diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/atk/AccessibleWrap.cpp firefox-trunk-41.0~a1~hg20150524r245419/accessible/atk/AccessibleWrap.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/atk/AccessibleWrap.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/atk/AccessibleWrap.cpp	2015-05-25 20:42:33.000000000 +0000
@@ -1128,7 +1128,12 @@
 
     switch (type) {
     case nsIAccessibleEvent::EVENT_STATE_CHANGE:
-        return FireAtkStateChangeEvent(aEvent, atkObj);
+      {
+        AccStateChangeEvent* event = downcast_accEvent(aEvent);
+        MAI_ATK_OBJECT(atkObj)->FireStateChangeEvent(event->GetState(),
+                                                     event->IsStateEnabled());
+        break;
+      }
 
     case nsIAccessibleEvent::EVENT_TEXT_REMOVED:
     case nsIAccessibleEvent::EVENT_TEXT_INSERTED:
@@ -1353,21 +1358,52 @@
 a11y::ProxyEvent(ProxyAccessible* aTarget, uint32_t aEventType)
 {
   AtkObject* wrapper = GetWrapperFor(aTarget);
-  if (aEventType == nsIAccessibleEvent::EVENT_FOCUS) {
+
+  switch (aEventType) {
+  case nsIAccessibleEvent::EVENT_FOCUS:
     atk_focus_tracker_notify(wrapper);
     atk_object_notify_state_change(wrapper, ATK_STATE_FOCUSED, true);
+    break;
+  case nsIAccessibleEvent::EVENT_DOCUMENT_LOAD_COMPLETE:
+    g_signal_emit_by_name(wrapper, "load_complete");
+    break;
+  case nsIAccessibleEvent::EVENT_DOCUMENT_RELOAD:
+    g_signal_emit_by_name(wrapper, "reload");
+    break;
+  case nsIAccessibleEvent::EVENT_DOCUMENT_LOAD_STOPPED:
+    g_signal_emit_by_name(wrapper, "load_stopped");
+    break;
+  case nsIAccessibleEvent::EVENT_MENUPOPUP_START:
+    atk_focus_tracker_notify(wrapper); // fire extra focus event
+    atk_object_notify_state_change(wrapper, ATK_STATE_VISIBLE, true);
+    atk_object_notify_state_change(wrapper, ATK_STATE_SHOWING, true);
+    break;
+  case nsIAccessibleEvent::EVENT_MENUPOPUP_END:
+    atk_object_notify_state_change(wrapper, ATK_STATE_VISIBLE, false);
+    atk_object_notify_state_change(wrapper, ATK_STATE_SHOWING, false);
+    break;
   }
 }
 
-nsresult
-AccessibleWrap::FireAtkStateChangeEvent(AccEvent* aEvent,
-                                        AtkObject* aObject)
+void
+a11y::ProxyStateChangeEvent(ProxyAccessible* aTarget, uint64_t aState,
+                            bool aEnabled)
 {
-    AccStateChangeEvent* event = downcast_accEvent(aEvent);
-    NS_ENSURE_TRUE(event, NS_ERROR_FAILURE);
+  MaiAtkObject* atkObj = MAI_ATK_OBJECT(GetWrapperFor(aTarget));
+  atkObj->FireStateChangeEvent(aState, aEnabled);
+}
 
-    bool isEnabled = event->IsStateEnabled();
-    int32_t stateIndex = AtkStateMap::GetStateIndexFor(event->GetState());
+void
+a11y::ProxyCaretMoveEvent(ProxyAccessible* aTarget, int32_t aOffset)
+{
+  AtkObject* wrapper = GetWrapperFor(aTarget);
+  g_signal_emit_by_name(wrapper, "text_caret_moved", aOffset);
+}
+
+void
+MaiAtkObject::FireStateChangeEvent(uint64_t aState, bool aEnabled)
+{
+    int32_t stateIndex = AtkStateMap::GetStateIndexFor(aState);
     if (stateIndex >= 0) {
         NS_ASSERTION(gAtkStateMap[stateIndex].stateMapEntryType != kNoSuchState,
                      "No such state");
@@ -1377,16 +1413,14 @@
                          "State changes should not fired for this state");
 
             if (gAtkStateMap[stateIndex].stateMapEntryType == kMapOpposite)
-                isEnabled = !isEnabled;
+                aEnabled = !aEnabled;
 
             // Fire state change for first state if there is one to map
-            atk_object_notify_state_change(aObject,
+            atk_object_notify_state_change(&parent,
                                            gAtkStateMap[stateIndex].atkState,
-                                           isEnabled);
+                                           aEnabled);
         }
     }
-
-    return NS_OK;
 }
 
 nsresult
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/atk/nsMai.h firefox-trunk-41.0~a1~hg20150524r245419/accessible/atk/nsMai.h
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/atk/nsMai.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/atk/nsMai.h	2015-05-25 20:42:33.000000000 +0000
@@ -76,6 +76,11 @@
    * Shutdown this AtkObject.
    */
   void Shutdown();
+
+  /*
+   * Notify atk of a state change on this AtkObject.
+   */
+  void FireStateChangeEvent(uint64_t aState, bool aEnabled);
 };
 
 #endif /* __NS_MAI_H__ */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/atk/Platform.cpp firefox-trunk-41.0~a1~hg20150524r245419/accessible/atk/Platform.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/atk/Platform.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/atk/Platform.cpp	2015-05-25 20:42:33.000000000 +0000
@@ -361,13 +361,12 @@
 #endif
 
   //check gconf-2 setting
-static const char sGconfAccessibilityKey[] =
-    "/desktop/gnome/interface/accessibility";
+#define GCONF_A11Y_KEY "/desktop/gnome/interface/accessibility"
   nsresult rv = NS_OK;
   nsCOMPtr<nsIGConfService> gconf =
     do_GetService(NS_GCONFSERVICE_CONTRACTID, &rv);
   if (NS_SUCCEEDED(rv) && gconf)
-    gconf->GetBool(NS_LITERAL_CSTRING(sGconfAccessibilityKey), &sShouldEnable);
+    gconf->GetBool(NS_LITERAL_CSTRING(GCONF_A11Y_KEY), &sShouldEnable);
 
   return sShouldEnable;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/base/EventQueue.cpp firefox-trunk-41.0~a1~hg20150524r245419/accessible/base/EventQueue.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/base/EventQueue.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/base/EventQueue.cpp	2015-05-25 20:42:33.000000000 +0000
@@ -502,6 +502,17 @@
       if (!aEvent->GetAccessible()->IsApplication())
         ipcDoc->SendEvent(id, aEvent->GetEventType());
       break;
+    case nsIAccessibleEvent::EVENT_STATE_CHANGE: {
+      AccStateChangeEvent* event = downcast_accEvent(aEvent);
+      ipcDoc->SendStateChangeEvent(id, event->GetState(),
+                                   event->IsStateEnabled());
+      break;
+    }
+    case nsIAccessibleEvent::EVENT_TEXT_CARET_MOVED: {
+                                                       AccCaretMoveEvent* event = downcast_accEvent(aEvent);
+                                                       ipcDoc->SendEvent(id, event->GetCaretOffset());
+                                                       break;
+                                                     }
     default:
       ipcDoc->SendEvent(id, aEvent->GetEventType());
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/base/MarkupMap.h firefox-trunk-41.0~a1~hg20150524r245419/accessible/base/MarkupMap.h
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/base/MarkupMap.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/base/MarkupMap.h	2015-05-25 20:42:33.000000000 +0000
@@ -103,6 +103,10 @@
           New_HTMLListitem,
           0)
 
+MARKUPMAP(map,
+          nullptr,
+          roles::TEXT_CONTAINER)
+
 MARKUPMAP(math,
           New_HyperText,
           roles::MATHML_MATH)
@@ -304,6 +308,10 @@
           roles::SECTION,
           Attr(live, polite))
 
+MARKUPMAP(p,
+          nullptr,
+          roles::PARAGRAPH)
+
 MARKUPMAP(progress,
           New_HTMLProgress,
           0)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/base/Platform.h firefox-trunk-41.0~a1~hg20150524r245419/accessible/base/Platform.h
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/base/Platform.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/base/Platform.h	2015-05-25 20:42:33.000000000 +0000
@@ -67,6 +67,9 @@
  * Callied when an event is fired on a proxied accessible.
  */
 void ProxyEvent(ProxyAccessible* aTarget, uint32_t aEventType);
+void ProxyStateChangeEvent(ProxyAccessible* aTarget, uint64_t aState,
+                           bool aEnabled);
+void ProxyCaretMoveEvent(ProxyAccessible* aTarget, int32_t aOffset);
 } // namespace a11y
 } // namespace mozilla
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/base/Role.h firefox-trunk-41.0~a1~hg20150524r245419/accessible/base/Role.h
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/base/Role.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/base/Role.h	2015-05-25 20:42:33.000000000 +0000
@@ -981,7 +981,13 @@
    */
   RADIO_GROUP = 168,
 
-  LAST_ROLE = RADIO_GROUP
+  /**
+   * A text container exposing brief amount of information. See related
+   * TEXT_CONTAINER role.
+   */
+  TEXT = 169,
+
+  LAST_ROLE = TEXT
 };
 
 } // namespace role
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/base/RoleMap.h firefox-trunk-41.0~a1~hg20150524r245419/accessible/base/RoleMap.h
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/base/RoleMap.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/base/RoleMap.h	2015-05-25 20:42:33.000000000 +0000
@@ -754,7 +754,7 @@
 
 ROLE(TEXT_CONTAINER,
      "text container",
-     ATK_ROLE_TEXT,
+     ATK_ROLE_SECTION,
      NSAccessibilityGroupRole,
      USE_ROLE_STRING,
      IA2_ROLE_TEXT_FRAME,
@@ -1367,3 +1367,12 @@
      ROLE_SYSTEM_GROUPING,
      ROLE_SYSTEM_GROUPING,
      eNoNameRule)
+
+ROLE(TEXT,
+     "text",
+     ATK_ROLE_STATIC,
+     NSAccessibilityGroupRole,
+     USE_ROLE_STRING,
+     IA2_ROLE_TEXT_FRAME,
+     eNameFromSubtreeIfReqRule)
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/base/TextAttrs.cpp firefox-trunk-41.0~a1~hg20150524r245419/accessible/base/TextAttrs.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/base/TextAttrs.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/base/TextAttrs.cpp	2015-05-25 20:42:33.000000000 +0000
@@ -18,6 +18,10 @@
 #include "mozilla/AppUnits.h"
 #include "mozilla/gfx/2D.h"
 
+#if defined(MOZ_WIDGET_GTK)
+#include "gfxPlatformGtk.h" // xxx - for UseFcFontList
+#endif
+
 using namespace mozilla;
 using namespace mozilla::a11y;
 
@@ -628,21 +632,30 @@
   if (font->IsSyntheticBold())
     return 700;
 
-#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
-  // On Linux, font->GetStyle()->weight will give the absolute weight requested
-  // of the font face. The Linux code uses the gfxFontEntry constructor which
-  // doesn't initialize the weight field.
-  return font->GetStyle()->weight;
-#else
-  // On Windows, font->GetStyle()->weight will give the same weight as
-  // fontEntry->Weight(), the weight of the first font in the font group, which
-  // may not be the weight of the font face used to render the characters.
-  // On Mac, font->GetStyle()->weight will just give the same number as
-  // getComputedStyle(). fontEntry->Weight() will give the weight of the font
-  // face used.
-  gfxFontEntry *fontEntry = font->GetFontEntry();
-  return fontEntry->Weight();
+  bool useFontEntryWeight = true;
+
+  // Under Linux, when gfxPangoFontGroup code is used,
+  // font->GetStyle()->weight will give the absolute weight requested of the
+  // font face. The gfxPangoFontGroup code uses the gfxFontEntry constructor
+  // which doesn't initialize the weight field.
+#if defined(MOZ_WIDGET_QT)
+  useFontEntryWeight = false;
+#elif defined(MOZ_WIDGET_GTK)
+  useFontEntryWeight = gfxPlatformGtk::UseFcFontList();
 #endif
+
+  if (useFontEntryWeight) {
+    // On Windows, font->GetStyle()->weight will give the same weight as
+    // fontEntry->Weight(), the weight of the first font in the font group,
+    // which may not be the weight of the font face used to render the
+    // characters. On Mac, font->GetStyle()->weight will just give the same
+    // number as getComputedStyle(). fontEntry->Weight() will give the weight
+    // of the font face used.
+    gfxFontEntry *fontEntry = font->GetFontEntry();
+    return fontEntry->Weight();
+  } else {
+    return font->GetStyle()->weight;
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/generic/HyperTextAccessible.cpp firefox-trunk-41.0~a1~hg20150524r245419/accessible/generic/HyperTextAccessible.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/generic/HyperTextAccessible.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/generic/HyperTextAccessible.cpp	2015-05-25 20:42:33.000000000 +0000
@@ -63,12 +63,11 @@
   if (r != roles::NOTHING)
     return r;
 
-  // Treat block frames as paragraphs
-  nsIFrame *frame = GetFrame();
-  if (frame && frame->GetType() == nsGkAtoms::blockFrame)
-    return roles::PARAGRAPH;
+  nsIFrame* frame = GetFrame();
+  if (frame && frame->GetType() == nsGkAtoms::inlineFrame)
+    return roles::TEXT;
 
-  return roles::TEXT_CONTAINER; // In ATK this works
+  return roles::TEXT_CONTAINER;
 }
 
 uint64_t
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/interfaces/nsIAccessibleRole.idl firefox-trunk-41.0~a1~hg20150524r245419/accessible/interfaces/nsIAccessibleRole.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/interfaces/nsIAccessibleRole.idl	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/interfaces/nsIAccessibleRole.idl	2015-05-25 20:42:34.000000000 +0000
@@ -8,7 +8,7 @@
 /**
  * Defines cross platform (Gecko) roles.
  */
-[scriptable, uuid(00f9e831-3198-40b7-9186-5251474d4d7a)]
+[scriptable, uuid(94add87a-190c-443e-9549-d11131affb2a)]
 interface nsIAccessibleRole : nsISupports
 {
   /**
@@ -974,4 +974,10 @@
    * A group containing radio buttons
    */
   const unsigned long ROLE_RADIO_GROUP = 168;
+
+  /**
+   * A text container exposing brief amount of information. See related
+   * TEXT_CONTAINER role.
+   */
+  const unsigned long ROLE_TEXT = 169;
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/ipc/DocAccessibleParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/accessible/ipc/DocAccessibleParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/ipc/DocAccessibleParent.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/ipc/DocAccessibleParent.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -23,14 +23,7 @@
     return false;
   }
 
-  ProxyAccessible* parent = nullptr;
-  if (aData.ID()) {
-    ProxyEntry* e = mAccessibles.GetEntry(aData.ID());
-    if (e)
-      parent = e->mProxy;
-  } else {
-    parent = this;
-  }
+  ProxyAccessible* parent = GetAccessible(aData.ID());
 
   // XXX This should really never happen, but sometimes we fail to fire the
   // required show events.
@@ -123,18 +116,37 @@
 bool
 DocAccessibleParent::RecvEvent(const uint64_t& aID, const uint32_t& aEventType)
 {
-  if (!aID) {
-    ProxyEvent(this, aEventType);
-    return true;
-  }
-
-  ProxyEntry* e = mAccessibles.GetEntry(aID);
-  if (!e) {
+  ProxyAccessible* proxy = GetAccessible(aID);
+  if (!proxy) {
     NS_ERROR("no proxy for event!");
     return true;
   }
 
-  ProxyEvent(e->mProxy, aEventType);
+  ProxyEvent(proxy, aEventType);
+  return true;
+}
+
+bool
+DocAccessibleParent::RecvStateChangeEvent(const uint64_t& aID,
+                                          const uint64_t& aState,
+                                          const bool& aEnabled)
+{
+  ProxyAccessible* target = GetAccessible(aID);
+  if (!target)
+    return false;
+
+  ProxyStateChangeEvent(target, aState, aEnabled);
+  return true;
+}
+
+bool
+DocAccessibleParent::RecvCaretMoveEvent(const uint64_t& aID, const int32_t& aOffset)
+{
+  ProxyAccessible* proxy = GetAccessible(aID);
+  if (!proxy)
+    return false;
+
+  ProxyCaretMoveEvent(proxy, aOffset);
   return true;
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/ipc/DocAccessibleParent.h firefox-trunk-41.0~a1~hg20150524r245419/accessible/ipc/DocAccessibleParent.h
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/ipc/DocAccessibleParent.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/ipc/DocAccessibleParent.h	2015-05-25 20:42:34.000000000 +0000
@@ -44,6 +44,12 @@
 
   virtual bool RecvShowEvent(const ShowEventData& aData) override;
   virtual bool RecvHideEvent(const uint64_t& aRootID) override;
+  virtual bool RecvStateChangeEvent(const uint64_t& aID,
+                                    const uint64_t& aState,
+                                    const bool& aEnabled) override final;
+
+  virtual bool RecvCaretMoveEvent(const uint64_t& aID, const int32_t& aOffset)
+    override final;
 
   virtual bool RecvBindChildDoc(PDocAccessibleParent* aChildDoc, const uint64_t& aID) override;
   void Unbind()
@@ -94,12 +100,18 @@
   /**
    * Return the accessible for given id.
    */
-  ProxyAccessible* GetAccessible(uintptr_t aID) const
+  ProxyAccessible* GetAccessible(uintptr_t aID)
   {
+    if (!aID)
+      return this;
+
     ProxyEntry* e = mAccessibles.GetEntry(aID);
     return e ? e->mProxy : nullptr;
   }
 
+  const ProxyAccessible* GetAccessible(uintptr_t aID) const
+    { return const_cast<DocAccessibleParent*>(this)->GetAccessible(aID); }
+
 private:
 
   class ProxyEntry : public PLDHashEntryHdr
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/ipc/PDocAccessible.ipdl firefox-trunk-41.0~a1~hg20150524r245419/accessible/ipc/PDocAccessible.ipdl
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/ipc/PDocAccessible.ipdl	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/ipc/PDocAccessible.ipdl	2015-05-25 20:42:34.000000000 +0000
@@ -56,6 +56,8 @@
   Event(uint64_t aID, uint32_t type);
   ShowEvent(ShowEventData data);
   HideEvent(uint64_t aRootID);
+  StateChangeEvent(uint64_t aID, uint64_t aState, bool aEnabled);
+  CaretMoveEvent(uint64_t aID, int32_t aOffset);
 
   /*
    * Tell the parent document to bind the existing document as a new child
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/mac/mozAccessible.h firefox-trunk-41.0~a1~hg20150524r245419/accessible/mac/mozAccessible.h
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/mac/mozAccessible.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/mac/mozAccessible.h	2015-05-25 20:42:34.000000000 +0000
@@ -31,12 +31,15 @@
   return native;
 }
 
+// This is OR'd with the Accessible owner to indicate the wrap-ee is a proxy.
+static const uintptr_t IS_PROXY = 1;
+
 @interface mozAccessible : NSObject <mozAccessible>
 {
   /**
    * Weak reference; it owns us.
    */
-  mozilla::a11y::AccessibleWrap* mGeckoAccessible;
+  uintptr_t mGeckoAccessible;
   
   /**
    * Strong ref to array of children
@@ -54,6 +57,9 @@
   mozilla::a11y::role        mRole;
 }
 
+// return the Accessible for this mozAccessible.
+- (mozilla::a11y::AccessibleWrap*) getGeckoAccessible;
+
 // inits with the gecko owner.
 - (id)initWithAccessible:(mozilla::a11y::AccessibleWrap*)geckoParent;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/mac/mozAccessible.mm firefox-trunk-41.0~a1~hg20150524r245419/accessible/mac/mozAccessible.mm
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/mac/mozAccessible.mm	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/mac/mozAccessible.mm	2015-05-25 20:42:34.000000000 +0000
@@ -65,7 +65,7 @@
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
   if ((self = [super init])) {
-    mGeckoAccessible = geckoAccessible;
+    mGeckoAccessible = reinterpret_cast<uintptr_t>(geckoAccessible);
     mRole = geckoAccessible->Role();
   }
    
@@ -83,6 +83,15 @@
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
+
+- (mozilla::a11y::AccessibleWrap*)getGeckoAccessible
+{
+  // Check if mGeckoAccessible points at a proxy
+  if (mGeckoAccessible & IS_PROXY)
+    return nil;
+
+  return reinterpret_cast<AccessibleWrap*>(mGeckoAccessible);
+}
  
 #pragma mark -
 
@@ -92,8 +101,10 @@
 
   // unknown (either unimplemented, or irrelevant) elements are marked as ignored
   // as well as expired elements.
-  return !mGeckoAccessible || ([[self role] isEqualToString:NSAccessibilityUnknownRole] &&
-                               !(mGeckoAccessible->InteractiveState() & states::FOCUSABLE));
+
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  return !accWrap || ([[self role] isEqualToString:NSAccessibilityUnknownRole] &&
+                               !(accWrap->InteractiveState() & states::FOCUSABLE));
 
   NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NO);
 }
@@ -103,7 +114,7 @@
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
   // if we're expired, we don't support any attributes.
-  if (!mGeckoAccessible)
+  if (![self getGeckoAccessible])
     return [NSArray array];
   
   static NSArray *generalAttributes = nil;
@@ -141,7 +152,7 @@
 {  
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
-  if (!mGeckoAccessible)
+  if (![self getGeckoAccessible])
     return nil;
 
 #if DEBUG
@@ -183,7 +194,8 @@
   if ([attribute isEqualToString:NSAccessibilityTitleAttribute])
     return [self title];
   if ([attribute isEqualToString:NSAccessibilityTitleUIElementAttribute]) {
-    Relation rel = mGeckoAccessible->RelationByType(RelationType::LABELLED_BY);
+    Relation rel =
+      [self getGeckoAccessible]->RelationByType(RelationType::LABELLED_BY);
     Accessible* tempAcc = rel.Next();
     return tempAcc ? GetNativeFromGeckoAccessible(tempAcc) : nil;
   }
@@ -227,7 +239,8 @@
 
 - (id)accessibilityHitTest:(NSPoint)point
 {
-  if (!mGeckoAccessible)
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  if (!accWrap)
     return nil;
 
   // Convert the given screen-global point in the cocoa coordinate system (with
@@ -239,8 +252,9 @@
   nsIntPoint geckoPoint = nsCocoaUtils::
     CocoaPointsToDevPixels(tmpPoint, nsCocoaUtils::GetBackingScaleFactor(mainView));
 
-  Accessible* child = mGeckoAccessible->ChildAtPoint(geckoPoint.x, geckoPoint.y,
-                                                     Accessible::eDeepestChild);
+  Accessible* child =
+    accWrap->ChildAtPoint(geckoPoint.x, geckoPoint.y,
+                          Accessible::eDeepestChild);
 
   if (child) {
     mozAccessible* nativeChild = GetNativeFromGeckoAccessible(child);
@@ -270,10 +284,11 @@
 
 - (id)accessibilityFocusedUIElement
 {
-  if (!mGeckoAccessible)
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  if (!accWrap)
     return nil;
   
-  Accessible* focusedGeckoChild = mGeckoAccessible->FocusedChild();
+  Accessible* focusedGeckoChild = accWrap->FocusedChild();
   if (focusedGeckoChild) {
     mozAccessible *focusedChild = GetNativeFromGeckoAccessible(focusedGeckoChild);
     if (focusedChild)
@@ -290,7 +305,8 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
-  Accessible* accessibleParent = mGeckoAccessible->GetUnignoredParent();
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  Accessible* accessibleParent = accWrap->GetUnignoredParent();
   if (accessibleParent) {
     id nativeParent = GetNativeFromGeckoAccessible(accessibleParent);
     if (nativeParent)
@@ -303,7 +319,7 @@
   //
   // get the native root accessible, and tell it to return its first parent unignored accessible.
   id nativeParent =
-    GetNativeFromGeckoAccessible(mGeckoAccessible->RootAccessible());
+    GetNativeFromGeckoAccessible(accWrap->RootAccessible());
   NSAssert1 (nativeParent, @"!!! we can't find a parent for %@", self);
 
   return GetClosestInterestingAccessible(nativeParent);
@@ -332,14 +348,15 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
-  if (mChildren || !mGeckoAccessible->AreChildrenCached())
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  if (mChildren || !accWrap->AreChildrenCached())
     return mChildren;
 
   mChildren = [[NSMutableArray alloc] init];
 
   // get the array of children.
   nsAutoTArray<Accessible*, 10> childrenArray;
-  mGeckoAccessible->GetUnignoredChildren(&childrenArray);
+  accWrap->GetUnignoredChildren(&childrenArray);
 
   // now iterate through the children array, and get each native accessible.
   uint32_t totalCount = childrenArray.Length();
@@ -370,10 +387,11 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
-  if (!mGeckoAccessible)
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  if (!accWrap)
     return nil;
 
-  nsIntRect rect = mGeckoAccessible->Bounds();
+  nsIntRect rect = accWrap->Bounds();
 
   NSScreen* mainView = [[NSScreen screens] objectAtIndex:0];
   CGFloat scaleFactor = nsCocoaUtils::GetBackingScaleFactor(mainView);
@@ -389,10 +407,11 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
-  if (!mGeckoAccessible)
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  if (!accWrap)
     return nil;
 
-  nsIntRect rect = mGeckoAccessible->Bounds();
+  nsIntRect rect = accWrap->Bounds();
   CGFloat scaleFactor =
     nsCocoaUtils::GetBackingScaleFactor([[NSScreen screens] objectAtIndex:0]);
   return [NSValue valueWithSize:NSMakeSize(static_cast<CGFloat>(rect.width) / scaleFactor,
@@ -403,11 +422,12 @@
 
 - (NSString*)role
 {
-  if (!mGeckoAccessible)
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  if (!accWrap)
     return nil;
 
 #ifdef DEBUG_A11Y
-  NS_ASSERTION(nsAccUtils::IsTextInterfaceSupportCorrect(mGeckoAccessible),
+  NS_ASSERTION(nsAccUtils::IsTextInterfaceSupportCorrect(accWrap),
                "Does not support Text when it should");
 #endif
 
@@ -427,10 +447,11 @@
 
 - (NSString*)subrole
 {
-  if (!mGeckoAccessible)
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  if (!accWrap)
     return nil;
 
-  nsIAtom* landmark = mGeckoAccessible->LandmarkRole();
+  nsIAtom* landmark = accWrap->LandmarkRole();
   if (landmark) {
     if (landmark == nsGkAtoms::application)
       return @"AXLandmarkApplication";
@@ -457,7 +478,7 @@
       return @"AXContentList"; // 10.6+ NSAccessibilityContentListSubrole;
 
     case roles::ENTRY:
-      if (mGeckoAccessible->IsSearchbox())
+      if (accWrap->IsSearchbox())
         return @"AXSearchField";
       break;
 
@@ -528,7 +549,7 @@
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
   nsAutoString title;
-  mGeckoAccessible->Name(title);
+  [self getGeckoAccessible]->Name(title);
   return nsCocoaUtils::ToNSString(title);
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
@@ -539,7 +560,7 @@
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
   nsAutoString value;
-  mGeckoAccessible->Value(value);
+  [self getGeckoAccessible]->Value(value);
   return nsCocoaUtils::ToNSString(value);
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
@@ -567,11 +588,12 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
-  if (mGeckoAccessible->IsDefunct())
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  if (accWrap->IsDefunct())
     return nil;
 
   nsAutoString desc;
-  mGeckoAccessible->Description(desc);
+  accWrap->Description(desc);
 
   return nsCocoaUtils::ToNSString(desc);
 
@@ -583,7 +605,7 @@
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
   nsAutoString helpText;
-  mGeckoAccessible->Help(helpText);
+  [self getGeckoAccessible]->Help(helpText);
   return nsCocoaUtils::ToNSString(helpText);
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
@@ -601,26 +623,29 @@
 
 - (BOOL)isFocused
 {
-  return FocusMgr()->IsFocused(mGeckoAccessible);
+  return FocusMgr()->IsFocused([self getGeckoAccessible]);
 }
 
 - (BOOL)canBeFocused
 {
-  return mGeckoAccessible && (mGeckoAccessible->InteractiveState() & states::FOCUSABLE);
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  return accWrap && (accWrap->InteractiveState() & states::FOCUSABLE);
 }
 
 - (BOOL)focus
 {
-  if (!mGeckoAccessible)
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  if (!accWrap)
     return NO;
 
-  mGeckoAccessible->TakeFocus();
+  accWrap->TakeFocus();
   return YES;
 }
 
 - (BOOL)isEnabled
 {
-  return mGeckoAccessible && ((mGeckoAccessible->InteractiveState() & states::UNAVAILABLE) == 0);
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  return accWrap && ((accWrap->InteractiveState() & states::UNAVAILABLE) == 0);
 }
 
 // The root accessible calls this when the focused node was
@@ -643,7 +668,7 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
-  AccessibleWrap* accWrap = static_cast<AccessibleWrap*>(mGeckoAccessible);
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
 
   // Get a pointer to the native window (NSWindow) we reside in.
   NSWindow *nativeWindow = nil;
@@ -685,14 +710,14 @@
 
   [self invalidateChildren];
 
-  mGeckoAccessible = nullptr;
+  mGeckoAccessible = 0;
   
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
 
 - (BOOL)isExpired
 {
-  return !mGeckoAccessible;
+  return ![self getGeckoAccessible];
 }
 
 #pragma mark -
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/mac/mozActionElements.mm firefox-trunk-41.0~a1~hg20150524r245419/accessible/mac/mozActionElements.mm
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/mac/mozActionElements.mm	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/mac/mozActionElements.mm	2015-05-25 20:42:34.000000000 +0000
@@ -73,7 +73,7 @@
 
 - (BOOL)accessibilityIsIgnored
 {
-  return !mGeckoAccessible;
+  return ![self getGeckoAccessible];
 }
 
 - (NSArray*)accessibilityActionNames
@@ -118,12 +118,13 @@
 {
   // both buttons and checkboxes have only one action. we should really stop using arbitrary
   // arrays with actions, and define constants for these actions.
-  mGeckoAccessible->DoAction(0);
+  [self getGeckoAccessible]->DoAction(0);
 }
 
 - (BOOL)isTab
 {
-  return (mGeckoAccessible && (mGeckoAccessible->Role() == roles::PAGETAB));
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  return (accWrap && (accWrap->Role() == roles::PAGETAB));
 }
 
 @end
@@ -148,7 +149,7 @@
 
 - (int)isChecked
 {
-  uint64_t state = mGeckoAccessible->NativeState();
+  uint64_t state = [self getGeckoAccessible]->NativeState();
 
   // check if we're checked or in a mixed state
   if (state & states::CHECKED) {
@@ -292,10 +293,10 @@
  */
 - (id)value
 {
-  if (!mGeckoAccessible)
+  if (![self getGeckoAccessible])
     return nil;
 
-  Accessible* accessible = mGeckoAccessible->GetSelectedItem(0);
+  Accessible* accessible = [self getGeckoAccessible]->GetSelectedItem(0);
   if (!accessible)
     return nil;
 
@@ -339,29 +340,29 @@
 
 - (NSUInteger)accessibilityArrayAttributeCount:(NSString*)attribute
 {
-  if (!mGeckoAccessible)
+  if (![self getGeckoAccessible])
     return 0;
 
   // By default this calls -[[mozAccessible children] count].
   // Since we don't cache mChildren. This is faster.
   if ([attribute isEqualToString:NSAccessibilityChildrenAttribute])
-    return mGeckoAccessible->ChildCount() ? 1 : 0;
+    return [self getGeckoAccessible]->ChildCount() ? 1 : 0;
 
   return [super accessibilityArrayAttributeCount:attribute];
 }
 
 - (NSArray*)children
 {
-  if (!mGeckoAccessible)
+  if (![self getGeckoAccessible])
     return nil;
 
-  nsDeckFrame* deckFrame = do_QueryFrame(mGeckoAccessible->GetFrame());
+  nsDeckFrame* deckFrame = do_QueryFrame([self getGeckoAccessible]->GetFrame());
   nsIFrame* selectedFrame = deckFrame ? deckFrame->GetSelectedBox() : nullptr;
 
   Accessible* selectedAcc = nullptr;
   if (selectedFrame) {
     nsINode* node = selectedFrame->GetContent();
-    selectedAcc = mGeckoAccessible->Document()->GetAccessible(node);
+    selectedAcc = [self getGeckoAccessible]->Document()->GetAccessible(node);
   }
 
   if (selectedAcc) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/mac/mozDocAccessible.mm firefox-trunk-41.0~a1~hg20150524r245419/accessible/mac/mozDocAccessible.mm
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/mac/mozDocAccessible.mm	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/mac/mozDocAccessible.mm	2015-05-25 20:42:34.000000000 +0000
@@ -33,7 +33,7 @@
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
   
   // if we're expired, we don't support any attributes.
-  if (!mGeckoAccessible)
+  if (![self getGeckoAccessible])
     return [NSArray array];
   
   // standard attributes that are shared and supported by root accessible (AXMain) elements.
@@ -95,7 +95,7 @@
   if (mParallelView)
     return (id)mParallelView;
   
-  mParallelView = getNativeViewFromRootAccessible (mGeckoAccessible);
+  mParallelView = getNativeViewFromRootAccessible ([self getGeckoAccessible]);
   
   NSAssert(mParallelView, @"can't return root accessible's native parallel view.");
   return mParallelView;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/mac/mozHTMLAccessible.mm firefox-trunk-41.0~a1~hg20150524r245419/accessible/mac/mozHTMLAccessible.mm
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/mac/mozHTMLAccessible.mm	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/mac/mozHTMLAccessible.mm	2015-05-25 20:42:34.000000000 +0000
@@ -20,17 +20,19 @@
   mozilla::ErrorResult rv;
   // XXX use the flattening API when there are available
   // see bug 768298
-  mGeckoAccessible->GetContent()->GetTextContent(title, rv);
+  [self getGeckoAccessible]->GetContent()->GetTextContent(title, rv);
 
   return nsCocoaUtils::ToNSString(title);
 }
 
 - (id)value
 {
-  if (!mGeckoAccessible || !mGeckoAccessible->IsHyperText())
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+
+  if (!accWrap || !accWrap->IsHyperText())
     return nil;
 
-  uint32_t level = mGeckoAccessible->AsHyperText()->GetLevelInternal();
+  uint32_t level = accWrap->AsHyperText()->GetLevelInternal();
   return [NSNumber numberWithInt:level];
 }
 
@@ -45,7 +47,7 @@
 - (NSArray*)accessibilityAttributeNames
 {
   // if we're expired, we don't support any attributes.
-  if (!mGeckoAccessible)
+  if (![self getGeckoAccessible])
     return [NSArray array];
   
   static NSMutableArray* attributes = nil;
@@ -69,7 +71,7 @@
 - (NSArray*)accessibilityActionNames 
 {
     // if we're expired, we don't support any attributes.
-  if (!mGeckoAccessible)
+  if (![self getGeckoAccessible])
     return [NSArray array];
 
   static NSArray* actionNames = nil;
@@ -84,11 +86,13 @@
 
 - (void)accessibilityPerformAction:(NSString*)action 
 {
-  if (!mGeckoAccessible)
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+
+  if (!accWrap)
     return;
 
   if ([action isEqualToString:NSAccessibilityPressAction])
-    mGeckoAccessible->DoAction(0);
+    accWrap->DoAction(0);
   else
     [super accessibilityPerformAction:action];
 }
@@ -105,11 +109,11 @@
 
 - (NSURL*)url
 {
-  if (!mGeckoAccessible || mGeckoAccessible->IsDefunct())
+  if (![self getGeckoAccessible] || [self getGeckoAccessible]->IsDefunct())
     return nil;
 
   nsAutoString value;
-  mGeckoAccessible->Value(value);
+  [self getGeckoAccessible]->Value(value);
 
   NSString* urlString = value.IsEmpty() ? nil : nsCocoaUtils::ToNSString(value);
   if (!urlString)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/mac/mozTextAccessible.h firefox-trunk-41.0~a1~hg20150524r245419/accessible/mac/mozTextAccessible.h
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/mac/mozTextAccessible.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/mac/mozTextAccessible.h	2015-05-25 20:42:34.000000000 +0000
@@ -8,9 +8,6 @@
 
 @interface mozTextAccessible : mozAccessible
 {
-  // both of these are the same old mGeckoAccessible, but already
-  // QI'd for us, to the right type, for convenience.
-  mozilla::a11y::HyperTextAccessible* mGeckoTextAccessible; // strong
 }
 @end
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/mac/mozTextAccessible.mm firefox-trunk-41.0~a1~hg20150524r245419/accessible/mac/mozTextAccessible.mm
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/mac/mozTextAccessible.mm	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/mac/mozTextAccessible.mm	2015-05-25 20:42:34.000000000 +0000
@@ -53,21 +53,9 @@
 
 @implementation mozTextAccessible
 
-- (id)initWithAccessible:(AccessibleWrap*)accessible
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  if ((self = [super initWithAccessible:accessible])) {
-    mGeckoTextAccessible = accessible->AsHyperText();
-  }
-  return self;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
 - (BOOL)accessibilityIsIgnored
 {
-  return !mGeckoAccessible;
+  return ![self getGeckoAccessible];
 }
 
 - (NSArray*)accessibilityAttributeNames
@@ -126,11 +114,13 @@
     return [self text];
   }
 
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+
   if ([attribute isEqualToString:@"AXRequired"])
-    return [NSNumber numberWithBool:!!(mGeckoAccessible->State() & states::REQUIRED)];
+    return [NSNumber numberWithBool:!!(accWrap->State() & states::REQUIRED)];
 
   if ([attribute isEqualToString:@"AXInvalid"])
-    return [NSNumber numberWithBool:!!(mGeckoAccessible->State() & states::INVALID)];
+    return [NSNumber numberWithBool:!!(accWrap->State() & states::INVALID)];
 
   if ([attribute isEqualToString:NSAccessibilityVisibleCharacterRangeAttribute])
     return [self visibleCharacterRange];
@@ -166,7 +156,9 @@
 
 - (id)accessibilityAttributeValue:(NSString*)attribute forParameter:(id)parameter
 {
-  if (!mGeckoTextAccessible)
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  HyperTextAccessible* textAcc = accWrap? accWrap->AsHyperText() : nullptr;
+  if (!textAcc)
     return nil;
 
   if ([attribute isEqualToString:NSAccessibilityStringForRangeParameterizedAttribute]) {
@@ -214,7 +206,7 @@
 
     int32_t start = range.location;
     int32_t end = start + range.length;
-    nsIntRect bounds = mGeckoTextAccessible->TextBounds(start, end);
+    nsIntRect bounds = textAcc->TextBounds(start, end);
 
     return [NSValue valueWithRect:nsCocoaUtils::GeckoRectToCocoaRect(bounds)];
   }
@@ -247,7 +239,9 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  if (!mGeckoTextAccessible)
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  HyperTextAccessible* textAcc = accWrap? accWrap->AsHyperText() : nullptr;
+  if (!textAcc)
     return;
 
   if ([attribute isEqualToString:NSAccessibilityValueAttribute]) {
@@ -262,12 +256,12 @@
       return;
 
     int32_t start = 0, end = 0;
-    mGeckoTextAccessible->SelectionBoundsAt(0, &start, &end);
-    mGeckoTextAccessible->DeleteText(start, end - start);
+    textAcc->SelectionBoundsAt(0, &start, &end);
+    textAcc->DeleteText(start, end - start);
 
     nsString text;
     nsCocoaUtils::GetStringForNSString(stringValue, text);
-    mGeckoTextAccessible->InsertText(text, start);
+    textAcc->InsertText(text, start);
   }
 
   if ([attribute isEqualToString:NSAccessibilitySelectedTextRangeAttribute]) {
@@ -275,8 +269,8 @@
     if (!ToNSRange(value, &range))
       return;
 
-    mGeckoTextAccessible->SetSelectionBoundsAt(0, range.location,
-                                               range.location + range.length);
+    textAcc->SetSelectionBoundsAt(0, range.location,
+                                  range.location + range.length);
     return;
   }
 
@@ -285,8 +279,8 @@
     if (!ToNSRange(value, &range))
       return;
 
-    mGeckoTextAccessible->ScrollSubstringTo(range.location, range.location + range.length,
-                                            nsIAccessibleScrollType::SCROLL_TYPE_TOP_EDGE);
+    textAcc->ScrollSubstringTo(range.location, range.location + range.length,
+                               nsIAccessibleScrollType::SCROLL_TYPE_TOP_EDGE);
     return;
   } 
 
@@ -303,16 +297,6 @@
   return nil;
 }
 
-- (void)expire
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  mGeckoTextAccessible = nullptr;
-  [super expire];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
 #pragma mark -
 
 - (BOOL)isReadOnly
@@ -322,8 +306,10 @@
   if ([[self role] isEqualToString:NSAccessibilityStaticTextRole])
     return YES;
 
-  if (mGeckoTextAccessible)
-    return (mGeckoAccessible->State() & states::READONLY) == 0;
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  HyperTextAccessible* textAcc = accWrap? accWrap->AsHyperText() : nullptr;
+  if (textAcc)
+    return (accWrap->State() & states::READONLY) == 0;
 
   return NO;
 
@@ -332,8 +318,10 @@
 
 - (NSNumber*)caretLineNumber
 {
-  int32_t lineNumber = mGeckoTextAccessible ?
-    mGeckoTextAccessible->CaretLineNumber() - 1 : -1;
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  HyperTextAccessible* textAcc = accWrap? accWrap->AsHyperText() : nullptr;
+  int32_t lineNumber = textAcc ?
+    textAcc->CaretLineNumber() - 1 : -1;
 
   return (lineNumber >= 0) ? [NSNumber numberWithInt:lineNumber] : nil;
 }
@@ -342,10 +330,12 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  if (mGeckoTextAccessible) {
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  HyperTextAccessible* textAcc = accWrap? accWrap->AsHyperText() : nullptr;
+  if (textAcc) {
     nsString text;
     nsCocoaUtils::GetStringForNSString(aNewString, text);
-    mGeckoTextAccessible->ReplaceText(text);
+    textAcc->ReplaceText(text);
   }
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
@@ -353,7 +343,9 @@
 
 - (NSString*)text
 {
-  if (!mGeckoAccessible || !mGeckoTextAccessible)
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  HyperTextAccessible* textAcc = accWrap? accWrap->AsHyperText() : nullptr;
+  if (!accWrap || !textAcc)
     return nil;
 
   // A password text field returns an empty value
@@ -361,9 +353,7 @@
     return @"";
 
   nsAutoString text;
-  mGeckoTextAccessible->TextSubstring(0,
-                                      nsIAccessibleText::TEXT_OFFSET_END_OF_TEXT,
-                                      text);
+  textAcc->TextSubstring(0, nsIAccessibleText::TEXT_OFFSET_END_OF_TEXT, text);
   return nsCocoaUtils::ToNSString(text);
 }
 
@@ -371,10 +361,12 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
-  if (!mGeckoAccessible || !mGeckoTextAccessible)
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  HyperTextAccessible* textAcc = accWrap? accWrap->AsHyperText() : nullptr;
+  if (!accWrap || !textAcc)
     return 0;
 
-  return mGeckoTextAccessible ? mGeckoTextAccessible->CharacterCount() : 0;
+  return textAcc ? textAcc->CharacterCount() : 0;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(0);
 }
@@ -383,9 +375,11 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
-  if (mGeckoTextAccessible) {
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  HyperTextAccessible* textAcc = accWrap? accWrap->AsHyperText() : nullptr;
+  if (textAcc) {
     int32_t start = 0, end = 0;
-    mGeckoTextAccessible->SelectionBoundsAt(0, &start, &end);
+    textAcc->SelectionBoundsAt(0, &start, &end);
     return (end - start);
   }
   return 0;
@@ -397,12 +391,14 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
-  if (mGeckoTextAccessible) {
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  HyperTextAccessible* textAcc = accWrap? accWrap->AsHyperText() : nullptr;
+  if (textAcc) {
     int32_t start = 0, end = 0;
-    mGeckoTextAccessible->SelectionBoundsAt(0, &start, &end);
+    textAcc->SelectionBoundsAt(0, &start, &end);
     if (start != end) {
       nsAutoString selText;
-      mGeckoTextAccessible->TextSubstring(start, end, selText);
+      textAcc->TextSubstring(start, end, selText);
       return nsCocoaUtils::ToNSString(selText);
     }
   }
@@ -415,17 +411,19 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
-  if (mGeckoTextAccessible) {
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  HyperTextAccessible* textAcc = accWrap? accWrap->AsHyperText() : nullptr;
+  if (textAcc) {
     int32_t start = 0;
     int32_t end = 0;
-    int32_t count = mGeckoTextAccessible->SelectionCount();
+    int32_t count = textAcc->SelectionCount();
 
     if (count) {
-      mGeckoTextAccessible->SelectionBoundsAt(0, &start, &end);
+      textAcc->SelectionBoundsAt(0, &start, &end);
       return [NSValue valueWithRange:NSMakeRange(start, end - start)];
     }
 
-    start = mGeckoTextAccessible->CaretOffset();
+    start = textAcc->CaretOffset();
     return [NSValue valueWithRange:NSMakeRange(start != -1 ? start : 0, 0)]; 
   }
   return [NSValue valueWithRange:NSMakeRange(0, 0)];
@@ -437,9 +435,11 @@
 {
   // XXX this won't work with Textarea and such as we actually don't give
   // the visible character range.
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  HyperTextAccessible* textAcc = accWrap? accWrap->AsHyperText() : nullptr;
   return [NSValue valueWithRange:
-    NSMakeRange(0, mGeckoTextAccessible ? 
-                mGeckoTextAccessible->CharacterCount() : 0)];
+    NSMakeRange(0, textAcc ?
+                textAcc->CharacterCount() : 0)];
 }
 
 - (void)valueDidChange
@@ -460,11 +460,16 @@
 
 - (NSString*)stringFromRange:(NSRange*)range
 {
-  NS_PRECONDITION(mGeckoTextAccessible && range, "no Gecko text accessible or range");
+  NS_PRECONDITION(range, "no range");
+
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  HyperTextAccessible* textAcc = accWrap? accWrap->AsHyperText() : nullptr;
+  if (!textAcc)
+    return nil;
 
   nsAutoString text;
-  mGeckoTextAccessible->TextSubstring(range->location,
-                                      range->location + range->length, text);
+  textAcc->TextSubstring(range->location,
+                         range->location + range->length, text);
   return nsCocoaUtils::ToNSString(text);
 }
 
@@ -496,18 +501,20 @@
 
 - (NSString*)text
 {
-  if (!mGeckoAccessible)
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  if (!accWrap)
     return nil;
 
-  return nsCocoaUtils::ToNSString(mGeckoAccessible->AsTextLeaf()->Text());
+  return nsCocoaUtils::ToNSString(accWrap->AsTextLeaf()->Text());
 }
 
 - (long)textLength
 {
-  if (!mGeckoAccessible)
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  if (!accWrap)
     return 0;
 
-  return mGeckoAccessible->AsTextLeaf()->Text().Length();
+  return accWrap->AsTextLeaf()->Text().Length();
 }
 
 @end
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/mac/Platform.mm firefox-trunk-41.0~a1~hg20150524r245419/accessible/mac/Platform.mm
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/mac/Platform.mm	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/mac/Platform.mm	2015-05-25 20:42:34.000000000 +0000
@@ -47,6 +47,16 @@
 ProxyEvent(ProxyAccessible*, uint32_t)
 {
 }
+
+void
+ProxyStateChangeEvent(ProxyAccessible*, uint64_t, bool)
+{
+}
+
+void
+ProxyCaretMoveEvent(ProxyAccessible* aTarget, int32_t aOffset)
+{
+}
 }
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/other/Platform.cpp firefox-trunk-41.0~a1~hg20150524r245419/accessible/other/Platform.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/other/Platform.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/other/Platform.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -33,3 +33,13 @@
 a11y::ProxyEvent(ProxyAccessible*, uint32_t)
 {
 }
+
+void
+a11y::ProxyStateChangeEvent(ProxyAccessible*, uint64_t, bool)
+{
+}
+
+void
+a11y::ProxyCaretMoveEvent(ProxyAccessible* aTarget, int32_t aOffset)
+{
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/tests/mochitest/elm/test_HTMLSpec.html firefox-trunk-41.0~a1~hg20150524r245419/accessible/tests/mochitest/elm/test_HTMLSpec.html
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/tests/mochitest/elm/test_HTMLSpec.html	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/tests/mochitest/elm/test_HTMLSpec.html	2015-05-25 20:42:34.000000000 +0000
@@ -70,7 +70,7 @@
         interfaces: [ nsIAccessibleText, nsIAccessibleHyperText ],
         children: [
           {
-            role: ROLE_TEXT_CONTAINER,
+            role: ROLE_TEXT,
             children: [ { role: ROLE_TEXT_LEAF } ]
           }
         ]
@@ -81,7 +81,7 @@
       // HTML:address
 
       obj = {
-        todo_role: ROLE_PARAGRAPH,
+        role: ROLE_TEXT_CONTAINER,
         interfaces: [ nsIAccessibleText, nsIAccessibleHyperText ],
       };
       testElm("address", obj);
@@ -188,7 +188,7 @@
       testElm("blockquote", obj);
 
       //////////////////////////////////////////////////////////////////////////
-      // HTML:br
+      // HTML:br contained by paragraph
 
       obj = {
         role: ROLE_PARAGRAPH,
@@ -1062,7 +1062,7 @@
       // HTML:pre
 
       obj = {
-        role: ROLE_PARAGRAPH,
+        role: ROLE_TEXT_CONTAINER,
         interfaces: [ nsIAccessibleText, nsIAccessibleHyperText ]
       };
       testElm("pre", obj);
@@ -1087,7 +1087,7 @@
       // HTML:q
 
       obj = {
-        role: ROLE_TEXT_CONTAINER,
+        role: ROLE_TEXT,
         interfaces: [ nsIAccessibleText, nsIAccessibleHyperText ],
         children: [
           { role: ROLE_STATICTEXT }, // left quote
@@ -1233,7 +1233,7 @@
       // HTML:time
 
       obj = {
-        role: ROLE_TEXT_CONTAINER,
+        role: ROLE_TEXT,
         attributes: { "xml-roles": "time", "datetime": "2001-05-15 19:00" },
         interfaces: [ nsIAccessibleText, nsIAccessibleHyperText ]
       };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/tests/mochitest/role/test_aria.html firefox-trunk-41.0~a1~hg20150524r245419/accessible/tests/mochitest/role/test_aria.html
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/tests/mochitest/role/test_aria.html	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/tests/mochitest/role/test_aria.html	2015-05-25 20:42:35.000000000 +0000
@@ -39,7 +39,7 @@
       testRole("aria_list", ROLE_LIST);
       testRole("aria_listbox", ROLE_LISTBOX);
       testRole("aria_listitem", ROLE_LISTITEM);
-      testRole("aria_log", ROLE_TEXT_CONTAINER); // weak role
+      testRole("aria_log", ROLE_TEXT); // weak role
       testRole("aria_marquee", ROLE_ANIMATION);
       testRole("aria_math", ROLE_FLAT_EQUATION);
       testRole("aria_menu", ROLE_MENUPOPUP);
@@ -48,7 +48,7 @@
       testRole("aria_menuitemcheckbox", ROLE_CHECK_MENU_ITEM);
       testRole("aria_menuitemradio", ROLE_RADIO_MENU_ITEM);
       testRole("aria_note", ROLE_NOTE);
-      testRole("aria_presentation", ROLE_TEXT_CONTAINER); // weak role
+      testRole("aria_presentation", ROLE_TEXT); // weak role
       testRole("aria_progressbar", ROLE_PROGRESSBAR);
       testRole("aria_radio", ROLE_RADIOBUTTON);
       testRole("aria_radiogroup", ROLE_RADIO_GROUP);
@@ -66,7 +66,7 @@
       testRole("aria_tablist", ROLE_PAGETABLIST);
       testRole("aria_tabpanel", ROLE_PROPERTYPAGE);
       testRole("aria_textbox", ROLE_ENTRY);
-      testRole("aria_timer", ROLE_TEXT_CONTAINER); // weak role
+      testRole("aria_timer", ROLE_TEXT); // weak role
       testRole("aria_toolbar", ROLE_TOOLBAR);
       testRole("aria_tooltip", ROLE_TOOLTIP);
       testRole("aria_tree", ROLE_OUTLINE);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/tests/mochitest/role/test_general.html firefox-trunk-41.0~a1~hg20150524r245419/accessible/tests/mochitest/role/test_general.html
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/tests/mochitest/role/test_general.html	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/tests/mochitest/role/test_general.html	2015-05-25 20:42:35.000000000 +0000
@@ -67,9 +67,9 @@
       testRole("definitiondescription", ROLE_DEFINITION);
 
       // Has click, mousedown or mouseup listeners.
-      testRole("span1", ROLE_TEXT_CONTAINER);
-      testRole("span2", ROLE_TEXT_CONTAINER);
-      testRole("span3", ROLE_TEXT_CONTAINER);
+      testRole("span1", ROLE_TEXT);
+      testRole("span2", ROLE_TEXT);
+      testRole("span3", ROLE_TEXT);
 
       // Test role of listbox inside combobox
       testRole("listbox1", ROLE_COMBOBOX_LIST);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/tests/mochitest/role.js firefox-trunk-41.0~a1~hg20150524r245419/accessible/tests/mochitest/role.js
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/tests/mochitest/role.js	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/tests/mochitest/role.js	2015-05-25 20:42:35.000000000 +0000
@@ -111,6 +111,7 @@
 const ROLE_SWITCH = nsIAccessibleRole.ROLE_SWITCH;
 const ROLE_TABLE = nsIAccessibleRole.ROLE_TABLE;
 const ROLE_TERM = nsIAccessibleRole.ROLE_TERM;
+const ROLE_TEXT = nsIAccessibleRole.ROLE_TEXT;
 const ROLE_TEXT_CONTAINER = nsIAccessibleRole.ROLE_TEXT_CONTAINER;
 const ROLE_TEXT_LEAF = nsIAccessibleRole.ROLE_TEXT_LEAF;
 const ROLE_TOGGLE_BUTTON = nsIAccessibleRole.ROLE_TOGGLE_BUTTON;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/tests/mochitest/tree/test_aria_list.html firefox-trunk-41.0~a1~hg20150524r245419/accessible/tests/mochitest/tree/test_aria_list.html
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/tests/mochitest/tree/test_aria_list.html	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/tests/mochitest/tree/test_aria_list.html	2015-05-25 20:42:35.000000000 +0000
@@ -35,7 +35,7 @@
         role: ROLE_LIST,
         children: [
           { // li
-            role: ROLE_PARAGRAPH,
+            role: ROLE_TEXT_CONTAINER,
             children: [
               { // li text leaf
                 role: ROLE_TEXT_LEAF,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/tests/mochitest/tree/test_aria_presentation.html firefox-trunk-41.0~a1~hg20150524r245419/accessible/tests/mochitest/tree/test_aria_presentation.html
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/tests/mochitest/tree/test_aria_presentation.html	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/tests/mochitest/tree/test_aria_presentation.html	2015-05-25 20:42:35.000000000 +0000
@@ -73,10 +73,10 @@
     // Presentation list, expose generic accesisble for list items.
     tree =
       { SECTION: [ // container
-        { PARAGRAPH: [ // li generic accessible inside 'presentation' role
+        { TEXT_CONTAINER: [ // li generic accessible inside 'presentation' role
           { TEXT_LEAF: [ ] } // li text
         ] },
-        { PARAGRAPH: [ // li generic accessible inside 'none' role
+        { TEXT_CONTAINER: [ // li generic accessible inside 'none' role
           { TEXT_LEAF: [ ] } // li text
         ] }
       ] };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/tests/mochitest/tree/test_dockids.html firefox-trunk-41.0~a1~hg20150524r245419/accessible/tests/mochitest/tree/test_dockids.html
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/tests/mochitest/tree/test_dockids.html	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/tests/mochitest/tree/test_dockids.html	2015-05-25 20:42:35.000000000 +0000
@@ -20,15 +20,15 @@
   {
     var tree =
      { DOCUMENT: [
-       { PARAGRAPH: [ // head
-         { PARAGRAPH: [ // link
+       { TEXT_CONTAINER: [ // head
+         { TEXT_CONTAINER: [ // link
            { STATICTEXT: [] }, // generated content
            { STATICTEXT: [] } // generated content
          ] }
        ] },
        { TEXT_LEAF: [ ] }, // body text
        { ENTRY: [ ] }, // input under document element
-       { PARAGRAPH: [ // link under document element
+       { TEXT_CONTAINER: [ // link under document element
          { TEXT_LEAF: [ ] }, // link content
          { STATICTEXT: [ ] }, // generated content
          { STATICTEXT: [ ] } // generated content
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/tests/mochitest/tree/test_invalid_img.xhtml firefox-trunk-41.0~a1~hg20150524r245419/accessible/tests/mochitest/tree/test_invalid_img.xhtml
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/tests/mochitest/tree/test_invalid_img.xhtml	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/tests/mochitest/tree/test_invalid_img.xhtml	2015-05-25 20:42:35.000000000 +0000
@@ -20,7 +20,7 @@
       document.getElementsByTagName("img")[0].firstChild.data = "2";
 
       var accTree = {
-        role: ROLE_TEXT_CONTAINER,
+        role: ROLE_TEXT,
         children: [ { role: ROLE_TEXT_LEAF } ]
       };
       testAccessibleTree("the_img", accTree);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/tests/mochitest/tree/test_txtcntr.html firefox-trunk-41.0~a1~hg20150524r245419/accessible/tests/mochitest/tree/test_txtcntr.html
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/tests/mochitest/tree/test_txtcntr.html	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/tests/mochitest/tree/test_txtcntr.html	2015-05-25 20:42:35.000000000 +0000
@@ -120,7 +120,7 @@
             children: []
           },
           { // abbr tag
-            role: ROLE_TEXT_CONTAINER,
+            role: ROLE_TEXT,
             name: "accessibility",
             children: [
               { // text leaf with actual text
@@ -150,7 +150,7 @@
             children: []
           },
           { // acronym tag
-            role: ROLE_TEXT_CONTAINER,
+            role: ROLE_TEXT,
             name: "personal computer",
             children: [
               { // text leaf with actual text
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/tests/mochitest/treeupdate/test_textleaf.html firefox-trunk-41.0~a1~hg20150524r245419/accessible/tests/mochitest/treeupdate/test_textleaf.html
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/tests/mochitest/treeupdate/test_textleaf.html	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/tests/mochitest/treeupdate/test_textleaf.html	2015-05-25 20:42:35.000000000 +0000
@@ -84,7 +84,7 @@
       }
     }
 
-    function removeTextData(aID)
+    function removeTextData(aID, aRole)
     {
       this.containerNode = getNode(aID);
       this.textNode = this.containerNode.firstChild;
@@ -96,7 +96,7 @@
       this.invoke = function removeTextData_invoke()
       {
         var tree = {
-          role: ROLE_PARAGRAPH,
+          role: aRole,
           children: [
             {
               role: ROLE_TEXT_LEAF,
@@ -112,7 +112,7 @@
       this.finalCheck = function removeTextData_finalCheck()
       {
         var tree = {
-          role: ROLE_PARAGRAPH,
+          role: aRole,
           children: []
         };
         testAccessibleTree(this.containerNode, tree);
@@ -147,8 +147,8 @@
       gQueue.push(new setOnClickNRoleAttrs("span"));
 
       // text data removal of text node should remove its text accessible
-      gQueue.push(new removeTextData("p"));
-      gQueue.push(new removeTextData("pre"));
+      gQueue.push(new removeTextData("p", ROLE_PARAGRAPH));
+      gQueue.push(new removeTextData("pre", ROLE_TEXT_CONTAINER));
 
       gQueue.invoke(); // SimpleTest.finish() will be called in the end
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/windows/msaa/nsWinUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/accessible/windows/msaa/nsWinUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/windows/msaa/nsWinUtils.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/windows/msaa/nsWinUtils.cpp	2015-05-25 20:42:35.000000000 +0000
@@ -149,7 +149,10 @@
   switch (msg) {
     case WM_GETOBJECT:
     {
-      if (lParam == OBJID_CLIENT) {
+      // Do explicit casting to make it working on 64bit systems (see bug 649236
+      // for details).
+      int32_t objId = static_cast<DWORD>(lParam);
+      if (objId == OBJID_CLIENT) {
         DocAccessible* document =
           nsWinUtils::sHWNDCache->GetWeak(static_cast<void*>(hWnd));
         if (document) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/windows/msaa/Platform.cpp firefox-trunk-41.0~a1~hg20150524r245419/accessible/windows/msaa/Platform.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/windows/msaa/Platform.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/windows/msaa/Platform.cpp	2015-05-25 20:42:35.000000000 +0000
@@ -58,3 +58,13 @@
 a11y::ProxyEvent(ProxyAccessible*, uint32_t)
 {
 }
+
+void
+a11y::ProxyStateChangeEvent(ProxyAccessible*, uint64_t, bool)
+{
+}
+
+void
+a11y::ProxyCaretMoveEvent(ProxyAccessible* aTarget, int32_t aOffset)
+{
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/accessible/windows/sdn/sdnAccessible.cpp firefox-trunk-41.0~a1~hg20150524r245419/accessible/windows/sdn/sdnAccessible.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/accessible/windows/sdn/sdnAccessible.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/accessible/windows/sdn/sdnAccessible.cpp	2015-05-25 20:42:35.000000000 +0000
@@ -106,8 +106,11 @@
   // focus events, to correlate back to data nodes in their internal object
   // model.
   Accessible* accessible = GetAccessible();
-  *aUniqueID = - NS_PTR_TO_INT32(accessible ? accessible->UniqueID() :
-                                              static_cast<void*>(this));
+  if (accessible) {
+    *aUniqueID = AccessibleWrap::GetChildIDFor(accessible);
+  } else {
+    *aUniqueID = - NS_PTR_TO_INT32(static_cast<void*>(this));
+  }
 
   *aNumChildren = mNode->GetChildCount();
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/addon-sdk/source/lib/sdk/net/url.js firefox-trunk-41.0~a1~hg20150524r245419/addon-sdk/source/lib/sdk/net/url.js
--- firefox-trunk-41.0~a1~hg20150513r243603/addon-sdk/source/lib/sdk/net/url.js	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/addon-sdk/source/lib/sdk/net/url.js	2015-05-25 20:42:36.000000000 +0000
@@ -35,19 +35,14 @@
   options = options || {};
   let charset = options.charset || 'UTF-8';
 
-  let channel = NetUtil.newChannel2(uri,
-                                    charset,
-                                    null,
-                                    null,      // aLoadingNode
-                                    Services.scriptSecurityManager.getSystemPrincipal(),
-                                    null,      // aTriggeringPrincipal
-                                    Ci.nsILoadInfo.SEC_NORMAL,
-                                    Ci.nsIContentPolicy.TYPE_OTHER);
+  let channel = NetUtil.newChannel({
+    uri: NetUtil.newURI(uri, charset),
+    loadUsingSystemPrincipal: true});
 
   let { promise, resolve, reject } = defer();
 
   try {
-    NetUtil.asyncFetch2(channel, function (stream, result) {
+    NetUtil.asyncFetch(channel, function (stream, result) {
       if (components.isSuccessCode(result)) {
         let count = stream.available();
         let data = NetUtil.readInputStreamToString(stream, count, { charset : charset });
@@ -83,14 +78,9 @@
 function readURISync(uri, charset) {
   charset = typeof charset === "string" ? charset : "UTF-8";
 
-  let channel = NetUtil.newChannel2(uri,
-                                    charset,
-                                    null,
-                                    null,      // aLoadingNode
-                                    Services.scriptSecurityManager.getSystemPrincipal(),
-                                    null,      // aTriggeringPrincipal
-                                    Ci.nsILoadInfo.SEC_NORMAL,
-                                    Ci.nsIContentPolicy.TYPE_OTHER);
+  let channel = NetUtil.newChannel({
+    uri: NetUtil.newURI(uri, charset),
+    loadUsingSystemPrincipal: true});
   let stream = channel.open();
 
   let count = stream.available();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/addon-sdk/source/lib/sdk/url.js firefox-trunk-41.0~a1~hg20150524r245419/addon-sdk/source/lib/sdk/url.js
--- firefox-trunk-41.0~a1~hg20150513r243603/addon-sdk/source/lib/sdk/url.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/addon-sdk/source/lib/sdk/url.js	2015-05-25 20:42:37.000000000 +0000
@@ -152,20 +152,28 @@
 
   Object.defineProperties(this, {
     toString: {
-      value() new String(uri.spec).toString(),
+      value() {
+        return new String(uri.spec).toString();
+      },
       enumerable: false
     },
     valueOf: {
-      value() new String(uri.spec).valueOf(),
+      value() {
+        return new String(uri.spec).valueOf();
+      },
       enumerable: false
     },
     toSource: {
-      value() new String(uri.spec).toSource(),
+      value() {
+        return new String(uri.spec).toSource();
+      },
       enumerable: false
     },
     // makes more sense to flatten to string, easier to travel across JSON
     toJSON: {
-      value() new String(uri.spec).toString(),
+      value() {
+        return new String(uri.spec).toString();
+      },
       enumerable: false
     }
   });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/addon-sdk/source/lib/toolkit/loader.js firefox-trunk-41.0~a1~hg20150524r245419/addon-sdk/source/lib/toolkit/loader.js
--- firefox-trunk-41.0~a1~hg20150513r243603/addon-sdk/source/lib/toolkit/loader.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/addon-sdk/source/lib/toolkit/loader.js	2015-05-25 20:42:37.000000000 +0000
@@ -178,14 +178,10 @@
     uri = proto.resolveURI(nsURI);
   }
 
-  let stream = NetUtil.newChannel2(uri,
-                                   'UTF-8',
-                                   null,
-                                   null,      // aLoadingNode
-                                   systemPrincipal,
-                                   null,      // aTriggeringPrincipal
-                                   Ci.nsILoadInfo.SEC_NORMAL,
-                                   Ci.nsIContentPolicy.TYPE_OTHER).open();
+  let stream = NetUtil.newChannel({
+    uri: NetUtil.newURI(uri, 'UTF-8'),
+    loadUsingSystemPrincipal: true}
+  ).open();
   let count = stream.available();
   let data = NetUtil.readInputStreamToString(stream, count, {
     charset: 'UTF-8'
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/app/b2g.js firefox-trunk-41.0~a1~hg20150524r245419/b2g/app/b2g.js
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/app/b2g.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/app/b2g.js	2015-05-25 20:42:39.000000000 +0000
@@ -88,7 +88,6 @@
 pref("network.cookie.cookieBehavior", 0);
 
 // spdy
-pref("network.http.spdy.enabled.http2draft", true);
 pref("network.http.spdy.push-allowance", 32768);
 
 // See bug 545869 for details on why these are set the way they are
@@ -740,13 +739,9 @@
 pref("hal.processPriorityManager.gonk.FOREGROUND_KEYBOARD.cgroup", "apps");
 
 pref("hal.processPriorityManager.gonk.BACKGROUND_PERCEIVABLE.OomScoreAdjust", 400);
-pref("hal.processPriorityManager.gonk.BACKGROUND_PERCEIVABLE.KillUnderKB", 7168);
+pref("hal.processPriorityManager.gonk.BACKGROUND_PERCEIVABLE.KillUnderKB", 8192);
 pref("hal.processPriorityManager.gonk.BACKGROUND_PERCEIVABLE.cgroup", "apps/bg_perceivable");
 
-pref("hal.processPriorityManager.gonk.BACKGROUND_HOMESCREEN.OomScoreAdjust", 534);
-pref("hal.processPriorityManager.gonk.BACKGROUND_HOMESCREEN.KillUnderKB", 8192);
-pref("hal.processPriorityManager.gonk.BACKGROUND_HOMESCREEN.cgroup", "apps/bg_non_interactive");
-
 pref("hal.processPriorityManager.gonk.BACKGROUND.OomScoreAdjust", 667);
 pref("hal.processPriorityManager.gonk.BACKGROUND.KillUnderKB", 20480);
 pref("hal.processPriorityManager.gonk.BACKGROUND.cgroup", "apps/bg_non_interactive");
@@ -804,13 +799,11 @@
 // blocked on a poll(), and this pref has no effect.)
 pref("gonk.systemMemoryPressureRecoveryPollMS", 5000);
 
-#ifndef DEBUG
 // Enable pre-launching content processes for improved startup time
 // (hiding latency).
 pref("dom.ipc.processPrelaunch.enabled", true);
 // Wait this long before pre-launching a new subprocess.
 pref("dom.ipc.processPrelaunch.delayMs", 5000);
-#endif
 
 pref("dom.ipc.reuse_parent_app", false);
 
@@ -991,7 +984,7 @@
 pref("gfx.gralloc.fence-with-readpixels", true);
 
 // The url of the page used to display network error details.
-pref("b2g.neterror.url", "app://system.gaiamobile.org/net_error.html");
+pref("b2g.neterror.url", "net_error.html");
 
 // The origin used for the shared themes uri space.
 pref("b2g.theme.origin", "app://theme.gaiamobile.org");
@@ -1140,3 +1133,6 @@
 // mulet apparently loads firefox.js as well as b2g.js, so we have to explicitly
 // disable serviceworkers here to get them disabled in mulet.
 pref("dom.serviceWorkers.enabled", false);
+
+// Retain at most 10 processes' layers buffers
+pref("layers.compositor-lru-size", 10);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/app/B2GLoader.cpp firefox-trunk-41.0~a1~hg20150524r245419/b2g/app/B2GLoader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/app/B2GLoader.cpp	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/app/B2GLoader.cpp	2015-05-25 20:42:39.000000000 +0000
@@ -219,6 +219,13 @@
                                     aReservedFds);
   }
 
+  // Reap zombie child process.
+  struct sigaction sa;
+  sa.sa_handler = SIG_IGN;
+  sigemptyset(&sa.sa_mask);
+  sa.sa_flags = 0;
+  sigaction(SIGCHLD, &sa, nullptr);
+
   // The b2g process
   int childPid = pid;
   XRE_ProcLoaderClientInit(childPid, parentSock, aReservedFds);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/chrome/content/shell.js firefox-trunk-41.0~a1~hg20150524r245419/b2g/chrome/content/shell.js
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/chrome/content/shell.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/chrome/content/shell.js	2015-05-25 20:42:39.000000000 +0000
@@ -636,7 +636,27 @@
       }
       delete shell.pendingChromeEvents;
     });
-  }
+
+    shell.handleCmdLine();
+  },
+
+  handleCmdLine: function shell_handleCmdLine() {
+#ifndef MOZ_WIDGET_GONK
+    let b2gcmds = Cc["@mozilla.org/commandlinehandler/general-startup;1?type=b2gcmds"]
+                    .getService(Ci.nsISupports);
+    let args = b2gcmds.wrappedJSObject.cmdLine;
+    try {
+      // Returns null if -url is not present
+      let url = args.handleFlagWithParam("url", false);
+      if (url) {
+        this.sendChromeEvent({type: "mozbrowseropenwindow", url});
+        args.preventDefault = true;
+      }
+    } catch(e) {
+      // Throws if -url is present with no params
+    }
+#endif
+  },
 };
 
 Services.obs.addObserver(function onFullscreenOriginChange(subject, topic, data) {
@@ -1086,7 +1106,12 @@
 
   // We must set the size in KB, and keep a bit of free space.
   let size = Math.floor(stats.totalBytes / 1024) - 1024;
-  Services.prefs.setIntPref("browser.cache.disk.capacity", size);
+
+  // keep the default value if it is smaller than the physical partition size.
+  let oldSize = Services.prefs.getIntPref("browser.cache.disk.capacity");
+  if (size < oldSize) {
+    Services.prefs.setIntPref("browser.cache.disk.capacity", size);
+  }
 })();
 #endif
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/components/AboutServiceWorkers.jsm firefox-trunk-41.0~a1~hg20150524r245419/b2g/components/AboutServiceWorkers.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/components/AboutServiceWorkers.jsm	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/components/AboutServiceWorkers.jsm	2015-05-25 20:42:39.000000000 +0000
@@ -4,7 +4,7 @@
 
 "use strict"
 
-this.EXPORTED_SYMBOLS = [];
+this.EXPORTED_SYMBOLS = ["AboutServiceWorkers"];
 
 const { interfaces: Ci, utils: Cu } = Components;
 
@@ -47,19 +47,6 @@
   return result;
 }
 
-function sendResult(aId, aResult) {
-  SystemAppProxy._sendCustomEvent("mozAboutServiceWorkersChromeEvent", {
-    id: aId,
-    result: aResult
-  });
-}
-
-function sendError(aId, aError) {
-  SystemAppProxy._sendCustomEvent("mozAboutServiceWorkersChromeEvent", {
-    id: aId,
-    error: aError
-  });
-}
 
 this.AboutServiceWorkers = {
   get enabled() {
@@ -75,7 +62,21 @@
 
   init: function() {
     SystemAppProxy.addEventListener("mozAboutServiceWorkersContentEvent",
-                                   AboutServiceWorkers);
+                                    AboutServiceWorkers);
+  },
+
+  sendResult: function(aId, aResult) {
+    SystemAppProxy._sendCustomEvent("mozAboutServiceWorkersChromeEvent", {
+      id: aId,
+      result: aResult
+    });
+  },
+
+  sendError: function(aId, aError) {
+    SystemAppProxy._sendCustomEvent("mozAboutServiceWorkersChromeEvent", {
+      id: aId,
+      error: aError
+    });
   },
 
   handleEvent: function(aEvent) {
@@ -88,10 +89,12 @@
       return;
     }
 
+    let self = AboutServiceWorkers;
+
     switch(message.name) {
       case "init":
-        if (!this.enabled) {
-          sendResult({
+        if (!self.enabled) {
+          self.sendResult(message.id, {
             enabled: false,
             registrations: []
           });
@@ -100,7 +103,7 @@
 
         let data = gServiceWorkerManager.getAllRegistrations();
         if (!data) {
-          sendError(message.id, "NoServiceWorkersRegistrations");
+          self.sendError(message.id, "NoServiceWorkersRegistrations");
           return;
         }
 
@@ -116,26 +119,26 @@
           registrations.push(serializeServiceWorkerInfo(info));
         }
 
-        sendResult(message.id, {
-          enabled: this.enabled,
+        self.sendResult(message.id, {
+          enabled: self.enabled,
           registrations: registrations
         });
         break;
 
       case "update":
         if (!message.scope) {
-          sendError(message.id, "MissingScope");
+          self.sendError(message.id, "MissingScope");
           return;
         }
-        gServiceWorkerManager.update(message.scope);
-        sendResult(message.id, true);
+        gServiceWorkerManager.softUpdate(message.scope);
+        self.sendResult(message.id, true);
         break;
 
       case "unregister":
         if (!message.principal ||
             !message.principal.origin ||
             !message.principal.appId) {
-          sendError("MissingPrincipal");
+          self.sendError("MissingPrincipal");
           return;
         }
 
@@ -146,17 +149,17 @@
         );
 
         if (!message.scope) {
-          sendError("MissingScope");
+          self.sendError("MissingScope");
           return;
         }
 
         let serviceWorkerUnregisterCallback = {
           unregisterSucceeded: function() {
-            sendResult(message.id, true);
+            self.sendResult(message.id, true);
           },
 
           unregisterFailed: function() {
-            sendError(message.id, "UnregisterError");
+            self.sendError(message.id, "UnregisterError");
           },
 
           QueryInterface: XPCOMUtils.generateQI([
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/components/AlertsHelper.jsm firefox-trunk-41.0~a1~hg20150524r245419/b2g/components/AlertsHelper.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/components/AlertsHelper.jsm	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/components/AlertsHelper.jsm	2015-05-25 20:42:39.000000000 +0000
@@ -232,7 +232,7 @@
   },
 
   showNotification: function(imageURL, title, text, textClickable, cookie,
-                             uid, bidi, lang, dataObj, manifestURL, timestamp,
+                             uid, dir, lang, dataObj, manifestURL, timestamp,
                              behavior) {
     function send(appName, appIcon) {
       SystemAppProxy._sendCustomEvent(kMozChromeNotificationEvent, {
@@ -241,7 +241,7 @@
         icon: imageURL,
         title: title,
         text: text,
-        bidi: bidi,
+        dir: dir,
         lang: lang,
         appName: appName,
         appIcon: appIcon,
@@ -276,7 +276,7 @@
     let dataObj = this.deserializeStructuredClone(data.dataStr);
     this.registerListener(data.name, data.cookie, data.alertListener);
     this.showNotification(data.imageURL, data.title, data.text,
-                          data.textClickable, data.cookie, data.name, data.bidi,
+                          data.textClickable, data.cookie, data.name, data.dir,
                           data.lang, dataObj, null, data.inPrivateBrowsing);
   },
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/components/B2GAboutRedirector.js firefox-trunk-41.0~a1~hg20150524r245419/b2g/components/B2GAboutRedirector.js
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/components/B2GAboutRedirector.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/components/B2GAboutRedirector.js	2015-05-25 20:42:39.000000000 +0000
@@ -12,11 +12,11 @@
 }
 
 function netErrorURL() {
-  let uri = "app://system.gaiamobile.org/net_error.html";
-  try {
-    uri = Services.prefs.getCharPref("b2g.neterror.url");
-  } catch(e) {}
-  return uri;
+  let systemManifestURL = Services.prefs.getCharPref("b2g.system_manifest_url");
+  systemManifestURL = Services.io.newURI(systemManifestURL, null, null);
+  let netErrorURL = Services.prefs.getCharPref("b2g.neterror.url");
+  netErrorURL = Services.io.newURI(netErrorURL, null, systemManifestURL);
+  return netErrorURL.spec;
 }
 
 let modules = {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/components/CommandLine.js firefox-trunk-41.0~a1~hg20150524r245419/b2g/components/CommandLine.js
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/components/CommandLine.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/components/CommandLine.js	2015-05-25 20:42:39.000000000 +0000
@@ -15,6 +15,10 @@
 CommandlineHandler.prototype = {
     handle: function(cmdLine) {
       this.cmdLine = cmdLine;
+      let win = Services.wm.getMostRecentWindow("navigator:browser");
+      if (win && win.shell) {
+        win.shell.handleCmdLine();
+      }
     },
 
     helpInfo: "",
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/components/test/mochitest/screenshot_helper.js firefox-trunk-41.0~a1~hg20150524r245419/b2g/components/test/mochitest/screenshot_helper.js
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/components/test/mochitest/screenshot_helper.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/components/test/mochitest/screenshot_helper.js	2015-05-25 20:42:40.000000000 +0000
@@ -1,6 +1,8 @@
 const Cu = Components.utils;
 const Ci = Components.interfaces;
 
+Cu.importGlobalProperties(['File']);
+
 const { Services } = Cu.import("resource://gre/modules/Services.jsm");
 
 // Load a duplicated copy of the jsm to prevent messing with the currently running one
@@ -25,7 +27,7 @@
 let steps = [
   function getScreenshot() {
     let screenshot = Screenshot.get();
-    assert.ok(screenshot instanceof Ci.nsIDOMFile,
+    assert.ok(screenshot instanceof File,
               "Screenshot.get() returns a File");
     next();
   },
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/components/test/unit/test_aboutserviceworkers.js firefox-trunk-41.0~a1~hg20150524r245419/b2g/components/test/unit/test_aboutserviceworkers.js
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/components/test/unit/test_aboutserviceworkers.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/components/test/unit/test_aboutserviceworkers.js	2015-05-25 20:42:40.000000000 +0000
@@ -0,0 +1,139 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const {utils: Cu} = Components;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "AboutServiceWorkers",
+  "resource://gre/modules/AboutServiceWorkers.jsm");
+
+XPCOMUtils.defineLazyServiceGetter(this, "gServiceWorkerManager",
+                                   "@mozilla.org/serviceworkers/manager;1",
+                                   "nsIServiceWorkerManager");
+
+const CHROME_MSG = "mozAboutServiceWorkersChromeEvent";
+
+const ORIGINAL_SENDRESULT = AboutServiceWorkers.sendResult;
+const ORIGINAL_SENDERROR = AboutServiceWorkers.sendError;
+
+do_get_profile();
+
+let mockSendResult = (aId, aResult) => {
+  let msg = {
+    id: aId,
+    result: aResult
+  };
+  Services.obs.notifyObservers({wrappedJSObject: msg}, CHROME_MSG, null);
+};
+
+let mockSendError = (aId, aError) => {
+  let msg = {
+    id: aId,
+    result: aError
+  };
+  Services.obs.notifyObservers({wrappedJSObject: msg}, CHROME_MSG, null);
+};
+
+function attachMocks() {
+  AboutServiceWorkers.sendResult = mockSendResult;
+  AboutServiceWorkers.sendError = mockSendError;
+}
+
+function restoreMocks() {
+  AboutServiceWorkers.sendResult = ORIGINAL_SENDRESULT;
+  AboutServiceWorkers.sendError = ORIGINAL_SENDERROR;
+}
+
+do_register_cleanup(restoreMocks);
+
+function run_test() {
+  run_next_test();
+}
+
+/**
+ * "init" tests
+ */
+[
+// Pref disabled, no registrations
+{
+  prefEnabled: false,
+  expectedMessage: {
+    id: Date.now(),
+    result: {
+      enabled: false,
+      registrations: []
+    }
+  }
+},
+// Pref enabled, no registrations
+{
+  prefEnabled: true,
+  expectedMessage: {
+    id: Date.now(),
+    result: {
+      enabled: true,
+      registrations: []
+    }
+  }
+}].forEach(test => {
+  add_test(function() {
+    Services.prefs.setBoolPref("dom.serviceWorkers.enabled", test.prefEnabled);
+
+    let id = test.expectedMessage.id;
+
+    function onMessage(subject, topic, data) {
+      let message = subject.wrappedJSObject;
+      let expected = test.expectedMessage;
+
+      do_check_true(message.id, "Message should have id");
+      do_check_eq(message.id, test.expectedMessage.id,
+                  "Id should be the expected one");
+      do_check_eq(message.result.enabled, expected.result.enabled,
+                  "Pref should be disabled");
+      do_check_true(message.result.registrations, "Registrations should exist");
+      do_check_eq(message.result.registrations.length,
+                  expected.result.registrations.length,
+                  "Registrations length should be the expected one");
+
+      Services.obs.removeObserver(onMessage, CHROME_MSG);
+
+      run_next_test();
+    }
+
+    Services.obs.addObserver(onMessage, CHROME_MSG, false);
+
+    attachMocks();
+
+    AboutServiceWorkers.handleEvent({ detail: {
+      id: id,
+      name: "init"
+    }});
+  });
+});
+
+/**
+ * ServiceWorkerManager tests.
+ */
+
+// We cannot register a sw via ServiceWorkerManager cause chrome
+// registrations are not allowed.
+// All we can do for now is to test the interface of the swm.
+add_test(function test_swm() {
+  do_check_true(gServiceWorkerManager, "SWM exists");
+  do_check_true(gServiceWorkerManager.getAllRegistrations,
+                "SWM.getAllRegistrations exists");
+  do_check_true(typeof gServiceWorkerManager.getAllRegistrations == "function",
+                "SWM.getAllRegistrations is a function");
+  do_check_true(gServiceWorkerManager.softUpdate, "SWM.softUpdate exists");
+  do_check_true(typeof gServiceWorkerManager.softUpdate == "function",
+                "SWM.softUpdate is a function");
+  do_check_true(gServiceWorkerManager.unregister, "SWM.unregister exists");
+  do_check_true(typeof gServiceWorkerManager.unregister == "function",
+                "SWM.unregister exists");
+
+  run_next_test();
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/components/test/unit/test_logshake_gonk.js firefox-trunk-41.0~a1~hg20150524r245419/b2g/components/test/unit/test_logshake_gonk.js
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/components/test/unit/test_logshake_gonk.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/components/test/unit/test_logshake_gonk.js	2015-05-25 20:42:40.000000000 +0000
@@ -52,8 +52,6 @@
   let vol = volumeService.getVolumeByName(volName);
   ok(vol, "volume shouldn't be null");
   equal(volName, vol.name, "name");
-
-  volumeService.SetFakeVolumeState(volName, Ci.nsIVolume.STATE_MOUNTED);
   equal(Ci.nsIVolume.STATE_MOUNTED, vol.state, "state");
 
   run_next_test();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/components/test/unit/xpcshell.ini firefox-trunk-41.0~a1~hg20150524r245419/b2g/components/test/unit/xpcshell.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/components/test/unit/xpcshell.ini	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/components/test/unit/xpcshell.ini	2015-05-25 20:42:40.000000000 +0000
@@ -28,3 +28,5 @@
 [test_logshake_gonk.js]
 # only run on b2g builds due to requiring b2g-specific log files to exist
 skip-if = (toolkit != "gonk")
+
+[test_aboutserviceworkers.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/aries/config.json firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/aries/config.json
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/aries/config.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/aries/config.json	2015-05-25 20:42:40.000000000 +0000
@@ -0,0 +1,47 @@
+{
+    "config_version": 2,
+    "tooltool_manifest": "releng-aries.tt",
+    "mock_target": "mozilla-centos6-x86_64",
+    "mock_packages": ["ccache", "make", "bison", "flex", "gcc", "g++", "mpfr", "zlib-devel", "ncurses-devel", "zip", "autoconf213", "glibc-static", "perl-Digest-SHA", "wget", "alsa-lib", "atk", "cairo", "dbus-glib", "fontconfig", "freetype", "glib2", "gtk2", "libXRender", "libXt", "pango", "mozilla-python27-mercurial", "openssh-clients", "nss-devel", "glibc-devel.i686", "libstdc++.i686", "zlib-devel.i686", "ncurses-devel.i686", "libX11-devel.i686", "mesa-libGL-devel.i686", "mesa-libGL-devel", "libX11-devel", "git", "libxml2", "dosfstools"],
+    "mock_files": [["/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"]],
+    "build_targets": [],
+    "upload_files": [
+        "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
+        "{objdir}/dist/b2g-*.tar.gz",
+        "{workdir}/sources.xml"
+    ],
+    "public_upload_files": [
+        "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
+        "{objdir}/dist/b2g-*.tar.gz",
+        "{workdir}/sources.xml",
+        "{objdir}/dist/b2g-update/*.mar"
+    ],
+    "zip_files": [
+        ["{workdir}/out/target/product/aries/*.img", "out/target/product/aries/"],
+        "{workdir}/flash.sh",
+        "{workdir}/load-config.sh",
+        "{workdir}/.config",
+        "{workdir}/sources.xml",
+        "{workdir}/profile.sh",
+        ["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"],
+        ["{workdir}/scripts/profile-symbolicate.py", "scripts/"],
+        ["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"]
+    ],
+    "env": {
+        "VARIANT": "user",
+        "MOZILLA_OFFICIAL": "1",
+        "MOZ_TELEMETRY_REPORTING": "1",
+        "B2G_UPDATE_CHANNEL": "nightly",
+        "GAIA_KEYBOARD_LAYOUTS": "en,pt-BR,es,de,fr,pl,zh-Hans-Pinyin,zh-Hant-Zhuyin,en-Dvorak"
+    },
+    "b2g_manifest": "aries.xml",
+    "b2g_manifest_intree": true,
+    "additional_source_tarballs": ["backup-aries.tar.xz"],
+    "gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
+    "gaia": {
+        "l10n": {
+            "vcs": "hgtool",
+            "root": "https://hg.mozilla.org/gaia-l10n"
+        }
+    }
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/aries/releng-aries.tt firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/aries/releng-aries.tt
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/aries/releng-aries.tt	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/aries/releng-aries.tt	2015-05-25 20:42:40.000000000 +0000
@@ -0,0 +1,16 @@
+[
+{
+"size": 135359412,
+"digest": "45e677c9606cc4eec44ef4761df47ff431df1ffad17a5c6d21ce700a1c47f79e87a4aa9f30ae47ff060bd64f5b775d995780d88211f9a759ffa0d076beb4816b",
+"algorithm": "sha512",
+"filename": "backup-aries.tar.xz",
+"comment": "v18D"
+},
+{
+"size": 80458572,
+"digest": "e5101f9dee1e462f6cbd3897ea57eede41d23981825c7b20d91d23ab461875d54d3dfc24999aa58a31e8b01f49fb3140e05ffe5af2957ef1d1afb89fd0dfe1ad",
+"algorithm": "sha512",
+"filename": "gcc.tar.xz",
+"unpack": "True"
+}
+]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/aries/sources.xml firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/aries/sources.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/aries/sources.xml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/aries/sources.xml	2015-05-25 20:42:40.000000000 +0000
@@ -0,0 +1,157 @@
+<?xml version="1.0" ?><manifest>
+  <!--original fetch url was https://android.googlesource.com/-->
+  <remote fetch="https://git.mozilla.org/external/aosp" name="aosp"/>
+  <!--original fetch url was git://github.com/mozilla-b2g/-->
+  <remote fetch="https://git.mozilla.org/b2g" name="b2g"/>
+  <!--original fetch url was git://github.com/mozilla/-->
+  <remote fetch="https://git.mozilla.org/b2g" name="mozilla"/>
+  <!--original fetch url was git://github.com/apitrace/-->
+  <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
+  <!--original fetch url was git://codeaurora.org/-->
+  <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
+  <!--original fetch url was https://git.mozilla.org/releases-->
+  <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
+  <!-- B2G specific things. -->
+  <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
+    <copyfile dest="Makefile" src="core/root.mk"/>
+  </project>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5bcc08a732163087999251b523e3643db397412c"/>
+  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="fffc68521ebb1501d6b015c6d1c4a17a04fdb2e2"/>
+  <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="46da1a05ac04157669685246d70ac59d48699c9e"/>
+  <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
+  <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
+  <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="53517af1f57810bef745f03602f407161a475d76"/>
+  <!-- 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"/>
+  <project groups="linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.7" path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.7" revision="8b880805d454664b3eed11d0f053cdeafa1ff06e"/>
+  <project groups="linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7" revision="a1e239a0bb5cd1d69680bf1075883aa9a7bf2429"/>
+  <project groups="linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/i686-linux-android-4.7" path="prebuilts/gcc/linux-x86/x86/i686-linux-android-4.7" revision="c7931763d41be602407ed9d71e2c0292c6597e00"/>
+  <project groups="linux,x86" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="a32003194f707f66a2d8cdb913ed1869f1926c5d"/>
+  <project name="device/common" path="device/common" revision="96d4d2006c4fcb2f19a3fa47ab10cb409faa017b"/>
+  <project name="device/sample" path="device/sample" revision="9c19bbbe0793ebdc427277dc37f9bb4ae20bccb2"/>
+  <project name="platform/abi/cpp" path="abi/cpp" revision="18f1b5e28734183ff8073fe86dc46bc4ebba8a59"/>
+  <project name="platform/bionic" path="bionic" revision="e36fba720d5327bf5532dfcde013239080f38b56"/>
+  <project name="platform/bootable/recovery" path="bootable/recovery" revision="dc8da21282a0c68328d05268433d19b0f2f6a15c"/>
+  <project name="platform/external/aac" path="external/aac" revision="fa3eba16446cc8f2f5e2dfc20d86a49dbd37299e"/>
+  <project name="platform/external/bison" path="external/bison" revision="c2418b886165add7f5a31fc5609f0ce2d004a90e"/>
+  <project name="platform/external/bsdiff" path="external/bsdiff" revision="23e322ab19fb7d74c2c37e40ce364d9f709bdcee"/>
+  <project name="platform/external/bzip2" path="external/bzip2" revision="1cb636bd8e9e5cdfd5d5b2909a122f6e80db62de"/>
+  <project name="platform/external/checkpolicy" path="external/checkpolicy" revision="0d73ef7049feee794f14cf1af88d05dae8139914"/>
+  <project name="platform/external/dhcpcd" path="external/dhcpcd" revision="84b7252b0a9d0edc9a1db1e0c518771d26b23058"/>
+  <project name="platform/external/dnsmasq" path="external/dnsmasq" revision="a0f273e289166fa488bba261b2d431c9503aed0d"/>
+  <project name="platform/external/dropbear" path="external/dropbear" revision="a34ddbe3819bc465968f3676c734b405e655f8b7"/>
+  <project name="platform/external/e2fsprogs" path="external/e2fsprogs" revision="164ce36fe92b78b92575e56abd101209631b48fc"/>
+  <project name="platform/external/elfutils" path="external/elfutils" revision="b23b2dfb354b3ccf5d1c5d39815f02e7048cf516"/>
+  <project name="platform/external/expat" path="external/expat" revision="0af0cb3bc7519e567bd9daff3dcd315ab0134a99"/>
+  <project name="platform/external/fdlibm" path="external/fdlibm" revision="0da5f683c9ddc9442af3b389b4220e91ccffb320"/>
+  <project name="platform/external/flac" path="external/flac" revision="b38b3d2c53c22f542fd764f9d60ef19b49d42e1b"/>
+  <project name="platform/external/freetype" path="external/freetype" revision="899c67b6cfcd2010784fbf08c5415af16c526e0c"/>
+  <project name="platform/external/gcc-demangle" path="external/gcc-demangle" revision="9241386b62c353302c2f9eccda0672685b252b4d"/>
+  <project name="platform/external/genext2fs" path="external/genext2fs" revision="e11a9c7fe6f1cef99aad2f25afaea37b72fe9f93"/>
+  <project name="platform/external/giflib" path="external/giflib" revision="9aef3ea079a57c98a9207f8c3b95a5dc08ee74b5"/>
+  <project name="platform/external/gtest" path="external/gtest" revision="0f1ce3dd0b880b6ae0cf7f5413702b8ef542efb2"/>
+  <project name="platform/external/harfbuzz" path="external/harfbuzz" revision="858f2d28ac741ef139f74bdbdbcefa7560f17c91"/>
+  <project name="platform/external/harfbuzz_ng" path="external/harfbuzz_ng" revision="3309edccdbc2a92eb03a285abb27c1c1c4a88e43"/>
+  <project name="platform/external/iproute2" path="external/iproute2" revision="1778c5571f3b9ed213a03ecc80adf74f570b4916"/>
+  <project name="platform/external/ipsec-tools" path="external/ipsec-tools" revision="f4cb1ee4b00abbfb6f968dc25818c23b4b47e584"/>
+  <project name="platform/external/iptables" path="external/iptables" revision="ceedcd308d47976e31eda76a8852edd7f92837de"/>
+  <project name="platform/external/jack" path="external/jack" revision="5ceb2025ac5d25ed48183ac2d3dac4691fe761fb"/>
+  <project name="platform/external/jhead" path="external/jhead" revision="31b17e69a87e4caa50f9c6b1a47c84ef75f79d83"/>
+  <project name="platform/external/jpeg" path="external/jpeg" revision="1808bfd1060d2fde90478691a4da8ead0cb0a345"/>
+  <project name="platform/external/junit" path="external/junit" revision="01da89f7f8a8f9852e0ec1a490e7d2a0ee3785d5"/>
+  <project name="platform/external/libgsm" path="external/libgsm" revision="50761abed8f4734970874165b386cfd4d9599db4"/>
+  <project name="platform/external/liblzf" path="external/liblzf" revision="6946aa575b0949d045722794850896099d937cbb"/>
+  <project name="platform/external/libnfc-nxp" path="external/libnfc-nxp" revision="9e987ccb716624d658f98abc7db2097e11e3d8ed"/>
+  <project name="platform/external/libnl-headers" path="external/libnl-headers" revision="6ccf7349d61f73ac26a0675d735d903ab919c658"/>
+  <project name="platform/external/libogg" path="external/libogg" revision="ec0b24fb1468abe37be4164a6feb16568e036bde"/>
+  <project name="platform/external/libpcap" path="external/libpcap" revision="3a7bce5dda6a8db92c9248846d0255e68c3a5b2a"/>
+  <project name="platform/external/libpng" path="external/libpng" revision="cdf9c7fe4febaa4a7b3917d56d4180960e48800f"/>
+  <project name="platform/external/libselinux" path="external/libselinux" revision="1e2cf2c4a2d15a9b1ca2d353b99fb6884413ffe1"/>
+  <project name="platform/external/libsepol" path="external/libsepol" revision="edc447a138ec77236f1cbfd36c1211a38ba21418"/>
+  <project name="platform/external/libvpx" path="external/libvpx" revision="ca9281af0bfe816f1ae2fc3e8771524164a0a03c"/>
+  <project name="platform/external/mdnsresponder" path="external/mdnsresponder" revision="c46f53f5e072f23051c4eedef730386f7634dc11"/>
+  <project name="platform/external/mksh" path="external/mksh" revision="f8c396c4d446a038358106a301b329607a04633d"/>
+  <project name="platform/external/netcat" path="external/netcat" revision="444644cfa9a2f3002863caa168fb2d6b34dfd1e8"/>
+  <project name="platform/external/openssl" path="external/openssl" revision="bb8428f762b3632f493572c4f73957e1281ade79"/>
+  <project name="platform/external/protobuf" path="external/protobuf" revision="48ee66d295979372ed0234cefda42385daae8312"/>
+  <project name="platform/external/safe-iop" path="external/safe-iop" revision="aa0725fb1da35e47676b6da30009322eb5ed59be"/>
+  <project name="platform/external/scrypt" path="external/scrypt" revision="eb05b73c3bba21fff55529813109de4bad5ddbd1"/>
+  <project name="platform/external/sepolicy" path="external/sepolicy" revision="6f50b84072d4920ce331226837ba794be72ea2b1"/>
+  <project name="platform/external/sfntly" path="external/sfntly" revision="30d4e1f3d81ad9f7a1aa14ce6d2ceb5df56c15cd"/>
+  <project name="platform/external/skia" path="external/skia" revision="84a7058ba19c80ababd8c7c9eb379bf0babcc9ce"/>
+  <project name="platform/external/sonivox" path="external/sonivox" revision="9fb2c53165b1512aa57db0bf1c757e3215e28eb8"/>
+  <project name="platform/external/speex" path="external/speex" revision="fb7db5853ffb841a4d32fea8b5c3a43e6b875cae"/>
+  <project name="platform/external/sqlite" path="external/sqlite" revision="ac0e0d5f866fbce0ebf00d0ddd615464849aa83b"/>
+  <project name="platform/external/stlport" path="external/stlport" revision="628e14d37c5b239839a466e81c74bf66255b770b"/>
+  <project name="platform/external/strace" path="external/strace" revision="1a4e05d53dec658a061acb9869cb1eb1342cd09d"/>
+  <project name="platform/external/svox" path="external/svox" revision="b3c3bf3c1be35f3d455671de9f6d7b9bca3ce73a"/>
+  <project name="platform/external/tagsoup" path="external/tagsoup" revision="68c2ec9e0acdb3214b7fb91dbab8c9fab8736817"/>
+  <project name="platform/external/tcpdump" path="external/tcpdump" revision="841663c88f0692202d57def239267e28cf832cdc"/>
+  <project name="platform/external/tinyalsa" path="external/tinyalsa" revision="c1b682efcd3b3eac3101408231b58ea92c668756"/>
+  <project name="platform/external/tinycompress" path="external/tinycompress" revision="a85e245a09c028d36cbf04f233be10bc583691f5"/>
+  <project name="platform/external/tinyxml" path="external/tinyxml" revision="494e448824844d866e805831d1d5f5acb654065c"/>
+  <project name="platform/external/tinyxml2" path="external/tinyxml2" revision="ead7a211773b9366466c6512cf945bc9dd1490a5"/>
+  <project name="platform/external/tremolo" path="external/tremolo" revision="78772d5dde5a06eefae281b0dde224fcac46c4ff"/>
+  <project name="platform/external/webp" path="external/webp" revision="513e97bd307573e2adc776eb5368bd129aceaa4a"/>
+  <project name="platform/external/webrtc" path="external/webrtc" revision="446452f84e9cc4c75d8e80f6f05e24793397a19d"/>
+  <project name="platform/external/yaffs2" path="external/yaffs2" revision="a2cff2275e1b501ff478b03757d6e4f05fddc2db"/>
+  <project name="platform/external/zlib" path="external/zlib" revision="6eb3570ff8fa71bd83bb375b4bf09804c6089fed"/>
+  <project name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" revision="dbbe673145107e99883f62bafd70c5f43f11065c"/>
+  <project name="platform/frameworks/wilhelm" path="frameworks/wilhelm" revision="f0c3b4edf597c40aae4ea311575f39c8bcf203df"/>
+  <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" remote="b2g" revision="23404f05422c6bf3c39573325a4f4909167671b4"/>
+  <project name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="c792f0bd9fff7aea2887c60bbb3a9bbdb534ffa3"/>
+  <project name="platform_prebuilts_qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="6a1bb59af65b6485b1090522f66fac95c3f9e22c"/>
+  <project name="platform/prebuilts/sdk" path="prebuilts/sdk" revision="69d524e80cdf3981006627c65ac85f3a871238a3"/>
+  <project name="platform/prebuilts/tools" path="prebuilts/tools" revision="5a48c04c4bb5f079bc757e29864a42427378e051"/>
+  <project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="48d2332e6d8400cdc0de273ceff2abe8aaababf8"/>
+  <project name="platform/system/extras" path="system/extras" revision="576f57b6510de59c08568b53c0fb60588be8689e"/>
+  <project name="platform_system_libfdio" path="system/libfdio" remote="b2g" revision="3c5405863d2002f665ef2b901abb3853c420129b"/>
+  <project name="platform/system/netd" path="system/netd" revision="a6531f7befb49b1c81bc0de7e51c5482b308e1c5"/>
+  <project name="platform/system/security" path="system/security" revision="ee8068b9e7bfb2770635062fc9c2035be2142bd8"/>
+  <project name="platform/system/vold" path="system/vold" revision="42fa2a0f14f965970a4b629a176bbd2666edf017"/>
+  <project name="platform/external/curl" path="external/curl" revision="e68addd988448959ea8157c5de637346b4180c33"/>
+  <project name="platform/external/icu4c" path="external/icu4c" revision="d3ec7428eb276db43b7ed0544e09344a6014806c"/>
+  <project name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="76c4bf4bc430a1b8317f2f21ef735867733e50cc"/>
+  <project name="platform/system/media" path="system/media" revision="c1332c21c608f4932a6d7e83450411cde53315ef"/>
+  <default remote="caf" revision="LNX.LA.3.5.2.1.1" sync-j="4"/>
+  <!-- Platform common things -->
+  <project name="device-shinano-common" path="device/sony/shinano-common" remote="b2g" revision="f4e8f3b19fedc7e08c455de93fe4cef90744c169"/>
+  <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="2501e5940ba69ece7654ff85611c76ae5bda299c"/>
+  <project name="codeaurora_kernel_msm" path="kernel" remote="b2g" revision="5ada05ac150f643ef19e87015df7e106b88effe7"/>
+  <project name="platform/external/bluetooth/bluedroid" path="external/bluetooth/bluedroid" revision="d61fc97258c8b0c362430dd2eb195dcc4d266f14"/>
+  <project name="init_sh" path="external/init_sh" remote="b2g" revision="3bdd26e092db9c47c5beb04b4809a35f8f767b8a"/>
+  <project name="platform/external/libnfc-nci" path="external/libnfc-nci" revision="0a01977f34d6e86fe23d6c0ec75e96ba988bbebb"/>
+  <project name="platform_external_libnfc-pn547" path="external/libnfc-pn547" remote="b2g" revision="5bb999b84b8adc14f6bea004d523ba258dea8188"/>
+  <project name="timekeep" path="external/timekeep" remote="b2g" revision="58e9fd70a62d2c0ebf9bc2bd99439dcc5be8cad8"/>
+  <project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="5b71e40213f650459e95d35b6f14af7e88d8ab62"/>
+  <project name="platform_frameworks_av" path="frameworks/av" remote="b2g" revision="a920312eb6299b6cc11f7136254c4b0ba7a663be"/>
+  <project name="platform/frameworks/base" path="frameworks/base" revision="da8e6bc53c8bc669da0bb627904d08aa293f2497"/>
+  <project name="platform/frameworks/native" path="frameworks/native" revision="a46a9f1ac0ed5662d614c277cbb14eb3f332f365"/>
+  <project name="platform/hardware/libhardware" path="hardware/libhardware" revision="7196881a0e9dd7bfbbcf0af64c8064e70f0fa094"/>
+  <project name="platform/hardware/broadcom/wlan" path="hardware/broadcom/wlan" revision="15a9b66de9b7d84c7ea63df3a834f095bca9e493"/>
+  <project name="platform/hardware/qcom/audio" path="hardware/qcom/audio" revision="8d7676dfb68ee0cd069affedd5d1e97316a184ba"/>
+  <project name="platform/hardware/qcom/camera" path="hardware/qcom/camera" revision="2a1ded216a91bf62a72b1640cf01ab4998f37028"/>
+  <project name="platform/hardware/qcom/display" path="hardware/qcom/display" revision="a74adcf8d88320d936daa8d20ce88ca0107fb916"/>
+  <project name="platform/hardware/qcom/gps" path="hardware/qcom/gps" revision="9883ea57b0668d8f60dba025d4522dfa69a1fbfa"/>
+  <project name="platform/hardware/qcom/media" path="hardware/qcom/media" revision="a558dc844bf5144fc38603fd8f4df8d9557052a5"/>
+  <project name="platform/hardware/qcom/wlan" path="hardware/qcom/wlan" revision="57ee1320ed7b4a1a1274d8f3f6c177cd6b9becb2"/>
+  <project name="platform/hardware/ril" path="hardware/ril" revision="12b1977cc704b35f2e9db2bb423fa405348bc2f3"/>
+  <project name="platform/system/bluetooth" path="system/bluetooth" revision="985bf15264d865fe7b9c5b45f61c451cbaafa43d"/>
+  <project name="platform/system/core" path="system/core" revision="42839aedcf70bf6bc92a3b7ea4a5cc9bf9aef3f9"/>
+  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="d82e00fb6380b4f6cea7a96213913ee9eb441239"/>
+  <project name="platform/system/qcom" path="system/qcom" revision="63e3f6f176caad587d42bba4c16b66d953fb23c2"/>
+  <project name="platform/vendor/qcom/copper" path="device/qcom/msm8974" revision="ec7bc1a26610922156d7d412b4d3de6b4adb93da"/>
+  <project name="vendor_broadcom_wlan" path="vendor/broadcom/wlan" remote="b2g" revision="114b9491a8a919687da4e22fbd89fab511d6d8d7"/>
+  <!-- Shinano specific things -->
+  <project name="device-shinano" path="device/sony/shinano" remote="b2g" revision="65bdce6f5851d4fb760aa84eec0db2adca49fabf"/>
+  <!-- Aries specific things -->
+  <project name="device-aries" path="device/sony/aries" remote="b2g" revision="3af1ede0d0956cfbf9c549df7cd9a6807a9efdf2"/>
+</manifest>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/dolphin/sources.xml firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/dolphin/sources.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/dolphin/sources.xml	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/dolphin/sources.xml	2015-05-25 20:42:40.000000000 +0000
@@ -12,18 +12,18 @@
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
-  <project name="platform_build" path="build" remote="b2g" revision="a8ace1361d702eef293e48f2ea525dac686daa86">
+  <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0d6c04f13fd385bda045f4e539b2a67cb5d84b1d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5bcc08a732163087999251b523e3643db397412c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="fffc68521ebb1501d6b015c6d1c4a17a04fdb2e2"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="46da1a05ac04157669685246d70ac59d48699c9e"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="53517af1f57810bef745f03602f407161a475d76"/>
   <!-- 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"/>
@@ -43,7 +43,7 @@
   <project name="platform/external/bzip2" path="external/bzip2" revision="1cb636bd8e9e5cdfd5d5b2909a122f6e80db62de"/>
   <project name="platform/external/checkpolicy" path="external/checkpolicy" revision="0d73ef7049feee794f14cf1af88d05dae8139914"/>
   <project name="platform/external/dhcpcd" path="external/dhcpcd" revision="84b7252b0a9d0edc9a1db1e0c518771d26b23058"/>
-  <project name="platform/external/dnsmasq" path="external/dnsmasq" revision="41d356427a632f5336384bfa45c8420ffc274f66"/>
+  <project name="platform/external/dnsmasq" path="external/dnsmasq" revision="c2f655d7b501739e05e263d45cb334f26db78079"/>
   <project name="platform/external/dropbear" path="external/dropbear" revision="a34ddbe3819bc465968f3676c734b405e655f8b7"/>
   <project name="platform/external/e2fsprogs" path="external/e2fsprogs" revision="47478a2944a2a17c7fdebe9d92573db92013125c"/>
   <project name="platform/external/elfutils" path="external/elfutils" revision="b23b2dfb354b3ccf5d1c5d39815f02e7048cf516"/>
@@ -106,7 +106,7 @@
   <project name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" revision="dbbe673145107e99883f62bafd70c5f43f11065c"/>
   <project name="platform/frameworks/wilhelm" path="frameworks/wilhelm" revision="aac6c4bb59a6577c97cbda68699829b507b7490d"/>
   <project name="platform/hardware/libhardware" path="hardware/libhardware" revision="fbeca55f4695dd07c0291213403533b8fbca4885"/>
-  <project name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="92605aa35361ae4ae1e473781e40c1f6929f4ec4"/>
+  <project name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="68b0c269fd1889f47ecfb9119c05281e9b6db0af"/>
   <project name="platform/libcore" path="libcore" revision="e195beab082c09217318fc19250caeaf4c1bd800"/>
   <project name="platform/libnativehelper" path="libnativehelper" revision="feeb36c2bd4adfe285f98f5de92e0f3771b2c115"/>
   <project name="platform/ndk" path="ndk" revision="e58ef003be4306bb53a8c11331146f39e4eab31f"/>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/emulator/config.json firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/emulator/config.json
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/emulator/config.json	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/emulator/config.json	2015-05-25 20:42:40.000000000 +0000
@@ -10,6 +10,7 @@
         "{workdir}/out/target/product/generic/tests/*.zip",
         "{workdir}/out/emulator.tar.gz",
         "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
+        "{objdir}/dist/test_packages.json",
         "{workdir}/sources.xml"
     ],
     "public_upload_files": [
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/emulator/sources.xml firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/emulator/sources.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/emulator/sources.xml	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/emulator/sources.xml	2015-05-25 20:42:40.000000000 +0000
@@ -19,12 +19,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="0d6c04f13fd385bda045f4e539b2a67cb5d84b1d"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5bcc08a732163087999251b523e3643db397412c"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="fffc68521ebb1501d6b015c6d1c4a17a04fdb2e2"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
-  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>
-  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="8c2d32bccc7061e9ca0165135457c3fd53e7107e"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
+  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="22664edc4c73e5fe8f5095ff1d5549db78a2bc10"/>
+  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="218a5637399d023f4326e12c8a486dad95403b6c"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="46da1a05ac04157669685246d70ac59d48699c9e"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="34ea6163f9f0e0122fb0bb03607eccdca31ced7a"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="dd924f92906085b831bf1cbbc7484d3c043d613c"/>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/emulator-ics/config.json firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/emulator-ics/config.json
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/emulator-ics/config.json	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/emulator-ics/config.json	2015-05-25 20:42:40.000000000 +0000
@@ -10,6 +10,7 @@
         "{workdir}/out/target/product/generic/tests/*.zip",
         "{workdir}/out/emulator.tar.gz",
         "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
+        "{objdir}/dist/test_packages.json",
         "{workdir}/sources.xml"
     ],
     "upload_platform": "emulator-ics",
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/emulator-ics/sources.xml firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/emulator-ics/sources.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/emulator-ics/sources.xml	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/emulator-ics/sources.xml	2015-05-25 20:42:40.000000000 +0000
@@ -19,12 +19,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="0d6c04f13fd385bda045f4e539b2a67cb5d84b1d"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5bcc08a732163087999251b523e3643db397412c"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="fffc68521ebb1501d6b015c6d1c4a17a04fdb2e2"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
-  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>
-  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="8c2d32bccc7061e9ca0165135457c3fd53e7107e"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
+  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="22664edc4c73e5fe8f5095ff1d5549db78a2bc10"/>
+  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="218a5637399d023f4326e12c8a486dad95403b6c"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="46da1a05ac04157669685246d70ac59d48699c9e"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="34ea6163f9f0e0122fb0bb03607eccdca31ced7a"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="dd924f92906085b831bf1cbbc7484d3c043d613c"/>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/emulator-jb/sources.xml firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/emulator-jb/sources.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/emulator-jb/sources.xml	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/emulator-jb/sources.xml	2015-05-25 20:42:40.000000000 +0000
@@ -17,10 +17,10 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0d6c04f13fd385bda045f4e539b2a67cb5d84b1d"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5bcc08a732163087999251b523e3643db397412c"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="fffc68521ebb1501d6b015c6d1c4a17a04fdb2e2"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="46da1a05ac04157669685246d70ac59d48699c9e"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="53517af1f57810bef745f03602f407161a475d76"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <!-- Stock Android things -->
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/emulator-kk/sources.xml firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/emulator-kk/sources.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/emulator-kk/sources.xml	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/emulator-kk/sources.xml	2015-05-25 20:42:40.000000000 +0000
@@ -12,18 +12,18 @@
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
-  <project name="platform_build" path="build" remote="b2g" revision="a8ace1361d702eef293e48f2ea525dac686daa86">
+  <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0d6c04f13fd385bda045f4e539b2a67cb5d84b1d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5bcc08a732163087999251b523e3643db397412c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="fffc68521ebb1501d6b015c6d1c4a17a04fdb2e2"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="46da1a05ac04157669685246d70ac59d48699c9e"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="53517af1f57810bef745f03602f407161a475d76"/>
   <!-- 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"/>
@@ -128,11 +128,11 @@
   <default remote="caf" revision="refs/tags/android-4.4.2_r1" sync-j="4"/>
   <!-- Emulator specific things -->
   <project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="72ffdf71c68a96309212eb13d63560d66db14c9e"/>
-  <project name="device_generic_goldfish" path="device/generic/goldfish" remote="b2g" revision="d4377e11659d54b41c51526547e971ba0cb11754"/>
+  <project name="device_generic_goldfish" path="device/generic/goldfish" remote="b2g" revision="f390788a00706c06e5248edfd8d27b365387e84a"/>
   <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="fbd2becab3825c49e756db5149552f85049c66e2"/>
   <project name="platform/external/libnfc-nci" path="external/libnfc-nci" revision="f37bd545063039e30a92f2550ae78c0e6e4e2d08"/>
-  <project name="platform_external_wpa_supplicant_8" path="external/wpa_supplicant_8" remote="b2g" revision="9a725b0f5aa715282f8854ac56e5b63efc9cd077"/>
-  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="0c2ffe181ca64a6cad9c5f93ddea623f080c6434"/>
+  <project name="platform_external_wpa_supplicant_8" path="external/wpa_supplicant_8" remote="b2g" revision="0c6a6547cd1fd302fa2b0f6e375654df36bf0ec4"/>
+  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="42f61f665e7a9857da8cd14b455e15bae98e6b44"/>
   <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="d82e00fb6380b4f6cea7a96213913ee9eb441239"/>
   <project name="platform/development" path="development" revision="5968ff4e13e0d696ad8d972281fc27ae5a12829b"/>
   <project name="android-sdk" path="sdk" remote="b2g" revision="0951179277915335251c5e11d242e4e1a8c2236f"/>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/emulator-l/sources.xml firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/emulator-l/sources.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/emulator-l/sources.xml	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/emulator-l/sources.xml	2015-05-25 20:42:40.000000000 +0000
@@ -15,15 +15,15 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0d6c04f13fd385bda045f4e539b2a67cb5d84b1d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5bcc08a732163087999251b523e3643db397412c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="fffc68521ebb1501d6b015c6d1c4a17a04fdb2e2"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="46da1a05ac04157669685246d70ac59d48699c9e"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="53517af1f57810bef745f03602f407161a475d76"/>
   <!-- Stock Android things -->
   <project groups="pdk,linux" name="platform/prebuilts/clang/linux-x86/host/3.5" path="prebuilts/clang/linux-x86/host/3.5" revision="ffc05a232799fe8fcb3e47b7440b52b1fb4244c0"/>
   <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" revision="337e0ef5e40f02a1ae59b90db0548976c70a7226"/>
@@ -144,7 +144,7 @@
   <project name="device_generic_goldfish" path="device/generic/goldfish" remote="b2g" revision="48132ec0b0dfe9fc29c7c3f0e799066be8999198"/>
   <!-- external/qemu for emulator-l need to be updated in bug-1121378 -->
   <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="7639c5c496ffd207bb627f2a59b2c5203ae6fefc"/>
-  <project name="platform_external_wpa_supplicant_8" path="external/wpa_supplicant_8" remote="b2g" revision="326450198720862ade868801cc2f43597f3c1fd8"/>
+  <project name="platform_external_wpa_supplicant_8" path="external/wpa_supplicant_8" remote="b2g" revision="cbda29a58abc4ea1f7f4611fe354ab67b606219d"/>
   <project name="platform/development" path="development" revision="0c51f6e0aa2ee57fcb75ec3b2ff6bf754cece63e"/>
   <project name="android-sdk" path="sdk" remote="b2g" revision="ff4190dc603f62a7caa48342aa268acf99863c5c"/>
   <!-- hardware-ril for emulator-l need to be updated in bug-1113054 -->
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/emulator-x86-kk/sources.xml firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/emulator-x86-kk/sources.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/emulator-x86-kk/sources.xml	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/emulator-x86-kk/sources.xml	2015-05-25 20:42:40.000000000 +0000
@@ -12,18 +12,18 @@
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
-  <project name="platform_build" path="build" remote="b2g" revision="a8ace1361d702eef293e48f2ea525dac686daa86">
+  <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0d6c04f13fd385bda045f4e539b2a67cb5d84b1d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5bcc08a732163087999251b523e3643db397412c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="fffc68521ebb1501d6b015c6d1c4a17a04fdb2e2"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="46da1a05ac04157669685246d70ac59d48699c9e"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="53517af1f57810bef745f03602f407161a475d76"/>
   <!-- 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"/>
@@ -128,11 +128,11 @@
   <default remote="caf" revision="refs/tags/android-4.4.2_r1" sync-j="4"/>
   <!-- Emulator specific things -->
   <project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="72ffdf71c68a96309212eb13d63560d66db14c9e"/>
-  <project name="device_generic_goldfish" path="device/generic/goldfish" remote="b2g" revision="d4377e11659d54b41c51526547e971ba0cb11754"/>
+  <project name="device_generic_goldfish" path="device/generic/goldfish" remote="b2g" revision="f390788a00706c06e5248edfd8d27b365387e84a"/>
   <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="fbd2becab3825c49e756db5149552f85049c66e2"/>
   <project name="platform/external/libnfc-nci" path="external/libnfc-nci" revision="f37bd545063039e30a92f2550ae78c0e6e4e2d08"/>
-  <project name="platform_external_wpa_supplicant_8" path="external/wpa_supplicant_8" remote="b2g" revision="9a725b0f5aa715282f8854ac56e5b63efc9cd077"/>
-  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="0c2ffe181ca64a6cad9c5f93ddea623f080c6434"/>
+  <project name="platform_external_wpa_supplicant_8" path="external/wpa_supplicant_8" remote="b2g" revision="0c6a6547cd1fd302fa2b0f6e375654df36bf0ec4"/>
+  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="42f61f665e7a9857da8cd14b455e15bae98e6b44"/>
   <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="d82e00fb6380b4f6cea7a96213913ee9eb441239"/>
   <project name="platform/development" path="development" revision="5968ff4e13e0d696ad8d972281fc27ae5a12829b"/>
   <project name="android-sdk" path="sdk" remote="b2g" revision="0951179277915335251c5e11d242e4e1a8c2236f"/>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/emulator-x86-l/sources.xml firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/emulator-x86-l/sources.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/emulator-x86-l/sources.xml	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/emulator-x86-l/sources.xml	2015-05-25 20:42:40.000000000 +0000
@@ -15,15 +15,15 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0d6c04f13fd385bda045f4e539b2a67cb5d84b1d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5bcc08a732163087999251b523e3643db397412c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="fffc68521ebb1501d6b015c6d1c4a17a04fdb2e2"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="46da1a05ac04157669685246d70ac59d48699c9e"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="53517af1f57810bef745f03602f407161a475d76"/>
   <!-- Stock Android things -->
   <project groups="pdk,linux" name="platform/prebuilts/clang/linux-x86/host/3.5" path="prebuilts/clang/linux-x86/host/3.5" revision="ffc05a232799fe8fcb3e47b7440b52b1fb4244c0"/>
   <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" revision="337e0ef5e40f02a1ae59b90db0548976c70a7226"/>
@@ -144,7 +144,7 @@
   <project name="device_generic_goldfish" path="device/generic/goldfish" remote="b2g" revision="48132ec0b0dfe9fc29c7c3f0e799066be8999198"/>
   <!-- external/qemu for emulator-l need to be updated in bug-1121378 -->
   <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="7639c5c496ffd207bb627f2a59b2c5203ae6fefc"/>
-  <project name="platform_external_wpa_supplicant_8" path="external/wpa_supplicant_8" remote="b2g" revision="326450198720862ade868801cc2f43597f3c1fd8"/>
+  <project name="platform_external_wpa_supplicant_8" path="external/wpa_supplicant_8" remote="b2g" revision="cbda29a58abc4ea1f7f4611fe354ab67b606219d"/>
   <project name="platform/development" path="development" revision="0c51f6e0aa2ee57fcb75ec3b2ff6bf754cece63e"/>
   <project name="android-sdk" path="sdk" remote="b2g" revision="ff4190dc603f62a7caa48342aa268acf99863c5c"/>
   <!-- hardware-ril for emulator-l need to be updated in bug-1113054 -->
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/flame/sources.xml firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/flame/sources.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/flame/sources.xml	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/flame/sources.xml	2015-05-25 20:42:40.000000000 +0000
@@ -17,9 +17,9 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0d6c04f13fd385bda045f4e539b2a67cb5d84b1d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="c5b3aa4fc662d961eba79ef24d1378a243109e29"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="46da1a05ac04157669685246d70ac59d48699c9e"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/flame-kk/sources.xml firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/flame-kk/sources.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/flame-kk/sources.xml	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/flame-kk/sources.xml	2015-05-25 20:42:40.000000000 +0000
@@ -12,18 +12,18 @@
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
-  <project name="platform_build" path="build" remote="b2g" revision="a8ace1361d702eef293e48f2ea525dac686daa86">
+  <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0d6c04f13fd385bda045f4e539b2a67cb5d84b1d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5bcc08a732163087999251b523e3643db397412c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="fffc68521ebb1501d6b015c6d1c4a17a04fdb2e2"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="46da1a05ac04157669685246d70ac59d48699c9e"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="53517af1f57810bef745f03602f407161a475d76"/>
   <!-- Stock Android things -->
   <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="95bb5b66b3ec5769c3de8d3f25d681787418e7d2"/>
   <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="ebdad82e61c16772f6cd47e9f11936bf6ebe9aa0"/>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/gaia.json firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/gaia.json
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/gaia.json	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/gaia.json	2015-05-25 20:42:40.000000000 +0000
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "0d6c04f13fd385bda045f4e539b2a67cb5d84b1d", 
+        "git_revision": "5bcc08a732163087999251b523e3643db397412c", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "4f0c2bfc450d56679bd44c53b4492cb850549f78", 
+    "revision": "66ad152ea50938f799bf7edd4bc2088f47b85c00", 
     "repo_path": "integration/gaia-central"
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/nexus-4/sources.xml firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/nexus-4/sources.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/nexus-4/sources.xml	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/nexus-4/sources.xml	2015-05-25 20:42:40.000000000 +0000
@@ -17,10 +17,10 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0d6c04f13fd385bda045f4e539b2a67cb5d84b1d"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5bcc08a732163087999251b523e3643db397412c"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="fffc68521ebb1501d6b015c6d1c4a17a04fdb2e2"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="46da1a05ac04157669685246d70ac59d48699c9e"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="53517af1f57810bef745f03602f407161a475d76"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <!-- Stock Android things -->
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/nexus-5-l/sources.xml firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/nexus-5-l/sources.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/config/nexus-5-l/sources.xml	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/config/nexus-5-l/sources.xml	2015-05-25 20:42:40.000000000 +0000
@@ -15,15 +15,15 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0d6c04f13fd385bda045f4e539b2a67cb5d84b1d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5bcc08a732163087999251b523e3643db397412c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="fffc68521ebb1501d6b015c6d1c4a17a04fdb2e2"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="46da1a05ac04157669685246d70ac59d48699c9e"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="53517af1f57810bef745f03602f407161a475d76"/>
   <!-- Stock Android things -->
   <project groups="pdk,linux" name="platform/prebuilts/clang/linux-x86/host/3.5" path="prebuilts/clang/linux-x86/host/3.5" revision="ffc05a232799fe8fcb3e47b7440b52b1fb4244c0"/>
   <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" revision="337e0ef5e40f02a1ae59b90db0548976c70a7226"/>
@@ -141,7 +141,7 @@
   <default remote="caf" revision="refs/tags/android-5.1.0_r1" sync-j="4"/>
   <!-- Nexus 5 specific things -->
   <project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="fe7df1bc8dd0fd71571505d7be1c31a4ad1e40fb"/>
-  <project name="device-hammerhead" path="device/lge/hammerhead" remote="b2g" revision="01a78e0cd81f7a48ac12f854e094dead0deb094d"/>
+  <project name="device-hammerhead" path="device/lge/hammerhead" remote="b2g" revision="74919c3e2742b3237b2f30a8cefe182d0caf1e31"/>
   <project name="device_lge_hammerhead-kernel" path="device/lge/hammerhead-kernel" remote="b2g" revision="1d42cfba2e91a07b1bea1d1591b8aed4db9cb9a5"/>
   <project name="platform/external/libnfc-nci" path="external/libnfc-nci" revision="5d0ae53d9588c3d70c005aec9be94af9a534de16"/>
   <project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="c15b6e266136cd0cdd9b94d0bbed1962d9dd6672"/>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/b2g/installer/package-manifest.in firefox-trunk-41.0~a1~hg20150524r245419/b2g/installer/package-manifest.in
--- firefox-trunk-41.0~a1~hg20150513r243603/b2g/installer/package-manifest.in	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/b2g/installer/package-manifest.in	2015-05-25 20:42:40.000000000 +0000
@@ -439,6 +439,10 @@
 @RESPATH@/components/TCPPresentationServer.js
 
 #ifdef MOZ_SECUREELEMENT
+@RESPATH@/components/ACEService.js
+@RESPATH@/components/ACEService.manifest
+@RESPATH@/components/GPAccessRulesManager.js
+@RESPATH@/components/GPAccessRulesManager.manifest
 @RESPATH@/components/SecureElement.js
 @RESPATH@/components/SecureElement.manifest
 @RESPATH@/components/UiccConnector.js
@@ -491,6 +495,8 @@
 #if defined(MOZ_WIDGET_GONK) && defined(MOZ_B2G_RIL)
 @RESPATH@/components/CellBroadcastService.js
 @RESPATH@/components/CellBroadcastService.manifest
+@RESPATH@/components/DataCallManager.js
+@RESPATH@/components/DataCallManager.manifest
 @BINPATH@/components/IccService.js
 @BINPATH@/components/IccService.manifest
 @RESPATH@/components/MmsService.js
@@ -498,6 +504,8 @@
 @RESPATH@/components/MobileMessageDatabaseService.js
 @RESPATH@/components/MobileMessageDatabaseService.manifest
 #ifndef DISABLE_MOZ_RIL_GEOLOC
+@RESPATH@/components/DataCallInterfaceService.js
+@RESPATH@/components/DataCallInterfaceService.manifest
 @RESPATH@/components/MobileConnectionService.js
 @RESPATH@/components/MobileConnectionService.manifest
 @RESPATH@/components/RadioInterfaceLayer.js
@@ -511,6 +519,8 @@
 @RESPATH@/components/RILSystemMessengerHelper.manifest
 @RESPATH@/components/TelephonyAudioService.js
 @RESPATH@/components/TelephonyAudioService.manifest
+@RESPATH@/components/USSDReceivedWrapper.js
+@RESPATH@/components/USSDReceivedWrapper.manifest
 #ifndef DISABLE_MOZ_RIL_GEOLOC
 @RESPATH@/components/TelephonyService.js
 @RESPATH@/components/TelephonyService.manifest
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/app/blocklist.xml firefox-trunk-41.0~a1~hg20150524r245419/browser/app/blocklist.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/app/blocklist.xml	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/app/blocklist.xml	2015-05-25 20:42:40.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1428708782000">
+<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1432051555000">
   <emItems>
       <emItem  blockID="i58" id="webmaster@buzzzzvideos.info">
                         <versionRange  minVersion="0" maxVersion="*">
@@ -2970,6 +2970,30 @@
                   <match name="filename" exp="(NPSWF32.*\.dll)|(Flash\ Player\.plugin)" />                      <versionRange  minVersion="13.0.0.263" maxVersion="13.0.0.268" severity="0" vulnerabilitystatus="1"></versionRange>
                             <infoURL>https://get.adobe.com/flashplayer/</infoURL>
           </pluginItem>
+      <pluginItem  blockID="p902">
+                  <match name="filename" exp="JavaAppletPlugin\.plugin" />                      <versionRange  minVersion="Java 7 Update 45" maxVersion="Java 7 Update 78" severity="0" vulnerabilitystatus="1"></versionRange>
+                            <infoURL>https://java.com/</infoURL>
+          </pluginItem>
+      <pluginItem  blockID="p904">
+                  <match name="filename" exp="JavaAppletPlugin\.plugin" />                      <versionRange  minVersion="Java 8" maxVersion="Java 8 Update 44" severity="0" vulnerabilitystatus="1"></versionRange>
+                            <infoURL>https://java.com/</infoURL>
+          </pluginItem>
+      <pluginItem  blockID="p906">
+      <match name="name" exp="Java\(TM\) Platform SE 7 U(4[5-9]|(5|6)\d|7[0-8])(\s[^\d\._U]|$)" />            <match name="filename" exp="npjp2\.dll" />                      <versionRange  severity="0" vulnerabilitystatus="1"></versionRange>
+                            <infoURL>https://java.com/</infoURL>
+          </pluginItem>
+      <pluginItem  blockID="p908">
+      <match name="name" exp="Java\(TM\) Platform SE 8( U([1-3]?\d|4[0-4]))?(\s[^\d\._U]|$)" />            <match name="filename" exp="npjp2\.dll" />                      <versionRange  severity="0" vulnerabilitystatus="1"></versionRange>
+                            <infoURL>https://java.com/</infoURL>
+          </pluginItem>
+      <pluginItem  blockID="p910">
+      <match name="name" exp="Java(\(TM\))? Plug-in 10\.(4[5-9]|(5|6)\d|7[0-8])(\.[0-9]+)?([^\d\._]|$)" />            <match name="filename" exp="libnpjp2\.so" />                      <versionRange  severity="0" vulnerabilitystatus="1"></versionRange>
+                            <infoURL>https://java.com/</infoURL>
+          </pluginItem>
+      <pluginItem  blockID="p912">
+      <match name="name" exp="Java(\(TM\))? Plug-in 11\.(\d|[1-3]\d|4[0-4])(\.[0-9]+)?([^\d\._]|$)" />            <match name="filename" exp="libnpjp2\.so" />                      <versionRange  severity="0" vulnerabilitystatus="1"></versionRange>
+                            <infoURL>https://java.com/</infoURL>
+          </pluginItem>
     </pluginItems>
 
   <gfxItems>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/app/profile/firefox.js firefox-trunk-41.0~a1~hg20150524r245419/browser/app/profile/firefox.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/app/profile/firefox.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/app/profile/firefox.js	2015-05-25 20:42:40.000000000 +0000
@@ -198,7 +198,7 @@
 pref("app.update.idletime", 60);
 
 // Whether or not we show a dialog box informing the user that the update was
-// successfully applied. This is off in Firefox by default since we show a 
+// successfully applied. This is off in Firefox by default since we show a
 // upgrade start page instead! Other apps may wish to show this UI, and supply
 // a whatsNewURL field in their brand.properties that contains a link to a page
 // which tells users what's new in this new update.
@@ -225,10 +225,10 @@
 pref("extensions.update.enabled", true);
 pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%&currentAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%");
 pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%&currentAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%");
-pref("extensions.update.interval", 86400);  // Check for updates to Extensions and 
+pref("extensions.update.interval", 86400);  // Check for updates to Extensions and
                                             // Themes every day
 // Non-symmetric (not shared by extensions) extension-specific [update] preferences
-pref("extensions.dss.enabled", false);          // Dynamic Skin Switching                                               
+pref("extensions.dss.enabled", false);          // Dynamic Skin Switching
 pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
                                                 // restart.
 
@@ -359,7 +359,7 @@
 pref("browser.download.debug", false);
 
 // Number of milliseconds to wait for the http headers (and thus
-// the Content-Disposition filename) before giving up and falling back to 
+// the Content-Disposition filename) before giving up and falling back to
 // picking a filename without that info in hand so that the user sees some
 // feedback from their action.
 pref("browser.download.saveLinkAsFilenameTimeout", 4000);
@@ -383,10 +383,14 @@
 // search engines URL
 pref("browser.search.searchEnginesURL",      "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/");
 
+// Tell the search service to load search plugins from the locale JAR
+pref("browser.search.loadFromJars", true);
+pref("browser.search.jarURIs", "chrome://browser/locale/searchplugins/");
+
 // pointer to the default engine name
 pref("browser.search.defaultenginename",      "chrome://browser-region/locale/region.properties");
 
-// Ordering of Search Engines in the Engine list. 
+// Ordering of Search Engines in the Engine list.
 pref("browser.search.order.1",                "chrome://browser-region/locale/region.properties");
 pref("browser.search.order.2",                "chrome://browser-region/locale/region.properties");
 pref("browser.search.order.3",                "chrome://browser-region/locale/region.properties");
@@ -458,7 +462,7 @@
 pref("browser.tabs.drawInTitlebar", true);
 #endif
 
-// When tabs opened by links in other tabs via a combination of 
+// When tabs opened by links in other tabs via a combination of
 // browser.link.open_newwindow being set to 3 and target="_blank" etc are
 // closed:
 // true   return to the tab that opened this tab (its owner)
@@ -472,7 +476,7 @@
 // be exported as HTML to the bookmarks.html file.
 pref("browser.bookmarks.autoExportHTML",          false);
 
-// The maximum number of daily bookmark backups to 
+// The maximum number of daily bookmark backups to
 // keep in {PROFILEDIR}/bookmarkbackups. Special values:
 // -1: unlimited
 //  0: no backups created (and deletes all existing backups)
@@ -485,7 +489,7 @@
 pref("general.warnOnAboutConfig",                 false);
 #endif
 
-// This is the pref to control the location bar, change this to true to 
+// This is the pref to control the location bar, change this to true to
 // force this - this makes the origin of popup windows more obvious to avoid
 // spoofing. We would rather not do it by default because it affects UE for web
 // applications, but without it there isn't a really good way to prevent chrome
@@ -913,7 +917,7 @@
 // At startup, if the handler service notices that the version number in the
 // region.properties file is newer than the version number in the handler
 // service datastore, it will add any new handlers it finds in the prefs (as
-// seeded by this file) to its datastore.  
+// seeded by this file) to its datastore.
 pref("gecko.handlerService.defaultHandlersVersion", "chrome://browser-region/locale/region.properties");
 
 // The default set of web-based protocol handlers shown in the application
@@ -1210,6 +1214,9 @@
 pref("security.sandbox.content.level", 0);
 #endif
 
+// ID (a UUID when set by gecko) that is used as a per profile suffix to a low
+// integrity temp directory.
+pref("security.sandbox.content.tempDirSuffix", "");
 
 #if defined(MOZ_STACKWALKING)
 // This controls the depth of stack trace that is logged when Windows sandbox
@@ -1332,6 +1339,8 @@
 #ifdef MOZ_DEV_EDITION
 sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
 sticky_pref("browser.devedition.theme.enabled", true);
+#else
+sticky_pref("lightweightThemes.selectedThemeID", "");
 #endif
 
 // Developer edition promo preferences
@@ -1373,7 +1382,7 @@
 
 // Toolbox Button preferences
 pref("devtools.command-button-pick.enabled", true);
-pref("devtools.command-button-frames.enabled", false);
+pref("devtools.command-button-frames.enabled", true);
 pref("devtools.command-button-splitconsole.enabled", true);
 pref("devtools.command-button-paintflashing.enabled", false);
 pref("devtools.command-button-tilt.enabled", false);
@@ -1401,6 +1410,8 @@
 pref("devtools.inspector.showAllAnonymousContent", false);
 // Enable the MDN docs tooltip
 pref("devtools.inspector.mdnDocsTooltip.enabled", true);
+// Show the new animation inspector UI
+pref("devtools.inspector.animationInspectorV3", false);
 
 // DevTools default color unit
 pref("devtools.defaultColorUnit", "hex");
@@ -1435,7 +1446,9 @@
 
 // The default Performance UI settings
 pref("devtools.performance.memory.sample-probability", "0.05");
-pref("devtools.performance.memory.max-log-length", 2147483647); // Math.pow(2,31) - 1
+// Can't go higher than this without causing internal allocation overflows while
+// serializing the allocations data over the RDP.
+pref("devtools.performance.memory.max-log-length", 125000);
 pref("devtools.performance.timeline.hidden-markers", "[]");
 pref("devtools.performance.profiler.buffer-size", 10000000);
 pref("devtools.performance.profiler.sample-frequency-khz", 1);
@@ -1447,13 +1460,12 @@
 pref("devtools.performance.ui.enable-memory", false);
 pref("devtools.performance.ui.enable-framerate", true);
 pref("devtools.performance.ui.show-jit-optimizations", false);
-// If in aurora/dev edition (40.0, will revert for 40.1), set default
-// to retro mode.
-// TODO bug 1160313
-#ifdef MOZ_DEV_EDITION
-  pref("devtools.performance.ui.retro-mode", true);
+
+// Enable experimental options in the UI only in Nightly
+#if defined(NIGHTLY_BUILD)
+pref("devtools.performance.ui.experimental", true);
 #else
-  pref("devtools.performance.ui.retro-mode", false);
+pref("devtools.performance.ui.experimental", false);
 #endif
 
 // The default cache UI setting
@@ -1632,6 +1644,9 @@
 // Remembers if the about:newtab intro has been shown
 pref("browser.newtabpage.introShown", false);
 
+// Remembers if the about:newtab update intro has been shown
+pref("browser.newtabpage.updateIntroShown", false);
+
 // Toggles the content of 'about:newtab'. Shows the grid when enabled.
 pref("browser.newtabpage.enabled", true);
 
@@ -1689,6 +1704,7 @@
 pref("image.mem.max_decoded_image_kb", 256000);
 
 pref("loop.enabled", true);
+pref("loop.textChat.enabled", false);
 pref("loop.server", "https://loop.services.mozilla.com/v0");
 pref("loop.seenToS", "unseen");
 pref("loop.showPartnerLogo", true);
@@ -1764,19 +1780,11 @@
 #endif
 
 #ifdef XP_MACOSX
-#ifdef RELEASE_BUILD
 pref("geo.provider.use_corelocation", false);
-#else
-pref("geo.provider.use_corelocation", true);
-#endif
 #endif
 
 #ifdef XP_WIN
-#ifdef RELEASE_BUILD
 pref("geo.provider.ms-windows-location", false);
-#else
-pref("geo.provider.ms-windows-location", true);
-#endif
 #endif
 
 // Necko IPC security checks only needed for app isolation for cookies/cache/etc:
@@ -1907,14 +1915,11 @@
 // Don't limit how many nodes we care about on desktop:
 pref("reader.parse-node-limit", 0);
 
-// Enable Service workers for desktop on non-release builds
-#ifdef NIGHTLY_BUILD
-pref("dom.serviceWorkers.enabled", true);
-#endif
-
 pref("browser.pocket.enabled", true);
 pref("browser.pocket.api", "api.getpocket.com");
 pref("browser.pocket.site", "getpocket.com");
 pref("browser.pocket.oAuthConsumerKey", "40249-e88c401e1b1f2242d9e441c4");
 pref("browser.pocket.useLocaleList", true);
-pref("browser.pocket.enabledLocales", "en-US de es-ES ja ru");
+pref("browser.pocket.enabledLocales", "en-US de es-ES ja ja-JP-mac ru");
+
+pref("view_source.tab", true);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/abouthome/aboutHome.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/abouthome/aboutHome.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/abouthome/aboutHome.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/abouthome/aboutHome.js	2015-05-25 20:42:40.000000000 +0000
@@ -307,11 +307,19 @@
   if (engineName && searchTerms.length > 0) {
     // Send an event that will perform a search and Firefox Health Report will
     // record that a search from about:home has occurred.
-    let useNewTab = aEvent && aEvent.button == 1;
     let eventData = {
       engineName: engineName,
       searchTerms: searchTerms,
-      useNewTab: useNewTab,
+      originalEvent: {
+        target: {
+          ownerDocument: null
+        },
+        shiftKey: aEvent.shiftKey,
+        ctrlKey: aEvent.ctrlKey,
+        metaKey: aEvent.metaKey,
+        altKey: aEvent.altKey,
+        button: aEvent.button,
+      },
     };
 
     if (searchText.hasAttribute("selection-index")) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/aboutSocialError.xhtml firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/aboutSocialError.xhtml
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/aboutSocialError.xhtml	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/aboutSocialError.xhtml	2015-05-25 20:42:40.000000000 +0000
@@ -46,13 +46,14 @@
     }
 
     function parseQueryString() {
-      let searchParams = new URLSearchParams(location.href.split("?")[1]);
+      let searchParams = new URLSearchParams(document.documentURI.split("?")[1]);
       let mode = searchParams.get("mode");
-      config.directory = searchParams.get("directory");
       config.origin = searchParams.get("origin");
       let encodedURL = searchParams.get("url");
       let url = decodeURIComponent(encodedURL);
-      if (config.directory) {
+      // directory does not have origin set, in that case use the url origin for
+      // the error message.
+      if (!config.origin) {
         let URI = Services.io.newURI(url, null, null);
         config.origin = Services.scriptSecurityManager.getNoAppCodebasePrincipal(URI).origin;
       }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/baseMenuOverlay.xul firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/baseMenuOverlay.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/baseMenuOverlay.xul	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/baseMenuOverlay.xul	2015-05-25 20:42:40.000000000 +0000
@@ -114,6 +114,5 @@
     <stringbundleset id="stringbundleset">
         <stringbundle id="bundle_browser" src="chrome://browser/locale/browser.properties"/>
         <stringbundle id="bundle_browser_region" src="chrome://browser-region/locale/region.properties"/>
-        <stringbundle id="bundle_pocket" src="chrome://browser/content/browser-pocket.properties"/>
     </stringbundleset>
 </overlay>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-addons.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-addons.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-addons.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-addons.js	2015-05-25 20:42:40.000000000 +0000
@@ -49,11 +49,27 @@
     };
 
     try {
-      options.originHost = installInfo.originatingURI.host;
+      options.displayOrigin = installInfo.originatingURI.host;
     } catch (e) {
       // originatingURI might be missing or 'host' might throw for non-nsStandardURL nsIURIs.
     }
 
+    let cancelInstallation = () => {
+      if (installInfo) {
+        for (let install of installInfo.installs)
+          install.cancel();
+      }
+
+      if (aTopic == "addon-install-confirmation")
+        this.acceptInstallation = null;
+
+      let tab = gBrowser.getTabForBrowser(browser);
+      if (tab)
+        tab.removeEventListener("TabClose", cancelInstallation);
+
+      window.removeEventListener("unload", cancelInstallation);
+    };
+
     switch (aTopic) {
     case "addon-install-disabled": {
       notificationID = "xpinstall-disabled";
@@ -78,11 +94,6 @@
                               action, null, options);
       break; }
     case "addon-install-blocked": {
-      if (!options.originHost) {
-        // Need to deal with missing originatingURI and with about:/data: URIs more gracefully,
-        // see bug 1063418 - but for now, bail:
-        return;
-      }
       messageString = gNavigatorBundle.getFormattedString("xpinstallPromptMessage",
                         [brandShortName]);
 
@@ -138,25 +149,25 @@
     case "addon-install-failed": {
       // TODO This isn't terribly ideal for the multiple failure case
       for (let install of installInfo.installs) {
-        let host = options.originHost;
+        let host = options.displayOrigin;
         if (!host)
           host = (install.sourceURI instanceof Ci.nsIStandardURL) &&
                  install.sourceURI.host;
 
-        let error = (host || install.error == 0) ? "addonError" : "addonLocalError";
-        if (install.error != 0)
+        let error = (host || install.error == 0) ? "addonInstallError" : "addonLocalInstallError";
+        let args;
+        if (install.error < 0) {
           error += install.error;
-        else if (install.addon.blocklistState == Ci.nsIBlocklistService.STATE_BLOCKED)
+          args = [brandShortName, install.name];
+        } else if (install.addon.blocklistState == Ci.nsIBlocklistService.STATE_BLOCKED) {
           error += "Blocklisted";
-        else
+          args = [install.name];
+        } else {
           error += "Incompatible";
+          args = [brandShortName, Services.appinfo.version, install.name];
+        }
 
-        messageString = gNavigatorBundle.getString(error);
-        messageString = messageString.replace("#1", install.name);
-        if (host)
-          messageString = messageString.replace("#2", host);
-        messageString = messageString.replace("#3", brandShortName);
-        messageString = messageString.replace("#4", Services.appinfo.version);
+        messageString = gNavigatorBundle.getFormattedString(error, args);
 
         PopupNotifications.show(browser, notificationID, messageString, anchorID,
                                 action, null, options);
@@ -170,11 +181,7 @@
       options.eventCallback = (aEvent) => {
         switch (aEvent) {
           case "removed":
-            if (installInfo) {
-              for (let install of installInfo.installs)
-                install.cancel();
-            }
-            this.acceptInstallation = null;
+            cancelInstallation();
             break;
           case "shown":
             let addonList = document.getElementById("addon-install-confirmation-content");
@@ -215,18 +222,22 @@
       options.learnMoreURL = Services.urlFormatter.formatURLPref("app.support.baseURL") +
                              "find-and-install-add-ons";
 
+      let notification = document.getElementById("addon-install-confirmation-notification");
       if (unsigned.length == installInfo.installs.length) {
         // None of the add-ons are verified
         messageString = gNavigatorBundle.getString("addonConfirmInstallUnsigned.message");
+        notification.setAttribute("warning", "true");
       }
       else if (unsigned.length == 0) {
         // All add-ons are verified or don't need to be verified
         messageString = gNavigatorBundle.getString("addonConfirmInstall.message");
+        notification.removeAttribute("warning");
       }
       else {
         // Some of the add-ons are unverified, the list of names will indicate
         // which
         messageString = gNavigatorBundle.getString("addonConfirmInstallSomeUnsigned.message");
+        notification.setAttribute("warning", "true");
       }
 
       messageString = PluralForm.get(installInfo.installs.length, messageString);
@@ -243,8 +254,12 @@
 
       let showNotification = () => {
         let tab = gBrowser.getTabForBrowser(browser);
-        if (tab)
+        if (tab) {
           gBrowser.selectedTab = tab;
+          tab.addEventListener("TabClose", cancelInstallation);
+        }
+
+        window.addEventListener("unload", cancelInstallation);
 
         if (PopupNotifications.isPanelOpen) {
           let rect = document.getElementById("addon-progress-notification").getBoundingClientRect();
@@ -283,6 +298,7 @@
       });
 
       if (needsRestart) {
+        notificationID = "addon-install-restart";
         messageString = gNavigatorBundle.getString("addonsInstalledNeedsRestart");
         action = {
           label: gNavigatorBundle.getString("addonInstallRestartButton"),
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-context.inc firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-context.inc
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-context.inc	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-context.inc	2015-05-25 20:42:40.000000000 +0000
@@ -79,6 +79,10 @@
                 label="&saveLinkCmd.label;"
                 accesskey="&saveLinkCmd.accesskey;"
                 oncommand="gContextMenu.saveLink();"/>
+      <menuitem id="context-savelinktopocket"
+                label="&saveLinkToPocketCmd.label;"
+                accesskey="&saveLinkToPocketCmd.accesskey;"
+                oncommand="gContextMenu.saveLinkToPocket();"/>
       <menu id="context-marklinkMenu" label="&social.marklinkMenu.label;"
             accesskey="&social.marklinkMenu.accesskey;">
         <menupopup/>
@@ -269,7 +273,7 @@
       <menuitem id="context-pocket"
                 label="&saveToPocketCmd.label;"
                 accesskey="&saveToPocketCmd.accesskey;"
-                oncommand="gContextMenu.saveToPocket();"/>
+                oncommand="gContextMenu.savePageToPocket();"/>
       <menu id="context-markpageMenu" label="&social.markpageMenu.label;"
             accesskey="&social.markpageMenu.accesskey;">
         <menupopup/>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser.css firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser.css	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser.css	2015-05-25 20:42:41.000000000 +0000
@@ -773,8 +773,8 @@
   -moz-binding: url("chrome://browser/content/urlbarBindings.xml#click-to-play-plugins-notification");
 }
 
-#password-fill-notification {
-  -moz-binding: url("chrome://browser/content/urlbarBindings.xml#password-fill-notification");
+#login-fill-notification {
+  -moz-binding: url("chrome://browser/content/urlbarBindings.xml#login-fill-notification");
 }
 
 .login-fill-item {
@@ -1033,6 +1033,9 @@
 /* Combobox dropdown renderer */
 #ContentSelectDropdown > menupopup {
   max-height: 350px;
+  /* The menupopup itself should always be rendered LTR to ensure the scrollbar aligns with
+   * the dropdown arrow on the dropdown widget. If a menuitem is RTL, its style will be set accordingly */
+  direction: ltr;
 }
 
 .contentSelectDropdown-optgroup {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-fullScreen.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-fullScreen.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-fullScreen.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-fullScreen.js	2015-05-25 20:42:41.000000000 +0000
@@ -6,19 +6,27 @@
 var FullScreen = {
   _XULNS: "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
 
+  _MESSAGES: [
+    "DOMFullscreen:Entered",
+    "DOMFullscreen:NewOrigin",
+    "DOMFullscreen:Exited"
+  ],
+
   init: function() {
     // called when we go into full screen, even if initiated by a web page script
     window.addEventListener("fullscreen", this, true);
-    window.messageManager.addMessageListener("MozEnteredDomFullscreen", this);
-    window.messageManager.addMessageListener("MozExitedDomFullscreen", this);
+    for (let type of this._MESSAGES) {
+      window.messageManager.addMessageListener(type, this);
+    }
 
     if (window.fullScreen)
       this.toggle();
   },
 
   uninit: function() {
-    window.messageManager.removeMessageListener("MozEnteredDomFullscreen", this);
-    window.messageManager.removeMessageListener("MozExitedDomFullscreen", this);
+    for (let type of this._MESSAGES) {
+      window.messageManager.removeMessageListener(type, this);
+    }
     this.cleanup();
   },
 
@@ -50,21 +58,6 @@
       this._fullScrToggler.addEventListener("dragenter", this._expandCallback, false);
     }
 
-    // On OS X Lion we don't want to hide toolbars when entering fullscreen, unless
-    // we're entering DOM fullscreen, in which case we should hide the toolbars.
-    // If we're leaving fullscreen, then we'll go through the exit code below to
-    // make sure toolbars are made visible in the case of DOM fullscreen.
-    if (enterFS && this.useLionFullScreen) {
-      if (document.mozFullScreen) {
-        this.showXULChrome("toolbar", false);
-      }
-      else {
-        gNavToolbox.setAttribute("inFullscreen", true);
-        document.documentElement.setAttribute("inFullscreen", true);
-      }
-      return;
-    }
-
     // show/hide menubars, toolbars (except the full screen toolbar)
     this.showXULChrome("toolbar", !enterFS);
 
@@ -108,34 +101,45 @@
   },
 
   receiveMessage: function(aMessage) {
-    if (aMessage.name == "MozEnteredDomFullscreen") {
-      // If we're a multiprocess browser, then the request to enter fullscreen
-      // did not bubble up to the root browser document - it stopped at the root
-      // of the content document. That means we have to kick off the switch to
-      // fullscreen here at the operating system level in the parent process
-      // ourselves.
-      let data = aMessage.data;
-      let browser = aMessage.target;
-      if (gMultiProcessBrowser && browser.getAttribute("remote") == "true") {
-        let windowUtils = window.QueryInterface(Ci.nsIInterfaceRequestor)
-                                .getInterface(Ci.nsIDOMWindowUtils);
-        windowUtils.remoteFrameFullscreenChanged(browser, data.origin);
+    let browser = aMessage.target;
+    switch (aMessage.name) {
+      case "DOMFullscreen:Entered": {
+        // If we're a multiprocess browser, then the request to enter
+        // fullscreen did not bubble up to the root browser document -
+        // it stopped at the root of the content document. That means
+        // we have to kick off the switch to fullscreen here at the
+        // operating system level in the parent process ourselves.
+        if (this._isRemoteBrowser(browser)) {
+          this._windowUtils.remoteFrameFullscreenChanged(browser);
+        }
+        this.enterDomFullscreen(browser);
+        break;
       }
-      this.enterDomFullscreen(browser, data.origin);
-    } else if (aMessage.name == "MozExitedDomFullscreen") {
-      document.documentElement.removeAttribute("inDOMFullscreen");
-      this.cleanupDomFullscreen();
-      this.showNavToolbox();
-      // If we are still in fullscreen mode, re-hide
-      // the toolbox with animation.
-      if (window.fullScreen) {
-        this._shouldAnimate = true;
-        this.hideNavToolbox();
+      case "DOMFullscreen:NewOrigin": {
+        this.showWarning(aMessage.data.origin);
+        break;
+      }
+      case "DOMFullscreen:Exited": {
+        // Like entering DOM fullscreen, we also need to exit fullscreen
+        // at the operating system level in the parent process here.
+        if (this._isRemoteBrowser(browser)) {
+          this._windowUtils.remoteFrameFullscreenReverted();
+        }
+        document.documentElement.removeAttribute("inDOMFullscreen");
+        this.cleanupDomFullscreen();
+        this.showNavToolbox();
+        // If we are still in fullscreen mode, re-hide
+        // the toolbox with animation.
+        if (window.fullScreen) {
+          this._shouldAnimate = true;
+          this.hideNavToolbox();
+        }
+        break;
       }
     }
   },
 
-  enterDomFullscreen : function(aBrowser, aOrigin) {
+  enterDomFullscreen : function(aBrowser) {
     if (!document.mozFullScreen)
       return;
 
@@ -161,8 +165,6 @@
     if (gFindBarInitialized)
       gFindBar.close();
 
-    this.showWarning(aOrigin);
-
     // Exit DOM full-screen mode upon open, close, or change tab.
     gBrowser.tabContainer.addEventListener("TabOpen", this.exitDomFullScreen);
     gBrowser.tabContainer.addEventListener("TabClose", this.exitDomFullScreen);
@@ -201,7 +203,16 @@
       window.removeEventListener("activate", this);
 
     window.messageManager
-          .broadcastAsyncMessage("DOMFullscreen:Cleanup");
+          .broadcastAsyncMessage("DOMFullscreen:CleanUp");
+  },
+
+  _isRemoteBrowser: function (aBrowser) {
+    return gMultiProcessBrowser && aBrowser.getAttribute("remote") == "true";
+  },
+
+  get _windowUtils() {
+    return window.QueryInterface(Ci.nsIInterfaceRequestor)
+                 .getInterface(Ci.nsIDOMWindowUtils);
   },
 
   getMouseTargetRect: function()
@@ -238,9 +249,14 @@
     if (!gPrefService.getBoolPref("browser.fullscreen.autohide"))
       return false;
 
-    // a popup menu is open in chrome: don't collapse chrome
-    if (!forceHide && this._isPopupOpen)
-      return false;
+    if (!forceHide) {
+      // a popup menu is open in chrome: don't collapse chrome
+      if (this._isPopupOpen)
+        return false;
+      // On OS X Lion we don't want to hide toolbars.
+      if (this.useLionFullScreen)
+        return false;
+    }
 
     // a textbox in chrome is focused (location bar anyone?): don't collapse chrome
     if (document.commandDispatcher.focusedElement &&
@@ -448,7 +464,7 @@
 
     // Track whether mouse is near the toolbox
     this._isChromeCollapsed = false;
-    if (trackMouse) {
+    if (trackMouse && !this.useLionFullScreen) {
       let rect = gBrowser.mPanelContainer.getBoundingClientRect();
       this._mouseTargetRect = {
         top: rect.top + 50,
@@ -547,6 +563,16 @@
       document.documentElement.setAttribute("inFullscreen", true);
     }
 
+    ToolbarIconColor.inferFromText();
+
+    // For Lion fullscreen, all fullscreen controls are hidden, don't
+    // bother to touch them. If we don't stop here, the following code
+    // could cause the native fullscreen button be shown unexpectedly.
+    // See bug 1165570.
+    if (this.useLionFullScreen) {
+      return;
+    }
+
     var fullscreenctls = document.getElementById("window-controls");
     var navbar = document.getElementById("nav-bar");
     var ctlsOnTabbar = window.toolbar.visible;
@@ -559,8 +585,6 @@
       navbar.appendChild(fullscreenctls);
     }
     fullscreenctls.hidden = aShow;
-
-    ToolbarIconColor.inferFromText();
   }
 };
 XPCOMUtils.defineLazyGetter(FullScreen, "useLionFullScreen", function() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser.js	2015-05-25 20:42:41.000000000 +0000
@@ -55,6 +55,35 @@
 XPCOMUtils.defineLazyModuleGetter(this, "Pocket",
                                   "resource:///modules/Pocket.jsm");
 
+// Can't use XPCOMUtils for these because the scripts try to define the variables
+// on window, and so the defineProperty inside defineLazyGetter fails.
+Object.defineProperty(window, "pktApi", {
+  get: function() {
+    // Avoid this getter running again:
+    delete window.pktApi;
+    Services.scriptloader.loadSubScript("chrome://browser/content/pocket/pktApi.js", window);
+    return window.pktApi;
+  },
+  configurable: true,
+  enumerable: true
+});
+
+function pktUIGetter(prop) {
+  return {
+    get: function() {
+      // Avoid either of these getters running again:
+      delete window.pktUI;
+      delete window.pktUIMessaging;
+      Services.scriptloader.loadSubScript("chrome://browser/content/pocket/main.js", window);
+      return window[prop];
+    },
+    configurable: true,
+    enumerable: true
+  };
+}
+Object.defineProperty(window, "pktUI", pktUIGetter("pktUI"));
+Object.defineProperty(window, "pktUIMessaging", pktUIGetter("pktUIMessaging"));
+
 const nsIWebNavigation = Ci.nsIWebNavigation;
 
 var gLastBrowserCharset = null;
@@ -957,6 +986,7 @@
     mm.loadFrameScript("chrome://browser/content/content.js", true);
     mm.loadFrameScript("chrome://browser/content/content-UITour.js", true);
     mm.loadFrameScript("chrome://global/content/manifestMessages.js", true);
+    mm.loadFrameScript("chrome://global/content/viewSource-content.js", true);
 
     window.messageManager.addMessageListener("Browser:LoadURI", RedirectLoad);
 
@@ -2293,11 +2323,11 @@
  *        If aArgsOrDocument is an object, that object can take the
  *        following properties:
  *
- *        browser:
- *          The browser containing the document that we would like to view the
- *          source of.
- *        URL:
+ *        URL (required):
  *          A string URL for the page we'd like to view the source of.
+ *        browser (optional):
+ *          The browser containing the document that we would like to view the
+ *          source of. This is required if outerWindowID is passed.
  *        outerWindowID (optional):
  *          The outerWindowID of the content window containing the document that
  *          we want to view the source of. You only need to provide this if you
@@ -2330,7 +2360,18 @@
     args = aArgsOrDocument;
   }
 
-  top.gViewSourceUtils.viewSource(args);
+  let inTab = Services.prefs.getBoolPref("view_source.tab");
+  if (inTab) {
+    let viewSourceURL = `view-source:${args.URL}`;
+    let tab = gBrowser.loadOneTab(viewSourceURL, {
+      relatedToCurrent: true,
+      inBackground: false
+    });
+    args.viewSourceBrowser = gBrowser.getBrowserForTab(tab);
+    top.gViewSourceUtils.viewSourceInBrowser(args);
+  } else {
+    top.gViewSourceUtils.viewSource(args);
+  }
 }
 
 /**
@@ -2389,9 +2430,8 @@
 
     // Replace initial page URIs with an empty string
     // only if there's no opener (bug 370555).
-    // Bug 863515 - Make content.opener checks work in electrolysis.
     if (gInitialPages.indexOf(uri.spec) != -1)
-      value = !gMultiProcessBrowser && content.opener ? uri.spec : "";
+      value = gBrowser.selectedBrowser.hasContentOpener ? uri.spec : "";
     else
       value = losslessDecodeURI(uri);
 
@@ -4158,7 +4198,7 @@
     // Do not update urlbar if there was a subframe navigation
 
     if (aWebProgress.isTopLevel) {
-      if ((location == "about:blank" && (gMultiProcessBrowser || !content.opener)) ||
+      if ((location == "about:blank" && !gBrowser.selectedBrowser.hasContentOpener) ||
           location == "") {  // Second condition is for new tabs, otherwise
                              // reload function is enabled until tab is refreshed.
         this.reloadCommand.setAttribute("disabled", "true");
@@ -4172,7 +4212,6 @@
         BookmarkingUI.onLocationChange();
         SocialUI.updateState(location);
         UITour.onLocationChange(location);
-        Pocket.onLocationChange(browser, aLocationURI);
       }
 
       // Utility functions for disabling find
@@ -4531,7 +4570,7 @@
     if (aFlags & Ci.nsIWebProgressListener.LOCATION_CHANGE_SAME_DOCUMENT) {
       // Reader mode actually cares about these:
       let mm = gBrowser.selectedBrowser.messageManager;
-      mm.sendAsyncMessage("Reader:PushState");
+      mm.sendAsyncMessage("Reader:PushState", {isArticle: gBrowser.selectedBrowser.isArticle});
       return;
     }
 
@@ -5533,7 +5572,7 @@
 
   clipboard = stripUnsafeProtocolOnPaste(clipboard);
 
-  // if it's not the current tab, we don't need to do anything because the 
+  // if it's not the current tab, we don't need to do anything because the
   // browser doesn't exist.
   let where = whereToOpenLink(event, true, false);
   let lastLocationChange;
@@ -6251,10 +6290,10 @@
         otherPBWindowExists = true;
       if (win.toolbar.visible)
         nonPopupPresent = true;
-      // If the current window is not in private browsing mode we don't need to 
-      // look for other pb windows, we can leave the loop when finding the 
-      // first non-popup window. If however the current window is in private 
-      // browsing mode then we need at least one other pb and one non-popup 
+      // If the current window is not in private browsing mode we don't need to
+      // look for other pb windows, we can leave the loop when finding the
+      // first non-popup window. If however the current window is in private
+      // browsing mode then we need at least one other pb and one non-popup
       // window to break out early.
       if ((!isPBWindow || otherPBWindowExists) && nonPopupPresent)
         break;
@@ -6533,8 +6572,7 @@
   if (!isBlankPageURL(browser.currentURI.spec))
     return false;
 
-  // Bug 863515 - Make content.opener checks work in electrolysis.
-  if (!gMultiProcessBrowser && browser.contentWindow.opener)
+  if (browser.hasContentOpener)
     return false;
 
   if (browser.canGoForward || browser.canGoBack)
@@ -7073,7 +7111,7 @@
     dt.setData("text/html", htmlString);
     dt.setDragImage(gProxyFavIcon, 16, 16);
   },
- 
+
   handleEvent: function (event) {
     switch (event.type) {
       case "blur":
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-loop.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-loop.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-loop.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-loop.js	2015-05-25 20:42:41.000000000 +0000
@@ -218,7 +218,15 @@
       // Add observer notifications before the service is initialized
       Services.obs.addObserver(this, "loop-status-changed", false);
 
-      this.MozLoopService.initialize();
+      // This is a promise for test purposes, but we don't want to be logging
+      // expected errors to the console, so we catch them here.
+      this.MozLoopService.initialize().catch(ex => {
+        if (!ex.message ||
+            (!ex.message.contains("not enabled") &&
+             !ex.message.contains("not needed"))) {
+          console.error(ex);
+        }
+      });
       this.updateToolbarState();
     },
 
@@ -504,6 +512,49 @@
         this._maybeShowBrowserSharingInfoBar();
       }
     },
+
+    /**
+     * Fetch the favicon of the currently selected tab in the format of a data-uri.
+     *
+     * @param  {Function} callback Function to be invoked with an error object as
+     *                             its first argument when an error occurred or
+     *                             a string as second argument when the favicon
+     *                             has been fetched.
+     */
+    getFavicon: function(callback) {
+      let favicon = gBrowser.getIcon(gBrowser.selectedTab);
+      // If the tab image's url starts with http(s), fetch icon from favicon
+      // service via the moz-anno protocol.
+      if (/^https?:/.test(favicon)) {
+        let faviconURI = makeURI(favicon);
+        favicon = this.favIconService.getFaviconLinkForIcon(faviconURI).spec;
+      }
+      if (!favicon) {
+        callback(new Error("No favicon found"));
+        return;
+      }
+      favicon = this.PlacesUtils.getImageURLForResolution(window, favicon);
+
+      // We XHR the favicon to get a File object, which we can pass to the FileReader
+      // object. The FileReader turns the File object into a data-uri.
+      let xhr = new XMLHttpRequest();
+      xhr.open("get", favicon, true);
+      xhr.responseType = "blob";
+      xhr.overrideMimeType("image/x-icon");
+      xhr.onload = () => {
+        if (xhr.status != 200) {
+          callback(new Error("Invalid status code received for favicon XHR: " + xhr.status));
+          return;
+        }
+
+        let reader = new FileReader();
+        reader.onload = () => callback(null, reader.result);
+        reader.onerror = callback;
+        reader.readAsDataURL(xhr.response);
+      };
+      xhr.onerror = callback;
+      xhr.send();
+    }
   };
 })();
 
@@ -511,3 +562,6 @@
 XPCOMUtils.defineLazyModuleGetter(LoopUI, "LoopRooms", "resource:///modules/loop/LoopRooms.jsm");
 XPCOMUtils.defineLazyModuleGetter(LoopUI, "MozLoopService", "resource:///modules/loop/MozLoopService.jsm");
 XPCOMUtils.defineLazyModuleGetter(LoopUI, "PanelFrame", "resource:///modules/PanelFrame.jsm");
+XPCOMUtils.defineLazyModuleGetter(LoopUI, "PlacesUtils", "resource://gre/modules/PlacesUtils.jsm");
+XPCOMUtils.defineLazyServiceGetter(LoopUI, "favIconService",
+  "@mozilla.org/browser/favicon-service;1", "nsIFaviconService");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-menubar.inc firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-menubar.inc
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-menubar.inc	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-menubar.inc	2015-05-25 20:42:41.000000000 +0000
@@ -397,6 +397,9 @@
                 key="manBookmarkKb"/>
       <menuseparator id="organizeBookmarksSeparator"/>
       <menuitem id="menu_pocket" label="&pocketMenuitem.label;"
+#ifndef XP_MACOSX
+                class="menuitem-iconic"
+#endif
                 oncommand="openUILink(Pocket.listURL, event);"/>
       <menuseparator id="menu_pocketSeparator"/>
       <menuitem id="menu_bookmarkThisPage"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-places.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-places.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-places.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-places.js	2015-05-25 20:42:41.000000000 +0000
@@ -483,38 +483,32 @@
    *        the address of the link target
    * @param aTitle
    *        The link text
+   * @param [optional] aDescription
+   *        The linked page description, if available
    */
-  bookmarkLink: Task.async(function* (aParentId, aURL, aTitle) {
-    let node = null;
-    if (PlacesUIUtils.useAsyncTransactions) {
-      node = yield PlacesUIUtils.fetchNodeLike({ url: aURL });
-    }
-    else {
-      let linkURI = makeURI(aURL);
-      let itemId = PlacesUtils.getMostRecentBookmarkForURI(linkURI);
-      if (itemId != -1) {
-        node = { itemId, uri: aURL };
-        PlacesUIUtils.completeNodeLikeObjectForItemId(node);
-      }
-    }
-
+  bookmarkLink: Task.async(function* (aParentId, aURL, aTitle, aDescription="") {
+    let node = yield PlacesUIUtils.fetchNodeLike({ url: aURL });
     if (node) {
       PlacesUIUtils.showBookmarkDialog({ action: "edit"
-                                       , type: "bookmark"
                                        , node
-                                       }, window);
-    }
-    else {
-      PlacesUIUtils.showBookmarkDialog({ action: "add"
-                                       , type: "bookmark"
-                                       , uri: linkURI
-                                       , title: aTitle
-                                       , hiddenRows: [ "description"
-                                                     , "location"
-                                                     , "loadInSidebar"
-                                                     , "keyword" ]
-                                       }, window);
+                                       }, window.top);
+      return;
     }
+
+    let ip = new InsertionPoint(aParentId,
+                                PlacesUtils.bookmarks.DEFAULT_INDEX,
+                                Components.interfaces.nsITreeView.DROP_ON);
+    PlacesUIUtils.showBookmarkDialog({ action: "add"
+                                     , type: "bookmark"
+                                     , uri: makeURI(aURL)
+                                     , title: aTitle
+                                     , description: aDescription
+                                     , defaultInsertionPoint: ip
+                                     , hiddenRows: [ "description"
+                                                   , "location"
+                                                   , "loadInSidebar"
+                                                   , "keyword" ]
+                                     }, window.top);
   }),
 
   /**
@@ -586,7 +580,9 @@
     else
       description = PlacesUIUtils.getDescriptionFromDocument(doc);
 
-    var toolbarIP = new InsertionPoint(PlacesUtils.toolbarFolderId, -1);
+    var toolbarIP = new InsertionPoint(PlacesUtils.toolbarFolderId,
+                                       PlacesUtils.bookmarks.DEFAULT_INDEX,
+                                       Components.interfaces.nsITreeView.DROP_ON);
     PlacesUIUtils.showBookmarkDialog({ action: "add"
                                      , type: "livemark"
                                      , feedURI: feedURI
@@ -1001,7 +997,7 @@
   onDragOver: function PMDH_onDragOver(event) {
     let ip = new InsertionPoint(PlacesUtils.bookmarksMenuFolderId,
                                 PlacesUtils.bookmarks.DEFAULT_INDEX,
-                                Ci.nsITreeView.DROP_ON);
+                                Components.interfaces.nsITreeView.DROP_ON);
     if (ip && PlacesControllerDragHelper.canDrop(ip, event.dataTransfer))
       event.preventDefault();
 
@@ -1017,7 +1013,7 @@
     // Put the item at the end of bookmark menu.
     let ip = new InsertionPoint(PlacesUtils.bookmarksMenuFolderId,
                                 PlacesUtils.bookmarks.DEFAULT_INDEX,
-                                Ci.nsITreeView.DROP_ON);
+                                Components.interfaces.nsITreeView.DROP_ON);
     PlacesControllerDragHelper.onDrop(ip, event.dataTransfer);
     PlacesControllerDragHelper.currentDropTarget = null;
     event.stopPropagation();
@@ -1571,15 +1567,19 @@
       let locale = Cc["@mozilla.org/chrome/chrome-registry;1"].
                    getService(Ci.nsIXULChromeRegistry).
                    getSelectedLocale("browser");
-      let url = "chrome://browser/content/browser-pocket-" + locale + ".properties";
-      let bundle = Services.strings.createBundle(url);
-      let item = document.getElementById(prefix + "pocket");
-      try {
-        item.setAttribute("label", bundle.GetStringFromName("pocketMenuitem.label"));
-      } catch (err) {
-        // GetStringFromName throws when the bundle doesn't exist.  In that
-        // case, the item will retain the browser-pocket.dtd en-US string that
-        // it has in the markup.
+      if (locale != "en-US") {
+        if (locale == "ja-JP-mac")
+          locale = "ja";
+        let url = "chrome://browser/content/browser-pocket-" + locale + ".properties";
+        let bundle = Services.strings.createBundle(url);
+        let item = document.getElementById(prefix + "pocket");
+        try {
+          item.setAttribute("label", bundle.GetStringFromName("pocketMenuitem.label"));
+        } catch (err) {
+          // GetStringFromName throws when the bundle doesn't exist.  In that
+          // case, the item will retain the browser-pocket.dtd en-US string that
+          // it has in the markup.
+        }
       }
     }
     document.getElementById(prefix + "pocket").hidden = hidden;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-pocket-de.properties firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-pocket-de.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-pocket-de.properties	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-pocket-de.properties	2015-05-25 20:42:41.000000000 +0000
@@ -11,4 +11,6 @@
 # From browser-pocket.dtd
 saveToPocketCmd.label = Seite bei Pocket speichern
 saveToPocketCmd.accesskey = k
+saveLinkToPocketCmd.label = Link bei Pocket speichern
+saveLinkToPocketCmd.accesskey = o
 pocketMenuitem.label = Pocket-Liste anzeigen
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-pocket.dtd firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-pocket.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-pocket.dtd	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-pocket.dtd	2015-05-25 20:42:41.000000000 +0000
@@ -7,4 +7,6 @@
 
 <!ENTITY saveToPocketCmd.label     "Save Page to Pocket">
 <!ENTITY saveToPocketCmd.accesskey "k">
+<!ENTITY saveLinkToPocketCmd.label     "Save Link to Pocket">
+<!ENTITY saveLinkToPocketCmd.accesskey "o">
 <!ENTITY pocketMenuitem.label      "View Pocket List">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-pocket-en-US.properties firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-pocket-en-US.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-pocket-en-US.properties	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-pocket-en-US.properties	2015-05-25 20:42:41.000000000 +0000
@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# This is a temporary file, later versions of Firefox will use
+# browser.properties in the usual L10N location.
+
+pocket-button.label = Pocket
+pocket-button.tooltiptext = Save to Pocket
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-pocket-es-ES.properties firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-pocket-es-ES.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-pocket-es-ES.properties	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-pocket-es-ES.properties	2015-05-25 20:42:41.000000000 +0000
@@ -11,4 +11,6 @@
 # From browser-pocket.dtd
 saveToPocketCmd.label = Guardar página en Pocket
 saveToPocketCmd.accesskey = k
+saveLinkToPocketCmd.label = Guardar enlace en Pocket
+saveLinkToPocketCmd.accesskey = k
 pocketMenuitem.label = Ver lista de Pocket
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-pocket-ja.properties firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-pocket-ja.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-pocket-ja.properties	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-pocket-ja.properties	2015-05-25 20:42:41.000000000 +0000
@@ -11,4 +11,6 @@
 # From browser-pocket.dtd
 saveToPocketCmd.label = Pocket にページを保存
 saveToPocketCmd.accesskey = k
+saveLinkToPocketCmd.label = Pocket にリンクを保存
+saveLinkToPocketCmd.accesskey = o
 pocketMenuitem.label = Pocket のマイリストを表示
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-pocket.properties firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-pocket.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-pocket.properties	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-pocket.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# This is a temporary file, later versions of Firefox will use
-# browser.properties in the usual L10N location.
-
-pocket-button.label = Pocket
-pocket-button.tooltiptext = Save to Pocket
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-pocket-ru.properties firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-pocket-ru.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-pocket-ru.properties	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-pocket-ru.properties	2015-05-25 20:42:41.000000000 +0000
@@ -11,4 +11,6 @@
 # From browser-pocket.dtd
 saveToPocketCmd.label = Сохранить страницу в Pocket
 saveToPocketCmd.accesskey = х
+saveLinkToPocketCmd.label = Сохранить ссылку в Pocket
+saveLinkToPocketCmd.accesskey = а
 pocketMenuitem.label = Показать список Pocket
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-social.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-social.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser-social.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser-social.js	2015-05-25 20:42:41.000000000 +0000
@@ -60,6 +60,9 @@
     if (this._initialized) {
       return;
     }
+    let mm = window.getGroupMessageManager("social");
+    mm.loadFrameScript("chrome://browser/content/content.js", true);
+    mm.loadFrameScript("chrome://browser/content/social-content.js", true);
 
     Services.obs.addObserver(this, "social:ambient-notification-changed", false);
     Services.obs.addObserver(this, "social:profile-changed", false);
@@ -154,7 +157,7 @@
         break;
       case "social:frameworker-error":
         if (this.enabled && SocialSidebar.provider && SocialSidebar.provider.origin == data) {
-          SocialSidebar.setSidebarErrorMessage();
+          SocialSidebar.loadFrameworkerFailure();
         }
         break;
       case "nsPref:changed":
@@ -351,21 +354,21 @@
     if (!SocialUI.enabled || panel.firstChild)
       return;
     // create and initialize the panel for this window
-    let iframe = document.createElement("iframe");
+    let iframe = document.createElement("browser");
     iframe.setAttribute("type", "content");
     iframe.setAttribute("class", "social-panel-frame");
     iframe.setAttribute("flex", "1");
+    iframe.setAttribute("message", "true");
+    iframe.setAttribute("messagemanagergroup", "social");
     iframe.setAttribute("tooltip", "aHTMLTooltip");
+    iframe.setAttribute("context", "contentAreaContextMenu");
     iframe.setAttribute("origin", SocialSidebar.provider.origin);
     panel.appendChild(iframe);
-  },
-
-  setFlyoutErrorMessage: function SF_setFlyoutErrorMessage() {
-    this.iframe.removeAttribute("src");
-    this.iframe.webNavigation.loadURI("about:socialerror?mode=compactInfo&origin=" +
-                                 encodeURIComponent(this.iframe.getAttribute("origin")),
-                                 null, null, null, null);
-    sizeSocialPanelToContent(this.panel, this.iframe);
+    // the xbl bindings for the iframe probably don't exist yet, so we can't
+    // access iframe.messageManager directly - but can get at it with this dance.
+    let mm = iframe.QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.messageManager;
+    mm.sendAsyncMessage("Social:SetErrorURL", null,
+                        { template: "about:socialerror?mode=compactInfo&origin=%{origin}" });
   },
 
   unload: function() {
@@ -374,8 +377,6 @@
     if (!panel.firstChild)
       return
     let iframe = panel.firstChild;
-    if (iframe.socialErrorListener)
-      iframe.socialErrorListener.remove();
     panel.removeChild(iframe);
   },
 
@@ -383,8 +384,7 @@
     let panel = this.panel;
     let iframe = this.iframe;
     this._dynamicResizer = new DynamicResizeWatcher();
-    iframe.docShell.isActive = true;
-    iframe.docShell.isAppTab = true;
+    iframe.docShellIsActive = true;
     if (iframe.contentDocument.readyState == "complete") {
       this._dynamicResizer.start(panel, iframe);
       this.dispatchPanelEvent("socialFrameShow");
@@ -405,7 +405,7 @@
   onHidden: function(aEvent) {
     this._dynamicResizer.stop();
     this._dynamicResizer = null;
-    this.iframe.docShell.isActive = false;
+    this.iframe.docShellIsActive = false;
     this.dispatchPanelEvent("socialFrameHide");
   },
 
@@ -423,7 +423,6 @@
         iframe.removeEventListener("load", documentLoaded, true);
         cb();
       }, true);
-      Social.setErrorListener(iframe, SocialFlyout.setFlyoutErrorMessage.bind(SocialFlyout))
       iframe.setAttribute("src", aURL);
     } else {
       // we still need to set the src to trigger the contents hashchange event
@@ -503,11 +502,13 @@
     iframe.setAttribute("tooltip", "aHTMLTooltip");
     iframe.setAttribute("disableglobalhistory", "true");
     iframe.setAttribute("flex", "1");
+    iframe.setAttribute("message", "true");
+    iframe.setAttribute("messagemanagergroup", "social");
     panel.lastChild.appendChild(iframe);
-    iframe.addEventListener("load", function _firstload() {
-      iframe.removeEventListener("load", _firstload, true);
-      iframe.messageManager.loadFrameScript("chrome://browser/content/content.js", true);
-    }, true);
+    let mm = iframe.QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.messageManager;
+    mm.sendAsyncMessage("Social:SetErrorURL", null,
+                        { template: "about:socialerror?mode=compactInfo&origin=%{origin}&url=%{url}" });
+
     this.populateProviderMenu();
   },
 
@@ -596,23 +597,6 @@
     }
   },
 
-  setErrorMessage: function() {
-    let iframe = this.iframe;
-    if (!iframe)
-      return;
-
-    let url;
-    let origin = iframe.getAttribute("origin");
-    if (!origin) {
-      // directory site is down
-      url = "about:socialerror?mode=tryAgainOnly&directory=1&url=" + encodeURIComponent(iframe.getAttribute("src"));
-    } else {
-      url = "about:socialerror?mode=compactInfo&origin=" + encodeURIComponent(origin);
-    }
-    iframe.webNavigation.loadURI(url, null, null, null, null);
-    sizeSocialPanelToContent(this.panel, iframe);
-  },
-
   sharePage: function(providerOrigin, graphData, target) {
     // if providerOrigin is undefined, we use the last-used provider, or the
     // current/default provider.  The provider selection in the share panel
@@ -694,8 +678,7 @@
     let endpointMatch = shareEndpoint == iframe.getAttribute("src");
     if (endpointMatch) {
       this._dynamicResizer.start(iframe.parentNode, iframe, size);
-      iframe.docShell.isActive = true;
-      iframe.docShell.isAppTab = true;
+      iframe.docShellIsActive = true;
       let evt = iframe.contentDocument.createEvent("CustomEvent");
       evt.initCustomEvent("OpenGraphData", true, true, JSON.stringify(pageData));
       iframe.contentDocument.documentElement.dispatchEvent(evt);
@@ -704,8 +687,7 @@
       // first time load, wait for load and dispatch after load
       iframe.addEventListener("load", function panelBrowserOnload(e) {
         iframe.removeEventListener("load", panelBrowserOnload, true);
-        iframe.docShell.isActive = true;
-        iframe.docShell.isAppTab = true;
+        iframe.docShellIsActive = true;
         iframe.parentNode.removeAttribute("loading");
         // to support standard share endpoints mimick window.open by setting
         // window.opener, some share endpoints rely on w.opener to know they
@@ -764,7 +746,6 @@
   _openPanel: function() {
     let anchor = document.getAnonymousElementByAttribute(this.anchor, "class", "toolbarbutton-icon");
     this.panel.openPopup(anchor, "bottomcenter topright", 0, 0, false, false);
-    Social.setErrorListener(this.iframe, this.setErrorMessage.bind(this));
     Services.telemetry.getHistogramById("SOCIAL_TOOLBAR_BUTTONS").add(0);
   }
 };
@@ -918,19 +899,12 @@
       }
     } else {
       sbrowser.setAttribute("origin", this.provider.origin);
-      if (this.provider.errorState == "frameworker-error") {
-        SocialSidebar.setSidebarErrorMessage();
-        return;
-      }
 
       // Make sure the right sidebar URL is loaded
       if (sbrowser.getAttribute("src") != this.provider.sidebarURL) {
         // we check readyState right after setting src, we need a new content
         // viewer to ensure we are checking against the correct document.
         sbrowser.docShell.createAboutBlankContentViewer(null);
-        Social.setErrorListener(sbrowser, this.setSidebarErrorMessage.bind(this));
-        // setting isAppTab causes clicks on untargeted links to open new tabs
-        sbrowser.docShell.isAppTab = true;
         sbrowser.setAttribute("src", this.provider.sidebarURL);
         PopupNotifications.locationChange(sbrowser);
       }
@@ -976,18 +950,13 @@
 
   _unloadTimeoutId: 0,
 
-  setSidebarErrorMessage: function() {
-    let sbrowser = document.getElementById("social-sidebar-browser");
-    // a frameworker error "trumps" a sidebar error.
-    let origin = sbrowser.getAttribute("origin");
-    if (origin) {
-      origin = "&origin=" + encodeURIComponent(origin);
-    }
-    if (this.provider.errorState == "frameworker-error") {
-      sbrowser.setAttribute("src", "about:socialerror?mode=workerFailure" + origin);
-    } else {
-      let url = encodeURIComponent(this.provider.sidebarURL);
-      sbrowser.loadURI("about:socialerror?mode=tryAgain&url=" + url + origin, null, null);
+  loadFrameworkerFailure: function() {
+    if (this.provider && this.provider.errorState == "frameworker-error") {
+      // we have to explicitly load this error page since it is not being
+      // handled via the normal error page paths.
+      let sbrowser = document.getElementById("social-sidebar-browser");
+      sbrowser.setAttribute("src", "about:socialerror?mode=workerFailure&origin=" +
+                            encodeURIComponent(this.provider.origin));
     }
   },
 
@@ -1298,8 +1267,6 @@
   _onclose: function(frame) {
     frame.removeEventListener("close", this._onclose, true);
     frame.removeEventListener("click", this._onclick, true);
-    if (frame.socialErrorListener)
-      frame.socialErrorListener.remove();
   },
 
   _onclick: function() {
@@ -1316,28 +1283,27 @@
                          (frame) => {
                           frame.addEventListener("close", () => { SocialStatus._onclose(frame) }, true);
                           frame.addEventListener("click", this._onclick, true);
-                          Social.setErrorListener(frame, this.setPanelErrorMessage.bind(this));
                         });
     Services.telemetry.getHistogramById("SOCIAL_TOOLBAR_BUTTONS").add(1);
-  },
+  }
+};
 
-  setPanelErrorMessage: function(aNotificationFrame) {
-    if (!aNotificationFrame)
-      return;
 
-    let src = aNotificationFrame.getAttribute("src");
-    aNotificationFrame.removeAttribute("src");
-    let origin = aNotificationFrame.getAttribute("origin");
-    aNotificationFrame.webNavigation.loadURI("about:socialerror?mode=tryAgainOnly&url=" +
-                                            encodeURIComponent(src) + "&origin=" +
-                                            encodeURIComponent(origin),
-                                            null, null, null, null);
-    let panel = aNotificationFrame.parentNode;
-    sizeSocialPanelToContent(panel, aNotificationFrame);
+let SocialMarksWidgetListener = {
+  onWidgetAdded: function(aWidgetId, aArea, aPosition) {
+    let node = document.getElementById(aWidgetId);
+    if (!node || !node.classList.contains("social-mark-button"))
+      return;
+    node._receiveMessage = node.receiveMessage.bind(node);
+    messageManager.addMessageListener("Social:ErrorPageNotify", node._receiveMessage);
   },
-
-};
-
+  onWidgetBeforeDOMChange: function(aNode, aNextNode, aContainer, isRemoval) {
+    if (!isRemoval || !aNode || !aNode.classList.contains("social-mark-button"))
+      return;
+    messageManager.removeMessageListener("Social:ErrorPageNotify", aNode._receiveMessage);
+    delete aNode._receiveMessage;
+  }
+}
 
 /**
  * SocialMarks
@@ -1442,7 +1408,9 @@
 
   get _toolbarHelper() {
     delete this._toolbarHelper;
-    this._toolbarHelper = new ToolbarHelper("social-mark-button", CreateSocialMarkWidget);
+    this._toolbarHelper = new ToolbarHelper("social-mark-button",
+                                            CreateSocialMarkWidget,
+                                            SocialMarksWidgetListener);
     return this._toolbarHelper;
   },
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser.xul firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/browser.xul	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/browser.xul	2015-05-25 20:42:41.000000000 +0000
@@ -783,6 +783,7 @@
                 <image id="push-notification-icon" class="notification-anchor-icon" role="button"/>
                 <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
                 <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
+                <image id="login-fill-notification-icon" class="notification-anchor-icon" role="button"/>
                 <image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
                 <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
                 <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
@@ -1222,6 +1223,8 @@
         <browser id="social-sidebar-browser"
                  type="content"
                  context="contentAreaContextMenu"
+                 message="true"
+                 messagemanagergroup="social"
                  disableglobalhistory="true"
                  tooltip="aHTMLTooltip"
                  popupnotificationanchor="social-sidebar-favico"
@@ -1306,7 +1309,4 @@
 #     starting with an empty iframe here in browser.xul from a Ts standpoint.
 </deck>
 
-<script type="application/javascript" src="chrome://browser/content/pocket/pktApi.js"/>
-<script type="application/javascript" src="chrome://browser/content/pocket/main.js"/>
-
 </window>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/content.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/content.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/content.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/content.js	2015-05-25 20:42:41.000000000 +0000
@@ -49,9 +49,15 @@
   PageMenuChild.executeMenu(message.data);
 });
 
+addMessageListener("RemoteLogins:fillForm", function(message) {
+  LoginManagerContent.receiveMessage(message, content);
+});
 addEventListener("DOMFormHasPassword", function(event) {
+  LoginManagerContent.onDOMFormHasPassword(event, content);
   InsecurePasswordUtils.checkForInsecurePasswords(event.target);
-  LoginManagerContent.onFormPassword(event);
+});
+addEventListener("pageshow", function(event) {
+  LoginManagerContent.onPageShow(event, content);
 });
 addEventListener("DOMAutoComplete", function(event) {
   LoginManagerContent.onUsernameInput(event);
@@ -369,6 +375,12 @@
                  bookmark: false, referrerPolicy: ownerDoc.referrerPolicy };
 
     if (href) {
+      try {
+        BrowserUtils.urlSecurityCheck(href, node.ownerDocument.nodePrincipal);
+      } catch (e) {
+        return;
+      }
+
       json.href = href;
       if (node) {
         json.title = node.getAttribute("title");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/gcli_sec_bad.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/gcli_sec_bad.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/gcli_sec_bad.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/gcli_sec_bad.svg	2015-05-25 20:42:41.000000000 +0000
@@ -0,0 +1,7 @@
+<svg width="30" height="30" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="15" fill="#e74c3c"/>
+  <g stroke="white" stroke-width="3">
+    <line x1="9" y1="9" x2="21" y2="21"/>
+    <line x1="21" y1="9" x2="9" y2="21"/>
+  </g>
+</svg>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/gcli_sec_good.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/gcli_sec_good.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/gcli_sec_good.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/gcli_sec_good.svg	2015-05-25 20:42:41.000000000 +0000
@@ -0,0 +1,4 @@
+<svg width="30" height="30" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 60">
+  <circle cx="30" cy="30" r="30" fill="#2CBB0F"/>
+  <polygon points="17,32 25,39 26,39 44,18 45,18 48,21 27,46 25,46 14,36 13,36 16,33 16,32" fill="white"/>
+</svg>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/gcli_sec_moderate.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/gcli_sec_moderate.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/gcli_sec_moderate.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/gcli_sec_moderate.svg	2015-05-25 20:42:41.000000000 +0000
@@ -0,0 +1,4 @@
+<svg width="30" height="30" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="15" fill="#F5B400"/>
+  <rect x="7.5" y="13" width="15" height="4" fill="white"/>
+</svg>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/newtab/grid.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/newtab/grid.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/newtab/grid.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/newtab/grid.js	2015-05-25 20:42:41.000000000 +0000
@@ -168,7 +168,7 @@
       '       class="newtab-control newtab-control-pin"/>' +
       '<input type="button" title="' + newTabString("block") + '"' +
       '       class="newtab-control newtab-control-block"/>' +
-      '<span class="newtab-sponsored">' + newTabString("suggested.tag") + '</span>' +
+      '<span class="newtab-sponsored">' + newTabString("sponsored.button") + '</span>' +
       '<span class="newtab-suggested"/>';
 
     this._siteFragment = document.createDocumentFragment();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/newtab/intro.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/newtab/intro.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/newtab/intro.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/newtab/intro.js	2015-05-25 20:42:41.000000000 +0000
@@ -5,53 +5,234 @@
 #endif
 
 const PREF_INTRO_SHOWN = "browser.newtabpage.introShown";
+const PREF_UPDATE_INTRO_SHOWN = "browser.newtabpage.updateIntroShown";
+
+// These consts indicate the type of intro/onboarding we show.
+const WELCOME = "welcome";
+const UPDATE = "update";
+
+// The maximum paragraph ID listed for 'newtab.intro.paragraph'
+// strings in newTab.properties
+const MAX_PARAGRAPH_ID = 9;
+
+const NUM_INTRO_PAGES = 3;
 
 let gIntro = {
   _nodeIDSuffixes: [
-    "panel",
-    "what",
+    "mask",
+    "modal",
+    "numerical-progress",
+    "text",
+    "buttons",
+    "image",
+    "header",
+    "footer"
   ],
 
+  _imageTypes: {
+    COG : "cog",
+    PIN_REMOVE : "pin-remove",
+    SUGGESTED : "suggested"
+  },
+
+
+  /**
+   * The paragraphs & buttons to show on each page in the intros.
+   *
+   * _introPages.welcome and _introPages.update contain an array of
+   * indices of paragraphs to be used to lookup text in _paragraphs
+   * for each page of the intro.
+   *
+   * Similarly, _introPages.buttons is used to lookup text for buttons
+   * on each page of the intro.
+   */
+  _introPages: {
+    "welcome": [[0,1],[2,5],[4,3]],
+    "update": [[6,5],[4,3],[0,1]],
+    "buttons": [["skip", "continue"],["back", "next"],["back", "gotit"]],
+    "welcome-images": ["cog", "suggested", "pin-remove"],
+    "update-images": ["suggested", "pin-remove", "cog"]
+  },
+
+  _paragraphs: [],
+
   _nodes: {},
 
+  _images: {},
+
   init: function() {
     for (let idSuffix of this._nodeIDSuffixes) {
       this._nodes[idSuffix] = document.getElementById("newtab-intro-" + idSuffix);
     }
 
-    this._nodes.panel.addEventListener("popupshowing", e => this._setUpPanel());
-    this._nodes.panel.addEventListener("popuphidden", e => this._hidePanel());
-    this._nodes.what.addEventListener("click", e => this.showPanel());
+    let brand = Services.strings.createBundle("chrome://branding/locale/brand.properties");
+    this._brandShortName = brand.GetStringFromName("brandShortName");
+  },
+
+  _setImage: function(imageType) {
+    // Remove previously existing images, if any.
+    let currImageHolder = this._nodes.image;
+    while (currImageHolder.firstChild) {
+      currImageHolder.removeChild(currImageHolder.firstChild);
+    }
+
+    this._nodes.image.appendChild(this._images[imageType]);
+  },
+
+  _goToPage: function(pageNum) {
+    this._currPage = pageNum;
+
+    this._nodes["numerical-progress"].innerHTML = `${this._bold(pageNum + 1)} / ${NUM_INTRO_PAGES}`;
+    this._nodes["numerical-progress"].setAttribute("page", pageNum);
+
+    // Set the page's image
+    let imageType = this._introPages[this._onboardingType + "-images"][pageNum];
+    this._setImage(imageType);
+
+    // Set the paragraphs
+    let paragraphNodes = this._nodes.text.getElementsByTagName("p");
+    let paragraphIDs = this._introPages[this._onboardingType][pageNum];
+    paragraphIDs.forEach((arg, index) => {
+      paragraphNodes[index].innerHTML = this._paragraphs[arg];
+    });
+
+    // Set the buttons
+    let buttonNodes = this._nodes.buttons.getElementsByTagName("input");
+    let buttonIDs = this._introPages.buttons[pageNum];
+    buttonIDs.forEach((arg, index) => {
+      buttonNodes[index].setAttribute("value", newTabString("intro." + arg));
+    });
+  },
+
+  _bold: function(str) {
+    return `<strong>${str}</strong>`
+  },
+
+  _link: function(url, text) {
+    return `<a href="${url}" target="_blank">${text}</a>`;
+  },
+
+  _span: function(text, className) {
+    return `<span class="${className}">${text}</span>`;
+  },
+
+  _exitIntro: function() {
+    this._nodes.mask.style.opacity = 0;
+    this._nodes.mask.addEventListener("transitionend", () => {
+      this._nodes.mask.style.display = "none";
+    });
+  },
+
+  _back: function() {
+    if (this._currPage == 0) {
+      // We're on the first page so 'back' means exit.
+      this._exitIntro();
+      return;
+    }
+    this._goToPage(this._currPage - 1);
+  },
+
+  _next: function() {
+    if (this._currPage == (NUM_INTRO_PAGES - 1)) {
+      // We're on the last page so 'next' means exit.
+      this._exitIntro();
+      return;
+    }
+    this._goToPage(this._currPage + 1);
+  },
+
+  _generateImages: function() {
+    Object.keys(this._imageTypes).forEach(type => {
+      let image = "";
+      let imageClass = "";
+      switch (this._imageTypes[type]) {
+        case this._imageTypes.COG:
+          image = document.getElementById("newtab-customize-panel").cloneNode(true);
+          image.removeAttribute("hidden");
+          image.removeAttribute("type");
+          image.classList.add("newtab-intro-image-customize");
+          break;
+        case this._imageTypes.PIN_REMOVE:
+          imageClass = "-hover";
+          // fall-through
+        case this._imageTypes.SUGGESTED:
+          image = document.createElementNS(HTML_NAMESPACE, "div");
+          image.classList.add("newtab-intro-cell-wrapper");
+
+          // Create the cell's inner HTML code.
+          image.innerHTML =
+            '<div class="newtab-intro-cell' + imageClass + '">' +
+            '  <div class="newtab-site newtab-intro-image-tile" type="sponsored">' +
+            '    <a class="newtab-link">' +
+            '      <span class="newtab-thumbnail"/>' +
+            '      <span class="newtab-title">mozilla.org</span>' +
+            '    </a>' +
+            '    <input type="button" class="newtab-control newtab-control-pin"/>' +
+            '    <input type="button" class="newtab-control newtab-control-block"/>' +
+            '    <span class="newtab-sponsored">' +
+                   newTabString(imageClass ? "sponsored.button" : "suggested.tag") + '</span>' +
+            '  </div>' +
+            '</div>';
+            break;
+      }
+      this._images[this._imageTypes[type]] = image;
+    });
+  },
+
+  _generateParagraphs: function() {
+    let customizeIcon = '<input type="button" class="newtab-control newtab-customize"/>';
+
+    let substringMappings = {
+      "2": [this._link(TILES_PRIVACY_LINK, newTabString("privacy.link"))],
+      "4": [customizeIcon, this._bold(newTabString("intro.controls"))],
+      "6": [this._bold(newTabString("intro.paragraph6.remove")), this._bold(newTabString("intro.paragraph6.pin"))],
+      "7": [this._link(TILES_INTRO_LINK, newTabString("learn.link"))],
+      "8": [this._brandShortName, this._link(TILES_INTRO_LINK, newTabString("learn.link"))]
+    }
+
+    for (let i = 1; i <= MAX_PARAGRAPH_ID; i++) {
+      try {
+        let name = "intro.paragraph" + i + (i == 4 ? ".2" : "");
+        this._paragraphs.push(newTabString(name, substringMappings[i]));
+      } catch (ex) {
+        // Paragraph with this ID doesn't exist so continue
+      }
+    }
   },
 
   showIfNecessary: function() {
     if (!Services.prefs.getBoolPref(PREF_INTRO_SHOWN)) {
-      Services.prefs.setBoolPref(PREF_INTRO_SHOWN, true);
+      this._onboardingType = WELCOME;
+      this.showPanel();
+    } else if (!Services.prefs.getBoolPref(PREF_UPDATE_INTRO_SHOWN)) {
+      this._onboardingType = UPDATE;
       this.showPanel();
     }
+    Services.prefs.setBoolPref(PREF_INTRO_SHOWN, true);
+    Services.prefs.setBoolPref(PREF_UPDATE_INTRO_SHOWN, true);
   },
 
   showPanel: function() {
-    // Point the panel at the 'what' link
-    this._nodes.panel.hidden = false;
-    this._nodes.panel.openPopup(this._nodes.what);
-  },
-
-  _setUpPanel: function() {
-    // Build the panel if necessary
-    if (this._nodes.panel.childNodes.length == 1) {
-      ['<a href="' + TILES_INTRO_LINK + '">' + newTabString("learn.link") + "</a>",
-       '<a href="' + TILES_PRIVACY_LINK + '">' + newTabString("privacy.link") + "</a>",
-       '<input type="button" class="newtab-customize"/>',
-      ].forEach((arg, index) => {
-        let paragraph = document.createElementNS(HTML_NAMESPACE, "p");
-        this._nodes.panel.appendChild(paragraph);
-        paragraph.innerHTML = newTabString("intro.paragraph" + (index + 1), [arg]);
-      });
+    this._nodes.mask.style.display = "block";
+    this._nodes.mask.style.opacity = 1;
+
+    if (!this._paragraphs.length) {
+      // It's our first time showing the panel. Do some initial setup
+      this._generateParagraphs();
+      this._generateImages();
     }
-  },
+    this._goToPage(0);
 
-  _hidePanel: function() {
-    this._nodes.panel.hidden = true;
-  }
+    // Header text
+    let boldSubstr = this._onboardingType == WELCOME ? this._span(this._brandShortName, "bold") : "";
+    this._nodes.header.innerHTML = newTabString("intro.header." + this._onboardingType, [boldSubstr]);
+
+    // Footer links
+    let footerLinkNodes = this._nodes.footer.getElementsByTagName("li");
+    [this._link(TILES_INTRO_LINK, newTabString("learn.link2")),
+     this._link(TILES_PRIVACY_LINK, newTabString("privacy.link2")),
+    ].forEach((arg, index) => {
+      footerLinkNodes[index].innerHTML = arg;
+    });
+  },
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/newtab/newTab.css firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/newtab/newTab.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/newtab/newTab.css	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/newtab/newTab.css	2015-05-25 20:42:41.000000000 +0000
@@ -55,6 +55,7 @@
   position: absolute;
   right: 70px;
   top: 20px;
+  display: none;
 }
 
 #newtab-intro-what:-moz-locale-dir(rtl) {
@@ -157,13 +158,24 @@
 }
 
 /* CELLS */
-.newtab-cell {
+.newtab-cell,
+.newtab-intro-cell,
+.newtab-intro-cell-hover {
   display: -moz-box;
   height: 210px;
   margin: 20px 10px 35px;
   width: 290px;
 }
 
+.newtab-intro-cell-wrapper {
+  margin-top: -12px;
+}
+
+.newtab-intro-cell,
+.newtab-intro-cell-hover {
+  margin: 0;
+}
+
 /* SITES */
 .newtab-site {
   position: relative;
@@ -235,6 +247,7 @@
 
 .newtab-title {
   left: 0;
+  padding: 0 4px;
 }
 
 .newtab-sponsored {
@@ -306,7 +319,8 @@
 }
 
 .newtab-control:-moz-focusring,
-.newtab-cell:not([ignorehover]) > .newtab-site:hover > .newtab-control {
+.newtab-cell:not([ignorehover]) > .newtab-site:hover > .newtab-control,
+.newtab-intro-cell-hover .newtab-control {
   opacity: 1;
 }
 
@@ -558,6 +572,11 @@
   cursor: pointer;
 }
 
+.newtab-customize-panel-item,
+.newtab-customize-complex-option {
+  width: 100%;
+}
+
 .newtab-customize-panel-item:not([selected]),
 .newtab-customize-panel-subitem:not([selected]){
   color: #7A7A7A;
@@ -572,7 +591,7 @@
 .selectable:not([selected]):hover {
   background: url("chrome://global/skin/menu/shared-menu-check-hover.svg") no-repeat #FFFFFF;
   background-size: 16px 16px;
-  background-position: 15px 20px;
+  background-position: 15px 15px;
   color: #171F26;
 }
 
@@ -584,7 +603,7 @@
 .newtab-search-panel-engine[selected] {
   background: url("chrome://global/skin/menu/shared-menu-check-active.svg") no-repeat transparent;
   background-size: 16px 16px;
-  background-position: 15px 20px;
+  background-position: 15px 15px;
   color: black;
   font-weight: 600;
 }
@@ -606,7 +625,7 @@
 .newtab-customize-panel-subitem {
   font-size: 12px;
   padding-left: 40px;
-  padding-bottom: 20px;
+  padding-bottom: 15px;
   border-bottom: 1px solid threedshadow;
 }
 
@@ -617,10 +636,244 @@
 .newtab-customize-panel-superitem {
   line-height: 14px;
   border-bottom: medium none !important;
-  padding: 20px 0px 10px 40px;
+  padding: 15px 0px 10px 40px;
 }
 
 .searchSuggestionTable {
   font: message-box;
   font-size: 16px;
 }
+
+/**
+ * Onboarding styling
+ */
+
+ #newtab-intro-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: #424F5A;
+  z-index:102;
+  background-color: rgba(66,79,90,0.95);
+  transition: opacity .5s linear;
+  overflow: auto;
+  display: none;
+}
+
+#newtab-intro-modal {
+  font-family: "Helvetica";
+  width: 700px;
+  height: 500px;
+  position: fixed;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  margin: auto;
+  background: linear-gradient(#FFFFFF, #F9F9F9);
+  box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.7);
+  border-radius: 8px 8px 0px 0px;
+}
+
+#newtab-intro-header {
+  font-size: 28px;
+  color: #737980;
+  text-align: center;
+  top: 50px;
+  position: relative;
+  border-bottom: 2px solid #E0DFE0;
+  padding-bottom: 10px;
+  width: 600px;
+  display: block;
+  margin: 0px auto;
+  font-weight: 100;
+}
+
+#newtab-intro-header .bold {
+  font-weight: 500;
+  color: #343F48;
+}
+
+#newtab-intro-footer {
+  width: 100%;
+  height: 55px;
+  margin: 0px auto;
+  display: block;
+  position: absolute;
+  bottom: 0px;
+  background-color: white;
+  box-shadow: 0 -1px 4px -1px #EBEBEB;
+  text-align: center;
+  vertical-align: middle;
+  line-height: 55px;
+}
+
+#newtab-intro-footer > ul {
+  list-style-type: none;
+  margin: 0px;
+  padding: 0px;
+}
+
+#newtab-intro-footer > ul > li {
+  display: inline;
+  padding-left: 10px;
+  padding-right: 10px;
+}
+
+#newtab-intro-footer > ul > li > a {
+  text-decoration: none;
+  color: #4A90E2;
+}
+
+#newtab-intro-footer > ul > li > a:visited {
+  color: #171F26;
+}
+
+#newtab-intro-footer > ul > :first-child {
+  border-right: solid 1px #C1C1C1;
+}
+
+#newtab-intro-body {
+  height: 300px;
+  position: relative;
+  display: block;
+  top: 50px;
+  margin: 25px 50px 30px;
+}
+
+#newtab-intro-content > * {
+  display: inline-block;
+}
+
+#newtab-intro-content {
+  height: 210px;
+  position: relative;
+}
+
+#newtab-intro-buttons {
+  height: 90px;
+  text-align: center;
+  vertical-align: middle;
+  line-height: 90px;
+}
+
+#newtab-intro-tile {
+  width: 290px;
+  height: 100%;
+}
+
+#newtab-intro-text,
+#newtab-intro-image {
+  height: 100%;
+  width: 270px;
+  right: 0px;
+  position: absolute;
+  font-size: 14px;
+  line-height: 20px;
+  margin-top: -12px;
+}
+
+#newtab-intro-image {
+  left: 0px;
+  right: auto;
+}
+
+.newtab-intro-image-tile {
+}
+
+.newtab-intro-image-customize {
+  display: block;
+  box-shadow: 3px 3px 5px #888;
+  margin: 0 !important;
+}
+
+.newtab-intro-image-customize .newtab-customize-panel-item:not([selected]):hover {
+  background-color: inherit;
+  color: #7A7A7A;
+  background: none;
+}
+
+#newtab-intro-text > p {
+  margin: 0 0 1em 0;
+}
+
+#newtab-intro-text .newtab-control {
+  background-size: 18px auto;
+  height: 18px;
+  width: 18px;
+  vertical-align: middle;
+  opacity: 1;
+  position: inherit;
+}
+
+#newtab-intro-buttons > input {
+  width: 150px;
+  height: 50px;
+  margin: 0px 5px;
+  vertical-align: bottom;
+  border-radius: 2px;
+  border: solid 1px #2C72E2;
+  background-color: #FFFFFF;
+  color: #4A90E2;
+  -moz-user-focus: normal;
+}
+
+#newtab-intro-buttons > input[default] {
+  background-color: #4A90E2;
+  color: #FFFFFF;
+}
+
+#newtab-intro-buttons > input:hover {
+  background-color: #2C72E2;
+  color: #FFFFFF;
+}
+
+#newtab-intro-progress {
+  position: absolute;
+  width: 100%;
+}
+
+#newtab-intro-numerical-progress {
+  text-align: center;
+  top: 15px;
+  position: relative;
+  font-size: 12px;
+  color: #424F5A;
+}
+
+#newtab-intro-graphical-progress {
+  text-align: left;
+  border-radius: 1.5px;
+  overflow: hidden;
+  position: relative;
+  margin: 10px auto 0px;
+  height: 3px;
+  top: 8px;
+  width: 35px;
+  background-color: #DCDCDC;
+}
+
+#indicator {
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  display: inline-block;
+  width: 0%;
+  height: 4px;
+  background: none repeat scroll 0% 0% #FF9500;
+  transition: width 0.3s ease-in-out 0s;
+}
+
+#newtab-intro-numerical-progress[page="0"] + #newtab-intro-graphical-progress > #indicator {
+  width: 33%;
+}
+
+#newtab-intro-numerical-progress[page="1"] + #newtab-intro-graphical-progress > #indicator {
+  width: 66%;
+}
+
+#newtab-intro-numerical-progress[page="2"] + #newtab-intro-graphical-progress > #indicator {
+  width: 100%;
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/newtab/newTab.inadjacent.json firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/newtab/newTab.inadjacent.json
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/newtab/newTab.inadjacent.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/newtab/newTab.inadjacent.json	2015-05-25 20:42:41.000000000 +0000
@@ -0,0 +1,3209 @@
+{
+    "domains": [
+        "rp5slFCxq/e7hYhXJCd0vQ==",
+        "2rEimAJDNX5g8HPZehOrGg==",
+        "nvLEpj6ZZF3LWH3wUB6lKg==",
+        "9Cqd4Lm3VvXuJxz79Bbqyg==",
+        "vNRy4LR+7TOKTixqsr5ybw==",
+        "N4zSgsZCo6Z4XRwZ4fu8WQ==",
+        "jsDtRfVbMsFg3KkEl2UiZQ==",
+        "TckkKpiq0a6J6NTw7uOZqw==",
+        "9Or7IAYuuIgZA370w9rNIg==",
+        "ul8WvOjCkxTz9LjT4RqTHg==",
+        "ZGJrbwb5878Nsqm0z+A7nQ==",
+        "5iT64HTeeG5SIFXG7A9o3w==",
+        "YSeSEghPe1kV6g8ghFcNAA==",
+        "0jIUl1NDmJZQkDY12VDeIQ==",
+        "aos6UyDyIw0R1nTK5wTawA==",
+        "G1xxubsq65ugK06UT2DO5A==",
+        "lbhavoDrDPP/8m0onwo63w==",
+        "ObcLsjW0SkdvY0nkZmiTGQ==",
+        "FHZ5084LC0nTAzZlnSKN3Q==",
+        "cdEr+0Fv5iaVZzalZToseg==",
+        "Co8WbNYbCPTFPcHpeK3hRQ==",
+        "qXSzhCEhByLQq9N84tqV+Q==",
+        "h3ufhRk5IEFaNH11rIACtQ==",
+        "fQ1PJ/JwazIaYoy/zy49QQ==",
+        "zAJqfbn54Nsm2ddGtkb59A==",
+        "ixPM9T8ik/gWGZ7BRIcaig==",
+        "/E9pwA3E3hVAZoYq3FmCyw==",
+        "U6ygonI8CxpruhpGB2+Q6A==",
+        "Igi4voB8oVMVw6WUeDSjZg==",
+        "jtuHIJhwoTGzavFpM7ilNw==",
+        "eBvTV27n6Gs+ZsBkpVynvw==",
+        "sFbzw0AUOGG0NEzkaSxVDg==",
+        "yAkIS+Ezj6woEff9YvdO7Q==",
+        "IP1+BwG6q60QzDADi8j7oA==",
+        "Q/teQEBFepHtwZ7UHa2TEA==",
+        "B1vDep5a1Gok5Gnth39+LA==",
+        "cyEIyQ2MZaPGf+K1x9Bbkg==",
+        "aaM+oEJnF4/nwMWyXJU8rA==",
+        "qpDNIpxah8FUiqXm5IRaUg==",
+        "ZTeJ35gMPqIv2WWbeNyIEg==",
+        "nzoAGQAnC/Xgg5PmOgXqkA==",
+        "J5pJDuNi3cqQiyaRJAJk4g==",
+        "2vqN53BXhXzPrKYsh6QH1A==",
+        "QlrzHNYxCwCBMVENvbXjQA==",
+        "Ou2HGn43nmsL3RWSNvMdXw==",
+        "3qk9lsvGTMqVMAZW+xihfw==",
+        "RncMe42RB2bhmUbYtGVnKQ==",
+        "hzNXR6dqPq1+vf4Qh5ByWA==",
+        "sRq3S2ZRs3H39cEQHv4Vig==",
+        "B4ThUBTVJOUPyOsHxikHXA==",
+        "A2lU9GkAdSibLO1JJfFnIA==",
+        "ef3HNkSvuWQrAzkuty2iqg==",
+        "yKDiRM6bf2xc0QXIwHYuaA==",
+        "AdCk4ccJuhA0bIT/61J+RQ==",
+        "UXvAZ7ULCVz2f505K0Wkvg==",
+        "ueKWblrOwVJNgiOvkXKLBQ==",
+        "s8u/jPuBAxu1d18HfV5Z0g==",
+        "hUT0Uc5YMUdNZQEGLz4hJw==",
+        "6jo/phmMTrEXKrNRsionGQ==",
+        "s/Ea/3fkyJ9honzPJkgEQQ==",
+        "hgu2/Jf+WrQAHfO+asW2zw==",
+        "kiVuTNwZ1r2lqYEZxIHyiQ==",
+        "24T5KVrVE2mYwJ5Goj3xJw==",
+        "fiWBVlfj97GGjEvf/Q9Spg==",
+        "5VWdlvJe7eoXMGkTtHzCUg==",
+        "+cFQxKa5RWVtc1z00Jujew==",
+        "nVa+rLH5p+yXBksLwQsjRQ==",
+        "5tyI6bMdb3tMIi4ewvr/SQ==",
+        "S6Roj31yS5bZbSFcd3f4Hg==",
+        "uW1Zl8iuEF8ZT/gwCBEqwA==",
+        "YwL+FJgxlZ8JVig+9iP5Cw==",
+        "ThIYK/mQsp9cMf8+rws/4Q==",
+        "w0oSxOhRG6kE9B868aoYVQ==",
+        "DJUDGQ0J32dF1kfItyxALg==",
+        "34/ab69lPkuAKt6WBxJPpA==",
+        "25jH4C9apgqWZGZP15lM6Q==",
+        "GxvwleSaSwILD1pG9k9buA==",
+        "YRAMt2ArEINo83ms6AqJ0A==",
+        "15HyTJNoMYzi3XCkeU5Z7A==",
+        "/SqjXGD+TKC90uz1vsjqUw==",
+        "karhKOknkhtg/LSFo9BGRA==",
+        "+tD1d0t3vfJvc1hUAvTT4Q==",
+        "rkaKbtlnyVr53D0rexLqdQ==",
+        "fAugw4rtnXzzRXfC1wRgOQ==",
+        "RgxoepF/XOwIsGat5r5HpQ==",
+        "Y49/EnzVz3ugXCYxFjFN7g==",
+        "tHMyzBm/2wNDw7TeNeujbg==",
+        "LlqzYV4uZpiJy4ORWPSekA==",
+        "M3Huar7/ded9OGgDwJhZgw==",
+        "QkNNATSx/PJ1XjgZyTtkUQ==",
+        "skVw0v6Wx00sfHAScPK1Bw==",
+        "v1gsIvg+C68T9wixMzL2sQ==",
+        "hDL75EXhl7BaYnAxkoGwbw==",
+        "tReG97snx2ESpXbfllCL7Q==",
+        "EiZBXR15dT1TMrkgkzmkvw==",
+        "5hRHirfD90/sdp0ILJQU8A==",
+        "rabElvtYtG0jW6dxAOHofg==",
+        "JpxoTRKWN+SEeBQ453R1YQ==",
+        "Faz4Lm0cpjvF0IjVkHiZMg==",
+        "jGErFAIoXx+50KFpVIGZiA==",
+        "5GzBkduKpUX7u1uwtYIFug==",
+        "cRBe0J9/KWRX19N2vPkCiw==",
+        "t/7g8t4Kr3/+SCnOn3XFWQ==",
+        "sd08c6jUXs5/hxND0fBkPA==",
+        "nTxKpqIdnHNdpDk7Dx3TEg==",
+        "5l+RALcce+lTDnmXI+Wqqg==",
+        "pzJ4QmEBGRNiiX6z0xHh8g==",
+        "Vfl3YbqR6JRR7SIdsUA/vA==",
+        "cgfhOdB376a4GAcuACADvA==",
+        "inAefsQM6tiIhQCMtcPcyA==",
+        "FTSULGL8CMhmcc7Cyf/X8A==",
+        "9XSWpaZyHEy7V/tuw5uZEw==",
+        "+VtM1opKlgb/jrCwc4YjFA==",
+        "oF46xheuI/NUxUOnOttzvA==",
+        "Qy+lvhDbJCumr6kiPLd1oA==",
+        "swps7UEKpIbVBJ9SnPK3zQ==",
+        "b7wyIiJvJs+29QePxsdWtQ==",
+        "x3iDZxYyuHtG/9rNW5HMYg==",
+        "r1dx1g5UOksywvOaQTamfA==",
+        "KvVF3Si/fr4JQtr7jCJiog==",
+        "spvZ7hhtG5QY7JXs96lBUg==",
+        "ECL8mA5B6CswyDH6yJ4hVw==",
+        "7Uu+YsdS69dMSDYUr6vTag==",
+        "Rnm9pSvQRRbkHpOijraLZw==",
+        "aQJqpnXdzqNSFhMn3EJA2Q==",
+        "TctnXpd7Wd5ZXKMnOFHAQA==",
+        "+lPqG8l6mf2FWVGWflyF/g==",
+        "mPmnmL2oRRJmKYjQ6TfN3g==",
+        "fyXFcT5ZCawDBg74n1WSpg==",
+        "uq5Zrxq10pO1HoPxReT5og==",
+        "3eoCsOKXY8RDrHSdlXqmrA==",
+        "9nQv2BFG56xsHViN5UpHYw==",
+        "RtP/nJgy/ItyuDrpBbAotg==",
+        "5E/drRptfHmBhJ7qplujGg==",
+        "cUxyZvoqXbQ0a/0I9s6Zbg==",
+        "womzqSigwEF30V422YmxKw==",
+        "FPvZqDfN8dTFHLVOuYEbUA==",
+        "YZMXx+scKXp/v9GaJjb1bA==",
+        "bjURu5MRsNIZavG5HV0eZw==",
+        "iY0C9uSMEOn8ikT+J7+/Eg==",
+        "aXkD6BzsdkMEv7A+eYqQQQ==",
+        "dOcOfEDGHYG2kgmrglDkPw==",
+        "c7GjtY05Mh+cp6SNuWY3Ig==",
+        "lM1uY1oVncHXNzKs/cCEtQ==",
+        "7jXnQJkutLsi+r9aYmrMxw==",
+        "NgrugWWduj2qdWnEQf9dLA==",
+        "faYjmy/yn5iXdS28QCIdWw==",
+        "68XbaOvIZpCGb4G1gaKErA==",
+        "Yi67HkOLtGYXeL7WD4GPrA==",
+        "Puo8gXuUkwcoQViaXwkdSQ==",
+        "L202Et5aZh60Vl20LTKNFg==",
+        "4agAzQ5+dnTmLZEjsZs26g==",
+        "LegGM1ft8Y7Ka3CUxpObvg==",
+        "KRdILc1QDOpow5im/qY+Kw==",
+        "peMW+rpwmXrSwplVuB/gTA==",
+        "Pic1ncr+Zn6wv75zjAdzQA==",
+        "ilSPlWYbiPzIC13vQUBlOw==",
+        "GUlDufLoTalBqrG/h3mZ6w==",
+        "5twANNlT57T9BG4r2D9+Hw==",
+        "ENrnM8HlMi+5y8Hsu4Pn4A==",
+        "K/DzpLEbz1MpRjA6qyYn4Q==",
+        "yN1cHJRHDXoFxFZacL6wsw==",
+        "Rc6r+KqIePH+dnj1aNYCsQ==",
+        "8u/z5htgqXVU5Dqwd9whJQ==",
+        "jV575O42EYoqDNxCm9643Q==",
+        "xCxGo0h3lS8N6X+ivKfpjA==",
+        "us+2nfpj2gjI7s14Hw0gmA==",
+        "bp90A/rbESwVU7eh9xRTfQ==",
+        "5QtMXzbTafvKDQOWZP7M8w==",
+        "1gFCxPLjQlQGKmSGmHwmJQ==",
+        "m+/dnOIe6SaIFhfvg+ybDg==",
+        "9Dcg87+RPq9U+swRg4dH3Q==",
+        "mnjbL7WFmrWp0RUqS8AMGA==",
+        "/0e0E+NFmq8GeE5+y2Gekw==",
+        "y11mbpHHtka9Ep8cr2nEvQ==",
+        "GdmjRyliw+W21Q+dHO4CWA==",
+        "X65wWQTpkg756V/Nfn92kQ==",
+        "xj06KvacQOxRSofbhzBNgA==",
+        "nVDxVhaa2o38gd1XJgE3aw==",
+        "4IV+JOGXrltpkQamBRXMgA==",
+        "jIfp8LqaYXT88r/K3a8gNw==",
+        "vhT4dDtbMFVyevS6yCGy0g==",
+        "zMs7/x8hDt8xj2FFc5+6vA==",
+        "1J7u2N62JGb2VrnCRlJIrw==",
+        "3hJs9P/RRxB0CO4q0Icb+g==",
+        "ZpuVY1ZyoKD3hqosdsfT6Q==",
+        "6KIM7C7eWgxZtqZboiJvZQ==",
+        "vtb6fdqirkuUkqITAmXTlw==",
+        "C/rEVr22mw2u/1dwUx9VTg==",
+        "NrY4Q5C67haCWLK8HXHq9g==",
+        "X9qvEftCEFWX3gBU5hXy+Q==",
+        "0zgw7xNB3xVGaH48TyxaNQ==",
+        "g7J9Jy/PJrAGRgVdvA+bEg==",
+        "9zb+anAyZVBzuU9rW4cJtg==",
+        "6Zc5FzT/m0YIjxEPYA6zDQ==",
+        "R2YPNlvCbVK0EodTR7czIw==",
+        "gsI6EGgXMtDu+1u364A8mw==",
+        "Bg2wBFb1/xaxeEiHfBHX+A==",
+        "64aapfVI6dV3LpTK56KZlg==",
+        "HdgcJU0W3yVnH69VYStmug==",
+        "qTDCcv+LK3JPFB/++t66IQ==",
+        "P0HEIXMnAmbvq+QYREwFzw==",
+        "aaU7CAmtyE35jNKTkyXOkg==",
+        "r9G97WKDiQ48qJHP9LBRNg==",
+        "8mPgQhYVDn8KshDDvvf5SA==",
+        "GCQiiOLDguXLiYwuLcFPsA==",
+        "R2Use39If2C0FVBP7KDerA==",
+        "23C4eh3yBb5n/RNZeTyJkA==",
+        "2QQtKtBAm2AjJ5c0WQ6BQA==",
+        "Qc+XYy2qyWJ5VVwd2PExbw==",
+        "zJ7ScHNxr2leCDNNcuDApA==",
+        "vFtC0B2oe1gck28JOM1dyg==",
+        "bLEntCrCHFy9pg3T3gbBzg==",
+        "G3PmmPGHaWHpPW30xQgm3Q==",
+        "me61ST+JrXM5k3/a11gRAA==",
+        "+LJYVZl1iPrdMU3L5+nxZw==",
+        "CLPzjXKGGpJ0VrkSJp7wPQ==",
+        "Pc+u0MAzp4lndTz4m6oQ5w==",
+        "cwBNvZc0u4bGABo88YUsVQ==",
+        "q7m/EtZySBjZNBjQ5m1hKw==",
+        "8ZBiwr842ZMKphlqmNngHw==",
+        "LMCZqd3UoF/kHHwzTdj7Tw==",
+        "0ODJyWKJSfObo+FNdRQkkA==",
+        "ViweSJuNWbx5Lc49ETEs/A==",
+        "x+8rwkqKCv0juoT5m1A4eg==",
+        "pxuSWn1u+bHtRjyh2Z8veA==",
+        "GKzs8mlnQQc58CyOBTlfIg==",
+        "Owg8qCpjZa+PmbhZew6/sw==",
+        "YLz+HA6qIneP+4naavq44Q==",
+        "9ajIS45NTicqRANzRhDWFA==",
+        "DjeSrUoWW2QAZOAybeLGJg==",
+        "qxALQrqHoDq9d91nU0DckA==",
+        "yPIeWcW8+3HjDagegrN8bw==",
+        "ocpLRASvTgqfkY20YlVFHQ==",
+        "RuLeQHP1wHsxhdmYMcgtrQ==",
+        "3WwITQML938W9+MUM56a3A==",
+        "ZbLVNTQSVZQWTNgC4ZGfQg==",
+        "X6Ln4si8G5aKar52ZH/FEQ==",
+        "+gbitI/gpxebN/rK7qj8Fw==",
+        "7cnUHeaPO8txZGGWHL9tKg==",
+        "epY+dsm5EMoXnZCnO4WSHw==",
+        "nf8x+F03kOpMhsCSUWEhVg==",
+        "VE4sLM5bKlLdk85sslxiLQ==",
+        "Hs3vUOOs2TWQdQZHs+FaQQ==",
+        "hkOBNoHbno2iNR7t3/d4vg==",
+        "Ar9N1VYgE7riwmcrM3bA2Q==",
+        "SbMjjI8/P8B9a9H2G0wHEQ==",
+        "tU31r8zla146sqczdKXufg==",
+        "tFmWYH82I3zb+ymk5dhepA==",
+        "XHjrTLXkm/bBY/BewmJcCQ==",
+        "FV/D5uSco+Iz8L+5t7E8SA==",
+        "yKLLiqzxfrCsr6+Rm6kx1Q==",
+        "B6reUwMkQFaCHb9BYZExpw==",
+        "5jyuDp82Fux+B0+zlx8EXw==",
+        "WGKFTWJac8uehn3N59yHJw==",
+        "JQf9UmutPh3tAnu7FDk3nA==",
+        "hv5GrLEIjPb4bGOi8RSO0w==",
+        "p3V7NfveB6cNxFW7+XQNeQ==",
+        "DinJuuBX9OKsK5fUtcaTcQ==",
+        "UEMwF4kwgIGxGT4jrBhMPQ==",
+        "Y78dviyBS3Jq9zoRD5sZtQ==",
+        "zbjXhZaeyMfdTb2zxvmRMg==",
+        "kydoXVaNcx1peR5g6i588g==",
+        "M2suCoFHJ5fh9oKEpUG3xA==",
+        "/VnKh/NDv7y/bfO6CWsLaQ==",
+        "S+b37XhKRm8cDwRb1gSsKQ==",
+        "jz7QlwxCIzysP39Cgro8jg==",
+        "IjmLaf3stWDAwvjzNbJpQA==",
+        "cHSj5dpQ04h/WyefjABfmQ==",
+        "+gO0bg8LY+py2dLM1sM7Ag==",
+        "fSANOaHD0Koaqg7AoieY9A==",
+        "vqYHQ3MnHrAIAr1QHwfIag==",
+        "Uh1mvZNGehK1AaI4a1auKQ==",
+        "HCbHUfsTDl6+bxPjT57lrA==",
+        "S7Vjy/gOWp0HozPP1RUOZw==",
+        "KPh6TwYpspne4KZA6NyMbw==",
+        "cfh5VZFmIqJH/bKboDvtlA==",
+        "H1zH9I8RwfEy5DGz3z+dHw==",
+        "2ksediOVrh4asSBxKcudTg==",
+        "+jVN/3ASc2O44sX6ab8/cg==",
+        "uvKYnKE01D5r7kR9UQyo5A==",
+        "BB9PTlwKAWkExt3kKC/Wog==",
+        "yqQPU4jT9XvRABZgNQXjgg==",
+        "6v3eTZtPYBfKFSjfOo2UaA==",
+        "49z/15Nx9Og7dN9ebVqIzg==",
+        "VjclDY8HN4fSpB263jsEiQ==",
+        "vSKsa0JhLCe9QFZKkcj58Q==",
+        "PolhKCedOsplEcaX4hQ0YQ==",
+        "D0Qt9sRlMaPnOv1xaq+XUg==",
+        "gBgJF0PiGEfcUnXF0RO7/w==",
+        "sC11Rf/mau3FG5SnON4+vQ==",
+        "rKb3TBM4EPx/RErFOFVCnQ==",
+        "+n0K7OB2ItzhySZ4rhUrMg==",
+        "Epm0d/DvXkOFeM4hoPCBrg==",
+        "K8PVQhEJCEH1ghwOdztjRw==",
+        "xjA21QjNdThLW3VV7SCnrg==",
+        "nE72uQToQFVLOzcu/nMjww==",
+        "2Hc5oyl0AYRy2VzcDKy+VA==",
+        "Y7XpxIwsGK3Lm/7jX/rRmg==",
+        "MK7AqlJIGqK2+K5mCvMXRQ==",
+        "mXycPfF5zOvcj1p4hnikWw==",
+        "V1fvtnJ0L3sluj9nI5KzRw==",
+        "TahqPgS7kEg+y6Df0HBASw==",
+        "EKU3OVlT4b/8j3MTBqpMNg==",
+        "EdvIAKdRAXj7e42mMlFOGQ==",
+        "uPm+cF4Jq08S5pQhYFjU8A==",
+        "CnIwpRVC2URVfoiymnsdYQ==",
+        "wyx5mnUMgP5wjykjAfTO7w==",
+        "OwIGvTh8FPFqa4ijNkguAw==",
+        "4ID0PHTzIMZz2rQqDGBVfA==",
+        "rlXt6zKE7DswUl0oWGOQUQ==",
+        "4NP8EFFJyPcuQKnBSxzKgQ==",
+        "bJgsuw29cO2WozqsGZxl7w==",
+        "b3q8kjHJPj9DWrz3yNgwjQ==",
+        "QGYFMpkv37CS2wmyp42ppg==",
+        "Kzs+/IZJO8v4uIv9mlyJ2Q==",
+        "ZJY+hujfd58mTKTdsmHoQQ==",
+        "R8FxgXWKBpEVbnl41+tWEw==",
+        "+CvLiih/gf2ugXAF+LgWqw==",
+        "BDbfe/xa9Mz1lVD82ZYRGA==",
+        "Dz90OhYEjpaJ/pxwg1Qxhg==",
+        "MLHt6Ak288G0RGhCVaOeqA==",
+        "r0QffVKB9OD9yGsOtqzlhA==",
+        "hK8KhTFcR06onlIJjTji/Q==",
+        "wMum67lfk5E1ohUObJgrOg==",
+        "JKmZqz9cUnj6eTsWnFaB0A==",
+        "rtJdfki8fG6CB36CADp0QA==",
+        "cUyqCa7Oue934riyC17F8g==",
+        "y4Y4mSSTw/WrIdRpktc5Hw==",
+        "r36kVMpF+9J+sfI3GeGqow==",
+        "ydVj2odhergi+2zGUwK4/A==",
+        "J2NFyb8cXEpZyxWDthYQiA==",
+        "qYuo5vY8V3tZx41Kh9/4Dw==",
+        "jrfRznO0nAz6tZM1mHOKIA==",
+        "JSr/lqDej81xqUvd/O2s7w==",
+        "vHGjRRSlZHJIliCwIkCAmQ==",
+        "sQAxqWXeiu/Su0pnnXgI9A==",
+        "xPe76nHyHmald6kmMQsKdg==",
+        "50jASqzGm4VyHJbFv8qVRA==",
+        "uuiJ+yB7JLDh2ulthM0mjg==",
+        "TI90EuS/bHq/CAlX32UFXg==",
+        "JgxNrUlL8wutG04ogKFPvw==",
+        "aMa1yVA71/w6Uf1Szc9rMA==",
+        "k/Aou2Jmyh8Bu3k8/+ndsQ==",
+        "iANKiuMqWzrHSk9nbPe3bQ==",
+        "7GgNLBppgAKcgJCDSsRqOQ==",
+        "bzVeU2qM9zHuzf7cVIsSZw==",
+        "rkeLYwMZ1/pW2EmIibALfA==",
+        "91+Yms6Oy/rP0rVjha5z9w==",
+        "JgXSPXDqaS1G9NqmJXZG0A==",
+        "ZzduJxTnXLD9EPKMn1LI4Q==",
+        "6W79FmpUN1ByNtv5IEXY4w==",
+        "Y1Nm3omeWX2MXaCjDDYnWQ==",
+        "ejfikwrSPMqEHjZAk3DMkA==",
+        "WNfDNaWUOqABQ6c6kR+eyw==",
+        "4BkqgraeXY7yaI1FE07Evw==",
+        "AjHz9GkRTFPjrqBokCDzFw==",
+        "T/6gSz2HwWJDFIVrmcm8Ug==",
+        "VWy9lB5t4fNCp4O/4n8S4w==",
+        "/FdZzSprPnNDPwbhV1C0Cg==",
+        "LUWxfy4lfgB5wUrqCOUisw==",
+        "r1VGXWeqGeGbfKjigaAS+Q==",
+        "ztULoqHvCOE6qV7ocqa4/w==",
+        "QCpzCTReHxGm5lcLsgwPCA==",
+        "Hst3yfyTB7yBUinvVzYROQ==",
+        "gf1Ypna/Tt+TZ08Y+GcvGg==",
+        "3rbml1D0gfXnwOs5jRZ3gA==",
+        "2vm7g3rk1ACJOTCXkLB3zA==",
+        "11FE2kknwYi2Qu0JUKMn3A==",
+        "1b2uf+CdVjufqiVpUShvHw==",
+        "0a4SafpDIe8V4FlFWYkMHw==",
+        "7btpMFgeGkUsiTtsmNxGQA==",
+        "dUx1REyXKiDFAABooqrKEA==",
+        "knYKU74onR6NkGVjQLezZg==",
+        "Scto+9TWxj1eZgvNKo+a9A==",
+        "cvZT1pvNbIL8TWg+SoTZdA==",
+        "1nXByug2eKq0kR3H3VjnWQ==",
+        "tG+rpfJBXlyGXxTmkceiKA==",
+        "7W9aF7dxnL+E8lbS/F7brg==",
+        "8vr+ERVrM99dp+IGnCWDGQ==",
+        "oFNMOKbQXcydxnp8fUNOHw==",
+        "uJZGw3IY2nCcdVeWW1geNQ==",
+        "q6LG0VzO1oxiogAAU63hyg==",
+        "f0H/AFSx2KLZi9kVx5BAZg==",
+        "1RQZ2pWSxT+RKyhBigtSFg==",
+        "scCQPl0em2Zmv/RQYar60g==",
+        "A2ODff+ImIkreJtDPUVrlg==",
+        "vRgkZZGVN7YZrlml0vxrKA==",
+        "68jPYo3znYoU4uWI7FH3/g==",
+        "iJ2nT8w8LuK11IXYqBK+YA==",
+        "54XELlPm8gBvx8D5bN3aUg==",
+        "PTAm/jGkie7OlgVOvPKpaA==",
+        "v7BrkRmK0FfWSHunTRHQFQ==",
+        "dVh/XMTUIx1nYN4q1iH1bA==",
+        "TSGL3iQYUgVg/O9SBKP9EA==",
+        "wTO49YX/ePHMWtcoxUAHpw==",
+        "bMb1ia0rElr2ZpZVhva0Jw==",
+        "sNmW2b2Ud7dZi3qOF8O8EQ==",
+        "3djRJvkZk9O2bZeUTe+7xQ==",
+        "I9KNZC1tijiG1T72C4cVqQ==",
+        "sQzCwNDlRsSH7iB9cTbBcg==",
+        "mk1CKDah7EzDJEdhL22B7w==",
+        "lON3WM0uMJ30F8poBMvAjQ==",
+        "88PNi9+yn3Bp4/upgxtWGA==",
+        "C+Ssp+v1r+00+qiTy2d7kA==",
+        "11U5XEwfMI7avx014LfC8g==",
+        "xsf0m31Am0W9eLhopAkfnA==",
+        "d13Rj3NJdcat0K/kxlHLFw==",
+        "UP7NXAE0uxHRXUAWPhto0w==",
+        "ZKXxq9yr7NGBOHidht34uQ==",
+        "Fd2fYFs8vtjws2kx1gf6Rw==",
+        "ojf6uL85EuEYgLvHoGhUrw==",
+        "KjnL3x+56r3M2pDj1pPihA==",
+        "WdCWezJU4JK43EOZ9YHVdg==",
+        "/jH6imhTPZ/tHI4gYz2+HA==",
+        "+OLntmlsMBBYPREPnS6iVw==",
+        "5lfLJAk1L3QzGMML3fOuSw==",
+        "AZs3v4KJYxdi8T1gjVjI2Q==",
+        "7pkUY2UzSbGnwLvyRrbxfA==",
+        "BjfOelfc1IBgmUxMJFjlbQ==",
+        "TcGhAJHRr7eMwGeFgpFBhg==",
+        "Y7iDCWYrO1coopM3RZWIPg==",
+        "mnalaO6xJucSiZ0+99r3Cg==",
+        "plXHHzA8X9QGwWzlJxhLRw==",
+        "Zqd6+81TwYuiIgLrToFOTQ==",
+        "1Pmnur6TbZ9cmemvu0+dSA==",
+        "OaNpzwshdHUZMphQXa6i8w==",
+        "WKehT4nGF2T7aKuzABDMlA==",
+        "4LvQSicqsgxQFWauqlcEjw==",
+        "BMZB1FwvAuEqyrd0rZrEzw==",
+        "YfbfE3WyYOW7083Y8sGfwQ==",
+        "46FCwqh+eMkf+czjhjworw==",
+        "734u4Y1R3u7UNUnD+wWUoA==",
+        "yf06Slv9l3IZEjVqvxP2aA==",
+        "bIk7Fa6SW7X18hfDjTKowg==",
+        "DnF6TYSJxlc+cwdfevLYng==",
+        "ionqS0piAOY2LeSReAz4zg==",
+        "hlMumZ7RJFpILuKs09ABtw==",
+        "NjeDgQ1nzH1XGRnLNqCmSg==",
+        "o7y4zQXQAryST2cak4gVbw==",
+        "29EybnMEO95Ng4l/qK4NWQ==",
+        "udU65VtsvJspYmamiOsgXw==",
+        "v1AWe5qb5y3vSKFb7ADeEw==",
+        "wK6Srd83eLigZ11Q20XGrg==",
+        "GmC+0rNDMIR+YbUudoNUXw==",
+        "W4utAK3ws0zjiba/3i91YA==",
+        "MlKWxeEh8404vXenBLq4bw==",
+        "Gdf4VEDLBrKJNQ8qzDsIyw==",
+        "Z9bDWIgcq6XwMoU2ECDR5Q==",
+        "VIkS30v268x+M1GCcq/A8A==",
+        "iPwX3SbbG9ez9HoHsrHbKw==",
+        "yKrsKX4/1B1C0TyvciNz5w==",
+        "BophnnMszW5o+ywgb+3Qbw==",
+        "eJLrGwPRa6NgWiOrw1pA7w==",
+        "eV+RwWPiGEB+76bqvw+hbA==",
+        "oad5SwflzN0vfNcyEyF4EA==",
+        "Uw6Iw+TP9ZdZGm2b/DAmkg==",
+        "9qWLbRLXWIBJUXYjYhY2pg==",
+        "dxWv00FN/2Cgmgq9U3NVDQ==",
+        "AX1HxQKXD12Yv5HWi39aPQ==",
+        "J0NauydfKsACUUEpMhQg8A==",
+        "mxug34EekabLz0JynutfBg==",
+        "bNq/hj0Cjt4lkLQeVxDVdQ==",
+        "nW3zZshjZEoM8KVJoVfnuQ==",
+        "ghp8sWGKWw20S/z1tbTxFg==",
+        "S4rFuiKLFKZ+cL7ldiTwpg==",
+        "8ZqmPJDnQSOFXvNMRQYG2Q==",
+        "6XYqR2WvDzx4fWO7BIOTjA==",
+        "Uo+FIhw1mfjF6/M8cE1c/Q==",
+        "bsHIShcLS134C+dTxFQHyA==",
+        "19yQHaBemtlgo2QkU5M6jQ==",
+        "sWLcS+m4aWk31BiBF+vfJQ==",
+        "BlCgDd7EYDIqnoAiKOXX6Q==",
+        "MrxR3cJaDHp0t3jQNThEyg==",
+        "cMo6l1EQESx1rIo+R4Vogg==",
+        "VOvrzqiZ1EHw+ZzzTWtpsw==",
+        "1/ZheMsbojazxt31j/l3iA==",
+        "0QxPAqRF8inBuFEEzNmLjA==",
+        "UXUNYEOffgW3AdBs7zTMFA==",
+        "lOPJhHqCtMRFZfWMX/vFZQ==",
+        "rXSbbRABEf4Ymtda45w8Fw==",
+        "jfegbZSZWkDoPulFomVntA==",
+        "hfcH5Az2M7rp+EjtVpPwsg==",
+        "VsXEBIaMkVftkxt1kIh7TA==",
+        "M20iX2sUfw5SXaZLZYlTaA==",
+        "VUDsc9RMS1fSM43c+Jo9dQ==",
+        "itPtn+JaO4i7wz2wOPOmDQ==",
+        "rCxoo4TP/+fupXMuIM0sDA==",
+        "cSHSg9xJz/3F6kc+hKXkwg==",
+        "b4BoZmzVErvuynxirLxn0w==",
+        "e4B3HmWjW+6hQzcOLru6Xg==",
+        "lTE6u9G/RzvmbuAzq2J2/Q==",
+        "897ptlztTjr7yk+pk8MT0Q==",
+        "jd6IpPJwOJW1otHKtKZ5Gw==",
+        "b4aFwwcWMXsSdgS1AdFOXA==",
+        "FltEN+7NKvzt+XAktHpfHA==",
+        "ZyDh3vCQWzS5DI1zSasXWA==",
+        "kcJ1acgBv6FtUhV8KuWoow==",
+        "zgEyxj/sCs63O98sZS94Yw==",
+        "/kGxvyEokQsVz0xlKzCn2A==",
+        "cxqHS4UbPolcYUwMMzgoOA==",
+        "62RHCbpGU8Hb+Ubn+SCTBg==",
+        "ePlsM/iOMme2jEUYwi15ng==",
+        "0fN+eHlbRS6mVZBbH/B9FQ==",
+        "k0XIjxp2vFG7sTrKcfAihA==",
+        "0rfG4gRugAwVP0i3AGVxxg==",
+        "M98hjSxCwvZ27aBaJTGozQ==",
+        "kzGNkWh3fz27cZer4BspUQ==",
+        "3CJbrUdW68E3Drhe4ahUnQ==",
+        "NGApiVkDSwzO45GT57GDQw==",
+        "lMjip5hbCjkD9JQjuhewDg==",
+        "GrSbnecYAC3j5gtoKntL0A==",
+        "9dbn0Kzwr9adCEfBJh78uQ==",
+        "64QzHOYX0A9++FqRzZRHlQ==",
+        "YZt6HwCvdI5DRQqndA/hBQ==",
+        "6GXHGF62/+jZ7PfIBlMxZw==",
+        "PBULPuFXb6V3Di713n3Gug==",
+        "8Cm19vJW8ivhFPy0oQXVNA==",
+        "zDSQ3NJuUGkVOlvVCATRwA==",
+        "6QAtjOK9enNLRhcVa2iaTg==",
+        "v/PshI6JjkL9nojLlMNfhg==",
+        "yTgN5xFIdz1MzFS6xMl5uQ==",
+        "SCO9nQncEcyVXGCtx30Jdg==",
+        "7b0oo4+qphu6HRvJq6qkHQ==",
+        "ol9xhVTG9e1wNo50JdZbOA==",
+        "hIABph+vhtSF5kkZQtOCTA==",
+        "k+IBS52XdOe5/hLp28ufnA==",
+        "6HnWgYNKohqhoa1tnjjU3A==",
+        "HDxGhvdQwGh0aLRYEGFqnw==",
+        "LDuBcL5r3PUuzKKZ9x6Kfw==",
+        "HPvYV94ufwiNHEImu4OYvQ==",
+        "h2cnQQF2/R3Mq2hWdDdrTg==",
+        "nqpKfidczdgrNaAyPi7BOQ==",
+        "2ywo4t5PPSVUCWDwUlOVwQ==",
+        "jZMDIu95ITTjaUX0pk4V5g==",
+        "bA2kaTpeXflTElTnQRp6GQ==",
+        "lwYQm2ynA3ik2gE1m11IEg==",
+        "5ugVOraop5P5z5XLlYPJyQ==",
+        "l2NppPcweAtmA1V2CNdk2Q==",
+        "DbWQI3H2tcJsVJThszfHGA==",
+        "H6HPFAcdHFbQUNrYnB74dA==",
+        "H1NJEI+fvOQbI51kaNQQjQ==",
+        "53UccFNzMi9mKmdeD82vAw==",
+        "lffapwUUgaQOIqLz2QPbAg==",
+        "rSvhrHyIlnIBlfNJqemEbw==",
+        "BLJk9wA88z6e0IQNrWJIVw==",
+        "5m1ijXEW+4RTNGZsDA/rxQ==",
+        "GG8a3BlwGrYIwZH9j3cnPA==",
+        "HhBHt5lQauNl7EZXpsDHJA==",
+        "/XjB6c5fxFGcKVAQ4o+OMw==",
+        "+tuUmnRDRWVLA+1k0dcUvg==",
+        "SM7E98MyViSSS9G0Pwzwyw==",
+        "c5q/8n7Oeffv3B1snHM/lA==",
+        "kwlAQhR2jPMmfLTAwcmoxw==",
+        "0b/xj6fd0x+aB8EB0LC4SA==",
+        "S8jlvuYuankCnvIvMVMzmg==",
+        "kZkmDatUOdIqs7GzH3nI1A==",
+        "obW3kzv2KBvuckU7F+tfjA==",
+        "pa8nkpAAzDKUldWjIvYMYg==",
+        "m+eh+ZqS74w2q0vejBkjaw==",
+        "LcoJBEPTlSsQwfuoKQUxEw==",
+        "KO2XVYyNZadcQv8aCNn5JA==",
+        "uvzmRcvgepW6mZbMfYgcNw==",
+        "KhUT2buOXavGCpcDOcbOYg==",
+        "fo3JL+2kPgDWfP+CCrFlFw==",
+        "wIfvvLKC61gOpsddUFjVog==",
+        "SPHU6ES1WVm0Mu2LB+YjrA==",
+        "LWWfRqgtph1XrpxF4N64TA==",
+        "LCvz/h9hbouXCmdWDPGWqg==",
+        "PXC6ZpdMH0ATis/jGW12iA==",
+        "z920R8eahJPiTsifrPYdxA==",
+        "GIHKW6plyLra0BmMOurFgA==",
+        "k6OmSlaSZ5CB0i7SD9LczQ==",
+        "YZ39RIXpeLAhyMgmW2vfkQ==",
+        "bs2QG8yYWxPzhtyMqO6u3A==",
+        "pKaTI+TfcV3p/sxbd2e7YQ==",
+        "xWYecfzAtXT9WyQ8NYY/hw==",
+        "Fz8EI+ZpYlbcttSHs5PfpA==",
+        "wfwuxn+Vja1DNwiDwL2pcQ==",
+        "wux5Y8AipBnc5tJapTzgEQ==",
+        "U+oTpcjhc0E+6UjP11OE/Q==",
+        "yTVJKBn72RjakMBXDoBKHg==",
+        "0TxcYwG72dT7Tg+eG8pP1w==",
+        "imZ+mwiT22sW2M9alcUFfg==",
+        "CkDIoAFLlIRXra78bxT/ZA==",
+        "4qMSNAxichi3ori/pR+o0w==",
+        "zNLlWGW/aKBhUwQZ4DZWoQ==",
+        "D31ZticrjGWAO45l5hFh7A==",
+        "HdXg64DBy5WcL5fRRiUVOg==",
+        "yhI5jHlfFJxu4eV5VJO2zQ==",
+        "e9GqAEnk8XI5ix6kJuieNQ==",
+        "EC0+iUdSZvmIEzipXgj7Gg==",
+        "chwv4+xbEAa93PHg8q9zgQ==",
+        "B1VVUbl8pU0Phyl1RYrmBg==",
+        "A+DLpIlYyCb9DaarpLN76g==",
+        "wHA+D5cObfV3kGORCdEknw==",
+        "+Mp+JIyO0XC5urvMyi3wvQ==",
+        "vUE8Iw3NyWXURpXyoNJdaw==",
+        "ParhxI6RtLETBSwB0vwChQ==",
+        "NxSdT2+MUkQN49pyNO2bJw==",
+        "JSyhTcHLTfzHsPrxJyiVrA==",
+        "PAlx9+U+yQCAc5Fi0BOG0w==",
+        "W/0s1x3Qm+wN8DhROk6FrQ==",
+        "L3Jt5dHQpWQk74IAuDOL8g==",
+        "VWb8U4jF/Ic0+wpoXi/y/g==",
+        "1wBuHqS1ciup31WTfm3NPg==",
+        "BDNM1u/9mefjuW1YM2DuBg==",
+        "SDi5+FoP9bMyKYp+vVv1XA==",
+        "23d9B9Gz5kUOi1I//EYsSQ==",
+        "/a9O7kWeXa0le45ab3+nVw==",
+        "PcoVtZrS1x1Q+6nfm4f80w==",
+        "A6TLWhipfymkjPYq8kaoDQ==",
+        "lzUQ1o7JAbdJYpmEqi6KnQ==",
+        "/2jGyMekNu7U136K+2N3Jg==",
+        "ZItMIn1vhGqAlpDHclg0Ig==",
+        "Ee4A3lTMLQ7iDQ7b8QP8Qg==",
+        "bO55S58bqDiRWXSAIUGJKw==",
+        "zeHF6fdeqcOId3fRUGscRw==",
+        "BxsDnI8jXr4lBwDbyHaYXw==",
+        "ylA6sU7Kaf9fMNIx1+sIlw==",
+        "ZWXfE3uGU91WpPMGyknmqw==",
+        "f1+fHgR5rDPsCZOzqrHM7Q==",
+        "8VqeoQELbCs232+Mu+HblA==",
+        "beSrliUu0BOadCWmx+yZyA==",
+        "NQVQfN3nIg9ipHiFh4BvfQ==",
+        "4wnUAbPT3AHRJrPwTTEjyw==",
+        "/cdR1i5TuQvO+u3Ov3b0KQ==",
+        "wtyAZIfhomcHe9dLbYoSvA==",
+        "ulpDxLeQnIRPnq6oaah2AA==",
+        "pdPwUHauXOowaq9hpL2yFw==",
+        "1+A9FCGP3bZhk6gU3LQtNg==",
+        "raYifKqev8pASjjuV+UTKQ==",
+        "+OERSmo7OQUUjudkccSMOA==",
+        "FeRovookFQIsXmHXUJhGOw==",
+        "USCvrMEm/Wqeu9oX6FrgcQ==",
+        "kly/2kE4/7ffbO34WTgoGg==",
+        "IindlAnepkazs5DssBCPhA==",
+        "Bq82MoMcDjIo/exqd/6UoA==",
+        "ocvA1/NbyxM0hanwwY6EiA==",
+        "rtd6mqFgGe98mqO0pFGbSw==",
+        "nvLEpj6ZZF3LWH3wUB6lKg==",
+        "AGd0rcLnQ0n+meYyJur1Pw==",
+        "wI7JrSPQwYHpv2lRsQu9nQ==",
+        "OnmvXbyT2BYsSDJYZhLScA==",
+        "CmBf5qchS1V3C2mS6Rl4bw==",
+        "TafM7nTE5d+tBpRCsb8TjQ==",
+        "wxkb8evGEaGf/rg/1XUWiA==",
+        "y1J+o6DC2sETFsySgpDZyA==",
+        "SVLHWPCCH7GPVCF7QApPbw==",
+        "HMWOlMmzocOIiJ7yG1YaDQ==",
+        "DJmrmNRKARzsTCKSMLmcNA==",
+        "/XC/FmMIOdhMTPqmy4DfUA==",
+        "63OTPaKM0xCfJOy9EDto+Q==",
+        "PxReytUUn/BbxYTFMu1r2Q==",
+        "WjDqf1LyFyhdd8qkwWk+MA==",
+        "/DiUApY7cVp5W9o24rkgRA==",
+        "alJtvTAD7dH/zss/Ek1DMQ==",
+        "xLm/bJBonpTs0PwsF0DvRg==",
+        "eAOEgF5N80A/oDVnlZYRAw==",
+        "LqgzKxbI6WTMz0AMIDJR5w==",
+        "MJ1FuK8PXcmnBAG9meU84A==",
+        "JLq/DrW2f26NaRwfpDXIEA==",
+        "fsrX00onlGvfsuiCc35pGg==",
+        "tXVb5f90k9l3e1oK2NGXog==",
+        "1JRgSHnfAQFQtSkFTttkqQ==",
+        "B0TaUQ6dKhPfSc5V/MjLEQ==",
+        "nkbLVLvh3ClKED97+nH+7Q==",
+        "avFTp3rS6z5zxQUZQuaBHQ==",
+        "lNF8PvUIN02NattcGi5u4g==",
+        "bBEndaOStXBpAK79FrgHaw==",
+        "dM9up4vKQV5LeX82j//1jQ==",
+        "4WO6eT0Rh6sokb29zSJQnQ==",
+        "RHKCMAqrPjvUYt13BVcmvw==",
+        "Ju4YwtPw+MKzpbC0wJsZow==",
+        "tzV7ixFH37ze4zuLILTlfA==",
+        "oPlhC4ebXdkIDazeMSn1fQ==",
+        "5pje7qyz8BRsa8U4a4rmoA==",
+        "7E6V6/zSjbtqraG7Umj+Jw==",
+        "8QK7emHS6rAcAF5QQemW/A==",
+        "LhqRc9oewY4XaaXTcnXIHQ==",
+        "p/7qM5+Lwzw1/lIPY91YxQ==",
+        "fy54Milpa7KZH/zgrDmMXQ==",
+        "LyPXOoOPMieqINtX8C9Zag==",
+        "aD4QvtMlr8Lk/zZgZ6zIMg==",
+        "dsueq9eygFXILDC7ZpamuA==",
+        "+mJLK+6qq8xFv7O/mbILTw==",
+        "nHUpYmfV59fe3RWaXhPs3Q==",
+        "VbCoGr8apEcN7xfdaVwVXw==",
+        "/2Chaw2M9DzsadFFkCu6WQ==",
+        "rKAQxu80Q8g1EEhW5Wh8tg==",
+        "RJJqFMeiCZHdsqs72J17MQ==",
+        "GF2yvI9UWf1WY7V7HXmKPA==",
+        "JyIDGL1m/w+pQDOyyeYupA==",
+        "wR2Gxb07nkaPcZHlEjr8iA==",
+        "PbDVq2Iw1eeM8c2o/XYdTA==",
+        "BL3buzSCV78rCXNEhUhuKQ==",
+        "i42XumprV/aDT5R0HcmfIQ==",
+        "DuEKxykezAvyaFO2/5ZmKQ==",
+        "6ACvJNfryPSjGOK39ov8Qg==",
+        "YaUKOTyByjUvp1XaoLiW5Q==",
+        "jNcMS2zX1iSZN9uYnb2EIg==",
+        "VRnx+kd6VdxChwsfbo1oeQ==",
+        "4Qinl7cWmVeLJgah8bcNkw==",
+        "Fiy3hkcGZQjNKSQP9vRqyA==",
+        "HaSc7MZphCMysTy2JbTJkw==",
+        "VhYGC8KYe5Up+UJ2OTLKUw==",
+        "K2gk9zWGd0lJFRMQ1AjQ/Q==",
+        "NfxVYc3RNWZwzh2RmfXpiA==",
+        "JGeqHRQpf4No74aCs+YTfA==",
+        "7VHlLw20dWck+I8tCEZilA==",
+        "V5HKdaTHjA8IzvHNd9C51g==",
+        "9TalxEyFgy6hFCM73hgb7Q==",
+        "R/y6+JJP8rzz1KITJ4qWBw==",
+        "7bM/pn4G7g7Zl6Xf1r62Lg==",
+        "CHsFJfsvZkPWDXkA6ZMsDQ==",
+        "uXuPA/2KJbb7ZX+NymN3dw==",
+        "o+nYS4TqJc6XOiuUzEpC3A==",
+        "8N3mhHt29FZDHn1P2WH1wQ==",
+        "uZ2gUA74/7Q33tI2TcGQlg==",
+        "8B12CamjOGzJDnQ+RkUf4w==",
+        "9FdpxlIFu11qIPdO7WC5nw==",
+        "G+sGF13VXPH4Ih6XgFEXxg==",
+        "y+1I05LDAYJ09tKMs3zW6g==",
+        "gnkadeCgjdmLdlu/AjBZJg==",
+        "1I+UVx3krrD4NhzO7dgfHQ==",
+        "8LNNoHe6rEQyJ0ebl151Mw==",
+        "yOE90OHQdyOfrAgwDvn2gA==",
+        "ayBGGPEy++biljvGcwIjXA==",
+        "o/Y4U6rWfsUCXJ72p5CUGw==",
+        "5kvyy902llnYGQdn2Py04w==",
+        "6k2cuk0McTThSMW/QRHfjA==",
+        "2XrR2hjDEvx8MQpHk9dnjw==",
+        "fv/PW8oexJYWf5De30fdLQ==",
+        "861mBNvjIkVgkBiocCUj/Q==",
+        "NKGY0ANVZ0gnUtzVx1pKSw==",
+        "4DIPP/yWRgRuFqVeqIyxMQ==",
+        "cgSEbLqqvDsNUyeA3ryJ6Q==",
+        "xbBxUP9JyY0wDgHDipBHeg==",
+        "c3WVxyC5ZFtzGeQlH5Gw+w==",
+        "ZKeTDCboOgCptrjSfgu0xw==",
+        "DjHszpS8Dgocv3oQkW/VZQ==",
+        "Iqszlv4R49UevjGxIPMhIA==",
+        "uChFnF0oCwARhAOz/d47eA==",
+        "0egBaMnAf0CQEXf1pCIKnA==",
+        "FnVNxl5AFH1AieYru2ZG+A==",
+        "2Ct+pLXrK6Ku1f4qehjurQ==",
+        "x2nSgcTjA3oGgI8mMgiqjw==",
+        "AUGmvZkpkKBry5bHZn4DJA==",
+        "x8kRVzohTdhkryvYeMvkMw==",
+        "rXfWkabSPN+23Ei1bdxfmQ==",
+        "ElTNyMR4Rg8ApKrPw88WPg==",
+        "9jxA/t3TQx8dQ+FBsn/YCg==",
+        "I07W2eDQwe6DVsm1zHKM8A==",
+        "0p1jMr06OyBoXQuSLYN4aQ==",
+        "odGhKtO4bDW5R8SYiI5yCg==",
+        "5Q/Y2V0iSVTK8HE8JerEig==",
+        "Ily2MKoFI1zr5LxBy93EmQ==",
+        "8dUcSkd2qnX5lD9B+fUe+Q==",
+        "80UE+Ivby3nwplO/HA7cPw==",
+        "sS6QcitMPdvUBLiMXkWQkw==",
+        "5VY++KiWgo7jXSdFJsPN3A==",
+        "aY6B28XdPnuYnbOy9uSP8A==",
+        "ZfRlID+pC1Rr4IY14jolMw==",
+        "/YuQw7oAF08KDptxJEBS9g==",
+        "16d+fhFlgayu3ttKVV/pbg==",
+        "8dBIsHMEAk7aoArLZKDZtg==",
+        "wRqaDZVHHurp5whOQ1kDbQ==",
+        "lFUq6PGk9dBRtUuiEW7Cug==",
+        "FoJZ61VrU8i084pAuoWhDQ==",
+        "4mig4AMLUw+T/ect9p4CfA==",
+        "Po0lhBfiMaXhl+vYh1D8gA==",
+        "z9cd+Qj+ueX34Zf3997MNQ==",
+        "1dsKN1nG6upj7kKTKuJWsQ==",
+        "UtLYUlQJ02oKcjNR3l+ktg==",
+        "O538ibsrI4gkE5tfwjxjmg==",
+        "G736AX070whraDxChqUrqw==",
+        "THs1r8ZEPChSGrrhrNTlsA==",
+        "pVG1hL96/+hQ+58rJJy6/A==",
+        "1BjsijOzgHt/0i36ZGffoQ==",
+        "6rIWazDEWU5WPZHLkqznuQ==",
+        "cdWUm6uLNzR/knuj2x75eA==",
+        "nsnX3tKkN1elr18E31tXDw==",
+        "0fnruVOCxEczscBuv4yL9A==",
+        "SVuEYfQ9FGyVMo1672n0Yg==",
+        "ZRWyfXyXqAaOEjkzWl949Q==",
+        "S2MAIYeDQeJ1pl9vhtYtUg==",
+        "vsRNZx4thFFFPneubKq1Fw==",
+        "kuWGANwzNRpG4XmY7KjjNg==",
+        "i6r+mZfyhZyqlYv56o0H+w==",
+        "wqWqe0KRjZlUIrGgEOG9Mg==",
+        "t5wh9JGSkQO78QoQoEqvXA==",
+        "AGoVLd0QPcXnTedT5T95JQ==",
+        "aRrcmH+Ud3mF1vEXcpEm4w==",
+        "C65PZm8rZxJ6tTEb6d08Eg==",
+        "oAHVGBSJ2cf4dVnb/KEYmw==",
+        "BuDVDLl0OGdomEcr+73XhQ==",
+        "bLsStF0DDebpO+xulqGNtg==",
+        "xukOAM0QVsA72qEy0yku9A==",
+        "LpoayYsTO8WLFLCSh2kf2w==",
+        "LEVYAE54618FrlXkDN01Kw==",
+        "Jm862vBTCYbv/V4T1t46+Q==",
+        "X4kdXUuhcUqMSduqhfLpxA==",
+        "cLR0Ry4/N5swqga1R6QDMw==",
+        "0klouNfZRHFFpdHi4ZR2hA==",
+        "JGx8sTyvr4bLREIhSqpFkw==",
+        "ZiJ/kJ9GneF3TIEm08lfvQ==",
+        "hP7dSa8lLn9KTE/Z0s4GVQ==",
+        "600bwlyhcy754W1E6tuyYg==",
+        "U49SfOBeqQV9wzsNkboi8Q==",
+        "5DDb7fFJQEb3XTc3YyOTjg==",
+        "6uT7LZiWjLnnqnnSEW4e/Q==",
+        "tq5xUJt8GtjDIh1b48SthQ==",
+        "eJFIQh/TR7JriMzYiTw4Sg==",
+        "jdRzkUJrWxrqoyNH9paHfQ==",
+        "RKVDdE1AkILTFndYWi9wFg==",
+        "AEpTVUQhIEJGlXJB6rS26A==",
+        "PD+yHtJxZJ2XEvjIPIJHsQ==",
+        "dOS+mVCy3rFX9FvpkTxGXA==",
+        "lz+SeifYXxamOLs1FsFmSQ==",
+        "QTz21WkhpPjfK8YoBrpo+w==",
+        "9wUIeSgNN36SFxy8v2unVg==",
+        "ash1r2J6B0PUxJe8P0otVQ==",
+        "y7yS9x3yshVhMpDbQtfYOQ==",
+        "f07bdNVAe9x+cAMdF1bByQ==",
+        "N2KovXW14hN/6+iWa1Yv3g==",
+        "2DNbXVgesUa7PgYQ4zX5Lw==",
+        "WQznrwqvMhUlM3CzmbhAOQ==",
+        "FpWDTLTDmkUhH/Sgo+g1Gg==",
+        "OVHqwV8oQMC5KSMzd5VemA==",
+        "Bv4mNIC72KppYw/nHQxfpQ==",
+        "MI+HSMRh8KTW+Afiaxd/Fw==",
+        "10OltdxPXOvfatJuwPVKbQ==",
+        "y4/HohCJxtt+cT7nLJB08w==",
+        "RhcqXY4OsZlVVF7ZlkTeRw==",
+        "/mrqas0eDX+sFUNJvCQY8g==",
+        "ZIZx4MehWTVXPN9cVQBmyA==",
+        "z20AAnvj7WsfJeOu3vemlA==",
+        "dL6n/JsK+Iq6UTbQuo/GOw==",
+        "rMm9bHK69h0fcMkMdGgeeA==",
+        "ftsf2qztw3NC78ep/CZXWQ==",
+        "/n1RLTTVpygre1dl36PDwQ==",
+        "/FsJYFNe+7UvsSkiotNJEQ==",
+        "Yy2pPhITTmkEwoudXizHqQ==",
+        "lizovLQxu6L9sbafNQuShQ==",
+        "XV5MYe0Q7YMtoBD6/iMdSw==",
+        "5jHgQF4SfO/zy9xy9t+9dw==",
+        "16iT/jCcPDrJEfi2bE5F+Q==",
+        "syeBfQBUmkXNWCZ1GV8xSA==",
+        "sr3UXbMg5zzkRduFx/as7g==",
+        "xUXEE7OBBCudsQnuj5ycOA==",
+        "ojZY7Gi2QJXE/fp6Wy31iA==",
+        "RlNPyhgYOIn28R4vKCVtYA==",
+        "KOm8PTa+ICgDrgK9QxCJZw==",
+        "DJoy1NSZZw87oxWGlNHhfg==",
+        "jEdanvXKyZdZJG6mj/3FWw==",
+        "Omr+zPWVucPCSfkgOzLmSQ==",
+        "71w3aSvuh2mBLtdqJCN3wA==",
+        "xjTMO2mvtpvwQrounD4e8g==",
+        "Zz/5VMbw1TqwazReplvsEg==",
+        "hIjgi20+km+Ks23NJ4VQ6Q==",
+        "00TVKawojyqrJkC7YqT41Q==",
+        "YgVpC5d5V6K/BpOD663yQA==",
+        "wX70jKLKJApHnhyK0r6t3A==",
+        "lacCCRiWdquNm4YRO7FoKA==",
+        "cWdlhVZD7NWHUGte24tMjg==",
+        "t5U+VMsTtlWAAWSW+00SfQ==",
+        "AMfL0rH+g8c0VqOUSgNzQw==",
+        "0G93AxGPVwmr66ZOleM90A==",
+        "9tiibT8V9VwnPOErWGNT3w==",
+        "+dBv88reDrjEz6a2xX3Hzw==",
+        "xX6atcCApI08oVLjjLteLg==",
+        "+YrqTEJlJCv0A2RHQ8tr1A==",
+        "aqcOby9QyEbizPsgO3g0yw==",
+        "s/BZAhh1cTV3JCDUQsV8mA==",
+        "x9VwDdFPp/rJ+SF16ooWYg==",
+        "k/OVIllJvW6BefaLEPq7DA==",
+        "rIMXaCaozDvrdpvpWvyZOQ==",
+        "qQQwJ/aF87BbnLu3okXxaw==",
+        "TIWSM78m0RprwgPGK/e0JA==",
+        "r/b5px/UImGNjT/X5sYjuA==",
+        "7K8l6KoP0BH82/WMLntfrg==",
+        "gEHGeR2F82OgBeAlnYhRSw==",
+        "1/SGIab+NnizimUmNDC4wA==",
+        "WADmxH7R6B4LR+W6HqQQ6A==",
+        "pcoBh5ic7baSD4TZWb3BSw==",
+        "es/L9iW8wsyLeC5S4Q8t+g==",
+        "D175i+2bZ7aWa4quSSkQpA==",
+        "WQMffxULFKJ+bun6NrCURA==",
+        "82hTTe1Nr4N2g7zwgGjxkw==",
+        "oyYtf08AkWLR52bXm5+sKw==",
+        "8uP4HUnSodw88yoiWXOIcw==",
+        "x2NpqNnqRihktNzpxmepkQ==",
+        "x5zMDuW66467ofgL3spLUQ==",
+        "OMO4pqzfcbQ11YO4nkTXfg==",
+        "N4/mQFyhDpPzmihjFJJn6w==",
+        "NN/ymVQNa17JOTGr6ki3eQ==",
+        "htDbVu1xGhCRd8qoMlBoMg==",
+        "S47hklz3Ow+n5aY6+qsCoA==",
+        "ji+1YHlRvzevs3q5Uw1gfA==",
+        "3Y4w0nETru3SiSVUMcWXqw==",
+        "XfBOCJwi2dezYzLe316ivw==",
+        "kMUdiwM7WR8KGOucLK4Brw==",
+        "V/xG5QFyx1pihimKmAo8ZA==",
+        "sQskMBELEq86o1SJGQqfzg==",
+        "6+jhreeBLfw64tJ+Nhyipw==",
+        "8iYdEleTXGM+Wc85/7vU9w==",
+        "D7piVoB2NJlBxK5owyo4+g==",
+        "hDGa2yLwNvgBd/v6mxmQaQ==",
+        "WLsh3UF4WXdHwgnbKEwRlQ==",
+        "D5jaV+HtXkSpSxJPmaBDXg==",
+        "jCgdKXsBCgf7giUKnr6paQ==",
+        "XqW7UBTobbV4lt1yfh0LZw==",
+        "EbGG4X18upaiVQmPfwKytg==",
+        "dXDPnL1ggEoBqR13aaW9HA==",
+        "Vik8tGNxO0xfdV0pFmmFDw==",
+        "Swjn3YkWgj0uxbZ1Idtk+A==",
+        "JPxEncA4IkfBDvpjHsQzig==",
+        "F5FcNti7lUa9DyF2iEpBug==",
+        "HJYgUxFZ66fRT8Ka73RaUg==",
+        "Jbxl8Nw1vlHO9rtu0q/Fpg==",
+        "fmC+85h5WBuk8fDEUWPjtQ==",
+        "dZgMquvZmfLqP4EcFaWCiA==",
+        "XF/yncdoT4ruPeXCxEhl9Q==",
+        "QJEbr3+42P9yiAfrekKdRQ==",
+        "Sr9c0ReRpkDYGAiqSy683g==",
+        "Nr4zGo5VUrjXbI8Lr4YVWQ==",
+        "NDZWIhhixq7NT8baJUR4VQ==",
+        "GFRJoPcXlkKSvJRuBOAYHQ==",
+        "WHutPin+uUEqtrA7L8878A==",
+        "2rhjiY0O0Lo36wTHjmlNyw==",
+        "XsF7R12agx/KkRWl0TyXRA==",
+        "R6cO8GzYfOGTIi773jtkXw==",
+        "zrZWcqQsUE3ocWE0fG+SOA==",
+        "uNzpptKjihEfKRo5A1nWmw==",
+        "gICaI06E9scnisonpvqCsA==",
+        "TA9WjiLAFgJubLN4StPwLw==",
+        "sBpytpE38xz0zYeT+0qc2A==",
+        "Ej7W3+67kCIng3yulXGpRQ==",
+        "nR3ACzeVF5YcLX6Gj6AGyQ==",
+        "b0vZfEyuTja2JYMa20Rtbg==",
+        "f1h+Vp+xmdZsZIziHrB2+g==",
+        "WzjvUJ4jZAEK7sBqw+m07A==",
+        "OzMR5D2LriC5yrVd5hchnA==",
+        "cw1gBLtxH/m4H7dSM7yvFg==",
+        "CZbd+UoTz0Qu1kkCS3k8Xg==",
+        "WtT0QAERZSiIt2SFDiAizg==",
+        "QsquNcCZL9wv7oZFqm64vQ==",
+        "FXzaxi3nAXBc8WZfFElQeA==",
+        "Ml3mi1lGS1IspHp3dYYClg==",
+        "XGAXhUFjORwKmAq9gGEcRg==",
+        "wOhbpTzmFla8R0kI9OiHaA==",
+        "qoK2keBg3hdbn7Q24kkVXg==",
+        "ZAQHWU6RMg4IadOxuaukyw==",
+        "RiahBXX2JbPzt8baPiP/8g==",
+        "Qx6rVv9Xj8CBjqikWI9KFA==",
+        "ZRnR6i+5WKMRfs3BDRBCJg==",
+        "91LQuW6bMSxl10J/UDX23A==",
+        "0dIeIM5Zvm5nSVWLy94LWg==",
+        "Ja3ECL7ClwDrWMTdcSQ6Ug==",
+        "f6iLrMpxKhFxIlfRsFAuew==",
+        "iSeH0JFSGK73F470Rhtesw==",
+        "DwOTyyCoUfaSShHZx9u6xg==",
+        "rdeftHE7gwAT67wwhCmkYQ==",
+        "kUhyc3G8Zvx8+q5q5nVEhw==",
+        "W8bATujVUT80v2XGJTKXDg==",
+        "dMRx4Mf6LrN64tiJuyWmDw==",
+        "9cvHJmim9e0pOaoUEtiM6A==",
+        "RHToSGASrwEmvzjX6VPvNQ==",
+        "V7eji28JSg3vTi30BCS7gw==",
+        "4+htiqjEz9oq0YcI/ErBVg==",
+        "jKJn4czwUl/6wtZklcMsSg==",
+        "bvyB6OEwhwCIfJ6KRhjnRw==",
+        "59ipbMH7cKBsF9bNf4PLeQ==",
+        "M/cQja3uIk1im9++brbBOA==",
+        "AChOz8avRYsvxlbWcorQ3w==",
+        "FcKjlHKfQAGoovtpf+DxWQ==",
+        "y+cl1/Knb9MZPz8nBB0M+w==",
+        "b8BZV1NfBdLi70ir4vYvZg==",
+        "aFJuE/s+Kbge4ppn+wulkA==",
+        "CWBGcRFYwZ0va6115vV/oQ==",
+        "glnqaRfwm6NxivtB2nySzw==",
+        "mPk1IsU5DmDFA/Ym5+1ojw==",
+        "LGwcvetzQ3QqKjNh5vA8vw==",
+        "yctId8ltkl3+xqi9bj+RqA==",
+        "spJI3xFUlpCDqzg0XCxopA==",
+        "V8m51xgUgywRoV6BGKUrgg==",
+        "rgcXxjx3pDLotH7TTfAoZw==",
+        "/TSsi/AwKHtP6kQaeReI3w==",
+        "8dbyfox/isKLsnVjQNsEXg==",
+        "MOrAbuJTyGKPC6MgYJlx5Q==",
+        "uNWFZlP7DA96sf+LWiAhtQ==",
+        "hNHqznsrIVRSQdII6crkww==",
+        "GT6WUDXiheKAM7tPg3he9A==",
+        "JC8Q+8yOJ52NvtVeyHo68w==",
+        "HMQarkPWOUDIg5+5ja2dBQ==",
+        "nknBKPgb7US42v8A0fTl/w==",
+        "fDOUzPTU2ndpbH0vgkgrJQ==",
+        "GTNttXfMniNhrbhn92Aykg==",
+        "D2JcY4zWwqaCKebLM8lPiQ==",
+        "/c34NtdUZAHWIwGl3JM8Tw==",
+        "/G26n5Xoviqldr5sg/Jl3w==",
+        "GF0lY77rx1NQzAsZpFtXIQ==",
+        "BMOi5JmFUg5sCkbTTffXHw==",
+        "R+beucURp/H5jLs4kW6wmg==",
+        "xfYZ6qhWNBqqJ0PdWRjOwA==",
+        "Ahpi9+nl13kPTdzL+jgqMw==",
+        "oIU19xAvLJwQSZzIH577aA==",
+        "50xwiYvGQytEDyVgeeOnMg==",
+        "M0ESOGwJ4WZ4Ons1ljP0bQ==",
+        "fS471/rN4K2m10mUwGFuLg==",
+        "RrE3B3X/SJi3CqCUlTYwaw==",
+        "oDca3JEdRb4vONT9GUUsaQ==",
+        "pHo1O5zrCHCiLvopP2xaWw==",
+        "7sCJ4RxbxRqVnF4MBoKfuQ==",
+        "7R5rFaXCxM3moIUtoCfM2g==",
+        "4rrSL6N0wyucuxeRELfAmw==",
+        "9Gkw+hvsR/tFY1cO89topg==",
+        "aw4CzX8pYbPVMuNrGCEcWg==",
+        "KyLQxi5UP+qOiyZl0PoHNQ==",
+        "T1pMWdoNDpIsHF8nKuOn2A==",
+        "Qv6wWP4PpycDGxe7EZNSCw==",
+        "ZJc7GV0Yb6MrXkpDVIuc8g==",
+        "aXrbsro7KLV8s4I4NMi4Eg==",
+        "7k5rBuh8FbTTI4TP87wBPQ==",
+        "NRyFx6jqO/oo9ojvbYzsAg==",
+        "P7eMlOz9YUcJO+pJy0Kpkw==",
+        "jpjpNjL1IKzJdGqWujhxCw==",
+        "9k1u/5TgPmXrsx3/NsYUhg==",
+        "c1wbFbN7AdUERO/xVPJlgw==",
+        "Yw4ztKv6yqxK9U1L0noFXg==",
+        "GnJKlRzmgKN9vWyGfMq3aA==",
+        "91VcAVv7YDzkC1XtluPigw==",
+        "h1NNwMy0RjQmLloSw1hvdg==",
+        "pzC8Y0Vj9MPBy3YXR32z6w==",
+        "UTmTgvl+vGiCDQpLXyVgOg==",
+        "CzWhuxwYbNB/Ffj/uSCtbw==",
+        "VOB+9Bcfu8aHKGdNO0iMRw==",
+        "X2Tawm2Cra6H7WtXi1Z4Qw==",
+        "6cTETZ9iebhWl+4W5CB+YQ==",
+        "X4hrgqMIcApsjA9qOWBoCw==",
+        "1buQEv2YlH/ljTgH0uJEtw==",
+        "FH5Z60RXXUiDk+dSZBxD3g==",
+        "FI2WhaSMb3guFLe3e9il8Q==",
+        "O/EizzJSuFY8MpusBRn7Tg==",
+        "b6rrRA0W247O+FfvDHbVCQ==",
+        "ng1Q0A7ljho3TUWWYl46sw==",
+        "1Ym0lyBJ9aFjhJb/GdUPvQ==",
+        "+OXdvbTxHtSoLg7bZMho4w==",
+        "cuQslgfqD2VOMhAdnApHrA==",
+        "pCQmlnn3BxhsV2GwqjRhXg==",
+        "6PzjncEw2wHZg7SP7SQk9w==",
+        "nqtQI1bSM7DCO9P1jGV97Q==",
+        "O1ckWUwuhD44MswpaD6/rw==",
+        "RUmhye56tQu9xXs4SRJpOQ==",
+        "llujnWE17U8MIHmx4SbrSA==",
+        "UwqBVd4Wfias4ElOjk2BzQ==",
+        "kBAB2PSjXwqoQOXNrv80AA==",
+        "w1zN28mSrI/gqHsgs4ME3A==",
+        "301utVPZ93AnPLYbsiJggw==",
+        "qIFpKKwUmztsBpJgMaVvSg==",
+        "QmcURiMzmVeUNaYPSOtTTg==",
+        "x/MpsQvziUpW40nNUHDS5Q==",
+        "t1O9jSNjg4DTIv/Za4NbtA==",
+        "1B5gxGQSGzVKoNd5Ol4N7g==",
+        "81iQLU+YwxNwq4of6e9z7A==",
+        "x0eIHCvQLd2jdDaXwSWTYQ==",
+        "96ORaz1JRHY1Gk8H74+C2g==",
+        "bNDKcFu8T5Y6OoLSV+o/Sw==",
+        "WrJMOuXSLKKzgmIDALkyNw==",
+        "+gpHnUj2GWocP74t5XWz4w==",
+        "z5DveTu377UW8IHnsiUGZg==",
+        "irnD9K8bsT+up/JUrxPw6A==",
+        "ginkFyNVMwkZLE49AbfqfA==",
+        "2hEzujfG3mR5uQJXbvOPTQ==",
+        "E9yeifEZtpqlD0N3pomnGw==",
+        "OpC/sL320wl5anx6AVEL+A==",
+        "D7wN7b5u5PKkMaLJBP9Ksw==",
+        "83WGpQGWyt6mCV+emaomog==",
+        "X6ulLp4noBgefQTsbuIbYQ==",
+        "BH+rkZWQjTp7au6vtll/CQ==",
+        "Ex3x5HeDPhgO2S9jjCFy4g==",
+        "YNqIHCmBp/EbCgaPKJ7phw==",
+        "312g8iTB9oJgk/OqcgR7Cw==",
+        "LcF0OqPWrcpHby8RwXz1Yg==",
+        "gaEtlJtD6ZjF5Ftx0IFt0A==",
+        "bvbMJZMHScwjJALxEyGIyg==",
+        "StoXC7TBzyRViPzytAlzyQ==",
+        "XqFSbgvgZn0CpaZoZiRauQ==",
+        "AqHVaj3JcR44hnMzUPvVYg==",
+        "jTg9Y6EfpON4CRFOq0QovA==",
+        "q/siBRjx6wNu+OTvpFKDwA==",
+        "goSgZ8N5UbT5NMnW3PjIlQ==",
+        "9onh6QKp70glZk9cX3s34A==",
+        "o5XVEpdP4OXH0NEO4Yfc/A==",
+        "a5gZ5uuRrXEAjgaoh7PXAg==",
+        "PaROi5U16Tk35p0EKX5JpA==",
+        "dtnE401dC0zRWU0S/QOTAg==",
+        "7J3FoFGuTIW36q0PZkgBiw==",
+        "hiYg+aVzdBUDCG0CXz9kCw==",
+        "vhdFtKVH4bVatb4n8KzeXw==",
+        "DWKsPfKDAtfuwgmc2dKUNg==",
+        "M2JMnViESVHTZaru6LDM6w==",
+        "G/PA+kt0N+jXDVKjR/054A==",
+        "6rqK8sjLPJUIp7ohkEwfZg==",
+        "wajwXfWz2J+O+NVaj6j2UQ==",
+        "C4QEzQKGxyRi2rjwioHttA==",
+        "N/HgDydvaXuJvTCBhG/KtA==",
+        "6erpZS36qZRXeZ9RN9L+kw==",
+        "bbBsi6tXMVWyq3SDVTIXUg==",
+        "aySnrShOW4/xRSzl/dtSKQ==",
+        "rxfACPLtKXbYua18l3WlUw==",
+        "L4+C6I7ausPl6JbIbmozAg==",
+        "R3ijnutzvK6IKV3AKHQZSA==",
+        "leDlMcM+B1mDE8k5SWtUeg==",
+        "KGI/cXVz6v6CfL8H6akcUQ==",
+        "NtwqUO3SKZE/9MXLbTJo/g==",
+        "dJHKDkfMFJeoULg7U4wwDQ==",
+        "IEz72W2/W8xBx5aCobUFOQ==",
+        "wUYhs4j3W9nIywu1HIv2JA==",
+        "GzbeM7snhe+M+J7X+gAsQw==",
+        "3/1puZTGSrD9qNKPGaUZww==",
+        "eKQCVzLuzoCLcB4im8147A==",
+        "CCK+6Dr72G3WlNCzV7nmqw==",
+        "CJoZn5wdTXbhrWO5LkiW0g==",
+        "bJ1cZW7KsXmoLw0BcoppJg==",
+        "OlpA9HsF8MBh7b45WZSSlg==",
+        "JZRjdJLgZ+S0ieWVDj8IJg==",
+        "uhT12XY79CtbwhcSfAmAXQ==",
+        "isep9d+Q7DEUf0W7CJJYzw==",
+        "K9A87aMlJC8XB9LuFM913g==",
+        "uqe3rFveJ2JIkcZQ3ZMXHQ==",
+        "0e8hM3E5tnABRyy29A8yFw==",
+        "4iiCq+HhC+hPMldNQMt0NA==",
+        "X4o0OkTz0ec70mzgwRfltA==",
+        "1E3pMgAHOnHx3ALdNoHr8Q==",
+        "xNilc7UOu1kyP0+nK5MrLw==",
+        "DQlZWBgdTCoYB1tJrNS5YQ==",
+        "iruDC5MeywV4yA8o1tw/KQ==",
+        "z+1oDVy8GJ5u/UDF+bIQdA==",
+        "uExgqZkkJnZj252l5dKAGg==",
+        "ZgdpqFrVGiaHkh9o3rDszg==",
+        "5N2oi2pB69NxeNt08yPLhw==",
+        "G37U8XTFyshfCs7qzFxATg==",
+        "0ZEC3hy411LkOhKblvTcqg==",
+        "ITZ3P47ALS0JguFms6/cDA==",
+        "WWN44lbUnEdHmxSfMCZc6w==",
+        "r2f2MyT+ww1g9uEBzdYI1w==",
+        "ZvvxwDd0I6MsYd7aobjLUA==",
+        "uQs79rbD/wEakMUxqMI48A==",
+        "022B0oiRMx8Xb4Af98mTvQ==",
+        "afMd/Hr3rYz/l7a3CfdDjg==",
+        "xmsYnsJq78/f9xuKuQ2pBQ==",
+        "dFetwmFw+D6bPMAZodUMZQ==",
+        "TBQpcKq2huNC5OmI2wzRQw==",
+        "skrQRB9xbOsiSA19YgAdIQ==",
+        "anyANMnNkUqr3JuPJz5Qzw==",
+        "6QUGE2S8oFYx4T4nW56cCw==",
+        "rwtF86ZAbWyKI6kLn4+KBw==",
+        "6txm8z4/LGCH0cpaet/Hsg==",
+        "wdRyYjaM11VmqkkxV/5bsA==",
+        "+k5lDb+QdNc9iZ01hL5yBg==",
+        "k/pBSWE2BvUsvJhA9Zl5uw==",
+        "jQjyjWCEo9nWFjP4O8lehw==",
+        "R6Me6sSGP5xpNI8R0xGOWw==",
+        "9+hjTVMQUsvVKs7Tmp52tg==",
+        "VQIpquUqmeyt/q6OgxzduQ==",
+        "KXvdjZ3rRKn60djPTCENGA==",
+        "5HovoyHtul8lXh+z8ywq9A==",
+        "1+XWdu4qCqLLVjqkKz3nmA==",
+        "LCj4hI520tA685Sscq6uLw==",
+        "b53qqLnrTBthRXmmnuXWvw==",
+        "WTr3q/gDkmB4Zyj7Ly20+w==",
+        "FbxScyuRacAQkdQ034ShTA==",
+        "qaTdVEeZ6S8NMOxfm+wOMA==",
+        "ZNrjP1fLdQpGykFXoLBNPw==",
+        "/Bwpt5fllzDHq2Ul6v86fA==",
+        "/mFp3GFkGNLhx2CiDvJv4A==",
+        "RppDe/WGt1Ed6Vqg1+cCkQ==",
+        "6M6QapJ5xtMXfiD3bMaiLA==",
+        "Ghuj9hAyfehmYgebBktfgA==",
+        "GncGQgmWpI/fZyb/6zaFCg==",
+        "R1TCCfgltnXBvt5AiUnCtQ==",
+        "5NEP7Xt7ynj6xCzWzt21hQ==",
+        "4yEkKp2FYZ09mAhw2IcrrA==",
+        "y2Tn2gmhKs5WKc01ce74rg==",
+        "wnfYUctNK+UPwefX5y4/Rw==",
+        "BV1moliPL15M14xkL+H1zw==",
+        "80C9TB9/XT1gGFfQDJxRoA==",
+        "yL1DwlIIREPuyuCFULi0uw==",
+        "D09afzGpwCEH0EgZUSmIZA==",
+        "eCy/T+a8kXggn1L8SQwgvA==",
+        "+dIEf5FBrHpkjmwUmGS6eg==",
+        "kzXsrxWRnWhkA82LsLRYog==",
+        "Nf9fbRHm844KZ2sqUjNgkA==",
+        "XAq/C+XyR6m3uzzLlMWO5Q==",
+        "jiV+b/1EFMnHG6J0hHpzBg==",
+        "HK0yf7F97bkf1VYCrEFoWA==",
+        "Cz1G77hsDtAjpe0WzEgQog==",
+        "xdCCdP8SNBOK3IsX6PiPQA==",
+        "8snljTGo/uICl9q0Hxy7/A==",
+        "sLdxIKap0ZfC3GpUk3gjog==",
+        "IA1jmtfpYkz/E2wD0+27WA==",
+        "PPa7BDMpRdxJdBxkuWCxKA==",
+        "CuGIxWhRLN7AalafBZLCKQ==",
+        "MWcV03ULc0vSt/pFPYPvFA==",
+        "QVwuN66yPajcjiRnVk/V8g==",
+        "aLY2pCT0WfFO5EJyinLpPg==",
+        "dGrf9SWJ13+eWS6BtmKCNw==",
+        "YtZ8CYfnIpMd2FFA5fJ+1Q==",
+        "Umd+5fTcxa3mzRFDL9Z8Ww==",
+        "Al8+d/dlOA5BXsUc5GL8Tg==",
+        "/KYZdUWrkfxSsIrp46xxow==",
+        "kr8tw1+3NxoPExnAtTmfxg==",
+        "PwvPBc+4L73xK22S9kTrdA==",
+        "VWNDBOtjiiI4uVNntOlu/A==",
+        "lJFPmPWcDzDp5B2S8Ad8AA==",
+        "Mofqu40zMRrlcGRLS42eBw==",
+        "BuENxPg7JNrWXcCxBltOPg==",
+        "nmD7fEU4u7/4+W/pkC4/0Q==",
+        "axEl7xXt/bwlvxKhI7hx4g==",
+        "W04GeDh+Tk/I1S85KlozRA==",
+        "tVw8U1AsslIFmQs4H1xshg==",
+        "TSPFvkgw6uLsJh66Ou0H9w==",
+        "IYIbEaErHoFBn8sTT9ICIQ==",
+        "WBu0gJmmjVdVbjDmQOkU6w==",
+        "ZgjifTVKmxOieco81gnccQ==",
+        "ZrCnZB/U/vcqEtI1cSvnww==",
+        "2D6yhuABiaFFoXz0Lh0C+w==",
+        "SfwnYZCKP1iUJyU1yq4eKg==",
+        "tsiqwelcBAMU/HpLGBtMGw==",
+        "S9L29U2P5K8wNW+sWbiH7w==",
+        "sGLPmr568+SalaQr8SE/PA==",
+        "Hm6MG6BXbAGURVJKWRM6ZA==",
+        "euxzbIq4vfGYoY3s1QmLcw==",
+        "/FchS2nPezycB8Bcqc2dbg==",
+        "ZKvox7BaQg4/p5jIX69Umw==",
+        "HkbdaMuDTPBDnt3wAn5RpQ==",
+        "eddhS+FkXxiUnbPoCd5JJw==",
+        "Muf2Eafcf9G3U2ZvQ9OgtQ==",
+        "a7Pv1SOWYnkhIUC22dhdDA==",
+        "O839JUrR+JS30/nOp428QA==",
+        "2qK2ZEY9LgdKSTaLf6VnLA==",
+        "BTiGLT6XdZIpFBc91IJY6g==",
+        "EqYq2aVOrdX5r7hBqUJP7g==",
+        "SIuKH/Qediq0TyvqUF93HQ==",
+        "c5ymZKqx/td1MiS2ERiz9A==",
+        "rqucO37p86LpzehR/asCSQ==",
+        "1tpM0qgdo7JDFwvT0TD78g==",
+        "Ar1Eb/f/LtuIjXnnVPYQlA==",
+        "V8q+xz4ljszLZMrOMOngug==",
+        "P5WPQc5NOaK7WQiRtFabkw==",
+        "Xo8ZjXOIoXlBjFCGdlPuZw==",
+        "jTmPbq+wh30+yJ/dRXk1cA==",
+        "KSumhnbKxMXQDkZIpDSWmQ==",
+        "Kh/J1NpDBGoyDU+Mrnnxkg==",
+        "3BjLFon1Il0SsjxHE2A1LQ==",
+        "dml2gqLPsKpbIZ93zTXwCQ==",
+        "ZyoaR1cMiKAsElmYZqKjLA==",
+        "vnOJ3e9Zd4wPx8PX7QgZzQ==",
+        "2melaInV0wnhBpiI3da6/A==",
+        "mUek9NkXm8HiVhQ6YXiyzA==",
+        "RZTpYKxOAH9JgF1QFGN+hw==",
+        "a/Y6IAVFv0ykRs9WD+ming==",
+        "yhRi5M9Etuu9HSu4d24i3w==",
+        "+1gcqAqaRZwCj5BGiZp3CA==",
+        "o1zeXHJEKevURAAbUE/Vog==",
+        "cvOg7N4DmTM+ok1NBLyBiQ==",
+        "uPdjKJIGzN7pbGZDZdCGaA==",
+        "REnDNe9mGfqVGZt+GdsmjQ==",
+        "XqTK/2QuGWj50tGmiDxysA==",
+        "bL2FuwsPT7a7oserJQnPcw==",
+        "uO+uK1DntCxVRr1KttfUIw==",
+        "Xconi1dtldH90Wou9swggw==",
+        "HRF3WL/ue3/QlYyu7NUTrA==",
+        "5LuFDNKzMd2BzpWEIYO2Ww==",
+        "dNTU+/2DdZyGGTdc+3KMhQ==",
+        "H+NHjk/GJDh/GaNzMQSzjg==",
+        "/Ph/6l/lFNVqxAje1+PgFA==",
+        "4WRdAjiUmOQg2MahsunjAg==",
+        "j+lDhAnWAyso+1N8cm85hQ==",
+        "nFBXCPeiwxK9mLXPScXzTA==",
+        "vGKknndb4j6VTV8DxeT4fQ==",
+        "fdqt93OrpG13KAJ5cASvkg==",
+        "1MIn73MLroxXirrb+vyg2Q==",
+        "Q7teXmTHAC5qBy+t7ugf0w==",
+        "bWwtTFlhO3xEh/pdw0uWaQ==",
+        "Omi2ZB9kdR1HrVP2nueQkA==",
+        "+ZozWaPWw8ws1cE5DJACeg==",
+        "3FH4D31nKV13sC9RpRZFIg==",
+        "4kXlJNuT79XXf1HuuFOlHw==",
+        "36XDmX6j542q+Oei1/x0gw==",
+        "MqqDg9Iyt4k3vYVW5F+LDw==",
+        "cvrGmub2LoJ+FaM5HTPt9A==",
+        "uC2lzm7HaMAoczJO6Z/IhQ==",
+        "MnStiFQAr3QlaRZ02SYGaQ==",
+        "ZuayB6IpbeITokKGVi9R5w==",
+        "FtxpWdhEmC6MT61qQv4DGA==",
+        "KujFdhhgB9q4oJfjYMSsLg==",
+        "ZV8mEgJweIYk0/l0BFKetA==",
+        "gDLjxT7vm07arF4SRX5/Vg==",
+        "/MEOgAhwb7F0nBnV4tIRZA==",
+        "k2KP9oPMnHmFlZO6u6tgyw==",
+        "fbTm027Ms0/tEzbGnKZMDA==",
+        "HOi+vsGAae4vhr+lJ5ATnQ==",
+        "9Bet5waJF5/ZvsYaHUVEjQ==",
+        "Wd0dOs7eIMqW5wnILTQBtg==",
+        "z/e5M2lE9qh3bzB97jZCKA==",
+        "b16O4LF7sVqB7aLU2f3F1A==",
+        "lsBTMnse2BgPS6wvPbe7JA==",
+        "0nOg18ZJ/NicqVUz5Jr0Hg==",
+        "MFeXfNZy6Q9wBfZmPQy3xg==",
+        "ksOFI9C7IrDNk4OP6SpPgw==",
+        "NquRbPn8fFQhBrUCQeRRoQ==",
+        "ccmy4GVuX967KaQyycmO0w==",
+        "DY0IolKTYlW+jbKLPAlYjQ==",
+        "aJFbBhYtMbTyMFBFIz/dTA==",
+        "9pdeedz1UZUlv8jPfPeZ1g==",
+        "qZ2q5j2gH3O56xqxkNhlIA==",
+        "N7fHwb397tuQHtBz1P80ZQ==",
+        "uOkMpYy/7DYYoethJdixfQ==",
+        "E9ajQQMe02gyUiW3YLjO/A==",
+        "dFSavcNwGd8OaLUdWq3sng==",
+        "TAD0Lk95CD86vbwrcRogaQ==",
+        "jLI3XpVfjJ6IzrwOc4g9Pw==",
+        "CzP13PM/mNpJcJg8JD3s6w==",
+        "GSWncBq4nwomZCBoxCULww==",
+        "9k17UqdR1HzlF7OBAjpREA==",
+        "TrWS+reCJ0vbrDNT5HDR9w==",
+        "CXMKIdGvm60bgfsNc+Imvg==",
+        "6NP81geiL14BeQW6TpLnUA==",
+        "hW9DJA1YCxHmVUAF7rhSmQ==",
+        "8M0kSvjn5KN8bjsMdUqKZQ==",
+        "eS/vTdSlMUnpmnl1PbHjyw==",
+        "h2B0ty0GobQhDnFqmKOpKQ==",
+        "n7KL1Kv027TSxBVwzt9qeA==",
+        "yYmnM/WOgi+48Rw7foGyXA==",
+        "FhthAO5IkMyW4dFwpFS7RA==",
+        "81ZH3SO0NrOO+xoR/Ngw1g==",
+        "t7HaNlXL16fVwjgSXmeOAQ==",
+        "N+K1ibXAOyMWdfYctNDSZQ==",
+        "yQCLV9IoPyXEOaj3IdFMWw==",
+        "3+zsjCi7TnJhti//YXK35w==",
+        "600mjiWke4u0CDaSQKLOOg==",
+        "K4VS+DDkTdBblG93l2eNkA==",
+        "5KOgetfZR+O2wHQSKt41BQ==",
+        "kj5WqpRCjWAfjM7ULMcuPQ==",
+        "AxEjImKz4tMFieSo7m60Sg==",
+        "jp5Em/0Ml4Txr1ptTUQjpg==",
+        "jQVlDU+HjZ2OHSDBidxX5A==",
+        "4NHQwbb3zWq2klqbT/pG6g==",
+        "PeJS+mXnAA6jQ0WxybRQ8w==",
+        "l6Ssc04/CnsqUua9ELu2iQ==",
+        "nFPDZGZowr3XXLmDVpo7hg==",
+        "yYBIS9PZbKo7Gram7IXWPA==",
+        "/HU2+fBqfWTEuqINc0UZSA==",
+        "adT+OjEB2kqpeYi4kQ6FPg==",
+        "GW1Uaq622QamiiF24QUA0g==",
+        "rTwJggSxTbwIYdp07ly0LA==",
+        "4yrFNgqWq17zVCyffULocA==",
+        "vvh9vAIrXjIwLVkuJb5oDQ==",
+        "C7UaoIEXsVRxjeA0u99Qmw==",
+        "x1A74vg/hwwjAx6GrkU8zw==",
+        "7XRiYvytcwscemlxd9iXIQ==",
+        "64AA4jLHXc1Dp15aMaGVcA==",
+        "u/QxrP1NOM/bOJlJlsi/jQ==",
+        "5M3dFrAOemzQ0MAbA8bI5w==",
+        "wyqmQGB6vgRVrYtmB2vB7w==",
+        "8vLA9MOdmLTo3Qg+/2GzLA==",
+        "/u5W2Gab4GgCMIc4KTp2mg==",
+        "lhAOM81Ej6YZYBu45pQYgg==",
+        "MArbGuIAGnw4+fw6mZIxaw==",
+        "ZZImGypBWwYOAW43xDRWCQ==",
+        "L2IeUnATZHqOPcrnW2APbA==",
+        "bQKkL+/KUCsAXlwwIH0N3w==",
+        "f09F7+1LRolRL5nZTcfKGA==",
+        "hPnPQOhz4QKhZi02KD6C+A==",
+        "78b8sDBp28zUlYPV5UTnYw==",
+        "iVDd2Zk7vwmEh97LkOONpQ==",
+        "LHQETSI5zsejvDaPpsO29g==",
+        "Yjm5tSq1ejZn3aWqqysNvA==",
+        "gkrg0NR0iCaL7edq0vtewA==",
+        "Lo1xTCEWSxVuIGEbBEkVxA==",
+        "8GyPup4QAiolFJ9v80/Nkw==",
+        "3L3KEBHhgDwH615w4OvgZA==",
+        "hJSP7CostefBkJrwVEjKHA==",
+        "9oQ/SVNJ4Ye9lq8AaguGAQ==",
+        "n7Bns42aTungqxKkRfQ5OQ==",
+        "K5lhaAIZkGeP5rH2ebSJFw==",
+        "ZaPsR9X77SNt7dLjMJUh8A==",
+        "18ndtDM9UaNfBR1cr3SHdA==",
+        "0QbH4oI8IjZ9BRcqRyvvDQ==",
+        "J/eAtAPswMELIj8K2ai+Xg==",
+        "qenHZKKlTUiEFv6goKM/Mw==",
+        "vjrSYGUpeKOtJ2cNgLFg2g==",
+        "DA+3fjr7mgpwf6BZcExj0w==",
+        "rh7bzsTQ1UZjG7amysr0Gg==",
+        "tFMJRXfWE9g78O1uBUxeqQ==",
+        "e/nWuo5YalCAFKsoJmFyFA==",
+        "gqehq46BhFX2YLknuMv02w==",
+        "Uudn69Kcv2CGz2FbfJSSEA==",
+        "Otz/PgYOEZ1CQDW54FWJIQ==",
+        "IwfeA6d0cT4nDTCCRhK+pA==",
+        "jgNijyoj2JrQNSlUv4gk4A==",
+        "KzWdWPP2gH0DoMYV4ndJRg==",
+        "pv/m2mA/RJiEQu2Qyfv9RA==",
+        "ATmMzriwGLl+M3ppkfcZNA==",
+        "tVvWdA+JqH0HR2OlNVRoag==",
+        "n6QVaozMGniCO0PCwGQZ6w==",
+        "gU3gu8Y5CYVPqHrZmLYHbQ==",
+        "cBBOQn7ZjxDku0CUrxq2ng==",
+        "w+jzM0I5DRzoUiLS/9QIMQ==",
+        "MLlVniZ08FHAS5xe+ZKRaA==",
+        "wMyJLQJdmrC2TSeFkIuSvQ==",
+        "dG98w8MynOoX7aWmkvt+jg==",
+        "zm+z+OOyHhljV2TjA3U9zw==",
+        "Tk5MAqd1gyHpkYi8ErlbWg==",
+        "g6zSo8BvLuKqdmBFM1ejLA==",
+        "d0VAZLbLcDUgLgIfT1GmVQ==",
+        "SNPYH4r/J9vpciGN2ybP5Q==",
+        "XA2hUgq3GVPpxtRYiqnclg==",
+        "fVCRaPsTCKEVLkoF4y3zEw==",
+        "FpgdsQ2OG+bVEy3AeuLXFQ==",
+        "JquDByOmaQEpFb47ZJ4+JA==",
+        "e369ZIQjxMZJtopA//G55Q==",
+        "Nsd+DfRX6L54xs+iWeMjCQ==",
+        "+/UCpAhZhz368iGioEO8aQ==",
+        "e5l9ZiNWXglpw6nVCtO8JQ==",
+        "Cl1u5nGyXaoGyDmNdt38Bw==",
+        "6sNP0rzCCm3w976I2q2s/w==",
+        "qcpeZWUlPllQYZU6mHVwUw==",
+        "kzYddqiMsY3EYrpxve2/CQ==",
+        "3iC21ByW/YVL+pSyppanWw==",
+        "3HPOzIZxoaQAmWRy9OkoSg==",
+        "xsCZVhCk2qJmOqvUjK3Y8Q==",
+        "i2sSvrTh/RdLJX0uKhbrew==",
+        "7Y87wVJok20UfuwkGbXxLg==",
+        "ibsb1ncaLZXAYgGkMO7tjQ==",
+        "+VfRcTBQ80KSeJRdg0cDfw==",
+        "kgKWQJJQKLUuD2VYKIKvxA==",
+        "ARKIvf4+zRF8eCvUITWPng==",
+        "1fztTtQWNMIMSAc5Hr6jMQ==",
+        "md6zNd7ZBn3qArYqQz7/fw==",
+        "kvAaIJb+aRAfKK104dxFAA==",
+        "UIXytIHyVODxlrg+eQoARA==",
+        "Dk0L/lQizPEb3Qud6VHb1Q==",
+        "64YsV2qeDxk2Q6WK/h7OqA==",
+        "90dtIMq0ozJXezT2r79vMQ==",
+        "wy/Z8505o4sVovk4UuBp1A==",
+        "ytDXLDBqWiU1w3sTurYmaw==",
+        "9pk75mBzhmcdT+koHvgDlw==",
+        "DQeib845UqBMEl96sqsaSg==",
+        "UPYR575ASaBSZIR3aX1IgQ==",
+        "swsVVsPi/5aPFBGP+jmPIw==",
+        "1cj1Fpd3+UiBAOahEhsluA==",
+        "ifuJCv9ZA84Vz1FYAPsyEA==",
+        "uu+ncs63SdQIvG6z4r7Q3Q==",
+        "UvC1WADanMrhT+gPp/yVqA==",
+        "llOvGOUDVfX68jKnAlvVRA==",
+        "SusSOsWNoAerAIMBVWHtfA==",
+        "VznvTPAAwAev+yhl9oZT0w==",
+        "luR/kvHLwA6tSdLeTM4TzA==",
+        "PcdBtV8pfKU0YbDpsjPgwg==",
+        "5l6kDfjtZjkTZPJvNNOVFw==",
+        "4FBBtWPvqJ3dv4w25tRHiQ==",
+        "JJbzQ/trOeqQomsKXKwUpQ==",
+        "0bj069wXgEJbw7dpiPr8Tg==",
+        "tejpAZp7y32SO2+o4OGvwQ==",
+        "kq26VyDyJTH/eM6QvS2cMw==",
+        "+zBkeHF4P8vLzk1iO1Zn3Q==",
+        "BzkNYH03gF/mQY71RwO3VA==",
+        "RnxOYPSQdHS6fw4KkDJtrA==",
+        "65KhGKUBFQubRRIEdh9SwQ==",
+        "k1DPiH6NkOFXP/r3N12GyA==",
+        "DqzWt1gfyu/e7RQl5zWnuQ==",
+        "gnez1VrH+UHT8C/SB9qGdA==",
+        "vZtL0yWpSIA+9v8i23bZSg==",
+        "FNvQqYoe0s/SogpAB7Hr1Q==",
+        "6nwR+e9Qw0qp8qIwH9S/Mg==",
+        "BPT4PQxeQcsZsUQl33VGmg==",
+        "rOYeIcB+Rg5V6JG2k4zS2w==",
+        "Je1UESovkBa9T6wS0hevLw==",
+        "HFHMGgfOeO0UPrray1G+Zw==",
+        "NBmB/cQfS+ipERd7j9+oVg==",
+        "iIm8c9uDotr87Aij+4vnMw==",
+        "S3VQa6DH+BdlSrxT/g6B5g==",
+        "BwRA+tMtwEvth28IwpZx+w==",
+        "vg3jozLXEmAnmJwdfcEN0g==",
+        "gW0oKhtQQ7BxozxUWw5XvQ==",
+        "Q6vGRQiNwoyz7bDETGvi5g==",
+        "Ak3rlzEOds6ykivfg39xmw==",
+        "G4qzBI1sFP2faN+tlRL/Bw==",
+        "ND9l4JWcncRaSLATsq0LVw==",
+        "yQmNZnp/JZywbBiZs3gecA==",
+        "ZoNSxARrRiKZF5Wvpg7bew==",
+        "GhpJfRSWZigLg/azTssyVA==",
+        "QyyiJ5I/OZC50o89fa5EmQ==",
+        "4kj0S8XlmhHXoUP7dQItUw==",
+        "Dt8Q5ORzTmpPR2Wdk0k+Aw==",
+        "/hFhjFGJx2wRfz6hyrIpvA==",
+        "eFimq+LuHi42byKnBeqnZQ==",
+        "JrKGKAKdjfAaYeQH8Y2ZRQ==",
+        "JFFeXsFsMA59iNtZey7LAA==",
+        "91SdBFJEZ65M+ixGaprY/A==",
+        "+S+WXgVDSU1oGmCzGwuT3g==",
+        "1X14kHeKwGmLeYqpe60XEA==",
+        "4xojeUxTFmMLGm6jiMYh/Q==",
+        "+1e7jvUo8f2/2l0TFrQqfA==",
+        "8WU1vLKV1GhrL7oS9PpABg==",
+        "DYWCPUq/hpjr6puBE7KBHg==",
+        "birqO8GOwGEI97zYaHyAuw==",
+        "6e8boFcyc8iF0/tHVje4eQ==",
+        "FLvED9nB9FEl9LqPn7OOrA==",
+        "ji306HRiq965zb8EZD2uig==",
+        "AklOdt9/2//3ylUhWebHRw==",
+        "VGRCSrgGTkBNb8sve0fYnQ==",
+        "oqlkgrYe9aCOwHXddxuyag==",
+        "KXuFON8tMBizNkCC48ICLA==",
+        "9aKH1u5+4lgYhhLztQ4KWA==",
+        "3hVslsq98QCDIiO40JNOuA==",
+        "OOS6wQCJsXH8CsWEidB35A==",
+        "YXHQ3JI9+oca8pc/jMH6mA==",
+        "V9vkAanK+Pkc4FGAokJsTA==",
+        "OFLn4wun6lq484I7f6yEwg==",
+        "3WVBP9fyAiBPZAq3DpMwOQ==",
+        "5gGoDPTc/sOIDLngmlEq4A==",
+        "E2lvMXqHdTw0x+KCKVnblg==",
+        "f1Gs++Iilgq9GHukcnBG3w==",
+        "uIkVijg7RPi/1j7c18G1qA==",
+        "9T7gB0ZkdWB0VpbKIXiujQ==",
+        "KCJJfgLe00+tjSfP6EBcUg==",
+        "WbAdlac/PhYUq7J2+n5f+w==",
+        "GLnS9wDCje7TOMvBX9jJVA==",
+        "VAg/aU5nl72O+cdNuPRO4g==",
+        "kzTl7WH/JXsX1fqgnuTOgw==",
+        "1HDgfU7xU7LWO/BXsODZAQ==",
+        "D0W5F7gKMljoG5rlue1jrg==",
+        "9reBKZ1Rp6xcdH1pFQacjw==",
+        "SSKhl2L3Mvy93DcZulADtA==",
+        "hlu7os0KtAkpBTBV6D2jyQ==",
+        "sfte/o9vVNyida/yLvqADA==",
+        "gYGQBLo5TdMyXks0LsZhsQ==",
+        "dNq2InSVDGnYXjkxPNPRxA==",
+        "fiv0DJivQeqUkrzDNlluRw==",
+        "msstzxq++XO0AqNTmA7Bmg==",
+        "DCjgaGV5hgSVtFY5tcwkuA==",
+        "aMmrAzoRWLOMPHhBuxczKg==",
+        "qNOSm15bdkIDSc/iUr+UTQ==",
+        "2nSTEYzLK77h5Rgyti+ULQ==",
+        "BhKO1s1O693Fjy1LItR/Jw==",
+        "kRnBEH6ILR5GNSmjHYOclw==",
+        "R97chlspND/sE9/HMScXjQ==",
+        "1Oykse0jQVbuR3MvW5ot4A==",
+        "Dmyb+a7/QFsU4d2cVQsxDw==",
+        "W5now3RWSzzMDAxsHSl++Q==",
+        "IrDuBrVu1HWm0BthAHyOLQ==",
+        "V6zyoX6MERIybGhhULnZiw==",
+        "ZQSDYgpsimK+lYGdXBWE/w==",
+        "lV70RNlE++04G1KFB3BMXA==",
+        "QmSBVvdk0tqH9RAicXq2zA==",
+        "qNyy6Fc0b8oOMWqqaliZ/w==",
+        "xvipmmwKdYt4eoKvvRnjEg==",
+        "Q7Df6zGwvb4rC+EtIKfaSw==",
+        "n1M2dgFPpmaICP+JwxHUug==",
+        "1k8tL2xmGFVYMgKUcmDcEw==",
+        "fFvXa1dbMoOOoWZdHxPGjw==",
+        "UP9mmAKzeQqGhod7NCqzhg==",
+        "PMCWKgog/G+GFZcIruSONw==",
+        "dnvatwSEcl73ROwcZ4bbIQ==",
+        "hY82j+sUQQRpCi6CCGea5A==",
+        "QoUC9nyK1BAzoUVnBLV2zw==",
+        "+aF4ilbjQbLpAuFXQEYMWQ==",
+        "XTCcsVfEvqxnjc0K5PLcyw==",
+        "ML7ipnY/g8mA1PUIju1j8Q==",
+        "tOkYq1BZY152/7IJ6ZYKUg==",
+        "2bsIpvnGcFhTCSrK9EW1FQ==",
+        "Af9j1naGtnZf0u1LyYmK1w==",
+        "ZmblZauRqO5tGysY3/0kDw==",
+        "PF0lpolQQXlpc3qTLMBk8w==",
+        "emVLJVzha7ui5OFHPJzeRQ==",
+        "gR0sgItXIH8hE4FVs9Q07w==",
+        "PTW+fhZq/ErxHqpM0DZwHQ==",
+        "g0kHTNRI7x/lAsr92EEppw==",
+        "24H9q+E8pgCEdFS7JO5kzQ==",
+        "HtDXgMuF8PJ1haWk88S0Ew==",
+        "pulldyBt2sw6QDvTrCh6zw==",
+        "ehwc2vvwNUAI7MxU4MWQZw==",
+        "enj9VEzLbmeOyYugTmdGfQ==",
+        "auvG6kWMnhCMi7c7e9eHrw==",
+        "R36O31Pj8jn0AWSuqI7X2Q==",
+        "3AVYtcIv7A5mVbVnQMaCeA==",
+        "T9WoUJNwp8h4Yydixbx6nA==",
+        "t0WN8TwMLgi8UVEImoFXKg==",
+        "mS99D+CXhwyfVt8xJ+dJZA==",
+        "AFdelaqvxRj6T3YdLgCFyg==",
+        "Lu02ic/E94s42A14m7NGCA==",
+        "7w3b73nN/fIBvuLuGZDCYQ==",
+        "O209ftgvu0vSr0UZywRFXA==",
+        "MQvAr+OOfnYnr/Il/2Ubkg==",
+        "e5txnNRcGs2a9+mBFcF1Qg==",
+        "YA0kMTJ82PYuLA4pkn4rfw==",
+        "QIKjir/ppRyS63BwUcHWmw==",
+        "P3y5MoXrkRTSLhCdLlnc4A==",
+        "WY7mCUGvpXrC8gkBB46euw==",
+        "g0GbRp2hFVIdc7ct7Ky7ag==",
+        "Cv079ZF55RnbsDT27MOQIA==",
+        "cvMJ714elj/HUh89a9lzOQ==",
+        "9inw7xzbqAnZDKOl/MfCqA==",
+        "F58ktE4O0f7C9HdsXYm+lw==",
+        "CsPkyTZADMnKcgSuNu1qxg==",
+        "mAzsVkijuqihhmhNTTz65g==",
+        "FxnbKnuDct4OWcnFMT/a5w==",
+        "P5wS+xB8srW4a5KDp/JVkA==",
+        "ctJYJegZhG42i+vnPFWAWw==",
+        "OrqJKjRndcZ8OjE3cSQv7g==",
+        "aXqiibI6BpW3qilV6izHaQ==",
+        "BA18GEAOOyVXO2yZt2U35w==",
+        "saEpnDGBSZWqeXSJm34eOA==",
+        "CUEueo8QXRxkfVdfNIk/gg==",
+        "H0UMAUfHFQH92A2AXRCBKA==",
+        "CT9g8mKsIN/VeHLSTFJcNQ==",
+        "E4NtzxQruLcetC23zKVIng==",
+        "203EqmJI9Q4tWxTJaBdSzA==",
+        "Do3aqbRKtmlQI2fXtSZfxQ==",
+        "JaYQXntiyznQzrTlEeZMIw==",
+        "VK95g27ws2C6J2h/7rC2qA==",
+        "CQ0PPwgdG3N6Ohfwx1C8xA==",
+        "/MeHciFhvFzQsCIw39xIZA==",
+        "u5cUPxM6/spLIV8VidPrAA==",
+        "OwArFF1hpdBupCkanpwT+Q==",
+        "PdBgXFq5mBqNxgCiqaRnkw==",
+        "lC5EumoIcctvxYqwELqIqw==",
+        "xoPSM86Se+1hHX0y3hhdkw==",
+        "F5bs0GGWBx9eBwcJJpXbqg==",
+        "1mw6LfTiirFyfjejf8QNGA==",
+        "daBhAvmE9shDgmciDAC5eg==",
+        "AvdeYb9XNOUFWiiz+XGfng==",
+        "JJJkp1TpuDx5wrua2Wml7g==",
+        "3y5Xk65ShGvWFbQxcZaQAQ==",
+        "l6QHU5JsJExNoOnqxBPVbw==",
+        "X2YfnPXgF2VHVX95ZcBaxQ==",
+        "g6udffWh7qUnSIo1Ldn3eA==",
+        "V2P75JFB4Se9h7TCUMfeNA==",
+        "IUZ5aGpkJ9rLgSg6oAmMlw==",
+        "pyrUqiZ98gVXxlXQNXv5fA==",
+        "83ERX2XJV3ST4XwvN7YWCg==",
+        "eJDUejE/Ez/7kV+S74PDYg==",
+        "M9oqlPb63e0kZE0zWOm+JQ==",
+        "0rTYcuVYdilO7zEfKrxY3A==",
+        "rfPTskbnoh3hRJH6ZAzQRg==",
+        "QtD35QhE8sAccPrDnhtQmQ==",
+        "jpNUgFnanr9Sxvj2xbBXZw==",
+        "nykEOLL/o7h0cs0yvdeT2g==",
+        "wX2URK6eDDHeEOF3cgPgHA==",
+        "jqPQ0aOuvOJte/ghI1RVng==",
+        "nHTsDl0xeQPC5zNRnoa0Rw==",
+        "mNv2Q67zePjk/jbQuvkAFA==",
+        "HjlPM2FQWdILUXHalIhQ5w==",
+        "cHkOsVd80Rgwepeweq4S1g==",
+        "kTCHqcb3Cos51o8cL+MXcg==",
+        "nvmBgp0YlUrdZ05INsEE8Q==",
+        "kFrRjz7Cf2KvLtz9X6oD+w==",
+        "Tmx0suRHzlUK4FdBivwOwA==",
+        "bG+P+p34t/IJ1ubRiWg6IA==",
+        "uESeJe/nYrHCq4RQbrNpGA==",
+        "ehfPlu6YctzzpQmFiQDxGA==",
+        "ZH5Es/4lJ+D5KEkF1BVSGg==",
+        "HHxn4iIQ7m0tF1rSd+BZBg==",
+        "DQJRsUwO1fOuGlkgJavcwQ==",
+        "HITIVoFoWNg04NExe13dNA==",
+        "MeKXnEfxeuQu9t3r/qWvcw==",
+        "Y7OofF9eUvp7qlpgdrzvkg==",
+        "XSb71ae0v+yDxNF5HJXGbQ==",
+        "p8W1LgFuW6JSOKjHkx3+aA==",
+        "y2JOIoIiT9cV1VxplZPraQ==",
+        "MN94B0r5CNAF9sl3Kccdbw==",
+        "Q1pdQadt12anX1QRmU2Y/A==",
+        "JIC8R48jGVqro6wmG2KXIw==",
+        "eWgLAqJOU+fdn8raHb9HCw==",
+        "5CMadLqS2KWwwMCpzlDmLw==",
+        "H1y2iXVaQYwP0SakN6sa+Q==",
+        "CUCjG2UaEBmiYWQc6+AS1Q==",
+        "yV3IbbTWAbHMhMGVvgb/ZQ==",
+        "80PCwYh4llIKAplcDvMj4g==",
+        "fgdUFvQPb5h+Rqz8pzLsmw==",
+        "2SI4F7Vvde2yjzMLAwxOog==",
+        "kJdY3XEdJS/hyHdR+IN0GA==",
+        "IKgNa2oPaFVGYnOsL+GC5Q==",
+        "eXFOya6x5inTdGwJx/xtUQ==",
+        "uTA0XbiH3fTeVV7u5z0b3w==",
+        "onFcHOO1c3pDdfCb5N4WkQ==",
+        "Slu3z535ijcs5kzDnR7kfA==",
+        "SElc2+YVi3afE1eG1MI7dQ==",
+        "ND2hYtAIQGMxBF7o7+u7nQ==",
+        "Pv9FWQEDLKnG/9K9EIz4Gw==",
+        "6CjtF1S2Y6RCbhl7hMsD+g==",
+        "rs2QrN4qzAHCHhkcrAvIfA==",
+        "eTMPXa60OTGjSPmvR4IgGw==",
+        "pvXHwJ3dwf9GDzfDD9JI3g==",
+        "CRmAj3JcasAb4iZ9ZbNIbw==",
+        "rcY4Ot40678ByCfqvGOGdg==",
+        "l4ddTxbTCW5UmZW+KRmx6A==",
+        "NKRzJndo2uXNiNppVnqy1g==",
+        "0NrvBuyjcJ2q6yaHpz/FOA==",
+        "3YXp1PmMldUjBz3hC6ItbA==",
+        "CmVD6nh8b/04/6JV9SovlA==",
+        "HjyxyL0db2hGDq2ZjwOOhg==",
+        "4PBaoeEwUj79njftnYYqLg==",
+        "vFFzkWgGyw6OPADONtEojQ==",
+        "czBWiYsQtNFrksWwoQxlOw==",
+        "9iB7+VwXRbi6HLkWyh9/kg==",
+        "zwY6tCjjya/bgrYaCncaag==",
+        "mW6TCje9Zg2Ep7nzmDjSYQ==",
+        "5LJqHFRyIwQKA4HbtqAYQQ==",
+        "INNBBin5ePwTyhPIyndHHg==",
+        "dChBe9QR29ObPFu/9PusLg==",
+        "1dhq3ozNCx0o4dV1syLVDA==",
+        "nyaekSYTKzfSeSfPrB114Q==",
+        "TfNHjSTV8w6Pg6+FaGlxvA==",
+        "m/Lp4U75AQyk9c8cX14HJg==",
+        "uU1TX5DoDg6EcFKgFcn0GA==",
+        "B+TsxQZf0IiQrU8X9S4dsQ==",
+        "6b7ue29cBDsvmj1VSa5njw==",
+        "RvXWAFwM+mUAPW1MjPBaHA==",
+        "pdaY6kZ8+QqkMOInvvACNA==",
+        "7nr3zyWL+HHtJhRrCPhYZA==",
+        "BXGlq54wIH6R3OdYfSSDRw==",
+        "b06KGv5zDYsTxyTbQ9/eyA==",
+        "8ylI1AS3QJpAi3I/NLMYdg==",
+        "0fpe9E6m3eLp/5j5rLrz2Q==",
+        "Qrh7OEHjp80IW+YzQwzlJg==",
+        "lqhgbgEqROAdfzEnJ17eXA==",
+        "Dulw855DfgIwiK7hr3X8vg==",
+        "wsp+vmW8sEqXYVURd/gjHA==",
+        "VoPth5hDHhkQcrQTxHXbuw==",
+        "TgWe70YalDPyyUz6n88ujg==",
+        "9lLhHcrPWI4EsA4fHIIXuw==",
+        "UymZUnEEQWVnLDdRemv+Tw==",
+        "qnkFUlJ8QT322JuCI3LQgg==",
+        "/p/aCTIhi1bU0/liuO/a2Q==",
+        "hWoxz5HhE50oYBNRoPp1JQ==",
+        "88tB/HgUIUnqWXEX++b5Aw==",
+        "Z8T1b9RsUWf59D06MUrXCQ==",
+        "BZTzHJGhzhs3mCXHDqMjnQ==",
+        "XfY+QUriCAA1+3QAsswdgg==",
+        "TZ3ATPOFjNqFGSKY3vP2Hw==",
+        "cl4t9FXabQg7tbh1g7a0OA==",
+        "9SgfpAY0UhNC6sYGus9GgQ==",
+        "d/Wd3Ma1xYyoMByPQnA9Cw==",
+        "DDitrRSvovaiXe2nfAtp4g==",
+        "s+eHg5K9zZ2Jozu5Oya9ZQ==",
+        "z3L2BNjQOMOfTVBUxcpnRA==",
+        "v4xIYrfPGILEbD/LwVDDzA==",
+        "HoaBBw2aPCyhh0f5GxF+/Q==",
+        "i9IRqAqKjBTppsxtPB7rdw==",
+        "cWUg7AfqhiiEmBIu+ryImA==",
+        "E+02smwQGBIxv42LIF2Y4Q==",
+        "W4CfeVp9mXgk04flryL7iA==",
+        "9SUOfKtfKmkGICJnvbIDMg==",
+        "xweGAZf+Yb3TtwR/sGmGIA==",
+        "EJgedRYsZPc4cT9rlwaZhg==",
+        "wv4NC9CIpwuGf/nOQYe/oA==",
+        "ZXeMG5eqQpZO/SGKC4WQkA==",
+        "bzXXzQGZs8ustv0K4leklA==",
+        "RkQK9S1ezo+dFYHQP57qrw==",
+        "mrinv7KooPQPrLCNTRWCFg==",
+        "qIUJPanWmGzTD1XxvHp+6w==",
+        "Js7g8Dr6XsnGURA4UNF0Ug==",
+        "dpSTNOCPFHN5yGoMpl1EUA==",
+        "ugY8rTtJkN4CXWMVcRZiZw==",
+        "rqHKB91H3qVuQAm+Ym5cUA==",
+        "UjmDFO7uzjl4RZDPeMeNyg==",
+        "cu4ZluwohhfIYLkWp72pqA==",
+        "ZydKlOpn2ySBW0G3uAqwuw==",
+        "LWd0+N3M94n81qd346LfJQ==",
+        "VbHoWmtiiPdABvkbt+3XKQ==",
+        "J4MC9He6oqjOWsYQh9nl3Q==",
+        "ahAbmGJZvUOXrcK6OydNGQ==",
+        "Byhi4ymFqqH8uIeoMRvPug==",
+        "LSN9GmT6LUHlCAMFqpuPIA==",
+        "IAMInfSYb76GxDlAr1dsTg==",
+        "qYHdgFAXhF/XcW4lxqfvWQ==",
+        "26+yXbqI+fmIZsYl4UhUzw==",
+        "AwPTZpC28NJQhf5fNiJuLA==",
+        "SESKbGF35rjO64gktmLTWA==",
+        "YVlRQHQglkbj3J2nHiP/Hw==",
+        "DdaT4JLC7U0EkF50LzIj9w==",
+        "G0LChrb0OE5YFqsfTpIL1Q==",
+        "5Yrj6uevT8wHRyqqgnSfeg==",
+        "NmWmDxwK5FpKlZbo0Rt8RA==",
+        "iUsUCB0mfRsE9KPEQctIzw==",
+        "Tm4zk2Lmg8w4ITMI31NfTA==",
+        "Vu0E+IJXBnc25x4n41kQig==",
+        "6wkfN8hyKmKU6tG3YetCmw==",
+        "trjM81KANPZrg9iSThWx6Q==",
+        "iGuY4VxcotHvMFXuXum7KA==",
+        "ICPdBCdONUqPwD5BXU5lrw==",
+        "alqHQBz8V446EdzuVfeY5Q==",
+        "74FW/QYTzr/P1k6QwVHMcw==",
+        "avZp5K7zJvRvJvpLSldNAw==",
+        "TIKadc6FAaRWSQUg5OATgg==",
+        "PfkWkSbAxIt1Iso0znW0+Q==",
+        "Z+bsbVP91KrJvxrujBLrrQ==",
+        "mrxlFD3FBqpSZr1kuuwxGg==",
+        "nUgYO7/oVNSX8fJqP2dbdg==",
+        "tVhXk9Ff3wAg56FbdNtcFg==",
+        "DdiNGiOSoIZxrMrGNvqkXw==",
+        "CDsanJz7e3r/eQe+ZYFeVQ==",
+        "wVfSZYjMjbTsD2gaSbwuqQ==",
+        "6c0iuya20Ys8BsvoI4iQaQ==",
+        "qCPfJTR8ecTw6u6b1yHibA==",
+        "fZrj3wGQSt8RXv0ykJROcQ==",
+        "gR3B8usSEb0NLos51BmJQg==",
+        "vTAmgfq3GxL4+ubXpzwk5w==",
+        "jLkmUZ6fV56GfhC0nkh4GA==",
+        "3v09RHCPTLUztqapThYaHg==",
+        "nULSbtw2dXbfVjZh33pDiA==",
+        "IHhyR6+5sZXTH+/NrghIPg==",
+        "tnUtJ/DQX9WaVJyTgemsUA==",
+        "7xTKFcog69nTmMfr5qFUTA==",
+        "IshzWega6zr3979khNVFQQ==",
+        "Ng5v/B9Z10TTfsDFQ/XrXQ==",
+        "hnCUnoxofUiqQvrxl73M8w==",
+        "VPa7DG6v7KnzMvtJPb88LQ==",
+        "4LtQrahKXVtsbXrEzYU1zQ==",
+        "Ev/xjTi7akYBI7IeZJ4Igw==",
+        "41WEjhYUlG6jp2UPGj11eQ==",
+        "JvXTdChcE3AqMbFYTT3/wg==",
+        "2rOkEVl90EPqfHOF5q2FYw==",
+        "mjFBVRJ7TgnJx+Q74xllPg==",
+        "Uy4QI8D2y1bq/HDNItCtAw==",
+        "wMOE/pEKVIklE75xjt6b6w==",
+        "ZcuIvc8fDI+2uF0I0uLiVA==",
+        "CX/N/lHckmAtHKysYtGdZA==",
+        "j8to4gtSIRYpCogv2TESuQ==",
+        "iS9wumBV5ktCTefFzKYfkA==",
+        "ewPT4dM12nDWEDoRfiZZnA==",
+        "vWn9OPnrJgfPavg4D6T/HQ==",
+        "J/PNYu4y6ZMWFFXsAhaoow==",
+        "catI+QUNk3uJ+mUBY3bY8Q==",
+        "F8tEIT5EhcvLNRU5f0zlXQ==",
+        "zyA9f5J7mw5InjhcfeumAQ==",
+        "MlOOZOwcRGIkifaktEq0aQ==",
+        "Pt3i49uweYVgWze3OjkjJA==",
+        "sfIClgTMtZo9CM9MHaoqhQ==",
+        "HeQbUuBM9sqfXFXRBDISSw==",
+        "SFn78uklZfMtKoz2N0xDaQ==",
+        "H6j2nPbBaxHecXruxiWYkA==",
+        "fU32wmMeD44UsFSqFY0wBA==",
+        "hDILjSpTLqJpiSSSGu445A==",
+        "ieEAgvK9LsWh2t6DsQOpWA==",
+        "xfjBQk3CrNjhufdPIhr91A==",
+        "j+8/VARfbQSYhHzj0KPurQ==",
+        "/zFLRvi75UL8qvg+a6zqGg==",
+        "U0KmEI6e5zJkaI4YJyA5Ew==",
+        "uXvr6vi5kazZ9BCg2PWPJA==",
+        "jEqP0dyHKHiUjZ9dNNGTlQ==",
+        "1xWx5V3G9murZP7srljFmA==",
+        "OIwtfdq37eQ0qoXuB2j7Hw==",
+        "fUAy3f9bAglLvZWvkO2Lug==",
+        "duRFqmvqF93uf/vWn8aOmg==",
+        "ysRQ+7Aq7eVLOp88KnFVMA==",
+        "CkZUmKBAGu0FLpgPDrybpw==",
+        "TrLmfgwaNATh24eSrOT+pw==",
+        "83wtvSoSP9FVBsdWaiWfpA==",
+        "pUfWmRXo70yGkUD/x5oIvA==",
+        "PybPZhJErbRTuAafrrkb3g==",
+        "8hsfXqi4uiuL+bV1VrHqCw==",
+        "TVlHoi8J7sOZ2Ti7Dm92cQ==",
+        "za4rzveYVMFe3Gw531DQJQ==",
+        "JKphO0UYjFqcbPr6EeBuqg==",
+        "hqeSvwu8eqA072iidlJBAw==",
+        "bUF0JIfS4uKd3JZj2xotLQ==",
+        "hKOsXOBoFTl/K4xE+RNHDA==",
+        "JHBjKpCgSgrNNACZW1W+1w==",
+        "Rrq0ak9YexLqqbSD4SSXlw==",
+        "+NmjwjsPhGJh9bM10SFkLw==",
+        "xMIHeno2qj3V8q9H1xezeg==",
+        "TcFinyBrUoAEcLzWdFymow==",
+        "Rvchz/xjcY9uKiDAkRBMmA==",
+        "TYlnrwgyeZoRgOpBYneRAg==",
+        "PbnxuVerGwHyshkumqAARg==",
+        "iFtadcw8v6betKka9yaJfg==",
+        "7wgT9WIiMVcrj48PVAMIgw==",
+        "2HHqeGRMfzf3RXwVybx+ZQ==",
+        "tdgI9v7cqJsgCAeW1Fii1A==",
+        "4ZFYKa7ZgvHyZLS6WpM8gA==",
+        "gB8wkuIzvuDAIhDtNT1gyA==",
+        "g1ELwsk6hQ+RAY1BH640Pg==",
+        "UZoibx+y1YJy/uRSa9Oa2w==",
+        "yS/yMnJDHW0iaOsbj4oPTg==",
+        "JzW+yhrjXW1ivKu3mUXPXg==",
+        "/wIZAye9h1TUiZmDW0ZmYA==",
+        "YK+q7uJObkQZvOwQ9hplMg==",
+        "Rs8deApkoosIJSfX7NXtAA==",
+        "MsCloSmTFoBpm7XWYb+ueQ==",
+        "3ltw31yJuAl4VT6MieEXXw==",
+        "1+qmrbC8c7MJ6pxmDMcKuA==",
+        "AYxGETZs477n2sa1Ulu/RQ==",
+        "Q0TJZxpn3jk67L7N+YDaNA==",
+        "OGpsXRHlaN8BvZftxh1e7A==",
+        "UbABE6ECnjB+9YvblE9CYw==",
+        "kZ0D191c/uv4YMG15yVLDw==",
+        "QWURrsEgxbJ8MWcaRmOWqw==",
+        "xiFlcSfa/gnPiO+LwbixcQ==",
+        "Szko0IPE7RX2+mfsWczrMg==",
+        "Ugt8HVC/aUzyWpiHd0gCOQ==",
+        "8j9GVPiFdfIRm/+ho7hpoA==",
+        "KR401XBdgCrtVDSaXqPEiA==",
+        "d0NBFiwGlQNclKObRtGVMQ==",
+        "XEwOJG24eaEtAuBWtMxhwg==",
+        "0Y6iiZjCwPDwD/CwJzfioQ==",
+        "MvMbvZNKbXFe2XdN+HtnpQ==",
+        "fsoXIbq0T0nmSpW8b+bj+g==",
+        "Uje3Ild84sN41JEg3PEHDg==",
+        "i6ZYpFwsyWyMJNgqUMSV1A==",
+        "+P5q4YD1Rr5SX26Xr+tzlw==",
+        "z4oKy2wKH+sbNSgGjbdHGw==",
+        "XwKWd03sAz8MmvJEuN08xA==",
+        "Xv0mNYedaBc57RrcbHr9OA==",
+        "9oUawSwUGOmb0sDn3XS6og==",
+        "9RGIQ2qyevNbSSEF36xk/A==",
+        "q8YF9G2jqydAxSqwyyys5Q==",
+        "m5JIUETVXcRza4VL4xlJbg==",
+        "aRpdnrOyu5mWB1P5YMbvOA==",
+        "rM/BOovNgnvebKMxZQdk7g==",
+        "fQS0jnQMnHBn7+JZWkiE/g==",
+        "gAoV4BZYdW1Wm712YXOhWQ==",
+        "hCzsi1yDv9ja5/o7t94j9Q==",
+        "CoLvjQDQGldGDqRxfQo+WQ==",
+        "pfGcaa49SM3S6yJIPk/EJQ==",
+        "yYp4iuI5f/y/l1AEJxYolQ==",
+        "Jj4IrSVpqQnhFrzNvylSzA==",
+        "4jeOFKuKpCmMXUVJSh9y0g==",
+        "+NMUaQ7XPsAi0rk7tTT9wQ==",
+        "Jt4Eg6MJn8O4Ph/K2LeSUA==",
+        "CiiUeJ0LeWfm7+gmEmYXtg==",
+        "c5Tc7rTFXNJqYyc0ppW+Iw==",
+        "4KJZPCE9NKTfzFxl76GWjg==",
+        "aXs9qTEXLTkN956ch3pnOA==",
+        "f5Xo7F1uaiM760Qbt978iw==",
+        "wpZqFkKafFpLcykN2IISqg==",
+        "vIORTYSHFIXk5E2NyIvWcQ==",
+        "prOsOG0adI4o+oz50moipw==",
+        "blygTgAHZJ3NzyAT33Bfww==",
+        "rBt6L/KLT7eybxKt5wtFdg==",
+        "vMuaLvAntJB5o7lmt/kVXA==",
+        "iujlt9fXcUXEYc+T2s5UjA==",
+        "LyYPOZKm8bBegMr5NTSBfg==",
+        "ZtWvgitOSRDWq7LAKYYd4Q==",
+        "kh51WUI5TRnKhur6ZEpRTQ==",
+        "VzQ1NwNv9btxUzxwVqvHQg==",
+        "8fJLQeIHaTnJ8wGqUiKU6g==",
+        "vvEH5A39TTe1AOC11rRCLA==",
+        "dihDsG7+6aocG6M9BWrCzQ==",
+        "3jqsY8/xTWELmu/az3Daug==",
+        "mpOtwBvle+nyY6lUBwTemw==",
+        "E1CvxFbuu9AYW604mnpGTw==",
+        "1LPC0BzhJbepHTSAiZ3QTw==",
+        "XpGXh76RDgXC4qnTCsnNHA==",
+        "3Gg9N7vjAfQEYOtQKuF/Eg==",
+        "+WpF8+poKmHPUBB4UYh/ig==",
+        "UNt7CNMtltJWq8giDciGyA==",
+        "RIZYDgXqsIdTf9o2Tp/S7g==",
+        "0QCQORCYfLuSbq94Sbt0bQ==",
+        "hvsZ5JmVevK1zclFYmxHaw==",
+        "3+9nURtBK3FKn0J9DQDa3g==",
+        "jdVMQqApseHH3fd91NFhxg==",
+        "VX+cVXV8p9i5EBTMoiQOQQ==",
+        "I5qDndyelK4Njv4YrX7S6w==",
+        "rWliqgfZ3/uCRBOZ9sMmdA==",
+        "vwno3vugCvt6ooT3CD4qIQ==",
+        "cffrYrBX3UQhfX1TbAF+GQ==",
+        "nOiwBFnXxCBfPCHYITgqNg==",
+        "LQttmX92SI94+hDNVd8Gtw==",
+        "iCF+GWw9/YGQXsOOPAnPHQ==",
+        "nwtCsN1xEYaHvEOPzBv+qQ==",
+        "CQpJFrpOvcQhsTXIlJli+Q==",
+        "tYeIZjIm0tVEsYxH1iIiUQ==",
+        "iCnm5fPmSmxsIzuRK6osrA==",
+        "tX8X8KoxUQ8atFSCxgwE1Q==",
+        "hZlX6qOfwxW5SPfqtRqaMw==",
+        "2aIx9UdMxxZWvrfeJ+DcTw==",
+        "TlJizlASbPtShZhkPww4UA==",
+        "p+bx+/WQWALXEBCTnIMr4w==",
+        "4VR5LiXLew6Nyn91zH9L4w==",
+        "bfUD03N2PRDT+MZ+WFVtow==",
+        "cTvDd8okNUx0RCMer6O8sw==",
+        "49jZr/mEW6fvnyzskyN40w==",
+        "vHmQUl4WHXs1E/Shh+TeyA==",
+        "fgXfRuqFfAu8qxbTi4bmhA==",
+        "Wn+Vj4eiWx0WPUHr3nFbyA==",
+        "2SwIiUwT4vRZPrg7+vZqDA==",
+        "nkedTagkmf6YE4tEY+0fKw==",
+        "8nOTDhFyZ8YUA4b6M5p84w==",
+        "qnzWszsyJhYtx8wkMN6b1g==",
+        "ka7pMp8eSiv92WgAsz2vdA==",
+        "pGQEWJ38hb/ZYy2P1+FIuw==",
+        "cVhdRFuZaW/09CYPmtNv5g==",
+        "prCOYlboBnzmLEBG/OeVrQ==",
+        "oIWwTbkVS5DDL47mY9/1KQ==",
+        "PKtXc4x4DEjM45dnmPWzyg==",
+        "f9ywiGXsz+PuEsLTV3zIbQ==",
+        "6G2bD3Y7qbGmfPqH9TqLFA==",
+        "DMHmyn2U2n+UXxkqdvKpnA==",
+        "XOG1PYgqoG8gVLIbVLTQgg==",
+        "1FSrgkUXgZot2CsmbAtkPw==",
+        "BxFP+4o6PSlGN78eSVT1pA==",
+        "EZVQGsXTZvht1qedRLF8bQ==",
+        "eYAQWuWZX2346VMCD6s7/A==",
+        "jkUpkLoIXuu7aSH8ZghIAQ==",
+        "mXPtbPaoNAAlGmUMmJEWBQ==",
+        "HLesnV3DL+FhWF3h6RXe8g==",
+        "nDAsSla+9XfAlQSPsXtzPA==",
+        "RAECgYZmcF4WxcFcZ4A0Ww==",
+        "W+M4BcYNmjj7xAximDGWsA==",
+        "ueODvMv/f9ZD8O0aIHn4sg==",
+        "cszpMdGbsbe6BygqMlnC9Q==",
+        "siHwJx6EgeB1gBT9z/vTyw==",
+        "FN7oLGBQGHXXn5dLnr/ElA==",
+        "Tud+AMyuFkWYYZ73yoJGpQ==",
+        "TuaG3wRdM9BWKAxh2UmAsg==",
+        "8CjmgWQSAAGcXX9kz3kssw==",
+        "ays5/F7JANIgPHN0vp2dqQ==",
+        "PCOGl7GIqbizAKj/sZmlwQ==",
+        "rZKD8oJnIj5fSNGiccfcvA==",
+        "gFEnTI8os2BfRGqx9p5x8w==",
+        "5r1ZsGkrzNQEpgt/gENibw==",
+        "1YO9G8qAhLIu2rShvekedw==",
+        "6ZKmm7IW7IdWuVytLr68CQ==",
+        "mMfn8OaKBxtetweulho+xQ==",
+        "GQJxu1SoMBH14KPV/G/KrQ==",
+        "IYIP2UBRyWetVfYLRsi1SQ==",
+        "Jit0X0srSNFnn8Ymi1EY+g==",
+        "ARCWkHAnVgBOIkCDQ19ZuA==",
+        "qA0sTaeNPNIiQbjIe1bOgQ==",
+        "iGI9uqMoBBAjPszpxjZBWQ==",
+        "+L1FDsr5VQtuYc2Is5QGjw==",
+        "4XNUmgwxsqDYsNmPkgNQYQ==",
+        "Yig+Wh18VIqdsmwtwfoUQw==",
+        "uqp92lAqjec8UQYfyjaEZw==",
+        "QiozlNcQCbqXtwItWExqJQ==",
+        "JFHutgSe1/SlcYKIbNNYwQ==",
+        "Y26jxXvl79RcffH8O8b9Ew==",
+        "bQ7J5mebp38rfP/fuqQOsg==",
+        "HI4ZIE5s8ez8Rb+Mv39FxA==",
+        "OzH7jTcyeM7RPVFtBdakpQ==",
+        "HLxROy6fx/mLXFTDSX4eLA==",
+        "s5RUHVRNAoKMuPR/Jkfc2Q==",
+        "X9QAaNjgiOeAWSphrGtyVw==",
+        "ALJWKUImVE40MbEooqsrng==",
+        "9MDG0WeBPpjGJLEmUJgBWg==",
+        "9RXymE9kCkDvBzWGyMgIWA==",
+        "vFox1d3llOeBeCUZGvTy0A==",
+        "r3lQAYOYhwlLnDWQIunKqg==",
+        "2os5s7j7Tl46ZmoZJH8FjA==",
+        "O5N2yd+QQggPBinQ+zIhtQ==",
+        "ZygAjaN62XhW5smlLkks+Q==",
+        "AgDJsaW0LkpGE65Kxk5+IA==",
+        "omAjyj1l6gyQAlBGfdxJTw==",
+        "fY9VATklOvceDfHZDDk57A==",
+        "StpQm/cQF8cT0LFzKUhC5w==",
+        "CYJB3qy5GalPLAv1KGFEZA==",
+        "coGEgMVs2b314qrXMjNumQ==",
+        "DQQB/l55iPN9XcySieNX3A==",
+        "6dshA8knH5qqD+KmR/kdSQ==",
+        "qyRmvxh8p4j4f+61c10ZFQ==",
+        "apWEPWUvMC24Y+2vTSLXoA==",
+        "RzX2OfSFEd//LhZwRwzBVw==",
+        "NdULoUDGhIolzw1PyYKV0A==",
+        "5w/c9WkI/FA+4lOtdPxoww==",
+        "bV9r7j2kNJpDCEM5E2339Q==",
+        "vbyiKeDCQ4q9dDRI1Q0Ong==",
+        "9xIgKpZGqq0/OU6wM5ZSHw==",
+        "RYkDwwng6eeffPHxt8iD9A==",
+        "w5N/aHbtOIKzcvG3GlMjGA==",
+        "3P2aJxV8Trll2GH9ptElYA==",
+        "yteeQr3ub2lDXgLziZV+DQ==",
+        "yqtj8GfLaUHYv/BsdjxIVw==",
+        "NyF+4VRog7etp90B9FuEjA==",
+        "uwA6N5LptSXqIBkTO0Jd7Q==",
+        "6lVSzYUQ/r0ep4W2eCzFpg==",
+        "1d7RPHdZ9qzAbG3Vi9BdFA==",
+        "7br49X11xc2GxQLSpZWjKQ==",
+        "peMW+rpwmXrSwplVuB/gTA==",
+        "RqYpA5AY7mKPaSxoQfI1CA==",
+        "dqVw2q2nhCvTcW82MT7z0g==",
+        "5S5/asYfWjOwnzYpbK6JDw==",
+        "NvkR0inSzAdetpI4SOXGhw==",
+        "tIqwBotg052wGBL65DZ+yA==",
+        "S4RvORcJ3m6WhnAgV4YfYA==",
+        "UAqf4owQ+EmrE45hBcUMEw==",
+        "4aPU6053cfMLHgLwAZJRNg==",
+        "3Y6/HqS1trYc9Dh778sefg==",
+        "ck86G8HsbXflyrK7MBntLg==",
+        "GLmWLXURlUOJ+PMjpWEXVA==",
+        "jNJQ6otieHBYIXA9LjXprg==",
+        "AsAHrIkMgc3RRWnklY9lJw==",
+        "FCLQocqxxhJeleARZ6kSPg==",
+        "3Leu2Sc+YOntJFlrvhaXeg==",
+        "hSkY45CeB6Ilvh0Io4W6cg==",
+        "DwrNdmU5VFFf3TwCCcptPA==",
+        "u2WQlcMxOACy6VbJXK4FwA==",
+        "E9IlDyULLdeaVUzN6eky8g==",
+        "EXveRXjzsjh8zbbQY2pM9g==",
+        "5VO1inwXMvLDBQSOahT6rg==",
+        "HaHTsLzx7V3G1SFknXpGxA==",
+        "MMaegl2Md9s/wOx5o9564w==",
+        "mpWNaUH9kn4WY26DWNAh3Q==",
+        "w3G+qXXqqKi8F5s+qvkBUg==",
+        "wM8tnXO4PDlLVHspZFcjYw==",
+        "LFcpCtnSnsCPD2gT/RA+Zg==",
+        "bhVbgJ4Do4v56D9mBuR/EA==",
+        "yU3N0HMSP5etuHPNrVkZtg==",
+        "FzqIpOcTsckSNHExrl+9jg==",
+        "BYz52gYI/Z6AbYbjWefcEA==",
+        "h3vYYI9yhpSZV2MQMJtwFQ==",
+        "adJAjAFyR2ne1puEgRiH+g==",
+        "eDcyiPaB954q5cPXcuxAQw==",
+        "40gCrW4YWi+2lkqMSPKBPg==",
+        "ulLuTZqhEDkX0EJ3xwRP9A==",
+        "y4iBxAMn/KzMmaWShdYiIw==",
+        "ilBBNK/IV69xKTShvI94fQ==",
+        "0HN6MIGtkdzNPsrGs611xA==",
+        "twPn6wTGqI0aR//0wP3xtA==",
+        "3UNJ37f+gnNyYk9yLFeoYA==",
+        "4SdHWowXgCpCDL28jEFpAw==",
+        "Mr5mCtC53+wwmwujOU/fWw==",
+        "81pAhreEPxcKse+++h1qBg==",
+        "KmcGEE0pacQ/HDUgjlt7Pg==",
+        "Gt4/MMrLBErhbFjGbiNqQQ==",
+        "lf1fwA0YoWUZaEybE+LyMQ==",
+        "RIVYGO2smx9rmRoDVYMPXw==",
+        "rJ9qVn8/2nOxexWzqIHlcQ==",
+        "lfOLLyZNbsWQgHRhicr4ag==",
+        "wgH1GlUxWi6/yLLFzE76uQ==",
+        "Qg1ubGl+orphvT990e5ZPA==",
+        "Z5B+uOmPZbpbFWHpI9WhPw==",
+        "snGTzo540cCqgBjxrfNpKw==",
+        "ZqkmoGB0p5uT5J6XBGh7Tw==",
+        "uPi8TsGY3vQsMVo/nsbgVQ==",
+        "Y5XR8Igvau/h+c1pRgKayg==",
+        "ZmVpw1TUVuT13Zw/MNI5hQ==",
+        "60suecbWRfexSh7C67RENA==",
+        "kZ/mZZg9YSDmk2rCGChYAg==",
+        "OpL+vHwPasW30s2E1TYgpA==",
+        "ZVnErH1Si4u51QoT0OT7pA==",
+        "3pi3aNVq1QNJmu1j0iyL0g==",
+        "tb5+2dmYALJibez1W4zXgA==",
+        "jOPdd330tB6+7C29a9wn0Q==",
+        "5oD/aGqoakxaezq43x0Tvw==",
+        "HdB7Se47cWjPgpJN0pZuiA==",
+        "6WhHPWlqEUqXC52rHGRHjA==",
+        "WLwpjgr9KzevuogoHZaVUw==",
+        "E8yMPK7W0SIGTK6gIqhxiQ==",
+        "1/Hxu8M9N/oNwk8bCj4FNQ==",
+        "Uo1ebgsOxc3eDRds1ah3ag==",
+        "5pqqzC/YmRIMA9tMFPi7rg==",
+        "ri4AOITPdB1YHyXV+5S51g==",
+        "HfvsiCQN/3mT0FabCU5ygQ==",
+        "UQTQk5rrs6lEb1a+nkLwfg==",
+        "VH70dN82yPCRctmAHMfCig==",
+        "yD3Dd4ToRrl53k/2NSCJiw==",
+        "fO0+6TsjL+45p9mSsMRiIg==",
+        "fM5uYpkvJFArnYiQ3MrQnA==",
+        "V+QzdKh5gxTPp2yPC9ZNEg==",
+        "XHHEg/8KZioW/4/wgSEkbQ==",
+        "2abfl3N46tznOpr+94VONQ==",
+        "gxwbqZDHLbQVqXjaq42BCg==",
+        "WnHK5ZQDR6Da5cGODXeo0A==",
+        "SChDh/Np1HyTPWfICfE1uA==",
+        "yhexr/OFKfZl0o3lS70e4w==",
+        "N65PqIWiQeS082D6qpfrAg==",
+        "RM5CpIiB94Sqxi462G7caA==",
+        "CBAGa5l95f3hVzNi6MPWeQ==",
+        "OHJBT2SEv5b5NxBpiAf7oQ==",
+        "p48i7AfSSAyTdJSyHvOONw==",
+        "/SP6pOdYFzcAl2OL05z4uQ==",
+        "N8dXCawxSBX40fgRRSDqlQ==",
+        "bMWFvjM8eVezU1ZXKmdgqw==",
+        "Um1ftRBycvb+363a90Osog==",
+        "QAz7FA+jpz9GgLvwdoNTEQ==",
+        "qO4HlyHMK5ygX+6HbwQe8w==",
+        "UgvtdE2eBZBUCAJG/6c0og==",
+        "q5g3c8tnQTW2EjNfb2sukw==",
+        "gsC/mWD8KFblxB0JxNuqJw==",
+        "SVFbcjXbV7HRg+7jUrzpwg==",
+        "bz294kSG4egZnH2dJ8HwEg==",
+        "ybpTgPr3SjJ12Rj5lC/IMA==",
+        "yDrAd1ot38soBk7zKdnT8A==",
+        "BB/R8oQOcoE4j63Hrh8ifg==",
+        "GNrMvNXQkW7PydlyJa+f1w==",
+        "w0PKdssv+Zc5J/BbphoxpA==",
+        "D5ibbo8UJMfFZ48RffuhgQ==",
+        "MdvhC1cuXqni/0mtQlSOCw==",
+        "wQKL8Ga6JQkpZ7yymDkC3w==",
+        "o1uhaQg5/zfne84BFAINUQ==",
+        "Ft2wXUokFdUf6d2Y/lwriw==",
+        "sLJrshdEANp0qk2xOUtTnQ==",
+        "jx7rpxbm1NaUMcE2ktg5sA==",
+        "ZQ0ZnTsZKWxbRj7Tilh24Q==",
+        "KhrIIHfqXl9zGE9aGrkRVg==",
+        "jS0JuioLGAVaHdo/96JFoQ==",
+        "tr+U/vt+MIGXPRQYYWJfRg==",
+        "TXab/hqNGWaSK+fXAoB2bg==",
+        "0K4NBxqEa3RYpnrkrD/XjQ==",
+        "3oMTbWf7Bv83KRlfjNWQZA==",
+        "yLAhLNezvqVHmN1SfMRrPw==",
+        "ZYW30FfgwHmW6nAbUGmwzA==",
+        "CZNoTy26VUQirvYxSPc/5A==",
+        "CF1sAlhjDQY/KWOBnSSveA==",
+        "+CLf5witKkuOvPCulTlkqw==",
+        "1m1yD4L9A7Q1Ot+wCsrxJQ==",
+        "2E41e0MgM3WhFx2oasIQeA==",
+        "mDXHuOmI4ayjy2kLSHku1Q==",
+        "sCLMrLjEUQ6P1L8tz90Kxg==",
+        "zDUZCzQesFjO1JI3PwDjfg==",
+        "x/BIDm6TKMhqu/gtb3kGyw==",
+        "DEaZD/8aWV6+zkiLSVN/gA==",
+        "7dz+W494zwU5sg63v5flCg==",
+        "Y5iDQySR2c3MK7RPMCgSrw==",
+        "GglPoW5fvr4JSM3Zv99oiA==",
+        "myzvc+2MfxGD9uuvZYdnqQ==",
+        "V9G1we3DOIQGKXjjPqIppQ==",
+        "gYvdNJCDDQmNhtJ6NKSuTA==",
+        "rXtGpN17Onx8LnccJnXwJQ==",
+        "/a+bLXOq02sa/s8h7PhUTg==",
+        "htNVAogFakQkTX6GHoCVXg==",
+        "eshD40tvOA6bXb0Fs/cH3A==",
+        "K1CGbMfhlhIuS0YHLG30PQ==",
+        "aOeJZUIZM9YWjIEokFPnzQ==",
+        "r0hAwlS0mPZVfCSB+2G6uQ==",
+        "0q+erphtrB+6HBnnYg7O6w==",
+        "bkRdUHAksJZGzE1gugizYQ==",
+        "J8v2f6hWFu8oLuwhOeoQjA==",
+        "qkvEep4vvXhc2ZJ6R449Mg==",
+        "6HGeEPyTAu9oiKhNVLjQnA==",
+        "JoATsk/aJH0UcDchFMksWA==",
+        "QozQL0DTtr+PXNKifv6l6g==",
+        "HiAgt86AyznvbI2pnLalVQ==",
+        "lY+tivtsfvU0LJzBQ6itYQ==",
+        "EfXDc6h69aBPE6qsB+6+Ig==",
+        "gnAIpoCyl3mQytLFgBEgGA==",
+        "p2JPOX8yDQ0agG+tUyyT/g==",
+        "zeELfk015D5krExLKRUYtg==",
+        "wDiGoFEfIVEDyyc4VpwhWQ==",
+        "7Ephy+mklG2Y3MFdqmXqlA==",
+        "8ZFPMJJYVJHsfRpU4DigSg==",
+        "ocRh5LR1ZIN9Johnht8fhQ==",
+        "l5f3I6osM9oxLRAwnUnc5A==",
+        "yxCyBXqGWA735JEyljDP7Q==",
+        "qE/h/Z+6buZWf+cmPdhxog==",
+        "HCu4ZMrcLMZbPXbTlWuvvQ==",
+        "TDrq23VUdzEU/8L5i8jRJQ==",
+        "L+N/6geuokiLPPSDXM9Qkg==",
+        "v6jZicMNM3ysm3U5xu0HoQ==",
+        "b85nxzs8xiHxaqezuDVWvg==",
+        "ca+kx+kf7JuZ3pfYKDwFlg==",
+        "KlY5TGg0pR/57TVX+ik1KQ==",
+        "3jmCreW5ytSuGfmeLv7NfQ==",
+        "ucLMWnNDSqE4NOCGWvcGWw==",
+        "NSrzwNlB0bde3ph8k6ZQcQ==",
+        "nL4iEd3b5v4Y9fHWDs+Lrw==",
+        "W2x0SBzSIsTRgyWUCOZ/lg==",
+        "ifZM0gBm9g9L09YlL+vXBg==",
+        "4WcFEswYU/HHQPw77DYnyA==",
+        "TLJbasOoVO435E5NE5JDcA==",
+        "WyCFB4+6lVtlzu3ExHAGbQ==",
+        "BW0A06zoQw7S+YMGaegT7g==",
+        "qP1cCE4zsKGTPhjbcpczMw==",
+        "UVEZPoH9cysC+17MKHFraw==",
+        "eQ45Mvf5in9xKrP6/qjYbg==",
+        "fOARCnIg/foF/6tm7m9+3w==",
+        "lK2xe+OuPutp4os0ZAZx5w==",
+        "Tug3eh+28ttyf+U7jfpg5w==",
+        "ENFfP93LA257G6pXQkmIdg==",
+        "FuWspiqu5g8Eeli5Az+BkA==",
+        "kIGxCUxSlNgsKZ45Al1lWw==",
+        "RzeH+G3gvuK1z+nJGYqARQ==",
+        "0ofMbUCA3/v5L8lHnX4S5w==",
+        "VI8pgqBZeGWNaxkuqQVe7g==",
+        "x6lNRGgJcRxgKTlzhc1WPg==",
+        "La0gzdbDyXUq6YAXeKPuJA==",
+        "dAq8/1JSQf1f4QPLUitp0g==",
+        "WN7lFJfw4lSnTCcbmt5nsg==",
+        "2aDK0tGNgMLyxT+BQPDE8Q==",
+        "9W57pTzc572EvSURqwrRhw==",
+        "37Nkh06O979nt7xzspOFyQ==",
+        "4TQkMnRsXBobbtnBmfPKnA==",
+        "f/BjtP5fmFw2dRHgocbFlg==",
+        "9vEgJVJLEfed6wJ7hBUGgQ==",
+        "HRWYX2XOdsOqYzCcqkwIyw==",
+        "StDtLMlCI75g4XC59mESEQ==",
+        "99+SBN45LwKCPfrjUKRPmw==",
+        "HbT6W1Ssd3W7ApKzrmsbcg==",
+        "l8/KMItWaW3n4g1Yot/rcQ==",
+        "s7iW1M6gkAMp+D/3jHY58w==",
+        "GWwJ32SZqD5wldrXUdNTLA==",
+        "YhLEPsi/TNyeUJw69SPYzQ==",
+        "g0aTR8aJ0uVy3YvGYu5xrw==",
+        "m6get5wjq5j1i5abnpXuZQ==",
+        "ymtA8EMPMgmMcimWZZ0A1Q==",
+        "HEcOaEd9zCoOVbEmroSvJg==",
+        "F8l+Qd9TZgzV+r8G584lKA==",
+        "3yDD+xT8iRfUVdxcc7RxKw==",
+        "1eRUCdIJe3YGD5jOMbkkOg==",
+        "DO1/jfP/xBI9N0RJNqB2Rw==",
+        "SiSlasZ+6U2IZYogqr2UPg==",
+        "tBQDfy48FnIOZI04rxfdcA==",
+        "HEghmKg3GN60K7otpeNhaA==",
+        "mTLBkP+yGHsdk5g7zLjVUw==",
+        "RgtwfY5pTolKrUGT+6Pp6g==",
+        "EyIsYQxgFa4huyo/Lomv7g==",
+        "HwLSUie8bzH+pOJT3XQFyg==",
+        "7Tauesu7bgs5lJmQROVFiQ==",
+        "ojugpLIfzflgU2lonfdGxA==",
+        "ZqjnqxZE/BjOUY0CMdVl0g==",
+        "oQjugfjraFziga1BcwRLRA==",
+        "JXCYeWjFqcdSf6QwB54G+A==",
+        "TeBGJCqSqbzvljIh9viAqA==",
+        "1Gpj4TPXhdPEI4zfQFsOCg==",
+        "asouSfUjJa8yfMG7BBe+fA==",
+        "ccy3Ke2k4+evIw0agHlh3w==",
+        "CzSumIcYrZlxOUwUnLR2Zw==",
+        "9QFYrCXsGsInUb4SClS3cQ==",
+        "3RTtSaMp1TZegJo5gFtwwA==",
+        "aTWiWjyeSDVY/q8y9xc2zg==",
+        "UK+R+hAoVeZ4xvsoZjdWpw==",
+        "rHagXw+CkF3uEWPWDKXvog==",
+        "MfkyURTBfkNZwB+wZKjP4g==",
+        "Qf7JFJJuuacSzl6djUT2EQ==",
+        "K1RL+tLjICBvMupe7QppIQ==",
+        "R2OOV18CV/YpWL1xzr/VQg==",
+        "o+areESiXgSO0Lby56cBeg==",
+        "VPqyIomYm7HbK5biVDvlpw==",
+        "pw1jplCdTC+b0ThX0FXOjw==",
+        "gTnsH3IzALFscTZ1JkA9pw==",
+        "JYJvOZ4CHktLrYJyAbdOnA==",
+        "P8lUiLFoL100c9YSQWYqDA==",
+        "LATQEY7f47i77M6p11wjWA==",
+        "U9kE50Wq5/EHO03c5hE4Ug==",
+        "pFKzcRHSUBqSMtkEJvrR1Q==",
+        "vHVXsAMQqc0qp7HA5Q+YkA==",
+        "3XyoREdvhmSbyvAbgw2y/A==",
+        "qOEIUWtGm5vx/+fg4tuazg==",
+        "a6IszND1m+6w+W+CvseC7g==",
+        "KuNY8qAJBce+yUIluW8AYw==",
+        "5Wcq+6hgnWsQZ/bojERpUw==",
+        "l2ZB9TvT68rn8AAN4MdxWw==",
+        "h5HsEsObPuPFqREfynVblw==",
+        "fvm0IQfnbfZFETg9v3z/Fg==",
+        "QV0OG5bpjrjku4AzDvp9yw==",
+        "nMuMtK/Zkb3Xr34oFuX/Lg==",
+        "jMZKSMP2THqwpWqJNJRWdw==",
+        "fX4G68hFL7DmEmjbWlCBJQ==",
+        "ZlBNHAiYsfaEEiPQ1z+rCA==",
+        "ckugAisBNX18eQz+EnEjjw==",
+        "Dt6hvhPJu94CJpiyJ5uUkg==",
+        "eYE9No9sN5kUZ5ePEyS3+Q==",
+        "Tp52d1NndiC9w3crFqFm9g==",
+        "MBjMU/17AXBK0tqyARZP5w==",
+        "1EI9aa955ejNo1dJepcZJw==",
+        "FqWLkhWl0iiD/u2cp+XK9A==",
+        "j8nMH8mK/0Aae7ZkqyPgdg==",
+        "ZtmnX24AwYAXHb2ZDC6MeQ==",
+        "who8uUamlHWHXnBf7dwy4A==",
+        "CmkmWcMK4eqPBcRbdnQvhw==",
+        "61V74uIjaSfZM8au1dxr1A==",
+        "778O1hdVKHLG2q9dycUS0Q==",
+        "IdadoCPmSgHDHzn1zyf8Jw==",
+        "Z2rwGmVEMCY6nCfHO3qOzw==",
+        "Q3TpCE+wnmH/1h/EPWsBtQ==",
+        "HnVfyqgJ+1xSsN4deTXcIA==",
+        "XgPHx2+ULpm14IOZU2lrDg==",
+        "IbN736G1Px5bsYqE5gW1JQ==",
+        "nY/H7vThZ+dDxoPRyql+Cg==",
+        "wlWxtQDJ+siGhN2fJn3qtw==",
+        "MrbEUlTagbesBNg0OemHpw==",
+        "LJtRcR70ug6UHiuqbT6NGw==",
+        "hSNZWNKUtDtMo6otkXA/DA==",
+        "LawT9ZygiVtBk0XJ+KkQgQ==",
+        "DLzHkTjjuH6LpWHo2ITD0Q==",
+        "i8XXN7jcrmhnrOVDV8a2Hw==",
+        "ogcuGHUZJkmv+vCz567a2g==",
+        "rUp5Mfc57+A8Q29SPcvH/Q==",
+        "6706ncrH1OANFnaK6DUMqQ==",
+        "gK7dhke5ChQzlYc/bcIkcg==",
+        "t3Txxjq43e/CtQmfQTKwWg==",
+        "6ZMs9vCzK9lsbS6eyzZlIA==",
+        "uTHBqApdKOAgdwX3cjrCYQ==",
+        "zirOtGUXeRL22ezfotZfQg==",
+        "iK0dWKHjVVexuXvMWJV9pg==",
+        "uzEgwx1iAXAvWPKSVwYSeQ==",
+        "FHvI0IVNvih8tC7JgzvCOw==",
+        "jjNMPXbmpFNsCpWY0cv3eg==",
+        "/cJ0Nn5YbXeUpOHMfWXNHQ==",
+        "WkSJpxBa45XJRWWZFee7hw==",
+        "edlXkskLx287vOBZ9+gVYg==",
+        "+Pl0bSMBAdXpRIA+zE02JA==",
+        "3xw8+0/WU51Yz4TWIMK8mw==",
+        "GdTanUprpE3X/YjJDPpkhQ==",
+        "qnsBdl050y9cUaWxbCczRw==",
+        "pnJnBzAJlO4j3IRqcfmhkQ==",
+        "USq1iF90eUv41QBebs3bhw==",
+        "QH3lAwOYBAJ0Fd5pULAZqw==",
+        "gvvyX5ATi4q9NhnwxRxC8w==",
+        "7xDIG/80SnhgxAYPL9YJtg==",
+        "WVhfn2yJZ43qCTu0TVWJwA==",
+        "twjiDKJM7528oIu/el4Zbg==",
+        "6sBemZt4qY/TBwqk3YcLOQ==",
+        "m3XYojKO+I6PXlVRUQBC3w==",
+        "gUNP5w7ANJm257qjFxSJrA==",
+        "mMLhjdWNnZ8zts9q+a2v3g==",
+        "kjWYVC7Eok2w2YT4rrI+IA==",
+        "ZzT5b0dYQXkQHTXySpWEaA==",
+        "YzTV0esAxBFVls3e0qRsnA==",
+        "9xmtuClkFlpz/X5E9JBWBA==",
+        "nhAnHuCGXcYlqzOxrrEe1g==",
+        "cbBXgB1WQ/i8Xul0bYY2fg==",
+        "AkAes5oErTaJiGD2I4A1Pw==",
+        "Wx9jh/teM0LJHrvTScssyQ==",
+        "fU5ZZ1bIVsV+eXxOpGWo/Q==",
+        "k8eZxqwxiN/ievXdLSEL/w==",
+        "E2LR1aZ3DcdCBuVT7BhReA==",
+        "1eCHcz4swFH+uRhiilOinQ==",
+        "JipruVZx4ban3Zo5nNM37g==",
+        "IPLD9nT5EEYG9ioaSIYuuA==",
+        "pHozgRyMiEmyzThtJnY4MQ==",
+        "p0eNK7zJd7D/HEGaVOrtrQ==",
+        "dGjcKAOGBd4gIjJq7fL+qQ==",
+        "uMq8cDVWFD+tpn8aeP8Pqg==",
+        "gC7gUwGumN7GNlWwfIOjJQ==",
+        "It+K/RCYMOfNrDZxo7lbcA==",
+        "4CfEP8TeMKX33ktwgifGgA==",
+        "nxDGRpePV3H4NChn4eLwag==",
+        "300hoYyMR/mk1mfWJxS8/w==",
+        "DmxgZsQg+Qy1GP0fPkW3VA==",
+        "1vqRt79ukuvdJNyIlIag8Q==",
+        "RWI0HfpP7643OSEZR8kxzw==",
+        "zZtYkKU50PPEj6qSbO5/Sw==",
+        "UNRlg6+CYVOt68NwgufGNA==",
+        "kkbX+a00dfiTgbMI+aJpMg==",
+        "VIC7inSiqzM6v9VqtXDyCw==",
+        "l+x2QhxG8wb5AQbcRxXlmA==",
+        "GUiinC3vgBjbQC2ybMrMNQ==",
+        "6uMF5i0b/xsk55DlPumT7A==",
+        "aK9nybtiIBUvxgs1iQFgsw==",
+        "BLbTFLSb4mkxMaq4/B2khg==",
+        "mTAqtg6oi0iytHQCaSVUsA==",
+        "eBapvE+hdyFTsZ0y5yrahg==",
+        "lHN2dn2cUKJ8ocVL3vEhUQ==",
+        "Mj87ajJ/yR41XwAbFzJbcA==",
+        "FA+nK6mpFWdD0kLFcEdhxA==",
+        "FrTgaF5YZCNkyfR1kVzTLQ==",
+        "5eHStFN7wEmIE+uuRwIlPQ==",
+        "AyWlT+EGzIXc395zTlEU5Q==",
+        "I+wVQA+jpPTJ6xEsAlYucg==",
+        "Y1flEyZZAYxauMo4cmtJ1w==",
+        "1AeReq55UQotRQVKJ66pmg==",
+        "xzGzN5Hhbh0m/KezjNvXbQ==",
+        "meHzY9dIF7llDpFQo1gyMg==",
+        "RnOXOygwJFqrD+DlM3R5Ew==",
+        "JKg64m6mU7C/CkTwVn4ASg==",
+        "gGLz3Ss+amU7y6JF09jq7A==",
+        "Pu9pEf+Tek3J+3jmQNqrKw==",
+        "EATnlYm0p3h04cLAL95JgA==",
+        "o64LDtKq/Fulf1PkVfFcyg==",
+        "hUWqqG1QwYgGC5uXJpCvJw==",
+        "RfSwpO/ywQx4lfgeYlBr2w==",
+        "VaJc9vtYlqJbRPGb5Tf0ow==",
+        "9JKIJrlQjhNSC46H3Cstcw==",
+        "6Z9myGCF5ylWljgIYAmhqw==",
+        "9bAWYElyRN1oJ6eJwPtCtQ==",
+        "ohK6EftXOqBzIMI+5XnESw==",
+        "AVjwqrTBQH1VREuBlOyUOg==",
+        "G2UponGde3/Z+9b2m9abpQ==",
+        "DoiItHSms0B9gYmunVbRkQ==",
+        "vUC0HlTTHj6qNHwfviDtAw==",
+        "hq35Fjgvrcx6I9e6egWS4w==",
+        "sw+bmpzqsM4gEQtnqocQLQ==",
+        "ApiuEPWr8UjuRyJjsYZQBw==",
+        "VXu4ARjq7DS2IR/gT24Pfw==",
+        "3TbRZtFtsh9ez8hqZuTDeA==",
+        "CazLJMJjQMeHhYLwXW7YNg==",
+        "ROSt+NlEoiPFtpRqKtDUrQ==",
+        "IUwVHH6+8/0c+nOrjclOWA==",
+        "lkzFdvtBx5bV6xZO0cxK7g==",
+        "4ekt4m38G9m599xJCmhlug==",
+        "fzkmVWKhJsxyCwiqB/ULnQ==",
+        "LZAKplVoNjeQgfaHqkyEJA==",
+        "91vfsZ7Lx9x5gqWTOdM4sg==",
+        "MVoxyIA+emaulH8Oks8Weg==",
+        "oGH7SMLI2/qjd9Vnhi3s0A==",
+        "vmqfGJE6r4yDahtU/HLrxw==",
+        "Y5KKN7t/v9JSxG/m1GMPSA==",
+        "gXlb7bbRqHXusTE5deolGA==",
+        "/2c4oNniwhL3z5IOngfggg==",
+        "HgIFX42oUdRPu7sKAXhNWg==",
+        "A3dX2ShyL9+WOi6MNJBoYQ==",
+        "hN9bmMHfmnVBVr+7Ibd2Ng==",
+        "DB706G73NpBSRS8TKQOVZw==",
+        "JSyq2MIuObPnEgEUDyALjQ==",
+        "kSUectNPXpXNg+tIveTFRw==",
+        "XVVy3e6dTnO3HpgD6BtwQw==",
+        "td7nDgTDmKPSODRusMcupw==",
+        "Lt/pVD4TFRoiikmgAxEWEw==",
+        "mmRob7iyTkTLDu8ObmTPow==",
+        "Fd0c8f2eykUp9GYhqOcKoA==",
+        "18RKixTv12q3xoBLz6eKiA==",
+        "RClzwwKh51rbB4ekl99EZA==",
+        "oONlXCW4aAqGczQ/bUllBw==",
+        "foPAmiABJ3IXBoed2EgQXA==",
+        "wEJDulZafLuXCvcqBYioFQ==",
+        "K1RgR6HR5uDEQgZ32TAFgA==",
+        "SEIZhyguLoyH7So0p1KY0A==",
+        "ggIfX1J4dX3xQoHnHUI7VA==",
+        "HBRzLacCVYfwUVGzrefZYg==",
+        "aWZRql2IUPVe9hS3dxgVfQ==",
+        "Err1mbWJud80JNsDEmXcYg==",
+        "Z2MkqmpQXdlctCTCUDPyzw==",
+        "JnE6BK0vpWIhNkaeaYNUzw==",
+        "5dUry23poD+0wxZ3hH6WmA==",
+        "DwP0MQf71VsqvAbAMtC3QQ==",
+        "kHcBZXoxnFJ+GMwBZ/xhfQ==",
+        "SUAwMWLMml8uGqagz5oqhQ==",
+        "79uTykH43voFC3XhHHUzKg==",
+        "P5fucOJhtcRIoElFJS4ffg==",
+        "s8NpalwgPdHPla7Zi9FJ3w==",
+        "8cXqZub6rjgJXmh1CYJBOg==",
+        "tY916jrSySzrL+YTcVmYKQ==",
+        "DRiFNojs7wM8sfkWcmLnhQ==",
+        "wqUJ1Gq1Yz2cXFkbcCmzHQ==",
+        "0u+0WHr7WI6IlVBBgiRi6w==",
+        "GCYI9Dn1h3gOuueKc7pdKA==",
+        "nVDxVhaa2o38gd1XJgE3aw==",
+        "5I/heFSQG/UpWGx0uhAqGQ==",
+        "1PvTn90xwZJPoVfyT5/uIQ==",
+        "jHOoSl3ldFYr9YErEBnD3w==",
+        "swJhrPwllq5JORWiP5EkDA==",
+        "tj2rWvF2Fl+XIccctj8Mhw==",
+        "QvYZxsLdu+3nV/WhY1DsYg==",
+        "fKalNdhsyxTt1w08bv9fJA==",
+        "CHLHizLruvCrVi9chj9sXA==",
+        "sa2DECaqYH1z1/AFhpHi+g==",
+        "LbPp1oL0t3K2BAlIN+l8DA==",
+        "5SbwLDNT6sBOy6nONtUcTg==",
+        "AfVPdxD3FyfwwNrQnVNQ7A==",
+        "jt9Ocr9D8EwGRgrXVz//aQ==",
+        "KkwQL0DeUM3nPFfHb2ej+A==",
+        "WwraoO97OTalvavjUsqhxQ==",
+        "fAKFfwlCOyhtdBK6yNnsNg==",
+        "EqMlrz1to7HG4GIFTPaehQ==",
+        "YmjZJyNfHN5FaTL/HAm8ww==",
+        "L2D7G0btrwxl9V4dP3XM5Q==",
+        "oUqO4HrBvkpSL781qAC9+w==",
+        "c6Yhwy/q3j7skXq52l36Ww==",
+        "FWphIPZMumqnXr1glnbK4w==",
+        "AcKwfS8FRVqb72uSkDNY/Q==",
+        "uSIiF1r9F18avZczmlEuMQ==",
+        "XrFDomoH2qFjQ2jJ2yp9lA==",
+        "N2X7KWekNN+fMmwyXgKD5w==",
+        "IdmcpJXyVDajzeiGZixhSA==",
+        "Wf2olJCYZRGTTZxZoBePuQ==",
+        "oVlG+0rjrg2tdFImxIeVBA==",
+        "7w4PDRJxptG8HMe/ijL6cQ==",
+        "rueNryrchijjmWaA3kljYg==",
+        "ZybIEGf1Rn/26vlHmuMxhw==",
+        "yYVW07lOZHdgtX42xJONIA==",
+        "4ifNsmjYf1iOn2YpMfzihg==",
+        "KTjwL+qswa+Bid8xLdjMTg==",
+        "THfzE2G2NVKKfO+A2TjeFw==",
+        "QoqHzpHDHTwQD5UF30NruQ==",
+        "dTMoNd6DDr1Tu8tuZWLudw==",
+        "wOc4TbwQGUwOC1B3BEZ4OQ==",
+        "gfhkPuMvjoC3CGcnOvki3Q==",
+        "vljJciS+uuIvL7XXm5688g==",
+        "EGLOaMe6Nvzs/cmb7pNpbg==",
+        "oLWWIn/2AbKRHnddr2og9g==",
+        "7l0RMKbONGS/goW/M+gnMQ==",
+        "eFkXKRd2dwu/KWI5ZFpEzw==",
+        "jWsC7kdp2YmIZpfXGUimiA==",
+        "Jcxjli2tcIAjCe+5LyvqdQ==",
+        "MUkRa/PjeWMhbCTq43g6Aw==",
+        "g2nh2xENCFOpHZfdEXnoQA==",
+        "x6M66krXSi0EhppwmDmsxA==",
+        "26Wmdp6SkKN74W0/XPcnmA==",
+        "ycjv4XkS5O7zcF3sqq9MwQ==",
+        "gfnbviaVhKvv1UvlRGznww==",
+        "aIPde9CtyZrhbHLK740bfw==",
+        "0p8YbEMxeb73HbAfvPLQRw==",
+        "Is3uxoSNqoIo5I15z6Z2UQ==",
+        "NZtcY8fIpSKPso/KA6ZfzA==",
+        "iQ304I1hmLZktA1d1cuOJA==",
+        "0QB0OUW5x2JLHfrtmpZQ+w==",
+        "kgyUtd8MFe0tuuxDEUZA9w==",
+        "AcbG0e6xN8pZfYAv7QJe1Q==",
+        "bb/U8UynPHwczew/hxLQxw==",
+        "NuBYjwlxadAH+vLWYRZ3bg==",
+        "Ao1Zc0h5AdSHtYt1caWZnQ==",
+        "FL/j3GJBuXdAo54JYiWklQ==",
+        "E2v8Kk60qVpQ232YzjS2ow==",
+        "zVupSPz7cD0v/mD/eUIIjg==",
+        "sEeblUmISi1HK4omrWuPTA==",
+        "xQpYjaAmrQudWgsdu24J0A==",
+        "vCekQ2nOQKiN/q8Be/qwZg==",
+        "8g08gjG/QtvAYer32xgNAg==",
+        "miiOqnhtef1ODjFzMHnxjA==",
+        "sXlFMSTBFnq0STHj6cS/8w==",
+        "+SclwwY8R2RPrnX54Z+A6w==",
+        "g8TcogVxHpw7uhgNFt5VCQ==",
+        "9viAzLFGYYudBYFu7kFamg==",
+        "BAJ+/jbk2HyobezZyB9LiQ==",
+        "/DJgKE9ouibewuZ2QEnk6w==",
+        "fxg/vQq9WPpmQsqQ4RFYaA==",
+        "lM/EhwTsbivA7MDecaVTPw==",
+        "pVgjGg4TeTNhKimyOu3AAw==",
+        "gYnznEt9r97haD/j2Cko7g==",
+        "/ngbFuKIAVpdSwsA3VxvNw==",
+        "VCL3xfPVCL5RjihQM59fgg==",
+        "eDWsx4isnr2xPveBOGc7Hw==",
+        "FIOCTEbzb2+KMCnEdJ7jZw==",
+        "40HzgVKYnqIb6NJhpSIF0A==",
+        "ccK42Lm8Tsv73YMVZRwL6A==",
+        "MpAwWMt7bcs4eL7hCSLudQ==",
+        "zxsSqovedB3HT99jVblCnQ==",
+        "4erEA42TqGA9K4iFKkxMMA==",
+        "BaRwTrc5ulyKbW4+QqD0dw==",
+        "CT3ldhWpS1SEEmPtjejR/Q==",
+        "lkl6XkrTMUpXi46dPxTPxg==",
+        "3EhLkC9NqD3A6ApV6idmgg==",
+        "fsW2DaKYTCC7gswCT+ByQQ==",
+        "pW4gDKtVLj48gNz6V17QdA==",
+        "KjfL7YyVqmCJGBGDFdJ0gw==",
+        "bGGUhiG9SqJMHQWitXTcYQ==",
+        "8RtLlzkGEiisy1v9Xo0sbw==",
+        "R81DX/5a7DYKkS4CU+TL+w==",
+        "Tu6w6DtX2RJJ3Ym3o3QAWw==",
+        "nx/U4Tode5ILux4DSR+QMg==",
+        "mjQS8CpyGnsZIDOIEdYUxg==",
+        "wJpepvmtQQ3sz3tVFDnFqw==",
+        "a4rPqbDWiMivVzaRxvAj7g==",
+        "6o5g9JfKLKQ2vBPqKs6kjg==",
+        "UzPPFSXgeV7KW4CN5GIQXA==",
+        "NdVyHoTbBhX6Umz/9vbi0g==",
+        "Fzuq+Wg7clo6DTujNrxsSA==",
+        "XXFr0WUuGsH5nXPas7hR3Q==",
+        "JVSLiwurnCelNBiG2nflpQ==",
+        "NiawWuMBDo0Q3P2xK/vnLQ==",
+        "nNaGqigseHw30DaAhjBU3g==",
+        "+edqJYGvcy1AH2mEjJtSIg==",
+        "1WIi4I62GqkjDXOYqHWJfQ==",
+        "rwplpbNJz0ADUHTmzAj15Q==",
+        "iWNlSnwrtCmVF89B+DZqOQ==",
+        "tHDbi43e6k6uBgO0hA+Uiw==",
+        "fHNpW230mNib08aB7IM3XQ==",
+        "OChiB4BzcRE8Qxilu6TgJg==",
+        "d+ctfXU0j07rpRRzb5/HDA==",
+        "GDMqfhPQN0PxfJPnK1Bb9A==",
+        "bLd38ZNkVeuhf0joEAxnBQ==",
+        "nvUKoKfC6j8fz3gEDQrc/w==",
+        "fhcbn9xE/6zobqQ2niSBgA==",
+        "HGxe+5/kkh6R9GXzEOOFHA==",
+        "mPwCyD0yrIDonVi+fhXyEQ==",
+        "5PfGtbH9fmVuNnq83xIIgQ==",
+        "XePy/hhnQwHXFeXUQQ55Vg==",
+        "yfAaL0MMtSXPQ37pBdmHxQ==",
+        "NiQ/m4DZXUbpca9aZdzWAw==",
+        "uT6WRh5UpVdeABssoP2VTg==",
+        "oxoZP897lgMg/KLcZAtkAg==",
+        "oKt57TPe4PogmsGssc3Cbg==",
+        "RxmdoO8ak8y/HzMSIm+yBQ==",
+        "6leyDVmC5jglAa98NQ3+Hg==",
+        "+QosBAnSM2h4lsKuBlqEZw==",
+        "hy303iin+Wm7JA6MeelwiQ==",
+        "m9iuy4UtsjmyPzy6FTTZvw==",
+        "f6Ye5F0Lkn34uLVDCzogFQ==",
+        "iGykaF+h4p46HhrWqL8Ffg==",
+        "LPYFDbTEp5nGtG6uO8epSw==",
+        "t2vWMIh2BvfDSQaz5T1TZw==",
+        "OONAvFS/kmH7+vPhAGTNSg==",
+        "g/z9yk94XaeBRFj4hqPzdw==",
+        "2wesXiib76wM9sqRZ7JYwQ==",
+        "n7h9v2N1gOcvMuBEf8uThw==",
+        "ITYL3tDwddEdWSD6J6ULaA==",
+        "inrUwXyKikpOW0y2Kl1wGw==",
+        "iwKBOGDTFzV4aXgDGfyUkw==",
+        "+fcjH2kZKNj8quOytUk4nQ==",
+        "Srl4HivgHMxMOUHyM3jvNw==",
+        "qngzBJbiTB4fivrdnE5gOg==",
+        "G0MlFNCbRjXk4ekcPO/chQ==",
+        "t+bYn9UqrzKiuxAYGF7RLA==",
+        "RVD3Ij6sRwwxTUDAxwELtA==",
+        "RNdyt6ZRGvwYG5Ws3QTuEA==",
+        "9DRHdyX8ECKHUoEsGuqR4Q==",
+        "oMJLQTH1wW7LvOV0KRx/dw==",
+        "bjLZ7ot/X/vWSVx4EYwMCg==",
+        "+p8pofUlwn8vV6Rp6+sz9g==",
+        "cchuqe+CWCJpoakjHLvUfA==",
+        "NvurnIHin4O+wNP7MnrZ1w==",
+        "RBMv0IxXEO3o7MnV47Bzow==",
+        "xTizUioizbMQxD0T6fy/EQ==",
+        "ZCdad3AwhVArttapWFwT/Q==",
+        "Hy1nqC40l5ItxumkIC2LAA==",
+        "W/5ThNLu43uT1O+fg0Fzwg==",
+        "b3BQG9/9qDNC/bNSTBY/sQ==",
+        "neQoa8pvETr07blVMN3pgA==",
+        "oR8rvIZoeoaZ/ufpo0htfQ==",
+        "zEzWZ6l7EKoVUxvk/l78Mw==",
+        "IHyIeMad23fSDisblwyfpA==",
+        "m6srF+pMehggHB1tdoxlPg==",
+        "kggaIvN2tlbZdZRI8S5Apw==",
+        "2RFaMPlSbVuoEqKXgkIa5A==",
+        "//eHwmDOQRSrv+k9C/k3ZQ==",
+        "X/Gha4Ajjm/GStp/tv+Jvw==",
+        "+H0Rglt/HnhZwdty2hsDHg==",
+        "a1aL8zQ+ie3YPogE3hyFFg==",
+        "HxEU37uBMeiR5y8q/pM42g==",
+        "68nqDtXOuxF7DSw6muEZvg==",
+        "s5+78jS4hQYrFtxqTW3g1Q==",
+        "drfODfDI6GyMW7hzkmzQvA==",
+        "pT1raq2fChffFSIBX3fRiA==",
+        "sfowXUMdN2mCoBVrUzulZg==",
+        "AV/YJfdoDUdRcrXVwinhQg==",
+        "3AKEYQqpkfW7CZMFQZoxOw==",
+        "PHwJ5ZAqqftZ4ypr8H1qiQ==",
+        "AoN/pnK4KEUaGw4V9SFjpg==",
+        "soBA65OmZdfBGJkBmY/4Iw==",
+        "mSstwJq7IkJ0JBJ5T8xDKg==",
+        "h13Xuonj+0dD1xH86IhSyQ==",
+        "HK9xG03FjgCy8vSR+hx8+Q==",
+        "oFanDWdePmmZN0xqwpUukA==",
+        "zCRZgVsHbQZcVMHd9pGD3A==",
+        "EvSB+rCggob2RBeXyDQRvQ==",
+        "tXuu7YpZOuMLTv87NjKerA==",
+        "DJ+a37tCaGF5OgUhG+T0NA==",
+        "KkXlgPJPen6HLxbNn5llBw==",
+        "2W6lz1Z7PhkvObEAg2XKJw==",
+        "n+xYzfKmMoB3lWkdZ+D3rg==",
+        "CPDs+We/1wvsGdaiqxzeCQ==",
+        "2Wvk/kouEEOY0evUkQLhOQ==",
+        "ezsm4aFd6+DO9FUxz0A8Pg==",
+        "9sYLg75/hudZaBA3FrzKHw==",
+        "Pp1ZMxJ8yajdbfKM4HAQxA==",
+        "xiyRfVG0EfBA+rCk+tgWRQ==",
+        "/IarsLzJB8bf0AupJJ+/Eg==",
+        "LJeLdqmriyAQp+QjZGFkdQ==",
+        "IhHyHbHGyQS+VawxteLP0w==",
+        "nGzPc0kI/EduVjiK7bzM6Q==",
+        "m06wctjNc3o7iyBHDMZs2w==",
+        "mSJF9dJnxZ15lTC6ilbJ2A==",
+        "xdmY+qyoxxuRZa9kuNpDEg==",
+        "oNOI17POQCAkDwj6lJsYOA==",
+        "p73gSu4d+4T/ZNNkIv9Nlw==",
+        "vOJ55zFdgPPauPyFYBf01w==",
+        "4A+RHIw+aDzw0rSRYfbc7g==",
+        "/gi3UZmunVOIXhZSktZ8zQ==",
+        "a6vem8n6WmRZAalDrHNP0g==",
+        "kGeXrHEN6o7h5qJYcThCPw==",
+        "wrewZ0hoHODf7qmoGcOd7g==",
+        "Z0sjccxzKylgEiPCFBqPSA==",
+        "LKyOFgUKKGUU/PxpFYMILw==",
+        "L2RofFWDO0fVgSz4D2mtdw==",
+        "KI7tQFYW38zYHOzkKp9/lQ==",
+        "ewe/P3pJLYu/kMb5tpvVog==",
+        "IADk81pIu8NIL/+9Fi94pA==",
+        "0L0FVcH5Dlj3oL8+e9Na7g==",
+        "tdiTXKrkqxstDasT0D5BPA==",
+        "R906Kxp2VFVR3VD+o6Vxcw==",
+        "wc+8ohFWgOF4VlSYiZIGwQ==",
+        "wJKFMqh6MGctWfasjHrPEg==",
+        "UHpge5Bldt9oPGo2oxnYvQ==",
+        "vX7RIhatQeXAMr1+OjzhZw==",
+        "s2AKVTwrY65/SWqQxDGJQg==",
+        "Q4bfQslDSqU64MOQbBQEUw==",
+        "mVT74Eht+gAowINoMKV7IQ==",
+        "EuGWtIbyKToOe6DN3NkVpQ==",
+        "ALlGgVDO8So71ccX0D6u2g==",
+        "Rww3qkF3kWSd+AaMT0kfdw==",
+        "hlvtFGW8r0PkbUAYXEM+Hw==",
+        "Oc3BqTF3ZBW3xE0QsnFn/A==",
+        "3j0kFUZ6g+yeeEljx+WXGg==",
+        "8BLkvEkfnOizJq0OTCYGzw==",
+        "Lqel4GdU0ZkfoJVXI5WC/Q==",
+        "rvE64KQGkVkbl07y7JwBqw==",
+        "HbXv8InyZqFT7i3VrllBgg==",
+        "zwQ/3MzTJ9rfBmrANIh14w==",
+        "gglLMohmJDPRGMY1XKndjQ==",
+        "lyfqic/AbEJbCiw+wA01FA==",
+        "XqUO7ULEYhDOuT/I2J8BOA==",
+        "wPhJcp7U7IVX83szbIOOxQ==",
+        "1gA65t5FiBTEgMELTQFUPQ==",
+        "ll2M0QQzBsj5OFi02fv3Yg==",
+        "wt+qDLU38kzNU75ZYi3Hbw==",
+        "a4EYNljinYTx9vb1VvUA6A==",
+        "T6LA+daQqRI38iDKZTdg1A==",
+        "gwyVIrTk5o0YMKQq4lpJ+Q==",
+        "bPRX2zl+K1S0iWAWUn1DZw==",
+        "KQw25X4LnQ9is+qdqfxo0w==",
+        "6tfM6dx3R5TiVKaqYQjnCg==",
+        "OlwHO6Sg2zIwsCOCRu0HiQ==",
+        "mr1qjhliRfl87wPOrJbFQg==",
+        "8c+lvG5sZNimvx9NKNH3ug==",
+        "5Nk2Z94DhlIdfG5HNgvBbQ==",
+        "F50iXjRo1aSTr37GQQXuJA==",
+        "tfgO55QqUyayjDfQh+Zo1Q==",
+        "h7Fc+eT/GuC8iWI+YTD0UQ==",
+        "3TjntNWtpG7VqBt3729L6Q==",
+        "+DWs0vvFGt6d3mzdcsdsyA==",
+        "VJt2kPVBLEBpGpgvuv1oUw==",
+        "XLq/nWX8lQqjxsK9jlCqUg==",
+        "9s3ar9q32Y5A3tla5GW/2Q==",
+        "51yLpfEdvqXmtB6+q27/AQ==",
+        "AiMtfedwGcddA+XYNc+21g==",
+        "p/48hurJ1kh2FFPpyChzJg==",
+        "CRiL6zpjfznhGXhCIbz8pQ==",
+        "/jDVt9dRIn+o4IQ1DPwbsg==",
+        "UNdKik7Vy23LjjPzEdzNsg==",
+        "Koiog/hpN7ew5kgJbty34A==",
+        "4itEKfbRCJvqlgKnyEdIOQ==",
+        "zi04Yc01ZheuFAQc59E45A==",
+        "etRjRvfL/IwceY/IJ1tgzQ==",
+        "3sNJJIx1NnjYcgJhjOLJOg==",
+        "4yVqq66iHYQjiTSxGgX2oA==",
+        "Q8RVI/kRbKuXa8HAQD7zUA==",
+        "OERGn45uzfDfglzFFn6JAg==",
+        "JGEy6VP3sz3LHiyT2UwNHQ==",
+        "1zDfWw5LdG20ClNP1HYxgw==",
+        "TGB+FIzzKnouLh5bAiVOQg==",
+        "n5GA+pA9mO/f4RN9NL9lNg==",
+        "bUxQBaqKyvlSHcuRL9whjg==",
+        "tOdlnsE3L3XCBDJRmb/OqA==",
+        "XdkxmYYooeDKzy7PXVigBQ==",
+        "PMvG4NqJP76kMRAup6TSZA==",
+        "qpFJZqzkklby+u1UT3c1iA==",
+        "fW3QZyq5UixIA1mP6eWgqQ==",
+        "9nMltdrrBmM5ESBY2FRjGA==",
+        "1Vtrv6QUAfiYQjlLTpNovg==",
+        "ur9JDCVNwzSH4q4ngDlHNQ==",
+        "4u3eyKc+y3uRnkASrgBVUw==",
+        "XddlSluOH6VkR7spFIFmdQ==",
+        "NOmu8oZc6CcKLu+Wfz2YOQ==",
+        "3Ejtsqw3Iep/UQd0tXnSlg==",
+        "y/e3HSdg7T19FanRpJ7+7Q==",
+        "YodhkayN5wsgPZEYN7/KNA==",
+        "pZfn6IiG+V28fN8E2hawDQ==",
+        "jGHMJqbj6X1NdTDyWmXYAQ==",
+        "olTSlmirL9MFhKORiOKYkQ==",
+        "CrJDgdfzOea2M2hVedTrIg==",
+        "fpXijBOM3Ai1RkmHven5Ww==",
+        "eLYKLr4labZeLiRrDJ9mnA==",
+        "9vmJUS7WIVOlhMqwipAknQ==",
+        "G7J/za99BFbAZH+Q+/B8WA==",
+        "Hb+pdSavvJ9lUXkSVZW8Og==",
+        "gTB2zM3RPm27mUQRXc/YRg==",
+        "e5KCqQ/1GAyVMRNgQpYf6g==",
+        "1ApqwW7pE+XUB2Cs2M6y7g==",
+        "/wiA2ltAuWyBhIvQAYBTQw==",
+        "HFCQEiZf7/SNc+oNSkkwlA==",
+        "JFi6N1PlrpKaYECOnI7GFg==",
+        "E4ojRDwGsIiyuxBuXHsKBA==",
+        "+25t/2lo0FUEtWYK8LdQZQ==",
+        "up2MVDi9ve+s83/nwNtZ7Q==",
+        "cXpfd6Io6Glj2/QzrDMCvA==",
+        "DCvI9byhw0wOFwF1uP6xIQ==",
+        "PibGJQNw7VHPTgqeCzGUGA==",
+        "0ZRGz+oj2infCAkuKKuHiQ==",
+        "2QS/6OBA1T01NlIbfkTYJg==",
+        "P14k+fyz0TG9yIPdojp52w==",
+        "g5EzTJ0KA4sO3+Opss3LMg==",
+        "R5oOM58zdbVxFSDQnNWqeA==",
+        "Vg2E5qEDfC+QxZTZDCu9yQ==",
+        "YPgMthbpcBN2CMkugV60hQ==",
+        "gZWTFt5CuLqMz6OhWL+hqQ==",
+        "YrEP9z2WPQ8l7TY1qWncDA==",
+        "7p4NpnoNSQR7ISg+w+4yFg==",
+        "9L6yLO93sRN70+3qq3ObfA==",
+        "QH36wzyIhh6I56Vnx79hRA==",
+        "9DtM1vls4rFTdrSnQ7uWXw==",
+        "ZlOAnCLV1PkR0kb3E+Nfuw==",
+        "9UhKmKtr4vMzXTEn74BEhg==",
+        "Ndx5LDiVyyTz/Fh3oBTgvA==",
+        "mXZ4JeBwT2WJQL4a/Tm4jQ==",
+        "N9nD7BGEM7LDwWIMDB+rEQ==",
+        "dmAfbd9F0OJHRAhNMEkRsA==",
+        "jV/D2B11NLXZRH77sG9lBw==",
+        "1C50kisi9nvyVJNfq2hOEQ==",
+        "NMbAjbnuK7EkVeY3CQI5VA==",
+        "J1nYqJ7tIQK1+a/3sMXI/Q==",
+        "m416yrrAlv+YPClGvGh+qQ==",
+        "rLZII1R6EGus+tYCiUtm6g==",
+        "xktOghh1S9nIX6fXWnT+Ug==",
+        "FcFcn4qmPse5mJCX5yNlsA==",
+        "xAAipGfHTGTjp9Qk1MR8RQ==",
+        "RQOlmzHwQKFpafKPJj0D8w==",
+        "WRjYdKdtnd1G9e/vFXCt0g==",
+        "z0BU//aSjYHAkGGk3ZSGNg==",
+        "M55eersiJuN9v61r8DoAjQ==",
+        "l2mAbuFF3QBIUILDODiUHQ==",
+        "IhpXs1TK7itQ3uTzZPRP5Q==",
+        "t2EkpUsLOEOsrnep0nZSmA==",
+        "lMaO8Yf+6YNowGyhDkPhQA==",
+        "UbSFw5jtyLk5MealqJw++A==",
+        "5u2PdDcIY3RQgtchSGDCGg==",
+        "MQYM3BT77i35LG9HcqxY2Q==",
+        "8AfCSZC0uasVON9Y/0P2Pw==",
+        "evaWFoxZNQcRszIRnxqB+A==",
+        "+8PiQt6O7pJI/nIvQpDaAg==",
+        "eRwaYiog2DdlGQyaltCMJg==",
+        "JyUJEnU6hJu8x2NCnGrYFw==",
+        "l0E0U/CJsyCVSTsXW4Fp+w==",
+        "XV13yK0QypJXmgI+dj4KYw==",
+        "jrRH0aTUYCOpPLZwzwPRfQ==",
+        "N3YDSkBUqSmrmNvZZx4a1Q==",
+        "0yJ7TQYzcp3DXVSvwavr+w==",
+        "rhgtLQh0F9bRA6IllM7AGw==",
+        "IWZnTJ3Hb9qw9HAK/M9gTw==",
+        "izeyFvXOumNgVyLrbKW45g==",
+        "xYD8jrCDmuQna+p1ebnKDQ==",
+        "SOdpdrk2ayeyv0xWdNuy9g==",
+        "HYylUirJRqLm+dkp39fSOQ==",
+        "q4z6A4l3nhX3smTmXr+Sig==",
+        "Zyo0fzewcqXiKe2mAwKx5g==",
+        "LMEtzh0+J27+4zORfcjITw==",
+        "LoUv/f2lcWpjftzpdivMww==",
+        "mXBfDUt/sBW5OUZs2sihvw==",
+        "PggVPQL5YKqSU/1asihcrg==",
+        "mI0eT4Rlr7QerMIngcu/ng==",
+        "NmQrsmb8PVP05qnSulPe5Q==",
+        "TcyyXrSsQsnz0gJ36w4Dxw==",
+        "y4mfEDerrhaqApDdhP5vjA==",
+        "ynaj4XjU27b7XbqPyxI8Ig==",
+        "Ua6aO6HwM+rY4sPR19CNFA==",
+        "3go7bJ9WqH/PPUTjNP3q/Q==",
+        "n1ixvP7SfwYT3L2iWpJg6A==",
+        "W8y32OLHihfeV0XFw7LmOg==",
+        "uzkNhmo2d08tv5AmnyqkoQ==",
+        "hJ8leLNuJ6DK5V8scnDaZQ==",
+        "KodYHHN62zESrXUye7M01g==",
+        "H+yPRiooEh5J7lAJB4RZ7Q==",
+        "dZg5w8rFETMp9SgW7m0gfg==",
+        "LsmsPokAwWNCuC74MaqFCQ==",
+        "1QGhj9NONF2rC44UdO+Izw==",
+        "uwGivY3/C9WK+dirRPJZ4A==",
+        "rXGWY/Gq+ZEsmvBHUfFMmQ==",
+        "j4FBMnNfdBwx0VsDeTvhFg==",
+        "81nkjWtpBhqhvOp6K8dcWg==",
+        "dCDaYYrgASXPMGFRV0RCGg==",
+        "Kj1QI+s9261S3lTtPKd9eg==",
+        "LblwOqNiciHmt2NXjd89tg==",
+        "46piyANQVvvLqcoMq5G8tQ==",
+        "XJihma9zSRrXLC+T+VcFDA==",
+        "K3NBEG8jJTJbSrYSOC3FKw==",
+        "cT3PwwS6ALZA/na9NjtdzA==",
+        "wJ4uCrl4DPg70ltw1dZO3w==",
+        "JATLdpQm//SQnkyCfI5x7Q==",
+        "X1PaCfEDScclLtOTiF5JUw==",
+        "444F9T6Y7J67Y9sULG81qg==",
+        "8JVHFRwAd/SCLU0CRJYofg==",
+        "aLh1XEUrfR9W82gzusKcOg==",
+        "U+bB5NjFIuQr/Y5UpXHwxA==",
+        "Egs14xVbRWjfBBX7X5Z60g==",
+        "KSorNz/PLR/YYkxaj1fuqw==",
+        "RDgGGxTtcPvRg/5KRRlz4w==",
+        "5T39s5CtSrK5awMPUcEWJg==",
+        "+PUVXkoTqHxJHO18z4KMfw==",
+        "Bvk8NX4l6WktLcRDRKsK/A==",
+        "kNGIV3+jQmJlZDTXy1pnyA==",
+        "E3jMjAgXwvwR8PA53g4+PQ==",
+        "MbI04HlTGCoc/6WDejwtaQ==",
+        "aEnHUfn7UE/Euh6jsMuZ7g==",
+        "z4Bft++f72QeDh4PWGr/sw==",
+        "1lCcQWGDePPYco4vYrA5vw==",
+        "iu5csar0IQQBOTgw5OvJwQ==",
+        "raKMXnnX6PFFsbloDqyVzQ==",
+        "uPnL9tboMZo0Kl2fe24CmA==",
+        "8OFxXwnPmrogpNoueZlC4Q==",
+        "V6CRKrKezPwsRdbm0DJ2Yg==",
+        "xmGgK3W5y+oCd0K2u8XjZQ==",
+        "Ry3zgZ6KHrpNyb7+Tt2Pkw==",
+        "IwLbkL33z+LdTjaFYh93kg==",
+        "caepyBOAFu0MxbcXrGf6TA==",
+        "iIWxFdolLcnXqIjPMg+5kQ==",
+        "P430CeF2MDkuq11YdjvV8A==",
+        "yCu+DVU/ceMTOZ5h/7wQTg==",
+        "4mQVNv7FHj+/O6XFqWFt/Q==",
+        "OEJ40VmMDYzc2ESEMontRA==",
+        "D66Suu3tWBD+eurBpPXfjA==",
+        "RNK9G1hfuz3ETY/RmA9+aA==",
+        "BYpHADmEnzBsegdYTv8B5Q==",
+        "DBKrdpCE0awppxST4o/zzg==",
+        "KOmdvm+wJuZ/nT/o1+xOuw==",
+        "gDxqUdxxeXDYhJk9zcrNyA==",
+        "UPzS4LR3p/h0u69+7YemrQ==",
+        "hf9HFxWRNX2ucH8FLS7ytA==",
+        "ozVqYsmUueKifb4lDyVyrg==",
+        "TfHvdbl2M4deg65QKBTPng==",
+        "SzCGM8ypE58FLaR1+1ccxQ==",
+        "3nthUmLZ30HxQrzr2d7xFA==",
+        "1jBaRO8Bg5l6TH7qJ8EPiw==",
+        "eJlcN+gJnqAnctbWSIO9uA==",
+        "G8LFBop8u6IIng+gQuVg3w==",
+        "3JhnM6G4L06NHt31lR0zXA==",
+        "342VOUOxoLHUqtHANt83Hw==",
+        "hRxbdeniAVFgKUgB9Q3Y+g==",
+        "cFFE2R4GztNoftYkqalqUQ==",
+        "YmaksRzoU+OwlpiEaBDYaQ==",
+        "jon1y9yMEGfiIBjsDeeJdA==",
+        "oSnrpW4UmmVXtUGWqLq+tQ==",
+        "zaqyy3GaJ7cp8qDoLJWcTw==",
+        "luO1R8dUM9gy1E2lojRQoA==",
+        "YHM6NNHjmodv+G0mRLK7kw==",
+        "ZSmN8mmI9lDEHkJqBBg0Nw==",
+        "520wTzrysiRi2Td92Zq0HQ==",
+        "RAAw14BA1ws5Wu/rU7oegw==",
+        "vb6Agwzk4JG0Nn7qRPPFMQ==",
+        "joDXdLpXvRjOqkRiYaD/Sw==",
+        "dK2DU3t1ns+DWDwfBvH3SQ==",
+        "gZNJ1Qq6OcnwXqc+jXzMLQ==",
+        "R8ULpSNu9FcCwXZM0QedSg==",
+        "mc45FSMtzdw2PTcEBwHWPw==",
+        "d0qvm3bl38rRCpYdWqolCQ==",
+        "o9tdzmIu+3J/EYU4YWyTkA==",
+        "5eXpiczlRdmqMYSaodOUiQ==",
+        "KYuUNrkTvjUWQovw9dNakA==",
+        "02im2RooJQ/9UfUrh5LO+A==",
+        "kWPUUi7x9kKKa6nJ+FDR5Q==",
+        "6z8CRivao3IMyV4p4gMh7g==",
+        "SmRWEzqddY9ucGAP5jXjAg==",
+        "DJscTYNFPyPmTb57g/1w+Q==",
+        "uOHrw37yF9oLLVd16nUpeg==",
+        "HaIRV9SNPRTPDOSX9sK/bg==",
+        "K4yZNVoqHjXNhrZzz2gTew==",
+        "bTNRjJm+FfSQVfd56nNNqQ==",
+        "x5lyMArsv1MuJmEFlWCnNw==",
+        "cxpZ4bloGv734LBf4NpVhA==",
+        "kUudvRfA33uJDzHIShQd3Q==",
+        "3Wfj05vCLFAB9vII5AU9tw==",
+        "FUQySDFodnRhr+NUsWt0KA==",
+        "eC/RcoCVQBlXdE9WtcgXIw==",
+        "NoX8lkY+kd2GPuGjp+s0tQ==",
+        "EzjbinBHx3Wr08eXpH3HXA==",
+        "0VsaJHR0Ms8zegsCpAKoyg==",
+        "e2xLFVavnZIUUtxJx+qa1g==",
+        "Kt6BTG1zdeBZ3nlVk+BZKQ==",
+        "EUXQZwLgnDG+C8qxVoBNdw==",
+        "0SkC/4PtnX1bMYgD6r6CLA==",
+        "rzj6mjHCcMEouL66083BAg==",
+        "V5HEaY3v9agOhsbYOAZgJA==",
+        "tJt6VDdAPEemBUvnoc4viA==",
+        "g0lWrzEYMntVIahC7i0O2g==",
+        "zCpibjrZOA3FQ4lYt0WoVA==",
+        "4Xh/B3C16rrjbES+FM1W8g==",
+        "GHEdXgGWOeOa6RuPMF0xXg==",
+        "3kREs/qaMX0AwFXN0LO5ow==",
+        "GLDNTSwygNBmuFwCIm7HtA==",
+        "JBkbaBiorCtFq9M9lSUdMg==",
+        "rJCuanCy51ydVD4nInf9IQ==",
+        "OzFRv+PzPqTNmOnvZGoo5g==",
+        "7mxU5fJl/c6dXss9H3vGcQ==",
+        "9J53kk+InE3CKa7cPyCXMw==",
+        "x9TIZ9Ua++3BX+MpjgTuWA==",
+        "h0MH5NGFfChgmRJ3E/R3HQ==",
+        "25w3ZRUzCvJwAVHYCIO5uw==",
+        "1Wc8jQlDSB4Dp32wkL2odw==",
+        "ipPPjxpXHS1tcykXmrHPMQ==",
+        "r95wJtP5rsTExKMS7QhHcw==",
+        "TZT86wXfzFffjt0f95UF5w==",
+        "VpmBstwR7qPVqPgKYQTA3g==",
+        "3++dZXzZ6AFEz7hK+i5hww==",
+        "mAiD16zf+rCc7Qzxjd5buA==",
+        "1JI9bT92UzxI8txjhst9LQ==",
+        "TNyvLixb03aP2f8cDozzfA==",
+        "spHVvA/pc7nF9Q4ON020+w==",
+        "GA8k6GQ20DGduVoC+gieRA==",
+        "T7waQc3PvTFr0yWGKmFQdQ==",
+        "P0Pc8owrqt6spdf7FgBFSw==",
+        "DKApp/alXiaPSRNm3MfSuA==",
+        "UreSZCIdDgloih8KLeX7gg==",
+        "xJi0T+psHOXMivSOVpMWeQ==",
+        "cNsC9bH30eM1EZS6IdEdtQ==",
+        "XjjrIpsmATV/lyln4tPb+g==",
+        "qt5CsMts2aD4lw/4Q6bHYQ==",
+        "h+KRDKIvyVUBmRjv1LcCyg==",
+        "2j83jrPwPfYlpJJ2clEBYQ==",
+        "ZrCezGLz38xKmzAom6yCTQ==",
+        "SEGu+cSbeeeZg4xWwsSErQ==",
+        "Duz/8Ebbd0w6oHwOs0Wnwg==",
+        "Ci7sS7Yi1+IwAM3VMAB4ew==",
+        "DG2Qe2DqPs5MkZPOqX363Q==",
+        "v0Bvws1WYVoEgDt8xmVKew==",
+        "CtDj/h2Q/lRey20G8dzSgA==",
+        "WRoJMO0BCJyn5V6qnpUi4Q==",
+        "RQywrOLZEKw9+kG6qTzr3g==",
+        "mU4CqbAwpwqegxJaOz9ofQ==",
+        "aN5x46Gw1VihRalwCt1CGg==",
+        "U6VQghxOXsydh3Naa5Nz4A==",
+        "YA+zdEC+yEgFWRIgS1Eiqw==",
+        "oPcxgoismve6+jXyIKK6AQ==",
+        "PqLCd/pwc+q5GkL6MB0jTg==",
+        "fHL+fHtDxhALZFb9W/uHuw==",
+        "dhTevyxTYAuKbdLWhG47Kw==",
+        "VllbOAjeW3Dpbj5lp2OSmA==",
+        "3itfXtlLPRmPCSYaSvc39Q==",
+        "GNak/LFeoHWlTdLW1iU4eg==",
+        "HuDuxs2KiGqmeyY1s1PjpQ==",
+        "xs8J3cesq7lDhP/dNltqOw==",
+        "foXSDEUwMhfHWJSmSejsQg==",
+        "6fWom3YoKvW6NIg6y9o9CQ==",
+        "NhZbSq0CjDNOAIvBHBM9zA==",
+        "5w4FbRhWACP7k2WnNitiHg==",
+        "0UeRwDID2RBIikInqFI7uw==",
+        "/y/jHHEpUu5TR+R2o96kXA==",
+        "voO3krg4sdy4Iu+MZEr8+g==",
+        "hdzol5dk//Q6tCm4+OndIA==",
+        "Nc5kiwXCAyjpzt43G5RF1A==",
+        "3UBYBMejKInSbCHRoJJ7dg==",
+        "dRFCIbVu0Y8XbjG5i+UFCQ==",
+        "t8pjhdyNJirkvYgWIO/eKg==",
+        "FAXzjjIr8l1nsQFPpgxM/g==",
+        "SPGpjEJrpflv1hF0qsFlPw==",
+        "9Y1ZmfiHJd9vCiZ6KfO1xQ==",
+        "7Eqzyb+Kep+dIahYJWNNxQ==",
+        "9rL8nC/VbSqrvnUtH9WsxQ==",
+        "H4FZ5Wcnb40hQM1DMGGe8A==",
+        "AjoXWGb/l9xH/hscgEc6kQ==",
+        "6nzFl41uutgDdC30oOeCqg==",
+        "3jo1jRy3MybXtoLR+JIbJw==",
+        "mXdE08dv+OlIhlcqMBH2Gg==",
+        "Ifd7DI6o8N5gnyAKqZTlRw==",
+        "JNUvg/kxL3rdcZnD4IqUxw==",
+        "ry8B+sAHNeFIZHCCDynFyw==",
+        "TXaEd5lIKhzjcncfNcBgSg==",
+        "Mr3ehuDMUimOSn+FlkchdA==",
+        "cwiGhjmX9v8I7E/ekQ0h+g==",
+        "I/r5+1jnqumCPprKC/2BqA==",
+        "S4V3MfGYk8I4fd3WH09yYw==",
+        "A+crVyUeynAkEMYKbnFjZw==",
+        "vtyHcNQPcUTRuZcQvRUX4Q==",
+        "UNKx1ZVv3HNp21zrUSm6ew==",
+        "rsAlvGLv2D0swd6ol3WlvA==",
+        "2qwqb8ENAR2fpQnw55sPDw==",
+        "xBJJuYYnsTJOeFggZSKC4Q==",
+        "omvtZZKruPiEt6fV0YXTdg==",
+        "JZEgKUhUN+USJsvtF4HZOg==",
+        "euG/kpJ5elSDOGNbWWDfNQ==",
+        "DiiVmM6/WNcp0MUjSaFq6w==",
+        "QCNS8gAml1M2pJ+MxZsueg==",
+        "M6+pggFsHfM3alFxcMOFNQ==",
+        "YLoWpDTwXnszEQm8FA164Q==",
+        "N08oUZtlXbQvO9t3vXnGog==",
+        "jkjuJowWuOa4CLY+RZiErQ==",
+        "mPf+S+6oAoVIYEVveaiNFA==",
+        "R0iVyo5qreP/68uZlZphDA==",
+        "GYlqhQgp03B0mXpUhQ+ZCA==",
+        "lQNbmWD7PhwNGye+zbc3GQ==",
+        "cNeaOJEOzUSDdRmenPQyuw==",
+        "Gp66/Txv6ebv5bn85TuQtA==",
+        "xAda6DVkcvvqhI8vWZeGyA==",
+        "Ggk1Qa0lEdAgCXG6SmCkBA==",
+        "MYuO7ZURXtyaf56q7hH4Zw==",
+        "RUIdZRTgJBudWUZQFgiFaQ==",
+        "bgFJxLirUom2zT0h7LdOpw==",
+        "A2gaOpIlrS7TKVQgy9XMSw==",
+        "zevXp0lqqnXv9X6Bgmjtqg==",
+        "a5iuFqWAdFFsRgp7SFYwNg==",
+        "TxTy0TaDsWTcRH3wdBEQLQ==",
+        "jephVdKDeJIhXPrdMOJ4qA==",
+        "C4KdamfqUPuJ3RGFdpIEdw==",
+        "zl6l2Ioz1qovRUIWrSyxVA==",
+        "+gGaDxUe0UnNrf3PPg1qQQ==",
+        "1HgbrlaLMHS6Qj/0kkaJxg==",
+        "eGxTly6Pnu7eV/MKYMmuYw==",
+        "RAMKfnlrzNjpyh2BWt6JHg==",
+        "4pZQm9ogCZ/EAR9pjJm1eA==",
+        "l1zv3erwXIegQFd02NlCag==",
+        "uHGyRZchuA4ulmuD5LqquQ==",
+        "/vFu89tsV+lbcoiqM/XWog==",
+        "63SUgqfQimrmjvy/bEDQ0w==",
+        "JLHuf+FlChFDa9LYfTQ4Eg==",
+        "I+ZnPePTFX8ZODe14bxgyA==",
+        "CtoK1k3U82BkvzuPfQ4pjQ==",
+        "6nqQm4C7y+wZ+qX0kVjwmA==",
+        "+C3kBxRXIjqBk0EJxe3Xfg==",
+        "qVu748pIxEZtiywg4/4qhw==",
+        "07o+sKjjRCYkwy/ACyoYhg==",
+        "CiLF4dkbLURekBcQbwPUVA==",
+        "W/N5/nkp4iQIPYfAagVV7A==",
+        "3PJOphhEjw0E4arTfVVwdg==",
+        "YdMbARHwB+bSOd0PlTlXiA==",
+        "41hbx5Yr7UWxsV6+bWUYUA==",
+        "SqJHXD0MorNwHtHL9TbWLg==",
+        "pWKGUzm/muwOiBtzkRMnRg==",
+        "az9zZ7HTa4FJGRQMcamvEw==",
+        "zavAAN8C9Wo8oBLyztp63Q==",
+        "yBAnPmwrMJ8kpPP292S/Lw==",
+        "E6szQhjuUAz2e0h9ffQfEQ==",
+        "Fs3cQxQyS9kM4T8j5R7rWw==",
+        "GB5fRLZxnjRUfEe0SwcePQ==",
+        "+9OY8xkT9dM/rb2T6ACtOQ==",
+        "If2xFBD1p91iDD7ZrsfgjA==",
+        "QCFfoMhy8EleZAOpfRY88w==",
+        "NobWPk1Z6bHt5s9NHXt/pg==",
+        "nK6T4vV4384OIcqO5tQMhA==",
+        "Zov1EzK+VomiuwT1+ulQ8g==",
+        "pF98OKDvLUlnTzo7wmlpOw==",
+        "Wrq9YDsieAMC3Y2DSY5Rcg=="
+    ]
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/newtab/newTab.xul firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/newtab/newTab.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/newtab/newTab.xul	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/newtab/newTab.xul	2015-05-25 20:42:41.000000000 +0000
@@ -58,6 +58,35 @@
     </xul:hbox>
   </xul:panel>
 
+  <div id="newtab-intro-mask">
+    <div id="newtab-intro-modal">
+      <div id="newtab-intro-progress">
+        <div id="newtab-intro-numerical-progress"/>
+        <div id="newtab-intro-graphical-progress">
+          <span id="indicator"/>
+        </div>
+      </div>
+      <div id="newtab-intro-header"/>
+      <div id="newtab-intro-body">
+        <div id="newtab-intro-content">
+          <div id="newtab-intro-image"/>
+          <div id="newtab-intro-text">
+            <p/><p/>
+          </div>
+        </div>
+        <div id="newtab-intro-buttons">
+          <input type="button" onclick="gIntro._back()"/>
+          <input type="button" default="true" onclick="gIntro._next()"/>
+        </div>
+      </div>
+      <div id="newtab-intro-footer">
+        <ul>
+          <li/><li/>
+        </ul>
+      </div>
+    </div>
+  </div>
+
   <div id="newtab-scrollbox">
 
     <div id="newtab-vertical-margin">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/newtab/page.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/newtab/page.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/newtab/page.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/newtab/page.js	2015-05-25 20:42:41.000000000 +0000
@@ -217,7 +217,10 @@
 
     for (let site of gGrid.sites) {
       if (site) {
-        site.captureIfMissing();
+        // The site may need to modify and/or re-render itself if
+        // something changed after newtab was created by preloader.
+        // For example, the suggested tile endTime may have passed.
+        site.onFirstVisible();
       }
     }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/newtab/search.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/newtab/search.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/newtab/search.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/newtab/search.js	2015-05-25 20:42:41.000000000 +0000
@@ -54,7 +54,16 @@
         engineName: this.currentEngineName,
         searchString: searchStr,
         whence: "newtab",
-        useNewTab: useNewTab,
+        originalEvent: {
+          target: {
+            ownerDocument: null
+          },
+          shiftKey: event.shiftKey,
+          ctrlKey: event.ctrlKey,
+          metaKey: event.metaKey,
+          altKey: event.altKey,
+          button: event.button,
+        },
       }
 
       if (searchText.hasAttribute("selection-index")) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/newtab/sites.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/newtab/sites.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/newtab/sites.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/newtab/sites.js	2015-05-25 20:42:41.000000000 +0000
@@ -116,10 +116,52 @@
     }
   },
 
+  _newTabString: function(str, substrArr) {
+    let regExp = /%[0-9]\$S/g;
+    let matches;
+    while (matches = regExp.exec(str)) {
+      let match = matches[0];
+      let index = match.charAt(1); // Get the digit in the regExp.
+      str = str.replace(match, substrArr[index - 1]);
+    }
+    return str;
+  },
+
+  _getSuggestedTileExplanation: function() {
+    let targetedName = `<strong> ${this.link.targetedName} </strong>`;
+    let targetedSite = `<strong> ${this.link.targetedSite} </strong>`;
+    if (this.link.explanation) {
+      return this._newTabString(this.link.explanation, [targetedName, targetedSite]);
+    }
+    return newTabString("suggested.button", [targetedName]);
+  },
+
+  /**
+   * Checks for and modifies link at campaign end time
+   */
+  _checkLinkEndTime: function Site_checkLinkEndTime() {
+    if (this.link.endTime && this.link.endTime < Date.now()) {
+       let oldUrl = this.url;
+       // chop off the path part from url
+       this.link.url = Services.io.newURI(this.url, null, null).resolve("/");
+       // clear supplied images - this triggers thumbnail download for new url
+       delete this.link.imageURI;
+       delete this.link.enhancedImageURI;
+       // remove endTime to avoid further time checks
+       delete this.link.endTime;
+       // clear enhanced-content image that may still exist in preloaded page
+       this._querySelector(".enhanced-content").style.backgroundImage = "";
+       gPinnedLinks.replace(oldUrl, this.link);
+    }
+  },
+
   /**
    * Renders the site's data (fills the HTML fragment).
    */
   _render: function Site_render() {
+    // first check for end time, as it may modify the link
+    this._checkLinkEndTime();
+    // setup display variables
     let enhanced = gAllPages.enhanced && DirectoryLinksProvider.getEnhancedLink(this.link);
     let url = this.url;
     let title = enhanced && enhanced.title ? enhanced.title :
@@ -134,10 +176,15 @@
     this.node.setAttribute("type", this.link.type);
 
     if (this.link.targetedSite) {
+      if (this.node.getAttribute("type") != "sponsored") {
+        this._querySelector(".newtab-sponsored").textContent =
+          newTabString("suggested.tag");
+      }
+
       this.node.setAttribute("suggested", true);
-      let targetedSite = `<strong> ${this.link.targetedName} </strong>`;
+      let explanation = this._getSuggestedTileExplanation();
       this._querySelector(".newtab-suggested").innerHTML =
-        `<div class='newtab-suggested-bounds'> ${newTabString("suggested.button", [targetedSite])} </div>`;
+        `<div class='newtab-suggested-bounds'> ${explanation} </div>`;
     }
 
     if (this.isPinned())
@@ -150,6 +197,21 @@
   },
 
   /**
+   * Called when the site's tab becomes visible for the first time.
+   * Since the newtab may be preloaded long before it's displayed,
+   * check for changed conditions and re-render if needed
+   */
+  onFirstVisible: function Site_onFirstVisible() {
+    if (this.link.endTime && this.link.endTime < Date.now()) {
+      // site needs to change landing url and background image
+      this._render();
+    }
+    else {
+      this.captureIfMissing();
+    }
+  },
+
+  /**
    * Captures the site's thumbnail in the background, but only if there's no
    * existing thumbnail and the page allows background captures.
    */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/nsContextMenu.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/nsContextMenu.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/nsContextMenu.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/nsContextMenu.js	2015-05-25 20:42:41.000000000 +0000
@@ -6,6 +6,12 @@
 Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
 Components.utils.import("resource://gre/modules/InlineSpellChecker.jsm");
 Components.utils.import("resource://gre/modules/BrowserUtils.jsm");
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "CustomizableUI",
+  "resource:///modules/CustomizableUI.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Pocket",
+  "resource:///modules/Pocket.jsm");
 
 var gContextMenuContentData = null;
 
@@ -178,24 +184,36 @@
                      CastingApps.getServicesForVideo(this.target).length > 0;
     this.setItemAttr("context-castvideo", "disabled", !shouldShowCast);
 
-    let canPocket = false;
-    if (shouldShow && window.gBrowser &&
-        this.browser.getTabBrowser() == window.gBrowser) {
-      let uri = this.browser.currentURI;
-      canPocket =
-        CustomizableUI.getPlacementOfWidget("pocket-button") &&
-        (uri.schemeIs("http") || uri.schemeIs("https") ||
-         (uri.schemeIs("about") && ReaderMode.getOriginalUrl(uri.spec)));
-      if (canPocket) {
-        let locale = Cc["@mozilla.org/chrome/chrome-registry;1"].
-                     getService(Ci.nsIXULChromeRegistry).
-                     getSelectedLocale("browser");
+    this.initPocketItems();
+  },
+
+  initPocketItems: function CM_initPocketItems() {
+    var showSaveCurrentPageToPocket = !(this.onTextInput || this.onLink ||
+                                        this.isContentSelected || this.onImage ||
+                                        this.onCanvas || this.onVideo || this.onAudio);
+    let targetURI = (this.onSaveableLink || this.onPlainTextLink) ? this.linkURI : this.browser.currentURI;
+    let canPocket = CustomizableUI.getPlacementOfWidget("pocket-button") &&
+                    window.pktApi && window.pktApi.isUserLoggedIn();
+    canPocket = canPocket && (targetURI.schemeIs("http") || targetURI.schemeIs("https") ||
+                              (targetURI.schemeIs("about") && ReaderMode.getOriginalUrl(targetURI.spec)));
+    canPocket = canPocket && window.gBrowser && this.browser.getTabBrowser() == window.gBrowser;
+
+    if (canPocket) {
+      let locale = Cc["@mozilla.org/chrome/chrome-registry;1"].
+                   getService(Ci.nsIXULChromeRegistry).
+                   getSelectedLocale("browser");
+      if (locale != "en-US") {
+        if (locale == "ja-JP-mac")
+          locale = "ja";
         let url = "chrome://browser/content/browser-pocket-" + locale + ".properties";
         let bundle = Services.strings.createBundle(url);
-        let item = document.getElementById("context-pocket");
+        let saveToPocketItem = document.getElementById("context-pocket");
+        let saveLinkToPocketItem = document.getElementById("context-savelinktopocket");
         try {
-          item.setAttribute("label", bundle.GetStringFromName("saveToPocketCmd.label"));
-          item.setAttribute("accesskey", bundle.GetStringFromName("saveToPocketCmd.accesskey"));
+          saveToPocketItem.setAttribute("label", bundle.GetStringFromName("saveToPocketCmd.label"));
+          saveToPocketItem.setAttribute("accesskey", bundle.GetStringFromName("saveToPocketCmd.accesskey"));
+          saveLinkToPocketItem.setAttribute("label", bundle.GetStringFromName("saveLinkToPocketCmd.label"));
+          saveLinkToPocketItem.setAttribute("accesskey", bundle.GetStringFromName("saveLinkToPocketCmd.accesskey"));
         } catch (err) {
           // GetStringFromName throws when the bundle doesn't exist.  In that
           // case, the item will retain the browser-pocket.dtd en-US string that
@@ -203,7 +221,10 @@
         }
       }
     }
-    this.showItem("context-pocket", canPocket && window.pktApi && window.pktApi.isUserLoggedIn());
+    this.showItem("context-pocket", canPocket && showSaveCurrentPageToPocket);
+    let showSaveLinkToPocket = canPocket && !showSaveCurrentPageToPocket &&
+                               (this.onSaveableLink || this.onPlainTextLink);
+    this.showItem("context-savelinktopocket", showSaveLinkToPocket);
   },
 
   initViewItems: function CM_initViewItems() {
@@ -984,11 +1005,28 @@
     else
       throw "not reached";
 
-    // unused (and play nice for fragments generated via XSLT too)
-    var docUrl = null;
-    window.openDialog("chrome://global/content/viewPartialSource.xul",
-                      "_blank", "scrollbars,resizable,chrome,dialog=no",
-                      docUrl, docCharset, reference, aContext);
+    let inTab = Services.prefs.getBoolPref("view_source.tab");
+    if (inTab) {
+      let tab = gBrowser.loadOneTab("about:blank", {
+        relatedToCurrent: true,
+        inBackground: false
+      });
+      let viewSourceBrowser = gBrowser.getBrowserForTab(tab);
+      if (aContext == "selection") {
+        top.gViewSourceUtils
+           .viewSourceFromSelectionInBrowser(reference, viewSourceBrowser);
+      } else {
+        top.gViewSourceUtils
+           .viewSourceFromFragmentInBrowser(reference, aContext,
+                                            viewSourceBrowser);
+      }
+    } else {
+      // unused (and play nice for fragments generated via XSLT too)
+      var docUrl = null;
+      window.openDialog("chrome://global/content/viewPartialSource.xul",
+                        "_blank", "scrollbars,resizable,chrome,dialog=no",
+                        docUrl, docCharset, reference, aContext);
+    }
   },
 
   // Open new "view source" window with the frame's URL.
@@ -1132,7 +1170,7 @@
     urlSecurityCheck(this.target.currentURI.spec, this.principal);
 
     // Confirm since it's annoying if you hit this accidentally.
-    const kDesktopBackgroundURL = 
+    const kDesktopBackgroundURL =
                   "chrome://browser/content/setDesktopBackground.xul";
 #ifdef XP_MACOSX
     // On Mac, the Set Desktop Background window is not modal.
@@ -1175,7 +1213,7 @@
     // file picker
     function saveAsListener() {}
     saveAsListener.prototype = {
-      extListener: null, 
+      extListener: null,
 
       onStartRequest: function saveLinkAs_onStartRequest(aRequest, aContext) {
 
@@ -1208,17 +1246,17 @@
           return;
         }
 
-        let extHelperAppSvc = 
+        let extHelperAppSvc =
           Cc["@mozilla.org/uriloader/external-helper-app-service;1"].
           getService(Ci.nsIExternalHelperAppService);
         let channel = aRequest.QueryInterface(Ci.nsIChannel);
         this.extListener =
-          extHelperAppSvc.doContent(channel.contentType, aRequest, 
+          extHelperAppSvc.doContent(channel.contentType, aRequest,
                                     null, true, window);
         this.extListener.onStartRequest(aRequest, aContext);
-      }, 
+      },
 
-      onStopRequest: function saveLinkAs_onStopRequest(aRequest, aContext, 
+      onStopRequest: function saveLinkAs_onStopRequest(aRequest, aContext,
                                                        aStatusCode) {
         if (aStatusCode == NS_ERROR_SAVE_LINK_AS_TIMEOUT) {
           // do it the old fashioned way, which will pick the best filename
@@ -1251,12 +1289,12 @@
           channel.cancel(NS_ERROR_SAVE_LINK_AS_TIMEOUT);
         }
         throw Cr.NS_ERROR_NO_INTERFACE;
-      } 
+      }
     }
 
-    // if it we don't have the headers after a short time, the user 
+    // if it we don't have the headers after a short time, the user
     // won't have received any feedback from their click.  that's bad.  so
-    // we give up waiting for the filename. 
+    // we give up waiting for the filename.
     function timerCallback() {}
     timerCallback.prototype = {
       notify: function sLA_timer_notify(aTimer) {
@@ -1298,8 +1336,8 @@
         channel.forceAllowThirdPartyCookie = true;
     }
 
-    // fallback to the old way if we don't see the headers quickly 
-    var timeToWait = 
+    // fallback to the old way if we don't see the headers quickly
+    var timeToWait =
       gPrefService.getIntPref("browser.download.saveLinkAsFilenameTimeout");
     var timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
     timer.initWithCallback(new timerCallback(), timeToWait,
@@ -1412,13 +1450,13 @@
 
     var clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].
                     getService(Ci.nsIClipboardHelper);
-    clipboard.copyString(addresses, document);
+    clipboard.copyString(addresses);
   },
 
   copyLink: function() {
     var clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].
                     getService(Ci.nsIClipboardHelper);
-    clipboard.copyString(this.linkURL, document);
+    clipboard.copyString(this.linkURL);
   },
 
   ///////////////
@@ -1478,7 +1516,7 @@
 
   // Generate fully qualified URL for clicked-on link.
   getLinkURL: function() {
-    var href = this.link.href;  
+    var href = this.link.href;
     if (href)
       return href;
 
@@ -1609,30 +1647,17 @@
     let onMessage = (message) => {
       mm.removeMessageListener("ContextMenu:BookmarkFrame:Result", onMessage);
 
-      let itemId = PlacesUtils.getMostRecentBookmarkForURI(uri);
-      if (itemId == -1) {
-        PlacesUIUtils.showBookmarkDialog({ action: "add"
-                                         , type: "bookmark"
-                                         , uri: uri
-                                         , title: message.data.title
-                                         , description: message.data.description
-                                         , hiddenRows: [ "description"
-                                                       , "location"
-                                                       , "loadInSidebar"
-                                                       , "keyword" ]
-                                         }, window.top);
-      }
-      else {
-        PlacesUIUtils.showBookmarkDialog({ action: "edit"
-                                         , type: "bookmark"
-                                         , itemId: itemId
-                                         }, window.top);
-      }
+      window.top.PlacesCommandHook.bookmarkLink(PlacesUtils.bookmarksMenuFolderId,
+                                                uri.spec,
+                                                message.data.title,
+                                                message.data.description)
+                                  .catch(Components.utils.reportError);
     };
     mm.addMessageListener("ContextMenu:BookmarkFrame:Result", onMessage);
 
     mm.sendAsyncMessage("ContextMenu:BookmarkFrame", null, { target: this.target });
   },
+
   markLink: function CM_markLink(origin) {
     // send link to social, if it is the page url linkURI will be null
     SocialMarks.markLink(origin, this.linkURI ? this.linkURI.spec : null, this.target);
@@ -1657,20 +1682,12 @@
     saveDocument(this.browser.contentDocumentAsCPOW);
   },
 
-  saveToPocket: function CM_saveToPocket() {
-    let pocketWidget = document.getElementById("pocket-button");
-    let placement = CustomizableUI.getPlacementOfWidget("pocket-button");
-    if (!placement)
-      return;
+  saveLinkToPocket: function CM_saveLinkToPocket() {
+    Pocket.savePage(this.browser, this.linkURL);
+  },
 
-    if (placement.area == CustomizableUI.AREA_PANEL) {
-      PanelUI.show().then(function() {
-        pocketWidget = document.getElementById("pocket-button");
-        pocketWidget.doCommand();
-      });
-    } else {
-      pocketWidget.doCommand();
-    }
+  savePageToPocket: function CM_saveToPocket() {
+    Pocket.savePage(this.browser, this.browser.currentURI.spec, this.browser.contentTitle);
   },
 
   printFrame: function CM_printFrame() {
@@ -1691,7 +1708,7 @@
   copyMediaLocation : function () {
     var clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].
                     getService(Ci.nsIClipboardHelper);
-    clipboard.copyString(this.mediaURL, document);
+    clipboard.copyString(this.mediaURL);
   },
 
   drmLearnMore: function(aEvent) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/pageinfo/pageInfo.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/pageinfo/pageInfo.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/pageinfo/pageInfo.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/pageinfo/pageInfo.js	2015-05-25 20:42:41.000000000 +0000
@@ -1253,7 +1253,7 @@
         elem.removeAttribute("copybuffer");
       }
     }
-    gClipboardHelper.copyString(text.join("\n"), document);
+    gClipboardHelper.copyString(text.join("\n"));
   }
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/socialchat.xml firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/socialchat.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/socialchat.xml	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/socialchat.xml	2015-05-25 20:42:41.000000000 +0000
@@ -30,6 +30,8 @@
       <xul:browser anonid="content" class="chat-frame" flex="1"
                   context="contentAreaContextMenu"
                   disableglobalhistory="true"
+                  message="true"
+                  messagemanagergroup="social"
                   tooltip="aHTMLTooltip"
                   xbl:inherits="src,origin" type="content"/>
     </content>
@@ -72,13 +74,6 @@
           this._deferredChatLoaded.resolve(this);
         }, true);
 
-        // load content.js to support webrtc, fullscreen, etc.
-        this.addEventListener("load", function loaded(event) {
-          this.removeEventListener("load", loaded, true);
-          let mm = this.content.messageManager;
-          mm.loadFrameScript("chrome://browser/content/content.js", true);
-        }, true);
-
         if (this.src)
           this.setAttribute("src", this.src);
       ]]></constructor>
@@ -141,10 +136,10 @@
 
       <property name="isActive">
         <getter>
-          return this.content.docShell.isActive;
+          return this.content.docShellIsActive;
         </getter>
         <setter>
-          this.content.docShell.isActive = !!val;
+          this.content.docShellIsActive = !!val;
 
           // let the chat frame know if it is being shown or hidden
           let evt = this.contentDocument.createEvent("CustomEvent");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/social-content.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/social-content.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/social-content.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/social-content.js	2015-05-25 20:42:41.000000000 +0000
@@ -0,0 +1,105 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* This content script should work in any browser or iframe and should not
+ * depend on the frame being contained in tabbrowser. */
+
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+
+// social frames are always treated as app tabs
+docShell.isAppTab = true;
+
+// Error handling class used to listen for network errors in the social frames
+// and replace them with a social-specific error page
+SocialErrorListener = {
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
+                                         Ci.nsISupportsWeakReference,
+                                         Ci.nsISupports]),
+
+  defaultTemplate: "about:socialerror?mode=tryAgainOnly&url=%{url}&origin=%{origin}",
+  urlTemplate: null,
+
+  init() {
+    addMessageListener("Social:SetErrorURL", this);
+    let webProgress = docShell.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+                              .getInterface(Components.interfaces.nsIWebProgress);
+    webProgress.addProgressListener(this, Ci.nsIWebProgress.NOTIFY_STATE_REQUEST |
+                                          Ci.nsIWebProgress.NOTIFY_LOCATION);
+  },
+  receiveMessage(message) {
+    switch(message.name) {
+      case "Social:SetErrorURL": {
+        // either a url or null to reset to default template
+        this.urlTemplate = message.objects.template;
+      }
+    }
+  },
+
+  setErrorPage() {
+    // if this is about:providerdirectory, use the directory iframe
+    let frame = docShell.chromeEventHandler;
+    let origin = frame.getAttribute("origin");
+    let src = frame.getAttribute("src");
+    if (src == "about:providerdirectory") {
+      frame = content.document.getElementById("activation-frame");
+      src = frame.getAttribute("src");
+    }
+
+    let url = this.urlTemplate || this.defaultTemplate;
+    url = url.replace("%{url}", encodeURIComponent(src));
+    url = url.replace("%{origin}", encodeURIComponent(origin));
+    if (frame != docShell.chromeEventHandler) {
+      // Unable to access frame.docShell here. This is our own frame and doesn't
+      // provide reload, so we'll just set the src.
+      frame.setAttribute("src", url);
+    } else {
+      let webNav = docShell.QueryInterface(Ci.nsIWebNavigation);
+      webNav.loadURI(url, null, null, null, null);
+    }
+    sendAsyncMessage("Social:ErrorPageNotify", {
+        origin: origin,
+        url: src
+    });
+  },
+
+  onStateChange(aWebProgress, aRequest, aState, aStatus) {
+    let failure = false;
+    if ((aState & Ci.nsIWebProgressListener.STATE_STOP)) {
+      if (aRequest instanceof Ci.nsIHttpChannel) {
+        try {
+          // Change the frame to an error page on 4xx (client errors)
+          // and 5xx (server errors).  responseStatus throws if it is not set.
+          failure = aRequest.responseStatus >= 400 &&
+                    aRequest.responseStatus < 600;
+        } catch (e) {
+          failure = aStatus != Components.results.NS_OK;
+        }
+      }
+    }
+
+    // Calling cancel() will raise some OnStateChange notifications by itself,
+    // so avoid doing that more than once
+    if (failure && aStatus != Components.results.NS_BINDING_ABORTED) {
+      aRequest.cancel(Components.results.NS_BINDING_ABORTED);
+      this.setErrorPage();
+    }
+  },
+
+  onLocationChange(aWebProgress, aRequest, aLocation, aFlags) {
+    if (aRequest && aFlags & Ci.nsIWebProgressListener.LOCATION_CHANGE_ERROR_PAGE) {
+      aRequest.cancel(Components.results.NS_BINDING_ABORTED);
+      this.setErrorPage();
+    }
+  },
+
+  onProgressChange() {},
+  onStatusChange() {},
+  onSecurityChange() {},
+};
+
+SocialErrorListener.init();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/socialmarks.xml firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/socialmarks.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/socialmarks.xml	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/socialmarks.xml	2015-05-25 20:42:41.000000000 +0000
@@ -54,6 +54,8 @@
           iframe.setAttribute("type", "content");
           iframe.setAttribute("class", "social-panel-frame");
           iframe.setAttribute("flex", "1");
+          iframe.setAttribute("message", "true");
+          iframe.setAttribute("messagemanagergroup", "social");
           iframe.setAttribute("tooltip", "aHTMLTooltip");
           iframe.setAttribute("context", "contentAreaContextMenu");
           iframe.setAttribute("origin", provider.origin);
@@ -134,6 +136,15 @@
         ]]></body>
       </method>
 
+      <method name="receiveMessage">
+        <parameter name="message"/>
+        <body><![CDATA[
+        if (message.name != "Social:ErrorPageNotify" || message.target != this.content)
+          return;
+        this.openPanel();
+        ]]></body>
+      </method>
+
       <method name="loadPanel">
         <parameter name="pageData"/>
         <parameter name="target"/>
@@ -206,37 +217,16 @@
           let unload = () => {
             contentWindow.removeEventListener("unload", unload);
             contentWindow.removeEventListener("socialMarkUpdate", markUpdate);
-            if (this.content.socialErrorListener)
-              this.content.socialErrorListener.remove();
           }
           contentWindow.addEventListener("socialMarkUpdate", markUpdate);
           contentWindow.addEventListener("unload", unload);
         }
         this.content.addEventListener("DOMContentLoaded", DOMContentLoaded, true);
-        Social.setErrorListener(this.content, this.setErrorMessage.bind(this));
         this._loading = true;
         this.content.setAttribute("src", endpoint);
         ]]></body>
       </method>
 
-      <method name="setErrorMessage">
-        <parameter name="aNotificationFrame"/>
-        <body><![CDATA[
-        if (!aNotificationFrame)
-          return;
-
-        let src = aNotificationFrame.getAttribute("src");
-        aNotificationFrame.removeAttribute("src");
-        let origin = aNotificationFrame.getAttribute("origin");
-        aNotificationFrame.webNavigation.loadURI("about:socialerror?mode=tryAgainOnly&url=" +
-                                                encodeURIComponent(src) + "&origin=" +
-                                                encodeURIComponent(origin),
-                                                null, null, null, null);
-        // ensure the panel is open if error occurs on first click
-        this.openPanel();
-        ]]></body>
-      </method>
-
       <method name="openPanel">
         <parameter name="aResetOnClose"/>
         <body><![CDATA[
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/tabbrowser.css firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/tabbrowser.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/tabbrowser.css	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/tabbrowser.css	2015-05-25 20:42:41.000000000 +0000
@@ -19,7 +19,7 @@
 }
 
 .tab-close-button[pinned],
-.tabbrowser-tabs[closebuttons="activetab"] > * > * > * > .tab-close-button:not([selected="true"]) {
+.tabbrowser-tabs[closebuttons="activetab"] > * > * > * > .tab-close-button:not([visuallyselected="true"]) {
   display: none;
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/tabbrowser.xml firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/tabbrowser.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/tabbrowser.xml	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/tabbrowser.xml	2015-05-25 20:42:41.000000000 +0000
@@ -3099,11 +3099,12 @@
               } else if (needSpinner && this.spinnerTab !== showTab) {
                 if (this.spinnerTab) {
                   this.spinnerTab.linkedBrowser.removeAttribute("pendingpaint");
+                } else {
+                  this.spinnerDisplayed();
                 }
                 this.spinnerTab = showTab;
                 this.tabbrowser.setAttribute("pendingpaint", "true");
                 this.spinnerTab.linkedBrowser.setAttribute("pendingpaint", "true");
-                this.spinnerDisplayed();
               }
 
               // Switch to the tab we've decided to make visible.
@@ -3171,6 +3172,7 @@
                 this.lastVisibleTab = null;
               }
               if (this.spinnerTab && !this.spinnerTab.linkedBrowser) {
+                this.spinnerHidden();
                 this.spinnerTab = null;
               }
               if (this.loadingTab && !this.loadingTab.linkedBrowser) {
@@ -3354,6 +3356,7 @@
              */
 
             startTabSwitch: function () {
+              TelemetryStopwatch.cancel("FX_TAB_SWITCH_TOTAL_E10S_MS", window);
               TelemetryStopwatch.start("FX_TAB_SWITCH_TOTAL_E10S_MS", window);
               this.addMarker("AsyncTabSwitch:Start");
             },
@@ -3370,21 +3373,19 @@
             },
 
             spinnerDisplayed: function () {
-              if (this.spinnerTab) {
-                TelemetryStopwatch.start("FX_TAB_SWITCH_SPINNER_VISIBLE_MS", window);
-                this.addMarker("AsyncTabSwitch:SpinnerShown");
-              }
+              this.assert(!this.spinnerTab);
+              TelemetryStopwatch.start("FX_TAB_SWITCH_SPINNER_VISIBLE_MS", window);
+              this.addMarker("AsyncTabSwitch:SpinnerShown");
             },
 
             spinnerHidden: function () {
-              if (this.spinnerTab) {
-                this.log("DEBUG: spinner time = " +
-                         TelemetryStopwatch.timeElapsed("FX_TAB_SWITCH_SPINNER_VISIBLE_MS", window));
-                TelemetryStopwatch.finish("FX_TAB_SWITCH_SPINNER_VISIBLE_MS", window);
-                this.addMarker("AsyncTabSwitch:SpinnerHidden");
-                // we do not get a onPaint after displaying the spinner
-                this.finishTabSwitch();
-              }
+              this.assert(this.spinnerTab);
+              this.log("DEBUG: spinner time = " +
+                       TelemetryStopwatch.timeElapsed("FX_TAB_SWITCH_SPINNER_VISIBLE_MS", window));
+              TelemetryStopwatch.finish("FX_TAB_SWITCH_SPINNER_VISIBLE_MS", window);
+              this.addMarker("AsyncTabSwitch:SpinnerHidden");
+              // we do not get a onPaint after displaying the spinner
+              this.finishTabSwitch();
             },
 
             addMarker: function(marker) {
@@ -5620,7 +5621,13 @@
 
       <field name="mOverCloseButton">false</field>
       <field name="mCorrespondingMenuitem">null</field>
+
+      <!--
+      While it would make sense to track this in a field, the field will get nuked
+      once the node is gone from the DOM, which causes us to think the tab is not
+      closed, which causes us to make wrong decisions. So we use an expando instead.
       <field name="closing">false</field>
+      -->
 
       <method name="_mouseenter">
         <body><![CDATA[
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/tab-content.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/tab-content.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/tab-content.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/tab-content.js	2015-05-25 20:42:41.000000000 +0000
@@ -308,7 +308,7 @@
         break;
 
       case "Reader:PushState":
-        this.updateReaderButton();
+        this.updateReaderButton(!!(message.data && message.data.isArticle));
         break;
     }
   },
@@ -353,7 +353,7 @@
 
     }
   },
-  updateReaderButton: function() {
+  updateReaderButton: function(forceNonArticle) {
     if (!ReaderMode.isEnabledForParseOnLoad || this.isAboutReader ||
         !(content.document instanceof content.HTMLDocument) ||
         content.document.mozSyntheticDocument) {
@@ -363,6 +363,8 @@
     // |false| all the time.
     if (ReaderMode.isProbablyReaderable(content.document)) {
       sendAsyncMessage("Reader:UpdateReaderButton", { isArticle: true });
+    } else if (forceNonArticle) {
+      sendAsyncMessage("Reader:UpdateReaderButton", { isArticle: false });
     }
   },
 };
@@ -589,8 +591,9 @@
   init: function() {
     addMessageListener("DOMFullscreen:Approved", this);
     addMessageListener("DOMFullscreen:CleanUp", this);
-    addEventListener("MozEnteredDomFullscreen", this);
-    addEventListener("MozExitedDomFullscreen", this);
+    addEventListener("MozDOMFullscreen:Entered", this);
+    addEventListener("MozDOMFullscreen:NewOrigin", this);
+    addEventListener("MozDOMFullscreen:Exited", this);
   },
 
   receiveMessage: function(aMessage) {
@@ -604,6 +607,9 @@
         break;
       }
       case "DOMFullscreen:CleanUp": {
+        let utils = content.QueryInterface(Ci.nsIInterfaceRequestor)
+                           .getInterface(Ci.nsIDOMWindowUtils);
+        utils.exitFullscreen();
         this._fullscreenDoc = null;
         break;
       }
@@ -611,13 +617,22 @@
   },
 
   handleEvent: function(aEvent) {
-    if (aEvent.type == "MozEnteredDomFullscreen") {
-      this._fullscreenDoc = aEvent.target;
-      sendAsyncMessage("MozEnteredDomFullscreen", {
-        origin: this._fullscreenDoc.nodePrincipal.origin,
-      });
-    } else if (aEvent.type == "MozExitedDomFullscreen") {
-      sendAsyncMessage("MozExitedDomFullscreen");
+    switch (aEvent.type) {
+      case "MozDOMFullscreen:Entered": {
+        sendAsyncMessage("DOMFullscreen:Entered");
+        break;
+      }
+      case "MozDOMFullscreen:NewOrigin": {
+        this._fullscreenDoc = aEvent.target;
+        sendAsyncMessage("DOMFullscreen:NewOrigin", {
+          origin: this._fullscreenDoc.nodePrincipal.origin,
+        });
+        break;
+      }
+      case "MozDOMFullscreen:Exited": {
+        sendAsyncMessage("DOMFullscreen:Exited");
+        break;
+      }
     }
   }
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/browser_blob-channelname.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/browser_blob-channelname.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/browser_blob-channelname.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/browser_blob-channelname.js	2015-05-25 20:42:42.000000000 +0000
@@ -5,14 +5,7 @@
 function test() {
     var file = new File([new Blob(['test'], {type: 'text/plain'})], "test-name");
     var url = URL.createObjectURL(file);
-    var channel = NetUtil.newChannel2(url,
-                                      null,
-                                      null,
-                                      null,      // aLoadingNode
-                                      Services.scriptSecurityManager.getSystemPrincipal(),
-                                      null,      // aTriggeringPrincipal
-                                      Ci.nsILoadInfo.SEC_NORMAL,
-                                      Ci.nsIContentPolicy.TYPE_OTHER);
+    var channel = NetUtil.newChannel({uri: url, loadUsingSystemPrincipal: true});
 
     is(channel.contentDispositionFilename, 'test-name', "filename matches");
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/browser_bug321000.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/browser_bug321000.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/browser_bug321000.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/browser_bug321000.js	2015-05-25 20:42:42.000000000 +0000
@@ -32,7 +32,7 @@
   // Put a multi-line string in the clipboard.
   // Setting the clipboard value is an async OS operation, so we need to poll
   // the clipboard for valid data before going on.
-  waitForClipboard(kTestString, function() { cbHelper.copyString(kTestString, document); },
+  waitForClipboard(kTestString, function() { cbHelper.copyString(kTestString); },
                    next_test, finish);
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/browser_bug553455.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/browser_bug553455.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/browser_bug553455.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/browser_bug553455.js	2015-05-25 20:42:42.000000000 +0000
@@ -29,6 +29,8 @@
     topic = "addon-install-disabled";
   else if (topic == "addon-progress")
     topic = "addon-install-started";
+  else if (topic == "addon-install-restart")
+    topic = "addon-install-complete";
   return topic;
 }
 
@@ -205,7 +207,7 @@
   wait_for_notification("addon-install-blocked", function(aPanel) {
     let notification = aPanel.childNodes[0];
     is(notification.button.label, "Allow", "Should have seen the right button");
-    is(notification.getAttribute("originhost"), "example.com",
+    is(notification.getAttribute("origin"), "example.com",
        "Should have seen the right origin host");
     is(notification.getAttribute("label"),
        gApp + " prevented this site from asking you to install software on your computer.",
@@ -214,7 +216,7 @@
     // Wait for the install confirmation dialog
     wait_for_install_dialog(function() {
       // Wait for the complete notification
-      wait_for_notification("addon-install-complete", function(aPanel) {
+      wait_for_notification("addon-install-restart", function(aPanel) {
         let notification = aPanel.childNodes[0];
         is(notification.button.label, "Restart Now", "Should have seen the right button");
         is(notification.getAttribute("label"),
@@ -260,7 +262,7 @@
          "tab selected in response to the addon-install-confirmation notification");
 
       // Wait for the complete notification
-      wait_for_notification("addon-install-complete", function(aPanel) {
+      wait_for_notification("addon-install-restart", function(aPanel) {
         let notification = aPanel.childNodes[0];
         is(notification.button.label, "Restart Now", "Should have seen the right button");
         is(notification.getAttribute("label"),
@@ -300,8 +302,7 @@
     wait_for_notification("addon-install-failed", function(aPanel) {
       let notification = aPanel.childNodes[0];
       is(notification.getAttribute("label"),
-         "The add-on could not be downloaded because of a connection failure " +
-         "on example.com.",
+         "The add-on could not be downloaded because of a connection failure.",
          "Should have seen the right message");
 
       Services.perms.remove("example.com", "install");
@@ -327,7 +328,7 @@
     wait_for_notification("addon-install-failed", function(aPanel) {
       let notification = aPanel.childNodes[0];
       is(notification.getAttribute("label"),
-         "The add-on downloaded from example.com could not be installed " +
+         "The add-on downloaded from this site could not be installed " +
          "because it appears to be corrupt.",
          "Should have seen the right message");
 
@@ -419,7 +420,7 @@
     // Wait for the install confirmation dialog
     wait_for_install_dialog(function() {
       // Wait for the complete notification
-      wait_for_notification("addon-install-complete", function(aPanel) {
+      wait_for_notification("addon-install-restart", function(aPanel) {
         let notification = aPanel.childNodes[0];
         is(notification.button.label, "Restart Now", "Should have seen the right button");
         is(notification.getAttribute("label"),
@@ -482,7 +483,7 @@
       is(container.childNodes[1].childNodes.length, 1, "Shouldn't have the unverified marker");
 
       // Wait for the complete notification
-      wait_for_notification("addon-install-complete", function(aPanel) {
+      wait_for_notification("addon-install-restart", function(aPanel) {
         AddonManager.getAddonsByIDs(["restartless-xpi@tests.mozilla.org",
                                      "theme-xpi@tests.mozilla.org"], function([a, t]) {
           a.uninstall();
@@ -565,7 +566,7 @@
     // Wait for the install confirmation dialog
     wait_for_install_dialog(function() {
       // Wait for the complete notification
-      wait_for_notification("addon-install-complete", function(aPanel) {
+      wait_for_notification("addon-install-restart", function(aPanel) {
         let notification = aPanel.childNodes[0];
         is(notification.button.label, "Restart Now", "Should have seen the right button");
         is(notification.getAttribute("label"),
@@ -618,6 +619,35 @@
   gBrowser.loadURI(path);
 },
 
+function test_tabclose() {
+  if (!Preferences.get("xpinstall.customConfirmationUI", false)) {
+    runNextTest();
+    return;
+  }
+
+  // Wait for the progress notification
+  wait_for_progress_notification(aPanel => {
+    // Wait for the install confirmation dialog
+    wait_for_install_dialog(() => {
+      AddonManager.getAllInstalls(aInstalls => {
+        is(aInstalls.length, 1, "Should be one pending install");
+
+        wait_for_notification_close(() => {
+          AddonManager.getAllInstalls(aInstalls => {
+            is(aInstalls.length, 0, "Should be no pending install since the tab is closed");
+            runNextTest();
+          });
+        });
+
+        gBrowser.removeTab(gBrowser.selectedTab);
+      });
+    });
+  });
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.loadURI(TESTROOT + "unsigned.xpi");
+},
+
 function test_wronghost() {
   gBrowser.selectedTab = gBrowser.addTab();
   gBrowser.addEventListener("load", function() {
@@ -632,7 +662,7 @@
       wait_for_notification("addon-install-failed", function(aPanel) {
         let notification = aPanel.childNodes[0];
         is(notification.getAttribute("label"),
-           "The add-on downloaded from example.com could not be installed " +
+           "The add-on downloaded from this site could not be installed " +
            "because it appears to be corrupt.",
            "Should have seen the right message");
 
@@ -652,7 +682,7 @@
     // Wait for the install confirmation dialog
     wait_for_install_dialog(function() {
       // Wait for the complete notification
-      wait_for_notification("addon-install-complete", function(aPanel) {
+      wait_for_notification("addon-install-restart", function(aPanel) {
         let notification = aPanel.childNodes[0];
         is(notification.button.label, "Restart Now", "Should have seen the right button");
         is(notification.getAttribute("label"),
@@ -705,7 +735,7 @@
     // Wait for the install confirmation dialog
     wait_for_install_dialog(function() {
       // Wait for the complete notification
-      wait_for_notification("addon-install-complete", function(aPanel) {
+      wait_for_notification("addon-install-restart", function(aPanel) {
         let notification = aPanel.childNodes[0];
         is(notification.button.label, "Restart Now", "Should have seen the right button");
         is(notification.getAttribute("label"),
@@ -783,7 +813,7 @@
     // Wait for the install confirmation dialog
     wait_for_install_dialog(function() {
       // Wait for the complete notification
-      wait_for_notification("addon-install-complete", function(aPanel) {
+      wait_for_notification("addon-install-restart", function(aPanel) {
         // Dismiss the notification
         wait_for_notification_close(function () {
           // Install another
@@ -795,7 +825,7 @@
                 info("Timeouts after this probably mean bug 589954 regressed");
 
                 // Wait for the complete notification
-                wait_for_notification("addon-install-complete", function(aPanel) {
+                wait_for_notification("addon-install-restart", function(aPanel) {
                   AddonManager.getAllInstalls(function(aInstalls) {
                   is(aInstalls.length, 1, "Should be one pending installs");
                     aInstalls[0].cancel();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/browser.ini firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/browser.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/browser.ini	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/browser.ini	2015-05-25 20:42:42.000000000 +0000
@@ -184,6 +184,7 @@
 skip-if = buildapp == 'mulet'
 [browser_bug495058.js]
 [browser_bug517902.js]
+skip-if = (os == 'linux' && e10s) # bug 1161699
 [browser_bug519216.js]
 [browser_bug520538.js]
 [browser_bug521216.js]
@@ -406,6 +407,10 @@
 [browser_tabkeynavigation.js]
 skip-if = e10s
 [browser_tabopen_reflows.js]
+[browser_tabs_close_beforeunload.js]
+support-files =
+  close_beforeunload_opens_second_tab.html
+  close_beforeunload.html
 [browser_tabs_isActive.js]
 skip-if = e10s # Bug 1100664 - test relies on linkedBrowser.docShell
 [browser_tabs_owner.js]
@@ -423,6 +428,7 @@
 [browser_urlHighlight.js]
 [browser_urlbarAutoFillTrimURLs.js]
 [browser_urlbarCopying.js]
+[browser_urlbarDelete.js]
 [browser_urlbarEnter.js]
 [browser_urlbarEnterAfterMouseOver.js]
 skip-if = os == "linux" || e10s # Bug 1073339 - Investigate autocomplete test unreliability on Linux/e10s
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/browser_middleMouse_noJSPaste.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/browser_middleMouse_noJSPaste.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/browser_middleMouse_noJSPaste.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/browser_middleMouse_noJSPaste.js	2015-05-25 20:42:42.000000000 +0000
@@ -14,7 +14,7 @@
     SimpleTest.waitForClipboard(url, () => {
       Components.classes["@mozilla.org/widget/clipboardhelper;1"]
                 .getService(Components.interfaces.nsIClipboardHelper)
-                .copyString(url, document);
+                .copyString(url);
     }, resolve, () => {
       ok(false, "Clipboard copy failed");
       reject();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/browser_parsable_script.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/browser_parsable_script.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/browser_parsable_script.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/browser_parsable_script.js	2015-05-25 20:42:42.000000000 +0000
@@ -77,8 +77,8 @@
                " browser/base/content/test/general/browser_parsable_script.js");
       return;
     }
-    // Request a 10 minutes timeout (30 seconds * 20) for debug builds.
-    requestLongerTimeout(20);
+    // Request a 15 minutes timeout (30 seconds * 30) for debug builds.
+    requestLongerTimeout(30);
   }
 
   let uris;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/browser_restore_isAppTab.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/browser_restore_isAppTab.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/browser_restore_isAppTab.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/browser_restore_isAppTab.js	2015-05-25 20:42:42.000000000 +0000
@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
+const {TabStateFlusher} = Cu.import("resource:///modules/sessionstore/TabStateFlusher.jsm", {});
+
 const DUMMY = "http://example.com/browser/browser/base/content/test/general/dummy_page.html";
 
 function getMinidumpDirectory() {
@@ -86,7 +88,7 @@
     return browser;
 
   // Make sure the main process has all of the current tab state before crashing
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
 
   browser.messageManager.sendAsyncMessage("Test:Crash");
   yield promiseWaitForEvent(browser, "AboutTabCrashedLoad", false, true);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/browser_tab_detach_restore.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/browser_tab_detach_restore.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/browser_tab_detach_restore.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/browser_tab_detach_restore.js	2015-05-25 20:42:42.000000000 +0000
@@ -1,5 +1,7 @@
 "use strict";
 
+const {TabStateFlusher} = Cu.import("resource:///modules/sessionstore/TabStateFlusher.jsm", {});
+
 add_task(function*() {
   let uri = "http://example.com/browser/browser/base/content/test/general/dummy_page.html";
 
@@ -10,7 +12,7 @@
   let tab = gBrowser.addTab();
   tab.linkedBrowser.loadURI(uri);
   yield BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  TabState.flush(tab.linkedBrowser);
+  yield TabStateFlusher.flush(tab.linkedBrowser);
 
   let key = tab.linkedBrowser.permanentKey;
   let win = gBrowser.replaceTabWithWindow(tab);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/browser_tabfocus.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/browser_tabfocus.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/browser_tabfocus.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/browser_tabfocus.js	2015-05-25 20:42:42.000000000 +0000
@@ -156,18 +156,16 @@
 
   is(document.activeElement, gURLBar.inputField, "focus after loading two tabs");
 
-  yield expectFocusShift(function () gBrowser.selectedTab = tab2,
-                         "window2", null, true,
-                         "after tab change, focus in new tab");
+  yield* expectFocusShiftAfterTabSwitch(tab2, "window2", null, true,
+                                        "after tab change, focus in new tab");
 
   focused = yield getFocusedElementForBrowser(browser2);
   is(focused, "Focus is <none>", "focusedElement after tab change, focus in new tab");
 
   // switching tabs when nothing in the new tab is focused
   // should focus the browser
-  yield expectFocusShift(function () gBrowser.selectedTab = tab1,
-                         "window1", null, true,
-                         "after tab change, focus in original tab");
+  yield* expectFocusShiftAfterTabSwitch(tab1, "window1", null, true,
+                                        "after tab change, focus in original tab");
 
   focused = yield getFocusedElementForBrowser(browser1);
   is(focused, "Focus is <none>", "focusedElement after tab change, focus in original tab");
@@ -193,9 +191,8 @@
   is(focused, "Focus is button2", "focusedElement in second browser after button focus in unfocused tab");
 
   // switching tabs should now make the button in the other tab focused
-  yield expectFocusShift(function () gBrowser.selectedTab = tab2,
-                         "window2", "button2", true,
-                         "after tab change with button focused");
+  yield* expectFocusShiftAfterTabSwitch(tab2, "window2", "button2", true,
+                                        "after tab change with button focused");
 
   // blurring an element in a background tab should not change the active
   // focus, but should clear the focus in that tab.
@@ -212,9 +209,8 @@
   yield expectFocusShift(function () gBrowser.selectedTab.focus(),
                          "main-window", "tab2", true,
                          "focusing tab element");
-  yield expectFocusShift(function () gBrowser.selectedTab = tab1,
-                         "main-window", "tab1", true,
-                         "tab change when selected tab element was focused");
+  yield* expectFocusShiftAfterTabSwitch(tab1, "main-window", "tab1", true,
+                                        "tab change when selected tab element was focused");
 
   let switchWaiter;
   if (gMultiProcessBrowser) {
@@ -226,9 +222,8 @@
     });
   }
 
-  yield expectFocusShift(function () gBrowser.selectedTab = tab2,
-                         "main-window", "tab2", true,
-                         "another tab change when selected tab element was focused");
+  yield* expectFocusShiftAfterTabSwitch(tab2, "main-window", "tab2", true,
+                                        "another tab change when selected tab element was focused");
 
   // When this a remote browser, wait for the paint on the second browser so that
   // any post tab-switching stuff has time to complete before blurring the tab.
@@ -260,9 +255,8 @@
 
   // when a chrome element is focused, switching tabs to a tab with a button
   // with the current focus should focus the button
-  yield expectFocusShift(function () gBrowser.selectedTab = tab1,
-                         "window1", "button1", true,
-                         "after tab change, focus in url field, button focused in new tab");
+  yield* expectFocusShiftAfterTabSwitch(tab1, "window1", "button1", true,
+                                        "after tab change, focus in url field, button focused in new tab");
 
   focused = yield getFocusedElementForBrowser(browser1, false);
   is(focused, "Focus is button1", "after switch tab, focus in unfocused tab, first browser");
@@ -288,9 +282,8 @@
   is(fm.getFocusedElementForWindow(window, false, focusedWindow), browser1, "focusedElement after blur in unfocused url field");
 
   // switch focus to a tab with a currently focused element
-  yield expectFocusShift(function () gBrowser.selectedTab = tab2,
-                         "window2", "button2", true,
-                         "after switch from unfocused to focused tab");
+  yield* expectFocusShiftAfterTabSwitch(tab2, "window2", "button2", true,
+                                        "after switch from unfocused to focused tab");
   focused = yield getFocusedElementForBrowser(browser2, true);
   is(focused, "Focus is button2", "focusedElement after switch from unfocused to focused tab");
 
@@ -304,9 +297,8 @@
   is(fm.getFocusedElementForWindow(window, false, focusedWindow), null, "focusedElement after switch to chrome with no focused element");
 
   // switch focus to another tab when neither have an active focus
-  yield expectFocusShift(function () gBrowser.selectedTab = tab1,
-                         "window1", null, true,
-                         "focusedWindow after tab switch from no focus to no focus");
+  yield* expectFocusShiftAfterTabSwitch(tab1, "window1", null, true,
+                                        "focusedWindow after tab switch from no focus to no focus");
 
   focused = yield getFocusedElementForBrowser(browser1, false);
   is(focused, "Focus is <none>", "after tab switch from no focus to no focus, first browser");
@@ -475,6 +467,14 @@
   });
 }
 
+function* expectFocusShiftAfterTabSwitch(tab, expectedWindow, expectedElement, focusChanged, testid)
+{
+  let tabSwitchPromise = null;
+  yield expectFocusShift(() => { tabSwitchPromise = BrowserTestUtils.switchTab(gBrowser, tab) },
+                         expectedWindow, expectedElement, focusChanged, testid)
+  yield tabSwitchPromise;
+}
+
 function* expectFocusShift(callback, expectedWindow, expectedElement, focusChanged, testid)
 {
   currentPromiseResolver = null;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/browser_tabs_close_beforeunload.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/browser_tabs_close_beforeunload.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/browser_tabs_close_beforeunload.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/browser_tabs_close_beforeunload.js	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,43 @@
+"use strict";
+
+const FIRST_TAB = getRootDirectory(gTestPath) + "close_beforeunload_opens_second_tab.html";
+const SECOND_TAB = getRootDirectory(gTestPath) + "close_beforeunload.html";
+
+add_task(function*() {
+  let firstTab = yield BrowserTestUtils.openNewForegroundTab(gBrowser, FIRST_TAB);
+  let newTabPromise = waitForNewTabEvent(gBrowser);
+  ContentTask.spawn(firstTab.linkedBrowser, "", function*() {
+    content.document.getElementsByTagName("a")[0].click();
+  });
+  let tabOpenEvent = yield newTabPromise;
+  let secondTab = tabOpenEvent.target;
+  yield ContentTask.spawn(secondTab.linkedBrowser, SECOND_TAB, function*(expectedURL) {
+    if (content.window.location.href == expectedURL &&
+        content.document.readyState === "complete") {
+      return Promise.resolve();
+    }
+    return new Promise(function(resolve, reject) {
+      content.window.addEventListener("load", function() {
+        if (content.window.location.href == expectedURL) {
+          resolve();
+        }
+      }, false);
+    });
+  });
+
+  let closeBtn = document.getAnonymousElementByAttribute(secondTab, "anonid", "close-button");
+  let closePromise = BrowserTestUtils.removeTab(secondTab, {dontRemove: true});
+  info("closing second tab (which will self-close in beforeunload)");
+  closeBtn.click();
+  ok(secondTab.closing, "Second tab should be marked as closing synchronously.");
+  yield closePromise;
+  ok(secondTab.closing, "Second tab should still be marked as closing");
+  ok(!secondTab.linkedBrowser, "Second tab's browser should be dead");
+  ok(!firstTab.closing, "First tab should not be closing");
+  ok(firstTab.linkedBrowser, "First tab's browser should be alive");
+  info("closing first tab");
+  yield BrowserTestUtils.removeTab(firstTab);
+
+  ok(firstTab.closing, "First tab should be marked as closing");
+  ok(!firstTab.linkedBrowser, "First tab's browser should be dead");
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/browser_urlbarDelete.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/browser_urlbarDelete.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/browser_urlbarDelete.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/browser_urlbarDelete.js	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,53 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+add_task(function*() {
+  let bm = yield PlacesUtils.bookmarks.insert({ parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                                url: "http://example.com/",
+                                                title: "test" });
+
+  registerCleanupFunction(function* () {
+    yield PlacesUtils.bookmarks.remove(bm);
+  });
+
+  // We do this test with both unifiedcomplete disabled and enabled.
+  let ucpref = Services.prefs.getBoolPref("browser.urlbar.unifiedcomplete");
+  registerCleanupFunction(() => {
+    Services.prefs.setBoolPref("browser.urlbar.unifiedcomplete", ucpref);
+  });
+
+  Services.prefs.setBoolPref("browser.urlbar.unifiedcomplete", false);
+  yield BrowserTestUtils.withNewTab({ gBrowser, url: "about:blank" }, testDelete);
+
+  Services.prefs.setBoolPref("browser.urlbar.unifiedcomplete", true);
+  yield BrowserTestUtils.withNewTab({ gBrowser, url: "about:blank" }, testDelete);
+});
+
+function sendHome() {
+  // unclear why VK_HOME doesn't work on Mac, but it doesn't...
+  if (Services.appinfo.OS == "Darwin") {
+    EventUtils.synthesizeKey("VK_LEFT", { altKey: true });
+  } else {
+    EventUtils.synthesizeKey("VK_HOME", {});
+  }
+}
+
+function sendDelete() {
+  EventUtils.synthesizeKey("VK_DELETE", {});
+}
+
+function* testDelete() {
+  yield promiseAutocompleteResultPopup("exam");
+
+  // move to the start.
+  sendHome();
+  // delete the first few chars - each delete should operate on the input field.
+  sendDelete();
+  Assert.equal(gURLBar.inputField.value, "xam");
+
+  yield promisePopupShown(gURLBar.popup);
+
+  sendDelete();
+  Assert.equal(gURLBar.inputField.value, "am");
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/close_beforeunload.html firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/close_beforeunload.html
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/close_beforeunload.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/close_beforeunload.html	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,8 @@
+<body>
+  <p>I will close myself if you close me.</p>
+  <script>
+    window.onbeforeunload = function() {
+      window.close();
+    };
+  </script>
+</body>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/close_beforeunload_opens_second_tab.html firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/close_beforeunload_opens_second_tab.html
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/close_beforeunload_opens_second_tab.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/close_beforeunload_opens_second_tab.html	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,3 @@
+<body>
+  <a href="#" onclick="window.open('close_beforeunload.html', '_blank')">Open second tab</a>
+</body>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/title_test.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/title_test.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/general/title_test.svg	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/general/title_test.svg	2015-05-25 20:42:43.000000000 +0000
@@ -1,4 +1,4 @@
-<svg width="640px" height="480px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0">
+<svg width="640px" height="480px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <title>This is a root SVG element's title</title>
   <foreignObject>
     <html xmlns="http://www.w3.org/1999/xhtml">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/newtab/browser.ini firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/newtab/browser.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/newtab/browser.ini	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/newtab/browser.ini	2015-05-25 20:42:43.000000000 +0000
@@ -46,3 +46,4 @@
 [browser_newtab_undo.js]
 [browser_newtab_unpin.js]
 [browser_newtab_update.js]
+[browser_newtab_bug1145428.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/newtab/browser_newtab_bug1145428.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/newtab/browser_newtab_bug1145428.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/newtab/browser_newtab_bug1145428.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/newtab/browser_newtab_bug1145428.js	2015-05-25 20:42:43.000000000 +0000
@@ -0,0 +1,88 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/*
+ * These tests make sure that pinning suggested tile results in:
+ * - making suggested tile a history tile and replacing enhancedImageURI with imageURI
+ * - upond end of campaign, replaces landing url with baseDomain and switches
+ *   background image to thumbnail
+ */
+
+gDirectorySource = "data:application/json," + JSON.stringify({
+  "suggested": [{
+    url: "http://example.com/landing/page.html",
+    imageURI: "data:image/png;base64,helloWORLD3",
+    enhancedImageURI: "data:image/png;base64,helloWORLD2",
+    title: "title",
+    type: "affiliate",
+    frecent_sites: ["example0.com"],
+  }]
+});
+
+function runTests() {
+  let origGetFrecentSitesName = DirectoryLinksProvider.getFrecentSitesName;
+  DirectoryLinksProvider.getFrecentSitesName = () => "";
+
+  function getData(cellNum) {
+    let cell = getCell(cellNum);
+    if (!cell.site)
+      return null;
+    let siteNode = cell.site.node;
+    return {
+      type: siteNode.getAttribute("type"),
+      thumbnail: siteNode.querySelector(".newtab-thumbnail").style.backgroundImage,
+      enhanced: siteNode.querySelector(".enhanced-content").style.backgroundImage,
+      title: siteNode.querySelector(".newtab-title").textContent,
+      suggested: siteNode.getAttribute("suggested"),
+      url: siteNode.querySelector(".newtab-link").getAttribute("href"),
+    };
+  }
+
+  yield setLinks("0,1,2,3,4,5,6,7,8,9");
+  setPinnedLinks("");
+
+  yield addNewTabPageTab();
+  // load another newtab since the first may not get suggested tile
+  yield addNewTabPageTab();
+  checkGrid("http://example.com/landing/page.html,0,1,2,3,4,5,6,7,8,9");
+  // evaluate suggested tile
+  let tileData = getData(0);
+  is(tileData.type, "affiliate", "unpinned type");
+  is(tileData.thumbnail, "url(\"data:image/png;base64,helloWORLD3\")", "unpinned thumbnail");
+  is(tileData.enhanced, "url(\"data:image/png;base64,helloWORLD2\")", "unpinned enhanced");
+  is(tileData.suggested, "true", "has suggested set", "unpinned suggested exists");
+  is(tileData.url, "http://example.com/landing/page.html", "unpinned landing page");
+
+  // suggested tile should not be pinned
+  is(NewTabUtils.pinnedLinks.isPinned({url: "http://example.com/landing/page.html"}), false, "suggested tile is not pinned");
+
+  // pin suggested tile
+  whenPagesUpdated();
+  let siteNode = getCell(0).node.querySelector(".newtab-site");
+  let pinButton = siteNode.querySelector(".newtab-control-pin");
+  EventUtils.synthesizeMouseAtCenter(pinButton, {}, getContentWindow());
+  // wait for whenPagesUpdated
+  yield null;
+
+  // tile should be pinned and turned into history tile
+  is(NewTabUtils.pinnedLinks.isPinned({url: "http://example.com/landing/page.html"}), true, "suggested tile is pinned");
+  tileData = getData(0);
+  is(tileData.type, "history", "pinned type");
+  is(tileData.suggested, null, "no suggested attribute");
+  is(tileData.url, "http://example.com/landing/page.html", "original landing page");
+
+  // set pinned tile endTime into past and reload the page
+  NewTabUtils.pinnedLinks._links[0].endTime = Date.now() - 1000;
+  yield addNewTabPageTab();
+
+  // check that url is reset to base domain and thumbnail points to moz-page-thumb service
+  is(NewTabUtils.pinnedLinks.isPinned({url: "http://example.com/"}), true, "baseDomain url is pinned");
+  tileData = getData(0);
+  is(tileData.type, "history", "type is history");
+  is(tileData.title, "example.com", "title changed to baseDomain");
+  is(tileData.thumbnail.indexOf("moz-page-thumb") != -1, true, "thumbnail contains moz-page-thumb");
+  is(tileData.enhanced, "", "no enhanced image");
+  is(tileData.url, "http://example.com/", "url points to baseDomian");
+
+  DirectoryLinksProvider.getFrecentSitesName = origGetFrecentSitesName;
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/newtab/browser_newtab_enhanced.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/newtab/browser_newtab_enhanced.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/newtab/browser_newtab_enhanced.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/newtab/browser_newtab_enhanced.js	2015-05-25 20:42:43.000000000 +0000
@@ -3,6 +3,14 @@
 
 const PRELOAD_PREF = "browser.newtab.preload";
 
+let suggestedLink = {
+  url: "http://example1.com/2",
+  imageURI: "data:image/png;base64,helloWORLD3",
+  title: "title2",
+  type: "affiliate",
+  frecent_sites: ["classroom.google.com", "codecademy.com", "elearning.ut.ac.id", "khanacademy.org", "learn.jquery.com", "teamtreehouse.com", "tutorialspoint.com", "udacity.com", "w3cschool.cc", "w3schools.com"]
+};
+
 gDirectorySource = "data:application/json," + JSON.stringify({
   "enhanced": [{
     url: "http://example.com/",
@@ -16,21 +24,12 @@
     title: "title1",
     type: "organic"
   }],
-  "suggested": [{
-    url: "http://example1.com/2",
-    imageURI: "data:image/png;base64,helloWORLD3",
-    title: "title2",
-    type: "affiliate",
-    frecent_sites: ["test.com"]
-  }]
+  "suggested": [suggestedLink]
 });
 
 function runTests() {
-  let origGetFrecentSitesName = DirectoryLinksProvider.getFrecentSitesName;
-  DirectoryLinksProvider.getFrecentSitesName = () => "";
   let origEnhanced = NewTabUtils.allPages.enhanced;
   registerCleanupFunction(() => {
-    DirectoryLinksProvider.getFrecentSitesName = origGetFrecentSitesName;
     Services.prefs.clearUserPref(PRELOAD_PREF);
     NewTabUtils.allPages.enhanced = origEnhanced;
   });
@@ -46,6 +45,7 @@
       type: siteNode.getAttribute("type"),
       enhanced: siteNode.querySelector(".enhanced-content").style.backgroundImage,
       title: siteNode.querySelector(".newtab-title").textContent,
+      suggested: siteNode.querySelector(".newtab-suggested").innerHTML
     };
   }
 
@@ -56,50 +56,56 @@
   yield addNewTabPageTab();
   yield customizeNewTabPage("classic");
   yield customizeNewTabPage("enhanced"); // Toggle enhanced off
-  let {type, enhanced, title} = getData(0);
+  let {type, enhanced, title, suggested} = getData(0);
   isnot(type, "enhanced", "history link is not enhanced");
   is(enhanced, "", "history link has no enhanced image");
   is(title, "example.com");
+  is(suggested, "", "There is no suggested explanation");
 
   is(getData(1), null, "there is only one link and it's a history link");
 
   // Test with enhanced = true
   yield addNewTabPageTab();
   yield customizeNewTabPage("enhanced"); // Toggle enhanced on
-  ({type, enhanced, title} = getData(0));
+  ({type, enhanced, title, suggested} = getData(0));
   is(type, "organic", "directory link is organic");
   isnot(enhanced, "", "directory link has enhanced image");
   is(title, "title1");
+  is(suggested, "", "There is no suggested explanation");
 
-  ({type, enhanced, title} = getData(1));
+  ({type, enhanced, title, suggested} = getData(1));
   is(type, "enhanced", "history link is enhanced");
   isnot(enhanced, "", "history link has enhanced image");
   is(title, "title");
+  is(suggested, "", "There is no suggested explanation");
 
   is(getData(2), null, "there are only 2 links, directory and enhanced history");
 
   // Test with a pinned link
   setPinnedLinks("-1");
   yield addNewTabPageTab();
-  ({type, enhanced, title} = getData(0));
+  ({type, enhanced, title, suggested} = getData(0));
   is(type, "enhanced", "pinned history link is enhanced");
   isnot(enhanced, "", "pinned history link has enhanced image");
   is(title, "title");
+  is(suggested, "", "There is no suggested explanation");
 
-  ({type, enhanced, title} = getData(1));
+  ({type, enhanced, title, suggested} = getData(1));
   is(type, "organic", "directory link is organic");
   isnot(enhanced, "", "directory link has enhanced image");
   is(title, "title1");
+  is(suggested, "", "There is no suggested explanation");
 
   is(getData(2), null, "directory link pushed out by pinned history link");
 
   // Test pinned link with enhanced = false
   yield addNewTabPageTab();
   yield customizeNewTabPage("enhanced"); // Toggle enhanced off
-  ({type, enhanced, title} = getData(0));
+  ({type, enhanced, title, suggested} = getData(0));
   isnot(type, "enhanced", "history link is not enhanced");
   is(enhanced, "", "history link has no enhanced image");
   is(title, "example.com");
+  is(suggested, "", "There is no suggested explanation");
 
   is(getData(1), null, "directory link still pushed out by pinned history link");
 
@@ -117,10 +123,11 @@
 
   // Test with enhanced = false
   yield addNewTabPageTab();
-  ({type, enhanced, title} = getData(0));
+  ({type, enhanced, title, suggested} = getData(0));
   isnot(type, "enhanced", "history link is not enhanced");
   is(enhanced, "", "history link has no enhanced image");
   is(title, "example.com");
+  is(suggested, "", "There is no suggested explanation");
 
   isnot(getData(7), null, "there are 8 history links");
   is(getData(8), null, "there are 8 history links");
@@ -131,16 +138,55 @@
   yield customizeNewTabPage("enhanced");
 
   // Suggested link was not enhanced by directory link with same domain
-  ({type, enhanced, title} = getData(0));
+  ({type, enhanced, title, suggested} = getData(0));
   is(type, "affiliate", "suggested link is affiliate");
   is(enhanced, "", "suggested link has no enhanced image");
   is(title, "title2");
+  ok(suggested.indexOf("Suggested for <strong> Web Education </strong> visitors") > -1, "Suggested for 'Web Education'");
 
   // Enhanced history link shows up second
-  ({type, enhanced, title} = getData(1));
+  ({type, enhanced, title, suggested} = getData(1));
   is(type, "enhanced", "pinned history link is enhanced");
   isnot(enhanced, "", "pinned history link has enhanced image");
   is(title, "title");
+  is(suggested, "", "There is no suggested explanation");
 
   is(getData(9), null, "there is a suggested link followed by an enhanced history link and the remaining history links");
+
+
+
+  // Test override category/adgroup name.
+  suggestedLink.adgroup_name = "Technology";
+  Services.prefs.setCharPref(PREF_NEWTAB_DIRECTORYSOURCE,
+    "data:application/json," + JSON.stringify({"suggested": [suggestedLink]}));
+  yield watchLinksChangeOnce().then(TestRunner.next);
+
+  yield addNewTabPageTab();
+  ({type, enhanced, title, suggested} = getData(0));
+  Cu.reportError("SUGGEST " + suggested);
+  ok(suggested.indexOf("Suggested for <strong> Technology </strong> visitors") > -1, "Suggested for 'Technology'");
+
+
+  // Test server provided explanation string.
+  suggestedLink.explanation = "Suggested for %1$S enthusiasts who visit sites like %2$S";
+  Services.prefs.setCharPref(PREF_NEWTAB_DIRECTORYSOURCE,
+    "data:application/json," + encodeURIComponent(JSON.stringify({"suggested": [suggestedLink]})));
+  yield watchLinksChangeOnce().then(TestRunner.next);
+
+  yield addNewTabPageTab();
+  ({type, enhanced, title, suggested} = getData(0));
+  Cu.reportError("SUGGEST " + suggested);
+  ok(suggested.indexOf("Suggested for <strong> Technology </strong> enthusiasts who visit sites like <strong> classroom.google.com </strong>") > -1, "Suggested for 'Technology' enthusiasts");
+
+
+    // Test server provided explanation string without category override.
+  delete suggestedLink.adgroup_name;
+  Services.prefs.setCharPref(PREF_NEWTAB_DIRECTORYSOURCE,
+    "data:application/json," + encodeURIComponent(JSON.stringify({"suggested": [suggestedLink]})));
+  yield watchLinksChangeOnce().then(TestRunner.next);
+
+  yield addNewTabPageTab();
+  ({type, enhanced, title, suggested} = getData(0));
+  Cu.reportError("SUGGEST " + suggested);
+  ok(suggested.indexOf("Suggested for <strong> Web Education </strong> enthusiasts who visit sites like <strong> classroom.google.com </strong>") > -1, "Suggested for 'Web Education' enthusiasts");
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/newtab/browser_newtab_intro.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/newtab/browser_newtab_intro.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/newtab/browser_newtab_intro.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/newtab/browser_newtab_intro.js	2015-05-25 20:42:43.000000000 +0000
@@ -2,50 +2,118 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 const INTRO_PREF = "browser.newtabpage.introShown";
+const UPDATE_INTRO_PREF = "browser.newtabpage.updateIntroShown";
 const PRELOAD_PREF = "browser.newtab.preload";
 
 function runTests() {
   let origIntro = Services.prefs.getBoolPref(INTRO_PREF);
+  let origUpdateIntro = Services.prefs.getBoolPref(UPDATE_INTRO_PREF);
   let origPreload = Services.prefs.getBoolPref(PRELOAD_PREF);
   registerCleanupFunction(_ => {
     Services.prefs.setBoolPref(INTRO_PREF, origIntro);
+    Services.prefs.setBoolPref(INTRO_PREF, origUpdateIntro);
     Services.prefs.setBoolPref(PRELOAD_PREF, origPreload);
   });
 
   // Test with preload false
   Services.prefs.setBoolPref(INTRO_PREF, false);
+  Services.prefs.setBoolPref(UPDATE_INTRO_PREF, false);
   Services.prefs.setBoolPref(PRELOAD_PREF, false);
 
-  let panel;
-  function maybeWaitForPanel() {
-    // If already open, no need to wait
-    if (panel.state == "open") {
-      executeSoon(TestRunner.next);
-      return;
-    }
-
-    // We're expecting the panel to open, so wait for it
-    panel.addEventListener("popupshown", TestRunner.next);
-    isnot(panel.state, "open", "intro panel can be slow to show");
-  }
+  let intro;
+  let brand = Services.strings.createBundle("chrome://branding/locale/brand.properties");
+  let brandShortName = brand.GetStringFromName("brandShortName");
 
   yield addNewTabPageTab();
-  panel = getContentDocument().getElementById("newtab-intro-panel");
-  yield maybeWaitForPanel();
-  is(panel.state, "open", "intro automatically shown on first opening");
+  intro = getContentDocument().getElementById("newtab-intro-mask");
+  is(intro.style.opacity, 1, "intro automatically shown on first opening");
+  is(getContentDocument().getElementById("newtab-intro-header").innerHTML,
+     'Welcome to New Tab on <span xmlns="http://www.w3.org/1999/xhtml" class="bold">' + brandShortName + '</span>!', "we show the first-run intro.");
   is(Services.prefs.getBoolPref(INTRO_PREF), true, "newtab remembers that the intro was shown");
+  is(Services.prefs.getBoolPref(UPDATE_INTRO_PREF), true, "newtab avoids showing update if intro was shown");
 
   yield addNewTabPageTab();
-  panel = getContentDocument().getElementById("newtab-intro-panel");
-  is(panel.state, "closed", "intro not shown on second opening");
+  intro = getContentDocument().getElementById("newtab-intro-mask");
+  is(intro.style.opacity, 0, "intro not shown on second opening");
 
   // Test with preload true
   Services.prefs.setBoolPref(INTRO_PREF, false);
   Services.prefs.setBoolPref(PRELOAD_PREF, true);
 
   yield addNewTabPageTab();
-  panel = getContentDocument().getElementById("newtab-intro-panel");
-  yield maybeWaitForPanel();
-  is(panel.state, "open", "intro automatically shown on preloaded opening");
+  intro = getContentDocument().getElementById("newtab-intro-mask");
+  is(intro.style.opacity, 1, "intro automatically shown on preloaded opening");
+  is(getContentDocument().getElementById("newtab-intro-header").innerHTML,
+     'Welcome to New Tab on <span xmlns="http://www.w3.org/1999/xhtml" class="bold">' + brandShortName + '</span>!', "we show the first-run intro.");
   is(Services.prefs.getBoolPref(INTRO_PREF), true, "newtab remembers that the intro was shown");
+  is(Services.prefs.getBoolPref(UPDATE_INTRO_PREF), true, "newtab avoids showing update if intro was shown");
+
+  // Test with first run true but update false
+  Services.prefs.setBoolPref(UPDATE_INTRO_PREF, false);
+
+  yield addNewTabPageTab();
+  intro = getContentDocument().getElementById("newtab-intro-mask");
+  is(intro.style.opacity, 1, "intro automatically shown on preloaded opening");
+  is(getContentDocument().getElementById("newtab-intro-header").innerHTML,
+     "New Tab got an update!", "we show the update intro.");
+  is(Services.prefs.getBoolPref(INTRO_PREF), true, "INTRO_PREF stays true");
+  is(Services.prefs.getBoolPref(UPDATE_INTRO_PREF), true, "newtab remembers that the update intro was show");
+
+  // Test clicking the 'next' and 'back' buttons.
+  let buttons = getContentDocument().getElementById("newtab-intro-buttons").getElementsByTagName("input");
+  let progress = getContentDocument().getElementById("newtab-intro-numerical-progress");
+  let back = buttons[0];
+  let next = buttons[1];
+
+  is(progress.getAttribute("page"), 0, "we are on the first page");
+  is(intro.style.opacity, 1, "intro visible");
+
+
+  let createMutationObserver = function(fcn) {
+    return new Promise(resolve => {
+      let observer = new MutationObserver(function(mutations) {
+        fcn();
+        observer.disconnect();
+        resolve();
+      });
+      let config = { attributes: true, attributeFilter: ["style"], childList: true };
+      observer.observe(progress, config);
+    });
+  }
+
+  let p = createMutationObserver(function() {
+    is(progress.getAttribute("page"), 1, "we get to the 2nd page");
+    is(intro.style.opacity, 1, "intro visible");
+  });
+  next.click();
+  yield p.then(TestRunner.next);
+
+  p = createMutationObserver(function() {
+    is(progress.getAttribute("page"), 2, "we get to the 3rd page");
+    is(intro.style.opacity, 1, "intro visible");
+  });
+  next.click();
+  yield p.then(TestRunner.next);
+
+  p = createMutationObserver(function() {
+    is(progress.getAttribute("page"), 1, "go back to 2nd page");
+    is(intro.style.opacity, 1, "intro visible");
+  });
+  back.click();
+  yield p.then(TestRunner.next);
+
+  p = createMutationObserver(function() {
+    is(progress.getAttribute("page"), 0, "go back to 1st page");
+    is(intro.style.opacity, 1, "intro visible");
+  });
+  back.click();
+  yield p.then(TestRunner.next);
+
+
+  p = createMutationObserver(function() {
+    is(progress.getAttribute("page"), 0, "another back will 'skip tutorial'");
+    is(intro.style.opacity, 0, "intro exited");
+  });
+  back.click();
+  p.then(TestRunner.next);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/newtab/browser_newtab_reportLinkAction.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/newtab/browser_newtab_reportLinkAction.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/newtab/browser_newtab_reportLinkAction.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/newtab/browser_newtab_reportLinkAction.js	2015-05-25 20:42:43.000000000 +0000
@@ -41,20 +41,27 @@
   yield null;
   yield null;
 
+  whenPagesUpdated();
   // Click the pin button on the link in the 1th tile spot
   let siteNode = getCell(1).node.querySelector(".newtab-site");
   let pinButton = siteNode.querySelector(".newtab-control-pin");
   expected.action = "pin";
+  // tiles become "history" when pinned
+  expected.type = "history";
   expected.pinned = true;
   EventUtils.synthesizeMouseAtCenter(pinButton, {}, getContentWindow());
 
-  // Wait for reportSitesAction
+  // Wait for whenPagesUpdated and reportSitesAction
+  yield null;
   yield null;
 
   // Unpin that link
   expected.action = "unpin";
   expected.pinned = false;
   whenPagesUpdated();
+  // need to reget siteNode for it could have been re-rendered after pin
+  siteNode = getCell(1).node.querySelector(".newtab-site");
+  pinButton = siteNode.querySelector(".newtab-control-pin");
   EventUtils.synthesizeMouseAtCenter(pinButton, {}, getContentWindow());
 
   // Wait for whenPagesUpdated and reportSitesAction
@@ -75,7 +82,7 @@
   yield null;
 
   // Click the 1th link now in the 0th tile spot
-  expected.type = "sponsored";
+  expected.type = "history";
   expected.action = "click";
   EventUtils.synthesizeMouseAtCenter(siteNode, {}, getContentWindow());
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/plugins/browser.ini firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/plugins/browser.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/plugins/browser.ini	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/plugins/browser.ini	2015-05-25 20:42:43.000000000 +0000
@@ -55,7 +55,6 @@
 skip-if = !crashreporter
 [browser_CTP_data_urls.js]
 [browser_CTP_drag_drop.js]
-skip-if = e10s # misc. issues, bug 1156871
 [browser_CTP_hide_overlay.js]
 [browser_CTP_iframe.js]
 skip-if = os == 'linux' || os == 'mac' # Bug 984821
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/referrer/head.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/referrer/head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/referrer/head.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/referrer/head.js	2015-05-25 20:42:43.000000000 +0000
@@ -49,19 +49,19 @@
     rel: "noreferrer",
     result: ""  // rel=noreferrer trumps meta-referrer
   },
-  // 3. Origin-when-crossorigin policy - this depends on the triggering
+  // 3. Origin-when-cross-origin policy - this depends on the triggering
   //    principal.  We expect full referrer for same-origin requests,
   //    and origin referrer for cross-origin requests.
   {
     fromScheme: "https://",
     toScheme: "https://",
-    policy: "origin-when-crossorigin",
+    policy: "origin-when-cross-origin",
     result: "https://test1.example.com/browser"  // same origin
   },
   {
     fromScheme: "http://",
     toScheme: "https://",
-    policy: "origin-when-crossorigin",
+    policy: "origin-when-cross-origin",
     result: "http://test1.example.com"  // cross origin
   },
 ];
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/social/browser_aboutHome_activation.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/social/browser_aboutHome_activation.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/social/browser_aboutHome_activation.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/social/browser_aboutHome_activation.js	2015-05-25 20:42:43.000000000 +0000
@@ -17,7 +17,7 @@
 '         "name": "Demo Social Service",' +
 '         "origin": "https://example.com",' +
 '         "iconURL": "chrome://branding/content/icon16.png",' +
-'         "icon32URL": "chrome://branding/content/favicon32.png",' +
+'         "icon32URL": "chrome://branding/content/icon32.png",' +
 '         "icon64URL": "chrome://branding/content/icon64.png",' +
 '         "sidebarURL": "https://example.com/browser/browser/base/content/test/social/social_sidebar_empty.html",' +
 '         "postActivationURL": "https://example.com/browser/browser/base/content/test/social/social_postActivation.html",' +
@@ -29,7 +29,7 @@
 '       }' +
 '     </script>' +
 '     <div id="activationSnippet" onclick="activateProvider(this)">' +
-'     <img src="chrome://branding/content/favicon32.png"></img>' +
+'     <img src="chrome://branding/content/icon32.png"></img>' +
 '     </div>';
 
 // enable one-click activation
@@ -39,7 +39,7 @@
 '         "name": "Demo Social Service",' +
 '         "origin": "https://example.com",' +
 '         "iconURL": "chrome://branding/content/icon16.png",' +
-'         "icon32URL": "chrome://branding/content/favicon32.png",' +
+'         "icon32URL": "chrome://branding/content/icon32.png",' +
 '         "icon64URL": "chrome://branding/content/icon64.png",' +
 '         "sidebarURL": "https://example.com/browser/browser/base/content/test/social/social_sidebar_empty.html",' +
 '         "postActivationURL": "https://example.com/browser/browser/base/content/test/social/social_postActivation.html",' +
@@ -52,18 +52,14 @@
 '       }' +
 '     </script>' +
 '     <div id="activationSnippet" onclick="activateProvider(this)">' +
-'     <img src="chrome://branding/content/favicon32.png"></img>' +
+'     <img src="chrome://branding/content/icon32.png"></img>' +
 '     </div>';
 
 let gTests = [
 
 {
   desc: "Test activation with enable panel",
-  setup: function (aSnippetsMap)
-  {
-    // This must be some incorrect xhtml code.
-    aSnippetsMap.set("snippets", snippet);
-  },
+  snippet: snippet,
   run: function (aSnippetsMap)
   {
     let deferred = Promise.defer();
@@ -81,7 +77,6 @@
       gBrowser.removeTab(gBrowser.selectedTab);
       SocialService.uninstallProvider(SocialSidebar.provider.origin, function () {
         info("provider uninstalled");
-        aSnippetsMap.delete("snippets");
         deferred.resolve(true);
       });
     });
@@ -91,11 +86,7 @@
 
 {
   desc: "Test activation bypassing enable panel",
-  setup: function (aSnippetsMap)
-  {
-    // This must be some incorrect xhtml code.
-    aSnippetsMap.set("snippets", snippet2);
-  },
+  snippet: snippet2,
   run: function (aSnippetsMap)
   {
     let deferred = Promise.defer();
@@ -113,7 +104,6 @@
       gBrowser.removeTab(gBrowser.selectedTab);
       SocialService.uninstallProvider(SocialSidebar.provider.origin, function () {
         info("provider uninstalled");
-        aSnippetsMap.delete("snippets");
         deferred.resolve(true);
       });
     });
@@ -136,7 +126,7 @@
       let tab = gBrowser.selectedTab = gBrowser.addTab("about:blank");
 
       // Add an event handler to modify the snippets map once it's ready.
-      let snippetsPromise = promiseSetupSnippetsMap(tab, test.setup);
+      let snippetsPromise = promiseSetupSnippetsMap(tab, test.snippet);
 
       // Start loading about:home and wait for it to complete.
       yield promiseTabLoadEvent(tab, "about:home", "AboutHomeLoadSnippetsCompleted");
@@ -196,32 +186,45 @@
  *        The setup function to be run.
  * @return {Promise} resolved when the snippets are ready.  Gets the snippets map.
  */
-function promiseSetupSnippetsMap(aTab, aSetupFn)
+function promiseSetupSnippetsMap(aTab, aSnippet)
 {
-  let deferred = Promise.defer();
   info("Waiting for snippets map");
-  aTab.linkedBrowser.addEventListener("AboutHomeLoadSnippets", function load(event) {
-    aTab.linkedBrowser.removeEventListener("AboutHomeLoadSnippets", load, true);
 
-    let cw = aTab.linkedBrowser.contentWindow.wrappedJSObject;
-    // The snippets should already be ready by this point. Here we're
-    // just obtaining a reference to the snippets map.
-    cw.ensureSnippetsMapThen(function (aSnippetsMap) {
-      aSnippetsMap = Cu.waiveXrays(aSnippetsMap);
-      info("Got snippets map: " +
-           "{ last-update: " + aSnippetsMap.get("snippets-last-update") +
-           ", cached-version: " + aSnippetsMap.get("snippets-cached-version") +
-           " }");
-      // Don't try to update.
-      aSnippetsMap.set("snippets-last-update", Date.now());
-      aSnippetsMap.set("snippets-cached-version", AboutHomeUtils.snippetsVersion);
-      // Clear snippets.
-      aSnippetsMap.delete("snippets");
-      aSetupFn(aSnippetsMap);
-      deferred.resolve(aSnippetsMap);
-    });
-  }, true, true);
-  return deferred.promise;
+  return ContentTask.spawn(aTab.linkedBrowser,
+                    {snippetsVersion: AboutHomeUtils.snippetsVersion,
+                     snippet: aSnippet},
+                    function*(arg) {
+
+    let obj = {};
+    Cu.import("resource://gre/modules/Promise.jsm", obj);
+    let deferred = obj.Promise.defer();
+
+    addEventListener("AboutHomeLoadSnippets", function load(event) {
+      removeEventListener("AboutHomeLoadSnippets", load, true);
+
+      let cw = content.window.wrappedJSObject;
+
+      // The snippets should already be ready by this point. Here we're
+      // just obtaining a reference to the snippets map.
+      cw.ensureSnippetsMapThen(function (aSnippetsMap) {
+        aSnippetsMap = Cu.waiveXrays(aSnippetsMap);
+        console.log("Got snippets map: " +
+             "{ last-update: " + aSnippetsMap.get("snippets-last-update") +
+             ", cached-version: " + aSnippetsMap.get("snippets-cached-version") +
+             " }");
+        // Don't try to update.
+        aSnippetsMap.set("snippets-last-update", Date.now());
+        aSnippetsMap.set("snippets-cached-version", arg.snippetsVersion);
+        // Clear snippets.
+        aSnippetsMap.delete("snippets");
+        aSnippetsMap.set("snippets", arg.snippet);
+        deferred.resolve();
+      });
+    }, true, true);
+
+    return deferred.promise;
+
+  });
 }
 
 
@@ -233,7 +236,7 @@
   if (doc.defaultView.frames[0])
     doc = doc.defaultView.frames[0].document;
   let button = doc.getElementById("activationSnippet");
-  EventUtils.synthesizeMouseAtCenter(button, {}, doc.defaultView);
+  BrowserTestUtils.synthesizeMouseAtCenter(button, {}, tab.linkedBrowser);
   executeSoon(callback);
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/social/browser.ini firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/social/browser.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/social/browser.ini	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/social/browser.ini	2015-05-25 20:42:43.000000000 +0000
@@ -27,7 +27,6 @@
   unchecked.jpg
 
 [browser_aboutHome_activation.js]
-skip-if = e10s # Bug 1053965 "cw.ensureSnippetsMapThen is not a function", also see general/browser.ini about:home comments
 [browser_addons.js]
 skip-if = e10s && debug # Leaking docshells (bug 1150147)
 [browser_blocklist.js]
@@ -35,7 +34,7 @@
 [browser_share.js]
 skip-if = true # bug 1115131
 [browser_social_activation.js]
-skip-if = e10s # Bug 933103 synthesizeMouseAtCenter not e10s friendly
+skip-if = e10s && debug # e10s/Linux/Debug Leaking docshells (bug 1150147)
 [browser_social_chatwindow.js]
 [browser_social_chatwindow_resize.js]
 [browser_social_chatwindowfocus.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/social/browser_social_activation.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/social/browser_social_activation.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/social/browser_social_activation.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/social/browser_social_activation.js	2015-05-25 20:42:43.000000000 +0000
@@ -62,12 +62,7 @@
 function sendActivationEvent(tab, callback, nullManifest) {
   // hack Social.lastEventReceived so we don't hit the "too many events" check.
   Social.lastEventReceived = 0;
-  let doc = tab.linkedBrowser.contentDocument;
-  // if our test has a frame, use it
-  if (doc.defaultView.frames[0])
-    doc = doc.defaultView.frames[0].document;
-  let button = doc.getElementById(nullManifest ? "activation-old" : "activation");
-  EventUtils.synthesizeMouseAtCenter(button, {}, doc.defaultView);
+  BrowserTestUtils.synthesizeMouseAtCenter("#activation", {}, tab.linkedBrowser);
   executeSoon(callback);
 }
 
@@ -117,24 +112,22 @@
   AddonManager.getAddonsByTypes(["service"], function(aAddons) {
     let addon = aAddons[0];
 
-    let doc = tab.linkedBrowser.contentDocument;
+    let doc = tab.linkedBrowser.contentDocument;;
     let list = doc.getElementById("addon-list");
 
     let item = getAddonItemInList(addon.id, list);
-    isnot(item, null, "Should have found the add-on in the list");
-
-    var button = doc.getAnonymousElementByAttribute(item, "anonid", "remove-btn");
+    let button = item._removeBtn;
     isnot(button, null, "Should have a remove button");
     ok(!button.disabled, "Button should not be disabled");
 
-    EventUtils.synthesizeMouseAtCenter(button, { }, doc.defaultView);
-
-    // Force XBL to apply
-    item.clientTop;
-
-    is(item.getAttribute("pending"), "uninstall", "Add-on should be uninstalling");
+    // uninstall happens after about:addons tab is closed, so we wait on
+    // disabled
+    promiseObserverNotified("social:provider-disabled").then(() => {
+      is(item.getAttribute("pending"), "uninstall", "Add-on should be uninstalling");
+      executeSoon(function() { aCallback(addon); });
+    });
 
-    executeSoon(function() { aCallback(addon); });
+    BrowserTestUtils.synthesizeMouseAtCenter(button, {}, tab.linkedBrowser);
   });
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/social/browser_social_errorPage.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/social/browser_social_errorPage.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/social/browser_social_errorPage.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/social/browser_social_errorPage.js	2015-05-25 20:42:43.000000000 +0000
@@ -62,17 +62,17 @@
   testSidebar: function(next) {
     let sbrowser = document.getElementById("social-sidebar-browser");
     onSidebarLoad(function() {
-      ok(sbrowser.contentDocument.location.href.indexOf("about:socialerror?")==0, "sidebar is on social error page");
+      ok(sbrowser.contentDocument.documentURI.indexOf("about:socialerror?mode=tryAgainOnly")==0, "sidebar is on social error page");
       gc();
       // Add a new load listener, then find and click the "try again" button.
       onSidebarLoad(function() {
         // should still be on the error page.
-        ok(sbrowser.contentDocument.location.href.indexOf("about:socialerror?")==0, "sidebar is still on social error page");
+        ok(sbrowser.contentDocument.documentURI.indexOf("about:socialerror?mode=tryAgainOnly")==0, "sidebar is still on social error page");
         // go online and try again - this should work.
         goOnline().then(function () {
           onSidebarLoad(function() {
             // should now be on the correct page.
-            is(sbrowser.contentDocument.location.href, manifest.sidebarURL, "sidebar is now on social sidebar page");
+            is(sbrowser.contentDocument.documentURI, manifest.sidebarURL, "sidebar is now on social sidebar page");
             next();
           });
           sbrowser.contentDocument.getElementById("btnTryAgain").click();
@@ -97,8 +97,8 @@
         },
         function() { // the "load" callback.
           todo_is(panelCallbackCount, 0, "Bug 833207 - should be no callback when error page loads.");
-          let href = panel.firstChild.contentDocument.location.href;
-          ok(href.indexOf("about:socialerror?")==0, "flyout is on social error page");
+          let href = panel.firstChild.contentDocument.documentURI;
+          ok(href.indexOf("about:socialerror?mode=compactInfo")==0, "flyout is on social error page");
           // Bug 832943 - the listeners previously stopped working after a GC, so
           // force a GC now and try again.
           gc();
@@ -109,8 +109,8 @@
             },
             function() { // the "load" callback.
               todo_is(panelCallbackCount, 0, "Bug 833207 - should be no callback when error page loads.");
-              let href = panel.firstChild.contentDocument.location.href;
-              ok(href.indexOf("about:socialerror?")==0, "flyout is on social error page");
+              let href = panel.firstChild.contentDocument.documentURI;
+              ok(href.indexOf("about:socialerror?mode=compactInfo")==0, "flyout is on social error page");
               gc();
               SocialFlyout.unload();
               next();
@@ -134,7 +134,7 @@
         function() { // the "load" callback.
           todo_is(panelCallbackCount, 0, "Bug 833207 - should be no callback when error page loads.");
           let chat = getChatBar().selectedChat;
-          waitForCondition(function() chat.content != null && chat.contentDocument.location.href.indexOf("about:socialerror?")==0,
+          waitForCondition(function() chat.content != null && chat.contentDocument.documentURI.indexOf("about:socialerror?mode=tryAgainOnly")==0,
                            function() {
                             chat.close();
                             next();
@@ -157,7 +157,7 @@
       null,
       function() { // the "load" callback.
         let chat = getChatBar().selectedChat;
-        is(chat.contentDocument.location.href, url, "correct url loaded");
+        is(chat.contentDocument.documentURI, url, "correct url loaded");
         // toggle to a detached window.
         chat.swapWindows().then(
           chat => {
@@ -169,7 +169,7 @@
                 ok(!!chat.content, "we have chat content 2");
                 chat.contentDocument.location.reload();
                 info("chat reload called");
-                waitForCondition(function() chat.contentDocument.location.href.indexOf("about:socialerror?")==0,
+                waitForCondition(function() chat.contentDocument.documentURI.indexOf("about:socialerror?mode=tryAgainOnly")==0,
                                  function() {
                                   chat.close();
                                   next();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/social/browser_social_marks.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/social/browser_social_marks.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/social/browser_social_marks.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/social/browser_social_marks.js	2015-05-25 20:42:43.000000000 +0000
@@ -238,7 +238,7 @@
         ensureEventFired(btn.panel, "popupshown").then(() => {
           info("marks panel is open");
           ensureFrameLoaded(btn.content).then(() => {
-            is(btn.contentDocument.location.href.indexOf("about:socialerror?"), 0, "social error page is showing");
+            is(btn.contentDocument.documentURI.indexOf("about:socialerror?mode=tryAgainOnly"), 0, "social error page is showing "+btn.contentDocument.documentURI);
             // cleanup after the page has been unmarked
             ensureBrowserTabClosed(tab).then(() => {
               ok(btn.disabled, "button is disabled");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/social/browser_social_status.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/social/browser_social_status.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/social/browser_social_status.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/social/browser_social_status.js	2015-05-25 20:42:43.000000000 +0000
@@ -183,7 +183,7 @@
       let panel = document.getElementById("social-notification-panel");
       ensureEventFired(panel, "popupshown").then(() => {
         ensureFrameLoaded(frame).then(() => {
-          is(frame.contentDocument.location.href.indexOf("about:socialerror?"), 0, "social error page is showing "+frame.contentDocument.location.href);
+          is(frame.contentDocument.documentURI.indexOf("about:socialerror?mode=tryAgainOnly"), 0, "social error page is showing "+frame.contentDocument.documentURI);
           panel.hidePopup();
           goOnline().then(next);
         });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/social/browser_social_workercrash.js firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/social/browser_social_workercrash.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/test/social/browser_social_workercrash.js	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/test/social/browser_social_workercrash.js	2015-05-25 20:42:43.000000000 +0000
@@ -63,7 +63,7 @@
           Services.obs.removeObserver(observer, 'ipc:content-shutdown');
           // Add another sidebar load listener - it should be the error page.
           onSidebarLoad(function() {
-            ok(sbrowser.contentDocument.location.href.indexOf("about:socialerror?")==0, "is on social error page");
+            ok(sbrowser.contentDocument.location.href.indexOf("about:socialerror?mode=workerFailure")==0, "is on social error page");
             // after reloading, the sidebar should reload
             onSidebarLoad(function() {
               // now ping both workers - they should both be alive.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/urlbarBindings.xml firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/urlbarBindings.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/content/urlbarBindings.xml	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/content/urlbarBindings.xml	2015-05-25 20:42:43.000000000 +0000
@@ -596,7 +596,7 @@
 
             Cc["@mozilla.org/widget/clipboardhelper;1"]
               .getService(Ci.nsIClipboardHelper)
-              .copyString(val, document);
+              .copyString(val);
           },
           supportsCommand: function(aCommand) {
             switch (aCommand) {
@@ -866,6 +866,23 @@
         ]]></body>
       </method>
 
+      <method name="handleDelete">
+        <body><![CDATA[
+          // When UnifiedComplete is enabled, we arrange for the popup to
+          // always have a "special" first item that's always selected. The
+          // autocomplete controller's handleDelete() implementation will
+          // remove the selected entry from the popup in that case.
+          // So when our first special item is selected, we call handleText
+          // instead so it acts as a delete on the text value instead of
+          // removing that item.
+          if (Services.prefs.getBoolPref("browser.urlbar.unifiedcomplete") &&
+              this.popup.selectedIndex == 0) {
+            return this.mController.handleText();
+          }
+          return this.mController.handleDelete();
+        ]]></body>
+      </method>
+
     </implementation>
 
     <handlers>
@@ -952,7 +969,7 @@
 
         Cc["@mozilla.org/widget/clipboardhelper;1"]
           .getService(Ci.nsIClipboardHelper)
-          .copyStringToClipboard(val, Ci.nsIClipboard.kSelectionClipboard, document);
+          .copyStringToClipboard(val, Ci.nsIClipboard.kSelectionClipboard);
       ]]></handler>
     </handlers>
 
@@ -2781,7 +2798,7 @@
        which is empty because the actual panel is not implemented inside an XBL
        binding, but made of elements added to the notification panel. This
        allows accessing the full structure while the panel is hidden. -->
-  <binding id="password-fill-notification" extends="chrome://global/content/bindings/notification.xml#popup-notification">
+  <binding id="login-fill-notification" extends="chrome://global/content/bindings/notification.xml#popup-notification">
     <content>
       <children/>
     </content>
@@ -3000,7 +3017,7 @@
             return "passwords";
           if (type == "editBookmarkPanel")
             return "bookmarks";
-          if (type == "addon-install-complete") {
+          if (type == "addon-install-complete" || type == "addon-install-restart") {
             if (!Services.prefs.prefHasUserValue("services.sync.username"))
               return "addons";
             if (!Services.prefs.getBoolPref("services.sync.engine.addons"))
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/base/jar.mn firefox-trunk-41.0~a1~hg20150524r245419/browser/base/jar.mn
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/base/jar.mn	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/base/jar.mn	2015-05-25 20:42:43.000000000 +0000
@@ -75,7 +75,7 @@
 *       content/browser/browser.css                   (content/browser.css)
 *       content/browser/browser.js                    (content/browser.js)
 *       content/browser/browser.xul                   (content/browser.xul)
-        content/browser/browser-pocket.properties     (content/browser-pocket.properties)
+        content/browser/browser-pocket-en-US.properties (content/browser-pocket-en-US.properties)
         content/browser/browser-pocket.dtd            (content/browser-pocket.dtd)
         content/browser/browser-pocket-de.properties  (content/browser-pocket-de.properties)
         content/browser/browser-pocket-es-ES.properties (content/browser-pocket-es-ES.properties)
@@ -85,6 +85,7 @@
 *       content/browser/chatWindow.xul                (content/chatWindow.xul)
         content/browser/tab-content.js                (content/tab-content.js)
         content/browser/content.js                    (content/content.js)
+        content/browser/social-content.js             (content/social-content.js)
         content/browser/defaultthemes/1.footer.jpg    (content/defaultthemes/1.footer.jpg)
         content/browser/defaultthemes/1.header.jpg    (content/defaultthemes/1.header.jpg)
         content/browser/defaultthemes/1.icon.jpg      (content/defaultthemes/1.icon.jpg)
@@ -107,9 +108,13 @@
         content/browser/defaultthemes/5.preview.jpg   (content/defaultthemes/5.preview.jpg)
         content/browser/defaultthemes/devedition.header.png   (content/defaultthemes/devedition.header.png)
         content/browser/defaultthemes/devedition.icon.png     (content/defaultthemes/devedition.icon.png)
+        content/browser/gcli_sec_bad.svg              (content/gcli_sec_bad.svg)
+        content/browser/gcli_sec_good.svg             (content/gcli_sec_good.svg)
+        content/browser/gcli_sec_moderate.svg         (content/gcli_sec_moderate.svg)
         content/browser/newtab/newTab.xul             (content/newtab/newTab.xul)
 *       content/browser/newtab/newTab.js              (content/newtab/newTab.js)
         content/browser/newtab/newTab.css             (content/newtab/newTab.css)
+        content/browser/newtab/newTab.inadjacent.json         (content/newtab/newTab.inadjacent.json)
 *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
         content/browser/pageinfo/pageInfo.js          (content/pageinfo/pageInfo.js)
         content/browser/pageinfo/pageInfo.css         (content/pageinfo/pageInfo.css)
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/browser/branding/aurora/appname.bmp and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/browser/branding/aurora/appname.bmp differ
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/branding/aurora/branding.nsi firefox-trunk-41.0~a1~hg20150524r245419/browser/branding/aurora/branding.nsi
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/branding/aurora/branding.nsi	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/branding/aurora/branding.nsi	2015-05-25 20:42:43.000000000 +0000
@@ -26,8 +26,8 @@
 # settings.
 # The dialog units for the bitmap's dimensions should match exactly with the
 # bitmap's width and height in pixels.
-!define APPNAME_BMP_WIDTH_DU 123u
-!define APPNAME_BMP_HEIGHT_DU 56u
+!define APPNAME_BMP_WIDTH_DU 108u
+!define APPNAME_BMP_HEIGHT_DU 48u
 !define INTRO_BLURB_WIDTH_DU "232u"
 !define INTRO_BLURB_EDGE_DU "196u"
 !define INTRO_BLURB_LTR_TOP_DU "16u"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/branding/aurora/content/about-wordmark.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/branding/aurora/content/about-wordmark.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/branding/aurora/content/about-wordmark.svg	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/branding/aurora/content/about-wordmark.svg	2015-05-25 20:42:44.000000000 +0000
@@ -1,60 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<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 132 62" width="132" height="62">
-  	 
-<path d="M5.3,45.2H2.7L0.1,57.3h3.2c1.8,0,3-0.4,4.2-1.5c1.4-1.2,2.6-4.1,2.6-6.2c0-1.7-0.4-2.8-1.2-3.5C8,45.4,7.1,45.2,5.3,45.2z
-	 M6.6,54.9c-0.7,0.9-1.9,1.3-3.5,1.3H1.8l2.1-9.8h1.5c1.3,0,2,0.2,2.6,1.1c0.4,0.5,0.5,1.3,0.5,2.4C8.5,51.2,7.9,53.4,6.6,54.9z
-	 M15.3,48.3c-1.1,0-2,0.4-2.9,1.2c-1.3,1.2-2,3.1-2,4.8c0,2,1.3,3.2,2.9,3.2c1.8,0,2.7-0.4,3.6-1.3l-0.6-0.8c-0.8,0.7-1.5,1-2.6,1
-	c-0.9,0-1.8-0.7-1.8-1.9c0-0.3,0-0.7,0.1-1.1c0.4,0,0.8,0,1.1,0c1.9,0,3.1-0.3,3.8-1c0.5-0.5,0.8-1.1,0.8-1.8
-	C17.8,49.2,17,48.3,15.3,48.3z M16,51.7c-0.5,0.4-1.2,0.7-2.8,0.7c-0.3,0-0.7,0-0.9,0c0.5-1.8,1.6-3,2.8-3c1,0,1.4,0.5,1.4,1.2
-	C16.4,51,16.2,51.4,16,51.7z M25,48.5l-3.3,5.9c-0.4,0.6-0.5,1-0.7,1.5h0c0-0.4-0.1-0.9-0.1-1.5l-0.8-6.1l-1.4,0.3l1.3,8.8h1.4
-	l5.2-8.9L25,48.5z M30.7,48.3c-1.1,0-2,0.4-2.9,1.2c-1.3,1.2-2,3.1-2,4.8c0,2,1.3,3.2,2.9,3.2c1.8,0,2.7-0.4,3.6-1.3l-0.6-0.8
-	c-0.8,0.7-1.5,1-2.6,1c-0.9,0-1.8-0.7-1.8-1.9c0-0.3,0-0.7,0.1-1.1c0.4,0,0.8,0,1.1,0c1.9,0,3.1-0.3,3.8-1c0.5-0.5,0.8-1.1,0.8-1.8
-	C33.3,49.2,32.4,48.3,30.7,48.3z M31.4,51.7c-0.5,0.4-1.2,0.7-2.8,0.7c-0.3,0-0.7,0-0.9,0c0.5-1.8,1.6-3,2.8-3c1,0,1.4,0.5,1.4,1.2
-	C31.9,51,31.7,51.4,31.4,51.7z M37.2,47.5c0.2-1.1,0.4-2.5,0.1-3.2l-1.5,0.6c0.2,0.6,0.2,1.5-0.1,2.7L34,55.7
-	c-0.1,0.3-0.1,0.5-0.1,0.8c0,0.7,0.4,1,1.2,1c0.4,0,0.7,0,1.1-0.2l-0.1-0.9c-0.1,0-0.2,0-0.3,0c-0.2,0-0.4-0.1-0.4-0.4
-	c0-0.2,0-0.4,0.1-0.6L37.2,47.5z M42.3,48.2c-2.8,0-4.9,2.6-4.9,6.1c0,2,1.1,3.2,3,3.2c2.9,0,4.9-2.7,4.9-6.1
-	C45.3,49.5,44.4,48.2,42.3,48.2z M40.7,56.4c-1.1,0-1.7-0.6-1.7-1.9c0-2.9,1.2-5.1,3.2-5.1c0.9,0,1.7,0.5,1.7,1.9
-	C43.8,54,42.7,56.4,40.7,56.4z M52.1,48.3c-1,0-2.3,0.5-3.2,1.8c0.2-0.9,0.1-1.4-0.1-1.9l-1.3,0.6c0.2,0.6,0.2,1-0.1,2.2l-2.2,10
-	l1.4-0.3l0.8-3.6c0.6,0.3,1.2,0.4,2.1,0.4c1.2,0,2.4-0.6,3.3-1.6c0.9-1.1,1.5-3.2,1.5-4.8C54.4,49.4,53.7,48.3,52.1,48.3z
-	 M51.8,55.2c-0.4,0.7-1.4,1.2-2.2,1.2c-0.7,0-1.4-0.2-1.8-0.5l0.9-4.3c0.9-1.3,2-1.9,2.9-1.9c0.9,0,1.3,0.5,1.3,1.7
-	C52.9,52.5,52.4,54.3,51.8,55.2z M60.1,48.3c-1.1,0-2,0.4-2.9,1.2c-1.3,1.2-2,3.1-2,4.8c0,2,1.3,3.2,2.9,3.2c1.8,0,2.7-0.4,3.6-1.3
-	l-0.6-0.8c-0.8,0.7-1.5,1-2.6,1c-0.9,0-1.8-0.7-1.8-1.9c0-0.3,0-0.7,0.1-1.1c0.4,0,0.8,0,1.1,0c1.9,0,3.1-0.3,3.8-1
-	c0.5-0.5,0.8-1.1,0.8-1.8C62.6,49.2,61.8,48.3,60.1,48.3z M60.8,51.7c-0.5,0.4-1.2,0.7-2.8,0.7c-0.3,0-0.7,0-0.9,0
-	c0.5-1.8,1.6-3,2.8-3c1,0,1.4,0.5,1.4,1.2C61.2,51,61,51.4,60.8,51.7z M65.8,50.3c0.2-1,0.2-1.5-0.1-2.1l-1.3,0.6
-	c0.2,0.6,0.2,1.2-0.1,2.5l-1.3,6h1.4l1.2-5.5c0.9-1.3,1.8-2,2.6-2c0.3,0,0.4,0,0.6,0.1l0.6-1.5c-0.2-0.1-0.3-0.1-0.7-0.1
-	C67.8,48.3,66.6,49.1,65.8,50.3z M78.1,51.6l0.3-1.3h-4.2l0.8-4h5l0.5-1.2h-6.7l-2.6,12.1H78l0.3-1.3h-5.4l0.9-4.4H78.1z M86.6,54.5
-	l2.1-9.8l-1.4-0.2l-0.9,4.3c-0.4-0.2-1-0.3-2-0.3c-1,0-2.2,0.4-3.1,1.3c-1.3,1.3-2,3.1-2,4.9c0,1.9,0.8,3,2.5,3
-	c1.3,0,2.3-0.5,3.1-1.6c-0.1,1,0.2,1.4,0.7,1.9l1.2-0.9C86.4,56.3,86.2,55.9,86.6,54.5z M85.2,54.2c-0.9,1.5-2,2.1-3,2.1
-	c-0.9,0-1.3-0.6-1.3-1.7c0-1.3,0.6-3.2,1.4-4.1c0.6-0.6,1.4-1,2.1-1c0.8,0,1.2,0.1,1.7,0.4L85.2,54.2z M88.2,57.3h1.5l1.9-9
-	l-1.5,0.2L88.2,57.3z M91.4,44.7c-0.6,0-1.1,0.5-1.1,1.1c0,0.6,0.5,1.1,1.1,1.1s1.1-0.5,1.1-1.1S92,44.7,91.4,44.7z M93.7,55.7
-	c0-0.2,0-0.6,0.1-1l1.1-5.2h1.9l0.6-1h-2.2c0.2-0.8,0.5-1.9,0.7-2.5l-1.5,0.3c-0.2,0.7-0.4,1.5-0.6,2.2h-1.2l-0.2,1h1.2l-1.1,5.3
-	c-0.1,0.5-0.1,1-0.1,1.3c0,0.9,0.5,1.4,1.6,1.4c0.6,0,1.1-0.1,1.6-0.4v-0.9c-0.3,0.1-0.5,0.2-0.9,0.2C94,56.5,93.7,56.3,93.7,55.7z
-	 M99.8,44.7c-0.6,0-1.1,0.5-1.1,1.1c0,0.6,0.5,1.1,1.1,1.1s1.1-0.5,1.1-1.1S100.4,44.7,99.8,44.7z M96.6,57.3h1.5l1.9-9l-1.5,0.2
-	L96.6,57.3z M105.3,48.2c-2.8,0-4.9,2.6-4.9,6.1c0,2,1.1,3.2,3,3.2c2.9,0,4.9-2.7,4.9-6.1C108.3,49.5,107.3,48.2,105.3,48.2z
-	 M103.6,56.4c-1.1,0-1.7-0.6-1.7-1.9c0-2.9,1.2-5.1,3.1-5.1c0.9,0,1.7,0.5,1.7,1.9C106.8,54,105.7,56.4,103.6,56.4z M115.3,48.3
-	c-1.1,0-2.5,0.6-3.4,1.9c0.2-0.9,0.1-1.4-0.1-1.9l-1.3,0.6c0.2,0.7,0.2,1-0.1,2.2l-1.4,6.3h1.4l1.2-5.8c1.2-1.5,2.4-2.1,3.1-2.1
-	c0.6,0,0.9,0.3,0.9,0.9c0,0.2,0,0.5-0.1,1l-1.3,6h1.4l1.4-6.7c0-0.2,0.1-0.4,0.1-0.6C117.1,49,116.4,48.3,115.3,48.3z M130.9,12.5
-	c-0.1-0.2-0.2-0.4-0.4-0.6c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.1-0.7-0.1c-0.2,0-0.5,0-0.7,0.1c-0.2,0.1-0.4,0.2-0.6,0.4
-	c-0.2,0.2-0.3,0.4-0.4,0.6c-0.1,0.2-0.1,0.5-0.1,0.7c0,0.3,0,0.5,0.1,0.7c0.1,0.2,0.2,0.4,0.4,0.6c0.2,0.2,0.4,0.3,0.6,0.4
-	c0.2,0.1,0.5,0.1,0.7,0.1c0.2,0,0.5,0,0.7-0.1c0.2-0.1,0.4-0.2,0.6-0.4c0.2-0.2,0.3-0.4,0.4-0.6c0.1-0.2,0.1-0.5,0.1-0.7
-	C131,13,131,12.7,130.9,12.5z M130.5,13.8c-0.1,0.2-0.2,0.3-0.3,0.5c-0.1,0.1-0.3,0.2-0.5,0.3c-0.2,0.1-0.4,0.1-0.6,0.1
-	c-0.2,0-0.4,0-0.6-0.1c-0.2-0.1-0.3-0.2-0.5-0.3c-0.1-0.1-0.2-0.3-0.3-0.5c-0.1-0.2-0.1-0.4-0.1-0.6c0-0.2,0-0.4,0.1-0.6
-	c0.1-0.2,0.2-0.3,0.3-0.5c0.1-0.1,0.3-0.2,0.5-0.3c0.2-0.1,0.4-0.1,0.6-0.1c0.2,0,0.4,0,0.6,0.1c0.2,0.1,0.3,0.2,0.5,0.3
-	c0.1,0.1,0.2,0.3,0.3,0.5c0.1,0.2,0.1,0.4,0.1,0.6C130.6,13.5,130.6,13.6,130.5,13.8z M129.6,13.6c0,0-0.1-0.1-0.1-0.1
-	c0,0-0.1-0.1-0.1-0.1c0,0,0,0-0.1-0.1c0.2,0,0.3-0.1,0.4-0.2c0.1-0.1,0.1-0.2,0.1-0.4c0-0.1,0-0.2,0-0.2c0-0.1-0.1-0.1-0.1-0.2
-	c-0.1-0.1-0.1-0.1-0.2-0.1c-0.1,0-0.2,0-0.3,0h-0.6v2h0.3v-0.9c0,0,0.1,0,0.1,0c0,0,0,0,0.1,0c0.1,0.1,0.1,0.1,0.2,0.2
-	c0.1,0.1,0.1,0.2,0.2,0.3l0.2,0.3h0.4l-0.3-0.5C129.7,13.7,129.6,13.7,129.6,13.6z M129.1,13.1h-0.2v-0.6h0.2c0.2,0,0.3,0,0.3,0.1
-	c0.1,0.1,0.1,0.1,0.1,0.2c0,0.1,0,0.2-0.1,0.2c0,0-0.1,0.1-0.1,0.1C129.3,13.1,129.2,13.1,129.1,13.1z M0,36.8h5.8V20.9h9.7v-4.7
-	H5.8V6.9h11.9l0.7-4.7H0V36.8z M24.3,7.7C26.4,7.7,28,6,28,4c0-2.1-1.7-3.7-3.6-3.7c-2.1,0-3.7,1.7-3.7,3.7
-	C20.7,6,22.3,7.7,24.3,7.7z M21.5,36.8h5.6V10.9l-5.6,1V36.8z M32.4,36.8H38V19.7c0.5-2.1,2.5-3.7,4.8-3.7c0.6,0,1,0.2,1.6,0.4
-	l1.7-5.1c-0.7-0.3-1.2-0.4-2-0.4c-2.5,0-4.5,1.3-6.5,4.1c0-1.4-0.4-2.9-1-4l-5.1,1.3c0.6,1.6,0.9,3.6,0.9,6.8V36.8z M56.9,37.4
-	c3.4,0,6.5-1.1,9.2-3.4l-2.2-3.4c-1.9,1.7-4,2.5-6.3,2.5c-5,0-6.3-3.7-6.3-7.2v-0.4h15.2v-1.2c0-5.9-1.1-9-3.3-11
-	c-2.2-2-4.5-2.6-7-2.6c-3.2,0-5.7,1.1-7.8,3.4c-2.2,2.5-3.2,5.4-3.2,9.9C45.2,32.3,49.8,37.4,56.9,37.4z M56.2,15
-	c2.8,0,4.6,2.4,4.6,6.6h-9.4C51.4,17.5,53.1,15,56.2,15z M76.1,36.8V15.3h5.2l1.4-3.8h-6.6V7.6c0-2.3,1.2-3.6,3.1-3.6
-	C80.2,4,81,4.4,82.2,5l1.8-3.5c-1.8-1-3.6-1.5-5.7-1.5c-4.5,0-7.7,2.5-7.7,7.7c0,2.4,0.2,3.8,0.2,3.8h-2.5v3.8h2.4v21.5H76.1z
-	 M93.1,37.4c6.9,0,11.3-5.1,11.3-13.2c0-8-4.1-13.4-11.4-13.4c-6.7,0-11.1,5.2-11.1,13.3C81.9,32.3,86.2,37.4,93.1,37.4z M93.1,15
-	c3.2,0,5.2,2.1,5.2,9.3c0,6.4-1.8,9-5.1,9c-3.3,0-5.2-2.2-5.2-9.5C88.1,17.7,89.6,15,93.1,15z M126.1,11.5h-6.4
-	c-0.8,1.1-3.3,6.1-4,7.8c-1.2-2.3-3.5-6.3-4.6-8.2l-6,1.2l7.3,10.9L103,36.8h7c1-1.4,4.6-7.6,5.5-9.5c0.5,0.9,4.6,8,5.5,9.5h6.9
-	L118.6,23L126.1,11.5z" fill="#fff" />
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 132 62" width="132" height="62">
+  <path fill="#fff" d="M5.3,45.2H2.7L0.1,57.3h3.2c1.8,0,3-0.4,4.2-1.5c1.4-1.2,2.6-4.1,2.6-6.2c0-1.7-0.4-2.8-1.2-3.5C8,45.4,7.1,45.2,5.3,45.2z
+  M6.6,54.9c-0.7,0.9-1.9,1.3-3.5,1.3H1.8l2.1-9.8h1.5c1.3,0,2,0.2,2.6,1.1c0.4,0.5,0.5,1.3,0.5,2.4C8.5,51.2,7.9,53.4,6.6,54.9z
+  M15.3,48.3c-1.1,0-2,0.4-2.9,1.2c-1.3,1.2-2,3.1-2,4.8c0,2,1.3,3.2,2.9,3.2c1.8,0,2.7-0.4,3.6-1.3l-0.6-0.8c-0.8,0.7-1.5,1-2.6,1
+  c-0.9,0-1.8-0.7-1.8-1.9c0-0.3,0-0.7,0.1-1.1c0.4,0,0.8,0,1.1,0c1.9,0,3.1-0.3,3.8-1c0.5-0.5,0.8-1.1,0.8-1.8
+  C17.8,49.2,17,48.3,15.3,48.3z M16,51.7c-0.5,0.4-1.2,0.7-2.8,0.7c-0.3,0-0.7,0-0.9,0c0.5-1.8,1.6-3,2.8-3c1,0,1.4,0.5,1.4,1.2
+  C16.4,51,16.2,51.4,16,51.7z M25,48.5l-3.3,5.9c-0.4,0.6-0.5,1-0.7,1.5h0c0-0.4-0.1-0.9-0.1-1.5l-0.8-6.1l-1.4,0.3l1.3,8.8h1.4
+  l5.2-8.9L25,48.5z M30.7,48.3c-1.1,0-2,0.4-2.9,1.2c-1.3,1.2-2,3.1-2,4.8c0,2,1.3,3.2,2.9,3.2c1.8,0,2.7-0.4,3.6-1.3l-0.6-0.8
+  c-0.8,0.7-1.5,1-2.6,1c-0.9,0-1.8-0.7-1.8-1.9c0-0.3,0-0.7,0.1-1.1c0.4,0,0.8,0,1.1,0c1.9,0,3.1-0.3,3.8-1c0.5-0.5,0.8-1.1,0.8-1.8
+  C33.3,49.2,32.4,48.3,30.7,48.3z M31.4,51.7c-0.5,0.4-1.2,0.7-2.8,0.7c-0.3,0-0.7,0-0.9,0c0.5-1.8,1.6-3,2.8-3c1,0,1.4,0.5,1.4,1.2
+  C31.9,51,31.7,51.4,31.4,51.7z M37.2,47.5c0.2-1.1,0.4-2.5,0.1-3.2l-1.5,0.6c0.2,0.6,0.2,1.5-0.1,2.7L34,55.7
+  c-0.1,0.3-0.1,0.5-0.1,0.8c0,0.7,0.4,1,1.2,1c0.4,0,0.7,0,1.1-0.2l-0.1-0.9c-0.1,0-0.2,0-0.3,0c-0.2,0-0.4-0.1-0.4-0.4
+  c0-0.2,0-0.4,0.1-0.6L37.2,47.5z M42.3,48.2c-2.8,0-4.9,2.6-4.9,6.1c0,2,1.1,3.2,3,3.2c2.9,0,4.9-2.7,4.9-6.1
+  C45.3,49.5,44.4,48.2,42.3,48.2z M40.7,56.4c-1.1,0-1.7-0.6-1.7-1.9c0-2.9,1.2-5.1,3.2-5.1c0.9,0,1.7,0.5,1.7,1.9
+  C43.8,54,42.7,56.4,40.7,56.4z M52.1,48.3c-1,0-2.3,0.5-3.2,1.8c0.2-0.9,0.1-1.4-0.1-1.9l-1.3,0.6c0.2,0.6,0.2,1-0.1,2.2l-2.2,10
+  l1.4-0.3l0.8-3.6c0.6,0.3,1.2,0.4,2.1,0.4c1.2,0,2.4-0.6,3.3-1.6c0.9-1.1,1.5-3.2,1.5-4.8C54.4,49.4,53.7,48.3,52.1,48.3z
+  M51.8,55.2c-0.4,0.7-1.4,1.2-2.2,1.2c-0.7,0-1.4-0.2-1.8-0.5l0.9-4.3c0.9-1.3,2-1.9,2.9-1.9c0.9,0,1.3,0.5,1.3,1.7
+  C52.9,52.5,52.4,54.3,51.8,55.2z M60.1,48.3c-1.1,0-2,0.4-2.9,1.2c-1.3,1.2-2,3.1-2,4.8c0,2,1.3,3.2,2.9,3.2c1.8,0,2.7-0.4,3.6-1.3
+  l-0.6-0.8c-0.8,0.7-1.5,1-2.6,1c-0.9,0-1.8-0.7-1.8-1.9c0-0.3,0-0.7,0.1-1.1c0.4,0,0.8,0,1.1,0c1.9,0,3.1-0.3,3.8-1
+  c0.5-0.5,0.8-1.1,0.8-1.8C62.6,49.2,61.8,48.3,60.1,48.3z M60.8,51.7c-0.5,0.4-1.2,0.7-2.8,0.7c-0.3,0-0.7,0-0.9,0
+  c0.5-1.8,1.6-3,2.8-3c1,0,1.4,0.5,1.4,1.2C61.2,51,61,51.4,60.8,51.7z M65.8,50.3c0.2-1,0.2-1.5-0.1-2.1l-1.3,0.6
+  c0.2,0.6,0.2,1.2-0.1,2.5l-1.3,6h1.4l1.2-5.5c0.9-1.3,1.8-2,2.6-2c0.3,0,0.4,0,0.6,0.1l0.6-1.5c-0.2-0.1-0.3-0.1-0.7-0.1
+  C67.8,48.3,66.6,49.1,65.8,50.3z M78.1,51.6l0.3-1.3h-4.2l0.8-4h5l0.5-1.2h-6.7l-2.6,12.1H78l0.3-1.3h-5.4l0.9-4.4H78.1z M86.6,54.5
+  l2.1-9.8l-1.4-0.2l-0.9,4.3c-0.4-0.2-1-0.3-2-0.3c-1,0-2.2,0.4-3.1,1.3c-1.3,1.3-2,3.1-2,4.9c0,1.9,0.8,3,2.5,3
+  c1.3,0,2.3-0.5,3.1-1.6c-0.1,1,0.2,1.4,0.7,1.9l1.2-0.9C86.4,56.3,86.2,55.9,86.6,54.5z M85.2,54.2c-0.9,1.5-2,2.1-3,2.1
+  c-0.9,0-1.3-0.6-1.3-1.7c0-1.3,0.6-3.2,1.4-4.1c0.6-0.6,1.4-1,2.1-1c0.8,0,1.2,0.1,1.7,0.4L85.2,54.2z M88.2,57.3h1.5l1.9-9
+  l-1.5,0.2L88.2,57.3z M91.4,44.7c-0.6,0-1.1,0.5-1.1,1.1c0,0.6,0.5,1.1,1.1,1.1s1.1-0.5,1.1-1.1S92,44.7,91.4,44.7z M93.7,55.7
+  c0-0.2,0-0.6,0.1-1l1.1-5.2h1.9l0.6-1h-2.2c0.2-0.8,0.5-1.9,0.7-2.5l-1.5,0.3c-0.2,0.7-0.4,1.5-0.6,2.2h-1.2l-0.2,1h1.2l-1.1,5.3
+  c-0.1,0.5-0.1,1-0.1,1.3c0,0.9,0.5,1.4,1.6,1.4c0.6,0,1.1-0.1,1.6-0.4v-0.9c-0.3,0.1-0.5,0.2-0.9,0.2C94,56.5,93.7,56.3,93.7,55.7z
+  M99.8,44.7c-0.6,0-1.1,0.5-1.1,1.1c0,0.6,0.5,1.1,1.1,1.1s1.1-0.5,1.1-1.1S100.4,44.7,99.8,44.7z M96.6,57.3h1.5l1.9-9l-1.5,0.2
+  L96.6,57.3z M105.3,48.2c-2.8,0-4.9,2.6-4.9,6.1c0,2,1.1,3.2,3,3.2c2.9,0,4.9-2.7,4.9-6.1C108.3,49.5,107.3,48.2,105.3,48.2z
+  M103.6,56.4c-1.1,0-1.7-0.6-1.7-1.9c0-2.9,1.2-5.1,3.1-5.1c0.9,0,1.7,0.5,1.7,1.9C106.8,54,105.7,56.4,103.6,56.4z M115.3,48.3
+  c-1.1,0-2.5,0.6-3.4,1.9c0.2-0.9,0.1-1.4-0.1-1.9l-1.3,0.6c0.2,0.7,0.2,1-0.1,2.2l-1.4,6.3h1.4l1.2-5.8c1.2-1.5,2.4-2.1,3.1-2.1
+  c0.6,0,0.9,0.3,0.9,0.9c0,0.2,0,0.5-0.1,1l-1.3,6h1.4l1.4-6.7c0-0.2,0.1-0.4,0.1-0.6C117.1,49,116.4,48.3,115.3,48.3z M130.9,12.5
+  c-0.1-0.2-0.2-0.4-0.4-0.6c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.1-0.7-0.1c-0.2,0-0.5,0-0.7,0.1c-0.2,0.1-0.4,0.2-0.6,0.4
+  c-0.2,0.2-0.3,0.4-0.4,0.6c-0.1,0.2-0.1,0.5-0.1,0.7c0,0.3,0,0.5,0.1,0.7c0.1,0.2,0.2,0.4,0.4,0.6c0.2,0.2,0.4,0.3,0.6,0.4
+  c0.2,0.1,0.5,0.1,0.7,0.1c0.2,0,0.5,0,0.7-0.1c0.2-0.1,0.4-0.2,0.6-0.4c0.2-0.2,0.3-0.4,0.4-0.6c0.1-0.2,0.1-0.5,0.1-0.7
+  C131,13,131,12.7,130.9,12.5z M130.5,13.8c-0.1,0.2-0.2,0.3-0.3,0.5c-0.1,0.1-0.3,0.2-0.5,0.3c-0.2,0.1-0.4,0.1-0.6,0.1
+  c-0.2,0-0.4,0-0.6-0.1c-0.2-0.1-0.3-0.2-0.5-0.3c-0.1-0.1-0.2-0.3-0.3-0.5c-0.1-0.2-0.1-0.4-0.1-0.6c0-0.2,0-0.4,0.1-0.6
+  c0.1-0.2,0.2-0.3,0.3-0.5c0.1-0.1,0.3-0.2,0.5-0.3c0.2-0.1,0.4-0.1,0.6-0.1c0.2,0,0.4,0,0.6,0.1c0.2,0.1,0.3,0.2,0.5,0.3
+  c0.1,0.1,0.2,0.3,0.3,0.5c0.1,0.2,0.1,0.4,0.1,0.6C130.6,13.5,130.6,13.6,130.5,13.8z M129.6,13.6c0,0-0.1-0.1-0.1-0.1
+  c0,0-0.1-0.1-0.1-0.1c0,0,0,0-0.1-0.1c0.2,0,0.3-0.1,0.4-0.2c0.1-0.1,0.1-0.2,0.1-0.4c0-0.1,0-0.2,0-0.2c0-0.1-0.1-0.1-0.1-0.2
+  c-0.1-0.1-0.1-0.1-0.2-0.1c-0.1,0-0.2,0-0.3,0h-0.6v2h0.3v-0.9c0,0,0.1,0,0.1,0c0,0,0,0,0.1,0c0.1,0.1,0.1,0.1,0.2,0.2
+  c0.1,0.1,0.1,0.2,0.2,0.3l0.2,0.3h0.4l-0.3-0.5C129.7,13.7,129.6,13.7,129.6,13.6z M129.1,13.1h-0.2v-0.6h0.2c0.2,0,0.3,0,0.3,0.1
+  c0.1,0.1,0.1,0.1,0.1,0.2c0,0.1,0,0.2-0.1,0.2c0,0-0.1,0.1-0.1,0.1C129.3,13.1,129.2,13.1,129.1,13.1z M0,36.8h5.8V20.9h9.7v-4.7
+  H5.8V6.9h11.9l0.7-4.7H0V36.8z M24.3,7.7C26.4,7.7,28,6,28,4c0-2.1-1.7-3.7-3.6-3.7c-2.1,0-3.7,1.7-3.7,3.7
+  C20.7,6,22.3,7.7,24.3,7.7z M21.5,36.8h5.6V10.9l-5.6,1V36.8z M32.4,36.8H38V19.7c0.5-2.1,2.5-3.7,4.8-3.7c0.6,0,1,0.2,1.6,0.4
+  l1.7-5.1c-0.7-0.3-1.2-0.4-2-0.4c-2.5,0-4.5,1.3-6.5,4.1c0-1.4-0.4-2.9-1-4l-5.1,1.3c0.6,1.6,0.9,3.6,0.9,6.8V36.8z M56.9,37.4
+  c3.4,0,6.5-1.1,9.2-3.4l-2.2-3.4c-1.9,1.7-4,2.5-6.3,2.5c-5,0-6.3-3.7-6.3-7.2v-0.4h15.2v-1.2c0-5.9-1.1-9-3.3-11
+  c-2.2-2-4.5-2.6-7-2.6c-3.2,0-5.7,1.1-7.8,3.4c-2.2,2.5-3.2,5.4-3.2,9.9C45.2,32.3,49.8,37.4,56.9,37.4z M56.2,15
+  c2.8,0,4.6,2.4,4.6,6.6h-9.4C51.4,17.5,53.1,15,56.2,15z M76.1,36.8V15.3h5.2l1.4-3.8h-6.6V7.6c0-2.3,1.2-3.6,3.1-3.6
+  C80.2,4,81,4.4,82.2,5l1.8-3.5c-1.8-1-3.6-1.5-5.7-1.5c-4.5,0-7.7,2.5-7.7,7.7c0,2.4,0.2,3.8,0.2,3.8h-2.5v3.8h2.4v21.5H76.1z
+  M93.1,37.4c6.9,0,11.3-5.1,11.3-13.2c0-8-4.1-13.4-11.4-13.4c-6.7,0-11.1,5.2-11.1,13.3C81.9,32.3,86.2,37.4,93.1,37.4z M93.1,15
+  c3.2,0,5.2,2.1,5.2,9.3c0,6.4-1.8,9-5.1,9c-3.3,0-5.2-2.2-5.2-9.5C88.1,17.7,89.6,15,93.1,15z M126.1,11.5h-6.4
+  c-0.8,1.1-3.3,6.1-4,7.8c-1.2-2.3-3.5-6.3-4.6-8.2l-6,1.2l7.3,10.9L103,36.8h7c1-1.4,4.6-7.6,5.5-9.5c0.5,0.9,4.6,8,5.5,9.5h6.9
+  L118.6,23L126.1,11.5z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/branding/aurora/content/silhouette-40.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/branding/aurora/content/silhouette-40.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/branding/aurora/content/silhouette-40.svg	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/branding/aurora/content/silhouette-40.svg	2015-05-25 20:42:44.000000000 +0000
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg"
-  x="0px" y="0px" viewBox="-45 31 40 40"
-  enable-background="new -45 31 40 40">
-  <path fill="#CCCCCC" d="M-14.1,54.7c0.7-1.4,1.7-4.4,0.8-6.9c0,0,0,0,0,0.1l0,0c0,0-0.2,0.5-0.4,1.3c0-0.1,0-0.2,0-0.3
-    c0.1-0.9,0-1.9-0.1-2.9c-0.3-1.5-1.4-2.8-2-3.2c0,0,0.1,0,0.1,0.1c-0.1-0.1-0.1-0.1-0.1-0.1s0,0.1,0.1,0.4c-0.7-1.1-1.6-1.5-1.6-1.5
-    s0,0.2,0.1,0.5c-2-1.9-4.7-3-7.6-3c-3,0-5.7,1.2-7.8,3.1c0.1,0.1,0.2,0.3,0.4,0.5c0,0,0.8-0.1,1.7-0.1c1.7-1.2,3.6-1.8,5.7-1.8
-    c2.6,0,5.1,1.1,7,3c-0.2-0.1-0.1,0,0,0.1c-0.6-0.4-1.2-0.8-1.7-0.8c1,0.8,2.6,2.7,2.4,6.2c-0.3-0.6-0.6-1-0.9-1.3
-    c0.4,3.5,0,4.2-0.2,5.1c0-0.4-0.2-0.7-0.3-0.9c0,0,0,1.1-0.7,2.6c-0.5,1.2-1.1,1.5-1.3,1.5c-0.2,0-0.1-0.2-0.1-0.4
-    c0,0-0.4,0.2-0.7,0.6c-0.3,0.4-0.6,0.8-0.8,0.6c0.1-0.1,0.2-0.3,0.3-0.4c-0.1,0.1-0.5,0.4-1.2,0.5c-0.3,0-1.6,0.3-3.3-0.6
-    c0.3,0,0.6-0.1,0.9,0.1c-0.3-0.3-1-0.3-1.5-0.4c-0.5-0.4-1.1-1-1.4-1.4c1.3,0.3,2.8,0.1,3.6-0.5s1.3-1,1.8-0.9
-    c0.4,0.1,0.7-0.4,0.4-0.8c-0.3-0.4-1.2-1-2.3-0.7c-0.8,0.2-1.8,1.1-3.3,0.2c-1.3-0.8-1.3-1.4-1.3-1.8c0-0.3,0.2-0.7,0.5-0.8
-    c0.2,0.1,0.3,0.1,0.3,0.1s-0.1-0.1-0.1-0.2l0,0c0.1,0,0.4,0.2,0.6,0.2c0.2,0.1,0.3,0.2,0.3,0.2s0,0,0-0.1c0,0-0.1-0.2-0.3-0.3l0,0
-    c0.1,0,0.2,0.1,0.4,0.2c0-0.2,0.1-0.4,0.1-0.7c0-0.2,0-0.3-0.1-0.4c-0.1-0.1,0-0.1,0.1,0c0-0.1,0-0.1-0.1-0.2l0,0c0,0,0,0,0-0.1
-    c0.2-0.3,1.8-1.2,1.9-1.3c0.2-0.1,0.3-0.3,0.4-0.5c0.2-0.1,0.3-0.5,0.3-0.8c0-0.1-0.2-0.3-0.4-0.3c-0.1,0-0.4-0.1-0.6,0l0,0
-    c-0.3,0-0.7,0-1.2,0s-0.8-0.3-1-0.6c0-0.1-0.1-0.1-0.1-0.2c0-0.1-0.1-0.2-0.1-0.2c0.2-0.8,0.7-1.5,1.4-2.1c0,0-0.2,0-0.1,0
-    c0,0,0.3-0.2,0.4-0.2c0.1,0-0.3-0.1-0.6-0.1c-0.5,0.2-0.6,0.2-0.8,0.3c0.1-0.1,0.3-0.2,0.2-0.2c-0.3,0.1-0.7,0.4-1.1,0.6v-0.1
-    c-0.2,0.1-0.6,0.4-0.7,0.7c0-0.1,0-0.1,0-0.1c-0.1,0-0.2,0.2-0.3,0.3l0,0c-1.1-0.3-2-0.2-2.8,0c-0.2-0.1-0.6-0.5-0.9-1
-    c0,0,0,0.1-0.1,0.1c-0.1-0.4-0.3-0.9-0.3-1.3v-0.1c0,0-0.1,0.1-0.3,0.3c-0.1,0.2-0.2,0.3-0.2,0.5c0,0.1-0.1,0.2-0.1,0.2v-0.2
-    c0,0.1-0.1,0.2-0.2,0.3c0,0.2,0,0.3-0.1,0.4l0,0c0,0,0-0.2,0-0.1c-0.1,0.2-0.2,0.5-0.2,0.8c-0.1,0.3-0.1,0.5-0.1,0.8s0,0.7,0,1.2
-    c0,0.1,0,0.1,0,0.2c-0.3,0.4-0.5,0.7-0.6,0.9c-0.4,0.7-0.7,1.8-1,3.5c0,0,0.2-0.6,0.6-1.3l0,0c-0.3,0.9-0.5,2.3-0.4,4.4
-    c0-0.1,0.1-0.6,0.2-1.3c0.1,1.4,0.5,3.1,1.5,5c0.8,1.4,1.7,2.4,2.7,3.2c0.2,0.2,0.4,0.3,0.6,0.5c1.3,1,3.3,2.1,5,2.4
-    c-0.6-0.2-1-0.5-1-0.5s2,0.7,3.5,0.6c-0.5-0.1-0.6-0.3-0.6-0.3s4.2,0.2,6.4-1.5c0.5-0.4,0.8-0.8,0.9-1.2c0.6-0.4,1.3-0.8,2-1.6
-    c1.2-1.2,1.3-2.1,1.4-3v0.1C-14,55.2-14,54.9-14.1,54.7z"/>
-  </svg>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-45 31 40 40">
+  <path fill="#ccc" d="M-14.1,54.7c0.7-1.4,1.7-4.4,0.8-6.9c0,0,0,0,0,0.1l0,0c0,0-0.2,0.5-0.4,1.3c0-0.1,0-0.2,0-0.3
+  c0.1-0.9,0-1.9-0.1-2.9c-0.3-1.5-1.4-2.8-2-3.2c0,0,0.1,0,0.1,0.1c-0.1-0.1-0.1-0.1-0.1-0.1s0,0.1,0.1,0.4c-0.7-1.1-1.6-1.5-1.6-1.5
+  s0,0.2,0.1,0.5c-2-1.9-4.7-3-7.6-3c-3,0-5.7,1.2-7.8,3.1c0.1,0.1,0.2,0.3,0.4,0.5c0,0,0.8-0.1,1.7-0.1c1.7-1.2,3.6-1.8,5.7-1.8
+  c2.6,0,5.1,1.1,7,3c-0.2-0.1-0.1,0,0,0.1c-0.6-0.4-1.2-0.8-1.7-0.8c1,0.8,2.6,2.7,2.4,6.2c-0.3-0.6-0.6-1-0.9-1.3
+  c0.4,3.5,0,4.2-0.2,5.1c0-0.4-0.2-0.7-0.3-0.9c0,0,0,1.1-0.7,2.6c-0.5,1.2-1.1,1.5-1.3,1.5c-0.2,0-0.1-0.2-0.1-0.4
+  c0,0-0.4,0.2-0.7,0.6c-0.3,0.4-0.6,0.8-0.8,0.6c0.1-0.1,0.2-0.3,0.3-0.4c-0.1,0.1-0.5,0.4-1.2,0.5c-0.3,0-1.6,0.3-3.3-0.6
+  c0.3,0,0.6-0.1,0.9,0.1c-0.3-0.3-1-0.3-1.5-0.4c-0.5-0.4-1.1-1-1.4-1.4c1.3,0.3,2.8,0.1,3.6-0.5s1.3-1,1.8-0.9
+  c0.4,0.1,0.7-0.4,0.4-0.8c-0.3-0.4-1.2-1-2.3-0.7c-0.8,0.2-1.8,1.1-3.3,0.2c-1.3-0.8-1.3-1.4-1.3-1.8c0-0.3,0.2-0.7,0.5-0.8
+  c0.2,0.1,0.3,0.1,0.3,0.1s-0.1-0.1-0.1-0.2l0,0c0.1,0,0.4,0.2,0.6,0.2c0.2,0.1,0.3,0.2,0.3,0.2s0,0,0-0.1c0,0-0.1-0.2-0.3-0.3l0,0
+  c0.1,0,0.2,0.1,0.4,0.2c0-0.2,0.1-0.4,0.1-0.7c0-0.2,0-0.3-0.1-0.4c-0.1-0.1,0-0.1,0.1,0c0-0.1,0-0.1-0.1-0.2l0,0c0,0,0,0,0-0.1
+  c0.2-0.3,1.8-1.2,1.9-1.3c0.2-0.1,0.3-0.3,0.4-0.5c0.2-0.1,0.3-0.5,0.3-0.8c0-0.1-0.2-0.3-0.4-0.3c-0.1,0-0.4-0.1-0.6,0l0,0
+  c-0.3,0-0.7,0-1.2,0s-0.8-0.3-1-0.6c0-0.1-0.1-0.1-0.1-0.2c0-0.1-0.1-0.2-0.1-0.2c0.2-0.8,0.7-1.5,1.4-2.1c0,0-0.2,0-0.1,0
+  c0,0,0.3-0.2,0.4-0.2c0.1,0-0.3-0.1-0.6-0.1c-0.5,0.2-0.6,0.2-0.8,0.3c0.1-0.1,0.3-0.2,0.2-0.2c-0.3,0.1-0.7,0.4-1.1,0.6v-0.1
+  c-0.2,0.1-0.6,0.4-0.7,0.7c0-0.1,0-0.1,0-0.1c-0.1,0-0.2,0.2-0.3,0.3l0,0c-1.1-0.3-2-0.2-2.8,0c-0.2-0.1-0.6-0.5-0.9-1
+  c0,0,0,0.1-0.1,0.1c-0.1-0.4-0.3-0.9-0.3-1.3v-0.1c0,0-0.1,0.1-0.3,0.3c-0.1,0.2-0.2,0.3-0.2,0.5c0,0.1-0.1,0.2-0.1,0.2v-0.2
+  c0,0.1-0.1,0.2-0.2,0.3c0,0.2,0,0.3-0.1,0.4l0,0c0,0,0-0.2,0-0.1c-0.1,0.2-0.2,0.5-0.2,0.8c-0.1,0.3-0.1,0.5-0.1,0.8s0,0.7,0,1.2
+  c0,0.1,0,0.1,0,0.2c-0.3,0.4-0.5,0.7-0.6,0.9c-0.4,0.7-0.7,1.8-1,3.5c0,0,0.2-0.6,0.6-1.3l0,0c-0.3,0.9-0.5,2.3-0.4,4.4
+  c0-0.1,0.1-0.6,0.2-1.3c0.1,1.4,0.5,3.1,1.5,5c0.8,1.4,1.7,2.4,2.7,3.2c0.2,0.2,0.4,0.3,0.6,0.5c1.3,1,3.3,2.1,5,2.4
+  c-0.6-0.2-1-0.5-1-0.5s2,0.7,3.5,0.6c-0.5-0.1-0.6-0.3-0.6-0.3s4.2,0.2,6.4-1.5c0.5-0.4,0.8-0.8,0.9-1.2c0.6-0.4,1.3-0.8,2-1.6
+  c1.2-1.2,1.3-2.1,1.4-3v0.1C-14,55.2-14,54.9-14.1,54.7z"/>
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/branding/nightly/content/about-wordmark.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/branding/nightly/content/about-wordmark.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/branding/nightly/content/about-wordmark.svg	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/branding/nightly/content/about-wordmark.svg	2015-05-25 20:42:44.000000000 +0000
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<svg version="1.1" id="aboutWordmark" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="270px" height="48px" viewBox="0 0 270 48" xml:space="preserve">
-
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="270px" height="48px" viewBox="0 0 270 48">
   <path fill="#fff" d="M75.5,11.8V7.9c0-2.2,1.2-3.5,3.1-3.5c1,0,1.8,0.3,3,0.9l1.8-3.5c-1.7-1-3.5-1.4-5.7-1.4
-  	C73.2,0.3,70,2.8,70,8c0,2.3,0.2,3.7,0.2,3.7h-2.5v3.8H70V37h5.4V15.6h5.1l1.4-3.8H75.5z M92.3,11.2c-6.7,0-11,5.2-11,13.3
-  	c0,8.1,4.3,13.2,11.1,13.2c6.8,0,11.2-5,11.2-13.2C103.6,16.5,99.5,11.2,92.3,11.2z M92.5,33.6c-3.3,0-5.1-2.1-5.1-9.5
-  	c0-6.1,1.5-8.8,5-8.8c3.2,0,5.2,2.1,5.2,9.3C97.6,30.9,95.8,33.6,92.5,33.6z M43.7,11.1c-2.5,0-4.4,1.3-6.4,4c0-1.4-0.3-2.8-0.9-4
-  	l-5,1.3c0.6,1.6,0.9,3.6,0.9,6.8V37h5.5V19.9c0.5-2,2.4-3.7,4.7-3.7c0.6,0,1,0.1,1.6,0.4l1.7-5.1C45,11.2,44.5,11.1,43.7,11.1z
-  	 M0,37h5.7V21.2h9.6v-4.6H5.7V7.2h11.8l0.7-4.7H0V37z M21.4,37h5.5V11.2l-5.5,1V37z M24.2,0.7c-2,0-3.6,1.6-3.6,3.7
-  	c0,2,1.5,3.6,3.5,3.6c2,0,3.7-1.6,3.7-3.6C27.8,2.3,26.2,0.7,24.2,0.7z M125.2,11.8h-6.4c-0.7,1.1-3.3,6.1-4,7.7
-  	c-1.2-2.3-3.4-6.3-4.6-8.2l-5.9,1.2l7.3,10.8L102.2,37h6.9c0.9-1.4,4.5-7.5,5.5-9.4c0.5,0.9,4.6,8,5.5,9.4h6.9l-9.2-13.8L125.2,11.8
-  	z M62.7,13.8c-2.1-1.9-4.4-2.6-6.9-2.6c-3.2,0-5.7,1-7.7,3.4C45.9,17.1,45,20,45,24.5c0,8.1,4.5,13.2,11.6,13.2
-  	c3.4,0,6.4-1.1,9.1-3.3L63.4,31c-1.9,1.6-3.9,2.5-6.3,2.5c-4.9,0-6.2-3.7-6.2-7.2v-0.4H66v-1.2C66,18.9,64.9,15.8,62.7,13.8z
-  	 M51,21.8c0-4.1,1.7-6.5,4.8-6.5c2.8,0,4.5,2.4,4.5,6.5H51z M198.5,14.3l-2.4-2.4c-1.2,0.8-2.2,1.1-3.5,1.1c-3,0-3.8-1.4-7.6-1.4
-  	c-5.4,0-9.2,3.4-9.2,8.4c0,3.3,2.2,6.1,5.6,7.2c-3.4,1-4.5,2.2-4.5,4.3c0,2.2,1.8,3.6,4.7,3.6h3.8c2.5,0,3.9,0.2,4.9,0.9
-  	c0.9,0.6,1.4,1.6,1.4,3c0,3.1-2.2,4.4-6,4.4c-2,0-3.8-0.5-5.1-1.2c-0.9-0.6-1.5-1.6-1.5-2.9c0-0.8,0.3-1.7,0.7-2.2l-4.1,0.4
-  	c-0.3,1-0.5,1.7-0.5,2.6c0,3.5,3,6.4,10.8,6.4c6.1,0,9.9-2.5,9.9-7.9c0-2.1-0.8-3.9-2.7-5.3c-1.5-1.1-3.1-1.4-6-1.4h-4
-  	c-1.3,0-2-0.5-2-1.2c0-0.8,1.1-1.7,4.5-2.9c1.8,0,3.4-0.3,4.7-1.1c2.3-1.4,3.7-4.1,3.7-6.8c0-1.6-0.5-3-1.5-4.3
-  	c0.4,0.2,1.1,0.3,1.7,0.3C195.8,15.8,196.9,15.4,198.5,14.3z M185,24.8c-3.1,0-4.8-1.7-4.8-4.8c0-3.5,1.6-5.1,4.7-5.1
-  	c3.3,0,4.6,1.5,4.6,4.9C189.5,23.1,188,24.8,185,24.8z M168.6,1.3c-1.7,0-3,1.4-3,3.1c0,1.7,1.4,3,3,3c1.7,0,3.1-1.3,3.1-3
-  	C171.6,2.7,170.3,1.3,168.6,1.3z M245.7,34.5c-1.1,0-1.4-0.6-1.4-2.5V6.5c0-3.8-0.6-5.9-0.6-5.9l-3.9,0.8c0,0,0.6,1.9,0.6,5.1v26.4
-  	c0,1.8,0.4,2.8,1.2,3.5c0.7,0.7,1.7,1,2.9,1c1,0,1.5-0.1,2.5-0.5l-0.8-2.5C246.2,34.4,245.8,34.5,245.7,34.5z M212.7,11.6
-  	c-3.2,0-6.1,1.8-8.3,3.9c0,0,0.2-1.8,0.2-3.4V6.3c0-3.8-0.7-5.9-0.7-5.9L200,1.1c0,0,0.7,1.9,0.7,5.1V37h3.9V19.3
-  	c2.1-2.7,4.9-4.2,7.2-4.2c1.3,0,2.3,0.4,2.9,1c0.7,0.7,0.9,1.8,0.9,3.7V37h3.8V19.1c0-1.8-0.1-2.6-0.4-3.6
-  	C218.4,13.2,215.7,11.6,212.7,11.6z M265.4,12.1l-4.9,16.4c-0.6,2-1.6,5.2-1.6,5.2s-0.7-3.9-1.5-6.2l-5.1-16.2l-3.9,1.3l5.4,15.6
-  	c0.8,2.5,2.2,7.4,2.5,9l1.6-0.3c-1.3,5.1-2.5,6.7-5.7,7.6l1.2,2.7c4.4-1,6.4-4.3,8-9.3l8.6-25.8H265.4z M234.9,15l1.2-2.9h-6.2
-  	c0-3.3,0.5-7.2,0.5-7.2l-4.1,0.9c0,0-0.4,3.9-0.4,6.3h-3.2V15h3.2v17.1c0,2.5,0.7,4.1,2.4,5c0.9,0.4,1.9,0.7,3.3,0.7
-  	c1.8,0,3.1-0.4,4.4-1l-0.6-2.5c-0.7,0.3-1.3,0.5-2.4,0.5c-2.4,0-3.2-0.9-3.2-3.7V15H234.9z M166.5,37h4.1V11.5l-4.1,0.6V37z
-  	 M156.8,21.3c0,5,0.4,10.5,0.4,10.5s-1.4-3.8-3.2-7.2L142.7,2.7h-4.8V37h4.2l-0.2-19.9c0-4.5-0.4-9.3-0.4-9.3s1.7,4.1,3.9,8.2l11,21
-  	h4.3V2.7h-4L156.8,21.3z M128.3,12.9c-0.3-0.1-0.7-0.1-1-0.1v2.3h0.3v-1c0.3,0,0.7,1,0.7,1s0.2,0,0.4,0c-0.2-0.3-0.3-0.7-0.6-1
-  	C128.8,14.1,128.9,13.1,128.3,12.9z M127.6,13.8v-0.7c0,0,0.7,0,0.7,0.3C128.3,13.9,127.8,13.9,127.6,13.8z M128,12
-  	c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S129.1,12,128,12z M128,15.5c-0.8,0-1.5-0.7-1.5-1.5s0.7-1.5,1.5-1.5s1.5,0.7,1.5,1.5
-  	S128.8,15.5,128,15.5z"/>
-	
+  C73.2,0.3,70,2.8,70,8c0,2.3,0.2,3.7,0.2,3.7h-2.5v3.8H70V37h5.4V15.6h5.1l1.4-3.8H75.5z M92.3,11.2c-6.7,0-11,5.2-11,13.3
+  c0,8.1,4.3,13.2,11.1,13.2c6.8,0,11.2-5,11.2-13.2C103.6,16.5,99.5,11.2,92.3,11.2z M92.5,33.6c-3.3,0-5.1-2.1-5.1-9.5
+  c0-6.1,1.5-8.8,5-8.8c3.2,0,5.2,2.1,5.2,9.3C97.6,30.9,95.8,33.6,92.5,33.6z M43.7,11.1c-2.5,0-4.4,1.3-6.4,4c0-1.4-0.3-2.8-0.9-4
+  l-5,1.3c0.6,1.6,0.9,3.6,0.9,6.8V37h5.5V19.9c0.5-2,2.4-3.7,4.7-3.7c0.6,0,1,0.1,1.6,0.4l1.7-5.1C45,11.2,44.5,11.1,43.7,11.1z
+  M0,37h5.7V21.2h9.6v-4.6H5.7V7.2h11.8l0.7-4.7H0V37z M21.4,37h5.5V11.2l-5.5,1V37z M24.2,0.7c-2,0-3.6,1.6-3.6,3.7
+  c0,2,1.5,3.6,3.5,3.6c2,0,3.7-1.6,3.7-3.6C27.8,2.3,26.2,0.7,24.2,0.7z M125.2,11.8h-6.4c-0.7,1.1-3.3,6.1-4,7.7
+  c-1.2-2.3-3.4-6.3-4.6-8.2l-5.9,1.2l7.3,10.8L102.2,37h6.9c0.9-1.4,4.5-7.5,5.5-9.4c0.5,0.9,4.6,8,5.5,9.4h6.9l-9.2-13.8L125.2,11.8
+  z M62.7,13.8c-2.1-1.9-4.4-2.6-6.9-2.6c-3.2,0-5.7,1-7.7,3.4C45.9,17.1,45,20,45,24.5c0,8.1,4.5,13.2,11.6,13.2
+  c3.4,0,6.4-1.1,9.1-3.3L63.4,31c-1.9,1.6-3.9,2.5-6.3,2.5c-4.9,0-6.2-3.7-6.2-7.2v-0.4H66v-1.2C66,18.9,64.9,15.8,62.7,13.8z
+  M51,21.8c0-4.1,1.7-6.5,4.8-6.5c2.8,0,4.5,2.4,4.5,6.5H51z M198.5,14.3l-2.4-2.4c-1.2,0.8-2.2,1.1-3.5,1.1c-3,0-3.8-1.4-7.6-1.4
+  c-5.4,0-9.2,3.4-9.2,8.4c0,3.3,2.2,6.1,5.6,7.2c-3.4,1-4.5,2.2-4.5,4.3c0,2.2,1.8,3.6,4.7,3.6h3.8c2.5,0,3.9,0.2,4.9,0.9
+  c0.9,0.6,1.4,1.6,1.4,3c0,3.1-2.2,4.4-6,4.4c-2,0-3.8-0.5-5.1-1.2c-0.9-0.6-1.5-1.6-1.5-2.9c0-0.8,0.3-1.7,0.7-2.2l-4.1,0.4
+  c-0.3,1-0.5,1.7-0.5,2.6c0,3.5,3,6.4,10.8,6.4c6.1,0,9.9-2.5,9.9-7.9c0-2.1-0.8-3.9-2.7-5.3c-1.5-1.1-3.1-1.4-6-1.4h-4
+  c-1.3,0-2-0.5-2-1.2c0-0.8,1.1-1.7,4.5-2.9c1.8,0,3.4-0.3,4.7-1.1c2.3-1.4,3.7-4.1,3.7-6.8c0-1.6-0.5-3-1.5-4.3
+  c0.4,0.2,1.1,0.3,1.7,0.3C195.8,15.8,196.9,15.4,198.5,14.3z M185,24.8c-3.1,0-4.8-1.7-4.8-4.8c0-3.5,1.6-5.1,4.7-5.1
+  c3.3,0,4.6,1.5,4.6,4.9C189.5,23.1,188,24.8,185,24.8z M168.6,1.3c-1.7,0-3,1.4-3,3.1c0,1.7,1.4,3,3,3c1.7,0,3.1-1.3,3.1-3
+  C171.6,2.7,170.3,1.3,168.6,1.3z M245.7,34.5c-1.1,0-1.4-0.6-1.4-2.5V6.5c0-3.8-0.6-5.9-0.6-5.9l-3.9,0.8c0,0,0.6,1.9,0.6,5.1v26.4
+  c0,1.8,0.4,2.8,1.2,3.5c0.7,0.7,1.7,1,2.9,1c1,0,1.5-0.1,2.5-0.5l-0.8-2.5C246.2,34.4,245.8,34.5,245.7,34.5z M212.7,11.6
+  c-3.2,0-6.1,1.8-8.3,3.9c0,0,0.2-1.8,0.2-3.4V6.3c0-3.8-0.7-5.9-0.7-5.9L200,1.1c0,0,0.7,1.9,0.7,5.1V37h3.9V19.3
+  c2.1-2.7,4.9-4.2,7.2-4.2c1.3,0,2.3,0.4,2.9,1c0.7,0.7,0.9,1.8,0.9,3.7V37h3.8V19.1c0-1.8-0.1-2.6-0.4-3.6
+  C218.4,13.2,215.7,11.6,212.7,11.6z M265.4,12.1l-4.9,16.4c-0.6,2-1.6,5.2-1.6,5.2s-0.7-3.9-1.5-6.2l-5.1-16.2l-3.9,1.3l5.4,15.6
+  c0.8,2.5,2.2,7.4,2.5,9l1.6-0.3c-1.3,5.1-2.5,6.7-5.7,7.6l1.2,2.7c4.4-1,6.4-4.3,8-9.3l8.6-25.8H265.4z M234.9,15l1.2-2.9h-6.2
+  c0-3.3,0.5-7.2,0.5-7.2l-4.1,0.9c0,0-0.4,3.9-0.4,6.3h-3.2V15h3.2v17.1c0,2.5,0.7,4.1,2.4,5c0.9,0.4,1.9,0.7,3.3,0.7
+  c1.8,0,3.1-0.4,4.4-1l-0.6-2.5c-0.7,0.3-1.3,0.5-2.4,0.5c-2.4,0-3.2-0.9-3.2-3.7V15H234.9z M166.5,37h4.1V11.5l-4.1,0.6V37z
+  M156.8,21.3c0,5,0.4,10.5,0.4,10.5s-1.4-3.8-3.2-7.2L142.7,2.7h-4.8V37h4.2l-0.2-19.9c0-4.5-0.4-9.3-0.4-9.3s1.7,4.1,3.9,8.2l11,21
+  h4.3V2.7h-4L156.8,21.3z M128.3,12.9c-0.3-0.1-0.7-0.1-1-0.1v2.3h0.3v-1c0.3,0,0.7,1,0.7,1s0.2,0,0.4,0c-0.2-0.3-0.3-0.7-0.6-1
+  C128.8,14.1,128.9,13.1,128.3,12.9z M127.6,13.8v-0.7c0,0,0.7,0,0.7,0.3C128.3,13.9,127.8,13.9,127.6,13.8z M128,12
+  c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S129.1,12,128,12z M128,15.5c-0.8,0-1.5-0.7-1.5-1.5s0.7-1.5,1.5-1.5s1.5,0.7,1.5,1.5
+  S128.8,15.5,128,15.5z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/branding/nightly/content/silhouette-40.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/branding/nightly/content/silhouette-40.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/branding/nightly/content/silhouette-40.svg	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/branding/nightly/content/silhouette-40.svg	2015-05-25 20:42:44.000000000 +0000
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1"
- xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="-45 31 40 40"
- enable-background="new -45 31 40 40">
- <path fill="#CCCCCC" d="M-25,62.991c-6.622,0-11.991-5.369-11.991-11.991S-31.622,39.009-25,39.009S-13.009,44.378-13.009,51
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-45 31 40 40">
+  <path fill="#ccc" d="M-25,62.991c-6.622,0-11.991-5.369-11.991-11.991S-31.622,39.009-25,39.009S-13.009,44.378-13.009,51
   S-18.378,62.991-25,62.991z M-34.439,48.549c-0.002,0.007-0.004,0.013-0.006,0.02c0.002-0.004,0.006-0.006,0.007-0.01
   C-34.437,48.555-34.438,48.552-34.439,48.549z M-34.259,47.956c-0.001-0.006-0.003-0.005-0.002-0.012l0,0
   c-0.001,0.004-0.003,0.008-0.004,0.012l0.008,0.006C-34.258,47.96-34.258,47.958-34.259,47.956z M-34.245,48.067
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/branding/official/content/about-wordmark.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/branding/official/content/about-wordmark.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/branding/official/content/about-wordmark.svg	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/branding/official/content/about-wordmark.svg	2015-05-25 20:42:44.000000000 +0000
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<svg version="1.1" id="aboutWordmark" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="130px" height="38px" viewBox="0 0 130 38" xml:space="preserve">
-
-  <path fill="#55575C" d="M128.4,14.4c0,0-0.1-0.1-0.1-0.1c0,0-0.1-0.1-0.1-0.1c0,0-0.1-0.1-0.1-0.1c0.2,0,0.3-0.1,0.4-0.2
-  	c0.1-0.1,0.1-0.3,0.1-0.4c0-0.1,0-0.2,0-0.2c0-0.1-0.1-0.1-0.1-0.2c-0.1-0.1-0.1-0.1-0.2-0.1c-0.1,0-0.2-0.1-0.3-0.1h-0.7v2.2h0.4
-  	v-1c0,0,0.1,0,0.1,0c0,0,0,0,0.1,0.1c0.1,0.1,0.1,0.1,0.2,0.2c0.1,0.1,0.1,0.2,0.2,0.3l0.2,0.4h0.4l-0.3-0.5
-  	C128.4,14.5,128.4,14.5,128.4,14.4z M127.8,13.9h-0.2v-0.7h0.2c0.2,0,0.3,0,0.4,0.1c0.1,0.1,0.1,0.1,0.1,0.3c0,0.1,0,0.2-0.1,0.3
-  	c0,0-0.1,0.1-0.1,0.1C128,13.9,127.9,13.9,127.8,13.9z M0,37h5.7V21.2h9.6v-4.6H5.7V7.2h11.8l0.7-4.7H0V37z M24.2,0.7
-  	c-2,0-3.6,1.6-3.6,3.7c0,2,1.5,3.6,3.5,3.6c2,0,3.7-1.6,3.7-3.6C27.8,2.3,26.2,0.7,24.2,0.7z M21.4,37h5.5V11.2l-5.5,1V37z
-  	 M43.7,11.1c-2.5,0-4.4,1.3-6.4,4c0-1.4-0.3-2.8-0.9-4l-5,1.3c0.6,1.6,0.9,3.6,0.9,6.8V37h5.5V19.9c0.5-2,2.4-3.7,4.7-3.7
-  	c0.6,0,1,0.1,1.6,0.4l1.7-5.1C45,11.2,44.5,11.1,43.7,11.1z M62.7,13.8c-2.1-1.9-4.4-2.6-6.9-2.6c-3.2,0-5.7,1-7.7,3.4
-  	c-2.2,2.5-3.1,5.4-3.1,9.9c0,8.1,4.5,13.2,11.6,13.2c3.4,0,6.4-1.1,9.1-3.3L63.4,31c-1.9,1.6-3.9,2.5-6.3,2.5
-  	c-4.9,0-6.2-3.7-6.2-7.2v-0.4H66v-1.2C66,18.9,64.9,15.8,62.7,13.8z M51,21.8c0-4.1,1.7-6.5,4.8-6.5c2.8,0,4.5,2.4,4.5,6.5H51z
-  	 M75.5,11.8V7.9c0-2.2,1.2-3.5,3.1-3.5c1,0,1.8,0.3,3,0.9l1.8-3.5c-1.7-1-3.5-1.4-5.7-1.4C73.2,0.3,70,2.8,70,8
-  	c0,2.3,0.2,3.7,0.2,3.7h-2.5v3.8h2.3V37h5.4V15.6h5.1l1.4-3.8H75.5z M92.3,11.2c-6.7,0-11,5.2-11,13.3c0,8.1,4.3,13.2,11.1,13.2
-  	c6.8,0,11.2-5,11.2-13.2C103.6,16.5,99.5,11.2,92.3,11.2z M92.5,33.6c-3.3,0-5.1-2.1-5.1-9.5c0-6.1,1.5-8.8,5-8.8
-  	c3.2,0,5.2,2.1,5.2,9.3C97.6,30.9,95.8,33.6,92.5,33.6z M125.2,11.8h-6.4c-0.7,1.1-3.3,6.1-4,7.7c-1.2-2.3-3.4-6.3-4.6-8.2l-5.9,1.2
-  	l7.3,10.8L102.2,37h6.9c0.9-1.4,4.5-7.5,5.5-9.4c0.5,0.9,4.6,8,5.5,9.4h6.9l-9.2-13.8L125.2,11.8z M128,12c-1.1,0-2,0.9-2,2
-  	s0.9,2,2,2c1.1,0,2-0.9,2-2S129.1,12,128,12z M128,15.5c-0.8,0-1.5-0.7-1.5-1.5s0.7-1.5,1.5-1.5c0.8,0,1.5,0.7,1.5,1.5
-  	S128.8,15.5,128,15.5z"/>
-	
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="130px" height="38px" viewBox="0 0 130 38">
+  <path fill="#55575c" d="M128.4,14.4c0,0-0.1-0.1-0.1-0.1c0,0-0.1-0.1-0.1-0.1c0,0-0.1-0.1-0.1-0.1c0.2,0,0.3-0.1,0.4-0.2
+  c0.1-0.1,0.1-0.3,0.1-0.4c0-0.1,0-0.2,0-0.2c0-0.1-0.1-0.1-0.1-0.2c-0.1-0.1-0.1-0.1-0.2-0.1c-0.1,0-0.2-0.1-0.3-0.1h-0.7v2.2h0.4
+  v-1c0,0,0.1,0,0.1,0c0,0,0,0,0.1,0.1c0.1,0.1,0.1,0.1,0.2,0.2c0.1,0.1,0.1,0.2,0.2,0.3l0.2,0.4h0.4l-0.3-0.5
+  C128.4,14.5,128.4,14.5,128.4,14.4z M127.8,13.9h-0.2v-0.7h0.2c0.2,0,0.3,0,0.4,0.1c0.1,0.1,0.1,0.1,0.1,0.3c0,0.1,0,0.2-0.1,0.3
+  c0,0-0.1,0.1-0.1,0.1C128,13.9,127.9,13.9,127.8,13.9z M0,37h5.7V21.2h9.6v-4.6H5.7V7.2h11.8l0.7-4.7H0V37z M24.2,0.7
+  c-2,0-3.6,1.6-3.6,3.7c0,2,1.5,3.6,3.5,3.6c2,0,3.7-1.6,3.7-3.6C27.8,2.3,26.2,0.7,24.2,0.7z M21.4,37h5.5V11.2l-5.5,1V37z
+  M43.7,11.1c-2.5,0-4.4,1.3-6.4,4c0-1.4-0.3-2.8-0.9-4l-5,1.3c0.6,1.6,0.9,3.6,0.9,6.8V37h5.5V19.9c0.5-2,2.4-3.7,4.7-3.7
+  c0.6,0,1,0.1,1.6,0.4l1.7-5.1C45,11.2,44.5,11.1,43.7,11.1z M62.7,13.8c-2.1-1.9-4.4-2.6-6.9-2.6c-3.2,0-5.7,1-7.7,3.4
+  c-2.2,2.5-3.1,5.4-3.1,9.9c0,8.1,4.5,13.2,11.6,13.2c3.4,0,6.4-1.1,9.1-3.3L63.4,31c-1.9,1.6-3.9,2.5-6.3,2.5
+  c-4.9,0-6.2-3.7-6.2-7.2v-0.4H66v-1.2C66,18.9,64.9,15.8,62.7,13.8z M51,21.8c0-4.1,1.7-6.5,4.8-6.5c2.8,0,4.5,2.4,4.5,6.5H51z
+  M75.5,11.8V7.9c0-2.2,1.2-3.5,3.1-3.5c1,0,1.8,0.3,3,0.9l1.8-3.5c-1.7-1-3.5-1.4-5.7-1.4C73.2,0.3,70,2.8,70,8
+  c0,2.3,0.2,3.7,0.2,3.7h-2.5v3.8h2.3V37h5.4V15.6h5.1l1.4-3.8H75.5z M92.3,11.2c-6.7,0-11,5.2-11,13.3c0,8.1,4.3,13.2,11.1,13.2
+  c6.8,0,11.2-5,11.2-13.2C103.6,16.5,99.5,11.2,92.3,11.2z M92.5,33.6c-3.3,0-5.1-2.1-5.1-9.5c0-6.1,1.5-8.8,5-8.8
+  c3.2,0,5.2,2.1,5.2,9.3C97.6,30.9,95.8,33.6,92.5,33.6z M125.2,11.8h-6.4c-0.7,1.1-3.3,6.1-4,7.7c-1.2-2.3-3.4-6.3-4.6-8.2l-5.9,1.2
+  l7.3,10.8L102.2,37h6.9c0.9-1.4,4.5-7.5,5.5-9.4c0.5,0.9,4.6,8,5.5,9.4h6.9l-9.2-13.8L125.2,11.8z M128,12c-1.1,0-2,0.9-2,2
+  s0.9,2,2,2c1.1,0,2-0.9,2-2S129.1,12,128,12z M128,15.5c-0.8,0-1.5-0.7-1.5-1.5s0.7-1.5,1.5-1.5c0.8,0,1.5,0.7,1.5,1.5
+  S128.8,15.5,128,15.5z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/branding/official/content/silhouette-40.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/branding/official/content/silhouette-40.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/branding/official/content/silhouette-40.svg	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/branding/official/content/silhouette-40.svg	2015-05-25 20:42:44.000000000 +0000
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1"
- xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="-45 31 40 40"
- enable-background="new -45 31 40 40">
- <path fill="#CCCCCC" d="M-14.1,54.7c0.7-1.4,1.7-4.4,0.8-6.9c0,0,0,0,0,0.1l0,0c0,0-0.2,0.5-0.4,1.3c0-0.1,0-0.2,0-0.3
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-45 31 40 40">
+  <path fill="#ccc" d="M-14.1,54.7c0.7-1.4,1.7-4.4,0.8-6.9c0,0,0,0,0,0.1l0,0c0,0-0.2,0.5-0.4,1.3c0-0.1,0-0.2,0-0.3
   c0.1-0.9,0-1.9-0.1-2.9c-0.3-1.5-1.4-2.8-2-3.2c0,0,0.1,0,0.1,0.1c-0.1-0.1-0.1-0.1-0.1-0.1s0,0.1,0.1,0.4c-0.7-1.1-1.6-1.5-1.6-1.5
   s0,0.2,0.1,0.5c-2-1.9-4.7-3-7.6-3c-3,0-5.7,1.2-7.8,3.1c0.1,0.1,0.2,0.3,0.4,0.5c0,0,0.8-0.1,1.7-0.1c1.7-1.2,3.6-1.8,5.7-1.8
   c2.6,0,5.1,1.1,7,3c-0.2-0.1-0.1,0,0,0.1c-0.6-0.4-1.2-0.8-1.7-0.8c1,0.8,2.6,2.7,2.4,6.2c-0.3-0.6-0.6-1-0.9-1.3
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/branding/unofficial/content/about-wordmark.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/branding/unofficial/content/about-wordmark.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/branding/unofficial/content/about-wordmark.svg	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/branding/unofficial/content/about-wordmark.svg	2015-05-25 20:42:45.000000000 +0000
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<svg version="1.1" id="aboutWordmark" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="132px" height="48px" viewBox="0 0 132 48" xml:space="preserve">
-
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="132px" height="48px" viewBox="0 0 132 48">
   <path fill="#fff" d="M60.6,14.3l-2.4-2.4C57,12.7,56,13,54.7,13c-3,0-3.8-1.4-7.6-1.4c-5.4,0-9.2,3.4-9.2,8.4
-  	c0,3.3,2.2,6.1,5.6,7.2c-3.4,1-4.5,2.2-4.5,4.3c0,2.2,1.8,3.6,4.7,3.6h3.8c2.5,0,3.9,0.2,4.9,0.9c0.9,0.6,1.4,1.6,1.4,3
-  	c0,3.1-2.2,4.4-6,4.4c-2,0-3.8-0.5-5.1-1.2c-0.9-0.6-1.5-1.6-1.5-2.9c0-0.8,0.3-1.7,0.7-2.2l-4.1,0.4c-0.3,1-0.5,1.7-0.5,2.6
-  	c0,3.5,3,6.4,10.8,6.4c6.1,0,9.9-2.5,9.9-7.9c0-2.1-0.8-3.9-2.7-5.3c-1.5-1.1-3.1-1.4-6-1.4h-4c-1.3,0-2-0.5-2-1.2
-  	c0-0.8,1.1-1.7,4.5-2.9c1.8,0,3.4-0.3,4.7-1.1c2.3-1.4,3.7-4.1,3.7-6.8c0-1.6-0.5-3-1.5-4.3c0.4,0.2,1.1,0.3,1.7,0.3
-  	C57.9,15.8,59,15.4,60.6,14.3z M47.1,24.8c-3.1,0-4.8-1.7-4.8-4.8c0-3.5,1.6-5.1,4.7-5.1c3.3,0,4.6,1.5,4.6,4.9
-  	C51.6,23.1,50.1,24.8,47.1,24.8z M30.7,1.3c-1.7,0-3,1.4-3,3.1s1.4,3,3,3c1.7,0,3.1-1.3,3.1-3C33.7,2.7,32.4,1.3,30.7,1.3z
-  	 M107.7,34.5c-1.1,0-1.4-0.6-1.4-2.5V6.5c0-3.8-0.6-5.9-0.6-5.9l-3.9,0.8c0,0,0.6,1.9,0.6,5.1v26.4c0,1.8,0.4,2.8,1.2,3.5
-  	c0.7,0.7,1.7,1,2.9,1c1,0,1.5-0.1,2.5-0.5l-0.8-2.5C108.2,34.4,107.8,34.5,107.7,34.5z M74.7,11.6c-3.2,0-6.1,1.8-8.3,3.9
-  	c0,0,0.2-1.8,0.2-3.4V6.3c0-3.8-0.7-5.9-0.7-5.9l-3.9,0.7c0,0,0.7,1.9,0.7,5.1V37h3.9V19.3c2.1-2.7,4.9-4.2,7.2-4.2
-  	c1.3,0,2.3,0.4,2.9,1c0.7,0.7,0.9,1.8,0.9,3.7V37h3.8V19.1c0-1.8-0.1-2.6-0.4-3.6C80.4,13.2,77.7,11.6,74.7,11.6z M127.4,12.1
-  	l-4.9,16.4c-0.6,2-1.6,5.2-1.6,5.2s-0.7-3.9-1.5-6.2l-5.1-16.2l-3.9,1.3l5.4,15.6c0.8,2.5,2.2,7.4,2.5,9l1.6-0.3
-  	c-1.3,5.1-2.5,6.7-5.7,7.6l1.2,2.7c4.4-1,6.4-4.3,8-9.3l8.6-25.8H127.4z M96.9,15l1.2-2.9h-6.2c0-3.3,0.5-7.2,0.5-7.2l-4.1,0.9
-  	c0,0-0.4,3.9-0.4,6.3h-3.2V15h3.2v17.1c0,2.5,0.7,4.1,2.4,5c0.9,0.4,1.9,0.7,3.3,0.7c1.8,0,3.1-0.4,4.4-1l-0.6-2.5
-  	c-0.7,0.3-1.3,0.5-2.4,0.5c-2.4,0-3.2-0.9-3.2-3.7V15H96.9z M28.6,37h4.1V11.5l-4.1,0.6V37z M18.9,21.3c0,5,0.4,10.5,0.4,10.5
-  	s-1.4-3.8-3.2-7.2L4.8,2.7H0V37h4.2L4,17.1c0-4.5-0.4-9.3-0.4-9.3s1.7,4.1,3.9,8.2l11,21h4.3V2.7h-4L18.9,21.3z"/>
-	
+  c0,3.3,2.2,6.1,5.6,7.2c-3.4,1-4.5,2.2-4.5,4.3c0,2.2,1.8,3.6,4.7,3.6h3.8c2.5,0,3.9,0.2,4.9,0.9c0.9,0.6,1.4,1.6,1.4,3
+  c0,3.1-2.2,4.4-6,4.4c-2,0-3.8-0.5-5.1-1.2c-0.9-0.6-1.5-1.6-1.5-2.9c0-0.8,0.3-1.7,0.7-2.2l-4.1,0.4c-0.3,1-0.5,1.7-0.5,2.6
+  c0,3.5,3,6.4,10.8,6.4c6.1,0,9.9-2.5,9.9-7.9c0-2.1-0.8-3.9-2.7-5.3c-1.5-1.1-3.1-1.4-6-1.4h-4c-1.3,0-2-0.5-2-1.2
+  c0-0.8,1.1-1.7,4.5-2.9c1.8,0,3.4-0.3,4.7-1.1c2.3-1.4,3.7-4.1,3.7-6.8c0-1.6-0.5-3-1.5-4.3c0.4,0.2,1.1,0.3,1.7,0.3
+  C57.9,15.8,59,15.4,60.6,14.3z M47.1,24.8c-3.1,0-4.8-1.7-4.8-4.8c0-3.5,1.6-5.1,4.7-5.1c3.3,0,4.6,1.5,4.6,4.9
+  C51.6,23.1,50.1,24.8,47.1,24.8z M30.7,1.3c-1.7,0-3,1.4-3,3.1s1.4,3,3,3c1.7,0,3.1-1.3,3.1-3C33.7,2.7,32.4,1.3,30.7,1.3z
+  M107.7,34.5c-1.1,0-1.4-0.6-1.4-2.5V6.5c0-3.8-0.6-5.9-0.6-5.9l-3.9,0.8c0,0,0.6,1.9,0.6,5.1v26.4c0,1.8,0.4,2.8,1.2,3.5
+  c0.7,0.7,1.7,1,2.9,1c1,0,1.5-0.1,2.5-0.5l-0.8-2.5C108.2,34.4,107.8,34.5,107.7,34.5z M74.7,11.6c-3.2,0-6.1,1.8-8.3,3.9
+  c0,0,0.2-1.8,0.2-3.4V6.3c0-3.8-0.7-5.9-0.7-5.9l-3.9,0.7c0,0,0.7,1.9,0.7,5.1V37h3.9V19.3c2.1-2.7,4.9-4.2,7.2-4.2
+  c1.3,0,2.3,0.4,2.9,1c0.7,0.7,0.9,1.8,0.9,3.7V37h3.8V19.1c0-1.8-0.1-2.6-0.4-3.6C80.4,13.2,77.7,11.6,74.7,11.6z M127.4,12.1
+  l-4.9,16.4c-0.6,2-1.6,5.2-1.6,5.2s-0.7-3.9-1.5-6.2l-5.1-16.2l-3.9,1.3l5.4,15.6c0.8,2.5,2.2,7.4,2.5,9l1.6-0.3
+  c-1.3,5.1-2.5,6.7-5.7,7.6l1.2,2.7c4.4-1,6.4-4.3,8-9.3l8.6-25.8H127.4z M96.9,15l1.2-2.9h-6.2c0-3.3,0.5-7.2,0.5-7.2l-4.1,0.9
+  c0,0-0.4,3.9-0.4,6.3h-3.2V15h3.2v17.1c0,2.5,0.7,4.1,2.4,5c0.9,0.4,1.9,0.7,3.3,0.7c1.8,0,3.1-0.4,4.4-1l-0.6-2.5
+  c-0.7,0.3-1.3,0.5-2.4,0.5c-2.4,0-3.2-0.9-3.2-3.7V15H96.9z M28.6,37h4.1V11.5l-4.1,0.6V37z M18.9,21.3c0,5,0.4,10.5,0.4,10.5
+  s-1.4-3.8-3.2-7.2L4.8,2.7H0V37h4.2L4,17.1c0-4.5-0.4-9.3-0.4-9.3s1.7,4.1,3.9,8.2l11,21h4.3V2.7h-4L18.9,21.3z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/branding/unofficial/content/silhouette-40.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/branding/unofficial/content/silhouette-40.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/branding/unofficial/content/silhouette-40.svg	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/branding/unofficial/content/silhouette-40.svg	2015-05-25 20:42:45.000000000 +0000
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1"
- xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="-45 31 40 40"
- enable-background="new -45 31 40 40">
- <path fill="#CCCCCC" d="M-25,62.991c-6.622,0-11.991-5.369-11.991-11.991S-31.622,39.009-25,39.009S-13.009,44.378-13.009,51
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-45 31 40 40">
+  <path fill="#ccc" d="M-25,62.991c-6.622,0-11.991-5.369-11.991-11.991S-31.622,39.009-25,39.009S-13.009,44.378-13.009,51
   S-18.378,62.991-25,62.991z M-34.439,48.549c-0.002,0.007-0.004,0.013-0.006,0.02c0.002-0.004,0.006-0.006,0.007-0.01
   C-34.437,48.555-34.438,48.552-34.439,48.549z M-34.259,47.956c-0.001-0.006-0.003-0.005-0.002-0.012l0,0
   c-0.001,0.004-0.003,0.008-0.004,0.012l0.008,0.006C-34.258,47.96-34.258,47.958-34.259,47.956z M-34.245,48.067
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/customizableui/content/panelUI.inc.xul firefox-trunk-41.0~a1~hg20150524r245419/browser/components/customizableui/content/panelUI.inc.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/customizableui/content/panelUI.inc.xul	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/customizableui/content/panelUI.inc.xul	2015-05-25 20:42:45.000000000 +0000
@@ -103,6 +103,10 @@
                        observes="bookmarkThisPageBroadcaster"
                        command="Browser:AddBookmarkAs"
                        onclick="PanelUI.hide();"/>
+        <toolbarseparator id="panelMenu_pocketSeparator"/>
+        <toolbarbutton id="panelMenu_pocket" label="&pocketMenuitem.label;"
+                       class="subviewbutton cui-withicon"
+                       oncommand="openUILink(Pocket.listURL, event);"/>
         <toolbarseparator/>
         <toolbarbutton id="panelMenu_viewBookmarksSidebar"
                        label="&viewBookmarksSidebar2.label;"
@@ -137,10 +141,6 @@
           <observes element="readingListSidebar" attribute="checked"/>
           <observes element="readingListSidebar" attribute="hidden"/>
         </toolbarbutton>
-        <toolbarseparator id="panelMenu_pocketSeparator"/>
-        <toolbarbutton id="panelMenu_pocket" label="&pocketMenuitem.label;"
-                       class="subviewbutton cui-withicon"
-                       oncommand="openUILink(Pocket.listURL, event);"/>
         <toolbarseparator class="small-separator"/>
         <toolbaritem id="panelMenu_bookmarksMenu"
                      orient="vertical"
@@ -235,7 +235,6 @@
 
     <panelview id="PanelUI-pocketView" flex="1">
       <vbox class="panel-subview-body">
-        <iframe id="pocket-panel-iframe" type="content"/>
       </vbox>
     </panelview>
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/customizableui/content/panelUI.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/customizableui/content/panelUI.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/customizableui/content/panelUI.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/customizableui/content/panelUI.js	2015-05-25 20:42:45.000000000 +0000
@@ -6,8 +6,6 @@
                                   "resource:///modules/CustomizableUI.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "ScrollbarSampler",
                                   "resource:///modules/ScrollbarSampler.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "Pocket",
-                                  "resource:///modules/Pocket.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Promise",
                                   "resource://gre/modules/Promise.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "ShortcutUtils",
@@ -515,19 +513,11 @@
  * @return  the selected locale or "en-US" if none is selected
  */
 function getLocale() {
-  const PREF_SELECTED_LOCALE = "general.useragent.locale";
   try {
-    let locale = Services.prefs.getComplexValue(PREF_SELECTED_LOCALE,
-                                                Ci.nsIPrefLocalizedString);
-    if (locale)
-      return locale;
+    let chromeRegistry = Cc["@mozilla.org/chrome/chrome-registry;1"]
+                           .getService(Ci.nsIXULChromeRegistry);
+    return chromeRegistry.getSelectedLocale("browser");
+  } catch (ex) {
+    return "en-US";
   }
-  catch (e) { }
-
-  try {
-    return Services.prefs.getCharPref(PREF_SELECTED_LOCALE);
-  }
-  catch (e) { }
-
-  return "en-US";
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/customizableui/CustomizableUI.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/components/customizableui/CustomizableUI.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/customizableui/CustomizableUI.jsm	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/customizableui/CustomizableUI.jsm	2015-05-25 20:42:45.000000000 +0000
@@ -300,6 +300,13 @@
     // We should still enter even if gSavedState.currentVersion >= kVersion
     // because the per-widget pref facility is independent of versioning.
     if (!gSavedState) {
+      // Flip all the prefs so we don't try to re-introduce later:
+      for (let [id, widget] of gPalette) {
+        if (widget.defaultArea && widget._introducedInVersion === "pref") {
+          let prefId = "browser.toolbarbuttons.introduced." + widget.id;
+          Services.prefs.setBoolPref(prefId, true);
+        }
+      }
       return;
     }
 
@@ -376,6 +383,7 @@
           // Before you ask, yes, deleting things inside a let x of y loop where y is a Set is
           // safe, and we won't skip any items.
           futurePlacedWidgets.delete(widget.id);
+          gDirty = true;
           break;
         }
         // Otherwise, if we're somewhere other than the beginning, check if the previous
@@ -386,6 +394,7 @@
           if (previousWidgetIndex != -1) {
             savedPlacements.splice(previousWidgetIndex + 1, 0, widget.id);
             futurePlacedWidgets.delete(widget.id);
+            gDirty = true;
             break;
           }
         }
@@ -394,6 +403,7 @@
       // with doing nothing else now; if the item remains in gFuturePlacements, we'll
       // add it at the end in restoreStateForArea.
     }
+    this.saveState();
   },
 
   wrapWidget: function(aWidgetId) {
@@ -2173,9 +2183,9 @@
     // current placement settings.
 
     // This allows a widget to be both built-in by default but also able to be
-    // destroyed based on criteria that may not be available when the widget is
-    // created -- for example, because some other feature in the browser
-    // supersedes the widget.
+    // destroyed and removed from the area based on criteria that may not be
+    // available when the widget is created -- for example, because some other
+    // feature in the browser supersedes the widget.
     let conditionalDestroyPromise = aData.conditionalDestroyPromise || null;
     delete aData.conditionalDestroyPromise;
 
@@ -2192,6 +2202,7 @@
       conditionalDestroyPromise.then(shouldDestroy => {
         if (shouldDestroy) {
           this.destroyWidget(widget.id);
+          this.removeWidgetFromArea(widget.id);
         }
       }, err => {
         Cu.reportError(err);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/customizableui/CustomizableWidgets.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/components/customizableui/CustomizableWidgets.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/customizableui/CustomizableWidgets.jsm	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/customizableui/CustomizableWidgets.jsm	2015-05-25 20:42:45.000000000 +0000
@@ -1080,6 +1080,8 @@
   }
 
   if (isEnabledForLocale) {
+    if (browserLocale == "ja-JP-mac")
+      browserLocale = "ja";
     let url = "chrome://browser/content/browser-pocket-" + browserLocale + ".properties";
     let strings = Services.strings.createBundle(url);
     let label;
@@ -1090,7 +1092,7 @@
     } catch (err) {
       // GetStringFromName throws when the bundle doesn't exist.  In that case,
       // fall back to the en-US browser-pocket.properties.
-      url = "chrome://browser/content/browser-pocket.properties";
+      url = "chrome://browser/content/browser-pocket-en-US.properties";
       strings = Services.strings.createBundle(url);
       label = strings.GetStringFromName("pocket-button.label");
       tooltiptext = strings.GetStringFromName("pocket-button.tooltiptext");
@@ -1104,8 +1106,13 @@
       viewId: "PanelUI-pocketView",
       label: label,
       tooltiptext: tooltiptext,
-      onViewShowing: Pocket.onPanelViewShowing,
-      onViewHiding: Pocket.onPanelViewHiding,
+      // Use forwarding functions here to avoid loading Pocket.jsm on startup:
+      onViewShowing: function() {
+        return Pocket.onPanelViewShowing.apply(this, arguments);
+      },
+      onViewHiding: function() {
+        return Pocket.onPanelViewHiding.apply(this, arguments);
+      },
 
       // If the user has the "classic" Pocket add-on installed, use that instead
       // and destroy the widget.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/customizableui/test/browser_1003588_no_specials_in_panel.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/customizableui/test/browser_1003588_no_specials_in_panel.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/customizableui/test/browser_1003588_no_specials_in_panel.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/customizableui/test/browser_1003588_no_specials_in_panel.js	2015-05-25 20:42:45.000000000 +0000
@@ -3,6 +3,21 @@
 
 "use strict";
 
+function simulateItemDragAndEnd(aToDrag, aTarget) {
+  var ds = Components.classes["@mozilla.org/widget/dragservice;1"].
+           getService(Components.interfaces.nsIDragService);
+
+  ds.startDragSession();
+  try {
+    var [result, dataTransfer] = ChromeUtils.synthesizeDragOver(aToDrag.parentNode, aTarget);
+    ChromeUtils.synthesizeDropAfterDragOver(result, dataTransfer, aTarget);
+    // Send dragend to move dragging item back to initial place.
+    EventUtils.sendDragEvent({ type: "dragend", dataTransfer: dataTransfer },
+                             aToDrag.parentNode);
+  } finally {
+    ds.endDragSession(true);
+  }
+}
 
 add_task(function* checkNoAddingToPanel() {
   let area = CustomizableUI.AREA_PANEL;
@@ -66,7 +81,7 @@
 
   yield startCustomizing();
   for (let id of elementsToMove) {
-    simulateItemDrag(document.getElementById(id), PanelUI.contents);
+    simulateItemDragAndEnd(document.getElementById(id), PanelUI.contents);
   }
 
   assertAreaPlacements(startArea, placementsWithSpecials);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/customizableui/test/browser_1007336_lwthemes_in_customize_mode.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/customizableui/test/browser_1007336_lwthemes_in_customize_mode.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/customizableui/test/browser_1007336_lwthemes_in_customize_mode.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/customizableui/test/browser_1007336_lwthemes_in_customize_mode.js	2015-05-25 20:42:45.000000000 +0000
@@ -51,7 +51,7 @@
 
   let defaultTheme = header.nextSibling;
   defaultTheme.doCommand();
-  is(Services.prefs.prefHasUserValue("lightweightThemes.selectedThemeID"), false, "No lwtheme should be selected");
+  is(Services.prefs.getCharPref("lightweightThemes.selectedThemeID"), "", "No lwtheme should be selected");
 });
 
 add_task(function asyncCleanup() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/customizableui/test/browser_962069_drag_to_overflow_chevron.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/customizableui/test/browser_962069_drag_to_overflow_chevron.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/customizableui/test/browser_962069_drag_to_overflow_chevron.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/customizableui/test/browser_962069_drag_to_overflow_chevron.js	2015-05-25 20:42:45.000000000 +0000
@@ -26,8 +26,20 @@
   // async-ness of the 'shown' yield...
   let panelHiddenPromise = promisePanelElementHidden(window, widgetOverflowPanel);
 
-  ChromeUtils.synthesizeDrop(identityBox, overflowChevron, [], null);
-  yield panelShownPromise;
+  var ds = Components.classes["@mozilla.org/widget/dragservice;1"].
+           getService(Components.interfaces.nsIDragService);
+
+  ds.startDragSession();
+  try {
+    var [result, dataTransfer] = ChromeUtils.synthesizeDragOver(identityBox, overflowChevron);
+
+    // Wait for showing panel before ending drag session.
+    yield panelShownPromise;
+
+    ChromeUtils.synthesizeDropAfterDragOver(result, dataTransfer, overflowChevron);
+  } finally {
+    ds.endDragSession(true);
+  }
 
   info("Overflow panel is shown.");
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/customizableui/test/browser_978084_dragEnd_after_move.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/customizableui/test/browser_978084_dragEnd_after_move.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/customizableui/test/browser_978084_dragEnd_after_move.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/customizableui/test/browser_978084_dragEnd_after_move.js	2015-05-25 20:42:45.000000000 +0000
@@ -21,6 +21,7 @@
   simulateItemDrag(draggedItem, gCustomizeMode.visiblePalette);
   is(document.documentElement.hasAttribute("customizing-movingItem"), false,
      "Make sure customizing-movingItem is removed after dragging to the palette");
+  yield endCustomizing();
 });
 
 // Drop on a customization target itself
@@ -36,6 +37,7 @@
   simulateItemDrag(draggedItem, dest.customizationTarget);
   is(document.documentElement.hasAttribute("customizing-movingItem"), false,
      "Make sure customizing-movingItem is removed");
+  yield endCustomizing();
 });
 
 add_task(function asyncCleanup() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/customizableui/test/browser_995164_registerArea_during_customize_mode.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/customizableui/test/browser_995164_registerArea_during_customize_mode.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/customizableui/test/browser_995164_registerArea_during_customize_mode.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/customizableui/test/browser_995164_registerArea_during_customize_mode.js	2015-05-25 20:42:45.000000000 +0000
@@ -18,6 +18,7 @@
   ok(!CustomizableUI.getPlacementOfWidget("sync-button"), "Button moved to the palette");
   ok(gNavToolbox.palette.querySelector("#sync-button"), "Sync button really is in palette.");
 
+  syncButton.scrollIntoView();
   simulateItemDrag(syncButton, toolbar);
   ok(CustomizableUI.getPlacementOfWidget("sync-button"), "Button moved out of palette");
   is(CustomizableUI.getPlacementOfWidget("sync-button").area, TOOLBARID, "Button's back on toolbar");
@@ -49,6 +50,7 @@
   ok(!CustomizableUI.inDefaultState, "Now that the toolbar is registered again, should no longer be in default state.");
   ok(gCustomizeMode.areas.has(toolbar), "Toolbar should be known to customize mode again.");
 
+  syncButton.scrollIntoView();
   simulateItemDrag(syncButton, toolbar);
   ok(CustomizableUI.getPlacementOfWidget("sync-button"), "Button moved out of palette");
   is(CustomizableUI.getPlacementOfWidget("sync-button").area, TOOLBARID, "Button's back on toolbar");
@@ -78,6 +80,7 @@
   ok(gNavToolbox.palette.querySelector("#sync-button"), "Sync button really is in palette.");
   ok(!otherTB.querySelector("#sync-button"), "Sync button is in palette in other window, too.");
 
+  syncButton.scrollIntoView();
   simulateItemDrag(syncButton, toolbar);
   ok(CustomizableUI.getPlacementOfWidget("sync-button"), "Button moved out of palette");
   is(CustomizableUI.getPlacementOfWidget("sync-button").area, TOOLBARID, "Button's back on toolbar");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/customizableui/test/head.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/customizableui/test/head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/customizableui/test/head.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/customizableui/test/head.js	2015-05-25 20:42:45.000000000 +0000
@@ -173,12 +173,8 @@
   return CustomizableUI.getWidgetIdsInArea(areaId);
 }
 
-function simulateItemDrag(toDrag, target) {
-  let docId = toDrag.ownerDocument.documentElement.id;
-  let dragData = [[{type: 'text/toolbarwrapper-id/' + docId,
-                    data: toDrag.id}]];
-  synthesizeDragStart(toDrag.parentNode, dragData);
-  synthesizeDrop(target, target, dragData);
+function simulateItemDrag(aToDrag, aTarget) {
+  synthesizeDrop(aToDrag.parentNode, aTarget);
 }
 
 function endCustomizing(aWindow=window) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/downloads/content/allDownloadsViewOverlay.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/downloads/content/allDownloadsViewOverlay.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/downloads/content/allDownloadsViewOverlay.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/downloads/content/allDownloadsViewOverlay.js	2015-05-25 20:42:46.000000000 +0000
@@ -1208,7 +1208,7 @@
 
     Cc["@mozilla.org/widget/clipboardhelper;1"]
       .getService(Ci.nsIClipboardHelper)
-      .copyString(urls.join("\n"), document);
+      .copyString(urls.join("\n"));
   },
 
   _getURLFromClipboardData() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/downloads/content/downloads.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/downloads/content/downloads.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/downloads/content/downloads.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/downloads/content/downloads.js	2015-05-25 20:42:46.000000000 +0000
@@ -1262,7 +1262,7 @@
     downloadsCmd_copyLocation() {
       let clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"]
                       .getService(Ci.nsIClipboardHelper);
-      clipboard.copyString(this.download.source.url, document);
+      clipboard.copyString(this.download.source.url);
     },
 
     downloadsCmd_doDefault() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/conversation.html firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/conversation.html
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/conversation.html	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/conversation.html	2015-05-25 20:42:46.000000000 +0000
@@ -40,6 +40,8 @@
     <script type="text/javascript" src="loop/shared/js/feedbackStore.js"></script>
     <script type="text/javascript" src="loop/shared/js/views.js"></script>
     <script type="text/javascript" src="loop/shared/js/feedbackViews.js"></script>
+    <script type="text/javascript" src="loop/shared/js/textChatStore.js"></script>
+    <script type="text/javascript" src="loop/shared/js/textChatView.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 firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/css/panel.css firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/css/panel.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/css/panel.css	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/css/panel.css	2015-05-25 20:42:46.000000000 +0000
@@ -229,30 +229,59 @@
   -moz-margin-start: 0;
 }
 
-.new-room-view > .context > .context-preview {
-  float: right;
-  width: 100px;
-  max-height: 200px;
-  -moz-margin-start: 10px;
-  margin-bottom: 10px;
+.new-room-view > .context > .checkbox-wrapper {
+  margin-bottom: .5em;
 }
 
-body[dir=rtl] .new-room-view > .context > .context-preview {
+.new-room-view > .context > .checkbox-wrapper > .checkbox {
+  border-color: #0096dd;
+  background-color: #fff;
+}
+
+.new-room-view > .context > .checkbox-wrapper > .checkbox.checked {
+  background-image: url("../shared/img/check.svg#check-blue");
+}
+
+.new-room-view > .context > .checkbox-wrapper > label {
+  color: #3c3c3c;
+  font-weight: 700;
+}
+
+.new-room-view > .context > .context-content {
+  border: 1px solid #0096dd;
+  border-radius: 3px;
+  background: #fff;
+  padding: .8em;
+  display: flex;
+  flex-flow: row nowrap;
+  line-height: 1.1em;
+}
+
+.new-room-view > .context > .context-content > .context-preview {
+  float: left;
+  width: 16px;
+  max-height: 16px;
+  -moz-margin-end: .8em;
+  flex: 0 1 auto;
+}
+
+body[dir=rtl] .new-room-view > .context > .context-content > .context-preview {
   float: left;
 }
 
-.new-room-view > .context > .context-preview[src=""] {
+.new-room-view > .context > .context-content > .context-preview[src=""] {
   display: none;
 }
 
-.new-room-view > .context > .context-description {
+.new-room-view > .context > .context-content > .context-description {
+  flex: 0 1 auto;
   display: block;
-  color: #707070;
 }
 
-.new-room-view > .context > .context-url {
+.new-room-view > .context > .context-content > .context-description > .context-url {
   display: block;
   color: #59A1D7;
+  font-weight: 700;
   clear: both;
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/client.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/client.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/client.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/client.js	2015-05-25 20:42:46.000000000 +0000
@@ -2,9 +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/. */
 
-/* jshint esnext:true */
-/* global loop:true, hawk, deriveHawkCredentials */
-
 var loop = loop || {};
 loop.Client = (function($) {
   "use strict";
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/contacts.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/contacts.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/contacts.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/contacts.js	2015-05-25 20:42:46.000000000 +0000
@@ -1,12 +1,7 @@
-/** @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.contacts = (function(_, mozL10n) {
   "use strict";
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/contacts.jsx firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/contacts.jsx
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/contacts.jsx	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/contacts.jsx	2015-05-25 20:42:46.000000000 +0000
@@ -1,12 +1,7 @@
-/** @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.contacts = (function(_, mozL10n) {
   "use strict";
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/conversationAppStore.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/conversationAppStore.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/conversationAppStore.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/conversationAppStore.js	2015-05-25 20:42:46.000000000 +0000
@@ -2,8 +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/. */
 
-/* global loop:true */
-
 var loop = loop || {};
 loop.store = loop.store || {};
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/conversation.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/conversation.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/conversation.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/conversation.js	2015-05-25 20:42:46.000000000 +0000
@@ -1,12 +1,7 @@
-/** @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, esnext:true */
-/* global loop:true, React */
-
 var loop = loop || {};
 loop.conversation = (function(mozL10n) {
   "use strict";
@@ -91,10 +86,14 @@
       }
     });
 
+    // We want data channels only if the text chat preference is enabled.
+    var useDataChannels = loop.shared.utils.getBoolPreference("textChat.enabled");
+
     var dispatcher = new loop.Dispatcher();
     var client = new loop.Client();
     var sdkDriver = new loop.OTSdkDriver({
       isDesktop: true,
+      useDataChannels: useDataChannels,
       dispatcher: dispatcher,
       sdk: OT,
       mozLoop: navigator.mozLoop
@@ -135,11 +134,15 @@
     var feedbackStore = new loop.store.FeedbackStore(dispatcher, {
       feedbackClient: feedbackClient
     });
+    var textChatStore = new loop.store.TextChatStore(dispatcher, {
+      sdkDriver: sdkDriver
+    });
 
     loop.store.StoreMixin.register({
       conversationAppStore: conversationAppStore,
       conversationStore: conversationStore,
-      feedbackStore: feedbackStore
+      feedbackStore: feedbackStore,
+      textChatStore: textChatStore
     });
 
     // Obtain the windowId and pass it through
@@ -158,8 +161,7 @@
     React.render(React.createElement(AppControllerView, {
       roomStore: roomStore, 
       dispatcher: dispatcher, 
-      mozLoop: navigator.mozLoop}
-    ), document.querySelector('#main'));
+      mozLoop: navigator.mozLoop}), document.querySelector("#main"));
 
     document.body.setAttribute("dir", mozL10n.getDirection());
     document.body.setAttribute("platform", loop.shared.utils.getPlatform());
@@ -183,4 +185,4 @@
   };
 })(document.mozL10n);
 
-document.addEventListener('DOMContentLoaded', loop.conversation.init);
+document.addEventListener("DOMContentLoaded", loop.conversation.init);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/conversation.jsx firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/conversation.jsx
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/conversation.jsx	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/conversation.jsx	2015-05-25 20:42:46.000000000 +0000
@@ -1,12 +1,7 @@
-/** @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, esnext:true */
-/* global loop:true, React */
-
 var loop = loop || {};
 loop.conversation = (function(mozL10n) {
   "use strict";
@@ -91,10 +86,14 @@
       }
     });
 
+    // We want data channels only if the text chat preference is enabled.
+    var useDataChannels = loop.shared.utils.getBoolPreference("textChat.enabled");
+
     var dispatcher = new loop.Dispatcher();
     var client = new loop.Client();
     var sdkDriver = new loop.OTSdkDriver({
       isDesktop: true,
+      useDataChannels: useDataChannels,
       dispatcher: dispatcher,
       sdk: OT,
       mozLoop: navigator.mozLoop
@@ -135,11 +134,15 @@
     var feedbackStore = new loop.store.FeedbackStore(dispatcher, {
       feedbackClient: feedbackClient
     });
+    var textChatStore = new loop.store.TextChatStore(dispatcher, {
+      sdkDriver: sdkDriver
+    });
 
     loop.store.StoreMixin.register({
       conversationAppStore: conversationAppStore,
       conversationStore: conversationStore,
-      feedbackStore: feedbackStore
+      feedbackStore: feedbackStore,
+      textChatStore: textChatStore
     });
 
     // Obtain the windowId and pass it through
@@ -158,8 +161,7 @@
     React.render(<AppControllerView
       roomStore={roomStore}
       dispatcher={dispatcher}
-      mozLoop={navigator.mozLoop}
-    />, document.querySelector('#main'));
+      mozLoop={navigator.mozLoop} />, document.querySelector("#main"));
 
     document.body.setAttribute("dir", mozL10n.getDirection());
     document.body.setAttribute("platform", loop.shared.utils.getPlatform());
@@ -183,4 +185,4 @@
   };
 })(document.mozL10n);
 
-document.addEventListener('DOMContentLoaded', loop.conversation.init);
+document.addEventListener("DOMContentLoaded", loop.conversation.init);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/conversationViews.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/conversationViews.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/conversationViews.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/conversationViews.js	2015-05-25 20:42:46.000000000 +0000
@@ -1,11 +1,7 @@
-/** @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/. */
 
-/* global loop:true, React */
-
 var loop = loop || {};
 loop.conversationViews = (function(mozL10n) {
 
@@ -167,7 +163,7 @@
 
     clickHandler: function(e) {
       var target = e.target;
-      if (!target.classList.contains('btn-chevron')) {
+      if (!target.classList.contains("btn-chevron")) {
         this._hideDeclineMenu();
       }
     },
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/conversationViews.jsx firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/conversationViews.jsx
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/conversationViews.jsx	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/conversationViews.jsx	2015-05-25 20:42:46.000000000 +0000
@@ -1,11 +1,7 @@
-/** @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/. */
 
-/* global loop:true, React */
-
 var loop = loop || {};
 loop.conversationViews = (function(mozL10n) {
 
@@ -167,7 +163,7 @@
 
     clickHandler: function(e) {
       var target = e.target;
-      if (!target.classList.contains('btn-chevron')) {
+      if (!target.classList.contains("btn-chevron")) {
         this._hideDeclineMenu();
       }
     },
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/otconfig.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/otconfig.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/otconfig.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/otconfig.js	2015-05-25 20:42:46.000000000 +0000
@@ -3,8 +3,8 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 window.OTProperties = {
-  cdnURL: 'loop/'
+  cdnURL: "loop/"
 };
-window.OTProperties.assetURL = window.OTProperties.cdnURL + 'sdk-content/';
-window.OTProperties.configURL = window.OTProperties.assetURL + 'js/dynamic_config.min.js';
-window.OTProperties.cssURL = window.OTProperties.assetURL + 'css/ot.css';
+window.OTProperties.assetURL = window.OTProperties.cdnURL + "sdk-content/";
+window.OTProperties.configURL = window.OTProperties.assetURL + "js/dynamic_config.min.js";
+window.OTProperties.cssURL = window.OTProperties.assetURL + "css/ot.css";
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/panel.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/panel.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/panel.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/panel.js	2015-05-25 20:42:46.000000000 +0000
@@ -1,12 +1,7 @@
-/** @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.panel = (function(_, mozL10n) {
   "use strict";
@@ -18,6 +13,7 @@
   var sharedUtils = loop.shared.utils;
   var Button = sharedViews.Button;
   var ButtonGroup = sharedViews.ButtonGroup;
+  var Checkbox = sharedViews.Checkbox;
   var ContactsList = loop.contacts.ContactsList;
   var ContactDetailsForm = loop.contacts.ContactDetailsForm;
 
@@ -132,11 +128,11 @@
       return function(event) {
         // Note: side effect!
         switch (newAvailabilty) {
-          case 'available':
+          case "available":
             this.setState({doNotDisturb: false});
             navigator.mozLoop.doNotDisturb = false;
             break;
-          case 'do-not-disturb':
+          case "do-not-disturb":
             this.setState({doNotDisturb: true});
             navigator.mozLoop.doNotDisturb = true;
             break;
@@ -149,13 +145,13 @@
       // XXX https://github.com/facebook/react/issues/310 for === htmlFor
       var cx = React.addons.classSet;
       var availabilityStatus = cx({
-        'status': true,
-        'status-dnd': this.state.doNotDisturb,
-        'status-available': !this.state.doNotDisturb
+        "status": true,
+        "status-dnd": this.state.doNotDisturb,
+        "status-available": !this.state.doNotDisturb
       });
       var availabilityDropdown = cx({
-        'dropdown-menu': true,
-        'hide': !this.state.showMenu
+        "dropdown-menu": true,
+        "hide": !this.state.showMenu
       });
       var availabilityText = this.state.doNotDisturb ?
                               mozL10n.get("display_name_dnd_status") :
@@ -293,7 +289,7 @@
       }
 
       var locale = mozL10n.getLanguage();
-      navigator.mozLoop.setLoopPref('showPartnerLogo', false);
+      navigator.mozLoop.setLoopPref("showPartnerLogo", false);
       return (
         React.createElement("p", {id: "powered-by", className: "powered-by"}, 
           mozL10n.get("powered_by_beforeLogo"), 
@@ -305,8 +301,8 @@
 
     render: function() {
       if (!this.state.gettingStartedSeen || this.state.seenToS == "unseen") {
-        var terms_of_use_url = navigator.mozLoop.getLoopPref('legal.ToS_url');
-        var privacy_notice_url = navigator.mozLoop.getLoopPref('legal.privacy_url');
+        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.renderToStaticMarkup(
@@ -704,7 +700,10 @@
       userDisplayName: React.PropTypes.string.isRequired
     },
 
-    mixins: [sharedMixins.DocumentVisibilityMixin],
+    mixins: [
+      sharedMixins.DocumentVisibilityMixin,
+      React.addons.PureRenderMixin
+    ],
 
     getInitialState: function() {
       return {
@@ -716,24 +715,25 @@
     },
 
     onDocumentVisible: function() {
+      // We would use onDocumentHidden to null out the data ready for the next
+      // opening. However, this seems to cause an awkward glitch in the display
+      // when opening the panel, and it seems cleaner just to update the data
+      // even if there's a small delay.
+
       this.props.mozLoop.getSelectedTabMetadata(function callback(metadata) {
-        var previewImage = metadata.previews.length ? metadata.previews[0] : "";
-        var description = metadata.description || metadata.title;
+        var previewImage = metadata.favicon || "";
+        var description = metadata.title || metadata.description;
         var url = metadata.url;
-        this.setState({previewImage: previewImage,
-                       description: description,
-                       url: url});
+        this.setState({
+          previewImage: previewImage,
+          description: description,
+          url: url
+        });
       }.bind(this));
     },
 
-    onDocumentHidden: function() {
-      this.setState({previewImage: "",
-                     description: "",
-                     url: ""});
-    },
-
-    onCheckboxChange: function(event) {
-      this.setState({checked: event.target.checked});
+    onCheckboxChange: function(newState) {
+      this.setState({checked: newState.checked});
     },
 
     handleCreateButtonClick: function() {
@@ -770,14 +770,15 @@
       return (
         React.createElement("div", {className: "new-room-view"}, 
           React.createElement("div", {className: contextClasses}, 
-            React.createElement("label", {className: "context-enabled"}, 
-              React.createElement("input", {className: "context-checkbox", 
-                     type: "checkbox", onChange: this.onCheckboxChange}), 
-              mozL10n.get("context_offer_label")
-            ), 
-            React.createElement("img", {className: "context-preview", src: this.state.previewImage}), 
-            React.createElement("span", {className: "context-description"}, this.state.description), 
-            React.createElement("span", {className: "context-url"}, hostname)
+            React.createElement(Checkbox, {label: mozL10n.get("context_inroom_label"), 
+                      onChange: this.onCheckboxChange}), 
+            React.createElement("div", {className: "context-content"}, 
+              React.createElement("img", {className: "context-preview", src: this.state.previewImage}), 
+              React.createElement("span", {className: "context-description"}, 
+                this.state.description, 
+                React.createElement("span", {className: "context-url"}, hostname)
+              )
+            )
           ), 
           React.createElement("button", {className: "btn btn-info new-room-button", 
                   onClick: this.handleCreateButtonClick, 
@@ -1005,8 +1006,8 @@
     document.body.setAttribute("platform", loop.shared.utils.getPlatform());
 
     // Notify the window that we've finished initalization and initial layout
-    var evtObject = document.createEvent('Event');
-    evtObject.initEvent('loopPanelInitialized', true, false);
+    var evtObject = document.createEvent("Event");
+    evtObject.initEvent("loopPanelInitialized", true, false);
     window.dispatchEvent(evtObject);
   }
 
@@ -1026,4 +1027,4 @@
   };
 })(_, document.mozL10n);
 
-document.addEventListener('DOMContentLoaded', loop.panel.init);
+document.addEventListener("DOMContentLoaded", loop.panel.init);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/panel.jsx firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/panel.jsx
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/panel.jsx	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/panel.jsx	2015-05-25 20:42:46.000000000 +0000
@@ -1,12 +1,7 @@
-/** @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.panel = (function(_, mozL10n) {
   "use strict";
@@ -18,6 +13,7 @@
   var sharedUtils = loop.shared.utils;
   var Button = sharedViews.Button;
   var ButtonGroup = sharedViews.ButtonGroup;
+  var Checkbox = sharedViews.Checkbox;
   var ContactsList = loop.contacts.ContactsList;
   var ContactDetailsForm = loop.contacts.ContactDetailsForm;
 
@@ -132,11 +128,11 @@
       return function(event) {
         // Note: side effect!
         switch (newAvailabilty) {
-          case 'available':
+          case "available":
             this.setState({doNotDisturb: false});
             navigator.mozLoop.doNotDisturb = false;
             break;
-          case 'do-not-disturb':
+          case "do-not-disturb":
             this.setState({doNotDisturb: true});
             navigator.mozLoop.doNotDisturb = true;
             break;
@@ -149,13 +145,13 @@
       // XXX https://github.com/facebook/react/issues/310 for === htmlFor
       var cx = React.addons.classSet;
       var availabilityStatus = cx({
-        'status': true,
-        'status-dnd': this.state.doNotDisturb,
-        'status-available': !this.state.doNotDisturb
+        "status": true,
+        "status-dnd": this.state.doNotDisturb,
+        "status-available": !this.state.doNotDisturb
       });
       var availabilityDropdown = cx({
-        'dropdown-menu': true,
-        'hide': !this.state.showMenu
+        "dropdown-menu": true,
+        "hide": !this.state.showMenu
       });
       var availabilityText = this.state.doNotDisturb ?
                               mozL10n.get("display_name_dnd_status") :
@@ -293,7 +289,7 @@
       }
 
       var locale = mozL10n.getLanguage();
-      navigator.mozLoop.setLoopPref('showPartnerLogo', false);
+      navigator.mozLoop.setLoopPref("showPartnerLogo", false);
       return (
         <p id="powered-by" className="powered-by">
           {mozL10n.get("powered_by_beforeLogo")}
@@ -305,8 +301,8 @@
 
     render: function() {
       if (!this.state.gettingStartedSeen || this.state.seenToS == "unseen") {
-        var terms_of_use_url = navigator.mozLoop.getLoopPref('legal.ToS_url');
-        var privacy_notice_url = navigator.mozLoop.getLoopPref('legal.privacy_url');
+        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.renderToStaticMarkup(
@@ -704,7 +700,10 @@
       userDisplayName: React.PropTypes.string.isRequired
     },
 
-    mixins: [sharedMixins.DocumentVisibilityMixin],
+    mixins: [
+      sharedMixins.DocumentVisibilityMixin,
+      React.addons.PureRenderMixin
+    ],
 
     getInitialState: function() {
       return {
@@ -716,24 +715,25 @@
     },
 
     onDocumentVisible: function() {
+      // We would use onDocumentHidden to null out the data ready for the next
+      // opening. However, this seems to cause an awkward glitch in the display
+      // when opening the panel, and it seems cleaner just to update the data
+      // even if there's a small delay.
+
       this.props.mozLoop.getSelectedTabMetadata(function callback(metadata) {
-        var previewImage = metadata.previews.length ? metadata.previews[0] : "";
-        var description = metadata.description || metadata.title;
+        var previewImage = metadata.favicon || "";
+        var description = metadata.title || metadata.description;
         var url = metadata.url;
-        this.setState({previewImage: previewImage,
-                       description: description,
-                       url: url});
+        this.setState({
+          previewImage: previewImage,
+          description: description,
+          url: url
+        });
       }.bind(this));
     },
 
-    onDocumentHidden: function() {
-      this.setState({previewImage: "",
-                     description: "",
-                     url: ""});
-    },
-
-    onCheckboxChange: function(event) {
-      this.setState({checked: event.target.checked});
+    onCheckboxChange: function(newState) {
+      this.setState({checked: newState.checked});
     },
 
     handleCreateButtonClick: function() {
@@ -770,14 +770,15 @@
       return (
         <div className="new-room-view">
           <div className={contextClasses}>
-            <label className="context-enabled">
-              <input className="context-checkbox"
-                     type="checkbox" onChange={this.onCheckboxChange}/>
-              {mozL10n.get("context_offer_label")}
-            </label>
-            <img className="context-preview" src={this.state.previewImage}/>
-            <span className="context-description">{this.state.description}</span>
-            <span className="context-url">{hostname}</span>
+            <Checkbox label={mozL10n.get("context_inroom_label")}
+                      onChange={this.onCheckboxChange} />
+            <div className="context-content">
+              <img className="context-preview" src={this.state.previewImage}/>
+              <span className="context-description">
+                {this.state.description}
+                <span className="context-url">{hostname}</span>
+              </span>
+            </div>
           </div>
           <button className="btn btn-info new-room-button"
                   onClick={this.handleCreateButtonClick}
@@ -1005,8 +1006,8 @@
     document.body.setAttribute("platform", loop.shared.utils.getPlatform());
 
     // Notify the window that we've finished initalization and initial layout
-    var evtObject = document.createEvent('Event');
-    evtObject.initEvent('loopPanelInitialized', true, false);
+    var evtObject = document.createEvent("Event");
+    evtObject.initEvent("loopPanelInitialized", true, false);
     window.dispatchEvent(evtObject);
   }
 
@@ -1026,4 +1027,4 @@
   };
 })(_, document.mozL10n);
 
-document.addEventListener('DOMContentLoaded', loop.panel.init);
+document.addEventListener("DOMContentLoaded", loop.panel.init);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/roomStore.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/roomStore.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/roomStore.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/roomStore.js	2015-05-25 20:42:46.000000000 +0000
@@ -2,8 +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/. */
 
-/* global loop:true */
-
 var loop = loop || {};
 loop.store = loop.store || {};
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/roomViews.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/roomViews.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/roomViews.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/roomViews.js	2015-05-25 20:42:46.000000000 +0000
@@ -1,12 +1,7 @@
-/** @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.roomViews = (function(mozL10n) {
   "use strict";
@@ -312,8 +307,8 @@
         // checkbox will be disabled in that case.
         if (nextProps.editMode) {
           this.props.mozLoop.getSelectedTabMetadata(function(metadata) {
-            var previewImage = metadata.previews.length ? metadata.previews[0] : "";
-            var description = metadata.description || metadata.title;
+            var previewImage = metadata.favicon || "";
+            var description = metadata.title || metadata.description;
             var url = metadata.url;
             this.setState({
               availableContext: {
@@ -480,8 +475,10 @@
         locationData = checkboxLabel = sharedUtils.formatURL(location);
       }
       if (!checkboxLabel) {
-        checkboxLabel = sharedUtils.formatURL((this.state.availableContext ?
-          this.state.availableContext.url : ""));
+        try {
+          checkboxLabel = sharedUtils.formatURL((this.state.availableContext ?
+            this.state.availableContext.url : ""));
+        } catch (ex) {}
       }
 
       var cx = React.addons.classSet;
@@ -668,6 +665,7 @@
         default: {
           return (
             React.createElement("div", {className: "room-conversation-wrapper"}, 
+              React.createElement(sharedViews.TextChatView, {dispatcher: this.props.dispatcher}), 
               React.createElement(DesktopRoomInvitationView, {
                 dispatcher: this.props.dispatcher, 
                 error: this.state.error, 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/roomViews.jsx firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/roomViews.jsx
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/js/roomViews.jsx	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/js/roomViews.jsx	2015-05-25 20:42:46.000000000 +0000
@@ -1,12 +1,7 @@
-/** @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.roomViews = (function(mozL10n) {
   "use strict";
@@ -312,8 +307,8 @@
         // checkbox will be disabled in that case.
         if (nextProps.editMode) {
           this.props.mozLoop.getSelectedTabMetadata(function(metadata) {
-            var previewImage = metadata.previews.length ? metadata.previews[0] : "";
-            var description = metadata.description || metadata.title;
+            var previewImage = metadata.favicon || "";
+            var description = metadata.title || metadata.description;
             var url = metadata.url;
             this.setState({
               availableContext: {
@@ -480,8 +475,10 @@
         locationData = checkboxLabel = sharedUtils.formatURL(location);
       }
       if (!checkboxLabel) {
-        checkboxLabel = sharedUtils.formatURL((this.state.availableContext ?
-          this.state.availableContext.url : ""));
+        try {
+          checkboxLabel = sharedUtils.formatURL((this.state.availableContext ?
+            this.state.availableContext.url : ""));
+        } catch (ex) {}
       }
 
       var cx = React.addons.classSet;
@@ -668,6 +665,7 @@
         default: {
           return (
             <div className="room-conversation-wrapper">
+              <sharedViews.TextChatView dispatcher={this.props.dispatcher} />
               <DesktopRoomInvitationView
                 dispatcher={this.props.dispatcher}
                 error={this.state.error}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/css/conversation.css firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/css/conversation.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/css/conversation.css	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/css/conversation.css	2015-05-25 20:42:46.000000000 +0000
@@ -690,6 +690,27 @@
   height: 100%;
 }
 
+/**
+ * The .fx-embbeded .text-chat-* styles are very temporarily whilst we work on
+ * text chat (bug 1108892 and dependencies).
+ */
+.fx-embedded .text-chat-view {
+  height: 60px;
+  color: white;
+  background-color: black;
+}
+
+.fx-embedded .text-chat-entries {
+  /* XXX Should use flex, this is just for the initial implementation. */
+  height: calc(100% - 2em);
+  width: 100%;
+}
+
+.fx-embedded .text-chat-box {
+  width: 100%;
+  margin: auto;
+}
+
 @media screen and (min-width:640px) {
   .standalone .conversation-toolbar {
     position: absolute;
@@ -999,7 +1020,7 @@
 }
 
 .room-context-thumbnail {
-  width: 100px;
+  width: 16px;
   -moz-margin-end: 1ch;
   margin-bottom: 1em;
   order: 1;
@@ -1268,6 +1289,27 @@
   height: auto;
 }
 
+.text-chat-entries {
+  margin: auto;
+  overflow: scroll;
+  border: 1px solid red;
+}
+
+.text-chat-entry {
+  text-align: left;
+}
+
+.text-chat-entry.received {
+  text-align: right;
+}
+
+.text-chat-box {
+  margin: auto;
+}
+
+.text-chat-box > form > input {
+  width: 100%;
+}
 
 @media screen and (max-width:640px) {
   .standalone-room-info {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/img/audio-call-avatar.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/img/audio-call-avatar.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/img/audio-call-avatar.svg	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/img/audio-call-avatar.svg	2015-05-25 20:42:46.000000000 +0000
@@ -1,3 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" viewBox="129 5 252 253" width="21pc" height="253pt"><metadata xmlns:dc="http://purl.org/dc/elements/1.1/"><dc:date>2014-08-13 17:00Z</dc:date><!-- Produced by OmniGraffle Professional 5.4.4 --></metadata><defs><linearGradient x1="0" x2="1" id="Gradient" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#4ba6e9"/><stop offset="1" stop-color="#4ba7bf"/></linearGradient></defs><g stroke="none" stroke-opacity="1" stroke-dasharray="none" fill="none" fill-opacity="1"><title>Canvas 1</title><g><title>Layer 1</title><rect x="129" y="5" width="252" height="252" fill="#4BA6E7"/><circle cx="255" cy="106" r="54.000088" fill="#badbeb"/><path d="M 159.01782 257 L 350.98218 257 C 351.46667 236.66908 342.1 216.2136 322.88218 200.69928 C 285.39187 170.43352 224.60813 170.43352 187.11782 200.69928 C 167.9 216.2136 158.53333 236.66909 159.01782 257 Z" fill="#badbeb"/></g></g></svg>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="129 5 252 253" width="21pc" height="253pt">
+  <rect x="129" y="5" width="252" height="252" fill="#4ba6e7"/>
+  <circle cx="255" cy="106" r="54" fill="#badbeb"/>
+  <path fill="#badbeb" d="M 159.01782 257 L 350.98218 257 C 351.46667 236.66908 342.1 216.2136 322.88218 200.69928 C 285.39187 170.43352 224.60813 170.43352 187.11782 200.69928 C 167.9 216.2136 158.53333 236.66909 159.01782 257 Z"/>
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/img/beta-ribbon.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/img/beta-ribbon.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/img/beta-ribbon.svg	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/img/beta-ribbon.svg	2015-05-25 20:42:46.000000000 +0000
@@ -2,25 +2,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/. -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     viewBox="0 0 100 100"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     enable-background="new 0 0 100 100">
-<style>
-</style>
-<defs>
-  <g id="beta-ribbon">
-    <path fill="#e6e6e6" d="M0,100 100,0 49.1,0 0,49.2z"/>
-    <path fill="#fff" d="M0,94.7 94.7,0 46.5,0 0,46.6z"/>
-    <g fill="#999">
-      <path d="m25.9,56.7l-4,4-13.7-13.7 3.7-3.7c2.4-2.4 5.7-4.1 8.3-1.4 1.7,1.7 1.4,3.9 .5,5.3l.1,.1c1.6-1.1 4-1.9 6.3,.3 3,3 1.3,6.5-1.2,9.1zm-12.2-12.2l-2.2,2.2 4.3,4.3 2.3-2.3c1.6-1.6 1.8-3.1 .2-4.7-1.4-1.6-2.9-1.2-4.6,.5zm6.1,5.4l-2.5,2.5 4.9,4.9 2.4-2.4c1.3-1.3 2.5-3.3 .6-5.3-2-2-3.9-1.2-5.4,.3z"/>
-      <path d="m30.7,42.7c2.5,2.2 4.6,2.1 6.2,.5 1-1 1.5-2 1.6-3.6l2,.4c-.2,1.7-.9,3.4-2.2,4.7-3.1,3.1-6.9,2.5-10.2-.7-3.2-3.2-3.8-7.1-1.1-9.9 2.7-2.7 6.2-2.3 9.4,.9 .4,.4 .7,.7 .9,1l-6.6,6.7zm-1.4-1.4l4.9-4.9c-2.2-2.1-4.1-2.5-5.7-.9-1.4,1.5-1.3,3.4 .8,5.8z"/>
-      <path d="m49.8,31.8c-.2,1.1-.8,2.2-1.6,3.1-1.9,1.9-4,1.6-5.9-.2l-6.3-6.3-1.6,1.6-1.4-1.4 1.7-1.7-2.4-2.4 1.6-2 2.6,2.6 2.6-2.6 1.2,1.6-2.4,2.4 6.3,6.3c1.1,1.1 1.9,1.2 2.8,.3 .5-.5 .7-1 .9-1.8l1.9,.5z"/>
-      <path d="m57,20.8c.8,.8 1.4,.9 2.1,.6l.8,1.7c-1.1,.8-2.1,1.1-3.4,.5 .3,1.7-.4,3.3-1.6,4.6-2.1,2.1-4.7,2.1-6.6,.2-2.2-2.2-1.6-5.1 1.5-8.3l1.4-1.3-.8-.8c-1.5-1.5-2.8-1.3-4.3,.2-.7,.7-1.5,1.8-2.2,3.3l-1.8-.9c.8-1.8 1.8-3.1 2.8-4.2 2.7-2.7 5.1-2.5 7.2-.4l4.9,4.8zm-2,1.6l-2.6-2.6-1.3,1.3c-2.2,2.2-2.2,3.8-.9,5.1 1.3,1.3 2.5,1.4 3.8,.1 1.1-1.1 1.3-2.4 1-3.9z"/>
-      <path d="M93.4,0 0,94.1 0,96 95.2,0z"/>
-      <path d="M45.3,0 0,46 0,47.9 47,0z"/>
-    </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <path fill="#e6e6e6" d="M0,100 100,0 49.1,0 0,49.2z"/>
+  <path fill="#fff" d="M0,94.7 94.7,0 46.5,0 0,46.6z"/>
+  <g fill="#999">
+    <path d="m25.9,56.7l-4,4-13.7-13.7 3.7-3.7c2.4-2.4 5.7-4.1 8.3-1.4 1.7,1.7 1.4,3.9 .5,5.3l.1,.1c1.6-1.1 4-1.9 6.3,.3 3,3 1.3,6.5-1.2,9.1zm-12.2-12.2l-2.2,2.2 4.3,4.3 2.3-2.3c1.6-1.6 1.8-3.1 .2-4.7-1.4-1.6-2.9-1.2-4.6,.5zm6.1,5.4l-2.5,2.5 4.9,4.9 2.4-2.4c1.3-1.3 2.5-3.3 .6-5.3-2-2-3.9-1.2-5.4,.3z"/>
+    <path d="m30.7,42.7c2.5,2.2 4.6,2.1 6.2,.5 1-1 1.5-2 1.6-3.6l2,.4c-.2,1.7-.9,3.4-2.2,4.7-3.1,3.1-6.9,2.5-10.2-.7-3.2-3.2-3.8-7.1-1.1-9.9 2.7-2.7 6.2-2.3 9.4,.9 .4,.4 .7,.7 .9,1l-6.6,6.7zm-1.4-1.4l4.9-4.9c-2.2-2.1-4.1-2.5-5.7-.9-1.4,1.5-1.3,3.4 .8,5.8z"/>
+    <path d="m49.8,31.8c-.2,1.1-.8,2.2-1.6,3.1-1.9,1.9-4,1.6-5.9-.2l-6.3-6.3-1.6,1.6-1.4-1.4 1.7-1.7-2.4-2.4 1.6-2 2.6,2.6 2.6-2.6 1.2,1.6-2.4,2.4 6.3,6.3c1.1,1.1 1.9,1.2 2.8,.3 .5-.5 .7-1 .9-1.8l1.9,.5z"/>
+    <path d="m57,20.8c.8,.8 1.4,.9 2.1,.6l.8,1.7c-1.1,.8-2.1,1.1-3.4,.5 .3,1.7-.4,3.3-1.6,4.6-2.1,2.1-4.7,2.1-6.6,.2-2.2-2.2-1.6-5.1 1.5-8.3l1.4-1.3-.8-.8c-1.5-1.5-2.8-1.3-4.3,.2-.7,.7-1.5,1.8-2.2,3.3l-1.8-.9c.8-1.8 1.8-3.1 2.8-4.2 2.7-2.7 5.1-2.5 7.2-.4l4.9,4.8zm-2,1.6l-2.6-2.6-1.3,1.3c-2.2,2.2-2.2,3.8-.9,5.1 1.3,1.3 2.5,1.4 3.8,.1 1.1-1.1 1.3-2.4 1-3.9z"/>
+    <path d="M93.4,0 0,94.1 0,96 95.2,0z"/>
+    <path d="M45.3,0 0,46 0,47.9 47,0z"/>
   </g>
-</defs>
-<use id="beta-ribbon" xlink:href="#beta-ribbon"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/img/check.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/img/check.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/img/check.svg	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/img/check.svg	2015-05-25 20:42:46.000000000 +0000
@@ -2,11 +2,7 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     x="0" y="0"
-     width="21" height="21"
-     viewBox="0 0 21 21">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="21" height="21" viewBox="0 0 21 21">
   <style>
     use:not(:target) {
       display: none;
@@ -26,11 +22,15 @@
       stroke: rgba(255,255,255,.4);
       stroke-width: 0.5;
     }
+    use[id$="-blue"] {
+      fill: #0096dd;
+    }
   </style>
-  <defs style="display: none;">
+  <defs>
     <path id="check-shape" d="M 9.39,16.5 16.28,6 14.77,4.5 9.37,12.7 6.28,9.2 4.7,10.7 z"/>
   </defs>
-  <use id="check"          xlink:href="#check-shape"/>
-  <use id="check-active"   xlink:href="#check-shape"/>
+  <use id="check" xlink:href="#check-shape"/>
+  <use id="check-active" xlink:href="#check-shape"/>
   <use id="check-disabled" xlink:href="#check-shape"/>
+  <use id="check-blue" xlink:href="#check-shape"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/img/icons-10x10.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/img/icons-10x10.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/img/icons-10x10.svg	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/img/icons-10x10.svg	2015-05-25 20:42:46.000000000 +0000
@@ -2,64 +2,48 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     x="0px" y="0px"
-     viewBox="0 0 10 10"
-     enable-background="new 0 0 10 10"
-     xml:space="preserve">
-<style>
-use:not(:target) {
-  display: none;
-}
-
-use {
-  fill: #ccc;
-}
-
-use[id$="-hover"] {
-  fill: #444;
-}
-
-use[id$="-active"] {
-  fill: #0095dd;
-}
-
-use[id$="-white"] {
-  fill: rgba(255,255,255,0.8);
-}
-
-use[id$="-disabled"] {
-  fill: rgba(255,255,255,0.4);
-}
-</style>
-<defs style="display:none">
-  <polygon id="close-shape" fill-rule="evenodd" clip-rule="evenodd" points="10,1.717 8.336,0.049 5.024,3.369 1.663,0 0,1.668 
-    3.36,5.037 0.098,8.307 1.762,9.975 5.025,6.705 8.311,10 9.975,8.332 6.688,5.037"/>
-  <path id="dropdown-shape" fill-rule="evenodd" clip-rule="evenodd" d="M9,3L4.984,7L1,3H9z"/>
-  <polygon id="expand-shape" fill-rule="evenodd" clip-rule="evenodd" points="10,0 4.838,0 6.506,1.669 0,8.175 1.825,10 8.331,3.494 
-    10,5.162"/>
-  <path id="edit-shape" d="M5.493,1.762l2.745,2.745L2.745,10H0V7.255L5.493,1.762z M2.397,9.155l0.601-0.601L1.446,7.002L0.845,7.603
-    V8.31H1.69v0.845H2.397z M5.849,3.028c0-0.096-0.048-0.144-0.146-0.144c-0.044,0-0.081,0.015-0.112,0.046L2.014,6.508
-    C1.983,6.538,1.968,6.577,1.968,6.619c0,0.098,0.048,0.146,0.144,0.146c0.044,0,0.081-0.015,0.112-0.046l3.579-3.577
-    C5.834,3.111,5.849,3.073,5.849,3.028z M10,2.395c0,0.233-0.081,0.431-0.245,0.595L8.66,4.085L5.915,1.34L7.01,0.25
-    C7.168,0.083,7.366,0,7.605,0c0.233,0,0.433,0.083,0.601,0.25l1.55,1.544C9.919,1.966,10,2.166,10,2.395z"/>
-  <rect id="minimize-shape" y="3.6" fill-rule="evenodd" clip-rule="evenodd" width="10" height="2.8"/>
-</defs>
-<use id="close"               xlink:href="#close-shape"/>
-<use id="close-active"        xlink:href="#close-shape"/>
-<use id="close-disabled"      xlink:href="#close-shape"/>
-<use id="dropdown"            xlink:href="#dropdown-shape"/>
-<use id="dropdown-white"      xlink:href="#dropdown-shape"/>
-<use id="dropdown-active"     xlink:href="#dropdown-shape"/>
-<use id="dropdown-disabled"   xlink:href="#dropdown-shape"/>
-<use id="edit"                xlink:href="#edit-shape"/>
-<use id="edit-active"         xlink:href="#edit-shape"/>
-<use id="edit-disabled"       xlink:href="#edit-shape"/>
-<use id="expand"              xlink:href="#expand-shape"/>
-<use id="expand-active"       xlink:href="#expand-shape"/>
-<use id="expand-disabled"     xlink:href="#expand-shape"/>
-<use id="minimize"            xlink:href="#minimize-shape"/>
-<use id="minimize-active"     xlink:href="#minimize-shape"/>
-<use id="minimize-disabled"   xlink:href="#minimize-shape"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 10 10">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: #ccc;
+    }
+    use[id$="-hover"] {
+      fill: #444;
+    }
+    use[id$="-active"] {
+      fill: #0095dd;
+    }
+    use[id$="-white"] {
+      fill: rgba(255,255,255,0.8);
+    }
+    use[id$="-disabled"] {
+      fill: rgba(255,255,255,0.4);
+    }
+  </style>
+  <defs>
+    <polygon id="close-shape" points="10,1.717 8.336,0.049 5.024,3.369 1.663,0 0,1.668 3.36,5.037 0.098,8.307 1.762,9.975 5.025,6.705 8.311,10 9.975,8.332 6.688,5.037"/>
+    <path id="dropdown-shape" fill-rule="evenodd" d="M9,3L4.984,7L1,3H9z"/>
+    <polygon id="expand-shape" points="10,0 4.838,0 6.506,1.669 0,8.175 1.825,10 8.331,3.494 10,5.162"/>
+    <path id="edit-shape" d="M5.493,1.762l2.745,2.745L2.745,10H0V7.255L5.493,1.762z M2.397,9.155l0.601-0.601L1.446,7.002L0.845,7.603 V8.31H1.69v0.845H2.397z M5.849,3.028c0-0.096-0.048-0.144-0.146-0.144c-0.044,0-0.081,0.015-0.112,0.046L2.014,6.508 C1.983,6.538,1.968,6.577,1.968,6.619c0,0.098,0.048,0.146,0.144,0.146c0.044,0,0.081-0.015,0.112-0.046l3.579-3.577 C5.834,3.111,5.849,3.073,5.849,3.028z M10,2.395c0,0.233-0.081,0.431-0.245,0.595L8.66,4.085L5.915,1.34L7.01,0.25 C7.168,0.083,7.366,0,7.605,0c0.233,0,0.433,0.083,0.601,0.25l1.55,1.544C9.919,1.966,10,2.166,10,2.395z"/>
+    <rect id="minimize-shape" y="3.6" width="10" height="2.8"/>
+  </defs>
+  <use id="close" xlink:href="#close-shape"/>
+  <use id="close-active" xlink:href="#close-shape"/>
+  <use id="close-disabled" xlink:href="#close-shape"/>
+  <use id="dropdown" xlink:href="#dropdown-shape"/>
+  <use id="dropdown-white" xlink:href="#dropdown-shape"/>
+  <use id="dropdown-active" xlink:href="#dropdown-shape"/>
+  <use id="dropdown-disabled" xlink:href="#dropdown-shape"/>
+  <use id="edit" xlink:href="#edit-shape"/>
+  <use id="edit-active" xlink:href="#edit-shape"/>
+  <use id="edit-disabled" xlink:href="#edit-shape"/>
+  <use id="expand" xlink:href="#expand-shape"/>
+  <use id="expand-active" xlink:href="#expand-shape"/>
+  <use id="expand-disabled" xlink:href="#expand-shape"/>
+  <use id="minimize" xlink:href="#minimize-shape"/>
+  <use id="minimize-active" xlink:href="#minimize-shape"/>
+  <use id="minimize-disabled" xlink:href="#minimize-shape"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/img/icons-14x14.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/img/icons-14x14.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/img/icons-14x14.svg	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/img/icons-14x14.svg	2015-05-25 20:42:46.000000000 +0000
@@ -2,133 +2,71 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     x="0px" y="0px"
-     viewBox="0 0 14 14"
-     enable-background="new 0 0 14 14"
-     xml:space="preserve">
-<style>
-use:not(:target) {
-  display: none;
-}
-
-use {
-  fill: #ccc;
-}
-
-use[id$="-hover"] {
-  fill: #444;
-}
-
-use[id$="-active"] {
-  fill: #0095dd;
-}
-
-use[id$="-white"] {
-  fill: #fff;
-}
-</style>
-<defs style="display:none">
-  <path id="audio-shape" fill-rule="evenodd" clip-rule="evenodd" d="M9.571,6.143v1.714c0,1.42-1.151,2.571-2.571,2.571
-    c-1.42,0-2.571-1.151-2.571-2.571V6.143H3.571v1.714c0,1.597,1.093,2.935,2.571,3.316v0.97H5.714c-0.56,0-1.034,0.358-1.211,0.857
-    h4.993c-0.177-0.499-0.651-0.857-1.211-0.857H7.857v-0.97c1.478-0.381,2.571-1.719,2.571-3.316V6.143H9.571z M7,10
-    c1.183,0,2.143-0.959,2.143-2.143V3.143C9.143,1.959,8.183,1,7,1C5.817,1,4.857,1.959,4.857,3.143v4.714C4.857,9.041,5.817,10,7,10
-    z"/>
-  <g id="facemute-shape">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M12.174,3.551L9.568,5.856V5.847L3.39,11.49h5.066
-      c0.613,0,1.111-0.533,1.111-1.19V8.526l2.606,2.304C12.4,11.071,12.71,11.142,13,11.078V3.302C12.71,3.239,12.4,3.309,12.174,3.551
-      z"/>
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M12.395,2.617l-0.001-0.001l-0.809-0.884l-2.102,1.92
-      C9.316,3.221,8.919,2.918,8.457,2.918H2.111C1.498,2.918,1,3.451,1,4.109v6.191c0,0.318,0.118,0.607,0.306,0.821l-0.288,0.263
-      l0.809,0.884l0.001,0.001l0.853-0.779l6.887-6.29L12.395,2.617z"/>
-  </g>
-  <path id="hangup-shape" fill-rule="evenodd" clip-rule="evenodd" d="M13,11.732c-0.602,0.52-1.254,0.946-1.941,1.267
-    c-1.825-0.337-4.164-1.695-6.264-3.795C2.696,7.106,1.339,4.769,1,2.945c0.321-0.688,0.748-1.341,1.268-1.944l2.528,2.855
-    C4.579,4.153,4.377,4.454,4.209,4.759L4.22,4.77C3.924,5.42,4.608,6.833,5.889,8.114c1.281,1.28,2.694,1.965,3.343,1.669
-    l0.011,0.011c0.305-0.168,0.606-0.37,0.904-0.587L13,11.732z"/>
-  <path id="incoming-shape" fill-rule="evenodd" clip-rule="evenodd" d="M2.745,7.558l0.637,0.669c0.04,0.041,0.085,0.073,0.134,0.1
-    l3.249,3.313c0.38,0.393,0.915,0.478,1.197,0.186l0.638-0.676c0.281-0.292,0.2-0.848-0.18-1.244L7.097,8.558h3.566
-    c0.419,0,0.759-0.34,0.759-0.759V6.28c0-0.419-0.34-0.759-0.759-0.759H7.059l1.42-1.443c0.381-0.392,0.461-0.945,0.18-1.234
-    l-0.637-0.67C7.74,1.883,7.204,1.966,6.824,2.359L3.55,5.688C3.487,5.717,3.43,5.755,3.381,5.806L2.745,6.482
-    c-0.131,0.137-0.183,0.332-0.162,0.54C2.562,7.229,2.613,7.423,2.745,7.558z"/>
-  <path id="link-shape" fill-rule="evenodd" clip-rule="evenodd" d="M7.359,6.107c0.757-0.757,0.757-1.995,0-2.752
-    L5.573,1.568c-0.757-0.757-1.995-0.757-2.752,0L1.568,2.82c-0.757,0.757-0.757,1.995,0,2.752l1.787,1.787
-    c0.757,0.757,1.995,0.757,2.752,0L6.266,7.2L6.8,7.734L6.641,7.893c-0.757,0.757-0.757,1.995,0,2.752l1.787,1.787
-    c0.757,0.757,1.995,0.757,2.752,0l1.253-1.253c0.757-0.757,0.757-1.995,0-2.752l-1.787-1.787c-0.757-0.757-1.995-0.757-2.752,0
-    L7.734,6.8L7.2,6.266L7.359,6.107z M9.87,7.868l1.335,1.335c0.294,0.294,0.294,0.774,0,1.068l-0.934,0.934
-    c-0.294,0.294-0.774,0.294-1.068,0L7.868,9.87c-0.294-0.294-0.294-0.774,0-1.068L8.13,9.064c0.294,0.294,0.744,0.324,1.001,0.067
-    C9.388,8.874,9.358,8.424,9.064,8.13L8.802,7.868C9.096,7.574,9.577,7.574,9.87,7.868z M4.13,6.132L2.795,4.797
-    c-0.294-0.294-0.294-0.774,0-1.068l0.934-0.934c0.294-0.294,0.774-0.294,1.068,0L6.132,4.13c0.294,0.294,0.294,0.774,0,1.068
-    L5.86,4.926C5.567,4.632,5.116,4.602,4.859,4.859C4.602,5.116,4.632,5.567,4.926,5.86l0.272,0.272
-    C4.904,6.426,4.423,6.426,4.13,6.132z"/>
-  <g id="mute-shape">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M5.186,9.492L5.49,9.188l3.822-3.822l2.354-2.354l-0.848-0.848
-      L9.312,3.669V3.142C9.312,1.959,8.352,1,7.169,1C5.986,1,5.026,1.959,5.026,3.142v4.715c0,0.032,0.001,0.064,0.002,0.096
-      L4.643,8.338c-0.03-0.156-0.046-0.317-0.046-0.481V6.142H3.741v1.715c0,0.414,0.073,0.81,0.208,1.176l-1.615,1.615l0.848,0.848
-      l1.398-1.398v0L5.186,9.492z"/>
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M9.312,7.857V6.045L5.829,9.528C6.196,9.824,6.662,10,7.169,10
-      C8.352,10,9.312,9.04,9.312,7.857z"/>
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M9.741,7.857c0,1.42-1.151,2.572-2.572,2.572
-      c-0.625,0-1.199-0.223-1.645-0.595l-0.605,0.605c0.395,0.344,0.87,0.599,1.393,0.734v0.97H5.884c-0.56,0-1.034,0.359-1.212,0.858
-      h4.994c-0.178-0.499-0.652-0.858-1.212-0.858H8.026v-0.97c1.478-0.38,2.572-1.718,2.572-3.316V6.142H9.741V7.857z"/>
-  </g>
-  <path id="pause-shape" fill-rule="evenodd" clip-rule="evenodd" d="M4.75,1h-1.5C2.836,1,2.5,1.336,2.5,1.75v10.5
-    C2.5,12.664,2.836,13,3.25,13h1.5c0.414,0,0.75-0.336,0.75-0.75V1.75C5.5,1.336,5.164,1,4.75,1z M10.75,1h-1.5
-    C8.836,1,8.5,1.336,8.5,1.75v10.5C8.5,12.664,8.836,13,9.25,13h1.5c0.414,0,0.75-0.336,0.75-0.75V1.75C11.5,1.336,11.164,1,10.75,1
-    z"/>
-  <path id="video-shape" fill-rule="evenodd" clip-rule="evenodd" d="M12.175,3.347L9.568,5.651V3.905c0-0.657-0.497-1.19-1.111-1.19
-    H2.111C1.498,2.714,1,3.247,1,3.905v6.191c0,0.658,0.498,1.19,1.111,1.19h6.345c0.614,0,1.111-0.533,1.111-1.19V8.322l2.607,2.305
-    C12.4,10.867,12.71,10.938,13,10.874V3.099C12.71,3.035,12.4,3.106,12.175,3.347z"/>
-  <g id="volume-shape">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M3.513,4.404H1.896c-0.417,0-0.756,0.338-0.756,0.755v3.679
-      c0,0.417,0.338,0.755,0.756,0.755H3.51l2.575,2.575c0.261,0.261,0.596,0.4,0.938,0.422V1.409C6.682,1.431,6.346,1.57,6.085,1.831
-      L3.513,4.404z M8.555,5.995C8.619,6.32,8.653,6.656,8.653,7c0,0.344-0.034,0.679-0.098,1.004l0.218,0.142
-      C8.852,7.777,8.895,7.393,8.895,7c0-0.394-0.043-0.777-0.123-1.147L8.555,5.995z M12.224,3.6l-0.475,0.31
-      c0.359,0.962,0.557,2.003,0.557,3.09c0,1.087-0.198,2.128-0.557,3.09l0.475,0.31c0.41-1.054,0.635-2.201,0.635-3.4
-      C12.859,5.8,12.634,4.654,12.224,3.6z M10.061,5.012C10.25,5.642,10.353,6.308,10.353,7c0,0.691-0.103,1.358-0.293,1.987
-      l0.351,0.229C10.634,8.517,10.756,7.772,10.756,7c0-0.773-0.121-1.517-0.345-2.216L10.061,5.012z"/>
-    <path d="M7.164,12.74l-0.15-0.009c-0.389-0.024-0.754-0.189-1.028-0.463L3.452,9.735H1.896
-      C1.402,9.735,1,9.333,1,8.838V5.16c0-0.494,0.402-0.896,0.896-0.896h1.558l2.531-2.531C6.26,1.458,6.625,1.293,7.014,1.269
-      l0.15-0.009V12.74z M1.896,4.545c-0.339,0-0.615,0.276-0.615,0.615v3.679c0,0.339,0.276,0.615,0.615,0.615h1.672l2.616,2.616
-      c0.19,0.19,0.434,0.316,0.697,0.363V1.568C6.619,1.615,6.375,1.741,6.185,1.931L3.571,4.545H1.896z M12.292,10.612l-0.714-0.467
-      l0.039-0.105C11.981,9.067,12.165,8.044,12.165,7c0-1.044-0.184-2.067-0.548-3.041l-0.039-0.105l0.714-0.467l0.063,0.162
-      C12.783,4.649,13,5.81,13,7s-0.217,2.351-0.645,3.451L12.292,10.612z M11.92,10.033l0.234,0.153
-      c0.374-1.019,0.564-2.09,0.564-3.186s-0.19-2.167-0.564-3.186L11.92,3.966C12.27,4.94,12.447,5.96,12.447,7
-      C12.447,8.04,12.27,9.059,11.92,10.033z M10.489,9.435L9.895,9.047l0.031-0.101C10.116,8.315,10.212,7.66,10.212,7
-      c0-0.661-0.096-1.316-0.287-1.947L9.895,4.952l0.594-0.388l0.056,0.176C10.779,5.471,10.897,6.231,10.897,7
-      c0,0.769-0.118,1.529-0.351,2.259L10.489,9.435z M10.225,8.926l0.106,0.069C10.52,8.348,10.615,7.677,10.615,7
-      c0-0.677-0.095-1.348-0.284-1.996l-0.106,0.07C10.403,5.699,10.494,6.347,10.494,7C10.494,7.652,10.403,8.3,10.225,8.926z
-       M8.867,8.376L8.398,8.07l0.018-0.093C8.48,7.654,8.512,7.325,8.512,7S8.48,6.345,8.417,6.022L8.398,5.929l0.469-0.306l0.043,0.2
-      C8.994,6.211,9.036,6.607,9.036,7c0,0.393-0.042,0.789-0.126,1.176L8.867,8.376z"/>
-  </g>
-</defs>
-<use id="audio"               xlink:href="#audio-shape"/>
-<use id="audio-active"        xlink:href="#audio-shape"/>
-<use id="audio-disabled"      xlink:href="#audio-shape"/>
-<use id="facemute"            xlink:href="#facemute-shape"/>
-<use id="facemute-active"     xlink:href="#facemute-shape"/>
-<use id="facemute-disabled"   xlink:href="#facemute-shape"/>
-<use id="hangup"              xlink:href="#hangup-shape"/>
-<use id="hangup-active"       xlink:href="#hangup-shape"/>
-<use id="hangup-disabled"     xlink:href="#hangup-shape"/>
-<use id="incoming"            xlink:href="#incoming-shape"/>
-<use id="incoming-active"     xlink:href="#incoming-shape"/>
-<use id="incoming-disabled"   xlink:href="#incoming-shape"/>
-<use id="link"                xlink:href="#link-shape"/>
-<use id="link-active"         xlink:href="#link-shape"/>
-<use id="link-disabled"       xlink:href="#link-shape"/>
-<use id="mute"                xlink:href="#mute-shape"/>
-<use id="mute-active"         xlink:href="#mute-shape"/>
-<use id="mute-disabled"       xlink:href="#mute-shape"/>
-<use id="pause"               xlink:href="#pause-shape"/>
-<use id="pause-active"        xlink:href="#pause-shape"/>
-<use id="pause-disabled"      xlink:href="#pause-shape"/>
-<use id="video"               xlink:href="#video-shape"/>
-<use id="video-white"         xlink:href="#video-shape"/>
-<use id="video-active"        xlink:href="#video-shape"/>
-<use id="video-disabled"      xlink:href="#video-shape"/>
-<use id="volume"              xlink:href="#volume-shape"/>
-<use id="volume-active"       xlink:href="#volume-shape"/>
-<use id="volume-disabled"     xlink:href="#volume-shape"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 14 14">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: #ccc;
+    }
+    use[id$="-hover"] {
+      fill: #444;
+    }
+    use[id$="-active"] {
+      fill: #0095dd;
+    }
+    use[id$="-white"] {
+      fill: #fff;
+    }
+  </style>
+  <defs>
+    <path id="audio-shape" fill-rule="evenodd" d="M9.571,6.143v1.714c0,1.42-1.151,2.571-2.571,2.571 c-1.42,0-2.571-1.151-2.571-2.571V6.143H3.571v1.714c0,1.597,1.093,2.935,2.571,3.316v0.97H5.714c-0.56,0-1.034,0.358-1.211,0.857 h4.993c-0.177-0.499-0.651-0.857-1.211-0.857H7.857v-0.97c1.478-0.381,2.571-1.719,2.571-3.316V6.143H9.571z M7,10 c1.183,0,2.143-0.959,2.143-2.143V3.143C9.143,1.959,8.183,1,7,1C5.817,1,4.857,1.959,4.857,3.143v4.714C4.857,9.041,5.817,10,7,10 z"/>
+    <g id="facemute-shape">
+      <path fill-rule="evenodd" d="M12.174,3.551L9.568,5.856V5.847L3.39,11.49h5.066 c0.613,0,1.111-0.533,1.111-1.19V8.526l2.606,2.304C12.4,11.071,12.71,11.142,13,11.078V3.302C12.71,3.239,12.4,3.309,12.174,3.551 z"/>
+      <path fill-rule="evenodd" d="M12.395,2.617l-0.001-0.001l-0.809-0.884l-2.102,1.92 C9.316,3.221,8.919,2.918,8.457,2.918H2.111C1.498,2.918,1,3.451,1,4.109v6.191c0,0.318,0.118,0.607,0.306,0.821l-0.288,0.263 l0.809,0.884l0.001,0.001l0.853-0.779l6.887-6.29L12.395,2.617z"/>
+    </g>
+    <path id="hangup-shape" fill-rule="evenodd" d="M13,11.732c-0.602,0.52-1.254,0.946-1.941,1.267 c-1.825-0.337-4.164-1.695-6.264-3.795C2.696,7.106,1.339,4.769,1,2.945c0.321-0.688,0.748-1.341,1.268-1.944l2.528,2.855 C4.579,4.153,4.377,4.454,4.209,4.759L4.22,4.77C3.924,5.42,4.608,6.833,5.889,8.114c1.281,1.28,2.694,1.965,3.343,1.669 l0.011,0.011c0.305-0.168,0.606-0.37,0.904-0.587L13,11.732z"/>
+    <path id="incoming-shape" fill-rule="evenodd" d="M2.745,7.558l0.637,0.669c0.04,0.041,0.085,0.073,0.134,0.1 l3.249,3.313c0.38,0.393,0.915,0.478,1.197,0.186l0.638-0.676c0.281-0.292,0.2-0.848-0.18-1.244L7.097,8.558h3.566 c0.419,0,0.759-0.34,0.759-0.759V6.28c0-0.419-0.34-0.759-0.759-0.759H7.059l1.42-1.443c0.381-0.392,0.461-0.945,0.18-1.234 l-0.637-0.67C7.74,1.883,7.204,1.966,6.824,2.359L3.55,5.688C3.487,5.717,3.43,5.755,3.381,5.806L2.745,6.482 c-0.131,0.137-0.183,0.332-0.162,0.54C2.562,7.229,2.613,7.423,2.745,7.558z"/>
+    <path id="link-shape" fill-rule="evenodd" d="M7.359,6.107c0.757-0.757,0.757-1.995,0-2.752 L5.573,1.568c-0.757-0.757-1.995-0.757-2.752,0L1.568,2.82c-0.757,0.757-0.757,1.995,0,2.752l1.787,1.787 c0.757,0.757,1.995,0.757,2.752,0L6.266,7.2L6.8,7.734L6.641,7.893c-0.757,0.757-0.757,1.995,0,2.752l1.787,1.787 c0.757,0.757,1.995,0.757,2.752,0l1.253-1.253c0.757-0.757,0.757-1.995,0-2.752l-1.787-1.787c-0.757-0.757-1.995-0.757-2.752,0 L7.734,6.8L7.2,6.266L7.359,6.107z M9.87,7.868l1.335,1.335c0.294,0.294,0.294,0.774,0,1.068l-0.934,0.934 c-0.294,0.294-0.774,0.294-1.068,0L7.868,9.87c-0.294-0.294-0.294-0.774,0-1.068L8.13,9.064c0.294,0.294,0.744,0.324,1.001,0.067 C9.388,8.874,9.358,8.424,9.064,8.13L8.802,7.868C9.096,7.574,9.577,7.574,9.87,7.868z M4.13,6.132L2.795,4.797 c-0.294-0.294-0.294-0.774,0-1.068l0.934-0.934c0.294-0.294,0.774-0.294,1.068,0L6.132,4.13c0.294,0.294,0.294,0.774,0,1.068 L5.86,4.926C5.567,4.632,5.116,4.602,4.859,4.859C4.602,5.116,4.632,5.567,4.926,5.86l0.272,0.272 C4.904,6.426,4.423,6.426,4.13,6.132z"/>
+    <g id="mute-shape">
+      <path fill-rule="evenodd" d="M5.186,9.492L5.49,9.188l3.822-3.822l2.354-2.354l-0.848-0.848 L9.312,3.669V3.142C9.312,1.959,8.352,1,7.169,1C5.986,1,5.026,1.959,5.026,3.142v4.715c0,0.032,0.001,0.064,0.002,0.096 L4.643,8.338c-0.03-0.156-0.046-0.317-0.046-0.481V6.142H3.741v1.715c0,0.414,0.073,0.81,0.208,1.176l-1.615,1.615l0.848,0.848 l1.398-1.398v0L5.186,9.492z"/>
+      <path fill-rule="evenodd" d="M9.312,7.857V6.045L5.829,9.528C6.196,9.824,6.662,10,7.169,10 C8.352,10,9.312,9.04,9.312,7.857z"/>
+      <path fill-rule="evenodd" d="M9.741,7.857c0,1.42-1.151,2.572-2.572,2.572 c-0.625,0-1.199-0.223-1.645-0.595l-0.605,0.605c0.395,0.344,0.87,0.599,1.393,0.734v0.97H5.884c-0.56,0-1.034,0.359-1.212,0.858 h4.994c-0.178-0.499-0.652-0.858-1.212-0.858H8.026v-0.97c1.478-0.38,2.572-1.718,2.572-3.316V6.142H9.741V7.857z"/>
+    </g>
+    <path id="pause-shape" fill-rule="evenodd" d="M4.75,1h-1.5C2.836,1,2.5,1.336,2.5,1.75v10.5 C2.5,12.664,2.836,13,3.25,13h1.5c0.414,0,0.75-0.336,0.75-0.75V1.75C5.5,1.336,5.164,1,4.75,1z M10.75,1h-1.5 C8.836,1,8.5,1.336,8.5,1.75v10.5C8.5,12.664,8.836,13,9.25,13h1.5c0.414,0,0.75-0.336,0.75-0.75V1.75C11.5,1.336,11.164,1,10.75,1 z"/>
+    <path id="video-shape" fill-rule="evenodd" d="M12.175,3.347L9.568,5.651V3.905c0-0.657-0.497-1.19-1.111-1.19 H2.111C1.498,2.714,1,3.247,1,3.905v6.191c0,0.658,0.498,1.19,1.111,1.19h6.345c0.614,0,1.111-0.533,1.111-1.19V8.322l2.607,2.305 C12.4,10.867,12.71,10.938,13,10.874V3.099C12.71,3.035,12.4,3.106,12.175,3.347z"/>
+    <g id="volume-shape">
+      <path fill-rule="evenodd" d="M3.513,4.404H1.896c-0.417,0-0.756,0.338-0.756,0.755v3.679 c0,0.417,0.338,0.755,0.756,0.755H3.51l2.575,2.575c0.261,0.261,0.596,0.4,0.938,0.422V1.409C6.682,1.431,6.346,1.57,6.085,1.831 L3.513,4.404z M8.555,5.995C8.619,6.32,8.653,6.656,8.653,7c0,0.344-0.034,0.679-0.098,1.004l0.218,0.142 C8.852,7.777,8.895,7.393,8.895,7c0-0.394-0.043-0.777-0.123-1.147L8.555,5.995z M12.224,3.6l-0.475,0.31 c0.359,0.962,0.557,2.003,0.557,3.09c0,1.087-0.198,2.128-0.557,3.09l0.475,0.31c0.41-1.054,0.635-2.201,0.635-3.4 C12.859,5.8,12.634,4.654,12.224,3.6z M10.061,5.012C10.25,5.642,10.353,6.308,10.353,7c0,0.691-0.103,1.358-0.293,1.987 l0.351,0.229C10.634,8.517,10.756,7.772,10.756,7c0-0.773-0.121-1.517-0.345-2.216L10.061,5.012z"/>
+      <path d="M7.164,12.74l-0.15-0.009c-0.389-0.024-0.754-0.189-1.028-0.463L3.452,9.735H1.896 C1.402,9.735,1,9.333,1,8.838V5.16c0-0.494,0.402-0.896,0.896-0.896h1.558l2.531-2.531C6.26,1.458,6.625,1.293,7.014,1.269 l0.15-0.009V12.74z M1.896,4.545c-0.339,0-0.615,0.276-0.615,0.615v3.679c0,0.339,0.276,0.615,0.615,0.615h1.672l2.616,2.616 c0.19,0.19,0.434,0.316,0.697,0.363V1.568C6.619,1.615,6.375,1.741,6.185,1.931L3.571,4.545H1.896z M12.292,10.612l-0.714-0.467 l0.039-0.105C11.981,9.067,12.165,8.044,12.165,7c0-1.044-0.184-2.067-0.548-3.041l-0.039-0.105l0.714-0.467l0.063,0.162 C12.783,4.649,13,5.81,13,7s-0.217,2.351-0.645,3.451L12.292,10.612z M11.92,10.033l0.234,0.153 c0.374-1.019,0.564-2.09,0.564-3.186s-0.19-2.167-0.564-3.186L11.92,3.966C12.27,4.94,12.447,5.96,12.447,7 C12.447,8.04,12.27,9.059,11.92,10.033z M10.489,9.435L9.895,9.047l0.031-0.101C10.116,8.315,10.212,7.66,10.212,7 c0-0.661-0.096-1.316-0.287-1.947L9.895,4.952l0.594-0.388l0.056,0.176C10.779,5.471,10.897,6.231,10.897,7 c0,0.769-0.118,1.529-0.351,2.259L10.489,9.435z M10.225,8.926l0.106,0.069C10.52,8.348,10.615,7.677,10.615,7 c0-0.677-0.095-1.348-0.284-1.996l-0.106,0.07C10.403,5.699,10.494,6.347,10.494,7C10.494,7.652,10.403,8.3,10.225,8.926z M8.867,8.376L8.398,8.07l0.018-0.093C8.48,7.654,8.512,7.325,8.512,7S8.48,6.345,8.417,6.022L8.398,5.929l0.469-0.306l0.043,0.2 C8.994,6.211,9.036,6.607,9.036,7c0,0.393-0.042,0.789-0.126,1.176L8.867,8.376z"/>
+    </g>
+  </defs>
+  <use id="audio" xlink:href="#audio-shape"/>
+  <use id="audio-active" xlink:href="#audio-shape"/>
+  <use id="audio-disabled" xlink:href="#audio-shape"/>
+  <use id="facemute" xlink:href="#facemute-shape"/>
+  <use id="facemute-active" xlink:href="#facemute-shape"/>
+  <use id="facemute-disabled" xlink:href="#facemute-shape"/>
+  <use id="hangup" xlink:href="#hangup-shape"/>
+  <use id="hangup-active" xlink:href="#hangup-shape"/>
+  <use id="hangup-disabled" xlink:href="#hangup-shape"/>
+  <use id="incoming" xlink:href="#incoming-shape"/>
+  <use id="incoming-active" xlink:href="#incoming-shape"/>
+  <use id="incoming-disabled" xlink:href="#incoming-shape"/>
+  <use id="link" xlink:href="#link-shape"/>
+  <use id="link-active" xlink:href="#link-shape"/>
+  <use id="link-disabled" xlink:href="#link-shape"/>
+  <use id="mute" xlink:href="#mute-shape"/>
+  <use id="mute-active" xlink:href="#mute-shape"/>
+  <use id="mute-disabled" xlink:href="#mute-shape"/>
+  <use id="pause" xlink:href="#pause-shape"/>
+  <use id="pause-active" xlink:href="#pause-shape"/>
+  <use id="pause-disabled" xlink:href="#pause-shape"/>
+  <use id="video" xlink:href="#video-shape"/>
+  <use id="video-white" xlink:href="#video-shape"/>
+  <use id="video-active" xlink:href="#video-shape"/>
+  <use id="video-disabled" xlink:href="#video-shape"/>
+  <use id="volume" xlink:href="#volume-shape"/>
+  <use id="volume-active" xlink:href="#volume-shape"/>
+  <use id="volume-disabled" xlink:href="#volume-shape"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/img/icons-16x16.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/img/icons-16x16.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/img/icons-16x16.svg	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/img/icons-16x16.svg	2015-05-25 20:42:46.000000000 +0000
@@ -2,222 +2,131 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg 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">
-<style>
-use:not(:target) {
-  display: none;
-}
-
-use {
-  fill: #ccc;
-}
-
-use[id$="-hover"] {
-  fill: #444;
-}
-
-use[id$="-active"] {
-  fill: #0095dd;
-}
-
-use[id$="-red"] {
-  fill: #d74345
-}
-
-use[id$="-white"] {
-  fill: #fff;
-}
-
-use[id$="-darkgrey"] {
-  fill: #666;
-}
-
-use[id$="-disabled"] {
-  fill: rgba(255,255,255,.6);
-}
-</style>
-<defs style="display:none">
-  <polygon id="add-shape" fill-rule="evenodd" clip-rule="evenodd" points="16,6.4 9.6,6.4 9.6,0 6.4,0 6.4,6.4 0,6.4 0,9.6
-    6.4,9.6 6.4,16 9.6,16 9.6,9.6 16,9.6"/>
-  <path id="audio-shape" fill-rule="evenodd" clip-rule="evenodd" d="M11.429,6.857v2.286c0,1.894-1.535,3.429-3.429,3.429
-    c-1.894,0-3.429-1.535-3.429-3.429V6.857H3.429v2.286c0,2.129,1.458,3.913,3.429,4.422v1.293H6.286
-    c-0.746,0-1.379,0.477-1.615,1.143h6.658c-0.236-0.665-0.869-1.143-1.615-1.143H9.143v-1.293c1.971-0.508,3.429-2.292,3.429-4.422
-    V6.857H11.429z M8,12c1.578,0,2.857-1.279,2.857-2.857V2.857C10.857,1.279,9.578,0,8,0C6.422,0,5.143,1.279,5.143,2.857v6.286
-    C5.143,10.721,6.422,12,8,12z"/>
-  <path id="block-shape" fill-rule="evenodd" clip-rule="evenodd" d="M8,0C3.582,0,0,3.582,0,8c0,4.418,3.582,8,8,8
-    c4.418,0,8-3.582,8-8C16,3.582,12.418,0,8,0z M8,2.442c1.073,0,2.075,0.301,2.926,0.821l-7.673,7.673
-    C2.718,10.085,2.408,9.079,2.408,8C2.408,4.931,4.911,2.442,8,2.442z M8,13.557c-1.073,0-2.075-0.301-2.926-0.821l7.673-7.673
-    C13.282,5.915,13.592,6.921,13.592,8C13.592,11.069,11.089,13.557,8,13.557z"/>
-  <path id="contacts-shape" fill-rule="evenodd" clip-rule="evenodd" d="M8,6.526c1.802,0,3.263-1.461,3.263-3.263
-    C11.263,1.461,9.802,0,8,0C6.198,0,4.737,1.461,4.737,3.263C4.737,5.066,6.198,6.526,8,6.526z M14.067,11.421c0,0,0-0.001,0-0.001
-    c0-1.676-1.397-3.119-3.419-3.807L8.001,10.26L5.354,7.613C3.331,8.3,1.933,9.744,1.933,11.42v0.001H1.93
-    c0,1.679,0.328,3.246,0.896,4.579h10.348c0.568-1.333,0.896-2.9,0.896-4.579H14.067z"/>
-  <g id="google-shape">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M8.001,9.278c-0.9,0.03-1.989,0.454-2.144,1.274
-      c-0.292,1.54,1.284,2.004,2.455,1.932c1.097-0.067,1.737-0.593,1.813-1.26c0.063-0.554-0.184-1.153-0.959-1.644
-      c-0.142-0.09-0.28-0.185-0.413-0.282C8.504,9.291,8.25,9.27,8.001,9.278z"/>
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M7.381,3.409C6.638,3.64,6.32,4.405,6.627,5.61
-      C6.908,6.708,7.78,7.322,8.569,7.104c0.77-0.213,0.987-1.021,0.847-1.873C9.201,3.929,8.261,3.136,7.381,3.409z"/>
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M8,0C3.582,0,0,3.582,0,8s3.582,8,8,8c4.418,0,8-3.582,8-8
-      S12.418,0,8,0z M10.544,4.471c0.17,0.453,0.194,0.954,0.021,1.416c-0.163,0.436-0.495,0.811-0.982,1.096
-      C9.307,7.146,9.167,7.351,9.151,7.548c-0.045,0.575,0.658,0.993,1.064,1.297c0.889,0.666,1.236,1.758,0.648,2.813
-      c-0.562,1.007-1.901,1.457-3.322,1.462c-1.766-0.008-2.88-0.817-2.938-1.918C4.527,9.779,5.987,9.101,7.307,8.947
-      c0.369-0.043,0.7-0.036,1.01-0.014C7.85,8.625,7.675,7.998,7.914,7.58c0.062-0.109,0.023-0.072-0.095-0.054
-      C6.739,7.689,5.628,6.985,5.367,5.92c-0.132-0.54-0.05-1.105,0.156-1.547C5.97,3.413,6.964,2.88,8.067,2.88
-      c1.147,0,2.209,0,3.334,0.009L10.612,3.4H9.714C10.093,3.665,10.384,4.046,10.544,4.471z"/>
-  </g>
-  <path id="history-shape" fill-rule="evenodd" clip-rule="evenodd" d="M8,16c-4.418,0-8-3.582-8-8c0-4.418,3.582-8,8-8
-    c4.418,0,8,3.582,8,8C16,12.418,12.418,16,8,16z M8,2.442C4.911,2.442,2.408,4.931,2.408,8c0,3.069,2.504,5.557,5.592,5.557
-    S13.592,11.069,13.592,8C13.592,4.931,11.089,2.442,8,2.442z M7.649,9.048C7.206,8.899,6.882,8.493,6.882,8V4.645
-    c0-0.618,0.501-1.119,1.118-1.119c0.618,0,1.119,0.501,1.119,1.119v3.078c1.176,1.22,2.237,3.633,2.237,3.633
-    S8.844,10.252,7.649,9.048z"/>
-  <path id="precall-shape" fill-rule="evenodd" clip-rule="evenodd" d="M8.014,0.003c-4.411,0-7.987,3.576-7.987,7.986
-    c0,1.642,0.496,3.168,1.346,4.437L0,15.997l3.568-1.372c1.271,0.853,2.8,1.352,4.446,1.352c4.411,0,7.986-3.576,7.986-7.987
-    C16,3.579,12.424,0.003,8.014,0.003z"/>
-  <path id="settings-shape" fill-rule="evenodd" clip-rule="evenodd" d="M14.77,8c0,0.804,0.262,1.548,0.634,1.678L16,9.887
-    c-0.205,0.874-0.553,1.692-1.011,2.434l-0.567-0.272c-0.355-0.171-1.066,0.17-1.635,0.738c-0.569,0.569-0.909,1.279-0.738,1.635
-    l0.273,0.568c-0.741,0.46-1.566,0.79-2.438,0.998l-0.205-0.584c-0.13-0.372-0.874-0.634-1.678-0.634s-1.548,0.262-1.678,0.634
-    l-0.209,0.596c-0.874-0.205-1.692-0.553-2.434-1.011l0.272-0.567c0.171-0.355-0.17-1.066-0.739-1.635
-    c-0.568-0.568-1.279-0.909-1.635-0.738l-0.568,0.273c-0.46-0.741-0.79-1.566-0.998-2.439l0.584-0.205
-    C0.969,9.547,1.231,8.804,1.231,8c0-0.804-0.262-1.548-0.634-1.678L0,6.112c0.206-0.874,0.565-1.685,1.025-2.427l0.554,0.266
-    c0.355,0.171,1.066-0.17,1.635-0.738c0.569-0.568,0.909-1.28,0.739-1.635L3.686,1.025c0.742-0.46,1.553-0.818,2.427-1.024
-    l0.209,0.596C6.453,0.969,7.197,1.23,8.001,1.23s1.548-0.262,1.678-0.634l0.209-0.596c0.874,0.205,1.692,0.553,2.434,1.011
-    l-0.272,0.567c-0.171,0.355,0.17,1.066,0.738,1.635c0.569,0.568,1.279,0.909,1.635,0.738l0.568-0.273
-    c0.46,0.741,0.79,1.566,0.998,2.438l-0.584,0.205C15.032,6.452,14.77,7.196,14.77,8z M8.001,3.661C5.604,3.661,3.661,5.603,3.661,8
-    c0,2.397,1.943,4.34,4.339,4.34c2.397,0,4.339-1.943,4.339-4.34C12.34,5.603,10.397,3.661,8.001,3.661z"/>
-  <g id="share-shape">
-    <path fill="transparent" d="M11.704,12.375H7.556c-0.183,0-0.353-0.071-0.48-0.199c-0.124-0.125-0.191-0.29-0.19-0.464V10.09h-2.59
-      c-0.37,0-0.671-0.296-0.671-0.661V4.286c0-0.365,0.301-0.661,0.671-0.661h3.384L7.817,3.73l1.299,1.254v0.927h1.851
-      l1.408,1.359v4.444C12.375,12.079,12.074,12.375,11.704,12.375z M7.635,11.625h3.989V7.588l-0.961-0.927H7.635V11.625z
-      M4.375,9.34h2.5V6.561c0-0.365,0.301-0.661,0.671-0.661h0.82V5.302L7.405,4.375h-3.03V9.34z"/>
-    <polygon fill="transparent" points="10.222,8 10.222,6.857 11.407,8"/>
-    <polygon fill="transparent" points="6.963,5.714 6.963,4.571 8.148,5.714"/>
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M8.999,10.654L8.69,10.6L8.999,16l2.56-3.754L8.999,10.654z
-      M8.658,10.041l0.341-0.043l6,2.898V0L1,10.998l4.55-0.569L8.999,16l-1.892-5.68l-0.283-0.05l0.256-0.032L7,9.998l6.999-8.003
-      L8.656,9.998L8.658,10.041z"/>
-  </g>
-  <path id="tag-shape" fill-rule="evenodd" clip-rule="evenodd" d="M15.578,7.317L9.659,1.398
-    C9.374,1.033,8.955,0.777,8.471,0.761L2.556,0C1.72-0.027-0.027,1.72,0,2.556l0.761,5.916c0.016,0.484,0.272,0.902,0.637,1.188
-    l5.919,5.919c0.591,0.591,1.584,0.557,2.218-0.076l5.966-5.966C16.135,8.902,16.169,7.909,15.578,7.317z M4.222,4.163
-    c-0.511,0.511-1.339,0.511-1.85,0c-0.511-0.511-0.511-1.339,0-1.85c0.511-0.511,1.339-0.511,1.85,0
-    C4.733,2.823,4.733,3.652,4.222,4.163z"/>
-  <path id="unblock-shape" fill-rule="evenodd" clip-rule="evenodd" d="M8,16c-4.418,0-8-3.582-8-8c0-4.418,3.582-8,8-8
-    c4.418,0,8,3.582,8,8C16,12.418,12.418,16,8,16z M8,2.442C4.911,2.442,2.408,4.931,2.408,8c0,3.069,2.504,5.557,5.592,5.557
-    S13.592,11.069,13.592,8C13.592,4.931,11.089,2.442,8,2.442z"/>
-  <path id="video-shape" fill-rule="evenodd" clip-rule="evenodd" d="M14.9,3.129l-3.476,3.073V3.873c0-0.877-0.663-1.587-1.482-1.587
-    H1.482C0.663,2.286,0,2.996,0,3.873v8.254c0,0.877,0.663,1.587,1.482,1.587h8.461c0.818,0,1.482-0.711,1.482-1.587V9.762
-    l3.476,3.073c0.3,0.321,0.714,0.416,1.1,0.331V2.798C15.614,2.713,15.2,2.808,14.9,3.129z"/>
-  <g id="copy-shape">
-    <circle fill-rule="evenodd" clip-rule="evenodd" fill="#0096DD" cx="8" cy="8" r="8"/>
-    <path fill-rule="evenodd" clip-rule="evenodd" fill="none"
-          stroke="#FFFFFF" stroke-width="0.75" stroke-miterlimit="10"
-          d="M10.815,6.286H7.556c-0.164,0-0.296,0.128-0.296,0.286v5.143C7.259,11.872,7.392,12,7.556,12h4.148
-             C11.867,12,12,11.872,12,11.714V7.429L10.815,6.286z
-             M8.741,6.275V5.143L7.556,4H7.528C6.509,4,4.593,4,4.593,4H4.296
-             C4.133,4,4,4.128,4,4.286v5.143c0,0.158,0.133,0.286,0.296,0.286H7.25V6.561c0-0.158,0.133-0.286,0.296-0.286H8.741z"/>
-    <polygon fill-rule="evenodd" clip-rule="evenodd"
-             fill="#FFFFFF" points="10.222,8 10.222,6.857 11.407,8"/>
-    <polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF"
-             points="6.963,5.714 6.963,4.571 8.148,5.714"/>
-  </g>
-  <g id="checkmark-shape">
-    <circle fill-rule="evenodd" clip-rule="evenodd" fill="#0096DD" cx="8"
-            cy="8" r="8"/>
-    <path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF"
-          d="M7.236,12L12,5.007L10.956,4L7.224,9.465l-2.14-2.326L4,8.146L7.236,12z"/>
-  </g>
-  <g id="trash-shape">
-    <circle fill-rule="evenodd" clip-rule="evenodd" fill="#D74345" cx="8" cy="8" r="8"/>
-    <path fill="#FFFFFF" d="M12,5.79c0-0.742-0.537-1.344-1.2-1.344h-0.583V4.121c0-0.713-0.516-1.29-1.152-1.29h-2.13
-      c-0.636,0-1.152,0.578-1.152,1.29v0.324H5.2C4.537,4.446,4,5.048,4,5.79v0.898h0.687l0.508,5.438
-      c0.054,0.585,0.543,1.044,1.114,1.044h3.38c0.57,0,1.06-0.458,1.114-1.043l0.509-5.439H12V5.79z M6.407,4.264V4.165
-      c0-0.375,0.271-0.678,0.606-0.678h1.974c0.334,0,0.606,0.304,0.606,0.678v0.099c0,0.063-0.01,0.123-0.025,0.181H6.432
-      C6.417,4.387,6.407,4.328,6.407,4.264z M10.057,12.056c-0.019,0.197-0.188,0.363-0.368,0.363h-3.38
-      c-0.182,0-0.35-0.166-0.368-0.363L5.44,6.687h5.12L10.057,12.056z"/>
-    <rect x="7.75" y="7.542" fill="#FFFFFF" width="0.5" height="4"/>
-    <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>
-  <path id="tour-shape" fill="#5A5A5A" d="M8,0C4.831,0,2.262,2.674,2.262,5.972c0,1.393,1.023,3.398,2.206,5.249l0.571,
-    0.866C6.504,14.245,8,16,8,16 s1.496-1.755,2.961-3.912l0.571-0.866c1.182-1.852,2.206-3.856,2.206-5.249C13.738,2.674,
-    11.169,0,8,0z M8,7.645 c-0.603,0-1.146-0.262-1.534-0.681C6.098,6.566,5.87,6.025,5.87,5.428c0-1.224,0.954-2.217,
-    2.13-2.217s2.13,0.992,2.13,2.217 C10.13,6.653,9.177,7.645,8,7.645z"/>
-  <g id="screen-shape">
-    <path d="M12.199,3.915v-0.4c0-0.837-0.65-1.515-1.452-1.515H2.452C1.65,2,1,2.678,1,3.515v6.242
-      c0,0.837,0.65,1.515,1.452,1.515h0.514V5.431c0-0.837,0.65-1.515,1.452-1.515H12.199z"/>
-    <path d="M13.548,4.727H5.253c-0.802,0-1.452,0.678-1.452,1.515v6.242c0,0.837,0.65,1.515,1.452,
-      1.515h8.294 C14.35,14,15,13.322,15,12.485V6.242C15,5.406,14.35,4.727,13.548,4.727z"/>
-  </g>
-  <g id="screenmute-shape">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M13.55,4.73h-0.54l-8.13,8.13L4.2,13.53
-      C4.46,13.82,4.84,14,5.25,14h8.3c0.8,0,1.45-0.68,1.45-1.52V6.24C15,5.41,14.35,4.73,13.55,4.73z"/>
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M14.21,2.72l-0.99-0.99l-1.15,1.15C11.83,2.36,11.33,2,10.75,2
-      h-8.3C1.65,2,1,2.68,1,3.52v6.24c0,0.83,0.65,1.51,1.45,1.51h0.52V5.43c0-0.84,0.65-1.51,1.45-1.51h6.61l-0.81,
-      0.81H5.25 c-0.8,0-1.45,0.68-1.45,1.51v4.91l-1.89,1.89l0.99,0.99l1-1l8.3-8.3L14.21,2.72z"/>
-  </g>
-  <g id="delete-shape">
-    <path fill="#CCCCCC" d="M14.191,4.579c0-1.149-0.832-2.08-1.857-2.08h-0.902V1.997C11.432,0.894,10.633,0,9.648,0H6.352
-      C5.367,0,4.568,0.894,4.568,1.997v0.502H3.666c-1.026,0-1.857,0.932-1.857,2.08v1.389h1.064l0.785,8.416
-      C3.742,15.29,4.499,16,5.383,16h5.231c0.883,0,1.64-0.709,1.724-1.614l0.788-8.417h1.064V4.579z M5.535,2.218V2.065
-      c0-0.58,0.42-1.05,0.938-1.05h3.055c0.518,0,0.937,0.47,0.937,1.05v0.153c0,0.098-0.016,0.191-0.038,0.281H5.573
-      C5.55,2.409,5.535,2.316,5.535,2.218z M11.184,14.277c-0.029,0.305-0.29,0.562-0.57,0.562H5.383c-0.281,0-0.541-0.257-0.57-0.562
-      L4.038,5.969h7.924L11.184,14.277z"/>
-    <rect x="7.612" y="7.291" fill="#CCCCCC" width="0.774" height="6.191"/>
-    <polyline fill="#CCCCCC" points="9.934,7.291 9.16,7.291 9.16,13.482 9.934,13.482  "/>
-    <rect x="6.065" y="7.291" fill="#CCCCCC" width="0.774" height="6.191"/>
-  </g>
-</defs>
-<use id="add"                 xlink:href="#add-shape"/>
-<use id="add-hover"           xlink:href="#add-shape"/>
-<use id="add-active"          xlink:href="#add-shape"/>
-<use id="audio"               xlink:href="#audio-shape"/>
-<use id="audio-hover"         xlink:href="#audio-shape"/>
-<use id="audio-active"        xlink:href="#audio-shape"/>
-<use id="block"               xlink:href="#block-shape"/>
-<use id="block-red"           xlink:href="#block-shape"/>
-<use id="block-hover"         xlink:href="#block-shape"/>
-<use id="block-active"        xlink:href="#block-shape"/>
-<use id="contacts"            xlink:href="#contacts-shape"/>
-<use id="contacts-hover"      xlink:href="#contacts-shape"/>
-<use id="contacts-active"     xlink:href="#contacts-shape"/>
-<use id="copy"                xlink:href="#copy-shape"/>
-<use id="checkmark"           xlink:href="#checkmark-shape"/>
-<use id="google"              xlink:href="#google-shape"/>
-<use id="google-hover"        xlink:href="#google-shape"/>
-<use id="google-active"       xlink:href="#google-shape"/>
-<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"/>
-<use id="settings"            xlink:href="#settings-shape"/>
-<use id="settings-hover"      xlink:href="#settings-shape"/>
-<use id="settings-active"     xlink:href="#settings-shape"/>
-<use id="share-darkgrey"      xlink:href="#share-shape"/>
-<use id="tag"                 xlink:href="#tag-shape"/>
-<use id="tag-hover"           xlink:href="#tag-shape"/>
-<use id="tag-active"          xlink:href="#tag-shape"/>
-<use id="trash"               xlink:href="#trash-shape"/>
-<use id="unblock"             xlink:href="#unblock-shape"/>
-<use id="unblock-hover"       xlink:href="#unblock-shape"/>
-<use id="unblock-active"      xlink:href="#unblock-shape"/>
-<use id="video"               xlink:href="#video-shape"/>
-<use id="video-hover"         xlink:href="#video-shape"/>
-<use id="video-active"        xlink:href="#video-shape"/>
-<use id="tour"                xlink:href="#tour-shape"/>
-<use id="screen-white"        xlink:href="#screen-shape"/>
-<use id="screen-disabled"     xlink:href="#screen-shape"/>
-<use id="screenmute-white"    xlink:href="#screenmute-shape"/>
-<use id="delete"              xlink:href="#delete-shape"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: #ccc;
+    }
+    use[id$="-hover"] {
+      fill: #444;
+    }
+    use[id$="-active"] {
+      fill: #0095dd;
+    }
+    use[id$="-red"] {
+      fill: #d74345
+    }
+    use[id$="-white"] {
+      fill: #fff;
+    }
+    use[id$="-darkgrey"] {
+      fill: #666;
+    }
+    use[id$="-disabled"] {
+      fill: rgba(255,255,255,.6);
+    }
+  </style>
+  <defs>
+    <polygon id="add-shape" points="16,6.4 9.6,6.4 9.6,0 6.4,0 6.4,6.4 0,6.4 0,9.6 6.4,9.6 6.4,16 9.6,16 9.6,9.6 16,9.6"/>
+    <path id="audio-shape" fill-rule="evenodd" d="M11.429,6.857v2.286c0,1.894-1.535,3.429-3.429,3.429 c-1.894,0-3.429-1.535-3.429-3.429V6.857H3.429v2.286c0,2.129,1.458,3.913,3.429,4.422v1.293H6.286 c-0.746,0-1.379,0.477-1.615,1.143h6.658c-0.236-0.665-0.869-1.143-1.615-1.143H9.143v-1.293c1.971-0.508,3.429-2.292,3.429-4.422 V6.857H11.429z M8,12c1.578,0,2.857-1.279,2.857-2.857V2.857C10.857,1.279,9.578,0,8,0C6.422,0,5.143,1.279,5.143,2.857v6.286 C5.143,10.721,6.422,12,8,12z"/>
+    <path id="block-shape" fill-rule="evenodd" d="M8,0C3.582,0,0,3.582,0,8c0,4.418,3.582,8,8,8 c4.418,0,8-3.582,8-8C16,3.582,12.418,0,8,0z M8,2.442c1.073,0,2.075,0.301,2.926,0.821l-7.673,7.673 C2.718,10.085,2.408,9.079,2.408,8C2.408,4.931,4.911,2.442,8,2.442z M8,13.557c-1.073,0-2.075-0.301-2.926-0.821l7.673-7.673 C13.282,5.915,13.592,6.921,13.592,8C13.592,11.069,11.089,13.557,8,13.557z"/>
+    <path id="contacts-shape" fill-rule="evenodd" d="M8,6.526c1.802,0,3.263-1.461,3.263-3.263 C11.263,1.461,9.802,0,8,0C6.198,0,4.737,1.461,4.737,3.263C4.737,5.066,6.198,6.526,8,6.526z M14.067,11.421c0,0,0-0.001,0-0.001 c0-1.676-1.397-3.119-3.419-3.807L8.001,10.26L5.354,7.613C3.331,8.3,1.933,9.744,1.933,11.42v0.001H1.93 c0,1.679,0.328,3.246,0.896,4.579h10.348c0.568-1.333,0.896-2.9,0.896-4.579H14.067z"/>
+    <g id="google-shape">
+      <path fill-rule="evenodd" d="M8.001,9.278c-0.9,0.03-1.989,0.454-2.144,1.274 c-0.292,1.54,1.284,2.004,2.455,1.932c1.097-0.067,1.737-0.593,1.813-1.26c0.063-0.554-0.184-1.153-0.959-1.644 c-0.142-0.09-0.28-0.185-0.413-0.282C8.504,9.291,8.25,9.27,8.001,9.278z"/>
+      <path fill-rule="evenodd" d="M7.381,3.409C6.638,3.64,6.32,4.405,6.627,5.61 C6.908,6.708,7.78,7.322,8.569,7.104c0.77-0.213,0.987-1.021,0.847-1.873C9.201,3.929,8.261,3.136,7.381,3.409z"/>
+      <path fill-rule="evenodd" d="M8,0C3.582,0,0,3.582,0,8s3.582,8,8,8c4.418,0,8-3.582,8-8 S12.418,0,8,0z M10.544,4.471c0.17,0.453,0.194,0.954,0.021,1.416c-0.163,0.436-0.495,0.811-0.982,1.096 C9.307,7.146,9.167,7.351,9.151,7.548c-0.045,0.575,0.658,0.993,1.064,1.297c0.889,0.666,1.236,1.758,0.648,2.813 c-0.562,1.007-1.901,1.457-3.322,1.462c-1.766-0.008-2.88-0.817-2.938-1.918C4.527,9.779,5.987,9.101,7.307,8.947 c0.369-0.043,0.7-0.036,1.01-0.014C7.85,8.625,7.675,7.998,7.914,7.58c0.062-0.109,0.023-0.072-0.095-0.054 C6.739,7.689,5.628,6.985,5.367,5.92c-0.132-0.54-0.05-1.105,0.156-1.547C5.97,3.413,6.964,2.88,8.067,2.88 c1.147,0,2.209,0,3.334,0.009L10.612,3.4H9.714C10.093,3.665,10.384,4.046,10.544,4.471z"/>
+    </g>
+    <path id="history-shape" fill-rule="evenodd" d="M8,16c-4.418,0-8-3.582-8-8c0-4.418,3.582-8,8-8 c4.418,0,8,3.582,8,8C16,12.418,12.418,16,8,16z M8,2.442C4.911,2.442,2.408,4.931,2.408,8c0,3.069,2.504,5.557,5.592,5.557 S13.592,11.069,13.592,8C13.592,4.931,11.089,2.442,8,2.442z M7.649,9.048C7.206,8.899,6.882,8.493,6.882,8V4.645 c0-0.618,0.501-1.119,1.118-1.119c0.618,0,1.119,0.501,1.119,1.119v3.078c1.176,1.22,2.237,3.633,2.237,3.633 S8.844,10.252,7.649,9.048z"/>
+    <path id="precall-shape" fill-rule="evenodd" d="M8.014,0.003c-4.411,0-7.987,3.576-7.987,7.986 c0,1.642,0.496,3.168,1.346,4.437L0,15.997l3.568-1.372c1.271,0.853,2.8,1.352,4.446,1.352c4.411,0,7.986-3.576,7.986-7.987 C16,3.579,12.424,0.003,8.014,0.003z"/>
+    <path id="settings-shape" fill-rule="evenodd" d="M14.77,8c0,0.804,0.262,1.548,0.634,1.678L16,9.887 c-0.205,0.874-0.553,1.692-1.011,2.434l-0.567-0.272c-0.355-0.171-1.066,0.17-1.635,0.738c-0.569,0.569-0.909,1.279-0.738,1.635 l0.273,0.568c-0.741,0.46-1.566,0.79-2.438,0.998l-0.205-0.584c-0.13-0.372-0.874-0.634-1.678-0.634s-1.548,0.262-1.678,0.634 l-0.209,0.596c-0.874-0.205-1.692-0.553-2.434-1.011l0.272-0.567c0.171-0.355-0.17-1.066-0.739-1.635 c-0.568-0.568-1.279-0.909-1.635-0.738l-0.568,0.273c-0.46-0.741-0.79-1.566-0.998-2.439l0.584-0.205 C0.969,9.547,1.231,8.804,1.231,8c0-0.804-0.262-1.548-0.634-1.678L0,6.112c0.206-0.874,0.565-1.685,1.025-2.427l0.554,0.266 c0.355,0.171,1.066-0.17,1.635-0.738c0.569-0.568,0.909-1.28,0.739-1.635L3.686,1.025c0.742-0.46,1.553-0.818,2.427-1.024 l0.209,0.596C6.453,0.969,7.197,1.23,8.001,1.23s1.548-0.262,1.678-0.634l0.209-0.596c0.874,0.205,1.692,0.553,2.434,1.011 l-0.272,0.567c-0.171,0.355,0.17,1.066,0.738,1.635c0.569,0.568,1.279,0.909,1.635,0.738l0.568-0.273 c0.46,0.741,0.79,1.566,0.998,2.438l-0.584,0.205C15.032,6.452,14.77,7.196,14.77,8z M8.001,3.661C5.604,3.661,3.661,5.603,3.661,8 c0,2.397,1.943,4.34,4.339,4.34c2.397,0,4.339-1.943,4.339-4.34C12.34,5.603,10.397,3.661,8.001,3.661z"/>
+    <g id="share-shape">
+      <path fill-rule="evenodd" d="M8.999,10.654L8.69,10.6L8.999,16l2.56-3.754L8.999,10.654z M8.658,10.041l0.341-0.043l6,2.898V0L1,10.998l4.55-0.569L8.999,16l-1.892-5.68l-0.283-0.05l0.256-0.032L7,9.998l6.999-8.003 L8.656,9.998L8.658,10.041z"/>
+    </g>
+    <path id="tag-shape" fill-rule="evenodd" d="M15.578,7.317L9.659,1.398 C9.374,1.033,8.955,0.777,8.471,0.761L2.556,0C1.72-0.027-0.027,1.72,0,2.556l0.761,5.916c0.016,0.484,0.272,0.902,0.637,1.188 l5.919,5.919c0.591,0.591,1.584,0.557,2.218-0.076l5.966-5.966C16.135,8.902,16.169,7.909,15.578,7.317z M4.222,4.163 c-0.511,0.511-1.339,0.511-1.85,0c-0.511-0.511-0.511-1.339,0-1.85c0.511-0.511,1.339-0.511,1.85,0 C4.733,2.823,4.733,3.652,4.222,4.163z"/>
+    <path id="unblock-shape" fill-rule="evenodd" d="M8,16c-4.418,0-8-3.582-8-8c0-4.418,3.582-8,8-8 c4.418,0,8,3.582,8,8C16,12.418,12.418,16,8,16z M8,2.442C4.911,2.442,2.408,4.931,2.408,8c0,3.069,2.504,5.557,5.592,5.557 S13.592,11.069,13.592,8C13.592,4.931,11.089,2.442,8,2.442z"/>
+    <path id="video-shape" fill-rule="evenodd" d="M14.9,3.129l-3.476,3.073V3.873c0-0.877-0.663-1.587-1.482-1.587 H1.482C0.663,2.286,0,2.996,0,3.873v8.254c0,0.877,0.663,1.587,1.482,1.587h8.461c0.818,0,1.482-0.711,1.482-1.587V9.762 l3.476,3.073c0.3,0.321,0.714,0.416,1.1,0.331V2.798C15.614,2.713,15.2,2.808,14.9,3.129z"/>
+    <g id="copy-shape">
+      <circle fill="#0096dd" cx="8" cy="8" r="8"/>
+      <path fill-rule="evenodd" fill="none" stroke="#fff" stroke-width="0.75" stroke-miterlimit="10" d="M10.815,6.286H7.556c-0.164,0-0.296,0.128-0.296,0.286v5.143C7.259,11.872,7.392,12,7.556,12h4.148 C11.867,12,12,11.872,12,11.714V7.429L10.815,6.286z M8.741,6.275V5.143L7.556,4H7.528C6.509,4,4.593,4,4.593,4H4.296 C4.133,4,4,4.128,4,4.286v5.143c0,0.158,0.133,0.286,0.296,0.286H7.25V6.561c0-0.158,0.133-0.286,0.296-0.286H8.741z"/>
+      <polygon fill="#fff" points="10.222,8 10.222,6.857 11.407,8"/>
+      <polygon fill="#fff" points="6.963,5.714 6.963,4.571 8.148,5.714"/>
+    </g>
+    <g id="checkmark-shape">
+      <circle fill="#0096dd" cx="8" cy="8" r="8"/>
+      <path fill-rule="evenodd" fill="#fff" d="M7.236,12L12,5.007L10.956,4L7.224,9.465l-2.14-2.326L4,8.146L7.236,12z"/>
+    </g>
+    <g id="trash-shape">
+      <circle fill="#d74345" cx="8" cy="8" r="8"/>
+      <path fill="#fff" d="M12,5.79c0-0.742-0.537-1.344-1.2-1.344h-0.583V4.121c0-0.713-0.516-1.29-1.152-1.29h-2.13 c-0.636,0-1.152,0.578-1.152,1.29v0.324H5.2C4.537,4.446,4,5.048,4,5.79v0.898h0.687l0.508,5.438 c0.054,0.585,0.543,1.044,1.114,1.044h3.38c0.57,0,1.06-0.458,1.114-1.043l0.509-5.439H12V5.79z M6.407,4.264V4.165 c0-0.375,0.271-0.678,0.606-0.678h1.974c0.334,0,0.606,0.304,0.606,0.678v0.099c0,0.063-0.01,0.123-0.025,0.181H6.432 C6.417,4.387,6.407,4.328,6.407,4.264z M10.057,12.056c-0.019,0.197-0.188,0.363-0.368,0.363h-3.38 c-0.182,0-0.35-0.166-0.368-0.363L5.44,6.687h5.12L10.057,12.056z"/>
+      <rect x="7.75" y="7.542" fill="#fff" width="0.5" height="4"/>
+      <polyline fill="#fff" 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="#fff" width="0.5" height="4"/>
+    </g>
+    <g id="leave-shape">
+      <polygon fill="#fff" 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="#fff" 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>
+    <path id="tour-shape" fill="#5a5a5a" d="M8,0C4.831,0,2.262,2.674,2.262,5.972c0,1.393,1.023,3.398,2.206,5.249l0.571, 0.866C6.504,14.245,8,16,8,16 s1.496-1.755,2.961-3.912l0.571-0.866c1.182-1.852,2.206-3.856,2.206-5.249C13.738,2.674, 11.169,0,8,0z M8,7.645 c-0.603,0-1.146-0.262-1.534-0.681C6.098,6.566,5.87,6.025,5.87,5.428c0-1.224,0.954-2.217, 2.13-2.217s2.13,0.992,2.13,2.217 C10.13,6.653,9.177,7.645,8,7.645z"/>
+    <g id="screen-shape">
+      <path d="M12.199,3.915v-0.4c0-0.837-0.65-1.515-1.452-1.515H2.452C1.65,2,1,2.678,1,3.515v6.242 c0,0.837,0.65,1.515,1.452,1.515h0.514V5.431c0-0.837,0.65-1.515,1.452-1.515H12.199z"/>
+      <path d="M13.548,4.727H5.253c-0.802,0-1.452,0.678-1.452,1.515v6.242c0,0.837,0.65,1.515,1.452, 1.515h8.294 C14.35,14,15,13.322,15,12.485V6.242C15,5.406,14.35,4.727,13.548,4.727z"/>
+    </g>
+    <g id="screenmute-shape">
+      <path fill-rule="evenodd" d="M13.55,4.73h-0.54l-8.13,8.13L4.2,13.53 C4.46,13.82,4.84,14,5.25,14h8.3c0.8,0,1.45-0.68,1.45-1.52V6.24C15,5.41,14.35,4.73,13.55,4.73z"/>
+      <path fill-rule="evenodd" d="M14.21,2.72l-0.99-0.99l-1.15,1.15C11.83,2.36,11.33,2,10.75,2 h-8.3C1.65,2,1,2.68,1,3.52v6.24c0,0.83,0.65,1.51,1.45,1.51h0.52V5.43c0-0.84,0.65-1.51,1.45-1.51h6.61l-0.81, 0.81H5.25 c-0.8,0-1.45,0.68-1.45,1.51v4.91l-1.89,1.89l0.99,0.99l1-1l8.3-8.3L14.21,2.72z"/>
+    </g>
+    <g id="delete-shape">
+      <path fill="#ccc" d="M14.191,4.579c0-1.149-0.832-2.08-1.857-2.08h-0.902V1.997C11.432,0.894,10.633,0,9.648,0H6.352 C5.367,0,4.568,0.894,4.568,1.997v0.502H3.666c-1.026,0-1.857,0.932-1.857,2.08v1.389h1.064l0.785,8.416 C3.742,15.29,4.499,16,5.383,16h5.231c0.883,0,1.64-0.709,1.724-1.614l0.788-8.417h1.064V4.579z M5.535,2.218V2.065 c0-0.58,0.42-1.05,0.938-1.05h3.055c0.518,0,0.937,0.47,0.937,1.05v0.153c0,0.098-0.016,0.191-0.038,0.281H5.573 C5.55,2.409,5.535,2.316,5.535,2.218z M11.184,14.277c-0.029,0.305-0.29,0.562-0.57,0.562H5.383c-0.281,0-0.541-0.257-0.57-0.562 L4.038,5.969h7.924L11.184,14.277z"/>
+      <rect x="7.612" y="7.291" fill="#ccc" width="0.774" height="6.191"/>
+      <polyline fill="#ccc" points="9.934,7.291 9.16,7.291 9.16,13.482 9.934,13.482  "/>
+      <rect x="6.065" y="7.291" fill="#ccc" width="0.774" height="6.191"/>
+    </g>
+  </defs>
+  <use id="add" xlink:href="#add-shape"/>
+  <use id="add-hover" xlink:href="#add-shape"/>
+  <use id="add-active" xlink:href="#add-shape"/>
+  <use id="audio" xlink:href="#audio-shape"/>
+  <use id="audio-hover" xlink:href="#audio-shape"/>
+  <use id="audio-active" xlink:href="#audio-shape"/>
+  <use id="block" xlink:href="#block-shape"/>
+  <use id="block-red" xlink:href="#block-shape"/>
+  <use id="block-hover" xlink:href="#block-shape"/>
+  <use id="block-active" xlink:href="#block-shape"/>
+  <use id="contacts" xlink:href="#contacts-shape"/>
+  <use id="contacts-hover" xlink:href="#contacts-shape"/>
+  <use id="contacts-active" xlink:href="#contacts-shape"/>
+  <use id="copy" xlink:href="#copy-shape"/>
+  <use id="checkmark" xlink:href="#checkmark-shape"/>
+  <use id="google" xlink:href="#google-shape"/>
+  <use id="google-hover" xlink:href="#google-shape"/>
+  <use id="google-active" xlink:href="#google-shape"/>
+  <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"/>
+  <use id="settings" xlink:href="#settings-shape"/>
+  <use id="settings-hover" xlink:href="#settings-shape"/>
+  <use id="settings-active" xlink:href="#settings-shape"/>
+  <use id="share-darkgrey" xlink:href="#share-shape"/>
+  <use id="tag" xlink:href="#tag-shape"/>
+  <use id="tag-hover" xlink:href="#tag-shape"/>
+  <use id="tag-active" xlink:href="#tag-shape"/>
+  <use id="trash" xlink:href="#trash-shape"/>
+  <use id="unblock" xlink:href="#unblock-shape"/>
+  <use id="unblock-hover" xlink:href="#unblock-shape"/>
+  <use id="unblock-active" xlink:href="#unblock-shape"/>
+  <use id="video" xlink:href="#video-shape"/>
+  <use id="video-hover" xlink:href="#video-shape"/>
+  <use id="video-active" xlink:href="#video-shape"/>
+  <use id="tour" xlink:href="#tour-shape"/>
+  <use id="screen-white" xlink:href="#screen-shape"/>
+  <use id="screen-disabled" xlink:href="#screen-shape"/>
+  <use id="screenmute-white" xlink:href="#screenmute-shape"/>
+  <use id="delete" xlink:href="#delete-shape"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/img/svg/glyph-account-16x16.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/img/svg/glyph-account-16x16.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/img/svg/glyph-account-16x16.svg	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/img/svg/glyph-account-16x16.svg	2015-05-25 20:42:46.000000000 +0000
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<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">
-<g id="Contacts">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#231F20" d="M8,6.526c1.802,0,3.263-1.461,3.263-3.263
-		C11.263,1.461,9.802,0,8,0C6.198,0,4.737,1.461,4.737,3.263C4.737,5.066,6.198,6.526,8,6.526z M14.067,11.421c0,0,0-0.001,0-0.001
-		c0-1.676-1.397-3.119-3.419-3.807L8.001,10.26L5.354,7.613C3.331,8.3,1.933,9.744,1.933,11.42v0.001H1.93
-		c0,1.679,0.328,3.246,0.896,4.579h10.348c0.568-1.333,0.896-2.9,0.896-4.579H14.067z"/>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" fill="#231f20" d="M8,6.526c1.802,0,3.263-1.461,3.263-3.263 C11.263,1.461,9.802,0,8,0C6.198,0,4.737,1.461,4.737,3.263C4.737,5.066,6.198,6.526,8,6.526z M14.067,11.421c0,0,0-0.001,0-0.001 c0-1.676-1.397-3.119-3.419-3.807L8.001,10.26L5.354,7.613C3.331,8.3,1.933,9.744,1.933,11.42v0.001H1.93 c0,1.679,0.328,3.246,0.896,4.579h10.348c0.568-1.333,0.896-2.9,0.896-4.579H14.067z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/img/svg/glyph-help-16x16.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/img/svg/glyph-help-16x16.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/img/svg/glyph-help-16x16.svg	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/img/svg/glyph-help-16x16.svg	2015-05-25 20:42:46.000000000 +0000
@@ -2,14 +2,7 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<!-- 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 xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <circle fill="#5a5a5a" cx="8" cy="8" r="8"/>
+  <path fill="#fff" 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"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/img/svg/glyph-settings-16x16.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/img/svg/glyph-settings-16x16.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/img/svg/glyph-settings-16x16.svg	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/img/svg/glyph-settings-16x16.svg	2015-05-25 20:42:46.000000000 +0000
@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<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">
-<path id="Setting" fill-rule="evenodd" clip-rule="evenodd" fill="#131311" d="M14.77,8c0,0.804,0.262,1.548,0.634,1.678L16,9.887
-	c-0.205,0.874-0.553,1.692-1.011,2.434l-0.567-0.272c-0.355-0.171-1.066,0.17-1.635,0.738c-0.569,0.569-0.909,1.279-0.738,1.635
-	l0.273,0.568c-0.741,0.46-1.566,0.79-2.438,0.998l-0.205-0.584c-0.13-0.372-0.874-0.634-1.678-0.634s-1.548,0.262-1.678,0.634
-	l-0.209,0.596c-0.874-0.205-1.692-0.553-2.434-1.011l0.272-0.567c0.171-0.355-0.17-1.066-0.739-1.635
-	c-0.568-0.568-1.279-0.909-1.635-0.738l-0.568,0.273c-0.46-0.741-0.79-1.566-0.998-2.439l0.584-0.205
-	C0.969,9.547,1.231,8.804,1.231,8c0-0.804-0.262-1.548-0.634-1.678L0,6.112c0.206-0.874,0.565-1.685,1.025-2.427l0.554,0.266
-	c0.355,0.171,1.066-0.17,1.635-0.738c0.569-0.568,0.909-1.28,0.739-1.635L3.686,1.025c0.742-0.46,1.553-0.818,2.427-1.024
-	l0.209,0.596C6.453,0.969,7.197,1.23,8.001,1.23s1.548-0.262,1.678-0.634l0.209-0.596c0.874,0.205,1.692,0.553,2.434,1.011
-	l-0.272,0.567c-0.171,0.355,0.17,1.066,0.738,1.635c0.569,0.568,1.279,0.909,1.635,0.738l0.568-0.273
-	c0.46,0.741,0.79,1.566,0.998,2.438l-0.584,0.205C15.032,6.452,14.77,7.196,14.77,8z M8.001,3.661C5.604,3.661,3.661,5.603,3.661,8
-	c0,2.397,1.943,4.34,4.339,4.34c2.397,0,4.339-1.943,4.339-4.34C12.34,5.603,10.397,3.661,8.001,3.661z"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" fill="#131311" d="M14.77,8c0,0.804,0.262,1.548,0.634,1.678L16,9.887 c-0.205,0.874-0.553,1.692-1.011,2.434l-0.567-0.272c-0.355-0.171-1.066,0.17-1.635,0.738c-0.569,0.569-0.909,1.279-0.738,1.635 l0.273,0.568c-0.741,0.46-1.566,0.79-2.438,0.998l-0.205-0.584c-0.13-0.372-0.874-0.634-1.678-0.634s-1.548,0.262-1.678,0.634 l-0.209,0.596c-0.874-0.205-1.692-0.553-2.434-1.011l0.272-0.567c0.171-0.355-0.17-1.066-0.739-1.635 c-0.568-0.568-1.279-0.909-1.635-0.738l-0.568,0.273c-0.46-0.741-0.79-1.566-0.998-2.439l0.584-0.205 C0.969,9.547,1.231,8.804,1.231,8c0-0.804-0.262-1.548-0.634-1.678L0,6.112c0.206-0.874,0.565-1.685,1.025-2.427l0.554,0.266 c0.355,0.171,1.066-0.17,1.635-0.738c0.569-0.568,0.909-1.28,0.739-1.635L3.686,1.025c0.742-0.46,1.553-0.818,2.427-1.024 l0.209,0.596C6.453,0.969,7.197,1.23,8.001,1.23s1.548-0.262,1.678-0.634l0.209-0.596c0.874,0.205,1.692,0.553,2.434,1.011 l-0.272,0.567c-0.171,0.355,0.17,1.066,0.738,1.635c0.569,0.568,1.279,0.909,1.635,0.738l0.568-0.273 c0.46,0.741,0.79,1.566,0.998,2.438l-0.584,0.205C15.032,6.452,14.77,7.196,14.77,8z M8.001,3.661C5.604,3.661,3.661,5.603,3.661,8 c0,2.397,1.943,4.34,4.339,4.34c2.397,0,4.339-1.943,4.339-4.34C12.34,5.603,10.397,3.661,8.001,3.661z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/img/svg/glyph-signin-16x16.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/img/svg/glyph-signin-16x16.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/img/svg/glyph-signin-16x16.svg	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/img/svg/glyph-signin-16x16.svg	2015-05-25 20:42:46.000000000 +0000
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<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">
-<g id="Outgoing_14x14_1_">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#231F20" d="M9.921,8.415c0.105-0.11,0.146-0.265,0.13-0.432
-		c0.016-0.166-0.025-0.321-0.13-0.429L9.305,6.938l-2.6-2.65C6.402,3.973,5.973,3.906,5.748,4.139L5.238,4.68
-		c-0.225,0.233-0.16,0.679,0.144,0.995L6.44,6.754H0.608C0.272,6.754,0,7.026,0,7.361l0,1.215c0,0.335,0.272,0.607,0.608,0.607H6.47
-		l-1.136,1.155c-0.305,0.313-0.369,0.756-0.144,0.987L5.7,11.861c0.225,0.233,0.654,0.166,0.959-0.149l2.619-2.663L9.921,8.415z"/>
-</g>
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#231F20" d="M14,0H5.558c-0.331,0-0.6,0.269-0.6,0.6v0.8
-	c0,0.331,0.269,0.6,0.6,0.6H12.5C13.328,2,14,2.672,14,3.5v9c0,0.828-0.672,1.5-1.5,1.5H5.558c-0.331,0-0.6,0.269-0.6,0.6v0.8
-	c0,0.331,0.269,0.6,0.6,0.6H14c1.105,0,2-0.895,2-2V2C16,0.895,15.105,0,14,0z"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" fill="#231f20" d="M9.921,8.415c0.105-0.11,0.146-0.265,0.13-0.432 c0.016-0.166-0.025-0.321-0.13-0.429L9.305,6.938l-2.6-2.65C6.402,3.973,5.973,3.906,5.748,4.139L5.238,4.68 c-0.225,0.233-0.16,0.679,0.144,0.995L6.44,6.754H0.608C0.272,6.754,0,7.026,0,7.361l0,1.215c0,0.335,0.272,0.607,0.608,0.607H6.47 l-1.136,1.155c-0.305,0.313-0.369,0.756-0.144,0.987L5.7,11.861c0.225,0.233,0.654,0.166,0.959-0.149l2.619-2.663L9.921,8.415z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M14,0H5.558c-0.331,0-0.6,0.269-0.6,0.6v0.8 c0,0.331,0.269,0.6,0.6,0.6H12.5C13.328,2,14,2.672,14,3.5v9c0,0.828-0.672,1.5-1.5,1.5H5.558c-0.331,0-0.6,0.269-0.6,0.6v0.8 c0,0.331,0.269,0.6,0.6,0.6H14c1.105,0,2-0.895,2-2V2C16,0.895,15.105,0,14,0z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/img/svg/glyph-signout-16x16.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/img/svg/glyph-signout-16x16.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/img/svg/glyph-signout-16x16.svg	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/img/svg/glyph-signout-16x16.svg	2015-05-25 20:42:46.000000000 +0000
@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<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">
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#231F20" d="M14,0H5.558c-0.331,0-0.6,0.269-0.6,0.6v0.8
-	c0,0.331,0.269,0.6,0.6,0.6H12.5C13.328,2,14,2.672,14,3.5v9c0,0.828-0.672,1.5-1.5,1.5H5.558c-0.331,0-0.6,0.269-0.6,0.6v0.8
-	c0,0.331,0.269,0.6,0.6,0.6H14c1.105,0,2-0.895,2-2V2C16,0.895,15.105,0,14,0z"/>
-<g id="Outgoing_14x14_2_">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#231F20" d="M0.133,7.585c-0.105,0.11-0.146,0.265-0.13,0.432
-		c-0.016,0.166,0.025,0.321,0.13,0.429l0.616,0.615l2.6,2.65c0.304,0.315,0.732,0.382,0.958,0.149l0.51-0.541
-		c0.225-0.233,0.16-0.679-0.144-0.995L3.615,9.246h5.832c0.335,0,0.608-0.272,0.608-0.607V7.424c0-0.335-0.272-0.607-0.608-0.607
-		H3.585L4.72,5.662c0.305-0.313,0.369-0.756,0.144-0.987L4.355,4.139C4.13,3.906,3.701,3.973,3.396,4.287L0.777,6.951L0.133,7.585z"
-		/>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" fill="#231f20" d="M14,0H5.558c-0.331,0-0.6,0.269-0.6,0.6v0.8 c0,0.331,0.269,0.6,0.6,0.6H12.5C13.328,2,14,2.672,14,3.5v9c0,0.828-0.672,1.5-1.5,1.5H5.558c-0.331,0-0.6,0.269-0.6,0.6v0.8 c0,0.331,0.269,0.6,0.6,0.6H14c1.105,0,2-0.895,2-2V2C16,0.895,15.105,0,14,0z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M0.133,7.585c-0.105,0.11-0.146,0.265-0.13,0.432 c-0.016,0.166,0.025,0.321,0.13,0.429l0.616,0.615l2.6,2.65c0.304,0.315,0.732,0.382,0.958,0.149l0.51-0.541 c0.225-0.233,0.16-0.679-0.144-0.995L3.615,9.246h5.832c0.335,0,0.608-0.272,0.608-0.607V7.424c0-0.335-0.272-0.607-0.608-0.607 H3.585L4.72,5.662c0.305-0.313,0.369-0.756,0.144-0.987L4.355,4.139C4.13,3.906,3.701,3.973,3.396,4.287L0.777,6.951L0.133,7.585z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/actions.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/actions.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/actions.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/actions.js	2015-05-25 20:42:46.000000000 +0000
@@ -2,8 +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/. */
 
-/* global loop:true */
-
 var loop = loop || {};
 loop.shared = loop.shared || {};
 loop.shared.actions = (function() {
@@ -168,6 +166,28 @@
     }),
 
     /**
+     * Used to notify that the session has a data channel available.
+     */
+    DataChannelsAvailable: Action.define("dataChannelsAvailable", {
+    }),
+
+    /**
+     * Used to send a message to the other peer.
+     */
+    SendTextChatMessage: Action.define("sendTextChatMessage", {
+      contentType: String,
+      message: String
+    }),
+
+    /**
+     * Notifies that a message has been received from the other peer.
+     */
+    ReceivedTextChatMessage: Action.define("receivedTextChatMessage", {
+      contentType: String,
+      message: String
+    }),
+
+    /**
      * Used by the ongoing views to notify stores about the elements
      * required for the sdk.
      */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/activeRoomStore.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/activeRoomStore.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/activeRoomStore.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/activeRoomStore.js	2015-05-25 20:42:46.000000000 +0000
@@ -2,8 +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/. */
 
-/* global loop:true */
-
 var loop = loop || {};
 loop.store = loop.store || {};
 
@@ -374,6 +372,8 @@
      */
     _handleRoomUpdate: function(eventName, roomData) {
       this.dispatchAction(new sharedActions.UpdateRoomInfo({
+        urls: roomData.decryptedContext.urls,
+        description: roomData.decryptedContext.description,
         roomName: roomData.decryptedContext.roomName,
         roomOwner: roomData.roomOwner,
         roomUrl: roomData.roomUrl
@@ -412,7 +412,20 @@
         this.setStoreState({failureReason: undefined});
       }
 
-      this.setStoreState({roomState: ROOM_STATES.MEDIA_WAIT});
+      // XXX Ideally we'd do this check before joining a room, but we're waiting
+      // for the UX for that. See bug 1166824. In the meantime this gives us
+      // additional information for analysis.
+      loop.shared.utils.hasAudioDevices(function(hasAudio) {
+        if (hasAudio) {
+          // MEDIA_WAIT causes the views to dispatch sharedActions.SetupStreamElements,
+          // which in turn starts the sdk obtaining the device permission.
+          this.setStoreState({roomState: ROOM_STATES.MEDIA_WAIT});
+        } else {
+          this.dispatchAction(new sharedActions.ConnectionFailure({
+            reason: FAILURE_DETAILS.NO_MEDIA
+          }));
+        }
+      }.bind(this));
     },
 
     /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/conversationStore.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/conversationStore.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/conversationStore.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/conversationStore.js	2015-05-25 20:42:46.000000000 +0000
@@ -2,8 +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/. */
 
-/* global loop:true */
-
 var loop = loop || {};
 loop.store = loop.store || {};
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/crypto.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/crypto.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/crypto.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/crypto.js	2015-05-25 20:42:46.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/. */
 
-/* global loop:true */
+/* global Components */
 
 var loop = loop || {};
 var inChrome = typeof Components != "undefined" && "utils" in Components;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/dispatcher.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/dispatcher.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/dispatcher.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/dispatcher.js	2015-05-25 20:42:46.000000000 +0000
@@ -2,8 +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/. */
 
-/* global loop:true */
-
 /**
  * The dispatcher for actions. This dispatches actions to stores registered
  * for those actions.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/feedbackApiClient.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/feedbackApiClient.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/feedbackApiClient.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/feedbackApiClient.js	2015-05-25 20:42:46.000000000 +0000
@@ -2,8 +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/. */
 
-/* global loop:true */
-
 var loop = loop || {};
 loop.FeedbackAPIClient = (function($, _) {
   "use strict";
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/feedbackStore.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/feedbackStore.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/feedbackStore.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/feedbackStore.js	2015-05-25 20:42:46.000000000 +0000
@@ -2,8 +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/. */
 
-/* global loop:true */
-
 var loop = loop || {};
 loop.store = loop.store || {};
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/feedbackViews.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/feedbackViews.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/feedbackViews.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/feedbackViews.js	2015-05-25 20:42:46.000000000 +0000
@@ -1,11 +1,7 @@
-/** @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 || {};
@@ -173,6 +169,7 @@
    */
   var FeedbackReceived = React.createClass({displayName: "FeedbackReceived",
     propTypes: {
+      noCloseText: React.PropTypes.bool,
       onAfterFeedbackReceived: React.PropTypes.func
     },
 
@@ -199,14 +196,24 @@
       }
     },
 
+    _renderCloseText: function() {
+      if (this.props.noCloseText) {
+        return null;
+      }
+
+      return (
+        React.createElement("p", {className: "info thank-you"}, 
+          l10n.get("feedback_window_will_close_in2", {
+            countdown: this.state.countdown,
+            num: this.state.countdown
+          }))
+      );
+    },
+
     render: function() {
       return (
         React.createElement(FeedbackLayout, {title: l10n.get("feedback_thank_you_heading")}, 
-          React.createElement("p", {className: "info thank-you"}, 
-            l10n.get("feedback_window_will_close_in2", {
-              countdown: this.state.countdown,
-              num: this.state.countdown
-            }))
+          this._renderCloseText()
         )
       );
     }
@@ -224,7 +231,8 @@
     propTypes: {
       onAfterFeedbackReceived: React.PropTypes.func,
       // Used by the UI showcase.
-      feedbackState: React.PropTypes.string
+      feedbackState: React.PropTypes.string,
+      noCloseText: React.PropTypes.bool
     },
 
     getInitialState: function() {
@@ -295,6 +303,7 @@
           }
           return (
             React.createElement(FeedbackReceived, {
+              noCloseText: this.props.noCloseText, 
               onAfterFeedbackReceived: this.props.onAfterFeedbackReceived})
           );
         }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/feedbackViews.jsx firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/feedbackViews.jsx
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/feedbackViews.jsx	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/feedbackViews.jsx	2015-05-25 20:42:46.000000000 +0000
@@ -1,11 +1,7 @@
-/** @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 || {};
@@ -173,6 +169,7 @@
    */
   var FeedbackReceived = React.createClass({
     propTypes: {
+      noCloseText: React.PropTypes.bool,
       onAfterFeedbackReceived: React.PropTypes.func
     },
 
@@ -199,14 +196,24 @@
       }
     },
 
+    _renderCloseText: function() {
+      if (this.props.noCloseText) {
+        return null;
+      }
+
+      return (
+        <p className="info thank-you">{
+          l10n.get("feedback_window_will_close_in2", {
+            countdown: this.state.countdown,
+            num: this.state.countdown
+          })}</p>
+      );
+    },
+
     render: function() {
       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>
+          {this._renderCloseText()}
         </FeedbackLayout>
       );
     }
@@ -224,7 +231,8 @@
     propTypes: {
       onAfterFeedbackReceived: React.PropTypes.func,
       // Used by the UI showcase.
-      feedbackState: React.PropTypes.string
+      feedbackState: React.PropTypes.string,
+      noCloseText: React.PropTypes.bool
     },
 
     getInitialState: function() {
@@ -295,6 +303,7 @@
           }
           return (
             <FeedbackReceived
+              noCloseText={this.props.noCloseText}
               onAfterFeedbackReceived={this.props.onAfterFeedbackReceived} />
           );
         }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/fxOSActiveRoomStore.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/fxOSActiveRoomStore.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/fxOSActiveRoomStore.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/fxOSActiveRoomStore.js	2015-05-25 20:42:46.000000000 +0000
@@ -2,8 +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/. */
 
-/* global loop:true */
-
 var loop = loop || {};
 loop.store = loop.store || {};
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/mixins.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/mixins.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/mixins.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/mixins.js	2015-05-25 20:42:46.000000000 +0000
@@ -2,8 +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/. */
 
-/* global loop:true */
-
 var loop = loop || {};
 loop.shared = loop.shared || {};
 loop.shared.mixins = (function() {
@@ -282,12 +280,9 @@
    * elements and handling updates of the media containers.
    */
   var MediaSetupMixin = {
-    _videoDimensionsCache: {
-      local: {},
-      remote: {}
-    },
 
     componentDidMount: function() {
+      this.resetDimensionsCache();
       rootObject.addEventListener("orientationchange", this.updateVideoContainer);
       rootObject.addEventListener("resize", this.updateVideoContainer);
     },
@@ -520,7 +515,7 @@
           this._bufferedUpdateVideo = null;
           var localStreamParent = this._getElement(".local .OT_publisher");
           var remoteStreamParent = this._getElement(".remote .OT_subscriber");
-          var screenShareStreamParent = this._getElement('.screen .OT_subscriber');
+          var screenShareStreamParent = this._getElement(".screen .OT_subscriber");
           if (localStreamParent) {
             localStreamParent.style.width = "100%";
           }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/models.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/models.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/models.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/models.js	2015-05-25 20:42:46.000000000 +0000
@@ -2,8 +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/. */
 
-/* global loop:true */
-
 var loop = loop || {};
 loop.shared = loop.shared || {};
 loop.shared.models = (function(l10n) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/otSdkDriver.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/otSdkDriver.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/otSdkDriver.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/otSdkDriver.js	2015-05-25 20:42:46.000000000 +0000
@@ -2,8 +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/. */
 
-/* global loop:true */
-
 var loop = loop || {};
 loop.OTSdkDriver = (function() {
 
@@ -27,6 +25,7 @@
     this.dispatcher = options.dispatcher;
     this.sdk = options.sdk;
 
+    this._useDataChannels = !!options.useDataChannels;
     this._isDesktop = !!options.isDesktop;
 
     if (this._isDesktop) {
@@ -79,11 +78,25 @@
      * Clones the publisher config into a new object, as the sdk modifies the
      * properties object.
      */
-    _getCopyPublisherConfig: function() {
+    get _getCopyPublisherConfig() {
       return _.extend({}, this.publisherConfig);
     },
 
     /**
+     * Returns the required data channel settings.
+     */
+    get _getDataChannelSettings() {
+      return {
+        channels: {
+          // We use a single channel for text. To make things simpler, we
+          // always send on the publisher channel, and receive on the subscriber
+          // channel.
+          text: {}
+        }
+      };
+    },
+
+    /**
      * Handles the setupStreamElements action. Saves the required data and
      * kicks off the initialising of the publisher.
      *
@@ -110,7 +123,7 @@
      */
     _publishLocalStreams: function() {
       this.publisher = this.sdk.initPublisher(this.getLocalElement(),
-        this._getCopyPublisherConfig());
+        _.extend(this._getDataChannelSettings, this._getCopyPublisherConfig));
       this.publisher.on("streamCreated", this._onLocalStreamCreated.bind(this));
       this.publisher.on("streamDestroyed", this._onLocalStreamDestroyed.bind(this));
       this.publisher.on("accessAllowed", this._onPublishComplete.bind(this));
@@ -167,7 +180,7 @@
         this._windowId = options.constraints.browserWindow;
       }
 
-      var config = _.extend(this._getCopyPublisherConfig(), options);
+      var config = _.extend(this._getCopyPublisherConfig, options);
 
       this.screenshare = this.sdk.initPublisher(this.getScreenShareElementFunc(),
         config);
@@ -243,6 +256,7 @@
       this.session.on("streamCreated", this._onRemoteStreamCreated.bind(this));
       this.session.on("streamDestroyed", this._onRemoteStreamDestroyed.bind(this));
       this.session.on("streamPropertyChanged", this._onStreamPropertyChanged.bind(this));
+      this.session.on("signal:readyForDataChannel", this._onReadyForDataChannel.bind(this));
 
       // This starts the actual session connection.
       this.session.connect(sessionData.apiKey, sessionData.sessionToken,
@@ -497,7 +511,7 @@
       var remoteElement = this.getScreenShareElementFunc();
 
       this.session.subscribe(stream,
-        remoteElement, this._getCopyPublisherConfig());
+        remoteElement, this._getCopyPublisherConfig);
     },
 
     /**
@@ -524,8 +538,9 @@
 
       var remoteElement = this.getRemoteElement();
 
-      this.session.subscribe(event.stream,
-        remoteElement, this._getCopyPublisherConfig());
+      this.subscriber = this.session.subscribe(event.stream,
+        remoteElement, this._getCopyPublisherConfig,
+        this._onRemoteSessionSubscribed.bind(this, event.stream.connection));
 
       this._subscribedRemoteStream = true;
       if (this._checkAllStreamsConnected()) {
@@ -535,6 +550,117 @@
     },
 
     /**
+     * Once a remote stream has been subscribed to, this triggers the data
+     * channel set-up routines. A data channel cannot be requested before this
+     * time as the peer connection is not set up.
+     *
+     * @param {OT.Connection} connection The OT connection class object.
+     * @param {OT.Error}      err        Indicates if there's been an error in
+     *                                    completing the subscribe.
+     */
+    _onRemoteSessionSubscribed: function(connection, err) {
+      if (err) {
+        console.error(err);
+        return;
+      }
+
+      if (this._useDataChannels) {
+        this.session.signal({
+          type: "readyForDataChannel",
+          to: connection
+        }, function(signalError) {
+          if (signalError) {
+            console.error(signalError);
+          }
+        });
+      }
+    },
+
+    /**
+     * Handles receiving the signal that the other end of the connection
+     * has subscribed to the stream and we're ready to setup the data channel.
+     *
+     * We get data channels for both the publisher and subscriber on reception
+     * of the signal, as it means that a) the remote client is setup for data
+     * channels, and b) that subscribing of streams has definitely completed
+     * for both clients.
+     *
+     * @param {OT.SignalEvent} event Details of the signal received.
+     */
+    _onReadyForDataChannel: function(event) {
+      // If we don't want data channels, just ignore the message. We haven't
+      // send the other side a message, so it won't display anything.
+      if (!this._useDataChannels) {
+        return;
+      }
+
+      // This won't work until a subscriber exists for this publisher
+      this.publisher._.getDataChannel("text", {}, function(err, channel) {
+        if (err) {
+          console.error(err);
+          return;
+        }
+
+        this._publisherChannel = channel;
+
+        channel.on({
+          close: function(event) {
+            // XXX We probably want to dispatch and handle this somehow.
+            console.log("Published data channel closed!");
+          }
+        });
+
+        this._checkDataChannelsAvailable();
+      }.bind(this));
+
+      this.subscriber._.getDataChannel("text", {}, function(err, channel) {
+        // Sends will queue until the channel is fully open.
+        if (err) {
+          console.error(err);
+          return;
+        }
+
+        channel.on({
+          message: function(event) {
+            try {
+              this.dispatcher.dispatch(
+                new sharedActions.ReceivedTextChatMessage(JSON.parse(event.data)));
+            } catch (ex) {
+              console.error("Failed to process incoming chat message", ex);
+            }
+          }.bind(this),
+
+          close: function(event) {
+            // XXX We probably want to dispatch and handle this somehow.
+            console.log("Subscribed data channel closed!");
+          }
+        });
+
+        this._subscriberChannel = channel;
+        this._checkDataChannelsAvailable();
+      }.bind(this));
+    },
+
+    /**
+     * Checks to see if all channels have been obtained, and if so it dispatches
+     * a notification to the stores to inform them.
+     */
+    _checkDataChannelsAvailable: function() {
+      if (this._publisherChannel && this._subscriberChannel) {
+        this.dispatcher.dispatch(new sharedActions.DataChannelsAvailable());
+      }
+    },
+
+    /**
+     * Sends a text chat message on the data channel.
+     *
+     * @param {String} message The message to send.
+     */
+    sendTextChatMessage: function(message) {
+      this._publisherChannel.send(JSON.stringify(message));
+    },
+
+    /**
      * Handles the event when the local stream is created.
      *
      * @param {StreamEvent} event The event details:
@@ -794,8 +920,8 @@
 
       this._connectionLengthNotedCalls++;
       if (this._debugTwoWayMediaTelemetry) {
-        console.log('Loop Telemetry: noted two-way media connection ' +
-          'in bucket: ', bucket);
+        console.log("Loop Telemetry: noted two-way media connection " +
+          "in bucket: ", bucket);
       }
     },
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/roomStates.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/roomStates.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/roomStates.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/roomStates.js	2015-05-25 20:42:46.000000000 +0000
@@ -2,8 +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/. */
 
-/* global loop:true */
-
 var loop = loop || {};
 loop.store = loop.store || {};
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/store.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/store.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/store.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/store.js	2015-05-25 20:42:46.000000000 +0000
@@ -2,8 +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/. */
 
-/* global loop:true */
-
 var loop = loop || {};
 loop.store = loop.store || {};
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/textChatStore.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/textChatStore.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/textChatStore.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/textChatStore.js	2015-05-25 20:42:46.000000000 +0000
@@ -0,0 +1,113 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+var loop = loop || {};
+loop.store = loop.store || {};
+
+loop.store.TextChatStore = (function() {
+  "use strict";
+
+  var sharedActions = loop.shared.actions;
+
+  var CHAT_MESSAGE_TYPES = loop.store.CHAT_MESSAGE_TYPES = {
+    RECEIVED: "recv",
+    SENT: "sent"
+  };
+
+  var CHAT_CONTENT_TYPES = loop.store.CHAT_CONTENT_TYPES = {
+    TEXT: "chat-text"
+  };
+
+  /**
+   * A store to handle text chats. The store has a message list that may
+   * contain different types of messages and data.
+   */
+  var TextChatStore = loop.store.createStore({
+    actions: [
+      "dataChannelsAvailable",
+      "receivedTextChatMessage",
+      "sendTextChatMessage"
+    ],
+
+    /**
+     * Initializes the store.
+     *
+     * @param  {Object} options An object containing options for this store.
+     *                          It should consist of:
+     *                          - sdkDriver: The sdkDriver to use for sending
+     *                                       messages.
+     */
+    initialize: function(options) {
+      options = options || {};
+
+      if (!options.sdkDriver) {
+        throw new Error("Missing option sdkDriver");
+      }
+
+      this._sdkDriver = options.sdkDriver;
+    },
+
+    /**
+     * Returns initial state data for this active room.
+     */
+    getInitialStoreState: function() {
+      return {
+        textChatEnabled: false,
+        // The messages currently received. Care should be taken when updating
+        // this - do not update the in-store array directly, but use a clone or
+        // separate array and then use setStoreState().
+        messageList: [],
+        length: 0
+      };
+    },
+
+    /**
+     * Handles information for when data channels are available - enables
+     * text chat.
+     */
+    dataChannelsAvailable: function() {
+      this.setStoreState({ textChatEnabled: true });
+    },
+
+    /**
+     * Handles received text chat messages.
+     *
+     * @param {sharedActions.ReceivedTextChatMessage} actionData
+     */
+    receivedTextChatMessage: function(actionData) {
+      // If we don't know how to deal with this content, then skip it
+      // as this version doesn't support it.
+      if (actionData.contentType != CHAT_CONTENT_TYPES.TEXT) {
+        return;
+      }
+      // We create a new list to avoid updating the store's state directly,
+      // which confuses the views.
+      var newList = this._storeState.messageList.concat({
+        type: CHAT_MESSAGE_TYPES.RECEIVED,
+        contentType: actionData.contentType,
+        message: actionData.message
+      });
+      this.setStoreState({ messageList: newList });
+    },
+
+    /**
+     * Handles sending of a chat message.
+     *
+     * @param {sharedActions.SendTextChatMessage} actionData
+     */
+    sendTextChatMessage: function(actionData) {
+      // We create a new list to avoid updating the store's state directly,
+      // which confuses the views.
+      var newList = this._storeState.messageList.concat({
+        type: CHAT_MESSAGE_TYPES.SENT,
+        contentType: actionData.contentType,
+        message: actionData.message
+      });
+      this._sdkDriver.sendTextChatMessage(actionData);
+      this.setStoreState({ messageList: newList });
+    }
+  });
+
+  return TextChatStore;
+})();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/textChatView.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/textChatView.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/textChatView.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/textChatView.js	2015-05-25 20:42:46.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/. */
+
+var loop = loop || {};
+loop.shared = loop.shared || {};
+loop.shared.views = loop.shared.views || {};
+loop.shared.views.TextChatView = (function(mozl10n) {
+  var sharedActions = loop.shared.actions;
+  var CHAT_MESSAGE_TYPES = loop.store.CHAT_MESSAGE_TYPES;
+  var CHAT_CONTENT_TYPES = loop.store.CHAT_CONTENT_TYPES;
+
+  /**
+   * Renders an individual entry for the text chat entries view.
+   */
+  var TextChatEntry = React.createClass({displayName: "TextChatEntry",
+    mixins: [React.addons.PureRenderMixin],
+
+    propTypes: {
+      message: React.PropTypes.string.isRequired,
+      type: React.PropTypes.string.isRequired
+    },
+
+    render: function() {
+      var classes = React.addons.classSet({
+        "text-chat-entry": true,
+        "received": this.props.type === CHAT_MESSAGE_TYPES.RECEIVED
+      });
+
+      return (
+        React.createElement("div", {className: classes}, 
+          this.props.message
+        )
+      );
+    }
+  });
+
+  /**
+   * Manages the text entries in the chat entries view. This is split out from
+   * TextChatView so that scrolling can be managed more efficiently - this
+   * component only updates when the message list is changed.
+   */
+  var TextChatEntriesView = React.createClass({displayName: "TextChatEntriesView",
+    mixins: [React.addons.PureRenderMixin],
+
+    propTypes: {
+      messageList: React.PropTypes.array.isRequired
+    },
+
+    componentWillUpdate: function() {
+      var node = this.getDOMNode();
+      // Scroll only if we're right at the bottom of the display.
+      this.shouldScroll = node.scrollHeight === node.scrollTop + node.clientHeight;
+    },
+
+    componentDidUpdate: function() {
+      if (this.shouldScroll) {
+        // This ensures the paint is complete.
+        window.requestAnimationFrame(function() {
+          var node = this.getDOMNode();
+          node.scrollTop = node.scrollHeight - node.clientHeight;
+        }.bind(this));
+      }
+    },
+
+    render: function() {
+      return (
+        React.createElement("div", {className: "text-chat-entries"}, 
+          
+            this.props.messageList.map(function(entry, i) {
+              return (
+                React.createElement(TextChatEntry, {key: i, 
+                               message: entry.message, 
+                               type: entry.type})
+              );
+            }, this)
+          
+        )
+      );
+    }
+  });
+
+  /**
+   * Displays the text chat view. This includes the text chat messages as well
+   * as a field for entering new messages.
+   */
+  var TextChatView = React.createClass({displayName: "TextChatView",
+    mixins: [
+      React.addons.LinkedStateMixin,
+      loop.store.StoreMixin("textChatStore")
+    ],
+
+    propTypes: {
+      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired
+    },
+
+    getInitialState: function() {
+      return _.extend({
+        messageDetail: ""
+      }, this.getStoreState());
+    },
+
+    /**
+     * Handles a key being pressed - looking for the return key for submitting
+     * the form.
+     *
+     * @param {Object} event The DOM event.
+     */
+    handleKeyDown: function(event) {
+      if (event.which === 13) {
+        this.handleFormSubmit(event);
+      }
+    },
+
+    /**
+     * Handles submitting of the form - dispatches a send text chat message.
+     *
+     * @param {Object} event The DOM event.
+     */
+    handleFormSubmit: function(event) {
+      event.preventDefault();
+
+      this.props.dispatcher.dispatch(new sharedActions.SendTextChatMessage({
+        contentType: CHAT_CONTENT_TYPES.TEXT,
+        message: this.state.messageDetail
+      }));
+
+      // Reset the form to empty, ready for the next message.
+      this.setState({ messageDetail: "" });
+    },
+
+    render: function() {
+      if (!this.state.textChatEnabled) {
+        return null;
+      }
+
+      return (
+        React.createElement("div", {className: "text-chat-view"}, 
+          React.createElement(TextChatEntriesView, {messageList: this.state.messageList}), 
+          React.createElement("div", {className: "text-chat-box"}, 
+            React.createElement("form", {onSubmit: this.handleFormSubmit}, 
+              React.createElement("input", {type: "text", 
+                     onKeyDown: this.handleKeyDown, 
+                     valueLink: this.linkState("messageDetail")})
+            )
+          )
+        )
+      );
+    }
+  });
+
+  return TextChatView;
+})(navigator.mozL10n || document.mozL10n);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/textChatView.jsx firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/textChatView.jsx
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/textChatView.jsx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/textChatView.jsx	2015-05-25 20:42:46.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/. */
+
+var loop = loop || {};
+loop.shared = loop.shared || {};
+loop.shared.views = loop.shared.views || {};
+loop.shared.views.TextChatView = (function(mozl10n) {
+  var sharedActions = loop.shared.actions;
+  var CHAT_MESSAGE_TYPES = loop.store.CHAT_MESSAGE_TYPES;
+  var CHAT_CONTENT_TYPES = loop.store.CHAT_CONTENT_TYPES;
+
+  /**
+   * Renders an individual entry for the text chat entries view.
+   */
+  var TextChatEntry = React.createClass({
+    mixins: [React.addons.PureRenderMixin],
+
+    propTypes: {
+      message: React.PropTypes.string.isRequired,
+      type: React.PropTypes.string.isRequired
+    },
+
+    render: function() {
+      var classes = React.addons.classSet({
+        "text-chat-entry": true,
+        "received": this.props.type === CHAT_MESSAGE_TYPES.RECEIVED
+      });
+
+      return (
+        <div className={classes}>
+          {this.props.message}
+        </div>
+      );
+    }
+  });
+
+  /**
+   * Manages the text entries in the chat entries view. This is split out from
+   * TextChatView so that scrolling can be managed more efficiently - this
+   * component only updates when the message list is changed.
+   */
+  var TextChatEntriesView = React.createClass({
+    mixins: [React.addons.PureRenderMixin],
+
+    propTypes: {
+      messageList: React.PropTypes.array.isRequired
+    },
+
+    componentWillUpdate: function() {
+      var node = this.getDOMNode();
+      // Scroll only if we're right at the bottom of the display.
+      this.shouldScroll = node.scrollHeight === node.scrollTop + node.clientHeight;
+    },
+
+    componentDidUpdate: function() {
+      if (this.shouldScroll) {
+        // This ensures the paint is complete.
+        window.requestAnimationFrame(function() {
+          var node = this.getDOMNode();
+          node.scrollTop = node.scrollHeight - node.clientHeight;
+        }.bind(this));
+      }
+    },
+
+    render: function() {
+      return (
+        <div className="text-chat-entries">
+          {
+            this.props.messageList.map(function(entry, i) {
+              return (
+                <TextChatEntry key={i}
+                               message={entry.message}
+                               type={entry.type} />
+              );
+            }, this)
+          }
+        </div>
+      );
+    }
+  });
+
+  /**
+   * Displays the text chat view. This includes the text chat messages as well
+   * as a field for entering new messages.
+   */
+  var TextChatView = React.createClass({
+    mixins: [
+      React.addons.LinkedStateMixin,
+      loop.store.StoreMixin("textChatStore")
+    ],
+
+    propTypes: {
+      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired
+    },
+
+    getInitialState: function() {
+      return _.extend({
+        messageDetail: ""
+      }, this.getStoreState());
+    },
+
+    /**
+     * Handles a key being pressed - looking for the return key for submitting
+     * the form.
+     *
+     * @param {Object} event The DOM event.
+     */
+    handleKeyDown: function(event) {
+      if (event.which === 13) {
+        this.handleFormSubmit(event);
+      }
+    },
+
+    /**
+     * Handles submitting of the form - dispatches a send text chat message.
+     *
+     * @param {Object} event The DOM event.
+     */
+    handleFormSubmit: function(event) {
+      event.preventDefault();
+
+      this.props.dispatcher.dispatch(new sharedActions.SendTextChatMessage({
+        contentType: CHAT_CONTENT_TYPES.TEXT,
+        message: this.state.messageDetail
+      }));
+
+      // Reset the form to empty, ready for the next message.
+      this.setState({ messageDetail: "" });
+    },
+
+    render: function() {
+      if (!this.state.textChatEnabled) {
+        return null;
+      }
+
+      return (
+        <div className="text-chat-view">
+          <TextChatEntriesView messageList={this.state.messageList} />
+          <div className="text-chat-box">
+            <form onSubmit={this.handleFormSubmit}>
+              <input type="text"
+                     onKeyDown={this.handleKeyDown}
+                     valueLink={this.linkState("messageDetail")} />
+            </form>
+          </div>
+        </div>
+      );
+    }
+  });
+
+  return TextChatView;
+})(navigator.mozL10n || document.mozL10n);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/utils.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/utils.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/utils.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/utils.js	2015-05-25 20:42:46.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/. */
 
-/* global loop:true */
+/* global Components */
 
 var loop = loop || {};
 loop.shared = loop.shared || {};
@@ -11,6 +11,32 @@
 (function() {
   "use strict";
 
+  /**
+   * Root object, by default set to window if we're not in chrome code.
+   * @type {DOMWindow|Object}
+   */
+  var rootObject = inChrome ? {} : window;
+  /**
+   * Root navigator, by default set to navigator if we're not in chrome code.
+   * @type {Navigator|Object}
+   */
+  var rootNavigator = inChrome ? {} : navigator;
+
+  /**
+   * Sets new root objects.  This is useful for testing native DOM events, and also
+   * so we can easily stub items like navigator.mediaDevices.
+   * can fake them. In beforeEach(), loop.shared.utils.setRootObjects is used to
+   * substitute fake objects, and in afterEach(), the real window object is
+   * replaced.
+   *
+   * @param {Object} windowObj The fake window object, undefined to use window.
+   * @param {Object} navigatorObj The fake navigator object, undefined to use navigator.
+   */
+  function setRootObjects(windowObj, navigatorObj) {
+    rootObject = windowObj || window;
+    rootNavigator = navigatorObj || navigator;
+  }
+
   var mozL10n;
   if (inChrome) {
     this.EXPORTED_SYMBOLS = ["utils"];
@@ -48,6 +74,7 @@
 
   var FAILURE_DETAILS = {
     MEDIA_DENIED: "reason-media-denied",
+    NO_MEDIA: "reason-no-media",
     UNABLE_TO_PUBLISH_MEDIA: "unable-to-publish-media",
     COULD_NOT_CONNECT: "reason-could-not-connect",
     NETWORK_DISCONNECTED: "reason-network-disconnected",
@@ -109,8 +136,8 @@
   }
 
   function isChrome(platform) {
-    return platform.toLowerCase().indexOf('chrome') > -1 ||
-           platform.toLowerCase().indexOf('chromium') > -1;
+    return platform.toLowerCase().indexOf("chrome") > -1 ||
+           platform.toLowerCase().indexOf("chromium") > -1;
   }
 
   function isFirefox(platform) {
@@ -127,8 +154,8 @@
   }
 
   function isOpera(platform) {
-    return platform.toLowerCase().indexOf('opera') > -1 ||
-           platform.toLowerCase().indexOf('opr') > -1;
+    return platform.toLowerCase().indexOf("opera") > -1 ||
+           platform.toLowerCase().indexOf("opr") > -1;
   }
 
   /**
@@ -280,6 +307,40 @@
   };
 
   /**
+   * Determines if the user has any audio devices installed.
+   *
+   * @param  {Function} callback Called with a boolean which is true if there
+   *                             are audio devices present.
+   */
+  function hasAudioDevices(callback) {
+    // mediaDevices is the official API for the spec.
+    if ("mediaDevices" in rootNavigator) {
+      rootNavigator.mediaDevices.enumerateDevices().then(function(result) {
+        function checkForInput(device) {
+          return device.kind === "audioinput";
+        }
+
+        callback(result.some(checkForInput));
+      }).catch(function() {
+        callback(false);
+      });
+    // MediaStreamTrack is the older version of the API, implemented originally
+    // by Google Chrome.
+    } else if ("MediaStreamTrack" in rootObject) {
+      rootObject.MediaStreamTrack.getSources(function(result) {
+        function checkForInput(device) {
+          return device.kind === "audio";
+        }
+
+        callback(result.some(checkForInput));
+      });
+    } else {
+      // We don't know, so assume true.
+      callback(true);
+    }
+  }
+
+  /**
    * Helper to allow getting some of the location data in a way that's compatible
    * with stubbing for unit tests.
    */
@@ -671,6 +732,7 @@
     STREAM_PROPERTIES: STREAM_PROPERTIES,
     SCREEN_SHARE_STATES: SCREEN_SHARE_STATES,
     ROOM_INFO_FAILURES: ROOM_INFO_FAILURES,
+    setRootObjects: setRootObjects,
     composeCallUrlEmail: composeCallUrlEmail,
     formatDate: formatDate,
     formatURL: formatURL,
@@ -683,6 +745,7 @@
     isFirefoxOS: isFirefoxOS,
     isOpera: isOpera,
     getUnsupportedPlatform: getUnsupportedPlatform,
+    hasAudioDevices: hasAudioDevices,
     locationData: locationData,
     atob: atob,
     btoa: btoa,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/validate.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/validate.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/validate.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/validate.js	2015-05-25 20:42:46.000000000 +0000
@@ -2,8 +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/. */
 
-/* jshint unused:false */
-
 var loop = loop || {};
 loop.validate = (function() {
   "use strict";
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/views.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/views.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/views.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/views.js	2015-05-25 20:42:46.000000000 +0000
@@ -1,11 +1,7 @@
-/** @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 = (function(_, l10n) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/views.jsx firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/views.jsx
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/views.jsx	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/views.jsx	2015-05-25 20:42:46.000000000 +0000
@@ -1,11 +1,7 @@
-/** @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 = (function(_, l10n) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/websocket.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/websocket.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/js/websocket.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/js/websocket.js	2015-05-25 20:42:46.000000000 +0000
@@ -2,8 +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/. */
 
-/* global loop:true */
-
 var loop = loop || {};
 loop.CallConnectionWebSocket = (function() {
   "use strict";
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/libs/sdk-content/css/ot.css firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/libs/sdk-content/css/ot.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/libs/sdk-content/css/ot.css	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/libs/sdk-content/css/ot.css	2015-05-25 20:42:46.000000000 +0000
@@ -865,6 +865,12 @@
   display: block;
 }
 
+.OT_audio-only.OT_publisher .OT_video-element,
+.OT_audio-only.OT_subscriber .OT_video-element {
+  display: none;
+}
+
+
 .OT_video-disabled-indicator {
   opacity: 1;
   border: none;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/libs/sdk.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/libs/sdk.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/content/shared/libs/sdk.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/content/shared/libs/sdk.js	2015-05-25 20:42:46.000000000 +0000
@@ -1,12 +1,12 @@
 /**
- * @license  OpenTok JavaScript Library v2.5.0 17447b9 HEAD
+ * @license  OpenTok JavaScript Library v2.5.1 23265fa HEAD
  * http://www.tokbox.com/
  *
  * Copyright (c) 2014 TokBox, Inc.
  * Released under the MIT license
  * http://opensource.org/licenses/MIT
  *
- * Date: March 02 09:16:29 2015
+ * Date: April 13 06:37:42 2015
  */
 
 
@@ -15,12 +15,12 @@
 !(function(window, OTHelpers, undefined) {
 
 /**
- * @license  Common JS Helpers on OpenTok 0.3.0 f4918b4 2014Q4-2.2.patch.1
+ * @license  Common JS Helpers on OpenTok 0.3.0 058dfa5 2015Q1
  * http://www.tokbox.com/
  *
  * Copyright (c) 2015 TokBox, Inc.
  *
- * Date: March 02 09:16:17 2015
+ * Date: April 13 06:37:28 2015
  *
  */
 
@@ -93,7 +93,9 @@
       results = context.querySelectorAll(selector);
     }
   }
-  else if (selector.nodeType || window.XMLHttpRequest && selector instanceof XMLHttpRequest) {
+  else if (selector &&
+            (selector.nodeType || window.XMLHttpRequest && selector instanceof XMLHttpRequest)) {
+
     // allow OTHelpers(DOMNode) and OTHelpers(xmlHttpRequest)
     results = [selector];
     context = selector;
@@ -554,6 +556,31 @@
   return result;
 };
 
+// tb_require('../../../helpers.js')
+
+/* exported EventableEvent */
+
+OTHelpers.Event = function() {
+  return function (type, cancelable) {
+    this.type = type;
+    this.cancelable = cancelable !== undefined ? cancelable : true;
+
+    var _defaultPrevented = false;
+
+    this.preventDefault = function() {
+      if (this.cancelable) {
+        _defaultPrevented = true;
+      } else {
+        OTHelpers.warn('Event.preventDefault :: Trying to preventDefault ' +
+          'on an Event that isn\'t cancelable');
+      }
+    };
+
+    this.isDefaultPrevented = function() {
+      return _defaultPrevented;
+    };
+  };
+};
 /*jshint browser:true, smarttabs:true*/
 
 // tb_require('../../helpers.js')
@@ -748,2837 +775,4445 @@
   OTHelpers.uuid = uuid;
 
 }());
-/*jshint browser:true, smarttabs:true */
-
 // tb_require('../helpers.js')
 
+/*!
+ * @overview RSVP - a tiny implementation of Promises/A+.
+ * @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors
+ * @license   Licensed under MIT license
+ *            See https://raw.githubusercontent.com/tildeio/rsvp.js/master/LICENSE
+ * @version   3.0.16
+ */
 
-var getErrorLocation;
+/// OpenTok: Modified for inclusion in OpenTok. Disable all the module stuff and
+/// just mount it on OTHelpers. Also tweaked some of the linting stuff as it conflicted
+/// with our linter settings.
 
-// Properties that we'll acknowledge from the JS Error object
-var safeErrorProps = [
-  'description',
-  'fileName',
-  'lineNumber',
-  'message',
-  'name',
-  'number',
-  'stack'
-];
+/* jshint ignore:start */
+(function() {
+    'use strict';
+    function lib$rsvp$utils$$objectOrFunction(x) {
+      return typeof x === 'function' || (typeof x === 'object' && x !== null);
+    }
 
+    function lib$rsvp$utils$$isFunction(x) {
+      return typeof x === 'function';
+    }
 
-// OTHelpers.Error
-//
-// A construct to contain error information that also helps with extracting error
-// context, such as stack trace.
-//
-// @constructor
-// @memberof OTHelpers
-// @method Error
-//
-// @param {String} message
-//      Optional. The error message
-//
-// @param {Object} props
-//      Optional. A dictionary of properties containing extra Error info.
-//
-//
-// @example Create a simple error with juts a custom message
-//   var error = new OTHelpers.Error('Something Broke!');
-//   error.message === 'Something Broke!';
-//
-// @example Create an Error with a message and a name
-//   var error = new OTHelpers.Error('Something Broke!', 'FooError');
-//   error.message === 'Something Broke!';
-//   error.name === 'FooError';
-//
-// @example Create an Error with a message, name, and custom properties
-//   var error = new OTHelpers.Error('Something Broke!', 'FooError', {
-//     foo: 'bar',
-//     listOfImportantThings: [1,2,3,4]
-//   });
-//   error.message === 'Something Broke!';
-//   error.name === 'FooError';
-//   error.foo === 'bar';
-//   error.listOfImportantThings == [1,2,3,4];
-//
-// @example Create an Error from a Javascript Error
-//   var error = new OTHelpers.Error(domSyntaxError);
-//   error.message === domSyntaxError.message;
-//   error.name === domSyntaxError.name === 'SyntaxError';
-//   // ...continues for each properties of domSyntaxError
-//
-// @references
-// * https://code.google.com/p/v8/wiki/JavaScriptStackTraceApi
-// * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error/Stack
-// * http://www.w3.org/TR/dom/#interface-domerror
-//
-//
-// @todo
-// * update usage in OTMedia
-// * replace error handling in OT.js
-// * normalise stack behaviour under Chrome/Node/Safari with other browsers
-// * unit test for stack parsing
-//
-//
-OTHelpers.Error = function (message, name, props) {
-  switch (arguments.length) {
-  case 1:
-    if ($.isObject(message)) {
-      props = message;
-      name = void 0;
-      message = void 0;
+    function lib$rsvp$utils$$isMaybeThenable(x) {
+      return typeof x === 'object' && x !== null;
     }
-    // Otherwise it's the message
-    break;
 
-  case 2:
-    if ($.isObject(name)) {
-      props = name;
-      name = void 0;
+    var lib$rsvp$utils$$_isArray;
+    if (!Array.isArray) {
+      lib$rsvp$utils$$_isArray = function (x) {
+        return Object.prototype.toString.call(x) === '[object Array]';
+      };
+    } else {
+      lib$rsvp$utils$$_isArray = Array.isArray;
     }
-    // Otherwise name is actually the name
 
-    break;
-  }
+    var lib$rsvp$utils$$isArray = lib$rsvp$utils$$_isArray;
 
-  if ( props instanceof Error) {
-    // Special handling of this due to Chrome weirdness. It seems that
-    // properties of the Error object, and it's children, are not
-    // enumerable in Chrome?
-    for (var i = 0, num = safeErrorProps.length; i < num; ++i) {
-      this[safeErrorProps[i]] = props[safeErrorProps[i]];
-    }
-  }
-  else if ( $.isObject(props)) {
-    // Use an custom properties that are provided
-    for (var key in props) {
-      if (props.hasOwnProperty(key)) {
-        this[key] = props[key];
-      }
-    }
-  }
+    var lib$rsvp$utils$$now = Date.now || function() { return new Date().getTime(); };
 
-  // If any of the fundamental properties are missing then try and
-  // extract them.
-  if ( !(this.fileName && this.lineNumber && this.columnNumber && this.stack) ) {
-    var err = getErrorLocation();
+    function lib$rsvp$utils$$F() { }
 
-    if (!this.fileName && err.fileName) {
-      this.fileName = err.fileName;
-    }
+    var lib$rsvp$utils$$o_create = (Object.create || function (o) {
+      if (arguments.length > 1) {
+        throw new Error('Second argument not supported');
+      }
+      if (typeof o !== 'object') {
+        throw new TypeError('Argument must be an object');
+      }
+      lib$rsvp$utils$$F.prototype = o;
+      return new lib$rsvp$utils$$F();
+    });
+    function lib$rsvp$events$$indexOf(callbacks, callback) {
+      for (var i=0, l=callbacks.length; i<l; i++) {
+        if (callbacks[i] === callback) { return i; }
+      }
 
-    if (!this.lineNumber && err.lineNumber) {
-      this.lineNumber = err.lineNumber;
+      return -1;
     }
 
-    if (!this.columnNumber && err.columnNumber) {
-      this.columnNumber = err.columnNumber;
-    }
+    function lib$rsvp$events$$callbacksFor(object) {
+      var callbacks = object._promiseCallbacks;
 
-    if (!this.stack && err.stack) {
-      this.stack = err.stack;
+      if (!callbacks) {
+        callbacks = object._promiseCallbacks = {};
+      }
+
+      return callbacks;
     }
-  }
 
-  if (!this.message && message) this.message = message;
-  if (!this.name && name) this.name = name;
-};
+    var lib$rsvp$events$$default = {
 
-OTHelpers.Error.prototype.toString =
-OTHelpers.Error.prototype.valueOf = function() {
-  var locationDetails = '';
-  if (this.fileName) locationDetails += ' ' + this.fileName;
-  if (this.lineNumber) {
-    locationDetails += ' ' + this.lineNumber;
-    if (this.columnNumber) locationDetails += ':' + this.columnNumber;
-  }
+      /**
+        `RSVP.EventTarget.mixin` extends an object with EventTarget methods. For
+        Example:
 
-  return '<' + (this.name ? this.name + ' ' : '') + this.message + locationDetails + '>';
-};
+        ```javascript
+        var object = {};
 
+        RSVP.EventTarget.mixin(object);
 
-// Normalise err.stack so that it is the same format as the other browsers
-// We skip the first two frames so that we don't capture getErrorLocation() and
-// the callee.
-//
-// Used by Environments that support the StackTrace API. (Chrome, Node, Opera)
-//
-var prepareStackTrace = function prepareStackTrace (_, stack){
-  return $.map(stack.slice(2), function(frame) {
-    var _f = {
-      fileName: frame.getFileName(),
-      linenumber: frame.getLineNumber(),
-      columnNumber: frame.getColumnNumber()
-    };
+        object.on('finished', function(event) {
+          // handle event
+        });
 
-    if (frame.getFunctionName()) _f.functionName = frame.getFunctionName();
-    if (frame.getMethodName()) _f.methodName = frame.getMethodName();
-    if (frame.getThis()) _f.self = frame.getThis();
+        object.trigger('finished', { detail: value });
+        ```
 
-    return _f;
-  });
-};
+        `EventTarget.mixin` also works with prototypes:
 
+        ```javascript
+        var Person = function() {};
+        RSVP.EventTarget.mixin(Person.prototype);
 
-// Black magic to retrieve error location info for various environments
-getErrorLocation = function getErrorLocation () {
-  var info = {},
-      callstack,
-      errLocation,
-      err;
+        var yehuda = new Person();
+        var tom = new Person();
 
-  switch ($.env.name) {
-  case 'Firefox':
-  case 'Safari':
-  case 'IE':
+        yehuda.on('poke', function(event) {
+          console.log('Yehuda says OW');
+        });
 
-    if ($.env.name === 'IE') {
-      err = new Error();
-    }
-    else {
-      try {
-        window.call.js.is.explody;
-      }
-      catch(e) { err = e; }
-    }
+        tom.on('poke', function(event) {
+          console.log('Tom says OW');
+        });
 
-    callstack = err.stack.split('\n');
+        yehuda.trigger('poke');
+        tom.trigger('poke');
+        ```
+
+        @method mixin
+        @for RSVP.EventTarget
+        @private
+        @param {Object} object object to extend with EventTarget methods
+      */
+      'mixin': function(object) {
+        object['on']      = this['on'];
+        object['off']     = this['off'];
+        object['trigger'] = this['trigger'];
+        object._promiseCallbacks = undefined;
+        return object;
+      },
 
-    //Remove call to getErrorLocation() and the callee
-    callstack.shift();
-    callstack.shift();
+      /**
+        Registers a callback to be executed when `eventName` is triggered
 
-    info.stack = callstack;
+        ```javascript
+        object.on('event', function(eventInfo){
+          // handle the event
+        });
 
-    if ($.env.name === 'IE') {
-      // IE also includes the error message in it's stack trace
-      info.stack.shift();
+        object.trigger('event');
+        ```
 
-      // each line begins with some amounts of spaces and 'at', we remove
-      // these to normalise with the other browsers.
-      info.stack = $.map(callstack, function(call) {
-        return call.replace(/^\s+at\s+/g, '');
-      });
-    }
+        @method on
+        @for RSVP.EventTarget
+        @private
+        @param {String} eventName name of the event to listen for
+        @param {Function} callback function to be called when the event is triggered.
+      */
+      'on': function(eventName, callback) {
+        var allCallbacks = lib$rsvp$events$$callbacksFor(this), callbacks;
 
-    errLocation = /@(.+?):([0-9]+)(:([0-9]+))?$/.exec(callstack[0]);
-    if (errLocation) {
-      info.fileName = errLocation[1];
-      info.lineNumber = parseInt(errLocation[2], 10);
-      if (errLocation.length > 3) info.columnNumber = parseInt(errLocation[4], 10);
-    }
-    break;
+        callbacks = allCallbacks[eventName];
 
-  case 'Chrome':
-  case 'Node':
-  case 'Opera':
-    var currentPST = Error.prepareStackTrace;
-    Error.prepareStackTrace = prepareStackTrace;
-    err = new Error();
-    info.stack = err.stack;
-    Error.prepareStackTrace = currentPST;
+        if (!callbacks) {
+          callbacks = allCallbacks[eventName] = [];
+        }
 
-    var topFrame = info.stack[0];
-    info.lineNumber = topFrame.lineNumber;
-    info.columnNumber = topFrame.columnNumber;
-    info.fileName = topFrame.fileName;
-    if (topFrame.functionName) info.functionName = topFrame.functionName;
-    if (topFrame.methodName) info.methodName = topFrame.methodName;
-    if (topFrame.self) info.self = topFrame.self;
-    break;
+        if (lib$rsvp$events$$indexOf(callbacks, callback) === -1) {
+          callbacks.push(callback);
+        }
+      },
 
-  default:
-    err = new Error();
-    if (err.stack) info.stack = err.stack.split('\n');
-    break;
-  }
+      /**
+        You can use `off` to stop firing a particular callback for an event:
 
-  if (err.message) info.message = err.message;
-  return info;
-};
+        ```javascript
+        function doStuff() { // do stuff! }
+        object.on('stuff', doStuff);
+
+        object.trigger('stuff'); // doStuff will be called
+
+        // Unregister ONLY the doStuff callback
+        object.off('stuff', doStuff);
+        object.trigger('stuff'); // doStuff will NOT be called
+        ```
+
+        If you don't pass a `callback` argument to `off`, ALL callbacks for the
+        event will not be executed when the event fires. For example:
+
+        ```javascript
+        var callback1 = function(){};
+        var callback2 = function(){};
+
+        object.on('stuff', callback1);
+        object.on('stuff', callback2);
+
+        object.trigger('stuff'); // callback1 and callback2 will be executed.
+
+        object.off('stuff');
+        object.trigger('stuff'); // callback1 and callback2 will not be executed!
+        ```
+
+        @method off
+        @for RSVP.EventTarget
+        @private
+        @param {String} eventName event to stop listening to
+        @param {Function} callback optional argument. If given, only the function
+        given will be removed from the event's callback queue. If no `callback`
+        argument is given, all callbacks will be removed from the event's callback
+        queue.
+      */
+      'off': function(eventName, callback) {
+        var allCallbacks = lib$rsvp$events$$callbacksFor(this), callbacks, index;
 
+        if (!callback) {
+          allCallbacks[eventName] = [];
+          return;
+        }
 
-/*jshint browser:true, smarttabs:true*/
-/* global process */
+        callbacks = allCallbacks[eventName];
 
-// tb_require('../helpers.js')
+        index = lib$rsvp$events$$indexOf(callbacks, callback);
 
+        if (index !== -1) { callbacks.splice(index, 1); }
+      },
 
-// OTHelpers.env
-//
-// Contains information about the current environment.
-// * **OTHelpers.env.name** The name of the Environment (Chrome, FF, Node, etc)
-// * **OTHelpers.env.version** Usually a Float, except in Node which uses a String
-// * **OTHelpers.env.userAgent** The raw user agent
-// * **OTHelpers.env.versionGreaterThan** A helper method that returns true if the
-// current version is greater than the argument
-//
-// Example
-//     if (OTHelpers.env.versionGreaterThan('0.10.30')) {
-//       // do something
-//     }
-//
-(function() {
-  // @todo make exposing userAgent unnecessary
-  var version = -1;
+      /**
+        Use `trigger` to fire custom events. For example:
 
-  // Returns true if otherVersion is greater than the current environment
-  // version.
-  var versionGEThan = function versionGEThan (otherVersion) {
-    if (otherVersion === version) return true;
+        ```javascript
+        object.on('foo', function(){
+          console.log('foo event happened!');
+        });
+        object.trigger('foo');
+        // 'foo event happened!' logged to the console
+        ```
+
+        You can also pass a value as a second argument to `trigger` that will be
+        passed as an argument to all event listeners for the event:
+
+        ```javascript
+        object.on('foo', function(value){
+          console.log(value.name);
+        });
 
-    if (typeof(otherVersion) === 'number' && typeof(version) === 'number') {
-      return otherVersion > version;
-    }
+        object.trigger('foo', { name: 'bar' });
+        // 'bar' logged to the console
+        ```
 
-    // The versions have multiple components (i.e. 0.10.30) and
-    // must be compared piecewise.
-    // Note: I'm ignoring the case where one version has multiple
-    // components and the other doesn't.
-    var v1 = otherVersion.split('.'),
-        v2 = version.split('.'),
-        versionLength = (v1.length > v2.length ? v2 : v1).length;
+        @method trigger
+        @for RSVP.EventTarget
+        @private
+        @param {String} eventName name of the event to be triggered
+        @param {Any} options optional value to be passed to any event handlers for
+        the given `eventName`
+      */
+      'trigger': function(eventName, options) {
+        var allCallbacks = lib$rsvp$events$$callbacksFor(this), callbacks, callback;
 
-    for (var i = 0; i < versionLength; ++i) {
-      if (parseInt(v1[i], 10) > parseInt(v2[i], 10)) {
-        return true;
-      }
-    }
+        if (callbacks = allCallbacks[eventName]) {
+          // Don't cache the callbacks.length since it may grow
+          for (var i=0; i<callbacks.length; i++) {
+            callback = callbacks[i];
 
-    // Special case, v1 has extra components but the initial components
-    // were identical, we assume this means newer but it might also mean
-    // that someone changed versioning systems.
-    if (i < v1.length) {
-      return true;
-    }
+            callback(options);
+          }
+        }
+      }
+    };
 
-    return false;
-  };
+    var lib$rsvp$config$$config = {
+      instrument: false
+    };
 
-  var env = function() {
-    if (typeof(process) !== 'undefined' &&
-        typeof(process.versions) !== 'undefined' &&
-        typeof(process.versions.node) === 'string') {
+    lib$rsvp$events$$default['mixin'](lib$rsvp$config$$config);
 
-      version = process.versions.node;
-      if (version.substr(1) === 'v') version = version.substr(1);
+    function lib$rsvp$config$$configure(name, value) {
+      if (name === 'onerror') {
+        // handle for legacy users that expect the actual
+        // error to be passed to their function added via
+        // `RSVP.configure('onerror', someFunctionHere);`
+        lib$rsvp$config$$config['on']('error', value);
+        return;
+      }
 
-      // Special casing node to avoid gating window.navigator.
-      // Version will be a string rather than a float.
-      return {
-        name: 'Node',
-        version: version,
-        userAgent: 'Node ' + version,
-        iframeNeedsLoad: false,
-        versionGreaterThan: versionGEThan
-      };
+      if (arguments.length === 2) {
+        lib$rsvp$config$$config[name] = value;
+      } else {
+        return lib$rsvp$config$$config[name];
+      }
     }
 
-    var userAgent = window.navigator.userAgent.toLowerCase(),
-        appName = window.navigator.appName,
-        navigatorVendor,
-        name = 'unknown';
-
-    if (userAgent.indexOf('opera') > -1 || userAgent.indexOf('opr') > -1) {
-      name = 'Opera';
+    var lib$rsvp$instrument$$queue = [];
 
-      if (/opr\/([0-9]{1,}[\.0-9]{0,})/.exec(userAgent) !== null) {
-        version = parseFloat( RegExp.$1 );
-      }
+    function lib$rsvp$instrument$$scheduleFlush() {
+      setTimeout(function() {
+        var entry;
+        for (var i = 0; i < lib$rsvp$instrument$$queue.length; i++) {
+          entry = lib$rsvp$instrument$$queue[i];
 
-    } else if (userAgent.indexOf('firefox') > -1)   {
-      name = 'Firefox';
+          var payload = entry.payload;
 
-      if (/firefox\/([0-9]{1,}[\.0-9]{0,})/.exec(userAgent) !== null) {
-        version = parseFloat( RegExp.$1 );
-      }
+          payload.guid = payload.key + payload.id;
+          payload.childGuid = payload.key + payload.childId;
+          if (payload.error) {
+            payload.stack = payload.error.stack;
+          }
 
-    } else if (appName === 'Microsoft Internet Explorer') {
-      // IE 10 and below
-      name = 'IE';
+          lib$rsvp$config$$config['trigger'](entry.name, entry.payload);
+        }
+        lib$rsvp$instrument$$queue.length = 0;
+      }, 50);
+    }
 
-      if (/msie ([0-9]{1,}[\.0-9]{0,})/.exec(userAgent) !== null) {
-        version = parseFloat( RegExp.$1 );
+    function lib$rsvp$instrument$$instrument(eventName, promise, child) {
+      if (1 === lib$rsvp$instrument$$queue.push({
+          name: eventName,
+          payload: {
+            key: promise._guidKey,
+            id:  promise._id,
+            eventName: eventName,
+            detail: promise._result,
+            childId: child && child._id,
+            label: promise._label,
+            timeStamp: lib$rsvp$utils$$now(),
+            error: lib$rsvp$config$$config["instrument-with-stack"] ? new Error(promise._label) : null
+          }})) {
+            lib$rsvp$instrument$$scheduleFlush();
+          }
       }
+    var lib$rsvp$instrument$$default = lib$rsvp$instrument$$instrument;
 
-    } else if (appName === 'Netscape' && userAgent.indexOf('trident') > -1) {
-      // IE 11+
+    function  lib$rsvp$$internal$$withOwnPromise() {
+      return new TypeError('A promises callback cannot return that same promise.');
+    }
 
-      name = 'IE';
+    function lib$rsvp$$internal$$noop() {}
 
-      if (/trident\/.*rv:([0-9]{1,}[\.0-9]{0,})/.exec(userAgent) !== null) {
-        version = parseFloat( RegExp.$1 );
-      }
+    var lib$rsvp$$internal$$PENDING   = void 0;
+    var lib$rsvp$$internal$$FULFILLED = 1;
+    var lib$rsvp$$internal$$REJECTED  = 2;
 
-    } else if (userAgent.indexOf('chrome') > -1) {
-      name = 'Chrome';
+    var lib$rsvp$$internal$$GET_THEN_ERROR = new lib$rsvp$$internal$$ErrorObject();
 
-      if (/chrome\/([0-9]{1,}[\.0-9]{0,})/.exec(userAgent) !== null) {
-        version = parseFloat( RegExp.$1 );
+    function lib$rsvp$$internal$$getThen(promise) {
+      try {
+        return promise.then;
+      } catch(error) {
+        lib$rsvp$$internal$$GET_THEN_ERROR.error = error;
+        return lib$rsvp$$internal$$GET_THEN_ERROR;
       }
+    }
 
-    } else if ((navigatorVendor = window.navigator.vendor) &&
-      navigatorVendor.toLowerCase().indexOf('apple') > -1) {
-      name = 'Safari';
-
-      if (/version\/([0-9]{1,}[\.0-9]{0,})/.exec(userAgent) !== null) {
-        version = parseFloat( RegExp.$1 );
+    function lib$rsvp$$internal$$tryThen(then, value, fulfillmentHandler, rejectionHandler) {
+      try {
+        then.call(value, fulfillmentHandler, rejectionHandler);
+      } catch(e) {
+        return e;
       }
     }
 
-    return {
-      name: name,
-      version: version,
-      userAgent: window.navigator.userAgent,
-      iframeNeedsLoad: userAgent.indexOf('webkit') < 0,
-      versionGreaterThan: versionGEThan
-    };
-  }();
+    function lib$rsvp$$internal$$handleForeignThenable(promise, thenable, then) {
+      lib$rsvp$config$$config.async(function(promise) {
+        var sealed = false;
+        var error = lib$rsvp$$internal$$tryThen(then, thenable, function(value) {
+          if (sealed) { return; }
+          sealed = true;
+          if (thenable !== value) {
+            lib$rsvp$$internal$$resolve(promise, value);
+          } else {
+            lib$rsvp$$internal$$fulfill(promise, value);
+          }
+        }, function(reason) {
+          if (sealed) { return; }
+          sealed = true;
 
+          lib$rsvp$$internal$$reject(promise, reason);
+        }, 'Settle: ' + (promise._label || ' unknown promise'));
 
-  OTHelpers.env = env;
+        if (!sealed && error) {
+          sealed = true;
+          lib$rsvp$$internal$$reject(promise, error);
+        }
+      }, promise);
+    }
 
-  OTHelpers.browser = function() {
-    return OTHelpers.env.name;
-  };
+    function lib$rsvp$$internal$$handleOwnThenable(promise, thenable) {
+      if (thenable._state === lib$rsvp$$internal$$FULFILLED) {
+        lib$rsvp$$internal$$fulfill(promise, thenable._result);
+      } else if (thenable._state === lib$rsvp$$internal$$REJECTED) {
+        thenable._onError = null;
+        lib$rsvp$$internal$$reject(promise, thenable._result);
+      } else {
+        lib$rsvp$$internal$$subscribe(thenable, undefined, function(value) {
+          if (thenable !== value) {
+            lib$rsvp$$internal$$resolve(promise, value);
+          } else {
+            lib$rsvp$$internal$$fulfill(promise, value);
+          }
+        }, function(reason) {
+          lib$rsvp$$internal$$reject(promise, reason);
+        });
+      }
+    }
 
-  OTHelpers.browserVersion = function() {
-    return OTHelpers.env;
-  };
+    function lib$rsvp$$internal$$handleMaybeThenable(promise, maybeThenable) {
+      if (maybeThenable.constructor === promise.constructor) {
+        lib$rsvp$$internal$$handleOwnThenable(promise, maybeThenable);
+      } else {
+        var then = lib$rsvp$$internal$$getThen(maybeThenable);
 
-})();
-/*jshint browser:false, smarttabs:true*/
-/* global window, require */
+        if (then === lib$rsvp$$internal$$GET_THEN_ERROR) {
+          lib$rsvp$$internal$$reject(promise, lib$rsvp$$internal$$GET_THEN_ERROR.error);
+        } else if (then === undefined) {
+          lib$rsvp$$internal$$fulfill(promise, maybeThenable);
+        } else if (lib$rsvp$utils$$isFunction(then)) {
+          lib$rsvp$$internal$$handleForeignThenable(promise, maybeThenable, then);
+        } else {
+          lib$rsvp$$internal$$fulfill(promise, maybeThenable);
+        }
+      }
+    }
 
-// tb_require('../../helpers.js')
-// tb_require('../environment.js')
+    function lib$rsvp$$internal$$resolve(promise, value) {
+      if (promise === value) {
+        lib$rsvp$$internal$$fulfill(promise, value);
+      } else if (lib$rsvp$utils$$objectOrFunction(value)) {
+        lib$rsvp$$internal$$handleMaybeThenable(promise, value);
+      } else {
+        lib$rsvp$$internal$$fulfill(promise, value);
+      }
+    }
 
-if (window.OTHelpers.env.name === 'Node') {
-  var request = require('request');
+    function lib$rsvp$$internal$$publishRejection(promise) {
+      if (promise._onError) {
+        promise._onError(promise._result);
+      }
 
-  OTHelpers.request = function(url, options, callback) {
-    var completion = function(error, response, body) {
-      var event = {response: response, body: body};
+      lib$rsvp$$internal$$publish(promise);
+    }
 
-      // We need to detect things that Request considers a success,
-      // but we consider to be failures.
-      if (!error && response.statusCode >= 200 &&
-                  (response.statusCode < 300 || response.statusCode === 304) ) {
-        callback(null, event);
+    function lib$rsvp$$internal$$fulfill(promise, value) {
+      if (promise._state !== lib$rsvp$$internal$$PENDING) { return; }
+
+      promise._result = value;
+      promise._state = lib$rsvp$$internal$$FULFILLED;
+
+      if (promise._subscribers.length === 0) {
+        if (lib$rsvp$config$$config.instrument) {
+          lib$rsvp$instrument$$default('fulfilled', promise);
+        }
       } else {
-        callback(error, event);
+        lib$rsvp$config$$config.async(lib$rsvp$$internal$$publish, promise);
       }
-    };
-
-    if (options.method.toLowerCase() === 'get') {
-      request.get(url, completion);
     }
-    else {
-      request.post(url, options.body, completion);
+
+    function lib$rsvp$$internal$$reject(promise, reason) {
+      if (promise._state !== lib$rsvp$$internal$$PENDING) { return; }
+      promise._state = lib$rsvp$$internal$$REJECTED;
+      promise._result = reason;
+      lib$rsvp$config$$config.async(lib$rsvp$$internal$$publishRejection, promise);
     }
-  };
 
-  OTHelpers.getJSON = function(url, options, callback) {
-    var extendedHeaders = require('underscore').extend(
-      {
-        'Accept': 'application/json'
-      },
-      options.headers || {}
-    );
+    function lib$rsvp$$internal$$subscribe(parent, child, onFulfillment, onRejection) {
+      var subscribers = parent._subscribers;
+      var length = subscribers.length;
 
-    request.get({
-      url: url,
-      headers: extendedHeaders,
-      json: true
-    }, function(err, response) {
-      callback(err, response && response.body);
-    });
-  };
-}
-/*jshint browser:true, smarttabs:true*/
+      parent._onError = null;
 
-// tb_require('../../helpers.js')
-// tb_require('../environment.js')
+      subscribers[length] = child;
+      subscribers[length + lib$rsvp$$internal$$FULFILLED] = onFulfillment;
+      subscribers[length + lib$rsvp$$internal$$REJECTED]  = onRejection;
 
-function formatPostData(data) { //, contentType
-  // If it's a string, we assume it's properly encoded
-  if (typeof(data) === 'string') return data;
+      if (length === 0 && parent._state) {
+        lib$rsvp$config$$config.async(lib$rsvp$$internal$$publish, parent);
+      }
+    }
 
-  var queryString = [];
+    function lib$rsvp$$internal$$publish(promise) {
+      var subscribers = promise._subscribers;
+      var settled = promise._state;
 
-  for (var key in data) {
-    queryString.push(
-      encodeURIComponent(key) + '=' + encodeURIComponent(data[key])
-    );
-  }
+      if (lib$rsvp$config$$config.instrument) {
+        lib$rsvp$instrument$$default(settled === lib$rsvp$$internal$$FULFILLED ? 'fulfilled' : 'rejected', promise);
+      }
 
-  return queryString.join('&').replace(/\+/g, '%20');
-}
+      if (subscribers.length === 0) { return; }
 
-if (window.OTHelpers.env.name !== 'Node') {
+      var child, callback, detail = promise._result;
 
-  OTHelpers.xdomainRequest = function(url, options, callback) {
-    /*global XDomainRequest*/
-    var xdr = new XDomainRequest(),
-        _options = options || {},
-        _method = _options.method.toLowerCase();
+      for (var i = 0; i < subscribers.length; i += 3) {
+        child = subscribers[i];
+        callback = subscribers[i + settled];
 
-    if(!_method) {
-      callback(new Error('No HTTP method specified in options'));
-      return;
-    }
+        if (child) {
+          lib$rsvp$$internal$$invokeCallback(settled, child, callback, detail);
+        } else {
+          callback(detail);
+        }
+      }
 
-    _method = _method.toUpperCase();
+      promise._subscribers.length = 0;
+    }
 
-    if(!(_method === 'GET' || _method === 'POST')) {
-      callback(new Error('HTTP method can only be '));
-      return;
+    function lib$rsvp$$internal$$ErrorObject() {
+      this.error = null;
     }
 
-    function done(err, event) {
-      xdr.onload = xdr.onerror = xdr.ontimeout = function() {};
-      xdr = void 0;
-      callback(err, event);
+    var lib$rsvp$$internal$$TRY_CATCH_ERROR = new lib$rsvp$$internal$$ErrorObject();
+
+    function lib$rsvp$$internal$$tryCatch(callback, detail) {
+      try {
+        return callback(detail);
+      } catch(e) {
+        lib$rsvp$$internal$$TRY_CATCH_ERROR.error = e;
+        return lib$rsvp$$internal$$TRY_CATCH_ERROR;
+      }
     }
 
+    function lib$rsvp$$internal$$invokeCallback(settled, promise, callback, detail) {
+      var hasCallback = lib$rsvp$utils$$isFunction(callback),
+          value, error, succeeded, failed;
 
-    xdr.onload = function() {
-      done(null, {
-        target: {
-          responseText: xdr.responseText,
-          headers: {
-            'content-type': xdr.contentType
-          }
+      if (hasCallback) {
+        value = lib$rsvp$$internal$$tryCatch(callback, detail);
+
+        if (value === lib$rsvp$$internal$$TRY_CATCH_ERROR) {
+          failed = true;
+          error = value.error;
+          value = null;
+        } else {
+          succeeded = true;
         }
-      });
-    };
 
-    xdr.onerror = function() {
-      done(new Error('XDomainRequest of ' + url + ' failed'));
-    };
-
-    xdr.ontimeout = function() {
-      done(new Error('XDomainRequest of ' + url + ' timed out'));
-    };
+        if (promise === value) {
+          lib$rsvp$$internal$$reject(promise, lib$rsvp$$internal$$withOwnPromise());
+          return;
+        }
 
-    xdr.open(_method, url);
-    xdr.send(options.body && formatPostData(options.body));
+      } else {
+        value = detail;
+        succeeded = true;
+      }
 
-  };
+      if (promise._state !== lib$rsvp$$internal$$PENDING) {
+        // noop
+      } else if (hasCallback && succeeded) {
+        lib$rsvp$$internal$$resolve(promise, value);
+      } else if (failed) {
+        lib$rsvp$$internal$$reject(promise, error);
+      } else if (settled === lib$rsvp$$internal$$FULFILLED) {
+        lib$rsvp$$internal$$fulfill(promise, value);
+      } else if (settled === lib$rsvp$$internal$$REJECTED) {
+        lib$rsvp$$internal$$reject(promise, value);
+      }
+    }
 
-  OTHelpers.request = function(url, options, callback) {
-    var request = new XMLHttpRequest(),
-        _options = options || {},
-        _method = _options.method;
+    function lib$rsvp$$internal$$initializePromise(promise, resolver) {
+      var resolved = false;
+      try {
+        resolver(function resolvePromise(value){
+          if (resolved) { return; }
+          resolved = true;
+          lib$rsvp$$internal$$resolve(promise, value);
+        }, function rejectPromise(reason) {
+          if (resolved) { return; }
+          resolved = true;
+          lib$rsvp$$internal$$reject(promise, reason);
+        });
+      } catch(e) {
+        lib$rsvp$$internal$$reject(promise, e);
+      }
+    }
 
-    if(!_method) {
-      callback(new Error('No HTTP method specified in options'));
-      return;
+    function lib$rsvp$enumerator$$makeSettledResult(state, position, value) {
+      if (state === lib$rsvp$$internal$$FULFILLED) {
+        return {
+          state: 'fulfilled',
+          value: value
+        };
+      } else {
+        return {
+          state: 'rejected',
+          reason: value
+        };
+      }
     }
 
-    // Setup callbacks to correctly respond to success and error callbacks. This includes
-    // interpreting the responses HTTP status, which XmlHttpRequest seems to ignore
-    // by default.
-    if(callback) {
-      OTHelpers.on(request, 'load', function(event) {
-        var status = event.target.status;
+    function lib$rsvp$enumerator$$Enumerator(Constructor, input, abortOnReject, label) {
+      this._instanceConstructor = Constructor;
+      this.promise = new Constructor(lib$rsvp$$internal$$noop, label);
+      this._abortOnReject = abortOnReject;
+
+      if (this._validateInput(input)) {
+        this._input     = input;
+        this.length     = input.length;
+        this._remaining = input.length;
 
-        // We need to detect things that XMLHttpRequest considers a success,
-        // but we consider to be failures.
-        if ( status >= 200 && (status < 300 || status === 304) ) {
-          callback(null, event);
+        this._init();
+
+        if (this.length === 0) {
+          lib$rsvp$$internal$$fulfill(this.promise, this._result);
         } else {
-          callback(event);
+          this.length = this.length || 0;
+          this._enumerate();
+          if (this._remaining === 0) {
+            lib$rsvp$$internal$$fulfill(this.promise, this._result);
+          }
         }
-      });
-
-      OTHelpers.on(request, 'error', callback);
+      } else {
+        lib$rsvp$$internal$$reject(this.promise, this._validationError());
+      }
     }
 
-    request.open(options.method, url, true);
+    var lib$rsvp$enumerator$$default = lib$rsvp$enumerator$$Enumerator;
 
-    if (!_options.headers) _options.headers = {};
+    lib$rsvp$enumerator$$Enumerator.prototype._validateInput = function(input) {
+      return lib$rsvp$utils$$isArray(input);
+    };
 
-    for (var name in _options.headers) {
-      request.setRequestHeader(name, _options.headers[name]);
-    }
+    lib$rsvp$enumerator$$Enumerator.prototype._validationError = function() {
+      return new Error('Array Methods must be provided an Array');
+    };
 
-    request.send(options.body && formatPostData(options.body));
-  };
+    lib$rsvp$enumerator$$Enumerator.prototype._init = function() {
+      this._result = new Array(this.length);
+    };
 
+    lib$rsvp$enumerator$$Enumerator.prototype._enumerate = function() {
+      var length  = this.length;
+      var promise = this.promise;
+      var input   = this._input;
 
-  OTHelpers.getJSON = function(url, options, callback) {
-    options = options || {};
+      for (var i = 0; promise._state === lib$rsvp$$internal$$PENDING && i < length; i++) {
+        this._eachEntry(input[i], i);
+      }
+    };
 
-    var done = function(error, event) {
-      if(error) {
-        callback(error, event && event.target && event.target.responseText);
+    lib$rsvp$enumerator$$Enumerator.prototype._eachEntry = function(entry, i) {
+      var c = this._instanceConstructor;
+      if (lib$rsvp$utils$$isMaybeThenable(entry)) {
+        if (entry.constructor === c && entry._state !== lib$rsvp$$internal$$PENDING) {
+          entry._onError = null;
+          this._settledAt(entry._state, i, entry._result);
+        } else {
+          this._willSettleAt(c.resolve(entry), i);
+        }
       } else {
-        var response;
+        this._remaining--;
+        this._result[i] = this._makeResult(lib$rsvp$$internal$$FULFILLED, i, entry);
+      }
+    };
 
-        try {
-          response = JSON.parse(event.target.responseText);
-        } catch(e) {
-          // Badly formed JSON
-          callback(e, event && event.target && event.target.responseText);
-          return;
+    lib$rsvp$enumerator$$Enumerator.prototype._settledAt = function(state, i, value) {
+      var promise = this.promise;
+
+      if (promise._state === lib$rsvp$$internal$$PENDING) {
+        this._remaining--;
+
+        if (this._abortOnReject && state === lib$rsvp$$internal$$REJECTED) {
+          lib$rsvp$$internal$$reject(promise, value);
+        } else {
+          this._result[i] = this._makeResult(state, i, value);
         }
+      }
 
-        callback(null, response, event);
+      if (this._remaining === 0) {
+        lib$rsvp$$internal$$fulfill(promise, this._result);
       }
     };
 
-    if(options.xdomainrequest) {
-      OTHelpers.xdomainRequest(url, { method: 'GET' }, done);
-    } else {
-      var extendedHeaders = OTHelpers.extend({
-        'Accept': 'application/json'
-      }, options.headers || {});
+    lib$rsvp$enumerator$$Enumerator.prototype._makeResult = function(state, i, value) {
+      return value;
+    };
 
-      OTHelpers.get(url, OTHelpers.extend(options || {}, {
-        headers: extendedHeaders
-      }), done);
+    lib$rsvp$enumerator$$Enumerator.prototype._willSettleAt = function(promise, i) {
+      var enumerator = this;
+
+      lib$rsvp$$internal$$subscribe(promise, undefined, function(value) {
+        enumerator._settledAt(lib$rsvp$$internal$$FULFILLED, i, value);
+      }, function(reason) {
+        enumerator._settledAt(lib$rsvp$$internal$$REJECTED, i, reason);
+      });
+    };
+    function lib$rsvp$promise$all$$all(entries, label) {
+      return new lib$rsvp$enumerator$$default(this, entries, true /* abort on reject */, label).promise;
     }
+    var lib$rsvp$promise$all$$default = lib$rsvp$promise$all$$all;
+    function lib$rsvp$promise$race$$race(entries, label) {
+      var Constructor = this;
 
-  };
+      var promise = new Constructor(lib$rsvp$$internal$$noop, label);
 
-}
-/*jshint browser:true, smarttabs:true*/
+      if (!lib$rsvp$utils$$isArray(entries)) {
+        lib$rsvp$$internal$$reject(promise, new TypeError('You must pass an array to race.'));
+        return promise;
+      }
 
-// tb_require('../helpers.js')
-// tb_require('./environment.js')
+      var length = entries.length;
 
-OTHelpers.useLogHelpers = function(on){
+      function onFulfillment(value) {
+        lib$rsvp$$internal$$resolve(promise, value);
+      }
 
-  // Log levels for OTLog.setLogLevel
-  on.DEBUG    = 5;
-  on.LOG      = 4;
-  on.INFO     = 3;
-  on.WARN     = 2;
-  on.ERROR    = 1;
-  on.NONE     = 0;
+      function onRejection(reason) {
+        lib$rsvp$$internal$$reject(promise, reason);
+      }
 
-  var _logLevel = on.NONE,
-      _logs = [],
-      _canApplyConsole = true;
+      for (var i = 0; promise._state === lib$rsvp$$internal$$PENDING && i < length; i++) {
+        lib$rsvp$$internal$$subscribe(Constructor.resolve(entries[i]), undefined, onFulfillment, onRejection);
+      }
 
-  try {
-    Function.prototype.bind.call(window.console.log, window.console);
-  } catch (err) {
-    _canApplyConsole = false;
-  }
+      return promise;
+    }
+    var lib$rsvp$promise$race$$default = lib$rsvp$promise$race$$race;
+    function lib$rsvp$promise$resolve$$resolve(object, label) {
+      var Constructor = this;
 
-  // Some objects can't be logged in the console, mostly these are certain
-  // types of native objects that are exposed to JS. This is only really a
-  // problem with IE, hence only the IE version does anything.
-  var makeLogArgumentsSafe = function(args) { return args; };
+      if (object && typeof object === 'object' && object.constructor === Constructor) {
+        return object;
+      }
 
-  if (OTHelpers.env.name === 'IE') {
-    makeLogArgumentsSafe = function(args) {
-      return [toDebugString(prototypeSlice.apply(args))];
-    };
-  }
+      var promise = new Constructor(lib$rsvp$$internal$$noop, label);
+      lib$rsvp$$internal$$resolve(promise, object);
+      return promise;
+    }
+    var lib$rsvp$promise$resolve$$default = lib$rsvp$promise$resolve$$resolve;
+    function lib$rsvp$promise$reject$$reject(reason, label) {
+      var Constructor = this;
+      var promise = new Constructor(lib$rsvp$$internal$$noop, label);
+      lib$rsvp$$internal$$reject(promise, reason);
+      return promise;
+    }
+    var lib$rsvp$promise$reject$$default = lib$rsvp$promise$reject$$reject;
 
-  // Generates a logging method for a particular method and log level.
-  //
-  // Attempts to handle the following cases:
-  // * the desired log method doesn't exist, call fallback (if available) instead
-  // * the console functionality isn't available because the developer tools (in IE)
-  // aren't open, call fallback (if available)
-  // * attempt to deal with weird IE hosted logging methods as best we can.
-  //
-  function generateLoggingMethod(method, level, fallback) {
-    return function() {
-      if (on.shouldLog(level)) {
-        var cons = window.console,
-            args = makeLogArgumentsSafe(arguments);
+    var lib$rsvp$promise$$guidKey = 'rsvp_' + lib$rsvp$utils$$now() + '-';
+    var lib$rsvp$promise$$counter = 0;
 
-        // In IE, window.console may not exist if the developer tools aren't open
-        // This also means that cons and cons[method] can appear at any moment
-        // hence why we retest this every time.
-        if (cons && cons[method]) {
-          // the desired console method isn't a real object, which means
-          // that we can't use apply on it. We force it to be a real object
-          // using Function.bind, assuming that's available.
-          if (cons[method].apply || _canApplyConsole) {
-            if (!cons[method].apply) {
-              cons[method] = Function.prototype.bind.call(cons[method], cons);
-            }
+    function lib$rsvp$promise$$needsResolver() {
+      throw new TypeError('You must pass a resolver function as the first argument to the promise constructor');
+    }
 
-            cons[method].apply(cons, args);
-          }
-          else {
-            // This isn't the same result as the above, but it's better
-            // than nothing.
-            cons[method](args);
-          }
-        }
-        else if (fallback) {
-          fallback.apply(on, args);
+    function lib$rsvp$promise$$needsNew() {
+      throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.");
+    }
 
-          // Skip appendToLogs, we delegate entirely to the fallback
-          return;
-        }
+    /**
+      Promise objects represent the eventual result of an asynchronous operation. The
+      primary way of interacting with a promise is through its `then` method, which
+      registers callbacks to receive either a promise’s eventual value or the reason
+      why the promise cannot be fulfilled.
+
+      Terminology
+      -----------
+
+      - `promise` is an object or function with a `then` method whose behavior conforms to this specification.
+      - `thenable` is an object or function that defines a `then` method.
+      - `value` is any legal JavaScript value (including undefined, a thenable, or a promise).
+      - `exception` is a value that is thrown using the throw statement.
+      - `reason` is a value that indicates why a promise was rejected.
+      - `settled` the final resting state of a promise, fulfilled or rejected.
+
+      A promise can be in one of three states: pending, fulfilled, or rejected.
+
+      Promises that are fulfilled have a fulfillment value and are in the fulfilled
+      state.  Promises that are rejected have a rejection reason and are in the
+      rejected state.  A fulfillment value is never a thenable.
+
+      Promises can also be said to *resolve* a value.  If this value is also a
+      promise, then the original promise's settled state will match the value's
+      settled state.  So a promise that *resolves* a promise that rejects will
+      itself reject, and a promise that *resolves* a promise that fulfills will
+      itself fulfill.
+
+
+      Basic Usage:
+      ------------
+
+      ```js
+      var promise = new Promise(function(resolve, reject) {
+        // on success
+        resolve(value);
 
-        appendToLogs(method, makeLogArgumentsSafe(arguments));
-      }
-    };
-  }
+        // on failure
+        reject(reason);
+      });
 
-  on.log = generateLoggingMethod('log', on.LOG);
+      promise.then(function(value) {
+        // on fulfillment
+      }, function(reason) {
+        // on rejection
+      });
+      ```
 
-  // Generate debug, info, warn, and error logging methods, these all fallback to on.log
-  on.debug = generateLoggingMethod('debug', on.DEBUG, on.log);
-  on.info = generateLoggingMethod('info', on.INFO, on.log);
-  on.warn = generateLoggingMethod('warn', on.WARN, on.log);
-  on.error = generateLoggingMethod('error', on.ERROR, on.log);
+      Advanced Usage:
+      ---------------
 
+      Promises shine when abstracting away asynchronous interactions such as
+      `XMLHttpRequest`s.
 
-  on.setLogLevel = function(level) {
-    _logLevel = typeof(level) === 'number' ? level : 0;
-    on.debug('TB.setLogLevel(' + _logLevel + ')');
-    return _logLevel;
-  };
+      ```js
+      function getJSON(url) {
+        return new Promise(function(resolve, reject){
+          var xhr = new XMLHttpRequest();
+
+          xhr.open('GET', url);
+          xhr.onreadystatechange = handler;
+          xhr.responseType = 'json';
+          xhr.setRequestHeader('Accept', 'application/json');
+          xhr.send();
+
+          function handler() {
+            if (this.readyState === this.DONE) {
+              if (this.status === 200) {
+                resolve(this.response);
+              } else {
+                reject(new Error('getJSON: `' + url + '` failed with status: [' + this.status + ']'));
+              }
+            }
+          };
+        });
+      }
 
-  on.getLogs = function() {
-    return _logs;
-  };
+      getJSON('/posts.json').then(function(json) {
+        // on fulfillment
+      }, function(reason) {
+        // on rejection
+      });
+      ```
 
-  // Determine if the level is visible given the current logLevel.
-  on.shouldLog = function(level) {
-    return _logLevel >= level;
-  };
+      Unlike callbacks, promises are great composable primitives.
 
-  // Format the current time nicely for logging. Returns the current
-  // local time.
-  function formatDateStamp() {
-    var now = new Date();
-    return now.toLocaleTimeString() + now.getMilliseconds();
-  }
+      ```js
+      Promise.all([
+        getJSON('/posts'),
+        getJSON('/comments')
+      ]).then(function(values){
+        values[0] // => postsJSON
+        values[1] // => commentsJSON
 
-  function toJson(object) {
-    try {
-      return JSON.stringify(object);
-    } catch(e) {
-      return object.toString();
-    }
-  }
+        return values;
+      });
+      ```
 
-  function toDebugString(object) {
-    var components = [];
+      @class RSVP.Promise
+      @param {function} resolver
+      @param {String} label optional string for labeling the promise.
+      Useful for tooling.
+      @constructor
+    */
+    function lib$rsvp$promise$$Promise(resolver, label) {
+      this._id = lib$rsvp$promise$$counter++;
+      this._label = label;
+      this._state = undefined;
+      this._result = undefined;
+      this._subscribers = [];
 
-    if (typeof(object) === 'undefined') {
-      // noop
-    }
-    else if (object === null) {
-      components.push('NULL');
-    }
-    else if (OTHelpers.isArray(object)) {
-      for (var i=0; i<object.length; ++i) {
-        components.push(toJson(object[i]));
+      if (lib$rsvp$config$$config.instrument) {
+        lib$rsvp$instrument$$default('created', this);
       }
-    }
-    else if (OTHelpers.isObject(object)) {
-      for (var key in object) {
-        var stringValue;
 
-        if (!OTHelpers.isFunction(object[key])) {
-          stringValue = toJson(object[key]);
+      if (lib$rsvp$$internal$$noop !== resolver) {
+        if (!lib$rsvp$utils$$isFunction(resolver)) {
+          lib$rsvp$promise$$needsResolver();
         }
-        else if (object.hasOwnProperty(key)) {
-          stringValue = 'function ' + key + '()';
+
+        if (!(this instanceof lib$rsvp$promise$$Promise)) {
+          lib$rsvp$promise$$needsNew();
         }
 
-        components.push(key + ': ' + stringValue);
-      }
-    }
-    else if (OTHelpers.isFunction(object)) {
-      try {
-        components.push(object.toString());
-      } catch(e) {
-        components.push('function()');
+        lib$rsvp$$internal$$initializePromise(this, resolver);
       }
     }
-    else  {
-      components.push(object.toString());
-    }
-
-    return components.join(', ');
-  }
 
-  // Append +args+ to logs, along with the current log level and the a date stamp.
-  function appendToLogs(level, args) {
-    if (!args) return;
+    var lib$rsvp$promise$$default = lib$rsvp$promise$$Promise;
 
-    var message = toDebugString(args);
-    if (message.length <= 2) return;
+    // deprecated
+    lib$rsvp$promise$$Promise.cast = lib$rsvp$promise$resolve$$default;
+    lib$rsvp$promise$$Promise.all = lib$rsvp$promise$all$$default;
+    lib$rsvp$promise$$Promise.race = lib$rsvp$promise$race$$default;
+    lib$rsvp$promise$$Promise.resolve = lib$rsvp$promise$resolve$$default;
+    lib$rsvp$promise$$Promise.reject = lib$rsvp$promise$reject$$default;
 
-    _logs.push(
-      [level, formatDateStamp(), message]
-    );
-  }
-};
+    lib$rsvp$promise$$Promise.prototype = {
+      constructor: lib$rsvp$promise$$Promise,
 
-OTHelpers.useLogHelpers(OTHelpers);
-OTHelpers.setLogLevel(OTHelpers.ERROR);
+      _guidKey: lib$rsvp$promise$$guidKey,
 
-/*jshint browser:true, smarttabs:true*/
-
-// tb_require('../helpers.js')
+      _onError: function (reason) {
+        lib$rsvp$config$$config.async(function(promise) {
+          setTimeout(function() {
+            if (promise._onError) {
+              lib$rsvp$config$$config['trigger']('error', reason);
+            }
+          }, 0);
+        }, this);
+      },
 
-// DOM helpers
+    /**
+      The primary way of interacting with a promise is through its `then` method,
+      which registers callbacks to receive either a promise's eventual value or the
+      reason why the promise cannot be fulfilled.
+
+      ```js
+      findUser().then(function(user){
+        // user is available
+      }, function(reason){
+        // user is unavailable, and you are given the reason why
+      });
+      ```
 
-// Helper function for adding event listeners to dom elements.
-// WARNING: This doesn't preserve event types, your handler could
-// be getting all kinds of different parameters depending on the browser.
-// You also may have different scopes depending on the browser and bubbling
-// and cancelable are not supported.
-ElementCollection.prototype.on = function (eventName, handler) {
-  return this.forEach(function(element) {
-    if (element.addEventListener) {
-      element.addEventListener(eventName, handler, false);
-    } else if (element.attachEvent) {
-      element.attachEvent('on' + eventName, handler);
-    } else {
-      var oldHandler = element['on'+eventName];
-      element['on'+eventName] = function() {
-        handler.apply(this, arguments);
-        if (oldHandler) oldHandler.apply(this, arguments);
-      };
-    }
-  });
-};
+      Chaining
+      --------
 
-// Helper function for removing event listeners from dom elements.
-ElementCollection.prototype.off = function (eventName, handler) {
-  return this.forEach(function(element) {
-    if (element.removeEventListener) {
-      element.removeEventListener (eventName, handler,false);
-    }
-    else if (element.detachEvent) {
-      element.detachEvent('on' + eventName, handler);
-    }
-  });
-};
+      The return value of `then` is itself a promise.  This second, 'downstream'
+      promise is resolved with the return value of the first promise's fulfillment
+      or rejection handler, or rejected if the handler throws an exception.
+
+      ```js
+      findUser().then(function (user) {
+        return user.name;
+      }, function (reason) {
+        return 'default name';
+      }).then(function (userName) {
+        // If `findUser` fulfilled, `userName` will be the user's name, otherwise it
+        // will be `'default name'`
+      });
 
-ElementCollection.prototype.once = function (eventName, handler) {
-  var removeAfterTrigger = $.bind(function() {
-    this.off(eventName, removeAfterTrigger);
-    handler.apply(null, arguments);
-  }, this);
+      findUser().then(function (user) {
+        throw new Error('Found user, but still unhappy');
+      }, function (reason) {
+        throw new Error('`findUser` rejected and we're unhappy');
+      }).then(function (value) {
+        // never reached
+      }, function (reason) {
+        // if `findUser` fulfilled, `reason` will be 'Found user, but still unhappy'.
+        // If `findUser` rejected, `reason` will be '`findUser` rejected and we're unhappy'.
+      });
+      ```
+      If the downstream promise does not specify a rejection handler, rejection reasons will be propagated further downstream.
 
-  return this.on(eventName, removeAfterTrigger);
-};
+      ```js
+      findUser().then(function (user) {
+        throw new PedagogicalException('Upstream error');
+      }).then(function (value) {
+        // never reached
+      }).then(function (value) {
+        // never reached
+      }, function (reason) {
+        // The `PedgagocialException` is propagated all the way down to here
+      });
+      ```
 
-// @remove
-OTHelpers.on = function(element, eventName,  handler) {
-  return $(element).on(eventName, handler);
-};
+      Assimilation
+      ------------
 
-// @remove
-OTHelpers.off = function(element, eventName, handler) {
-  return $(element).off(eventName, handler);
-};
+      Sometimes the value you want to propagate to a downstream promise can only be
+      retrieved asynchronously. This can be achieved by returning a promise in the
+      fulfillment or rejection handler. The downstream promise will then be pending
+      until the returned promise is settled. This is called *assimilation*.
+
+      ```js
+      findUser().then(function (user) {
+        return findCommentsByAuthor(user);
+      }).then(function (comments) {
+        // The user's comments are now available
+      });
+      ```
 
-// @remove
-OTHelpers.once = function (element, eventName, handler) {
-  return $(element).once(eventName, handler);
-};
+      If the assimliated promise rejects, then the downstream promise will also reject.
 
-/*jshint browser:true, smarttabs:true*/
+      ```js
+      findUser().then(function (user) {
+        return findCommentsByAuthor(user);
+      }).then(function (comments) {
+        // If `findCommentsByAuthor` fulfills, we'll have the value here
+      }, function (reason) {
+        // If `findCommentsByAuthor` rejects, we'll have the reason here
+      });
+      ```
 
-// tb_require('../helpers.js')
-// tb_require('./dom_events.js')
+      Simple Example
+      --------------
 
-(function() {
+      Synchronous Example
 
-  var _domReady = typeof(document) === 'undefined' ||
-                    document.readyState === 'complete' ||
-                   (document.readyState === 'interactive' && document.body),
+      ```javascript
+      var result;
 
-      _loadCallbacks = [],
-      _unloadCallbacks = [],
-      _domUnloaded = false,
+      try {
+        result = findResult();
+        // success
+      } catch(reason) {
+        // failure
+      }
+      ```
 
-      onDomReady = function() {
-        _domReady = true;
+      Errback Example
 
-        if (typeof(document) !== 'undefined') {
-          if ( document.addEventListener ) {
-            document.removeEventListener('DOMContentLoaded', onDomReady, false);
-            window.removeEventListener('load', onDomReady, false);
-          } else {
-            document.detachEvent('onreadystatechange', onDomReady);
-            window.detachEvent('onload', onDomReady);
-          }
+      ```js
+      findResult(function(result, err){
+        if (err) {
+          // failure
+        } else {
+          // success
         }
+      });
+      ```
 
-        // This is making an assumption about there being only one 'window'
-        // that we care about.
-        OTHelpers.on(window, 'unload', onDomUnload);
-
-        OTHelpers.forEach(_loadCallbacks, function(listener) {
-          listener[0].call(listener[1]);
-        });
+      Promise Example;
 
-        _loadCallbacks = [];
-      },
+      ```javascript
+      findResult().then(function(result){
+        // success
+      }, function(reason){
+        // failure
+      });
+      ```
 
-      onDomUnload = function() {
-        _domUnloaded = true;
+      Advanced Example
+      --------------
 
-        OTHelpers.forEach(_unloadCallbacks, function(listener) {
-          listener[0].call(listener[1]);
-        });
+      Synchronous Example
 
-        _unloadCallbacks = [];
-      };
+      ```javascript
+      var author, books;
 
+      try {
+        author = findAuthor();
+        books  = findBooksByAuthor(author);
+        // success
+      } catch(reason) {
+        // failure
+      }
+      ```
 
-  OTHelpers.onDOMLoad = function(cb, context) {
-    if (OTHelpers.isReady()) {
-      cb.call(context);
-      return;
-    }
+      Errback Example
 
-    _loadCallbacks.push([cb, context]);
-  };
+      ```js
 
-  OTHelpers.onDOMUnload = function(cb, context) {
-    if (this.isDOMUnloaded()) {
-      cb.call(context);
-      return;
-    }
+      function foundBooks(books) {
 
-    _unloadCallbacks.push([cb, context]);
-  };
+      }
 
-  OTHelpers.isReady = function() {
-    return !_domUnloaded && _domReady;
-  };
+      function failure(reason) {
 
-  OTHelpers.isDOMUnloaded = function() {
-    return _domUnloaded;
-  };
+      }
 
-  if (_domReady) {
-    onDomReady();
-  } else if(typeof(document) !== 'undefined') {
-    if (document.addEventListener) {
-      document.addEventListener('DOMContentLoaded', onDomReady, false);
+      findAuthor(function(author, err){
+        if (err) {
+          failure(err);
+          // failure
+        } else {
+          try {
+            findBoooksByAuthor(author, function(books, err) {
+              if (err) {
+                failure(err);
+              } else {
+                try {
+                  foundBooks(books);
+                } catch(reason) {
+                  failure(reason);
+                }
+              }
+            });
+          } catch(error) {
+            failure(err);
+          }
+          // success
+        }
+      });
+      ```
 
-      // fallback
-      window.addEventListener( 'load', onDomReady, false );
+      Promise Example;
 
-    } else if (document.attachEvent) {
-      document.attachEvent('onreadystatechange', function() {
-        if (document.readyState === 'complete') onDomReady();
+      ```javascript
+      findAuthor().
+        then(findBooksByAuthor).
+        then(function(books){
+          // found books
+      }).catch(function(reason){
+        // something went wrong
       });
+      ```
 
-      // fallback
-      window.attachEvent( 'onload', onDomReady );
-    }
-  }
+      @method then
+      @param {Function} onFulfilled
+      @param {Function} onRejected
+      @param {String} label optional string for labeling the promise.
+      Useful for tooling.
+      @return {Promise}
+    */
+      then: function(onFulfillment, onRejection, label) {
+        var parent = this;
+        var state = parent._state;
 
-})();
+        if (state === lib$rsvp$$internal$$FULFILLED && !onFulfillment || state === lib$rsvp$$internal$$REJECTED && !onRejection) {
+          if (lib$rsvp$config$$config.instrument) {
+            lib$rsvp$instrument$$default('chained', this, this);
+          }
+          return this;
+        }
 
-/*jshint browser:true, smarttabs:true*/
+        parent._onError = null;
 
-// tb_require('../helpers.js')
+        var child = new this.constructor(lib$rsvp$$internal$$noop, label);
+        var result = parent._result;
 
-OTHelpers.setCookie = function(key, value) {
-  try {
-    localStorage.setItem(key, value);
-  } catch (err) {
-    // Store in browser cookie
-    var date = new Date();
-    date.setTime(date.getTime()+(365*24*60*60*1000));
-    var expires = '; expires=' + date.toGMTString();
-    document.cookie = key + '=' + value + expires + '; path=/';
-  }
-};
+        if (lib$rsvp$config$$config.instrument) {
+          lib$rsvp$instrument$$default('chained', parent, child);
+        }
 
-OTHelpers.getCookie = function(key) {
-  var value;
+        if (state) {
+          var callback = arguments[state - 1];
+          lib$rsvp$config$$config.async(function(){
+            lib$rsvp$$internal$$invokeCallback(state, child, callback, result);
+          });
+        } else {
+          lib$rsvp$$internal$$subscribe(parent, child, onFulfillment, onRejection);
+        }
 
-  try {
-    value = localStorage.getItem(key);
-    return value;
-  } catch (err) {
-    // Check browser cookies
-    var nameEQ = key + '=';
-    var ca = document.cookie.split(';');
-    for(var i=0;i < ca.length;i++) {
-      var c = ca[i];
-      while (c.charAt(0) === ' ') {
-        c = c.substring(1,c.length);
+        return child;
+      },
+
+    /**
+      `catch` is simply sugar for `then(undefined, onRejection)` which makes it the same
+      as the catch block of a try/catch statement.
+
+      ```js
+      function findAuthor(){
+        throw new Error('couldn't find that author');
       }
-      if (c.indexOf(nameEQ) === 0) {
-        value = c.substring(nameEQ.length,c.length);
+
+      // synchronous
+      try {
+        findAuthor();
+      } catch(reason) {
+        // something went wrong
       }
-    }
 
-    if (value) {
-      return value;
-    }
-  }
+      // async with promises
+      findAuthor().catch(function(reason){
+        // something went wrong
+      });
+      ```
 
-  return null;
-};
+      @method catch
+      @param {Function} onRejection
+      @param {String} label optional string for labeling the promise.
+      Useful for tooling.
+      @return {Promise}
+    */
+      'catch': function(onRejection, label) {
+        return this.then(null, onRejection, label);
+      },
 
-// tb_require('../helpers.js')
+    /**
+      `finally` will be invoked regardless of the promise's fate just as native
+      try/catch/finally behaves
 
-/* jshint globalstrict: true, strict: false, undef: true, unused: true,
-          trailing: true, browser: true, smarttabs:true */
+      Synchronous example:
 
+      ```js
+      findAuthor() {
+        if (Math.random() > 0.5) {
+          throw new Error();
+        }
+        return new Author();
+      }
 
-OTHelpers.Collection = function(idField) {
-  var _models = [],
-      _byId = {},
-      _idField = idField || 'id';
+      try {
+        return findAuthor(); // succeed or fail
+      } catch(error) {
+        return findOtherAuther();
+      } finally {
+        // always runs
+        // doesn't affect the return value
+      }
+      ```
+
+      Asynchronous example:
+
+      ```js
+      findAuthor().catch(function(reason){
+        return findOtherAuther();
+      }).finally(function(){
+        // author was either found, or not
+      });
+      ```
 
-  OTHelpers.eventing(this, true);
+      @method finally
+      @param {Function} callback
+      @param {String} label optional string for labeling the promise.
+      Useful for tooling.
+      @return {Promise}
+    */
+      'finally': function(callback, label) {
+        var constructor = this.constructor;
+
+        return this.then(function(value) {
+          return constructor.resolve(callback()).then(function(){
+            return value;
+          });
+        }, function(reason) {
+          return constructor.resolve(callback()).then(function(){
+            throw reason;
+          });
+        }, label);
+      }
+    };
 
-  var modelProperty = function(model, property) {
-    if(OTHelpers.isFunction(model[property])) {
-      return model[property]();
-    } else {
-      return model[property];
+    function lib$rsvp$all$settled$$AllSettled(Constructor, entries, label) {
+      this._superConstructor(Constructor, entries, false /* don't abort on reject */, label);
     }
-  };
 
-  var onModelUpdate = OTHelpers.bind(function onModelUpdate (event) {
-        this.trigger('update', event);
-        this.trigger('update:'+event.target.id, event);
-      }, this),
+    lib$rsvp$all$settled$$AllSettled.prototype = lib$rsvp$utils$$o_create(lib$rsvp$enumerator$$default.prototype);
+    lib$rsvp$all$settled$$AllSettled.prototype._superConstructor = lib$rsvp$enumerator$$default;
+    lib$rsvp$all$settled$$AllSettled.prototype._makeResult = lib$rsvp$enumerator$$makeSettledResult;
+    lib$rsvp$all$settled$$AllSettled.prototype._validationError = function() {
+      return new Error('allSettled must be called with an array');
+    };
 
-      onModelDestroy = OTHelpers.bind(function onModelDestroyed (event) {
-        this.remove(event.target, event.reason);
-      }, this);
+    function lib$rsvp$all$settled$$allSettled(entries, label) {
+      return new lib$rsvp$all$settled$$AllSettled(lib$rsvp$promise$$default, entries, label).promise;
+    }
+    var lib$rsvp$all$settled$$default = lib$rsvp$all$settled$$allSettled;
+    function lib$rsvp$all$$all(array, label) {
+      return lib$rsvp$promise$$default.all(array, label);
+    }
+    var lib$rsvp$all$$default = lib$rsvp$all$$all;
+    var lib$rsvp$asap$$len = 0;
+    var lib$rsvp$asap$$toString = {}.toString;
+    var lib$rsvp$asap$$vertxNext;
+    function lib$rsvp$asap$$asap(callback, arg) {
+      lib$rsvp$asap$$queue[lib$rsvp$asap$$len] = callback;
+      lib$rsvp$asap$$queue[lib$rsvp$asap$$len + 1] = arg;
+      lib$rsvp$asap$$len += 2;
+      if (lib$rsvp$asap$$len === 2) {
+        // If len is 1, that means that we need to schedule an async flush.
+        // If additional callbacks are queued before the queue is flushed, they
+        // will be processed by this flush that we are scheduling.
+        lib$rsvp$asap$$scheduleFlush();
+      }
+    }
 
+    var lib$rsvp$asap$$default = lib$rsvp$asap$$asap;
 
-  this.reset = function() {
-    // Stop listening on the models, they are no longer our problem
-    OTHelpers.forEach(_models, function(model) {
-      model.off('updated', onModelUpdate, this);
-      model.off('destroyed', onModelDestroy, this);
-    }, this);
+    var lib$rsvp$asap$$browserWindow = (typeof window !== 'undefined') ? window : undefined;
+    var lib$rsvp$asap$$browserGlobal = lib$rsvp$asap$$browserWindow || {};
+    var lib$rsvp$asap$$BrowserMutationObserver = lib$rsvp$asap$$browserGlobal.MutationObserver || lib$rsvp$asap$$browserGlobal.WebKitMutationObserver;
+    var lib$rsvp$asap$$isNode = typeof process !== 'undefined' && {}.toString.call(process) === '[object process]';
 
-    _models = [];
-    _byId = {};
-  };
+    // test for web worker but not in IE10
+    var lib$rsvp$asap$$isWorker = typeof Uint8ClampedArray !== 'undefined' &&
+      typeof importScripts !== 'undefined' &&
+      typeof MessageChannel !== 'undefined';
 
-  this.destroy = function(reason) {
-    OTHelpers.forEach(_models, function(model) {
-      if(model && typeof model.destroy === 'function') {
-        model.destroy(reason, true);
+    // node
+    function lib$rsvp$asap$$useNextTick() {
+      var nextTick = process.nextTick;
+      // node version 0.10.x displays a deprecation warning when nextTick is used recursively
+      // setImmediate should be used instead instead
+      var version = process.versions.node.match(/^(?:(\d+)\.)?(?:(\d+)\.)?(\*|\d+)$/);
+      if (Array.isArray(version) && version[1] === '0' && version[2] === '10') {
+        nextTick = setImmediate;
       }
-    });
+      return function() {
+        nextTick(lib$rsvp$asap$$flush);
+      };
+    }
 
-    this.reset();
-    this.off();
-  };
+    // vertx
+    function lib$rsvp$asap$$useVertxTimer() {
+      return function() {
+        lib$rsvp$asap$$vertxNext(lib$rsvp$asap$$flush);
+      };
+    }
 
-  this.get = function(id) { return id && _byId[id] !== void 0 ? _models[_byId[id]] : void 0; };
-  this.has = function(id) { return id && _byId[id] !== void 0; };
+    function lib$rsvp$asap$$useMutationObserver() {
+      var iterations = 0;
+      var observer = new lib$rsvp$asap$$BrowserMutationObserver(lib$rsvp$asap$$flush);
+      var node = document.createTextNode('');
+      observer.observe(node, { characterData: true });
 
-  this.toString = function() { return _models.toString(); };
+      return function() {
+        node.data = (iterations = ++iterations % 2);
+      };
+    }
 
-  // Return only models filtered by either a dict of properties
-  // or a filter function.
-  //
-  // @example Return all publishers with a streamId of 1
-  //   OT.publishers.where({streamId: 1})
-  //
-  // @example The same thing but filtering using a filter function
-  //   OT.publishers.where(function(publisher) {
-  //     return publisher.stream.id === 4;
-  //   });
-  //
-  // @example The same thing but filtering using a filter function
-  //          executed with a specific this
-  //   OT.publishers.where(function(publisher) {
-  //     return publisher.stream.id === 4;
-  //   }, self);
-  //
-  this.where = function(attrsOrFilterFn, context) {
-    if (OTHelpers.isFunction(attrsOrFilterFn)) {
-      return OTHelpers.filter(_models, attrsOrFilterFn, context);
+    // web worker
+    function lib$rsvp$asap$$useMessageChannel() {
+      var channel = new MessageChannel();
+      channel.port1.onmessage = lib$rsvp$asap$$flush;
+      return function () {
+        channel.port2.postMessage(0);
+      };
     }
 
-    return OTHelpers.filter(_models, function(model) {
-      for (var key in attrsOrFilterFn) {
-        if(!attrsOrFilterFn.hasOwnProperty(key)) {
-          continue;
-        }
-        if (modelProperty(model, key) !== attrsOrFilterFn[key]) return false;
-      }
+    function lib$rsvp$asap$$useSetTimeout() {
+      return function() {
+        setTimeout(lib$rsvp$asap$$flush, 1);
+      };
+    }
 
-      return true;
-    });
-  };
+    var lib$rsvp$asap$$queue = new Array(1000);
+    function lib$rsvp$asap$$flush() {
+      for (var i = 0; i < lib$rsvp$asap$$len; i+=2) {
+        var callback = lib$rsvp$asap$$queue[i];
+        var arg = lib$rsvp$asap$$queue[i+1];
 
-  // Similar to where in behaviour, except that it only returns
-  // the first match.
-  this.find = function(attrsOrFilterFn, context) {
-    var filterFn;
+        callback(arg);
 
-    if (OTHelpers.isFunction(attrsOrFilterFn)) {
-      filterFn = attrsOrFilterFn;
+        lib$rsvp$asap$$queue[i] = undefined;
+        lib$rsvp$asap$$queue[i+1] = undefined;
+      }
+
+      lib$rsvp$asap$$len = 0;
     }
-    else {
-      filterFn = function(model) {
-        for (var key in attrsOrFilterFn) {
-          if(!attrsOrFilterFn.hasOwnProperty(key)) {
-            continue;
-          }
-          if (modelProperty(model, key) !== attrsOrFilterFn[key]) return false;
-        }
 
-        return true;
-      };
+    function lib$rsvp$asap$$attemptVertex() {
+      try {
+        var r = require;
+        var vertx = r('vertx');
+        lib$rsvp$asap$$vertxNext = vertx.runOnLoop || vertx.runOnContext;
+        return lib$rsvp$asap$$useVertxTimer();
+      } catch(e) {
+        return lib$rsvp$asap$$useSetTimeout();
+      }
     }
 
-    filterFn = OTHelpers.bind(filterFn, context);
+    var lib$rsvp$asap$$scheduleFlush;
+    // Decide what async method to use to triggering processing of queued callbacks:
+    if (lib$rsvp$asap$$isNode) {
+      lib$rsvp$asap$$scheduleFlush = lib$rsvp$asap$$useNextTick();
+    } else if (lib$rsvp$asap$$BrowserMutationObserver) {
+      lib$rsvp$asap$$scheduleFlush = lib$rsvp$asap$$useMutationObserver();
+    } else if (lib$rsvp$asap$$isWorker) {
+      lib$rsvp$asap$$scheduleFlush = lib$rsvp$asap$$useMessageChannel();
+    } else if (lib$rsvp$asap$$browserWindow === undefined && typeof require === 'function') {
+      lib$rsvp$asap$$scheduleFlush = lib$rsvp$asap$$attemptVertex();
+    } else {
+      lib$rsvp$asap$$scheduleFlush = lib$rsvp$asap$$useSetTimeout();
+    }
+    function lib$rsvp$defer$$defer(label) {
+      var deferred = { };
 
-    for (var i=0; i<_models.length; ++i) {
-      if (filterFn(_models[i]) === true) return _models[i];
+      deferred['promise'] = new lib$rsvp$promise$$default(function(resolve, reject) {
+        deferred['resolve'] = resolve;
+        deferred['reject'] = reject;
+      }, label);
+
+      return deferred;
     }
+    var lib$rsvp$defer$$default = lib$rsvp$defer$$defer;
+    function lib$rsvp$filter$$filter(promises, filterFn, label) {
+      return lib$rsvp$promise$$default.all(promises, label).then(function(values) {
+        if (!lib$rsvp$utils$$isFunction(filterFn)) {
+          throw new TypeError("You must pass a function as filter's second argument.");
+        }
 
-    return null;
-  };
+        var length = values.length;
+        var filtered = new Array(length);
 
-  this.add = function(model) {
-    var id = modelProperty(model, _idField);
+        for (var i = 0; i < length; i++) {
+          filtered[i] = filterFn(values[i]);
+        }
 
-    if (this.has(id)) {
-      OTHelpers.warn('Model ' + id + ' is already in the collection', _models);
-      return this;
+        return lib$rsvp$promise$$default.all(filtered, label).then(function(filtered) {
+          var results = new Array(length);
+          var newLength = 0;
+
+          for (var i = 0; i < length; i++) {
+            if (filtered[i]) {
+              results[newLength] = values[i];
+              newLength++;
+            }
+          }
+
+          results.length = newLength;
+
+          return results;
+        });
+      });
     }
+    var lib$rsvp$filter$$default = lib$rsvp$filter$$filter;
 
-    _byId[id] = _models.push(model) - 1;
+    function lib$rsvp$promise$hash$$PromiseHash(Constructor, object, label) {
+      this._superConstructor(Constructor, object, true, label);
+    }
 
-    model.on('updated', onModelUpdate, this);
-    model.on('destroyed', onModelDestroy, this);
+    var lib$rsvp$promise$hash$$default = lib$rsvp$promise$hash$$PromiseHash;
 
-    this.trigger('add', model);
-    this.trigger('add:'+id, model);
+    lib$rsvp$promise$hash$$PromiseHash.prototype = lib$rsvp$utils$$o_create(lib$rsvp$enumerator$$default.prototype);
+    lib$rsvp$promise$hash$$PromiseHash.prototype._superConstructor = lib$rsvp$enumerator$$default;
+    lib$rsvp$promise$hash$$PromiseHash.prototype._init = function() {
+      this._result = {};
+    };
 
-    return this;
-  };
+    lib$rsvp$promise$hash$$PromiseHash.prototype._validateInput = function(input) {
+      return input && typeof input === 'object';
+    };
 
-  this.remove = function(model, reason) {
-    var id = modelProperty(model, _idField);
+    lib$rsvp$promise$hash$$PromiseHash.prototype._validationError = function() {
+      return new Error('Promise.hash must be called with an object');
+    };
 
-    _models.splice(_byId[id], 1);
+    lib$rsvp$promise$hash$$PromiseHash.prototype._enumerate = function() {
+      var promise = this.promise;
+      var input   = this._input;
+      var results = [];
 
-    // Shuffle everyone down one
-    for (var i=_byId[id]; i<_models.length; ++i) {
-      _byId[_models[i][_idField]] = i;
-    }
+      for (var key in input) {
+        if (promise._state === lib$rsvp$$internal$$PENDING && input.hasOwnProperty(key)) {
+          results.push({
+            position: key,
+            entry: input[key]
+          });
+        }
+      }
 
-    delete _byId[id];
+      var length = results.length;
+      this._remaining = length;
+      var result;
 
-    model.off('updated', onModelUpdate, this);
-    model.off('destroyed', onModelDestroy, this);
+      for (var i = 0; promise._state === lib$rsvp$$internal$$PENDING && i < length; i++) {
+        result = results[i];
+        this._eachEntry(result.entry, result.position);
+      }
+    };
 
-    this.trigger('remove', model, reason);
-    this.trigger('remove:'+id, model, reason);
+    function lib$rsvp$hash$settled$$HashSettled(Constructor, object, label) {
+      this._superConstructor(Constructor, object, false, label);
+    }
 
-    return this;
-  };
+    lib$rsvp$hash$settled$$HashSettled.prototype = lib$rsvp$utils$$o_create(lib$rsvp$promise$hash$$default.prototype);
+    lib$rsvp$hash$settled$$HashSettled.prototype._superConstructor = lib$rsvp$enumerator$$default;
+    lib$rsvp$hash$settled$$HashSettled.prototype._makeResult = lib$rsvp$enumerator$$makeSettledResult;
 
-  // Retrigger the add event behaviour for each model. You can also
-  // select a subset of models to trigger using the same arguments
-  // as the #where method.
-  this._triggerAddEvents = function() {
-    var models = this.where.apply(this, arguments);
-    OTHelpers.forEach(models, function(model) {
-      this.trigger('add', model);
-      this.trigger('add:' + modelProperty(model, _idField), model);
-    }, this);
-  };
+    lib$rsvp$hash$settled$$HashSettled.prototype._validationError = function() {
+      return new Error('hashSettled must be called with an object');
+    };
 
-  this.length = function() {
-    return _models.length;
-  };
-};
+    function lib$rsvp$hash$settled$$hashSettled(object, label) {
+      return new lib$rsvp$hash$settled$$HashSettled(lib$rsvp$promise$$default, object, label).promise;
+    }
+    var lib$rsvp$hash$settled$$default = lib$rsvp$hash$settled$$hashSettled;
+    function lib$rsvp$hash$$hash(object, label) {
+      return new lib$rsvp$promise$hash$$default(lib$rsvp$promise$$default, object, label).promise;
+    }
+    var lib$rsvp$hash$$default = lib$rsvp$hash$$hash;
+    function lib$rsvp$map$$map(promises, mapFn, label) {
+      return lib$rsvp$promise$$default.all(promises, label).then(function(values) {
+        if (!lib$rsvp$utils$$isFunction(mapFn)) {
+          throw new TypeError("You must pass a function as map's second argument.");
+        }
 
+        var length = values.length;
+        var results = new Array(length);
 
-/*jshint browser:true, smarttabs:true*/
+        for (var i = 0; i < length; i++) {
+          results[i] = mapFn(values[i]);
+        }
 
-// tb_require('../helpers.js')
-// tb_require('../vendor/uuid.js')
-// tb_require('./dom_events.js')
+        return lib$rsvp$promise$$default.all(results, label);
+      });
+    }
+    var lib$rsvp$map$$default = lib$rsvp$map$$map;
 
-(function() {
+    function lib$rsvp$node$$Result() {
+      this.value = undefined;
+    }
 
-  var _callAsync;
+    var lib$rsvp$node$$ERROR = new lib$rsvp$node$$Result();
+    var lib$rsvp$node$$GET_THEN_ERROR = new lib$rsvp$node$$Result();
 
-  // Is true if window.postMessage is supported.
-  // This is not quite as simple as just looking for
-  // window.postMessage as some older versions of IE
-  // have a broken implementation of it.
-  //
-  var supportsPostMessage = (function () {
-    if (window.postMessage) {
-      // Check to see if postMessage fires synchronously,
-      // if it does, then the implementation of postMessage
-      // is broken.
-      var postMessageIsAsynchronous = true;
-      var oldOnMessage = window.onmessage;
-      window.onmessage = function() {
-        postMessageIsAsynchronous = false;
-      };
-      window.postMessage('', '*');
-      window.onmessage = oldOnMessage;
-      return postMessageIsAsynchronous;
+    function lib$rsvp$node$$getThen(obj) {
+      try {
+       return obj.then;
+      } catch(error) {
+        lib$rsvp$node$$ERROR.value= error;
+        return lib$rsvp$node$$ERROR;
+      }
     }
-  })();
 
-  if (supportsPostMessage) {
-    var timeouts = [],
-        messageName = 'OTHelpers.' + OTHelpers.uuid.v4() + '.zero-timeout';
 
-    var removeMessageHandler = function() {
-      timeouts = [];
+    function lib$rsvp$node$$tryApply(f, s, a) {
+      try {
+        f.apply(s, a);
+      } catch(error) {
+        lib$rsvp$node$$ERROR.value = error;
+        return lib$rsvp$node$$ERROR;
+      }
+    }
 
-      if(window.removeEventListener) {
-        window.removeEventListener('message', handleMessage);
-      } else if(window.detachEvent) {
-        window.detachEvent('onmessage', handleMessage);
+    function lib$rsvp$node$$makeObject(_, argumentNames) {
+      var obj = {};
+      var name;
+      var i;
+      var length = _.length;
+      var args = new Array(length);
+
+      for (var x = 0; x < length; x++) {
+        args[x] = _[x];
       }
-    };
 
-    var handleMessage = function(event) {
-      if (event.source === window &&
-          event.data === messageName) {
+      for (i = 0; i < argumentNames.length; i++) {
+        name = argumentNames[i];
+        obj[name] = args[i + 1];
+      }
 
-        if(OTHelpers.isFunction(event.stopPropagation)) {
-          event.stopPropagation();
+      return obj;
+    }
+
+    function lib$rsvp$node$$arrayResult(_) {
+      var length = _.length;
+      var args = new Array(length - 1);
+
+      for (var i = 1; i < length; i++) {
+        args[i - 1] = _[i];
+      }
+
+      return args;
+    }
+
+    function lib$rsvp$node$$wrapThenable(then, promise) {
+      return {
+        then: function(onFulFillment, onRejection) {
+          return then.call(promise, onFulFillment, onRejection);
         }
-        event.cancelBubble = true;
+      };
+    }
 
-        if (!window.___othelpers) {
-          removeMessageHandler();
-          return;
+    function lib$rsvp$node$$denodeify(nodeFunc, options) {
+      var fn = function() {
+        var self = this;
+        var l = arguments.length;
+        var args = new Array(l + 1);
+        var arg;
+        var promiseInput = false;
+
+        for (var i = 0; i < l; ++i) {
+          arg = arguments[i];
+
+          if (!promiseInput) {
+            // TODO: clean this up
+            promiseInput = lib$rsvp$node$$needsPromiseInput(arg);
+            if (promiseInput === lib$rsvp$node$$GET_THEN_ERROR) {
+              var p = new lib$rsvp$promise$$default(lib$rsvp$$internal$$noop);
+              lib$rsvp$$internal$$reject(p, lib$rsvp$node$$GET_THEN_ERROR.value);
+              return p;
+            } else if (promiseInput && promiseInput !== true) {
+              arg = lib$rsvp$node$$wrapThenable(promiseInput, arg);
+            }
+          }
+          args[i] = arg;
         }
 
-        if (timeouts.length > 0) {
-          var args = timeouts.shift(),
-              fn = args.shift();
+        var promise = new lib$rsvp$promise$$default(lib$rsvp$$internal$$noop);
 
-          fn.apply(null, args);
+        args[l] = function(err, val) {
+          if (err)
+            lib$rsvp$$internal$$reject(promise, err);
+          else if (options === undefined)
+            lib$rsvp$$internal$$resolve(promise, val);
+          else if (options === true)
+            lib$rsvp$$internal$$resolve(promise, lib$rsvp$node$$arrayResult(arguments));
+          else if (lib$rsvp$utils$$isArray(options))
+            lib$rsvp$$internal$$resolve(promise, lib$rsvp$node$$makeObject(arguments, options));
+          else
+            lib$rsvp$$internal$$resolve(promise, val);
+        };
+
+        if (promiseInput) {
+          return lib$rsvp$node$$handlePromiseInput(promise, args, nodeFunc, self);
+        } else {
+          return lib$rsvp$node$$handleValueInput(promise, args, nodeFunc, self);
         }
-      }
-    };
+      };
 
-    // Ensure that we don't receive messages after unload
-    // Yes, this seems to really happen in IE sometimes, usually
-    // when iFrames are involved.
-    OTHelpers.on(window, 'unload', removeMessageHandler);
+      fn.__proto__ = nodeFunc;
 
-    if(window.addEventListener) {
-      window.addEventListener('message', handleMessage, true);
-    } else if(window.attachEvent) {
-      window.attachEvent('onmessage', handleMessage);
+      return fn;
     }
 
-    _callAsync = function (/* fn, [arg1, arg2, ..., argN] */) {
-      timeouts.push(prototypeSlice.call(arguments));
-      window.postMessage(messageName, '*');
-    };
-  }
-  else {
-    _callAsync = function (/* fn, [arg1, arg2, ..., argN] */) {
-      var args = prototypeSlice.call(arguments),
-          fn = args.shift();
+    var lib$rsvp$node$$default = lib$rsvp$node$$denodeify;
+
+    function lib$rsvp$node$$handleValueInput(promise, args, nodeFunc, self) {
+      var result = lib$rsvp$node$$tryApply(nodeFunc, self, args);
+      if (result === lib$rsvp$node$$ERROR) {
+        lib$rsvp$$internal$$reject(promise, result.value);
+      }
+      return promise;
+    }
+
+    function lib$rsvp$node$$handlePromiseInput(promise, args, nodeFunc, self){
+      return lib$rsvp$promise$$default.all(args).then(function(args){
+        var result = lib$rsvp$node$$tryApply(nodeFunc, self, args);
+        if (result === lib$rsvp$node$$ERROR) {
+          lib$rsvp$$internal$$reject(promise, result.value);
+        }
+        return promise;
+      });
+    }
 
+    function lib$rsvp$node$$needsPromiseInput(arg) {
+      if (arg && typeof arg === 'object') {
+        if (arg.constructor === lib$rsvp$promise$$default) {
+          return true;
+        } else {
+          return lib$rsvp$node$$getThen(arg);
+        }
+      } else {
+        return false;
+      }
+    }
+    function lib$rsvp$race$$race(array, label) {
+      return lib$rsvp$promise$$default.race(array, label);
+    }
+    var lib$rsvp$race$$default = lib$rsvp$race$$race;
+    function lib$rsvp$reject$$reject(reason, label) {
+      return lib$rsvp$promise$$default.reject(reason, label);
+    }
+    var lib$rsvp$reject$$default = lib$rsvp$reject$$reject;
+    function lib$rsvp$resolve$$resolve(value, label) {
+      return lib$rsvp$promise$$default.resolve(value, label);
+    }
+    var lib$rsvp$resolve$$default = lib$rsvp$resolve$$resolve;
+    function lib$rsvp$rethrow$$rethrow(reason) {
       setTimeout(function() {
-        fn.apply(null, args);
-      }, 0);
-    };
-  }
+        throw reason;
+      });
+      throw reason;
+    }
+    var lib$rsvp$rethrow$$default = lib$rsvp$rethrow$$rethrow;
 
+    // default async is asap;
+    lib$rsvp$config$$config.async = lib$rsvp$asap$$default;
+    var lib$rsvp$$cast = lib$rsvp$resolve$$default;
+    function lib$rsvp$$async(callback, arg) {
+      lib$rsvp$config$$config.async(callback, arg);
+    }
 
-  // Calls the function +fn+ asynchronously with the current execution.
-  // This is most commonly used to execute something straight after
-  // the current function.
-  //
-  // Any arguments in addition to +fn+ will be passed to +fn+ when it's
-  // called.
-  //
-  // You would use this inplace of setTimeout(fn, 0) type constructs. callAsync
-  // is preferable as it executes in a much more predictable time window,
-  // unlike setTimeout which could execute anywhere from 2ms to several thousand
-  // depending on the browser/context.
-  //
-  // It does this using window.postMessage, although if postMessage won't
-  // work it will fallback to setTimeout.
-  //
-  OTHelpers.callAsync = _callAsync;
+    function lib$rsvp$$on() {
+      lib$rsvp$config$$config['on'].apply(lib$rsvp$config$$config, arguments);
+    }
 
+    function lib$rsvp$$off() {
+      lib$rsvp$config$$config['off'].apply(lib$rsvp$config$$config, arguments);
+    }
 
-  // Wraps +handler+ in a function that will execute it asynchronously
-  // so that it doesn't interfere with it's exceution context if it raises
-  // an exception.
-  OTHelpers.createAsyncHandler = function(handler) {
-    return function() {
-      var args = prototypeSlice.call(arguments);
+    // Set up instrumentation through `window.__PROMISE_INTRUMENTATION__`
+    if (typeof window !== 'undefined' && typeof window['__PROMISE_INSTRUMENTATION__'] === 'object') {
+      var lib$rsvp$$callbacks = window['__PROMISE_INSTRUMENTATION__'];
+      lib$rsvp$config$$configure('instrument', true);
+      for (var lib$rsvp$$eventName in lib$rsvp$$callbacks) {
+        if (lib$rsvp$$callbacks.hasOwnProperty(lib$rsvp$$eventName)) {
+          lib$rsvp$$on(lib$rsvp$$eventName, lib$rsvp$$callbacks[lib$rsvp$$eventName]);
+        }
+      }
+    }
 
-      OTHelpers.callAsync(function() {
-        handler.apply(null, args);
-      });
+    var lib$rsvp$umd$$RSVP = {
+      'race': lib$rsvp$race$$default,
+      'Promise': lib$rsvp$promise$$default,
+      'allSettled': lib$rsvp$all$settled$$default,
+      'hash': lib$rsvp$hash$$default,
+      'hashSettled': lib$rsvp$hash$settled$$default,
+      'denodeify': lib$rsvp$node$$default,
+      'on': lib$rsvp$$on,
+      'off': lib$rsvp$$off,
+      'map': lib$rsvp$map$$default,
+      'filter': lib$rsvp$filter$$default,
+      'resolve': lib$rsvp$resolve$$default,
+      'reject': lib$rsvp$reject$$default,
+      'all': lib$rsvp$all$$default,
+      'rethrow': lib$rsvp$rethrow$$default,
+      'defer': lib$rsvp$defer$$default,
+      'EventTarget': lib$rsvp$events$$default,
+      'configure': lib$rsvp$config$$configure,
+      'async': lib$rsvp$$async
     };
-  };
 
-})();
 
-/*jshint browser:true, smarttabs:true*/
-/*global jasmine:true*/
+    OTHelpers.RSVP = lib$rsvp$umd$$RSVP;
+}).call(this);
+/* jshint ignore:end */
 
-// tb_require('../../helpers.js')
-// tb_require('../callbacks.js')
+/*jshint browser:true, smarttabs:true */
 
-/**
-* This base class defines the <code>on</code>, <code>once</code>, and <code>off</code>
-* methods of objects that can dispatch events.
-*
-* @class EventDispatcher
-*/
-OTHelpers.eventing = function(self, syncronous) {
-  var _events = {};
+// tb_require('../helpers.js')
 
-  // Call the defaultAction, passing args
-  function executeDefaultAction(defaultAction, args) {
-    if (!defaultAction) return;
 
-    defaultAction.apply(null, args.slice());
-  }
+var getErrorLocation;
 
-  // Execute each handler in +listeners+ with +args+.
-  //
-  // Each handler will be executed async. On completion the defaultAction
-  // handler will be executed with the args.
-  //
-  // @param [Array] listeners
-  //    An array of functions to execute. Each will be passed args.
-  //
-  // @param [Array] args
-  //    An array of arguments to execute each function in  +listeners+ with.
-  //
-  // @param [String] name
-  //    The name of this event.
-  //
-  // @param [Function, Null, Undefined] defaultAction
-  //    An optional function to execute after every other handler. This will execute even
-  //    if +listeners+ is empty. +defaultAction+ will be passed args as a normal
-  //    handler would.
-  //
-  // @return Undefined
-  //
-  function executeListenersAsyncronously(name, args, defaultAction) {
-    var listeners = _events[name];
-    if (!listeners || listeners.length === 0) return;
+// Properties that we'll acknowledge from the JS Error object
+var safeErrorProps = [
+  'description',
+  'fileName',
+  'lineNumber',
+  'message',
+  'name',
+  'number',
+  'stack'
+];
 
-    var listenerAcks = listeners.length;
 
-    OTHelpers.forEach(listeners, function(listener) { // , index
-      function filterHandlerAndContext(_listener) {
-        return _listener.context === listener.context && _listener.handler === listener.handler;
-      }
+// OTHelpers.Error
+//
+// A construct to contain error information that also helps with extracting error
+// context, such as stack trace.
+//
+// @constructor
+// @memberof OTHelpers
+// @method Error
+//
+// @param {String} message
+//      Optional. The error message
+//
+// @param {Object} props
+//      Optional. A dictionary of properties containing extra Error info.
+//
+//
+// @example Create a simple error with juts a custom message
+//   var error = new OTHelpers.Error('Something Broke!');
+//   error.message === 'Something Broke!';
+//
+// @example Create an Error with a message and a name
+//   var error = new OTHelpers.Error('Something Broke!', 'FooError');
+//   error.message === 'Something Broke!';
+//   error.name === 'FooError';
+//
+// @example Create an Error with a message, name, and custom properties
+//   var error = new OTHelpers.Error('Something Broke!', 'FooError', {
+//     foo: 'bar',
+//     listOfImportantThings: [1,2,3,4]
+//   });
+//   error.message === 'Something Broke!';
+//   error.name === 'FooError';
+//   error.foo === 'bar';
+//   error.listOfImportantThings == [1,2,3,4];
+//
+// @example Create an Error from a Javascript Error
+//   var error = new OTHelpers.Error(domSyntaxError);
+//   error.message === domSyntaxError.message;
+//   error.name === domSyntaxError.name === 'SyntaxError';
+//   // ...continues for each properties of domSyntaxError
+//
+// @references
+// * https://code.google.com/p/v8/wiki/JavaScriptStackTraceApi
+// * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error/Stack
+// * http://www.w3.org/TR/dom/#interface-domerror
+//
+//
+// @todo
+// * update usage in OTMedia
+// * replace error handling in OT.js
+// * normalise stack behaviour under Chrome/Node/Safari with other browsers
+// * unit test for stack parsing
+//
+//
+OTHelpers.Error = function (message, name, props) {
+  switch (arguments.length) {
+  case 1:
+    if ($.isObject(message)) {
+      props = message;
+      name = void 0;
+      message = void 0;
+    }
+    // Otherwise it's the message
+    break;
 
-      // We run this asynchronously so that it doesn't interfere with execution if an
-      // error happens
-      OTHelpers.callAsync(function() {
-        try {
-          // have to check if the listener has not been removed
-          if (_events[name] && OTHelpers.some(_events[name], filterHandlerAndContext)) {
-            (listener.closure || listener.handler).apply(listener.context || null, args);
-          }
-        }
-        finally {
-          listenerAcks--;
+  case 2:
+    if ($.isObject(name)) {
+      props = name;
+      name = void 0;
+    }
+    // Otherwise name is actually the name
 
-          if (listenerAcks === 0) {
-            executeDefaultAction(defaultAction, args);
-          }
-        }
-      });
-    });
+    break;
   }
 
-
-  // This is identical to executeListenersAsyncronously except that handlers will
-  // be executed syncronously.
-  //
-  // On completion the defaultAction handler will be executed with the args.
-  //
-  // @param [Array] listeners
-  //    An array of functions to execute. Each will be passed args.
-  //
-  // @param [Array] args
-  //    An array of arguments to execute each function in  +listeners+ with.
-  //
-  // @param [String] name
-  //    The name of this event.
-  //
-  // @param [Function, Null, Undefined] defaultAction
-  //    An optional function to execute after every other handler. This will execute even
-  //    if +listeners+ is empty. +defaultAction+ will be passed args as a normal
-  //    handler would.
-  //
-  // @return Undefined
-  //
-  function executeListenersSyncronously(name, args) { // defaultAction is not used
-    var listeners = _events[name];
-    if (!listeners || listeners.length === 0) return;
-
-    OTHelpers.forEach(listeners, function(listener) { // index
-      (listener.closure || listener.handler).apply(listener.context || null, args);
-    });
+  if ( props instanceof Error) {
+    // Special handling of this due to Chrome weirdness. It seems that
+    // properties of the Error object, and it's children, are not
+    // enumerable in Chrome?
+    for (var i = 0, num = safeErrorProps.length; i < num; ++i) {
+      this[safeErrorProps[i]] = props[safeErrorProps[i]];
+    }
   }
-
-  var executeListeners = syncronous === true ?
-    executeListenersSyncronously : executeListenersAsyncronously;
-
-
-  var removeAllListenersNamed = function (eventName, context) {
-    if (_events[eventName]) {
-      if (context) {
-        // We are removing by context, get only events that don't
-        // match that context
-        _events[eventName] = OTHelpers.filter(_events[eventName], function(listener){
-          return listener.context !== context;
-        });
-      }
-      else {
-        delete _events[eventName];
+  else if ( $.isObject(props)) {
+    // Use an custom properties that are provided
+    for (var key in props) {
+      if (props.hasOwnProperty(key)) {
+        this[key] = props[key];
       }
     }
-  };
+  }
 
-  var addListeners = OTHelpers.bind(function (eventNames, handler, context, closure) {
-    var listener = {handler: handler};
-    if (context) listener.context = context;
-    if (closure) listener.closure = closure;
+  // If any of the fundamental properties are missing then try and
+  // extract them.
+  if ( !(this.fileName && this.lineNumber && this.columnNumber && this.stack) ) {
+    var err = getErrorLocation();
 
-    OTHelpers.forEach(eventNames, function(name) {
-      if (!_events[name]) _events[name] = [];
-      _events[name].push(listener);
-      var addedListener = name + ':added';
-      if (_events[addedListener]) {
-        executeListeners(addedListener, [_events[name].length]);
-      }
-    });
-  }, self);
+    if (!this.fileName && err.fileName) {
+      this.fileName = err.fileName;
+    }
 
+    if (!this.lineNumber && err.lineNumber) {
+      this.lineNumber = err.lineNumber;
+    }
 
-  var removeListeners = function (eventNames, handler, context) {
-    function filterHandlerAndContext(listener) {
-      return !(listener.handler === handler && listener.context === context);
+    if (!this.columnNumber && err.columnNumber) {
+      this.columnNumber = err.columnNumber;
     }
 
-    OTHelpers.forEach(eventNames, OTHelpers.bind(function(name) {
-      if (_events[name]) {
-        _events[name] = OTHelpers.filter(_events[name], filterHandlerAndContext);
-        if (_events[name].length === 0) delete _events[name];
-        var removedListener = name + ':removed';
-        if (_events[ removedListener]) {
-          executeListeners(removedListener, [_events[name] ? _events[name].length : 0]);
-        }
-      }
-    }, self));
+    if (!this.stack && err.stack) {
+      this.stack = err.stack;
+    }
+  }
 
-  };
+  if (!this.message && message) this.message = message;
+  if (!this.name && name) this.name = name;
+};
 
-  // Execute any listeners bound to the +event+ Event.
-  //
-  // Each handler will be executed async. On completion the defaultAction
-  // handler will be executed with the args.
-  //
-  // @param [Event] event
-  //    An Event object.
-  //
-  // @param [Function, Null, Undefined] defaultAction
-  //    An optional function to execute after every other handler. This will execute even
-  //    if there are listeners bound to this event. +defaultAction+ will be passed
-  //    args as a normal handler would.
-  //
-  // @return this
-  //
-  self.dispatchEvent = function(event, defaultAction) {
-    if (!event.type) {
-      OTHelpers.error('OTHelpers.Eventing.dispatchEvent: Event has no type');
-      OTHelpers.error(event);
+OTHelpers.Error.prototype.toString =
+OTHelpers.Error.prototype.valueOf = function() {
+  var locationDetails = '';
+  if (this.fileName) locationDetails += ' ' + this.fileName;
+  if (this.lineNumber) {
+    locationDetails += ' ' + this.lineNumber;
+    if (this.columnNumber) locationDetails += ':' + this.columnNumber;
+  }
 
-      throw new Error('OTHelpers.Eventing.dispatchEvent: Event has no type');
-    }
+  return '<' + (this.name ? this.name + ' ' : '') + this.message + locationDetails + '>';
+};
 
-    if (!event.target) {
-      event.target = this;
-    }
 
-    if (!_events[event.type] || _events[event.type].length === 0) {
-      executeDefaultAction(defaultAction, [event]);
-      return;
-    }
+// Normalise err.stack so that it is the same format as the other browsers
+// We skip the first two frames so that we don't capture getErrorLocation() and
+// the callee.
+//
+// Used by Environments that support the StackTrace API. (Chrome, Node, Opera)
+//
+var prepareStackTrace = function prepareStackTrace (_, stack){
+  return $.map(stack.slice(2), function(frame) {
+    var _f = {
+      fileName: frame.getFileName(),
+      linenumber: frame.getLineNumber(),
+      columnNumber: frame.getColumnNumber()
+    };
 
-    executeListeners(event.type, [event], defaultAction);
+    if (frame.getFunctionName()) _f.functionName = frame.getFunctionName();
+    if (frame.getMethodName()) _f.methodName = frame.getMethodName();
+    if (frame.getThis()) _f.self = frame.getThis();
 
-    return this;
-  };
-
-  // Execute each handler for the event called +name+.
-  //
-  // Each handler will be executed async, and any exceptions that they throw will
-  // be caught and logged
-  //
-  // How to pass these?
-  //  * defaultAction
-  //
-  // @example
-  //  foo.on('bar', function(name, message) {
-  //    alert("Hello " + name + ": " + message);
-  //  });
-  //
-  //  foo.trigger('OpenTok', 'asdf');     // -> Hello OpenTok: asdf
-  //
-  //
-  // @param [String] eventName
-  //    The name of this event.
-  //
-  // @param [Array] arguments
-  //    Any additional arguments beyond +eventName+ will be passed to the handlers.
-  //
-  // @return this
-  //
-  self.trigger = function(eventName) {
-    if (!_events[eventName] || _events[eventName].length === 0) {
-      return;
-    }
-
-    var args = prototypeSlice.call(arguments);
+    return _f;
+  });
+};
 
-    // Remove the eventName arg
-    args.shift();
 
-    executeListeners(eventName, args);
+// Black magic to retrieve error location info for various environments
+getErrorLocation = function getErrorLocation () {
+  var info = {},
+      callstack,
+      errLocation,
+      err;
 
-    return this;
-  };
+  switch ($.env.name) {
+  case 'Firefox':
+  case 'Safari':
+  case 'IE':
 
- /**
-  * Adds an event handler function for one or more events.
-  *
-  * <p>
-  * The following code adds an event handler for one event:
-  * </p>
-  *
-  * <pre>
-  * obj.on("eventName", function (event) {
-  *     // This is the event handler.
-  * });
-  * </pre>
-  *
-  * <p>If you pass in multiple event names and a handler method, the handler is
-  * registered for each of those events:</p>
-  *
-  * <pre>
-  * obj.on("eventName1 eventName2",
-  *        function (event) {
-  *            // This is the event handler.
-  *        });
-  * </pre>
-  *
-  * <p>You can also pass in a third <code>context</code> parameter (which is optional) to
-  * define the value of <code>this</code> in the handler method:</p>
-  *
-  * <pre>obj.on("eventName",
-  *        function (event) {
-  *            // This is the event handler.
-  *        },
-  *        obj);
-  * </pre>
-  *
-  * <p>
-  * The method also supports an alternate syntax, in which the first parameter is an object
-  * that is a hash map of event names and handler functions and the second parameter (optional)
-  * is the context for this in each handler:
-  * </p>
-  * <pre>
-  * obj.on(
-  *    {
-  *       eventName1: function (event) {
-  *               // This is the handler for eventName1.
-  *           },
-  *       eventName2:  function (event) {
-  *               // This is the handler for eventName2.
-  *           }
-  *    },
-  *    obj);
-  * </pre>
-  *
-  * <p>
-  * If you do not add a handler for an event, the event is ignored locally.
-  * </p>
-  *
-  * @param {String} type The string identifying the type of event. You can specify multiple event
-  * names in this string, separating them with a space. The event handler will process each of
-  * the events.
-  * @param {Function} handler The handler function to process the event. This function takes
-  * the event object as a parameter.
-  * @param {Object} context (Optional) Defines the value of <code>this</code> in the event
-  * handler function.
-  *
-  * @returns {EventDispatcher} The EventDispatcher object.
-  *
-  * @memberOf EventDispatcher
-  * @method #on
-  * @see <a href="#off">off()</a>
-  * @see <a href="#once">once()</a>
-  * @see <a href="#events">Events</a>
-  */
-  self.on = function(eventNames, handlerOrContext, context) {
-    if (typeof(eventNames) === 'string' && handlerOrContext) {
-      addListeners(eventNames.split(' '), handlerOrContext, context);
+    if ($.env.name === 'IE') {
+      err = new Error();
     }
     else {
-      for (var name in eventNames) {
-        if (eventNames.hasOwnProperty(name)) {
-          addListeners([name], eventNames[name], handlerOrContext);
-        }
+      try {
+        window.call.js.is.explody;
       }
+      catch(e) { err = e; }
     }
 
-    return this;
-  };
+    callstack = err.stack.split('\n');
 
- /**
-  * Removes an event handler or handlers.
-  *
-  * <p>If you pass in one event name and a handler method, the handler is removed for that
-  * event:</p>
-  *
-  * <pre>obj.off("eventName", eventHandler);</pre>
-  *
-  * <p>If you pass in multiple event names and a handler method, the handler is removed for
-  * those events:</p>
-  *
-  * <pre>obj.off("eventName1 eventName2", eventHandler);</pre>
-  *
-  * <p>If you pass in an event name (or names) and <i>no</i> handler method, all handlers are
-  * removed for those events:</p>
-  *
-  * <pre>obj.off("event1Name event2Name");</pre>
-  *
-  * <p>If you pass in no arguments, <i>all</i> event handlers are removed for all events
-  * dispatched by the object:</p>
-  *
-  * <pre>obj.off();</pre>
-  *
-  * <p>
-  * The method also supports an alternate syntax, in which the first parameter is an object that
-  * is a hash map of event names and handler functions and the second parameter (optional) is
-  * the context for this in each handler:
-  * </p>
-  * <pre>
-  * obj.off(
-  *    {
-  *       eventName1: event1Handler,
-  *       eventName2: event2Handler
-  *    });
-  * </pre>
-  *
-  * @param {String} type (Optional) The string identifying the type of event. You can
-  * use a space to specify multiple events, as in "accessAllowed accessDenied
-  * accessDialogClosed". If you pass in no <code>type</code> value (or other arguments),
-  * all event handlers are removed for the object.
-  * @param {Function} handler (Optional) The event handler function to remove. The handler
-  * must be the same function object as was passed into <code>on()</code>. Be careful with
-  * helpers like <code>bind()</code> that return a new function when called. If you pass in
-  * no <code>handler</code>, all event handlers are removed for the specified event
-  * <code>type</code>.
-  * @param {Object} context (Optional) If you specify a <code>context</code>, the event handler
-  * is removed for all specified events and handlers that use the specified context. (The
-  * context must match the context passed into <code>on()</code>.)
-  *
-  * @returns {Object} The object that dispatched the event.
-  *
-  * @memberOf EventDispatcher
-  * @method #off
-  * @see <a href="#on">on()</a>
-  * @see <a href="#once">once()</a>
-  * @see <a href="#events">Events</a>
-  */
-  self.off = function(eventNames, handlerOrContext, context) {
-    if (typeof eventNames === 'string') {
-      if (handlerOrContext && OTHelpers.isFunction(handlerOrContext)) {
-        removeListeners(eventNames.split(' '), handlerOrContext, context);
-      }
-      else {
-        OTHelpers.forEach(eventNames.split(' '), function(name) {
-          removeAllListenersNamed(name, handlerOrContext);
-        }, this);
-      }
+    //Remove call to getErrorLocation() and the callee
+    callstack.shift();
+    callstack.shift();
 
-    } else if (!eventNames) {
-      // remove all bound events
-      _events = {};
+    info.stack = callstack;
 
-    } else {
-      for (var name in eventNames) {
-        if (eventNames.hasOwnProperty(name)) {
-          removeListeners([name], eventNames[name], handlerOrContext);
-        }
-      }
+    if ($.env.name === 'IE') {
+      // IE also includes the error message in it's stack trace
+      info.stack.shift();
+
+      // each line begins with some amounts of spaces and 'at', we remove
+      // these to normalise with the other browsers.
+      info.stack = $.map(callstack, function(call) {
+        return call.replace(/^\s+at\s+/g, '');
+      });
     }
 
-    return this;
-  };
+    errLocation = /@(.+?):([0-9]+)(:([0-9]+))?$/.exec(callstack[0]);
+    if (errLocation) {
+      info.fileName = errLocation[1];
+      info.lineNumber = parseInt(errLocation[2], 10);
+      if (errLocation.length > 3) info.columnNumber = parseInt(errLocation[4], 10);
+    }
+    break;
 
+  case 'Chrome':
+  case 'Node':
+  case 'Opera':
+    var currentPST = Error.prepareStackTrace;
+    Error.prepareStackTrace = prepareStackTrace;
+    err = new Error();
+    info.stack = err.stack;
+    Error.prepareStackTrace = currentPST;
 
- /**
-  * Adds an event handler function for one or more events. Once the handler is called,
-  * the specified handler method is removed as a handler for this event. (When you use
-  * the <code>on()</code> method to add an event handler, the handler is <i>not</i>
-  * removed when it is called.) The <code>once()</code> method is the equivilent of
-  * calling the <code>on()</code>
-  * method and calling <code>off()</code> the first time the handler is invoked.
-  *
-  * <p>
-  * The following code adds a one-time event handler for the <code>accessAllowed</code> event:
-  * </p>
-  *
-  * <pre>
-  * obj.once("eventName", function (event) {
-  *    // This is the event handler.
-  * });
-  * </pre>
-  *
-  * <p>If you pass in multiple event names and a handler method, the handler is registered
-  * for each of those events:</p>
-  *
-  * <pre>obj.once("eventName1 eventName2"
-  *          function (event) {
-  *              // This is the event handler.
-  *          });
-  * </pre>
-  *
-  * <p>You can also pass in a third <code>context</code> parameter (which is optional) to define
-  * the value of
-  * <code>this</code> in the handler method:</p>
-  *
-  * <pre>obj.once("eventName",
-  *          function (event) {
-  *              // This is the event handler.
-  *          },
-  *          obj);
-  * </pre>
-  *
-  * <p>
-  * The method also supports an alternate syntax, in which the first parameter is an object that
-  * is a hash map of event names and handler functions and the second parameter (optional) is the
-  * context for this in each handler:
-  * </p>
-  * <pre>
-  * obj.once(
-  *    {
-  *       eventName1: function (event) {
-  *                  // This is the event handler for eventName1.
-  *           },
-  *       eventName2:  function (event) {
-  *                  // This is the event handler for eventName1.
-  *           }
-  *    },
-  *    obj);
-  * </pre>
-  *
-  * @param {String} type The string identifying the type of event. You can specify multiple
-  * event names in this string, separating them with a space. The event handler will process
-  * the first occurence of the events. After the first event, the handler is removed (for
-  * all specified events).
-  * @param {Function} handler The handler function to process the event. This function takes
-  * the event object as a parameter.
-  * @param {Object} context (Optional) Defines the value of <code>this</code> in the event
-  * handler function.
-  *
-  * @returns {Object} The object that dispatched the event.
-  *
-  * @memberOf EventDispatcher
-  * @method #once
-  * @see <a href="#on">on()</a>
-  * @see <a href="#off">off()</a>
-  * @see <a href="#events">Events</a>
-  */
-  self.once = function(eventNames, handler, context) {
-    var names = eventNames.split(' '),
-        fun = OTHelpers.bind(function() {
-          var result = handler.apply(context || null, arguments);
-          removeListeners(names, handler, context);
+    var topFrame = info.stack[0];
+    info.lineNumber = topFrame.lineNumber;
+    info.columnNumber = topFrame.columnNumber;
+    info.fileName = topFrame.fileName;
+    if (topFrame.functionName) info.functionName = topFrame.functionName;
+    if (topFrame.methodName) info.methodName = topFrame.methodName;
+    if (topFrame.self) info.self = topFrame.self;
+    break;
+
+  default:
+    err = new Error();
+    if (err.stack) info.stack = err.stack.split('\n');
+    break;
+  }
+
+  if (err.message) info.message = err.message;
+  return info;
+};
+
+
+/*jshint browser:true, smarttabs:true*/
+/* global process */
+
+// tb_require('../helpers.js')
+
+
+// OTHelpers.env
+//
+// Contains information about the current environment.
+// * **OTHelpers.env.name** The name of the Environment (Chrome, FF, Node, etc)
+// * **OTHelpers.env.version** Usually a Float, except in Node which uses a String
+// * **OTHelpers.env.userAgent** The raw user agent
+// * **OTHelpers.env.versionGreaterThan** A helper method that returns true if the
+// current version is greater than the argument
+//
+// Example
+//     if (OTHelpers.env.versionGreaterThan('0.10.30')) {
+//       // do something
+//     }
+//
+(function() {
+  // @todo make exposing userAgent unnecessary
+  var version = -1;
+
+  // Returns true if otherVersion is greater than the current environment
+  // version.
+  var versionGEThan = function versionGEThan (otherVersion) {
+    if (otherVersion === version) return true;
+
+    if (typeof(otherVersion) === 'number' && typeof(version) === 'number') {
+      return otherVersion > version;
+    }
+
+    // The versions have multiple components (i.e. 0.10.30) and
+    // must be compared piecewise.
+    // Note: I'm ignoring the case where one version has multiple
+    // components and the other doesn't.
+    var v1 = otherVersion.split('.'),
+        v2 = version.split('.'),
+        versionLength = (v1.length > v2.length ? v2 : v1).length;
+
+    for (var i = 0; i < versionLength; ++i) {
+      if (parseInt(v1[i], 10) > parseInt(v2[i], 10)) {
+        return true;
+      }
+    }
+
+    // Special case, v1 has extra components but the initial components
+    // were identical, we assume this means newer but it might also mean
+    // that someone changed versioning systems.
+    if (i < v1.length) {
+      return true;
+    }
+
+    return false;
+  };
+
+  var env = function() {
+    if (typeof(process) !== 'undefined' &&
+        typeof(process.versions) !== 'undefined' &&
+        typeof(process.versions.node) === 'string') {
+
+      version = process.versions.node;
+      if (version.substr(1) === 'v') version = version.substr(1);
+
+      // Special casing node to avoid gating window.navigator.
+      // Version will be a string rather than a float.
+      return {
+        name: 'Node',
+        version: version,
+        userAgent: 'Node ' + version,
+        iframeNeedsLoad: false,
+        versionGreaterThan: versionGEThan
+      };
+    }
+
+    var userAgent = window.navigator.userAgent.toLowerCase(),
+        appName = window.navigator.appName,
+        navigatorVendor,
+        name = 'unknown';
+
+    if (userAgent.indexOf('opera') > -1 || userAgent.indexOf('opr') > -1) {
+      name = 'Opera';
+
+      if (/opr\/([0-9]{1,}[\.0-9]{0,})/.exec(userAgent) !== null) {
+        version = parseFloat( RegExp.$1 );
+      }
+
+    } else if (userAgent.indexOf('firefox') > -1)   {
+      name = 'Firefox';
+
+      if (/firefox\/([0-9]{1,}[\.0-9]{0,})/.exec(userAgent) !== null) {
+        version = parseFloat( RegExp.$1 );
+      }
+
+    } else if (appName === 'Microsoft Internet Explorer') {
+      // IE 10 and below
+      name = 'IE';
+
+      if (/msie ([0-9]{1,}[\.0-9]{0,})/.exec(userAgent) !== null) {
+        version = parseFloat( RegExp.$1 );
+      }
+
+    } else if (appName === 'Netscape' && userAgent.indexOf('trident') > -1) {
+      // IE 11+
+
+      name = 'IE';
+
+      if (/trident\/.*rv:([0-9]{1,}[\.0-9]{0,})/.exec(userAgent) !== null) {
+        version = parseFloat( RegExp.$1 );
+      }
+
+    } else if (userAgent.indexOf('chrome') > -1) {
+      name = 'Chrome';
+
+      if (/chrome\/([0-9]{1,}[\.0-9]{0,})/.exec(userAgent) !== null) {
+        version = parseFloat( RegExp.$1 );
+      }
+
+    } else if ((navigatorVendor = window.navigator.vendor) &&
+      navigatorVendor.toLowerCase().indexOf('apple') > -1) {
+      name = 'Safari';
+
+      if (/version\/([0-9]{1,}[\.0-9]{0,})/.exec(userAgent) !== null) {
+        version = parseFloat( RegExp.$1 );
+      }
+    }
+
+    return {
+      name: name,
+      version: version,
+      userAgent: window.navigator.userAgent,
+      iframeNeedsLoad: userAgent.indexOf('webkit') < 0,
+      versionGreaterThan: versionGEThan
+    };
+  }();
+
+
+  OTHelpers.env = env;
+
+  OTHelpers.browser = function() {
+    return OTHelpers.env.name;
+  };
+
+  OTHelpers.browserVersion = function() {
+    return OTHelpers.env;
+  };
+
+})();
+// tb_require('../../environment.js')
+// tb_require('./event.js')
+
+var nodeEventing;
+
+if($.env.name === 'Node') {
+  (function() {
+    var EventEmitter = require('events').EventEmitter,
+        util = require('util');
+
+    // container for the EventEmitter behaviour. This prevents tight coupling
+    // caused by accidentally bleeding implementation details and API into whatever
+    // objects nodeEventing is applied to.
+    var NodeEventable = function NodeEventable () {
+      EventEmitter.call(this);
+
+      this.events = {};
+    };
+    util.inherits(NodeEventable, EventEmitter);
+
+
+    nodeEventing = function nodeEventing (/* self */) {
+      var api = new NodeEventable(),
+          _on = api.on,
+          _off = api.removeListener;
+
+
+      api.addListeners = function (eventNames, handler, context, closure) {
+        var listener = {handler: handler};
+        if (context) listener.context = context;
+        if (closure) listener.closure = closure;
+
+        $.forEach(eventNames, function(name) {
+          if (!api.events[name]) api.events[name] = [];
+          api.events[name].push(listener);
+
+          _on(name, handler);
+
+          var addedListener = name + ':added';
+          if (api.events[addedListener]) {
+            api.emit(addedListener, api.events[name].length);
+          }
+        });
+      };
+
+      api.removeAllListenersNamed = function (eventNames) {
+        var _eventNames = eventNames.split(' ');
+        api.removeAllListeners(_eventNames);
+
+        $.forEach(_eventNames, function(name) {
+          if (api.events[name]) delete api.events[name];
+        });
+      };
+
+      api.removeListeners = function (eventNames, handler, closure) {
+        function filterHandlers(listener) {
+          return !(listener.handler === handler && listener.closure === closure);
+        }
+
+        $.forEach(eventNames.split(' '), function(name) {
+          if (api.events[name]) {
+            _off(name, handler);
+            api.events[name] = $.filter(api.events[name], filterHandlers);
+            if (api.events[name].length === 0) delete api.events[name];
+
+            var removedListener = name + ':removed';
+            if (api.events[removedListener]) {
+              api.emit(removedListener, api.events[name] ? api.events[name].length : 0);
+            }
+          }
+        });
+      };
+
+      api.removeAllListeners = function () {
+        api.events = {};
+        api.removeAllListeners();
+      };
+
+      api.dispatchEvent = function(event, defaultAction) {
+        this.emit(event.type, event);
+
+        if (defaultAction) {
+          defaultAction.call(null, event);
+        }
+      };
+
+      api.trigger = $.bind(api.emit, api);
+
+
+      return api;
+    };
+  })();
+}
+
+// tb_require('../../environment.js')
+// tb_require('./event.js')
+
+var browserEventing;
+
+if($.env.name !== 'Node') {
+
+  browserEventing = function browserEventing (self, syncronous) {
+    var api = {
+      events: {}
+    };
+
+
+    // Call the defaultAction, passing args
+    function executeDefaultAction(defaultAction, args) {
+      if (!defaultAction) return;
+
+      defaultAction.apply(null, args.slice());
+    }
+
+    // Execute each handler in +listeners+ with +args+.
+    //
+    // Each handler will be executed async. On completion the defaultAction
+    // handler will be executed with the args.
+    //
+    // @param [Array] listeners
+    //    An array of functions to execute. Each will be passed args.
+    //
+    // @param [Array] args
+    //    An array of arguments to execute each function in  +listeners+ with.
+    //
+    // @param [String] name
+    //    The name of this event.
+    //
+    // @param [Function, Null, Undefined] defaultAction
+    //    An optional function to execute after every other handler. This will execute even
+    //    if +listeners+ is empty. +defaultAction+ will be passed args as a normal
+    //    handler would.
+    //
+    // @return Undefined
+    //
+    function executeListenersAsyncronously(name, args, defaultAction) {
+      var listeners = api.events[name];
+      if (!listeners || listeners.length === 0) return;
+
+      var listenerAcks = listeners.length;
+
+      $.forEach(listeners, function(listener) { // , index
+        function filterHandlers(_listener) {
+          return _listener.handler === listener.handler;
+        }
+
+        // We run this asynchronously so that it doesn't interfere with execution if an
+        // error happens
+        $.callAsync(function() {
+          try {
+            // have to check if the listener has not been removed
+            if (api.events[name] && $.some(api.events[name], filterHandlers)) {
+              (listener.closure || listener.handler).apply(listener.context || null, args);
+            }
+          }
+          finally {
+            listenerAcks--;
+
+            if (listenerAcks === 0) {
+              executeDefaultAction(defaultAction, args);
+            }
+          }
+        });
+      });
+    }
+
+
+    // This is identical to executeListenersAsyncronously except that handlers will
+    // be executed syncronously.
+    //
+    // On completion the defaultAction handler will be executed with the args.
+    //
+    // @param [Array] listeners
+    //    An array of functions to execute. Each will be passed args.
+    //
+    // @param [Array] args
+    //    An array of arguments to execute each function in  +listeners+ with.
+    //
+    // @param [String] name
+    //    The name of this event.
+    //
+    // @param [Function, Null, Undefined] defaultAction
+    //    An optional function to execute after every other handler. This will execute even
+    //    if +listeners+ is empty. +defaultAction+ will be passed args as a normal
+    //    handler would.
+    //
+    // @return Undefined
+    //
+    function executeListenersSyncronously(name, args) { // defaultAction is not used
+      var listeners = api.events[name];
+      if (!listeners || listeners.length === 0) return;
+
+      $.forEach(listeners, function(listener) { // index
+        (listener.closure || listener.handler).apply(listener.context || null, args);
+      });
+    }
+
+    var executeListeners = syncronous === true ?
+      executeListenersSyncronously : executeListenersAsyncronously;
+
+
+    api.addListeners = function (eventNames, handler, context, closure) {
+      var listener = {handler: handler};
+      if (context) listener.context = context;
+      if (closure) listener.closure = closure;
+
+      $.forEach(eventNames, function(name) {
+        if (!api.events[name]) api.events[name] = [];
+        api.events[name].push(listener);
+
+        var addedListener = name + ':added';
+        if (api.events[addedListener]) {
+          executeListeners(addedListener, [api.events[name].length]);
+        }
+      });
+    };
+
+    api.removeListeners = function(eventNames, handler, context) {
+      function filterListeners(listener) {
+        var isCorrectHandler = (
+          listener.handler.originalHandler === handler ||
+          listener.handler === handler
+        );
+
+        return !(isCorrectHandler && listener.context === context);
+      }
+
+      $.forEach(eventNames, function(name) {
+        if (api.events[name]) {
+          api.events[name] = $.filter(api.events[name], filterListeners);
+          if (api.events[name].length === 0) delete api.events[name];
+
+          var removedListener = name + ':removed';
+          if (api.events[ removedListener]) {
+            executeListeners(removedListener, [api.events[name] ? api.events[name].length : 0]);
+          }
+        }
+      });
+    };
+
+    api.removeAllListenersNamed = function (eventNames) {
+      $.forEach(eventNames, function(name) {
+        if (api.events[name]) {
+          delete api.events[name];
+        }
+      });
+    };
+
+    api.removeAllListeners = function () {
+      api.events = {};
+    };
+
+    api.dispatchEvent = function(event, defaultAction) {
+      if (!api.events[event.type] || api.events[event.type].length === 0) {
+        executeDefaultAction(defaultAction, [event]);
+        return;
+      }
+
+      executeListeners(event.type, [event], defaultAction);
+    };
+
+    api.trigger = function(eventName, args) {
+      if (!api.events[eventName] || api.events[eventName].length === 0) {
+        return;
+      }
+
+      executeListeners(eventName, args);
+    };
+
+
+    return api;
+  };
+}
+
+/*jshint browser:false, smarttabs:true*/
+/* global window, require */
+
+// tb_require('../../helpers.js')
+// tb_require('../environment.js')
+
+if (window.OTHelpers.env.name === 'Node') {
+  var request = require('request');
+
+  OTHelpers.request = function(url, options, callback) {
+    var completion = function(error, response, body) {
+      var event = {response: response, body: body};
+
+      // We need to detect things that Request considers a success,
+      // but we consider to be failures.
+      if (!error && response.statusCode >= 200 &&
+                  (response.statusCode < 300 || response.statusCode === 304) ) {
+        callback(null, event);
+      } else {
+        callback(error, event);
+      }
+    };
+
+    if (options.method.toLowerCase() === 'get') {
+      request.get(url, completion);
+    }
+    else {
+      request.post(url, options.body, completion);
+    }
+  };
+
+  OTHelpers.getJSON = function(url, options, callback) {
+    var extendedHeaders = require('underscore').extend(
+      {
+        'Accept': 'application/json'
+      },
+      options.headers || {}
+    );
+
+    request.get({
+      url: url,
+      headers: extendedHeaders,
+      json: true
+    }, function(err, response) {
+      callback(err, response && response.body);
+    });
+  };
+}
+/*jshint browser:true, smarttabs:true*/
+
+// tb_require('../../helpers.js')
+// tb_require('../environment.js')
+
+function formatPostData(data) { //, contentType
+  // If it's a string, we assume it's properly encoded
+  if (typeof(data) === 'string') return data;
+
+  var queryString = [];
+
+  for (var key in data) {
+    queryString.push(
+      encodeURIComponent(key) + '=' + encodeURIComponent(data[key])
+    );
+  }
+
+  return queryString.join('&').replace(/\+/g, '%20');
+}
+
+if (window.OTHelpers.env.name !== 'Node') {
+
+  OTHelpers.xdomainRequest = function(url, options, callback) {
+    /*global XDomainRequest*/
+    var xdr = new XDomainRequest(),
+        _options = options || {},
+        _method = _options.method.toLowerCase();
+
+    if(!_method) {
+      callback(new Error('No HTTP method specified in options'));
+      return;
+    }
+
+    _method = _method.toUpperCase();
+
+    if(!(_method === 'GET' || _method === 'POST')) {
+      callback(new Error('HTTP method can only be '));
+      return;
+    }
+
+    function done(err, event) {
+      xdr.onload = xdr.onerror = xdr.ontimeout = function() {};
+      xdr = void 0;
+      callback(err, event);
+    }
+
+
+    xdr.onload = function() {
+      done(null, {
+        target: {
+          responseText: xdr.responseText,
+          headers: {
+            'content-type': xdr.contentType
+          }
+        }
+      });
+    };
+
+    xdr.onerror = function() {
+      done(new Error('XDomainRequest of ' + url + ' failed'));
+    };
+
+    xdr.ontimeout = function() {
+      done(new Error('XDomainRequest of ' + url + ' timed out'));
+    };
+
+    xdr.open(_method, url);
+    xdr.send(options.body && formatPostData(options.body));
+
+  };
+
+  OTHelpers.request = function(url, options, callback) {
+    var request = new XMLHttpRequest(),
+        _options = options || {},
+        _method = _options.method;
+
+    if(!_method) {
+      callback(new Error('No HTTP method specified in options'));
+      return;
+    }
+
+    // Setup callbacks to correctly respond to success and error callbacks. This includes
+    // interpreting the responses HTTP status, which XmlHttpRequest seems to ignore
+    // by default.
+    if(callback) {
+      OTHelpers.on(request, 'load', function(event) {
+        var status = event.target.status;
+
+        // We need to detect things that XMLHttpRequest considers a success,
+        // but we consider to be failures.
+        if ( status >= 200 && (status < 300 || status === 304) ) {
+          callback(null, event);
+        } else {
+          callback(event);
+        }
+      });
+
+      OTHelpers.on(request, 'error', callback);
+    }
+
+    request.open(options.method, url, true);
+
+    if (!_options.headers) _options.headers = {};
+
+    for (var name in _options.headers) {
+      request.setRequestHeader(name, _options.headers[name]);
+    }
+
+    request.send(options.body && formatPostData(options.body));
+  };
+
+
+  OTHelpers.getJSON = function(url, options, callback) {
+    options = options || {};
+
+    var done = function(error, event) {
+      if(error) {
+        callback(error, event && event.target && event.target.responseText);
+      } else {
+        var response;
+
+        try {
+          response = JSON.parse(event.target.responseText);
+        } catch(e) {
+          // Badly formed JSON
+          callback(e, event && event.target && event.target.responseText);
+          return;
+        }
+
+        callback(null, response, event);
+      }
+    };
+
+    if(options.xdomainrequest) {
+      OTHelpers.xdomainRequest(url, { method: 'GET' }, done);
+    } else {
+      var extendedHeaders = OTHelpers.extend({
+        'Accept': 'application/json'
+      }, options.headers || {});
+
+      OTHelpers.get(url, OTHelpers.extend(options || {}, {
+        headers: extendedHeaders
+      }), done);
+    }
+
+  };
+
+}
+/*jshint browser:true, smarttabs:true*/
+
+// tb_require('../helpers.js')
+// tb_require('./environment.js')
+
+
+// Log levels for OTLog.setLogLevel
+var LOG_LEVEL_DEBUG = 5,
+    LOG_LEVEL_LOG   = 4,
+    LOG_LEVEL_INFO  = 3,
+    LOG_LEVEL_WARN  = 2,
+    LOG_LEVEL_ERROR = 1,
+    LOG_LEVEL_NONE  = 0;
+
+
+// There is a single global log level for every component that uses
+// the logs.
+var _logLevel = LOG_LEVEL_NONE;
+
+var setLogLevel = function setLogLevel (level) {
+  _logLevel = typeof(level) === 'number' ? level : 0;
+  return _logLevel;
+};
+
+
+OTHelpers.useLogHelpers = function(on){
+
+  // Log levels for OTLog.setLogLevel
+  on.DEBUG    = LOG_LEVEL_DEBUG;
+  on.LOG      = LOG_LEVEL_LOG;
+  on.INFO     = LOG_LEVEL_INFO;
+  on.WARN     = LOG_LEVEL_WARN;
+  on.ERROR    = LOG_LEVEL_ERROR;
+  on.NONE     = LOG_LEVEL_NONE;
+
+  var _logs = [],
+      _canApplyConsole = true;
+
+  try {
+    Function.prototype.bind.call(window.console.log, window.console);
+  } catch (err) {
+    _canApplyConsole = false;
+  }
+
+  // Some objects can't be logged in the console, mostly these are certain
+  // types of native objects that are exposed to JS. This is only really a
+  // problem with IE, hence only the IE version does anything.
+  var makeLogArgumentsSafe = function(args) { return args; };
+
+  if (OTHelpers.env.name === 'IE') {
+    makeLogArgumentsSafe = function(args) {
+      return [toDebugString(prototypeSlice.apply(args))];
+    };
+  }
+
+  // Generates a logging method for a particular method and log level.
+  //
+  // Attempts to handle the following cases:
+  // * the desired log method doesn't exist, call fallback (if available) instead
+  // * the console functionality isn't available because the developer tools (in IE)
+  // aren't open, call fallback (if available)
+  // * attempt to deal with weird IE hosted logging methods as best we can.
+  //
+  function generateLoggingMethod(method, level, fallback) {
+    return function() {
+      if (on.shouldLog(level)) {
+        var cons = window.console,
+            args = makeLogArgumentsSafe(arguments);
+
+        // In IE, window.console may not exist if the developer tools aren't open
+        // This also means that cons and cons[method] can appear at any moment
+        // hence why we retest this every time.
+        if (cons && cons[method]) {
+          // the desired console method isn't a real object, which means
+          // that we can't use apply on it. We force it to be a real object
+          // using Function.bind, assuming that's available.
+          if (cons[method].apply || _canApplyConsole) {
+            if (!cons[method].apply) {
+              cons[method] = Function.prototype.bind.call(cons[method], cons);
+            }
+
+            cons[method].apply(cons, args);
+          }
+          else {
+            // This isn't the same result as the above, but it's better
+            // than nothing.
+            cons[method](args);
+          }
+        }
+        else if (fallback) {
+          fallback.apply(on, args);
+
+          // Skip appendToLogs, we delegate entirely to the fallback
+          return;
+        }
+
+        appendToLogs(method, makeLogArgumentsSafe(arguments));
+      }
+    };
+  }
+
+  on.log = generateLoggingMethod('log', on.LOG);
+
+  // Generate debug, info, warn, and error logging methods, these all fallback to on.log
+  on.debug = generateLoggingMethod('debug', on.DEBUG, on.log);
+  on.info = generateLoggingMethod('info', on.INFO, on.log);
+  on.warn = generateLoggingMethod('warn', on.WARN, on.log);
+  on.error = generateLoggingMethod('error', on.ERROR, on.log);
+
+
+  on.setLogLevel = function(level) {
+    on.debug('TB.setLogLevel(' + _logLevel + ')');
+    return setLogLevel(level);
+  };
+
+  on.getLogs = function() {
+    return _logs;
+  };
+
+  // Determine if the level is visible given the current logLevel.
+  on.shouldLog = function(level) {
+    return _logLevel >= level;
+  };
+
+  // Format the current time nicely for logging. Returns the current
+  // local time.
+  function formatDateStamp() {
+    var now = new Date();
+    return now.toLocaleTimeString() + now.getMilliseconds();
+  }
+
+  function toJson(object) {
+    try {
+      return JSON.stringify(object);
+    } catch(e) {
+      return object.toString();
+    }
+  }
+
+  function toDebugString(object) {
+    var components = [];
+
+    if (typeof(object) === 'undefined') {
+      // noop
+    }
+    else if (object === null) {
+      components.push('NULL');
+    }
+    else if (OTHelpers.isArray(object)) {
+      for (var i=0; i<object.length; ++i) {
+        components.push(toJson(object[i]));
+      }
+    }
+    else if (OTHelpers.isObject(object)) {
+      for (var key in object) {
+        var stringValue;
+
+        if (!OTHelpers.isFunction(object[key])) {
+          stringValue = toJson(object[key]);
+        }
+        else if (object.hasOwnProperty(key)) {
+          stringValue = 'function ' + key + '()';
+        }
+
+        components.push(key + ': ' + stringValue);
+      }
+    }
+    else if (OTHelpers.isFunction(object)) {
+      try {
+        components.push(object.toString());
+      } catch(e) {
+        components.push('function()');
+      }
+    }
+    else  {
+      components.push(object.toString());
+    }
+
+    return components.join(', ');
+  }
+
+  // Append +args+ to logs, along with the current log level and the a date stamp.
+  function appendToLogs(level, args) {
+    if (!args) return;
+
+    var message = toDebugString(args);
+    if (message.length <= 2) return;
+
+    _logs.push(
+      [level, formatDateStamp(), message]
+    );
+  }
+};
+
+OTHelpers.useLogHelpers(OTHelpers);
+OTHelpers.setLogLevel(OTHelpers.ERROR);
+
+/*jshint browser:true, smarttabs:true*/
+
+// tb_require('../helpers.js')
+
+// DOM helpers
+
+// Helper function for adding event listeners to dom elements.
+// WARNING: This doesn't preserve event types, your handler could
+// be getting all kinds of different parameters depending on the browser.
+// You also may have different scopes depending on the browser and bubbling
+// and cancelable are not supported.
+ElementCollection.prototype.on = function (eventName, handler) {
+  return this.forEach(function(element) {
+    if (element.addEventListener) {
+      element.addEventListener(eventName, handler, false);
+    } else if (element.attachEvent) {
+      element.attachEvent('on' + eventName, handler);
+    } else {
+      var oldHandler = element['on'+eventName];
+      element['on'+eventName] = function() {
+        handler.apply(this, arguments);
+        if (oldHandler) oldHandler.apply(this, arguments);
+      };
+    }
+  });
+};
+
+// Helper function for removing event listeners from dom elements.
+ElementCollection.prototype.off = function (eventName, handler) {
+  return this.forEach(function(element) {
+    if (element.removeEventListener) {
+      element.removeEventListener (eventName, handler,false);
+    }
+    else if (element.detachEvent) {
+      element.detachEvent('on' + eventName, handler);
+    }
+  });
+};
+
+ElementCollection.prototype.once = function (eventName, handler) {
+  var removeAfterTrigger = $.bind(function() {
+    this.off(eventName, removeAfterTrigger);
+    handler.apply(null, arguments);
+  }, this);
+
+  return this.on(eventName, removeAfterTrigger);
+};
+
+// @remove
+OTHelpers.on = function(element, eventName,  handler) {
+  return $(element).on(eventName, handler);
+};
+
+// @remove
+OTHelpers.off = function(element, eventName, handler) {
+  return $(element).off(eventName, handler);
+};
+
+// @remove
+OTHelpers.once = function (element, eventName, handler) {
+  return $(element).once(eventName, handler);
+};
+
+/*jshint browser:true, smarttabs:true*/
+
+// tb_require('../helpers.js')
+// tb_require('./dom_events.js')
+
+(function() {
+
+  var _domReady = typeof(document) === 'undefined' ||
+                    document.readyState === 'complete' ||
+                   (document.readyState === 'interactive' && document.body),
+
+      _loadCallbacks = [],
+      _unloadCallbacks = [],
+      _domUnloaded = false,
+
+      onDomReady = function() {
+        _domReady = true;
+
+        if (typeof(document) !== 'undefined') {
+          if ( document.addEventListener ) {
+            document.removeEventListener('DOMContentLoaded', onDomReady, false);
+            window.removeEventListener('load', onDomReady, false);
+          } else {
+            document.detachEvent('onreadystatechange', onDomReady);
+            window.detachEvent('onload', onDomReady);
+          }
+        }
+
+        // This is making an assumption about there being only one 'window'
+        // that we care about.
+        OTHelpers.on(window, 'unload', onDomUnload);
+
+        OTHelpers.forEach(_loadCallbacks, function(listener) {
+          listener[0].call(listener[1]);
+        });
+
+        _loadCallbacks = [];
+      },
+
+      onDomUnload = function() {
+        _domUnloaded = true;
+
+        OTHelpers.forEach(_unloadCallbacks, function(listener) {
+          listener[0].call(listener[1]);
+        });
+
+        _unloadCallbacks = [];
+      };
+
+
+  OTHelpers.onDOMLoad = function(cb, context) {
+    if (OTHelpers.isReady()) {
+      cb.call(context);
+      return;
+    }
+
+    _loadCallbacks.push([cb, context]);
+  };
+
+  OTHelpers.onDOMUnload = function(cb, context) {
+    if (this.isDOMUnloaded()) {
+      cb.call(context);
+      return;
+    }
+
+    _unloadCallbacks.push([cb, context]);
+  };
+
+  OTHelpers.isReady = function() {
+    return !_domUnloaded && _domReady;
+  };
+
+  OTHelpers.isDOMUnloaded = function() {
+    return _domUnloaded;
+  };
+
+  if (_domReady) {
+    onDomReady();
+  } else if(typeof(document) !== 'undefined') {
+    if (document.addEventListener) {
+      document.addEventListener('DOMContentLoaded', onDomReady, false);
+
+      // fallback
+      window.addEventListener( 'load', onDomReady, false );
+
+    } else if (document.attachEvent) {
+      document.attachEvent('onreadystatechange', function() {
+        if (document.readyState === 'complete') onDomReady();
+      });
+
+      // fallback
+      window.attachEvent( 'onload', onDomReady );
+    }
+  }
+
+})();
+
+/*jshint browser:true, smarttabs:true*/
+
+// tb_require('../helpers.js')
+
+OTHelpers.setCookie = function(key, value) {
+  try {
+    localStorage.setItem(key, value);
+  } catch (err) {
+    // Store in browser cookie
+    var date = new Date();
+    date.setTime(date.getTime()+(365*24*60*60*1000));
+    var expires = '; expires=' + date.toGMTString();
+    document.cookie = key + '=' + value + expires + '; path=/';
+  }
+};
+
+OTHelpers.getCookie = function(key) {
+  var value;
+
+  try {
+    value = localStorage.getItem(key);
+    return value;
+  } catch (err) {
+    // Check browser cookies
+    var nameEQ = key + '=';
+    var ca = document.cookie.split(';');
+    for(var i=0;i < ca.length;i++) {
+      var c = ca[i];
+      while (c.charAt(0) === ' ') {
+        c = c.substring(1,c.length);
+      }
+      if (c.indexOf(nameEQ) === 0) {
+        value = c.substring(nameEQ.length,c.length);
+      }
+    }
+
+    if (value) {
+      return value;
+    }
+  }
+
+  return null;
+};
+
+// tb_require('../helpers.js')
+
+/* jshint globalstrict: true, strict: false, undef: true, unused: true,
+          trailing: true, browser: true, smarttabs:true */
+
+
+OTHelpers.Collection = function(idField) {
+  var _models = [],
+      _byId = {},
+      _idField = idField || 'id';
+
+  OTHelpers.eventing(this, true);
+
+  var modelProperty = function(model, property) {
+    if(OTHelpers.isFunction(model[property])) {
+      return model[property]();
+    } else {
+      return model[property];
+    }
+  };
+
+  var onModelUpdate = OTHelpers.bind(function onModelUpdate (event) {
+        this.trigger('update', event);
+        this.trigger('update:'+event.target.id, event);
+      }, this),
+
+      onModelDestroy = OTHelpers.bind(function onModelDestroyed (event) {
+        this.remove(event.target, event.reason);
+      }, this);
+
+
+  this.reset = function() {
+    // Stop listening on the models, they are no longer our problem
+    OTHelpers.forEach(_models, function(model) {
+      model.off('updated', onModelUpdate, this);
+      model.off('destroyed', onModelDestroy, this);
+    }, this);
+
+    _models = [];
+    _byId = {};
+  };
+
+  this.destroy = function(reason) {
+    OTHelpers.forEach(_models, function(model) {
+      if(model && typeof model.destroy === 'function') {
+        model.destroy(reason, true);
+      }
+    });
+
+    this.reset();
+    this.off();
+  };
+
+  this.get = function(id) { return id && _byId[id] !== void 0 ? _models[_byId[id]] : void 0; };
+  this.has = function(id) { return id && _byId[id] !== void 0; };
+
+  this.toString = function() { return _models.toString(); };
+
+  // Return only models filtered by either a dict of properties
+  // or a filter function.
+  //
+  // @example Return all publishers with a streamId of 1
+  //   OT.publishers.where({streamId: 1})
+  //
+  // @example The same thing but filtering using a filter function
+  //   OT.publishers.where(function(publisher) {
+  //     return publisher.stream.id === 4;
+  //   });
+  //
+  // @example The same thing but filtering using a filter function
+  //          executed with a specific this
+  //   OT.publishers.where(function(publisher) {
+  //     return publisher.stream.id === 4;
+  //   }, self);
+  //
+  this.where = function(attrsOrFilterFn, context) {
+    if (OTHelpers.isFunction(attrsOrFilterFn)) {
+      return OTHelpers.filter(_models, attrsOrFilterFn, context);
+    }
+
+    return OTHelpers.filter(_models, function(model) {
+      for (var key in attrsOrFilterFn) {
+        if(!attrsOrFilterFn.hasOwnProperty(key)) {
+          continue;
+        }
+        if (modelProperty(model, key) !== attrsOrFilterFn[key]) return false;
+      }
+
+      return true;
+    });
+  };
+
+  // Similar to where in behaviour, except that it only returns
+  // the first match.
+  this.find = function(attrsOrFilterFn, context) {
+    var filterFn;
+
+    if (OTHelpers.isFunction(attrsOrFilterFn)) {
+      filterFn = attrsOrFilterFn;
+    }
+    else {
+      filterFn = function(model) {
+        for (var key in attrsOrFilterFn) {
+          if(!attrsOrFilterFn.hasOwnProperty(key)) {
+            continue;
+          }
+          if (modelProperty(model, key) !== attrsOrFilterFn[key]) return false;
+        }
+
+        return true;
+      };
+    }
+
+    filterFn = OTHelpers.bind(filterFn, context);
+
+    for (var i=0; i<_models.length; ++i) {
+      if (filterFn(_models[i]) === true) return _models[i];
+    }
+
+    return null;
+  };
+
+  this.add = function(model) {
+    var id = modelProperty(model, _idField);
+
+    if (this.has(id)) {
+      OTHelpers.warn('Model ' + id + ' is already in the collection', _models);
+      return this;
+    }
+
+    _byId[id] = _models.push(model) - 1;
+
+    model.on('updated', onModelUpdate, this);
+    model.on('destroyed', onModelDestroy, this);
+
+    this.trigger('add', model);
+    this.trigger('add:'+id, model);
+
+    return this;
+  };
+
+  this.remove = function(model, reason) {
+    var id = modelProperty(model, _idField);
+
+    _models.splice(_byId[id], 1);
+
+    // Shuffle everyone down one
+    for (var i=_byId[id]; i<_models.length; ++i) {
+      _byId[_models[i][_idField]] = i;
+    }
+
+    delete _byId[id];
 
-          return result;
-        }, this);
+    model.off('updated', onModelUpdate, this);
+    model.off('destroyed', onModelDestroy, this);
+
+    this.trigger('remove', model, reason);
+    this.trigger('remove:'+id, model, reason);
 
-    addListeners(names, handler, context, fun);
     return this;
   };
 
-
-  /**
-  * Deprecated; use <a href="#on">on()</a> or <a href="#once">once()</a> instead.
-  * <p>
-  * This method registers a method as an event listener for a specific event.
-  * <p>
-  *
-  * <p>
-  *   If a handler is not registered for an event, the event is ignored locally. If the
-  *   event listener function does not exist, the event is ignored locally.
-  * </p>
-  * <p>
-  *   Throws an exception if the <code>listener</code> name is invalid.
-  * </p>
-  *
-  * @param {String} type The string identifying the type of event.
-  *
-  * @param {Function} listener The function to be invoked when the object dispatches the event.
-  *
-  * @param {Object} context (Optional) Defines the value of <code>this</code> in the event
-  * handler function.
-  *
-  * @memberOf EventDispatcher
-  * @method #addEventListener
-  * @see <a href="#on">on()</a>
-  * @see <a href="#once">once()</a>
-  * @see <a href="#events">Events</a>
-  */
-  // See 'on' for usage.
-  // @depreciated will become a private helper function in the future.
-  self.addEventListener = function(eventName, handler, context) {
-    OTHelpers.warn('The addEventListener() method is deprecated. Use on() or once() instead.');
-    addListeners([eventName], handler, context);
+  // Retrigger the add event behaviour for each model. You can also
+  // select a subset of models to trigger using the same arguments
+  // as the #where method.
+  this._triggerAddEvents = function() {
+    var models = this.where.apply(this, arguments);
+    OTHelpers.forEach(models, function(model) {
+      this.trigger('add', model);
+      this.trigger('add:' + modelProperty(model, _idField), model);
+    }, this);
   };
 
-
-  /**
-  * Deprecated; use <a href="#on">on()</a> or <a href="#once">once()</a> instead.
-  * <p>
-  * Removes an event listener for a specific event.
-  * <p>
-  *
-  * <p>
-  *   Throws an exception if the <code>listener</code> name is invalid.
-  * </p>
-  *
-  * @param {String} type The string identifying the type of event.
-  *
-  * @param {Function} listener The event listener function to remove.
-  *
-  * @param {Object} context (Optional) If you specify a <code>context</code>, the event
-  * handler is removed for all specified events and event listeners that use the specified
-  context. (The context must match the context passed into
-  * <code>addEventListener()</code>.)
-  *
-  * @memberOf EventDispatcher
-  * @method #removeEventListener
-  * @see <a href="#off">off()</a>
-  * @see <a href="#events">Events</a>
-  */
-  // See 'off' for usage.
-  // @depreciated will become a private helper function in the future.
-  self.removeEventListener = function(eventName, handler, context) {
-    OTHelpers.warn('The removeEventListener() method is deprecated. Use off() instead.');
-    removeListeners([eventName], handler, context);
+  this.length = function() {
+    return _models.length;
   };
-
-
-  return self;
 };
 
-OTHelpers.eventing.Event = function() {
-  return function (type, cancelable) {
-    this.type = type;
-    this.cancelable = cancelable !== undefined ? cancelable : true;
 
-    var _defaultPrevented = false;
+/*jshint browser:true, smarttabs:true*/
 
-    this.preventDefault = function() {
-      if (this.cancelable) {
-        _defaultPrevented = true;
-      } else {
-        OTHelpers.warn('Event.preventDefault :: Trying to preventDefault ' +
-          'on an Event that isn\'t cancelable');
-      }
-    };
+// tb_require('../helpers.js')
 
-    this.isDefaultPrevented = function() {
-      return _defaultPrevented;
-    };
-  };
+OTHelpers.castToBoolean = function(value, defaultValue) {
+  if (value === undefined) return defaultValue;
+  return value === 'true' || value === true;
 };
 
-/*jshint browser:true, smarttabs:true */
+OTHelpers.roundFloat = function(value, places) {
+  return Number(value.toFixed(places));
+};
+
+/*jshint browser:true, smarttabs:true*/
 
 // tb_require('../helpers.js')
-// tb_require('./callbacks.js')
-// tb_require('./dom_events.js')
 
-OTHelpers.createElement = function(nodeName, attributes, children, doc) {
-  var element = (doc || document).createElement(nodeName);
+(function() {
 
-  if (attributes) {
-    for (var name in attributes) {
-      if (typeof(attributes[name]) === 'object') {
-        if (!element[name]) element[name] = {};
+  var capabilities = {};
 
-        var subAttrs = attributes[name];
-        for (var n in subAttrs) {
-          element[name][n] = subAttrs[n];
-        }
-      }
-      else if (name === 'className') {
-        element.className = attributes[name];
-      }
-      else {
-        element.setAttribute(name, attributes[name]);
-      }
+  // Registers a new capability type and a function that will indicate
+  // whether this client has that capability.
+  //
+  //   OTHelpers.registerCapability('bundle', function() {
+  //     return OTHelpers.hasCapabilities('webrtc') &&
+  //                (OTHelpers.env.name === 'Chrome' || TBPlugin.isInstalled());
+  //   });
+  //
+  OTHelpers.registerCapability = function(name, callback) {
+    var _name = name.toLowerCase();
+
+    if (capabilities.hasOwnProperty(_name)) {
+      OTHelpers.error('Attempted to register', name, 'capability more than once');
+      return;
     }
-  }
 
-  var setChildren = function(child) {
-    if(typeof child === 'string') {
-      element.innerHTML = element.innerHTML + child;
-    } else {
-      element.appendChild(child);
+    if (!OTHelpers.isFunction(callback)) {
+      OTHelpers.error('Attempted to register', name,
+                              'capability with a callback that isn\' a function');
+      return;
     }
+
+    memoriseCapabilityTest(_name, callback);
   };
 
-  if($.isArray(children)) {
-    $.forEach(children, setChildren);
-  } else if(children) {
-    setChildren(children);
-  }
 
-  return element;
-};
+  // Wrap up a capability test in a function that memorises the
+  // result.
+  var memoriseCapabilityTest = function (name, callback) {
+    capabilities[name] = function() {
+      var result = callback();
+      capabilities[name] = function() {
+        return result;
+      };
 
-OTHelpers.createButton = function(innerHTML, attributes, events) {
-  var button = $.createElement('button', attributes, innerHTML);
+      return result;
+    };
+  };
 
-  if (events) {
-    for (var name in events) {
-      if (events.hasOwnProperty(name)) {
-        $.on(button, name, events[name]);
-      }
-    }
+  var testCapability = function (name) {
+    return capabilities[name]();
+  };
 
-    button._boundEvents = events;
-  }
 
-  return button;
-};
-/*jshint browser:true, smarttabs:true */
+  // Returns true if all of the capability names passed in
+  // exist and are met.
+  //
+  //  OTHelpers.hasCapabilities('bundle', 'rtcpMux')
+  //
+  OTHelpers.hasCapabilities = function(/* capability1, capability2, ..., capabilityN  */) {
+    var capNames = prototypeSlice.call(arguments),
+        name;
 
-// tb_require('../helpers.js')
-// tb_require('./callbacks.js')
+    for (var i=0; i<capNames.length; ++i) {
+      name = capNames[i].toLowerCase();
 
-// DOM helpers
+      if (!capabilities.hasOwnProperty(name)) {
+        OTHelpers.error('hasCapabilities was called with an unknown capability: ' + name);
+        return false;
+      }
+      else if (testCapability(name) === false) {
+        return false;
+      }
+    }
 
-ElementCollection.prototype.appendTo = function(parentElement) {
-  if (!parentElement) throw new Error('appendTo requires a DOMElement to append to.');
+    return true;
+  };
 
-  return this.forEach(parentElement.appendChild.bind(parentElement));
-};
+})();
 
-ElementCollection.prototype.after = function(prevElement) {
-  if (!prevElement) throw new Error('after requires a DOMElement to insert after');
+/*jshint browser:true, smarttabs:true*/
 
-  return this.forEach(function(element) {
-    if (element.parentElement) {
-      if (prevElement !== element.parentNode.lastChild) {
-        element.parentElement.before(element, prevElement);
-      }
-      else {
-        element.parentElement.appendChild(element);
-      }
-    }
-  });
-};
+// tb_require('../helpers.js')
+// tb_require('./capabilities.js')
 
-ElementCollection.prototype.before = function(nextElement) {
-  if (!nextElement) throw new Error('before requires a DOMElement to insert before');
+// Indicates if the client supports WebSockets.
+OTHelpers.registerCapability('websockets', function() {
+  return 'WebSocket' in window && window.WebSocket !== void 0;
+});
+/*jshint browser:true, smarttabs:true*/
 
-  return this.forEach(function(element) {
-    if (element.parentElement) {
-      element.parentElement.before(element, nextElement);
-    }
-  });
-};
+// tb_require('../helpers.js')
+// tb_require('../vendor/uuid.js')
+// tb_require('./dom_events.js')
 
-ElementCollection.prototype.remove = function () {
-  return this.forEach(function(element) {
-    if (element.parentNode) {
-      element.parentNode.removeChild(element);
+(function() {
+
+  var _callAsync;
+
+  // Is true if window.postMessage is supported.
+  // This is not quite as simple as just looking for
+  // window.postMessage as some older versions of IE
+  // have a broken implementation of it.
+  //
+  var supportsPostMessage = (function () {
+    if (window.postMessage) {
+      // Check to see if postMessage fires synchronously,
+      // if it does, then the implementation of postMessage
+      // is broken.
+      var postMessageIsAsynchronous = true;
+      var oldOnMessage = window.onmessage;
+      window.onmessage = function() {
+        postMessageIsAsynchronous = false;
+      };
+      window.postMessage('', '*');
+      window.onmessage = oldOnMessage;
+      return postMessageIsAsynchronous;
     }
-  });
-};
+  })();
 
-ElementCollection.prototype.empty = function () {
-  return this.forEach(function(element) {
-    // elements is a "live" NodesList collection. Meaning that the collection
-    // itself will be mutated as we remove elements from the DOM. This means
-    // that "while there are still elements" is safer than "iterate over each
-    // element" as the collection length and the elements indices will be modified
-    // with each iteration.
-    while (element.firstChild) {
-      element.removeChild(element.firstChild);
-    }
-  });
-};
+  if (supportsPostMessage) {
+    var timeouts = [],
+        messageName = 'OTHelpers.' + OTHelpers.uuid.v4() + '.zero-timeout';
 
+    var removeMessageHandler = function() {
+      timeouts = [];
 
-// Detects when an element is not part of the document flow because
-// it or one of it's ancesters has display:none.
-ElementCollection.prototype.isDisplayNone = function() {
-  return this.some(function(element) {
-    if ( (element.offsetWidth === 0 || element.offsetHeight === 0) &&
-                $(element).css('display') === 'none') return true;
+      if(window.removeEventListener) {
+        window.removeEventListener('message', handleMessage);
+      } else if(window.detachEvent) {
+        window.detachEvent('onmessage', handleMessage);
+      }
+    };
 
-    if (element.parentNode && element.parentNode.style) {
-      return $(element.parentNode).isDisplayNone();
-    }
-  });
-};
+    var handleMessage = function(event) {
+      if (event.source === window &&
+          event.data === messageName) {
 
-ElementCollection.prototype.findElementWithDisplayNone = function(element) {
-  return $.findElementWithDisplayNone(element);
-};
+        if(OTHelpers.isFunction(event.stopPropagation)) {
+          event.stopPropagation();
+        }
+        event.cancelBubble = true;
 
+        if (!window.___othelpers) {
+          removeMessageHandler();
+          return;
+        }
 
+        if (timeouts.length > 0) {
+          var args = timeouts.shift(),
+              fn = args.shift();
 
-OTHelpers.isElementNode = function(node) {
-  return node && typeof node === 'object' && node.nodeType === 1;
-};
+          fn.apply(null, args);
+        }
+      }
+    };
 
+    // Ensure that we don't receive messages after unload
+    // Yes, this seems to really happen in IE sometimes, usually
+    // when iFrames are involved.
+    OTHelpers.on(window, 'unload', removeMessageHandler);
 
-// @remove
-OTHelpers.removeElement = function(element) {
-  $(element).remove();
-};
+    if(window.addEventListener) {
+      window.addEventListener('message', handleMessage, true);
+    } else if(window.attachEvent) {
+      window.attachEvent('onmessage', handleMessage);
+    }
 
-// @remove
-OTHelpers.removeElementById = function(elementId) {
-  return $('#'+elementId).remove();
-};
+    _callAsync = function (/* fn, [arg1, arg2, ..., argN] */) {
+      timeouts.push(prototypeSlice.call(arguments));
+      window.postMessage(messageName, '*');
+    };
+  }
+  else {
+    _callAsync = function (/* fn, [arg1, arg2, ..., argN] */) {
+      var args = prototypeSlice.call(arguments),
+          fn = args.shift();
 
-// @remove
-OTHelpers.removeElementsByType = function(parentElem, type) {
-  return $(type, parentElem).remove();
-};
+      setTimeout(function() {
+        fn.apply(null, args);
+      }, 0);
+    };
+  }
 
-// @remove
-OTHelpers.emptyElement = function(element) {
-  return $(element).empty();
-};
 
+  // Calls the function +fn+ asynchronously with the current execution.
+  // This is most commonly used to execute something straight after
+  // the current function.
+  //
+  // Any arguments in addition to +fn+ will be passed to +fn+ when it's
+  // called.
+  //
+  // You would use this inplace of setTimeout(fn, 0) type constructs. callAsync
+  // is preferable as it executes in a much more predictable time window,
+  // unlike setTimeout which could execute anywhere from 2ms to several thousand
+  // depending on the browser/context.
+  //
+  // It does this using window.postMessage, although if postMessage won't
+  // work it will fallback to setTimeout.
+  //
+  OTHelpers.callAsync = _callAsync;
 
 
+  // Wraps +handler+ in a function that will execute it asynchronously
+  // so that it doesn't interfere with it's exceution context if it raises
+  // an exception.
+  OTHelpers.createAsyncHandler = function(handler) {
+    return function() {
+      var args = prototypeSlice.call(arguments);
 
+      OTHelpers.callAsync(function() {
+        handler.apply(null, args);
+      });
+    };
+  };
 
-// @remove
-OTHelpers.isDisplayNone = function(element) {
-  return $(element).isDisplayNone();
-};
+})();
 
-OTHelpers.findElementWithDisplayNone = function(element) {
-  if ( (element.offsetWidth === 0 || element.offsetHeight === 0) &&
-            $.css(element, 'display') === 'none') return element;
+/*global nodeEventing:true, browserEventing:true */
 
-  if (element.parentNode && element.parentNode.style) {
-    return $.findElementWithDisplayNone(element.parentNode);
-  }
+// tb_require('../../helpers.js')
+// tb_require('../callbacks.js')
+// tb_require('../../vendor/rsvp.js')
+// tb_require('./eventing/event.js')
+// tb_require('./eventing/node.js')
+// tb_require('./eventing/browser.js')
 
-  return null;
-};
+/**
+* This base class defines the <code>on</code>, <code>once</code>, and <code>off</code>
+* methods of objects that can dispatch events.
+*
+* @class EventDispatcher
+*/
+OTHelpers.eventing = function(self, syncronous) {
+  var _ = (nodeEventing || browserEventing)(this, syncronous);
 
+ /**
+  * Adds an event handler function for one or more events.
+  *
+  * <p>
+  * The following code adds an event handler for one event:
+  * </p>
+  *
+  * <pre>
+  * obj.on("eventName", function (event) {
+  *     // This is the event handler.
+  * });
+  * </pre>
+  *
+  * <p>If you pass in multiple event names and a handler method, the handler is
+  * registered for each of those events:</p>
+  *
+  * <pre>
+  * obj.on("eventName1 eventName2",
+  *        function (event) {
+  *            // This is the event handler.
+  *        });
+  * </pre>
+  *
+  * <p>You can also pass in a third <code>context</code> parameter (which is optional) to
+  * define the value of <code>this</code> in the handler method:</p>
+  *
+  * <pre>obj.on("eventName",
+  *        function (event) {
+  *            // This is the event handler.
+  *        },
+  *        obj);
+  * </pre>
+  *
+  * <p>
+  * The method also supports an alternate syntax, in which the first parameter is an object
+  * that is a hash map of event names and handler functions and the second parameter (optional)
+  * is the context for this in each handler:
+  * </p>
+  * <pre>
+  * obj.on(
+  *    {
+  *       eventName1: function (event) {
+  *               // This is the handler for eventName1.
+  *           },
+  *       eventName2:  function (event) {
+  *               // This is the handler for eventName2.
+  *           }
+  *    },
+  *    obj);
+  * </pre>
+  *
+  * <p>
+  * If you do not add a handler for an event, the event is ignored locally.
+  * </p>
+  *
+  * @param {String} type The string identifying the type of event. You can specify multiple event
+  * names in this string, separating them with a space. The event handler will process each of
+  * the events.
+  * @param {Function} handler The handler function to process the event. This function takes
+  * the event object as a parameter.
+  * @param {Object} context (Optional) Defines the value of <code>this</code> in the event
+  * handler function.
+  *
+  * @returns {EventDispatcher} The EventDispatcher object.
+  *
+  * @memberOf EventDispatcher
+  * @method #on
+  * @see <a href="#off">off()</a>
+  * @see <a href="#once">once()</a>
+  * @see <a href="#events">Events</a>
+  */
+  self.on = function(eventNames, handlerOrContext, context) {
+    if (typeof(eventNames) === 'string' && handlerOrContext) {
+      _.addListeners(eventNames.split(' '), handlerOrContext, context);
+    }
+    else {
+      for (var name in eventNames) {
+        if (eventNames.hasOwnProperty(name)) {
+          _.addListeners([name], eventNames[name], handlerOrContext);
+        }
+      }
+    }
 
-/*jshint browser:true, smarttabs:true*/
+    return this;
+  };
 
-// tb_require('../helpers.js')
-// tb_require('./environment.js')
-// tb_require('./dom.js')
 
-OTHelpers.Modal = function(options) {
+ /**
+  * Removes an event handler or handlers.
+  *
+  * <p>If you pass in one event name and a handler method, the handler is removed for that
+  * event:</p>
+  *
+  * <pre>obj.off("eventName", eventHandler);</pre>
+  *
+  * <p>If you pass in multiple event names and a handler method, the handler is removed for
+  * those events:</p>
+  *
+  * <pre>obj.off("eventName1 eventName2", eventHandler);</pre>
+  *
+  * <p>If you pass in an event name (or names) and <i>no</i> handler method, all handlers are
+  * removed for those events:</p>
+  *
+  * <pre>obj.off("event1Name event2Name");</pre>
+  *
+  * <p>If you pass in no arguments, <i>all</i> event handlers are removed for all events
+  * dispatched by the object:</p>
+  *
+  * <pre>obj.off();</pre>
+  *
+  * <p>
+  * The method also supports an alternate syntax, in which the first parameter is an object that
+  * is a hash map of event names and handler functions and the second parameter (optional) is
+  * the context for this in each handler:
+  * </p>
+  * <pre>
+  * obj.off(
+  *    {
+  *       eventName1: event1Handler,
+  *       eventName2: event2Handler
+  *    });
+  * </pre>
+  *
+  * @param {String} type (Optional) The string identifying the type of event. You can
+  * use a space to specify multiple events, as in "accessAllowed accessDenied
+  * accessDialogClosed". If you pass in no <code>type</code> value (or other arguments),
+  * all event handlers are removed for the object.
+  * @param {Function} handler (Optional) The event handler function to remove. The handler
+  * must be the same function object as was passed into <code>on()</code>. Be careful with
+  * helpers like <code>bind()</code> that return a new function when called. If you pass in
+  * no <code>handler</code>, all event handlers are removed for the specified event
+  * <code>type</code>.
+  * @param {Object} context (Optional) If you specify a <code>context</code>, the event handler
+  * is removed for all specified events and handlers that use the specified context. (The
+  * context must match the context passed into <code>on()</code>.)
+  *
+  * @returns {Object} The object that dispatched the event.
+  *
+  * @memberOf EventDispatcher
+  * @method #off
+  * @see <a href="#on">on()</a>
+  * @see <a href="#once">once()</a>
+  * @see <a href="#events">Events</a>
+  */
+  self.off = function(eventNames, handlerOrContext, context) {
+    if (typeof eventNames === 'string') {
 
-  OTHelpers.eventing(this, true);
+      if (handlerOrContext && $.isFunction(handlerOrContext)) {
+        _.removeListeners(eventNames.split(' '), handlerOrContext, context);
+      }
+      else {
+        _.removeAllListenersNamed(eventNames.split(' '));
+      }
 
-  var callback = arguments[arguments.length - 1];
+    } else if (!eventNames) {
+      _.removeAllListeners();
 
-  if(!OTHelpers.isFunction(callback)) {
-    throw new Error('OTHelpers.Modal2 must be given a callback');
-  }
+    } else {
+      for (var name in eventNames) {
+        if (eventNames.hasOwnProperty(name)) {
+          _.removeListeners([name], eventNames[name], context);
+        }
+      }
+    }
 
-  if(arguments.length < 2) {
-    options = {};
-  }
+    return this;
+  };
 
-  var domElement = document.createElement('iframe');
+ /**
+  * Adds an event handler function for one or more events. Once the handler is called,
+  * the specified handler method is removed as a handler for this event. (When you use
+  * the <code>on()</code> method to add an event handler, the handler is <i>not</i>
+  * removed when it is called.) The <code>once()</code> method is the equivilent of
+  * calling the <code>on()</code>
+  * method and calling <code>off()</code> the first time the handler is invoked.
+  *
+  * <p>
+  * The following code adds a one-time event handler for the <code>accessAllowed</code> event:
+  * </p>
+  *
+  * <pre>
+  * obj.once("eventName", function (event) {
+  *    // This is the event handler.
+  * });
+  * </pre>
+  *
+  * <p>If you pass in multiple event names and a handler method, the handler is registered
+  * for each of those events:</p>
+  *
+  * <pre>obj.once("eventName1 eventName2"
+  *          function (event) {
+  *              // This is the event handler.
+  *          });
+  * </pre>
+  *
+  * <p>You can also pass in a third <code>context</code> parameter (which is optional) to define
+  * the value of
+  * <code>this</code> in the handler method:</p>
+  *
+  * <pre>obj.once("eventName",
+  *          function (event) {
+  *              // This is the event handler.
+  *          },
+  *          obj);
+  * </pre>
+  *
+  * <p>
+  * The method also supports an alternate syntax, in which the first parameter is an object that
+  * is a hash map of event names and handler functions and the second parameter (optional) is the
+  * context for this in each handler:
+  * </p>
+  * <pre>
+  * obj.once(
+  *    {
+  *       eventName1: function (event) {
+  *                  // This is the event handler for eventName1.
+  *           },
+  *       eventName2:  function (event) {
+  *                  // This is the event handler for eventName1.
+  *           }
+  *    },
+  *    obj);
+  * </pre>
+  *
+  * @param {String} type The string identifying the type of event. You can specify multiple
+  * event names in this string, separating them with a space. The event handler will process
+  * the first occurence of the events. After the first event, the handler is removed (for
+  * all specified events).
+  * @param {Function} handler The handler function to process the event. This function takes
+  * the event object as a parameter.
+  * @param {Object} context (Optional) Defines the value of <code>this</code> in the event
+  * handler function.
+  *
+  * @returns {Object} The object that dispatched the event.
+  *
+  * @memberOf EventDispatcher
+  * @method #once
+  * @see <a href="#on">on()</a>
+  * @see <a href="#off">off()</a>
+  * @see <a href="#events">Events</a>
+  */
 
-  domElement.id = options.id || OTHelpers.uuid();
-  domElement.style.position = 'absolute';
-  domElement.style.position = 'fixed';
-  domElement.style.height = '100%';
-  domElement.style.width = '100%';
-  domElement.style.top = '0px';
-  domElement.style.left = '0px';
-  domElement.style.right = '0px';
-  domElement.style.bottom = '0px';
-  domElement.style.zIndex = 1000;
-  domElement.style.border = '0';
+  self.once = function(eventNames, handler, context) {
+    var handleThisOnce = function() {
+      self.off(eventNames, handleThisOnce, context);
+      handler.apply(context, arguments);
+    };
 
-  try {
-    domElement.style.backgroundColor = 'rgba(0,0,0,0.2)';
-  } catch (err) {
-    // Old IE browsers don't support rgba and we still want to show the upgrade message
-    // but we just make the background of the iframe completely transparent.
-    domElement.style.backgroundColor = 'transparent';
-    domElement.setAttribute('allowTransparency', 'true');
-  }
+    handleThisOnce.originalHandler = handler;
 
-  domElement.scrolling = 'no';
-  domElement.setAttribute('scrolling', 'no');
+    self.on(eventNames, handleThisOnce, context);
 
-  // This is necessary for IE, as it will not inherit it's doctype from
-  // the parent frame.
-  var frameContent = '<!DOCTYPE html><html><head>' +
-                    '<meta http-equiv="x-ua-compatible" content="IE=Edge">' +
-                    '<meta http-equiv="Content-type" content="text/html; charset=utf-8">' +
-                    '<title></title></head><body></body></html>';
+    return this;
+  };
 
-  var wrappedCallback = function() {
-    var doc = domElement.contentDocument || domElement.contentWindow.document;
+  // Execute any listeners bound to the +event+ Event.
+  //
+  // Each handler will be executed async. On completion the defaultAction
+  // handler will be executed with the args.
+  //
+  // @param [Event] event
+  //    An Event object.
+  //
+  // @param [Function, Null, Undefined] defaultAction
+  //    An optional function to execute after every other handler. This will execute even
+  //    if there are listeners bound to this event. +defaultAction+ will be passed
+  //    args as a normal handler would.
+  //
+  // @return this
+  //
+  self.dispatchEvent = function(event, defaultAction) {
+    if (!event.type) {
+      $.error('OTHelpers.Eventing.dispatchEvent: Event has no type');
+      $.error(event);
 
-    if (OTHelpers.env.iframeNeedsLoad) {
-      doc.body.style.backgroundColor = 'transparent';
-      doc.body.style.border = 'none';
+      throw new Error('OTHelpers.Eventing.dispatchEvent: Event has no type');
+    }
 
-      if (OTHelpers.env.name !== 'IE') {
-        // Skip this for IE as we use the bookmarklet workaround
-        // for THAT browser.
-        doc.open();
-        doc.write(frameContent);
-        doc.close();
-      }
+    if (!event.target) {
+      event.target = this;
     }
 
-    callback(
-      domElement.contentWindow,
-      doc
-    );
+    _.dispatchEvent(event, defaultAction);
+    return this;
   };
 
-  document.body.appendChild(domElement);
-
-  if(OTHelpers.env.iframeNeedsLoad) {
-    if (OTHelpers.env.name === 'IE') {
-      // This works around some issues with IE and document.write.
-      // Basically this works by slightly abusing the bookmarklet/scriptlet
-      // functionality that all browsers support.
-      domElement.contentWindow.contents = frameContent;
-      /*jshint scripturl:true*/
-      domElement.src = 'javascript:window["contents"]';
-      /*jshint scripturl:false*/
-    }
-
-    OTHelpers.on(domElement, 'load', wrappedCallback);
-  } else {
-    setTimeout(wrappedCallback, 0);
-  }
+  // Execute each handler for the event called +name+.
+  //
+  // Each handler will be executed async, and any exceptions that they throw will
+  // be caught and logged
+  //
+  // How to pass these?
+  //  * defaultAction
+  //
+  // @example
+  //  foo.on('bar', function(name, message) {
+  //    alert("Hello " + name + ": " + message);
+  //  });
+  //
+  //  foo.trigger('OpenTok', 'asdf');     // -> Hello OpenTok: asdf
+  //
+  //
+  // @param [String] eventName
+  //    The name of this event.
+  //
+  // @param [Array] arguments
+  //    Any additional arguments beyond +eventName+ will be passed to the handlers.
+  //
+  // @return this
+  //
+  self.trigger = function(/* eventName [, arg0, arg1, ..., argN ] */) {
+    var args = prototypeSlice.call(arguments);
+
+    // Shifting to remove the eventName from the other args
+    _.trigger(args.shift(), args);
 
-  this.close = function() {
-    OTHelpers.removeElement(domElement);
-    this.trigger('closed');
-    this.element = domElement = null;
     return this;
   };
 
-  this.element = domElement;
-
-};
-
-/*
- * getComputedStyle from
- * https://github.com/jonathantneal/Polyfills-for-IE8/blob/master/getComputedStyle.js
-
-// tb_require('../helpers.js')
-// tb_require('./dom.js')
-
-/*jshint strict: false, eqnull: true, browser:true, smarttabs:true*/
+  // Alias of trigger for easier node compatibility
+  self.emit = self.trigger;
 
-(function() {
 
-  /*jshint eqnull: true, browser: true */
+  /**
+  * Deprecated; use <a href="#on">on()</a> or <a href="#once">once()</a> instead.
+  * <p>
+  * This method registers a method as an event listener for a specific event.
+  * <p>
+  *
+  * <p>
+  *   If a handler is not registered for an event, the event is ignored locally. If the
+  *   event listener function does not exist, the event is ignored locally.
+  * </p>
+  * <p>
+  *   Throws an exception if the <code>listener</code> name is invalid.
+  * </p>
+  *
+  * @param {String} type The string identifying the type of event.
+  *
+  * @param {Function} listener The function to be invoked when the object dispatches the event.
+  *
+  * @param {Object} context (Optional) Defines the value of <code>this</code> in the event
+  * handler function.
+  *
+  * @memberOf EventDispatcher
+  * @method #addEventListener
+  * @see <a href="#on">on()</a>
+  * @see <a href="#once">once()</a>
+  * @see <a href="#events">Events</a>
+  */
+  // See 'on' for usage.
+  // @depreciated will become a private helper function in the future.
+  self.addEventListener = function(eventName, handler, context) {
+    $.warn('The addEventListener() method is deprecated. Use on() or once() instead.');
+    return self.on(eventName, handler, context);
+  };
 
 
-  function getPixelSize(element, style, property, fontSize) {
-    var sizeWithSuffix = style[property],
-        size = parseFloat(sizeWithSuffix),
-        suffix = sizeWithSuffix.split(/\d/)[0],
-        rootSize;
+  /**
+  * Deprecated; use <a href="#on">on()</a> or <a href="#once">once()</a> instead.
+  * <p>
+  * Removes an event listener for a specific event.
+  * <p>
+  *
+  * <p>
+  *   Throws an exception if the <code>listener</code> name is invalid.
+  * </p>
+  *
+  * @param {String} type The string identifying the type of event.
+  *
+  * @param {Function} listener The event listener function to remove.
+  *
+  * @param {Object} context (Optional) If you specify a <code>context</code>, the event
+  * handler is removed for all specified events and event listeners that use the specified
+  context. (The context must match the context passed into
+  * <code>addEventListener()</code>.)
+  *
+  * @memberOf EventDispatcher
+  * @method #removeEventListener
+  * @see <a href="#off">off()</a>
+  * @see <a href="#events">Events</a>
+  */
+  // See 'off' for usage.
+  // @depreciated will become a private helper function in the future.
+  self.removeEventListener = function(eventName, handler, context) {
+    $.warn('The removeEventListener() method is deprecated. Use off() instead.');
+    return self.off(eventName, handler, context);
+  };
 
-    fontSize = fontSize != null ?
-      fontSize : /%|em/.test(suffix) && element.parentElement ?
-        getPixelSize(element.parentElement, element.parentElement.currentStyle, 'fontSize', null) :
-        16;
-    rootSize = property === 'fontSize' ?
-      fontSize : /width/i.test(property) ? element.clientWidth : element.clientHeight;
 
-    return (suffix === 'em') ?
-      size * fontSize : (suffix === 'in') ?
-        size * 96 : (suffix === 'pt') ?
-          size * 96 / 72 : (suffix === '%') ?
-            size / 100 * rootSize : size;
-  }
+  return self;
+};
+/*jshint browser:true, smarttabs:true */
 
-  function setShortStyleProperty(style, property) {
-    var
-    borderSuffix = property === 'border' ? 'Width' : '',
-    t = property + 'Top' + borderSuffix,
-    r = property + 'Right' + borderSuffix,
-    b = property + 'Bottom' + borderSuffix,
-    l = property + 'Left' + borderSuffix;
+// tb_require('../helpers.js')
+// tb_require('./callbacks.js')
+// tb_require('./dom_events.js')
 
-    style[property] = (style[t] === style[r] === style[b] === style[l] ? [style[t]]
-    : style[t] === style[b] && style[l] === style[r] ? [style[t], style[r]]
-    : style[l] === style[r] ? [style[t], style[r], style[b]]
-    : [style[t], style[r], style[b], style[l]]).join(' ');
-  }
+OTHelpers.createElement = function(nodeName, attributes, children, doc) {
+  var element = (doc || document).createElement(nodeName);
 
-  function CSSStyleDeclaration(element) {
-    var currentStyle = element.currentStyle,
-        style = this,
-        fontSize = getPixelSize(element, currentStyle, 'fontSize', null),
-        property;
+  if (attributes) {
+    for (var name in attributes) {
+      if (typeof(attributes[name]) === 'object') {
+        if (!element[name]) element[name] = {};
 
-    for (property in currentStyle) {
-      if (/width|height|margin.|padding.|border.+W/.test(property) && style[property] !== 'auto') {
-        style[property] = getPixelSize(element, currentStyle, property, fontSize) + 'px';
-      } else if (property === 'styleFloat') {
-        /*jshint -W069 */
-        style['float'] = currentStyle[property];
-      } else {
-        style[property] = currentStyle[property];
+        var subAttrs = attributes[name];
+        for (var n in subAttrs) {
+          element[name][n] = subAttrs[n];
+        }
+      }
+      else if (name === 'className') {
+        element.className = attributes[name];
+      }
+      else {
+        element.setAttribute(name, attributes[name]);
       }
     }
-
-    setShortStyleProperty(style, 'margin');
-    setShortStyleProperty(style, 'padding');
-    setShortStyleProperty(style, 'border');
-
-    style.fontSize = fontSize + 'px';
-
-    return style;
   }
 
-  CSSStyleDeclaration.prototype = {
-    constructor: CSSStyleDeclaration,
-    getPropertyPriority: function () {},
-    getPropertyValue: function ( prop ) {
-      return this[prop] || '';
-    },
-    item: function () {},
-    removeProperty: function () {},
-    setProperty: function () {},
-    getPropertyCSSValue: function () {}
+  var setChildren = function(child) {
+    if(typeof child === 'string') {
+      element.innerHTML = element.innerHTML + child;
+    } else {
+      element.appendChild(child);
+    }
   };
 
-  function getComputedStyle(element) {
-    return new CSSStyleDeclaration(element);
+  if($.isArray(children)) {
+    $.forEach(children, setChildren);
+  } else if(children) {
+    setChildren(children);
   }
 
+  return element;
+};
 
-  OTHelpers.getComputedStyle = function(element) {
-    if(element &&
-        element.ownerDocument &&
-        element.ownerDocument.defaultView &&
-        element.ownerDocument.defaultView.getComputedStyle) {
-      return element.ownerDocument.defaultView.getComputedStyle(element);
-    } else {
-      return getComputedStyle(element);
+OTHelpers.createButton = function(innerHTML, attributes, events) {
+  var button = $.createElement('button', attributes, innerHTML);
+
+  if (events) {
+    for (var name in events) {
+      if (events.hasOwnProperty(name)) {
+        $.on(button, name, events[name]);
+      }
     }
-  };
 
-})();
+    button._boundEvents = events;
+  }
 
+  return button;
+};
 /*jshint browser:true, smarttabs:true */
 
 // tb_require('../helpers.js')
 // tb_require('./callbacks.js')
-// tb_require('./dom.js')
 
-var observeStyleChanges = function observeStyleChanges (element, stylesToObserve, onChange) {
-  var oldStyles = {};
+// DOM helpers
 
-  var getStyle = function getStyle(style) {
-    switch (style) {
-    case 'width':
-      return $(element).width();
+var firstElementChild;
 
-    case 'height':
-      return $(element).height();
+// This mess is for IE8
+if( typeof(document) !== 'undefined' &&
+      document.createElement('div').firstElementChild !== void 0 ){
+  firstElementChild = function firstElementChild (parentElement) {
+    return parentElement.firstElementChild;
+  };
+}
+else {
+  firstElementChild = function firstElementChild (parentElement) {
+    var el = parentElement.firstChild;
 
-    default:
-      return $(element).css(style);
-    }
+    do {
+      if(el.nodeType===1){
+        return el;
+      }
+      el = el.nextSibling;
+    } while(el);
+
+    return null;
   };
+}
 
-  // get the inital values
-  $.forEach(stylesToObserve, function(style) {
-    oldStyles[style] = getStyle(style);
-  });
 
-  var observer = new MutationObserver(function(mutations) {
-    var changeSet = {};
+ElementCollection.prototype.appendTo = function(parentElement) {
+  if (!parentElement) throw new Error('appendTo requires a DOMElement to append to.');
 
-    $.forEach(mutations, function(mutation) {
-      if (mutation.attributeName !== 'style') return;
+  return this.forEach(function(child) {
+    parentElement.appendChild(child);
+  });
+};
 
-      var isHidden = $.isDisplayNone(element);
+ElementCollection.prototype.append = function() {
+  var parentElement = this.first;
+  if (!parentElement) return this;
 
-      $.forEach(stylesToObserve, function(style) {
-        if(isHidden && (style === 'width' || style === 'height')) return;
+  $.forEach(prototypeSlice.call(arguments), function(child) {
+    parentElement.appendChild(child);
+  });
 
-        var newValue = getStyle(style);
+  return this;
+};
 
-        if (newValue !== oldStyles[style]) {
-          changeSet[style] = [oldStyles[style], newValue];
-          oldStyles[style] = newValue;
-        }
-      });
-    });
+ElementCollection.prototype.prepend = function() {
+  if (arguments.length === 0) return this;
 
-    if (!$.isEmpty(changeSet)) {
-      // Do this after so as to help avoid infinite loops of mutations.
-      $.callAsync(function() {
-        onChange.call(null, changeSet);
-      });
-    }
-  });
+  var parentElement = this.first,
+      elementsToPrepend;
 
-  observer.observe(element, {
-    attributes:true,
-    attributeFilter: ['style'],
-    childList:false,
-    characterData:false,
-    subtree:false
+  if (!parentElement) return this;
+
+  elementsToPrepend = prototypeSlice.call(arguments);
+
+  if (!firstElementChild(parentElement)) {
+    parentElement.appendChild(elementsToPrepend.shift());
+  }
+
+  $.forEach(elementsToPrepend, function(element) {
+    parentElement.insertBefore(element, firstElementChild(parentElement));
   });
 
-  return observer;
+  return this;
 };
 
-var observeNodeOrChildNodeRemoval = function observeNodeOrChildNodeRemoval (element, onChange) {
-  var observer = new MutationObserver(function(mutations) {
-    var removedNodes = [];
+ElementCollection.prototype.after = function(prevElement) {
+  if (!prevElement) throw new Error('after requires a DOMElement to insert after');
 
-    $.forEach(mutations, function(mutation) {
-      if (mutation.removedNodes.length) {
-        removedNodes = removedNodes.concat(prototypeSlice.call(mutation.removedNodes));
+  return this.forEach(function(element) {
+    if (element.parentElement) {
+      if (prevElement !== element.parentNode.lastChild) {
+        element.parentElement.insertBefore(element, prevElement);
+      }
+      else {
+        element.parentElement.appendChild(element);
       }
-    });
-
-    if (removedNodes.length) {
-      // Do this after so as to help avoid infinite loops of mutations.
-      $.callAsync(function() {
-        onChange($(removedNodes));
-      });
     }
   });
+};
 
-  observer.observe(element, {
-    attributes:false,
-    childList:true,
-    characterData:false,
-    subtree:true
-  });
+ElementCollection.prototype.before = function(nextElement) {
+  if (!nextElement) {
+    throw new Error('before requires a DOMElement to insert before');
+  }
 
-  return observer;
+  return this.forEach(function(element) {
+    if (element.parentElement) {
+      element.parentElement.insertBefore(element, nextElement);
+    }
+  });
 };
 
-var observeSize = function (element, onChange) {
-  var previousSize = {
-    width: 0,
-    height: 0
-  };
-
-  var interval = setInterval(function() {
-    var rect = element.getBoundingClientRect();
-    if (previousSize.width !== rect.width || previousSize.height !== rect.height) {
-      onChange(rect, previousSize);
-      previousSize = {
-        width: rect.width,
-        height: rect.height
-      };
+ElementCollection.prototype.remove = function () {
+  return this.forEach(function(element) {
+    if (element.parentNode) {
+      element.parentNode.removeChild(element);
     }
-  }, 1000 / 5);
+  });
+};
 
-  return {
-    disconnect: function() {
-      clearInterval(interval);
+ElementCollection.prototype.empty = function () {
+  return this.forEach(function(element) {
+    // elements is a "live" NodesList collection. Meaning that the collection
+    // itself will be mutated as we remove elements from the DOM. This means
+    // that "while there are still elements" is safer than "iterate over each
+    // element" as the collection length and the elements indices will be modified
+    // with each iteration.
+    while (element.firstChild) {
+      element.removeChild(element.firstChild);
     }
-  };
+  });
 };
 
-// Allows an +onChange+ callback to be triggered when specific style properties
-// of +element+ are notified. The callback accepts a single parameter, which is
-// a hash where the keys are the style property that changed and the values are
-// an array containing the old and new values ([oldValue, newValue]).
-//
-// Width and Height changes while the element is display: none will not be
-// fired until such time as the element becomes visible again.
-//
-// This function returns the MutationObserver itself. Once you no longer wish
-// to observe the element you should call disconnect on the observer.
-//
-// Observing changes:
-//  // observe changings to the width and height of object
-//  dimensionsObserver = OTHelpers(object).observeStyleChanges(,
-//                                                    ['width', 'height'], function(changeSet) {
-//      OT.debug("The new width and height are " +
-//                      changeSet.width[1] + ',' + changeSet.height[1]);
-//  });
-//
-// Cleaning up
-//  // stop observing changes
-//  dimensionsObserver.disconnect();
-//  dimensionsObserver = null;
-//
-ElementCollection.prototype.observeStyleChanges = function(stylesToObserve, onChange) {
-  var observers = [];
 
-  this.forEach(function(element) {
-    observers.push(
-      observeStyleChanges(element, stylesToObserve, onChange)
-    );
+// Detects when an element is not part of the document flow because
+// it or one of it's ancesters has display:none.
+ElementCollection.prototype.isDisplayNone = function() {
+  return this.some(function(element) {
+    if ( (element.offsetWidth === 0 || element.offsetHeight === 0) &&
+                $(element).css('display') === 'none') return true;
+
+    if (element.parentNode && element.parentNode.style) {
+      return $(element.parentNode).isDisplayNone();
+    }
   });
+};
 
-  return observers;
+ElementCollection.prototype.findElementWithDisplayNone = function(element) {
+  return $.findElementWithDisplayNone(element);
 };
 
-// trigger the +onChange+ callback whenever
-// 1. +element+ is removed
-// 2. or an immediate child of +element+ is removed.
-//
-// This function returns the MutationObserver itself. Once you no longer wish
-// to observe the element you should call disconnect on the observer.
-//
-// Observing changes:
-//  // observe changings to the width and height of object
-//  nodeObserver = OTHelpers(object).observeNodeOrChildNodeRemoval(function(removedNodes) {
-//      OT.debug("Some child nodes were removed");
-//      removedNodes.forEach(function(node) {
-//          OT.debug(node);
-//      });
-//  });
-//
-// Cleaning up
-//  // stop observing changes
-//  nodeObserver.disconnect();
-//  nodeObserver = null;
-//
-ElementCollection.prototype.observeNodeOrChildNodeRemoval = function(onChange) {
-  var observers = [];
 
-  this.forEach(function(element) {
-    observers.push(
-      observeNodeOrChildNodeRemoval(element, onChange)
-    );
-  });
 
-  return observers;
+OTHelpers.isElementNode = function(node) {
+  return node && typeof node === 'object' && node.nodeType === 1;
 };
 
-// trigger the +onChange+ callback whenever the width or the height of the element changes
-//
-// Once you no longer wish to observe the element you should call disconnect on the observer.
-//
-// Observing changes:
-//  // observe changings to the width and height of object
-//  sizeObserver = OTHelpers(object).observeSize(function(newSize, previousSize) {
-//      OT.debug("The new width and height are " +
-//                      newSize.width + ',' + newSize.height);
-//  });
-//
-// Cleaning up
-//  // stop observing changes
-//  sizeObserver.disconnect();
-//  sizeObserver = null;
-//
-ElementCollection.prototype.observeSize = function(onChange) {
-  var observers = [];
-
-  this.forEach(function(element) {
-    observers.push(
-      observeSize(element, onChange)
-    );
-  });
 
-  return observers;
+// @remove
+OTHelpers.removeElement = function(element) {
+  $(element).remove();
 };
 
+// @remove
+OTHelpers.removeElementById = function(elementId) {
+  return $('#'+elementId).remove();
+};
 
 // @remove
-OTHelpers.observeStyleChanges = function(element, stylesToObserve, onChange) {
-  return $(element).observeStyleChanges(stylesToObserve, onChange)[0];
+OTHelpers.removeElementsByType = function(parentElem, type) {
+  return $(type, parentElem).remove();
 };
 
 // @remove
-OTHelpers.observeNodeOrChildNodeRemoval = function(element, onChange) {
-  return $(element).observeNodeOrChildNodeRemoval(onChange)[0];
+OTHelpers.emptyElement = function(element) {
+  return $(element).empty();
 };
 
-// CSS helpers helpers
 
-/*jshint browser:true, smarttabs:true*/
 
-// tb_require('../helpers.js')
-// tb_require('./dom.js')
-// tb_require('./getcomputedstyle.js')
 
-(function() {
 
-  var displayStateCache = {},
-      defaultDisplays = {};
+// @remove
+OTHelpers.isDisplayNone = function(element) {
+  return $(element).isDisplayNone();
+};
 
-  var defaultDisplayValueForElement = function (element) {
-    if (defaultDisplays[element.ownerDocument] &&
-      defaultDisplays[element.ownerDocument][element.nodeName]) {
-      return defaultDisplays[element.ownerDocument][element.nodeName];
-    }
+OTHelpers.findElementWithDisplayNone = function(element) {
+  if ( (element.offsetWidth === 0 || element.offsetHeight === 0) &&
+            $.css(element, 'display') === 'none') return element;
 
-    if (!defaultDisplays[element.ownerDocument]) defaultDisplays[element.ownerDocument] = {};
+  if (element.parentNode && element.parentNode.style) {
+    return $.findElementWithDisplayNone(element.parentNode);
+  }
 
-    // We need to know what display value to use for this node. The easiest way
-    // is to actually create a node and read it out.
-    var testNode = element.ownerDocument.createElement(element.nodeName),
-        defaultDisplay;
+  return null;
+};
 
-    element.ownerDocument.body.appendChild(testNode);
-    defaultDisplay = defaultDisplays[element.ownerDocument][element.nodeName] =
-    $(testNode).css('display');
 
-    $(testNode).remove();
-    testNode = null;
+/*jshint browser:true, smarttabs:true*/
 
-    return defaultDisplay;
-  };
+// tb_require('../helpers.js')
+// tb_require('./environment.js')
+// tb_require('./dom.js')
 
-  var isHidden = function (element) {
-    var computedStyle = $.getComputedStyle(element);
-    return computedStyle.getPropertyValue('display') === 'none';
-  };
+OTHelpers.Modal = function(options) {
 
-  var setCssProperties = function (element, hash) {
-    var style = element.style;
+  OTHelpers.eventing(this, true);
 
-    for (var cssName in hash) {
-      if (hash.hasOwnProperty(cssName)) {
-        style[cssName] = hash[cssName];
-      }
-    }
-  };
+  var callback = arguments[arguments.length - 1];
 
-  var setCssProperty = function (element, name, value) {
-    element.style[name] = value;
-  };
+  if(!OTHelpers.isFunction(callback)) {
+    throw new Error('OTHelpers.Modal2 must be given a callback');
+  }
 
-  var getCssProperty = function (element, unnormalisedName) {
-    // Normalise vendor prefixes from the form MozTranform to -moz-transform
-    // except for ms extensions, which are weird...
+  if(arguments.length < 2) {
+    options = {};
+  }
 
-    var name = unnormalisedName.replace( /([A-Z]|^ms)/g, '-$1' ).toLowerCase(),
-        computedStyle = $.getComputedStyle(element),
-        currentValue = computedStyle.getPropertyValue(name);
+  var domElement = document.createElement('iframe');
 
-    if (currentValue === '') {
-      currentValue = element.style[name];
-    }
+  domElement.id = options.id || OTHelpers.uuid();
+  domElement.style.position = 'absolute';
+  domElement.style.position = 'fixed';
+  domElement.style.height = '100%';
+  domElement.style.width = '100%';
+  domElement.style.top = '0px';
+  domElement.style.left = '0px';
+  domElement.style.right = '0px';
+  domElement.style.bottom = '0px';
+  domElement.style.zIndex = 1000;
+  domElement.style.border = '0';
 
-    return currentValue;
-  };
+  try {
+    domElement.style.backgroundColor = 'rgba(0,0,0,0.2)';
+  } catch (err) {
+    // Old IE browsers don't support rgba and we still want to show the upgrade message
+    // but we just make the background of the iframe completely transparent.
+    domElement.style.backgroundColor = 'transparent';
+    domElement.setAttribute('allowTransparency', 'true');
+  }
 
-  var applyCSS = function(element, styles, callback) {
-    var oldStyles = {},
-        name,
-        ret;
+  domElement.scrolling = 'no';
+  domElement.setAttribute('scrolling', 'no');
 
-    // Backup the old styles
-    for (name in styles) {
-      if (styles.hasOwnProperty(name)) {
-        // We intentionally read out of style here, instead of using the css
-        // helper. This is because the css helper uses querySelector and we
-        // only want to pull values out of the style (domeElement.style) hash.
-        oldStyles[name] = element.style[name];
+  // This is necessary for IE, as it will not inherit it's doctype from
+  // the parent frame.
+  var frameContent = '<!DOCTYPE html><html><head>' +
+                    '<meta http-equiv="x-ua-compatible" content="IE=Edge">' +
+                    '<meta http-equiv="Content-type" content="text/html; charset=utf-8">' +
+                    '<title></title></head><body></body></html>';
 
-        $(element).css(name, styles[name]);
-      }
-    }
+  var wrappedCallback = function() {
+    var doc = domElement.contentDocument || domElement.contentWindow.document;
 
-    ret = callback(element);
+    if (OTHelpers.env.iframeNeedsLoad) {
+      doc.body.style.backgroundColor = 'transparent';
+      doc.body.style.border = 'none';
 
-    // Restore the old styles
-    for (name in styles) {
-      if (styles.hasOwnProperty(name)) {
-        $(element).css(name, oldStyles[name] || '');
+      if (OTHelpers.env.name !== 'IE') {
+        // Skip this for IE as we use the bookmarklet workaround
+        // for THAT browser.
+        doc.open();
+        doc.write(frameContent);
+        doc.close();
       }
     }
 
-    return ret;
+    callback(
+      domElement.contentWindow,
+      doc
+    );
   };
 
-  ElementCollection.prototype.show = function() {
-    return this.forEach(function(element) {
-      var display = element.style.display;
+  document.body.appendChild(domElement);
 
-      if (display === '' || display === 'none') {
-        element.style.display = displayStateCache[element] || '';
-        delete displayStateCache[element];
-      }
+  if(OTHelpers.env.iframeNeedsLoad) {
+    if (OTHelpers.env.name === 'IE') {
+      // This works around some issues with IE and document.write.
+      // Basically this works by slightly abusing the bookmarklet/scriptlet
+      // functionality that all browsers support.
+      domElement.contentWindow.contents = frameContent;
+      /*jshint scripturl:true*/
+      domElement.src = 'javascript:window["contents"]';
+      /*jshint scripturl:false*/
+    }
 
-      if (isHidden(element)) {
-        // It's still hidden so there's probably a stylesheet that declares this
-        // element as display:none;
-        displayStateCache[element] = 'none';
+    OTHelpers.on(domElement, 'load', wrappedCallback);
+  } else {
+    setTimeout(wrappedCallback, 0);
+  }
 
-        element.style.display = defaultDisplayValueForElement(element);
-      }
-    });
+  this.close = function() {
+    OTHelpers.removeElement(domElement);
+    this.trigger('closed');
+    this.element = domElement = null;
+    return this;
   };
 
-  ElementCollection.prototype.hide = function() {
-    return this.forEach(function(element) {
-      if (element.style.display === 'none') return;
+  this.element = domElement;
 
-      displayStateCache[element] = element.style.display;
-      element.style.display = 'none';
-    });
-  };
+};
 
-  ElementCollection.prototype.css = function(nameOrHash, value) {
-    if (this.length === 0) return;
+/*
+ * getComputedStyle from
+ * https://github.com/jonathantneal/Polyfills-for-IE8/blob/master/getComputedStyle.js
 
-    if (typeof(nameOrHash) !== 'string') {
+// tb_require('../helpers.js')
+// tb_require('./dom.js')
 
-      return this.forEach(function(element) {
-        setCssProperties(element, nameOrHash);
-      });
+/*jshint strict: false, eqnull: true, browser:true, smarttabs:true*/
 
-    } else if (value !== undefined) {
+(function() {
 
-      return this.forEach(function(element) {
-        setCssProperty(element, nameOrHash, value);
-      });
+  /*jshint eqnull: true, browser: true */
 
-    } else {
-      return getCssProperty(this.first, nameOrHash, value);
-    }
-  };
 
-  // Apply +styles+ to +element+ while executing +callback+, restoring the previous
-  // styles after the callback executes.
-  ElementCollection.prototype.applyCSS = function (styles, callback) {
-    var results = [];
+  function getPixelSize(element, style, property, fontSize) {
+    var sizeWithSuffix = style[property],
+        size = parseFloat(sizeWithSuffix),
+        suffix = sizeWithSuffix.split(/\d/)[0],
+        rootSize;
 
-    this.forEach(function(element) {
-      results.push(applyCSS(element, styles, callback));
-    });
+    fontSize = fontSize != null ?
+      fontSize : /%|em/.test(suffix) && element.parentElement ?
+        getPixelSize(element.parentElement, element.parentElement.currentStyle, 'fontSize', null) :
+        16;
+    rootSize = property === 'fontSize' ?
+      fontSize : /width/i.test(property) ? element.clientWidth : element.clientHeight;
 
-    return results;
-  };
+    return (suffix === 'em') ?
+      size * fontSize : (suffix === 'in') ?
+        size * 96 : (suffix === 'pt') ?
+          size * 96 / 72 : (suffix === '%') ?
+            size / 100 * rootSize : size;
+  }
 
+  function setShortStyleProperty(style, property) {
+    var
+    borderSuffix = property === 'border' ? 'Width' : '',
+    t = property + 'Top' + borderSuffix,
+    r = property + 'Right' + borderSuffix,
+    b = property + 'Bottom' + borderSuffix,
+    l = property + 'Left' + borderSuffix;
 
-  // Make +element+ visible while executing +callback+.
-  ElementCollection.prototype.makeVisibleAndYield = function (callback) {
-    var hiddenVisually = {
-        display: 'block',
-        visibility: 'hidden'
-      },
-      results = [];
+    style[property] = (style[t] === style[r] === style[b] === style[l] ? [style[t]]
+    : style[t] === style[b] && style[l] === style[r] ? [style[t], style[r]]
+    : style[l] === style[r] ? [style[t], style[r], style[b]]
+    : [style[t], style[r], style[b], style[l]]).join(' ');
+  }
 
-    this.forEach(function(element) {
-      // find whether it's the element or an ancestor that's display none and
-      // then apply to whichever it is
-      var targetElement = $.findElementWithDisplayNone(element);
-      if (!targetElement) {
-        results.push(void 0);
-      }
-      else {
-        results.push(
-          applyCSS(targetElement, hiddenVisually, callback)
-        );
+  function CSSStyleDeclaration(element) {
+    var currentStyle = element.currentStyle,
+        style = this,
+        fontSize = getPixelSize(element, currentStyle, 'fontSize', null),
+        property;
+
+    for (property in currentStyle) {
+      if (/width|height|margin.|padding.|border.+W/.test(property) && style[property] !== 'auto') {
+        style[property] = getPixelSize(element, currentStyle, property, fontSize) + 'px';
+      } else if (property === 'styleFloat') {
+        /*jshint -W069 */
+        style['float'] = currentStyle[property];
+      } else {
+        style[property] = currentStyle[property];
       }
-    });
+    }
 
-    return results;
-  };
+    setShortStyleProperty(style, 'margin');
+    setShortStyleProperty(style, 'padding');
+    setShortStyleProperty(style, 'border');
 
+    style.fontSize = fontSize + 'px';
 
-  // @remove
-  OTHelpers.show = function(element) {
-    return $(element).show();
-  };
+    return style;
+  }
 
-  // @remove
-  OTHelpers.hide = function(element) {
-    return $(element).hide();
+  CSSStyleDeclaration.prototype = {
+    constructor: CSSStyleDeclaration,
+    getPropertyPriority: function () {},
+    getPropertyValue: function ( prop ) {
+      return this[prop] || '';
+    },
+    item: function () {},
+    removeProperty: function () {},
+    setProperty: function () {},
+    getPropertyCSSValue: function () {}
   };
 
-  // @remove
-  OTHelpers.css = function(element, nameOrHash, value) {
-    return $(element).css(nameOrHash, value);
-  };
+  function getComputedStyle(element) {
+    return new CSSStyleDeclaration(element);
+  }
 
-  // @remove
-  OTHelpers.applyCSS = function(element, styles, callback) {
-    return $(element).applyCSS(styles, callback);
-  };
 
-  // @remove
-  OTHelpers.makeVisibleAndYield = function(element, callback) {
-    return $(element).makeVisibleAndYield(callback);
+  OTHelpers.getComputedStyle = function(element) {
+    if(element &&
+        element.ownerDocument &&
+        element.ownerDocument.defaultView &&
+        element.ownerDocument.defaultView.getComputedStyle) {
+      return element.ownerDocument.defaultView.getComputedStyle(element);
+    } else {
+      return getComputedStyle(element);
+    }
   };
 
 })();
 
-/*jshint browser:true, smarttabs:true*/
+/*jshint browser:true, smarttabs:true */
 
 // tb_require('../helpers.js')
+// tb_require('./callbacks.js')
+// tb_require('./dom.js')
 
-OTHelpers.castToBoolean = function(value, defaultValue) {
-  if (value === undefined) return defaultValue;
-  return value === 'true' || value === true;
-};
+var observeStyleChanges = function observeStyleChanges (element, stylesToObserve, onChange) {
+  var oldStyles = {};
 
-OTHelpers.roundFloat = function(value, places) {
-  return Number(value.toFixed(places));
-};
+  var getStyle = function getStyle(style) {
+    switch (style) {
+    case 'width':
+      return $(element).width();
 
-/*jshint browser:true, smarttabs:true*/
+    case 'height':
+      return $(element).height();
 
-// tb_require('../helpers.js')
+    default:
+      return $(element).css(style);
+    }
+  };
 
-(function() {
+  // get the inital values
+  $.forEach(stylesToObserve, function(style) {
+    oldStyles[style] = getStyle(style);
+  });
 
-  var requestAnimationFrame = window.requestAnimationFrame ||
-                              window.mozRequestAnimationFrame ||
-                              window.webkitRequestAnimationFrame ||
-                              window.msRequestAnimationFrame;
+  var observer = new MutationObserver(function(mutations) {
+    var changeSet = {};
 
-  if (requestAnimationFrame) {
-    requestAnimationFrame = OTHelpers.bind(requestAnimationFrame, window);
-  }
-  else {
-    var lastTime = 0;
-    var startTime = OTHelpers.now();
+    $.forEach(mutations, function(mutation) {
+      if (mutation.attributeName !== 'style') return;
 
-    requestAnimationFrame = function(callback){
-      var currTime = OTHelpers.now();
-      var timeToCall = Math.max(0, 16 - (currTime - lastTime));
-      var id = window.setTimeout(function() { callback(currTime - startTime); }, timeToCall);
-      lastTime = currTime + timeToCall;
-      return id;
-    };
-  }
+      var isHidden = $.isDisplayNone(element);
 
-  OTHelpers.requestAnimationFrame = requestAnimationFrame;
-})();
-/*jshint browser:true, smarttabs:true*/
+      $.forEach(stylesToObserve, function(style) {
+        if(isHidden && (style === 'width' || style === 'height')) return;
 
-// tb_require('../helpers.js')
+        var newValue = getStyle(style);
 
-(function() {
+        if (newValue !== oldStyles[style]) {
+          changeSet[style] = [oldStyles[style], newValue];
+          oldStyles[style] = newValue;
+        }
+      });
+    });
 
-  var capabilities = {};
+    if (!$.isEmpty(changeSet)) {
+      // Do this after so as to help avoid infinite loops of mutations.
+      $.callAsync(function() {
+        onChange.call(null, changeSet);
+      });
+    }
+  });
 
-  // Registers a new capability type and a function that will indicate
-  // whether this client has that capability.
-  //
-  //   OTHelpers.registerCapability('bundle', function() {
-  //     return OTHelpers.hasCapabilities('webrtc') &&
-  //                (OTHelpers.env.name === 'Chrome' || TBPlugin.isInstalled());
-  //   });
-  //
-  OTHelpers.registerCapability = function(name, callback) {
-    var _name = name.toLowerCase();
+  observer.observe(element, {
+    attributes:true,
+    attributeFilter: ['style'],
+    childList:false,
+    characterData:false,
+    subtree:false
+  });
 
-    if (capabilities.hasOwnProperty(_name)) {
-      OTHelpers.error('Attempted to register', name, 'capability more than once');
-      return;
-    }
+  return observer;
+};
 
-    if (!OTHelpers.isFunction(callback)) {
-      OTHelpers.error('Attempted to register', name,
-                              'capability with a callback that isn\' a function');
-      return;
+var observeNodeOrChildNodeRemoval = function observeNodeOrChildNodeRemoval (element, onChange) {
+  var observer = new MutationObserver(function(mutations) {
+    var removedNodes = [];
+
+    $.forEach(mutations, function(mutation) {
+      if (mutation.removedNodes.length) {
+        removedNodes = removedNodes.concat(prototypeSlice.call(mutation.removedNodes));
+      }
+    });
+
+    if (removedNodes.length) {
+      // Do this after so as to help avoid infinite loops of mutations.
+      $.callAsync(function() {
+        onChange($(removedNodes));
+      });
     }
+  });
 
-    memoriseCapabilityTest(_name, callback);
-  };
+  observer.observe(element, {
+    attributes:false,
+    childList:true,
+    characterData:false,
+    subtree:true
+  });
 
+  return observer;
+};
 
-  // Wrap up a capability test in a function that memorises the
-  // result.
-  var memoriseCapabilityTest = function (name, callback) {
-    capabilities[name] = function() {
-      var result = callback();
-      capabilities[name] = function() {
-        return result;
+var observeSize = function (element, onChange) {
+  var previousSize = {
+    width: 0,
+    height: 0
+  };
+
+  var interval = setInterval(function() {
+    var rect = element.getBoundingClientRect();
+    if (previousSize.width !== rect.width || previousSize.height !== rect.height) {
+      onChange(rect, previousSize);
+      previousSize = {
+        width: rect.width,
+        height: rect.height
       };
+    }
+  }, 1000 / 5);
 
-      return result;
-    };
+  return {
+    disconnect: function() {
+      clearInterval(interval);
+    }
   };
+};
 
-  var testCapability = function (name) {
-    return capabilities[name]();
-  };
+// Allows an +onChange+ callback to be triggered when specific style properties
+// of +element+ are notified. The callback accepts a single parameter, which is
+// a hash where the keys are the style property that changed and the values are
+// an array containing the old and new values ([oldValue, newValue]).
+//
+// Width and Height changes while the element is display: none will not be
+// fired until such time as the element becomes visible again.
+//
+// This function returns the MutationObserver itself. Once you no longer wish
+// to observe the element you should call disconnect on the observer.
+//
+// Observing changes:
+//  // observe changings to the width and height of object
+//  dimensionsObserver = OTHelpers(object).observeStyleChanges(,
+//                                                    ['width', 'height'], function(changeSet) {
+//      OT.debug("The new width and height are " +
+//                      changeSet.width[1] + ',' + changeSet.height[1]);
+//  });
+//
+// Cleaning up
+//  // stop observing changes
+//  dimensionsObserver.disconnect();
+//  dimensionsObserver = null;
+//
+ElementCollection.prototype.observeStyleChanges = function(stylesToObserve, onChange) {
+  var observers = [];
+
+  this.forEach(function(element) {
+    observers.push(
+      observeStyleChanges(element, stylesToObserve, onChange)
+    );
+  });
 
+  return observers;
+};
 
-  // Returns true if all of the capability names passed in
-  // exist and are met.
-  //
-  //  OTHelpers.hasCapabilities('bundle', 'rtcpMux')
-  //
-  OTHelpers.hasCapabilities = function(/* capability1, capability2, ..., capabilityN  */) {
-    var capNames = prototypeSlice.call(arguments),
-        name;
+// trigger the +onChange+ callback whenever
+// 1. +element+ is removed
+// 2. or an immediate child of +element+ is removed.
+//
+// This function returns the MutationObserver itself. Once you no longer wish
+// to observe the element you should call disconnect on the observer.
+//
+// Observing changes:
+//  // observe changings to the width and height of object
+//  nodeObserver = OTHelpers(object).observeNodeOrChildNodeRemoval(function(removedNodes) {
+//      OT.debug("Some child nodes were removed");
+//      removedNodes.forEach(function(node) {
+//          OT.debug(node);
+//      });
+//  });
+//
+// Cleaning up
+//  // stop observing changes
+//  nodeObserver.disconnect();
+//  nodeObserver = null;
+//
+ElementCollection.prototype.observeNodeOrChildNodeRemoval = function(onChange) {
+  var observers = [];
 
-    for (var i=0; i<capNames.length; ++i) {
-      name = capNames[i].toLowerCase();
+  this.forEach(function(element) {
+    observers.push(
+      observeNodeOrChildNodeRemoval(element, onChange)
+    );
+  });
+
+  return observers;
+};
+
+// trigger the +onChange+ callback whenever the width or the height of the element changes
+//
+// Once you no longer wish to observe the element you should call disconnect on the observer.
+//
+// Observing changes:
+//  // observe changings to the width and height of object
+//  sizeObserver = OTHelpers(object).observeSize(function(newSize, previousSize) {
+//      OT.debug("The new width and height are " +
+//                      newSize.width + ',' + newSize.height);
+//  });
+//
+// Cleaning up
+//  // stop observing changes
+//  sizeObserver.disconnect();
+//  sizeObserver = null;
+//
+ElementCollection.prototype.observeSize = function(onChange) {
+  var observers = [];
 
-      if (!capabilities.hasOwnProperty(name)) {
-        OTHelpers.error('hasCapabilities was called with an unknown capability: ' + name);
-        return false;
-      }
-      else if (testCapability(name) === false) {
-        return false;
-      }
-    }
+  this.forEach(function(element) {
+    observers.push(
+      observeSize(element, onChange)
+    );
+  });
 
-    return true;
-  };
+  return observers;
+};
 
-})();
 
-/*jshint browser:true, smarttabs:true*/
+// @remove
+OTHelpers.observeStyleChanges = function(element, stylesToObserve, onChange) {
+  return $(element).observeStyleChanges(stylesToObserve, onChange)[0];
+};
 
-// tb_require('../helpers.js')
-// tb_require('./capabilities.js')
+// @remove
+OTHelpers.observeNodeOrChildNodeRemoval = function(element, onChange) {
+  return $(element).observeNodeOrChildNodeRemoval(onChange)[0];
+};
 
-// Indicates if the client supports WebSockets.
-OTHelpers.registerCapability('websockets', function() {
-  return 'WebSocket' in window && window.WebSocket !== void 0;
-});
 /*jshint browser:true, smarttabs:true */
 
 // tb_require('../helpers.js')
@@ -3760,24 +5395,45 @@
 // tb_require('./dom.js')
 // tb_require('./capabilities.js')
 
+var specialDomProperties = {
+  'for': 'htmlFor',
+  'class': 'className'
+};
+
 
 // Gets or sets the attribute called +name+ for the first element in the collection
 ElementCollection.prototype.attr = function (name, value) {
   if (OTHelpers.isObject(name)) {
+    var actualName;
+
     for (var key in name) {
-      this.first.setAttribute(key, name[key]);
+      actualName = specialDomProperties[key] || key;
+      this.first.setAttribute(actualName, name[key]);
     }
   }
   else if (value === void 0) {
-    return this.first.getAttribute(name);
+    return this.first.getAttribute(specialDomProperties[name] || name);
   }
   else {
-    this.first.setAttribute(name, value);
+    this.first.setAttribute(specialDomProperties[name] || name, value);
   }
 
   return this;
 };
 
+
+// Removes an attribute called +name+ for the every element in the collection.
+ElementCollection.prototype.removeAttr = function (name) {
+  var actualName = specialDomProperties[name] || name;
+
+  this.forEach(function(element) {
+    element.removeAttribute(actualName);
+  });
+
+  return this;
+};
+
+
 // Gets, and optionally sets, the html body of the first element
 // in the collection. If the +html+ is provided then the first
 // element's html body will be replaced with it.
@@ -3882,14 +5538,227 @@
   };
 
   // @remove
-  OTHelpers.height = function(element, newHeight) {
-    var ret = $(element).height(newHeight);
-    return newHeight ? OTHelpers : ret;
+  OTHelpers.height = function(element, newHeight) {
+    var ret = $(element).height(newHeight);
+    return newHeight ? OTHelpers : ret;
+  };
+
+})();
+
+
+// CSS helpers helpers
+
+/*jshint browser:true, smarttabs:true*/
+
+// tb_require('../helpers.js')
+// tb_require('./dom.js')
+// tb_require('./getcomputedstyle.js')
+
+(function() {
+
+  var displayStateCache = {},
+      defaultDisplays = {};
+
+  var defaultDisplayValueForElement = function (element) {
+    if (defaultDisplays[element.ownerDocument] &&
+      defaultDisplays[element.ownerDocument][element.nodeName]) {
+      return defaultDisplays[element.ownerDocument][element.nodeName];
+    }
+
+    if (!defaultDisplays[element.ownerDocument]) defaultDisplays[element.ownerDocument] = {};
+
+    // We need to know what display value to use for this node. The easiest way
+    // is to actually create a node and read it out.
+    var testNode = element.ownerDocument.createElement(element.nodeName),
+        defaultDisplay;
+
+    element.ownerDocument.body.appendChild(testNode);
+    defaultDisplay = defaultDisplays[element.ownerDocument][element.nodeName] =
+    $(testNode).css('display');
+
+    $(testNode).remove();
+    testNode = null;
+
+    return defaultDisplay;
+  };
+
+  var isHidden = function (element) {
+    var computedStyle = $.getComputedStyle(element);
+    return computedStyle.getPropertyValue('display') === 'none';
+  };
+
+  var setCssProperties = function (element, hash) {
+    var style = element.style;
+
+    for (var cssName in hash) {
+      if (hash.hasOwnProperty(cssName)) {
+        style[cssName] = hash[cssName];
+      }
+    }
+  };
+
+  var setCssProperty = function (element, name, value) {
+    element.style[name] = value;
+  };
+
+  var getCssProperty = function (element, unnormalisedName) {
+    // Normalise vendor prefixes from the form MozTranform to -moz-transform
+    // except for ms extensions, which are weird...
+
+    var name = unnormalisedName.replace( /([A-Z]|^ms)/g, '-$1' ).toLowerCase(),
+        computedStyle = $.getComputedStyle(element),
+        currentValue = computedStyle.getPropertyValue(name);
+
+    if (currentValue === '') {
+      currentValue = element.style[name];
+    }
+
+    return currentValue;
+  };
+
+  var applyCSS = function(element, styles, callback) {
+    var oldStyles = {},
+        name,
+        ret;
+
+    // Backup the old styles
+    for (name in styles) {
+      if (styles.hasOwnProperty(name)) {
+        // We intentionally read out of style here, instead of using the css
+        // helper. This is because the css helper uses querySelector and we
+        // only want to pull values out of the style (domeElement.style) hash.
+        oldStyles[name] = element.style[name];
+
+        $(element).css(name, styles[name]);
+      }
+    }
+
+    ret = callback(element);
+
+    // Restore the old styles
+    for (name in styles) {
+      if (styles.hasOwnProperty(name)) {
+        $(element).css(name, oldStyles[name] || '');
+      }
+    }
+
+    return ret;
+  };
+
+  ElementCollection.prototype.show = function() {
+    return this.forEach(function(element) {
+      var display = element.style.display;
+
+      if (display === '' || display === 'none') {
+        element.style.display = displayStateCache[element] || '';
+        delete displayStateCache[element];
+      }
+
+      if (isHidden(element)) {
+        // It's still hidden so there's probably a stylesheet that declares this
+        // element as display:none;
+        displayStateCache[element] = 'none';
+
+        element.style.display = defaultDisplayValueForElement(element);
+      }
+    });
+  };
+
+  ElementCollection.prototype.hide = function() {
+    return this.forEach(function(element) {
+      if (element.style.display === 'none') return;
+
+      displayStateCache[element] = element.style.display;
+      element.style.display = 'none';
+    });
+  };
+
+  ElementCollection.prototype.css = function(nameOrHash, value) {
+    if (this.length === 0) return;
+
+    if (typeof(nameOrHash) !== 'string') {
+
+      return this.forEach(function(element) {
+        setCssProperties(element, nameOrHash);
+      });
+
+    } else if (value !== undefined) {
+
+      return this.forEach(function(element) {
+        setCssProperty(element, nameOrHash, value);
+      });
+
+    } else {
+      return getCssProperty(this.first, nameOrHash, value);
+    }
+  };
+
+  // Apply +styles+ to +element+ while executing +callback+, restoring the previous
+  // styles after the callback executes.
+  ElementCollection.prototype.applyCSS = function (styles, callback) {
+    var results = [];
+
+    this.forEach(function(element) {
+      results.push(applyCSS(element, styles, callback));
+    });
+
+    return results;
+  };
+
+
+  // Make +element+ visible while executing +callback+.
+  ElementCollection.prototype.makeVisibleAndYield = function (callback) {
+    var hiddenVisually = {
+        display: 'block',
+        visibility: 'hidden'
+      },
+      results = [];
+
+    this.forEach(function(element) {
+      // find whether it's the element or an ancestor that's display none and
+      // then apply to whichever it is
+      var targetElement = $.findElementWithDisplayNone(element);
+      if (!targetElement) {
+        results.push(void 0);
+      }
+      else {
+        results.push(
+          applyCSS(targetElement, hiddenVisually, callback)
+        );
+      }
+    });
+
+    return results;
+  };
+
+
+  // @remove
+  OTHelpers.show = function(element) {
+    return $(element).show();
+  };
+
+  // @remove
+  OTHelpers.hide = function(element) {
+    return $(element).hide();
+  };
+
+  // @remove
+  OTHelpers.css = function(element, nameOrHash, value) {
+    return $(element).css(nameOrHash, value);
+  };
+
+  // @remove
+  OTHelpers.applyCSS = function(element, styles, callback) {
+    return $(element).applyCSS(styles, callback);
+  };
+
+  // @remove
+  OTHelpers.makeVisibleAndYield = function(element, callback) {
+    return $(element).makeVisibleAndYield(callback);
   };
 
 })();
 
-
 // tb_require('../helpers.js')
 
 /**@licence
@@ -3992,6 +5861,35 @@
 
 (function() {
 
+  var requestAnimationFrame = window.requestAnimationFrame ||
+                              window.mozRequestAnimationFrame ||
+                              window.webkitRequestAnimationFrame ||
+                              window.msRequestAnimationFrame;
+
+  if (requestAnimationFrame) {
+    requestAnimationFrame = OTHelpers.bind(requestAnimationFrame, window);
+  }
+  else {
+    var lastTime = 0;
+    var startTime = OTHelpers.now();
+
+    requestAnimationFrame = function(callback){
+      var currTime = OTHelpers.now();
+      var timeToCall = Math.max(0, 16 - (currTime - lastTime));
+      var id = window.setTimeout(function() { callback(currTime - startTime); }, timeToCall);
+      lastTime = currTime + timeToCall;
+      return id;
+    };
+  }
+
+  OTHelpers.requestAnimationFrame = requestAnimationFrame;
+})();
+/*jshint browser:true, smarttabs:true*/
+
+// tb_require('../helpers.js')
+
+(function() {
+
   // Singleton interval
   var logQueue = [],
       queueRunning = false;
@@ -4207,18 +6105,16 @@
 
 
 /**
- * @license  TB Plugin 0.4.0.9 2c62633 2014Q4-2.2.patch.1
+ * @license  TB Plugin 0.4.0.10 01e58ad 2015Q1
  * http://www.tokbox.com/
  *
  * Copyright (c) 2015 TokBox, Inc.
  *
- * Date: March 02 09:16:25 2015
+ * Date: April 13 06:37:38 2015
  *
  */
 
-/* jshint globalstrict: true, strict: false, undef: true, unused: false,
-          trailing: true, browser: true, smarttabs:true */
-/* global scope:true, OT:true, OTHelpers:true */
+/* global scope:true */
 /* exported OTPlugin */
 
 /* jshint ignore:start */
@@ -4228,14 +6124,16 @@
 // If we've already be setup, bail
 if (scope.OTPlugin !== void 0) return;
 
+var $ = OTHelpers;
 
 // TB must exist first, otherwise we can't do anything
 // if (scope.OT === void 0) return;
 
 // Establish the environment that we're running in
 // Note: we don't currently support 64bit IE
-var isSupported = (OTHelpers.env.name === 'IE' && OTHelpers.env.version >= 8 &&
-                    OTHelpers.env.userAgent.indexOf('x64') === -1),
+var isSupported = $.env.name === 'Safari' ||
+                  ($.env.name === 'IE' && $.env.version >= 8 &&
+                    $.env.userAgent.indexOf('x64') === -1),
     pluginIsReady = false;
 
 
@@ -4243,19 +6141,32 @@
   isSupported: function () { return isSupported; },
   isReady: function() { return pluginIsReady; },
   meta: {
-    mimeType: 'application/x-opentokie,version=0.4.0.9',
-    activeXName: 'TokBox.OpenTokIE.0.4.0.9',
-    version: '0.4.0.9'
+    mimeType: 'application/x-opentokie,version=0.4.0.10',
+    activeXName: 'TokBox.OpenTokIE.0.4.0.10',
+    version: '0.4.0.10'
+  },
+
+  useLoggingFrom: function(host) {
+    // TODO there's no way to revert this, should there be?
+    OTPlugin.log = $.bind(host.log, host);
+    OTPlugin.debug = $.bind(host.debug, host);
+    OTPlugin.info = $.bind(host.info, host);
+    OTPlugin.warn = $.bind(host.warn, host);
+    OTPlugin.error = $.bind(host.error, host);
   }
 };
 
 
-
 // Add logging methods
-OTHelpers.useLogHelpers(OTPlugin);
+$.useLogHelpers(OTPlugin);
+
 
 scope.OTPlugin = OTPlugin;
 
+$.registerCapability('otplugin', function() {
+  return OTPlugin.isInstalled();
+});
+
 // If this client isn't supported we still make sure that OTPlugin is defined
 // and the basic API (isSupported() and isInstalled()) is created.
 if (!OTPlugin.isSupported()) {
@@ -4362,13 +6273,15 @@
 // tb_require('./header.js')
 // tb_require('./shims.js')
 
+/* global curryCallAsync:true */
 /* exported RumorSocket */
 
-var RumorSocket = function(plugin, server) {
-  var connected = false,
-      rumorID;
-
-  var _onOpen,
+var RumorSocket = function (plugin, server) {
+  var Proto = function RumorSocket () {},
+      api = new Proto(),
+      connected = false,
+      rumorID,
+      _onOpen,
       _onClose;
 
 
@@ -4383,91 +6296,217 @@
     throw new Error('Could not initialise OTPlugin rumor connection');
   }
 
-  plugin._.SetOnRumorOpen(rumorID, function() {
-    if (_onOpen && OTHelpers.isFunction(_onOpen)) {
+
+  api.open = function() {
+    connected = true;
+    plugin._.RumorOpen(rumorID);
+  };
+
+  api.close = function(code, reason) {
+    if (connected) {
+      connected = false;
+      plugin._.RumorClose(rumorID, code, reason);
+    }
+
+    plugin.removeRef(api);
+  };
+
+  api.destroy = function() {
+    this.close();
+  };
+
+  api.send = function(msg) {
+    plugin._.RumorSend(rumorID, msg.type, msg.toAddress,
+      JSON.parse(JSON.stringify(msg.headers)), msg.data);
+  };
+
+  api.onOpen = function(callback) {
+    _onOpen = callback;
+  };
+
+  api.onClose = function(callback) {
+    _onClose = callback;
+  };
+
+  api.onError = function(callback) {
+    plugin._.SetOnRumorError(rumorID, curryCallAsync(callback));
+  };
+
+  api.onMessage = function(callback) {
+    plugin._.SetOnRumorMessage(rumorID, curryCallAsync(callback));
+  };
+
+  plugin.addRef(api);
+
+  plugin._.SetOnRumorOpen(rumorID, curryCallAsync(function() {
+    if (_onOpen && $.isFunction(_onOpen)) {
       _onOpen.call(null);
     }
-  });
+  }));
 
-  plugin._.SetOnRumorClose(rumorID, function(code) {
+  plugin._.SetOnRumorClose(rumorID, curryCallAsync(function(code) {
     _onClose(code);
 
     // We're done. Clean up ourselves
-    plugin.removeRef(this);
-  });
+    plugin.removeRef(api);
+  }));
 
-  var api = {
-    open: function() {
-      connected = true;
-      plugin._.RumorOpen(rumorID);
-    },
+  return api;
+};
 
-    close: function(code, reason) {
-      if (connected) {
-        connected = false;
-        plugin._.RumorClose(rumorID, code, reason);
-      }
-    },
+// tb_require('./header.js')
+// tb_require('./shims.js')
 
-    destroy: function() {
-      this.close();
-    },
+/* exported  refCountBehaviour */
 
-    send: function(msg) {
-      plugin._.RumorSend(rumorID, msg.type, msg.toAddress,
-        JSON.parse(JSON.stringify(msg.headers)), msg.data);
-    },
+var refCountBehaviour = function refCountBehaviour (api) {
+  var _liveObjects = [];
 
-    onOpen: function(callback) {
-      _onOpen = callback;
-    },
+  api.addRef = function (ref) {
+    _liveObjects.push(ref);
+    return api;
+  };
 
-    onClose: function(callback) {
-      _onClose = callback;
-    },
+  api.removeRef = function (ref) {
+    if (_liveObjects.length === 0) return;
 
-    onError: function(callback) {
-      plugin._.SetOnRumorError(rumorID, callback);
-    },
+    var index = _liveObjects.indexOf(ref);
+    if (index !== -1) {
+      _liveObjects.splice(index, 1);
+    }
 
-    onMessage: function(callback) {
-      plugin._.SetOnRumorMessage(rumorID, callback);
+    if (_liveObjects.length === 0) {
+      api.destroy();
     }
+
+    return api;
   };
 
-  plugin.addRef(api);
-  return api;
+  api.removeAllRefs = function () {
+    while (_liveObjects.length) {
+      _liveObjects.shift().destroy();
+    }
+  };
 };
 
 // tb_require('./header.js')
 // tb_require('./shims.js')
 
-/* jshint globalstrict: true, strict: false, undef: true, unused: true,
-          trailing: true, browser: true, smarttabs:true */
-/* global OT:true, scope:true, injectObject:true */
-/* exported createMediaCaptureController:true, createPeerController:true,
-            injectObject:true, plugins:true, mediaCaptureObject:true,
-            removeAllObjects:true, curryCallAsync:true */
-
-var objectTimeouts = {},
-    mediaCaptureObject,
-    plugins = {};
+/* global curryCallAsync:true */
+/* exported  pluginEventingBehaviour */
+
+var pluginEventingBehaviour = function pluginEventingBehaviour (api) {
+  var eventHandlers = {};
+
+  var onCustomEvent = function() {
+    var args = Array.prototype.slice.call(arguments);
+    api.emit(args.shift(), args);
+  };
+
+  api.on = function (name, callback, context) {
+    if (!eventHandlers.hasOwnProperty(name)) {
+      eventHandlers[name] = [];
+    }
+
+    eventHandlers[name].push([callback, context]);
+    return api;
+  };
+
+  api.off = function (name, callback, context) {
+    if (!eventHandlers.hasOwnProperty(name) ||
+        eventHandlers[name].length === 0) {
+      return;
+    }
+
+    $.filter(eventHandlers[name], function(listener) {
+      return listener[0] === callback &&
+              listener[1] === context;
+    });
+
+    return api;
+  };
+
+  api.once = function (name, callback, context) {
+    var fn = function () {
+      api.off(name, fn);
+      return callback.apply(context, arguments);
+    };
+
+    api.on(name, fn);
+    return api;
+  };
+
+  api.emit = function (name, args) {
+    $.callAsync(function() {
+      if (!eventHandlers.hasOwnProperty(name) && eventHandlers[name].length) {
+        return;
+      }
+
+      $.forEach(eventHandlers[name], function(handler) {
+        handler[0].apply(handler[1], args);
+      });
+    });
+
+    return api;
+  };
+
+  var onReady = function onReady (readyCallback) {
+    if (api._.on) {
+      // If the plugin supports custom events we'll use them
+      api._.on(-1, {
+        customEvent: curryCallAsync(onCustomEvent)
+      });
+    }
+
+    // Only the main plugin has an initialise method
+    if (api._.initialise) {
+      api.on('ready', curryCallAsync(readyCallback));
+      api._.initialise();
+    }
+    else {
+      readyCallback.call(api);
+    }
+  };
+
+  return function (completion) {
+    onReady(function(err) {
+      if (err) {
+        OTPlugin.error('Error while starting up plugin ' + api.uuid + ': ' + err);
+        completion(err);
+        return;
+      }
+
+      OTPlugin.debug('Plugin ' + api.id + ' is loaded');
+      completion(void 0, api);
+    });
+  };
+};
+// tb_require('./header.js')
+// tb_require('./shims.js')
+// tb_require('./ref_count_behaviour.js')
+// tb_require('./plugin_eventing_behaviour.js')
+
+/* global refCountBehaviour:true, pluginEventingBehaviour:true, scope:true */
+/* exported createPluginProxy, curryCallAsync, makeMediaPeerProxy, makeMediaCapturerProxy */
+
+var PROXY_LOAD_TIMEOUT = 5000;
+
+var objectTimeouts = {};
 
 var curryCallAsync = function curryCallAsync (fn) {
   return function() {
     var args = Array.prototype.slice.call(arguments);
     args.unshift(fn);
-    OTHelpers.callAsync.apply(OTHelpers, args);
+    $.callAsync.apply($, args);
   };
 };
 
-
-var clearObjectLoadTimeout = function clearObjectLoadTimeout (callbackId) {
+var clearGlobalCallback = function clearGlobalCallback (callbackId) {
   if (!callbackId) return;
 
   if (objectTimeouts[callbackId]) {
     clearTimeout(objectTimeouts[callbackId]);
-    delete objectTimeouts[callbackId];
+    objectTimeouts[callbackId] = null;
   }
 
   if (scope[callbackId]) {
@@ -4479,148 +6518,196 @@
   }
 };
 
-var removeObjectFromDom = function removeObjectFromDom (object) {
-  clearObjectLoadTimeout(object.getAttribute('tbCallbackId'));
+var waitOnGlobalCallback = function waitOnGlobalCallback (callbackId, completion) {
+  objectTimeouts[callbackId] = setTimeout(function() {
+    clearGlobalCallback(callbackId);
+    completion('The object timed out while loading.');
+  }, PROXY_LOAD_TIMEOUT);
 
-  if (mediaCaptureObject && mediaCaptureObject.id === object.id) {
-    mediaCaptureObject = null;
-  }
-  else if (plugins.hasOwnProperty(object.id)) {
-    delete plugins[object.id];
-  }
+  scope[callbackId] = function() {
+    clearGlobalCallback(callbackId);
 
-  OTHelpers.removeElement(object);
+    var args = Array.prototype.slice.call(arguments);
+    args.unshift(null);
+    completion.apply(null, args);
+  };
+};
+
+var generateCallbackID = function generateCallbackID () {
+  return 'OTPlugin_loaded_' + $.uuid().replace(/\-+/g, '');
 };
 
-// @todo bind destroy to unload, may need to coordinate with TB
-// jshint -W098
-var removeAllObjects = function removeAllObjects () {
-  if (mediaCaptureObject) mediaCaptureObject.destroy();
+var generateObjectHtml = function generateObjectHtml (callbackId, options) {
+  options = options || {};
+
+  var objBits = [],
+    attrs = [
+      'type="' + options.mimeType + '"',
+      'id="' + callbackId + '_obj"',
+      'tb_callback_id="' + callbackId + '"',
+      'width="0" height="0"'
+    ],
+    params = {
+      userAgent: $.env.userAgent.toLowerCase(),
+      windowless: options.windowless,
+      onload: callbackId
+    };
+
+
+  if (options.isVisible !== true) {
+    attrs.push('visibility="hidden"');
+  }
+
+  objBits.push('<object ' + attrs.join(' ') + '>');
 
-  for (var id in plugins) {
-    if (plugins.hasOwnProperty(id)) {
-      plugins[id].destroy();
+  for (var name in params) {
+    if (params.hasOwnProperty(name)) {
+      objBits.push('<param name="' + name + '" value="' + params[name] + '" />');
     }
   }
+
+  objBits.push('</object>');
+  return objBits.join('');
 };
 
-// Reference counted wrapper for a plugin object
-var PluginProxy = function PluginProxy (plugin) {
-  var _plugin = plugin,
-      _liveObjects = [];
 
-  this._ = _plugin;
 
-  this.addRef = function(ref) {
-    _liveObjects.push(ref);
-    return this;
-  };
+var createObject = function createObject (callbackId, options, completion) {
+  options = options || {};
 
-  this.removeRef = function(ref) {
-    if (_liveObjects.length === 0) return;
+  var html = generateObjectHtml(callbackId, options),
+      doc = options.doc || scope.document;
 
-    var index = _liveObjects.indexOf(ref);
-    if (index !== -1) {
-      _liveObjects.splice(index, 1);
-    }
+  // if (options.robust !== false) {
+  //   new createFrame(html, callbackId, scope[callbackId], function(frame, win, doc) {
+  //     var object = doc.getElementById(callbackId+'_obj');
+  //     object.removeAttribute('id');
+  //     completion(void 0, object, frame);
+  //   });
+  // }
+  // else {
 
-    if (_liveObjects.length === 0) {
-      this.destroy();
-    }
 
-    return this;
-  };
+  doc.body.insertAdjacentHTML('beforeend', html);
+  var object = doc.body.querySelector('#'+callbackId+'_obj');
 
-  this.isValid = function() {
-    return _plugin.valid;
-  };
+  // object.setAttribute('type', options.mimeType);
 
-  // Event Handling Mechanisms
+  completion(void 0, object);
+  // }
+};
 
-  var eventHandlers = {};
+// Reference counted wrapper for a plugin object
+var createPluginProxy = function (options, completion) {
+  var Proto = function PluginProxy() {},
+      api = new Proto(),
+      waitForReadySignal = pluginEventingBehaviour(api);
 
-  var onCustomEvent = OTHelpers.bind(curryCallAsync(function onCustomEvent() {
-    var args = Array.prototype.slice.call(arguments),
-        name = args.shift();
+  refCountBehaviour(api);
 
-    if (!eventHandlers.hasOwnProperty(name) && eventHandlers[name].length) {
-      return;
-    }
+  // Assign +plugin+ to this object and setup all the public
+  // accessors that relate to the DOM Object.
+  //
+  var setPlugin = function setPlugin (plugin) {
+        if (plugin) {
+          api._ = plugin;
+          api.parentElement = plugin.parentElement;
+          api.$ = $(plugin);
+        }
+        else {
+          api._ = null;
+          api.parentElement = null;
+          api.$ = $();
+        }
+      };
 
-    OTHelpers.forEach(eventHandlers[name], function(handler) {
-      handler[0].apply(handler[1], args);
-    });
-  }), this);
 
+  api.uuid = generateCallbackID();
 
-  this.on = function (name, callback, context) {
-    if (!eventHandlers.hasOwnProperty(name)) {
-      eventHandlers[name] = [];
-    }
+  api.isValid = function() {
+    return api._.valid;
+  };
 
-    eventHandlers[name].push([callback, context]);
-    return this;
+  api.destroy = function() {
+    api.removeAllRefs();
+    setPlugin(null);
+
+    // Let listeners know that they should do any final book keeping
+    // that relates to us.
+    api.emit('destroy');
   };
 
-  this.off = function (name, callback, context) {
-    if (!eventHandlers.hasOwnProperty(name) ||
-        eventHandlers[name].length === 0) {
-      return;
-    }
 
-    OTHelpers.filter(eventHandlers[name], function(listener) {
-      return listener[0] === callback &&
-              listener[1] === context;
-    });
 
-    return this;
-  };
+  /// Initialise
 
-  this.once = function (name, callback, context) {
-    var fn = function () {
-      this.off(name, fn, this);
-      return callback.apply(context, arguments);
-    };
 
-    this.on(name, fn, this);
-    return this;
-  };
+  // The next statement creates the raw plugin object accessor on the Proxy.
+  // This is null until we actually have created the Object.
+  setPlugin(null);
 
+  waitOnGlobalCallback(api.uuid, function(err) {
+    if (err) {
+      completion('The plugin with the mimeType of ' +
+                      options.mimeType + ' timed out while loading: ' + err);
 
-  this.onReady = function(readyCallback) {
-    if (_plugin.on) {
-      // If the plugin supports custom events we'll use them
-      _plugin.on(-1, {customEvent: curryCallAsync(onCustomEvent, this)});
+      api.destroy();
+      return;
     }
 
-    // Only the main plugin has an initialise method
-    if (_plugin.initialise) {
-      this.on('ready', OTHelpers.bind(curryCallAsync(readyCallback), this));
-      _plugin.initialise();
-    }
-    else {
-      readyCallback.call(null);
-    }
-  };
+    api._.setAttribute('id', 'tb_plugin_' + api._.uuid);
+    api._.removeAttribute('tb_callback_id');
+    api.uuid = api._.uuid;
+    api.id = api._.id;
+
+    waitForReadySignal(function(err) {
+      if (err) {
+        completion('Error while starting up plugin ' + api.uuid + ': ' + err);
+        api.destroy();
+        return;
+      }
+
+      completion(void 0, api);
+    });
+  });
+
+  createObject(api.uuid, options, function(err, plugin) {
+    setPlugin(plugin);
+  });
+
+  return api;
+};
+
 
-  this.destroy = function() {
-    while (_liveObjects.length) {
-      _liveObjects.shift().destroy();
-    }
 
-    if (_plugin) removeObjectFromDom(_plugin);
-    _plugin = null;
+
+// Specialisation for the MediaCapturer API surface
+var makeMediaCapturerProxy = function makeMediaCapturerProxy (api) {
+
+  api.selectSources = function() {
+    return api._.selectSources.apply(api._, arguments);
   };
 
-  this.setStream = function(stream, completion) {
+  return api;
+};
+
+
+// Specialisation for the MediaPeer API surface
+var makeMediaPeerProxy = function makeMediaPeerProxy (api) {
+  api.setStream = function(stream, completion) {
+    api._.setStream(stream);
+
     if (completion) {
       if (stream.hasVideo()) {
         // FIX ME renderingStarted currently doesn't first
-        // this.once('renderingStarted', completion);
+        // api.once('renderingStarted', completion);
         var verifyStream = function() {
-          if (!_plugin) return;
+          if (!api._) {
+            completion(new $.Error('The plugin went away before the stream could be bound.'));
+            return;
+          }
 
-          if (_plugin.videoWidth > 0) {
+          if (api._.videoWidth > 0) {
             // This fires a little too soon.
             setTimeout(completion, 200);
           }
@@ -4634,122 +6721,256 @@
       else {
         // TODO Investigate whether there is a good way to detect
         // when the audio is ready. Does it even matter?
-        completion();
+
+        // This fires a little too soon.
+        setTimeout(completion, 200);
       }
     }
-    _plugin.setStream(stream);
+
+    return api;
   };
+
+  return api;
 };
 
+
 // tb_require('./header.js')
 // tb_require('./shims.js')
 // tb_require('./proxy.js')
 
-/* jshint globalstrict: true, strict: false, undef: true, unused: true,
-          trailing: true, browser: true, smarttabs:true */
 /* exported VideoContainer */
 
-var VideoContainer = function VideoContainer (plugin, stream) {
-  this.domElement = plugin._;
-  this.parentElement = plugin._.parentNode;
+var VideoContainer = function (plugin, stream) {
+  var Proto = function VideoContainer () {},
+      api = new Proto();
+
+  api.domElement = plugin._;
+  api.$ = $(plugin._);
+  api.parentElement = plugin._.parentNode;
 
-  plugin.addRef(this);
+  plugin.addRef(api);
 
-  this.appendTo = function (parentDomElement) {
+  api.appendTo = function (parentDomElement) {
     if (parentDomElement && plugin._.parentNode !== parentDomElement) {
       OTPlugin.debug('VideoContainer appendTo', parentDomElement);
       parentDomElement.appendChild(plugin._);
-      this.parentElement = parentDomElement;
+      api.parentElement = parentDomElement;
     }
   };
 
-  this.show = function (completion) {
+  api.show = function (completion) {
     OTPlugin.debug('VideoContainer show');
     plugin._.removeAttribute('width');
     plugin._.removeAttribute('height');
     plugin.setStream(stream, completion);
-    OTHelpers.show(plugin._);
+    $.show(plugin._);
+    return api;
   };
 
-  this.setWidth = function (width) {
-    OTPlugin.debug('VideoContainer setWidth to ' + width);
+  api.setSize = function(width, height) {
     plugin._.setAttribute('width', width);
+    plugin._.setAttribute('height', height);
+    return api;
   };
 
-  this.setHeight = function (height) {
-    OTPlugin.debug('VideoContainer setHeight to ' + height);
-    plugin._.setAttribute('height', height);
+  api.width = function (newWidth) {
+    if (newWidth !== void 0) {
+      OTPlugin.debug('VideoContainer set width to ' + newWidth);
+      plugin._.setAttribute('width', newWidth);
+    }
+
+    return plugin._.getAttribute('width');
   };
 
-  this.setVolume = function (value) {
-    // TODO
-    OTPlugin.debug('VideoContainer setVolume not implemented: called with ' + value);
+  api.height = function (newHeight) {
+    if (newHeight !== void 0) {
+      OTPlugin.debug('VideoContainer set height to ' + newHeight);
+      plugin._.setAttribute('height', newHeight);
+    }
+
+    return plugin._.getAttribute('height');
   };
 
-  this.getVolume = function () {
-    // TODO
-    OTPlugin.debug('VideoContainer getVolume not implemented');
+  api.volume = function (newVolume) {
+    if (newVolume !== void 0) {
+      // TODO
+      OTPlugin.debug('VideoContainer setVolume not implemented: called with ' + newVolume);
+    }
+    else {
+      OTPlugin.debug('VideoContainer getVolume not implemented');
+    }
+
     return 0.5;
   };
 
-  this.getImgData = function () {
+  api.getImgData = function () {
     return plugin._.getImgData('image/png');
   };
 
-  this.getVideoWidth = function () {
+  api.videoWidth = function () {
     return plugin._.videoWidth;
   };
 
-  this.getVideoHeight = function () {
+  api.videoHeight = function () {
     return plugin._.videoHeight;
   };
 
-  this.destroy = function () {
+  api.destroy = function () {
     plugin._.setStream(null);
-    plugin.removeRef(this);
+    plugin.removeRef(api);
   };
+
+  return api;
 };
 
 // tb_require('./header.js')
 // tb_require('./shims.js')
 // tb_require('./proxy.js')
 
-/* jshint globalstrict: true, strict: false, undef: true, unused: true,
-          trailing: true, browser: true, smarttabs:true */
 /* exported RTCStatsReport */
 
-var RTCStatsReport = function (reports) {
-  this.forEach = function (callback, context) {
-    for (var id in reports) {
-      callback.call(context, reports[id]);
+var RTCStatsReport = function RTCStatsReport (reports) {
+  for (var id in reports) {
+    if (reports.hasOwnProperty(id)) {
+      this[id] = reports[id];
     }
-  };
+  }
 };
 
-  // tb_require('./header.js')
+RTCStatsReport.prototype.forEach = function (callback, context) {
+  for (var id in this) {
+    if (this.hasOwnProperty(id)) {
+      callback.call(context, this[id]);
+    }
+  }
+};
+
+// tb_require('./header.js')
+// tb_require('./shims.js')
+// tb_require('./proxy.js')
+
+/* global createPluginProxy:true, makeMediaPeerProxy:true, makeMediaCapturerProxy:true */
+/* exported PluginProxies  */
+
+
+var PluginProxies = (function() {
+  var Proto = function PluginProxies () {},
+      api = new Proto(),
+      proxies = {};
+
+
+  /// Private API
+
+  // This is called whenever a Proxy's destroy event fires.
+  var cleanupProxyOnDestroy = function cleanupProxyOnDestroy (object) {
+    if (api.mediaCapturer && api.mediaCapturer.id === object.id) {
+      api.mediaCapturer = null;
+    }
+    else if (proxies.hasOwnProperty(object.id)) {
+      delete proxies[object.id];
+    }
+
+    if (object.$) {
+      object.$.remove();
+    }
+  };
+
+
+  /// Public API
+
+
+  // Public accessor for the MediaCapturer
+  api.mediaCapturer = null;
+
+  api.removeAll = function removeAll () {
+    for (var id in proxies) {
+      if (proxies.hasOwnProperty(id)) {
+        proxies[id].destroy();
+      }
+    }
+
+    if (api.mediaCapturer) api.mediaCapturer.destroy();
+  };
+
+  api.create = function create (options, completion) {
+    var proxy = createPluginProxy(options, completion);
+
+    proxies[proxy.uuid] = proxy;
+
+    // Clean up after this Proxy when it's destroyed.
+    proxy.on('destroy', function() {
+      cleanupProxyOnDestroy(proxy);
+    });
+
+    return proxy;
+  };
+
+  api.createMediaPeer = function createMediaPeer (options, completion) {
+    if ($.isFunction(options)) {
+      completion = options;
+      options = {};
+    }
+
+    var mediaPeer =  api.create($.extend(options || {}, {
+      mimeType: OTPlugin.meta.mimeType,
+      isVisible: true,
+      windowless: true
+    }), function(err) {
+      if (err) {
+        completion.call(OTPlugin, err);
+        return;
+      }
+
+      proxies[mediaPeer.id] = mediaPeer;
+      completion.call(OTPlugin, void 0, mediaPeer);
+    });
+
+    makeMediaPeerProxy(mediaPeer);
+  };
+
+  api.createMediaCapturer = function createMediaCapturer (completion) {
+    if (api.mediaCapturer) {
+      completion.call(OTPlugin, void 0, api.mediaCapturer);
+      return api;
+    }
+
+    api.mediaCapturer = api.create({
+      mimeType: OTPlugin.meta.mimeType,
+      isVisible: false,
+      windowless: false
+    }, function(err) {
+      completion.call(OTPlugin, err, api.mediaCapturer);
+    });
+
+    makeMediaCapturerProxy(api.mediaCapturer);
+  };
+
+  return api;
+})();
+
+// tb_require('./header.js')
 // tb_require('./shims.js')
 // tb_require('./proxy.js')
 // tb_require('./stats.js')
 
-/* jshint globalstrict: true, strict: false, undef: true, unused: true,
-          trailing: true, browser: true, smarttabs:true */
-/* global MediaStream:true, RTCStatsReport:true */
+/* global MediaStream:true, RTCStatsReport:true, curryCallAsync:true */
 /* exported PeerConnection */
 
 // Our RTCPeerConnection shim, it should look like a normal PeerConection
 // from the outside, but it actually delegates to our plugin.
 //
-var PeerConnection = function PeerConnection (iceServers, options, plugin, ready) {
-  var id = OTHelpers.uuid(),
+var PeerConnection = function (iceServers, options, plugin, ready) {
+  var Proto = function PeerConnection () {},
+      api = new Proto(),
+      id = $.uuid(),
       hasLocalDescription = false,
       hasRemoteDescription = false,
       candidates = [],
       inited = false,
       deferMethods = [],
-      events,
-      _this = this;
+      events;
 
-  plugin.addRef(this);
+  plugin.addRef(api);
 
   events = {
     addstream: [],
@@ -4773,24 +6994,24 @@
       },
 
 
-      deferMethod = function (method) {
+      deferMethod = function deferMethod (method) {
         return function() {
           if (inited === true) {
-            return method.apply(_this, arguments);
+            return method.apply(api, arguments);
           }
 
           deferMethods.push([method, arguments]);
         };
       },
 
-      processDeferredMethods = function () {
+      processDeferredMethods = function processDeferredMethods () {
         var m;
         while ( (m = deferMethods.shift()) ) {
-          m[0].apply(_this, m[1]);
+          m[0].apply(api, m[1]);
         }
       },
 
-      triggerEvent = function (/* eventName [, arg1, arg2, ..., argN] */) {
+      triggerEvent = function triggerEvent (/* eventName [, arg1, arg2, ..., argN] */) {
         var args = Array.prototype.slice.call(arguments),
             eventName = args.shift();
 
@@ -4799,80 +7020,86 @@
           return;
         }
 
-        OTHelpers.forEach(events[eventName], function(listener) {
+        $.forEach(events[eventName], function(listener) {
           listener.apply(null, args);
         });
       },
 
-      bindAndDelegateEvents = function () {
-        plugin._.on(id, {
-          addStream: function(streamJson) {
-            setTimeout(function() {
-              var stream = MediaStream.fromJson(streamJson, plugin),
-                  event = {stream: stream, target: _this};
+      bindAndDelegateEvents = function bindAndDelegateEvents (events) {
+        for (var name in events) {
+          if (events.hasOwnProperty(name)) {
+            events[name] = curryCallAsync(events[name]);
+          }
+        }
 
-              if (_this.onaddstream && OTHelpers.isFunction(_this.onaddstream)) {
-                OTHelpers.callAsync(_this.onaddstream, event);
-              }
+        plugin._.on(id, events);
+      },
 
-              triggerEvent('addstream', event);
-            }, 3000);
-          },
+      addStream = function addStream (streamJson) {
+        setTimeout(function() {
+          var stream = MediaStream.fromJson(streamJson, plugin),
+              event = {stream: stream, target: api};
 
-          removeStream: function(streamJson) {
-            var stream = MediaStream.fromJson(streamJson, plugin),
-                event = {stream: stream, target: _this};
+          if (api.onaddstream && $.isFunction(api.onaddstream)) {
+            $.callAsync(api.onaddstream, event);
+          }
 
-            if (_this.onremovestream && OTHelpers.isFunction(_this.onremovestream)) {
-              OTHelpers.callAsync(_this.onremovestream, event);
-            }
+          triggerEvent('addstream', event);
+        }, 3000);
+      },
 
-            triggerEvent('removestream', event);
-          },
+      removeStream = function removeStream (streamJson) {
+        var stream = MediaStream.fromJson(streamJson, plugin),
+            event = {stream: stream, target: api};
 
-          iceCandidate: function(candidateSdp, sdpMid, sdpMLineIndex) {
-            var candidate = new OTPlugin.RTCIceCandidate({
-              candidate: candidateSdp,
-              sdpMid: sdpMid,
-              sdpMLineIndex: sdpMLineIndex
-            });
+        if (api.onremovestream && $.isFunction(api.onremovestream)) {
+          $.callAsync(api.onremovestream, event);
+        }
 
-            var event = {candidate: candidate, target: _this};
+        triggerEvent('removestream', event);
+      },
 
-            if (_this.onicecandidate && OTHelpers.isFunction(_this.onicecandidate)) {
-              OTHelpers.callAsync(_this.onicecandidate, event);
-            }
+      iceCandidate = function iceCandidate (candidateSdp, sdpMid, sdpMLineIndex) {
+        var candidate = new OTPlugin.RTCIceCandidate({
+          candidate: candidateSdp,
+          sdpMid: sdpMid,
+          sdpMLineIndex: sdpMLineIndex
+        });
 
-            triggerEvent('icecandidate', event);
-          },
+        var event = {candidate: candidate, target: api};
 
-          signalingStateChange: function(state) {
-            _this.signalingState = state;
-            var event = {state: state, target: _this};
-
-            if (_this.onsignalingstatechange &&
-                    OTHelpers.isFunction(_this.onsignalingstatechange)) {
-              OTHelpers.callAsync(_this.onsignalingstatechange, event);
-            }
+        if (api.onicecandidate && $.isFunction(api.onicecandidate)) {
+          $.callAsync(api.onicecandidate, event);
+        }
 
-            triggerEvent('signalingstate', event);
-          },
+        triggerEvent('icecandidate', event);
+      },
 
-          iceConnectionChange: function(state) {
-            _this.iceConnectionState = state;
-            var event = {state: state, target: _this};
-
-            if (_this.oniceconnectionstatechange &&
-                    OTHelpers.isFunction(_this.oniceconnectionstatechange)) {
-              OTHelpers.callAsync(_this.oniceconnectionstatechange, event);
-            }
+      signalingStateChange = function signalingStateChange (state) {
+        api.signalingState = state;
+        var event = {state: state, target: api};
 
-            triggerEvent('iceconnectionstatechange', event);
-          }
-        });
+        if (api.onsignalingstatechange &&
+                $.isFunction(api.onsignalingstatechange)) {
+          $.callAsync(api.onsignalingstatechange, event);
+        }
+
+        triggerEvent('signalingstate', event);
+      },
+
+      iceConnectionChange = function iceConnectionChange (state) {
+        api.iceConnectionState = state;
+        var event = {state: state, target: api};
+
+        if (api.oniceconnectionstatechange &&
+                $.isFunction(api.oniceconnectionstatechange)) {
+          $.callAsync(api.oniceconnectionstatechange, event);
+        }
+
+        triggerEvent('iceconnectionstatechange', event);
       };
 
-  this.createOffer = deferMethod(function (success, error, constraints) {
+  api.createOffer = deferMethod(function (success, error, constraints) {
     OTPlugin.debug('createOffer', constraints);
     plugin._.createOffer(id, function(type, sdp) {
       success(new OTPlugin.RTCSessionDescription({
@@ -4882,7 +7109,7 @@
     }, error, constraints || {});
   });
 
-  this.createAnswer = deferMethod(function (success, error, constraints) {
+  api.createAnswer = deferMethod(function (success, error, constraints) {
     OTPlugin.debug('createAnswer', constraints);
     plugin._.createAnswer(id, function(type, sdp) {
       success(new OTPlugin.RTCSessionDescription({
@@ -4892,19 +7119,18 @@
     }, error, constraints || {});
   });
 
-  this.setLocalDescription = deferMethod( function (description, success, error) {
+  api.setLocalDescription = deferMethod( function (description, success, error) {
     OTPlugin.debug('setLocalDescription');
 
     plugin._.setLocalDescription(id, description, function() {
       hasLocalDescription = true;
 
       if (hasRemoteDescription) processPendingCandidates();
-
       if (success) success.call(null);
     }, error);
   });
 
-  this.setRemoteDescription = deferMethod( function (description, success, error) {
+  api.setRemoteDescription = deferMethod( function (description, success, error) {
     OTPlugin.debug('setRemoteDescription');
 
     plugin._.setRemoteDescription(id, description, function() {
@@ -4915,7 +7141,7 @@
     }, error);
   });
 
-  this.addIceCandidate = deferMethod( function (candidate) {
+  api.addIceCandidate = deferMethod( function (candidate) {
     OTPlugin.debug('addIceCandidate');
 
     if (hasLocalDescription && hasRemoteDescription) {
@@ -4926,143 +7152,156 @@
     }
   });
 
-  this.addStream = deferMethod( function (stream) {
+  api.addStream = deferMethod( function (stream) {
     var constraints = {};
     plugin._.addStream(id, stream, constraints);
   });
 
-  this.removeStream = deferMethod( function (stream) {
+  api.removeStream = deferMethod( function (stream) {
     plugin._.removeStream(id, stream);
   });
 
-  this.getRemoteStreams = function () {
-    return OTHelpers.map(plugin._.getRemoteStreams(id), function(stream) {
+
+  api.getRemoteStreams = function () {
+    return $.map(plugin._.getRemoteStreams(id), function(stream) {
       return MediaStream.fromJson(stream, plugin);
     });
   };
 
-  this.getLocalStreams = function () {
-    return OTHelpers.map(plugin._.getLocalStreams(id), function(stream) {
+  api.getLocalStreams = function () {
+    return $.map(plugin._.getLocalStreams(id), function(stream) {
       return MediaStream.fromJson(stream, plugin);
     });
   };
 
-  this.getStreamById = function (streamId) {
+  api.getStreamById = function (streamId) {
     return MediaStream.fromJson(plugin._.getStreamById(id, streamId), plugin);
   };
 
-  this.getStats = deferMethod( function (mediaStreamTrack, success, error) {
-    plugin._.getStats(id, mediaStreamTrack || null, function(statsReportJson) {
+  api.getStats = deferMethod( function (mediaStreamTrack, success, error) {
+    plugin._.getStats(id, mediaStreamTrack || null, curryCallAsync(function(statsReportJson) {
       var report = new RTCStatsReport(JSON.parse(statsReportJson));
-      OTHelpers.callAsync(success, report);
-    }, error);
+      success(report);
+    }), error);
   });
 
-  this.close = function () {
+  api.close = function () {
     plugin._.destroyPeerConnection(id);
     plugin.removeRef(this);
   };
 
-  this.destroy = function () {
-    this.close();
+  api.destroy = function () {
+    api.close();
   };
 
-  this.addEventListener = function  (event, handler /* [, useCapture] we ignore this */) {
+  api.addEventListener = function  (event, handler /* [, useCapture] we ignore this */) {
     if (events[event] === void 0) {
       OTPlugin.error('Could not bind invalid event "' + event + '" to PeerConnection. ' +
                       'The valid event types are:');
-      OTPlugin.error('\t' + OTHelpers.keys(events).join(', '));
+      OTPlugin.error('\t' + $.keys(events).join(', '));
       return;
     }
 
     events[event].push(handler);
   };
 
-  this.removeEventListener = function  (event, handler /* [, useCapture] we ignore this */) {
+  api.removeEventListener = function  (event, handler /* [, useCapture] we ignore this */) {
     if (events[event] === void 0) {
       OTPlugin.error('Could not unbind invalid event "' + event + '" to PeerConnection. ' +
                       'The valid event types are:');
-      OTPlugin.error('\t' + OTHelpers.keys(events).join(', '));
+      OTPlugin.error('\t' + $.keys(events).join(', '));
       return;
     }
 
-    events[event] = OTHelpers.filter(events[event], handler);
+    events[event] = $.filter(events[event], handler);
   };
 
-  // I want these to appear to be null, instead of undefined, if no
+  // These should appear to be null, instead of undefined, if no
   // callbacks are assigned. This more closely matches how the native
   // objects appear and allows 'if (pc.onsignalingstatechange)' type
   // feature detection to work.
-  this.onaddstream = null;
-  this.onremovestream = null;
-  this.onicecandidate = null;
-  this.onsignalingstatechange = null;
-  this.oniceconnectionstatechange = null;
+  api.onaddstream = null;
+  api.onremovestream = null;
+  api.onicecandidate = null;
+  api.onsignalingstatechange = null;
+  api.oniceconnectionstatechange = null;
 
   // Both username and credential must exist, otherwise the plugin throws an error
-  OTHelpers.forEach(iceServers.iceServers, function(iceServer) {
+  $.forEach(iceServers.iceServers, function(iceServer) {
     if (!iceServer.username) iceServer.username = '';
     if (!iceServer.credential) iceServer.credential = '';
   });
 
   if (!plugin._.initPeerConnection(id, iceServers, options)) {
-    OTPlugin.error('Failed to initialise PeerConnection');
-    ready(new OTHelpers.error('Failed to initialise PeerConnection'));
+    ready(new $.error('Failed to initialise PeerConnection'));
     return;
   }
 
-  // This will make sense
+  // This will make sense once init becomes async
+  bindAndDelegateEvents({
+    addStream: addStream,
+    removeStream: removeStream,
+    iceCandidate: iceCandidate,
+    signalingStateChange: signalingStateChange,
+    iceConnectionChange: iceConnectionChange
+  });
+
   inited = true;
-  bindAndDelegateEvents();
   processDeferredMethods();
-  ready(void 0, this);
+  ready(void 0, api);
+
+  return api;
 };
 
 PeerConnection.create = function (iceServers, options, plugin, ready) {
   new PeerConnection(iceServers, options, plugin, ready);
 };
 
-
-
 // tb_require('./header.js')
 // tb_require('./shims.js')
 // tb_require('./proxy.js')
 // tb_require('./video_container.js')
 
-/* jshint globalstrict: true, strict: false, undef: true, unused: true,
-          trailing: true, browser: true, smarttabs:true */
 /* global VideoContainer:true */
 /* exported MediaStream */
 
-var MediaStreamTrack = function MediaStreamTrack (mediaStreamId, options, plugin) {
-  this.id = options.id;
-  this.kind = options.kind;
-  this.label = options.label;
-  this.enabled = OTHelpers.castToBoolean(options.enabled);
-  this.streamId = mediaStreamId;
 
-  this.setEnabled = function (enabled) {
-    this.enabled = OTHelpers.castToBoolean(enabled);
+var MediaStreamTrack = function (mediaStreamId, options, plugin) {
+  var Proto = function MediaStreamTrack () {},
+      api = new Proto();
+
+  api.id = options.id;
+  api.kind = options.kind;
+  api.label = options.label;
+  api.enabled = $.castToBoolean(options.enabled);
+  api.streamId = mediaStreamId;
 
-    if (this.enabled) {
-      plugin._.enableMediaStreamTrack(mediaStreamId, this.id);
+  api.setEnabled = function (enabled) {
+    api.enabled = $.castToBoolean(enabled);
+
+    if (api.enabled) {
+      plugin._.enableMediaStreamTrack(mediaStreamId, api.id);
     }
     else {
-      plugin._.disableMediaStreamTrack(mediaStreamId, this.id);
+      plugin._.disableMediaStreamTrack(mediaStreamId, api.id);
     }
   };
+
+  return api;
 };
 
-var MediaStream = function MediaStream (options, plugin) {
-  var audioTracks = [],
+var MediaStream = function (options, plugin) {
+  var Proto = function MediaStream () {},
+      api = new Proto(),
+      audioTracks = [],
       videoTracks = [];
 
-  this.id = options.id;
-  plugin.addRef(this);
+  api.id = options.id;
+  plugin.addRef(api);
 
   // TODO
-  // this.ended =
-  // this.onended =
+  // api.ended =
+  // api.onended =
 
   if (options.videoTracks) {
     options.videoTracks.map(function(track) {
@@ -5079,15 +7318,15 @@
   var hasTracksOfType = function (type) {
     var tracks = type === 'video' ? videoTracks : audioTracks;
 
-    return OTHelpers.some(tracks, function(track) {
+    return $.some(tracks, function(track) {
       return track.enabled;
     });
   };
 
-  this.getVideoTracks = function () { return videoTracks; };
-  this.getAudioTracks = function () { return audioTracks; };
+  api.getVideoTracks = function () { return videoTracks; };
+  api.getAudioTracks = function () { return audioTracks; };
 
-  this.getTrackById = function (id) {
+  api.getTrackById = function (id) {
     videoTracks.concat(audioTracks).forEach(function(track) {
       if (track.id === id) return track;
     });
@@ -5095,40 +7334,42 @@
     return null;
   };
 
-  this.hasVideo = function () {
+  api.hasVideo = function () {
     return hasTracksOfType('video');
   };
 
-  this.hasAudio = function () {
+  api.hasAudio = function () {
     return hasTracksOfType('audio');
   };
 
-  this.addTrack = function (/* MediaStreamTrack */) {
+  api.addTrack = function (/* MediaStreamTrack */) {
     // TODO
   };
 
-  this.removeTrack = function (/* MediaStreamTrack */) {
+  api.removeTrack = function (/* MediaStreamTrack */) {
     // TODO
   };
 
-  this.stop = function() {
-    plugin._.stopMediaStream(this.id);
-    plugin.removeRef(this);
+  api.stop = function() {
+    plugin._.stopMediaStream(api.id);
+    plugin.removeRef(api);
   };
 
-  this.destroy = function() {
-    this.stop();
+  api.destroy = function() {
+    api.stop();
   };
 
   // Private MediaStream API
-  this._ = {
+  api._ = {
     plugin: plugin,
 
     // Get a VideoContainer to render the stream in.
-    render: OTHelpers.bind(function() {
-      return new VideoContainer(plugin, this);
-    }, this)
+    render: function() {
+      return new VideoContainer(plugin, api);
+    }
   };
+
+  return api;
 };
 
 
@@ -5142,12 +7383,10 @@
 // tb_require('./proxy.js')
 // tb_require('./video_container.js')
 
-/* jshint globalstrict: true, strict: false, undef: true, unused: true,
-          trailing: true, browser: true, smarttabs:true */
 /* exported MediaConstraints */
 
 var MediaConstraints = function(userConstraints) {
-  var constraints = OTHelpers.clone(userConstraints);
+  var constraints = $.clone(userConstraints);
 
   this.hasVideo = constraints.video !== void 0 && constraints.video !== false;
   this.hasAudio = constraints.audio !== void 0 && constraints.audio !== false;
@@ -5187,202 +7426,100 @@
 
 // tb_require('./header.js')
 // tb_require('./shims.js')
-// tb_require('./proxy.js')
 
-/* jshint globalstrict: true, strict: false, undef: true, unused: true,
-          trailing: true, browser: true, smarttabs:true */
-/* global PluginProxy:true, scope:true */
-/* exported  injectObject, clearObjectLoadTimeout */
-
-var objectTimeouts = {};
-
-var lastElementChild = function lastElementChild(parent) {
-  var node = parent.lastChild;
-
-  while(node && node.nodeType !== 1) {
-    node = node.previousSibling;
-  }
-
-  return node;
-};
-
-var generateCallbackUUID = function generateCallbackUUID () {
-  return 'OTPlugin_loaded_' + OTHelpers.uuid().replace(/\-+/g, '');
-};
+/* global scope:true */
+/* exported  createFrame */
 
+var createFrame = function createFrame (bodyContent, callbackId, callback) {
+  var Proto = function Frame () {},
+      api = new Proto(),
+      domElement = scope.document.createElement('iframe');
 
-var clearObjectLoadTimeout = function clearObjectLoadTimeout (callbackId) {
-  if (!callbackId) return;
+  domElement.id = 'OTPlugin_frame_' + $.uuid().replace(/\-+/g, '');
+  domElement.style.border = '0';
 
-  if (objectTimeouts[callbackId]) {
-    clearTimeout(objectTimeouts[callbackId]);
-    delete objectTimeouts[callbackId];
+  try {
+    domElement.style.backgroundColor = 'rgba(0,0,0,0)';
+  } catch (err) {
+    // Old IE browsers don't support rgba
+    domElement.style.backgroundColor = 'transparent';
+    domElement.setAttribute('allowTransparency', 'true');
   }
 
-  if (scope[callbackId]) {
-    try {
-      delete scope[callbackId];
-    } catch (err) {
-      scope[callbackId] = void 0;
-    }
-  }
-};
+  domElement.scrolling = 'no';
+  domElement.setAttribute('scrolling', 'no');
 
-var createPluginProxy = function createPluginProxy (callbackId, mimeType, params, isVisible) {
-  var objBits = [],
-      extraAttributes = ['width="0" height="0"'],
-      plugin;
+  // This is necessary for IE, as it will not inherit it's doctype from
+  // the parent frame.
+  var frameContent = '<!DOCTYPE html><html><head>' +
+                    '<meta http-equiv="x-ua-compatible" content="IE=Edge">' +
+                    '<meta http-equiv="Content-type" content="text/html; charset=utf-8">' +
+                    '<title></title></head><body>' +
+                    bodyContent +
+                    '<script>window.parent["' + callbackId + '"](' +
+                      'document.querySelector("object")' +
+                    ');</script></body></html>';
 
-  if (isVisible !== true) {
-    extraAttributes.push('visibility="hidden"');
-  }
+  var wrappedCallback = function() {
+    OTPlugin.log('LOADED IFRAME');
+    var doc = domElement.contentDocument || domElement.contentWindow.document;
 
-  objBits.push('<object type="' + mimeType + '" ' + extraAttributes.join(' ') + '>');
+    if ($.env.iframeNeedsLoad) {
+      doc.body.style.backgroundColor = 'transparent';
+      doc.body.style.border = 'none';
 
-  for (var name in params) {
-    if (params.hasOwnProperty(name)) {
-      objBits.push('<param name="' + name + '" value="' + params[name] + '" />');
+      if ($.env.name !== 'IE') {
+        // Skip this for IE as we use the bookmarklet workaround
+        // for THAT browser.
+        doc.open();
+        doc.write(frameContent);
+        doc.close();
+      }
     }
-  }
-
-  objBits.push('</object>');
-
-  scope.document.body.insertAdjacentHTML('beforeend', objBits.join(''));
-  plugin = new PluginProxy(lastElementChild(scope.document.body));
-  plugin._.setAttribute('tbCallbackId', callbackId);
-
-  return plugin;
-};
-
 
-// Stops and cleans up after the plugin object load timeout.
-var injectObject = function injectObject (mimeType, isVisible, params, completion) {
-  var callbackId = generateCallbackUUID(),
-      plugin;
-
-  params.onload = callbackId;
-  params.userAgent = OTHelpers.env.userAgent.toLowerCase();
-
-  scope[callbackId] = function() {
-    clearObjectLoadTimeout(callbackId);
-
-    plugin._.setAttribute('id', 'tb_plugin_' + plugin._.uuid);
-
-    if (plugin._.removeAttribute !== void 0) {
-      plugin._.removeAttribute('tbCallbackId');
-    }
-    else {
-      // Plugin is some kind of weird object that doesn't have removeAttribute on Safari?
-      plugin._.tbCallbackId = null;
+    if (callback) {
+      callback(
+        api,
+        domElement.contentWindow,
+        doc
+      );
     }
-
-    plugin.uuid = plugin._.uuid;
-    plugin.id = plugin._.id;
-
-    plugin.onReady(function(err) {
-      if (err) {
-        OTPlugin.error('Error while starting up plugin ' + plugin.uuid + ': ' + err);
-        return;
-      }
-
-      OTPlugin.debug('Plugin ' + plugin.id + ' is loaded');
-
-      if (completion && OTHelpers.isFunction(completion)) {
-        completion.call(OTPlugin, null, plugin);
-      }
-    });
   };
 
-  plugin = createPluginProxy(callbackId, mimeType, params, isVisible);
-
-  objectTimeouts[callbackId] = setTimeout(function() {
-    clearObjectLoadTimeout(callbackId);
-
-    completion.call(OTPlugin, 'The object with the mimeType of ' +
-                                mimeType + ' timed out while loading.');
-
-    scope.document.body.removeChild(plugin._);
-  }, 3000);
-
-  return plugin;
-};
-
-
-// tb_require('./header.js')
-// tb_require('./shims.js')
-// tb_require('./proxy.js')
-// tb_require('./embedding.js')
-
-/* jshint globalstrict: true, strict: false, undef: true, unused: true,
-          trailing: true, browser: true, smarttabs:true */
-/* global injectObject, scope:true */
-/* exported createMediaCaptureController:true, createPeerController:true,
-            injectObject:true, plugins:true, mediaCaptureObject:true,
-            removeAllObjects:true */
-
-var objectTimeouts = {},
-    mediaCaptureObject,
-    plugins = {};
-
+  scope.document.body.appendChild(domElement);
 
-// @todo bind destroy to unload, may need to coordinate with TB
-// jshint -W098
-var removeAllObjects = function removeAllObjects () {
-  if (mediaCaptureObject) mediaCaptureObject.destroy();
-
-  for (var id in plugins) {
-    if (plugins.hasOwnProperty(id)) {
-      plugins[id].destroy();
+  if($.env.iframeNeedsLoad) {
+    if ($.env.name === 'IE') {
+      // This works around some issues with IE and document.write.
+      // Basically this works by slightly abusing the bookmarklet/scriptlet
+      // functionality that all browsers support.
+      domElement.contentWindow.contents = frameContent;
+      /*jshint scripturl:true*/
+      domElement.src = 'javascript:window["contents"]';
+      /*jshint scripturl:false*/
     }
-  }
-};
 
-// Creates the Media Capture controller. This exposes selectSources and is
-// used in the private API.
-//
-// Only one Media Capture controller can exist at once, calling this method
-// more than once will raise an exception.
-//
-var createMediaCaptureController = function createMediaCaptureController (completion) {
-  if (mediaCaptureObject) {
-    throw new Error('OTPlugin.createMediaCaptureController called multiple times!');
+    $.on(domElement, 'load', wrappedCallback);
+  } else {
+    setTimeout(wrappedCallback, 0);
   }
 
-  mediaCaptureObject = injectObject(OTPlugin.meta.mimeType, false, {windowless: false}, completion);
-
-  mediaCaptureObject.selectSources = function() {
-    return this._.selectSources.apply(this._, arguments);
+  api.reparent = function reparent (target) {
+    // document.adoptNode(domElement);
+    target.appendChild(domElement);
   };
 
-  return mediaCaptureObject;
-};
-
-// Create an instance of the publisher/subscriber/peerconnection object.
-// Many of these can exist at once, but the +id+ of each must be unique
-// within a single instance of scope (window or window-like thing).
-//
-var createPeerController = function createPeerController (completion) {
-  var o = injectObject(OTPlugin.meta.mimeType, true, {windowless: true}, function(err, plugin) {
-    if (err) {
-      completion.call(OTPlugin, err);
-      return;
-    }
-
-    plugins[plugin.id] = plugin;
-    completion.call(OTPlugin, null, plugin);
-  });
+  api.element = domElement;
 
-  return o;
+  return api;
 };
 
 // tb_require('./header.js')
 // tb_require('./shims.js')
-// tb_require('./proxy.js')
+// tb_require('./plugin_proxies.js')
 
-/* jshint globalstrict: true, strict: false, undef: true, unused: true,
-          trailing: true, browser: true, smarttabs:true */
 /* global OT:true, OTPlugin:true, ActiveXObject:true,
-          injectObject:true, curryCallAsync:true */
+          PluginProxies:true, curryCallAsync:true */
 
 /* exported AutoUpdater:true */
 var AutoUpdater;
@@ -5472,7 +7609,7 @@
         }
       }
     }
-    else if (OTHelpers.env.name === 'IE') {
+    else if ($.env.name === 'IE') {
       // This may mean that the installer plugin is not installed.
       // Although it could also mean that we're on IE 9 and below,
       // which does not support navigator.plugins. Fallback to
@@ -5507,9 +7644,12 @@
 
   // Version 0.4.0.4 autoupdate was broken. We want to prompt
   // for install on 0.4.0.4 or earlier. We're also including
-  // earlier versions just in case...
+  // earlier versions just in case. Version 0.4.0.10 also
+  // had a broken updater, we'll treat that version the same
+  // way.
   var hasBrokenUpdater = function () {
-    var _broken = !versionGreaterThan(getInstalledVersion(), '0.4.0.4');
+    var _broken = getInstalledVersion() === '0.4.0.9' ||
+                  !versionGreaterThan(getInstalledVersion(), '0.4.0.4');
 
     hasBrokenUpdater = function() { return _broken; };
     return _broken;
@@ -5525,7 +7665,11 @@
           return fn(void 0, arguments);
         }
 
-        injectObject(getInstallerMimeType(), false, {windowless: false}, function(err, p) {
+        PluginProxies.create({
+          mimeType: getInstallerMimeType(),
+          isVisible: false,
+          windowless: false
+        }, function(err, p) {
           plugin = p;
 
           if (err) {
@@ -5548,7 +7692,7 @@
       var modal = OT.Dialogs.Plugin.updateInProgress(),
           analytics = new OT.Analytics(),
         payload = {
-          ieVersion: OTHelpers.env.version,
+          ieVersion: $.env.version,
           pluginOldVersion: OTPlugin.installedVersion(),
           pluginNewVersion: OTPlugin.version()
         };
@@ -5649,19 +7793,15 @@
 // tb_require('./media_stream.js')
 // tb_require('./video_container.js')
 // tb_require('./rumor.js')
-// tb_require('./controllers.js')
 
-/* jshint globalstrict: true, strict: false, undef: true,
-          unused: true, trailing: true, browser: true, smarttabs:true */
-/* global scope, shim, pluginIsReady:true, mediaCaptureObject, plugins,
-          createMediaCaptureController, removeAllObjects, AutoUpdater */
+/* global scope, shim, pluginIsReady:true, PluginProxies, AutoUpdater */
 /* export registerReadyListener, notifyReadyListeners, onDomReady */
 
 var readyCallbacks = [];
 
 var // jshint -W098
     destroy = function destroy () {
-      removeAllObjects();
+      PluginProxies.removeAll();
     },
 
     registerReadyListener = function registerReadyListener (callback) {
@@ -5671,7 +7811,7 @@
     notifyReadyListeners = function notifyReadyListeners (err) {
       var callback;
 
-      while ( (callback = readyCallbacks.pop()) && OTHelpers.isFunction(callback) ) {
+      while ( (callback = readyCallbacks.pop()) && $.isFunction(callback) ) {
         callback.call(OTPlugin, err);
       }
     },
@@ -5692,15 +7832,15 @@
         }
 
         // Inject the controller object into the page, wait for it to load or timeout...
-        createMediaCaptureController(function(err) {
-          if (!err && (mediaCaptureObject && !mediaCaptureObject.isValid())) {
+        PluginProxies.createMediaCapturer(function(err) {
+          if (!err && (PluginProxies.mediaCapturer && !PluginProxies.mediaCapturer.isValid())) {
             err = 'The TB Plugin failed to load properly';
           }
 
           pluginIsReady = true;
           notifyReadyListeners(err);
 
-          OTHelpers.onDOMUnload(destroy);
+          $.onDOMUnload(destroy);
         });
       });
     };
@@ -5716,13 +7856,11 @@
 // tb_require('./rumor.js')
 // tb_require('./lifecycle.js')
 
-/* jshint globalstrict: true, strict: false, undef: true,
-          unused: true, trailing: true, browser: true, smarttabs:true */
 /* global AutoUpdater,
           RumorSocket,
           MediaConstraints, PeerConnection, MediaStream,
           registerReadyListener,
-          mediaCaptureObject, createPeerController */
+          PluginProxies */
 
 OTPlugin.isInstalled = function isInstalled () {
   if (!this.isSupported()) return false;
@@ -5753,7 +7891,7 @@
   if (OTPlugin.isReady()) {
     var err;
 
-    if (!mediaCaptureObject || !mediaCaptureObject.isValid()) {
+    if (!PluginProxies.mediaCapturer || !PluginProxies.mediaCapturer.isValid()) {
       err = 'The TB Plugin failed to load properly';
     }
 
@@ -5766,7 +7904,7 @@
 
 // Helper function for OTPlugin.getUserMedia
 var _getUserMedia = function _getUserMedia(mediaConstraints, success, error) {
-  createPeerController(function(err, plugin) {
+  PluginProxies.createMediaPeer(function(err, plugin) {
     if (err) {
       error.call(OTPlugin, err);
       return;
@@ -5792,7 +7930,7 @@
     if (constraints.hasVideo) sources.push('video');
     if (constraints.hasAudio) sources.push('audio');
 
-    mediaCaptureObject.selectSources(sources, function(captureDevices) {
+    PluginProxies.mediaCapturer.selectSources(sources, function(captureDevices) {
       for (var key in captureDevices) {
         if (captureDevices.hasOwnProperty(key)) {
           OTPlugin.debug(key + ' Capture Device: ' + captureDevices[key]);
@@ -5813,7 +7951,7 @@
     if(error) {
       completion(error);
     } else {
-      completion(null, new RumorSocket(mediaCaptureObject, messagingURL));
+      completion(null, new RumorSocket(PluginProxies.mediaCapturer, messagingURL));
     }
   });
 };
@@ -5834,6 +7972,7 @@
     }
 
     OTPlugin.debug('Got PeerConnection for ' + plugin.id);
+
     PeerConnection.create(iceServers, options, plugin, function(err, peerConnection) {
       if (err) {
         completion.call(OTPlugin, err);
@@ -5854,7 +7993,7 @@
     gotPeerObject(null, localStream._.plugin);
   }
   else {
-    createPeerController(gotPeerObject);
+    PluginProxies.createMediaPeer(gotPeerObject);
   }
 };
 
@@ -5873,11 +8012,11 @@
 
 // tb_require('./api.js')
 
-/* global shim, OTHelpers, onDomReady */
+/* global shim, onDomReady */
 
 shim();
 
-OTHelpers.onDOMLoad(onDomReady);
+$.onDOMLoad(onDomReady);
 
 /* jshint ignore:start */
 })(this);
@@ -5926,8 +8065,8 @@
 // tb_require('../js/ot.js')
 
 OT.properties = {
-  version: 'v2.5.0',         // The current version (eg. v2.0.4) (This is replaced by gradle)
-  build: '17447b9',    // The current build hash (This is replaced by gradle)
+  version: 'v2.5.1',         // The current version (eg. v2.0.4) (This is replaced by gradle)
+  build: '23265fa',    // The current build hash (This is replaced by gradle)
 
   // Whether or not to turn on debug logging by default
   debug: 'false',
@@ -8362,7 +10501,7 @@
 !(function() {
   /* jshint globalstrict: true, strict: false, undef: true, unused: true,
             trailing: true, browser: true, smarttabs:true */
-  /* global OT, EventEmitter, util */
+  /* global OT */
 
   // Connect error codes and reasons that Raptor can return.
   var connectErrorReasons;
@@ -8375,21 +10514,10 @@
 
 
   OT.Raptor.Dispatcher = function () {
-
-    if(OT.$.env.name === 'Node') {
-      EventEmitter.call(this);
-    } else {
-      OT.$.eventing(this, true);
-      this.emit = this.trigger;
-    }
-
+    OT.$.eventing(this, true);
     this.callbacks = {};
   };
 
-  if(OT.$.env.name === 'Node') {
-    util.inherits(OT.Raptor.Dispatcher, EventEmitter);
-  }
-
   OT.Raptor.Dispatcher.prototype.registerCallback = function (transactionId, completion) {
     this.callbacks[transactionId] = completion;
   };
@@ -9108,158 +11236,134 @@
 
 // tb_require('../../helpers/helpers.js')
 
-/* global OT, Promise */
+/* global OT */
 
 function httpTest(config) {
 
-  function otRequest(url, options, callback) {
-    var request = new XMLHttpRequest(),
-        _options = options || {},
-        _method = _options.method;
-
-    if (!_method) {
-      callback(new OT.$.Error('No HTTP method specified in options'));
-      return;
-    }
-
-    // Setup callbacks to correctly respond to success and error callbacks. This includes
-    // interpreting the responses HTTP status, which XmlHttpRequest seems to ignore
-    // by default.
-    if (callback) {
-      OTHelpers.on(request, 'load', function(event) {
-        var status = event.target.status;
-
-        // We need to detect things that XMLHttpRequest considers a success,
-        // but we consider to be failures.
-        if (status >= 200 && (status < 300 || status === 304)) {
-          callback(null, event);
-        } else {
-          callback(event);
-        }
-      });
-
-      OTHelpers.on(request, 'error', callback);
-    }
+  var _httpConfig = config.httpConfig;
 
-    request.open(options.method, url, true);
+  function measureDownloadBandwidth(url) {
 
-    if (!_options.headers) _options.headers = {};
+    var xhr = new XMLHttpRequest(),
+      resultPromise = new OT.$.RSVP.Promise(function(resolve, reject) {
 
-    for (var name in _options.headers) {
-      request.setRequestHeader(name, _options.headers[name]);
-    }
+        var startTs = Date.now(), progressLoaded = 0;
 
-    return request;
-  }
+        function calculate(loaded) {
+          return 1000 * 8 * loaded / (Date.now() - startTs);
+        }
 
+        xhr.addEventListener('load', function(evt) {
+          resolve(calculate(evt.loaded));
+        });
+        xhr.addEventListener('abort', function() {
+          resolve(calculate(progressLoaded));
+        });
+        xhr.addEventListener('error', function(evt) {
+          reject(evt);
+        });
 
-  var _httpConfig = config.httpConfig;
+        xhr.addEventListener('progress', function(evt) {
+          progressLoaded = evt.loaded;
+        });
 
-  function timeout(delay) {
-    return new Promise(function(resolve) {
-      setTimeout(function() {
-        resolve();
-      }, delay);
-    });
-  }
+        xhr.open('GET', url + '?_' + Math.random());
+        xhr.send();
+      });
 
-  function generateRandom10DigitNumber() {
-    var min = 1000000000;
-    var max = 9999999999;
-    return min + Math.floor(Math.random() * (max - min));
+    return {
+      promise: resultPromise,
+      abort: function() {
+        xhr.abort();
+      }
+    };
   }
 
   /**
-   * The bandwidth is in bit per second.
+   * Measures the bandwidth in bps.
    *
-   * @returns {Promise.<{downloadBandwidth: number, uploadBandwidth: number}>}
+   * @param {string} url
+   * @param {ArrayBuffer} payload
+   * @returns {{promise: Promise, abort: function}}
    */
-  function doDownload() {
-
-    var xhr;
-    var startTs;
-    var loadedLength = 0;
-    var downloadPromise = new Promise(function(resolve, reject) {
-      xhr = otRequest([_httpConfig.downloadUrl, '?x=', generateRandom10DigitNumber()].join(''),
-        {method: 'get'}, function(error) {
-        if (error) {
-          reject(new OT.$.Error('Connection to the HTTP server failed (' +
-          error.target.status + ')', 1006));
-        } else {
-          resolve();
-        }
+  function measureUploadBandwidth(url, payload) {
+    var xhr = new XMLHttpRequest(),
+      resultPromise = new OT.$.RSVP.Promise(function(resolve, reject) {
+
+        var startTs,
+          lastTs,
+          lastLoaded;
+        xhr.upload.addEventListener('progress', function(evt) {
+          if (!startTs) {
+            startTs = Date.now();
+          }
+          lastLoaded = evt.loaded;
+        });
+        xhr.addEventListener('load', function() {
+          lastTs = Date.now();
+          resolve(1000 * 8 * lastLoaded / (lastTs - startTs));
+        });
+        xhr.addEventListener('error', function(e) {
+          reject(e);
+        });
+        xhr.addEventListener('abort', function() {
+          reject();
+        });
+        xhr.open('POST', url);
+        xhr.send(payload);
       });
 
-      xhr.addEventListener('loadstart', function() {
-        startTs = OT.$.now();
-      });
-      xhr.addEventListener('progress', function(evt) {
-        loadedLength = evt.loaded;
-      });
+    return {
+      promise: resultPromise,
+      abort: function() {
+        xhr.abort();
+      }
+    };
+  }
 
-      xhr.send();
-    });
+  function doDownload(url, maxDuration) {
+    var measureResult = measureDownloadBandwidth(url);
 
-    return Promise.race([
-      downloadPromise,
-      timeout(_httpConfig.duration * 1000)
-    ])
-      .then(function() {
-        xhr.abort();
-        return {
-          byteDownloaded: loadedLength,
-          duration: OT.$.now() - startTs
-        };
-      });
+    setTimeout(function() {
+      measureResult.abort();
+    }, maxDuration);
+
+    return measureResult.promise;
   }
 
-  function doUpload() {
-    var payload = new Array(_httpConfig.uploadSize * _httpConfig.uploadCount).join('a');
+  function loopUpload(url, initialSize, maxDuration) {
+    return new OT.$.RSVP.Promise(function(resolve) {
+      var lastMeasureResult,
+        lastBandwidth = 0;
 
-    var xhr;
-    var startTs;
-    var loadedLength = 0;
-    var uploadPromise = new Promise(function(resolve, reject) {
-      xhr = otRequest(_httpConfig.uploadUrl, {method: 'post'}, function(error) {
-        if (error) {
-          reject(new OT.$.Error('Connection to the HTTP server failed (' +
-          error.target.status + ')', 1006));
-        } else {
-          resolve();
-        }
-      });
+      setTimeout(function() {
+        lastMeasureResult.abort();
+        resolve(lastBandwidth);
 
-      xhr.upload.addEventListener('loadstart', function() {
-        startTs = OT.$.now();
-      });
-      xhr.upload.addEventListener('progress', function(evt) {
-        loadedLength = evt.loaded;
-      });
+      }, maxDuration);
 
-      xhr.send(payload);
-    });
+      function loop(loopSize) {
+        lastMeasureResult = measureUploadBandwidth(url, new ArrayBuffer(loopSize / 8));
+        lastMeasureResult.promise
+          .then(function(bandwidth) {
+            lastBandwidth = bandwidth;
+            loop(loopSize * 2);
+          });
+      }
 
-    return Promise.race([
-      uploadPromise,
-      timeout(_httpConfig.duration * 1000)
-    ])
-      .then(function() {
-        xhr.abort();
-        return {
-          byteUploaded: loadedLength,
-          duration: OT.$.now() - startTs
-        };
-      });
+      loop(initialSize);
+    });
   }
 
-  return Promise.all([doDownload(), doUpload()])
-    .then(function(values) {
-      var downloadStats = values[0];
-      var uploadStats = values[1];
-
+  return OT.$.RSVP.Promise
+    .all([
+      doDownload(_httpConfig.downloadUrl, _httpConfig.duration * 1000),
+      loopUpload(_httpConfig.uploadUrl, _httpConfig.uploadSize, _httpConfig.duration * 1000)
+    ])
+    .then(function(results) {
       return {
-        downloadBandwidth: 1000 * (downloadStats.byteDownloaded * 8) / downloadStats.duration,
-        uploadBandwidth: 1000 * (uploadStats.byteUploaded * 8) / uploadStats.duration
+        downloadBandwidth: results[0],
+        uploadBandwidth: results[1]
       };
     });
 }
@@ -9508,7 +11612,7 @@
 // tb_require('../peer_connection/get_stats_adapter.js')
 // tb_require('../peer_connection/get_stats_helpers.js')
 
-/* global OT, Promise */
+/* global OT */
 
 /**
  * @returns {Promise.<{packetLostRation: number, roundTripTime: number}>}
@@ -9553,7 +11657,7 @@
   }
 
   function createPeerConnectionForTest() {
-    return new Promise(function(resolve, reject) {
+    return new OT.$.RSVP.Promise(function(resolve, reject) {
       OT.$.createPeerConnection({
           iceServers: _mediaConfig.iceServers
         }, {},
@@ -9570,13 +11674,13 @@
   }
 
   function createOffer(pc) {
-    return new Promise(function(resolve, reject) {
+    return new OT.$.RSVP.Promise(function(resolve, reject) {
       pc.createOffer(resolve, reject);
     });
   }
 
   function attachMediaStream(videoElement, webRtcStream) {
-    return new Promise(function(resolve, reject) {
+    return new OT.$.RSVP.Promise(function(resolve, reject) {
       videoElement.bindToStream(webRtcStream, function(error) {
         if (error) {
           reject(new OT.$.Error('bindToStream failed', 1600, error));
@@ -9588,7 +11692,7 @@
   }
 
   function addIceCandidate(pc, candidate) {
-    return new Promise(function(resolve, reject) {
+    return new OT.$.RSVP.Promise(function(resolve, reject) {
       pc.addIceCandidate(new NativeRTCIceCandidate({
         sdpMLineIndex: candidate.sdpMLineIndex,
         candidate: candidate.candidate
@@ -9597,7 +11701,7 @@
   }
 
   function setLocalDescription(pc, offer) {
-    return new Promise(function(resolve, reject) {
+    return new OT.$.RSVP.Promise(function(resolve, reject) {
       pc.setLocalDescription(offer, resolve, function(error) {
         reject(new OT.$.Error('setLocalDescription failed', 1600, error));
       });
@@ -9605,7 +11709,7 @@
   }
 
   function setRemoteDescription(pc, offer) {
-    return new Promise(function(resolve, reject) {
+    return new OT.$.RSVP.Promise(function(resolve, reject) {
       pc.setRemoteDescription(offer, resolve, function(error) {
         reject(new OT.$.Error('setRemoteDescription failed', 1600, error));
       });
@@ -9613,7 +11717,7 @@
   }
 
   function createAnswer(pc) {
-    return new Promise(function(resolve, reject) {
+    return new OT.$.RSVP.Promise(function(resolve, reject) {
       pc.createAnswer(resolve, function(error) {
         reject(new OT.$.Error('createAnswer failed', 1600, error));
       });
@@ -9621,7 +11725,7 @@
   }
 
   function getStats(pc) {
-    return new Promise(function(resolve, reject) {
+    return new OT.$.RSVP.Promise(function(resolve, reject) {
       _getStats(pc, function(error, stats) {
         if (error) {
           reject(new OT.$.Error('geStats failed', 1600, error));
@@ -9643,32 +11747,38 @@
   }
 
   /**
+   * @param {{videoBytesReceived: number, audioBytesReceived: number, startTs: number}} statsSamples
+   * @returns {number} the bandwidth in bits per second
+   */
+  function calculateBandwidth(statsSamples) {
+    return (((statsSamples.videoBytesReceived + statsSamples.audioBytesReceived) * 8) /
+      (OT.$.now() - statsSamples.startTs)) * 1000;
+  }
+
+  /**
    * @returns {Promise.<{packetLostRation: number, roundTripTime: number}>}
    */
   function collectPeerConnectionStats(localPc, remotePc) {
 
     var SAMPLING_DELAY = 1000;
 
-    return new Promise(function(resolve) {
+    return new OT.$.RSVP.Promise(function(resolve) {
 
       var collectionActive = true;
 
-      var statsSamples = {
+      var _statsSamples = {
         startTs: OT.$.now(),
         packetLostRatioSamplesCount: 0,
         packetLostRatio: 0,
         roundTripTimeSamplesCount: 0,
         roundTripTime: 0,
-        bytesReceived: 0
+        videoBytesReceived: 0,
+        audioBytesReceived: 0
       };
 
-      function calculateBandwidth() {
-        return 1000 * statsSamples.bytesReceived * 8 / (OT.$.now() - statsSamples.startTs);
-      }
-
       function sample() {
 
-        Promise.all([
+        OT.$.RSVP.Promise.all([
           getStats(localPc).then(function(stats) {
             OT.$.forEach(stats, function(stat) {
               if (OT.getStatsHelpers.isVideoStat(stat)) {
@@ -9681,8 +11791,8 @@
                 }
 
                 if (rtt !== null && rtt > -1) {
-                  statsSamples.roundTripTimeSamplesCount++;
-                  statsSamples.roundTripTime += rtt;
+                  _statsSamples.roundTripTimeSamplesCount++;
+                  _statsSamples.roundTripTime += rtt;
                 }
               }
             });
@@ -9697,13 +11807,17 @@
                   var packetLost = parseInt(stat.packetsLost, 10);
                   var packetsReceived = parseInt(stat.packetsReceived, 10);
                   if (packetLost >= 0 && packetsReceived > 0) {
-                    statsSamples.packetLostRatioSamplesCount++;
-                    statsSamples.packetLostRatio += packetLost * 100 / packetsReceived;
+                    _statsSamples.packetLostRatioSamplesCount++;
+                    _statsSamples.packetLostRatio += packetLost * 100 / packetsReceived;
                   }
                 }
 
                 if (stat.hasOwnProperty('bytesReceived')) {
-                  statsSamples.bytesReceived += parseInt(stat.bytesReceived, 10);
+                  _statsSamples.videoBytesReceived = parseInt(stat.bytesReceived, 10);
+                }
+              } else if(OT.getStatsHelpers.isAudioStat(stat)) {
+                if (stat.hasOwnProperty('bytesReceived')) {
+                  _statsSamples.audioBytesReceived = parseInt(stat.bytesReceived, 10);
                 }
               }
             });
@@ -9722,15 +11836,19 @@
       // start the sampling "loop"
       sample();
 
-      function stopCollectStats() {
+      /**
+       * @param {boolean} extended marks the test results as extended
+       */
+      function stopCollectStats(extended) {
         collectionActive = false;
 
         var pcStats = {
-          packetLostRatio: statsSamples.packetLostRatioSamplesCount > 0 ?
-            statsSamples.packetLostRatio /= statsSamples.packetLostRatioSamplesCount * 100 : null,
-          roundTripTime: statsSamples.roundTripTimeSamplesCount > 0 ?
-            statsSamples.roundTripTime /= statsSamples.roundTripTimeSamplesCount : null,
-          bandwidth: calculateBandwidth()
+          packetLostRatio: _statsSamples.packetLostRatioSamplesCount > 0 ?
+            _statsSamples.packetLostRatio /= _statsSamples.packetLostRatioSamplesCount * 100 : null,
+          roundTripTime: _statsSamples.roundTripTimeSamplesCount > 0 ?
+            _statsSamples.roundTripTime /= _statsSamples.roundTripTimeSamplesCount : null,
+          bandwidth: calculateBandwidth(_statsSamples),
+          extended: extended
         };
 
         resolve(pcStats);
@@ -9740,18 +11858,20 @@
       // if the bandwidth is bellow the threshold at the end we give an extra time
       setTimeout(function() {
 
-        if (calculateBandwidth() < _mediaConfig.thresholdBitsPerSecond) {
+        if (calculateBandwidth(_statsSamples) < _mediaConfig.thresholdBitsPerSecond) {
           // give an extra delay in case it was transient bandwidth problem
-          setTimeout(stopCollectStats, _mediaConfig.extendedDuration * 1000);
+          setTimeout(function() {
+            stopCollectStats(true);
+          }, _mediaConfig.extendedDuration * 1000);
         } else {
-          stopCollectStats();
+          stopCollectStats(false);
         }
 
       }, _mediaConfig.duration * 1000);
     });
   }
 
-  return Promise
+  return OT.$.RSVP.Promise
     .all([createPeerConnectionForTest(), createPeerConnectionForTest()])
     .then(function(pcs) {
 
@@ -9782,7 +11902,7 @@
 
       return createOffer(localPc)
         .then(function(offer) {
-          return Promise.all([
+          return OT.$.RSVP.Promise.all([
             setLocalDescription(localPc, offer),
             setRemoteDescription(remotePc, offer)
           ]);
@@ -9791,7 +11911,7 @@
           return createAnswer(remotePc);
         })
         .then(function(answer) {
-          return Promise.all([
+          return OT.$.RSVP.Promise.all([
             setLocalDescription(remotePc, answer),
             setRemoteDescription(localPc, answer)
           ]);
@@ -10557,15 +12677,9 @@
 // Errors during any step will result in the +failure+ callback being executed.
 //
 var subscribeProcessor = function(peerConnection, success, failure) {
-  var constraints,
-      generateErrorCallback,
+  var generateErrorCallback,
       setLocalDescription;
 
-  constraints = {
-    mandatory: {},
-    optional: []
-  },
-
   generateErrorCallback = function(message, prefix) {
     return function(errorReason) {
       OT.error(message);
@@ -10593,11 +12707,6 @@
     );
   };
 
-  // For interop with FireFox. Disable Data Channel in createOffer.
-  if (navigator.mozGetUserMedia) {
-    constraints.mandatory.MozDontOfferDataChannel = true;
-  }
-
   peerConnection.createOffer(
     // Success
     setLocalDescription,
@@ -10605,9 +12714,11 @@
     // Failure
     generateErrorCallback('Error while creating Offer', 'CreateOffer'),
 
-    constraints
+    // Constraints
+    {}
   );
 };
+
 // tb_require('../../helpers/helpers.js')
 // tb_require('../../helpers/lib/web_rtc.js')
 
@@ -10667,20 +12778,9 @@
     );
   };
 
-  // Workaround for a Chrome issue. Add in the SDES crypto line into offers
-  // from Firefox
-  if (offer.sdp.indexOf('a=crypto') === -1) {
-    var cryptoLine = 'a=crypto:1 AES_CM_128_HMAC_SHA1_80 ' +
-      'inline:FakeFakeFakeFakeFakeFakeFakeFakeFakeFake\\r\\n';
-
-      // insert the fake crypto line for every M line
-    offer.sdp = offer.sdp.replace(/^c=IN(.*)$/gmi, 'c=IN$1\r\n'+cryptoLine);
-  }
-
   if (offer.sdp.indexOf('a=rtcp-fb') === -1) {
     var rtcpFbLine = 'a=rtcp-fb:* ccm fir\r\na=rtcp-fb:* nack ';
 
-    // insert the fake crypto line for every M line
     offer.sdp = offer.sdp.replace(/^m=video(.*)$/gmi, 'm=video$1\r\n'+rtcpFbLine);
   }
 
@@ -10752,6 +12852,248 @@
 // tb_require('../../helpers/helpers.js')
 // tb_require('../../helpers/lib/web_rtc.js')
 
+/* exported DataChannel */
+
+
+// Wraps up a native RTCDataChannelEvent object for the message event. This is
+// so we never accidentally leak the native DataChannel.
+//
+// @constructor
+// @private
+//
+var DataChannelMessageEvent = function DataChanneMessageEvent (event) {
+  this.data = event.data;
+  this.source = event.source;
+  this.lastEventId = event.lastEventId;
+  this.origin = event.origin;
+  this.timeStamp = event.timeStamp;
+  this.type = event.type;
+  this.ports = event.ports;
+  this.path = event.path;
+};
+
+
+// DataChannel is a wrapper of the native browser RTCDataChannel object.
+//
+// It exposes an interface that is very similar to the native one except
+// for the following differences:
+//  * eventing is handled in a way that is consistent with the OpenTok API
+//  * calls to the send method that occur before the channel is open will be
+//    buffered until the channel is open (as opposed to throwing an exception)
+//
+// By design, there is (almost) no direct access to the native object. This is to ensure
+// that we can control the underlying implementation as needed.
+//
+// NOTE: IT TURNS OUT THAT FF HASN'T IMPLEMENT THE LATEST PUBLISHED DATACHANNELS
+// SPEC YET, SO THE INFO ABOUT maxRetransmitTime AND maxRetransmits IS WRONG. INSTEAD
+// THERE IS A SINGLE PROPERTY YOU PROVIDE WHEN CREATING THE CHANNEL WHICH CONTROLS WHETHER
+// THE CHANNEL IS RELAIBLE OF NOT.
+//
+// Two properties that will have a large bearing on channel behaviour are maxRetransmitTime
+// and maxRetransmits. Descriptions of those properties are below. They are set when creating
+// the initial native RTCDataChannel.
+//
+// maxRetransmitTime of type unsigned short, readonly , nullable
+//   The RTCDataChannel.maxRetransmitTime attribute returns the length of the time window
+//   (in milliseconds) during which retransmissions may occur in unreliable mode, or null if
+//   unset. The attribute MUST return the value to which it was set when the RTCDataChannel was
+//   created.
+//
+// maxRetransmits of type unsigned short, readonly , nullable
+//   The RTCDataChannel.maxRetransmits attribute returns the maximum number of retransmissions
+//   that are attempted in unreliable mode, or null if unset. The attribute MUST return the value
+//   to which it was set when the RTCDataChannel was created.
+//
+// @reference http://www.w3.org/TR/webrtc/#peer-to-peer-data-api
+//
+// @param [RTCDataChannel] dataChannel A native data channel.
+//
+//
+// @constructor
+// @private
+//
+var DataChannel = function DataChannel (dataChannel) {
+  var api = {};
+
+  /// Private Data
+
+  var bufferedMessages = [];
+
+
+  /// Private API
+
+  var bufferMessage = function bufferMessage (data) {
+        bufferedMessages.push(data);
+        return api;
+      },
+
+      sendMessage = function sendMessage (data) {
+        dataChannel.send(data);
+        return api;
+      },
+
+      flushBufferedMessages = function flushBufferedMessages () {
+        var data;
+
+        while ( (data = bufferedMessages.shift()) ) {
+          api.send(data);
+        }
+      },
+
+      onOpen = function onOpen () {
+        api.send = sendMessage;
+        flushBufferedMessages();
+      },
+
+      onClose = function onClose (event) {
+        api.send = bufferMessage;
+        api.trigger('close', event);
+      },
+
+      onError = function onError (event) {
+        OT.error('Data Channel Error:', event);
+      },
+
+      onMessage = function onMessage (domEvent) {
+        var event = new DataChannelMessageEvent(domEvent);
+        api.trigger('message', event);
+      };
+
+
+  /// Public API
+
+  OT.$.eventing(api, true);
+
+  api.label = dataChannel.label;
+  api.id = dataChannel.id;
+  // api.maxRetransmitTime = dataChannel.maxRetransmitTime;
+  // api.maxRetransmits = dataChannel.maxRetransmits;
+  api.reliable = dataChannel.reliable;
+  api.negotiated = dataChannel.negotiated;
+  api.ordered = dataChannel.ordered;
+  api.protocol = dataChannel.protocol;
+  api._channel = dataChannel;
+  api.close = function () {
+    dataChannel.close();
+  };
+
+  api.equals = function (label, options) {
+    if (api.label !== label) return false;
+
+    for (var key in options) {
+      if (options.hasOwnProperty(key)) {
+        if (api[key] !== options[key]) {
+          return false;
+        }
+      }
+    }
+
+    return true;
+  };
+
+  // Send initially just buffers all messages until
+  // the channel is open.
+  api.send = bufferMessage;
+
+
+  /// Init
+  dataChannel.addEventListener('open', onOpen, false);
+  dataChannel.addEventListener('close', onClose, false);
+  dataChannel.addEventListener('error', onError, false);
+  dataChannel.addEventListener('message', onMessage, false);
+
+  return api;
+};
+// tb_require('../../helpers/helpers.js')
+// tb_require('../../helpers/lib/web_rtc.js')
+// tb_require('./data_channel.js')
+
+/* exported PeerConnectionChannels */
+/* global DataChannel */
+
+// Contains a collection of DataChannels for a particular RTCPeerConnection
+//
+// @param [RTCPeerConnection] pc A native peer connection object
+//
+// @constructor
+// @private
+//
+var PeerConnectionChannels = function PeerConnectionChannels (pc) {
+  /// Private Data
+  var channels = [],
+      api = {};
+
+
+  /// Private API
+
+  var remove = function remove (channel) {
+    OT.$.filter(channels, function(c) {
+      return channel !== c;
+    });
+  };
+
+  var add = function add (nativeChannel) {
+    var channel = new DataChannel(nativeChannel);
+    channels.push(channel);
+
+    channel.on('close', function() {
+      remove(channel);
+    });
+
+    return channel;
+  };
+
+
+  /// Public API
+
+  api.add = function (label, options) {
+    return add(pc.createDataChannel(label, options));
+  };
+
+  api.addMany = function (newChannels) {
+    for (var label in newChannels) {
+      if (newChannels.hasOwnProperty(label)) {
+        api.add(label, newChannels[label]);
+      }
+    }
+  };
+
+  api.get = function (label, options) {
+    return OT.$.find(channels, function(channel) {
+      return channel.equals(label, options);
+    });
+  };
+
+  api.getOrAdd = function (label, options) {
+    var channel = api.get(label, options);
+    if (!channel) {
+      channel = api.add(label, options);
+    }
+
+    return channel;
+  };
+
+  api.destroy = function () {
+    OT.$.forEach(channels, function(channel) {
+      channel.close();
+    });
+
+    channels = [];
+  };
+
+
+  /// Init
+
+  pc.addEventListener('datachannel', function(event) {
+    add(event.channel);
+  }, false);
+
+  return api;
+};
+
+// tb_require('../../helpers/helpers.js')
+// tb_require('../../helpers/lib/web_rtc.js')
+
 /* exported connectionStateLogger */
 
 // @meta: ping Mike/Eric to let them know that this data is coming and what format it will be
@@ -10842,8 +13184,10 @@
 // tb_require('./subscribe_processor.js')
 // tb_require('./offer_processor.js')
 // tb_require('./get_stats_adapter.js')
+// tb_require('./peer_connection_channels.js')
 
-/* global offerProcessor, subscribeProcessor, connectionStateLogger, IceCandidateProcessor */
+/* global offerProcessor, subscribeProcessor, connectionStateLogger,
+          IceCandidateProcessor, PeerConnectionChannels */
 
 // Normalise these
 var NativeRTCSessionDescription;
@@ -10862,7 +13206,11 @@
 var iceCandidateForwarder = function(messageDelegate) {
   return function(event) {
     if (event.candidate) {
-      messageDelegate(OT.Raptor.Actions.CANDIDATE, event.candidate);
+      messageDelegate(OT.Raptor.Actions.CANDIDATE, {
+        candidate: event.candidate.candidate,
+        sdpMid: event.candidate.sdpMid || '',
+        sdpMLineIndex: event.candidate.sdpMLineIndex || 0
+      });
     } else {
       OT.debug('IceCandidateForwarder: No more ICE candidates.');
     }
@@ -10881,16 +13229,18 @@
 OT.PeerConnection = function(config) {
   var _peerConnection,
       _peerConnectionCompletionHandlers = [],
+      _channels,
       _iceProcessor = new IceCandidateProcessor(),
       _getStatsAdapter = OT.getStatsAdpater(),
       _stateLogger,
       _offer,
       _answer,
       _state = 'new',
-      _messageDelegates = [];
+      _messageDelegates = [],
+      api = {};
 
 
-  OT.$.eventing(this);
+  OT.$.eventing(api);
 
   // if ice servers doesn't exist Firefox will throw an exception. Chrome
   // interprets this as 'Use my default STUN servers' whereas FF reads it
@@ -10898,7 +13248,7 @@
   if (!config.iceServers) config.iceServers = [];
 
   // Private methods
-  var delegateMessage = OT.$.bind(function(type, messagePayload, uri) {
+  var delegateMessage = function(type, messagePayload, uri) {
         if (_messageDelegates.length) {
           // We actually only ever send to the first delegate. This is because
           // each delegate actually represents a Publisher/Subscriber that
@@ -10907,7 +13257,7 @@
           // each PeerConnection.
           _messageDelegates[0](type, messagePayload, uri);
         }
-      }, this),
+      },
 
       // Create and initialise the PeerConnection object. This deals with
       // any differences between the various browser implementations and
@@ -10921,7 +13271,7 @@
       // of OTPlugin, it's not used for vanilla WebRTC. Hopefully this can
       // be tidied up later.
       //
-      createPeerConnection = OT.$.bind(function (completion, localWebRtcStream) {
+      createPeerConnection = function (completion, localWebRtcStream) {
         if (_peerConnection) {
           completion.call(null, null, _peerConnection);
           return;
@@ -10937,10 +13287,16 @@
 
         var pcConstraints = {
           optional: [
-            {DtlsSrtpKeyAgreement: true}
+            // This should be unnecessary, but the plugin has issues if we remove it. This needs
+            // to be investigated.
+            {DtlsSrtpKeyAgreement: true},
+
+            // https://jira.tokbox.com/browse/OPENTOK-21989
+            {googIPv6: false}
           ]
         };
 
+
         OT.debug('Creating peer connection config "' + JSON.stringify(config) + '".');
 
         if (!config.iceServers || config.iceServers.length === 0) {
@@ -10950,7 +13306,7 @@
 
         OT.$.createPeerConnection(config, pcConstraints, localWebRtcStream,
                                         attachEventsToPeerConnection);
-      }, this),
+      },
 
       // An auxiliary function to createPeerConnection. This binds the various event callbacks
       // once the peer connection is created.
@@ -10958,7 +13314,7 @@
       // +err+ will be non-null if an err occured while creating the PeerConnection
       // +pc+ will be the PeerConnection object itself.
       //
-      attachEventsToPeerConnection = OT.$.bind(function(err, pc) {
+      attachEventsToPeerConnection = function(err, pc) {
         if (err) {
           triggerError('Failed to create PeerConnection, exception: ' +
               err.toString(), 'NewPeerConnection');
@@ -10970,6 +13326,8 @@
         OT.debug('OT attachEventsToPeerConnection');
         _peerConnection = pc;
         _stateLogger = connectionStateLogger(_peerConnection);
+        _channels = new PeerConnectionChannels(_peerConnection);
+        if (config.channels) _channels.addMany(config.channels);
 
         _peerConnection.addEventListener('icecandidate',
                                     iceCandidateForwarder(delegateMessage), false);
@@ -10999,7 +13357,7 @@
         }
 
         triggerPeerConnectionCompletion(null);
-      }, this),
+      },
 
       triggerPeerConnectionCompletion = function () {
         while (_peerConnectionCompletionHandlers.length) {
@@ -11025,11 +13383,11 @@
           }
 
           _peerConnection = null;
-          this.trigger('close');
+          api.trigger('close');
         }
       },
 
-      routeStateChanged = OT.$.bind(function() {
+      routeStateChanged = function() {
         var newState = _peerConnection.signalingState;
 
         if (newState && newState !== _state) {
@@ -11038,15 +13396,15 @@
 
           switch(_state) {
             case 'closed':
-              tearDownPeerConnection.call(this);
+              tearDownPeerConnection();
               break;
           }
         }
-      }, this),
+      },
 
-      qosCallback = OT.$.bind(function(parsedStats) {
-        this.trigger('qos', parsedStats);
-      }, this),
+      qosCallback = function(parsedStats) {
+        api.trigger('qos', parsedStats);
+      },
 
       getRemoteStreams = function() {
         var streams;
@@ -11067,13 +13425,13 @@
       },
 
       /// PeerConnection signaling
-      onRemoteStreamAdded = OT.$.bind(function(event) {
-        this.trigger('streamAdded', event.stream);
-      }, this),
+      onRemoteStreamAdded = function(event) {
+        api.trigger('streamAdded', event.stream);
+      },
 
-      onRemoteStreamRemoved = OT.$.bind(function(event) {
-        this.trigger('streamRemoved', event.stream);
-      }, this),
+      onRemoteStreamRemoved = function(event) {
+        api.trigger('streamRemoved', event.stream);
+      },
 
       // ICE Negotiation messages
 
@@ -11164,22 +13522,22 @@
         });
       },
 
-      triggerError = OT.$.bind(function(errorReason, prefix) {
+      triggerError = function(errorReason, prefix) {
         OT.error(errorReason);
-        this.trigger('error', errorReason, prefix);
-      }, this);
+        api.trigger('error', errorReason, prefix);
+      };
 
-  this.addLocalStream = function(webRTCStream) {
+  api.addLocalStream = function(webRTCStream) {
     createPeerConnection(function() {
       _peerConnection.addStream(webRTCStream);
     }, webRTCStream);
   };
 
-  this.getSenders = function() {
+  api.getSenders = function() {
     return _peerConnection.getSenders();
   };
 
-  this.disconnect = function() {
+  api.disconnect = function() {
     _iceProcessor = null;
 
     if (_peerConnection &&
@@ -11195,14 +13553,14 @@
         //
         // * https://bugzilla.mozilla.org/show_bug.cgi?id=989936
         //
-        OT.$.callAsync(OT.$.bind(tearDownPeerConnection, this));
+        OT.$.callAsync(tearDownPeerConnection);
       }
     }
 
-    this.off();
+    api.off();
   };
 
-  this.processMessage = function(type, message) {
+  api.processMessage = function(type, message) {
     OT.debug('PeerConnection.processMessage: Received ' +
       type + ' from ' + message.fromAddress);
 
@@ -11210,16 +13568,16 @@
 
     switch(type) {
       case 'generateoffer':
-        processSubscribe.call(this, message);
+        processSubscribe(message);
         break;
 
       case 'offer':
-        processOffer.call(this, message);
+        processOffer(message);
         break;
 
       case 'answer':
       case 'pranswer':
-        processAnswer.call(this, message);
+        processAnswer(message);
         break;
 
       case 'candidate':
@@ -11231,20 +13589,20 @@
           type + ' from ' + message.fromAddress + ': ' + JSON.stringify(message));
     }
 
-    return this;
+    return api;
   };
 
-  this.setIceServers = function (iceServers) {
+  api.setIceServers = function (iceServers) {
     if (iceServers) {
       config.iceServers = iceServers;
     }
   };
 
-  this.registerMessageDelegate = function(delegateFn) {
+  api.registerMessageDelegate = function(delegateFn) {
     return _messageDelegates.push(delegateFn);
   };
 
-  this.unregisterMessageDelegate = function(delegateFn) {
+  api.unregisterMessageDelegate = function(delegateFn) {
     var index = OT.$.arrayIndexOf(_messageDelegates, delegateFn);
 
     if ( index !== -1 ) {
@@ -11253,17 +13611,43 @@
     return _messageDelegates.length;
   };
 
-  this.remoteStreams = function() {
+  api.remoteStreams = function() {
     return _peerConnection ? getRemoteStreams() : [];
   };
 
-  this.getStats = function(callback) {
+  api.getStats = function(callback) {
     createPeerConnection(function() {
       _getStatsAdapter(_peerConnection, callback);
     });
   };
 
+  var waitForChannel = function waitForChannel (timesToWait, label, options, completion) {
+    var channel = _channels.get(label, options),
+        err;
+
+    if (!channel) {
+      if (timesToWait > 0) {
+        setTimeout(OT.$.bind(waitForChannel, null, timesToWait-1, label, options, completion), 200);
+        return;
+      }
+
+      err = new OT.$.Error('A channel with that label and options could not be found. ' +
+                            'Label:' + label + '. Options: ' + JSON.stringify(options));
+    }
+
+    completion(err, channel);
+  };
+
+  api.getDataChannel = function (label, options, completion) {
+    createPeerConnection(function() {
+      // Wait up to 20 sec for the channel to appear, then fail
+      waitForChannel(100, label, options, completion);
+    });
+  };
+
   var qos = new OT.PeerConnection.QOS(qosCallback);
+
+  return api;
 };
 
 // tb_require('../../helpers/helpers.js')
@@ -11397,7 +13781,8 @@
 
           if (currentStats.audioBytesTransferred) {
             transferDelta = currentStats.audioBytesTransferred - lastBytesSent;
-            currentStats.avgAudioBitrate = Math.round(transferDelta * 8 / currentStats.period);
+            currentStats.avgAudioBitrate = Math.round(transferDelta * 8 /
+              (currentStats.period/1000));
           }
         },
 
@@ -11433,7 +13818,8 @@
 
           if (currentStats.videoBytesTransferred) {
             transferDelta = currentStats.videoBytesTransferred - lastBytesSent;
-            currentStats.avgVideoBitrate = Math.round(transferDelta * 8 / currentStats.period);
+            currentStats.avgVideoBitrate = Math.round(transferDelta * 8 /
+             (currentStats.period/1000));
           }
 
           if (statsReport.googFrameRateSent) {
@@ -11517,10 +13903,12 @@
           (stats[key].type === 'outboundrtp' || stats[key].type === 'inboundrtp')) {
           var res = stats[key];
 
-          if (res.id.indexOf('audio') !== -1) {
-            parseAudioStats(res);
-          } else if (res.id.indexOf('video') !== -1) {
-            parseVideoStats(res);
+          if (res.id.indexOf('rtp') !== -1) {
+            if (res.id.indexOf('audio') !== -1) {
+              parseAudioStats(res);
+            } else if (res.id.indexOf('video') !== -1) {
+              parseVideoStats(res);
+            }
           }
         }
       }
@@ -11561,7 +13949,7 @@
       var currentStats = {
         timeStamp: now,
         duration: Math.round(now - _creationTime),
-        period: (now - prevStats.timeStamp) / 1000
+        period: Math.round(now - prevStats.timeStamp)
       };
 
       var onParsedStats = function (err, parsedStats) {
@@ -11755,7 +14143,7 @@
         for (var k=0, numTracks=tracks.length; k < numTracks; ++k){
           // Only change the enabled property if it's different
           // otherwise we get flickering of the video
-          if (tracks[k].enabled !== enabled) tracks[k].enabled=enabled;
+          if (tracks[k].enabled !== enabled) tracks[k].setEnabled(enabled);
         }
       }
     };
@@ -11792,12 +14180,20 @@
     this.off();
   };
 
+  this.getDataChannel = function (label, options, completion) {
+    _peerConnection.getDataChannel(label, options, completion);
+  };
+
   this.processMessage = function(type, message) {
     _peerConnection.processMessage(type, message);
   };
 
   this.getStats = function(callback) {
-    _peerConnection.getStats(callback);
+    if (_peerConnection) {
+      _peerConnection.getStats(callback);
+    } else {
+      callback(new OT.$.Error('Subscriber is not connected cannot getStats', 1015));
+    }
   };
 
   this.subscribeToAudio = _setEnabledOnStreamTracksCurry(false);
@@ -11886,7 +14282,7 @@
  * * connected
  * * disconnected
  */
-OT.PublisherPeerConnection = function(remoteConnection, session, streamId, webRTCStream) {
+OT.PublisherPeerConnection = function(remoteConnection, session, streamId, webRTCStream, channels) {
   var _peerConnection,
       _hasRelayCandidates = false,
       _subscriberId = session._.subscriberMap[remoteConnection.id + '_' + streamId],
@@ -11953,7 +14349,12 @@
 
   OT.$.eventing(this);
 
-  // Public
+  /// Public API
+
+  this.getDataChannel = function (label, options, completion) {
+    _peerConnection.getDataChannel(label, options, completion);
+  };
+
   this.destroy = function() {
     // Clean up our PeerConnection
     if (_peerConnection) {
@@ -11971,7 +14372,8 @@
   // Init
   this.init = function(iceServers) {
     _peerConnection = OT.PeerConnections.add(remoteConnection, streamId, {
-      iceServers: iceServers
+      iceServers: iceServers,
+      channels: channels
     });
 
     _peerConnection.on({
@@ -12263,11 +14665,11 @@
     };
 
     this.videoWidth = function() {
-      return _videoProxy ? _videoProxy.getVideoWidth() : void 0;
+      return _videoProxy ? _videoProxy.videoWidth() : void 0;
     };
 
     this.videoHeight = function() {
-      return _videoProxy ? _videoProxy.getVideoHeight() : void 0;
+      return _videoProxy ? _videoProxy.videoHeight() : void 0;
     };
 
     this.imgData = function() {
@@ -12319,12 +14721,12 @@
     };
 
     this.setAudioVolume = function(value) {
-      if (_videoProxy) _videoProxy.setVolume(value);
+      if (_videoProxy) _videoProxy.volume(value);
     };
 
     this.getAudioVolume = function() {
       // Return the actual volume of the DOM element
-      if (_videoProxy) return _videoProxy.getVolume();
+      if (_videoProxy) return _videoProxy.volume();
       return DefaultAudioVolume;
     };
 
@@ -12392,6 +14794,10 @@
     var ratioAvailable = false;
     var ratioAvailableListeners = [];
     _domElement.addEventListener('timeupdate', function timeupdateHandler() {
+      if (!_domElement) {
+        event.target.removeEventListener('timeupdate', timeupdateHandler);
+        return;
+      }
       var aspectRatio = _domElement.videoWidth / _domElement.videoHeight;
       if (!isNaN(aspectRatio)) {
         _domElement.removeEventListener('timeupdate', timeupdateHandler);
@@ -12416,11 +14822,11 @@
     };
 
     this.videoWidth = function() {
-      return _domElement.videoWidth;
+      return _domElement ? _domElement.videoWidth : 0;
     };
 
     this.videoHeight = function() {
-      return _domElement.videoHeight;
+      return _domElement ? _domElement.videoHeight : 0;
     };
 
     this.imgData = function() {
@@ -12466,7 +14872,9 @@
         };
 
 
-        _domElement.addEventListener('error', _onVideoError, false);
+        if (_domElement) {
+          _domElement.addEventListener('error', _onVideoError, false);
+        }
         completion(null);
       });
 
@@ -12927,10 +15335,14 @@
       }
 
       domId = container.getAttribute('id');
-    } else {
+    } else if (elementOrDomId) {
       // We may have got an id, try and get it's DOM element.
       container = OT.$('#' + elementOrDomId).get(0);
-      domId = elementOrDomId || ('OT_' + OT.$.uuid());
+      if (container) domId = elementOrDomId;
+    }
+
+    if (!domId) {
+      domId = 'OT_' + OT.$.uuid().replace(/-/g, '_');
     }
 
     if (!container) {
@@ -13085,6 +15497,13 @@
       });
     }
 
+    var fixFitModePartial = function() {
+      if (!videoElement) return;
+
+      fixFitMode(widgetContainer, container.offsetWidth, container.offsetHeight,
+        videoElement.aspectRatio(), videoElement.isRotated());
+    };
+
     widgetView.destroy = function() {
       if (sizeObserver) {
         sizeObserver.disconnect();
@@ -13151,12 +15570,9 @@
         videoElement = video;
 
         // clear inline height value we used to init plugin rendering
-        OT.$.css(video.domElement(), 'height', '');
-
-        var fixFitModePartial = function() {
-          fixFitMode(widgetContainer, container.offsetWidth, container.offsetHeight,
-            video.aspectRatio(), video.isRotated());
-        };
+        if (video.domElement()) {
+          OT.$.css(video.domElement(), 'height', '');
+        }
 
         video.on({
           orientationChanged: fixFitModePartial,
@@ -13236,6 +15652,11 @@
           } else {
             OT.$.removeClass(container, 'OT_audio-only');
           }
+
+          if (OTPlugin.isInstalled()) {
+            // to keep OTPlugin happy
+            setTimeout(fixFitModePartial, 0);
+          }
         }
       },
 
@@ -15401,7 +17822,7 @@
    *
    * @property {String} type  The type of event.
    */
-  OT.Event = OT.$.eventing.Event();
+  OT.Event = OT.$.Event();
   /**
   * Prevents the default behavior associated with the event from taking place.
   *
@@ -15516,7 +17937,10 @@
     UNABLE_TO_PUBLISH: 1500,
     UNABLE_TO_SUBSCRIBE: 1501,
     UNABLE_TO_FORCE_DISCONNECT: 1520,
-    UNABLE_TO_FORCE_UNPUBLISH: 1530
+    UNABLE_TO_FORCE_UNPUBLISH: 1530,
+    PUBLISHER_ICE_WORKFLOW_FAILED: 1553,
+    SUBSCRIBER_ICE_WORKFLOW_FAILED: 1554,
+    UNEXPECTED_SERVER_RESPONSE: 2001
   };
 
   /**
@@ -16347,7 +18771,7 @@
  * <p>
  * The OpenTok
  * <a href="https://github.com/opentok/screensharing-extensions">screensharing-extensions</a>
- * sample includes code for creating a Chrome extension for screen-sharing support.
+ * sample includes code for creating an extension for screen-sharing support.
  *
  * @param {String} kind Set this parameter to <code>"chrome"</code>. Currently, you can only
  * register a screen-sharing extension for Chrome.
@@ -16401,16 +18825,21 @@
  * OT.checkScreenSharingCapability(function(response) {
  *   if (!response.supported || response.extensionRegistered === false) {
  *     // This browser does not support screen sharing
- *   } else if(response.extensionInstalled === false) {
+ *   } else if (response.extensionInstalled === false) {
  *     // Prompt to install the extension
  *   } else {
  *     // Screen sharing is available.
  *   }
  * });
  * </pre>
+ * <p>
+ * The OpenTok
+ * <a href="https://github.com/opentok/screensharing-extensions">screensharing-extensions</a>
+ * sample includes code for creating Chrome and Firefox extensions for screen-sharing support.
  *
  * @param {function} callback The callback invoked with the support options object passed as
- * the parameter. This object has the following properties:
+ * the parameter. This object has the following properties that indicate support for publishing
+ * screen-sharing streams in the client:
  * <p>
  * <ul>
  *   <li>
@@ -16419,23 +18848,33 @@
  *     an extension for screen sharing.
  *   </li>
  *   <li>
- *     <code>extensionRequired</code> (String) &mdash; Set to <code>"chrome"</code> on Chrome,
+ *     <code>supportedSources</code> (Object) &mdash; An object with the following properties:
+ *     <code>application</code>, <code>screen</code>, and <code>window</code>. Each property is
+ *     a Boolean value indicating support. In Firefox, each of these properties is set to
+ *     <code>true</code>. Currently in Chrome, only the <code>screen</code> property is
+ *     set to <code>true</code>.
+ *   </li>
+ * </ul>
+ * <p> The options parameter also includes the following properties, which apply to screen-sharing
+ * support in Chrome:
+ * <ul>
+ *   <li>
+ *     <code>extensionRequired</code> (String) &mdash; Set to <code>"chrome"</code> in Chrome,
  *     which requires a screen sharing extension to be installed. Otherwise, this property is
  *     undefined.
  *   </li>
  *   <li>
- *     <code>extensionRegistered</code> (Boolean) &mdash; On Chrome, this property is set to
+ *     <code>extensionRegistered</code> (Boolean) &mdash; In Chrome, this property is set to
  *     <code>true</code> if a screen-sharing extension is registered; otherwise it is set to
- *     <code>false</code>. If the extension type does not require registration (as in the
- *     case of of the OpenTok plugin for Internet Explorer), this property is set to
- *     <code>true</code>. In other browsers (which do not require an extension), this property
- *     is undefined. Use the <code>OT.registerScreenSharingExtension()</code> method to register
- *     an extension in Chrome.
+ *     <code>false</code>. If the extension type does not require registration (for example,
+ *     in Firefox), this property is set to <code>true</code>. In other browsers (which do not
+ *     require an extension), this property is undefined. Use the
+ *     <code>OT.registerScreenSharingExtension()</code> method to register an extension in Chrome.
  *   </li>
  *   <li>
  *     <code>extensionInstalled</code> (Boolean) &mdash; If an extension is required, this is set
  *     to <code>true</code> if the extension installed (and registered, if needed); otherwise it
- *     is set to <code>false</code>. If an extension is not required (for example on FireFox),
+ *     is set to <code>false</code>. If an extension is not required (for example in Firefox),
  *     this property is undefined.
  *   </li>
  * </ul>
@@ -17181,13 +19620,18 @@
       }
 
       var errorCode = errors[0].error.code;
+      var errorMessage;
       if (messageServerToClientErrorCodes[errorCode.toString()]) {
         errorCode = messageServerToClientErrorCodes[errorCode];
+        errorMessage = errors[0].error.errorMessage && errors[0].error.errorMessage.message;
+      } else {
+        errorCode = OT.ErrorCodes.UNEXPECTED_SERVER_RESPONSE;
+        errorMessage = 'Unexpected server response. Try this operation again later.';
       }
 
       return {
         code: errorCode,
-        message: errors[0].error.errorMessage && errors[0].error.errorMessage.message
+        message: errorMessage
       };
     } else {
       return {
@@ -17281,6 +19725,16 @@
    *   <td>Connect Failed. Unable to connect to the session. You may want to have the client check
    *     the network connection.</td>
    * </tr>
+   * <tr>
+   *  <td>1026</td>
+   *  <td>Terms of service violation: export compliance. See the
+   *    <a href="https://tokbox.com/support/tos">Terms of Service</a>.</td>
+   * </tr>
+   * <tr>
+   *   <td>2001</td>
+   *   <td>Connect Failed. Unexpected response from the OpenTok server. Try connecting again
+   *     later.</td>
+   * </tr>
    * </tbody></table>
    *
    * <p>Errors when calling <code>Session.forceDisconnect()</code>:</p>
@@ -17350,10 +19804,19 @@
    *     property of the Session object lists the client's capabilities.</td>
    * </tr>
    * <tr>
+   *   <td>1553</td>
+   *   <td>WebRTC ICE workflow error. Try publishing again or reconnecting to the session.</td>
+   * </tr>
+   * <tr>
    *   <td>1601</td>
    *   <td>Internal error -- WebRTC publisher error. Try republishing or reconnecting to the
    *     session.</td>
    * </tr>
+   * <tr>
+   *   <td>2001</td>
+   *   <td>Publish Failed. Unexpected response from the OpenTok server. Try publishing again
+   *     later.</td>
+   * </tr>
    * </tbody></table>
    *
    * <p>Errors when calling <code>Session.signal()</code>:</p>
@@ -17381,6 +19844,11 @@
    *     successfully before trying to signal. And check that the client has not disconnected before
    *     trying to publish.</td>
    * </tr>
+   * <tr>
+   *   <td>2001</td>
+   *   <td>Signal Failed. Unexpected response from the OpenTok server. Try sending the signal again
+   *     later.</td>
+   * </tr>
    * </tbody></table>
    *
    * <p>Errors when calling <code>Session.subscribe()</code>:</p>
@@ -17393,10 +19861,25 @@
    *   <td><b>Description</b></td>
    * </tr>
    * <tr>
+   *   <td>1013</td>
+   *   <td>WebRTC PeerConnection error. Try resubscribing to the stream or
+   *     reconnecting to the session.</td>
+   * </tr>
+   * <tr>
+   *   <td>1554</td>
+   *   <td>WebRTC ICE workflow error. Try resubscribing to the stream or
+   *     reconnecting to the session.</td>
+   * </tr>
+   * <tr>
    *   <td>1600</td>
    *   <td>Internal error -- WebRTC subscriber error. Try resubscribing to the stream or
    *     reconnecting to the session.</td>
    * </tr>
+   * <tr>
+   *   <td>2001</td>
+   *   <td>Subscribe Failed. Unexpected response from the OpenTok server. Try subscribing again
+   *     later.</td>
+   * </tr>
    * </tbody></table>
    *
    * <p>Errors when calling <code>OT.initPublisher()</code>:</p>
@@ -17492,7 +19975,7 @@
     1553: 'ICEWorkflow failed',
     1600: 'createOffer, createAnswer, setLocalDescription, setRemoteDescription',
     2000: 'Internal Error',
-    2001: 'Unexpected HTTP error codes (f.e. 500)',
+    2001: 'Unexpected Server Response',
     4000: 'WebSocket Connection Failed',
     4001: 'WebSocket Network Disconnected'
   };
@@ -17518,6 +20001,20 @@
     }
   }
 
+  /**
+   * Get the title of an error by error code
+   *
+   * @property {Number|String} code The error code to lookup
+   * @return {String} The title of the message with that code
+   *
+   * @example
+   *
+   * OT.getErrorTitleByCode(1006) === 'Connect Failed'
+   */
+  OT.getErrorTitleByCode = function(code) {
+    return errorsCodesToTitle[+code];
+  };
+
 // @todo redo this when we have time to tidy up
 //
 // @example
@@ -18171,10 +20668,12 @@
         _completion.apply(null, arguments);
       },
 
-      onClose = OT.$.bind(function onClose (err) {
-        var reason = this.is('disconnecting') ? 'clientDisconnected' : 'networkDisconnected';
-
-        if(err && err.code === 4001) {
+      onClose = OT.$.bind(function onClose(err) {
+        var reason = 'clientDisconnected';
+        if (!this.is('disconnecting') && _rumor.is('error')) {
+          reason = 'networkDisconnected';
+        }
+        if (err && err.code === 4001) {
           reason = 'networkTimedout';
         }
 
@@ -18230,12 +20729,27 @@
         _sessionId, _rumor.id());
       this.publish(connectMessage, {'X-TB-TOKEN-AUTH': _token}, OT.$.bind(function(error) {
         if (error) {
+          var errorCode,
+            errorMessage,
+            knownErrorCodes = [400, 403, 409];
+
+          if (error.code === OT.ExceptionCodes.CONNECT_FAILED) {
+            errorCode = error.code;
+            errorMessage = OT.getErrorTitleByCode(error.code);
+          } else if (error.code && OT.$.arrayIndexOf(knownErrorCodes, error.code) > -1) {
+            errorCode = OT.ExceptionCodes.CONNECT_FAILED;
+            errorMessage = 'Received error response to connection create message.';
+          } else {
+            errorCode = OT.ExceptionCodes.UNEXPECTED_SERVER_RESPONSE;
+            errorMessage = 'Unexpected server response. Try this operation again later.';
+          }
+
           error.message = 'ConnectToSession:' + error.code +
               ':Received error response to connection create message.';
           var payload = {
             reason: 'ConnectToSession',
-            code: error.code,
-            message: 'Received error response to connection create message.'
+            code: errorCode,
+            message: errorMessage
           };
           var event = {
             action: 'Connect',
@@ -18253,10 +20767,20 @@
         this.publish( OT.Raptor.Message.sessions.get(OT.APIKEY, _sessionId),
           function (error) {
           if (error) {
+            var errorCode,
+              errorMessage,
+              knownErrorCodes = [400, 403, 409];
+            if (error.code && OT.$.arrayIndexOf(knownErrorCodes, error.code) > -1) {
+              errorCode = OT.ExceptionCodes.CONNECT_FAILED;
+              errorMessage = 'Received error response to session read';
+            } else {
+              errorCode = OT.ExceptionCodes.UNEXPECTED_SERVER_RESPONSE;
+              errorMessage = 'Unexpected server response. Try this operation again later.';
+            }
             var payload = {
               reason: 'GetSessionState',
               code: error.code,
-              message: 'Received error response to session read'
+              message: errorMessage
             };
             var event = {
               action: 'Connect',
@@ -18422,9 +20946,19 @@
     }
 
     this.publish( signal.toRaptorMessage(), function(err) {
-      var error;
+      var error,
+        errorCode,
+        errorMessage,
+        expectedErrorCodes = [400, 403, 404, 413];
       if (err) {
-        error = new SignalError(err.code, err.message);
+        if (err.code && OT.$.arrayIndexOf(expectedErrorCodes, error.code) > -1) {
+          errorCode = err.code;
+          errorMessage = err.message;
+        } else {
+          errorCode = OT.ExceptionCodes.UNEXPECTED_SERVER_RESPONSE;
+          errorMessage = 'Unexpected server response. Try this operation again later.';
+        }
+        error = new OT.SignalError(errorCode, errorMessage);
       } else {
         var typeStr = signal.data? typeof(signal.data) : null;
         logEventFn('signal', 'send', {type: typeStr});
@@ -18896,15 +21430,21 @@
 
         this.disconnect();
 
+        var errorCode;
+        if (prefix === 'ICEWorkflow') {
+          errorCode = OT.ExceptionCodes.SUBSCRIBER_ICE_WORKFLOW_FAILED;
+        } else {
+          errorCode = OT.ExceptionCodes.P2P_CONNECTION_FAILED;
+        }
         payload = {
           reason: prefix ? prefix : 'PeerConnectionError',
           message: 'Subscriber PeerConnection Error: ' + reason,
-          code: OT.ExceptionCodes.P2P_CONNECTION_FAILED
+          code: errorCode
         };
         logConnectivityEvent('Failure', payload);
 
         OT.handleJsException('Subscriber PeerConnection Error: ' + reason,
-          OT.ExceptionCodes.P2P_CONNECTION_FAILED, {
+          errorCode, {
             session: _session,
             target: this
           }
@@ -18932,14 +21472,15 @@
         // the remote end doesn't fire loadedmetadata causing the subscriber to timeout
         // https://jira.tokbox.com/browse/OPENTOK-15605
         // Also https://jira.tokbox.com/browse/OPENTOK-16425
-        var tracks,
-            reenableVideoTrack = false;
-        if (!_stream.hasVideo && OT.$.env.name === 'Chrome' && OT.$.env.version >= 35) {
-          tracks = webRTCStream.getVideoTracks();
-          if(tracks.length > 0) {
-            tracks[0].enabled = false;
-            reenableVideoTrack = tracks[0];
-          }
+        //
+        // Workaround for an IE issue https://jira.tokbox.com/browse/OPENTOK-18824
+        // We still need to investigate further.
+        //
+        var tracks = webRTCStream.getVideoTracks();
+        if(tracks.length > 0) {
+          OT.$.forEach(tracks, function(track) {
+            track.setEnabled(_stream.hasVideo && _properties.subscribeToVideo);
+          });
         }
 
         _streamContainer = _container.bindVideo(webRTCStream,
@@ -18949,19 +21490,14 @@
             onPeerConnectionFailure(null, err.message || err, _peerConnection, 'VideoElement');
             return;
           }
-
-          // Continues workaround for https://jira.tokbox.com/browse/OPENTOK-15605
-          // Also https://jira.tokbox.com/browse/OPENTOK-16425]
-          if (reenableVideoTrack != null && _properties.subscribeToVideo) {
-            reenableVideoTrack.enabled = true;
+          if (_streamContainer) {
+            _streamContainer.orientation({
+              width: _stream.videoDimensions.width,
+              height: _stream.videoDimensions.height,
+              videoOrientation: _stream.videoDimensions.orientation
+            });
           }
 
-          _streamContainer.orientation({
-            width: _stream.videoDimensions.width,
-            height: _stream.videoDimensions.height,
-            videoOrientation: _stream.videoDimensions.orientation
-          });
-
           onLoaded.call(this, null);
         }, this));
 
@@ -19157,7 +21693,7 @@
           );
         }
       };
-      
+
   OT.StylableComponent(this, {
     nameDisplayMode: 'auto',
     buttonDisplayMode: 'auto',
@@ -19171,6 +21707,10 @@
   });
 
   var setAudioOnly = function(audioOnly) {
+    if (_peerConnection) {
+      _peerConnection.subscribeToVideo(!audioOnly);
+    }
+
     if (_container) {
       _container.audioOnly(audioOnly);
       _container.showPoster(audioOnly);
@@ -19302,7 +21842,7 @@
   };
 
   /**
-   * Return the base-64-encoded string of PNG data representing the Subscriber video.
+   * Returns the base-64-encoded string of PNG data representing the Subscriber video.
    *
    *  <p>You can use the string as the value for a data URL scheme passed to the src parameter of
    *  an image file, as in the following:</p>
@@ -19527,7 +22067,7 @@
   */
   this.subscribeToVideo = function(pValue, reason) {
     var value = OT.$.castToBoolean(pValue, true);
-    
+
     setAudioOnly(!(value && _stream.hasVideo));
 
     if ( value && _container  && _container.video()) {
@@ -19542,8 +22082,6 @@
     }
 
     if (_peerConnection) {
-      _peerConnection.subscribeToVideo(value);
-
       if (_session && _stream && (value !== _properties.subscribeToVideo ||
           reason !== _lastSubscribeToVideoReason)) {
         _stream.setChannelActiveState('video', value, reason);
@@ -19579,10 +22117,24 @@
     return _streamContainer.domElement();
   };
 
+  /**
+  * Returns the width, in pixels, of the Subscriber video.
+  *
+  * @method #videoWidth
+  * @memberOf Subscriber
+  * @return {Number} the width, in pixels, of the Subscriber video.
+  */
   this.videoWidth = function() {
     return _streamContainer.videoWidth();
   };
 
+  /**
+  * Returns the height, in pixels, of the Subscriber video.
+  *
+  * @method #videoHeight
+  * @memberOf Subscriber
+  * @return {Number} the width, in pixels, of the Subscriber video.
+  */
   this.videoHeight = function() {
     return _streamContainer.videoHeight();
   };
@@ -19646,6 +22198,20 @@
       if(_chrome) {
         _chrome.archive.setArchiving(status);
       }
+    },
+
+    getDataChannel: function (label, options, completion) {
+      // @fixme this will fail if it's called before we have a SubscriberPeerConnection.
+      // I.e. before we have a publisher connection.
+      if (!_peerConnection) {
+        completion(
+          new OT.$.Error('Cannot create a DataChannel before there is a publisher connection.')
+        );
+
+        return;
+      }
+
+      _peerConnection.getDataChannel(label, options, completion);
     }
   };
 
@@ -19953,7 +22519,7 @@
 
 /* jshint globalstrict: true, strict: false, undef: true, unused: true,
           trailing: true, browser: true, smarttabs:true */
-/* global OT, Promise */
+/* global OT */
 
 
 /**
@@ -20371,7 +22937,7 @@
    */
 
   function getTestNetworkConfig(token) {
-    return new Promise(function(resolve, reject) {
+    return new OT.$.RSVP.Promise(function(resolve, reject) {
       OT.$.getJSON(
         [OT.properties.apiURL, '/v2/partner/', _apiKey, '/session/', _sessionId, '/connection/',
           _connectionId, '/testNetworkConfig'].join(''),
@@ -20423,7 +22989,7 @@
       return;
     }
 
-    var webRtcStreamPromise = new Promise(
+    var webRtcStreamPromise = new OT.$.RSVP.Promise(
       function(resolve, reject) {
         var webRtcStream = publisher._.webRtcStream();
         if (webRtcStream) {
@@ -20455,7 +23021,7 @@
 
     var testConfig;
     var webrtcStats;
-    Promise.all([getTestNetworkConfig(token), webRtcStreamPromise])
+    OT.$.RSVP.Promise.all([getTestNetworkConfig(token), webRtcStreamPromise])
       .then(function(values) {
         var webRtcStream = values[1];
         testConfig = values[0];
@@ -20464,19 +23030,22 @@
       .then(function(stats) {
         OT.debug('Received stats from webrtcTest: ', stats);
         if (stats.bandwidth < testConfig.media.thresholdBitsPerSecond) {
-          return Promise.reject(new OT.$.Error('The detect bandwidth form the WebRTC stage of ' +
-          'the test was not sufficient to run the HTTP stage of the test', 1553));
+          return OT.$.RSVP.Promise.reject(new OT.$.Error('The detect bandwidth form the WebRTC ' +
+          'stage of the test was not sufficient to run the HTTP stage of the test', 1553));
         }
 
         webrtcStats = stats;
       })
       .then(function() {
-        return OT.httpTest({httpConfig: testConfig.http});
+        // run the HTTP test only if the PC test was not extended
+        if(!webrtcStats.extended) {
+          return OT.httpTest({httpConfig: testConfig.http});
+        }
       })
       .then(function(httpStats) {
         var stats = {
-          uploadBitsPerSecond: httpStats.uploadBandwidth,
-          downloadBitsPerSecond: httpStats.downloadBandwidth,
+          uploadBitsPerSecond: httpStats ? httpStats.uploadBandwidth : webrtcStats.bandwidth,
+          downloadBitsPerSecond: httpStats ? httpStats.downloadBandwidth : webrtcStats.bandwidth,
           packetLossRatio: webrtcStats.packetLostRatio,
           roundTripTimeMilliseconds: webrtcStats.roundTripTime
         };
@@ -20640,14 +23209,27 @@
       return this;
     }
 
-    if (!_sessionId) {
+    this.logConnectivityEvent('Attempt');
+
+    if (!_sessionId || OT.$.isObject(_sessionId) || OT.$.isArray(_sessionId)) {
+      var errorMsg;
+      if(!_sessionId) {
+        errorMsg = 'SessionID is undefined. You must pass a sessionID to initSession.';
+      } else {
+        errorMsg = 'SessionID is not a string. You must use string as the session ID passed into ' +
+          'OT.initSession().';
+        _sessionId = _sessionId.toString();
+      }
       setTimeout(OT.$.bind(
         sessionConnectFailed,
         this,
-        'SessionID is undefined. You must pass a sessionID to initSession.',
+        errorMsg,
         OT.ExceptionCodes.INVALID_SESSION_ID
       ));
 
+      this.logConnectivityEvent('Failure', {reason:'ConnectToSession',
+        code: OT.ExceptionCodes.INVALID_SESSION_ID,
+        message: errorMsg});
       return this;
     }
 
@@ -20658,8 +23240,6 @@
       OT.APIKEY = _apiKey;
     }
 
-    this.logConnectivityEvent('Attempt');
-
     getSessionInfo.call(this);
     return this;
   };
@@ -21108,15 +23688,15 @@
 *           <ul>
 *             <li>
 *               <code>"cover"</code> &mdash; The video is cropped if its dimensions do not match
-*               those of the DOM element. This is the default setting for screen-sharing videos
-*               (for Stream objects with the <code>videoType</code> property set to
-*               <code>"screen"</code>).
+*               those of the DOM element. This is the default setting for videos that have a
+*               camera as the source (for Stream objects with the <code>videoType</code> property
+*               set to <code>"camera"</code>).
 *             </li>
 *             <li>
 *               <code>"contain"</code> &mdash; The video is letter-boxed if its dimensions do not
-*               match those of the DOM element. This is the default setting for videos that have a
-*               camera as the source (for Stream objects with the <code>videoType</code> property
-*               set to <code>"camera"</code>).
+*               match those of the DOM element. This is the default setting for screen-sharing
+*               videos (for Stream objects with the <code>videoType</code> property set to
+*               <code>"screen"</code>).
 *             </li>
 *           </ul>
 *       </li>
@@ -21145,7 +23725,16 @@
 *             appended as the last child element of the targetElement.</li>
 *         </ul>
 *       </li>
-*
+*   </li>
+*   <li>
+*   <code>showControls</code> (Boolean) &#151; Whether to display the built-in user interface
+*   controls for the Subscriber (default: <code>true</code>). These controls include the name
+*   display, the audio level indicator, the speaker control button, the video disabled indicator,
+*   and the video disabled warning icon. You can turn off all user interface controls by setting
+*   this property to <code>false</code>. You can control the display of individual user interface
+*   controls by leaving this property set to <code>true</code> (the default) and setting individual
+*   properties of the <code>style</code> property.
+*   </li>
 *   <li>
 *   <code>style</code> (Object) &#151; An object containing properties that define the initial
 *   appearance of user interface controls of the Subscriber. The <code>style</code> object
@@ -21234,6 +23823,16 @@
 * @memberOf Session
 */
   this.subscribe = function(stream, targetElement, properties, completionHandler) {
+    if(typeof targetElement === 'function') {
+      completionHandler = targetElement;
+      targetElement = undefined;
+      properties = undefined;
+    }
+
+    if(typeof properties === 'function') {
+      completionHandler = properties;
+      properties = undefined;
+    }
 
     if (!this.connection || !this.connection.connectionId) {
       dispatchError(OT.ExceptionCodes.UNABLE_TO_SUBSCRIBE,
@@ -21256,16 +23855,6 @@
       return;
     }
 
-    if(typeof targetElement === 'function') {
-      completionHandler = targetElement;
-      targetElement = undefined;
-      properties = undefined;
-    }
-
-    if(typeof properties === 'function') {
-      completionHandler = properties;
-      properties = undefined;
-    }
 
     var subscriber = new OT.Subscriber(targetElement, OT.$.extend(properties || {}, {
       stream: stream,
@@ -21273,9 +23862,18 @@
     }), function(err) {
 
       if (err) {
-        dispatchError(OT.ExceptionCodes.UNABLE_TO_SUBSCRIBE,
-              'Session.subscribe :: ' + err.message,
-              completionHandler);
+        var errorCode,
+          errorMessage,
+          knownErrorCodes = [400, 403];
+        if (!err.code && OT.$.arrayIndexOf(knownErrorCodes, err.code) > -1) {
+          errorCode = OT.OT.ExceptionCodes.UNABLE_TO_SUBSCRIBE;
+          errorMessage = 'Session.subscribe :: ' + err.message;
+        } else {
+          errorCode = OT.ExceptionCodes.UNEXPECTED_SERVER_RESPONSE;
+          errorMessage = 'Unexpected server response. Try this operation again later.';
+        }
+
+        dispatchError(errorCode, errorMessage, completionHandler);
 
       } else  if (completionHandler && OT.$.isFunction(completionHandler)) {
         completionHandler.apply(null, arguments);
@@ -22184,7 +24782,7 @@
     '640x480': {width: 640, height: 480},
     '1280x720': {width: 1280, height: 720}
   };
-  
+
   if (_isScreenSharing) {
     if (window.location.protocol !== 'https:') {
       OT.warn('Screen Sharing typically requires pages to be loadever over HTTPS - unless this ' +
@@ -22251,7 +24849,7 @@
           });
         }
         if (variation === 'Failure' && payload.reason !== 'Non-fatal') {
-          // We don't want to log an invalid sequence in this case because it was a 
+          // We don't want to log an invalid sequence in this case because it was a
           // non-fatal failure
           _connectivityAttemptPinger.setVariation(variation);
         }
@@ -22466,9 +25064,15 @@
       }, this),
 
       onPeerConnectionFailure = OT.$.bind(function(code, reason, peerConnection, prefix) {
+        var errorCode;
+        if (prefix === 'ICEWorkflow') {
+          errorCode = OT.ExceptionCodes.PUBLISHER_ICE_WORKFLOW_FAILED;
+        } else {
+          errorCode = OT.ExceptionCodes.UNABLE_TO_PUBLISH;
+        }
         var payload = {
           reason: prefix ? prefix : 'PeerConnectionError',
-          code: OT.ExceptionCodes.UNABLE_TO_PUBLISH,
+          code: errorCode,
           message: (prefix ? prefix : '') + ':Publisher PeerConnection with connection ' +
             (peerConnection && peerConnection.remoteConnection &&
             peerConnection.remoteConnection().id) + ' failed: ' + reason,
@@ -22478,11 +25082,13 @@
           // We're already publishing so this is a Non-fatal failure, must be p2p and one of our
           // peerconnections failed
           payload.reason = 'Non-fatal';
+        } else {
+          this.trigger('publishComplete', new OT.Error(OT.ExceptionCodes.UNABLE_TO_PUBLISH,
+              payload.message));
         }
         logConnectivityEvent('Failure', payload);
 
-        OT.handleJsException('Publisher PeerConnection Error: ' + reason,
-        OT.ExceptionCodes.UNABLE_TO_PUBLISH, {
+        OT.handleJsException('Publisher PeerConnection Error: ' + reason, errorCode, {
           session: _session,
           target: this
         });
@@ -22544,7 +25150,8 @@
             remoteConnection,
             _session,
             _streamId,
-            _webRTCStream
+            _webRTCStream,
+            _properties.channels
           );
 
           peerConnection.on({
@@ -22705,7 +25312,7 @@
 
         if (!_state.isDestroyed()) _state.set('NotPublishing');
       }, this);
-      
+
   OT.StylableComponent(this, {
     showArchiveStatus: true,
     nameDisplayMode: 'auto',
@@ -22721,7 +25328,7 @@
       _widgetView.audioOnly(audioOnly);
       _widgetView.showPoster(audioOnly);
     }
-  
+
     if (_audioLevelMeter && _publisher.getStyle('audioLevelDisplayMode') === 'auto') {
       _audioLevelMeter[audioOnly ? 'show' : 'hide']();
     }
@@ -22799,7 +25406,7 @@
           _setupVideoDefaults();
 
           var mandatory = _properties.constraints.video.mandatory;
-          
+
           if(_isScreenSharing) {
             // this is handled by the extension helpers
           } else if(_properties.videoSource.deviceId != null) {
@@ -23192,16 +25799,33 @@
           if (err) {
             // @todo we should respect err.code here and translate it to the local
             // client equivalent.
-            var errorCode = OT.ExceptionCodes.UNABLE_TO_PUBLISH;
+            var errorCode,
+              errorMessage,
+              knownErrorCodes = [403, 404, 409];
+            if (err.code && OT.$.arrayIndexOf(knownErrorCodes, err.code) > -1) {
+              errorCode = OT.ExceptionCodes.UNABLE_TO_PUBLISH;
+              errorMessage = err.message;
+            } else {
+              errorCode = OT.ExceptionCodes.UNEXPECTED_SERVER_RESPONSE;
+              errorMessage = 'Unexpected server response. Try this operation again later.';
+            }
+
             var payload = {
               reason: 'Publish',
               code: errorCode,
-              message: err.message
+              message: errorMessage
             };
             logConnectivityEvent('Failure', payload);
             if (_state.isAttemptingToPublish()) {
-              this.trigger('publishComplete', new OT.Error(errorCode, err.message));
+              this.trigger('publishComplete', new OT.Error(errorCode, errorMessage));
             }
+
+            OT.handleJsException(err.message,
+              errorCode, {
+              session: _session,
+              target: this
+            });
+
             return;
           }
 
@@ -23247,7 +25871,6 @@
 
         session._.streamCreate(_properties.name || '', _streamId,
           _properties.audioFallbackEnabled, streamChannels, onStreamRegistered);
-
       };
 
       if (_loaded) createStream.call(this);
@@ -23313,20 +25936,7 @@
       return _webRTCStream;
     },
 
-    /**
-     * @param {string=} windowId
-     */
-    switchAcquiredWindow: function(windowId) {
-
-      if (OT.$.env.name !== 'Firefox' || OT.$.env.version < 38) {
-        throw new Error('switchAcquiredWindow is an experimental method and is not supported by' +
-        'the current platform');
-      }
-
-      if (typeof windowId !== 'undefined') {
-        _properties.constraints.video.browserWindow = windowId;
-      }
-
+    switchTracks: function() {
       return new Promise(function(resolve, reject) {
         OT.$.getUserMedia(
           _properties.constraints,
@@ -23360,9 +25970,9 @@
               var peerConnection = _peerConnections[connectionId];
               peerConnection.getSenders().forEach(function(sender) {
                 if (sender.track.kind === 'audio' && newStream.getAudioTracks().length) {
-                  replacePromises.push(sender.replaceTrack(newStream.getAudioTracks()[0]));
+                  replacePromises.push(sender.switchTracks(newStream.getAudioTracks()[0]));
                 } else if (sender.track.kind === 'video' && newStream.getVideoTracks().length) {
-                  replacePromises.push(sender.replaceTrack(newStream.getVideoTracks()[0]));
+                  replacePromises.push(sender.switchTracks(newStream.getVideoTracks()[0]));
                 }
               });
             });
@@ -23380,6 +25990,54 @@
             reject(error);
           });
       });
+    },
+
+    /**
+     * @param {string=} windowId
+     */
+    switchAcquiredWindow: function(windowId) {
+
+      if (OT.$.env.name !== 'Firefox' || OT.$.env.version < 38) {
+        throw new Error('switchAcquiredWindow is an experimental method and is not supported by' +
+        'the current platform');
+      }
+
+      if (typeof windowId !== 'undefined') {
+        _properties.constraints.video.browserWindow = windowId;
+      }
+
+      logAnalyticsEvent('SwitchAcquiredWindow', 'Attempt', {
+        constraints: _properties.constraints
+      });
+
+      var switchTracksPromise = _publisher._.switchTracks();
+
+      // "listening" promise completion just for analytics
+      switchTracksPromise.then(function() {
+        logAnalyticsEvent('SwitchAcquiredWindow', 'Success', {
+          constraints: _properties.constraints
+        });
+      }, function(error) {
+        logAnalyticsEvent('SwitchAcquiredWindow', 'Failure', {
+          error: error,
+          constraints: _properties.constraints
+        });
+      });
+
+      return switchTracksPromise;
+    },
+
+    getDataChannel: function (label, options, completion) {
+      var pc = _peerConnections[OT.$.keys(_peerConnections)[0]];
+
+      // @fixme this will fail if it's called before we have a PublisherPeerConnection.
+      // I.e. before we have a subscriber.
+      if (!pc) {
+        completion(new OT.$.Error('Cannot create a DataChannel before there is a subscriber.'));
+        return;
+      }
+
+      pc.getDataChannel(label, options, completion);
     }
   };
 
@@ -23432,10 +26090,30 @@
     return _widgetView && _widgetView.loading();
   };
 
+  /**
+  * Returns the width, in pixels, of the Publisher video. This may differ from the
+  * <code>resolution</code> property passed in as the <code>properties</code> property
+  * the options passed into the <code>OT.initPublisher()</code> method, if the browser
+  * does not support the requested resolution.
+  *
+  * @method #videoWidth
+  * @memberOf Publisher
+  * @return {Number} the width, in pixels, of the Publisher video.
+  */
   this.videoWidth = function() {
     return _targetElement.videoWidth();
   };
 
+  /**
+  * Returns the height, in pixels, of the Publisher video. This may differ from the
+  * <code>resolution</code> property passed in as the <code>properties</code> property
+  * the options passed into the <code>OT.initPublisher()</code> method, if the browser
+  * does not support the requested resolution.
+  *
+  * @method #videoHeight
+  * @memberOf Publisher
+  * @return {Number} the height, in pixels, of the Publisher video.
+  */
   this.videoHeight = function() {
     return _targetElement.videoHeight();
   };
@@ -23620,6 +26298,13 @@
     apiKey = null;
   }
 
+  // Allow buggy legacy behavior to succeed, where the client can connect if sessionId
+  // is an array containing one element (the session ID), but fix it so that sessionId
+  // is stored as a string (not an array):
+  if (OT.$.isArray(sessionId) && sessionId.length === 1) {
+    sessionId = sessionId[0];
+  }
+
   var session = OT.sessions.get(sessionId);
 
   if (!session) {
@@ -23694,11 +26379,11 @@
 *     <ul>
 *       <li>
 *         <code>"cover"</code> &mdash; The video is cropped if its dimensions do not match those of
-*         the DOM element. This is the default setting for screen-sharing videos.
+*         the DOM element. This is the default setting for videos publishing a camera feed.
 *       </li>
 *       <li>
 *         <code>"contain"</code> &mdash; The video is letter-boxed if its dimensions do not match
-*         those of the DOM element. This is the default setting for videos publishing a camera feed.
+*         those of the DOM element. This is the default setting for screen-sharing videos.
 *       </li>
 *     </ul>
 * </li>
@@ -23799,6 +26484,15 @@
 *   next largest setting supported.
 *   </p>
 *   <p>
+*   The actual resolution used by the Publisher is returned by the <code>videoHeight()</code> and
+*   <code>videoWidth()</code> methods of the Publisher object. The actual resolution of a
+*   Subscriber video stream is returned by the <code>videoHeight()</code> and
+*   <code>videoWidth()</code> properties of the Subscriber object. These may differ from the values
+*   of the <code>resolution</code> property passed in as the <code>properties</code> property of the
+*   <code>OT.initPublisher()</code> method, if the browser does not support the requested
+*   resolution.
+*   </p>
+*   <p>
 *   For sessions that use the OpenTok Media Router (sessions with the
 *   <a href="http://tokbox.com/opentok/tutorials/create-session/#media-mode">media mode</a>
 *   set to routed, lowering the frame rate or lowering the resolution reduces the maximum bandwidth
@@ -23807,6 +26501,14 @@
 *   </p>
 * </li>
 * <li>
+*   <strong>showControls</strong> (Boolean) &#151; Whether to display the built-in user interface
+*   controls (default: <code>true</code>) for the Publisher. These controls include the name
+*   display, the audio level indicator, and the microphone control button. You can turn off all user
+*   interface controls by setting this property to <code>false</code>. You can control the display
+*   of individual user interface controls by leaving this property set to <code>true</code> (the
+*   default) and setting individual properties of the <code>style</code> property.
+* </li>
+* <li>
 *   <strong>style</strong> (Object) &#151; An object containing properties that define the initial
 *   appearance of user interface controls of the Publisher. The <code>style</code> object includes
 *   the following properties:
@@ -23859,7 +26561,7 @@
 *    property to <code>null</code> or <code>false</code> for each Publisher.
 *    </p>
 *   <p>
-*     To publish a screen-sharing streamet this property to <code>"application"</code>,
+*     To publish a screen-sharing stream, set this property to <code>"application"</code>,
 *    <code>"screen"</code>, or <code>"window"</code>. Call
 *    <a href="OT.html#checkScreenSharingCapability">OT.checkScreenSharingCapability()</a> to check
 *    if screen sharing is supported. When you set the <code>videoSource</code> property to
@@ -23910,9 +26612,7 @@
 
   // To support legacy (apikey, targetElement, properties) users
   // we check to see if targetElement is actually an apikey. Which we ignore.
-  if(targetElement != null && !(OT.$.isElementNode(targetElement) ||
-    (typeof targetElement === 'string' && document.getElementById(targetElement))) &&
-    typeof targetElement !== 'function') {
+  if(typeof targetElement === 'string' && !document.getElementById(targetElement)) {
     targetElement = properties;
     properties = completionHandler;
     completionHandler = arguments[3];
@@ -23923,6 +26623,11 @@
     properties = undefined;
     targetElement = undefined;
   }
+  else if (OT.$.isObject(targetElement) && !(OT.$.isElementNode(targetElement))) {
+    completionHandler = properties;
+    properties = targetElement;
+    targetElement = undefined;
+  }
 
   if(typeof properties === 'function') {
     completionHandler = properties;
@@ -23969,6 +26674,9 @@
  * <p>
  * The array of devices is passed in as the <code>devices</code> parameter of
  * the <code>callback</code> function passed into the method.
+ * <p>
+ * This method is only available in Chrome. In other browsers, the callback function is
+ * passed an error object.
  *
  * @param callback {Function} The callback function invoked when the list of devices
  * devices is available. This function takes two parameters:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/.eslintignore firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/.eslintignore
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/.eslintignore	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/.eslintignore	2015-05-25 20:42:46.000000000 +0000
@@ -18,6 +18,7 @@
 content/js/panel.js
 content/js/roomViews.js
 content/shared/js/feedbackViews.js
+content/shared/js/textChatView.js
 content/shared/js/views.js
 standalone/content/js/fxOSMarketplace.js
 standalone/content/js/standaloneRoomViews.js
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/.eslintrc firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/.eslintrc
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/.eslintrc	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/.eslintrc	2015-05-25 20:42:46.000000000 +0000
@@ -19,9 +19,11 @@
     "chai": false,
     "console": false,
     "jQuery": false,
-    "loop": false,
+    "loop": true,
     "MozActivity": false,
+    "mozRTCSessionDescription": false,
     "OT": false,
+    "performance": false,
     "Promise": false,
     "React": false,
     "sinon": false
@@ -35,9 +37,11 @@
     // Eslint built-in rules are documented at <http://eslint.org/docs/rules/>
     "camelcase": 0,               // TODO: Remove (use default)
     "consistent-return": 0,       // TODO: Remove (use default)
+    dot-location: 0,              // [2, property],
     "eqeqeq": 0,                  // TBD. Might need to be separate for content & chrome
     "global-strict": 0,           // Leave as zero (this will be unsupported in eslint 1.0.0)
     "key-spacing": 0,             // TODO: Remove (use default)
+    "linebreak-style": [2, "unix"],
     "new-cap": 0,                 // TODO: Remove (use default)
     "no-catch-shadow": 0,         // TODO: Remove (use default)
     "no-console": 0,              // Leave as 0. We use console logging in content code.
@@ -50,13 +54,13 @@
     "no-return-assign": 0,        // TODO: Remove (use default)
     "no-shadow": 0,               // TODO: Remove (use default)
     "no-spaced-func": 0,          // TODO: Remove (use default)
-    "no-undef": 0,                // TODO: Remove (use default)
     "no-underscore-dangle": 0,    // Leave as 0. Commonly used for private variables.
+    "no-unneeded-ternary": 2,
     "no-unused-expressions": 0,   // TODO: Remove (use default)
     "no-unused-vars": 0,          // TODO: Remove (use default)
     "no-use-before-define": 0,    // TODO: Remove (use default)
     "no-wrap-func": 0,            // TODO: Remove (use default)
-    "quotes": 0,                  // [2, "double", "avoid-escape"],
+    "quotes": [2, "double", "avoid-escape"],
     "strict": 0,                  // [2, "function"],
     // eslint-plugin-react rules. These are documented at
     // <https://github.com/yannickcr/eslint-plugin-react#list-of-supported-rules>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/.eslintrc-gecko firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/.eslintrc-gecko
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/.eslintrc-gecko	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/.eslintrc-gecko	2015-05-25 20:42:46.000000000 +0000
@@ -0,0 +1,64 @@
+// This file defines additional items and rules specific for gecko files.
+// This is applied on top of the basic .eslintrc for gecko specific directories
+// e.g. the modules directory.
+{
+  "ecmaFeatures": {
+    "arrowFunctions": true,
+    "blockBindings": true,
+    "destructuring": true,
+    "generators": true,
+    "restParams": true,
+    "spread": true,
+    "objectLiteralShorthandMethods": true,
+  },
+  "globals": {
+    // Gecko + Loop Globals.
+    "CardDavImporter": true,
+    "Chat": false,
+    "ChromeWorker": false,
+    "CommonUtils": false,
+    "Components": false,
+    "convertToRTCStatsReport": false,
+    "CustomizableUI": false,
+    "deriveHawkCredentials": false,
+    "eventEmitter": false,
+    "FxAccountsOAuthClient": false,
+    "FxAccountsProfileClient": false,
+    "gBrowser": false,
+    "gDNSService": false,
+    "gLoopBundle": false,
+    "GoogleImporter": true,
+    "gWM": false,
+    "HawkClient": false,
+    "injectLoopAPI": true,
+    "Iterator": false,
+    "Log": false,
+    "log": true,
+    "LOOP_SESSION_TYPE": true,
+    "LoopCalls": true,
+    "LoopContacts": true,
+    "loopCrypto": false,
+    "LoopRooms": true,
+    "LoopRoomsCache": true,
+    "LoopStorage": true,
+    "MozLoopPushHandler": true,
+    "MozLoopService": true,
+    "OS": false,
+    "roomsPushNotification": true,
+    "Services": false,
+    "Social": false,
+    "SocialShare": false,
+    "Task": false,
+    "UITour": false,
+    "XPCOMUtils": false,
+    "uuidgen": true,
+    // Test Related
+    "Assert": false,
+  },
+  "rules": {
+    "generator-star-spacing": [2, "after"],
+    // We should fix the errors and enable this (set to 2)
+    "no-var": 0,
+    "strict": [2, "global"]
+  }
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/jar.mn firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/jar.mn
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/jar.mn	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/jar.mn	2015-05-25 20:42:46.000000000 +0000
@@ -84,6 +84,8 @@
   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/textChatStore.js       (content/shared/js/textChatStore.js)
+  content/browser/loop/shared/js/textChatView.js        (content/shared/js/textChatView.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)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/modules/.eslintrc firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/modules/.eslintrc
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/modules/.eslintrc	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/modules/.eslintrc	2015-05-25 20:42:46.000000000 +0000
@@ -1,17 +1,3 @@
 {
-  "ecmaFeatures": {
-    "arrowFunctions": true,
-    "blockBindings": true,
-    "destructuring": true,
-    "generators": true,
-    "restParams": true,
-    "spread": true,
-    "objectLiteralShorthandMethods": true,
-  },
-  "rules": {
-    "generator-star-spacing": [2, "after"],
-    // We should fix the errors and enable this (set to 2)
-    "no-var": 0,
-    "strict": [2, "global"]
-  }
+  "extends": "../.eslintrc-gecko"
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/modules/LoopCalls.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/modules/LoopCalls.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/modules/LoopCalls.jsm	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/modules/LoopCalls.jsm	2015-05-25 20:42:46.000000000 +0000
@@ -146,7 +146,7 @@
       return;
     }
 
-    if (msg.messageType && msg.messageType === 'hello') {
+    if (msg.messageType && msg.messageType === "hello") {
       this._handshakeComplete = true;
       this._onSuccess();
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/modules/LoopContacts.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/modules/LoopContacts.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/modules/LoopContacts.jsm	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/modules/LoopContacts.jsm	2015-05-25 20:42:46.000000000 +0000
@@ -267,7 +267,7 @@
 const batch = function(operation, data, callback) {
   let processed = [];
   if (!LoopContactsInternal.hasOwnProperty(operation) ||
-    typeof LoopContactsInternal[operation] != 'function') {
+    typeof LoopContactsInternal[operation] != "function") {
     callback(new Error ("LoopContactsInternal does not contain a '" +
              operation + "' method"));
     return;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/modules/LoopRoomsCache.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/modules/LoopRoomsCache.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/modules/LoopRoomsCache.jsm	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/modules/LoopRoomsCache.jsm	2015-05-25 20:42:46.000000000 +0000
@@ -81,9 +81,7 @@
     try {
       return (this._cache = yield CommonUtils.readJSON(this.path));
     } catch(error) {
-      // This is really complex due to OSFile's error handling, see bug 1160109.
-      if ((OS.Constants.libc && error.unixErrno != OS.Constants.libc.ENOENT) ||
-          (OS.Constants.Win && error.winLastError != OS.Constants.Win.ERROR_FILE_NOT_FOUND)) {
+      if (!error.becauseNoSuchFile) {
         MozLoopService.log.debug("Error reading the cache:", error);
       }
       return (this._cache = {});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/modules/LoopRooms.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/modules/LoopRooms.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/modules/LoopRooms.jsm	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/modules/LoopRooms.jsm	2015-05-25 20:42:46.000000000 +0000
@@ -8,6 +8,7 @@
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
+Cu.import("resource://gre/modules/Timer.jsm");
 
 const {MozLoopService, LOOP_SESSION_TYPE} = Cu.import("resource:///modules/loop/MozLoopService.jsm", {});
 XPCOMUtils.defineLazyModuleGetter(this, "Promise",
@@ -19,7 +20,7 @@
   return new EventEmitter();
 });
 XPCOMUtils.defineLazyGetter(this, "gLoopBundle", function() {
-  return Services.strings.createBundle('chrome://browser/locale/loop/loop.properties');
+  return Services.strings.createBundle("chrome://browser/locale/loop/loop.properties");
 });
 
 XPCOMUtils.defineLazyModuleGetter(this, "LoopRoomsCache",
@@ -28,6 +29,8 @@
   "resource:///modules/loop/utils.js", "utils");
 XPCOMUtils.defineLazyModuleGetter(this, "loopCrypto",
   "resource:///modules/loop/crypto.js", "LoopCrypto");
+XPCOMUtils.defineLazyModuleGetter(this, "ObjectUtils",
+  "resource://gre/modules/ObjectUtils.jsm");
 
 
 this.EXPORTED_SYMBOLS = ["LoopRooms", "roomsPushNotification"];
@@ -35,6 +38,13 @@
 // The maximum number of clients that we support currently.
 const CLIENT_MAX_SIZE = 2;
 
+// Wait at least 5 seconds before doing opportunistic encryption.
+const MIN_TIME_BEFORE_ENCRYPTION = 5 * 1000;
+// Wait at maximum of 30 minutes before doing opportunistic encryption.
+const MAX_TIME_BEFORE_ENCRYPTION = 30 * 60 * 1000;
+// Wait time between individual re-encryption cycles (1 second).
+const TIME_BETWEEN_ENCRYPTIONS = 1000;
+
 const roomsPushNotification = function(version, channelID) {
   return LoopRoomsInternal.onNotification(version, channelID);
 };
@@ -118,6 +128,23 @@
 };
 
 /**
+ * These are wrappers which can be overriden by tests to allow us to manually
+ * handle the timeouts.
+ */
+let timerHandlers = {
+  /**
+   * Wrapper for setTimeout.
+   *
+   * @param  {Function} callback The callback function.
+   * @param  {Number}   delay    The delay in milliseconds.
+   * @return {Number}            The timer identifier.
+   */
+  startTimer(callback, delay) {
+    return setTimeout(callback, delay);
+  }
+};
+
+/**
  * The Rooms class.
  *
  * Each method that is a member of this class requires the last argument to be a
@@ -138,6 +165,19 @@
   },
 
   /**
+   * @var {Object} encryptionQueue  This stores the list of rooms awaiting
+   *                                encryption and associated timers.
+   */
+  encryptionQueue: {
+    queue: [],
+    timer: null,
+    reset: function() {
+      this.queue = [];
+      this.timer = null;
+    }
+  },
+
+  /**
    * @var {String} sessionType The type of user session. May be 'FXA' or 'GUEST'.
    */
   get sessionType() {
@@ -161,6 +201,64 @@
   },
 
   /**
+   * Processes the encryption queue. Takes the next item off the queue,
+   * restarts the timer if necessary.
+   *
+   * Although this is only called from a timer callback, it is an async function
+   * so that tests can call it and be deterministic.
+   */
+  processEncryptionQueue: Task.async(function* () {
+    let roomToken = this.encryptionQueue.queue.shift();
+
+    // Performed in sync fashion so that we don't queue a timer until it has
+    // completed, and to make it easier to run tests.
+    let roomData = this.rooms.get(roomToken);
+
+    if (roomData) {
+      try {
+        // Passing the empty object for roomData is enough for the room to be
+        // re-encrypted.
+        yield LoopRooms.promise("update", roomToken, {});
+      } catch (error) {
+        MozLoopService.log.error("Upgrade encryption of room failed", error);
+        // No need to remove the room from the list as that's done in the shift above.
+      }
+    }
+
+    if (this.encryptionQueue.queue.length) {
+      this.encryptionQueue.timer =
+        timerHandlers.startTimer(this.processEncryptionQueue.bind(this), TIME_BETWEEN_ENCRYPTIONS);
+    } else {
+      this.encryptionQueue.timer = null;
+    }
+  }),
+
+  /**
+   * Queues a room for encryption sometime in the future. This is done so as
+   * not to overload the server or the browser when we initially request the
+   * list of rooms.
+   *
+   * @param {String} roomToken The token for the room that needs encrypting.
+   */
+  queueForEncryption: function(roomToken) {
+    if (!this.encryptionQueue.queue.includes(roomToken)) {
+      this.encryptionQueue.queue.push(roomToken);
+    }
+
+    // Set up encryption to happen at a random time later. There's a minimum
+    // wait time - we don't need to do this straight away, so no need if the user
+    // is starting up. We then add a random factor on top of that. This is to
+    // try and avoid any potential with a set of clients being restarted at the
+    // same time and flooding the server.
+    if (!this.encryptionQueue.timer) {
+      let waitTime = (MAX_TIME_BEFORE_ENCRYPTION - MIN_TIME_BEFORE_ENCRYPTION) *
+        Math.random() + MIN_TIME_BEFORE_ENCRYPTION;
+      this.encryptionQueue.timer =
+        timerHandlers.startTimer(this.processEncryptionQueue.bind(this), waitTime);
+    }
+  },
+
+  /**
    * Gets or creates a room key for a room.
    *
    * It assumes that the room data is decrypted.
@@ -214,24 +312,12 @@
    *                                any decrypted data.
    *                   - all: The roomData with both encrypted and decrypted
    *                          information.
+   *                   If rejected, encryption has failed. This could be due to
+   *                   missing keys for FxA, which this process can't manage. It
+   *                   is generally expected the panel will prompt the user for
+   *                   re-auth if the FxA keys are missing.
    */
   promiseEncryptRoomData: Task.async(function* (roomData) {
-    // XXX We should only return unencrypted data whilst we're still working
-    // on context. Once bug 1115340 is fixed, this function should no longer be
-    // here.
-    function getUnencryptedData() {
-      var serverRoomData = extend({}, roomData);
-      delete serverRoomData.decryptedContext;
-
-      // We can only save roomName as non-encypted data for now.
-      serverRoomData.roomName = roomData.decryptedContext.roomName;
-
-      return {
-        all: roomData,
-        encrypted: serverRoomData
-      };
-    }
-
     var newRoomData = extend({}, roomData);
 
     if (!newRoomData.context) {
@@ -241,17 +327,7 @@
     // First get the room key.
     let key = yield this.promiseGetOrCreateRoomKey(newRoomData);
 
-    try {
-      newRoomData.context.wrappedKey = yield this.promiseEncryptedRoomKey(key);
-    }
-    catch (ex) {
-      // XXX Bug 1153788 should remove this, then we can remove the whole
-      // try/catch.
-      if (ex.message == "FxA re-register not implemented") {
-        return getUnencryptedData();
-      }
-      return Promise.reject(ex);
-    }
+    newRoomData.context.wrappedKey = yield this.promiseEncryptedRoomKey(key);
 
     // Now encrypt the actual data.
     newRoomData.context.value = yield loopCrypto.encryptBytes(key,
@@ -312,7 +388,9 @@
     if (fallback) {
       // Fallback decryption succeeded, so we need to re-encrypt the room key and
       // save the data back again.
-      // XXX Bug 1152764 will implement this or make it a separate bug.
+      MozLoopService.log.debug("Fell back to saved key, queuing for encryption",
+        roomData.roomToken);
+      this.queueForEncryption(roomData.roomToken);
     } else if (!savedRoomKey || key != savedRoomKey) {
       // Decryption succeeded, but we don't have the right key saved.
       try {
@@ -363,17 +441,23 @@
       // We don't do anything with roomUrl here as it doesn't need a key
       // string adding at this stage.
 
-      // No encrypted data, use the old roomName field.
-      // XXX Bug 1152764 will add functions for automatically encrypting the room
-      // name.
+      // No encrypted data yet, use the old roomName field.
       room.decryptedContext = {
         roomName: room.roomName
       };
       delete room.roomName;
 
+      // This room doesn't have context, so we'll save it for a later encryption
+      // cycle.
+      this.queueForEncryption(room.roomToken);
+
       this.saveAndNotifyUpdate(room, isUpdate);
     } else {
-      // XXX Don't decrypt if same?
+      // We could potentially optimise this later by not decrypting if the
+      // encrypted context hasn't already changed. However perf doesn't seem
+      // to be too bigger an issue at the moment, so we just decrypt for now.
+      // If we do change this, then we need to make sure we get the new room
+      // data setup properly, as happens at the end of promiseDecryptRoomData.
       try {
         let roomData = yield this.promiseDecryptRoomData(room);
 
@@ -725,13 +809,16 @@
   update: function(roomToken, roomData, callback) {
     let room = this.rooms.get(roomToken);
     let url = "/rooms/" + encodeURIComponent(roomToken);
-
     if (!room.decryptedContext) {
       room.decryptedContext = {
         roomName: roomData.roomName || room.roomName
       };
     } else {
-      room.decryptedContext.roomName = roomData.roomName || room.roomName;
+      // room.roomName is the final fallback as this is pre-encryption support.
+      // Bug 1166283 is tracking the removal of the fallback.
+      room.decryptedContext.roomName = roomData.roomName ||
+                                       room.decryptedContext.roomName ||
+                                       room.roomName;
     }
     if (roomData.urls && roomData.urls.length) {
       // For now we only support adding one URL to the room context.
@@ -746,17 +833,9 @@
         context: encrypted.context
       };
 
-      // If we're not encrypting currently, then only send the roomName.
-      // XXX This should go away once bug 1153788 is fixed.
-      if (!sendData.context) {
-        sendData = {
-          roomName: room.decryptedContext.roomName
-        };
-      } else {
-        // This might be an upgrade to encrypted rename, so store the key
-        // just in case.
-        yield this.roomsCache.setKey(this.sessionType, all.roomToken, all.roomKey);
-      }
+      // This might be an upgrade to encrypted rename, so store the key
+      // just in case.
+      yield this.roomsCache.setKey(this.sessionType, all.roomToken, all.roomKey);
 
       let response = yield MozLoopService.hawkRequest(this.sessionType,
           url, "PATCH", sendData);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/modules/LoopStorage.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/modules/LoopStorage.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/modules/LoopStorage.jsm	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/modules/LoopStorage.jsm	2015-05-25 20:42:46.000000000 +0000
@@ -10,7 +10,7 @@
   Cu.importGlobalProperties(["indexedDB"]);
 } catch (ex) {
   // don't write this is out in xpcshell, since it's expected there
-  if (typeof window !== 'undefined' && "console" in window) {
+  if (typeof window !== "undefined" && "console" in window) {
     console.log("Failed to import indexedDB; if this isn't a unit test," +
                 " something is wrong", ex);
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/modules/MozLoopAPI.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/modules/MozLoopAPI.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/modules/MozLoopAPI.jsm	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/modules/MozLoopAPI.jsm	2015-05-25 20:42:46.000000000 +0000
@@ -904,7 +904,16 @@
         win.messageManager.addMessageListener("PageMetadata:PageDataResult", function onPageDataResult(msg) {
           win.messageManager.removeMessageListener("PageMetadata:PageDataResult", onPageDataResult);
           let pageData = msg.json;
-          callback(cloneValueInto(pageData, targetWindow));
+          win.LoopUI.getFavicon(function(err, favicon) {
+            if (err) {
+              MozLoopService.log.error("Error occurred whilst fetching favicon", err);
+              // We don't return here intentionally to make sure the callback is
+              // invoked at all times. We just report the error here.
+            }
+            pageData.favicon = favicon || null;
+
+            callback(cloneValueInto(pageData, targetWindow));
+          });
         });
         win.gBrowser.selectedBrowser.messageManager.sendAsyncMessage("PageMetadata:GetPageData");
       }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/modules/MozLoopService.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/modules/MozLoopService.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/modules/MozLoopService.jsm	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/modules/MozLoopService.jsm	2015-05-25 20:42:46.000000000 +0000
@@ -190,7 +190,6 @@
       // Default to 5 seconds
       return 5000;
     }
-    return initialDelay;
   },
 
   /**
@@ -753,7 +752,7 @@
   stageForTelemetryUpload: function(window, pc) {
     window.WebrtcGlobalInformation.getAllStats(allStats => {
       let internalFormat = allStats.reports[0]; // filtered on pc.id
-      window.WebrtcGlobalInformation.getLogging('', logs => {
+      window.WebrtcGlobalInformation.getLogging("", logs => {
         let report = convertToRTCStatsReport(internalFormat);
         let logStr = "";
         logs.forEach(s => { logStr += s + "\n"; });
@@ -1073,6 +1072,7 @@
              MozLoopServiceInternal.initialRegistrationDelayMilliseconds);
 };
 
+let gServiceInitialized = false;
 
 /**
  * Public API
@@ -1090,10 +1090,21 @@
     };
   },
 
+  /**
+   * Used to override the initalize timer function for test purposes.
+   */
   set initializeTimerFunc(value) {
     gInitializeTimerFunc = value;
   },
 
+  /**
+   * Used to reset if the service has been initialized or not - for test
+   * purposes.
+   */
+  resetServiceInitialized: function() {
+    gServiceInitialized = false;
+  },
+
   get roomsParticipantsCount() {
     return LoopRooms.participantsCount;
   },
@@ -1102,9 +1113,18 @@
    * Initialized the loop service, and starts registration with the
    * push and loop servers.
    *
+   * Note: this returns a promise for unit test purposes.
+   *
    * @return {Promise}
    */
   initialize: Task.async(function*() {
+    // Ensure we don't setup things like listeners more than once.
+    if (gServiceInitialized) {
+      return Promise.resolve();
+    }
+
+    gServiceInitialized = true;
+
     // Do this here, rather than immediately after definition, so that we can
     // stub out API functions for unit testing
     Object.freeze(this);
@@ -1349,9 +1369,10 @@
           return;
         }
 
-        // XXX If we don't have a key for FxA yet, then simply reject for now.
-        // We'll create some sign-in/sign-out UX in bug 1153788.
-        reject(new Error("FxA re-register not implemented"));
+        // This should generally never happen, but its not really possible
+        // for us to force reauth from here in a sensible way for the user.
+        // So we'll just have to flag it the best we can.
+        reject(new Error("No FxA key available"));
         return;
       }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/css/webapp.css firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/css/webapp.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/css/webapp.css	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/css/webapp.css	2015-05-25 20:42:46.000000000 +0000
@@ -292,6 +292,30 @@
   display: none;
 }
 
+/**
+ * The .text-chat-* styles are very temporarily whilst we work on text chat
+ * (bug 1108892 and dependencies).
+ */
+.text-chat-view {
+  height: 60px;
+  color: white;
+}
+
+.text-chat-entries {
+  /* XXX Should use flex, this is just for the initial implementation. */
+  height: calc(100% - 2em);
+  width: 30%;
+}
+
+.text-chat-box {
+  width: 30%;
+  margin: auto;
+}
+
+.text-chat-box > form > input {
+  width: 100%;
+}
+
 @media screen and (max-width:640px) {
   .standalone .ended-conversation .feedback {
     width: 92%;
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/favicon.ico and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/favicon.ico differ
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/img/gum-chrome.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/img/gum-chrome.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/img/gum-chrome.svg	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/img/gum-chrome.svg	2015-05-25 20:42:46.000000000 +0000
@@ -1,22 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="102px" height="62px" viewBox="0 0 102 62" version="1.1" xmlns="http://www.w3.org/2000/svg">
-  <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-    <g transform="translate(0.500000, 0.000000)">
-      <rect stroke="#ABE6F8" fill="#FFFFFF" x="0.5" y="1" width="100" height="60"/>
-      <path d="M36.4003,3 L39.02,9.66666667 L34.8325,9.66666667 L5.6875,9.66666667 L1.5,9.66666667 L4.1197,3 L36.4003,3 Z" fill="#AAE5F9"/>
-      <rect fill="#AAE5F9" x="0.5" y="9" width="100" height="10"/>
-      <path d="M21.004515,11.3333333 C19.6213095,11.3333333 18.5,12.4429954 18.5,13.8333333 L18.5,13.8333333 C18.5,15.2140452 19.6250227,16.3333333 21.0055946,16.3333333 L40.8816964,16.3333333 L90.002759,16.3333333 C91.3819471,16.3333333 92.5,15.2236713 92.5,13.8333333 L92.5,13.8333333 C92.5,12.4526215 91.3819191,11.3333333 89.995485,11.3333333 L21.004515,11.3333333 Z" fill="#FFFFFF"/>
-      <rect stroke="#ABE6F8" x="0" y="0" width="101" height="62"/>
-      <g transform="translate(0.000000, 18.000000)">
-        <rect stroke="#92CB3E" stroke-width="2" fill="#FFFFFF" x="0.5" y="0" width="100" height="10"/>
-        <path d="M89.5096131,3 C88.3997344,3 87.5,3.88772964 87.5,5 L87.5,5 C87.5,6.1045695 88.3933569,7 89.4971942,7 L88.5360952,7 C89.6426425,7 91.4357226,7 92.5331547,7 L95.5533191,7 C96.6560555,7 97.55,6.11227036 97.55,5 L97.55,5 C97.55,3.8954305 96.6581295,3 95.5403869,3 L89.5096131,3 Z" stroke="#92CB3E" fill="#FFFFFF"/>
-        <path d="M78.5096131,3 C77.3997344,3 76.5,3.88772964 76.5,5 L76.5,5 C76.5,6.1045695 77.3933569,7 78.4971942,7 L77.5360952,7 C78.6426425,7 80.4357226,7 81.5331547,7 L84.5533191,7 C85.6560555,7 86.55,6.11227036 86.55,5 L86.55,5 C86.55,3.8954305 85.6581295,3 84.5403869,3 L78.5096131,3 Z" stroke="#92CB3E" fill="#FFFFFF"/>
-        <path d="M8.5,3.69642857 L8.5,6.73214286 C8.5,6.81026825 8.46372804,6.86514121 8.39118304,6.89676339 C8.36700137,6.90606403 8.34375011,6.91071429 8.32142857,6.91071429 C8.27120511,6.91071429 8.22935285,6.89304333 8.19587054,6.85770089 L7.07142857,5.73325893 L7.07142857,6.19642857 C7.07142857,6.41778384 6.99283933,6.60704907 6.83565848,6.76422991 C6.67847764,6.92141076 6.48921242,7 6.26785714,7 L4.30357143,7 C4.08221616,7 3.89295093,6.92141076 3.73577009,6.76422991 C3.57858924,6.60704907 3.5,6.41778384 3.5,6.19642857 L3.5,4.23214286 C3.5,4.01078758 3.57858924,3.82152236 3.73577009,3.66434152 C3.89295093,3.50716067 4.08221616,3.42857143 4.30357143,3.42857143 L6.26785714,3.42857143 C6.48921242,3.42857143 6.67847764,3.50716067 6.83565848,3.66434152 C6.99283933,3.82152236 7.07142857,4.01078758 7.07142857,4.23214286 L7.07142857,4.69252232 L8.19587054,3.57087054 C8.22935285,3.5355281 8.27120511,3.51785714 8.32142857,3.51785714 C8.34375011,3.51785714 8.36700137,3.52250739 8.39118304,3.53180804 C8.46372804,3.56343022 8.5,3.61830318 8.5,3.69642857 L8.5,3.69642857 Z" fill="#00AF84"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="102px" height="62px" viewBox="0 0 102 62" xmlns="http://www.w3.org/2000/svg">
+  <g stroke="none" fill="none" fill-rule="evenodd">
+    <g transform="translate(0.5,0)">
+      <rect stroke="#abe6f8" fill="#fff" x="0.5" y="1" width="100" height="60"/>
+      <path fill="#aae5f9" d="M36.4003,3 L39.02,9.66666667 L34.8325,9.66666667 L5.6875,9.66666667 L1.5,9.66666667 L4.1197,3 L36.4003,3 Z"/>
+      <rect fill="#aae5f9" x="0.5" y="9" width="100" height="10"/>
+      <path fill="#fff" d="M21.004515,11.3333333 C19.6213095,11.3333333 18.5,12.4429954 18.5,13.8333333 L18.5,13.8333333 C18.5,15.2140452 19.6250227,16.3333333 21.0055946,16.3333333 L40.8816964,16.3333333 L90.002759,16.3333333 C91.3819471,16.3333333 92.5,15.2236713 92.5,13.8333333 L92.5,13.8333333 C92.5,12.4526215 91.3819191,11.3333333 89.995485,11.3333333 L21.004515,11.3333333 Z"/>
+      <rect stroke="#abe6f8" width="101" height="62"/>
+      <g transform="translate(0,18)">
+        <rect stroke="#92cb3e" stroke-width="2" fill="#fff" x="0.5" width="100" height="10"/>
+        <path stroke="#92cb3e" fill="#fff" d="M89.5096131,3 C88.3997344,3 87.5,3.88772964 87.5,5 L87.5,5 C87.5,6.1045695 88.3933569,7 89.4971942,7 L88.5360952,7 C89.6426425,7 91.4357226,7 92.5331547,7 L95.5533191,7 C96.6560555,7 97.55,6.11227036 97.55,5 L97.55,5 C97.55,3.8954305 96.6581295,3 95.5403869,3 L89.5096131,3 Z"/>
+        <path stroke="#92cb3e" fill="#fff" d="M78.5096131,3 C77.3997344,3 76.5,3.88772964 76.5,5 L76.5,5 C76.5,6.1045695 77.3933569,7 78.4971942,7 L77.5360952,7 C78.6426425,7 80.4357226,7 81.5331547,7 L84.5533191,7 C85.6560555,7 86.55,6.11227036 86.55,5 L86.55,5 C86.55,3.8954305 85.6581295,3 84.5403869,3 L78.5096131,3 Z"/>
+        <path fill="#00af84" d="M8.5,3.69642857 L8.5,6.73214286 C8.5,6.81026825 8.46372804,6.86514121 8.39118304,6.89676339 C8.36700137,6.90606403 8.34375011,6.91071429 8.32142857,6.91071429 C8.27120511,6.91071429 8.22935285,6.89304333 8.19587054,6.85770089 L7.07142857,5.73325893 L7.07142857,6.19642857 C7.07142857,6.41778384 6.99283933,6.60704907 6.83565848,6.76422991 C6.67847764,6.92141076 6.48921242,7 6.26785714,7 L4.30357143,7 C4.08221616,7 3.89295093,6.92141076 3.73577009,6.76422991 C3.57858924,6.60704907 3.5,6.41778384 3.5,6.19642857 L3.5,4.23214286 C3.5,4.01078758 3.57858924,3.82152236 3.73577009,3.66434152 C3.89295093,3.50716067 4.08221616,3.42857143 4.30357143,3.42857143 L6.26785714,3.42857143 C6.48921242,3.42857143 6.67847764,3.50716067 6.83565848,3.66434152 C6.99283933,3.82152236 7.07142857,4.01078758 7.07142857,4.23214286 L7.07142857,4.69252232 L8.19587054,3.57087054 C8.22935285,3.5355281 8.27120511,3.51785714 8.32142857,3.51785714 C8.34375011,3.51785714 8.36700137,3.52250739 8.39118304,3.53180804 C8.46372804,3.56343022 8.5,3.61830318 8.5,3.69642857 L8.5,3.69642857 Z"/>
       </g>
-      <path d="M97.9285714,14.5714286 L97.9285714,14.8571429 C97.9285714,14.8958335 97.9144347,14.9293153 97.8861607,14.9575893 C97.8578868,14.9858632 97.824405,15 97.7857143,15 L94.6428571,15 C94.6041665,15 94.5706847,14.9858632 94.5424107,14.9575893 C94.5141368,14.9293153 94.5,14.8958335 94.5,14.8571429 L94.5,14.5714286 C94.5,14.5327379 94.5141368,14.4992561 94.5424107,14.4709821 C94.5706847,14.4427082 94.6041665,14.4285714 94.6428571,14.4285714 L97.7857143,14.4285714 C97.824405,14.4285714 97.8578868,14.4427082 97.8861607,14.4709821 C97.9144347,14.4992561 97.9285714,14.5327379 97.9285714,14.5714286 L97.9285714,14.5714286 Z M97.9285714,13.4285714 L97.9285714,13.7142857 C97.9285714,13.7529764 97.9144347,13.7864582 97.8861607,13.8147321 C97.8578868,13.8430061 97.824405,13.8571429 97.7857143,13.8571429 L94.6428571,13.8571429 C94.6041665,13.8571429 94.5706847,13.8430061 94.5424107,13.8147321 C94.5141368,13.7864582 94.5,13.7529764 94.5,13.7142857 L94.5,13.4285714 C94.5,13.3898808 94.5141368,13.356399 94.5424107,13.328125 C94.5706847,13.299851 94.6041665,13.2857143 94.6428571,13.2857143 L97.7857143,13.2857143 C97.824405,13.2857143 97.8578868,13.299851 97.8861607,13.328125 C97.9144347,13.356399 97.9285714,13.3898808 97.9285714,13.4285714 L97.9285714,13.4285714 Z M97.9285714,12.2857143 L97.9285714,12.5714286 C97.9285714,12.6101192 97.9144347,12.643601 97.8861607,12.671875 C97.8578868,12.700149 97.824405,12.7142857 97.7857143,12.7142857 L94.6428571,12.7142857 C94.6041665,12.7142857 94.5706847,12.700149 94.5424107,12.671875 C94.5141368,12.643601 94.5,12.6101192 94.5,12.5714286 L94.5,12.2857143 C94.5,12.2470236 94.5141368,12.2135418 94.5424107,12.1852679 C94.5706847,12.1569939 94.6041665,12.1428571 94.6428571,12.1428571 L97.7857143,12.1428571 C97.824405,12.1428571 97.8578868,12.1569939 97.8861607,12.1852679 C97.9144347,12.2135418 97.9285714,12.2470236 97.9285714,12.2857143 L97.9285714,12.2857143 Z" fill="#FFFFFF"/>
-      <path d="M5.92857143,13.5714286 L5.92857143,13.8571429 C5.92857143,13.9360123 5.90439012,14.0033479 5.85602679,14.0591518 C5.80766345,14.1149556 5.74479205,14.1428571 5.66741071,14.1428571 L4.09598214,14.1428571 L4.75,14.7991071 C4.8065479,14.8526788 4.83482143,14.9196425 4.83482143,15 C4.83482143,15.0803575 4.8065479,15.1473212 4.75,15.2008929 L4.58258929,15.3705357 C4.52752949,15.4255955 4.46056587,15.453125 4.38169643,15.453125 C4.30431509,15.453125 4.23660743,15.4255955 4.17857143,15.3705357 L2.72544643,13.9151786 C2.67038663,13.8601188 2.64285714,13.7931552 2.64285714,13.7142857 C2.64285714,13.6369044 2.67038663,13.5691967 2.72544643,13.5111607 L4.17857143,12.0602679 C4.23511933,12.00372 4.30282699,11.9754464 4.38169643,11.9754464 C4.45907777,11.9754464 4.52604138,12.00372 4.58258929,12.0602679 L4.75,12.2254464 C4.8065479,12.2819943 4.83482143,12.349702 4.83482143,12.4285714 C4.83482143,12.5074409 4.8065479,12.5751485 4.75,12.6316964 L4.09598214,13.2857143 L5.66741071,13.2857143 C5.74479205,13.2857143 5.80766345,13.3136158 5.85602679,13.3694196 C5.90439012,13.4252235 5.92857143,13.4925591 5.92857143,13.5714286 L5.92857143,13.5714286 Z" fill="#FFFFFF"/>
-      <path d="M10.9285714,13.5714286 L10.9285714,13.8571429 C10.9285714,13.9360123 10.9043901,14.0033479 10.8560268,14.0591518 C10.8076634,14.1149556 10.7447921,14.1428571 10.6674107,14.1428571 L9.09598214,14.1428571 L9.75,14.7991071 C9.8065479,14.8526788 9.83482143,14.9196425 9.83482143,15 C9.83482143,15.0803575 9.8065479,15.1473212 9.75,15.2008929 L9.58258929,15.3705357 C9.52752949,15.4255955 9.46056587,15.453125 9.38169643,15.453125 C9.30431509,15.453125 9.23660743,15.4255955 9.17857143,15.3705357 L7.72544643,13.9151786 C7.67038663,13.8601188 7.64285714,13.7931552 7.64285714,13.7142857 C7.64285714,13.6369044 7.67038663,13.5691967 7.72544643,13.5111607 L9.17857143,12.0602679 C9.23511933,12.00372 9.30282699,11.9754464 9.38169643,11.9754464 C9.45907777,11.9754464 9.52604138,12.00372 9.58258929,12.0602679 L9.75,12.2254464 C9.8065479,12.2819943 9.83482143,12.349702 9.83482143,12.4285714 C9.83482143,12.5074409 9.8065479,12.5751485 9.75,12.6316964 L9.09598214,13.2857143 L10.6674107,13.2857143 C10.7447921,13.2857143 10.8076634,13.3136158 10.8560268,13.3694196 C10.9043901,13.4252235 10.9285714,13.4925591 10.9285714,13.5714286 L10.9285714,13.5714286 Z" fill="#FFFFFF" transform="translate(9.285714, 13.714286) scale(-1, 1) translate(-9.285714, -13.714286) "/>
-      <path d="M16.9285714,12.1428571 L16.9285714,13.1428571 C16.9285714,13.1815478 16.9144347,13.2150296 16.8861607,13.2433036 C16.8578868,13.2715775 16.824405,13.2857143 16.7857143,13.2857143 L15.7857143,13.2857143 C15.723214,13.2857143 15.6793156,13.2559527 15.6540179,13.1964286 C15.6287201,13.1383926 15.6391367,13.0870538 15.6852679,13.0424107 L15.9933036,12.734375 C15.7730644,12.5305049 15.5133944,12.4285714 15.2142857,12.4285714 C15.059523,12.4285714 14.9118311,12.4587051 14.7712054,12.5189732 C14.6305797,12.5792414 14.5089291,12.6607138 14.40625,12.7633929 C14.3035709,12.8660719 14.2220985,12.9877225 14.1618304,13.1283482 C14.1015622,13.2689739 14.0714286,13.4166659 14.0714286,13.5714286 C14.0714286,13.7261912 14.1015622,13.8738832 14.1618304,14.0145089 C14.2220985,14.1551346 14.3035709,14.2767852 14.40625,14.3794643 C14.5089291,14.4821434 14.6305797,14.5636158 14.7712054,14.6238839 C14.9118311,14.6841521 15.059523,14.7142857 15.2142857,14.7142857 C15.3913699,14.7142857 15.558779,14.6755956 15.7165179,14.5982143 C15.8742567,14.5208329 16.0074399,14.411459 16.1160714,14.2700893 C16.1264881,14.2552083 16.1436011,14.2462798 16.1674107,14.2433036 C16.1882442,14.2433036 16.2068452,14.2499999 16.2232143,14.2633929 L16.5290179,14.5714286 C16.5424108,14.5833334 16.5494792,14.5985862 16.5502232,14.6171875 C16.5509673,14.6357888 16.545387,14.6525297 16.5334821,14.6674107 C16.371279,14.8638403 16.1748523,15.0159965 15.9441964,15.1238839 C15.7135405,15.2317714 15.4702394,15.2857143 15.2142857,15.2857143 C14.9821417,15.2857143 14.7604177,15.2403278 14.5491071,15.1495536 C14.3377966,15.0587793 14.1555067,14.9367567 14.0022321,14.7834821 C13.8489576,14.6302076 13.726935,14.4479177 13.6361607,14.2366071 C13.5453865,14.0252966 13.5,13.8035726 13.5,13.5714286 C13.5,13.3392846 13.5453865,13.1175606 13.6361607,12.90625 C13.726935,12.6949394 13.8489576,12.5126496 14.0022321,12.359375 C14.1555067,12.2061004 14.3377966,12.0840778 14.5491071,11.9933036 C14.7604177,11.9025293 14.9821417,11.8571429 15.2142857,11.8571429 C15.4330368,11.8571429 15.6447162,11.8984371 15.8493304,11.9810268 C16.0539445,12.0636165 16.2358623,12.1800588 16.3950893,12.3303571 L16.6852679,12.0424107 C16.7284228,11.9962795 16.7805056,11.985863 16.8415179,12.0111607 C16.8995539,12.0364585 16.9285714,12.0803568 16.9285714,12.1428571 L16.9285714,12.1428571 Z" fill="#FFFFFF"/>
+      <path fill="#fff" d="M97.9285714,14.5714286 L97.9285714,14.8571429 C97.9285714,14.8958335 97.9144347,14.9293153 97.8861607,14.9575893 C97.8578868,14.9858632 97.824405,15 97.7857143,15 L94.6428571,15 C94.6041665,15 94.5706847,14.9858632 94.5424107,14.9575893 C94.5141368,14.9293153 94.5,14.8958335 94.5,14.8571429 L94.5,14.5714286 C94.5,14.5327379 94.5141368,14.4992561 94.5424107,14.4709821 C94.5706847,14.4427082 94.6041665,14.4285714 94.6428571,14.4285714 L97.7857143,14.4285714 C97.824405,14.4285714 97.8578868,14.4427082 97.8861607,14.4709821 C97.9144347,14.4992561 97.9285714,14.5327379 97.9285714,14.5714286 L97.9285714,14.5714286 Z M97.9285714,13.4285714 L97.9285714,13.7142857 C97.9285714,13.7529764 97.9144347,13.7864582 97.8861607,13.8147321 C97.8578868,13.8430061 97.824405,13.8571429 97.7857143,13.8571429 L94.6428571,13.8571429 C94.6041665,13.8571429 94.5706847,13.8430061 94.5424107,13.8147321 C94.5141368,13.7864582 94.5,13.7529764 94.5,13.7142857 L94.5,13.4285714 C94.5,13.3898808 94.5141368,13.356399 94.5424107,13.328125 C94.5706847,13.299851 94.6041665,13.2857143 94.6428571,13.2857143 L97.7857143,13.2857143 C97.824405,13.2857143 97.8578868,13.299851 97.8861607,13.328125 C97.9144347,13.356399 97.9285714,13.3898808 97.9285714,13.4285714 L97.9285714,13.4285714 Z M97.9285714,12.2857143 L97.9285714,12.5714286 C97.9285714,12.6101192 97.9144347,12.643601 97.8861607,12.671875 C97.8578868,12.700149 97.824405,12.7142857 97.7857143,12.7142857 L94.6428571,12.7142857 C94.6041665,12.7142857 94.5706847,12.700149 94.5424107,12.671875 C94.5141368,12.643601 94.5,12.6101192 94.5,12.5714286 L94.5,12.2857143 C94.5,12.2470236 94.5141368,12.2135418 94.5424107,12.1852679 C94.5706847,12.1569939 94.6041665,12.1428571 94.6428571,12.1428571 L97.7857143,12.1428571 C97.824405,12.1428571 97.8578868,12.1569939 97.8861607,12.1852679 C97.9144347,12.2135418 97.9285714,12.2470236 97.9285714,12.2857143 L97.9285714,12.2857143 Z"/>
+      <path fill="#fff" d="M5.92857143,13.5714286 L5.92857143,13.8571429 C5.92857143,13.9360123 5.90439012,14.0033479 5.85602679,14.0591518 C5.80766345,14.1149556 5.74479205,14.1428571 5.66741071,14.1428571 L4.09598214,14.1428571 L4.75,14.7991071 C4.8065479,14.8526788 4.83482143,14.9196425 4.83482143,15 C4.83482143,15.0803575 4.8065479,15.1473212 4.75,15.2008929 L4.58258929,15.3705357 C4.52752949,15.4255955 4.46056587,15.453125 4.38169643,15.453125 C4.30431509,15.453125 4.23660743,15.4255955 4.17857143,15.3705357 L2.72544643,13.9151786 C2.67038663,13.8601188 2.64285714,13.7931552 2.64285714,13.7142857 C2.64285714,13.6369044 2.67038663,13.5691967 2.72544643,13.5111607 L4.17857143,12.0602679 C4.23511933,12.00372 4.30282699,11.9754464 4.38169643,11.9754464 C4.45907777,11.9754464 4.52604138,12.00372 4.58258929,12.0602679 L4.75,12.2254464 C4.8065479,12.2819943 4.83482143,12.349702 4.83482143,12.4285714 C4.83482143,12.5074409 4.8065479,12.5751485 4.75,12.6316964 L4.09598214,13.2857143 L5.66741071,13.2857143 C5.74479205,13.2857143 5.80766345,13.3136158 5.85602679,13.3694196 C5.90439012,13.4252235 5.92857143,13.4925591 5.92857143,13.5714286 L5.92857143,13.5714286 Z"/>
+      <path fill="#fff" d="M10.9285714,13.5714286 L10.9285714,13.8571429 C10.9285714,13.9360123 10.9043901,14.0033479 10.8560268,14.0591518 C10.8076634,14.1149556 10.7447921,14.1428571 10.6674107,14.1428571 L9.09598214,14.1428571 L9.75,14.7991071 C9.8065479,14.8526788 9.83482143,14.9196425 9.83482143,15 C9.83482143,15.0803575 9.8065479,15.1473212 9.75,15.2008929 L9.58258929,15.3705357 C9.52752949,15.4255955 9.46056587,15.453125 9.38169643,15.453125 C9.30431509,15.453125 9.23660743,15.4255955 9.17857143,15.3705357 L7.72544643,13.9151786 C7.67038663,13.8601188 7.64285714,13.7931552 7.64285714,13.7142857 C7.64285714,13.6369044 7.67038663,13.5691967 7.72544643,13.5111607 L9.17857143,12.0602679 C9.23511933,12.00372 9.30282699,11.9754464 9.38169643,11.9754464 C9.45907777,11.9754464 9.52604138,12.00372 9.58258929,12.0602679 L9.75,12.2254464 C9.8065479,12.2819943 9.83482143,12.349702 9.83482143,12.4285714 C9.83482143,12.5074409 9.8065479,12.5751485 9.75,12.6316964 L9.09598214,13.2857143 L10.6674107,13.2857143 C10.7447921,13.2857143 10.8076634,13.3136158 10.8560268,13.3694196 C10.9043901,13.4252235 10.9285714,13.4925591 10.9285714,13.5714286 L10.9285714,13.5714286 Z" transform="translate(9.285714, 13.714286) scale(-1, 1) translate(-9.285714, -13.714286) "/>
+      <path fill="#fff" d="M16.9285714,12.1428571 L16.9285714,13.1428571 C16.9285714,13.1815478 16.9144347,13.2150296 16.8861607,13.2433036 C16.8578868,13.2715775 16.824405,13.2857143 16.7857143,13.2857143 L15.7857143,13.2857143 C15.723214,13.2857143 15.6793156,13.2559527 15.6540179,13.1964286 C15.6287201,13.1383926 15.6391367,13.0870538 15.6852679,13.0424107 L15.9933036,12.734375 C15.7730644,12.5305049 15.5133944,12.4285714 15.2142857,12.4285714 C15.059523,12.4285714 14.9118311,12.4587051 14.7712054,12.5189732 C14.6305797,12.5792414 14.5089291,12.6607138 14.40625,12.7633929 C14.3035709,12.8660719 14.2220985,12.9877225 14.1618304,13.1283482 C14.1015622,13.2689739 14.0714286,13.4166659 14.0714286,13.5714286 C14.0714286,13.7261912 14.1015622,13.8738832 14.1618304,14.0145089 C14.2220985,14.1551346 14.3035709,14.2767852 14.40625,14.3794643 C14.5089291,14.4821434 14.6305797,14.5636158 14.7712054,14.6238839 C14.9118311,14.6841521 15.059523,14.7142857 15.2142857,14.7142857 C15.3913699,14.7142857 15.558779,14.6755956 15.7165179,14.5982143 C15.8742567,14.5208329 16.0074399,14.411459 16.1160714,14.2700893 C16.1264881,14.2552083 16.1436011,14.2462798 16.1674107,14.2433036 C16.1882442,14.2433036 16.2068452,14.2499999 16.2232143,14.2633929 L16.5290179,14.5714286 C16.5424108,14.5833334 16.5494792,14.5985862 16.5502232,14.6171875 C16.5509673,14.6357888 16.545387,14.6525297 16.5334821,14.6674107 C16.371279,14.8638403 16.1748523,15.0159965 15.9441964,15.1238839 C15.7135405,15.2317714 15.4702394,15.2857143 15.2142857,15.2857143 C14.9821417,15.2857143 14.7604177,15.2403278 14.5491071,15.1495536 C14.3377966,15.0587793 14.1555067,14.9367567 14.0022321,14.7834821 C13.8489576,14.6302076 13.726935,14.4479177 13.6361607,14.2366071 C13.5453865,14.0252966 13.5,13.8035726 13.5,13.5714286 C13.5,13.3392846 13.5453865,13.1175606 13.6361607,12.90625 C13.726935,12.6949394 13.8489576,12.5126496 14.0022321,12.359375 C14.1555067,12.2061004 14.3377966,12.0840778 14.5491071,11.9933036 C14.7604177,11.9025293 14.9821417,11.8571429 15.2142857,11.8571429 C15.4330368,11.8571429 15.6447162,11.8984371 15.8493304,11.9810268 C16.0539445,12.0636165 16.2358623,12.1800588 16.3950893,12.3303571 L16.6852679,12.0424107 C16.7284228,11.9962795 16.7805056,11.985863 16.8415179,12.0111607 C16.8995539,12.0364585 16.9285714,12.0803568 16.9285714,12.1428571 L16.9285714,12.1428571 Z"/>
     </g>
   </g>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/img/gum-firefox.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/img/gum-firefox.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/img/gum-firefox.svg	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/img/gum-firefox.svg	2015-05-25 20:42:46.000000000 +0000
@@ -1,28 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="102px" height="62px" viewBox="0 0 102 62" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <defs>
-    <path d="M39.565,8.00739557 C39.4896406,8.00249919 39.4115419,8 39.3306224,8 C35.3657519,8 37.8823812,2 33.0112546,2 L7.18295591,2 C2.59740823,2 4.61972552,7.31710024 1.565,7.94055011 L1.565,7.94055011 L1.565,14 L15.5658248,14 L39.565,14 L39.565,8.00739557 Z" id="path-1"/>
-  </defs>
-  <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-    <g transform="translate(0.500000, 0.000000)">
-      <g transform="translate(0.000000, 1.000000)">
-        <rect stroke="#ABE6F8" fill="#FFFFFF" x="0.565" y="0" width="100" height="60"/>
-        <g>
-          <use fill="#AAE5F9" fill-rule="evenodd" xlink:href="#path-1"/>
-          <use fill="none" xlink:href="#path-1"/>
-          <use fill="none" xlink:href="#path-1"/>
-        </g>
-        <rect fill="#ABE6F8" x="0.565" y="7" width="99.685" height="10"/>
-        <path d="M8.07491535,9.33333333 C6.68872738,9.33333333 5.565,10.4429954 5.565,11.8333333 L5.565,11.8333333 C5.565,13.2140452 6.68484687,14.3333333 8.05891597,14.3333333 L31.8786161,14.3333333 L90.0705787,14.3333333 C91.4482095,14.3333333 92.565,13.2236713 92.565,11.8333333 L92.565,11.8333333 C92.565,10.4526215 91.4491428,9.33333333 90.0550846,9.33333333 L8.07491535,9.33333333 Z" fill="#FFFFFF"/>
-        <ellipse stroke="#FFFFFF" fill="#AAE5F9" cx="5.565" cy="12" rx="3" ry="3"/>
-        <path d="M16.2240909,16.6938776 L44.5630004,16.6938776 C45.6668839,16.6938776 46.565,17.5893929 46.565,18.6940672 L46.565,44.9998104 C46.565,46.1094081 45.6686743,47 44.5630004,47 L5.56699958,47 C4.46311611,47 3.565,46.1044846 3.565,44.9998104 L3.565,18.6940672 C3.565,17.5844694 4.46132574,16.6938776 5.56699958,16.6938776 L8.40590909,16.6938776 L12.315,14 L16.2240909,16.6938776 Z" stroke="#92CB3E" stroke-width="2" fill="#FFFFFF"/>
-        <path d="M25.0575753,38 C23.680964,38 22.565,39.1096621 22.565,40.5 L22.565,40.5 C22.565,41.8807119 23.6941328,43 25.0722854,43 L26.115167,43 C27.4952935,43 29.7367265,43 31.1231981,43 L40.0643408,43 C41.4454167,43 42.565,41.8903379 42.565,40.5 L42.565,40.5 C42.565,39.1192881 41.4468578,38 40.0724247,38 L25.0575753,38 Z" stroke="#92CB3E" fill="#FFFFFF"/>
-        <path d="M17.565,22.3928571 L17.565,28.4642857 C17.565,28.6205365 17.4924561,28.7302824 17.3473661,28.7935268 C17.2990027,28.8121281 17.2525002,28.8214286 17.2078571,28.8214286 C17.1074102,28.8214286 17.0237057,28.7860867 16.9567411,28.7154018 L14.7078571,26.4665179 L14.7078571,27.3928571 C14.7078571,27.8355677 14.5506787,28.2140981 14.236317,28.5284598 C13.9219553,28.8428215 13.5434248,29 13.1007143,29 L9.17214286,29 C8.72943231,29 8.35090187,28.8428215 8.03654018,28.5284598 C7.72217849,28.2140981 7.565,27.8355677 7.565,27.3928571 L7.565,23.4642857 C7.565,23.0215752 7.72217849,22.6430447 8.03654018,22.328683 C8.35090187,22.0143213 8.72943231,21.8571429 9.17214286,21.8571429 L13.1007143,21.8571429 C13.5434248,21.8571429 13.9219553,22.0143213 14.236317,22.328683 C14.5506787,22.6430447 14.7078571,23.0215752 14.7078571,23.4642857 L14.7078571,24.3850446 L16.9567411,22.1417411 C17.0237057,22.0710562 17.1074102,22.0357143 17.2078571,22.0357143 C17.2525002,22.0357143 17.2990027,22.0450148 17.3473661,22.0636161 C17.4924561,22.1268604 17.565,22.2366064 17.565,22.3928571 L17.565,22.3928571 Z" fill="#00AF84"/>
-        <path d="M13.565,11.0178571 L13.565,12.8392857 C13.565,12.8861609 13.5432368,12.9190847 13.4997098,12.938058 C13.4852008,12.9436384 13.4712501,12.9464286 13.4578571,12.9464286 C13.4277231,12.9464286 13.4026117,12.935826 13.3825223,12.9146205 L12.7078571,12.2399554 L12.7078571,12.5178571 C12.7078571,12.6506703 12.6607036,12.7642294 12.5663951,12.8585379 C12.4720866,12.9528465 12.3585274,13 12.2257143,13 L11.0471429,13 C10.9143297,13 10.8007706,12.9528465 10.7064621,12.8585379 C10.6121535,12.7642294 10.565,12.6506703 10.565,12.5178571 L10.565,11.3392857 C10.565,11.2064726 10.6121535,11.0929134 10.7064621,10.9986049 C10.8007706,10.9042964 10.9143297,10.8571429 11.0471429,10.8571429 L12.2257143,10.8571429 C12.3585274,10.8571429 12.4720866,10.9042964 12.5663951,10.9986049 C12.6607036,11.0929134 12.7078571,11.2064726 12.7078571,11.3392857 L12.7078571,11.6155134 L13.3825223,10.9425223 C13.4026117,10.9213169 13.4277231,10.9107143 13.4578571,10.9107143 C13.4712501,10.9107143 13.4852008,10.9135044 13.4997098,10.9190848 C13.5432368,10.9380581 13.565,10.9709819 13.565,11.0178571 L13.565,11.0178571 Z" fill="#00AF84"/>
-        <path d="M6.86418806,12.1429618 C6.86418806,12.2021139 6.84605208,12.2526156 6.80977958,12.2944685 C6.77350707,12.3363214 6.72635353,12.3572475 6.66831752,12.3572475 L5.48974609,12.3572475 L5.98025949,12.849435 C6.02267041,12.8896138 6.04387556,12.9398365 6.04387556,13.0001046 C6.04387556,13.0603728 6.02267041,13.1105955 5.98025949,13.1507743 L5.85470145,13.2780064 C5.8134066,13.3193013 5.76318389,13.3399484 5.70403181,13.3399484 C5.6459958,13.3399484 5.59521506,13.3193013 5.55168806,13.2780064 L4.46184431,12.1864886 C4.42054946,12.1451937 4.39990234,12.094971 4.39990234,12.0358189 C4.39990234,11.9777829 4.42054946,11.9270022 4.46184431,11.8834752 L5.55168806,10.7953055 C5.59409898,10.7528946 5.64487973,10.7316895 5.70403181,10.7316895 C5.76206781,10.7316895 5.81229052,10.7528946 5.85470145,10.7953055 L5.98025949,10.9191895 C6.02267041,10.9616004 6.04387556,11.0123811 6.04387556,11.0715332 C6.04387556,11.1306853 6.02267041,11.181466 5.98025949,11.223877 L5.48974609,11.7143903 L6.66831752,11.7143903 C6.72635353,11.7143903 6.77350707,11.7353165 6.80977958,11.7771694 C6.84605208,11.8190223 6.86418806,11.869524 6.86418806,11.9286761 L6.86418806,12.1429618 Z" fill="#FFFFFF"/>
-        <path d="M97.1364286,12.6785714 L97.1364286,12.8928571 C97.1364286,12.9218751 97.125826,12.9469865 97.1046205,12.968192 C97.0834151,12.9893974 97.0583037,13 97.0292857,13 L94.6721429,13 C94.6431249,13 94.6180135,12.9893974 94.596808,12.968192 C94.5756026,12.9469865 94.565,12.9218751 94.565,12.8928571 L94.565,12.6785714 C94.565,12.6495534 94.5756026,12.6244421 94.596808,12.6032366 C94.6180135,12.5820311 94.6431249,12.5714286 94.6721429,12.5714286 L97.0292857,12.5714286 C97.0583037,12.5714286 97.0834151,12.5820311 97.1046205,12.6032366 C97.125826,12.6244421 97.1364286,12.6495534 97.1364286,12.6785714 L97.1364286,12.6785714 Z M97.1364286,11.8214286 L97.1364286,12.0357143 C97.1364286,12.0647323 97.125826,12.0898436 97.1046205,12.1110491 C97.0834151,12.1322546 97.0583037,12.1428571 97.0292857,12.1428571 L94.6721429,12.1428571 C94.6431249,12.1428571 94.6180135,12.1322546 94.596808,12.1110491 C94.5756026,12.0898436 94.565,12.0647323 94.565,12.0357143 L94.565,11.8214286 C94.565,11.7924106 94.5756026,11.7672992 94.596808,11.7460937 C94.6180135,11.7248883 94.6431249,11.7142857 94.6721429,11.7142857 L97.0292857,11.7142857 C97.0583037,11.7142857 97.0834151,11.7248883 97.1046205,11.7460937 C97.125826,11.7672992 97.1364286,11.7924106 97.1364286,11.8214286 L97.1364286,11.8214286 Z M97.1364286,10.9642857 L97.1364286,11.1785714 C97.1364286,11.2075894 97.125826,11.2327008 97.1046205,11.2539062 C97.0834151,11.2751117 97.0583037,11.2857143 97.0292857,11.2857143 L94.6721429,11.2857143 C94.6431249,11.2857143 94.6180135,11.2751117 94.596808,11.2539062 C94.5756026,11.2327008 94.565,11.2075894 94.565,11.1785714 L94.565,10.9642857 C94.565,10.9352677 94.5756026,10.9101564 94.596808,10.8889509 C94.6180135,10.8677454 94.6431249,10.8571429 94.6721429,10.8571429 L97.0292857,10.8571429 C97.0583037,10.8571429 97.0834151,10.8677454 97.1046205,10.8889509 C97.125826,10.9101564 97.1364286,10.9352677 97.1364286,10.9642857 L97.1364286,10.9642857 Z" fill="#FFFFFF"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="102px" height="62px" viewBox="0 0 102 62" xmlns="http://www.w3.org/2000/svg">
+  <g stroke="none" fill="none" fill-rule="evenodd">
+    <g transform="translate(0.5,0.0)">
+      <g transform="translate(0,1)">
+        <rect stroke="#abe6f8" fill="#fff" x="0.565" width="100" height="60"/>
+        <path fill="#aae5f9" fill-rule="evenodd" d="M39.565,8.00739557 C39.4896406,8.00249919 39.4115419,8 39.3306224,8 C35.3657519,8 37.8823812,2 33.0112546,2 L7.18295591,2 C2.59740823,2 4.61972552,7.31710024 1.565,7.94055011 L1.565,7.94055011 L1.565,14 L15.5658248,14 L39.565,14 L39.565,8.00739557 Z"/>
+        <rect fill="#abe6f8" x="0.565" y="7" width="99.685" height="10"/>
+        <path fill="#fff" d="M8.07491535,9.33333333 C6.68872738,9.33333333 5.565,10.4429954 5.565,11.8333333 L5.565,11.8333333 C5.565,13.2140452 6.68484687,14.3333333 8.05891597,14.3333333 L31.8786161,14.3333333 L90.0705787,14.3333333 C91.4482095,14.3333333 92.565,13.2236713 92.565,11.8333333 L92.565,11.8333333 C92.565,10.4526215 91.4491428,9.33333333 90.0550846,9.33333333 L8.07491535,9.33333333 Z"/>
+        <ellipse stroke="#fff" fill="#aae5f9" cx="5.565" cy="12" rx="3" ry="3"/>
+        <path stroke="#92cb3e" stroke-width="2" fill="#fff" d="M16.2240909,16.6938776 L44.5630004,16.6938776 C45.6668839,16.6938776 46.565,17.5893929 46.565,18.6940672 L46.565,44.9998104 C46.565,46.1094081 45.6686743,47 44.5630004,47 L5.56699958,47 C4.46311611,47 3.565,46.1044846 3.565,44.9998104 L3.565,18.6940672 C3.565,17.5844694 4.46132574,16.6938776 5.56699958,16.6938776 L8.40590909,16.6938776 L12.315,14 L16.2240909,16.6938776 Z"/>
+        <path stroke="#92cb3e" fill="#fff" d="M25.0575753,38 C23.680964,38 22.565,39.1096621 22.565,40.5 L22.565,40.5 C22.565,41.8807119 23.6941328,43 25.0722854,43 L26.115167,43 C27.4952935,43 29.7367265,43 31.1231981,43 L40.0643408,43 C41.4454167,43 42.565,41.8903379 42.565,40.5 L42.565,40.5 C42.565,39.1192881 41.4468578,38 40.0724247,38 L25.0575753,38 Z"/>
+        <path fill="#00af84" d="M17.565,22.3928571 L17.565,28.4642857 C17.565,28.6205365 17.4924561,28.7302824 17.3473661,28.7935268 C17.2990027,28.8121281 17.2525002,28.8214286 17.2078571,28.8214286 C17.1074102,28.8214286 17.0237057,28.7860867 16.9567411,28.7154018 L14.7078571,26.4665179 L14.7078571,27.3928571 C14.7078571,27.8355677 14.5506787,28.2140981 14.236317,28.5284598 C13.9219553,28.8428215 13.5434248,29 13.1007143,29 L9.17214286,29 C8.72943231,29 8.35090187,28.8428215 8.03654018,28.5284598 C7.72217849,28.2140981 7.565,27.8355677 7.565,27.3928571 L7.565,23.4642857 C7.565,23.0215752 7.72217849,22.6430447 8.03654018,22.328683 C8.35090187,22.0143213 8.72943231,21.8571429 9.17214286,21.8571429 L13.1007143,21.8571429 C13.5434248,21.8571429 13.9219553,22.0143213 14.236317,22.328683 C14.5506787,22.6430447 14.7078571,23.0215752 14.7078571,23.4642857 L14.7078571,24.3850446 L16.9567411,22.1417411 C17.0237057,22.0710562 17.1074102,22.0357143 17.2078571,22.0357143 C17.2525002,22.0357143 17.2990027,22.0450148 17.3473661,22.0636161 C17.4924561,22.1268604 17.565,22.2366064 17.565,22.3928571 L17.565,22.3928571 Z"/>
+        <path fill="#00af84" d="M13.565,11.0178571 L13.565,12.8392857 C13.565,12.8861609 13.5432368,12.9190847 13.4997098,12.938058 C13.4852008,12.9436384 13.4712501,12.9464286 13.4578571,12.9464286 C13.4277231,12.9464286 13.4026117,12.935826 13.3825223,12.9146205 L12.7078571,12.2399554 L12.7078571,12.5178571 C12.7078571,12.6506703 12.6607036,12.7642294 12.5663951,12.8585379 C12.4720866,12.9528465 12.3585274,13 12.2257143,13 L11.0471429,13 C10.9143297,13 10.8007706,12.9528465 10.7064621,12.8585379 C10.6121535,12.7642294 10.565,12.6506703 10.565,12.5178571 L10.565,11.3392857 C10.565,11.2064726 10.6121535,11.0929134 10.7064621,10.9986049 C10.8007706,10.9042964 10.9143297,10.8571429 11.0471429,10.8571429 L12.2257143,10.8571429 C12.3585274,10.8571429 12.4720866,10.9042964 12.5663951,10.9986049 C12.6607036,11.0929134 12.7078571,11.2064726 12.7078571,11.3392857 L12.7078571,11.6155134 L13.3825223,10.9425223 C13.4026117,10.9213169 13.4277231,10.9107143 13.4578571,10.9107143 C13.4712501,10.9107143 13.4852008,10.9135044 13.4997098,10.9190848 C13.5432368,10.9380581 13.565,10.9709819 13.565,11.0178571 L13.565,11.0178571 Z"/>
+        <path fill="#fff" d="M6.86418806,12.1429618 C6.86418806,12.2021139 6.84605208,12.2526156 6.80977958,12.2944685 C6.77350707,12.3363214 6.72635353,12.3572475 6.66831752,12.3572475 L5.48974609,12.3572475 L5.98025949,12.849435 C6.02267041,12.8896138 6.04387556,12.9398365 6.04387556,13.0001046 C6.04387556,13.0603728 6.02267041,13.1105955 5.98025949,13.1507743 L5.85470145,13.2780064 C5.8134066,13.3193013 5.76318389,13.3399484 5.70403181,13.3399484 C5.6459958,13.3399484 5.59521506,13.3193013 5.55168806,13.2780064 L4.46184431,12.1864886 C4.42054946,12.1451937 4.39990234,12.094971 4.39990234,12.0358189 C4.39990234,11.9777829 4.42054946,11.9270022 4.46184431,11.8834752 L5.55168806,10.7953055 C5.59409898,10.7528946 5.64487973,10.7316895 5.70403181,10.7316895 C5.76206781,10.7316895 5.81229052,10.7528946 5.85470145,10.7953055 L5.98025949,10.9191895 C6.02267041,10.9616004 6.04387556,11.0123811 6.04387556,11.0715332 C6.04387556,11.1306853 6.02267041,11.181466 5.98025949,11.223877 L5.48974609,11.7143903 L6.66831752,11.7143903 C6.72635353,11.7143903 6.77350707,11.7353165 6.80977958,11.7771694 C6.84605208,11.8190223 6.86418806,11.869524 6.86418806,11.9286761 L6.86418806,12.1429618 Z"/>
+        <path fill="#fff" d="M97.1364286,12.6785714 L97.1364286,12.8928571 C97.1364286,12.9218751 97.125826,12.9469865 97.1046205,12.968192 C97.0834151,12.9893974 97.0583037,13 97.0292857,13 L94.6721429,13 C94.6431249,13 94.6180135,12.9893974 94.596808,12.968192 C94.5756026,12.9469865 94.565,12.9218751 94.565,12.8928571 L94.565,12.6785714 C94.565,12.6495534 94.5756026,12.6244421 94.596808,12.6032366 C94.6180135,12.5820311 94.6431249,12.5714286 94.6721429,12.5714286 L97.0292857,12.5714286 C97.0583037,12.5714286 97.0834151,12.5820311 97.1046205,12.6032366 C97.125826,12.6244421 97.1364286,12.6495534 97.1364286,12.6785714 L97.1364286,12.6785714 Z M97.1364286,11.8214286 L97.1364286,12.0357143 C97.1364286,12.0647323 97.125826,12.0898436 97.1046205,12.1110491 C97.0834151,12.1322546 97.0583037,12.1428571 97.0292857,12.1428571 L94.6721429,12.1428571 C94.6431249,12.1428571 94.6180135,12.1322546 94.596808,12.1110491 C94.5756026,12.0898436 94.565,12.0647323 94.565,12.0357143 L94.565,11.8214286 C94.565,11.7924106 94.5756026,11.7672992 94.596808,11.7460937 C94.6180135,11.7248883 94.6431249,11.7142857 94.6721429,11.7142857 L97.0292857,11.7142857 C97.0583037,11.7142857 97.0834151,11.7248883 97.1046205,11.7460937 C97.125826,11.7672992 97.1364286,11.7924106 97.1364286,11.8214286 L97.1364286,11.8214286 Z M97.1364286,10.9642857 L97.1364286,11.1785714 C97.1364286,11.2075894 97.125826,11.2327008 97.1046205,11.2539062 C97.0834151,11.2751117 97.0583037,11.2857143 97.0292857,11.2857143 L94.6721429,11.2857143 C94.6431249,11.2857143 94.6180135,11.2751117 94.596808,11.2539062 C94.5756026,11.2327008 94.565,11.2075894 94.565,11.1785714 L94.565,10.9642857 C94.565,10.9352677 94.5756026,10.9101564 94.596808,10.8889509 C94.6180135,10.8677454 94.6431249,10.8571429 94.6721429,10.8571429 L97.0292857,10.8571429 C97.0583037,10.8571429 97.0834151,10.8677454 97.1046205,10.8889509 C97.125826,10.9101564 97.1364286,10.9352677 97.1364286,10.9642857 L97.1364286,10.9642857 Z"/>
       </g>
-      <rect stroke="#ABE6F8" x="0" y="0" width="101" height="62"/>
+      <rect stroke="#abe6f8" width="101" height="62"/>
     </g>
   </g>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/img/gum-opera.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/img/gum-opera.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/img/gum-opera.svg	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/img/gum-opera.svg	2015-05-25 20:42:46.000000000 +0000
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="102px" height="62px" viewBox="0 0 102 62" version="1.1" xmlns="http://www.w3.org/2000/svg">
-  <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-    <g transform="translate(0.500000, 0.000000)">
-      <rect stroke="#AAE5F9" fill="#FFFFFF" x="0.990196078" y="1" width="99.0196078" height="60"/>
-      <rect fill="#AAE5F9" x="2.97058824" y="3" width="33.6666667" height="13"/>
-      <rect fill="#AAE5F9" x="0.990196078" y="8" width="99.0196078" height="10"/>
-      <path d="M27.2559789,11 C25.8746722,11 24.754902,12.1096621 24.754902,13.5 L24.754902,13.5 C24.754902,14.8807119 25.8688951,16 27.2538514,16 L46.91717,16 L95.5280221,16 C96.9095015,16 98.0294118,14.8903379 98.0294118,13.5 L98.0294118,13.5 C98.0294118,12.1192881 96.9077658,11 95.5283349,11 L27.2559789,11 Z" fill="#FFFFFF"/>
-      <rect stroke="#92CB3E" stroke-width="2" fill="#FFFFFF" x="28.7156863" y="15" width="42.5784314" height="22" rx="2"/>
-      <path d="M51.5228862,29 C50.1376565,29 49.0147059,30.1096621 49.0147059,31.5 L49.0147059,31.5 C49.0147059,32.8807119 50.1327688,34 51.5124335,34 L55.0045081,34 L66.3156937,34 C67.6980258,34 68.8186275,32.8903379 68.8186275,31.5 L68.8186275,31.5 C68.8186275,30.1192881 67.6971405,29 66.3104471,29 L51.5228862,29 Z" stroke="#92CB3E" fill="#FFFFFF"/>
-      <rect stroke="#ABE6F8" x="0" y="0" width="101" height="62"/>
-      <path d="M40.6764706,19.7142857 L40.6764706,24.5714286 C40.6764706,24.6964292 40.6184355,24.7842259 40.5023634,24.8348214 C40.4636728,24.8497025 40.4264708,24.8571429 40.3907563,24.8571429 C40.3103988,24.8571429 40.2434351,24.8288693 40.1898634,24.7723214 L38.3907563,22.9732143 L38.3907563,23.7142857 C38.3907563,24.0684542 38.2650135,24.3712785 38.0135242,24.6227679 C37.7620348,24.8742572 37.4592105,25 37.105042,25 L33.9621849,25 C33.6080164,25 33.3051921,24.8742572 33.0537027,24.6227679 C32.8022134,24.3712785 32.6764706,24.0684542 32.6764706,23.7142857 L32.6764706,20.5714286 C32.6764706,20.2172601 32.8022134,19.9144358 33.0537027,19.6629464 C33.3051921,19.4114571 33.6080164,19.2857143 33.9621849,19.2857143 L37.105042,19.2857143 C37.4592105,19.2857143 37.7620348,19.4114571 38.0135242,19.6629464 C38.2650135,19.9144358 38.3907563,20.2172601 38.3907563,20.5714286 L38.3907563,21.3080357 L40.1898634,19.5133929 C40.2434351,19.456845 40.3103988,19.4285714 40.3907563,19.4285714 C40.4264708,19.4285714 40.4636728,19.4360118 40.5023634,19.4508929 C40.6184355,19.5014883 40.6764706,19.5892851 40.6764706,19.7142857 L40.6764706,19.7142857 Z" fill="#00AF84"/>
-      <path d="M22.2422969,14.5714286 L22.2422969,14.8571429 C22.2422969,14.8958335 22.2281602,14.9293153 22.1998862,14.9575893 C22.1716123,14.9858632 22.1381304,15 22.0994398,15 L18.9565826,15 C18.917892,15 18.8844102,14.9858632 18.8561362,14.9575893 C18.8278623,14.9293153 18.8137255,14.8958335 18.8137255,14.8571429 L18.8137255,14.5714286 C18.8137255,14.5327379 18.8278623,14.4992561 18.8561362,14.4709821 C18.8844102,14.4427082 18.917892,14.4285714 18.9565826,14.4285714 L22.0994398,14.4285714 C22.1381304,14.4285714 22.1716123,14.4427082 22.1998862,14.4709821 C22.2281602,14.4992561 22.2422969,14.5327379 22.2422969,14.5714286 L22.2422969,14.5714286 Z M22.2422969,13.4285714 L22.2422969,13.7142857 C22.2422969,13.7529764 22.2281602,13.7864582 22.1998862,13.8147321 C22.1716123,13.8430061 22.1381304,13.8571429 22.0994398,13.8571429 L18.9565826,13.8571429 C18.917892,13.8571429 18.8844102,13.8430061 18.8561362,13.8147321 C18.8278623,13.7864582 18.8137255,13.7529764 18.8137255,13.7142857 L18.8137255,13.4285714 C18.8137255,13.3898808 18.8278623,13.356399 18.8561362,13.328125 C18.8844102,13.299851 18.917892,13.2857143 18.9565826,13.2857143 L22.0994398,13.2857143 C22.1381304,13.2857143 22.1716123,13.299851 22.1998862,13.328125 C22.2281602,13.356399 22.2422969,13.3898808 22.2422969,13.4285714 L22.2422969,13.4285714 Z M22.2422969,12.2857143 L22.2422969,12.5714286 C22.2422969,12.6101192 22.2281602,12.643601 22.1998862,12.671875 C22.1716123,12.700149 22.1381304,12.7142857 22.0994398,12.7142857 L18.9565826,12.7142857 C18.917892,12.7142857 18.8844102,12.700149 18.8561362,12.671875 C18.8278623,12.643601 18.8137255,12.6101192 18.8137255,12.5714286 L18.8137255,12.2857143 C18.8137255,12.2470236 18.8278623,12.2135418 18.8561362,12.1852679 C18.8844102,12.1569939 18.917892,12.1428571 18.9565826,12.1428571 L22.0994398,12.1428571 C22.1381304,12.1428571 22.1716123,12.1569939 22.1998862,12.1852679 C22.2281602,12.2135418 22.2422969,12.2470236 22.2422969,12.2857143 L22.2422969,12.2857143 Z" fill="#FFFFFF"/>
-      <path d="M7.38935574,13.5714286 L7.38935574,13.8571429 C7.38935574,13.9360123 7.36517444,14.0033479 7.3168111,14.0591518 C7.26844776,14.1149556 7.20557637,14.1428571 7.12819503,14.1428571 L5.55676646,14.1428571 L6.21078431,14.7991071 C6.26733222,14.8526788 6.29560574,14.9196425 6.29560574,15 C6.29560574,15.0803575 6.26733222,15.1473212 6.21078431,15.2008929 L6.0433736,15.3705357 C5.9883138,15.4255955 5.92135018,15.453125 5.84248074,15.453125 C5.7650994,15.453125 5.69739175,15.4255955 5.63935574,15.3705357 L4.18623074,13.9151786 C4.13117094,13.8601188 4.10364146,13.7931552 4.10364146,13.7142857 C4.10364146,13.6369044 4.13117094,13.5691967 4.18623074,13.5111607 L5.63935574,12.0602679 C5.69590364,12.00372 5.7636113,11.9754464 5.84248074,11.9754464 C5.91986208,11.9754464 5.9868257,12.00372 6.0433736,12.0602679 L6.21078431,12.2254464 C6.26733222,12.2819943 6.29560574,12.349702 6.29560574,12.4285714 C6.29560574,12.5074409 6.26733222,12.5751485 6.21078431,12.6316964 L5.55676646,13.2857143 L7.12819503,13.2857143 C7.20557637,13.2857143 7.26844776,13.3136158 7.3168111,13.3694196 C7.36517444,13.4252235 7.38935574,13.4925591 7.38935574,13.5714286 L7.38935574,13.5714286 Z" fill="#FFFFFF"/>
-      <path d="M12.3403361,13.5714286 L12.3403361,13.8571429 C12.3403361,13.9360123 12.3161548,14.0033479 12.2677915,14.0591518 C12.2194282,14.1149556 12.1565568,14.1428571 12.0791754,14.1428571 L10.5077468,14.1428571 L11.1617647,14.7991071 C11.2183126,14.8526788 11.2465861,14.9196425 11.2465861,15 C11.2465861,15.0803575 11.2183126,15.1473212 11.1617647,15.2008929 L10.994354,15.3705357 C10.9392942,15.4255955 10.8723306,15.453125 10.7934611,15.453125 C10.7160798,15.453125 10.6483721,15.4255955 10.5903361,15.3705357 L9.13721113,13.9151786 C9.08215134,13.8601188 9.05462185,13.7931552 9.05462185,13.7142857 C9.05462185,13.6369044 9.08215134,13.5691967 9.13721113,13.5111607 L10.5903361,12.0602679 C10.646884,12.00372 10.7145917,11.9754464 10.7934611,11.9754464 C10.8708425,11.9754464 10.9378061,12.00372 10.994354,12.0602679 L11.1617647,12.2254464 C11.2183126,12.2819943 11.2465861,12.349702 11.2465861,12.4285714 C11.2465861,12.5074409 11.2183126,12.5751485 11.1617647,12.6316964 L10.5077468,13.2857143 L12.0791754,13.2857143 C12.1565568,13.2857143 12.2194282,13.3136158 12.2677915,13.3694196 C12.3161548,13.4252235 12.3403361,13.4925591 12.3403361,13.5714286 L12.3403361,13.5714286 Z" fill="#FFFFFF" transform="translate(10.697479, 13.714286) scale(-1, 1) translate(-10.697479, -13.714286) "/>
-      <path d="M17.2913165,12.1428571 L17.2913165,13.1428571 C17.2913165,13.1815478 17.2771798,13.2150296 17.2489058,13.2433036 C17.2206319,13.2715775 17.1871501,13.2857143 17.1484594,13.2857143 L16.1484594,13.2857143 C16.0859591,13.2857143 16.0420607,13.2559527 16.016763,13.1964286 C15.9914652,13.1383926 16.0018818,13.0870538 16.048013,13.0424107 L16.3560487,12.734375 C16.1358095,12.5305049 15.8761395,12.4285714 15.5770308,12.4285714 C15.4222681,12.4285714 15.2745762,12.4587051 15.1339505,12.5189732 C14.9933248,12.5792414 14.8716742,12.6607138 14.7689951,12.7633929 C14.666316,12.8660719 14.5848436,12.9877225 14.5245755,13.1283482 C14.4643073,13.2689739 14.4341737,13.4166659 14.4341737,13.5714286 C14.4341737,13.7261912 14.4643073,13.8738832 14.5245755,14.0145089 C14.5848436,14.1551346 14.666316,14.2767852 14.7689951,14.3794643 C14.8716742,14.4821434 14.9933248,14.5636158 15.1339505,14.6238839 C15.2745762,14.6841521 15.4222681,14.7142857 15.5770308,14.7142857 C15.754115,14.7142857 15.9215241,14.6755956 16.079263,14.5982143 C16.2370018,14.5208329 16.370185,14.411459 16.4788165,14.2700893 C16.4892332,14.2552083 16.5063462,14.2462798 16.5301558,14.2433036 C16.5509892,14.2433036 16.5695903,14.2499999 16.5859594,14.2633929 L16.891763,14.5714286 C16.9051559,14.5833334 16.9122243,14.5985862 16.9129683,14.6171875 C16.9137124,14.6357888 16.9081321,14.6525297 16.8962272,14.6674107 C16.734024,14.8638403 16.5375974,15.0159965 16.3069415,15.1238839 C16.0762856,15.2317714 15.8329845,15.2857143 15.5770308,15.2857143 C15.3448868,15.2857143 15.1231628,15.2403278 14.9118522,15.1495536 C14.7005417,15.0587793 14.5182518,14.9367567 14.3649772,14.7834821 C14.2117027,14.6302076 14.0896801,14.4479177 13.9989058,14.2366071 C13.9081315,14.0252966 13.8627451,13.8035726 13.8627451,13.5714286 C13.8627451,13.3392846 13.9081315,13.1175606 13.9989058,12.90625 C14.0896801,12.6949394 14.2117027,12.5126496 14.3649772,12.359375 C14.5182518,12.2061004 14.7005417,12.0840778 14.9118522,11.9933036 C15.1231628,11.9025293 15.3448868,11.8571429 15.5770308,11.8571429 C15.7957819,11.8571429 16.0074613,11.8984371 16.2120755,11.9810268 C16.4166896,12.0636165 16.5986074,12.1800588 16.7578344,12.3303571 L17.048013,12.0424107 C17.0911679,11.9962795 17.1432507,11.985863 17.204263,12.0111607 C17.262299,12.0364585 17.2913165,12.0803568 17.2913165,12.1428571 L17.2913165,12.1428571 Z" fill="#FFFFFF"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="102px" height="62px" viewBox="0 0 102 62" xmlns="http://www.w3.org/2000/svg">
+  <g stroke="none" fill="none" fill-rule="evenodd">
+    <g transform="translate(0.5,0.0)">
+      <rect stroke="#aae5f9" fill="#fff" x="0.99" y="1" width="99.02" height="60"/>
+      <rect fill="#aae5f9" x="2.97" y="3" width="33.67" height="13"/>
+      <rect fill="#aae5f9" x="0.99" y="8" width="99.02" height="10"/>
+      <path fill="#fff" d="M27.2559789,11 C25.8746722,11 24.754902,12.1096621 24.754902,13.5 L24.754902,13.5 C24.754902,14.8807119 25.8688951,16 27.2538514,16 L46.91717,16 L95.5280221,16 C96.9095015,16 98.0294118,14.8903379 98.0294118,13.5 L98.0294118,13.5 C98.0294118,12.1192881 96.9077658,11 95.5283349,11 L27.2559789,11 Z"/>
+      <rect stroke="#92cb3e" stroke-width="2" fill="#fff" x="28.72" y="15" width="42.58" height="22" rx="2"/>
+      <path stroke="#92cb3e" fill="#fff" d="M51.5228862,29 C50.1376565,29 49.0147059,30.1096621 49.0147059,31.5 L49.0147059,31.5 C49.0147059,32.8807119 50.1327688,34 51.5124335,34 L55.0045081,34 L66.3156937,34 C67.6980258,34 68.8186275,32.8903379 68.8186275,31.5 L68.8186275,31.5 C68.8186275,30.1192881 67.6971405,29 66.3104471,29 L51.5228862,29 Z"/>
+      <rect stroke="#abe6f8" width="101" height="62"/>
+      <path fill="#00af84" d="M40.6764706,19.7142857 L40.6764706,24.5714286 C40.6764706,24.6964292 40.6184355,24.7842259 40.5023634,24.8348214 C40.4636728,24.8497025 40.4264708,24.8571429 40.3907563,24.8571429 C40.3103988,24.8571429 40.2434351,24.8288693 40.1898634,24.7723214 L38.3907563,22.9732143 L38.3907563,23.7142857 C38.3907563,24.0684542 38.2650135,24.3712785 38.0135242,24.6227679 C37.7620348,24.8742572 37.4592105,25 37.105042,25 L33.9621849,25 C33.6080164,25 33.3051921,24.8742572 33.0537027,24.6227679 C32.8022134,24.3712785 32.6764706,24.0684542 32.6764706,23.7142857 L32.6764706,20.5714286 C32.6764706,20.2172601 32.8022134,19.9144358 33.0537027,19.6629464 C33.3051921,19.4114571 33.6080164,19.2857143 33.9621849,19.2857143 L37.105042,19.2857143 C37.4592105,19.2857143 37.7620348,19.4114571 38.0135242,19.6629464 C38.2650135,19.9144358 38.3907563,20.2172601 38.3907563,20.5714286 L38.3907563,21.3080357 L40.1898634,19.5133929 C40.2434351,19.456845 40.3103988,19.4285714 40.3907563,19.4285714 C40.4264708,19.4285714 40.4636728,19.4360118 40.5023634,19.4508929 C40.6184355,19.5014883 40.6764706,19.5892851 40.6764706,19.7142857 L40.6764706,19.7142857 Z"/>
+      <path fill="#fff" d="M22.2422969,14.5714286 L22.2422969,14.8571429 C22.2422969,14.8958335 22.2281602,14.9293153 22.1998862,14.9575893 C22.1716123,14.9858632 22.1381304,15 22.0994398,15 L18.9565826,15 C18.917892,15 18.8844102,14.9858632 18.8561362,14.9575893 C18.8278623,14.9293153 18.8137255,14.8958335 18.8137255,14.8571429 L18.8137255,14.5714286 C18.8137255,14.5327379 18.8278623,14.4992561 18.8561362,14.4709821 C18.8844102,14.4427082 18.917892,14.4285714 18.9565826,14.4285714 L22.0994398,14.4285714 C22.1381304,14.4285714 22.1716123,14.4427082 22.1998862,14.4709821 C22.2281602,14.4992561 22.2422969,14.5327379 22.2422969,14.5714286 L22.2422969,14.5714286 Z M22.2422969,13.4285714 L22.2422969,13.7142857 C22.2422969,13.7529764 22.2281602,13.7864582 22.1998862,13.8147321 C22.1716123,13.8430061 22.1381304,13.8571429 22.0994398,13.8571429 L18.9565826,13.8571429 C18.917892,13.8571429 18.8844102,13.8430061 18.8561362,13.8147321 C18.8278623,13.7864582 18.8137255,13.7529764 18.8137255,13.7142857 L18.8137255,13.4285714 C18.8137255,13.3898808 18.8278623,13.356399 18.8561362,13.328125 C18.8844102,13.299851 18.917892,13.2857143 18.9565826,13.2857143 L22.0994398,13.2857143 C22.1381304,13.2857143 22.1716123,13.299851 22.1998862,13.328125 C22.2281602,13.356399 22.2422969,13.3898808 22.2422969,13.4285714 L22.2422969,13.4285714 Z M22.2422969,12.2857143 L22.2422969,12.5714286 C22.2422969,12.6101192 22.2281602,12.643601 22.1998862,12.671875 C22.1716123,12.700149 22.1381304,12.7142857 22.0994398,12.7142857 L18.9565826,12.7142857 C18.917892,12.7142857 18.8844102,12.700149 18.8561362,12.671875 C18.8278623,12.643601 18.8137255,12.6101192 18.8137255,12.5714286 L18.8137255,12.2857143 C18.8137255,12.2470236 18.8278623,12.2135418 18.8561362,12.1852679 C18.8844102,12.1569939 18.917892,12.1428571 18.9565826,12.1428571 L22.0994398,12.1428571 C22.1381304,12.1428571 22.1716123,12.1569939 22.1998862,12.1852679 C22.2281602,12.2135418 22.2422969,12.2470236 22.2422969,12.2857143 L22.2422969,12.2857143 Z"/>
+      <path fill="#fff" d="M7.38935574,13.5714286 L7.38935574,13.8571429 C7.38935574,13.9360123 7.36517444,14.0033479 7.3168111,14.0591518 C7.26844776,14.1149556 7.20557637,14.1428571 7.12819503,14.1428571 L5.55676646,14.1428571 L6.21078431,14.7991071 C6.26733222,14.8526788 6.29560574,14.9196425 6.29560574,15 C6.29560574,15.0803575 6.26733222,15.1473212 6.21078431,15.2008929 L6.0433736,15.3705357 C5.9883138,15.4255955 5.92135018,15.453125 5.84248074,15.453125 C5.7650994,15.453125 5.69739175,15.4255955 5.63935574,15.3705357 L4.18623074,13.9151786 C4.13117094,13.8601188 4.10364146,13.7931552 4.10364146,13.7142857 C4.10364146,13.6369044 4.13117094,13.5691967 4.18623074,13.5111607 L5.63935574,12.0602679 C5.69590364,12.00372 5.7636113,11.9754464 5.84248074,11.9754464 C5.91986208,11.9754464 5.9868257,12.00372 6.0433736,12.0602679 L6.21078431,12.2254464 C6.26733222,12.2819943 6.29560574,12.349702 6.29560574,12.4285714 C6.29560574,12.5074409 6.26733222,12.5751485 6.21078431,12.6316964 L5.55676646,13.2857143 L7.12819503,13.2857143 C7.20557637,13.2857143 7.26844776,13.3136158 7.3168111,13.3694196 C7.36517444,13.4252235 7.38935574,13.4925591 7.38935574,13.5714286 L7.38935574,13.5714286 Z"/>
+      <path fill="#fff" d="M12.3403361,13.5714286 L12.3403361,13.8571429 C12.3403361,13.9360123 12.3161548,14.0033479 12.2677915,14.0591518 C12.2194282,14.1149556 12.1565568,14.1428571 12.0791754,14.1428571 L10.5077468,14.1428571 L11.1617647,14.7991071 C11.2183126,14.8526788 11.2465861,14.9196425 11.2465861,15 C11.2465861,15.0803575 11.2183126,15.1473212 11.1617647,15.2008929 L10.994354,15.3705357 C10.9392942,15.4255955 10.8723306,15.453125 10.7934611,15.453125 C10.7160798,15.453125 10.6483721,15.4255955 10.5903361,15.3705357 L9.13721113,13.9151786 C9.08215134,13.8601188 9.05462185,13.7931552 9.05462185,13.7142857 C9.05462185,13.6369044 9.08215134,13.5691967 9.13721113,13.5111607 L10.5903361,12.0602679 C10.646884,12.00372 10.7145917,11.9754464 10.7934611,11.9754464 C10.8708425,11.9754464 10.9378061,12.00372 10.994354,12.0602679 L11.1617647,12.2254464 C11.2183126,12.2819943 11.2465861,12.349702 11.2465861,12.4285714 C11.2465861,12.5074409 11.2183126,12.5751485 11.1617647,12.6316964 L10.5077468,13.2857143 L12.0791754,13.2857143 C12.1565568,13.2857143 12.2194282,13.3136158 12.2677915,13.3694196 C12.3161548,13.4252235 12.3403361,13.4925591 12.3403361,13.5714286 L12.3403361,13.5714286 Z" transform="translate(10.697479, 13.714286) scale(-1, 1) translate(-10.697479, -13.714286) "/>
+      <path fill="#fff" d="M17.2913165,12.1428571 L17.2913165,13.1428571 C17.2913165,13.1815478 17.2771798,13.2150296 17.2489058,13.2433036 C17.2206319,13.2715775 17.1871501,13.2857143 17.1484594,13.2857143 L16.1484594,13.2857143 C16.0859591,13.2857143 16.0420607,13.2559527 16.016763,13.1964286 C15.9914652,13.1383926 16.0018818,13.0870538 16.048013,13.0424107 L16.3560487,12.734375 C16.1358095,12.5305049 15.8761395,12.4285714 15.5770308,12.4285714 C15.4222681,12.4285714 15.2745762,12.4587051 15.1339505,12.5189732 C14.9933248,12.5792414 14.8716742,12.6607138 14.7689951,12.7633929 C14.666316,12.8660719 14.5848436,12.9877225 14.5245755,13.1283482 C14.4643073,13.2689739 14.4341737,13.4166659 14.4341737,13.5714286 C14.4341737,13.7261912 14.4643073,13.8738832 14.5245755,14.0145089 C14.5848436,14.1551346 14.666316,14.2767852 14.7689951,14.3794643 C14.8716742,14.4821434 14.9933248,14.5636158 15.1339505,14.6238839 C15.2745762,14.6841521 15.4222681,14.7142857 15.5770308,14.7142857 C15.754115,14.7142857 15.9215241,14.6755956 16.079263,14.5982143 C16.2370018,14.5208329 16.370185,14.411459 16.4788165,14.2700893 C16.4892332,14.2552083 16.5063462,14.2462798 16.5301558,14.2433036 C16.5509892,14.2433036 16.5695903,14.2499999 16.5859594,14.2633929 L16.891763,14.5714286 C16.9051559,14.5833334 16.9122243,14.5985862 16.9129683,14.6171875 C16.9137124,14.6357888 16.9081321,14.6525297 16.8962272,14.6674107 C16.734024,14.8638403 16.5375974,15.0159965 16.3069415,15.1238839 C16.0762856,15.2317714 15.8329845,15.2857143 15.5770308,15.2857143 C15.3448868,15.2857143 15.1231628,15.2403278 14.9118522,15.1495536 C14.7005417,15.0587793 14.5182518,14.9367567 14.3649772,14.7834821 C14.2117027,14.6302076 14.0896801,14.4479177 13.9989058,14.2366071 C13.9081315,14.0252966 13.8627451,13.8035726 13.8627451,13.5714286 C13.8627451,13.3392846 13.9081315,13.1175606 13.9989058,12.90625 C14.0896801,12.6949394 14.2117027,12.5126496 14.3649772,12.359375 C14.5182518,12.2061004 14.7005417,12.0840778 14.9118522,11.9933036 C15.1231628,11.9025293 15.3448868,11.8571429 15.5770308,11.8571429 C15.7957819,11.8571429 16.0074613,11.8984371 16.2120755,11.9810268 C16.4166896,12.0636165 16.5986074,12.1800588 16.7578344,12.3303571 L17.048013,12.0424107 C17.0911679,11.9962795 17.1432507,11.985863 17.204263,12.0111607 C17.262299,12.0364585 17.2913165,12.0803568 17.2913165,12.1428571 L17.2913165,12.1428571 Z"/>
     </g>
   </g>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/img/gum-others.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/img/gum-others.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/img/gum-others.svg	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/img/gum-others.svg	2015-05-25 20:42:46.000000000 +0000
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="51px" height="36px" viewBox="0 0 51 36" version="1.1" xmlns="http://www.w3.org/2000/svg">
-  <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-    <g transform="translate(0.500000, 0.000000)">
-      <path d="M50,2.96428571 L50,33.3214286 C50,34.1026825 49.6372804,34.6514121 48.9118304,34.9676339 C48.6700137,35.0606403 48.4375011,35.1071429 48.2142857,35.1071429 C47.7120511,35.1071429 47.2935285,34.9304333 46.9587054,34.5770089 L35.7142857,23.3325893 L35.7142857,27.9642857 C35.7142857,30.1778384 34.9283933,32.0704907 33.3565848,33.6422991 C31.7847764,35.2141076 29.8921242,36 27.6785714,36 L8.03571429,36 C5.82216155,36 3.92950935,35.2141076 2.35770089,33.6422991 C0.785892439,32.0704907 0,30.1778384 0,27.9642857 L0,8.32142857 C0,6.10787584 0.785892439,4.21522363 2.35770089,2.64341518 C3.92950935,1.07160672 5.82216155,0.285714286 8.03571429,0.285714286 L27.6785714,0.285714286 C29.8921242,0.285714286 31.7847764,1.07160672 33.3565848,2.64341518 C34.9283933,4.21522363 35.7142857,6.10787584 35.7142857,8.32142857 L35.7142857,12.9252232 L46.9587054,1.70870536 C47.2935285,1.35528097 47.7120511,1.17857143 48.2142857,1.17857143 C48.4375011,1.17857143 48.6700137,1.22507394 48.9118304,1.31808036 C49.6372804,1.63430218 50,2.18303181 50,2.96428571 L50,2.96428571 Z" fill="#00AF84"/>
-      <path d="M19.8214286,22.09375 L19.8214286,25.4419643 C19.8214286,25.5907746 19.7656256,25.7209816 19.6540179,25.8325893 C19.5424102,25.944197 19.4122031,26 19.2633929,26 L15.9151786,26 C15.7663683,26 15.6361613,25.944197 15.5245536,25.8325893 C15.4129459,25.7209816 15.3571429,25.5907746 15.3571429,25.4419643 L15.3571429,22.09375 C15.3571429,21.9449397 15.4129459,21.8147327 15.5245536,21.703125 C15.6361613,21.5915173 15.7663683,21.5357143 15.9151786,21.5357143 L19.2633929,21.5357143 C19.4122031,21.5357143 19.5424102,21.5915173 19.6540179,21.703125 C19.7656256,21.8147327 19.8214286,21.9449397 19.8214286,22.09375 L19.8214286,22.09375 Z M24.2299107,13.7232143 C24.2299107,14.2254489 24.1578318,14.6951243 24.0136719,15.1322545 C23.8695119,15.5693846 23.7067531,15.9251288 23.5253906,16.1994978 C23.3440281,16.4738667 23.0882643,16.7505566 22.7580915,17.0295759 C22.4279187,17.3085951 22.1605293,17.5108811 21.9559152,17.6364397 C21.7513011,17.7619984 21.4676357,17.9270823 21.1049107,18.1316964 C20.7235844,18.3456112 20.4050422,18.6478775 20.1492746,19.0385045 C19.8935069,19.4291314 19.765625,19.7406982 19.765625,19.9732143 C19.765625,20.1313252 19.709822,20.2824584 19.5982143,20.4266183 C19.4866066,20.5707783 19.3563996,20.6428571 19.2075893,20.6428571 L15.859375,20.6428571 C15.7198654,20.6428571 15.601284,20.5568275 15.5036272,20.3847656 C15.4059705,20.2127038 15.3571429,20.0383193 15.3571429,19.8616071 L15.3571429,19.233817 C15.3571429,18.4618637 15.6594092,17.7340994 16.2639509,17.0505022 C16.8684926,16.3669051 17.5334785,15.8623528 18.2589286,15.5368304 C18.8076664,15.285713 19.1982875,15.025299 19.4308036,14.7555804 C19.6633196,14.4858617 19.7795759,14.1324427 19.7795759,13.6953125 C19.7795759,13.3046855 19.5633392,12.960567 19.1308594,12.6629464 C18.6983795,12.3653259 18.1984775,12.2165179 17.6311384,12.2165179 C17.0265967,12.2165179 16.5243696,12.3513751 16.124442,12.6210938 C15.7989195,12.8536098 15.3013426,13.3883887 14.6316964,14.2254464 C14.5107881,14.3742567 14.3666303,14.4486607 14.1992188,14.4486607 C14.087611,14.4486607 13.9713548,14.4114587 13.8504464,14.3370536 L11.5625,12.593192 C11.4415917,12.5001855 11.3695128,12.3839293 11.3462612,12.2444196 C11.3230096,12.10491 11.3485859,11.974703 11.4229911,11.8537946 C12.9110938,9.37982394 15.0688103,8.14285714 17.8962054,8.14285714 C18.6402567,8.14285714 19.3889471,8.28701493 20.1422991,8.57533482 C20.8956511,8.86365472 21.5745878,9.24962556 22.1791295,9.73325893 C22.7836712,10.2168923 23.2765978,10.8097993 23.6579241,11.5119978 C24.0392504,12.2141962 24.2299107,12.951261 24.2299107,13.7232143 L24.2299107,13.7232143 Z" fill="#FFFFFF"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="51px" height="36px" viewBox="0 0 51 36" xmlns="http://www.w3.org/2000/svg">
+  <g stroke="none" fill="none" fill-rule="evenodd">
+    <g transform="translate(0.5,0)">
+      <path fill="#00af84" d="M50,2.96428571 L50,33.3214286 C50,34.1026825 49.6372804,34.6514121 48.9118304,34.9676339 C48.6700137,35.0606403 48.4375011,35.1071429 48.2142857,35.1071429 C47.7120511,35.1071429 47.2935285,34.9304333 46.9587054,34.5770089 L35.7142857,23.3325893 L35.7142857,27.9642857 C35.7142857,30.1778384 34.9283933,32.0704907 33.3565848,33.6422991 C31.7847764,35.2141076 29.8921242,36 27.6785714,36 L8.03571429,36 C5.82216155,36 3.92950935,35.2141076 2.35770089,33.6422991 C0.785892439,32.0704907 0,30.1778384 0,27.9642857 L0,8.32142857 C0,6.10787584 0.785892439,4.21522363 2.35770089,2.64341518 C3.92950935,1.07160672 5.82216155,0.285714286 8.03571429,0.285714286 L27.6785714,0.285714286 C29.8921242,0.285714286 31.7847764,1.07160672 33.3565848,2.64341518 C34.9283933,4.21522363 35.7142857,6.10787584 35.7142857,8.32142857 L35.7142857,12.9252232 L46.9587054,1.70870536 C47.2935285,1.35528097 47.7120511,1.17857143 48.2142857,1.17857143 C48.4375011,1.17857143 48.6700137,1.22507394 48.9118304,1.31808036 C49.6372804,1.63430218 50,2.18303181 50,2.96428571 L50,2.96428571 Z"/>
+      <path fill="#fff" d="M19.8214286,22.09375 L19.8214286,25.4419643 C19.8214286,25.5907746 19.7656256,25.7209816 19.6540179,25.8325893 C19.5424102,25.944197 19.4122031,26 19.2633929,26 L15.9151786,26 C15.7663683,26 15.6361613,25.944197 15.5245536,25.8325893 C15.4129459,25.7209816 15.3571429,25.5907746 15.3571429,25.4419643 L15.3571429,22.09375 C15.3571429,21.9449397 15.4129459,21.8147327 15.5245536,21.703125 C15.6361613,21.5915173 15.7663683,21.5357143 15.9151786,21.5357143 L19.2633929,21.5357143 C19.4122031,21.5357143 19.5424102,21.5915173 19.6540179,21.703125 C19.7656256,21.8147327 19.8214286,21.9449397 19.8214286,22.09375 L19.8214286,22.09375 Z M24.2299107,13.7232143 C24.2299107,14.2254489 24.1578318,14.6951243 24.0136719,15.1322545 C23.8695119,15.5693846 23.7067531,15.9251288 23.5253906,16.1994978 C23.3440281,16.4738667 23.0882643,16.7505566 22.7580915,17.0295759 C22.4279187,17.3085951 22.1605293,17.5108811 21.9559152,17.6364397 C21.7513011,17.7619984 21.4676357,17.9270823 21.1049107,18.1316964 C20.7235844,18.3456112 20.4050422,18.6478775 20.1492746,19.0385045 C19.8935069,19.4291314 19.765625,19.7406982 19.765625,19.9732143 C19.765625,20.1313252 19.709822,20.2824584 19.5982143,20.4266183 C19.4866066,20.5707783 19.3563996,20.6428571 19.2075893,20.6428571 L15.859375,20.6428571 C15.7198654,20.6428571 15.601284,20.5568275 15.5036272,20.3847656 C15.4059705,20.2127038 15.3571429,20.0383193 15.3571429,19.8616071 L15.3571429,19.233817 C15.3571429,18.4618637 15.6594092,17.7340994 16.2639509,17.0505022 C16.8684926,16.3669051 17.5334785,15.8623528 18.2589286,15.5368304 C18.8076664,15.285713 19.1982875,15.025299 19.4308036,14.7555804 C19.6633196,14.4858617 19.7795759,14.1324427 19.7795759,13.6953125 C19.7795759,13.3046855 19.5633392,12.960567 19.1308594,12.6629464 C18.6983795,12.3653259 18.1984775,12.2165179 17.6311384,12.2165179 C17.0265967,12.2165179 16.5243696,12.3513751 16.124442,12.6210938 C15.7989195,12.8536098 15.3013426,13.3883887 14.6316964,14.2254464 C14.5107881,14.3742567 14.3666303,14.4486607 14.1992188,14.4486607 C14.087611,14.4486607 13.9713548,14.4114587 13.8504464,14.3370536 L11.5625,12.593192 C11.4415917,12.5001855 11.3695128,12.3839293 11.3462612,12.2444196 C11.3230096,12.10491 11.3485859,11.974703 11.4229911,11.8537946 C12.9110938,9.37982394 15.0688103,8.14285714 17.8962054,8.14285714 C18.6402567,8.14285714 19.3889471,8.28701493 20.1422991,8.57533482 C20.8956511,8.86365472 21.5745878,9.24962556 22.1791295,9.73325893 C22.7836712,10.2168923 23.2765978,10.8097993 23.6579241,11.5119978 C24.0392504,12.2141962 24.2299107,12.951261 24.2299107,13.7232143 L24.2299107,13.7232143 Z"/>
     </g>
   </g>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/index.html firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/index.html
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/index.html	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/index.html	2015-05-25 20:42:46.000000000 +0000
@@ -8,6 +8,8 @@
     <meta name="locales" content="en-US" />
     <meta name="default_locale" content="en-US" />
 
+    <link rel="shortcut icon" href="favicon.ico">
+
     <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">
@@ -125,6 +127,8 @@
     <script type="text/javascript" src="shared/js/feedbackStore.js"></script>
     <script type="text/javascript" src="shared/js/views.js"></script>
     <script type="text/javascript" src="shared/js/feedbackViews.js"></script>
+    <script type="text/javascript" src="shared/js/textChatStore.js"></script>
+    <script type="text/javascript" src="shared/js/textChatView.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 firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/js/fxOSMarketplace.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/js/fxOSMarketplace.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/js/fxOSMarketplace.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/js/fxOSMarketplace.js	2015-05-25 20:42:46.000000000 +0000
@@ -1,4 +1,6 @@
-/** @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/. */
 
 var loop = loop || {};
 loop.fxOSMarketplaceViews = (function() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/js/fxOSMarketplace.jsx firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/js/fxOSMarketplace.jsx
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/js/fxOSMarketplace.jsx	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/js/fxOSMarketplace.jsx	2015-05-25 20:42:46.000000000 +0000
@@ -1,4 +1,6 @@
-/** @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/. */
 
 var loop = loop || {};
 loop.fxOSMarketplaceViews = (function() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/js/multiplexGum.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/js/multiplexGum.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/js/multiplexGum.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/js/multiplexGum.js	2015-05-25 20:42:46.000000000 +0000
@@ -2,7 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
 var loop = loop || {};
 
 /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/js/standaloneAppStore.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/js/standaloneAppStore.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/js/standaloneAppStore.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/js/standaloneAppStore.js	2015-05-25 20:42:46.000000000 +0000
@@ -2,8 +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/. */
 
-/* global loop:true */
-
 var loop = loop || {};
 loop.store = loop.store || {};
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/js/standaloneClient.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/js/standaloneClient.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/js/standaloneClient.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/js/standaloneClient.js	2015-05-25 20:42:46.000000000 +0000
@@ -2,8 +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/. */
 
-/* global loop:true */
-
 var loop = loop || {};
 loop.StandaloneClient = (function($) {
   "use strict";
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/js/standaloneMetricsStore.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/js/standaloneMetricsStore.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/js/standaloneMetricsStore.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/js/standaloneMetricsStore.js	2015-05-25 20:42:46.000000000 +0000
@@ -32,7 +32,8 @@
     button: "button click",
     download: "download button click",
     faceMute: "face mute",
-    link: "link click",
+    failed: "failed",
+    linkClick: "link click",
     pageLoad: "page load messages",
     success: "success",
     support: "support link click"
@@ -40,11 +41,15 @@
 
   var StandaloneMetricsStore = loop.store.createStore({
     actions: [
+      "connectedToSdkServers",
+      "connectionFailure",
       "gotMediaPermission",
       "joinRoom",
+      "joinedRoom",
       "leaveRoom",
       "mediaConnected",
-      "recordClick"
+      "recordClick",
+      "remotePeerConnected"
     ],
 
     /**
@@ -104,6 +109,29 @@
     },
 
     /**
+     * Handles notification that we've connected to the sdk servers.
+     */
+    connectedToSdkServers: function() {
+      this._storeEvent(METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.success,
+        "Joined sdk servers");
+    },
+
+    /**
+     * Handles connection failures for various reasons.
+     *
+     * @param {sharedActions.ConnectionFailure} actionData
+     */
+    connectionFailure: function(actionData) {
+      if (actionData.reason === FAILURE_DETAILS.MEDIA_DENIED) {
+        this._storeEvent(METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.failed,
+          "Media denied");
+      } else if (actionData.reason === FAILURE_DETAILS.NO_MEDIA) {
+        this._storeEvent(METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.failed,
+          "No media");
+      }
+    },
+
+    /**
      * Handles media permssion being obtained.
      */
     gotMediaPermission: function() {
@@ -120,6 +148,14 @@
     },
 
     /**
+     * Handles the room having been joined on the loop-server.
+     */
+    joinedRoom: function() {
+      this._storeEvent(METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.success,
+        "Joined room");
+    },
+
+    /**
      * Handles the user clicking the leave room button.
      */
     leaveRoom: function() {
@@ -147,6 +183,14 @@
     },
 
     /**
+     * Handles notification that the remote peer is connected.
+     */
+    remotePeerConnected: function() {
+      this._storeEvent(METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.success,
+        "Remote peer connected");
+    },
+
+    /**
      * Handles notifications that the activeRoomStore has changed, updating
      * the metrics for room state and mute state as necessary.
      */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/js/standaloneMozLoop.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/js/standaloneMozLoop.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/js/standaloneMozLoop.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/js/standaloneMozLoop.js	2015-05-25 20:42:46.000000000 +0000
@@ -2,8 +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/. */
 
-/* global loop:true */
-
 /**
  * The StandaloneMozLoop implementation reflects that of the mozLoop API for Loop
  * in the desktop code. Not all functions are implemented.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/js/standaloneRoomViews.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/js/standaloneRoomViews.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/js/standaloneRoomViews.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/js/standaloneRoomViews.js	2015-05-25 20:42:47.000000000 +0000
@@ -1,12 +1,7 @@
-/** @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/. */
 
-/* global loop:true, React */
-/* jshint newcap:false, maxlen:false */
-
 var loop = loop || {};
 loop.standaloneRoomViews = (function(mozL10n) {
   "use strict";
@@ -60,6 +55,8 @@
     _getFailureString: function() {
       switch(this.props.failureReason) {
         case FAILURE_DETAILS.MEDIA_DENIED:
+        // XXX Bug 1166824 should provide a better string for this.
+        case FAILURE_DETAILS.NO_MEDIA:
           return mozL10n.get("rooms_media_denied_message");
         case FAILURE_DETAILS.EXPIRED_OR_INVALID:
           return mozL10n.get("rooms_unavailable_notification_message");
@@ -130,7 +127,8 @@
             return (
               React.createElement("div", {className: "ended-conversation"}, 
                 React.createElement(sharedViews.FeedbackView, {
-                  onAfterFeedbackReceived: this.onFeedbackSent}
+                  onAfterFeedbackReceived: this.onFeedbackSent, 
+                  noCloseText: true}
                 )
               )
             );
@@ -583,6 +581,7 @@
       return (
         React.createElement("div", {className: "room-conversation-wrapper"}, 
           React.createElement("div", {className: "beta-logo"}), 
+          React.createElement(sharedViews.TextChatView, {dispatcher: this.props.dispatcher}), 
           React.createElement(StandaloneRoomHeader, {dispatcher: this.props.dispatcher}), 
           React.createElement(StandaloneRoomInfoArea, {roomState: this.state.roomState, 
                                   failureReason: this.state.failureReason, 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx	2015-05-25 20:42:47.000000000 +0000
@@ -1,12 +1,7 @@
-/** @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/. */
 
-/* global loop:true, React */
-/* jshint newcap:false, maxlen:false */
-
 var loop = loop || {};
 loop.standaloneRoomViews = (function(mozL10n) {
   "use strict";
@@ -60,6 +55,8 @@
     _getFailureString: function() {
       switch(this.props.failureReason) {
         case FAILURE_DETAILS.MEDIA_DENIED:
+        // XXX Bug 1166824 should provide a better string for this.
+        case FAILURE_DETAILS.NO_MEDIA:
           return mozL10n.get("rooms_media_denied_message");
         case FAILURE_DETAILS.EXPIRED_OR_INVALID:
           return mozL10n.get("rooms_unavailable_notification_message");
@@ -131,6 +128,7 @@
               <div className="ended-conversation">
                 <sharedViews.FeedbackView
                   onAfterFeedbackReceived={this.onFeedbackSent}
+                  noCloseText={true}
                 />
               </div>
             );
@@ -583,6 +581,7 @@
       return (
         <div className="room-conversation-wrapper">
           <div className="beta-logo" />
+          <sharedViews.TextChatView dispatcher={this.props.dispatcher} />
           <StandaloneRoomHeader dispatcher={this.props.dispatcher} />
           <StandaloneRoomInfoArea roomState={this.state.roomState}
                                   failureReason={this.state.failureReason}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/js/webapp.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/js/webapp.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/js/webapp.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/js/webapp.js	2015-05-25 20:42:47.000000000 +0000
@@ -1,12 +1,7 @@
-/** @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/. */
 
-/* global loop:true, React, MozActivity */
-/* jshint newcap:false, maxlen:false */
-
 var loop = loop || {};
 loop.webapp = (function($, _, OT, mozL10n) {
   "use strict";
@@ -460,7 +455,7 @@
 
     getInitialState: function() {
       return {
-        urlCreationDateString: '',
+        urlCreationDateString: "",
         disableCallButton: false
       };
     },
@@ -1045,6 +1040,10 @@
       baseServerUrl: loop.config.serverUrl
     });
     var sdkDriver = new loop.OTSdkDriver({
+      // For the standalone, always request data channels. If they aren't
+      // implemented on the client, there won't be a similar message to us, and
+      // we won't display the UI.
+      useDataChannels: true,
       dispatcher: dispatcher,
       sdk: OT
     });
@@ -1090,12 +1089,16 @@
     var standaloneMetricsStore = new loop.store.StandaloneMetricsStore(dispatcher, {
       activeRoomStore: activeRoomStore
     });
+    var textChatStore = new loop.store.TextChatStore(dispatcher, {
+      sdkDriver: sdkDriver
+    });
 
     loop.store.StoreMixin.register({
       feedbackStore: feedbackStore,
       // This isn't used in any views, but is saved here to ensure it
       // is kept alive.
-      standaloneMetricsStore: standaloneMetricsStore
+      standaloneMetricsStore: standaloneMetricsStore,
+      textChatStore: textChatStore
     });
 
     window.addEventListener("unload", function() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/js/webapp.jsx firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/js/webapp.jsx
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/content/js/webapp.jsx	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/content/js/webapp.jsx	2015-05-25 20:42:47.000000000 +0000
@@ -1,12 +1,7 @@
-/** @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/. */
 
-/* global loop:true, React, MozActivity */
-/* jshint newcap:false, maxlen:false */
-
 var loop = loop || {};
 loop.webapp = (function($, _, OT, mozL10n) {
   "use strict";
@@ -460,7 +455,7 @@
 
     getInitialState: function() {
       return {
-        urlCreationDateString: '',
+        urlCreationDateString: "",
         disableCallButton: false
       };
     },
@@ -1045,6 +1040,10 @@
       baseServerUrl: loop.config.serverUrl
     });
     var sdkDriver = new loop.OTSdkDriver({
+      // For the standalone, always request data channels. If they aren't
+      // implemented on the client, there won't be a similar message to us, and
+      // we won't display the UI.
+      useDataChannels: true,
       dispatcher: dispatcher,
       sdk: OT
     });
@@ -1090,12 +1089,16 @@
     var standaloneMetricsStore = new loop.store.StandaloneMetricsStore(dispatcher, {
       activeRoomStore: activeRoomStore
     });
+    var textChatStore = new loop.store.TextChatStore(dispatcher, {
+      sdkDriver: sdkDriver
+    });
 
     loop.store.StoreMixin.register({
       feedbackStore: feedbackStore,
       // This isn't used in any views, but is saved here to ensure it
       // is kept alive.
-      standaloneMetricsStore: standaloneMetricsStore
+      standaloneMetricsStore: standaloneMetricsStore,
+      textChatStore: textChatStore
     });
 
     window.addEventListener("unload", function() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/package.json firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/package.json
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/package.json	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/package.json	2015-05-25 20:42:47.000000000 +0000
@@ -12,8 +12,8 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "eslint": "0.20.x",
-    "eslint-plugin-react": "2.2.x",
+    "eslint": "0.21.x",
+    "eslint-plugin-react": "2.3.x",
     "express": "4.x"
   },
   "scripts": {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/server.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/server.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/standalone/server.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/standalone/server.js	2015-05-25 20:42:47.000000000 +0000
@@ -9,7 +9,7 @@
  */
 /* eslint-disable no-path-concat,no-process-exit */
 
-var express = require('express');
+var express = require("express");
 var app = express();
 
 var port = process.env.PORT || 3000;
@@ -27,7 +27,7 @@
 function getConfigFile(req, res) {
   "use strict";
 
-  res.set('Content-Type', 'text/javascript');
+  res.set("Content-Type", "text/javascript");
   res.send([
     "var loop = loop || {};",
     "loop.config = loop.config || {};",
@@ -52,38 +52,38 @@
   ].join("\n"));
 }
 
-app.get('/content/config.js', getConfigFile);
-app.get('/content/c/config.js', getConfigFile);
+app.get("/content/config.js", getConfigFile);
+app.get("/content/c/config.js", getConfigFile);
 
 // Various mappings to let us end up with:
 // /test - for the test files
 // /ui - for the ui showcase
 // /content - for the standalone files.
 
-app.use('/ui', express.static(__dirname + '/../ui'));
+app.use("/ui", express.static(__dirname + "/../ui"));
 
 // This exists exclusively for the unit tests. They are served the
 // whole loop/ directory structure and expect some files in the standalone directory.
-app.use('/standalone/content', express.static(__dirname + '/content'));
+app.use("/standalone/content", express.static(__dirname + "/content"));
 
 // We load /content this from  both /content *and* /../content. The first one
 // does what we need for running in the github loop-client context, the second one
 // handles running in the hg repo under mozilla-central and is used so that the shared
 // files are in the right location.
-app.use('/content', express.static(__dirname + '/content'));
-app.use('/content', express.static(__dirname + '/../content'));
+app.use("/content", express.static(__dirname + "/content"));
+app.use("/content", express.static(__dirname + "/../content"));
 // These two are based on the above, but handle call urls, that have a /c/ in them.
-app.use('/content/c', express.static(__dirname + '/content'));
-app.use('/content/c', express.static(__dirname + '/../content'));
+app.use("/content/c", express.static(__dirname + "/content"));
+app.use("/content/c", express.static(__dirname + "/../content"));
 
 // Two lines for the same reason as /content above.
-app.use('/test', express.static(__dirname + '/test'));
-app.use('/test', express.static(__dirname + '/../test'));
+app.use("/test", express.static(__dirname + "/test"));
+app.use("/test", express.static(__dirname + "/../test"));
 
 // As we don't have hashes on the urls, the best way to serve the index files
 // appears to be to be to closely filter the url and match appropriately.
 function serveIndex(req, res) {
-  return res.sendfile(__dirname + '/content/index.html');
+  return res.sendfile(__dirname + "/content/index.html");
 }
 
 app.get(/^\/content\/[\w\-]+$/, serveIndex);
@@ -114,4 +114,4 @@
   }
 }
 
-process.on('SIGTERM', shutdown);
+process.on("SIGTERM", shutdown);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/desktop-local/client_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/desktop-local/client_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/desktop-local/client_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/desktop-local/client_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -2,13 +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/. */
 
-/*global loop, sinon, it, beforeEach, afterEach, describe */
-
-var expect = chai.expect;
-
 describe("loop.Client", function() {
   "use strict";
 
+  var expect = chai.expect;
   var sandbox,
       callback,
       client,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/desktop-local/contacts_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/desktop-local/contacts_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/desktop-local/contacts_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/desktop-local/contacts_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -2,15 +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/. */
 
-/*jshint newcap:false*/
-/*global loop, sinon */
-
-var expect = chai.expect;
-var TestUtils = React.addons.TestUtils;
-
 describe("loop.contacts", function() {
   "use strict";
 
+  var expect = chai.expect;
+  var TestUtils = React.addons.TestUtils;
+
   var fakeAddContactButtonText = "Fake Add Contact";
   var fakeEditContactButtonText = "Fake Edit Contact";
   var fakeDoneButtonText = "Fake Done";
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/desktop-local/conversationAppStore_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/desktop-local/conversationAppStore_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/desktop-local/conversationAppStore_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/desktop-local/conversationAppStore_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -1,10 +1,9 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-var expect = chai.expect;
-
 describe("loop.store.ConversationAppStore", function () {
 
+  var expect = chai.expect;
   var sharedActions = loop.shared.actions;
   var sandbox, dispatcher;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/desktop-local/conversation_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/desktop-local/conversation_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/desktop-local/conversation_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/desktop-local/conversation_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -2,13 +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/. */
 
-/* global loop, sinon, React, TestUtils */
-
-var expect = chai.expect;
-
 describe("loop.conversation", function() {
   "use strict";
 
+  var expect = chai.expect;
+  var TestUtils = React.addons.TestUtils;
   var sharedModels = loop.shared.models,
       fakeWindow,
       sandbox;
@@ -47,7 +45,7 @@
         };
       },
       getAudioBlob: sinon.spy(function(name, callback) {
-        callback(null, new Blob([new ArrayBuffer(10)], {type: 'audio/ogg'}));
+        callback(null, new Blob([new ArrayBuffer(10)], {type: "audio/ogg"}));
       })
     };
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/desktop-local/conversationViews_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/desktop-local/conversationViews_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/desktop-local/conversationViews_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/desktop-local/conversationViews_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -1,11 +1,12 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-var expect = chai.expect;
-
 describe("loop.conversationViews", function () {
   "use strict";
 
+  var expect = chai.expect;
+  var TestUtils = React.addons.TestUtils;
+  var sharedActions = loop.shared.actions;
   var sharedUtils = loop.shared.utils;
   var sharedView = loop.shared.views;
   var sandbox, view, dispatcher, contact, fakeAudioXHR;
@@ -216,7 +217,7 @@
           enableCancelButton: false
         });
 
-        var cancelBtn = view.getDOMNode().querySelector('.btn-cancel');
+        var cancelBtn = view.getDOMNode().querySelector(".btn-cancel");
 
         expect(cancelBtn.classList.contains("disabled")).eql(true);
       });
@@ -230,7 +231,7 @@
           enableCancelButton: true
         });
 
-        var cancelBtn = view.getDOMNode().querySelector('.btn-cancel');
+        var cancelBtn = view.getDOMNode().querySelector(".btn-cancel");
 
         expect(cancelBtn.classList.contains("disabled")).eql(false);
       });
@@ -243,7 +244,7 @@
           dispatcher: dispatcher
         });
 
-        var cancelBtn = view.getDOMNode().querySelector('.btn-cancel');
+        var cancelBtn = view.getDOMNode().querySelector(".btn-cancel");
 
         React.addons.TestUtils.Simulate.click(cancelBtn);
 
@@ -289,7 +290,7 @@
       function() {
         view = mountTestComponent({contact: contact});
 
-        var retryBtn = view.getDOMNode().querySelector('.btn-retry');
+        var retryBtn = view.getDOMNode().querySelector(".btn-retry");
 
         React.addons.TestUtils.Simulate.click(retryBtn);
 
@@ -302,7 +303,7 @@
       function() {
         view = mountTestComponent({contact: contact});
 
-        var cancelBtn = view.getDOMNode().querySelector('.btn-cancel');
+        var cancelBtn = view.getDOMNode().querySelector(".btn-cancel");
 
         React.addons.TestUtils.Simulate.click(cancelBtn);
 
@@ -315,7 +316,7 @@
       function() {
         view = mountTestComponent({contact: contact});
 
-        var emailLinkBtn = view.getDOMNode().querySelector('.btn-email');
+        var emailLinkBtn = view.getDOMNode().querySelector(".btn-email");
 
         React.addons.TestUtils.Simulate.click(emailLinkBtn);
 
@@ -335,7 +336,7 @@
           name: ["Mr Fake ContactName"]
         }});
 
-        var emailLinkBtn = view.getDOMNode().querySelector('.btn-email');
+        var emailLinkBtn = view.getDOMNode().querySelector(".btn-email");
 
         React.addons.TestUtils.Simulate.click(emailLinkBtn);
 
@@ -347,7 +348,7 @@
     it("should disable the email link button once the action is dispatched",
       function() {
         view = mountTestComponent({contact: contact});
-        var emailLinkBtn = view.getDOMNode().querySelector('.btn-email');
+        var emailLinkBtn = view.getDOMNode().querySelector(".btn-email");
         React.addons.TestUtils.Simulate.click(emailLinkBtn);
 
         expect(view.getDOMNode().querySelector(".btn-email").disabled).eql(true);
@@ -498,7 +499,7 @@
           dispatcher: dispatcher
         });
 
-        var hangupBtn = view.getDOMNode().querySelector('.btn-hangup');
+        var hangupBtn = view.getDOMNode().querySelector(".btn-hangup");
 
         React.addons.TestUtils.Simulate.click(hangupBtn);
 
@@ -513,7 +514,7 @@
           audio: {enabled: false}
         });
 
-        var muteBtn = view.getDOMNode().querySelector('.btn-mute-audio');
+        var muteBtn = view.getDOMNode().querySelector(".btn-mute-audio");
 
         React.addons.TestUtils.Simulate.click(muteBtn);
 
@@ -532,7 +533,7 @@
           video: {enabled: true}
         });
 
-        var muteBtn = view.getDOMNode().querySelector('.btn-mute-video');
+        var muteBtn = view.getDOMNode().querySelector(".btn-mute-video");
 
         React.addons.TestUtils.Simulate.click(muteBtn);
 
@@ -550,7 +551,7 @@
         video: {enabled: true}
       });
 
-      var muteBtn = view.getDOMNode().querySelector('.btn-mute-video');
+      var muteBtn = view.getDOMNode().querySelector(".btn-mute-video");
 
       expect(muteBtn.classList.contains("muted")).eql(false);
     });
@@ -561,7 +562,7 @@
         audio: {enabled: false}
       });
 
-      var muteBtn = view.getDOMNode().querySelector('.btn-mute-audio');
+      var muteBtn = view.getDOMNode().querySelector(".btn-mute-audio");
 
       expect(muteBtn.classList.contains("muted")).eql(true);
     });
@@ -768,7 +769,7 @@
         });
 
         var primaryBtn = view.getDOMNode()
-                                  .querySelector('.fx-embedded-btn-icon-video');
+                                  .querySelector(".fx-embedded-btn-icon-video");
 
         expect(primaryBtn).not.to.eql(null);
       });
@@ -780,7 +781,7 @@
         });
 
         var primaryBtn = view.getDOMNode()
-                                  .querySelector('.fx-embedded-btn-icon-audio');
+                                  .querySelector(".fx-embedded-btn-icon-audio");
 
         expect(primaryBtn).not.to.eql(null);
       });
@@ -792,7 +793,7 @@
         });
 
         var primaryBtn = view.getDOMNode()
-                                  .querySelector('.fx-embedded-btn-icon-video');
+                                  .querySelector(".fx-embedded-btn-icon-video");
 
         React.addons.TestUtils.Simulate.click(primaryBtn);
 
@@ -810,7 +811,7 @@
         });
 
         var primaryBtn = view.getDOMNode()
-                                  .querySelector('.fx-embedded-btn-icon-audio');
+                                  .querySelector(".fx-embedded-btn-icon-audio");
 
         React.addons.TestUtils.Simulate.click(primaryBtn);
 
@@ -829,7 +830,7 @@
           });
 
           var secondaryBtn = view.getDOMNode()
-          .querySelector('.fx-embedded-btn-video-small');
+          .querySelector(".fx-embedded-btn-video-small");
 
           React.addons.TestUtils.Simulate.click(secondaryBtn);
 
@@ -848,7 +849,7 @@
           });
 
           var secondaryBtn = view.getDOMNode()
-          .querySelector('.fx-embedded-btn-audio-small');
+          .querySelector(".fx-embedded-btn-audio-small");
 
           React.addons.TestUtils.Simulate.click(secondaryBtn);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/desktop-local/index.html firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/desktop-local/index.html
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/desktop-local/index.html	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/desktop-local/index.html	2015-05-25 20:42:47.000000000 +0000
@@ -55,6 +55,8 @@
   <script src="../../content/shared/js/activeRoomStore.js"></script>
   <script src="../../content/shared/js/feedbackStore.js"></script>
   <script src="../../content/shared/js/views.js"></script>
+  <script src="../../content/shared/js/textChatStore.js"></script>
+  <script src="../../content/shared/js/textChatView.js"></script>
   <script src="../../content/shared/js/feedbackViews.js"></script>
   <script src="../../content/js/client.js"></script>
   <script src="../../content/js/conversationAppStore.js"></script>
@@ -82,7 +84,7 @@
 
     describe("Uncaught Error Check", function() {
       it("should load the tests without errors", function() {
-        expect(uncaughtError && uncaughtError.message).to.be.undefined;
+        chai.expect(uncaughtError && uncaughtError.message).to.be.undefined;
       });
     });
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/desktop-local/panel_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/desktop-local/panel_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/desktop-local/panel_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/desktop-local/panel_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -2,17 +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/. */
 
-/*jshint newcap:false*/
-/*global loop, sinon */
-
-var expect = chai.expect;
-var TestUtils = React.addons.TestUtils;
-var sharedActions = loop.shared.actions;
-var sharedUtils = loop.shared.utils;
-
 describe("loop.panel", function() {
   "use strict";
 
+  var expect = chai.expect;
+  var TestUtils = React.addons.TestUtils;
+  var sharedActions = loop.shared.actions;
+  var sharedUtils = loop.shared.utils;
+
   var sandbox, notifications;
   var fakeXHR, fakeWindow, fakeMozLoop;
   var requests = [];
@@ -205,7 +202,7 @@
         .to.have.length.of(0);
     });
 
-    describe('TabView', function() {
+    describe("TabView", function() {
       var view, callTab, roomsTab, contactsTab;
 
       beforeEach(function() {
@@ -794,10 +791,12 @@
     it("should dispatch a CreateRoom action with context when clicking on the " +
        "Start a conversation button", function() {
       fakeMozLoop.userProfile = {email: fakeEmail};
+      var favicon = "data:image/x-icon;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==";
       fakeMozLoop.getSelectedTabMetadata = function (callback) {
         callback({
           url: "http://invalid.com",
           description: "fakeSite",
+          favicon: favicon,
           previews: ["fakeimage.png"]
         });
       };
@@ -810,8 +809,7 @@
       var node = view.getDOMNode();
 
       // Select the checkbox
-      TestUtils.Simulate.change(node.querySelector(".context-checkbox"),
-        {"target": {"checked": true}});
+      TestUtils.Simulate.click(node.querySelector(".checkbox-wrapper"));
 
       TestUtils.Simulate.click(node.querySelector(".new-room-button"));
 
@@ -821,7 +819,7 @@
         urls: [{
           location: "http://invalid.com",
           description: "fakeSite",
-          thumbnail: "fakeimage.png"
+          thumbnail: favicon
         }]
       }));
     });
@@ -848,8 +846,8 @@
       // Simulate being visible
       view.onDocumentVisible();
 
-      var contextEnabledCheckbox = view.getDOMNode().querySelector(".context-enabled");
-      expect(contextEnabledCheckbox).to.not.equal(null);
+      var contextContent = view.getDOMNode().querySelector(".context-content");
+      expect(contextContent).to.not.equal(null);
     });
 
     it("should not show context information when a URL is unavailable", function() {
@@ -886,9 +884,29 @@
       var contextHostname = view.getDOMNode().querySelector(".context-url");
       expect(contextHostname.textContent).eql("www.example.com");
     });
+
+    it("should show the favicon when available", function() {
+      var favicon = "data:image/x-icon;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==";
+      fakeMozLoop.getSelectedTabMetadata = function (callback) {
+        callback({
+          url: "https://www.example.com:1234",
+          description: "fake description",
+          favicon: favicon,
+          previews: ["foo.gif"]
+        });
+      };
+
+      var view = createTestComponent();
+
+      // Simulate being visible.
+      view.onDocumentVisible();
+
+      var contextPreview = view.getDOMNode().querySelector(".context-preview");
+      expect(contextPreview.src).eql(favicon);
+    });
   });
 
-  describe('loop.panel.ToSView', function() {
+  describe("loop.panel.ToSView", function() {
 
     it("should render when the value of loop.seenToS is not set", function() {
       navigator.mozLoop.getLoopPref = function(key) {
@@ -904,8 +922,7 @@
       TestUtils.findRenderedDOMComponentWithClass(view, "terms-service");
     });
 
-    it("should not render when the value of loop.seenToS is set to 'seen'",
-      function(done) {
+    it("should not render when the value of loop.seenToS is set to 'seen'", function() {
         navigator.mozLoop.getLoopPref = function(key) {
           return {
             "gettingStarted.seen": true,
@@ -913,11 +930,12 @@
           }[key];
         };
 
-        try {
+        var view = TestUtils.renderIntoDocument(
+          React.createElement(loop.panel.ToSView));
+
+        expect(function() {
           TestUtils.findRenderedDOMComponentWithClass(view, "terms-service");
-        } catch (err) {
-          done();
-        }
+        }).to.Throw(/not find/);
     });
 
     it("should render when the value of loop.gettingStarted.seen is false",
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/desktop-local/roomViews_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/desktop-local/roomViews_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/desktop-local/roomViews_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/desktop-local/roomViews_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -1,15 +1,19 @@
-var expect = chai.expect;
-
-/* jshint newcap:false */
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 describe("loop.roomViews", function () {
   "use strict";
 
+  var expect = chai.expect;
+  var TestUtils = React.addons.TestUtils;
+  var sharedActions = loop.shared.actions;
+  var sharedUtils = loop.shared.utils;
   var ROOM_STATES = loop.store.ROOM_STATES;
   var SCREEN_SHARE_STATES = loop.shared.utils.SCREEN_SHARE_STATES;
 
   var sandbox, dispatcher, roomStore, activeRoomStore, fakeWindow,
     fakeMozLoop, fakeContextURL;
+  var favicon = "data:image/x-icon;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==";
 
   beforeEach(function() {
     sandbox = sinon.sandbox.create();
@@ -20,10 +24,22 @@
       getAudioBlob: sinon.stub(),
       getLoopPref: sinon.stub(),
       getSelectedTabMetadata: sinon.stub().callsArgWith(0, {
+        favicon: favicon,
         previews: [],
         title: ""
       }),
-      isSocialShareButtonAvailable: sinon.stub()
+      isSocialShareButtonAvailable: sinon.stub(),
+      rooms: {
+        get: sinon.stub().callsArgWith(1, null, {
+          roomToken: "fakeToken",
+          roomName: "fakeName",
+          decryptedContext: {
+            roomName: "fakeName",
+            urls: []
+          }
+        }),
+        update: sinon.stub().callsArgWith(2, null)
+      }
     };
 
     fakeWindow = {
@@ -49,7 +65,7 @@
       sdkDriver: {}
     });
     roomStore = new loop.store.RoomStore(dispatcher, {
-      mozLoop: {},
+      mozLoop: fakeMozLoop,
       activeRoomStore: activeRoomStore
     });
 
@@ -296,7 +312,7 @@
 
         view.setState({audioMuted: true});
 
-        var muteBtn = view.getDOMNode().querySelector('.btn-mute-audio');
+        var muteBtn = view.getDOMNode().querySelector(".btn-mute-audio");
 
         React.addons.TestUtils.Simulate.click(muteBtn);
 
@@ -314,7 +330,7 @@
 
         view.setState({videoMuted: false});
 
-        var muteBtn = view.getDOMNode().querySelector('.btn-mute-video');
+        var muteBtn = view.getDOMNode().querySelector(".btn-mute-video");
 
         React.addons.TestUtils.Simulate.click(muteBtn);
 
@@ -331,7 +347,7 @@
 
       view.setState({videoMuted: false});
 
-      var muteBtn = view.getDOMNode().querySelector('.btn-mute-video');
+      var muteBtn = view.getDOMNode().querySelector(".btn-mute-video");
 
       expect(muteBtn.classList.contains("muted")).eql(false);
     });
@@ -341,7 +357,7 @@
 
       view.setState({audioMuted: true});
 
-      var muteBtn = view.getDOMNode().querySelector('.btn-mute-audio');
+      var muteBtn = view.getDOMNode().querySelector(".btn-mute-audio");
 
       expect(muteBtn.classList.contains("muted")).eql(true);
     });
@@ -352,7 +368,7 @@
 
       view.setState({screenSharingState: SCREEN_SHARE_STATES.INACTIVE});
 
-      var muteBtn = view.getDOMNode().querySelector('.btn-mute-video');
+      var muteBtn = view.getDOMNode().querySelector(".btn-mute-video");
 
       React.addons.TestUtils.Simulate.click(muteBtn);
 
@@ -723,6 +739,32 @@
         var checkbox = view.getDOMNode().querySelector(".checkbox");
         expect(checkbox.classList.contains("disabled")).to.eql(true);
       });
+
+      it("should render the editMode view when the edit button is clicked", function(next) {
+        var roomName = "Hello, is it me you're looking for?";
+        view = mountTestComponent({
+          roomData: {
+            roomToken: "fakeToken",
+            roomName: roomName,
+            roomContextUrls: [fakeContextURL]
+          }
+        });
+
+        // Switch to editMode via setting the prop, since we can control that
+        // better.
+        view.setProps({ editMode: true }, function() {
+          // First check if availableContext is set correctly.
+          expect(view.state.availableContext).to.not.eql(null);
+          expect(view.state.availableContext.previewImage).to.eql(favicon);
+
+          var node = view.getDOMNode();
+          expect(node.querySelector(".room-context-name").value).to.eql(roomName);
+          expect(node.querySelector(".room-context-url").value).to.eql(fakeContextURL.location);
+          expect(node.querySelector(".room-context-comments").value).to.eql(fakeContextURL.description);
+
+          next();
+        });
+      });
     });
 
     describe("Update Room", function() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/functional/config.py firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/functional/config.py
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/functional/config.py	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/functional/config.py	2015-05-25 20:42:47.000000000 +0000
@@ -6,7 +6,6 @@
     "loop.server": LOOP_SERVER_URL + "/v0",
     "browser.dom.window.dump.enabled": True,
     # Some more changes might be necesarry to have this working in offline mode
-    "media.peerconnection.default_iceservers": "[]",
     "media.peerconnection.use_document_iceservers": False,
     "media.peerconnection.ice.loopback": True,
     "devtools.chrome.enabled": True,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/mochitest/browser_CardDavImporter.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/mochitest/browser_CardDavImporter.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/mochitest/browser_CardDavImporter.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/mochitest/browser_CardDavImporter.js	2015-05-25 20:42:47.000000000 +0000
@@ -91,18 +91,18 @@
     '<?xml version="1.0" encoding="UTF-8"?>\n' +
     '<d:multistatus xmlns:card="urn:ietf:params:xml:ns:carddav"\n' +
     '               xmlns:d="DAV:">\n' +
-    ' <d:response>\n' +
-    '  <d:href>/carddav/abook/</d:href>\n' +
-    '  <d:propstat>\n' +
-    '   <d:status>HTTP/1.1 200 OK</d:status>\n' +
-    '  </d:propstat>\n' +
-    '  <d:propstat>\n' +
-    '   <d:status>HTTP/1.1 404 Not Found</d:status>\n' +
-    '   <d:prop>\n' +
-    '    <d:getetag/>\n' +
-    '   </d:prop>\n' +
-    '  </d:propstat>\n' +
-    ' </d:response>\n';
+    " <d:response>\n" +
+    "  <d:href>/carddav/abook/</d:href>\n" +
+    "  <d:propstat>\n" +
+    "   <d:status>HTTP/1.1 200 OK</d:status>\n" +
+    "  </d:propstat>\n" +
+    "  <d:propstat>\n" +
+    "   <d:status>HTTP/1.1 404 Not Found</d:status>\n" +
+    "   <d:prop>\n" +
+    "    <d:getetag/>\n" +
+    "   </d:prop>\n" +
+    "  </d:propstat>\n" +
+    " </d:response>\n";
 
   let listReportMultiget =
     '<?xml version="1.0" encoding="UTF-8"?>\n' +
@@ -112,27 +112,27 @@
   vcards.forEach(vcard => {
     let uid = /\nUID:(.*?)\n/.exec(vcard);
     listPropfind +=
-      ' <d:response>\n' +
-      '  <d:href>/carddav/abook/' + uid + '</d:href>\n' +
-      '  <d:propstat>\n' +
-      '   <d:status>HTTP/1.1 200 OK</d:status>\n' +
-      '   <d:prop>\n' +
+      " <d:response>\n" +
+      "  <d:href>/carddav/abook/" + uid + "</d:href>\n" +
+      "  <d:propstat>\n" +
+      "   <d:status>HTTP/1.1 200 OK</d:status>\n" +
+      "   <d:prop>\n" +
       '    <d:getetag>"2011-07-12T07:43:20.855-07:00"</d:getetag>\n' +
-      '   </d:prop>\n' +
-      '  </d:propstat>\n' +
-      ' </d:response>\n';
+      "   </d:prop>\n" +
+      "  </d:propstat>\n" +
+      " </d:response>\n";
 
     listReportMultiget +=
-      ' <d:response>\n' +
-      '  <d:href>/carddav/abook/' + uid + '</d:href>\n' +
-      '  <d:propstat>\n' +
-      '   <d:status>HTTP/1.1 200 OK</d:status>\n' +
-      '   <d:prop>\n' +
+      " <d:response>\n" +
+      "  <d:href>/carddav/abook/" + uid + "</d:href>\n" +
+      "  <d:propstat>\n" +
+      "   <d:status>HTTP/1.1 200 OK</d:status>\n" +
+      "   <d:prop>\n" +
       '    <d:getetag>"2011-07-12T07:43:20.855-07:00"</d:getetag>\n' +
-      '    <card:address-data>' + vcard + '</card:address-data>\n' +
-      '   </d:prop>\n' +
-      '  </d:propstat>\n' +
-      ' </d:response>\n';
+      "    <card:address-data>" + vcard + "</card:address-data>\n" +
+      "   </d:prop>\n" +
+      "  </d:propstat>\n" +
+      " </d:response>\n";
   });
 
   listPropfind += "</d:multistatus>\n";
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/mochitest/browser_fxa_login.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/mochitest/browser_fxa_login.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/mochitest/browser_fxa_login.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/mochitest/browser_fxa_login.js	2015-05-25 20:42:47.000000000 +0000
@@ -11,13 +11,13 @@
 
 function* checkFxA401() {
   let err = MozLoopService.errors.get("login");
-  ise(err.code, 401, "Check error code");
-  ise(err.friendlyMessage, getLoopString("could_not_authenticate"),
-      "Check friendlyMessage");
-  ise(err.friendlyDetails, getLoopString("password_changed_question"),
-      "Check friendlyDetails");
-  ise(err.friendlyDetailsButtonLabel, getLoopString("retry_button"),
-      "Check friendlyDetailsButtonLabel");
+  is(err.code, 401, "Check error code");
+  is(err.friendlyMessage, getLoopString("could_not_authenticate"),
+     "Check friendlyMessage");
+  is(err.friendlyDetails, getLoopString("password_changed_question"),
+     "Check friendlyDetails");
+  is(err.friendlyDetailsButtonLabel, getLoopString("retry_button"),
+     "Check friendlyDetailsButtonLabel");
   let loopButton = document.getElementById("loop-button");
   is(loopButton.getAttribute("state"), "error",
      "state of loop button should be error after a 401 with login");
@@ -65,11 +65,11 @@
   yield promiseOAuthParamsSetup(BASE_URL, params);
   let client = yield MozLoopServiceInternal.promiseFxAOAuthClient();
   for (let key of Object.keys(params)) {
-    ise(client.parameters[key], params[key], "Check " + key + " was passed to the OAuth client");
+    is(client.parameters[key], params[key], "Check " + key + " was passed to the OAuth client");
   }
   let prefName = MozLoopServiceInternal.getSessionTokenPrefName(LOOP_SESSION_TYPE.FXA);
   let padding = "X".repeat(HAWK_TOKEN_LENGTH - params.client_id.length);
-  ise(Services.prefs.getCharPref(prefName), params.client_id + padding, "Check FxA hawk token");
+  is(Services.prefs.getCharPref(prefName), params.client_id + padding, "Check FxA hawk token");
 });
 
 add_task(function* basicAuthorization() {
@@ -82,7 +82,7 @@
   yield resetFxA();
   let client1 = yield MozLoopServiceInternal.promiseFxAOAuthClient();
   let client2 = yield MozLoopServiceInternal.promiseFxAOAuthClient();
-  ise(client1, client2, "The same client should be returned");
+  is(client1, client2, "The same client should be returned");
 });
 
 add_task(function* paramsInvalid() {
@@ -120,9 +120,9 @@
   });
   ok(caught, "Should have caught the rejection");
   let prefName = MozLoopServiceInternal.getSessionTokenPrefName(LOOP_SESSION_TYPE.FXA);
-  ise(Services.prefs.getPrefType(prefName),
-      Services.prefs.PREF_INVALID,
-      "Check FxA hawk token is not set");
+  is(Services.prefs.getPrefType(prefName),
+     Services.prefs.PREF_INVALID,
+     "Check FxA hawk token is not set");
 });
 
 add_task(function* params_nonJSON() {
@@ -299,9 +299,9 @@
   statusChangedPromise = promiseObserverNotified("loop-status-changed", "login");
   let tokenData = yield MozLoopService.logInToFxA();
   yield statusChangedPromise;
-  ise(tokenData.access_token, "code1_access_token", "Check access_token");
-  ise(tokenData.scope, "profile", "Check scope");
-  ise(tokenData.token_type, "bearer", "Check token_type");
+  is(tokenData.access_token, "code1_access_token", "Check access_token");
+  is(tokenData.scope, "profile", "Check scope");
+  is(tokenData.token_type, "bearer", "Check token_type");
 
   is(MozLoopService.userProfile.email, "test@example.com", "email should exist in the profile data");
   is(MozLoopService.userProfile.uid, "1234abcd", "uid should exist in the profile data");
@@ -309,10 +309,10 @@
   is(loopButton.getAttribute("state"), "active", "state of loop button should be active when logged in");
 
   let registrationResponse = yield promiseOAuthGetRegistration(BASE_URL);
-  ise(registrationResponse.response.simplePushURLs.calls, "https://localhost/pushUrl/fxa-calls",
-      "Check registered push URL");
-  ise(registrationResponse.response.simplePushURLs.rooms, "https://localhost/pushUrl/fxa-rooms",
-      "Check registered push URL");
+  is(registrationResponse.response.simplePushURLs.calls, "https://localhost/pushUrl/fxa-calls",
+     "Check registered push URL");
+  is(registrationResponse.response.simplePushURLs.rooms, "https://localhost/pushUrl/fxa-rooms",
+     "Check registered push URL");
 
   let loopPanel = document.getElementById("loop-notification-panel");
   loopPanel.hidePopup();
@@ -326,8 +326,8 @@
   yield MozLoopService.logOutFromFxA();
   checkLoggedOutState();
   registrationResponse = yield promiseOAuthGetRegistration(BASE_URL);
-  ise(registrationResponse.response, null,
-      "Check registration was deleted on the server");
+  is(registrationResponse.response, null,
+     "Check registration was deleted on the server");
   is(visibleEmail.textContent, "Guest", "Guest should be displayed on the panel again after logout");
   is(MozLoopService.userProfile, null, "userProfile should be null after logout");
 });
@@ -350,7 +350,7 @@
     ok(false, "Promise should have rejected");
   },
   error => {
-    ise(error.code, 401, "Check error code");
+    is(error.code, 401, "Check error code");
     checkFxAOAuthTokenData(null);
   });
 
@@ -365,7 +365,7 @@
   Services.prefs.setCharPref(fxASessionPref, "X".repeat(HAWK_TOKEN_LENGTH));
   yield MozLoopServiceInternal.registerWithLoopServer(LOOP_SESSION_TYPE.FXA, "calls", pushURL);
   let registrationResponse = yield promiseOAuthGetRegistration(BASE_URL);
-  ise(registrationResponse.response.simplePushURLs.calls, pushURL, "Check registered push URL");
+  is(registrationResponse.response.simplePushURLs.calls, pushURL, "Check registered push URL");
   MozLoopServiceInternal.pushURLs.get(LOOP_SESSION_TYPE.FXA).calls = "http://www.example.com/invalid";
   let caught = false;
   yield MozLoopService.logOutFromFxA().catch((error) => {
@@ -374,7 +374,7 @@
   ok(caught, "Should have caught an error logging out with a mismatched push URL");
   checkLoggedOutState();
   registrationResponse = yield promiseOAuthGetRegistration(BASE_URL);
-  ise(registrationResponse.response.simplePushURLs.calls, pushURL, "Check registered push URL wasn't deleted");
+  is(registrationResponse.response.simplePushURLs.calls, pushURL, "Check registered push URL wasn't deleted");
 });
 
 add_task(function* logoutWithNoPushURL() {
@@ -386,12 +386,12 @@
 
   yield MozLoopServiceInternal.registerWithLoopServer(LOOP_SESSION_TYPE.FXA, "calls", pushURL);
   let registrationResponse = yield promiseOAuthGetRegistration(BASE_URL);
-  ise(registrationResponse.response.simplePushURLs.calls, pushURL, "Check registered push URL");
+  is(registrationResponse.response.simplePushURLs.calls, pushURL, "Check registered push URL");
   MozLoopServiceInternal.pushURLs.delete(LOOP_SESSION_TYPE.FXA);
   yield MozLoopService.logOutFromFxA();
   checkLoggedOutState();
   registrationResponse = yield promiseOAuthGetRegistration(BASE_URL);
-  ise(registrationResponse.response.simplePushURLs.calls, pushURL, "Check registered push URL wasn't deleted");
+  is(registrationResponse.response.simplePushURLs.calls, pushURL, "Check registered push URL wasn't deleted");
 });
 
 add_task(function* loginWithRegistration401() {
@@ -411,7 +411,7 @@
     ok(false, "Promise should have rejected");
   },
   error => {
-    ise(error.code, 401, "Check error code");
+    is(error.code, 401, "Check error code");
     checkFxAOAuthTokenData(null);
   });
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/mochitest/browser.ini firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/mochitest/browser.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/mochitest/browser.ini	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/mochitest/browser.ini	2015-05-25 20:42:47.000000000 +0000
@@ -16,6 +16,7 @@
 [browser_loop_fxa_server.js]
 [browser_LoopContacts.js]
 [browser_mozLoop_appVersionInfo.js]
+[browser_mozLoop_context.js]
 [browser_mozLoop_prefs.js]
 [browser_mozLoop_doNotDisturb.js]
 skip-if = buildapp == 'mulet'
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/mochitest/browser_loop_fxa_server.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/mochitest/browser_loop_fxa_server.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/mochitest/browser_loop_fxa_server.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/mochitest/browser_loop_fxa_server.js	2015-05-25 20:42:47.000000000 +0000
@@ -68,10 +68,10 @@
   yield promiseOAuthParamsSetup(BASE_URL, params);
 
   let request = yield promiseToken("my_code", params.state);
-  ise(request.status, 200, "Check token response status");
-  ise(request.response.access_token, "my_code_access_token", "Check access_token");
-  ise(request.response.scope, "profile", "Check scope");
-  ise(request.response.token_type, "bearer", "Check token_type");
+  is(request.status, 200, "Check token response status");
+  is(request.response.access_token, "my_code_access_token", "Check access_token");
+  is(request.response.scope, "profile", "Check scope");
+  is(request.response.token_type, "bearer", "Check token_type");
 });
 
 add_task(function* token_request_invalid_state() {
@@ -84,8 +84,8 @@
   };
   yield promiseOAuthParamsSetup(BASE_URL, params);
   let request = yield promiseToken("my_code", "my_state");
-  ise(request.status, 400, "Check token response status");
-  ise(request.response, null, "Check token response body");
+  is(request.status, 400, "Check token response status");
+  is(request.response, null, "Check token response body");
 });
 
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/mochitest/browser_mozLoop_context.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/mochitest/browser_mozLoop_context.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/mochitest/browser_mozLoop_context.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/mochitest/browser_mozLoop_context.js	2015-05-25 20:42:47.000000000 +0000
@@ -0,0 +1,37 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/*
+ * This file contains tests for various context-in-conversations helpers in
+ * LoopUI and MozLoopAPI.
+ */
+"use strict";
+
+add_task(loadLoopPanel);
+
+function promiseGetMetadata() {
+  return new Promise(resolve => gMozLoopAPI.getSelectedTabMetadata(resolve));
+}
+
+add_task(function* test_mozLoop_getSelectedTabMetadata() {
+  Assert.ok(gMozLoopAPI, "mozLoop should exist");
+
+  let metadata = yield promiseGetMetadata();
+
+  Assert.strictEqual(metadata.url, null, "URL should be empty for about:blank");
+  Assert.strictEqual(metadata.favicon, null, "Favicon should be empty for about:blank");
+  Assert.strictEqual(metadata.title, "", "Title should be empty for about:blank");
+  Assert.deepEqual(metadata.previews, [], "No previews available for about:blank");
+
+  let tab = gBrowser.selectedTab = gBrowser.addTab();
+  yield promiseTabLoadEvent(tab, "about:home");
+  metadata = yield promiseGetMetadata();
+
+  Assert.strictEqual(metadata.url, null, "URL should be empty for about:home");
+  Assert.ok(metadata.favicon.startsWith("data:image/x-icon;base64,"),
+    "Favicon should be set for about:home");
+  Assert.ok(metadata.title, "Title should be set for about:home");
+  Assert.deepEqual(metadata.previews, [], "No previews available for about:home");
+
+  gBrowser.removeTab(tab);
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/mochitest/.eslintrc firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/mochitest/.eslintrc
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/mochitest/.eslintrc	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/mochitest/.eslintrc	2015-05-25 20:42:47.000000000 +0000
@@ -1,17 +1,35 @@
 {
-  "ecmaFeatures": {
-    "arrowFunctions": true,
-    "blockBindings": true,
-    "destructuring": true,
-    "generators": true,
-    "restParams": true,
-    "spread": true,
-    "objectLiteralShorthandMethods": true,
-  },
-  "rules": {
-    "generator-star-spacing": [2, "after"],
-    // We should fix the errors and enable this (set to 2)
-    "no-var": 0,
-    "strict": [2, "global"]
+  "extends": "../../.eslintrc-gecko",
+  "globals": {
+    // General test items.
+    "add_task": false,
+    "Cc": true,
+    "Ci": true,
+    "Cr": true,
+    "Cu": true,
+    "is": false,
+    "info": false,
+    "ok": false,
+    "registerCleanupFunction": false,
+    // head.js items
+    "HAWK_TOKEN_LENGTH": true,
+    "checkLoggedOutState": false,
+    "checkFxAOAuthTokenData": false,
+    "loadLoopPanel": false,
+    "getLoopString": false,
+    "gMozLoopAPI": true,
+    "mockDb": true,
+    "mockPushHandler": true,
+    "promiseDeletedOAuthParams": false,
+    "promiseOAuthGetRegistration": false,
+    "promiseOAuthParamsSetup": false,
+    "promiseObserverNotified": false,
+    "promiseTabLoadEvent": false,
+    "promiseWaitForCondition": false,
+    "resetFxA": true,
+    // Loop specific items
+    "MozLoopServiceInternal": true,
+    "LoopRoomsInternal": true,
+    "LoopUI": false,
   }
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/mochitest/head.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/mochitest/head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/mochitest/head.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/mochitest/head.js	2015-05-25 20:42:47.000000000 +0000
@@ -157,18 +157,18 @@
 }
 
 function checkFxAOAuthTokenData(aValue) {
-  ise(MozLoopServiceInternal.fxAOAuthTokenData, aValue, "fxAOAuthTokenData should be " + aValue);
+  is(MozLoopServiceInternal.fxAOAuthTokenData, aValue, "fxAOAuthTokenData should be " + aValue);
 }
 
 function checkLoggedOutState() {
   let global = Cu.import("resource:///modules/loop/MozLoopService.jsm", {});
-  ise(global.gFxAOAuthClientPromise, null, "gFxAOAuthClientPromise should be cleared");
-  ise(MozLoopService.userProfile, null, "fxAOAuthProfile should be cleared");
-  ise(global.gFxAOAuthClient, null, "gFxAOAuthClient should be cleared");
+  is(global.gFxAOAuthClientPromise, null, "gFxAOAuthClientPromise should be cleared");
+  is(MozLoopService.userProfile, null, "fxAOAuthProfile should be cleared");
+  is(global.gFxAOAuthClient, null, "gFxAOAuthClient should be cleared");
   checkFxAOAuthTokenData(null);
   const fxASessionPref = MozLoopServiceInternal.getSessionTokenPrefName(LOOP_SESSION_TYPE.FXA);
-  ise(Services.prefs.getPrefType(fxASessionPref), Services.prefs.PREF_INVALID,
-      "FxA hawk session should be cleared anyways");
+  is(Services.prefs.getPrefType(fxASessionPref), Services.prefs.PREF_INVALID,
+     "FxA hawk session should be cleared anyways");
 }
 
 function promiseDeletedOAuthParams(baseURL) {
@@ -351,7 +351,7 @@
     callback(null);
   },
   promise: function(method, ...params) {
-    return new Promise(resolve => {
+    return new Promise((resolve, reject) => {
       this[method](...params, (err, res) => err ? reject(err) : resolve(res));
     });
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/activeRoomStore_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/activeRoomStore_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/activeRoomStore_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/activeRoomStore_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -1,11 +1,11 @@
-/* global chai, loop */
-
-var expect = chai.expect;
-var sharedActions = loop.shared.actions;
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 describe("loop.store.ActiveRoomStore", function () {
   "use strict";
 
+  var expect = chai.expect;
+  var sharedActions = loop.shared.actions;
   var REST_ERRNOS = loop.shared.utils.REST_ERRNOS;
   var ROOM_STATES = loop.store.ROOM_STATES;
   var FAILURE_DETAILS = loop.shared.utils.FAILURE_DETAILS;
@@ -269,7 +269,7 @@
         }));
 
         expect(store.getStoreState()).
-          to.have.property('roomState', ROOM_STATES.GATHER);
+          to.have.property("roomState", ROOM_STATES.GATHER);
       });
 
     it("should dispatch an SetupRoomInfo action if the get is successful",
@@ -619,6 +619,10 @@
   });
 
   describe("#joinRoom", function() {
+    beforeEach(function() {
+      store.setStoreState({roomState: ROOM_STATES.READY});
+    });
+
     it("should reset failureReason", function() {
       store.setStoreState({failureReason: "Test"});
 
@@ -627,13 +631,33 @@
       expect(store.getStoreState().failureReason).eql(undefined);
     });
 
-    it("should set the state to MEDIA_WAIT", function() {
-      store.setStoreState({roomState: ROOM_STATES.READY});
+    it("should set the state to MEDIA_WAIT if media devices are present", function() {
+      sandbox.stub(loop.shared.utils, "hasAudioDevices").callsArgWith(0, true);
 
       store.joinRoom();
 
       expect(store.getStoreState().roomState).eql(ROOM_STATES.MEDIA_WAIT);
     });
+
+    it("should not set the state to MEDIA_WAIT if no media devices are present", function() {
+      sandbox.stub(loop.shared.utils, "hasAudioDevices").callsArgWith(0, false);
+
+      store.joinRoom();
+
+      expect(store.getStoreState().roomState).eql(ROOM_STATES.READY);
+    });
+
+    it("should dispatch `ConnectionFailure` if no media devices are present", function() {
+      sandbox.stub(loop.shared.utils, "hasAudioDevices").callsArgWith(0, false);
+
+      store.joinRoom();
+
+      sinon.assert.calledOnce(dispatcher.dispatch);
+      sinon.assert.calledWithExactly(dispatcher.dispatch,
+        new sharedActions.ConnectionFailure({
+          reason: FAILURE_DETAILS.NO_MEDIA
+        }));
+    });
   });
 
   describe("#gotMediaPermission", function() {
@@ -1318,7 +1342,11 @@
 
         var fakeRoomData = {
           decryptedContext: {
-            roomName: "fakeName"
+            description: "fakeDescription",
+            roomName: "fakeName",
+            urls: {
+              fake: "url"
+            }
           },
           roomOwner: "you",
           roomUrl: "original"
@@ -1329,9 +1357,13 @@
         sinon.assert.calledOnce(dispatcher.dispatch);
         sinon.assert.calledWithExactly(dispatcher.dispatch,
           new sharedActions.UpdateRoomInfo({
+            description: "fakeDescription",
             roomName: fakeRoomData.decryptedContext.roomName,
             roomOwner: fakeRoomData.roomOwner,
-            roomUrl: fakeRoomData.roomUrl
+            roomUrl: fakeRoomData.roomUrl,
+            urls: {
+              fake: "url"
+            }
           }));
       });
     });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/conversationStore_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/conversationStore_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/conversationStore_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/conversationStore_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -1,11 +1,10 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-var expect = chai.expect;
-
 describe("loop.store.ConversationStore", function () {
   "use strict";
 
+  var expect = chai.expect;
   var CALL_STATES = loop.store.CALL_STATES;
   var WS_STATES = loop.store.WS_STATES;
   var CALL_TYPES = loop.shared.utils.CALL_TYPES;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/crypto_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/crypto_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/crypto_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/crypto_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -2,13 +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/. */
 
-/* global loop, sinon */
-
-var expect = chai.expect;
-
 describe("loop.crypto", function() {
   "use strict";
 
+  var expect = chai.expect;
   var sandbox, oldCrypto;
 
   beforeEach(function() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/dispatcher_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/dispatcher_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/dispatcher_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/dispatcher_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -1,11 +1,10 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-var expect = chai.expect;
-
 describe("loop.Dispatcher", function () {
   "use strict";
 
+  var expect = chai.expect;
   var sharedActions = loop.shared.actions;
   var dispatcher, sandbox;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/feedbackApiClient_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/feedbackApiClient_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/feedbackApiClient_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/feedbackApiClient_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -2,13 +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/. */
 
-/*global loop, sinon, it, beforeEach, afterEach, describe */
-
-var expect = chai.expect;
-
 describe("loop.FeedbackAPIClient", function() {
   "use strict";
 
+  var expect = chai.expect;
   var sandbox,
       fakeXHR,
       requests = [];
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/feedbackStore_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/feedbackStore_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/feedbackStore_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/feedbackStore_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -1,11 +1,11 @@
-/* global chai, loop */
-
-var expect = chai.expect;
-var sharedActions = loop.shared.actions;
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 describe("loop.store.FeedbackStore", function () {
   "use strict";
 
+  var expect = chai.expect;
+  var sharedActions = loop.shared.actions;
   var FEEDBACK_STATES = loop.store.FEEDBACK_STATES;
   var sandbox, dispatcher, store, feedbackClient;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/feedbackViews_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/feedbackViews_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/feedbackViews_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/feedbackViews_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -2,20 +2,16 @@
  * License, v. 2.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 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;
   var sandbox, comp, dispatcher, fakeFeedbackClient, feedbackStore;
 
   beforeEach(function() {
@@ -81,6 +77,15 @@
       expect(comp.getDOMNode().querySelector("button.fx-embedded-btn-back"))
         .eql(null);
     });
+
+    it("should not display the countdown text if noCloseText is true", function() {
+      comp = TestUtils.renderIntoDocument(
+        React.createElement(sharedViews.FeedbackView, {
+          noCloseText: true
+        }));
+
+      expect(comp.getDOMNode().querySelector(".info.thank-you")).eql(null);
+    });
   });
 
   describe("Sad feedback", function() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/fxOSActiveRoomStore_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/fxOSActiveRoomStore_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/fxOSActiveRoomStore_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/fxOSActiveRoomStore_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -1,13 +1,12 @@
-/* global chai, loop */
-
-var expect = chai.expect;
-var sharedActions = loop.shared.actions;
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 describe("loop.store.FxOSActiveRoomStore", function () {
   "use strict";
 
   var ROOM_STATES = loop.store.ROOM_STATES;
-
+  var expect = chai.expect;
+  var sharedActions = loop.shared.actions;
   var sandbox;
   var dispatcher;
   var fakeMozLoop;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/index.html firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/index.html
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/index.html	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/index.html	2015-05-25 20:42:47.000000000 +0000
@@ -57,6 +57,8 @@
   <script src="../../content/shared/js/conversationStore.js"></script>
   <script src="../../content/shared/js/feedbackStore.js"></script>
   <script src="../../content/shared/js/views.js"></script>
+  <script src="../../content/shared/js/textChatStore.js"></script>
+  <script src="../../content/shared/js/textChatView.js"></script>
   <script src="../../content/shared/js/feedbackViews.js"></script>
 
   <!-- Test scripts -->
@@ -76,10 +78,12 @@
   <script src="feedbackStore_test.js"></script>
   <script src="otSdkDriver_test.js"></script>
   <script src="store_test.js"></script>
+  <script src="textChatStore_test.js"></script>
+  <script src="textChatView_test.js"></script>
   <script>
     describe("Uncaught Error Check", function() {
       it("should load the tests without errors", function() {
-        expect(uncaughtError && uncaughtError.message).to.be.undefined;
+        chai.expect(uncaughtError && uncaughtError.message).to.be.undefined;
       });
     });
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/mixins_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/mixins_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/mixins_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/mixins_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -2,16 +2,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/. */
 
-/* global loop, sinon */
-/* jshint newcap:false */
-
-var expect = chai.expect;
-
 describe("loop.shared.mixins", function() {
   "use strict";
 
+  var expect = chai.expect;
   var sandbox;
   var sharedMixins = loop.shared.mixins;
+  var TestUtils = React.addons.TestUtils;
   var ROOM_STATES = loop.store.ROOM_STATES;
 
   beforeEach(function() {
@@ -487,6 +484,15 @@
           expect(view._videoDimensionsCache.remote.camera.aspectRatio.height)
             .eql(0.32857142857142857);
         });
+
+        it("should not populate the cache on another component instance", function() {
+            var view2 =
+              TestUtils.renderIntoDocument(React.createElement(TestComp));
+
+            expect(view2._videoDimensionsCache.local).to.be.empty;
+            expect(view2._videoDimensionsCache.remote).to.be.empty;
+        });
+
       });
     });
   });
@@ -498,7 +504,7 @@
       navigator.mozLoop = {
         doNotDisturb: true,
         getAudioBlob: sinon.spy(function(name, callback) {
-          callback(null, new Blob([new ArrayBuffer(10)], {type: 'audio/ogg'}));
+          callback(null, new Blob([new ArrayBuffer(10)], {type: "audio/ogg"}));
         })
       };
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/models_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/models_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/models_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/models_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -2,13 +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/. */
 
-/* global loop, sinon */
-
-var expect = chai.expect;
-
 describe("loop.shared.models", function() {
   "use strict";
 
+  var expect = chai.expect;
+  var l10n = navigator.mozL10n || document.mozL10n;
   var sharedModels = loop.shared.models, sandbox, fakeXHR,
       requests = [], fakeSDK, fakeMozLoop, fakeSession, fakeSessionData;
 
@@ -450,7 +448,7 @@
     beforeEach(function() {
       collection = new sharedModels.NotificationCollection();
       sandbox.stub(l10n, "get", function(x, y) {
-        return "translated:" + x + (y ? ':' + y : '');
+        return "translated:" + x + (y ? ":" + y : "");
       });
       notifData = {level: "error", message: "plop"};
       testNotif = new sharedModels.NotificationModel(notifData);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/otSdkDriver_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/otSdkDriver_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/otSdkDriver_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/otSdkDriver_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -1,18 +1,18 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-var expect = chai.expect;
-
 describe("loop.OTSdkDriver", function () {
   "use strict";
 
+  var expect = chai.expect;
   var sharedActions = loop.shared.actions;
   var FAILURE_DETAILS = loop.shared.utils.FAILURE_DETAILS;
   var STREAM_PROPERTIES = loop.shared.utils.STREAM_PROPERTIES;
   var SCREEN_SHARE_STATES = loop.shared.utils.SCREEN_SHARE_STATES;
+  var CHAT_CONTENT_TYPES = loop.store.CHAT_CONTENT_TYPES;
 
   var sandbox;
-  var dispatcher, driver, mozLoop, publisher, sdk, session, sessionData;
+  var dispatcher, driver, mozLoop, publisher, sdk, session, sessionData, subscriber;
   var fakeLocalElement, fakeRemoteElement, fakeScreenElement;
   var publisherConfig, fakeEvent;
 
@@ -43,6 +43,7 @@
       disconnect: sinon.stub(),
       publish: sinon.stub(),
       unpublish: sinon.stub(),
+      signal: sinon.stub(),
       subscribe: sinon.stub(),
       forceDisconnect: sinon.stub()
     }, Backbone.Events);
@@ -52,10 +53,17 @@
       publishAudio: sinon.stub(),
       publishVideo: sinon.stub(),
       _: {
+        getDataChannel: sinon.stub(),
         switchAcquiredWindow: sinon.stub()
       }
     }, Backbone.Events);
 
+    subscriber = _.extend({
+      _: {
+        getDataChannel: sinon.stub()
+      }
+    });
+
     sdk = _.extend({
       initPublisher: sinon.stub().returns(publisher),
       initSession: sinon.stub().returns(session)
@@ -117,8 +125,14 @@
         publisherConfig: publisherConfig
       }));
 
+      var expectedConfig = _.extend({
+        channels: {
+          text: {}
+        }
+      }, publisherConfig);
+
       sinon.assert.calledOnce(sdk.initPublisher);
-      sinon.assert.calledWith(sdk.initPublisher, fakeLocalElement, publisherConfig);
+      sinon.assert.calledWith(sdk.initPublisher, fakeLocalElement, expectedConfig);
     });
   });
 
@@ -148,8 +162,14 @@
     it("should call initPublisher", function() {
       driver.retryPublishWithoutVideo();
 
+      var expectedConfig = _.extend({
+        channels: {
+          text: {}
+        }
+      }, publisherConfig);
+
       sinon.assert.calledTwice(sdk.initPublisher);
-      sinon.assert.calledWith(sdk.initPublisher, fakeLocalElement, publisherConfig);
+      sinon.assert.calledWith(sdk.initPublisher, fakeLocalElement, expectedConfig);
     });
   });
 
@@ -597,6 +617,25 @@
       driver.forceDisconnectAll(function() {});
       sinon.assert.calledThrice(session.forceDisconnect);
     });
+
+    describe("#sendTextChatMessage", function() {
+      it("should send a message on the publisher data channel", function() {
+        driver._publisherChannel = {
+          send: sinon.stub()
+        };
+
+        var message = {
+          contentType: CHAT_CONTENT_TYPES.TEXT,
+          message: "Help!"
+        };
+
+        driver.sendTextChatMessage(message);
+
+        sinon.assert.calledOnce(driver._publisherChannel.send);
+        sinon.assert.calledWithExactly(driver._publisherChannel.send,
+          JSON.stringify(message));
+      });
+    });
   });
 
   describe("Events (general media)", function() {
@@ -804,10 +843,34 @@
         session.trigger("streamCreated", { stream: fakeStream });
 
         sinon.assert.calledOnce(session.subscribe);
-        sinon.assert.calledWithExactly(session.subscribe,
+        sinon.assert.calledWith(session.subscribe,
           fakeStream, fakeRemoteElement, publisherConfig);
       });
 
+      it("should trigger a readyForDataChannel signal after subscribe is complete", function() {
+        session.subscribe.callsArgWith(3, null);
+        driver._useDataChannels = true;
+        fakeStream.connection = "fakeID";
+
+        session.trigger("streamCreated", { stream: fakeStream });
+
+        sinon.assert.calledOnce(session.signal);
+        sinon.assert.calledWith(session.signal, {
+          type: "readyForDataChannel",
+          to: "fakeID"
+        });
+      });
+
+      it("should not trigger readyForDataChannel signal if data channels are not wanted", function() {
+        session.subscribe.callsArgWith(3, null);
+        driver._useDataChannels = false;
+        fakeStream.connection = "fakeID";
+
+        session.trigger("streamCreated", { stream: fakeStream });
+
+        sinon.assert.notCalled(session.signal);
+      });
+
       it("should subscribe to a screen sharing stream", function() {
         fakeStream.videoType = "screen";
 
@@ -1119,6 +1182,67 @@
       });
     });
 
+    describe("signal:readyForDataChannel", function() {
+      beforeEach(function() {
+        driver.subscriber = subscriber;
+        driver._useDataChannels = true;
+      });
+
+      it("should not do anything if data channels are not wanted", function() {
+        driver._useDataChannels = false;
+
+        session.trigger("signal:readyForDataChannel");
+
+        sinon.assert.notCalled(publisher._.getDataChannel);
+        sinon.assert.notCalled(subscriber._.getDataChannel);
+      });
+
+      it("should get the data channel for the publisher", function() {
+        session.trigger("signal:readyForDataChannel");
+
+        sinon.assert.calledOnce(publisher._.getDataChannel);
+      });
+
+      it("should get the data channel for the subscriber", function() {
+        session.trigger("signal:readyForDataChannel");
+
+        sinon.assert.calledOnce(subscriber._.getDataChannel);
+      });
+
+      it("should dispatch `DataChannelsAvailable` once both data channels have been obtained", function() {
+        var fakeChannel = _.extend({}, Backbone.Events);
+
+        subscriber._.getDataChannel.callsArgWith(2, null, fakeChannel);
+        publisher._.getDataChannel.callsArgWith(2, null, fakeChannel);
+
+        session.trigger("signal:readyForDataChannel");
+
+        sinon.assert.calledOnce(dispatcher.dispatch);
+        sinon.assert.calledWithExactly(dispatcher.dispatch,
+          new sharedActions.DataChannelsAvailable());
+      });
+
+      it("should dispatch `ReceivedTextChatMessage` when a text message is received", function() {
+        var fakeChannel = _.extend({}, Backbone.Events);
+
+        subscriber._.getDataChannel.callsArgWith(2, null, fakeChannel);
+
+        session.trigger("signal:readyForDataChannel");
+
+        // Now send the message.
+        fakeChannel.trigger("message", {
+          data: '{"contentType":"' + CHAT_CONTENT_TYPES.TEXT + '","message":"Are you there?"}'
+        });
+
+        sinon.assert.calledOnce(dispatcher.dispatch);
+        sinon.assert.calledWithExactly(dispatcher.dispatch,
+          new sharedActions.ReceivedTextChatMessage({
+            contentType: CHAT_CONTENT_TYPES.TEXT,
+            message: "Are you there?"
+          }));
+      });
+    });
+
     describe("exception", function() {
       describe("Unable to publish (GetUserMedia)", function() {
         it("should destroy the publisher", function() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/store_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/store_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/store_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/store_test.js	2015-05-25 20:42:47.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/. */
 
-var expect = chai.expect;
-
 describe("loop.store", function () {
   "use strict";
 
+  var expect = chai.expect;
   var dispatcher;
   var sandbox;
   var sharedActions = loop.shared.actions;
+  var TestUtils = React.addons.TestUtils;
 
   beforeEach(function() {
     sandbox = sinon.sandbox.create();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/textChatStore_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/textChatStore_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/textChatStore_test.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/textChatStore_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -0,0 +1,96 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+describe("loop.store.TextChatStore", function () {
+  "use strict";
+
+  var expect = chai.expect;
+  var sharedActions = loop.shared.actions;
+  var CHAT_MESSAGE_TYPES = loop.store.CHAT_MESSAGE_TYPES;
+  var CHAT_CONTENT_TYPES = loop.store.CHAT_CONTENT_TYPES;
+
+  var dispatcher, fakeSdkDriver, sandbox, store;
+
+  beforeEach(function() {
+    sandbox = sinon.sandbox.create();
+    sandbox.useFakeTimers();
+
+    dispatcher = new loop.Dispatcher();
+    sandbox.stub(dispatcher, "dispatch");
+
+    fakeSdkDriver = {
+      sendTextChatMessage: sinon.stub()
+    };
+
+    store = new loop.store.TextChatStore(dispatcher, {
+      sdkDriver: fakeSdkDriver
+    });
+  });
+
+  afterEach(function() {
+    sandbox.restore();
+  });
+
+  describe("#dataChannelsAvailable", function() {
+    it("should set textChatEnabled to true", function() {
+      store.dataChannelsAvailable();
+
+      expect(store.getStoreState("textChatEnabled")).eql(true);
+    });
+  });
+
+  describe("#receivedTextChatMessage", function() {
+    it("should add the message to the list", function() {
+      var message = "Hello!";
+
+      store.receivedTextChatMessage({
+        contentType: CHAT_CONTENT_TYPES.TEXT,
+        message: message
+      });
+
+      expect(store.getStoreState("messageList")).eql([{
+        type: CHAT_MESSAGE_TYPES.RECEIVED,
+        contentType: CHAT_CONTENT_TYPES.TEXT,
+        message: message
+      }]);
+    });
+
+    it("should not add messages for unknown content types", function() {
+      store.receivedTextChatMessage({
+        contentType: "invalid type",
+        message: "Hi"
+      });
+
+      expect(store.getStoreState("messageList").length).eql(0);
+    });
+  });
+
+  describe("#sendTextChatMessage", function() {
+    it("should send the message", function() {
+      var messageData = {
+        contentType: CHAT_CONTENT_TYPES.TEXT,
+        message: "Yes, that's what this is called."
+      };
+
+      store.sendTextChatMessage(messageData);
+
+      sinon.assert.calledOnce(fakeSdkDriver.sendTextChatMessage);
+      sinon.assert.calledWithExactly(fakeSdkDriver.sendTextChatMessage, messageData);
+    });
+
+    it("should add the message to the list", function() {
+      var messageData = {
+        contentType: CHAT_CONTENT_TYPES.TEXT,
+        message: "It's awesome!"
+      };
+
+      store.sendTextChatMessage(messageData);
+
+      expect(store.getStoreState("messageList")).eql([{
+        type: CHAT_MESSAGE_TYPES.SENT,
+        contentType: messageData.contentType,
+        message: messageData.message
+      }]);
+    });
+  });
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/textChatView_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/textChatView_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/textChatView_test.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/textChatView_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -0,0 +1,84 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+describe("loop.shared.views.TextChatView", function () {
+  "use strict";
+
+  var expect = chai.expect;
+  var sharedActions = loop.shared.actions;
+  var TestUtils = React.addons.TestUtils;
+  var CHAT_MESSAGE_TYPES = loop.store.CHAT_MESSAGE_TYPES;
+  var CHAT_CONTENT_TYPES = loop.store.CHAT_CONTENT_TYPES;
+
+  var dispatcher, fakeSdkDriver, sandbox, store;
+
+  beforeEach(function() {
+    sandbox = sinon.sandbox.create();
+    sandbox.useFakeTimers();
+
+    dispatcher = new loop.Dispatcher();
+    sandbox.stub(dispatcher, "dispatch");
+
+    fakeSdkDriver = {
+      sendTextChatMessage: sinon.stub()
+    };
+
+    store = new loop.store.TextChatStore(dispatcher, {
+      sdkDriver: fakeSdkDriver
+    });
+
+    loop.store.StoreMixin.register({
+      textChatStore: store
+    });
+  });
+
+  afterEach(function() {
+    sandbox.restore();
+  });
+
+  describe("TextChatView", function() {
+    var view;
+
+    function mountTestComponent() {
+      return TestUtils.renderIntoDocument(
+        React.createElement(loop.shared.views.TextChatView, {
+          dispatcher: dispatcher
+        }));
+    }
+
+    beforeEach(function() {
+      store.setStoreState({ textChatEnabled: true });
+    });
+
+    it("should not display anything if text chat is disabled", function() {
+      store.setStoreState({ textChatEnabled: false });
+
+      view = mountTestComponent();
+
+      expect(view.getDOMNode()).eql(null);
+    });
+
+    it("should dispatch SendTextChatMessage action when enter is pressed", function() {
+      view = mountTestComponent();
+
+      var entryNode = view.getDOMNode().querySelector(".text-chat-box > form > input");
+
+      TestUtils.Simulate.change(entryNode, {
+        target: {
+          value: "Hello!"
+        }
+      });
+      TestUtils.Simulate.keyDown(entryNode, {
+        key: "Enter",
+        which: 13
+      });
+
+      sinon.assert.calledOnce(dispatcher.dispatch);
+      sinon.assert.calledWithExactly(dispatcher.dispatch,
+        new sharedActions.SendTextChatMessage({
+          contentType: CHAT_CONTENT_TYPES.TEXT,
+          message: "Hello!"
+        }));
+    });
+  });
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/utils_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/utils_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/utils_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/utils_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -2,14 +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/. */
 
-/* global loop, sinon */
-/* jshint newcap:false */
-
-var expect = chai.expect;
-
 describe("loop.shared.utils", function() {
   "use strict";
 
+  var expect = chai.expect;
   var sandbox;
   var sharedUtils = loop.shared.utils;
 
@@ -24,20 +20,20 @@
 
   describe("#getUnsupportedPlatform", function() {
     it("should detect iOS", function() {
-      expect(sharedUtils.getUnsupportedPlatform("iPad")).eql('ios');
-      expect(sharedUtils.getUnsupportedPlatform("iPod")).eql('ios');
-      expect(sharedUtils.getUnsupportedPlatform("iPhone")).eql('ios');
-      expect(sharedUtils.getUnsupportedPlatform("iPhone Simulator")).eql('ios');
+      expect(sharedUtils.getUnsupportedPlatform("iPad")).eql("ios");
+      expect(sharedUtils.getUnsupportedPlatform("iPod")).eql("ios");
+      expect(sharedUtils.getUnsupportedPlatform("iPhone")).eql("ios");
+      expect(sharedUtils.getUnsupportedPlatform("iPhone Simulator")).eql("ios");
     });
 
     it("should detect Windows Phone", function() {
       expect(sharedUtils.getUnsupportedPlatform("Windows Phone"))
-        .eql('windows_phone');
+        .eql("windows_phone");
     });
 
     it("should detect BlackBerry", function() {
       expect(sharedUtils.getUnsupportedPlatform("BlackBerry"))
-        .eql('blackberry');
+        .eql("blackberry");
     });
 
     it("shouldn't detect other platforms", function() {
@@ -144,6 +140,120 @@
       });
     });
   });
+
+  describe("hasAudioDevices", function() {
+    var fakeNavigatorObject, fakeWindowObject;
+
+    beforeEach(function() {
+      fakeNavigatorObject = {
+        mediaDevices: {
+          enumerateDevices: sinon.stub()
+        }
+      };
+
+      fakeWindowObject = {
+        MediaStreamTrack: {
+          getSources: sinon.stub()
+        }
+      };
+
+      sharedUtils.setRootObjects(fakeWindowObject, fakeNavigatorObject);
+    });
+
+    afterEach(function() {
+      sharedUtils.setRootObjects();
+    });
+
+    it("should return true if no APIs to detect devices exist", function(done) {
+      delete fakeNavigatorObject.mediaDevices;
+      delete fakeWindowObject.MediaStreamTrack;
+
+      sharedUtils.hasAudioDevices(function(result) {
+        expect(result).eql(true);
+        done();
+      });
+    });
+
+    it("should return false if no audio devices exist according to navigator.mediaDevices", function(done) {
+      delete fakeWindowObject.MediaStreamTrack;
+
+      fakeNavigatorObject.mediaDevices.enumerateDevices.returns(Promise.resolve([]));
+      sharedUtils.hasAudioDevices(function(result) {
+        try {
+          expect(result).eql(false);
+          done();
+        } catch (ex) {
+          done(ex);
+        }
+      });
+    });
+
+    it("should return true if audio devices exist according to navigator.mediaDevices", function(done) {
+      delete fakeWindowObject.MediaStreamTrack;
+
+      fakeNavigatorObject.mediaDevices.enumerateDevices.returns(
+        Promise.resolve([{
+          deviceId: "15234",
+          groupId: "",
+          kind: "videoinput",
+          label: ""
+        }, {
+          deviceId: "54321",
+          groupId: "",
+          kind: "audioinput",
+          label: ""
+        }])
+      );
+
+      sharedUtils.hasAudioDevices(function(result) {
+        try {
+          expect(result).eql(true);
+          done();
+        } catch (ex) {
+          done(ex);
+        }
+      });
+    });
+
+    it("should return false if no audio devices exist according to window.MediaStreamTrack", function(done) {
+      delete fakeNavigatorObject.mediaDevices;
+
+      fakeWindowObject.MediaStreamTrack.getSources.callsArgWith(0, []);
+      sharedUtils.hasAudioDevices(function(result) {
+        try {
+          expect(result).eql(false);
+          done();
+        } catch (ex) {
+          done(ex);
+        }
+      });
+    });
+
+    it("should return true if audio devices exist according to window.MediaStreamTrack", function(done) {
+      delete fakeNavigatorObject.mediaDevices;
+
+      fakeWindowObject.MediaStreamTrack.getSources.callsArgWith(0, [{
+        facing: "",
+        id: "15234",
+        kind: "video",
+        label: ""
+      }, {
+        facing: "",
+        id: "54321",
+        kind: "audio",
+        label: ""
+      }]);
+
+      sharedUtils.hasAudioDevices(function(result) {
+        try {
+          expect(result).eql(true);
+          done();
+        } catch (ex) {
+          done(ex);
+        }
+      });
+    });
+  });
 
   describe("#formatURL", function() {
     it("should decode encoded URIs", function() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/validate_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/validate_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/validate_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/validate_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -1,13 +1,11 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-/*global chai, validate */
-
-var expect = chai.expect;
-
 describe("Validator", function() {
   "use strict";
 
+  var expect = chai.expect;
+
   // test helpers
   function create(dependencies, values) {
     var validator = new loop.validate.Validator(dependencies);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/views_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/views_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/views_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/views_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -2,16 +2,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/. */
 
-/*global loop, sinon, React */
-/* jshint newcap:false */
-
-var expect = chai.expect;
-var l10n = navigator.mozL10n || document.mozL10n;
-var TestUtils = React.addons.TestUtils;
-
 describe("loop.shared.views", function() {
   "use strict";
 
+  var expect = chai.expect;
+  var l10n = navigator.mozL10n || document.mozL10n;
+  var TestUtils = React.addons.TestUtils;
+  var sharedActions = loop.shared.actions;
   var sharedModels = loop.shared.models;
   var sharedViews = loop.shared.views;
   var SCREEN_SHARE_STATES = loop.shared.utils.SCREEN_SHARE_STATES;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/websocket_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/websocket_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/shared/websocket_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/shared/websocket_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -2,14 +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/. */
 
-/*global loop, sinon, it, beforeEach, afterEach, describe */
-
-var expect = chai.expect;
-
-
 describe("loop.CallConnectionWebSocket", function() {
   "use strict";
 
+  var expect = chai.expect;
   var WEBSOCKET_REASONS = loop.shared.utils.WEBSOCKET_REASONS;
 
   var sandbox,
@@ -23,7 +19,7 @@
       close: sinon.spy(),
       send: sinon.spy()
     };
-    sandbox.stub(window, 'WebSocket').returns(dummySocket);
+    sandbox.stub(window, "WebSocket").returns(dummySocket);
   });
 
   afterEach(function() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/standalone/index.html firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/standalone/index.html
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/standalone/index.html	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/standalone/index.html	2015-05-25 20:42:47.000000000 +0000
@@ -52,6 +52,8 @@
   <script src="../../content/shared/js/activeRoomStore.js"></script>
   <script src="../../content/shared/js/feedbackStore.js"></script>
   <script src="../../content/shared/js/views.js"></script>
+  <script src="../../content/shared/js/textChatStore.js"></script>
+  <script src="../../content/shared/js/textChatView.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>
@@ -73,7 +75,7 @@
   <script>
     describe("Uncaught Error Check", function() {
       it("should load the tests without errors", function() {
-        expect(uncaughtError && uncaughtError.message).to.be.undefined;
+        chai.expect(uncaughtError && uncaughtError.message).to.be.undefined;
       });
     });
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/standalone/multiplexGum_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/standalone/multiplexGum_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/standalone/multiplexGum_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/standalone/multiplexGum_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -2,18 +2,15 @@
  * License, v. 2.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, it, beforeEach, afterEach, describe*/
-
-var expect = chai.expect;
-
 describe("loop.standaloneMedia._MultiplexGum", function() {
   "use strict";
 
+  var expect = chai.expect;
   var defaultGum =
     navigator.getUserMedia ||
     navigator.mozGetUserMedia ||
     navigator.webkitGetUserMedia ||
-    (window.TBPlugin && TBPlugin.getUserMedia);
+    (window.TBPlugin && window.TBPlugin.getUserMedia);
 
   var sandbox;
   var multiplexGum;
@@ -165,7 +162,7 @@
           expect(localStream).to.eql(fakeLocalStream);
         }, null);
 
-        expect(multiplexGum.userMedia).to.have.property('pending', true);
+        expect(multiplexGum.userMedia).to.have.property("pending", true);
 
         multiplexGum.getPermsAndCacheMedia(null, function onSuccess(localStream) {
           calls += 10;
@@ -187,7 +184,7 @@
           expect(error).to.eql(fakeError);
         });
 
-        expect(multiplexGum.userMedia).to.have.property('pending', true);
+        expect(multiplexGum.userMedia).to.have.property("pending", true);
 
         multiplexGum.getPermsAndCacheMedia(null, null, function onError(error) {
           calls += 10;
@@ -209,7 +206,7 @@
           multiplexGum.getPermsAndCacheMedia(null,
             function gPACMSuccess(localStream) {
               expect(localStream).to.eql(fakeLocalStream);
-              expect(multiplexGum.userMedia).to.have.property('pending', false);
+              expect(multiplexGum.userMedia).to.have.property("pending", false);
               expect(multiplexGum.userMedia.successCallbacks.length).to.equal(0);
               if (calledOnce) {
                 sinon.assert.fail("original callback was called twice");
@@ -225,7 +222,7 @@
         return promiseCalledOnce.then(function() {
           defaultGum(null, function gUMSuccess(localStream2) {
             expect(localStream2).to.eql(fakeLocalStream);
-            expect(multiplexGum.userMedia).to.have.property('pending', false);
+            expect(multiplexGum.userMedia).to.have.property("pending", false);
             expect(multiplexGum.userMedia.successCallbacks.length).to.equal(0);
           });
         });
@@ -244,7 +241,7 @@
             reject();
           }, function gPACMError(errString) {
             expect(errString).to.eql(fakeError);
-            expect(multiplexGum.userMedia).to.have.property('pending', false);
+            expect(multiplexGum.userMedia).to.have.property("pending", false);
             if (calledOnce) {
               sinon.assert.fail("original error callback was called twice");
             }
@@ -257,7 +254,7 @@
           defaultGum(null, function() {},
             function gUMError(errString) {
               expect(errString).to.eql(fakeError);
-              expect(multiplexGum.userMedia).to.have.property('pending', false);
+              expect(multiplexGum.userMedia).to.have.property("pending", false);
             });
         });
       });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/standalone/standaloneAppStore_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/standalone/standaloneAppStore_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/standalone/standaloneAppStore_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/standalone/standaloneAppStore_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -1,9 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-var expect = chai.expect;
-
 describe("loop.store.StandaloneAppStore", function () {
+  var expect = chai.expect;
   var sharedActions = loop.shared.actions;
   var sharedUtils = loop.shared.utils;
   var sandbox, dispatcher;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/standalone/standalone_client_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/standalone/standalone_client_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/standalone/standalone_client_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/standalone/standalone_client_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -2,13 +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/. */
 
-/*global loop, sinon, it, beforeEach, afterEach, describe, hawk */
-
-var expect = chai.expect;
-
 describe("loop.StandaloneClient", function() {
   "use strict";
 
+  var expect = chai.expect;
   var sandbox,
       fakeXHR,
       requests = [],
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/standalone/standaloneMetricsStore_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/standalone/standaloneMetricsStore_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/standalone/standaloneMetricsStore_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/standalone/standaloneMetricsStore_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -2,11 +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/. */
 
-var expect = chai.expect;
-
 describe("loop.store.StandaloneMetricsStore", function() {
   "use strict";
 
+  var expect = chai.expect;
   var sandbox, dispatcher, store, fakeActiveRoomStore;
 
   var sharedActions = loop.shared.actions;
@@ -47,6 +46,37 @@
     beforeEach(function() {
     });
 
+    it("should log an event on ConnectedToSdkServers", function() {
+      store.connectedToSdkServers();
+
+      sinon.assert.calledOnce(window.ga);
+      sinon.assert.calledWithExactly(window.ga,
+        "send", "event", METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.success,
+        "Joined sdk servers");
+    });
+
+    it("should log an event on connection failure if media denied", function() {
+      store.connectionFailure(new sharedActions.ConnectionFailure({
+        reason: FAILURE_DETAILS.MEDIA_DENIED
+      }));
+
+      sinon.assert.calledOnce(window.ga);
+      sinon.assert.calledWithExactly(window.ga,
+        "send", "event", METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.failed,
+        "Media denied");
+    });
+
+    it("should log an event on connection failure if no media was found", function() {
+      store.connectionFailure(new sharedActions.ConnectionFailure({
+        reason: FAILURE_DETAILS.NO_MEDIA
+      }));
+
+      sinon.assert.calledOnce(window.ga);
+      sinon.assert.calledWithExactly(window.ga,
+        "send", "event", METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.failed,
+        "No media");
+    });
+
     it("should log an event on GotMediaPermission", function() {
       store.gotMediaPermission();
 
@@ -65,6 +95,15 @@
         "Join the conversation");
     });
 
+    it("should log an event on JoinedRoom", function() {
+      store.joinedRoom();
+
+      sinon.assert.calledOnce(window.ga);
+      sinon.assert.calledWithExactly(window.ga,
+        "send", "event", METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.success,
+        "Joined room");
+    });
+
     it("should log an event on LeaveRoom", function() {
       store.leaveRoom();
 
@@ -93,6 +132,15 @@
         "send", "event", METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.linkClick,
         "fake");
     });
+
+    it("should log an event on RemotePeerConnected", function() {
+      store.remotePeerConnected();
+
+      sinon.assert.calledOnce(window.ga);
+      sinon.assert.calledWithExactly(window.ga,
+        "send", "event", METRICS_GA_CATEGORY.general, METRICS_GA_ACTIONS.success,
+        "Remote peer connected");
+    });
   });
 
   describe("Store Change Handlers", function() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/standalone/standaloneMozLoop_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/standalone/standaloneMozLoop_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/standalone/standaloneMozLoop_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/standalone/standaloneMozLoop_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -2,11 +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/. */
 
-var expect = chai.expect;
-
 describe("loop.StandaloneMozLoop", function() {
   "use strict";
 
+  var expect = chai.expect;
   var sandbox, fakeXHR, requests, callback, mozLoop;
   var fakeToken, fakeBaseServerUrl, fakeServerErrorDescription;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/standalone/standaloneRoomViews_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/standalone/standaloneRoomViews_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/standalone/standaloneRoomViews_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/standalone/standaloneRoomViews_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -2,13 +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/. */
 
-/* global loop, sinon */
-
-var expect = chai.expect;
-
 describe("loop.standaloneRoomViews", function() {
   "use strict";
 
+  var expect = chai.expect;
+  var TestUtils = React.addons.TestUtils;
+
   var ROOM_STATES = loop.store.ROOM_STATES;
   var FEEDBACK_STATES = loop.store.FEEDBACK_STATES;
   var ROOM_INFO_FAILURES = loop.shared.utils.ROOM_INFO_FAILURES;
@@ -25,10 +24,16 @@
       mozLoop: {},
       sdkDriver: {}
     });
+    var textChatStore = new loop.store.TextChatStore(dispatcher, {
+      sdkDriver: {}
+    });
     feedbackStore = new loop.store.FeedbackStore(dispatcher, {
       feedbackClient: {}
     });
-    loop.store.StoreMixin.register({feedbackStore: feedbackStore});
+    loop.store.StoreMixin.register({
+      feedbackStore: feedbackStore,
+      textChatStore: textChatStore
+    });
 
     sandbox.useFakeTimers();
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/standalone/webapp_test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/standalone/webapp_test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/standalone/webapp_test.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/standalone/webapp_test.js	2015-05-25 20:42:47.000000000 +0000
@@ -2,14 +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/. */
 
-/* global loop, sinon */
-
-var expect = chai.expect;
-var TestUtils = React.addons.TestUtils;
-
 describe("loop.webapp", function() {
   "use strict";
 
+  var expect = chai.expect;
+  var TestUtils = React.addons.TestUtils;
   var sharedActions = loop.shared.actions;
   var sharedModels = loop.shared.models,
       sharedViews = loop.shared.views,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/xpcshell/.eslintrc firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/xpcshell/.eslintrc
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/xpcshell/.eslintrc	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/xpcshell/.eslintrc	2015-05-25 20:42:47.000000000 +0000
@@ -1,17 +1,36 @@
 {
-  "ecmaFeatures": {
-    "arrowFunctions": true,
-    "blockBindings": true,
-    "destructuring": true,
-    "generators": true,
-    "restParams": true,
-    "spread": true,
-    "objectLiteralShorthandMethods": true,
-  },
-  "rules": {
-    "generator-star-spacing": [2, "after"],
-    // We should fix the errors and enable this (set to 2)
-    "no-var": 0,
-    "strict": [2, "global"]
+  "extends": "../../.eslintrc-gecko",
+  "globals": {
+    // General xpcshell-test functions
+    "HttpServer": false,
+    "add_task": false,
+    "add_test": false,
+    "Ci": true,
+    "Cu": true,
+    "do_check_true": false,
+    "do_check_false": false,
+    "do_check_eq": false,
+    "do_get_profile": false,
+    "do_print": false,
+    "do_register_cleanup": false,
+    "do_throw": false,
+    "do_timeout": false,
+    "run_next_test": false,
+    // head.js items.
+    "MockWebSocketChannel": false,
+    "extend": true,
+    "getLoopString": false,
+    "kServerPushUrl": true,
+    "kEndPointUrl": true,
+    "loopCrypto": true,
+    "loopServer": true,
+    "mockPushHandler": true,
+    "setupFakeFxAUserProfile": false,
+    "setupFakeLoopServer": false,
+    "timerHandlers",
+    "waitForCondition": true,
+    // Loop specific items
+    "MozLoopServiceInternal": true,
+    "LoopRoomsInternal": true,
   }
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/xpcshell/head.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/xpcshell/head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/xpcshell/head.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/xpcshell/head.js	2015-05-25 20:42:47.000000000 +0000
@@ -18,7 +18,7 @@
 Cu.import("resource:///modules/loop/LoopRooms.jsm");
 Cu.import("resource://gre/modules/osfile.jsm");
 const { MozLoopServiceInternal } = Cu.import("resource:///modules/loop/MozLoopService.jsm", {});
-const { LoopRoomsInternal } = Cu.import("resource:///modules/loop/LoopRooms.jsm", {});
+const { LoopRoomsInternal, timerHandlers } = Cu.import("resource:///modules/loop/LoopRooms.jsm", {});
 
 XPCOMUtils.defineLazyModuleGetter(this, "MozLoopPushHandler",
                                   "resource:///modules/loop/MozLoopPushHandler.jsm");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/xpcshell/test_looprooms_encryption_in_fxa.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/xpcshell/test_looprooms_encryption_in_fxa.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/xpcshell/test_looprooms_encryption_in_fxa.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/xpcshell/test_looprooms_encryption_in_fxa.js	2015-05-25 20:42:47.000000000 +0000
@@ -4,6 +4,8 @@
 
 "use strict";
 
+timerHandlers.startTimer = callback => callback();
+
 Cu.import("resource://services-common/utils.js");
 const { LOOP_ROOMS_CACHE_FILENAME } = Cu.import("resource:///modules/loop/LoopRoomsCache.jsm", {});
 
@@ -124,7 +126,9 @@
   });
 
   function returnRoomDetails(res, roomName) {
-    roomDetail.roomName = roomName;
+    var roomDetail = {
+      roomName: roomName
+    };
     res.setStatusLine(null, 200, "OK");
     res.write(JSON.stringify(roomDetail));
     res.processAsync();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/xpcshell/test_looprooms.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/xpcshell/test_looprooms.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/xpcshell/test_looprooms.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/xpcshell/test_looprooms.js	2015-05-25 20:42:47.000000000 +0000
@@ -9,16 +9,18 @@
 Cu.import("resource:///modules/Chat.jsm");
 Cu.import("resource://gre/modules/Promise.jsm");
 
+timerHandlers.startTimer = callback => callback();
+
 let openChatOrig = Chat.open;
 
-const kGuestKey = "uGIs-kGbYt1hBBwjyW7MLQ";
+const kKey = "uGIs-kGbYt1hBBwjyW7MLQ";
 
 // Rooms details as responded by the server.
 const kRoomsResponses = new Map([
   ["_nxD4V4FflQ", {
     roomToken: "_nxD4V4FflQ",
     // Encrypted with roomKey "FliIGLUolW-xkKZVWstqKw".
-    // roomKey is wrapped with kGuestKey.
+    // roomKey is wrapped with kKey.
     context: {
       wrappedKey: "F3V27oPB+FgjFbVPML2PupONYqoIZ53XRU4BqG46Lr3eyIGumgCEqgjSe/MXAXiQ//8=",
       value: "df7B4SNxhOI44eJjQavCevADyCCxz6/DEZbkOkRUMVUxzS42FbzN6C2PqmCKDYUGyCJTwJ0jln8TLw==",
@@ -304,12 +306,7 @@
         room.deleted = kRoomUpdates[qs.version].deleted;
         res.write(JSON.stringify([room]));
       } else {
-        // XXX Only return last 2 elements until FxA keys are implemented.
-        if (MozLoopServiceInternal.fxAOAuthTokenData) {
-          res.write(JSON.stringify([...kRoomsResponses.values()].slice(1, 3)));
-        } else {
-          res.write(JSON.stringify([...kRoomsResponses.values()]));
-        }
+        res.write(JSON.stringify([...kRoomsResponses.values()]));
       }
     }
 
@@ -431,8 +428,7 @@
 
 // Test if the rooms cache is refreshed after FxA signin or signout.
 add_task(function* test_refresh() {
-  // XXX Temporarily whilst FxA encryption isn't handled (bug 1153788).
-  Array.prototype.push.apply(gExpectedAdds, [...kExpectedRooms.values()].slice(1, 3));
+  gExpectedAdds.push(...kExpectedRooms.values());
   gExpectedRefresh = true;
 
   // Make the switch.
@@ -441,6 +437,7 @@
     email: "fake@invalid.com",
     uid: "fake"
   };
+  Services.prefs.setCharPref("loop.key.fxa", kKey);
 
   yield waitForCondition(() => !gExpectedRefresh);
   yield waitForCondition(() => gExpectedAdds.length === 0);
@@ -639,7 +636,7 @@
 function run_test() {
   setupFakeLoopServer();
 
-  Services.prefs.setCharPref("loop.key", kGuestKey);
+  Services.prefs.setCharPref("loop.key", kKey);
 
   LoopRooms.on("add", onRoomAdded);
   LoopRooms.on("update", onRoomUpdated);
@@ -652,6 +649,7 @@
     // Revert original Chat.open implementation
     Chat.open = openChatOrig;
     Services.prefs.clearUserPref("loop.key");
+    Services.prefs.clearUserPref("loop.key.fxa");
 
     MozLoopServiceInternal.fxAOAuthTokenData = null;
     MozLoopServiceInternal.fxAOAuthProfile = null;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/xpcshell/test_looprooms_upgrade_to_encryption.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/xpcshell/test_looprooms_upgrade_to_encryption.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/xpcshell/test_looprooms_upgrade_to_encryption.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/xpcshell/test_looprooms_upgrade_to_encryption.js	2015-05-25 20:42:47.000000000 +0000
@@ -0,0 +1,141 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+Cu.import("resource://services-common/utils.js");
+
+const loopCrypto = Cu.import("resource:///modules/loop/crypto.js", {}).LoopCrypto;
+const { LOOP_ROOMS_CACHE_FILENAME } = Cu.import("resource:///modules/loop/LoopRoomsCache.jsm", {});
+
+let gTimerArgs = [];
+
+timerHandlers.startTimer = function(callback, delay) {
+  gTimerArgs.push({callback, delay});
+  return gTimerArgs.length;
+};
+
+let gRoomPatches = [];
+
+const kContextEnabledPref = "loop.contextInConverations.enabled";
+
+const kFxAKey = "uGIs-kGbYt1hBBwjyW7MLQ";
+
+// Rooms details as responded by the server.
+const kRoomsResponses = new Map([
+  ["_nxD4V4FflQ", {
+    roomToken: "_nxD4V4FflQ",
+    roomName: "First Room Name",
+    roomUrl: "http://localhost:3000/rooms/_nxD4V4FflQ"
+  }],
+  ["QzBbvGmIZWU", {
+    roomToken: "QzBbvGmIZWU",
+    roomName: "Loopy Discussion",
+    roomUrl: "http://localhost:3000/rooms/QzBbvGmIZWU"
+  }]
+]);
+
+// This is a cut-down version of the one in test_looprooms.js.
+add_task(function* setup_server() {
+  loopServer.registerPathHandler("/registration", (req, res) => {
+    res.setStatusLine(null, 200, "OK");
+    res.processAsync();
+    res.finish();
+  });
+
+  loopServer.registerPathHandler("/rooms", (req, res) => {
+    res.setStatusLine(null, 200, "OK");
+
+    res.write(JSON.stringify([...kRoomsResponses.values()]));
+
+    res.processAsync();
+    res.finish();
+  });
+
+  function getJSONData(body) {
+    return JSON.parse(CommonUtils.readBytesFromInputStream(body));
+  }
+
+  // Add a request handler for each room in the list.
+  [...kRoomsResponses.values()].forEach(function(room) {
+    loopServer.registerPathHandler("/rooms/" + encodeURIComponent(room.roomToken), (req, res) => {
+      let roomDetail = extend({}, room);
+      if (req.method == "PATCH") {
+        let data = getJSONData(req.bodyInputStream);
+        Assert.ok("context" in data, "should have encrypted context");
+        gRoomPatches.push(data);
+        delete roomDetail.roomName;
+        roomDetail.context = data.context;
+        res.setStatusLine(null, 200, "OK");
+        res.write(JSON.stringify(roomDetail));
+        res.processAsync();
+        res.finish();
+      } else {
+        res.setStatusLine(null, 200, "OK");
+        res.write(JSON.stringify(room));
+        res.processAsync();
+        res.finish();
+      }
+    });
+  });
+
+  mockPushHandler.registrationPushURL = kEndPointUrl;
+
+  yield MozLoopService.promiseRegisteredWithServers();
+});
+
+// Test if getting rooms saves unknown keys correctly.
+add_task(function* test_get_rooms_upgrades_to_encryption() {
+  let rooms = yield LoopRooms.promise("getAll");
+
+  // Check that we've saved the encryption keys correctly.
+  Assert.equal(LoopRoomsInternal.encryptionQueue.queue.length, 2, "Should have two rooms queued");
+  Assert.equal(gTimerArgs.length, 1, "Should have started a timer");
+
+  // Now pretend the timer has fired.
+  yield gTimerArgs[0].callback();
+
+  Assert.equal(gRoomPatches.length, 1, "Should have patched one room");
+  Assert.equal(gTimerArgs.length, 2, "Should have started a second timer");
+
+  yield gTimerArgs[1].callback();
+
+  Assert.equal(gRoomPatches.length, 2, "Should have patches a second room");
+  Assert.equal(gTimerArgs.length, 2, "Should not have queued another timer");
+
+  // Now check that we've got the right data stored in the rooms.
+  rooms = yield LoopRooms.promise("getAll");
+
+  Assert.equal(rooms.length, 2, "Should have two rooms");
+
+  // We have to decrypt the info, no other way.
+  for (let room of rooms) {
+    let roomData = yield loopCrypto.decryptBytes(room.roomKey, room.context.value);
+
+    Assert.deepEqual(JSON.parse(roomData),
+      { roomName: kRoomsResponses.get(room.roomToken).roomName },
+      "Should have encrypted the data correctly");
+  }
+});
+
+function run_test() {
+  setupFakeLoopServer();
+
+  Services.prefs.setCharPref("loop.key.fxa", kFxAKey);
+  Services.prefs.setBoolPref(kContextEnabledPref, true);
+
+  // Pretend we're signed into FxA.
+  MozLoopServiceInternal.fxAOAuthTokenData = { token_type: "bearer" };
+  MozLoopServiceInternal.fxAOAuthProfile = { email: "fake@invalid.com" };
+
+  do_register_cleanup(function () {
+    Services.prefs.clearUserPref(kContextEnabledPref);
+    Services.prefs.clearUserPref("loop.key.fxa");
+
+    MozLoopServiceInternal.fxAOAuthTokenData = null;
+    MozLoopServiceInternal.fxAOAuthProfile = null;
+  });
+
+  run_next_test();
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/xpcshell/test_loopservice_encryptionkey.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/xpcshell/test_loopservice_encryptionkey.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/xpcshell/test_loopservice_encryptionkey.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/xpcshell/test_loopservice_encryptionkey.js	2015-05-25 20:42:47.000000000 +0000
@@ -1,6 +1,5 @@
 /* Any copyright is dedicated to the Public Domain.
  http://creativecommons.org/publicdomain/zero/1.0/ */
-/* global Services, Assert */
 
 "use strict";
 
@@ -57,7 +56,7 @@
 
   // Currently unimplemented, add a test when we implement the code.
   yield Assert.rejects(MozLoopService.promiseProfileEncryptionKey(),
-    /not implemented/, "should reject as unimplemented");
+    /No FxA key available/, "should reject as not available");
 });
 
 add_task(function test_hasEncryptionKey() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/xpcshell/test_loopservice_initialize.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/xpcshell/test_loopservice_initialize.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/xpcshell/test_loopservice_initialize.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/xpcshell/test_loopservice_initialize.js	2015-05-25 20:42:47.000000000 +0000
@@ -40,11 +40,19 @@
 add_task(function test_initialize_with_guest_rooms() {
   Services.prefs.setBoolPref("loop.createdRoom", true);
   startTimerCalled = false;
+  MozLoopService.resetServiceInitialized();
 
   MozLoopService.initialize();
 
   Assert.equal(startTimerCalled, true,
     "should start the timer when guest rooms have been created");
+
+  startTimerCalled = false;
+
+  MozLoopService.initialize();
+
+  Assert.equal(startTimerCalled, false,
+    "should not have initialized a second time");
 });
 
 function run_test() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/xpcshell/test_loopservice_loop_prefs.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/xpcshell/test_loopservice_loop_prefs.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/xpcshell/test_loopservice_loop_prefs.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/xpcshell/test_loopservice_loop_prefs.js	2015-05-25 20:42:47.000000000 +0000
@@ -1,6 +1,5 @@
 /* Any copyright is dedicated to the Public Domain.
  http://creativecommons.org/publicdomain/zero/1.0/ */
-/*global XPCOMUtils, Services, Assert */
 
 "use strict";
 
@@ -65,7 +64,7 @@
 {
   MozLoopService.setLoopPref(fakeCharPrefName, true);
 
-  ok(true, "Setting non-coercible type should not fail");
+  Assert.ok(true, "Setting non-coercible type should not fail");
 }
 
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/xpcshell/test_loopservice_restart.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/xpcshell/test_loopservice_restart.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/xpcshell/test_loopservice_restart.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/xpcshell/test_loopservice_restart.js	2015-05-25 20:42:47.000000000 +0000
@@ -39,6 +39,7 @@
 add_task(function* test_initialize_with_created_room_and_no_auth_token() {
   Services.prefs.setBoolPref(LOOP_CREATED_ROOM_PREF, true);
   Services.prefs.clearUserPref(LOOP_FXA_TOKEN_PREF);
+  MozLoopService.resetServiceInitialized();
 
   loopServer.registerPathHandler("/registration", (request, response) => {
     response.setStatusLine(null, 200, "OK");
@@ -55,6 +56,7 @@
 add_task(function* test_initialize_with_invalid_fxa_token() {
   Services.prefs.setCharPref(LOOP_FXA_PROFILE_PREF, FAKE_FXA_PROFILE);
   Services.prefs.setCharPref(LOOP_FXA_TOKEN_PREF, FAKE_FXA_TOKEN_DATA);
+  MozLoopService.resetServiceInitialized();
 
   // Only need to implement the FxA registration because the previous
   // test registered as a guest.
@@ -88,6 +90,7 @@
 add_task(function* test_initialize_with_fxa_token() {
   Services.prefs.setCharPref(LOOP_FXA_PROFILE_PREF, FAKE_FXA_PROFILE);
   Services.prefs.setCharPref(LOOP_FXA_TOKEN_PREF, FAKE_FXA_TOKEN_DATA);
+  MozLoopService.resetServiceInitialized();
 
   MozLoopService.errors.clear();
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/xpcshell/xpcshell.ini firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/xpcshell/xpcshell.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/test/xpcshell/xpcshell.ini	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/test/xpcshell/xpcshell.ini	2015-05-25 20:42:47.000000000 +0000
@@ -9,6 +9,7 @@
 [test_looprooms.js]
 [test_looprooms_encryption_in_fxa.js]
 [test_looprooms_first_notification.js]
+[test_looprooms_upgrade_to_encryption.js]
 [test_loopservice_directcall.js]
 [test_loopservice_dnd.js]
 [test_loopservice_encryptionkey.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/ui/index.html firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/ui/index.html
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/ui/index.html	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/ui/index.html	2015-05-25 20:42:47.000000000 +0000
@@ -56,6 +56,8 @@
     <script src="../content/shared/js/feedbackStore.js"></script>
     <script src="../content/shared/js/views.js"></script>
     <script src="../content/shared/js/feedbackViews.js"></script>
+    <script src="../content/shared/js/textChatStore.js"></script>
+    <script src="../content/shared/js/textChatView.js"></script>
     <script src="../content/js/roomStore.js"></script>
     <script src="../content/js/roomViews.js"></script>
     <script src="../content/js/conversationViews.js"></script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/ui/ui-showcase.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/ui/ui-showcase.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/ui/ui-showcase.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/ui/ui-showcase.js	2015-05-25 20:42:47.000000000 +0000
@@ -1,18 +1,15 @@
-/** @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 */
+/* global uncaughtError:true */
 
 (function() {
   "use strict";
 
   // Stop the default init functions running to avoid conflicts.
-  document.removeEventListener('DOMContentLoaded', loop.panel.init);
-  document.removeEventListener('DOMContentLoaded', loop.conversation.init);
+  document.removeEventListener("DOMContentLoaded", loop.panel.init);
+  document.removeEventListener("DOMContentLoaded", loop.conversation.init);
 
   // 1. Desktop components
   // 1.1 Panel
@@ -79,6 +76,8 @@
 
   loop.shared.mixins.setRootObject(rootObject);
 
+  var dispatcher = new loop.Dispatcher();
+
   // Feedback API client configured to send data to the stage input server,
   // which is available at https://input.allizom.org
   var stageFeedbackApiClient = new loop.FeedbackAPIClient(
@@ -87,9 +86,14 @@
     }
   );
 
-  var mockSDK = _.extend({}, Backbone.Events);
+  var mockSDK = _.extend({
+    sendTextChatMessage: function(message) {
+      dispatcher.dispatch(new loop.shared.actions.ReceivedTextChatMessage({
+        message: message
+      }));
+    }
+  }, Backbone.Events);
 
-  var dispatcher = new loop.Dispatcher();
   var activeRoomStore = new loop.store.ActiveRoomStore(dispatcher, {
     mozLoop: navigator.mozLoop,
     sdkDriver: mockSDK
@@ -105,10 +109,19 @@
     mozLoop: navigator.mozLoop,
     sdkDriver: mockSDK
   });
+  var textChatStore = new loop.store.TextChatStore(dispatcher, {
+    sdkDriver: mockSDK
+  });
+
+  textChatStore.setStoreState({
+    // XXX Disabled until we start sorting out some of the layouts.
+    textChatEnabled: false
+  });
 
   loop.store.StoreMixin.register({
     conversationStore: conversationStore,
-    feedbackStore: feedbackStore
+    feedbackStore: feedbackStore,
+    textChatStore: textChatStore
   });
 
   // Local mocks
@@ -746,7 +759,7 @@
    * CSS media rules in their own iframe to mimic the viewport
    * */
   function _renderComponentsInIframes() {
-    var parents = document.querySelectorAll('.breakpoint');
+    var parents = document.querySelectorAll(".breakpoint");
     [].forEach.call(parents, appendChildInIframe);
 
     /**
@@ -755,9 +768,9 @@
      * @type {HTMLElement} parent - Parent DOM node of a component & iframe
      * */
     function appendChildInIframe(parent) {
-      var styles     = document.querySelector('head').children;
+      var styles     = document.querySelector("head").children;
       var component  = parent.children[0];
-      var iframe     = document.createElement('iframe');
+      var iframe     = document.createElement("iframe");
       var width      = parent.dataset.breakpointWidth;
       var height     = parent.dataset.breakpointHeight;
 
@@ -768,8 +781,8 @@
       iframe.src    = "about:blank";
       // Workaround for bug 297685
       iframe.onload = function () {
-        var iframeHead = iframe.contentDocument.querySelector('head');
-        iframe.contentDocument.documentElement.querySelector('body')
+        var iframeHead = iframe.contentDocument.querySelector("head");
+        iframe.contentDocument.documentElement.querySelector("body")
                                               .appendChild(component);
 
         [].forEach.call(styles, function(style) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/ui/ui-showcase.jsx firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/ui/ui-showcase.jsx
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/loop/ui/ui-showcase.jsx	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/loop/ui/ui-showcase.jsx	2015-05-25 20:42:47.000000000 +0000
@@ -1,18 +1,15 @@
-/** @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 */
+/* global uncaughtError:true */
 
 (function() {
   "use strict";
 
   // Stop the default init functions running to avoid conflicts.
-  document.removeEventListener('DOMContentLoaded', loop.panel.init);
-  document.removeEventListener('DOMContentLoaded', loop.conversation.init);
+  document.removeEventListener("DOMContentLoaded", loop.panel.init);
+  document.removeEventListener("DOMContentLoaded", loop.conversation.init);
 
   // 1. Desktop components
   // 1.1 Panel
@@ -79,6 +76,8 @@
 
   loop.shared.mixins.setRootObject(rootObject);
 
+  var dispatcher = new loop.Dispatcher();
+
   // Feedback API client configured to send data to the stage input server,
   // which is available at https://input.allizom.org
   var stageFeedbackApiClient = new loop.FeedbackAPIClient(
@@ -87,9 +86,14 @@
     }
   );
 
-  var mockSDK = _.extend({}, Backbone.Events);
+  var mockSDK = _.extend({
+    sendTextChatMessage: function(message) {
+      dispatcher.dispatch(new loop.shared.actions.ReceivedTextChatMessage({
+        message: message
+      }));
+    }
+  }, Backbone.Events);
 
-  var dispatcher = new loop.Dispatcher();
   var activeRoomStore = new loop.store.ActiveRoomStore(dispatcher, {
     mozLoop: navigator.mozLoop,
     sdkDriver: mockSDK
@@ -105,10 +109,19 @@
     mozLoop: navigator.mozLoop,
     sdkDriver: mockSDK
   });
+  var textChatStore = new loop.store.TextChatStore(dispatcher, {
+    sdkDriver: mockSDK
+  });
+
+  textChatStore.setStoreState({
+    // XXX Disabled until we start sorting out some of the layouts.
+    textChatEnabled: false
+  });
 
   loop.store.StoreMixin.register({
     conversationStore: conversationStore,
-    feedbackStore: feedbackStore
+    feedbackStore: feedbackStore,
+    textChatStore: textChatStore
   });
 
   // Local mocks
@@ -746,7 +759,7 @@
    * CSS media rules in their own iframe to mimic the viewport
    * */
   function _renderComponentsInIframes() {
-    var parents = document.querySelectorAll('.breakpoint');
+    var parents = document.querySelectorAll(".breakpoint");
     [].forEach.call(parents, appendChildInIframe);
 
     /**
@@ -755,9 +768,9 @@
      * @type {HTMLElement} parent - Parent DOM node of a component & iframe
      * */
     function appendChildInIframe(parent) {
-      var styles     = document.querySelector('head').children;
+      var styles     = document.querySelector("head").children;
       var component  = parent.children[0];
-      var iframe     = document.createElement('iframe');
+      var iframe     = document.createElement("iframe");
       var width      = parent.dataset.breakpointWidth;
       var height     = parent.dataset.breakpointHeight;
 
@@ -768,8 +781,8 @@
       iframe.src    = "about:blank";
       // Workaround for bug 297685
       iframe.onload = function () {
-        var iframeHead = iframe.contentDocument.querySelector('head');
-        iframe.contentDocument.documentElement.querySelector('body')
+        var iframeHead = iframe.contentDocument.querySelector("head");
+        iframe.contentDocument.documentElement.querySelector("body")
                                               .appendChild(component);
 
         [].forEach.call(styles, function(style) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/nsBrowserGlue.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/nsBrowserGlue.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/nsBrowserGlue.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/nsBrowserGlue.js	2015-05-25 20:42:47.000000000 +0000
@@ -175,28 +175,6 @@
 // days we will try to create a new one more aggressively.
 const BOOKMARKS_BACKUP_MAX_INTERVAL_DAYS = 3;
 
-// Record the current default search engine in Telemetry.
-function recordDefaultSearchEngine() {
-  let engine;
-  try {
-    engine = Services.search.defaultEngine;
-  } catch (e) {}
-  let name;
-
-  if (!engine) {
-    name = "NONE";
-  } else if (engine.identifier) {
-    name = engine.identifier;
-  } else if (engine.name) {
-    name = "other-" + engine.name;
-  } else {
-    name = "UNDEFINED";
-  }
-
-  let engines = Services.telemetry.getKeyedHistogramById("SEARCH_DEFAULT_ENGINE");
-  engines.add(name, true)
-}
-
 // Factory object
 const BrowserGlueServiceFactory = {
   _instance: null,
@@ -476,14 +454,12 @@
           ss.defaultEngine = ss.currentEngine;
         else
           ss.currentEngine = ss.defaultEngine;
-        recordDefaultSearchEngine();
         break;
       case "browser-search-service":
         if (data != "init-complete")
           return;
         Services.obs.removeObserver(this, "browser-search-service");
         this._syncSearchEngines();
-        recordDefaultSearchEngine();
         break;
 #ifdef NIGHTLY_BUILD
       case "nsPref:changed":
@@ -739,9 +715,6 @@
     LightweightThemeManager.addBuiltInTheme({
       id: "firefox-devedition@mozilla.org",
       name: themeName,
-#ifdef XP_WIN
-      accentcolor: "transparent",
-#endif
       headerURL: "resource:///chrome/browser/content/browser/defaultthemes/devedition.header.png",
       iconURL: "resource:///chrome/browser/content/browser/defaultthemes/devedition.icon.png",
       author: vendorShortName,
@@ -1367,7 +1340,7 @@
                                  stringName: "pu.notifyButton.accesskey"});
 
       let win = this.getMostRecentBrowserWindow();
-      let notifyBox = win.gBrowser.getNotificationBox();
+      let notifyBox = win.document.getElementById("high-priority-global-notificationbox");
 
       let buttons = [
                       {
@@ -1383,7 +1356,6 @@
       let notification = notifyBox.appendNotification(text, "post-update-notification",
                                                       null, notifyBox.PRIORITY_INFO_LOW,
                                                       buttons);
-      notification.persistence = -1; // Until user closes it
     }
 
     if (actions.indexOf("showAlert") == -1)
@@ -2346,11 +2318,6 @@
    */
   _showPrompt: function CPP_showPrompt(aRequest, aMessage, aPermission, aActions,
                                        aNotificationId, aAnchorId, aOptions) {
-    function onFullScreen() {
-      popup.remove();
-    }
-
-
     var browser = this._getBrowserForRequest(aRequest);
     var chromeWin = browser.ownerDocument.defaultView;
     var requestPrincipal = aRequest.principal;
@@ -2397,51 +2364,25 @@
                        popupNotificationActions[0] : null;
     var secondaryActions = popupNotificationActions.splice(1);
 
-    // Only allow exactly one permission rquest here.
+    // Only allow exactly one permission request here.
     let types = aRequest.types.QueryInterface(Ci.nsIArray);
     if (types.length != 1) {
       aRequest.cancel();
       return;
     }
 
-    let perm = types.queryElementAt(0, Ci.nsIContentPermissionType);
-
-    if (perm.type == "pointerLock") {
-      // If there's no mainAction, this is the autoAllow warning prompt.
-      let autoAllow = !mainAction;
-
-      if (!aOptions)
-        aOptions = {};
-
-      aOptions.removeOnDismissal = autoAllow;
-      aOptions.eventCallback = type => {
-        if (type == "removed") {
-          browser.removeEventListener("mozfullscreenchange", onFullScreen, true);
-          if (autoAllow) {
-            aRequest.allow();
-          }
-        }
-      }
+    if (!aOptions)
+      aOptions = {};
+    aOptions.displayOrigin = (requestPrincipal.URI instanceof Ci.nsIFileURL) ?
+                             requestPrincipal.URI.file.path :
+                             requestPrincipal.URI.host;
 
-    }
-
-    var popup = chromeWin.PopupNotifications.show(browser, aNotificationId, aMessage, aAnchorId,
-                                                  mainAction, secondaryActions, aOptions);
-    if (perm.type == "pointerLock") {
-      // pointerLock is automatically allowed in fullscreen mode (and revoked
-      // upon exit), so if the page enters fullscreen mode after requesting
-      // pointerLock (but before the user has granted permission), we should
-      // remove the now-impotent notification.
-      browser.addEventListener("mozfullscreenchange", onFullScreen, true);
-    }
+    return chromeWin.PopupNotifications.show(browser, aNotificationId, aMessage, aAnchorId,
+                                             mainAction, secondaryActions, aOptions);
   },
 
   _promptPush : function(aRequest) {
-    var browserBundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
-    var requestingURI = aRequest.principal.URI;
-
-    var message = browserBundle.formatStringFromName("push.enablePush",
-                                                 [requestingURI.host], 1);
+    var message = gBrowserBundle.GetStringFromName("push.enablePush2");
 
     var actions = [
     {
@@ -2464,8 +2405,8 @@
     }]
 
     var options = {
-                    learnMoreURL: Services.urlFormatter.formatURLPref("browser.push.warning.infoURL"),
-                  };
+      learnMoreURL: Services.urlFormatter.formatURLPref("browser.push.warning.infoURL"),
+    };
 
     this._showPrompt(aRequest, message, "push", actions, "push",
                      "push-notification-icon", options);
@@ -2474,7 +2415,6 @@
 
   _promptGeo : function(aRequest) {
     var secHistogram = Services.telemetry.getHistogramById("SECURITY_UI");
-    var requestingURI = aRequest.principal.URI;
 
     var message;
 
@@ -2488,12 +2428,14 @@
       },
     }];
 
-    if (requestingURI.schemeIs("file")) {
-      message = gBrowserBundle.formatStringFromName("geolocation.shareWithFile",
-                                                    [requestingURI.path], 1);
+    let options = {
+      learnMoreURL: Services.urlFormatter.formatURLPref("browser.geolocation.warning.infoURL"),
+    };
+
+    if (aRequest.principal.URI.schemeIs("file")) {
+      message = gBrowserBundle.GetStringFromName("geolocation.shareWithFile2");
     } else {
-      message = gBrowserBundle.formatStringFromName("geolocation.shareWithSite",
-                                                    [requestingURI.host], 1);
+      message = gBrowserBundle.GetStringFromName("geolocation.shareWithSite2");
       // Always share location action.
       actions.push({
         stringId: "geolocation.alwaysShareLocation",
@@ -2515,10 +2457,6 @@
       });
     }
 
-    var options = {
-                    learnMoreURL: Services.urlFormatter.formatURLPref("browser.geolocation.warning.infoURL"),
-                  };
-
     secHistogram.add(Ci.nsISecurityUITelemetry.WARNING_GEOLOCATION_REQUEST);
 
     this._showPrompt(aRequest, message, "geo", actions, "geolocation",
@@ -2526,10 +2464,7 @@
   },
 
   _promptWebNotifications : function(aRequest) {
-    var requestingURI = aRequest.principal.URI;
-
-    var message = gBrowserBundle.formatStringFromName("webNotifications.showFromSite",
-                                                      [requestingURI.host], 1);
+    var message = gBrowserBundle.GetStringFromName("webNotifications.showFromSite2");
 
     var actions = [
       {
@@ -2558,13 +2493,9 @@
   },
 
   _promptPointerLock: function CPP_promtPointerLock(aRequest, autoAllow) {
+    let message = gBrowserBundle.GetStringFromName(autoAllow ?
+                                  "pointerLock.autoLock.title3" : "pointerLock.title3");
 
-    let requestingURI = aRequest.principal.URI;
-
-    let originString = requestingURI.schemeIs("file") ? requestingURI.path : requestingURI.host;
-    let message = gBrowserBundle.formatStringFromName(autoAllow ?
-                                  "pointerLock.autoLock.title2" : "pointerLock.title2",
-                                  [originString], 1);
     // If this is an autoAllow info prompt, offer no actions.
     // _showPrompt() will allow the request when it's dismissed.
     let actions = [];
@@ -2591,12 +2522,34 @@
       ];
     }
 
-    this._showPrompt(aRequest, message, "pointerLock", actions, "pointerLock",
-                     "pointerLock-notification-icon", null);
+    function onFullScreen() {
+      notification.remove();
+    }
+
+    let options = {};
+    options.removeOnDismissal = autoAllow;
+    options.eventCallback = type => {
+      if (type == "removed") {
+        notification.browser.removeEventListener("mozfullscreenchange", onFullScreen, true);
+        if (autoAllow) {
+          aRequest.allow();
+        }
+      }
+    }
+
+    let notification =
+      this._showPrompt(aRequest, message, "pointerLock", actions, "pointerLock",
+                       "pointerLock-notification-icon", options);
+
+    // pointerLock is automatically allowed in fullscreen mode (and revoked
+    // upon exit), so if the page enters fullscreen mode after requesting
+    // pointerLock (but before the user has granted permission), we should
+    // remove the now-impotent notification.
+    notification.browser.addEventListener("mozfullscreenchange", onFullScreen, true);
   },
 
   prompt: function CPP_prompt(request) {
-    // Only allow exactly one permission rquest here.
+    // Only allow exactly one permission request here.
     let types = request.types.QueryInterface(Ci.nsIArray);
     if (types.length != 1) {
       request.cancel();
@@ -2612,7 +2565,7 @@
 
     // Make sure that we support the request.
     if (!(perm.type in kFeatureKeys)) {
-        return;
+      return;
     }
 
     var requestingPrincipal = request.principal;
@@ -2832,7 +2785,7 @@
       let channelAuthorized = updateChannel == "nightly" || updateChannel == "aurora";
 
       skipE10sChecks = !channelAuthorized ||
-                       UpdateServices.prefs.getBoolPref("browser.tabs.remote.autostart.disabled-because-using-a11y");
+                       Services.prefs.getBoolPref("browser.tabs.remote.disabled-for-a11y");
     } catch(e) {}
 
     if (skipE10sChecks) {
@@ -2916,7 +2869,9 @@
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
 
   observe: function(subject, topic, data) {
-    if (topic == "a11y-init-or-shutdown" && data == "1") {
+    if (topic == "a11y-init-or-shutdown"
+        && data == "1" &&
+        Services.appinfo.accessibilityIsBlacklistedForE10S) {
       this._showE10sAccessibilityWarning();
     }
   },
@@ -3006,7 +2961,15 @@
   _warnedAboutAccessibility: false,
 
   _showE10sAccessibilityWarning: function() {
-    Services.prefs.setBoolPref("browser.tabs.remote.autostart.disabled-because-using-a11y", true);
+    try {
+      if (!Services.prefs.getBoolPref("browser.tabs.remote.disabled-for-a11y")) {
+        // Only return if the pref exists and was set to false, but not
+        // if the pref didn't exist (which will throw).
+        return;
+      }
+    } catch (e) { }
+
+    Services.prefs.setBoolPref("browser.tabs.remote.disabled-for-a11y", true);
 
     if (this._warnedAboutAccessibility) {
       return;
@@ -3043,7 +3006,7 @@
         label: win.gNavigatorBundle.getString("e10s.accessibilityNotice.dontDisable.label"),
         accessKey: win.gNavigatorBundle.getString("e10s.accessibilityNotice.dontDisable.accesskey"),
         callback: function () {
-          Services.prefs.setBoolPref("browser.tabs.remote.autostart.disabled-because-using-a11y", false);
+          Services.prefs.setBoolPref("browser.tabs.remote.disabled-for-a11y", false);
         }
       }
     ];
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/places/content/bookmarkProperties.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/places/content/bookmarkProperties.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/places/content/bookmarkProperties.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/places/content/bookmarkProperties.js	2015-05-25 20:42:47.000000000 +0000
@@ -235,14 +235,10 @@
     else { // edit
       this._node = dialogInfo.node;
       this._title = this._node.title;
-      switch (dialogInfo.type) {
-        case "bookmark":
-          this._itemType = BOOKMARK_ITEM;
-          break;
-        case "folder":
-          this._itemType = BOOKMARK_FOLDER;
-          break;
-      }
+      if (PlacesUtils.nodeIsFolder(this._node))
+        this._itemType = BOOKMARK_FOLDER;
+      else if (PlacesUtils.nodeIsURI(this._node))
+        this._itemType = BOOKMARK_ITEM;
     }
   },
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/places/content/browserPlacesViews.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/places/content/browserPlacesViews.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/places/content/browserPlacesViews.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/places/content/browserPlacesViews.js	2015-05-25 20:42:47.000000000 +0000
@@ -205,8 +205,12 @@
         // In all other cases the insertion point is before that node.
         container = selectedNode.parent;
         index = container.getChildIndex(selectedNode);
-        if (PlacesUtils.nodeIsTagQuery(container))
+        if (PlacesUtils.nodeIsTagQuery(container)) {
           tagName = container.title;
+          // TODO (Bug 1160193): properly support dropping on a tag root.
+          if (!tagName)
+            return null;
+        }
       }
     }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/places/content/controller.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/places/content/controller.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/places/content/controller.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/places/content/controller.js	2015-05-25 20:42:47.000000000 +0000
@@ -1055,15 +1055,15 @@
     if (!didSuppressNotifications)
       result.suppressNotifications = true;
 
-    function addData(type, index, overrideURI) {
-      let wrapNode = PlacesUtils.wrapNode(node, type, overrideURI);
+    function addData(type, index, feedURI) {
+      let wrapNode = PlacesUtils.wrapNode(node, type, feedURI);
       dt.mozSetDataAt(type, wrapNode, index);
     }
 
-    function addURIData(index, overrideURI) {
-      addData(PlacesUtils.TYPE_X_MOZ_URL, index, overrideURI);
-      addData(PlacesUtils.TYPE_UNICODE, index, overrideURI);
-      addData(PlacesUtils.TYPE_HTML, index, overrideURI);
+    function addURIData(index, feedURI) {
+      addData(PlacesUtils.TYPE_X_MOZ_URL, index, feedURI);
+      addData(PlacesUtils.TYPE_UNICODE, index, feedURI);
+      addData(PlacesUtils.TYPE_HTML, index, feedURI);
     }
 
     try {
@@ -1155,11 +1155,11 @@
         copiedFolders.push(node);
 
       let livemarkInfo = this.getCachedLivemarkInfo(node);
-      let overrideURI = livemarkInfo ? livemarkInfo.feedURI.spec : null;
+      let feedURI = livemarkInfo && livemarkInfo.feedURI.spec;
 
       contents.forEach(function (content) {
         content.entries.push(
-          PlacesUtils.wrapNode(node, content.type, overrideURI)
+          PlacesUtils.wrapNode(node, content.type, feedURI)
         );
       });
     }, this);
@@ -1499,7 +1499,7 @@
       }
 
       // Only bookmarks and urls can be dropped into tag containers.
-      if (ip.isTag && ip.orientation == Ci.nsITreeView.DROP_ON &&
+      if (ip.isTag &&
           dragged.type != PlacesUtils.TYPE_X_MOZ_URL &&
           (dragged.type != PlacesUtils.TYPE_X_MOZ_PLACE ||
            (dragged.uri && dragged.uri.startsWith("place:")) ))
@@ -1605,8 +1605,7 @@
         index+= movedCount++;
 
       // If dragging over a tag container we should tag the item.
-      if (insertionPoint.isTag &&
-          insertionPoint.orientation == Ci.nsITreeView.DROP_ON) {
+      if (insertionPoint.isTag) {
         let uri = NetUtil.newURI(unwrapped.uri);
         let tagItemId = insertionPoint.itemId;
         if (PlacesUIUtils.useAsyncTransactions)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/places/content/editBookmarkOverlay.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/places/content/editBookmarkOverlay.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/places/content/editBookmarkOverlay.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/places/content/editBookmarkOverlay.js	2015-05-25 20:42:47.000000000 +0000
@@ -374,7 +374,9 @@
   XPCOMUtils.generateQI([Components.interfaces.nsIDOMEventListener,
                          Components.interfaces.nsINavBookmarkObserver]),
 
-  _element(aID) document.getElementById("editBMPanel_" + aID),
+  _element(aID) {
+    return document.getElementById("editBMPanel_" + aID);
+  },
 
   uninitPanel(aHideCollapsibleElements) {
     if (aHideCollapsibleElements) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/places/content/treeView.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/places/content/treeView.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/places/content/treeView.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/places/content/treeView.js	2015-05-25 20:42:47.000000000 +0000
@@ -1334,7 +1334,14 @@
     if (PlacesControllerDragHelper.disallowInsertion(container))
       return null;
 
-    let tagName = PlacesUtils.nodeIsTagQuery(container) ? container.title : null;
+    // TODO (Bug 1160193): properly support dropping on a tag root.
+    let tagName = null;
+    if (PlacesUtils.nodeIsTagQuery(container)) {
+      tagName = container.title;
+      if (!tagName)
+        return null;
+    }
+
     return new InsertionPoint(PlacesUtils.getConcreteItemId(container),
                               index, orientation,
                               tagName,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/places/content/tree.xml firefox-trunk-41.0~a1~hg20150524r245419/browser/components/places/content/tree.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/places/content/tree.xml	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/places/content/tree.xml	2015-05-25 20:42:47.000000000 +0000
@@ -529,8 +529,14 @@
           if (PlacesControllerDragHelper.disallowInsertion(container))
             return null;
 
-          let tagName = PlacesUtils.nodeIsTagQuery(container) ?
-                          container.title : null;
+          // TODO (Bug 1160193): properly support dropping on a tag root.
+          let tagName = null;
+          if (PlacesUtils.nodeIsTagQuery(container)) {
+            tagName = container.title;
+            if (!tagName)
+              return null;
+          }
+
           return new InsertionPoint(PlacesUtils.getConcreteItemId(container),
                                     index, orientation,
                                     tagName,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/places/PlacesUIUtils.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/components/places/PlacesUIUtils.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/places/PlacesUIUtils.jsm	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/places/PlacesUIUtils.jsm	2015-05-25 20:42:47.000000000 +0000
@@ -200,14 +200,21 @@
    *       annotations are synced from the old one.
    * @see this._copyableAnnotations for the list of copyable annotations.
    */
-  _getFolderCopyTransaction:
-  function PUIU__getFolderCopyTransaction(aData, aContainer, aIndex)
-  {
-    function getChildItemsTransactions(aChildren)
-    {
+  _getFolderCopyTransaction(aData, aContainer, aIndex) {
+    function getChildItemsTransactions(aRoot) {
       let transactions = [];
       let index = aIndex;
-      aChildren.forEach(function (node, i) {
+      for (let i = 0; i < aRoot.childCount; ++i) {
+        let child = aRoot.getChild(i);
+        // Temporary hacks until we switch to PlacesTransactions.jsm.
+        let isLivemark =
+          PlacesUtils.annotations.itemHasAnnotation(child.itemId,
+                                                    PlacesUtils.LMANNO_FEEDURI);
+        let [node] = PlacesUtils.unwrapNodes(
+          PlacesUtils.wrapNode(child, PlacesUtils.TYPE_X_MOZ_PLACE, isLivemark),
+          PlacesUtils.TYPE_X_MOZ_PLACE
+        );
+
         // Make sure that items are given the correct index, this will be
         // passed by the transaction manager to the backend for the insertion.
         // Insertion behaves differently for DEFAULT_INDEX (append).
@@ -238,19 +245,21 @@
         else {
           throw new Error("Unexpected item under a bookmarks folder");
         }
-      });
+      }
       return transactions;
     }
 
-    if (aContainer == PlacesUtils.tagsFolderId) { // Copying a tag folder.
+    if (aContainer == PlacesUtils.tagsFolderId) { // Copying into a tag folder.
       let transactions = [];
-      if (aData.children) {
-        aData.children.forEach(function(aChild) {
+      if (!aData.livemark && aData.type == PlacesUtils.TYPE_X_MOZ_PLACE_CONTAINER) {
+        let {root} = PlacesUtils.getFolderContents(aData.id, false, false);
+        let urls = PlacesUtils.getURLsForContainerNode(root);
+        root.containerOpen = false;
+        for (let { uri } of urls) {
           transactions.push(
-            new PlacesTagURITransaction(PlacesUtils._uri(aChild.uri),
-                                        [aData.title])
+            new PlacesTagURITransaction(NetUtil.newURI(uri), [aData.title])
           );
-        });
+        }
       }
       return new PlacesAggregatedTransaction("addTags", transactions);
     }
@@ -259,7 +268,10 @@
       return this._getLivemarkCopyTransaction(aData, aContainer, aIndex);
     }
 
-    let transactions = getChildItemsTransactions(aData.children);
+    let {root} = PlacesUtils.getFolderContents(aData.id, false, false);
+    let transactions = getChildItemsTransactions(root);
+    root.containerOpen = false;
+
     if (aData.dateAdded) {
       transactions.push(
         new PlacesEditItemDateAddedTransaction(null, aData.dateAdded)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/pocket/main.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/pocket/main.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/pocket/main.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/pocket/main.js	2015-05-25 20:42:48.000000000 +0000
@@ -42,7 +42,10 @@
 // TODO : [nice to have] - Immediately save, buffer the actions in a local queue and send (so it works offline, works like our native extensions)
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "ReaderMode", "resource://gre/modules/ReaderMode.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
+  "resource://gre/modules/PrivateBrowsingUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "ReaderMode",
+  "resource://gre/modules/ReaderMode.jsm");
 
 var pktUI = (function() {
 
@@ -294,7 +297,7 @@
             {
             	startheight = overflowMenuHeight;
             }
-            else if (pktApi.getSignupAB() == 'storyboard')
+            else if (pktApi.getSignupAB().indexOf('storyboard') > -1)
             {
                 startheight = 460;
                 if (fxasignedin == '1')
@@ -616,11 +619,33 @@
      * Open a new tab with a given url and notify the iframe panel that it was opened
      */
 
-	function openTabWithUrl(url, activate) {
-        var tab = gBrowser.addTab(url);
-        if (activate) {
-            gBrowser.selectedTab = tab;
+	function openTabWithUrl(url) {
+        let recentWindow = Services.wm.getMostRecentWindow("navigator:browser");
+        if (!recentWindow) {
+          Cu.reportError("Pocket: No open browser windows to openTabWithUrl");
+          return;
+        }
+
+        // If the user is in permanent private browsing than this is not an issue,
+        // since the current window will always share the same cookie jar as the other
+        // windows.
+        if (!PrivateBrowsingUtils.isWindowPrivate(recentWindow) ||
+            PrivateBrowsingUtils.permanentPrivateBrowsing) {
+          recentWindow.openUILinkIn(url, "tab");
+          return;
+        }
+
+        let windows = Services.wm.getEnumerator("navigator:browser");
+        while (windows.hasMoreElements()) {
+          let win = windows.getNext();
+          if (!PrivateBrowsingUtils.isWindowPrivate(win)) {
+            win.openUILinkIn(url, "tab");
+            return;
+          }
         }
+
+        // If there were no non-private windows opened already.
+        recentWindow.openUILinkIn(url, "window");
 	}
 
 
@@ -644,7 +669,15 @@
     }
 
     function getPanelFrame() {
-    	return document.getElementById('pocket-panel-iframe');
+        var frame = document.getElementById('pocket-panel-iframe');
+        if (!frame) {
+            var frameParent = document.getElementById("PanelUI-pocketView").firstChild;
+            frame = document.createElement("iframe");
+            frame.id = 'pocket-panel-iframe';
+            frame.setAttribute("type", "content");
+            frameParent.appendChild(frame);
+        }
+        return frame;
     }
 
     function getSubview() {
@@ -779,6 +812,9 @@
      */
     return {
     	onLoad: onLoad,
+    	getPanelFrame: getPanelFrame,
+
+        openTabWithUrl: openTabWithUrl,
 
     	pocketButtonOnCommand: pocketButtonOnCommand,
     	pocketPanelDidShow: pocketPanelDidShow,
@@ -841,7 +877,7 @@
 
         if (!isPanelIdValid(panelId)) { return; };
 
-        var panelFrame = document.getElementById('pocket-panel-iframe');
+        var panelFrame = pktUI.getPanelFrame();
         if (!isPocketPanelFrameValid(panelFrame)) { return; }
 
         var doc = panelFrame.contentWindow.document;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/pocket/panels/css/signup.css firefox-trunk-41.0~a1~hg20150524r245419/browser/components/pocket/panels/css/signup.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/pocket/panels/css/signup.css	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/pocket/panels/css/signup.css	2015-05-25 20:42:48.000000000 +0000
@@ -108,6 +108,9 @@
 .pkt_ext_containersignup .pkt_ext_learnmore {
     font-size: 12px;
 }
+.pkt_ext_containersignup .pkt_ext_learnmoreinactive {
+    visibility: hidden;
+}
 .pkt_ext_signupdetail h4 {
     font-size: 12px;
     font-weight: normal;
@@ -356,6 +359,20 @@
 .pkt_ext_signup_ru .signup-btn-firefox .text {
     left: 15px;
 }
+.pkt_ext_signup_de .signup-btn-firefox .logo,
+.pkt_ext_signup_es .pkt_ext_signupdetail_hero .signup-btn-firefox .logo,
+.pkt_ext_signup_ja .signup-btn-firefox .logo,
+.pkt_ext_signup_ru .signup-btn-firefox .logo {
+    height: 2.4em;
+}
+@media (min-resolution: 1.1dppx) {
+    .pkt_ext_signup_de .signup-btn-firefox .logo,
+    .pkt_ext_signup_es .pkt_ext_signupdetail_hero .signup-btn-firefox .logo,
+    .pkt_ext_signup_ja .signup-btn-firefox .logo,
+    .pkt_ext_signup_ru .signup-btn-firefox .logo {
+        height: 2.5em;
+    }
+}
 .pkt_ext_signup_de .signup-btn-email,
 .pkt_ext_signup_es .pkt_ext_signupdetail_hero .signup-btn-email,
 .pkt_ext_signup_ja .signup-btn-email,
@@ -373,4 +390,10 @@
 .pkt_ext_signup_ja .pkt_ext_introdetailhero .pkt_ext_tagline,
 .pkt_ext_signup_ru .pkt_ext_introdetailhero .pkt_ext_tagline {
     font-size: 13px;
+}
+.pkt_ext_signup_overflow.pkt_ext_signup_de .signup-btn-firefox .logo,
+.pkt_ext_signup_overflow.pkt_ext_signup_es .signup-btn-firefox .logo,
+.pkt_ext_signup_overflow.pkt_ext_signup_ja .signup-btn-firefox .logo,
+.pkt_ext_signup_overflow.pkt_ext_signup_ru .signup-btn-firefox .logo {
+    display: none;
 }
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/pocket/panels/js/dictionary.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/pocket/panels/js/dictionary.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/pocket/panels/js/dictionary.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/pocket/panels/js/dictionary.js	2015-05-25 20:42:48.000000000 +0000
@@ -3,6 +3,7 @@
 {
 	addtags: "Add Tags",
 	alreadyhaveacct: "Already a Pocket user?",
+	continueff: "Continue with Firefox",
 	errorgeneric: "There was an error when trying to save to Pocket.",
 	learnmore: "Learn More",
 	loginnow: "Log in",
@@ -34,11 +35,11 @@
   addtags: "Tags hinzufügen",
   alreadyhaveacct: "Sind Sie bereits Pocket-Nutzer?",
   continueff: "Mit Firefox fortfahren",
-  error1: "Wir konnten keine vorgeschlagenen Tags für dieses Element finden.",
-  error3: "Bitte melden Sie sich bei Pocket an und versuchen Sie es erneut.",
+  errorgeneric: "Beim Speichern des Links bei Pocket ist ein Fehler aufgetreten.",
   learnmore: "Mehr erfahren",
   loginnow: "Anmelden",
   maxtaglength: "Tags dürfen höchsten 25 Zeichen lang sein.",
+  mustbeconnected: "Bitte überprüfen Sie, ob Sie mit dem Internet verbunden sind.",
   onlylinkssaved: "Es können nur Links gespeichert werden",
   pagenotsaved: "Seite nicht gespeichert",
   pageremoved: "Seite entfernt",
@@ -47,6 +48,7 @@
   processingtags: "Tags werden hinzugefügt…",
   removepage: "Seite entfernen",
   save: "Speichern",
+  saving: "Speichern…",
   signupemail: "Mit E-Mail registrieren",
   signuptosave: "Registrieren Sie sich bei Pocket. Das ist kostenlos.",
   suggestedtags: "Vorgeschlagene Tags",
@@ -64,11 +66,11 @@
   addtags: "Añadir etiquetas",
   alreadyhaveacct: "¿Ya tiene cuenta Pocket?",
   continueff: "Continuar con Firefox",
-  error1: "No se han encontrado etiquetas sugeridas para este elemento.",
-  error3: "Inicie sesión en Pocket y vuelva a intentarlo.",
+  errorgeneric: "Se ha producido un error al guardar el enlace en Pocket.",
   learnmore: "Saber más",
   loginnow: "Iniciar sesión",
   maxtaglength: "Las etiquetas están limitadas a 25 caracteres.",
+  mustbeconnected: "Compruebe que tiene conexión a Internet.",
   onlylinkssaved: "Solo se pueden guardar enlaces",
   pagenotsaved: "Página no guardada",
   pageremoved: "Página eliminada",
@@ -77,6 +79,7 @@
   processingtags: "Añadiendo etiquetas…",
   removepage: "Eliminar página",
   save: "Guardar",
+  saving: "Guardando…",
   signupemail: "Regístrese con su correo.",
   signuptosave: "Regístrese en Pocket. Es gratis.",
   suggestedtags: "Etiquetas sugeridas",
@@ -94,11 +97,11 @@
   addtags: "タグを追加",
   alreadyhaveacct: "アカウントをお持ちですか？",
   continueff: "Firefox で続行",
-  error1: "この項目に合うタグが見つかりません。",
-  error3: "Pocket にログインしてやり直してください。",
+  errorgeneric: "Pocket にリンクを保存中に問題が発生しました。",
   learnmore: "詳細",
   loginnow: "ログイン",
   maxtaglength: "タグは 25 文字までです。",
+  mustbeconnected: "インターネットに接続されていることを確認してください。",
   onlylinkssaved: "リンクのみ保存できます",
   pagenotsaved: "ページを保存できませんでした",
   pageremoved: "ページを削除しました",
@@ -107,12 +110,13 @@
   processingtags: "タグを追加中...",
   removepage: "ページを削除",
   save: "保存",
+  saving: "保存中...",
   signupemail: "メールでアカウント登録",
   signuptosave: "Pocket にアカウント登録してください。無料です。",
   suggestedtags: "タグ候補",
-  tagline: "Pocket でいつでもどこでも見れるよう、Firefox から記事や動画を保存できます。",
+  tagline: "Pocket でいつでもどこでも見られるよう、Firefox から記事や動画を保存できます。",
   taglinestory_one: "Firefox から記事や動画やページを保存するには、Pocket ボタンをクリックしてください。",
-  taglinestory_two: "Pocket でいつでもどこでも見れます。",
+  taglinestory_two: "Pocket でいつでもどこでも見られます。",
   tagssaved: "タグを追加しました",
   signinfirefox: "Firefox でログイン",
   signupfirefox: "Firefox でアカウント登録",
@@ -124,11 +128,11 @@
   addtags: "Добавить теги",
   alreadyhaveacct: "Уже используете Pocket?",
   continueff: "Продолжить через Firefox",
-  error1: "Мы не смогли найти для этого элемента рекомендуемые теги.",
-  error3: "Пожалуйста, войдите в Pocket, и попробуйте ещё раз.",
+  errorgeneric: "Не удалось сохранить в Pocket.",
   learnmore: "Узнайте больше",
   loginnow: "Войдите",
   maxtaglength: "Длина тега не должна превышать 25 символов.",
+  mustbeconnected: "Убедитесь, что вы подключены к Интернет.",
   onlylinkssaved: "Можно сохранять только ссылки",
   pagenotsaved: "Страница не сохранена",
   pageremoved: "Страница удалена",
@@ -137,6 +141,7 @@
   processingtags: "Добавление тегов...",
   removepage: "Удалить страницу",
   save: "Сохранить",
+  saving: "Сохранение...",
   signupemail: "Регистрация по эл. почте",
   signuptosave: "Зарегистрируйтесь в Pocket. Это бесплатно.",
   suggestedtags: "Рекомендуемые теги",
@@ -147,4 +152,4 @@
   signinfirefox: "Войти через Firefox",
   signupfirefox: "Регистрация через Firefox",
   viewlist: "Просмотреть список"
-};
\ No newline at end of file
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/pocket/panels/js/saved.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/pocket/panels/js/saved.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/pocket/panels/js/saved.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/pocket/panels/js/saved.js	2015-05-25 20:42:48.000000000 +0000
@@ -78,7 +78,7 @@
             }
             else if (resp.status == 'error') {
                 var msg = $('<p class="suggestedtag_msg">');
-                msg.text(resp.error);
+                msg.text(resp.error.message);
                 $('.pkt_ext_suggestedtag_detail').append(msg);
                 this.suggestedTagsLoaded = true;
                 if (!myself.mouseInside) {
@@ -315,7 +315,7 @@
             thePKT_SAVED.sendMessage("addTags",
             {
                 url: myself.savedUrl,
-                tags: originaltags   
+                tags: originaltags
             }, function(resp)
             {
                 if (resp.status == 'success') 
@@ -324,7 +324,7 @@
                 }
                 else if (resp.status == 'error') 
                 {
-                    $('.pkt_ext_edit_msg').addClass('pkt_ext_edit_msg_error pkt_ext_edit_msg_active').text(resp.error);
+                    $('.pkt_ext_edit_msg').addClass('pkt_ext_edit_msg_error pkt_ext_edit_msg_active').text(resp.error.message);
                 }
             });
         });
@@ -348,7 +348,7 @@
                         myself.showStateFinalMsg(myself.dictJSON.pageremoved);
                     }
                     else if (resp.status == 'error') {
-                        $('.pkt_ext_edit_msg').addClass('pkt_ext_edit_msg_error pkt_ext_edit_msg_active').text(resp.error);
+                        $('.pkt_ext_edit_msg').addClass('pkt_ext_edit_msg_error pkt_ext_edit_msg_active').text(resp.error.message);
                     }
                 });
             }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/pocket/panels/js/signup.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/pocket/panels/js/signup.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/pocket/panels/js/signup.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/pocket/panels/js/signup.js	2015-05-25 20:42:48.000000000 +0000
@@ -187,7 +187,9 @@
         this.getTranslations();
         this.dictJSON.fxasignedin = this.fxasignedin ? 1 : 0;
         this.dictJSON.variant = (this.variant ? this.variant : 'undefined');
+        this.dictJSON.variant += this.fxasignedin ? '_fxa' : '_nonfxa';
         this.dictJSON.pockethost = this.pockethost;
+        this.dictJSON.showlearnmore = (this.variant.indexOf('_lm') > -1 || this.variant == 'storyboard' || this.variant == 'hero') ? 1 : 0;
 
         // extra modifier class for collapsed state
         if (this.inoverflowmenu)
@@ -202,7 +204,7 @@
         }
 
         // Create actual content
-        if (this.variant == 'storyboard')
+        if (this.variant == 'storyboard' || this.variant == 'storyboard_lm' || this.variant == 'storyboard_nlm')
         {
             $('body').append(Handlebars.templates.signupstoryboard_shell(this.dictJSON));
         }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/pocket/panels/js/tmpl.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/pocket/panels/js/tmpl.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/pocket/panels/js/tmpl.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/pocket/panels/js/tmpl.js	2015-05-25 20:42:48.000000000 +0000
@@ -29,74 +29,99 @@
 },"useData":true});
 templates['signup_shell'] = template({"1":function(depth0,helpers,partials,data) {
   var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "	<p class=\"pkt_ext_learnmorecontainer\"><a class=\"pkt_ext_learnmore\" href=\"https://"
+    + escapeExpression(((helper = (helper = helpers.pockethost || (depth0 != null ? depth0.pockethost : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"pockethost","hash":{},"data":data}) : helper)))
+    + "?s=ffi&t=learnmore&v="
+    + escapeExpression(((helper = (helper = helpers.variant || (depth0 != null ? depth0.variant : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"variant","hash":{},"data":data}) : helper)))
+    + "\" target=\"_blank\">"
+    + escapeExpression(((helper = (helper = helpers.learnmore || (depth0 != null ? depth0.learnmore : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"learnmore","hash":{},"data":data}) : helper)))
+    + "</a></p>\n";
+},"3":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "	<p class=\"pkt_ext_learnmorecontainer\"><a class=\"pkt_ext_learnmore pkt_ext_learnmoreinactive\" href=\"#\">"
+    + escapeExpression(((helper = (helper = helpers.learnmore || (depth0 != null ? depth0.learnmore : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"learnmore","hash":{},"data":data}) : helper)))
+    + "</a></p>\n";
+},"5":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
   return "	<p class=\"btn-container\"><a href=\"https://"
     + escapeExpression(((helper = (helper = helpers.pockethost || (depth0 != null ? depth0.pockethost : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"pockethost","hash":{},"data":data}) : helper)))
-    + "/ff_signup?s="
+    + "/ff_signup?s=ffi&t=signupff&v="
     + escapeExpression(((helper = (helper = helpers.variant || (depth0 != null ? depth0.variant : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"variant","hash":{},"data":data}) : helper)))
-    + "&t=wlm\" target=_blank\" class=\"btn signup-btn-firefox\"><span class=\"logo\"></span><span class=\"text\">"
+    + "\" target=\"_blank\" class=\"btn signup-btn-firefox\"><span class=\"logo\"></span><span class=\"text\">"
     + escapeExpression(((helper = (helper = helpers.signinfirefox || (depth0 != null ? depth0.signinfirefox : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"signinfirefox","hash":{},"data":data}) : helper)))
     + "</span></a></p>\n";
-},"3":function(depth0,helpers,partials,data) {
+},"7":function(depth0,helpers,partials,data) {
   var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
   return "	<p class=\"btn-container\"><a href=\"https://"
     + escapeExpression(((helper = (helper = helpers.pockethost || (depth0 != null ? depth0.pockethost : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"pockethost","hash":{},"data":data}) : helper)))
-    + "/ff_signup?s="
+    + "/ff_signup?s=ffi&t=signupff&v="
     + escapeExpression(((helper = (helper = helpers.variant || (depth0 != null ? depth0.variant : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"variant","hash":{},"data":data}) : helper)))
-    + "&t=wlm\" target=_blank\" class=\"btn signup-btn-firefox\"><span class=\"logo\"></span><span class=\"text\">"
+    + "\" target=\"_blank\" class=\"btn signup-btn-firefox\"><span class=\"logo\"></span><span class=\"text\">"
     + escapeExpression(((helper = (helper = helpers.signupfirefox || (depth0 != null ? depth0.signupfirefox : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"signupfirefox","hash":{},"data":data}) : helper)))
-    + "</span></a></p>\n	<p class=\"btn-container\"><a href=\"http://"
+    + "</span></a></p>\n	<p class=\"btn-container\"><a href=\"https://"
     + escapeExpression(((helper = (helper = helpers.pockethost || (depth0 != null ? depth0.pockethost : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"pockethost","hash":{},"data":data}) : helper)))
-    + "/signup?force=email&src=extension&s="
+    + "/signup?force=email&src=extension&s=ffi&t=signupemail&v="
     + escapeExpression(((helper = (helper = helpers.variant || (depth0 != null ? depth0.variant : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"variant","hash":{},"data":data}) : helper)))
-    + "&t=wlm\" target=\"_blank\" class=\"btn btn-secondary signup-btn-email signup-btn-initstate\">"
+    + "\" target=\"_blank\" class=\"btn btn-secondary signup-btn-email signup-btn-initstate\">"
     + escapeExpression(((helper = (helper = helpers.signupemail || (depth0 != null ? depth0.signupemail : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"signupemail","hash":{},"data":data}) : helper)))
     + "</a></p>\n";
 },"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
   var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<div class=\"pkt_ext_introdetail pkt_ext_introdetailhero\">\n	<h2 class=\"pkt_ext_logo\">Pocket</h2>\n	<p class=\"pkt_ext_tagline\">"
     + escapeExpression(((helper = (helper = helpers.tagline || (depth0 != null ? depth0.tagline : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"tagline","hash":{},"data":data}) : helper)))
-    + "</p>\n	<p class=\"pkt_ext_learnmorecontainer\"><a class=\"pkt_ext_learnmore\" href=\"http://"
-    + escapeExpression(((helper = (helper = helpers.pockethost || (depth0 != null ? depth0.pockethost : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"pockethost","hash":{},"data":data}) : helper)))
-    + "?s="
-    + escapeExpression(((helper = (helper = helpers.variant || (depth0 != null ? depth0.variant : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"variant","hash":{},"data":data}) : helper)))
-    + "&t=wlm&src=ff_learn_more\" target=\"_blank\">"
-    + escapeExpression(((helper = (helper = helpers.learnmore || (depth0 != null ? depth0.learnmore : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"learnmore","hash":{},"data":data}) : helper)))
-    + "</a></p>\n	<div class=\"pkt_ext_introimg\"></div>\n</div>\n<div class=\"pkt_ext_signupdetail pkt_ext_signupdetail_hero\">\n	<h4>"
+    + "</p>\n";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.showlearnmore : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.program(3, data),"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "	<div class=\"pkt_ext_introimg\"></div>\n</div>\n<div class=\"pkt_ext_signupdetail pkt_ext_signupdetail_hero\">\n	<h4>"
     + escapeExpression(((helper = (helper = helpers.signuptosave || (depth0 != null ? depth0.signuptosave : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"signuptosave","hash":{},"data":data}) : helper)))
     + "</h4>\n";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.fxasignedin : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.program(3, data),"data":data});
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.fxasignedin : depth0), {"name":"if","hash":{},"fn":this.program(5, data),"inverse":this.program(7, data),"data":data});
   if (stack1 != null) { buffer += stack1; }
   return buffer + "	<p class=\"alreadyhave\">"
     + escapeExpression(((helper = (helper = helpers.alreadyhaveacct || (depth0 != null ? depth0.alreadyhaveacct : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"alreadyhaveacct","hash":{},"data":data}) : helper)))
-    + " <a href=\"http://"
+    + " <a href=\"https://"
     + escapeExpression(((helper = (helper = helpers.pockethost || (depth0 != null ? depth0.pockethost : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"pockethost","hash":{},"data":data}) : helper)))
-    + "/login?ep=3&src=extension&s="
+    + "/login?ep=3&src=extension&s=ffi&t=login&v="
     + escapeExpression(((helper = (helper = helpers.variant || (depth0 != null ? depth0.variant : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"variant","hash":{},"data":data}) : helper)))
-    + "&t=wlm\" target=\"_blank\">"
+    + "\" target=\"_blank\">"
     + escapeExpression(((helper = (helper = helpers.loginnow || (depth0 != null ? depth0.loginnow : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"loginnow","hash":{},"data":data}) : helper)))
     + "</a>.</p>\n</div>";
 },"useData":true});
 templates['signupstoryboard_shell'] = template({"1":function(depth0,helpers,partials,data) {
   var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "			<p><a class=\"pkt_ext_learnmore\" href=\"https://"
+    + escapeExpression(((helper = (helper = helpers.pockethost || (depth0 != null ? depth0.pockethost : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"pockethost","hash":{},"data":data}) : helper)))
+    + "?s=ffi&t=learnmore&v="
+    + escapeExpression(((helper = (helper = helpers.variant || (depth0 != null ? depth0.variant : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"variant","hash":{},"data":data}) : helper)))
+    + "\" target=\"_blank\">"
+    + escapeExpression(((helper = (helper = helpers.learnmore || (depth0 != null ? depth0.learnmore : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"learnmore","hash":{},"data":data}) : helper)))
+    + "</a></p>\n";
+},"3":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "			<p><a class=\"pkt_ext_learnmore pkt_ext_learnmoreinactive\" href=\"#\">"
+    + escapeExpression(((helper = (helper = helpers.learnmore || (depth0 != null ? depth0.learnmore : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"learnmore","hash":{},"data":data}) : helper)))
+    + "</a></p>\n";
+},"5":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
   return "	<p class=\"btn-container\"><a href=\"https://"
     + escapeExpression(((helper = (helper = helpers.pockethost || (depth0 != null ? depth0.pockethost : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"pockethost","hash":{},"data":data}) : helper)))
-    + "/ff_signup?s="
+    + "/ff_signup?s=ffi&t=signupff&v="
     + escapeExpression(((helper = (helper = helpers.variant || (depth0 != null ? depth0.variant : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"variant","hash":{},"data":data}) : helper)))
-    + "&t=wlm\" target=_blank\" class=\"btn signup-btn-firefox\"><span class=\"logo\"></span><span class=\"text\">"
+    + "\" target=\"_blank\" class=\"btn signup-btn-firefox\"><span class=\"logo\"></span><span class=\"text\">"
     + escapeExpression(((helper = (helper = helpers.signinfirefox || (depth0 != null ? depth0.signinfirefox : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"signinfirefox","hash":{},"data":data}) : helper)))
     + "</span></a></p>\n";
-},"3":function(depth0,helpers,partials,data) {
+},"7":function(depth0,helpers,partials,data) {
   var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
   return "	<p class=\"btn-container\"><a href=\"https://"
     + escapeExpression(((helper = (helper = helpers.pockethost || (depth0 != null ? depth0.pockethost : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"pockethost","hash":{},"data":data}) : helper)))
-    + "/ff_signup?s="
+    + "/ff_signup?s=ffi&t=signupff&v="
     + escapeExpression(((helper = (helper = helpers.variant || (depth0 != null ? depth0.variant : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"variant","hash":{},"data":data}) : helper)))
-    + "&t=wlm\" target=_blank\" class=\"btn signup-btn-firefox\"><span class=\"logo\"></span><span class=\"text\">"
+    + "\" target=\"_blank\" class=\"btn signup-btn-firefox\"><span class=\"logo\"></span><span class=\"text\">"
     + escapeExpression(((helper = (helper = helpers.signupfirefox || (depth0 != null ? depth0.signupfirefox : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"signupfirefox","hash":{},"data":data}) : helper)))
-    + "</span></a></p>\n	<p class=\"btn-container\"><a href=\"http://"
+    + "</span></a></p>\n	<p class=\"btn-container\"><a href=\"https://"
     + escapeExpression(((helper = (helper = helpers.pockethost || (depth0 != null ? depth0.pockethost : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"pockethost","hash":{},"data":data}) : helper)))
-    + "/signup?force=email&src=extension&s="
+    + "/signup?force=email&src=extension&s=ffi&t=signupemail&v="
     + escapeExpression(((helper = (helper = helpers.variant || (depth0 != null ? depth0.variant : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"variant","hash":{},"data":data}) : helper)))
-    + "&t=wlm\" target=\"_blank\" class=\"btn btn-secondary signup-btn-email signup-btn-initstate\">"
+    + "\" target=\"_blank\" class=\"btn btn-secondary signup-btn-email signup-btn-initstate\">"
     + escapeExpression(((helper = (helper = helpers.signupemail || (depth0 != null ? depth0.signupemail : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"signupemail","hash":{},"data":data}) : helper)))
     + "</a></p>\n";
 },"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
@@ -104,24 +129,21 @@
     + escapeExpression(((helper = (helper = helpers.taglinestory_one || (depth0 != null ? depth0.taglinestory_one : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"taglinestory_one","hash":{},"data":data}) : helper)))
     + "</p>\n		</div>\n		<div class=\"pkt_ext_introstoryone_img\"></div>\n	</div>\n	<div class=\"pkt_ext_introstorydivider\"></div>\n	<div class=\"pkt_ext_introstory pkt_ext_introstorytwo\">\n		<div class=\"pkt_ext_introstory_text\">\n			<p class=\"pkt_ext_tagline\">"
     + escapeExpression(((helper = (helper = helpers.taglinestory_two || (depth0 != null ? depth0.taglinestory_two : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"taglinestory_two","hash":{},"data":data}) : helper)))
-    + "</p>\n			<p><a class=\"pkt_ext_learnmore\" href=\"http://"
-    + escapeExpression(((helper = (helper = helpers.pockethost || (depth0 != null ? depth0.pockethost : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"pockethost","hash":{},"data":data}) : helper)))
-    + "?s="
-    + escapeExpression(((helper = (helper = helpers.variant || (depth0 != null ? depth0.variant : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"variant","hash":{},"data":data}) : helper)))
-    + "&t=wlm&src=ff_learn_more\" target=\"_blank\">"
-    + escapeExpression(((helper = (helper = helpers.learnmore || (depth0 != null ? depth0.learnmore : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"learnmore","hash":{},"data":data}) : helper)))
-    + "</a></p>\n		</div>\n		<div class=\"pkt_ext_introstorytwo_img\"></div>\n	</div>\n</div>\n<div class=\"pkt_ext_signupdetail\">\n	<h4>"
+    + "</p>\n";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.showlearnmore : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.program(3, data),"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "		</div>\n		<div class=\"pkt_ext_introstorytwo_img\"></div>\n	</div>\n</div>\n<div class=\"pkt_ext_signupdetail\">\n	<h4>"
     + escapeExpression(((helper = (helper = helpers.signuptosave || (depth0 != null ? depth0.signuptosave : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"signuptosave","hash":{},"data":data}) : helper)))
     + "</h4>\n";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.fxasignedin : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.program(3, data),"data":data});
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.fxasignedin : depth0), {"name":"if","hash":{},"fn":this.program(5, data),"inverse":this.program(7, data),"data":data});
   if (stack1 != null) { buffer += stack1; }
   return buffer + "	<p class=\"alreadyhave\">"
     + escapeExpression(((helper = (helper = helpers.alreadyhaveacct || (depth0 != null ? depth0.alreadyhaveacct : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"alreadyhaveacct","hash":{},"data":data}) : helper)))
-    + " <a href=\"http://"
+    + " <a href=\"https://"
     + escapeExpression(((helper = (helper = helpers.pockethost || (depth0 != null ? depth0.pockethost : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"pockethost","hash":{},"data":data}) : helper)))
-    + "/login?ep=3&src=extension&s="
+    + "/login?ep=3&src=extension&s=ffi&t=login&v="
     + escapeExpression(((helper = (helper = helpers.variant || (depth0 != null ? depth0.variant : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"variant","hash":{},"data":data}) : helper)))
-    + "&t=wlm\" target=\"_blank\">"
+    + "\" target=\"_blank\">"
     + escapeExpression(((helper = (helper = helpers.loginnow || (depth0 != null ? depth0.loginnow : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"loginnow","hash":{},"data":data}) : helper)))
     + "</a>.</p>\n</div>";
 },"useData":true});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/pocket/panels/tmpl/signup_shell.handlebars firefox-trunk-41.0~a1~hg20150524r245419/browser/components/pocket/panels/tmpl/signup_shell.handlebars
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/pocket/panels/tmpl/signup_shell.handlebars	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/pocket/panels/tmpl/signup_shell.handlebars	2015-05-25 20:42:48.000000000 +0000
@@ -1,16 +1,20 @@
 <div class="pkt_ext_introdetail pkt_ext_introdetailhero">
 	<h2 class="pkt_ext_logo">Pocket</h2>
 	<p class="pkt_ext_tagline">{{tagline}}</p>
-	<p class="pkt_ext_learnmorecontainer"><a class="pkt_ext_learnmore" href="http://{{pockethost}}?s={{variant}}&t=wlm&src=ff_learn_more" target="_blank">{{learnmore}}</a></p>
+	{{#if showlearnmore}}
+	<p class="pkt_ext_learnmorecontainer"><a class="pkt_ext_learnmore" href="https://{{pockethost}}?s=ffi&t=learnmore&v={{variant}}" target="_blank">{{learnmore}}</a></p>
+	{{else}}
+	<p class="pkt_ext_learnmorecontainer"><a class="pkt_ext_learnmore pkt_ext_learnmoreinactive" href="#">{{learnmore}}</a></p>
+	{{/if}}
 	<div class="pkt_ext_introimg"></div>
 </div>
 <div class="pkt_ext_signupdetail pkt_ext_signupdetail_hero">
 	<h4>{{signuptosave}}</h4>
 	{{#if fxasignedin}}
-	<p class="btn-container"><a href="https://{{pockethost}}/ff_signup?s={{variant}}&t=wlm" target=_blank" class="btn signup-btn-firefox"><span class="logo"></span><span class="text">{{signinfirefox}}</span></a></p>
+	<p class="btn-container"><a href="https://{{pockethost}}/ff_signup?s=ffi&t=signupff&v={{variant}}" target="_blank" class="btn signup-btn-firefox"><span class="logo"></span><span class="text">{{signinfirefox}}</span></a></p>
 	{{else}}
-	<p class="btn-container"><a href="https://{{pockethost}}/ff_signup?s={{variant}}&t=wlm" target=_blank" class="btn signup-btn-firefox"><span class="logo"></span><span class="text">{{signupfirefox}}</span></a></p>
-	<p class="btn-container"><a href="http://{{pockethost}}/signup?force=email&src=extension&s={{variant}}&t=wlm" target="_blank" class="btn btn-secondary signup-btn-email signup-btn-initstate">{{signupemail}}</a></p>
+	<p class="btn-container"><a href="https://{{pockethost}}/ff_signup?s=ffi&t=signupff&v={{variant}}" target="_blank" class="btn signup-btn-firefox"><span class="logo"></span><span class="text">{{signupfirefox}}</span></a></p>
+	<p class="btn-container"><a href="https://{{pockethost}}/signup?force=email&src=extension&s=ffi&t=signupemail&v={{variant}}" target="_blank" class="btn btn-secondary signup-btn-email signup-btn-initstate">{{signupemail}}</a></p>
 	{{/if}}
-	<p class="alreadyhave">{{alreadyhaveacct}} <a href="http://{{pockethost}}/login?ep=3&src=extension&s={{variant}}&t=wlm" target="_blank">{{loginnow}}</a>.</p>
+	<p class="alreadyhave">{{alreadyhaveacct}} <a href="https://{{pockethost}}/login?ep=3&src=extension&s=ffi&t=login&v={{variant}}" target="_blank">{{loginnow}}</a>.</p>
 </div>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/pocket/panels/tmpl/signupstoryboard_shell.handlebars firefox-trunk-41.0~a1~hg20150524r245419/browser/components/pocket/panels/tmpl/signupstoryboard_shell.handlebars
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/pocket/panels/tmpl/signupstoryboard_shell.handlebars	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/pocket/panels/tmpl/signupstoryboard_shell.handlebars	2015-05-25 20:42:48.000000000 +0000
@@ -9,7 +9,11 @@
 	<div class="pkt_ext_introstory pkt_ext_introstorytwo">
 		<div class="pkt_ext_introstory_text">
 			<p class="pkt_ext_tagline">{{taglinestory_two}}</p>
-			<p><a class="pkt_ext_learnmore" href="http://{{pockethost}}?s={{variant}}&t=wlm&src=ff_learn_more" target="_blank">{{learnmore}}</a></p>
+			{{#if showlearnmore}}
+			<p><a class="pkt_ext_learnmore" href="https://{{pockethost}}?s=ffi&t=learnmore&v={{variant}}" target="_blank">{{learnmore}}</a></p>
+			{{else}}
+			<p><a class="pkt_ext_learnmore pkt_ext_learnmoreinactive" href="#">{{learnmore}}</a></p>
+			{{/if}}
 		</div>
 		<div class="pkt_ext_introstorytwo_img"></div>
 	</div>
@@ -17,10 +21,10 @@
 <div class="pkt_ext_signupdetail">
 	<h4>{{signuptosave}}</h4>
 	{{#if fxasignedin}}
-	<p class="btn-container"><a href="https://{{pockethost}}/ff_signup?s={{variant}}&t=wlm" target=_blank" class="btn signup-btn-firefox"><span class="logo"></span><span class="text">{{signinfirefox}}</span></a></p>
+	<p class="btn-container"><a href="https://{{pockethost}}/ff_signup?s=ffi&t=signupff&v={{variant}}" target="_blank" class="btn signup-btn-firefox"><span class="logo"></span><span class="text">{{signinfirefox}}</span></a></p>
 	{{else}}
-	<p class="btn-container"><a href="https://{{pockethost}}/ff_signup?s={{variant}}&t=wlm" target=_blank" class="btn signup-btn-firefox"><span class="logo"></span><span class="text">{{signupfirefox}}</span></a></p>
-	<p class="btn-container"><a href="http://{{pockethost}}/signup?force=email&src=extension&s={{variant}}&t=wlm" target="_blank" class="btn btn-secondary signup-btn-email signup-btn-initstate">{{signupemail}}</a></p>
+	<p class="btn-container"><a href="https://{{pockethost}}/ff_signup?s=ffi&t=signupff&v={{variant}}" target="_blank" class="btn signup-btn-firefox"><span class="logo"></span><span class="text">{{signupfirefox}}</span></a></p>
+	<p class="btn-container"><a href="https://{{pockethost}}/signup?force=email&src=extension&s=ffi&t=signupemail&v={{variant}}" target="_blank" class="btn btn-secondary signup-btn-email signup-btn-initstate">{{signupemail}}</a></p>
 	{{/if}}
-	<p class="alreadyhave">{{alreadyhaveacct}} <a href="http://{{pockethost}}/login?ep=3&src=extension&s={{variant}}&t=wlm" target="_blank">{{loginnow}}</a>.</p>
+	<p class="alreadyhave">{{alreadyhaveacct}} <a href="https://{{pockethost}}/login?ep=3&src=extension&s=ffi&t=login&v={{variant}}" target="_blank">{{loginnow}}</a>.</p>
 </div>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/pocket/pktApi.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/pocket/pktApi.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/pocket/pktApi.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/pocket/pktApi.js	2015-05-25 20:42:48.000000000 +0000
@@ -49,11 +49,8 @@
      */
 
     // Base url for all api calls
-    // TODO: This is a dev server and will be changed before launch
-    var pocketAPIhost = Services.prefs.getCharPref("browser.pocket.api");
-    var pocketSiteHost = Services.prefs.getCharPref("browser.pocket.site");
-
-    // Base url for all api calls
+    var pocketAPIhost = Services.prefs.getCharPref("browser.pocket.api"); 	// api.getpocket.com
+    var pocketSiteHost = Services.prefs.getCharPref("browser.pocket.site"); // getpocket.com
     var baseAPIUrl = "https://" + pocketAPIhost + "/v3";
 
 
@@ -86,6 +83,23 @@
         return out;
     }
 
+    var parseJSON = function(jsonString){
+        try {
+            var o = JSON.parse(jsonString);
+
+            // Handle non-exception-throwing cases:
+            // Neither JSON.parse(false) or JSON.parse(1234) throw errors, hence the type-checking,
+            // but... JSON.parse(null) returns 'null', and typeof null === "object", 
+            // so we must check for that, too.
+            if (o && typeof o === "object" && o !== null) {
+                return o;
+            }
+        }
+        catch (e) { }
+
+        return undefined;
+    };
+
     /**
      * Settings
      */
@@ -174,6 +188,29 @@
     }
 
     /**
+     * Get the current premium status of the user
+     * @return {number | undefined} Premium status of user
+     */
+    function getPremiumStatus() {
+        var premiumStatus = getSetting("premium_status");
+        if (typeof premiumStatus === "undefined") {
+            // Premium status is not in settings try get it from cookie
+            var pocketCookies = getCookiesFromPocket();
+            premiumStatus = pocketCookies['ps'];
+        }
+        return premiumStatus;
+    }
+
+    /**
+     * Helper method to check if a user is premium or not
+     * @return {Boolean} Boolean if user is premium or not
+     */
+    function isPremiumUser() {
+        return getPremiumStatus() == 1;
+    }
+
+
+    /**
      * Returns users logged in status
      * @return {Boolean} Users logged in status
      */
@@ -210,7 +247,9 @@
 
         var url = baseAPIUrl + options.path;
         var data = options.data || {};
-        data.locale_lang = window.navigator.language;
+        data.locale_lang = Cc["@mozilla.org/chrome/chrome-registry;1"].
+             getService(Ci.nsIXULChromeRegistry).
+             getSelectedLocale("browser");
         data.consumer_key = oAuthConsumerKey;
 
         var request = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"].createInstance(Components.interfaces.nsIXMLHttpRequest);
@@ -218,11 +257,16 @@
 		request.onreadystatechange = function(e){
 			if (request.readyState == 4) {
 				if (request.status === 200) {
-                    if (options.success) {
-                        options.success(JSON.parse(request.response), request);
+                    // There could still be an error if the response is no valid json
+                    // or does not have status = 1
+                    var response = parseJSON(request.response);
+                    if (options.success && response && response.status == 1) {
+                        options.success(response, request);
+                        return;
                     }
-                    return;
                 }
+
+                // Handle error case
                 if (options.error) {
                     // In case the user did revoke the access token or it's not
                     // valid anymore clear the user data
@@ -231,7 +275,11 @@
                     }
 
                     // Handle error message
-                    var errorMessage = request.getResponseHeader("X-Error") || request.statusText;
+                    var errorMessage;
+                    if (request.status !== 200) {
+                        errorMessage = request.getResponseHeader("X-Error") || request.statusText;
+                        errorMessage = JSON.parse('"' + errorMessage + '"');
+                    }
                     var error = {message: errorMessage};
                     options.error(error, request);
                 }
@@ -510,13 +558,6 @@
     }
 
     /**
-     * Helper method to check if a user is premium or not
-     */
-    function isPremiumUser() {
-        return getSetting('premium_status') == 1;
-    }
-
-    /**
      * Fetch suggested tags for a given item id
      * @param  {string} itemId Item id of
      * @param  {Object | undefined} options Can provide an actionInfo object
@@ -563,20 +604,21 @@
      * Helper function to get current signup AB group the user is in
      */
     function getSignupAB() {
-        if (!getSetting('signupAB'))
+    	var setting = getSetting('signupAB');
+        if (!setting || setting.contains('hero'))
         {
-            var rand = (Math.floor(Math.random()*2+1));
-            if (rand == 2)
+            var rand = (Math.floor(Math.random()*100+1));
+            if (rand > 90)
             {
-                setSetting('signupAB','storyboard');
+            	setting = 'storyboard_nlm';
             }
             else
             {
-                setSetting('signupAB','hero');
+            	setting = 'storyboard_lm';
             }
-
+            setSetting('signupAB',setting);
         }
-        return getSetting('signupAB');
+        return setting;
     }
 
     /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/pocket/Pocket.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/components/pocket/Pocket.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/pocket/Pocket.jsm	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/pocket/Pocket.jsm	2015-05-25 20:42:48.000000000 +0000
@@ -17,7 +17,7 @@
 
 let Pocket = {
   get site() Services.prefs.getCharPref("browser.pocket.site"),
-  get listURL() { return "https://" + Pocket.site; },
+  get listURL() { return "https://" + Pocket.site + "/?src=ff_ext"; },
 
   /**
    * Functions related to the Pocket panel UI.
@@ -25,16 +25,23 @@
   onPanelViewShowing(event) {
     let document = event.target.ownerDocument;
     let window = document.defaultView;
-    let iframe = document.getElementById('pocket-panel-iframe');
+    let iframe = window.pktUI.getPanelFrame();
 
+    let urlToSave = Pocket._urlToSave;
+    let titleToSave = Pocket._titleToSave;
+    Pocket._urlToSave = null;
+    Pocket._titleToSave = null;
     // ViewShowing fires immediately before it creates the contents,
     // in lieu of an AfterViewShowing event, just spin the event loop.
     window.setTimeout(function() {
-      window.pktUI.pocketButtonOnCommand();
+      if (urlToSave) {
+        window.pktUI.tryToSaveUrl(urlToSave, titleToSave);
+      } else {
+        window.pktUI.pocketButtonOnCommand();
+      }
 
       if (iframe.contentDocument &&
-          iframe.contentDocument.readyState == "complete")
-      {
+          iframe.contentDocument.readyState == "complete") {
         window.pktUI.pocketPanelDidShow();
       } else {
         // iframe didn't load yet. This seems to always be the case when in
@@ -48,9 +55,9 @@
   onFrameLoaded(event) {
     let document = event.currentTarget.ownerDocument;
     let window = document.defaultView;
-    let iframe = document.getElementById('pocket-panel-iframe');
+    let iframe = window.pktUI.getPanelFrame();
 
-    iframe.removeEventListener("load", Pocket.onPanelLoaded, true);
+    iframe.removeEventListener("load", Pocket.onFrameLoaded, true);
     window.pktUI.pocketPanelDidShow();
   },
 
@@ -59,27 +66,25 @@
     window.pktUI.pocketPanelDidHide(event);
   },
 
-  // Called on tab/urlbar/location changes and after customization. Update
-  // anything that is tab specific.
-  onLocationChange(browser, locationURI) {
-    if (!locationURI) {
+  _urlToSave: null,
+  _titleToSave: null,
+  savePage(browser, url, title) {
+    let document = browser.ownerDocument;
+    let pocketWidget = document.getElementById("pocket-button");
+    let placement = CustomizableUI.getPlacementOfWidget("pocket-button");
+    if (!placement)
       return;
-    }
-    let widget = CustomizableUI.getWidget("pocket-button");
-    for (let instance of widget.instances) {
-      let node = instance.node;
-      if (!node ||
-          node.ownerDocument != browser.ownerDocument) {
-        continue;
-      }
-      if (node) {
-        let win = browser.ownerDocument.defaultView;
-        node.disabled = win.pktApi.isUserLoggedIn() &&
-                        !locationURI.schemeIs("http") &&
-                        !locationURI.schemeIs("https") &&
-                        !(locationURI.schemeIs("about") &&
-                          locationURI.spec.toLowerCase().startsWith("about:reader?url="));
-      }
+
+    this._urlToSave = url;
+    this._titleToSave = title;
+    if (placement.area == CustomizableUI.AREA_PANEL) {
+      let win = document.defaultView;
+      win.PanelUI.show().then(function() {
+        pocketWidget = document.getElementById("pocket-button");
+        pocketWidget.doCommand();
+      });
+    } else {
+      pocketWidget.doCommand();
     }
   },
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/aboutPermissions.xul firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/aboutPermissions.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/aboutPermissions.xul	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/aboutPermissions.xul	2015-05-25 20:42:48.000000000 +0000
@@ -38,7 +38,7 @@
                    onselect="AboutPermissions.onSitesListSelect(event);">
         <richlistitem id="all-sites-item"
                       class="site"
-                      value="&sites.allSites;"/>                
+                      value="&sites.allSites;"/>
       </richlistbox>
     </vbox>
 
@@ -63,217 +63,220 @@
         </hbox>
       </deck>
 
-      <!-- Passwords -->
-      <hbox id="password-pref-item"
-            class="pref-item" align="top">
-        <image class="pref-icon" type="password"/>
-        <vbox>
-          <label class="pref-title" value="&password.label;"/>
-          <hbox align="center">
-            <menulist id="password-menulist"
-                      class="pref-menulist"
-                      type="password"
-                      oncommand="AboutPermissions.onPermissionCommand(event);">
-              <menupopup>
-                <menuitem id="password-1" value="1" label="&permission.allow;"/>
-                <menuitem id="password-2" value="2" label="&permission.block;"/>
-              </menupopup>
-            </menulist>
-            <button id="passwords-manage-all-button"
-                    label="&password.manage;"
-                    oncommand="AboutPermissions.managePasswords();"/>
-          </hbox>
-          <hbox id="passwords-count" align="center">
-            <label id="passwords-label"/>
-            <button id="passwords-manage-button"
-                    label="&password.manage;"
-                    oncommand="AboutPermissions.managePasswords();"/>
-          </hbox>
-        </vbox>
-      </hbox>
-
-      <!-- Geolocation -->
-      <hbox id="geo-pref-item"
-            class="pref-item" align="top">
-        <image class="pref-icon" type="geo"/>
-        <vbox>
-          <label class="pref-title" value="&geo.label;"/>
-          <hbox>
-            <menulist id="geo-menulist"
-                      class="pref-menulist"
-                      type="geo"
-                      oncommand="AboutPermissions.onPermissionCommand(event);">
-              <menupopup>
-                <menuitem id="geo-0" value="0" label="&permission.alwaysAsk;"/>
-                <menuitem id="geo-1" value="1" label="&permission.allow;"/>
-                <menuitem id="geo-2" value="2" label="&permission.block;"/>
-              </menupopup>
-            </menulist>
-          </hbox>
-        </vbox>
-      </hbox>
-
-      <!-- Camera -->
-      <hbox id="camera-pref-item"
-            class="pref-item" align="top">
-        <image class="pref-icon" type="camera"/>
-        <vbox>
-          <label class="pref-title" value="&camera.label;"/>
-          <hbox align="center">
-            <menulist id="camera-menulist"
-                      class="pref-menulist"
-                      type="camera"
-                      oncommand="AboutPermissions.onPermissionCommand(event);">
-              <menupopup>
-                <menuitem id="camera-0" value="0" label="&permission.alwaysAsk;"/>
-                <menuitem id="camera-1" value="1" label="&permission.allow;"/>
-                <menuitem id="camera-2" value="2" label="&permission.block;"/>
-              </menupopup>
-            </menulist>
-          </hbox>
-        </vbox>
-      </hbox>
-
-      <!-- Microphone -->
-      <hbox id="microphone-pref-item"
-            class="pref-item" align="top">
-        <image class="pref-icon" type="microphone"/>
-        <vbox>
-          <label class="pref-title" value="&microphone.label;"/>
-          <hbox align="center">
-            <menulist id="microphone-menulist"
-                      class="pref-menulist"
-                      type="microphone"
-                      oncommand="AboutPermissions.onPermissionCommand(event);">
-              <menupopup>
-                <menuitem id="microphone-0" value="0" label="&permission.alwaysAsk;"/>
-                <menuitem id="microphone-1" value="1" label="&permission.allow;"/>
-                <menuitem id="microphone-2" value="2" label="&permission.block;"/>
-              </menupopup>
-            </menulist>
-          </hbox>
-        </vbox>
-      </hbox>
-
-      <!-- Cookies -->
-      <hbox id="cookie-pref-item"
-            class="pref-item" align="top">
-        <image class="pref-icon" type="cookie"/>
-        <vbox>
-          <label class="pref-title" value="&cookie.label;"/>
-          <hbox align="center">
-            <menulist id="cookie-menulist"
-                      class="pref-menulist"
-                      type="cookie"
-                      oncommand="AboutPermissions.onPermissionCommand(event);">
-              <menupopup>
-                <menuitem id="cookie-1" value="1" label="&permission.allow;"/>
-                <menuitem id="cookie-8" value="8" label="&permission.allowForSession;"/>
-                <menuitem id="cookie-9" value="9" label="&permission.allowFirstPartyOnly;"/>
-                <menuitem id="cookie-2" value="2" label="&permission.block;"/>
-              </menupopup>
-            </menulist>
-            <button id="cookies-clear-all-button"
-                    label="&cookie.removeAll;"
-                    oncommand="Services.cookies.removeAll();"/>
-            <button id="cookies-manage-all-button"
-                    label="&cookie.manage;"
-                    oncommand="AboutPermissions.manageCookies();"/>
-          </hbox>
-          <hbox id="cookies-count" align="center">
-            <label id="cookies-label"/>
-            <button id="cookies-clear-button"
-                    label="&cookie.remove;"
-                    oncommand="AboutPermissions.clearCookies();"/>
-            <button id="cookies-manage-button"
-                    label="&cookie.manage;"
-                    oncommand="AboutPermissions.manageCookies();"/>
-          </hbox>
-        </vbox>
-      </hbox>
-
-      <!-- Pop-up Blocking -->
-      <hbox id="popup-pref-item"
-            class="pref-item" align="top">
-        <image class="pref-icon" type="popup"/>
-        <vbox>
-          <label class="pref-title" value="&popup.label;"/>
-          <hbox>
-            <menulist id="popup-menulist"
-                      class="pref-menulist"
-                      type="popup"
-                      oncommand="AboutPermissions.onPermissionCommand(event);">
-              <menupopup>
-                <menuitem id="popup-1" value="1" label="&permission.allow;"/>
-                <menuitem id="popup-2" value="2" label="&permission.block;"/>
-              </menupopup>
-            </menulist>
-          </hbox>
-        </vbox>
-      </hbox>
-
-      <!-- IndexedDB Storage -->  
-      <hbox id="indexedDB-pref-item"
-            class="pref-item" align="top">
-        <image class="pref-icon" type="indexedDB"/>
-        <vbox>
-          <label class="pref-title" value="&indexedDB.label;"/>
-          <hbox>
-            <menulist id="indexedDB-menulist"
-                      class="pref-menulist"
-                      type="indexedDB"
-                      oncommand="AboutPermissions.onPermissionCommand(event);">
-              <menupopup>
-                <menuitem id="indexedDB-0" value="0" label="&permission.alwaysAsk;"/>
-                <menuitem id="indexedDB-1" value="1" label="&permission.allow;"/>
-                <menuitem id="indexedDB-2" value="2" label="&permission.block;"/>
-              </menupopup>
-            </menulist>
-          </hbox>
-        </vbox>
-      </hbox>
-
-      <!-- Fullscreen -->
-      <hbox id="fullscreen-pref-item"
-            class="pref-item" align="top">
-        <image class="pref-icon" type="fullscreen"/>
-        <vbox>
-          <label class="pref-title" value="&fullscreen.label;"/>
-          <hbox align="center">
-            <menulist id="fullscreen-menulist"
-                      class="pref-menulist"
-                      type="fullscreen"
-                      oncommand="AboutPermissions.onPermissionCommand(event);">
-              <menupopup>
-                <menuitem id="fullscreen-0" value="0" label="&permission.alwaysAsk;"/>
-                <menuitem id="fullscreen-1" value="1" label="&permission.allow;"/>
-                <menuitem id="fullscreen-2" value="2" label="&permission.block;"/>
-              </menupopup>
-            </menulist>
-          </hbox>
-        </vbox>
-      </hbox>
-
-      <!-- Push Notifications -->
-      <hbox id="push-pref-item"
-            class="pref-item" align="top">
-        <image class="pref-icon" type="push"/>
-        <vbox>
-          <label class="pref-title" value="&push.label;"/>
-          <hbox align="center">
-            <menulist id="push-menulist"
-                      class="pref-menulist"
-                      type="push"
-                      oncommand="AboutPermissions.onPermissionCommand(event);">
-              <menupopup>
-                <menuitem id="push-0" value="0" label="&permission.alwaysAsk;"/>
-                <menuitem id="push-1" value="1" label="&permission.allow;"/>
-                <menuitem id="push-2" value="2" label="&permission.block;"/>
-              </menupopup>
-            </menulist>
-          </hbox>
-        </vbox>
-      </hbox>
+      <vbox id="permissions-list" flex="1">
+
+        <!-- Passwords -->
+        <hbox id="password-pref-item"
+              class="pref-item" align="top">
+          <image class="pref-icon" type="password"/>
+          <vbox>
+            <label class="pref-title" value="&password.label;"/>
+            <hbox align="center">
+              <menulist id="password-menulist"
+                        class="pref-menulist"
+                        type="password"
+                        oncommand="AboutPermissions.onPermissionCommand(event);">
+                <menupopup>
+                  <menuitem id="password-1" value="1" label="&permission.allow;"/>
+                  <menuitem id="password-2" value="2" label="&permission.block;"/>
+                </menupopup>
+              </menulist>
+              <button id="passwords-manage-all-button"
+                      label="&password.manage;"
+                      oncommand="AboutPermissions.managePasswords();"/>
+            </hbox>
+            <hbox id="passwords-count" align="center">
+              <label id="passwords-label"/>
+              <button id="passwords-manage-button"
+                      label="&password.manage;"
+                      oncommand="AboutPermissions.managePasswords();"/>
+            </hbox>
+          </vbox>
+        </hbox>
+
+        <!-- Geolocation -->
+        <hbox id="geo-pref-item"
+              class="pref-item" align="top">
+          <image class="pref-icon" type="geo"/>
+          <vbox>
+            <label class="pref-title" value="&geo.label;"/>
+            <hbox>
+              <menulist id="geo-menulist"
+                        class="pref-menulist"
+                        type="geo"
+                        oncommand="AboutPermissions.onPermissionCommand(event);">
+                <menupopup>
+                  <menuitem id="geo-0" value="0" label="&permission.alwaysAsk;"/>
+                  <menuitem id="geo-1" value="1" label="&permission.allow;"/>
+                  <menuitem id="geo-2" value="2" label="&permission.block;"/>
+                </menupopup>
+              </menulist>
+            </hbox>
+          </vbox>
+        </hbox>
+
+        <!-- Camera -->
+        <hbox id="camera-pref-item"
+              class="pref-item" align="top">
+          <image class="pref-icon" type="camera"/>
+          <vbox>
+            <label class="pref-title" value="&camera.label;"/>
+            <hbox align="center">
+              <menulist id="camera-menulist"
+                        class="pref-menulist"
+                        type="camera"
+                        oncommand="AboutPermissions.onPermissionCommand(event);">
+                <menupopup>
+                  <menuitem id="camera-0" value="0" label="&permission.alwaysAsk;"/>
+                  <menuitem id="camera-1" value="1" label="&permission.allow;"/>
+                  <menuitem id="camera-2" value="2" label="&permission.block;"/>
+                </menupopup>
+              </menulist>
+            </hbox>
+          </vbox>
+        </hbox>
+
+        <!-- Microphone -->
+        <hbox id="microphone-pref-item"
+              class="pref-item" align="top">
+          <image class="pref-icon" type="microphone"/>
+          <vbox>
+            <label class="pref-title" value="&microphone.label;"/>
+            <hbox align="center">
+              <menulist id="microphone-menulist"
+                        class="pref-menulist"
+                        type="microphone"
+                        oncommand="AboutPermissions.onPermissionCommand(event);">
+                <menupopup>
+                  <menuitem id="microphone-0" value="0" label="&permission.alwaysAsk;"/>
+                  <menuitem id="microphone-1" value="1" label="&permission.allow;"/>
+                  <menuitem id="microphone-2" value="2" label="&permission.block;"/>
+                </menupopup>
+              </menulist>
+            </hbox>
+          </vbox>
+        </hbox>
+
+        <!-- Cookies -->
+        <hbox id="cookie-pref-item"
+              class="pref-item" align="top">
+          <image class="pref-icon" type="cookie"/>
+          <vbox>
+            <label class="pref-title" value="&cookie.label;"/>
+            <hbox align="center">
+              <menulist id="cookie-menulist"
+                        class="pref-menulist"
+                        type="cookie"
+                        oncommand="AboutPermissions.onPermissionCommand(event);">
+                <menupopup>
+                  <menuitem id="cookie-1" value="1" label="&permission.allow;"/>
+                  <menuitem id="cookie-8" value="8" label="&permission.allowForSession;"/>
+                  <menuitem id="cookie-9" value="9" label="&permission.allowFirstPartyOnly;"/>
+                  <menuitem id="cookie-2" value="2" label="&permission.block;"/>
+                </menupopup>
+              </menulist>
+              <button id="cookies-clear-all-button"
+                      label="&cookie.removeAll;"
+                      oncommand="Services.cookies.removeAll();"/>
+              <button id="cookies-manage-all-button"
+                      label="&cookie.manage;"
+                      oncommand="AboutPermissions.manageCookies();"/>
+            </hbox>
+            <hbox id="cookies-count" align="center">
+              <label id="cookies-label"/>
+              <button id="cookies-clear-button"
+                      label="&cookie.remove;"
+                      oncommand="AboutPermissions.clearCookies();"/>
+              <button id="cookies-manage-button"
+                      label="&cookie.manage;"
+                      oncommand="AboutPermissions.manageCookies();"/>
+            </hbox>
+          </vbox>
+        </hbox>
+
+        <!-- Pop-up Blocking -->
+        <hbox id="popup-pref-item"
+              class="pref-item" align="top">
+          <image class="pref-icon" type="popup"/>
+          <vbox>
+            <label class="pref-title" value="&popup.label;"/>
+            <hbox>
+              <menulist id="popup-menulist"
+                        class="pref-menulist"
+                        type="popup"
+                        oncommand="AboutPermissions.onPermissionCommand(event);">
+                <menupopup>
+                  <menuitem id="popup-1" value="1" label="&permission.allow;"/>
+                  <menuitem id="popup-2" value="2" label="&permission.block;"/>
+                </menupopup>
+              </menulist>
+            </hbox>
+          </vbox>
+        </hbox>
+
+        <!-- IndexedDB Storage -->
+        <hbox id="indexedDB-pref-item"
+              class="pref-item" align="top">
+          <image class="pref-icon" type="indexedDB"/>
+          <vbox>
+            <label class="pref-title" value="&indexedDB.label;"/>
+            <hbox>
+              <menulist id="indexedDB-menulist"
+                        class="pref-menulist"
+                        type="indexedDB"
+                        oncommand="AboutPermissions.onPermissionCommand(event);">
+                <menupopup>
+                  <menuitem id="indexedDB-0" value="0" label="&permission.alwaysAsk;"/>
+                  <menuitem id="indexedDB-1" value="1" label="&permission.allow;"/>
+                  <menuitem id="indexedDB-2" value="2" label="&permission.block;"/>
+                </menupopup>
+              </menulist>
+            </hbox>
+          </vbox>
+        </hbox>
+
+        <!-- Fullscreen -->
+        <hbox id="fullscreen-pref-item"
+              class="pref-item" align="top">
+          <image class="pref-icon" type="fullscreen"/>
+          <vbox>
+            <label class="pref-title" value="&fullscreen.label;"/>
+            <hbox align="center">
+              <menulist id="fullscreen-menulist"
+                        class="pref-menulist"
+                        type="fullscreen"
+                        oncommand="AboutPermissions.onPermissionCommand(event);">
+                <menupopup>
+                  <menuitem id="fullscreen-0" value="0" label="&permission.alwaysAsk;"/>
+                  <menuitem id="fullscreen-1" value="1" label="&permission.allow;"/>
+                  <menuitem id="fullscreen-2" value="2" label="&permission.block;"/>
+                </menupopup>
+              </menulist>
+            </hbox>
+          </vbox>
+        </hbox>
+
+        <!-- Push Notifications -->
+        <hbox id="push-pref-item"
+              class="pref-item" align="top">
+          <image class="pref-icon" type="push"/>
+          <vbox>
+            <label class="pref-title" value="&push.label;"/>
+            <hbox align="center">
+              <menulist id="push-menulist"
+                        class="pref-menulist"
+                        type="push"
+                        oncommand="AboutPermissions.onPermissionCommand(event);">
+                <menupopup>
+                  <menuitem id="push-0" value="0" label="&permission.alwaysAsk;"/>
+                  <menuitem id="push-1" value="1" label="&permission.allow;"/>
+                  <menuitem id="push-2" value="2" label="&permission.block;"/>
+                </menupopup>
+              </menulist>
+            </hbox>
+          </vbox>
+        </hbox>
+      </vbox>
     </vbox>
   </hbox>
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/advanced.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/advanced.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/advanced.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/advanced.js	2015-05-25 20:42:48.000000000 +0000
@@ -48,6 +48,7 @@
     this.initSubmitHealthReport();
 #endif
 
+    this.updateCacheSizeInputField();
     this.updateActualCacheSize();
     this.updateActualAppCacheSize();
 
@@ -378,24 +379,31 @@
   },
 
   /**
-   * Converts the cache size from units of KB to units of MB and returns that
-   * value.
+   * Converts the cache size from units of KB to units of MB and stores it in
+   * the textbox element.
    */
-  readCacheSize: function ()
+  updateCacheSizeInputField()
   {
-    var preference = document.getElementById("browser.cache.disk.capacity");
-    return preference.value / 1024;
+    let cacheSizeElem = document.getElementById("cacheSize");
+    let cachePref = document.getElementById("browser.cache.disk.capacity");
+    cacheSizeElem.value = cachePref.value / 1024;
+    if (cachePref.locked)
+      cacheSizeElem.disabled = true;
   },
 
   /**
-   * Converts the cache size as specified in UI (in MB) to KB and returns that
-   * value.
+   * Updates the cache size preference once user enters a new value.
+   * We intentionally do not set preference="browser.cache.disk.capacity"
+   * onto the textbox directly, as that would update the pref at each keypress
+   * not only after the final value is entered.
    */
-  writeCacheSize: function ()
+  updateCacheSizePref()
   {
-    var cacheSize = document.getElementById("cacheSize");
-    var intValue = parseInt(cacheSize.value, 10);
-    return isNaN(intValue) ? 0 : intValue * 1024;
+    let cacheSizeElem = document.getElementById("cacheSize");
+    let cachePref = document.getElementById("browser.cache.disk.capacity");
+    // Converts the cache size as specified in UI (in MB) to KB.
+    let intValue = parseInt(cacheSizeElem.value, 10);
+    cachePref.value = isNaN(intValue) ? 0 : intValue * 1024;
   },
 
   /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/advanced.xul firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/advanced.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/advanced.xul	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/advanced.xul	2015-05-25 20:42:48.000000000 +0000
@@ -250,9 +250,7 @@
                      accesskey="&limitCacheSizeBefore.accesskey;"
                      value="&limitCacheSizeBefore.label;"/>
               <textbox id="cacheSize" type="number" size="4" max="1024"
-                       preference="browser.cache.disk.capacity"
-                       onsyncfrompreference="return gAdvancedPane.readCacheSize();"
-                       onsynctopreference="return gAdvancedPane.writeCacheSize();"
+                       onchange="gAdvancedPane.updateCacheSizePref();"
                        aria-labelledby="useCacheBefore cacheSize useCacheAfter"/>
               <label id="useCacheAfter" flex="1">&limitCacheSizeAfter.label;</label>
             </hbox>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/content.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/content.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/content.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/content.js	2015-05-25 20:42:48.000000000 +0000
@@ -10,8 +10,7 @@
     this._rebuildFonts();
     var menulist = document.getElementById("defaultFont");
     if (menulist.selectedIndex == -1) {
-      menulist.insertItemAt(0, "", "", "");
-      menulist.selectedIndex = 0;
+      menulist.value = FontBuilder.readFontSelection(menulist);
     }
 
     // Show translation preferences if we may:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/fonts.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/fonts.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/fonts.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/fonts.js	2015-05-25 20:42:48.000000000 +0000
@@ -63,41 +63,6 @@
     return undefined;
   },
   
-  readFontSelection: function (aElement)
-  {
-    // Determine the appropriate value to select, for the following cases:
-    // - there is no setting 
-    // - the font selected by the user is no longer present (e.g. deleted from
-    //   fonts folder)
-    var preference = document.getElementById(aElement.getAttribute("preference"));
-    if (preference.value) {
-      var fontItems = aElement.getElementsByAttribute("value", preference.value);
-    
-      // There is a setting that actually is in the list. Respect it.
-      if (fontItems.length > 0)
-        return undefined;
-    }
-    
-    var defaultValue = aElement.firstChild.firstChild.getAttribute("value");
-    var languagePref = document.getElementById("font.language.group");
-    preference = document.getElementById("font.name-list." + aElement.id + "." + languagePref.value);
-    if (!preference || !preference.hasUserValue)
-      return defaultValue;
-    
-    var fontNames = preference.value.split(",");
-    var stripWhitespace = /^\s*(.*)\s*$/;
-    
-    for (var i = 0; i < fontNames.length; ++i) {
-      var fontName = fontNames[i].replace(stripWhitespace, "$1");
-      fontItems = aElement.getElementsByAttribute("value", fontName);
-      if (fontItems.length)
-        break;
-    }
-    if (fontItems.length)
-      return fontItems[0].getAttribute("value");
-    return defaultValue;
-  },
-  
   readUseDocumentFonts: function ()
   {
     var preference = document.getElementById("browser.display.use_document_fonts");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/fonts.xul firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/fonts.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/fonts.xul	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/fonts.xul	2015-05-25 20:42:48.000000000 +0000
@@ -107,7 +107,7 @@
                      accesskey="&sizeProportional.accesskey;"
                      control="sizeVar"/>
             </hbox>  
-            <menulist id="sizeVar">
+            <menulist id="sizeVar" delayprefsave="true">
               <menupopup>
                 <menuitem value="9" label="9"/>
                 <menuitem value="10" label="10"/>
@@ -141,30 +141,30 @@
             <hbox align="center" pack="end">
               <label accesskey="&serif.accesskey;" control="serif">&serif.label;</label>
             </hbox>
-            <menulist id="serif" flex="1" style="width: 0px;"
-                      onsyncfrompreference="return gFontsDialog.readFontSelection(document.getElementById('serif'));"/>
+            <menulist id="serif" flex="1" style="width: 0px;" delayprefsave="true"
+                      onsyncfrompreference="return FontBuilder.readFontSelection(this);"/>
             <spacer/>
           </row>
           <row align="center">
             <hbox align="center" pack="end">
               <label accesskey="&sans-serif.accesskey;" control="sans-serif">&sans-serif.label;</label>
             </hbox>
-            <menulist id="sans-serif" flex="1" style="width: 0px;"
-                      onsyncfrompreference="return gFontsDialog.readFontSelection(document.getElementById('sans-serif'));"/>
+            <menulist id="sans-serif" flex="1" style="width: 0px;" delayprefsave="true"
+                      onsyncfrompreference="return FontBuilder.readFontSelection(this);"/>
             <spacer/>
           </row>
           <row align="center">
             <hbox align="center" pack="end">
               <label accesskey="&monospace.accesskey;" control="monospace">&monospace.label;</label>
             </hbox>
-            <menulist id="monospace" flex="1" style="width: 0px;" crop="right"
-                      onsyncfrompreference="return gFontsDialog.readFontSelection(document.getElementById('monospace'));"/>
+            <menulist id="monospace" flex="1" style="width: 0px;" crop="right" delayprefsave="true"
+                      onsyncfrompreference="return FontBuilder.readFontSelection(this);"/>
             <hbox align="center" pack="end">
               <label value="&size.label;"
                      accesskey="&sizeMonospace.accesskey;"
                      control="sizeMono"/>
             </hbox>  
-            <menulist id="sizeMono">
+            <menulist id="sizeMono" delayprefsave="true">
               <menupopup>
                 <menuitem value="9" label="9"/>
                 <menuitem value="10" label="10"/>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/in-content/advanced.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/in-content/advanced.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/in-content/advanced.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/in-content/advanced.js	2015-05-25 20:42:48.000000000 +0000
@@ -45,6 +45,7 @@
 #ifdef MOZ_SERVICES_HEALTHREPORT
     this.initSubmitHealthReport();
 #endif
+    this.updateCacheSizeInputField();
     this.updateActualCacheSize();
     this.updateActualAppCacheSize();
 
@@ -413,24 +414,31 @@
   },
 
   /**
-   * Converts the cache size from units of KB to units of MB and returns that
-   * value.
+   * Converts the cache size from units of KB to units of MB and stores it in
+   * the textbox element.
    */
-  readCacheSize: function ()
+  updateCacheSizeInputField()
   {
-    var preference = document.getElementById("browser.cache.disk.capacity");
-    return preference.value / 1024;
+    let cacheSizeElem = document.getElementById("cacheSize");
+    let cachePref = document.getElementById("browser.cache.disk.capacity");
+    cacheSizeElem.value = cachePref.value / 1024;
+    if (cachePref.locked)
+      cacheSizeElem.disabled = true;
   },
 
   /**
-   * Converts the cache size as specified in UI (in MB) to KB and returns that
-   * value.
+   * Updates the cache size preference once user enters a new value.
+   * We intentionally do not set preference="browser.cache.disk.capacity"
+   * onto the textbox directly, as that would update the pref at each keypress
+   * not only after the final value is entered.
    */
-  writeCacheSize: function ()
+  updateCacheSizePref()
   {
-    var cacheSize = document.getElementById("cacheSize");
-    var intValue = parseInt(cacheSize.value, 10);
-    return isNaN(intValue) ? 0 : intValue * 1024;
+    let cacheSizeElem = document.getElementById("cacheSize");
+    let cachePref = document.getElementById("browser.cache.disk.capacity");
+    // Converts the cache size as specified in UI (in MB) to KB.
+    let intValue = parseInt(cacheSizeElem.value, 10);
+    cachePref.value = isNaN(intValue) ? 0 : intValue * 1024;
   },
 
   /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/in-content/advanced.xul firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/in-content/advanced.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/in-content/advanced.xul	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/in-content/advanced.xul	2015-05-25 20:42:48.000000000 +0000
@@ -271,10 +271,8 @@
             &limitCacheSizeBefore.label;
           </label>
           <textbox id="cacheSize" type="number" size="4" max="1024"
-                  preference="browser.cache.disk.capacity"
-                  onsyncfrompreference="return gAdvancedPane.readCacheSize();"
-                  onsynctopreference="return gAdvancedPane.writeCacheSize();"
-                  aria-labelledby="useCacheBefore cacheSize useCacheAfter"/>
+                   onchange="gAdvancedPane.updateCacheSizePref();"
+                   aria-labelledby="useCacheBefore cacheSize useCacheAfter"/>
           <label id="useCacheAfter" flex="1">&limitCacheSizeAfter.label;</label>
         </hbox>
       </groupbox>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/in-content/content.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/in-content/content.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/in-content/content.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/in-content/content.js	2015-05-25 20:42:48.000000000 +0000
@@ -15,8 +15,7 @@
     this._rebuildFonts();
     var menulist = document.getElementById("defaultFont");
     if (menulist.selectedIndex == -1) {
-      menulist.insertItemAt(0, "", "", "");
-      menulist.selectedIndex = 0;
+      menulist.value = FontBuilder.readFontSelection(menulist);
     }
 
     // Show translation preferences if we may:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/in-content/content.xul firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/in-content/content.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/in-content/content.xul	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/in-content/content.xul	2015-05-25 20:42:48.000000000 +0000
@@ -97,9 +97,9 @@
       <row id="fontRow">
         <hbox align="center">
           <label control="defaultFont" accesskey="&defaultFont.accesskey;">&defaultFont.label;</label>
-          <menulist id="defaultFont" />
+          <menulist id="defaultFont" delayprefsave="true"/>
           <label id="defaultFontSizeLabel" control="defaultFontSize" accesskey="&defaultSize.accesskey;">&defaultSize.label;</label>
-          <menulist id="defaultFontSize">
+          <menulist id="defaultFontSize" delayprefsave="true">
             <menupopup>
               <menuitem value="9" label="9"/>
               <menuitem value="10" label="10"/>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/in-content/main.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/in-content/main.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/in-content/main.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/in-content/main.js	2015-05-25 20:42:48.000000000 +0000
@@ -444,7 +444,10 @@
    * downloads are automatically saved, updating preferences and UI in
    * response to the choice, if one is made.
    */
-  chooseFolder() this.chooseFolderTask().catch(Components.utils.reportError),
+  chooseFolder()
+  {
+    return this.chooseFolderTask().catch(Components.utils.reportError);
+  },
   chooseFolderTask: Task.async(function* ()
   {
     let bundlePreferences = document.getElementById("bundlePreferences");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/in-content/sync.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/in-content/sync.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/in-content/sync.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/in-content/sync.js	2015-05-25 20:42:48.000000000 +0000
@@ -570,7 +570,7 @@
   },
 
   openChangeProfileImage: function() {
-    fxAccounts.promiseAccountsChangeProfileURI("avatar")
+    fxAccounts.promiseAccountsChangeProfileURI("preferences", "avatar")
       .then(url => {
         this.openContentInBrowser(url, {
           replaceQueryString: true
@@ -579,7 +579,7 @@
   },
 
   manageFirefoxAccount: function() {
-    fxAccounts.promiseAccountsManageURI()
+    fxAccounts.promiseAccountsManageURI("preferences")
       .then(url => {
         this.openContentInBrowser(url, {
           replaceQueryString: true
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/in-content/tests/browser_subdialogs.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/in-content/tests/browser_subdialogs.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/in-content/tests/browser_subdialogs.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/in-content/tests/browser_subdialogs.js	2015-05-25 20:42:48.000000000 +0000
@@ -38,27 +38,27 @@
     let dialog = yield dialogPromise;
 
     // Check focus is in the textbox
-    ise(dialog.document.activeElement.value, "Default text", "Textbox with correct text is focused");
+    is(dialog.document.activeElement.value, "Default text", "Textbox with correct text is focused");
 
     // Titlebar
-    ise(content.document.getElementById("dialogTitle").textContent, "Sample sub-dialog",
-       "Dialog title should be correct initially");
+    is(content.document.getElementById("dialogTitle").textContent, "Sample sub-dialog",
+      "Dialog title should be correct initially");
     let receivedEvent = waitForEvent(gBrowser.selectedBrowser, "DOMTitleChanged");
     dialog.document.title = "Updated title";
     // Wait for the title change listener
     yield receivedEvent;
-    ise(content.document.getElementById("dialogTitle").textContent, "Updated title",
-       "Dialog title should be updated with changes");
+    is(content.document.getElementById("dialogTitle").textContent, "Updated title",
+      "Dialog title should be updated with changes");
 
     let closingPromise = promiseDialogClosing(dialog);
 
     // Accept the dialog
     dialog.document.documentElement.acceptDialog();
     let closingEvent = yield closingPromise;
-    ise(closingEvent.detail.button, "accept", "closing event should indicate button was 'accept'");
+    is(closingEvent.detail.button, "accept", "closing event should indicate button was 'accept'");
 
     yield deferredClose.promise;
-    ise(rv.acceptCount, 1, "return value should have been updated");
+    is(rv.acceptCount, 1, "return value should have been updated");
   },
 },
 {
@@ -76,10 +76,10 @@
     dialog.document.documentElement.cancelDialog();
 
     let closingEvent = yield closingPromise;
-    ise(closingEvent.detail.button, "cancel", "closing event should indicate button was 'cancel'");
+    is(closingEvent.detail.button, "cancel", "closing event should indicate button was 'cancel'");
 
     yield deferredClose.promise;
-    ise(rv.acceptCount, 0, "return value should NOT have been updated");
+    is(rv.acceptCount, 0, "return value should NOT have been updated");
   },
 },
 {
@@ -96,10 +96,10 @@
     dialog.window.close();
 
     let closingEvent = yield closingPromise;
-    ise(closingEvent.detail.button, null, "closing event should indicate no button was clicked");
+    is(closingEvent.detail.button, null, "closing event should indicate no button was clicked");
 
     yield deferredClose.promise;
-    ise(rv.acceptCount, 0, "return value should NOT have been updated");
+    is(rv.acceptCount, 0, "return value should NOT have been updated");
   },
 },
 {
@@ -115,7 +115,7 @@
                                              content.window);
 
     yield deferredClose.promise;
-    ise(rv.acceptCount, 0, "return value should NOT have been updated");
+    is(rv.acceptCount, 0, "return value should NOT have been updated");
   },
 },
 {
@@ -131,7 +131,7 @@
     content.gSubDialog._frame.goBack();
 
     yield deferredClose.promise;
-    ise(rv.acceptCount, 0, "return value should NOT have been updated");
+    is(rv.acceptCount, 0, "return value should NOT have been updated");
   },
 },
 {
@@ -146,7 +146,7 @@
     EventUtils.synthesizeKey("VK_ESCAPE", {}, content.window);
 
     yield deferredClose.promise;
-    ise(rv.acceptCount, 0, "return value should NOT have been updated");
+    is(rv.acceptCount, 0, "return value should NOT have been updated");
   },
 },
 {
@@ -157,8 +157,8 @@
                                              (aEvent) => dialogClosingCallback(deferredClose, aEvent));
     let dialog = yield dialogPromise;
 
-    ise(content.gSubDialog._frame.style.width, "32em", "Width should be set on the frame from the dialog");
-    ise(content.gSubDialog._frame.style.height, "5em", "Height should be set on the frame from the dialog");
+    is(content.gSubDialog._frame.style.width, "32em", "Width should be set on the frame from the dialog");
+    is(content.gSubDialog._frame.style.height, "5em", "Height should be set on the frame from the dialog");
 
     content.gSubDialog.close();
     yield deferredClose.promise;
@@ -194,10 +194,10 @@
 
     let dialog = yield dialogPromise;
 
-    ise(content.gSubDialog._frame.style.width, "32em", "Width should be set on the frame from the dialog");
+    is(content.gSubDialog._frame.style.width, "32em", "Width should be set on the frame from the dialog");
     let docEl = content.gSubDialog._frame.contentDocument.documentElement;
     ok(docEl.scrollHeight > oldHeight, "Content height increased (from " + oldHeight + " to " + docEl.scrollHeight + ").");
-    ise(content.gSubDialog._frame.style.height, docEl.scrollHeight + "px", "Height on the frame should be higher now");
+    is(content.gSubDialog._frame.style.height, docEl.scrollHeight + "px", "Height on the frame should be higher now");
 
     content.gSubDialog.close();
     yield deferredClose.promise;
@@ -217,7 +217,7 @@
 
     let dialog = yield dialogPromise;
 
-    ise(content.gSubDialog._frame.style.width, "32em", "Width should be set on the frame from the dialog");
+    is(content.gSubDialog._frame.style.width, "32em", "Width should be set on the frame from the dialog");
     let newHeight = content.gSubDialog._frame.contentDocument.documentElement.scrollHeight;
     ok(parseInt(content.gSubDialog._frame.style.height) < window.innerHeight,
        "Height on the frame should be smaller than window's innerHeight");
@@ -261,10 +261,10 @@
   waitForEvent(content.gSubDialog._frame, "load", 4000).then((aEvt) => {
     info("Load event happened: " + !(aEvt instanceof Error));
     is_element_hidden(content.gSubDialog._overlay, "Overlay is not visible");
-    ise(content.gSubDialog._frame.getAttribute("style"), "",
-        "Check that inline styles were cleared");
-    ise(content.gSubDialog._frame.contentWindow.location.toString(), "about:blank",
-       "Check the sub-dialog was unloaded");
+    is(content.gSubDialog._frame.getAttribute("style"), "",
+       "Check that inline styles were cleared");
+    is(content.gSubDialog._frame.contentWindow.location.toString(), "about:blank",
+      "Check the sub-dialog was unloaded");
     if (gTeardownAfterClose) {
       content.close();
       finish();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/in-content/tests/head.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/in-content/tests/head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/in-content/tests/head.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/in-content/tests/head.js	2015-05-25 20:42:48.000000000 +0000
@@ -51,8 +51,8 @@
         return;
       content.gSubDialog._frame.removeEventListener("load", load);
 
-      ise(content.gSubDialog._frame.contentWindow.location.toString(), aURL,
-          "Check the proper URL is loaded");
+      is(content.gSubDialog._frame.contentWindow.location.toString(), aURL,
+         "Check the proper URL is loaded");
 
       // Check visibility
       is_element_visible(content.gSubDialog._overlay, "Overlay is visible");
@@ -66,7 +66,7 @@
           expectedStyleSheetURLs.splice(i, 1);
         }
       }
-      ise(expectedStyleSheetURLs.length, 0, "All expectedStyleSheetURLs should have been found");
+      is(expectedStyleSheetURLs.length, 0, "All expectedStyleSheetURLs should have been found");
 
       resolve(content.gSubDialog._frame.contentWindow);
     });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/main.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/main.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/preferences/main.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/preferences/main.js	2015-05-25 20:42:48.000000000 +0000
@@ -308,7 +308,10 @@
    * downloads are automatically saved, updating preferences and UI in
    * response to the choice, if one is made.
    */
-  chooseFolder() this.chooseFolderTask().catch(Components.utils.reportError),
+  chooseFolder()
+  {
+    return this.chooseFolderTask().catch(Components.utils.reportError);
+  },
   chooseFolderTask: Task.async(function* ()
   {
     let bundlePreferences = document.getElementById("bundlePreferences");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/privatebrowsing/test/browser/browser.ini firefox-trunk-41.0~a1~hg20150524r245419/browser/components/privatebrowsing/test/browser/browser.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/privatebrowsing/test/browser/browser.ini	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/privatebrowsing/test/browser/browser.ini	2015-05-25 20:42:48.000000000 +0000
@@ -17,9 +17,6 @@
 
 [browser_privatebrowsing_DownloadLastDirWithCPS.js]
 [browser_privatebrowsing_aboutHomeButtonAfterWindowClose.js]
-skip-if = true # Bug 1142678 - Loading a message sending frame script into a private about:home tab causes leaks
-[browser_privatebrowsing_aboutHomeButtonAfterWindowClose_old.js]
-skip-if = e10s
 [browser_privatebrowsing_aboutSessionRestore.js]
 [browser_privatebrowsing_cache.js]
 [browser_privatebrowsing_certexceptionsui.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_aboutHomeButtonAfterWindowClose_old.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_aboutHomeButtonAfterWindowClose_old.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_aboutHomeButtonAfterWindowClose_old.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_aboutHomeButtonAfterWindowClose_old.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-// This test checks that the Session Restore about:home button
-// is disabled in private mode
-
-function test() {
-  waitForExplicitFinish();
-
-  function testNoSessionRestoreButton() {
-    let win = OpenBrowserWindow({private: true});
-    win.addEventListener("load", function onLoad() {
-      win.removeEventListener("load", onLoad, false);
-      executeSoon(function() {
-        info("The second private window got loaded");
-        let newTab = win.gBrowser.addTab();
-        win.gBrowser.selectedTab = newTab;
-        let tabBrowser = win.gBrowser.getBrowserForTab(newTab);
-        tabBrowser.addEventListener("load", function tabLoadListener() {
-          if (win.content.location != "about:home") {
-            win.content.location = "about:home";
-            return;
-          }
-          tabBrowser.removeEventListener("load", tabLoadListener, true);
-          executeSoon(function() {
-            info("about:home got loaded");
-            let sessionRestoreButton = win.gBrowser
-                                          .contentDocument
-                                          .getElementById("restorePreviousSession");
-            is(win.getComputedStyle(sessionRestoreButton).display, 
-               "none", "The Session Restore about:home button should be disabled");
-            win.close();
-            finish();
-          });
-        }, true);
-      });
-    }, false);
-  }
-
-  let win = OpenBrowserWindow({private: true});
-  win.addEventListener("load", function onload() {
-    win.removeEventListener("load", onload, false);
-    executeSoon(function() {
-      info("The first private window got loaded");
-      win.close();
-      testNoSessionRestoreButton();
-    });
-  }, false);
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/readinglist/Scheduler.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/components/readinglist/Scheduler.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/readinglist/Scheduler.jsm	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/readinglist/Scheduler.jsm	2015-05-25 20:42:48.000000000 +0000
@@ -293,7 +293,11 @@
       // the last success.
       prefs.set("lastSync", new Date().toString());
       this.state = this.STATE_OK;
-      this._logManager.resetFileLog(this._logManager.REASON_SUCCESS);
+      this._logManager.resetFileLog().then(result => {
+        if (result == this._logManager.ERROR_LOG_WRITTEN) {
+          Cu.reportError("Reading List sync encountered an error - see about:sync-log for the log file.");
+        }
+      });
       Services.obs.notifyObservers(null, "readinglist:sync:finish", null);
       this._currentErrorBackoff = 0; // error retry interval is reset on success.
       return intervals.schedule;
@@ -307,7 +311,11 @@
         this._currentErrorBackoff = 0; // error retry interval is reset on success.
         this.log.info("Can't sync due to FxA account state " + err.message);
         this.state = this.STATE_OK;
-        this._logManager.resetFileLog(this._logManager.REASON_SUCCESS);
+        this._logManager.resetFileLog().then(result => {
+          if (result == this._logManager.ERROR_LOG_WRITTEN) {
+            Cu.reportError("Reading List sync encountered an error - see about:sync-log for the log file.");
+          }
+        });
         Services.obs.notifyObservers(null, "readinglist:sync:finish", null);
         // it's unfortunate that we are probably going to hit this every
         // 2 hours, but it should be invisible to the user.
@@ -317,7 +325,7 @@
                    this.STATE_ERROR_AUTHENTICATION : this.STATE_ERROR_OTHER;
       this.log.error("Sync failed, now in state '${state}': ${err}",
                      {state: this.state, err});
-      this._logManager.resetFileLog(this._logManager.REASON_ERROR);
+      this._logManager.resetFileLog();
       Services.obs.notifyObservers(null, "readinglist:sync:error", null);
       // We back-off on error retries until it hits our normally scheduled interval.
       this._currentErrorBackoff = this._currentErrorBackoff == 0 ? intervals.retry :
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/content/content-sessionStore.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/content/content-sessionStore.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/content/content-sessionStore.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/content/content-sessionStore.js	2015-05-25 20:42:49.000000000 +0000
@@ -106,6 +106,7 @@
     "SessionStore:restoreHistory",
     "SessionStore:restoreTabContent",
     "SessionStore:resetRestore",
+    "SessionStore:flush",
   ],
 
   init: function () {
@@ -137,6 +138,9 @@
       case "SessionStore:resetRestore":
         gContentRestore.resetRestore();
         break;
+      case "SessionStore:flush":
+        this.flush(data);
+        break;
       default:
         debug("received unknown message '" + name + "'");
         break;
@@ -192,6 +196,11 @@
       // Pretend that the load succeeded so that event handlers fire correctly.
       sendAsyncMessage("SessionStore:restoreTabContentComplete", {epoch});
     }
+  },
+
+  flush({id}) {
+    // Flush the message queue, send the latest updates.
+    MessageQueue.send({flushID: id});
   }
 };
 
@@ -651,6 +660,8 @@
    * @param options (object)
    *        {id: 123} to override the update ID used to accumulate data to send.
    *        {sync: true} to send data to the parent process synchronously.
+   *        {flushID: 123} to specify that this is a flush
+   *        {isFinal: true} to signal this is the final message sent on unload
    */
   send: function (options = {}) {
     // Looks like we have been called off a timeout after the tab has been
@@ -667,6 +678,7 @@
 
     let sync = options && options.sync;
     let startID = (options && options.id) || this._id;
+    let flushID = (options && options.flushID) || 0;
 
     // We use sendRpcMessage in the sync case because we may have been called
     // through a CPOW. RPC messages are the only synchronous messages that the
@@ -702,7 +714,7 @@
 
     // Send all data to the parent process.
     sendMessage("SessionStore:update", {
-      id: this._id, data, telemetry,
+      id: this._id, data, telemetry, flushID,
       isFinal: options.isFinal || false,
       epoch: gCurrentEpoch
     });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/moz.build firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/moz.build	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/moz.build	2015-05-25 20:42:49.000000000 +0000
@@ -44,6 +44,7 @@
     'TabAttributes.jsm',
     'TabState.jsm',
     'TabStateCache.jsm',
+    'TabStateFlusher.jsm',
     'Utils.jsm',
 ]
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/SessionStorage.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/SessionStorage.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/SessionStorage.jsm	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/SessionStorage.jsm	2015-05-25 20:42:49.000000000 +0000
@@ -74,7 +74,7 @@
 
       // Get the root domain of the current history entry
       // and use that as a key for the per-host storage data.
-      let origin = principal.jarPrefix + principal.origin;
+      let origin = principal.jarPrefix + principal.originNoSuffix;
       if (visitedOrigins.has(origin)) {
         // Don't read a host twice.
         return;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/SessionStore.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/SessionStore.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/SessionStore.jsm	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/SessionStore.jsm	2015-05-25 20:42:49.000000000 +0000
@@ -158,6 +158,8 @@
   "resource:///modules/sessionstore/TabState.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "TabStateCache",
   "resource:///modules/sessionstore/TabStateCache.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "TabStateFlusher",
+  "resource:///modules/sessionstore/TabStateFlusher.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Utils",
   "resource:///modules/sessionstore/Utils.jsm");
 
@@ -653,6 +655,19 @@
         TabState.update(browser, aMessage.data);
         this.saveStateDelayed(win);
 
+        if (aMessage.data.isFinal) {
+          // If this the final message we need to resolve all pending flush
+          // requests for the given browser as they might have been sent too
+          // late and will never respond. If they have been sent shortly after
+          // switching a browser's remoteness there isn't too much data to skip.
+          TabStateFlusher.resolveAll(browser);
+        } else if (aMessage.data.flushID) {
+          // This is an update kicked off by an async flush request. Notify the
+          // TabStateFlusher so that it can finish the request and notify its
+          // consumer that's waiting for the flush to be done.
+          TabStateFlusher.resolve(browser, aMessage.data.flushID);
+        }
+
         // Handle any updates sent by the child after the tab was closed. This
         // might be the final update as sent by the "unload" handler but also
         // any async update message that was sent before the child unloaded.
@@ -661,7 +676,7 @@
 
           // Update the closed tab's state. This will be reflected in its
           // window's list of closed tabs as that refers to the same object.
-          TabState.copyFromCache({linkedBrowser: browser}, tabData.state);
+          TabState.copyFromCache(browser, tabData.state);
 
           // Is this the tab's final message?
           if (aMessage.data.isFinal) {
@@ -691,7 +706,7 @@
         break;
       case "SessionStore:restoreHistoryComplete":
         // Notify the tabbrowser that the tab chrome has been restored.
-        let tabData = browser.__SS_data;
+        let tabData = TabState.collect(tab);
 
         // wall-paper fix for bug 439675: make sure that the URL to be loaded
         // is always visible in the address bar
@@ -713,6 +728,7 @@
         // Restore the tab icon.
         if ("image" in tabData) {
           win.gBrowser.setIcon(tab, tabData.image);
+          TabStateCache.update(browser, {image: null});
         }
 
         let event = win.document.createEvent("Events");
@@ -729,11 +745,16 @@
           // enter yet, then we just need to write that value to the URL bar without
           // loading anything. This must happen after the load, since it will clear
           // userTypedValue.
-          let tabData = browser.__SS_data;
+          let tabData = TabState.collect(tab);
           if (tabData.userTypedValue && !tabData.userTypedClear) {
             browser.userTypedValue = tabData.userTypedValue;
             win.URLBarSetURI();
           }
+
+          // Remove state we don't need any longer.
+          TabStateCache.update(browser, {
+            userTypedValue: null, userTypedClear: null
+          });
         }
         break;
       case "SessionStore:restoreTabContentComplete":
@@ -743,8 +764,6 @@
           Services.obs.notifyObservers(browser, NOTIFY_TAB_RESTORED, null);
         }
 
-        delete browser.__SS_data;
-
         SessionStoreInternal._resetLocalTabRestoringState(tab);
         SessionStoreInternal.restoreNextTab();
 
@@ -812,7 +831,7 @@
         this.onBrowserCrashed(win, target);
         break;
       case "XULFrameLoaderCreated":
-        if (target.tagName == "browser" && target.frameLoader) {
+        if (target.tagName == "browser" && target.frameLoader && target.permanentKey) {
           this._lastKnownFrameLoader.set(target.permanentKey, target.frameLoader);
         }
         break;
@@ -1410,7 +1429,6 @@
    */
   onTabRemove: function ssi_onTabRemove(aWindow, aTab, aNoNotification) {
     let browser = aTab.linkedBrowser;
-    delete browser.__SS_data;
     browser.removeEventListener("SwapDocShells", this);
     browser.removeEventListener("oop-browser-crashed", this);
 
@@ -1619,6 +1637,10 @@
       let tab = aWindow.gBrowser.getTabForBrowser(aBrowser);
       this._resetLocalTabRestoringState(tab);
     }
+
+    // The browser crashed so we might never receive flush responses.
+    // Resolve all pending flush requests for the crashed browser.
+    TabStateFlusher.resolveAll(aBrowser);
   },
 
   // Clean up data that has been closed a long time ago.
@@ -1783,24 +1805,43 @@
       throw Components.Exception("Invalid window object: no gBrowser", Cr.NS_ERROR_INVALID_ARG);
     }
 
-    // Flush all data queued in the content script because we will need that
-    // state to properly duplicate the given tab.
-    TabState.flush(aTab.linkedBrowser);
-
-    // Duplicate the tab state
-    let tabState = TabState.clone(aTab);
-
-    tabState.index += aDelta;
-    tabState.index = Math.max(1, Math.min(tabState.index, tabState.entries.length));
-    tabState.pinned = false;
-
+    // Create a new tab.
     let newTab = aTab == aWindow.gBrowser.selectedTab ?
       aWindow.gBrowser.addTab(null, {relatedToCurrent: true, ownerTab: aTab}) :
       aWindow.gBrowser.addTab();
 
-    this.restoreTab(newTab, tabState, {
-      restoreImmediately: true /* Load this tab right away. */
+    // Set tab title to "Connecting..." and start the throbber to pretend we're
+    // doing something while actually waiting for data from the frame script.
+    aWindow.gBrowser.setTabTitleLoading(newTab);
+    newTab.setAttribute("busy", "true");
+
+    // Collect state before flushing.
+    let tabState = TabState.clone(aTab);
+
+    // Flush to get the latest tab state to duplicate.
+    let browser = aTab.linkedBrowser;
+    TabStateFlusher.flush(browser).then(() => {
+      // The new tab might have been closed in the meantime.
+      if (newTab.closing || !newTab.linkedBrowser) {
+        return;
+      }
+
+      // Update state with flushed data. We can't use TabState.clone() here as
+      // the tab to duplicate may have already been closed. In that case we
+      // only have access to the <xul:browser>.
+      let options = {includePrivateData: true};
+      TabState.copyFromCache(browser, tabState, options);
+
+      tabState.index += aDelta;
+      tabState.index = Math.max(1, Math.min(tabState.index, tabState.entries.length));
+      tabState.pinned = false;
+
+      // Restore the state into the new tab.
+      this.restoreTab(newTab, tabState, {
+        restoreImmediately: true /* Load this tab right away. */
+      });
     });
+
     return newTab;
   },
 
@@ -1948,15 +1989,7 @@
   },
 
   getTabValue: function ssi_getTabValue(aTab, aKey) {
-    let data = {};
-    if (aTab.__SS_extdata) {
-      data = aTab.__SS_extdata;
-    }
-    else if (aTab.linkedBrowser.__SS_data && aTab.linkedBrowser.__SS_data.extData) {
-      // If the tab hasn't been fully restored, get the data from the to-be-restored data
-      data = aTab.linkedBrowser.__SS_data.extData;
-    }
-    return data[aKey] || "";
+    return (aTab.__SS_extdata || {})[aKey] || "";
   },
 
   setTabValue: function ssi_setTabValue(aTab, aKey, aStringValue) {
@@ -1966,36 +1999,17 @@
 
     // If the tab hasn't been restored, then set the data there, otherwise we
     // could lose newly added data.
-    let saveTo;
-    if (aTab.__SS_extdata) {
-      saveTo = aTab.__SS_extdata;
-    }
-    else if (aTab.linkedBrowser.__SS_data && aTab.linkedBrowser.__SS_data.extData) {
-      saveTo = aTab.linkedBrowser.__SS_data.extData;
-    }
-    else {
+    if (!aTab.__SS_extdata) {
       aTab.__SS_extdata = {};
-      saveTo = aTab.__SS_extdata;
     }
 
-    saveTo[aKey] = aStringValue;
+    aTab.__SS_extdata[aKey] = aStringValue;
     this.saveStateDelayed(aTab.ownerDocument.defaultView);
   },
 
   deleteTabValue: function ssi_deleteTabValue(aTab, aKey) {
-    // We want to make sure that if data is accessed early, we attempt to delete
-    // that data from __SS_data as well. Otherwise we'll throw in cases where
-    // data can be set or read.
-    let deleteFrom;
-    if (aTab.__SS_extdata) {
-      deleteFrom = aTab.__SS_extdata;
-    }
-    else if (aTab.linkedBrowser.__SS_data && aTab.linkedBrowser.__SS_data.extData) {
-      deleteFrom = aTab.linkedBrowser.__SS_data.extData;
-    }
-
-    if (deleteFrom && aKey in deleteFrom) {
-      delete deleteFrom[aKey];
+    if (aTab.__SS_extdata && aKey in aTab.__SS_extdata) {
+      delete aTab.__SS_extdata[aKey];
       this.saveStateDelayed(aTab.ownerDocument.defaultView);
     }
   },
@@ -2819,7 +2833,6 @@
 
     // keep the data around to prevent dataloss in case
     // a tab gets closed before it's been properly restored
-    browser.__SS_data = tabData;
     browser.__SS_restoreState = TAB_STATE_NEEDS_RESTORE;
     browser.setAttribute("pending", "true");
     tab.setAttribute("pending", "true");
@@ -2831,7 +2844,14 @@
       storage: tabData.storage || null,
       formdata: tabData.formdata || null,
       disallow: tabData.disallow || null,
-      pageStyle: tabData.pageStyle || null
+      pageStyle: tabData.pageStyle || null,
+
+      // This information is only needed until the tab has finished restoring.
+      // When that's done it will be removed from the cache and we always
+      // collect it in TabState._collectBaseTabData().
+      image: tabData.image || "",
+      userTypedValue: tabData.userTypedValue || "",
+      userTypedClear: tabData.userTypedClear || 0
     });
 
     browser.messageManager.sendAsyncMessage("SessionStore:restoreHistory",
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/TabStateFlusher.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/TabStateFlusher.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/TabStateFlusher.jsm	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/TabStateFlusher.jsm	2015-05-25 20:42:49.000000000 +0000
@@ -0,0 +1,122 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+this.EXPORTED_SYMBOLS = ["TabStateFlusher"];
+
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/Promise.jsm", this);
+
+/**
+ * A module that enables async flushes. Updates from frame scripts are
+ * throttled to be sent only once per second. If an action wants a tab's latest
+ * state without waiting for a second then it can request an async flush and
+ * wait until the frame scripts reported back. At this point the parent has the
+ * latest data and the action can continue.
+ */
+this.TabStateFlusher = Object.freeze({
+  /**
+   * Requests an async flush for the given browser. Returns a promise that will
+   * resolve when we heard back from the content process and the parent has
+   * all the latest data.
+   */
+  flush(browser) {
+    return TabStateFlusherInternal.flush(browser);
+  },
+
+  /**
+   * Resolves the flush request with the given flush ID.
+   */
+  resolve(browser, flushID) {
+    TabStateFlusherInternal.resolve(browser, flushID);
+  },
+
+  /**
+   * Resolves all active flush requests for a given browser. This should be
+   * used when the content process crashed or the final update message was
+   * seen. In those cases we can't guarantee to ever hear back from the frame
+   * script so we just resolve all requests instead of discarding them.
+   */
+  resolveAll(browser) {
+    TabStateFlusherInternal.resolveAll(browser);
+  }
+});
+
+let TabStateFlusherInternal = {
+  // Stores the last request ID.
+  _lastRequestID: 0,
+
+  // A map storing all active requests per browser.
+  _requests: new WeakMap(),
+
+  /**
+   * Requests an async flush for the given browser. Returns a promise that will
+   * resolve when we heard back from the content process and the parent has
+   * all the latest data.
+   */
+  flush(browser) {
+    let id = ++this._lastRequestID;
+    let mm = browser.messageManager;
+    mm.sendAsyncMessage("SessionStore:flush", {id});
+
+    // Retrieve active requests for given browser.
+    let permanentKey = browser.permanentKey;
+    let perBrowserRequests = this._requests.get(permanentKey) || new Map();
+
+    return new Promise(resolve => {
+      // Store resolve() so that we can resolve the promise later.
+      perBrowserRequests.set(id, resolve);
+
+      // Update the flush requests stored per browser.
+      this._requests.set(permanentKey, perBrowserRequests);
+    });
+  },
+
+  /**
+   * Resolves the flush request with the given flush ID.
+   */
+  resolve(browser, flushID) {
+    // Nothing to do if there are no pending flushes for the given browser.
+    if (!this._requests.has(browser.permanentKey)) {
+      return;
+    }
+
+    // Retrieve active requests for given browser.
+    let perBrowserRequests = this._requests.get(browser.permanentKey);
+    if (!perBrowserRequests.has(flushID)) {
+      return;
+    }
+
+    // Resolve the request with the given id.
+    let resolve = perBrowserRequests.get(flushID);
+    perBrowserRequests.delete(flushID);
+    resolve();
+  },
+
+  /**
+   * Resolves all active flush requests for a given browser. This should be
+   * used when the content process crashed or the final update message was
+   * seen. In those cases we can't guarantee to ever hear back from the frame
+   * script so we just resolve all requests instead of discarding them.
+   */
+  resolveAll(browser) {
+    // Nothing to do if there are no pending flushes for the given browser.
+    if (!this._requests.has(browser.permanentKey)) {
+      return;
+    }
+
+    // Retrieve active requests for given browser.
+    let perBrowserRequests = this._requests.get(browser.permanentKey);
+
+    // Resolve all requests.
+    for (let resolve of perBrowserRequests.values()) {
+      resolve();
+    }
+
+    // Clear active requests.
+    perBrowserRequests.clear();
+  }
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/TabState.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/TabState.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/TabState.jsm	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/TabState.jsm	2015-05-25 20:42:49.000000000 +0000
@@ -55,8 +55,8 @@
     return TabStateInternal.clone(tab);
   },
 
-  copyFromCache: function (tab, tabData, options) {
-    TabStateInternal.copyFromCache(tab, tabData, options);
+  copyFromCache(browser, tabData, options) {
+    TabStateInternal.copyFromCache(browser, tabData, options);
   }
 });
 
@@ -165,43 +165,6 @@
     let tabData = {entries: [], lastAccessed: tab.lastAccessed };
     let browser = tab.linkedBrowser;
 
-    if (!browser || !browser.currentURI) {
-      // can happen when calling this function right after .addTab()
-      return tabData;
-    }
-    if (browser.__SS_data) {
-      // Use the data to be restored when the tab hasn't been
-      // completely loaded. We clone the data, since we're updating it
-      // here and the caller may update it further.
-      tabData = Utils.shallowCopy(browser.__SS_data);
-      if (tab.pinned)
-        tabData.pinned = true;
-      else
-        delete tabData.pinned;
-      tabData.hidden = tab.hidden;
-
-      // If __SS_extdata is set then we'll use that since it might be newer.
-      if (tab.__SS_extdata)
-        tabData.extData = tab.__SS_extdata;
-      // If it exists but is empty then a key was likely deleted. In that case just
-      // delete extData.
-      if (tabData.extData && !Object.keys(tabData.extData).length)
-        delete tabData.extData;
-      return tabData;
-    }
-
-    // If there is a userTypedValue set, then either the user has typed something
-    // in the URL bar, or a new tab was opened with a URI to load. userTypedClear
-    // is used to indicate whether the tab was in some sort of loading state with
-    // userTypedValue.
-    if (browser.userTypedValue) {
-      tabData.userTypedValue = browser.userTypedValue;
-      tabData.userTypedClear = browser.userTypedClear;
-    } else {
-      delete tabData.userTypedValue;
-      delete tabData.userTypedClear;
-    }
-
     if (tab.pinned)
       tabData.pinned = true;
     else
@@ -211,10 +174,6 @@
     // Save tab attributes.
     tabData.attributes = TabAttributes.get(tab);
 
-    // Store the tab icon.
-    let tabbrowser = tab.ownerDocument.defaultView.gBrowser;
-    tabData.image = tabbrowser.getIcon(tab);
-
     if (tab.__SS_extdata)
       tabData.extData = tab.__SS_extdata;
     else if (tabData.extData)
@@ -222,29 +181,50 @@
 
     // Copy data from the tab state cache only if the tab has fully finished
     // restoring. We don't want to overwrite data contained in __SS_data.
-    this.copyFromCache(tab, tabData, options);
+    this.copyFromCache(browser, tabData, options);
+
+    // After copyFromCache() was called we check for properties that are kept
+    // in the cache only while the tab is pending or restoring. Once that
+    // happened those properties will be removed from the cache and will
+    // be read from the tab/browser every time we collect data.
+
+    // Store the tab icon.
+    if (!("image" in tabData)) {
+      let tabbrowser = tab.ownerDocument.defaultView.gBrowser;
+      tabData.image = tabbrowser.getIcon(tab);
+    }
+
+    // If there is a userTypedValue set, then either the user has typed something
+    // in the URL bar, or a new tab was opened with a URI to load. userTypedClear
+    // is used to indicate whether the tab was in some sort of loading state with
+    // userTypedValue.
+    if (!("userTypedValue" in tabData) && browser.userTypedValue) {
+      tabData.userTypedValue = browser.userTypedValue;
+      tabData.userTypedClear = browser.userTypedClear;
+    }
 
     return tabData;
   },
 
   /**
-   * Copy tab data for the given |tab| from the cache to |tabData|.
+   * Copy data for the given |browser| from the cache to |tabData|.
    *
-   * @param tab (xul:tab)
-   *        The tab belonging to the given |tabData| object.
+   * @param browser (xul:browser)
+   *        The browser belonging to the given |tabData| object.
    * @param tabData (object)
    *        The tab data belonging to the given |tab|.
    * @param options (object)
    *        {includePrivateData: true} to always include private data
    */
-  copyFromCache: function (tab, tabData, options = {}) {
-    let data = TabStateCache.get(tab.linkedBrowser);
+  copyFromCache(browser, tabData, options = {}) {
+    let data = TabStateCache.get(browser);
     if (!data) {
       return;
     }
 
     // The caller may explicitly request to omit privacy checks.
     let includePrivateData = options && options.includePrivateData;
+    let isPinned = tabData.pinned || false;
 
     for (let key of Object.keys(data)) {
       let value = data[key];
@@ -252,9 +232,9 @@
       // Filter sensitive data according to the current privacy level.
       if (!includePrivateData) {
         if (key === "storage") {
-          value = PrivacyFilter.filterSessionStorageData(value, tab.pinned);
+          value = PrivacyFilter.filterSessionStorageData(value, isPinned);
         } else if (key === "formdata") {
-          value = PrivacyFilter.filterFormData(value, tab.pinned);
+          value = PrivacyFilter.filterFormData(value, isPinned);
         }
       }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_393716.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_393716.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_393716.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_393716.js	2015-05-25 20:42:49.000000000 +0000
@@ -18,7 +18,7 @@
   yield promiseBrowserLoaded(tab.linkedBrowser);
 
   // get the tab's state
-  TabState.flush(tab.linkedBrowser);
+  yield TabStateFlusher.flush(tab.linkedBrowser);
   let state = ss.getTabState(tab);
   ok(state, "get the tab's state");
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_423132.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_423132.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_423132.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_423132.js	2015-05-25 20:42:49.000000000 +0000
@@ -32,7 +32,6 @@
       promiseBrowserLoaded(newWin.gBrowser.selectedBrowser).then(() => {
         let ready = () => {
           // get the sessionstore state for the window
-          TabState.flush(newWin.gBrowser.selectedBrowser);
           let state = ss.getWindowState(newWin);
 
           // verify our cookie got set during pageload
@@ -71,11 +70,15 @@
           finish();
         };
 
+        function flushAndReady() {
+          TabStateFlusher.flush(newWin.gBrowser.selectedBrowser).then(ready);
+        }
+
         if (newWin.gMultiProcessBrowser) {
           let tab = newWin.gBrowser.selectedTab;
-          promiseTabRestored(tab).then(ready);
+          promiseTabRestored(tab).then(flushAndReady);
         } else {
-          ready();
+          flushAndReady();
         }
       }, true, testURL);
     });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_447951.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_447951.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_447951.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_447951.js	2015-05-25 20:42:49.000000000 +0000
@@ -25,7 +25,8 @@
       tabState.entries.push({ url: baseURL + i });
 
     promiseTabState(tab, tabState).then(() => {
-      TabState.flush(tab.linkedBrowser);
+      return TabStateFlusher.flush(tab.linkedBrowser);
+    }).then(() => {
       tabState = JSON.parse(ss.getTabState(tab));
       is(tabState.entries.length, max_entries, "session history filled to the limit");
       is(tabState.entries[0].url, baseURL + 0, "... but not more");
@@ -33,15 +34,18 @@
       // visit yet another anchor (appending it to session history)
       runInContent(tab.linkedBrowser, function(win) {
         win.document.querySelector("a").click();
-      }, null).then(check);
+      }, null).then(flushAndCheck);
+
+      function flushAndCheck() {
+        TabStateFlusher.flush(tab.linkedBrowser).then(check);
+      }
 
       function check() {
-        TabState.flush(tab.linkedBrowser);
         tabState = JSON.parse(ss.getTabState(tab));
         if (tab.linkedBrowser.currentURI.spec != baseURL + "end") {
           // It may take a few passes through the event loop before we
           // get the right URL.
-          executeSoon(check);
+          executeSoon(flushAndCheck);
           return;
         }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_454908.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_454908.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_454908.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_454908.js	2015-05-25 20:42:49.000000000 +0000
@@ -3,10 +3,6 @@
 
 "use strict";
 
-let tmp = {};
-Cu.import("resource:///modules/sessionstore/SessionSaver.jsm", tmp);
-let {SessionSaver} = tmp;
-
 const URL = ROOT + "browser_454908_sample.html";
 const PASS = "pwd-" + Math.random();
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_465215.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_465215.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_465215.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_465215.js	2015-05-25 20:42:49.000000000 +0000
@@ -1,36 +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/. */
-
-function test() {
-  /** Test for Bug 465215 **/
-
-  waitForExplicitFinish();
-
-  let uniqueName = "bug 465215";
-  let uniqueValue1 = "as good as unique: " + Date.now();
-  let uniqueValue2 = "as good as unique: " + Math.random();
+"use strict";
 
+let uniqueName = "bug 465215";
+let uniqueValue1 = "as good as unique: " + Date.now();
+let uniqueValue2 = "as good as unique: " + Math.random();
+
+add_task(function* () {
   // set a unique value on a new, blank tab
-  let tab1 = gBrowser.addTab();
-  promiseBrowserLoaded(tab1.linkedBrowser).then(() => {
-    ss.setTabValue(tab1, uniqueName, uniqueValue1);
-
-    // duplicate the tab with that value
-    let tab2 = ss.duplicateTab(window, tab1);
-    is(ss.getTabValue(tab2, uniqueName), uniqueValue1, "tab value was duplicated");
-
-    ss.setTabValue(tab2, uniqueName, uniqueValue2);
-    isnot(ss.getTabValue(tab1, uniqueName), uniqueValue2, "tab values aren't sync'd");
-
-    // overwrite the tab with the value which should remove it
-    promiseTabState(tab1, {entries: []}).then(() => {
-      is(ss.getTabValue(tab1, uniqueName), "", "tab value was cleared");
-
-      // clean up
-      gBrowser.removeTab(tab2);
-      gBrowser.removeTab(tab1);
-      finish();
-    });
-  });
-}
+  let tab1 = gBrowser.addTab("about:blank");
+  yield promiseBrowserLoaded(tab1.linkedBrowser);
+  ss.setTabValue(tab1, uniqueName, uniqueValue1);
+
+  // duplicate the tab with that value
+  let tab2 = ss.duplicateTab(window, tab1);
+  yield promiseTabRestored(tab2);
+  is(ss.getTabValue(tab2, uniqueName), uniqueValue1, "tab value was duplicated");
+
+  ss.setTabValue(tab2, uniqueName, uniqueValue2);
+  isnot(ss.getTabValue(tab1, uniqueName), uniqueValue2, "tab values aren't sync'd");
+
+  // overwrite the tab with the value which should remove it
+  yield promiseTabState(tab1, {entries: []});
+  is(ss.getTabValue(tab1, uniqueName), "", "tab value was cleared");
+
+  // clean up
+  gBrowser.removeTab(tab2);
+  gBrowser.removeTab(tab1);
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_467409-backslashplosion.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_467409-backslashplosion.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_467409-backslashplosion.js	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_467409-backslashplosion.js	2015-05-25 20:42:49.000000000 +0000
@@ -38,23 +38,23 @@
 
   // test 1
   yield promiseTabState(tab, STATE);
-  checkState("test1", tab);
+  yield checkState("test1", tab);
 
   // test 2
   yield promiseTabState(tab, STATE2);
-  checkState("test2", tab);
+  yield checkState("test2", tab);
 
   // test 3
   yield promiseTabState(tab, STATE3);
-  checkState("test3", tab);
+  yield checkState("test3", tab);
 
   // Cleanup.
   gBrowser.removeTab(tab);
 });
 
-function checkState(prefix, tab) {
+function* checkState(prefix, tab) {
   // Flush and query tab state.
-  TabState.flush(tab.linkedBrowser);
+  yield TabStateFlusher.flush(tab.linkedBrowser);
   let {formdata} = JSON.parse(ss.getTabState(tab));
 
   ok(formdata.id["sessionData"], prefix + ": we have form data for about:sessionrestore");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_491168.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_491168.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_491168.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_491168.js	2015-05-25 20:42:49.000000000 +0000
@@ -14,7 +14,7 @@
   browser.loadURI("http://example.org", referrerURI, null);
   yield promiseBrowserLoaded(browser);
 
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
   let tabState = JSON.parse(ss.getTabState(tab));
   is(tabState.entries[0].referrer,  REFERRER1,
      "Referrer retrieved via getTabState matches referrer set via loadURI.");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_500328.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_500328.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_500328.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_500328.js	2015-05-25 20:42:49.000000000 +0000
@@ -99,7 +99,8 @@
         history.replaceState({obj3:/^a$/}, "title-obj3");
       }
       runInContent(browser, contentTest, null).then(function() {
-        TabState.flush(tab.linkedBrowser);
+        return TabStateFlusher.flush(tab.linkedBrowser);
+      }).then(() => {
         let state = ss.getTabState(tab);
         gBrowser.removeTab(tab);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_586068-browser_state_interrupted.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_586068-browser_state_interrupted.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_586068-browser_state_interrupted.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_586068-browser_state_interrupted.js	2015-05-25 20:42:49.000000000 +0000
@@ -4,6 +4,8 @@
 
 const PREF_RESTORE_ON_DEMAND = "browser.sessionstore.restore_on_demand";
 
+requestLongerTimeout(2);
+
 add_task(function* test() {
   Services.prefs.setBoolPref(PREF_RESTORE_ON_DEMAND, false);
   registerCleanupFunction(function () {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_623779.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_623779.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_623779.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_623779.js	2015-05-25 20:42:49.000000000 +0000
@@ -1,7 +1,13 @@
-function test() {
+"use strict";
+
+add_task(function* () {
   gBrowser.pinTab(gBrowser.selectedTab);
-  var newTab = gBrowser.duplicateTab(gBrowser.selectedTab);
+
+  let newTab = gBrowser.duplicateTab(gBrowser.selectedTab);
+  yield promiseTabRestored(newTab);
+
   ok(!newTab.pinned, "duplicating a pinned tab creates unpinned tab");
-  gBrowser.removeTab(newTab);
+  yield promiseRemoveTab(newTab);
+
   gBrowser.unpinTab(gBrowser.selectedTab);
-}
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_662743.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_662743.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_662743.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_662743.js	2015-05-25 20:42:49.000000000 +0000
@@ -67,12 +67,12 @@
 
   promiseBrowserLoaded(tab.linkedBrowser).then(() => {
     promiseTabState(tab, tabState).then(() => {
+      // Flush to make sure we have the latest form data.
+      return TabStateFlusher.flush(tab.linkedBrowser);
+    }).then(() => {
       let doc = tab.linkedBrowser.contentDocument;
       let select = doc.getElementById("select_id");
       let value = select.options[select.selectedIndex].value;
-
-      // Flush to make sure we have the latest form data.
-      TabState.flush(tab.linkedBrowser);
       let restoredTabState = JSON.parse(ss.getTabState(tab));
 
       // If aExpectedValue=null we don't expect any form data to be collected.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_705597.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_705597.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_705597.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_705597.js	2015-05-25 20:42:49.000000000 +0000
@@ -26,7 +26,8 @@
     whenChildCount(entry, 1, function () {
       whenChildCount(entry, 2, function () {
         promiseBrowserLoaded(browser).then(() => {
-          TabState.flush(browser);
+          return TabStateFlusher.flush(browser);
+        }).then(() => {
           let {entries} = JSON.parse(ss.getTabState(tab));
           is(entries.length, 1, "tab has one history entry");
           ok(!entries[0].children, "history entry has no subframes");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_819510_perwindowpb.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_819510_perwindowpb.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_819510_perwindowpb.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_819510_perwindowpb.js	2015-05-25 20:42:49.000000000 +0000
@@ -109,8 +109,9 @@
   forgetClosedWindows();
 });
 
-function promiseTabLoad(win, url) {
+function* promiseTabLoad(win, url) {
   let browser = win.gBrowser.selectedBrowser;
   browser.loadURI(url);
-  return promiseBrowserLoaded(browser).then(() => TabState.flush(browser));
+  yield promiseBrowserLoaded(browser);
+  yield TabStateFlusher.flush(browser);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_async_duplicate_tab.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_async_duplicate_tab.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_async_duplicate_tab.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_async_duplicate_tab.js	2015-05-25 20:42:49.000000000 +0000
@@ -0,0 +1,78 @@
+"use strict";
+
+const URL = "data:text/html;charset=utf-8,<a href=%23>clickme</a>";
+
+add_task(function* test_duplicate() {
+  // Create new tab.
+  let tab = gBrowser.addTab(URL);
+  let browser = tab.linkedBrowser;
+  yield promiseBrowserLoaded(browser);
+
+  // Flush to empty any queued update messages.
+  yield TabStateFlusher.flush(browser);
+
+  // Click the link to navigate, this will add second shistory entry.
+  yield ContentTask.spawn(browser, null, function* () {
+    return new Promise(resolve => {
+      addEventListener("hashchange", function onHashChange() {
+        removeEventListener("hashchange", onHashChange);
+        resolve();
+      });
+
+      // Click the link.
+      content.document.querySelector("a").click();
+    });
+  });
+
+  // Duplicate the tab.
+  let tab2 = ss.duplicateTab(window, tab);
+
+  // Wait until the tab has fully restored.
+  yield promiseTabRestored(tab2);
+  yield TabStateFlusher.flush(tab2.linkedBrowser);
+
+  // There should be two history entries now.
+  let {entries} = JSON.parse(ss.getTabState(tab2));
+  is(entries.length, 2, "there are two shistory entries");
+
+  // Cleanup.
+  yield promiseRemoveTab(tab2);
+  yield promiseRemoveTab(tab);
+});
+
+add_task(function* test_duplicate_remove() {
+  // Create new tab.
+  let tab = gBrowser.addTab(URL);
+  let browser = tab.linkedBrowser;
+  yield promiseBrowserLoaded(browser);
+
+  // Flush to empty any queued update messages.
+  yield TabStateFlusher.flush(browser);
+
+  // Click the link to navigate, this will add second shistory entry.
+  yield ContentTask.spawn(browser, null, function* () {
+    return new Promise(resolve => {
+      addEventListener("hashchange", function onHashChange() {
+        removeEventListener("hashchange", onHashChange);
+        resolve();
+      });
+
+      // Click the link.
+      content.document.querySelector("a").click();
+    });
+  });
+
+  // Duplicate the tab.
+  let tab2 = ss.duplicateTab(window, tab);
+
+  // Before the duplication finished, remove the tab.
+  yield Promise.all([promiseRemoveTab(tab), promiseTabRestored(tab2)]);
+  yield TabStateFlusher.flush(tab2.linkedBrowser);
+
+  // There should be two history entries now.
+  let {entries} = JSON.parse(ss.getTabState(tab2));
+  is(entries.length, 2, "there are two shistory entries");
+
+  // Cleanup.
+  yield promiseRemoveTab(tab2);
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_async_flushes.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_async_flushes.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_async_flushes.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_async_flushes.js	2015-05-25 20:42:49.000000000 +0000
@@ -0,0 +1,112 @@
+"use strict";
+
+const URL = "data:text/html;charset=utf-8,<a href=%23>clickme</a>";
+
+add_task(function* test_flush() {
+  // Create new tab.
+  let tab = gBrowser.addTab(URL);
+  let browser = tab.linkedBrowser;
+  yield promiseBrowserLoaded(browser);
+
+  // Flush to empty any queued update messages.
+  yield TabStateFlusher.flush(browser);
+
+  // There should be one history entry.
+  let {entries} = JSON.parse(ss.getTabState(tab));
+  is(entries.length, 1, "there is a single history entry");
+
+  // Click the link to navigate, this will add second shistory entry.
+  yield ContentTask.spawn(browser, null, function* () {
+    return new Promise(resolve => {
+      addEventListener("hashchange", function onHashChange() {
+        removeEventListener("hashchange", onHashChange);
+        resolve();
+      });
+
+      // Click the link.
+      content.document.querySelector("a").click();
+    });
+  });
+
+  // Flush to empty any queued update messages.
+  yield TabStateFlusher.flush(browser);
+
+  // There should be two history entries now.
+  ({entries} = JSON.parse(ss.getTabState(tab)));
+  is(entries.length, 2, "there are two shistory entries");
+
+  // Cleanup.
+  gBrowser.removeTab(tab);
+});
+
+add_task(function* test_crash() {
+  // Create new tab.
+  let tab = gBrowser.addTab(URL);
+  let browser = tab.linkedBrowser;
+  yield promiseBrowserLoaded(browser);
+
+  // Flush to empty any queued update messages.
+  yield TabStateFlusher.flush(browser);
+
+  // There should be one history entry.
+  let {entries} = JSON.parse(ss.getTabState(tab));
+  is(entries.length, 1, "there is a single history entry");
+
+  // Click the link to navigate.
+  yield ContentTask.spawn(browser, null, function* () {
+    return new Promise(resolve => {
+      addEventListener("hashchange", function onHashChange() {
+        removeEventListener("hashchange", onHashChange);
+        resolve();
+      });
+
+      // Click the link.
+      content.document.querySelector("a").click();
+    });
+  });
+
+  // Crash the browser and flush. Both messages are async and will be sent to
+  // the content process. The "crash" message makes it first so that we don't
+  // get a chance to process the flush. The TabStateFlusher however should be
+  // notified so that the flush still completes.
+  let promise1 = crashBrowser(browser);
+  let promise2 = TabStateFlusher.flush(browser);
+  yield Promise.all([promise1, promise2]);
+
+  // The pending update should be lost.
+  ({entries} = JSON.parse(ss.getTabState(tab)));
+  is(entries.length, 1, "still only one history entry");
+
+  // Cleanup.
+  gBrowser.removeTab(tab);
+});
+
+add_task(function* test_remove() {
+  // Create new tab.
+  let tab = gBrowser.addTab(URL);
+  let browser = tab.linkedBrowser;
+  yield promiseBrowserLoaded(browser);
+
+  // Flush to empty any queued update messages.
+  yield TabStateFlusher.flush(browser);
+
+  // There should be one history entry.
+  let {entries} = JSON.parse(ss.getTabState(tab));
+  is(entries.length, 1, "there is a single history entry");
+
+  // Click the link to navigate.
+  yield ContentTask.spawn(browser, null, function* () {
+    return new Promise(resolve => {
+      addEventListener("hashchange", function onHashChange() {
+        removeEventListener("hashchange", onHashChange);
+        resolve();
+      });
+
+      // Click the link.
+      content.document.querySelector("a").click();
+    });
+  });
+
+  // Request a flush and remove the tab. The flush should still complete.
+  yield Promise.all([TabStateFlusher.flush(browser), promiseRemoveTab(tab)]);
+})
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_async_remove_tab.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_async_remove_tab.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_async_remove_tab.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_async_remove_tab.js	2015-05-25 20:42:49.000000000 +0000
@@ -10,7 +10,7 @@
   ss.setTabValue(tab, "foobar", r);
 
   // Flush to ensure there are no scheduled messages.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
 
   return {tab, r};
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_backup_recovery.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_backup_recovery.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_backup_recovery.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_backup_recovery.js	2015-05-25 20:42:49.000000000 +0000
@@ -50,7 +50,7 @@
 
   info("Testing situation after a single write");
   yield promiseBrowserLoaded(tab.linkedBrowser);
-  TabState.flush(tab.linkedBrowser);
+  yield TabStateFlusher.flush(tab.linkedBrowser);
   yield SessionSaver.run();
 
   ok((yield File.exists(Paths.recovery)), "After write, recovery sessionstore file exists again");
@@ -62,7 +62,7 @@
   let URL2 = URL_BASE + "?second_write";
   tab.linkedBrowser.loadURI(URL2);
   yield promiseBrowserLoaded(tab.linkedBrowser);
-  TabState.flush(tab.linkedBrowser);
+  yield TabStateFlusher.flush(tab.linkedBrowser);
   yield SessionSaver.run();
 
   ok((yield File.exists(Paths.recovery)), "After second write, recovery sessionstore file still exists");
@@ -89,7 +89,7 @@
   let tab = gBrowser.addTab(URL);
 
   yield promiseBrowserLoaded(tab.linkedBrowser);
-  TabState.flush(tab.linkedBrowser);
+  yield TabStateFlusher.flush(tab.linkedBrowser);
   yield SessionSaver.run();
   gBrowser.removeTab(tab);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_broadcast.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_broadcast.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_broadcast.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_broadcast.js	2015-05-25 20:42:49.000000000 +0000
@@ -54,11 +54,12 @@
 
   yield modifySessionStorage(browser, {test: "on-duplicate"});
   let tab2 = ss.duplicateTab(window, tab);
+  yield promiseTabRestored(tab2);
+
   let {storage} = JSON.parse(ss.getTabState(tab2));
   is(storage["http://example.com"].test, "on-duplicate",
     "sessionStorage data has been flushed when duplicating tabs");
 
-  yield promiseTabRestored(tab2);
   yield promiseRemoveTab(tab2);
   [{state: {storage}}] = JSON.parse(ss.getClosedTabData(window));
   is(storage["http://example.com"].test, "on-duplicate",
@@ -93,7 +94,7 @@
   let browser = tab.linkedBrowser;
 
   // Flush to make sure our tab state is up-to-date.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
 
   let state = ss.getTabState(tab);
   yield modifySessionStorage(browser, {test: "on-set-tab-state"});
@@ -121,7 +122,7 @@
   let browser = tab.linkedBrowser;
 
   // Flush to make sure we start with an empty queue.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
 
   yield modifySessionStorage(browser, {test: "on-tab-close-racy"});
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_capabilities.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_capabilities.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_capabilities.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_capabilities.js	2015-05-25 20:42:49.000000000 +0000
@@ -31,7 +31,7 @@
   yield promiseBrowserLoaded(browser);
 
   // Flush to make sure chrome received all data.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
 
   // Check that we correctly save disallowed features.
   let disallowedState = JSON.parse(ss.getTabState(tab));
@@ -44,7 +44,7 @@
   yield promiseTabState(tab, {entries: [{url: "about:robots"}]});
 
   // Flush to make sure chrome received all data.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
 
   // After restoring disallowed features must be available again.
   state = JSON.parse(ss.getTabState(tab));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_cookies.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_cookies.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_cookies.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_cookies.js	2015-05-25 20:42:49.000000000 +0000
@@ -1,6 +1,3 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
 "use strict";
 
 const PATH = "/browser/browser/components/sessionstore/test/";
@@ -147,7 +144,7 @@
   yield promiseBrowserLoaded(browser);
 
   // Ensure the tab's session history is up-to-date.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
 });
 
 /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_crashedTabs.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_crashedTabs.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_crashedTabs.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_crashedTabs.js	2015-05-25 20:42:49.000000000 +0000
@@ -18,84 +18,6 @@
 // Running this test in ASAN is slow.
 requestLongerTimeout(2);
 
-/**
- * Returns a Promise that resolves once a remote <xul:browser> has experienced
- * a crash. Also does the job of cleaning up the minidump of the crash.
- *
- * @param browser
- *        The <xul:browser> that will crash
- * @return Promise
- */
-function crashBrowser(browser) {
-  // This frame script is injected into the remote browser, and used to
-  // intentionally crash the tab. We crash by using js-ctypes and dereferencing
-  // a bad pointer. The crash should happen immediately upon loading this
-  // frame script.
-  let frame_script = () => {
-    const Cu = Components.utils;
-    Cu.import("resource://gre/modules/ctypes.jsm");
-
-    let dies = function() {
-      privateNoteIntentionalCrash();
-      let zero = new ctypes.intptr_t(8);
-      let badptr = ctypes.cast(zero, ctypes.PointerType(ctypes.int32_t));
-      badptr.contents
-    };
-
-    dump("Et tu, Brute?");
-    dies();
-  }
-
-  let crashCleanupPromise = new Promise((resolve, reject) => {
-    let observer = (subject, topic, data) => {
-      is(topic, 'ipc:content-shutdown', 'Received correct observer topic.');
-      ok(subject instanceof Ci.nsIPropertyBag2,
-         'Subject implements nsIPropertyBag2.');
-      // we might see this called as the process terminates due to previous tests.
-      // We are only looking for "abnormal" exits...
-      if (!subject.hasKey("abnormal")) {
-        info("This is a normal termination and isn't the one we are looking for...");
-        return;
-      }
-
-      let dumpID;
-      if ('nsICrashReporter' in Ci) {
-        dumpID = subject.getPropertyAsAString('dumpID');
-        ok(dumpID, "dumpID is present and not an empty string");
-      }
-
-      if (dumpID) {
-        let minidumpDirectory = getMinidumpDirectory();
-        removeFile(minidumpDirectory, dumpID + '.dmp');
-        removeFile(minidumpDirectory, dumpID + '.extra');
-      }
-
-      Services.obs.removeObserver(observer, 'ipc:content-shutdown');
-      info("Crash cleaned up");
-      resolve();
-    };
-
-    Services.obs.addObserver(observer, 'ipc:content-shutdown');
-  });
-
-  let aboutTabCrashedLoadPromise = new Promise((resolve, reject) => {
-    browser.addEventListener("AboutTabCrashedLoad", function onCrash() {
-      browser.removeEventListener("AboutTabCrashedLoad", onCrash, false);
-      info("about:tabcrashed loaded");
-      resolve();
-    }, false, true);
-  });
-
-  // This frame script will crash the remote browser as soon as it is
-  // evaluated.
-  let mm = browser.messageManager;
-  mm.loadFrameScript("data:,(" + frame_script.toString() + ")();", false);
-  return Promise.all([crashCleanupPromise, aboutTabCrashedLoadPromise]).then(() => {
-    let tab = gBrowser.getTabForBrowser(browser);
-    is(tab.getAttribute("crashed"), "true", "Tab should be marked as crashed");
-  });
-}
-
 function clickButton(browser, id) {
   info("Clicking " + id);
 
@@ -109,34 +31,6 @@
 }
 
 /**
- * Returns the directory where crash dumps are stored.
- *
- * @return nsIFile
- */
-function getMinidumpDirectory() {
-  let dir = Services.dirsvc.get('ProfD', Ci.nsIFile);
-  dir.append("minidumps");
-  return dir;
-}
-
-/**
- * Removes a file from a directory. This is a no-op if the file does not
- * exist.
- *
- * @param directory
- *        The nsIFile representing the directory to remove from.
- * @param filename
- *        A string for the file to remove from the directory.
- */
-function removeFile(directory, filename) {
-  let file = directory.clone();
-  file.append(filename);
-  if (file.exists()) {
-    file.remove(false);
-  }
-}
-
-/**
  * Checks the documentURI of the root document of a remote browser
  * to see if it equals URI. Returns a Promise that resolves if
  * there is a match, and rejects with an error message if they
@@ -220,7 +114,7 @@
 
   browser.loadURI(PAGE_1);
   yield promiseBrowserLoaded(browser);
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
 
   // Crash the tab
   yield crashBrowser(browser);
@@ -249,7 +143,7 @@
 
   browser.loadURI(PAGE_1);
   yield promiseBrowserLoaded(browser);
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
 
   // Crash the tab
   yield crashBrowser(browser);
@@ -260,7 +154,7 @@
   yield promiseTabRestored(newTab);
   ok(!newTab.hasAttribute("crashed"), "Tab shouldn't be marked as crashed anymore.");
   ok(browser.isRemoteBrowser, "Should be a remote browser");
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
 
   // Check the tab state and make sure the tab crashed page isn't
   // mentioned.
@@ -288,7 +182,7 @@
 
   browser.loadURI(PAGE_1);
   yield promiseBrowserLoaded(browser);
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
 
   // Crash the tab
   yield crashBrowser(browser);
@@ -299,7 +193,7 @@
   yield promiseBrowserLoaded(browser);
   ok(!newTab.hasAttribute("crashed"), "Tab shouldn't be marked as crashed anymore.");
   ok(!browser.isRemoteBrowser, "Should not be a remote browser");
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
 
   // Check the tab state and make sure the tab crashed page isn't
   // mentioned.
@@ -338,7 +232,7 @@
   browser.loadURI(PAGE_2);
   yield promiseBrowserLoaded(browser);
 
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
 
   // Crash the tab
   yield crashBrowser(browser);
@@ -388,8 +282,8 @@
   browser.loadURI(PAGE_2);
   yield promiseBrowserLoaded(browser);
 
-  TabState.flush(browser);
-  TabState.flush(browser2);
+  yield TabStateFlusher.flush(browser);
+  yield TabStateFlusher.flush(browser2);
 
   // Crash the tab
   yield crashBrowser(browser);
@@ -434,7 +328,7 @@
   browser.loadURI(PAGE_1);
   yield promiseBrowserLoaded(browser);
 
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
 
   // Crash the tab
   yield crashBrowser(browser);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_dying_cache.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_dying_cache.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_dying_cache.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_dying_cache.js	2015-05-25 20:42:49.000000000 +0000
@@ -1,5 +1,4 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
 
 /**
  * This test ensures that after closing a window we keep its state data around
@@ -19,7 +18,7 @@
   // Open a second tab and close the first one.
   let tab = win.gBrowser.addTab("about:mozilla");
   yield promiseBrowserLoaded(tab.linkedBrowser);
-  TabState.flush(tab.linkedBrowser);
+  yield TabStateFlusher.flush(tab.linkedBrowser);
   yield promiseRemoveTab(win.gBrowser.tabs[0]);
 
   // Make sure our window is still tracked by sessionstore
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_dynamic_frames.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_dynamic_frames.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_dynamic_frames.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_dynamic_frames.js	2015-05-25 20:42:49.000000000 +0000
@@ -24,7 +24,7 @@
   let browser = tab.linkedBrowser;
   yield promiseBrowserLoaded(browser);
 
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
   let {entries} = JSON.parse(ss.getTabState(tab));
 
   // Check URLs.
@@ -61,7 +61,7 @@
   let browser = tab.linkedBrowser;
   yield promiseBrowserLoaded(browser);
 
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
   let {entries} = JSON.parse(ss.getTabState(tab));
 
   // Check URLs.
@@ -76,7 +76,7 @@
   browser.messageManager.sendAsyncMessage("ss-test:click", {id: "lnk"});
   yield promiseBrowserLoaded(browser, false /* don't ignore subframes */);
 
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
   ({entries} = JSON.parse(ss.getTabState(tab)));
 
   // Check URLs.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_formdata_cc.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_formdata_cc.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_formdata_cc.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_formdata_cc.js	2015-05-25 20:42:49.000000000 +0000
@@ -0,0 +1,79 @@
+"use strict";
+
+const URL = "http://mochi.test:8888/browser/browser/components/" +
+            "sessionstore/test/browser_formdata_sample.html";
+
+requestLongerTimeout(2);
+
+/**
+ * This test ensures that credit card numbers in form data will not be
+ * collected, while numbers that don't look like credit card numbers will
+ * still be collected.
+ */
+add_task(function* () {
+  const validCCNumbers = [
+    // 15 digits
+    "930771457288760", "474915027480942",
+    "924894781317325", "714816113937185",
+    "790466087343106", "474320195408363",
+    "219211148122351", "633038472250799",
+    "354236732906484", "095347810189325",
+    // 16 digits
+    "3091269135815020", "5471839082338112",
+    "0580828863575793", "5015290610002932",
+    "9465714503078607", "4302068493801686",
+    "2721398408985465", "6160334316984331",
+    "8643619970075142", "0218246069710785"
+  ];
+
+  const invalidCCNumbers = [
+    // 15 digits
+    "526931005800649", "724952425140686",
+    "379761391174135", "030551436468583",
+    "947377014076746", "254848023655752",
+    "226871580283345", "708025346034339",
+    "917585839076788", "918632588027666",
+    // 16 digits
+    "9946177098017064", "4081194386488872",
+    "3095975979578034", "3662215692222536",
+    "6723210018630429", "4411962856225025",
+    "8276996369036686", "4449796938248871",
+    "3350852696538147", "5011802870046957"
+  ];
+
+  // Creates a tab, loads a page with a form field, sets the value of the
+  // field, and then removes the tab to trigger data collection.
+  function* createAndRemoveTab(formValue) {
+    // Create a new tab.
+    let tab = gBrowser.addTab(URL);
+    let browser = tab.linkedBrowser;
+    yield promiseBrowserLoaded(browser);
+
+    // Set form value.
+    yield setInputValue(browser, formValue);
+
+    // Remove the tab.
+    yield promiseRemoveTab(tab);
+  }
+
+  // Test that valid CC numbers are not collected.
+  for (let number of validCCNumbers) {
+    yield createAndRemoveTab(number);
+    let [{state}] = JSON.parse(ss.getClosedTabData(window));
+    ok(!("formdata" in state), "valid CC numbers are not collected");
+  }
+
+  // Test that non-CC numbers are still collected.
+  for (let number of invalidCCNumbers) {
+    yield createAndRemoveTab(number);
+    let [{state: {formdata}}] = JSON.parse(ss.getClosedTabData(window));
+    is(formdata.id.txt, number,
+       "numbers that are not valid CC numbers are still collected");
+  }
+});
+
+function setInputValue(browser, formValue) {
+  return ContentTask.spawn(browser, formValue, function* (formValue) {
+    content.document.getElementById("txt").setUserInput(formValue);
+  });
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_formdata_format.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_formdata_format.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_formdata_format.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_formdata_format.js	2015-05-25 20:42:49.000000000 +0000
@@ -79,7 +79,7 @@
     yield promiseBrowserLoaded(tab.linkedBrowser);
     yield promiseTabState(tab, tabState);
 
-    TabState.flush(tab.linkedBrowser);
+    yield TabStateFlusher.flush(tab.linkedBrowser);
     let restoredTabState = JSON.parse(ss.getTabState(tab));
     let restoredFormData = restoredTabState.formdata;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_formdata.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_formdata.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_formdata.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_formdata.js	2015-05-25 20:42:49.000000000 +0000
@@ -130,7 +130,7 @@
   yield promiseTabRestored(tab);
 
   // Check that the input field has the right value.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
   ({formdata} = JSON.parse(ss.getTabState(tab)));
   is(JSON.stringify(formdata), JSON.stringify(FORM_DATA),
     "formdata for iframe restored correctly");
@@ -181,76 +181,6 @@
   gBrowser.removeTab(tab);
 });
 
-/**
- * This test ensures that credit card numbers in form data will not be
- * collected, while numbers that don't look like credit card numbers will
- * still be collected.
- */
-add_task(function test_ccNumbers() {
-  const validCCNumbers = [
-    // 15 digits
-    "930771457288760", "474915027480942",
-    "924894781317325", "714816113937185",
-    "790466087343106", "474320195408363",
-    "219211148122351", "633038472250799",
-    "354236732906484", "095347810189325",
-    // 16 digits
-    "3091269135815020", "5471839082338112",
-    "0580828863575793", "5015290610002932",
-    "9465714503078607", "4302068493801686",
-    "2721398408985465", "6160334316984331",
-    "8643619970075142", "0218246069710785"
-  ];
-
-  const invalidCCNumbers = [
-    // 15 digits
-    "526931005800649", "724952425140686",
-    "379761391174135", "030551436468583",
-    "947377014076746", "254848023655752",
-    "226871580283345", "708025346034339",
-    "917585839076788", "918632588027666",
-    // 16 digits
-    "9946177098017064", "4081194386488872",
-    "3095975979578034", "3662215692222536",
-    "6723210018630429", "4411962856225025",
-    "8276996369036686", "4449796938248871",
-    "3350852696538147", "5011802870046957"
-  ];
-
-  const URL = "http://mochi.test:8888/browser/browser/components/" +
-              "sessionstore/test/browser_formdata_sample.html";
-
-  // Creates a tab, loads a page with a form field, sets the value of the
-  // field, and then removes the tab to trigger data collection.
-  function* createAndRemoveTab(formValue) {
-    // Create a new tab.
-    let tab = gBrowser.addTab(URL);
-    let browser = tab.linkedBrowser;
-    yield promiseBrowserLoaded(browser);
-
-    // Set form value.
-    yield setInputValue(browser, {id: "txt", value: formValue});
-
-    // Remove the tab.
-    yield promiseRemoveTab(tab);
-  }
-
-  // Test that valid CC numbers are not collected.
-  for (let number of validCCNumbers) {
-    yield createAndRemoveTab(number);
-    let [{state}] = JSON.parse(ss.getClosedTabData(window));
-    ok(!("formdata" in state), "valid CC numbers are not collected");
-  }
-
-  // Test that non-CC numbers are still collected.
-  for (let number of invalidCCNumbers) {
-    yield createAndRemoveTab(number);
-    let [{state: {formdata}}] = JSON.parse(ss.getClosedTabData(window));
-    is(formdata.id.txt, number,
-       "numbers that are not valid CC numbers are still collected");
-  }
-});
-
 function getInputValue(browser, id) {
   return sendMessage(browser, "ss-test:getInputValue", {id: id});
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_formdata_xpath.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_formdata_xpath.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_formdata_xpath.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_formdata_xpath.js	2015-05-25 20:42:49.000000000 +0000
@@ -62,8 +62,8 @@
   }
 
   // Remove all tabs.
-  gBrowser.removeTab(tab2);
-  gBrowser.removeTab(tab);
+  yield promiseRemoveTab(tab2);
+  yield promiseRemoveTab(tab);
 
   // Restore one of the tabs again.
   tab = ss.undoCloseTab(window, 0);
@@ -81,7 +81,7 @@
   }
 
   // Cleanup.
-  gBrowser.removeTab(tab);
+  yield promiseRemoveTab(tab);
 });
 
 function createFilePath(leaf) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_history_persist.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_history_persist.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_history_persist.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_history_persist.js	2015-05-25 20:42:49.000000000 +0000
@@ -14,7 +14,7 @@
   yield promiseBrowserLoaded(browser);
 
   // Retrieve the tab state.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
   let state = JSON.parse(ss.getTabState(tab));
   ok(!state.entries[0].persist, "Should have collected the persistence state");
   gBrowser.removeTab(tab);
@@ -51,7 +51,7 @@
   yield promiseBrowserLoaded(browser);
 
   // Retrieve the tab state.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
   let state = JSON.parse(ss.getTabState(tab));
   delete state.entries[0].persist;
   gBrowser.removeTab(tab);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser.ini firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser.ini	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser.ini	2015-05-25 20:42:49.000000000 +0000
@@ -65,6 +65,9 @@
 
 [browser_aboutPrivateBrowsing.js]
 [browser_aboutSessionRestore.js]
+[browser_async_duplicate_tab.js]
+[browser_async_flushes.js]
+run-if = e10s && crashreporter
 [browser_async_remove_tab.js]
 run-if = e10s
 [browser_attributes.js]
@@ -80,6 +83,7 @@
 [browser_form_restore_events.js]
 [browser_formdata.js]
 skip-if = buildapp == 'mulet'
+[browser_formdata_cc.js]
 [browser_formdata_format.js]
 [browser_formdata_xpath.js]
 [browser_frametree.js]
@@ -95,8 +99,6 @@
 [browser_restore_redirect.js]
 [browser_scrollPositions.js]
 [browser_sessionHistory.js]
-# Disabled because of bug 1077581
-skip-if = e10s
 [browser_sessionStorage.js]
 [browser_swapDocShells.js]
 skip-if = e10s # See bug 918634
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_label_and_icon.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_label_and_icon.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_label_and_icon.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_label_and_icon.js	2015-05-25 20:42:49.000000000 +0000
@@ -25,9 +25,9 @@
   yield promiseBrowserLoaded(browser);
 
   // Retrieve the tab state.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
   let state = ss.getTabState(tab);
-  gBrowser.removeTab(tab);
+  yield promiseRemoveTab(tab);
   browser = null;
 
   // Open a new tab to restore into.
@@ -40,5 +40,5 @@
   is(tab.label, "Gort! Klaatu barada nikto!", "label is set");
 
   // Cleanup.
-  gBrowser.removeTab(tab);
+  yield promiseRemoveTab(tab);
 });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_page_title.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_page_title.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_page_title.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_page_title.js	2015-05-25 20:42:49.000000000 +0000
@@ -22,11 +22,18 @@
   yield promiseBrowserLoaded(browser);
 
   // Flush to ensure we collected the initial title.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
 
   // Set a new title.
   yield ContentTask.spawn(browser, null, function* () {
-    content.document.title = "new title";
+    return new Promise(resolve => {
+      addEventListener("DOMTitleChanged", function onTitleChanged() {
+        removeEventListener("DOMTitleChanged", onTitleChanged);
+        resolve();
+      });
+
+      content.document.title = "new title";
+    });
   });
 
   // Remove the tab.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_privatetabs.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_privatetabs.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_privatetabs.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_privatetabs.js	2015-05-25 20:42:49.000000000 +0000
@@ -30,8 +30,8 @@
     yield promiseBrowserLoaded(tab2.linkedBrowser);
 
     info("Flush to make sure chrome received all data.");
-    TabState.flush(tab1.linkedBrowser);
-    TabState.flush(tab2.linkedBrowser);
+    yield TabStateFlusher.flush(tab1.linkedBrowser);
+    yield TabStateFlusher.flush(tab2.linkedBrowser);
 
     info("Checking out state");
     let state = yield promiseRecoveryFileContents();
@@ -79,7 +79,7 @@
   let tab = win.gBrowser.addTab("about:mozilla");
   let browser = tab.linkedBrowser;
   yield promiseBrowserLoaded(browser);
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
 
   // Check that we consider the tab as private.
   let state = JSON.parse(ss.getTabState(tab));
@@ -93,7 +93,7 @@
   tab = win.gBrowser.addTab("about:mozilla");
   browser = tab.linkedBrowser;
   yield promiseBrowserLoaded(browser);
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
 
   // Check that we consider the tab as private.
   state = JSON.parse(ss.getTabState(tab));
@@ -116,7 +116,7 @@
   let tab = win.gBrowser.addTab("about:mozilla");
   let browser = tab.linkedBrowser;
   yield promiseBrowserLoaded(browser);
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
 
   // Check that we consider the tab as private.
   let state = JSON.parse(ss.getTabState(tab));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_restore_redirect.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_restore_redirect.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_restore_redirect.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_restore_redirect.js	2015-05-25 20:42:49.000000000 +0000
@@ -18,7 +18,7 @@
 
   info("Restored tab");
 
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
   let data = TabState.collect(tab);
   is(data.entries.length, 1, "Should be one entry in session history");
   is(data.entries[0].url, TARGET, "Should be the right session history entry");
@@ -26,7 +26,7 @@
   ok(!("__SS_data" in browser), "Temporary restore data should have been cleared");
 
   // Cleanup.
-  gBrowser.removeTab(tab);
+  yield promiseRemoveTab(tab);
 });
 
 /**
@@ -57,7 +57,7 @@
 
   yield loadPromise;
 
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
   let data = TabState.collect(tab);
   is(data.entries.length, 1, "Should be one entry in session history");
   is(data.entries[0].url, TARGET, "Should be the right session history entry");
@@ -65,5 +65,5 @@
   ok(!("__SS_data" in browser), "Temporary restore data should have been cleared");
 
   // Cleanup.
-  gBrowser.removeTab(tab);
+  yield promiseRemoveTab(tab);
 });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_scrollPositions.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_scrollPositions.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_scrollPositions.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_scrollPositions.js	2015-05-25 20:42:49.000000000 +0000
@@ -26,7 +26,7 @@
 
   // Scroll down a little.
   yield sendMessage(browser, "ss-test:setScrollPosition", {x: SCROLL_X, y: SCROLL_Y});
-  checkScroll(tab, {scroll: SCROLL_STR}, "scroll is fine");
+  yield checkScroll(tab, {scroll: SCROLL_STR}, "scroll is fine");
 
   // Duplicate and check that the scroll position is restored.
   let tab2 = ss.duplicateTab(window, tab);
@@ -40,22 +40,22 @@
   // Check that reloading retains the scroll positions.
   browser2.reload();
   yield promiseBrowserLoaded(browser2);
-  checkScroll(tab2, {scroll: SCROLL_STR}, "reloading retains scroll positions");
+  yield checkScroll(tab2, {scroll: SCROLL_STR}, "reloading retains scroll positions");
 
   // Check that a force-reload resets scroll positions.
   browser2.reloadWithFlags(Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE);
   yield promiseBrowserLoaded(browser2);
-  checkScroll(tab2, null, "force-reload resets scroll positions");
+  yield checkScroll(tab2, null, "force-reload resets scroll positions");
 
   // Scroll back to the top and check that the position has been reset. We
   // expect the scroll position to be "null" here because there is no data to
   // be stored if the frame is in its default scroll position.
   yield sendMessage(browser, "ss-test:setScrollPosition", {x: 0, y: 0});
-  checkScroll(tab, null, "no scroll stored");
+  yield checkScroll(tab, null, "no scroll stored");
 
   // Cleanup.
-  gBrowser.removeTab(tab);
-  gBrowser.removeTab(tab2);
+  yield promiseRemoveTab(tab);
+  yield promiseRemoveTab(tab2);
 });
 
 /**
@@ -69,11 +69,11 @@
 
   // Scroll the first child frame down a little.
   yield sendMessage(browser, "ss-test:setScrollPosition", {x: SCROLL_X, y: SCROLL_Y, frame: 0});
-  checkScroll(tab, {children: [{scroll: SCROLL_STR}]}, "scroll is fine");
+  yield checkScroll(tab, {children: [{scroll: SCROLL_STR}]}, "scroll is fine");
 
   // Scroll the second child frame down a little.
   yield sendMessage(browser, "ss-test:setScrollPosition", {x: SCROLL2_X, y: SCROLL2_Y, frame: 1});
-  checkScroll(tab, {children: [{scroll: SCROLL_STR}, {scroll: SCROLL2_STR}]}, "scroll is fine");
+  yield checkScroll(tab, {children: [{scroll: SCROLL_STR}, {scroll: SCROLL2_STR}]}, "scroll is fine");
 
   // Duplicate and check that the scroll position is restored.
   let tab2 = ss.duplicateTab(window, tab);
@@ -91,20 +91,20 @@
   // Check that resetting one frame's scroll position removes it from the
   // serialized value.
   yield sendMessage(browser, "ss-test:setScrollPosition", {x: 0, y: 0, frame: 0});
-  checkScroll(tab, {children: [null, {scroll: SCROLL2_STR}]}, "scroll is fine");
+  yield checkScroll(tab, {children: [null, {scroll: SCROLL2_STR}]}, "scroll is fine");
 
   // Check the resetting all frames' scroll positions nulls the stored value.
   yield sendMessage(browser, "ss-test:setScrollPosition", {x: 0, y: 0, frame: 1});
-  checkScroll(tab, null, "no scroll stored");
+  yield checkScroll(tab, null, "no scroll stored");
 
   // Cleanup.
-  gBrowser.removeTab(tab);
-  gBrowser.removeTab(tab2);
+  yield promiseRemoveTab(tab);
+  yield promiseRemoveTab(tab2);
 });
 
-function checkScroll(tab, expected, msg) {
+function* checkScroll(tab, expected, msg) {
   let browser = tab.linkedBrowser;
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
 
   let scroll = JSON.parse(ss.getTabState(tab)).scroll || null;
   is(JSON.stringify(scroll), JSON.stringify(expected), msg);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_sessionHistory.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_sessionHistory.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_sessionHistory.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_sessionHistory.js	2015-05-25 20:42:49.000000000 +0000
@@ -43,7 +43,7 @@
   yield promiseBrowserLoaded(browser);
 
   // Check that we now have two shistory entries.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
   let {entries} = JSON.parse(ss.getTabState(tab));
   is(entries.length, 2, "there are two shistory entries");
 
@@ -51,7 +51,7 @@
   yield sendMessage(browser, "ss-test:purgeSessionHistory");
 
   // Check that we are left with a single shistory entry.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
   ({entries} = JSON.parse(ss.getTabState(tab)));
   is(entries.length, 1, "there is one shistory entry");
 
@@ -71,7 +71,7 @@
   yield promiseBrowserLoaded(browser);
 
   // Check that we start with a single shistory entry.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
   let {entries} = JSON.parse(ss.getTabState(tab));
   is(entries.length, 1, "there is one shistory entry");
 
@@ -80,7 +80,7 @@
   yield promiseContentMessage(browser, "ss-test:hashchange");
 
   // Check that we now have two shistory entries.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
   ({entries} = JSON.parse(ss.getTabState(tab)));
   is(entries.length, 2, "there are two shistory entries");
 
@@ -110,7 +110,7 @@
   is(browser.currentURI.spec, URL, "correct url after going back");
 
   // Check that loading from bfcache did invalidate shistory.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
   let {index} = JSON.parse(ss.getTabState(tab));
   is(index, 1, "first history entry is selected");
 
@@ -133,7 +133,7 @@
   yield promiseBrowserLoaded(browser);
 
   // Check that we have a single shistory entry.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
   let {entries} = JSON.parse(ss.getTabState(tab));
   is(entries.length, 1, "there is one shistory entry");
   is(entries[0].children.length, 1, "the entry has one child");
@@ -143,7 +143,7 @@
   yield promiseBrowserLoaded(browser, false /* don't ignore subframes */);
 
   // Check shistory.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
   ({entries} = JSON.parse(ss.getTabState(tab)));
   is(entries.length, 2, "there now are two shistory entries");
   is(entries[1].children.length, 1, "the second entry has one child");
@@ -157,7 +157,7 @@
   yield promiseContentMessage(browser, "ss-test:hashchange");
 
   // Check shistory.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
   ({entries} = JSON.parse(ss.getTabState(tab)));
   is(entries.length, 2, "there now are two shistory entries");
   is(entries[1].children.length, 1, "the second entry has one child");
@@ -176,7 +176,7 @@
   yield promiseBrowserLoaded(browser);
 
   // Check that we have a single shistory entry.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
   let {entries} = JSON.parse(ss.getTabState(tab));
   is(entries.length, 1, "there is one shistory entry");
   is(entries[0].url, "about:blank", "url is correct");
@@ -185,7 +185,7 @@
   yield promiseBrowserLoaded(browser);
 
   // Check that we have changed the history entry.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
   ({entries} = JSON.parse(ss.getTabState(tab)));
   is(entries.length, 1, "there is one shistory entry");
   is(entries[0].url, "about:robots", "url is correct");
@@ -204,7 +204,7 @@
   yield promiseBrowserLoaded(browser);
 
   // Check that we have a single shistory entry.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
   let {entries} = JSON.parse(ss.getTabState(tab));
   is(entries.length, 1, "there is one shistory entry");
   is(entries[0].url, "http://example.com/1", "url is correct");
@@ -214,7 +214,7 @@
   });
 
   // Check that we have added the history entry.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
   ({entries} = JSON.parse(ss.getTabState(tab)));
   is(entries.length, 2, "there is another shistory entry");
   is(entries[1].url, "http://example.com/test-entry/", "url is correct");
@@ -224,7 +224,7 @@
   });
 
   // Check that we have modified the history entry.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
   ({entries} = JSON.parse(ss.getTabState(tab)));
   is(entries.length, 2, "there is still two shistory entries");
   is(entries[1].url, "http://example.com/test-entry/test-entry2/", "url is correct");
@@ -250,7 +250,7 @@
   let browser = tab.linkedBrowser;
   yield promiseBrowserLoaded(browser);
 
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
   let {entries} = JSON.parse(ss.getTabState(tab));
 
   // Check the number of children.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_sessionStorage.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_sessionStorage.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_sessionStorage.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_sessionStorage.js	2015-05-25 20:42:49.000000000 +0000
@@ -21,7 +21,7 @@
   yield promiseBrowserLoaded(browser);
 
   // Flush to make sure chrome received all data.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
 
   let {storage} = JSON.parse(ss.getTabState(tab));
   is(storage["http://example.com"].test, INNER_VALUE,
@@ -31,7 +31,7 @@
 
   // Ensure that modifying sessionStore values works for the inner frame only.
   yield modifySessionStorage2(browser, {test: "modified1"});
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
 
   ({storage} = JSON.parse(ss.getTabState(tab)));
   is(storage["http://example.com"].test, "modified1",
@@ -42,7 +42,7 @@
   // Ensure that modifying sessionStore values works for both frames.
   yield modifySessionStorage(browser, {test: "modified"});
   yield modifySessionStorage2(browser, {test: "modified2"});
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
 
   ({storage} = JSON.parse(ss.getTabState(tab)));
   is(storage["http://example.com"].test, "modified2",
@@ -56,7 +56,7 @@
   yield promiseTabRestored(tab2);
 
   // Flush to make sure chrome received all data.
-  TabState.flush(browser2);
+  yield TabStateFlusher.flush(browser2);
 
   ({storage} = JSON.parse(ss.getTabState(tab2)));
   is(storage["http://example.com"].test, "modified2",
@@ -67,7 +67,7 @@
   // Ensure that the content script retains restored data
   // (by e.g. duplicateTab) and sends it along with new data.
   yield modifySessionStorage(browser2, {test: "modified3"});
-  TabState.flush(browser2);
+  yield TabStateFlusher.flush(browser2);
 
   ({storage} = JSON.parse(ss.getTabState(tab2)));
   is(storage["http://example.com"].test, "modified2",
@@ -78,7 +78,7 @@
   // Check that loading a new URL discards data.
   browser2.loadURI("http://mochi.test:8888/");
   yield promiseBrowserLoaded(browser2);
-  TabState.flush(browser2);
+  yield TabStateFlusher.flush(browser2);
 
   ({storage} = JSON.parse(ss.getTabState(tab2)));
   is(storage["http://mochi.test:8888"].test, "modified3",
@@ -88,14 +88,14 @@
   // Check that loading a new URL discards data.
   browser2.loadURI("about:mozilla");
   yield promiseBrowserLoaded(browser2);
-  TabState.flush(browser2);
+  yield TabStateFlusher.flush(browser2);
 
   let state = JSON.parse(ss.getTabState(tab2));
   ok(!state.hasOwnProperty("storage"), "storage data was discarded");
 
   // Clean up.
-  gBrowser.removeTab(tab);
-  gBrowser.removeTab(tab2);
+  yield promiseRemoveTab(tab);
+  yield promiseRemoveTab(tab2);
 });
 
 /**
@@ -111,7 +111,7 @@
   yield purgeDomainData(browser, "mochi.test");
 
   // Flush to make sure chrome received all data.
-  TabState.flush(browser);
+  yield TabStateFlusher.flush(browser);
 
   let {storage} = JSON.parse(ss.getTabState(tab));
   ok(!storage["http://mochi.test:8888"],
@@ -119,7 +119,7 @@
   is(storage["http://example.com"].test, INNER_VALUE,
     "sessionStorage data for example.com has been preserved");
 
-  gBrowser.removeTab(tab);
+  yield promiseRemoveTab(tab);
 });
 
 /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_swapDocShells.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_swapDocShells.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/browser_swapDocShells.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/browser_swapDocShells.js	2015-05-25 20:42:49.000000000 +0000
@@ -1,25 +1,21 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
 
-function test() {
-  waitForExplicitFinish();
+add_task(function* () {
+  let tab = gBrowser.selectedTab = gBrowser.addTab("about:mozilla");
+  yield promiseBrowserLoaded(gBrowser.selectedBrowser);
 
-  Task.spawn(function task() {
-    let tab = gBrowser.selectedTab = gBrowser.addTab("about:mozilla");
-    yield promiseBrowserLoaded(gBrowser.selectedBrowser);
-
-    let win = gBrowser.replaceTabWithWindow(tab);
-    yield promiseDelayedStartupFinished(win);
-    yield promiseBrowserHasURL(win.gBrowser.browsers[0], "about:mozilla");
-
-    win.duplicateTabIn(win.gBrowser.selectedTab, "tab");
-    let browser = win.gBrowser.browsers[1];
-    yield promiseBrowserLoaded(browser);
-    is(browser.currentURI.spec, "about:mozilla", "tab was duplicated");
-
-    win.close();
-  }).then(finish);
-}
+  let win = gBrowser.replaceTabWithWindow(tab);
+  yield promiseDelayedStartupFinished(win);
+  yield promiseBrowserHasURL(win.gBrowser.browsers[0], "about:mozilla");
+
+  win.duplicateTabIn(win.gBrowser.selectedTab, "tab");
+  yield promiseTabRestored(win.gBrowser.tabs[1]);
+
+  let browser = win.gBrowser.browsers[1];
+  is(browser.currentURI.spec, "about:mozilla", "tab was duplicated");
+
+  yield promiseWindowClosed(win);
+});
 
 function promiseDelayedStartupFinished(win) {
   let deferred = Promise.defer();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/head.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/sessionstore/test/head.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/sessionstore/test/head.js	2015-05-25 20:42:49.000000000 +0000
@@ -25,16 +25,14 @@
   }
 });
 
-let tmp = {};
-Cu.import("resource://gre/modules/Promise.jsm", tmp);
-Cu.import("resource://gre/modules/Task.jsm", tmp);
-Cu.import("resource:///modules/sessionstore/SessionStore.jsm", tmp);
-Cu.import("resource:///modules/sessionstore/SessionSaver.jsm", tmp);
-Cu.import("resource:///modules/sessionstore/SessionFile.jsm", tmp);
-Cu.import("resource:///modules/sessionstore/TabState.jsm", tmp);
-let {Promise, Task, SessionStore, SessionSaver, SessionFile, TabState} = tmp;
+const {Promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const {SessionStore} = Cu.import("resource:///modules/sessionstore/SessionStore.jsm", {});
+const {SessionSaver} = Cu.import("resource:///modules/sessionstore/SessionSaver.jsm", {});
+const {SessionFile} = Cu.import("resource:///modules/sessionstore/SessionFile.jsm", {});
+const {TabState} = Cu.import("resource:///modules/sessionstore/TabState.jsm", {});
+const {TabStateFlusher} = Cu.import("resource:///modules/sessionstore/TabStateFlusher.jsm", {});
 
-let ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
+const ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
 
 // Some tests here assume that all restored tabs are loaded without waiting for
 // the user to bring them to the foreground. We ensure this by resetting the
@@ -533,3 +531,109 @@
 function promiseRemoveTab(tab) {
   return BrowserTestUtils.removeTab(tab);
 }
+
+/**
+ * Returns a Promise that resolves once a remote <xul:browser> has experienced
+ * a crash. Also does the job of cleaning up the minidump of the crash.
+ *
+ * @param browser
+ *        The <xul:browser> that will crash
+ * @return Promise
+ */
+function crashBrowser(browser) {
+  /**
+   * Returns the directory where crash dumps are stored.
+   *
+   * @return nsIFile
+   */
+  function getMinidumpDirectory() {
+    let dir = Services.dirsvc.get('ProfD', Ci.nsIFile);
+    dir.append("minidumps");
+    return dir;
+  }
+
+  /**
+   * Removes a file from a directory. This is a no-op if the file does not
+   * exist.
+   *
+   * @param directory
+   *        The nsIFile representing the directory to remove from.
+   * @param filename
+   *        A string for the file to remove from the directory.
+   */
+  function removeFile(directory, filename) {
+    let file = directory.clone();
+    file.append(filename);
+    if (file.exists()) {
+      file.remove(false);
+    }
+  }
+
+  // This frame script is injected into the remote browser, and used to
+  // intentionally crash the tab. We crash by using js-ctypes and dereferencing
+  // a bad pointer. The crash should happen immediately upon loading this
+  // frame script.
+  let frame_script = () => {
+    const Cu = Components.utils;
+    Cu.import("resource://gre/modules/ctypes.jsm");
+
+    let dies = function() {
+      privateNoteIntentionalCrash();
+      let zero = new ctypes.intptr_t(8);
+      let badptr = ctypes.cast(zero, ctypes.PointerType(ctypes.int32_t));
+      badptr.contents
+    };
+
+    dump("Et tu, Brute?");
+    dies();
+  }
+
+  let crashCleanupPromise = new Promise((resolve, reject) => {
+    let observer = (subject, topic, data) => {
+      is(topic, 'ipc:content-shutdown', 'Received correct observer topic.');
+      ok(subject instanceof Ci.nsIPropertyBag2,
+         'Subject implements nsIPropertyBag2.');
+      // we might see this called as the process terminates due to previous tests.
+      // We are only looking for "abnormal" exits...
+      if (!subject.hasKey("abnormal")) {
+        info("This is a normal termination and isn't the one we are looking for...");
+        return;
+      }
+
+      let dumpID;
+      if ('nsICrashReporter' in Ci) {
+        dumpID = subject.getPropertyAsAString('dumpID');
+        ok(dumpID, "dumpID is present and not an empty string");
+      }
+
+      if (dumpID) {
+        let minidumpDirectory = getMinidumpDirectory();
+        removeFile(minidumpDirectory, dumpID + '.dmp');
+        removeFile(minidumpDirectory, dumpID + '.extra');
+      }
+
+      Services.obs.removeObserver(observer, 'ipc:content-shutdown');
+      info("Crash cleaned up");
+      resolve();
+    };
+
+    Services.obs.addObserver(observer, 'ipc:content-shutdown');
+  });
+
+  let aboutTabCrashedLoadPromise = new Promise((resolve, reject) => {
+    browser.addEventListener("AboutTabCrashedLoad", function onCrash() {
+      browser.removeEventListener("AboutTabCrashedLoad", onCrash, false);
+      info("about:tabcrashed loaded");
+      resolve();
+    }, false, true);
+  });
+
+  // This frame script will crash the remote browser as soon as it is
+  // evaluated.
+  let mm = browser.messageManager;
+  mm.loadFrameScript("data:,(" + frame_script.toString() + ")();", false);
+  return Promise.all([crashCleanupPromise, aboutTabCrashedLoadPromise]).then(() => {
+    let tab = gBrowser.getTabForBrowser(browser);
+    is(tab.getAttribute("crashed"), "true", "Tab should be marked as crashed");
+  });
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/tabview/test/browser_tabview_bug706430.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/tabview/test/browser_tabview_bug706430.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/tabview/test/browser_tabview_bug706430.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/tabview/test/browser_tabview_bug706430.js	2015-05-25 20:42:50.000000000 +0000
@@ -1,16 +1,18 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+"use strict";
+
 let state1 = {
   windows: [{
     tabs: [{
-      entries: [{ url: "about:blank#1" }],
+      entries: [{ url: "about:robots#1" }],
       hidden: true,
-      extData: {"tabview-tab": '{"url":"about:blank#1","groupID":1,"bounds":{"left":120,"top":20,"width":20,"height":20}}'}
+      extData: {"tabview-tab": '{"url":"about:robots#1","groupID":1,"bounds":{"left":120,"top":20,"width":20,"height":20}}'}
     },{
-      entries: [{ url: "about:blank#2" }],
+      entries: [{ url: "about:robots#2" }],
       hidden: false,
-      extData: {"tabview-tab": '{"url":"about:blank#2","groupID":2,"bounds":{"left":20,"top":20,"width":20,"height":20}}'},
+      extData: {"tabview-tab": '{"url":"about:robots#2","groupID":2,"bounds":{"left":20,"top":20,"width":20,"height":20}}'},
     }],
     selected: 2,
     extData: {
@@ -24,8 +26,8 @@
 
 let state2 = {
   windows: [{
-    tabs: [{entries: [{ url: "about:blank#1" }], hidden: true},
-           {entries: [{ url: "about:blank#2" }], hidden: false}],
+    tabs: [{entries: [{ url: "about:robots#1" }], hidden: true},
+           {entries: [{ url: "about:robots#2" }], hidden: false}],
     selected: 2
   }]
 };
@@ -44,8 +46,8 @@
       let [group1, group2] = cw.GroupItems.groupItems;
       let [tab1, tab2] = win.gBrowser.tabs;
 
-      checkUrl(group1.getChild(0), "about:blank#1", "tab1 is in first group");
-      checkUrl(group2.getChild(0), "about:blank#2", "tab2 is in second group");
+      checkUrl(group1.getChild(0), "about:robots#1", "tab1 is in first group");
+      checkUrl(group2.getChild(0), "about:robots#2", "tab2 is in second group");
 
       whenWindowStateReady(win, function () {
         let groups = cw.GroupItems.groupItems;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/test/browser_bug538331.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/test/browser_bug538331.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/test/browser_bug538331.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/test/browser_bug538331.js	2015-05-25 20:42:50.000000000 +0000
@@ -303,8 +303,7 @@
 // _showUpdateNotification in nsBrowserGlue.js
 function testShowNotification()
 {
-  let gTestBrowser = gBrowser.selectedBrowser;
-  let notifyBox = gBrowser.getNotificationBox(gTestBrowser);
+  let notifyBox = document.getElementById("high-priority-global-notificationbox");
 
   // Catches any windows opened by these tests (e.g. alert windows) and closes
   // them
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/uitour/test/browser_UITour2.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/uitour/test/browser_UITour2.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/uitour/test/browser_UITour2.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/uitour/test/browser_UITour2.js	2015-05-25 20:42:51.000000000 +0000
@@ -70,7 +70,7 @@
   taskify(function* test_bookmarks_menu() {
     let bookmarksMenuButton = document.getElementById("bookmarks-menu-button");
 
-    ise(bookmarksMenuButton.open, false, "Menu should initially be closed");
+    is(bookmarksMenuButton.open, false, "Menu should initially be closed");
     gContentAPI.showMenu("bookmarks");
 
     yield waitForConditionPromise(() => {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/uitour/test/browser_UITour_annotation_size_attributes.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/uitour/test/browser_UITour_annotation_size_attributes.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/uitour/test/browser_UITour_annotation_size_attributes.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/uitour/test/browser_UITour_annotation_size_attributes.js	2015-05-25 20:42:51.000000000 +0000
@@ -26,8 +26,8 @@
       gContentAPI.showHighlight("urlbar");
       waitForElementToBeVisible(highlight, function checkPanelAttributes() {
         SimpleTest.executeSoon(() => {
-          ise(highlight.height, "", "Highlight panel should have no explicit height set");
-          ise(highlight.width, "", "Highlight panel should have no explicit width set");
+          is(highlight.height, "", "Highlight panel should have no explicit height set");
+          is(highlight.width, "", "Highlight panel should have no explicit width set");
           done();
         });
       }, "Highlight should be moved to the urlbar");
@@ -40,8 +40,8 @@
       gContentAPI.showInfo("urlbar", "new title", "new text");
       waitForElementToBeVisible(tooltip, function checkPanelAttributes() {
         SimpleTest.executeSoon(() => {
-          ise(tooltip.height, "", "Info panel should have no explicit height set");
-          ise(tooltip.width, "", "Info panel should have no explicit width set");
+          is(tooltip.height, "", "Info panel should have no explicit height set");
+          is(tooltip.width, "", "Info panel should have no explicit width set");
           done();
         });
       }, "Tooltip should be moved to the urlbar");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/uitour/test/browser_UITour.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/uitour/test/browser_UITour.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/uitour/test/browser_UITour.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/uitour/test/browser_UITour.js	2015-05-25 20:42:51.000000000 +0000
@@ -17,10 +17,10 @@
   function test_untrusted_host(done) {
     loadUITourTestPage(function() {
       let bookmarksMenu = document.getElementById("bookmarks-menu-button");
-      ise(bookmarksMenu.open, false, "Bookmark menu should initially be closed");
+      is(bookmarksMenu.open, false, "Bookmark menu should initially be closed");
 
       gContentAPI.showMenu("bookmarks");
-      ise(bookmarksMenu.open, false, "Bookmark menu should not open on a untrusted host");
+      is(bookmarksMenu.open, false, "Bookmark menu should not open on a untrusted host");
 
       done();
     }, "http://mochi.test:8888/");
@@ -45,10 +45,10 @@
   function test_unsecure_host(done) {
     loadUITourTestPage(function() {
       let bookmarksMenu = document.getElementById("bookmarks-menu-button");
-      ise(bookmarksMenu.open, false, "Bookmark menu should initially be closed");
+      is(bookmarksMenu.open, false, "Bookmark menu should initially be closed");
 
       gContentAPI.showMenu("bookmarks");
-      ise(bookmarksMenu.open, false, "Bookmark menu should not open on a unsecure host");
+      is(bookmarksMenu.open, false, "Bookmark menu should not open on a unsecure host");
 
       done();
     }, "http://example.com/");
@@ -69,10 +69,10 @@
     Services.prefs.setBoolPref("browser.uitour.enabled", false);
 
     let bookmarksMenu = document.getElementById("bookmarks-menu-button");
-    ise(bookmarksMenu.open, false, "Bookmark menu should initially be closed");
+    is(bookmarksMenu.open, false, "Bookmark menu should initially be closed");
 
     gContentAPI.showMenu("bookmarks");
-    ise(bookmarksMenu.open, false, "Bookmark menu should not open when feature is disabled");
+    is(bookmarksMenu.open, false, "Bookmark menu should not open when feature is disabled");
 
     Services.prefs.setBoolPref("browser.uitour.enabled", true);
     done();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/uitour/test/browser_UITour_loop.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/uitour/test/browser_UITour_loop.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/uitour/test/browser_UITour_loop.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/uitour/test/browser_UITour_loop.js	2015-05-25 20:42:51.000000000 +0000
@@ -31,7 +31,7 @@
   taskify(function* test_gettingStartedClicked_linkOpenedWithExpectedParams() {
     Services.prefs.setBoolPref("loop.gettingStarted.seen", false);
     Services.prefs.setCharPref("loop.gettingStarted.url", "http://example.com");
-    ise(loopButton.open, false, "Menu should initially be closed");
+    is(loopButton.open, false, "Menu should initially be closed");
     loopButton.click();
 
     yield waitForConditionPromise(() => {
@@ -69,7 +69,7 @@
 
     UITour.pageIDsForSession.clear();
     Services.prefs.setCharPref("loop.gettingStarted.url", "http://example.com");
-    ise(loopButton.open, false, "Menu should initially be closed");
+    is(loopButton.open, false, "Menu should initially be closed");
     loopButton.click();
 
     yield waitForConditionPromise(() => {
@@ -106,7 +106,7 @@
   taskify(function* test_menu_show_hide() {
     // The targets to highlight only appear after getting started is launched.
     Services.prefs.setBoolPref("loop.gettingStarted.seen", true);
-    ise(loopButton.open, false, "Menu should initially be closed");
+    is(loopButton.open, false, "Menu should initially be closed");
     gContentAPI.showMenu("loop");
 
     yield waitForConditionPromise(() => {
@@ -301,7 +301,7 @@
     LoopRooms.open("fakeTourRoom");
   }),
   taskify(function* test_arrow_panel_position() {
-    ise(loopButton.open, false, "Menu should initially be closed");
+    is(loopButton.open, false, "Menu should initially be closed");
     let popup = document.getElementById("UITourTooltip");
 
     yield showMenuPromise("loop");
@@ -344,7 +344,7 @@
     let observationPromise = new Promise((resolve) => {
       gContentAPI.observe((event, params) => {
         is(event, "Loop:IncomingConversation", "Page should have been notified about incoming conversation");
-        ise(params.conversationOpen, false, "conversationOpen should be false");
+        is(params.conversationOpen, false, "conversationOpen should be false");
         is(gBrowser.selectedTab, gTestTab, "The same tab should be selected");
         resolve();
       });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/uitour/test/browser_UITour_pocket.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/uitour/test/browser_UITour_pocket.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/uitour/test/browser_UITour_pocket.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/uitour/test/browser_UITour_pocket.js	2015-05-25 20:42:51.000000000 +0000
@@ -16,7 +16,7 @@
 
 let tests = [
   taskify(function* test_menu_show_navbar() {
-    ise(button.open, false, "Menu should initially be closed");
+    is(button.open, false, "Menu should initially be closed");
     gContentAPI.showMenu("pocket");
 
     // The panel gets created dynamically.
@@ -36,7 +36,7 @@
   taskify(function* test_menu_show_appMenu() {
     CustomizableUI.addWidgetToArea("pocket-button", CustomizableUI.AREA_PANEL);
 
-    ise(PanelUI.multiView.hasAttribute("panelopen"), false, "Multiview should initially be closed");
+    is(PanelUI.multiView.hasAttribute("panelopen"), false, "Multiview should initially be closed");
     gContentAPI.showMenu("pocket");
 
     yield waitForConditionPromise(() => {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/components/uitour/test/browser_UITour_sync.js firefox-trunk-41.0~a1~hg20150524r245419/browser/components/uitour/test/browser_UITour_sync.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/components/uitour/test/browser_UITour_sync.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/components/uitour/test/browser_UITour_sync.js	2015-05-25 20:42:51.000000000 +0000
@@ -50,9 +50,9 @@
       tabBrowser.addEventListener("load", function onload(evt) {
         tabBrowser.removeEventListener("load", onload, true);
 
-        ise(tabBrowser.contentDocument.location.href,
-            "about:accounts?action=signup&entrypoint=uitour",
-            "about:accounts should have replaced the tab");
+        is(tabBrowser.contentDocument.location.href,
+           "about:accounts?action=signup&entrypoint=uitour",
+           "about:accounts should have replaced the tab");
 
         // the iframe in about:accounts will still be loading, so we stop
         // that before resetting the pref.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/config/mozconfigs/linux32/valgrind firefox-trunk-41.0~a1~hg20150524r245419/browser/config/mozconfigs/linux32/valgrind
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/config/mozconfigs/linux32/valgrind	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/config/mozconfigs/linux32/valgrind	2015-05-25 20:42:51.000000000 +0000
@@ -5,7 +5,6 @@
 
 ac_add_options --enable-valgrind
 ac_add_options --disable-jemalloc
-ac_add_options --enable-optimize="-g -O -freorder-blocks"
 ac_add_options --disable-install-strip
 
 # Include the override mozconfig again (even though the above includes it)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/config/mozconfigs/linux64/valgrind firefox-trunk-41.0~a1~hg20150524r245419/browser/config/mozconfigs/linux64/valgrind
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/config/mozconfigs/linux64/valgrind	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/config/mozconfigs/linux64/valgrind	2015-05-25 20:42:51.000000000 +0000
@@ -5,7 +5,6 @@
 
 ac_add_options --enable-valgrind
 ac_add_options --disable-jemalloc
-ac_add_options --enable-optimize="-g -O -freorder-blocks"
 ac_add_options --disable-install-strip
 
 # Include the override mozconfig again (even though the above includes it)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/confvars.sh firefox-trunk-41.0~a1~hg20150524r245419/browser/confvars.sh
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/confvars.sh	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/confvars.sh	2015-05-25 20:42:51.000000000 +0000
@@ -67,3 +67,13 @@
 MOZ_ACTIVITIES=1
 MOZ_JSDOWNLOADS=1
 MOZ_WEBM_ENCODER=1
+
+# Enable checking that add-ons are signed by the trusted root
+MOZ_ADDON_SIGNING=1
+if test "$MOZ_OFFICIAL_BRANDING"; then
+  if test "$MOZ_UPDATE_CHANNEL" = "beta" -o \
+          "$MOZ_UPDATE_CHANNEL" = "release" -o \
+          "$MOZ_UPDATE_CHANNEL" = "esr"; then
+    MOZ_REQUIRE_SIGNING=1
+  fi
+fi
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/canvasdebugger/snapshotslist.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/canvasdebugger/snapshotslist.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/canvasdebugger/snapshotslist.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/canvasdebugger/snapshotslist.js	2015-05-25 20:42:52.000000000 +0000
@@ -359,17 +359,13 @@
       return;
     }
 
-    let channel = NetUtil.newChannel2(fp.file,
-                                      null,
-                                      null,
-                                      window.document,
-                                      null, // aLoadingPrincipal
-                                      null, // aTriggeringPrincipal
-                                      Ci.nsILoadInfo.SEC_NORMAL,
-                                      Ci.nsIContentPolicy.TYPE_OTHER);
+    let channel = NetUtil.newChannel({
+      uri: NetUtil.newURI(fp.file),
+      loadingNode: window.document,
+      contentPolicyType: Ci.nsIContentPolicy.TYPE_OTHER});
     channel.contentType = "text/plain";
 
-    NetUtil.asyncFetch2(channel, (inputStream, status) => {
+    NetUtil.asyncFetch(channel, (inputStream, status) => {
       if (!Components.isSuccessCode(status)) {
         console.error("Could not import recorded animation frame snapshot file.");
         return;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/debugger-controller.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/debugger-controller.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/debugger-controller.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/debugger-controller.js	2015-05-25 20:42:52.000000000 +0000
@@ -690,9 +690,7 @@
       let { depth, source, where: { line } } = frame;
 
       let isBlackBoxed = source ? this.activeThread.source(source).isBlackBoxed : false;
-      let location = NetworkHelper.convertToUnicode(unescape(source.url || source.introductionUrl));
-      let title = StackFrameUtils.getFrameTitle(frame);
-      DebuggerView.StackFrames.addFrame(title, location, line, depth, isBlackBoxed);
+      DebuggerView.StackFrames.addFrame(frame, line, depth, isBlackBoxed);
     }
 
     DebuggerView.StackFrames.selectedDepth = Math.max(this.currentFrameDepth, 0);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/debugger-view.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/debugger-view.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/debugger-view.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/debugger-view.js	2015-05-25 20:42:52.000000000 +0000
@@ -422,7 +422,8 @@
       deferred.resolve([aSource, aText, aContentType]);
     },
     ([, aError]) => {
-      let msg = L10N.getStr("errorLoadingText") + DevToolsUtils.safeErrorString(aError);
+      let url = aError;
+      let msg = L10N.getFormatStr("errorLoadingText2", url);
       this._setEditorText(msg);
       Cu.reportError(msg);
       dumpn(msg);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/browser_dbg_break-in-anon.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/browser_dbg_break-in-anon.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/browser_dbg_break-in-anon.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/browser_dbg_break-in-anon.js	2015-05-25 20:42:52.000000000 +0000
@@ -0,0 +1,40 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Make sure anonymous eval scripts can still break with a `debugger`
+ * statement
+ */
+
+const TAB_URL = EXAMPLE_URL + "doc_script-eval.html";
+
+function test() {
+  let gTab, gPanel, gDebugger;
+  let gSources, gBreakpoints;
+
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
+    gTab = aTab;
+    gPanel = aPanel;
+    gDebugger = gPanel.panelWin;
+    gSources = gDebugger.DebuggerView.Sources;
+    gBreakpoints = gDebugger.DebuggerController.Breakpoints;
+
+    return Task.spawn(function*() {
+      yield waitForSourceShown(gPanel, "-eval.js");
+      is(gSources.values.length, 1, "Should have 1 source");
+
+      let hasFrames = waitForDebuggerEvents(gPanel, gDebugger.EVENTS.AFTER_FRAMES_REFILLED);
+      callInTab(gTab, "evalSourceWithDebugger");
+      yield hasFrames;
+
+      is(gSources.values.length, 2, "Should have 2 sources");
+
+      let item = gSources.getItemForAttachment(e => e.label.indexOf("SCRIPT") === 0);
+      ok(item, "Source label is incorrect.");
+      is(item.attachment.group, gDebugger.L10N.getStr('anonymousSourcesLabel'),
+         'Source group is incorrect');
+
+      yield resumeDebuggerThenCloseAndFinish(gPanel);
+    });
+  });
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/browser_dbg_on-pause-raise.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/browser_dbg_on-pause-raise.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/browser_dbg_on-pause-raise.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/browser_dbg_on-pause-raise.js	2015-05-25 20:42:53.000000000 +0000
@@ -62,9 +62,10 @@
     "Main window is the top level window before pause.");
 
   if (gToolbox.hostType == devtools.Toolbox.HostType.WINDOW) {
-    gToolbox._host._window.onfocus = () => {
+    gToolbox._host._window.addEventListener("focus", function onFocus() {
+      gToolbox._host._window.removeEventListener("focus", onFocus, true);
       gFocusedWindow = gToolbox._host._window;
-    };
+    }, true);
   }
 
   gDebugger.gThreadClient.addOneTimeListener("paused", () => {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/browser_dbg_scripts-switching-03.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/browser_dbg_scripts-switching-03.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/browser_dbg_scripts-switching-03.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/browser_dbg_scripts-switching-03.js	2015-05-25 20:42:53.000000000 +0000
@@ -36,7 +36,7 @@
 }
 
 function testDebuggerLoadingError() {
-  ok(gEditor.getText().includes(gL10N.getStr("errorLoadingText")),
+  ok(gEditor.getText().includes(gL10N.getFormatStr("errorLoadingText2", "noSuchActor")),
     "The valid error loading message is displayed.");
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/browser_dbg_stack-02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/browser_dbg_stack-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/browser_dbg_stack-02.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/browser_dbg_stack-02.js	2015-05-25 20:42:53.000000000 +0000
@@ -41,7 +41,7 @@
   is(gFrames.getItemAtIndex(1).attachment.title,
     "(eval)", "Newest frame name should be correct.");
   is(gFrames.getItemAtIndex(1).attachment.url,
-     TAB_URL, "Newest frame url should be correct.");
+     'SCRIPT0', "Newest frame url should be correct.");
   is(gClassicFrames.getItemAtIndex(1).attachment.depth,
     1, "Newest frame name is mirrored correctly.");
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/browser_dbg_watch-expressions-01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/browser_dbg_watch-expressions-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/browser_dbg_watch-expressions-01.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/browser_dbg_watch-expressions-01.js	2015-05-25 20:42:53.000000000 +0000
@@ -108,9 +108,7 @@
   function addAndCheckCustomExpression(aTotal, aIndex, aString, noBlur) {
     addAndCheckExpressions(aTotal, aIndex, "", true);
 
-    for (let i = 0; i < aString.length; i++) {
-      EventUtils.sendChar(aString[i], gDebugger);
-    }
+    EventUtils.sendString(aString, gDebugger);
 
     gEditor.focus();
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/browser_dbg_WorkerActor.attach.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/browser_dbg_WorkerActor.attach.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/browser_dbg_WorkerActor.attach.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/browser_dbg_WorkerActor.attach.js	2015-05-25 20:42:52.000000000 +0000
@@ -0,0 +1,63 @@
+let MAX_TOTAL_VIEWERS = "browser.sessionhistory.max_total_viewers";
+
+let TAB1_URL = EXAMPLE_URL + "doc_WorkerActor.attach-tab1.html";
+let TAB2_URL = EXAMPLE_URL + "doc_WorkerActor.attach-tab2.html";
+let WORKER1_URL = "code_WorkerActor.attach-worker1.js";
+let WORKER2_URL = "code_WorkerActor.attach-worker2.js";
+
+function test() {
+  Task.spawn(function* () {
+    let oldMaxTotalViewers = SpecialPowers.getIntPref(MAX_TOTAL_VIEWERS);
+    SpecialPowers.setIntPref(MAX_TOTAL_VIEWERS, 10);
+
+    DebuggerServer.init();
+    DebuggerServer.addBrowserActors();
+
+    let client = new DebuggerClient(DebuggerServer.connectPipe());
+    yield connect(client);
+
+    let tab = yield addTab(TAB1_URL);
+    let { tabs } = yield listTabs(client);
+    let [, tabClient] = yield attachTab(client, findTab(tabs, TAB1_URL));
+    yield listWorkers(tabClient);
+
+    // If a page still has pending network requests, it will not be moved into
+    // the bfcache. Consequently, we cannot use waitForWorkerListChanged here,
+    // because the worker is not guaranteed to have finished loading when it is
+    // registered. Instead, we have to wait for the promise returned by
+    // createWorker in the tab to be resolved.
+    yield createWorkerInTab(tab, WORKER1_URL);
+
+    let { workers } = yield listWorkers(tabClient);
+    let [, workerClient1] = yield attachWorker(tabClient,
+                                               findWorker(workers, WORKER1_URL));
+    is(workerClient1.isFrozen, false);
+
+    executeSoon(() => {
+      tab.linkedBrowser.loadURI(TAB2_URL);
+    });
+    yield waitForWorkerFreeze(workerClient1);
+    is(workerClient1.isFrozen, true, "worker should be frozen");
+
+    yield createWorkerInTab(tab, WORKER2_URL);
+    ({ workers } = yield listWorkers(tabClient));
+    let [, workerClient2] = yield attachWorker(tabClient,
+                                               findWorker(workers, WORKER2_URL));
+    is(workerClient2.isFrozen, false);
+
+    executeSoon(() => {
+      tab.linkedBrowser.contentWindow.history.back();
+    });
+    yield Promise.all([
+      waitForWorkerFreeze(workerClient2),
+      waitForWorkerThaw(workerClient1)
+    ]);
+
+    terminateWorkerInTab(tab, WORKER1_URL);
+    yield waitForWorkerClose(workerClient1);
+
+    yield close(client);
+    SpecialPowers.setIntPref(MAX_TOTAL_VIEWERS, oldMaxTotalViewers);
+    finish();
+  });
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/browser.ini firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/browser.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/browser.ini	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/browser.ini	2015-05-25 20:42:52.000000000 +0000
@@ -43,6 +43,8 @@
   code_ugly-7.js
   code_ugly-8
   code_ugly-8^headers^
+  code_WorkerActor.attach-worker1.js
+  code_WorkerActor.attach-worker2.js
   doc_auto-pretty-print-01.html
   doc_auto-pretty-print-02.html
   doc_binary_search.html
@@ -103,6 +105,8 @@
   doc_watch-expressions.html
   doc_watch-expression-button.html
   doc_with-frame.html
+  doc_WorkerActor.attach-tab1.html
+  doc_WorkerActor.attach-tab2.html
   head.js
   sjs_random-javascript.sjs
   testactors.js
@@ -129,6 +133,7 @@
 [browser_dbg_blackboxing-05.js]
 [browser_dbg_blackboxing-06.js]
 [browser_dbg_breadcrumbs-access.js]
+[browser_dbg_break-in-anon.js]
 [browser_dbg_break-on-dom-01.js]
 [browser_dbg_break-on-dom-02.js]
 [browser_dbg_break-on-dom-03.js]
@@ -555,3 +560,5 @@
 skip-if = e10s && debug
 [browser_dbg_watch-expressions-02.js]
 skip-if = e10s && debug
+[browser_dbg_WorkerActor.attach.js]
+skip-if = e10s && debug
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/code_frame-script.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/code_frame-script.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/code_frame-script.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/code_frame-script.js	2015-05-25 20:42:53.000000000 +0000
@@ -13,8 +13,14 @@
   dump("Calling function with name " + message.data.name + ".\n");
 
   let data = message.data;
-  XPCNativeWrapper.unwrap(content)[data.name].apply(undefined, data.args);
-  sendAsyncMessage("test:call");
+  let result = XPCNativeWrapper.unwrap(content)[data.name].apply(undefined, data.args);
+  if (result && result.then) {
+    result.then(() => {
+      sendAsyncMessage("test:call");
+    });
+  } else {
+    sendAsyncMessage("test:call");
+  }
 });
 
 addMessageListener("test:click", function (message) {
@@ -28,6 +34,34 @@
 addMessageListener("test:eval", function (message) {
   dump("Evalling string " + message.data.string + ".\n");
 
-  content.eval(message.data.string);
-  sendAsyncMessage("test:eval");
+  let result = content.eval(message.data.string);
+  if (result.then) {
+    result.then(() => {
+      sendAsyncMessage("test:eval");
+    });
+  } else {
+    sendAsyncMessage("test:eval");
+  }
+});
+
+let workers = {}
+
+addMessageListener("test:createWorker", function (message) {
+  dump("Creating worker with url '" + message.data.url + "'.\n");
+
+  let url = message.data.url;
+  let worker = new content.Worker(message.data.url);
+  worker.addEventListener("message", function listener() {
+    worker.removeEventListener("message", listener);
+    sendAsyncMessage("test:createWorker");
+  });
+  workers[url] = worker;
+});
+
+addMessageListener("test:terminateWorker", function (message) {
+  dump("Terminating worker with url '" + message.data.url + "'.\n");
+
+  let url = message.data.url;
+  workers[url].terminate();
+  delete workers[url];
 });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/code_script-eval.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/code_script-eval.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/code_script-eval.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/code_script-eval.js	2015-05-25 20:42:53.000000000 +0000
@@ -8,3 +8,7 @@
 function evalSourceWithSourceURL() {
   eval('bar = function() {\nvar x = 6;\n} //# sourceURL=bar.js');
 }
+
+function evalSourceWithDebugger() {
+  eval('bar = function() {\nvar x = 7;\ndebugger; }\n bar();');
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/code_WorkerActor.attach-worker1.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/code_WorkerActor.attach-worker1.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/code_WorkerActor.attach-worker1.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/code_WorkerActor.attach-worker1.js	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,5 @@
+"use strict";
+
+self.onmessage = function () {};
+
+postMessage("load");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/code_WorkerActor.attach-worker2.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/code_WorkerActor.attach-worker2.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/code_WorkerActor.attach-worker2.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/code_WorkerActor.attach-worker2.js	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,5 @@
+"use strict";
+
+self.onmessage = function () {};
+
+postMessage("load");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/code_workeractor-worker.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/code_workeractor-worker.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/code_workeractor-worker.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/code_workeractor-worker.js	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,5 @@
+"use strict";
+
+self.onmessage = function () {};
+
+postMessage("load");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/doc_WorkerActor.attach-tab1.html firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/doc_WorkerActor.attach-tab1.html
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/doc_WorkerActor.attach-tab1.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/doc_WorkerActor.attach-tab1.html	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8"/>
+  </head>
+  <body>
+  </body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/doc_WorkerActor.attach-tab2.html firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/doc_WorkerActor.attach-tab2.html
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/doc_WorkerActor.attach-tab2.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/doc_WorkerActor.attach-tab2.html	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8"/>
+  </head>
+  <body>
+  </body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/head.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/test/head.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/test/head.js	2015-05-25 20:42:53.000000000 +0000
@@ -984,7 +984,7 @@
     name: name,
     args: Array.prototype.slice.call(arguments, 2)
   });
-  waitForMessageFromTab(tab, "test:call");
+  return waitForMessageFromTab(tab, "test:call");
 }
 
 function evalInTab(tab, string) {
@@ -993,7 +993,7 @@
   sendMessageToTab(tab, "test:eval", {
     string: string,
   });
-  waitForMessageFromTab(tab, "test:eval");
+  return waitForMessageFromTab(tab, "test:eval");
 }
 
 function sendMouseClickToTab(tab, target) {
@@ -1026,6 +1026,24 @@
   return item.attachment.source;
 }
 
+function createWorkerInTab(tab, url) {
+  info("Creating worker with url '" + url + "' in tab.");
+
+  sendMessageToTab(tab, "test:createWorker", {
+    url: url
+  });
+  return waitForMessageFromTab(tab, "test:createWorker");
+}
+
+function terminateWorkerInTab(tab, url) {
+  info("Terminating worker with url '" + url + "' in tab.");
+
+  sendMessageToTab(tab, "test:terminateWorker", {
+    url: url
+  });
+  return waitForMessageFromTab(tab, "test:terminateWorker");
+}
+
 function connect(client) {
   info("Connecting client.");
   return new Promise(function (resolve) {
@@ -1081,6 +1099,25 @@
   });
 }
 
+function findWorker(workers, url) {
+  info("Finding worker with url '" + url + "'.");
+  for (let worker of workers) {
+    if (worker.url === url) {
+      return worker;
+    }
+  }
+  return null;
+}
+
+function attachWorker(tabClient, worker) {
+  info("Attaching to worker with url '" + worker.url + "'.");
+  return new Promise(function(resolve, reject) {
+    tabClient.attachWorker(worker.actor, function (response, workerClient) {
+      resolve([response, workerClient]);
+    });
+  });
+}
+
 function waitForWorkerListChanged(tabClient) {
   info("Waiting for worker list to change.");
   return new Promise(function (resolve) {
@@ -1089,4 +1126,32 @@
       resolve();
     });
   });
+}
+
+function waitForWorkerClose(workerClient) {
+  info("Waiting for worker to close.");
+  return new Promise(function (resolve) {
+    workerClient.addOneTimeListener("close", function () {
+      info("Worker did close.");
+      resolve();
+    });
+  });
+}
+
+function waitForWorkerFreeze(workerClient) {
+  info("Waiting for worker to freeze.");
+  return new Promise(function (resolve) {
+    workerClient.addOneTimeListener("freeze", function () {
+      resolve();
+    });
+  });
+}
+
+function waitForWorkerThaw(workerClient) {
+  info("Waiting for worker to thaw.");
+  return new Promise(function (resolve) {
+    workerClient.addOneTimeListener("thaw", function () {
+      resolve();
+    });
+  });
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/views/sources-view.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/views/sources-view.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/views/sources-view.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/views/sources-view.js	2015-05-25 20:42:53.000000000 +0000
@@ -9,7 +9,7 @@
   "Add-on SDK": "resource://gre/modules/commonjs/",
 };
 
-KNOWN_SOURCE_GROUPS[L10N.getStr("evalGroupLabel")] = "eval";
+KNOWN_SOURCE_GROUPS[L10N.getStr("anonymousSourcesLabel")] = "anonymous";
 
 /**
  * Functions handling the sources UI.
@@ -53,6 +53,7 @@
       showArrows: true
     });
 
+    this._unnamedSourceIndex = 0;
     this.emptyText = L10N.getStr("noSourcesText");
     this._blackBoxCheckboxTooltip = L10N.getStr("blackBoxCheckboxTooltip");
 
@@ -121,6 +122,11 @@
     this._newTabMenuItem.removeEventListener("command", this._onNewTabCommand, false);
   },
 
+  empty: function() {
+    WidgetMethods.empty.call(this);
+    this._unnamedSourceIndex = 0;
+  },
+
   /**
    * Add commands that XUL can fire.
    */
@@ -161,7 +167,7 @@
    *        - staged: true to stage the item to be appended later
    */
   addSource: function(aSource, aOptions = {}) {
-    if (!aSource.url) {
+    if (!aSource.url && !aOptions.force) {
       // We don't show any unnamed eval scripts yet (see bug 1124106)
       return;
     }
@@ -195,14 +201,24 @@
 
   _parseUrl: function(aSource) {
     let fullUrl = aSource.url;
-    let url = fullUrl.split(" -> ").pop();
-    let label = aSource.addonPath ? aSource.addonPath : SourceUtils.getSourceLabel(url);
-    let group = aSource.addonID ? aSource.addonID : SourceUtils.getSourceGroup(url);
+    let url, unicodeUrl, label, group;
+
+    if(!fullUrl) {
+      unicodeUrl = 'SCRIPT' + this._unnamedSourceIndex++;
+      label = unicodeUrl;
+      group = L10N.getStr("anonymousSourcesLabel");
+    }
+    else {
+      let url = fullUrl.split(" -> ").pop();
+      label = aSource.addonPath ? aSource.addonPath : SourceUtils.getSourceLabel(url);
+      group = aSource.addonID ? aSource.addonID : SourceUtils.getSourceGroup(url);
+      unicodeUrl = NetworkHelper.convertToUnicode(unescape(fullUrl));
+    }
 
     return {
       label: label,
       group: group,
-      unicodeUrl: NetworkHelper.convertToUnicode(unescape(fullUrl))
+      unicodeUrl: unicodeUrl
     };
   },
 
@@ -642,6 +658,13 @@
     return aLocation.actor;
   },
 
+  getDisplayURL: function(source) {
+    if(!source.url) {
+      return this.getItemByValue(source.actor).attachment.label;
+    }
+    return NetworkHelper.convertToUnicode(unescape(source.url))
+  },
+
   /**
    * Marks a breakpoint as selected in this sources container.
    *
@@ -887,7 +910,7 @@
     if (!selected) {
       return;
     }
-    clipboardHelper.copyString(selected.source.url, document);
+    clipboardHelper.copyString(selected.source.url);
   },
 
   /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/views/stack-frames-view.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/views/stack-frames-view.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/debugger/views/stack-frames-view.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/debugger/views/stack-frames-view.js	2015-05-25 20:42:53.000000000 +0000
@@ -62,27 +62,40 @@
    * @param boolean aIsBlackBoxed
    *        Whether or not the frame is black boxed.
    */
-  addFrame: function(aTitle, aUrl, aLine, aDepth, aIsBlackBoxed) {
+  addFrame: function(aFrame, aLine, aDepth, aIsBlackBoxed) {
+    let { source } = aFrame;
+
+    // The source may not exist in the source listing yet because it's
+    // an unnamed eval source, which we hide, so we need to add it
+    if(!DebuggerView.Sources.getItemByValue(source.actor)) {
+      DebuggerView.Sources.addSource(source, { force: true });
+    }
+
+    let location = DebuggerView.Sources.getDisplayURL(source);
+    let title = StackFrameUtils.getFrameTitle(aFrame);
+
     // Blackboxed stack frames are collapsed into a single entry in
     // the view. By convention, only the first frame is displayed.
     if (aIsBlackBoxed) {
-      if (this._prevBlackBoxedUrl == aUrl) {
+      if (this._prevBlackBoxedUrl == location) {
         return;
       }
-      this._prevBlackBoxedUrl = aUrl;
+      this._prevBlackBoxedUrl = location;
     } else {
       this._prevBlackBoxedUrl = null;
     }
 
     // Create the element node for the stack frame item.
-    let frameView = this._createFrameView.apply(this, arguments);
+    let frameView = this._createFrameView(
+      title, location, aLine, aDepth, aIsBlackBoxed
+    );
 
     // Append a stack frame item to this container.
     this.push([frameView], {
       index: 0, /* specifies on which position should the item be appended */
       attachment: {
-        title: aTitle,
-        url: aUrl,
+        title: title,
+        url: location,
         line: aLine,
         depth: aDepth
       },
@@ -92,7 +105,7 @@
     });
 
     // Mirror this newly inserted item inside the "Call Stack" tab.
-    this._mirror.addFrame(aTitle, aUrl, aLine, aDepth);
+    this._mirror.addFrame(title, location, aLine, aDepth);
   },
 
   /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/eyedropper/test/browser_eyedropper_basic.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/eyedropper/test/browser_eyedropper_basic.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/eyedropper/test/browser_eyedropper_basic.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/eyedropper/test/browser_eyedropper_basic.js	2015-05-25 20:42:53.000000000 +0000
@@ -2,7 +2,7 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-const TESTCASE_URI = TEST_BASE + "color-block.html";
+const TESTCASE_URI = CHROME_URL_ROOT + "color-block.html";
 const DIV_COLOR = "#0000FF";
 
 /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/eyedropper/test/browser_eyedropper_cmd.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/eyedropper/test/browser_eyedropper_cmd.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/eyedropper/test/browser_eyedropper_cmd.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/eyedropper/test/browser_eyedropper_cmd.js	2015-05-25 20:42:53.000000000 +0000
@@ -3,14 +3,14 @@
 
 // Tests that the eyedropper command works
 
-const TESTCASE_URI = TEST_BASE + "color-block.html";
+const TESTCASE_URI = CHROME_URL_ROOT + "color-block.html";
 const DIV_COLOR = "#0000FF";
 
 function test() {
   return Task.spawn(spawnTest).then(finish, helpers.handleError);
 }
 
-function spawnTest() {
+function* spawnTest() {
   let options = yield helpers.openTab(TESTCASE_URI);
   yield helpers.openToolbar(options);
 
@@ -33,7 +33,7 @@
 function inspectAndWaitForCopy() {
   let copied = waitForClipboard(() => {}, DIV_COLOR);
   let ready = inspectPage(); // resolves once eyedropper is destroyed
-  
+
   return Promise.all([copied, ready]);
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/eyedropper/test/head.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/eyedropper/test/head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/eyedropper/test/head.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/eyedropper/test/head.js	2015-05-25 20:42:53.000000000 +0000
@@ -1,42 +1,11 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-const TEST_BASE = "chrome://mochitests/content/browser/browser/devtools/eyedropper/test/";
-const TEST_HOST = 'mochi.test:8888';
+// shared-head.js handles imports, constants, and utility functions
+Services.scriptloader.loadSubScript("chrome://mochitests/content/browser/browser/devtools/framework/test/shared-head.js", this);
+Services.scriptloader.loadSubScript(TEST_DIR + "../../../commandline/test/helpers.js", this);
 
-let { devtools } = Components.utils.import("resource://gre/modules/devtools/Loader.jsm", {});
 const { Eyedropper, EyedropperManager } = devtools.require("devtools/eyedropper/eyedropper");
-const { Promise: promise } = devtools.require("resource://gre/modules/Promise.jsm");
-
-let testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
-Services.scriptloader.loadSubScript(testDir + "../../../commandline/test/helpers.js", this);
-
-waitForExplicitFinish();
-
-function cleanup()
-{
-  while (gBrowser.tabs.length > 1) {
-    gBrowser.removeCurrentTab();
-  }
-}
-
-registerCleanupFunction(cleanup);
-
-function addTab(uri) {
-  let deferred = promise.defer();
-
-  let tab = gBrowser.addTab();
-
-  gBrowser.selectedTab = tab;
-  gBrowser.selectedBrowser.addEventListener("load", function onLoad() {
-    gBrowser.selectedBrowser.removeEventListener("load", onLoad, true);
-    deferred.resolve(tab);
-  }, true);
-
-  content.location = uri;
-
-  return deferred.promise;
-}
 
 function waitForClipboard(setup, expected) {
   let deferred = promise.defer();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/fontinspector/font-inspector.css firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/fontinspector/font-inspector.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/fontinspector/font-inspector.css	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/fontinspector/font-inspector.css	2015-05-25 20:42:53.000000000 +0000
@@ -23,3 +23,29 @@
 .font-format::after {
   content: ")";
 }
+
+.preview-input-toolbar {
+  display: -moz-box;
+  width: 100%;
+}
+
+.font-preview-container {
+  overflow-x: auto;
+}
+
+#preview-text-input {
+  font: inherit;
+  margin-top: 1px;
+  margin-bottom: 1px;
+  padding-top: 0;
+  padding-bottom: 0;
+  -moz-box-flex: 1;
+}
+
+:root {
+  height: 100%;
+}
+
+#root {
+  overflow: auto;
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/fontinspector/font-inspector.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/fontinspector/font-inspector.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/fontinspector/font-inspector.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/fontinspector/font-inspector.js	2015-05-25 20:42:53.000000000 +0000
@@ -6,8 +6,9 @@
 
 "use strict";
 
-const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-const DOMUtils = Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils);
+const { utils: Cu } = Components;
+const DEFAULT_PREVIEW_TEXT = "Abc";
+const PREVIEW_UPDATE_DELAY = 150;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Task",
@@ -24,7 +25,7 @@
 }
 
 FontInspector.prototype = {
-  init: function FI_init() {
+  init: function() {
     this.update = this.update.bind(this);
     this.onNewNode = this.onNewNode.bind(this);
     this.inspector.selection.on("new-node", this.onNewNode);
@@ -32,13 +33,16 @@
     this.showAll = this.showAll.bind(this);
     this.showAllButton = this.chromeDoc.getElementById("showall");
     this.showAllButton.addEventListener("click", this.showAll);
+    this.previewTextChanged = this.previewTextChanged.bind(this);
+    this.previewInput = this.chromeDoc.getElementById("preview-text-input");
+    this.previewInput.addEventListener("input", this.previewTextChanged);
     this.update();
   },
 
   /**
    * Is the fontinspector visible in the sidebar?
    */
-  isActive: function FI_isActive() {
+  isActive: function() {
     return this.inspector.sidebar &&
            this.inspector.sidebar.getCurrentTabID() == "fontinspector";
   },
@@ -46,17 +50,22 @@
   /**
    * Remove listeners.
    */
-  destroy: function FI_destroy() {
+  destroy: function() {
     this.chromeDoc = null;
     this.inspector.sidebar.off("fontinspector-selected", this.onNewNode);
     this.inspector.selection.off("new-node", this.onNewNode);
     this.showAllButton.removeEventListener("click", this.showAll);
+    this.previewInput.removeEventListener("input", this.previewTextChanged);
+
+    if (this._previewUpdateTimeout) {
+      clearTimeout(this._previewUpdateTimeout);
+    }
   },
 
   /**
    * Selection 'new-node' event handler.
    */
-  onNewNode: function FI_onNewNode() {
+  onNewNode: function() {
     if (this.isActive() &&
         this.inspector.selection.isConnected() &&
         this.inspector.selection.isElementNode()) {
@@ -68,20 +77,54 @@
   },
 
   /**
+   * The text to use for previews. Returns either the value user has typed to
+   * the preview input or DEFAULT_PREVIEW_TEXT if the input is empty or contains
+   * only whitespace.
+   */
+  getPreviewText: function() {
+    let inputText = this.previewInput.value.trim();
+    if (inputText === "") {
+      return DEFAULT_PREVIEW_TEXT;
+    }
+
+    return inputText;
+  },
+
+  /**
+   * Preview input 'input' event handler.
+   */
+  previewTextChanged: function() {
+    if (this._previewUpdateTimeout) {
+      clearTimeout(this._previewUpdateTimeout);
+    }
+
+    this._previewUpdateTimeout = setTimeout(() => {
+      this.update(this._lastUpdateShowedAllFonts);
+    }, PREVIEW_UPDATE_DELAY);
+  },
+
+  /**
    * Hide the font list. No node are selected.
    */
-  dim: function FI_dim() {
+  dim: function() {
     this.chromeDoc.body.classList.add("dim");
-    this.chromeDoc.querySelector("#all-fonts").innerHTML = "";
+    this.clear();
   },
 
   /**
    * Show the font list. A node is selected.
    */
-  undim: function FI_undim() {
+  undim: function() {
     this.chromeDoc.body.classList.remove("dim");
   },
 
+  /**
+   * Clears the font list.
+   */
+  clear: function() {
+    this.chromeDoc.querySelector("#all-fonts").innerHTML = "";
+  },
+
  /**
   * Retrieve all the font info for the selected node and display it.
   */
@@ -96,25 +139,30 @@
       return;
     }
 
-    this.chromeDoc.querySelector("#all-fonts").innerHTML = "";
+    this._lastUpdateShowedAllFonts = showAllFonts;
 
     // Assume light theme colors as the default (see also bug 1118179).
     let fillStyle = (Services.prefs.getCharPref("devtools.theme") == "dark") ?
         "white" : "black";
+
     let options = {
       includePreviews: true,
+      previewText: this.getPreviewText(),
       previewFillStyle: fillStyle
-    }
+    };
+
     let fonts = [];
-    if (showAllFonts){
+    if (showAllFonts) {
       fonts = yield this.pageStyle.getAllUsedFontFaces(options)
                       .then(null, console.error);
-    }
-    else{
+    } else {
       fonts = yield this.pageStyle.getUsedFontFaces(node, options)
                       .then(null, console.error);
     }
+
     if (!fonts || !fonts.length) {
+      // No fonts to display. Clear the previously shown fonts.
+      this.clear();
       return;
     }
 
@@ -127,8 +175,8 @@
       return;
     }
 
-    // clear again in case an update got in right before us
-    this.chromeDoc.querySelector("#all-fonts").innerHTML = "";
+    // Make room for the new fonts.
+    this.clear();
 
     for (let font of fonts) {
       this.render(font);
@@ -140,7 +188,7 @@
   /**
    * Display the information of one font.
    */
-  render: function FI_render(font) {
+  render: function(font) {
     let s = this.chromeDoc.querySelector("#template > section");
     s = s.cloneNode(true);
 
@@ -178,17 +226,17 @@
   /**
    * Show all fonts for the document (including iframes)
    */
-  showAll: function FI_showAll() {
+  showAll: function() {
     this.update(true);
   },
-}
+};
 
 window.setPanel = function(panel) {
   window.fontInspector = new FontInspector(panel, window);
-}
+};
 
 window.onunload = function() {
   if (window.fontInspector) {
     window.fontInspector.destroy();
   }
-}
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/fontinspector/font-inspector.xhtml firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/fontinspector/font-inspector.xhtml
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/fontinspector/font-inspector.xhtml	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/fontinspector/font-inspector.xhtml	2015-05-25 20:42:53.000000000 +0000
@@ -18,13 +18,24 @@
   </head>
   <body class="theme-sidebar devtools-monospace" role="application">
     <script type="application/javascript;version=1.8" src="font-inspector.js"></script>
+    <div>
+      <div class="devtools-toolbar preview-input-toolbar">
+        <div class="devtools-searchbox">
+          <input id="preview-text-input"
+                 class="devtools-textinput"
+                 placeholder="&previewHint;"/>
+        </div>
+      </div>
+    </div>
     <div id="root">
       <ul id="all-fonts"></ul>
       <button id="showall">&showAllFonts;</button>
     </div>
     <div id="template">
       <section class="font">
-        <img class="font-preview"></img>
+        <div class="font-preview-container">
+          <img class="font-preview"></img>
+        </div>
         <div class="font-info">
           <h1 class="font-name"></h1>
           <span class="font-is-local">&system;</span>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/fontinspector/test/browser_fontinspector_edit-previews.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/fontinspector/test/browser_fontinspector_edit-previews.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/fontinspector/test/browser_fontinspector_edit-previews.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/fontinspector/test/browser_fontinspector_edit-previews.js	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,60 @@
+/* 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 that previews change when the preview text changes. It doesn't check the
+// exact preview images because they are drawn on a canvas causing them to vary
+// between systems, platforms and software versions.
+
+const TEST_URI = BASE_URI + "browser_fontinspector.html";
+
+add_task(function*() {
+  let { inspector, fontInspector } = yield openFontInspectorForURL(TEST_URI);
+  let viewDoc = fontInspector.chromeDoc;
+
+  let previews = viewDoc.querySelectorAll("#all-fonts .font-preview");
+  let initialPreviews = [...previews].map(p => p.src);
+
+  info("Typing 'Abc' to check that the reference previews are correct.");
+  yield updatePreviewText(fontInspector, "Abc");
+  checkPreviewImages(viewDoc, initialPreviews, true);
+
+  info("Typing something else to the preview box.");
+  yield updatePreviewText(fontInspector, "The quick brown");
+  checkPreviewImages(viewDoc, initialPreviews, false);
+
+  info("Blanking the input to restore default previews.");
+  yield updatePreviewText(fontInspector, "");
+  checkPreviewImages(viewDoc, initialPreviews, true);
+});
+
+/**
+ * Compares the previous preview image URIs to the current URIs.
+ *
+ * @param {Document} viewDoc
+ *        The FontInspector document.
+ * @param {Array[String]} originalURIs
+ *        An array of URIs to compare with the current URIs.
+ * @param {Boolean} assertIdentical
+ *        If true, this method asserts that the previous and current URIs are
+ *        identical. If false, this method asserts that the previous and current
+ *        URI's are different.
+ */
+function checkPreviewImages(viewDoc, originalURIs, assertIdentical) {
+  let previews = viewDoc.querySelectorAll("#all-fonts .font-preview");
+  let newURIs = [...previews].map(p => p.src);
+
+  is(newURIs.length, originalURIs.length,
+    "The number of previews has not changed.");
+
+  for (let i = 0; i < newURIs.length; ++i) {
+    if (assertIdentical) {
+      is(newURIs[i], originalURIs[i],
+        `The preview image at index ${i} has stayed the same.`);
+    } else {
+      isnot(newURIs[i], originalURIs[i],
+        `The preview image at index ${i} has changed.`);
+    }
+  }
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/fontinspector/test/browser_fontinspector_edit-previews-show-all.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/fontinspector/test/browser_fontinspector_edit-previews-show-all.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/fontinspector/test/browser_fontinspector_edit-previews-show-all.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/fontinspector/test/browser_fontinspector_edit-previews-show-all.js	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,44 @@
+/* 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 that correct previews are shown if the text is edited after 'Show all'
+// button is pressed.
+
+const TEST_URI = BASE_URI + "browser_fontinspector.html";
+
+add_task(function*() {
+  let { inspector, fontInspector } = yield openFontInspectorForURL(TEST_URI);
+  let viewDoc = fontInspector.chromeDoc;
+
+  info("Selecting a node that doesn't contain all document fonts.");
+  yield selectNode(".normal-text", inspector);
+
+  let normalTextNumPreviews =
+    viewDoc.querySelectorAll("#all-fonts .font-preview").length;
+
+  let onUpdated = inspector.once("fontinspector-updated");
+
+  info("Clicking 'Select all' button.");
+  viewDoc.getElementById("showall").click();
+
+  info("Waiting for font-inspector to update.");
+  yield onUpdated;
+
+  let allFontsNumPreviews =
+    viewDoc.querySelectorAll("#all-fonts .font-preview").length;
+
+  // Sanity check. If this fails all fonts apply also to the .normal-text node
+  // meaning we won't detect if preview editing causes the panel not to show all
+  // fonts.
+  isnot(allFontsNumPreviews, normalTextNumPreviews,
+    "The .normal-text didn't show all fonts.");
+
+  info("Editing the preview text.");
+  yield updatePreviewText(fontInspector, "The quick brown");
+
+  let numPreviews = viewDoc.querySelectorAll("#all-fonts .font-preview").length;
+  is(numPreviews, allFontsNumPreviews,
+    "All fonts are still shown after the preview text was edited.");
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/fontinspector/test/browser_fontinspector.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/fontinspector/test/browser_fontinspector.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/fontinspector/test/browser_fontinspector.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/fontinspector/test/browser_fontinspector.js	2015-05-25 20:42:53.000000000 +0000
@@ -1,17 +1,9 @@
+/* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
 
-let tempScope = {};
-let {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
-let {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-let TargetFactory = devtools.TargetFactory;
-
-let TEST_URI = "http://mochi.test:8888/browser/browser/devtools/fontinspector/test/browser_fontinspector.html";
-
-let view, viewDoc;
-
-const BASE_URI = "http://mochi.test:8888/browser/browser/devtools/fontinspector/test/"
-
+const TEST_URI = BASE_URI + "browser_fontinspector.html";
 const FONTS = [
   {name: "Ostrich Sans Medium", remote: true, url: BASE_URI + "ostrich-regular.ttf",
    format: "truetype", cssName: "bar"},
@@ -24,33 +16,17 @@
 ];
 
 add_task(function*() {
-  yield loadTab(TEST_URI);
-  let {toolbox, inspector} = yield openInspector();
-
-  info("Selecting the test node");
-  yield selectNode("body", inspector);
-
-  let updated = inspector.once("fontinspector-updated");
-  inspector.sidebar.select("fontinspector");
-  yield updated;
-
-  info("Font Inspector ready");
-
-  view = inspector.sidebar.getWindowForTab("fontinspector");
-  viewDoc = view.document;
-
-  ok(!!view.fontInspector, "Font inspector document is alive.");
-
-  yield testBodyFonts(inspector);
-
-  yield testDivFonts(inspector);
+  let { inspector, fontInspector } = yield openFontInspectorForURL(TEST_URI);
+  ok(!!fontInspector, "Font inspector document is alive.");
 
-  yield testShowAllFonts(inspector);
+  let viewDoc = fontInspector.chromeDoc;
 
-  view = viewDoc = null;
+  yield testBodyFonts(inspector, viewDoc);
+  yield testDivFonts(inspector, viewDoc);
+  yield testShowAllFonts(inspector, viewDoc);
 });
 
-function* testBodyFonts(inspector) {
+function* testBodyFonts(inspector, viewDoc) {
   let s = viewDoc.querySelectorAll("#all-fonts > section");
   is(s.length, 5, "Found 5 fonts");
 
@@ -89,7 +65,7 @@
      "Arial", "local font has right css name");
 }
 
-function* testDivFonts(inspector) {
+function* testDivFonts(inspector, viewDoc) {
   let updated = inspector.once("fontinspector-updated");
   yield selectNode("div", inspector);
   yield updated;
@@ -100,7 +76,7 @@
     "The DIV font has the right name");
 }
 
-function* testShowAllFonts(inspector) {
+function* testShowAllFonts(inspector, viewDoc) {
   info("testing showing all fonts");
 
   let updated = inspector.once("fontinspector-updated");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/fontinspector/test/browser.ini firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/fontinspector/test/browser.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/fontinspector/test/browser.ini	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/fontinspector/test/browser.ini	2015-05-25 20:42:53.000000000 +0000
@@ -9,3 +9,5 @@
   head.js
 
 [browser_fontinspector.js]
+[browser_fontinspector_edit-previews.js]
+[browser_fontinspector_edit-previews-show-all.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/fontinspector/test/head.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/fontinspector/test/head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/fontinspector/test/head.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/fontinspector/test/head.js	2015-05-25 20:42:53.000000000 +0000
@@ -13,6 +13,8 @@
 let {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 let TargetFactory = devtools.TargetFactory;
 
+const BASE_URI = "http://mochi.test:8888/browser/browser/devtools/fontinspector/test/"
+
 // All test are asynchronous
 waitForExplicitFinish();
 
@@ -99,6 +101,52 @@
 });
 
 /**
+ * Adds a new tab with the given URL, opens the inspector and selects the
+ * font-inspector tab.
+ *
+ * @return Object
+ *  {
+ *    toolbox,
+ *    inspector,
+ *    fontInspector
+ *  }
+ */
+let openFontInspectorForURL = Task.async(function* (url) {
+  info("Opening tab " + url);
+  yield loadTab(url);
+
+  let { toolbox, inspector } = yield openInspector();
+
+  /**
+   * Call selectNode to trigger font-inspector update so that we don't timeout
+   * if following conditions hold
+   * a) the initial 'fontinspector-updated' was emitted while we were waiting
+   *    for openInspector to resolve
+   * b) the font-inspector tab was selected by default which means the call to
+   *    select will not trigger another update.
+   *
+   * selectNode calls setNodeFront which always emits 'new-node' which calls
+   * FontInspector.update that emits the 'fontinspector-updated' event.
+   */
+  let onUpdated = inspector.once("fontinspector-updated");
+
+  yield selectNode("body", inspector);
+  inspector.sidebar.select("fontinspector");
+
+  info("Waiting for font-inspector to update.");
+  yield onUpdated;
+
+  info("Font Inspector ready.");
+
+  let { fontInspector } = inspector.sidebar.getWindowForTab("fontinspector");
+  return {
+    fontInspector,
+    inspector,
+    toolbox
+  };
+});
+
+/**
  * Select a node in the inspector given its selector.
  */
 let selectNode = Task.async(function*(selector, inspector, reason="test") {
@@ -135,3 +183,37 @@
   waitForFocus(def.resolve, win);
   return def.promise;
 }
+
+/**
+ * Clears the preview input field, types new text into it and waits for the
+ * preview images to be updated.
+ *
+ * @param {FontInspector} fontInspector - The FontInspector instance.
+ * @param {String} text - The text to preview.
+ */
+function* updatePreviewText(fontInspector, text) {
+  info(`Changing the preview text to '${text}'`);
+
+  let doc = fontInspector.chromeDoc;
+  let input = doc.getElementById("preview-text-input");
+  let update = fontInspector.inspector.once("fontinspector-updated");
+
+  info("Focusing the input field.");
+  input.focus();
+
+  is(doc.activeElement, input, "The input was focused.");
+
+  info("Blanking the input field.");
+  for (let i = input.value.length; i >= 0; i--) {
+    EventUtils.sendKey("BACK_SPACE", doc.defaultView);
+  }
+
+  is(input.value, "", "The input is now blank.");
+
+  info("Typing the specified text to the input field.");
+  EventUtils.sendString(text, doc.defaultView);
+  is(input.value, text, "The input now contains the correct text.");
+
+  info("Waiting for the font-inspector to update.");
+  yield update;
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_devtools_api_destroy.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_devtools_api_destroy.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_devtools_api_destroy.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_devtools_api_destroy.js	2015-05-25 20:42:53.000000000 +0000
@@ -13,7 +13,7 @@
   let toolDefinition = {
     id: "testTool",
     visibilityswitch: "devtools.testTool.enabled",
-    isTargetSupported: function() true,
+    isTargetSupported: () => true,
     url: "about:blank",
     label: "someLabel",
     build: function(iframeWindow, toolbox) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_devtools_api.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_devtools_api.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_devtools_api.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_devtools_api.js	2015-05-25 20:42:53.000000000 +0000
@@ -29,7 +29,7 @@
 function runTests1(aTab) {
   let toolDefinition = {
     id: toolId1,
-    isTargetSupported: function() true,
+    isTargetSupported: () => true,
     visibilityswitch: "devtools.test-tool.enabled",
     url: "about:blank",
     label: "someLabel",
@@ -90,7 +90,7 @@
 function runTests2() {
   let toolDefinition = {
     id: toolId2,
-    isTargetSupported: function() true,
+    isTargetSupported: () => true,
     visibilityswitch: "devtools.test-tool.enabled",
     url: "about:blank",
     label: "someLabel",
@@ -229,11 +229,17 @@
     return deferred.promise;
   },
 
-  get target() this._toolbox.target,
+  get target() {
+    return this._toolbox.target;
+  },
 
-  get toolbox() this._toolbox,
+  get toolbox() {
+    return this._toolbox;
+  },
 
-  get isReady() this._isReady,
+  get isReady() {
+    return this._isReady;
+  },
 
   _isReady: false,
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_ignore_toolbox_network_requests.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_ignore_toolbox_network_requests.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_ignore_toolbox_network_requests.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_ignore_toolbox_network_requests.js	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,30 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
+// Test that network requests originating from the toolbox don't get recorded in
+// the network panel.
+
+add_task(function*() {
+  // TODO: This test tries to verify the normal behavior of the netmonitor and
+  // therefore needs to avoid the explicit check for tests. Bug 1167188 will
+  // allow us to remove this workaround.
+  let isTesting = gDevTools.testing;
+  gDevTools.testing = false;
+
+  let tab = yield addTab(URL_ROOT + "doc_viewsource.html");
+  let target = TargetFactory.forTab(tab);
+  let toolbox = yield gDevTools.showToolbox(target, "styleeditor");
+  let panel = toolbox.getPanel("styleeditor");
+
+  is(panel.UI.editors.length, 1, "correct number of editors opened");
+
+  let monitor = yield toolbox.selectTool("netmonitor");
+  let { RequestsMenu } = monitor.panelWin.NetMonitorView;
+  is(RequestsMenu.itemCount, 0, "No network requests appear in the network panel");
+
+  yield gDevTools.closeToolbox(target);
+  tab = target = toolbox = panel = null;
+  gBrowser.removeCurrentTab();
+  gDevTools.testing = isTesting;
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser.ini firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser.ini	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser.ini	2015-05-25 20:42:53.000000000 +0000
@@ -8,6 +8,7 @@
   browser_toolbox_sidebar_tool.xul
   code_math.js
   head.js
+  shared-head.js
   helper_disable_cache.js
   doc_theme.css
   doc_viewsource.html
@@ -17,7 +18,9 @@
 [browser_devtools_api.js]
 [browser_devtools_api_destroy.js]
 [browser_dynamic_tool_enabling.js]
-[browser_keybindings.js]
+[browser_ignore_toolbox_network_requests.js]
+[browser_keybindings_01.js]
+[browser_keybindings_02.js]
 [browser_new_activation_workflow.js]
 [browser_target_events.js]
 [browser_target_remote.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_keybindings_01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_keybindings_01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_keybindings_01.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_keybindings_01.js	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,117 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Tests that the keybindings for opening and closing the inspector work as expected
+// Can probably make this a shared test that tests all of the tools global keybindings
+
+function test()
+{
+  waitForExplicitFinish();
+
+  let doc;
+  let node;
+  let inspector;
+  let keysetMap = { };
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function onload() {
+    gBrowser.selectedBrowser.removeEventListener("load", onload, true);
+    doc = content.document;
+    node = doc.querySelector("h1");
+    waitForFocus(setupKeyBindingsTest);
+  }, true);
+
+  content.location = "data:text/html,<html><head><title>Test for the " +
+                     "highlighter keybindings</title></head><body>" +
+                     "<h1>Keybindings!</h1></body></html>";
+
+  function buildDevtoolsKeysetMap(keyset) {
+    [].forEach.call(keyset.querySelectorAll("key"), function(key) {
+
+      if (!key.getAttribute("key")) {
+        return;
+      }
+
+      let modifiers = key.getAttribute("modifiers");
+
+      keysetMap[key.id.split("_")[1]] = {
+        key: key.getAttribute("key"),
+        modifiers: modifiers,
+        modifierOpt: {
+          shiftKey: modifiers.match("shift"),
+          ctrlKey: modifiers.match("ctrl"),
+          altKey: modifiers.match("alt"),
+          metaKey: modifiers.match("meta"),
+          accelKey: modifiers.match("accel")
+        },
+        synthesizeKey: function() {
+          EventUtils.synthesizeKey(this.key, this.modifierOpt);
+        }
+      }
+    });
+  }
+
+  function setupKeyBindingsTest()
+  {
+    for (let win of gDevToolsBrowser._trackedBrowserWindows) {
+      buildDevtoolsKeysetMap(win.document.getElementById("devtoolsKeyset"));
+    }
+
+    gDevTools.once("toolbox-ready", (e, toolbox) => {
+      inspectorShouldBeOpenAndHighlighting(toolbox.getCurrentPanel(), toolbox);
+    });
+
+    keysetMap.inspector.synthesizeKey();
+  }
+
+  function inspectorShouldBeOpenAndHighlighting(aInspector, aToolbox)
+  {
+    is (aToolbox.currentToolId, "inspector", "Correct tool has been loaded");
+
+    aToolbox.once("picker-started", () => {
+      ok(true, "picker-started event received, highlighter started");
+      keysetMap.inspector.synthesizeKey();
+
+      aToolbox.once("picker-stopped", () => {
+        ok(true, "picker-stopped event received, highlighter stopped");
+        gDevTools.once("select-tool-command", () => {
+          webconsoleShouldBeSelected(aToolbox);
+        });
+        keysetMap.webconsole.synthesizeKey();
+      });
+    });
+  }
+
+  function webconsoleShouldBeSelected(aToolbox)
+  {
+      is (aToolbox.currentToolId, "webconsole", "webconsole should be selected.");
+
+      gDevTools.once("select-tool-command", () => {
+        jsdebuggerShouldBeSelected(aToolbox);
+      });
+      keysetMap.jsdebugger.synthesizeKey();
+  }
+
+  function jsdebuggerShouldBeSelected(aToolbox)
+  {
+      is (aToolbox.currentToolId, "jsdebugger", "jsdebugger should be selected.");
+
+      gDevTools.once("select-tool-command", () => {
+        netmonitorShouldBeSelected(aToolbox);
+      });
+
+      keysetMap.netmonitor.synthesizeKey();
+  }
+
+  function netmonitorShouldBeSelected(aToolbox, panel)
+  {
+      is (aToolbox.currentToolId, "netmonitor", "netmonitor should be selected.");
+      finishUp();
+  }
+
+  function finishUp() {
+    doc = node = inspector = keysetMap = null;
+    gBrowser.removeCurrentTab();
+    finish();
+  }
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_keybindings_02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_keybindings_02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_keybindings_02.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_keybindings_02.js	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,39 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Test that the toolbox keybindings still work after the host is changed.
+
+const URL = "data:text/html;charset=utf8,test page";
+
+add_task(function*() {
+  info("Create a test tab and open the toolbox");
+  let tab = yield addTab(URL);
+  let target = TargetFactory.forTab(tab);
+  let toolbox = yield gDevTools.showToolbox(target, "webconsole");
+
+  let {SIDE, BOTTOM} = devtools.Toolbox.HostType;
+  for (let type of [SIDE, BOTTOM, SIDE]) {
+    info("Switch to host type " + type);
+    yield toolbox.switchHost(type);
+
+    info("Try to use the toolbox shortcuts");
+    yield checkKeyBindings(toolbox);
+  }
+
+  Services.prefs.clearUserPref("devtools.toolbox.zoomValue", BOTTOM);
+  Services.prefs.setCharPref("devtools.toolbox.host", BOTTOM);
+  yield toolbox.destroy();
+  gBrowser.removeCurrentTab();
+});
+
+function* checkKeyBindings(toolbox) {
+  let currentZoom = toolbox.zoomValue;
+
+  let key = toolbox.doc.getElementById("toolbox-zoom-in-key").getAttribute("key");
+  EventUtils.synthesizeKey(key, {accelKey: true}, toolbox.doc.defaultView);
+
+  let newZoom = toolbox.zoomValue;
+  isnot(newZoom, currentZoom, "The zoom level was changed in the toolbox");
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_keybindings.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_keybindings.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_keybindings.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_keybindings.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,117 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Tests that the keybindings for opening and closing the inspector work as expected
-// Can probably make this a shared test that tests all of the tools global keybindings
-
-function test()
-{
-  waitForExplicitFinish();
-
-  let doc;
-  let node;
-  let inspector;
-  let keysetMap = { };
-
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function onload() {
-    gBrowser.selectedBrowser.removeEventListener("load", onload, true);
-    doc = content.document;
-    node = doc.querySelector("h1");
-    waitForFocus(setupKeyBindingsTest);
-  }, true);
-
-  content.location = "data:text/html,<html><head><title>Test for the " +
-                     "highlighter keybindings</title></head><body>" +
-                     "<h1>Keybindings!</h1></body></html>";
-
-  function buildDevtoolsKeysetMap(keyset) {
-    [].forEach.call(keyset.querySelectorAll("key"), function(key) {
-
-      if (!key.getAttribute("key")) {
-        return;
-      }
-
-      let modifiers = key.getAttribute("modifiers");
-
-      keysetMap[key.id.split("_")[1]] = {
-        key: key.getAttribute("key"),
-        modifiers: modifiers,
-        modifierOpt: {
-          shiftKey: modifiers.match("shift"),
-          ctrlKey: modifiers.match("ctrl"),
-          altKey: modifiers.match("alt"),
-          metaKey: modifiers.match("meta"),
-          accelKey: modifiers.match("accel")
-        },
-        synthesizeKey: function() {
-          EventUtils.synthesizeKey(this.key, this.modifierOpt);
-        }
-      }
-    });
-  }
-
-  function setupKeyBindingsTest()
-  {
-    for (let win of gDevToolsBrowser._trackedBrowserWindows) {
-      buildDevtoolsKeysetMap(win.document.getElementById("devtoolsKeyset"));
-    }
-
-    gDevTools.once("toolbox-ready", (e, toolbox) => {
-      inspectorShouldBeOpenAndHighlighting(toolbox.getCurrentPanel(), toolbox);
-    });
-
-    keysetMap.inspector.synthesizeKey();
-  }
-
-  function inspectorShouldBeOpenAndHighlighting(aInspector, aToolbox)
-  {
-    is (aToolbox.currentToolId, "inspector", "Correct tool has been loaded");
-
-    aToolbox.once("picker-started", () => {
-      ok(true, "picker-started event received, highlighter started");
-      keysetMap.inspector.synthesizeKey();
-
-      aToolbox.once("picker-stopped", () => {
-        ok(true, "picker-stopped event received, highlighter stopped");
-        gDevTools.once("select-tool-command", () => {
-          webconsoleShouldBeSelected(aToolbox);
-        });
-        keysetMap.webconsole.synthesizeKey();
-      });
-    });
-  }
-
-  function webconsoleShouldBeSelected(aToolbox)
-  {
-      is (aToolbox.currentToolId, "webconsole", "webconsole should be selected.");
-
-      gDevTools.once("select-tool-command", () => {
-        jsdebuggerShouldBeSelected(aToolbox);
-      });
-      keysetMap.jsdebugger.synthesizeKey();
-  }
-
-  function jsdebuggerShouldBeSelected(aToolbox)
-  {
-      is (aToolbox.currentToolId, "jsdebugger", "jsdebugger should be selected.");
-
-      gDevTools.once("select-tool-command", () => {
-        netmonitorShouldBeSelected(aToolbox);
-      });
-
-      keysetMap.netmonitor.synthesizeKey();
-  }
-
-  function netmonitorShouldBeSelected(aToolbox, panel)
-  {
-      is (aToolbox.currentToolId, "netmonitor", "netmonitor should be selected.");
-      finishUp();
-  }
-
-  function finishUp() {
-    doc = node = inspector = keysetMap = null;
-    gBrowser.removeCurrentTab();
-    finish();
-  }
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_target_support.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_target_support.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_target_support.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_target_support.js	2015-05-25 20:42:53.000000000 +0000
@@ -14,39 +14,39 @@
 function* testTarget (client, target) {
   yield target.makeRemote();
 
-  ise(target.hasActor("timeline"), true, "target.hasActor() true when actor exists.");
-  ise(target.hasActor("webaudio"), true, "target.hasActor() true when actor exists.");
-  ise(target.hasActor("notreal"), false, "target.hasActor() false when actor does not exist.");
+  is(target.hasActor("timeline"), true, "target.hasActor() true when actor exists.");
+  is(target.hasActor("webaudio"), true, "target.hasActor() true when actor exists.");
+  is(target.hasActor("notreal"), false, "target.hasActor() false when actor does not exist.");
   // Create a front to ensure the actor is loaded
   let front = new WebAudioFront(target.client, target.form);
 
   let desc = yield target.getActorDescription("webaudio");
-  ise(desc.typeName, "webaudio",
+  is(desc.typeName, "webaudio",
     "target.getActorDescription() returns definition data for corresponding actor");
-  ise(desc.events["start-context"]["type"], "startContext",
+  is(desc.events["start-context"]["type"], "startContext",
     "target.getActorDescription() returns event data for corresponding actor");
 
   desc = yield target.getActorDescription("nope");
-  ise(desc, undefined, "target.getActorDescription() returns undefined for non-existing actor");
+  is(desc, undefined, "target.getActorDescription() returns undefined for non-existing actor");
   desc = yield target.getActorDescription();
-  ise(desc, undefined, "target.getActorDescription() returns undefined for undefined actor");
+  is(desc, undefined, "target.getActorDescription() returns undefined for undefined actor");
 
   let hasMethod = yield target.actorHasMethod("audionode", "getType");
-  ise(hasMethod, true,
+  is(hasMethod, true,
     "target.actorHasMethod() returns true for existing actor with method");
   hasMethod = yield target.actorHasMethod("audionode", "nope");
-  ise(hasMethod, false,
+  is(hasMethod, false,
     "target.actorHasMethod() returns false for existing actor with no method");
   hasMethod = yield target.actorHasMethod("nope", "nope");
-  ise(hasMethod, false,
+  is(hasMethod, false,
     "target.actorHasMethod() returns false for non-existing actor with no method");
   hasMethod = yield target.actorHasMethod();
-  ise(hasMethod, false,
+  is(hasMethod, false,
     "target.actorHasMethod() returns false for undefined params");
 
-  ise(target.getTrait("customHighlighters"), true,
+  is(target.getTrait("customHighlighters"), true,
     "target.getTrait() returns boolean when trait exists");
-  ise(target.getTrait("giddyup"), undefined,
+  is(target.getTrait("giddyup"), undefined,
     "target.getTrait() returns undefined when trait does not exist");
 
   close(target, client);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_toolbox_custom_host.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_toolbox_custom_host.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_toolbox_custom_host.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_toolbox_custom_host.js	2015-05-25 20:42:53.000000000 +0000
@@ -3,15 +3,7 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 function test() {
-  Cu.import("resource://gre/modules/Services.jsm");
-  let temp = {}
-  Cu.import("resource:///modules/devtools/gDevTools.jsm", temp);
-  let DevTools = temp.DevTools;
-  Cu.import("resource://gre/modules/devtools/LayoutHelpers.jsm", temp);
-  let LayoutHelpers = temp.LayoutHelpers;
-
-  Cu.import("resource://gre/modules/devtools/Loader.jsm", temp);
-  let devtools = temp.devtools;
+  let {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 
   let Toolbox = devtools.Toolbox;
 
@@ -40,19 +32,27 @@
     let json = JSON.parse(event.data);
     if (json.name == "toolbox-close") {
       ok("Got the `toolbox-close` message");
+      window.removeEventListener("message", onMessage);
       cleanup();
     }
   }
 
-  function testCustomHost(toolbox) {
+  function testCustomHost(t) {
+    toolbox = t;
     is(toolbox.doc.defaultView.top, window, "Toolbox is included in browser.xul");
     is(toolbox.doc, iframe.contentDocument, "Toolbox is in the custom iframe");
     executeSoon(() => gBrowser.removeCurrentTab());
   }
 
   function cleanup() {
-    window.removeEventListener("message", onMessage);
     iframe.remove();
-    finish();
+
+    // Even if we received "toolbox-close", the toolbox may still be destroying
+    // toolbox.destroy() returns a singleton promise that ensures
+    // everything is cleaned up before proceeding.
+    toolbox.destroy().then(() => {
+      toolbox = iframe = target = tab = null;
+      finish();
+    });
   }
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_toolbox_dynamic_registration.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_toolbox_dynamic_registration.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_toolbox_dynamic_registration.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_toolbox_dynamic_registration.js	2015-05-25 20:42:53.000000000 +0000
@@ -26,7 +26,7 @@
     id: "test-tool",
     label: "Test Tool",
     inMenu: true,
-    isTargetSupported: function() true,
+    isTargetSupported: () => true,
     build: function() {}
   });
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_toolbox_options_enable_serviceworkers_testing.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_toolbox_options_enable_serviceworkers_testing.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_toolbox_options_enable_serviceworkers_testing.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_toolbox_options_enable_serviceworkers_testing.js	2015-05-25 20:42:54.000000000 +0000
@@ -37,11 +37,15 @@
 
 function testSelectTool(aToolbox) {
   toolbox = aToolbox;
-  toolbox.once("options-selected", testRegisterFails);
+  toolbox.once("options-selected", () => {
+    testRegisterFails().then(testRegisterInstallingWorker);
+  });
   toolbox.selectTool("options");
 }
 
 function testRegisterFails() {
+  let deferred = promise.defer();
+
   let output = doc.getElementById("output");
   let button = doc.getElementById("button");
 
@@ -50,7 +54,7 @@
     is(output.textContent,
        "SecurityError",
        "SecurityError expected");
-    testRegisterInstallingWorker();
+    deferred.resolve();
   }
 
   if (output.textContent !== "No output") {
@@ -61,6 +65,8 @@
     button.removeEventListener('click', onClick);
     doTheCheck();
   });
+
+  return deferred.promise;
 }
 
 function testRegisterInstallingWorker() {
@@ -73,7 +79,7 @@
       is(output.textContent,
          "Installing worker/",
          "Installing worker expected");
-      toggleServiceWorkersTestingCheckbox().then(finishUp);
+      testRegisterFailsWhenToolboxCloses();
     }
 
     if (output.textContent !== "No output") {
@@ -87,6 +93,30 @@
   });
 }
 
+// Workers should be turned back off when we closes the toolbox
+function testRegisterFailsWhenToolboxCloses() {
+  info("Testing it disable worker when closing the toolbox");
+  toolbox.destroy()
+         .then(reload)
+         .then(testRegisterFails)
+         .then(finishUp);
+}
+
+function reload() {
+  let deferred = promise.defer();
+
+  gBrowser.selectedBrowser.addEventListener("load", function onLoad(evt) {
+    gBrowser.selectedBrowser.removeEventListener(evt.type, onLoad, true);
+    doc = content.document;
+    deferred.resolve();
+  }, true);
+
+  let mm = getFrameScript();
+  mm.sendAsyncMessage("devtools:test:reload");
+
+  return deferred.promise;
+}
+
 function toggleServiceWorkersTestingCheckbox() {
   let deferred = promise.defer();
 
@@ -101,24 +131,13 @@
     info("Checking checkbox to enable service workers testing");
   }
 
-  gBrowser.selectedBrowser.addEventListener("load", function onLoad(evt) {
-    gBrowser.selectedBrowser.removeEventListener(evt.type, onLoad, true);
-    doc = content.document;
-    deferred.resolve();
-  }, true);
-
   cbx.click();
 
-  let mm = getFrameScript();
-  mm.sendAsyncMessage("devtools:test:reload");
-
-  return deferred.promise;
+  return reload();
 }
 
 function finishUp() {
-  toolbox.destroy().then(function() {
-    gBrowser.removeCurrentTab();
-    toolbox = doc = null;
-    finish();
-  });
+  gBrowser.removeCurrentTab();
+  toolbox = doc = null;
+  finish();
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_toolbox_options.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_toolbox_options.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_toolbox_options.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_toolbox_options.js	2015-05-25 20:42:54.000000000 +0000
@@ -23,7 +23,7 @@
 function registerNewTool() {
   let toolDefinition = {
     id: "test-tool",
-    isTargetSupported: function() true,
+    isTargetSupported: () => true,
     visibilityswitch: "devtools.test-tool.enabled",
     url: "about:blank",
     label: "someLabel"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_toolbox_sidebar_events.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_toolbox_sidebar_events.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_toolbox_sidebar_events.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_toolbox_sidebar_events.js	2015-05-25 20:42:54.000000000 +0000
@@ -22,7 +22,7 @@
     visibilityswitch: "devtools.testTool1072208.enabled",
     url: toolURL,
     label: "Test tool",
-    isTargetSupported: function() true,
+    isTargetSupported: () => true,
     build: function(iframeWindow, toolbox) {
       let deferred = promise.defer();
       executeSoon(() => {
@@ -30,7 +30,7 @@
           target: toolbox.target,
           toolbox: toolbox,
           isReady: true,
-          destroy: function(){},
+          destroy: function() {},
           panelDoc: iframeWindow.document,
         });
       });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_toolbox_sidebar.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_toolbox_sidebar.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_toolbox_sidebar.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_toolbox_sidebar.js	2015-05-25 20:42:54.000000000 +0000
@@ -27,7 +27,7 @@
     visibilityswitch: "devtools.fakeTool4242.enabled",
     url: toolURL,
     label: "FAKE TOOL!!!",
-    isTargetSupported: function() true,
+    isTargetSupported: () => true,
     build: function(iframeWindow, toolbox) {
       let deferred = promise.defer();
       executeSoon(() => {
@@ -35,7 +35,7 @@
           target: toolbox.target,
           toolbox: toolbox,
           isReady: true,
-          destroy: function(){},
+          destroy: function() {},
           panelDoc: iframeWindow.document,
         });
       });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_toolbox_toggle.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_toolbox_toggle.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_toolbox_toggle.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_toolbox_toggle.js	2015-05-25 20:42:54.000000000 +0000
@@ -1,20 +1,27 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
-const URL = "data:text/html;charset=utf-8,Test toggling devtools using keyboard shortcuts";
+
+"use strict";
+
+// Test toggling the toolbox with ACCEL+SHIFT+I / ACCEL+ALT+I and F12 in docked
+// and detached (window) modes.
+
+const URL = "data:text/html;charset=utf-8,Toggling devtools using shortcuts";
 
 add_task(function*() {
   // Test with ACCEL+SHIFT+I / ACCEL+ALT+I (MacOSX) ; modifiers should match :
   // - toolbox-key-toggle in browser/devtools/framework/toolbox-window.xul
   // - key_devToolboxMenuItem in browser/base/content/browser.xul
-  info('Test toggle using CTRL+SHIFT+I/CMD+ALT+I');
-  yield testToggle('I', {
-    accelKey : true,
-    shiftKey : !navigator.userAgent.match(/Mac/),
-    altKey : navigator.userAgent.match(/Mac/),
+  info("Test toggle using CTRL+SHIFT+I/CMD+ALT+I");
+  yield testToggle("I", {
+    accelKey: true,
+    shiftKey: !navigator.userAgent.match(/Mac/),
+    altKey: navigator.userAgent.match(/Mac/)
   });
+
   // Test with F12 ; no modifiers
-  info('Test toggle using F12');
-  yield testToggle('VK_F12', {});
+  info("Test toggle using F12");
+  yield testToggle("VK_F12", {});
 });
 
 function* testToggle(key, modifiers) {
@@ -22,7 +29,6 @@
   yield gDevTools.showToolbox(TargetFactory.forTab(tab));
 
   yield testToggleDockedToolbox(tab, key, modifiers);
-
   yield testToggleDetachedToolbox(tab, key, modifiers);
 
   yield cleanup();
@@ -31,15 +37,16 @@
 function* testToggleDockedToolbox (tab, key, modifiers) {
   let toolbox = getToolboxForTab(tab);
 
-  isnot(toolbox.hostType, devtools.Toolbox.HostType.WINDOW, "Toolbox is docked in the main window");
+  isnot(toolbox.hostType, devtools.Toolbox.HostType.WINDOW,
+    "Toolbox is docked in the main window");
 
-  info('verify docked toolbox is destroyed when using toggle key');
+  info("verify docked toolbox is destroyed when using toggle key");
   let onToolboxDestroyed = once(gDevTools, "toolbox-destroyed");
   EventUtils.synthesizeKey(key, modifiers);
   yield onToolboxDestroyed;
   ok(true, "Docked toolbox is destroyed when using a toggle key");
 
-  info('verify new toolbox is created when using toggle key');
+  info("verify new toolbox is created when using toggle key");
   let onToolboxReady = once(gDevTools, "toolbox-ready");
   EventUtils.synthesizeKey(key, modifiers);
   yield onToolboxReady;
@@ -49,27 +56,33 @@
 function* testToggleDetachedToolbox (tab, key, modifiers) {
   let toolbox = getToolboxForTab(tab);
 
-  info('change the toolbox hostType to WINDOW');
+  info("change the toolbox hostType to WINDOW");
+
   yield toolbox.switchHost(devtools.Toolbox.HostType.WINDOW);
-  is(toolbox.hostType, devtools.Toolbox.HostType.WINDOW, "Toolbox opened on separate window");
+  is(toolbox.hostType, devtools.Toolbox.HostType.WINDOW,
+    "Toolbox opened on separate window");
 
-  let toolboxWindow = toolbox._host._window;
-  info('Wait for focus on the toolbox window')
-  yield new Promise(resolve => waitForFocus(resolve, toolboxWindow));
+  info("Wait for focus on the toolbox window");
+  yield new Promise(res => waitForFocus(res, toolbox.frame.contentWindow));
+
+  info("Focus main window to put the toolbox window in the background");
 
-  info('Focus main window')
   let onMainWindowFocus = once(window, "focus");
   window.focus();
   yield onMainWindowFocus;
   ok(true, "Main window focused");
 
-  info('verify windowed toolbox is focused when using toggle key from the main window')
-  let onToolboxWindowFocus = once(toolboxWindow, "focus");
+  info("Verify windowed toolbox is focused instead of closed when using " +
+    "toggle key from the main window");
+  let toolboxWindow = toolbox._host._window;
+  let onToolboxWindowFocus = once(toolboxWindow, "focus", true);
   EventUtils.synthesizeKey(key, modifiers);
   yield onToolboxWindowFocus;
   ok(true, "Toolbox focused and not destroyed");
 
-  info('verify windowed toolbox is destroyed when using toggle key from its own window')
+  info("Verify windowed toolbox is destroyed when using toggle key from its " +
+    "own window");
+
   let onToolboxDestroyed = once(gDevTools, "toolbox-destroyed");
   EventUtils.synthesizeKey(key, modifiers, toolboxWindow);
   yield onToolboxDestroyed;
@@ -80,7 +93,8 @@
   return gDevTools.getToolbox(TargetFactory.forTab(tab));
 }
 
-function* cleanup(toolbox) {
-  Services.prefs.setCharPref("devtools.toolbox.host", devtools.Toolbox.HostType.BOTTOM);
+function* cleanup() {
+  Services.prefs.setCharPref("devtools.toolbox.host",
+    devtools.Toolbox.HostType.BOTTOM);
   gBrowser.removeCurrentTab();
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_toolbox_tool_ready.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_toolbox_tool_ready.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_toolbox_tool_ready.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_toolbox_tool_ready.js	2015-05-25 20:42:54.000000000 +0000
@@ -4,12 +4,12 @@
 ///////////////////
 //
 // Whitelisting this test.
-// As part of bug 1077403, the leaking uncaught rejection should be fixed. 
+// As part of bug 1077403, the leaking uncaught rejection should be fixed.
 //
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Shader Editor is still waiting for a WebGL context to be created.");
 
 function performChecks(target) {
-  return Task.spawn(function() {
+  return Task.spawn(function*() {
     let toolIds = gDevTools.getToolDefinitionArray()
                            .filter(def => def.isTargetSupported(target))
                            .map(def => def.id);
@@ -32,7 +32,7 @@
 }
 
 function test() {
-  Task.spawn(function() {
+  Task.spawn(function*() {
     toggleAllTools(true);
     let tab = yield addTab("about:blank");
     let target = TargetFactory.forTab(tab);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_toolbox_tool_remote_reopen.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_toolbox_tool_remote_reopen.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_toolbox_tool_remote_reopen.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_toolbox_tool_remote_reopen.js	2015-05-25 20:42:54.000000000 +0000
@@ -4,7 +4,7 @@
 ///////////////////
 //
 // Whitelisting this test.
-// As part of bug 1077403, the leaking uncaught rejection should be fixed. 
+// As part of bug 1077403, the leaking uncaught rejection should be fixed.
 //
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Shader Editor is still waiting for a WebGL context to be created.");
 
@@ -40,7 +40,7 @@
  */
 
 function runTools(target) {
-  return Task.spawn(function() {
+  return Task.spawn(function*() {
     let toolIds = gDevTools.getToolDefinitionArray()
                            .filter(def => def.isTargetSupported(target))
                            .map(def => def.id);
@@ -96,7 +96,7 @@
 }
 
 function test() {
-  Task.spawn(function() {
+  Task.spawn(function*() {
     toggleAllTools(true);
     yield addTab("about:blank");
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_toolbox_window_title_changes.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_toolbox_window_title_changes.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/browser_toolbox_window_title_changes.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/browser_toolbox_window_title_changes.js	2015-05-25 20:42:54.000000000 +0000
@@ -23,20 +23,20 @@
     let target = TargetFactory.forTab(gBrowser.selectedTab);
     gDevTools.showToolbox(target, null, Toolbox.HostType.BOTTOM)
       .then(function (aToolbox) { toolbox = aToolbox; })
-      .then(function () toolbox.selectTool(TOOL_ID_1))
+      .then(() => toolbox.selectTool(TOOL_ID_1))
 
     // undock toolbox and check title
-      .then(function () toolbox.switchHost(Toolbox.HostType.WINDOW))
+      .then(() => toolbox.switchHost(Toolbox.HostType.WINDOW))
       .then(checkTitle.bind(null, LABEL_1, URL_1, "toolbox undocked"))
 
     // switch to different tool and check title
-      .then(function () toolbox.selectTool(TOOL_ID_2))
+      .then(() => toolbox.selectTool(TOOL_ID_2))
       .then(checkTitle.bind(null, LABEL_2, URL_1, "tool changed"))
 
     // navigate to different url and check title
       .then(function () {
         let deferred = promise.defer();
-        target.once("navigate", function () deferred.resolve());
+        target.once("navigate", () => deferred.resolve());
         gBrowser.loadURI(URL_2);
         return deferred.promise;
       })
@@ -55,12 +55,12 @@
               return gDevTools.showToolbox(target, null, Toolbox.HostType.WINDOW);
             })
             .then(function (aToolbox) { toolbox = aToolbox; })
-            .then(function () toolbox.selectTool(TOOL_ID_1))
+            .then(() => toolbox.selectTool(TOOL_ID_1))
             .then(checkTitle.bind(null, LABEL_1, URL_2,
                                   "toolbox destroyed and recreated"))
 
             // clean up
-            .then(function () toolbox.destroy())
+            .then(() => toolbox.destroy())
             .then(function () {
               toolbox = null;
               gBrowser.removeCurrentTab();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/head.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/head.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/head.js	2015-05-25 20:42:54.000000000 +0000
@@ -1,145 +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/. */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
 
-let TargetFactory = gDevTools.TargetFactory;
-
-const { console } = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
-const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
-const { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-const { ScratchpadManager } = Cu.import("resource:///modules/devtools/scratchpad-manager.jsm", {});
-
-const URL_ROOT = "http://example.com/browser/browser/devtools/framework/test/";
-const CHROME_URL_ROOT = "chrome://mochitests/content/browser/browser/devtools/framework/test/";
-
-let TargetFactory = devtools.TargetFactory;
-
-// All test are asynchronous
-waitForExplicitFinish();
-
-// Uncomment this pref to dump all devtools emitted events to the console.
-// Services.prefs.setBoolPref("devtools.dump.emit", true);
-
-function getFrameScript() {
-  let mm = gBrowser.selectedBrowser.messageManager;
-  let frameURL = "chrome://browser/content/devtools/frame-script-utils.js";
-  mm.loadFrameScript(frameURL, false);
-  SimpleTest.registerCleanupFunction(() => {
-    mm = null;
-  });
-  return mm;
-}
-
-gDevTools.testing = true;
-SimpleTest.registerCleanupFunction(() => {
-  gDevTools.testing = false;
-  Services.prefs.clearUserPref("devtools.dump.emit");
-});
-
-/**
- * Add a new test tab in the browser and load the given url.
- * @param {String} url The url to be loaded in the new tab
- * @return a promise that resolves to the tab object when the url is loaded
- */
-function addTab(url) {
-  info("Adding a new tab with URL: '" + url + "'");
-  let def = promise.defer();
-
-  let tab = gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function onload() {
-    gBrowser.selectedBrowser.removeEventListener("load", onload, true);
-    info("URL '" + url + "' loading complete");
-    def.resolve(tab);
-  }, true);
-  content.location = url;
-
-  return def.promise;
-}
-
-registerCleanupFunction(function tearDown() {
-  while (gBrowser.tabs.length > 1) {
-    gBrowser.removeCurrentTab();
-  }
-});
-
-function synthesizeKeyFromKeyTag(aKeyId, document) {
-  let key = document.getElementById(aKeyId);
-  isnot(key, null, "Successfully retrieved the <key> node");
-
-  let modifiersAttr = key.getAttribute("modifiers");
-
-  let name = null;
-
-  if (key.getAttribute("keycode"))
-    name = key.getAttribute("keycode");
-  else if (key.getAttribute("key"))
-    name = key.getAttribute("key");
-
-  isnot(name, null, "Successfully retrieved keycode/key");
-
-  let modifiers = {
-    shiftKey: modifiersAttr.match("shift"),
-    ctrlKey: modifiersAttr.match("ctrl"),
-    altKey: modifiersAttr.match("alt"),
-    metaKey: modifiersAttr.match("meta"),
-    accelKey: modifiersAttr.match("accel")
-  };
-
-  EventUtils.synthesizeKey(name, modifiers);
-}
-
-/**
- * Wait for eventName on target.
- * @param {Object} target An observable object that either supports on/off or
- * addEventListener/removeEventListener
- * @param {String} eventName
- * @param {Boolean} useCapture Optional, for addEventListener/removeEventListener
- * @return A promise that resolves when the event has been handled
- */
-function once(target, eventName, useCapture=false) {
-  info("Waiting for event: '" + eventName + "' on " + target + ".");
-
-  let deferred = promise.defer();
-
-  for (let [add, remove] of [
-    ["addEventListener", "removeEventListener"],
-    ["addListener", "removeListener"],
-    ["on", "off"]
-  ]) {
-    if ((add in target) && (remove in target)) {
-      target[add](eventName, function onEvent(...aArgs) {
-        info("Got event: '" + eventName + "' on " + target + ".");
-        target[remove](eventName, onEvent, useCapture);
-        deferred.resolve.apply(deferred, aArgs);
-      }, useCapture);
-      break;
-    }
-  }
-
-  return deferred.promise;
-}
-
-/**
- * Some tests may need to import one or more of the test helper scripts.
- * A test helper script is simply a js file that contains common test code that
- * is either not common-enough to be in head.js, or that is located in a separate
- * directory.
- * The script will be loaded synchronously and in the test's scope.
- * @param {String} filePath The file path, relative to the current directory.
- *                 Examples:
- *                 - "helper_attributes_test_runner.js"
- *                 - "../../../commandline/test/helpers.js"
- */
-function loadHelperScript(filePath) {
-  let testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
-  Services.scriptloader.loadSubScript(testDir + "/" + filePath, this);
-}
-
-function waitForTick() {
-  let deferred = promise.defer();
-  executeSoon(deferred.resolve);
-  return deferred.promise;
-}
+// shared-head.js handles imports, constants, and utility functions
+Services.scriptloader.loadSubScript("chrome://mochitests/content/browser/browser/devtools/framework/test/shared-head.js", this);
 
 function toggleAllTools(state) {
   for (let [, tool] of gDevTools._tools) {
@@ -177,26 +40,6 @@
   });
 }
 
-function loadToolbox (url) {
-  let { promise: p, resolve } = promise.defer();
-  gBrowser.selectedTab = gBrowser.addTab();
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-
-  gBrowser.selectedBrowser.addEventListener("load", function onLoad(evt) {
-    gBrowser.selectedBrowser.removeEventListener(evt.type, onLoad, true);
-    gDevTools.showToolbox(target).then(resolve);
-  }, true);
-
-  content.location = url;
-  return p;
-}
-
-function unloadToolbox (toolbox) {
-  return toolbox.destroy().then(function() {
-    gBrowser.removeCurrentTab();
-  });
-}
-
 function getSourceActor(aSources, aURL) {
   let item = aSources.getItemForAttachment(a => a.source.url === aURL);
   return item && item.value;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/shared-head.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/shared-head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/test/shared-head.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/test/shared-head.js	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,162 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 shared-head.js file is used for multiple directories in devtools.
+const {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
+const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+const {ScratchpadManager} = Cu.import("resource:///modules/devtools/scratchpad-manager.jsm", {});
+const {TargetFactory} = devtools;
+
+const TEST_DIR = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
+const CHROME_URL_ROOT = TEST_DIR + "/";
+const URL_ROOT = CHROME_URL_ROOT.replace("chrome://mochitests/content/", "http://example.com/");
+
+// All test are asynchronous
+waitForExplicitFinish();
+
+// Uncomment this pref to dump all devtools emitted events to the console.
+// Services.prefs.setBoolPref("devtools.dump.emit", true);
+
+function getFrameScript() {
+  let mm = gBrowser.selectedBrowser.messageManager;
+  let frameURL = "chrome://browser/content/devtools/frame-script-utils.js";
+  mm.loadFrameScript(frameURL, false);
+  SimpleTest.registerCleanupFunction(() => {
+    mm = null;
+  });
+  return mm;
+}
+
+gDevTools.testing = true;
+SimpleTest.registerCleanupFunction(() => {
+  gDevTools.testing = false;
+  Services.prefs.clearUserPref("devtools.dump.emit");
+});
+
+registerCleanupFunction(function cleanup() {
+  while (gBrowser.tabs.length > 1) {
+    gBrowser.removeCurrentTab();
+  }
+});
+
+
+/**
+ * Add a new test tab in the browser and load the given url.
+ * @param {String} url The url to be loaded in the new tab
+ * @return a promise that resolves to the tab object when the url is loaded
+ */
+function addTab(url) {
+  info("Adding a new tab with URL: '" + url + "'");
+  let def = promise.defer();
+
+  let tab = gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function onload() {
+    gBrowser.selectedBrowser.removeEventListener("load", onload, true);
+    info("URL '" + url + "' loading complete");
+    def.resolve(tab);
+  }, true);
+  content.location = url;
+
+  return def.promise;
+}
+
+function synthesizeKeyFromKeyTag(aKeyId, document) {
+  let key = document.getElementById(aKeyId);
+  isnot(key, null, "Successfully retrieved the <key> node");
+
+  let modifiersAttr = key.getAttribute("modifiers");
+
+  let name = null;
+
+  if (key.getAttribute("keycode"))
+    name = key.getAttribute("keycode");
+  else if (key.getAttribute("key"))
+    name = key.getAttribute("key");
+
+  isnot(name, null, "Successfully retrieved keycode/key");
+
+  let modifiers = {
+    shiftKey: modifiersAttr.match("shift"),
+    ctrlKey: modifiersAttr.match("ctrl"),
+    altKey: modifiersAttr.match("alt"),
+    metaKey: modifiersAttr.match("meta"),
+    accelKey: modifiersAttr.match("accel")
+  };
+
+  EventUtils.synthesizeKey(name, modifiers);
+}
+
+/**
+ * Wait for eventName on target.
+ * @param {Object} target An observable object that either supports on/off or
+ * addEventListener/removeEventListener
+ * @param {String} eventName
+ * @param {Boolean} useCapture Optional, for addEventListener/removeEventListener
+ * @return A promise that resolves when the event has been handled
+ */
+function once(target, eventName, useCapture=false) {
+  info("Waiting for event: '" + eventName + "' on " + target + ".");
+
+  let deferred = promise.defer();
+
+  for (let [add, remove] of [
+    ["addEventListener", "removeEventListener"],
+    ["addListener", "removeListener"],
+    ["on", "off"]
+  ]) {
+    if ((add in target) && (remove in target)) {
+      target[add](eventName, function onEvent(...aArgs) {
+        info("Got event: '" + eventName + "' on " + target + ".");
+        target[remove](eventName, onEvent, useCapture);
+        deferred.resolve.apply(deferred, aArgs);
+      }, useCapture);
+      break;
+    }
+  }
+
+  return deferred.promise;
+}
+
+/**
+ * Some tests may need to import one or more of the test helper scripts.
+ * A test helper script is simply a js file that contains common test code that
+ * is either not common-enough to be in head.js, or that is located in a separate
+ * directory.
+ * The script will be loaded synchronously and in the test's scope.
+ * @param {String} filePath The file path, relative to the current directory.
+ *                 Examples:
+ *                 - "helper_attributes_test_runner.js"
+ *                 - "../../../commandline/test/helpers.js"
+ */
+function loadHelperScript(filePath) {
+  let testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
+  Services.scriptloader.loadSubScript(testDir + "/" + filePath, this);
+}
+
+function waitForTick() {
+  let deferred = promise.defer();
+  executeSoon(deferred.resolve);
+  return deferred.promise;
+}
+
+function loadToolbox (url) {
+  let { promise: p, resolve } = promise.defer();
+  gBrowser.selectedTab = gBrowser.addTab();
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+
+  gBrowser.selectedBrowser.addEventListener("load", function onLoad(evt) {
+    gBrowser.selectedBrowser.removeEventListener(evt.type, onLoad, true);
+    gDevTools.showToolbox(target).then(resolve);
+  }, true);
+
+  content.location = url;
+  return p;
+}
+
+function unloadToolbox (toolbox) {
+  return toolbox.destroy().then(function() {
+    gBrowser.removeCurrentTab();
+  });
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/toolbox.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/toolbox.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/toolbox.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/toolbox.js	2015-05-25 20:42:54.000000000 +0000
@@ -1479,8 +1479,8 @@
   },
 
   /**
-   * Switch to a new host for the toolbox UI. E.g.
-   * bottom, sidebar, separate window.
+   * Switch to a new host for the toolbox UI. E.g. bottom, sidebar, window,
+   * and focus the window when done.
    *
    * @param {string} hostType
    *        The host type of the new host object
@@ -1496,6 +1496,11 @@
       iframe.QueryInterface(Ci.nsIFrameLoaderOwner);
       iframe.swapFrameLoaders(this.frame);
 
+      // See bug 1022726, most probably because of swapFrameLoaders we need to
+      // first focus the window here, and then once again further below to make
+      // sure focus actually happens.
+      this.frame.contentWindow.focus();
+
       this._host.off("window-closed", this.destroy);
       this.destroyHost();
 
@@ -1508,6 +1513,10 @@
       this._buildDockButtons();
       this._addKeysToWindow();
 
+      // Focus the contentWindow to make sure keyboard shortcuts work straight
+      // away.
+      this.frame.contentWindow.focus();
+
       this.emit("host-changed");
     });
   },
@@ -1753,7 +1762,8 @@
 
     // Now that we are closing the toolbox we can re-enable the cache settings
     // and disable the service workers testing settings for the current tab.
-    if (this.target.activeTab) {
+    // FF41+ automatically cleans up state in actor on disconnect.
+    if (this.target.activeTab && !this.target.activeTab.traits.noTabReconfigureOnClose) {
       this.target.activeTab.reconfigure({
         "cacheDisabled": false,
         "serviceWorkersTestingEnabled": false
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/toolbox-options.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/toolbox-options.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/toolbox-options.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/toolbox-options.js	2015-05-25 20:42:54.000000000 +0000
@@ -316,8 +316,8 @@
 
     if (this.target.activeTab) {
       this.target.client.attachTab(this.target.activeTab._actor, (response) => {
-        this._origJavascriptEnabled = response.javascriptEnabled;
-        this.disableJSNode.checked = !this._origJavascriptEnabled;
+        this._origJavascriptEnabled = !response.javascriptEnabled;
+        this.disableJSNode.checked = this._origJavascriptEnabled;
         this.disableJSNode.addEventListener("click", this._disableJSClicked, false);
       });
     } else {
@@ -370,25 +370,29 @@
     }
 
     let deferred = promise.defer();
-
     this.destroyPromise = deferred.promise;
+
     this._removeListeners();
 
     if (this.target.activeTab) {
-      this.disableJSNode.removeEventListener("click", this._disableJSClicked, false);
-      // If JavaScript is disabled we need to revert it to it's original value.
-      let options = {
-        "javascriptEnabled": this._origJavascriptEnabled
-      };
-      this.target.activeTab.reconfigure(options, () => {
-        this.toolbox = null;
+      this.disableJSNode.removeEventListener("click", this._disableJSClicked);
+      // FF41+ automatically cleans up state in actor on disconnect
+      if (!this.target.activeTab.traits.noTabReconfigureOnClose) {
+        let options = {
+          "javascriptEnabled": this._origJavascriptEnabled,
+          "performReload": false
+        };
+        this.target.activeTab.reconfigure(options, deferred.resolve);
+      } else {
         deferred.resolve();
-      }, true);
+      }
+    } else {
+      deferred.resolve();
     }
 
-    this.panelWin = this.panelDoc = this.disableJSNode = null;
+    this.panelWin = this.panelDoc = this.disableJSNode = this.toolbox = null;
 
-    return deferred.promise;
+    return this.destroyPromise;
   }
 };
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/toolbox-process-window.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/toolbox-process-window.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/framework/toolbox-process-window.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/framework/toolbox-process-window.js	2015-05-25 20:42:54.000000000 +0000
@@ -54,7 +54,6 @@
   Services.prefs.setBoolPref("devtools.performance.ui.show-platform-data", true);
   Services.prefs.setBoolPref("devtools.inspector.showAllAnonymousContent", true);
   Services.prefs.setBoolPref("browser.dom.window.dump.enabled", true);
-  Services.prefs.setBoolPref("devtools.command-button-frames.enabled", true);
 }
 
 window.addEventListener("load", function() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/inspector/breadcrumbs.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/inspector/breadcrumbs.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/inspector/breadcrumbs.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/inspector/breadcrumbs.js	2015-05-25 20:42:54.000000000 +0000
@@ -58,7 +58,9 @@
 exports.HTMLBreadcrumbs = HTMLBreadcrumbs;
 
 HTMLBreadcrumbs.prototype = {
-  get walker() this.inspector.walker,
+  get walker() {
+    return this.inspector.walker;
+  },
 
   _init: function() {
     this.container = this.chromeDoc.getElementById("inspector-breadcrumbs");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/inspector/inspector-panel.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/inspector/inspector-panel.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/inspector/inspector-panel.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/inspector/inspector-panel.js	2015-05-25 20:42:54.000000000 +0000
@@ -451,8 +451,7 @@
 
     // On any new selection made by the user, store the unique css selector
     // of the selected node so it can be restored after reload of the same page
-    if (reason !== "navigateaway" &&
-        this.canGetUniqueSelector &&
+    if (this.canGetUniqueSelector &&
         this.selection.isElementNode()) {
       selection.getUniqueSelector().then(selector => {
         this.selectionCssSelector = selector;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/inspector/selector-search.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/inspector/selector-search.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/inspector/selector-search.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/inspector/selector-search.js	2015-05-25 20:42:54.000000000 +0000
@@ -73,8 +73,9 @@
 exports.SelectorSearch = SelectorSearch;
 
 SelectorSearch.prototype = {
-
-  get walker() this.inspector.walker,
+  get walker() {
+    return this.inspector.walker;
+  },
 
   // The possible states of the query.
   States: {
@@ -445,27 +446,27 @@
         let lastPart = query.match(/[a-zA-Z][#\.][^#\.\s>+]*$/)[0];
         value = query.slice(0, -1 * lastPart.length + 1) + value;
       }
-
+
       let item = {
         preLabel: query,
         label: value,
         count: count
       };
-
-      // In case of tagNames, change te case to small
+
+      // In case of tagNames, change the case to small
       if (value.match(/.*[\.#][^\.#]{0,}$/) == null) {
         item.label = value.toLowerCase();
       }
-
-      // In case the query's state is tag and the item's state is id or class
-      // adjust the preLabel
-      if (aState === this.States.TAG && state === this.States.CLASS) {
-        item.preLabel = "." + item.preLabel;
-      }
-      if (aState === this.States.TAG && state === this.States.ID) {
-        item.preLabel = "#" + item.preLabel;
-      }
-
+
+      // In case the query's state is tag and the item's state is id or class
+      // adjust the preLabel
+      if (aState === this.States.TAG && state === this.States.CLASS) {
+        item.preLabel = "." + item.preLabel;
+      }
+      if (aState === this.States.TAG && state === this.States.ID) {
+        item.preLabel = "#" + item.preLabel;
+      }
+
       items.unshift(item);
       if (++total > MAX_SUGGESTIONS - 1) {
         break;
@@ -486,9 +487,9 @@
    */
   showSuggestions: function() {
     let query = this.searchBox.value;
-    let state = this.state;
+    let state = this.state;
     let firstPart = "";
-
+
     if (state == this.States.TAG) {
       // gets the tag that is being completed. For ex. 'div.foo > s' returns 's',
       // 'di' returns 'di' and likewise.
@@ -510,7 +511,7 @@
     if (/[\s+>~]$/.test(query)) {
       query += "*";
     }
-
+
     this._currentSuggesting = query;
     return this.walker.getSuggestionsForQuery(query, firstPart, state).then(result => {
       if (this._currentSuggesting != result.query) {
@@ -519,14 +520,14 @@
         return;
       }
       this._lastToLastValidSearch = this._lastValidSearch;
-
+
       if (state == this.States.CLASS) {
         firstPart = "." + firstPart;
       }
       else if (state == this.States.ID) {
         firstPart = "#" + firstPart;
       }
-
+
       this._showPopup(result.suggestions, firstPart, state);
     });
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/jar.mn firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/jar.mn
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/jar.mn	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/jar.mn	2015-05-25 20:42:54.000000000 +0000
@@ -100,6 +100,7 @@
     content/browser/devtools/webaudioeditor/views/properties.js        (webaudioeditor/views/properties.js)
     content/browser/devtools/webaudioeditor/views/automation.js        (webaudioeditor/views/automation.js)
     content/browser/devtools/performance.xul                           (performance/performance.xul)
+*   content/browser/devtools/performance/system.js                     (performance/system.js)
     content/browser/devtools/performance/performance-controller.js     (performance/performance-controller.js)
     content/browser/devtools/performance/performance-view.js           (performance/performance-view.js)
     content/browser/devtools/performance/views/overview.js             (performance/views/overview.js)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/layoutview/view.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/layoutview/view.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/layoutview/view.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/layoutview/view.js	2015-05-25 20:42:54.000000000 +0000
@@ -462,7 +462,7 @@
         this.sizeLabel.textContent = newValue;
       }
 
-      this.elementRules = [e.rule for (e of styleEntries)];
+      this.elementRules = styleEntries.map(e => e.rule);
 
       this.inspector.emit("layoutview-updated");
     }).bind(this)).then(null, console.error);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/markup-view.css firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/markup-view.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/markup-view.css	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/markup-view.css	2015-05-25 20:42:54.000000000 +0000
@@ -182,3 +182,13 @@
   display: none;
   cursor: pointer;
 }
+
+.editor.text {
+  display: inline-block;
+}
+
+.editor.text pre,
+.editor.comment pre {
+  font: inherit;
+}
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/markup-view.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/markup-view.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/markup-view.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/markup-view.js	2015-05-25 20:42:54.000000000 +0000
@@ -419,10 +419,13 @@
   },
 
   /**
-   * Highlight the inspector selected node.
+   * React to new-node-front selection events.
+   * Highlights the node if needed, and make sure it is shown and selected in
+   * the view.
    */
   _onNewSelection: function() {
     let selection = this._inspector.selection;
+    let reason = selection.reason;
 
     this.htmlEditor.hide();
     if (this._hoveredNode && this._hoveredNode !== selection.nodeFront) {
@@ -430,34 +433,57 @@
       this._hoveredNode = null;
     }
 
+    if (!selection.isNode()) {
+      this.unmarkSelectedNode();
+      return;
+    }
+
     let done = this._inspector.updating("markup-view");
-    if (selection.isNode()) {
-      if (this._shouldNewSelectionBeHighlighted()) {
-        this._brieflyShowBoxModel(selection.nodeFront);
+
+    // Highlight the element briefly if needed.
+    if (this._shouldNewSelectionBeHighlighted()) {
+      this._brieflyShowBoxModel(selection.nodeFront);
+    }
+
+    this.showNode(selection.nodeFront).then(() => {
+      // We could be destroyed by now.
+      if (this._destroyer) {
+        return promise.reject("markupview destroyed");
       }
 
-      this.showNode(selection.nodeFront).then(() => {
-        if (this._destroyer) {
-          return promise.reject("markupview destroyed");
-        }
-        if (selection.reason !== "treepanel") {
-          this.markNodeAsSelected(selection.nodeFront);
-        }
-        done();
-      }).then(null, e => {
-        if (!this._destroyer) {
-          console.error(e);
-        } else {
-          console.warn("Could not mark node as selected, the markup-view was " +
-            "destroyed while showing the node.");
-        }
+      // Mark the node as selected.
+      this.markNodeAsSelected(selection.nodeFront);
+
+      // Make sure the new selection receives focus so the keyboard can be used.
+      this.maybeFocusNewSelection();
+
+      done();
+    }).catch(e => {
+      if (!this._destroyer) {
+        console.error(e);
+      } else {
+        console.warn("Could not mark node as selected, the markup-view was " +
+          "destroyed while showing the node.");
+      }
 
-        done();
-      });
-    } else {
-      this.unmarkSelectedNode();
       done();
+    });
+  },
+
+  /**
+   * Focus the current node selection's MarkupContainer if the selection
+   * happened because the user picked an element using the element picker or
+   * browser context menu.
+   */
+  maybeFocusNewSelection: function() {
+    let {reason, nodeFront} = this._inspector.selection;
+
+    if (reason !== "browser-context-menu" &&
+        reason !== "picker-node-picked") {
+      return;
     }
+
+    this.getContainer(nodeFront).focus();
   },
 
   /**
@@ -874,7 +900,7 @@
         console.warn("Could not expand the node, the markup-view was destroyed");
         return;
       }
-      aContainer.expanded = true;
+      aContainer.setExpanded(true);
     });
   },
 
@@ -919,7 +945,7 @@
    */
   collapseNode: function(aNode) {
     let container = this.getContainer(aNode);
-    container.expanded = false;
+    container.setExpanded(false);
   },
 
   /**
@@ -1155,22 +1181,33 @@
   /**
    * Mark the given node selected, and update the inspector.selection
    * object's NodeFront to keep consistent state between UI and selection.
-   * @param aNode The NodeFront to mark as selected.
+   * @param {NodeFront} aNode The NodeFront to mark as selected.
+   * @param {String} reason The reason for marking the node as selected.
+   * @return {Boolean} False if the node is already marked as selected, true
+   * otherwise.
    */
-  markNodeAsSelected: function(aNode, reason) {
-    let container = this.getContainer(aNode);
+  markNodeAsSelected: function(node, reason) {
+    let container = this.getContainer(node);
     if (this._selectedContainer === container) {
       return false;
     }
+
+    // Un-select the previous container.
     if (this._selectedContainer) {
       this._selectedContainer.selected = false;
     }
+
+    // Select the new container.
     this._selectedContainer = container;
-    if (aNode) {
+    if (node) {
       this._selectedContainer.selected = true;
     }
 
-    this._inspector.selection.setNodeFront(aNode, reason || "nodeselected");
+    // Change the current selection if needed.
+    if (this._inspector.selection.nodeFront !== node) {
+      this._inspector.selection.setNodeFront(node, reason || "nodeselected");
+    }
+
     return true;
   },
 
@@ -1264,11 +1301,40 @@
       return promise.resolve(aContainer);
     }
 
+    if (aContainer.singleTextChild
+        && aContainer.singleTextChild != aContainer.node.singleTextChild) {
+
+      // This container was doing double duty as a container for a single
+      // text child, back that out.
+      this._containers.delete(aContainer.singleTextChild);
+      aContainer.clearSingleTextChild();
+
+      if (aContainer.hasChildren && aContainer.selected) {
+        aContainer.setExpanded(true);
+      }
+    }
+
+    if (aContainer.node.singleTextChild) {
+      aContainer.setExpanded(false);
+      // this container will do double duty as the container for the single
+      // text child.
+      while (aContainer.children.firstChild) {
+        aContainer.children.removeChild(aContainer.children.firstChild);
+      }
+
+      aContainer.setSingleTextChild(aContainer.node.singleTextChild);
+
+      this._containers.set(aContainer.node.singleTextChild, aContainer);
+      aContainer.childrenDirty = false;
+      return promise.resolve(aContainer);
+    }
+
     if (!aContainer.hasChildren) {
       while (aContainer.children.firstChild) {
         aContainer.children.removeChild(aContainer.children.firstChild);
       }
       aContainer.childrenDirty = false;
+      aContainer.setExpanded(false);
       return promise.resolve(aContainer);
     }
 
@@ -1344,7 +1410,8 @@
     if (!this._queuedChildUpdates) {
       return promise.resolve(undefined);
     }
-    return promise.all([updatePromise for (updatePromise of this._queuedChildUpdates.values())]);
+
+    return promise.all([...this._queuedChildUpdates.values()]);
   },
 
   /**
@@ -1705,11 +1772,22 @@
 
   set hasChildren(aValue) {
     this._hasChildren = aValue;
+    this.updateExpander();
+  },
+
+  /**
+   * True if the current node can be expanded.
+   */
+  get canExpand() {
+    return this._hasChildren && !this.node.singleTextChild;
+  },
+
+  updateExpander: function() {
     if (!this.expander) {
       return;
     }
 
-    if (aValue) {
+    if (this.canExpand) {
       this.expander.style.visibility = "visible";
     } else {
       this.expander.style.visibility = "hidden";
@@ -1735,11 +1813,15 @@
     return !this.elt.classList.contains("collapsed");
   },
 
-  set expanded(aValue) {
+  setExpanded: function(aValue) {
     if (!this.expander) {
       return;
     }
 
+    if (!this.canExpand) {
+      aValue = false;
+    }
+
     if (aValue && this.elt.classList.contains("collapsed")) {
       // Expanding a node means cloning its "inline" closing tag into a new
       // tag-line that the user can interact with and showing the children.
@@ -1766,6 +1848,7 @@
     } else if (!aValue) {
       if (this.closeTagLine) {
         this.elt.removeChild(this.closeTagLine);
+        this.closeTagLine = undefined;
       }
       this.elt.classList.add("collapsed");
       this.expander.removeAttribute("open");
@@ -1816,7 +1899,7 @@
     // line. So, if the click happened outside of a focusable element, do
     // prevent the default behavior, so that the tagname or textcontent gains
     // focus.
-    if (!target.closest(".open [tabindex]")) {
+    if (!target.closest(".editor [tabindex]")) {
       event.preventDefault();
     }
 
@@ -2169,9 +2252,19 @@
     // the tooltip, because we want the full-size image
     this.node.getImageData().then(data => {
       data.data.string().then(str => {
-        clipboardHelper.copyString(str, this.markup.doc);
+        clipboardHelper.copyString(str);
       });
     });
+  },
+
+  setSingleTextChild: function(singleTextChild) {
+    this.singleTextChild = singleTextChild;
+    this.editor.updateTextEditor();
+  },
+
+  clearSingleTextChild: function() {
+    this.singleTextChild = undefined;
+    this.editor.updateTextEditor();
   }
 });
 
@@ -2199,7 +2292,9 @@
    */
   getChildContainers: function() {
     return [...this.children.children].map(node => node.container);
-  }
+  },
+
+  setExpanded: function(aValue) {}
 };
 
 /**
@@ -2277,7 +2372,10 @@
 }
 
 TextEditor.prototype = {
-  get selected() this._selected,
+  get selected() {
+    return this._selected;
+  },
+
   set selected(aValue) {
     if (aValue === this._selected) {
       return;
@@ -2302,6 +2400,7 @@
         longstr.release().then(null, console.error);
         if (this.selected) {
           this.value.textContent = str;
+          this.markup.emit("text-expand")
         }
       }).then(null, console.error);
     }
@@ -2387,6 +2486,12 @@
 
 ElementEditor.prototype = {
 
+  set selected(aValue) {
+    if (this.textEditor) {
+      this.textEditor.selected = aValue;
+    }
+  },
+
   flashAttribute: function(attrName) {
     if (this.animationTimers[attrName]) {
       clearTimeout(this.animationTimers[attrName]);
@@ -2439,6 +2544,33 @@
         }
       }
     }
+
+    this.updateTextEditor();
+  },
+
+  /**
+   * Update the inline text editor in case of a single text child node.
+   */
+  updateTextEditor: function() {
+    let node = this.node.singleTextChild;
+
+    if (this.textEditor && this.textEditor.node != node) {
+      this.elt.removeChild(this.textEditor.elt);
+      this.textEditor = null;
+    }
+
+    if (node && !this.textEditor) {
+      // Create a text editor added to this editor.
+      // This editor won't receive an update automatically, so we rely on
+      // child text editors to let us know that we need updating.
+      this.textEditor = new TextEditor(this.container, node, "text");
+      this.elt.insertBefore(this.textEditor.elt,
+                            this.elt.firstChild.nextSibling.nextSibling);
+    }
+
+    if (this.textEditor) {
+      this.textEditor.update();
+    }
   },
 
   _startModifyingAttributes: function() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/markup-view.xhtml firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/markup-view.xhtml
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/markup-view.xhtml	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/markup-view.xhtml	2015-05-25 20:42:54.000000000 +0000
@@ -84,9 +84,9 @@
    --></span><!--
  --></span>
 
-    <span id="template-text" save="${elt}" class="editor text">
-      <pre save="${value}" style="display:inline-block; white-space: normal;" tabindex="0"></pre>
-    </span>
+    <span id="template-text" save="${elt}" class="editor text"><!--
+   --><pre save="${value}" style="display:inline-block; white-space: normal;" tabindex="0"></pre><!--
+ --></span>
 
     <span id="template-comment"
           save="${elt}"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/test/browser.ini firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/test/browser.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/test/browser.ini	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/test/browser.ini	2015-05-25 20:42:54.000000000 +0000
@@ -83,6 +83,7 @@
 [browser_markupview_keybindings_01.js]
 [browser_markupview_keybindings_02.js]
 [browser_markupview_keybindings_03.js]
+[browser_markupview_keybindings_04.js]
 [browser_markupview_mutation_01.js]
 [browser_markupview_mutation_02.js]
 [browser_markupview_navigation.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/test/browser_markupview_html_edit_01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/test/browser_markupview_html_edit_01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/test/browser_markupview_html_edit_01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/test/browser_markupview_html_edit_01.js	2015-05-25 20:42:54.000000000 +0000
@@ -66,7 +66,7 @@
   "<!DOCTYPE html>" +
   "<head><meta charset='utf-8' /></head>" +
   "<body>" +
-  [outer.oldHTML for (outer of TEST_DATA)].join("\n") +
+  TEST_DATA.map(outer => outer.oldHTML).join("\n") +
   "</body>" +
   "</html>";
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/test/browser_markupview_html_edit_02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/test/browser_markupview_html_edit_02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/test/browser_markupview_html_edit_02.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/test/browser_markupview_html_edit_02.js	2015-05-25 20:42:54.000000000 +0000
@@ -89,7 +89,7 @@
   "<!DOCTYPE html>" +
   "<head><meta charset='utf-8' /></head>" +
   "<body>" +
-  [outer.oldHTML for (outer of TEST_DATA)].join("\n") +
+  TEST_DATA.map(outer => outer.oldHTML).join("\n") +
   "</body>" +
   "</html>";
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/test/browser_markupview_keybindings_04.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/test/browser_markupview_keybindings_04.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/test/browser_markupview_keybindings_04.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/test/browser_markupview_keybindings_04.js	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,80 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* global nsContextMenu*/
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Tests that selecting a node using the browser context menu (inspect element)
+// or the element picker focuses that node so that the keyboard can be used
+// immediately.
+
+const TEST_URL = "data:text/html;charset=utf8,<div>test element</div>";
+
+add_task(function*() {
+  let {inspector} = yield addTab(TEST_URL).then(openInspector);
+
+  info("Select the test node with the browser ctx menu");
+  yield selectWithBrowserMenu(inspector);
+  assertNodeSelected(inspector, "div");
+
+  info("Press arrowUp to focus <body> " +
+       "(which works if the node was focused properly)");
+  EventUtils.synthesizeKey("VK_UP", {});
+  yield waitForChildrenUpdated(inspector);
+  assertNodeSelected(inspector, "body");
+
+  info("Select the test node with the element picker");
+  yield selectWithElementPicker(inspector);
+  assertNodeSelected(inspector, "div");
+
+  info("Press arrowUp to focus <body> " +
+       "(which works if the node was focused properly)");
+  EventUtils.synthesizeKey("VK_UP", {});
+  yield waitForChildrenUpdated(inspector);
+  assertNodeSelected(inspector, "body");
+});
+
+function assertNodeSelected(inspector, tagName) {
+  is(inspector.selection.nodeFront.tagName.toLowerCase(), tagName,
+    `The <${tagName}> node is selected`);
+}
+
+function* selectWithBrowserMenu(inspector) {
+  yield executeInContent("Test:SynthesizeMouse", {
+    center: true,
+    selector: "div",
+    options: {type: "contextmenu", button: 2}
+  });
+
+  // nsContextMenu also requires the popupNode to be set, but we can't set it to
+  // node under e10s as it's a CPOW, not a DOM node. But under e10s,
+  // nsContextMenu won't use the property anyway, so just try/catching is ok.
+  try {
+    document.popupNode = getNode("div");
+  } catch (e) {}
+
+  let contentAreaContextMenu = document.querySelector("#contentAreaContextMenu");
+  let contextMenu = new nsContextMenu(contentAreaContextMenu);
+  yield contextMenu.inspectNode();
+
+  contentAreaContextMenu.hidden = true;
+  contentAreaContextMenu.hidePopup();
+  contextMenu.hiding();
+
+  yield inspector.once("inspector-updated");
+}
+
+function* selectWithElementPicker(inspector) {
+  yield inspector.toolbox.highlighterUtils.startPicker();
+  yield executeInContent("Test:SynthesizeMouse", {
+    center: true,
+    selector: "div",
+    options: {type: "mousemove"}
+  });
+  executeInContent("Test:SynthesizeKey", {
+    key: "VK_RETURN",
+    options: {}
+  }, false);
+  yield inspector.once("inspector-updated");
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/test/browser_markupview_mutation_01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/test/browser_markupview_mutation_01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/test/browser_markupview_mutation_01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/test/browser_markupview_mutation_01.js	2015-05-25 20:42:54.000000000 +0000
@@ -72,12 +72,75 @@
       node1.textContent = "newtext";
     },
     check: function*(inspector) {
-      let {children} = yield getContainerForSelector("#node1", inspector);
-      is(children.querySelector(".text").textContent.trim(), "newtext",
-        "The new textcontent was updated");
+      let container = yield getContainerForSelector("#node1", inspector);
+      ok(container.singleTextChild, "Has single text child.");
+      ok(!container.canExpand, "Can't expand container with singleTextChild.");
+      ok(!container.singleTextChild.canExpand, "Can't expand singleTextChild.");
+      is(container.editor.elt.querySelector(".text").textContent.trim(), "newtext",
+        "Single text child editor updated.");
     }
   },
   {
+    desc: "Adding a second text child",
+    test: () => {
+      let node1 = getNode("#node1");
+      let newText = node1.ownerDocument.createTextNode("more");
+      node1.appendChild(newText);
+    },
+    check: function*(inspector) {
+      let container = yield getContainerForSelector("#node1", inspector);
+      ok(!container.singleTextChild, "Does not have single text child.");
+      ok(container.canExpand, "Can expand container with child nodes.");
+      ok(container.editor.elt.querySelector(".text") == null,
+        "Single text child editor removed.");
+    },
+  },
+  {
+    desc: "Go from 2 to 1 text child",
+    test: () => {
+      let node1 = getNode("#node1");
+      node1.textContent = "newtext";
+    },
+    check: function*(inspector) {
+      let container = yield getContainerForSelector("#node1", inspector);
+      ok(container.singleTextChild, "Has single text child.");
+      ok(!container.canExpand, "Can't expand container with singleTextChild.");
+      ok(!container.singleTextChild.canExpand, "Can't expand singleTextChild.");
+      ok(container.editor.elt.querySelector(".text").textContent.trim(), "newtext",
+        "Single text child editor updated.");
+    },
+  },
+  {
+    desc: "Removing an only text child",
+    test: () => {
+      let node1 = getNode("#node1");
+      node1.innerHTML = "";
+    },
+    check: function*(inspector) {
+      let container = yield getContainerForSelector("#node1", inspector);
+      ok(!container.singleTextChild, "Does not have single text child.");
+      ok(!container.canExpand, "Can't expand empty container.");
+      ok(container.editor.elt.querySelector(".text") == null,
+        "Single text child editor removed.");
+    },
+  },
+  {
+    desc: "Go from 0 to 1 text child",
+    test: () => {
+      let node1 = getNode("#node1");
+      node1.textContent = "newtext";
+    },
+    check: function*(inspector) {
+      let container = yield getContainerForSelector("#node1", inspector);
+      ok(container.singleTextChild, "Has single text child.");
+      ok(!container.canExpand, "Can't expand container with singleTextChild.");
+      ok(!container.singleTextChild.canExpand, "Can't expand singleTextChild.");
+      ok(container.editor.elt.querySelector(".text").textContent.trim(), "newtext",
+        "Single text child editor updated.");
+    },
+  },
+
+  {
     desc: "Updating the innerHTML",
     test: () => {
       let node2 = getNode("#node2");
@@ -150,17 +213,20 @@
       node20.appendChild(node18);
     },
     check: function*(inspector) {
+      yield inspector.markup.expandAll();
+
       let {children} = yield getContainerForSelector("#node1", inspector);
       is(children.childNodes.length, 2,
         "Node1 now has 2 children (textnode and node20)");
 
       let node20 = children.childNodes[1];
-      let node20Children = node20.querySelector(".children")
-      is(node20Children.childNodes.length, 2, "Node20 has 2 children (21 and 18)");
+      let node20Children = node20.container.children;
+      is(node20Children.childNodes.length, 2,
+          "Node20 has 2 children (21 and 18)");
 
       let node21 = node20Children.childNodes[0];
-      is(node21.querySelector(".children").textContent.trim(), "line21",
-        "Node21 only has a text node child");
+      is(node21.container.editor.elt.querySelector(".text").textContent.trim(), "line21",
+        "Node21 has a single text child");
 
       let node18 = node20Children.childNodes[1];
       is(node18.querySelector(".open .attreditor .attr-value").textContent.trim(),
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/test/browser_markupview_navigation.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/test/browser_markupview_navigation.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/test/browser_markupview_navigation.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/test/browser_markupview_navigation.js	2015-05-25 20:42:54.000000000 +0000
@@ -33,8 +33,6 @@
   ["right", "node7"],
   ["right", "*text*"],
   ["down", "node8"],
-  ["right", "node8"],
-  ["left", "node8"],
   ["down", "node9"],
   ["down", "node10"],
   ["down", "node11"],
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/test/browser_markupview_textcontent_edit_01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/test/browser_markupview_textcontent_edit_01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/test/browser_markupview_textcontent_edit_01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/test/browser_markupview_textcontent_edit_01.js	2015-05-25 20:42:54.000000000 +0000
@@ -15,17 +15,60 @@
   yield inspector.markup.expandAll();
   yield waitForMultipleChildrenUpdates(inspector);
 
-  let node = getNode(".node6").firstChild;
-  is(node.nodeValue, "line6", "The test node's text content is correct");
+  yield editContainer(inspector, {
+    selector: ".node6",
+    newValue: "New text",
+    oldValue: "line6"
+  });
 
-  info("Changing the text content");
+  yield editContainer(inspector, {
+    selector: "#node17",
+    newValue: "LOREM IPSUM DOLOR SIT AMET, CONSECTETUR ADIPISCING ELIT. DONEC POSUERE PLACERAT MAGNA ET IMPERDIET.",
+    oldValue: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec posuere placerat magna et imperdiet.",
+    shortValue: true
+  });
 
-  info("Listening to the markupmutation event");
+  yield editContainer(inspector, {
+    selector: "#node17",
+    newValue: "New value",
+    oldValue: "LOREM IPSUM DOLOR SIT AMET, CONSECTETUR ADIPISCING ELIT. DONEC POSUERE PLACERAT MAGNA ET IMPERDIET.",
+    shortValue: true
+  });
+});
+
+function* editContainer(inspector, {selector, newValue, oldValue, shortValue}) {
+  let node = getNode(selector).firstChild;
+  is(node.nodeValue, oldValue, "The test node's text content is correct");
+
+  info("Changing the text content");
   let onMutated = inspector.once("markupmutation");
-  let container = yield getContainerForSelector(".node6", inspector);
+  let container = yield getContainerForSelector(selector, inspector);
   let field = container.elt.querySelector("pre");
-  setEditableFieldValue(field, "New text", inspector);
+
+  if (shortValue) {
+    is (oldValue.indexOf(field.textContent.substring(0, field.textContent.length - 1)), 0,
+        "The shortened value starts with the full value " + field.textContent);
+    ok (oldValue.length > field.textContent.length, "The shortened value is short");
+  } else {
+    is (field.textContent, oldValue, "The text node has the correct original value");
+  }
+
+  inspector.markup.markNodeAsSelected(container.node);
+
+  if (shortValue) {
+    info("Waiting for the text to be updated");
+    yield inspector.markup.once("text-expand");
+  }
+
+  is (field.textContent, oldValue, "The text node has the correct original value after selecting");
+  setEditableFieldValue(field, newValue, inspector);
+
+  info("Listening to the markupmutation event");
   yield onMutated;
 
-  is(node.nodeValue, "New text", "Test test node's text content has changed");
-});
+  is(node.nodeValue, newValue, "The test node's text content has changed");
+
+  info("Selecting the <body> to reset the selection");
+  let bodyContainer = yield getContainerForSelector("body", inspector);
+  inspector.markup.markNodeAsSelected(bodyContainer.node);
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/test/doc_markup_dragdrop.html firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/test/doc_markup_dragdrop.html
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/test/doc_markup_dragdrop.html	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/test/doc_markup_dragdrop.html	2015-05-25 20:42:54.000000000 +0000
@@ -20,7 +20,7 @@
   </div>
   <input id="anonymousParent" />
 
-  <span id="before">Before</span>
+  <span id="before">Before<!-- Force not-inline --></span>
   <pre id="test">
     <span id="firstChild">First</span>
     <span id="middleChild">Middle</span>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/test/doc_markup_edit.html firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/test/doc_markup_edit.html
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/test/doc_markup_edit.html	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/test/doc_markup_edit.html	2015-05-25 20:42:54.000000000 +0000
@@ -22,7 +22,7 @@
       <p class="node15">line15</p>
     </div>
     <div id="node16">
-      <p id="node17">line17</p>
+      <p id="node17">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec posuere placerat magna et imperdiet.</p>
     </div>
     <div id="node18">
       <div id="node19">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/test/doc_markup_toggle.html firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/test/doc_markup_toggle.html
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/markupview/test/doc_markup_toggle.html	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/markupview/test/doc_markup_toggle.html	2015-05-25 20:42:54.000000000 +0000
@@ -6,23 +6,23 @@
 <body>
   <ul>
     <li>
-      <span>list <em>item</em></span>
+      <span>list <em>item<!-- force expand --></em></span>
     </li>
     <li>
-      <span>list <em>item</em></span>
+      <span>list <em>item<!-- force expand --></em></span>
     </li>
     <li>
-      <span>list <em>item</em></span>
+      <span>list <em>item<!-- force expand --></em></span>
     </li>
     <li>
-      <span>list <em>item</em></span>
+      <span>list <em>item<!-- force expand --></em></span>
     </li>
     <li>
-      <span>list <em>item</em></span>
+      <span>list <em>item<!-- force expand --></em></span>
     </li>
     <li>
-      <span>list <em>item</em></span>
+      <span>list <em>item<!-- force expand --></em></span>
     </li>
   </ul>
 </body>
-</html>
\ No newline at end of file
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/netmonitor/netmonitor-view.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/netmonitor/netmonitor-view.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/netmonitor/netmonitor-view.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/netmonitor/netmonitor-view.js	2015-05-25 20:42:55.000000000 +0000
@@ -563,7 +563,7 @@
    */
   copyUrl: function() {
     let selected = this.selectedItem.attachment;
-    clipboardHelper.copyString(selected.url, document);
+    clipboardHelper.copyString(selected.url);
   },
 
   /**
@@ -573,10 +573,87 @@
     let selected = this.selectedItem.attachment;
     let params = nsIURL(selected.url).query.split("&");
     let string = params.join(Services.appinfo.OS === "WINNT" ? "\r\n" : "\n");
-    clipboardHelper.copyString(params.join("\n"), document);
+    clipboardHelper.copyString(string);
   },
 
   /**
+   * Extracts any urlencoded form data sections (e.g. "?foo=bar&baz=42") from a
+   * POST request.
+   *
+   * @param object aHeaders
+   *        The "requestHeaders".
+   * @param object aUploadHeaders
+   *        The "requestHeadersFromUploadStream".
+   * @param object aPostData
+   *        The "requestPostData".
+   * @return array
+   *        A promise that is resolved with the extracted form data.
+   */
+  _getFormDataSections: Task.async(function*(aHeaders, aUploadHeaders, aPostData) {
+    let formDataSections = [];
+
+    let { headers: requestHeaders } = aHeaders;
+    let { headers: payloadHeaders } = aUploadHeaders;
+    let allHeaders = [...payloadHeaders, ...requestHeaders];
+
+    let contentTypeHeader = allHeaders.find(e => e.name.toLowerCase() == "content-type");
+    let contentTypeLongString = contentTypeHeader ? contentTypeHeader.value : "";
+    let contentType = yield gNetwork.getString(contentTypeLongString);
+
+    if (contentType.includes("x-www-form-urlencoded")) {
+      let postDataLongString = aPostData.postData.text;
+      let postData = yield gNetwork.getString(postDataLongString);
+
+      for (let section of postData.split(/\r\n|\r|\n/)) {
+        // Before displaying it, make sure this section of the POST data
+        // isn't a line containing upload stream headers.
+        if (payloadHeaders.every(header => !section.startsWith(header.name))) {
+          formDataSections.push(section);
+        }
+      }
+    }
+
+    return formDataSections;
+  }),
+
+  /**
+   * Copy the request form data parameters (or raw payload) from the currently selected item.
+   */
+  copyPostData: Task.async(function*() {
+    let selected = this.selectedItem.attachment;
+    let view = this;
+
+    // Try to extract any form data parameters.
+    let formDataSections = yield view._getFormDataSections(
+      selected.requestHeaders,
+      selected.requestHeadersFromUploadStream,
+      selected.requestPostData);
+
+    let params = [];
+    formDataSections.forEach(section => {
+      let paramsArray = parseQueryString(section);
+      if (paramsArray) {
+        params = [...params, ...paramsArray];
+      }
+    });
+
+    let string = params
+      .map(param => param.name + (param.value ? "=" + param.value : ""))
+      .join(Services.appinfo.OS === "WINNT" ? "\r\n" : "\n");
+
+    // Fall back to raw payload.
+    if (!string) {
+      let postData = selected.requestPostData.postData.text;
+      string = yield gNetwork.getString(postData);
+      if (Services.appinfo.OS !== "WINNT") {
+        string = string.replace(/\r/g, "");
+      }
+    }
+
+    clipboardHelper.copyString(string);
+  }),
+
+  /**
    * Copy a cURL command from the currently selected item.
    */
   copyAsCurl: function() {
@@ -604,7 +681,7 @@
         data.postDataText = yield gNetwork.getString(postData);
       }
 
-      clipboardHelper.copyString(Curl.generateCommand(data), document);
+      clipboardHelper.copyString(Curl.generateCommand(data));
     });
   },
 
@@ -617,7 +694,7 @@
     if (Services.appinfo.OS !== "WINNT") {
       rawHeaders = rawHeaders.replace(/\r/g, "");
     }
-    clipboardHelper.copyString(rawHeaders, document);
+    clipboardHelper.copyString(rawHeaders);
   },
 
   /**
@@ -629,7 +706,7 @@
     if (Services.appinfo.OS !== "WINNT") {
       rawHeaders = rawHeaders.replace(/\r/g, "");
     }
-    clipboardHelper.copyString(rawHeaders, document);
+    clipboardHelper.copyString(rawHeaders);
   },
 
   /**
@@ -641,7 +718,7 @@
 
     gNetwork.getString(text).then(aString => {
       let data = "data:" + mimeType + ";" + encoding + "," + aString;
-      clipboardHelper.copyString(data, document);
+      clipboardHelper.copyString(data);
     });
   },
 
@@ -653,7 +730,7 @@
     let text = selected.responseContent.content.text;
 
     gNetwork.getString(text).then(aString => {
-      clipboardHelper.copyString(aString, document);
+      clipboardHelper.copyString(aString);
     });
   },
 
@@ -1425,10 +1502,11 @@
         }
         let nameWithQuery = this._getUriNameWithQuery(uri);
         let hostPort = this._getUriHostPort(uri);
+        let unicodeUrl = NetworkHelper.convertToUnicode(unescape(uri.spec));
 
         let file = $(".requests-menu-file", target);
         file.setAttribute("value", nameWithQuery);
-        file.setAttribute("tooltiptext", nameWithQuery);
+        file.setAttribute("tooltiptext", unicodeUrl);
 
         let domain = $(".requests-menu-domain", target);
         domain.setAttribute("value", hostPort);
@@ -1843,6 +1921,9 @@
     let copyUrlParamsElement = $("#request-menu-context-copy-url-params");
     copyUrlParamsElement.hidden = !selectedItem || !nsIURL(selectedItem.attachment.url).query;
 
+    let copyPostDataElement = $("#request-menu-context-copy-post-data");
+    copyPostDataElement.hidden = !selectedItem || !selectedItem.attachment.requestPostData;
+
     let copyAsCurlElement = $("#request-menu-context-copy-as-curl");
     copyAsCurlElement.hidden = !selectedItem || !selectedItem.attachment.responseContent;
 
@@ -1906,7 +1987,7 @@
     if (!(aUrl instanceof Ci.nsIURL)) {
       aUrl = nsIURL(aUrl);
     }
-    let name = NetworkHelper.convertToUnicode(unescape(aUrl.fileName)) || "/";
+    let name = NetworkHelper.convertToUnicode(unescape(aUrl.fileName || aUrl.filePath || "/"));
     let query = NetworkHelper.convertToUnicode(unescape(aUrl.query));
     return name + (query ? "?" + query : "");
   },
@@ -2450,19 +2531,19 @@
   /**
    * Sets the network request headers shown in this view.
    *
-   * @param object aHeadersResponse
+   * @param object aHeaders
    *        The "requestHeaders" message received from the server.
-   * @param object aHeadersFromUploadStream
+   * @param object aUploadHeaders
    *        The "requestHeadersFromUploadStream" inferred from the POST payload.
    * @return object
    *        A promise that resolves when request headers are set.
    */
-  _setRequestHeaders: Task.async(function*(aHeadersResponse, aHeadersFromUploadStream) {
-    if (aHeadersResponse && aHeadersResponse.headers.length) {
-      yield this._addHeaders(this._requestHeaders, aHeadersResponse);
+  _setRequestHeaders: Task.async(function*(aHeaders, aUploadHeaders) {
+    if (aHeaders && aHeaders.headers.length) {
+      yield this._addHeaders(this._requestHeaders, aHeaders);
     }
-    if (aHeadersFromUploadStream && aHeadersFromUploadStream.headers.length) {
-      yield this._addHeaders(this._requestHeadersFromUpload, aHeadersFromUploadStream);
+    if (aUploadHeaders && aUploadHeaders.headers.length) {
+      yield this._addHeaders(this._requestHeadersFromUpload, aUploadHeaders);
     }
   }),
 
@@ -2590,40 +2671,28 @@
   /**
    * Sets the network request post params shown in this view.
    *
-   * @param object aHeadersResponse
+   * @param object aHeaders
    *        The "requestHeaders" message received from the server.
-   * @param object aHeadersFromUploadStream
+   * @param object aUploadHeaders
    *        The "requestHeadersFromUploadStream" inferred from the POST payload.
-   * @param object aPostDataResponse
+   * @param object aPostData
    *        The "requestPostData" message received from the server.
    * @return object
    *        A promise that is resolved when the request post params are set.
    */
-  _setRequestPostParams: Task.async(function*(aHeadersResponse, aHeadersFromUploadStream, aPostDataResponse) {
-    if (!aHeadersResponse || !aHeadersFromUploadStream || !aPostDataResponse) {
+  _setRequestPostParams: Task.async(function*(aHeaders, aUploadHeaders, aPostData) {
+    if (!aHeaders || !aUploadHeaders || !aPostData) {
       return;
     }
 
-    let { headers: requestHeaders } = aHeadersResponse;
-    let { headers: payloadHeaders } = aHeadersFromUploadStream;
-    let allHeaders = [...payloadHeaders, ...requestHeaders];
-
-    let contentTypeHeader = allHeaders.find(e => e.name.toLowerCase() == "content-type");
-    let contentTypeLongString = contentTypeHeader ? contentTypeHeader.value : "";
-    let postDataLongString = aPostDataResponse.postData.text;
-
-    let postData = yield gNetwork.getString(postDataLongString);
-    let contentType = yield gNetwork.getString(contentTypeLongString);
+    let formDataSections = yield RequestsMenuView.prototype._getFormDataSections(
+      aHeaders, aUploadHeaders, aPostData);
 
-    // Handle query strings (e.g. "?foo=bar&baz=42").
-    if (contentType.includes("x-www-form-urlencoded")) {
-      for (let section of postData.split(/\r\n|\r|\n/)) {
-        // Before displaying it, make sure this section of the POST data
-        // isn't a line containing upload stream headers.
-        if (payloadHeaders.every(header => !section.startsWith(header.name))) {
-          this._addParams(this._paramsFormData, section);
-        }
-      }
+    // Handle urlencoded form data sections (e.g. "?foo=bar&baz=42").
+    if (formDataSections.length > 0) {
+      formDataSections.forEach(section => {
+        this._addParams(this._paramsFormData, section);
+      });
     }
     // Handle actual forms ("multipart/form-data" content type).
     else {
@@ -2637,6 +2706,9 @@
 
       $("#request-post-data-textarea-box").hidden = false;
       let editor = yield NetMonitorView.editor("#request-post-data-textarea");
+      let postDataLongString = aPostData.postData.text;
+      let postData = yield gNetwork.getString(postDataLongString);
+
       // Most POST bodies are usually JSON, so they can be neatly
       // syntax highlighted as JS. Otheriwse, fall back to plain text.
       try {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/netmonitor/netmonitor.xul firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/netmonitor/netmonitor.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/netmonitor/netmonitor.xul	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/netmonitor/netmonitor.xul	2015-05-25 20:42:55.000000000 +0000
@@ -32,6 +32,10 @@
                 label="&netmonitorUI.context.copyUrlParams;"
                 accesskey="&netmonitorUI.context.copyUrlParams.accesskey;"
                 oncommand="NetMonitorView.RequestsMenu.copyUrlParams();"/>
+      <menuitem id="request-menu-context-copy-post-data"
+                label="&netmonitorUI.context.copyPostData;"
+                accesskey="&netmonitorUI.context.copyPostData.accesskey;"
+                oncommand="NetMonitorView.RequestsMenu.copyPostData();"/>
       <menuitem id="request-menu-context-copy-as-curl"
                 label="&netmonitorUI.context.copyAsCurl;"
                 accesskey="&netmonitorUI.context.copyAsCurl.accesskey;"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/netmonitor/test/browser.ini firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/netmonitor/test/browser.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/netmonitor/test/browser.ini	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/netmonitor/test/browser.ini	2015-05-25 20:42:55.000000000 +0000
@@ -24,6 +24,7 @@
   html_sorting-test-page.html
   html_statistics-test-page.html
   html_status-codes-test-page.html
+  html_api-calls-test-page.html
   html_copy-as-curl.html
   html_curl-utils.html
   sjs_content-type-test-server.sjs
@@ -37,6 +38,7 @@
 [browser_net_aaa_leaktest.js]
 [browser_net_accessibility-01.js]
 [browser_net_accessibility-02.js]
+[browser_net_api-calls.js]
 [browser_net_autoscroll.js]
 [browser_net_cached-status.js]
 [browser_net_charts-01.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/netmonitor/test/browser_net_api-calls.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/netmonitor/test/browser_net_api-calls.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/netmonitor/test/browser_net_api-calls.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/netmonitor/test/browser_net_api-calls.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,40 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests whether API call URLs (without a filename) are correctly displayed (including Unicode)
+ */
+
+function test() {
+  initNetMonitor(API_CALLS_URL).then(([aTab, aDebuggee, aMonitor]) => {
+    info("Starting test... ");
+
+    let { document, L10N, EVENTS, Editor, NetMonitorView } = aMonitor.panelWin;
+    let { RequestsMenu, NetworkDetails } = NetMonitorView;
+
+    RequestsMenu.lazyUpdate = false;
+
+    const REQUEST_URIS = [
+      "http://example.com/api/fileName.xml",
+      "http://example.com/api/file%E2%98%A2.xml",
+      "http://example.com/api/ascii/get/",
+      "http://example.com/api/unicode/%E2%98%A2/",
+      "http://example.com/api/search/?q=search%E2%98%A2"
+    ];
+
+    Task.spawn(function*() {
+      yield waitForNetworkEvents(aMonitor, 5);
+
+      REQUEST_URIS.forEach(function(uri, index) {
+        verifyRequestItemTarget(RequestsMenu.getItemAtIndex(index), "GET", uri);
+      });
+
+      yield teardown(aMonitor);
+      finish();
+    });
+
+    aDebuggee.performRequests();
+  });
+}
+
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/netmonitor/test/browser_net_cached-status.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/netmonitor/test/browser_net_cached-status.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/netmonitor/test/browser_net_cached-status.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/netmonitor/test/browser_net_cached-status.js	2015-05-25 20:42:55.000000000 +0000
@@ -3,6 +3,13 @@
    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: can't convert undefined to object");
+
 /**
  * Tests if cached requests have the correct status code
  */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/netmonitor/test/browser_net_charts-01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/netmonitor/test/browser_net_charts-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/netmonitor/test/browser_net_charts-01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/netmonitor/test/browser_net_charts-01.js	2015-05-25 20:42:55.000000000 +0000
@@ -6,7 +6,7 @@
 // Whitelisting this test.
 // As part of bug 1077403, the leaking uncaught rejection should be fixed.
 //
-thisTestLeaksUncaughtRejectionsAndShouldBeFixed("TypeError: aValue.content is undefined");
+thisTestLeaksUncaughtRejectionsAndShouldBeFixed("TypeError: can't convert undefined to object");
 
 /**
  * Makes sure Pie Charts have the right internal structure.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/netmonitor/test/browser_net_copy_params.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/netmonitor/test/browser_net_copy_params.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/netmonitor/test/browser_net_copy_params.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/netmonitor/test/browser_net_copy_params.js	2015-05-25 20:42:55.000000000 +0000
@@ -14,35 +14,48 @@
 
     RequestsMenu.lazyUpdate = false;
 
-    Task.spawn(function () {
+    Task.spawn(function*() {
       yield waitForNetworkEvents(aMonitor, 1, 6);
 
       RequestsMenu.selectedItem = RequestsMenu.getItemAtIndex(0);
-      testCopyUrlParamsHidden(false);
-      testCopyUrlParams("a");
+      yield testCopyUrlParamsHidden(false);
+      yield testCopyUrlParams("a");
+      yield testCopyPostDataHidden(false);
+      yield testCopyPostData("{ \"foo\": \"bar\" }");
 
       RequestsMenu.selectedItem = RequestsMenu.getItemAtIndex(1);
-      testCopyUrlParamsHidden(false);
-      testCopyUrlParams("a=b");
+      yield testCopyUrlParamsHidden(false);
+      yield testCopyUrlParams("a=b");
+      yield testCopyPostDataHidden(false);
+      yield testCopyPostData("{ \"foo\": \"bar\" }");
 
       RequestsMenu.selectedItem = RequestsMenu.getItemAtIndex(2);
-      testCopyUrlParamsHidden(false);
-      testCopyUrlParams("a=b");
+      yield testCopyUrlParamsHidden(false);
+      yield testCopyUrlParams("a=b");
+      yield testCopyPostDataHidden(false);
+      yield testCopyPostData("foo=bar");
 
       RequestsMenu.selectedItem = RequestsMenu.getItemAtIndex(3);
-      testCopyUrlParamsHidden(false);
-      testCopyUrlParams("a");
+      yield testCopyUrlParamsHidden(false);
+      yield testCopyUrlParams("a");
+      yield testCopyPostDataHidden(false);
+      yield testCopyPostData("{ \"foo\": \"bar\" }");
 
       RequestsMenu.selectedItem = RequestsMenu.getItemAtIndex(4);
-      testCopyUrlParamsHidden(false);
-      testCopyUrlParams("a=b");
+      yield testCopyUrlParamsHidden(false);
+      yield testCopyUrlParams("a=b");
+      yield testCopyPostDataHidden(false);
+      yield testCopyPostData("{ \"foo\": \"bar\" }");
 
       RequestsMenu.selectedItem = RequestsMenu.getItemAtIndex(5);
-      testCopyUrlParamsHidden(false);
-      testCopyUrlParams("a=b");
+      yield testCopyUrlParamsHidden(false);
+      yield testCopyUrlParams("a=b");
+      yield testCopyPostDataHidden(false);
+      yield testCopyPostData("?foo=bar");
 
       RequestsMenu.selectedItem = RequestsMenu.getItemAtIndex(6);
-      testCopyUrlParamsHidden(true);
+      yield testCopyUrlParamsHidden(true);
+      yield testCopyPostDataHidden(true);
 
       yield teardown(aMonitor);
       finish();
@@ -50,12 +63,27 @@
 
     function testCopyUrlParamsHidden(aHidden) {
       RequestsMenu._onContextShowing();
-      is(document.querySelector("#request-menu-context-copy-url-params").hidden, aHidden, "The \"Copy URL Params\" context menu item should" + (aHidden ? " " : " not ") + "be hidden.");
+      is(document.querySelector("#request-menu-context-copy-url-params").hidden,
+        aHidden, "The \"Copy URL Parameters\" context menu item should" + (aHidden ? " " : " not ") + "be hidden.");
     }
 
     function testCopyUrlParams(aQueryString) {
       RequestsMenu.copyUrlParams();
-      is(SpecialPowers.getClipboardData("text/unicode"), aQueryString, "The url query string copied from the selected item is correct.");
+      is(SpecialPowers.getClipboardData("text/unicode"),
+        aQueryString, "The url query string copied from the selected item is correct.");
+    }
+
+    function testCopyPostDataHidden(aHidden) {
+      RequestsMenu._onContextShowing();
+      is(document.querySelector("#request-menu-context-copy-post-data").hidden,
+        aHidden, "The \"Copy POST Data\" context menu item should" + (aHidden ? " " : " not ") + "be hidden.");
+    }
+
+    function testCopyPostData(aPostData) {
+      return RequestsMenu.copyPostData().then(() => {
+        is(SpecialPowers.getClipboardData("text/unicode"),
+          aPostData, "The post data string copied from the selected item is correct.");
+      });
     }
 
     aDebuggee.performRequests();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/netmonitor/test/head.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/netmonitor/test/head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/netmonitor/test/head.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/netmonitor/test/head.js	2015-05-25 20:42:55.000000000 +0000
@@ -10,11 +10,13 @@
 let { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
 let { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 let { CurlUtils } = Cu.import("resource:///modules/devtools/Curl.jsm", {});
+let NetworkHelper = devtools.require("devtools/toolkit/webconsole/network-helper");
 let TargetFactory = devtools.TargetFactory;
 let Toolbox = devtools.Toolbox;
 
 const EXAMPLE_URL = "http://example.com/browser/browser/devtools/netmonitor/test/";
 
+const API_CALLS_URL = EXAMPLE_URL + "html_api-calls-test-page.html";
 const SIMPLE_URL = EXAMPLE_URL + "html_simple-test-page.html";
 const NAVIGATE_URL = EXAMPLE_URL + "html_navigate-test-page.html";
 const CONTENT_TYPE_URL = EXAMPLE_URL + "html_content-type-test-page.html";
@@ -278,8 +280,9 @@
   let { attachment, target } = aRequestItem
 
   let uri = Services.io.newURI(aUrl, null, null).QueryInterface(Ci.nsIURL);
-  let name = uri.fileName || "/";
-  let query = uri.query;
+  let unicodeUrl = NetworkHelper.convertToUnicode(unescape(aUrl));
+  let name = NetworkHelper.convertToUnicode(unescape(uri.fileName || uri.filePath || "/"));
+  let query = NetworkHelper.convertToUnicode(unescape(uri.query));
   let hostPort = uri.hostPort;
   let remoteAddress = attachment.remoteAddress;
 
@@ -297,13 +300,13 @@
   if (fuzzyUrl) {
     ok(target.querySelector(".requests-menu-file").getAttribute("value").startsWith(
       name + (query ? "?" + query : "")), "The displayed file is correct.");
-    ok(target.querySelector(".requests-menu-file").getAttribute("tooltiptext").startsWith(
-      name + (query ? "?" + query : "")), "The tooltip file is correct.");
+    ok(target.querySelector(".requests-menu-file").getAttribute("tooltiptext").startsWith(unicodeUrl),
+      "The tooltip file is correct.");
   } else {
     is(target.querySelector(".requests-menu-file").getAttribute("value"),
       name + (query ? "?" + query : ""), "The displayed file is correct.");
     is(target.querySelector(".requests-menu-file").getAttribute("tooltiptext"),
-      name + (query ? "?" + query : ""), "The tooltip file is correct.");
+      unicodeUrl, "The tooltip file is correct.");
   }
 
   is(target.querySelector(".requests-menu-domain").getAttribute("value"),
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/netmonitor/test/html_api-calls-test-page.html firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/netmonitor/test/html_api-calls-test-page.html
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/netmonitor/test/html_api-calls-test-page.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/netmonitor/test/html_api-calls-test-page.html	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,46 @@
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
+    <meta http-equiv="Pragma" content="no-cache" />
+    <meta http-equiv="Expires" content="0" />
+    <title>Network Monitor test page</title>
+  </head>
+
+  <body>
+    <p>API calls request test</p>
+
+    <script type="text/javascript">
+      function get(aAddress, aCallback) {
+        var xhr = new XMLHttpRequest();
+        xhr.open("GET", aAddress, true);
+
+        xhr.onreadystatechange = function() {
+          if (this.readyState == this.DONE) {
+            aCallback();
+          }
+        };
+        xhr.send();
+      }
+
+      function performRequests() {
+        get("/api/fileName.xml", function() {
+          get("/api/file%E2%98%A2.xml", function() {
+            get("/api/ascii/get/", function() {
+              get("/api/unicode/%E2%98%A2/", function() {
+                get("/api/search/?q=search%E2%98%A2", function() {
+                  // Done.
+                });
+              });
+            });
+          });
+        });
+      }
+    </script>
+  </body>
+
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/docs/markers.md firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/docs/markers.md
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/docs/markers.md	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/docs/markers.md	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,134 @@
+# Timeline Markers
+
+## Common
+
+* DOMHighResTimeStamp start
+* DOMHighResTimeStamp end
+* DOMString name
+* object? stack
+* object? endStack
+
+## DOMEvent
+
+Triggered when a DOM event occurs, like a click or a keypress.
+
+* unsigned short eventPhase - a number indicating what phase this event is
+  in (target, bubbling, capturing, maps to Ci.nsIDOMEvent constants)
+* DOMString type - the type of event, like "keypress" or "click"
+
+## Reflow
+
+Reflow markers (labeled as "Layout") indicate when a change has occurred to
+a DOM element's positioning that requires the frame tree (rendering
+representation of the DOM) to figure out the new position of a handful of
+elements. Fired via `PresShell::DoReflow`
+
+## Paint
+
+* sequence<{ long height, long width, long x, long y }> rectangles - An array
+  of rectangle objects indicating where painting has occurred.
+
+## Styles
+
+Style markers (labeled as "Recalculating Styles") are triggered when Gecko
+needs to figure out the computational style of an element. Fired via
+`RestyleTracker::DoProcessRestyles` when there are elements to restyle.
+
+* DOMString restyleHint - A string indicating what kind of restyling will need
+  to be processed; for example "eRestyle_StyleAttribute" is relatively cheap,
+  whereas "eRestyle_Subtree" is more expensive. The hint can be a string of
+  any amount of the following, separated via " | ". All future restyleHints
+  are from `RestyleManager::RestyleHintToString`.
+
+  * "eRestyle_Self"
+  * "eRestyle_Subtree"
+  * "eRestyle_LaterSiblings"
+  * "eRestyle_CSSTransitions"
+  * "eRestyle_CSSAnimations"
+  * "eRestyle_SVGAttrAnimations"
+  * "eRestyle_StyleAttribute"
+  * "eRestyle_StyleAttribute_Animations"
+  * "eRestyle_Force"
+  * "eRestyle_ForceDescendants"
+
+
+## Javascript
+
+`Javascript` markers are emitted indicating when JS execution begins and ends,
+with a reason that triggered it (causeName), like a requestAnimationFrame or
+a setTimeout.
+
+* string causeName - The reason that JS was entered. There are many possible
+  reasons, and the interesting ones to show web developers (triggered by content) are:
+
+  * "\<script\> element"
+  * "EventListener.handleEvent"
+  * "setInterval handler"
+  * "setTimeout handler"
+  * "FrameRequestCallback"
+  * "EventHandlerNonNull"
+  * "promise callback"
+  * "promise initializer"
+  * "Worker runnable"
+
+  There are also many more potential JS causes, some which are just internally
+  used and won't emit a marker, but the below ones are only of interest to
+  Gecko hackers, most likely
+
+  * "promise thenable"
+  * "worker runnable"
+  * "nsHTTPIndex set HTTPIndex property"
+  * "XPCWrappedJS method call"
+  * "nsHTTPIndex OnFTPControlLog"
+  * "XPCWrappedJS QueryInterface"
+  * "xpcshell argument processing”
+  * "XPConnect sandbox evaluation "
+  * "component loader report global"
+  * "component loader load module"
+  * "Cross-Process Object Wrapper call/construct"
+  * "Cross-Process Object Wrapper ’set'"
+  * "Cross-Process Object Wrapper 'get'"
+  * "nsXULTemplateBuilder creation"
+  * "TestShellCommand"
+  * "precompiled XUL \<script\> element"
+  * "XBL \<field\> initialization "
+  * "NPAPI NPN_evaluate"
+  * "NPAPI get"
+  * "NPAPI set"
+  * "NPAPI doInvoke"
+  * "javascript: URI"
+  * "geolocation.always_precise indexing"
+  * "geolocation.app_settings enumeration"
+  * "WebIDL dictionary creation"
+  * "XBL \<constructor\>/\<destructor\> invocation"
+  * "message manager script load"
+  * "message handler script load"
+  * "nsGlobalWindow report new global"
+
+## GarbageCollection
+
+Emitted after a full GC has occurred (which will emit past incremental events).
+
+* DOMString causeName - The reason for a GC event to occur. A full list of
+  GC reasons can be found [on MDN](https://developer.mozilla.org/en-US/docs/Tools/Debugger-API/Debugger.Memory#Debugger.Memory_Handler_Functions).
+* DOMString nonincremenetalReason - If the GC could not do an incremental
+  GC (smaller, quick GC events), and we have to walk the entire heap and
+  GC everything marked, then the reason listed here is why.
+
+## ConsoleTime
+
+A marker generated via `console.time()` and `console.timeEnd()`.
+
+* DOMString causeName - the label passed into `console.time(label)` and
+  `console.timeEnd(label)` if passed in.
+
+## TimeStamp
+
+A marker generated via `console.timeStamp(label)`.
+
+* DOMString causeName - the label passed into `console.timeStamp(label)`
+  if passed in.
+
+## Parse HTML
+
+## Parse XML
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/actors.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/actors.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/actors.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/actors.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,384 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-const { Task } = require("resource://gre/modules/Task.jsm");
-const { Promise } = require("resource://gre/modules/Promise.jsm");
-const {
-  actorCompatibilityBridge, getProfiler,
-  MockMemoryFront, MockTimelineFront,
-  memoryActorSupported, timelineActorSupported
-} = require("devtools/performance/compatibility");
-
-loader.lazyRequireGetter(this, "EventEmitter",
-  "devtools/toolkit/event-emitter");
-loader.lazyRequireGetter(this, "RecordingUtils",
-  "devtools/performance/recording-utils", true);
-loader.lazyRequireGetter(this, "TimelineFront",
-  "devtools/server/actors/timeline", true);
-loader.lazyRequireGetter(this, "MemoryFront",
-  "devtools/server/actors/memory", true);
-loader.lazyRequireGetter(this, "Poller",
-  "devtools/shared/poller", true);
-
-// how often do we pull allocation sites from the memory actor
-const ALLOCATION_SITE_POLL_TIMER = 200; // ms
-
-// how often do we check the status of the profiler's circular buffer
-const PROFILER_CHECK_TIMER = 5000; // ms
-
-const MEMORY_ACTOR_METHODS = [
-  "attach", "detach", "getState", "getAllocationsSettings",
-  "getAllocations", "startRecordingAllocations", "stopRecordingAllocations"
-];
-
-const TIMELINE_ACTOR_METHODS = [
-  "start", "stop",
-];
-
-const PROFILER_ACTOR_METHODS = [
-  "startProfiler", "getStartOptions", "stopProfiler",
-  "registerEventNotifications", "unregisterEventNotifications"
-];
-
-/**
- * Constructor for a facade around an underlying ProfilerFront.
- */
-function ProfilerFrontFacade (target) {
-  this._target = target;
-  this._onProfilerEvent = this._onProfilerEvent.bind(this);
-  this._checkProfilerStatus = this._checkProfilerStatus.bind(this);
-  this._PROFILER_CHECK_TIMER = this._target.TEST_MOCK_PROFILER_CHECK_TIMER || PROFILER_CHECK_TIMER;
-
-  EventEmitter.decorate(this);
-}
-
-ProfilerFrontFacade.prototype = {
-  EVENTS: ["console-api-profiler", "profiler-stopped"],
-
-  // Connects to the targets underlying real ProfilerFront.
-  connect: Task.async(function*() {
-    let target = this._target;
-    this._actor = yield getProfiler(target);
-
-    // Fetch and store information about the SPS profiler and
-    // server profiler.
-    this.traits = {};
-    this.traits.filterable = target.getTrait("profilerDataFilterable");
-
-    // Directly register to event notifications when connected
-    // to hook into `console.profile|profileEnd` calls.
-    yield this.registerEventNotifications({ events: this.EVENTS });
-    // TODO bug 1159389, listen directly to actor if supporting new front
-    target.client.addListener("eventNotification", this._onProfilerEvent);
-  }),
-
-  /**
-   * Unregisters events for the underlying profiler actor.
-   */
-  destroy: Task.async(function *() {
-    if (this._poller) {
-      yield this._poller.destroy();
-    }
-    yield this.unregisterEventNotifications({ events: this.EVENTS });
-    // TODO bug 1159389, listen directly to actor if supporting new front
-    this._target.client.removeListener("eventNotification", this._onProfilerEvent);
-  }),
-
-  /**
-   * Starts the profiler actor, if necessary.
-   *
-   * @option {number?} bufferSize
-   * @option {number?} sampleFrequency
-   */
-  start: Task.async(function *(options={}) {
-    // Check for poller status even if the profiler is already active --
-    // profiler can be activated via `console.profile` or another source, like
-    // the Gecko Profiler.
-    if (!this._poller) {
-      this._poller = new Poller(this._checkProfilerStatus, this._PROFILER_CHECK_TIMER, false);
-    }
-    if (!this._poller.isPolling()) {
-      this._poller.on();
-    }
-
-    // Start the profiler only if it wasn't already active. The built-in
-    // nsIPerformance module will be kept recording, because it's the same instance
-    // for all targets and interacts with the whole platform, so we don't want
-    // to affect other clients by stopping (or restarting) it.
-    let { isActive, currentTime, position, generation, totalSize } = yield this.getStatus();
-
-    if (isActive) {
-      this.emit("profiler-already-active");
-      return { startTime: currentTime, position, generation, totalSize };
-    }
-
-    // Translate options from the recording model into profiler-specific
-    // options for the nsIProfiler
-    let profilerOptions = {
-      entries: options.bufferSize,
-      interval: options.sampleFrequency ? (1000 / (options.sampleFrequency * 1000)) : void 0
-    };
-
-    yield this.startProfiler(profilerOptions);
-
-    this.emit("profiler-activated");
-    return { startTime: 0, position, generation, totalSize };
-  }),
-
-  /**
-   * Indicates the end of a recording -- does not actually stop the profiler
-   * (stopProfiler does that), but notes that we no longer need to poll
-   * for buffer status.
-   */
-  stop: Task.async(function *() {
-    yield this._poller.off();
-  }),
-
-  /**
-   * Wrapper around `profiler.isActive()` to take profiler status data and emit.
-   */
-  getStatus: Task.async(function *() {
-    let data = yield (actorCompatibilityBridge("isActive").call(this));
-    // If no data, the last poll for `isActive()` was wrapping up, and the target.client
-    // is now null, so we no longer have data, so just abort here.
-    if (!data) {
-      return;
-    }
-
-    // If TEST_PROFILER_FILTER_STATUS defined (via array of fields), filter
-    // out any field from isActive, used only in tests. Used to filter out
-    // buffer status fields to simulate older geckos.
-    if (this._target.TEST_PROFILER_FILTER_STATUS) {
-      data = Object.keys(data).reduce((acc, prop) => {
-        if (this._target.TEST_PROFILER_FILTER_STATUS.indexOf(prop) === -1) {
-          acc[prop] = data[prop];
-        }
-        return acc;
-      }, {});
-    }
-
-    this.emit("profiler-status", data);
-    return data;
-  }),
-
-  /**
-   * Returns profile data from now since `startTime`.
-   */
-  getProfile: Task.async(function *(options) {
-    let profilerData = yield (actorCompatibilityBridge("getProfile").call(this, options));
-    // If the backend is not deduped, dedupe it ourselves, as rest of the code
-    // expects a deduped profile.
-    if (profilerData.profile.meta.version === 2) {
-      RecordingUtils.deflateProfile(profilerData.profile);
-    }
-
-    // If the backend does not support filtering by start and endtime on platform (< Fx40),
-    // do it on the client (much slower).
-    if (!this.traits.filterable) {
-      RecordingUtils.filterSamples(profilerData.profile, options.startTime || 0);
-    }
-
-    return profilerData;
-  }),
-
-  /**
-   * Invoked whenever a registered event was emitted by the profiler actor.
-   *
-   * @param object response
-   *        The data received from the backend.
-   */
-  _onProfilerEvent: function (_, { topic, subject, details }) {
-    if (topic === "console-api-profiler") {
-      if (subject.action === "profile") {
-        this.emit("console-profile-start", details);
-      } else if (subject.action === "profileEnd") {
-        this.emit("console-profile-end", details);
-      }
-    } else if (topic === "profiler-stopped") {
-      this.emit("profiler-stopped");
-    }
-  },
-
-  _checkProfilerStatus: Task.async(function *() {
-    // Calling `getStatus()` will emit the "profiler-status" on its own
-    yield this.getStatus();
-  }),
-
-  toString: () => "[object ProfilerFrontFacade]"
-};
-
-// Bind all the methods that directly proxy to the actor
-PROFILER_ACTOR_METHODS.forEach(method => ProfilerFrontFacade.prototype[method] = actorCompatibilityBridge(method));
-exports.ProfilerFront = ProfilerFrontFacade;
-
-/**
- * Constructor for a facade around an underlying TimelineFront.
- */
-function TimelineFrontFacade (target) {
-  this._target = target;
-  EventEmitter.decorate(this);
-}
-
-TimelineFrontFacade.prototype = {
-  EVENTS: ["markers", "frames", "memory", "ticks"],
-
-  connect: Task.async(function*() {
-    let supported = yield timelineActorSupported(this._target);
-    this._actor = supported ?
-                  new TimelineFront(this._target.client, this._target.form) :
-                  new MockTimelineFront();
-
-    this.IS_MOCK = !supported;
-
-    // Binds underlying actor events and consolidates them to a `timeline-data`
-    // exposed event.
-    this.EVENTS.forEach(type => {
-      let handler = this[`_on${type}`] = this._onTimelineData.bind(this, type);
-      this._actor.on(type, handler);
-    });
-  }),
-
-  /**
-   * Override actor's destroy, so we can unregister listeners before
-   * destroying the underlying actor.
-   */
-  destroy: Task.async(function *() {
-    this.EVENTS.forEach(type => this._actor.off(type, this[`_on${type}`]));
-    yield this._actor.destroy();
-  }),
-
-  /**
-   * An aggregate of all events (markers, frames, memory, ticks) and exposes
-   * to PerformanceActorsConnection as a single event.
-   */
-  _onTimelineData: function (type, ...data) {
-    this.emit("timeline-data", type, ...data);
-  },
-
-  toString: () => "[object TimelineFrontFacade]"
-};
-
-// Bind all the methods that directly proxy to the actor
-TIMELINE_ACTOR_METHODS.forEach(method => TimelineFrontFacade.prototype[method] = actorCompatibilityBridge(method));
-exports.TimelineFront = TimelineFrontFacade;
-
-/**
- * Constructor for a facade around an underlying ProfilerFront.
- */
-function MemoryFrontFacade (target) {
-  this._target = target;
-  this._pullAllocationSites = this._pullAllocationSites.bind(this);
-
-  EventEmitter.decorate(this);
-}
-
-MemoryFrontFacade.prototype = {
-  connect: Task.async(function*() {
-    let supported = yield memoryActorSupported(this._target);
-    this._actor = supported ?
-                  new MemoryFront(this._target.client, this._target.form) :
-                  new MockMemoryFront();
-
-    this.IS_MOCK = !supported;
-  }),
-
-  /**
-   * Disables polling and destroys actor.
-   */
-  destroy: Task.async(function *() {
-    if (this._poller) {
-      yield this._poller.destroy();
-    }
-    yield this._actor.destroy();
-  }),
-
-  /**
-   * Starts polling for allocation information.
-   */
-  start: Task.async(function *(options) {
-    if (!options.withAllocations) {
-      return 0;
-    }
-
-    yield this.attach();
-
-    // Reconstruct our options because the server actor fails when being passed
-    // undefined values in objects.
-    let allocationOptions = {};
-    if (options.allocationsSampleProbability !== void 0) {
-      allocationOptions.probability = options.allocationsSampleProbability;
-    }
-    if (options.allocationsMaxLogLength !== void 0) {
-      allocationOptions.maxLogLength = options.allocationsMaxLogLength;
-    }
-
-    let startTime = yield this.startRecordingAllocations(allocationOptions);
-
-    if (!this._poller) {
-      this._poller = new Poller(this._pullAllocationSites, ALLOCATION_SITE_POLL_TIMER, false);
-    }
-    if (!this._poller.isPolling()) {
-      this._poller.on();
-    }
-
-    return startTime;
-  }),
-
-  /**
-   * Stops polling for allocation information.
-   */
-  stop: Task.async(function *(options) {
-    if (!options.withAllocations) {
-      return 0;
-    }
-
-    // Since `_pullAllocationSites` is usually running inside a timeout, and
-    // it's performing asynchronous requests to the server, a recording may
-    // be stopped before that method finishes executing. Therefore, we need to
-    // wait for the last request to `getAllocations` to finish before actually
-    // stopping recording allocations.
-    yield this._poller.off();
-    yield this._lastPullAllocationSitesFinished;
-
-    let endTime = yield this.stopRecordingAllocations();
-    yield this.detach();
-
-    return endTime;
-  }),
-
-  /**
-   * At regular intervals, pull allocations from the memory actor, and
-   * forward them on this Front facade as "timeline-data" events. This
-   * gives the illusion that the MemoryActor supports an EventEmitter-style
-   * event stream.
-   */
-  _pullAllocationSites: Task.async(function *() {
-    let { promise, resolve } = Promise.defer();
-    this._lastPullAllocationSitesFinished = promise;
-
-    if ((yield this.getState()) !== "attached") {
-      resolve();
-      return;
-    }
-
-    let memoryData = yield this.getAllocations();
-    // Match the signature of the TimelineFront events, with "timeline-data"
-    // being the event name, and the second argument describing the type.
-    this.emit("timeline-data", "allocations", {
-      sites: memoryData.allocations,
-      timestamps: memoryData.allocationsTimestamps,
-      frames: memoryData.frames,
-      counts: memoryData.counts
-    });
-
-    resolve();
-  }),
-
-  toString: () => "[object MemoryFrontFacade]"
-};
-
-// Bind all the methods that directly proxy to the actor
-MEMORY_ACTOR_METHODS.forEach(method => MemoryFrontFacade.prototype[method] = actorCompatibilityBridge(method));
-exports.MemoryFront = MemoryFrontFacade;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/compatibility.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/compatibility.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/compatibility.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/compatibility.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,178 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-const { Task } = require("resource://gre/modules/Task.jsm");
-const { Promise } = require("resource://gre/modules/Promise.jsm");
-loader.lazyRequireGetter(this, "EventEmitter",
-  "devtools/toolkit/event-emitter");
-
-/**
- * A dummy front decorated with the provided methods.
- *
- * @param array blueprint
- *        A list of [funcName, retVal] describing the class.
- */
-function MockFront (blueprint) {
-  EventEmitter.decorate(this);
-
-  for (let [funcName, retVal] of blueprint) {
-    this[funcName] = (x => typeof x === "function" ? x() : x).bind(this, retVal);
-  }
-}
-
-function MockMemoryFront () {
-  MockFront.call(this, [
-    ["start", 0], // for facade
-    ["stop", 0], // for facade
-    ["destroy"],
-    ["attach"],
-    ["detach"],
-    ["getState", "detached"],
-    ["startRecordingAllocations", 0],
-    ["stopRecordingAllocations", 0],
-    ["getAllocations", createMockAllocations],
-  ]);
-}
-exports.MockMemoryFront = MockMemoryFront;
-
-function MockTimelineFront () {
-  MockFront.call(this, [
-    ["destroy"],
-    ["start", 0],
-    ["stop", 0],
-  ]);
-}
-exports.MockTimelineFront = MockTimelineFront;
-
-/**
- * Create a fake allocations object, to be used with the MockMemoryFront
- * so we create a fresh object each time.
- *
- * @return {Object}
- */
-function createMockAllocations () {
-  return {
-    allocations: [],
-    allocationsTimestamps: [],
-    frames: [],
-    counts: []
-  };
-}
-
-/**
- * Takes a TabTarget, and checks through all methods that are needed
- * on the server's memory actor to determine if a mock or real MemoryActor
- * should be used. The last of the methods added to MemoryActor
- * landed in Gecko 35, so previous versions will fail this. Setting the `target`'s
- * TEST_MOCK_MEMORY_ACTOR property to true will cause this function to indicate that
- * the memory actor is not supported.
- *
- * @param {TabTarget} target
- * @return {Boolean}
- */
-function memoryActorSupported (target) {
-  // This `target` property is used only in tests to test
-  // instances where the memory actor is not available.
-  if (target.TEST_MOCK_MEMORY_ACTOR) {
-    return false;
-  }
-
-  // We need to test that both the root actor has `memoryActorAllocations`,
-  // which is in Gecko 38+, and also that the target has a memory actor. There
-  // are scenarios, like addon debugging, where memoryActorAllocations is available,
-  // but no memory actor (like addon debugging in Gecko 38+)
-  return !!target.getTrait("memoryActorAllocations") && target.hasActor("memory");
-}
-exports.memoryActorSupported = Task.async(memoryActorSupported);
-
-/**
- * Takes a TabTarget, and checks existence of a TimelineActor on
- * the server, or if TEST_MOCK_TIMELINE_ACTOR is to be used.
- *
- * @param {TabTarget} target
- * @return {Boolean}
- */
-function timelineActorSupported(target) {
-  // This `target` property is used only in tests to test
-  // instances where the timeline actor is not available.
-  if (target.TEST_MOCK_TIMELINE_ACTOR) {
-    return false;
-  }
-
-  return target.hasActor("timeline");
-}
-exports.timelineActorSupported = Task.async(timelineActorSupported);
-
-/**
- * Returns a promise resolving to the location of the profiler actor
- * within this context.
- *
- * @param {TabTarget} target
- * @return {Promise<ProfilerActor>}
- */
-function getProfiler (target) {
-  let { promise, resolve } = Promise.defer();
-  // Chrome and content process targets already have obtained a reference
-  // to the profiler tab actor. Use it immediately.
-  if (target.form && target.form.profilerActor) {
-    resolve(target.form.profilerActor);
-  }
-  // Check if we already have a grip to the `listTabs` response object
-  // and, if we do, use it to get to the profiler actor.
-  else if (target.root && target.root.profilerActor) {
-    resolve(target.root.profilerActor);
-  }
-  // Otherwise, call `listTabs`.
-  else {
-    target.client.listTabs(({ profilerActor }) => resolve(profilerActor));
-  }
-  return promise;
-}
-exports.getProfiler = Task.async(getProfiler);
-
-/**
- * Makes a request to an actor that does not have the modern `Front`
- * interface.
- */
-function legacyRequest (target, actor, method, args) {
-  let { promise, resolve } = Promise.defer();
-  let data = args[0] || {};
-  data.to = actor;
-  data.type = method;
-  target.client.request(data, resolve);
-  return promise;
-}
-
-/**
- * Returns a function to be used as a method on an "Actor" in ./actors.
- * Calls the underlying actor's method, supporting the modern `Front`
- * interface if possible, otherwise, falling back to using
- * `legacyRequest`.
- */
-function actorCompatibilityBridge (method) {
-  return function () {
-    // If there's no target or client on this actor facade,
-    // abort silently -- this occurs in tests when polling occurs
-    // after the test ends, when tests do not wait for toolbox destruction
-    // (which will destroy the actor facade, turning off the polling).
-    if (!this._target || !this._target.client) {
-      return;
-    }
-    // Check to see if this is a modern ActorFront, which has its
-    // own `request` method. Also, check if its a mock actor, as it mimicks
-    // the ActorFront interface.
-    // The profiler actor does not currently support the modern `Front`
-    // interface, so we have to manually push packets to it.
-    // TODO bug 1159389, fix up profiler actor to not need this, however
-    // we will need it for backwards compat
-    if (this.IS_MOCK || this._actor.request) {
-      return this._actor[method].apply(this._actor, arguments);
-    }
-    else {
-      return legacyRequest(this._target, this._actor, method, arguments);
-    }
-  };
-}
-exports.actorCompatibilityBridge = actorCompatibilityBridge;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/front.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/front.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/front.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/front.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,535 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-const { Cc, Ci, Cu, Cr } = require("chrome");
-const { Task } = require("resource://gre/modules/Task.jsm");
-const { extend } = require("sdk/util/object");
-const { RecordingModel } = require("devtools/performance/recording-model");
-
-loader.lazyRequireGetter(this, "Services");
-loader.lazyRequireGetter(this, "EventEmitter",
-  "devtools/toolkit/event-emitter");
-loader.lazyRequireGetter(this, "DevToolsUtils",
-  "devtools/toolkit/DevToolsUtils");
-loader.lazyRequireGetter(this, "actors",
-  "devtools/performance/actors");
-
-loader.lazyImporter(this, "gDevTools",
-  "resource:///modules/devtools/gDevTools.jsm");
-loader.lazyImporter(this, "Promise",
-  "resource://gre/modules/Promise.jsm");
-
-// Events to pipe from PerformanceActorsConnection to the PerformanceFront
-const CONNECTION_PIPE_EVENTS = [
-  "timeline-data", "profiler-already-active", "profiler-activated",
-  "recording-starting", "recording-started", "recording-stopping", "recording-stopped",
-  "profiler-status"
-];
-
-/**
- * A cache of all PerformanceActorsConnection instances.
- * The keys are Target objects.
- */
-let SharedPerformanceActors = new WeakMap();
-
-/**
- * Instantiates a shared PerformanceActorsConnection for the specified target.
- * Consumers must yield on `open` to make sure the connection is established.
- *
- * @param Target target
- *        The target owning this connection.
- * @return PerformanceActorsConnection
- *         The shared connection for the specified target.
- */
-SharedPerformanceActors.forTarget = function(target) {
-  if (this.has(target)) {
-    return this.get(target);
-  }
-
-  let instance = new PerformanceActorsConnection(target);
-  this.set(target, instance);
-  return instance;
-};
-
-/**
- * A connection to underlying actors (profiler, memory, framerate, etc.)
- * shared by all tools in a target.
- *
- * Use `SharedPerformanceActors.forTarget` to make sure you get the same
- * instance every time, and the `PerformanceFront` to start/stop recordings.
- *
- * @param Target target
- *        The target owning this connection.
- */
-function PerformanceActorsConnection(target) {
-  EventEmitter.decorate(this);
-
-  this._target = target;
-  this._client = this._target.client;
-  this._pendingConsoleRecordings = [];
-  this._sitesPullTimeout = 0;
-  this._recordings = [];
-
-  this._pipeToConnection = this._pipeToConnection.bind(this);
-  this._onTimelineData = this._onTimelineData.bind(this);
-  this._onConsoleProfileStart = this._onConsoleProfileStart.bind(this);
-  this._onConsoleProfileEnd = this._onConsoleProfileEnd.bind(this);
-  this._onProfilerStatus = this._onProfilerStatus.bind(this);
-  this._onProfilerUnexpectedlyStopped = this._onProfilerUnexpectedlyStopped.bind(this);
-
-  Services.obs.notifyObservers(null, "performance-actors-connection-created", null);
-}
-
-PerformanceActorsConnection.prototype = {
-
-  // Properties set based off of server actor support
-  _memorySupported: true,
-  _timelineSupported: true,
-
-  /**
-   * Initializes a connection to the profiler and other miscellaneous actors.
-   * If in the process of opening, or already open, nothing happens.
-   *
-   * @return object
-   *         A promise that is resolved once the connection is established.
-   */
-  open: Task.async(function*() {
-    if (this._connecting) {
-      return this._connecting.promise;
-    }
-
-    // Create a promise that gets resolved upon connecting, so that
-    // other attempts to open the connection use the same resolution promise
-    this._connecting = Promise.defer();
-
-    // Local debugging needs to make the target remote.
-    yield this._target.makeRemote();
-
-    // Sets `this._profiler`, `this._timeline` and `this._memory`.
-    // Only initialize the timeline and memory fronts if the respective actors
-    // are available. Older Gecko versions don't have existing implementations,
-    // in which case all the methods we need can be easily mocked.
-    yield this._connectActors();
-    yield this._registerListeners();
-
-    this._connected = true;
-
-    this._connecting.resolve();
-    Services.obs.notifyObservers(null, "performance-actors-connection-opened", null);
-  }),
-
-  /**
-   * Destroys this connection.
-   */
-  destroy: Task.async(function*() {
-    if (this._connecting && !this._connected) {
-      yield this._connecting.promise;
-    } else if (!this._connected) {
-      return;
-    }
-
-    yield this._unregisterListeners();
-    yield this._disconnectActors();
-
-    this._memory = this._timeline = this._profiler = this._target = this._client = null;
-    this._connected = false;
-    this._connecting = null;
-  }),
-
-  /**
-   * Initializes fronts and connects to the underlying actors using the facades
-   * found in ./actors.js.
-   */
-  _connectActors: Task.async(function*() {
-    this._profiler = new actors.ProfilerFront(this._target);
-    this._memory = new actors.MemoryFront(this._target);
-    this._timeline = new actors.TimelineFront(this._target);
-
-    yield Promise.all([
-      this._profiler.connect(),
-      this._memory.connect(),
-      this._timeline.connect()
-    ]);
-
-    // Expose server support status of underlying actors
-    // after connecting.
-    this._memorySupported = !this._memory.IS_MOCK;
-    this._timelineSupported = !this._timeline.IS_MOCK;
-  }),
-
-  /**
-   * Registers listeners on events from the underlying
-   * actors, so the connection can handle them.
-   */
-  _registerListeners: function () {
-    this._timeline.on("timeline-data", this._onTimelineData);
-    this._memory.on("timeline-data", this._onTimelineData);
-    this._profiler.on("console-profile-start", this._onConsoleProfileStart);
-    this._profiler.on("console-profile-end", this._onConsoleProfileEnd);
-    this._profiler.on("profiler-stopped", this._onProfilerUnexpectedlyStopped);
-    this._profiler.on("profiler-already-active", this._pipeToConnection);
-    this._profiler.on("profiler-activated", this._pipeToConnection);
-    this._profiler.on("profiler-status", this._onProfilerStatus);
-  },
-
-  /**
-   * Unregisters listeners on events on the underlying actors.
-   */
-  _unregisterListeners: function () {
-    this._timeline.off("timeline-data", this._onTimelineData);
-    this._memory.off("timeline-data", this._onTimelineData);
-    this._profiler.off("console-profile-start", this._onConsoleProfileStart);
-    this._profiler.off("console-profile-end", this._onConsoleProfileEnd);
-    this._profiler.off("profiler-stopped", this._onProfilerUnexpectedlyStopped);
-    this._profiler.off("profiler-already-active", this._pipeToConnection);
-    this._profiler.off("profiler-activated", this._pipeToConnection);
-    this._profiler.off("profiler-status", this._onProfilerStatus);
-  },
-
-  /**
-   * Closes the connections to non-profiler actors.
-   */
-  _disconnectActors: Task.async(function* () {
-    yield Promise.all([
-      this._profiler.destroy(),
-      this._timeline.destroy(),
-      this._memory.destroy()
-    ]);
-  }),
-
-  /**
-   * Invoked whenever `console.profile` is called.
-   *
-   * @param string profileLabel
-   *        The provided string argument if available; undefined otherwise.
-   * @param number currentTime
-   *        The time (in milliseconds) when the call was made, relative to when
-   *        the nsIProfiler module was started.
-   */
-  _onConsoleProfileStart: Task.async(function *(_, { profileLabel, currentTime: startTime }) {
-    let recordings = this._recordings;
-
-    // Abort if a profile with this label already exists.
-    if (recordings.find(e => e.getLabel() === profileLabel)) {
-      return;
-    }
-
-    // Ensure the performance front is set up and ready.
-    // Slight performance overhead for this, should research some more.
-    // This is to ensure that there is a front to receive the events for
-    // the console profiles.
-    yield gDevTools.getToolbox(this._target).loadTool("performance");
-
-    let model = yield this.startRecording(extend(getRecordingModelPrefs(), {
-      console: true,
-      label: profileLabel
-    }));
-  }),
-
-  /**
-   * Invoked whenever `console.profileEnd` is called.
-   *
-   * @param string profileLabel
-   *        The provided string argument if available; undefined otherwise.
-   * @param number currentTime
-   *        The time (in milliseconds) when the call was made, relative to when
-   *        the nsIProfiler module was started.
-   */
-  _onConsoleProfileEnd: Task.async(function *(_, data) {
-    // If no data, abort; can occur if profiler isn't running and we get a surprise
-    // call to console.profileEnd()
-    if (!data) {
-      return;
-    }
-    let { profileLabel, currentTime: endTime } = data;
-
-    let pending = this._recordings.filter(r => r.isConsole() && r.isRecording());
-    if (pending.length === 0) {
-      return;
-    }
-
-    let model;
-    // Try to find the corresponding `console.profile` call if
-    // a label was used in profileEnd(). If no matches, abort.
-    if (profileLabel) {
-      model = pending.find(e => e.getLabel() === profileLabel);
-    }
-    // If no label supplied, pop off the most recent pending console recording
-    else {
-      model = pending[pending.length - 1];
-    }
-
-    // If `profileEnd()` was called with a label, and there are no matching
-    // sessions, abort.
-    if (!model) {
-      Cu.reportError("console.profileEnd() called with label that does not match a recording.");
-      return;
-    }
-
-    yield this.stopRecording(model);
-  }),
-
- /**
-  * TODO handle bug 1144438
-  */
-  _onProfilerUnexpectedlyStopped: function () {
-    Cu.reportError("Profiler unexpectedly stopped.", arguments);
-  },
-
-  /**
-   * Called whenever there is timeline data of any of the following types:
-   * - markers
-   * - frames
-   * - memory
-   * - ticks
-   * - allocations
-   *
-   * Populate our internal store of recordings for all currently recording sessions.
-   */
-  _onTimelineData: function (_, ...data) {
-    this._recordings.forEach(e => e._addTimelineData.apply(e, data));
-    this.emit("timeline-data", ...data);
-  },
-
-  /**
-   * Called whenever the underlying profiler polls its current status.
-   */
-  _onProfilerStatus: function (_, data) {
-    // If no data emitted (whether from an older actor being destroyed
-    // from a previous test, or the server does not support it), just ignore.
-    if (!data) {
-      return;
-    }
-    // Check for a value of buffer status (`position`) to see if the server
-    // supports buffer status -- apply to the recording models if so.
-    if (data.position !== void 0) {
-      this._recordings.forEach(e => e._addBufferStatusData.call(e, data));
-    }
-    this.emit("profiler-status", data);
-  },
-
-  /**
-   * Begins a recording session
-   *
-   * @param object options
-   *        An options object to pass to the actors. Supported properties are
-   *        `withTicks`, `withMemory` and `withAllocations`, `probability`, and `maxLogLength`.
-   * @return object
-   *         A promise that is resolved once recording has started.
-   */
-  startRecording: Task.async(function*(options = {}) {
-    let model = new RecordingModel(options);
-    this.emit("recording-starting", model);
-
-    // All actors are started asynchronously over the remote debugging protocol.
-    // Get the corresponding start times from each one of them.
-    // The timeline and memory actors are target-dependent, so start those as well,
-    // even though these are mocked in older Geckos (FF < 35)
-    let { startTime, position, generation, totalSize } = yield this._profiler.start(options);
-    let timelineStartTime = yield this._timeline.start(options);
-    let memoryStartTime = yield this._memory.start(options);
-
-    let data = {
-      profilerStartTime: startTime, timelineStartTime, memoryStartTime,
-      generation, position, totalSize
-    };
-
-    // Signify to the model that the recording has started,
-    // populate with data and store the recording model here.
-    model._populate(data);
-    this._recordings.push(model);
-
-    this.emit("recording-started", model);
-    return model;
-  }),
-
-  /**
-   * Manually ends the recording session for the corresponding RecordingModel.
-   *
-   * @param RecordingModel model
-   *        The corresponding RecordingModel that belongs to the recording session wished to stop.
-   * @return RecordingModel
-   *         Returns the same model, populated with the profiling data.
-   */
-  stopRecording: Task.async(function*(model) {
-    // If model isn't in the PerformanceActorsConnections internal store,
-    // then do nothing.
-    if (this._recordings.indexOf(model) === -1) {
-      return;
-    }
-
-    // Flag the recording as no longer recording, so that `model.isRecording()`
-    // is false. Do this before we fetch all the data, and then subsequently
-    // the recording can be considered "completed".
-    let endTime = Date.now();
-    model._onStoppingRecording(endTime);
-    this.emit("recording-stopping", model);
-
-    // Currently there are two ways profiles stop recording. Either manually in the
-    // performance tool, or via console.profileEnd. Once a recording is done,
-    // we want to deliver the model to the performance tool (either as a return
-    // from the PerformanceFront or via `console-profile-end` event) and then
-    // remove it from the internal store.
-    //
-    // In the case where a console.profile is generated via the console (so the tools are
-    // open), we initialize the Performance tool so it can listen to those events.
-    this._recordings.splice(this._recordings.indexOf(model), 1);
-
-    let config = model.getConfiguration();
-    let startTime = model.getProfilerStartTime();
-    let profilerData = yield this._profiler.getProfile({ startTime });
-    let memoryEndTime = Date.now();
-    let timelineEndTime = Date.now();
-
-    // Only if there are no more sessions recording do we stop
-    // the underlying memory and timeline actors. If we're still recording,
-    // juse use Date.now() for the memory and timeline end times, as those
-    // are only used in tests.
-    if (!this.isRecording()) {
-      // This doesn't stop the profiler, just turns off polling for
-      // events, and also turns off events on memory/timeline actors.
-      yield this._profiler.stop();
-      memoryEndTime = yield this._memory.stop(config);
-      timelineEndTime = yield this._timeline.stop(config);
-    }
-
-    // Set the results on the RecordingModel itself.
-    model._onStopRecording({
-      // Data available only at the end of a recording.
-      profile: profilerData.profile,
-
-      // End times for all the actors.
-      profilerEndTime: profilerData.currentTime,
-      timelineEndTime: timelineEndTime,
-      memoryEndTime: memoryEndTime
-    });
-
-    this.emit("recording-stopped", model);
-    return model;
-  }),
-
-  /**
-   * Checks all currently stored recording models and returns a boolean
-   * if there is a session currently being recorded.
-   *
-   * @return Boolean
-   */
-  isRecording: function () {
-    return this._recordings.some(recording => recording.isRecording());
-  },
-
-  /**
-   * An event from an underlying actor that we just want
-   * to pipe to the connection itself.
-   */
-  _pipeToConnection: function (eventName, ...args) {
-    this.emit(eventName, ...args);
-  },
-
-  toString: () => "[object PerformanceActorsConnection]"
-};
-
-/**
- * A thin wrapper around a shared PerformanceActorsConnection for the parent target.
- * Handles manually starting and stopping a recording.
- *
- * @param PerformanceActorsConnection connection
- *        The shared instance for the parent target.
- */
-function PerformanceFront(connection) {
-  EventEmitter.decorate(this);
-
-  this._connection = connection;
-
-  // Set when mocks are being used
-  this._memorySupported = connection._memorySupported;
-  this._timelineSupported = connection._timelineSupported;
-
-  // Pipe the console profile events from the connection
-  // to the front so that the UI can listen.
-  CONNECTION_PIPE_EVENTS.forEach(eventName => this._connection.on(eventName, () => this.emit.apply(this, arguments)));
-}
-
-PerformanceFront.prototype = {
-
-  /**
-   * Manually begins a recording session and creates a RecordingModel.
-   * Calls the underlying PerformanceActorsConnection's startRecording method.
-   *
-   * @param object options
-   *        An options object to pass to the actors. Supported properties are
-   *        `withTicks`, `withMemory` and `withAllocations`,
-   *        `probability` and `maxLogLength`.
-   * @return object
-   *         A promise that is resolved once recording has started.
-   */
-  startRecording: function (options) {
-    return this._connection.startRecording(options);
-  },
-
-  /**
-   * Manually ends the recording session for the corresponding RecordingModel.
-   * Calls the underlying PerformanceActorsConnection's
-   *
-   * @param RecordingModel model
-   *        The corresponding RecordingModel that belongs to the recording session wished to stop.
-   * @return RecordingModel
-   *         Returns the same model, populated with the profiling data.
-   */
-  stopRecording: function (model) {
-    return this._connection.stopRecording(model);
-  },
-
-  /**
-   * Returns an object indicating what server actors are available and
-   * initialized. A falsy value indicates that the server does not support
-   * that feature, or that mock actors were explicitly requested (tests).
-   */
-  getActorSupport: function () {
-    return {
-      memory: this._memorySupported,
-      timeline: this._timelineSupported
-    };
-  },
-
-  /**
-   * Returns a boolean indicating whether or not the current performance connection is recording.
-   *
-   * @return Boolean
-   */
-  isRecording: function () {
-    return this._connection.isRecording();
-  },
-
-  /**
-   * Interacts with the connection's actors. Should only be used in tests.
-   */
-  _request: function (actorName, method, ...args) {
-    if (!gDevTools.testing) {
-      throw new Error("PerformanceFront._request may only be used in tests.");
-    }
-    let actor = this._connection[`_${actorName}`];
-    return actor[method].apply(actor, args);
-  },
-
-  toString: () => "[object PerformanceFront]"
-};
-
-/**
- * Creates an object of configurations based off of preferences for a RecordingModel.
- */
-function getRecordingModelPrefs () {
-  return {
-    withMarkers: true,
-    withMemory: Services.prefs.getBoolPref("devtools.performance.ui.enable-memory"),
-    withTicks: Services.prefs.getBoolPref("devtools.performance.ui.enable-framerate"),
-    withAllocations: Services.prefs.getBoolPref("devtools.performance.ui.enable-memory"),
-    allocationsSampleProbability: +Services.prefs.getCharPref("devtools.performance.memory.sample-probability"),
-    allocationsMaxLogLength: Services.prefs.getIntPref("devtools.performance.memory.max-log-length")
-  };
-}
-
-exports.getPerformanceActorsConnection = target => SharedPerformanceActors.forTarget(target);
-exports.PerformanceFront = PerformanceFront;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/global.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/global.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/global.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/global.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,353 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+const { Cc, Ci, Cu, Cr } = require("chrome");
+const { ViewHelpers } = require("resource:///modules/devtools/ViewHelpers.jsm");
+
+// String used to fill in platform data when it should be hidden.
+const GECKO_SYMBOL = "(Gecko)";
+
+/**
+ * Localization convenience methods.
+ + TODO: merge these into a single file: Bug 1082695.
+ */
+const L10N = new ViewHelpers.MultiL10N([
+  "chrome://browser/locale/devtools/timeline.properties",
+  "chrome://browser/locale/devtools/profiler.properties"
+]);
+
+/**
+ * A list of preferences for this tool. The values automatically update
+ * if somebody edits edits about:config or the prefs change somewhere else.
+ */
+const PREFS = new ViewHelpers.Prefs("devtools.performance", {
+  "show-platform-data": ["Bool", "ui.show-platform-data"],
+  "hidden-markers": ["Json", "timeline.hidden-markers"],
+  "memory-sample-probability": ["Float", "memory.sample-probability"],
+  "memory-max-log-length": ["Int", "memory.max-log-length"],
+  "profiler-buffer-size": ["Int", "profiler.buffer-size"],
+  "profiler-sample-frequency": ["Int", "profiler.sample-frequency-khz"],
+}, {
+  monitorChanges: true
+});
+
+/**
+ * Details about each profile entry cateogry.
+ * @see CATEGORY_MAPPINGS.
+ */
+const CATEGORIES = [{
+  color: "#5e88b0",
+  abbrev: "other",
+  label: L10N.getStr("category.other")
+}, {
+  color: "#46afe3",
+  abbrev: "css",
+  label: L10N.getStr("category.css")
+}, {
+  color: "#d96629",
+  abbrev: "js",
+  label: L10N.getStr("category.js")
+}, {
+  color: "#eb5368",
+  abbrev: "gc",
+  label: L10N.getStr("category.gc")
+}, {
+  color: "#df80ff",
+  abbrev: "network",
+  label: L10N.getStr("category.network")
+}, {
+  color: "#70bf53",
+  abbrev: "graphics",
+  label: L10N.getStr("category.graphics")
+}, {
+  color: "#8fa1b2",
+  abbrev: "storage",
+  label: L10N.getStr("category.storage")
+}, {
+  color: "#d99b28",
+  abbrev: "events",
+  label: L10N.getStr("category.events")
+}];
+
+/**
+ * Mapping from category bitmasks in the profiler data to additional details.
+ * To be kept in sync with the js::ProfileEntry::Category in ProfilingStack.h
+ */
+const CATEGORY_MAPPINGS = {
+  "16": CATEGORIES[0],    // js::ProfileEntry::Category::OTHER
+  "32": CATEGORIES[1],    // js::ProfileEntry::Category::CSS
+  "64": CATEGORIES[2],    // js::ProfileEntry::Category::JS
+  "128": CATEGORIES[3],   // js::ProfileEntry::Category::GC
+  "256": CATEGORIES[3],   // js::ProfileEntry::Category::CC
+  "512": CATEGORIES[4],   // js::ProfileEntry::Category::NETWORK
+  "1024": CATEGORIES[5],  // js::ProfileEntry::Category::GRAPHICS
+  "2048": CATEGORIES[6],  // js::ProfileEntry::Category::STORAGE
+  "4096": CATEGORIES[7],  // js::ProfileEntry::Category::EVENTS
+};
+
+/**
+ * A simple schema for mapping markers to the timeline UI. The keys correspond
+ * to marker names, while the values are objects with the following format:
+ *
+ * - group: The row index in the timeline overview graph; multiple markers
+ *          can be added on the same row. @see <overview.js/buildGraphImage>
+ * - label: The label used in the waterfall to identify the marker. Can be a
+ *          string or just a function that accepts the marker and returns a
+ *          string, if you want to use a dynamic property for the main label.
+ *          If you use a function for a label, it *must* handle the case where
+ *          no marker is provided for a main label to describe all markers of
+ *          this type.
+ * - colorName: The label of the DevTools color used for this marker. If
+ *              adding a new color, be sure to check that there's an entry
+ *              for `.marker-details-bullet.{COLORNAME}` for the equivilent
+ *              entry in ./browser/themes/shared/devtools/performance.inc.css
+ *              https://developer.mozilla.org/en-US/docs/Tools/DevToolsColors
+ * - fields: An optional array of marker properties you wish to display in the
+ *           marker details view. For example, a field in the array such as
+ *           { property: "aCauseName", label: "Cause" } would render a string
+ *           like `Cause: ${marker.aCauseName}` in the marker details view.
+ *           Each `field` item may take the following properties:
+ *           - property: The property that must exist on the marker to render,
+ *                       and the value of the property will be displayed.
+ *           - label: The name of the property that should be displayed.
+ *           - formatter: If a formatter is provided, instead of directly using
+ *                        the `property` property on the marker, the marker is
+ *                        passed into the formatter function to determine the
+ *                        displayed value.
+ *            Can also be a function that returns an object. Each key in the object
+ *            will be rendered as a field, with its value rendering as the value.
+ *
+ * Whenever this is changed, browser_timeline_waterfall-styles.js *must* be
+ * updated as well.
+ */
+const TIMELINE_BLUEPRINT = {
+  /* Group 0 - Reflow and Rendering pipeline */
+  "Styles": {
+    group: 0,
+    colorName: "graphs-purple",
+    label: L10N.getStr("timeline.label.styles2"),
+    fields: getStylesFields,
+  },
+  "Reflow": {
+    group: 0,
+    colorName: "graphs-purple",
+    label: L10N.getStr("timeline.label.reflow2")
+  },
+  "Paint": {
+    group: 0,
+    colorName: "graphs-green",
+    label: L10N.getStr("timeline.label.paint")
+  },
+
+  /* Group 1 - JS */
+  "DOMEvent": {
+    group: 1,
+    colorName: "graphs-yellow",
+    label: L10N.getStr("timeline.label.domevent"),
+    fields: getDOMEventFields,
+  },
+  "Javascript": {
+    group: 1,
+    colorName: "graphs-yellow",
+    label: getJSLabel,
+    fields: getJSFields,
+  },
+  "Parse HTML": {
+    group: 1,
+    colorName: "graphs-yellow",
+    label: L10N.getStr("timeline.label.parseHTML")
+  },
+  "Parse XML": {
+    group: 1,
+    colorName: "graphs-yellow",
+    label: L10N.getStr("timeline.label.parseXML")
+  },
+  "GarbageCollection": {
+    group: 1,
+    colorName: "graphs-red",
+    label: getGCLabel,
+    fields: [
+      { property: "causeName", label: "Reason:" },
+      { property: "nonincrementalReason", label: "Non-incremental Reason:" }
+    ]
+  },
+
+  /* Group 2 - User Controlled */
+  "ConsoleTime": {
+    group: 2,
+    colorName: "graphs-grey",
+    label: sublabelForProperty(L10N.getStr("timeline.label.consoleTime"), "causeName"),
+    fields: [{
+      property: "causeName",
+      label: L10N.getStr("timeline.markerDetail.consoleTimerName")
+    }]
+  },
+  "TimeStamp": {
+    group: 2,
+    colorName: "graphs-blue",
+    label: sublabelForProperty(L10N.getStr("timeline.label.timestamp"), "causeName"),
+    fields: [{
+      property: "causeName",
+      label: "Label:"
+    }]
+  },
+};
+
+/**
+ * A series of formatters used by the blueprint.
+ */
+
+function getGCLabel (marker={}) {
+  let label = L10N.getStr("timeline.label.garbageCollection");
+  // Only if a `nonincrementalReason` exists, do we want to label
+  // this as a non incremental GC event.
+  if ("nonincrementalReason" in marker) {
+    label = `${label} (Non-incremental)`;
+  }
+  return label;
+}
+
+/**
+ * Mapping of JS marker causes to a friendlier form. Only
+ * markers that are considered "from content" should be labeled here.
+ */
+const JS_MARKER_MAP = {
+  "<script> element":          "Script Tag",
+  "setInterval handler":       "setInterval",
+  "setTimeout handler":        "setTimeout",
+  "FrameRequestCallback":      "requestAnimationFrame",
+  "promise callback":          "Promise Callback",
+  "promise initializer":       "Promise Init",
+  "Worker runnable":           "Worker",
+  "javascript: URI":           "JavaScript URI",
+  // The difference between these two event handler markers are differences
+  // in their WebIDL implementation, so distinguishing them is not necessary.
+  "EventHandlerNonNull":       "Event Handler",
+  "EventListener.handleEvent": "Event Handler",
+};
+
+function getJSLabel (marker={}) {
+  let generic = L10N.getStr("timeline.label.javascript2");
+  if ("causeName" in marker) {
+    return JS_MARKER_MAP[marker.causeName] || generic;
+  }
+  return generic;
+}
+
+/**
+ * Returns a hash for computing a fields object for a JS marker. If the cause
+ * is considered content (so an entry exists in the JS_MARKER_MAP), do not display it
+ * since it's redundant with the label. Otherwise for Gecko code, either display
+ * the cause, or "(Gecko)", depending on if "show-platform-data" is set.
+ */
+function getJSFields (marker) {
+  if ("causeName" in marker && !JS_MARKER_MAP[marker.causeName]) {
+    return { Reason: PREFS["show-platform-data"] ? marker.causeName : GECKO_SYMBOL };
+  }
+}
+
+function getDOMEventFields (marker) {
+  let fields = Object.create(null);
+  if ("type" in marker) {
+    fields[L10N.getStr("timeline.markerDetail.DOMEventType")] = marker.type;
+  }
+  if ("eventPhase" in marker) {
+    let phase;
+    if (marker.eventPhase === Ci.nsIDOMEvent.AT_TARGET) {
+      phase = L10N.getStr("timeline.markerDetail.DOMEventTargetPhase");
+    } else if (marker.eventPhase === Ci.nsIDOMEvent.CAPTURING_PHASE) {
+      phase = L10N.getStr("timeline.markerDetail.DOMEventCapturingPhase");
+    } else if (marker.eventPhase === Ci.nsIDOMEvent.BUBBLING_PHASE) {
+      phase = L10N.getStr("timeline.markerDetail.DOMEventBubblingPhase");
+    }
+    fields[L10N.getStr("timeline.markerDetail.DOMEventPhase")] = phase;
+  }
+  return fields;
+}
+
+function getStylesFields (marker) {
+  if ("restyleHint" in marker) {
+    return { "Restyle Hint": marker.restyleHint.replace(/eRestyle_/g, "") };
+  }
+}
+
+/**
+ * Takes a main label (like "Timestamp") and a property,
+ * and returns a marker that will print out the property
+ * value for a marker if it exists ("Timestamp (rendering)"),
+ * or just the main label if it does not.
+ */
+function sublabelForProperty (mainLabel, prop) {
+  return (marker={}) => marker[prop] ? `${mainLabel} (${marker[prop]})` : mainLabel;
+}
+
+/**
+ * Get the numeric bitmask (or set of masks) for the given category
+ * abbreviation. See CATEGORIES and CATEGORY_MAPPINGS above.
+ *
+ * CATEGORY_MASK can be called with just a name if it is expected that the
+ * category is mapped to by exactly one bitmask.  If the category is mapped
+ * to by multiple masks, CATEGORY_MASK for that name must be called with
+ * an additional argument specifying the desired id (in ascending order).
+ */
+const [CATEGORY_MASK, CATEGORY_MASK_LIST] = (function () {
+  let bitmasksForCategory = {};
+  let all = Object.keys(CATEGORY_MAPPINGS);
+
+  for (let category of CATEGORIES) {
+    bitmasksForCategory[category.abbrev] = all
+      .filter(mask => CATEGORY_MAPPINGS[mask] == category)
+      .map(mask => +mask)
+      .sort();
+  }
+
+  return [
+    function (name, index) {
+      if (!(name in bitmasksForCategory)) {
+        throw new Error(`Category abbreviation '${name}' does not exist.`);
+      }
+      if (arguments.length == 1) {
+        if (bitmasksForCategory[name].length != 1) {
+          throw new Error(`Expected exactly one category number for '${name}'.`);
+        } else {
+          return bitmasksForCategory[name][0];
+        }
+      } else {
+        if (index > bitmasksForCategory[name].length) {
+          throw new Error(`Index '${index}' too high for category '${name}'.`);
+        } else {
+          return bitmasksForCategory[name][index - 1];
+        }
+      }
+    },
+
+    function (name) {
+      if (!(name in bitmasksForCategory)) {
+        throw new Error(`Category abbreviation '${name}' does not exist.`);
+      }
+      return bitmasksForCategory[name];
+    }
+  ];
+})();
+
+// Human-readable "other" category bitmask. Older Geckos don't have all the
+// necessary instrumentation in the sampling profiler backend for creating
+// a categories graph, in which case we default to the "other" category.
+const CATEGORY_OTHER = CATEGORY_MASK('other');
+
+// Human-readable JIT category bitmask. Certain pseudo-frames in a sample,
+// like "EnterJIT", don't have any associated `cateogry` information.
+const CATEGORY_JIT = CATEGORY_MASK('js');
+
+// Exported symbols.
+exports.L10N = L10N;
+exports.PREFS = PREFS;
+exports.TIMELINE_BLUEPRINT = TIMELINE_BLUEPRINT;
+exports.CATEGORIES = CATEGORIES;
+exports.CATEGORY_MAPPINGS = CATEGORY_MAPPINGS;
+exports.CATEGORY_MASK = CATEGORY_MASK;
+exports.CATEGORY_MASK_LIST = CATEGORY_MASK_LIST;
+exports.CATEGORY_OTHER = CATEGORY_OTHER;
+exports.CATEGORY_JIT = CATEGORY_JIT;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/graphs.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/graphs.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/graphs.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/graphs.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,449 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-/**
- * This file contains the base line graph that all Performance line graphs use.
- */
-
-const {Cc, Ci, Cu, Cr} = require("chrome");
-
-Cu.import("resource:///modules/devtools/Graphs.jsm");
-Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
-Cu.import("resource://gre/modules/Task.jsm");
-Cu.import("resource://gre/modules/Promise.jsm");
-
-const { colorUtils: { setAlpha }} = require("devtools/css-color");
-const { getColor } = require("devtools/shared/theme");
-
-loader.lazyRequireGetter(this, "ProfilerGlobal",
-  "devtools/shared/profiler/global");
-loader.lazyRequireGetter(this, "TimelineGlobal",
-  "devtools/shared/timeline/global");
-loader.lazyRequireGetter(this, "MarkersOverview",
-  "devtools/shared/timeline/markers-overview", true);
-loader.lazyRequireGetter(this, "EventEmitter",
-  "devtools/toolkit/event-emitter");
-
-// TODO get rid of retro mode in bug 1160313
-loader.lazyRequireGetter(this, "Services");
-
-/**
- * For line graphs
- */
-const HEIGHT = 35; // px
-const STROKE_WIDTH = 1; // px
-const DAMPEN_VALUES = 0.95;
-const CLIPHEAD_LINE_COLOR = "#666";
-const SELECTION_LINE_COLOR = "#555";
-const SELECTION_BACKGROUND_COLOR_NAME = "highlight-blue";
-const FRAMERATE_GRAPH_COLOR_NAME = "highlight-green";
-const MEMORY_GRAPH_COLOR_NAME = "highlight-blue";
-
-/**
- * For timeline overview
- */
-const MARKERS_GRAPH_HEADER_HEIGHT = 14; // px
-const MARKERS_GRAPH_ROW_HEIGHT = 10; // px
-const MARKERS_GROUP_VERTICAL_PADDING = 4; // px
-
-/**
- * A base class for performance graphs to inherit from.
- *
- * @param nsIDOMNode parent
- *        The parent node holding the overview.
- * @param string metric
- *        The unit of measurement for this graph.
- */
-function PerformanceGraph(parent, metric) {
-  LineGraphWidget.call(this, parent, { metric });
-  this.setTheme();
-}
-
-PerformanceGraph.prototype = Heritage.extend(LineGraphWidget.prototype, {
-  strokeWidth: STROKE_WIDTH,
-  dampenValuesFactor: DAMPEN_VALUES,
-  fixedHeight: HEIGHT,
-  clipheadLineColor: CLIPHEAD_LINE_COLOR,
-  selectionLineColor: SELECTION_LINE_COLOR,
-  withTooltipArrows: false,
-  withFixedTooltipPositions: true,
-
-  /**
-   * Disables selection and empties this graph.
-   */
-  clearView: function() {
-    this.selectionEnabled = false;
-    this.dropSelection();
-    this.setData([]);
-  },
-
-  /**
-   * Sets the theme via `theme` to either "light" or "dark",
-   * and updates the internal styling to match. Requires a redraw
-   * to see the effects.
-   */
-  setTheme: function (theme) {
-    theme = theme || "light";
-    let mainColor = getColor(this.mainColor || "highlight-blue", theme);
-    this.backgroundColor = getColor("body-background", theme);
-    this.strokeColor = mainColor;
-    this.backgroundGradientStart = setAlpha(mainColor, 0.2);
-    this.backgroundGradientEnd = setAlpha(mainColor, 0.2);
-    this.selectionBackgroundColor = setAlpha(getColor(SELECTION_BACKGROUND_COLOR_NAME, theme), 0.25);
-    this.selectionStripesColor = "rgba(255, 255, 255, 0.1)";
-    this.maximumLineColor = setAlpha(mainColor, 0.4);
-    this.averageLineColor = setAlpha(mainColor, 0.7);
-    this.minimumLineColor = setAlpha(mainColor, 0.9);
-  }
-});
-
-/**
- * Constructor for the framerate graph. Inherits from PerformanceGraph.
- *
- * @param nsIDOMNode parent
- *        The parent node holding the overview.
- */
-function FramerateGraph(parent) {
-  PerformanceGraph.call(this, parent, ProfilerGlobal.L10N.getStr("graphs.fps"));
-}
-
-FramerateGraph.prototype = Heritage.extend(PerformanceGraph.prototype, {
-  mainColor: FRAMERATE_GRAPH_COLOR_NAME,
-  setPerformanceData: function ({ duration, ticks }, resolution) {
-    this.dataDuration = duration;
-    return this.setDataFromTimestamps(ticks, resolution, duration);
-  }
-});
-
-/**
- * Constructor for the memory graph. Inherits from PerformanceGraph.
- *
- * @param nsIDOMNode parent
- *        The parent node holding the overview.
- */
-function MemoryGraph(parent) {
-  PerformanceGraph.call(this, parent, TimelineGlobal.L10N.getStr("graphs.memory"));
-}
-
-MemoryGraph.prototype = Heritage.extend(PerformanceGraph.prototype, {
-  mainColor: MEMORY_GRAPH_COLOR_NAME,
-  setPerformanceData: function ({ duration, memory }) {
-    this.dataDuration = duration;
-    return this.setData(memory);
-  }
-});
-
-function TimelineGraph(parent, blueprint) {
-  MarkersOverview.call(this, parent, blueprint);
-}
-
-TimelineGraph.prototype = Heritage.extend(MarkersOverview.prototype, {
-  headerHeight: MARKERS_GRAPH_HEADER_HEIGHT,
-  rowHeight: MARKERS_GRAPH_ROW_HEIGHT,
-  groupPadding: MARKERS_GROUP_VERTICAL_PADDING,
-  setPerformanceData: MarkersOverview.prototype.setData
-});
-
-/**
- * Definitions file for GraphsController, indicating the constructor,
- * selector and other meta for each of the graphs controller by
- * GraphsController.
- */
-const GRAPH_DEFINITIONS = {
-  memory: {
-    constructor: MemoryGraph,
-    selector: "#memory-overview",
-  },
-  framerate: {
-    constructor: FramerateGraph,
-    selector: "#time-framerate",
-  },
-  timeline: {
-    constructor: TimelineGraph,
-    selector: "#markers-overview",
-    needsBlueprints: true,
-    primaryLink: true
-  }
-};
-
-// TODO get rid of retro mode in bug 1160313
-const GRAPH_DEFINITIONS_RETRO = {
-  memory: {
-    constructor: MemoryGraph,
-    selector: "#memory-overview",
-  },
-  framerate: {
-    constructor: FramerateGraph,
-    selector: "#time-framerate",
-    needsBlueprints: true,
-    primaryLink: true
-  },
-  timeline: {
-    constructor: TimelineGraph,
-    selector: "#markers-overview",
-  }
-};
-
-/**
- * A controller for orchestrating the performance's tool overview graphs. Constructs,
- * syncs, toggles displays and defines the memory, framerate and timeline view.
- *
- * @param {object} definition
- * @param {DOMElement} root
- * @param {function} getBlueprint
- * @param {function} getTheme
- */
-function GraphsController ({ definition, root, getBlueprint, getTheme }) {
-  this._graphs = {};
-  this._enabled = new Set();
-  // TODO get rid of retro mode in bug 1160313
-  let RETRO_MODE = Services.prefs.getBoolPref("devtools.performance.ui.retro-mode");
-  this._definition = definition || (RETRO_MODE ? GRAPH_DEFINITIONS_RETRO : GRAPH_DEFINITIONS);
-  this._root = root;
-  this._getBlueprint = getBlueprint;
-  this._getTheme = getTheme;
-  this._primaryLink = Object.keys(this._definition).filter(name => this._definition[name].primaryLink)[0];
-  this.$ = root.ownerDocument.querySelector.bind(root.ownerDocument);
-
-  EventEmitter.decorate(this);
-  this._onSelecting = this._onSelecting.bind(this);
-}
-
-GraphsController.prototype = {
-
-  /**
-   * Returns the corresponding graph by `graphName`.
-   */
-  get: function (graphName) {
-    return this._graphs[graphName];
-  },
-
-  /**
-   * Iterates through all graphs and renders the data
-   * from a RecordingModel. Takes a resolution value used in
-   * some graphs.
-   * Saves rendering progress as a promise to be consumed by `destroy`,
-   * to wait for cleaning up rendering during destruction.
-   */
-  render: Task.async(function *(recordingData, resolution) {
-    // Get the previous render promise so we don't start rendering
-    // until the previous render cycle completes, which can occur
-    // especially when a recording is finished, and triggers a
-    // fresh rendering at a higher rate
-    yield (this._rendering && this._rendering.promise);
-
-    // Check after yielding to ensure we're not tearing down,
-    // as this can create a race condition in tests
-    if (this._destroyed) {
-      return;
-    }
-
-    this._rendering = Promise.defer();
-    for (let graph of (yield this._getEnabled())) {
-      yield graph.setPerformanceData(recordingData, resolution);
-      this.emit("rendered", graph.graphName);
-    }
-    this._rendering.resolve();
-  }),
-
-  /**
-   * Destroys the underlying graphs.
-   */
-  destroy: Task.async(function *() {
-    let primary = this._getPrimaryLink();
-
-    this._destroyed = true;
-
-    if (primary) {
-      primary.off("selecting", this._onSelecting);
-    }
-
-    // If there was rendering, wait until the most recent render cycle
-    // has finished
-    if (this._rendering) {
-      yield this._rendering.promise;
-    }
-
-    for (let graph of this.getWidgets()) {
-      yield graph.destroy();
-    }
-  }),
-
-  /**
-   * Applies the theme to the underlying graphs. Optionally takes
-   * a `redraw` boolean in the options to force redraw.
-   */
-  setTheme: function (options={}) {
-    let theme = options.theme || this._getTheme();
-    for (let graph of this.getWidgets()) {
-      graph.setTheme(theme);
-      graph.refresh({ force: options.redraw });
-    }
-  },
-
-  /**
-   * Sets up the graph, if needed. Returns a promise resolving
-   * to the graph if it is enabled once it's ready, or otherwise returns
-   * null if disabled.
-   */
-  isAvailable: Task.async(function *(graphName) {
-    if (!this._enabled.has(graphName)) {
-      return null;
-    }
-
-    let graph = this.get(graphName);
-
-    if (!graph) {
-      graph = yield this._construct(graphName);
-    }
-
-    yield graph.ready();
-    return graph;
-  }),
-
-  /**
-   * Enable or disable a subgraph controlled by GraphsController.
-   * This determines what graphs are visible and get rendered.
-   */
-  enable: function (graphName, isEnabled) {
-    let el = this.$(this._definition[graphName].selector);
-    el.hidden = !isEnabled;
-
-    // If no status change, just return
-    if (this._enabled.has(graphName) === isEnabled) {
-      return;
-    }
-    if (isEnabled) {
-      this._enabled.add(graphName);
-    } else {
-      this._enabled.delete(graphName);
-    }
-
-    // Invalidate our cache of ready-to-go graphs
-    this._enabledGraphs = null;
-  },
-
-  /**
-   * Disables all graphs controller by the GraphsController, and
-   * also hides the root element. This is a one way switch, and used
-   * when older platforms do not have any timeline data.
-   */
-  disableAll: function () {
-    this._root.hidden = true;
-    // Hide all the subelements
-    Object.keys(this._definition).forEach(graphName => this.enable(graphName, false));
-  },
-
-  /**
-   * Sets a mapped selection on the graph that is the main controller
-   * for keeping the graphs' selections in sync.
-   */
-  setMappedSelection: function (selection, { mapStart, mapEnd }) {
-    return this._getPrimaryLink().setMappedSelection(selection, { mapStart, mapEnd });
-  },
-
-  /**
-   * Fetches the currently mapped selection. If graphs are not yet rendered,
-   * (which throws in Graphs.jsm), return null.
-   */
-  getMappedSelection: function ({ mapStart, mapEnd }) {
-    let primary = this._getPrimaryLink();
-    if (primary && primary.hasData()) {
-      return primary.getMappedSelection({ mapStart, mapEnd });
-    } else {
-      return null;
-    }
-  },
-
-  /**
-   * Returns an array of graphs that have been created, not necessarily
-   * enabled currently.
-   */
-  getWidgets: function () {
-    return Object.keys(this._graphs).map(name => this._graphs[name]);
-  },
-
-  /**
-   * Drops the selection.
-   */
-  dropSelection: function () {
-    if (this._getPrimaryLink()) {
-      return this._getPrimaryLink().dropSelection();
-    }
-  },
-
-  /**
-   * Makes sure the selection is enabled or disabled in all the graphs.
-   */
-  selectionEnabled: Task.async(function *(enabled) {
-    for (let graph of (yield this._getEnabled())) {
-      graph.selectionEnabled = enabled;
-    }
-  }),
-
-  /**
-   * Creates the graph `graphName` and initializes it.
-   */
-  _construct: Task.async(function *(graphName) {
-    let def = this._definition[graphName];
-    let el = this.$(def.selector);
-    let blueprint = def.needsBlueprints ? this._getBlueprint() : void 0;
-    let graph = this._graphs[graphName] = new def.constructor(el, blueprint);
-    graph.graphName = graphName;
-
-    yield graph.ready();
-
-    // Sync the graphs' animations and selections together
-    if (def.primaryLink) {
-      graph.on("selecting", this._onSelecting);
-    } else {
-      CanvasGraphUtils.linkAnimation(this._getPrimaryLink(), graph);
-      CanvasGraphUtils.linkSelection(this._getPrimaryLink(), graph);
-    }
-
-    this.setTheme();
-    return graph;
-  }),
-
-  /**
-   * Returns the main graph for this collection, that all graphs
-   * are bound to for syncing and selection.
-   */
-  _getPrimaryLink: function () {
-    return this.get(this._primaryLink);
-  },
-
-  /**
-   * Emitted when a selection occurs.
-   */
-  _onSelecting: function () {
-    this.emit("selecting");
-  },
-
-  /**
-   * Resolves to an array with all graphs that are enabled, and
-   * creates them if needed. Different than just iterating over `this._graphs`,
-   * as those could be enabled. Uses caching, as rendering happens many times per second,
-   * compared to how often which graphs/features are changed (rarely).
-   */
-  _getEnabled: Task.async(function *() {
-    if (this._enabledGraphs) {
-      return this._enabledGraphs;
-    }
-    let enabled = [];
-    for (let graphName of this._enabled) {
-      let graph;
-      if (graph = yield this.isAvailable(graphName)) {
-        enabled.push(graph);
-      }
-    }
-    return this._enabledGraphs = enabled;
-  }),
-};
-
-exports.FramerateGraph = FramerateGraph;
-exports.MemoryGraph = MemoryGraph;
-exports.TimelineGraph = TimelineGraph;
-exports.GraphsController = GraphsController;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/io.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/io.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/io.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/io.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,168 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-const { Cc, Ci, Cu, Cr } = require("chrome");
-
-loader.lazyRequireGetter(this, "Services");
-loader.lazyRequireGetter(this, "promise");
-loader.lazyRequireGetter(this, "RecordingUtils",
-  "devtools/performance/recording-utils", true);
-
-loader.lazyImporter(this, "FileUtils",
-  "resource://gre/modules/FileUtils.jsm");
-loader.lazyImporter(this, "NetUtil",
-  "resource://gre/modules/NetUtil.jsm");
-
-// This identifier string is used to tentatively ascertain whether or not
-// a JSON loaded from disk is actually something generated by this tool.
-// It isn't, of course, a definitive verification, but a Good Enough™
-// approximation before continuing the import. Don't localize this.
-const PERF_TOOL_SERIALIZER_IDENTIFIER = "Recorded Performance Data";
-const PERF_TOOL_SERIALIZER_LEGACY_VERSION = 1;
-const PERF_TOOL_SERIALIZER_CURRENT_VERSION = 2;
-
-/**
- * Helpers for importing/exporting JSON.
- */
-let PerformanceIO = {
-  /**
-   * Gets a nsIScriptableUnicodeConverter instance with a default UTF-8 charset.
-   * @return object
-   */
-  getUnicodeConverter: function() {
-    let className = "@mozilla.org/intl/scriptableunicodeconverter";
-    let converter = Cc[className].createInstance(Ci.nsIScriptableUnicodeConverter);
-    converter.charset = "UTF-8";
-    return converter;
-  },
-
-  /**
-   * Saves a recording as JSON to a file. The provided data is assumed to be
-   * acyclical, so that it can be properly serialized.
-   *
-   * @param object recordingData
-   *        The recording data to stream as JSON.
-   * @param nsILocalFile file
-   *        The file to stream the data into.
-   * @return object
-   *         A promise that is resolved once streaming finishes, or rejected
-   *         if there was an error.
-   */
-  saveRecordingToFile: function(recordingData, file) {
-    let deferred = promise.defer();
-
-    recordingData.fileType = PERF_TOOL_SERIALIZER_IDENTIFIER;
-    recordingData.version = PERF_TOOL_SERIALIZER_CURRENT_VERSION;
-
-    let string = JSON.stringify(recordingData);
-    let inputStream = this.getUnicodeConverter().convertToInputStream(string);
-    let outputStream = FileUtils.openSafeFileOutputStream(file);
-
-    NetUtil.asyncCopy(inputStream, outputStream, deferred.resolve);
-    return deferred.promise;
-  },
-
-  /**
-   * Loads a recording stored as JSON from a file.
-   *
-   * @param nsILocalFile file
-   *        The file to import the data from.
-   * @return object
-   *         A promise that is resolved once importing finishes, or rejected
-   *         if there was an error.
-   */
-  loadRecordingFromFile: function(file) {
-    let deferred = promise.defer();
-
-    let channel = NetUtil.newChannel2(file,
-                                      null,
-                                      null,
-                                      null,      // aLoadingNode
-                                      Services.scriptSecurityManager.getSystemPrincipal(),
-                                      null,      // aTriggeringPrincipal
-                                      Ci.nsILoadInfo.SEC_NORMAL,
-                                      Ci.nsIContentPolicy.TYPE_OTHER);
-
-    channel.contentType = "text/plain";
-
-    NetUtil.asyncFetch(channel, (inputStream, status) => {
-      try {
-        let string = NetUtil.readInputStreamToString(inputStream, inputStream.available());
-        var recordingData = JSON.parse(string);
-      } catch (e) {
-        deferred.reject(new Error("Could not read recording data file."));
-        return;
-      }
-      if (recordingData.fileType != PERF_TOOL_SERIALIZER_IDENTIFIER) {
-        deferred.reject(new Error("Unrecognized recording data file."));
-        return;
-      }
-      if (!isValidSerializerVersion(recordingData.version)) {
-        deferred.reject(new Error("Unsupported recording data file version."));
-        return;
-      }
-      if (recordingData.version === PERF_TOOL_SERIALIZER_LEGACY_VERSION) {
-        recordingData = convertLegacyData(recordingData);
-      }
-      if (recordingData.profile.meta.version === 2) {
-        RecordingUtils.deflateProfile(recordingData.profile);
-      }
-      deferred.resolve(recordingData);
-    });
-
-    return deferred.promise;
-  }
-};
-
-exports.PerformanceIO = PerformanceIO;
-
-/**
- * Returns a boolean indicating whether or not the passed in `version`
- * is supported by this serializer.
- *
- * @param number version
- * @return boolean
- */
-function isValidSerializerVersion (version) {
-  return !!~[
-    PERF_TOOL_SERIALIZER_LEGACY_VERSION,
-    PERF_TOOL_SERIALIZER_CURRENT_VERSION
-  ].indexOf(version);
-}
-
-/**
- * Takes recording data (with version `1`, from the original profiler tool), and
- * massages the data to be line with the current performance tool's property names
- * and values.
- *
- * @param object legacyData
- * @return object
- */
-function convertLegacyData (legacyData) {
-  let { profilerData, ticksData, recordingDuration } = legacyData;
-
-  // The `profilerData` and `ticksData` stay, but the previously unrecorded
-  // fields just are empty arrays or objects.
-  let data = {
-    label: profilerData.profilerLabel,
-    duration: recordingDuration,
-    markers: [],
-    frames: [],
-    memory: [],
-    ticks: ticksData,
-    allocations: { sites: [], timestamps: [], frames: [], counts: [] },
-    profile: profilerData.profile,
-    // Fake a configuration object here if there's tick data,
-    // so that it can be rendered
-    configuration: {
-      withTicks: !!ticksData.length,
-      withMarkers: false,
-      withMemory: false,
-      withAllocations: false
-    }
-  };
-
-  return data;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/logic/actors.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/logic/actors.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/logic/actors.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/logic/actors.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,382 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 { Task } = require("resource://gre/modules/Task.jsm");
+
+loader.lazyRequireGetter(this, "promise");
+loader.lazyRequireGetter(this, "EventEmitter",
+  "devtools/toolkit/event-emitter");
+loader.lazyRequireGetter(this, "Poller",
+  "devtools/shared/poller", true);
+
+loader.lazyRequireGetter(this, "CompatUtils",
+  "devtools/performance/compatibility");
+loader.lazyRequireGetter(this, "RecordingUtils",
+  "devtools/performance/recording-utils", true);
+loader.lazyRequireGetter(this, "TimelineFront",
+  "devtools/server/actors/timeline", true);
+loader.lazyRequireGetter(this, "MemoryFront",
+  "devtools/server/actors/memory", true);
+
+// how often do we pull allocation sites from the memory actor
+const ALLOCATION_SITE_POLL_TIMER = 200; // ms
+
+// how often do we check the status of the profiler's circular buffer
+const PROFILER_CHECK_TIMER = 5000; // ms
+
+const MEMORY_ACTOR_METHODS = [
+  "attach", "detach", "getState", "getAllocationsSettings",
+  "getAllocations", "startRecordingAllocations", "stopRecordingAllocations"
+];
+
+const TIMELINE_ACTOR_METHODS = [
+  "start", "stop",
+];
+
+const PROFILER_ACTOR_METHODS = [
+  "startProfiler", "getStartOptions", "stopProfiler",
+  "registerEventNotifications", "unregisterEventNotifications"
+];
+
+/**
+ * Constructor for a facade around an underlying ProfilerFront.
+ */
+function ProfilerFrontFacade (target) {
+  this._target = target;
+  this._onProfilerEvent = this._onProfilerEvent.bind(this);
+  this._checkProfilerStatus = this._checkProfilerStatus.bind(this);
+  this._PROFILER_CHECK_TIMER = this._target.TEST_MOCK_PROFILER_CHECK_TIMER || PROFILER_CHECK_TIMER;
+
+  EventEmitter.decorate(this);
+}
+
+ProfilerFrontFacade.prototype = {
+  EVENTS: ["console-api-profiler", "profiler-stopped"],
+
+  // Connects to the targets underlying real ProfilerFront.
+  connect: Task.async(function*() {
+    let target = this._target;
+    this._actor = yield CompatUtils.getProfiler(target);
+
+    // Fetch and store information about the SPS profiler and
+    // server profiler.
+    this.traits = {};
+    this.traits.filterable = target.getTrait("profilerDataFilterable");
+
+    // Directly register to event notifications when connected
+    // to hook into `console.profile|profileEnd` calls.
+    yield this.registerEventNotifications({ events: this.EVENTS });
+    // TODO bug 1159389, listen directly to actor if supporting new front
+    target.client.addListener("eventNotification", this._onProfilerEvent);
+  }),
+
+  /**
+   * Unregisters events for the underlying profiler actor.
+   */
+  destroy: Task.async(function *() {
+    if (this._poller) {
+      yield this._poller.destroy();
+    }
+    yield this.unregisterEventNotifications({ events: this.EVENTS });
+    // TODO bug 1159389, listen directly to actor if supporting new front
+    this._target.client.removeListener("eventNotification", this._onProfilerEvent);
+  }),
+
+  /**
+   * Starts the profiler actor, if necessary.
+   *
+   * @option {number?} bufferSize
+   * @option {number?} sampleFrequency
+   */
+  start: Task.async(function *(options={}) {
+    // Check for poller status even if the profiler is already active --
+    // profiler can be activated via `console.profile` or another source, like
+    // the Gecko Profiler.
+    if (!this._poller) {
+      this._poller = new Poller(this._checkProfilerStatus, this._PROFILER_CHECK_TIMER, false);
+    }
+    if (!this._poller.isPolling()) {
+      this._poller.on();
+    }
+
+    // Start the profiler only if it wasn't already active. The built-in
+    // nsIPerformance module will be kept recording, because it's the same instance
+    // for all targets and interacts with the whole platform, so we don't want
+    // to affect other clients by stopping (or restarting) it.
+    let { isActive, currentTime, position, generation, totalSize } = yield this.getStatus();
+
+    if (isActive) {
+      this.emit("profiler-already-active");
+      return { startTime: currentTime, position, generation, totalSize };
+    }
+
+    // Translate options from the recording model into profiler-specific
+    // options for the nsIProfiler
+    let profilerOptions = {
+      entries: options.bufferSize,
+      interval: options.sampleFrequency ? (1000 / (options.sampleFrequency * 1000)) : void 0
+    };
+
+    yield this.startProfiler(profilerOptions);
+
+    this.emit("profiler-activated");
+    return { startTime: 0, position, generation, totalSize };
+  }),
+
+  /**
+   * Indicates the end of a recording -- does not actually stop the profiler
+   * (stopProfiler does that), but notes that we no longer need to poll
+   * for buffer status.
+   */
+  stop: Task.async(function *() {
+    yield this._poller.off();
+  }),
+
+  /**
+   * Wrapper around `profiler.isActive()` to take profiler status data and emit.
+   */
+  getStatus: Task.async(function *() {
+    let data = yield (CompatUtils.actorCompatibilityBridge("isActive").call(this));
+    // If no data, the last poll for `isActive()` was wrapping up, and the target.client
+    // is now null, so we no longer have data, so just abort here.
+    if (!data) {
+      return;
+    }
+
+    // If TEST_PROFILER_FILTER_STATUS defined (via array of fields), filter
+    // out any field from isActive, used only in tests. Used to filter out
+    // buffer status fields to simulate older geckos.
+    if (this._target.TEST_PROFILER_FILTER_STATUS) {
+      data = Object.keys(data).reduce((acc, prop) => {
+        if (this._target.TEST_PROFILER_FILTER_STATUS.indexOf(prop) === -1) {
+          acc[prop] = data[prop];
+        }
+        return acc;
+      }, {});
+    }
+
+    this.emit("profiler-status", data);
+    return data;
+  }),
+
+  /**
+   * Returns profile data from now since `startTime`.
+   */
+  getProfile: Task.async(function *(options) {
+    let profilerData = yield (CompatUtils.actorCompatibilityBridge("getProfile").call(this, options));
+    // If the backend is not deduped, dedupe it ourselves, as rest of the code
+    // expects a deduped profile.
+    if (profilerData.profile.meta.version === 2) {
+      RecordingUtils.deflateProfile(profilerData.profile);
+    }
+
+    // If the backend does not support filtering by start and endtime on platform (< Fx40),
+    // do it on the client (much slower).
+    if (!this.traits.filterable) {
+      RecordingUtils.filterSamples(profilerData.profile, options.startTime || 0);
+    }
+
+    return profilerData;
+  }),
+
+  /**
+   * Invoked whenever a registered event was emitted by the profiler actor.
+   *
+   * @param object response
+   *        The data received from the backend.
+   */
+  _onProfilerEvent: function (_, { topic, subject, details }) {
+    if (topic === "console-api-profiler") {
+      if (subject.action === "profile") {
+        this.emit("console-profile-start", details);
+      } else if (subject.action === "profileEnd") {
+        this.emit("console-profile-end", details);
+      }
+    } else if (topic === "profiler-stopped") {
+      this.emit("profiler-stopped");
+    }
+  },
+
+  _checkProfilerStatus: Task.async(function *() {
+    // Calling `getStatus()` will emit the "profiler-status" on its own
+    yield this.getStatus();
+  }),
+
+  toString: () => "[object ProfilerFrontFacade]"
+};
+
+// Bind all the methods that directly proxy to the actor
+PROFILER_ACTOR_METHODS.forEach(method => ProfilerFrontFacade.prototype[method] = CompatUtils.actorCompatibilityBridge(method));
+exports.ProfilerFront = ProfilerFrontFacade;
+
+/**
+ * Constructor for a facade around an underlying TimelineFront.
+ */
+function TimelineFrontFacade (target) {
+  this._target = target;
+  EventEmitter.decorate(this);
+}
+
+TimelineFrontFacade.prototype = {
+  EVENTS: ["markers", "frames", "memory", "ticks"],
+
+  connect: Task.async(function*() {
+    let supported = yield CompatUtils.timelineActorSupported(this._target);
+    this._actor = supported ?
+                  new TimelineFront(this._target.client, this._target.form) :
+                  new CompatUtils.MockTimelineFront();
+
+    this.IS_MOCK = !supported;
+
+    // Binds underlying actor events and consolidates them to a `timeline-data`
+    // exposed event.
+    this.EVENTS.forEach(type => {
+      let handler = this[`_on${type}`] = this._onTimelineData.bind(this, type);
+      this._actor.on(type, handler);
+    });
+  }),
+
+  /**
+   * Override actor's destroy, so we can unregister listeners before
+   * destroying the underlying actor.
+   */
+  destroy: Task.async(function *() {
+    this.EVENTS.forEach(type => this._actor.off(type, this[`_on${type}`]));
+    yield this._actor.destroy();
+  }),
+
+  /**
+   * An aggregate of all events (markers, frames, memory, ticks) and exposes
+   * to PerformanceActorsConnection as a single event.
+   */
+  _onTimelineData: function (type, ...data) {
+    this.emit("timeline-data", type, ...data);
+  },
+
+  toString: () => "[object TimelineFrontFacade]"
+};
+
+// Bind all the methods that directly proxy to the actor
+TIMELINE_ACTOR_METHODS.forEach(method => TimelineFrontFacade.prototype[method] = CompatUtils.actorCompatibilityBridge(method));
+exports.TimelineFront = TimelineFrontFacade;
+
+/**
+ * Constructor for a facade around an underlying ProfilerFront.
+ */
+function MemoryFrontFacade (target) {
+  this._target = target;
+  this._pullAllocationSites = this._pullAllocationSites.bind(this);
+
+  EventEmitter.decorate(this);
+}
+
+MemoryFrontFacade.prototype = {
+  connect: Task.async(function*() {
+    let supported = yield CompatUtils.memoryActorSupported(this._target);
+    this._actor = supported ?
+                  new MemoryFront(this._target.client, this._target.form) :
+                  new CompatUtils.MockMemoryFront();
+
+    this.IS_MOCK = !supported;
+  }),
+
+  /**
+   * Disables polling and destroys actor.
+   */
+  destroy: Task.async(function *() {
+    if (this._poller) {
+      yield this._poller.destroy();
+    }
+    yield this._actor.destroy();
+  }),
+
+  /**
+   * Starts polling for allocation information.
+   */
+  start: Task.async(function *(options) {
+    if (!options.withAllocations) {
+      return 0;
+    }
+
+    yield this.attach();
+
+    // Reconstruct our options because the server actor fails when being passed
+    // undefined values in objects.
+    let allocationOptions = {};
+    if (options.allocationsSampleProbability !== void 0) {
+      allocationOptions.probability = options.allocationsSampleProbability;
+    }
+    if (options.allocationsMaxLogLength !== void 0) {
+      allocationOptions.maxLogLength = options.allocationsMaxLogLength;
+    }
+
+    let startTime = yield this.startRecordingAllocations(allocationOptions);
+
+    if (!this._poller) {
+      this._poller = new Poller(this._pullAllocationSites, ALLOCATION_SITE_POLL_TIMER, false);
+    }
+    if (!this._poller.isPolling()) {
+      this._poller.on();
+    }
+
+    return startTime;
+  }),
+
+  /**
+   * Stops polling for allocation information.
+   */
+  stop: Task.async(function *(options) {
+    if (!options.withAllocations) {
+      return 0;
+    }
+
+    // Since `_pullAllocationSites` is usually running inside a timeout, and
+    // it's performing asynchronous requests to the server, a recording may
+    // be stopped before that method finishes executing. Therefore, we need to
+    // wait for the last request to `getAllocations` to finish before actually
+    // stopping recording allocations.
+    yield this._poller.off();
+    yield this._lastPullAllocationSitesFinished;
+
+    let endTime = yield this.stopRecordingAllocations();
+    yield this.detach();
+
+    return endTime;
+  }),
+
+  /**
+   * At regular intervals, pull allocations from the memory actor, and
+   * forward them on this Front facade as "timeline-data" events. This
+   * gives the illusion that the MemoryActor supports an EventEmitter-style
+   * event stream.
+   */
+  _pullAllocationSites: Task.async(function *() {
+    let deferred = promise.defer();
+    this._lastPullAllocationSitesFinished = deferred.promise;
+
+    if ((yield this.getState()) !== "attached") {
+      deferred.resolve();
+      return;
+    }
+
+    let memoryData = yield this.getAllocations();
+    // Match the signature of the TimelineFront events, with "timeline-data"
+    // being the event name, and the second argument describing the type.
+    this.emit("timeline-data", "allocations", {
+      sites: memoryData.allocations,
+      timestamps: memoryData.allocationsTimestamps,
+      frames: memoryData.frames,
+      counts: memoryData.counts
+    });
+
+    deferred.resolve();
+  }),
+
+  toString: () => "[object MemoryFrontFacade]"
+};
+
+// Bind all the methods that directly proxy to the actor
+MEMORY_ACTOR_METHODS.forEach(method => MemoryFrontFacade.prototype[method] = CompatUtils.actorCompatibilityBridge(method));
+exports.MemoryFront = MemoryFrontFacade;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/logic/compatibility.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/logic/compatibility.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/logic/compatibility.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/logic/compatibility.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,179 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 { Task } = require("resource://gre/modules/Task.jsm");
+
+loader.lazyRequireGetter(this, "promise");
+loader.lazyRequireGetter(this, "EventEmitter",
+  "devtools/toolkit/event-emitter");
+
+/**
+ * A dummy front decorated with the provided methods.
+ *
+ * @param array blueprint
+ *        A list of [funcName, retVal] describing the class.
+ */
+function MockFront (blueprint) {
+  EventEmitter.decorate(this);
+
+  for (let [funcName, retVal] of blueprint) {
+    this[funcName] = (x => typeof x === "function" ? x() : x).bind(this, retVal);
+  }
+}
+
+function MockMemoryFront () {
+  MockFront.call(this, [
+    ["start", 0], // for facade
+    ["stop", 0], // for facade
+    ["destroy"],
+    ["attach"],
+    ["detach"],
+    ["getState", "detached"],
+    ["startRecordingAllocations", 0],
+    ["stopRecordingAllocations", 0],
+    ["getAllocations", createMockAllocations],
+  ]);
+}
+exports.MockMemoryFront = MockMemoryFront;
+
+function MockTimelineFront () {
+  MockFront.call(this, [
+    ["destroy"],
+    ["start", 0],
+    ["stop", 0],
+  ]);
+}
+exports.MockTimelineFront = MockTimelineFront;
+
+/**
+ * Create a fake allocations object, to be used with the MockMemoryFront
+ * so we create a fresh object each time.
+ *
+ * @return {Object}
+ */
+function createMockAllocations () {
+  return {
+    allocations: [],
+    allocationsTimestamps: [],
+    frames: [],
+    counts: []
+  };
+}
+
+/**
+ * Takes a TabTarget, and checks through all methods that are needed
+ * on the server's memory actor to determine if a mock or real MemoryActor
+ * should be used. The last of the methods added to MemoryActor
+ * landed in Gecko 35, so previous versions will fail this. Setting the `target`'s
+ * TEST_MOCK_MEMORY_ACTOR property to true will cause this function to indicate that
+ * the memory actor is not supported.
+ *
+ * @param {TabTarget} target
+ * @return {Boolean}
+ */
+function memoryActorSupported (target) {
+  // This `target` property is used only in tests to test
+  // instances where the memory actor is not available.
+  if (target.TEST_MOCK_MEMORY_ACTOR) {
+    return false;
+  }
+
+  // We need to test that both the root actor has `memoryActorAllocations`,
+  // which is in Gecko 38+, and also that the target has a memory actor. There
+  // are scenarios, like addon debugging, where memoryActorAllocations is available,
+  // but no memory actor (like addon debugging in Gecko 38+)
+  return !!target.getTrait("memoryActorAllocations") && target.hasActor("memory");
+}
+exports.memoryActorSupported = Task.async(memoryActorSupported);
+
+/**
+ * Takes a TabTarget, and checks existence of a TimelineActor on
+ * the server, or if TEST_MOCK_TIMELINE_ACTOR is to be used.
+ *
+ * @param {TabTarget} target
+ * @return {Boolean}
+ */
+function timelineActorSupported(target) {
+  // This `target` property is used only in tests to test
+  // instances where the timeline actor is not available.
+  if (target.TEST_MOCK_TIMELINE_ACTOR) {
+    return false;
+  }
+
+  return target.hasActor("timeline");
+}
+exports.timelineActorSupported = Task.async(timelineActorSupported);
+
+/**
+ * Returns a promise resolving to the location of the profiler actor
+ * within this context.
+ *
+ * @param {TabTarget} target
+ * @return {Promise<ProfilerActor>}
+ */
+function getProfiler (target) {
+  let deferred = promise.defer();
+  // Chrome and content process targets already have obtained a reference
+  // to the profiler tab actor. Use it immediately.
+  if (target.form && target.form.profilerActor) {
+    deferred.resolve(target.form.profilerActor);
+  }
+  // Check if we already have a grip to the `listTabs` response object
+  // and, if we do, use it to get to the profiler actor.
+  else if (target.root && target.root.profilerActor) {
+    deferred.resolve(target.root.profilerActor);
+  }
+  // Otherwise, call `listTabs`.
+  else {
+    target.client.listTabs(({ profilerActor }) => deferred.resolve(profilerActor));
+  }
+  return deferred.promise;
+}
+exports.getProfiler = Task.async(getProfiler);
+
+/**
+ * Makes a request to an actor that does not have the modern `Front`
+ * interface.
+ */
+function legacyRequest (target, actor, method, args) {
+  let deferred = promise.defer();
+  let data = args[0] || {};
+  data.to = actor;
+  data.type = method;
+  target.client.request(data, deferred.resolve);
+  return deferred.promise;
+}
+
+/**
+ * Returns a function to be used as a method on an "Actor" in ./actors.
+ * Calls the underlying actor's method, supporting the modern `Front`
+ * interface if possible, otherwise, falling back to using
+ * `legacyRequest`.
+ */
+function actorCompatibilityBridge (method) {
+  return function () {
+    // If there's no target or client on this actor facade,
+    // abort silently -- this occurs in tests when polling occurs
+    // after the test ends, when tests do not wait for toolbox destruction
+    // (which will destroy the actor facade, turning off the polling).
+    if (!this._target || !this._target.client) {
+      return;
+    }
+    // Check to see if this is a modern ActorFront, which has its
+    // own `request` method. Also, check if its a mock actor, as it mimicks
+    // the ActorFront interface.
+    // The profiler actor does not currently support the modern `Front`
+    // interface, so we have to manually push packets to it.
+    // TODO bug 1159389, fix up profiler actor to not need this, however
+    // we will need it for backwards compat
+    if (this.IS_MOCK || this._actor.request) {
+      return this._actor[method].apply(this._actor, arguments);
+    }
+    else {
+      return legacyRequest(this._target, this._actor, method, arguments);
+    }
+  };
+}
+exports.actorCompatibilityBridge = actorCompatibilityBridge;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/logic/frame-utils.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/logic/frame-utils.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/logic/frame-utils.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/logic/frame-utils.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,422 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+const { Cc, Ci, Cu, Cr } = require("chrome");
+
+loader.lazyRequireGetter(this, "Services");
+loader.lazyRequireGetter(this, "CATEGORY_OTHER",
+  "devtools/performance/global", true);
+
+// Character codes used in various parsing helper functions.
+const CHAR_CODE_A = "a".charCodeAt(0);
+const CHAR_CODE_C = "c".charCodeAt(0);
+const CHAR_CODE_E = "e".charCodeAt(0);
+const CHAR_CODE_F = "f".charCodeAt(0);
+const CHAR_CODE_H = "h".charCodeAt(0);
+const CHAR_CODE_I = "i".charCodeAt(0);
+const CHAR_CODE_J = "j".charCodeAt(0);
+const CHAR_CODE_L = "l".charCodeAt(0);
+const CHAR_CODE_M = "m".charCodeAt(0);
+const CHAR_CODE_O = "o".charCodeAt(0);
+const CHAR_CODE_P = "p".charCodeAt(0);
+const CHAR_CODE_R = "r".charCodeAt(0);
+const CHAR_CODE_S = "s".charCodeAt(0);
+const CHAR_CODE_T = "t".charCodeAt(0);
+const CHAR_CODE_U = "u".charCodeAt(0);
+const CHAR_CODE_0 = "0".charCodeAt(0);
+const CHAR_CODE_9 = "9".charCodeAt(0);
+
+const CHAR_CODE_LPAREN = "(".charCodeAt(0);
+const CHAR_CODE_COLON = ":".charCodeAt(0);
+const CHAR_CODE_SLASH = "/".charCodeAt(0);
+
+// The cache used in the `nsIURL` function.
+const gNSURLStore = new Map();
+
+// The cache used to store inflated frames.
+const gInflatedFrameStore = new WeakMap();
+
+/**
+ * Parses the raw location of this function call to retrieve the actual
+ * function name, source url, host name, line and column.
+ */
+exports.parseLocation = function parseLocation(location, fallbackLine, fallbackColumn) {
+  // Parse the `location` for the function name, source url, line, column etc.
+
+  let line, column, url;
+
+  // These two indices are used to extract the resource substring, which is
+  // location[firstParenIndex + 1 .. lineAndColumnIndex].
+  //
+  // The resource substring is extracted iff a line number was found. There
+  // may be no parentheses, in which case the substring starts at 0.
+  //
+  // For example, take "foo (bar.js:1)".
+  //                        ^      ^
+  //                        |      -----+
+  //                        +-------+   |
+  //                                |   |
+  // firstParenIndex will point to -+   |
+  //                                    |
+  // lineAndColumnIndex will point to --+
+  //
+  // For an example without parentheses, take "bar.js:2".
+  //                                          ^      ^
+  //                                          |      |
+  // firstParenIndex will point to -----------+      |
+  //                                                 |
+  // lineAndColumIndex will point to ----------------+
+  let firstParenIndex = -1;
+  let lineAndColumnIndex = -1;
+
+  // Compute firstParenIndex and lineAndColumnIndex. If lineAndColumnIndex is
+  // found, also extract the line and column.
+  for (let i = 0; i < location.length; i++) {
+    let c = location.charCodeAt(i);
+
+    // The url and line information might be inside parentheses.
+    if (c === CHAR_CODE_LPAREN) {
+      if (firstParenIndex < 0) {
+        firstParenIndex = i;
+      }
+      continue;
+    }
+
+    // Look for numbers after colons, twice. Firstly for the line, secondly
+    // for the column.
+    if (c === CHAR_CODE_COLON) {
+      if (isNumeric(location.charCodeAt(i + 1))) {
+        // If we found a line number, remember when it starts.
+        if (lineAndColumnIndex < 0) {
+          lineAndColumnIndex = i;
+        }
+
+        let start = ++i;
+        let length = 1;
+        while (isNumeric(location.charCodeAt(++i))) {
+          length++;
+        }
+
+        // Discard port numbers
+        if (location.charCodeAt(i) === CHAR_CODE_SLASH) {
+          lineAndColumnIndex = -1;
+          --i;
+          continue;
+        }
+
+        if (!line) {
+          line = location.substr(start, length);
+
+          // Unwind a character due to the isNumeric loop above.
+          --i;
+
+          // There still might be a column number, continue looking.
+          continue;
+        }
+
+        column = location.substr(start, length);
+
+        // We've gotten both a line and a column, stop looking.
+        break;
+      }
+    }
+  }
+
+  let uri;
+  if (lineAndColumnIndex > 0) {
+    let resource = location.substring(firstParenIndex + 1, lineAndColumnIndex);
+    url = resource.split(" -> ").pop();
+    if (url) {
+      uri = nsIURL(url);
+    }
+  }
+
+  let functionName, fileName, hostName, port, host;
+  line = line || fallbackLine;
+  column = column || fallbackColumn;
+
+  // If the URI digged out from the `location` is valid, this is a JS frame.
+  if (uri) {
+    functionName = location.substring(0, firstParenIndex - 1);
+    fileName = uri.fileName || "/";
+    hostName = getHost(url, uri.host);
+    // nsIURL throws when accessing a piece of a URL that doesn't
+    // exist, because we can't have nice things. Only check this if hostName
+    // exists, to save an extra try/catch.
+    if (hostName) {
+      try {
+        port = uri.port === -1 ? null : uri.port;
+        host = port !== null ? `${hostName}:${port}` : hostName;
+      } catch (e) {
+        host = hostName;
+      }
+    }
+  } else {
+    functionName = location;
+    url = null;
+  }
+
+  return { functionName, fileName, hostName, host, port, url, line, column };
+};
+
+/**
+ * Checks if the specified function represents a chrome or content frame.
+ *
+ * @param string location
+ *        The location of the frame.
+ * @param number category [optional]
+ *        If a chrome frame, the category.
+ * @return boolean
+ *         True if a content frame, false if a chrome frame.
+ */
+function isContent({ location, category }) {
+  // Only C++ stack frames have associated category information.
+  if (category) {
+    return false;
+  }
+
+  // Locations in frames with function names look like:
+  //   "functionName (foo://bar)".
+  // Look for the starting left parenthesis, then try to match a
+  // scheme name.
+  for (let i = 0; i < location.length; i++) {
+    if (location.charCodeAt(i) === CHAR_CODE_LPAREN) {
+      return isContentScheme(location, i + 1);
+    }
+  }
+
+  // If there was no left parenthesis, try matching from the start.
+  return isContentScheme(location, 0);
+}
+exports.isContent = isContent;
+
+/**
+ * Get caches to cache inflated frames and computed frame keys of a frame
+ * table.
+ *
+ * @param object framesTable
+ * @return object
+ */
+exports.getInflatedFrameCache = function getInflatedFrameCache(frameTable) {
+  let inflatedCache = gInflatedFrameStore.get(frameTable);
+  if (inflatedCache !== undefined) {
+    return inflatedCache;
+  }
+
+  // Fill with nulls to ensure no holes.
+  inflatedCache = Array.from({ length: frameTable.data.length }, () => null);
+  gInflatedFrameStore.set(frameTable, inflatedCache);
+  return inflatedCache;
+};
+
+/**
+ * Get or add an inflated frame to a cache.
+ *
+ * @param object cache
+ * @param number index
+ * @param object frameTable
+ * @param object stringTable
+ * @param object allocationsTable
+ */
+exports.getOrAddInflatedFrame = function getOrAddInflatedFrame(cache, index, frameTable, stringTable, allocationsTable) {
+  let inflatedFrame = cache[index];
+  if (inflatedFrame === null) {
+    inflatedFrame = cache[index] = new InflatedFrame(index, frameTable, stringTable, allocationsTable);
+  }
+  return inflatedFrame;
+};
+
+/**
+ * An intermediate data structured used to hold inflated frames.
+ *
+ * @param number index
+ * @param object frameTable
+ * @param object stringTable
+ * @param object allocationsTable
+ */
+function InflatedFrame(index, frameTable, stringTable, allocationsTable) {
+  const LOCATION_SLOT = frameTable.schema.location;
+  const OPTIMIZATIONS_SLOT = frameTable.schema.optimizations;
+  const LINE_SLOT = frameTable.schema.line;
+  const CATEGORY_SLOT = frameTable.schema.category;
+
+  let frame = frameTable.data[index];
+  let category = frame[CATEGORY_SLOT];
+  this.location = stringTable[frame[LOCATION_SLOT]];
+  this.optimizations = frame[OPTIMIZATIONS_SLOT];
+  this.line = frame[LINE_SLOT];
+  this.column = undefined;
+  this.category = category;
+  this.metaCategory = category || CATEGORY_OTHER;
+  this.allocations = allocationsTable ? allocationsTable[index] : 0;
+  this.isContent = isContent(this);
+};
+
+/**
+ * Gets the frame key (i.e., equivalence group) according to options. Content
+ * frames are always identified by location. Chrome frames are identified by
+ * location if content-only filtering is off. If content-filtering is on, they
+ * are identified by their category.
+ *
+ * @param object options
+ * @return string
+ */
+InflatedFrame.prototype.getFrameKey = function getFrameKey(options) {
+  if (this.isContent || !options.contentOnly || options.isRoot) {
+    options.isMetaCategoryOut = false;
+    return this.location;
+  }
+
+  if (options.isLeaf) {
+    // We only care about leaf platform frames if we are displaying content
+    // only. If no category is present, give the default category of
+    // CATEGORY_OTHER.
+    //
+    // 1. The leaf is where time is _actually_ being spent, so we _need_ to
+    // show it to developers in some way to give them accurate profiling
+    // data. We decide to split the platform into various category buckets
+    // and just show time spent in each bucket.
+    //
+    // 2. The calls leading to the leaf _aren't_ where we are spending time,
+    // but _do_ give the developer context for how they got to the leaf
+    // where they _are_ spending time. For non-platform hackers, the
+    // non-leaf platform frames don't give any meaningful context, and so we
+    // can safely filter them out.
+    options.isMetaCategoryOut = true;
+    return this.metaCategory;
+  }
+
+  // Return an empty string denoting that this frame should be skipped.
+  return "";
+};
+
+exports.InflatedFrame = InflatedFrame;
+
+/**
+ * Helper for getting an nsIURL instance out of a string.
+ */
+function nsIURL(url) {
+  let cached = gNSURLStore.get(url);
+  // If we cached a valid URI, or `null` in the case
+  // of a failure, return it.
+  if (cached !== void 0) {
+    return cached;
+  }
+  let uri = null;
+  try {
+    uri = Services.io.newURI(url, null, null).QueryInterface(Ci.nsIURL);
+    // Access the host, because the constructor doesn't necessarily throw
+    // if it's invalid, but accessing the host can throw as well
+    uri.host;
+  } catch(e) {
+    // The passed url string is invalid.
+    uri = null;
+  }
+
+  gNSURLStore.set(url, uri);
+  return uri;
+};
+
+/**
+ * Takes a `host` string from an nsIURL instance and
+ * returns the same string, or null, if it's an invalid host.
+ */
+function getHost (url, hostName) {
+  return isChromeScheme(url, 0) ? null : hostName;
+}
+
+// For the functions below, we assume that we will never access the location
+// argument out of bounds, which is indeed the vast majority of cases.
+//
+// They are written this way because they are hot. Each frame is checked for
+// being content or chrome when processing the profile.
+
+function isColonSlashSlash(location, i) {
+  return location.charCodeAt(++i) === CHAR_CODE_COLON &&
+         location.charCodeAt(++i) === CHAR_CODE_SLASH &&
+         location.charCodeAt(++i) === CHAR_CODE_SLASH;
+}
+
+function isContentScheme(location, i) {
+  let firstChar = location.charCodeAt(i);
+
+  switch (firstChar) {
+  case CHAR_CODE_H: // "http://" or "https://"
+    if (location.charCodeAt(++i) === CHAR_CODE_T &&
+        location.charCodeAt(++i) === CHAR_CODE_T &&
+        location.charCodeAt(++i) === CHAR_CODE_P) {
+      if (location.charCodeAt(i + 1) === CHAR_CODE_S) {
+        ++i;
+      }
+      return isColonSlashSlash(location, i);
+    }
+    return false;
+
+  case CHAR_CODE_F: // "file://"
+    if (location.charCodeAt(++i) === CHAR_CODE_I &&
+        location.charCodeAt(++i) === CHAR_CODE_L &&
+        location.charCodeAt(++i) === CHAR_CODE_E) {
+      return isColonSlashSlash(location, i);
+    }
+    return false;
+
+  case CHAR_CODE_A: // "app://"
+    if (location.charCodeAt(++i) == CHAR_CODE_P &&
+        location.charCodeAt(++i) == CHAR_CODE_P) {
+      return isColonSlashSlash(location, i);
+    }
+    return false;
+
+  default:
+    return false;
+  }
+}
+
+function isChromeScheme(location, i) {
+  let firstChar = location.charCodeAt(i);
+
+  switch (firstChar) {
+  case CHAR_CODE_C: // "chrome://"
+    if (location.charCodeAt(++i) === CHAR_CODE_H &&
+        location.charCodeAt(++i) === CHAR_CODE_R &&
+        location.charCodeAt(++i) === CHAR_CODE_O &&
+        location.charCodeAt(++i) === CHAR_CODE_M &&
+        location.charCodeAt(++i) === CHAR_CODE_E) {
+      return isColonSlashSlash(location, i);
+    }
+    return false;
+
+  case CHAR_CODE_R: // "resource://"
+    if (location.charCodeAt(++i) === CHAR_CODE_E &&
+        location.charCodeAt(++i) === CHAR_CODE_S &&
+        location.charCodeAt(++i) === CHAR_CODE_O &&
+        location.charCodeAt(++i) === CHAR_CODE_U &&
+        location.charCodeAt(++i) === CHAR_CODE_R &&
+        location.charCodeAt(++i) === CHAR_CODE_C &&
+        location.charCodeAt(++i) === CHAR_CODE_E) {
+      return isColonSlashSlash(location, i);
+    }
+    return false;
+
+  case CHAR_CODE_J: // "jar:file://"
+    if (location.charCodeAt(++i) === CHAR_CODE_A &&
+        location.charCodeAt(++i) === CHAR_CODE_R &&
+        location.charCodeAt(++i) === CHAR_CODE_COLON &&
+        location.charCodeAt(++i) === CHAR_CODE_F &&
+        location.charCodeAt(++i) === CHAR_CODE_I &&
+        location.charCodeAt(++i) === CHAR_CODE_L &&
+        location.charCodeAt(++i) === CHAR_CODE_E) {
+      return isColonSlashSlash(location, i);
+    }
+    return false;
+
+  default:
+    return false;
+  }
+}
+
+function isNumeric(c) {
+  return c >= CHAR_CODE_0 && c <= CHAR_CODE_9;
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/logic/front.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/logic/front.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/logic/front.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/logic/front.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,538 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+const { Cc, Ci, Cu, Cr } = require("chrome");
+const { Task } = require("resource://gre/modules/Task.jsm");
+
+loader.lazyRequireGetter(this, "Services");
+loader.lazyRequireGetter(this, "promise");
+loader.lazyRequireGetter(this, "EventEmitter",
+  "devtools/toolkit/event-emitter");
+loader.lazyRequireGetter(this, "extend",
+  "sdk/util/object", true);
+
+loader.lazyRequireGetter(this, "Actors",
+  "devtools/performance/actors");
+loader.lazyRequireGetter(this, "RecordingModel",
+  "devtools/performance/recording-model", true);
+loader.lazyRequireGetter(this, "DevToolsUtils",
+  "devtools/toolkit/DevToolsUtils");
+
+loader.lazyImporter(this, "gDevTools",
+  "resource:///modules/devtools/gDevTools.jsm");
+
+// Events to pipe from PerformanceActorsConnection to the PerformanceFront
+const CONNECTION_PIPE_EVENTS = [
+  "timeline-data", "profiler-already-active", "profiler-activated",
+  "recording-starting", "recording-started", "recording-stopping", "recording-stopped",
+  "profiler-status"
+];
+
+/**
+ * A cache of all PerformanceActorsConnection instances.
+ * The keys are Target objects.
+ */
+let SharedPerformanceActors = new WeakMap();
+
+/**
+ * Instantiates a shared PerformanceActorsConnection for the specified target.
+ * Consumers must yield on `open` to make sure the connection is established.
+ *
+ * @param Target target
+ *        The target owning this connection.
+ * @return PerformanceActorsConnection
+ *         The shared connection for the specified target.
+ */
+SharedPerformanceActors.forTarget = function(target) {
+  if (this.has(target)) {
+    return this.get(target);
+  }
+
+  let instance = new PerformanceActorsConnection(target);
+  this.set(target, instance);
+  return instance;
+};
+
+/**
+ * A connection to underlying actors (profiler, memory, framerate, etc.)
+ * shared by all tools in a target.
+ *
+ * Use `SharedPerformanceActors.forTarget` to make sure you get the same
+ * instance every time, and the `PerformanceFront` to start/stop recordings.
+ *
+ * @param Target target
+ *        The target owning this connection.
+ */
+function PerformanceActorsConnection(target) {
+  EventEmitter.decorate(this);
+
+  this._target = target;
+  this._client = this._target.client;
+  this._pendingConsoleRecordings = [];
+  this._sitesPullTimeout = 0;
+  this._recordings = [];
+
+  this._pipeToConnection = this._pipeToConnection.bind(this);
+  this._onTimelineData = this._onTimelineData.bind(this);
+  this._onConsoleProfileStart = this._onConsoleProfileStart.bind(this);
+  this._onConsoleProfileEnd = this._onConsoleProfileEnd.bind(this);
+  this._onProfilerStatus = this._onProfilerStatus.bind(this);
+  this._onProfilerUnexpectedlyStopped = this._onProfilerUnexpectedlyStopped.bind(this);
+
+  Services.obs.notifyObservers(null, "performance-actors-connection-created", null);
+}
+
+PerformanceActorsConnection.prototype = {
+
+  // Properties set based off of server actor support
+  _memorySupported: true,
+  _timelineSupported: true,
+
+  /**
+   * Initializes a connection to the profiler and other miscellaneous actors.
+   * If in the process of opening, or already open, nothing happens.
+   *
+   * @return object
+   *         A promise that is resolved once the connection is established.
+   */
+  open: Task.async(function*() {
+    if (this._connecting) {
+      return this._connecting.promise;
+    }
+
+    // Create a promise that gets resolved upon connecting, so that
+    // other attempts to open the connection use the same resolution promise
+    this._connecting = promise.defer();
+
+    // Local debugging needs to make the target remote.
+    yield this._target.makeRemote();
+
+    // Sets `this._profiler`, `this._timeline` and `this._memory`.
+    // Only initialize the timeline and memory fronts if the respective actors
+    // are available. Older Gecko versions don't have existing implementations,
+    // in which case all the methods we need can be easily mocked.
+    yield this._connectActors();
+    yield this._registerListeners();
+
+    this._connecting.resolve();
+    Services.obs.notifyObservers(null, "performance-actors-connection-opened", null);
+  }),
+
+  /**
+   * Destroys this connection.
+   */
+  destroy: Task.async(function*() {
+    if (this._connecting) {
+      yield this._connecting.promise;
+    } else {
+      return;
+    }
+
+    yield this._unregisterListeners();
+    yield this._disconnectActors();
+
+    this._connecting = null;
+    this._profiler = null;
+    this._timeline = null;
+    this._memory = null;
+    this._target = null;
+    this._client = null;
+  }),
+
+  /**
+   * Initializes fronts and connects to the underlying actors using the facades
+   * found in ./actors.js.
+   */
+  _connectActors: Task.async(function*() {
+    this._profiler = new Actors.ProfilerFront(this._target);
+    this._memory = new Actors.MemoryFront(this._target);
+    this._timeline = new Actors.TimelineFront(this._target);
+
+    yield promise.all([
+      this._profiler.connect(),
+      this._memory.connect(),
+      this._timeline.connect()
+    ]);
+
+    // Expose server support status of underlying actors
+    // after connecting.
+    this._memorySupported = !this._memory.IS_MOCK;
+    this._timelineSupported = !this._timeline.IS_MOCK;
+  }),
+
+  /**
+   * Registers listeners on events from the underlying
+   * actors, so the connection can handle them.
+   */
+  _registerListeners: function () {
+    this._timeline.on("timeline-data", this._onTimelineData);
+    this._memory.on("timeline-data", this._onTimelineData);
+    this._profiler.on("console-profile-start", this._onConsoleProfileStart);
+    this._profiler.on("console-profile-end", this._onConsoleProfileEnd);
+    this._profiler.on("profiler-stopped", this._onProfilerUnexpectedlyStopped);
+    this._profiler.on("profiler-already-active", this._pipeToConnection);
+    this._profiler.on("profiler-activated", this._pipeToConnection);
+    this._profiler.on("profiler-status", this._onProfilerStatus);
+  },
+
+  /**
+   * Unregisters listeners on events on the underlying actors.
+   */
+  _unregisterListeners: function () {
+    this._timeline.off("timeline-data", this._onTimelineData);
+    this._memory.off("timeline-data", this._onTimelineData);
+    this._profiler.off("console-profile-start", this._onConsoleProfileStart);
+    this._profiler.off("console-profile-end", this._onConsoleProfileEnd);
+    this._profiler.off("profiler-stopped", this._onProfilerUnexpectedlyStopped);
+    this._profiler.off("profiler-already-active", this._pipeToConnection);
+    this._profiler.off("profiler-activated", this._pipeToConnection);
+    this._profiler.off("profiler-status", this._onProfilerStatus);
+  },
+
+  /**
+   * Closes the connections to non-profiler actors.
+   */
+  _disconnectActors: Task.async(function* () {
+    yield promise.all([
+      this._profiler.destroy(),
+      this._timeline.destroy(),
+      this._memory.destroy()
+    ]);
+  }),
+
+  /**
+   * Invoked whenever `console.profile` is called.
+   *
+   * @param string profileLabel
+   *        The provided string argument if available; undefined otherwise.
+   * @param number currentTime
+   *        The time (in milliseconds) when the call was made, relative to when
+   *        the nsIProfiler module was started.
+   */
+  _onConsoleProfileStart: Task.async(function *(_, { profileLabel, currentTime: startTime }) {
+    let recordings = this._recordings;
+
+    // Abort if a profile with this label already exists.
+    if (recordings.find(e => e.getLabel() === profileLabel)) {
+      return;
+    }
+
+    // Ensure the performance front is set up and ready.
+    // Slight performance overhead for this, should research some more.
+    // This is to ensure that there is a front to receive the events for
+    // the console profiles.
+    yield gDevTools.getToolbox(this._target).loadTool("performance");
+
+    let model = yield this.startRecording(extend(getRecordingModelPrefs(), {
+      console: true,
+      label: profileLabel
+    }));
+  }),
+
+  /**
+   * Invoked whenever `console.profileEnd` is called.
+   *
+   * @param string profileLabel
+   *        The provided string argument if available; undefined otherwise.
+   * @param number currentTime
+   *        The time (in milliseconds) when the call was made, relative to when
+   *        the nsIProfiler module was started.
+   */
+  _onConsoleProfileEnd: Task.async(function *(_, data) {
+    // If no data, abort; can occur if profiler isn't running and we get a surprise
+    // call to console.profileEnd()
+    if (!data) {
+      return;
+    }
+    let { profileLabel, currentTime: endTime } = data;
+
+    let pending = this._recordings.filter(r => r.isConsole() && r.isRecording());
+    if (pending.length === 0) {
+      return;
+    }
+
+    let model;
+    // Try to find the corresponding `console.profile` call if
+    // a label was used in profileEnd(). If no matches, abort.
+    if (profileLabel) {
+      model = pending.find(e => e.getLabel() === profileLabel);
+    }
+    // If no label supplied, pop off the most recent pending console recording
+    else {
+      model = pending[pending.length - 1];
+    }
+
+    // If `profileEnd()` was called with a label, and there are no matching
+    // sessions, abort.
+    if (!model) {
+      Cu.reportError("console.profileEnd() called with label that does not match a recording.");
+      return;
+    }
+
+    yield this.stopRecording(model);
+  }),
+
+ /**
+  * TODO handle bug 1144438
+  */
+  _onProfilerUnexpectedlyStopped: function () {
+    Cu.reportError("Profiler unexpectedly stopped.", arguments);
+  },
+
+  /**
+   * Called whenever there is timeline data of any of the following types:
+   * - markers
+   * - frames
+   * - memory
+   * - ticks
+   * - allocations
+   *
+   * Populate our internal store of recordings for all currently recording sessions.
+   */
+  _onTimelineData: function (_, ...data) {
+    this._recordings.forEach(e => e._addTimelineData.apply(e, data));
+    this.emit("timeline-data", ...data);
+  },
+
+  /**
+   * Called whenever the underlying profiler polls its current status.
+   */
+  _onProfilerStatus: function (_, data) {
+    // If no data emitted (whether from an older actor being destroyed
+    // from a previous test, or the server does not support it), just ignore.
+    if (!data) {
+      return;
+    }
+    // Check for a value of buffer status (`position`) to see if the server
+    // supports buffer status -- apply to the recording models if so.
+    if (data.position !== void 0) {
+      this._recordings.forEach(e => e._addBufferStatusData.call(e, data));
+    }
+    this.emit("profiler-status", data);
+  },
+
+  /**
+   * Begins a recording session
+   *
+   * @param object options
+   *        An options object to pass to the actors. Supported properties are
+   *        `withTicks`, `withMemory` and `withAllocations`, `probability`, and `maxLogLength`.
+   * @return object
+   *         A promise that is resolved once recording has started.
+   */
+  startRecording: Task.async(function*(options = {}) {
+    let model = new RecordingModel(options);
+    this.emit("recording-starting", model);
+
+    // All actors are started asynchronously over the remote debugging protocol.
+    // Get the corresponding start times from each one of them.
+    // The timeline and memory actors are target-dependent, so start those as well,
+    // even though these are mocked in older Geckos (FF < 35)
+    let { startTime, position, generation, totalSize } = yield this._profiler.start(options);
+    let timelineStartTime = yield this._timeline.start(options);
+    let memoryStartTime = yield this._memory.start(options);
+
+    let data = {
+      profilerStartTime: startTime, timelineStartTime, memoryStartTime,
+      generation, position, totalSize
+    };
+
+    // Signify to the model that the recording has started,
+    // populate with data and store the recording model here.
+    model._populate(data);
+    this._recordings.push(model);
+
+    this.emit("recording-started", model);
+    return model;
+  }),
+
+  /**
+   * Manually ends the recording session for the corresponding RecordingModel.
+   *
+   * @param RecordingModel model
+   *        The corresponding RecordingModel that belongs to the recording session wished to stop.
+   * @return RecordingModel
+   *         Returns the same model, populated with the profiling data.
+   */
+  stopRecording: Task.async(function*(model) {
+    // If model isn't in the PerformanceActorsConnections internal store,
+    // then do nothing.
+    if (this._recordings.indexOf(model) === -1) {
+      return;
+    }
+
+    // Flag the recording as no longer recording, so that `model.isRecording()`
+    // is false. Do this before we fetch all the data, and then subsequently
+    // the recording can be considered "completed".
+    let endTime = Date.now();
+    model._onStoppingRecording(endTime);
+    this.emit("recording-stopping", model);
+
+    // Currently there are two ways profiles stop recording. Either manually in the
+    // performance tool, or via console.profileEnd. Once a recording is done,
+    // we want to deliver the model to the performance tool (either as a return
+    // from the PerformanceFront or via `console-profile-end` event) and then
+    // remove it from the internal store.
+    //
+    // In the case where a console.profile is generated via the console (so the tools are
+    // open), we initialize the Performance tool so it can listen to those events.
+    this._recordings.splice(this._recordings.indexOf(model), 1);
+
+    let config = model.getConfiguration();
+    let startTime = model.getProfilerStartTime();
+    let profilerData = yield this._profiler.getProfile({ startTime });
+    let memoryEndTime = Date.now();
+    let timelineEndTime = Date.now();
+
+    // Only if there are no more sessions recording do we stop
+    // the underlying memory and timeline actors. If we're still recording,
+    // juse use Date.now() for the memory and timeline end times, as those
+    // are only used in tests.
+    if (!this.isRecording()) {
+      // This doesn't stop the profiler, just turns off polling for
+      // events, and also turns off events on memory/timeline actors.
+      yield this._profiler.stop();
+      memoryEndTime = yield this._memory.stop(config);
+      timelineEndTime = yield this._timeline.stop(config);
+    }
+
+    // Set the results on the RecordingModel itself.
+    model._onStopRecording({
+      // Data available only at the end of a recording.
+      profile: profilerData.profile,
+
+      // End times for all the actors.
+      profilerEndTime: profilerData.currentTime,
+      timelineEndTime: timelineEndTime,
+      memoryEndTime: memoryEndTime
+    });
+
+    this.emit("recording-stopped", model);
+    return model;
+  }),
+
+  /**
+   * Checks all currently stored recording models and returns a boolean
+   * if there is a session currently being recorded.
+   *
+   * @return Boolean
+   */
+  isRecording: function () {
+    return this._recordings.some(recording => recording.isRecording());
+  },
+
+  /**
+   * An event from an underlying actor that we just want
+   * to pipe to the connection itself.
+   */
+  _pipeToConnection: function (eventName, ...args) {
+    this.emit(eventName, ...args);
+  },
+
+  toString: () => "[object PerformanceActorsConnection]"
+};
+
+/**
+ * A thin wrapper around a shared PerformanceActorsConnection for the parent target.
+ * Handles manually starting and stopping a recording.
+ *
+ * @param PerformanceActorsConnection connection
+ *        The shared instance for the parent target.
+ */
+function PerformanceFront(connection) {
+  EventEmitter.decorate(this);
+
+  this._connection = connection;
+
+  // Set when mocks are being used
+  this._memorySupported = connection._memorySupported;
+  this._timelineSupported = connection._timelineSupported;
+
+  // Pipe the console profile events from the connection
+  // to the front so that the UI can listen.
+  CONNECTION_PIPE_EVENTS.forEach(eventName => this._connection.on(eventName, () => this.emit.apply(this, arguments)));
+}
+
+PerformanceFront.prototype = {
+
+  /**
+   * Manually begins a recording session and creates a RecordingModel.
+   * Calls the underlying PerformanceActorsConnection's startRecording method.
+   *
+   * @param object options
+   *        An options object to pass to the actors. Supported properties are
+   *        `withTicks`, `withMemory` and `withAllocations`,
+   *        `probability` and `maxLogLength`.
+   * @return object
+   *         A promise that is resolved once recording has started.
+   */
+  startRecording: function (options) {
+    return this._connection.startRecording(options);
+  },
+
+  /**
+   * Manually ends the recording session for the corresponding RecordingModel.
+   * Calls the underlying PerformanceActorsConnection's
+   *
+   * @param RecordingModel model
+   *        The corresponding RecordingModel that belongs to the recording session wished to stop.
+   * @return RecordingModel
+   *         Returns the same model, populated with the profiling data.
+   */
+  stopRecording: function (model) {
+    return this._connection.stopRecording(model);
+  },
+
+  /**
+   * Returns an object indicating what server actors are available and
+   * initialized. A falsy value indicates that the server does not support
+   * that feature, or that mock actors were explicitly requested (tests).
+   */
+  getActorSupport: function () {
+    return {
+      memory: this._memorySupported,
+      timeline: this._timelineSupported
+    };
+  },
+
+  /**
+   * Returns a boolean indicating whether or not the current performance connection is recording.
+   *
+   * @return Boolean
+   */
+  isRecording: function () {
+    return this._connection.isRecording();
+  },
+
+  /**
+   * Interacts with the connection's actors. Should only be used in tests.
+   */
+  _request: function (actorName, method, ...args) {
+    if (!gDevTools.testing) {
+      throw new Error("PerformanceFront._request may only be used in tests.");
+    }
+    let actor = this._connection[`_${actorName}`];
+    return actor[method].apply(actor, args);
+  },
+
+  toString: () => "[object PerformanceFront]"
+};
+
+/**
+ * Creates an object of configurations based off of preferences for a RecordingModel.
+ */
+function getRecordingModelPrefs () {
+  return {
+    withMarkers: true,
+    withMemory: Services.prefs.getBoolPref("devtools.performance.ui.enable-memory"),
+    withTicks: Services.prefs.getBoolPref("devtools.performance.ui.enable-framerate"),
+    withAllocations: Services.prefs.getBoolPref("devtools.performance.ui.enable-memory"),
+    allocationsSampleProbability: +Services.prefs.getCharPref("devtools.performance.memory.sample-probability"),
+    allocationsMaxLogLength: Services.prefs.getIntPref("devtools.performance.memory.max-log-length")
+  };
+}
+
+exports.getPerformanceActorsConnection = target => SharedPerformanceActors.forTarget(target);
+exports.PerformanceFront = PerformanceFront;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/logic/io.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/logic/io.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/logic/io.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/logic/io.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,163 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+const { Cc, Ci, Cu, Cr } = require("chrome");
+
+loader.lazyRequireGetter(this, "Services");
+loader.lazyRequireGetter(this, "promise");
+loader.lazyRequireGetter(this, "RecordingUtils",
+  "devtools/performance/recording-utils", true);
+
+loader.lazyImporter(this, "FileUtils",
+  "resource://gre/modules/FileUtils.jsm");
+loader.lazyImporter(this, "NetUtil",
+  "resource://gre/modules/NetUtil.jsm");
+
+// This identifier string is used to tentatively ascertain whether or not
+// a JSON loaded from disk is actually something generated by this tool.
+// It isn't, of course, a definitive verification, but a Good Enough™
+// approximation before continuing the import. Don't localize this.
+const PERF_TOOL_SERIALIZER_IDENTIFIER = "Recorded Performance Data";
+const PERF_TOOL_SERIALIZER_LEGACY_VERSION = 1;
+const PERF_TOOL_SERIALIZER_CURRENT_VERSION = 2;
+
+/**
+ * Helpers for importing/exporting JSON.
+ */
+let PerformanceIO = {
+  /**
+   * Gets a nsIScriptableUnicodeConverter instance with a default UTF-8 charset.
+   * @return object
+   */
+  getUnicodeConverter: function() {
+    let className = "@mozilla.org/intl/scriptableunicodeconverter";
+    let converter = Cc[className].createInstance(Ci.nsIScriptableUnicodeConverter);
+    converter.charset = "UTF-8";
+    return converter;
+  },
+
+  /**
+   * Saves a recording as JSON to a file. The provided data is assumed to be
+   * acyclical, so that it can be properly serialized.
+   *
+   * @param object recordingData
+   *        The recording data to stream as JSON.
+   * @param nsILocalFile file
+   *        The file to stream the data into.
+   * @return object
+   *         A promise that is resolved once streaming finishes, or rejected
+   *         if there was an error.
+   */
+  saveRecordingToFile: function(recordingData, file) {
+    let deferred = promise.defer();
+
+    recordingData.fileType = PERF_TOOL_SERIALIZER_IDENTIFIER;
+    recordingData.version = PERF_TOOL_SERIALIZER_CURRENT_VERSION;
+
+    let string = JSON.stringify(recordingData);
+    let inputStream = this.getUnicodeConverter().convertToInputStream(string);
+    let outputStream = FileUtils.openSafeFileOutputStream(file);
+
+    NetUtil.asyncCopy(inputStream, outputStream, deferred.resolve);
+    return deferred.promise;
+  },
+
+  /**
+   * Loads a recording stored as JSON from a file.
+   *
+   * @param nsILocalFile file
+   *        The file to import the data from.
+   * @return object
+   *         A promise that is resolved once importing finishes, or rejected
+   *         if there was an error.
+   */
+  loadRecordingFromFile: function(file) {
+    let deferred = promise.defer();
+
+    let channel = NetUtil.newChannel({
+      uri: NetUtil.newURI(file),
+      loadUsingSystemPrincipal: true});
+
+    channel.contentType = "text/plain";
+
+    NetUtil.asyncFetch(channel, (inputStream, status) => {
+      try {
+        let string = NetUtil.readInputStreamToString(inputStream, inputStream.available());
+        var recordingData = JSON.parse(string);
+      } catch (e) {
+        deferred.reject(new Error("Could not read recording data file."));
+        return;
+      }
+      if (recordingData.fileType != PERF_TOOL_SERIALIZER_IDENTIFIER) {
+        deferred.reject(new Error("Unrecognized recording data file."));
+        return;
+      }
+      if (!isValidSerializerVersion(recordingData.version)) {
+        deferred.reject(new Error("Unsupported recording data file version."));
+        return;
+      }
+      if (recordingData.version === PERF_TOOL_SERIALIZER_LEGACY_VERSION) {
+        recordingData = convertLegacyData(recordingData);
+      }
+      if (recordingData.profile.meta.version === 2) {
+        RecordingUtils.deflateProfile(recordingData.profile);
+      }
+      deferred.resolve(recordingData);
+    });
+
+    return deferred.promise;
+  }
+};
+
+exports.PerformanceIO = PerformanceIO;
+
+/**
+ * Returns a boolean indicating whether or not the passed in `version`
+ * is supported by this serializer.
+ *
+ * @param number version
+ * @return boolean
+ */
+function isValidSerializerVersion (version) {
+  return !!~[
+    PERF_TOOL_SERIALIZER_LEGACY_VERSION,
+    PERF_TOOL_SERIALIZER_CURRENT_VERSION
+  ].indexOf(version);
+}
+
+/**
+ * Takes recording data (with version `1`, from the original profiler tool), and
+ * massages the data to be line with the current performance tool's property names
+ * and values.
+ *
+ * @param object legacyData
+ * @return object
+ */
+function convertLegacyData (legacyData) {
+  let { profilerData, ticksData, recordingDuration } = legacyData;
+
+  // The `profilerData` and `ticksData` stay, but the previously unrecorded
+  // fields just are empty arrays or objects.
+  let data = {
+    label: profilerData.profilerLabel,
+    duration: recordingDuration,
+    markers: [],
+    frames: [],
+    memory: [],
+    ticks: ticksData,
+    allocations: { sites: [], timestamps: [], frames: [], counts: [] },
+    profile: profilerData.profile,
+    // Fake a configuration object here if there's tick data,
+    // so that it can be rendered
+    configuration: {
+      withTicks: !!ticksData.length,
+      withMarkers: false,
+      withMemory: false,
+      withAllocations: false
+    }
+  };
+
+  return data;
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/logic/jit.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/logic/jit.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/logic/jit.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/logic/jit.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,240 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+// An outcome of an OptimizationAttempt that is considered successful.
+const SUCCESSFUL_OUTCOMES = [
+  "GenericSuccess", "Inlined", "DOM", "Monomorphic", "Polymorphic"
+];
+
+/**
+ * Model representing JIT optimization sites from the profiler
+ * for a frame (represented by a FrameNode). Requires optimization data from
+ * a profile, which is an array of RawOptimizationSites.
+ *
+ * When the ThreadNode for the profile iterates over the samples' frames, each
+ * frame's optimizations are accumulated in their respective FrameNodes. Each
+ * FrameNode may contain many different optimization sites. One sample may
+ * pick up optimization X on line Y in the frame, with the next sample
+ * containing optimization Z on line W in the same frame, as each frame is
+ * only function.
+ *
+ * An OptimizationSite contains a record of how many times the
+ * RawOptimizationSite was sampled, as well as the unique id based off of the
+ * original profiler array, and the RawOptimizationSite itself as a reference.
+ * @see browser/devtools/performance/modules/logic/tree-model.js
+ *
+ * @struct RawOptimizationSite
+ * A structure describing a location in a script that was attempted to be optimized.
+ * Contains all the IonTypes observed, and the sequence of OptimizationAttempts that
+ * were attempted, and the line and column in the script. This is retrieved from the
+ * profiler after a recording, and our base data structure. Should always be referenced,
+ * and unmodified.
+ *
+ * Note that propertyName is an index into a string table, which needs to be
+ * provided in order for the raw optimization site to be inflated.
+ *
+ * @type {Array<IonType>} types
+ * @type {Array<OptimizationAttempt>} attempts
+ * @type {?number} propertyName
+ * @type {number} line
+ * @type {number} column
+ *
+ *
+ * @struct IonType
+ * IonMonkey attempts to classify each value in an optimization site by some type.
+ * Based off of the observed types for a value (like a variable that could be a
+ * string or an instance of an object), it determines what kind of type it should be classified
+ * as. Each IonType here contains an array of all ObservedTypes under `types`,
+ * the Ion type that IonMonkey decided this value should be (Int32, Object, etc.) as `mirType`,
+ * and the component of this optimization type that this value refers to -- like
+ * a "getter" optimization, `a[b]`, has site `a` (the "Receiver") and `b` (the "Index").
+ *
+ * Generally the more ObservedTypes, the more deoptimized this OptimizationSite is.
+ * There could be no ObservedTypes, in which case `types` is undefined.
+ *
+ * @type {?Array<ObservedType>} typeset
+ * @type {string} site
+ * @type {string} mirType
+ *
+ *
+ * @struct ObservedType
+ * When IonMonkey attempts to determine what type a value is, it checks on each sample.
+ * The ObservedType can be thought of in more of JavaScripty-terms, rather than C++.
+ * The `keyedBy` property is a high level description of the type, like "primitive",
+ * "constructor", "function", "singleton", "alloc-site" (that one is a bit more weird).
+ * If the `keyedBy` type is a function or constructor, the ObservedType should have a
+ * `name` property, referring to the function or constructor name from the JS source.
+ * If IonMonkey can determine the origin of this type (like where the constructor is defined),
+ * the ObservedType will also have `location` and `line` properties, but `location` can sometimes
+ * be non-URL strings like "self-hosted" or a memory location like "102ca7880", or no location
+ * at all, and maybe `line` is 0 or undefined.
+ *
+ * @type {string} keyedBy
+ * @type {?string} name
+ * @type {?string} location
+ * @type {?string} line
+ *
+ *
+ * @struct OptimizationAttempt
+ * Each RawOptimizationSite contains an array of OptimizationAttempts. Generally, IonMonkey
+ * goes through a series of strategies for each kind of optimization, starting from most-niche
+ * and optimized, to the less-optimized, but more general strategies -- for example, a getter
+ * opt may first try to optimize for the scenario of a getter on an `arguments` object --
+ * that will fail most of the time, as most objects are not arguments objects, but it will attempt
+ * several strategies in order until it finds a strategy that works, or fails. Even in the best
+ * scenarios, some attempts will fail (like the arguments getter example), which is OK,
+ * as long as some attempt succeeds (with the earlier attempts preferred, as those are more optimized).
+ * In an OptimizationAttempt structure, we store just the `strategy` name and `outcome` name,
+ * both from enums in js/public/TrackedOptimizationInfo.h as TRACKED_STRATEGY_LIST and
+ * TRACKED_OUTCOME_LIST, respectively. An array of successful outcome strings are above
+ * in SUCCESSFUL_OUTCOMES.
+ *
+ * @see js/public/TrackedOptimizationInfo.h
+ *
+ * @type {string} strategy
+ * @type {string} outcome
+ */
+
+
+/*
+ * A wrapper around RawOptimizationSite to record sample count and ID (referring to the index
+ * of where this is in the initially seeded optimizations data), so we don't mutate
+ * the original data from the profiler. Provides methods to access the underlying optimization
+ * data easily, so understanding the semantics of JIT data isn't necessary.
+ *
+ * @constructor
+ *
+ * @param {Array<RawOptimizationSite>} optimizations
+ * @param {number} optsIndex
+ *
+ * @type {RawOptimizationSite} data
+ * @type {number} samples
+ * @type {number} id
+ */
+
+const OptimizationSite = exports.OptimizationSite = function (id, opts) {
+  this.id = id;
+  this.data = opts;
+  this.samples = 1;
+};
+
+/**
+ * Returns a boolean indicating if the passed in OptimizationSite
+ * has a "good" outcome at the end of its attempted strategies.
+ *
+ * @param {Array<string>} stringTable
+ * @return {boolean}
+ */
+
+OptimizationSite.prototype.hasSuccessfulOutcome = function () {
+  let attempts = this.getAttempts();
+  let lastOutcome = attempts[attempts.length - 1].outcome;
+  return OptimizationSite.isSuccessfulOutcome(lastOutcome);
+};
+
+/**
+ * Returns the last attempted OptimizationAttempt for this OptimizationSite.
+ *
+ * @return {Array<OptimizationAttempt>}
+ */
+
+OptimizationSite.prototype.getAttempts = function () {
+  return this.data.attempts;
+};
+
+/**
+ * Returns all IonTypes in this OptimizationSite.
+ *
+ * @return {Array<IonType>}
+ */
+
+OptimizationSite.prototype.getIonTypes = function () {
+  return this.data.types;
+};
+
+
+/**
+ * Constructor for JITOptimizations. A collection of OptimizationSites for a frame.
+ *
+ * @constructor
+ * @param {Array<RawOptimizationSite>} rawSites
+ *                                     Array of raw optimization sites.
+ * @param {Array<string>} stringTable
+ *                        Array of strings from the profiler used to inflate
+ *                        JIT optimizations. Do not modify this!
+ */
+
+const JITOptimizations = exports.JITOptimizations = function (rawSites, stringTable) {
+  // Build a histogram of optimization sites.
+  let sites = [];
+
+  for (let rawSite of rawSites) {
+    let existingSite = sites.find((site) => site.data === rawSite);
+    if (existingSite) {
+      existingSite.samples++;
+    } else {
+      sites.push(new OptimizationSite(sites.length, rawSite));
+    }
+  }
+
+  // Inflate the optimization information.
+  for (let site of sites) {
+    let data = site.data;
+    let STRATEGY_SLOT = data.attempts.schema.strategy;
+    let OUTCOME_SLOT = data.attempts.schema.outcome;
+
+    site.data = {
+      attempts: data.attempts.data.map((a) => {
+        return {
+          strategy: stringTable[a[STRATEGY_SLOT]],
+          outcome: stringTable[a[OUTCOME_SLOT]]
+        }
+      }),
+
+      types: data.types.map((t) => {
+        return {
+          typeset: maybeTypeset(t.typeset, stringTable),
+          site: stringTable[t.site],
+          mirType: stringTable[t.mirType]
+        };
+      }),
+
+      propertyName: maybeString(stringTable, data.propertyName),
+      line: data.line,
+      column: data.column
+    };
+  }
+
+  this.optimizationSites = sites.sort((a, b) => b.samples - a.samples);;
+};
+
+/**
+ * Takes an "outcome" string from an OptimizationAttempt and returns
+ * a boolean indicating whether or not its a successful outcome.
+ *
+ * @return {boolean}
+ */
+
+OptimizationSite.isSuccessfulOutcome = JITOptimizations.isSuccessfulOutcome = function (outcome) {
+  return !!~SUCCESSFUL_OUTCOMES.indexOf(outcome);
+};
+
+function maybeString(stringTable, index) {
+  return index ? stringTable[index] : undefined;
+}
+
+function maybeTypeset(typeset, stringTable) {
+  if (!typeset) {
+    return undefined;
+  }
+  return typeset.map((ty) => {
+    return {
+      keyedBy: maybeString(stringTable, ty.keyedBy),
+      name: maybeString(stringTable, ty.name),
+      location: maybeString(stringTable, ty.location),
+      line: ty.line
+    };
+  });
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/logic/marker-utils.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/logic/marker-utils.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/logic/marker-utils.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/logic/marker-utils.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,274 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+/**
+ * This file contains utilities for creating elements for markers to be displayed,
+ * and parsing out the blueprint to generate correct values for markers.
+ */
+
+loader.lazyRequireGetter(this, "L10N",
+  "devtools/performance/global", true);
+loader.lazyRequireGetter(this, "TIMELINE_BLUEPRINT",
+  "devtools/performance/global", true);
+loader.lazyRequireGetter(this, "WebConsoleUtils",
+  "devtools/toolkit/webconsole/utils");
+
+/**
+ * Returns the correct label to display for passed in marker, based
+ * off of the blueprints.
+ *
+ * @param {ProfileTimelineMarker} marker
+ * @return {string}
+ */
+function getMarkerLabel (marker) {
+  let blueprint = TIMELINE_BLUEPRINT[marker.name];
+  // Either use the label function in the blueprint, or use it directly
+  // as a string.
+  return typeof blueprint.label === "function" ? blueprint.label(marker) : blueprint.label;
+}
+exports.getMarkerLabel = getMarkerLabel;
+
+/**
+ * Returns the correct generic name for a marker class, like "Function Call"
+ * being the general class for JS markers, rather than "setTimeout", etc.
+ *
+ * @param {string} type
+ * @return {string}
+ */
+function getMarkerClassName (type) {
+  let blueprint = TIMELINE_BLUEPRINT[type];
+  // Either use the label function in the blueprint, or use it directly
+  // as a string.
+  let className = typeof blueprint.label === "function" ? blueprint.label() : blueprint.label;
+
+  // If no class name found, attempt to throw a descriptive error how the marker
+  // implementor can fix this.
+  if (!className) {
+    let message = `Could not find marker class name for "${type}".`;
+    if (typeof blueprint.label === "function") {
+      message += ` The following function must return a class name string when no marker passed: ${blueprint.label}`;
+    } else {
+      message += ` ${type}.label must be defined in the marker blueprint.`;
+    }
+    throw new Error(message);
+  }
+
+  return className;
+}
+exports.getMarkerClassName = getMarkerClassName;
+
+/**
+ * Returns an array of objects with key/value pairs of what should be rendered
+ * in the marker details view.
+ *
+ * @param {ProfileTimelineMarker} marker
+ * @return {Array<object>}
+ */
+function getMarkerFields (marker) {
+  let blueprint = TIMELINE_BLUEPRINT[marker.name];
+
+  // If blueprint.fields is a function, use that
+  if (typeof blueprint.fields === "function") {
+    let fields = blueprint.fields(marker);
+    // Add a ":" to the label since the localization files contain the ":"
+    // if not present. This should be changed, ugh.
+    return Object.keys(fields || []).map(label => {
+      // TODO revisit localization strings for markers bug 1163763
+      let normalizedLabel = label.indexOf(":") !== -1 ? label : (label + ":");
+      return { label: normalizedLabel, value: fields[label] };
+    });
+  }
+
+  // Otherwise, iterate over the array
+  return (blueprint.fields || []).reduce((fields, field) => {
+    // Ensure this marker has this field present
+    if (field.property in marker) {
+      let label = field.label;
+      let value = marker[field.property];
+      fields.push({ label, value });
+    }
+    return fields;
+  }, []);
+}
+exports.getMarkerFields = getMarkerFields;
+
+/**
+ * Utilites for creating elements for markers.
+ */
+const DOM = exports.DOM = {
+  /**
+   * Builds all the fields possible for the given marker. Returns an
+   * array of elements to be appended to a parent element.
+   *
+   * @param {Document} doc
+   * @param {ProfileTimelineMarker} marker
+   * @return {Array<Element>}
+   */
+  buildFields: function (doc, marker) {
+    let blueprint = TIMELINE_BLUEPRINT[marker.name];
+    let fields = getMarkerFields(marker);
+
+    return fields.map(({ label, value }) => DOM.buildNameValueLabel(doc, label, value));
+  },
+
+  /**
+   * Builds the label representing marker's type.
+   *
+   * @param {Document} doc
+   * @param {ProfileTimelineMarker}
+   * @return {Element}
+   */
+  buildTitle: function (doc, marker) {
+    let blueprint = TIMELINE_BLUEPRINT[marker.name];
+
+    let hbox = doc.createElement("hbox");
+    hbox.setAttribute("align", "center");
+
+    let bullet = doc.createElement("hbox");
+    bullet.className = `marker-details-bullet marker-color-${blueprint.colorName}`;
+
+    let title = getMarkerLabel(marker);
+    let label = doc.createElement("label");
+    label.className = "marker-details-type";
+    label.setAttribute("value", title);
+
+    hbox.appendChild(bullet);
+    hbox.appendChild(label);
+
+    return hbox;
+  },
+
+  /**
+   * Builds the duration element, like "Duration: 200ms".
+   *
+   * @param {Document} doc
+   * @param {ProfileTimelineMarker} marker
+   * @return {Element}
+   */
+  buildDuration: function (doc, marker) {
+    let label = L10N.getStr("timeline.markerDetail.duration");
+    let start = L10N.getFormatStrWithNumbers("timeline.tick", marker.start);
+    let end = L10N.getFormatStrWithNumbers("timeline.tick", marker.end);
+    let duration = L10N.getFormatStrWithNumbers("timeline.tick", marker.end - marker.start);
+    let el = DOM.buildNameValueLabel(doc, label, duration);
+    el.classList.add("marker-details-duration");
+    el.setAttribute("tooltiptext", `${start} → ${end}`);
+    return el;
+  },
+
+  /**
+   * Builds labels for name:value pairs. Like "Start: 100ms",
+   * "Duration: 200ms", ...
+   *
+   * @param {Document} doc
+   * @param string field
+   *        String identifier for label's name.
+   * @param string value
+   *        Label's value.
+   * @return {Element}
+   */
+  buildNameValueLabel: function (doc, field, value) {
+    let hbox = doc.createElement("hbox");
+    let labelName = doc.createElement("label");
+    let labelValue = doc.createElement("label");
+    labelName.className = "plain marker-details-labelname";
+    labelValue.className = "plain marker-details-labelvalue";
+    labelName.setAttribute("value", field);
+    labelValue.setAttribute("value", value);
+    hbox.appendChild(labelName);
+    hbox.appendChild(labelValue);
+    return hbox;
+  },
+
+  /**
+   * Builds a stack trace in an element.
+   *
+   * @param {Document} doc
+   * @param object params
+   *        An options object with the following members:
+   *        string type - String identifier for type of stack ("stack", "startStack" or "endStack")
+   *        number frameIndex - The index of the topmost stack frame.
+   *        array frames - Array of stack frames.
+   */
+  buildStackTrace: function(doc, { type, frameIndex, frames }) {
+    let container = doc.createElement("vbox");
+    let labelName = doc.createElement("label");
+    labelName.className = "plain marker-details-labelname";
+    labelName.setAttribute("value", L10N.getStr(`timeline.markerDetail.${type}`));
+    container.appendChild(labelName);
+
+    let wasAsyncParent = false;
+    while (frameIndex > 0) {
+      let frame = frames[frameIndex];
+      let url = frame.source;
+      let displayName = frame.functionDisplayName;
+      let line = frame.line;
+
+      // If the previous frame had an async parent, then the async
+      // cause is in this frame and should be displayed.
+      if (wasAsyncParent) {
+        let asyncBox = doc.createElement("hbox");
+        let asyncLabel = doc.createElement("label");
+        asyncLabel.className = "devtools-monospace";
+        asyncLabel.setAttribute("value", L10N.getFormatStr("timeline.markerDetail.asyncStack",
+                                                           frame.asyncCause));
+        asyncBox.appendChild(asyncLabel);
+        container.appendChild(asyncBox);
+        wasAsyncParent = false;
+      }
+
+      let hbox = doc.createElement("hbox");
+
+      if (displayName) {
+        let functionLabel = doc.createElement("label");
+        functionLabel.className = "devtools-monospace";
+        functionLabel.setAttribute("value", displayName);
+        hbox.appendChild(functionLabel);
+      }
+
+      if (url) {
+        let aNode = doc.createElement("a");
+        aNode.className = "waterfall-marker-location devtools-source-link";
+        aNode.href = url;
+        aNode.draggable = false;
+        aNode.setAttribute("title", url);
+
+        let urlNode = doc.createElement("label");
+        urlNode.className = "filename";
+        urlNode.setAttribute("value", WebConsoleUtils.Utils.abbreviateSourceURL(url));
+        let lineNode = doc.createElement("label");
+        lineNode.className = "line-number";
+        lineNode.setAttribute("value", `:${line}`);
+
+        aNode.appendChild(urlNode);
+        aNode.appendChild(lineNode);
+        hbox.appendChild(aNode);
+
+        // Clicking here will bubble up to the parent,
+        // which handles the view source.
+        aNode.setAttribute("data-action", JSON.stringify({
+          url, line, action: "view-source"
+        }));
+      }
+
+      if (!displayName && !url) {
+        let label = doc.createElement("label");
+        label.setAttribute("value", L10N.getStr("timeline.markerDetail.unknownFrame"));
+        hbox.appendChild(label);
+      }
+
+      container.appendChild(hbox);
+
+      if (frame.asyncParent) {
+        frameIndex = frame.asyncParent;
+        wasAsyncParent = true;
+      } else {
+        frameIndex = frame.parent;
+      }
+    }
+
+    return container;
+  }
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/logic/recording-model.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/logic/recording-model.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/logic/recording-model.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/logic/recording-model.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,405 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+const { Cc, Ci, Cu, Cr } = require("chrome");
+const { Task } = require("resource://gre/modules/Task.jsm");
+
+loader.lazyRequireGetter(this, "PerformanceIO",
+  "devtools/performance/io", true);
+loader.lazyRequireGetter(this, "RecordingUtils",
+  "devtools/performance/recording-utils", true);
+
+/**
+ * Model for a wholistic profile, containing the duration, profiling data,
+ * frames data, timeline (marker, tick, memory) data, and methods to mark
+ * a recording as 'in progress' or 'finished'.
+ */
+const RecordingModel = function (options={}) {
+  this._label = options.label || "";
+  this._console = options.console || false;
+
+  this._configuration = {
+    withMarkers: options.withMarkers || false,
+    withTicks: options.withTicks || false,
+    withMemory: options.withMemory || false,
+    withAllocations: options.withAllocations || false,
+    allocationsSampleProbability: options.allocationsSampleProbability || 0,
+    allocationsMaxLogLength: options.allocationsMaxLogLength || 0,
+    bufferSize: options.bufferSize || 0,
+    sampleFrequency: options.sampleFrequency || 1
+  };
+};
+
+RecordingModel.prototype = {
+  // Private fields, only needed when a recording is started or stopped.
+  _console: false,
+  _imported: false,
+  _recording: false,
+  _completed: false,
+  _profilerStartTime: 0,
+  _timelineStartTime: 0,
+  _memoryStartTime: 0,
+  _configuration: {},
+  _originalBufferStatus: null,
+  _bufferPercent: null,
+
+  // Serializable fields, necessary and sufficient for import and export.
+  _label: "",
+  _duration: 0,
+  _markers: null,
+  _frames: null,
+  _memory: null,
+  _ticks: null,
+  _allocations: null,
+  _profile: null,
+
+  /**
+   * Loads a recording from a file.
+   *
+   * @param nsILocalFile file
+   *        The file to import the data form.
+   */
+  importRecording: Task.async(function *(file) {
+    let recordingData = yield PerformanceIO.loadRecordingFromFile(file);
+
+    this._imported = true;
+    this._label = recordingData.label || "";
+    this._duration = recordingData.duration;
+    this._markers = recordingData.markers;
+    this._frames = recordingData.frames;
+    this._memory = recordingData.memory;
+    this._ticks = recordingData.ticks;
+    this._allocations = recordingData.allocations;
+    this._profile = recordingData.profile;
+    this._configuration = recordingData.configuration || {};
+  }),
+
+  /**
+   * Saves the current recording to a file.
+   *
+   * @param nsILocalFile file
+   *        The file to stream the data into.
+   */
+  exportRecording: Task.async(function *(file) {
+    let recordingData = this.getAllData();
+    yield PerformanceIO.saveRecordingToFile(recordingData, file);
+  }),
+
+  /**
+   * Sets up the instance with data from the SharedPerformanceConnection when
+   * starting a recording. Should only be called by SharedPerformanceConnection.
+   */
+  _populate: function (info) {
+    // Times must come from the actor in order to be self-consistent.
+    // However, we also want to update the view with the elapsed time
+    // even when the actor is not generating data. To do this we get
+    // the local time and use it to compute a reasonable elapsed time.
+    this._localStartTime = Date.now();
+
+    this._profilerStartTime = info.profilerStartTime;
+    this._timelineStartTime = info.timelineStartTime;
+    this._memoryStartTime = info.memoryStartTime;
+    this._originalBufferStatus = {
+      position: info.position,
+      totalSize: info.totalSize,
+      generation: info.generation
+    };
+    // initialize the _bufferPercent if the server supports it.
+    this._bufferPercent = info.position !== void 0 ? 0 : null;
+
+    this._recording = true;
+
+    this._markers = [];
+    this._frames = [];
+    this._memory = [];
+    this._ticks = [];
+    this._allocations = { sites: [], timestamps: [], frames: [], counts: [] };
+  },
+
+  /**
+   * Called when the signal was sent to the front to no longer record more
+   * data, and begin fetching the data. There's some delay during fetching,
+   * even though the recording is stopped, the model is not yet completed until
+   * all the data is fetched.
+   */
+  _onStoppingRecording: function (endTime) {
+    this._duration = endTime - this._localStartTime;
+    this._recording = false;
+  },
+
+  /**
+   * Sets results available from stopping a recording from SharedPerformanceConnection.
+   * Should only be called by SharedPerformanceConnection.
+   */
+  _onStopRecording: Task.async(function *(info) {
+    this._profile = info.profile;
+    this._completed = true;
+
+    // We filter out all samples that fall out of current profile's range
+    // since the profiler is continuously running. Because of this, sample
+    // times are not guaranteed to have a zero epoch, so offset the
+    // timestamps.
+    // TODO move this into FakeProfilerFront in ./actors.js after bug 1154115
+    RecordingUtils.offsetSampleTimes(this._profile, this._profilerStartTime);
+
+    // Markers need to be sorted ascending by time, to be properly displayed
+    // in a waterfall view.
+    this._markers = this._markers.sort((a, b) => (a.start > b.start));
+  }),
+
+  /**
+   * Gets the profile's start time.
+   * @return number
+   */
+  getProfilerStartTime: function () {
+    return this._profilerStartTime;
+  },
+
+  /**
+   * Gets the profile's label, from `console.profile(LABEL)`.
+   * @return string
+   */
+  getLabel: function () {
+    return this._label;
+  },
+
+  /**
+   * Gets duration of this recording, in milliseconds.
+   * @return number
+   */
+  getDuration: function () {
+    // Compute an approximate ending time for the current recording if it is
+    // still in progress. This is needed to ensure that the view updates even
+    // when new data is not being generated.
+    if (this._recording) {
+      return Date.now() - this._localStartTime;
+    } else {
+      return this._duration;
+    }
+  },
+
+  /**
+   * Returns configuration object of specifying whether the recording
+   * was started withTicks, withMemory and withAllocations.
+   * @return object
+   */
+  getConfiguration: function () {
+    return this._configuration;
+  },
+
+  /**
+   * Gets the accumulated markers in the current recording.
+   * @return array
+   */
+  getMarkers: function() {
+    return this._markers;
+  },
+
+  /**
+   * Gets the accumulated stack frames in the current recording.
+   * @return array
+   */
+  getFrames: function() {
+    return this._frames;
+  },
+
+  /**
+   * Gets the accumulated memory measurements in this recording.
+   * @return array
+   */
+  getMemory: function() {
+    return this._memory;
+  },
+
+  /**
+   * Gets the accumulated refresh driver ticks in this recording.
+   * @return array
+   */
+  getTicks: function() {
+    return this._ticks;
+  },
+
+  /**
+   * Gets the memory allocations data in this recording.
+   * @return array
+   */
+  getAllocations: function() {
+    return this._allocations;
+  },
+
+  /**
+   * Gets the profiler data in this recording.
+   * @return array
+   */
+  getProfile: function() {
+    return this._profile;
+  },
+
+  /**
+   * Gets all the data in this recording.
+   */
+  getAllData: function() {
+    let label = this.getLabel();
+    let duration = this.getDuration();
+    let markers = this.getMarkers();
+    let frames = this.getFrames();
+    let memory = this.getMemory();
+    let ticks = this.getTicks();
+    let allocations = this.getAllocations();
+    let profile = this.getProfile();
+    let configuration = this.getConfiguration();
+    return { label, duration, markers, frames, memory, ticks, allocations, profile, configuration };
+  },
+
+  /**
+   * Returns a boolean indicating whether or not this recording model
+   * was imported via file.
+   */
+  isImported: function () {
+    return this._imported;
+  },
+
+  /**
+   * Returns a boolean indicating whether or not this recording model
+   * was started via a `console.profile` call.
+   */
+  isConsole: function () {
+    return this._console;
+  },
+
+  /**
+   * Returns a boolean indicating whether or not this recording model
+   * has finished recording.
+   * There is some delay in fetching data between when the recording stops, and
+   * when the recording is considered completed once it has all the profiler and timeline data.
+   */
+  isCompleted: function () {
+    return this._completed || this.isImported();
+  },
+
+  /**
+   * Returns a boolean indicating whether or not this recording model
+   * is recording.
+   * A model may no longer be recording, yet still not have the profiler data. In that
+   * case, use `isCompleted()`.
+   */
+  isRecording: function () {
+    return this._recording;
+  },
+
+  /**
+   * Returns the percent (value between 0 and 1) of buffer used in this
+   * recording. Returns `null` for recordings that are no longer recording.
+   */
+  getBufferUsage: function () {
+    return this.isRecording() ? this._bufferPercent : null;
+  },
+
+  /**
+   * Fired whenever the PerformanceFront has new buffer data.
+   */
+  _addBufferStatusData: function (bufferStatus) {
+    // If this model isn't currently recording, or if the server does not
+    // support buffer status (or if this fires after actors are being destroyed),
+    // ignore this information.
+    if (!bufferStatus || !this.isRecording()) {
+      return;
+    }
+    let { position: currentPosition, totalSize, generation: currentGeneration } = bufferStatus;
+    let { position: origPosition, generation: origGeneration } = this._originalBufferStatus;
+
+    let normalizedCurrent = (totalSize * (currentGeneration - origGeneration)) + currentPosition;
+    let percent = (normalizedCurrent - origPosition) / totalSize;
+    this._bufferPercent = percent > 1 ? 1 : percent;
+  },
+
+  /**
+   * Fired whenever the PerformanceFront emits markers, memory or ticks.
+   */
+  _addTimelineData: function (eventName, ...data) {
+    // If this model isn't currently recording,
+    // ignore the timeline data.
+    if (!this.isRecording()) {
+      return;
+    }
+
+    let config = this.getConfiguration();
+
+    switch (eventName) {
+      // Accumulate timeline markers into an array. Furthermore, the timestamps
+      // do not have a zero epoch, so offset all of them by the start time.
+      case "markers": {
+        if (!config.withMarkers) { break; }
+        let [markers] = data;
+        RecordingUtils.offsetMarkerTimes(markers, this._timelineStartTime);
+        pushAll(this._markers, markers);
+        break;
+      }
+      // Accumulate stack frames into an array.
+      case "frames": {
+        if (!config.withMarkers) { break; }
+        let [, frames] = data;
+        pushAll(this._frames, frames);
+        break;
+      }
+      // Accumulate memory measurements into an array. Furthermore, the timestamp
+      // does not have a zero epoch, so offset it by the actor's start time.
+      case "memory": {
+        if (!config.withMemory) { break; }
+        let [currentTime, measurement] = data;
+        this._memory.push({
+          delta: currentTime - this._timelineStartTime,
+          value: measurement.total / 1024 / 1024
+        });
+        break;
+      }
+      // Save the accumulated refresh driver ticks.
+      case "ticks": {
+        if (!config.withTicks) { break; }
+        let [, timestamps] = data;
+        this._ticks = timestamps;
+        break;
+      }
+      // Accumulate allocation sites into an array. Furthermore, the timestamps
+      // do not have a zero epoch, and are microseconds instead of milliseconds,
+      // so offset all of them by the start time, also converting from µs to ms.
+      case "allocations": {
+        if (!config.withAllocations) { break; }
+        let [{ sites, timestamps, frames, counts }] = data;
+        let timeOffset = this._memoryStartTime * 1000;
+        let timeScale = 1000;
+        RecordingUtils.offsetAndScaleTimestamps(timestamps, timeOffset, timeScale);
+        pushAll(this._allocations.sites, sites);
+        pushAll(this._allocations.timestamps, timestamps);
+        pushAll(this._allocations.frames, frames);
+        pushAll(this._allocations.counts, counts);
+        break;
+      }
+    }
+  },
+
+  toString: () => "[object RecordingModel]"
+};
+
+/**
+ * Push all elements of src array into dest array. Marker data will come in small chunks
+ * and add up over time, whereas allocation arrays can be > 500000 elements (and
+ * Function.prototype.apply throws if applying more than 500000 elements, which
+ * is what spawned this separate function), so iterate one element at a time.
+ * @see bug 1166823
+ * @see http://jsperf.com/concat-large-arrays
+ * @see http://jsperf.com/concat-large-arrays/2
+ *
+ * @param {Array} dest
+ * @param {Array} src
+ */
+function pushAll (dest, src) {
+  let length = src.length;
+  for (let i = 0; i < length; i++) {
+    dest.push(src[i]);
+  }
+}
+
+exports.RecordingModel = RecordingModel;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/logic/recording-utils.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/logic/recording-utils.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/logic/recording-utils.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/logic/recording-utils.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,574 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+const { Cc, Ci, Cu, Cr } = require("chrome");
+
+/**
+ * Utility functions for managing recording models and their internal data,
+ * such as filtering profile samples or offsetting timestamps.
+ */
+
+exports.RecordingUtils = {};
+
+/**
+ * Filters all the samples in the provided profiler data to be more recent
+ * than the specified start time.
+ *
+ * @param object profile
+ *        The profiler data received from the backend.
+ * @param number profilerStartTime
+ *        The earliest acceptable sample time (in milliseconds).
+ */
+exports.RecordingUtils.filterSamples = function(profile, profilerStartTime) {
+  let firstThread = profile.threads[0];
+  const TIME_SLOT = firstThread.samples.schema.time;
+  firstThread.samples.data = firstThread.samples.data.filter(e => {
+    return e[TIME_SLOT] >= profilerStartTime;
+  });
+}
+
+/**
+ * Offsets all the samples in the provided profiler data by the specified time.
+ *
+ * @param object profile
+ *        The profiler data received from the backend.
+ * @param number timeOffset
+ *        The amount of time to offset by (in milliseconds).
+ */
+exports.RecordingUtils.offsetSampleTimes = function(profile, timeOffset) {
+  let firstThread = profile.threads[0];
+  const TIME_SLOT = firstThread.samples.schema.time;
+  let samplesData = firstThread.samples.data;
+  for (let i = 0; i < samplesData.length; i++) {
+    samplesData[i][TIME_SLOT] -= timeOffset;
+  }
+}
+
+/**
+ * Offsets all the markers in the provided timeline data by the specified time.
+ *
+ * @param array markers
+ *        The markers array received from the backend.
+ * @param number timeOffset
+ *        The amount of time to offset by (in milliseconds).
+ */
+exports.RecordingUtils.offsetMarkerTimes = function(markers, timeOffset) {
+  for (let marker of markers) {
+    marker.start -= timeOffset;
+    marker.end -= timeOffset;
+  }
+}
+
+/**
+ * Offsets and scales all the timestamps in the provided array by the
+ * specified time and scale factor.
+ *
+ * @param array array
+ *        A list of timestamps received from the backend.
+ * @param number timeOffset
+ *        The amount of time to offset by (in milliseconds).
+ * @param number timeScale
+ *        The factor to scale by, after offsetting.
+ */
+exports.RecordingUtils.offsetAndScaleTimestamps = function(timestamps, timeOffset, timeScale) {
+  for (let i = 0, len = timestamps.length; i < len; i++) {
+    timestamps[i] -= timeOffset;
+    timestamps[i] /= timeScale;
+  }
+}
+
+/**
+ * Cache used in `RecordingUtils.getProfileThreadFromAllocations`.
+ */
+let gProfileThreadFromAllocationCache = new WeakMap();
+
+/**
+ * Converts allocation data from the memory actor to something that follows
+ * the same structure as the samples data received from the profiler.
+ *
+ * @see MemoryActor.prototype.getAllocations for more information.
+ *
+ * @param object allocations
+ *        A list of { sites, timestamps, frames, counts } arrays.
+ * @return object
+ *         The "profile" describing the allocations log.
+ */
+exports.RecordingUtils.getProfileThreadFromAllocations = function(allocations) {
+  let cached = gProfileThreadFromAllocationCache.get(allocations);
+  if (cached) {
+    return cached;
+  }
+
+  let { sites, timestamps, frames, counts } = allocations;
+  let uniqueStrings = new UniqueStrings();
+
+  // Convert allocation frames to the the stack and frame tables expected by
+  // the profiler format.
+  //
+  // Since the allocations log is already presented as a tree, we would be
+  // wasting time if we jumped through the same hoops as deflateProfile below
+  // and instead use the existing structure of the allocations log to build up
+  // the profile JSON.
+  //
+  // The allocations.frames array corresponds roughly to the profile stack
+  // table: a trie of all stacks. We could work harder to further deduplicate
+  // each individual frame as the profiler does, but it is not necessary for
+  // correctness.
+  let stackTable = new Array(frames.length);
+  let frameTable = new Array(frames.length);
+
+  // Array used to concat the location.
+  let locationConcatArray = new Array(5);
+
+  for (let i = 0; i < frames.length; i++) {
+    let frame = frames[i];
+    if (!frame) {
+      stackTable[i] = frameTable[i] = null;
+      continue;
+    }
+
+    let prefix = frame.parent;
+
+    // Schema:
+    //   [prefix, frame]
+    stackTable[i] = [frames[prefix] ? prefix : null, i];
+
+    // Schema:
+    //   [location]
+    //
+    // The only field a frame will have in an allocations profile is location.
+    //
+    // If frame.functionDisplayName is present, the format is
+    //   "functionDisplayName (source:line:column)"
+    // Otherwise, it is
+    //   "source:line:column"
+    //
+    // A static array is used to join to save memory on intermediate strings.
+    locationConcatArray[0] = frame.source;
+    locationConcatArray[1] = ":";
+    locationConcatArray[2] = String(frame.line);
+    locationConcatArray[3] = ":";
+    locationConcatArray[4] = String(frame.column);
+    locationConcatArray[5] = "";
+
+    let location = locationConcatArray.join("");
+    let funcName = frame.functionDisplayName;
+
+    if (funcName) {
+      locationConcatArray[0] = funcName;
+      locationConcatArray[1] = " (";
+      locationConcatArray[2] = location;
+      locationConcatArray[3] = ")";
+      locationConcatArray[4] = "";
+      locationConcatArray[5] = "";
+      location = locationConcatArray.join("");
+    }
+
+    frameTable[i] = [uniqueStrings.getOrAddStringIndex(location)];
+  }
+
+  let samples = new Array(sites.length);
+  let writePos = 0;
+  for (let i = 0; i < sites.length; i++) {
+    // Schema:
+    //   [stack, time]
+    //
+    // Originally, sites[i] indexes into the frames array. Note that in the
+    // loop above, stackTable[sites[i]] and frames[sites[i]] index the same
+    // information.
+    let stackIndex = sites[i];
+    if (frames[stackIndex]) {
+      samples[writePos++] = [stackIndex, timestamps[i]];
+    }
+  }
+  samples.length = writePos;
+
+  let thread = {
+    name: "allocations",
+    samples: samplesWithSchema(samples),
+    stackTable: stackTableWithSchema(stackTable),
+    frameTable: frameTableWithSchema(frameTable),
+    stringTable: uniqueStrings.stringTable,
+    allocationsTable: counts
+  };
+
+  gProfileThreadFromAllocationCache.set(allocations, thread);
+  return thread;
+}
+
+/**
+ * Gets the current timeline blueprint without the hidden markers.
+ *
+ * @param blueprint
+ *        The default timeline blueprint.
+ * @param array hiddenMarkers
+ *        A list of hidden markers' names.
+ * @return object
+ *         The filtered timeline blueprint.
+ */
+exports.RecordingUtils.getFilteredBlueprint = function({ blueprint, hiddenMarkers }) {
+  // Clone functions here just to prevent an error, as the blueprint
+  // contains functions (even though we do not use them).
+  let filteredBlueprint = Cu.cloneInto(blueprint, {}, { cloneFunctions: true });
+  let maybeRemovedGroups = new Set();
+  let removedGroups = new Set();
+
+  // 1. Remove hidden markers from the blueprint.
+
+  for (let hiddenMarkerName of hiddenMarkers) {
+    maybeRemovedGroups.add(filteredBlueprint[hiddenMarkerName].group);
+    delete filteredBlueprint[hiddenMarkerName];
+  }
+
+  // 2. Get a list of all the groups that will be removed.
+
+  for (let maybeRemovedGroup of maybeRemovedGroups) {
+    let markerNames = Object.keys(filteredBlueprint);
+    let isGroupRemoved = markerNames.every(e => filteredBlueprint[e].group != maybeRemovedGroup);
+    if (isGroupRemoved) {
+      removedGroups.add(maybeRemovedGroup);
+    }
+  }
+
+  // 3. Offset groups so that their indices are consecutive.
+
+  for (let removedGroup of removedGroups) {
+    let markerNames = Object.keys(filteredBlueprint);
+    for (let markerName of markerNames) {
+      let markerDetails = filteredBlueprint[markerName];
+      if (markerDetails.group > removedGroup) {
+        markerDetails.group--;
+      }
+    }
+  }
+
+  return filteredBlueprint;
+};
+
+/**
+ * Deduplicates a profile by deduplicating stacks, frames, and strings.
+ *
+ * This is used to adapt version 2 profiles from the backend to version 3, for
+ * use with older Geckos (like B2G).
+ *
+ * Note that the schemas used by this must be kept in sync with schemas used
+ * by the C++ UniqueStacks class in tools/profiler/ProfileEntry.cpp.
+ *
+ * @param object profile
+ *               A profile with version 2.
+ */
+exports.RecordingUtils.deflateProfile = function deflateProfile(profile) {
+  profile.threads = profile.threads.map((thread) => {
+    let uniqueStacks = new UniqueStacks();
+    return deflateThread(thread, uniqueStacks);
+  });
+
+  profile.meta.version = 3;
+  return profile;
+};
+
+/**
+ * Given an array of frame objects, deduplicates each frame as well as all
+ * prefixes in the stack. Returns the index of the deduplicated stack.
+ *
+ * @param object frames
+ *               Array of frame objects.
+ * @param UniqueStacks uniqueStacks
+ * @return number index
+ */
+function deflateStack(frames, uniqueStacks) {
+  // Deduplicate every prefix in the stack by keeping track of the current
+  // prefix hash.
+  let prefixIndex = null;
+  for (let i = 0; i < frames.length; i++) {
+    let frameIndex = uniqueStacks.getOrAddFrameIndex(frames[i]);
+    prefixIndex = uniqueStacks.getOrAddStackIndex(prefixIndex, frameIndex);
+  }
+  return prefixIndex;
+}
+
+/**
+ * Given an array of sample objects, deduplicate each sample's stack and
+ * convert the samples to a table with a schema. Returns the deflated samples.
+ *
+ * @param object samples
+ *               Array of samples
+ * @param UniqueStacks uniqueStacks
+ * @return object
+ */
+function deflateSamples(samples, uniqueStacks) {
+  // Schema:
+  //   [stack, time, responsiveness, rss, uss, frameNumber, power]
+
+  let deflatedSamples = new Array(samples.length);
+  for (let i = 0; i < samples.length; i++) {
+    let sample = samples[i];
+    deflatedSamples[i] = [
+      deflateStack(sample.frames, uniqueStacks),
+      sample.time,
+      sample.responsiveness,
+      sample.rss,
+      sample.uss,
+      sample.frameNumber,
+      sample.power
+    ];
+  }
+
+  return samplesWithSchema(deflatedSamples);
+}
+
+/**
+ * Given an array of marker objects, convert the markers to a table with a
+ * schema. Returns the deflated markers.
+ *
+ * If a marker contains a backtrace as its payload, the backtrace stack is
+ * deduplicated in the context of the profile it's in.
+ *
+ * @param object markers
+ *               Array of markers
+ * @param UniqueStacks uniqueStacks
+ * @return object
+ */
+function deflateMarkers(markers, uniqueStacks) {
+  // Schema:
+  //   [name, time, data]
+
+  let deflatedMarkers = new Array(markers.length);
+  for (let i = 0; i < markers.length; i++) {
+    let marker = markers[i];
+    if (marker.data && marker.data.type === "tracing" && marker.data.stack) {
+      marker.data.stack = deflateThread(marker.data.stack, uniqueStacks);
+    }
+
+    deflatedMarkers[i] = [
+      uniqueStacks.getOrAddStringIndex(marker.name),
+      marker.time,
+      marker.data
+    ];
+  }
+
+  let slot = 0;
+  return {
+    schema: {
+      name: slot++,
+      time: slot++,
+      data: slot++
+    },
+    data: deflatedMarkers
+  };
+}
+
+/**
+ * Deflate a thread.
+ *
+ * @param object thread
+ *               The profile thread.
+ * @param UniqueStacks uniqueStacks
+ * @return object
+ */
+function deflateThread(thread, uniqueStacks) {
+  return {
+    name: thread.name,
+    tid: thread.tid,
+    samples: deflateSamples(thread.samples, uniqueStacks),
+    markers: deflateMarkers(thread.markers, uniqueStacks),
+    stackTable: uniqueStacks.getStackTableWithSchema(),
+    frameTable: uniqueStacks.getFrameTableWithSchema(),
+    stringTable: uniqueStacks.getStringTable()
+  };
+}
+exports.RecordingUtils.deflateThread = deflateThread;
+
+function stackTableWithSchema(data) {
+  let slot = 0;
+  return {
+    schema: {
+      prefix: slot++,
+      frame: slot++
+    },
+    data: data
+  };
+}
+
+function frameTableWithSchema(data) {
+  let slot = 0;
+  return {
+    schema: {
+      location: slot++,
+      implementation: slot++,
+      optimizations: slot++,
+      line: slot++,
+      category: slot++
+    },
+    data: data
+  };
+}
+
+function samplesWithSchema(data) {
+  let slot = 0;
+  return {
+    schema: {
+      stack: slot++,
+      time: slot++,
+      responsiveness: slot++,
+      rss: slot++,
+      uss: slot++,
+      frameNumber: slot++,
+      power: slot++
+    },
+    data: data
+  };
+}
+
+/**
+ * A helper class to deduplicate strings.
+ */
+function UniqueStrings() {
+  this.stringTable = [];
+  this._stringHash = Object.create(null);
+}
+
+UniqueStrings.prototype.getOrAddStringIndex = function(s) {
+  if (!s) {
+    return null;
+  }
+
+  let stringHash = this._stringHash;
+  let stringTable = this.stringTable;
+  let index = stringHash[s];
+  if (index !== undefined) {
+    return index;
+  }
+
+  index = stringTable.length;
+  stringHash[s] = index;
+  stringTable.push(s);
+  return index;
+};
+
+exports.RecordingUtils.UniqueStrings = UniqueStrings;
+
+/**
+ * A helper class to deduplicate old-version profiles.
+ *
+ * The main functionality provided is deduplicating frames and stacks.
+ *
+ * For example, given 2 stacks
+ *   [A, B, C]
+ * and
+ *   [A, B, D]
+ *
+ * There are 4 unique frames: A, B, C, and D.
+ * There are 4 unique prefixes: [A], [A, B], [A, B, C], [A, B, D]
+ *
+ * For the example, the output of using UniqueStacks is:
+ *
+ * Frame table:
+ *   [A, B, C, D]
+ *
+ * That is, A has id 0, B has id 1, etc.
+ *
+ * Since stack prefixes are themselves deduplicated (shared), stacks are
+ * represented as a tree, or more concretely, a pair of ids, the prefix and
+ * the leaf.
+ *
+ * Stack table:
+ *   [
+ *     [null, 0],
+ *     [0,    1],
+ *     [1,    2],
+ *     [1,    3]
+ *   ]
+ *
+ * That is, [A] has id 0 and value [null, 0]. This means it has no prefix, and
+ * has the leaf frame 0, which resolves to A in the frame table.
+ *
+ * [A, B] has id 1 and value [0, 1]. This means it has prefix 0, which is [A],
+ * and leaf 1, thus [A, B].
+ *
+ * [A, B, C] has id 2 and value [1, 2]. This means it has prefix 1, which in
+ * turn is [A, B], and leaf 2, thus [A, B, C].
+ *
+ * [A, B, D] has id 3 and value [1, 3]. Note how it shares the prefix 1 with
+ * [A, B, C].
+ */
+function UniqueStacks() {
+  this._frameTable = [];
+  this._stackTable = [];
+  this._frameHash = Object.create(null);
+  this._stackHash = Object.create(null);
+  this._uniqueStrings = new UniqueStrings();
+}
+
+UniqueStacks.prototype.getStackTableWithSchema = function() {
+  return stackTableWithSchema(this._stackTable);
+};
+
+UniqueStacks.prototype.getFrameTableWithSchema = function() {
+  return frameTableWithSchema(this._frameTable);
+};
+
+UniqueStacks.prototype.getStringTable = function() {
+  return this._uniqueStrings.stringTable;
+};
+
+UniqueStacks.prototype.getOrAddFrameIndex = function(frame) {
+  // Schema:
+  //   [location, implementation, optimizations, line, category]
+
+  let frameHash = this._frameHash;
+  let frameTable = this._frameTable;
+
+  let locationIndex = this.getOrAddStringIndex(frame.location);
+  let implementationIndex = this.getOrAddStringIndex(frame.implementation);
+
+  // Super dumb.
+  let hash = `${locationIndex} ${implementationIndex || ""} ${frame.line || ""} ${frame.category || ""}`;
+
+  let index = frameHash[hash];
+  if (index !== undefined) {
+    return index;
+  }
+
+  index = frameTable.length;
+  frameHash[hash] = index;
+  frameTable.push([
+    this.getOrAddStringIndex(frame.location),
+    this.getOrAddStringIndex(frame.implementation),
+    // Don't bother with JIT optimization info for deflating old profile data
+    // format to the new format.
+    null,
+    frame.line,
+    frame.category
+  ]);
+  return index;
+};
+
+UniqueStacks.prototype.getOrAddStackIndex = function(prefixIndex, frameIndex) {
+  // Schema:
+  //   [prefix, frame]
+
+  let stackHash = this._stackHash;
+  let stackTable = this._stackTable;
+
+  // Also super dumb.
+  let hash = prefixIndex + " " + frameIndex;
+
+  let index = stackHash[hash];
+  if (index !== undefined) {
+    return index;
+  }
+
+  index = stackTable.length;
+  stackHash[hash] = index;
+  stackTable.push([prefixIndex, frameIndex]);
+  return index;
+};
+
+UniqueStacks.prototype.getOrAddStringIndex = function(s) {
+  return this._uniqueStrings.getOrAddStringIndex(s);
+};
+
+exports.RecordingUtils.UniqueStacks = UniqueStacks;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/logic/tree-model.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/logic/tree-model.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/logic/tree-model.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/logic/tree-model.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,504 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+const { Cc, Ci, Cu, Cr } = require("chrome");
+
+loader.lazyRequireGetter(this, "L10N",
+  "devtools/performance/global", true);
+loader.lazyRequireGetter(this, "CATEGORY_MAPPINGS",
+  "devtools/performance/global", true);
+loader.lazyRequireGetter(this, "CATEGORIES",
+  "devtools/performance/global", true);
+loader.lazyRequireGetter(this, "CATEGORY_JIT",
+  "devtools/performance/global", true);
+loader.lazyRequireGetter(this, "CATEGORY_OTHER",
+  "devtools/performance/global", true);
+loader.lazyRequireGetter(this, "JITOptimizations",
+  "devtools/performance/jit", true);
+loader.lazyRequireGetter(this, "FrameUtils",
+  "devtools/performance/frame-utils");
+
+exports.ThreadNode = ThreadNode;
+exports.FrameNode = FrameNode;
+exports.FrameNode.isContent = FrameUtils.isContent;
+
+/**
+ * A call tree for a thread. This is essentially a linkage between all frames
+ * of all samples into a single tree structure, with additional information
+ * on each node, like the time spent (in milliseconds) and samples count.
+ *
+ * @param object thread
+ *        The raw thread object received from the backend. Contains samples,
+ *        stackTable, frameTable, and stringTable.
+ * @param object options
+ *        Additional supported options, @see ThreadNode.prototype.insert
+ *          - number startTime [optional]
+ *          - number endTime [optional]
+ *          - boolean contentOnly [optional]
+ *          - boolean invertTree [optional]
+ *          - boolean flattenRecursion [optional]
+ */
+function ThreadNode(thread, options = {}) {
+  this.samples = 0;
+  this.duration = 0;
+  this.calls = [];
+
+  // Maps of frame to their self counts and duration.
+  this.selfCount = Object.create(null);
+  this.selfDuration = Object.create(null);
+
+  let { samples, stackTable, frameTable, stringTable, allocationsTable } = thread;
+
+  // Nothing to do if there are no samples.
+  if (samples.data.length === 0) {
+    return;
+  }
+
+  this._buildInverted(samples, stackTable, frameTable, stringTable, allocationsTable, options);
+  if (!options.invertTree) {
+    this._uninvert();
+  }
+}
+
+ThreadNode.prototype = {
+  /**
+   * Build an inverted call tree from profile samples. The format of the
+   * samples is described in tools/profiler/ProfileEntry.h, under the heading
+   * "ThreadProfile JSON Format".
+   *
+   * The profile data is naturally presented inverted. Inverting the call tree
+   * is also the default in the Performance tool.
+   *
+   * @param object samples
+   *        The raw samples array received from the backend.
+   * @param object stackTable
+   *        The table of deduplicated stacks from the backend.
+   * @param object frameTable
+   *        The table of deduplicated frames from the backend.
+   * @param object stringTable
+   *        The table of deduplicated strings from the backend.
+   * @param object allocationsTable
+   *        The table of allocation counts from the backend. Indexed by frame
+   *        index.
+   * @param object options
+   *        Additional supported options
+   *          - number startTime [optional]
+   *          - number endTime [optional]
+   *          - boolean contentOnly [optional]
+   *          - boolean invertTree [optional]
+   */
+  _buildInverted: function buildInverted(samples, stackTable, frameTable, stringTable, allocationsTable, options) {
+    function getOrAddFrameNode(calls, isLeaf, frameKey, inflatedFrame, isMetaCategory, leafTable) {
+      // Insert the inflated frame into the call tree at the current level.
+      let frameNode;
+
+      // Leaf nodes have fan out much greater than non-leaf nodes, thus the
+      // use of a hash table. Otherwise, do linear search.
+      //
+      // Note that this method is very hot, thus the manual looping over
+      // Array.prototype.find.
+      if (isLeaf) {
+        frameNode = leafTable[frameKey];
+      } else {
+        for (let i = 0; i < calls.length; i++) {
+          if (calls[i].key === frameKey) {
+            frameNode = calls[i];
+            break;
+          }
+        }
+      }
+
+      if (!frameNode) {
+        frameNode = new FrameNode(frameKey, inflatedFrame, isMetaCategory);
+        if (isLeaf) {
+          leafTable[frameKey] = frameNode;
+        }
+        calls.push(frameNode);
+      }
+
+      return frameNode;
+    }
+
+    const SAMPLE_STACK_SLOT = samples.schema.stack;
+    const SAMPLE_TIME_SLOT = samples.schema.time;
+
+    const STACK_PREFIX_SLOT = stackTable.schema.prefix;
+    const STACK_FRAME_SLOT = stackTable.schema.frame;
+
+    const InflatedFrame = FrameUtils.InflatedFrame;
+    const getOrAddInflatedFrame = FrameUtils.getOrAddInflatedFrame;
+
+    let selfCount = this.selfCount;
+    let selfDuration = this.selfDuration;
+
+    let samplesData = samples.data;
+    let stacksData = stackTable.data;
+
+    // Caches.
+    let inflatedFrameCache = FrameUtils.getInflatedFrameCache(frameTable);
+    let leafTable = Object.create(null);
+
+    let startTime = options.startTime || 0
+    let endTime = options.endTime || Infinity;
+    let flattenRecursion = options.flattenRecursion;
+
+    // Take the timestamp of the first sample as prevSampleTime. 0 is
+    // incorrect due to circular buffer wraparound. If wraparound happens,
+    // then the first sample will have an incorrect, large duration.
+    let prevSampleTime = samplesData[0][SAMPLE_TIME_SLOT];
+
+    // Reused options object passed to InflatedFrame.prototype.getFrameKey.
+    let mutableFrameKeyOptions = {
+      contentOnly: options.contentOnly,
+      isRoot: false,
+      isLeaf: false,
+      isMetaCategoryOut: false
+    };
+
+    // Start iteration at the second sample, as we use the first sample to
+    // compute prevSampleTime.
+    for (let i = 1; i < samplesData.length; i++) {
+      let sample = samplesData[i];
+      let sampleTime = sample[SAMPLE_TIME_SLOT];
+
+      // A sample's end time is considered to be its time of sampling. Its
+      // start time is the sampling time of the previous sample.
+      //
+      // Thus, we compare sampleTime <= start instead of < to filter out
+      // samples that end exactly at the start time.
+      if (!sampleTime || sampleTime <= startTime || sampleTime > endTime) {
+        prevSampleTime = sampleTime;
+        continue;
+      }
+
+      let sampleDuration = sampleTime - prevSampleTime;
+      let stackIndex = sample[SAMPLE_STACK_SLOT];
+      let calls = this.calls;
+      let prevCalls = this.calls;
+      let prevFrameKey;
+      let isLeaf = mutableFrameKeyOptions.isLeaf = true;
+
+      // Inflate the stack and build the FrameNode call tree directly.
+      //
+      // In the profiler data, each frame's stack is referenced by an index
+      // into stackTable.
+      //
+      // Each entry in stackTable is a pair [ prefixIndex, frameIndex ]. The
+      // prefixIndex is itself an index into stackTable, referencing the
+      // prefix of the current stack (that is, the younger frames). In other
+      // words, the stackTable is encoded as a trie of the inverted
+      // callstack. The frameIndex is an index into frameTable, describing the
+      // frame at the current depth.
+      //
+      // This algorithm inflates each frame in the frame table while walking
+      // the stack trie as described above.
+      //
+      // The frame key is then computed from the inflated frame /and/ the
+      // current depth in the FrameNode call tree.  That is, the frame key is
+      // not wholly determinable from just the inflated frame.
+      //
+      // For content frames, the frame key is just its location. For chrome
+      // frames, the key may be a metacategory or its location, depending on
+      // rendering options and its position in the FrameNode call tree.
+      //
+      // The frame key is then used to build up the inverted FrameNode call
+      // tree.
+      //
+      // Note that various filtering functions, such as filtering for content
+      // frames or flattening recursion, are inlined into the stack inflation
+      // loop. This is important for performance as it avoids intermediate
+      // structures and multiple passes.
+      while (stackIndex !== null) {
+        let stackEntry = stacksData[stackIndex];
+        let frameIndex = stackEntry[STACK_FRAME_SLOT];
+
+        // Fetch the stack prefix (i.e. older frames) index.
+        stackIndex = stackEntry[STACK_PREFIX_SLOT];
+
+        // Inflate the frame.
+        let inflatedFrame = getOrAddInflatedFrame(inflatedFrameCache, frameIndex, frameTable,
+                                                  stringTable, allocationsTable);
+
+        // Compute the frame key.
+        mutableFrameKeyOptions.isRoot = stackIndex === null;
+        let frameKey = inflatedFrame.getFrameKey(mutableFrameKeyOptions);
+
+        // Leaf frames are never skipped and require self count and duration
+        // bookkeeping.
+        if (isLeaf) {
+          // Tabulate self count and duration for the leaf frame. The frameKey
+          // is never empty for a leaf frame.
+          if (selfCount[frameKey] === undefined) {
+            selfCount[frameKey] = 0;
+            selfDuration[frameKey] = 0;
+          }
+          selfCount[frameKey]++;
+          selfDuration[frameKey] += sampleDuration;
+        } else {
+          // An empty frame key means this frame should be skipped.
+          if (frameKey === "") {
+            continue;
+          }
+        }
+
+        // If we shouldn't flatten the current frame into the previous one, advance a
+        // level in the call tree.
+        if (!flattenRecursion || frameKey !== prevFrameKey) {
+          calls = prevCalls;
+        }
+
+        let frameNode = getOrAddFrameNode(calls, isLeaf, frameKey, inflatedFrame,
+                                          mutableFrameKeyOptions.isMetaCategoryOut,
+                                          leafTable);
+
+        frameNode._countSample(prevSampleTime, sampleTime, inflatedFrame.optimizations,
+                               stringTable);
+
+        prevFrameKey = frameKey;
+        prevCalls = frameNode.calls;
+        isLeaf = mutableFrameKeyOptions.isLeaf = false;
+      }
+
+      this.duration += sampleDuration;
+      this.samples++;
+      prevSampleTime = sampleTime;
+    }
+  },
+
+  /**
+   * Uninverts the call tree after its having been built.
+   */
+  _uninvert: function uninvert() {
+    function mergeOrAddFrameNode(calls, node) {
+      // Unlike the inverted call tree, we don't use a root table for the top
+      // level, as in general, there are many fewer entry points than
+      // leaves. Instead, linear search is used regardless of level.
+      for (let i = 0; i < calls.length; i++) {
+        if (calls[i].key === node.key) {
+          let foundNode = calls[i];
+          foundNode._merge(node);
+          return foundNode.calls;
+        }
+      }
+      let copy = node._clone();
+      calls.push(copy);
+      return copy.calls;
+    }
+
+    let workstack = [{ node: this, level: 0 }];
+    let spine = [];
+    let entry;
+
+    // The new root.
+    let rootCalls = [];
+
+    // Walk depth-first and keep the current spine (e.g., callstack).
+    while (entry = workstack.pop()) {
+      spine[entry.level] = entry;
+
+      let node = entry.node;
+      let calls = node.calls;
+
+      if (calls.length === 0) {
+        // We've bottomed out. Reverse the spine and add them to the
+        // uninverted call tree.
+        let uninvertedCalls = rootCalls;
+        for (let level = entry.level; level > 0; level--) {
+          let callee = spine[level];
+          uninvertedCalls = mergeOrAddFrameNode(uninvertedCalls, callee.node);
+        }
+      } else {
+        // We still have children. Continue the depth-first walk.
+        for (let i = 0; i < calls.length; i++) {
+          workstack.push({ node: calls[i], level: entry.level + 1 });
+        }
+      }
+    }
+
+    // Replace the toplevel calls with rootCalls, which now contains the
+    // uninverted roots.
+    this.calls = rootCalls;
+  },
+
+  /**
+   * Gets additional details about this node.
+   * @return object
+   */
+  getInfo: function() {
+    return {
+      nodeType: "Thread",
+      functionName: L10N.getStr("table.root"),
+      categoryData: {}
+    };
+  },
+
+  /**
+   * Mimicks the interface of FrameNode, and a ThreadNode can never have
+   * optimization data (at the moment, anyway), so provide a function
+   * to return null so we don't need to check if a frame node is a thread
+   * or not everytime we fetch optimization data.
+   *
+   * @return {null}
+   */
+
+  hasOptimizations: function () {
+    return null;
+  }
+};
+
+/**
+ * A function call node in a tree.
+ *
+ * @param string frameKey
+ *        The key associated with this frame. The key determines identity of
+ *        the node.
+ * @param string location
+ *        The location of this function call. Note that this isn't sanitized,
+ *        so it may very well (not?) include the function name, url, etc.
+ * @param number line
+ *        The line number inside the source containing this function call.
+ * @param number category
+ *        The category type of this function call ("js", "graphics" etc.).
+ * @param number allocations
+ *        The number of memory allocations performed in this frame.
+ * @param number isContent
+ *        Whether this frame is content.
+ * @param boolean isMetaCategory
+ *        Whether or not this is a platform node that should appear as a
+ *        generalized meta category or not.
+ */
+function FrameNode(frameKey, { location, line, category, allocations, isContent }, isMetaCategory) {
+  this.key = frameKey;
+  this.location = location;
+  this.line = line;
+  this.category = category;
+  this.allocations = allocations;
+  this.samples = 0;
+  this.duration = 0;
+  this.calls = [];
+  this.isContent = isContent;
+  this._optimizations = null;
+  this._stringTable = null;
+  this.isMetaCategory = isMetaCategory;
+}
+
+FrameNode.prototype = {
+  /**
+   * Count a sample as associated with this node.
+   *
+   * @param number prevSampleTime
+   *               The time when the immediate previous sample was sampled.
+   * @param number sampleTime
+   *               The time when the current sample was sampled.
+   * @param object optimizationSite
+   *               Any JIT optimization information attached to the current
+   *               sample. Lazily inflated via stringTable.
+   * @param object stringTable
+   *               The string table used to inflate the optimizationSite.
+   */
+  _countSample: function (prevSampleTime, sampleTime, optimizationSite, stringTable) {
+    this.samples++;
+    this.duration += sampleTime - prevSampleTime;
+
+    // Simply accumulate optimization sites for now. Processing is done lazily
+    // by JITOptimizations, if optimization information is actually displayed.
+    if (optimizationSite) {
+      let opts = this._optimizations;
+      if (opts === null) {
+        opts = this._optimizations = [];
+        this._stringTable = stringTable;
+      }
+      opts.push(optimizationSite);
+    }
+  },
+
+  _clone: function () {
+    let newNode = new FrameNode(this.key, this, this.isMetaCategory);
+    newNode._merge(this);
+    return newNode;
+  },
+
+  _merge: function (otherNode) {
+    if (this === otherNode) {
+      return;
+    }
+
+    this.samples += otherNode.samples;
+    this.duration += otherNode.duration;
+
+    if (otherNode._optimizations) {
+      let opts = this._optimizations;
+      if (opts === null) {
+        opts = this._optimizations = [];
+        this._stringTable = otherNode._stringTable;
+      }
+      let otherOpts = otherNode._optimizations;
+      for (let i = 0; i < otherOpts.length; i++) {
+        opts.push(otherOpts[i]);
+      }
+    }
+  },
+
+  /**
+   * Returns the parsed location and additional data describing
+   * this frame. Uses cached data if possible.
+   *
+   * @return object
+   *         The computed { name, file, url, line } properties for this
+   *         function call.
+   */
+  getInfo: function() {
+    return this._data || this._computeInfo();
+  },
+
+  /**
+   * Parses the raw location of this function call to retrieve the actual
+   * function name and source url.
+   */
+  _computeInfo: function() {
+    // "EnterJIT" pseudoframes are special, not actually on the stack.
+    if (this.location == "EnterJIT") {
+      this.category = CATEGORY_JIT;
+    }
+
+    if (this.isMetaCategory && !this.category) {
+      this.category = CATEGORY_OTHER;
+    }
+
+    // Since only C++ stack frames have associated category information,
+    // default to an "unknown" category otherwise.
+    let categoryData = CATEGORY_MAPPINGS[this.category] || {};
+
+    let parsedData = FrameUtils.parseLocation(this.location, this.line, this.column);
+    parsedData.nodeType = "Frame";
+    parsedData.categoryData = categoryData;
+    parsedData.isContent = this.isContent;
+    parsedData.isMetaCategory = this.isMetaCategory;
+
+    return this._data = parsedData;
+  },
+
+  /**
+   * Returns whether or not the frame node has an JITOptimizations model.
+   *
+   * @return {Boolean}
+   */
+  hasOptimizations: function () {
+    return !!this._optimizations;
+  },
+
+  /**
+   * Returns the underlying JITOptimizations model representing
+   * the optimization attempts occuring in this frame.
+   *
+   * @return {JITOptimizations|null}
+   */
+  getOptimizations: function () {
+    if (!this._optimizations) {
+      return null;
+    }
+    return new JITOptimizations(this._optimizations, this._stringTable);
+  }
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/recording-model.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/recording-model.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/recording-model.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/recording-model.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,387 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-const { Cc, Ci, Cu, Cr } = require("chrome");
-const { Task } = require("resource://gre/modules/Task.jsm");
-
-loader.lazyRequireGetter(this, "PerformanceIO",
-  "devtools/performance/io", true);
-loader.lazyRequireGetter(this, "RecordingUtils",
-  "devtools/performance/recording-utils", true);
-
-/**
- * Model for a wholistic profile, containing the duration, profiling data,
- * frames data, timeline (marker, tick, memory) data, and methods to mark
- * a recording as 'in progress' or 'finished'.
- */
-
-const RecordingModel = function (options={}) {
-  this._label = options.label || "";
-  this._console = options.console || false;
-
-  this._configuration = {
-    withMarkers: options.withMarkers || false,
-    withTicks: options.withTicks || false,
-    withMemory: options.withMemory || false,
-    withAllocations: options.withAllocations || false,
-    allocationsSampleProbability: options.allocationsSampleProbability || 0,
-    allocationsMaxLogLength: options.allocationsMaxLogLength || 0,
-    bufferSize: options.bufferSize || 0,
-    sampleFrequency: options.sampleFrequency || 1
-  };
-};
-
-RecordingModel.prototype = {
-  // Private fields, only needed when a recording is started or stopped.
-  _console: false,
-  _imported: false,
-  _recording: false,
-  _completed: false,
-  _profilerStartTime: 0,
-  _timelineStartTime: 0,
-  _memoryStartTime: 0,
-  _configuration: {},
-  _originalBufferStatus: null,
-  _bufferPercent: null,
-
-  // Serializable fields, necessary and sufficient for import and export.
-  _label: "",
-  _duration: 0,
-  _markers: null,
-  _frames: null,
-  _memory: null,
-  _ticks: null,
-  _allocations: null,
-  _profile: null,
-
-  /**
-   * Loads a recording from a file.
-   *
-   * @param nsILocalFile file
-   *        The file to import the data form.
-   */
-  importRecording: Task.async(function *(file) {
-    let recordingData = yield PerformanceIO.loadRecordingFromFile(file);
-
-    this._imported = true;
-    this._label = recordingData.label || "";
-    this._duration = recordingData.duration;
-    this._markers = recordingData.markers;
-    this._frames = recordingData.frames;
-    this._memory = recordingData.memory;
-    this._ticks = recordingData.ticks;
-    this._allocations = recordingData.allocations;
-    this._profile = recordingData.profile;
-    this._configuration = recordingData.configuration || {};
-  }),
-
-  /**
-   * Saves the current recording to a file.
-   *
-   * @param nsILocalFile file
-   *        The file to stream the data into.
-   */
-  exportRecording: Task.async(function *(file) {
-    let recordingData = this.getAllData();
-    yield PerformanceIO.saveRecordingToFile(recordingData, file);
-  }),
-
-  /**
-   * Sets up the instance with data from the SharedPerformanceConnection when
-   * starting a recording. Should only be called by SharedPerformanceConnection.
-   */
-  _populate: function (info) {
-    // Times must come from the actor in order to be self-consistent.
-    // However, we also want to update the view with the elapsed time
-    // even when the actor is not generating data. To do this we get
-    // the local time and use it to compute a reasonable elapsed time.
-    this._localStartTime = Date.now();
-
-    this._profilerStartTime = info.profilerStartTime;
-    this._timelineStartTime = info.timelineStartTime;
-    this._memoryStartTime = info.memoryStartTime;
-    this._originalBufferStatus = {
-      position: info.position,
-      totalSize: info.totalSize,
-      generation: info.generation
-    };
-    // initialize the _bufferPercent if the server supports it.
-    this._bufferPercent = info.position !== void 0 ? 0 : null;
-
-    this._recording = true;
-
-    this._markers = [];
-    this._frames = [];
-    this._memory = [];
-    this._ticks = [];
-    this._allocations = { sites: [], timestamps: [], frames: [], counts: [] };
-  },
-
-  /**
-   * Called when the signal was sent to the front to no longer record more
-   * data, and begin fetching the data. There's some delay during fetching,
-   * even though the recording is stopped, the model is not yet completed until
-   * all the data is fetched.
-   */
-  _onStoppingRecording: function (endTime) {
-    this._duration = endTime - this._localStartTime;
-    this._recording = false;
-  },
-
-  /**
-   * Sets results available from stopping a recording from SharedPerformanceConnection.
-   * Should only be called by SharedPerformanceConnection.
-   */
-  _onStopRecording: Task.async(function *(info) {
-    this._profile = info.profile;
-    this._completed = true;
-
-    // We filter out all samples that fall out of current profile's range
-    // since the profiler is continuously running. Because of this, sample
-    // times are not guaranteed to have a zero epoch, so offset the
-    // timestamps.
-    // TODO move this into FakeProfilerFront in ./actors.js after bug 1154115
-    RecordingUtils.offsetSampleTimes(this._profile, this._profilerStartTime);
-
-    // Markers need to be sorted ascending by time, to be properly displayed
-    // in a waterfall view.
-    this._markers = this._markers.sort((a, b) => (a.start > b.start));
-  }),
-
-  /**
-   * Gets the profile's start time.
-   * @return number
-   */
-  getProfilerStartTime: function () {
-    return this._profilerStartTime;
-  },
-
-  /**
-   * Gets the profile's label, from `console.profile(LABEL)`.
-   * @return string
-   */
-  getLabel: function () {
-    return this._label;
-  },
-
-  /**
-   * Gets duration of this recording, in milliseconds.
-   * @return number
-   */
-  getDuration: function () {
-    // Compute an approximate ending time for the current recording if it is
-    // still in progress. This is needed to ensure that the view updates even
-    // when new data is not being generated.
-    if (this._recording) {
-      return Date.now() - this._localStartTime;
-    } else {
-      return this._duration;
-    }
-  },
-
-  /**
-   * Returns configuration object of specifying whether the recording
-   * was started withTicks, withMemory and withAllocations.
-   * @return object
-   */
-  getConfiguration: function () {
-    return this._configuration;
-  },
-
-  /**
-   * Gets the accumulated markers in the current recording.
-   * @return array
-   */
-  getMarkers: function() {
-    return this._markers;
-  },
-
-  /**
-   * Gets the accumulated stack frames in the current recording.
-   * @return array
-   */
-  getFrames: function() {
-    return this._frames;
-  },
-
-  /**
-   * Gets the accumulated memory measurements in this recording.
-   * @return array
-   */
-  getMemory: function() {
-    return this._memory;
-  },
-
-  /**
-   * Gets the accumulated refresh driver ticks in this recording.
-   * @return array
-   */
-  getTicks: function() {
-    return this._ticks;
-  },
-
-  /**
-   * Gets the memory allocations data in this recording.
-   * @return array
-   */
-  getAllocations: function() {
-    return this._allocations;
-  },
-
-  /**
-   * Gets the profiler data in this recording.
-   * @return array
-   */
-  getProfile: function() {
-    return this._profile;
-  },
-
-  /**
-   * Gets all the data in this recording.
-   */
-  getAllData: function() {
-    let label = this.getLabel();
-    let duration = this.getDuration();
-    let markers = this.getMarkers();
-    let frames = this.getFrames();
-    let memory = this.getMemory();
-    let ticks = this.getTicks();
-    let allocations = this.getAllocations();
-    let profile = this.getProfile();
-    let configuration = this.getConfiguration();
-    return { label, duration, markers, frames, memory, ticks, allocations, profile, configuration };
-  },
-
-  /**
-   * Returns a boolean indicating whether or not this recording model
-   * was imported via file.
-   */
-  isImported: function () {
-    return this._imported;
-  },
-
-  /**
-   * Returns a boolean indicating whether or not this recording model
-   * was started via a `console.profile` call.
-   */
-  isConsole: function () {
-    return this._console;
-  },
-
-  /**
-   * Returns a boolean indicating whether or not this recording model
-   * has finished recording.
-   * There is some delay in fetching data between when the recording stops, and
-   * when the recording is considered completed once it has all the profiler and timeline data.
-   */
-  isCompleted: function () {
-    return this._completed || this.isImported();
-  },
-
-  /**
-   * Returns a boolean indicating whether or not this recording model
-   * is recording.
-   * A model may no longer be recording, yet still not have the profiler data. In that
-   * case, use `isCompleted()`.
-   */
-  isRecording: function () {
-    return this._recording;
-  },
-
-  /**
-   * Returns the percent (value between 0 and 1) of buffer used in this
-   * recording. Returns `null` for recordings that are no longer recording.
-   */
-  getBufferUsage: function () {
-    return this.isRecording() ? this._bufferPercent : null;
-  },
-
-  /**
-   * Fired whenever the PerformanceFront has new buffer data.
-   */
-  _addBufferStatusData: function (bufferStatus) {
-    // If this model isn't currently recording, or if the server does not
-    // support buffer status (or if this fires after actors are being destroyed),
-    // ignore this information.
-    if (!bufferStatus || !this.isRecording()) {
-      return;
-    }
-    let { position: currentPosition, totalSize, generation: currentGeneration } = bufferStatus;
-    let { position: origPosition, generation: origGeneration } = this._originalBufferStatus;
-
-    let normalizedCurrent = (totalSize * (currentGeneration - origGeneration)) + currentPosition;
-    let percent = (normalizedCurrent - origPosition) / totalSize;
-    this._bufferPercent = percent > 1 ? 1 : percent;
-  },
-
-  /**
-   * Fired whenever the PerformanceFront emits markers, memory or ticks.
-   */
-  _addTimelineData: function (eventName, ...data) {
-    // If this model isn't currently recording,
-    // ignore the timeline data.
-    if (!this.isRecording()) {
-      return;
-    }
-
-    let config = this.getConfiguration();
-
-    switch (eventName) {
-      // Accumulate timeline markers into an array. Furthermore, the timestamps
-      // do not have a zero epoch, so offset all of them by the start time.
-      case "markers": {
-        if (!config.withMarkers) { break; }
-        let [markers] = data;
-        RecordingUtils.offsetMarkerTimes(markers, this._timelineStartTime);
-        Array.prototype.push.apply(this._markers, markers);
-        break;
-      }
-      // Accumulate stack frames into an array.
-      case "frames": {
-        if (!config.withMarkers) { break; }
-        let [, frames] = data;
-        Array.prototype.push.apply(this._frames, frames);
-        break;
-      }
-      // Accumulate memory measurements into an array. Furthermore, the timestamp
-      // does not have a zero epoch, so offset it by the actor's start time.
-      case "memory": {
-        if (!config.withMemory) { break; }
-        let [currentTime, measurement] = data;
-        this._memory.push({
-          delta: currentTime - this._timelineStartTime,
-          value: measurement.total / 1024 / 1024
-        });
-        break;
-      }
-      // Save the accumulated refresh driver ticks.
-      case "ticks": {
-        if (!config.withTicks) { break; }
-        let [, timestamps] = data;
-        this._ticks = timestamps;
-        break;
-      }
-      // Accumulate allocation sites into an array. Furthermore, the timestamps
-      // do not have a zero epoch, and are microseconds instead of milliseconds,
-      // so offset all of them by the start time, also converting from µs to ms.
-      case "allocations": {
-        if (!config.withAllocations) { break; }
-        let [{ sites, timestamps, frames, counts }] = data;
-        let timeOffset = this._memoryStartTime * 1000;
-        let timeScale = 1000;
-        RecordingUtils.offsetAndScaleTimestamps(timestamps, timeOffset, timeScale);
-        Array.prototype.push.apply(this._allocations.sites, sites);
-        Array.prototype.push.apply(this._allocations.timestamps, timestamps);
-        Array.prototype.push.apply(this._allocations.frames, frames);
-        Array.prototype.push.apply(this._allocations.counts, counts);
-        break;
-      }
-    }
-  },
-
-  toString: () => "[object RecordingModel]"
-};
-
-exports.RecordingModel = RecordingModel;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/recording-utils.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/recording-utils.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/recording-utils.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/recording-utils.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,572 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-const { Cc, Ci, Cu, Cr } = require("chrome");
-
-/**
- * Utility functions for managing recording models and their internal data,
- * such as filtering profile samples or offsetting timestamps.
- */
-
-exports.RecordingUtils = {};
-
-/**
- * Filters all the samples in the provided profiler data to be more recent
- * than the specified start time.
- *
- * @param object profile
- *        The profiler data received from the backend.
- * @param number profilerStartTime
- *        The earliest acceptable sample time (in milliseconds).
- */
-exports.RecordingUtils.filterSamples = function(profile, profilerStartTime) {
-  let firstThread = profile.threads[0];
-  const TIME_SLOT = firstThread.samples.schema.time;
-  firstThread.samples.data = firstThread.samples.data.filter(e => {
-    return e[TIME_SLOT] >= profilerStartTime;
-  });
-}
-
-/**
- * Offsets all the samples in the provided profiler data by the specified time.
- *
- * @param object profile
- *        The profiler data received from the backend.
- * @param number timeOffset
- *        The amount of time to offset by (in milliseconds).
- */
-exports.RecordingUtils.offsetSampleTimes = function(profile, timeOffset) {
-  let firstThread = profile.threads[0];
-  const TIME_SLOT = firstThread.samples.schema.time;
-  let samplesData = firstThread.samples.data;
-  for (let i = 0; i < samplesData.length; i++) {
-    samplesData[i][TIME_SLOT] -= timeOffset;
-  }
-}
-
-/**
- * Offsets all the markers in the provided timeline data by the specified time.
- *
- * @param array markers
- *        The markers array received from the backend.
- * @param number timeOffset
- *        The amount of time to offset by (in milliseconds).
- */
-exports.RecordingUtils.offsetMarkerTimes = function(markers, timeOffset) {
-  for (let marker of markers) {
-    marker.start -= timeOffset;
-    marker.end -= timeOffset;
-  }
-}
-
-/**
- * Offsets and scales all the timestamps in the provided array by the
- * specified time and scale factor.
- *
- * @param array array
- *        A list of timestamps received from the backend.
- * @param number timeOffset
- *        The amount of time to offset by (in milliseconds).
- * @param number timeScale
- *        The factor to scale by, after offsetting.
- */
-exports.RecordingUtils.offsetAndScaleTimestamps = function(timestamps, timeOffset, timeScale) {
-  for (let i = 0, len = timestamps.length; i < len; i++) {
-    timestamps[i] -= timeOffset;
-    timestamps[i] /= timeScale;
-  }
-}
-
-/**
- * Cache used in `RecordingUtils.getProfileThreadFromAllocations`.
- */
-let gProfileThreadFromAllocationCache = new WeakMap();
-
-/**
- * Converts allocation data from the memory actor to something that follows
- * the same structure as the samples data received from the profiler.
- *
- * @see MemoryActor.prototype.getAllocations for more information.
- *
- * @param object allocations
- *        A list of { sites, timestamps, frames, counts } arrays.
- * @return object
- *         The "profile" describing the allocations log.
- */
-exports.RecordingUtils.getProfileThreadFromAllocations = function(allocations) {
-  let cached = gProfileThreadFromAllocationCache.get(allocations);
-  if (cached) {
-    return cached;
-  }
-
-  let { sites, timestamps, frames, counts } = allocations;
-  let uniqueStrings = new UniqueStrings();
-
-  // Convert allocation frames to the the stack and frame tables expected by
-  // the profiler format.
-  //
-  // Since the allocations log is already presented as a tree, we would be
-  // wasting time if we jumped through the same hoops as deflateProfile below
-  // and instead use the existing structure of the allocations log to build up
-  // the profile JSON.
-  //
-  // The allocations.frames array corresponds roughly to the profile stack
-  // table: a trie of all stacks. We could work harder to further deduplicate
-  // each individual frame as the profiler does, but it is not necessary for
-  // correctness.
-  let stackTable = new Array(frames.length);
-  let frameTable = new Array(frames.length);
-
-  // Array used to concat the location.
-  let locationConcatArray = new Array(5);
-
-  for (let i = 0; i < frames.length; i++) {
-    let frame = frames[i];
-    if (!frame) {
-      stackTable[i] = frameTable[i] = null;
-      continue;
-    }
-
-    let prefix = frame.parent;
-
-    // Schema:
-    //   [prefix, frame]
-    stackTable[i] = [frames[prefix] ? prefix : null, i];
-
-    // Schema:
-    //   [location]
-    //
-    // The only field a frame will have in an allocations profile is location.
-    //
-    // If frame.functionDisplayName is present, the format is
-    //   "functionDisplayName (source:line:column)"
-    // Otherwise, it is
-    //   "source:line:column"
-    //
-    // A static array is used to join to save memory on intermediate strings.
-    locationConcatArray[0] = frame.source;
-    locationConcatArray[1] = ":";
-    locationConcatArray[2] = String(frame.line);
-    locationConcatArray[3] = ":";
-    locationConcatArray[4] = String(frame.column);
-    locationConcatArray[5] = "";
-
-    let location = locationConcatArray.join("");
-    let funcName = frame.functionDisplayName;
-
-    if (funcName) {
-      locationConcatArray[0] = funcName;
-      locationConcatArray[1] = " (";
-      locationConcatArray[2] = location;
-      locationConcatArray[3] = ")";
-      locationConcatArray[4] = "";
-      locationConcatArray[5] = "";
-      location = locationConcatArray.join("");
-    }
-
-    frameTable[i] = [uniqueStrings.getOrAddStringIndex(location)];
-  }
-
-  let samples = new Array(sites.length);
-  let writePos = 0;
-  for (let i = 0; i < sites.length; i++) {
-    // Schema:
-    //   [stack, time]
-    //
-    // Originally, sites[i] indexes into the frames array. Note that in the
-    // loop above, stackTable[sites[i]] and frames[sites[i]] index the same
-    // information.
-    let stackIndex = sites[i];
-    if (frames[stackIndex]) {
-      samples[writePos++] = [stackIndex, timestamps[i]];
-    }
-  }
-  samples.length = writePos;
-
-  let thread = {
-    name: "allocations",
-    samples: samplesWithSchema(samples),
-    stackTable: stackTableWithSchema(stackTable),
-    frameTable: frameTableWithSchema(frameTable),
-    stringTable: uniqueStrings.stringTable,
-    allocationsTable: counts
-  };
-
-  gProfileThreadFromAllocationCache.set(allocations, thread);
-  return thread;
-}
-
-/**
- * Gets the current timeline blueprint without the hidden markers.
- *
- * @param blueprint
- *        The default timeline blueprint.
- * @param array hiddenMarkers
- *        A list of hidden markers' names.
- * @return object
- *         The filtered timeline blueprint.
- */
-exports.RecordingUtils.getFilteredBlueprint = function({ blueprint, hiddenMarkers }) {
-  let filteredBlueprint = Cu.cloneInto(blueprint, {});
-  let maybeRemovedGroups = new Set();
-  let removedGroups = new Set();
-
-  // 1. Remove hidden markers from the blueprint.
-
-  for (let hiddenMarkerName of hiddenMarkers) {
-    maybeRemovedGroups.add(filteredBlueprint[hiddenMarkerName].group);
-    delete filteredBlueprint[hiddenMarkerName];
-  }
-
-  // 2. Get a list of all the groups that will be removed.
-
-  for (let maybeRemovedGroup of maybeRemovedGroups) {
-    let markerNames = Object.keys(filteredBlueprint);
-    let isGroupRemoved = markerNames.every(e => filteredBlueprint[e].group != maybeRemovedGroup);
-    if (isGroupRemoved) {
-      removedGroups.add(maybeRemovedGroup);
-    }
-  }
-
-  // 3. Offset groups so that their indices are consecutive.
-
-  for (let removedGroup of removedGroups) {
-    let markerNames = Object.keys(filteredBlueprint);
-    for (let markerName of markerNames) {
-      let markerDetails = filteredBlueprint[markerName];
-      if (markerDetails.group > removedGroup) {
-        markerDetails.group--;
-      }
-    }
-  }
-
-  return filteredBlueprint;
-};
-
-/**
- * Deduplicates a profile by deduplicating stacks, frames, and strings.
- *
- * This is used to adapt version 2 profiles from the backend to version 3, for
- * use with older Geckos (like B2G).
- *
- * Note that the schemas used by this must be kept in sync with schemas used
- * by the C++ UniqueStacks class in tools/profiler/ProfileEntry.cpp.
- *
- * @param object profile
- *               A profile with version 2.
- */
-exports.RecordingUtils.deflateProfile = function deflateProfile(profile) {
-  profile.threads = profile.threads.map((thread) => {
-    let uniqueStacks = new UniqueStacks();
-    return deflateThread(thread, uniqueStacks);
-  });
-
-  profile.meta.version = 3;
-  return profile;
-};
-
-/**
- * Given an array of frame objects, deduplicates each frame as well as all
- * prefixes in the stack. Returns the index of the deduplicated stack.
- *
- * @param object frames
- *               Array of frame objects.
- * @param UniqueStacks uniqueStacks
- * @return number index
- */
-function deflateStack(frames, uniqueStacks) {
-  // Deduplicate every prefix in the stack by keeping track of the current
-  // prefix hash.
-  let prefixIndex = null;
-  for (let i = 0; i < frames.length; i++) {
-    let frameIndex = uniqueStacks.getOrAddFrameIndex(frames[i]);
-    prefixIndex = uniqueStacks.getOrAddStackIndex(prefixIndex, frameIndex);
-  }
-  return prefixIndex;
-}
-
-/**
- * Given an array of sample objects, deduplicate each sample's stack and
- * convert the samples to a table with a schema. Returns the deflated samples.
- *
- * @param object samples
- *               Array of samples
- * @param UniqueStacks uniqueStacks
- * @return object
- */
-function deflateSamples(samples, uniqueStacks) {
-  // Schema:
-  //   [stack, time, responsiveness, rss, uss, frameNumber, power]
-
-  let deflatedSamples = new Array(samples.length);
-  for (let i = 0; i < samples.length; i++) {
-    let sample = samples[i];
-    deflatedSamples[i] = [
-      deflateStack(sample.frames, uniqueStacks),
-      sample.time,
-      sample.responsiveness,
-      sample.rss,
-      sample.uss,
-      sample.frameNumber,
-      sample.power
-    ];
-  }
-
-  return samplesWithSchema(deflatedSamples);
-}
-
-/**
- * Given an array of marker objects, convert the markers to a table with a
- * schema. Returns the deflated markers.
- *
- * If a marker contains a backtrace as its payload, the backtrace stack is
- * deduplicated in the context of the profile it's in.
- *
- * @param object markers
- *               Array of markers
- * @param UniqueStacks uniqueStacks
- * @return object
- */
-function deflateMarkers(markers, uniqueStacks) {
-  // Schema:
-  //   [name, time, data]
-
-  let deflatedMarkers = new Array(markers.length);
-  for (let i = 0; i < markers.length; i++) {
-    let marker = markers[i];
-    if (marker.data && marker.data.type === "tracing" && marker.data.stack) {
-      marker.data.stack = deflateThread(marker.data.stack, uniqueStacks);
-    }
-
-    deflatedMarkers[i] = [
-      uniqueStacks.getOrAddStringIndex(marker.name),
-      marker.time,
-      marker.data
-    ];
-  }
-
-  let slot = 0;
-  return {
-    schema: {
-      name: slot++,
-      time: slot++,
-      data: slot++
-    },
-    data: deflatedMarkers
-  };
-}
-
-/**
- * Deflate a thread.
- *
- * @param object thread
- *               The profile thread.
- * @param UniqueStacks uniqueStacks
- * @return object
- */
-function deflateThread(thread, uniqueStacks) {
-  return {
-    name: thread.name,
-    tid: thread.tid,
-    samples: deflateSamples(thread.samples, uniqueStacks),
-    markers: deflateMarkers(thread.markers, uniqueStacks),
-    stackTable: uniqueStacks.getStackTableWithSchema(),
-    frameTable: uniqueStacks.getFrameTableWithSchema(),
-    stringTable: uniqueStacks.getStringTable()
-  };
-}
-exports.RecordingUtils.deflateThread = deflateThread;
-
-function stackTableWithSchema(data) {
-  let slot = 0;
-  return {
-    schema: {
-      prefix: slot++,
-      frame: slot++
-    },
-    data: data
-  };
-}
-
-function frameTableWithSchema(data) {
-  let slot = 0;
-  return {
-    schema: {
-      location: slot++,
-      implementation: slot++,
-      optimizations: slot++,
-      line: slot++,
-      category: slot++
-    },
-    data: data
-  };
-}
-
-function samplesWithSchema(data) {
-  let slot = 0;
-  return {
-    schema: {
-      stack: slot++,
-      time: slot++,
-      responsiveness: slot++,
-      rss: slot++,
-      uss: slot++,
-      frameNumber: slot++,
-      power: slot++
-    },
-    data: data
-  };
-}
-
-/**
- * A helper class to deduplicate strings.
- */
-function UniqueStrings() {
-  this.stringTable = [];
-  this._stringHash = Object.create(null);
-}
-
-UniqueStrings.prototype.getOrAddStringIndex = function(s) {
-  if (!s) {
-    return null;
-  }
-
-  let stringHash = this._stringHash;
-  let stringTable = this.stringTable;
-  let index = stringHash[s];
-  if (index !== undefined) {
-    return index;
-  }
-
-  index = stringTable.length;
-  stringHash[s] = index;
-  stringTable.push(s);
-  return index;
-};
-
-exports.RecordingUtils.UniqueStrings = UniqueStrings;
-
-/**
- * A helper class to deduplicate old-version profiles.
- *
- * The main functionality provided is deduplicating frames and stacks.
- *
- * For example, given 2 stacks
- *   [A, B, C]
- * and
- *   [A, B, D]
- *
- * There are 4 unique frames: A, B, C, and D.
- * There are 4 unique prefixes: [A], [A, B], [A, B, C], [A, B, D]
- *
- * For the example, the output of using UniqueStacks is:
- *
- * Frame table:
- *   [A, B, C, D]
- *
- * That is, A has id 0, B has id 1, etc.
- *
- * Since stack prefixes are themselves deduplicated (shared), stacks are
- * represented as a tree, or more concretely, a pair of ids, the prefix and
- * the leaf.
- *
- * Stack table:
- *   [
- *     [null, 0],
- *     [0,    1],
- *     [1,    2],
- *     [1,    3]
- *   ]
- *
- * That is, [A] has id 0 and value [null, 0]. This means it has no prefix, and
- * has the leaf frame 0, which resolves to A in the frame table.
- *
- * [A, B] has id 1 and value [0, 1]. This means it has prefix 0, which is [A],
- * and leaf 1, thus [A, B].
- *
- * [A, B, C] has id 2 and value [1, 2]. This means it has prefix 1, which in
- * turn is [A, B], and leaf 2, thus [A, B, C].
- *
- * [A, B, D] has id 3 and value [1, 3]. Note how it shares the prefix 1 with
- * [A, B, C].
- */
-function UniqueStacks() {
-  this._frameTable = [];
-  this._stackTable = [];
-  this._frameHash = Object.create(null);
-  this._stackHash = Object.create(null);
-  this._uniqueStrings = new UniqueStrings();
-}
-
-UniqueStacks.prototype.getStackTableWithSchema = function() {
-  return stackTableWithSchema(this._stackTable);
-};
-
-UniqueStacks.prototype.getFrameTableWithSchema = function() {
-  return frameTableWithSchema(this._frameTable);
-};
-
-UniqueStacks.prototype.getStringTable = function() {
-  return this._uniqueStrings.stringTable;
-};
-
-UniqueStacks.prototype.getOrAddFrameIndex = function(frame) {
-  // Schema:
-  //   [location, implementation, optimizations, line, category]
-
-  let frameHash = this._frameHash;
-  let frameTable = this._frameTable;
-
-  let locationIndex = this.getOrAddStringIndex(frame.location);
-  let implementationIndex = this.getOrAddStringIndex(frame.implementation);
-
-  // Super dumb.
-  let hash = `${locationIndex} ${implementationIndex || ""} ${frame.line || ""} ${frame.category || ""}`;
-
-  let index = frameHash[hash];
-  if (index !== undefined) {
-    return index;
-  }
-
-  index = frameTable.length;
-  frameHash[hash] = index;
-  frameTable.push([
-    this.getOrAddStringIndex(frame.location),
-    this.getOrAddStringIndex(frame.implementation),
-    // Don't bother with JIT optimization info for deflating old profile data
-    // format to the new format.
-    null,
-    frame.line,
-    frame.category
-  ]);
-  return index;
-};
-
-UniqueStacks.prototype.getOrAddStackIndex = function(prefixIndex, frameIndex) {
-  // Schema:
-  //   [prefix, frame]
-
-  let stackHash = this._stackHash;
-  let stackTable = this._stackTable;
-
-  // Also super dumb.
-  let hash = prefixIndex + " " + frameIndex;
-
-  let index = stackHash[hash];
-  if (index !== undefined) {
-    return index;
-  }
-
-  index = stackTable.length;
-  stackHash[hash] = index;
-  stackTable.push([prefixIndex, frameIndex]);
-  return index;
-};
-
-UniqueStacks.prototype.getOrAddStringIndex = function(s) {
-  return this._uniqueStrings.getOrAddStringIndex(s);
-};
-
-exports.RecordingUtils.UniqueStacks = UniqueStacks;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/widgets/graphs.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/widgets/graphs.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/widgets/graphs.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/widgets/graphs.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,429 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+/**
+ * This file contains the base line graph that all Performance line graphs use.
+ */
+
+const { Cc, Ci, Cu, Cr } = require("chrome");
+const { Task } = require("resource://gre/modules/Task.jsm");
+const { LineGraphWidget } = require("resource:///modules/devtools/Graphs.jsm");
+const { BarGraphWidget } = require("resource:///modules/devtools/Graphs.jsm");
+const { CanvasGraphUtils } = require("resource:///modules/devtools/Graphs.jsm");
+const { Heritage } = require("resource:///modules/devtools/ViewHelpers.jsm");
+
+loader.lazyRequireGetter(this, "promise");
+loader.lazyRequireGetter(this, "EventEmitter",
+  "devtools/toolkit/event-emitter");
+
+loader.lazyRequireGetter(this, "colorUtils",
+  "devtools/css-color", true);
+loader.lazyRequireGetter(this, "getColor",
+  "devtools/shared/theme", true);
+loader.lazyRequireGetter(this, "ProfilerGlobal",
+  "devtools/performance/global");
+loader.lazyRequireGetter(this, "TimelineGlobal",
+  "devtools/performance/global");
+loader.lazyRequireGetter(this, "MarkersOverview",
+  "devtools/performance/markers-overview", true);
+
+/**
+ * For line graphs
+ */
+const HEIGHT = 35; // px
+const STROKE_WIDTH = 1; // px
+const DAMPEN_VALUES = 0.95;
+const CLIPHEAD_LINE_COLOR = "#666";
+const SELECTION_LINE_COLOR = "#555";
+const SELECTION_BACKGROUND_COLOR_NAME = "highlight-blue";
+const FRAMERATE_GRAPH_COLOR_NAME = "highlight-green";
+const MEMORY_GRAPH_COLOR_NAME = "highlight-blue";
+
+/**
+ * For timeline overview
+ */
+const MARKERS_GRAPH_HEADER_HEIGHT = 14; // px
+const MARKERS_GRAPH_ROW_HEIGHT = 10; // px
+const MARKERS_GROUP_VERTICAL_PADDING = 4; // px
+
+/**
+ * A base class for performance graphs to inherit from.
+ *
+ * @param nsIDOMNode parent
+ *        The parent node holding the overview.
+ * @param string metric
+ *        The unit of measurement for this graph.
+ */
+function PerformanceGraph(parent, metric) {
+  LineGraphWidget.call(this, parent, { metric });
+  this.setTheme();
+}
+
+PerformanceGraph.prototype = Heritage.extend(LineGraphWidget.prototype, {
+  strokeWidth: STROKE_WIDTH,
+  dampenValuesFactor: DAMPEN_VALUES,
+  fixedHeight: HEIGHT,
+  clipheadLineColor: CLIPHEAD_LINE_COLOR,
+  selectionLineColor: SELECTION_LINE_COLOR,
+  withTooltipArrows: false,
+  withFixedTooltipPositions: true,
+
+  /**
+   * Disables selection and empties this graph.
+   */
+  clearView: function() {
+    this.selectionEnabled = false;
+    this.dropSelection();
+    this.setData([]);
+  },
+
+  /**
+   * Sets the theme via `theme` to either "light" or "dark",
+   * and updates the internal styling to match. Requires a redraw
+   * to see the effects.
+   */
+  setTheme: function (theme) {
+    theme = theme || "light";
+    let mainColor = getColor(this.mainColor || "highlight-blue", theme);
+    this.backgroundColor = getColor("body-background", theme);
+    this.strokeColor = mainColor;
+    this.backgroundGradientStart = colorUtils.setAlpha(mainColor, 0.2);
+    this.backgroundGradientEnd = colorUtils.setAlpha(mainColor, 0.2);
+    this.selectionBackgroundColor = colorUtils.setAlpha(getColor(SELECTION_BACKGROUND_COLOR_NAME, theme), 0.25);
+    this.selectionStripesColor = "rgba(255, 255, 255, 0.1)";
+    this.maximumLineColor = colorUtils.setAlpha(mainColor, 0.4);
+    this.averageLineColor = colorUtils.setAlpha(mainColor, 0.7);
+    this.minimumLineColor = colorUtils.setAlpha(mainColor, 0.9);
+  }
+});
+
+/**
+ * Constructor for the framerate graph. Inherits from PerformanceGraph.
+ *
+ * @param nsIDOMNode parent
+ *        The parent node holding the overview.
+ */
+function FramerateGraph(parent) {
+  PerformanceGraph.call(this, parent, ProfilerGlobal.L10N.getStr("graphs.fps"));
+}
+
+FramerateGraph.prototype = Heritage.extend(PerformanceGraph.prototype, {
+  mainColor: FRAMERATE_GRAPH_COLOR_NAME,
+  setPerformanceData: function ({ duration, ticks }, resolution) {
+    this.dataDuration = duration;
+    return this.setDataFromTimestamps(ticks, resolution, duration);
+  }
+});
+
+/**
+ * Constructor for the memory graph. Inherits from PerformanceGraph.
+ *
+ * @param nsIDOMNode parent
+ *        The parent node holding the overview.
+ */
+function MemoryGraph(parent) {
+  PerformanceGraph.call(this, parent, TimelineGlobal.L10N.getStr("graphs.memory"));
+}
+
+MemoryGraph.prototype = Heritage.extend(PerformanceGraph.prototype, {
+  mainColor: MEMORY_GRAPH_COLOR_NAME,
+  setPerformanceData: function ({ duration, memory }) {
+    this.dataDuration = duration;
+    return this.setData(memory);
+  }
+});
+
+function TimelineGraph(parent, blueprint) {
+  MarkersOverview.call(this, parent, blueprint);
+}
+
+TimelineGraph.prototype = Heritage.extend(MarkersOverview.prototype, {
+  headerHeight: MARKERS_GRAPH_HEADER_HEIGHT,
+  rowHeight: MARKERS_GRAPH_ROW_HEIGHT,
+  groupPadding: MARKERS_GROUP_VERTICAL_PADDING,
+  setPerformanceData: MarkersOverview.prototype.setData
+});
+
+/**
+ * Definitions file for GraphsController, indicating the constructor,
+ * selector and other meta for each of the graphs controller by
+ * GraphsController.
+ */
+const GRAPH_DEFINITIONS = {
+  memory: {
+    constructor: MemoryGraph,
+    selector: "#memory-overview",
+  },
+  framerate: {
+    constructor: FramerateGraph,
+    selector: "#time-framerate",
+  },
+  timeline: {
+    constructor: TimelineGraph,
+    selector: "#markers-overview",
+    needsBlueprints: true,
+    primaryLink: true
+  }
+};
+
+/**
+ * A controller for orchestrating the performance's tool overview graphs. Constructs,
+ * syncs, toggles displays and defines the memory, framerate and timeline view.
+ *
+ * @param {object} definition
+ * @param {DOMElement} root
+ * @param {function} getBlueprint
+ * @param {function} getTheme
+ */
+function GraphsController ({ definition, root, getBlueprint, getTheme }) {
+  this._graphs = {};
+  this._enabled = new Set();
+  this._definition = definition || GRAPH_DEFINITIONS;
+  this._root = root;
+  this._getBlueprint = getBlueprint;
+  this._getTheme = getTheme;
+  this._primaryLink = Object.keys(this._definition).filter(name => this._definition[name].primaryLink)[0];
+  this.$ = root.ownerDocument.querySelector.bind(root.ownerDocument);
+
+  EventEmitter.decorate(this);
+  this._onSelecting = this._onSelecting.bind(this);
+}
+
+GraphsController.prototype = {
+
+  /**
+   * Returns the corresponding graph by `graphName`.
+   */
+  get: function (graphName) {
+    return this._graphs[graphName];
+  },
+
+  /**
+   * Iterates through all graphs and renders the data
+   * from a RecordingModel. Takes a resolution value used in
+   * some graphs.
+   * Saves rendering progress as a promise to be consumed by `destroy`,
+   * to wait for cleaning up rendering during destruction.
+   */
+  render: Task.async(function *(recordingData, resolution) {
+    // Get the previous render promise so we don't start rendering
+    // until the previous render cycle completes, which can occur
+    // especially when a recording is finished, and triggers a
+    // fresh rendering at a higher rate
+    yield (this._rendering && this._rendering.promise);
+
+    // Check after yielding to ensure we're not tearing down,
+    // as this can create a race condition in tests
+    if (this._destroyed) {
+      return;
+    }
+
+    this._rendering = promise.defer();
+    for (let graph of (yield this._getEnabled())) {
+      yield graph.setPerformanceData(recordingData, resolution);
+      this.emit("rendered", graph.graphName);
+    }
+    this._rendering.resolve();
+  }),
+
+  /**
+   * Destroys the underlying graphs.
+   */
+  destroy: Task.async(function *() {
+    let primary = this._getPrimaryLink();
+
+    this._destroyed = true;
+
+    if (primary) {
+      primary.off("selecting", this._onSelecting);
+    }
+
+    // If there was rendering, wait until the most recent render cycle
+    // has finished
+    if (this._rendering) {
+      yield this._rendering.promise;
+    }
+
+    for (let graph of this.getWidgets()) {
+      yield graph.destroy();
+    }
+  }),
+
+  /**
+   * Applies the theme to the underlying graphs. Optionally takes
+   * a `redraw` boolean in the options to force redraw.
+   */
+  setTheme: function (options={}) {
+    let theme = options.theme || this._getTheme();
+    for (let graph of this.getWidgets()) {
+      graph.setTheme(theme);
+      graph.refresh({ force: options.redraw });
+    }
+  },
+
+  /**
+   * Sets up the graph, if needed. Returns a promise resolving
+   * to the graph if it is enabled once it's ready, or otherwise returns
+   * null if disabled.
+   */
+  isAvailable: Task.async(function *(graphName) {
+    if (!this._enabled.has(graphName)) {
+      return null;
+    }
+
+    let graph = this.get(graphName);
+
+    if (!graph) {
+      graph = yield this._construct(graphName);
+    }
+
+    yield graph.ready();
+    return graph;
+  }),
+
+  /**
+   * Enable or disable a subgraph controlled by GraphsController.
+   * This determines what graphs are visible and get rendered.
+   */
+  enable: function (graphName, isEnabled) {
+    let el = this.$(this._definition[graphName].selector);
+    el.hidden = !isEnabled;
+
+    // If no status change, just return
+    if (this._enabled.has(graphName) === isEnabled) {
+      return;
+    }
+    if (isEnabled) {
+      this._enabled.add(graphName);
+    } else {
+      this._enabled.delete(graphName);
+    }
+
+    // Invalidate our cache of ready-to-go graphs
+    this._enabledGraphs = null;
+  },
+
+  /**
+   * Disables all graphs controller by the GraphsController, and
+   * also hides the root element. This is a one way switch, and used
+   * when older platforms do not have any timeline data.
+   */
+  disableAll: function () {
+    this._root.hidden = true;
+    // Hide all the subelements
+    Object.keys(this._definition).forEach(graphName => this.enable(graphName, false));
+  },
+
+  /**
+   * Sets a mapped selection on the graph that is the main controller
+   * for keeping the graphs' selections in sync.
+   */
+  setMappedSelection: function (selection, { mapStart, mapEnd }) {
+    return this._getPrimaryLink().setMappedSelection(selection, { mapStart, mapEnd });
+  },
+
+  /**
+   * Fetches the currently mapped selection. If graphs are not yet rendered,
+   * (which throws in Graphs.jsm), return null.
+   */
+  getMappedSelection: function ({ mapStart, mapEnd }) {
+    let primary = this._getPrimaryLink();
+    if (primary && primary.hasData()) {
+      return primary.getMappedSelection({ mapStart, mapEnd });
+    } else {
+      return null;
+    }
+  },
+
+  /**
+   * Returns an array of graphs that have been created, not necessarily
+   * enabled currently.
+   */
+  getWidgets: function () {
+    return Object.keys(this._graphs).map(name => this._graphs[name]);
+  },
+
+  /**
+   * Drops the selection.
+   */
+  dropSelection: function () {
+    if (this._getPrimaryLink()) {
+      return this._getPrimaryLink().dropSelection();
+    }
+  },
+
+  /**
+   * Makes sure the selection is enabled or disabled in all the graphs.
+   */
+  selectionEnabled: Task.async(function *(enabled) {
+    for (let graph of (yield this._getEnabled())) {
+      graph.selectionEnabled = enabled;
+    }
+  }),
+
+  /**
+   * Creates the graph `graphName` and initializes it.
+   */
+  _construct: Task.async(function *(graphName) {
+    let def = this._definition[graphName];
+    let el = this.$(def.selector);
+    let blueprint = def.needsBlueprints ? this._getBlueprint() : void 0;
+    let graph = this._graphs[graphName] = new def.constructor(el, blueprint);
+    graph.graphName = graphName;
+
+    yield graph.ready();
+
+    // Sync the graphs' animations and selections together
+    if (def.primaryLink) {
+      graph.on("selecting", this._onSelecting);
+    } else {
+      CanvasGraphUtils.linkAnimation(this._getPrimaryLink(), graph);
+      CanvasGraphUtils.linkSelection(this._getPrimaryLink(), graph);
+    }
+
+    this.setTheme();
+    return graph;
+  }),
+
+  /**
+   * Returns the main graph for this collection, that all graphs
+   * are bound to for syncing and selection.
+   */
+  _getPrimaryLink: function () {
+    return this.get(this._primaryLink);
+  },
+
+  /**
+   * Emitted when a selection occurs.
+   */
+  _onSelecting: function () {
+    this.emit("selecting");
+  },
+
+  /**
+   * Resolves to an array with all graphs that are enabled, and
+   * creates them if needed. Different than just iterating over `this._graphs`,
+   * as those could be enabled. Uses caching, as rendering happens many times per second,
+   * compared to how often which graphs/features are changed (rarely).
+   */
+  _getEnabled: Task.async(function *() {
+    if (this._enabledGraphs) {
+      return this._enabledGraphs;
+    }
+    let enabled = [];
+    for (let graphName of this._enabled) {
+      let graph;
+      if (graph = yield this.isAvailable(graphName)) {
+        enabled.push(graph);
+      }
+    }
+    return this._enabledGraphs = enabled;
+  }),
+};
+
+exports.FramerateGraph = FramerateGraph;
+exports.MemoryGraph = MemoryGraph;
+exports.TimelineGraph = TimelineGraph;
+exports.GraphsController = GraphsController;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/widgets/marker-details.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/widgets/marker-details.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/widgets/marker-details.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/widgets/marker-details.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,125 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+/**
+ * This file contains the rendering code for the marker sidebar.
+ */
+
+const { Cc, Ci, Cu, Cr } = require("chrome");
+let WebConsoleUtils = require("devtools/toolkit/webconsole/utils").Utils;
+
+loader.lazyRequireGetter(this, "EventEmitter",
+  "devtools/toolkit/event-emitter");
+loader.lazyRequireGetter(this, "L10N",
+  "devtools/performance/global", true);
+loader.lazyRequireGetter(this, "TIMELINE_BLUEPRINT",
+  "devtools/performance/global", true);
+loader.lazyRequireGetter(this, "MarkerUtils",
+  "devtools/performance/marker-utils");
+
+/**
+ * A detailed view for one single marker.
+ *
+ * @param nsIDOMNode parent
+ *        The parent node holding the view.
+ * @param nsIDOMNode splitter
+ *        The splitter node that the resize event is bound to.
+ */
+function MarkerDetails(parent, splitter) {
+  EventEmitter.decorate(this);
+  this._onClick = this._onClick.bind(this);
+  this._document = parent.ownerDocument;
+  this._parent = parent;
+  this._splitter = splitter;
+  this._splitter.addEventListener("mouseup", () => this.emit("resize"));
+  this._parent.addEventListener("click", this._onClick);
+}
+
+MarkerDetails.prototype = {
+  /**
+   * Removes any node references from this view.
+   */
+  destroy: function() {
+    this.empty();
+    this._parent.removeEventListener("click", this._onClick);
+    this._parent = null;
+    this._splitter = null;
+  },
+
+  /**
+   * Clears the view.
+   */
+  empty: function() {
+    this._parent.innerHTML = "";
+  },
+
+  /**
+   * Populates view with marker's details.
+   *
+   * @param object params
+   *        An options object holding:
+   *        marker - The marker to display.
+   *        frames - Array of stack frame information; see stack.js.
+   */
+  render: function({ marker, frames }) {
+    this.empty();
+
+    let elements = [];
+    elements.push(MarkerUtils.DOM.buildTitle(this._document, marker));
+    elements.push(MarkerUtils.DOM.buildDuration(this._document, marker));
+    MarkerUtils.DOM.buildFields(this._document, marker).forEach(field => elements.push(field));
+
+    // Build a stack element -- and use the "startStack" label if
+    // we have both a star and endStack.
+    if (marker.stack) {
+      let type = marker.endStack ? "startStack" : "stack";
+      elements.push(MarkerUtils.DOM.buildStackTrace(this._document, {
+        frameIndex: marker.stack, frames, type
+      }));
+    }
+
+    elements.forEach(el => this._parent.appendChild(el));
+  },
+
+  /**
+   * Handles click in the marker details view. Based on the target,
+   * can handle different actions -- only supporting view source links
+   * for the moment.
+   */
+  _onClick: function (e) {
+    let data = findActionFromEvent(e.target);
+    if (!data) {
+      return;
+    }
+
+    if (data.action === "view-source") {
+      this.emit("view-source", data.url, data.line);
+    }
+  },
+};
+
+exports.MarkerDetails = MarkerDetails;
+
+/**
+ * Take an element from an event `target`, and asend through
+ * the DOM, looking for an element with a `data-action` attribute. Return
+ * the parsed `data-action` value found, or null if none found before
+ * reaching the parent `container`.
+ *
+ * @param {Element} target
+ * @param {Element} container
+ * @return {?object}
+ */
+function findActionFromEvent (target, container) {
+  let el = target;
+  let action;
+  while (el !== container) {
+    if (action = el.getAttribute("data-action")) {
+      return JSON.parse(action);
+    }
+    el = el.parentNode;
+  }
+  return null;
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/widgets/markers-overview.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/widgets/markers-overview.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/widgets/markers-overview.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/widgets/markers-overview.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,236 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+/**
+ * This file contains the "markers overview" graph, which is a minimap of all
+ * the timeline data. Regions inside it may be selected, determining which
+ * markers are visible in the "waterfall".
+ */
+
+const { Cc, Ci, Cu, Cr } = require("chrome");
+const { AbstractCanvasGraph } = require("resource:///modules/devtools/Graphs.jsm");
+const { Heritage } = require("resource:///modules/devtools/ViewHelpers.jsm");
+
+loader.lazyRequireGetter(this, "colorUtils",
+  "devtools/css-color", true);
+loader.lazyRequireGetter(this, "getColor",
+  "devtools/shared/theme", true);
+loader.lazyRequireGetter(this, "L10N",
+  "devtools/performance/global", true);
+
+const OVERVIEW_HEADER_HEIGHT = 14; // px
+const OVERVIEW_ROW_HEIGHT = 11; // px
+
+const OVERVIEW_SELECTION_LINE_COLOR = "#666";
+const OVERVIEW_CLIPHEAD_LINE_COLOR = "#555";
+
+const FIND_OPTIMAL_TICK_INTERVAL_MAX_ITERS = 100;
+const OVERVIEW_HEADER_TICKS_MULTIPLE = 100; // ms
+const OVERVIEW_HEADER_TICKS_SPACING_MIN = 75; // px
+const OVERVIEW_HEADER_TEXT_FONT_SIZE = 9; // px
+const OVERVIEW_HEADER_TEXT_FONT_FAMILY = "sans-serif";
+const OVERVIEW_HEADER_TEXT_PADDING_LEFT = 6; // px
+const OVERVIEW_HEADER_TEXT_PADDING_TOP = 1; // px
+const OVERVIEW_MARKERS_COLOR_STOPS = [0, 0.1, 0.75, 1];
+const OVERVIEW_MARKER_WIDTH_MIN = 4; // px
+const OVERVIEW_GROUP_VERTICAL_PADDING = 5; // px
+
+/**
+ * An overview for the markers data.
+ *
+ * @param nsIDOMNode parent
+ *        The parent node holding the overview.
+ * @param Object blueprint
+ *        List of names and colors defining markers.
+ */
+function MarkersOverview(parent, blueprint, ...args) {
+  AbstractCanvasGraph.apply(this, [parent, "markers-overview", ...args]);
+  this.setTheme();
+  this.setBlueprint(blueprint);
+}
+
+MarkersOverview.prototype = Heritage.extend(AbstractCanvasGraph.prototype, {
+  clipheadLineColor: OVERVIEW_CLIPHEAD_LINE_COLOR,
+  selectionLineColor: OVERVIEW_SELECTION_LINE_COLOR,
+  headerHeight: OVERVIEW_HEADER_HEIGHT,
+  rowHeight: OVERVIEW_ROW_HEIGHT,
+  groupPadding: OVERVIEW_GROUP_VERTICAL_PADDING,
+
+  /**
+   * Compute the height of the overview.
+   */
+  get fixedHeight() {
+    return this.headerHeight + this.rowHeight * (this._lastGroup + 1);
+  },
+
+  /**
+   * List of names and colors used to paint this overview.
+   * @see TIMELINE_BLUEPRINT in timeline/widgets/global.js
+   */
+  setBlueprint: function(blueprint) {
+    this._paintBatches = new Map();
+    this._lastGroup = 0;
+
+    for (let type in blueprint) {
+      this._paintBatches.set(type, { style: blueprint[type], batch: [] });
+      this._lastGroup = Math.max(this._lastGroup, blueprint[type].group);
+    }
+  },
+
+  /**
+   * Disables selection and empties this graph.
+   */
+  clearView: function() {
+    this.selectionEnabled = false;
+    this.dropSelection();
+    this.setData({ duration: 0, markers: [] });
+  },
+
+  /**
+   * Renders the graph's data source.
+   * @see AbstractCanvasGraph.prototype.buildGraphImage
+   */
+  buildGraphImage: function() {
+    let { markers, duration } = this._data;
+
+    let { canvas, ctx } = this._getNamedCanvas("markers-overview-data");
+    let canvasWidth = this._width;
+    let canvasHeight = this._height;
+
+    // Group markers into separate paint batches. This is necessary to
+    // draw all markers sharing the same style at once.
+
+    for (let marker of markers) {
+      let markerType = this._paintBatches.get(marker.name);
+      if (markerType) {
+        markerType.batch.push(marker);
+      }
+    }
+
+    // Calculate each row's height, and the time-based scaling.
+
+    let totalGroups = this._lastGroup + 1;
+    let groupHeight = this.rowHeight * this._pixelRatio;
+    let groupPadding = this.groupPadding * this._pixelRatio;
+    let headerHeight = this.headerHeight * this._pixelRatio;
+    let dataScale = this.dataScaleX = canvasWidth / duration;
+
+    // Draw the header and overview background.
+
+    ctx.fillStyle = this.headerBackgroundColor;
+    ctx.fillRect(0, 0, canvasWidth, headerHeight);
+
+    ctx.fillStyle = this.backgroundColor;
+    ctx.fillRect(0, headerHeight, canvasWidth, canvasHeight);
+
+    // Draw the alternating odd/even group backgrounds.
+
+    ctx.fillStyle = this.alternatingBackgroundColor;
+    ctx.beginPath();
+
+    for (let i = 0; i < totalGroups; i += 2) {
+      let top = headerHeight + i * groupHeight;
+      ctx.rect(0, top, canvasWidth, groupHeight);
+    }
+
+    ctx.fill();
+
+    // Draw the timeline header ticks.
+
+    let fontSize = OVERVIEW_HEADER_TEXT_FONT_SIZE * this._pixelRatio;
+    let fontFamily = OVERVIEW_HEADER_TEXT_FONT_FAMILY;
+    let textPaddingLeft = OVERVIEW_HEADER_TEXT_PADDING_LEFT * this._pixelRatio;
+    let textPaddingTop = OVERVIEW_HEADER_TEXT_PADDING_TOP * this._pixelRatio;
+    let tickInterval = this._findOptimalTickInterval(dataScale);
+
+    ctx.textBaseline = "middle";
+    ctx.font = fontSize + "px " + fontFamily;
+    ctx.fillStyle = this.headerTextColor;
+    ctx.strokeStyle = this.headerTimelineStrokeColor;
+    ctx.beginPath();
+
+    for (let x = 0; x < canvasWidth; x += tickInterval) {
+      let lineLeft = x;
+      let textLeft = lineLeft + textPaddingLeft;
+      let time = Math.round(x / dataScale);
+      let label = L10N.getFormatStr("timeline.tick", time);
+      ctx.fillText(label, textLeft, headerHeight / 2 + textPaddingTop);
+      ctx.moveTo(lineLeft, 0);
+      ctx.lineTo(lineLeft, canvasHeight);
+    }
+
+    ctx.stroke();
+
+    // Draw the timeline markers.
+
+    for (let [, { style, batch }] of this._paintBatches) {
+      let top = headerHeight + style.group * groupHeight + groupPadding / 2;
+      let height = groupHeight - groupPadding;
+
+      let color = getColor(style.colorName, this.theme);
+      ctx.fillStyle = color;
+      ctx.beginPath();
+
+      for (let { start, end } of batch) {
+        let left = start * dataScale;
+        let width = Math.max((end - start) * dataScale, OVERVIEW_MARKER_WIDTH_MIN);
+        ctx.rect(left, top, width, height);
+      }
+
+      ctx.fill();
+
+      // Since all the markers in this batch (thus sharing the same style) have
+      // been drawn, empty it. The next time new markers will be available,
+      // they will be sorted and drawn again.
+      batch.length = 0;
+    }
+
+    return canvas;
+  },
+
+  /**
+   * Finds the optimal tick interval between time markers in this overview.
+   */
+  _findOptimalTickInterval: function(dataScale) {
+    let timingStep = OVERVIEW_HEADER_TICKS_MULTIPLE;
+    let spacingMin = OVERVIEW_HEADER_TICKS_SPACING_MIN * this._pixelRatio;
+    let maxIters = FIND_OPTIMAL_TICK_INTERVAL_MAX_ITERS;
+    let numIters = 0;
+
+    if (dataScale > spacingMin) {
+      return dataScale;
+    }
+
+    while (true) {
+      let scaledStep = dataScale * timingStep;
+      if (++numIters > maxIters) {
+        return scaledStep;
+      }
+      if (scaledStep < spacingMin) {
+        timingStep <<= 1;
+        continue;
+      }
+      return scaledStep;
+    }
+  },
+
+  /**
+   * Sets the theme via `theme` to either "light" or "dark",
+   * and updates the internal styling to match. Requires a redraw
+   * to see the effects.
+   */
+  setTheme: function (theme) {
+    this.theme = theme = theme || "light";
+    this.backgroundColor = getColor("body-background", theme);
+    this.selectionBackgroundColor = colorUtils.setAlpha(getColor("selection-background", theme), 0.25);
+    this.selectionStripesColor = colorUtils.setAlpha("#fff", 0.1);
+    this.headerBackgroundColor = getColor("body-background", theme);
+    this.headerTextColor = getColor("body-color", theme);
+    this.headerTimelineStrokeColor = colorUtils.setAlpha(getColor("body-color-alt", theme), 0.25);
+    this.alternatingBackgroundColor = colorUtils.setAlpha(getColor("body-color", theme), 0.05);
+  }
+});
+
+exports.MarkersOverview = MarkersOverview;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/widgets/tree-view.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/widgets/tree-view.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/widgets/tree-view.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/widgets/tree-view.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,404 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+/**
+ * This file contains the tree view, displaying all the samples and frames
+ * received from the proviler in a tree-like structure.
+ */
+
+const { Cc, Ci, Cu, Cr } = require("chrome");
+const { L10N } = require("devtools/performance/global");
+const { Heritage } = require("resource:///modules/devtools/ViewHelpers.jsm");
+const { AbstractTreeItem } = require("resource:///modules/devtools/AbstractTreeItem.jsm");
+
+const MILLISECOND_UNITS = L10N.getStr("table.ms");
+const PERCENTAGE_UNITS = L10N.getStr("table.percentage");
+const URL_LABEL_TOOLTIP = L10N.getStr("table.url.tooltiptext");
+const CALL_TREE_INDENTATION = 16; // px
+
+const DEFAULT_SORTING_PREDICATE = (frameA, frameB) => {
+  let dataA = frameA.getDisplayedData();
+  let dataB = frameB.getDisplayedData();
+  return this.inverted
+    ? (dataA.selfPercentage < dataB.selfPercentage ? 1 : -1)
+    : (dataA.samples < dataB.samples ? 1 : -1);
+};
+
+const DEFAULT_AUTO_EXPAND_DEPTH = 3; // depth
+const DEFAULT_VISIBLE_CELLS = {
+  duration: true,
+  percentage: true,
+  allocations: false,
+  selfDuration: true,
+  selfPercentage: true,
+  selfAllocations: false,
+  samples: true,
+  function: true
+};
+
+const clamp = (val, min, max) => Math.max(min, Math.min(max, val));
+const sum = vals => vals.reduce((a, b) => a + b, 0);
+
+exports.CallView = CallView;
+
+/**
+ * An item in a call tree view, which looks like this:
+ *
+ *   Time (ms)  |   Cost   | Calls | Function
+ * ============================================================================
+ *     1,000.00 |  100.00% |       | ▼ (root)
+ *       500.12 |   50.01% |   300 |   ▼ foo                          Categ. 1
+ *       300.34 |   30.03% |  1500 |     ▼ bar                        Categ. 2
+ *        10.56 |    0.01% |    42 |       ▶ call_with_children       Categ. 3
+ *        90.78 |    0.09% |    25 |         call_without_children    Categ. 4
+ *
+ * Every instance of a `CallView` represents a row in the call tree. The same
+ * parent node is used for all rows.
+ *
+ * @param CallView caller
+ *        The CallView considered the "caller" frame. This instance will be
+ *        represent the "callee". Should be null for root nodes.
+ * @param ThreadNode | FrameNode frame
+ *        Details about this function, like { samples, duration, calls } etc.
+ * @param number level
+ *        The indentation level in the call tree. The root node is at level 0.
+ * @param boolean hidden [optional]
+ *        Whether this node should be hidden and not contribute to depth/level
+ *        calculations. Defaults to false.
+ * @param boolean inverted [optional]
+ *        Whether the call tree has been inverted (bottom up, rather than
+ *        top-down). Defaults to false.
+ * @param function sortingPredicate [optional]
+ *        The predicate used to sort the tree items when created. Defaults to
+ *        the caller's `sortingPredicate` if a caller exists, otherwise defaults
+ *        to DEFAULT_SORTING_PREDICATE. The two passed arguments are FrameNodes.
+ * @param number autoExpandDepth [optional]
+ *        The depth to which the tree should automatically expand. Defualts to
+ *        the caller's `autoExpandDepth` if a caller exists, otherwise defaults
+ *        to DEFAULT_AUTO_EXPAND_DEPTH.
+ * @param object visibleCells
+ *        An object specifying which cells are visible in the tree. Defaults to
+ *        the caller's `visibleCells` if a caller exists, otherwise defaults
+ *        to DEFAULT_VISIBLE_CELLS.
+ */
+function CallView({
+  caller, frame, level, hidden, inverted,
+  sortingPredicate, autoExpandDepth, visibleCells
+}) {
+  AbstractTreeItem.call(this, {
+    parent: caller,
+    level: level|0 - (hidden ? 1 : 0)
+  });
+
+  this.sortingPredicate = sortingPredicate != null
+    ? sortingPredicate
+    : caller ? caller.sortingPredicate
+             : DEFAULT_SORTING_PREDICATE
+
+  this.autoExpandDepth = autoExpandDepth != null
+    ? autoExpandDepth
+    : caller ? caller.autoExpandDepth
+             : DEFAULT_AUTO_EXPAND_DEPTH;
+
+  this.visibleCells = visibleCells != null
+    ? visibleCells
+    : caller ? caller.visibleCells
+             : Object.create(DEFAULT_VISIBLE_CELLS);
+
+  this.caller = caller;
+  this.frame = frame;
+  this.hidden = hidden;
+  this.inverted = inverted;
+
+  this._onUrlClick = this._onUrlClick.bind(this);
+};
+
+CallView.prototype = Heritage.extend(AbstractTreeItem.prototype, {
+  /**
+   * Creates the view for this tree node.
+   * @param nsIDOMNode document
+   * @param nsIDOMNode arrowNode
+   * @return nsIDOMNode
+   */
+  _displaySelf: function(document, arrowNode) {
+    this.document = document;
+
+    let displayedData = this.getDisplayedData();
+    let frameInfo = this.frame.getInfo();
+
+    if (this.visibleCells.duration) {
+      var durationCell = this._createTimeCell(displayedData.totalDuration);
+    }
+    if (this.visibleCells.selfDuration) {
+      var selfDurationCell = this._createTimeCell(displayedData.selfDuration, true);
+    }
+    if (this.visibleCells.percentage) {
+      var percentageCell = this._createExecutionCell(displayedData.totalPercentage);
+    }
+    if (this.visibleCells.selfPercentage) {
+      var selfPercentageCell = this._createExecutionCell(displayedData.selfPercentage, true);
+    }
+    if (this.visibleCells.allocations) {
+      var allocationsCell = this._createAllocationsCell(displayedData.totalAllocations);
+    }
+    if (this.visibleCells.selfAllocations) {
+      var selfAllocationsCell = this._createAllocationsCell(displayedData.selfAllocations, true);
+    }
+    if (this.visibleCells.samples) {
+      var samplesCell = this._createSamplesCell(displayedData.samples);
+    }
+    if (this.visibleCells.function) {
+      var functionCell = this._createFunctionCell(arrowNode, displayedData.name, frameInfo, this.level);
+    }
+
+    let targetNode = document.createElement("hbox");
+    targetNode.className = "call-tree-item";
+    targetNode.setAttribute("origin", frameInfo.isContent ? "content" : "chrome");
+    targetNode.setAttribute("category", frameInfo.categoryData.abbrev || "");
+    targetNode.setAttribute("tooltiptext", displayedData.tooltiptext);
+
+    if (this.hidden) {
+      targetNode.style.display = "none";
+    }
+    if (this.visibleCells.duration) {
+      targetNode.appendChild(durationCell);
+    }
+    if (this.visibleCells.percentage) {
+      targetNode.appendChild(percentageCell);
+    }
+    if (this.visibleCells.allocations) {
+      targetNode.appendChild(allocationsCell);
+    }
+    if (this.visibleCells.selfDuration) {
+      targetNode.appendChild(selfDurationCell);
+    }
+    if (this.visibleCells.selfPercentage) {
+      targetNode.appendChild(selfPercentageCell);
+    }
+    if (this.visibleCells.selfAllocations) {
+      targetNode.appendChild(selfAllocationsCell);
+    }
+    if (this.visibleCells.samples) {
+      targetNode.appendChild(samplesCell);
+    }
+    if (this.visibleCells.function) {
+      targetNode.appendChild(functionCell);
+    }
+
+    return targetNode;
+  },
+
+  /**
+   * Populates this node in the call tree with the corresponding "callees".
+   * These are defined in the `frame` data source for this call view.
+   * @param array:AbstractTreeItem children
+   */
+  _populateSelf: function(children) {
+    let newLevel = this.level + 1;
+
+    for (let newFrame of this.frame.calls) {
+      children.push(new CallView({
+        caller: this,
+        frame: newFrame,
+        level: newLevel,
+        inverted: this.inverted
+      }));
+    }
+
+    // Sort the "callees" asc. by samples, before inserting them in the tree,
+    // if no other sorting predicate was specified on this on the root item.
+    children.sort(this.sortingPredicate.bind(this));
+  },
+
+  /**
+   * Functions creating each cell in this call view.
+   * Invoked by `_displaySelf`.
+   */
+  _createTimeCell: function(duration, isSelf = false) {
+    let cell = this.document.createElement("label");
+    cell.className = "plain call-tree-cell";
+    cell.setAttribute("type", isSelf ? "self-duration" : "duration");
+    cell.setAttribute("crop", "end");
+    cell.setAttribute("value", L10N.numberWithDecimals(duration, 2) + " " + MILLISECOND_UNITS);
+    return cell;
+  },
+  _createExecutionCell: function(percentage, isSelf = false) {
+    let cell = this.document.createElement("label");
+    cell.className = "plain call-tree-cell";
+    cell.setAttribute("type", isSelf ? "self-percentage" : "percentage");
+    cell.setAttribute("crop", "end");
+    cell.setAttribute("value", L10N.numberWithDecimals(percentage, 2) + PERCENTAGE_UNITS);
+    return cell;
+  },
+  _createAllocationsCell: function(count, isSelf = false) {
+    let cell = this.document.createElement("label");
+    cell.className = "plain call-tree-cell";
+    cell.setAttribute("type", isSelf ? "self-allocations" : "allocations");
+    cell.setAttribute("crop", "end");
+    cell.setAttribute("value", count || 0);
+    return cell;
+  },
+  _createSamplesCell: function(count) {
+    let cell = this.document.createElement("label");
+    cell.className = "plain call-tree-cell";
+    cell.setAttribute("type", "samples");
+    cell.setAttribute("crop", "end");
+    cell.setAttribute("value", count || "");
+    return cell;
+  },
+  _createFunctionCell: function(arrowNode, frameName, frameInfo, frameLevel) {
+    let cell = this.document.createElement("hbox");
+    cell.className = "call-tree-cell";
+    cell.style.MozMarginStart = (frameLevel * CALL_TREE_INDENTATION) + "px";
+    cell.setAttribute("type", "function");
+    cell.appendChild(arrowNode);
+
+    // Don't render a name label node if there's no function name. A different
+    // location label node will be rendered instead.
+    if (frameName) {
+      let nameNode = this.document.createElement("label");
+      nameNode.className = "plain call-tree-name";
+      nameNode.setAttribute("flex", "1");
+      nameNode.setAttribute("crop", "end");
+      nameNode.setAttribute("value", frameName);
+      cell.appendChild(nameNode);
+    }
+
+    // Don't render detailed labels for meta category frames
+    if (!frameInfo.isMetaCategory) {
+      this._appendFunctionDetailsCells(cell, frameInfo);
+    }
+
+    // Don't render an expando-arrow for leaf nodes.
+    let hasDescendants = Object.keys(this.frame.calls).length > 0;
+    if (!hasDescendants) {
+      arrowNode.setAttribute("invisible", "");
+    }
+
+    return cell;
+  },
+  _appendFunctionDetailsCells: function(cell, frameInfo) {
+    if (frameInfo.fileName) {
+      let urlNode = this.document.createElement("label");
+      urlNode.className = "plain call-tree-url";
+      urlNode.setAttribute("flex", "1");
+      urlNode.setAttribute("crop", "end");
+      urlNode.setAttribute("value", frameInfo.fileName);
+      urlNode.setAttribute("tooltiptext", URL_LABEL_TOOLTIP + " → " + frameInfo.url);
+      urlNode.addEventListener("mousedown", this._onUrlClick);
+      cell.appendChild(urlNode);
+    }
+
+    if (frameInfo.line) {
+      let lineNode = this.document.createElement("label");
+      lineNode.className = "plain call-tree-line";
+      lineNode.setAttribute("value", ":" + frameInfo.line);
+      cell.appendChild(lineNode);
+    }
+
+    if (frameInfo.column) {
+      let columnNode = this.document.createElement("label");
+      columnNode.className = "plain call-tree-column";
+      columnNode.setAttribute("value", ":" + frameInfo.column);
+      cell.appendChild(columnNode);
+    }
+
+    if (frameInfo.host) {
+      let hostNode = this.document.createElement("label");
+      hostNode.className = "plain call-tree-host";
+      hostNode.setAttribute("value", frameInfo.host);
+      cell.appendChild(hostNode);
+    }
+
+    let spacerNode = this.document.createElement("spacer");
+    spacerNode.setAttribute("flex", "10000");
+    cell.appendChild(spacerNode);
+
+    if (frameInfo.categoryData.label) {
+      let categoryNode = this.document.createElement("label");
+      categoryNode.className = "plain call-tree-category";
+      categoryNode.style.color = frameInfo.categoryData.color;
+      categoryNode.setAttribute("value", frameInfo.categoryData.label);
+      cell.appendChild(categoryNode);
+    }
+  },
+
+  /**
+   * Gets the data displayed about this tree item, based on the FrameNode
+   * model associated with this view.
+   *
+   * @return object
+   */
+  getDisplayedData: function() {
+    if (this._cachedDisplayedData) {
+      return this._cachedDisplayedData;
+    }
+
+    let data = this._cachedDisplayedData = Object.create(null);
+    let frameInfo = this.frame.getInfo();
+
+    // Self/total duration.
+    if (this.visibleCells.duration) {
+      data.totalDuration = this.frame.duration;
+    }
+    if (this.visibleCells.selfDuration) {
+      data.selfDuration = this.root.frame.selfDuration[this.frame.key];
+    }
+
+    // Self/total samples percentage.
+    if (this.visibleCells.percentage) {
+      data.totalPercentage = this.frame.samples / this.root.frame.samples * 100;
+    }
+    if (this.visibleCells.selfPercentage) {
+      data.selfPercentage = this.root.frame.selfCount[this.frame.key] / this.root.frame.samples * 100;
+    }
+
+    // Self/total allocations count.
+    if (this.visibleCells.allocations) {
+      let childrenAllocations = this.frame.calls.reduce((acc, node) => acc + node.allocations, 0);
+      data.totalAllocations = this.frame.allocations + childrenAllocations;
+    }
+    if (this.visibleCells.selfAllocations) {
+      data.selfAllocations = this.frame.allocations;
+    }
+
+    // Raw samples.
+    if (this.visibleCells.samples) {
+      data.samples = this.frame.samples;
+    }
+
+    // Frame name (function location or some meta information).
+    data.name = frameInfo.isMetaCategory
+      ? frameInfo.categoryData.label
+      : frameInfo.functionName || "";
+
+    data.tooltiptext = frameInfo.isMetaCategory
+      ? frameInfo.categoryData.label
+      : this.frame.location || "";
+
+    return this._cachedDisplayedData;
+  },
+
+  /**
+   * Toggles the category information hidden or visible.
+   * @param boolean visible
+   */
+  toggleCategories: function(visible) {
+    if (!visible) {
+      this.container.setAttribute("categories-hidden", "");
+    } else {
+      this.container.removeAttribute("categories-hidden");
+    }
+  },
+
+  /**
+   * Handler for the "click" event on the url node of this call view.
+   */
+  _onUrlClick: function(e) {
+    e.preventDefault();
+    e.stopPropagation();
+    this.root.emit("link", this);
+  }
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/widgets/waterfall.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/widgets/waterfall.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/modules/widgets/waterfall.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/modules/widgets/waterfall.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,620 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+/**
+ * This file contains the "waterfall" view, essentially a detailed list
+ * of all the markers in the timeline data.
+ */
+
+const { Cc, Ci, Cu, Cr } = require("chrome");
+
+loader.lazyRequireGetter(this, "promise");
+loader.lazyRequireGetter(this, "EventEmitter",
+  "devtools/toolkit/event-emitter");
+
+loader.lazyRequireGetter(this, "L10N",
+  "devtools/performance/global", true);
+loader.lazyRequireGetter(this, "MarkerUtils",
+  "devtools/performance/marker-utils");
+
+loader.lazyImporter(this, "setNamedTimeout",
+  "resource:///modules/devtools/ViewHelpers.jsm");
+loader.lazyImporter(this, "clearNamedTimeout",
+  "resource:///modules/devtools/ViewHelpers.jsm");
+
+const HTML_NS = "http://www.w3.org/1999/xhtml";
+
+const WATERFALL_SIDEBAR_WIDTH = 200; // px
+
+const WATERFALL_IMMEDIATE_DRAW_MARKERS_COUNT = 30;
+const WATERFALL_FLUSH_OUTSTANDING_MARKERS_DELAY = 75; // ms
+
+const FIND_OPTIMAL_TICK_INTERVAL_MAX_ITERS = 100;
+const WATERFALL_HEADER_TICKS_MULTIPLE = 5; // ms
+const WATERFALL_HEADER_TICKS_SPACING_MIN = 50; // px
+const WATERFALL_HEADER_TEXT_PADDING = 3; // px
+
+const WATERFALL_BACKGROUND_TICKS_MULTIPLE = 5; // ms
+const WATERFALL_BACKGROUND_TICKS_SCALES = 3;
+const WATERFALL_BACKGROUND_TICKS_SPACING_MIN = 10; // px
+const WATERFALL_BACKGROUND_TICKS_COLOR_RGB = [128, 136, 144];
+const WATERFALL_BACKGROUND_TICKS_OPACITY_MIN = 32; // byte
+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.
+ *
+ * @param nsIDOMNode parent
+ *        The parent node holding the waterfall.
+ * @param nsIDOMNode container
+ *        The container node that key events should be bound to.
+ * @param Object blueprint
+ *        List of names and colors defining markers.
+ */
+function Waterfall(parent, container, blueprint) {
+  EventEmitter.decorate(this);
+
+  this._parent = parent;
+  this._document = parent.ownerDocument;
+  this._container = container;
+  this._fragment = this._document.createDocumentFragment();
+  this._outstandingMarkers = [];
+
+  this._headerContents = this._document.createElement("hbox");
+  this._headerContents.className = "waterfall-header-contents";
+  this._parent.appendChild(this._headerContents);
+
+  this._listContents = this._document.createElement("vbox");
+  this._listContents.className = "waterfall-list-contents";
+  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.
+  this._l10n = L10N;
+  this._blueprint = blueprint;
+  this._setNamedTimeout = setNamedTimeout;
+  this._clearNamedTimeout = clearNamedTimeout;
+
+  // Selected row index. By default, we want the first
+  // row to be selected.
+  this._selectedRowIdx = 0;
+
+  // Default rowCount
+  this.rowCount = WATERFALL_ROWCOUNT_ONPAGEUPDOWN;
+}
+
+Waterfall.prototype = {
+  /**
+   * Removes any node references from this view.
+   */
+  destroy: function() {
+    this._parent = this._document = this._container = null;
+  },
+
+  /**
+   * Populates this view with the provided data source.
+   *
+   * @param object data
+   *        An object containing the following properties:
+   *          - markers: a list of markers received from the controller
+   *          - interval: the { startTime, endTime }, in milliseconds
+   */
+  setData: function({ markers, interval }) {
+    this.clearView();
+    this._markers = markers;
+    this._interval = interval;
+
+    let { startTime, endTime } = interval;
+    let dataScale = this._waterfallWidth / (endTime - startTime);
+    this._drawWaterfallBackground(dataScale);
+
+    this._buildHeader(this._headerContents, startTime, dataScale);
+    this._buildMarkers(this._listContents, markers, startTime, endTime, dataScale);
+    this.selectRow(this._selectedRowIdx);
+  },
+
+  /**
+   * List of names and colors used to paint markers.
+   * @see TIMELINE_BLUEPRINT in timeline/widgets/global.js
+   */
+  setBlueprint: function(blueprint) {
+    this._blueprint = blueprint;
+  },
+
+  /**
+   * Keybindings.
+   */
+  setupKeys: function() {
+    let pane = this._container;
+    pane.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 - this.rowCount);
+      }
+      if (e.keyCode === Ci.nsIDOMKeyEvent.DOM_VK_PAGE_DOWN) {
+        e.preventDefault();
+        this.selectNearestRow(this._selectedRowIdx + this.rowCount);
+      }
+    }, true);
+  },
+
+  /**
+   * Depopulates this view.
+   */
+  clearView: function() {
+    while (this._headerContents.hasChildNodes()) {
+      this._headerContents.firstChild.remove();
+    }
+    while (this._listContents.hasChildNodes()) {
+      this._listContents.firstChild.remove();
+    }
+    this._listContents.scrollTop = 0;
+    this._outstandingMarkers.length = 0;
+    this._clearNamedTimeout("flush-outstanding-markers");
+  },
+
+  /**
+   * Calculates and stores the available width for the waterfall.
+   * This should be invoked every time the container window is resized.
+   */
+  recalculateBounds: function() {
+    let bounds = this._parent.getBoundingClientRect();
+    this._waterfallWidth = bounds.width - WATERFALL_SIDEBAR_WIDTH;
+  },
+
+  /**
+   * Creates the header part of this view.
+   *
+   * @param nsIDOMNode parent
+   *        The parent node holding the header.
+   * @param number startTime
+   *        @see Waterfall.prototype.setData
+   * @param number dataScale
+   *        The time scale of the data source.
+   */
+  _buildHeader: function(parent, startTime, dataScale) {
+    let container = this._document.createElement("hbox");
+    container.className = "waterfall-header-container";
+    container.setAttribute("flex", "1");
+
+    let sidebar = this._document.createElement("hbox");
+    sidebar.className = "waterfall-sidebar theme-sidebar";
+    sidebar.setAttribute("width", WATERFALL_SIDEBAR_WIDTH);
+    sidebar.setAttribute("align", "center");
+    container.appendChild(sidebar);
+
+    let name = this._document.createElement("label");
+    name.className = "plain waterfall-header-name";
+    name.setAttribute("value", this._l10n.getStr("timeline.records"));
+    sidebar.appendChild(name);
+
+    let ticks = this._document.createElement("hbox");
+    ticks.className = "waterfall-header-ticks waterfall-background-ticks";
+    ticks.setAttribute("align", "center");
+    ticks.setAttribute("flex", "1");
+    container.appendChild(ticks);
+
+    let offset = this._isRTL ? this._waterfallWidth : 0;
+    let direction = this._isRTL ? -1 : 1;
+    let tickInterval = this._findOptimalTickInterval({
+      ticksMultiple: WATERFALL_HEADER_TICKS_MULTIPLE,
+      ticksSpacingMin: WATERFALL_HEADER_TICKS_SPACING_MIN,
+      dataScale: dataScale
+    });
+
+    for (let x = 0; x < this._waterfallWidth; x += tickInterval) {
+      let left = x + direction * WATERFALL_HEADER_TEXT_PADDING;
+      let time = Math.round(x / dataScale + startTime);
+      let label = this._l10n.getFormatStr("timeline.tick", time);
+
+      let node = this._document.createElement("label");
+      node.className = "plain waterfall-header-tick";
+      node.style.transform = "translateX(" + (left - offset) + "px)";
+      node.setAttribute("value", label);
+      ticks.appendChild(node);
+    }
+
+    parent.appendChild(container);
+  },
+
+  /**
+   * Creates the markers part of this view.
+   *
+   * @param nsIDOMNode parent
+   *        The parent node holding the markers.
+   * @param number startTime
+   *        @see Waterfall.prototype.setData
+   * @param number dataScale
+   *        The time scale of the data source.
+   */
+  _buildMarkers: function(parent, markers, startTime, endTime, dataScale) {
+    let rowsCount = 0;
+    let markerIdx = -1;
+
+    for (let marker of markers) {
+      markerIdx++;
+
+      if (!isMarkerInRange(marker, startTime, endTime)) {
+        continue;
+      }
+      if (!(marker.name in this._blueprint)) {
+        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, startTime, dataScale, markerIdx, rowsCount];
+      if (rowsCount++ < WATERFALL_IMMEDIATE_DRAW_MARKERS_COUNT) {
+        this._buildMarker.apply(this, arguments_);
+      } else {
+        this._outstandingMarkers.push(arguments_);
+      }
+    }
+
+    // If there are no outstanding markers, add a dummy "spacer" at the end
+    // to fill up any remaining available space in the UI.
+    if (!this._outstandingMarkers.length) {
+      this._buildMarker(this._fragment, null);
+    }
+    // Otherwise prepare flushing the outstanding markers after a small delay.
+    else {
+      let delay = WATERFALL_FLUSH_OUTSTANDING_MARKERS_DELAY;
+      let func = () => this._buildOutstandingMarkers(parent);
+      this._setNamedTimeout("flush-outstanding-markers", delay, func);
+    }
+
+    parent.appendChild(this._fragment);
+  },
+
+  /**
+   * Finishes building the outstanding markers in this view.
+   * @see Waterfall.prototype._buildMarkers
+   */
+  _buildOutstandingMarkers: function(parent) {
+    if (!this._outstandingMarkers.length) {
+      return;
+    }
+    for (let args of this._outstandingMarkers) {
+      this._buildMarker.apply(this, args);
+    }
+    this._outstandingMarkers.length = 0;
+    parent.appendChild(this._fragment);
+    this.selectRow(this._selectedRowIdx);
+  },
+
+  /**
+   * Creates a single marker in this view.
+   *
+   * @param nsIDOMNode parent
+   *        The parent node holding the marker.
+   * @param object marker
+   *        The { name, start, end } marker in the data source.
+   * @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, 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, startTime, dataScale, markerIdx);
+      container.onclick = () => this.selectRow(rowIdx);
+    } else {
+      this._buildMarkerSpacer(container);
+      container.setAttribute("flex", "1");
+      container.setAttribute("is-spacer", "");
+    }
+
+    parent.appendChild(container);
+  },
+
+  /**
+   * 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) {
+    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
+   *        The container node representing the marker in this view.
+   * @param object marker
+   *        @see Waterfall.prototype._buildMarker
+   */
+  _buildMarkerSidebar: function(container, marker) {
+    let blueprint = this._blueprint[marker.name];
+
+    let sidebar = this._document.createElement("hbox");
+    sidebar.className = "waterfall-sidebar theme-sidebar";
+    sidebar.setAttribute("width", WATERFALL_SIDEBAR_WIDTH);
+    sidebar.setAttribute("align", "center");
+
+    let bullet = this._document.createElement("hbox");
+    bullet.className = `waterfall-marker-bullet marker-color-${blueprint.colorName}`;
+    bullet.setAttribute("type", marker.name);
+    sidebar.appendChild(bullet);
+
+    let name = this._document.createElement("label");
+    name.setAttribute("crop", "end");
+    name.setAttribute("flex", "1");
+    name.className = "plain waterfall-marker-name";
+
+    let label = MarkerUtils.getMarkerLabel(marker);
+    name.setAttribute("value", label);
+    name.setAttribute("tooltiptext", label);
+    sidebar.appendChild(name);
+
+    container.appendChild(sidebar);
+  },
+
+  /**
+   * Creates the waterfall part of a marker in this view.
+   *
+   * @param nsIDOMNode container
+   *        The container node representing the marker.
+   * @param object marker
+   *        @see Waterfall.prototype._buildMarker
+   * @param startTime
+   *        @see Waterfall.prototype.setData
+   * @param number dataScale
+   *        @see Waterfall.prototype._buildMarkers
+   */
+  _buildMarkerWaterfall: function(container, marker, startTime, dataScale) {
+    let blueprint = this._blueprint[marker.name];
+
+    let waterfall = this._document.createElement("hbox");
+    waterfall.className = "waterfall-marker-item waterfall-background-ticks";
+    waterfall.setAttribute("align", "center");
+    waterfall.setAttribute("flex", "1");
+
+    let start = (marker.start - startTime) * dataScale;
+    let width = (marker.end - marker.start) * dataScale;
+    let offset = this._isRTL ? this._waterfallWidth : 0;
+
+    let bar = this._document.createElement("hbox");
+    bar.className = `waterfall-marker-bar marker-color-${blueprint.colorName}`;
+    bar.style.transform = "translateX(" + (start - offset) + "px)";
+    bar.setAttribute("type", marker.name);
+    bar.setAttribute("width", Math.max(width, WATERFALL_MARKER_BAR_WIDTH_MIN));
+    waterfall.appendChild(bar);
+
+    container.appendChild(waterfall);
+  },
+
+  /**
+   * Creates a dummy spacer as an empty marker.
+   *
+   * @param nsIDOMNode container
+   *        The container node representing the marker.
+   */
+  _buildMarkerSpacer: function(container) {
+    let sidebarSpacer = this._document.createElement("spacer");
+    sidebarSpacer.className = "waterfall-sidebar theme-sidebar";
+    sidebarSpacer.setAttribute("width", WATERFALL_SIDEBAR_WIDTH);
+
+    let waterfallSpacer = this._document.createElement("spacer");
+    waterfallSpacer.className = "waterfall-marker-item waterfall-background-ticks";
+    waterfallSpacer.setAttribute("flex", "1");
+
+    container.appendChild(sidebarSpacer);
+    container.appendChild(waterfallSpacer);
+  },
+
+  /**
+   * Creates the background displayed on the marker's waterfall.
+   *
+   * @param number dataScale
+   *        @see Waterfall.prototype._buildMarkers
+   */
+  _drawWaterfallBackground: function(dataScale) {
+    if (!this._canvas || !this._ctx) {
+      this._canvas = this._document.createElementNS(HTML_NS, "canvas");
+      this._ctx = this._canvas.getContext("2d");
+    }
+    let canvas = this._canvas;
+    let ctx = this._ctx;
+
+    // Nuke the context.
+    let canvasWidth = canvas.width = this._waterfallWidth;
+    let canvasHeight = canvas.height = 1; // Awww yeah, 1px, repeats on Y axis.
+
+    // Start over.
+    let imageData = ctx.createImageData(canvasWidth, canvasHeight);
+    let pixelArray = imageData.data;
+
+    let buf = new ArrayBuffer(pixelArray.length);
+    let view8bit = new Uint8ClampedArray(buf);
+    let view32bit = new Uint32Array(buf);
+
+    // Build new millisecond tick lines...
+    let [r, g, b] = WATERFALL_BACKGROUND_TICKS_COLOR_RGB;
+    let alphaComponent = WATERFALL_BACKGROUND_TICKS_OPACITY_MIN;
+    let tickInterval = this._findOptimalTickInterval({
+      ticksMultiple: WATERFALL_BACKGROUND_TICKS_MULTIPLE,
+      ticksSpacingMin: WATERFALL_BACKGROUND_TICKS_SPACING_MIN,
+      dataScale: dataScale
+    });
+
+    // Insert one pixel for each division on each scale.
+    for (let i = 1; i <= WATERFALL_BACKGROUND_TICKS_SCALES; i++) {
+      let increment = tickInterval * Math.pow(2, i);
+      for (let x = 0; x < canvasWidth; x += increment) {
+        let position = x | 0;
+        view32bit[position] = (alphaComponent << 24) | (b << 16) | (g << 8) | r;
+      }
+      alphaComponent += WATERFALL_BACKGROUND_TICKS_OPACITY_ADD;
+    }
+
+    // Flush the image data and cache the waterfall background.
+    pixelArray.set(view8bit);
+    ctx.putImageData(imageData, 0, 0);
+    this._document.mozSetImageElement("waterfall-background", canvas);
+  },
+
+  /**
+   * Finds the optimal tick interval between time markers in this timeline.
+   *
+   * @param number ticksMultiple
+   * @param number ticksSpacingMin
+   * @param number dataScale
+   * @return number
+   */
+  _findOptimalTickInterval: function({ ticksMultiple, ticksSpacingMin, dataScale }) {
+    let timingStep = ticksMultiple;
+    let maxIters = FIND_OPTIMAL_TICK_INTERVAL_MAX_ITERS;
+    let numIters = 0;
+
+    if (dataScale > ticksSpacingMin) {
+      return dataScale;
+    }
+
+    while (true) {
+      let scaledStep = dataScale * timingStep;
+      if (++numIters > maxIters) {
+        return scaledStep;
+      }
+      if (scaledStep < ticksSpacingMin) {
+        timingStep <<= 1;
+        continue;
+      }
+      return scaledStep;
+    }
+  },
+
+  /**
+   * Returns true if this is document is in RTL mode.
+   * @return boolean
+   */
+  _getRTL: function() {
+    let win = this._document.defaultView;
+    let doc = this._document.documentElement;
+    return win.getComputedStyle(doc, null).direction == "rtl";
+  }
+};
+
+/**
+ * Checks if a given marker is in the specified time range.
+ *
+ * @param object e
+ *        The marker containing the { start, end } timestamps.
+ * @param number start
+ *        The earliest allowed time.
+ * @param number end
+ *        The latest allowed time.
+ * @return boolean
+ *         True if the marker fits inside the specified time range.
+ */
+function isMarkerInRange(e, start, end) {
+  return (e.start >= start && e.end <= end) || // bounds inside
+         (e.start < start && e.end > end) || // bounds outside
+         (e.start < start && e.end >= start && e.end <= end) || // overlap start
+         (e.end > end && e.start >= start && e.start <= end); // overlap end
+}
+
+exports.Waterfall = Waterfall;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/moz.build firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/moz.build	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/moz.build	2015-05-25 20:42:55.000000000 +0000
@@ -4,13 +4,22 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXTRA_JS_MODULES.devtools.performance += [
-    'modules/actors.js',
-    'modules/compatibility.js',
-    'modules/front.js',
-    'modules/graphs.js',
-    'modules/io.js',
-    'modules/recording-model.js',
-    'modules/recording-utils.js',
+    'modules/global.js',
+    'modules/logic/actors.js',
+    'modules/logic/compatibility.js',
+    'modules/logic/frame-utils.js',
+    'modules/logic/front.js',
+    'modules/logic/io.js',
+    'modules/logic/jit.js',
+    'modules/logic/marker-utils.js',
+    'modules/logic/recording-model.js',
+    'modules/logic/recording-utils.js',
+    'modules/logic/tree-model.js',
+    'modules/widgets/graphs.js',
+    'modules/widgets/marker-details.js',
+    'modules/widgets/markers-overview.js',
+    'modules/widgets/tree-view.js',
+    'modules/widgets/waterfall.js',
     'panel.js'
 ]
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/panel.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/panel.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/panel.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/panel.js	2015-05-25 20:42:55.000000000 +0000
@@ -5,14 +5,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const {Cc, Ci, Cu, Cr} = require("chrome");
-const { PerformanceFront } = require("devtools/performance/front");
-
-Cu.import("resource://gre/modules/Task.jsm");
+const { Cc, Ci, Cu, Cr } = require("chrome");
+const { Task } = require("resource://gre/modules/Task.jsm");
 
 loader.lazyRequireGetter(this, "promise");
 loader.lazyRequireGetter(this, "EventEmitter",
   "devtools/toolkit/event-emitter");
+loader.lazyRequireGetter(this, "PerformanceFront",
+  "devtools/performance/front", true);
 
 function PerformancePanel(iframeWindow, toolbox) {
   this.panelWin = iframeWindow;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/performance-controller.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/performance-controller.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/performance-controller.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/performance-controller.js	2015-05-25 20:42:55.000000000 +0000
@@ -3,54 +3,61 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
+const { Task } = require("resource://gre/modules/Task.jsm");
+const { Heritage, ViewHelpers, WidgetMethods } = require("resource:///modules/devtools/ViewHelpers.jsm");
 
-Cu.import("resource://gre/modules/Task.jsm");
-Cu.import("resource://gre/modules/devtools/Loader.jsm");
-Cu.import("resource://gre/modules/devtools/Console.jsm");
-Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
-
-devtools.lazyRequireGetter(this, "Services");
-devtools.lazyRequireGetter(this, "promise");
-devtools.lazyRequireGetter(this, "EventEmitter",
+loader.lazyRequireGetter(this, "Services");
+loader.lazyRequireGetter(this, "promise");
+loader.lazyRequireGetter(this, "EventEmitter",
   "devtools/toolkit/event-emitter");
-devtools.lazyRequireGetter(this, "DevToolsUtils",
+loader.lazyRequireGetter(this, "DevToolsUtils",
   "devtools/toolkit/DevToolsUtils");
 
-devtools.lazyRequireGetter(this, "TreeWidget",
-  "devtools/shared/widgets/TreeWidget", true);
-devtools.lazyRequireGetter(this, "TIMELINE_BLUEPRINT",
-  "devtools/shared/timeline/global", true);
-devtools.lazyRequireGetter(this, "L10N",
-  "devtools/shared/profiler/global", true);
-devtools.lazyRequireGetter(this, "RecordingUtils",
+// Logic modules
+
+loader.lazyRequireGetter(this, "L10N",
+  "devtools/performance/global", true);
+loader.lazyRequireGetter(this, "TIMELINE_BLUEPRINT",
+  "devtools/performance/global", true);
+loader.lazyRequireGetter(this, "RecordingUtils",
   "devtools/performance/recording-utils", true);
-devtools.lazyRequireGetter(this, "RecordingModel",
+loader.lazyRequireGetter(this, "RecordingModel",
   "devtools/performance/recording-model", true);
-devtools.lazyRequireGetter(this, "GraphsController",
+loader.lazyRequireGetter(this, "GraphsController",
   "devtools/performance/graphs", true);
-devtools.lazyRequireGetter(this, "Waterfall",
-  "devtools/shared/timeline/waterfall", true);
-devtools.lazyRequireGetter(this, "MarkerDetails",
-  "devtools/shared/timeline/marker-details", true);
-devtools.lazyRequireGetter(this, "CallView",
-  "devtools/shared/profiler/tree-view", true);
-devtools.lazyRequireGetter(this, "ThreadNode",
-  "devtools/shared/profiler/tree-model", true);
-devtools.lazyRequireGetter(this, "FrameNode",
-  "devtools/shared/profiler/tree-model", true);
-devtools.lazyRequireGetter(this, "JITOptimizations",
-  "devtools/shared/profiler/jit", true);
-devtools.lazyRequireGetter(this, "OptionsView",
+loader.lazyRequireGetter(this, "Waterfall",
+  "devtools/performance/waterfall", true);
+loader.lazyRequireGetter(this, "MarkerDetails",
+  "devtools/performance/marker-details", true);
+loader.lazyRequireGetter(this, "MarkerUtils",
+  "devtools/performance/marker-utils");
+loader.lazyRequireGetter(this, "CallView",
+  "devtools/performance/tree-view", true);
+loader.lazyRequireGetter(this, "ThreadNode",
+  "devtools/performance/tree-model", true);
+loader.lazyRequireGetter(this, "FrameNode",
+  "devtools/performance/tree-model", true);
+loader.lazyRequireGetter(this, "JITOptimizations",
+  "devtools/performance/jit", true);
+
+// Widgets modules
+
+loader.lazyRequireGetter(this, "OptionsView",
   "devtools/shared/options-view", true);
-devtools.lazyRequireGetter(this, "FlameGraphUtils",
+loader.lazyRequireGetter(this, "FlameGraphUtils",
   "devtools/shared/widgets/FlameGraph", true);
-devtools.lazyRequireGetter(this, "FlameGraph",
+loader.lazyRequireGetter(this, "FlameGraph",
   "devtools/shared/widgets/FlameGraph", true);
+loader.lazyRequireGetter(this, "TreeWidget",
+  "devtools/shared/widgets/TreeWidget", true);
 
-devtools.lazyImporter(this, "SideMenuWidget",
+loader.lazyImporter(this, "SideMenuWidget",
   "resource:///modules/devtools/SideMenuWidget.jsm");
-devtools.lazyImporter(this, "PluralForm",
+loader.lazyImporter(this, "setNamedTimeout",
+  "resource:///modules/devtools/ViewHelpers.jsm");
+loader.lazyImporter(this, "clearNamedTimeout",
+  "resource:///modules/devtools/ViewHelpers.jsm");
+loader.lazyImporter(this, "PluralForm",
   "resource://gre/modules/PluralForm.jsm");
 
 const BRANCH_NAME = "devtools.performance.ui.";
@@ -191,19 +198,12 @@
     this._onRecordingStateChange = this._onRecordingStateChange.bind(this);
     this._onProfilerStatusUpdated = this._onProfilerStatusUpdated.bind(this);
 
-    // All boolean prefs should be handled via the OptionsView in the
-    // ToolbarView, so that they may be accessible via the "gear" menu.
-    // Every other pref should be registered here.
-    this._nonBooleanPrefs = new ViewHelpers.Prefs("devtools.performance", {
-      "hidden-markers": ["Json", "timeline.hidden-markers"],
-      "memory-sample-probability": ["Float", "memory.sample-probability"],
-      "memory-max-log-length": ["Int", "memory.max-log-length"],
-      "profiler-buffer-size": ["Int", "profiler.buffer-size"],
-      "profiler-sample-frequency": ["Int", "profiler.sample-frequency-khz"],
-    });
+    // Store data regarding if e10s is enabled.
+    this._e10s = Services.appinfo.browserTabsRemoteAutostart;
+    this._setMultiprocessAttributes();
 
-    this._nonBooleanPrefs.registerObserver();
-    this._nonBooleanPrefs.on("pref-changed", this._onPrefChanged);
+    this._prefs = require("devtools/performance/global").PREFS;
+    this._prefs.on("pref-changed", this._onPrefChanged);
 
     gFront.on("recording-starting", this._onRecordingStateChange);
     gFront.on("recording-started", this._onRecordingStateChange);
@@ -225,14 +225,13 @@
    * Remove events handled by the PerformanceController
    */
   destroy: function() {
-    this._nonBooleanPrefs.unregisterObserver();
-    this._nonBooleanPrefs.off("pref-changed", this._onPrefChanged);
+    this._prefs.off("pref-changed", this._onPrefChanged);
 
     gFront.off("recording-starting", this._onRecordingStateChange);
     gFront.off("recording-started", this._onRecordingStateChange);
     gFront.off("recording-stopping", this._onRecordingStateChange);
     gFront.off("recording-stopped", this._onRecordingStateChange);
-    gFront.on("profiler-status", this._onProfilerStatusUpdated);
+    gFront.off("profiler-status", this._onProfilerStatusUpdated);
     ToolbarView.off(EVENTS.PREF_CHANGED, this._onPrefChanged);
     PerformanceView.off(EVENTS.UI_START_RECORDING, this.startRecording);
     PerformanceView.off(EVENTS.UI_STOP_RECORDING, this.stopRecording);
@@ -253,7 +252,8 @@
 
   /**
    * Get a boolean preference setting from `prefName` via the underlying
-   * OptionsView in the ToolbarView.
+   * OptionsView in the ToolbarView. This preference is guaranteed to be
+   * displayed in the UI.
    *
    * @param string prefName
    * @return boolean
@@ -263,21 +263,25 @@
   },
 
   /**
-   * Get a preference setting from `prefName`.
+   * Get a preference setting from `prefName`. This preference can be of
+   * any type and might not be displayed in the UI.
+   *
    * @param string prefName
-   * @return object
+   * @return any
    */
   getPref: function (prefName) {
-    return this._nonBooleanPrefs[prefName];
+    return this._prefs[prefName];
   },
 
   /**
-   * Set a preference setting from `prefName`.
+   * Set a preference setting from `prefName`. This preference can be of
+   * any type and might not be displayed in the UI.
+   *
    * @param string prefName
-   * @param object prefValue
+   * @param any prefValue
    */
   setPref: function (prefName, prefValue) {
-    this._nonBooleanPrefs[prefName] = prefValue;
+    this._prefs[prefName] = prefValue;
   },
 
   /**
@@ -285,16 +289,11 @@
    * when the front has started to record.
    */
   startRecording: Task.async(function *() {
-    // Store retro-mode here so we can easily list true/false
-    // values for reverting.
-    // TODO bug 1160313
-    let superMode = !this.getOption("retro-mode");
-
     let options = {
-      withMarkers: superMode ? true : false,
-      withMemory: superMode ? this.getOption("enable-memory") : false,
+      withMarkers: true,
+      withMemory: this.getOption("enable-memory"),
       withTicks: this.getOption("enable-framerate"),
-      withAllocations: superMode ? this.getOption("enable-memory") : false,
+      withAllocations: this.getOption("enable-memory"),
       allocationsSampleProbability: this.getPref("memory-sample-probability"),
       allocationsMaxLogLength: this.getPref("memory-max-log-length"),
       bufferSize: this.getPref("profiler-buffer-size"),
@@ -310,7 +309,6 @@
    */
   stopRecording: Task.async(function *() {
     let recording = this.getLatestManualRecording();
-
     yield gFront.stopRecording(recording);
   }),
 
@@ -334,7 +332,6 @@
    */
   clearRecordings: Task.async(function* () {
     let latest = this.getLatestManualRecording();
-
     if (latest && latest.isRecording()) {
       yield this.stopRecording();
     }
@@ -452,6 +449,11 @@
    * @param {RecordingModel} model
    */
   _onRecordingStateChange: function (state, model) {
+    // If we get a state change for a recording that isn't being tracked in the front,
+    // just ignore it. This can occur when stopping a profile via console that was cleared.
+    if (state !== "recording-starting" && this.getRecordings().indexOf(model) === -1) {
+      return;
+    }
     switch (state) {
       // Fired when a RecordingModel was just created from the front
       case "recording-starting":
@@ -518,6 +520,44 @@
     return true;
   },
 
+  /**
+   * Returns an object with `supported` and `enabled` properties indicating
+   * whether or not the platform is capable of turning on e10s and whether or not
+   * it's already enabled, respectively.
+   *
+   * @return {object}
+   */
+  getMultiprocessStatus: function () {
+    // If testing, set both supported and enabled to true so we
+    // have realtime rendering tests in non-e10s. This function is
+    // overridden wholesale in tests when we want to test multiprocess support
+    // specifically.
+    if (gDevTools.testing) {
+      return { supported: true, enabled: true };
+    }
+    let supported = SYSTEM.MULTIPROCESS_SUPPORTED;
+    // This is only checked on tool startup -- requires a restart if
+    // e10s subsequently enabled.
+    let enabled = this._e10s;
+    return { supported, enabled };
+  },
+
+  /**
+   * Called on init, sets an `e10s` attribute on the main view container with
+   * "disabled" if e10s is possible on the platform and just not on, or "unsupported"
+   * if e10s is not possible on the platform. If e10s is on, no attribute is set.
+   */
+  _setMultiprocessAttributes: function () {
+    let { enabled, supported } = this.getMultiprocessStatus();
+    if (!enabled && supported) {
+      $("#performance-view").setAttribute("e10s", "disabled");
+    }
+    // Could be a chance where the directive goes away yet e10s is still on
+    else if (!enabled && !supported) {
+      $("#performance-view").setAttribute("e10s", "unsupported");
+    }
+  },
+
   toString: () => "[object PerformanceController]"
 };
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/performance-view.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/performance-view.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/performance-view.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/performance-view.js	2015-05-25 20:42:55.000000000 +0000
@@ -9,6 +9,7 @@
 let PerformanceView = {
 
   _state: null,
+
   // Set to true if the front emits a "buffer-status" event, indicating
   // that the server has support for determining buffer status.
   _bufferStatusSupported: false,
@@ -30,6 +31,10 @@
     recorded: [
       { deck: "#performance-view", pane: "#performance-view-content" },
       { deck: "#details-pane-container", pane: "#details-pane" }
+    ],
+    loading: [
+      { deck: "#performance-view", pane: "#performance-view-content" },
+      { deck: "#details-pane-container", pane: "#loading-notice" }
     ]
   },
 
@@ -50,6 +55,7 @@
     this._onRecordingStopped = this._onRecordingStopped.bind(this);
     this._onRecordingStarted = this._onRecordingStarted.bind(this);
     this._onProfilerStatusUpdated = this._onProfilerStatusUpdated.bind(this);
+    this._onRecordingWillStop = this._onRecordingWillStop.bind(this);
 
     for (let button of $$(".record-button")) {
       button.addEventListener("click", this._onRecordButtonClick);
@@ -62,6 +68,7 @@
     PerformanceController.on(EVENTS.RECORDING_STOPPED, this._onRecordingStopped);
     PerformanceController.on(EVENTS.RECORDING_SELECTED, this._onRecordingSelected);
     PerformanceController.on(EVENTS.PROFILER_STATUS_UPDATED, this._onProfilerStatusUpdated);
+    PerformanceController.on(EVENTS.RECORDING_WILL_STOP, this._onRecordingWillStop);
 
     this.setState("empty");
 
@@ -87,6 +94,7 @@
     PerformanceController.off(EVENTS.RECORDING_STOPPED, this._onRecordingStopped);
     PerformanceController.off(EVENTS.RECORDING_SELECTED, this._onRecordingSelected);
     PerformanceController.off(EVENTS.PROFILER_STATUS_UPDATED, this._onProfilerStatusUpdated);
+    PerformanceController.off(EVENTS.RECORDING_WILL_STOP, this._onRecordingWillStop);
 
     yield ToolbarView.destroy();
     yield RecordingsView.destroy();
@@ -164,7 +172,7 @@
       $container.setAttribute("buffer-status", "in-progress");
     }
 
-    $bufferLabel.value = L10N.getFormatStr("profiler.bufferStatus", percent);
+    $bufferLabel.value = `Buffer ${percent}% full`;
     this.emit(EVENTS.UI_BUFFER_UPDATED, percent);
   },
 
@@ -219,6 +227,17 @@
   },
 
   /**
+   * Fired when a recording is stopping, but not yet completed
+   */
+  _onRecordingWillStop: function (_, recording) {
+    // Lock the details view while the recording is being loaded in the UI.
+    // Only do this if this is the current recording.
+    if (recording === PerformanceController.getCurrentRecording()) {
+      this.setState("loading");
+    }
+  },
+
+  /**
    * Handler for clicking the clear button.
    */
   _onClearButtonClick: function (e) {
@@ -249,7 +268,8 @@
    */
   _onImportButtonClick: function(e) {
     let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
-    fp.init(window, L10N.getStr("recordingsList.saveDialogTitle"), Ci.nsIFilePicker.modeOpen);
+    // TODO localize? in bug 1163763
+    fp.init(window, "Import recording…", Ci.nsIFilePicker.modeOpen);
     fp.appendFilter(L10N.getStr("recordingsList.saveDialogJSONFilter"), "*.json");
     fp.appendFilter(L10N.getStr("recordingsList.saveDialogAllFilter"), "*.*");
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/performance.xul firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/performance.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/performance.xul	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/performance.xul	2015-05-25 20:42:55.000000000 +0000
@@ -14,9 +14,9 @@
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script src="chrome://browser/content/devtools/theme-switching.js"/>
+  <script type="application/javascript" src="performance/system.js"/>
   <script type="application/javascript" src="performance/performance-controller.js"/>
   <script type="application/javascript" src="performance/performance-view.js"/>
-  <script type="application/javascript" src="performance/recording-model.js"/>
   <script type="application/javascript" src="performance/views/overview.js"/>
   <script type="application/javascript" src="performance/views/toolbar.js"/>
   <script type="application/javascript" src="performance/views/details-subview.js"/>
@@ -37,12 +37,12 @@
                 data-pref="show-platform-data"
                 label="&profilerUI.showPlatformData;"
                 tooltiptext="&profilerUI.showPlatformData.tooltiptext;"/>
-      <!-- TODO Re-enable in bug 1163350 -->
-      <!-- <menuitem id="option-enable-memory"
+      <menuitem id="option-enable-memory"
+                class="experimental-option"
                 type="checkbox"
                 data-pref="enable-memory"
                 label="&profilerUI.enableMemory;"
-                tooltiptext="&profilerUI.enableMemory.tooltiptext;"/> -->
+                tooltiptext="&profilerUI.enableMemory.tooltiptext;"/>
       <menuitem id="option-enable-framerate"
                 type="checkbox"
                 data-pref="enable-framerate"
@@ -63,12 +63,12 @@
                 data-pref="flatten-tree-recursion"
                 label="&profilerUI.flattenTreeRecursion;"
                 tooltiptext="&profilerUI.flattenTreeRecursion.tooltiptext;"/>
-      <!-- TODO Re-enable in bug 1163351 -->
-      <!-- <menuitem id="option-show-jit-optimizations"
+      <menuitem id="option-show-jit-optimizations"
+                class="experimental-option"
                 type="checkbox"
                 data-pref="show-jit-optimizations"
                 label="&profilerUI.showJITOptimizations;"
-                tooltiptext="&profilerUI.showJITOptimizations.tooltiptext;"/> -->
+                tooltiptext="&profilerUI.showJITOptimizations.tooltiptext;"/>
     </menupopup>
   </popupset>
 
@@ -96,34 +96,34 @@
       <toolbar id="performance-toolbar" class="devtools-toolbar">
         <hbox id="performance-toolbar-control-other" class="devtools-toolbarbutton-group">
           <toolbarbutton id="filter-button"
-                         popup="performance-filter-menupopup"
                          class="devtools-toolbarbutton"
+                         popup="performance-filter-menupopup"
                          tooltiptext="&profilerUI.options.filter.tooltiptext;"/>
         </hbox>
         <hbox id="performance-toolbar-controls-detail-views" class="devtools-toolbarbutton-group">
           <toolbarbutton id="select-waterfall-view"
                          class="devtools-toolbarbutton devtools-button"
-                         label="&profilerUI.toolbar.waterfall;"
+                         label="Waterfall"
                          hidden="true"
                          data-view="waterfall" />
           <toolbarbutton id="select-js-calltree-view"
                          class="devtools-toolbarbutton devtools-button"
-                         label="&profilerUI.toolbar.js-calltree;"
+                         label="Call Tree"
                          hidden="true"
                          data-view="js-calltree" />
           <toolbarbutton id="select-js-flamegraph-view"
                          class="devtools-toolbarbutton devtools-button"
-                         label="&profilerUI.toolbar.js-flamegraph;"
+                         label="Flame Chart"
                          hidden="true"
                          data-view="js-flamegraph" />
           <toolbarbutton id="select-memory-calltree-view"
                          class="devtools-toolbarbutton devtools-button"
-                         label="&profilerUI.toolbar.memory-calltree1;"
+                         label="Allocations Tree"
                          hidden="true"
                          data-view="memory-calltree" />
           <toolbarbutton id="select-memory-flamegraph-view"
                          class="devtools-toolbarbutton devtools-button"
-                         label="&profilerUI.toolbar.memory-flamegraph1;"
+                         label="Allocations Chart"
                          hidden="true"
                          data-view="memory-flamegraph" />
         </hbox>
@@ -145,7 +145,8 @@
           <hbox class="devtools-toolbarbutton-group"
                 pack="center">
             <toolbarbutton class="devtools-toolbarbutton record-button"
-                           label="&profilerUI.startRecording;" />
+                           label="&profilerUI.startRecording;"
+                           standalone="true"/>
           </hbox>
         </hbox>
         <vbox id="performance-view-content" flex="1">
@@ -155,6 +156,13 @@
             <hbox id="time-framerate"/>
           </vbox>
           <deck id="details-pane-container" flex="1">
+            <hbox id="loading-notice"
+                  class="notice-container devtools-throbber"
+                  align="center"
+                  pack="center"
+                  flex="1">
+              <label value="&profilerUI.loadingNotice;"/>
+            </hbox>
             <hbox id="recording-notice"
                   class="notice-container"
                   align="center"
@@ -164,8 +172,15 @@
                 <hbox class="devtools-toolbarbutton-group"
                       pack="center">
                   <toolbarbutton class="devtools-toolbarbutton record-button"
-                                 label="&profilerUI.stopRecording;" />
+                                 label="&profilerUI.stopRecording;"
+                                 standalone="true"/>
                 </hbox>
+                <label class="realtime-disabled-message">
+                  Realtime recording data disabled on non-multiprocess Firefox.
+                </label>
+                <label class="realtime-disabled-on-e10s-message">
+                  Enable multiprocess Firefox in preferences for rendering recording data in realtime.
+                </label>
                 <label class="buffer-status-message"
                        tooltiptext="&profilerUI.bufferStatusTooltip;"/>
                 <label class="buffer-status-message-full"
@@ -188,6 +203,12 @@
                       <label class="console-profile-command" />
                       <label value="&profilerUI.console.stopCommandEnd;" />
                     </hbox>
+                    <label class="realtime-disabled-message">
+                      Realtime recording data disabled on non-multiprocess Firefox.
+                    </label>
+                    <label class="realtime-disabled-on-e10s-message">
+                      Enable multiprocess Firefox in preferences for rendering recording data in realtime.
+                    </label>
                     <label class="buffer-status-message"
                            tooltiptext="&profilerUI.bufferStatusTooltip;"/>
                     <label class="buffer-status-message-full"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/system.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/system.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/system.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/system.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,20 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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";
+
+/**
+ * A dump file to attach preprocessing directives consumable to the controller
+ * without littering our code with directives.
+ */
+
+const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
+const { devtools: loader } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+const require = loader.require;
+
+const SYSTEM = {};
+
+// If e10s is possible on the platform.
+#ifdef E10S_TESTING_ONLY
+SYSTEM.MULTIPROCESS_SUPPORTED = true;
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_aaa-run-first-leaktest.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_aaa-run-first-leaktest.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_aaa-run-first-leaktest.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_aaa-run-first-leaktest.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,22 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests if the performance tool leaks on initialization and sudden destruction.
+ * You can also use this initialization format as a template for other tests.
+ */
+
+function spawnTest () {
+  let { target, panel, toolbox } = yield initPerformance(SIMPLE_URL);
+
+  ok(target, "Should have a target available.");
+  ok(toolbox, "Should have a toolbox available.");
+  ok(panel, "Should have a panel available.");
+
+  ok(panel.panelWin.gToolbox, "Should have a toolbox reference on the panel window.");
+  ok(panel.panelWin.gTarget, "Should have a target reference on the panel window.");
+  ok(panel.panelWin.gFront, "Should have a front reference on the panel window.");
+
+  yield teardown(panel);
+  finish();
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser.ini firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser.ini	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser.ini	2015-05-25 20:42:55.000000000 +0000
@@ -1,6 +1,5 @@
 [DEFAULT]
 tags = devtools
-skip-if = e10s # Handle in Bug 1077464 for profiler
 subsuite = devtools
 support-files =
   doc_innerHTML.html
@@ -10,11 +9,15 @@
 # Commented out tests are profiler tests
 # that need to be moved over to performance tool
 
-[browser_perf-aaa-run-first-leaktest.js]
+[browser_aaa-run-first-leaktest.js]
+[browser_marker-utils.js]
 [browser_markers-gc.js]
+skip-if = e10s # GC events seem unreliable in multiprocess
 [browser_markers-parse-html.js]
+[browser_markers-styles.js]
 [browser_markers-timestamp.js]
 [browser_perf-allocations-to-samples.js]
+[browser_perf-categories-js-calltree.js]
 [browser_perf-compatibility-01.js]
 [browser_perf-compatibility-02.js]
 [browser_perf-compatibility-03.js]
@@ -34,6 +37,7 @@
 [browser_perf-console-record-06.js]
 [browser_perf-console-record-07.js]
 [browser_perf-console-record-08.js]
+[browser_perf-console-record-09.js]
 [browser_perf-data-massaging-01.js]
 [browser_perf-data-samples.js]
 [browser_perf-details-calltree-render.js]
@@ -64,8 +68,10 @@
 [browser_perf-jit-model-01.js]
 [browser_perf-jit-model-02.js]
 [browser_perf-loading-01.js]
+[browser_perf-loading-02.js]
 [browser_perf-options-01.js]
 [browser_perf-options-02.js]
+[browser_perf-options-03.js]
 [browser_perf-options-invert-call-tree-01.js]
 [browser_perf-options-invert-call-tree-02.js]
 [browser_perf-options-invert-flame-graph-01.js]
@@ -84,6 +90,7 @@
 [browser_perf-overview-render-01.js]
 [browser_perf-overview-render-02.js]
 [browser_perf-overview-render-03.js]
+[browser_perf-overview-render-04.js]
 [browser_perf-overview-selection-01.js]
 [browser_perf-overview-selection-02.js]
 [browser_perf-overview-selection-03.js]
@@ -99,6 +106,7 @@
 [browser_perf-recording-notices-02.js]
 [browser_perf-recording-notices-03.js]
 [browser_perf-recording-notices-04.js]
+[browser_perf-recording-notices-05.js]
 [browser_perf_recordings-io-01.js]
 [browser_perf_recordings-io-02.js]
 [browser_perf_recordings-io-03.js]
@@ -131,11 +139,10 @@
 [browser_profiler_tree-view-06.js]
 [browser_profiler_tree-view-07.js]
 [browser_profiler_tree-view-08.js]
+[browser_profiler_tree-view-09.js]
 [browser_profiler-frame-utils-01.js]
 [browser_timeline-blueprint.js]
 [browser_timeline-filters.js]
 [browser_timeline-waterfall-background.js]
 [browser_timeline-waterfall-generic.js]
 [browser_timeline-waterfall-sidebar.js]
-# remove in bug 1160313
-[browser_retro-test.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_markers-styles.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_markers-styles.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_markers-styles.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_markers-styles.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,38 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Test that we get a "Styles" marker with the correct meta.
+ */
+
+
+function* spawnTest () {
+  let { target, front } = yield initBackend(SIMPLE_URL);
+  let markers = [];
+
+  front.on("timeline-data", handler);
+  let model = yield front.startRecording({ withTicks: true });
+
+  yield waitUntil(() => {
+    return markers.some(({restyleHint}) => restyleHint != void 0);
+  });
+
+  front.off("timeline-data", handler);
+  yield front.stopRecording(model);
+
+  info(`Got ${markers.length} markers.`);
+
+  ok(markers.every(({name}) => name === "Styles"), "All markers found are Styles markers");
+  ok(markers.length, "found some restyle markers");
+
+  ok(markers.some(({restyleHint}) => restyleHint != void 0), "some markers have a restyleHint property");
+
+  yield removeTab(target.tab);
+  finish();
+
+  function handler (_, name, m) {
+    if (name === "markers") {
+      markers = markers.concat(m.filter(marker => marker.name === "Styles"));
+    }
+  }
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_marker-utils.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_marker-utils.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_marker-utils.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_marker-utils.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,70 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests the marker utils methods.
+ */
+
+function spawnTest () {
+  let { TIMELINE_BLUEPRINT } = devtools.require("devtools/performance/global");
+  let Utils = devtools.require("devtools/performance/marker-utils");
+
+  Services.prefs.setBoolPref(PLATFORM_DATA_PREF, false);
+
+  is(Utils.getMarkerLabel({ name: "DOMEvent" }), "DOM Event",
+    "getMarkerLabel() returns a simple label");
+  is(Utils.getMarkerLabel({ name: "Javascript", causeName: "setTimeout handler" }), "setTimeout",
+    "getMarkerLabel() returns a label defined via function");
+
+  ok(Utils.getMarkerFields({ name: "Paint" }).length === 0,
+    "getMarkerFields() returns an empty array when no fields defined");
+
+  let fields = Utils.getMarkerFields({ name: "ConsoleTime", causeName: "snowstorm" });
+  is(fields[0].label, "Timer Name:", "getMarkerFields() returns an array with proper label");
+  is(fields[0].value, "snowstorm", "getMarkerFields() returns an array with proper value");
+
+  fields = Utils.getMarkerFields({ name: "DOMEvent", type: "mouseclick" });
+  is(fields.length, 1, "getMarkerFields() ignores fields that are not found on marker");
+  is(fields[0].label, "Event Type:", "getMarkerFields() returns an array with proper label");
+  is(fields[0].value, "mouseclick", "getMarkerFields() returns an array with proper value");
+
+  fields = Utils.getMarkerFields({ name: "DOMEvent", eventPhase: Ci.nsIDOMEvent.AT_TARGET, type: "mouseclick" });
+  is(fields.length, 2, "getMarkerFields() returns multiple fields when using a fields function");
+  is(fields[0].label, "Event Type:", "getMarkerFields() correctly returns fields via function (1)");
+  is(fields[0].value, "mouseclick", "getMarkerFields() correctly returns fields via function (2)");
+  is(fields[1].label, "Phase:", "getMarkerFields() correctly returns fields via function (3)");
+  is(fields[1].value, "Target", "getMarkerFields() correctly returns fields via function (4)");
+
+  is(Utils.getMarkerFields({ name: "Javascript", causeName: "Some Platform Field" })[0].value, "(Gecko)",
+    "Correctly obfuscates JS markers when platform data is off.");
+  Services.prefs.setBoolPref(PLATFORM_DATA_PREF, true);
+  is(Utils.getMarkerFields({ name: "Javascript", causeName: "Some Platform Field" })[0].value, "Some Platform Field",
+    "Correctly deobfuscates JS markers when platform data is on.");
+
+  is(Utils.getMarkerClassName("Javascript"), "Function Call",
+    "getMarkerClassName() returns correct string when defined via function");
+  is(Utils.getMarkerClassName("GarbageCollection"), "GC Event",
+    "getMarkerClassName() returns correct string when defined via function");
+  is(Utils.getMarkerClassName("Reflow"), "Layout",
+    "getMarkerClassName() returns correct string when defined via string");
+
+  TIMELINE_BLUEPRINT["fakemarker"] = { group: 0 };
+  try {
+    Utils.getMarkerClassName("fakemarker");
+    ok(false, "getMarkerClassName() should throw when no label on blueprint.");
+  } catch (e) {
+    ok(true, "getMarkerClassName() should throw when no label on blueprint.");
+  }
+
+  TIMELINE_BLUEPRINT["fakemarker"] = { group: 0, label: () => void 0};
+  try {
+    Utils.getMarkerClassName("fakemarker");
+    ok(false, "getMarkerClassName() should throw when label function returnd undefined.");
+  } catch (e) {
+    ok(true, "getMarkerClassName() should throw when label function returnd undefined.");
+  }
+
+  delete TIMELINE_BLUEPRINT["fakemarker"];
+
+  finish();
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-aaa-run-first-leaktest.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-aaa-run-first-leaktest.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-aaa-run-first-leaktest.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-aaa-run-first-leaktest.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the performance tool leaks on initialization and sudden destruction.
- * You can also use this initialization format as a template for other tests.
- */
-
-function spawnTest () {
-  let { target, panel, toolbox } = yield initPerformance(SIMPLE_URL);
-
-  ok(target, "Should have a target available.");
-  ok(toolbox, "Should have a toolbox available.");
-  ok(panel, "Should have a panel available.");
-
-  ok(panel.panelWin.gToolbox, "Should have a toolbox reference on the panel window.");
-  ok(panel.panelWin.gTarget, "Should have a target reference on the panel window.");
-  ok(panel.panelWin.gFront, "Should have a front reference on the panel window.");
-
-  yield teardown(panel);
-  finish();
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-categories-js-calltree.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-categories-js-calltree.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-categories-js-calltree.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-categories-js-calltree.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,38 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that the categories are shown in the js call tree when platform data
+ * is enabled.
+ */
+function spawnTest () {
+  let { panel } = yield initPerformance(SIMPLE_URL);
+  let { EVENTS, $, DetailsView, JsCallTreeView } = panel.panelWin;
+
+  // Enable platform data to show the categories.
+  Services.prefs.setBoolPref(PLATFORM_DATA_PREF, true);
+
+  yield startRecording(panel);
+  yield busyWait(100);
+
+  let rendered = once(JsCallTreeView, EVENTS.JS_CALL_TREE_RENDERED);
+  yield stopRecording(panel);
+  yield DetailsView.selectView("js-calltree");
+  yield rendered;
+
+  is($(".call-tree-cells-container").hasAttribute("categories-hidden"), false,
+    "The call tree cells container should show the categories now.");
+  ok($(".call-tree-category[value=Gecko]"),
+    "A category node with the label `Gecko` is displayed in the tree.");
+
+  // Disable platform data to show the categories.
+  Services.prefs.setBoolPref(PLATFORM_DATA_PREF, false);
+
+  is($(".call-tree-cells-container").getAttribute("categories-hidden"), "",
+    "The call tree cells container should hide the categories now.");
+  ok(!$(".call-tree-category[value=Gecko]"),
+    "A category node with the label `Gecko` doesn't exist in the tree anymore.");
+
+  yield teardown(panel);
+  finish();
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-console-record-09.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-console-record-09.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-console-record-09.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-console-record-09.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,31 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that an error is not thrown when clearing out the recordings if there's
+ * an in-progress console profile.
+ */
+
+function spawnTest () {
+  loadFrameScripts();
+  let { target, toolbox, panel } = yield initPerformance(SIMPLE_URL);
+  let win = panel.panelWin;
+  let { gFront, PerformanceController } = win;
+
+  info("Starting console.profile()...");
+  yield consoleProfile(win);
+  yield PerformanceController.clearRecordings();
+
+  info("Ending console.profileEnd()...");
+  consoleMethod("profileEnd");
+  // Wait for the front to receive the stopped event
+  yield once(gFront, "recording-stopped");
+
+  // Wait an extra tick or two since the above promise will be resolved
+  // the same time as _onRecordingStateChange, which should not cause any throwing
+  yield idleWait(100);
+  ok(true, "Stopping an in-progress console profile after clearing recordings does not throw.");
+
+  yield teardown(panel);
+  finish();
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-data-samples.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-data-samples.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-data-samples.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-data-samples.js	2015-05-25 20:42:55.000000000 +0000
@@ -4,7 +4,7 @@
 /**
  * Tests if the retrieved profiler data samples always have a (root) node.
  * If this ever changes, the |ThreadNode.prototype.insert| function in
- * browser/devtools/profiler/utils/tree-model.js will have to be changed.
+ * browser/devtools/performance/modules/logic/tree-model.js will have to be changed.
  */
 
 const WAIT_TIME = 1000; // ms
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-events-calltree.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-events-calltree.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-events-calltree.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-events-calltree.js	2015-05-25 20:42:55.000000000 +0000
@@ -4,7 +4,7 @@
 /**
  * Tests that the call tree up/down events work for js calltree and memory calltree.
  */
-const { ThreadNode } = devtools.require("devtools/shared/profiler/tree-model");
+const { ThreadNode } = devtools.require("devtools/performance/tree-model");
 const { RecordingUtils } = devtools.require("devtools/performance/recording-utils")
 function spawnTest () {
   let focus = 0;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-front-basic-profiler-01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-front-basic-profiler-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-front-basic-profiler-01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-front-basic-profiler-01.js	2015-05-25 20:42:55.000000000 +0000
@@ -17,7 +17,7 @@
     "A `_profilerStartTime` property exists in the recording model.");
   ok(startModel._timelineStartTime !== undefined,
     "A `_timelineStartTime` property exists in the recording model.");
-  ise(startModel._memoryStartTime, 0,
+  is(startModel._memoryStartTime, 0,
     "A `_memoryStartTime` property exists in the recording model, but it's 0.");
 
   yield busyWait(WAIT_TIME);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-front-profiler-02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-front-profiler-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-front-profiler-02.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-front-profiler-02.js	2015-05-25 20:42:55.000000000 +0000
@@ -10,28 +10,32 @@
 let test = Task.async(function*() {
   let { target, panel, toolbox } = yield initPerformance(SIMPLE_URL);
   let front = panel.panelWin.gFront;
+  loadFrameScripts();
 
-  ok(!nsIProfilerModule.IsActive(),
+  ok(!(yield PMM_isProfilerActive()),
     "The built-in profiler module should not have been automatically started.");
 
   let activated = front.once("profiler-activated");
   let rec = yield front.startRecording();
   yield activated;
   yield front.stopRecording(rec);
-  ok(nsIProfilerModule.IsActive(),
+  ok((yield PMM_isProfilerActive()),
     "The built-in profiler module should still be active (1).");
 
   let alreadyActive = front.once("profiler-already-active");
   rec = yield front.startRecording();
   yield alreadyActive;
   yield front.stopRecording(rec);
-  ok(nsIProfilerModule.IsActive(),
+  ok((yield PMM_isProfilerActive()),
     "The built-in profiler module should still be active (2).");
 
-  yield teardown(panel);
-
-  ok(!nsIProfilerModule.IsActive(),
-    "The built-in profiler module should have been automatically stoped.");
+  // Manually tear down so we can check profiler status
+  let tab = panel.target.tab;
+  yield panel._toolbox.destroy();
+  ok(!(yield PMM_isProfilerActive()),
+    "The built-in profiler module should no longer be active.");
+  yield removeTab(tab);
+  tab = null;
 
   finish();
 });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-front-profiler-03.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-front-profiler-03.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-front-profiler-03.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-front-profiler-03.js	2015-05-25 20:42:55.000000000 +0000
@@ -16,18 +16,25 @@
 
   let { panel: secondPanel } = yield initPerformance(SIMPLE_URL);
   let secondFront = secondPanel.panelWin.gFront;
+  loadFrameScripts();
 
   let alreadyActive = secondFront.once("profiler-already-active");
   yield secondFront.startRecording();
   yield alreadyActive;
 
-  yield teardown(firstPanel);
-  ok(nsIProfilerModule.IsActive(),
+  // Manually teardown the tabs so we can check profiler status
+  let tab1 = firstPanel.target.tab;
+  let tab2 = secondPanel.target.tab;
+  yield firstPanel._toolbox.destroy();
+  yield removeTab(tab1);
+  ok((yield PMM_isProfilerActive()),
     "The built-in profiler module should still be active.");
 
-  yield teardown(secondPanel);
-  ok(!nsIProfilerModule.IsActive(),
-    "The built-in profiler module should have been automatically stoped.");
+  yield secondPanel._toolbox.destroy();
+  ok(!(yield PMM_isProfilerActive()),
+    "The built-in profiler module should no longer be active.");
+  yield removeTab(tab2);
+  tab1 = tab2 = null;
 
   finish();
 });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-front-profiler-04.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-front-profiler-04.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-front-profiler-04.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-front-profiler-04.js	2015-05-25 20:42:55.000000000 +0000
@@ -10,10 +10,11 @@
 
 let test = Task.async(function*() {
   // Ensure the profiler is already running when the test starts.
+  loadFrameScripts();
   let ENTRIES = 1000000;
   let INTERVAL = 1;
   let FEATURES = ["js"];
-  nsIProfilerModule.StartProfiler(ENTRIES, INTERVAL, FEATURES, FEATURES.length);
+  yield sendProfilerCommand("StartProfiler", [ENTRIES, INTERVAL, FEATURES, FEATURES.length]);
 
   let { panel: firstPanel } = yield initPerformance(SIMPLE_URL);
   let firstFront = firstPanel.panelWin.gFront;
@@ -32,11 +33,11 @@
   ok(secondRecording._profilerStartTime > 0, "The profiler was not restarted.");
 
   yield teardown(firstPanel);
-  ok(nsIProfilerModule.IsActive(),
+  ok((yield PMM_isProfilerActive()),
     "The built-in profiler module should still be active.");
 
   yield teardown(secondPanel);
-  ok(!nsIProfilerModule.IsActive(),
+  ok(!(yield PMM_isProfilerActive()),
     "The built-in profiler module should have been automatically stoped.");
 
   finish();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-jit-model-01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-jit-model-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-jit-model-01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-jit-model-01.js	2015-05-25 20:42:55.000000000 +0000
@@ -10,7 +10,7 @@
 const { RecordingUtils } = devtools.require("devtools/performance/recording-utils");
 
 function test() {
-  let { JITOptimizations } = devtools.require("devtools/shared/profiler/jit");
+  let { JITOptimizations } = devtools.require("devtools/performance/jit");
 
   let rawSites = [];
   rawSites.push(gRawSite2);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-jit-model-02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-jit-model-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-jit-model-02.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-jit-model-02.js	2015-05-25 20:42:55.000000000 +0000
@@ -9,7 +9,7 @@
 const { RecordingUtils } = devtools.require("devtools/performance/recording-utils");
 
 function test() {
-  let { JITOptimizations, OptimizationSite } = devtools.require("devtools/shared/profiler/jit");
+  let { JITOptimizations, OptimizationSite } = devtools.require("devtools/performance/jit");
 
   let rawSites = [];
   rawSites.push(gRawSite2);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-jit-view-02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-jit-view-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-jit-view-02.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-jit-view-02.js	2015-05-25 20:42:55.000000000 +0000
@@ -6,7 +6,7 @@
  * for meta nodes when viewing "content only".
  */
 
-const { CATEGORY_MASK } = devtools.require("devtools/shared/profiler/global");
+const { CATEGORY_MASK } = devtools.require("devtools/performance/global");
 const { RecordingUtils } = devtools.require("devtools/performance/recording-utils");
 
 Services.prefs.setBoolPref(INVERT_PREF, false);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-loading-02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-loading-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-loading-02.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-loading-02.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,78 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that the details view is locked after recording has stopped and before
+ * the recording has finished loading.
+ * Also test that the details view isn't locked if the recording that is being
+ * stopped isn't the active one.
+ */
+
+let test = Task.async(function*() {
+  let { panel } = yield initPerformance(SIMPLE_URL);
+  let { PerformanceController, PerformanceView, RecordingsView,
+        EVENTS, $ } = panel.panelWin;
+
+  let detailsContainer = $("#details-pane-container");
+  let recordingNotice = $("#recording-notice");
+  let loadingNotice = $("#loading-notice");
+  let detailsPane = $("#details-pane");
+
+  info("Start to record");
+  yield startRecording(panel);
+
+  is(detailsContainer.selectedPanel, recordingNotice,
+    "The recording-notice is shown while recording");
+
+  info("Stop the recording and wait for the WILL_STOP and STOPPED events");
+  let clicked = PerformanceView.once(EVENTS.UI_STOP_RECORDING);
+  let willStop = PerformanceController.once(EVENTS.RECORDING_WILL_STOP);
+  let hasStopped = PerformanceController.once(EVENTS.RECORDING_STOPPED);
+
+  click(panel.panelWin, $("#main-record-button"));
+  yield clicked;
+  yield willStop;
+
+  is(detailsContainer.selectedPanel, loadingNotice,
+    "The loading-notice is shown while the record is stopping");
+
+  let stateChanged = once(PerformanceView, EVENTS.UI_STATE_CHANGED);
+  yield hasStopped;
+  yield stateChanged;
+
+  is(detailsContainer.selectedPanel, detailsPane,
+    "The details panel is shown after the record has stopped");
+
+  info("Start to record again");
+  yield startRecording(panel);
+
+  info("While the 2nd record is still going, switch to the first one");
+  let select = once(PerformanceController, EVENTS.RECORDING_SELECTED);
+  RecordingsView.selectedIndex = 0;
+  yield select;
+
+  info("Stop the 2nd recording and wait for the WILL_STOP and STOPPED events");
+  clicked = PerformanceView.once(EVENTS.UI_STOP_RECORDING);
+  willStop = PerformanceController.once(EVENTS.RECORDING_WILL_STOP);
+  hasStopped = PerformanceController.once(EVENTS.RECORDING_STOPPED);
+
+  click(panel.panelWin, $("#main-record-button"));
+  yield clicked;
+  yield willStop;
+
+  is(detailsContainer.selectedPanel, detailsPane,
+    "The details panel is still shown while the 2nd record is being stopped");
+  is(RecordingsView.selectedIndex, 0, "The first record is still selected");
+
+  stateChanged = once(PerformanceView, EVENTS.UI_STATE_CHANGED);
+  yield hasStopped;
+  yield stateChanged;
+
+  is(detailsContainer.selectedPanel, detailsPane,
+    "The details panel is still shown after the 2nd record has stopped");
+  is(RecordingsView.selectedIndex, 1, "The second record is now selected");
+
+  yield PerformanceController.clearRecordings();
+  yield teardown(panel);
+  finish();
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-options-03.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-options-03.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-options-03.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-options-03.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,27 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that toggling meta option prefs change visibility of other options.
+ */
+
+Services.prefs.setBoolPref(EXPERIMENTAL_PREF, false);
+
+function spawnTest () {
+  let { panel } = yield initPerformance(SIMPLE_URL);
+  let { $, EVENTS, PerformanceController } = panel.panelWin;
+
+  let $body = $(".theme-body");
+  let $menu = $("#performance-options-menupopup");
+
+  ok(!$body.classList.contains("experimental-enabled"), "body does not have `experimental-enabled` on start");
+  ok(!$menu.classList.contains("experimental-enabled"), "menu does not have `experimental-enabled` on start");
+
+  Services.prefs.setBoolPref(EXPERIMENTAL_PREF, true);
+
+  ok($body.classList.contains("experimental-enabled"), "body has `experimental-enabled` after toggle");
+  ok($menu.classList.contains("experimental-enabled"), "menu has `experimental-enabled` after toggle");
+
+  yield teardown(panel);
+  finish();
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-overview-render-04.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-overview-render-04.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-overview-render-04.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-overview-render-04.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,52 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that the overview graphs do not render when realtime rendering is off
+ * due to lack of e10s.
+ */
+function spawnTest () {
+  let { panel } = yield initPerformance(SIMPLE_URL);
+  let { $, EVENTS, PerformanceController, OverviewView, RecordingsView } = panel.panelWin;
+
+  let updated = 0;
+  OverviewView.on(EVENTS.OVERVIEW_RENDERED, () => updated++);
+  OverviewView.OVERVIEW_UPDATE_INTERVAL = 1;
+
+  // Set realtime rendering off.
+  OverviewView.isRealtimeRenderingEnabled = () => false;
+
+  yield startRecording(panel, { waitForOverview: false, waitForStateChange: true });
+  is($("#overview-pane").hidden, true, "overview graphs hidden");
+  is(updated, 0, "Overview graphs have still not been updated");
+  yield waitUntil(() => PerformanceController.getCurrentRecording().getMarkers().length);
+  yield waitUntil(() => PerformanceController.getCurrentRecording().getTicks().length);
+  is(updated, 0, "Overview graphs have still not been updated");
+
+  yield stopRecording(panel);
+
+  let markers = OverviewView.graphs.get("timeline");
+  let framerate = OverviewView.graphs.get("framerate");
+
+  ok(markers.width > 0,
+    "The overview's markers graph has a width.");
+  ok(framerate.width > 0,
+    "The overview's framerate graph has a width.");
+
+  is(updated, 1, "Overview graphs rendered upon completion.");
+  is($("#overview-pane").hidden, false, "overview graphs no longer hidden");
+
+  yield startRecording(panel, { waitForOverview: false, waitForStateChange: true });
+  is($("#overview-pane").hidden, true, "overview graphs hidden again when starting new recording");
+
+  RecordingsView.selectedIndex = 0;
+  is($("#overview-pane").hidden, false, "overview graphs no longer hidden when switching back to complete recording.");
+  RecordingsView.selectedIndex = 1;
+  is($("#overview-pane").hidden, true, "overview graphs hidden again when going back to inprogress recording.");
+
+  yield stopRecording(panel);
+  is($("#overview-pane").hidden, false, "overview graphs no longer hidden when recording finishes");
+
+  yield teardown(panel);
+  finish();
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-recording-notices-04.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-recording-notices-04.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-recording-notices-04.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-recording-notices-04.js	2015-05-25 20:42:55.000000000 +0000
@@ -6,13 +6,14 @@
  * a class is assigned to the recording notices.
  */
 function spawnTest () {
-  // Make sure the profiler module is stopped so we can set a new buffer limit
-  nsIProfilerModule.StopProfiler();
-  Services.prefs.setIntPref(PROFILER_BUFFER_SIZE_PREF, 1000);
-
   let { panel } = yield initPerformance(SIMPLE_URL, void 0, { TEST_MOCK_PROFILER_CHECK_TIMER: 10 });
   let { EVENTS, $, PerformanceController, PerformanceView } = panel.panelWin;
 
+  // Make sure the profiler module is stopped so we can set a new buffer limit
+  loadFrameScripts();
+  yield PMM_stopProfiler();
+  Services.prefs.setIntPref(PROFILER_BUFFER_SIZE_PREF, 1000);
+
   yield startRecording(panel);
 
   let percent = 0;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-recording-notices-05.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-recording-notices-05.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-recording-notices-05.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-recording-notices-05.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,43 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that when a recording overlaps the circular buffer, that
+ * a class is assigned to the recording notices.
+ */
+function spawnTest () {
+  let { panel } = yield initPerformance(SIMPLE_URL, void 0, { TEST_MOCK_PROFILER_CHECK_TIMER: 10 });
+  let { EVENTS, $, PerformanceController, PerformanceView } = panel.panelWin;
+
+  let supported = false;
+  let enabled = false;
+
+  PerformanceController.getMultiprocessStatus = () => {
+    return { supported, enabled };
+  };
+
+  PerformanceController._setMultiprocessAttributes();
+  ok($("#performance-view").getAttribute("e10s"), "unsupported",
+    "when e10s is disabled and no option to turn on, container has [e10s=unsupported]");
+
+  supported = true;
+  enabled = false;
+  PerformanceController._setMultiprocessAttributes();
+  ok($("#performance-view").getAttribute("e10s"), "disabled",
+    "when e10s is disabled and but is supported, container has [e10s=disabled]");
+
+  supported = false;
+  enabled = true;
+  PerformanceController._setMultiprocessAttributes();
+  ok($("#performance-view").getAttribute("e10s"), "",
+    "when e10s is enabled, but not supported, this probably means we no longer have E10S_TESTING_ONLY, and we have no e10s attribute.");
+
+  supported = true;
+  enabled = true;
+  PerformanceController._setMultiprocessAttributes();
+  ok($("#performance-view").getAttribute("e10s"), "",
+    "when e10s is enabled and supported, there should be no e10s attribute.");
+
+  yield teardown(panel);
+  finish();
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-shared-connection-03.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-shared-connection-03.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-shared-connection-03.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-shared-connection-03.js	2015-05-25 20:42:55.000000000 +0000
@@ -9,19 +9,21 @@
   let { panel } = yield initPerformance(SIMPLE_URL);
   let front = panel.panelWin.gFront;
 
-  ok(!nsIProfilerModule.IsActive(),
+  loadFrameScripts();
+
+  ok(!(yield PMM_isProfilerActive()),
     "The built-in profiler module should not have been automatically started.");
 
   let result = yield front._request("profiler", "startProfiler");
   is(result.started, true,
     "The request finished successfully and the profiler should've been started.");
-  ok(nsIProfilerModule.IsActive(),
+  ok((yield PMM_isProfilerActive()),
     "The built-in profiler module should now be active.");
 
   result = yield front._request("profiler", "stopProfiler");
   is(result.started, false,
     "The request finished successfully and the profiler should've been stopped.");
-  ok(!nsIProfilerModule.IsActive(),
+  ok(!(yield PMM_isProfilerActive()),
     "The built-in profiler module should now be inactive.");
 
   yield teardown(panel);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-ui-recording.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-ui-recording.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_perf-ui-recording.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_perf-ui-recording.js	2015-05-25 20:42:55.000000000 +0000
@@ -11,19 +11,20 @@
   let { panel } = yield initPerformance(SIMPLE_URL);
   let { EVENTS, PerformanceController } = panel.panelWin;
   let front = panel.panelWin.gFront;
+  loadFrameScripts();
 
-  ok(!nsIProfilerModule.IsActive(),
+  ok(!(yield PMM_isProfilerActive()),
     "The built-in profiler module should not have been automatically started.");
 
   yield startRecording(panel);
   busyWait(WAIT_TIME); // allow the profiler module to sample some cpu activity
 
-  ok(nsIProfilerModule.IsActive(),
+  ok((yield PMM_isProfilerActive()),
     "The built-in profiler module should now be active.");
 
   yield stopRecording(panel);
 
-  ok(nsIProfilerModule.IsActive(),
+  ok((yield PMM_isProfilerActive()),
     "The built-in profiler module should still be active.");
 
   yield teardown(panel);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_categories.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_categories.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_categories.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_categories.js	2015-05-25 20:42:55.000000000 +0000
@@ -6,7 +6,7 @@
  */
 
 function test() {
-  let global = devtools.require("devtools/shared/profiler/global");
+  let global = devtools.require("devtools/performance/global");
   let l10n = global.L10N;
   let categories = global.CATEGORIES;
   let mappings = global.CATEGORY_MAPPINGS;
@@ -15,15 +15,6 @@
   ok(count,
     "Should have a non-empty list of categories available.");
 
-  ok(categories.find(e => e.ordinal == count - 1),
-    "The maximum category ordinal is the equal to the categories count.");
-
-  is(categories.reduce((a, b) => a + b.ordinal, 0), count * (count - 1) / 2,
-    "There is an ordinal for every category in the list.");
-
-  is(categories.filter((e, i, self) => self.find(e => e.ordinal == i)).length, count,
-    "All categories have unique ordinals.");
-
   ok(!categories.some(e => !e.color),
     "All categories have an associated color.");
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_content-check.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_content-check.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_content-check.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_content-check.js	2015-05-25 20:42:55.000000000 +0000
@@ -7,7 +7,7 @@
  */
 
 function test() {
-  let { FrameNode } = devtools.require("devtools/shared/profiler/tree-model");
+  let { FrameNode } = devtools.require("devtools/performance/tree-model");
 
   ok(FrameNode.isContent({ location: "http://foo" }),
     "Verifying content/chrome frames is working properly.");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler-frame-utils-01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler-frame-utils-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler-frame-utils-01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler-frame-utils-01.js	2015-05-25 20:42:55.000000000 +0000
@@ -11,6 +11,7 @@
   "hello/<.world (http://foo/bar.js:123:987)",
   "hello/<.world (http://foo/bar.js:123)",
   "hello/<.world (http://foo/bar.js#baz:123:987)",
+  "hello/<.world (http://foo/bar.js?myquery=params&search=1:123:987)",
   "hello/<.world (http://foo/#bar:123:987)",
   "hello/<.world (http://foo/:123:987)",
   "hello/<.world (app://myfxosapp/file.js:100:1)",
@@ -35,7 +36,7 @@
 ].map(argify);
 
 function test() {
-  const { isContent, parseLocation } = devtools.require("devtools/shared/profiler/frame-utils");
+  const { isContent, parseLocation } = devtools.require("devtools/performance/frame-utils");
 
   for (let frame of CONTENT_LOCATIONS) {
     ok(isContent.apply(null, frameify(frame)), `${frame[0]} should be considered a content frame.`);
@@ -51,8 +52,9 @@
     ["hello/<.world", "bar.js", "foo", "https://foo/bar.js", 123, 987, "foo", null],
     ["hello/<.world", "bar.js", "foo", "http://foo/bar.js", 123, 987, "foo", null],
     ["hello/<.world", "bar.js", "foo", "http://foo/bar.js", 123, null, "foo", null],
-    ["hello/<.world", "bar.js#baz", "foo", "http://foo/bar.js#baz", 123, 987, "foo", null],
-    ["hello/<.world", "#bar", "foo", "http://foo/#bar", 123, 987, "foo", null],
+    ["hello/<.world", "bar.js", "foo", "http://foo/bar.js#baz", 123, 987, "foo", null],
+    ["hello/<.world", "bar.js", "foo", "http://foo/bar.js?myquery=params&search=1", 123, 987, "foo", null],
+    ["hello/<.world", "/", "foo", "http://foo/#bar", 123, 987, "foo", null],
     ["hello/<.world", "/", "foo", "http://foo/", 123, 987, "foo", null],
     ["hello/<.world", "file.js", "myfxosapp", "app://myfxosapp/file.js", 100, 1, "myfxosapp", null],
     ["hello/<.world", "file.js", "localhost", "http://localhost:8888/file.js", 100, 1, "localhost:8888", 8888],
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-frame-node.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-frame-node.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-frame-node.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-frame-node.js	2015-05-25 20:42:55.000000000 +0000
@@ -6,8 +6,8 @@
  */
 
 function test() {
-  let { FrameNode } = devtools.require("devtools/shared/profiler/tree-model");
-  let { CATEGORY_OTHER } = devtools.require("devtools/shared/profiler/global");
+  let { FrameNode } = devtools.require("devtools/performance/tree-model");
+  let { CATEGORY_OTHER } = devtools.require("devtools/performance/global");
 
   let frame1 = new FrameNode("hello/<.world (http://foo/bar.js:123:987)", {
     location: "hello/<.world (http://foo/bar.js:123:987)",
@@ -48,7 +48,7 @@
     "The second frame node has the correct type.");
   is(frame2.getInfo().functionName, "hello/<.world",
     "The second frame node has the correct function name.");
-  is(frame2.getInfo().fileName, "bar.js#baz",
+  is(frame2.getInfo().fileName, "bar.js",
     "The second frame node has the correct file name.");
   is(frame2.getInfo().hostName, "foo",
     "The second frame node has the correct host name.");
@@ -75,7 +75,7 @@
     "The third frame node has the correct type.");
   is(frame3.getInfo().functionName, "hello/<.world",
     "The third frame node has the correct function name.");
-  is(frame3.getInfo().fileName, "#bar",
+  is(frame3.getInfo().fileName, "/",
     "The third frame node has the correct file name.");
   is(frame3.getInfo().hostName, "foo",
     "The third frame node has the correct host name.");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-model-01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-model-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-model-01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-model-01.js	2015-05-25 20:42:55.000000000 +0000
@@ -6,7 +6,7 @@
  */
 
 function test() {
-  const { ThreadNode } = devtools.require("devtools/shared/profiler/tree-model");
+  const { ThreadNode } = devtools.require("devtools/performance/tree-model");
 
   // Create a root node from a given samples array.
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-model-02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-model-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-model-02.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-model-02.js	2015-05-25 20:42:55.000000000 +0000
@@ -6,7 +6,7 @@
  */
 
 function test() {
-  let { ThreadNode } = devtools.require("devtools/shared/profiler/tree-model");
+  let { ThreadNode } = devtools.require("devtools/performance/tree-model");
 
   // Create a root node from a given samples array.
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-model-03.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-model-03.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-model-03.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-model-03.js	2015-05-25 20:42:55.000000000 +0000
@@ -7,7 +7,7 @@
  */
 
 function test() {
-  let { ThreadNode } = devtools.require("devtools/shared/profiler/tree-model");
+  let { ThreadNode } = devtools.require("devtools/performance/tree-model");
 
   // Create a root node from a given samples array, filtering by time.
   //
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-model-04.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-model-04.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-model-04.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-model-04.js	2015-05-25 20:42:55.000000000 +0000
@@ -7,7 +7,7 @@
  */
 
 function test() {
-  let { ThreadNode } = devtools.require("devtools/shared/profiler/tree-model");
+  let { ThreadNode } = devtools.require("devtools/performance/tree-model");
 
   // Create a root node from a given samples array, filtering by time.
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-model-05.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-model-05.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-model-05.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-model-05.js	2015-05-25 20:42:55.000000000 +0000
@@ -43,7 +43,7 @@
 }]);
 
 function test() {
-  let { ThreadNode } = devtools.require("devtools/shared/profiler/tree-model");
+  let { ThreadNode } = devtools.require("devtools/performance/tree-model");
 
   let root = new ThreadNode(gThread, { invertTree: true });
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-model-06.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-model-06.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-model-06.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-model-06.js	2015-05-25 20:42:55.000000000 +0000
@@ -155,7 +155,7 @@
 });
 
 function test() {
-  let { ThreadNode } = devtools.require("devtools/shared/profiler/tree-model");
+  let { ThreadNode } = devtools.require("devtools/performance/tree-model");
 
   let root = new ThreadNode(gThread);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-model-07.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-model-07.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-model-07.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-model-07.js	2015-05-25 20:42:55.000000000 +0000
@@ -5,10 +5,10 @@
  * Tests that when displaying only content nodes, platform nodes are generalized.
  */
 
-let { CATEGORY_MASK } = devtools.require("devtools/shared/profiler/global");
+let { CATEGORY_MASK } = devtools.require("devtools/performance/global");
 
 function test() {
-  let { ThreadNode } = devtools.require("devtools/shared/profiler/tree-model");
+  let { ThreadNode } = devtools.require("devtools/performance/tree-model");
   let url = (n) => `http://content/${n}`;
 
   // Create a root node from a given samples array.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-view-01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-view-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-view-01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-view-01.js	2015-05-25 20:42:55.000000000 +0000
@@ -7,8 +7,8 @@
  */
 
 function test() {
-  let { ThreadNode } = devtools.require("devtools/shared/profiler/tree-model");
-  let { CallView } = devtools.require("devtools/shared/profiler/tree-view");
+  let { ThreadNode } = devtools.require("devtools/performance/tree-model");
+  let { CallView } = devtools.require("devtools/performance/tree-view");
 
   let threadNode = new ThreadNode(gThread);
   // Don't display the synthesized (root) and the real (root) node twice.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-view-02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-view-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-view-02.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-view-02.js	2015-05-25 20:42:55.000000000 +0000
@@ -6,11 +6,11 @@
  * creates the correct column structure after expanding some of the nodes.
  */
 
-let { CATEGORY_MASK } = devtools.require("devtools/shared/profiler/global");
+let { CATEGORY_MASK } = devtools.require("devtools/performance/global");
 
 function test() {
-  let { ThreadNode } = devtools.require("devtools/shared/profiler/tree-model");
-  let { CallView } = devtools.require("devtools/shared/profiler/tree-view");
+  let { ThreadNode } = devtools.require("devtools/performance/tree-model");
+  let { CallView } = devtools.require("devtools/performance/tree-view");
 
   let threadNode = new ThreadNode(gThread);
   // Don't display the synthesized (root) and the real (root) node twice.
@@ -21,7 +21,9 @@
   treeRoot.autoExpandDepth = 0;
   treeRoot.attachTo(container);
 
-  let $$fun = node => container.querySelectorAll(".call-tree-cell[type=function] > " + node);
+  let $$ = node => container.querySelectorAll(node);
+  let $fun = (node, ancestor) => (ancestor || container).querySelector(".call-tree-cell[type=function] > " + node);
+  let $$fun = (node, ancestor) => (ancestor || container).querySelectorAll(".call-tree-cell[type=function] > " + node);
   let $$dur = i => container.querySelectorAll(".call-tree-cell[type=duration]")[i];
   let $$perc = i => container.querySelectorAll(".call-tree-cell[type=percentage]")[i];
   let $$sampl = i => container.querySelectorAll(".call-tree-cell[type=samples]")[i];
@@ -39,13 +41,13 @@
     "The root's samples cell displays the correct value.");
   is($$fun(".call-tree-name")[0].getAttribute("value"), "(root)",
     "The root's function cell displays the correct name.");
-  is($$fun(".call-tree-url")[0].getAttribute("value"), "",
-    "The root's function cell displays the correct url.");
-  is($$fun(".call-tree-line")[0].getAttribute("value"), "",
-    "The root's function cell displays the correct line.");
-  is($$fun(".call-tree-host")[0].getAttribute("value"), "",
+  is($$fun(".call-tree-url")[0], null,
+    "The root's function cell displays no url.");
+  is($$fun(".call-tree-line")[0], null,
+    "The root's function cell displays no line.");
+  is($$fun(".call-tree-host")[0], null,
     "The root's function cell displays the correct host.");
-  is($$fun(".call-tree-category")[0].getAttribute("value"), "",
+  is($$fun(".call-tree-category")[0], null,
     "The root's function cell displays the correct category.");
 
   treeRoot.expand();
@@ -63,17 +65,17 @@
     "The .A node's percentage cell displays the correct value.");
   is($$sampl(1).getAttribute("value"), "4",
     "The .A node's samples cell displays the correct value.");
-  is($$fun(".call-tree-name")[1].getAttribute("value"), "A",
+  is($fun(".call-tree-name", $$(".call-tree-item")[1]).getAttribute("value"), "A",
     "The .A node's function cell displays the correct name.");
-  is($$fun(".call-tree-url")[1].getAttribute("value"), "baz",
+  is($fun(".call-tree-url", $$(".call-tree-item")[1]).getAttribute("value"), "baz",
     "The .A node's function cell displays the correct url.");
-  ok($$fun(".call-tree-url")[1].getAttribute("tooltiptext").includes("http://foo/bar/baz"),
+  ok($fun(".call-tree-url", $$(".call-tree-item")[1]).getAttribute("tooltiptext").includes("http://foo/bar/baz"),
     "The .A node's function cell displays the correct url tooltiptext.");
-  is($$fun(".call-tree-line")[1].getAttribute("value"), ":12",
+  is($fun(".call-tree-line", $$(".call-tree-item")[1]).getAttribute("value"), ":12",
     "The .A node's function cell displays the correct line.");
-  is($$fun(".call-tree-host")[1].getAttribute("value"), "foo",
+  is($fun(".call-tree-host", $$(".call-tree-item")[1]).getAttribute("value"), "foo",
     "The .A node's function cell displays the correct host.");
-  is($$fun(".call-tree-category")[1].getAttribute("value"), "Gecko",
+  is($fun(".call-tree-category", $$(".call-tree-item")[1]).getAttribute("value"), "Gecko",
     "The .A node's function cell displays the correct category.");
 
   let A = treeRoot.getChild();
@@ -92,17 +94,17 @@
     "The .A.B node's percentage cell displays the correct value.");
   is($$sampl(2).getAttribute("value"), "3",
     "The .A.B node's samples cell displays the correct value.");
-  is($$fun(".call-tree-name")[2].getAttribute("value"), "B",
+  is($fun(".call-tree-name", $$(".call-tree-item")[2]).getAttribute("value"), "B",
     "The .A.B node's function cell displays the correct name.");
-  is($$fun(".call-tree-url")[2].getAttribute("value"), "baz",
+  is($fun(".call-tree-url", $$(".call-tree-item")[2]).getAttribute("value"), "baz",
     "The .A.B node's function cell displays the correct url.");
-  ok($$fun(".call-tree-url")[2].getAttribute("tooltiptext").includes("http://foo/bar/baz"),
+  ok($fun(".call-tree-url", $$(".call-tree-item")[2]).getAttribute("tooltiptext").includes("http://foo/bar/baz"),
     "The .A.B node's function cell displays the correct url tooltiptext.");
-  is($$fun(".call-tree-line")[2].getAttribute("value"), ":34",
+  is($fun(".call-tree-line", $$(".call-tree-item")[2]).getAttribute("value"), ":34",
     "The .A.B node's function cell displays the correct line.");
-  is($$fun(".call-tree-host")[2].getAttribute("value"), "foo",
+  is($fun(".call-tree-host", $$(".call-tree-item")[2]).getAttribute("value"), "foo",
     "The .A.B node's function cell displays the correct host.");
-  is($$fun(".call-tree-category")[2].getAttribute("value"), "Styles",
+  is($fun(".call-tree-category", $$(".call-tree-item")[2]).getAttribute("value"), "Styles",
     "The .A.B node's function cell displays the correct category.");
 
   is($$dur(3).getAttribute("value"), "7 ms",
@@ -111,17 +113,17 @@
     "The .A.E node's percentage cell displays the correct value.");
   is($$sampl(3).getAttribute("value"), "1",
     "The .A.E node's samples cell displays the correct value.");
-  is($$fun(".call-tree-name")[3].getAttribute("value"), "E",
+  is($fun(".call-tree-name", $$(".call-tree-item")[3]).getAttribute("value"), "E",
     "The .A.E node's function cell displays the correct name.");
-  is($$fun(".call-tree-url")[3].getAttribute("value"), "baz",
+  is($fun(".call-tree-url", $$(".call-tree-item")[3]).getAttribute("value"), "baz",
     "The .A.E node's function cell displays the correct url.");
-  ok($$fun(".call-tree-url")[3].getAttribute("tooltiptext").includes("http://foo/bar/baz"),
+  ok($fun(".call-tree-url", $$(".call-tree-item")[3]).getAttribute("tooltiptext").includes("http://foo/bar/baz"),
     "The .A.E node's function cell displays the correct url tooltiptext.");
-  is($$fun(".call-tree-line")[3].getAttribute("value"), ":90",
+  is($fun(".call-tree-line", $$(".call-tree-item")[3]).getAttribute("value"), ":90",
     "The .A.E node's function cell displays the correct line.");
-  is($$fun(".call-tree-host")[3].getAttribute("value"), "foo",
+  is($fun(".call-tree-host", $$(".call-tree-item")[3]).getAttribute("value"), "foo",
     "The .A.E node's function cell displays the correct host.");
-  is($$fun(".call-tree-category")[3].getAttribute("value"), "GC",
+  is($fun(".call-tree-category", $$(".call-tree-item")[3]).getAttribute("value"), "GC",
     "The .A.E node's function cell displays the correct category.");
 
   finish();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-view-03.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-view-03.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-view-03.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-view-03.js	2015-05-25 20:42:55.000000000 +0000
@@ -7,8 +7,8 @@
  */
 
 function test() {
-  let { ThreadNode } = devtools.require("devtools/shared/profiler/tree-model");
-  let { CallView } = devtools.require("devtools/shared/profiler/tree-view");
+  let { ThreadNode } = devtools.require("devtools/performance/tree-model");
+  let { CallView } = devtools.require("devtools/performance/tree-view");
 
   let threadNode = new ThreadNode(gThread);
   // Don't display the synthesized (root) and the real (root) node twice.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-view-04.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-view-04.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-view-04.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-view-04.js	2015-05-25 20:42:55.000000000 +0000
@@ -6,11 +6,11 @@
  * creates the correct DOM nodes in the correct order.
  */
 
-let { CATEGORY_MASK } = devtools.require("devtools/shared/profiler/global");
+let { CATEGORY_MASK } = devtools.require("devtools/performance/global");
 
 function test() {
-  let { ThreadNode } = devtools.require("devtools/shared/profiler/tree-model");
-  let { CallView } = devtools.require("devtools/shared/profiler/tree-view");
+  let { ThreadNode } = devtools.require("devtools/performance/tree-model");
+  let { CallView } = devtools.require("devtools/performance/tree-view");
 
   let threadNode = new ThreadNode(gThread);
   // Don't display the synthesized (root) and the real (root) node twice.
@@ -26,7 +26,7 @@
     "The root node's 'category' attribute is correct.");
   is(treeRoot.target.getAttribute("tooltiptext"), "",
     "The root node's 'tooltiptext' attribute is correct.");
-  ok(treeRoot.target.querySelector(".call-tree-category").hidden,
+  is(treeRoot.target.querySelector(".call-tree-category"), null,
     "The root node's category label cell should be hidden.");
 
   let A = treeRoot.getChild();
@@ -37,7 +37,7 @@
     "The .A.B.D node's 'origin' attribute is correct.");
   is(D.target.getAttribute("category"), "gc",
     "The .A.B.D node's 'category' attribute is correct.");
-  is(D.target.getAttribute("tooltiptext"), "D (http://foo/bar/baz:78)",
+  is(D.target.getAttribute("tooltiptext"), "D (http://foo/bar/baz:78:1337)",
     "The .A.B.D node's 'tooltiptext' attribute is correct.");
   ok(!A.target.querySelector(".call-tree-category").hidden,
     "The .A.B.D node's category label cell should not be hidden.");
@@ -72,7 +72,7 @@
   is(functionCell.childNodes[4].className, "plain call-tree-column",
     "The fifth node displayed for function cells is correct.");
   is(functionCell.childNodes[5].className, "plain call-tree-host",
-    "The fifth node displayed for function cells is correct.");
+    "The sixth node displayed for function cells is correct.");
   is(functionCell.childNodes[6].tagName, "spacer",
     "The seventh node displayed for function cells is correct.");
   is(functionCell.childNodes[7].className, "plain call-tree-category",
@@ -95,7 +95,7 @@
     { category: CATEGORY_MASK('other'),  location: "(root)" },
     { category: CATEGORY_MASK('other'),  location: "A (http://foo/bar/baz:12)" },
     { category: CATEGORY_MASK('css'),    location: "B (http://foo/bar/baz:34)" },
-    { category: CATEGORY_MASK('gc', 1),  location: "D (http://foo/bar/baz:78)" }
+    { category: CATEGORY_MASK('gc', 1),  location: "D (http://foo/bar/baz:78:1337)" }
   ]
 }, {
   time: 5 + 1 + 2,
@@ -103,7 +103,7 @@
     { category: CATEGORY_MASK('other'),  location: "(root)" },
     { category: CATEGORY_MASK('other'),  location: "A (http://foo/bar/baz:12)" },
     { category: CATEGORY_MASK('css'),    location: "B (http://foo/bar/baz:34)" },
-    { category: CATEGORY_MASK('gc', 1),  location: "D (http://foo/bar/baz:78)" }
+    { category: CATEGORY_MASK('gc', 1),  location: "D (http://foo/bar/baz:78:1337)" }
   ]
 }, {
   time: 5 + 1 + 2 + 7,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-view-05.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-view-05.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-view-05.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-view-05.js	2015-05-25 20:42:55.000000000 +0000
@@ -7,8 +7,8 @@
  */
 
 function test() {
-  let { ThreadNode } = devtools.require("devtools/shared/profiler/tree-model");
-  let { CallView } = devtools.require("devtools/shared/profiler/tree-view");
+  let { ThreadNode } = devtools.require("devtools/performance/tree-model");
+  let { CallView } = devtools.require("devtools/performance/tree-view");
 
   let threadNode = new ThreadNode(gThread);
   // Don't display the synthesized (root) and the real (root) node twice.
@@ -19,13 +19,13 @@
   treeRoot.attachTo(container);
 
   let categories = container.querySelectorAll(".call-tree-category");
-  is(categories.length, 7,
+  is(categories.length, 5,
     "The call tree displays a correct number of categories.");
   ok(!container.hasAttribute("categories-hidden"),
     "All categories should be visible in the tree.");
 
   treeRoot.toggleCategories(false);
-  is(categories.length, 7,
+  is(categories.length, 5,
     "The call tree displays the same number of categories.");
   ok(container.hasAttribute("categories-hidden"),
     "All categories should now be hidden in the tree.");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-view-06.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-view-06.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-view-06.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-view-06.js	2015-05-25 20:42:55.000000000 +0000
@@ -7,8 +7,8 @@
  */
 
 function spawnTest () {
-  let { ThreadNode } = devtools.require("devtools/shared/profiler/tree-model");
-  let { CallView } = devtools.require("devtools/shared/profiler/tree-view");
+  let { ThreadNode } = devtools.require("devtools/performance/tree-model");
+  let { CallView } = devtools.require("devtools/performance/tree-view");
 
   let threadNode = new ThreadNode(gThread);
   // Don't display the synthesized (root) and the real (root) node twice.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-view-07.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-view-07.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-view-07.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-view-07.js	2015-05-25 20:42:55.000000000 +0000
@@ -7,8 +7,8 @@
  */
 
 function spawnTest () {
-  let { ThreadNode } = devtools.require("devtools/shared/profiler/tree-model");
-  let { CallView } = devtools.require("devtools/shared/profiler/tree-view");
+  let { ThreadNode } = devtools.require("devtools/performance/tree-model");
+  let { CallView } = devtools.require("devtools/performance/tree-view");
 
   let threadNode = new ThreadNode(gThread);
   // Don't display the synthesized (root) and the real (root) node twice.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-view-08.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-view-08.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-view-08.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-view-08.js	2015-05-25 20:42:55.000000000 +0000
@@ -6,11 +6,11 @@
  * when `contentOnly` is on correctly.
  */
 
-let { CATEGORY_MASK } = devtools.require("devtools/shared/profiler/global");
+let { CATEGORY_MASK } = devtools.require("devtools/performance/global");
 
 function test() {
-  let { ThreadNode } = devtools.require("devtools/shared/profiler/tree-model");
-  let { CallView } = devtools.require("devtools/shared/profiler/tree-view");
+  let { ThreadNode } = devtools.require("devtools/performance/tree-model");
+  let { CallView } = devtools.require("devtools/performance/tree-view");
 
   /*
    * should have a tree like:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-view-09.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-view-09.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_profiler_tree-view-09.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_profiler_tree-view-09.js	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,56 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that the profiler's tree view sorts inverted call trees by
+ * "self cost" and not "total cost".
+ */
+
+let { CATEGORY_MASK } = devtools.require("devtools/performance/global");
+
+let test = Task.async(function*() {
+  let { ThreadNode } = devtools.require("devtools/performance/tree-model");
+  let { CallView } = devtools.require("devtools/performance/tree-view");
+
+  let threadNode = new ThreadNode(gSamples, { invertTree: true });
+  let treeRoot = new CallView({ frame: threadNode, inverted: true, autoExpandDepth: 1 });
+
+  let container = document.createElement("vbox");
+  treeRoot.attachTo(container);
+
+  is(treeRoot.getChild(0).frame.location, "B",
+    "The tree root's first child is the `B` function.");
+  is(treeRoot.getChild(1).frame.location, "A",
+    "The tree root's second child is the `A` function.");
+
+  finish();
+});
+
+let gSamples = synthesizeProfileForTest([{
+  time: 1,
+  frames: [
+    { location: "(root)" },
+    { location: "A" },
+    { location: "B" },
+  ]
+}, {
+  time: 2,
+  frames: [
+    { location: "(root)" },
+    { location: "A" },
+    { location: "B" }
+  ]
+}, {
+  time: 3,
+  frames: [
+    { location: "(root)" },
+    { location: "A" },
+    { location: "B" },
+  ]
+}, {
+  time: 4,
+  frames: [
+    { location: "(root)" },
+    { location: "A" }
+  ]
+}]);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_retro-test.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_retro-test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_retro-test.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_retro-test.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests that only js-calltree view is on, default, and many things are hidden
- * when in retro mode.
- */
-const HIDDEN_OPTIONS = ["option-enable-memory", "option-invert-flame-graph", "option-show-jit-optimizations", "option-flatten-tree-recursion"];
-
-Services.prefs.setBoolPref("devtools.performance.ui.retro-mode", true);
-
-function spawnTest () {
-  let { panel } = yield initPerformance(SIMPLE_URL);
-  let { EVENTS, DetailsView, PerformanceController, $, $$, JsCallTreeView } = panel.panelWin;
-
-  yield startRecording(panel);
-  yield stopRecording(panel);
-
-  let model = PerformanceController.getCurrentRecording();
-
-  ok(model.getMemory().length === 0, "model did not record memory.");
-  ok(model.getTicks().length !== 0, "model did get ticks.");
-  ok(model.getAllocations().sites.length === 0, "model did get allocation data.");
-  ok(model.getAllocations().timestamps.length === 0, "model did get allocation data.");
-  ok(model.getAllocations().frames.length === 0, "model did get allocation data.");
-  ok(model.getAllocations().counts.length === 0, "model did get allocation data.");
-
-  ok(DetailsView.isViewSelected(JsCallTreeView),
-    "The jscalltree view is selected by default");
-
-  for (let option of $$("#performance-options-menupopup > menuitem")) {
-    if (HIDDEN_OPTIONS.indexOf(option.id) !== -1) {
-      ok(option.hidden === true, `${option.id} should be hidden.`);
-    } else {
-      ok(option.hidden === false, `${option.id} should be visible.`);
-    }
-  }
-
-  for (let viewbutton of $$("#performance-toolbar-controls-detail-views > toolbarbutton")) {
-    ok (viewbutton.hidden === true, `${viewbutton.id} should be hidden.`);
-  }
-
-  ok($("#markers-overview").hidden, "markers overview should be hidden.");
-  ok($("#memory-overview").hidden, "memory overview should be hidden.");
-  ok(!$("#time-framerate").hidden, "framerate should be shown.");
-
-  yield teardown(panel);
-  finish();
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_timeline-blueprint.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_timeline-blueprint.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_timeline-blueprint.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_timeline-blueprint.js	2015-05-25 20:42:55.000000000 +0000
@@ -6,7 +6,7 @@
  */
 
 function spawnTest () {
-  let { TIMELINE_BLUEPRINT } = devtools.require("devtools/shared/timeline/global");
+  let { TIMELINE_BLUEPRINT } = devtools.require("devtools/performance/global");
 
   ok(TIMELINE_BLUEPRINT,
     "A timeline blueprint should be available.");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_timeline-waterfall-sidebar.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_timeline-waterfall-sidebar.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/browser_timeline-waterfall-sidebar.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/browser_timeline-waterfall-sidebar.js	2015-05-25 20:42:55.000000000 +0000
@@ -8,7 +8,8 @@
 function spawnTest () {
   let { target, panel } = yield initPerformance(SIMPLE_URL);
   let { $, $$, EVENTS, PerformanceController, OverviewView } = panel.panelWin;
-  let { L10N, TIMELINE_BLUEPRINT } = devtools.require("devtools/shared/timeline/global");
+  let { L10N, TIMELINE_BLUEPRINT } = devtools.require("devtools/performance/global");
+  let { getMarkerLabel } = devtools.require("devtools/performance/marker-utils");
 
   yield startRecording(panel);
   ok(true, "Recording has started.");
@@ -38,21 +39,20 @@
     bar.click();
     let m = markers[i];
 
-    let name = TIMELINE_BLUEPRINT[m.name].label;
-
-    is($("#waterfall-details .marker-details-type").getAttribute("value"), name,
+    is($("#waterfall-details .marker-details-type").getAttribute("value"), getMarkerLabel(m),
       "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 tooltip = $(".marker-details-duration").getAttribute("tooltiptext");
+    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");
+    // For some reason, anything that creates "→" here turns it into a "â" for some reason.
+    // So just check that start and end time are in there somewhere.
+    ok(tooltip.indexOf(toMs(m.start)) !== -1, "tooltip has start time");
+    ok(tooltip.indexOf(toMs(m.end)) !== -1, "tooltip has end time");
   }
   yield teardown(panel);
   finish();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/head.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/test/head.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/test/head.js	2015-05-25 20:42:55.000000000 +0000
@@ -13,10 +13,10 @@
 let { DevToolsUtils } = Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm", {});
 let { DebuggerServer } = Cu.import("resource://gre/modules/devtools/dbg-server.jsm", {});
 let { merge } = devtools.require("sdk/util/object");
+let { generateUUID } = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator);
 let { getPerformanceActorsConnection, PerformanceFront } = devtools.require("devtools/performance/front");
-
-let nsIProfilerModule = Cc["@mozilla.org/tools/profiler;1"].getService(Ci.nsIProfiler);
 let TargetFactory = devtools.TargetFactory;
+
 let mm = null;
 
 const FRAME_SCRIPT_UTILS_URL = "chrome://browser/content/devtools/frame-script-utils.js"
@@ -37,6 +37,7 @@
 const INVERT_FLAME_PREF = "devtools.performance.ui.invert-flame-graph";
 const FLATTEN_PREF = "devtools.performance.ui.flatten-tree-recursion";
 const JIT_PREF = "devtools.performance.ui.show-jit-optimizations";
+const EXPERIMENTAL_PREF = "devtools.performance.ui.experimental";
 
 // All tests are asynchronous.
 waitForExplicitFinish();
@@ -56,7 +57,7 @@
   "devtools.performance.memory.max-log-length",
   "devtools.performance.profiler.buffer-size",
   "devtools.performance.profiler.sample-frequency-khz",
-  "devtools.performance.ui.retro-mode",
+  "devtools.performance.ui.experimental",
 ].reduce((prefs, pref) => {
   prefs[pref] = Preferences.get(pref);
   return prefs;
@@ -68,15 +69,9 @@
 // be affected by this pref.
 Services.prefs.setBoolPref("devtools.debugger.log", false);
 
-// Disable retro mode.
-// TODO bug 1160313
-Services.prefs.setBoolPref("devtools.performance.ui.retro-mode", false);
-
 /**
  * Call manually in tests that use frame script utils after initializing
- * the tool. Must be called after initializing so we can detect
- * whether or not `content` is a CPOW or not. Call after init but before navigating
- * to different pages.
+ * the tool. Must be called after initializing (once we have a tab).
  */
 function loadFrameScripts () {
   mm = gBrowser.selectedBrowser.messageManager;
@@ -92,9 +87,6 @@
     Preferences.set(pref, DEFAULT_PREFS[pref]);
   });
 
-  // Make sure the profiler module is stopped when the test finishes.
-  nsIProfilerModule.StopProfiler();
-
   Cu.forceGC();
 });
 
@@ -580,3 +572,39 @@
     markers: []
   }, uniqueStacks);
 }
+
+function PMM_isProfilerActive () {
+  return sendProfilerCommand("IsActive");
+}
+
+function PMM_stopProfiler () {
+  return Task.spawn(function*() {
+    let isActive = (yield sendProfilerCommand("IsActive")).isActive;
+    if (isActive) {
+      return sendProfilerCommand("StopProfiler");
+    }
+  });
+}
+
+function sendProfilerCommand (method, args=[]) {
+  let deferred = Promise.defer();
+
+  if (!mm) {
+    throw new Error("`loadFrameScripts()` must be called when using MessageManager.");
+  }
+
+  let id = generateUUID().toString();
+  mm.addMessageListener("devtools:test:profiler:response", handler);
+  mm.sendAsyncMessage("devtools:test:profiler", { method, args, id });
+
+  function handler ({ data }) {
+    if (id !== data.id) {
+      return;
+    }
+
+    mm.removeMessageListener("devtools:test:profiler:response", handler);
+    deferred.resolve(data.data);
+  }
+
+  return deferred.promise;
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/views/details.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/views/details.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/views/details.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/views/details.js	2015-05-25 20:42:55.000000000 +0000
@@ -92,12 +92,9 @@
     let invalidCurrentView = false;
 
     for (let [name, { view }] of Iterator(this.components)) {
-      // TODO bug 1160313 get rid of retro mode checks.
-      let isRetro = PerformanceController.getOption("retro-mode");
-      let isSupported = isRetro ? name === "js-calltree" : this._isViewSupported(name, true);
+      let isSupported = this._isViewSupported(name, true);
 
-      // TODO bug 1160313 hide all view buttons, but let js-calltree still be "supported"
-      $(`toolbarbutton[data-view=${name}]`).hidden = isRetro ? true : !isSupported;
+      $(`toolbarbutton[data-view=${name}]`).hidden = !isSupported;
 
       // If the view is currently selected and not supported, go back to the
       // default view.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/views/details-js-call-tree.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/views/details-js-call-tree.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/views/details-js-call-tree.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/views/details-js-call-tree.js	2015-05-25 20:42:55.000000000 +0000
@@ -26,7 +26,6 @@
     this._onLink = this._onLink.bind(this);
 
     this.container = $("#js-calltree-view .call-tree-cells-container");
-
     JITOptimizationsView.initialize();
   },
 
@@ -123,8 +122,8 @@
     root.attachTo(this.container);
 
     // When platform data isn't shown, hide the cateogry labels, since they're
-    // only available for C++ frames.
-    root.toggleCategories(options.contentOnly);
+    // only available for C++ frames. Pass *false* to make them invisible.
+    root.toggleCategories(!options.contentOnly);
 
     // Return the CallView for tests
     return root;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/views/details-waterfall.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/views/details-waterfall.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/views/details-waterfall.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/views/details-waterfall.js	2015-05-25 20:42:55.000000000 +0000
@@ -3,6 +3,8 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
+const MARKER_DETAILS_WIDTH = 300;
+
 /**
  * Waterfall view containing the timeline markers, controlled by DetailsView.
  */
@@ -24,6 +26,9 @@
   initialize: function () {
     DetailsSubview.initialize.call(this);
 
+    // TODO bug 1167093 save the previously set width, and ensure minimum width
+    $("#waterfall-details").setAttribute("width", MARKER_DETAILS_WIDTH);
+
     this.waterfall = new Waterfall($("#waterfall-breakdown"), $("#waterfall-view"));
     this.details = new MarkerDetails($("#waterfall-details"), $("#waterfall-view > splitter"));
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/views/jit-optimizations.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/views/jit-optimizations.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/views/jit-optimizations.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/views/jit-optimizations.js	2015-05-25 20:42:55.000000000 +0000
@@ -12,7 +12,7 @@
 /**
  * View for rendering JIT Optimization data. The terminology and types
  * used here can be referenced:
- * @see browser/devtools/shared/profiler/jit.js
+ * @see browser/devtools/performance/modules/logic/jit.js
  */
 
 let JITOptimizationsView = {
@@ -243,7 +243,7 @@
   /**
    * Creates an element for insertion in the raw view for an IonType.
    *
-   * @see browser/devtools/shared/profiler/jit.js
+   * @see browser/devtools/performance/modules/logic/jit.js
    * @param {IonType} ionType
    * @return {Element}
    */
@@ -258,7 +258,7 @@
   /**
    * Creates an element for insertion in the raw view for an ObservedType.
    *
-   * @see browser/devtools/shared/profiler/jit.js
+   * @see browser/devtools/performance/modules/logic/jit.js
    * @param {ObservedType} type
    * @return {Element}
    */
@@ -298,7 +298,7 @@
   /**
    * Creates an element for insertion in the raw view for an OptimizationAttempt.
    *
-   * @see browser/devtools/shared/profiler/jit.js
+   * @see browser/devtools/performance/modules/logic/jit.js
    * @param {OptimizationAttempt} attempt
    * @return {Element}
    */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/views/overview.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/views/overview.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/views/overview.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/views/overview.js	2015-05-25 20:42:55.000000000 +0000
@@ -31,6 +31,12 @@
 let OverviewView = {
 
   /**
+   * How frequently we attempt to render the graphs. Overridden
+   * in tests.
+   */
+  OVERVIEW_UPDATE_INTERVAL: OVERVIEW_UPDATE_INTERVAL,
+
+  /**
    * Sets up the view with event binding.
    */
   initialize: function () {
@@ -46,6 +52,9 @@
       return;
     }
 
+    // Store info on multiprocess support.
+    this._multiprocessData = PerformanceController.getMultiprocessStatus();
+
     this._onRecordingWillStart = this._onRecordingWillStart.bind(this);
     this._onRecordingStarted = this._onRecordingStarted.bind(this);
     this._onRecordingWillStop = this._onRecordingWillStop.bind(this);
@@ -173,6 +182,7 @@
     if (this.isDisabled()) {
       return;
     }
+
     let recording = PerformanceController.getCurrentRecording();
     yield this.graphs.render(recording.getAllData(), resolution);
 
@@ -197,7 +207,7 @@
     // Check here to see if there's still a _timeoutId, incase
     // `stop` was called before the _prepareNextTick call was executed.
     if (this.isRendering()) {
-      this._timeoutId = setTimeout(this._onRecordingTick, OVERVIEW_UPDATE_INTERVAL);
+      this._timeoutId = setTimeout(this._onRecordingTick, this.OVERVIEW_UPDATE_INTERVAL);
     }
   },
 
@@ -255,7 +265,7 @@
    * Start the polling for rendering the overview graph.
    */
   _startPolling: function () {
-    this._timeoutId = setTimeout(this._onRecordingTick, OVERVIEW_UPDATE_INTERVAL);
+    this._timeoutId = setTimeout(this._onRecordingTick, this.OVERVIEW_UPDATE_INTERVAL);
   },
 
   /**
@@ -341,6 +351,35 @@
   },
 
   /**
+   * Fetch the multiprocess status and if e10s is not currently on, disable
+   * realtime rendering.
+   *
+   * @return {boolean}
+   */
+  isRealtimeRenderingEnabled: function () {
+    return this._multiprocessData.enabled;
+  },
+
+  /**
+   * Show the graphs overview panel when a recording is finished
+   * when non-realtime graphs are enabled. Also set the graph visibility
+   * so the performance graphs know which graphs to render.
+   *
+   * @param {RecordingModel} recording
+   */
+  _showGraphsPanel: function (recording) {
+    this._setGraphVisibilityFromRecordingFeatures(recording);
+    $("#overview-pane").hidden = false;
+  },
+
+  /**
+   * Hide the graphs container completely.
+   */
+  _hideGraphsPanel: function () {
+    $("#overview-pane").hidden = true;
+  },
+
+  /**
    * Called when `devtools.theme` changes.
    */
   _onThemeChanged: function (_, theme) {
@@ -361,14 +400,34 @@
  * @return {function}
  */
 function OverviewViewOnStateChange (fn) {
-  return function _onRecordingStateChange () {
+  return function _onRecordingStateChange (eventName, recording) {
     let currentRecording = PerformanceController.getCurrentRecording();
 
-    // All these methods require a recording to exist.
-    if (!currentRecording) {
+    // All these methods require a recording to exist selected and
+    // from the event name, since there is a delay between starting
+    // a recording and changing the selection.
+    if (!currentRecording || !recording) {
+      // If no recording (this can occur when having a console.profile recording, and
+      // we do not stop it from the backend), and we are still rendering updates,
+      // stop that.
+      if (this.isRendering()) {
+        this._stopPolling();
+      }
       return;
     }
 
+    // If realtime rendering is not enabed (e10s not on), then
+    // show the disabled message, or the full graphs if the recording is completed
+    if (!this.isRealtimeRenderingEnabled()) {
+      if (recording.isRecording()) {
+        this._hideGraphsPanel();
+        // Abort, as we do not want to change polling status.
+        return;
+      } else {
+        this._showGraphsPanel(recording);
+      }
+    }
+
     if (this.isRendering() && !currentRecording.isRecording()) {
       this._stopPolling();
     } else if (currentRecording.isRecording() && !this.isRendering()) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/views/recordings.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/views/recordings.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/views/recordings.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/views/recordings.js	2015-05-25 20:42:55.000000000 +0000
@@ -214,7 +214,8 @@
    */
   _onSaveButtonClick: function (e) {
     let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
-    fp.init(window, L10N.getStr("recordingsList.saveDialogTitle"), Ci.nsIFilePicker.modeSave);
+    // TODO localize? in bug 1163763
+    fp.init(window, "Save recording…", Ci.nsIFilePicker.modeSave);
     fp.appendFilter(L10N.getStr("recordingsList.saveDialogJSONFilter"), "*.json");
     fp.appendFilter(L10N.getStr("recordingsList.saveDialogAllFilter"), "*.*");
     fp.defaultString = "profile.json";
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/views/toolbar.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/views/toolbar.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/performance/views/toolbar.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/performance/views/toolbar.js	2015-05-25 20:42:55.000000000 +0000
@@ -15,29 +15,17 @@
     this._onFilterPopupHiding = this._onFilterPopupHiding.bind(this);
     this._onHiddenMarkersChanged = this._onHiddenMarkersChanged.bind(this);
     this._onPrefChanged = this._onPrefChanged.bind(this);
+    this._popup = $("#performance-options-menupopup");
 
     this.optionsView = new OptionsView({
       branchName: BRANCH_NAME,
-      menupopup: $("#performance-options-menupopup")
+      menupopup: this._popup
     });
 
-    // TODO bug 1160313 get rid of retro mode checks
-    // hide option buttons here, and any other buttons in the toolbar
-    // (details.js takes care of view buttons)
-    if (PerformanceController.getOption("retro-mode")) {
-      let RETRO_ELEMENTS = [
-        "#option-flatten-tree-recursion",
-        "#option-invert-flame-graph",
-        "#filter-button",
-        // TODO re-enable in bug 1163350
-        // "#option-enable-memory",
-        // TODO re-enable in bug 1163351
-        // "#option-show-jit-optimizations",
-      ];
-      for (let selector of RETRO_ELEMENTS) {
-        $(selector).hidden = true;
-      }
-    }
+    // Set the visibility of experimental UI options on load
+    // based off of `devtools.performance.ui.experimental` preference
+    let experimentalEnabled = PerformanceController.getOption("experimental");
+    this._toggleExperimentalUI(experimentalEnabled);
 
     yield this.optionsView.initialize();
     this.optionsView.on("pref-changed", this._onPrefChanged);
@@ -54,6 +42,7 @@
   destroy: function () {
     $("#performance-filter-menupopup").removeEventListener("popupshowing", this._onFilterPopupShowing);
     $("#performance-filter-menupopup").removeEventListener("popuphiding",  this._onFilterPopupHiding);
+    this._popup = null
 
     this.optionsView.off("pref-changed", this._onPrefChanged);
     this.optionsView.destroy();
@@ -69,9 +58,9 @@
       menuitem.setAttribute("type", "checkbox");
       menuitem.setAttribute("align", "center");
       menuitem.setAttribute("flex", "1");
-      menuitem.setAttribute("label", markerDetails.label);
+      menuitem.setAttribute("label", MarkerUtils.getMarkerClassName(markerName));
       menuitem.setAttribute("marker-type", markerName);
-      menuitem.className = markerDetails.colorName;
+      menuitem.className = `marker-color-${markerDetails.colorName}`;
 
       menuitem.addEventListener("command", this._onHiddenMarkersChanged);
 
@@ -96,6 +85,29 @@
   },
 
   /**
+   * Fired when `devtools.performance.ui.experimental` is changed, or
+   * during init. Toggles the visibility of experimental performance tool options
+   * in the UI options.
+   *
+   * Sets or removes "experimental-enabled" on the menu and main elements,
+   * hiding or showing all elements with class "experimental-option".
+   *
+   * TODO re-enable "#option-enable-memory" permanently once stable in bug 1163350
+   * TODO re-enable "#option-show-jit-optimizations" permanently once stable in bug 1163351
+   *
+   * @param {boolean} isEnabled
+   */
+  _toggleExperimentalUI: function (isEnabled) {
+    if (isEnabled) {
+      $(".theme-body").classList.add("experimental-enabled");
+      this._popup.classList.add("experimental-enabled");
+    } else {
+      $(".theme-body").classList.remove("experimental-enabled");
+      this._popup.classList.remove("experimental-enabled");
+    }
+  },
+
+  /**
    * Fired when the markers filter popup starts to show.
    */
   _onFilterPopupShowing: function() {
@@ -123,7 +135,12 @@
    * Propogated by the PerformanceController.
    */
   _onPrefChanged: function (_, prefName) {
-    let value = Services.prefs.getBoolPref(BRANCH_NAME + prefName);
+    let value = PerformanceController.getOption(prefName);
+
+    if (prefName === "experimental") {
+      this._toggleExperimentalUI(value);
+    }
+
     this.emit(EVENTS.PREF_CHANGED, prefName, value);
   },
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/moz.build firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/moz.build	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXTRA_JS_MODULES.devtools.profiler += [
-    'panel.js',
-    'utils/shared.js'
-]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/panel.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/panel.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/panel.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/panel.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-/* -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-const {Cc, Ci, Cu, Cr} = require("chrome");
-
-Cu.import("resource://gre/modules/Task.jsm");
-
-loader.lazyRequireGetter(this, "promise");
-loader.lazyRequireGetter(this, "EventEmitter",
-  "devtools/toolkit/event-emitter");
-
-loader.lazyRequireGetter(this, "getProfilerConnection",
-  "devtools/profiler/shared", true);
-loader.lazyRequireGetter(this, "ProfilerFront",
-  "devtools/profiler/shared", true);
-
-function ProfilerPanel(iframeWindow, toolbox) {
-  this.panelWin = iframeWindow;
-  this._toolbox = toolbox;
-
-  EventEmitter.decorate(this);
-}
-
-exports.ProfilerPanel = ProfilerPanel;
-
-ProfilerPanel.prototype = {
-  /**
-   * Open is effectively an asynchronous constructor.
-   *
-   * @return object
-   *         A promise that is resolved when the Profiler completes opening.
-   */
-  open: Task.async(function*() {
-    this._connection = getProfilerConnection(this._toolbox);
-    yield this._connection.open();
-
-    this.panelWin.gToolbox = this._toolbox;
-    this.panelWin.gTarget = this.target;
-    this.panelWin.gFront = new ProfilerFront(this._connection);
-    yield this.panelWin.startupProfiler();
-
-    this.isReady = true;
-    this.emit("ready");
-    return this;
-  }),
-
-  // DevToolPanel API
-
-  get target() this._toolbox.target,
-
-  destroy: Task.async(function*() {
-    // Make sure this panel is not already destroyed.
-    if (this._destroyed) {
-      return;
-    }
-
-    yield this.panelWin.shutdownProfiler();
-
-    // Destroy the connection to ensure packet handlers are removed from client.
-    this._connection.destroy();
-
-    this.emit("destroyed");
-    this._destroyed = true;
-  })
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/profiler.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/profiler.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/profiler.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/profiler.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,232 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
-
-Cu.import("resource://gre/modules/Task.jsm");
-Cu.import("resource://gre/modules/devtools/Loader.jsm");
-Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
-
-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/shared/profiler/global", true);
-devtools.lazyRequireGetter(this, "CATEGORIES",
-  "devtools/shared/profiler/global", true);
-devtools.lazyRequireGetter(this, "CATEGORY_MAPPINGS",
-  "devtools/shared/profiler/global", true);
-devtools.lazyRequireGetter(this, "CATEGORY_OTHER",
-  "devtools/shared/profiler/global", true);
-devtools.lazyRequireGetter(this, "ThreadNode",
-  "devtools/shared/profiler/tree-model", true);
-devtools.lazyRequireGetter(this, "CallView",
-  "devtools/shared/profiler/tree-view", true);
-
-devtools.lazyImporter(this, "FileUtils",
-  "resource://gre/modules/FileUtils.jsm");
-devtools.lazyImporter(this, "NetUtil",
-  "resource://gre/modules/NetUtil.jsm");
-devtools.lazyImporter(this, "LineGraphWidget",
-  "resource:///modules/devtools/Graphs.jsm");
-devtools.lazyImporter(this, "BarGraphWidget",
-  "resource:///modules/devtools/Graphs.jsm");
-devtools.lazyImporter(this, "CanvasGraphUtils",
-  "resource:///modules/devtools/Graphs.jsm");
-devtools.lazyImporter(this, "SideMenuWidget",
-  "resource:///modules/devtools/SideMenuWidget.jsm");
-
-const RECORDING_DATA_DISPLAY_DELAY = 10; // ms
-const FRAMERATE_CALC_INTERVAL = 16; // ms
-const FRAMERATE_GRAPH_HEIGHT = 60; // px
-const CATEGORIES_GRAPH_HEIGHT = 60; // px
-const CATEGORIES_GRAPH_MIN_BARS_WIDTH = 3; // px
-const CALL_VIEW_FOCUS_EVENTS_DRAIN = 10; // ms
-const GRAPH_SCROLL_EVENTS_DRAIN = 50; // ms
-const GRAPH_ZOOM_MIN_TIMESPAN = 20; // ms
-
-// This identifier string is used to tentatively ascertain whether or not
-// a JSON loaded from disk is actually something generated by this tool.
-// It isn't, of course, a definitive verification, but a Good Enough™
-// approximation before continuing the import. Don't localize this.
-const PROFILE_SERIALIZER_IDENTIFIER = "Recorded Performance Data";
-const PROFILE_SERIALIZER_VERSION = 1;
-
-// The panel's window global is an EventEmitter firing the following events:
-const EVENTS = {
-  // When a recording is started or stopped, via the `stopwatch` button, or
-  // when `console.profile` and `console.profileEnd` is invoked.
-  RECORDING_STARTED: "Profiler:RecordingStarted",
-  RECORDING_ENDED: "Profiler:RecordingEnded",
-
-  // When a recording is abruptly ended, either because the built-in profiler
-  // module is stopped by a third party, or because the recordings list is
-  // cleared while there's one in progress.
-  RECORDING_LOST: "Profiler:RecordingCancelled",
-
-  // When a recording is displayed in the ProfileView.
-  RECORDING_DISPLAYED: "Profiler:RecordingDisplayed",
-
-  // When a new tab is spawned in the ProfileView from a graphs selection.
-  TAB_SPAWNED_FROM_SELECTION: "Profiler:TabSpawnedFromSelection",
-
-  // When a new tab is spawned in the ProfileView from a node in the tree.
-  TAB_SPAWNED_FROM_FRAME_NODE: "Profiler:TabSpawnedFromFrameNode",
-
-  // When different panels in the ProfileView are shown.
-  EMPTY_NOTICE_SHOWN: "Profiler:EmptyNoticeShown",
-  RECORDING_NOTICE_SHOWN: "Profiler:RecordingNoticeShown",
-  LOADING_NOTICE_SHOWN: "Profiler:LoadingNoticeShown",
-  TABBED_BROWSER_SHOWN: "Profiler:TabbedBrowserShown",
-
-  // When a source is shown in the JavaScript Debugger at a specific location.
-  SOURCE_SHOWN_IN_JS_DEBUGGER: "Profiler:SourceShownInJsDebugger",
-  SOURCE_NOT_FOUND_IN_JS_DEBUGGER: "Profiler:SourceNotFoundInJsDebugger"
-};
-
-/**
- * The current target and the profiler connection, set by this tool's host.
- */
-let gToolbox, gTarget, gFront;
-
-/**
- * Initializes the profiler controller and views.
- */
-let startupProfiler = Task.async(function*() {
-  yield promise.all([
-    PrefObserver.register(),
-    EventsHandler.initialize(),
-    RecordingsListView.initialize(),
-    ProfileView.initialize()
-  ]);
-
-  // Profiles may have been created before this tool was opened, e.g. via
-  // `console.profile` and `console.profileEnd(). Populate the UI with them.
-  for (let recordingData of gFront.finishedConsoleRecordings) {
-    let profileLabel = recordingData.profilerData.profileLabel;
-    let recordingItem = RecordingsListView.addEmptyRecording(profileLabel);
-    RecordingsListView.customizeRecording(recordingItem, recordingData);
-  }
-  for (let { profileLabel } of gFront.pendingConsoleRecordings) {
-    RecordingsListView.handleRecordingStarted(profileLabel);
-  }
-
-  // Select the first recording, if available.
-  RecordingsListView.selectedIndex = 0;
-});
-
-/**
- * Destroys the profiler controller and views.
- */
-let shutdownProfiler = Task.async(function*() {
-  yield promise.all([
-    PrefObserver.unregister(),
-    EventsHandler.destroy(),
-    RecordingsListView.destroy(),
-    ProfileView.destroy()
-  ]);
-});
-
-/**
- * Observes pref changes on the devtools.profiler branch and triggers the
- * required frontend modifications.
- */
-let PrefObserver = {
-  register: function() {
-    this.branch = Services.prefs.getBranch("devtools.profiler.");
-    this.branch.addObserver("", this, false);
-  },
-  unregister: function() {
-    this.branch.removeObserver("", this);
-  },
-  observe: function(subject, topic, pref) {
-    if (pref == "ui.show-platform-data") {
-      RecordingsListView.forceSelect(RecordingsListView.selectedItem);
-    }
-  }
-};
-
-/**
- * Functions handling target-related lifetime events.
- */
-let EventsHandler = {
-  /**
-   * Listen for events emitted by the current tab target.
-   */
-  initialize: function() {
-    this._onConsoleProfileStart = this._onConsoleProfileStart.bind(this);
-    this._onConsoleProfileEnd = this._onConsoleProfileEnd.bind(this);
-
-    gFront.on("profile", this._onConsoleProfileStart);
-    gFront.on("profileEnd", this._onConsoleProfileEnd);
-    gFront.on("profiler-unexpectedly-stopped", this._onProfilerDeactivated);
-  },
-
-  /**
-   * Remove events emitted by the current tab target.
-   */
-  destroy: function() {
-    gFront.off("profile", this._onConsoleProfileStart);
-    gFront.off("profileEnd", this._onConsoleProfileEnd);
-    gFront.off("profiler-unexpectedly-stopped", this._onProfilerDeactivated);
-  },
-
-  /**
-   * Invoked whenever `console.profile` is called.
-   *
-   * @param string profileLabel
-   *        The provided string argument if available, undefined otherwise.
-   */
-  _onConsoleProfileStart: function(event, profileLabel) {
-    RecordingsListView.handleRecordingStarted(profileLabel);
-  },
-
-  /**
-   * Invoked whenever `console.profileEnd` is called.
-   *
-   * @param object recordingData
-   *        The profiler and refresh driver ticks data received from the front.
-   */
-  _onConsoleProfileEnd: function(event, recordingData) {
-    RecordingsListView.handleRecordingEnded(recordingData);
-  },
-
-  /**
-   * Invoked whenever the built-in profiler module is deactivated.
-   * @see ProfilerConnection.prototype._onProfilerUnexpectedlyStopped
-   */
-  _onProfilerDeactivated: function() {
-    RecordingsListView.removeForPredicate(e => e.isRecording);
-    RecordingsListView.handleRecordingCancelled();
-  }
-};
-
-/**
- * Shortcuts for accessing various profiler preferences.
- */
-const Prefs = new ViewHelpers.Prefs("devtools.profiler", {
-  showPlatformData: ["Bool", "ui.show-platform-data"]
-});
-
-/**
- * Convenient way of emitting events from the panel window.
- */
-EventEmitter.decorate(this);
-
-/**
- * DOM query helpers.
- */
-function $(selector, target = document) {
-  return target.querySelector(selector);
-}
-function $$(selector, target = document) {
-  return target.querySelectorAll(selector);
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/profiler.xul firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/profiler.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/profiler.xul	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/profiler.xul	1970-01-01 00:00:00.000000000 +0000
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/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/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/devtools/profiler.css" type="text/css"?>
-<!DOCTYPE window [
-  <!ENTITY % profilerDTD SYSTEM "chrome://browser/locale/devtools/profiler.dtd">
-  %profilerDTD;
-]>
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script src="chrome://browser/content/devtools/theme-switching.js"/>
-  <script type="application/javascript" src="profiler.js"/>
-  <script type="application/javascript" src="ui-recordings.js"/>
-  <script type="application/javascript" src="ui-profile.js"/>
-
-  <hbox class="theme-body" flex="1">
-    <vbox id="recordings-pane">
-      <toolbar id="recordings-toolbar"
-               class="devtools-toolbar">
-        <hbox id="recordings-controls"
-              class="devtools-toolbarbutton-group">
-          <toolbarbutton id="record-button"
-                         class="devtools-toolbarbutton"
-                         oncommand="RecordingsListView._onRecordButtonClick()"
-                         tooltiptext="&profilerUI.recordButton.tooltip;"/>
-          <toolbarbutton id="import-button"
-                         class="devtools-toolbarbutton"
-                         oncommand="RecordingsListView._onImportButtonClick()"
-                         label="&profilerUI.importButton;"/>
-          <toolbarbutton id="clear-button"
-                         class="devtools-toolbarbutton"
-                         oncommand="RecordingsListView._onClearButtonClick()"
-                         label="&profilerUI.clearButton;"/>
-        </hbox>
-      </toolbar>
-      <vbox id="recordings-list" flex="1"/>
-      <splitter class="devtools-horizontal-splitter" />
-      <vbox id="profile-options" class="devtools-toolbar">
-        <checkbox id="invert-tree" label="&profilerUI.invertTree;"
-                  tooltiptext="&profilerUI.invertTree.tooltiptext;" />
-      </vbox>
-    </vbox>
-
-    <deck id="profile-pane"
-          class="devtools-responsive-container"
-          flex="1">
-      <hbox id="empty-notice"
-            class="notice-container"
-            align="center"
-            pack="center"
-            flex="1">
-        <label value="&profilerUI.emptyNotice1;"/>
-        <button id="profiling-notice-button"
-                class="devtools-toolbarbutton"
-                standalone="true"
-                oncommand="RecordingsListView._onRecordButtonClick()"/>
-        <label value="&profilerUI.emptyNotice2;"/>
-      </hbox>
-
-      <hbox id="recording-notice"
-            class="notice-container"
-            align="center"
-            pack="center"
-            flex="1">
-        <label value="&profilerUI.stopNotice1;"/>
-        <button id="profiling-notice-button"
-                class="devtools-toolbarbutton"
-                standalone="true"
-                checked="true"
-                oncommand="RecordingsListView._onRecordButtonClick()"/>
-        <label value="&profilerUI.stopNotice2;"/>
-      </hbox>
-
-      <hbox id="loading-notice"
-            class="notice-container"
-            align="center"
-            pack="center"
-            flex="1">
-        <label value="&profilerUI.loadingNotice;"/>
-      </hbox>
-
-      <tabbox id="profile-content"
-              class="theme-sidebar devtools-sidebar-tabs"
-              flex="1">
-        <hbox>
-          <tabs/>
-          <button id="profile-newtab-button"
-                  tooltiptext="&profilerUI.newtab.tooltiptext;"/>
-        </hbox>
-        <tabpanels flex="1"/>
-      </tabbox>
-    </deck>
-  </hbox>
-
-  <template>
-    <!-- Template for a tab inside the #profile-content tabbox. -->
-    <tab id="profile-content-tab-template" covered="true">
-      <label class="tab-title-label"/>
-    </tab>
-
-    <!-- Template for a panel inside the #profile-content tabbox. -->
-    <tabpanel id="profile-content-tabpanel-template">
-      <vbox class="framerate"/>
-      <vbox class="categories"/>
-      <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.totalDuration2;"/>
-          <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.selfDuration2;"/>
-          <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>
-    </tabpanel>
-  </template>
-
-</window>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser.ini firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser.ini	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,93 +0,0 @@
-[DEFAULT]
-tags = devtools
-subsuite = devtools
-support-files =
-  doc_simple-test.html
-  head.js
-
-[browser_profiler_aaa_run_first_leaktest.js]
-[browser_profiler_console-record-01.js]
-skip-if = true # Bug 1047124
-[browser_profiler_console-record-02.js]
-skip-if = true # Bug 1047124
-[browser_profiler_console-record-03.js]
-skip-if = true # Bug 1047124
-[browser_profiler_console-record-04.js]
-skip-if = true # Bug 1047124
-[browser_profiler_console-record-05.js]
-skip-if = true # Bug 1047124
-[browser_profiler_console-record-06.js]
-skip-if = true # Bug 1047124
-[browser_profiler_console-record-07.js]
-skip-if = true # Bug 1047124
-[browser_profiler_console-record-08.js]
-skip-if = true # Bug 1047124
-[browser_profiler_console-record-09.js]
-skip-if = true # Bug 1047124
-[browser_profiler_data-massaging-01.js]
-skip-if = true # Bug 1047124
-[browser_profiler_data-massaging-02.js]
-skip-if = true # Bug 1047124
-[browser_profiler_data-samples.js]
-skip-if = true # Bug 1047124
-[browser_profiler_gecko-pref-changed.js]
-skip-if = true # Bug 1047124
-[browser_profiler_jump-to-debugger-01.js]
-[browser_profiler_jump-to-debugger-02.js]
-[browser_profiler_profile-deselection.js]
-skip-if = true # Bug 1047124
-[browser_profiler_profile-view-events.js]
-[browser_profiler_recording-cancelled.js]
-skip-if = true # Bug 1047124
-[browser_profiler_recording-selected-01.js]
-skip-if = true # Bug 1047124
-[browser_profiler_recording-selected-02.js]
-skip-if = true # Bug 1047124
-[browser_profiler_recording-selected-03.js]
-skip-if = true # Bug 1047124
-[browser_profiler_recording-utils.js]
-skip-if = true # Bug 1047124
-[browser_profiler_recordings-clear.js]
-skip-if = true # Bug 1047124
-[browser_profiler_recordings-io-01.js]
-skip-if = true # Bug 1047124
-[browser_profiler_recordings-io-02.js]
-[browser_profiler_recordings-io-03.js]
-[browser_profiler_shared-connection-01.js]
-[browser_profiler_shared-connection-02.js]
-[browser_profiler_shared-connection-03.js]
-skip-if = true # Bug 1047124
-[browser_profiler_shared-connection-04.js]
-skip-if = true # Bug 1047124
-[browser_profiler_shared-front-01.js]
-skip-if = true # Bug 1047124
-[browser_profiler_shared-front-02.js]
-skip-if = true # Bug 1047124
-[browser_profiler_shared-front-03.js]
-skip-if = true # Bug 1047124
-[browser_profiler_shared-front-04.js]
-skip-if = true # Bug 1047124
-[browser_profiler_shared-front-05.js]
-skip-if = true # Bug 1047124
-[browser_profiler_shared-front-06.js]
-skip-if = true # Bug 1047124
-[browser_profiler_simple-record-01.js]
-skip-if = true # Bug 1047124
-[browser_profiler_simple-record-02.js]
-skip-if = true # Bug 1047124
-[browser_profiler_simple-record-03.js]
-skip-if = true # Bug 1047124
-[browser_profiler_sudden-deactivation-01.js]
-skip-if = true # Bug 1047124
-[browser_profiler_sudden-deactivation-02.js]
-skip-if = true # Bug 1047124
-[browser_profiler_tabbed-browser-01.js]
-skip-if = true # Bug 1047124
-[browser_profiler_tabbed-browser-02.js]
-skip-if = true # Bug 1047124
-[browser_profiler_tabbed-browser-03.js]
-skip-if = true # Bug 1047124
-[browser_profiler_tabbed-browser-add-remove-01.js]
-skip-if = true # Bug 1047124
-[browser_profiler_tabbed-browser-add-remove-02.js]
-skip-if = true # Bug 1047124
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_aaa_run_first_leaktest.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_aaa_run_first_leaktest.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_aaa_run_first_leaktest.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_aaa_run_first_leaktest.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler leaks on initialization and sudden destruction.
- * You can also use this initialization format as a template for other tests.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-
-  ok(target, "Should have a target available.");
-  ok(debuggee, "Should have a debuggee available.");
-  ok(panel, "Should have a panel available.");
-
-  ok(panel.panelWin.gToolbox, "Should have a toolbox reference on the panel window.");
-  ok(panel.panelWin.gTarget, "Should have a target reference on the panel window.");
-  ok(panel.panelWin.gFront, "Should have a front reference on the panel window.");
-
-  yield teardown(panel);
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_console-record-01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_console-record-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_console-record-01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_console-record-01.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler is populated by console recordings that have finished
- * before it was opened.
- */
-
-let test = Task.async(function*() {
-  let profilerConnected = waitForProfilerConnection();
-
-  let [target, debuggee, networkPanel] = yield initFrontend(SIMPLE_URL, "netmonitor");
-  let toolbox = networkPanel._toolbox;
-
-  let SharedProfilerUtils = devtools.require("devtools/profiler/shared");
-  let sharedProfilerConnection = SharedProfilerUtils.getProfilerConnection(toolbox);
-
-  yield profilerConnected;
-  yield consoleProfile(sharedProfilerConnection, 1);
-  yield consoleProfile(sharedProfilerConnection, 2);
-  yield consoleProfileEnd(sharedProfilerConnection);
-  yield consoleProfileEnd(sharedProfilerConnection);
-
-  yield toolbox.selectTool("jsprofiler");
-  let profilerPanel = toolbox.getCurrentPanel();
-  let { $, EVENTS, RecordingsListView, ProfileView } = profilerPanel.panelWin;
-
-  yield profilerPanel.panelWin.once(EVENTS.RECORDING_DISPLAYED);
-  ok(true, "The first already finished console recording was automatically displayed.");
-
-  is(RecordingsListView.itemCount, 2,
-    "There should be two recordings visible.");
-  ok(!$(".side-menu-widget-empty-text"),
-    "There shouldn't be any empty text displayed in the recordings list.");
-
-  is(ProfileView.tabCount, 1,
-    "There should be one tab visible.");
-  is($("#profile-pane").selectedPanel, $("#profile-content"),
-    "The profile content should be displayed in the profile view.");
-
-  is(RecordingsListView.items[0], RecordingsListView.selectedItem,
-    "The first recording item should be automatically selected.");
-
-  is(RecordingsListView.items[0].attachment.profilerData.profileLabel, "2",
-    "The profile label for the first recording is correct.");
-  ok(!RecordingsListView.items[0].isRecording,
-    "The 'isRecording' flag for the first recording is correct.");
-
-  is(RecordingsListView.items[1].attachment.profilerData.profileLabel, "1",
-    "The profile label for the second recording is correct.");
-  ok(!RecordingsListView.items[1].isRecording,
-    "The 'isRecording' flag for the second recording is correct.");
-
-  yield teardown(networkPanel);
-  finish();
-});
-
-function* consoleProfile(connection, label) {
-  let notified = connection.once("profile");
-  console.profile(label);
-  yield notified;
-}
-
-function* consoleProfileEnd(connection) {
-  let notified = connection.once("profileEnd");
-  console.profileEnd();
-  yield notified;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_console-record-02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_console-record-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_console-record-02.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_console-record-02.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler is populated by in-progress console recordings
- * when it is opened.
- */
-
-let test = Task.async(function*() {
-  let profilerConnected = waitForProfilerConnection();
-
-  let [target, debuggee, networkPanel] = yield initFrontend(SIMPLE_URL, "netmonitor");
-  let toolbox = networkPanel._toolbox;
-
-  let SharedProfilerUtils = devtools.require("devtools/profiler/shared");
-  let sharedProfilerConnection = SharedProfilerUtils.getProfilerConnection(toolbox);
-
-  yield profilerConnected;
-  yield consoleProfile(sharedProfilerConnection, 1);
-  yield consoleProfile(sharedProfilerConnection, 2);
-
-  yield toolbox.selectTool("jsprofiler");
-  let profilerPanel = toolbox.getCurrentPanel();
-  let { $, L10N, RecordingsListView, ProfileView } = profilerPanel.panelWin;
-
-  is(RecordingsListView.itemCount, 2,
-    "There should be two recordings visible.");
-  ok(!$(".side-menu-widget-empty-text"),
-    "There shouldn't be any empty text displayed in the recordings list.");
-
-  is(ProfileView.tabCount, 0,
-    "There shouldn't be any tabs visible yet.");
-  is($("#profile-pane").selectedPanel, $("#recording-notice"),
-    "There should be a recording notice displayed in the profile view.");
-
-  is(RecordingsListView.items[0], RecordingsListView.selectedItem,
-    "The first recording item should be automatically selected.");
-
-  is(RecordingsListView.items[0].attachment.profilerData.profileLabel, "1",
-    "The profile label for the first recording is correct.");
-  ok(RecordingsListView.items[0].isRecording,
-    "The 'isRecording' flag for the first recording is correct.");
-
-  is(RecordingsListView.items[1].attachment.profilerData.profileLabel, "2",
-    "The profile label for the second recording is correct.");
-  ok(RecordingsListView.items[1].isRecording,
-    "The 'isRecording' flag for the second recording is correct.");
-
-  let firstTarget = RecordingsListView.items[0].target;
-  let secondTarget = RecordingsListView.items[1].target;
-
-  is($(".recording-item-title", firstTarget).getAttribute("value"), "1",
-    "The first recording item's title is correct.");
-  is($(".recording-item-title", secondTarget).getAttribute("value"), "2",
-    "The second recording item's title is correct.");
-
-  is($(".recording-item-duration", firstTarget).getAttribute("value"),
-    L10N.getStr("recordingsList.recordingLabel"),
-    "The first recording item's duration is correct.");
- is($(".recording-item-duration", secondTarget).getAttribute("value"),
-    L10N.getStr("recordingsList.recordingLabel"),
-    "The second recording item's duration is correct.");
-
-  is($(".recording-item-save", firstTarget).getAttribute("value"), "",
-    "The first recording item's save link should be invisible.");
-  is($(".recording-item-save", secondTarget).getAttribute("value"), "",
-    "The second recording item's save link should be invisible.");
-
-  yield teardown(profilerPanel);
-  finish();
-});
-
-function* consoleProfile(connection, label) {
-  let notified = connection.once("profile");
-  console.profile(label);
-  yield notified;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_console-record-03.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_console-record-03.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_console-record-03.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_console-record-03.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler is populated by in-progress console recordings, and
- * also console recordings that have finished before it was opened.
- */
-
-let test = Task.async(function*() {
-  let profilerConnected = waitForProfilerConnection();
-
-  let [target, debuggee, networkPanel] = yield initFrontend(SIMPLE_URL, "netmonitor");
-  let toolbox = networkPanel._toolbox;
-
-  let SharedProfilerUtils = devtools.require("devtools/profiler/shared");
-  let sharedProfilerConnection = SharedProfilerUtils.getProfilerConnection(toolbox);
-
-  yield profilerConnected;
-  yield consoleProfile(sharedProfilerConnection, 1);
-  yield consoleProfile(sharedProfilerConnection, 2);
-  yield consoleProfileEnd(sharedProfilerConnection);
-
-  yield toolbox.selectTool("jsprofiler");
-  let profilerPanel = toolbox.getCurrentPanel();
-  let { $, EVENTS, RecordingsListView, ProfileView } = profilerPanel.panelWin;
-
-  yield profilerPanel.panelWin.once(EVENTS.RECORDING_DISPLAYED);
-  ok(true, "The already finished console recording was automatically displayed.");
-
-  is(RecordingsListView.itemCount, 2,
-    "There should be two recordings visible.");
-  ok(!$(".side-menu-widget-empty-text"),
-    "There shouldn't be any empty text displayed in the recordings list.");
-
-  is(ProfileView.tabCount, 1,
-    "There should be one tab visible.");
-  is($("#profile-pane").selectedPanel, $("#profile-content"),
-    "The profile content should be displayed in the profile view.");
-
-  is(RecordingsListView.items[0], RecordingsListView.selectedItem,
-    "The first recording item should be automatically selected.");
-
-  is(RecordingsListView.items[0].attachment.profilerData.profileLabel, "2",
-    "The profile label for the first recording is correct.");
-  ok(!RecordingsListView.items[0].isRecording,
-    "The 'isRecording' flag for the first recording is correct.");
-
-  is(RecordingsListView.items[1].attachment.profilerData.profileLabel, "1",
-    "The profile label for the second recording is correct.");
-  ok(RecordingsListView.items[1].isRecording,
-    "The 'isRecording' flag for the second recording is correct.");
-
-  let recordingDisplayed = profilerPanel.panelWin.once(EVENTS.RECORDING_DISPLAYED);
-  yield consoleProfileEnd(sharedProfilerConnection);
-  yield recordingDisplayed;
-  ok(true, "The newly finished console recording was automatically displayed.");
-
-  is(RecordingsListView.itemCount, 2,
-    "There should still be two recordings visible.");
-  ok(!$(".side-menu-widget-empty-text"),
-    "There still shouldn't be any empty text displayed in the recordings list.");
-
-  is(ProfileView.tabCount, 1,
-    "There should still be one tab visible.");
-  is($("#profile-pane").selectedPanel, $("#profile-content"),
-    "The profile content should still be displayed in the profile view.");
-
-  is(RecordingsListView.items[1], RecordingsListView.selectedItem,
-    "The second recording item should still be selected.");
-
-  is(RecordingsListView.items[0].attachment.profilerData.profileLabel, "2",
-    "The profile label for the first recording is still correct.");
-  ok(!RecordingsListView.items[0].isRecording,
-    "The 'isRecording' flag for the first recording is still correct.");
-
-  is(RecordingsListView.items[1].attachment.profilerData.profileLabel, "1",
-    "The profile label for the second recording is still correct.");
-  ok(!RecordingsListView.items[1].isRecording,
-    "The 'isRecording' flag for the second recording is still correct.");
-
-  yield teardown(profilerPanel);
-  finish();
-});
-
-function* consoleProfile(connection, label) {
-  let notified = connection.once("profile");
-  console.profile(label);
-  yield notified;
-}
-
-function* consoleProfileEnd(connection) {
-  let notified = connection.once("profileEnd");
-  console.profileEnd();
-  yield notified;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_console-record-04.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_console-record-04.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_console-record-04.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_console-record-04.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler is correctly populated by new console recordings
- * after it is opened.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { $, EVENTS, gFront, RecordingsListView, ProfileView } = panel.panelWin;
-
-  yield consoleProfile(gFront, "hello world");
-
-  is(RecordingsListView.itemCount, 1,
-    "There should be one recording visible.");
-  ok(!$(".side-menu-widget-empty-text"),
-    "There shouldn't be any empty text displayed in the recordings list.");
-
-  is(ProfileView.tabCount, 0,
-    "There shouldn't be any tabs visible yet.");
-  is($("#profile-pane").selectedPanel, $("#recording-notice"),
-    "There should be a recording notice displayed in the profile view.");
-
-  is(RecordingsListView.items[0], RecordingsListView.selectedItem,
-    "The first and only recording item should be selected.");
-
-  is(RecordingsListView.items[0].attachment.profilerData.profileLabel, "hello world",
-    "The profile label for the first recording is correct.");
-  ok(RecordingsListView.items[0].isRecording,
-    "The 'isRecording' flag for the first recording is correct.");
-
-  let recordingDisplayed = panel.panelWin.once(EVENTS.RECORDING_DISPLAYED);
-  yield consoleProfileEnd(gFront);
-  yield recordingDisplayed;
-  ok(true, "The newly finished console recording was automatically displayed.");
-
-  is(RecordingsListView.itemCount, 1,
-    "There should still be one recording visible.");
-  ok(!$(".side-menu-widget-empty-text"),
-    "There still shouldn't be any empty text displayed in the recordings list.");
-
-  is(ProfileView.tabCount, 1,
-    "There should still be one tab visible.");
-  is($("#profile-pane").selectedPanel, $("#profile-content"),
-    "The profile content should still be displayed in the profile view.");
-
-  is(RecordingsListView.items[0], RecordingsListView.selectedItem,
-    "The first and only recording item should still be selected.");
-
-  is(RecordingsListView.items[0].attachment.profilerData.profileLabel, "hello world",
-    "The profile label for the first recording is still correct.");
-  ok(!RecordingsListView.items[0].isRecording,
-    "The 'isRecording' flag for the first recording is still correct.");
-
-  yield teardown(panel);
-  finish();
-});
-
-function* consoleProfile(front, label) {
-  let notified = front.once("profile");
-  console.profile(label);
-  yield notified;
-}
-
-function* consoleProfileEnd(front) {
-  let notified = front.once("profileEnd");
-  console.profileEnd();
-  yield notified;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_console-record-05.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_console-record-05.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_console-record-05.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_console-record-05.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler is correctly populated by sequential console recordings
- * with the same label, after it is opened.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { $, EVENTS, gFront, RecordingsListView, ProfileView } = panel.panelWin;
-
-  yield consoleProfile(gFront, "hello world");
-  let firstRecordingDisplayed = panel.panelWin.once(EVENTS.RECORDING_DISPLAYED);
-  yield consoleProfileEnd(gFront);
-  yield firstRecordingDisplayed;
-  ok(true, "The newly finished console recording was automatically displayed.");
-
-  yield consoleProfile(gFront, "hello world");
-  let secondRecordingDisplayed = panel.panelWin.once(EVENTS.RECORDING_DISPLAYED);
-  yield consoleProfileEnd(gFront);
-  yield secondRecordingDisplayed;
-  ok(true, "The newly finished console recording was automatically redisplayed.");
-
-  is(RecordingsListView.itemCount, 1,
-    "There should be just one recording visible.");
-  ok(!$(".side-menu-widget-empty-text"),
-    "There shouldn't be any empty text displayed in the recordings list.");
-
-  is(ProfileView.tabCount, 1,
-    "There should be one tab visible.");
-  is($("#profile-pane").selectedPanel, $("#profile-content"),
-    "The profile content should be displayed in the profile view.");
-
-  is(RecordingsListView.items[0], RecordingsListView.selectedItem,
-    "The first and only recording item should be selected.");
-
-  is(RecordingsListView.items[0].attachment.profilerData.profileLabel, "hello world",
-    "The profile label for the first recording is correct.");
-  ok(!RecordingsListView.items[0].isRecording,
-    "The 'isRecording' flag for the first recording is correct.");
-
-  yield teardown(panel);
-  finish();
-});
-
-function* consoleProfile(front, label) {
-  let notified = front.once("profile");
-  console.profile(label);
-  yield notified;
-}
-
-function* consoleProfileEnd(front) {
-  let notified = front.once("profileEnd");
-  console.profileEnd();
-  yield notified;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_console-record-06.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_console-record-06.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_console-record-06.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_console-record-06.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler can correctly handle sequential console recordings,
- * finished in reverse order.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { $, EVENTS, gFront, RecordingsListView, ProfileView } = panel.panelWin;
-
-  yield consoleProfile(gFront, "1");
-  yield consoleProfile(gFront, "2");
-
-  let firstRecordingDisplayed = panel.panelWin.once(EVENTS.RECORDING_DISPLAYED);
-  yield consoleProfileEnd(gFront, "1");
-  yield firstRecordingDisplayed;
-  ok(true, "The newly finished console recording was automatically displayed.");
-
-  is(RecordingsListView.itemCount, 2,
-    "There should be two recordings visible.");
-  is(RecordingsListView.items[0], RecordingsListView.selectedItem,
-    "The first recording item should be selected.");
-
-  is(RecordingsListView.items[0].attachment.profilerData.profileLabel, "1",
-    "The profile label for the first recording is correct.");
-  ok(!RecordingsListView.items[0].isRecording,
-    "The 'isRecording' flag for the first recording is correct.");
-
-  is(RecordingsListView.items[1].attachment.profilerData.profileLabel, "2",
-    "The profile label for the second recording is correct.");
-  ok(RecordingsListView.items[1].isRecording,
-    "The 'isRecording' flag for the second recording is correct.");
-
-  let secondRecordingDisplayed = panel.panelWin.once(EVENTS.RECORDING_DISPLAYED);
-  yield consoleProfileEnd(gFront, "2");
-  yield secondRecordingDisplayed;
-  ok(true, "The newly finished console recording was automatically redisplayed.");
-
-  is(RecordingsListView.itemCount, 2,
-    "There should still be two recordings visible.");
-  is(RecordingsListView.items[1], RecordingsListView.selectedItem,
-    "The second recording item should now be selected.");
-
-  is(RecordingsListView.items[0].attachment.profilerData.profileLabel, "1",
-    "The profile label for the first recording is still correct.");
-  ok(!RecordingsListView.items[0].isRecording,
-    "The 'isRecording' flag for the first recording is still correct.");
-
-  is(RecordingsListView.items[1].attachment.profilerData.profileLabel, "2",
-    "The profile label for the second recording is still correct.");
-  ok(!RecordingsListView.items[1].isRecording,
-    "The 'isRecording' flag for the second recording is still correct.");
-
-  yield teardown(panel);
-  finish();
-});
-
-function* consoleProfile(front, label) {
-  let notified = front.once("profile");
-  console.profile(label);
-  yield notified;
-}
-
-function* consoleProfileEnd(front, label) {
-  let notified = front.once("profileEnd");
-  console.profileEnd(label);
-  yield notified;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_console-record-07.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_console-record-07.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_console-record-07.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_console-record-07.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler can correctly handle sequential console recordings,
- * finished in reverse order, and the second call to `console.profileEnd`
- * doesn't have any argument.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { $, EVENTS, gFront, RecordingsListView, ProfileView } = panel.panelWin;
-
-  yield consoleProfile(gFront, "1");
-  yield consoleProfile(gFront, "2");
-
-  let firstRecordingDisplayed = panel.panelWin.once(EVENTS.RECORDING_DISPLAYED);
-  yield consoleProfileEnd(gFront, true, "1");
-  yield firstRecordingDisplayed;
-  ok(true, "The newly finished console recording was automatically displayed.");
-
-  is(RecordingsListView.itemCount, 2,
-    "There should be two recordings visible.");
-  is(RecordingsListView.items[0], RecordingsListView.selectedItem,
-    "The first recording item should be selected.");
-
-  is(RecordingsListView.items[0].attachment.profilerData.profileLabel, "1",
-    "The profile label for the first recording is correct.");
-  ok(!RecordingsListView.items[0].isRecording,
-    "The 'isRecording' flag for the first recording is correct.");
-
-  is(RecordingsListView.items[1].attachment.profilerData.profileLabel, "2",
-    "The profile label for the second recording is correct.");
-  ok(RecordingsListView.items[1].isRecording,
-    "The 'isRecording' flag for the second recording is correct.");
-
-  let secondRecordingDisplayed = panel.panelWin.once(EVENTS.RECORDING_DISPLAYED);
-  yield consoleProfileEnd(gFront);
-  yield secondRecordingDisplayed;
-  ok(true, "The newly finished console recording was automatically redisplayed.");
-
-  is(RecordingsListView.itemCount, 2,
-    "There should still be two recordings visible.");
-  is(RecordingsListView.items[1], RecordingsListView.selectedItem,
-    "The second recording item should now be selected.");
-
-  is(RecordingsListView.items[0].attachment.profilerData.profileLabel, "1",
-    "The profile label for the first recording is still correct.");
-  ok(!RecordingsListView.items[0].isRecording,
-    "The 'isRecording' flag for the first recording is still correct.");
-
-  is(RecordingsListView.items[1].attachment.profilerData.profileLabel, "2",
-    "The profile label for the second recording is still correct.");
-  ok(!RecordingsListView.items[1].isRecording,
-    "The 'isRecording' flag for the second recording is still correct.");
-
-  yield teardown(panel);
-  finish();
-});
-
-function* consoleProfile(front, label) {
-  let notified = front.once("profile");
-  console.profile(label);
-  yield notified;
-}
-
-function* consoleProfileEnd(front, withLabel, labelValue) {
-  let notified = front.once("profileEnd");
-  if (!withLabel) {
-    console.profileEnd();
-  } else {
-    console.profileEnd(labelValue);
-  }
-  yield notified;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_console-record-08.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_console-record-08.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_console-record-08.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_console-record-08.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler can correctly handle sequential console recordings,
- * finished in reverse order, and the second call to `console.profileEnd`
- * contains the same label as the first call.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { $, EVENTS, gFront, RecordingsListView, ProfileView } = panel.panelWin;
-
-  yield consoleProfile(gFront, "1");
-  yield consoleProfile(gFront, "2");
-
-  let firstRecordingDisplayed = panel.panelWin.once(EVENTS.RECORDING_DISPLAYED);
-  yield consoleProfileEnd(gFront, "1");
-  yield firstRecordingDisplayed;
-  ok(true, "The newly finished console recording was automatically displayed.");
-
-  is(RecordingsListView.itemCount, 2,
-    "There should be two recordings visible.");
-  is(RecordingsListView.items[0], RecordingsListView.selectedItem,
-    "The first recording item should be selected.");
-
-  is(RecordingsListView.items[0].attachment.profilerData.profileLabel, "1",
-    "The profile label for the first recording is correct.");
-  ok(!RecordingsListView.items[0].isRecording,
-    "The 'isRecording' flag for the first recording is correct.");
-
-  is(RecordingsListView.items[1].attachment.profilerData.profileLabel, "2",
-    "The profile label for the second recording is correct.");
-  ok(RecordingsListView.items[1].isRecording,
-    "The 'isRecording' flag for the second recording is correct.");
-
-  gFront.once("profileEnd", () => {
-    ok(false, "The second console recording shouldn't have ended.")
-  });
-  panel.panelWin.once(EVENTS.RECORDING_DISPLAYED, () => {
-    ok(false, "The second console recording shouldn't have been displayed.");
-  });
-
-  console.profileEnd("1");
-  yield DevToolsUtils.waitForTime(1000);
-
-  yield teardown(panel);
-  finish();
-});
-
-function* consoleProfile(front, label) {
-  let notified = front.once("profile");
-  console.profile(label);
-  yield notified;
-}
-
-function* consoleProfileEnd(front, label) {
-  let notified = front.once("profileEnd");
-  console.profileEnd(label);
-  yield notified;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_console-record-09.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_console-record-09.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_console-record-09.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_console-record-09.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler can correctly handle simultaneous console and manual
- * recordings (via `console.profile` and clicking the record button).
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { $, EVENTS, gFront, RecordingsListView, ProfileView } = panel.panelWin;
-
-  info("Starting a manual recording...");
-  yield startRecording(panel);
-
-  info("Starting two console recordings, one without a label, one with.");
-  yield consoleProfile(gFront);
-  yield consoleProfile(gFront, true, "hello world");
-
-  is(RecordingsListView.itemCount, 3,
-    "There should be three recordings visible now.");
-  is(RecordingsListView.selectedIndex, 0,
-    "The first recording item was selected in the list.");
-
-  testListItem(RecordingsListView, 0, undefined, true);
-  testListItem(RecordingsListView, 1, undefined, true);
-  testListItem(RecordingsListView, 2, "hello world", true);
-
-  info("Stopping the manual recording...");
-  yield stopRecording(panel, { waitForDisplay: true });
-
-  is(RecordingsListView.itemCount, 3,
-    "There should still be three recordings visible now.");
-  is(RecordingsListView.selectedIndex, 0,
-    "The first recording item is still selected in the list.");
-
-  testListItem(RecordingsListView, 0, undefined, false);
-  testListItem(RecordingsListView, 1, undefined, true);
-  testListItem(RecordingsListView, 2, "hello world", true);
-
-  info("Stopping the unlabeled console recording...");
-  yield consoleProfileEnd(gFront);
-
-  is(RecordingsListView.itemCount, 3,
-    "There should still be three recordings visible now.");
-  is(RecordingsListView.selectedIndex, 1,
-    "The second recording item was selected in the list.");
-
-  testListItem(RecordingsListView, 0, undefined, false);
-  testListItem(RecordingsListView, 1, undefined, false);
-  testListItem(RecordingsListView, 2, "hello world", true);
-
-  info("Stopping the labeled console recording...");
-  yield consoleProfileEnd(gFront);
-
-  is(RecordingsListView.itemCount, 3,
-    "There should still be three recordings visible now.");
-  is(RecordingsListView.selectedIndex, 2,
-    "The third recording item was selected in the list.");
-
-  testListItem(RecordingsListView, 0, undefined, false);
-  testListItem(RecordingsListView, 1, undefined, false);
-  testListItem(RecordingsListView, 2, "hello world", false);
-
-  yield teardown(panel);
-  finish();
-});
-
-function testListItem(view, index, profileLabel, isRecording) {
-  is(view.items[index].attachment.profilerData.profileLabel, profileLabel,
-    "The recording item at index " + index + " has a correct profile label.");
-  is(!!view.items[index].isRecording, isRecording,
-    "The recording item at index " + index + " has a correct `isRecording` flag.");
-}
-
-function* consoleProfile(front, withLabel, labelValue) {
-  let notified = front.once("profile");
-  if (!withLabel) {
-    console.profile();
-  } else {
-    console.profile(labelValue);
-  }
-  yield notified;
-}
-
-function* consoleProfileEnd(front) {
-  let notified = front.once("profileEnd");
-  console.profileEnd();
-  yield notified;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_data-massaging-01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_data-massaging-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_data-massaging-01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_data-massaging-01.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the retrieved profiler data samples are correctly filtered and
- * normalized before passed to consumers.
- */
-
-const WAIT_TIME = 1000; // ms
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let front = panel.panelWin.gFront;
-
-  // Perform the first recording...
-
-  yield front.startRecording();
-  let profilingStartTime = front._profilingStartTime;
-  info("Started profiling at: " + profilingStartTime);
-
-  busyWait(WAIT_TIME); // allow the profiler module to sample some cpu activity
-
-  let firstRecordingData = yield front.stopRecording();
-  let firstRecordingFinishTime = firstRecordingData.profilerData.currentTime;
-
-  is(profilingStartTime, 0,
-    "The profiling start time should be 0 for the first recording.");
-  ok(firstRecordingData.recordingDuration >= WAIT_TIME,
-    "The first recording duration is correct.");
-  ok(firstRecordingFinishTime >= WAIT_TIME,
-    "The first recording finish time is correct.");
-
-  // Perform the second recording...
-
-  yield front.startRecording();
-  profilingStartTime = front._profilingStartTime;
-  info("Started profiling at: " + profilingStartTime);
-
-  busyWait(WAIT_TIME); // allow the profiler module to sample more cpu activity
-
-  let secondRecordingData = yield front.stopRecording();
-  let secondRecordingFinishTime = secondRecordingData.profilerData.currentTime;
-  let secondRecordingProfile = secondRecordingData.profilerData.profile;
-  let secondRecordingSamples = secondRecordingProfile.threads[0].samples;
-
-  isnot(profilingStartTime, 0,
-    "The profiling start time should not be 0 on the second recording.");
-  ok(secondRecordingData.recordingDuration >= WAIT_TIME,
-    "The second recording duration is correct.");
-  ok(secondRecordingFinishTime - firstRecordingFinishTime >= WAIT_TIME,
-    "The second recording finish time is correct.");
-
-  ok(secondRecordingSamples[0].time < profilingStartTime,
-    "The second recorded sample times were normalized.");
-  ok(secondRecordingSamples[0].time > 0,
-    "The second recorded sample times were normalized correctly.");
-  ok(!secondRecordingSamples.find(e => e.time + profilingStartTime <= firstRecordingFinishTime),
-    "There should be no samples from the first recording in the second one, " +
-    "even though the total number of frames did not overflow.");
-
-  yield teardown(panel);
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_data-massaging-02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_data-massaging-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_data-massaging-02.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_data-massaging-02.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the retrieved profiler data samples are correctly filtered and
- * normalized before passed to consumers.
- */
-
-const WAIT_TIME = 1000; // ms
-const FRAMES_OVERFLOW = 1000;
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let front = panel.panelWin.gFront;
-
-  front._customProfilerOptions = { entries: FRAMES_OVERFLOW };
-
-  yield front.startRecording();
-  let profilingStartTime = front._profilingStartTime;
-  info("Started profiling at: " + profilingStartTime);
-
-  yield idleWait(WAIT_TIME); // allow refresh driver ticks to accumulate
-  busyWait(WAIT_TIME); // allow the profiler module to sample some cpu activity
-  yield idleWait(WAIT_TIME); // allow refresh driver ticks to accumulate more
-
-  let recordingData = yield front.stopRecording();
-  let ticks = recordingData.ticksData;
-  let profile = recordingData.profilerData.profile;
-  let samples = profile.threads[0].samples;
-
-  ok(samples[0].time >= WAIT_TIME,
-    "The recorded samples overflowed, so the older ones were clamped.");
-
-  if (ticks.length) {
-    ok(ticks[0] >= samples[0].time,
-      "The refresh driver ticks were filtered before being retrieved (1).");
-    ok(ticks[ticks.length - 1] <= findOldestSampleTime(samples),
-      "The refresh driver ticks were filtered before being retrieved (2).");
-  }
-
-  yield teardown(panel);
-  finish();
-});
-
-function findOldestSampleTime(samples) {
-  for (let i = samples.length - 1; i >= 0; i--) {
-    let sample = samples[i];
-    if ("time" in sample) {
-      return sample.time;
-    }
-  }
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_data-samples.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_data-samples.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_data-samples.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_data-samples.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the retrieved profiler data samples always have a (root) node.
- * If this ever changes, the |ThreadNode.prototype.insert| function in
- * browser/devtools/profiler/utils/tree-model.js will have to be changed.
- */
-
-const WAIT_TIME = 1000; // ms
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let front = panel.panelWin.gFront;
-
-  yield front.startRecording();
-  busyWait(WAIT_TIME); // allow the profiler module to sample some cpu activity
-
-  let recordingData = yield front.stopRecording();
-  let profile = recordingData.profilerData.profile;
-
-  for (let thread of profile.threads) {
-    info("Checking thread: " + thread.name);
-
-    for (let sample of thread.samples) {
-      if (sample.frames[0].location != "(root)") {
-        ok(false, "The sample " + sample.toSource() + " doesn't have a root node.");
-      }
-    }
-  }
-
-  yield teardown(panel);
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_gecko-pref-changed.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_gecko-pref-changed.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_gecko-pref-changed.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_gecko-pref-changed.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profile view is rebuilt every time the
- * devtools.profiler.ui.show-platform-data pref is changed.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { $, EVENTS, Prefs, RecordingsListView, ProfileView } = panel.panelWin;
-
-  yield startRecording(panel);
-  yield stopRecording(panel, { waitForDisplay: true });
-
-  is(RecordingsListView.itemCount, 1,
-    "There should be one recording visible.");
-  ok(!$(".side-menu-widget-empty-text"),
-    "There shouldn't be any empty text displayed in the recordings list.");
-
-  is(ProfileView.tabCount, 1,
-    "There should be one tab visible.");
-  is($("#profile-pane").selectedPanel, $("#profile-content"),
-    "The profile content should be displayed in the profile view.");
-
-  let emptyNoticeDisplayed = panel.panelWin.once(EVENTS.EMPTY_NOTICE_SHOWN);
-  let tabbedBrowserRedisplayed = panel.panelWin.once(EVENTS.TABBED_BROWSER_SHOWN);
-  let recordingRedisplayed = panel.panelWin.once(EVENTS.RECORDING_DISPLAYED);
-
-  let prevPrefValue = Prefs.showPlatformData;
-  Prefs.showPlatformData ^= 1;
-
-  yield emptyNoticeDisplayed;
-  yield tabbedBrowserRedisplayed;
-  yield recordingRedisplayed;
-  ok(true, "The profile view was rebuilt.");
-
-  is(RecordingsListView.itemCount, 1,
-    "There should still be one recording visible.");
-  ok(!$(".side-menu-widget-empty-text"),
-    "There still shouldn't be any empty text displayed in the recordings list.");
-
-  is(ProfileView.tabCount, 1,
-    "There should still be one tab visible.");
-  is($("#profile-pane").selectedPanel, $("#profile-content"),
-    "The profile content should still be displayed in the profile view.");
-
-  yield teardown(panel);
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_jump-to-debugger-01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_jump-to-debugger-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_jump-to-debugger-01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_jump-to-debugger-01.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler can jump to the debugger.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let toolbox = panel._toolbox;
-  let EVENTS = panel.panelWin.EVENTS;
-
-  let whenSourceShown = panel.panelWin.once(EVENTS.SOURCE_SHOWN_IN_JS_DEBUGGER);
-  panel.panelWin.viewSourceInDebugger(SIMPLE_URL, 14);
-  yield whenSourceShown;
-
-  let debuggerPanel = toolbox.getPanel("jsdebugger");
-  ok(debuggerPanel, "The debugger panel was opened.");
-
-  let { DebuggerView } = debuggerPanel.panelWin;
-  let Sources = DebuggerView.Sources;
-
-  is(Sources.selectedValue, getSourceActor(Sources, SIMPLE_URL),
-    "The correct source is shown in the debugger.");
-  is(DebuggerView.editor.getCursor().line + 1, 14,
-    "The correct line is highlighted in the debugger's source editor.");
-
-  yield teardown(panel);
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_jump-to-debugger-02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_jump-to-debugger-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_jump-to-debugger-02.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_jump-to-debugger-02.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler can jump to the debugger, when the source was already
- * loaded in that tool.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, debuggerPanel] = yield initFrontend(SIMPLE_URL, "jsdebugger");
-  let toolbox = debuggerPanel._toolbox;
-  let debuggerWin = debuggerPanel.panelWin;
-  let debuggerEvents = debuggerWin.EVENTS;
-  let { DebuggerView } = debuggerWin;
-  let Sources = DebuggerView.Sources;
-
-  yield debuggerWin.once(debuggerEvents.SOURCE_SHOWN);
-  ok("A source was shown in the debugger.");
-
-  is(Sources.selectedValue, getSourceActor(Sources, SIMPLE_URL),
-    "The correct source is initially shown in the debugger.");
-  is(DebuggerView.editor.getCursor().line, 0,
-    "The correct line is initially highlighted in the debugger's source editor.");
-
-  yield toolbox.selectTool("jsprofiler");
-  let profilerPanel = toolbox.getCurrentPanel();
-  let profilerWin = profilerPanel.panelWin;
-  let profilerEvents = profilerWin.EVENTS;
-
-  let whenSourceShown = profilerWin.once(profilerEvents.SOURCE_SHOWN_IN_JS_DEBUGGER);
-  profilerWin.viewSourceInDebugger(SIMPLE_URL, 14);
-  yield whenSourceShown;
-
-  debuggerPanel = toolbox.getPanel("jsdebugger");
-  ok(debuggerPanel, "The debugger panel was reselected.");
-
-  is(DebuggerView.Sources.selectedValue, getSourceActor(Sources, SIMPLE_URL),
-    "The correct source is still shown in the debugger.");
-  is(DebuggerView.editor.getCursor().line + 1, 14,
-    "The correct line is now highlighted in the debugger's source editor.");
-
-  yield teardown(profilerPanel);
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_profile-deselection.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_profile-deselection.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_profile-deselection.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_profile-deselection.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler shows the appropriate notice when a selection
- * from the recordings list is lost.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { $, EVENTS, RecordingsListView } = panel.panelWin;
-
-  is(RecordingsListView.itemCount, 0,
-    "There should be no recordings visible yet.");
-  is($("#profile-pane").selectedPanel, $("#empty-notice"),
-    "There should be an empty notice displayed in the profile view.");
-
-  yield startRecording(panel);
-  yield stopRecording(panel, { waitForDisplay: true });
-
-  is(RecordingsListView.itemCount, 1,
-    "There should be one recording visible now.");
-  is($("#profile-pane").selectedPanel, $("#profile-content"),
-    "The profile content should be displayed in the profile view.");
-
-  RecordingsListView.selectedItem = null;
-
-  is(RecordingsListView.itemCount, 1,
-    "There should still be one recording visible now.");
-  is($("#profile-pane").selectedPanel, $("#empty-notice"),
-    "There should be an empty notice displayed in the profile view again.");
-
-  yield teardown(panel);
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_profile-view-events.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_profile-view-events.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_profile-view-events.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_profile-view-events.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profile view correctly displays its panels and emits
- * the appropriate events.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { $, EVENTS, ProfileView } = panel.panelWin;
-
-  is($("#profile-pane").selectedPanel, $("#empty-notice"),
-    "The empty notice should initially be displayed in the profile view.");
-
-  let recordingNoticeDisplayed = panel.panelWin.once(EVENTS.RECORDING_NOTICE_SHOWN);
-  ProfileView.showRecordingNotice();
-  yield recordingNoticeDisplayed;
-
-  is($("#profile-pane").selectedPanel, $("#recording-notice"),
-    "The recording notice should now be displayed in the profile view.");
-
-  let loadingNoticeDisplayed = panel.panelWin.once(EVENTS.LOADING_NOTICE_SHOWN);
-  ProfileView.showLoadingNotice();
-  yield loadingNoticeDisplayed;
-
-  is($("#profile-pane").selectedPanel, $("#loading-notice"),
-    "The loading notice should now be displayed in the profile view.");
-
-  let tabbedBrowserDisplayed = panel.panelWin.once(EVENTS.TABBED_BROWSER_SHOWN);
-  ProfileView.showTabbedBrowser();
-  yield tabbedBrowserDisplayed;
-
-  is($("#profile-pane").selectedPanel, $("#profile-content"),
-    "The profile content should now be displayed in the profile view.");
-
-  let emptyNoticeDisplayed = panel.panelWin.once(EVENTS.EMPTY_NOTICE_SHOWN);
-  ProfileView.showEmptyNotice();
-  yield emptyNoticeDisplayed;
-
-  is($("#profile-pane").selectedPanel, $("#empty-notice"),
-    "The empty notice should now be redisplayed in the profile view.");
-
-  yield teardown(panel);
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_recording-cancelled.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_recording-cancelled.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_recording-cancelled.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_recording-cancelled.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler properly handles the built-in profiler module
- * suddenly stopping.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { $, gFront, EVENTS, RecordingsListView } = panel.panelWin;
-
-  yield consoleProfile(gFront, "test");
-  yield startRecording(panel);
-
-  is(gFront.pendingConsoleRecordings.length, 1,
-    "There should be one pending console recording.");
-  is(gFront.finishedConsoleRecordings.length, 0,
-    "There should be no finished console recordings.");
-  is(RecordingsListView.itemCount, 2,
-    "There should be two recordings visible.");
-  is($("#profile-pane").selectedPanel, $("#recording-notice"),
-    "There should be a recording notice displayed in the profile view.");
-
-  let whenFrontendNotified = gFront.once("profiler-unexpectedly-stopped");
-  let whenRecordingLost = panel.panelWin.once(EVENTS.RECORDING_LOST);
-  nsIProfilerModule.StopProfiler();
-
-  yield whenFrontendNotified;
-  ok(true, "The frontend was notified about the profiler being stopped.");
-
-  yield whenRecordingLost;
-  ok(true, "The frontend reacted to the profiler being stopped.");
-
-  is(gFront.pendingConsoleRecordings.length, 0,
-    "There should be no pending console recordings.");
-  is(gFront.finishedConsoleRecordings.length, 0,
-    "There should still be no finished console recordings.");
-  is(RecordingsListView.itemCount, 0,
-    "There should be no recordings visible.");
-  is($("#profile-pane").selectedPanel, $("#empty-notice"),
-    "There should be an empty notice displayed in the profile view.");
-
-  yield teardown(panel);
-  finish();
-});
-
-function* consoleProfile(front, label) {
-  let notified = front.once("profile");
-  console.profile(label);
-  yield notified;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_recordings-clear.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_recordings-clear.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_recordings-clear.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_recordings-clear.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler is able clear all recordings.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { $, gFront, EVENTS, RecordingsListView, ProfileView } = panel.panelWin;
-
-  // Start and finish a manual recording.
-  yield startRecording(panel);
-  yield stopRecording(panel, { waitForDisplay: true });
-
-  // Start and finish a console recording.
-  yield consoleProfile(gFront, "test 1");
-  yield consoleProfileEnd(gFront, { waitForDisplayOn: panel });
-
-  // Start a new manual and console recording, but keep them in progress.
-  yield startRecording(panel);
-  yield consoleProfile(gFront, "test 2");
-
-  is(RecordingsListView.itemCount, 4,
-    "There should be four recordings visible now.");
-  is(RecordingsListView.selectedIndex, 1,
-    "The second recording should be selected.");
-  is($("#profile-pane").selectedPanel, $("#profile-content"),
-    "The profile content should be displayed in the profile view.");
-
-  let whenRecordingLost = panel.panelWin.once(EVENTS.RECORDING_LOST);
-  EventUtils.synthesizeMouseAtCenter($("#clear-button"), {}, panel.panelWin);
-  yield whenRecordingLost;
-
-  yield teardown(panel);
-  finish();
-});
-
-function* consoleProfile(front, label) {
-  let notified = front.once("profile");
-  console.profile(label);
-  yield notified;
-}
-
-function* consoleProfileEnd(front, { waitForDisplayOn: panel }) {
-  let notified = front.once("profileEnd");
-  let displayed = panel.panelWin.once(panel.panelWin.EVENTS.RECORDING_DISPLAYED);
-  console.profileEnd();
-  yield promise.all([notified, displayed]);
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_recording-selected-01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_recording-selected-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_recording-selected-01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_recording-selected-01.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler correctly handles multiple recordings and can
- * successfully switch between them.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { $, EVENTS, RecordingsListView, ProfileView } = panel.panelWin;
-
-  yield startRecording(panel);
-  yield stopRecording(panel, { waitForDisplay: true });
-
-  yield startRecording(panel);
-  yield stopRecording(panel, { waitForDisplay: true });
-
-  is(RecordingsListView.itemCount, 2,
-    "There should be two recordings visible.");
-  is(RecordingsListView.selectedIndex, 1,
-    "The second recording item should be selected.");
-
-  is(ProfileView.tabCount, 1,
-    "There should be one tab visible.");
-  is($("#profile-pane").selectedPanel, $("#profile-content"),
-    "The profile content should be displayed in the profile view.");
-
-  let recordingDisplayed = panel.panelWin.once(EVENTS.RECORDING_DISPLAYED);
-  RecordingsListView.selectedIndex = 0;
-  yield recordingDisplayed;
-
-  is(RecordingsListView.itemCount, 2,
-    "There should still be two recordings visible.");
-  is(RecordingsListView.selectedIndex, 0,
-    "The first recording item should be selected.");
-
-  is(ProfileView.tabCount, 1,
-    "There should still be one tab visible.");
-  is($("#profile-pane").selectedPanel, $("#profile-content"),
-    "The profile content should still be displayed in the profile view.");
-
-  let emptyNoticeDisplayed = panel.panelWin.once(EVENTS.EMPTY_NOTICE_SHOWN);
-  RecordingsListView.selectedIndex = -1;
-  yield emptyNoticeDisplayed;
-
-  is(RecordingsListView.itemCount, 2,
-    "There should still be two recordings visible.");
-  is(RecordingsListView.selectedItem, null,
-    "No recording item should be selected.");
-
-  is($("#profile-pane").selectedPanel, $("#empty-notice"),
-    "The empty notice should still be displayed in the profile view.");
-
-  yield teardown(panel);
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_recording-selected-02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_recording-selected-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_recording-selected-02.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_recording-selected-02.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler correctly handles multiple recordings and can
- * successfully switch between them, even when one of them is in progress.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { $, EVENTS, RecordingsListView, ProfileView } = panel.panelWin;
-
-  yield startRecording(panel);
-  yield stopRecording(panel, { waitForDisplay: true });
-
-  yield startRecording(panel);
-
-  is(RecordingsListView.itemCount, 2,
-    "There should be two recordings visible.");
-  is(RecordingsListView.selectedIndex, 0,
-    "The first recording item should be selected.");
-
-  is(ProfileView.tabCount, 1,
-    "There should be one tab visible.");
-  is($("#profile-pane").selectedPanel, $("#profile-content"),
-    "The profile content should still be displayed in the profile view.");
-
-  let recordingNoticeDisplayed = panel.panelWin.once(EVENTS.RECORDING_NOTICE_SHOWN);
-  RecordingsListView.selectedIndex = 1;
-  yield recordingNoticeDisplayed;
-
-  is(RecordingsListView.itemCount, 2,
-    "There should still be two recordings visible.");
-  is(RecordingsListView.selectedIndex, 1,
-    "The second recording item should be selected now.");
-
-  is($("#profile-pane").selectedPanel, $("#recording-notice"),
-    "The recording notice should be displayed in the profile view.");
-
-  let recordingDisplayed = panel.panelWin.once(EVENTS.RECORDING_DISPLAYED);
-  RecordingsListView.selectedIndex = 0;
-  yield recordingDisplayed;
-
-  is(RecordingsListView.itemCount, 2,
-    "There should still be two recordings visible.");
-  is(RecordingsListView.selectedIndex, 0,
-    "The first recording item should be selected again.");
-
-  is(ProfileView.tabCount, 1,
-    "There should be one tab visible again.");
-  is($("#profile-pane").selectedPanel, $("#profile-content"),
-    "The profile content should be displayed in the profile view again.");
-
-  yield teardown(panel);
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_recording-selected-03.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_recording-selected-03.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_recording-selected-03.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_recording-selected-03.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler UI does not forget that recording is active when
- * selected recording changes. Bug 1060885.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { $, EVENTS, RecordingsListView, ProfileView } = panel.panelWin;
-
-  yield startRecording(panel);
-  yield stopRecording(panel, { waitForDisplay: true });
-
-  yield startRecording(panel);
-  yield stopRecording(panel, { waitForDisplay: true });
-
-  yield startRecording(panel);
-
-  info("Selecting recording #0 and waiting for it to be displayed.");
-  let selected = panel.panelWin.once(EVENTS.RECORDING_DISPLAYED);
-  RecordingsListView.selectedIndex = 0;
-  yield selected;
-
-  ok($("#record-button").hasAttribute("checked"),
-    "Button is still checked after selecting another item.");
-
-  ok(!$("#record-button").hasAttribute("locked"),
-    "Button is not locked after selecting another item.");
-
-  yield teardown(panel);
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_recordings-io-01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_recordings-io-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_recordings-io-01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_recordings-io-01.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler is able to save and load recordings.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { RecordingsListView } = panel.panelWin;
-
-  yield startRecording(panel);
-  yield stopRecording(panel, { waitForDisplay: true });
-
-  // Verify original recording.
-
-  is(RecordingsListView.itemCount, 1,
-    "There should be one recording visible now.");
-
-  let originalRecordingItem = RecordingsListView.getItemAtIndex(0);
-  ok(originalRecordingItem,
-    "A recording item was available for import.");
-
-  let originalData = originalRecordingItem.attachment;
-  ok(originalData,
-    "The original item has recording data attached to it.");
-
-  // Save recording.
-
-  let file = FileUtils.getFile("TmpD", ["tmpprofile.json"]);
-  file.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, parseInt("666", 8));
-
-  yield panel.panelWin.saveRecordingToFile(originalRecordingItem, file);
-  ok(true, "The recording data appears to have been successfully saved.");
-
-  // Import recording.
-
-  yield panel.panelWin.loadRecordingFromFile(file);
-  ok(true, "The recording data appears to have been successfully imported.");
-
-  // Verify imported recording.
-
-  is(RecordingsListView.itemCount, 2,
-    "There should be two recordings visible now.");
-
-  let importedRecordingItem = RecordingsListView.getItemAtIndex(1);
-  ok(importedRecordingItem,
-    "A recording item was imported.");
-
-  let importedData = importedRecordingItem.attachment;
-  ok(importedData,
-    "The imported item has recording data attached to it.");
-
-  ok(("fileType" in originalData) && ("fileType" in importedData),
-    "The serialization process attached an identifier to the recording data.");
-  ok(("version" in originalData) && ("version" in importedData),
-    "The serialization process attached a version to the recording data.");
-
-  is(importedData.toSource(), originalData.toSource(),
-    "The impored data is identical to the original data.");
-
-  yield teardown(panel);
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_recordings-io-02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_recordings-io-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_recordings-io-02.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_recordings-io-02.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler gracefully handles loading bogus files.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { RecordingsListView } = panel.panelWin;
-
-  let file = FileUtils.getFile("TmpD", ["tmpprofile.json"]);
-  file.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, parseInt("666", 8));
-
-  try {
-    yield panel.panelWin.loadRecordingFromFile(file);
-    ok(false, "The recording succeeded unexpectedly.");
-  } catch (e) {
-    is(e.message, "Could not read recording data file.");
-    ok(true, "The recording was cancelled.");
-  }
-
-  is(RecordingsListView.itemCount, 0,
-    "There should still be no recordings visible.");
-
-  yield teardown(panel);
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_recordings-io-03.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_recordings-io-03.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_recordings-io-03.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_recordings-io-03.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler gracefully handles loading files that are JSON,
- * but don't contain the appropriate recording data.
- */
-
-let { FileUtils } = Cu.import("resource://gre/modules/FileUtils.jsm", {});
-let { NetUtil } = Cu.import("resource://gre/modules/NetUtil.jsm", {});
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { RecordingsListView } = panel.panelWin;
-
-  let file = FileUtils.getFile("TmpD", ["tmpprofile.json"]);
-  file.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, parseInt("666", 8));
-  yield asyncCopy({ bogus: "data" }, file);
-
-  try {
-    yield panel.panelWin.loadRecordingFromFile(file);
-    ok(false, "The recording succeeded unexpectedly.");
-  } catch (e) {
-    is(e.message, "Unrecognized recording data file.");
-    ok(true, "The recording was cancelled.");
-  }
-
-  is(RecordingsListView.itemCount, 0,
-    "There should still be no recordings visible.");
-
-  yield teardown(panel);
-  finish();
-});
-
-function getUnicodeConverter() {
-  let className = "@mozilla.org/intl/scriptableunicodeconverter";
-  let converter = Cc[className].createInstance(Ci.nsIScriptableUnicodeConverter);
-  converter.charset = "UTF-8";
-  return converter;
-}
-
-function asyncCopy(data, file) {
-  let deferred = promise.defer();
-
-  let string = JSON.stringify(data);
-  let inputStream = getUnicodeConverter().convertToInputStream(string);
-  let outputStream = FileUtils.openSafeFileOutputStream(file);
-
-  NetUtil.asyncCopy(inputStream, outputStream, status => {
-    if (!Components.isSuccessCode(status)) {
-      deferred.reject(new Error("Could not save data to file."));
-    }
-    deferred.resolve();
-  });
-
-  return deferred.promise;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_recording-utils.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_recording-utils.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_recording-utils.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_recording-utils.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the recording utility functions work as expected.
- */
-
-const WAIT_TIME = 100; // ms
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { RecordingsListView, RecordingUtils } = panel.panelWin;
-
-  yield startRecording(panel);
-  yield idleWait(WAIT_TIME); // allow refresh driver ticks to accumulate
-  busyWait(WAIT_TIME); // allow the profiler module to sample more cpu activity
-  yield stopRecording(panel, { waitForDisplay: true });
-
-  let recordingData = RecordingsListView.selectedItem.attachment;
-  ok(recordingData, "The recording data was successfully retrieved.");
-
-  // Test plotting categories...
-
-  let profilerData = recordingData.profilerData;
-  let categoriesData = RecordingUtils.plotCategoriesFor(profilerData, 0, Infinity);
-
-  for (let category of categoriesData) {
-    is(Object.keys(category).toSource(), '["delta", "values"]',
-      "The correct keys are in the cateogries data.");
-    is(typeof category.delta, "number",
-      "The delta property is a number, as expected.");
-    is(typeof category.values, "object",
-      "The values property is a object, as expected.");
-    ok("length" in category.values,
-      "The values property is an array, as expected.");
-  }
-
-  // Test plotting framerate...
-
-  let ticksData = recordingData.ticksData;
-  let framerateData = RecordingUtils.plotFramerateFor(ticksData, 0, Infinity);
-
-  ok("length" in framerateData,
-    "The framerate data is an array, as expected.");
-
-  for (let rate of framerateData) {
-    is(typeof rate.delta, "number",
-      "The delta property is a number, as expected.");
-    is(typeof rate.value, "number",
-      "The value property is a number, as expected.");
-  }
-
-  // Test categories and framerate syncing...
-
-  RecordingUtils.syncCategoriesWithFramerate(categoriesData, framerateData);
-  info("Total framerate data: " + framerateData.length);
-  info("Total categories data: " + categoriesData.length);
-
-  if (framerateData.length >= 2 && categoriesData.length >= 2) {
-    is(categoriesData[0].delta, framerateData[0].delta,
-      "The categories and framerate data now start at the exact same time.");
-    is(categoriesData.pop().delta, framerateData.pop().delta,
-      "The categories and framerate data now end at the exact same time.");
-  }
-
-  yield teardown(panel);
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_shared-connection-01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_shared-connection-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_shared-connection-01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_shared-connection-01.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if there's only one shared profiler connection instance per toolbox.
- */
-
-let gProfilerConnections = 0;
-Services.obs.addObserver(profilerConnectionObserver, "profiler-connection-created", false);
-
-let test = Task.async(function*() {
-  let firstTab = yield addTab(SIMPLE_URL);
-  let firstTarget = TargetFactory.forTab(firstTab);
-  yield firstTarget.makeRemote();
-
-  let toolboxFirstTab;
-  yield gDevTools.showToolbox(firstTarget, "webconsole").then((aToolbox) => {
-    toolboxFirstTab = aToolbox;
-  });
-
-  is(gProfilerConnections, 1,
-    "A shared profiler connection should have been created.");
-
-  yield gDevTools.showToolbox(firstTarget, "jsprofiler");
-  is(gProfilerConnections, 1,
-    "No new profiler connections should have been created.");
-
-  let secondTab = yield addTab(SIMPLE_URL);
-  let secondTarget = TargetFactory.forTab(secondTab);
-  yield secondTarget.makeRemote();
-
-  let toolboxSecondTab;
-  yield gDevTools.showToolbox(secondTarget, "jsprofiler").then((aToolbox) => {
-    toolboxSecondTab = aToolbox;
-  });
-
-  is(gProfilerConnections, 2,
-    "Only one new profiler connection should have been created.");
-
-  yield toolboxFirstTab.destroy().then(() => {
-    removeTab(firstTab);
-  });
-  yield toolboxSecondTab.destroy().then(() => {
-    removeTab(secondTab);
-    finish();
-  });
-});
-
-function profilerConnectionObserver(subject, topic, data) {
-  is(topic, "profiler-connection-created", "The correct topic was observed.");
-  gProfilerConnections++;
-}
-
-registerCleanupFunction(() => {
-  Services.obs.removeObserver(profilerConnectionObserver, "profiler-connection-created");
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_shared-connection-02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_shared-connection-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_shared-connection-02.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_shared-connection-02.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the shared profiler connection is only opened once.
- */
-
-let gProfilerConnectionsOpened = 0;
-Services.obs.addObserver(profilerConnectionObserver, "profiler-connection-opened", false);
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-
-  is(gProfilerConnectionsOpened, 1,
-    "Only one profiler connection was opened.");
-
-  let SharedProfilerUtils = devtools.require("devtools/profiler/shared");
-  let sharedProfilerConnection = SharedProfilerUtils.getProfilerConnection(panel._toolbox);
-
-  ok(sharedProfilerConnection,
-    "A shared profiler connection for the current toolbox was retrieved.");
-  is(sharedProfilerConnection._request, panel.panelWin.gFront._request,
-    "The same shared profiler connection is used by the panel's front.");
-
-  ok(sharedProfilerConnection._target,
-    "A target exists for the current profiler connection.");
-  ok(sharedProfilerConnection._client,
-    "A target exists for the current profiler connection.");
-  is(sharedProfilerConnection._pendingConsoleRecordings.length, 0,
-    "There shouldn't be any pending console recordings yet.");
-  is(sharedProfilerConnection._finishedConsoleRecordings.length, 0,
-    "There shouldn't be any finished console recordings yet.");
-
-  yield sharedProfilerConnection.open();
-  is(gProfilerConnectionsOpened, 1,
-    "No additional profiler connections were opened.");
-
-  yield teardown(panel);
-  finish();
-});
-
-function profilerConnectionObserver(subject, topic, data) {
-  is(topic, "profiler-connection-opened", "The correct topic was observed.");
-  gProfilerConnectionsOpened++;
-}
-
-registerCleanupFunction(() => {
-  Services.obs.removeObserver(profilerConnectionObserver, "profiler-connection-opened");
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_shared-connection-03.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_shared-connection-03.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_shared-connection-03.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_shared-connection-03.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the shared profiler connection can properly send requests.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let front = panel.panelWin.gFront;
-
-  ok(!nsIProfilerModule.IsActive(),
-    "The built-in profiler module should not have been automatically started.");
-
-  let result = yield front._request("profiler", "startProfiler");
-  is(result.started, true,
-    "The request finished successfully and the profiler should've been started.");
-  ok(nsIProfilerModule.IsActive(),
-    "The built-in profiler module should now be active.");
-
-  result = yield front._request("profiler", "stopProfiler");
-  is(result.started, false,
-    "The request finished successfully and the profiler should've been stopped.");
-  ok(!nsIProfilerModule.IsActive(),
-    "The built-in profiler module should now be inactive.");
-
-  yield teardown(panel);
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_shared-connection-04.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_shared-connection-04.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_shared-connection-04.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_shared-connection-04.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,200 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the shared profiler connection's console notifications are
- * handled as expected.
- */
-
-let test = Task.async(function*() {
-  // This test seems to be a bit slow on debug builds.
-  requestLongerTimeout(3);
-
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-
-  let SharedProfilerUtils = devtools.require("devtools/profiler/shared");
-  let sharedProfilerConnection = SharedProfilerUtils.getProfilerConnection(panel._toolbox);
-
-  let pendingRecordings = sharedProfilerConnection._pendingConsoleRecordings;
-  let finishedRecordings = sharedProfilerConnection._finishedConsoleRecordings;
-  let stackSize = 0;
-  sharedProfilerConnection.on("profile", () => stackSize++);
-  sharedProfilerConnection.on("profileEnd", () => stackSize--);
-
-  ok(!(yield sharedProfilerConnection._request("profiler", "isActive")).isActive,
-    "The profiler should not be active yet.");
-  ok(!(yield sharedProfilerConnection._framerate.isRecording()),
-    "The framerate actor should not be recording yet.");
-
-  // Start calling `console.profile()`...
-
-  let pushedLabels = [];
-  pushedLabels.push((yield consoleProfile(sharedProfilerConnection)));
-
-  // Quickly check if the profiler and framerate actor have started recording.
-
-  ok((yield sharedProfilerConnection._request("profiler", "isActive")).isActive,
-    "The profiler should have been started.");
-  ok((yield sharedProfilerConnection._framerate.isRecording()),
-    "The framerate actor should have started recording.");
-
-  // Continue calling `console.profile()` with different arguments...
-
-  pushedLabels.push((yield consoleProfile(sharedProfilerConnection, true, undefined)));
-  pushedLabels.push((yield consoleProfile(sharedProfilerConnection, true, null)));
-  pushedLabels.push((yield consoleProfile(sharedProfilerConnection, true, 0)));
-  pushedLabels.push((yield consoleProfile(sharedProfilerConnection, true, "")));
-  pushedLabels.push((yield consoleProfile(sharedProfilerConnection, true, [])));
-  pushedLabels.push((yield consoleProfile(sharedProfilerConnection, true, [1, 2, 3])));
-  pushedLabels.push((yield consoleProfile(sharedProfilerConnection, true, [4, 5, 6])));
-  pushedLabels.push((yield consoleProfile(sharedProfilerConnection, true, "hello world")));
-  pushedLabels.push((yield consoleProfile(sharedProfilerConnection, true, "hello world")));
-
-  // Verify the actors' and stack state.
-
-  ok((yield sharedProfilerConnection._request("profiler", "isActive")).isActive,
-    "The profiler should still be active.");
-  ok((yield sharedProfilerConnection._framerate.isRecording()),
-    "The framerate actor should still be active.");
-
-  is(pushedLabels.length, 10,
-    "There should be 10 calls made to `console.profile()`.");
-  is(pushedLabels[0], undefined,
-    "The first `console.profile()` call had the correct coerced argument.");
-  is(pushedLabels[1], "null",
-    "The second `console.profile()` call had the correct coerced argument.");
-  is(pushedLabels[2], "null",
-    "The third `console.profile()` call had the correct coerced argument.");
-  is(pushedLabels[3], "0",
-    "The fourth `console.profile()` call had the correct coerced argument.");
-  is(pushedLabels[4], "",
-    "The fifth `console.profile()` call had the correct coerced argument.");
-  is(pushedLabels[5], "",
-    "The sixth `console.profile()` call had the correct coerced argument.");
-  is(pushedLabels[6], "1,2,3",
-    "The seventh `console.profile()` call had the correct coerced argument.");
-  is(pushedLabels[7], "4,5,6",
-    "The eigth `console.profile()` call had the correct coerced argument.");
-  is(pushedLabels[8], "hello world",
-    "The ninth `console.profile()` call had the correct coerced argument.");
-  is(pushedLabels[9], "hello world",
-    "The tenth `console.profile()` call had the correct coerced argument.");
-
-  is(stackSize, 7,
-    "There should be 7 pending profiles on the stack.");
-  is(pendingRecordings.length, 7,
-    "The internal pending console recordings count is correct.");
-  is(finishedRecordings.length, 0,
-    "The internal finished console recordings count is correct.");
-
-  testPendingRecording(pendingRecordings, 0, pushedLabels[0]);
-  testPendingRecording(pendingRecordings, 1, pushedLabels[1]);
-  testPendingRecording(pendingRecordings, 2, pushedLabels[3]);
-  testPendingRecording(pendingRecordings, 3, pushedLabels[4]);
-  testPendingRecording(pendingRecordings, 4, pushedLabels[6]);
-  testPendingRecording(pendingRecordings, 5, pushedLabels[7]);
-  testPendingRecording(pendingRecordings, 6, pushedLabels[8]);
-
-  // Start calling `console.profileEnd()`...
-
-  let poppedLabels = [];
-  poppedLabels.push((yield consoleProfileEnd(sharedProfilerConnection)));
-
-  // Quickly check if the profiler and framerate actor are still recording.
-
-  ok((yield sharedProfilerConnection._request("profiler", "isActive")).isActive,
-    "The profiler should still be active after one recording stopped.");
-  ok((yield sharedProfilerConnection._framerate.isRecording()),
-    "The framerate actor should still be active after one recording stopped.");
-
-  // Continue calling `console.profileEnd()` with different arguments...
-
-  poppedLabels.push((yield consoleProfileEnd(sharedProfilerConnection, true, null)));
-  poppedLabels.push((yield consoleProfileEnd(sharedProfilerConnection, true, 0)));
-  poppedLabels.push((yield consoleProfileEnd(sharedProfilerConnection, true, "")));
-  poppedLabels.push((yield consoleProfileEnd(sharedProfilerConnection, true, [1, 2, 3])));
-  poppedLabels.push((yield consoleProfileEnd(sharedProfilerConnection, true, [4, 5, 6])));
-  poppedLabels.push((yield consoleProfileEnd(sharedProfilerConnection, true, "hello world")));
-
-  // Verify the actors' and stack state.
-
-  ok((yield sharedProfilerConnection._request("profiler", "isActive")).isActive,
-    "The profiler should still be active after all recordings stopped.");
-  ok(!(yield sharedProfilerConnection._framerate.isRecording()),
-    "The framerate actor should not be active after all recordings stopped.");
-
-  is(poppedLabels.length, 7,
-    "There should be 7 calls made to `console.profileEnd()`.");
-  is(poppedLabels[0], undefined,
-    "The first `console.profileEnd()` call had the correct coerced argument.");
-  is(poppedLabels[1], "null",
-    "The second `console.profileEnd()` call had the correct coerced argument.");
-  is(poppedLabels[2], "0",
-    "The third `console.profileEnd()` call had the correct coerced argument.");
-  is(poppedLabels[3], "",
-    "The fourth `console.profileEnd()` call had the correct coerced argument.");
-  is(poppedLabels[4], "1,2,3",
-    "The fifth `console.profileEnd()` call had the correct coerced argument.");
-  is(poppedLabels[5], "4,5,6",
-    "The sixth `console.profileEnd()` call had the correct coerced argument.");
-  is(poppedLabels[6], "hello world",
-    "The seventh `console.profileEnd()` call had the correct coerced argument.");
-
-  is(stackSize, 0,
-    "There should be 0 pending profiles on the stack.");
-  is(pendingRecordings.length, 0,
-    "The internal pending console recordings count is correct.");
-  is(finishedRecordings.length, 7,
-    "The internal finished console recordings count is correct.");
-
-  testFinishedRecording(finishedRecordings, 0, poppedLabels[0]);
-  testFinishedRecording(finishedRecordings, 1, poppedLabels[1]);
-  testFinishedRecording(finishedRecordings, 2, poppedLabels[2]);
-  testFinishedRecording(finishedRecordings, 3, poppedLabels[3]);
-  testFinishedRecording(finishedRecordings, 4, poppedLabels[4]);
-  testFinishedRecording(finishedRecordings, 5, poppedLabels[5]);
-  testFinishedRecording(finishedRecordings, 6, poppedLabels[6]);
-
-  // We're done here.
-
-  yield teardown(panel);
-  finish();
-});
-
-function* consoleProfile(connection, withLabel, labelValue) {
-  let notified = connection.once("invoked-console-profile");
-  if (!withLabel) {
-    console.profile();
-  } else {
-    console.profile(labelValue);
-  }
-  return (yield notified);
-}
-
-function* consoleProfileEnd(connection, withLabel, labelValue) {
-  let notified = connection.once("invoked-console-profileEnd");
-  if (!withLabel) {
-    console.profileEnd();
-  } else {
-    console.profileEnd(labelValue);
-  }
-  return (yield notified);
-}
-
-function testPendingRecording(pendingRecordings, index, label) {
-  is(pendingRecordings[index].profileLabel, label,
-    "The pending profile at index " + index + " on the stack has the correct label.");
-  ok(pendingRecordings[index].profilingStartTime >= 0,
-    "...and has a positive start time.");
-}
-
-function testFinishedRecording(finishedRecordings, index, label) {
-  is(finishedRecordings[index].profilerData.profileLabel, label,
-    "The finished profile at index " + index + " has the correct label.");
-  ok(finishedRecordings[index].recordingDuration > 0,
-    "...and has a strictly positive recording duration.");
-  ok("samples" in finishedRecordings[index].profilerData.profile.threads[0],
-    "...with profiler data samples attached.");
-  ok("ticksData" in finishedRecordings[index],
-    "...and with refresh driver ticks data attached.");
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_shared-front-01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_shared-front-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_shared-front-01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_shared-front-01.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler connection front relays console notifications.
- */
-
-let test = Task.async(function*() {
-  // This test seems to be a bit slow on debug builds.
-  requestLongerTimeout(3);
-
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let front = panel.panelWin.gFront;
-
-  let SharedProfilerUtils = devtools.require("devtools/profiler/shared");
-  let sharedProfilerConnection = SharedProfilerUtils.getProfilerConnection(panel._toolbox);
-
-  let stackSize = 0;
-  front.on("profile", () => stackSize++);
-  front.on("profileEnd", () => stackSize--);
-
-  for (let i = 0; i < 10; i++) {
-    yield consoleProfile(sharedProfilerConnection, i);
-    is(stackSize, i + 1,
-      "The current stack size is correctly: " + (i + 1));
-    is(front.pendingConsoleRecordings.length, i + 1,
-      "The publicly exposed pending recordings array has the correct size.");
-  }
-  for (let i = 9; i >= 0; i--) {
-    yield consoleProfileEnd(sharedProfilerConnection);
-    is(stackSize, i,
-      "The current stack size is correctly: " + i);
-    is(front.pendingConsoleRecordings.length, i,
-      "The publicly exposed pending recordings array has the correct size.");
-    is(front.finishedConsoleRecordings.length, 10 - i,
-      "The publicly exposed finished recordings array has the correct size.");
-  }
-
-  yield teardown(panel);
-  finish();
-});
-
-function* consoleProfile(connection, label) {
-  let notified = connection.once("profile");
-  console.profile(label);
-  yield notified;
-}
-
-function* consoleProfileEnd(connection) {
-  let notified = connection.once("profileEnd");
-  console.profileEnd();
-  yield notified;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_shared-front-02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_shared-front-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_shared-front-02.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_shared-front-02.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler connection front does not activate the built-in
- * profiler module if not necessary, and doesn't deactivate it when
- * a recording is stopped.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let front = panel.panelWin.gFront;
-
-  ok(!nsIProfilerModule.IsActive(),
-    "The built-in profiler module should not have been automatically started.");
-
-  let activated = front.once("profiler-activated");
-  yield front.startRecording();
-  yield activated;
-  yield front.stopRecording();
-  ok(nsIProfilerModule.IsActive(),
-    "The built-in profiler module should still be active (1).");
-
-  let alreadyActive = front.once("profiler-already-active");
-  yield front.startRecording();
-  yield alreadyActive;
-  yield front.stopRecording();
-  ok(nsIProfilerModule.IsActive(),
-    "The built-in profiler module should still be active (2).");
-
-  yield teardown(panel);
-
-  ok(!nsIProfilerModule.IsActive(),
-    "The built-in profiler module should have been automatically stoped.");
-
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_shared-front-03.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_shared-front-03.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_shared-front-03.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_shared-front-03.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the built-in profiler module doesn't deactivate when the toolbox
- * is destroyed if there are other consumers using it.
- */
-
-let test = Task.async(function*() {
-  let [,, firstPanel] = yield initFrontend(SIMPLE_URL);
-  let firstFront = firstPanel.panelWin.gFront;
-
-  let activated = firstFront.once("profiler-activated");
-  yield firstFront.startRecording();
-  yield activated;
-
-  let [,, secondPanel] = yield initFrontend(SIMPLE_URL);
-  let secondFront = secondPanel.panelWin.gFront;
-
-  let alreadyActive = secondFront.once("profiler-already-active");
-  yield secondFront.startRecording();
-  yield alreadyActive;
-
-  yield teardown(firstPanel);
-  ok(nsIProfilerModule.IsActive(),
-    "The built-in profiler module should still be active.");
-
-  yield teardown(secondPanel);
-  ok(!nsIProfilerModule.IsActive(),
-    "The built-in profiler module should have been automatically stoped.");
-
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_shared-front-04.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_shared-front-04.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_shared-front-04.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_shared-front-04.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the built-in profiler module is not reactivated if no other
- * consumer was using it over the remote debugger protocol, and ensures
- * that the actor will work properly even in such cases (e.g. the Gecko Profiler
- * addon was installed and automatically activated the profiler module).
- */
-
-let test = Task.async(function*() {
-  // Ensure the profiler is already running when the test starts.
-  let ENTRIES = 1000000;
-  let INTERVAL = 1;
-  let FEATURES = ["js"];
-  nsIProfilerModule.StartProfiler(ENTRIES, INTERVAL, FEATURES, FEATURES.length);
-
-  let [,, firstPanel] = yield initFrontend(SIMPLE_URL);
-  let firstFront = firstPanel.panelWin.gFront;
-
-  let alredyActive = firstFront.once("profiler-already-active");
-  yield firstFront.startRecording();
-  yield alredyActive;
-  ok(firstFront._profilingStartTime > 0, "The profiler was not restarted.");
-
-  let [,, secondPanel] = yield initFrontend(SIMPLE_URL);
-  let secondFront = secondPanel.panelWin.gFront;
-
-  let alreadyActive = secondFront.once("profiler-already-active");
-  yield secondFront.startRecording();
-  yield alreadyActive;
-  ok(secondFront._profilingStartTime > 0, "The profiler was not restarted.");
-
-  yield teardown(firstPanel);
-  ok(nsIProfilerModule.IsActive(),
-    "The built-in profiler module should still be active.");
-
-  yield teardown(secondPanel);
-  ok(!nsIProfilerModule.IsActive(),
-    "The built-in profiler module should have been automatically stoped.");
-
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_shared-front-05.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_shared-front-05.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_shared-front-05.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_shared-front-05.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the framerate front is kept recording only when required.
- */
-
-let test = Task.async(function*() {
-  let [,, panel] = yield initFrontend(SIMPLE_URL);
-  let front = panel.panelWin.gFront;
-
-  let SharedProfilerUtils = devtools.require("devtools/profiler/shared");
-  let sharedProfilerConnection = SharedProfilerUtils.getProfilerConnection(panel._toolbox);
-
-  ok(!(yield sharedProfilerConnection._framerate.isRecording()),
-    "The framerate actor should not be recording yet.");
-
-  yield front.startRecording();
-  ok((yield sharedProfilerConnection._framerate.isRecording()),
-    "The framerate actor should now be recording.");
-
-  yield consoleProfile(sharedProfilerConnection, "1");
-  ok((yield sharedProfilerConnection._framerate.isRecording()),
-    "The framerate actor should still be recording (1).");
-
-  yield front.startRecording();
-  ok((yield sharedProfilerConnection._framerate.isRecording()),
-    "The framerate actor should still be recording (2).");
-
-  yield consoleProfile(sharedProfilerConnection, "2");
-  ok((yield sharedProfilerConnection._framerate.isRecording()),
-    "The framerate actor should still be recording (3).");
-
-  yield front.stopRecording();
-  ok((yield sharedProfilerConnection._framerate.isRecording()),
-    "The framerate actor should still be recording (4).");
-
-  yield consoleProfileEnd(sharedProfilerConnection);
-  ok((yield sharedProfilerConnection._framerate.isRecording()),
-    "The framerate actor should still be recording (5).");
-
-  yield front.stopRecording();
-  ok((yield sharedProfilerConnection._framerate.isRecording()),
-    "The framerate actor should still be recording (6).");
-
-  yield consoleProfileEnd(sharedProfilerConnection);
-  ok(!(yield sharedProfilerConnection._framerate.isRecording()),
-    "The framerate actor should finally have stopped recording.");
-
-  yield teardown(panel);
-  finish();
-});
-
-function* consoleProfile(connection, label) {
-  let notified = connection.once("profile");
-  console.profile(label);
-  yield notified;
-}
-
-function* consoleProfileEnd(connection) {
-  let notified = connection.once("profileEnd");
-  console.profileEnd();
-  yield notified;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_shared-front-06.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_shared-front-06.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_shared-front-06.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_shared-front-06.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the framerate front is kept recording only when required,
- * this time doing everything in reverse.
- */
-
-let test = Task.async(function*() {
-  let [,, panel] = yield initFrontend(SIMPLE_URL);
-  let front = panel.panelWin.gFront;
-
-  let SharedProfilerUtils = devtools.require("devtools/profiler/shared");
-  let sharedProfilerConnection = SharedProfilerUtils.getProfilerConnection(panel._toolbox);
-
-  ok(!(yield sharedProfilerConnection._framerate.isRecording()),
-    "The framerate actor should not be recording yet.");
-
-  yield consoleProfile(sharedProfilerConnection, "1");
-  ok((yield sharedProfilerConnection._framerate.isRecording()),
-    "The framerate actor should now be recording.");
-
-  yield front.startRecording();
-  ok((yield sharedProfilerConnection._framerate.isRecording()),
-    "The framerate actor should still be recording (1).");
-
-  yield consoleProfile(sharedProfilerConnection, "2");
-  ok((yield sharedProfilerConnection._framerate.isRecording()),
-    "The framerate actor should still be recording (2).");
-
-  yield front.startRecording();
-  ok((yield sharedProfilerConnection._framerate.isRecording()),
-    "The framerate actor should still be recording (3).");
-
-  yield consoleProfileEnd(sharedProfilerConnection);
-  ok((yield sharedProfilerConnection._framerate.isRecording()),
-    "The framerate actor should still be recording (4).");
-
-  yield front.stopRecording();
-  ok((yield sharedProfilerConnection._framerate.isRecording()),
-    "The framerate actor should still be recording (5).");
-
-  yield consoleProfileEnd(sharedProfilerConnection);
-  ok((yield sharedProfilerConnection._framerate.isRecording()),
-    "The framerate actor should still be recording (6).");
-
-  yield front.stopRecording();
-  ok(!(yield sharedProfilerConnection._framerate.isRecording()),
-    "The framerate actor should finally have stopped recording.");
-
-  yield teardown(panel);
-  finish();
-});
-
-function* consoleProfile(connection, label) {
-  let notified = connection.once("profile");
-  console.profile(label);
-  yield notified;
-}
-
-function* consoleProfileEnd(connection) {
-  let notified = connection.once("profileEnd");
-  console.profileEnd();
-  yield notified;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_simple-record-01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_simple-record-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_simple-record-01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_simple-record-01.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler is able to start a simple recording.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { $, L10N, RecordingsListView, ProfileView } = panel.panelWin;
-
-  is(RecordingsListView.itemCount, 0,
-    "There should be no recordings visible yet.");
-  ok($(".side-menu-widget-empty-text"),
-    "There should be some empty text displayed in the recordings list.");
-
-  is(ProfileView.tabCount, 0,
-    "There shouldn't be any tabs visible yet.");
-  is($("#profile-pane").selectedPanel, $("#empty-notice"),
-    "There should be an empty notice displayed in the profile view.");
-
-  yield startRecording(panel);
-
-  is(RecordingsListView.itemCount, 1,
-    "There should be one recording visible now.");
-  ok(!$(".side-menu-widget-empty-text"),
-    "There shouldn't be any empty text displayed in the recordings list.");
-
-  is(ProfileView.tabCount, 0,
-    "There still shouldn't be any tabs visible yet.");
-  is($("#profile-pane").selectedPanel, $("#recording-notice"),
-    "There should be a recording notice displayed in the profile view.");
-
-  let recordingItem = RecordingsListView.selectedItem;
-  is(recordingItem, RecordingsListView.items[0],
-    "The first and only recording item should be automatically selected.");
-
-  is($(".recording-item-title", recordingItem.target).getAttribute("value"),
-    L10N.getFormatStr("recordingsList.itemLabel", 1),
-    "The recording item's title is correct.");
-
-  is($(".recording-item-duration", recordingItem.target).getAttribute("value"),
-    L10N.getStr("recordingsList.recordingLabel"),
-    "The recording item's duration is correct.");
-
-  is($(".recording-item-save", recordingItem.target).getAttribute("value"), "",
-    "The recording item's save link should be invisible.");
-
-  yield teardown(panel);
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_simple-record-02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_simple-record-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_simple-record-02.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_simple-record-02.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler is able to end a simple recording.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { $, L10N, RecordingsListView, ProfileView } = panel.panelWin;
-
-  yield startRecording(panel);
-  yield stopRecording(panel, { waitForDisplay: true });
-
-  is(RecordingsListView.itemCount, 1,
-    "There should be one recording visible.");
-  ok(!$(".side-menu-widget-empty-text"),
-    "There shouldn't be any empty text displayed in the recordings list.");
-
-  is(ProfileView.tabCount, 1,
-    "There should be one tab visible.");
-  is($("#profile-pane").selectedPanel, $("#profile-content"),
-    "The profile content should be displayed in the profile view.");
-
-  let recordingItem = RecordingsListView.selectedItem;
-  is(recordingItem, RecordingsListView.items[0],
-    "The first and only recording item should be automatically selected.");
-
-  ok(recordingItem.attachment.recordingDuration > 0,
-    "The recording duration appears to be correct.");
-  is(recordingItem.attachment.profileLabel, undefined,
-    "The profile label should be undefined for non-console recordings.");
-  ok(recordingItem.attachment.profilerData,
-    "The profiler data appears to be correct.");
-  ok(recordingItem.attachment.ticksData,
-    "The ticks data appears to be correct.");
-
-  is($(".recording-item-title", recordingItem.target).getAttribute("value"),
-    L10N.getFormatStr("recordingsList.itemLabel", 1),
-    "The recording item's title is correct.");
-
-  ok($(".recording-item-duration", recordingItem.target).getAttribute("value")
-    .match(/\d+ ms/),
-    "The recording item's duration is correct.");
-
-  is($(".recording-item-save", recordingItem.target).getAttribute("value"),
-    L10N.getStr("recordingsList.saveLabel"),
-    "The recording item's save link is correct.");
-
-  yield teardown(panel);
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_simple-record-03.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_simple-record-03.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_simple-record-03.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_simple-record-03.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler goes through the appropriate steps while displaying
- * a finished recording.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { EVENTS } = panel.panelWin;
-
-  yield startRecording(panel);
-
-  let loadingNoticeDisplayed = panel.panelWin.once(EVENTS.LOADING_NOTICE_SHOWN);
-  let recordingDisplayed = panel.panelWin.once(EVENTS.RECORDING_DISPLAYED);
-  yield stopRecording(panel, { waitForDisplay: false });
-
-  yield loadingNoticeDisplayed;
-  ok(true, "The loading noticed was briefly displayed.");
-
-  yield recordingDisplayed;
-  ok(true, "The recording was finally displayed.");
-
-  yield teardown(panel);
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_sudden-deactivation-01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_sudden-deactivation-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_sudden-deactivation-01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_sudden-deactivation-01.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler removes all pending recordings in case of a
- * sudden deactivation.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { $, EVENTS, RecordingsListView } = panel.panelWin;
-
-  is(RecordingsListView.itemCount, 0,
-    "There should be no recordings visible yet.");
-  is($("#profile-pane").selectedPanel, $("#empty-notice"),
-    "There should be an empty notice displayed in the profile view.");
-
-  yield startRecording(panel);
-
-  is(RecordingsListView.itemCount, 1,
-    "There should be one recording visible now.");
-  is($("#profile-pane").selectedPanel, $("#recording-notice"),
-    "There should be a recording notice displayed in the profile view.");
-
-  let whenLost = panel.panelWin.once(EVENTS.RECORDING_LOST);
-
-  // Forcibly stop the built-in profiler module.
-  nsIProfilerModule.StopProfiler();
-
-  yield whenLost;
-  ok(true, "Recording was cancelled in the frontend.");
-
-  is(RecordingsListView.itemCount, 0,
-    "There should be no recordings visible now.");
-  is($("#profile-pane").selectedPanel, $("#empty-notice"),
-    "There should be an empty notice displayed in the profile view again.");
-
-  ok(!$("#record-button").hasAttribute("checked"),
-    "The record button was unchecked.");
-
-  yield teardown(panel);
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_sudden-deactivation-02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_sudden-deactivation-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_sudden-deactivation-02.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_sudden-deactivation-02.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler removes all pending recordings in case of a
- * sudden deactivation, even the ones started via `console.profile`.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { $, EVENTS, gFront, RecordingsListView } = panel.panelWin;
-
-  is(RecordingsListView.itemCount, 0,
-    "There should be no recordings visible yet.");
-  is($("#profile-pane").selectedPanel, $("#empty-notice"),
-    "There should be an empty notice displayed in the profile view.");
-
-  yield startRecording(panel);
-  yield consoleProfile(gFront, "test");
-
-  is(RecordingsListView.itemCount, 2,
-    "There should be two recordings visible now.");
-  is(RecordingsListView.selectedIndex, 0,
-    "The first recording should be selected in the list.");
-  is($("#profile-pane").selectedPanel, $("#recording-notice"),
-    "There should be a recording notice displayed in the profile view.");
-
-  let whenLost = panel.panelWin.once(EVENTS.RECORDING_LOST);
-
-  // Forcibly stop the built-in profiler module.
-  nsIProfilerModule.StopProfiler();
-
-  yield whenLost;
-  ok(true, "Recording was cancelled in the frontend.");
-
-  is(RecordingsListView.itemCount, 0,
-    "There should be no recordings visible now.");
-  is(RecordingsListView.selectedIndex, -1,
-    "There shouldn't be any recording selected in the list.");
-  is($("#profile-pane").selectedPanel, $("#empty-notice"),
-    "There should be an empty notice displayed in the profile view again.");
-
-  ok(!$("#record-button").hasAttribute("checked"),
-    "The record button was unchecked.");
-
-  yield teardown(panel);
-  finish();
-});
-
-function* consoleProfile(front, label) {
-  let notified = front.once("profile");
-  console.profile(label);
-  yield notified;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_tabbed-browser-01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_tabbed-browser-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_tabbed-browser-01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_tabbed-browser-01.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler displays and organizes the recording data in tabs.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { $, ProfileView } = panel.panelWin;
-
-  yield startRecording(panel);
-  yield stopRecording(panel, { waitForDisplay: true });
-
-  is(ProfileView.tabCount, 1,
-    "There should be one tab visible.");
-  is($("#profile-pane").selectedPanel, $("#profile-content"),
-    "The profile content should be displayed in the profile view.");
-  is($("#profile-content").selectedIndex, 0,
-    "The first tab is selected.");
-
-  ok($("#profile-content .tab-title-label").getAttribute("value")
-    .match(/\d+ ms . \d+ ms/),
-    "The recording's first tab title is correct.");
-
-  yield teardown(panel);
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_tabbed-browser-02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_tabbed-browser-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_tabbed-browser-02.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_tabbed-browser-02.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler displays and organizes the recording data in tabs,
- * spawning a new tab from frame nodes when required.
- */
-
-const WAIT_TIME = 1000; // ms
-
-let gPrevShowPlatformData =
-  Services.prefs.getBoolPref("devtools.profiler.ui.show-platform-data");
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { $, $$, EVENTS, Prefs, ProfileView } = panel.panelWin;
-
-  // Make sure platform data is displayed, so there's samples available.
-  Prefs.showPlatformData = true;
-
-  yield startRecording(panel);
-  busyWait(WAIT_TIME); // allow the profiler module to sample more cpu activity
-  yield stopRecording(panel, { waitForDisplay: true });
-
-  let treeRoot = ProfileView._getCallTreeRoot();
-  ok(treeRoot,
-    "There's a call tree view available on the profile view.");
-  let callItem = treeRoot.getChild(0);
-  ok(callItem,
-    "The first displayed item in the tree was retreived.");
-  let callNode = callItem.target;
-  ok(callNode,
-    "The first displayed item in the tree has a corresponding DOM node.");
-
-  is($(".call-tree-name", callNode).getAttribute("value"), "Startup::XRE_Main",
-    "The first displayed item in the tree has the expected function name.");
-  is($(".call-tree-cell[type=percentage]", callNode).getAttribute("value"), "100%",
-    "The first displayed item in the tree has the expected percentage usage.");
-
-  let tabSpawned = panel.panelWin.once(EVENTS.TAB_SPAWNED_FROM_FRAME_NODE);
-  EventUtils.sendMouseEvent({ type: "mousedown" }, callNode.querySelector(".call-tree-zoom"));
-  yield tabSpawned;
-
-  is(ProfileView.tabCount, 2,
-    "There should be two tabs visible now.");
-  is($("#profile-pane").selectedPanel, $("#profile-content"),
-    "The profile content should still be displayed in the profile view.");
-  is($("#profile-content").selectedIndex, 1,
-    "The second tab is now selected.");
-
-  let firstTabTitle = $$("#profile-content .tab-title-label")[0].getAttribute("value");
-  let secondTabTitle = $$("#profile-content .tab-title-label")[1].getAttribute("value");
-  info("The first tab's title is: " + firstTabTitle);
-  info("The second tab's title is: " + secondTabTitle);
-
-  isnot(firstTabTitle, secondTabTitle,
-    "The first and second tab titles are different.");
-  ok(firstTabTitle.match(/\d+ ms . \d+ ms/),
-    "The recording's first tab title is correct.");
-  ok(secondTabTitle.match(/[\d\.,]+ ms . [\d\.,]+ ms/),
-    "The recording's second tab title is correct.");
-
-  let newTreeRoot = ProfileView._getCallTreeRoot();
-  ok(newTreeRoot,
-    "There's a call tree view available on the profile view again.");
-  let newCallItem = newTreeRoot.getChild(0);
-  ok(newCallItem,
-    "The first displayed item in the tree was retreived again.");
-  let newCallNode = newCallItem.target;
-  ok(newCallNode,
-    "The first displayed item in the tree has a corresponding DOM node again.");
-
-  isnot(treeRoot, newTreeRoot,
-    "The new call tree view has a different root this time.");
-  isnot(callNode, newCallNode,
-    "The new call tree view has a different corresponding DOM node this time.");
-
-  is($(".call-tree-name", newTreeRoot.target).getAttribute("value"), "Startup::XRE_Main",
-    "The first displayed item in the tree has the expected function name.");
-  is($(".call-tree-cell[type=percentage]", newTreeRoot.target).getAttribute("value"), "100%",
-    "The first displayed item in the tree has the expected percentage usage.");
-
-  yield teardown(panel);
-  finish();
-});
-
-registerCleanupFunction(() => {
-  Services.prefs.setBoolPref(
-    "devtools.profiler.ui.show-platform-data", gPrevShowPlatformData);
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_tabbed-browser-03.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_tabbed-browser-03.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_tabbed-browser-03.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_tabbed-browser-03.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the profiler displays and organizes the recording data in tabs,
- * spawning a new tab from a graph's selection when required.
- */
-
-const WAIT_TIME = 1000; // ms
-
-let gPrevShowPlatformData =
-  Services.prefs.getBoolPref("devtools.profiler.ui.show-platform-data");
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { $, $$, EVENTS, Prefs, ProfileView } = panel.panelWin;
-
-  // Make sure platform data is displayed, so there's samples available.
-  Prefs.showPlatformData = true;
-
-  yield startRecording(panel);
-  busyWait(WAIT_TIME); // allow the profiler module to sample more cpu activity
-  yield stopRecording(panel, { waitForDisplay: true });
-
-  let categoriesGraph = ProfileView._getCategoriesGraph();
-  ok(categoriesGraph,
-    "There's a categories graph available on the profile view.");
-
-  ok(!categoriesGraph.hasSelection(),
-    "The categories graph shouldn't have a selection available yet.");
-  ok($("#profile-newtab-button").hidden,
-    "The new tab button on the profile view tab bar should be hidden.");
-
-  dragStart(categoriesGraph, 10);
-  dragStop(categoriesGraph, 50);
-
-  ok(categoriesGraph.hasSelection(),
-    "The categories graph should have a selection available now.");
-  ok(!$("#profile-newtab-button").hidden,
-    "The new tab button on the profile view tab bar should be visible.");
-
-  let tabSpawned = panel.panelWin.once(EVENTS.TAB_SPAWNED_FROM_SELECTION);
-  EventUtils.sendMouseEvent({ type: "click" }, $("#profile-newtab-button"));
-  yield tabSpawned;
-
-  is(ProfileView.tabCount, 2,
-    "There should be two tabs visible now.");
-  is($("#profile-pane").selectedPanel, $("#profile-content"),
-    "The profile content should still be displayed in the profile view.");
-  is($("#profile-content").selectedIndex, 1,
-    "The second tab is now selected.");
-
-  let firstTabTitle = $$("#profile-content .tab-title-label")[0].getAttribute("value");
-  let secondTabTitle = $$("#profile-content .tab-title-label")[1].getAttribute("value");
-  info("The first tab's title is: " + firstTabTitle);
-  info("The second tab's title is: " + secondTabTitle);
-
-  isnot(firstTabTitle, secondTabTitle,
-    "The first and second tab titles are different.");
-  ok(firstTabTitle.match(/\d+ ms . \d+ ms/),
-    "The recording's first tab title is correct.");
-  ok(secondTabTitle.match(/[\d\.,]+ ms . [\d\.,]+ ms/),
-    "The recording's second tab title is correct.");
-
-  yield teardown(panel);
-  finish();
-});
-
-registerCleanupFunction(() => {
-  Services.prefs.setBoolPref(
-    "devtools.profiler.ui.show-platform-data", gPrevShowPlatformData);
-});
-
-// EventUtils just doesn't work!
-
-function dragStart(graph, x, y = 1) {
-  x /= window.devicePixelRatio;
-  y /= window.devicePixelRatio;
-  graph._onMouseMove({ testX: x, testY: y });
-  graph._onMouseDown({ testX: x, testY: y });
-}
-
-function dragStop(graph, x, y = 1) {
-  x /= window.devicePixelRatio;
-  y /= window.devicePixelRatio;
-  graph._onMouseMove({ testX: x, testY: y });
-  graph._onMouseUp({ testX: x, testY: y });
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_tabbed-browser-add-remove-01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_tabbed-browser-add-remove-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_tabbed-browser-add-remove-01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_tabbed-browser-add-remove-01.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if adding, naming and selecting tabs in the ProfileView works.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { $, $$, L10N, Prefs, ProfileView } = panel.panelWin;
-
-  yield startRecording(panel);
-  yield stopRecording(panel, { waitForDisplay: true });
-
-  let tabIndex = ProfileView.addTab();
-  is(tabIndex, 1,
-    "A new tab was successfully added to the tabbed browser.");
-
-  is($("#profile-content tabs").childNodes.length, 2,
-    "There should be two tabs in the tabbed browser.");
-  is($("#profile-content tabpanels").childNodes.length, 2,
-    "There should be two tabpanels in the tabbed browser.");
-
-  is($("#profile-content").selectedIndex, 0,
-    "The first tab should still be selected in the tabbed browser (1).");
-  is($("#profile-content").selectedTab, $$("#profile-content tab")[0],
-    "The first tab should still be selected in the tabbed browser (2).");
-
-  ProfileView.nameTab(tabIndex, 12.34, 56.78);
-
-  ok($$("#profile-content .tab-title-label")[1].getAttribute("value"),
-    L10N.getFormatStr("profile.tab", "12.34", "56.78"),
-    "The newly added tab's title was successfully changed.");
-
-  ProfileView.selectTab(tabIndex);
-
-  is($("#profile-content").selectedIndex, 1,
-    "The second tab is now selected in the tabbed browser (1).");
-  is($("#profile-content").selectedTab, $$("#profile-content tab")[1],
-    "The second tab is now selected in the tabbed browser (2).");
-
-  yield teardown(panel);
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_tabbed-browser-add-remove-02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_tabbed-browser-add-remove-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/browser_profiler_tabbed-browser-add-remove-02.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/browser_profiler_tabbed-browser-add-remove-02.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if removing tabs in the ProfileView works.
- */
-
-let test = Task.async(function*() {
-  let [target, debuggee, panel] = yield initFrontend(SIMPLE_URL);
-  let { $, $$, L10N, Prefs, ProfileView } = panel.panelWin;
-
-  yield startRecording(panel);
-  yield stopRecording(panel, { waitForDisplay: true });
-
-  let newTab1 = ProfileView.addTab();
-  let newTab2 = ProfileView.addTab();
-  let newTab3 = ProfileView.addTab();
-
-  is($("#profile-content tabs").childNodes.length, 4,
-    "There should be four tabs in the tabbed browser.");
-  is($("#profile-content tabpanels").childNodes.length, 4,
-    "There should be four tabpanels in the tabbed browser.");
-
-  is($("#profile-content").selectedIndex, 0,
-    "The first tab should still be selected in the tabbed browser (1).");
-  is($("#profile-content").selectedTab, $$("#profile-content tab")[0],
-    "The first tab should still be selected in the tabbed browser (2).");
-
-  ProfileView.removeTabsAfter(newTab1);
-
-  is($("#profile-content tabs").childNodes.length, 2,
-    "There should be two tabs in the tabbed browser now.");
-  is($("#profile-content tabpanels").childNodes.length, 2,
-    "There should be two tabpanels in the tabbed browser now.");
-
-  is($("#profile-content").selectedIndex, 0,
-    "The first tab should still be selected in the tabbed browser (3).");
-  is($("#profile-content").selectedTab, $$("#profile-content tab")[0],
-    "The first tab should still be selected in the tabbed browser (4).");
-
-  ProfileView.removeAllTabs();
-
-  is($("#profile-content tabs").childNodes.length, 0,
-    "There should be no tabs in the tabbed browser now.");
-  is($("#profile-content tabpanels").childNodes.length, 0,
-    "There should be no tabpanels in the tabbed browser now.");
-
-  is($("#profile-content").selectedIndex, -1,
-    "No tab should be selected in the tabbed browser (3).");
-  is($("#profile-content").selectedTab, null,
-    "No tab should be selected in the tabbed browser (4).");
-
-  yield teardown(panel);
-  finish();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/doc_simple-test.html firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/doc_simple-test.html
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/doc_simple-test.html	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/doc_simple-test.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/ -->
-<!doctype html>
-
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <title>Profiler test page</title>
-  </head>
-
-  <body>
-    <script type="text/javascript">
-      function test() {
-        var a = "Hello world!";
-      }
-
-      // Prevent this script from being garbage collected.
-      window.setInterval(test, 1);
-    </script>
-  </body>
-
-</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/head.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/test/head.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/test/head.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,165 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-"use strict";
-
-const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
-
-let { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
-
-// Disable logging for all the tests. Both the debugger server and frontend will
-// be affected by this pref.
-let gEnableLogging = Services.prefs.getBoolPref("devtools.debugger.log");
-Services.prefs.setBoolPref("devtools.debugger.log", false);
-
-let { Task } = Cu.import("resource://gre/modules/Task.jsm", {});
-let { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
-let { DevToolsUtils } = Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm", {});
-let { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
-let { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-let { DebuggerServer } = Cu.import("resource://gre/modules/devtools/dbg-server.jsm", {});
-let { DebuggerClient } = Cu.import("resource://gre/modules/devtools/dbg-client.jsm", {});
-
-let nsIProfilerModule = Cc["@mozilla.org/tools/profiler;1"].getService(Ci.nsIProfiler);
-let TargetFactory = devtools.TargetFactory;
-let Toolbox = devtools.Toolbox;
-
-const EXAMPLE_URL = "http://example.com/browser/browser/devtools/profiler/test/";
-const SIMPLE_URL = EXAMPLE_URL + "doc_simple-test.html";
-
-// All tests are asynchronous.
-waitForExplicitFinish();
-
-registerCleanupFunction(() => {
-  info("finish() was called, cleaning up...");
-  Services.prefs.setBoolPref("devtools.debugger.log", gEnableLogging);
-
-  // Make sure the profiler module is stopped when the test finishes.
-  nsIProfilerModule.StopProfiler();
-});
-
-function addTab(url) {
-  info("Adding tab: " + url);
-
-  let deferred = promise.defer();
-  let tab = gBrowser.selectedTab = gBrowser.addTab(url);
-  let linkedBrowser = tab.linkedBrowser;
-
-  linkedBrowser.addEventListener("load", function onLoad() {
-    linkedBrowser.removeEventListener("load", onLoad, true);
-    info("Tab added and finished loading: " + url);
-    deferred.resolve(tab);
-  }, true);
-
-  return deferred.promise;
-}
-
-function removeTab(tab) {
-  info("Removing tab.");
-
-  let deferred = promise.defer();
-  let tabContainer = gBrowser.tabContainer;
-
-  tabContainer.addEventListener("TabClose", function onClose(aEvent) {
-    tabContainer.removeEventListener("TabClose", onClose, false);
-    info("Tab removed and finished closing.");
-    deferred.resolve();
-  }, false);
-
-  gBrowser.removeTab(tab);
-  return deferred.promise;
-}
-
-function* initFrontend(url, id = "jsprofiler") {
-  info("Initializing a " + id + " pane.");
-
-  let tab = yield addTab(url);
-  let target = TargetFactory.forTab(tab);
-  let debuggee = tab.linkedBrowser.contentWindow.wrappedJSObject;
-
-  yield target.makeRemote();
-
-  let toolbox = yield gDevTools.showToolbox(target, id);
-  let panel = toolbox.getCurrentPanel();
-  return [target, debuggee, panel];
-}
-
-function* teardown(panel) {
-  info("Destroying the specified profiler.");
-
-  let tab = panel.target.tab;
-  yield panel._toolbox.destroy();
-  yield removeTab(tab);
-}
-
-function* waitForProfilerConnection() {
-  let profilerConnected = promise.defer();
-  let profilerConnectionObserver = () => profilerConnected.resolve();
-  Services.obs.addObserver(profilerConnectionObserver, "profiler-connection-opened", false);
-
-  yield profilerConnected.promise;
-  Services.obs.removeObserver(profilerConnectionObserver, "profiler-connection-opened");
-}
-
-function busyWait(time) {
-  let start = Date.now();
-  let stack;
-  while (Date.now() - start < time) { stack = Components.stack; }
-}
-
-function idleWait(time) {
-  return DevToolsUtils.waitForTime(time);
-}
-
-function* startRecording(panel) {
-  let win = panel.panelWin;
-  let started = win.once(win.EVENTS.RECORDING_STARTED);
-  let button = win.$("#record-button");
-
-  ok(!button.hasAttribute("checked"),
-    "The record button should not be checked yet.");
-  ok(!button.hasAttribute("locked"),
-    "The record button should not be locked yet.");
-
-  EventUtils.synthesizeMouseAtCenter(button, {}, win);
-  yield started;
-
-  ok(button.hasAttribute("checked"),
-    "The record button should is now checked.");
-  ok(!button.hasAttribute("locked"),
-    "The record button should still not be locked.");
-}
-
-function* stopRecording(panel, { waitForDisplay }) {
-  let win = panel.panelWin;
-  let ended = win.once(win.EVENTS.RECORDING_ENDED);
-  let displayed = win.once(win.EVENTS.RECORDING_DISPLAYED);
-  let button = win.$("#record-button");
-
-  ok(button.hasAttribute("checked"),
-    "The record button should already be checked.");
-  ok(!button.hasAttribute("locked"),
-    "The record button should not be locked.");
-
-  EventUtils.synthesizeMouseAtCenter(button, {}, win);
-  yield ended;
-
-  ok(button.hasAttribute("checked"),
-    "The record button should still be checked.");
-  ok(button.hasAttribute("locked"),
-    "The record button now has a locked attribute.");
-
-  if (waitForDisplay) {
-    yield displayed;
-    if (!win.RecordingsListView.getItemForPredicate(e => e.isRecording)) {
-      ok(!button.hasAttribute("checked"),
-        "The record button should not be checked anymore.");
-    }
-    ok(!button.hasAttribute("locked"),
-      "The record button should not be locked anymore.");
-  }
-}
-
-function getSourceActor(aSources, aURL) {
-  let item = aSources.getItemForAttachment(a => a.source.url === aURL);
-  return item && item.value;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/ui-profile.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/ui-profile.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/ui-profile.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/ui-profile.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,834 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-/**
- * Functions handling the profile inspection UI, showing the framerate and
- * cateogry graphs, along with a call tree view.
- *
- * A profile view is a tabbed browser, so recording data will be displayed in
- * tabs. Certain messages like 'Loading' or 'Recording...' may also be shown.
- */
-let ProfileView = {
-  /**
-   * Initialization function, called when the tool is started.
-   */
-  initialize: function() {
-    this._tabs = $("#profile-content tabs");
-    this._panels = $("#profile-content tabpanels");
-    this._tabTemplate = $("#profile-content-tab-template");
-    this._panelTemplate = $("#profile-content-tabpanel-template");
-    this._newtabButton = $("#profile-newtab-button");
-    this._invertTree = $("#invert-tree");
-
-    this._recordingInfoByPanel = new WeakMap();
-    this._framerateGraphByPanel = new Map();
-    this._categoriesGraphByPanel = new Map();
-    this._callTreeRootByPanel = new Map();
-
-    this._onTabSelect = this._onTabSelect.bind(this);
-    this._onNewTabClick = this._onNewTabClick.bind(this);
-    this._onInvertTree = this._onInvertTree.bind(this);
-    this._onGraphLegendSelection = this._onGraphLegendSelection.bind(this);
-    this._onGraphMouseUp = this._onGraphMouseUp.bind(this);
-    this._onGraphScroll = this._onGraphScroll.bind(this);
-    this._onCallViewFocus = this._onCallViewFocus.bind(this);
-    this._onCallViewLink = this._onCallViewLink.bind(this);
-    this._onCallViewZoom = this._onCallViewZoom.bind(this);
-
-    this._panels.addEventListener("select", this._onTabSelect, false);
-    this._newtabButton.addEventListener("click", this._onNewTabClick, false);
-    this._invertTree.addEventListener("command", this._onInvertTree, false);
-  },
-
-  /**
-   * Destruction function, called when the tool is closed.
-   */
-  destroy: function() {
-    this.removeAllTabs();
-
-    this._panels.removeEventListener("select", this._onTabSelect, false);
-    this._newtabButton.removeEventListener("click", this._onNewTabClick, false);
-    this._invertTree.removeEventListener("command", this._onInvertTree, false);
-  },
-
-  /**
-   * Shows a message detailing that there are is no data available.
-   * The tabbed browser will also be hidden.
-   */
-  showEmptyNotice: function() {
-    $("#profile-pane").selectedPanel = $("#empty-notice");
-    window.emit(EVENTS.EMPTY_NOTICE_SHOWN);
-  },
-
-  /**
-   * Shows a message detailing that a recording is currently in progress.
-   * The tabbed browser will also be hidden.
-   */
-  showRecordingNotice: function() {
-    $("#profile-pane").selectedPanel = $("#recording-notice");
-    window.emit(EVENTS.RECORDING_NOTICE_SHOWN);
-  },
-
-  /**
-   * Shows a message detailing that a finished recording is being loaded.
-   * The tabbed browser will also be hidden.
-   */
-  showLoadingNotice: function() {
-    $("#profile-pane").selectedPanel = $("#loading-notice");
-    window.emit(EVENTS.LOADING_NOTICE_SHOWN);
-  },
-
-  /**
-   * Shows the tabbed browser displaying recording data.
-   */
-  showTabbedBrowser: function() {
-    $("#profile-pane").selectedPanel = $("#profile-content");
-    window.emit(EVENTS.TABBED_BROWSER_SHOWN);
-  },
-
-  /**
-   * Selects the tab at the specified index in this tabbed browser.
-   *
-   * @param number tabIndex
-   *        The index of the tab to select. If no tab is available at the
-   *        specified index, all tabs will be deselected.
-   */
-  selectTab: function(tabIndex) {
-    $("#profile-content").selectedIndex = tabIndex;
-  },
-
-  /**
-   * Adds an empty tab in this tabbed browser.
-   *
-   * @return number
-   *         The newly created tab's index.
-   */
-  addTab: function() {
-    let tab = this._tabs.appendChild(this._tabTemplate.cloneNode(true));
-    let panel = this._panels.appendChild(this._panelTemplate.cloneNode(true));
-
-    // "Uncover" the tab via a CSS animation.
-    tab.removeAttribute("covered");
-
-    let tabIndex = this._tabs.itemCount - 1;
-    return tabIndex;
-  },
-
-  /**
-   * Sets the title of a tab in this tabbed browser.
-   *
-   * @param number tabIndex
-   *        The index of the tab to name.
-   * @param number beginAt, endAt
-   *        The 'start → stop' components of the tab title.
-   */
-  nameTab: function(tabIndex, beginAt, endAt) {
-    let tab = this._getTab(tabIndex);
-    let a = L10N.numberWithDecimals(beginAt, 2);
-    let b = L10N.numberWithDecimals(endAt, 2);
-    let labelNode = $(".tab-title-label", tab);
-    labelNode.setAttribute("value", L10N.getFormatStr("profile.tab", a, b));
-  },
-
-  /**
-   * Populates the panel for a tab in this tabbed browser with the provided
-   * recording data.
-   *
-   * @param number tabIndex
-   *        The index of the tab to populate.
-   * @param object recordingData
-   *        The profiler and refresh driver ticks data received from the front.
-   * @param number beginAt
-   *        The earliest time in the recording data to start at (in milliseconds).
-   * @param number endAt
-   *        The latest time in the recording data to end at (in milliseconds).
-   * @param object options
-   *        Additional options supported by this operation.
-   *        @see ProfileView._populatePanelWidgets
-   */
-  populateTab: Task.async(function*(tabIndex, recordingData, beginAt, endAt, options) {
-    let tab = this._getTab(tabIndex);
-    let panel = this._getPanel(tabIndex);
-    if (!tab || !panel) {
-      return;
-    }
-
-    this._recordingInfoByPanel.set(panel, {
-      recordingData: recordingData,
-      displayRange: { beginAt: beginAt, endAt: endAt }
-    });
-
-    let { profilerData, ticksData } = recordingData;
-    let categoriesData = RecordingUtils.plotCategoriesFor(profilerData, beginAt, endAt);
-    let framerateData = RecordingUtils.plotFramerateFor(ticksData, beginAt, endAt);
-    RecordingUtils.syncCategoriesWithFramerate(categoriesData, framerateData);
-
-    yield this._populatePanelWidgets(panel, {
-      profilerData: profilerData,
-      framerateData: framerateData,
-      categoriesData: categoriesData
-    }, beginAt, endAt, options);
-  }),
-
-  /**
-   * Adds a new tab in this tabbed browser, populates it with the provided
-   * recording data and automatically selects it.
-   *
-   * @param object recordingData
-   *        The profiler and refresh driver ticks data received from the front.
-   * @param number beginAt
-   *        The earliest time in the recording data to start at (in milliseconds).
-   * @param number endAt
-   *        The latest time in the recording data to end at (in milliseconds).
-   * @param object options
-   *        Additional options supported by this operation.
-   *        @see ProfileView._populatePanelWidgets
-   */
-  addTabAndPopulate: Task.async(function*(recordingData, beginAt, endAt, options) {
-    let tabIndex = this.addTab();
-    this.nameTab(tabIndex, beginAt, endAt);
-
-    // Wait for a few milliseconds before presenting the recording data,
-    // to allow the 'Loading' panel to finish being drawn (if there is one).
-    yield DevToolsUtils.waitForTime(RECORDING_DATA_DISPLAY_DELAY);
-    yield this.populateTab(tabIndex, recordingData, beginAt, endAt, options);
-    this.selectTab(tabIndex);
-  }),
-
-  /**
-   * Removes all tabs and corresponding views from this tabbed browser.
-   */
-  removeAllTabs: function() {
-    for (let [, graph] of this._framerateGraphByPanel) graph.destroy();
-    for (let [, graph] of this._categoriesGraphByPanel) graph.destroy();
-    for (let [, root] of this._callTreeRootByPanel) root.remove();
-
-    this._recordingInfoByPanel = new WeakMap();
-    this._framerateGraphByPanel.clear();
-    this._categoriesGraphByPanel.clear();
-    this._callTreeRootByPanel.clear();
-
-    while (this._tabs.hasChildNodes()) {
-      this._tabs.firstChild.remove();
-    }
-    while (this._panels.hasChildNodes()) {
-      this._panels.firstChild.remove();
-    }
-  },
-
-  /**
-   * Removes all tabs exclusively after the one at the specified index.
-   *
-   * @param number tabIndex
-   *        The "leftmost" tab to still keep. Remaining tabs will be removed.
-   */
-  removeTabsAfter: function(tabIndex) {
-    tabIndex++;
-
-    while (tabIndex < this._tabs.itemCount) {
-      let tab = this._getTab(tabIndex);
-      let panel = this._getPanel(tabIndex);
-
-      this._framerateGraphByPanel.delete(panel);
-      this._categoriesGraphByPanel.delete(panel);
-      this._callTreeRootByPanel.delete(panel);
-      tab.remove();
-      panel.remove();
-    }
-  },
-
-  /**
-   * Gets the total number of tabs displayed in this tabbed browser.
-   * @return number
-   */
-  get tabCount() {
-    let tabs = this._tabs.childNodes.length;
-    let tabpanels = this._panels.childNodes.length;
-    if (tabs != tabpanels) {
-      throw "The number of tabs isn't equal to the number of tabpanels.";
-    }
-    return tabs;
-  },
-
-  /**
-   * Adds a new tab in this tabbed browser, populates it based on the current
-   * selection range in the displayed data and automatically selects it.
-   */
-  _spawnTabFromSelection: Task.async(function*() {
-    let { recordingData } = this._getRecordingInfo();
-    let categoriesGraph = this._getCategoriesGraph();
-
-    // A selection is assumed to be available in the current tab.
-    let { min: beginAt, max: endAt } = categoriesGraph.getMappedSelection();
-
-    // Hide the "new tab" button since a selection won't implicitly be made
-    // in the newly created tab.
-    this._newtabButton.hidden = true;
-
-    yield this.addTabAndPopulate(recordingData, beginAt, endAt);
-
-    // Signal that a new tab was spawned from a graph's selection.
-    window.emit(EVENTS.TAB_SPAWNED_FROM_SELECTION);
-  }),
-
-  /**
-   * Adds a new tab in this tabbed browser, populates it based on the provided
-   * frame node and automatically selects it.
-   *
-   * @param FrameNode frameNode
-   *        Information about the function call node in the tree.
-   */
-  _spawnTabFromFrameNode: Task.async(function*(frameNode) {
-    let { recordingData } = this._getRecordingInfo();
-    let sampleTimes = frameNode.sampleTimes;
-    let beginAt = sampleTimes[0].start;
-    let endAt = sampleTimes[sampleTimes.length - 1].end;
-
-    // Hide the "new tab" button since a selection won't implicitly be made
-    // in the newly created tab.
-    this._newtabButton.hidden = true;
-
-    yield this.addTabAndPopulate(recordingData, beginAt, endAt, { skipCallTree: true });
-    this._populateCallTreeFromFrameNode(this._getPanel(), frameNode);
-
-    // Signal that a new tab was spawned from a node in the call tree.
-    window.emit(EVENTS.TAB_SPAWNED_FROM_FRAME_NODE);
-  }),
-
-  /**
-   * Filters the recording data displayed in the call tree view to match
-   * the current selection range in the graphs.
-   *
-   * @param object options
-   *        Additional options supported by this operation.
-   *        @see ProfileView._populatePanelWidgets
-   */
-  _rebuildTreeFromSelection: function(options) {
-    let { recordingData, displayRange } = this._getRecordingInfo();
-    let categoriesGraph = this._getCategoriesGraph();
-    let selectedPanel = this._getPanel();
-
-    // If there's no selection, get the original display range and hide the
-    // "new tab" button.
-    if (!categoriesGraph.hasSelection()) {
-      let { beginAt, endAt } = displayRange;
-      this._newtabButton.hidden = true;
-      this._populateCallTree(selectedPanel, recordingData.profilerData, beginAt, endAt, options);
-    }
-    // Otherwise, just get the selected display range and only show the
-    // "new tab" button if the selection is wide enough.
-    else {
-      let { min: beginAt, max: endAt } = categoriesGraph.getMappedSelection();
-      this._newtabButton.hidden = (endAt - beginAt) < GRAPH_ZOOM_MIN_TIMESPAN;
-      this._populateCallTree(selectedPanel, recordingData.profilerData, beginAt, endAt, options);
-    }
-  },
-
-  /**
-   * Highlights certain areas in the categories graph to match the currently
-   * selected frame node's sample times in the tree view.
-   *
-   * @param ThreadNode | FrameNode frameNode
-   *        The root node data source for this tree.
-   */
-  _highlightAreaFromFrameNode: function(frameNode) {
-    let categoriesGraph = this._getCategoriesGraph();
-    if (categoriesGraph) {
-      categoriesGraph.setMask(frameNode.sampleTimes);
-    }
-  },
-
-  /**
-   * Populates all the widgets in the specified tab's panel with the provided
-   * data. The already existing widgets will be removed.
-   *
-   * @param nsIDOMNode panel
-   *        The <panel> element in this <tabbox>.
-   * @param object dataSource
-   *        The profiler, framerate and categories data source.
-   * @param number beginAt
-   *        The earliest allowed time for tree nodes (in milliseconds).
-   * @param number endAt
-   *        The latest allowed time for tree nodes (in milliseconds).
-   * @param object options
-   *        Additional options supported by this operation:
-   *          - skipCallTree: true if the call tree should not be populated
-   *          - skipCallTreeFocus: true if the root node shouldn't be focused
-   */
-  _populatePanelWidgets: Task.async(function*(panel, dataSource, beginAt, endAt, options = {}) {
-    let { profilerData, framerateData, categoriesData } = dataSource;
-
-    let framerateGraph = yield this._populateFramerateGraph(panel, framerateData, beginAt);
-    let categoriesGraph = yield this._populateCategoriesGraph(panel, categoriesData, beginAt);
-    CanvasGraphUtils.linkAnimation(framerateGraph, categoriesGraph);
-    CanvasGraphUtils.linkSelection(framerateGraph, categoriesGraph);
-
-    if (!options.skipCallTree) {
-      this._populateCallTree(panel, profilerData, beginAt, endAt, options);
-    }
-  }),
-
-  /**
-   * Populates the framerate graph in the specified tab's panel with the
-   * provided data. The already existing graph will be removed.
-   *
-   * @param nsIDOMNode panel
-   *        The <panel> element in this <tabbox>.
-   * @param object framerateData
-   *        The data source for this graph.
-   * @param number beginAt
-   *        The earliest time in the recording data to start at (in milliseconds).
-   */
-  _populateFramerateGraph: Task.async(function*(panel, framerateData, beginAt) {
-    let oldGraph = this._getFramerateGraph(panel);
-    if (oldGraph) {
-      oldGraph.destroy();
-    }
-
-    // Don't create a graph if there's not enough data to show.
-    if (!framerateData || framerateData.length < 2) {
-      return null;
-    }
-
-    let graph = new LineGraphWidget($(".framerate", panel), {
-      metric: L10N.getStr("graphs.fps")
-    });
-    graph.fixedHeight = FRAMERATE_GRAPH_HEIGHT;
-    graph.dataOffsetX = beginAt;
-
-    yield graph.setDataWhenReady(framerateData);
-
-    graph.on("mouseup", this._onGraphMouseUp);
-    graph.on("scroll", this._onGraphScroll);
-
-    this._framerateGraphByPanel.set(panel, graph);
-    return graph;
-  }),
-
-  /**
-   * Populates the categories graph in the specified tab's panel with the
-   * provided data. The already existing graph will be removed.
-   *
-   * @param nsIDOMNode panel
-   *        The <panel> element in this <tabbox>.
-   * @param object categoriesData
-   *        The data source for this graph.
-   * @param number beginAt
-   *        The earliest time in the recording data to start at (in milliseconds).
-   */
-  _populateCategoriesGraph: Task.async(function*(panel, categoriesData, beginAt) {
-    let oldGraph = this._getCategoriesGraph(panel);
-    if (oldGraph) {
-      oldGraph.destroy();
-    }
-    // Don't create a graph if there's not enough data to show.
-    if (!categoriesData || categoriesData.length < 2) {
-      return null;
-    }
-
-    let graph = new BarGraphWidget($(".categories", panel));
-    graph.fixedHeight = CATEGORIES_GRAPH_HEIGHT;
-    graph.minBarsWidth = CATEGORIES_GRAPH_MIN_BARS_WIDTH;
-    graph.format = CATEGORIES.sort((a, b) => a.ordinal > b.ordinal);
-    graph.dataOffsetX = beginAt;
-
-    yield graph.setDataWhenReady(categoriesData);
-
-    graph.on("legend-selection", this._onGraphLegendSelection);
-    graph.on("mouseup", this._onGraphMouseUp);
-    graph.on("scroll", this._onGraphScroll);
-
-    this._categoriesGraphByPanel.set(panel, graph);
-    return graph;
-  }),
-
-  /**
-   * Populates the call tree view in the specified tab's panel with the
-   * provided data. The already existing tree will be removed.
-   *
-   * @param nsIDOMNode panel
-   *        The <panel> element in this <tabbox>.
-   * @param object profilerData
-   *        The data source for this tree.
-   * @param number startTime
-   *        The earliest time in the data source to start at (in milliseconds).
-   * @param number endTime
-   *        The latest time in the data source to end at (in milliseconds).
-   * @param object options
-   *        Additional options supported by this operation.
-   *        @see ProfileView._populatePanelWidgets
-   */
-  _populateCallTree: function(panel, profilerData, startTime, endTime, options = {}) {
-    let threadSamples = profilerData.profile.threads[0].samples;
-    let contentOnly = !Prefs.showPlatformData;
-    let invertChecked = this._invertTree.hasAttribute("checked");
-    let threadNode = new ThreadNode(threadSamples,
-      { startTime, endTime, contentOnly, invertChecked });
-
-    // If we have an empty profile (no samples), then don't invert the tree, as
-    // it would hide the root node and a completely blank call tree space can be
-    // mis-interpreted as an error.
-    options.inverted = invertChecked && threadNode.samples > 0;
-    this._populateCallTreeFromFrameNode(panel, threadNode, options);
-  },
-
-  /**
-   * Populates the call tree view in the specified tab's panel with the
-   * provided frame node. The already existing tree will be removed.
-   *
-   * @param nsIDOMNode panel
-   *        The <panel> element in this <tabbox>.
-   * @param ThreadNode | FrameNode frameNode
-   *        The root node data source for this tree.
-   * @param object options
-   *        Additional options supported by this operation.
-   *        @see ProfileView._populatePanelWidgets
-   */
-  _populateCallTreeFromFrameNode: function(panel, frameNode, options = {}) {
-    let oldRoot = this._getCallTreeRoot(panel);
-    if (oldRoot) {
-      oldRoot.remove();
-    }
-
-    let callTreeRoot = new CallView({
-      autoExpandDepth: options.inverted ? 0 : undefined,
-      frame: frameNode,
-      hidden: options.inverted,
-      inverted: options.inverted
-    });
-    callTreeRoot.on("focus", this._onCallViewFocus);
-    callTreeRoot.on("link", this._onCallViewLink);
-    callTreeRoot.on("zoom", this._onCallViewZoom);
-    callTreeRoot.attachTo($(".call-tree-cells-container", panel));
-
-    if (!options.skipCallTreeFocus) {
-      callTreeRoot.focus();
-    }
-
-    let contentOnly = !Prefs.showPlatformData;
-    callTreeRoot.toggleCategories(!contentOnly);
-
-    this._callTreeRootByPanel.set(panel, callTreeRoot);
-  },
-
-  /**
-   * Shortcuts for accessing the recording info or widgets for a <panel>.
-   * @param nsIDOMNode panel [optional]
-   * @return object
-   */
-  _getRecordingInfo: function(panel = this._getPanel()) {
-    return this._recordingInfoByPanel.get(panel);
-  },
-  _getFramerateGraph: function(panel = this._getPanel()) {
-    return this._framerateGraphByPanel.get(panel);
-  },
-  _getCategoriesGraph: function(panel = this._getPanel()) {
-    return this._categoriesGraphByPanel.get(panel);
-  },
-  _getCallTreeRoot: function(panel = this._getPanel()) {
-    return this._callTreeRootByPanel.get(panel);
-  },
-  _getTab: function(tabIndex = this._getSelectedIndex()) {
-    return this._tabs.childNodes[tabIndex];
-  },
-  _getPanel: function(tabIndex = this._getSelectedIndex()) {
-    return this._panels.childNodes[tabIndex];
-  },
-  _getSelectedIndex: function() {
-    return $("#profile-content").selectedIndex;
-  },
-
-  /**
-   * Listener handling the tab "select" event in this container.
-   */
-  _onTabSelect: function() {
-    let categoriesGraph = this._getCategoriesGraph();
-    if (categoriesGraph) {
-      this._newtabButton.hidden = !categoriesGraph.hasSelection();
-    } else {
-      this._newtabButton.hidden = true;
-    }
-
-    this.removeTabsAfter(this._getSelectedIndex());
-  },
-
-  /**
-   * Listener handling the new tab "click" event in this container.
-   */
-  _onNewTabClick: function() {
-    this._spawnTabFromSelection();
-  },
-
-  _onInvertTree: function() {
-    this._rebuildTreeFromSelection();
-  },
-
-  /**
-   * Listener handling the "legend-selection" event for the graphs in this container.
-   */
-  _onGraphLegendSelection: function() {
-    this._rebuildTreeFromSelection({ skipCallTreeFocus: true });
-  },
-
-  /**
-   * Listener handling the "mouseup" event for the graphs in this container.
-   */
-  _onGraphMouseUp: function() {
-    this._rebuildTreeFromSelection();
-  },
-
-  /**
-   * Listener handling the "scroll" event for the graphs in this container.
-   */
-  _onGraphScroll: function() {
-    setNamedTimeout("graph-scroll", GRAPH_SCROLL_EVENTS_DRAIN, () => {
-      this._rebuildTreeFromSelection();
-    });
-  },
-
-  /**
-   * Listener handling the "focus" event for the call tree in this container.
-   */
-  _onCallViewFocus: function(event, treeItem) {
-    setNamedTimeout("graph-focus", CALL_VIEW_FOCUS_EVENTS_DRAIN, () => {
-      this._highlightAreaFromFrameNode(treeItem.frame);
-    });
-  },
-
-  /**
-   * Listener handling the "link" event for the call tree in this container.
-   */
-  _onCallViewLink: function(event, treeItem) {
-    let { url, line } = treeItem.frame.getInfo();
-    viewSourceInDebugger(url, line);
-  },
-
-  /**
-   * Listener handling the "zoom" event for the call tree in this container.
-   */
-  _onCallViewZoom: function(event, treeItem) {
-    this._spawnTabFromFrameNode(treeItem.frame);
-  }
-};
-
-/**
- * Utility functions handling recording data.
- */
-let RecordingUtils = {
-  _frameratePlotsCache: new WeakMap(),
-
-  /**
-   * Creates an appropriate data source to be displayed in a categories graph
-   * from on the provided profiler data.
-   *
-   * @param object profilerData
-   *        The profiler data received from the front.
-   * @param number beginAt
-   *        The earliest time in the profiler data to start at (in milliseconds).
-   * @param number endAt
-   *        The latest time in the profiler data to end at (in milliseconds).
-   * @return array
-   *         A data source useful for a BarGraphWidget.
-   */
-  plotCategoriesFor: function(profilerData, beginAt, endAt) {
-    let categoriesData = [];
-    let profile = profilerData.profile;
-    let samples = profile.threads[0].samples;
-
-    // Accumulate the category of each frame for every sample.
-    for (let { frames, time } of samples) {
-      if (!time || time < beginAt || time > endAt) continue;
-      let blocks = [];
-
-      for (let { category: bitmask } of frames) {
-        if (!bitmask) continue;
-        let category = CATEGORY_MAPPINGS[bitmask];
-
-        // Guard against categories that aren't found in the frontend mappings.
-        // This usually means that a new category was added in the platform,
-        // but browser/devtools/profiler/utils/global.js wasn't updated yet.
-        if (!category) {
-          category = CATEGORY_MAPPINGS[CATEGORY_OTHER];
-        }
-
-        if (!blocks[category.ordinal]) {
-          blocks[category.ordinal] = 1;
-        } else {
-          blocks[category.ordinal]++;
-        }
-      }
-
-      // If no categories were found in the frames, default to using a
-      // single block using the stack depth as height.
-      if (blocks.length == 0) {
-        blocks[CATEGORY_MAPPINGS[CATEGORY_OTHER].ordinal] = frames.length;
-      }
-
-      categoriesData.push({
-        delta: time,
-        values: blocks
-      });
-    }
-
-    return categoriesData;
-  },
-
-  /**
-   * Creates an appropriate data source to be displayed in a framerate graph
-   * from on the provided refresh driver ticks data.
-   *
-   * @param object ticksData
-   *        The refresh driver ticks received from the front.
-   * @param number beginAt
-   *        The earliest time in the ticks data to start at (in milliseconds).
-   * @param number endAt
-   *        The latest time in the ticks data to end at (in milliseconds).
-   * @return array
-   *         A data source useful for a LineGraphWidget.
-   */
-  plotFramerateFor: function(ticksData, beginAt, endAt) {
-    // Older Gecko versions don't have a framerate actor implementation,
-    // in which case the returned ticks data is null.
-    if (ticksData == null) {
-      return [];
-    }
-
-    let framerateData = this._frameratePlotsCache.get(ticksData);
-    if (framerateData == null) {
-      framerateData = FramerateFront.plotFPS(ticksData, FRAMERATE_CALC_INTERVAL);
-      this._frameratePlotsCache.set(ticksData, framerateData);
-    }
-
-    // Quickly find the earliest and oldest valid index in the plotted
-    // framerate data based on the specified beginAt and endAt time. Sure,
-    // using [].findIndex would be more elegant, but also slower.
-    let earliestValidIndex = findFirstIndex(framerateData, e => e.delta >= beginAt);
-    let oldestValidIndex = findLastIndex(framerateData, e => e.delta <= endAt);
-    let totalValues = framerateData.length;
-
-    // If all the plotted framerate data fits inside the specified time range,
-    // simply return it.
-    if (earliestValidIndex == 0 && oldestValidIndex == totalValues - 1) {
-      return framerateData;
-    }
-
-    // Otherwise, a slice will need to be made. Be very careful here, the
-    // beginAt and endAt timestamps can refer to a point in *between* two
-    // entries in the framerate data, so we'll need to insert new values where
-    // the cuts are made.
-    let slicedData = framerateData.slice(earliestValidIndex, oldestValidIndex + 1);
-    if (earliestValidIndex > 0) {
-      slicedData.unshift({
-        delta: beginAt,
-        value: framerateData[earliestValidIndex - 1].value
-      });
-    }
-    if (oldestValidIndex < totalValues - 1) {
-      slicedData.push({
-        delta: endAt,
-        value: framerateData[oldestValidIndex + 1].value
-      });
-    }
-
-    return slicedData;
-  },
-
-  /**
-   * Makes sure the data sources for the categories and framerate graphs
-   * have the same beginning and ending, time-wise.
-   *
-   * @param array categoriesData
-   *        Data source generated by `RecordingUtils.plotCategoriesFor`.
-   * @param array framerateData
-   *        Data source generated by `RecordingUtils.plotFramerateFor`.
-   */
-  syncCategoriesWithFramerate: function(categoriesData, framerateData) {
-    if (categoriesData.length < 2 || framerateData.length < 2) {
-      return;
-    }
-    let categoryBegin = categoriesData[0];
-    let categoryEnd = categoriesData[categoriesData.length - 1];
-    let framerateBegin = framerateData[0];
-    let framerateEnd = framerateData[framerateData.length - 1];
-
-    if (categoryBegin.delta > framerateBegin.delta) {
-      categoriesData.unshift({
-        delta: framerateBegin.delta,
-        values: categoryBegin.values
-      });
-    } else {
-      framerateData.unshift({
-        delta: categoryBegin.delta,
-        value: framerateBegin.value
-      });
-    }
-    if (categoryEnd.delta < framerateEnd.delta) {
-      categoriesData.push({
-        delta: framerateEnd.delta,
-        values: categoryEnd.values
-      });
-    } else {
-      framerateData.push({
-        delta: categoryEnd.delta,
-        value: framerateEnd.value
-      });
-    }
-  }
-};
-
-/**
- * Finds the index of the first element in an array that validates a predicate.
- * @param array
- * @param function predicate
- * @return number
- */
-function findFirstIndex(array, predicate) {
-  for (let i = 0, len = array.length; i < len; i++) {
-    if (predicate(array[i])) return i;
-  }
-}
-
-/**
- * Finds the last of the first element in an array that validates a predicate.
- * @param array
- * @param function predicate
- * @return number
- */
-function findLastIndex(array, predicate) {
-  for (let i = array.length - 1; i >= 0; i--) {
-    if (predicate(array[i])) return i;
-  }
-}
-
-/**
- * Opens/selects the debugger in this toolbox and jumps to the specified
- * file name and line number.
- * @param string url
- * @param number line
- */
-function viewSourceInDebugger(url, line) {
-  let showSource = ({ DebuggerView }) => {
-    let item = DebuggerView.Sources.getItemForAttachment(a => a.source.url === url);
-    if (item) {
-      DebuggerView.setEditorLocation(item.attachment.source.actor, line, { noDebug: true }).then(() => {
-        window.emit(EVENTS.SOURCE_SHOWN_IN_JS_DEBUGGER);
-      }, () => {
-        window.emit(EVENTS.SOURCE_NOT_FOUND_IN_JS_DEBUGGER);
-      });
-    }
-  };
-
-  // If the Debugger was already open, switch to it and try to show the
-  // source immediately. Otherwise, initialize it and wait for the sources
-  // to be added first.
-  let debuggerAlreadyOpen = gToolbox.getPanel("jsdebugger");
-  gToolbox.selectTool("jsdebugger").then(({ panelWin: dbg }) => {
-    if (debuggerAlreadyOpen) {
-      showSource(dbg);
-    } else {
-      dbg.once(dbg.EVENTS.SOURCES_ADDED, () => showSource(dbg));
-    }
-  });
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/ui-recordings.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/ui-recordings.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/ui-recordings.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/ui-recordings.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,369 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-/**
- * Functions handling the recordings UI.
- */
-let RecordingsListView = Heritage.extend(WidgetMethods, {
-  /**
-   * Initialization function, called when the tool is started.
-   */
-  initialize: function() {
-    this.widget = new SideMenuWidget($("#recordings-list"));
-
-    this._onSelect = this._onSelect.bind(this);
-    this._onClearButtonClick = this._onClearButtonClick.bind(this);
-    this._onRecordButtonClick = this._onRecordButtonClick.bind(this);
-    this._onImportButtonClick = this._onImportButtonClick.bind(this);
-    this._onSaveButtonClick = this._onSaveButtonClick.bind(this);
-
-    this.emptyText = L10N.getStr("noRecordingsText");
-    this.widget.addEventListener("select", this._onSelect, false);
-  },
-
-  /**
-   * Destruction function, called when the tool is closed.
-   */
-  destroy: function() {
-    this.widget.removeEventListener("select", this._onSelect, false);
-  },
-
-  /**
-   * Adds an empty recording to this container.
-   *
-   * @param string profileLabel [optional]
-   *        A custom label for the newly created recording item.
-   */
-  addEmptyRecording: function(profileLabel) {
-    let titleNode = document.createElement("label");
-    titleNode.className = "plain recording-item-title";
-    titleNode.setAttribute("value", profileLabel ||
-      L10N.getFormatStr("recordingsList.itemLabel", this.itemCount + 1));
-
-    let durationNode = document.createElement("label");
-    durationNode.className = "plain recording-item-duration";
-    durationNode.setAttribute("value",
-      L10N.getStr("recordingsList.recordingLabel"));
-
-    let saveNode = document.createElement("label");
-    saveNode.className = "plain recording-item-save";
-    saveNode.addEventListener("click", this._onSaveButtonClick);
-
-    let hspacer = document.createElement("spacer");
-    hspacer.setAttribute("flex", "1");
-
-    let footerNode = document.createElement("hbox");
-    footerNode.className = "recording-item-footer";
-    footerNode.appendChild(durationNode);
-    footerNode.appendChild(hspacer);
-    footerNode.appendChild(saveNode);
-
-    let vspacer = document.createElement("spacer");
-    vspacer.setAttribute("flex", "1");
-
-    let contentsNode = document.createElement("vbox");
-    contentsNode.className = "recording-item";
-    contentsNode.setAttribute("flex", "1");
-    contentsNode.appendChild(titleNode);
-    contentsNode.appendChild(vspacer);
-    contentsNode.appendChild(footerNode);
-
-    // Append a recording item to this container.
-    return this.push([contentsNode], {
-      attachment: {
-        // The profiler and refresh driver ticks data will be available
-        // as soon as recording finishes.
-        profilerData: { profileLabel },
-        ticksData: null
-      }
-    });
-  },
-
-  /**
-   * Signals that a recording session has started.
-   *
-   * @param string profileLabel
-   *        The provided string argument if available, undefined otherwise.
-   */
-  handleRecordingStarted: function(profileLabel) {
-    // Insert a "dummy" recording item, to hint that recording has now started.
-    let recordingItem;
-
-    // If a label is specified (e.g due to a call to `console.profile`),
-    // then try reusing a pre-existing recording item, if there is one.
-    // This is symmetrical to how `this.handleRecordingEnded` works.
-    if (profileLabel) {
-      recordingItem = this.getItemForAttachment(e =>
-        e.profilerData.profileLabel == profileLabel);
-    }
-    // Otherwise, create a new empty recording item.
-    if (!recordingItem) {
-      recordingItem = this.addEmptyRecording(profileLabel);
-    }
-
-    // Mark the corresponding item as being a "record in progress".
-    recordingItem.isRecording = true;
-
-    // If this is the first item, immediately select it.
-    if (this.itemCount == 1) {
-      this.selectedItem = recordingItem;
-    }
-
-    window.emit(EVENTS.RECORDING_STARTED, profileLabel);
-  },
-
-  /**
-   * Signals that a recording session has ended.
-   *
-   * @param object recordingData
-   *        The profiler and refresh driver ticks data received from the front.
-   */
-  handleRecordingEnded: function(recordingData) {
-    let profileLabel = recordingData.profilerData.profileLabel;
-    let recordingItem;
-
-    // If a label is specified (e.g due to a call to `console.profileEnd`),
-    // then try reusing a pre-existing recording item, if there is one.
-    // This is symmetrical to how `this.handleRecordingStarted` works.
-    if (profileLabel) {
-      recordingItem = this.getItemForAttachment(e =>
-        e.profilerData.profileLabel == profileLabel);
-    }
-    // Otherwise, just use the first available recording item.
-    if (!recordingItem) {
-      recordingItem = this.getItemForPredicate(e => e.isRecording);
-    }
-
-    // Mark the corresponding item as being a "finished recording".
-    recordingItem.isRecording = false;
-
-    // Store the recording data, customize and select this recording item.
-    this.customizeRecording(recordingItem, recordingData);
-    this.forceSelect(recordingItem);
-
-    window.emit(EVENTS.RECORDING_ENDED, recordingData);
-  },
-
-  /**
-   * Signals that a recording session has ended abruptly and the accumulated
-   * data should be discarded.
-   */
-  handleRecordingCancelled: Task.async(function*() {
-    if ($("#record-button").hasAttribute("checked")) {
-      $("#record-button").removeAttribute("checked");
-      yield gFront.cancelRecording();
-    }
-    ProfileView.showEmptyNotice();
-
-    window.emit(EVENTS.RECORDING_LOST);
-  }),
-
-  /**
-   * Adds recording data to a recording item in this container.
-   *
-   * @param Item recordingItem
-   *        An item inserted via `RecordingsListView.addEmptyRecording`.
-   * @param object recordingData
-   *        The profiler and refresh driver ticks data received from the front.
-   */
-  customizeRecording: function(recordingItem, recordingData) {
-    recordingItem.attachment = recordingData;
-
-    let saveNode = $(".recording-item-save", recordingItem.target);
-    saveNode.setAttribute("value",
-      L10N.getStr("recordingsList.saveLabel"));
-
-    let durationMillis = recordingData.recordingDuration;
-    let durationNode = $(".recording-item-duration", recordingItem.target);
-    durationNode.setAttribute("value",
-      L10N.getFormatStr("recordingsList.durationLabel", durationMillis));
-  },
-
-  /**
-   * The select listener for this container.
-   */
-  _onSelect: Task.async(function*({ detail: recordingItem }) {
-    if (!recordingItem) {
-      ProfileView.showEmptyNotice();
-      return;
-    }
-    if (recordingItem.isRecording) {
-      ProfileView.showRecordingNotice();
-      return;
-    }
-
-    ProfileView.showLoadingNotice();
-    ProfileView.removeAllTabs();
-
-    let recordingData = recordingItem.attachment;
-    let durationMillis = recordingData.recordingDuration;
-    yield ProfileView.addTabAndPopulate(recordingData, 0, durationMillis);
-    ProfileView.showTabbedBrowser();
-
-    // Only clear the checked state if there's nothing recording.
-    if (!this.getItemForPredicate(e => e.isRecording)) {
-      $("#record-button").removeAttribute("checked");
-    }
-
-    // But don't leave it locked in any case.
-    $("#record-button").removeAttribute("locked");
-
-    window.emit(EVENTS.RECORDING_DISPLAYED);
-  }),
-
-  /**
-   * The click listener for the "clear" button in this container.
-   */
-  _onClearButtonClick: Task.async(function*() {
-    this.empty();
-    yield this.handleRecordingCancelled();
-  }),
-
-  /**
-   * The click listener for the "record" button in this container.
-   */
-  _onRecordButtonClick: Task.async(function*() {
-    if (!$("#record-button").hasAttribute("checked")) {
-      $("#record-button").setAttribute("checked", "true");
-      yield gFront.startRecording();
-      this.handleRecordingStarted();
-    } else {
-      $("#record-button").setAttribute("locked", "");
-      let recordingData = yield gFront.stopRecording();
-      this.handleRecordingEnded(recordingData);
-    }
-  }),
-
-  /**
-   * The click listener for the "import" button in this container.
-   */
-  _onImportButtonClick: Task.async(function*() {
-    let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
-    fp.init(window, L10N.getStr("recordingsList.saveDialogTitle"), Ci.nsIFilePicker.modeOpen);
-    fp.appendFilter(L10N.getStr("recordingsList.saveDialogJSONFilter"), "*.json");
-    fp.appendFilter(L10N.getStr("recordingsList.saveDialogAllFilter"), "*.*");
-
-    if (fp.show() == Ci.nsIFilePicker.returnOK) {
-      loadRecordingFromFile(fp.file);
-    }
-  }),
-
-  /**
-   * The click listener for the "save" button of each item in this container.
-   */
-  _onSaveButtonClick: function(e) {
-    let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
-    fp.init(window, L10N.getStr("recordingsList.saveDialogTitle"), Ci.nsIFilePicker.modeSave);
-    fp.appendFilter(L10N.getStr("recordingsList.saveDialogJSONFilter"), "*.json");
-    fp.appendFilter(L10N.getStr("recordingsList.saveDialogAllFilter"), "*.*");
-    fp.defaultString = "profile.json";
-
-    fp.open({ done: result => {
-      if (result == Ci.nsIFilePicker.returnCancel) {
-        return;
-      }
-      let recordingItem = this.getItemForElement(e.target);
-      saveRecordingToFile(recordingItem, fp.file);
-    }});
-  }
-});
-
-/**
- * Gets a nsIScriptableUnicodeConverter instance with a default UTF-8 charset.
- * @return object
- */
-function getUnicodeConverter() {
-  let className = "@mozilla.org/intl/scriptableunicodeconverter";
-  let converter = Cc[className].createInstance(Ci.nsIScriptableUnicodeConverter);
-  converter.charset = "UTF-8";
-  return converter;
-}
-
-/**
- * Saves a recording as JSON to a file. The provided data is assumed to be
- * acyclical, so that it can be properly serialized.
- *
- * @param Item recordingItem
- *        The recording item containing the data to stream as JSON.
- * @param nsILocalFile file
- *        The file to stream the data into.
- * @return object
- *         A promise that is resolved once streaming finishes, or rejected
- *         if there was an error.
- */
-function saveRecordingToFile(recordingItem, file) {
-  let deferred = promise.defer();
-
-  let recordingData = recordingItem.attachment;
-  recordingData.fileType = PROFILE_SERIALIZER_IDENTIFIER;
-  recordingData.version = PROFILE_SERIALIZER_VERSION;
-
-  let string = JSON.stringify(recordingData);
-  let inputStream = getUnicodeConverter().convertToInputStream(string);
-  let outputStream = FileUtils.openSafeFileOutputStream(file);
-
-  NetUtil.asyncCopy(inputStream, outputStream, status => {
-    if (!Components.isSuccessCode(status)) {
-      deferred.reject(new Error("Could not save recording data file."));
-    }
-    deferred.resolve();
-  });
-
-  return deferred.promise;
-}
-
-/**
- * Loads a recording stored as JSON from a file.
- *
- * @param nsILocalFile file
- *        The file to import the data from.
- * @return object
- *         A promise that is resolved once importing finishes, or rejected
- *         if there was an error.
- */
-function loadRecordingFromFile(file) {
-  let deferred = promise.defer();
-
-  let channel = NetUtil.newChannel2(file,
-                                    null,
-                                    null,
-                                    window.document,
-                                    null,  // aLoadingPrincipal
-                                    null,  // aTriggeringPrincipal
-                                    Ci.nsILoadInfo.SEC_NORMAL,
-                                    Ci.nsIContentPolicy.TYPE_OTHER);
-  channel.contentType = "text/plain";
-
-  NetUtil.asyncFetch2(channel, (inputStream, status) => {
-    if (!Components.isSuccessCode(status)) {
-      deferred.reject(new Error("Could not import recording data file."));
-      return;
-    }
-    try {
-      let string = NetUtil.readInputStreamToString(inputStream, inputStream.available());
-      var recordingData = JSON.parse(string);
-    } catch (e) {
-      deferred.reject(new Error("Could not read recording data file."));
-      return;
-    }
-    if (recordingData.fileType != PROFILE_SERIALIZER_IDENTIFIER) {
-      deferred.reject(new Error("Unrecognized recording data file."));
-      return;
-    }
-
-    let profileLabel = recordingData.profilerData.profileLabel;
-    let recordingItem = RecordingsListView.addEmptyRecording(profileLabel);
-    RecordingsListView.customizeRecording(recordingItem, recordingData);
-
-    // If this is the first item, immediately select it.
-    if (RecordingsListView.itemCount == 1) {
-      RecordingsListView.selectedItem = recordingItem;
-    }
-
-    deferred.resolve();
-  });
-
-  return deferred.promise;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/utils/shared.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/utils/shared.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/profiler/utils/shared.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/profiler/utils/shared.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,524 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-const {Cc, Ci, Cu, Cr} = require("chrome");
-
-Cu.import("resource://gre/modules/Task.jsm");
-
-loader.lazyRequireGetter(this, "Services");
-loader.lazyRequireGetter(this, "promise");
-loader.lazyRequireGetter(this, "EventEmitter",
-  "devtools/toolkit/event-emitter");
-loader.lazyRequireGetter(this, "FramerateFront",
-  "devtools/server/actors/framerate", true);
-loader.lazyRequireGetter(this, "DevToolsUtils",
-  "devtools/toolkit/DevToolsUtils");
-
-loader.lazyImporter(this, "gDevTools",
-  "resource:///modules/devtools/gDevTools.jsm");
-
-/**
- * A cache of all ProfilerConnection instances. The keys are Toolbox objects.
- */
-let SharedProfilerConnection = new WeakMap();
-
-/**
- * Instantiates a shared ProfilerConnection for the specified toolbox.
- * Consumers must yield on `open` to make sure the connection is established.
- *
- * @param Toolbox toolbox
- *        The toolbox owning this connection.
- */
-SharedProfilerConnection.forToolbox = function(toolbox) {
-  if (this.has(toolbox)) {
-    return this.get(toolbox);
-  }
-
-  let instance = new ProfilerConnection(toolbox);
-  this.set(toolbox, instance);
-  return instance;
-};
-
-/**
- * A connection to the profiler actor, along with other miscellaneous actors,
- * shared by all tools in a toolbox.
- *
- * Use `SharedProfilerConnection.forToolbox` to make sure you get the same
- * instance every time, and the `ProfilerFront` to start/stop recordings.
- *
- * @param Toolbox toolbox
- *        The toolbox owning this connection.
- */
-function ProfilerConnection(toolbox) {
-  EventEmitter.decorate(this);
-
-  this._toolbox = toolbox;
-  this._target = this._toolbox.target;
-  this._client = this._target.client;
-  this._request = this._request.bind(this);
-
-  this._pendingFramerateConsumers = 0;
-  this._pendingConsoleRecordings = [];
-  this._finishedConsoleRecordings = [];
-  this._onEventNotification = this._onEventNotification.bind(this);
-
-  Services.obs.notifyObservers(null, "profiler-connection-created", null);
-}
-
-ProfilerConnection.prototype = {
-  /**
-   * Initializes a connection to the profiler and other miscellaneous actors.
-   * If already open, nothing happens.
-   *
-   * @return object
-   *         A promise that is resolved once the connection is established.
-   */
-  open: Task.async(function*() {
-    if (this._connected) {
-      return;
-    }
-
-    // Local debugging needs to make the target remote.
-    yield this._target.makeRemote();
-
-    // Chrome and content process targets already have obtained a reference
-    // to the profiler tab actor. Use it immediately.
-    if (this._target.form && this._target.form.profilerActor) {
-      this._profiler = this._target.form.profilerActor;
-      yield this._registerEventNotifications();
-    }
-    // Check if we already have a grip to the `listTabs` response object
-    // and, if we do, use it to get to the profiler actor.
-    else if (this._target.root && this._target.root.profilerActor) {
-      this._profiler = this._target.root.profilerActor;
-      yield this._registerEventNotifications();
-    }
-    // Otherwise, call `listTabs`, but ensure not trying to fetch tab actors
-    // for AddonTarget that are chrome, but do not expose profile at all.
-    else if (!this._target.chrome) {
-      this._profiler = (yield listTabs(this._client)).profilerActor;
-      yield this._registerEventNotifications();
-    }
-
-    this._connectMiscActors();
-    this._connected = true;
-
-    Services.obs.notifyObservers(null, "profiler-connection-opened", null);
-  }),
-
-  /**
-   * Destroys this connection.
-   */
-  destroy: function() {
-    this._disconnectMiscActors();
-    this._connected = false;
-  },
-
-  /**
-   * Initializes a connection to miscellaneous actors which are going to be
-   * used in tandem with the profiler actor.
-   */
-  _connectMiscActors: function() {
-    // Only initialize the framerate front if the respective actor is available.
-    // Older Gecko versions don't have an existing implementation, in which case
-    // all the methods we need can be easily mocked.
-    if (this._target.form && this._target.form.framerateActor) {
-      this._framerate = new FramerateFront(this._target.client, this._target.form);
-    } else {
-      this._framerate = {
-        destroy: () => {},
-        startRecording: () => {},
-        stopRecording: () => {},
-        cancelRecording: () => {},
-        isRecording: () => false,
-        getPendingTicks: () => null
-      };
-    }
-  },
-
-  /**
-   * Closes the connections to miscellaneous actors.
-   * @see ProfilerConnection.prototype._connectMiscActors
-   */
-  _disconnectMiscActors: function() {
-    this._framerate.destroy();
-  },
-
-  /**
-   * Sends the request over the remote debugging protocol to the
-   * specified actor.
-   *
-   * @param string actor
-   *        The designated actor. Currently supported: "profiler", "framerate".
-   * @param string method
-   *        Method to call on the backend.
-   * @param any args [optional]
-   *        Additional data or arguments to send with the request.
-   * @return object
-   *         A promise resolved with the response once the request finishes.
-   */
-  _request: function(actor, method, ...args) {
-    // Handle requests to the profiler actor.
-    if (actor == "profiler") {
-      let deferred = promise.defer();
-      let data = args[0] || {};
-      data.to = this._profiler;
-      data.type = method;
-      this._client.request(data, deferred.resolve);
-      return deferred.promise;
-    }
-
-    // Handle requests to the framerate actor.
-    if (actor == "framerate") {
-      switch (method) {
-      // Only stop recording framerate if there are no other pending consumers.
-      // Otherwise, for example, the next time `console.profileEnd` is called
-      // there won't be any framerate data available, since we're reusing the
-      // same actor for multiple overlapping recordings.
-        case "startRecording":
-          this._pendingFramerateConsumers++;
-          break;
-        case "stopRecording":
-        case "cancelRecording":
-          if (--this._pendingFramerateConsumers > 0) return;
-          break;
-        // Some versions of the framerate actor don't have a 'getPendingTicks'
-        // method available, in which case it's impossible to get all the
-        // accumulated framerate data without stopping the recording. Bail out.
-        case "getPendingTicks":
-          if (method in this._framerate) break;
-          return null;
-      }
-      checkPendingFramerateConsumers(this);
-      return this._framerate[method].apply(this._framerate, args);
-    }
-  },
-
-  /**
-   * Starts listening to certain events emitted by the profiler actor.
-   *
-   * @return object
-   *         A promise that is resolved once the notifications are registered.
-   */
-  _registerEventNotifications: Task.async(function*() {
-    let events = ["console-api-profiler", "profiler-stopped"];
-    yield this._request("profiler", "registerEventNotifications", { events });
-    this._client.addListener("eventNotification", this._onEventNotification);
-  }),
-
-  /**
-   * Invoked whenever a registered event was emitted by the profiler actor.
-   *
-   * @param object response
-   *        The data received from the backend.
-   */
-  _onEventNotification: function(event, response) {
-    let toolbox = gDevTools.getToolbox(this._target);
-    if (toolbox == null) {
-      return;
-    }
-    if (response.topic == "console-api-profiler") {
-      let action = response.subject.action;
-      let details = response.details;
-      if (action == "profile") {
-        this.emit("invoked-console-profile", details.profileLabel); // used in tests
-        this._onConsoleProfileStart(details);
-      } else if (action == "profileEnd") {
-        this.emit("invoked-console-profileEnd", details.profileLabel); // used in tests
-        this._onConsoleProfileEnd(details);
-      }
-    } else if (response.topic == "profiler-stopped") {
-      this._onProfilerUnexpectedlyStopped();
-    }
-  },
-
-  /**
-   * Invoked whenever `console.profile` is called.
-   *
-   * @param string profileLabel
-   *        The provided string argument if available, undefined otherwise.
-   * @param number currentTime
-   *        The time (in milliseconds) when the call was made, relative to
-   *        when the nsIProfiler module was started.
-   */
-  _onConsoleProfileStart: Task.async(function*({ profileLabel, currentTime }) {
-    let pending = this._pendingConsoleRecordings;
-    if (pending.find(e => e.profileLabel == profileLabel)) {
-      return;
-    }
-    // Push this unique `console.profile` call to the stack.
-    pending.push({
-      profileLabel: profileLabel,
-      profilingStartTime: currentTime
-    });
-
-    // Profiling was automatically started when `console.profile` was invoked,
-    // so we all we have to do is make sure the framerate actor is recording.
-    yield this._request("framerate", "startRecording");
-
-    // Signal that a call to `console.profile` actually created a new recording.
-    this.emit("profile", profileLabel);
-  }),
-
-  /**
-   * Invoked whenever `console.profileEnd` is called.
-   *
-   * @param object profilerData
-   *        The profiler data received from the backend.
-   */
-  _onConsoleProfileEnd: Task.async(function*(profilerData) {
-    let pending = this._pendingConsoleRecordings;
-    if (pending.length == 0) {
-      return;
-    }
-    // Try to find the corresponding `console.profile` call in the stack
-    // with the specified label (be it undefined, or a string).
-    let info = pending.find(e => e.profileLabel == profilerData.profileLabel);
-    if (info) {
-      pending.splice(pending.indexOf(info), 1);
-    }
-    // If no corresponding `console.profile` call was found, and if no label
-    // is specified, pop the most recent entry from the stack.
-    else if (!profilerData.profileLabel) {
-      info = pending.pop();
-      profilerData.profileLabel = info.profileLabel;
-    }
-    // ...Otherwise this is a call to `console.profileEnd` with a label that
-    // doesn't exist on the stack. Bail out.
-    else {
-      return;
-    }
-
-    // The profile is already available when console.profileEnd() was invoked,
-    // but we need to filter out all samples that fall out of current profile's
-    // range. This is necessary because the profiler is continuously running.
-    filterSamples(profilerData, info.profilingStartTime);
-    offsetSampleTimes(profilerData, info.profilingStartTime);
-
-    // Fetch the recorded refresh driver ticks, during the same time window
-    // as the filtered profiler data.
-    let beginAt = findEarliestSampleTime(profilerData);
-    let endAt = findOldestSampleTime(profilerData);
-    let ticksData = yield this._request("framerate", "getPendingTicks", beginAt, endAt);
-    yield this._request("framerate", "cancelRecording");
-
-    // Join all the acquired data and emit it for outside consumers.
-    let recordingData = {
-      recordingDuration: profilerData.currentTime - info.profilingStartTime,
-      profilerData: profilerData,
-      ticksData: ticksData
-    };
-    this._finishedConsoleRecordings.push(recordingData);
-
-    // Signal that a call to `console.profileEnd` actually finished a recording.
-    this.emit("profileEnd", recordingData);
-  }),
-
-  /**
-   * Invoked whenever the built-in profiler module is deactivated. Since this
-   * should *never* happen while there's a consumer (i.e. "toolbox") available,
-   * treat this notification as being unexpected.
-   *
-   * This may happen, for example, if the Gecko Profiler add-on is installed
-   * (and isn't using the profiler actor over the remote protocol). There's no
-   * way to prevent it from stopping the profiler and affecting our tool.
-   */
-  _onProfilerUnexpectedlyStopped: function() {
-    // Pop all pending `console.profile` calls from the stack.
-    this._pendingConsoleRecordings.length = 0;
-    this.emit("profiler-unexpectedly-stopped");
-  }
-};
-
-/**
- * A thin wrapper around a shared ProfilerConnection for the parent toolbox.
- * Handles manually starting and stopping a recording.
- *
- * @param ProfilerConnection connection
- *        The shared instance for the parent toolbox.
- */
-function ProfilerFront(connection) {
-  EventEmitter.decorate(this);
-
-  this._request = connection._request;
-  this.pendingConsoleRecordings = connection._pendingConsoleRecordings;
-  this.finishedConsoleRecordings = connection._finishedConsoleRecordings;
-
-  connection.on("profile", (e, args) => this.emit(e, args));
-  connection.on("profileEnd", (e, args) => this.emit(e, args));
-  connection.on("profiler-unexpectedly-stopped", (e, args) => this.emit(e, args));
-}
-
-ProfilerFront.prototype = {
-  /**
-   * Manually begins a recording session.
-   *
-   * @return object
-   *         A promise that is resolved once recording has started.
-   */
-  startRecording: Task.async(function*() {
-    let { isActive, currentTime } = yield this._request("profiler", "isActive");
-
-    // Start the profiler only if it wasn't already active. The built-in
-    // nsIProfiler module will be kept recording, because it's the same instance
-    // for all toolboxes and interacts with the whole platform, so we don't want
-    // to affect other clients by stopping (or restarting) it.
-    if (!isActive) {
-      // Make a copy of the options, because eventually _request wants
-      // to freeze the packet.
-      let localOptions = Cu.cloneInto(this._customProfilerOptions, {});
-      yield this._request("profiler", "startProfiler", localOptions);
-      this._profilingStartTime = 0;
-      this.emit("profiler-activated");
-    } else {
-      this._profilingStartTime = currentTime;
-      this.emit("profiler-already-active");
-    }
-
-    // The framerate actor is target-dependent, so just make sure
-    // it's recording.
-    yield this._request("framerate", "startRecording");
-  }),
-
-  /**
-   * Manually ends the current recording session.
-   *
-   * @return object
-   *         A promise that is resolved once recording has stopped,
-   *         with the profiler and framerate data.
-   */
-  stopRecording: Task.async(function*() {
-    // We'll need to filter out all samples that fall out of current profile's
-    // range. This is necessary because the profiler is continuously running.
-    let profilerData = yield this._request("profiler", "getProfile");
-    filterSamples(profilerData, this._profilingStartTime);
-    offsetSampleTimes(profilerData, this._profilingStartTime);
-
-    // Fetch the recorded refresh driver ticks, during the same time window
-    // as the filtered profiler data.
-    let beginAt = findEarliestSampleTime(profilerData);
-    let endAt = findOldestSampleTime(profilerData);
-    let ticksData = yield this._request("framerate", "getPendingTicks", beginAt, endAt);
-    yield this._request("framerate", "cancelRecording");
-
-    // Join all the aquired data and return it for outside consumers.
-    return {
-      recordingDuration: profilerData.currentTime - this._profilingStartTime,
-      profilerData: profilerData,
-      ticksData: ticksData
-    };
-  }),
-
-  /**
-   * Ends the current recording session without trying to retrieve any data.
-   */
-  cancelRecording: Task.async(function*() {
-    yield this._request("framerate", "cancelRecording");
-  }),
-
-  /**
-   * Overrides the options sent to the built-in profiler module when activating,
-   * such as the maximum entries count, the sampling interval etc.
-   *
-   * Used in tests and for older backend implementations.
-   */
-  _customProfilerOptions: {
-    entries: 1000000,
-    interval: 1,
-    features: ["js"],
-    threadFilters: ["GeckoMain"]
-  }
-};
-
-/**
- * Filters all the samples in the provided profiler data to be more recent
- * than the specified start time.
- *
- * @param object profilerData
- *        The profiler data received from the backend.
- * @param number profilingStartTime
- *        The earliest acceptable sample time (in milliseconds).
- */
-function filterSamples(profilerData, profilingStartTime) {
-  let firstThread = profilerData.profile.threads[0];
-
-  firstThread.samples = firstThread.samples.filter(e => {
-    return e.time >= profilingStartTime;
-  });
-}
-
-/**
- * Offsets all the samples in the provided profiler data by the specified time.
- *
- * @param object profilerData
- *        The profiler data received from the backend.
- * @param number timeOffset
- *        The amount of time to offset by (in milliseconds).
- */
-function offsetSampleTimes(profilerData, timeOffset) {
-  let firstThreadSamples = profilerData.profile.threads[0].samples;
-
-  for (let sample of firstThreadSamples) {
-    sample.time -= timeOffset;
-  }
-}
-
-/**
- * Finds the earliest sample time in the provided profiler data.
- *
- * @param object profilerData
- *        The profiler data received from the backend.
- * @return number
- *         The earliest sample time (in milliseconds).
- */
-function findEarliestSampleTime(profilerData) {
-  let firstThreadSamples = profilerData.profile.threads[0].samples;
-
-  for (let sample of firstThreadSamples) {
-    if ("time" in sample) {
-      return sample.time;
-    }
-  }
-}
-
-/**
- * Finds the oldest sample time in the provided profiler data.
- *
- * @param object profilerData
- *        The profiler data received from the backend.
- * @return number
- *         The oldest sample time (in milliseconds).
- */
-function findOldestSampleTime(profilerData) {
-  let firstThreadSamples = profilerData.profile.threads[0].samples;
-
-  for (let i = firstThreadSamples.length - 1; i >= 0; i--) {
-    if ("time" in firstThreadSamples[i]) {
-      return firstThreadSamples[i].time;
-    }
-  }
-}
-
-/**
- * Asserts the value sanity of `pendingFramerateConsumers`.
- */
-function checkPendingFramerateConsumers(connection) {
-  if (connection._pendingFramerateConsumers < 0) {
-    let msg = "Somehow the number of framerate consumers is now negative.";
-    DevToolsUtils.reportException("ProfilerConnection", msg);
-  }
-}
-
-/**
- * A collection of small wrappers promisifying functions invoking callbacks.
- */
-function listTabs(client) {
-  let deferred = promise.defer();
-  client.listTabs(deferred.resolve);
-  return deferred.promise;
-}
-
-exports.getProfilerConnection = toolbox => SharedProfilerConnection.forToolbox(toolbox);
-exports.ProfilerFront = ProfilerFront;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/projecteditor/test/head.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/projecteditor/test/head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/projecteditor/test/head.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/projecteditor/test/head.js	2015-05-25 20:42:56.000000000 +0000
@@ -260,7 +260,10 @@
   }
   let def = promise.defer();
 
-  NetUtil.asyncFetch2(file, function(inputStream, status) {
+  NetUtil.asyncFetch({
+    uri: NetUtil.newURI(file),
+    loadUsingSystemPrincipal: true
+  }, function(inputStream, status) {
     if (!Components.isSuccessCode(status)) {
       info("ERROR READING TEMP FILE", status);
     }
@@ -275,12 +278,7 @@
 
     var data = NetUtil.readInputStreamToString(inputStream, inputStream.available());
     def.resolve(data);
-  },
-  null,      // aLoadingNode
-  Services.scriptSecurityManager.getSystemPrincipal(),
-  null,      // aTriggeringPrincipal
-  Ci.nsILoadInfo.SEC_NORMAL,
-  Ci.nsIContentPolicy.TYPE_OTHER);
+  });
 
   return def.promise;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/responsivedesign/test/browser_responsiveuiaddcustompreset.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/responsivedesign/test/browser_responsiveuiaddcustompreset.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/responsivedesign/test/browser_responsiveuiaddcustompreset.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/responsivedesign/test/browser_responsiveuiaddcustompreset.js	2015-05-25 20:42:56.000000000 +0000
@@ -40,7 +40,7 @@
     key.doCommand();
   }
 
-  Task.spawn(function() {
+  Task.spawn(function*() {
 
     yield addTab("data:text/html;charset=utf8,test custom presets in responsive mode");
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/responsivedesign/test/browser_responsiveui.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/responsivedesign/test/browser_responsiveui.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/responsivedesign/test/browser_responsiveui.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/responsivedesign/test/browser_responsiveui.js	2015-05-25 20:42:56.000000000 +0000
@@ -6,7 +6,7 @@
 function test() {
   waitForExplicitFinish();
   SimpleTest.requestCompleteLog();
-  Task.spawn(function() {
+  Task.spawn(function*() {
 
     function extractSizeFromString(str) {
       let numbers = str.match(/(\d+)[^\d]*(\d+)/);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/scratchpad/scratchpad.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/scratchpad/scratchpad.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/scratchpad/scratchpad.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/scratchpad/scratchpad.js	2015-05-25 20:42:56.000000000 +0000
@@ -49,6 +49,7 @@
 const Editor    = require("devtools/sourceeditor/editor");
 const TargetFactory = require("devtools/framework/target").TargetFactory;
 const EventEmitter = require("devtools/toolkit/event-emitter");
+const {DevToolsWorker} = require("devtools/toolkit/shared/worker");
 
 const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
@@ -650,12 +651,11 @@
    */
   get prettyPrintWorker() {
     if (!this._prettyPrintWorker) {
-      this._prettyPrintWorker = new ChromeWorker(
-        "resource://gre/modules/devtools/server/actors/pretty-print-worker.js");
-
-      this._prettyPrintWorker.addEventListener("error", ({ message, filename, lineno }) => {
-        DevToolsUtils.reportException(message + " @ " + filename + ":" + lineno);
-      }, false);
+      this._prettyPrintWorker = new DevToolsWorker(
+        "resource://gre/modules/devtools/server/actors/pretty-print-worker.js",
+        { name: 'pretty-print',
+          verbose: DevToolsUtils.dumpn.wantLogging }
+      );
     }
     return this._prettyPrintWorker;
   },
@@ -670,34 +670,17 @@
   prettyPrint: function SP_prettyPrint() {
     const uglyText = this.getText();
     const tabsize = Services.prefs.getIntPref(TAB_SIZE);
-    const id = Math.random();
-    const deferred = promise.defer();
-
-    const onReply = ({ data }) => {
-      if (data.id !== id) {
-        return;
-      }
-      this.prettyPrintWorker.removeEventListener("message", onReply, false);
-
-      if (data.error) {
-        let errorString = DevToolsUtils.safeErrorString(data.error);
-        this.writeAsErrorComment({ exception: errorString });
-        deferred.reject(errorString);
-      } else {
-        this.editor.setText(data.code);
-        deferred.resolve(data.code);
-      }
-    };
 
-    this.prettyPrintWorker.addEventListener("message", onReply, false);
-    this.prettyPrintWorker.postMessage({
-      id: id,
+    return this.prettyPrintWorker.performTask("pretty-print", {
       url: "(scratchpad)",
       indent: tabsize,
       source: uglyText
+    }).then(data => {
+      this.editor.setText(data.code);
+    }).then(null, error => {
+      this.writeAsErrorComment({ exception: error });
+      throw error;
     });
-
-    return deferred.promise;
   },
 
   /**
@@ -1154,19 +1137,15 @@
   importFromFile: function SP_importFromFile(aFile, aSilentError, aCallback)
   {
     // Prevent file type detection.
-    let channel = NetUtil.newChannel2(aFile,
-                                      null,
-                                      null,
-                                      window.document,
-                                      null, // aLoadingPrincipal
-                                      null, // aTriggeringPrincipal
-                                      Ci.nsILoadInfo.SEC_NORMAL,
-                                      Ci.nsIContentPolicy.TYPE_OTHER);
+    let channel = NetUtil.newChannel({
+      uri: NetUtil.newURI(aFile),
+      loadingNode: window.document,
+      contentPolicyType: Ci.nsIContentPolicy.TYPE_OTHER});
     channel.contentType = "application/javascript";
 
     this.notificationBox.removeAllNotifications(false);
 
-    NetUtil.asyncFetch2(channel, (aInputStream, aStatus) => {
+    NetUtil.asyncFetch(channel, (aInputStream, aStatus) => {
       let content = null;
 
       if (Components.isSuccessCode(aStatus)) {
@@ -1829,7 +1808,7 @@
     }
 
     if (this._prettyPrintWorker) {
-      this._prettyPrintWorker.terminate();
+      this._prettyPrintWorker.destroy();
       this._prettyPrintWorker = null;
     }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/scratchpad/test/browser_scratchpad_confirm_close.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/scratchpad/test/browser_scratchpad_confirm_close.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/scratchpad/test/browser_scratchpad_confirm_close.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/scratchpad/test/browser_scratchpad_confirm_close.js	2015-05-25 20:42:56.000000000 +0000
@@ -214,17 +214,12 @@
 
 function readFile(file, callback)
 {
-  let channel = NetUtil.newChannel2(file,
-                                    null,
-                                    null,
-                                    null,      // aLoadingNode
-                                    Services.scriptSecurityManager.getSystemPrincipal(),
-                                    null,      // aTriggeringPrincipal
-                                    Ci.nsILoadInfo.SEC_NORMAL,
-                                    Ci.nsIContentPolicy.TYPE_OTHER);
+  let channel = NetUtil.newChannel({
+    uri: NetUtil.newURI(file),
+    loadUsingSystemPrincipal: true});
   channel.contentType = "application/javascript";
 
-  NetUtil.asyncFetch2(channel, function(inputStream, status) {
+  NetUtil.asyncFetch(channel, function(inputStream, status) {
     ok(Components.isSuccessCode(status),
        "file was read successfully");
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/scratchpad/test/browser_scratchpad_files.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/scratchpad/test/browser_scratchpad_files.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/scratchpad/test/browser_scratchpad_files.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/scratchpad/test/browser_scratchpad_files.js	2015-05-25 20:42:56.000000000 +0000
@@ -91,18 +91,13 @@
 
   gFileContent = oldContent;
 
-  let channel = NetUtil.newChannel2(gFile,
-                                    null,
-                                    null,
-                                    null,      // aLoadingNode
-                                    Services.scriptSecurityManager.getSystemPrincipal(),
-                                    null,      // aTriggeringPrincipal
-                                    Ci.nsILoadInfo.SEC_NORMAL,
-                                    Ci.nsIContentPolicy.TYPE_OTHER);
+  let channel = NetUtil.newChannel({
+    uri: NetUtil.newURI(gFile),
+    loadUsingSystemPrincipal: true});
   channel.contentType = "application/javascript";
 
   // Read back the temporary file.
-  NetUtil.asyncFetch2(channel, fileRead);
+  NetUtil.asyncFetch(channel, fileRead);
 }
 
 function fileExported2()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/frame-script-utils.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/frame-script-utils.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/frame-script-utils.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/frame-script-utils.js	2015-05-25 20:42:56.000000000 +0000
@@ -11,6 +11,9 @@
             .getService(Ci.mozIJSSubScriptLoader);
 let EventUtils = {};
 loader.loadSubScript("chrome://marionette/content/EventUtils.js", EventUtils);
+devtools.lazyGetter(this, "nsIProfilerModule", () => {
+  return Cc["@mozilla.org/tools/profiler;1"].getService(Ci.nsIProfiler);
+});
 
 addMessageListener("devtools:test:history", function ({ data }) {
   content.history[data.direction]();
@@ -103,6 +106,15 @@
   sendAsyncMessage("devtools:test:xhr", responses);
 }));
 
+addMessageListener("devtools:test:profiler", function ({ data: { method, args, id }}) {
+  let result = nsIProfilerModule[method](...args);
+  sendAsyncMessage("devtools:test:profiler:response", {
+    data: result,
+    id: id
+  });
+});
+
+
 // To eval in content, look at `evalInDebuggee` in the head.js of canvasdebugger
 // for an example.
 addMessageListener("devtools:test:eval", function ({ data }) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/inplace-editor.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/inplace-editor.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/inplace-editor.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/inplace-editor.js	2015-05-25 20:42:56.000000000 +0000
@@ -69,9 +69,15 @@
  *       This function is called before the editor has been torn down.
  *    {function} destroy:
  *       Called when the editor is destroyed and has been torn down.
- *    {string} advanceChars:
- *       If any characters in advanceChars are typed, focus will advance
- *       to the next element.
+ *    {object} advanceChars:
+ *       This can be either a string or a function.
+ *       If it is a string, then if any characters in it are typed,
+ *       focus will advance to the next element.
+ *       Otherwise, if it is a function, then the function will
+ *       be called with three arguments: a key code, the current text,
+ *       and the insertion point.  If the function returns true,
+ *       then the focus advance takes place.  If it returns false,
+ *       then the character is inserted instead.
  *    {boolean} stopOnReturn:
  *       If true, the return key will not advance the editor to the next
  *       focusable element.
@@ -212,10 +218,15 @@
 
   // Pull out character codes for advanceChars, listing the
   // characters that should trigger a blur.
-  this._advanceCharCodes = {};
-  let advanceChars = aOptions.advanceChars || '';
-  for (let i = 0; i < advanceChars.length; i++) {
-    this._advanceCharCodes[advanceChars.charCodeAt(i)] = true;
+  if (typeof(aOptions.advanceChars) === "function") {
+    this._advanceChars = aOptions.advanceChars;
+  } else {
+    let advanceCharcodes = {};
+    let advanceChars = aOptions.advanceChars || '';
+    for (let i = 0; i < advanceChars.length; i++) {
+      advanceCharcodes[advanceChars.charCodeAt(i)] = true;
+    }
+    this._advanceChars = aCharCode => aCharCode in advanceCharcodes;
   }
 
   // Hide the provided element and add our editor.
@@ -931,7 +942,8 @@
         aEvent.keyCode === Ci.nsIDOMKeyEvent.DOM_VK_RETURN &&
         aEvent.shiftKey) {
       prevent = false;
-    } else if (aEvent.charCode in this._advanceCharCodes
+    } else if (this._advanceChars(aEvent.charCode, this.input.value,
+                                 this.input.selectionStart)
        || aEvent.keyCode === Ci.nsIDOMKeyEvent.DOM_VK_RETURN
        || aEvent.keyCode === Ci.nsIDOMKeyEvent.DOM_VK_TAB) {
       prevent = true;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/moz.build firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/moz.build	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/moz.build	2015-05-25 20:42:56.000000000 +0000
@@ -30,21 +30,6 @@
     'widgets/ViewHelpers.jsm',
 ]
 
-EXTRA_JS_MODULES.devtools.shared.profiler += [
-    'profiler/frame-utils.js',
-    'profiler/global.js',
-    'profiler/jit.js',
-    'profiler/tree-model.js',
-    'profiler/tree-view.js',
-]
-
-EXTRA_JS_MODULES.devtools.shared.timeline += [
-    'timeline/global.js',
-    'timeline/marker-details.js',
-    'timeline/markers-overview.js',
-    'timeline/waterfall.js',
-]
-
 EXTRA_JS_MODULES.devtools.shared += [
     'autocomplete-popup.js',
     'devices.js',
@@ -60,9 +45,7 @@
     'telemetry.js',
     'theme-switching.js',
     'theme.js',
-    'undo.js',
-    'worker-helper.js',
-    'worker.js',
+    'undo.js'
 ]
 
 EXTRA_JS_MODULES.devtools.shared.widgets += [
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/profiler/frame-utils.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/profiler/frame-utils.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/profiler/frame-utils.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/profiler/frame-utils.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,422 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-const { Ci } = require("chrome");
-const { extend } = require("sdk/util/object");
-loader.lazyRequireGetter(this, "Services");
-loader.lazyRequireGetter(this, "CATEGORY_OTHER",
-  "devtools/shared/profiler/global", true);
-
-// Character codes used in various parsing helper functions.
-const CHAR_CODE_A = "a".charCodeAt(0);
-const CHAR_CODE_C = "c".charCodeAt(0);
-const CHAR_CODE_E = "e".charCodeAt(0);
-const CHAR_CODE_F = "f".charCodeAt(0);
-const CHAR_CODE_H = "h".charCodeAt(0);
-const CHAR_CODE_I = "i".charCodeAt(0);
-const CHAR_CODE_J = "j".charCodeAt(0);
-const CHAR_CODE_L = "l".charCodeAt(0);
-const CHAR_CODE_M = "m".charCodeAt(0);
-const CHAR_CODE_O = "o".charCodeAt(0);
-const CHAR_CODE_P = "p".charCodeAt(0);
-const CHAR_CODE_R = "r".charCodeAt(0);
-const CHAR_CODE_S = "s".charCodeAt(0);
-const CHAR_CODE_T = "t".charCodeAt(0);
-const CHAR_CODE_U = "u".charCodeAt(0);
-const CHAR_CODE_0 = "0".charCodeAt(0);
-const CHAR_CODE_9 = "9".charCodeAt(0);
-
-const CHAR_CODE_LPAREN = "(".charCodeAt(0);
-const CHAR_CODE_COLON = ":".charCodeAt(0);
-const CHAR_CODE_SLASH = "/".charCodeAt(0);
-
-// The cache used in the `nsIURL` function.
-const gNSURLStore = new Map();
-
-// The cache used to store inflated frames.
-const gInflatedFrameStore = new WeakMap();
-
-/**
- * Parses the raw location of this function call to retrieve the actual
- * function name, source url, host name, line and column.
- */
-exports.parseLocation = function parseLocation(location, fallbackLine, fallbackColumn) {
-  // Parse the `location` for the function name, source url, line, column etc.
-
-  let line, column, url;
-
-  // These two indices are used to extract the resource substring, which is
-  // location[firstParenIndex + 1 .. lineAndColumnIndex].
-  //
-  // The resource substring is extracted iff a line number was found. There
-  // may be no parentheses, in which case the substring starts at 0.
-  //
-  // For example, take "foo (bar.js:1)".
-  //                        ^      ^
-  //                        |      -----+
-  //                        +-------+   |
-  //                                |   |
-  // firstParenIndex will point to -+   |
-  //                                    |
-  // lineAndColumnIndex will point to --+
-  //
-  // For an example without parentheses, take "bar.js:2".
-  //                                          ^      ^
-  //                                          |      |
-  // firstParenIndex will point to -----------+      |
-  //                                                 |
-  // lineAndColumIndex will point to ----------------+
-  let firstParenIndex = -1;
-  let lineAndColumnIndex = -1;
-
-  // Compute firstParenIndex and lineAndColumnIndex. If lineAndColumnIndex is
-  // found, also extract the line and column.
-  for (let i = 0; i < location.length; i++) {
-    let c = location.charCodeAt(i);
-
-    // The url and line information might be inside parentheses.
-    if (c === CHAR_CODE_LPAREN) {
-      if (firstParenIndex < 0) {
-        firstParenIndex = i;
-      }
-      continue;
-    }
-
-    // Look for numbers after colons, twice. Firstly for the line, secondly
-    // for the column.
-    if (c === CHAR_CODE_COLON) {
-      if (isNumeric(location.charCodeAt(i + 1))) {
-        // If we found a line number, remember when it starts.
-        if (lineAndColumnIndex < 0) {
-          lineAndColumnIndex = i;
-        }
-
-        let start = ++i;
-        let length = 1;
-        while (isNumeric(location.charCodeAt(++i))) {
-          length++;
-        }
-
-        // Discard port numbers
-        if (location.charCodeAt(i) === CHAR_CODE_SLASH) {
-          lineAndColumnIndex = -1;
-          --i;
-          continue;
-        }
-
-        if (!line) {
-          line = location.substr(start, length);
-
-          // Unwind a character due to the isNumeric loop above.
-          --i;
-
-          // There still might be a column number, continue looking.
-          continue;
-        }
-
-        column = location.substr(start, length);
-
-        // We've gotten both a line and a column, stop looking.
-        break;
-      }
-    }
-  }
-
-  let uri;
-  if (lineAndColumnIndex > 0) {
-    let resource = location.substring(firstParenIndex + 1, lineAndColumnIndex);
-    url = resource.split(" -> ").pop();
-    if (url) {
-      uri = nsIURL(url);
-    }
-  }
-
-  let functionName, fileName, hostName, port, host;
-  line = line || fallbackLine;
-  column = column || fallbackColumn;
-
-  // If the URI digged out from the `location` is valid, this is a JS frame.
-  if (uri) {
-    functionName = location.substring(0, firstParenIndex - 1);
-    fileName = (uri.fileName + (uri.ref ? "#" + uri.ref : "")) || "/";
-    hostName = getHost(url, uri.host);
-    // nsIURL throws when accessing a piece of a URL that doesn't
-    // exist, because we can't have nice things. Only check this if hostName
-    // exists, to save an extra try/catch.
-    if (hostName) {
-      try {
-        port = uri.port === -1 ? null : uri.port;
-        host = port !== null ? `${hostName}:${port}` : hostName;
-      } catch (e) {
-        host = hostName;
-      }
-    }
-  } else {
-    functionName = location;
-    url = null;
-  }
-
-  return { functionName, fileName, hostName, host, port, url, line, column };
-};
-
-/**
- * Checks if the specified function represents a chrome or content frame.
- *
- * @param string location
- *        The location of the frame.
- * @param number category [optional]
- *        If a chrome frame, the category.
- * @return boolean
- *         True if a content frame, false if a chrome frame.
- */
-function isContent({ location, category }) {
-  // Only C++ stack frames have associated category information.
-  if (category) {
-    return false;
-  }
-
-  // Locations in frames with function names look like:
-  //   "functionName (foo://bar)".
-  // Look for the starting left parenthesis, then try to match a
-  // scheme name.
-  for (let i = 0; i < location.length; i++) {
-    if (location.charCodeAt(i) === CHAR_CODE_LPAREN) {
-      return isContentScheme(location, i + 1);
-    }
-  }
-
-  // If there was no left parenthesis, try matching from the start.
-  return isContentScheme(location, 0);
-}
-exports.isContent = isContent;
-
-/**
- * Get caches to cache inflated frames and computed frame keys of a frame
- * table.
- *
- * @param object framesTable
- * @return object
- */
-exports.getInflatedFrameCache = function getInflatedFrameCache(frameTable) {
-  let inflatedCache = gInflatedFrameStore.get(frameTable);
-  if (inflatedCache !== undefined) {
-    return inflatedCache;
-  }
-
-  // Fill with nulls to ensure no holes.
-  inflatedCache = Array.from({ length: frameTable.data.length }, () => null);
-  gInflatedFrameStore.set(frameTable, inflatedCache);
-  return inflatedCache;
-};
-
-/**
- * Get or add an inflated frame to a cache.
- *
- * @param object cache
- * @param number index
- * @param object frameTable
- * @param object stringTable
- * @param object allocationsTable
- */
-exports.getOrAddInflatedFrame = function getOrAddInflatedFrame(cache, index, frameTable, stringTable, allocationsTable) {
-  let inflatedFrame = cache[index];
-  if (inflatedFrame === null) {
-    inflatedFrame = cache[index] = new InflatedFrame(index, frameTable, stringTable, allocationsTable);
-  }
-  return inflatedFrame;
-};
-
-/**
- * An intermediate data structured used to hold inflated frames.
- *
- * @param number index
- * @param object frameTable
- * @param object stringTable
- * @param object allocationsTable
- */
-function InflatedFrame(index, frameTable, stringTable, allocationsTable) {
-  const LOCATION_SLOT = frameTable.schema.location;
-  const OPTIMIZATIONS_SLOT = frameTable.schema.optimizations;
-  const LINE_SLOT = frameTable.schema.line;
-  const CATEGORY_SLOT = frameTable.schema.category;
-
-  let frame = frameTable.data[index];
-  let category = frame[CATEGORY_SLOT];
-  this.location = stringTable[frame[LOCATION_SLOT]];
-  this.optimizations = frame[OPTIMIZATIONS_SLOT];
-  this.line = frame[LINE_SLOT];
-  this.column = undefined;
-  this.category = category;
-  this.metaCategory = category || CATEGORY_OTHER;
-  this.allocations = allocationsTable ? allocationsTable[index] : 0;
-  this.isContent = isContent(this);
-};
-
-/**
- * Gets the frame key (i.e., equivalence group) according to options. Content
- * frames are always identified by location. Chrome frames are identified by
- * location if content-only filtering is off. If content-filtering is on, they
- * are identified by their category.
- *
- * @param object options
- * @return string
- */
-InflatedFrame.prototype.getFrameKey = function getFrameKey(options) {
-  if (this.isContent || !options.contentOnly || options.isRoot) {
-    options.isMetaCategoryOut = false;
-    return this.location;
-  }
-
-  if (options.isLeaf) {
-    // We only care about leaf platform frames if we are displaying content
-    // only. If no category is present, give the default category of
-    // CATEGORY_OTHER.
-    //
-    // 1. The leaf is where time is _actually_ being spent, so we _need_ to
-    // show it to developers in some way to give them accurate profiling
-    // data. We decide to split the platform into various category buckets
-    // and just show time spent in each bucket.
-    //
-    // 2. The calls leading to the leaf _aren't_ where we are spending time,
-    // but _do_ give the developer context for how they got to the leaf
-    // where they _are_ spending time. For non-platform hackers, the
-    // non-leaf platform frames don't give any meaningful context, and so we
-    // can safely filter them out.
-    options.isMetaCategoryOut = true;
-    return this.metaCategory;
-  }
-
-  // Return an empty string denoting that this frame should be skipped.
-  return "";
-};
-
-exports.InflatedFrame = InflatedFrame;
-
-/**
- * Helper for getting an nsIURL instance out of a string.
- */
-function nsIURL(url) {
-  let cached = gNSURLStore.get(url);
-  // If we cached a valid URI, or `null` in the case
-  // of a failure, return it.
-  if (cached !== void 0) {
-    return cached;
-  }
-  let uri = null;
-  try {
-    uri = Services.io.newURI(url, null, null).QueryInterface(Ci.nsIURL);
-    // Access the host, because the constructor doesn't necessarily throw
-    // if it's invalid, but accessing the host can throw as well
-    uri.host;
-  } catch(e) {
-    // The passed url string is invalid.
-    uri = null;
-  }
-
-  gNSURLStore.set(url, uri);
-  return uri;
-};
-
-/**
- * Takes a `host` string from an nsIURL instance and
- * returns the same string, or null, if it's an invalid host.
- */
-function getHost (url, hostName) {
-  return isChromeScheme(url, 0) ? null : hostName;
-}
-
-// For the functions below, we assume that we will never access the location
-// argument out of bounds, which is indeed the vast majority of cases.
-//
-// They are written this way because they are hot. Each frame is checked for
-// being content or chrome when processing the profile.
-
-function isColonSlashSlash(location, i) {
-  return location.charCodeAt(++i) === CHAR_CODE_COLON &&
-         location.charCodeAt(++i) === CHAR_CODE_SLASH &&
-         location.charCodeAt(++i) === CHAR_CODE_SLASH;
-}
-
-function isContentScheme(location, i) {
-  let firstChar = location.charCodeAt(i);
-
-  switch (firstChar) {
-  case CHAR_CODE_H: // "http://" or "https://"
-    if (location.charCodeAt(++i) === CHAR_CODE_T &&
-        location.charCodeAt(++i) === CHAR_CODE_T &&
-        location.charCodeAt(++i) === CHAR_CODE_P) {
-      if (location.charCodeAt(i + 1) === CHAR_CODE_S) {
-        ++i;
-      }
-      return isColonSlashSlash(location, i);
-    }
-    return false;
-
-  case CHAR_CODE_F: // "file://"
-    if (location.charCodeAt(++i) === CHAR_CODE_I &&
-        location.charCodeAt(++i) === CHAR_CODE_L &&
-        location.charCodeAt(++i) === CHAR_CODE_E) {
-      return isColonSlashSlash(location, i);
-    }
-    return false;
-
-  case CHAR_CODE_A: // "app://"
-    if (location.charCodeAt(++i) == CHAR_CODE_P &&
-        location.charCodeAt(++i) == CHAR_CODE_P) {
-      return isColonSlashSlash(location, i);
-    }
-    return false;
-
-  default:
-    return false;
-  }
-}
-
-function isChromeScheme(location, i) {
-  let firstChar = location.charCodeAt(i);
-
-  switch (firstChar) {
-  case CHAR_CODE_C: // "chrome://"
-    if (location.charCodeAt(++i) === CHAR_CODE_H &&
-        location.charCodeAt(++i) === CHAR_CODE_R &&
-        location.charCodeAt(++i) === CHAR_CODE_O &&
-        location.charCodeAt(++i) === CHAR_CODE_M &&
-        location.charCodeAt(++i) === CHAR_CODE_E) {
-      return isColonSlashSlash(location, i);
-    }
-    return false;
-
-  case CHAR_CODE_R: // "resource://"
-    if (location.charCodeAt(++i) === CHAR_CODE_E &&
-        location.charCodeAt(++i) === CHAR_CODE_S &&
-        location.charCodeAt(++i) === CHAR_CODE_O &&
-        location.charCodeAt(++i) === CHAR_CODE_U &&
-        location.charCodeAt(++i) === CHAR_CODE_R &&
-        location.charCodeAt(++i) === CHAR_CODE_C &&
-        location.charCodeAt(++i) === CHAR_CODE_E) {
-      return isColonSlashSlash(location, i);
-    }
-    return false;
-
-  case CHAR_CODE_J: // "jar:file://"
-    if (location.charCodeAt(++i) === CHAR_CODE_A &&
-        location.charCodeAt(++i) === CHAR_CODE_R &&
-        location.charCodeAt(++i) === CHAR_CODE_COLON &&
-        location.charCodeAt(++i) === CHAR_CODE_F &&
-        location.charCodeAt(++i) === CHAR_CODE_I &&
-        location.charCodeAt(++i) === CHAR_CODE_L &&
-        location.charCodeAt(++i) === CHAR_CODE_E) {
-      return isColonSlashSlash(location, i);
-    }
-    return false;
-
-  default:
-    return false;
-  }
-}
-
-function isNumeric(c) {
-  return c >= CHAR_CODE_0 && c <= CHAR_CODE_9;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/profiler/global.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/profiler/global.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/profiler/global.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/profiler/global.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,108 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-const {Cc, Ci, Cu, Cr} = require("chrome");
-
-Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
-
-/**
- * Localization convenience methods.
- */
-const STRINGS_URI = "chrome://browser/locale/devtools/profiler.properties";
-const L10N = new ViewHelpers.L10N(STRINGS_URI);
-
-/**
- * Details about each profile entry cateogry.
- * @see CATEGORY_MAPPINGS.
- */
-const CATEGORIES = [
-  { ordinal: 7, color: "#5e88b0", abbrev: "other", label: L10N.getStr("category.other") },
-  { ordinal: 4, color: "#46afe3", abbrev: "css", label: L10N.getStr("category.css") },
-  { ordinal: 1, color: "#d96629", abbrev: "js", label: L10N.getStr("category.js") },
-  { ordinal: 2, color: "#eb5368", abbrev: "gc", label: L10N.getStr("category.gc") },
-  { ordinal: 0, color: "#df80ff", abbrev: "network", label: L10N.getStr("category.network") },
-  { ordinal: 5, color: "#70bf53", abbrev: "graphics", label: L10N.getStr("category.graphics") },
-  { ordinal: 6, color: "#8fa1b2", abbrev: "storage", label: L10N.getStr("category.storage") },
-  { ordinal: 3, color: "#d99b28", abbrev: "events", label: L10N.getStr("category.events") }
-];
-
-/**
- * Mapping from category bitmasks in the profiler data to additional details.
- * To be kept in sync with the js::ProfileEntry::Category in ProfilingStack.h
- */
-const CATEGORY_MAPPINGS = {
-  "16": CATEGORIES[0],      // js::ProfileEntry::Category::OTHER
-  "32": CATEGORIES[1],      // js::ProfileEntry::Category::CSS
-  "64": CATEGORIES[2],      // js::ProfileEntry::Category::JS
-  "128": CATEGORIES[3],     // js::ProfileEntry::Category::GC
-  "256": CATEGORIES[3],     // js::ProfileEntry::Category::CC
-  "512": CATEGORIES[4],     // js::ProfileEntry::Category::NETWORK
-  "1024": CATEGORIES[5],    // js::ProfileEntry::Category::GRAPHICS
-  "2048": CATEGORIES[6],    // js::ProfileEntry::Category::STORAGE
-  "4096": CATEGORIES[7],    // js::ProfileEntry::Category::EVENTS
-};
-
-/**
- * Get the numeric bitmask (or set of masks) for the given category
- * abbreviation. See CATEGORIES and CATEGORY_MAPPINGS above.
- *
- * CATEGORY_MASK can be called with just a name if it is expected that the
- * category is mapped to by exactly one bitmask.  If the category is mapped
- * to by multiple masks, CATEGORY_MASK for that name must be called with
- * an additional argument specifying the desired id (in ascending order).
- */
-const [CATEGORY_MASK, CATEGORY_MASK_LIST] = (function () {
-  let mappings = {};
-  for (let category of CATEGORIES) {
-    let numList = Object.keys(CATEGORY_MAPPINGS)
-          .filter(k => CATEGORY_MAPPINGS[k] == category)
-          .map(k => +k);
-    numList.sort();
-    mappings[category.abbrev] = numList;
-  }
-
-  return [
-    function (name, num) {
-      if (!(name in mappings)) {
-        throw new Error(`Category abbreviation '${name}' does not exist.`);
-      }
-      if (arguments.length == 1) {
-        if (mappings[name].length != 1) {
-          throw new Error(`Expected exactly one category number for '${name}'.`);
-        }
-        return mappings[name][0];
-      }
-      if (num > mappings[name].length) {
-        throw new Error(`Num '${num}' too high for category '${name}'.`);
-      }
-      return mappings[name][num - 1];
-    },
-
-    function (name) {
-      if (!(name in mappings)) {
-        throw new Error(`Category abbreviation '${name}' does not exist.`);
-      }
-      return mappings[name];
-    }
-  ];
-})();
-
-// Human-readable "other" category bitmask. Older Geckos don't have all the
-// necessary instrumentation in the sampling profiler backend for creating
-// a categories graph, in which case we default to the "other" category.
-const CATEGORY_OTHER = CATEGORY_MASK('other');
-
-// Human-readable JIT category bitmask. Certain pseudo-frames in a sample,
-// like "EnterJIT", don't have any associated `cateogry` information.
-const CATEGORY_JIT = CATEGORY_MASK('js');
-
-// Exported symbols.
-exports.L10N = L10N;
-exports.CATEGORIES = CATEGORIES;
-exports.CATEGORY_MAPPINGS = CATEGORY_MAPPINGS;
-exports.CATEGORY_OTHER = CATEGORY_OTHER;
-exports.CATEGORY_JIT = CATEGORY_JIT;
-exports.CATEGORY_MASK = CATEGORY_MASK;
-exports.CATEGORY_MASK_LIST = CATEGORY_MASK_LIST;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/profiler/jit.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/profiler/jit.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/profiler/jit.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/profiler/jit.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,240 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-// An outcome of an OptimizationAttempt that is considered successful.
-const SUCCESSFUL_OUTCOMES = [
-  "GenericSuccess", "Inlined", "DOM", "Monomorphic", "Polymorphic"
-];
-
-/**
- * Model representing JIT optimization sites from the profiler
- * for a frame (represented by a FrameNode). Requires optimization data from
- * a profile, which is an array of RawOptimizationSites.
- *
- * When the ThreadNode for the profile iterates over the samples' frames, each
- * frame's optimizations are accumulated in their respective FrameNodes. Each
- * FrameNode may contain many different optimization sites. One sample may
- * pick up optimization X on line Y in the frame, with the next sample
- * containing optimization Z on line W in the same frame, as each frame is
- * only function.
- *
- * An OptimizationSite contains a record of how many times the
- * RawOptimizationSite was sampled, as well as the unique id based off of the
- * original profiler array, and the RawOptimizationSite itself as a reference.
- * @see browser/devtools/shared/profiler/tree-model.js
- *
- * @struct RawOptimizationSite
- * A structure describing a location in a script that was attempted to be optimized.
- * Contains all the IonTypes observed, and the sequence of OptimizationAttempts that
- * were attempted, and the line and column in the script. This is retrieved from the
- * profiler after a recording, and our base data structure. Should always be referenced,
- * and unmodified.
- *
- * Note that propertyName is an index into a string table, which needs to be
- * provided in order for the raw optimization site to be inflated.
- *
- * @type {Array<IonType>} types
- * @type {Array<OptimizationAttempt>} attempts
- * @type {?number} propertyName
- * @type {number} line
- * @type {number} column
- *
- *
- * @struct IonType
- * IonMonkey attempts to classify each value in an optimization site by some type.
- * Based off of the observed types for a value (like a variable that could be a
- * string or an instance of an object), it determines what kind of type it should be classified
- * as. Each IonType here contains an array of all ObservedTypes under `types`,
- * the Ion type that IonMonkey decided this value should be (Int32, Object, etc.) as `mirType`,
- * and the component of this optimization type that this value refers to -- like
- * a "getter" optimization, `a[b]`, has site `a` (the "Receiver") and `b` (the "Index").
- *
- * Generally the more ObservedTypes, the more deoptimized this OptimizationSite is.
- * There could be no ObservedTypes, in which case `types` is undefined.
- *
- * @type {?Array<ObservedType>} typeset
- * @type {string} site
- * @type {string} mirType
- *
- *
- * @struct ObservedType
- * When IonMonkey attempts to determine what type a value is, it checks on each sample.
- * The ObservedType can be thought of in more of JavaScripty-terms, rather than C++.
- * The `keyedBy` property is a high level description of the type, like "primitive",
- * "constructor", "function", "singleton", "alloc-site" (that one is a bit more weird).
- * If the `keyedBy` type is a function or constructor, the ObservedType should have a
- * `name` property, referring to the function or constructor name from the JS source.
- * If IonMonkey can determine the origin of this type (like where the constructor is defined),
- * the ObservedType will also have `location` and `line` properties, but `location` can sometimes
- * be non-URL strings like "self-hosted" or a memory location like "102ca7880", or no location
- * at all, and maybe `line` is 0 or undefined.
- *
- * @type {string} keyedBy
- * @type {?string} name
- * @type {?string} location
- * @type {?string} line
- *
- *
- * @struct OptimizationAttempt
- * Each RawOptimizationSite contains an array of OptimizationAttempts. Generally, IonMonkey
- * goes through a series of strategies for each kind of optimization, starting from most-niche
- * and optimized, to the less-optimized, but more general strategies -- for example, a getter
- * opt may first try to optimize for the scenario of a getter on an `arguments` object --
- * that will fail most of the time, as most objects are not arguments objects, but it will attempt
- * several strategies in order until it finds a strategy that works, or fails. Even in the best
- * scenarios, some attempts will fail (like the arguments getter example), which is OK,
- * as long as some attempt succeeds (with the earlier attempts preferred, as those are more optimized).
- * In an OptimizationAttempt structure, we store just the `strategy` name and `outcome` name,
- * both from enums in js/public/TrackedOptimizationInfo.h as TRACKED_STRATEGY_LIST and
- * TRACKED_OUTCOME_LIST, respectively. An array of successful outcome strings are above
- * in SUCCESSFUL_OUTCOMES.
- *
- * @see js/public/TrackedOptimizationInfo.h
- *
- * @type {string} strategy
- * @type {string} outcome
- */
-
-
-/*
- * A wrapper around RawOptimizationSite to record sample count and ID (referring to the index
- * of where this is in the initially seeded optimizations data), so we don't mutate
- * the original data from the profiler. Provides methods to access the underlying optimization
- * data easily, so understanding the semantics of JIT data isn't necessary.
- *
- * @constructor
- *
- * @param {Array<RawOptimizationSite>} optimizations
- * @param {number} optsIndex
- *
- * @type {RawOptimizationSite} data
- * @type {number} samples
- * @type {number} id
- */
-
-const OptimizationSite = exports.OptimizationSite = function (id, opts) {
-  this.id = id;
-  this.data = opts;
-  this.samples = 1;
-};
-
-/**
- * Returns a boolean indicating if the passed in OptimizationSite
- * has a "good" outcome at the end of its attempted strategies.
- *
- * @param {Array<string>} stringTable
- * @return {boolean}
- */
-
-OptimizationSite.prototype.hasSuccessfulOutcome = function () {
-  let attempts = this.getAttempts();
-  let lastOutcome = attempts[attempts.length - 1].outcome;
-  return OptimizationSite.isSuccessfulOutcome(lastOutcome);
-};
-
-/**
- * Returns the last attempted OptimizationAttempt for this OptimizationSite.
- *
- * @return {Array<OptimizationAttempt>}
- */
-
-OptimizationSite.prototype.getAttempts = function () {
-  return this.data.attempts;
-};
-
-/**
- * Returns all IonTypes in this OptimizationSite.
- *
- * @return {Array<IonType>}
- */
-
-OptimizationSite.prototype.getIonTypes = function () {
-  return this.data.types;
-};
-
-
-/**
- * Constructor for JITOptimizations. A collection of OptimizationSites for a frame.
- *
- * @constructor
- * @param {Array<RawOptimizationSite>} rawSites
- *                                     Array of raw optimization sites.
- * @param {Array<string>} stringTable
- *                        Array of strings from the profiler used to inflate
- *                        JIT optimizations. Do not modify this!
- */
-
-const JITOptimizations = exports.JITOptimizations = function (rawSites, stringTable) {
-  // Build a histogram of optimization sites.
-  let sites = [];
-
-  for (let rawSite of rawSites) {
-    let existingSite = sites.find((site) => site.data === rawSite);
-    if (existingSite) {
-      existingSite.samples++;
-    } else {
-      sites.push(new OptimizationSite(sites.length, rawSite));
-    }
-  }
-
-  // Inflate the optimization information.
-  for (let site of sites) {
-    let data = site.data;
-    let STRATEGY_SLOT = data.attempts.schema.strategy;
-    let OUTCOME_SLOT = data.attempts.schema.outcome;
-
-    site.data = {
-      attempts: data.attempts.data.map((a) => {
-        return {
-          strategy: stringTable[a[STRATEGY_SLOT]],
-          outcome: stringTable[a[OUTCOME_SLOT]]
-        }
-      }),
-
-      types: data.types.map((t) => {
-        return {
-          typeset: maybeTypeset(t.typeset, stringTable),
-          site: stringTable[t.site],
-          mirType: stringTable[t.mirType]
-        };
-      }),
-
-      propertyName: maybeString(stringTable, data.propertyName),
-      line: data.line,
-      column: data.column
-    };
-  }
-
-  this.optimizationSites = sites.sort((a, b) => b.samples - a.samples);;
-};
-
-/**
- * Takes an "outcome" string from an OptimizationAttempt and returns
- * a boolean indicating whether or not its a successful outcome.
- *
- * @return {boolean}
- */
-
-OptimizationSite.isSuccessfulOutcome = JITOptimizations.isSuccessfulOutcome = function (outcome) {
-  return !!~SUCCESSFUL_OUTCOMES.indexOf(outcome);
-};
-
-function maybeString(stringTable, index) {
-  return index ? stringTable[index] : undefined;
-}
-
-function maybeTypeset(typeset, stringTable) {
-  if (!typeset) {
-    return undefined;
-  }
-  return typeset.map((ty) => {
-    return {
-      keyedBy: maybeString(stringTable, ty.keyedBy),
-      name: maybeString(stringTable, ty.name),
-      location: maybeString(stringTable, ty.location),
-      line: ty.line
-    };
-  });
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/profiler/tree-model.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/profiler/tree-model.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/profiler/tree-model.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/profiler/tree-model.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,504 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-const {Cc, Ci, Cu, Cr} = require("chrome");
-
-loader.lazyRequireGetter(this, "L10N",
-  "devtools/shared/profiler/global", true);
-loader.lazyRequireGetter(this, "CATEGORY_MAPPINGS",
-  "devtools/shared/profiler/global", true);
-loader.lazyRequireGetter(this, "CATEGORIES",
-  "devtools/shared/profiler/global", true);
-loader.lazyRequireGetter(this, "CATEGORY_JIT",
-  "devtools/shared/profiler/global", true);
-loader.lazyRequireGetter(this, "CATEGORY_OTHER",
-  "devtools/shared/profiler/global", true);
-loader.lazyRequireGetter(this, "JITOptimizations",
-  "devtools/shared/profiler/jit", true);
-loader.lazyRequireGetter(this, "FrameUtils",
-  "devtools/shared/profiler/frame-utils");
-
-exports.ThreadNode = ThreadNode;
-exports.FrameNode = FrameNode;
-exports.FrameNode.isContent = FrameUtils.isContent;
-
-/**
- * A call tree for a thread. This is essentially a linkage between all frames
- * of all samples into a single tree structure, with additional information
- * on each node, like the time spent (in milliseconds) and samples count.
- *
- * @param object thread
- *        The raw thread object received from the backend. Contains samples,
- *        stackTable, frameTable, and stringTable.
- * @param object options
- *        Additional supported options, @see ThreadNode.prototype.insert
- *          - number startTime [optional]
- *          - number endTime [optional]
- *          - boolean contentOnly [optional]
- *          - boolean invertTree [optional]
- *          - boolean flattenRecursion [optional]
- */
-function ThreadNode(thread, options = {}) {
-  this.samples = 0;
-  this.duration = 0;
-  this.calls = [];
-
-  // Maps of frame to their self counts and duration.
-  this.selfCount = Object.create(null);
-  this.selfDuration = Object.create(null);
-
-  let { samples, stackTable, frameTable, stringTable, allocationsTable } = thread;
-
-  // Nothing to do if there are no samples.
-  if (samples.data.length === 0) {
-    return;
-  }
-
-  this._buildInverted(samples, stackTable, frameTable, stringTable, allocationsTable, options);
-  if (!options.invertTree) {
-    this._uninvert();
-  }
-}
-
-ThreadNode.prototype = {
-  /**
-   * Build an inverted call tree from profile samples. The format of the
-   * samples is described in tools/profiler/ProfileEntry.h, under the heading
-   * "ThreadProfile JSON Format".
-   *
-   * The profile data is naturally presented inverted. Inverting the call tree
-   * is also the default in the Performance tool.
-   *
-   * @param object samples
-   *        The raw samples array received from the backend.
-   * @param object stackTable
-   *        The table of deduplicated stacks from the backend.
-   * @param object frameTable
-   *        The table of deduplicated frames from the backend.
-   * @param object stringTable
-   *        The table of deduplicated strings from the backend.
-   * @param object allocationsTable
-   *        The table of allocation counts from the backend. Indexed by frame
-   *        index.
-   * @param object options
-   *        Additional supported options
-   *          - number startTime [optional]
-   *          - number endTime [optional]
-   *          - boolean contentOnly [optional]
-   *          - boolean invertTree [optional]
-   */
-  _buildInverted: function buildInverted(samples, stackTable, frameTable, stringTable, allocationsTable, options) {
-    function getOrAddFrameNode(calls, isLeaf, frameKey, inflatedFrame, isMetaCategory, leafTable) {
-      // Insert the inflated frame into the call tree at the current level.
-      let frameNode;
-
-      // Leaf nodes have fan out much greater than non-leaf nodes, thus the
-      // use of a hash table. Otherwise, do linear search.
-      //
-      // Note that this method is very hot, thus the manual looping over
-      // Array.prototype.find.
-      if (isLeaf) {
-        frameNode = leafTable[frameKey];
-      } else {
-        for (let i = 0; i < calls.length; i++) {
-          if (calls[i].key === frameKey) {
-            frameNode = calls[i];
-            break;
-          }
-        }
-      }
-
-      if (!frameNode) {
-        frameNode = new FrameNode(frameKey, inflatedFrame, isMetaCategory);
-        if (isLeaf) {
-          leafTable[frameKey] = frameNode;
-        }
-        calls.push(frameNode);
-      }
-
-      return frameNode;
-    }
-
-    const SAMPLE_STACK_SLOT = samples.schema.stack;
-    const SAMPLE_TIME_SLOT = samples.schema.time;
-
-    const STACK_PREFIX_SLOT = stackTable.schema.prefix;
-    const STACK_FRAME_SLOT = stackTable.schema.frame;
-
-    const InflatedFrame = FrameUtils.InflatedFrame;
-    const getOrAddInflatedFrame = FrameUtils.getOrAddInflatedFrame;
-
-    let selfCount = this.selfCount;
-    let selfDuration = this.selfDuration;
-
-    let samplesData = samples.data;
-    let stacksData = stackTable.data;
-
-    // Caches.
-    let inflatedFrameCache = FrameUtils.getInflatedFrameCache(frameTable);
-    let leafTable = Object.create(null);
-
-    let startTime = options.startTime || 0
-    let endTime = options.endTime || Infinity;
-    let flattenRecursion = options.flattenRecursion;
-
-    // Take the timestamp of the first sample as prevSampleTime. 0 is
-    // incorrect due to circular buffer wraparound. If wraparound happens,
-    // then the first sample will have an incorrect, large duration.
-    let prevSampleTime = samplesData[0][SAMPLE_TIME_SLOT];
-
-    // Reused options object passed to InflatedFrame.prototype.getFrameKey.
-    let mutableFrameKeyOptions = {
-      contentOnly: options.contentOnly,
-      isRoot: false,
-      isLeaf: false,
-      isMetaCategoryOut: false
-    };
-
-    // Start iteration at the second sample, as we use the first sample to
-    // compute prevSampleTime.
-    for (let i = 1; i < samplesData.length; i++) {
-      let sample = samplesData[i];
-      let sampleTime = sample[SAMPLE_TIME_SLOT];
-
-      // A sample's end time is considered to be its time of sampling. Its
-      // start time is the sampling time of the previous sample.
-      //
-      // Thus, we compare sampleTime <= start instead of < to filter out
-      // samples that end exactly at the start time.
-      if (!sampleTime || sampleTime <= startTime || sampleTime > endTime) {
-        prevSampleTime = sampleTime;
-        continue;
-      }
-
-      let sampleDuration = sampleTime - prevSampleTime;
-      let stackIndex = sample[SAMPLE_STACK_SLOT];
-      let calls = this.calls;
-      let prevCalls = this.calls;
-      let prevFrameKey;
-      let isLeaf = mutableFrameKeyOptions.isLeaf = true;
-
-      // Inflate the stack and build the FrameNode call tree directly.
-      //
-      // In the profiler data, each frame's stack is referenced by an index
-      // into stackTable.
-      //
-      // Each entry in stackTable is a pair [ prefixIndex, frameIndex ]. The
-      // prefixIndex is itself an index into stackTable, referencing the
-      // prefix of the current stack (that is, the younger frames). In other
-      // words, the stackTable is encoded as a trie of the inverted
-      // callstack. The frameIndex is an index into frameTable, describing the
-      // frame at the current depth.
-      //
-      // This algorithm inflates each frame in the frame table while walking
-      // the stack trie as described above.
-      //
-      // The frame key is then computed from the inflated frame /and/ the
-      // current depth in the FrameNode call tree.  That is, the frame key is
-      // not wholly determinable from just the inflated frame.
-      //
-      // For content frames, the frame key is just its location. For chrome
-      // frames, the key may be a metacategory or its location, depending on
-      // rendering options and its position in the FrameNode call tree.
-      //
-      // The frame key is then used to build up the inverted FrameNode call
-      // tree.
-      //
-      // Note that various filtering functions, such as filtering for content
-      // frames or flattening recursion, are inlined into the stack inflation
-      // loop. This is important for performance as it avoids intermediate
-      // structures and multiple passes.
-      while (stackIndex !== null) {
-        let stackEntry = stacksData[stackIndex];
-        let frameIndex = stackEntry[STACK_FRAME_SLOT];
-
-        // Fetch the stack prefix (i.e. older frames) index.
-        stackIndex = stackEntry[STACK_PREFIX_SLOT];
-
-        // Inflate the frame.
-        let inflatedFrame = getOrAddInflatedFrame(inflatedFrameCache, frameIndex, frameTable,
-                                                  stringTable, allocationsTable);
-
-        // Compute the frame key.
-        mutableFrameKeyOptions.isRoot = stackIndex === null;
-        let frameKey = inflatedFrame.getFrameKey(mutableFrameKeyOptions);
-
-        // Leaf frames are never skipped and require self count and duration
-        // bookkeeping.
-        if (isLeaf) {
-          // Tabulate self count and duration for the leaf frame. The frameKey
-          // is never empty for a leaf frame.
-          if (selfCount[frameKey] === undefined) {
-            selfCount[frameKey] = 0;
-            selfDuration[frameKey] = 0;
-          }
-          selfCount[frameKey]++;
-          selfDuration[frameKey] += sampleDuration;
-        } else {
-          // An empty frame key means this frame should be skipped.
-          if (frameKey === "") {
-            continue;
-          }
-        }
-
-        // If we shouldn't flatten the current frame into the previous one, advance a
-        // level in the call tree.
-        if (!flattenRecursion || frameKey !== prevFrameKey) {
-          calls = prevCalls;
-        }
-
-        let frameNode = getOrAddFrameNode(calls, isLeaf, frameKey, inflatedFrame,
-                                          mutableFrameKeyOptions.isMetaCategoryOut,
-                                          leafTable);
-
-        frameNode._countSample(prevSampleTime, sampleTime, inflatedFrame.optimizations,
-                               stringTable);
-
-        prevFrameKey = frameKey;
-        prevCalls = frameNode.calls;
-        isLeaf = mutableFrameKeyOptions.isLeaf = false;
-      }
-
-      this.duration += sampleDuration;
-      this.samples++;
-      prevSampleTime = sampleTime;
-    }
-  },
-
-  /**
-   * Uninverts the call tree after its having been built.
-   */
-  _uninvert: function uninvert() {
-    function mergeOrAddFrameNode(calls, node) {
-      // Unlike the inverted call tree, we don't use a root table for the top
-      // level, as in general, there are many fewer entry points than
-      // leaves. Instead, linear search is used regardless of level.
-      for (let i = 0; i < calls.length; i++) {
-        if (calls[i].key === node.key) {
-          let foundNode = calls[i];
-          foundNode._merge(node);
-          return foundNode.calls;
-        }
-      }
-      let copy = node._clone();
-      calls.push(copy);
-      return copy.calls;
-    }
-
-    let workstack = [{ node: this, level: 0 }];
-    let spine = [];
-    let entry;
-
-    // The new root.
-    let rootCalls = [];
-
-    // Walk depth-first and keep the current spine (e.g., callstack).
-    while (entry = workstack.pop()) {
-      spine[entry.level] = entry;
-
-      let node = entry.node;
-      let calls = node.calls;
-
-      if (calls.length === 0) {
-        // We've bottomed out. Reverse the spine and add them to the
-        // uninverted call tree.
-        let uninvertedCalls = rootCalls;
-        for (let level = entry.level; level > 0; level--) {
-          let callee = spine[level];
-          uninvertedCalls = mergeOrAddFrameNode(uninvertedCalls, callee.node);
-        }
-      } else {
-        // We still have children. Continue the depth-first walk.
-        for (let i = 0; i < calls.length; i++) {
-          workstack.push({ node: calls[i], level: entry.level + 1 });
-        }
-      }
-    }
-
-    // Replace the toplevel calls with rootCalls, which now contains the
-    // uninverted roots.
-    this.calls = rootCalls;
-  },
-
-  /**
-   * Gets additional details about this node.
-   * @return object
-   */
-  getInfo: function() {
-    return {
-      nodeType: "Thread",
-      functionName: L10N.getStr("table.root"),
-      categoryData: {}
-    };
-  },
-
-  /**
-   * Mimicks the interface of FrameNode, and a ThreadNode can never have
-   * optimization data (at the moment, anyway), so provide a function
-   * to return null so we don't need to check if a frame node is a thread
-   * or not everytime we fetch optimization data.
-   *
-   * @return {null}
-   */
-
-  hasOptimizations: function () {
-    return null;
-  }
-};
-
-/**
- * A function call node in a tree.
- *
- * @param string frameKey
- *        The key associated with this frame. The key determines identity of
- *        the node.
- * @param string location
- *        The location of this function call. Note that this isn't sanitized,
- *        so it may very well (not?) include the function name, url, etc.
- * @param number line
- *        The line number inside the source containing this function call.
- * @param number category
- *        The category type of this function call ("js", "graphics" etc.).
- * @param number allocations
- *        The number of memory allocations performed in this frame.
- * @param number isContent
- *        Whether this frame is content.
- * @param boolean isMetaCategory
- *        Whether or not this is a platform node that should appear as a
- *        generalized meta category or not.
- */
-function FrameNode(frameKey, { location, line, category, allocations, isContent }, isMetaCategory) {
-  this.key = frameKey;
-  this.location = location;
-  this.line = line;
-  this.category = category;
-  this.allocations = allocations;
-  this.samples = 0;
-  this.duration = 0;
-  this.calls = [];
-  this.isContent = isContent;
-  this._optimizations = null;
-  this._stringTable = null;
-  this.isMetaCategory = isMetaCategory;
-}
-
-FrameNode.prototype = {
-  /**
-   * Count a sample as associated with this node.
-   *
-   * @param number prevSampleTime
-   *               The time when the immediate previous sample was sampled.
-   * @param number sampleTime
-   *               The time when the current sample was sampled.
-   * @param object optimizationSite
-   *               Any JIT optimization information attached to the current
-   *               sample. Lazily inflated via stringTable.
-   * @param object stringTable
-   *               The string table used to inflate the optimizationSite.
-   */
-  _countSample: function (prevSampleTime, sampleTime, optimizationSite, stringTable) {
-    this.samples++;
-    this.duration += sampleTime - prevSampleTime;
-
-    // Simply accumulate optimization sites for now. Processing is done lazily
-    // by JITOptimizations, if optimization information is actually displayed.
-    if (optimizationSite) {
-      let opts = this._optimizations;
-      if (opts === null) {
-        opts = this._optimizations = [];
-        this._stringTable = stringTable;
-      }
-      opts.push(optimizationSite);
-    }
-  },
-
-  _clone: function () {
-    let newNode = new FrameNode(this.key, this, this.isMetaCategory);
-    newNode._merge(this);
-    return newNode;
-  },
-
-  _merge: function (otherNode) {
-    if (this === otherNode) {
-      return;
-    }
-
-    this.samples += otherNode.samples;
-    this.duration += otherNode.duration;
-
-    if (otherNode._optimizations) {
-      let opts = this._optimizations;
-      if (opts === null) {
-        opts = this._optimizations = [];
-        this._stringTable = otherNode._stringTable;
-      }
-      let otherOpts = otherNode._optimizations;
-      for (let i = 0; i < otherOpts.length; i++) {
-        opts.push(otherOpts[i]);
-      }
-    }
-  },
-
-  /**
-   * Returns the parsed location and additional data describing
-   * this frame. Uses cached data if possible.
-   *
-   * @return object
-   *         The computed { name, file, url, line } properties for this
-   *         function call.
-   */
-  getInfo: function() {
-    return this._data || this._computeInfo();
-  },
-
-  /**
-   * Parses the raw location of this function call to retrieve the actual
-   * function name and source url.
-   */
-  _computeInfo: function() {
-    // "EnterJIT" pseudoframes are special, not actually on the stack.
-    if (this.location == "EnterJIT") {
-      this.category = CATEGORY_JIT;
-    }
-
-    if (this.isMetaCategory && !this.category) {
-      this.category = CATEGORY_OTHER;
-    }
-
-    // Since only C++ stack frames have associated category information,
-    // default to an "unknown" category otherwise.
-    let categoryData = CATEGORY_MAPPINGS[this.category] || {};
-
-    let parsedData = FrameUtils.parseLocation(this.location, this.line, this.column);
-    parsedData.nodeType = "Frame";
-    parsedData.categoryData = categoryData;
-    parsedData.isContent = this.isContent;
-    parsedData.isMetaCategory = this.isMetaCategory;
-
-    return this._data = parsedData;
-  },
-
-  /**
-   * Returns whether or not the frame node has an JITOptimizations model.
-   *
-   * @return {Boolean}
-   */
-  hasOptimizations: function () {
-    return !!this._optimizations;
-  },
-
-  /**
-   * Returns the underlying JITOptimizations model representing
-   * the optimization attempts occuring in this frame.
-   *
-   * @return {JITOptimizations|null}
-   */
-  getOptimizations: function () {
-    if (!this._optimizations) {
-      return null;
-    }
-    return new JITOptimizations(this._optimizations, this._stringTable);
-  }
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/profiler/tree-view.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/profiler/tree-view.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/profiler/tree-view.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/profiler/tree-view.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,361 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-const {Cc, Ci, Cu, Cr} = require("chrome");
-
-loader.lazyRequireGetter(this, "L10N",
-  "devtools/shared/profiler/global", true);
-
-loader.lazyImporter(this, "Heritage",
-  "resource:///modules/devtools/ViewHelpers.jsm");
-loader.lazyImporter(this, "AbstractTreeItem",
-  "resource:///modules/devtools/AbstractTreeItem.jsm");
-
-const MILLISECOND_UNITS = L10N.getStr("table.ms");
-const PERCENTAGE_UNITS = L10N.getStr("table.percentage");
-const URL_LABEL_TOOLTIP = L10N.getStr("table.url.tooltiptext");
-const CALL_TREE_INDENTATION = 16; // px
-
-const DEFAULT_SORTING_PREDICATE = (a, b) => a.frame.samples < b.frame.samples ? 1 : -1;
-const DEFAULT_AUTO_EXPAND_DEPTH = 3; // depth
-const DEFAULT_VISIBLE_CELLS = {
-  duration: true,
-  percentage: true,
-  allocations: false,
-  selfDuration: true,
-  selfPercentage: true,
-  selfAllocations: false,
-  samples: true,
-  function: true
-};
-
-const clamp = (val, min, max) => Math.max(min, Math.min(max, val));
-const sum = vals => vals.reduce((a, b) => a + b, 0);
-
-exports.CallView = CallView;
-
-/**
- * An item in a call tree view, which looks like this:
- *
- *   Time (ms)  |   Cost   | Calls | Function
- * ============================================================================
- *     1,000.00 |  100.00% |       | ▼ (root)
- *       500.12 |   50.01% |   300 |   ▼ foo                          Categ. 1
- *       300.34 |   30.03% |  1500 |     ▼ bar                        Categ. 2
- *        10.56 |    0.01% |    42 |       ▶ call_with_children       Categ. 3
- *        90.78 |    0.09% |    25 |         call_without_children    Categ. 4
- *
- * Every instance of a `CallView` represents a row in the call tree. The same
- * parent node is used for all rows.
- *
- * @param CallView caller
- *        The CallView considered the "caller" frame. This instance will be
- *        represent the "callee". Should be null for root nodes.
- * @param ThreadNode | FrameNode frame
- *        Details about this function, like { samples, duration, calls } etc.
- * @param number level
- *        The indentation level in the call tree. The root node is at level 0.
- * @param boolean hidden [optional]
- *        Whether this node should be hidden and not contribute to depth/level
- *        calculations. Defaults to false.
- * @param boolean inverted [optional]
- *        Whether the call tree has been inverted (bottom up, rather than
- *        top-down). Defaults to false.
- * @param function sortingPredicate [optional]
- *        The predicate used to sort the tree items when created. Defaults to
- *        the caller's `sortingPredicate` if a caller exists, otherwise defaults
- *        to DEFAULT_SORTING_PREDICATE. The two passed arguments are FrameNodes.
- * @param number autoExpandDepth [optional]
- *        The depth to which the tree should automatically expand. Defualts to
- *        the caller's `autoExpandDepth` if a caller exists, otherwise defaults
- *        to DEFAULT_AUTO_EXPAND_DEPTH.
- * @param object visibleCells
- *        An object specifying which cells are visible in the tree. Defaults to
- *        the caller's `visibleCells` if a caller exists, otherwise defaults
- *        to DEFAULT_VISIBLE_CELLS.
- */
-function CallView({
-  caller, frame, level, hidden, inverted,
-  sortingPredicate, autoExpandDepth, visibleCells
-}) {
-  AbstractTreeItem.call(this, {
-    parent: caller,
-    level: level|0 - (hidden ? 1 : 0)
-  });
-
-  this.sortingPredicate = sortingPredicate != null
-    ? sortingPredicate
-    : caller ? caller.sortingPredicate
-             : DEFAULT_SORTING_PREDICATE
-
-  this.autoExpandDepth = autoExpandDepth != null
-    ? autoExpandDepth
-    : caller ? caller.autoExpandDepth
-             : DEFAULT_AUTO_EXPAND_DEPTH;
-
-  this.visibleCells = visibleCells != null
-    ? visibleCells
-    : caller ? caller.visibleCells
-             : Object.create(DEFAULT_VISIBLE_CELLS);
-
-  this.caller = caller;
-  this.frame = frame;
-  this.hidden = hidden;
-  this.inverted = inverted;
-
-  this._onUrlClick = this._onUrlClick.bind(this);
-};
-
-CallView.prototype = Heritage.extend(AbstractTreeItem.prototype, {
-  /**
-   * Creates the view for this tree node.
-   * @param nsIDOMNode document
-   * @param nsIDOMNode arrowNode
-   * @return nsIDOMNode
-   */
-  _displaySelf: function(document, arrowNode) {
-    this.document = document;
-
-    let frameInfo = this.frame.getInfo();
-    let framePercentage = this._getPercentage(this.frame.samples);
-
-    let selfPercentage;
-    let selfDuration;
-    let totalAllocations;
-
-    let frameKey = this.frame.key;
-    if (this.visibleCells.selfPercentage) {
-      selfPercentage = this._getPercentage(this.root.frame.selfCount[frameKey]);
-    }
-    if (this.visibleCells.selfDuration) {
-      selfDuration = this.root.frame.selfDuration[frameKey];
-    }
-
-    if (!this.frame.calls.length) {
-      if (this.visibleCells.allocations) {
-        totalAllocations = this.frame.allocations;
-      }
-    } else {
-      if (this.visibleCells.allocations) {
-        let childrenAllocations = this.frame.calls.reduce((acc, node) => acc + node.allocations, 0);
-        totalAllocations = this.frame.allocations + childrenAllocations;
-      }
-    }
-
-    if (this.visibleCells.duration) {
-      var durationCell = this._createTimeCell(this.frame.duration);
-    }
-    if (this.visibleCells.selfDuration) {
-      var selfDurationCell = this._createTimeCell(selfDuration, true);
-    }
-    if (this.visibleCells.percentage) {
-      var percentageCell = this._createExecutionCell(framePercentage);
-    }
-    if (this.visibleCells.selfPercentage) {
-      var selfPercentageCell = this._createExecutionCell(selfPercentage, true);
-    }
-    if (this.visibleCells.allocations) {
-      var allocationsCell = this._createAllocationsCell(totalAllocations);
-    }
-    if (this.visibleCells.selfAllocations) {
-      var selfAllocationsCell = this._createAllocationsCell(this.frame.allocations, true);
-    }
-    if (this.visibleCells.samples) {
-      var samplesCell = this._createSamplesCell(this.frame.samples);
-    }
-    if (this.visibleCells.function) {
-      var functionCell = this._createFunctionCell(arrowNode, frameInfo, this.level);
-    }
-
-    let targetNode = document.createElement("hbox");
-    targetNode.className = "call-tree-item";
-    targetNode.setAttribute("origin", frameInfo.isContent ? "content" : "chrome");
-    targetNode.setAttribute("category", frameInfo.categoryData.abbrev || "");
-    targetNode.setAttribute("tooltiptext", frameInfo.isMetaCategory ? frameInfo.categoryData.label :
-                                           this.frame.location || "");
-    if (this.hidden) {
-      targetNode.style.display = "none";
-    }
-
-    let isRoot = frameInfo.nodeType == "Thread";
-    if (isRoot) {
-      functionCell.querySelector(".call-tree-category").hidden = true;
-    }
-
-    if (this.visibleCells.duration) {
-      targetNode.appendChild(durationCell);
-    }
-    if (this.visibleCells.percentage) {
-      targetNode.appendChild(percentageCell);
-    }
-    if (this.visibleCells.allocations) {
-      targetNode.appendChild(allocationsCell);
-    }
-    if (this.visibleCells.selfDuration) {
-      targetNode.appendChild(selfDurationCell);
-    }
-    if (this.visibleCells.selfPercentage) {
-      targetNode.appendChild(selfPercentageCell);
-    }
-    if (this.visibleCells.selfAllocations) {
-      targetNode.appendChild(selfAllocationsCell);
-    }
-    if (this.visibleCells.samples) {
-      targetNode.appendChild(samplesCell);
-    }
-    if (this.visibleCells.function) {
-      targetNode.appendChild(functionCell);
-    }
-
-    return targetNode;
-  },
-
-  /**
-   * Calculate what percentage of all samples the given number of samples is.
-   */
-  _getPercentage: function(samples) {
-    return samples / this.root.frame.samples * 100;
-  },
-
-  /**
-   * Populates this node in the call tree with the corresponding "callees".
-   * These are defined in the `frame` data source for this call view.
-   * @param array:AbstractTreeItem children
-   */
-  _populateSelf: function(children) {
-    let newLevel = this.level + 1;
-
-    for (let newFrame of this.frame.calls) {
-      children.push(new CallView({
-        caller: this,
-        frame: newFrame,
-        level: newLevel,
-        inverted: this.inverted
-      }));
-    }
-
-    // Sort the "callees" asc. by samples, before inserting them in the tree,
-    // if no other sorting predicate was specified on this on the root item.
-    children.sort(this.sortingPredicate);
-  },
-
-  /**
-   * Functions creating each cell in this call view.
-   * Invoked by `_displaySelf`.
-   */
-  _createTimeCell: function(duration, isSelf = false) {
-    let cell = this.document.createElement("label");
-    cell.className = "plain call-tree-cell";
-    cell.setAttribute("type", isSelf ? "self-duration" : "duration");
-    cell.setAttribute("crop", "end");
-    cell.setAttribute("value", L10N.numberWithDecimals(duration, 2) + " " + MILLISECOND_UNITS);
-    return cell;
-  },
-  _createExecutionCell: function(percentage, isSelf = false) {
-    let cell = this.document.createElement("label");
-    cell.className = "plain call-tree-cell";
-    cell.setAttribute("type", isSelf ? "self-percentage" : "percentage");
-    cell.setAttribute("crop", "end");
-    cell.setAttribute("value", L10N.numberWithDecimals(percentage, 2) + PERCENTAGE_UNITS);
-    return cell;
-  },
-  _createAllocationsCell: function(count, isSelf = false) {
-    let cell = this.document.createElement("label");
-    cell.className = "plain call-tree-cell";
-    cell.setAttribute("type", isSelf ? "self-allocations" : "allocations");
-    cell.setAttribute("crop", "end");
-    cell.setAttribute("value", count || 0);
-    return cell;
-  },
-  _createSamplesCell: function(count) {
-    let cell = this.document.createElement("label");
-    cell.className = "plain call-tree-cell";
-    cell.setAttribute("type", "samples");
-    cell.setAttribute("crop", "end");
-    cell.setAttribute("value", count || "");
-    return cell;
-  },
-  _createFunctionCell: function(arrowNode, frameInfo, frameLevel) {
-    let cell = this.document.createElement("hbox");
-    cell.className = "call-tree-cell";
-    cell.style.MozMarginStart = (frameLevel * CALL_TREE_INDENTATION) + "px";
-    cell.setAttribute("type", "function");
-    cell.appendChild(arrowNode);
-
-    let nameNode = this.document.createElement("label");
-    nameNode.className = "plain call-tree-name";
-    nameNode.setAttribute("flex", "1");
-    nameNode.setAttribute("crop", "end");
-    nameNode.setAttribute("value", frameInfo.isMetaCategory
-                                     ? frameInfo.categoryData.label
-                                     : frameInfo.functionName || "");
-    cell.appendChild(nameNode);
-
-    // Don't render detailed labels for meta category frames
-    if (!frameInfo.isMetaCategory) {
-      let urlNode = this.document.createElement("label");
-      urlNode.className = "plain call-tree-url";
-      urlNode.setAttribute("flex", "1");
-      urlNode.setAttribute("crop", "end");
-      urlNode.setAttribute("value", frameInfo.fileName || "");
-      urlNode.setAttribute("tooltiptext", URL_LABEL_TOOLTIP + " → " + frameInfo.url);
-      urlNode.addEventListener("mousedown", this._onUrlClick);
-      cell.appendChild(urlNode);
-
-      let lineNode = this.document.createElement("label");
-      lineNode.className = "plain call-tree-line";
-      lineNode.setAttribute("value", frameInfo.line ? ":" + frameInfo.line : "");
-      cell.appendChild(lineNode);
-
-      let columnNode = this.document.createElement("label");
-      columnNode.className = "plain call-tree-column";
-      columnNode.setAttribute("value", frameInfo.column ? ":" + frameInfo.column : "");
-      cell.appendChild(columnNode);
-
-      let hostNode = this.document.createElement("label");
-      hostNode.className = "plain call-tree-host";
-      hostNode.setAttribute("value", frameInfo.host || "");
-      cell.appendChild(hostNode);
-
-      let spacerNode = this.document.createElement("spacer");
-      spacerNode.setAttribute("flex", "10000");
-      cell.appendChild(spacerNode);
-
-      let categoryNode = this.document.createElement("label");
-      categoryNode.className = "plain call-tree-category";
-      categoryNode.style.color = frameInfo.categoryData.color;
-      categoryNode.setAttribute("value", frameInfo.categoryData.label || "");
-      cell.appendChild(categoryNode);
-    }
-
-    let hasDescendants = Object.keys(this.frame.calls).length > 0;
-    if (hasDescendants == false) {
-      arrowNode.setAttribute("invisible", "");
-    }
-
-    return cell;
-  },
-
-  /**
-   * Toggles the category information hidden or visible.
-   * @param boolean visible
-   */
-  toggleCategories: function(visible) {
-    if (!visible) {
-      this.container.setAttribute("categories-hidden", "");
-    } else {
-      this.container.removeAttribute("categories-hidden");
-    }
-  },
-
-  /**
-   * Handler for the "click" event on the url node of this call view.
-   */
-  _onUrlClick: function(e) {
-    e.preventDefault();
-    e.stopPropagation();
-    this.root.emit("link", this);
-  }
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/source-utils.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/source-utils.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/source-utils.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/source-utils.js	2015-05-25 20:42:56.000000000 +0000
@@ -123,6 +123,15 @@
  * @return {Promise}
  */
 exports.viewSource = Task.async(function *(toolbox, sourceURL, sourceLine) {
+  // Attempt to access view source via a browser first, which may display it in
+  // a tab, if enabled.
+  let browserWin = Services.wm.getMostRecentWindow("navigator:browser");
+  if (browserWin) {
+    return browserWin.BrowserViewSourceOfDocument({
+      URL: sourceURL,
+      lineNumber: sourceLine
+    });
+  }
   let utils = toolbox.gViewSourceUtils;
   utils.viewSource(sourceURL, null, toolbox.doc, sourceLine || 0);
 });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_css_color.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_css_color.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_css_color.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_css_color.js	2015-05-25 20:42:56.000000000 +0000
@@ -42,7 +42,6 @@
     testColorMatch(name, hex, hsl, rgb, color.rgba, canvas);
   }
 
-  testProcessCSSString();
   testSetAlpha();
 }
 
@@ -106,20 +105,6 @@
   test(rgb, "rgb");
 }
 
-function testProcessCSSString() {
-  let before = "border: 1px solid red; border-radius: 5px; " +
-               "color rgb(0, 255, 0); font-weight: bold; " +
-               "background-color: transparent; " +
-               "border-top-color: rgba(0, 0, 255, 0.5);";
-  let expected = "border: 1px solid #F00; border-radius: 5px; " +
-                 "color #0F0; font-weight: bold; " +
-                 "background-color: transparent; " +
-                 "border-top-color: rgba(0, 0, 255, 0.5);";
-  let after = colorUtils.processCSSString(before);
-
-  is(after, expected, "CSS string processed correctly");
-}
-
 function testSetAlpha() {
   let values = [
     ["longhex", "#ff0000", 0.5, "rgba(255, 0, 0, 0.5)"],
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_cubic-bezier-03.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_cubic-bezier-03.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_cubic-bezier-03.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_cubic-bezier-03.js	2015-05-25 20:42:56.000000000 +0000
@@ -58,12 +58,12 @@
 
   info("Setting a custom cubic-bezier css value");
   onUpdated = widget.once("updated");
-  widget.cssCubicBezierValue = "cubic-bezier(.25,-0.5, 1, 1.45)";
+  widget.cssCubicBezierValue = "cubic-bezier(.25,-0.5, 1, 1.25)";
   bezier = yield onUpdated;
   ok(true, "The updated event was fired as a result of setting cssValue");
 
   is(bezier.P1[0], .25, "The new P1 time coordinate is correct");
   is(bezier.P1[1], -.5, "The new P1 progress coordinate is correct");
   is(bezier.P2[0], 1, "The new P2 time coordinate is correct");
-  is(bezier.P2[1], 1.45, "The new P2 progress coordinate is correct");
+  is(bezier.P2[1], 1.25, "The new P2 progress coordinate is correct");
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_devtools-worker-01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_devtools-worker-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_devtools-worker-01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_devtools-worker-01.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Tests that the devtools/shared/worker communicates properly
-// as both CommonJS module and as a JSM.
-
-const WORKER_URL = "resource:///modules/devtools/GraphsWorker.js";
-
-const count = 100000;
-const WORKER_DATA = (function () {
-  let timestamps = [];
-  for (let i = 0; i < count; i++) {
-    timestamps.push(i);
-  }
-  return timestamps;
-})();
-const INTERVAL = 100;
-const DURATION = 1000;
-
-add_task(function*() {
-  // Test both CJS and JSM versions
-  yield testWorker("JSM", () => Cu.import("resource:///modules/devtools/shared/worker.js", {}));
-  yield testWorker("CommonJS", () => devtools.require("devtools/shared/worker"));
-});
-
-function *testWorker (context, workerFactory) {
-  let { DevToolsWorker, workerify } = workerFactory();
-  let worker = new DevToolsWorker(WORKER_URL);
-  let results = yield worker.performTask("plotTimestampsGraph", {
-    timestamps: WORKER_DATA,
-    interval: INTERVAL,
-    duration: DURATION
-  });
-
-  ok(results.plottedData.length,
-    `worker should have returned an object with array properties in ${context}`);
-  
-  let fn = workerify(function (x) { return x * x });
-  is((yield fn(5)), 25, `workerify works in ${context}`);
-  fn.destroy();
-
-
-  worker.destroy();
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_devtools-worker-02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_devtools-worker-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_devtools-worker-02.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_devtools-worker-02.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Tests errors are handled properly by the DevToolsWorker.
-
-const { DevToolsWorker } = devtools.require("devtools/shared/worker");
-const WORKER_URL = "resource:///modules/devtools/GraphsWorker.js";
-
-add_task(function*() {
-  try {
-    let workerNotFound = new DevToolsWorker("resource://i/dont/exist.js");
-    ok(false, "Creating a DevToolsWorker with an invalid URL throws");
-  } catch (e) {
-    ok(true, "Creating a DevToolsWorker with an invalid URL throws");
-  }
-
-  let worker = new DevToolsWorker(WORKER_URL);
-  try {
-    // plotTimestampsGraph requires timestamp, interval an duration props on the object
-    // passed in so there should be an error thrown in the worker
-    let results = yield worker.performTask("plotTimestampsGraph", {});
-    ok(false, "DevToolsWorker returns a rejected promise when an error occurs in the worker");
-  } catch (e) {
-    ok(true, "DevToolsWorker returns a rejected promise when an error occurs in the worker");
-  }
-
-  try {
-    let results = yield worker.performTask("not a real task");
-    ok(false, "DevToolsWorker returns a rejected promise when task does not exist");
-  } catch (e) {
-    ok(true, "DevToolsWorker returns a rejected promise when task does not exist");
-  }
-
-  worker.destroy();
-  try {
-    let results = yield worker.performTask("plotTimestampsGraph", {
-      timestamps: [0,1,2,3,4,5,6,7,8,9],
-      interval: 1,
-      duration: 1
-    });
-    ok(false, "DevToolsWorker rejects when performing a task on a destroyed worker");
-  } catch (e) {
-    ok(true, "DevToolsWorker rejects when performing a task on a destroyed worker");
-  };
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_devtools-worker-03.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_devtools-worker-03.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_devtools-worker-03.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_devtools-worker-03.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Tests that the devtools/shared/worker can handle:
-// returned primitives (or promise or Error)
-//
-// And tests `workerify` by doing so.
-
-const { DevToolsWorker, workerify } = devtools.require("devtools/shared/worker");
-function square (x) {
-  return x * x;
-}
-
-function squarePromise (x) {
-  return new Promise((resolve) => resolve(x*x));
-}
-
-function squareError (x) {
-  return new Error("Nope");
-}
-
-function squarePromiseReject (x) {
-  return new Promise((_, reject) => reject("Nope"));
-}
-
-add_task(function*() {
-  let fn = workerify(square);
-  is((yield fn(5)), 25, "return primitives successful");
-  fn.destroy();
-
-  fn = workerify(squarePromise);
-  is((yield fn(5)), 25, "promise primitives successful");
-  fn.destroy();
-
-  fn = workerify(squareError);
-  try {
-    yield fn(5);
-    ok(false, "return error should reject");
-  } catch (e) {
-    ok(true, "return error should reject");
-  }
-  fn.destroy();
-
-  fn = workerify(squarePromiseReject);
-  try {
-    yield fn(5);
-    ok(false, "returned rejected promise rejects");
-  } catch (e) {
-    ok(true, "returned rejected promise rejects");
-  }
-  fn.destroy();
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_filter-editor-01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_filter-editor-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_filter-editor-01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_filter-editor-01.js	2015-05-25 20:42:56.000000000 +0000
@@ -29,7 +29,7 @@
   widget.setCssValue("drop-shadow( 2px  1px 5px black) url( example.svg#filter )");
 
   const computedURI = "chrome://browser/content/devtools/example.svg#filter";
-  const expected = `drop-shadow(rgb(0, 0, 0) 2px 1px 5px) url("${computedURI}")`;
+  const expected = `drop-shadow(rgb(0, 0, 0) 2px 1px 5px) url(${computedURI})`;
   is(widget.getCssValue(), expected,
      "setCssValue should work for string-typed values");
 });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_filter-editor-02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_filter-editor-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_filter-editor-02.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_filter-editor-02.js	2015-05-25 20:42:56.000000000 +0000
@@ -47,7 +47,7 @@
       expected: [
         {
           label: "url",
-          value: "\"chrome://browser/content/devtools/example.svg\"",
+          value: "chrome://browser/content/devtools/example.svg",
           unit: null
         }
       ]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_filter-editor-05.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_filter-editor-05.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_filter-editor-05.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_filter-editor-05.js	2015-05-25 20:42:56.000000000 +0000
@@ -127,6 +127,6 @@
     shiftKey: true
   });
 
-  is(widget.getValueAt(1), "\"chrome://browser/content/devtools/test.svg\"",
+  is(widget.getValueAt(1), "chrome://browser/content/devtools/test.svg",
      "Label-dragging on string-type filters shouldn't affect their value");
 });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_flame-graph-04.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_flame-graph-04.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_flame-graph-04.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_flame-graph-04.js	2015-05-25 20:42:56.000000000 +0000
@@ -4,10 +4,10 @@
 // Tests that text metrics in the flame graph widget work properly.
 
 let HTML_NS = "http://www.w3.org/1999/xhtml";
-let FLAME_GRAPH_BLOCK_TEXT_FONT_SIZE = 9; // px
-let FLAME_GRAPH_BLOCK_TEXT_FONT_FAMILY = "sans-serif";
 let {ViewHelpers} = Cu.import("resource:///modules/devtools/ViewHelpers.jsm", {});
 let {FlameGraph} = devtools.require("devtools/shared/widgets/FlameGraph");
+let {FLAME_GRAPH_BLOCK_TEXT_FONT_SIZE} = devtools.require("devtools/shared/widgets/FlameGraph");
+let {FLAME_GRAPH_BLOCK_TEXT_FONT_FAMILY} = devtools.require("devtools/shared/widgets/FlameGraph");
 let {Promise} = devtools.require("resource://gre/modules/Promise.jsm");
 
 let L10N = new ViewHelpers.L10N();
@@ -58,8 +58,8 @@
   ok(text50px.includes(L10N.ellipsis),
     "The fitted text for 50px width is correct (2).");
 
-  is(graph._getFittedText(text, 10), L10N.ellipsis,
-    "The fitted text for 10px width is correct.");
+  is(graph._getFittedText(text, FLAME_GRAPH_BLOCK_TEXT_FONT_SIZE + 1), L10N.ellipsis,
+    "The fitted text for text font size width is correct.");
 
   is(graph._getFittedText(text, 1), "",
     "The fitted text for 1px width is correct.");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_flame-graph-utils-01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_flame-graph-utils-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_flame-graph-utils-01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_flame-graph-utils-01.js	2015-05-25 20:42:56.000000000 +0000
@@ -4,8 +4,8 @@
 // Tests that text metrics and data conversion from profiler samples
 // widget work properly in the flame graph.
 
-let {FlameGraphUtils, FLAME_GRAPH_BLOCK_HEIGHT} = devtools.require("devtools/shared/widgets/FlameGraph");
-let { DevToolsUtils } = Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm", {});
+let {FlameGraphUtils} = devtools.require("devtools/shared/widgets/FlameGraph");
+let {PALLETTE_SIZE} = devtools.require("devtools/shared/widgets/FlameGraph");
 
 add_task(function*() {
   yield promiseTab("about:blank");
@@ -17,7 +17,7 @@
   let out = FlameGraphUtils.createFlameGraphDataFromThread(TEST_DATA);
 
   ok(out, "Some data was outputted properly");
-  is(out.length, 10, "The outputted length is correct.");
+  is(out.length, PALLETTE_SIZE, "The outputted length is correct.");
 
   info("Got flame graph data:\n" + out.toSource() + "\n");
 
@@ -105,158 +105,150 @@
   blocks: []
 }, {
   blocks: [{
-    srcData: {
-      startTime: 50,
-      rawLocation: "A"
-    },
+    startTime: 50,
+    frameKey: "A",
     x: 50,
     y: 0,
     width: 410,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
+    height: 15,
     text: "A"
   }]
 }, {
   blocks: [{
-    srcData: {
-      startTime: 50,
-      rawLocation: "B"
-    },
+    startTime: 50,
+    frameKey: "B",
     x: 50,
-    y: FLAME_GRAPH_BLOCK_HEIGHT,
+    y: 15,
     width: 160,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
+    height: 15,
     text: "B"
   }, {
-    srcData: {
-      startTime: 330,
-      rawLocation: "B"
-    },
+    startTime: 330,
+    frameKey: "B",
     x: 330,
-    y: FLAME_GRAPH_BLOCK_HEIGHT,
+    y: 15,
     width: 130,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
+    height: 15,
     text: "B"
   }]
 }, {
   blocks: [{
-    srcData: {
-      startTime: 0,
-      rawLocation: "M"
-    },
-    x: 0,
-    y: 0,
-    width: 50,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
-    text: "M"
-  }, {
-    srcData: {
-      startTime: 50,
-      rawLocation: "C"
-    },
+    startTime: 50,
+    frameKey: "C",
     x: 50,
-    y: FLAME_GRAPH_BLOCK_HEIGHT * 2,
+    y: 30,
     width: 50,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
+    height: 15,
     text: "C"
   }, {
-    srcData: {
-      startTime: 330,
-      rawLocation: "C"
-    },
+    startTime: 330,
+    frameKey: "C",
     x: 330,
-    y: FLAME_GRAPH_BLOCK_HEIGHT * 2,
+    y: 30,
     width: 130,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
+    height: 15,
     text: "C"
   }]
 }, {
   blocks: [{
-    srcData: {
-      startTime: 0,
-      rawLocation: "N"
-    },
-    x: 0,
-    y: FLAME_GRAPH_BLOCK_HEIGHT,
-    width: 50,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
-    text: "N"
-  }, {
-    srcData: {
-      startTime: 100,
-      rawLocation: "D"
-    },
+    startTime: 100,
+    frameKey: "D",
     x: 100,
-    y: FLAME_GRAPH_BLOCK_HEIGHT * 2,
+    y: 30,
     width: 110,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
+    height: 15,
     text: "D"
   }, {
-    srcData: {
-      startTime: 460,
-      rawLocation: "X"
-    },
+    startTime: 460,
+    frameKey: "X",
     x: 460,
     y: 0,
     width: 40,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
+    height: 15,
     text: "X"
   }]
 }, {
   blocks: [{
-    srcData: {
-      startTime: 210,
-      rawLocation: "E"
-    },
+    startTime: 210,
+    frameKey: "E",
     x: 210,
-    y: FLAME_GRAPH_BLOCK_HEIGHT,
+    y: 15,
     width: 120,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
+    height: 15,
     text: "E"
   }, {
-    srcData: {
-      startTime: 460,
-      rawLocation: "Y"
-    },
+    startTime: 460,
+    frameKey: "Y",
     x: 460,
-    y: FLAME_GRAPH_BLOCK_HEIGHT,
+    y: 15,
     width: 40,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
+    height: 15,
     text: "Y"
   }]
 }, {
   blocks: [{
-    srcData: {
-      startTime: 0,
-      rawLocation: "P"
-    },
-    x: 0,
-    y: FLAME_GRAPH_BLOCK_HEIGHT * 2,
-    width: 50,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
-    text: "P"
-  }, {
-    srcData: {
-      startTime: 210,
-      rawLocation: "F"
-    },
+    startTime: 210,
+    frameKey: "F",
     x: 210,
-    y: FLAME_GRAPH_BLOCK_HEIGHT * 2,
+    y: 30,
     width: 120,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
+    height: 15,
     text: "F"
   }, {
-    srcData: {
-      startTime: 460,
-      rawLocation: "Z"
-    },
+    startTime: 460,
+    frameKey: "Z",
     x: 460,
-    y: FLAME_GRAPH_BLOCK_HEIGHT * 2,
+    y: 30,
     width: 40,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
+    height: 15,
     text: "Z"
   }]
 }, {
   blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: [{
+    startTime: 0,
+    frameKey: "M",
+    x: 0,
+    y: 0,
+    width: 50,
+    height: 15,
+    text: "M"
+  }]
+}, {
+  blocks: [{
+    startTime: 0,
+    frameKey: "N",
+    x: 0,
+    y: 15,
+    width: 50,
+    height: 15,
+    text: "N"
+  }]
+}, {
+  blocks: []
+}, {
+  blocks: [{
+    startTime: 0,
+    frameKey: "P",
+    x: 0,
+    y: 30,
+    width: 50,
+    height: 15,
+    text: "P"
+  }]
+}, {
+  blocks: []
 }, {
   blocks: []
 }];
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_flame-graph-utils-02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_flame-graph-utils-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_flame-graph-utils-02.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_flame-graph-utils-02.js	2015-05-25 20:42:56.000000000 +0000
@@ -3,7 +3,8 @@
 
 // Tests consecutive duplicate frames are removed from the flame graph data.
 
-let {FlameGraphUtils, FLAME_GRAPH_BLOCK_HEIGHT} = devtools.require("devtools/shared/widgets/FlameGraph");
+let {FlameGraphUtils} = devtools.require("devtools/shared/widgets/FlameGraph");
+let {PALLETTE_SIZE} = devtools.require("devtools/shared/widgets/FlameGraph");
 
 add_task(function*() {
   yield promiseTab("about:blank");
@@ -17,7 +18,7 @@
   });
 
   ok(out, "Some data was outputted properly");
-  is(out.length, 10, "The outputted length is correct.");
+  is(out.length, PALLETTE_SIZE, "The outputted length is correct.");
 
   info("Got flame graph data:\n" + out.toSource() + "\n");
 
@@ -66,43 +67,57 @@
   blocks: []
 }, {
   blocks: [{
-    srcData: {
-      startTime: 0,
-      rawLocation: "A"
-    },
+    startTime: 0,
+    frameKey: "A",
     x: 0,
     y: 0,
     width: 50,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
+    height: 15,
     text: "A"
   }]
 }, {
   blocks: [{
-    srcData: {
-      startTime: 0,
-      rawLocation: "B"
-    },
+    startTime: 0,
+    frameKey: "B",
     x: 0,
-    y: FLAME_GRAPH_BLOCK_HEIGHT,
+    y: 15,
     width: 50,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
+    height: 15,
     text: "B"
   }]
 }, {
   blocks: [{
-    srcData: {
-      startTime: 0,
-      rawLocation: "C"
-    },
+    startTime: 0,
+    frameKey: "C",
     x: 0,
-    y: FLAME_GRAPH_BLOCK_HEIGHT * 2,
+    y: 30,
     width: 50,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
+    height: 15,
     text: "C"
   }]
 }, {
   blocks: []
 }, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
   blocks: []
 }, {
   blocks: []
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_flame-graph-utils-03.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_flame-graph-utils-03.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_flame-graph-utils-03.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_flame-graph-utils-03.js	2015-05-25 20:42:56.000000000 +0000
@@ -3,8 +3,9 @@
 
 // Tests if platform frames are removed from the flame graph data.
 
-let {FlameGraphUtils, FLAME_GRAPH_BLOCK_HEIGHT} = devtools.require("devtools/shared/widgets/FlameGraph");
-let {FrameNode} = devtools.require("devtools/shared/profiler/tree-model");
+let {FlameGraphUtils} = devtools.require("devtools/shared/widgets/FlameGraph");
+let {PALLETTE_SIZE} = devtools.require("devtools/shared/widgets/FlameGraph");
+let {FrameNode} = devtools.require("devtools/performance/tree-model");
 
 add_task(function*() {
   yield promiseTab("about:blank");
@@ -18,12 +19,10 @@
   });
 
   ok(out, "Some data was outputted properly");
-  is(out.length, 10, "The outputted length is correct.");
+  is(out.length, PALLETTE_SIZE, "The outputted length is correct.");
 
   info("Got flame graph data:\n" + out.toSource() + "\n");
 
-  dump(JSON.stringify(out, undefined, 2));
-
   for (let i = 0; i < out.length; i++) {
     let found = out[i];
     let expected = EXPECTED_OUTPUT[i];
@@ -61,31 +60,20 @@
   time: 50,
 }]);
 
+
 let EXPECTED_OUTPUT = [{
   blocks: []
 }, {
   blocks: []
 }, {
   blocks: [{
-    srcData: {
-      startTime: 0,
-      rawLocation: "http://A"
-    },
+    startTime: 0,
+    frameKey: "http://A",
     x: 0,
     y: 0,
     width: 50,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
+    height: 15,
     text: "http://A"
-  }, {
-    srcData: {
-      startTime: 0,
-      rawLocation: "file://C"
-    },
-    x: 0,
-    y: FLAME_GRAPH_BLOCK_HEIGHT * 2,
-    width: 50,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
-    text: "file://C"
   }]
 }, {
   blocks: []
@@ -95,30 +83,54 @@
   blocks: []
 }, {
   blocks: [{
-    srcData: {
-      startTime: 0,
-      rawLocation: "Gecko"
-    },
+    startTime: 0,
+    frameKey: "Gecko",
     x: 0,
-    y: FLAME_GRAPH_BLOCK_HEIGHT * 3,
+    y: 45,
     width: 50,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
+    height: 15,
     text: "Gecko"
   }]
 }, {
   blocks: []
 }, {
   blocks: [{
-    srcData: {
-      startTime: 0,
-      rawLocation: "https://B"
-    },
+    startTime: 0,
+    frameKey: "https://B",
     x: 0,
-    y: FLAME_GRAPH_BLOCK_HEIGHT,
+    y: 15,
     width: 50,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
+    height: 15,
     text: "https://B"
   }]
 }, {
   blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: [{
+    startTime: 0,
+    frameKey: "file://C",
+    x: 0,
+    y: 30,
+    width: 50,
+    height: 15,
+    text: "file://C"
+  }]
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
 }];
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_flame-graph-utils-04.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_flame-graph-utils-04.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_flame-graph-utils-04.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_flame-graph-utils-04.js	2015-05-25 20:42:56.000000000 +0000
@@ -3,8 +3,9 @@
 
 // Tests if (idle) nodes are added when necessary in the flame graph data.
 
-let {FlameGraphUtils, FLAME_GRAPH_BLOCK_HEIGHT} = devtools.require("devtools/shared/widgets/FlameGraph");
-let {FrameNode} = devtools.require("devtools/shared/profiler/tree-model");
+let {FlameGraphUtils} = devtools.require("devtools/shared/widgets/FlameGraph");
+let {PALLETTE_SIZE} = devtools.require("devtools/shared/widgets/FlameGraph");
+let {FrameNode} = devtools.require("devtools/performance/tree-model");
 
 add_task(function*() {
   yield promiseTab("about:blank");
@@ -20,7 +21,7 @@
   });
 
   ok(out, "Some data was outputted properly");
-  is(out.length, 10, "The outputted length is correct.");
+  is(out.length, PALLETTE_SIZE, "The outputted length is correct.");
 
   info("Got flame graph data:\n" + out.toSource() + "\n");
 
@@ -85,98 +86,102 @@
   blocks: []
 }, {
   blocks: [{
-    srcData: {
-      startTime: 0,
-      rawLocation: "http://A"
-    },
+    startTime: 0,
+    frameKey: "http://A",
     x: 0,
     y: 0,
     width: 50,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
+    height: 15,
     text: "http://A"
   }, {
-    srcData: {
-      startTime: 0,
-      rawLocation: "file://C"
-    },
-    x: 0,
-    y: FLAME_GRAPH_BLOCK_HEIGHT * 2,
-    width: 50,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
-    text: "file://C"
-  }, {
-    srcData: {
-      startTime: 100,
-      rawLocation: "http://A"
-    },
+    startTime: 100,
+    frameKey: "http://A",
     x: 100,
     y: 0,
     width: 50,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
+    height: 15,
     text: "http://A"
-  }, {
-    srcData: {
-      startTime: 0,
-      rawLocation: "file://C"
-    },
-    x: 100,
-    y: FLAME_GRAPH_BLOCK_HEIGHT * 2,
-    width: 50,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
-    text: "file://C"
   }]
 }, {
-  blocks: [{
-    srcData: {
-      startTime: 50,
-      rawLocation: "\m/"
-    },
-    x: 50,
-    y: 0,
-    width: 50,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
-    text: "\m/"
-  }]
+  blocks: []
 }, {
   blocks: []
 }, {
   blocks: []
 }, {
   blocks: [{
-    srcData: {
-      startTime: 0,
-      rawLocation: "Gecko"
-    },
+    startTime: 0,
+    frameKey: "Gecko",
     x: 0,
-    y: FLAME_GRAPH_BLOCK_HEIGHT * 3,
+    y: 45,
     width: 50,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
+    height: 15,
     text: "Gecko"
   }]
 }, {
   blocks: []
 }, {
   blocks: [{
-    srcData: {
-      startTime: 0,
-      rawLocation: "https://B"
-    },
+    startTime: 0,
+    frameKey: "https://B",
     x: 0,
-    y: FLAME_GRAPH_BLOCK_HEIGHT,
+    y: 15,
     width: 50,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
+    height: 15,
     text: "https://B"
   }, {
-    srcData: {
-      startTime: 100,
-      rawLocation: "https://B"
-    },
+    startTime: 100,
+    frameKey: "https://B",
     x: 100,
-    y: FLAME_GRAPH_BLOCK_HEIGHT,
+    y: 15,
     width: 50,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
+    height: 15,
     text: "https://B"
   }]
 }, {
   blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: [{
+    startTime: 0,
+    frameKey: "file://C",
+    x: 0,
+    y: 30,
+    width: 50,
+    height: 15,
+    text: "file://C"
+  }, {
+    startTime: 100,
+    frameKey: "file://C",
+    x: 100,
+    y: 30,
+    width: 50,
+    height: 15,
+    text: "file://C"
+  }]
+}, {
+  blocks: [{
+    startTime: 50,
+    frameKey: "m/",
+    x: 50,
+    y: 0,
+    width: 50,
+    height: 15,
+    text: "m/"
+  }]
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
 }];
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_flame-graph-utils-06.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_flame-graph-utils-06.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_flame-graph-utils-06.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_flame-graph-utils-06.js	2015-05-25 20:42:56.000000000 +0000
@@ -4,7 +4,8 @@
 // Tests that the text displayed is the function name, file name and line number
 // if applicable.
 
-let {FlameGraphUtils, FLAME_GRAPH_BLOCK_HEIGHT} = devtools.require("devtools/shared/widgets/FlameGraph");
+let {FlameGraphUtils} = devtools.require("devtools/shared/widgets/FlameGraph");
+let {PALLETTE_SIZE} = devtools.require("devtools/shared/widgets/FlameGraph");
 
 add_task(function*() {
   yield promiseTab("about:blank");
@@ -18,7 +19,7 @@
   });
 
   ok(out, "Some data was outputted properly");
-  is(out.length, 10, "The outputted length is correct.");
+  is(out.length, PALLETTE_SIZE, "The outputted length is correct.");
 
   info("Got flame graph data:\n" + out.toSource() + "\n");
 
@@ -63,26 +64,42 @@
   blocks: []
 }, {
   blocks: [{
-    srcData: {
-      startTime: 0,
-      rawLocation: "A (http://path/to/file.js:10:5)"
-    },
+    startTime: 0,
+    frameKey: "A (http://path/to/file.js:10:5",
     x: 0,
     y: 0,
     width: 50,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
+    height: 15,
     text: "A (file.js:10)"
   }]
 }, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
+  blocks: []
+}, {
   blocks: [{
-    srcData: {
-      startTime: 0,
-      rawLocation: "B (http://path/to/file.js:100:5)"
-    },
+    startTime: 0,
+    frameKey: "B (http://path/to/file.js:100:5",
     x: 0,
-    y: FLAME_GRAPH_BLOCK_HEIGHT,
+    y: 15,
     width: 50,
-    height: FLAME_GRAPH_BLOCK_HEIGHT,
+    height: 15,
     text: "B (file.js:100)"
   }]
 }, {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_graphs-07d.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_graphs-07d.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_graphs-07d.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_graphs-07d.js	2015-05-25 20:42:56.000000000 +0000
@@ -0,0 +1,49 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Tests that selections are drawn onto the canvas.
+
+const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }];
+const TEST_REGIONS = [{ start: 320, end: 460 }, { start: 780, end: 860 }];
+let {LineGraphWidget} = Cu.import("resource:///modules/devtools/Graphs.jsm", {});
+let {Promise} = devtools.require("resource://gre/modules/Promise.jsm");
+
+add_task(function*() {
+  yield promiseTab("about:blank");
+  yield performTest();
+  gBrowser.removeCurrentTab();
+});
+
+function* performTest() {
+  let [host, win, doc] = yield createHost();
+  let graph = new LineGraphWidget(doc.body, "fps");
+  yield graph.once("ready");
+
+  testGraph(graph);
+
+  yield graph.destroy();
+  host.destroy();
+}
+
+function testGraph(graph) {
+  graph.setData(TEST_DATA);
+  graph.setRegions(TEST_REGIONS);
+
+  // Measure the color of the first pixel before any selection is made.
+  graph._onAnimationFrame();
+  let pixelNoSelection = graph._ctx.getImageData(1, 1, 1, 1).data;
+
+  graph.setSelection({ start: 0, end: 10 });
+  graph._onAnimationFrame();
+  let pixelNormalSelection = graph._ctx.getImageData(1, 1, 1, 1).data;
+
+  Assert.notDeepEqual(pixelNormalSelection, pixelNoSelection,
+    "The first pixel is part of the drawn selection.");
+
+  graph.setSelection({ start: graph.width + 100, end: -100 });
+  graph._onAnimationFrame();
+  let pixelFullSelection = graph._ctx.getImageData(1, 1, 1, 1).data;
+
+  Assert.deepEqual(pixelFullSelection, pixelNormalSelection,
+    "The first pixel is still part of the drawn selection.");
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser.ini firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser.ini	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser.ini	2015-05-25 20:42:56.000000000 +0000
@@ -24,9 +24,6 @@
 [browser_cubic-bezier-04.js]
 [browser_cubic-bezier-05.js]
 [browser_cubic-bezier-06.js]
-[browser_devtools-worker-01.js]
-[browser_devtools-worker-02.js]
-[browser_devtools-worker-03.js]
 [browser_filter-editor-01.js]
 [browser_filter-editor-02.js]
 [browser_filter-editor-03.js]
@@ -59,6 +56,7 @@
 [browser_graphs-07a.js]
 [browser_graphs-07b.js]
 [browser_graphs-07c.js]
+[browser_graphs-07d.js]
 [browser_graphs-08.js]
 [browser_graphs-09a.js]
 [browser_graphs-09b.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_inplace-editor-01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_inplace-editor-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/browser_inplace-editor-01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/browser_inplace-editor-01.js	2015-05-25 20:42:56.000000000 +0000
@@ -17,6 +17,7 @@
   yield testReturnCommit(doc);
   yield testBlurCommit(doc);
   yield testAdvanceCharCommit(doc);
+  yield testAdvanceCharsFunction(doc);
 
   host.destroy();
   gBrowser.removeCurrentTab();
@@ -81,11 +82,40 @@
     advanceChars: ":",
     start: function(editor) {
       let input = editor.input;
-      for each (let ch in "Test:") {
+      EventUtils.sendString("Test:");
+    },
+    done: onDone("Test", true, def)
+  }, doc);
+
+  return def.promise;
+}
+
+function testAdvanceCharsFunction(doc) {
+  info("Testing advanceChars as a function");
+  let def = promise.defer();
+
+  let firstTime = true;
+
+  createInplaceEditorAndClick({
+    initial: "",
+    advanceChars: function(aCharCode, aText, aInsertionPoint) {
+      if (aCharCode !== Components.interfaces.nsIDOMKeyEvent.DOM_VK_COLON) {
+        return false;
+      }
+      if (firstTime) {
+        firstTime = false;
+        return false;
+      }
+
+      // Just to make sure we check it somehow.
+      return aText.length > 0;
+    },
+    start: function(editor) {
+      for (let ch of ":Test:") {
         EventUtils.sendChar(ch);
       }
     },
-    done: onDone("Test", true, def)
+    done: onDone(":Test", true, def)
   }, doc);
 
   return def.promise;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/head.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/head.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/head.js	2015-05-25 20:42:56.000000000 +0000
@@ -44,7 +44,7 @@
     addTab(aURL, resolve));
 }
 
-registerCleanupFunction(function tearDown() {
+registerCleanupFunction(function* tearDown() {
   let target = TargetFactory.forTab(gBrowser.selectedTab);
   yield gDevTools.closeToolbox(target);
 
@@ -126,7 +126,9 @@
       successFn(aOptions, lastValue);
     }
     else {
-      setTimeout(function() wait(validatorFn, successFn, failureFn), 100);
+      setTimeout(() => {
+        wait(validatorFn, successFn, failureFn);
+      }, 100);
     }
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/unit/test_advanceValidate.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/unit/test_advanceValidate.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/unit/test_advanceValidate.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/unit/test_advanceValidate.js	2015-05-25 20:42:56.000000000 +0000
@@ -0,0 +1,33 @@
+/* -*- Mode: Javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Tests the advanceValidate function from rule-view.js.
+
+const Cu = Components.utils;
+const Ci = Components.interfaces;
+let {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+let require = devtools.require;
+let {_advanceValidate} = require("devtools/styleinspector/rule-view");
+
+//                            1         2         3
+//                  0123456789012345678901234567890
+let sampleInput = '\\symbol "string" url(somewhere)';
+
+function testInsertion(where, result, testName) {
+  do_print(testName);
+  equal(_advanceValidate(Ci.nsIDOMKeyEvent.DOM_VK_SEMICOLON, sampleInput, where),
+        result, "testing _advanceValidate at " + where);
+}
+
+function run_test() {
+  testInsertion(4, true, "inside a symbol");
+  testInsertion(1, false, "after a backslash");
+  testInsertion(8, true, "after whitespace");
+  testInsertion(11, false, "inside a string");
+  testInsertion(24, false, "inside a URL");
+  testInsertion(31, true, "at the end");
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/unit/test_cubicBezier.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/unit/test_cubicBezier.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/unit/test_cubicBezier.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/unit/test_cubicBezier.js	2015-05-25 20:42:56.000000000 +0000
@@ -10,7 +10,7 @@
 const Cu = Components.utils;
 let {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 let require = devtools.require;
-let {CubicBezier} = require("devtools/shared/widgets/CubicBezierWidget");
+let {CubicBezier, _parseTimingFunction} = require("devtools/shared/widgets/CubicBezierWidget");
 
 function run_test() {
   throwsWhenMissingCoordinates();
@@ -20,6 +20,7 @@
   pointGettersReturnPointCoordinatesArrays();
   toStringOutputsCubicBezierValue();
   toStringOutputsCssPresetValues();
+  testParseTimingFunction();
 }
 
 function throwsWhenMissingCoordinates() {
@@ -108,6 +109,30 @@
   do_check_eq(c.toString(), "ease-in-out");
 }
 
+function testParseTimingFunction() {
+  do_print("test parseTimingFunction");
+
+  for (let test of ["ease", "linear", "ease-in", "ease-out", "ease-in-out"]) {
+    ok(_parseTimingFunction(test), test);
+  }
+
+  ok(!_parseTimingFunction("something"), "non-function token");
+  ok(!_parseTimingFunction("something()"), "non-cubic-bezier function");
+  ok(!_parseTimingFunction("cubic-bezier(something)",
+                           "cubic-bezier with non-numeric argument"));
+  ok(!_parseTimingFunction("cubic-bezier(1,2,3:7)",
+                           "did not see comma"));
+  ok(!_parseTimingFunction("cubic-bezier(1,2,3,7:",
+                           "did not see close paren"));
+  ok(!_parseTimingFunction("cubic-bezier(1,2", "early EOF after number"));
+  ok(!_parseTimingFunction("cubic-bezier(1,2,", "early EOF after comma"));
+  deepEqual(_parseTimingFunction("cubic-bezier(1,2,3,7)"), [1,2,3,7],
+            "correct invocation");
+  deepEqual(_parseTimingFunction("cubic-bezier(1,  /* */ 2,3,   7  )"),
+            [1,2,3,7],
+            "correct with comments and whitespace");
+}
+
 function do_check_throws(cb, info) {
   do_print(info);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/unit/xpcshell.ini firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/unit/xpcshell.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/test/unit/xpcshell.ini	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/test/unit/xpcshell.ini	2015-05-25 20:42:56.000000000 +0000
@@ -5,6 +5,7 @@
 firefox-appdir = browser
 skip-if = toolkit == 'android' || toolkit == 'gonk'
 
+[test_advanceValidate.js]
 [test_attribute-parsing-01.js]
 [test_attribute-parsing-02.js]
 [test_bezierCanvas.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/theme.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/theme.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/theme.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/theme.js	2015-05-25 20:42:56.000000000 +0000
@@ -25,14 +25,10 @@
  * Returns a string of the file found at URI
  */
 function readURI (uri) {
-  let stream = NetUtil.newChannel2(uri,
-                                   "UTF-8",
-                                   null,
-                                   null,      // aLoadingNode
-                                   Services.scriptSecurityManager.getSystemPrincipal(),
-                                   null,      // aTriggeringPrincipal
-                                   Ci.nsILoadInfo.SEC_NORMAL,
-                                   Ci.nsIContentPolicy.TYPE_OTHER).open();
+  let stream = NetUtil.newChannel({
+    uri: NetUtil.newURI(uri, "UTF-8"),
+    loadUsingSystemPrincipal: true}
+  ).open();
 
   let count = stream.available();
   let data = NetUtil.readInputStreamToString(stream, count, { charset: "UTF-8" });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/timeline/global.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/timeline/global.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/timeline/global.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/timeline/global.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-const {Cc, Ci, Cu, Cr} = require("chrome");
-
-Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
-
-/**
- * Localization convenience methods.
- */
-const STRINGS_URI = "chrome://browser/locale/devtools/timeline.properties";
-const L10N = new ViewHelpers.L10N(STRINGS_URI);
-
-/**
- * A simple schema for mapping markers to the timeline UI. The keys correspond
- * to marker names, while the values are objects with the following format:
- *   - group: the row index in the timeline overview graph; multiple markers
- *            can be added on the same row. @see <overview.js/buildGraphImage>
- *   - label: the label used in the waterfall to identify the marker
- *   - colorName: the name of the DevTools color used for this marker. If adding
- *                a new color, be sure to check that there's an entry for
- *                `.marker-details-bullet.{COLORNAME}` for the equivilent entry
- *                in ./browser/themes/shared/devtools/performance.inc.css
- *                https://developer.mozilla.org/en-US/docs/Tools/DevToolsColors
- *
- * Whenever this is changed, browser_timeline_waterfall-styles.js *must* be
- * updated as well.
- */
-const TIMELINE_BLUEPRINT = {
-  "Styles": {
-    group: 0,
-    colorName: "highlight-pink",
-    label: L10N.getStr("timeline.label.styles2")
-  },
-  "Reflow": {
-    group: 0,
-    colorName: "highlight-pink",
-    label: L10N.getStr("timeline.label.reflow2")
-  },
-  "Paint": {
-    group: 0,
-    colorName: "highlight-green",
-    label: L10N.getStr("timeline.label.paint")
-  },
-  "DOMEvent": {
-    group: 1,
-    colorName: "highlight-lightorange",
-    label: L10N.getStr("timeline.label.domevent")
-  },
-  "Javascript": {
-    group: 1,
-    colorName: "highlight-lightorange",
-    label: L10N.getStr("timeline.label.javascript2")
-  },
-  "Parse HTML": {
-    group: 1,
-    colorName: "highlight-lightorange",
-    label: L10N.getStr("timeline.label.parseHTML")
-  },
-  "Parse XML": {
-    group: 1,
-    colorName: "highlight-lightorange",
-    label: L10N.getStr("timeline.label.parseXML")
-  },
-  "GarbageCollection": {
-    group: 1,
-    colorName: "highlight-red",
-    label: L10N.getStr("timeline.label.garbageCollection")
-  },
-  "ConsoleTime": {
-    group: 2,
-    colorName: "highlight-bluegrey",
-    label: L10N.getStr("timeline.label.consoleTime")
-  },
-  "TimeStamp": {
-    group: 2,
-    colorName: "highlight-purple",
-    label: L10N.getStr("timeline.label.timestamp")
-  },
-};
-
-// Exported symbols.
-exports.L10N = L10N;
-exports.TIMELINE_BLUEPRINT = TIMELINE_BLUEPRINT;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/timeline/marker-details.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/timeline/marker-details.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/timeline/marker-details.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/timeline/marker-details.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,307 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-let { Ci } = require("chrome");
-let WebConsoleUtils = require("devtools/toolkit/webconsole/utils").Utils;
-
-/**
- * This file contains the rendering code for the marker sidebar.
- */
-
-loader.lazyRequireGetter(this, "L10N",
-  "devtools/shared/timeline/global", true);
-loader.lazyRequireGetter(this, "TIMELINE_BLUEPRINT",
-  "devtools/shared/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.
- * @param nsIDOMNode splitter
- *        The splitter node that the resize event is bound to.
- */
-function MarkerDetails(parent, splitter) {
-  EventEmitter.decorate(this);
-  this._document = parent.ownerDocument;
-  this._parent = parent;
-  this._splitter = splitter;
-  this._splitter.addEventListener("mouseup", () => this.emit("resize"));
-}
-
-MarkerDetails.prototype = {
-  /**
-   * Removes any node references from this view.
-   */
-  destroy: function() {
-    this.empty();
-    this._parent = null;
-    this._splitter = 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 ${blueprint.colorName}`;
-
-    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 = "plain marker-details-labelname";
-    labelValue.className = "plain 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 params
-   *        An options object holding:
-   *        toolbox - The toolbox.
-   *        marker - The marker to display.
-   *        frames - Array of stack frame information; see stack.js.
-   */
-  render: function({toolbox: toolbox, marker: marker, frames: frames}) {
-    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;
-      case "Javascript":
-        this.renderJavascriptMarker(this._parent, marker);
-        break;
-      default:
-    }
-
-    if (marker.stack) {
-      let property = "timeline.markerDetail.stack";
-      if (marker.endStack) {
-        property = "timeline.markerDetail.startStack";
-      }
-      this.renderStackTrace({toolbox: toolbox, parent: this._parent, property: property,
-                             frameIndex: marker.stack, frames: frames});
-    }
-
-    if (marker.endStack) {
-      this.renderStackTrace({toolbox: toolbox, parent: this._parent, property: "timeline.markerDetail.endStack",
-                             frameIndex: marker.endStack, frames: frames});
-    }
-  },
-
-  /**
-   * Render a stack trace.
-   *
-   * @param object params
-   *        An options object with the following members:
-   *        object toolbox - The toolbox.
-   *        nsIDOMNode parent - The parent node holding the view.
-   *        string property - String identifier for label's name.
-   *        integer frameIndex - The index of the topmost stack frame.
-   *        array frames - Array of stack frames.
-   */
-  renderStackTrace: function({toolbox: toolbox, parent: parent,
-                              property: property, frameIndex: frameIndex,
-                              frames: frames}) {
-    let labelName = this._document.createElement("label");
-    labelName.className = "plain marker-details-labelname";
-    labelName.setAttribute("value", L10N.getStr(property));
-    parent.appendChild(labelName);
-
-    let wasAsyncParent = false;
-    while (frameIndex > 0) {
-      let frame = frames[frameIndex];
-      let url = frame.source;
-      let displayName = frame.functionDisplayName;
-      let line = frame.line;
-
-      // If the previous frame had an async parent, then the async
-      // cause is in this frame and should be displayed.
-      if (wasAsyncParent) {
-        let asyncBox = this._document.createElement("hbox");
-        let asyncLabel = this._document.createElement("label");
-        asyncLabel.className = "devtools-monospace";
-        asyncLabel.setAttribute("value", L10N.getFormatStr("timeline.markerDetail.asyncStack",
-                                                           frame.asyncCause));
-        asyncBox.appendChild(asyncLabel);
-        parent.appendChild(asyncBox);
-        wasAsyncParent = false;
-      }
-
-      let hbox = this._document.createElement("hbox");
-
-      if (displayName) {
-        let functionLabel = this._document.createElement("label");
-        functionLabel.className = "devtools-monospace";
-        functionLabel.setAttribute("value", displayName);
-        hbox.appendChild(functionLabel);
-      }
-
-      if (url) {
-        let aNode = this._document.createElement("a");
-        aNode.className = "waterfall-marker-location theme-link devtools-monospace";
-        aNode.href = url;
-        aNode.draggable = false;
-        aNode.setAttribute("title", url);
-
-        let text = WebConsoleUtils.abbreviateSourceURL(url) + ":" + line;
-        let label = this._document.createElement("label");
-        label.setAttribute("value", text);
-        aNode.appendChild(label);
-        hbox.appendChild(aNode);
-
-        aNode.addEventListener("click", (event) => {
-          event.preventDefault();
-          this.emit("view-source", url, line);
-        });
-      }
-
-      if (!displayName && !url) {
-        let label = this._document.createElement("label");
-        label.setAttribute("value", L10N.getStr("timeline.markerDetail.unknownFrame"));
-        hbox.appendChild(label);
-      }
-
-      parent.appendChild(hbox);
-
-      if (frame.asyncParent) {
-        frameIndex = frame.asyncParent;
-        wasAsyncParent = true;
-      } else {
-        frameIndex = frame.parent;
-      }
-    }
-  },
-
-  /**
-   * 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);
-    }
-  },
-
-  /**
-   * Render details of a Javascript marker.
-   *
-   * @param nsIDOMNode parent
-   *        The parent node holding the view.
-   * @param object marker
-   *        The marker to display.
-   */
-  renderJavascriptMarker: function(parent, marker) {
-    if ("causeName" in marker) {
-      let cause = this.buildNameValueLabel("timeline.markerDetail.causeName", marker.causeName);
-      this._parent.appendChild(cause);
-    }
-  },
-
-};
-
-exports.MarkerDetails = MarkerDetails;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/timeline/markers-overview.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/timeline/markers-overview.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/timeline/markers-overview.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/timeline/markers-overview.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,236 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-/**
- * This file contains the "markers overview" graph, which is a minimap of all
- * the timeline data. Regions inside it may be selected, determining which
- * markers are visible in the "waterfall".
- */
-
-const {Cc, Ci, Cu, Cr} = require("chrome");
-
-Cu.import("resource:///modules/devtools/Graphs.jsm");
-Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
-
-const { colorUtils: { setAlpha }} = require("devtools/css-color");
-const { getColor } = require("devtools/shared/theme");
-
-loader.lazyRequireGetter(this, "L10N",
-  "devtools/shared/timeline/global", true);
-
-const OVERVIEW_HEADER_HEIGHT = 14; // px
-const OVERVIEW_ROW_HEIGHT = 11; // px
-
-const OVERVIEW_SELECTION_LINE_COLOR = "#666";
-const OVERVIEW_CLIPHEAD_LINE_COLOR = "#555";
-
-const FIND_OPTIMAL_TICK_INTERVAL_MAX_ITERS = 100;
-const OVERVIEW_HEADER_TICKS_MULTIPLE = 100; // ms
-const OVERVIEW_HEADER_TICKS_SPACING_MIN = 75; // px
-const OVERVIEW_HEADER_TEXT_FONT_SIZE = 9; // px
-const OVERVIEW_HEADER_TEXT_FONT_FAMILY = "sans-serif";
-const OVERVIEW_HEADER_TEXT_PADDING_LEFT = 6; // px
-const OVERVIEW_HEADER_TEXT_PADDING_TOP = 1; // px
-const OVERVIEW_MARKERS_COLOR_STOPS = [0, 0.1, 0.75, 1];
-const OVERVIEW_MARKER_WIDTH_MIN = 4; // px
-const OVERVIEW_GROUP_VERTICAL_PADDING = 5; // px
-
-/**
- * An overview for the markers data.
- *
- * @param nsIDOMNode parent
- *        The parent node holding the overview.
- * @param Object blueprint
- *        List of names and colors defining markers.
- */
-function MarkersOverview(parent, blueprint, ...args) {
-  AbstractCanvasGraph.apply(this, [parent, "markers-overview", ...args]);
-  this.setTheme();
-  this.setBlueprint(blueprint);
-}
-
-MarkersOverview.prototype = Heritage.extend(AbstractCanvasGraph.prototype, {
-  clipheadLineColor: OVERVIEW_CLIPHEAD_LINE_COLOR,
-  selectionLineColor: OVERVIEW_SELECTION_LINE_COLOR,
-  headerHeight: OVERVIEW_HEADER_HEIGHT,
-  rowHeight: OVERVIEW_ROW_HEIGHT,
-  groupPadding: OVERVIEW_GROUP_VERTICAL_PADDING,
-
-  /**
-   * Compute the height of the overview.
-   */
-  get fixedHeight() {
-    return this.headerHeight + this.rowHeight * (this._lastGroup + 1);
-  },
-
-  /**
-   * List of names and colors used to paint this overview.
-   * @see TIMELINE_BLUEPRINT in timeline/widgets/global.js
-   */
-  setBlueprint: function(blueprint) {
-    this._paintBatches = new Map();
-    this._lastGroup = 0;
-
-    for (let type in blueprint) {
-      this._paintBatches.set(type, { style: blueprint[type], batch: [] });
-      this._lastGroup = Math.max(this._lastGroup, blueprint[type].group);
-    }
-  },
-
-  /**
-   * Disables selection and empties this graph.
-   */
-  clearView: function() {
-    this.selectionEnabled = false;
-    this.dropSelection();
-    this.setData({ duration: 0, markers: [] });
-  },
-
-  /**
-   * Renders the graph's data source.
-   * @see AbstractCanvasGraph.prototype.buildGraphImage
-   */
-  buildGraphImage: function() {
-    let { markers, duration } = this._data;
-
-    let { canvas, ctx } = this._getNamedCanvas("markers-overview-data");
-    let canvasWidth = this._width;
-    let canvasHeight = this._height;
-
-    // Group markers into separate paint batches. This is necessary to
-    // draw all markers sharing the same style at once.
-
-    for (let marker of markers) {
-      let markerType = this._paintBatches.get(marker.name);
-      if (markerType) {
-        markerType.batch.push(marker);
-      }
-    }
-
-    // Calculate each row's height, and the time-based scaling.
-
-    let totalGroups = this._lastGroup + 1;
-    let groupHeight = this.rowHeight * this._pixelRatio;
-    let groupPadding = this.groupPadding * this._pixelRatio;
-    let headerHeight = this.headerHeight * this._pixelRatio;
-    let dataScale = this.dataScaleX = canvasWidth / duration;
-
-    // Draw the header and overview background.
-
-    ctx.fillStyle = this.headerBackgroundColor;
-    ctx.fillRect(0, 0, canvasWidth, headerHeight);
-
-    ctx.fillStyle = this.backgroundColor;
-    ctx.fillRect(0, headerHeight, canvasWidth, canvasHeight);
-
-    // Draw the alternating odd/even group backgrounds.
-
-    ctx.fillStyle = this.alternatingBackgroundColor;
-    ctx.beginPath();
-
-    for (let i = 0; i < totalGroups; i += 2) {
-      let top = headerHeight + i * groupHeight;
-      ctx.rect(0, top, canvasWidth, groupHeight);
-    }
-
-    ctx.fill();
-
-    // Draw the timeline header ticks.
-
-    let fontSize = OVERVIEW_HEADER_TEXT_FONT_SIZE * this._pixelRatio;
-    let fontFamily = OVERVIEW_HEADER_TEXT_FONT_FAMILY;
-    let textPaddingLeft = OVERVIEW_HEADER_TEXT_PADDING_LEFT * this._pixelRatio;
-    let textPaddingTop = OVERVIEW_HEADER_TEXT_PADDING_TOP * this._pixelRatio;
-    let tickInterval = this._findOptimalTickInterval(dataScale);
-
-    ctx.textBaseline = "middle";
-    ctx.font = fontSize + "px " + fontFamily;
-    ctx.fillStyle = this.headerTextColor;
-    ctx.strokeStyle = this.headerTimelineStrokeColor;
-    ctx.beginPath();
-
-    for (let x = 0; x < canvasWidth; x += tickInterval) {
-      let lineLeft = x;
-      let textLeft = lineLeft + textPaddingLeft;
-      let time = Math.round(x / dataScale);
-      let label = L10N.getFormatStr("timeline.tick", time);
-      ctx.fillText(label, textLeft, headerHeight / 2 + textPaddingTop);
-      ctx.moveTo(lineLeft, 0);
-      ctx.lineTo(lineLeft, canvasHeight);
-    }
-
-    ctx.stroke();
-
-    // Draw the timeline markers.
-
-    for (let [, { style, batch }] of this._paintBatches) {
-      let top = headerHeight + style.group * groupHeight + groupPadding / 2;
-      let height = groupHeight - groupPadding;
-
-      let color = getColor(style.colorName, this.theme);
-      ctx.fillStyle = color;
-      ctx.beginPath();
-
-      for (let { start, end } of batch) {
-        let left = start * dataScale;
-        let width = Math.max((end - start) * dataScale, OVERVIEW_MARKER_WIDTH_MIN);
-        ctx.rect(left, top, width, height);
-      }
-
-      ctx.fill();
-
-      // Since all the markers in this batch (thus sharing the same style) have
-      // been drawn, empty it. The next time new markers will be available,
-      // they will be sorted and drawn again.
-      batch.length = 0;
-    }
-
-    return canvas;
-  },
-
-  /**
-   * Finds the optimal tick interval between time markers in this overview.
-   */
-  _findOptimalTickInterval: function(dataScale) {
-    let timingStep = OVERVIEW_HEADER_TICKS_MULTIPLE;
-    let spacingMin = OVERVIEW_HEADER_TICKS_SPACING_MIN * this._pixelRatio;
-    let maxIters = FIND_OPTIMAL_TICK_INTERVAL_MAX_ITERS;
-    let numIters = 0;
-
-    if (dataScale > spacingMin) {
-      return dataScale;
-    }
-
-    while (true) {
-      let scaledStep = dataScale * timingStep;
-      if (++numIters > maxIters) {
-        return scaledStep;
-      }
-      if (scaledStep < spacingMin) {
-        timingStep <<= 1;
-        continue;
-      }
-      return scaledStep;
-    }
-  },
-
-  /**
-   * Sets the theme via `theme` to either "light" or "dark",
-   * and updates the internal styling to match. Requires a redraw
-   * to see the effects.
-   */
-  setTheme: function (theme) {
-    this.theme = theme = theme || "light";
-    this.backgroundColor = getColor("body-background", theme);
-    this.selectionBackgroundColor = setAlpha(getColor("selection-background", theme), 0.25);
-    this.selectionStripesColor = setAlpha("#fff", 0.1);
-    this.headerBackgroundColor = getColor("body-background", theme);
-    this.headerTextColor = getColor("body-color", theme);
-    this.headerTimelineStrokeColor = setAlpha(getColor("body-color-alt", theme), 0.25);
-    this.alternatingBackgroundColor = setAlpha(getColor("body-color", theme), 0.05);
-  }
-});
-
-exports.MarkersOverview = MarkersOverview;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/timeline/waterfall.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/timeline/waterfall.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/timeline/waterfall.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/timeline/waterfall.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,623 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-/**
- * This file contains the "waterfall" view, essentially a detailed list
- * of all the markers in the timeline data.
- */
-
-const {Ci, Cu} = require("chrome");
-
-loader.lazyRequireGetter(this, "L10N",
-  "devtools/shared/timeline/global", true);
-
-loader.lazyImporter(this, "setNamedTimeout",
-  "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";
-
-const WATERFALL_SIDEBAR_WIDTH = 150; // px
-
-const WATERFALL_IMMEDIATE_DRAW_MARKERS_COUNT = 30;
-const WATERFALL_FLUSH_OUTSTANDING_MARKERS_DELAY = 75; // ms
-
-const FIND_OPTIMAL_TICK_INTERVAL_MAX_ITERS = 100;
-const WATERFALL_HEADER_TICKS_MULTIPLE = 5; // ms
-const WATERFALL_HEADER_TICKS_SPACING_MIN = 50; // px
-const WATERFALL_HEADER_TEXT_PADDING = 3; // px
-
-const WATERFALL_BACKGROUND_TICKS_MULTIPLE = 5; // ms
-const WATERFALL_BACKGROUND_TICKS_SCALES = 3;
-const WATERFALL_BACKGROUND_TICKS_SPACING_MIN = 10; // px
-const WATERFALL_BACKGROUND_TICKS_COLOR_RGB = [128, 136, 144];
-const WATERFALL_BACKGROUND_TICKS_OPACITY_MIN = 32; // byte
-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.
- *
- * @param nsIDOMNode parent
- *        The parent node holding the waterfall.
- * @param nsIDOMNode container
- *        The container node that key events should be bound to.
- * @param Object blueprint
- *        List of names and colors defining markers.
- */
-function Waterfall(parent, container, blueprint) {
-  EventEmitter.decorate(this);
-
-  this._parent = parent;
-  this._document = parent.ownerDocument;
-  this._container = container;
-  this._fragment = this._document.createDocumentFragment();
-  this._outstandingMarkers = [];
-
-  this._headerContents = this._document.createElement("hbox");
-  this._headerContents.className = "waterfall-header-contents";
-  this._parent.appendChild(this._headerContents);
-
-  this._listContents = this._document.createElement("vbox");
-  this._listContents.className = "waterfall-list-contents";
-  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.
-  this._l10n = L10N;
-  this._blueprint = blueprint;
-  this._setNamedTimeout = setNamedTimeout;
-  this._clearNamedTimeout = clearNamedTimeout;
-
-  // Selected row index. By default, we want the first
-  // row to be selected.
-  this._selectedRowIdx = 0;
-
-  // Default rowCount
-  this.rowCount = WATERFALL_ROWCOUNT_ONPAGEUPDOWN;
-}
-
-Waterfall.prototype = {
-  /**
-   * Removes any node references from this view.
-   */
-  destroy: function() {
-    this._parent = this._document = this._container = null;
-  },
-
-  /**
-   * Populates this view with the provided data source.
-   *
-   * @param object data
-   *        An object containing the following properties:
-   *          - markers: a list of markers received from the controller
-   *          - interval: the { startTime, endTime }, in milliseconds
-   */
-  setData: function({ markers, interval }) {
-    this.clearView();
-    this._markers = markers;
-    this._interval = interval;
-
-    let { startTime, endTime } = interval;
-    let dataScale = this._waterfallWidth / (endTime - startTime);
-    this._drawWaterfallBackground(dataScale);
-
-    this._buildHeader(this._headerContents, startTime, dataScale);
-    this._buildMarkers(this._listContents, markers, startTime, endTime, dataScale);
-    this.selectRow(this._selectedRowIdx);
-  },
-
-  /**
-   * List of names and colors used to paint markers.
-   * @see TIMELINE_BLUEPRINT in timeline/widgets/global.js
-   */
-  setBlueprint: function(blueprint) {
-    this._blueprint = blueprint;
-  },
-
-  /**
-   * Keybindings.
-   */
-  setupKeys: function() {
-    let pane = this._container;
-    pane.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 - this.rowCount);
-      }
-      if (e.keyCode === Ci.nsIDOMKeyEvent.DOM_VK_PAGE_DOWN) {
-        e.preventDefault();
-        this.selectNearestRow(this._selectedRowIdx + this.rowCount);
-      }
-    }, true);
-  },
-
-  /**
-   * Depopulates this view.
-   */
-  clearView: function() {
-    while (this._headerContents.hasChildNodes()) {
-      this._headerContents.firstChild.remove();
-    }
-    while (this._listContents.hasChildNodes()) {
-      this._listContents.firstChild.remove();
-    }
-    this._listContents.scrollTop = 0;
-    this._outstandingMarkers.length = 0;
-    this._clearNamedTimeout("flush-outstanding-markers");
-  },
-
-  /**
-   * Calculates and stores the available width for the waterfall.
-   * This should be invoked every time the container window is resized.
-   */
-  recalculateBounds: function() {
-    let bounds = this._parent.getBoundingClientRect();
-    this._waterfallWidth = bounds.width - WATERFALL_SIDEBAR_WIDTH;
-  },
-
-  /**
-   * Creates the header part of this view.
-   *
-   * @param nsIDOMNode parent
-   *        The parent node holding the header.
-   * @param number startTime
-   *        @see Waterfall.prototype.setData
-   * @param number dataScale
-   *        The time scale of the data source.
-   */
-  _buildHeader: function(parent, startTime, dataScale) {
-    let container = this._document.createElement("hbox");
-    container.className = "waterfall-header-container";
-    container.setAttribute("flex", "1");
-
-    let sidebar = this._document.createElement("hbox");
-    sidebar.className = "waterfall-sidebar theme-sidebar";
-    sidebar.setAttribute("width", WATERFALL_SIDEBAR_WIDTH);
-    sidebar.setAttribute("align", "center");
-    container.appendChild(sidebar);
-
-    let name = this._document.createElement("label");
-    name.className = "plain waterfall-header-name";
-    name.setAttribute("value", this._l10n.getStr("timeline.records"));
-    sidebar.appendChild(name);
-
-    let ticks = this._document.createElement("hbox");
-    ticks.className = "waterfall-header-ticks waterfall-background-ticks";
-    ticks.setAttribute("align", "center");
-    ticks.setAttribute("flex", "1");
-    container.appendChild(ticks);
-
-    let offset = this._isRTL ? this._waterfallWidth : 0;
-    let direction = this._isRTL ? -1 : 1;
-    let tickInterval = this._findOptimalTickInterval({
-      ticksMultiple: WATERFALL_HEADER_TICKS_MULTIPLE,
-      ticksSpacingMin: WATERFALL_HEADER_TICKS_SPACING_MIN,
-      dataScale: dataScale
-    });
-
-    for (let x = 0; x < this._waterfallWidth; x += tickInterval) {
-      let left = x + direction * WATERFALL_HEADER_TEXT_PADDING;
-      let time = Math.round(x / dataScale + startTime);
-      let label = this._l10n.getFormatStr("timeline.tick", time);
-
-      let node = this._document.createElement("label");
-      node.className = "plain waterfall-header-tick";
-      node.style.transform = "translateX(" + (left - offset) + "px)";
-      node.setAttribute("value", label);
-      ticks.appendChild(node);
-    }
-
-    parent.appendChild(container);
-  },
-
-  /**
-   * Creates the markers part of this view.
-   *
-   * @param nsIDOMNode parent
-   *        The parent node holding the markers.
-   * @param number startTime
-   *        @see Waterfall.prototype.setData
-   * @param number dataScale
-   *        The time scale of the data source.
-   */
-  _buildMarkers: function(parent, markers, startTime, endTime, dataScale) {
-    let rowsCount = 0;
-    let markerIdx = -1;
-
-    for (let marker of markers) {
-      markerIdx++;
-
-      if (!isMarkerInRange(marker, startTime, endTime)) {
-        continue;
-      }
-      if (!(marker.name in this._blueprint)) {
-        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, startTime, dataScale, markerIdx, rowsCount];
-      if (rowsCount++ < WATERFALL_IMMEDIATE_DRAW_MARKERS_COUNT) {
-        this._buildMarker.apply(this, arguments_);
-      } else {
-        this._outstandingMarkers.push(arguments_);
-      }
-    }
-
-    // If there are no outstanding markers, add a dummy "spacer" at the end
-    // to fill up any remaining available space in the UI.
-    if (!this._outstandingMarkers.length) {
-      this._buildMarker(this._fragment, null);
-    }
-    // Otherwise prepare flushing the outstanding markers after a small delay.
-    else {
-      let delay = WATERFALL_FLUSH_OUTSTANDING_MARKERS_DELAY;
-      let func = () => this._buildOutstandingMarkers(parent);
-      this._setNamedTimeout("flush-outstanding-markers", delay, func);
-    }
-
-    parent.appendChild(this._fragment);
-  },
-
-  /**
-   * Finishes building the outstanding markers in this view.
-   * @see Waterfall.prototype._buildMarkers
-   */
-  _buildOutstandingMarkers: function(parent) {
-    if (!this._outstandingMarkers.length) {
-      return;
-    }
-    for (let args of this._outstandingMarkers) {
-      this._buildMarker.apply(this, args);
-    }
-    this._outstandingMarkers.length = 0;
-    parent.appendChild(this._fragment);
-    this.selectRow(this._selectedRowIdx);
-  },
-
-  /**
-   * Creates a single marker in this view.
-   *
-   * @param nsIDOMNode parent
-   *        The parent node holding the marker.
-   * @param object marker
-   *        The { name, start, end } marker in the data source.
-   * @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, 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, startTime, dataScale, markerIdx);
-      container.onclick = () => this.selectRow(rowIdx);
-    } else {
-      this._buildMarkerSpacer(container);
-      container.setAttribute("flex", "1");
-      container.setAttribute("is-spacer", "");
-    }
-
-    parent.appendChild(container);
-  },
-
-  /**
-   * 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) {
-    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
-   *        The container node representing the marker in this view.
-   * @param object marker
-   *        @see Waterfall.prototype._buildMarker
-   */
-  _buildMarkerSidebar: function(container, marker) {
-    let blueprint = this._blueprint[marker.name];
-
-    let sidebar = this._document.createElement("hbox");
-    sidebar.className = "waterfall-sidebar theme-sidebar";
-    sidebar.setAttribute("width", WATERFALL_SIDEBAR_WIDTH);
-    sidebar.setAttribute("align", "center");
-
-    let bullet = this._document.createElement("hbox");
-    bullet.className = `waterfall-marker-bullet ${blueprint.colorName}`;
-    bullet.setAttribute("type", marker.name);
-    sidebar.appendChild(bullet);
-
-    let name = this._document.createElement("label");
-    name.setAttribute("crop", "end");
-    name.setAttribute("flex", "1");
-    name.className = "plain waterfall-marker-name";
-
-    let label;
-    if (marker.causeName) {
-      label = this._l10n.getFormatStr("timeline.markerDetailFormat",
-                                      blueprint.label,
-                                      marker.causeName);
-    } else {
-      label = blueprint.label;
-    }
-    name.setAttribute("value", label);
-    name.setAttribute("tooltiptext", label);
-    sidebar.appendChild(name);
-
-    container.appendChild(sidebar);
-  },
-
-  /**
-   * Creates the waterfall part of a marker in this view.
-   *
-   * @param nsIDOMNode container
-   *        The container node representing the marker.
-   * @param object marker
-   *        @see Waterfall.prototype._buildMarker
-   * @param startTime
-   *        @see Waterfall.prototype.setData
-   * @param number dataScale
-   *        @see Waterfall.prototype._buildMarkers
-   */
-  _buildMarkerWaterfall: function(container, marker, startTime, dataScale) {
-    let blueprint = this._blueprint[marker.name];
-
-    let waterfall = this._document.createElement("hbox");
-    waterfall.className = "waterfall-marker-item waterfall-background-ticks";
-    waterfall.setAttribute("align", "center");
-    waterfall.setAttribute("flex", "1");
-
-    let start = (marker.start - startTime) * dataScale;
-    let width = (marker.end - marker.start) * dataScale;
-    let offset = this._isRTL ? this._waterfallWidth : 0;
-
-    let bar = this._document.createElement("hbox");
-    bar.className = `waterfall-marker-bar ${blueprint.colorName}`;
-    bar.style.transform = "translateX(" + (start - offset) + "px)";
-    bar.setAttribute("type", marker.name);
-    bar.setAttribute("width", Math.max(width, WATERFALL_MARKER_BAR_WIDTH_MIN));
-    waterfall.appendChild(bar);
-
-    container.appendChild(waterfall);
-  },
-
-  /**
-   * Creates a dummy spacer as an empty marker.
-   *
-   * @param nsIDOMNode container
-   *        The container node representing the marker.
-   */
-  _buildMarkerSpacer: function(container) {
-    let sidebarSpacer = this._document.createElement("spacer");
-    sidebarSpacer.className = "waterfall-sidebar theme-sidebar";
-    sidebarSpacer.setAttribute("width", WATERFALL_SIDEBAR_WIDTH);
-
-    let waterfallSpacer = this._document.createElement("spacer");
-    waterfallSpacer.className = "waterfall-marker-item waterfall-background-ticks";
-    waterfallSpacer.setAttribute("flex", "1");
-
-    container.appendChild(sidebarSpacer);
-    container.appendChild(waterfallSpacer);
-  },
-
-  /**
-   * Creates the background displayed on the marker's waterfall.
-   *
-   * @param number dataScale
-   *        @see Waterfall.prototype._buildMarkers
-   */
-  _drawWaterfallBackground: function(dataScale) {
-    if (!this._canvas || !this._ctx) {
-      this._canvas = this._document.createElementNS(HTML_NS, "canvas");
-      this._ctx = this._canvas.getContext("2d");
-    }
-    let canvas = this._canvas;
-    let ctx = this._ctx;
-
-    // Nuke the context.
-    let canvasWidth = canvas.width = this._waterfallWidth;
-    let canvasHeight = canvas.height = 1; // Awww yeah, 1px, repeats on Y axis.
-
-    // Start over.
-    let imageData = ctx.createImageData(canvasWidth, canvasHeight);
-    let pixelArray = imageData.data;
-
-    let buf = new ArrayBuffer(pixelArray.length);
-    let view8bit = new Uint8ClampedArray(buf);
-    let view32bit = new Uint32Array(buf);
-
-    // Build new millisecond tick lines...
-    let [r, g, b] = WATERFALL_BACKGROUND_TICKS_COLOR_RGB;
-    let alphaComponent = WATERFALL_BACKGROUND_TICKS_OPACITY_MIN;
-    let tickInterval = this._findOptimalTickInterval({
-      ticksMultiple: WATERFALL_BACKGROUND_TICKS_MULTIPLE,
-      ticksSpacingMin: WATERFALL_BACKGROUND_TICKS_SPACING_MIN,
-      dataScale: dataScale
-    });
-
-    // Insert one pixel for each division on each scale.
-    for (let i = 1; i <= WATERFALL_BACKGROUND_TICKS_SCALES; i++) {
-      let increment = tickInterval * Math.pow(2, i);
-      for (let x = 0; x < canvasWidth; x += increment) {
-        let position = x | 0;
-        view32bit[position] = (alphaComponent << 24) | (b << 16) | (g << 8) | r;
-      }
-      alphaComponent += WATERFALL_BACKGROUND_TICKS_OPACITY_ADD;
-    }
-
-    // Flush the image data and cache the waterfall background.
-    pixelArray.set(view8bit);
-    ctx.putImageData(imageData, 0, 0);
-    this._document.mozSetImageElement("waterfall-background", canvas);
-  },
-
-  /**
-   * Finds the optimal tick interval between time markers in this timeline.
-   *
-   * @param number ticksMultiple
-   * @param number ticksSpacingMin
-   * @param number dataScale
-   * @return number
-   */
-  _findOptimalTickInterval: function({ ticksMultiple, ticksSpacingMin, dataScale }) {
-    let timingStep = ticksMultiple;
-    let maxIters = FIND_OPTIMAL_TICK_INTERVAL_MAX_ITERS;
-    let numIters = 0;
-
-    if (dataScale > ticksSpacingMin) {
-      return dataScale;
-    }
-
-    while (true) {
-      let scaledStep = dataScale * timingStep;
-      if (++numIters > maxIters) {
-        return scaledStep;
-      }
-      if (scaledStep < ticksSpacingMin) {
-        timingStep <<= 1;
-        continue;
-      }
-      return scaledStep;
-    }
-  },
-
-  /**
-   * Returns true if this is document is in RTL mode.
-   * @return boolean
-   */
-  _getRTL: function() {
-    let win = this._document.defaultView;
-    let doc = this._document.documentElement;
-    return win.getComputedStyle(doc, null).direction == "rtl";
-  }
-};
-
-/**
- * Checks if a given marker is in the specified time range.
- *
- * @param object e
- *        The marker containing the { start, end } timestamps.
- * @param number start
- *        The earliest allowed time.
- * @param number end
- *        The latest allowed time.
- * @return boolean
- *         True if the marker fits inside the specified time range.
- */
-function isMarkerInRange(e, start, end) {
-  return (e.start >= start && e.end <= end) || // bounds inside
-         (e.start < start && e.end > end) || // bounds outside
-         (e.start < start && e.end >= start && e.end <= end) || // overlap start
-         (e.end > end && e.start >= start && e.start <= end); // overlap end
-}
-
-exports.Waterfall = Waterfall;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/widgets/CubicBezierWidget.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/widgets/CubicBezierWidget.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/widgets/CubicBezierWidget.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/widgets/CubicBezierWidget.js	2015-05-25 20:42:56.000000000 +0000
@@ -28,6 +28,10 @@
 const EventEmitter = require("devtools/toolkit/event-emitter");
 const {setTimeout, clearTimeout} = require("sdk/timers");
 const {PREDEFINED, PRESETS, DEFAULT_PRESET_CATEGORY} = require("devtools/shared/widgets/CubicBezierPresets");
+const {Cc, Ci} = require('chrome');
+loader.lazyGetter(this, "DOMUtils", () => {
+  return Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils);
+});
 
 /**
  * CubicBezier data structure helper
@@ -439,12 +443,7 @@
     value = value.trim();
 
     // Try with one of the predefined values
-    let coordinates = PREDEFINED[value];
-
-    // Otherwise parse the coordinates from the cubic-bezier function
-    if (!coordinates && value.startsWith("cubic-bezier")) {
-      coordinates = value.replace(/cubic-bezier|\(|\)/g, "").split(",").map(parseFloat);
-    }
+    let coordinates = parseTimingFunction(value);
 
     this.presets.refreshMenu(coordinates);
     this.coordinates = coordinates;
@@ -760,7 +759,7 @@
 
     clearTimeout(this.autoRestartAnimation);
 
-    if (isValidTimingFunction(value)) {
+    if (parseTimingFunction(value)) {
       this.dot.style.animationTimingFunction = value;
       this.restartAnimation();
     }
@@ -811,24 +810,54 @@
 }
 
 /**
- * Checks whether a string is a valid timing-function value
+ * Parse a string to see whether it is a valid timing function.
+ * If it is, return the coordinates as an array.
+ * Otherwise, return undefined.
  * @param {String} value
- * @return {Boolean}
+ * @return {Array} of coordinates, or undefined
  */
-function isValidTimingFunction(value) {
-  // Either it's a predefined value
+function parseTimingFunction(value) {
   if (value in PREDEFINED) {
-    return true;
+    return PREDEFINED[value];
+  }
+
+  let tokenStream = DOMUtils.getCSSLexer(value);
+  let getNextToken = () => {
+    while (true) {
+      let token = tokenStream.nextToken();
+      if (!token || (token.tokenType !== "whitespace" &&
+                     token.tokenType !== "comment")) {
+        return token;
+      }
+    }
+  };
+
+  let token = getNextToken();
+  if (token.tokenType !== "function" || token.text !== "cubic-bezier") {
+    return undefined;
   }
 
-  // Or it has to match a cubic-bezier expression
-  if (value.match(/^cubic-bezier\(([0-9.\- ]+,){3}[0-9.\- ]+\)/)) {
-    return true;
+  let result = [];
+  for (let i = 0; i < 4; ++i) {
+    token = getNextToken();
+    if (!token || token.tokenType !== "number") {
+      return undefined;
+    }
+    result.push(token.number);
+
+    token = getNextToken();
+    if (!token || token.tokenType !== "symbol" ||
+        token.text !== (i == 3 ? ")" : ",")) {
+      return undefined;
+    }
   }
 
-  return false;
+  return result;
 }
 
+// This is exported for testing.
+exports._parseTimingFunction = parseTimingFunction;
+
 /**
  * Removes a class from a node and adds it to another.
  * @param {String} className the class to swap
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/widgets/filter-widget.css firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/widgets/filter-widget.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/widgets/filter-widget.css	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/widgets/filter-widget.css	2015-05-25 20:42:57.000000000 +0000
@@ -112,7 +112,7 @@
 #add-filter {
   -moz-appearance: none;
   background: url(chrome://browser/skin/devtools/add.svg);
-  background-size: 18px;
+  background-size: cover;
   border: none;
   width: 16px;
   height: 16px;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/widgets/FilterWidget.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/widgets/FilterWidget.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/widgets/FilterWidget.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/widgets/FilterWidget.js	2015-05-25 20:42:57.000000000 +0000
@@ -14,6 +14,7 @@
 const { ViewHelpers } = Cu.import("resource:///modules/devtools/ViewHelpers.jsm", {});
 const STRINGS_URI = "chrome://browser/locale/devtools/filterwidget.properties";
 const L10N = new ViewHelpers.L10N(STRINGS_URI);
+const {cssTokenizer} = require("devtools/sourceeditor/css-tokenizer");
 
 const DEFAULT_FILTER_TYPE = "length";
 const UNIT_MAPPING = {
@@ -750,41 +751,46 @@
   */
 function tokenizeComputedFilter(css) {
   let filters = [];
-  let current = "";
   let depth = 0;
 
   if (css === "none") {
     return filters;
   }
 
-  while (css.length) {
-    const char = css[0];
+  let state = "initial";
+  let name;
+  let contents;
+  for (let token of cssTokenizer(css)) {
+    switch (state) {
+      case "initial":
+        if (token.tokenType === "function") {
+          name = token.text;
+          contents = "";
+          state = "function";
+          depth = 1;
+        } else if (token.tokenType === "url" || token.tokenType === "bad_url") {
+          filters.push({name: "url", value: token.text});
+          // Leave state as "initial" because the URL token includes
+          // the trailing close paren.
+        }
+        break;
 
-    switch (char) {
-      case "(":
-        depth++;
-        if (depth === 1) {
-          filters.push({name: current.trim()});
-          current = "";
-        } else {
-          current += char;
+      case "function":
+        if (token.tokenType === "symbol" && token.text === ")") {
+          --depth;
+          if (depth === 0) {
+            filters.push({name: name, value: contents});
+            state = "initial";
+            break;
+          }
         }
-      break;
-      case ")":
-        depth--;
-        if (depth === 0) {
-          filters[filters.length - 1].value = current.trim();
-          current = "";
-        } else {
-          current += char;
+        contents += css.substring(token.startOffset, token.endOffset);
+        if (token.tokenType === "function" ||
+            (token.tokenType === "symbol" && token.text === "(")) {
+          ++depth;
         }
-      break;
-      default:
-        current += char;
-      break;
+        break;
     }
-
-    css = css.slice(1);
   }
 
   return filters;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/widgets/FlameGraph.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/widgets/FlameGraph.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/widgets/FlameGraph.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/widgets/FlameGraph.js	2015-05-25 20:42:57.000000000 +0000
@@ -9,10 +9,10 @@
 const { Task } = require("resource://gre/modules/Task.jsm");
 const { getColor } = require("devtools/shared/theme");
 const EventEmitter = require("devtools/toolkit/event-emitter");
-const FrameUtils = require("devtools/shared/profiler/frame-utils");
+const FrameUtils = require("devtools/performance/frame-utils");
 
 loader.lazyRequireGetter(this, "CATEGORY_MAPPINGS",
-  "devtools/shared/profiler/global", true);
+  "devtools/performance/global", true);
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
 const GRAPH_SRC = "chrome://browser/content/devtools/graphs-frame.xhtml";
@@ -38,13 +38,29 @@
 const OVERVIEW_HEADER_TEXT_PADDING_TOP = 5; // px
 const OVERVIEW_HEADER_TIMELINE_STROKE_COLOR = "rgba(128, 128, 128, 0.5)";
 
+const FLAME_GRAPH_BLOCK_HEIGHT = 15; // px
 const FLAME_GRAPH_BLOCK_BORDER = 1; // px
-const FLAME_GRAPH_BLOCK_TEXT_FONT_SIZE = 9; // px
-const FLAME_GRAPH_BLOCK_TEXT_FONT_FAMILY = "sans-serif";
+const FLAME_GRAPH_BLOCK_TEXT_FONT_SIZE = 10; // px
+const FLAME_GRAPH_BLOCK_TEXT_FONT_FAMILY = "message-box, Helvetica Neue, Helvetica, sans-serif";
 const FLAME_GRAPH_BLOCK_TEXT_PADDING_TOP = 0; // px
 const FLAME_GRAPH_BLOCK_TEXT_PADDING_LEFT = 3; // px
 const FLAME_GRAPH_BLOCK_TEXT_PADDING_RIGHT = 3; // px
 
+const PALLETTE_SIZE = 20; // Large enough number for a diverse pallette.
+const PALLETTE_HUE_OFFSET = Math.random() * 90;
+const PALLETTE_HUE_RANGE = 270;
+const PALLETTE_SATURATION = 100;
+const PALLETTE_BRIGHTNESS = 55;
+const PALLETTE_OPACITY = 0.35;
+
+const COLOR_PALLETTE = Array.from(Array(PALLETTE_SIZE)).map((_, i) => "hsla" +
+  "(" + ((PALLETTE_HUE_OFFSET + (i / PALLETTE_SIZE * PALLETTE_HUE_RANGE))|0 % 360) +
+  "," + PALLETTE_SATURATION + "%" +
+  "," + PALLETTE_BRIGHTNESS + "%" +
+  "," + PALLETTE_OPACITY +
+  ")"
+);
+
 /**
  * A flamegraph visualization. This implementation is responsable only with
  * drawing the graph, using a data source consisting of rectangles and
@@ -970,23 +986,6 @@
   }
 };
 
-const FLAME_GRAPH_BLOCK_HEIGHT = 12; // px
-
-const PALLETTE_SIZE = 10;
-const PALLETTE_HUE_OFFSET = Math.random() * 90;
-const PALLETTE_HUE_RANGE = 270;
-const PALLETTE_SATURATION = 100;
-const PALLETTE_BRIGHTNESS = 65;
-const PALLETTE_OPACITY = 0.55;
-
-const COLOR_PALLETTE = Array.from(Array(PALLETTE_SIZE)).map((_, i) => "hsla" +
-  "(" + ((PALLETTE_HUE_OFFSET + (i / PALLETTE_SIZE * PALLETTE_HUE_RANGE))|0 % 360) +
-  "," + PALLETTE_SATURATION + "%" +
-  "," + PALLETTE_BRIGHTNESS + "%" +
-  "," + PALLETTE_OPACITY +
-  ")"
-);
-
 /**
  * A collection of utility functions converting various data sources
  * into a format drawable by the FlameGraph.
@@ -1242,4 +1241,7 @@
 
 exports.FlameGraph = FlameGraph;
 exports.FlameGraphUtils = FlameGraphUtils;
+exports.PALLETTE_SIZE = PALLETTE_SIZE;
 exports.FLAME_GRAPH_BLOCK_HEIGHT = FLAME_GRAPH_BLOCK_HEIGHT;
+exports.FLAME_GRAPH_BLOCK_TEXT_FONT_SIZE = FLAME_GRAPH_BLOCK_TEXT_FONT_SIZE;
+exports.FLAME_GRAPH_BLOCK_TEXT_FONT_FAMILY = FLAME_GRAPH_BLOCK_TEXT_FONT_FAMILY;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/widgets/Graphs.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/widgets/Graphs.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/widgets/Graphs.jsm	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/widgets/Graphs.jsm	2015-05-25 20:42:57.000000000 +0000
@@ -9,7 +9,7 @@
 const promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
 const {Task} = Cu.import("resource://gre/modules/Task.jsm", {});
 const {EventEmitter} = Cu.import("resource://gre/modules/devtools/event-emitter.js", {});
-const {DevToolsWorker} = Cu.import("resource:///modules/devtools/shared/worker.js", {});
+const {DevToolsWorker} = Cu.import("resource://gre/modules/devtools/shared/worker.js", {});
 
 this.EXPORTED_SYMBOLS = [
   "GraphCursor",
@@ -826,7 +826,9 @@
       stripesColor: this.selectionStripesColor
     });
     ctx.fillStyle = pattern;
-    ctx.fillRect(start, 0, end - start, this._height);
+    let rectStart = Math.min(this._width, Math.max(0, start));
+    let rectEnd = Math.min(this._width, Math.max(0, end));
+    ctx.fillRect(rectStart, 0, rectEnd - rectStart, this._height);
 
     // Draw left boundary.
 
@@ -2025,9 +2027,14 @@
     callback(iframe);
   });
 
+  // Setting 100% width on the frame and flex on the parent allows the graph
+  // to properly shrink when the window is resized to be smaller.
   iframe.setAttribute("frameborder", "0");
+  iframe.style.width = "100%";
+  iframe.style.minWidth = "50px";
   iframe.src = url;
 
+  parent.style.display = "flex";
   parent.appendChild(iframe);
 };
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/widgets/GraphsWorker.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/widgets/GraphsWorker.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/widgets/GraphsWorker.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/widgets/GraphsWorker.js	2015-05-25 20:42:57.000000000 +0000
@@ -4,10 +4,10 @@
 "use strict";
 
 /**
- * Import `createTask` to communicate with `devtools/shared/worker`.
+ * Import `createTask` to communicate with `devtools/toolkit/shared/worker`.
  */
 importScripts("resource://gre/modules/workers/require.js");
-const { createTask } = require("resource:///modules/devtools/shared/worker-helper");
+const { createTask } = require("resource://gre/modules/devtools/shared/worker-helper");
 
 /**
  * @see LineGraphWidget.prototype.setDataFromTimestamps in Graphs.jsm
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/widgets/Tooltip.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/widgets/Tooltip.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/widgets/Tooltip.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/widgets/Tooltip.js	2015-05-25 20:42:57.000000000 +0000
@@ -35,9 +35,6 @@
 XPCOMUtils.defineLazyModuleGetter(this, "Task",
   "resource://gre/modules/Task.jsm");
 
-const GRADIENT_RE = /\b(repeating-)?(linear|radial)-gradient\(((rgb|hsl)a?\(.+?\)|[^\)])+\)/gi;
-const BORDERCOLOR_RE = /^border-[-a-z]*color$/ig;
-const BORDER_RE = /^border(-(top|bottom|left|right))?$/ig;
 const XHTML_NS = "http://www.w3.org/1999/xhtml";
 const SPECTRUM_FRAME = "chrome://browser/content/devtools/spectrum-frame.xhtml";
 const CUBIC_BEZIER_FRAME = "chrome://browser/content/devtools/cubic-bezier-frame.xhtml";
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/widgets/ViewHelpers.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/widgets/ViewHelpers.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/widgets/ViewHelpers.jsm	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/widgets/ViewHelpers.jsm	2015-05-25 20:42:57.000000000 +0000
@@ -385,6 +385,29 @@
 };
 
 /**
+ * A helper for having the same interface as ViewHelpers.L10N, but for
+ * more than one file. Useful for abstracting l10n string locations.
+ */
+ViewHelpers.MultiL10N = function(aStringBundleNames) {
+  let l10ns = aStringBundleNames.map(bundle => new ViewHelpers.L10N(bundle));
+  let proto = ViewHelpers.L10N.prototype;
+
+  Object.getOwnPropertyNames(proto)
+    .map(name => ({
+      name: name,
+      desc: Object.getOwnPropertyDescriptor(proto, name)
+    }))
+    .filter(property => property.desc.value instanceof Function)
+    .forEach(method => {
+      this[method.name] = function(...args) {
+        for (let l10n of l10ns) {
+          try { return method.desc.value.apply(l10n, args) } catch (e) {}
+        }
+      };
+    });
+};
+
+/**
  * Shortcuts for lazily accessing and setting various preferences.
  * Usage:
  *   let prefs = new ViewHelpers.Prefs("root.path.to.branch", {
@@ -409,8 +432,13 @@
  *        The root path to the required preferences branch.
  * @param object aPrefsBlueprint
  *        An object containing { accessorName: [prefType, prefName] } keys.
+ * @param object aOptions
+ *        Additional options for this constructor. Currently supported:
+ *          - monitorChanges: true to update the stored values if they changed
+ *                            when somebody edits about:config or the prefs
+ *                            change somewhere else.
  */
-ViewHelpers.Prefs = function(aPrefsRoot = "", aPrefsBlueprint = {}) {
+ViewHelpers.Prefs = function(aPrefsRoot = "", aPrefsBlueprint = {}, aOptions = {}) {
   EventEmitter.decorate(this);
 
   this._cache = new Map();
@@ -442,6 +470,10 @@
 
   this.registerObserver = () => observer.register();
   this.unregisterObserver = () => observer.unregister();
+
+  if (aOptions.monitorChanges) {
+    this.registerObserver();
+  }
 };
 
 ViewHelpers.Prefs.prototype = {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/worker-helper.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/worker-helper.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/worker-helper.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/worker-helper.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,100 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-/**
- * This file is to only be included by ChromeWorkers. This exposes
- * a `createTask` function to workers to register tasks for communication
- * back to `devtools/shared/worker`.
- *
- * Tasks can be send their responses via a return value, either a primitive
- * or a promise.
- *
- * createTask(self, "average", function (data) {
- *   return data.reduce((sum, val) => sum + val, 0) / data.length;
- * });
- *
- * createTask(self, "average", function (data) {
- *   return new Promise((resolve, reject) => {
- *     resolve(data.reduce((sum, val) => sum + val, 0) / data.length);
- *   });
- * });
- *
- *
- * Errors:
- *
- * Returning an Error value, or if the returned promise is rejected, this
- * propagates to the DevToolsWorker as a rejected promise. If an error is
- * thrown in a synchronous function, that error is also propagated.
- */
-
-/**
- * Takes a worker's `self` object, a task name, and a function to
- * be called when that task is called. The task is called with the
- * passed in data as the first argument
- *
- * @param {object} self
- * @param {string} name
- * @param {function} fn
- */
-function createTask (self, name, fn) {
-  // Store a hash of task name to function on the Worker
-  if (!self._tasks) {
-    self._tasks = {};
-  }
-
-  // Create the onmessage handler if not yet created.
-  if (!self.onmessage) {
-    self.onmessage = createHandler(self);
-  }
-
-  // Store the task on the worker.
-  self._tasks[name] = fn;
-}
-
-exports.createTask = createTask;
-
-/**
- * Creates the `self.onmessage` handler for a Worker.
- *
- * @param {object} self
- * @return {function}
- */
-function createHandler (self) {
-  return function (e) {
-    let { id, task, data } = e.data;
-    let taskFn = self._tasks[task];
-
-    if (!taskFn) {
-      self.postMessage({ id, error: `Task "${task}" not found in worker.` });
-      return;
-    }
-
-    try {
-      let results;
-      handleResponse(taskFn(data));
-    } catch (e) {
-      handleError(e);
-    }
-
-    function handleResponse (response) {
-      // If a promise
-      if (response && typeof response.then === "function") {
-        response.then(val => self.postMessage({ id, response: val }), handleError);
-      }
-      // If an error object
-      else if (response instanceof Error) {
-        handleError(response);
-      }
-      // If anything else
-      else {
-        self.postMessage({ id, response });
-      }
-    }
-
-    function handleError (e="Error") {
-      self.postMessage({ id, error: e.message || e });
-    }
-  }
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/worker.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/worker.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/shared/worker.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/shared/worker.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,134 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-(function (factory) { // Module boilerplate
-  if (this.module && module.id.indexOf("worker") >= 0) { // require
-    const { Cc, Ci, ChromeWorker } = require("chrome");
-    factory.call(this, require, exports, module, { Cc, Ci }, ChromeWorker);
-  } else { // Cu.import
-      const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
-      const { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-      this.isWorker = false;
-      this.Promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
-      this.console = Cu.import("resource://gre/modules/devtools/Console.jsm", {}).console;
-      factory.call(this, devtools.require, this, { exports: this }, { Cc, Ci }, ChromeWorker);
-      this.EXPORTED_SYMBOLS = ["DevToolsWorker"];
-  }
-}).call(this, function (require, exports, module, { Ci, Cc }, ChromeWorker ) {
-
-let MESSAGE_COUNTER = 0;
-
-/**
- * Creates a wrapper around a ChromeWorker, providing easy
- * communication to offload demanding tasks. The corresponding URL
- * must implement the interface provided by `devtools/shared/worker-helper`.
- *
- * @see `./browser/devtools/shared/widgets/GraphsWorker.js`
- *
- * @param {string} url
- *        The URL of the worker.
- */
-function DevToolsWorker (url) {
-  this._worker = new ChromeWorker(url);
-}
-exports.DevToolsWorker = DevToolsWorker;
-
-/**
- * Performs the given task in a chrome worker, passing in data.
- * Returns a promise that resolves when the task is completed, resulting in
- * the return value of the task.
- *
- * @param {string} task
- *        The name of the task to execute in the worker.
- * @param {any} data
- *        Data to be passed into the task implemented by the worker.
- * @return {Promise}
- */
-DevToolsWorker.prototype.performTask = function DevToolsWorkerPerformTask (task, data) {
-  if (this._destroyed) {
-    return Promise.reject("Cannot call performTask on a destroyed DevToolsWorker");
-  }
-  let worker = this._worker;
-  let id = ++MESSAGE_COUNTER;
-  worker.postMessage({ task, id, data });
-
-  return new Promise(function (resolve, reject) {
-    worker.addEventListener("message", function listener({ data }) {
-      if (data.id !== id) {
-        return;
-      }
-      worker.removeEventListener("message", listener);
-      if (data.error) {
-        reject(data.error);
-      } else {
-        resolve(data.response);
-      }
-    });
-  });
-}
-
-/**
- * Terminates the underlying worker. Use when no longer needing the worker.
- */
-DevToolsWorker.prototype.destroy = function DevToolsWorkerDestroy () {
-  this._worker.terminate();
-  this._worker = null;
-  this._destroyed = true;
-};
-
-/**
- * Takes a function and returns a Worker-wrapped version of the same function.
- * Returns a promise upon resolution.
- * @see `./browser/devtools/shared/test/browser_devtools-worker-03.js
- *
- * * * * ! ! ! This should only be used for tests or A/B testing performance ! ! ! * * * * * *
- *
- * The original function must:
- *
- * Be a pure function, that is, not use any variables not declared within the
- * function, or its arguments.
- *
- * Return a value or a promise.
- *
- * Note any state change in the worker will not affect the callee's context.
- *
- * @param {function} fn
- * @return {function}
- */
-function workerify (fn) {
-  console.warn(`\`workerify\` should only be used in tests or measuring performance.
-  This creates an object URL on the browser window, and should not be used in production.`)
-  // Fetch via window/utils here as we don't want to include
-  // this module normally.
-  let { getMostRecentBrowserWindow } = require("sdk/window/utils");
-  let { URL, Blob } = getMostRecentBrowserWindow();
-  let stringifiedFn = createWorkerString(fn);
-  let blob = new Blob([stringifiedFn]);
-  let url = URL.createObjectURL(blob);
-  let worker = new DevToolsWorker(url);
-
-  let wrapperFn = data => worker.performTask("workerifiedTask", data);
-
-  wrapperFn.destroy = function () {
-    URL.revokeObjectURL(url);
-    worker.destroy();
-  };
-
-  return wrapperFn;
-}
-exports.workerify = workerify;
-
-/**
- * Takes a function, and stringifies it, attaching the worker-helper.js
- * boilerplate hooks.
- */
-function createWorkerString (fn) {
-  return `importScripts("resource://gre/modules/workers/require.js");
-    const { createTask } = require("resource:///modules/devtools/shared/worker-helper");
-    createTask(self, "workerifiedTask", ${fn.toString()});
-  `;
-}
-
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/sourceeditor/css-autocompleter.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/sourceeditor/css-autocompleter.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/sourceeditor/css-autocompleter.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/sourceeditor/css-autocompleter.js	2015-05-25 20:42:57.000000000 +0000
@@ -3,7 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const { Cc, Ci, Cu } = require('chrome');
-const cssTokenizer  = require("devtools/sourceeditor/css-tokenizer");
+const {cssTokenizer, cssTokenizerWithLineColumn}  =
+      require("devtools/sourceeditor/css-tokenizer");
 const promise = Cu.import("resource://gre/modules/Promise.jsm");
 
 /**
@@ -180,18 +181,17 @@
     else {
       this.nullStates = [];
     }
-    let tokens = cssTokenizer(source, {loc:true});
+    let tokens = cssTokenizerWithLineColumn(source);
     let tokIndex = tokens.length - 1;
-    if (tokens[tokIndex].loc.end.line < line ||
-       (tokens[tokIndex].loc.end.line === line &&
-        tokens[tokIndex].loc.end.column < ch)) {
-      // If the last token is not an EOF, we didn't tokenize it correctly.
-      // This special case is handled in case we couldn't tokenize, but the last
-      // token that *could be tokenized* was an identifier.
+    if (tokIndex >=0 &&
+        (tokens[tokIndex].loc.end.line < line ||
+         (tokens[tokIndex].loc.end.line === line &&
+          tokens[tokIndex].loc.end.column < ch))) {
+      // If the last token ends before the cursor location, we didn't
+      // tokenize it correctly.  This special case can happen if the
+      // final token is a comment.
       return null;
     }
-    // Since last token is EOF, the cursor token is last - 1
-    tokIndex--;
 
     let cursor = 0;
     // This will maintain a stack of paired elements like { & }, @m & }, : & ; etc
@@ -202,13 +202,14 @@
         case CSS_STATES.property:
           // From CSS_STATES.property, we can either go to CSS_STATES.value state
           // when we hit the first ':' or CSS_STATES.selector if "}" is reached.
-          switch(token.tokenType) {
+          if (token.tokenType === "symbol") {
+            switch(token.text) {
             case ":":
               scopeStack.push(":");
-              if (tokens[cursor - 2].tokenType != "WHITESPACE")
-                propertyName = tokens[cursor - 2].value;
+              if (tokens[cursor - 2].tokenType != "whitespace")
+                propertyName = tokens[cursor - 2].text;
               else
-                propertyName = tokens[cursor - 3].value;
+                propertyName = tokens[cursor - 3].text;
               _state = CSS_STATES.value;
               break;
 
@@ -224,13 +225,15 @@
                 }
               }
               break;
+            }
           }
           break;
 
         case CSS_STATES.value:
           // From CSS_STATES.value, we can go to one of CSS_STATES.property,
           // CSS_STATES.frame, CSS_STATES.selector and CSS_STATES.null
-          switch(token.tokenType) {
+          if (token.tokenType === "symbol") {
+            switch(token.text) {
             case ";":
               if (/[:]/.test(peek(scopeStack))) {
                 scopeStack.pop();
@@ -253,13 +256,14 @@
                 }
               }
               break;
+            }
           }
           break;
 
         case CSS_STATES.selector:
           // From CSS_STATES.selector, we can only go to CSS_STATES.property when
           // we hit "{"
-          if (token.tokenType == "{") {
+          if (token.tokenType === "symbol" && token.text == "{") {
             scopeStack.push("{");
             _state = CSS_STATES.property;
             selectors.push(selector);
@@ -271,76 +275,71 @@
             case SELECTOR_STATES.class:
             case SELECTOR_STATES.tag:
               switch(token.tokenType) {
-                case "HASH":
+                case "hash":
+                case "id":
                   selectorState = SELECTOR_STATES.id;
-                  selector += "#" + token.value;
+                  selector += "#" + token.text;
                   break;
 
-                case "DELIM":
-                  if (token.value == ".") {
+                case "symbol":
+                  if (token.text == ".") {
                     selectorState = SELECTOR_STATES.class;
                     selector += ".";
                     if (cursor <= tokIndex &&
-                        tokens[cursor].tokenType == "IDENT") {
+                        tokens[cursor].tokenType == "ident") {
                       token = tokens[cursor++];
-                      selector += token.value;
+                      selector += token.text;
                     }
-                  } else if (token.value == "#") {
+                  } else if (token.text == "#") {
                     selectorState = SELECTOR_STATES.id;
                     selector += "#";
-                  } else if (/[>~+]/.test(token.value)) {
+                  } else if (/[>~+]/.test(token.text)) {
                     selectorState = SELECTOR_STATES.null;
-                    selector += token.value;
-                  } else if (token.value == ",") {
+                    selector += token.text;
+                  } else if (token.text == ",") {
                     selectorState = SELECTOR_STATES.null;
                     selectors.push(selector);
                     selector = "";
-                  }
-                  break;
-
-                case ":":
-                  selectorState = SELECTOR_STATES.pseudo;
-                  selector += ":";
-                  if (cursor > tokIndex)
-                    break;
-
-                  token = tokens[cursor++];
-                  switch(token.tokenType) {
-                    case "FUNCTION":
-                      if (token.value == "not") {
-                        selectorBeforeNot = selector;
-                        selector = "";
-                        scopeStack.push("(");
-                      } else {
-                        selector += token.value + "(";
-                      }
-                      selectorState = SELECTOR_STATES.null;
+                  } else if (token.text == ":") {
+                    selectorState = SELECTOR_STATES.pseudo;
+                    selector += ":";
+                    if (cursor > tokIndex)
                       break;
 
-                    case "IDENT":
-                      selector += token.value;
-                      break;
-                  }
-                  break;
-
-                case "[":
-                  selectorState = SELECTOR_STATES.attribute;
-                  scopeStack.push("[");
-                  selector += "[";
-                  break;
-
-                case ")":
-                  if (peek(scopeStack) == "(") {
-                    scopeStack.pop();
-                    selector = selectorBeforeNot + "not(" + selector + ")";
-                    selectorBeforeNot = null;
-                  } else {
-                    selector += ")";
+                    token = tokens[cursor++];
+                    switch(token.tokenType) {
+                      case "function":
+                        if (token.text == "not") {
+                          selectorBeforeNot = selector;
+                          selector = "";
+                          scopeStack.push("(");
+                        } else {
+                          selector += token.text + "(";
+                        }
+                        selectorState = SELECTOR_STATES.null;
+                        break;
+
+                      case "ident":
+                        selector += token.text;
+                        break;
+                    }
+                  } else if (token.text == "[") {
+                    selectorState = SELECTOR_STATES.attribute;
+                    scopeStack.push("[");
+                    selector += "[";
+                  } else if (token.text == ")") {
+                    if (peek(scopeStack) == "(") {
+                      scopeStack.pop();
+                      selector = selectorBeforeNot + "not(" + selector + ")";
+                      selectorBeforeNot = null;
+                    } else {
+                      selector += ")";
+                    }
+                    selectorState = SELECTOR_STATES.null;
                   }
-                  selectorState = SELECTOR_STATES.null;
                   break;
 
-                case "WHITESPACE":
+                case "whitespace":
                   selectorState = SELECTOR_STATES.null;
                   selector && (selector += " ");
                   break;
@@ -351,83 +350,78 @@
               // From SELECTOR_STATES.null state, we can go to one of
               // SELECTOR_STATES.id, SELECTOR_STATES.class or SELECTOR_STATES.tag
               switch(token.tokenType) {
-                case "HASH":
+                case "hash":
+                case "id":
                   selectorState = SELECTOR_STATES.id;
-                  selector += "#" + token.value;
+                  selector += "#" + token.text;
                   break;
 
-                case "IDENT":
+                case "ident":
                   selectorState = SELECTOR_STATES.tag;
-                  selector += token.value;
+                  selector += token.text;
                   break;
 
-                case "DELIM":
-                  if (token.value == ".") {
+                case "symbol":
+                  if (token.text == ".") {
                     selectorState = SELECTOR_STATES.class;
                     selector += ".";
                     if (cursor <= tokIndex &&
-                        tokens[cursor].tokenType == "IDENT") {
+                        tokens[cursor].tokenType == "ident") {
                       token = tokens[cursor++];
-                      selector += token.value;
+                      selector += token.text;
                     }
-                  } else if (token.value == "#") {
+                  } else if (token.text == "#") {
                     selectorState = SELECTOR_STATES.id;
                     selector += "#";
-                  } else if (token.value == "*") {
+                  } else if (token.text == "*") {
                     selectorState = SELECTOR_STATES.tag;
                     selector += "*";
-                  } else if (/[>~+]/.test(token.value)) {
-                    selector += token.value;
-                  } else if (token.value == ",") {
+                  } else if (/[>~+]/.test(token.text)) {
+                    selector += token.text;
+                  } else if (token.text == ",") {
                     selectorState = SELECTOR_STATES.null;
                     selectors.push(selector);
                     selector = "";
-                  }
-                  break;
-
-                case ":":
-                  selectorState = SELECTOR_STATES.pseudo;
-                  selector += ":";
-                  if (cursor > tokIndex)
-                    break;
-
-                  token = tokens[cursor++];
-                  switch(token.tokenType) {
-                    case "FUNCTION":
-                      if (token.value == "not") {
-                        selectorBeforeNot = selector;
-                        selector = "";
-                        scopeStack.push("(");
-                      } else {
-                        selector += token.value + "(";
-                      }
-                      selectorState = SELECTOR_STATES.null;
-                      break;
-
-                    case "IDENT":
-                      selector += token.value;
+                  } else if (token.text == ":") {
+                    selectorState = SELECTOR_STATES.pseudo;
+                    selector += ":";
+                    if (cursor > tokIndex)
                       break;
-                  }
-                  break;
-
-                case "[":
-                  selectorState = SELECTOR_STATES.attribute;
-                  scopeStack.push("[");
-                  selector += "[";
-                  break;
 
-                case ")":
-                  if (peek(scopeStack) == "(") {
-                    scopeStack.pop();
-                    selector = selectorBeforeNot + "not(" + selector + ")";
-                    selectorBeforeNot = null;
-                  } else {
-                    selector += ")";
+                    token = tokens[cursor++];
+                    switch(token.tokenType) {
+                      case "function":
+                        if (token.text == "not") {
+                          selectorBeforeNot = selector;
+                          selector = "";
+                          scopeStack.push("(");
+                        } else {
+                          selector += token.text + "(";
+                        }
+                        selectorState = SELECTOR_STATES.null;
+                        break;
+
+                      case "ident":
+                        selector += token.text;
+                        break;
+                    }
+                  } else if (token.text == "[") {
+                    selectorState = SELECTOR_STATES.attribute;
+                    scopeStack.push("[");
+                    selector += "[";
+                  } else if (token.text == ")") {
+                    if (peek(scopeStack) == "(") {
+                      scopeStack.pop();
+                      selector = selectorBeforeNot + "not(" + selector + ")";
+                      selectorBeforeNot = null;
+                    } else {
+                      selector += ")";
+                    }
+                    selectorState = SELECTOR_STATES.null;
                   }
-                  selectorState = SELECTOR_STATES.null;
                   break;
 
-                case "WHITESPACE":
+                case "whitespace":
                   selector && (selector += " ");
                   break;
               }
@@ -435,49 +429,45 @@
 
             case SELECTOR_STATES.pseudo:
               switch(token.tokenType) {
-                case "DELIM":
-                  if (/[>~+]/.test(token.value)) {
+                case "symbol":
+                  if (/[>~+]/.test(token.text)) {
                     selectorState = SELECTOR_STATES.null;
-                    selector += token.value;
-                  } else if (token.value == ",") {
+                    selector += token.text;
+                  } else if (token.text == ",") {
                     selectorState = SELECTOR_STATES.null;
                     selectors.push(selector);
                     selector = "";
-                  }
-                  break;
-
-                case ":":
-                  selectorState = SELECTOR_STATES.pseudo;
-                  selector += ":";
-                  if (cursor > tokIndex)
-                    break;
-
-                  token = tokens[cursor++];
-                  switch(token.tokenType) {
-                    case "FUNCTION":
-                      if (token.value == "not") {
-                        selectorBeforeNot = selector;
-                        selector = "";
-                        scopeStack.push("(");
-                      } else {
-                        selector += token.value + "(";
-                      }
-                      selectorState = SELECTOR_STATES.null;
+                  } else if (token.text == ":") {
+                    selectorState = SELECTOR_STATES.pseudo;
+                    selector += ":";
+                    if (cursor > tokIndex)
                       break;
 
-                    case "IDENT":
-                      selector += token.value;
-                      break;
+                    token = tokens[cursor++];
+                    switch(token.tokenType) {
+                      case "function":
+                        if (token.text == "not") {
+                          selectorBeforeNot = selector;
+                          selector = "";
+                          scopeStack.push("(");
+                        } else {
+                          selector += token.text + "(";
+                        }
+                        selectorState = SELECTOR_STATES.null;
+                        break;
+
+                      case "ident":
+                        selector += token.text;
+                        break;
+                    }
+                  } else if (token.text == "[") {
+                    selectorState = SELECTOR_STATES.attribute;
+                    scopeStack.push("[");
+                    selector += "[";
                   }
                   break;
 
-                case "[":
-                  selectorState = SELECTOR_STATES.attribute;
-                  scopeStack.push("[");
-                  selector += "[";
-                  break;
-
-                case "WHITESPACE":
+                case "whitespace":
                   selectorState = SELECTOR_STATES.null;
                   selector && (selector += " ");
                   break;
@@ -486,31 +476,28 @@
 
             case SELECTOR_STATES.attribute:
               switch(token.tokenType) {
-                case "DELIM":
-                  if (/[~|^$*]/.test(token.value)) {
-                    selector += token.value;
+                case "symbol":
+                  if (/[~|^$*]/.test(token.text)) {
+                    selector += token.text;
                     token = tokens[cursor++];
-                  }
-                  if(token.value == "=") {
+                  } else if (token.text == "=") {
                     selectorState = SELECTOR_STATES.value;
-                    selector += token.value;
-                  }
-                  break;
+                    selector += token.text;
+                  } else if (token.text == "]") {
+                    if (peek(scopeStack) == "[")
+                      scopeStack.pop();
 
-                case "IDENT":
-                case "STRING":
-                  selector += token.value;
+                    selectorState = SELECTOR_STATES.null;
+                    selector += "]";
+                  }
                   break;
 
-                case "]":
-                  if (peek(scopeStack) == "[")
-                    scopeStack.pop();
-
-                  selectorState = SELECTOR_STATES.null;
-                  selector += "]";
+                case "ident":
+                case "string":
+                  selector += token.text;
                   break;
 
-                case "WHITESPACE":
+                case "whitespace":
                   selector && (selector += " ");
                   break;
               }
@@ -518,20 +505,22 @@
 
             case SELECTOR_STATES.value:
               switch(token.tokenType) {
-                case "STRING":
-                case "IDENT":
-                  selector += token.value;
+                case "string":
+                case "ident":
+                  selector += token.text;
                   break;
 
-                case "]":
-                  if (peek(scopeStack) == "[")
-                    scopeStack.pop();
+                case "symbol":
+                  if (token.text == "]") {
+                    if (peek(scopeStack) == "[")
+                      scopeStack.pop();
 
-                  selectorState = SELECTOR_STATES.null;
-                  selector += "]";
+                    selectorState = SELECTOR_STATES.null;
+                    selector += "]";
+                  }
                   break;
 
-                case "WHITESPACE":
+                case "whitespace":
                   selector && (selector += " ");
                   break;
               }
@@ -543,89 +532,83 @@
           // From CSS_STATES.null state, we can go to either CSS_STATES.media or
           // CSS_STATES.selector.
           switch(token.tokenType) {
-            case "HASH":
+            case "hash":
+            case "id":
               selectorState = SELECTOR_STATES.id;
-              selector = "#" + token.value;
+              selector = "#" + token.text;
               _state = CSS_STATES.selector;
               break;
 
-            case "IDENT":
+            case "ident":
               selectorState = SELECTOR_STATES.tag;
-              selector = token.value;
+              selector = token.text;
               _state = CSS_STATES.selector;
               break;
 
-            case "DELIM":
-              if (token.value == ".") {
+            case "symbol":
+              if (token.text == ".") {
                 selectorState = SELECTOR_STATES.class;
                 selector = ".";
                 _state = CSS_STATES.selector;
                 if (cursor <= tokIndex &&
-                    tokens[cursor].tokenType == "IDENT") {
+                    tokens[cursor].tokenType == "ident") {
                   token = tokens[cursor++];
-                  selector += token.value;
+                  selector += token.text;
                 }
-              } else if (token.value == "#") {
+              } else if (token.text == "#") {
                 selectorState = SELECTOR_STATES.id;
                 selector = "#";
                 _state = CSS_STATES.selector;
-              } else if (token.value == "*") {
+              } else if (token.text == "*") {
                 selectorState = SELECTOR_STATES.tag;
                 selector = "*";
                 _state = CSS_STATES.selector;
-              }
-              break;
-
-            case ":":
-              _state = CSS_STATES.selector;
-              selectorState = SELECTOR_STATES.pseudo;
-              selector += ":";
-              if (cursor > tokIndex)
-                break;
-
-              token = tokens[cursor++];
-              switch(token.tokenType) {
-                case "FUNCTION":
-                  if (token.value == "not") {
-                    selectorBeforeNot = selector;
-                    selector = "";
-                    scopeStack.push("(");
-                  } else {
-                    selector += token.value + "(";
-                  }
-                  selectorState = SELECTOR_STATES.null;
+              } else if (token.text == ":") {
+                _state = CSS_STATES.selector;
+                selectorState = SELECTOR_STATES.pseudo;
+                selector += ":";
+                if (cursor > tokIndex)
                   break;
 
-                case "IDENT":
-                  selector += token.value;
-                  break;
-              }
-              break;
+                token = tokens[cursor++];
+                switch(token.tokenType) {
+                  case "function":
+                    if (token.text == "not") {
+                      selectorBeforeNot = selector;
+                      selector = "";
+                      scopeStack.push("(");
+                    } else {
+                      selector += token.text + "(";
+                    }
+                    selectorState = SELECTOR_STATES.null;
+                    break;
 
-            case "[":
-              _state = CSS_STATES.selector;
-              selectorState = SELECTOR_STATES.attribute;
-              scopeStack.push("[");
-              selector += "[";
+                  case "ident":
+                    selector += token.text;
+                    break;
+                }
+              } else if (token.text == "[") {
+                _state = CSS_STATES.selector;
+                selectorState = SELECTOR_STATES.attribute;
+                scopeStack.push("[");
+                selector += "[";
+              } else if (token.text == "}") {
+                if (peek(scopeStack) == "@m")
+                  scopeStack.pop();
+              }
               break;
 
-            case "AT-KEYWORD":
-              _state = token.value.startsWith("m") ? CSS_STATES.media
+            case "at":
+              _state = token.text.startsWith("m") ? CSS_STATES.media
                                                    : CSS_STATES.keyframes;
               break;
-
-            case "}":
-              if (peek(scopeStack) == "@m")
-                scopeStack.pop();
-
-              break;
           }
           break;
 
         case CSS_STATES.media:
           // From CSS_STATES.media, we can only go to CSS_STATES.null state when
           // we hit the first '{'
-          if (token.tokenType == "{") {
+          if (token.tokenType == "symbol" && token.text == "{") {
             scopeStack.push("@m");
             _state = CSS_STATES.null;
           }
@@ -634,7 +617,7 @@
         case CSS_STATES.keyframes:
           // From CSS_STATES.keyframes, we can only go to CSS_STATES.frame state
           // when we hit the first '{'
-          if (token.tokenType == "{") {
+          if (token.tokenType == "symbol" && token.text == "{") {
             scopeStack.push("@k");
             _state = CSS_STATES.frame;
           }
@@ -643,14 +626,16 @@
         case CSS_STATES.frame:
           // From CSS_STATES.frame, we can either go to CSS_STATES.property state
           // when we hit the first '{' or to CSS_STATES.selector when we hit '}'
-          if (token.tokenType == "{") {
-            scopeStack.push("f");
-            _state = CSS_STATES.property;
-          } else if (token.tokenType == "}") {
-            if (peek(scopeStack) == "@k")
-              scopeStack.pop();
+          if (token.tokenType == "symbol") {
+            if (token.text == "{") {
+              scopeStack.push("f");
+              _state = CSS_STATES.property;
+            } else if (token.text == "}") {
+              if (peek(scopeStack) == "@k")
+                scopeStack.pop();
 
-            _state = CSS_STATES.null;
+              _state = CSS_STATES.null;
+            }
           }
           break;
       }
@@ -682,10 +667,14 @@
     }
     this.selectors = selectors;
 
-    if (token && token.tokenType != "WHITESPACE") {
-      this.completing = ((token.value || token.repr || token.tokenType) + "")
-                          .slice(0, ch - token.loc.start.column)
-                          .replace(/^[.#]$/, "");
+    if (token && token.tokenType != "whitespace") {
+      let text;
+      if (token.tokenType == "dimension" || !token.text)
+        text = source.substring(token.startOffset, token.endOffset);
+      else
+        text = token.text;
+      this.completing = (text.slice(0, ch - token.loc.start.column)
+                         .replace(/^[.#]$/, ""));
     } else {
       this.completing = "";
     }
@@ -695,7 +684,7 @@
       this.completing = "";
 
     // Special check for !important; case.
-    if (token && tokens[cursor - 2] && tokens[cursor - 2].value == "!" &&
+    if (token && tokens[cursor - 2] && tokens[cursor - 2].text == "!" &&
         this.completing == "important".slice(0, this.completing.length)) {
       this.completing = "!" + this.completing;
     }
@@ -989,38 +978,41 @@
         if (line == caret.line)
           lineText = lineText.substring(caret.ch);
 
-        let tokens = cssTokenizer(lineText, {loc: true});
+        let prevToken = undefined;
+        let tokens = cssTokenizer(lineText);
         let found = false;
         let ech = line == caret.line ? caret.ch : 0;
-        for (let i = 0; i < tokens.length; i++) {
-          let token = tokens[i];
+        for (let token of tokens) {
           // If the line is completely spaces, handle it differently
           if (lineText.trim() == "") {
             limitedSource += lineText;
           } else {
             limitedSource += sourceArray[line]
-                              .substring(ech + token.loc.start.column,
-                                         ech + token.loc.end.column);
+                              .substring(ech + token.startOffset,
+                                         ech + token.endOffset);
           }
 
           // Whitespace cannot change state.
-          if (token.tokenType == "WHITESPACE")
+          if (token.tokenType == "whitespace") {
+            prevToken = token;
             continue;
+          }
 
           let state = this.resolveState(limitedSource, {
             line: line,
-            ch: token.loc.end.column + ech
+            ch: token.endOffset + ech
           });
           if (check(state)) {
-            if (tokens[i - 1] && tokens[i - 1].tokenType == "WHITESPACE")
-              token = tokens[i - 1];
+            if (prevToken && prevToken.tokenType == "whitespace")
+              token = prevToken;
             location = {
               line: line,
-              ch: token.loc.start.column + ech
+              ch: token.startOffset + ech
             };
             found = true;
             break;
           }
+          prevToken = token;
         }
         limitedSource += "\n";
         if (found)
@@ -1047,33 +1039,33 @@
         if (line == caret.line)
           lineText = lineText.substring(0, caret.ch);
 
-        let tokens = cssTokenizer(lineText, {loc: true});
+        let tokens = Array.from(cssTokenizer(lineText));
         let found = false;
         let ech = 0;
-        for (let i = tokens.length - 2; i >= 0; i--) {
+        for (let i = tokens.length - 1; i >= 0; i--) {
           let token = tokens[i];
           // If the line is completely spaces, handle it differently
           if (lineText.trim() == "") {
             limitedSource = limitedSource.slice(0, -1 * lineText.length);
           } else {
-            let length = token.loc.end.column - token.loc.start.column;
+            let length = token.endOffset - token.startOffset;
             limitedSource = limitedSource.slice(0, -1 * length);
           }
 
           // Whitespace cannot change state.
-          if (token.tokenType == "WHITESPACE")
+          if (token.tokenType == "whitespace")
             continue;
 
           let state = this.resolveState(limitedSource, {
             line: line,
-            ch: token.loc.start.column
+            ch: token.startOffset
           });
           if (check(state)) {
-            if (tokens[i + 1] && tokens[i + 1].tokenType == "WHITESPACE")
+            if (tokens[i + 1] && tokens[i + 1].tokenType == "whitespace")
               token = tokens[i + 1];
             location = {
               line: line,
-              ch: isValue ? token.loc.end.column: token.loc.start.column
+              ch: isValue ? token.endOffset: token.startOffset
             };
             found = true;
             break;
@@ -1121,21 +1113,23 @@
     }
     else if (state == CSS_STATES.property) {
       // A property can only be a single word and thus very easy to calculate.
-      let tokens = cssTokenizer(sourceArray[line], {loc: true});
+      let tokens = cssTokenizer(sourceArray[line]);
       for (let token of tokens) {
-        if (token.loc.start.column <= ch && token.loc.end.column >= ch) {
+        // Note that, because we're tokenizing a single line, the
+        // token's offset is also the column number.
+        if (token.startOffset <= ch && token.endOffset >= ch) {
           return {
             state: state,
-            propertyName: token.value,
+            propertyName: token.text,
             selectors: this.selectors,
             loc: {
               start: {
                 line: line,
-                ch: token.loc.start.column
+                ch: token.startOffset
               },
               end: {
                 line: line,
-                ch: token.loc.end.column
+                ch: token.endOffset
               }
             }
           };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/sourceeditor/css-tokenizer.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/sourceeditor/css-tokenizer.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/sourceeditor/css-tokenizer.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/sourceeditor/css-tokenizer.js	2015-05-25 20:42:57.000000000 +0000
@@ -1,717 +1,95 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const {Cc, Ci} = require("chrome");
+loader.lazyGetter(this, "DOMUtils", () => {
+  return Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils);
+});
+
 /**
- * This file is taken from the below mentioned url and is under CC0 license.
- * https://github.com/tabatkins/css-parser/blob/master/tokenizer.js
- * Please retain this comment while updating this file from upstream.
+ * A generator function that lexes a CSS source string, yielding the
+ * CSS tokens.  Comment tokens are dropped.
+ *
+ * @param {String} CSS source string
+ * @yield {CSSToken} The next CSSToken that is lexed
+ * @see CSSToken for details about the returned tokens
  */
-
-(function (root, factory) {
-    // Universal Module Definition (UMD) to support AMD, CommonJS/Node.js,
-    // Rhino, and plain browser loading.
-    if (typeof define === 'function' && define.amd) {
-        define(['exports'], factory);
-    } else if (typeof exports !== 'undefined') {
-        factory(exports);
-    } else {
-        factory(root);
-    }
-}(this, function (exports) {
-
-var between = function (num, first, last) { return num >= first && num <= last; }
-function digit(code) { return between(code, 0x30,0x39); }
-function hexdigit(code) { return digit(code) || between(code, 0x41,0x46) || between(code, 0x61,0x66); }
-function uppercaseletter(code) { return between(code, 0x41,0x5a); }
-function lowercaseletter(code) { return between(code, 0x61,0x7a); }
-function letter(code) { return uppercaseletter(code) || lowercaseletter(code); }
-function nonascii(code) { return code >= 0xa0; }
-function namestartchar(code) { return letter(code) || nonascii(code) || code == 0x5f; }
-function namechar(code) { return namestartchar(code) || digit(code) || code == 0x2d; }
-function nonprintable(code) { return between(code, 0,8) || between(code, 0xe,0x1f) || between(code, 0x7f,0x9f); }
-function newline(code) { return code == 0xa || code == 0xc; }
-function whitespace(code) { return newline(code) || code == 9 || code == 0x20; }
-function badescape(code) { return newline(code) || isNaN(code); }
-
-// Note: I'm not yet acting smart enough to actually handle astral characters.
-var maximumallowedcodepoint = 0x10ffff;
-
-function tokenize(str, options) {
-  if(options == undefined) options = {transformFunctionWhitespace:false, scientificNotation:false};
-  var i = -1;
-  var tokens = [];
-  var state = "data";
-  var code;
-  var currtoken;
-
-  // Line number information.
-  var line = 0;
-  var column = 0;
-  // The only use of lastLineLength is in reconsume().
-  var lastLineLength = 0;
-  var incrLineno = function() {
-    line += 1;
-    lastLineLength = column;
-    column = 0;
-  };
-  var locStart = {line:line, column:column};
-
-  var next = function(num) { if(num === undefined) num = 1; return str.charCodeAt(i+num); };
-  var consume = function(num) {
-    if(num === undefined)
-      num = 1;
-    i += num;
-    code = str.charCodeAt(i);
-    if (newline(code)) incrLineno();
-    else column += num;
-    //console.log('Consume '+i+' '+String.fromCharCode(code) + ' 0x' + code.toString(16));
-    return true;
-  };
-  var reconsume = function() {
-    i -= 1;
-    if (newline(code)) {
-      line -= 1;
-      column = lastLineLength;
-    } else {
-      column -= 1;
-    }
-    locStart.line = line;
-    locStart.column = column;
-    return true;
-  };
-  var eof = function() { return i >= str.length; };
-  var donothing = function() {};
-  var emit = function(token) {
-    if(token) {
-      token.finish();
-    } else {
-      token = currtoken.finish();
-    }
-    if (options.loc === true) {
-      token.loc = {};
-      token.loc.start = {line:locStart.line, column:locStart.column};
-      locStart = {line: line, column: column};
-      token.loc.end = locStart;
+function* cssTokenizer(string) {
+  let lexer = DOMUtils.getCSSLexer(string);
+  while (true) {
+    let token = lexer.nextToken();
+    if (!token) {
+      break;
     }
-    tokens.push(token);
-    //console.log('Emitting ' + token);
-    currtoken = undefined;
-    return true;
-  };
-  var create = function(token) { currtoken = token; return true; };
-  var parseerror = function() { console.log("Parse error at index " + i + ", processing codepoint 0x" + code.toString(16) + " in state " + state + ".");return true; };
-  var switchto = function(newstate) {
-    state = newstate;
-    //console.log('Switching to ' + state);
-    return true;
-  };
-  var consumeEscape = function() {
-    // Assume the the current character is the \
-    consume();
-    if(hexdigit(code)) {
-      // Consume 1-6 hex digits
-      var digits = [];
-      for(var total = 0; total < 6; total++) {
-        if(hexdigit(code)) {
-          digits.push(code);
-          consume();
-        } else { break; }
-      }
-      var value = parseInt(digits.map(String.fromCharCode).join(''), 16);
-      if( value > maximumallowedcodepoint ) value = 0xfffd;
-      // If the current char is whitespace, cool, we'll just eat it.
-      // Otherwise, put it back.
-      if(!whitespace(code)) reconsume();
-      return value;
-    } else {
-      return code;
+    // None of the existing consumers want comments.
+    if (token.tokenType !== "comment") {
+      yield token;
     }
-  };
-
-  for(;;) {
-    if(i > str.length*2) return "I'm infinite-looping!";
-    consume();
-    switch(state) {
-    case "data":
-      if(whitespace(code)) {
-        emit(new WhitespaceToken);
-        while(whitespace(next())) consume();
-      }
-      else if(code == 0x22) switchto("double-quote-string");
-      else if(code == 0x23) switchto("hash");
-      else if(code == 0x27) switchto("single-quote-string");
-      else if(code == 0x28) emit(new OpenParenToken);
-      else if(code == 0x29) emit(new CloseParenToken);
-      else if(code == 0x2b) {
-        if(digit(next()) || (next() == 0x2e && digit(next(2)))) switchto("number") && reconsume();
-        else emit(new DelimToken(code));
-      }
-      else if(code == 0x2d) {
-        if(next(1) == 0x2d && next(2) == 0x3e) consume(2) && emit(new CDCToken);
-        else if(digit(next()) || (next(1) == 0x2e && digit(next(2)))) switchto("number") && reconsume();
-        else if(namestartchar(next())) switchto("identifier") && reconsume();
-        else emit(new DelimToken(code));
-      }
-      else if(code == 0x2e) {
-        if(digit(next())) switchto("number") && reconsume();
-        else emit(new DelimToken(code));
-      }
-      else if(code == 0x2f) {
-        if(next() == 0x2a) switchto("comment");
-        else emit(new DelimToken(code));
-      }
-      else if(code == 0x3a) emit(new ColonToken);
-      else if(code == 0x3b) emit(new SemicolonToken);
-      else if(code == 0x3c) {
-        if(next(1) == 0x21 && next(2) == 0x2d && next(3) == 0x2d) consume(3) && emit(new CDOToken);
-        else emit(new DelimToken(code));
-      }
-      else if(code == 0x40) switchto("at-keyword");
-      else if(code == 0x5b) emit(new OpenSquareToken);
-      else if(code == 0x5c) {
-        if(badescape(next())) parseerror() && emit(new DelimToken(code));
-        else switchto("identifier") && reconsume();
-      }
-      else if(code == 0x5d) emit(new CloseSquareToken);
-      else if(code == 0x7b) emit(new OpenCurlyToken);
-      else if(code == 0x7d) emit(new CloseCurlyToken);
-      else if(digit(code)) switchto("number") && reconsume();
-      else if(code == 0x55 || code == 0x75) {
-        if(next(1) == 0x2b && hexdigit(next(2))) consume() && switchto("unicode-range");
-        else if((next(1) == 0x52 || next(1) == 0x72) && (next(2) == 0x4c || next(2) == 0x6c) && (next(3) == 0x28)) consume(3) && switchto("url");
-        else switchto("identifier") && reconsume();
-      }
-      else if(namestartchar(code)) switchto("identifier") && reconsume();
-      else if(eof()) { emit(new EOFToken); return tokens; }
-      else emit(new DelimToken(code));
-      break;
-
-    case "double-quote-string":
-      if(currtoken == undefined) create(new StringToken);
-
-      if(code == 0x22) emit() && switchto("data");
-      else if(eof()) parseerror() && emit() && switchto("data");
-      else if(newline(code)) parseerror() && emit(new BadStringToken) && switchto("data") && reconsume();
-      else if(code == 0x5c) {
-        if(badescape(next())) parseerror() && emit(new BadStringToken) && switchto("data");
-        else if(newline(next())) consume();
-        else currtoken.append(consumeEscape());
-      }
-      else currtoken.append(code);
-      break;
-
-    case "single-quote-string":
-      if(currtoken == undefined) create(new StringToken);
-
-      if(code == 0x27) emit() && switchto("data");
-      else if(eof()) parseerror() && emit() && switchto("data");
-      else if(newline(code)) parseerror() && emit(new BadStringToken) && switchto("data") && reconsume();
-      else if(code == 0x5c) {
-        if(badescape(next())) parseerror() && emit(new BadStringToken) && switchto("data");
-        else if(newline(next())) consume();
-        else currtoken.append(consumeEscape());
-      }
-      else currtoken.append(code);
-      break;
-
-    case "hash":
-      if(namechar(code)) create(new HashToken(code)) && switchto("hash-rest");
-      else if(code == 0x5c) {
-        if(badescape(next())) parseerror() && emit(new DelimToken(0x23)) && switchto("data") && reconsume();
-        else create(new HashToken(consumeEscape())) && switchto('hash-rest');
-      }
-      else emit(new DelimToken(0x23)) && switchto('data') && reconsume();
-      break;
-
-    case "hash-rest":
-      if(namechar(code)) currtoken.append(code);
-      else if(code == 0x5c) {
-        if(badescape(next())) parseerror() && emit(new DelimToken(0x23)) && switchto("data") && reconsume();
-        else currtoken.append(consumeEscape());
-      }
-      else emit() && switchto('data') && reconsume();
-      break;
-
-    case "comment":
-      if(code == 0x2a) {
-        if(next() == 0x2f) consume() && switchto('data');
-        else donothing();
-      }
-      else if(eof()) parseerror() && switchto('data') && reconsume();
-      else donothing();
-      break;
-
-    case "at-keyword":
-      if(code == 0x2d) {
-        if(namestartchar(next())) consume() && create(new AtKeywordToken([0x40,code])) && switchto('at-keyword-rest');
-        else emit(new DelimToken(0x40)) && switchto('data') && reconsume();
-      }
-      else if(namestartchar(code)) create(new AtKeywordToken(code)) && switchto('at-keyword-rest');
-      else if(code == 0x5c) {
-        if(badescape(next())) parseerror() && emit(new DelimToken(0x23)) && switchto("data") && reconsume();
-        else create(new AtKeywordToken(consumeEscape())) && switchto('at-keyword-rest');
-      }
-      else emit(new DelimToken(0x40)) && switchto('data') && reconsume();
-      break;
-
-    case "at-keyword-rest":
-      if(namechar(code)) currtoken.append(code);
-      else if(code == 0x5c) {
-        if(badescape(next())) parseerror() && emit() && switchto("data") && reconsume();
-        else currtoken.append(consumeEscape());
-      }
-      else emit() && switchto('data') && reconsume();
-      break;
-
-    case "identifier":
-      if(code == 0x2d) {
-        if(namestartchar(next())) create(new IdentifierToken(code)) && switchto('identifier-rest');
-        else switchto('data') && reconsume();
-      }
-      else if(namestartchar(code)) create(new IdentifierToken(code)) && switchto('identifier-rest');
-      else if(code == 0x5c) {
-        if(badescape(next())) parseerror() && switchto("data") && reconsume();
-        else create(new IdentifierToken(consumeEscape())) && switchto('identifier-rest');
-      }
-      else switchto('data') && reconsume();
-      break;
-
-    case "identifier-rest":
-      if(namechar(code)) currtoken.append(code);
-      else if(code == 0x5c) {
-        if(badescape(next())) parseerror() && emit() && switchto("data") && reconsume();
-        else currtoken.append(consumeEscape());
-      }
-      else if(code == 0x28) emit(new FunctionToken(currtoken)) && switchto('data');
-      else if(whitespace(code) && options.transformFunctionWhitespace) switchto('transform-function-whitespace');
-      else emit() && switchto('data') && reconsume();
-      break;
-
-    case "transform-function-whitespace":
-      if(whitespace(code)) donothing();
-      else if(code == 0x28) emit(new FunctionToken(currtoken)) && switchto('data');
-      else emit() && switchto('data') && reconsume();
-      break;
-
-    case "number":
-      create(new NumberToken());
-
-      if(code == 0x2d) {
-        if(digit(next())) consume() && currtoken.append([0x2d,code]) && switchto('number-rest');
-        else if(next(1) == 0x2e && digit(next(2))) consume(2) && currtoken.append([0x2d,0x2e,code]) && switchto('number-fraction');
-        else switchto('data') && reconsume();
-      }
-      else if(code == 0x2b) {
-        if(digit(next())) consume() && currtoken.append([0x2b,code]) && switchto('number-rest');
-        else if(next(1) == 0x2e && digit(next(2))) consume(2) && currtoken.append([0x2b,0x2e,code]) && switchto('number-fraction');
-        else switchto('data') && reconsume();
-      }
-      else if(digit(code)) currtoken.append(code) && switchto('number-rest');
-      else if(code == 0x2e) {
-        if(digit(next())) consume() && currtoken.append([0x2e,code]) && switchto('number-fraction');
-        else switchto('data') && reconsume();
-      }
-      else switchto('data') && reconsume();
-      break;
-
-    case "number-rest":
-      if(digit(code)) currtoken.append(code);
-      else if(code == 0x2e) {
-        if(digit(next())) consume() && currtoken.append([0x2e,code]) && switchto('number-fraction');
-        else emit() && switchto('data') && reconsume();
-      }
-      else if(code == 0x25) emit(new PercentageToken(currtoken)) && switchto('data') && reconsume();
-      else if(code == 0x45 || code == 0x65) {
-        if(!options.scientificNotation) create(new DimensionToken(currtoken,code)) && switchto('dimension');
-        else if(digit(next())) consume() && currtoken.append([0x25,code]) && switchto('sci-notation');
-        else if((next(1) == 0x2b || next(1) == 0x2d) && digit(next(2))) currtoken.append([0x25,next(1),next(2)]) && consume(2) && switchto('sci-notation');
-        else create(new DimensionToken(currtoken,code)) && switchto('dimension');
-      }
-      else if(code == 0x2d) {
-        if(namestartchar(next())) consume() && create(new DimensionToken(currtoken,[0x2d,code])) && switchto('dimension');
-        else if(next(1) == 0x5c && badescape(next(2))) parseerror() && emit() && switchto('data') && reconsume();
-        else if(next(1) == 0x5c) consume() && create(new DimensionToken(currtoken, [0x2d,consumeEscape()])) && switchto('dimension');
-        else emit() && switchto('data') && reconsume();
-      }
-      else if(namestartchar(code)) create(new DimensionToken(currtoken, code)) && switchto('dimension');
-      else if(code == 0x5c) {
-        if(badescape(next)) emit() && switchto('data') && reconsume();
-        else create(new DimensionToken(currtoken,consumeEscape)) && switchto('dimension');
-      }
-      else emit() && switchto('data') && reconsume();
-      break;
-
-    case "number-fraction":
-      currtoken.type = "number";
-
-      if(digit(code)) currtoken.append(code);
-      else if(code == 0x2e) emit() && switchto('data') && reconsume();
-      else if(code == 0x25) emit(new PercentageToken(currtoken)) && switchto('data') && reconsume();
-      else if(code == 0x45 || code == 0x65) {
-        if(!options.scientificNotation) create(new DimensionToken(currtoken,code)) && switchto('dimension');
-        else if(digit(next())) consume() && currtoken.append([0x25,code]) && switchto('sci-notation');
-        else if((next(1) == 0x2b || next(1) == 0x2d) && digit(next(2))) currtoken.append([0x25,next(1),next(2)]) && consume(2) && switchto('sci-notation');
-        else create(new DimensionToken(currtoken,code)) && switchto('dimension');
-      }
-      else if(code == 0x2d) {
-        if(namestartchar(next())) consume() && create(new DimensionToken(currtoken,[0x2d,code])) && switchto('dimension');
-        else if(next(1) == 0x5c && badescape(next(2))) parseerror() && emit() && switchto('data') && reconsume();
-        else if(next(1) == 0x5c) consume() && create(new DimensionToken(currtoken, [0x2d,consumeEscape()])) && switchto('dimension');
-        else emit() && switchto('data') && reconsume();
-      }
-      else if(namestartchar(code)) create(new DimensionToken(currtoken, code)) && switchto('dimension');
-      else if(code == 0x5c) {
-        if(badescape(next)) emit() && switchto('data') && reconsume();
-        else create(new DimensionToken(currtoken,consumeEscape)) && switchto('dimension');
-      }
-      else emit() && switchto('data') && reconsume();
-      break;
-
-    case "dimension":
-      if(namechar(code)) currtoken.append(code);
-      else if(code == 0x5c) {
-        if(badescape(next())) parseerror() && emit() && switchto('data') && reconsume();
-        else currtoken.append(consumeEscape());
-      }
-      else emit() && switchto('data') && reconsume();
-      break;
-
-    case "sci-notation":
-      if(digit(code)) currtoken.append(code);
-      else emit() && switchto('data') && reconsume();
-      break;
-
-    case "url":
-      if(code == 0x22) switchto('url-double-quote');
-      else if(code == 0x27) switchto('url-single-quote');
-      else if(code == 0x29) emit(new URLToken) && switchto('data');
-      else if(whitespace(code)) donothing();
-      else switchto('url-unquoted') && reconsume();
-      break;
-
-    case "url-double-quote":
-      if(currtoken == undefined) create(new URLToken);
-
-      if(code == 0x22) switchto('url-end');
-      else if(newline(code)) parseerror() && switchto('bad-url');
-      else if(code == 0x5c) {
-        if(newline(next())) consume();
-        else if(badescape(next())) parseerror() && emit(new BadURLToken) && switchto('data') && reconsume();
-        else currtoken.append(consumeEscape());
-      }
-      else currtoken.append(code);
-      break;
-
-    case "url-single-quote":
-      if(currtoken == undefined) create(new URLToken);
-
-      if(code == 0x27) switchto('url-end');
-      else if(newline(code)) parseerror() && switchto('bad-url');
-      else if(code == 0x5c) {
-        if(newline(next())) consume();
-        else if(badescape(next())) parseerror() && emit(new BadURLToken) && switchto('data') && reconsume();
-        else currtoken.append(consumeEscape());
-      }
-      else currtoken.append(code);
-      break;
-
-    case "url-end":
-      if(whitespace(code)) donothing();
-      else if(code == 0x29) emit() && switchto('data');
-      else parseerror() && switchto('bad-url') && reconsume();
-      break;
-
-    case "url-unquoted":
-      if(currtoken == undefined) create(new URLToken);
-
-      if(whitespace(code)) switchto('url-end');
-      else if(code == 0x29) emit() && switchto('data');
-      else if(code == 0x22 || code == 0x27 || code == 0x28 || nonprintable(code)) parseerror() && switchto('bad-url');
-      else if(code == 0x5c) {
-        if(badescape(next())) parseerror() && switchto('bad-url');
-        else currtoken.append(consumeEscape());
-      }
-      else currtoken.append(code);
-      break;
-
-    case "bad-url":
-      if(code == 0x29) emit(new BadURLToken) && switchto('data');
-      else if(code == 0x5c) {
-        if(badescape(next())) donothing();
-        else consumeEscape()
-      }
-      else donothing();
-      break;
-
-    case "unicode-range":
-      // We already know that the current code is a hexdigit.
+  }
+}
 
-      var start = [code], end = [code];
+exports.cssTokenizer = cssTokenizer;
 
-      for(var total = 1; total < 6; total++) {
-        if(hexdigit(next())) {
-          consume();
-          start.push(code);
-          end.push(code);
-        }
-        else break;
-      }
-
-      if(next() == 0x3f) {
-        for(;total < 6; total++) {
-          if(next() == 0x3f) {
-            consume();
-            start.push("0".charCodeAt(0));
-            end.push("f".charCodeAt(0));
-          }
-          else break;
-        }
-        emit(new UnicodeRangeToken(start,end)) && switchto('data');
-      }
-      else if(next(1) == 0x2d && hexdigit(next(2))) {
-        consume();
-        consume();
-        end = [code];
-        for(var total = 1; total < 6; total++) {
-          if(hexdigit(next())) {
-            consume();
-            end.push(code);
-          }
-          else break;
-        }
-        emit(new UnicodeRangeToken(start,end)) && switchto('data');
-      }
-      else emit(new UnicodeRangeToken(start)) && switchto('data');
-      break;
+/**
+ * Pass |string| to the CSS lexer and return an array of all the
+ * returned tokens.  Comment tokens are not included.  In addition to
+ * the usual information, each token will have starting and ending
+ * line and column information attached.  Specifically, each token
+ * has an additional "loc" attribute.  This attribute is an object
+ * of the form {line: L, column: C}.  Lines and columns are both zero
+ * based.
+ *
+ * It's best not to add new uses of this function.  In general it is
+ * simpler and better to use the CSSToken offsets, rather than line
+ * and column.  Also, this function lexes the entire input string at
+ * once, rather than lazily yielding a token stream.  Use
+ * |cssTokenizer| or |DOMUtils.getCSSLexer| instead.
+ *
+ * @param{String} string The input string.
+ * @return {Array} An array of tokens (@see CSSToken) that have
+ *        line and column information.
+ */
+function cssTokenizerWithLineColumn(string) {
+  let lexer = DOMUtils.getCSSLexer(string);
+  let result = [];
+  let prevToken = undefined;
+  while (true) {
+    let token = lexer.nextToken();
+    let lineNumber = lexer.lineNumber;
+    let columnNumber = lexer.columnNumber;
 
-    default:
-      console.log("Unknown state '" + state + "'");
+    if (prevToken) {
+      prevToken.loc.end = {
+        line: lineNumber,
+        column: columnNumber
+      };
     }
-  }
-}
-
-function stringFromCodeArray(arr) {
-  return String.fromCharCode.apply(null,arr.filter(function(e){return e;}));
-}
 
-function CSSParserToken(options) { return this; }
-CSSParserToken.prototype.finish = function() { return this; }
-CSSParserToken.prototype.toString = function() { return this.tokenType; }
-CSSParserToken.prototype.toJSON = function() { return this.toString(); }
-
-function BadStringToken() { return this; }
-BadStringToken.prototype = new CSSParserToken;
-BadStringToken.prototype.tokenType = "BADSTRING";
-
-function BadURLToken() { return this; }
-BadURLToken.prototype = new CSSParserToken;
-BadURLToken.prototype.tokenType = "BADURL";
-
-function WhitespaceToken() { return this; }
-WhitespaceToken.prototype = new CSSParserToken;
-WhitespaceToken.prototype.tokenType = "WHITESPACE";
-WhitespaceToken.prototype.toString = function() { return "WS"; }
-
-function CDOToken() { return this; }
-CDOToken.prototype = new CSSParserToken;
-CDOToken.prototype.tokenType = "CDO";
-
-function CDCToken() { return this; }
-CDCToken.prototype = new CSSParserToken;
-CDCToken.prototype.tokenType = "CDC";
-
-function ColonToken() { return this; }
-ColonToken.prototype = new CSSParserToken;
-ColonToken.prototype.tokenType = ":";
-
-function SemicolonToken() { return this; }
-SemicolonToken.prototype = new CSSParserToken;
-SemicolonToken.prototype.tokenType = ";";
-
-function OpenCurlyToken() { return this; }
-OpenCurlyToken.prototype = new CSSParserToken;
-OpenCurlyToken.prototype.tokenType = "{";
-
-function CloseCurlyToken() { return this; }
-CloseCurlyToken.prototype = new CSSParserToken;
-CloseCurlyToken.prototype.tokenType = "}";
-
-function OpenSquareToken() { return this; }
-OpenSquareToken.prototype = new CSSParserToken;
-OpenSquareToken.prototype.tokenType = "[";
-
-function CloseSquareToken() { return this; }
-CloseSquareToken.prototype = new CSSParserToken;
-CloseSquareToken.prototype.tokenType = "]";
-
-function OpenParenToken() { return this; }
-OpenParenToken.prototype = new CSSParserToken;
-OpenParenToken.prototype.tokenType = "(";
-
-function CloseParenToken() { return this; }
-CloseParenToken.prototype = new CSSParserToken;
-CloseParenToken.prototype.tokenType = ")";
-
-function EOFToken() { return this; }
-EOFToken.prototype = new CSSParserToken;
-EOFToken.prototype.tokenType = "EOF";
-
-function DelimToken(code) {
-  this.value = String.fromCharCode(code);
-  return this;
-}
-DelimToken.prototype = new CSSParserToken;
-DelimToken.prototype.tokenType = "DELIM";
-DelimToken.prototype.toString = function() { return "DELIM("+this.value+")"; }
-
-function StringValuedToken() { return this; }
-StringValuedToken.prototype = new CSSParserToken;
-StringValuedToken.prototype.append = function(val) {
-  if(val instanceof Array) {
-    for(var i = 0; i < val.length; i++) {
-      this.value.push(val[i]);
+    if (!token) {
+      break;
     }
-  } else {
-    this.value.push(val);
-  }
-  return true;
-}
-StringValuedToken.prototype.finish = function() {
-  this.value = stringFromCodeArray(this.value);
-  return this;
-}
 
-function IdentifierToken(val) {
-  this.value = [];
-  this.append(val);
-}
-IdentifierToken.prototype = new StringValuedToken;
-IdentifierToken.prototype.tokenType = "IDENT";
-IdentifierToken.prototype.toString = function() { return "IDENT("+this.value+")"; }
-
-function FunctionToken(val) {
-  // These are always constructed by passing an IdentifierToken
-  this.value = val.finish().value;
-}
-FunctionToken.prototype = new CSSParserToken;
-FunctionToken.prototype.tokenType = "FUNCTION";
-FunctionToken.prototype.toString = function() { return "FUNCTION("+this.value+")"; }
-
-function AtKeywordToken(val) {
-  this.value = [];
-  this.append(val);
-}
-AtKeywordToken.prototype = new StringValuedToken;
-AtKeywordToken.prototype.tokenType = "AT-KEYWORD";
-AtKeywordToken.prototype.toString = function() { return "AT("+this.value+")"; }
-
-function HashToken(val) {
-  this.value = [];
-  this.append(val);
-}
-HashToken.prototype = new StringValuedToken;
-HashToken.prototype.tokenType = "HASH";
-HashToken.prototype.toString = function() { return "HASH("+this.value+")"; }
-
-function StringToken(val) {
-  this.value = [];
-  this.append(val);
-}
-StringToken.prototype = new StringValuedToken;
-StringToken.prototype.tokenType = "STRING";
-StringToken.prototype.toString = function() { return "\""+this.value+"\""; }
-
-function URLToken(val) {
-  this.value = [];
-  this.append(val);
-}
-URLToken.prototype = new StringValuedToken;
-URLToken.prototype.tokenType = "URL";
-URLToken.prototype.toString = function() { return "URL("+this.value+")"; }
-
-function NumberToken(val) {
-  this.value = [];
-  this.append(val);
-  this.type = "integer";
-}
-NumberToken.prototype = new StringValuedToken;
-NumberToken.prototype.tokenType = "NUMBER";
-NumberToken.prototype.toString = function() {
-  if(this.type == "integer")
-    return "INT("+this.value+")";
-  return "NUMBER("+this.value+")";
-}
-NumberToken.prototype.finish = function() {
-  this.repr = stringFromCodeArray(this.value);
-  this.value = this.repr * 1;
-  if(Math.abs(this.value) % 1 != 0) this.type = "number";
-  return this;
-}
+    if (token.tokenType === "comment") {
+      // We've already dealt with the previous token's location.
+      prevToken = undefined;
+    } else {
+      let startLoc = {
+        line: lineNumber,
+        column: columnNumber
+      };
+      token.loc = {start: startLoc};
 
-function PercentageToken(val) {
-  // These are always created by passing a NumberToken as val
-  val.finish();
-  this.value = val.value;
-  this.repr = val.repr;
-}
-PercentageToken.prototype = new CSSParserToken;
-PercentageToken.prototype.tokenType = "PERCENTAGE";
-PercentageToken.prototype.toString = function() { return "PERCENTAGE("+this.value+")"; }
-
-function DimensionToken(val,unit) {
-  // These are always created by passing a NumberToken as the val
-  val.finish();
-  this.num = val.value;
-  this.unit = [];
-  this.repr = val.repr;
-  this.append(unit);
-}
-DimensionToken.prototype = new CSSParserToken;
-DimensionToken.prototype.tokenType = "DIMENSION";
-DimensionToken.prototype.toString = function() { return "DIM("+this.num+","+this.unit+")"; }
-DimensionToken.prototype.append = function(val) {
-  if(val instanceof Array) {
-    for(var i = 0; i < val.length; i++) {
-      this.unit.push(val[i]);
+      result.push(token);
+      prevToken = token;
     }
-  } else {
-    this.unit.push(val);
   }
-  return true;
-}
-DimensionToken.prototype.finish = function() {
-  this.unit = stringFromCodeArray(this.unit);
-  this.repr += this.unit;
-  return this;
-}
 
-function UnicodeRangeToken(start,end) {
-  // start and end are array of char codes, completely finished
-  start = parseInt(stringFromCodeArray(start),16);
-  if(end === undefined) end = start + 1;
-  else end = parseInt(stringFromCodeArray(end),16);
-
-  if(start > maximumallowedcodepoint) end = start;
-  if(end < start) end = start;
-  if(end > maximumallowedcodepoint) end = maximumallowedcodepoint;
-
-  this.start = start;
-  this.end = end;
-  return this;
-}
-UnicodeRangeToken.prototype = new CSSParserToken;
-UnicodeRangeToken.prototype.tokenType = "UNICODE-RANGE";
-UnicodeRangeToken.prototype.toString = function() {
-  if(this.start+1 == this.end)
-    return "UNICODE-RANGE("+this.start.toString(16).toUpperCase()+")";
-  if(this.start < this.end)
-    return "UNICODE-RANGE("+this.start.toString(16).toUpperCase()+"-"+this.end.toString(16).toUpperCase()+")";
-  return "UNICODE-RANGE()";
-}
-UnicodeRangeToken.prototype.contains = function(code) {
-  return code >= this.start && code < this.end;
+  return result;
 }
 
-
-// Exportation.
-// TODO: also export the various tokens objects?
-module.exports = tokenize;
-
-}));
+exports.cssTokenizerWithLineColumn = cssTokenizerWithLineColumn;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleeditor/styleeditor-panel.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleeditor/styleeditor-panel.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleeditor/styleeditor-panel.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleeditor/styleeditor-panel.js	2015-05-25 20:42:57.000000000 +0000
@@ -36,9 +36,13 @@
 exports.StyleEditorPanel = StyleEditorPanel;
 
 StyleEditorPanel.prototype = {
-  get target() this._toolbox.target,
+  get target() {
+    return this._toolbox.target;
+  },
 
-  get panelWindow() this._panelWin,
+  get panelWindow() {
+    return this._panelWin;
+  },
 
   /**
    * open is effectively an asynchronous constructor
@@ -131,11 +135,13 @@
       this._target.off("close", this.destroy);
       this._target = null;
       this._toolbox = null;
+      this._panelWin = null;
       this._panelDoc = null;
       this._debuggee.destroy();
       this._debuggee = null;
 
       this.UI.destroy();
+      this.UI = null;
     }
 
     return promise.resolve(null);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleeditor/StyleEditorUI.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleeditor/StyleEditorUI.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleeditor/StyleEditorUI.jsm	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleeditor/StyleEditorUI.jsm	2015-05-25 20:42:57.000000000 +0000
@@ -364,7 +364,11 @@
         // nothing selected
         return;
       }
-      NetUtil.asyncFetch2(file, (stream, status) => {
+      NetUtil.asyncFetch({
+        uri: NetUtil.newURI(file),
+        loadingNode: this._window.document,
+        contentPolicyType: Ci.nsIContentPolicy.TYPE_OTHER
+      }, (stream, status) => {
         if (!Components.isSuccessCode(status)) {
           this.emit("error", { key: LOAD_ERROR });
           return;
@@ -375,12 +379,7 @@
         this._debuggee.addStyleSheet(source).then((styleSheet) => {
           this._onStyleSheetCreated(styleSheet, file);
         });
-      },
-      this._window.document,
-      null,  // aLoadingPrincipal
-      null,  // aTriggeringPrincipal
-      Ci.nsILoadInfo.SEC_NORMAL,
-      Ci.nsIContentPolicy.TYPE_OTHER);
+      });
     };
 
     showFilePicker(file, false, parentWindow, onFileSelected);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleeditor/test/browser_styleeditor_fetch-from-cache.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleeditor/test/browser_styleeditor_fetch-from-cache.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleeditor/test/browser_styleeditor_fetch-from-cache.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleeditor/test/browser_styleeditor_fetch-from-cache.js	2015-05-25 20:42:57.000000000 +0000
@@ -8,7 +8,10 @@
 
 const TEST_URL = TEST_BASE_HTTP + "doc_uncached.html";
 
-add_task(function() {
+add_task(function*() {
+  let isTesting = gDevTools.testing;
+  gDevTools.testing = true;
+
   info("Opening netmonitor");
   let tab = yield addTab("about:blank");
   let target = TargetFactory.forTab(tab);
@@ -37,4 +40,5 @@
      "Got two requests for doc_uncached.css after Style Editor was loaded.");
   ok(attachments[1].fromCache,
      "Second request was loaded from browser cache");
+  gDevTools.testing = isTesting;
 });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleeditor/test/browser_styleeditor_pretty.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleeditor/test/browser_styleeditor_pretty.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleeditor/test/browser_styleeditor_pretty.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleeditor/test/browser_styleeditor_pretty.js	2015-05-25 20:42:57.000000000 +0000
@@ -9,16 +9,14 @@
 const TESTCASE_URI = TEST_BASE_HTTP + "minified.html";
 
 const PRETTIFIED_SOURCE = "" +
-"body\{\r?\n" +                   // body{
+"body \{\r?\n" +                   // body{
   "\tbackground\:white;\r?\n" +   //   background:white;
 "\}\r?\n" +                       // }
-"\r?\n" +                         //
-"div\{\r?\n" +                    // div{
+"div \{\r?\n" +                    // div{
   "\tfont\-size\:4em;\r?\n" +     //   font-size:4em;
   "\tcolor\:red\r?\n" +           //   color:red
 "\}\r?\n" +                       // }
-"\r?\n" +                         //
-"span\{\r?\n" +                   // span{
+"span \{\r?\n" +                   // span{
   "\tcolor\:green;\r?\n"          //   color:green;
 "\}\r?\n";                        // }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/computed-view.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/computed-view.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/computed-view.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/computed-view.js	2015-05-25 20:42:57.000000000 +0000
@@ -248,12 +248,14 @@
   }
 };
 
-XPCOMUtils.defineLazyGetter(CssHtmlTree, "_strings", function() Services.strings
-        .createBundle("chrome://global/locale/devtools/styleinspector.properties"));
+XPCOMUtils.defineLazyGetter(CssHtmlTree, "_strings", function() {
+  return Services.strings.createBundle(
+    "chrome://global/locale/devtools/styleinspector.properties");
+});
 
 XPCOMUtils.defineLazyGetter(this, "clipboardHelper", function() {
-  return Cc["@mozilla.org/widget/clipboardhelper;1"].
-    getService(Ci.nsIClipboardHelper);
+  return Cc["@mozilla.org/widget/clipboardhelper;1"]
+         .getService(Ci.nsIClipboardHelper);
 });
 
 CssHtmlTree.prototype = {
@@ -816,7 +818,7 @@
   },
 
   _onCopyColor: function() {
-    clipboardHelper.copyString(this._colorToCopy, this.styleDocument);
+    clipboardHelper.copyString(this._colorToCopy);
   },
 
   /**
@@ -854,7 +856,7 @@
         result = textArray[0];
       }
 
-      clipboardHelper.copyString(result, this.styleDocument);
+      clipboardHelper.copyString(result);
 
       if (event) {
         event.preventDefault();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/css-parsing-utils.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/css-parsing-utils.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/css-parsing-utils.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/css-parsing-utils.js	2015-05-25 20:42:57.000000000 +0000
@@ -6,36 +6,7 @@
 
 "use strict";
 
-const cssTokenizer  = require("devtools/sourceeditor/css-tokenizer");
-
-/**
- * Returns the string enclosed in quotes
- */
-function quoteString(string) {
-  let hasDoubleQuotes = string.includes('"');
-  let hasSingleQuotes = string.includes("'");
-
-  let quote = '"';
-  if (hasDoubleQuotes && !hasSingleQuotes) {
-    quote = "'";
-  }
-
-  // Quote special characters as specified by the CSS grammar.
-  // See http://www.w3.org/TR/CSS2/syndata.html#tokenization
-  // and http://www.w3.org/TR/CSS2/syndata.html#strings
-  return quote +
-    string.replace(/[\\"]/g, match => {
-      switch (match) {
-      case '\\':
-        return '\\\\';
-      case '"':
-        if (quote == '"')
-          return '\\"';
-        return match;
-      }
-    }) +
-    quote;
-}
+const {cssTokenizer} = require("devtools/sourceeditor/css-tokenizer");
 
 /**
  * Returns an array of CSS declarations given an string.
@@ -52,6 +23,10 @@
  *         [{"name": string, "value": string, "priority": string}, ...]
  */
 function parseDeclarations(inputString) {
+  if (inputString === null || inputString === undefined) {
+    throw new Error("empty input string");
+  }
+
   let tokens = cssTokenizer(inputString);
 
   let declarations = [{name: "", value: "", priority: ""}];
@@ -60,7 +35,7 @@
   for (let token of tokens) {
     lastProp = declarations[declarations.length - 1];
 
-    if (token.tokenType === ":") {
+    if (token.tokenType === "symbol" && token.text === ":") {
       if (!lastProp.name) {
         // Set the current declaration name if there's no name yet
         lastProp.name = current.trim();
@@ -71,63 +46,29 @@
         // with colons)
         current += ":";
       }
-    } else if (token.tokenType === ";") {
+    } else if (token.tokenType === "symbol" && token.text === ";") {
       lastProp.value = current.trim();
       current = "";
       hasBang = false;
       declarations.push({name: "", value: "", priority: ""});
-    } else {
-      switch(token.tokenType) {
-        case "IDENT":
-          if (token.value === "important" && hasBang) {
-            lastProp.priority = "important";
-            hasBang = false;
-          } else {
-            if (hasBang) {
-              current += "!";
-            }
-            current += token.value;
-          }
-          break;
-        case "WHITESPACE":
-          current += " ";
-          break;
-        case "DIMENSION":
-          current += token.repr;
-          break;
-        case "HASH":
-          current += "#" + token.value;
-          break;
-        case "URL":
-          current += "url(" + quoteString(token.value) + ")";
-          break;
-        case "FUNCTION":
-          current += token.value + "(";
-          break;
-        case "(":
-        case ")":
-          current += token.tokenType;
-          break;
-        case "EOF":
-          break;
-        case "DELIM":
-          if (token.value === "!") {
-            hasBang = true;
-          } else {
-            current += token.value;
-          }
-          break;
-        case "STRING":
-          current += quoteString(token.value);
-          break;
-        case "{":
-        case "}":
-          current += token.tokenType;
-          break;
-        default:
-          current += token.value;
-          break;
+    } else if (token.tokenType === "ident") {
+      if (token.text === "important" && hasBang) {
+        lastProp.priority = "important";
+        hasBang = false;
+      } else {
+        if (hasBang) {
+          current += "!";
+        }
+        current += token.text;
       }
+    } else if (token.tokenType === "symbol" && token.text === "!") {
+      hasBang = true;
+    } else if (token.tokenType === "whitespace") {
+      current += " ";
+    } else if (token.tokenType === "comment") {
+      // For now, just ignore.
+    } else {
+      current += inputString.substring(token.startOffset, token.endOffset);
     }
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/cssruleview.xhtml firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/cssruleview.xhtml
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/cssruleview.xhtml	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/cssruleview.xhtml	2015-05-25 20:42:57.000000000 +0000
@@ -45,6 +45,8 @@
                  type="search" placeholder="&filterStylesPlaceholder;"/>
           <button id="ruleview-searchinput-clear" class="devtools-searchinput-clear"></button>
         </div>
+        <!-- TODO : Bug 1165122 : Show this button by default -->
+        <button hidden="true" id="ruleview-add-rule-button" title="&addRuleButtonTooltip;" class="devtools-button"></button>
       </div>
     </div>
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/rule-view.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/rule-view.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/rule-view.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/rule-view.js	2015-05-25 20:42:57.000000000 +0000
@@ -29,19 +29,8 @@
 const PROPERTY_NAME_CLASS = "ruleview-propertyname";
 const FILTER_CHANGED_TIMEOUT = 150;
 
-/**
- * These regular expressions are adapted from firebug's css.js, and are
- * used to parse CSSStyleDeclaration's cssText attribute.
- */
-
-// Used to split on css line separators
-const CSS_LINE_RE = /(?:[^;\(]*(?:\([^\)]*?\))?[^;\(]*)*;?/g;
-
-// Used to parse a single property line.
-const CSS_PROP_RE = /\s*([^:\s]*)\s*:\s*(.*?)\s*(?:! (important))?;?$/;
-
-// Used to parse an external resource from a property value
-const CSS_RESOURCE_RE = /url\([\'\"]?(.*?)[\'\"]?\)/;
+// This is used to parse user input when filtering.
+const FILTER_PROP_RE = /\s*([^:\s]*)\s*:\s*(.*?)\s*;?$/;
 
 const IOService = Cc["@mozilla.org/network/io-service;1"]
                   .getService(Ci.nsIIOService);
@@ -234,7 +223,14 @@
 
         return null;
       });
-    }).then(null, promiseWarn);
+    }).then(null, e => {
+      // populate is often called after a setTimeout,
+      // the connection may already be closed.
+      if (this.destroyed) {
+        return;
+      }
+      return promiseWarn(e);
+    });
     this.populated = populated;
     return this.populated;
   },
@@ -261,7 +257,7 @@
     // If we've already included this domRule (for example, when a
     // common selector is inherited), ignore it.
     if (aOptions.rule &&
-        this.rules.some(function(rule) rule.domRule === aOptions.rule)) {
+        this.rules.some(rule => rule.domRule === aOptions.rule)) {
       return false;
     }
 
@@ -400,7 +396,7 @@
   _updatePropertyOverridden: function(aProp) {
     let overridden = true;
     let dirty = false;
-    for each (let computedProp in aProp.computed) {
+    for (let computedProp of aProp.computed) {
       if (!computedProp.overridden) {
         overridden = false;
       }
@@ -743,7 +739,7 @@
    *        The property to be removed
    */
   removeProperty: function(aProperty) {
-    this.textProps = this.textProps.filter(function(prop) prop != aProperty);
+    this.textProps = this.textProps.filter(prop => prop != aProperty);
     let modifications = this.style.startModifyingProperties();
     modifications.removeProperty(aProperty.name);
     // Need to re-apply properties in case removing this TextProperty
@@ -786,7 +782,7 @@
 
     let textProps = [];
 
-    for each (let prop in disabledProps) {
+    for (let prop of disabledProps) {
       let value = store.userProperties.getProperty(this.style, prop.name, prop.value);
       let textProp = new TextProperty(this, prop.name, value, prop.priority);
       textProp.enabled = false;
@@ -865,7 +861,7 @@
   _updateTextProperty: function(aNewProp) {
     let match = { rank: 0, prop: null };
 
-    for each (let prop in this.textProps) {
+    for (let prop of this.textProps) {
       if (prop.name != aNewProp.name)
         continue;
 
@@ -1135,6 +1131,7 @@
   this._onFilterTextboxContextMenu = this._onFilterTextboxContextMenu.bind(this);
 
   this.element = this.doc.getElementById("ruleview-container");
+  this.addRuleButton = this.doc.getElementById("ruleview-add-rule-button");
   this.searchField = this.doc.getElementById("ruleview-searchbox");
   this.searchClearButton = this.doc.getElementById("ruleview-searchinput-clear");
 
@@ -1142,6 +1139,7 @@
 
   this.element.addEventListener("copy", this._onCopy);
   this.element.addEventListener("contextmenu", this._onContextMenu);
+  this.addRuleButton.addEventListener("click", this._onAddRule);
   this.searchField.addEventListener("input", this._onFilterStyles);
   this.searchField.addEventListener("keypress", this._onFilterKeyPress);
   this.searchField.addEventListener("contextmenu", this._onFilterTextboxContextMenu);
@@ -1197,8 +1195,8 @@
     this._contextmenu.id = "rule-view-context-menu";
 
     this.menuitemAddRule = createMenuItem(this._contextmenu, {
-      label: "ruleView.contextmenu.addRule",
-      accesskey: "ruleView.contextmenu.addRule.accessKey",
+      label: "ruleView.contextmenu.addNewRule",
+      accesskey: "ruleView.contextmenu.addNewRule.accessKey",
       command: this._onAddRule
     });
     this.menuitemSelectAll = createMenuItem(this._contextmenu, {
@@ -1513,7 +1511,7 @@
         text = text.replace(rx, "");
       }
 
-      clipboardHelper.copyString(text, this.doc);
+      clipboardHelper.copyString(text);
       event.preventDefault();
     } catch(e) {
       console.error(e);
@@ -1524,7 +1522,7 @@
    * Copy the most recently selected color value to clipboard.
    */
   _onCopyColor: function() {
-    clipboardHelper.copyString(this._colorToCopy, this.styleDocument);
+    clipboardHelper.copyString(this._colorToCopy);
   },
 
   /**
@@ -1749,6 +1747,7 @@
     // Remove bound listeners
     this.element.removeEventListener("copy", this._onCopy);
     this.element.removeEventListener("contextmenu", this._onContextMenu);
+    this.addRuleButton.removeEventListener("click", this._onAddRule);
     this.searchField.removeEventListener("input", this._onFilterStyles);
     this.searchField.removeEventListener("keypress", this._onFilterKeyPress);
     this.searchField.removeEventListener("contextmenu",
@@ -2100,7 +2099,7 @@
     // Parse search value as a single property line and extract the property
     // name and value. Otherwise, use the search value as both the name and
     // value.
-    let propertyMatch = CSS_PROP_RE.exec(aValue);
+    let propertyMatch = FILTER_PROP_RE.exec(aValue);
     let name = propertyMatch ? propertyMatch[1] : aValue;
     let value = propertyMatch ? propertyMatch[2] : aValue;
 
@@ -2109,8 +2108,10 @@
       // Get the actual property value displayed in the rule view
       let propertyValue = textProp.editor.valueSpan.textContent.toLowerCase();
       let propertyName = textProp.name.toLowerCase();
+      let styleSheetSource = textProp.rule.title.toLowerCase();
 
       let editor = textProp.editor;
+      let source = editor.ruleEditor.source;
 
       let isPropertyHighlighted = this._highlightMatches(editor.container, {
         searchName: name,
@@ -2125,8 +2126,9 @@
       // Highlight search matches in the computed list of properties
       for (let computed of textProp.computed) {
         if (computed.element) {
-          let computedName = computed.name;
-          let computedValue = computed.value;
+          // Get the actual property value displayed in the computed list
+          let computedValue = computed.parsedValue.toLowerCase();
+          let computedName = computed.name.toLowerCase();
 
           isComputedHighlighted = this._highlightMatches(computed.element, {
             searchName: name,
@@ -2138,7 +2140,14 @@
         }
       }
 
-      if (isPropertyHighlighted || isComputedHighlighted) {
+      // Highlight search matches in the stylesheet source
+      let isStyleSheetHighlighted = styleSheetSource.includes(aValue);
+      if (isStyleSheetHighlighted) {
+        source.classList.add("ruleview-highlight");
+      }
+
+      if (isPropertyHighlighted || isComputedHighlighted ||
+          isStyleSheetHighlighted) {
         isHighlighted = true;
       }
 
@@ -2263,11 +2272,11 @@
     this.element.style.position = "relative";
 
     // Add the source link.
-    let source = createChild(this.element, "div", {
+    this.source = createChild(this.element, "div", {
       class: "ruleview-rule-source theme-link"
     });
-    source.addEventListener("click", function() {
-      if (source.hasAttribute("unselectable")) {
+    this.source.addEventListener("click", function() {
+      if (this.source.hasAttribute("unselectable")) {
         return;
       }
       let rule = this.rule.domRule;
@@ -2276,7 +2285,7 @@
     let sourceLabel = this.doc.createElementNS(XUL_NS, "label");
     sourceLabel.setAttribute("crop", "center");
     sourceLabel.classList.add("source-link-label");
-    source.appendChild(sourceLabel);
+    this.source.appendChild(sourceLabel);
 
     this.updateSourceLink();
 
@@ -2796,7 +2805,7 @@
         done: this._onValueDone,
         destroy: this.update,
         validate: this._onValidate,
-        advanceChars: ';',
+        advanceChars: advanceValidate,
         contentType: InplaceEditor.CONTENT_TYPES.CSS_VALUE,
         property: this.prop,
         popup: this.popup
@@ -2846,22 +2855,6 @@
   },
 
   /**
-   * Check the property value to find an external resource (if any).
-   * @return {string} the URI in the property value, or null if there is no match.
-   */
-  getResourceURI: function() {
-    let val = this.prop.value;
-    let uriMatch = CSS_RESOURCE_RE.exec(val);
-    let uri = null;
-
-    if (uriMatch && uriMatch[1]) {
-      uri = uriMatch[1];
-    }
-
-    return uri;
-  },
-
-  /**
    * Populate the span based on changes to the TextProperty.
    */
   update: function() {
@@ -2988,7 +2981,7 @@
     }
 
     let showExpander = false;
-    for each (let computed in this.prop.computed) {
+    for (let computed of this.prop.computed) {
       // Don't bother to duplicate information already
       // shown in the text property.
       if (computed.name === this.prop.name) {
@@ -3020,6 +3013,9 @@
         }
       );
 
+      // Store the computed property value that was parsed for output
+      computed.parsedValue = frag.textContent;
+
       createChild(li, "span", {
         class: "ruleview-propertyvalue theme-fg-color1",
         child: frag
@@ -3525,6 +3521,48 @@
   }
 }
 
+/**
+ * Called when a character is typed in a value editor.  This decides
+ * whether to advance or not, first by checking to see if ";" was
+ * typed, and then by lexing the input and seeing whether the ";"
+ * would be a terminator at this point.
+ *
+ * @param {number} aKeyCode Key code to be checked.
+ * @param {String} aValue   Current text editor value.
+ * @param {number} aInsertionPoint The index of the insertion point.
+ * @return {Boolean} True if the focus should advance; false if
+ *        the character should be inserted.
+ */
+function advanceValidate(aKeyCode, aValue, aInsertionPoint) {
+  // Only ";" has special handling here.
+  if (aKeyCode !== Ci.nsIDOMKeyEvent.DOM_VK_SEMICOLON) {
+    return false;
+  }
+
+  // Insert the character provisionally and see what happens.  If we
+  // end up with a ";" symbol token, then the semicolon terminates the
+  // value.  Otherwise it's been inserted in some spot where it has a
+  // valid meaning, like a comment or string.
+  aValue = aValue.slice(0, aInsertionPoint) + ';' + aValue.slice(aInsertionPoint);
+  let lexer = domUtils.getCSSLexer(aValue);
+  while (true) {
+    let token = lexer.nextToken();
+    if (token.endOffset > aInsertionPoint) {
+      if (token.tokenType === "symbol" && token.text === ";") {
+        // The ";" is a terminator.
+        return true;
+      } else {
+        // The ";" is not a terminator in this context.
+        break;
+      }
+    }
+  }
+  return false;
+}
+
+// We're exporting _advanceValidate for unit tests.
+exports._advanceValidate = advanceValidate;
+
 XPCOMUtils.defineLazyGetter(this, "clipboardHelper", function() {
   return Cc["@mozilla.org/widget/clipboardhelper;1"].
     getService(Ci.nsIClipboardHelper);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_computedview_browser-styles.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_computedview_browser-styles.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_computedview_browser-styles.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_computedview_browser-styles.js	2015-05-25 20:42:57.000000000 +0000
@@ -45,7 +45,7 @@
 function isPropertyVisible(name, view) {
   info("Checking property visibility for " + name);
   let propertyViews = view.propertyViews;
-  for each (let propView in propertyViews) {
+  for (let propView of propertyViews) {
     if (propView.name == name) {
       return propView.visible;
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_computedview_style-editor-link.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_computedview_style-editor-link.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_computedview_style-editor-link.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_computedview_style-editor-link.js	2015-05-25 20:42:57.000000000 +0000
@@ -7,7 +7,7 @@
 ///////////////////
 //
 // Whitelisting this test.
-// As part of bug 1077403, the leaking uncaught rejection should be fixed. 
+// As part of bug 1077403, the leaking uncaught rejection should be fixed.
 //
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Unknown sheet source");
 
@@ -70,16 +70,16 @@
 
   yield expandComputedViewPropertyByIndex(view, 0);
 
-  let onWindow = waitForWindow();
+  let onTab = waitForTab();
   info("Clicking on the first rule-link in the computed-view");
   clickLinkByIndex(view, 0);
 
-  let win = yield onWindow;
+  let tab = yield onTab;
 
-  let windowType = win.document.documentElement.getAttribute("windowtype");
-  is(windowType, "navigator:view-source", "View source window is open");
-  info("Closing window");
-  win.close();
+  let tabURI = tab.linkedBrowser.documentURI.spec;
+  ok(tabURI.startsWith("view-source:"), "View source tab is open");
+  info("Closing tab");
+  gBrowser.removeTab(tab);
 }
 
 function* testFirstInlineStyleSheet(view, toolbox) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser.ini firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser.ini	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser.ini	2015-05-25 20:42:57.000000000 +0000
@@ -120,6 +120,7 @@
 [browser_ruleview_search-filter-computed-list_04.js]
 [browser_ruleview_search-filter-computed-list_05.js]
 [browser_ruleview_search-filter-computed-list_06.js]
+[browser_ruleview_search-filter-computed-list_07.js]
 [browser_ruleview_search-filter-computed-list_clear.js]
 [browser_ruleview_search-filter-computed-list_expander.js]
 [browser_ruleview_search-filter_01.js]
@@ -132,6 +133,9 @@
 [browser_ruleview_search-filter_08.js]
 [browser_ruleview_search-filter_09.js]
 [browser_ruleview_search-filter_10.js]
+[browser_ruleview_search-filter_11.js]
+[browser_ruleview_search-filter_12.js]
+[browser_ruleview_search-filter_13.js]
 [browser_ruleview_search-filter_clear.js]
 [browser_ruleview_search-filter_context-menu.js]
 [browser_ruleview_search-filter_escape-keypress.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_add-property-cancel_03.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_add-property-cancel_03.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_add-property-cancel_03.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_add-property-cancel_03.js	2015-05-25 20:42:57.000000000 +0000
@@ -49,9 +49,8 @@
   let editor = yield focusEditableField(elementRuleEditor.closeBrace);
 
   is(inplaceEditor(elementRuleEditor.newPropSpan), editor, "Next focused editor should be the new property editor.");
-  for (let ch of "background") {
-    EventUtils.sendChar(ch, ruleView.doc.defaultView);
-  }
+
+  EventUtils.sendString("background", ruleView.doc.defaultView)
 
   let onBlur = once(editor.input, "blur");
   EventUtils.synthesizeKey("VK_ESCAPE", {});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_add-rule_01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_add-rule_01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_add-rule_01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_add-rule_01.js	2015-05-25 20:42:57.000000000 +0000
@@ -22,47 +22,29 @@
 const TEST_DATA = [
   { node: "#testid", expected: "#testid" },
   { node: ".testclass2", expected: ".testclass2" },
-  { node: ".class1.class2", expected: ".class1" },
+  { node: ".class1.class2", expected: ".class1.class2" },
   { node: "p", expected: "p" }
 ];
 
 add_task(function*() {
-  yield addTab("data:text/html;charset=utf-8,test rule view add rule");
-
-  info("Creating the test document");
-  content.document.body.innerHTML = PAGE_CONTENT;
+  yield addTab("data:text/html;charset=utf-8," + encodeURIComponent(PAGE_CONTENT));
 
   info("Opening the rule-view");
   let {toolbox, inspector, view} = yield openRuleView();
 
   info("Iterating over the test data");
   for (let data of TEST_DATA) {
-    yield runTestData(inspector, view, data);
+    yield runTestData(inspector, view, data, "context-menu");
+    yield runTestData(inspector, view, data, "button");
   }
 });
 
-function* runTestData(inspector, view, data) {
+function* runTestData(inspector, view, data, method) {
   let {node, expected} = data;
   info("Selecting the test element");
   yield selectNode(node, inspector);
 
-  info("Waiting for context menu to be shown");
-  let onPopup = once(view._contextmenu, "popupshown");
-  let win = view.doc.defaultView;
-
-  EventUtils.synthesizeMouseAtCenter(view.element,
-    {button: 2, type: "contextmenu"}, win);
-  yield onPopup;
-
-  ok(!view.menuitemAddRule.hidden, "Add rule is visible");
-
-  info("Waiting for rule view to change");
-  let onRuleViewChanged = once(view, "ruleview-changed");
-
-  info("Adding the new rule");
-  view.menuitemAddRule.click();
-  yield onRuleViewChanged;
-  view._contextmenu.hidePopup();
+  yield addNewRule(inspector, view, method);
 
   yield testNewRule(view, expected, 1);
 
@@ -70,6 +52,31 @@
   content.document.body.innerHTML = PAGE_CONTENT;
 }
 
+function* addNewRule(inspector, view, method) {
+  if (method == "context-menu") {
+    info("Waiting for context menu to be shown");
+    let onPopup = once(view._contextmenu, "popupshown");
+    let win = view.doc.defaultView;
+
+    EventUtils.synthesizeMouseAtCenter(view.element,
+      {button: 2, type: "contextmenu"}, win);
+    yield onPopup;
+
+    ok(!view.menuitemAddRule.hidden, "Add rule is visible");
+
+    info("Adding the new rule");
+    view.menuitemAddRule.click();
+    view._contextmenu.hidePopup();
+  }
+  else {
+    info("Adding the new rule using the button");
+    view.addRuleButton.click();
+  }
+  info("Waiting for rule view to change");
+  let onRuleViewChanged = once(view, "ruleview-changed");
+  yield onRuleViewChanged;
+}
+
 function* testNewRule(view, expected, index) {
   let idRuleEditor = getRuleViewRuleEditor(view, index);
   let editor = idRuleEditor.selectorText.ownerDocument.activeElement;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_add-rule_02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_add-rule_02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_add-rule_02.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_add-rule_02.js	2015-05-25 20:42:57.000000000 +0000
@@ -18,10 +18,7 @@
 ].join("\n");
 
 add_task(function*() {
-  yield addTab("data:text/html;charset=utf-8,test rule view add rule");
-
-  info("Creating the test document");
-  content.document.body.innerHTML = PAGE_CONTENT;
+  yield addTab("data:text/html;charset=utf-8," + encodeURIComponent(PAGE_CONTENT));
 
   info("Opening the rule-view");
   let {toolbox, inspector, view} = yield openRuleView();
@@ -29,23 +26,13 @@
   info("Selecting the test element");
   yield selectNode("#testid", inspector);
 
-  info("Waiting for context menu to be shown");
-  let onPopup = once(view._contextmenu, "popupshown");
-  let win = view.doc.defaultView;
-
-  EventUtils.synthesizeMouseAtCenter(view.element,
-    {button: 2, type: "contextmenu"}, win);
-  yield onPopup;
-
-  ok(!view.menuitemAddRule.hidden, "Add rule is visible");
-
   info("Waiting for rule view to change");
   let onRuleViewChanged = once(view, "ruleview-changed");
 
   info("Adding the new rule");
-  view.menuitemAddRule.click();
+  view.addRuleButton.click();
+
   yield onRuleViewChanged;
-  view._contextmenu.hidePopup();
 
   yield testEditSelector(view, "span");
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_add-rule_03.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_add-rule_03.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_add-rule_03.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_add-rule_03.js	2015-05-25 20:42:57.000000000 +0000
@@ -18,10 +18,7 @@
 ].join("\n");
 
 add_task(function*() {
-  yield addTab("data:text/html;charset=utf-8,test rule view add rule");
-
-  info("Creating the test document");
-  content.document.body.innerHTML = PAGE_CONTENT;
+  yield addTab("data:text/html;charset=utf-8," + encodeURIComponent(PAGE_CONTENT));
 
   info("Opening the rule-view");
   let {toolbox, inspector, view} = yield openRuleView();
@@ -29,23 +26,13 @@
   info("Selecting the test element");
   yield selectNode("#testid", inspector);
 
-  info("Waiting for context menu to be shown");
-  let onPopup = once(view._contextmenu, "popupshown");
-  let win = view.doc.defaultView;
-
-  EventUtils.synthesizeMouseAtCenter(view.element,
-    {button: 2, type: "contextmenu"}, win);
-  yield onPopup;
-
-  ok(!view.menuitemAddRule.hidden, "Add rule is visible");
-
   info("Waiting for rule view to change");
   let onRuleViewChanged = once(view, "ruleview-changed");
 
   info("Adding the new rule");
-  view.menuitemAddRule.click();
+  view.addRuleButton.click();
+
   yield onRuleViewChanged;
-  view._contextmenu.hidePopup();
 
   info("Adding new properties to the new rule");
   yield testNewRule(view, "#testid", 1);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_edit-property_01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_edit-property_01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_edit-property_01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_edit-property_01.js	2015-05-25 20:42:57.000000000 +0000
@@ -60,9 +60,7 @@
   info("Entering a new property name, including : to commit and focus the value");
   let onValueFocus = once(ruleEditor.element, "focus", true);
   let onModifications = ruleEditor.rule._applyingModifications;
-  for (let ch of name + ":") {
-    EventUtils.sendChar(ch, doc.defaultView);
-  }
+  EventUtils.sendString(name + ":", doc.defaultView);
   yield onValueFocus;
   yield onModifications;
 
@@ -74,9 +72,7 @@
   info("Entering a new value, including ; to commit and blur the value");
   let onBlur = once(input, "blur");
   onModifications = ruleEditor.rule._applyingModifications;
-  for (let ch of value + ";") {
-    EventUtils.sendChar(ch, doc.defaultView);
-  }
+  EventUtils.sendString(value + ";", doc.defaultView);
   yield onBlur;
   yield onModifications;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_edit-property_02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_edit-property_02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_edit-property_02.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_edit-property_02.js	2015-05-25 20:42:57.000000000 +0000
@@ -46,9 +46,7 @@
 
   info("Entering property name \"border-color\" followed by a colon to focus the value");
   let onFocus = once(idRuleEditor.element, "focus", true);
-  for (let ch of "border-color:") {
-    EventUtils.sendChar(ch, ruleView.doc.defaultView);
-  }
+  EventUtils.sendString("border-color:", ruleView.doc.defaultView);
   yield onFocus;
   yield idRuleEditor.rule._applyingModifications;
 
@@ -60,6 +58,7 @@
 
   info("Entering a value following by a semi-colon to commit it");
   let onBlur = once(editor.input, "blur");
+  // Use sendChar() to pass each character as a string so that we can test propEditor.warning.hidden after each character.
   for (let ch of "red;") {
     EventUtils.sendChar(ch, ruleView.doc.defaultView);
     is(propEditor.warning.hidden, true,
@@ -77,9 +76,7 @@
 
   info("Entering property name \"color\" followed by a colon to focus the value");
   onFocus = once(idRuleEditor.element, "focus", true);
-  for (let ch of "color:") {
-    EventUtils.sendChar(ch, ruleView.doc.defaultView);
-  }
+  EventUtils.sendString("color:", ruleView.doc.defaultView);
   yield onFocus;
 
   info("Verifying that the focused field is the valueSpan");
@@ -87,9 +84,7 @@
 
   info("Entering a value following by a semi-colon to commit it");
   onBlur = once(editor.input, "blur");
-  for (let ch of "red;") {
-    EventUtils.sendChar(ch, ruleView.doc.defaultView);
-  }
+  EventUtils.sendString("red;", ruleView.doc.defaultView);
   yield onBlur;
   yield idRuleEditor.rule._applyingModifications;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_edit-property-commit.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_edit-property-commit.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_edit-property-commit.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_edit-property-commit.js	2015-05-25 20:42:57.000000000 +0000
@@ -64,9 +64,7 @@
   is(inplaceEditor(propEditor.valueSpan), editor, "Focused editor should be the value span.");
 
   info("Entering test data " + value);
-  for (let ch of value) {
-    EventUtils.sendChar(ch, view.doc.defaultView);
-  }
+  EventUtils.sendString(value, view.doc.defaultView);
 
   info("Waiting for focus on the field");
   let onBlur = once(editor.input, "blur");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_keyframes-rule_01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_keyframes-rule_01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_keyframes-rule_01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_keyframes-rule_01.js	2015-05-25 20:42:57.000000000 +0000
@@ -58,7 +58,7 @@
   });
 }
 
-function testMoxy(inspector, view) {
+function* testMoxy(inspector, view) {
   info("Test content and gutter in the keyframes rule of #moxy");
 
   let {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_livepreview.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_livepreview.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_livepreview.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_livepreview.js	2015-05-25 20:42:57.000000000 +0000
@@ -47,9 +47,7 @@
   is(inplaceEditor(propEditor.valueSpan), editor, "The focused editor is the value");
 
   info("Enter a value in the editor")
-  for (let ch of data.value) {
-    EventUtils.sendChar(ch, ruleView.doc.defaultView);
-  }
+  EventUtils.sendString(data.value, ruleView.doc.defaultView);
   if (data.escape) {
     EventUtils.synthesizeKey("VK_ESCAPE", {});
   } else {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-unfinished_01.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-unfinished_01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-unfinished_01.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-unfinished_01.js	2015-05-25 20:42:57.000000000 +0000
@@ -31,9 +31,7 @@
   is(ruleEditor.rule.textProps.length, 4, "Should have created new text properties.");
   is(ruleEditor.propertyList.children.length, 4, "Should have created property editors.");
 
-  for (let ch of "red") {
-    EventUtils.sendChar(ch, view.doc.defaultView);
-  }
+  EventUtils.sendString("red", view.doc.defaultView);
   EventUtils.synthesizeKey("VK_RETURN", {}, view.doc.defaultView);
 
   is(ruleEditor.rule.textProps.length, 4, "Should have the same number of text properties.");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_search-filter_11.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_search-filter_11.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_search-filter_11.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_search-filter_11.js	2015-05-25 20:42:58.000000000 +0000
@@ -0,0 +1,51 @@
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Tests that the rule view search filter can find "!important".
+
+const SEARCH = "!important";
+
+let TEST_URI = [
+  '<style type="text/css">',
+  '  #testid {',
+  '    background-color: #00F !important;',
+  '  }',
+  '  .testclass {',
+  '    width: 100%;',
+  '  }',
+  '</style>',
+  '<h1 id="testid" class="testclass">Styled Node</h1>'
+].join("\n");
+
+add_task(function*() {
+  yield addTab("data:text/html;charset=utf-8," + encodeURIComponent(TEST_URI));
+  let {toolbox, inspector, view} = yield openRuleView();
+  yield selectNode("#testid", inspector);
+  yield testAddTextInFilter(inspector, view);
+});
+
+function* testAddTextInFilter(inspector, ruleView) {
+  info("Setting filter text to \"" + SEARCH + "\"");
+
+  let win = ruleView.doc.defaultView;
+  let searchField = ruleView.searchField;
+  let onRuleViewFiltered = inspector.once("ruleview-filtered");
+
+  searchField.focus();
+  synthesizeKeys(SEARCH, win);
+  yield onRuleViewFiltered;
+
+  info("Check that the correct rules are visible");
+  is(ruleView.element.children.length, 2, "Should have 2 rules.");
+  is(getRuleViewRuleEditor(ruleView, 0).rule.selectorText, "element",
+    "First rule is inline element.");
+
+  let rule = getRuleViewRuleEditor(ruleView, 1).rule;
+
+  is(rule.selectorText, "#testid", "Second rule is #testid.");
+  ok(rule.textProps[0].editor.container.classList.contains("ruleview-highlight"),
+    "background-color text property is correctly highlighted.");
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_search-filter_12.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_search-filter_12.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_search-filter_12.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_search-filter_12.js	2015-05-25 20:42:58.000000000 +0000
@@ -0,0 +1,41 @@
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Tests that the rule view search filter works properly for stylesheet source.
+
+const SEARCH = "doc_urls_clickable.css";
+const TEST_URI = TEST_URL_ROOT + "doc_urls_clickable.html";
+
+add_task(function*() {
+  yield addTab(TEST_URI);
+  let {toolbox, inspector, view} = yield openRuleView();
+  yield selectNode(".relative1", inspector);
+  yield testAddTextInFilter(inspector, view);
+});
+
+function* testAddTextInFilter(inspector, ruleView) {
+  info("Setting filter text to \"" + SEARCH + "\"");
+
+  let win = ruleView.doc.defaultView;
+  let searchField = ruleView.searchField;
+  let onRuleViewFiltered = inspector.once("ruleview-filtered");
+
+  searchField.focus();
+  synthesizeKeys(SEARCH, win);
+  yield onRuleViewFiltered;
+
+  info("Check that the correct rules are visible");
+  is(ruleView.element.children.length, 2, "Should have 2 rules.");
+  is(getRuleViewRuleEditor(ruleView, 0).rule.selectorText, "element",
+    "First rule is inline element.");
+
+  let rule = getRuleViewRuleEditor(ruleView, 1).rule;
+  let source = rule.textProps[0].editor.ruleEditor.source;
+
+  is(rule.selectorText, ".relative1", "Second rule is .relative1.");
+  ok(source.classList.contains("ruleview-highlight"),
+    "stylesheet source is correctly highlighted.");
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_search-filter_13.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_search-filter_13.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_search-filter_13.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_search-filter_13.js	2015-05-25 20:42:58.000000000 +0000
@@ -0,0 +1,35 @@
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Tests that the rule view search filter does not highlight the source with
+// input that could be parsed as a property line.
+
+const SEARCH = "doc_urls_clickable.css: url";
+const TEST_URI = TEST_URL_ROOT + "doc_urls_clickable.html";
+
+add_task(function*() {
+  yield addTab(TEST_URI);
+  let {toolbox, inspector, view} = yield openRuleView();
+  yield selectNode(".relative1", inspector);
+  yield testAddTextInFilter(inspector, view);
+});
+
+function* testAddTextInFilter(inspector, ruleView) {
+  info("Setting filter text to \"" + SEARCH + "\"");
+
+  let win = ruleView.doc.defaultView;
+  let searchField = ruleView.searchField;
+  let onRuleViewFiltered = inspector.once("ruleview-filtered");
+
+  searchField.focus();
+  synthesizeKeys(SEARCH, win);
+  yield onRuleViewFiltered;
+
+  info("Check that the correct rules are visible");
+  is(ruleView.element.children.length, 1, "Should have 1 rules.");
+  is(getRuleViewRuleEditor(ruleView, 0).rule.selectorText, "element",
+    "First rule is inline element.");
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_07.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_07.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_07.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_07.js	2015-05-25 20:42:58.000000000 +0000
@@ -0,0 +1,55 @@
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Tests that the rule view search filter works properly in the computed list
+// for color values.
+
+const SEARCH = "background-color: #F3F3F3"
+
+let TEST_URI = [
+  '<style type="text/css">',
+  '  .testclass {',
+  '    background: #F3F3F3 none repeat scroll 0% 0%;',
+  '  }',
+  '</style>',
+  '<div class="testclass">Styled Node</h1>'
+].join("\n");
+
+add_task(function*() {
+  yield addTab("data:text/html;charset=utf-8," + encodeURIComponent(TEST_URI));
+  let {toolbox, inspector, view} = yield openRuleView();
+  yield selectNode(".testclass", inspector);
+  yield testAddTextInFilter(inspector, view);
+});
+
+function* testAddTextInFilter(inspector, ruleView) {
+  info("Setting filter text to \"" + SEARCH + "\"");
+
+  let win = ruleView.doc.defaultView;
+  let searchField = ruleView.searchField;
+  let onRuleViewFiltered = inspector.once("ruleview-filtered");
+
+  searchField.focus();
+  synthesizeKeys(SEARCH, win);
+  yield onRuleViewFiltered;
+
+  info("Check that the correct rules are visible");
+  is(ruleView.element.children.length, 2, "Should have 2 rules.");
+  is(getRuleViewRuleEditor(ruleView, 0).rule.selectorText, "element",
+    "First rule is inline element.");
+
+  let rule = getRuleViewRuleEditor(ruleView, 1).rule;
+  let ruleEditor = rule.textProps[0].editor;
+  let computed = ruleEditor.computed;
+
+  is(rule.selectorText, ".testclass", "Second rule is .testclass.");
+  ok(ruleEditor.expander.getAttribute("open"), "Expander is open.");
+  ok(!ruleEditor.container.classList.contains("ruleview-highlight"),
+    "background property is not highlighted.");
+  ok(computed.hasAttribute("filter-open"), "background computed list is open.");
+  ok(computed.children[0].classList.contains("ruleview-highlight"),
+    "background-color computed property is highlighted.");
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_style-editor-link.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_style-editor-link.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_ruleview_style-editor-link.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_ruleview_style-editor-link.js	2015-05-25 20:42:58.000000000 +0000
@@ -7,7 +7,7 @@
 ///////////////////
 //
 // Whitelisting this test.
-// As part of bug 1077403, the leaking uncaught rejection should be fixed. 
+// As part of bug 1077403, the leaking uncaught rejection should be fixed.
 //
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Unknown sheet source");
 
@@ -70,16 +70,16 @@
 function* testInlineStyle(view, inspector) {
   info("Testing inline style");
 
-  let onWindow = waitForWindow();
+  let onTab = waitForTab();
   info("Clicking on the first link in the rule-view");
   clickLinkByIndex(view, 0);
 
-  let win = yield onWindow;
+  let tab = yield onTab;
 
-  let windowType = win.document.documentElement.getAttribute("windowtype");
-  is(windowType, "navigator:view-source", "View source window is open");
-  info("Closing window");
-  win.close();
+  let tabURI = tab.linkedBrowser.documentURI.spec;
+  ok(tabURI.startsWith("view-source:"), "View source tab is open");
+  info("Closing tab");
+  gBrowser.removeTab(tab);
 }
 
 function* testFirstInlineStyleSheet(view, toolbox) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_styleinspector_context-menu-copy-color_02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_styleinspector_context-menu-copy-color_02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/browser_styleinspector_context-menu-copy-color_02.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/browser_styleinspector_context-menu-copy-color_02.js	2015-05-25 20:42:58.000000000 +0000
@@ -58,10 +58,7 @@
   info("Typing new value");
   let input = editor.input;
   let onBlur = once(input, "blur");
-  for (let ch of newColor + ";"){
-    EventUtils.sendChar(ch, view.doc.defaultView);
-  }
-
+  EventUtils.sendString(newColor + ";", view.doc.defaultView);
   yield onBlur;
   yield wait(1);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/head.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/head.js	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/head.js	2015-05-25 20:42:58.000000000 +0000
@@ -492,6 +492,21 @@
 }
 
 /**
+ * Listen for a new tab to open and return a promise that resolves when one
+ * does and completes the load event.
+ * @return a promise that resolves to the tab object
+ */
+let waitForTab = Task.async(function*() {
+  info("Waiting for a tab to open");
+  yield once(gBrowser.tabContainer, "TabOpen");
+  let tab = gBrowser.selectedTab;
+  let browser = tab.linkedBrowser;
+  yield once(browser, "load", true);
+  info("The tab load completed");
+  return tab;
+});
+
+/**
  * @see SimpleTest.waitForClipboard
  * @param {Function} setup Function to execute before checking for the
  * clipboard content
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/unit/test_parseDeclarations.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/unit/test_parseDeclarations.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/styleinspector/test/unit/test_parseDeclarations.js	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/styleinspector/test/unit/test_parseDeclarations.js	2015-05-25 20:42:58.000000000 +0000
@@ -74,15 +74,15 @@
   // Test various types of background-image urls
   {
     input: "background-image: url(../../relative/image.png)",
-    expected: [{name: "background-image", value: "url(\"../../relative/image.png\")", priority: ""}]
+    expected: [{name: "background-image", value: "url(../../relative/image.png)", priority: ""}]
   },
   {
     input: "background-image: url(http://site.com/test.png)",
-    expected: [{name: "background-image", value: "url(\"http://site.com/test.png\")", priority: ""}]
+    expected: [{name: "background-image", value: "url(http://site.com/test.png)", priority: ""}]
   },
   {
     input: "background-image: url(wow.gif)",
-    expected: [{name: "background-image", value: "url(\"wow.gif\")", priority: ""}]
+    expected: [{name: "background-image", value: "url(wow.gif)", priority: ""}]
   },
   // Test that urls with :;{} characters in them are parsed correctly
   {
@@ -152,15 +152,15 @@
   {input: "wat: #XYZ", expected: [{name: "wat", value: "#XYZ", priority: ""}]},
   // Test string/url quotes escaping
   {input: "content: \"this is a 'string'\"", expected: [{name: "content", value: "\"this is a 'string'\"", priority: ""}]},
-  {input: 'content: "this is a \\"string\\""', expected: [{name: "content", value: '\'this is a "string"\'', priority: ""}]},
+  {input: 'content: "this is a \\"string\\""', expected: [{name: "content", value: '"this is a \\"string\\""', priority: ""}]},
   {input: "content: 'this is a \"string\"'", expected: [{name: "content", value: '\'this is a "string"\'', priority: ""}]},
-  {input: "content: 'this is a \\'string\\'", expected: [{name: "content", value: '"this is a \'string\'"', priority: ""}]},
-  {input: "content: 'this \\' is a \" really strange string'", expected: [{name: "content", value: '"this \' is a \\\" really strange string"', priority: ""}]},
+  {input: "content: 'this is a \\'string\\''", expected: [{name: "content", value: "'this is a \\'string\\''", priority: ""}]},
+  {input: "content: 'this \\' is a \" really strange string'", expected: [{name: "content", value: "'this \\' is a \" really strange string'", priority: ""}]},
   {
     input: "content: \"a not s\\\
           o very long title\"",
     expected: [
-      {name: "content", value: '"a not s\
+      {name: "content", value: '"a not s\\\
           o very long title"', priority: ""}
     ]
   },
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/tilt/tilt-commands.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/tilt/tilt-commands.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/tilt/tilt-commands.js	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/tilt/tilt-commands.js	2015-05-25 20:42:58.000000000 +0000
@@ -18,13 +18,14 @@
 
 exports.items = [
 {
-  name: 'tilt',
+  name: "tilt",
   description: l10n.lookup("tiltDesc"),
   manual: l10n.lookup("tiltManual"),
   hidden: true
 },
 {
-  name: 'tilt open',
+  name: "tilt open",
+  runAt: "client",
   description: l10n.lookup("tiltOpenDesc"),
   manual: l10n.lookup("tiltOpenManual"),
   hidden: true,
@@ -42,6 +43,7 @@
 },
 {
   name: "tilt toggle",
+  runAt: "client",
   buttonId: "command-button-tilt",
   buttonClass: "command-button command-button-invertable",
   tooltipText: l10n.lookup("tiltToggleTooltip"),
@@ -82,7 +84,8 @@
   }
 },
 {
-  name: 'tilt translate',
+  name: "tilt translate",
+  runAt: "client",
   description: l10n.lookup("tiltTranslateDesc"),
   manual: l10n.lookup("tiltTranslateManual"),
   hidden: true,
@@ -115,7 +118,8 @@
   }
 },
 {
-  name: 'tilt rotate',
+  name: "tilt rotate",
+  runAt: "client",
   description: l10n.lookup("tiltRotateDesc"),
   manual: l10n.lookup("tiltRotateManual"),
   hidden: true,
@@ -155,7 +159,8 @@
   }
 },
 {
-  name: 'tilt zoom',
+  name: "tilt zoom",
+  runAt: "client",
   description: l10n.lookup("tiltZoomDesc"),
   manual: l10n.lookup("tiltZoomManual"),
   hidden: true,
@@ -181,7 +186,8 @@
   }
 },
 {
-  name: 'tilt reset',
+  name: "tilt reset",
+  runAt: "client",
   description: l10n.lookup("tiltResetDesc"),
   manual: l10n.lookup("tiltResetManual"),
   hidden: true,
@@ -199,7 +205,8 @@
   }
 },
 {
-  name: 'tilt close',
+  name: "tilt close",
+  runAt: "client",
   description: l10n.lookup("tiltCloseDesc"),
   manual: l10n.lookup("tiltCloseManual"),
   hidden: true,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/timeline/moz.build firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/timeline/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/timeline/moz.build	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/timeline/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXTRA_JS_MODULES.devtools.timeline += [
-    'panel.js',
-]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/timeline/panel.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/timeline/panel.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/timeline/panel.js	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/timeline/panel.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-const { Cc, Ci, Cu, Cr } = require("chrome");
-
-Cu.import("resource://gre/modules/Task.jsm");
-
-loader.lazyRequireGetter(this, "promise");
-loader.lazyRequireGetter(this, "EventEmitter",
-  "devtools/toolkit/event-emitter");
-
-loader.lazyRequireGetter(this, "TimelineFront",
-  "devtools/server/actors/timeline", true);
-
-function TimelinePanel(iframeWindow, toolbox) {
-  this.panelWin = iframeWindow;
-  this._toolbox = toolbox;
-
-  EventEmitter.decorate(this);
-};
-
-exports.TimelinePanel = TimelinePanel;
-
-TimelinePanel.prototype = {
-  /**
-   * Open is effectively an asynchronous constructor.
-   *
-   * @return object
-   *         A promise that is resolved when the timeline completes opening.
-   */
-  open: Task.async(function*() {
-    // Local debugging needs to make the target remote.
-    yield this.target.makeRemote();
-
-    this.panelWin.gToolbox = this._toolbox;
-    this.panelWin.gTarget = this.target;
-    this.panelWin.gFront = new TimelineFront(this.target.client, this.target.form);
-    yield this.panelWin.startupTimeline();
-
-    this.isReady = true;
-    this.emit("ready");
-    return this;
-  }),
-
-  // DevToolPanel API
-
-  get target() this._toolbox.target,
-
-  destroy: Task.async(function*() {
-    // Make sure this panel is not already destroyed.
-    if (this._destroyed) {
-      return;
-    }
-
-    yield this.panelWin.shutdownTimeline();
-    // Destroy front to ensure packet handler is removed from client
-    this.panelWin.gFront.destroy();
-    this.emit("destroyed");
-    this._destroyed = true;
-  })
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/timeline/timeline.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/timeline/timeline.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/timeline/timeline.js	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/timeline/timeline.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,627 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
-
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/Task.jsm");
-Cu.import("resource://gre/modules/devtools/Loader.jsm");
-Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
-Cu.import("resource:///modules/devtools/gDevTools.jsm");
-
-devtools.lazyRequireGetter(this, "promise");
-devtools.lazyRequireGetter(this, "EventEmitter",
-  "devtools/toolkit/event-emitter");
-
-devtools.lazyRequireGetter(this, "MarkersOverview",
-  "devtools/shared/timeline/markers-overview", true);
-devtools.lazyRequireGetter(this, "MemoryOverview",
-  "devtools/shared/timeline/memory-overview", true);
-devtools.lazyRequireGetter(this, "Waterfall",
-  "devtools/shared/timeline/waterfall", true);
-devtools.lazyRequireGetter(this, "MarkerDetails",
-  "devtools/shared/timeline/marker-details", true);
-devtools.lazyRequireGetter(this, "TIMELINE_BLUEPRINT",
-  "devtools/shared/timeline/global", true);
-
-devtools.lazyImporter(this, "CanvasGraphUtils",
-  "resource:///modules/devtools/Graphs.jsm");
-
-devtools.lazyImporter(this, "PluralForm",
-  "resource://gre/modules/PluralForm.jsm");
-
-const OVERVIEW_UPDATE_INTERVAL = 200;
-const OVERVIEW_INITIAL_SELECTION_RATIO = 0.15;
-
-/**
- * Preference for devtools.timeline.hiddenMarkers.
- * Stores which markers should be hidden.
- */
-const Prefs = new ViewHelpers.Prefs("devtools.timeline", {
-  hiddenMarkers: ["Json", "hiddenMarkers"]
-});
-
-// The panel's window global is an EventEmitter firing the following events:
-const EVENTS = {
-  // When a recording is started or stopped, via the `stopwatch` button.
-  RECORDING_STARTED: "Timeline:RecordingStarted",
-  RECORDING_ENDED: "Timeline:RecordingEnded",
-
-  // When the overview graphs are populated with new markers.
-  OVERVIEW_UPDATED: "Timeline:OverviewUpdated",
-
-  // When the waterfall view is populated with new markers.
-  WATERFALL_UPDATED: "Timeline:WaterfallUpdated"
-};
-
-/**
- * The current target and the timeline front, set by this tool's host.
- */
-let gToolbox, gTarget, gFront;
-
-/**
- * Initializes the timeline controller and views.
- */
-let startupTimeline = Task.async(function*() {
-  yield TimelineView.initialize();
-  yield TimelineController.initialize();
-});
-
-/**
- * Destroys the timeline controller and views.
- */
-let shutdownTimeline = Task.async(function*() {
-  yield TimelineView.destroy();
-  yield TimelineController.destroy();
-  yield gFront.stop();
-});
-
-/**
- * Functions handling the timeline frontend controller.
- */
-let TimelineController = {
-  /**
-   * Permanent storage for the markers and the memory measurements streamed by
-   * the backend, along with the start and end timestamps.
-   */
-  _starTime: 0,
-  _endTime: 0,
-  _markers: [],
-  _memory: [],
-  _frames: [],
-
-  /**
-   * Initialization function, called when the tool is started.
-   */
-  initialize: function() {
-    this._onRecordingTick = this._onRecordingTick.bind(this);
-    this._onMarkers = this._onMarkers.bind(this);
-    this._onMemory = this._onMemory.bind(this);
-    this._onFrames = this._onFrames.bind(this);
-
-    gFront.on("markers", this._onMarkers);
-    gFront.on("memory", this._onMemory);
-    gFront.on("frames", this._onFrames);
-  },
-
-  /**
-   * Destruction function, called when the tool is closed.
-   */
-  destroy: function() {
-    gFront.off("markers", this._onMarkers);
-    gFront.off("memory", this._onMemory);
-    gFront.off("frames", this._onFrames);
-  },
-
-  /**
-   * Gets the { stat, end } time interval for this recording.
-   * @return object
-   */
-  getInterval: function() {
-    return { startTime: this._startTime, endTime: this._endTime };
-  },
-
-  /**
-   * Gets the accumulated markers in this recording.
-   * @return array
-   */
-  getMarkers: function() {
-    return this._markers;
-  },
-
-  /**
-   * Gets the accumulated memory measurements in this recording.
-   * @return array
-   */
-  getMemory: function() {
-    return this._memory;
-  },
-
-  /**
-   * Gets stack frame array reported by the actor.  The marker "stack"
-   * and "endStack" properties are indices into this array.  See
-   * actors/utils/stack.js for more details.
-   * @return array
-   */
-  getFrames: function() {
-    return this._frames;
-  },
-
-  /**
-   * Updates the views to show or hide the memory recording data.
-   */
-  updateMemoryRecording: Task.async(function*() {
-    if ($("#memory-checkbox").checked) {
-      yield TimelineView.showMemoryOverview();
-    } else {
-      yield TimelineView.hideMemoryOverview();
-    }
-  }),
-
-  /**
-   * Starts/stops the timeline recording and streaming.
-   */
-  toggleRecording: Task.async(function*() {
-    let isRecording = yield gFront.isRecording();
-    if (isRecording == false) {
-      yield this._startRecording();
-    } else {
-      yield this._stopRecording();
-    }
-  }),
-
-  /**
-   * Starts the recording, updating the UI as needed.
-   */
-  _startRecording: function*() {
-    TimelineView.handleRecordingStarted();
-
-    let withMemory = $("#memory-checkbox").checked;
-    let startTime = yield gFront.start({ withMemory });
-
-    // Times must come from the actor in order to be self-consistent.
-    // However, we also want to update the view with the elapsed time
-    // even when the actor is not generating data.  To do this we get
-    // the local time and use it to compute a reasonable elapsed time.
-    // See _onRecordingTick.
-    this._localStartTime = performance.now();
-    this._startTime = startTime;
-    this._endTime = startTime;
-    this._markers = [];
-    this._memory = [];
-    this._frames = [];
-    this._updateId = setInterval(this._onRecordingTick, OVERVIEW_UPDATE_INTERVAL);
-  },
-
-  /**
-   * Stops the recording, updating the UI as needed.
-   */
-  _stopRecording: function*() {
-    clearInterval(this._updateId);
-
-    // Sorting markers is only important when displayed in the waterfall.
-    this._markers = this._markers.sort((a,b) => (a.start > b.start));
-
-    TimelineView.handleRecordingUpdate();
-    TimelineView.handleRecordingEnded();
-    yield gFront.stop();
-  },
-
-  /**
-   * Used in tests. Stops the recording, discarding the accumulated markers and
-   * 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;
-  },
-
-  /**
-   * Callback handling the "markers" event on the timeline front.
-   *
-   * @param array markers
-   *        A list of new markers collected since the last time this
-   *        function was invoked.
-   * @param number endTime
-   *        A time after the last marker in markers was collected.
-   */
-  _onMarkers: function(markers, endTime) {
-    for (let marker of markers) {
-      marker.start -= this._startTime;
-      marker.end -= this._startTime;
-    }
-    Array.prototype.push.apply(this._markers, markers);
-    this._endTime = endTime;
-  },
-
-  /**
-   * Callback handling the "memory" event on the timeline front.
-   *
-   * @param number delta
-   *        The number of milliseconds elapsed since epoch.
-   * @param object measurement
-   *        A detailed breakdown of the current memory usage.
-   */
-  _onMemory: function(delta, measurement) {
-    this._memory.push({
-      delta: delta - this._startTime,
-      value: measurement.total / 1024 / 1024
-    });
-  },
-
-  /**
-   * Callback handling the "frames" event on the timeline front.
-   *
-   * @param number delta
-   *        The number of milliseconds elapsed since epoch.
-   * @param object frames
-   *        Newly generated frame objects.
-   */
-  _onFrames: function(delta, frames) {
-    Array.prototype.push.apply(this._frames, frames);
-  },
-
-  /**
-   * Callback invoked at a fixed interval while recording.
-   * Updates the current time and the timeline overview.
-   */
-  _onRecordingTick: function() {
-    // Compute an approximate ending time for the view.  This is
-    // needed to ensure that the view updates even when new data is
-    // not being generated.
-    let fakeTime = this._startTime + (performance.now() - this._localStartTime);
-    if (fakeTime > this._endTime) {
-      this._endTime = fakeTime;
-    }
-    TimelineView.handleRecordingUpdate();
-  }
-};
-
-/**
- * Functions handling the timeline frontend view.
- */
-let TimelineView = {
-  /**
-   * Initialization function, called when the tool is started.
-   */
-  initialize: Task.async(function*() {
-    let blueprint = this._getFilteredBluePrint();
-    this.markersOverview = new MarkersOverview($("#markers-overview"), blueprint);
-    this.waterfall = new Waterfall($("#timeline-waterfall"), $("#timeline-pane"), blueprint);
-    this.markerDetails = new MarkerDetails($("#timeline-waterfall-details"), $("#timeline-waterfall-container > splitter"));
-
-    this._onThemeChange = this._onThemeChange.bind(this);
-    this._onSelecting = this._onSelecting.bind(this);
-    this._onRefresh = this._onRefresh.bind(this);
-
-    gDevTools.on("pref-changed", this._onThemeChange);
-    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);
-
-    let theme = Services.prefs.getCharPref("devtools.theme");
-    this.markersOverview.setTheme(theme);
-
-    yield this.markersOverview.ready();
-
-    yield this.waterfall.recalculateBounds();
-
-    this._buildFilterPopup();
-  }),
-
-  /**
-   * Destruction function, called when the tool is closed.
-   */
-  destroy: function() {
-    gDevTools.off("pref-changed", this._onThemeChange);
-    this.markerDetails.off("resize", this._onRefresh);
-    this.markerDetails.destroy();
-    this.waterfall.off("selected", this._onMarkerSelected);
-    this.waterfall.off("unselected", this._onMarkerSelected);
-    this.waterfall.destroy();
-    this.markersOverview.off("selecting", this._onSelecting);
-    this.markersOverview.off("refresh", this._onRefresh);
-    this.markersOverview.destroy();
-
-    // The memory overview graph is not always available.
-    if (this.memoryOverview) {
-      this.memoryOverview.destroy();
-    }
-  },
-
-  /**
-   * Shows the memory overview graph.
-   */
-  showMemoryOverview: Task.async(function*() {
-    let theme = Services.prefs.getCharPref("devtools.theme");
-
-    this.memoryOverview = new MemoryOverview($("#memory-overview"));
-    this.memoryOverview.setTheme(theme);
-    yield this.memoryOverview.ready();
-
-    let memory = TimelineController.getMemory();
-    this.memoryOverview.setData(memory);
-
-    CanvasGraphUtils.linkAnimation(this.markersOverview, this.memoryOverview);
-    CanvasGraphUtils.linkSelection(this.markersOverview, this.memoryOverview);
-  }),
-
-  /**
-   * Hides the memory overview graph.
-   */
-  hideMemoryOverview: function() {
-    if (!this.memoryOverview) {
-      return;
-    }
-    this.memoryOverview.destroy();
-    this.memoryOverview = null;
-  },
-
-  /**
-   * A marker has been selected in the waterfall.
-   */
-  _onMarkerSelected: function(event, marker) {
-    if (event == "selected") {
-      this.markerDetails.render({
-        toolbox: gToolbox,
-        marker: marker,
-        frames: TimelineController.getFrames()
-      });
-    }
-    if (event == "unselected") {
-      this.markerDetails.empty();
-    }
-  },
-
-  /**
-   * Signals that a recording session has started and triggers the appropriate
-   * changes in the UI.
-   */
-  handleRecordingStarted: function() {
-    $("#record-button").setAttribute("checked", "true");
-    $("#memory-checkbox").setAttribute("disabled", "true");
-    $("#timeline-pane").selectedPanel = $("#recording-notice");
-
-    this.markersOverview.clearView();
-
-    // The memory overview graph is not always available.
-    if (this.memoryOverview) {
-      this.memoryOverview.clearView();
-    }
-
-    this.waterfall.clearView();
-
-    window.emit(EVENTS.RECORDING_STARTED);
-  },
-
-  /**
-   * Signals that a recording session has ended and triggers the appropriate
-   * changes in the UI.
-   */
-  handleRecordingEnded: function() {
-    $("#record-button").removeAttribute("checked");
-    $("#memory-checkbox").removeAttribute("disabled");
-    $("#timeline-pane").selectedPanel = $("#timeline-waterfall-container");
-
-    this.markersOverview.selectionEnabled = true;
-
-    // The memory overview graph is not always available.
-    if (this.memoryOverview) {
-      this.memoryOverview.selectionEnabled = true;
-    }
-
-    let interval = TimelineController.getInterval();
-    let markers = TimelineController.getMarkers();
-    let memory = TimelineController.getMemory();
-
-    if (markers.length) {
-      let start = markers[0].start * this.markersOverview.dataScaleX;
-      let end = start + this.markersOverview.width * OVERVIEW_INITIAL_SELECTION_RATIO;
-      this.markersOverview.setSelection({ start, end });
-    } else {
-      let startTime = interval.startTime;
-      let endTime = interval.endTime;
-      this.waterfall.setData({ markers, interval: { startTime, endTime } });
-    }
-
-    window.emit(EVENTS.RECORDING_ENDED);
-  },
-
-  /**
-   * Signals that a new set of markers was made available by the controller,
-   * or that the overview graph needs to be updated.
-   */
-  handleRecordingUpdate: function() {
-    let interval = TimelineController.getInterval();
-    let markers = TimelineController.getMarkers();
-    let memory = TimelineController.getMemory();
-
-    let duration = interval.endTime - interval.startTime;
-    this.markersOverview.setData({ markers, duration });
-
-    // The memory overview graph is not always available.
-    if (this.memoryOverview) {
-      this.memoryOverview.setData(memory);
-    }
-
-    window.emit(EVENTS.OVERVIEW_UPDATED);
-  },
-
-  /**
-   * Callback handling the "selecting" event on the timeline overview.
-   */
-  _onSelecting: function() {
-    if (!this.markersOverview.hasSelection() &&
-        !this.markersOverview.hasSelectionInProgress()) {
-      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;
-
-    let markers = TimelineController.getMarkers();
-    let interval = TimelineController.getInterval();
-
-    let startTime = Math.min(start, end);
-    let endTime = Math.max(start, end);
-
-    this.waterfall.setData({ markers, interval: { startTime, endTime } });
-  },
-
-  /**
-   * Callback handling the "refresh" event on the timeline overview.
-   */
-  _onRefresh: function() {
-    this.waterfall.recalculateBounds();
-    this.updateWaterfall();
-  },
-
-  /**
-   * Rebuild a blueprint without hidden markers.
-   */
-  _getFilteredBluePrint: function() {
-    let hiddenMarkers = Prefs.hiddenMarkers;
-    let filteredBlueprint = Cu.cloneInto(TIMELINE_BLUEPRINT, {});
-    let maybeRemovedGroups = new Set();
-    let removedGroups = new Set();
-
-    // 1. Remove hidden markers from the blueprint.
-
-    for (let hiddenMarkerName of hiddenMarkers) {
-      maybeRemovedGroups.add(filteredBlueprint[hiddenMarkerName].group);
-      delete filteredBlueprint[hiddenMarkerName];
-    }
-
-    // 2. Get a list of all the groups that will be removed.
-
-    for (let removedGroup of maybeRemovedGroups) {
-      let markerNames = Object.keys(filteredBlueprint);
-      let allGroupsRemoved = markerNames.every(e => filteredBlueprint[e].group != removedGroup);
-      if (allGroupsRemoved) {
-        removedGroups.add(removedGroup);
-      }
-    }
-
-    // 3. Offset groups.
-
-    for (let removedGroup of removedGroups) {
-      for (let [, markerDetails] of Iterator(filteredBlueprint)) {
-        if (markerDetails.group > removedGroup) {
-          markerDetails.group--;
-        }
-      }
-    }
-
-    return filteredBlueprint;
-
-  },
-
-  /**
-   * When the list of hidden markers changes, update waterfall
-   * and overview.
-   */
-  _onHiddenMarkersChanged: function(e) {
-    let menuItems = $$("#timelineFilterPopup menuitem[marker-type]:not([checked])");
-    let hiddenMarkers = Array.map(menuItems, e => e.getAttribute("marker-type"));
-
-    Prefs.hiddenMarkers = hiddenMarkers;
-    let blueprint = this._getFilteredBluePrint();
-
-    this.waterfall.setBlueprint(blueprint);
-    this.updateWaterfall();
-
-    this.markersOverview.setBlueprint(blueprint);
-    this.markersOverview.refresh({ force: true });
-  },
-
-  /**
-   * Creates the filter popup.
-   */
-  _buildFilterPopup: function() {
-    let popup = $("#timelineFilterPopup");
-    let button = $("#filter-button");
-
-    popup.addEventListener("popupshowing", () => button.setAttribute("open", "true"));
-    popup.addEventListener("popuphiding",  () => button.removeAttribute("open"));
-
-    this._onHiddenMarkersChanged = this._onHiddenMarkersChanged.bind(this);
-
-    for (let [markerName, markerDetails] of Iterator(TIMELINE_BLUEPRINT)) {
-      let menuitem = document.createElement("menuitem");
-      menuitem.setAttribute("closemenu", "none");
-      menuitem.setAttribute("type", "checkbox");
-      menuitem.setAttribute("marker-type", markerName);
-      menuitem.setAttribute("label", markerDetails.label);
-      menuitem.setAttribute("flex", "1");
-      menuitem.setAttribute("align", "center");
-
-      menuitem.addEventListener("command", this._onHiddenMarkersChanged);
-
-      if (Prefs.hiddenMarkers.indexOf(markerName) == -1) {
-        menuitem.setAttribute("checked", "true");
-      }
-
-      // Style used by pseudo element ::before in timeline.css.in
-      let bulletStyle = `--bullet-bg: ${markerDetails.fill};`
-      bulletStyle += `--bullet-border: ${markerDetails.stroke}`;
-      menuitem.setAttribute("style", bulletStyle);
-
-      popup.appendChild(menuitem);
-    }
-  },
-
-  /*
-   * Called when the developer tools theme changes. Redraws
-   * the graphs with the new theme setting.
-   */
-  _onThemeChange: function (_, theme) {
-    if (this.memoryOverview) {
-      this.memoryOverview.setTheme(theme.newValue);
-      this.memoryOverview.refresh({ force: true });
-    }
-
-    this.markersOverview.setTheme(theme.newValue);
-    this.markersOverview.refresh({ force: true });
-  }
-};
-
-/**
- * Convenient way of emitting events from the panel window.
- */
-EventEmitter.decorate(this);
-
-/**
- * DOM query helpers.
- */
-function $(selector, target = document) {
-  return target.querySelector(selector);
-}
-function $$(selector, target = document) {
-  return target.querySelectorAll(selector);
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/timeline/timeline.xul firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/timeline/timeline.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/timeline/timeline.xul	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/timeline/timeline.xul	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<?xml-stylesheet href="chrome://browser/skin/" 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;
-]>
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script src="chrome://browser/content/devtools/theme-switching.js"/>
-  <script type="application/javascript" src="timeline.js"/>
-
-  <popupset id="timelinePopupset">
-    <menupopup id="timelineFilterPopup" position="after_start"/>
-  </popupset>
-
-  <vbox class="theme-body" flex="1">
-    <toolbar id="timeline-toolbar"
-             class="devtools-toolbar">
-      <hbox id="recordings-controls"
-            class="devtools-toolbarbutton-group"
-            align="center">
-        <toolbarbutton id="record-button"
-                       class="devtools-toolbarbutton"
-                       oncommand="TimelineController.toggleRecording()"
-                       tooltiptext="&timelineUI.recordButton.tooltip;"/>
-        <toolbarbutton id="filter-button"
-                       popup="timelineFilterPopup"
-                       class="devtools-toolbarbutton"
-                       tooltiptext="&timelineUI.filterButton.tooltip;"/>
-        <checkbox id="memory-checkbox"
-                  label="&timelineUI.memoryCheckbox.label;"
-                  oncommand="TimelineController.updateMemoryRecording()"
-                  tooltiptext="&timelineUI.memoryCheckbox.tooltip;"/>
-        <label id="record-label"
-               value="&timelineUI.recordLabel;"/>
-      </hbox>
-    </toolbar>
-
-    <vbox id="markers-overview"/>
-    <vbox id="memory-overview"/>
-
-    <deck id="timeline-pane"
-          flex="1">
-      <hbox id="empty-notice"
-            class="notice-container"
-            align="center"
-            pack="center"
-            flex="1">
-        <label value="&timelineUI.emptyNotice1;"/>
-        <button id="profiling-notice-button"
-                class="devtools-toolbarbutton"
-                standalone="true"
-                oncommand="TimelineController.toggleRecording()"/>
-        <label value="&timelineUI.emptyNotice2;"/>
-      </hbox>
-
-      <hbox id="recording-notice"
-            class="notice-container"
-            align="center"
-            pack="center"
-            flex="1">
-        <label value="&timelineUI.stopNotice1;"/>
-        <button id="profiling-notice-button"
-                class="devtools-toolbarbutton"
-                standalone="true"
-                checked="true"
-                oncommand="TimelineController.toggleRecording()"/>
-        <label value="&timelineUI.stopNotice2;"/>
-      </hbox>
-
-      <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 firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webaudioeditor/test/browser_audionode-actor-get-params-02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webaudioeditor/test/browser_audionode-actor-get-params-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webaudioeditor/test/browser_audionode-actor-get-params-02.js	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webaudioeditor/test/browser_audionode-actor-get-params-02.js	2015-05-25 20:42:58.000000000 +0000
@@ -41,7 +41,7 @@
       ok(expected[param](value), type + " has a passing value for " + param);
     }
     else {
-      ise(value, expected[param], type + " has correct default value and type for " + param);
+      is(value, expected[param], type + " has correct default value and type for " + param);
     }
   });
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webaudioeditor/test/browser_audionode-actor-get-set-param.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webaudioeditor/test/browser_audionode-actor-get-set-param.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webaudioeditor/test/browser_audionode-actor-get-set-param.js	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webaudioeditor/test/browser_audionode-actor-get-set-param.js	2015-05-25 20:42:58.000000000 +0000
@@ -14,10 +14,10 @@
 
   let freq = yield oscNode.getParam("frequency");
   info(typeof freq);
-  ise(freq, 440, "AudioNode:getParam correctly fetches AudioParam");
+  is(freq, 440, "AudioNode:getParam correctly fetches AudioParam");
 
   let type = yield oscNode.getParam("type");
-  ise(type, "sine", "AudioNode:getParam correctly fetches non-AudioParam");
+  is(type, "sine", "AudioNode:getParam correctly fetches non-AudioParam");
 
   type = yield oscNode.getParam("not-a-valid-param");
   ok(type.type === "undefined",
@@ -25,12 +25,12 @@
 
   let resSuccess = yield oscNode.setParam("frequency", 220);
   freq = yield oscNode.getParam("frequency");
-  ise(freq, 220, "AudioNode:setParam correctly sets a `number` AudioParam");
+  is(freq, 220, "AudioNode:setParam correctly sets a `number` AudioParam");
   is(resSuccess, undefined, "AudioNode:setParam returns undefined for correctly set AudioParam");
 
   resSuccess = yield oscNode.setParam("type", "square");
   type = yield oscNode.getParam("type");
-  ise(type, "square", "AudioNode:setParam correctly sets a `string` non-AudioParam");
+  is(type, "square", "AudioNode:setParam correctly sets a `string` non-AudioParam");
   is(resSuccess, undefined, "AudioNode:setParam returns undefined for correctly set AudioParam");
 
   try {
@@ -40,7 +40,7 @@
     ok(/is not a finite floating-point/.test(e.message), "AudioNode:setParam returns error with correct message when attempting an invalid assignment");
     is(e.type, "TypeError", "AudioNode:setParam returns error with correct type when attempting an invalid assignment");
     freq = yield oscNode.getParam("frequency");
-    ise(freq, 220, "AudioNode:setParam does not modify value when an error occurs");
+    is(freq, 220, "AudioNode:setParam does not modify value when an error occurs");
   }
 
   yield removeTab(target.tab);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webaudioeditor/test/browser_callwatcher-02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webaudioeditor/test/browser_callwatcher-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webaudioeditor/test/browser_callwatcher-02.js	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webaudioeditor/test/browser_callwatcher-02.js	2015-05-25 20:42:58.000000000 +0000
@@ -26,7 +26,7 @@
   is(error.name, "TypeError", "error has correct name");
   is(error.message, "Argument 1 is not valid for any of the 2-argument overloads of AudioNode.connect.", "error has correct message");
   is(error.stringified, "TypeError: Argument 1 is not valid for any of the 2-argument overloads of AudioNode.connect.", "error is stringified correctly");
-  ise(error.instanceof, true, "error is correctly an instanceof TypeError");
+  is(error.instanceof, true, "error is correctly an instanceof TypeError");
   is(error.fileName, "http://example.com/browser/browser/devtools/webaudioeditor/test/doc_bug_1112378.html", "error has correct fileName");
 
   error = yield evalInDebuggee("throwDOMException()");
@@ -37,7 +37,7 @@
   is(error.name, "NotSupportedError", "exception has correct name");
   is(error.message, "Operation is not supported", "exception has correct message");
   is(error.stringified, "NotSupportedError: Operation is not supported", "exception is stringified correctly");
-  ise(error.instanceof, true, "exception is correctly an instance of DOMException");
+  is(error.instanceof, true, "exception is correctly an instance of DOMException");
   is(error.filename, "http://example.com/browser/browser/devtools/webaudioeditor/test/doc_bug_1112378.html", "exception has correct filename");
 
   yield teardown(target);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webaudioeditor/test/browser_wa_navigate.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webaudioeditor/test/browser_wa_navigate.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webaudioeditor/test/browser_wa_navigate.js	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webaudioeditor/test/browser_wa_navigate.js	2015-05-25 20:42:58.000000000 +0000
@@ -19,8 +19,8 @@
   ]);
 
   var { nodes, edges } = countGraphObjects(panelWin);
-  ise(nodes, 3, "should only be 3 nodes.");
-  ise(edges, 2, "should only be 2 edges.");
+  is(nodes, 3, "should only be 3 nodes.");
+  is(edges, 2, "should only be 2 edges.");
 
   navigate(target, SIMPLE_NODES_URL);
 
@@ -37,8 +37,8 @@
     "The tool's content should reappear without closing and reopening the toolbox.");
 
   var { nodes, edges } = countGraphObjects(panelWin);
-  ise(nodes, 15, "after navigation, should have 15 nodes");
-  ise(edges, 0, "after navigation, should have 0 edges.");
+  is(nodes, 15, "after navigation, should have 15 nodes");
+  is(edges, 0, "after navigation, should have 0 edges.");
 
   yield teardown(target);
 });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webaudioeditor/test/browser_wa_reset-02.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webaudioeditor/test/browser_wa_reset-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webaudioeditor/test/browser_wa_reset-02.js	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webaudioeditor/test/browser_wa_reset-02.js	2015-05-25 20:42:58.000000000 +0000
@@ -19,8 +19,8 @@
   ]);
 
   let { nodes, edges } = countGraphObjects(panelWin);
-  ise(nodes, 3, "should only be 3 nodes.");
-  ise(edges, 2, "should only be 2 edges.");
+  is(nodes, 3, "should only be 3 nodes.");
+  is(edges, 2, "should only be 2 edges.");
 
   reload(target);
 
@@ -30,8 +30,8 @@
   ]);
 
   ({ nodes, edges } = countGraphObjects(panelWin));
-  ise(nodes, 3, "after reload, should only be 3 nodes.");
-  ise(edges, 2, "after reload, should only be 2 edges.");
+  is(nodes, 3, "after reload, should only be 3 nodes.");
+  is(edges, 2, "after reload, should only be 2 edges.");
 
   yield teardown(target);
 });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webaudioeditor/test/browser_wa_reset-03.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webaudioeditor/test/browser_wa_reset-03.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webaudioeditor/test/browser_wa_reset-03.js	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webaudioeditor/test/browser_wa_reset-03.js	2015-05-25 20:42:58.000000000 +0000
@@ -36,7 +36,7 @@
   nodeIds = actors.map(actor => actor.actorID);
 
   ok(!InspectorView.isVisible(), "InspectorView hidden on start.");
-  ise(InspectorView.getCurrentAudioNode(), null,
+  is(InspectorView.getCurrentAudioNode(), null,
     "InspectorView has no current node set on reset.");
 
   yield clickGraphNode(panelWin, nodeIds[2], true);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webaudioeditor/test/head.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webaudioeditor/test/head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webaudioeditor/test/head.js	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webaudioeditor/test/head.js	2015-05-25 20:42:58.000000000 +0000
@@ -278,7 +278,7 @@
         "Passing property value of " + value + " for " + variable + " " + description);
     }
     else {
-      ise(value, hash[variable],
+      is(value, hash[variable],
         "Correct property value of " + hash[variable] + " for " + variable + " " + description);
     }
   });
@@ -540,4 +540,4 @@
   "DynamicsCompressorNode": "DynamicsCompressor",
   "OscillatorNode": "Oscillator",
   "StereoPannerNode": "StereoPanner"
-};
\ No newline at end of file
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webconsole/hudservice.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webconsole/hudservice.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webconsole/hudservice.js	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webconsole/hudservice.js	2015-05-25 20:42:58.000000000 +0000
@@ -434,6 +434,15 @@
    *        The line number which should be highlighted.
    */
   viewSource: function WC_viewSource(aSourceURL, aSourceLine) {
+    // Attempt to access view source via a browser first, which may display it in
+    // a tab, if enabled.
+    let browserWin = Services.wm.getMostRecentWindow("navigator:browser");
+    if (browserWin) {
+      return browserWin.BrowserViewSourceOfDocument({
+        URL: aSourceURL,
+        lineNumber: aSourceLine
+      });
+    }
     this.gViewSourceUtils.viewSource(aSourceURL, null, this.iframeWindow.document, aSourceLine || 0);
   },
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webconsole/test/browser_webconsole_autocomplete_and_selfxss.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webconsole/test/browser_webconsole_autocomplete_and_selfxss.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webconsole/test/browser_webconsole_autocomplete_and_selfxss.js	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webconsole/test/browser_webconsole_autocomplete_and_selfxss.js	2015-05-25 20:42:58.000000000 +0000
@@ -39,7 +39,7 @@
     waitForClipboard(
       stringToCopy,
       function() {
-        clipboardHelper.copyString(stringToCopy, document);
+        clipboardHelper.copyString(stringToCopy);
       },
       onClipboardCopy,
       finishTest);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webconsole/test/browser_webconsole_netlogging.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webconsole/test/browser_webconsole_netlogging.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webconsole/test/browser_webconsole_netlogging.js	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webconsole/test/browser_webconsole_netlogging.js	2015-05-25 20:42:59.000000000 +0000
@@ -184,12 +184,14 @@
 
     executeSoon(testNetworkPanel);
   };
-
-  let form = content.document.querySelector("form");
-  ok(form, "we have the HTML form");
-  form.submit();
+  ContentTask.spawn(gBrowser.selectedBrowser, { }, `function()
+  {
+    let form = content.document.querySelector("form");
+    form.submit();
+  }`);
 }
 
+
 function testNetworkPanel()
 {
   // Open the NetworkPanel. The functionality of the NetworkPanel is tested
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webconsole/test/browser_webconsole_output_05.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webconsole/test/browser_webconsole_output_05.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webconsole/test/browser_webconsole_output_05.js	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webconsole/test/browser_webconsole_output_05.js	2015-05-25 20:42:59.000000000 +0000
@@ -64,10 +64,10 @@
   // 7
   {
     input: "Date.prototype",
-    output: "Date",
+    output: /Object \{.*\}/,
     printOutput: "Invalid Date",
     inspectable: true,
-    variablesViewLabel: "Date",
+    variablesViewLabel: "Object",
   },
 
   // 8
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webconsole/test/browser_webconsole_view_source.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webconsole/test/browser_webconsole_view_source.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webconsole/test/browser_webconsole_view_source.js	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webconsole/test/browser_webconsole_view_source.js	2015-05-25 20:42:59.000000000 +0000
@@ -10,13 +10,9 @@
 let Sources;
 let getItemInvoked = false;
 
-function test() {
-  loadTab(TEST_URI).then(() => {
-    openConsole(null).then(testViewSource);
-  });
-}
-
-function testViewSource(hud) {
+add_task(function*() {
+  yield loadTab(TEST_URI);
+  let hud = yield openConsole(null);
   info("console opened");
 
   let button = content.document.querySelector("button");
@@ -25,58 +21,42 @@
   expectUncaughtException();
   EventUtils.sendMouseEvent({ type: "click" }, button, content);
 
-  openDebugger().then(({panelWin: { DebuggerView }}) => {
-    info("debugger opened");
-    Sources = DebuggerView.Sources;
-    openConsole().then((hud) => {
-      info("console opened again");
-
-      waitForMessages({
-        webconsole: hud,
-        messages: [{
-          text: "fooBazBaz is not defined",
-          category: CATEGORY_JS,
-          severity: SEVERITY_ERROR,
-        }],
-      }).then(onMessage);
-    });
+  let { panelWin: { DebuggerView } } = yield openDebugger();
+  info("debugger opened");
+  Sources = DebuggerView.Sources;
+  hud = yield openConsole();
+  info("console opened again");
+
+  let [result] = yield waitForMessages({
+    webconsole: hud,
+    messages: [{
+      text: "fooBazBaz is not defined",
+      category: CATEGORY_JS,
+      severity: SEVERITY_ERROR,
+    }],
   });
 
-  function onMessage([result]) {
-    let msg = [...result.matched][0];
-    ok(msg, "error message");
-    let locationNode = msg.querySelector(".message-location");
-    ok(locationNode, "location node");
-
-    Services.ww.registerNotification(observer);
-
-    getItemForAttachment = Sources.getItemForAttachment;
-    Sources.getItemForAttachment = () => {
-      getItemInvoked = true;
-      return false;
-    };
-
-    EventUtils.sendMouseEvent({ type: "click" }, locationNode);
-  }
-}
-
-let observer = {
-  observe: function(aSubject, aTopic, aData) {
-    if (aTopic != "domwindowopened") {
-      return;
-    }
-
-    ok(true, "the view source window was opened in response to clicking " +
-       "the location node");
-
-    aSubject.close();
-    ok(getItemInvoked, "custom getItemForAttachment() was invoked");
-    Sources.getItemForAttachment = getItemForAttachment;
-    Sources = getItemForAttachment = null;
-    finishTest();
-  }
-};
-
-registerCleanupFunction(function() {
-  Services.ww.unregisterNotification(observer);
+  let msg = [...result.matched][0];
+  ok(msg, "error message");
+  let locationNode = msg.querySelector(".message-location");
+  ok(locationNode, "location node");
+
+  let onTabOpen = waitForTab();
+
+  getItemForAttachment = Sources.getItemForAttachment;
+  Sources.getItemForAttachment = () => {
+    getItemInvoked = true;
+    return false;
+  };
+
+  EventUtils.sendMouseEvent({ type: "click" }, locationNode);
+
+  let tab = yield onTabOpen;
+  ok(true, "the view source tab was opened in response to clicking " +
+           "the location node");
+  gBrowser.removeTab(tab);
+
+  ok(getItemInvoked, "custom getItemForAttachment() was invoked");
+  Sources.getItemForAttachment = getItemForAttachment;
+  Sources = getItemForAttachment = null;
 });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webconsole/test/head.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webconsole/test/head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webconsole/test/head.js	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webconsole/test/head.js	2015-05-25 20:42:59.000000000 +0000
@@ -256,6 +256,21 @@
 }
 
 /**
+ * Listen for a new tab to open and return a promise that resolves when one
+ * does and completes the load event.
+ * @return a promise that resolves to the tab object
+ */
+let waitForTab = Task.async(function*() {
+  info("Waiting for a tab to open");
+  yield once(gBrowser.tabContainer, "TabOpen");
+  let tab = gBrowser.selectedTab;
+  let browser = tab.linkedBrowser;
+  yield once(browser, "load", true);
+  info("The tab load completed");
+  return tab;
+});
+
+/**
  * Dump the output of all open Web Consoles - used only for debugging purposes.
  */
 function dumpConsoles()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webconsole/test/test-console-extras.html firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webconsole/test/test-console-extras.html
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webconsole/test/test-console-extras.html	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webconsole/test/test-console-extras.html	2015-05-25 20:42:59.000000000 +0000
@@ -5,8 +5,7 @@
     <script type="text/javascript">
       function test() {
         console.log("start");
-        console.clear()
-        console.timeStamp()
+        console.clear();
         console.log("end");
       }
     </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webconsole/webconsole.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webconsole/webconsole.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webconsole/webconsole.js	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webconsole/webconsole.js	2015-05-25 20:42:59.000000000 +0000
@@ -1334,6 +1334,11 @@
         break;
       }
 
+      case "timeStamp": {
+        // console.timeStamp() doesn't need to display anything.
+        return null;
+      }
+
       default:
         Cu.reportError("Unknown Console API log level: " + level);
         return null;
@@ -2869,7 +2874,7 @@
       }
     }
 
-    clipboardHelper.copyString(strings.join("\n"), this.document);
+    clipboardHelper.copyString(strings.join("\n"));
   },
 
   /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webide/content/newapp.js firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webide/content/newapp.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webide/content/newapp.js	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webide/content/newapp.js	2015-05-25 20:42:59.000000000 +0000
@@ -129,12 +129,14 @@
 
   // Create subfolder with fs-friendly name of project
   let subfolder = projectName.replace(/[\\/:*?"<>|]/g, '').toLowerCase();
+  let win = Services.wm.getMostRecentWindow("devtools:webide");
   folder.append(subfolder);
 
   try {
     folder.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
   } catch(e) {
-    console.error(e);
+    win.UI.reportError("error_folderCreationFailed");
+    window.close();
     return false;
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webide/themes/throbber.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webide/themes/throbber.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/devtools/webide/themes/throbber.svg	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/devtools/webide/themes/throbber.svg	2015-05-25 20:43:00.000000000 +0000
@@ -1,22 +1,18 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<svg  xmlns="http://www.w3.org/2000/svg"
-      width="24" height="24" viewBox="0 0 64 64">
-  <g>
-    <rect x="30" y="4" width="4" height="15" transform="rotate(0, 32, 32)" fill="#BBB"/>
-    <rect x="30" y="4" width="4" height="15" transform="rotate(30, 32, 32)" fill="#AAA"/>
-    <rect x="30" y="4" width="4" height="15" transform="rotate(60, 32, 32)" fill="#999"/>
-    <rect x="30" y="4" width="4" height="15" transform="rotate(90, 32, 32)" fill="#888"/>
-    <rect x="30" y="4" width="4" height="15" transform="rotate(120, 32, 32)" fill="#777"/>
-    <rect x="30" y="4" width="4" height="15" transform="rotate(150, 32, 32)" fill="#666"/>
-    <rect x="30" y="4" width="4" height="15" transform="rotate(180, 32, 32)" fill="#555"/>
-    <rect x="30" y="4" width="4" height="15" transform="rotate(210, 32, 32)" fill="#444"/>
-    <rect x="30" y="4" width="4" height="15" transform="rotate(240, 32, 32)" fill="#333"/>
-    <rect x="30" y="4" width="4" height="15" transform="rotate(270, 32, 32)" fill="#222"/>
-    <rect x="30" y="4" width="4" height="15" transform="rotate(300, 32, 32)" fill="#111"/>
-    <rect x="30" y="4" width="4" height="15" transform="rotate(330, 32, 32)" fill="#000"/>
-    <animateTransform attributeName="transform" type="rotate" calcMode="discrete" values="0 32 32;30 32 32;60 32 32;90 32 32;120 32 32;150 32 32;180 32 32;210 32 32;240 32 32;270 32 32;300 32 32;330 32 32" dur="0.8s" repeatCount="indefinite"/>
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 64 64">
+  <rect x="30" y="4" width="4" height="15" transform="rotate(0, 32, 32)" fill="#bbb"/>
+  <rect x="30" y="4" width="4" height="15" transform="rotate(30, 32, 32)" fill="#aaa"/>
+  <rect x="30" y="4" width="4" height="15" transform="rotate(60, 32, 32)" fill="#999"/>
+  <rect x="30" y="4" width="4" height="15" transform="rotate(90, 32, 32)" fill="#888"/>
+  <rect x="30" y="4" width="4" height="15" transform="rotate(120, 32, 32)" fill="#777"/>
+  <rect x="30" y="4" width="4" height="15" transform="rotate(150, 32, 32)" fill="#666"/>
+  <rect x="30" y="4" width="4" height="15" transform="rotate(180, 32, 32)" fill="#555"/>
+  <rect x="30" y="4" width="4" height="15" transform="rotate(210, 32, 32)" fill="#444"/>
+  <rect x="30" y="4" width="4" height="15" transform="rotate(240, 32, 32)" fill="#333"/>
+  <rect x="30" y="4" width="4" height="15" transform="rotate(270, 32, 32)" fill="#222"/>
+  <rect x="30" y="4" width="4" height="15" transform="rotate(300, 32, 32)" fill="#111"/>
+  <rect x="30" y="4" width="4" height="15" transform="rotate(330, 32, 32)" fill="#000"/>
+  <animateTransform attributeName="transform" type="rotate" calcMode="discrete" dur="0.8s" repeatCount="indefinite" values="0 32 32;30 32 32;60 32 32;90 32 32;120 32 32;150 32 32;180 32 32;210 32 32;240 32 32;270 32 32;300 32 32;330 32 32"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/docs/DirectoryLinksProvider.rst firefox-trunk-41.0~a1~hg20150524r245419/browser/docs/DirectoryLinksProvider.rst
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/docs/DirectoryLinksProvider.rst	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/docs/DirectoryLinksProvider.rst	2015-05-25 20:43:00.000000000 +0000
@@ -23,7 +23,7 @@
 
 For the directory source and ping endpoints, the default preference values point
 to Mozilla key-pinned servers with encryption. No cookies are set by the servers
-but not enforced by Firefox.
+and Firefox enforces this by making anonymous requests.
 
 - default directory source endpoint:
   https://tiles.services.mozilla.com/v3/links/fetch/%LOCALE%/%CHANNEL%
@@ -90,7 +90,9 @@
 
 As the new tab page is rendered, any images for tiles are downloaded if not
 already cached. The default servers hosting the images are Mozilla CDN that
-don't use cookies: https://tiles.cdn.mozilla.net/
+don't use cookies: https://tiles.cdn.mozilla.net/ and Firefox enforces that the
+images come from mozilla.net or data URIs when using the default directory
+source.
 
 
 Source JSON Format
@@ -130,8 +132,11 @@
       ],
       "suggested": [
           {
+              "adgroup_name": "open-source browser",
               "bgColor": "#cae1f4",
+              "check_inadjacency": true,
               "directoryId": 702,
+              "explanation": "Suggested for %1$S enthusiasts who visit sites like %2$S",
               "frecent_sites": [
                   "addons.mozilla.org",
                   "air.mozilla.org",
@@ -180,6 +185,13 @@
 
 A suggested link has additional values:
 
+- ``adgroup_name`` - string to override the hardcoded display name of the
+  triggering set of sites in Firefox.
+- ``check_inadjacency`` - boolean if true prevents the suggested link from being
+  shown if the new tab page is showing a site from an inadjacency list.
+- ``explanation`` - string to override the default explanation that appears
+  below a Suggested Tile. %1$S is replaced by the triggering adgroup name and
+  %2$S is replaced by the triggering site.
 - ``frecent_sites`` - array of strings of the sites that can trigger showing a
   Suggested Tile if the user has the site in one of the top 100 most-frecent
   pages. Only preapproved array of strings that are hardcoded into the
@@ -191,6 +203,10 @@
   when a Suggested Tile may start and has to stop showing in the newtab.
   The timestamp is expected in ISO_8601 format: '2014-01-10T20:00:00.000Z'
 
+The inadjacency list is packaged with Firefox as base64-encoded 1-way-hashed
+sites that tend to have adult, gambling, alcohol, drug, and similar content.
+Its location: chrome://browser/content/newtab/newTab.inadjacent.json
+
 The preapproved arrays follow a policy for determining what topic grouping is
 allowed as well as the composition of a grouping. The topics are broad
 uncontroversial categories, e.g., Mobile Phone, News, Technology, Video Game,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/extensions/pdfjs/content/PdfStreamConverter.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/extensions/pdfjs/content/PdfStreamConverter.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/extensions/pdfjs/content/PdfStreamConverter.jsm	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/extensions/pdfjs/content/PdfStreamConverter.jsm	2015-05-25 20:43:00.000000000 +0000
@@ -157,18 +157,15 @@
 }
 
 function createNewChannel(uri, node, principal) {
-  return NetUtil.newChannel2(uri,
-                             null,
-                             null,
-                             node, // aLoadingNode
-                             principal, // aLoadingPrincipal
-                             null, // aTriggeringPrincipal
-                             Ci.nsILoadInfo.SEC_NORMAL,
-                             Ci.nsIContentPolicy.TYPE_OTHER);
+  return NetUtil.newChannel({
+    uri: uri,
+    loadingNode: node,
+    loadingPrincipal: principal,
+    contentPolicyType: Ci.nsIContentPolicy.TYPE_OTHER});
 }
 
 function asyncFetchChannel(channel, callback) {
-  return NetUtil.asyncFetch2(channel, callback);
+  return NetUtil.asyncFetch(channel, callback);
 }
 
 // PDF data storage
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/installer/package-manifest.in firefox-trunk-41.0~a1~hg20150524r245419/browser/installer/package-manifest.in
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/installer/package-manifest.in	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/installer/package-manifest.in	2015-05-25 20:43:01.000000000 +0000
@@ -53,7 +53,6 @@
 @RESPATH@/dictionaries/*
 @RESPATH@/hyphenation/*
 @RESPATH@/browser/@PREF_DIR@/firefox-l10n.js
-@RESPATH@/browser/searchplugins/*
 #ifdef HAVE_MAKENSISU
 @BINPATH@/uninstall/helper.exe
 #endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/installer/windows/nsis/installer.nsi firefox-trunk-41.0~a1~hg20150524r245419/browser/installer/windows/nsis/installer.nsi
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/installer/windows/nsis/installer.nsi	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/installer/windows/nsis/installer.nsi	2015-05-25 20:43:01.000000000 +0000
@@ -201,6 +201,7 @@
   SetOutPath "$INSTDIR"
   ${StartInstallLog} "${BrandFullName}" "${AB_CD}" "${AppVersion}" "${GREVersion}"
 
+  StrCpy $R9 "true"
   StrCpy $PreventRebootRequired "false"
   ${GetParameters} $R8
   ${GetOptions} "$R8" "/INI=" $R7
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/installer/windows/nsis/shared.nsh firefox-trunk-41.0~a1~hg20150524r245419/browser/installer/windows/nsis/shared.nsh
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/installer/windows/nsis/shared.nsh	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/installer/windows/nsis/shared.nsh	2015-05-25 20:43:01.000000000 +0000
@@ -995,147 +995,21 @@
     RmDir /r /REBOOTOK "$INSTDIR\extensions\talkback@mozilla.org"
   ${EndIf}
 
-  ; Remove the Java Console extension (bug 597235)
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0015-0000-0012-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0015-0000-0012-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0015-0000-0013-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0015-0000-0013-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0015-0000-0014-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0015-0000-0014-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0015-0000-0015-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0015-0000-0015-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0015-0000-0016-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0015-0000-0016-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0015-0000-0017-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0015-0000-0017-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0015-0000-0018-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0015-0000-0018-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0015-0000-0019-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0015-0000-0019-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0015-0000-0020-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0015-0000-0020-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0015-0000-0021-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0015-0000-0021-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0015-0000-0022-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0015-0000-0022-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0000-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0000-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0001-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0001-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0002-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0002-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0003-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0003-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0004-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0004-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0005-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0005-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0006-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0006-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0007-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0007-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0010-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0010-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0011-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0011-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0012-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0012-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0013-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0013-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0014-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0014-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0015-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0015-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0016-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0016-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0017-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0017-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0018-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0018-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0019-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0019-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0020-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0020-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0021-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0021-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0022-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0022-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0023-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0023-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0024-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0024-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0025-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0025-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0026-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0026-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0027-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0027-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0028-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0028-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0029-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0029-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0030-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0030-ABCDEFFEDCBA}"
-  ${EndIf}
+  ; Remove the Java Console extension (bug 1165156)
   ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0031-ABCDEFFEDCBA}"
     RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0031-ABCDEFFEDCBA}"
   ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0032-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0032-ABCDEFFEDCBA}"
+  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0034-ABCDEFFEDCBA}"
+    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0034-ABCDEFFEDCBA}"
   ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0017-0000-0000-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0017-0000-0000-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0017-0000-0001-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0017-0000-0001-ABCDEFFEDCBA}"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0017-0000-0002-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0017-0000-0002-ABCDEFFEDCBA}"
+  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0039-ABCDEFFEDCBA}"
+    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0039-ABCDEFFEDCBA}"
   ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0017-0000-0003-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0017-0000-0003-ABCDEFFEDCBA}"
+  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0045-ABCDEFFEDCBA}"
+    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0045-ABCDEFFEDCBA}"
   ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0017-0000-0004-ABCDEFFEDCBA}"
-    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0017-0000-0004-ABCDEFFEDCBA}"
+  ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0017-0000-0000-ABCDEFFEDCBA}"
+    RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0017-0000-0000-ABCDEFFEDCBA}"
   ${EndIf}
 !macroend
 !define RemoveDeprecatedFiles "!insertmacro RemoveDeprecatedFiles"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/locales/en-US/chrome/browser/browser.properties firefox-trunk-41.0~a1~hg20150524r245419/browser/locales/en-US/chrome/browser/browser.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/locales/en-US/chrome/browser/browser.properties	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/locales/en-US/chrome/browser/browser.properties	2015-05-25 20:43:01.000000000 +0000
@@ -77,24 +77,25 @@
 addonInstallRestartButton=Restart Now
 addonInstallRestartButton.accesskey=R
 
-# LOCALIZATION NOTE (addonError-1, addonError-2, addonError-3, addonError-4, addonError-5):
-# #1 is the add-on name, #2 is the host name, #3 is the application name
-# #4 is the application version
-addonError-1=The add-on could not be downloaded because of a connection failure on #2.
-addonError-2=The add-on from #2 could not be installed because it does not match the add-on #3 expected.
-addonError-3=The add-on downloaded from #2 could not be installed because it appears to be corrupt.
-addonError-4=#1 could not be installed because #3 cannot modify the needed file.
-addonError-5=#3 has prevented this site from installing an unverified add-on.
-
-# LOCALIZATION NOTE (addonLocalError-1, addonLocalError-2, addonLocalError-3, addonLocalError-4, addonLocalError-5, addonErrorIncompatible, addonErrorBlocklisted):
-# #1 is the add-on name, #3 is the application name, #4 is the application version
-addonLocalError-1=This add-on could not be installed because of a filesystem error.
-addonLocalError-2=This add-on could not be installed because it does not match the add-on #3 expected.
-addonLocalError-3=This add-on could not be installed because it appears to be corrupt.
-addonLocalError-4=#1 could not be installed because #3 cannot modify the needed file.
-addonLocalError-5=This add-on could not be installed because it has not been verified.
-addonErrorIncompatible=#1 could not be installed because it is not compatible with #3 #4.
-addonErrorBlocklisted=#1 could not be installed because it has a high risk of causing stability or security problems.
+# LOCALIZATION NOTE (addonInstallError-1, addonInstallError-2, addonInstallError-3, addonInstallError-4, addonInstallError-5, addonLocalInstallError-1, addonLocalInstallError-2, addonLocalInstallError-3, addonLocalInstallError-4, addonLocalInstallError-5):
+# %1$S is the application name, %2$S is the add-on name
+addonInstallError-1=The add-on could not be downloaded because of a connection failure.
+addonInstallError-2=The add-on could not be installed because it does not match the add-on %1$S expected.
+addonInstallError-3=The add-on downloaded from this site could not be installed because it appears to be corrupt.
+addonInstallError-4=%2$S could not be installed because %1$S cannot modify the needed file.
+addonInstallError-5=%1$S has prevented this site from installing an unverified add-on.
+addonLocalInstallError-1=This add-on could not be installed because of a filesystem error.
+addonLocalInstallError-2=This add-on could not be installed because it does not match the add-on %1$S expected.
+addonLocalInstallError-3=This add-on could not be installed because it appears to be corrupt.
+addonLocalInstallError-4=%2$S could not be installed because %1$S cannot modify the needed file.
+addonLocalInstallError-5=This add-on could not be installed because it has not been verified.
+
+# LOCALIZATION NOTE (addonInstallErrorIncompatible):
+# %1$S is the application name, %2$S is the application version, %3$S is the add-on name
+addonInstallErrorIncompatible=%3$S could not be installed because it is not compatible with %1$S %2$S.
+
+# LOCALIZATION NOTE (addonInstallErrorBlocklisted): %S is add-on name
+addonInstallErrorBlocklisted=%S could not be installed because it has a high risk of causing stability or security problems.
 
 unsignedAddonsDisabled.message=One or more installed add-ons cannot be verified and have been disabled.
 unsignedAddonsDisabled.learnMore.label=Learn More
@@ -369,8 +370,8 @@
 geolocation.alwaysShareLocation.accesskey=A
 geolocation.neverShareLocation=Never Share Location
 geolocation.neverShareLocation.accesskey=N
-geolocation.shareWithSite=Would you like to share your location with %S?
-geolocation.shareWithFile=Would you like to share your location with the file %S?
+geolocation.shareWithSite2=Would you like to share your location with this site?
+geolocation.shareWithFile2=Would you like to share your location with this file?
 
 webNotifications.showForSession=Show for this session
 webNotifications.showForSession.accesskey=s
@@ -378,7 +379,7 @@
 webNotifications.alwaysShow.accesskey=A
 webNotifications.neverShow=Always Block Notifications
 webNotifications.neverShow.accesskey=N
-webNotifications.showFromSite=Would you like to show notifications from %S?
+webNotifications.showFromSite2=Would you like to show notifications from this site?
 
 # Push Notifications
 push.allowForSession=Allow for Session
@@ -387,7 +388,7 @@
 push.alwaysAllow.accesskey=A
 push.alwaysBlock=Always Block Push Notifications
 push.alwaysBlock.accesskey=B
-push.enablePush=Would you like to allow Push Notifications for %S?
+push.enablePush2=Would you like to allow Push Notifications for this site?
 
 # Pointer lock UI
 
@@ -397,8 +398,8 @@
 pointerLock.alwaysAllow.accesskey=A
 pointerLock.neverAllow=Never allow hiding
 pointerLock.neverAllow.accesskey=N
-pointerLock.title2=Would you like to allow the pointer to be hidden on %S?
-pointerLock.autoLock.title2=%S will hide the pointer.
+pointerLock.title3=Would you like to allow the pointer to be hidden on this site?
+pointerLock.autoLock.title3=This site will hide the pointer.
 
 # Phishing/Malware Notification Bar.
 # LOCALIZATION NOTE (notAForgery, notAnAttack)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/locales/en-US/chrome/browser/devtools/debugger.properties firefox-trunk-41.0~a1~hg20150524r245419/browser/locales/en-US/chrome/browser/devtools/debugger.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/locales/en-US/chrome/browser/devtools/debugger.properties	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/locales/en-US/chrome/browser/devtools/debugger.properties	2015-05-25 20:43:01.000000000 +0000
@@ -214,10 +214,6 @@
 # yet.
 loadingText=Loading\u2026
 
-# LOCALIZATION NOTE (errorLoadingText): The text that is displayed in the debugger
-# viewer when there is an error loading a file
-errorLoadingText=Error loading source:\n
-
 # LOCALIZATION NOTE (errorLoadingText2): The text that is displayed in the debugger
 # viewer when there is an error loading a file
 errorLoadingText2=Error loading this URL: %S
@@ -324,5 +320,4 @@
 variablesViewUninitialized=(uninitialized)
 variablesViewMissingArgs=(unavailable)
 
-evalGroupLabel=Evaluated Sources
 anonymousSourcesLabel=Anonymous Sources
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/locales/en-US/chrome/browser/devtools/font-inspector.dtd firefox-trunk-41.0~a1~hg20150524r245419/browser/locales/en-US/chrome/browser/devtools/font-inspector.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/locales/en-US/chrome/browser/devtools/font-inspector.dtd	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/locales/en-US/chrome/browser/devtools/font-inspector.dtd	2015-05-25 20:43:01.000000000 +0000
@@ -10,3 +10,7 @@
 <!ENTITY usedAs "Used as: ">
 <!ENTITY system "system">
 <!ENTITY remote "remote">
+
+<!-- LOCALIZATION NOTE (previewHint): This is the label shown as the
+     placeholder in font inspector preview text box. -->
+<!ENTITY previewHint "Preview Text">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/locales/en-US/chrome/browser/devtools/netmonitor.dtd firefox-trunk-41.0~a1~hg20150524r245419/browser/locales/en-US/chrome/browser/devtools/netmonitor.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/locales/en-US/chrome/browser/devtools/netmonitor.dtd	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/locales/en-US/chrome/browser/devtools/netmonitor.dtd	2015-05-25 20:43:01.000000000 +0000
@@ -264,6 +264,14 @@
   -  for the Copy URL Parameters menu item displayed in the context menu for a request -->
 <!ENTITY netmonitorUI.context.copyUrlParams.accesskey "P">
 
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyPostData): This is the label displayed
+  -  on the context menu that copies the selected request's post data -->
+<!ENTITY netmonitorUI.context.copyPostData     "Copy POST Data">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyPostData.accesskey): This is the access key
+  -  for the Copy POST Data menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.context.copyPostData.accesskey "D">
+
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyAsCurl): This is the label displayed
   -  on the context menu that copies the selected request as a cURL command.
   -  The capitalization is part of the official name and should be used throughout all languages.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd firefox-trunk-41.0~a1~hg20150524r245419/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd	2015-05-25 20:43:02.000000000 +0000
@@ -17,6 +17,11 @@
   -  the search box when no search term has been entered. -->
 <!ENTITY filterStylesPlaceholder      "Filter Styles">
 
+<!-- LOCALIZATION NOTE (addRuleButtonTooltip): This is the tooltip shown when
+  -  hovering the `Add new rule` button in the rules view toolbar. This should
+  -  match ruleView.contextmenu.addNewRule in styleinspector.properties -->
+<!ENTITY addRuleButtonTooltip  "Add new rule">
+
 <!-- LOCALIZATION NOTE (selectedElementLabel): This is the label for the path of
   -  the highlighted element in the web page. This path is based on the document
   -  tree. -->
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/locales/en-US/chrome/browser/devtools/webide.properties firefox-trunk-41.0~a1~hg20150524r245419/browser/locales/en-US/chrome/browser/devtools/webide.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/locales/en-US/chrome/browser/devtools/webide.properties	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/locales/en-US/chrome/browser/devtools/webide.properties	2015-05-25 20:43:02.000000000 +0000
@@ -46,6 +46,7 @@
 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.
+error_folderCreationFailed=Unable to create project folder in the selected directory.
 
 addons_stable=stable
 addons_unstable=unstable
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/locales/en-US/chrome/browser/loop/loop.properties firefox-trunk-41.0~a1~hg20150524r245419/browser/locales/en-US/chrome/browser/loop/loop.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/locales/en-US/chrome/browser/loop/loop.properties	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/locales/en-US/chrome/browser/loop/loop.properties	2015-05-25 20:43:02.000000000 +0000
@@ -339,7 +339,7 @@
 infobar_menuitem_dontshowagain_accesskey=D
 
 # Context in conversation strings
-context_offer_label=Let's talk about this page
+
 # LOCALIZATION NOTE (context_inroom_label): this string is followed by the
 # title/URL of the website you are having a conversation about, displayed on a
 # separate line. If this structure doesn't work for your locale, you might want
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/locales/en-US/chrome/browser/newTab.properties firefox-trunk-41.0~a1~hg20150524r245419/browser/locales/en-US/chrome/browser/newTab.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/locales/en-US/chrome/browser/newTab.properties	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/locales/en-US/chrome/browser/newTab.properties	2015-05-25 20:43:02.000000000 +0000
@@ -34,19 +34,14 @@
 # the gear icon used to customize the new tab window. %2$S will be replaced by
 # an active link using string newtab.learn.link as text.
 newtab.enhanced.explain=A Mozilla partner has visually enhanced this tile, replacing the screenshot. You can turn off enhanced tiles by clicking the %1$S button for your preferences. %2$S
-# LOCALIZATION NOTE(newtab.intro.paragraph1): %1$S will be replaced inline by
-# active link using string newtab.learn.link as text.
-newtab.intro.paragraph1=When you open a new tab, you’ll see tiles from the sites you frequently visit, along with tiles that we think might be of interest to you. Some of these tiles may be sponsored by Mozilla partners. We’ll always indicate to you which tiles are sponsored. %1$S
 # LOCALIZATION NOTE(newtab.intro.paragraph2): %1$S will be replaced inline by
 # active link using string newtab.privacy.link as text.
 newtab.intro.paragraph2=In order to provide this service, Mozilla collects and uses certain analytics information relating to your use of the tiles in accordance with our %1$S.
-# LOCALIZATION NOTE(newtab.intro.paragraph3): %1$S will be replaced inline by
-# the gear icon used to customize the new tab window.
-newtab.intro.paragraph3=You can turn off the tiles feature by clicking the %1$S button for your preferences.
-# LOCALIZATION NOTE(newtab.intro.paragraph4): %1$S will be replaced inline by
+# LOCALIZATION NOTE(newtab.intro.paragraph4.2): %1$S will be replaced inline by
 # the gear icon used to customize the new tab window. %2$S will be replaced by
-# newtab.intro.controls as text
-newtab.intro.paragraph4=You can turn off this feature by clicking the gear (%1$S) button and selecting "Show blank page" in the %2$S menu.
+# newtab.intro.controls as text. The quoted strings should be the same as
+# newtab.customize.cog.enhanced.
+newtab.intro.paragraph4.2=You can turn off this service by clicking the gear (%1$S) button and unchecking "Include suggested sites" in the %2$S menu.
 newtab.intro.paragraph5=New Tab will show the sites you visit most frequently, along with sites we think might be of interest to you. To get started, you'll see several sites from Mozilla.
 # LOCALIZATION NOTE(newtab.intro.paragraph6): %1$S will be replaced by
 # newtab.intro.paragraph6.remove as bold text. %2$S will be replaced by
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/locales/en-US/searchplugins/ddg.xml firefox-trunk-41.0~a1~hg20150524r245419/browser/locales/en-US/searchplugins/ddg.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/locales/en-US/searchplugins/ddg.xml	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/locales/en-US/searchplugins/ddg.xml	2015-05-25 20:43:02.000000000 +0000
@@ -6,7 +6,7 @@
   <Image height="16" width="16">data:image/icon;base64,AAABAAIAEBAAAAEAIABoBAAAJgAAACAgAAABACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAAAAEAAATCwAAEwsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA11RgALs6oACbQ9wAj0v8AI9L/ACfQ9wAu0agANdUYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzzN4CNdL/oK/z//////////////////////+jsPv/BDXX/wAz0t4AAAAAAAAAAAAAAAAAAAAAAAAAAAAyzvNSduD//////8jK/v+P+Lf/IbQL/17RPP+J3Y//wOKX//////9YeuX/ADLO8wAAAAAAAAAAAAAAAAAw091piOX/8/X9/1Fx5P9xhu//WOWZ/0W9Lv9Lwjn/J8BB/xyDAP9bdfL/9fP//2mI5v8AMNPdAAAAAAc610YRQ9f//////0Zr4P8AGdD/sb32////////////wrv//wAh1/8MPab/ACPc/05r4///////EkPX/wc610YANtWkrr/y/6S48P8AJ9L/AB3R/+/w/v///////////3+D7f8AQeL/AYTw/wFr5/8AMNb/p7Tv/6698v8AM9WkADLW//////8yXt//AC3V/wAw1/////////////z///8A0P7/AKb1/wWI7P8AuPf/AJ3w/zZW3P//////ADHV/wAx2P//////AzrZ/wAu1/84ZOL////////////e////AND//wC1+f8Atff/AZbv/wY62f8ELNf//////wAw1/8AMtn//////wAw2f8ALNn/kKrz////+//cwbH////////////R////Rcb8/wDO/f8A/P//AHzo//////8AMNj/ADXa//////8vXuL/ACna/4yq9///79T/jUkg/9i+r///////r2Q0/7Cozv8BKdr/AirY/zdZ4P//////ADTa/wI72tOuv/T/prr0/wAl2v+JqPb//7yW/+bUxv/9+/n////u//W+n/+Op/L/ADPd/wAv2v+ru/T/r7/0/wI72tMLQd1DEEjg//////9Cbef/ADng///////////////////////R3///AC3g/wAy3v9SeOn//////xFI4P8LQd1DAAAAAAM64PNmiuz/9/j//2mN7f/m7P3///////////9Cb+n/ACXd/wAt3v9rju3//////2iL7P8DOuDzAAAAAAAAAAAAAAAAAT3g/0p16f//////3OT8/3OS7v8AKt3/ACPc/zhn5/+xw/b//////0956v8CPeD/AAAAAAAAAAAAAAAAAAAAAAAAAAAEPODzBUDh/5uz8//7/f7/////////////////prz0/wtF4v8FQeDzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtF5kYDQOOkADrj/wA44v8AOeP/ADzk/wVB46QPReZGAAAAAAAAAAAAAAAAAAAAAPAPAADgBwAAwAMAAIABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAADAAwAA4AcAAPAPAAAoAAAAIAAAAEAAAAABACAAAAAAAAAQAAATCwAAEwsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChIzyAnRNFwJ0TQryND0d8nRNH/J0TR/ydE0f8nRNH/I0PR3ydE0K8nRNFwKEjPIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChE00AlRdK/J0XS/ydF0v8nRdL/XXPd/11z3f94i+P/k6Lp/5Oi6f9rf+D/NVDV/ydF0v8nRdL/JUXSvyhE00AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAzxAnRNOvJ0XT/ydF0/8lRdK/KEXSYOvu+6/+/v6//v7+v/39/c////////////7+/r/J0fOAKEXSYCVF0r8nRdP/J0XT/ydE068gQM8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAlRdUwJ0bT7ydG0/8nRtHPKETTQAAAAADHx8dA2vHhn5TYpN/o9+z/////////////////8PL83ydG0o8lRdUwAAAAAChE00AnRtHPJ0bT/ydG0+8lRdUwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKEXVYCdG1P8nRtT/KEbTgAAAAAAmRtZQI0PU38jIyP/F6s//Rrtk/0a7ZP9/yIr/c796/4vLkv+JpNf/M3Kq/zyWh/8zeKTfJkbWUAAAAAAoRtOAJ0bU/ydG1P8oRdVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVF1TAnR9X/J0fV/yhF1WAgQM8QJ0fTrydH1f9CW8//2tra/6Pdsv9Gu2T/Rrtk/0WzWv9Gu2T/Rrtk/0a7ZP9Gu2T/Rrtk/z6egP8nR9X/J0fTryBAzxAoRdVgJ0fV/ydH1f8lRdUwAAAAAAAAAAAAAAAAAAAAAAAAAAAgQM8QJ0fV7ydH1f8oSNVgIEDPECdH1c8nR9X/J0fV/1xwyf/t7e3/o92y/0a7ZP9Gu2T/Ra5U/0a7ZP9Gu2T/Rrtk/0a7ZP9Gu2T/Pp6A/ydH1f8nR9X/J0fVzyBAzxAoSNVgJ0fV/ydH1e8gQM8QAAAAAAAAAAAAAAAAAAAAACdH1q8nR9b/KEjVgCBQzxAnR9bPJ0fW/ydH1v8nR9b/gIzB//r6+v+j3bL/Rrtk/13Ed/+i26//ruG7/z6egf8+noH/Rrtk/0a7ZP86kI//J0fW/ydH1v8nR9b/J0fWzyBQzxAoSNWAJ0fW/ydH1q8AAAAAAAAAAAAAAAAoSNdAJkjW/yZH1s8AAAAAJEfWryZI1v8mSNb/JkjW/yZI1v+jqsT//////+j37P/R7tj////////////W3ff/JkjW/yZI1v8uZbr/PJeI/zJzrP8mSNb/JkjW/yZI1v8mSNb/JEfWrwAAAAAmR9bPJkjW/yhI10AAAAAAAAAAACVI1r8mSNf/KEjXQCZJ1lAmSNf/JkjX/yZI1/8mSNf/JkjX/9HR0f///////////////////////////5Ok6/8mSNf/JkjX/yZI1/8mSNf/JkjX/yZI1/8mSNf/JkjX/yZI1/8mSNf/JknWUChI10AmSNf/JUjWvwAAAAAoSNcgJknY/yZH2M8AAAAAI0nY3yZJ2P8mSdj/JknY/yZJ2P9KZM//39/f////////////////////////////XHfi/yZJ2P8mSdj/JknY/yZJ2P8mSdj/JknY/yZJ2P8mSdj/JknY/yZJ2P8jSdjfAAAAACZH2M8mSdj/KEjXICdJ2HAmSdj/JUjXYCVK2jAmSdj/JknY/yZJ2P8mSdj/JknY/2V4yf/t7e3///////////////////////////9cd+L/HXTj/xSf7/8Nwfj/CdL8/wnS/P8J0vz/ELDz/xt85v8mSdj/JknY/yZJ2P8lStowJUjXYCZJ2P8nSdhwJErZryZK2f8oSNcgJUnajyZK2f8mStn/JkrZ/yZK2f8mStn/iJPA////////////////////////////0ff+/xjV/P8J0vz/Drn1/xiO6/8Yjuv/GI7r/xCw8/8Lyvr/CdL8/xmF6P8mStn/JkrZ/yVJ2o8oSNcgJkrZ/yRK2a8jStrfI0rZ3wAAAAAlSdq/Jkra/yZK2v8mStr/Jkra/yZK2v+xtsf///////////////////////////8o2Pz/CdL8/wvK+v8mStr/Jkra/yZK2v8mStr/Jkra/yZK2v8iW97/Jkra/yZK2v8mStr/JUnavwAAAAAjStnfI0ra3yZK2v8lSdq/AAAAACZH2O8mStr/Jkra/yZK2v8mStr/L1HY/9HR0f///////////////////////////yjY/P8J0vz/CdL8/xCw9P8QsPT/ELD0/xSf7/8ddeX/Jkra/yZK2v8mStr/Jkra/yZK2v8mR9jvAAAAACVJ2r8mStr/Jkvb/yVJ2r8AAAAAJkvb/yZL2/8mS9v/Jkvb/yZL2/9KZtL/4+Pj////////////////////////////4Pn//0fd/f8J0vz/CdL8/wnS/P8J0vz/CdL8/wnS/P8Lyvr/Fpfu/yJc3/8mS9v/Jkvb/yZL2/8AAAAAJUnavyZL2/8mS9z/JUncvwAAAAAmS9z/Jkvc/yZL3P8mS9z/Jkvc/26AyP/x8fH//////////////////////////////////////9H3/v/C9P7/o+7+/2fa+/8Oufb/CdL8/wnS/P8J0vz/CdL8/xiP7P8mS9z/Jkvc/wAAAAAlSdy/Jkvc/yZM3P8lTNy/AAAAACZJ2e8mTNz/Jkzc/yZM3P8mTNz/iJTB////////////qnth/5VaOf/x6eX///////////////////////Hp5f/x6eX/ydL2/yZM3P8kVN7/G37o/xKo8v8QsfT/HXbm/yZM3P8mSdnvAAAAACVM3L8mTNz/I0vc3yZJ2u8AAAAAJUzevyZM3f8mTN3/Jkzd/yZM3f+fqc3///////////+VWjn/v5yI/+re1///////////////////////jk8s/7iRe//J0vb/Jkzd/yZM3f8mTN3/Jkzd/yZM3f8mTN3/Jkzd/yVM3r8AAAAAI0vc3yNL3N8kTd2vJk3d/yhQ3yAlTd2PJk3d/yZN3f8mTd3/Jk3d/6St0v////////////Hp5f/q3tf///////////////////////////+xhm7/49PK/6Cx8P8mTd3/Jk3d/yZN3f8mTd3/Jk3d/yZN3f8mTd3/JU3djyhQ3yAmTd3/JE3drydN33AmTd7/J03fcCVK3zAmTd7/Jk3e/yZN3v8mTd7/pK7S///////Sp5r/////////////////////////////////////////////////T27k/yZN3v8mTd7/Jk3e/yZN3v8mTd7/Jk3e/yZN3v8lSt8wJ03fcCZN3v8nTd9wKFDfICZO3/8mTt3PAAAAACVN3r8mTt//Jk7f/yZO3/+EltX//////+fRyv/SqaD/59LO///////////////////////at63/vIBy/7Glxf8mTt//Jk7f/yZO3/8mTt//Jk7f/yZO3/8mTt//JU3evwAAAAAmTt3PJk7f/yhQ3yAAAAAAJE/dryZO3/8oUN9AKFDfQCZO3/8mTt//Jk7f/zhb2v/o6/T/////////////////////////////////////////////////XHrn/yZO3/8mTt//Jk7f/yZO3/8mTt//Jk7f/yZO3/8oUN9AKFDfQCZO3/8kT92vAAAAAAAAAAAoUN9AJk7g/yZO4M8AAAAAJk/hnyZO4P8mTuD/Jk7g/05v5v/k6fv//////////////////////////////////////3eR7P8mTuD/Jk7g/yZO4P8mTuD/Jk7g/yZO4P8mTuD/Jk/hnwAAAAAmTuDPJk7g/yhQ30AAAAAAAAAAAAAAAAAjT+GfJU/h/yVO4Y8gUN8QIk7gzyVP4f8lT+H/SWnW/0lp1v+bq+H/8fHx/////////////////6Cy8v9OcOb/JU/h/yVP4f8lT+H/JU/h/yVP4f8lT+H/JU/h/yJO4M8gUN8QJU7hjyVP4f8jT+GfAAAAAAAAAAAAAAAAAAAAACBQ3xAlTOHvJU/h/yVQ4mAgUN8QIk7hzyVP4f+ktOv///////////////////////H0/f9phur/JU/h/yVP4f8lT+H/JU/h/yVP4f8lT+H/JU/h/yVP4f8iTuHPIFDfECVQ4mAlT+H/JUzh7yBQ3xAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ3zAlUOLvJVDi/yVQ4mAgUN8QI1Din4mb2//J0/j/ydP4/6299P93ku3/M1vk/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/I1DinyBQ3xAlUOJgJVDi/yVQ4u8lUN8wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ5DAlUOLvJVDi/yVQ4o8AAAAAJFDjQCVQ4r8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDivyRQ40AAAAAAJVDijyVQ4v8lUOLvJVDkMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ5DAjUeTfJVHj/yNR5N8kUONAAAAAACVQ5DAmUuOAJVHivyNR5N8lUeP/JVHj/yNR5N8lUeK/JlLjgCVQ5DAAAAAAJFDjQCNR5N8lUeP/I1Hk3yVQ5DAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBQ3xAjUuSfJVHk/yVR5P8jUeTfJFLkcChQ5yAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoUOcgJFLkcCNR5N8lUeT/JVHk/yNS5J8gUN8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkUONAI1LknyVS5P8lUuT/JVLk/yVS5O8lUeS/JVHkvyVR5L8lUeS/JVLk7yVS5P8lUuT/JVLk/yRS468kUONAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIFDfECVS5GAjUuWfIlPlzyVS5f8lUuX/JVLl/yVS5f8iU+XPI1LlnyVS5GAgUN8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/AA///AAD//AAAP/ggBB/wgAEP4AAAB8AAAAPAAAADiAAAEYAAAAEQAAAIAAAAAAAAAAAgAAAEIAAABCAAAAQgAAAEIAAABCAAAAQAAAAAAAAAABAAAAiAAAABiAAAEcAAAAPAAAAD4AAAB/CAAQ/4IAQf/AfgP/8AAP//wAP/</Image>
   <Image height="26" width="65">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEEAAAAaCAYAAADovjFxAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoxNTg5QTM3RjNCMjA2ODExODIyQUVEOUNBRDIxQzhDMyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxRTYyNzYzMzFBQUUxMUU0ODc3NTg3NjMyNDFCNzExQSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxRTYyNzYzMjFBQUUxMUU0ODc3NTg3NjMyNDFCNzExQSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChNYWNpbnRvc2gpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDE4MDExNzQwNzIwNjgxMTg3MUZCQUIxMEI4RjU1NzYiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MTU4OUEzN0YzQjIwNjgxMTgyMkFFRDlDQUQyMUM4QzMiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7hxyCFAAAF4UlEQVR42tSZa2wUVRTH/3dmp92+tnRpCiUgxFoKCDQplsRIfZSgCEHSapBGBCURQvCLWkkQg9GYGNDwTYlGUCMoCA2EtEpEq1KjRJCA9EEElba2FajbN213d+b6vzOzZZfi99mb/DJ3d/aczD33vO6skFLCq6O9YubYXChE4n1+LublaVJO5hLDvRUhjaSefMolno+XU0uOX7WG5BxLSBsXc448Qo6SFWSuywr3O3XvnPqtK3PbkWxGUL5whHzN7WyAZeWQRZBWFz+v4v6+w3sKztFFFpEc0mDLOLJinNIkCocMXppJLhdcCssMw4zu5fOX2XGi6RAa91Rot8aNMsB6kkJOk24yh6seSjZPEHzoZmlfZaaU1pqR/Dsv+XfVlQXf/QbZ67dBz5sKKzxK20TpGBbU5qrtJWXkEllDMqWrK94jPG0ESzpwPTUkl8yQFvZL09oaLlqIG1LDQFoA6Y9vxJQ9Dch+bjus4WEaIwxpmjSGdJKgw1ay39bh6KqJ6U8GTyjnc1aQheQ1UqV2Of3LPTBPfI40RkVsEdmVGzClphmZy9bAitAQlhnvEbBlHR1KV4VbVbydE66sLFI+e8mN5e1Qc7o6IqMIr3sVhVUb/le2e1c1Bk8cgvAxFWjj9rqQvA7HGIVeN4LqA1SJm0iOci/LQDc3aZrg4RZkpBgYHY4iK8OXIHetz4RPi6K/ao4b9PrtkuVKElL9hafDgfuzjrQQk5QxH9hxPphfgAy/gYHByDgDqJGXrSOYlYrAo1WQUTc32LJj+aHM1dlEnvK2EYClpIasiotrmL5URE2JiQEDuw+ewunGjgS5hrNtWLp5P/QHKhk9lh1BDuKmIYAnyWGyxNuJUWI2+ZncG5/djKF+DA45ZX7Hh9/j2HdNCWKzC/JRsXg+sgrmQ4aFjS/LQvqsYejpqiTYepTOn8g8n8c9QQ21zdPiDxD+620IhULIC2TiYl01/CmJy8jNNrCxMh/hjiMIVvYioziK1BlRQJcIHc1B6KscqpLTXN2pPo/nhNjwxR2jIFgdBtouAzPuSDSAZLPUXgX0HYFgLjRIcLnO3sFAb33AJnLdYFNp9w/6Lco97Qm57o7dbKC5wpHffgHuL09srjo22AYY/tOPoQsBiFRgtJ3zljQqo/HoCfbSnULR6eq2vJ4TWskCcnYsJ9hGYIz/1YQR65bTYOARe5FW2EDfqQD+rQ1iqDkN/qlhTHhwAJnFQ6oxiuUWpfMe0uzpPuH3ZUV7eZlFVpPWsRjh+WA4OAV579UiPzghQaajuhgZc1qRWTIKnQ4g0i27N77RlI5rXwQR/seI9cnTyWfkvNfDYR8v35K/iSoBd8eSY8r1doR6escZYfRqLvrPDEDsM+ALWNADJiLdBttoYXuJEPamK13t5D6y1evNUj3pJzvIJqfRYV5XyZGFf/CPlnEy6UXzoLEZYDqEHBCIdBpsmFSsODEgHb1K105Xd4PnD1B86M2kmjSSA/Yi6AlSaBhtPG3/5mTXcTT3nLPnwYcq4KP7X52cgvc3TcWvpQFVDu1UIoWt74CrS+nc7P3qIO00rkLiBfcQdReZCamVqAqRcuUiolzJDx11aO4+gxxjOnqtbmhvzITO+6Yh0DthhF4jYmeHs4Q1FJfd+T6ZLC9VpHOcnk7qyQJSqzzB39WKnr5h+HhS1DUfOvs64RNRVgATlnDawoghYoWl1pWtd3WVJ0WfEDf6pGqhnTdCTGqihCw3urt2h0LdecH0ydB1Aw8XLkfPjRGUTixB4JUtuDDXj0nXokMmsJbyddJJiOoYPZuO0ZdsRlDjsnTa5x/JCDTxEnPfpIH6Y28uXvHYttUFzyNb1cTY+4TyC8ezD37wltT1k5YmXmRkjbhhMI2BcTVpXrS2LJ011jmO/VfgPO7L/GKnfSQ0zU+EaR2SlnWGN53FaRpdw1cKTX+Cxlrr5oMt5G2713Kq7NhLxmQ1gpPvpXyWs2f4oSz+oHHznxrRwOvHnHwkYpK3McJ/AgwADmrfhvtTyFYAAAAASUVORK5CYII=</Image>
   <Image height="52" width="130">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIIAAAA0CAYAAABGkOCVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoxNTg5QTM3RjNCMjA2ODExODIyQUVEOUNBRDIxQzhDMyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo4RTdBNDY4ODFBQUQxMUU0ODc3NTg3NjMyNDFCNzExQSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo4RTdBNDY4NzFBQUQxMUU0ODc3NTg3NjMyNDFCNzExQSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChNYWNpbnRvc2gpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6OTE3MzgzQ0I2QjIwNjgxMTgyMkFFRDlDQUQyMUM4QzMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MTU4OUEzN0YzQjIwNjgxMTgyMkFFRDlDQUQyMUM4QzMiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7NVVBAAAAO30lEQVR42uxdCXRU1Rn+3nszk5nJhmEJAYKyJJJAWFyqUqwWwaJi0aKA9bh0USwunEo9UGmrHG0Vj3LUUoEqFQGXciqgiFCoVtsKeBAJS9JWtrAmIUxmkpnJJDNv6X/fu5O8mUwmkwkoPef9Od/cN/ct9593v/vf//73vhdB0zRY0nU5dktxuzxBMG3zD6GD84XYHYMI1xMuJZQQ2MWzCS6+P0TwE74i/Juwi7CFcCR6gY6qUeMf5t2JjhUsInxjRBhJyUOEewn2NNWIEFYQFlM17rWI8P9FhJsILxGGdHDpOsJ+wmlCA8/LJfQhjCD07uC8Q4TZhI3pEMFmVenXJqMJ7xIGx+UfJawivEf4IsVrXUaYQriLcCHPY8T6gHCYMJVQ3hXlLIvw9ViE1wg/iTt8JeFpuvsHYs4BehLKCAWEHnyXj1BN2EfwmGuMzimi5FeEu+Ouv5zwU6trOD+IUEif/zS1WiZvEWZSzQT4gQ5WYbwVj0+x+I+5dXmNrhPm18miz6WEO+OszdV0zHGLCN8cEZj53mnaXUO4ke72blYTArRS+r6QMLnVFggmu5C6sO5gLl23kp/NuqBNhL6mYy7XTN1OoioXrSo9JzKJ7vVOjTtrhLWEAoMEag5UZaMmyxVqJDKZAFUmKDJBpd0EqinTuZ1hMqGCV34ObZfzstaajmGEnGT5CF+vRbg0zul7krCAN8Ufa6K0vLnkCmSXXQ5nuBmavx6qtw4t+3dC9p6GIJH/LkkQRMm4oNBlC8F8kT/x7Sd4+WYnc5c1ajj3UhBHgofppi/mdbmGmHA75DDC9afh63cxSr4zMeZk+Uw1Au+/jsCGN6C2NEGw2clmk9EWumS4l/PWP43KXkBle2j793wf060fdzwti3CuLAIfy0eHhwtMrZE5jONAZl+lSrUvXI/+w0qTXF1D/Su/QeP65RDsDrISkkGGrlmHf+mOYptVeoJvH04Uw7CIkKYcjSMCVdESSh7gX1lM4JYYEuj1qyKU1w/eUdcC3jPQMnNh65UP9+Dh6FFUin79+8e4ioG/vYszCx80uguyDkLUOqROCDMZ1vPYA5OlVOs/s4hw9onAmncF32YRwXy+/TZhRsy4TVWoD4gAkTA0RYHjuh/Adc0tyBhcAme/iyDGVXLk5GE0bfsr/NRlsK7DIITUFTK8Q7iDb9fCiFAyGQ4+0rCIcPaIUMHJwORb0ISddGfv4kGj2AE8jQ4QaUFkwh3o9/OFcNtSd9M8L8+D/8PVeneBrpHhbtJpFelkHtJWcjJYw8duiSZEMYFQyrfX8BudQ9srTceQJaBclYgQURCc/hiGPPZCl0jApOcjzyJz3GRodA39WubrJ8dKXSfmLDIdjbxSrrt+jGUR0pSqKRdHN9msXxnfvgBGOHiDESgyE4eYIMvwFw5D8bJNyOiOozrjEiiNXmNUkbpVYIGnm2GErb08j4WsR1oWoftSbCLBW5wERe1IYOoW5HseT4sEClmAWk8zzgQ19H7kd5RBfoaqInYWIalM5rr5uK7guhdbROhOz6DpmMVThqd5usiUZ4AqUVNUBHsVIm9oiX5+U4uCpavLsWTVbmz6+FCn5R2vDuhRR7+vCdLYSbAVFpHfqeiGpl15HSOq21OmPP03WF1DmnLk+3rXECS4eYCGBWokFhdKxBqBRgqnR30Xg+e/jF7ZWXjng68wdkwBBvbPTqt8/+a3UbdoLgQHdxxTF+aYkJOBk1xn9huyLIuQvhRyEjB5jaf3dRQgYmi5oC8k0bjl024qSpsETLIn3UHugabPS6BrjTmq43KeZjJCWERIt2sAbjBN6mzSjDn/25JNEKk2B+RIxBiumZw8D5n7lKJDX1bhqjtfwUtvbde/u0aPNSapgK7gNq7rJlPe9RYR0mfCVaa7u53nXZesBgRNQSgUirnM4y9uxogpi/DE4q3kN0SSFrlszQ4cPeXFF/tOwNcCOMuuNBxGVTOxLQFi9biO67rdlHe5RYT0ZQRP63jap+NDBR32gA/+QDBmz5sby2G3iThe68O2L48mLXDGDaPhsElgk9Q9aOiRMbi0HQk0VSDHlCBzqEIbGdqkd5zupRYR0u8ahvH7X8HTkUlNMnUFTs8peLz1Mde5+doShGVVb+VXjipMWuZN1wxD1dZ5WP3MNCPDmWUYBBZfokpXIoJelnt0ED1vrUfeFC/cw5uIK0K8PqN4up+nxdY0dPqSxdNTPO2X3CAQEWqP4nhDY8yuxfOnYM49V2NA3x66ZehSbMHfAi0iwd5XRmZJE1zDQ3BfHIJg582fzU/ZNNQsy0dwj8u8+KmApyd5mmsRoRtxBC7RJec5yboGtjjNUX8aQpMfTeEI3I62RxkGDchLrVD5DJl9sihyNYRwBSTtVQx64RRsubrJIZ2MmmZdgyBqeur7KAeBclfb4IVXPE+jrMy0iNB9CfO0k4dUBDZU0K2C1+uDO793aldXybSfmgOt/nWqyBazywFHL2Mlk6aIrfmMAEqTiMbPcuH9KBtqQNIjB2yoaRJ7nO7WCqWzID2jMZ7OeMC6B3dtFbw+H/qnQAQtuA3q4QlEhpCxUkm00SWiC12FVnLprZ9FKytdaNyejWC522j9ktE1RIljjkfF6R62iJC+syjzhtQjzgPvmAmCCFcNWYQGX+cFRKqhHvi2UYGiHYIkEh9ERBpt1BUokHIUqC0iQv/JgH93JoJ73VACkk4K3TcQDAJoieekorpGdQ9YREifCWzJF5uwGcZzKjpjDqsZZ3UVTsQ5jAkPD+3h/DGWqWmyiCO/LtTNfusSRr2la8Z3xjNJayssebAxqmsJT49Yw8f0ZR9Ph/L0YHKDYKxIdjTUQQg2ItjSkvzw7Al6VwBB1U9Vmw2LIHBz3wqJE4JVvMIcRUKExxJYDCExIQ7G6V5pESH9rqHcNC4fzPMqk4aY2ehBZN1Dle4wJmeCDeKgNYaJFxXYesgYMKcGrqJmvuJN0GMHKlU6iBDOoc3oMaERBffXYcjCEyhaUgV7fjiRHpVc18GmvL1W15A+EzbT51P8G5t3+AOMBaKlnfkKTt1PaMCAvvmdWIVbUbtxKpwFW5B9WRiZpSEdbFpb9lHVUYsX3Sokl9o6nNV9SOoiGj/LRrjWET9aYLKe59xgyttqESF9i2B+fmE6DCK8Sni8U4eRRg6eem9K5QT/G0T9h70hrpaQNaoZWWVNcBc3w5EvG6Fj3qoZAeSAiACNGLyf5KD5uIMZlUTyqknnqOyxiNA9YUvS2PIvtmScRW2qYDzdXJRsCOk8dRgn/P6UChAzaMRgU/WxIKtk/263bgmkbBkZ/WXYsmSoYQGR03a0kAWIOo+6/9B+2HiA6+hC2zL3DXo5Vl12S5aYtmdz8zw3uUUQYPd7IQYa4G8KdVqAY8CFdJaqDwtZ5Yp2Sh0qOY8SQgdp6FhOQ8dKN8Ieux5a1vdLbSOJOJnLdZwd/xssIqTbNRjrQdg6hObo8i+ev45woqPlYvoEkMAdRl/n8QTn0BFQ2VI30ySj4QtorYCoz3HraHUA25fNdFrHdYwuVWvmv8EiwlmQ+Txl3eyjWvv+N8EwUtS7B6+vodOLZ44Za0wv8poz6p1aPpFD4hBTW6A0nR/2KNoiyvNbuyCrHtN2FqNYxKKMfPsF3v9uo+1VyaakXdWH4fF27jA6i8tgc+eyZcwspABBocqn0o4OdOKP9w/A+1P6UL4Wr1M82Kt5tjHdmI48T+a668dYRDg7Yl6ruJbPArJX2RxP5CYYRKhCYyDQmv3+oZX44ear8NwXj2JX7T9iTuk5/lbYI0QAIoFiF7B2al+svKc/avpm4MBQt24dhI7XLTId7uY6re1AZ2vSKX2TEOOJreAmlz0nwB5Jn0k3fhkdMYa2T7CGHTt0oBbY1AS7tw4NgSbkZrnpcmTiaWSw37ML+zw70dPZB9cXTseO2h04ekkl1CuK4WzW4AxrCGRJsMlGxbNtmU1IaUg0sdBMGKMZpc6k/ZNMUdEVMaMTq0bPWlcx0WSK2buMLtOMF1+VEVpiuwaCaMw71PPuQSC/QRSogkU7HGIGGsM+vLhjCU4E9xA9FDhY2MAmoMkt6pbBsAKGjxhyiom6gxZetofrstS0b2K7YapVhWdN2JPGU03f2TOQF9FdP6inxhNGsYEl8hPq+cjBJbn5HoEIQZVNpBA0I5XYs4m84hPNHdjldpm+uLLN73KaynW1iHAOZS3d/CdNzZLNUJZR911D23mEv7eNAUVknGwbOWTY3K0ntf7RiSp7uQb/kwUFClt4IpF1IIuish5BbGcKWBl5epmsq9JwyLTvyTg/wSLCOZQFdM+Xta5gNx6SncKH8+MJP6IGrqj6GsZjCAQNh7GXKx+qpkIhyKqMiBpGVoYbh2tCOF4XQq1Xw3TvtXjouUMY94kXeZ4wIuQ4OshnsBPoeop+baMMjZe5l0cZWMYyRN/llEAsZzFNUZOP3R/g5jkaZVzPI3iz6LQVZOhXkFPwjBCJzHOcqYbPH0J+1kDI9McmlAbmFGFG8QMY1etK1ARrdZ8hz2WsITn05gaM++g0vkNk8OfY0ewSmWV4lnb9UmsLJrJ5j1kmfdhr/OZFX76JBD2M9exjmlLxvWGpOJCzeKVExasHmzRsNcKMMjzjb19aMO2+mcVFQ7Du2EqUXDAGw7LLOrxmw5b1OPbb2RBtjs8FUWTkekN/a6Mxr8CcwD/DeDw/Kg/Srlc609UiwrklAvtgD8J8SjAvVd5LRHiE8Gn0NTqZKz692aGq853ZOSMycnIzJWcGbHx5e0RWEGluQaTB63H7z7ztfe/Nh71b1vE3ruk24BrCy+DvOuBSr+cL2J/KGxQsIpx7IkTlecKc2AO0esJiqMrrUJQq5hgyS2HUidY+EiUK+pPPomRjaxgH0cjjXhiv+o9fD88inL9oHaBYRDiviMA22aNMiwi3xRGCgU0oUJehB3vY01M0xNP4ZITAnkPIp8Y/nLZHkhWYqAce2stfWGBLMEc0LSKcl0SISj5vsewVd5ndVCXIHdHno/EBIc6QWEQ4f4nQaghIriDcCOMfelyaYvHsX/mwf9DxIeHz+NcopUOE/wkwAAeR3z4C+zelAAAAAElFTkSuQmCC</Image>
-  <Url type="text/html" method="get" template="https://duckduckgo.com/">
+  <Url type="text/html" method="get" template="https://duckduckgo.com/" rel="searchform">
     <Param name="q" value="{searchTerms}"/>
     <MozParam name="t" condition="purpose" purpose="contextmenu" value="ffcm"/>
     <MozParam name="t" condition="purpose" purpose="keyword"     value="ffab"/>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/locales/jar.mn firefox-trunk-41.0~a1~hg20150524r245419/browser/locales/jar.mn
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/locales/jar.mn	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/locales/jar.mn	2015-05-25 20:43:02.000000000 +0000
@@ -148,6 +148,8 @@
     locale/browser/syncQuota.dtd                (%chrome/browser/syncQuota.dtd)
     locale/browser/syncQuota.properties         (%chrome/browser/syncQuota.properties)
 #endif
+    locale/browser/searchplugins/list.txt       (.deps/generated_@AB_CD@/list.txt)
+    locale/browser/searchplugins/               (.deps/generated_@AB_CD@/*.xml)
 % locale browser-region @AB_CD@ %locale/browser-region/
     locale/browser-region/region.properties        (%chrome/browser-region/region.properties)
 # the following files are browser-specific overrides
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/locales/Makefile.in firefox-trunk-41.0~a1~hg20150524r245419/browser/locales/Makefile.in
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/locales/Makefile.in	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/locales/Makefile.in	2015-05-25 20:43:01.000000000 +0000
@@ -5,9 +5,6 @@
 
 include $(topsrcdir)/config/config.mk
 
-vpath %.xml @srcdir@/en-US/searchplugins
-vpath %.xml $(LOCALE_SRCDIR)/searchplugins
-
 ifdef LOCALE_MERGEDIR
 vpath crashreporter%.ini $(LOCALE_MERGEDIR)/browser/crashreporter
 endif
@@ -72,7 +69,7 @@
 endif
 
 SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) ddg
-SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins
+SEARCHPLUGINS_PATH := .deps/generated_$(AB_CD)
 SEARCHPLUGINS_TARGET := libs searchplugins
 SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_NAMES)),$(or $(wildcard $(call EN_US_OR_L10N_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin))))
 # Some locale-specific search plugins may have preprocessor directives, but the
@@ -80,6 +77,11 @@
 SEARCHPLUGINS_FLAGS := --silence-missing-directive-warnings
 PP_TARGETS += SEARCHPLUGINS
 
+list-txt = $(SEARCHPLUGINS_PATH)/list.txt
+GARBAGE += $(list-txt)
+
+libs:: searchplugins
+
 # Required for l10n.mk - defines a list of app sub dirs that should
 # be included in langpack xpis.
 DIST_SUBDIRS = $(DIST_SUBDIR)
@@ -88,6 +90,11 @@
 
 include $(topsrcdir)/toolkit/locales/l10n.mk
 
+$(list-txt): $(call mkdir_deps,$(SEARCHPLUGINS_PATH)) $(if $(IS_LANGUAGE_REPACK),FORCE)
+	$(RM) $(list-txt)
+	$(foreach plugin,$(SEARCHPLUGINS_NAMES),printf '$(plugin)\n' >> $(list-txt);)
+searchplugins:: $(list-txt)
+
 $(STAGEDIST): $(DIST)/branding
 
 $(DIST)/branding:
@@ -126,6 +133,7 @@
 endif
 	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$*
+	@$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
 
@@ -158,8 +166,7 @@
 	  $(STAGEDIST)/webapprt/chrome/$(AB_CD).jar \
 	  $(STAGEDIST)/webapprt/chrome/$(AB_CD).manifest \
 	  $(STAGEDIST)/$(PREF_DIR)/firefox-l10n.js
-	$(RM) -rf  $(STAGEDIST)/searchplugins \
-	  $(STAGEDIST)/dictionaries \
+	$(RM) -rf  $(STAGEDIST)/dictionaries \
 	  $(STAGEDIST)/hyphenation \
 	  $(STAGEDIST)/defaults/profile \
 	  $(STAGEDIST)/chrome/$(AB_CD) \
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/modules/AboutHome.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/modules/AboutHome.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/modules/AboutHome.jsm	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/modules/AboutHome.jsm	2015-05-25 20:43:02.000000000 +0000
@@ -201,10 +201,25 @@
 
           // Trigger a search through nsISearchEngine.getSubmission()
           let submission = engine.getSubmission(data.searchTerms, null, "homepage");
-          let where = data.useNewTab ? "tabshifted" : "current";
-          window.openUILinkIn(submission.uri.spec, where, false,
-                              submission.postData);
+          let where = window.whereToOpenLink(data.originalEvent);
 
+          // There is a chance that by the time we receive the search message, the
+          // user has switched away from the tab that triggered the search. If,
+          // based on the event, we need to load the search in the same tab that
+          // triggered it (i.e. where == "current"), openUILinkIn will not work
+          // because that tab is no longer the current one. For this case we
+          // manually load the URI in the target browser.
+          if (where == "current") {
+            aMessage.target.loadURIWithFlags(submission.uri.spec,
+                                             Ci.nsIWebNavigation.LOAD_FLAGS_NONE,
+                                             null, null, submission.postData);
+          } else {
+            let params = {
+              postData: submission.postData,
+              inBackground: Services.prefs.getBoolPref("browser.tabs.loadInBackground"),
+            };
+            window.openLinkIn(submission.uri.spec, where, params);
+          }
           // Used for testing
           let mm = aMessage.target.messageManager;
           mm.sendAsyncMessage("AboutHome:SearchTriggered", aMessage.data.searchData);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/modules/ContentSearch.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/modules/ContentSearch.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/modules/ContentSearch.jsm	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/modules/ContentSearch.jsm	2015-05-25 20:43:02.000000000 +0000
@@ -210,15 +210,9 @@
     let engine = Services.search.getEngineByName(data.engineName);
     let submission = engine.getSubmission(data.searchString, "", data.whence);
     let browser = msg.target;
-    let newTab;
-    if (data.useNewTab) {
-      newTab = browser.getTabBrowser().addTab();
-      browser = newTab.linkedBrowser;
-    }
+    let win;
     try {
-      browser.loadURIWithFlags(submission.uri.spec,
-                               Ci.nsIWebNavigation.LOAD_FLAGS_NONE, null, null,
-                               submission.postData);
+      win = browser.ownerDocument.defaultView;
     }
     catch (err) {
       // The browser may have been closed between the time its content sent the
@@ -226,7 +220,25 @@
       // method on it will throw.
       return Promise.resolve();
     }
-    let win = browser.ownerDocument.defaultView;
+
+    let where = win.whereToOpenLink(data.originalEvent);
+
+    // There is a chance that by the time we receive the search message, the user
+    // has switched away from the tab that triggered the search. If, based on the
+    // event, we need to load the search in the same tab that triggered it (i.e.
+    // where == "current"), openUILinkIn will not work because that tab is no
+    // longer the current one. For this case we manually load the URI.
+    if (where == "current") {
+      browser.loadURIWithFlags(submission.uri.spec,
+                               Ci.nsIWebNavigation.LOAD_FLAGS_NONE, null, null,
+                               submission.postData);
+    } else {
+      let params = {
+        postData: submission.postData,
+        inBackground: Services.prefs.getBoolPref("browser.tabs.loadInBackground"),
+      };
+      win.openUILinkIn(submission.uri.spec, where, params);
+    }
     win.BrowserSearch.recordSearchInHealthReport(engine, data.whence,
                                                  data.selection || null);
     return Promise.resolve();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/modules/DirectoryLinksProvider.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/modules/DirectoryLinksProvider.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/modules/DirectoryLinksProvider.jsm	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/modules/DirectoryLinksProvider.jsm	2015-05-25 20:43:02.000000000 +0000
@@ -9,8 +9,9 @@
 const Ci = Components.interfaces;
 const Cc = Components.classes;
 const Cu = Components.utils;
-const XMLHttpRequest =
-  Components.Constructor("@mozilla.org/xmlextras/xmlhttprequest;1", "nsIXMLHttpRequest");
+const ParserUtils =  Cc["@mozilla.org/parserutils;1"].getService(Ci.nsIParserUtils);
+
+Cu.importGlobalProperties(["XMLHttpRequest"]);
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
@@ -27,9 +28,22 @@
   "resource://gre/modules/Promise.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "UpdateChannel",
   "resource://gre/modules/UpdateChannel.jsm");
+XPCOMUtils.defineLazyServiceGetter(this, "eTLD",
+  "@mozilla.org/network/effective-tld-service;1",
+  "nsIEffectiveTLDService");
 XPCOMUtils.defineLazyGetter(this, "gTextDecoder", () => {
   return new TextDecoder();
 });
+XPCOMUtils.defineLazyGetter(this, "gCryptoHash", function () {
+  return Cc["@mozilla.org/security/hash;1"].createInstance(Ci.nsICryptoHash);
+});
+XPCOMUtils.defineLazyGetter(this, "gUnicodeConverter", function () {
+  let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
+                    .createInstance(Ci.nsIScriptableUnicodeConverter);
+  converter.charset = 'utf8';
+  return converter;
+});
+
 
 // The filename where directory links are stored locally
 const DIRECTORY_LINKS_FILE = "directoryLinks.json";
@@ -84,6 +98,9 @@
 // Only allow link image urls that are https or data
 const ALLOWED_IMAGE_SCHEMES = new Set(["https", "data"]);
 
+// Only allow urls to Mozilla's CDN or empty (for data URIs)
+const ALLOWED_URL_BASE = new Set(["mozilla.net", ""]);
+
 // The frecency of a directory link
 const DIRECTORY_FRECENCY = 1000;
 
@@ -104,12 +121,18 @@
 // The min number of visible (not blocked) history tiles to have before showing suggested tiles
 const MIN_VISIBLE_HISTORY_TILES = 8;
 
+// The max number of visible (not blocked) history tiles to test for inadjacency
+const MAX_VISIBLE_HISTORY_TILES = 15;
+
 // Divide frecency by this amount for pings
 const PING_SCORE_DIVISOR = 10000;
 
 // Allowed ping actions remotely stored as columns: case-insensitive [a-z0-9_]
 const PING_ACTIONS = ["block", "click", "pin", "sponsored", "sponsored_link", "unpin", "view"];
 
+// Location of inadjacent sites json
+const INADJACENCY_SOURCE = "chrome://browser/content/newtab/newTab.inadjacent.json";
+
 /**
  * Singleton that serves as the provider of directory links.
  * Directory links are a hard-coded set of links shown if a user's link
@@ -147,6 +170,23 @@
    */
   _topSitesWithSuggestedLinks: new Set(),
 
+  /**
+   * lookup Set of inadjacent domains
+   */
+  _inadjacentSites: new Set(),
+
+  /**
+   * This flag is set if there is a suggested tile configured to avoid
+   * inadjacent sites in new tab
+   */
+  _avoidInadjacentSites: false,
+
+  /**
+   * This flag is set if _avoidInadjacentSites is true and there is
+   * an inadjacent site in the new tab
+   */
+  _newTabHasInadjacentSite: false,
+
   get _observedPrefs() Object.freeze({
     enhanced: PREF_NEWTAB_ENHANCED,
     linksURL: PREF_DIRECTORY_SOURCE,
@@ -158,6 +198,7 @@
     if (!this.__linksURL) {
       try {
         this.__linksURL = Services.prefs.getCharPref(this._observedPrefs["linksURL"]);
+        this.__linksURLModified = Services.prefs.prefHasUserValue(this._observedPrefs["linksURL"]);
       }
       catch (e) {
         Cu.reportError("Error fetching directory links url from prefs: " + e);
@@ -251,10 +292,11 @@
   },
 
   _cacheSuggestedLinks: function(link) {
-    if (!link.frecent_sites || "sponsored" == link.type) {
-      // Don't cache links that don't have the expected 'frecent_sites' or are sponsored.
+    // Don't cache links that don't have the expected 'frecent_sites'
+    if (!link.frecent_sites) {
       return;
     }
+
     for (let suggestedSite of link.frecent_sites) {
       let suggestedMap = this._suggestedLinks.get(suggestedSite) || new Map();
       suggestedMap.set(link.url, link);
@@ -268,22 +310,26 @@
     uri = uri.replace("%LOCALE%", this.locale);
     uri = uri.replace("%CHANNEL%", UpdateChannel.get());
 
+    return this._downloadJsonData(uri).then(json => {
+      return OS.File.writeAtomic(this._directoryFilePath, json, {tmpPath: this._directoryFilePath + ".tmp"});
+    });
+  },
+
+  /**
+   * Downloads a links with json content
+   * @param download uri
+   * @return promise resolved to json string, "{}" returned if status != 200
+   */
+  _downloadJsonData: function DirectoryLinksProvider__downloadJsonData(uri) {
     let deferred = Promise.defer();
-    let xmlHttp = new XMLHttpRequest();
+    let xmlHttp = this._newXHR();
 
-    let self = this;
     xmlHttp.onload = function(aResponse) {
       let json = this.responseText;
       if (this.status && this.status != 200) {
         json = "{}";
       }
-      OS.File.writeAtomic(self._directoryFilePath, json, {tmpPath: self._directoryFilePath + ".tmp"})
-        .then(() => {
-          deferred.resolve();
-        },
-        () => {
-          deferred.reject("Error writing uri data in profD.");
-        });
+      deferred.resolve(json);
     };
 
     xmlHttp.onerror = function(e) {
@@ -347,6 +393,13 @@
   },
 
   /**
+   * Create a new XMLHttpRequest that is anonymous, i.e., doesn't send cookies
+   */
+  _newXHR() {
+    return new XMLHttpRequest({mozAnon: true});
+  },
+
+  /**
    * Reads directory links file and parses its content
    * @return a promise resolved to an object with keys 'directory' and 'suggested',
    *         each containing a valid list of links,
@@ -537,7 +590,7 @@
     }
 
     // Package the data to be sent with the ping
-    let ping = new XMLHttpRequest();
+    let ping = this._newXHR();
     ping.open("POST", pingEndPoint + (action == "view" ? "view" : "click"));
     ping.send(JSON.stringify(data));
 
@@ -567,21 +620,30 @@
   },
 
   /**
-   * Check if a url's scheme is in a Set of allowed schemes
+   * Check if a url's scheme is in a Set of allowed schemes and if the base
+   * domain is allowed.
+   * @param url to check
+   * @param allowed Set of allowed schemes
+   * @param checkBase boolean to check the base domain
    */
-  isURLAllowed: function DirectoryLinksProvider_isURLAllowed(url, allowed) {
+  isURLAllowed(url, allowed, checkBase) {
     // Assume no url is an allowed url
     if (!url) {
       return true;
     }
 
-    let scheme = "";
+    let scheme = "", base = "";
     try {
       // A malformed url will not be allowed
-      scheme = Services.io.newURI(url, null, null).scheme;
+      let uri = Services.io.newURI(url, null, null);
+      scheme = uri.scheme;
+
+      // URIs without base domains will be allowed
+      base = Services.eTLD.getBaseDomain(uri);
     }
     catch(ex) {}
-    return allowed.has(scheme);
+    // Require a scheme match and the base only if desired
+    return allowed.has(scheme) && (!checkBase || ALLOWED_URL_BASE.has(base));
   },
 
   /**
@@ -594,12 +656,15 @@
       this._enhancedLinks.clear();
       this._suggestedLinks.clear();
       this._clearCampaignTimeout();
+      this._avoidInadjacentSites = false;
 
+      // Only check base domain for images when using the default pref
+      let checkBase = !this.__linksURLModified;
       let validityFilter = function(link) {
         // Make sure the link url is allowed and images too if they exist
-        return this.isURLAllowed(link.url, ALLOWED_LINK_SCHEMES) &&
-               this.isURLAllowed(link.imageURI, ALLOWED_IMAGE_SCHEMES) &&
-               this.isURLAllowed(link.enhancedImageURI, ALLOWED_IMAGE_SCHEMES);
+        return this.isURLAllowed(link.url, ALLOWED_LINK_SCHEMES, false) &&
+               this.isURLAllowed(link.imageURI, ALLOWED_IMAGE_SCHEMES, checkBase) &&
+               this.isURLAllowed(link.enhancedImageURI, ALLOWED_IMAGE_SCHEMES, checkBase);
       }.bind(this);
 
       rawLinks.suggested.filter(validityFilter).forEach((link, position) => {
@@ -609,8 +674,17 @@
           return;
         }
 
-        link.targetedName = name;
+        let sanitizeFlags = ParserUtils.SanitizerCidEmbedsOnly |
+          ParserUtils.SanitizerDropForms |
+          ParserUtils.SanitizerDropNonCSSPresentation;
+
+        link.explanation = link.explanation ? ParserUtils.convertToPlainText(link.explanation, sanitizeFlags, 0) : "";
+        link.targetedName = ParserUtils.convertToPlainText(link.adgroup_name, sanitizeFlags, 0) || name;
         link.lastVisitDate = rawLinks.suggested.length - position;
+        // check if link wants to avoid inadjacent sites
+        if (link.check_inadjacency) {
+          this._avoidInadjacentSites = true;
+        }
 
         // We cache suggested tiles here but do not push any of them in the links list yet.
         // The decision for which suggested tile to include will be made separately.
@@ -660,6 +734,8 @@
 
     // setup frequency cap file path
     this._frequencyCapFilePath = OS.Path.join(OS.Constants.Path.localProfileDir, FREQUENCY_CAP_FILE);
+    // setup inadjacent sites URL
+    this._inadjacentSitesUrl = INADJACENCY_SOURCE;
 
     NewTabUtils.placesProvider.addObserver(this);
     NewTabUtils.links.addObserver(this);
@@ -675,6 +751,8 @@
       yield this._readFrequencyCapFile();
       // fetch directory on startup without force
       yield this._fetchAndCacheLinksIfNecessary();
+      // fecth inadjacent sites on startup
+      yield this._loadInadjacentSites();
     }.bind(this));
   },
 
@@ -707,6 +785,13 @@
       this._topSitesWithSuggestedLinks.add(changedLinkSite);
       return true;
     }
+
+    // always run _updateSuggestedTile if aLink is inadjacent
+    // and there are tiles configured to avoid it
+    if (this._avoidInadjacentSites && this._isInadjacentLink(aLink)) {
+      return true;
+    }
+
     return false;
   },
 
@@ -750,11 +835,17 @@
 
   _getCurrentTopSiteCount: function() {
     let visibleTopSiteCount = 0;
-    for (let link of NewTabUtils.links.getLinks().slice(0, MIN_VISIBLE_HISTORY_TILES)) {
+    let newTabLinks = NewTabUtils.links.getLinks();
+    for (let link of newTabLinks.slice(0, MIN_VISIBLE_HISTORY_TILES)) {
+      // compute visibleTopSiteCount for suggested tiles
       if (link && (link.type == "history" || link.type == "enhanced")) {
         visibleTopSiteCount++;
       }
     }
+    // since newTabLinks are available, set _newTabHasInadjacentSite here
+    // note that _shouldUpdateSuggestedTile is called by _updateSuggestedTile
+    this._newTabHasInadjacentSite = this._avoidInadjacentSites && this._checkForInadjacentSites(newTabLinks);
+
     return visibleTopSiteCount;
   },
 
@@ -843,6 +934,11 @@
           return;
         }
 
+        // Skip link if it avoids inadjacent sites and newtab has one
+        if (suggestedLink.check_inadjacency && this._newTabHasInadjacentSite) {
+          return;
+        }
+
         possibleLinks.set(url, suggestedLink);
 
         // Keep a map of URL to targeted sites. We later use this to show the user
@@ -885,6 +981,66 @@
    },
 
   /**
+   * Loads inadjacent sites
+   * @return a promise resolved when lookup Set for sites is built
+   */
+  _loadInadjacentSites: function DirectoryLinksProvider_loadInadjacentSites() {
+    return this._downloadJsonData(this._inadjacentSitesUrl).then(jsonString => {
+      let jsonObject = {};
+      try {
+        jsonObject = JSON.parse(jsonString);
+      }
+      catch (e) {
+        Cu.reportError(e);
+      }
+
+      this._inadjacentSites = new Set(jsonObject.domains);
+    });
+  },
+
+  /**
+   * Genegrates hash suitable for looking up inadjacent site
+   * @param value to hsh
+   * @return hased value, base64-ed
+   */
+  _generateHash: function DirectoryLinksProvider_generateHash(value) {
+    let byteArr = gUnicodeConverter.convertToByteArray(value);
+    gCryptoHash.init(gCryptoHash.MD5);
+    gCryptoHash.update(byteArr, byteArr.length);
+    return gCryptoHash.finish(true);
+  },
+
+  /**
+   * Checks if link belongs to inadjacent domain
+   * @param link to check
+   * @return true for inadjacent domains, false otherwise
+   */
+  _isInadjacentLink: function DirectoryLinksProvider_isInadjacentLink(link) {
+    let baseDomain = link.baseDomain || NewTabUtils.extractSite(link.url || "");
+    if (!baseDomain) {
+        return false;
+    }
+    // check if hashed domain is inadjacent
+    return this._inadjacentSites.has(this._generateHash(baseDomain));
+  },
+
+  /**
+   * Checks if new tab has inadjacent site
+   * @param new tab links (or nothing, in which case NewTabUtils.links.getLinks() is called
+   * @return true if new tab shows has inadjacent site
+   */
+  _checkForInadjacentSites: function DirectoryLinksProvider_checkForInadjacentSites(newTabLink) {
+    let links = newTabLink || NewTabUtils.links.getLinks();
+    for (let link of links.slice(0, MAX_VISIBLE_HISTORY_TILES)) {
+      // check links against inadjacent list - specifically include ALL link types
+      if (this._isInadjacentLink(link)) {
+        return true;
+      }
+    }
+    return false;
+  },
+
+  /**
    * Reads json file, parses its content, and returns resulting object
    * @param json file path
    * @param json object to return in case file read or parse fails
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/modules/PanelFrame.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/modules/PanelFrame.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/modules/PanelFrame.jsm	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/modules/PanelFrame.jsm	2015-05-25 20:43:02.000000000 +0000
@@ -77,6 +77,10 @@
         "origin": aOrigin,
         "src": aSrc
       };
+      if (aType == "social") {
+        attrs["message"] = "true";
+        attrs["messagemanagergroup"] = aType;
+      }
       for (let [k, v] of Iterator(attrs)) {
         frame.setAttribute(k, v);
       }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/modules/Social.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/modules/Social.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/modules/Social.jsm	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/modules/Social.jsm	2015-05-25 20:43:02.000000000 +0000
@@ -240,12 +240,6 @@
         }).then(null, Cu.reportError);
       }
     }).then(null, Cu.reportError);
-  },
-
-  setErrorListener: function(iframe, errorHandler) {
-    if (iframe.socialErrorListener)
-      return iframe.socialErrorListener;
-    return new SocialErrorListener(iframe, errorHandler);
   }
 };
 
@@ -322,84 +316,6 @@
   });
 };
 
-// Error handling class used to listen for network errors in the social frames
-// and replace them with a social-specific error page
-function SocialErrorListener(iframe, errorHandler) {
-  this.setErrorMessage = errorHandler;
-  this.iframe = iframe;
-  iframe.socialErrorListener = this;
-  // Force a layout flush by calling .clientTop so that the docShell of this
-  // frame is created for the error listener
-  iframe.clientTop;
-  iframe.docShell.QueryInterface(Ci.nsIInterfaceRequestor)
-                                   .getInterface(Ci.nsIWebProgress)
-                                   .addProgressListener(this,
-                                                        Ci.nsIWebProgress.NOTIFY_STATE_REQUEST |
-                                                        Ci.nsIWebProgress.NOTIFY_LOCATION);
-}
-
-SocialErrorListener.prototype = {
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
-                                         Ci.nsISupportsWeakReference,
-                                         Ci.nsISupports]),
-
-  remove: function() {
-    this.iframe.docShell.QueryInterface(Ci.nsIInterfaceRequestor)
-                                     .getInterface(Ci.nsIWebProgress)
-                                     .removeProgressListener(this);
-    delete this.iframe.socialErrorListener;
-  },
-
-  onStateChange: function SPL_onStateChange(aWebProgress, aRequest, aState, aStatus) {
-    let failure = false;
-    if ((aState & Ci.nsIWebProgressListener.STATE_STOP)) {
-      if (aRequest instanceof Ci.nsIHttpChannel) {
-        try {
-          // Change the frame to an error page on 4xx (client errors)
-          // and 5xx (server errors).  responseStatus throws if it is not set.
-          failure = aRequest.responseStatus >= 400 &&
-                    aRequest.responseStatus < 600;
-        } catch (e) {
-          failure = aStatus == Components.results.NS_ERROR_CONNECTION_REFUSED;
-        }
-      }
-    }
-
-    // Calling cancel() will raise some OnStateChange notifications by itself,
-    // so avoid doing that more than once
-    if (failure && aStatus != Components.results.NS_BINDING_ABORTED) {
-      aRequest.cancel(Components.results.NS_BINDING_ABORTED);
-      let origin = this.iframe.getAttribute("origin");
-      if (origin) {
-        let provider = Social._getProviderFromOrigin(origin);
-        provider.errorState = "content-error";
-      }
-      this.setErrorMessage(aWebProgress.QueryInterface(Ci.nsIDocShell)
-                              .chromeEventHandler);
-    }
-  },
-
-  onLocationChange: function SPL_onLocationChange(aWebProgress, aRequest, aLocation, aFlags) {
-    if (aFlags & Ci.nsIWebProgressListener.LOCATION_CHANGE_ERROR_PAGE) {
-      aRequest.cancel(Components.results.NS_BINDING_ABORTED);
-      let origin = this.iframe.getAttribute("origin");
-      if (origin) {
-        let provider = Social._getProviderFromOrigin(origin);
-        if (!provider.errorState)
-          provider.errorState = "content-error";
-      }
-      schedule(function() {
-        this.setErrorMessage(aWebProgress.QueryInterface(Ci.nsIDocShell)
-                              .chromeEventHandler);
-      }.bind(this));
-    }
-  },
-
-  onProgressChange: function SPL_onProgressChange() {},
-  onStatusChange: function SPL_onStatusChange() {},
-  onSecurityChange: function SPL_onSecurityChange() {},
-};
-
 
 function sizeSocialPanelToContent(panel, iframe, requestedSize) {
   let doc = iframe.contentDocument;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/modules/test/xpcshell/test_DirectoryLinksProvider.js firefox-trunk-41.0~a1~hg20150524r245419/browser/modules/test/xpcshell/test_DirectoryLinksProvider.js
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/modules/test/xpcshell/test_DirectoryLinksProvider.js	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/modules/test/xpcshell/test_DirectoryLinksProvider.js	2015-05-25 20:43:02.000000000 +0000
@@ -104,6 +104,16 @@
     "sponsoredtarget.com"
   ]
 }
+let suggestedTile5 = {
+  url: "http://eviltile.com",
+  type: "affiliate",
+  lastVisitDate: 5,
+  explanation: "This is an evil tile <form><button formaction='javascript:alert(1)''>X</button></form> muhahaha",
+  adgroup_name: "WE ARE EVIL <link rel='import' href='test.svg'/>",
+  frecent_sites: [
+    "eviltarget.com"
+  ]
+}
 let someOtherSite = {url: "http://someothersite.com", title: "Not_A_Suggested_Site"};
 
 function getHttpHandler(path) {
@@ -199,6 +209,7 @@
     yield promiseDirectoryDownloadOnPrefChange(kLocalePref, "en-US");
     yield promiseDirectoryDownloadOnPrefChange(kSourceUrlPref, kTestURL);
     yield DirectoryLinksProvider._clearFrequencyCap();
+    yield DirectoryLinksProvider._loadInadjacentSites();
     DirectoryLinksProvider._lastDownloadMS  = 0;
     DirectoryLinksProvider.reset();
   });
@@ -409,6 +420,9 @@
 });
 
 add_task(function test_suggestedLinksMap() {
+  let origGetFrecentSitesName = DirectoryLinksProvider.getFrecentSitesName;
+  DirectoryLinksProvider.getFrecentSitesName = () => "testing map";
+
   let data = {"suggested": [suggestedTile1, suggestedTile2, suggestedTile3, suggestedTile4], "directory": [someOtherSite]};
   let dataURI = 'data:application/json,' + JSON.stringify(data);
 
@@ -427,17 +441,25 @@
     "1040.com": [suggestedTile1, suggestedTile3],
     "taxslayer.com": [suggestedTile1, suggestedTile2, suggestedTile3],
     "freetaxusa.com": [suggestedTile2, suggestedTile3],
+    "sponsoredtarget.com": [suggestedTile4],
   };
-  do_check_eq([...DirectoryLinksProvider._suggestedLinks.keys()].indexOf("sponsoredtarget.com"), -1);
+
+  let suggestedSites = [...DirectoryLinksProvider._suggestedLinks.keys()];
+  do_check_eq(suggestedSites.indexOf("sponsoredtarget.com"), 5);
+  do_check_eq(suggestedSites.length, Object.keys(expected_data).length);
 
   DirectoryLinksProvider._suggestedLinks.forEach((suggestedLinks, site) => {
     let suggestedLinksItr = suggestedLinks.values();
     for (let link of expected_data[site]) {
-      isIdentical(suggestedLinksItr.next().value, link);
+      let linkCopy = JSON.parse(JSON.stringify(link));
+      linkCopy.targetedName = "testing map";
+      linkCopy.explanation = "";
+      isIdentical(suggestedLinksItr.next().value, linkCopy);
     }
   })
 
   yield promiseCleanDirectoryLinksProvider();
+  DirectoryLinksProvider.getFrecentSitesName = origGetFrecentSitesName;
 });
 
 add_task(function test_topSitesWithSuggestedLinks() {
@@ -1097,6 +1119,30 @@
   do_check_eq(links[1].imageURI, data["directory"][5].imageURI);
 });
 
+add_task(function test_DirectoryLinksProvider_getAllowedImages_base() {
+  let data = {"directory": [
+    {url: "http://example1.com", imageURI: "https://example.com"},
+    {url: "http://example2.com", imageURI: "https://tiles.cdn.mozilla.net"},
+    {url: "http://example3.com", imageURI: "https://tiles2.cdn.mozilla.net"},
+    {url: "http://example4.com", enhancedImageURI: "https://mozilla.net"},
+    {url: "http://example5.com", imageURI: "data:text/plain,hi"},
+  ]};
+  let dataURI = 'data:application/json,' + JSON.stringify(data);
+  yield promiseSetupDirectoryLinksProvider({linksURL: dataURI});
+
+  // Pretend we're using the default pref to trigger base matching
+  DirectoryLinksProvider.__linksURLModified = false;
+
+  let links = yield fetchData();
+  do_check_eq(links.length, 4);
+
+  // The only remaining images should be https with mozilla.net or data URI
+  do_check_eq(links[0].url, data["directory"][1].url);
+  do_check_eq(links[1].url, data["directory"][2].url);
+  do_check_eq(links[2].url, data["directory"][3].url);
+  do_check_eq(links[3].url, data["directory"][4].url);
+});
+
 add_task(function test_DirectoryLinksProvider_getAllowedEnhancedImages() {
   let data = {"directory": [
     {url: "http://example.com", enhancedImageURI: "ftp://example.com"},
@@ -1674,3 +1720,207 @@
 
   yield promiseCleanDirectoryLinksProvider();
 });
+
+add_task(function test_DirectoryLinksProvider_anonymous() {
+  do_check_true(DirectoryLinksProvider._newXHR().mozAnon);
+});
+
+add_task(function test_sanitizeExplanation() {
+  // Note: this is a basic test to ensure we applied sanitization to the link explanation.
+  // Full testing for appropriate sanitization is done in parser/xml/test/unit/test_sanitizer.js.
+
+  let origGetFrecentSitesName = DirectoryLinksProvider.getFrecentSitesName;
+  DirectoryLinksProvider.getFrecentSitesName = () => "testing map";
+
+  let data = {"suggested": [suggestedTile5]};
+  let dataURI = 'data:application/json,' + encodeURIComponent(JSON.stringify(data));
+
+  yield promiseSetupDirectoryLinksProvider({linksURL: dataURI});
+  let links = yield fetchData();
+
+  let suggestedSites = [...DirectoryLinksProvider._suggestedLinks.keys()];
+  do_check_eq(suggestedSites.indexOf("eviltarget.com"), 0);
+  do_check_eq(suggestedSites.length, 1);
+
+  let suggestedLink = [...DirectoryLinksProvider._suggestedLinks.get(suggestedSites[0]).values()][0];
+  do_check_eq(suggestedLink.explanation, "This is an evil tile X muhahaha");
+  do_check_eq(suggestedLink.targetedName, "WE ARE EVIL ");
+});
+
+add_task(function test_inadjecentSites() {
+  let suggestedTile = Object.assign({
+    check_inadjacency: true
+  }, suggestedTile1);
+
+  // Initial setup
+  let topSites = ["1040.com", "site2.com", "hrblock.com", "site4.com", "freetaxusa.com", "site6.com"];
+  let data = {"suggested": [suggestedTile], "directory": [someOtherSite]};
+  let dataURI = 'data:application/json,' + JSON.stringify(data);
+
+  let testObserver = new TestFirstRun();
+  DirectoryLinksProvider.addObserver(testObserver);
+
+  let origGetFrecentSitesName = DirectoryLinksProvider.getFrecentSitesName;
+  DirectoryLinksProvider.getFrecentSitesName = () => "";
+
+  yield promiseSetupDirectoryLinksProvider({linksURL: dataURI});
+  let links = yield fetchData();
+
+  let origIsTopPlacesSite = NewTabUtils.isTopPlacesSite;
+  NewTabUtils.isTopPlacesSite = function(site) {
+    return topSites.indexOf(site) >= 0;
+  }
+
+  let origGetProviderLinks = NewTabUtils.getProviderLinks;
+  NewTabUtils.getProviderLinks = function(provider) {
+    return links;
+  }
+
+  let origCurrentTopSiteCount = DirectoryLinksProvider._getCurrentTopSiteCount;
+  DirectoryLinksProvider._getCurrentTopSiteCount = () => {
+    origCurrentTopSiteCount.apply(DirectoryLinksProvider);
+    return 8;
+  };
+
+  // store oroginal inadjacent sites url
+  let origInadjacentSitesUrl = DirectoryLinksProvider._inadjacentSitesUrl;
+
+  // loading inadjacent sites list function
+  function setInadjacentSites(sites) {
+    let badSiteB64 = [];
+    sites.forEach(site => {
+      badSiteB64.push(DirectoryLinksProvider._generateHash(site));
+    });
+    let theList = {"domains": badSiteB64};
+    let dataURI = 'data:application/json,' + JSON.stringify(theList);
+    DirectoryLinksProvider._inadjacentSitesUrl = dataURI;
+    return DirectoryLinksProvider._loadInadjacentSites();
+  };
+
+  // setup gLinks loader
+  let gLinks = NewTabUtils.links;
+  gLinks.addProvider(DirectoryLinksProvider);
+
+  function updateNewTabCache() {
+    gLinks.populateCache();
+    return new Promise(resolve => {
+      NewTabUtils.allPages.register({
+        observe: _ => _,
+        update() {
+          NewTabUtils.allPages.unregister(this);
+          resolve();
+        }
+      });
+  });
+  }
+
+  // no suggested file
+  do_check_eq(DirectoryLinksProvider._updateSuggestedTile(), undefined);
+  // _avoidInadjacentSites should be set, since link.check_inadjacency is on
+  do_check_true(DirectoryLinksProvider._avoidInadjacentSites);
+  // make sure example.com is included in inadjacent sites list
+  do_check_true(DirectoryLinksProvider._isInadjacentLink({baseDomain: "example.com"}));
+
+  function TestFirstRun() {
+    this.promise = new Promise(resolve => {
+      this.onLinkChanged = (directoryLinksProvider, link) => {
+        do_check_eq(link.url, suggestedTile.url);
+        do_check_eq(link.type, "affiliate");
+        resolve();
+      };
+    });
+  }
+
+  // Test first call to '_updateSuggestedTile()', called when fetching directory links.
+  yield testObserver.promise;
+  DirectoryLinksProvider.removeObserver(testObserver);
+
+  // update newtab cache
+  yield updateNewTabCache();
+  // this should have set
+  do_check_true(DirectoryLinksProvider._avoidInadjacentSites);
+
+  // there should be siggested link
+  let link = DirectoryLinksProvider._updateSuggestedTile();
+  do_check_eq(link.url, "http://turbotax.com");
+  // and it should have avoidInadjacentSites flag
+  do_check_true(link.check_inadjacency);
+
+  // make someothersite.com inadjacent
+  yield setInadjacentSites(["someothersite.com"]);
+
+  // there should be no suggested link
+  link = DirectoryLinksProvider._updateSuggestedTile();
+  do_check_false(link);
+  do_check_true(DirectoryLinksProvider._newTabHasInadjacentSite);
+
+  // _handleLinkChanged must return true on inadjacent site
+  do_check_true(DirectoryLinksProvider._handleLinkChanged({
+    url: "http://someothersite.com",
+    type: "history",
+  }));
+  // _handleLinkChanged must return false on ok site
+  do_check_false(DirectoryLinksProvider._handleLinkChanged({
+    url: "http://foobar.com",
+    type: "history",
+  }));
+
+  // change inadjacent list to sites not on newtab page
+  yield setInadjacentSites(["foo.com", "bar.com"]);
+
+  link = DirectoryLinksProvider._updateSuggestedTile();
+  // we should now have a link
+  do_check_true(link);
+  do_check_eq(link.url, "http://turbotax.com");
+
+  // make newtab offending again
+  yield setInadjacentSites(["someothersite.com", "foo.com"]);
+  // there should be no suggested link
+  link = DirectoryLinksProvider._updateSuggestedTile();
+  do_check_false(link);
+  do_check_true(DirectoryLinksProvider._newTabHasInadjacentSite);
+
+  // remove avoidInadjacentSites flag from suggested tile and reload json
+  delete suggestedTile.check_inadjacency;
+  data = {"suggested": [suggestedTile], "directory": [someOtherSite]};
+  dataURI = 'data:application/json,' + JSON.stringify(data);
+  yield promiseDirectoryDownloadOnPrefChange(kSourceUrlPref, dataURI);
+  yield fetchData();
+
+  // inadjacent checking should be disabled
+  do_check_false(DirectoryLinksProvider._avoidInadjacentSites);
+  link = DirectoryLinksProvider._updateSuggestedTile();
+  do_check_true(link);
+  do_check_eq(link.url, "http://turbotax.com");
+  do_check_false(DirectoryLinksProvider._newTabHasInadjacentSite);
+
+  // _handleLinkChanged should return false now, even if newtab has bad site
+  do_check_false(DirectoryLinksProvider._handleLinkChanged({
+    url: "http://someothersite.com",
+    type: "history",
+  }));
+
+  // test _isInadjacentLink
+  do_check_true(DirectoryLinksProvider._isInadjacentLink({baseDomain: "someothersite.com"}));
+  do_check_false(DirectoryLinksProvider._isInadjacentLink({baseDomain: "bar.com"}));
+  do_check_true(DirectoryLinksProvider._isInadjacentLink({url: "http://www.someothersite.com"}));
+  do_check_false(DirectoryLinksProvider._isInadjacentLink({url: "http://www.bar.com"}));
+  // try to crash _isInadjacentLink
+  do_check_false(DirectoryLinksProvider._isInadjacentLink({baseDomain: ""}));
+  do_check_false(DirectoryLinksProvider._isInadjacentLink({url: ""}));
+  do_check_false(DirectoryLinksProvider._isInadjacentLink({url: "http://localhost:8081/"}));
+  do_check_false(DirectoryLinksProvider._isInadjacentLink({url: "abracodabra"}));
+  do_check_false(DirectoryLinksProvider._isInadjacentLink({}));
+
+  // test _checkForInadjacentSites
+  do_check_true(DirectoryLinksProvider._checkForInadjacentSites());
+
+  // Cleanup
+  gLinks.removeProvider(DirectoryLinksProvider);
+  DirectoryLinksProvider._inadjacentSitesUrl = origInadjacentSitesUrl;
+  DirectoryLinksProvider.getFrecentSitesName = origGetFrecentSitesName;
+  NewTabUtils.isTopPlacesSite = origIsTopPlacesSite;
+  NewTabUtils.getProviderLinks = origGetProviderLinks;
+  DirectoryLinksProvider._getCurrentTopSiteCount = origCurrentTopSiteCount;
+  yield promiseCleanDirectoryLinksProvider();
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/modules/WindowsPreviewPerTab.jsm firefox-trunk-41.0~a1~hg20150524r245419/browser/modules/WindowsPreviewPerTab.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/modules/WindowsPreviewPerTab.jsm	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/modules/WindowsPreviewPerTab.jsm	2015-05-25 20:43:02.000000000 +0000
@@ -86,7 +86,7 @@
   } catch (e) {
     // Ignore channels which do not support nsIPrivateBrowsingChannel
   }
-  NetUtil.asyncFetch2(channel, function(inputStream, resultCode) {
+  NetUtil.asyncFetch(channel, function(inputStream, resultCode) {
     if (!Components.isSuccessCode(resultCode))
       return;
     try {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/linux/browser.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/linux/browser.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/linux/browser.css	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/linux/browser.css	2015-05-25 20:43:02.000000000 +0000
@@ -1136,10 +1136,10 @@
 
 %include ../shared/notification-icons.inc.css
 
-.popup-notification-description[popupid="addon-progress"],
-.popup-notification-description[popupid="addon-install-confirmation"] {
-  width: 27em;
-  max-width: 27em;
+.popup-notification-body[popupid="addon-progress"],
+.popup-notification-body[popupid="addon-install-confirmation"] {
+  width: 28em;
+  max-width: 28em;
 }
 
 .addon-install-confirmation-name {
@@ -1167,10 +1167,6 @@
   list-style-image: url(moz-icon://stock/gtk-dialog-question?size=16);
 }
 
-#pointerLock-cancel {
-  margin: 0px;
-}
-
 /* Translation infobar */
 
 %include ../shared/translation/infobar.inc.css
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/linux/content-contextmenu.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/linux/content-contextmenu.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/linux/content-contextmenu.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/linux/content-contextmenu.svg	2015-05-25 20:43:02.000000000 +0000
@@ -2,72 +2,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/. -->
-<svg 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">
-<style>
-use:not(:target) {
-  display: none;
-}
-
-use {
-  fill: menutext;
-}
-
-use[id$="-active"] {
-  fill: -moz-menuhovertext;
-}
-
-use[id$="-disabled"] {
-  fill: graytext;
-}
-</style>
-<defs style="display:none">
-  <path id="back-shape" fill-rule="evenodd" clip-rule="evenodd" d="M1.192,8.893L2.21,9.964c0.064,0.065,0.136,0.117,0.214,0.159
-    l5.199,5.301c0.607,0.63,1.465,0.764,1.915,0.297l1.02-1.082c0.449-0.467,0.32-1.357-0.288-1.99l-2.116-2.158h5.705
-    c0.671,0,1.215-0.544,1.215-1.215v-2.43c0-0.671-0.544-1.215-1.215-1.215H8.094l2.271-2.309c0.609-0.626,0.737-1.512,0.288-1.974
-    L9.635,0.278C9.184-0.188,8.327-0.055,7.718,0.575L2.479,5.901C2.38,5.946,2.289,6.008,2.21,6.089L1.192,7.171
-    c-0.21,0.219-0.293,0.53-0.26,0.864C0.899,8.367,0.981,8.676,1.192,8.893z"/>
-  <path id="forward-shape" fill-rule="evenodd" clip-rule="evenodd" d="M14.808,7.107L13.79,6.036c-0.064-0.065-0.136-0.117-0.214-0.159
-    L8.377,0.576C7.77-0.054,6.912-0.189,6.461,0.278L5.441,1.36c-0.449,0.467-0.32,1.357,0.288,1.99l2.116,2.158H2.14
-    c-0.671,0-1.215,0.544-1.215,1.215v2.43c0,0.671,0.544,1.215,1.215,1.215h5.765l-2.271,2.309c-0.609,0.626-0.737,1.512-0.288,1.974
-    l1.019,1.072c0.451,0.465,1.308,0.332,1.917-0.297l5.238-5.326c0.1-0.045,0.191-0.107,0.269-0.188l1.019-1.082
-    c0.21-0.219,0.293-0.53,0.26-0.864C15.101,7.633,15.019,7.324,14.808,7.107z"/>
-  <path id="reload-shape" fill-rule="evenodd" clip-rule="evenodd" d="M15.429,8h-8l3.207-3.207C9.889,4.265,8.986,3.947,8,3.947
-    c-2.554,0-4.625,2.071-4.625,4.625S5.446,13.196,8,13.196c1.638,0,3.069-0.857,3.891-2.141l2.576,1.104
-    C13.199,14.439,10.794,16,8,16c-4.103,0-7.429-3.326-7.429-7.429S3.897,1.143,8,1.143c1.762,0,3.366,0.624,4.631,1.654L15.429,0V8z"/>
-  <polygon id="stop-shape" fill-rule="evenodd" clip-rule="evenodd" points="16,2.748 13.338,0.079 8.038,5.391 2.661,0 0,2.669
-    5.377,8.059 0.157,13.292 2.819,15.961 8.039,10.728 13.298,16 15.959,13.331 10.701,8.06"/>
-  <path id="bookmark-shape" d="M8.008,3.632l0.986,2.012l0.452,0.922l1.014,0.169l2.326,0.389l-1.719,1.799l-0.676,0.708l0.145,0.967
-    L10.896,13l-1.959-1.039l-0.937-0.497l-0.937,0.497l-1.957,1.038L5.468,10.6l0.146-0.968L4.937,8.924L3.219,7.126l2.351-0.39
-    l1.023-0.17l0.45-0.934L8.008,3.632 M8,0C7.72,0,7.44,0.217,7.228,0.65L5.242,4.766L0.907,5.485c-0.958,0.159-1.195,0.861-0.53,1.56
-    l3.113,3.258l-0.69,4.583c-0.105,0.689,0.172,1.092,0.658,1.092c0.185,0,0.399-0.058,0.635-0.181l3.906-2.072l3.906,2.072
-    c0.236,0.123,0.45,0.181,0.635,0.181c0.486,0,0.762-0.403,0.659-1.092l-0.687-4.583l3.109-3.255c0.666-0.702,0.428-1.404-0.53-1.564
-    l-4.303-0.719L8.772,0.65C8.56,0.217,8.28,0,8,0L8,0z"/>
-  <path id="bookmarked-shape" d="M8,0C7.719,0,7.438,0.217,7.225,0.651L5.233,4.773l-4.35,0.72c-0.961,0.159-1.199,0.862-0.531,1.562
-    l3.124,3.262l-0.692,4.589C2.679,15.596,2.957,16,3.444,16c0.185,0,0.401-0.058,0.637-0.181L8,13.744l3.919,2.075
-    C12.156,15.942,12.372,16,12.557,16c0.487,0,0.764-0.404,0.661-1.094l-0.69-4.589l3.12-3.259c0.668-0.703,0.43-1.406-0.532-1.566
-    l-4.317-0.72L8.775,0.651C8.562,0.217,8.281,0,8,0L8,0z"/>
-</defs>
-<use id="back"                xlink:href="#back-shape"/>
-<use id="back-active"         xlink:href="#back-shape"/>
-<use id="back-disabled"       xlink:href="#back-shape"/>
-<use id="forward"             xlink:href="#forward-shape"/>
-<use id="forward-active"      xlink:href="#forward-shape"/>
-<use id="forward-disabled"    xlink:href="#forward-shape"/>
-<use id="reload"              xlink:href="#reload-shape"/>
-<use id="reload-active"       xlink:href="#reload-shape"/>
-<use id="reload-disabled"     xlink:href="#reload-shape"/>
-<use id="stop"                xlink:href="#stop-shape"/>
-<use id="stop-active"         xlink:href="#stop-shape"/>
-<use id="stop-disabled"       xlink:href="#stop-shape"/>
-<use id="bookmark"            xlink:href="#bookmark-shape"/>
-<use id="bookmark-active"     xlink:href="#bookmark-shape"/>
-<use id="bookmark-disabled"   xlink:href="#bookmark-shape"/>
-<use id="bookmarked"          xlink:href="#bookmarked-shape"/>
-<use id="bookmarked-active"   xlink:href="#bookmarked-shape"/>
-<use id="bookmarked-disabled" xlink:href="#bookmarked-shape"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: menutext;
+    }
+    use[id$="-active"] {
+      fill: -moz-menuhovertext;
+    }
+    use[id$="-disabled"] {
+      fill: graytext;
+    }
+  </style>
+  <defs>
+    <path id="back-shape" fill-rule="evenodd" d="M1.192,8.893L2.21,9.964c0.064,0.065,0.136,0.117,0.214,0.159 l5.199,5.301c0.607,0.63,1.465,0.764,1.915,0.297l1.02-1.082c0.449-0.467,0.32-1.357-0.288-1.99l-2.116-2.158h5.705 c0.671,0,1.215-0.544,1.215-1.215v-2.43c0-0.671-0.544-1.215-1.215-1.215H8.094l2.271-2.309c0.609-0.626,0.737-1.512,0.288-1.974 L9.635,0.278C9.184-0.188,8.327-0.055,7.718,0.575L2.479,5.901C2.38,5.946,2.289,6.008,2.21,6.089L1.192,7.171 c-0.21,0.219-0.293,0.53-0.26,0.864C0.899,8.367,0.981,8.676,1.192,8.893z"/>
+    <path id="forward-shape" fill-rule="evenodd" d="M14.808,7.107L13.79,6.036c-0.064-0.065-0.136-0.117-0.214-0.159 L8.377,0.576C7.77-0.054,6.912-0.189,6.461,0.278L5.441,1.36c-0.449,0.467-0.32,1.357,0.288,1.99l2.116,2.158H2.14 c-0.671,0-1.215,0.544-1.215,1.215v2.43c0,0.671,0.544,1.215,1.215,1.215h5.765l-2.271,2.309c-0.609,0.626-0.737,1.512-0.288,1.974 l1.019,1.072c0.451,0.465,1.308,0.332,1.917-0.297l5.238-5.326c0.1-0.045,0.191-0.107,0.269-0.188l1.019-1.082 c0.21-0.219,0.293-0.53,0.26-0.864C15.101,7.633,15.019,7.324,14.808,7.107z"/>
+    <path id="reload-shape" fill-rule="evenodd" d="M15.429,8h-8l3.207-3.207C9.889,4.265,8.986,3.947,8,3.947 c-2.554,0-4.625,2.071-4.625,4.625S5.446,13.196,8,13.196c1.638,0,3.069-0.857,3.891-2.141l2.576,1.104 C13.199,14.439,10.794,16,8,16c-4.103,0-7.429-3.326-7.429-7.429S3.897,1.143,8,1.143c1.762,0,3.366,0.624,4.631,1.654L15.429,0V8z"/>
+    <polygon id="stop-shape" points="16,2.748 13.338,0.079 8.038,5.391 2.661,0 0,2.669 5.377,8.059 0.157,13.292 2.819,15.961 8.039,10.728 13.298,16 15.959,13.331 10.701,8.06"/>
+    <path id="bookmark-shape" d="M8.008,3.632l0.986,2.012l0.452,0.922l1.014,0.169l2.326,0.389l-1.719,1.799l-0.676,0.708l0.145,0.967 L10.896,13l-1.959-1.039l-0.937-0.497l-0.937,0.497l-1.957,1.038L5.468,10.6l0.146-0.968L4.937,8.924L3.219,7.126l2.351-0.39 l1.023-0.17l0.45-0.934L8.008,3.632 M8,0C7.72,0,7.44,0.217,7.228,0.65L5.242,4.766L0.907,5.485c-0.958,0.159-1.195,0.861-0.53,1.56 l3.113,3.258l-0.69,4.583c-0.105,0.689,0.172,1.092,0.658,1.092c0.185,0,0.399-0.058,0.635-0.181l3.906-2.072l3.906,2.072 c0.236,0.123,0.45,0.181,0.635,0.181c0.486,0,0.762-0.403,0.659-1.092l-0.687-4.583l3.109-3.255c0.666-0.702,0.428-1.404-0.53-1.564 l-4.303-0.719L8.772,0.65C8.56,0.217,8.28,0,8,0L8,0z"/>
+    <path id="bookmarked-shape" d="M8,0C7.719,0,7.438,0.217,7.225,0.651L5.233,4.773l-4.35,0.72c-0.961,0.159-1.199,0.862-0.531,1.562 l3.124,3.262l-0.692,4.589C2.679,15.596,2.957,16,3.444,16c0.185,0,0.401-0.058,0.637-0.181L8,13.744l3.919,2.075 C12.156,15.942,12.372,16,12.557,16c0.487,0,0.764-0.404,0.661-1.094l-0.69-4.589l3.12-3.259c0.668-0.703,0.43-1.406-0.532-1.566 l-4.317-0.72L8.775,0.651C8.562,0.217,8.281,0,8,0L8,0z"/>
+  </defs>
+  <use id="back" xlink:href="#back-shape"/>
+  <use id="back-active" xlink:href="#back-shape"/>
+  <use id="back-disabled" xlink:href="#back-shape"/>
+  <use id="forward" xlink:href="#forward-shape"/>
+  <use id="forward-active" xlink:href="#forward-shape"/>
+  <use id="forward-disabled" xlink:href="#forward-shape"/>
+  <use id="reload" xlink:href="#reload-shape"/>
+  <use id="reload-active" xlink:href="#reload-shape"/>
+  <use id="reload-disabled" xlink:href="#reload-shape"/>
+  <use id="stop" xlink:href="#stop-shape"/>
+  <use id="stop-active" xlink:href="#stop-shape"/>
+  <use id="stop-disabled" xlink:href="#stop-shape"/>
+  <use id="bookmark" xlink:href="#bookmark-shape"/>
+  <use id="bookmark-active" xlink:href="#bookmark-shape"/>
+  <use id="bookmark-disabled" xlink:href="#bookmark-shape"/>
+  <use id="bookmarked" xlink:href="#bookmarked-shape"/>
+  <use id="bookmarked-active" xlink:href="#bookmarked-shape"/>
+  <use id="bookmarked-disabled" xlink:href="#bookmarked-shape"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/linux/devedition.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/linux/devedition.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/linux/devedition.css	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/linux/devedition.css	2015-05-25 20:43:02.000000000 +0000
@@ -4,7 +4,7 @@
 
 %include ../shared/devedition.inc.css
 
-.tab-close-button[selected]:not(:hover) {
+.tab-close-button[visuallyselected]:not(:hover) {
   background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 80, 16, 64);
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/linux/devtools/profiler.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/linux/devtools/profiler.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/linux/devtools/profiler.css	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/linux/devtools/profiler.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-%include ../../shared/devtools/profiler.inc.css
-
-#profile-content tab label {
-  margin-bottom: 4px;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/linux/devtools/timeline.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/linux/devtools/timeline.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/linux/devtools/timeline.css	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/linux/devtools/timeline.css	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/. */
-
-%include ../../shared/devtools/timeline.inc.css
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/linux/jar.mn firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/linux/jar.mn
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/linux/jar.mn	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/linux/jar.mn	2015-05-25 20:43:02.000000000 +0000
@@ -23,6 +23,14 @@
 #endif
   skin/classic/browser/aboutTabCrashed.css                      (../shared/aboutTabCrashed.css)
   skin/classic/browser/actionicon-tab.png
+  skin/classic/browser/addons/addon-install-blocked.svg     (../shared/addons/addon-install-blocked.svg)
+  skin/classic/browser/addons/addon-install-confirm.svg     (../shared/addons/addon-install-confirm.svg)
+  skin/classic/browser/addons/addon-install-downloading.svg (../shared/addons/addon-install-downloading.svg)
+  skin/classic/browser/addons/addon-install-error.svg       (../shared/addons/addon-install-error.svg)
+  skin/classic/browser/addons/addon-install-installed.svg   (../shared/addons/addon-install-installed.svg)
+  skin/classic/browser/addons/addon-install-restart.svg     (../shared/addons/addon-install-restart.svg)
+  skin/classic/browser/addons/addon-install-warning.svg     (../shared/addons/addon-install-warning.svg)
+  skin/classic/browser/addons/addon-install-anchor.svg      (../shared/addons/addon-install-anchor.svg)
 * skin/classic/browser/browser.css
 * skin/classic/browser/devedition.css
 * skin/classic/browser/browser-lightweightTheme.css
@@ -146,6 +154,7 @@
   skin/classic/browser/feeds/subscribe-ui.css         (feeds/subscribe-ui.css)
 * skin/classic/browser/newtab/newTab.css              (newtab/newTab.css)
   skin/classic/browser/newtab/controls.svg            (../shared/newtab/controls.svg)
+  skin/classic/browser/newtab/whimsycorn.png          (../shared/newtab/whimsycorn.png)
   skin/classic/browser/panic-panel/header.png         (../shared/panic-panel/header.png)
   skin/classic/browser/panic-panel/header-small.png   (../shared/panic-panel/header-small.png)
   skin/classic/browser/panic-panel/icons.png          (../shared/panic-panel/icons.png)
@@ -289,9 +298,7 @@
 * skin/classic/browser/devtools/debugger.css          (devtools/debugger.css)
   skin/classic/browser/devtools/eyedropper.css        (../shared/devtools/eyedropper.css)
 * skin/classic/browser/devtools/netmonitor.css        (devtools/netmonitor.css)
-* skin/classic/browser/devtools/profiler.css          (devtools/profiler.css)
 * skin/classic/browser/devtools/performance.css       (devtools/performance.css)
-* skin/classic/browser/devtools/timeline.css          (devtools/timeline.css)
   skin/classic/browser/devtools/timeline-filter.svg   (../shared/devtools/images/timeline-filter.svg)
 * skin/classic/browser/devtools/scratchpad.css        (devtools/scratchpad.css)
 * skin/classic/browser/devtools/shadereditor.css      (devtools/shadereditor.css)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/linux/preferences/aboutPermissions.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/linux/preferences/aboutPermissions.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/linux/preferences/aboutPermissions.css	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/linux/preferences/aboutPermissions.css	2015-05-25 20:43:02.000000000 +0000
@@ -2,13 +2,16 @@
  * License, v. 2.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 url("chrome://global/skin/inContentUI.css");
+@import url("chrome://global/skin/in-content/common.css");
 
+#permissions-content {
+  padding-top: 48px;
+  -moz-padding-end: 0; /* no padding to move the scroll bar to the edge */
+}
 
 /* sites box */
 
 #sites-box {
-  padding: 10px;
   width: 25em;
 }
 
@@ -39,13 +42,17 @@
 /* permissions box */
 
 #permissions-box {
-  padding-top: 10px;
+  -moz-padding-start: 10px;
+}
+
+#permissions-list {
   overflow-y: auto;
+  padding-top: 5px;
+  -moz-padding-end: 44px;
 }
 
 #site-description {
   font-size: 125%;
-  -moz-margin-start: 6px; /* to match button margin */
 }
 
 #site-label {
@@ -57,7 +64,15 @@
 #defaults-description {
   font-size: 125%;
   font-weight: bold;
-  -moz-margin-start: 6px;
+}
+
+#header-deck {
+  -moz-margin-end: 44px;
+}
+
+#site-header,
+#defaults-header {
+  margin-bottom: 1px;
 }
 
 .pref-item {
@@ -109,11 +124,16 @@
 
 .pref-title {
   font-size: 125%;
+  -moz-margin-start: 4px;
   margin-bottom: 0;
   font-weight: bold;
 }
 
 .pref-menulist {
-  margin-left: 6px;
-  margin-right: 6px;
+  min-width: 10em;
+ }
+
+#cookies-label,
+#passwords-label {
+  -moz-margin-start: 4px; /* align with the menulists */
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/osx/browser.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/osx/browser.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/osx/browser.css	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/osx/browser.css	2015-05-25 20:43:03.000000000 +0000
@@ -3687,10 +3687,10 @@
   }
 }
 
-.popup-notification-description[popupid="addon-progress"],
-.popup-notification-description[popupid="addon-install-confirmation"] {
-  width: 27em;
-  max-width: 27em;
+.popup-notification-body[popupid="addon-progress"],
+.popup-notification-body[popupid="addon-install-confirmation"] {
+  width: 28em;
+  max-width: 28em;
 }
 
 #addon-progress-notification-progresstext,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/osx/content-contextmenu.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/osx/content-contextmenu.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/osx/content-contextmenu.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/osx/content-contextmenu.svg	2015-05-25 20:43:03.000000000 +0000
@@ -2,72 +2,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/. -->
-<svg 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">
-<style>
-use:not(:target) {
-  display: none;
-}
-
-use {
-  fill: menutext;
-}
-
-use[id$="-active"] {
-  fill: -moz-mac-menutextselect;
-}
-
-use[id$="-disabled"] {
-  fill: -moz-mac-menutextdisable;
-}
-</style>
-<defs style="display:none">
-  <path id="back-shape" fill-rule="evenodd" clip-rule="evenodd" d="M1.192,8.893L2.21,9.964c0.064,0.065,0.136,0.117,0.214,0.159
-    l5.199,5.301c0.607,0.63,1.465,0.764,1.915,0.297l1.02-1.082c0.449-0.467,0.32-1.357-0.288-1.99l-2.116-2.158h5.705
-    c0.671,0,1.215-0.544,1.215-1.215v-2.43c0-0.671-0.544-1.215-1.215-1.215H8.094l2.271-2.309c0.609-0.626,0.737-1.512,0.288-1.974
-    L9.635,0.278C9.184-0.188,8.327-0.055,7.718,0.575L2.479,5.901C2.38,5.946,2.289,6.008,2.21,6.089L1.192,7.171
-    c-0.21,0.219-0.293,0.53-0.26,0.864C0.899,8.367,0.981,8.676,1.192,8.893z"/>
-  <path id="forward-shape" fill-rule="evenodd" clip-rule="evenodd" d="M14.808,7.107L13.79,6.036c-0.064-0.065-0.136-0.117-0.214-0.159
-    L8.377,0.576C7.77-0.054,6.912-0.189,6.461,0.278L5.441,1.36c-0.449,0.467-0.32,1.357,0.288,1.99l2.116,2.158H2.14
-    c-0.671,0-1.215,0.544-1.215,1.215v2.43c0,0.671,0.544,1.215,1.215,1.215h5.765l-2.271,2.309c-0.609,0.626-0.737,1.512-0.288,1.974
-    l1.019,1.072c0.451,0.465,1.308,0.332,1.917-0.297l5.238-5.326c0.1-0.045,0.191-0.107,0.269-0.188l1.019-1.082
-    c0.21-0.219,0.293-0.53,0.26-0.864C15.101,7.633,15.019,7.324,14.808,7.107z"/>
-  <path id="reload-shape" fill-rule="evenodd" clip-rule="evenodd" d="M15.429,8h-8l3.207-3.207C9.889,4.265,8.986,3.947,8,3.947
-    c-2.554,0-4.625,2.071-4.625,4.625S5.446,13.196,8,13.196c1.638,0,3.069-0.857,3.891-2.141l2.576,1.104
-    C13.199,14.439,10.794,16,8,16c-4.103,0-7.429-3.326-7.429-7.429S3.897,1.143,8,1.143c1.762,0,3.366,0.624,4.631,1.654L15.429,0V8z"/>
-  <polygon id="stop-shape" fill-rule="evenodd" clip-rule="evenodd" points="16,2.748 13.338,0.079 8.038,5.391 2.661,0 0,2.669
-    5.377,8.059 0.157,13.292 2.819,15.961 8.039,10.728 13.298,16 15.959,13.331 10.701,8.06"/>
-  <path id="bookmark-shape" d="M8.008,3.632l0.986,2.012l0.452,0.922l1.014,0.169l2.326,0.389l-1.719,1.799l-0.676,0.708l0.145,0.967
-    L10.896,13l-1.959-1.039l-0.937-0.497l-0.937,0.497l-1.957,1.038L5.468,10.6l0.146-0.968L4.937,8.924L3.219,7.126l2.351-0.39
-    l1.023-0.17l0.45-0.934L8.008,3.632 M8,0C7.72,0,7.44,0.217,7.228,0.65L5.242,4.766L0.907,5.485c-0.958,0.159-1.195,0.861-0.53,1.56
-    l3.113,3.258l-0.69,4.583c-0.105,0.689,0.172,1.092,0.658,1.092c0.185,0,0.399-0.058,0.635-0.181l3.906-2.072l3.906,2.072
-    c0.236,0.123,0.45,0.181,0.635,0.181c0.486,0,0.762-0.403,0.659-1.092l-0.687-4.583l3.109-3.255c0.666-0.702,0.428-1.404-0.53-1.564
-    l-4.303-0.719L8.772,0.65C8.56,0.217,8.28,0,8,0L8,0z"/>
-  <path id="bookmarked-shape" d="M8,0C7.719,0,7.438,0.217,7.225,0.651L5.233,4.773l-4.35,0.72c-0.961,0.159-1.199,0.862-0.531,1.562
-    l3.124,3.262l-0.692,4.589C2.679,15.596,2.957,16,3.444,16c0.185,0,0.401-0.058,0.637-0.181L8,13.744l3.919,2.075
-    C12.156,15.942,12.372,16,12.557,16c0.487,0,0.764-0.404,0.661-1.094l-0.69-4.589l3.12-3.259c0.668-0.703,0.43-1.406-0.532-1.566
-    l-4.317-0.72L8.775,0.651C8.562,0.217,8.281,0,8,0L8,0z"/>
-</defs>
-<use id="back"                xlink:href="#back-shape"/>
-<use id="back-active"         xlink:href="#back-shape"/>
-<use id="back-disabled"       xlink:href="#back-shape"/>
-<use id="forward"             xlink:href="#forward-shape"/>
-<use id="forward-active"      xlink:href="#forward-shape"/>
-<use id="forward-disabled"    xlink:href="#forward-shape"/>
-<use id="reload"              xlink:href="#reload-shape"/>
-<use id="reload-active"       xlink:href="#reload-shape"/>
-<use id="reload-disabled"     xlink:href="#reload-shape"/>
-<use id="stop"                xlink:href="#stop-shape"/>
-<use id="stop-active"         xlink:href="#stop-shape"/>
-<use id="stop-disabled"       xlink:href="#stop-shape"/>
-<use id="bookmark"            xlink:href="#bookmark-shape"/>
-<use id="bookmark-active"     xlink:href="#bookmark-shape"/>
-<use id="bookmark-disabled"   xlink:href="#bookmark-shape"/>
-<use id="bookmarked"          xlink:href="#bookmarked-shape"/>
-<use id="bookmarked-active"   xlink:href="#bookmarked-shape"/>
-<use id="bookmarked-disabled" xlink:href="#bookmarked-shape"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: menutext;
+    }
+    use[id$="-active"] {
+      fill: -moz-mac-menutextselect;
+    }
+    use[id$="-disabled"] {
+      fill: -moz-mac-menutextdisable;
+    }
+  </style>
+  <defs>
+    <path id="back-shape" fill-rule="evenodd" d="M1.192,8.893L2.21,9.964c0.064,0.065,0.136,0.117,0.214,0.159 l5.199,5.301c0.607,0.63,1.465,0.764,1.915,0.297l1.02-1.082c0.449-0.467,0.32-1.357-0.288-1.99l-2.116-2.158h5.705 c0.671,0,1.215-0.544,1.215-1.215v-2.43c0-0.671-0.544-1.215-1.215-1.215H8.094l2.271-2.309c0.609-0.626,0.737-1.512,0.288-1.974 L9.635,0.278C9.184-0.188,8.327-0.055,7.718,0.575L2.479,5.901C2.38,5.946,2.289,6.008,2.21,6.089L1.192,7.171 c-0.21,0.219-0.293,0.53-0.26,0.864C0.899,8.367,0.981,8.676,1.192,8.893z"/>
+    <path id="forward-shape" fill-rule="evenodd" d="M14.808,7.107L13.79,6.036c-0.064-0.065-0.136-0.117-0.214-0.159 L8.377,0.576C7.77-0.054,6.912-0.189,6.461,0.278L5.441,1.36c-0.449,0.467-0.32,1.357,0.288,1.99l2.116,2.158H2.14 c-0.671,0-1.215,0.544-1.215,1.215v2.43c0,0.671,0.544,1.215,1.215,1.215h5.765l-2.271,2.309c-0.609,0.626-0.737,1.512-0.288,1.974 l1.019,1.072c0.451,0.465,1.308,0.332,1.917-0.297l5.238-5.326c0.1-0.045,0.191-0.107,0.269-0.188l1.019-1.082 c0.21-0.219,0.293-0.53,0.26-0.864C15.101,7.633,15.019,7.324,14.808,7.107z"/>
+    <path id="reload-shape" fill-rule="evenodd" d="M15.429,8h-8l3.207-3.207C9.889,4.265,8.986,3.947,8,3.947 c-2.554,0-4.625,2.071-4.625,4.625S5.446,13.196,8,13.196c1.638,0,3.069-0.857,3.891-2.141l2.576,1.104 C13.199,14.439,10.794,16,8,16c-4.103,0-7.429-3.326-7.429-7.429S3.897,1.143,8,1.143c1.762,0,3.366,0.624,4.631,1.654L15.429,0V8z"/>
+    <polygon id="stop-shape" points="16,2.748 13.338,0.079 8.038,5.391 2.661,0 0,2.669 5.377,8.059 0.157,13.292 2.819,15.961 8.039,10.728 13.298,16 15.959,13.331 10.701,8.06"/>
+    <path id="bookmark-shape" d="M8.008,3.632l0.986,2.012l0.452,0.922l1.014,0.169l2.326,0.389l-1.719,1.799l-0.676,0.708l0.145,0.967 L10.896,13l-1.959-1.039l-0.937-0.497l-0.937,0.497l-1.957,1.038L5.468,10.6l0.146-0.968L4.937,8.924L3.219,7.126l2.351-0.39 l1.023-0.17l0.45-0.934L8.008,3.632 M8,0C7.72,0,7.44,0.217,7.228,0.65L5.242,4.766L0.907,5.485c-0.958,0.159-1.195,0.861-0.53,1.56 l3.113,3.258l-0.69,4.583c-0.105,0.689,0.172,1.092,0.658,1.092c0.185,0,0.399-0.058,0.635-0.181l3.906-2.072l3.906,2.072 c0.236,0.123,0.45,0.181,0.635,0.181c0.486,0,0.762-0.403,0.659-1.092l-0.687-4.583l3.109-3.255c0.666-0.702,0.428-1.404-0.53-1.564 l-4.303-0.719L8.772,0.65C8.56,0.217,8.28,0,8,0L8,0z"/>
+    <path id="bookmarked-shape" d="M8,0C7.719,0,7.438,0.217,7.225,0.651L5.233,4.773l-4.35,0.72c-0.961,0.159-1.199,0.862-0.531,1.562 l3.124,3.262l-0.692,4.589C2.679,15.596,2.957,16,3.444,16c0.185,0,0.401-0.058,0.637-0.181L8,13.744l3.919,2.075 C12.156,15.942,12.372,16,12.557,16c0.487,0,0.764-0.404,0.661-1.094l-0.69-4.589l3.12-3.259c0.668-0.703,0.43-1.406-0.532-1.566 l-4.317-0.72L8.775,0.651C8.562,0.217,8.281,0,8,0L8,0z"/>
+  </defs>
+  <use id="back" xlink:href="#back-shape"/>
+  <use id="back-active" xlink:href="#back-shape"/>
+  <use id="back-disabled" xlink:href="#back-shape"/>
+  <use id="forward" xlink:href="#forward-shape"/>
+  <use id="forward-active" xlink:href="#forward-shape"/>
+  <use id="forward-disabled" xlink:href="#forward-shape"/>
+  <use id="reload" xlink:href="#reload-shape"/>
+  <use id="reload-active" xlink:href="#reload-shape"/>
+  <use id="reload-disabled" xlink:href="#reload-shape"/>
+  <use id="stop" xlink:href="#stop-shape"/>
+  <use id="stop-active" xlink:href="#stop-shape"/>
+  <use id="stop-disabled" xlink:href="#stop-shape"/>
+  <use id="bookmark" xlink:href="#bookmark-shape"/>
+  <use id="bookmark-active" xlink:href="#bookmark-shape"/>
+  <use id="bookmark-disabled" xlink:href="#bookmark-shape"/>
+  <use id="bookmarked" xlink:href="#bookmarked-shape"/>
+  <use id="bookmarked-active" xlink:href="#bookmarked-shape"/>
+  <use id="bookmarked-disabled" xlink:href="#bookmarked-shape"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/osx/devtools/profiler.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/osx/devtools/profiler.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/osx/devtools/profiler.css	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/osx/devtools/profiler.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-%include ../shared.inc
-%include ../../shared/devtools/profiler.inc.css
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/osx/devtools/timeline.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/osx/devtools/timeline.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/osx/devtools/timeline.css	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/osx/devtools/timeline.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-%include ../shared.inc
-%include ../../shared/devtools/timeline.inc.css
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/osx/jar.mn firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/osx/jar.mn
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/osx/jar.mn	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/osx/jar.mn	2015-05-25 20:43:03.000000000 +0000
@@ -23,6 +23,14 @@
   skin/classic/browser/aboutTabCrashed.css                  (../shared/aboutTabCrashed.css)
   skin/classic/browser/actionicon-tab.png
   skin/classic/browser/actionicon-tab@2x.png
+  skin/classic/browser/addons/addon-install-blocked.svg     (../shared/addons/addon-install-blocked.svg)
+  skin/classic/browser/addons/addon-install-confirm.svg     (../shared/addons/addon-install-confirm.svg)
+  skin/classic/browser/addons/addon-install-downloading.svg (../shared/addons/addon-install-downloading.svg)
+  skin/classic/browser/addons/addon-install-error.svg       (../shared/addons/addon-install-error.svg)
+  skin/classic/browser/addons/addon-install-installed.svg   (../shared/addons/addon-install-installed.svg)
+  skin/classic/browser/addons/addon-install-restart.svg     (../shared/addons/addon-install-restart.svg)
+  skin/classic/browser/addons/addon-install-warning.svg     (../shared/addons/addon-install-warning.svg)
+  skin/classic/browser/addons/addon-install-anchor.svg      (../shared/addons/addon-install-anchor.svg)
 * skin/classic/browser/browser.css                          (browser.css)
 * skin/classic/browser/devedition.css
 * skin/classic/browser/browser-lightweightTheme.css
@@ -231,6 +239,7 @@
   skin/classic/browser/feeds/feedIcon16.png                 (feeds/feedIcon16.png)
 * skin/classic/browser/newtab/newTab.css                    (newtab/newTab.css)
   skin/classic/browser/newtab/controls.svg                  (../shared/newtab/controls.svg)
+  skin/classic/browser/newtab/whimsycorn.png                (../shared/newtab/whimsycorn.png)
   skin/classic/browser/setDesktopBackground.css
   skin/classic/browser/monitor.png
   skin/classic/browser/monitor_16-10.png
@@ -422,9 +431,7 @@
 * skin/classic/browser/devtools/debugger.css                (devtools/debugger.css)
   skin/classic/browser/devtools/eyedropper.css              (../shared/devtools/eyedropper.css)
 * skin/classic/browser/devtools/netmonitor.css              (devtools/netmonitor.css)
-* skin/classic/browser/devtools/profiler.css                (devtools/profiler.css)
 * skin/classic/browser/devtools/performance.css             (devtools/performance.css)
-* skin/classic/browser/devtools/timeline.css                (devtools/timeline.css)
   skin/classic/browser/devtools/timeline-filter.svg         (../shared/devtools/images/timeline-filter.svg)
 * skin/classic/browser/devtools/scratchpad.css              (devtools/scratchpad.css)
 * skin/classic/browser/devtools/shadereditor.css            (devtools/shadereditor.css)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/osx/preferences/aboutPermissions.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/osx/preferences/aboutPermissions.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/osx/preferences/aboutPermissions.css	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/osx/preferences/aboutPermissions.css	2015-05-25 20:43:03.000000000 +0000
@@ -2,13 +2,16 @@
  * License, v. 2.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 url("chrome://global/skin/inContentUI.css");
+@import url("chrome://global/skin/in-content/common.css");
 
+#permissions-content {
+  padding-top: 48px;
+  -moz-padding-end: 0; /* no padding to move the scroll bar to the edge */
+}
 
 /* sites box */
 
 #sites-box {
-  padding: 10px;
   width: 25em;
 }
 
@@ -17,10 +20,6 @@
 }
 
 #sites-list {
-  -moz-appearance: none;
-  border: 1px solid rgba(60,73,97,0.5);
-  box-shadow: inset 0 1px 1px rgba(0,0,0,0.15), 0 1px rgba(255,255,255,0.25);
-  background: linear-gradient(rgba(255,255,255,0.2), rgba(255,255,255,0.3));
   margin: 5px 0 0 0;
 }
 
@@ -49,13 +48,17 @@
 /* permissions box */
 
 #permissions-box {
-  padding: 10px;
+  -moz-padding-start: 10px;
+}
+
+#permissions-list {
   overflow-y: auto;
+  padding-top: 5px;
+  -moz-padding-end: 44px;
 }
 
 #site-description {
   font-size: 125%;
-  -moz-margin-start: 6px; /* to match button margin */
 }
 
 #site-label {
@@ -64,10 +67,22 @@
   margin-bottom: 0;
 }
 
+#site-visit-count {
+  margin-bottom: 4px;
+}
+
 #defaults-description {
   font-size: 125%;
   font-weight: bold;
-  -moz-margin-start: 6px;
+}
+
+#header-deck {
+  -moz-margin-end: 44px;
+}
+
+#site-header,
+#defaults-header {
+  margin-bottom: 1px;
 }
 
 .pref-item {
@@ -125,11 +140,16 @@
 
 .pref-title {
   font-size: 125%;
+  -moz-margin-start: 2px; /* align with the menulists */
   margin-bottom: 0;
   font-weight: bold;
 }
 
 .pref-menulist {
-  margin-left: 6px;
-  margin-right: 6px;
+  min-width: 10em;
+ }
+
+#cookies-label,
+#passwords-label {
+  -moz-margin-start: 2px; /* align with the menulists */
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/aboutNetError_alert.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/aboutNetError_alert.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/aboutNetError_alert.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/aboutNetError_alert.svg	2015-05-25 20:43:03.000000000 +0000
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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 40 40" enable-background="new 0 0 40 40" xml:space="preserve">
-<g>
-	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="20" y1="4" x2="20" y2="36">
-		<stop offset="0" style="stop-color:#E63B2E"/>
-		<stop offset="1" style="stop-color:#C33931"/>
-	</linearGradient>
-	<path fill="url(#SVGID_1_)" d="M13.373,4L4,13.372v13.256L13.373,36h13.255L36,26.628V13.372L26.627,4H13.373z M22.176,8.704   l-0.48,14.304h-3.424L17.76,8.704H22.176z M20,31.296c-1.44,0-2.592-1.184-2.592-2.592c0-1.44,1.152-2.592,2.592-2.592   c1.472,0,2.592,1.152,2.592,2.592C22.592,30.112,21.472,31.296,20,31.296z"/>
-	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="20" y1="-3.728928e-10" x2="20" y2="40">
-		<stop offset="0" style="stop-color:#E63B2E"/>
-		<stop offset="1" style="stop-color:#C33931"/>
-	</linearGradient>
-	<path fill="url(#SVGID_2_)" d="M28.284,0H11.716L0,11.716v16.569L11.716,40h16.569L40,28.284V11.716L28.284,0z M38,27.456   L27.456,38H12.544L2,27.456V12.544L12.544,2h14.911L38,12.544V27.456z"/>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 40">
+  <defs>
+    <linearGradient id="gradient1" gradientUnits="userSpaceOnUse" x1="20" y1="4" x2="20" y2="36">
+      <stop offset="0" style="stop-color:#e63b2e"/>
+      <stop offset="1" style="stop-color:#c33931"/>
+    </linearGradient>
+    <linearGradient id="gradient2" gradientUnits="userSpaceOnUse" x1="20" y1="0" x2="20" y2="40">
+      <stop offset="0" style="stop-color:#e63b2e"/>
+      <stop offset="1" style="stop-color:#c33931"/>
+    </linearGradient>
+  </defs>
+  <path fill="url(#gradient1)" d="M13.373,4L4,13.372v13.256L13.373,36h13.255L36,26.628V13.372L26.627,4H13.373z M22.176,8.704 l-0.48,14.304h-3.424L17.76,8.704H22.176z M20,31.296c-1.44,0-2.592-1.184-2.592-2.592c0-1.44,1.152-2.592,2.592-2.592 c1.472,0,2.592,1.152,2.592,2.592C22.592,30.112,21.472,31.296,20,31.296z"/>
+  <path fill="url(#gradient2)" d="M28.284,0H11.716L0,11.716v16.569L11.716,40h16.569L40,28.284V11.716L28.284,0z M38,27.456 L27.456,38H12.544L2,27.456V12.544L12.544,2h14.911L38,12.544V27.456z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/aboutNetError_info.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/aboutNetError_info.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/aboutNetError_info.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/aboutNetError_info.svg	2015-05-25 20:43:03.000000000 +0000
@@ -1,5 +1,8 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" fill="#424E5A">
-  <circle cx="50" cy="50" r="44" stroke="#424E5A" stroke-width="11" fill="none"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" fill="#424e5a">
+  <circle cx="50" cy="50" r="44" stroke="#424e5a" stroke-width="11" fill="none"/>
   <circle cx="50" cy="24.6" r="6.4"/>
   <rect x="45" y="39.9" width="10.1" height="41.8"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/addons/addon-install-anchor.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/addons/addon-install-anchor.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/addons/addon-install-anchor.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/addons/addon-install-anchor.svg	2015-05-25 20:43:03.000000000 +0000
@@ -0,0 +1,27 @@
+<?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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="16" height="16" viewBox="0 0 16 16">
+  <defs>
+    <style>
+      use:not(:target) {
+        display: none;
+      }
+      .style-icon-notification {
+        fill: #666;
+      }
+      .style-icon-notification.hover {
+        fill: #808080;
+      }
+      .style-icon-notification.active {
+        fill: #4d4d4d;
+      }
+    </style>
+    <path id="shape-notifcations-addons" d="M10,15c0.5,0,1-0.4,1-1v-3c0,0,0-0.8,0.8-0.8c0.6,0,0.6,0.8,1.8,0.8c0.6,0,1.5-0.2,1.5-2c0-1.8-0.9-2-1.5-2 c-1.1,0-1.1,0.7-1.8,0.7C11,7.7,11,7,11,7V6c0-0.6-0.5-1-1-1H8c0,0-0.8,0-0.8-0.8C7.2,3.6,8,3.6,8,2.5C8,1.9,7.8,1,6,1 C4.2,1,4,1.9,4,2.5c0,1.1,0.8,1.1,0.8,1.8C4.8,5,4,5,4,5H2C1.5,5,1,5.4,1,6l0,1.5c0,0-0.1,1,1.1,1c0.8,0,0.9-1,1.9-1 C4.5,7.4,5,8,5,9c0,1-0.5,1.6-1,1.6c-1,0-1.1-1.1-1.9-1.1C0.9,9.5,1,10.8,1,10.8V14c0,0.6,0.5,1,1,1l2.6,0c0,0,1.1,0,1.1-1 c0-0.8-1-0.1-1-1.1c0-0.5,0.7-1.2,1.8-1.2s1.8,0.7,1.8,1.2c0,1-1.1,0.3-1.1,1.1c0,1,1.2,1,1.2,1H10z"/>
+  </defs>
+  <use id="default" xlink:href="#shape-notifcations-addons" class="style-icon-notification"/>
+  <use id="hover" xlink:href="#shape-notifcations-addons" class="style-icon-notification hover"/>
+  <use id="active" xlink:href="#shape-notifcations-addons" class="style-icon-notification active"/>
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/addons/addon-install-blocked.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/addons/addon-install-blocked.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/addons/addon-install-blocked.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/addons/addon-install-blocked.svg	2015-05-25 20:43:03.000000000 +0000
@@ -0,0 +1,38 @@
+<?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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="64" height="64" viewBox="0 0 64 64">
+  <defs>
+    <style>
+      .style-puzzle-piece {
+        fill: url('#gradient-linear-puzzle-piece');
+      }
+      .style-badge-shadow {
+        fill: #0d131a;
+        fill-opacity: .15;
+      }
+      .style-badge-background {
+        fill: #fff;
+      }
+      .style-badge-inside {
+        fill: #e62117;
+      }
+      .style-badge-icon {
+        fill: #fff;
+      }
+    </style>
+    <linearGradient id="gradient-linear-puzzle-piece" x1="0%" y1="0%" x2="0%" y2="100%">
+      <stop offset="0%" stop-color="#999999" stop-opacity="1"/>
+      <stop offset="100%" stop-color="#8c8c8c" stop-opacity="1"/>
+    </linearGradient>
+  </defs>
+  <path class="style-puzzle-piece" d="M42,62c2.2,0,4-1.8,4-4l0-14.2c0,0,0.4-3.7,2.8-3.7c2.4,0,2.2,3.9,6.7,3.9c2.3,0,6.2-1.2,6.2-8.2 c0-7-3.9-7.9-6.2-7.9c-4.5,0-4.3,3.7-6.7,3.7c-2.4,0-2.8-3.8-2.8-3.8V22c0-2.2-1.8-4-4-4H31.5c0,0-3.4-0.6-3.4-3 c0-2.4,3.8-2.6,3.8-7.1c0-2.3-1.3-5.9-8.3-5.9s-8,3.6-8,5.9c0,4.5,3.4,4.7,3.4,7.1c0,2.4-3.4,3-3.4,3H6c-2.2,0-4,1.8-4,4l0,7.8 c0,0-0.4,6,4.4,6c3.1,0,3.2-4.1,7.3-4.1c2,0,4,1.9,4,6c0,4.2-2,6.3-4,6.3c-4,0-4.2-4.1-7.3-4.1c-4.8,0-4.4,5.8-4.4,5.8L2,58 c0,2.2,1.8,4,4,4H19c0,0,6.3,0.4,6.3-4.4c0-3.1-4-3.6-4-7.7c0-2,2.2-4.5,6.4-4.5c4.2,0,6.6,2.5,6.6,4.5c0,4-3.9,4.6-3.9,7.7 c0,4.9,6.3,4.4,6.3,4.4H42z"/>
+  <svg width="32" height="32" x="32" y="0">
+    <ellipse class="style-badge-shadow"     rx="14" ry="15" cx="16" cy="17" />
+    <circle  class="style-badge-background" r="15"  cy="15" cx="16" />
+    <circle  class="style-badge-inside"     r="12"  cy="15" cx="16" />
+    <rect    class="style-badge-icon"       x="9" y="13" width="14" height="4" rx="1" ry="1" />
+  </svg>
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/addons/addon-install-confirm.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/addons/addon-install-confirm.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/addons/addon-install-confirm.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/addons/addon-install-confirm.svg	2015-05-25 20:43:03.000000000 +0000
@@ -0,0 +1,19 @@
+<?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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="64" height="64" viewBox="0 0 64 64">
+  <defs>
+    <style>
+      .style-puzzle-piece {
+        fill: url('#gradient-linear-puzzle-piece');
+      }
+    </style>
+    <linearGradient id="gradient-linear-puzzle-piece" x1="0%" y1="0%" x2="0%" y2="100%">
+      <stop offset="0%" stop-color="#66cc52" stop-opacity="1"/>
+      <stop offset="100%" stop-color="#60bf4c" stop-opacity="1"/>
+    </linearGradient>
+  </defs>
+  <path class="style-puzzle-piece" d="M42,62c2.2,0,4-1.8,4-4l0-14.2c0,0,0.4-3.7,2.8-3.7c2.4,0,2.2,3.9,6.7,3.9c2.3,0,6.2-1.2,6.2-8.2 c0-7-3.9-7.9-6.2-7.9c-4.5,0-4.3,3.7-6.7,3.7c-2.4,0-2.8-3.8-2.8-3.8V22c0-2.2-1.8-4-4-4H31.5c0,0-3.4-0.6-3.4-3 c0-2.4,3.8-2.6,3.8-7.1c0-2.3-1.3-5.9-8.3-5.9s-8,3.6-8,5.9c0,4.5,3.4,4.7,3.4,7.1c0,2.4-3.4,3-3.4,3H6c-2.2,0-4,1.8-4,4l0,7.8 c0,0-0.4,6,4.4,6c3.1,0,3.2-4.1,7.3-4.1c2,0,4,1.9,4,6c0,4.2-2,6.3-4,6.3c-4,0-4.2-4.1-7.3-4.1c-4.8,0-4.4,5.8-4.4,5.8L2,58 c0,2.2,1.8,4,4,4H19c0,0,6.3,0.4,6.3-4.4c0-3.1-4-3.6-4-7.7c0-2,2.2-4.5,6.4-4.5c4.2,0,6.6,2.5,6.6,4.5c0,4-3.9,4.6-3.9,7.7 c0,4.9,6.3,4.4,6.3,4.4H42z"/>
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/addons/addon-install-downloading.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/addons/addon-install-downloading.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/addons/addon-install-downloading.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/addons/addon-install-downloading.svg	2015-05-25 20:43:03.000000000 +0000
@@ -0,0 +1,38 @@
+<?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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="64" height="64" viewBox="0 0 64 64">
+  <defs>
+    <style>
+      .style-puzzle-piece {
+        fill: url('#gradient-linear-puzzle-piece');
+      }
+      .style-badge-shadow {
+        fill: #0d131a;
+        fill-opacity: .15;
+      }
+      .style-badge-background {
+        fill: #fff;
+      }
+      .style-badge-inside {
+        fill: #55cc3d;
+      }
+      .style-badge-icon {
+        fill: #fff;
+      }
+    </style>
+    <linearGradient id="gradient-linear-puzzle-piece" x1="0%" y1="0%" x2="0%" y2="100%">
+      <stop offset="0%" stop-color="#66cc52" stop-opacity="1"/>
+      <stop offset="100%" stop-color="#60bf4c" stop-opacity="1"/>
+    </linearGradient>
+  </defs>
+  <path class="style-puzzle-piece" d="M42,62c2.2,0,4-1.8,4-4l0-14.2c0,0,0.4-3.7,2.8-3.7c2.4,0,2.2,3.9,6.7,3.9c2.3,0,6.2-1.2,6.2-8.2 c0-7-3.9-7.9-6.2-7.9c-4.5,0-4.3,3.7-6.7,3.7c-2.4,0-2.8-3.8-2.8-3.8V22c0-2.2-1.8-4-4-4H31.5c0,0-3.4-0.6-3.4-3 c0-2.4,3.8-2.6,3.8-7.1c0-2.3-1.3-5.9-8.3-5.9s-8,3.6-8,5.9c0,4.5,3.4,4.7,3.4,7.1c0,2.4-3.4,3-3.4,3H6c-2.2,0-4,1.8-4,4l0,7.8 c0,0-0.4,6,4.4,6c3.1,0,3.2-4.1,7.3-4.1c2,0,4,1.9,4,6c0,4.2-2,6.3-4,6.3c-4,0-4.2-4.1-7.3-4.1c-4.8,0-4.4,5.8-4.4,5.8L2,58 c0,2.2,1.8,4,4,4H19c0,0,6.3,0.4,6.3-4.4c0-3.1-4-3.6-4-7.7c0-2,2.2-4.5,6.4-4.5c4.2,0,6.6,2.5,6.6,4.5c0,4-3.9,4.6-3.9,7.7 c0,4.9,6.3,4.4,6.3,4.4H42z"/>
+  <svg width="32" height="32" x="32" y="0">
+    <ellipse class="style-badge-shadow"     rx="14" ry="15" cx="16" cy="17" />
+    <circle  class="style-badge-background" r="15"  cy="15" cx="16" />
+    <circle  class="style-badge-inside"     r="12"  cy="15" cx="16" />
+    <path    class="style-badge-icon" d="M22.7,16.1l-5.6,5.5C16.8,21.9,16.4,22,16,22c-0.4,0-0.7-0.1-1-0.4 l-5.6-5.5C8.8,15.5,8.9,15,9.8,15l3.2,0V9c0-0.6,0.5-1,1.1-1h4c0.6,0,1,0.4,1,1v6h3.2C23.1,15,23.3,15.5,22.7,16.1z"/>
+  </svg>
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/addons/addon-install-error.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/addons/addon-install-error.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/addons/addon-install-error.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/addons/addon-install-error.svg	2015-05-25 20:43:03.000000000 +0000
@@ -0,0 +1,38 @@
+<?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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="64" height="64" viewBox="0 0 64 64">
+  <defs>
+    <style>
+      .style-puzzle-piece {
+        fill: url('#gradient-linear-puzzle-piece');
+      }
+      .style-badge-shadow {
+        fill: #0d131a;
+        fill-opacity: .15;
+      }
+      .style-badge-background {
+        fill: #fff;
+      }
+      .style-badge-inside {
+        fill: #e62117;
+      }
+      .style-badge-icon {
+        fill: #fff;
+      }
+    </style>
+    <linearGradient id="gradient-linear-puzzle-piece" x1="0%" y1="0%" x2="0%" y2="100%">
+      <stop offset="0%" stop-color="#999999" stop-opacity="1"/>
+      <stop offset="100%" stop-color="#8c8c8c" stop-opacity="1"/>
+    </linearGradient>
+  </defs>
+  <path class="style-puzzle-piece" d="M42,62c2.2,0,4-1.8,4-4l0-14.2c0,0,0.4-3.7,2.8-3.7c2.4,0,2.2,3.9,6.7,3.9c2.3,0,6.2-1.2,6.2-8.2 c0-7-3.9-7.9-6.2-7.9c-4.5,0-4.3,3.7-6.7,3.7c-2.4,0-2.8-3.8-2.8-3.8V22c0-2.2-1.8-4-4-4H31.5c0,0-3.4-0.6-3.4-3 c0-2.4,3.8-2.6,3.8-7.1c0-2.3-1.3-5.9-8.3-5.9s-8,3.6-8,5.9c0,4.5,3.4,4.7,3.4,7.1c0,2.4-3.4,3-3.4,3H6c-2.2,0-4,1.8-4,4l0,7.8 c0,0-0.4,6,4.4,6c3.1,0,3.2-4.1,7.3-4.1c2,0,4,1.9,4,6c0,4.2-2,6.3-4,6.3c-4,0-4.2-4.1-7.3-4.1c-4.8,0-4.4,5.8-4.4,5.8L2,58 c0,2.2,1.8,4,4,4H19c0,0,6.3,0.4,6.3-4.4c0-3.1-4-3.6-4-7.7c0-2,2.2-4.5,6.4-4.5c4.2,0,6.6,2.5,6.6,4.5c0,4-3.9,4.6-3.9,7.7 c0,4.9,6.3,4.4,6.3,4.4H42z"/>
+  <svg width="32" height="32" x="32" y="0">
+    <ellipse class="style-badge-shadow"     rx="14" ry="15" cx="16" cy="17" />
+    <circle  class="style-badge-background" r="15"  cy="15" cx="16" />
+    <circle  class="style-badge-inside"     r="12"  cy="15" cx="16" />
+    <path    class="style-badge-icon" d="M14.9,16.2c0,0,0.1,0.8,1.1,0.8c1,0,1.1-0.8,1.1-0.8 s0.7-3.5,0.8-5.2C18,9.3,18.4,7,16,7s-2,2.4-1.9,4C14.2,12.7,14.9,16.2,14.9,16.2z M16,19c-1.1,0-2,0.9-2,2c0,1.1,0.9,2,2,2 c1.1,0,2-0.9,2-2C18,19.9,17.1,19,16,19z" />
+  </svg>
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/addons/addon-install-installed.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/addons/addon-install-installed.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/addons/addon-install-installed.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/addons/addon-install-installed.svg	2015-05-25 20:43:03.000000000 +0000
@@ -0,0 +1,38 @@
+<?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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="64" height="64" viewBox="0 0 64 64">
+  <defs>
+    <style>
+      .style-puzzle-piece {
+        fill: url('#gradient-linear-puzzle-piece');
+      }
+      .style-badge-shadow {
+        fill: #0d131a;
+        fill-opacity: .15;
+      }
+      .style-badge-background {
+        fill: #fff;
+      }
+      .style-badge-inside {
+        fill: #55cc3d;
+      }
+      .style-badge-icon {
+        fill: #fff;
+      }
+    </style>
+    <linearGradient id="gradient-linear-puzzle-piece" x1="0%" y1="0%" x2="0%" y2="100%">
+      <stop offset="0%" stop-color="#66cc52" stop-opacity="1"/>
+      <stop offset="100%" stop-color="#60bf4c" stop-opacity="1"/>
+    </linearGradient>
+  </defs>
+  <path class="style-puzzle-piece" d="M42,62c2.2,0,4-1.8,4-4l0-14.2c0,0,0.4-3.7,2.8-3.7c2.4,0,2.2,3.9,6.7,3.9c2.3,0,6.2-1.2,6.2-8.2 c0-7-3.9-7.9-6.2-7.9c-4.5,0-4.3,3.7-6.7,3.7c-2.4,0-2.8-3.8-2.8-3.8V22c0-2.2-1.8-4-4-4H31.5c0,0-3.4-0.6-3.4-3 c0-2.4,3.8-2.6,3.8-7.1c0-2.3-1.3-5.9-8.3-5.9s-8,3.6-8,5.9c0,4.5,3.4,4.7,3.4,7.1c0,2.4-3.4,3-3.4,3H6c-2.2,0-4,1.8-4,4l0,7.8 c0,0-0.4,6,4.4,6c3.1,0,3.2-4.1,7.3-4.1c2,0,4,1.9,4,6c0,4.2-2,6.3-4,6.3c-4,0-4.2-4.1-7.3-4.1c-4.8,0-4.4,5.8-4.4,5.8L2,58 c0,2.2,1.8,4,4,4H19c0,0,6.3,0.4,6.3-4.4c0-3.1-4-3.6-4-7.7c0-2,2.2-4.5,6.4-4.5c4.2,0,6.6,2.5,6.6,4.5c0,4-3.9,4.6-3.9,7.7 c0,4.9,6.3,4.4,6.3,4.4H42z"/>
+  <svg width="32" height="32" x="32" y="0">
+    <ellipse class="style-badge-shadow"     rx="14" ry="15" cx="16" cy="17" />
+    <circle  class="style-badge-background" r="15"  cy="15" cx="16" />
+    <circle  class="style-badge-inside"     r="12"  cy="15" cx="16" />
+    <path    class="style-badge-icon" d="M22.8,12.3c0,0-6.7,8.1-6.9,8.3c-0.4,0.5-1.5,0.3-1.7,0 c-0.2-0.3-5-5.8-5-5.8c-0.3-0.3-0.3-0.7,0-1l1-1c0.4-0.4,0.9,0,1.2,0.3c0.3,0.4,3.4,3.8,3.4,3.8s5.2-6.1,5.4-6.4 c0.5-0.8,1.6-0.8,1.9-0.5l0.7,0.6C23.1,11.1,23.1,12,22.8,12.3z" />
+  </svg>
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/addons/addon-install-restart.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/addons/addon-install-restart.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/addons/addon-install-restart.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/addons/addon-install-restart.svg	2015-05-25 20:43:03.000000000 +0000
@@ -0,0 +1,46 @@
+<?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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="64" height="64" viewBox="0 0 64 64">
+  <defs>
+    <style>
+      .style-puzzle-piece {
+        fill: url('#gradient-linear-puzzle-piece');
+        fill-opacity: .25;
+      }
+      .style-puzzle-piece-outline {
+        fill: none;
+        stroke-width: 2;
+        stroke: #52b33e;
+        stroke-dasharray: 4 2;
+      }
+      .style-badge-shadow {
+        fill: #0d131a;
+        fill-opacity: .15;
+      }
+      .style-badge-background {
+        fill: #fff;
+      }
+      .style-badge-inside {
+        fill: #00a1e5;
+      }
+      .style-badge-icon {
+        fill: #fff;
+      }
+    </style>
+    <linearGradient id="gradient-linear-puzzle-piece" x1="0%" y1="0%" x2="0%" y2="100%">
+      <stop offset="0%" stop-color="#66cc52" stop-opacity="1"/>
+      <stop offset="100%" stop-color="#60bf4c" stop-opacity="1"/>
+    </linearGradient>
+  </defs>
+  <path class="style-puzzle-piece" d="M42,62c2.2,0,4-1.8,4-4l0-14.2c0,0,0.4-3.7,2.8-3.7c2.4,0,2.2,3.9,6.7,3.9c2.3,0,6.2-1.2,6.2-8.2 c0-7-3.9-7.9-6.2-7.9c-4.5,0-4.3,3.7-6.7,3.7c-2.4,0-2.8-3.8-2.8-3.8V22c0-2.2-1.8-4-4-4H31.5c0,0-3.4-0.6-3.4-3 c0-2.4,3.8-2.6,3.8-7.1c0-2.3-1.3-5.9-8.3-5.9s-8,3.6-8,5.9c0,4.5,3.4,4.7,3.4,7.1c0,2.4-3.4,3-3.4,3H6c-2.2,0-4,1.8-4,4l0,7.8 c0,0-0.4,6,4.4,6c3.1,0,3.2-4.1,7.3-4.1c2,0,4,1.9,4,6c0,4.2-2,6.3-4,6.3c-4,0-4.2-4.1-7.3-4.1c-4.8,0-4.4,5.8-4.4,5.8L2,58 c0,2.2,1.8,4,4,4H19c0,0,6.3,0.4,6.3-4.4c0-3.1-4-3.6-4-7.7c0-2,2.2-4.5,6.4-4.5c4.2,0,6.6,2.5,6.6,4.5c0,4-3.9,4.6-3.9,7.7 c0,4.9,6.3,4.4,6.3,4.4H42z"/>
+  <path class="style-puzzle-piece-outline" d="M23.6,3c6.3,0,7.3,3,7.3,4.9c0,2.2-1,3.1-2,4c-0.8,0.8-1.8,1.6-1.8,3.1c0,2.6,2.7,3.7,4.3,4l0.1,0h0.1H42 c1.7,0,3,1.4,3,3v5.8v0l0,0c0.2,1.7,1.2,4.7,3.8,4.7c1.5,0,2.3-0.9,3-1.8c0.8-1,1.6-1.9,3.7-1.9c3.5,0,5.2,2.2,5.2,6.9 c0,6.2-3.2,7.2-5.2,7.2c-2.1,0-2.9-1-3.7-2c-0.7-0.9-1.5-1.9-3-1.9c-2.6,0-3.6,2.9-3.8,4.6l0,0l0,0L45,58c0,1.6-1.3,3-3,3h-5.2l0,0 l0,0c0,0-0.1,0-0.3,0c-4.5,0-4.9-2.4-4.9-3.4c0-1,0.5-1.6,1.5-2.6c1.1-1.1,2.4-2.5,2.4-5.1c0-3.3-3.9-5.5-7.6-5.5 c-4.6,0-7.4,2.8-7.4,5.5c0,2.6,1.4,4,2.5,5.1c1,1,1.5,1.6,1.5,2.6c0,3.1-3.4,3.4-4.9,3.4c-0.2,0-0.3,0-0.3,0l0,0h0H6 c-1.6,0-3-1.3-3-3l0-12.2l0,0l0,0c0,0-0.1-2.5,1.1-3.9c0.6-0.6,1.3-0.9,2.3-0.9c0.9,0,1.5,0.5,2.3,1.5c1,1.2,2.3,2.6,4.9,2.6 c3.3,0,5-3.6,5-7.3c0-3.4-1.6-7-5-7c-2.6,0-3.9,1.4-4.9,2.6c-0.9,1-1.4,1.5-2.3,1.5c-1,0-1.7-0.3-2.3-0.9C2.8,32.6,3,29.9,3,29.9 l0,0l0,0L3,22c0-1.7,1.3-3,3-3h9.7h0.1l0.1,0c1.6-0.3,4.3-1.4,4.3-4c0-1.4-0.9-2.3-1.6-3.1c-0.9-1-1.8-1.9-1.8-4.1 C16.6,4.6,18.9,3,23.6,3"/>
+  <svg width="32" height="32" x="32" y="0">
+    <ellipse class="style-badge-shadow"     rx="14" ry="15" cx="16" cy="17" />
+    <circle  class="style-badge-background" r="15"  cy="15" cx="16" />
+    <circle  class="style-badge-inside"     r="12"  cy="15" cx="16" />
+    <path    class="style-badge-icon" d="M21,15h-6l2.4-2.4c-0.6-0.4-1.2-0.6-1.9-0.6c-2,0-3.5,1.6-3.5,3.5 c0,2,1.6,3.5,3.5,3.5c1,0,2-0.5,2.6-1.2l1.7,1c-1,1.3-2.6,2.1-4.3,2.1c-3,0-5.5-2.5-5.5-5.5c0-3,2.5-5.5,5.5-5.5 c1.3,0,2.4,0.4,3.3,1.2L21,9V15z"/>
+  </svg>
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/addons/addon-install-warning.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/addons/addon-install-warning.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/addons/addon-install-warning.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/addons/addon-install-warning.svg	2015-05-25 20:43:03.000000000 +0000
@@ -0,0 +1,38 @@
+<?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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="64" height="64" viewBox="0 0 64 64">
+  <defs>
+    <style>
+      .style-puzzle-piece {
+        fill: url('#gradient-linear-puzzle-piece');
+      }
+      .style-badge-shadow {
+        fill: #0d131a;
+        fill-opacity: .15;
+      }
+      .style-badge-background {
+        fill: #fff;
+      }
+      .style-badge-inside {
+        fill: #ffcd02;
+      }
+      .style-badge-icon {
+        fill: #fff;
+      }
+    </style>
+    <linearGradient id="gradient-linear-puzzle-piece" x1="0%" y1="0%" x2="0%" y2="100%">
+      <stop offset="0%" stop-color="#999999" stop-opacity="1"/>
+      <stop offset="100%" stop-color="#8c8c8c" stop-opacity="1"/>
+    </linearGradient>
+  </defs>
+  <path class="style-puzzle-piece" d="M42,62c2.2,0,4-1.8,4-4l0-14.2c0,0,0.4-3.7,2.8-3.7c2.4,0,2.2,3.9,6.7,3.9c2.3,0,6.2-1.2,6.2-8.2 c0-7-3.9-7.9-6.2-7.9c-4.5,0-4.3,3.7-6.7,3.7c-2.4,0-2.8-3.8-2.8-3.8V22c0-2.2-1.8-4-4-4H31.5c0,0-3.4-0.6-3.4-3 c0-2.4,3.8-2.6,3.8-7.1c0-2.3-1.3-5.9-8.3-5.9s-8,3.6-8,5.9c0,4.5,3.4,4.7,3.4,7.1c0,2.4-3.4,3-3.4,3H6c-2.2,0-4,1.8-4,4l0,7.8 c0,0-0.4,6,4.4,6c3.1,0,3.2-4.1,7.3-4.1c2,0,4,1.9,4,6c0,4.2-2,6.3-4,6.3c-4,0-4.2-4.1-7.3-4.1c-4.8,0-4.4,5.8-4.4,5.8L2,58 c0,2.2,1.8,4,4,4H19c0,0,6.3,0.4,6.3-4.4c0-3.1-4-3.6-4-7.7c0-2,2.2-4.5,6.4-4.5c4.2,0,6.6,2.5,6.6,4.5c0,4-3.9,4.6-3.9,7.7 c0,4.9,6.3,4.4,6.3,4.4H42z"/>
+  <svg width="32" height="32" x="32" y="0">
+    <path class="style-badge-shadow" d="M29.5,25.8L18.7,4c-0.6-1.2-1.6-2-2.7-2c-1.1,0-2.1,0.7-2.7,2L2.5,25.8 c-0.6,1.2-0.6,2.5-0.1,3.6C2.9,30.4,4,31,5.2,31h21.6c1.2,0,2.3-0.6,2.8-1.6C30.2,28.4,30.1,27.1,29.5,25.8z" />
+    <path class="style-badge-background" d="M16,0c-1.7,0-3.2,1-4.1,2.7L1.7,21.9c-0.9,1.7-0.9,3.4,0,4.8C2.5,28.2,4.1,29,5.9,29H26 c1.9,0,3.4-0.8,4.3-2.2c0.9-1.4,0.8-3.2,0-4.8L20.1,2.7C19.2,1,17.7,0,16,0L16,0z" />
+    <path class="style-badge-inside" d="M5.9,26c-1.7,0-2.4-1.2-1.6-2.7L14.6,4.1c0.8-1.5,2.1-1.5,2.8,0l10.3,19.3 c0.8,1.5,0.1,2.7-1.6,2.7H5.9z" />
+    <path class="style-badge-icon" d="M14.9,17.6c0,0,0.1,0.7,1.1,0.7c1,0,1.1-0.7,1.1-0.7 s0.7-2.9,0.8-4.2c0.1-1.3,0.5-3.2-1.9-3.2c-2.4,0-2,1.9-1.9,3.2C14.2,14.8,14.9,17.6,14.9,17.6z M16,20c-1.1,0-2,0.9-2,2 c0,1.1,0.9,2,2,2c1.1,0,2-0.9,2-2C18,20.9,17.1,20,16,20z" />
+  </svg>
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/customizableui/panelUIOverlay.inc.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/customizableui/panelUIOverlay.inc.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/customizableui/panelUIOverlay.inc.css	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/customizableui/panelUIOverlay.inc.css	2015-05-25 20:43:03.000000000 +0000
@@ -246,6 +246,11 @@
   max-width: @standaloneSubviewWidth@;
 }
 
+/* Bug 1164419 - increase Pocket panel size to accomidate wider Russian text. */
+panelmultiview[mainViewId=PanelUI-pocketView] > .panel-viewcontainer > .panel-viewstack > .panel-mainview:not([panelid="PanelUI-popup"]) {
+  max-width: 33em; /* standaloneSubviewWidth + 3 */
+}
+
 panelview:not([mainview]) .toolbarbutton-text,
 .cui-widget-panel toolbarbutton > .toolbarbutton-text {
   text-align: start;
@@ -447,7 +452,8 @@
 /* above we treat the container as the icon for the margins, that is so the
 /* badge itself is positioned correctly. Here we make sure that the icon itself
 /* has the minum size we want, but no padding/margin. */
-.panelUI-grid .toolbarbutton-1 > .toolbarbutton-badge-container > .toolbarbutton-icon {
+.panelUI-grid .toolbarbutton-1 > .toolbarbutton-badge-container > .toolbarbutton-icon,
+.customization-palette .toolbarbutton-1 > .toolbarbutton-badge-container > .toolbarbutton-icon {
   min-width: 32px;
   min-height: 32px;
   margin: 0;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devedition/search.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devedition/search.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devedition/search.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devedition/search.svg	2015-05-25 20:43:04.000000000 +0000
@@ -2,40 +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/. -->
-<svg 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"
-     width="16"
-     height="16"
-     xml:space="preserve">
-<style>
-  use:not(:target) {
-    display: none;
-  }
-
-  use {
-    fill: #797C80;
-  }
-
-  use[id*="-inverted"] {
-    fill: #B6BABF;
-  }
-
-  use[id*="-mac"] {
-    transform: translate(16px) scaleX(-1);
-  }
-</style>
-<defs style="display: none;">
-  <path id="search" fill-rule="evenodd" clip-rule="evenodd" d="M9.356,1.178c-3.014,0-5.458,2.45-5.458,5.472c0,1.086,0.32,2.096,0.864,2.947
-    l-3.279,3.287c-0.396,0.397-0.396,1.041,0,1.438l0.202,0.202c0.396,0.397,1.039,0.397,1.435,0l3.275-3.283
-    c0.854,0.554,1.869,0.88,2.962,0.88c3.014,0,5.458-2.45,5.458-5.471C14.814,3.627,12.371,1.178,9.356,1.178z M9.356,10.001
-    c-1.847,0-3.344-1.501-3.344-3.352c0-1.851,1.497-3.352,3.344-3.352c1.846,0,3.344,1.501,3.344,3.352
-    C12.7,8.501,11.203,10.001,9.356,10.001z"/>
-</defs>
-<use id="search-icon"               xlink:href="#search"/>
-<use id="search-icon-inverted"      xlink:href="#search"/>
-<use id="search-icon-mac"           xlink:href="#search"/>
-<use id="search-icon-mac-inverted"  xlink:href="#search"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" width="16" height="16">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: #797c80;
+    }
+    use[id*="-inverted"] {
+      fill: #b6babf;
+    }
+    use[id*="-mac"] {
+      transform: translate(16px) scaleX(-1);
+    }
+  </style>
+  <defs>
+    <path id="search" fill-rule="evenodd" d="M9.356,1.178c-3.014,0-5.458,2.45-5.458,5.472c0,1.086,0.32,2.096,0.864,2.947 l-3.279,3.287c-0.396,0.397-0.396,1.041,0,1.438l0.202,0.202c0.396,0.397,1.039,0.397,1.435,0l3.275-3.283 c0.854,0.554,1.869,0.88,2.962,0.88c3.014,0,5.458-2.45,5.458-5.471C14.814,3.627,12.371,1.178,9.356,1.178z M9.356,10.001 c-1.847,0-3.344-1.501-3.344-3.352c0-1.851,1.497-3.352,3.344-3.352c1.846,0,3.344,1.501,3.344,3.352 C12.7,8.501,11.203,10.001,9.356,10.001z"/>
+  </defs>
+  <use id="search-icon" xlink:href="#search"/>
+  <use id="search-icon-inverted" xlink:href="#search"/>
+  <use id="search-icon-mac" xlink:href="#search"/>
+  <use id="search-icon-mac-inverted" xlink:href="#search"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devedition/urlbar-history-dropmarker.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devedition/urlbar-history-dropmarker.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devedition/urlbar-history-dropmarker.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devedition/urlbar-history-dropmarker.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,19 +1,22 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="33" height="14" viewBox="0 0 33 14" enable-background="new 0 0 33 14">
-  <defs style="display: none;">
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="33" height="14" viewBox="0 0 33 14">
+  <defs>
     <polygon points="0,0 5.5,7 11,0" id="dropmarker-shape"/>
   </defs>
   <style>
     use {
-      fill: #B6BABF;
+      fill: #b6babf;
     }
     .hover {
-      fill: #61BDEB;
+      fill: #61bdeb;
     }
     .active {
-      fill: #39ACE6;
+      fill: #39ace6;
     }
   </style>
-  <use xlink:href="#dropmarker-shape" style="transform: translate(0, 4px)"></use>
-  <use xlink:href="#dropmarker-shape" style="transform: translate(11px, 4px)" class="hover"></use>
-  <use xlink:href="#dropmarker-shape" style="transform: translate(22px, 4px)" class="active"></use>
+  <use xlink:href="#dropmarker-shape" style="transform: translate(0, 4px)"/>
+  <use xlink:href="#dropmarker-shape" style="transform: translate(11px, 4px)" class="hover"/>
+  <use xlink:href="#dropmarker-shape" style="transform: translate(22px, 4px)" class="active"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/app-manager/images/add.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/app-manager/images/add.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/app-manager/images/add.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/app-manager/images/add.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,12 +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/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="64px" height="64px" viewBox="0 0 64 64">
-  <path fill="#00B2F7" d="M32.336,3.894c-15.74,0-28.5,12.76-28.5,28.5s12.76,28.5,28.5,28.5s28.5-12.76,28.5-28.5
-    S48.076,3.894,32.336,3.894z M44.86,36.966h-7.823v7.62c0,2.582-2.12,4.702-4.702,4.702c-2.584,0-4.704-2.12-4.704-4.702v-7.62
-    h-7.817c-2.52,0-4.572-2.056-4.572-4.572s2.053-4.572,4.572-4.572h7.817v-7.62c0-2.582,2.12-4.702,4.704-4.702
-    c2.582,0,4.702,2.12,4.702,4.702v7.62h7.823c2.514,0,4.57,2.056,4.57,4.572S47.374,36.966,44.86,36.966z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="64px" height="64px" viewBox="0 0 64 64">
+  <path fill="#00b2f7" d="M32.336,3.894c-15.74,0-28.5,12.76-28.5,28.5s12.76,28.5,28.5,28.5s28.5-12.76,28.5-28.5 S48.076,3.894,32.336,3.894z M44.86,36.966h-7.823v7.62c0,2.582-2.12,4.702-4.702,4.702c-2.584,0-4.704-2.12-4.704-4.702v-7.62 h-7.817c-2.52,0-4.572-2.056-4.572-4.572s2.053-4.572,4.572-4.572h7.817v-7.62c0-2.582,2.12-4.702,4.704-4.702 c2.582,0,4.702,2.12,4.702,4.702v7.62h7.823c2.514,0,4.57,2.056,4.57,4.572S47.374,36.966,44.86,36.966z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/app-manager/images/error.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/app-manager/images/error.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/app-manager/images/error.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/app-manager/images/error.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,13 +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/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="64px" height="64px" viewBox="0 0 64 64">
-  <path fill="#E25026" d="M32,4.894c-15.74,0-28.5,12.76-28.5,28.5s12.76,28.5,28.5,28.5s28.5-12.76,28.5-28.5S47.74,4.894,32,4.894
-    z M46.903,48.674c-1.817,1.817-4.691,1.76-6.449,0.002l-8.327-8.327l-8.151,8.151c-1.877,1.877-4.87,1.814-6.685,0
-    c-1.877-1.877-1.879-4.811-0.002-6.687l8.151-8.151l-8.327-8.327c-1.76-1.76-1.817-4.634,0-6.451c1.76-1.76,4.691-1.76,6.451,0
-    l8.327,8.327l8.151-8.151c1.877-1.877,4.811-1.874,6.687,0.002c1.814,1.814,1.877,4.808,0,6.685l-8.151,8.151l8.327,8.327
-    C48.662,43.982,48.662,46.914,46.903,48.674z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="64px" height="64px" viewBox="0 0 64 64">
+  <path fill="#e25026" d="M32,4.894c-15.74,0-28.5,12.76-28.5,28.5s12.76,28.5,28.5,28.5s28.5-12.76,28.5-28.5S47.74,4.894,32,4.894 z M46.903,48.674c-1.817,1.817-4.691,1.76-6.449,0.002l-8.327-8.327l-8.151,8.151c-1.877,1.877-4.87,1.814-6.685,0 c-1.877-1.877-1.879-4.811-0.002-6.687l8.151-8.151l-8.327-8.327c-1.76-1.76-1.817-4.634,0-6.451c1.76-1.76,4.691-1.76,6.451,0 l8.327,8.327l8.151-8.151c1.877-1.877,4.811-1.874,6.687,0.002c1.814,1.814,1.877,4.808,0,6.685l-8.151,8.151l8.327,8.327 C48.662,43.982,48.662,46.914,46.903,48.674z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/app-manager/images/index-icons.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/app-manager/images/index-icons.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/app-manager/images/index-icons.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/app-manager/images/index-icons.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,80 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.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"
-	 width="160px" height="240px" viewBox="0 0 160 240" enable-background="new 0 0 160 240" xml:space="preserve">
-<rect y="40" display="none" fill="#22272D" width="84" height="160"/>
-<rect x="80.75" y="40" display="none" fill="#194866" width="84" height="160"/>
-<path fill="#414042" d="M40,21.149c-2.044,0.001-6.042,6.745-7.404,13.436L28,39.181v12l3.204,0l4.467-4.466
-	c0.457,0.478,0.96,0.88,1.5,1.199h5.652c0.543-0.318,1.05-0.719,1.507-1.199l4.466,4.466l3.204,0v-12l-4.597-4.596
-	C46.042,27.895,42.044,21.149,40,21.149z M40.005,28.185c0.712,0,1.965,2,2.746,4.392c-0.846-0.157-1.747-0.244-2.686-0.244
-	c-0.987,0-1.933,0.099-2.815,0.271C38.03,30.199,39.289,28.185,40.005,28.185z"/>
-<path fill="#414042" d="M41.436,50.98c0,1.41-1.094,2.553-1.459,2.553c-0.364,0-1.459-1.144-1.459-2.553
-	c0-0.546,0.099-1.051,0.266-1.466h-1.69c-0.198,0.731-0.31,1.549-0.31,2.412c0,3.108,2.411,5.627,3.215,5.627
-	s3.216-2.519,3.215-5.626c0-0.864-0.112-1.681-0.31-2.413l-1.734,0C41.337,49.929,41.436,50.434,41.436,50.98z"/>
-<g>
-	<g>
-		<path fill="#B2B5B9" d="M40,21.149c-2.044,0.001-6.042,6.745-7.404,13.436L28,39.181v12l3.204,0l4.467-4.466
-			c0.457,0.478,0.96,0.88,1.5,1.199h5.652c0.543-0.318,1.05-0.719,1.507-1.199l4.466,4.466l3.204,0v-12l-4.597-4.596
-			C46.042,27.895,42.044,21.149,40,21.149z M40.005,28.185c0.712,0,1.965,2,2.746,4.392c-0.846-0.157-1.747-0.244-2.686-0.244
-			c-0.987,0-1.933,0.099-2.815,0.271C38.03,30.199,39.289,28.185,40.005,28.185z"/>
-		<path fill="#B2B5B9" d="M41.436,50.98c0,1.41-1.094,2.553-1.459,2.553c-0.364,0-1.459-1.144-1.459-2.553
-			c0-0.546,0.099-1.051,0.266-1.466h-1.69c-0.198,0.731-0.31,1.549-0.31,2.412c0,3.108,2.411,5.627,3.215,5.627
-			s3.216-2.519,3.215-5.626c0-0.864-0.112-1.681-0.31-2.413l-1.734,0C41.337,49.929,41.436,50.434,41.436,50.98z"/>
-	</g>
-</g>
-<g>
-	<path fill="#DCE8F3" d="M120,21.149c-2.044,0.001-6.042,6.745-7.404,13.436L108,39.181v12l3.204,0l4.467-4.466
-		c0.457,0.478,0.96,0.88,1.5,1.199h5.652c0.543-0.318,1.05-0.719,1.507-1.199l4.467,4.466l3.204,0v-12l-4.597-4.596
-		C126.042,27.895,122.044,21.149,120,21.149z M120.005,28.185c0.712,0,1.965,2,2.746,4.392c-0.846-0.157-1.747-0.244-2.686-0.244
-		c-0.987,0-1.933,0.099-2.815,0.271C118.03,30.199,119.289,28.185,120.005,28.185z"/>
-	<path fill="#DCE8F3" d="M121.436,50.98c0,1.41-1.094,2.553-1.459,2.553c-0.364,0-1.459-1.144-1.459-2.553
-		c0-0.546,0.099-1.051,0.266-1.466h-1.69c-0.198,0.731-0.31,1.549-0.31,2.412c0,3.108,2.411,5.627,3.215,5.627
-		s3.216-2.519,3.215-5.626c0-0.864-0.112-1.681-0.31-2.413l-1.734,0C121.337,49.929,121.436,50.434,121.436,50.98z"/>
-</g>
-<g>
-	<g>
-		<path fill="#B2B5B9" d="M52.5,136.017c0,2.279-1.888,4.167-4.167,4.167H31.667c-2.279,0-4.167-1.888-4.167-4.167v-33.333
-			c0-2.279,1.888-4.167,4.167-4.167h16.667c2.279,0,4.167,1.888,4.167,4.167V136.017z M49.375,107.892
-			c0-0.554-0.488-1.042-1.042-1.042H31.667c-0.553,0-1.042,0.488-1.042,1.042v22.917c0,0.554,0.488,1.042,1.042,1.042h16.667
-			c0.553,0,1.042-0.488,1.042-1.042V107.892z M42.604,102.684h-5.208c-0.293,0-0.521,0.228-0.521,0.521
-			c0,0.293,0.228,0.521,0.521,0.521h5.208c0.293,0,0.521-0.228,0.521-0.521C43.125,102.912,42.897,102.684,42.604,102.684z
-			 M40,133.413c-1.432,0-2.604,1.171-2.604,2.604c0,1.433,1.172,2.604,2.604,2.604s2.604-1.171,2.604-2.604
-			C42.604,134.585,41.432,133.413,40,133.413z"/>
-	</g>
-</g>
-<g>
-	<path fill="#DCE8F3" d="M132.5,136.017c0,2.279-1.888,4.167-4.167,4.167h-16.667c-2.279,0-4.167-1.888-4.167-4.167v-33.333
-		c0-2.279,1.888-4.167,4.167-4.167h16.667c2.279,0,4.167,1.888,4.167,4.167V136.017z M129.375,107.892
-		c0-0.554-0.488-1.042-1.042-1.042h-16.667c-0.553,0-1.042,0.488-1.042,1.042v22.917c0,0.554,0.488,1.042,1.042,1.042h16.667
-		c0.553,0,1.042-0.488,1.042-1.042V107.892z M122.604,102.684h-5.208c-0.293,0-0.521,0.228-0.521,0.521
-		c0,0.293,0.228,0.521,0.521,0.521h5.208c0.293,0,0.521-0.228,0.521-0.521C123.125,102.912,122.897,102.684,122.604,102.684z
-		 M120,133.413c-1.432,0-2.604,1.171-2.604,2.604c0,1.433,1.172,2.604,2.604,2.604s2.604-1.171,2.604-2.604
-		C122.604,134.585,121.432,133.413,120,133.413z"/>
-</g>
-<g>
-	<path fill="#B2B5B9" d="M40,185.388c8.121,0,14.729,6.607,14.729,14.729S48.121,214.845,40,214.845s-14.729-6.607-14.729-14.729
-		S31.879,185.388,40,185.388 M40,182.75c-9.591,0-17.367,7.775-17.367,17.367c0,9.591,7.775,17.367,17.367,17.367
-		s17.367-7.775,17.367-17.367C57.367,190.525,49.591,182.75,40,182.75L40,182.75z"/>
-	<g>
-		<path fill="#B2B5B9" d="M39.565,204.504c-0.688,0-1.196-0.508-1.286-1.195l-0.299-2.57c-0.12-0.808,0.359-1.405,1.166-1.495
-			c2.81-0.269,4.364-1.345,4.364-3.229v-0.06c0-1.674-1.285-2.84-3.438-2.84c-1.584,0-2.87,0.568-4.065,1.645
-			c-0.299,0.239-0.688,0.418-1.106,0.418c-0.926,0-1.674-0.747-1.674-1.644c0-0.448,0.18-0.927,0.598-1.285
-			c1.584-1.495,3.587-2.481,6.337-2.481c4.185,0,7.024,2.331,7.024,6.068v0.06c0,3.767-2.72,5.47-6.038,6.038l-0.12,1.375
-			c-0.12,0.657-0.598,1.195-1.285,1.195H39.565z M39.565,206.687c1.226,0,2.122,0.896,2.122,2.062v0.299
-			c0,1.166-0.896,2.062-2.122,2.062s-2.123-0.896-2.123-2.062v-0.299C37.442,207.583,38.339,206.687,39.565,206.687z"/>
-	</g>
-</g>
-<g>
-	<path fill="#DCE8F3" d="M120,185.388c8.121,0,14.729,6.607,14.729,14.729s-6.607,14.729-14.729,14.729s-14.729-6.607-14.729-14.729
-		S111.879,185.388,120,185.388 M120,182.75c-9.591,0-17.367,7.775-17.367,17.367c0,9.591,7.775,17.367,17.367,17.367
-		s17.367-7.775,17.367-17.367C137.367,190.525,129.591,182.75,120,182.75L120,182.75z"/>
-	<g>
-		<path fill="#DCE8F3" d="M119.564,204.504c-0.688,0-1.195-0.508-1.285-1.195l-0.299-2.57c-0.12-0.808,0.358-1.405,1.166-1.495
-			c2.81-0.269,4.363-1.345,4.363-3.229v-0.06c0-1.674-1.285-2.84-3.438-2.84c-1.584,0-2.869,0.568-4.064,1.645
-			c-0.3,0.239-0.688,0.418-1.106,0.418c-0.927,0-1.674-0.747-1.674-1.644c0-0.448,0.18-0.927,0.598-1.285
-			c1.584-1.495,3.587-2.481,6.337-2.481c4.186,0,7.024,2.331,7.024,6.068v0.06c0,3.767-2.72,5.47-6.038,6.038l-0.119,1.375
-			c-0.12,0.657-0.598,1.195-1.285,1.195H119.564z M119.564,206.687c1.226,0,2.122,0.896,2.122,2.062v0.299
-			c0,1.166-0.896,2.062-2.122,2.062s-2.122-0.896-2.122-2.062v-0.299C117.442,207.583,118.339,206.687,119.564,206.687z"/>
-	</g>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="160px" height="240px" viewBox="0 0 160 240">
+  <path fill="#414042" d="M40,21.149c-2.044,0.001-6.042,6.745-7.404,13.436L28,39.181v12l3.204,0l4.467-4.466 c0.457,0.478,0.96,0.88,1.5,1.199h5.652c0.543-0.318,1.05-0.719,1.507-1.199l4.466,4.466l3.204,0v-12l-4.597-4.596 C46.042,27.895,42.044,21.149,40,21.149z M40.005,28.185c0.712,0,1.965,2,2.746,4.392c-0.846-0.157-1.747-0.244-2.686-0.244 c-0.987,0-1.933,0.099-2.815,0.271C38.03,30.199,39.289,28.185,40.005,28.185z"/>
+  <path fill="#414042" d="M41.436,50.98c0,1.41-1.094,2.553-1.459,2.553c-0.364,0-1.459-1.144-1.459-2.553 c0-0.546,0.099-1.051,0.266-1.466h-1.69c-0.198,0.731-0.31,1.549-0.31,2.412c0,3.108,2.411,5.627,3.215,5.627 s3.216-2.519,3.215-5.626c0-0.864-0.112-1.681-0.31-2.413l-1.734,0C41.337,49.929,41.436,50.434,41.436,50.98z"/>
+  <path fill="#b2b5b9" d="M40,21.149c-2.044,0.001-6.042,6.745-7.404,13.436L28,39.181v12l3.204,0l4.467-4.466 c0.457,0.478,0.96,0.88,1.5,1.199h5.652c0.543-0.318,1.05-0.719,1.507-1.199l4.466,4.466l3.204,0v-12l-4.597-4.596 C46.042,27.895,42.044,21.149,40,21.149z M40.005,28.185c0.712,0,1.965,2,2.746,4.392c-0.846-0.157-1.747-0.244-2.686-0.244 c-0.987,0-1.933,0.099-2.815,0.271C38.03,30.199,39.289,28.185,40.005,28.185z"/>
+  <path fill="#b2b5b9" d="M41.436,50.98c0,1.41-1.094,2.553-1.459,2.553c-0.364,0-1.459-1.144-1.459-2.553 c0-0.546,0.099-1.051,0.266-1.466h-1.69c-0.198,0.731-0.31,1.549-0.31,2.412c0,3.108,2.411,5.627,3.215,5.627 s3.216-2.519,3.215-5.626c0-0.864-0.112-1.681-0.31-2.413l-1.734,0C41.337,49.929,41.436,50.434,41.436,50.98z"/>
+  <path fill="#dce8f3" d="M120,21.149c-2.044,0.001-6.042,6.745-7.404,13.436L108,39.181v12l3.204,0l4.467-4.466 c0.457,0.478,0.96,0.88,1.5,1.199h5.652c0.543-0.318,1.05-0.719,1.507-1.199l4.467,4.466l3.204,0v-12l-4.597-4.596 C126.042,27.895,122.044,21.149,120,21.149z M120.005,28.185c0.712,0,1.965,2,2.746,4.392c-0.846-0.157-1.747-0.244-2.686-0.244 c-0.987,0-1.933,0.099-2.815,0.271C118.03,30.199,119.289,28.185,120.005,28.185z"/>
+  <path fill="#dce8f3" d="M121.436,50.98c0,1.41-1.094,2.553-1.459,2.553c-0.364,0-1.459-1.144-1.459-2.553 c0-0.546,0.099-1.051,0.266-1.466h-1.69c-0.198,0.731-0.31,1.549-0.31,2.412c0,3.108,2.411,5.627,3.215,5.627 s3.216-2.519,3.215-5.626c0-0.864-0.112-1.681-0.31-2.413l-1.734,0C121.337,49.929,121.436,50.434,121.436,50.98z"/>
+  <path fill="#b2b5b9" d="M52.5,136.017c0,2.279-1.888,4.167-4.167,4.167H31.667c-2.279,0-4.167-1.888-4.167-4.167v-33.333 c0-2.279,1.888-4.167,4.167-4.167h16.667c2.279,0,4.167,1.888,4.167,4.167V136.017z M49.375,107.892 c0-0.554-0.488-1.042-1.042-1.042H31.667c-0.553,0-1.042,0.488-1.042,1.042v22.917c0,0.554,0.488,1.042,1.042,1.042h16.667 c0.553,0,1.042-0.488,1.042-1.042V107.892z M42.604,102.684h-5.208c-0.293,0-0.521,0.228-0.521,0.521 c0,0.293,0.228,0.521,0.521,0.521h5.208c0.293,0,0.521-0.228,0.521-0.521C43.125,102.912,42.897,102.684,42.604,102.684z M40,133.413c-1.432,0-2.604,1.171-2.604,2.604c0,1.433,1.172,2.604,2.604,2.604s2.604-1.171,2.604-2.604 C42.604,134.585,41.432,133.413,40,133.413z"/>
+  <path fill="#dce8f3" d="M132.5,136.017c0,2.279-1.888,4.167-4.167,4.167h-16.667c-2.279,0-4.167-1.888-4.167-4.167v-33.333 c0-2.279,1.888-4.167,4.167-4.167h16.667c2.279,0,4.167,1.888,4.167,4.167V136.017z M129.375,107.892 c0-0.554-0.488-1.042-1.042-1.042h-16.667c-0.553,0-1.042,0.488-1.042,1.042v22.917c0,0.554,0.488,1.042,1.042,1.042h16.667 c0.553,0,1.042-0.488,1.042-1.042V107.892z M122.604,102.684h-5.208c-0.293,0-0.521,0.228-0.521,0.521 c0,0.293,0.228,0.521,0.521,0.521h5.208c0.293,0,0.521-0.228,0.521-0.521C123.125,102.912,122.897,102.684,122.604,102.684z M120,133.413c-1.432,0-2.604,1.171-2.604,2.604c0,1.433,1.172,2.604,2.604,2.604s2.604-1.171,2.604-2.604 C122.604,134.585,121.432,133.413,120,133.413z"/>
+  <path fill="#b2b5b9" d="M40,185.388c8.121,0,14.729,6.607,14.729,14.729S48.121,214.845,40,214.845s-14.729-6.607-14.729-14.729 S31.879,185.388,40,185.388 M40,182.75c-9.591,0-17.367,7.775-17.367,17.367c0,9.591,7.775,17.367,17.367,17.367 s17.367-7.775,17.367-17.367C57.367,190.525,49.591,182.75,40,182.75L40,182.75z"/>
+  <path fill="#b2b5b9" d="M39.565,204.504c-0.688,0-1.196-0.508-1.286-1.195l-0.299-2.57c-0.12-0.808,0.359-1.405,1.166-1.495 c2.81-0.269,4.364-1.345,4.364-3.229v-0.06c0-1.674-1.285-2.84-3.438-2.84c-1.584,0-2.87,0.568-4.065,1.645 c-0.299,0.239-0.688,0.418-1.106,0.418c-0.926,0-1.674-0.747-1.674-1.644c0-0.448,0.18-0.927,0.598-1.285 c1.584-1.495,3.587-2.481,6.337-2.481c4.185,0,7.024,2.331,7.024,6.068v0.06c0,3.767-2.72,5.47-6.038,6.038l-0.12,1.375 c-0.12,0.657-0.598,1.195-1.285,1.195H39.565z M39.565,206.687c1.226,0,2.122,0.896,2.122,2.062v0.299 c0,1.166-0.896,2.062-2.122,2.062s-2.123-0.896-2.123-2.062v-0.299C37.442,207.583,38.339,206.687,39.565,206.687z"/>
+  <path fill="#dce8f3" d="M120,185.388c8.121,0,14.729,6.607,14.729,14.729s-6.607,14.729-14.729,14.729s-14.729-6.607-14.729-14.729 S111.879,185.388,120,185.388 M120,182.75c-9.591,0-17.367,7.775-17.367,17.367c0,9.591,7.775,17.367,17.367,17.367 s17.367-7.775,17.367-17.367C137.367,190.525,129.591,182.75,120,182.75L120,182.75z"/>
+  <path fill="#dce8f3" d="M119.564,204.504c-0.688,0-1.195-0.508-1.285-1.195l-0.299-2.57c-0.12-0.808,0.358-1.405,1.166-1.495 c2.81-0.269,4.363-1.345,4.363-3.229v-0.06c0-1.674-1.285-2.84-3.438-2.84c-1.584,0-2.869,0.568-4.064,1.645 c-0.3,0.239-0.688,0.418-1.106,0.418c-0.927,0-1.674-0.747-1.674-1.644c0-0.448,0.18-0.927,0.598-1.285 c1.584-1.495,3.587-2.481,6.337-2.481c4.186,0,7.024,2.331,7.024,6.068v0.06c0,3.767-2.72,5.47-6.038,6.038l-0.119,1.375 c-0.12,0.657-0.598,1.195-1.285,1.195H119.564z M119.564,206.687c1.226,0,2.122,0.896,2.122,2.062v0.299 c0,1.166-0.896,2.062-2.122,2.062s-2.122-0.896-2.122-2.062v-0.299C117.442,207.583,118.339,206.687,119.564,206.687z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/app-manager/images/plus.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/app-manager/images/plus.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/app-manager/images/plus.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/app-manager/images/plus.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,12 +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/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="64px" height="64px" viewBox="0 0 64 64">
-  <path fill="#ABABAB" d="M32.336,3.894c-15.74,0-28.5,12.76-28.5,28.5s12.76,28.5,28.5,28.5s28.5-12.76,28.5-28.5
-    S48.076,3.894,32.336,3.894z M44.86,36.966h-7.823v7.62c0,2.582-2.12,4.702-4.702,4.702c-2.584,0-4.704-2.12-4.704-4.702v-7.62
-    h-7.817c-2.52,0-4.572-2.056-4.572-4.572s2.053-4.572,4.572-4.572h7.817v-7.62c0-2.582,2.12-4.702,4.704-4.702
-    c2.582,0,4.702,2.12,4.702,4.702v7.62h7.823c2.514,0,4.57,2.056,4.57,4.572S47.374,36.966,44.86,36.966z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="64px" height="64px" viewBox="0 0 64 64">
+  <path fill="#ababab" d="M32.336,3.894c-15.74,0-28.5,12.76-28.5,28.5s12.76,28.5,28.5,28.5s28.5-12.76,28.5-28.5 S48.076,3.894,32.336,3.894z M44.86,36.966h-7.823v7.62c0,2.582-2.12,4.702-4.702,4.702c-2.584,0-4.704-2.12-4.704-4.702v-7.62 h-7.817c-2.52,0-4.572-2.056-4.572-4.572s2.053-4.572,4.572-4.572h7.817v-7.62c0-2.582,2.12-4.702,4.704-4.702 c2.582,0,4.702,2.12,4.702,4.702v7.62h7.823c2.514,0,4.57,2.056,4.57,4.572S47.374,36.966,44.86,36.966z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/app-manager/images/remove.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/app-manager/images/remove.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/app-manager/images/remove.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/app-manager/images/remove.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="64px" height="64px" viewBox="0 0 64 64">
-<path d="m 12.183457,12.241457 c -11.129861,11.12986 -11.129861,29.175226 0,40.305086 11.12986,11.129861 29.175226,11.129861 40.305086,0 11.129861,-11.12986 11.129861,-29.175226 0,-40.305086 -11.12986,-11.129861 -29.175226,-11.129861 -40.305086,0 z m 32.241241,14.52963 -5.531697,5.531696 5.388154,5.388154 c 1.82575,1.82575 1.82575,4.823882 0,6.649632 -1.827164,1.827164 -4.825297,1.827164 -6.651047,0.0014 l -5.388153,-5.388153 -5.527454,5.527453 c -1.781909,1.781909 -4.686704,1.779081 -6.465784,0 -1.779081,-1.77908 -1.781202,-4.684582 0,-6.465784 l 5.527453,-5.527454 -5.388153,-5.388153 c -1.82575,-1.82575 -1.82575,-4.823883 0.0014,-6.651047 1.82575,-1.82575 4.823882,-1.82575 6.649632,0 l 5.388154,5.388154 5.531696,-5.531697 c 1.777667,-1.777666 4.68529,-1.777666 6.46437,0.0014 1.779081,1.77908 1.779081,4.686703 0.0014,6.46437 z"
-   style="fill:#FF6B00" />
+<svg xmlns="http://www.w3.org/2000/svg" width="64px" height="64px" viewBox="0 0 64 64">
+  <path fill="#ff6b00" d="m 12.183457,12.241457 c -11.129861,11.12986 -11.129861,29.175226 0,40.305086 11.12986,11.129861 29.175226,11.129861 40.305086,0 11.129861,-11.12986 11.129861,-29.175226 0,-40.305086 -11.12986,-11.129861 -29.175226,-11.129861 -40.305086,0 z m 32.241241,14.52963 -5.531697,5.531696 5.388154,5.388154 c 1.82575,1.82575 1.82575,4.823882 0,6.649632 -1.827164,1.827164 -4.825297,1.827164 -6.651047,0.0014 l -5.388153,-5.388153 -5.527454,5.527453 c -1.781909,1.781909 -4.686704,1.779081 -6.465784,0 -1.779081,-1.77908 -1.781202,-4.684582 0,-6.465784 l 5.527453,-5.527454 -5.388153,-5.388153 c -1.82575,-1.82575 -1.82575,-4.823883 0.0014,-6.651047 1.82575,-1.82575 4.823882,-1.82575 6.649632,0 l 5.388154,5.388154 5.531696,-5.531697 c 1.777667,-1.777666 4.68529,-1.777666 6.46437,0.0014 1.779081,1.77908 1.779081,4.686703 0.0014,6.46437 z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/app-manager/images/rocket.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/app-manager/images/rocket.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/app-manager/images/rocket.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/app-manager/images/rocket.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,30 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24">
   <g opacity="0.1">
-    <g>
-      <path fill="#FFFFFF" d="M12,2.3c-1.127,0-3.333,3.721-4.084,7.411l-2.535,2.535v6.619l1.767,0l2.464-2.464
-        c0.252,0.264,0.529,0.486,0.827,0.662h3.118c0.299-0.175,0.579-0.397,0.831-0.662l2.464,2.464l1.767,0v-6.619l-2.535-2.535
-        C15.333,6.021,13.127,2.3,12,2.3z M12.003,6.181c0.393,0,1.084,1.103,1.515,2.423c-0.466-0.087-0.963-0.135-1.481-0.135
-        c-0.545,0-1.066,0.054-1.553,0.15C10.914,7.292,11.608,6.181,12.003,6.181z"/>
-      <path fill="#FFFFFF" d="M12.792,18.755c0,0.778-0.603,1.408-0.805,1.408c-0.201,0-0.805-0.631-0.805-1.408
-        c0-0.301,0.055-0.579,0.147-0.809h-0.932c-0.109,0.403-0.171,0.854-0.171,1.33c0,1.714,1.33,3.104,1.774,3.104
-        s1.774-1.389,1.774-3.103c0-0.477-0.062-0.927-0.171-1.331l-0.957,0C12.738,18.175,12.792,18.453,12.792,18.755z"/>
-    </g>
-    <g>
-      <g>
-        <path fill="#414042" d="M12,2c-1.127,0-3.333,3.721-4.084,7.411l-2.535,2.535v6.619l1.767,0l2.464-2.464
-          c0.252,0.264,0.529,0.486,0.827,0.662h3.118c0.299-0.175,0.579-0.397,0.831-0.662l2.464,2.464l1.767,0v-6.619l-2.535-2.535
-          C15.333,5.721,13.127,2,12,2z M12.003,5.881c0.393,0,1.084,1.103,1.515,2.423c-0.466-0.087-0.963-0.135-1.481-0.135
-          c-0.545,0-1.066,0.054-1.553,0.15C10.914,6.992,11.608,5.881,12.003,5.881z"/>
-        <path fill="#414042" d="M12.792,18.455c0,0.778-0.603,1.408-0.805,1.408c-0.201,0-0.805-0.631-0.805-1.408
-          c0-0.301,0.055-0.579,0.147-0.809h-0.932c-0.109,0.403-0.171,0.854-0.171,1.33c0,1.714,1.33,3.104,1.774,3.104
-          s1.774-1.389,1.774-3.103c0-0.477-0.062-0.927-0.171-1.331l-0.957,0C12.738,17.875,12.792,18.153,12.792,18.455z"/>
-      </g>
-    </g>
+    <path fill="#fff" d="M12,2.3c-1.127,0-3.333,3.721-4.084,7.411l-2.535,2.535v6.619l1.767,0l2.464-2.464 c0.252,0.264,0.529,0.486,0.827,0.662h3.118c0.299-0.175,0.579-0.397,0.831-0.662l2.464,2.464l1.767,0v-6.619l-2.535-2.535 C15.333,6.021,13.127,2.3,12,2.3z M12.003,6.181c0.393,0,1.084,1.103,1.515,2.423c-0.466-0.087-0.963-0.135-1.481-0.135 c-0.545,0-1.066,0.054-1.553,0.15C10.914,7.292,11.608,6.181,12.003,6.181z"/>
+    <path fill="#fff" d="M12.792,18.755c0,0.778-0.603,1.408-0.805,1.408c-0.201,0-0.805-0.631-0.805-1.408 c0-0.301,0.055-0.579,0.147-0.809h-0.932c-0.109,0.403-0.171,0.854-0.171,1.33c0,1.714,1.33,3.104,1.774,3.104 s1.774-1.389,1.774-3.103c0-0.477-0.062-0.927-0.171-1.331l-0.957,0C12.738,18.175,12.792,18.453,12.792,18.755z"/>
+    <path fill="#414042" d="M12,2c-1.127,0-3.333,3.721-4.084,7.411l-2.535,2.535v6.619l1.767,0l2.464-2.464 c0.252,0.264,0.529,0.486,0.827,0.662h3.118c0.299-0.175,0.579-0.397,0.831-0.662l2.464,2.464l1.767,0v-6.619l-2.535-2.535 C15.333,5.721,13.127,2,12,2z M12.003,5.881c0.393,0,1.084,1.103,1.515,2.423c-0.466-0.087-0.963-0.135-1.481-0.135 c-0.545,0-1.066,0.054-1.553,0.15C10.914,6.992,11.608,5.881,12.003,5.881z"/>
+    <path fill="#414042" d="M12.792,18.455c0,0.778-0.603,1.408-0.805,1.408c-0.201,0-0.805-0.631-0.805-1.408 c0-0.301,0.055-0.579,0.147-0.809h-0.932c-0.109,0.403-0.171,0.854-0.171,1.33c0,1.714,1.33,3.104,1.774,3.104 s1.774-1.389,1.774-3.103c0-0.477-0.062-0.927-0.171-1.331l-0.957,0C12.738,17.875,12.792,18.153,12.792,18.455z"/>
   </g>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/app-manager/images/warning.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/app-manager/images/warning.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/app-manager/images/warning.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/app-manager/images/warning.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,13 +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/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64">
-  <path fill="#ECB51F" d="M61.689,51.121L36.437,7.384c-2.441-4.227-6.434-4.227-8.875,0L2.311,51.121
-    c-2.441,4.227-0.444,7.686,4.437,7.686h50.504C62.133,58.807,64.13,55.349,61.689,51.121z M35.968,47.68
-    c0,2.191-1.688,3.877-3.968,3.877s-3.968-1.686-3.968-3.877v-0.093c0-2.187,1.688-3.873,3.968-3.873s3.968,1.686,3.968,3.873V47.68z
-    M36.059,21.548l-1.961,17.146c-0.137,1.233-0.958,2.009-2.098,2.009s-1.961-0.776-2.098-2.009l-1.961-17.146
-    c-0.137-1.322,0.592-2.325,1.825-2.325h4.469C35.466,19.223,36.196,20.226,36.059,21.548z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="64px" height="64px" viewBox="0 0 64 64">
+  <path fill="#ecb51f" d="M61.689,51.121L36.437,7.384c-2.441-4.227-6.434-4.227-8.875,0L2.311,51.121 c-2.441,4.227-0.444,7.686,4.437,7.686h50.504C62.133,58.807,64.13,55.349,61.689,51.121z M35.968,47.68 c0,2.191-1.688,3.877-3.968,3.877s-3.968-1.686-3.968-3.877v-0.093c0-2.187,1.688-3.873,3.968-3.873s3.968,1.686,3.968,3.873V47.68z M36.059,21.548l-1.961,17.146c-0.137,1.233-0.958,2.009-2.098,2.009s-1.961-0.776-2.098-2.009l-1.961-17.146 c-0.137-1.322,0.592-2.325,1.825-2.325h4.469C35.466,19.223,36.196,20.226,36.059,21.548z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/common.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/common.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/common.css	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/common.css	2015-05-25 20:43:04.000000000 +0000
@@ -6,16 +6,17 @@
 
 :root {
   font: message-box;
-}
-
-.devtools-monospace {
 %ifdef XP_MACOSX
-  font-family: Menlo, monospace;
+  --monospace-font-family: Menlo, monospace;
 %elifdef XP_WIN
-  font-family: Consolas, monospace;
+  --monospace-font-family: Consolas, monospace;
 %else
-  font-family: monospace;
+  --monospace-font-family: monospace;
 %endif
+}
+
+.devtools-monospace {
+  font-family: var(--monospace-font-family);
 %if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
   font-size: 80%;
 %endif
@@ -247,3 +248,34 @@
   background-color: transparent;
   border: none;
 }
+
+/* links to source code, like displaying `myfile.js:45` */
+
+.devtools-source-link {
+  font-family: var(--monospace-font-family);
+  color: var(--theme-highlight-blue);
+  cursor: pointer;
+  white-space: nowrap;
+  display: flex;
+  text-decoration: none;
+  font-size: 11px;
+  width: 12em; /* probably should be changed for each tool */
+}
+
+.devtools-source-link:hover {
+  text-decoration: underline;
+}
+
+.devtools-source-link > .filename {
+  text-overflow: ellipsis;
+  text-align: end;
+  overflow: hidden;
+  margin: 2px 0px;
+  cursor: pointer;
+}
+
+.devtools-source-link > .line-number {
+  flex: none;
+  margin: 2px 0px;
+  cursor: pointer;
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/computedview.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/computedview.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/computedview.css	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/computedview.css	2015-05-25 20:43:04.000000000 +0000
@@ -183,9 +183,9 @@
 
 .computedview-colorswatch {
   border-radius: 50%;
-  width: 1em;
-  height: 1em;
-  vertical-align: text-top;
+  width: 0.9em;
+  height: 0.9em;
+  vertical-align: middle;
   -moz-margin-end: 5px;
   display: inline-block;
   position: relative;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/dark-theme.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/dark-theme.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/dark-theme.css	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/dark-theme.css	2015-05-25 20:43:04.000000000 +0000
@@ -34,6 +34,14 @@
   --theme-highlight-orange: #d96629;
   --theme-highlight-red: #eb5368;
   --theme-highlight-pink: #df80ff;
+
+  /* Colors used in Graphs, like performance tools. Mostly similar to some "highlight-*" colors. */
+  --theme-graphs-green: #70bf53;
+  --theme-graphs-blue: #46afe3;
+  --theme-graphs-purple: #df80ff;
+  --theme-graphs-yellow: #d99b28;
+  --theme-graphs-red: #eb5368;
+  --theme-graphs-grey: #757873;
 }
 
 .theme-body {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/filters.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/filters.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/filters.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/filters.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,3 +1,7 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <svg height="0" xmlns="http://www.w3.org/2000/svg">
 <filter id="invert" x="0%" y="0%" width="100%" height="100%" >
   <feComponentTransfer>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/font-inspector.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/font-inspector.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/font-inspector.css	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/font-inspector.css	2015-05-25 20:43:04.000000000 +0000
@@ -3,6 +3,9 @@
 }
 
 body {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
   margin: 0;
   padding-bottom: 20px;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/add.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/add.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/add.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/add.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,3 +1,9 @@
-<svg width="18" height="18" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <polygon fill="#EEF0F2" points="4,7 8,7 8,3 10,3 10,7 14,7 14,9 10,9 10,13 8,13 8,9 4,9 4,7"></polygon>
-</svg>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <g fill="#babec3">
+    <rect x="3" y="7" width="10" height="2" />
+    <rect x="7" y="3" width="2" height="10" />
+  </g>
+</svg>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/dropmarker.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/dropmarker.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/dropmarker.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/dropmarker.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,3 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="8" height="4" viewBox="0 0 8 4" enable-background="new 0 0 8 4">
-  <polygon points="0,0 4,4 8,0" fill="#B6BABF" />
-</svg>
\ 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="4" viewBox="0 0 8 4">
+  <polygon points="0,0 4,4 8,0" fill="#b6babf"/>
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/filetypes/dir-close.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/filetypes/dir-close.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/filetypes/dir-close.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/filetypes/dir-close.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#000000" width="16" height="16">
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" fill="#000" width="16" height="16">
   <path d="M 0.00,160.00 L 512.00,160.00 L 480.00,480.00 L 32.00,480.00 L 0.00,160.00 Z M 464.00,96.00 L 480.00,128.00 L 32.00,128.00 L 64.00,64.00 L 240.00,64.00 L 256.00,96.00 L 464.00,96.00 Z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/filetypes/dir-open.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/filetypes/dir-open.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/filetypes/dir-open.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/filetypes/dir-open.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#000000" width="16" height="16">
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" fill="#000" width="16" height="16">
   <path d="M 416.00,480.00L 512.00,224.00L 96.00,224.00L0.00,480.00 zM 64.00,192.00 L 0.00,480.00 L 0.00,64.00 L 144.00,64.00 L 208.00,128.00 L 416.00,128.00 L 416.00,192.00 Z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/filetypes/globe.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/filetypes/globe.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/filetypes/globe.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/filetypes/globe.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,3 +1,6 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18" height="20" viewBox="0 0 878 1024">
-	<path d="M438.857 73.143q119.429 0 220.286 58.857t159.714 159.714 58.857 220.286-58.857 220.286-159.714 159.714-220.286 58.857-220.286-58.857-159.714-159.714-58.857-220.286 58.857-220.286 159.714-159.714 220.286-58.857zM595.429 370.857q-1.143 0.571-5.429 5.429t-7.714 5.429q1.143 0 2.571-2.857t2.857-6.286 2-4q3.429-4 12.571-8.571 8-3.429 29.714-6.857 19.429-4.571 29.143 6.286-1.143-1.143 5.429-7.429t8.286-6.857q1.714-1.143 8.571-2.571t8.571-4.286l1.143-12.571q-6.857 0.571-10-4t-3.714-12q0 1.143-3.429 4.571 0-4-2.571-4.571t-6.571 0.571-5.143 0.571q-5.714-1.714-8.571-4.286t-4.571-9.429-2.286-8.571q-1.143-2.857-5.429-6t-5.429-6q-0.571-1.143-1.429-3.143t-1.714-3.714-2.286-3.143-3.143-1.429-4 2.857-4.286 5.714-2.571 2.857q-1.714-1.143-3.429-0.857t-2.571 0.571-2.571 1.714-2.857 2q-1.714 1.143-4.857 1.714t-4.857 1.143q8.571-2.857-0.571-6.286-5.714-2.286-9.143-1.714 5.143-2.286 4.286-6.857t-4.857-8h2.857q-0.571-2.286-4.857-4.857t-10-4.857-7.429-3.429q-4.571-2.857-19.429-5.429t-18.857-0.286q-2.857 3.429-2.571 6t2.286 8 2 7.143q0.571 3.429-3.143 7.429t-3.714 6.857q0 4 8 8.857t5.714 12.286q-1.714 4.571-9.143 9.143t-9.143 6.857q-2.857 4.571-0.857 10.571t6 9.429q1.143 1.143 0.857 2.286t-2 2.571-3.143 2.286-3.714 2l-1.714 1.143q-6.286 2.857-11.714-3.429t-7.714-14.857q-4-14.286-9.143-17.143-13.143-4.571-16.571 0.571-2.857-7.429-23.429-14.857-14.286-5.143-33.143-2.286 3.429-0.571 0-8.571-4-8.571-10.857-6.857 1.714-3.429 2.286-10t0.571-7.714q1.714-7.429 6.857-13.143 0.571-0.571 4-4.857t5.429-7.714 0.286-3.429q20 2.286 28.571-6.286 2.857-2.857 6.571-9.714t6-9.714q5.143-3.429 8-3.143t8.286 3.143 8.286 2.857q8 0.571 8.857-6.286t-4.286-11.429q6.857 0.571 1.714-9.714-2.857-4-4.571-5.143-6.857-2.286-15.429 2.857-4.571 2.286 1.143 4.571-0.571-0.571-5.429 6t-9.429 10-9.143-2.857q-0.571-0.571-3.143-7.714t-5.429-7.714q-4.571 0-9.143 8.571 1.714-4.571-6.286-8.571t-13.714-4.571q10.857-6.857-4.571-15.429-4-2.286-11.714-2.857t-11.143 2.286q-2.857 4-3.143 6.571t2.857 4.571 6 3.143 6.571 2.286 4.857 1.714q8 5.714 4.571 8-1.143 0.571-4.857 2t-6.571 2.571-3.429 2.286q-1.714 2.286 0 8t-1.143 8q-2.857-2.857-5.143-10t-4-9.429q4 5.143-14.286 3.429l-5.714-0.571q-2.286 0-9.143 1.143t-11.714 0.571-7.714-4.571q-2.286-4.571 0-11.429 0.571-2.286 2.286-1.143-2.286-1.714-6.286-5.429t-5.714-4.857q-26.286 8.571-53.714 23.429 3.429 0.571 6.857-0.571 2.857-1.143 7.429-3.714t5.714-3.143q19.429-8 24-4l2.857-2.857q8 9.143 11.429 14.286-4-2.286-17.143-0.571-11.429 3.429-12.571 6.857 4 6.857 2.857 10.286-2.286-1.714-6.571-5.714t-8.286-6.286-8.571-2.857q-9.143 0-12.571 0.571-83.429 45.714-134.286 126.857 4 4 6.857 4.571 2.286 0.571 2.857 5.143t1.429 6.286 6.571-1.714q5.143 4.571 1.714 10.857 0.571-0.571 25.143 15.429 10.857 9.714 12 12 1.714 6.286-5.714 10.286-0.571-1.143-5.143-5.143t-5.143-2.286q-1.714 2.857 0.286 10.571t6 7.143q-4 0-5.429 9.143t-1.429 20.286-0.571 13.429l1.143 0.571q-1.714 6.857 3.143 19.714t12.286 11.143q-7.429 1.714 11.429 24.571 3.429 4.571 4.571 5.143 1.714 1.143 6.857 4.286t8.571 5.714 5.714 6q2.286 2.857 5.714 12.857t8 13.429q-1.143 3.429 5.429 11.429t6 13.143q-0.571 0-1.429 0.571t-1.429 0.571q1.714 4 8.857 8t8.857 7.429q0.571 1.714 1.143 5.714t1.714 6.286 4.571 1.143q1.143-11.429-13.714-35.429-8.571-14.286-9.714-16.571-1.714-2.857-3.143-8.857t-2.571-8.286q1.143 0 3.429 0.857t4.857 2 4.286 2.286 1.143 1.714q-1.714 4 1.143 10t6.857 10.571 9.714 10.857 6.857 7.429q3.429 3.429 8 11.143t0 7.714q5.143 0 11.429 5.714t9.714 11.429q2.857 4.571 4.571 14.857t2.857 13.714q1.143 4 4.857 7.714t7.143 5.429l9.143 4.571t7.429 4q2.857 1.143 10.571 6t12.286 6.571q5.714 2.286 9.143 2.286t8.286-1.429 7.714-2q8.571-1.143 16.571 8.571t12 12q20.571 10.857 31.429 6.286-1.143 0.571 0.286 4.286t4.571 8.857 5.143 8.286 3.143 4.857q2.857 3.429 10.286 8.571t10.286 8.571q3.429-2.286 4-5.143-1.714 4.571 4 11.429t10.286 5.714q8-1.714 8-18.286-17.714 8.571-28-10.286 0-0.571-1.429-3.143t-2.286-4.857-1.429-4.857 0-4.286 2.857-1.714q5.143 0 5.714-2t-1.143-7.143-2.286-7.429q-0.571-4.571-6.286-11.429t-6.857-8.571q-2.857 5.143-9.143 4.571t-9.143-5.143q0 0.571-0.857 3.143t-0.857 3.714q-7.429 0-8.571-0.571 0.571-1.714 1.429-10t2-12.857q0.571-2.286 3.143-6.857t4.286-8.286 2.286-7.143-2.571-5.429-10-1.429q-10.857 0.571-14.857 11.429-0.571 1.714-1.714 6t-2.857 6.571-5.143 4q-4 1.714-13.714 1.143t-13.714-2.857q-7.429-4.571-12.857-16.571t-5.429-21.143q0-5.714 1.429-15.143t1.714-14.286-3.143-14q1.714-1.143 5.143-5.429t5.714-6q1.143-0.571 2.571-0.857t2.571 0 2.286-0.857 1.714-3.429q-0.571-0.571-2.286-1.714-1.714-1.714-2.286-1.714 4 1.714 16.286-0.857t15.714 0.857q8.571 6.286 12.571-1.143 0-0.571-1.429-5.429t-0.286-7.714q2.857 15.429 16.571 5.143 1.714 1.714 8.857 2.857t10 2.857q1.714 1.143 4 3.143t3.143 2.571 2.857-0.286 4.857-3.714q5.714 8 6.857 13.714 6.286 22.857 10.857 25.143 4 1.714 6.286 1.143t2.571-5.429 0-8-0.857-7.143l-0.571-4.571v-10.286l-0.571-4.571q-8.571-1.714-10.571-6.857t0.857-10.571 8.571-10.571q0.571-0.571 4.571-2t8.857-3.714 7.143-4.571q12-10.857 8.571-20 4 0 6.286-5.143-0.571 0-2.857-1.714t-4.286-2.857-2.571-1.143q5.143-2.857 1.143-9.143 2.857-1.714 4.286-6.286t4.286-5.714q5.143 6.857 12 1.143 4-4.571 0.571-9.143 2.857-4 11.714-6t10.571-5.429q4 1.143 4.571-1.143t0.571-6.857 1.714-6.857q2.286-2.857 8.571-5.143t7.429-2.857l9.714-6.286q1.714-2.286 0-2.286 10.286 1.143 17.714-6.286 5.714-6.286-3.429-11.429 1.714-3.429-1.714-5.429t-8.571-3.143q1.714-0.571 6.571-0.286t6-0.857q8.571-5.714-4-9.143-9.714-2.857-24.571 6.857zM502.286 872q117.714-20.571 200.571-108-1.714-1.714-7.143-2.571t-7.143-2q-10.286-4-13.714-4.571 0.571-4-1.429-7.429t-4.571-5.143-7.143-4.571-6.286-4q-1.143-1.143-4-3.429t-4-3.143-4.286-2.571-4.857-1.143-5.714 0.571l-1.714 0.571q-1.714 0.571-3.143 1.429t-3.143 1.714-2.286 1.714 0 1.429q-12-9.714-20.571-12.571-2.857-0.571-6.286-3.143t-6-4-5.714-0.857-6.571 4q-2.857 2.857-3.429 8.571t-1.143 7.429q-4-2.857 0-10t1.143-10.571q-1.714-3.429-6-2.571t-6.857 2.571-6.571 4.857-5.143 3.714-4.857 3.143-4.857 4.286q-1.714 2.286-3.429 6.857t-2.857 6.286q-1.143-2.286-6.571-3.714t-5.429-3.143q1.143 5.714 2.286 20t2.857 21.714q4 17.714-6.857 27.429-15.429 14.286-16.571 22.857-2.286 12.571 6.857 14.857 0 4-4.571 11.714t-4 12.286q0 3.429 1.143 9.143z"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="20" viewBox="0 0 878 1024">
+  <path d="M438.857 73.143q119.429 0 220.286 58.857t159.714 159.714 58.857 220.286-58.857 220.286-159.714 159.714-220.286 58.857-220.286-58.857-159.714-159.714-58.857-220.286 58.857-220.286 159.714-159.714 220.286-58.857zM595.429 370.857q-1.143 0.571-5.429 5.429t-7.714 5.429q1.143 0 2.571-2.857t2.857-6.286 2-4q3.429-4 12.571-8.571 8-3.429 29.714-6.857 19.429-4.571 29.143 6.286-1.143-1.143 5.429-7.429t8.286-6.857q1.714-1.143 8.571-2.571t8.571-4.286l1.143-12.571q-6.857 0.571-10-4t-3.714-12q0 1.143-3.429 4.571 0-4-2.571-4.571t-6.571 0.571-5.143 0.571q-5.714-1.714-8.571-4.286t-4.571-9.429-2.286-8.571q-1.143-2.857-5.429-6t-5.429-6q-0.571-1.143-1.429-3.143t-1.714-3.714-2.286-3.143-3.143-1.429-4 2.857-4.286 5.714-2.571 2.857q-1.714-1.143-3.429-0.857t-2.571 0.571-2.571 1.714-2.857 2q-1.714 1.143-4.857 1.714t-4.857 1.143q8.571-2.857-0.571-6.286-5.714-2.286-9.143-1.714 5.143-2.286 4.286-6.857t-4.857-8h2.857q-0.571-2.286-4.857-4.857t-10-4.857-7.429-3.429q-4.571-2.857-19.429-5.429t-18.857-0.286q-2.857 3.429-2.571 6t2.286 8 2 7.143q0.571 3.429-3.143 7.429t-3.714 6.857q0 4 8 8.857t5.714 12.286q-1.714 4.571-9.143 9.143t-9.143 6.857q-2.857 4.571-0.857 10.571t6 9.429q1.143 1.143 0.857 2.286t-2 2.571-3.143 2.286-3.714 2l-1.714 1.143q-6.286 2.857-11.714-3.429t-7.714-14.857q-4-14.286-9.143-17.143-13.143-4.571-16.571 0.571-2.857-7.429-23.429-14.857-14.286-5.143-33.143-2.286 3.429-0.571 0-8.571-4-8.571-10.857-6.857 1.714-3.429 2.286-10t0.571-7.714q1.714-7.429 6.857-13.143 0.571-0.571 4-4.857t5.429-7.714 0.286-3.429q20 2.286 28.571-6.286 2.857-2.857 6.571-9.714t6-9.714q5.143-3.429 8-3.143t8.286 3.143 8.286 2.857q8 0.571 8.857-6.286t-4.286-11.429q6.857 0.571 1.714-9.714-2.857-4-4.571-5.143-6.857-2.286-15.429 2.857-4.571 2.286 1.143 4.571-0.571-0.571-5.429 6t-9.429 10-9.143-2.857q-0.571-0.571-3.143-7.714t-5.429-7.714q-4.571 0-9.143 8.571 1.714-4.571-6.286-8.571t-13.714-4.571q10.857-6.857-4.571-15.429-4-2.286-11.714-2.857t-11.143 2.286q-2.857 4-3.143 6.571t2.857 4.571 6 3.143 6.571 2.286 4.857 1.714q8 5.714 4.571 8-1.143 0.571-4.857 2t-6.571 2.571-3.429 2.286q-1.714 2.286 0 8t-1.143 8q-2.857-2.857-5.143-10t-4-9.429q4 5.143-14.286 3.429l-5.714-0.571q-2.286 0-9.143 1.143t-11.714 0.571-7.714-4.571q-2.286-4.571 0-11.429 0.571-2.286 2.286-1.143-2.286-1.714-6.286-5.429t-5.714-4.857q-26.286 8.571-53.714 23.429 3.429 0.571 6.857-0.571 2.857-1.143 7.429-3.714t5.714-3.143q19.429-8 24-4l2.857-2.857q8 9.143 11.429 14.286-4-2.286-17.143-0.571-11.429 3.429-12.571 6.857 4 6.857 2.857 10.286-2.286-1.714-6.571-5.714t-8.286-6.286-8.571-2.857q-9.143 0-12.571 0.571-83.429 45.714-134.286 126.857 4 4 6.857 4.571 2.286 0.571 2.857 5.143t1.429 6.286 6.571-1.714q5.143 4.571 1.714 10.857 0.571-0.571 25.143 15.429 10.857 9.714 12 12 1.714 6.286-5.714 10.286-0.571-1.143-5.143-5.143t-5.143-2.286q-1.714 2.857 0.286 10.571t6 7.143q-4 0-5.429 9.143t-1.429 20.286-0.571 13.429l1.143 0.571q-1.714 6.857 3.143 19.714t12.286 11.143q-7.429 1.714 11.429 24.571 3.429 4.571 4.571 5.143 1.714 1.143 6.857 4.286t8.571 5.714 5.714 6q2.286 2.857 5.714 12.857t8 13.429q-1.143 3.429 5.429 11.429t6 13.143q-0.571 0-1.429 0.571t-1.429 0.571q1.714 4 8.857 8t8.857 7.429q0.571 1.714 1.143 5.714t1.714 6.286 4.571 1.143q1.143-11.429-13.714-35.429-8.571-14.286-9.714-16.571-1.714-2.857-3.143-8.857t-2.571-8.286q1.143 0 3.429 0.857t4.857 2 4.286 2.286 1.143 1.714q-1.714 4 1.143 10t6.857 10.571 9.714 10.857 6.857 7.429q3.429 3.429 8 11.143t0 7.714q5.143 0 11.429 5.714t9.714 11.429q2.857 4.571 4.571 14.857t2.857 13.714q1.143 4 4.857 7.714t7.143 5.429l9.143 4.571t7.429 4q2.857 1.143 10.571 6t12.286 6.571q5.714 2.286 9.143 2.286t8.286-1.429 7.714-2q8.571-1.143 16.571 8.571t12 12q20.571 10.857 31.429 6.286-1.143 0.571 0.286 4.286t4.571 8.857 5.143 8.286 3.143 4.857q2.857 3.429 10.286 8.571t10.286 8.571q3.429-2.286 4-5.143-1.714 4.571 4 11.429t10.286 5.714q8-1.714 8-18.286-17.714 8.571-28-10.286 0-0.571-1.429-3.143t-2.286-4.857-1.429-4.857 0-4.286 2.857-1.714q5.143 0 5.714-2t-1.143-7.143-2.286-7.429q-0.571-4.571-6.286-11.429t-6.857-8.571q-2.857 5.143-9.143 4.571t-9.143-5.143q0 0.571-0.857 3.143t-0.857 3.714q-7.429 0-8.571-0.571 0.571-1.714 1.429-10t2-12.857q0.571-2.286 3.143-6.857t4.286-8.286 2.286-7.143-2.571-5.429-10-1.429q-10.857 0.571-14.857 11.429-0.571 1.714-1.714 6t-2.857 6.571-5.143 4q-4 1.714-13.714 1.143t-13.714-2.857q-7.429-4.571-12.857-16.571t-5.429-21.143q0-5.714 1.429-15.143t1.714-14.286-3.143-14q1.714-1.143 5.143-5.429t5.714-6q1.143-0.571 2.571-0.857t2.571 0 2.286-0.857 1.714-3.429q-0.571-0.571-2.286-1.714-1.714-1.714-2.286-1.714 4 1.714 16.286-0.857t15.714 0.857q8.571 6.286 12.571-1.143 0-0.571-1.429-5.429t-0.286-7.714q2.857 15.429 16.571 5.143 1.714 1.714 8.857 2.857t10 2.857q1.714 1.143 4 3.143t3.143 2.571 2.857-0.286 4.857-3.714q5.714 8 6.857 13.714 6.286 22.857 10.857 25.143 4 1.714 6.286 1.143t2.571-5.429 0-8-0.857-7.143l-0.571-4.571v-10.286l-0.571-4.571q-8.571-1.714-10.571-6.857t0.857-10.571 8.571-10.571q0.571-0.571 4.571-2t8.857-3.714 7.143-4.571q12-10.857 8.571-20 4 0 6.286-5.143-0.571 0-2.857-1.714t-4.286-2.857-2.571-1.143q5.143-2.857 1.143-9.143 2.857-1.714 4.286-6.286t4.286-5.714q5.143 6.857 12 1.143 4-4.571 0.571-9.143 2.857-4 11.714-6t10.571-5.429q4 1.143 4.571-1.143t0.571-6.857 1.714-6.857q2.286-2.857 8.571-5.143t7.429-2.857l9.714-6.286q1.714-2.286 0-2.286 10.286 1.143 17.714-6.286 5.714-6.286-3.429-11.429 1.714-3.429-1.714-5.429t-8.571-3.143q1.714-0.571 6.571-0.286t6-0.857q8.571-5.714-4-9.143-9.714-2.857-24.571 6.857zM502.286 872q117.714-20.571 200.571-108-1.714-1.714-7.143-2.571t-7.143-2q-10.286-4-13.714-4.571 0.571-4-1.429-7.429t-4.571-5.143-7.143-4.571-6.286-4q-1.143-1.143-4-3.429t-4-3.143-4.286-2.571-4.857-1.143-5.714 0.571l-1.714 0.571q-1.714 0.571-3.143 1.429t-3.143 1.714-2.286 1.714 0 1.429q-12-9.714-20.571-12.571-2.857-0.571-6.286-3.143t-6-4-5.714-0.857-6.571 4q-2.857 2.857-3.429 8.571t-1.143 7.429q-4-2.857 0-10t1.143-10.571q-1.714-3.429-6-2.571t-6.857 2.571-6.571 4.857-5.143 3.714-4.857 3.143-4.857 4.286q-1.714 2.286-3.429 6.857t-2.857 6.286q-1.143-2.286-6.571-3.714t-5.429-3.143q1.143 5.714 2.286 20t2.857 21.714q4 17.714-6.857 27.429-15.429 14.286-16.571 22.857-2.286 12.571 6.857 14.857 0 4-4.571 11.714t-4 12.286q0 3.429 1.143 9.143z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/filetypes/store.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/filetypes/store.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/filetypes/store.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/filetypes/store.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,7 +1,8 @@
-<svg width="16" xmlns="http://www.w3.org/2000/svg" height="16" viewBox="0 0 16 16" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 16 16">
-<g>
-<path d="m1.3,12.5v-2.4c0,0 0,2.5 6.7,2.5 6.7,0 6.7-2.5 6.7-2.5v2.4c0,0 0,2.7-6.8,2.7-6.6,0-6.6-2.7-6.6-2.7z"/>
-<path d="m14.7,3.4c0-1.4-3-2.5-6.7-2.5s-6.7,1.1-6.7,2.5c0,.2 0,.3 .1,.5-.1-.3-.1-.4-.1-.4v1.5c0,0 0,2.7 6.7,2.7 6.7,0 6.8-2.7 6.8-2.7v-1.6c0,.1 0,.2-.1,.5-0-.2-0-.3-0-.5z"/>
-<path d="m1.3,8.7v-2.4c0,0 0,2.5 6.7,2.5 6.7,0 6.7-2.5 6.7-2.5v2.4c0,0 0,2.7-6.8,2.7-6.6-0-6.6-2.7-6.6-2.7z"/>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="16" xmlns="http://www.w3.org/2000/svg" height="16" viewBox="0 0 16 16">
+  <path d="m1.3,12.5v-2.4c0,0 0,2.5 6.7,2.5 6.7,0 6.7-2.5 6.7-2.5v2.4c0,0 0,2.7-6.8,2.7-6.6,0-6.6-2.7-6.6-2.7z"/>
+  <path d="m14.7,3.4c0-1.4-3-2.5-6.7-2.5s-6.7,1.1-6.7,2.5c0,.2 0,.3 .1,.5-.1-.3-.1-.4-.1-.4v1.5c0,0 0,2.7 6.7,2.7 6.7,0 6.8-2.7 6.8-2.7v-1.6c0,.1 0,.2-.1,.5-0-.2-0-.3-0-.5z"/>
+  <path d="m1.3,8.7v-2.4c0,0 0,2.5 6.7,2.5 6.7,0 6.7-2.5 6.7-2.5v2.4c0,0 0,2.7-6.8,2.7-6.6-0-6.6-2.7-6.6-2.7z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/filter-swatch.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/filter-swatch.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/filter-swatch.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/filter-swatch.svg	2015-05-25 20:43:04.000000000 +0000
@@ -2,16 +2,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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 12 12" width="12px" height="12px">
-  <defs>
-    <mask id="mask">
-      <rect width="100%" height="100%" fill="white"/>
-      <polygon points="12,0 0,0 0,12"/>
-    </mask>
-  </defs>
-
-  <g id="addpage-shape">
-    <circle cx="6" cy="6" r="6" fill="white"/>
-    <circle cx="6" cy="6" r="6" mask="url(#mask)" fill="#AEB0B1" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12" width="12px" height="12px">
+  <mask id="mask">
+    <rect width="100%" height="100%" fill="#fff"/>
+    <polygon points="12,0 0,0 0,12"/>
+  </mask>
+  <circle cx="6" cy="6" r="6" fill="#fff"/>
+  <circle cx="6" cy="6" r="6" mask="url(#mask)" fill="#aeb0b1"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/itemArrow-dark-ltr.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/itemArrow-dark-ltr.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/itemArrow-dark-ltr.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/itemArrow-dark-ltr.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,4 +1,7 @@
-<svg width="7" xmlns="http://www.w3.org/2000/svg" height="12" viewBox="0 0 7 12" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 7 12">
-<path fill="#181D20" d="M7,11.6 7,.4 1.5,6z"/>
-<path fill="#000" d="M7,0 6,0 0,6 6,12 7,12 7,11.6 1.5,6 7,.4z"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="7" xmlns="http://www.w3.org/2000/svg" height="12" viewBox="0 0 7 12">
+  <path fill="#181d20" d="M7,11.6 7,.4 1.5,6z"/>
+  <path fill="#000" d="M7,0 6,0 0,6 6,12 7,12 7,11.6 1.5,6 7,.4z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/itemArrow-dark-rtl.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/itemArrow-dark-rtl.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/itemArrow-dark-rtl.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/itemArrow-dark-rtl.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,4 +1,7 @@
-<svg width="7" xmlns="http://www.w3.org/2000/svg" height="12" viewBox="0 0 7 12" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 7 12">
-<path fill="#181D20" d="M0,11.6 0,.4 5.5,6z"/>
-<path fill="#000" d="M1,0 0,0 0,.4 5.5,6 0,11.6 0,12 1,12 7,6z"/>
-</svg>
\ 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/. -->
+<svg width="7" xmlns="http://www.w3.org/2000/svg" height="12" viewBox="0 0 7 12">
+  <path fill="#181d20" d="M0,11.6 0,.4 5.5,6z"/>
+  <path fill="#000" d="M1,0 0,0 0,.4 5.5,6 0,11.6 0,12 1,12 7,6z"/>
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/itemArrow-ltr.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/itemArrow-ltr.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/itemArrow-ltr.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/itemArrow-ltr.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,4 +1,7 @@
-<svg width="7" xmlns="http://www.w3.org/2000/svg" height="12" viewBox="0 0 7 12" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 7 12">
-<path fill="#f7f7f7" d="M7,11.6 7,.4 1.5,6z"/>
-<path fill="#ababab" d="M7,0 6,0 0,6 6,12 7,12 7,11.6 1.5,6 7,.4z"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="7" xmlns="http://www.w3.org/2000/svg" height="12" viewBox="0 0 7 12">
+  <path fill="#f7f7f7" d="M7,11.6 7,.4 1.5,6z"/>
+  <path fill="#ababab" d="M7,0 6,0 0,6 6,12 7,12 7,11.6 1.5,6 7,.4z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/itemArrow-rtl.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/itemArrow-rtl.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/itemArrow-rtl.svg	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/itemArrow-rtl.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,4 +1,7 @@
-<svg width="7" xmlns="http://www.w3.org/2000/svg" height="12" viewBox="0 0 7 12" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 7 12">
-<path fill="#f7f7f7" d="M0,11.6 0,.4 5.5,6z"/>
-<path fill="#ababab" d="M1,0 0,0 0,.4 5.5,6 0,11.6 0,12 1,12 7,6z"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="7" xmlns="http://www.w3.org/2000/svg" height="12" viewBox="0 0 7 12">
+  <path fill="#f7f7f7" d="M0,11.6 0,.4 5.5,6z"/>
+  <path fill="#ababab" d="M1,0 0,0 0,.4 5.5,6 0,11.6 0,12 1,12 7,6z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/performance-icons.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/performance-icons.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/performance-icons.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/performance-icons.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,42 +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/. -->
 <svg xmlns="http://www.w3.org/2000/svg" width="16px" height="16px">
-<style>
-  g {
-    fill: #edf0f1;
-  }
-  g:not(:target) {
-    display: none;
-  }
-</style>
-<g id="overview-markers">
-  <rect x="0px" y="3px" width="5px" height="2.5px" rx="1" ry="1"/>
-  <rect x="7px" y="3px" width="9px" height="2.5px" rx="1" ry="1"/>
-  <rect x="0px" y="7px" width="9px" height="2.5px" rx="1" ry="1"/>
-  <rect x="10px" y="7px" width="6px" height="2.5px" rx="1" ry="1"/>
-  <rect x="4px" y="11px" width="5px" height="2.5px" rx="1" ry="1"/>
-  <rect x="12px" y="11px" width="4px" height="2.5px" rx="1" ry="1"/>
-</g>
-<g id="overview-frames">
-  <rect x="1px" y="4px" width="2px" height="12px" rx="1" ry="1"/>
-  <rect x="5px" y="12px" width="2px" height="4px" rx="1" ry="1"/>
-  <rect x="9px" y="9px" width="2px" height="7px" rx="1" ry="1"/>
-  <rect x="13px" y="7px" width="2px" height="9px" rx="1" ry="1"/>
-</g>
-<g id="details-waterfall">
-  <rect x="0px" y="3px" width="9px" height="2.5px" rx="1" ry="1"/>
-  <rect x="5px" y="7px" width="8px" height="2.5px" rx="1" ry="1"/>
-  <rect x="7px" y="11px" width="9px" height="2.5px" rx="1" ry="1"/>
-</g>
-<g id="details-call-tree">
-  <rect x="0px" y="3px" width="16px" height="2px" rx="1" ry="1"/>
-  <rect x="0px" y="6px" width="8px" height="2px" rx="1" ry="1"/>
-  <rect x="0px" y="9px" width="11px" height="2px" rx="1" ry="1"/>
-  <rect x="0px" y="12px" width="6px" height="2px" rx="1" ry="1"/>
-</g>
-<g id="details-flamegraph">
-  <rect x="0px" y="3px" width="16px" height="2px" rx="1" ry="1"/>
-  <rect x="0px" y="6px" width="8px" height="2px" rx="1" ry="1"/>
-  <rect x="10px" y="6px" width="6px" height="2px" rx="1" ry="1"/>
-  <rect x="2px" y="9px" width="6px" height="2px" rx="1" ry="1"/>
-  <rect x="5px" y="12px" width="3px" height="2px" rx="1" ry="1"/>
-</g>
+  <style>
+    g {
+      fill: #babec3;
+    }
+    g:not(:target) {
+      display: none;
+    }
+  </style>
+  <g id="overview-markers">
+    <rect x="0px" y="3px" width="5px" height="2.5px" rx="1" ry="1"/>
+    <rect x="7px" y="3px" width="9px" height="2.5px" rx="1" ry="1"/>
+    <rect x="0px" y="7px" width="9px" height="2.5px" rx="1" ry="1"/>
+    <rect x="10px" y="7px" width="6px" height="2.5px" rx="1" ry="1"/>
+    <rect x="4px" y="11px" width="5px" height="2.5px" rx="1" ry="1"/>
+    <rect x="12px" y="11px" width="4px" height="2.5px" rx="1" ry="1"/>
+  </g>
+  <g id="overview-frames">
+    <rect x="1px" y="4px" width="2px" height="12px" rx="1" ry="1"/>
+    <rect x="5px" y="12px" width="2px" height="4px" rx="1" ry="1"/>
+    <rect x="9px" y="9px" width="2px" height="7px" rx="1" ry="1"/>
+    <rect x="13px" y="7px" width="2px" height="9px" rx="1" ry="1"/>
+  </g>
+  <g id="details-waterfall">
+    <rect x="0px" y="3px" width="9px" height="2.5px" rx="1" ry="1"/>
+    <rect x="5px" y="7px" width="8px" height="2.5px" rx="1" ry="1"/>
+    <rect x="7px" y="11px" width="9px" height="2.5px" rx="1" ry="1"/>
+  </g>
+  <g id="details-call-tree">
+    <rect x="0px" y="3px" width="16px" height="2px" rx="1" ry="1"/>
+    <rect x="0px" y="6px" width="8px" height="2px" rx="1" ry="1"/>
+    <rect x="0px" y="9px" width="11px" height="2px" rx="1" ry="1"/>
+    <rect x="0px" y="12px" width="6px" height="2px" rx="1" ry="1"/>
+  </g>
+  <g id="details-flamegraph">
+    <rect x="0px" y="3px" width="16px" height="2px" rx="1" ry="1"/>
+    <rect x="0px" y="6px" width="8px" height="2px" rx="1" ry="1"/>
+    <rect x="10px" y="6px" width="6px" height="2px" rx="1" ry="1"/>
+    <rect x="2px" y="9px" width="6px" height="2px" rx="1" ry="1"/>
+    <rect x="5px" y="12px" width="3px" height="2px" rx="1" ry="1"/>
+  </g>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/power.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/power.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/power.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/power.svg	2015-05-25 20:43:04.000000000 +0000
@@ -10,5 +10,5 @@
 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.
 -->
 <svg width="16" height="16" xmlns="http://www.w3.org/2000/svg">
-  <path stroke="#edf0f1" d="m10.89891,2.50043c-0.49827,-0.24134 -1.09841,-0.03411 -1.34129,0.46514c-0.24185,0.49928 -0.03311,1.09942 0.46517,1.34128c1.56306,0.76071 2.64193,2.36094 2.64092,4.21555c-0.00501,2.58626 -2.09749,4.6787 -4.68322,4.68321c-2.58623,-0.005 -4.67869,-2.09746 -4.68371,-4.68321c-0.001,-1.85561 1.07834,-3.45731 2.64294,-4.21654c0.49928,-0.24185 0.7065,-0.84201 0.46514,-1.34129c-0.24185,-0.49825 -0.84098,-0.70697 -1.34029,-0.46513c-2.23396,1.08135 -3.77446,3.37351 -3.77545,6.02296c0.00099,3.69518 2.99518,6.68989 6.69138,6.69088c3.6957,-0.00099 6.69037,-2.9957 6.69089,-6.69088c-0.00102,-2.64846 -1.53948,-4.9391 -3.77247,-6.02197zm-2.91842,4.9346c0.55398,0 1.00309,-0.44861 1.00309,-1.00357l0,-4.68373c0,-0.55446 -0.44911,-1.00309 -1.00309,-1.00309c-0.555,0 -1.00358,0.44911 -1.00358,1.00309l0,4.68321c0,0.55499 0.44858,1.00409 1.00358,1.00409z" stroke-width="0" fill="#edf0f1"/>
+  <path stroke="#babec3" stroke-width="0" fill="#babec3" d="m10.89891,2.50043c-0.49827,-0.24134 -1.09841,-0.03411 -1.34129,0.46514c-0.24185,0.49928 -0.03311,1.09942 0.46517,1.34128c1.56306,0.76071 2.64193,2.36094 2.64092,4.21555c-0.00501,2.58626 -2.09749,4.6787 -4.68322,4.68321c-2.58623,-0.005 -4.67869,-2.09746 -4.68371,-4.68321c-0.001,-1.85561 1.07834,-3.45731 2.64294,-4.21654c0.49928,-0.24185 0.7065,-0.84201 0.46514,-1.34129c-0.24185,-0.49825 -0.84098,-0.70697 -1.34029,-0.46513c-2.23396,1.08135 -3.77446,3.37351 -3.77545,6.02296c0.00099,3.69518 2.99518,6.68989 6.69138,6.69088c3.6957,-0.00099 6.69037,-2.9957 6.69089,-6.69088c-0.00102,-2.64846 -1.53948,-4.9391 -3.77247,-6.02197zm-2.91842,4.9346c0.55398,0 1.00309,-0.44861 1.00309,-1.00357l0,-4.68373c0,-0.55446 -0.44911,-1.00309 -1.00309,-1.00309c-0.555,0 -1.00358,0.44911 -1.00358,1.00309l0,4.68321c0,0.55499 0.44858,1.00409 1.00358,1.00409z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/profiler-stopwatch-checked.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/profiler-stopwatch-checked.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/profiler-stopwatch-checked.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/profiler-stopwatch-checked.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,14 +1,17 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 16 16">
-<g fill="#3BACE5" fill-rule="evenodd">
-<path d="m8,1c-3.9,0-7,3.1-7,7s3.1,7 7,7c3.9,0 7-3.1 7-7s-3.1-7-7-7zm-.1,12c-2.8,0-5-2.2-5-5 0-2.8 2.2-5 5-5s5,2.2 5,5c0,2.8-2.2,5-5,5z"/>
-<path d="m8,6.9c.6,0 1.1,.5 1.1,1.1 0,.6-.5,1.1-1.1,1.1-.6,0-1.1-.5-1.1-1.1 0-.6 .5-1.1 1.1-1.1z"/>
-<path d="m11.3,4.6l-3.9,2.5 1.5,1.4 2.4-3.9z"/>
-<path opacity=".4" d="m4.6,10c.7,1.2 2,2 3.4,2 1.5,0 2.7-.8 3.4-2h-6.8z"/>
-<g opacity=".3">
-<path d="m7.1,5.1l-.6-1.3-.9,.4 .7,1.3c.2-.1 .5-.3 .8-.4z"/>
-<path d="m9.8,5.6l.7-1.4-.9-.4-.7,1.3c.3,.2 .6,.3 .9,.5z"/>
-<path d="m10.8,7c.1,.3 .2,.7 .2,1h2v-1h-2.2z"/>
-<path d="m5,8c0-.3 .1-.7 .2-1h-2.2l-.1,1h2.1z"/>
-</g>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#3bace5" fill-rule="evenodd">
+    <path d="m8,1c-3.9,0-7,3.1-7,7s3.1,7 7,7c3.9,0 7-3.1 7-7s-3.1-7-7-7zm-.1,12c-2.8,0-5-2.2-5-5 0-2.8 2.2-5 5-5s5,2.2 5,5c0,2.8-2.2,5-5,5z"/>
+    <path d="m8,6.9c.6,0 1.1,.5 1.1,1.1 0,.6-.5,1.1-1.1,1.1-.6,0-1.1-.5-1.1-1.1 0-.6 .5-1.1 1.1-1.1z"/>
+    <path d="m11.3,4.6l-3.9,2.5 1.5,1.4 2.4-3.9z"/>
+    <path opacity=".4" d="m4.6,10c.7,1.2 2,2 3.4,2 1.5,0 2.7-.8 3.4-2h-6.8z"/>
+    <g opacity=".3">
+      <path d="m7.1,5.1l-.6-1.3-.9,.4 .7,1.3c.2-.1 .5-.3 .8-.4z"/>
+      <path d="m9.8,5.6l.7-1.4-.9-.4-.7,1.3c.3,.2 .6,.3 .9,.5z"/>
+      <path d="m10.8,7c.1,.3 .2,.7 .2,1h2v-1h-2.2z"/>
+      <path d="m5,8c0-.3 .1-.7 .2-1h-2.2l-.1,1h2.1z"/>
+    </g>
+  </g>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/profiler-stopwatch.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/profiler-stopwatch.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/profiler-stopwatch.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/profiler-stopwatch.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,14 +1,17 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 16 16">
-<g fill="#edf0f1" fill-rule="evenodd">
-<path d="m8,1c-3.9,0-7,3.1-7,7s3.1,7 7,7c3.9,0 7-3.1 7-7s-3.1-7-7-7zm-.1,12c-2.8,0-5-2.2-5-5 0-2.8 2.2-5 5-5s5,2.2 5,5c0,2.8-2.2,5-5,5z"/>
-<path d="m8,6.9c.6,0 1.1,.5 1.1,1.1 0,.6-.5,1.1-1.1,1.1-.6,0-1.1-.5-1.1-1.1 0-.6 .5-1.1 1.1-1.1z"/>
-<path d="m11.3,4.6l-3.9,2.5 1.5,1.4 2.4-3.9z"/>
-<path opacity=".4" d="m4.6,10c.7,1.2 2,2 3.4,2 1.5,0 2.7-.8 3.4-2h-6.8z"/>
-<g opacity=".3">
-<path d="m7.1,5.1l-.6-1.3-.9,.4 .7,1.3c.2-.1 .5-.3 .8-.4z"/>
-<path d="m9.8,5.6l.7-1.4-.9-.4-.7,1.3c.3,.2 .6,.3 .9,.5z"/>
-<path d="m10.8,7c.1,.3 .2,.7 .2,1h2v-1h-2.2z"/>
-<path d="m5,8c0-.3 .1-.7 .2-1h-2.2l-.1,1h2.1z"/>
-</g>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#babec3" fill-rule="evenodd">
+    <path d="m8,1c-3.9,0-7,3.1-7,7s3.1,7 7,7c3.9,0 7-3.1 7-7s-3.1-7-7-7zm-.1,12c-2.8,0-5-2.2-5-5 0-2.8 2.2-5 5-5s5,2.2 5,5c0,2.8-2.2,5-5,5z"/>
+    <path d="m8,6.9c.6,0 1.1,.5 1.1,1.1 0,.6-.5,1.1-1.1,1.1-.6,0-1.1-.5-1.1-1.1 0-.6 .5-1.1 1.1-1.1z"/>
+    <path d="m11.3,4.6l-3.9,2.5 1.5,1.4 2.4-3.9z"/>
+    <path opacity=".4" d="m4.6,10c.7,1.2 2,2 3.4,2 1.5,0 2.7-.8 3.4-2h-6.8z"/>
+    <g opacity=".3">
+      <path d="m7.1,5.1l-.6-1.3-.9,.4 .7,1.3c.2-.1 .5-.3 .8-.4z"/>
+      <path d="m9.8,5.6l.7-1.4-.9-.4-.7,1.3c.3,.2 .6,.3 .9,.5z"/>
+      <path d="m10.8,7c.1,.3 .2,.7 .2,1h2v-1h-2.2z"/>
+      <path d="m5,8c0-.3 .1-.7 .2-1h-2.2l-.1,1h2.1z"/>
+    </g>
+  </g>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/search-clear-dark.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/search-clear-dark.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/search-clear-dark.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/search-clear-dark.svg	2015-05-25 20:43:04.000000000 +0000
@@ -2,20 +2,14 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     x="0"
-     y="0"
-     width="32"
-     height="16"
-     viewBox="0 0 32 16">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="16" viewBox="0 0 32 16">
   <defs>
     <path id="glyphShape-clear" d="M8,0C3.6,0,0,3.6,0,8c0,4.4,3.6,8,8,8s8-3.6,8-8C16,3.6,12.4,0,8,0 z M11.9,10.5l-1.4,1.4L8,9.4l-2.4,2.4l-1.4-1.4L6.6,8L4.2,5.6l1.4-1.4L8,6.6l2.4-2.4l1.4,1.4L9.4,8L11.9,10.5z"/>
-    <style type="text/css">
+    <style>
       .icon-state-default { fill: #f5f7fa; fill-opacity: .6; }
       .icon-state-pressed { fill: #7d7e80; fill-opacity: .8; }
     </style>
   </defs>
-  <use xlink:href="#glyphShape-clear" class="icon-state-default" />
-  <use xlink:href="#glyphShape-clear" class="icon-state-pressed" transform="translate(16)" />
+  <use xlink:href="#glyphShape-clear" class="icon-state-default"/>
+  <use xlink:href="#glyphShape-clear" class="icon-state-pressed" transform="translate(16)"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/search-clear-failed.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/search-clear-failed.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/search-clear-failed.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/search-clear-failed.svg	2015-05-25 20:43:04.000000000 +0000
@@ -2,20 +2,14 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     x="0"
-     y="0"
-     width="32"
-     height="16"
-     viewBox="0 0 32 16">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="16" viewBox="0 0 32 16">
   <defs>
     <path id="glyphShape-clear" d="M8,0C3.6,0,0,3.6,0,8c0,4.4,3.6,8,8,8s8-3.6,8-8C16,3.6,12.4,0,8,0 z M11.9,10.5l-1.4,1.4L8,9.4l-2.4,2.4l-1.4-1.4L6.6,8L4.2,5.6l1.4-1.4L8,6.6l2.4-2.4l1.4,1.4L9.4,8L11.9,10.5z"/>
-    <style type="text/css">
+    <style>
       .icon-state-default { fill: #cc3d3d; fill-opacity: 1; }
       .icon-state-pressed { fill: #802d2d; fill-opacity: 1; }
     </style>
   </defs>
-  <use xlink:href="#glyphShape-clear" class="icon-state-default" />
-  <use xlink:href="#glyphShape-clear" class="icon-state-pressed" transform="translate(16)" />
+  <use xlink:href="#glyphShape-clear" class="icon-state-default"/>
+  <use xlink:href="#glyphShape-clear" class="icon-state-pressed" transform="translate(16)"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/search-clear-light.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/search-clear-light.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/search-clear-light.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/search-clear-light.svg	2015-05-25 20:43:04.000000000 +0000
@@ -2,20 +2,14 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     x="0"
-     y="0"
-     width="32"
-     height="16"
-     viewBox="0 0 32 16">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="16" viewBox="0 0 32 16">
   <defs>
     <path id="glyphShape-clear" d="M8,0C3.6,0,0,3.6,0,8c0,4.4,3.6,8,8,8s8-3.6,8-8C16,3.6,12.4,0,8,0 z M11.9,10.5l-1.4,1.4L8,9.4l-2.4,2.4l-1.4-1.4L6.6,8L4.2,5.6l1.4-1.4L8,6.6l2.4-2.4l1.4,1.4L9.4,8L11.9,10.5z"/>
-    <style type="text/css">
+    <style>
       .icon-state-default { fill: #1d2126; fill-opacity: .5; }
       .icon-state-pressed { fill: #1d2126; fill-opacity: .8; }
     </style>
   </defs>
-  <use xlink:href="#glyphShape-clear" class="icon-state-default" />
-  <use xlink:href="#glyphShape-clear" class="icon-state-pressed" transform="translate(16)" />
+  <use xlink:href="#glyphShape-clear" class="icon-state-default"/>
+  <use xlink:href="#glyphShape-clear" class="icon-state-pressed" transform="translate(16)"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/timeline-filter.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/timeline-filter.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/timeline-filter.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/timeline-filter.svg	2015-05-25 20:43:04.000000000 +0000
@@ -2,36 +2,25 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     x="0px" y="0px"
-     width="16" height="16"
-     viewBox="0 0 16 16"
-     enable-background="new 0 0 16 16"
-     xml:space="preserve">
-<style>
-use:not(:target) {
-  display: none;
-}
-
-use {
-  fill: #EDF0F1;
-}
-
-use[id$="-disabled"] {
-  fill-opacity: 0.5;
-}
-
-use[id$="-open"] {
-  fill: #3BACE5;
-}
-
-</style>
-<defs style="display:none">
-  <path id="filter-shape"
-         d="M 2,2 v 3 l 5,4 v 6 h 2 v -6 l 5,-4 v -3 L 14,2 z"/>
-</defs>
-<use id="filter"              xlink:href="#filter-shape"/>
-<use id="filter-disabled"     xlink:href="#filter-shape"/>
-<use id="filter-open"         xlink:href="#filter-shape"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: #babec3;
+    }
+    use[id$="-disabled"] {
+      fill-opacity: 0.5;
+    }
+    use[id$="-open"] {
+      fill: #3bace5;
+    }
+  </style>
+  <defs>
+    <path id="filter-shape" d="M 2,2 v 3 l 5,4 v 6 h 2 v -6 l 5,-4 v -3 L 14,2 z"/>
+  </defs>
+  <use id="filter" xlink:href="#filter-shape"/>
+  <use id="filter-disabled" xlink:href="#filter-shape"/>
+  <use id="filter-open" xlink:href="#filter-shape"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/tool-debugger-paused.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/tool-debugger-paused.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/tool-debugger-paused.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/tool-debugger-paused.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,3 +1,6 @@
-<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 16 16">
-<path fill="#71c054" fill-rule="evenodd" d="m8,1c-3.9,0-7,3.1-7,7 0,3.9 3.1,7 7,7 3.9,0 7-3.1 7-7 0-3.9-3.1-7-7-7zm2,11h-1-5c-.6,0-1-.4-1-1v-6c0-.6 .4-1 1-1h5 1l4,4-4,4z"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <path fill="#71c054" fill-rule="evenodd" d="m8,1c-3.9,0-7,3.1-7,7 0,3.9 3.1,7 7,7 3.9,0 7-3.1 7-7 0-3.9-3.1-7-7-7zm2,11h-1-5c-.6,0-1-.4-1-1v-6c0-.6 .4-1 1-1h5 1l4,4-4,4z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/tool-debugger.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/tool-debugger.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/tool-debugger.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/tool-debugger.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,7 +1,10 @@
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 16 16">
-<g fill="#edf0f1" fill-rule="evenodd">
-<path d="m8,1c-3.9,0-7,3.1-7,7 0,3.9 3.1,7 7,7 3.9,0 7-3.1 7-7 0-3.9-3.1-7-7-7zm0,12c-2.8,0-5-2.2-5-5 0-2.8 2.2-5 5-5 2.8,0 5,2.2 5,5 0,2.8-2.2,5-5,5z"/>
-<path d="m6,5c.6,0 1,.4 1,1v4c0,.6-.4,1-1,1-.6,0-1-.4-1-1v-4c0-.6 .4-1 1-1z"/>
-<path d="m10,5c.6,0 1,.4 1,1v4c0,.6-.4,1-1,1-.6,0-1-.4-1-1v-4c0-.6 .4-1 1-1z"/>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <g fill="#edf0f1" fill-rule="evenodd">
+    <path d="m8,1c-3.9,0-7,3.1-7,7 0,3.9 3.1,7 7,7 3.9,0 7-3.1 7-7 0-3.9-3.1-7-7-7zm0,12c-2.8,0-5-2.2-5-5 0-2.8 2.2-5 5-5 2.8,0 5,2.2 5,5 0,2.8-2.2,5-5,5z"/>
+    <path d="m6,5c.6,0 1,.4 1,1v4c0,.6-.4,1-1,1-.6,0-1-.4-1-1v-4c0-.6 .4-1 1-1z"/>
+    <path d="m10,5c.6,0 1,.4 1,1v4c0,.6-.4,1-1,1-.6,0-1-.4-1-1v-4c0-.6 .4-1 1-1z"/>
+  </g>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/tool-inspector.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/tool-inspector.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/tool-inspector.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/tool-inspector.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,9 +1,12 @@
-<svg width="16" xmlns="http://www.w3.org/2000/svg" height="16" viewBox="0 0 16 16" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 16 16">
-<path fill="#eef0f2" fill-rule="evenodd" d="M2,4v9h11V4H2z M11,11H4V6h7V11z"/>
-<g opacity=".8">
-<path opacity=".8" fill="#eef0f2" fill-rule="evenodd" d="M0,8h2v1H0V8z"/>
-<path opacity=".8" fill="#eef0f2" fill-rule="evenodd" d="M13,8h2v1h-2V8z"/>
-<path opacity=".8" fill="#eef0f2" fill-rule="evenodd" d="M7,2h1v2H7V2z"/>
-<path opacity=".8" fill="#eef0f2" fill-rule="evenodd" d="M7,13h1v2H7V13z"/>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="16" xmlns="http://www.w3.org/2000/svg" height="16" viewBox="0 0 16 16">
+  <path fill="#eef0f2" fill-rule="evenodd" d="M2,4v9h11V4H2z M11,11H4V6h7V11z"/>
+  <g opacity=".8">
+    <path opacity=".8" fill="#eef0f2" fill-rule="evenodd" d="M0,8h2v1H0V8z"/>
+    <path opacity=".8" fill="#eef0f2" fill-rule="evenodd" d="M13,8h2v1h-2V8z"/>
+    <path opacity=".8" fill="#eef0f2" fill-rule="evenodd" d="M7,2h1v2H7V2z"/>
+    <path opacity=".8" fill="#eef0f2" fill-rule="evenodd" d="M7,13h1v2H7V13z"/>
+  </g>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/tool-network.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/tool-network.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/tool-network.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/tool-network.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,36 +1,39 @@
-<svg width="17" height="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 17 16" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 17 16">
-<g fill="#edf0f1" fill-rule="evenodd">
-<path opacity=".1" d="M2.1,0h12.8C16,0,17,1,17,2.1v10.6c0,1.2-1,2.1-2.1,2.1H2.1c-1.2,0-2.1-1-2.1-2.1V2.1C0,1,1,0,2.1,0z"/>
-<path d="m2.1,2.1h9.6c.6,0 1.1,.5 1.1,1.1 0,.6-.5,1.1-1.1,1.1h-9.6c-.6,0-1.1-.5-1.1-1.1 .1-.6 .5-1.1 1.1-1.1z"/>
-</g>
-<g opacity=".7">
-<g opacity=".75">
-<path fill="#edf0f1" fill-rule="evenodd" d="m7.4,5.3h7.4c.6,0 1.1,.5 1.1,1.1 0,.6-.5,1.1-1.1,1.1h-7.4c-.5-.1-1-.5-1-1.1 0-.6 .5-1.1 1-1.1z"/>
-</g>
-<g opacity=".85">
-<path fill="#edf0f1" d="m14.9,5.7c.4,0 .7,.3 .7,.7s-.4,.6-.7,.6h-7.5c-.3,0-.6-.3-.6-.6s.3-.7 .7-.7h7.4m0-.4h-7.5c-.6,0-1.1,.5-1.1,1.1 0,.6 .5,1.1 1.1,1.1h7.4c.6,0 1.1-.5 1.1-1.1 0-.6-.4-1.1-1-1.1z"/>
-</g>
-</g>
-<g opacity=".75">
-<path fill="#edf0f1" fill-rule="evenodd" d="m5.3,8.5h3.2c.6,0 1.1,.5 1.1,1.1 0,.6-.5,1.1-1.1,1.1h-3.2c-.6,0-1.1-.5-1.1-1.1 .1-.6 .5-1.1 1.1-1.1z"/>
-</g>
-<g opacity=".85">
-<path fill="#edf0f1" d="m8.5,8.9c.4,0 .7,.3 .7,.7 0,.4-.3,.7-.7,.7h-3.2c-.4,0-.7-.3-.7-.7 0-.4 .3-.7 .7-.7h3.2m0-.4h-3.2c-.6,0-1.1,.5-1.1,1.1 0,.6 .5,1.1 1.1,1.1h3.2c.6,0 1.1-.5 1.1-1.1 0-.6-.5-1.1-1.1-1.1z"/>
-</g>
-<g opacity=".7">
-<g opacity=".75">
-<path fill="#edf0f1" fill-rule="evenodd" d="m4.3,11.7h2.1c.6,0 1.1,.5 1.1,1.1 0,.6-.5,1.1-1.1,1.1h-2.1c-.6,0-1.1-.5-1.1-1.1 0-.6 .5-1.1 1.1-1.1z"/>
-</g>
-<g opacity=".85">
-<path fill="#edf0f1" d="m6.4,12.1c.4,0 .7,.3 .7,.7 0,.4-.3,.7-.7,.7h-2.1c-.4,0-.7-.3-.7-.7 0-.4 .3-.7 .7-.7h2.1m0-.4h-2.1c-.6,0-1.1,.5-1.1,1.1 0,.6 .5,1.1 1.1,1.1h2.1c.6,0 1.1-.5 1.1-1.1-.1-.6-.5-1.1-1.1-1.1z"/>
-</g>
-</g>
-<g opacity="5.000000e-02" fill="#edf0f1" fill-rule="evenodd">
-<path d="m7.4,14.3v-13.8c0-.3-.2-.5-.5-.5-.3,0-.5,.2-.5,.5v13.8c0,.3 .2,.5 .5,.5 .3,.1 .5-.2 .5-.5z"/>
-<path d="m4.2,14.3v-13.8c0-.3-.2-.5-.5-.5-.3,0-.5,.2-.5,.5v13.8c0,.3 .2,.5 .5,.5 .3,.1 .5-.2 .5-.5z"/>
-<path d="m1,14.6c0-.1 0-.1 0-.2v-13.9c0-.1 0-.1 0-.2-.6,.4-1,1-1,1.8v10.6c0,.8 .4,1.5 1,1.9z"/>
-<path d="m16,.3c0,.1 0,.1 0,.2v13.8c0,.1 0,.1 0,.2 .6-.4 1-1 1-1.8v-10.6c0-.7-.4-1.4-1-1.8z"/>
-<path d="m13.8,14.3v-13.8c0-.3-.2-.5-.5-.5-.3,0-.5,.2-.5,.5v13.8c0,.3 .2,.5 .5,.5 .3,.1 .5-.2 .5-.5z"/>
-<path d="m10.6,14.3v-13.8c0-.3-.2-.5-.5-.5-.3,0-.5,.2-.5,.5v13.8c0,.3 .2,.5 .5,.5 .3,.1 .5-.2 .5-.5z"/>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="17" height="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 17 16">
+  <g fill="#edf0f1" fill-rule="evenodd">
+    <path opacity=".1" d="M2.1,0h12.8C16,0,17,1,17,2.1v10.6c0,1.2-1,2.1-2.1,2.1H2.1c-1.2,0-2.1-1-2.1-2.1V2.1C0,1,1,0,2.1,0z"/>
+    <path d="m2.1,2.1h9.6c.6,0 1.1,.5 1.1,1.1 0,.6-.5,1.1-1.1,1.1h-9.6c-.6,0-1.1-.5-1.1-1.1 .1-.6 .5-1.1 1.1-1.1z"/>
+  </g>
+  <g opacity=".7">
+    <g opacity=".75">
+      <path fill="#edf0f1" fill-rule="evenodd" d="m7.4,5.3h7.4c.6,0 1.1,.5 1.1,1.1 0,.6-.5,1.1-1.1,1.1h-7.4c-.5-.1-1-.5-1-1.1 0-.6 .5-1.1 1-1.1z"/>
+    </g>
+    <g opacity=".85">
+      <path fill="#edf0f1" d="m14.9,5.7c.4,0 .7,.3 .7,.7s-.4,.6-.7,.6h-7.5c-.3,0-.6-.3-.6-.6s.3-.7 .7-.7h7.4m0-.4h-7.5c-.6,0-1.1,.5-1.1,1.1 0,.6 .5,1.1 1.1,1.1h7.4c.6,0 1.1-.5 1.1-1.1 0-.6-.4-1.1-1-1.1z"/>
+    </g>
+  </g>
+  <g opacity=".75">
+    <path fill="#edf0f1" fill-rule="evenodd" d="m5.3,8.5h3.2c.6,0 1.1,.5 1.1,1.1 0,.6-.5,1.1-1.1,1.1h-3.2c-.6,0-1.1-.5-1.1-1.1 .1-.6 .5-1.1 1.1-1.1z"/>
+  </g>
+  <g opacity=".85">
+    <path fill="#edf0f1" d="m8.5,8.9c.4,0 .7,.3 .7,.7 0,.4-.3,.7-.7,.7h-3.2c-.4,0-.7-.3-.7-.7 0-.4 .3-.7 .7-.7h3.2m0-.4h-3.2c-.6,0-1.1,.5-1.1,1.1 0,.6 .5,1.1 1.1,1.1h3.2c.6,0 1.1-.5 1.1-1.1 0-.6-.5-1.1-1.1-1.1z"/>
+  </g>
+  <g opacity=".7">
+    <g opacity=".75">
+      <path fill="#edf0f1" fill-rule="evenodd" d="m4.3,11.7h2.1c.6,0 1.1,.5 1.1,1.1 0,.6-.5,1.1-1.1,1.1h-2.1c-.6,0-1.1-.5-1.1-1.1 0-.6 .5-1.1 1.1-1.1z"/>
+    </g>
+    <g opacity=".85">
+      <path fill="#edf0f1" d="m6.4,12.1c.4,0 .7,.3 .7,.7 0,.4-.3,.7-.7,.7h-2.1c-.4,0-.7-.3-.7-.7 0-.4 .3-.7 .7-.7h2.1m0-.4h-2.1c-.6,0-1.1,.5-1.1,1.1 0,.6 .5,1.1 1.1,1.1h2.1c.6,0 1.1-.5 1.1-1.1-.1-.6-.5-1.1-1.1-1.1z"/>
+    </g>
+  </g>
+  <g opacity=".05" fill="#edf0f1" fill-rule="evenodd">
+    <path d="m7.4,14.3v-13.8c0-.3-.2-.5-.5-.5-.3,0-.5,.2-.5,.5v13.8c0,.3 .2,.5 .5,.5 .3,.1 .5-.2 .5-.5z"/>
+    <path d="m4.2,14.3v-13.8c0-.3-.2-.5-.5-.5-.3,0-.5,.2-.5,.5v13.8c0,.3 .2,.5 .5,.5 .3,.1 .5-.2 .5-.5z"/>
+    <path d="m1,14.6c0-.1 0-.1 0-.2v-13.9c0-.1 0-.1 0-.2-.6,.4-1,1-1,1.8v10.6c0,.8 .4,1.5 1,1.9z"/>
+    <path d="m16,.3c0,.1 0,.1 0,.2v13.8c0,.1 0,.1 0,.2 .6-.4 1-1 1-1.8v-10.6c0-.7-.4-1.4-1-1.8z"/>
+    <path d="m13.8,14.3v-13.8c0-.3-.2-.5-.5-.5-.3,0-.5,.2-.5,.5v13.8c0,.3 .2,.5 .5,.5 .3,.1 .5-.2 .5-.5z"/>
+    <path d="m10.6,14.3v-13.8c0-.3-.2-.5-.5-.5-.3,0-.5,.2-.5,.5v13.8c0,.3 .2,.5 .5,.5 .3,.1 .5-.2 .5-.5z"/>
+  </g>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/tool-options.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/tool-options.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/tool-options.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/tool-options.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,3 +1,6 @@
-<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 16 16">
-<path fill="#edf0f1" d="m11.5,13.9l-.6-1.5c.3-.2 .5-.4 .8-.6 .2-.2 .4-.5 .6-.7l1.5,.6c.3,.1 .6,0 .7-.3l.4-1c.1-.3 0-.6-.3-.7l-1.5-.6c.1-.6 .1-1.3 0-2l1.5-.6c.3-.1 .4-.4 .3-.7l-.4-1c-.1-.3-.4-.4-.7-.3l-1.5,.6c-.2-.3-.4-.5-.6-.8-.2-.1-.5-.3-.7-.5l.6-1.5c.1-.3 0-.6-.3-.7l-.9-.4c-.3-.1-.6,0-.7,.3l-.6,1.5c-.6-.1-1.3-.1-2,0l-.6-1.5c-.1-.3-.4-.4-.7-.3l-1,.4c-.2,.1-.3,.4-.2,.6l.6,1.5c-.3,.3-.5,.5-.8,.7-.2,.3-.4,.5-.6,.8l-1.5-.7c-.3-.1-.6,0-.7,.3l-.4,.9c-.1,.3 0,.6 .3,.7l1.5,.7c-.1,.6-.1,1.3 0,1.9l-1.5,.6c-.3,.1-.4,.4-.3,.7l.4,1c.1,.3 .4,.4 .7,.3l1.5-.6c.2,.3 .4,.5 .6,.8 .2,.2 .5,.4 .7,.6l-.6,1.5c-.1,.3 0,.6 .3,.7l1,.4c.3,.1 .6,0 .7-.3l.6-1.5c.6,.1 1.3,.1 2,0l.6,1.5c.1,.3 .4,.4 .7,.3l1-.4c.1-.1 .3-.4 .1-.7zm-5.1-4.2c-.9-.9-.9-2.4 0-3.3 .9-.9 2.4-.9 3.3,0 .9,.9 .9,2.4 0,3.3-.9,.9-2.4,.9-3.3,0z"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <path fill="#edf0f1" d="m11.5,13.9l-.6-1.5c.3-.2 .5-.4 .8-.6 .2-.2 .4-.5 .6-.7l1.5,.6c.3,.1 .6,0 .7-.3l.4-1c.1-.3 0-.6-.3-.7l-1.5-.6c.1-.6 .1-1.3 0-2l1.5-.6c.3-.1 .4-.4 .3-.7l-.4-1c-.1-.3-.4-.4-.7-.3l-1.5,.6c-.2-.3-.4-.5-.6-.8-.2-.1-.5-.3-.7-.5l.6-1.5c.1-.3 0-.6-.3-.7l-.9-.4c-.3-.1-.6,0-.7,.3l-.6,1.5c-.6-.1-1.3-.1-2,0l-.6-1.5c-.1-.3-.4-.4-.7-.3l-1,.4c-.2,.1-.3,.4-.2,.6l.6,1.5c-.3,.3-.5,.5-.8,.7-.2,.3-.4,.5-.6,.8l-1.5-.7c-.3-.1-.6,0-.7,.3l-.4,.9c-.1,.3 0,.6 .3,.7l1.5,.7c-.1,.6-.1,1.3 0,1.9l-1.5,.6c-.3,.1-.4,.4-.3,.7l.4,1c.1,.3 .4,.4 .7,.3l1.5-.6c.2,.3 .4,.5 .6,.8 .2,.2 .5,.4 .7,.6l-.6,1.5c-.1,.3 0,.6 .3,.7l1,.4c.3,.1 .6,0 .7-.3l.6-1.5c.6,.1 1.3,.1 2,0l.6,1.5c.1,.3 .4,.4 .7,.3l1-.4c.1-.1 .3-.4 .1-.7zm-5.1-4.2c-.9-.9-.9-2.4 0-3.3 .9-.9 2.4-.9 3.3,0 .9,.9 .9,2.4 0,3.3-.9,.9-2.4,.9-3.3,0z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/tool-profiler-active.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/tool-profiler-active.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/tool-profiler-active.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/tool-profiler-active.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,14 +1,17 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 16 16">
-<g fill="#71c054" fill-rule="evenodd">
-<path d="m8,1c-3.9,0-7,3.1-7,7s3.1,7 7,7c3.9,0 7-3.1 7-7s-3.1-7-7-7zm-.1,12c-2.8,0-5-2.2-5-5 0-2.8 2.2-5 5-5s5,2.2 5,5c0,2.8-2.2,5-5,5z"/>
-<path d="m8,6.9c.6,0 1.1,.5 1.1,1.1 0,.6-.5,1.1-1.1,1.1-.6,0-1.1-.5-1.1-1.1 0-.6 .5-1.1 1.1-1.1z"/>
-<path d="m11.3,4.6l-3.9,2.5 1.5,1.4 2.4-3.9z"/>
-<path opacity=".4" d="m4.6,10c.7,1.2 2,2 3.4,2 1.5,0 2.7-.8 3.4-2h-6.8z"/>
-<g opacity=".3">
-<path d="m7.1,5.1l-.6-1.3-.9,.4 .7,1.3c.2-.1 .5-.3 .8-.4z"/>
-<path d="m9.8,5.6l.7-1.4-.9-.4-.7,1.3c.3,.2 .6,.3 .9,.5z"/>
-<path d="m10.8,7c.1,.3 .2,.7 .2,1h2v-1h-2.2z"/>
-<path d="m5,8c0-.3 .1-.7 .2-1h-2.2l-.1,1h2.1z"/>
-</g>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#71c054" fill-rule="evenodd">
+    <path d="m8,1c-3.9,0-7,3.1-7,7s3.1,7 7,7c3.9,0 7-3.1 7-7s-3.1-7-7-7zm-.1,12c-2.8,0-5-2.2-5-5 0-2.8 2.2-5 5-5s5,2.2 5,5c0,2.8-2.2,5-5,5z"/>
+    <path d="m8,6.9c.6,0 1.1,.5 1.1,1.1 0,.6-.5,1.1-1.1,1.1-.6,0-1.1-.5-1.1-1.1 0-.6 .5-1.1 1.1-1.1z"/>
+    <path d="m11.3,4.6l-3.9,2.5 1.5,1.4 2.4-3.9z"/>
+    <path opacity=".4" d="m4.6,10c.7,1.2 2,2 3.4,2 1.5,0 2.7-.8 3.4-2h-6.8z"/>
+    <g opacity=".3">
+      <path d="m7.1,5.1l-.6-1.3-.9,.4 .7,1.3c.2-.1 .5-.3 .8-.4z"/>
+      <path d="m9.8,5.6l.7-1.4-.9-.4-.7,1.3c.3,.2 .6,.3 .9,.5z"/>
+      <path d="m10.8,7c.1,.3 .2,.7 .2,1h2v-1h-2.2z"/>
+      <path d="m5,8c0-.3 .1-.7 .2-1h-2.2l-.1,1h2.1z"/>
+    </g>
+  </g>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/tool-profiler.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/tool-profiler.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/tool-profiler.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/tool-profiler.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,14 +1,17 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 16 16">
-<g fill="#edf0f1" fill-rule="evenodd">
-<path d="m8,1c-3.9,0-7,3.1-7,7s3.1,7 7,7c3.9,0 7-3.1 7-7s-3.1-7-7-7zm-.1,12c-2.8,0-5-2.2-5-5 0-2.8 2.2-5 5-5s5,2.2 5,5c0,2.8-2.2,5-5,5z"/>
-<path d="m8,6.9c.6,0 1.1,.5 1.1,1.1 0,.6-.5,1.1-1.1,1.1-.6,0-1.1-.5-1.1-1.1 0-.6 .5-1.1 1.1-1.1z"/>
-<path d="m11.3,4.6l-3.9,2.5 1.5,1.4 2.4-3.9z"/>
-<path opacity=".4" d="m4.6,10c.7,1.2 2,2 3.4,2 1.5,0 2.7-.8 3.4-2h-6.8z"/>
-<g opacity=".3">
-<path d="m7.1,5.1l-.6-1.3-.9,.4 .7,1.3c.2-.1 .5-.3 .8-.4z"/>
-<path d="m9.8,5.6l.7-1.4-.9-.4-.7,1.3c.3,.2 .6,.3 .9,.5z"/>
-<path d="m10.8,7c.1,.3 .2,.7 .2,1h2v-1h-2.2z"/>
-<path d="m5,8c0-.3 .1-.7 .2-1h-2.2l-.1,1h2.1z"/>
-</g>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#edf0f1" fill-rule="evenodd">
+    <path d="m8,1c-3.9,0-7,3.1-7,7s3.1,7 7,7c3.9,0 7-3.1 7-7s-3.1-7-7-7zm-.1,12c-2.8,0-5-2.2-5-5 0-2.8 2.2-5 5-5s5,2.2 5,5c0,2.8-2.2,5-5,5z"/>
+    <path d="m8,6.9c.6,0 1.1,.5 1.1,1.1 0,.6-.5,1.1-1.1,1.1-.6,0-1.1-.5-1.1-1.1 0-.6 .5-1.1 1.1-1.1z"/>
+    <path d="m11.3,4.6l-3.9,2.5 1.5,1.4 2.4-3.9z"/>
+    <path opacity=".4" d="m4.6,10c.7,1.2 2,2 3.4,2 1.5,0 2.7-.8 3.4-2h-6.8z"/>
+    <g opacity=".3">
+      <path d="m7.1,5.1l-.6-1.3-.9,.4 .7,1.3c.2-.1 .5-.3 .8-.4z"/>
+      <path d="m9.8,5.6l.7-1.4-.9-.4-.7,1.3c.3,.2 .6,.3 .9,.5z"/>
+      <path d="m10.8,7c.1,.3 .2,.7 .2,1h2v-1h-2.2z"/>
+      <path d="m5,8c0-.3 .1-.7 .2-1h-2.2l-.1,1h2.1z"/>
+    </g>
+  </g>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/tool-scratchpad.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/tool-scratchpad.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/tool-scratchpad.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/tool-scratchpad.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,6 +1,9 @@
-<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 16 16">
-<g fill="#edf0f1" fill-rule="evenodd">
-<path opacity=".3" d="m1.1,6.3c0-.3 .3-.6 .6-.6h4.6c.3,0 .6,.3 .6,.6s-.3,.6-.6,.6h-4.6c-.3,0-.6-.3-.6-.6zm12,1.7h-10.2c-.4,0-.6,.3-.6,.6 0,.3 .3,.6 .6,.6h10.3c.3,0 .6-.3 .6-.6-.1-.3-.3-.6-.7-.6zm-5.7,3.4c.3,0 .6-.3 .6-.6 0-.3-.3-.6-.6-.6h-4.5c-.3,0-.6,.3-.6,.6 0,.3 .3,.6 .6,.6h4.5zm2.3,1.2h-8c-.3,0-.6,.3-.6,.6 0,.3 .3,.6 .6,.6h8c.3,0 .6-.3 .6-.6 0-.4-.3-.6-.6-.6z"/>
-<path d="m14.3,2.3h-.6v1.1c0,.6-.5,1.1-1.1,1.1-.6,0-1.1-.5-1.1-1.1v-.5c0,.3 .3,.6 .6,.6 .3,0 .6-.3 .6-.6v-.6-1.7c0-.1 0-.2-.1-.3-.1-.1-.1-.1-.2-.2-.2-.1-.3-.1-.4-.1-.3,0-.6,.3-.6,.6v1.7h-1.1v1.1c0,.6-.5,1.1-1.1,1.1-.7,.1-1.2-.4-1.2-1.1v-.5c0,.3 .3,.6 .6,.6 .3,0 .6-.3 .6-.6v-.6-1.7c0-.1 0-.2-.1-.3-.1-.1-.2-.2-.3-.2-.1-.1-.1-.1-.2-.1-.3,0-.6,.3-.6,.6v1.7h-1.1v1.1c0,.6-.5,1.1-1.1,1.1-.6,0-1.1-.5-1.1-1.1v-.5c0,.3 .3,.6 .6,.6 .3,0 .6-.3 .6-.6v-.6-1.7c0-.1 0-.2-.1-.3-.3-.1-.3-.2-.4-.2-.1-.1-.2-.1-.3-.1-.3,0-.5,.3-.5,.6v1.7h-1.2v1.1c0,.6-.5,1.1-1.1,1.1-.6,0-1.1-.5-1.1-1.1v-.5c0,.3 .3,.6 .6,.6 .3,0 .6-.3 .6-.6v-.6-1.7c0-.1 0-.2-.1-.3-.2-.1-.2-.2-.3-.2-.1-.1-.2-.1-.3-.1-.3,0-.6,.3-.6,.6v1.7h-.5c-.3,0-.6,.2-.6,.6v12.6c0,.2 .3,.5 .6,.5h13.7c.3,0 .6-.3 .6-.6v-12.5c0-.4-.3-.6-.6-.6zm-12.6,3.4h4.6c.3,0 .6,.3 .6,.6s-.3,.6-.6,.6h-4.6c-.3,0-.6-.3-.6-.6s.3-.6 .6-.6zm8,8h-8c-.3,0-.6-.3-.6-.6 0-.3 .3-.6 .6-.6h8c.3,0 .6,.3 .6,.6 0,.4-.3,.6-.6,.6zm-7.4-2.8c0-.3 .3-.6 .6-.6h4.6c.3,0 .6,.3 .6,.6 0,.3-.3,.6-.6,.6h-4.6c-.4-.1-.6-.3-.6-.6zm10.8-1.8h-10.2c-.3,0-.6-.3-.6-.6 0-.2 .2-.5 .6-.5h10.3c.3,0 .6,.3 .6,.6-.1,.3-.3,.5-.7,.5z"/>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <g fill="#edf0f1" fill-rule="evenodd">
+    <path opacity=".3" d="m1.1,6.3c0-.3 .3-.6 .6-.6h4.6c.3,0 .6,.3 .6,.6s-.3,.6-.6,.6h-4.6c-.3,0-.6-.3-.6-.6zm12,1.7h-10.2c-.4,0-.6,.3-.6,.6 0,.3 .3,.6 .6,.6h10.3c.3,0 .6-.3 .6-.6-.1-.3-.3-.6-.7-.6zm-5.7,3.4c.3,0 .6-.3 .6-.6 0-.3-.3-.6-.6-.6h-4.5c-.3,0-.6,.3-.6,.6 0,.3 .3,.6 .6,.6h4.5zm2.3,1.2h-8c-.3,0-.6,.3-.6,.6 0,.3 .3,.6 .6,.6h8c.3,0 .6-.3 .6-.6 0-.4-.3-.6-.6-.6z"/>
+    <path d="m14.3,2.3h-.6v1.1c0,.6-.5,1.1-1.1,1.1-.6,0-1.1-.5-1.1-1.1v-.5c0,.3 .3,.6 .6,.6 .3,0 .6-.3 .6-.6v-.6-1.7c0-.1 0-.2-.1-.3-.1-.1-.1-.1-.2-.2-.2-.1-.3-.1-.4-.1-.3,0-.6,.3-.6,.6v1.7h-1.1v1.1c0,.6-.5,1.1-1.1,1.1-.7,.1-1.2-.4-1.2-1.1v-.5c0,.3 .3,.6 .6,.6 .3,0 .6-.3 .6-.6v-.6-1.7c0-.1 0-.2-.1-.3-.1-.1-.2-.2-.3-.2-.1-.1-.1-.1-.2-.1-.3,0-.6,.3-.6,.6v1.7h-1.1v1.1c0,.6-.5,1.1-1.1,1.1-.6,0-1.1-.5-1.1-1.1v-.5c0,.3 .3,.6 .6,.6 .3,0 .6-.3 .6-.6v-.6-1.7c0-.1 0-.2-.1-.3-.3-.1-.3-.2-.4-.2-.1-.1-.2-.1-.3-.1-.3,0-.5,.3-.5,.6v1.7h-1.2v1.1c0,.6-.5,1.1-1.1,1.1-.6,0-1.1-.5-1.1-1.1v-.5c0,.3 .3,.6 .6,.6 .3,0 .6-.3 .6-.6v-.6-1.7c0-.1 0-.2-.1-.3-.2-.1-.2-.2-.3-.2-.1-.1-.2-.1-.3-.1-.3,0-.6,.3-.6,.6v1.7h-.5c-.3,0-.6,.2-.6,.6v12.6c0,.2 .3,.5 .6,.5h13.7c.3,0 .6-.3 .6-.6v-12.5c0-.4-.3-.6-.6-.6zm-12.6,3.4h4.6c.3,0 .6,.3 .6,.6s-.3,.6-.6,.6h-4.6c-.3,0-.6-.3-.6-.6s.3-.6 .6-.6zm8,8h-8c-.3,0-.6-.3-.6-.6 0-.3 .3-.6 .6-.6h8c.3,0 .6,.3 .6,.6 0,.4-.3,.6-.6,.6zm-7.4-2.8c0-.3 .3-.6 .6-.6h4.6c.3,0 .6,.3 .6,.6 0,.3-.3,.6-.6,.6h-4.6c-.4-.1-.6-.3-.6-.6zm10.8-1.8h-10.2c-.3,0-.6-.3-.6-.6 0-.2 .2-.5 .6-.5h10.3c.3,0 .6,.3 .6,.6-.1,.3-.3,.5-.7,.5z"/>
+  </g>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/tool-storage.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/tool-storage.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/tool-storage.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/tool-storage.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,7 +1,10 @@
-<svg width="16" xmlns="http://www.w3.org/2000/svg" height="16" viewBox="0 0 16 16" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 16 16">
-<g fill="#edf0f1">
-<path d="m1.3,12.5v-2.4c0,0 0,2.5 6.7,2.5 6.7,0 6.7-2.5 6.7-2.5v2.4c0,0 0,2.7-6.8,2.7-6.6,0-6.6-2.7-6.6-2.7z"/>
-<path d="m14.7,3.4c0-1.4-3-2.5-6.7-2.5s-6.7,1.1-6.7,2.5c0,.2 0,.3 .1,.5-.1-.3-.1-.4-.1-.4v1.5c0,0 0,2.7 6.7,2.7 6.7,0 6.8-2.7 6.8-2.7v-1.6c0,.1 0,.2-.1,.5-0-.2-0-.3-0-.5z"/>
-<path d="m1.3,8.7v-2.4c0,0 0,2.5 6.7,2.5 6.7,0 6.7-2.5 6.7-2.5v2.4c0,0 0,2.7-6.8,2.7-6.6-0-6.6-2.7-6.6-2.7z"/>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="16" xmlns="http://www.w3.org/2000/svg" height="16" viewBox="0 0 16 16">
+  <g fill="#edf0f1">
+    <path d="m1.3,12.5v-2.4c0,0 0,2.5 6.7,2.5 6.7,0 6.7-2.5 6.7-2.5v2.4c0,0 0,2.7-6.8,2.7-6.6,0-6.6-2.7-6.6-2.7z"/>
+    <path d="m14.7,3.4c0-1.4-3-2.5-6.7-2.5s-6.7,1.1-6.7,2.5c0,.2 0,.3 .1,.5-.1-.3-.1-.4-.1-.4v1.5c0,0 0,2.7 6.7,2.7 6.7,0 6.8-2.7 6.8-2.7v-1.6c0,.1 0,.2-.1,.5-0-.2-0-.3-0-.5z"/>
+    <path d="m1.3,8.7v-2.4c0,0 0,2.5 6.7,2.5 6.7,0 6.7-2.5 6.7-2.5v2.4c0,0 0,2.7-6.8,2.7-6.6-0-6.6-2.7-6.6-2.7z"/>
+  </g>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/tool-styleeditor.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/tool-styleeditor.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/tool-styleeditor.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/tool-styleeditor.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,6 +1,9 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="17" height="16" viewBox="0 0 17 16" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 17 16">
-<g fill="#edf0f1" fill-rule="evenodd">
-<path d="m10,11.1 0,2.3-7.8,0 0-11.2 5.6-0 1.1,1.1 1.7-1.6-1.7-1.7-8.9,0 0,15.6 12.2,0 0-6.7z"/>
-<path d="M6.7,7.8L14.5,0l2.2,2.2L8.9,10l-3.3,1.1L6.7,7.8z"/>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="17" height="16" viewBox="0 0 17 16">
+  <g fill="#edf0f1" fill-rule="evenodd">
+    <path d="m10,11.1 0,2.3-7.8,0 0-11.2 5.6-0 1.1,1.1 1.7-1.6-1.7-1.7-8.9,0 0,15.6 12.2,0 0-6.7z"/>
+    <path d="M6.7,7.8L14.5,0l2.2,2.2L8.9,10l-3.3,1.1L6.7,7.8z"/>
+  </g>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/tool-webaudio.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/tool-webaudio.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/tool-webaudio.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/tool-webaudio.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,3 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="16px" height="16px" viewBox="-6.167 -16.135 100 100" enable-background="new -6.167 -16.135 100 100" xml:space="preserve">
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16px" height="16px" viewBox="-6.167 -16.135 100 100">
   <path fill="none" stroke="#edf0f1" stroke-width="8" stroke-linecap="round" stroke-miterlimit="10" d="M86.666,33.864  c-0.797,5.297-3.467,32.799-10.518,32.866c-7.086,0.066-9.973-27.596-10.9-32.866C64.322,28.597,61.436,0.933,54.35,1  c-7.105,0.068-9.644,27.561-10.517,32.864c-0.874,5.305-3.412,32.799-10.517,32.866c-7.087,0.066-9.974-27.596-10.899-32.866  C21.49,28.597,18.604,0.933,11.517,1C4.466,1.067,1.796,28.569,1,33.864"/>
-</svg>
\ No newline at end of file
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/tool-webconsole.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/tool-webconsole.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/images/tool-webconsole.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/images/tool-webconsole.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,3 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 16 16">
-<path fill="#edf0f1" fill-rule="evenodd" d="M2,2h5.4l6.5,6.5L7.4,15H2l6.5-6.5L2,2z"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#edf0f1" fill-rule="evenodd" d="M2,2h5.4l6.5,6.5L7.4,15H2l6.5-6.5L2,2z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/light-theme.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/light-theme.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/light-theme.css	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/light-theme.css	2015-05-25 20:43:04.000000000 +0000
@@ -34,6 +34,14 @@
   --theme-highlight-orange: #f13c00;
   --theme-highlight-red: #ed2655;
   --theme-highlight-pink: #b82ee5;
+
+  /* Colors used in Graphs, like performance tools. Similar colors to Chrome's timeline. */
+  --theme-graphs-green: #85d175;
+  --theme-graphs-blue: #83b7f6;
+  --theme-graphs-purple: #b693eb;
+  --theme-graphs-yellow: #efc052;
+  --theme-graphs-red: #e57180;
+  --theme-graphs-grey: #cccccc;
 }
 
 .theme-body {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/performance.inc.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/performance.inc.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/performance.inc.css	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/performance.inc.css	2015-05-25 20:43:04.000000000 +0000
@@ -84,21 +84,13 @@
   margin: 3px 2px;
 }
 
-.theme-dark #performance-view toolbarbutton.record-button {
-  background-color: var(--theme-tab-toolbar-background);
-  border: 1px solid var(--theme-sidebar-background);
-}
-
-.theme-light #performance-view toolbarbutton.record-button {
-  background-color: rgba(221, 221, 221, 1);
-  border: 1px solid rgba(204, 204, 204, 1);
+#performance-view .realtime-message {
+  opacity: 0.5;
+  display: block;
 }
 
 #performance-view toolbarbutton.record-button {
-  margin: 5px;
   padding: 5px;
-  cursor: pointer;
-  text-shadow: none;
 }
 
 #performance-view toolbarbutton.record-button[checked],
@@ -107,6 +99,30 @@
   background: var(--theme-selection-background);
 }
 
+.record-button[locked] {
+  pointer-events: none;
+  opacity: 0.5;
+}
+
+#performance-view .realtime-disabled-message,
+#performance-view .realtime-disabled-on-e10s-message {
+  display: none;
+  /* This label does not want to wrap naturally (based on some combination of
+     it's parents and flex).  Quick and dirty way to force it to wrap -> don't
+     let it get bigger than half the screen size */
+  max-width: 60vw;
+}
+
+#performance-view[e10s="disabled"] .realtime-disabled-on-e10s-message {
+  display: block;
+  opacity: 0.5;
+
+}
+#performance-view[e10s="unsupported"] .realtime-disabled-message {
+  display: block;
+  opacity: 0.5;
+}
+
 #details-pane-container .buffer-status-message,
 #details-pane-container .buffer-status-message-full {
   display: none;
@@ -138,10 +154,6 @@
   list-style-image: url(profiler-stopwatch-checked.svg);
 }
 
-#main-record-button[locked] {
-  pointer-events: none;
-}
-
 #main-record-button .button-icon {
   margin: 0;
 }
@@ -274,8 +286,11 @@
   opacity: 0.6;
 }
 
+.call-tree-name {
+  -moz-margin-end: 4px !important;
+}
+
 .call-tree-url {
-  -moz-margin-start: 4px !important;
   cursor: pointer;
 }
 
@@ -302,14 +317,6 @@
   color: var(--theme-content-color2);
 }
 
-.call-tree-name[value=""],
-.call-tree-url[value=""],
-.call-tree-line[value=""],
-.call-tree-column[value=""],
-.call-tree-host[value=""] {
-  display: none;
-}
-
 .call-tree-zoom {
   -moz-appearance: none;
   background-color: transparent;
@@ -450,15 +457,6 @@
   color: var(--theme-selection-color);
 }
 
-.waterfall-marker-location {
-   color: -moz-nativehyperlinktext;
-}
-
-.waterfall-marker-location:hover,
-.waterfall-marker-location:focus {
-   text-decoration: underline;
-}
-
 #waterfall-details {
   -moz-padding-start: 8px;
   -moz-padding-end: 8px;
@@ -473,41 +471,29 @@
   border-radius: 1px;
 }
 
-#performance-filter-menupopup > menuitem.highlight-pink:before,
-.marker-details-bullet.highlight-pink,
-.waterfall-marker-bar.highlight-pink,
-.waterfall-marker-bullet.highlight-pink {
-  background-color: var(--theme-highlight-pink);
-}
-#performance-filter-menupopup > menuitem.highlight-bluegrey:before,
-.marker-details-bullet.highlight-bluegrey,
-.waterfall-marker-bar.highlight-bluegrey,
-.waterfall-marker-bullet.highlight-bluegrey {
-  background-color: var(--theme-highlight-bluegrey);
-}
-#performance-filter-menupopup > menuitem.highlight-green:before,
-.marker-details-bullet.highlight-green,
-.waterfall-marker-bar.highlight-green,
-.waterfall-marker-bullet.highlight-green {
-  background-color: var(--theme-highlight-green);
-}
-#performance-filter-menupopup > menuitem.highlight-lightorange:before,
-.marker-details-bullet.highlight-lightorange,
-.waterfall-marker-bar.highlight-lightorange,
-.waterfall-marker-bullet.highlight-lightorange {
-  background-color: var(--theme-highlight-lightorange);
-}
-#performance-filter-menupopup > menuitem.highlight-red:before,
-.marker-details-bullet.highlight-red,
-.waterfall-marker-bar.highlight-red,
-.waterfall-marker-bullet.highlight-red {
-  background-color: var(--theme-highlight-red);
-}
-#performance-filter-menupopup > menuitem.highlight-purple:before,
-.marker-details-bullet.highlight-purple,
-.waterfall-marker-bar.highlight-purple,
-.waterfall-marker-bullet.highlight-purple {
-  background-color: var(--theme-highlight-purple);
+menuitem.marker-color-graphs-purple:before,
+.marker-color-graphs-purple {
+  background-color: var(--theme-graphs-purple);
+}
+menuitem.marker-color-graphs-grey:before,
+.marker-color-graphs-grey{
+  background-color: var(--theme-graphs-grey);
+}
+menuitem.marker-color-graphs-green:before,
+.marker-color-graphs-green {
+  background-color: var(--theme-graphs-green);
+}
+menuitem.marker-color-graphs-yellow:before,
+.marker-color-graphs-yellow {
+  background-color: var(--theme-graphs-yellow);
+}
+menuitem.marker-color-graphs-red:before,
+.marker-color-graphs-red {
+  background-color: var(--theme-graphs-red);
+}
+menuitem.marker-color-graphs-blue:before,
+.marker-color-graphs-blue {
+  background-color: var(--theme-graphs-blue);
 }
 
 #waterfall-details > * {
@@ -672,3 +658,35 @@
     background-image: url(chrome://browser/skin/devtools/webconsole@2x.png);
   }
 }
+
+/**
+ * Configurable Options
+ *
+ * Elements can be tagged with a class and visibility is controlled via a preference being
+ * applied or removed.
+ */
+
+/**
+ * devtools.performance.ui.experimental
+ */
+menuitem.experimental-option::before {
+  content: "";
+  background-image: url(chrome://browser/skin/devtools/webconsole.png);
+  background-repeat: no-repeat;
+  background-size: 48px 40px;
+  margin: 2px 5px 0 0;
+  width: 8px;
+  height: 8px;
+  max-height: 8px;
+  display: inline-block;
+  background-position: -16px -16px;
+}
+@media (min-resolution: 1.25dppx) {
+  menuitem.experimental-option::before {
+    background-image: url(chrome://browser/skin/devtools/webconsole@2x.png);
+  }
+}
+#performance-options-menupopup:not(.experimental-enabled) .experimental-option,
+#performance-options-menupopup:not(.experimental-enabled) .experimental-option::before {
+  display: none;
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/profiler.inc.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/profiler.inc.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/profiler.inc.css	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/profiler.inc.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,392 +0,0 @@
-/* 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/. */
-
-/* CSS Variables specific to this panel that aren't defined by the themes */
-.theme-dark {
-  --cell-border-color: rgba(255,255,255,0.15);
-  --focus-cell-border-color: rgba(0,0,0,0.3);
-  --row-alt-background-color: rgba(29,79,115,0.15);
-  --row-hover-background-color: rgba(29,79,115,0.25);
-  --tab-hover-background-color: rgba(0,0,0,0.3);
-}
-
-.theme-light {
-  --cell-border-color: rgba(0,0,0,0.15);
-  --focus-cell-border-color: rgba(255,255,255,0.5);
-  --row-alt-background-color: rgba(76,158,217,0.1);
-  --row-hover-background-color: rgba(76,158,217,0.2);
-  --tab-hover-background-color: rgba(255,255,255,0.8);
-}
-
-/* Reload and waiting notices */
-
-.notice-container {
-  margin-top: -50vh;
-  font-size: 120%;
-  background-color: var(--theme-toolbar-background);
-  color: var(--theme-body-color-alt);
-}
-
-#empty-notice button,
-#recording-notice button {
-  min-width: 30px;
-  min-height: 28px;
-  margin: 0;
-  list-style-image: url(profiler-stopwatch.svg);
-}
-
-#empty-notice button[checked],
-#recording-notice button[checked] {
-  list-style-image: url(profiler-stopwatch-checked.svg);
-}
-
-#empty-notice button .button-text,
-#recording-notice button .button-text {
-  display: none;
-}
-
-.theme-dark #loading-notice {
-  font-size: 250%;
-  color: rgba(255,255,255,0.2);
-}
-
-.theme-light #loading-notice {
-  font-size: 250%;
-  color: rgba(0,0,0,0.2);
-}
-
-/* Recordings pane */
-
-#recordings-pane > tabs,
-#recordings-pane .devtools-toolbar {
-  -moz-border-end-width: 1px;
-}
-
-#recordings-pane > tabs,
-#recordings-pane .devtools-toolbar {
-  -moz-border-end-color: var(--theme-splitter-color);
-}
-
-#record-button {
-  list-style-image: url(profiler-stopwatch.svg);
-}
-
-#record-button[checked] {
-  list-style-image: url(profiler-stopwatch-checked.svg);
-}
-
-#record-button[locked] {
-  pointer-events: none;
-}
-
-/* Recording items */
-
-.recording-item {
-  padding: 4px;
-}
-
-.recording-item-title {
-  font-size: 110%;
-}
-
-.recording-item-footer {
-  padding-top: 4px;
-  font-size: 90%;
-}
-
-.recording-item-save {
-  text-decoration: underline;
-  cursor: pointer;
-}
-
-.recording-item-duration,
-.recording-item-save {
-  color: var(--theme-body-color-alt);
-}
-
-#recordings-list .selected label {
-  /* Text inside a selected item should not be custom colored. */
-  color: inherit !important;
-}
-
-/* Profile pane */
-
-#profile-content tabs {
-  -moz-box-align: stretch;
-  height: 24px;
-  font: inherit;
-}
-
-#profile-content tab {
-  -moz-box-flex: 0;
-  background-color: transparent;
-  border: none;
-  border-radius: 0;
-  padding: 0;
-  text-shadow: none;
-  transition-duration: 0.25s;
-  transition-timing-function: ease-in-out;
-  transition-property: opacity, transform;
-}
-
-#profile-content tab {
-  color: var(--theme-body-color);
-}
-
-#profile-content tab:not([selected]) {
-  cursor: pointer;
-}
-
-#profile-content tab[covered] {
-  opacity: 0;
-  transform: translateY(100%);
-}
-
-#profile-content tab {
-  -moz-appearance: none;
-  -moz-border-end: 1px solid var(--theme-splitter-color);
-}
-
-#profile-content tab:hover {
-  background-color: var(--tab-hover-background-color);
-}
-
-#profile-content tab[selected] {
-  background-color: var(--theme-selection-background);
-  color: var(--theme-selection-color);
-}
-
-#profile-content tabpanel {
-  -moz-box-orient: vertical;
-  transform: translateZ(1px); /* Make sure the tabpanel appears above the tab */
-}
-
-#profile-newtab-button {
-  -moz-appearance: none;
-  background-color: transparent;
-  background-position: 4px 2px;
-  background-size: 54px 20px;
-  min-width: 26px;
-  margin: 0;
-  border: none;
-  cursor: pointer;
-}
-
-.theme-dark #profile-newtab-button {
-  background-color: rgba(112,191,83,0.2);
-}
-
-.theme-light #profile-newtab-button {
-  background-color: rgba(44,187,15,0.2);
-}
-
-.theme-dark #profile-newtab-button {
-  background-image: url(newtab-inverted.png);
-}
-
-.theme-light #profile-newtab-button {
-  background-image: url(newtab.png);
-}
-
-@media (min-resolution: 1.25dppx) {
-  .theme-dark #profile-newtab-button {
-    background-image: url(newtab-inverted@2x.png);
-  }
-
-  .theme-light #profile-newtab-button {
-    background-image: url(newtab@2x.png);
-  }
-}
-
-#profile-newtab-button:hover {
-  background-position: 40px 2px;
-}
-
-#profile-newtab-button:hover:active {
-  background-position: 22px 2px;
-}
-
-/* Profile call tree */
-
-.call-tree-headers-container {
-  border-top: 1px solid var(--theme-splitter-color);
-}
-
-.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;
-  color: var(--theme-body-color);
-}
-
-.call-tree-header:not(:last-child),
-.call-tree-cell:not(:last-child) {
-  -moz-border-end-width: 1px;
-  -moz-border-end-style: solid;
-}
-
-.call-tree-header,
-.call-tree-cell {
-  -moz-border-end-color: var(--cell-border-color);
-}
-
-.call-tree-header:not(:last-child) {
-  text-align: center;
-}
-
-.call-tree-cell:not(:last-child) {
-  text-align: end;
-}
-
-.call-tree-header {
-  background-color: var(--theme-tab-toolbar-background);
-}
-
-.call-tree-item:last-child:not(:focus) {
-  border-bottom: 1px solid var(--cell-border-color);
-}
-
-.call-tree-item:nth-child(2n) {
-  background-color: var(--row-alt-background-color);
-}
-
-.call-tree-item:hover {
-  background-color: var(--row-hover-background-color);
-}
-
-.call-tree-item:focus {
-  background-color: var(--theme-selection-background);
-}
-
-.call-tree-item:focus label {
-  color: var(--theme-selection-color) !important;
-}
-
-.call-tree-item:focus .call-tree-cell {
-  -moz-border-end-color: var(--focus-cell-border-color);
-}
-
-.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,
-.call-tree-item:not([origin="content"]) .call-tree-column {
-  /* 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;
-}
-
-.call-tree-url {
-  color: var(--theme-highlight-blue);
-}
-
-.call-tree-line {
-  color: var(--theme-highlight-orange);
-}
-
-.call-tree-column {
-  color: var(--theme-highlight-orange);
-  opacity: 0.6;
-}
-
-.call-tree-host {
-  -moz-margin-start: 8px !important;
-  font-size: 90%;
-  color: var(--theme-content-color2);
-}
-
-.call-tree-name[value=""],
-.call-tree-url[value=""],
-.call-tree-line[value=""],
-.call-tree-column[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: 1.25dppx) {
-  .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 firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/ruleview.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/ruleview.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/ruleview.css	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/ruleview.css	2015-05-25 20:43:04.000000000 +0000
@@ -16,15 +16,15 @@
 }
 
 .ruleview-rule-source {
-  -moz-padding-start: 5px;
   text-align: end;
   float: right;
   -moz-user-select: none;
+  margin-bottom: 2px;
 }
 
-.ruleview-rule-source,
 .ruleview-rule-source > label {
   cursor: pointer;
+  margin: 0;
 }
 
 .ruleview-rule-source[unselectable],
@@ -160,9 +160,9 @@
 .ruleview-swatch {
   cursor: pointer;
   border-radius: 50%;
-  width: 1em;
-  height: 1em;
-  vertical-align: text-top;
+  width: 0.9em;
+  height: 0.9em;
+  vertical-align: middle;
   -moz-margin-end: 5px;
   display: inline-block;
   position: relative;
@@ -264,3 +264,8 @@
 .ruleview-selectorhighlighter.highlighted {
   background-position: -16px 0;
 }
+
+#ruleview-add-rule-button::before {
+  background-image: url("chrome://browser/skin/devtools/add.svg");
+  background-size: cover;
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/timeline.inc.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/timeline.inc.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/timeline.inc.css	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/timeline.inc.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,246 +0,0 @@
-/* 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/. */
-
-#record-button {
-  list-style-image: url(profiler-stopwatch.svg);
-  min-width: 24px;
-}
-
-#record-button[checked] {
-  list-style-image: url(profiler-stopwatch-checked.svg);
-}
-
-#record-button:not([checked]) ~ #record-label {
-  visibility: hidden;
-}
-
-#memory-checkbox .checkbox-label {
-  line-height: 100%;
-}
-
-#filter-button {
-  list-style-image: url(timeline-filter.svg#filter);
-  min-width: 24px;
-}
-
-#filter-button[disabled] {
-  list-style-image: url(timeline-filter.svg#filter-disabled);
-}
-
-#filter-button[open] {
-  list-style-image: url(timeline-filter.svg#filter-open);
-}
-
-#timelineFilterPopup > menuitem:before {
-  content: "";
-  display: block;
-  width: 8px;
-  height: 8px;
-  margin: 0 8px;
-  border: 1px solid;
-  border-radius: 1px;
-  background-color: var(--bullet-bg);
-  border-color: var(--bullet-border);
-}
-
-.notice-container {
-  font-size: 120%;
-  padding-bottom: 35vh;
-}
-
-.theme-dark .notice-container {
-  background: #343c45; /* Toolbars */
-  color: #f5f7fa; /* Light foreground text */
-}
-
-.theme-light .notice-container {
-  background: #f0f1f2; /* Toolbars */
-  color: #585959; /* Grey foreground text */
-}
-
-#empty-notice button,
-#recording-notice button {
-  min-width: 30px;
-  min-height: 28px;
-  margin: 0;
-  list-style-image: url(profiler-stopwatch.svg);
-}
-
-#empty-notice button[checked],
-#recording-notice button[checked] {
-  list-style-image: url(profiler-stopwatch-checked.svg);
-}
-
-#empty-notice button .button-text,
-#recording-notice button .button-text {
-  display: none;
-}
-
-.theme-dark #timeline-pane {
-  border-top: 1px solid #000;
-}
-
-.theme-light #timeline-pane {
-  border-top: 1px solid #aaa;
-}
-
-.waterfall-list-contents {
-  /* Hack: force hardware acceleration */
-  transform: translateZ(1px);
-  overflow-x: hidden;
-  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 */
-  background-image: -moz-element(#waterfall-background);
-  background-repeat: repeat-y;
-  background-position: -1px center;
-}
-
-.waterfall-marker-container[is-spacer] {
-  pointer-events: none;
-}
-
-.theme-dark .waterfall-marker-container:not([is-spacer]):nth-child(2n) {
-  background-color: rgba(255,255,255,0.03);
-}
-
-.theme-light .waterfall-marker-container:not([is-spacer]):nth-child(2n) {
-  background-color: rgba(128,128,128,0.03);
-}
-
-.theme-dark .waterfall-marker-container:hover {
-  background-color: rgba(255,255,255,0.1) !important;
-}
-
-.theme-light .waterfall-marker-container:hover {
-  background-color: rgba(128,128,128,0.1) !important;
-}
-
-.waterfall-marker-item {
-  overflow: hidden;
-}
-
-.waterfall-sidebar {
-  -moz-border-end: 1px solid;
-}
-
-.theme-dark .waterfall-sidebar {
-  -moz-border-end-color: #000;
-}
-
-.theme-light .waterfall-sidebar {
-  -moz-border-end-color: #aaa;
-}
-
-.waterfall-marker-container:hover > .waterfall-sidebar {
-  background-color: transparent;
-}
-
-.waterfall-header-name {
-  padding: 4px;
-}
-
-.waterfall-header-tick {
-  width: 100px;
-  font-size: 9px;
-  transform-origin: left center;
-}
-
-.theme-dark .waterfall-header-tick {
-  color: #a9bacb;
-}
-
-.theme-light .waterfall-header-tick {
-  color: #292e33;
-}
-
-.waterfall-header-tick:not(:first-child) {
-  -moz-margin-start: -100px !important; /* Don't affect layout. */
-}
-
-.waterfall-marker-bullet {
-  width: 8px;
-  height: 8px;
-  -moz-margin-start: 8px;
-  -moz-margin-end: 6px;
-  border: 1px solid;
-  border-radius: 1px;
-}
-
-.waterfall-marker-name {
-  font-size: 95%;
-  padding-bottom: 1px !important;
-}
-
-.waterfall-marker-bar {
-  height: 9px;
-  border: 1px solid;
-  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;
-}
-
-.waterfall-marker-location {
-   color: -moz-nativehyperlinktext;
-}
-
-.waterfall-marker-location:hover,
-.waterfall-marker-location:focus {
-   text-decoration: underline;
-}
-
-#timeline-waterfall-details {
-  -moz-padding-start: 8px;
-  -moz-padding-end: 8px;
-  padding-top: 2vh;
-  overflow: auto;
-}
-
-.marker-details-bullet {
-  width: 8px;
-  height: 8px;
-  border: 1px solid;
-  border-radius: 1px;
-}
-
-#timeline-waterfall-details > * {
-  padding-top: 3px;
-}
-
-.marker-details-labelname {
-  -moz-padding-end: 4px;
-}
-
-.marker-details-type {
-  font-size: 1.2em;
-  font-weight: bold;
-}
-
-.marker-details-duration {
-  font-weight: bold;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/widgets.inc.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/widgets.inc.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/devtools/widgets.inc.css	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/devtools/widgets.inc.css	2015-05-25 20:43:04.000000000 +0000
@@ -880,13 +880,22 @@
 
 .line-graph-widget-gutter {
   position: absolute;
-  background: rgba(255,255,255,0.75);
   width: 10px;
   height: 100%;
   top: 0;
   left: 0;
-  border-right: 1px solid rgba(255,255,255,0.25);
   pointer-events: none;
+  -moz-border-end: 1px solid;
+}
+
+.theme-light .line-graph-widget-gutter {
+  background: rgba(255,255,255,0.75);
+  -moz-border-end-color: rgba(255,255,255,0.25);
+}
+
+.theme-dark .line-graph-widget-gutter {
+  background: rgba(0,0,0,0.5);
+  -moz-border-end-color: rgba(0,0,0,0.25);
 }
 
 .line-graph-widget-gutter-line {
@@ -909,7 +918,6 @@
 
 .line-graph-widget-tooltip {
   position: absolute;
-  background: rgba(255,255,255,0.9);
   border-radius: 2px;
   line-height: 15px;
   -moz-padding-start: 6px;
@@ -920,6 +928,14 @@
   pointer-events: none;
 }
 
+.theme-light .line-graph-widget-tooltip {
+  background: rgba(255,255,255,0.75);
+}
+
+.theme-dark .line-graph-widget-tooltip {
+  background: rgba(0,0,0,0.5);
+}
+
 .line-graph-widget-tooltip[with-arrows=true]::before {
   content: "";
   position: absolute;
@@ -929,15 +945,31 @@
 }
 
 .line-graph-widget-tooltip[arrow=start][with-arrows=true]::before {
-  -moz-border-end: 3px solid rgba(255,255,255,0.75);
+  -moz-border-end: 3px solid;
   left: -3px;
 }
 
 .line-graph-widget-tooltip[arrow=end][with-arrows=true]::before {
-  -moz-border-start: 3px solid rgba(255,255,255,0.75);
+  -moz-border-start: 3px solid;
   right: -3px;
 }
 
+.theme-light .line-graph-widget-tooltip[arrow=start][with-arrows=true]::before {
+  -moz-border-end-color: rgba(255,255,255,0.75);
+}
+
+.theme-dark .line-graph-widget-tooltip[arrow=start][with-arrows=true]::before {
+  -moz-border-end-color: rgba(0,0,0,0.5);
+}
+
+.theme-light .line-graph-widget-tooltip[arrow=end][with-arrows=true]::before {
+  -moz-border-start-color: rgba(255,255,255,0.75);
+}
+
+.theme-dark .line-graph-widget-tooltip[arrow=end][with-arrows=true]::before {
+  -moz-border-start-color: rgba(0,0,0,0.5);
+}
+
 .line-graph-widget-tooltip[type=maximum] {
   left: 14px;
 }
@@ -951,7 +983,7 @@
 }
 
 .line-graph-widget-tooltip > [text=info] {
-  color: #18191a;
+  color: var(--theme-content-color1);
 }
 
 .line-graph-widget-tooltip > [text=value] {
@@ -960,27 +992,35 @@
 
 .line-graph-widget-tooltip > [text=metric] {
   -moz-margin-start: 1px;
-  color: #667380;
+  color: var(--theme-content-color3);
 }
 
-.line-graph-widget-tooltip > [text=value],
-.line-graph-widget-tooltip > [text=metric] {
-  text-shadow: 1px  0px rgba(255,255,255,0.6),
-              -1px  0px rgba(255,255,255,0.6),
-               0px -1px rgba(255,255,255,0.6),
-               0px  1px rgba(255,255,255,0.6);
+.theme-light .line-graph-widget-tooltip > [text=value],
+.theme-light .line-graph-widget-tooltip > [text=metric] {
+  text-shadow: 1px  0px rgba(255,255,255,0.5),
+              -1px  0px rgba(255,255,255,0.5),
+               0px -1px rgba(255,255,255,0.5),
+               0px  1px rgba(255,255,255,0.5);
+}
+
+.theme-dark .line-graph-widget-tooltip > [text=value],
+.theme-dark .line-graph-widget-tooltip > [text=metric] {
+  text-shadow: 1px  0px rgba(0,0,0,0.5),
+              -1px  0px rgba(0,0,0,0.5),
+               0px -1px rgba(0,0,0,0.5),
+               0px  1px rgba(0,0,0,0.5);
 }
 
 .line-graph-widget-tooltip[type=maximum] > [text=value] {
-  color: #2cbb0f;
+  color: var(--theme-highlight-green);
 }
 
 .line-graph-widget-tooltip[type=minimum] > [text=value] {
-  color: #ed2655;
+  color: var(--theme-highlight-red);
 }
 
 .line-graph-widget-tooltip[type=average] > [text=value] {
-  color: #d97e00;
+  color: var(--theme-highlight-orange);
 }
 
 /* Bar graph widget */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/drm-icon.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/drm-icon.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/drm-icon.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/drm-icon.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-     viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg  xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16">
   <style>
     #chains > use > path {
       fill: url(#baseGradient);
@@ -11,7 +13,6 @@
     #chains-black > use > path {
       fill: black;
     }
-
     g:not(:target) {
       display: none;
     }
@@ -19,23 +20,15 @@
   <defs>
     <linearGradient id="baseGradient" gradientUnits="userSpaceOnUse" x1="8" x2="8" y1="16" y2="0">
       <stop offset="0" style="stop-color:#808080"/>
-      <stop offset="1" style="stop-color:#999999"/>
+      <stop offset="1" style="stop-color:#999"/>
     </linearGradient>
     <linearGradient id="pressedGradient" gradientUnits="userSpaceOnUse" x1="8" x2="8" y1="16" y2="0">
-      <stop offset="0" style="stop-color:#4D4D4D"/>
+      <stop offset="0" style="stop-color:#4d4d4d"/>
       <stop offset="1" style="stop-color:#808080"/>
     </linearGradient>
-    <path id="path1" d="M7.058,9.72c-0.245,0.245-0.62,0.27-0.834,0.056C6.01,9.562,6.035,9.186,6.28,8.942l0.218-0.218
-      c-0.245-0.245-0.645-0.245-0.89,0L4.496,9.836c-0.245,0.245-0.245,0.645,0,0.89l0.779,0.779c0.245,0.245,0.645,0.245,0.89,0
-      l1.112-1.112c0.245-0.245,0.245-0.645,0-0.89L7.058,9.72z"/>
-    <path id="path2" d="M10.726,4.496c-0.245-0.245-0.645-0.245-0.89,0L8.723,5.608c-0.245,0.245-0.245,0.645,0,0.89
-      L8.95,6.272c0.245-0.245,0.62-0.27,0.834-0.056s0.189,0.59-0.056,0.834L9.502,7.277c0.245,0.245,0.645,0.245,0.89,0l1.112-1.112
-      c0.245-0.245,0.245-0.645,0-0.89L10.726,4.496z"/>
-    <path id="path3" d="M8,0C3.582,0,0,3.582,0,8s3.582,8,8,8s8-3.582,8-8S12.418,0,8,0z M12.527,6.81l-1.489,1.489
-      c-0.631,0.631-1.663,0.631-2.293,0L8.612,8.167L8.167,8.612l0.133,0.133c0.631,0.631,0.631,1.663,0,2.293L6.81,12.527
-      c-0.631,0.631-1.663,0.631-2.293,0l-1.044-1.044c-0.631-0.631-0.631-1.663,0-2.293l1.489-1.489c0.631-0.631,1.663-0.631,2.293,0
-      l0.133,0.133l0.445-0.445L7.701,7.255c-0.631-0.631-0.631-1.663,0-2.293L9.19,3.473c0.631-0.631,1.663-0.631,2.293,0l1.044,1.044
-      C13.158,5.148,13.158,6.18,12.527,6.81z"/>
+    <path id="path1" d="M7.058,9.72c-0.245,0.245-0.62,0.27-0.834,0.056C6.01,9.562,6.035,9.186,6.28,8.942l0.218-0.218 c-0.245-0.245-0.645-0.245-0.89,0L4.496,9.836c-0.245,0.245-0.245,0.645,0,0.89l0.779,0.779c0.245,0.245,0.645,0.245,0.89,0 l1.112-1.112c0.245-0.245,0.245-0.645,0-0.89L7.058,9.72z"/>
+    <path id="path2" d="M10.726,4.496c-0.245-0.245-0.645-0.245-0.89,0L8.723,5.608c-0.245,0.245-0.245,0.645,0,0.89 L8.95,6.272c0.245-0.245,0.62-0.27,0.834-0.056s0.189,0.59-0.056,0.834L9.502,7.277c0.245,0.245,0.645,0.245,0.89,0l1.112-1.112 c0.245-0.245,0.245-0.645,0-0.89L10.726,4.496z"/>
+    <path id="path3" d="M8,0C3.582,0,0,3.582,0,8s3.582,8,8,8s8-3.582,8-8S12.418,0,8,0z M12.527,6.81l-1.489,1.489 c-0.631,0.631-1.663,0.631-2.293,0L8.612,8.167L8.167,8.612l0.133,0.133c0.631,0.631,0.631,1.663,0,2.293L6.81,12.527 c-0.631,0.631-1.663,0.631-2.293,0l-1.044-1.044c-0.631-0.631-0.631-1.663,0-2.293l1.489-1.489c0.631-0.631,1.663-0.631,2.293,0 l0.133,0.133l0.445-0.445L7.701,7.255c-0.631-0.631-0.631-1.663,0-2.293L9.19,3.473c0.631-0.631,1.663-0.631,2.293,0l1.044,1.044 C13.158,5.148,13.158,6.18,12.527,6.81z"/>
   </defs>
   <g id="chains">
     <use xlink:href="#path1"/>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/heartbeat-icon.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/heartbeat-icon.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/heartbeat-icon.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/heartbeat-icon.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,23 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="288px" height="248px" viewBox="0 0 288 248" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch -->
-    <title>  + Line 14</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path id="path-1" d="M144,246.857143 C141.214272,246.857143 138.857152,245.892867 136.928571,243.964286 L36.6428571,147.214286 C35.5714232,146.357139 34.0982237,144.964295 32.2232143,143.035714 C30.3482049,141.107133 27.3750204,137.59824 23.3035714,132.508929 C19.2321225,127.419617 15.5893018,122.196455 12.375,116.839286 C9.16069821,111.482116 6.29465545,105.000038 3.77678571,97.3928571 C1.25891598,89.7856763 0,82.392893 0,75.2142857 C0,51.6427393 6.80350339,33.2143521 20.4107143,19.9285714 C34.0179252,6.64279071 52.8213086,0 76.8214286,0 C83.4643189,0 90.2410369,1.1517742 97.1517857,3.45535714 C104.062535,5.75894009 110.491042,8.86605187 116.4375,12.7767857 C122.383958,16.6875196 127.499979,20.3571257 131.785714,23.7857143 C136.07145,27.2143029 140.142838,30.8571236 144,34.7142857 C147.857162,30.8571236 151.92855,27.2143029 156.214286,23.7857143 C160.500021,20.3571257 165.616042,16.6875196 171.5625,12.7767857 C177.508958,8.86605187 183.937465,5.75894009 190.848214,3.45535714 C197.758963,1.1517742 204.535681,0 211.178571,0 C235.178691,0 253.982075,6.64279071 267.589286,19.9285714 C281.196497,33.2143521 288,51.6427393 288,75.2142857 C288,98.8929755 275.732266,122.999877 251.196429,147.535714 L151.071429,243.964286 C149.142847,245.892867 146.785728,246.857143 144,246.857143 L144,246.857143 Z"/>
-    </defs>
-    <g id="Prompt---Spec" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="--+-Line-14" sketch:type="MSLayerGroup" transform="translate(0.000000, -1.000000)">
-            <path d="M144,248.571429 C141.214272,248.571429 138.857152,247.607152 136.928571,245.678571 L36.6428571,148.928571 C35.5714232,148.071424 34.0982237,146.678581 32.2232143,144.75 C30.3482049,142.821419 27.3750204,139.312525 23.3035714,134.223214 C19.2321225,129.133903 15.5893018,123.910741 12.375,118.553571 C9.16069821,113.196402 6.29465545,106.714324 3.77678571,99.1071429 C1.25891598,91.499962 0,84.1071788 0,76.9285714 C0,53.357025 6.80350339,34.9286379 20.4107143,21.6428571 C34.0179252,8.35707643 52.8213086,1.71428571 76.8214286,1.71428571 C83.4643189,1.71428571 90.2410369,2.86605991 97.1517857,5.16964286 C104.062535,7.4732258 110.491042,10.5803376 116.4375,14.4910714 C122.383958,18.4018053 127.499979,22.0714114 131.785714,25.5 C136.07145,28.9285886 140.142838,32.5714093 144,36.4285714 C147.857162,32.5714093 151.92855,28.9285886 156.214286,25.5 C160.500021,22.0714114 165.616042,18.4018053 171.5625,14.4910714 C177.508958,10.5803376 183.937465,7.4732258 190.848214,5.16964286 C197.758963,2.86605991 204.535681,1.71428571 211.178571,1.71428571 C235.178691,1.71428571 253.982075,8.35707643 267.589286,21.6428571 C281.196497,34.9286379 288,53.357025 288,76.9285714 C288,100.607261 275.732266,124.714163 251.196429,149.25 L151.071429,245.678571 C149.142847,247.607152 146.785728,248.571429 144,248.571429 L144,248.571429 Z" id="-" fill="#D74345" sketch:type="MSShapeGroup"/>
-            <g id="Line-14" transform="translate(0.000000, 0.714286)">
-                <mask id="mask-2" sketch:name="Mask" fill="white">
-                    <use xlink:href="#path-1"/>
-                </mask>
-                <use id="Mask" sketch:type="MSShapeGroup" xlink:href="#path-1"/>
-                <path d="M-166,115.135254 C-166,115.135254 0.595052083,115.135254 2.9765625,115.135254 L91.9101562,115.135254 L97.9638977,100.101562 L105.430695,115.135254 L114.893585,115.135254 L131.129913,189.53125 L148.161163,57 L165.348663,131.027344 L172.272491,115.135254 L250.84967,115.135254 L428.259813,115.135254" stroke="#FFFFFF" stroke-width="6" stroke-linecap="round" stroke-linejoin="round" sketch:type="MSShapeGroup" mask="url(#mask-2)">
-                    <g transform="translate(131.129906, 123.265625) scale(1, -1) translate(-131.129906, -123.265625) "/>
-                </path>
-            </g>
-        </g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="288px" height="248px" viewBox="0 0 288 248" xmlns="http://www.w3.org/2000/svg">
+  <g stroke="none" fill="none" fill-rule="evenodd">
+    <g transform="translate(0,-1)">
+      <path fill="#d74345" d="M144,248.571429 C141.214272,248.571429 138.857152,247.607152 136.928571,245.678571 L36.6428571,148.928571 C35.5714232,148.071424 34.0982237,146.678581 32.2232143,144.75 C30.3482049,142.821419 27.3750204,139.312525 23.3035714,134.223214 C19.2321225,129.133903 15.5893018,123.910741 12.375,118.553571 C9.16069821,113.196402 6.29465545,106.714324 3.77678571,99.1071429 C1.25891598,91.499962 0,84.1071788 0,76.9285714 C0,53.357025 6.80350339,34.9286379 20.4107143,21.6428571 C34.0179252,8.35707643 52.8213086,1.71428571 76.8214286,1.71428571 C83.4643189,1.71428571 90.2410369,2.86605991 97.1517857,5.16964286 C104.062535,7.4732258 110.491042,10.5803376 116.4375,14.4910714 C122.383958,18.4018053 127.499979,22.0714114 131.785714,25.5 C136.07145,28.9285886 140.142838,32.5714093 144,36.4285714 C147.857162,32.5714093 151.92855,28.9285886 156.214286,25.5 C160.500021,22.0714114 165.616042,18.4018053 171.5625,14.4910714 C177.508958,10.5803376 183.937465,7.4732258 190.848214,5.16964286 C197.758963,2.86605991 204.535681,1.71428571 211.178571,1.71428571 C235.178691,1.71428571 253.982075,8.35707643 267.589286,21.6428571 C281.196497,34.9286379 288,53.357025 288,76.9285714 C288,100.607261 275.732266,124.714163 251.196429,149.25 L151.071429,245.678571 C149.142847,247.607152 146.785728,248.571429 144,248.571429 L144,248.571429 Z"/>
+      <g transform="translate(0,0.71)">
+        <mask id="mask1" fill="#fff">
+          <path  d="M144,246.857143 C141.214272,246.857143 138.857152,245.892867 136.928571,243.964286 L36.6428571,147.214286 C35.5714232,146.357139 34.0982237,144.964295 32.2232143,143.035714 C30.3482049,141.107133 27.3750204,137.59824 23.3035714,132.508929 C19.2321225,127.419617 15.5893018,122.196455 12.375,116.839286 C9.16069821,111.482116 6.29465545,105.000038 3.77678571,97.3928571 C1.25891598,89.7856763 0,82.392893 0,75.2142857 C0,51.6427393 6.80350339,33.2143521 20.4107143,19.9285714 C34.0179252,6.64279071 52.8213086,0 76.8214286,0 C83.4643189,0 90.2410369,1.1517742 97.1517857,3.45535714 C104.062535,5.75894009 110.491042,8.86605187 116.4375,12.7767857 C122.383958,16.6875196 127.499979,20.3571257 131.785714,23.7857143 C136.07145,27.2143029 140.142838,30.8571236 144,34.7142857 C147.857162,30.8571236 151.92855,27.2143029 156.214286,23.7857143 C160.500021,20.3571257 165.616042,16.6875196 171.5625,12.7767857 C177.508958,8.86605187 183.937465,5.75894009 190.848214,3.45535714 C197.758963,1.1517742 204.535681,0 211.178571,0 C235.178691,0 253.982075,6.64279071 267.589286,19.9285714 C281.196497,33.2143521 288,51.6427393 288,75.2142857 C288,98.8929755 275.732266,122.999877 251.196429,147.535714 L151.071429,243.964286 C149.142847,245.892867 146.785728,246.857143 144,246.857143 L144,246.857143 Z"/>
+        </mask>
+        <path stroke="#fff" stroke-width="6" stroke-linecap="round" stroke-linejoin="round" mask="url(#mask1)" d="M-166,115.135254 C-166,115.135254 0.595052083,115.135254 2.9765625,115.135254 L91.9101562,115.135254 L97.9638977,100.101562 L105.430695,115.135254 L114.893585,115.135254 L131.129913,189.53125 L148.161163,57 L165.348663,131.027344 L172.272491,115.135254 L250.84967,115.135254 L428.259813,115.135254">
+          <g transform="translate(131.13,123.27) scale(1,-1) translate(-131.13,-123.27) "/>
+        </path>
+      </g>
     </g>
-</svg>
\ No newline at end of file
+  </g>
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/heartbeat-star-lit.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/heartbeat-star-lit.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/heartbeat-star-lit.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/heartbeat-star-lit.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,428 +1,50 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Toolbar"
-   x="0px"
-   y="0px"
-   viewBox="0 0 16 16"
-   enable-background="new 0 0 16 16"
-   xml:space="preserve"
-   inkscape:version="0.48.5 r10040"
-   width="100%"
-   height="100%"
-   sodipodi:docname="star-lit.svg"><metadata
-   id="metadata4111"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-   id="defs4109" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1440"
-   inkscape:window-height="838"
-   id="namedview4107"
-   showgrid="false"
-   inkscape:zoom="41.7193"
-   inkscape:cx="6.7712219"
-   inkscape:cy="7.3971752"
-   inkscape:window-x="-8"
-   inkscape:window-y="-8"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Toolbar" />
-<g
-   id="g3926">
-	<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M-238.2,6h-6.1l2.7-2.7c0.4-0.4,0.5-1.1,0.2-1.4l-1.2-1.2   c-0.3-0.3-1-0.3-1.4,0.2l-6.4,6.4c-0.1,0.1-0.1,0.2-0.2,0.2l0,0c0,0,0,0,0,0c0,0.1-0.1,0.1-0.1,0.1c0,0.1-0.1,0.2-0.1,0.3   c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0.1,0,0.2,0.1,0.3c0,0.1,0.1,0.1,0.1,0.1c0,0,0,0,0,0l0,0c0.1,0.1,0.1,0.2,0.2,0.2l6.4,6.4   c0.4,0.4,1.1,0.5,1.4,0.2l1.2-1.2c0.3-0.3,0.3-1-0.2-1.4l-2.8-2.8h6.2c0.6,0,1-0.4,1-1V7C-237.2,6.4-237.6,6-238.2,6z"
-   id="path3928" />
-</g>
-<g
-   id="g3930">
-	<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M-212.7,6.3l-1,1c-0.2,0.2-0.2,0.4-0.2,0.7c0,0.3,0,0.5,0.2,0.7   l0.8,0.9l4.5,4.5c0.5,0.5,1.2,0.6,1.6,0.2l0.8-0.9c0.4-0.4,0.3-1.1-0.2-1.6l-1.8-1.8h4.7c0.6,0,1-0.5,1-1V7c0-0.6-0.5-1-1-1h-4.8   l1.9-1.9c0.5-0.5,0.6-1.3,0.2-1.6l-0.8-0.9c-0.4-0.4-1.1-0.3-1.6,0.2L-212.7,6.3z"
-   id="path3932" />
-</g>
-<g
-   id="g3934">
-	<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M-167.3,9.7l1-1c0.2-0.2,0.2-0.4,0.2-0.7c0-0.3,0-0.5-0.2-0.7   l-0.8-0.9l-4.5-4.5c-0.5-0.5-1.2-0.6-1.6-0.2l-0.8,0.9c-0.4,0.4-0.3,1.1,0.2,1.6l1.8,1.8h-4.7c-0.6,0-1,0.5-1,1v2c0,0.6,0.5,1,1,1   h4.8l-1.9,1.9c-0.5,0.5-0.6,1.3-0.2,1.6l0.8,0.9c0.4,0.4,1.1,0.3,1.6-0.2L-167.3,9.7z"
-   id="path3936" />
-</g>
-<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M-129.5,8h-7l2.8-2.8c-0.7-0.5-1.4-0.7-2.3-0.7c-2.2,0-4,1.8-4,4  c0,2.2,1.8,4,4,4c1.4,0,2.7-0.7,3.4-1.9l2.3,1c-1.1,2-3.2,3.4-5.7,3.4c-3.6,0-6.5-2.9-6.5-6.5c0-3.6,2.9-6.5,6.5-6.5  c1.5,0,2.9,0.5,4.1,1.4l2.4-2.4V8z"
-   id="path3938" />
-<g
-   id="g3940">
-	<g
-   id="g3942">
-		<polygon
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   points="-93.6,3.8 -95.8,1.7 -100,5.9 -104.3,1.6 -106.4,3.8    -102.1,8 -106.3,12.2 -104.1,14.3 -99.9,10.2 -95.7,14.4 -93.6,12.2 -97.8,8.1   "
-   id="polygon3944" />
-	</g>
-</g>
-<g
-   id="g3946">
-	<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M-64,1l-8,7h2l6-5l6,5h2L-64,1z M-69,8v7h4v-5h2v5h4V8l-5-4L-69,8   z"
-   id="path3948" />
-</g>
-<path
-   fill="#00A3F2"
-   d="M-28,3.6l1,2l0.5,0.9l1,0.2l2.3,0.4l-1.7,1.8l-0.7,0.7l0.1,1l0.4,2.4l-2-1l-0.9-0.5l-0.9,0.5l-2,1l0.4-2.4  l0.1-1l-0.7-0.7l-1.7-1.8l2.4-0.4l1-0.2l0.5-0.9L-28,3.6 M-28,0c-0.3,0-0.6,0.2-0.8,0.7l-2,4.1l-4.3,0.7c-1,0.2-1.2,0.9-0.5,1.6  l3.1,3.3l-0.7,4.6c-0.1,0.7,0.2,1.1,0.7,1.1c0.2,0,0.4-0.1,0.6-0.2l3.9-2.1l3.9,2.1c0.2,0.1,0.5,0.2,0.6,0.2c0.5,0,0.8-0.4,0.7-1.1  l-0.7-4.6l3.1-3.3c0.7-0.7,0.4-1.4-0.5-1.6l-4.3-0.7l-2-4.1C-27.4,0.2-27.7,0-28,0L-28,0z"
-   id="path3950" />
-<path
-   fill="#00A3F2"
-   d="M8,0C7.7,0,7.4,0.2,7.2,0.7l-2,4.1L0.9,5.5c-1,0.2-1.2,0.9-0.5,1.6l3.1,3.3l-0.7,4.6C2.7,15.6,3,16,3.4,16  c0.2,0,0.4-0.1,0.6-0.2L8,13.7l3.9,2.1c0.2,0.1,0.5,0.2,0.6,0.2c0.5,0,0.8-0.4,0.7-1.1l-0.7-4.6l3.1-3.3c0.7-0.7,0.4-1.4-0.5-1.6  l-4.3-0.7l-2-4.1C8.6,0.2,8.3,0,8,0L8,0z"
-   id="path3952"
-   style="fill:#0095dd;fill-opacity:1" />
-<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M44,15.2c-4,0-7.2-3.2-7.2-7.2c0-4,3.2-7.2,7.2-7.2  c4,0,7.2,3.2,7.2,7.2C51.2,12,48,15.2,44,15.2z M44,3c-2.8,0-5,2.2-5,5c0,2.7,2.2,5,5,5c2.8,0,5-2.2,5-5C49,5.3,46.8,3,44,3z   M43.7,8.9C43.3,8.8,43,8.4,43,8V5c0-0.6,0.4-1,1-1c0.6,0,1,0.4,1,1v2.8c1.1,1.1,2,3.2,2,3.2S44.8,10,43.7,8.9z"
-   id="path3954" />
-<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M86.7,9.1l-5.6,5.5C80.8,14.9,80.4,15,80,15  c-0.4,0-0.8-0.1-1.1-0.4l-5.6-5.5C72.7,8.5,72.9,8,73.8,8H77l0-6c0-0.6,0.4-1,1-1h4c0.6,0,1,0.4,1,1v6h3.2C87.1,8,87.3,8.5,86.7,9.1  z"
-   id="path3956" />
-<path
-   fill="#00A3F2"
-   d="M-241,52c0.5,0,1-0.4,1-1v-4c0,0,0.1-0.8,0.8-0.8c0.6,0,0.6,0.8,1.8,0.8c0.6,0,1.5-0.2,1.5-2  c0-1.8-0.9-2-1.5-2c-1.1,0-1.1,0.8-1.8,0.8c-0.6,0-0.8-0.8-0.8-0.8v-2c0-0.6-0.4-1-1-1h-3c0,0-0.8-0.1-0.8-0.8  c0-0.6,0.8-0.6,0.8-1.8c0-0.6-0.2-1.5-2-1.5c-1.8,0-2,0.9-2,1.5c0,1.1,0.8,1.1,0.8,1.8c0,0.6-0.8,0.8-0.8,0.8h-3c-0.5,0-1,0.4-1,1  l0,2.5c0,0-0.1,1.5,1.1,1.5c0.8,0,0.9-1,1.9-1c0.5,0,1,0.5,1,1.6c0,1-0.5,1.6-1,1.6c-1,0-1.1-1-1.9-1c-1.2,0-1.1,1.5-1.1,1.5l0,3.5  c0,0.6,0.4,1,1,1h3.8c0,0,1.5,0.1,1.5-1.1c0-0.8-1-0.9-1-1.9c0-0.5,0.7-1.2,1.8-1.2c1,0,1.8,0.7,1.8,1.2c0,1-1,1.1-1,1.9  c0,1.2,1.5,1.1,1.5,1.1H-241z"
-   id="path3958" />
-<g
-   id="g3960">
-	<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   d="M-200.4,41.9h-0.3v0h-14.4v0h-0.3c-0.2,0-0.4,0.2-0.4,0.4c0,0,0.3,2.2,0.5,4.4   c0.2,2.5,0.2,4.2,0.2,4.2c0,0.2,0.2,0.4,0.4,0.4h13.7c0.2,0,0.4-0.2,0.4-0.4c0,0,0.1-2.1,0.2-4.2c0.1-2.2,0.5-4.4,0.5-4.4   C-200.1,42.1-200.2,41.9-200.4,41.9z"
-   id="path3962" />
-	<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   d="M-200.8,41.3v-2c0-0.3-0.2-0.5-0.5-0.5l-6.7,0l-0.8-1.1c0,0-0.6-0.9-1.2-0.9h-4.2   c-0.6,0-1,0.5-1,1v1l0,2.5H-200.8z"
-   id="path3964" />
-</g>
-<g
-   id="g3966">
-	<g
-   id="g3968">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M-169,37h-7.5c-0.8,0-1.5,0.7-1.5,1.5v11c0,0.8,0.7,1.5,1.5,1.5    h9c0.8,0,1.5-0.7,1.5-1.5V40L-169,37z M-170,41v-3.3l3.3,3.3H-170z"
-   id="path3970" />
-	</g>
-</g>
-<g
-   id="g3972">
-	<g
-   id="g3974">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   d="M-132.5,38c-0.4,0.2-0.9,0.6-1.3,1.2c-0.3,0.4-0.5,0.9-0.8,1.3    c0.7,0.3,1.3,0.8,1.7,1.4c0.4,0.7,0.7,1.5,0.6,2.3c-0.1,1.3-1,2.4-2.1,3c-0.5-0.5-1.4-2.1-1.4-2.1c0,0,0,1.8-0.6,3    c-0.4,0.8-0.9,1.5-1.6,2.1c1,0.4,2,0.6,3,0.6l0-0.1c0,0,0.1,0.1,0.1,0.1c2.1,0,4.1-0.3,4.1-0.3s-0.9-0.6-1.3-0.9    c1.3-0.7,2.2-2,2.5-3.3c0.2-0.5,0.3-1.1,0.4-1.7C-128.7,41.9-130.2,39.3-132.5,38z M-139.8,44.2c0-1.4,0.8-2.8,2.2-3.5    c0.5,0.5,1.6,2,1.6,2s0-3.6,1.2-5.6c-4.3-0.5-6.8,0.3-6.8,0.3s1.2,0.4,1.6,0.8c-0.1,0.1-0.2,0.1-0.3,0.2c-1,0.7-1.7,1.6-2.1,2.7    c-0.3,0.6-0.5,1.3-0.5,2c-0.3,2.8,1.1,5.4,3.4,6.7c0.4-0.3,0.8-0.6,1.2-1.1c0.4-0.4,0.7-0.9,1-1.4    C-138.7,46.9-139.7,45.7-139.8,44.2z"
-   id="path3976" />
-	</g>
-</g>
-<g
-   id="g3978">
-	<g
-   id="g3980">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M-96.6,41.5c-3.3-4-9.6-4.5-9.6-4.5c-0.4,0-0.8,0.3-0.8,0.7v1.4    c0,0.4,0.3,0.7,0.8,0.7c0,0,4.5,0.1,7.1,3.2c3.5,3.6,3.2,7.2,3.2,7.2c0,0.4,0.3,0.8,0.8,0.8h1.5c0.4,0,0.7-0.3,0.7-0.8    C-93,50.2-93.3,44.5-96.6,41.5z M-106.2,42c-0.4,0-0.8,0.3-0.8,0.7V44c0,0.4,0.3,0.7,0.8,0.7c0,0,2.4,0.1,3.8,1.4    c1.9,1.7,1.8,4.2,1.8,4.2c0,0.4,0.2,0.8,0.6,0.8h1.5c0.4,0,0.5-0.3,0.5-0.8c0,0-0.4-3.9-2.5-5.9C-102.5,42.4-106.2,42-106.2,42z     M-105,47c-1.1,0-2,0.9-2,2c0,1.1,0.9,2,2,2c1.1,0,2-0.9,2-2C-103,47.9-103.9,47-105,47z"
-   id="path3982" />
-	</g>
-</g>
-<path
-   fill="none"
-   d="M-102.6,34.4c0.5,0,1-0.4,1-1v-4c0,0,0.1-0.8,0.8-0.8c0.6,0,0.6,0.8,1.8,0.8c0.6,0,1.5-0.2,1.5-2  c0-1.8-0.9-2-1.5-2c-1.1,0-1.1,0.8-1.8,0.8c-0.6,0-0.8-0.8-0.8-0.8v-2c0-0.6-0.4-1-1-1h-3c0,0-0.8-0.1-0.8-0.8  c0-0.6,0.8-0.6,0.8-1.8c0-0.6-0.2-1.5-2-1.5c-1.8,0-2,0.9-2,1.5c0,1.1,0.8,1.1,0.8,1.8c0,0.6-0.8,0.8-0.8,0.8h-3c-0.5,0-1,0.4-1,1  l0,2.5c0,0-0.1,1.5,1.1,1.5c0.8,0,0.9-1,1.9-1c0.5,0,1,0.5,1,1.6c0,1-0.5,1.6-1,1.6c-1,0-1.1-1-1.9-1c-1.2,0-1.1,1.5-1.1,1.5l0,3.5  c0,0.6,0.4,1,1,1h3.8c0,0,1.5,0.1,1.5-1.1c0-0.8-1-0.9-1-1.9c0-0.5,0.7-1.2,1.8-1.2c1,0,1.8,0.7,1.8,1.2c0,1-1,1.1-1,1.9  c0,1.2,1.5,1.1,1.5,1.1H-102.6z"
-   id="path3984" />
-<g
-   id="g3986">
-	<g
-   id="g3988">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M-63,46.7l-0.3-0.1L-63,52l2.6-3.8L-63,46.7z M-63.3,46l0.3,0    l6,2.9V36l-14,11l4.6-0.6L-63,52l-1.9-5.7l-0.3-0.1l0.3,0L-65,46l7-8L-63.3,46L-63.3,46z"
-   id="path3990" />
-	</g>
-</g>
-<g
-   id="g3992">
-	<g
-   id="g3994">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M-23,37h-10c-1.1,0-2,0.9-2,2v10c0,1.1,0.9,2,2,2h10    c1.1,0,2-0.9,2-2V39C-21,37.9-21.9,37-23,37z M-23,46c0,1.7-1.3,2-3,2h-4c-1.7,0-3-1.3-3-3v-4c0-1.7,1.3-3,3-3h4c1.7,0,3,1.3,3,3    V46z"
-   id="path3996" />
-	</g>
-</g>
-<path
-   fill="#00A3F2"
-   d="M-23.7,42.6c0-0.8-0.2-1.5-0.6-2c-0.4-0.5-1-0.7-1.7-0.7c-0.4,0-0.8,0.1-1.1,0.3s-0.6,0.4-0.8,0.8  c-0.2-0.4-0.4-0.6-0.7-0.8c-0.3-0.2-0.7-0.2-1.2-0.2c-0.4,0-0.7,0-1.1,0.1s-0.7,0.2-1,0.4l0.3,0.7c0.6-0.3,1.2-0.5,1.7-0.5  c0.4,0,0.8,0.1,1,0.3c0.2,0.2,0.3,0.6,0.3,1.1v0.4l-1,0c-0.9,0-1.6,0.2-2.1,0.5c-0.5,0.3-0.7,0.8-0.7,1.4c0,0.6,0.2,1,0.5,1.3  c0.3,0.3,0.8,0.5,1.4,0.5c0.5,0,0.9-0.1,1.3-0.3c0.4-0.2,0.7-0.5,1-1c0.5,0.9,1.2,1.3,2.3,1.3c0.4,0,0.7,0,1-0.1  c0.3-0.1,0.6-0.2,0.9-0.3v-0.8c-0.3,0.1-0.6,0.3-0.9,0.3c-0.3,0.1-0.6,0.1-0.9,0.1c-1.2,0-1.8-0.7-1.8-2.2h3.9V42.6z M-28.5,43.6  c0,0.6-0.2,1-0.5,1.3c-0.3,0.3-0.7,0.5-1.3,0.5c-0.3,0-0.6-0.1-0.8-0.2c-0.2-0.2-0.3-0.4-0.3-0.8c0-0.4,0.2-0.7,0.5-0.9  c0.3-0.2,0.8-0.3,1.5-0.3l0.9,0V43.6z M-27.5,42.4c0-0.6,0.2-1,0.4-1.3c0.3-0.3,0.6-0.5,1.1-0.5c0.4,0,0.8,0.2,1,0.5  c0.2,0.3,0.4,0.8,0.4,1.3H-27.5z"
-   id="path3998" />
-<g
-   id="g4000">
-	<g
-   id="g4002">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M14.5,37h-13C0.7,37,0,37.7,0,38.5v11C0,50.3,0.7,51,1.5,51h13    c0.8,0,1.5-0.7,1.5-1.5v-11C16,37.7,15.3,37,14.5,37z M6.5,38C6.8,38,7,38.2,7,38.5C7,38.8,6.8,39,6.5,39C6.2,39,6,38.8,6,38.5    C6,38.2,6.2,38,6.5,38z M4.4,38c0.3,0,0.5,0.2,0.5,0.5c0,0.3-0.2,0.5-0.5,0.5c-0.3,0-0.5-0.2-0.5-0.5C3.9,38.2,4.2,38,4.4,38z     M2.5,38C2.8,38,3,38.2,3,38.5C3,38.8,2.8,39,2.5,39C2.2,39,2,38.8,2,38.5C2,38.2,2.2,38,2.5,38z M14,48c0,0.6-0.4,1-1,1H3    c-0.6,0-1-0.4-1-1v-6c0-0.6,0.4-1,1-1h10c0.6,0,1,0.4,1,1V48z"
-   id="path4004" />
-	</g>
-</g>
-<path
-   fill="#00A3F2"
-   d="M51.2,45.9L51.2,45.9c-0.4-0.1-0.7-0.3-1-0.6c-0.1-0.1-0.1-0.1-0.2-0.2c-0.1-0.1-0.1-0.1-0.2-0.2  c0-0.1-0.1-0.1-0.1-0.2c0-0.1-0.1-0.1-0.1-0.2c-0.3-0.6-0.4-1.5-0.5-2.4c-0.3-2.2-0.1-3.8-3-3.8h-4.4c-2.9,0-2.6,1.6-2.9,3.8  c-0.1,0.9-0.3,1.8-0.6,2.4c0,0,0,0,0,0c-0.1,0.1-0.1,0.2-0.2,0.3c0,0,0,0-0.1,0.1c-0.1,0.2-0.2,0.3-0.4,0.4  c-0.3,0.2-0.5,0.4-0.9,0.5l0,0C36.4,46,36,46.3,36,46.8v1.9c0,0.5,0.4,0.9,0.9,0.9h14.1c0.5,0,0.9-0.4,0.9-0.9v-1.9  C52,46.3,51.6,46,51.2,45.9z M46.4,43.8c0,0.1-0.1,0.2-0.2,0.2h-1.6v1.6c0,0.1-0.1,0.2-0.2,0.2h-0.5c-0.1,0-0.2-0.1-0.2-0.2V44h-1.6  c-0.1,0-0.2-0.1-0.2-0.2v-0.5c0-0.1,0.1-0.2,0.2-0.2h1.6v-1.6c0-0.1,0.1-0.2,0.2-0.2h0.5c0.1,0,0.2,0.1,0.2,0.2v1.6h1.6  c0.1,0,0.2,0.1,0.2,0.2V43.8z"
-   id="path4006" />
-<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M87.7,42c-0.1,1.1,0.2,2.5-1.3,4.4c-1.6,2.1-3.1,2.1-3.4,2.1  c-1.8-0.1-2-1.5-3-1.5c-0.9,0-1.6,1.4-3,1.5c-0.3,0-1.9,0-3.4-2c-1.5-1.9-1.2-3.3-1.3-4.4S72,39.7,72,39.7s0.7,0.7,1.6,0.8  c0.9,0.1,1.1-0.3,3-0.9c2.1-0.6,3.4,1.9,3.4,1.9s1.4-2.4,3.4-1.9c1.9,0.6,2,0.9,2.9,0.9c0.9-0.1,1.7-0.8,1.7-0.8S87.8,40.9,87.7,42z   M76.9,42.5c-1.1-0.3-1.6,0.2-2.1,0.4C74.4,43,74,43.1,74,43.1s0.1,0.7,1.2,1.2c1.1,0.6,3.5,0.3,3.5,0.3S78.9,42.9,76.9,42.5z   M85.2,42.9c-0.5-0.2-1-0.6-2.1-0.4c-2,0.4-1.8,2.1-1.8,2.1s2.4,0.3,3.5-0.3c1.1-0.6,1.2-1.2,1.2-1.2S85.6,43,85.2,42.9z"
-   id="path4008" />
-<g
-   id="g4010">
-	<g
-   id="g4012">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   d="M-237.5,84.9l-3.3-3.3c0.5-0.9,0.9-1.9,0.9-2.9c0-3-2.4-5.5-5.5-5.5    c-3,0-5.5,2.4-5.5,5.5c0,3,2.4,5.5,5.5,5.5c1.1,0,2.1-0.3,3-0.9l3.3,3.3c0.4,0.4,1,0.4,1.4,0l0.2-0.2    C-237.1,85.9-237.1,85.3-237.5,84.9z M-245.4,82c-1.8,0-3.3-1.5-3.3-3.4c0-1.9,1.5-3.4,3.3-3.4c1.8,0,3.3,1.5,3.3,3.4    C-242,80.5-243.5,82-245.4,82z"
-   id="path4014" />
-	</g>
-</g>
-<g
-   id="g4016">
-	<g
-   id="g4018">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   d="M-214.5,86.3l0.2,0.2c0.4,0.4,1,0.4,1.4,0l3.3-3.3c0.9,0.6,1.9,0.9,3,0.9    c3,0,5.5-2.4,5.5-5.5c0-3-2.4-5.5-5.5-5.5c-3,0-5.5,2.4-5.5,5.5c0,1.1,0.3,2.1,0.9,2.9l-3.3,3.3    C-214.9,85.3-214.9,85.9-214.5,86.3z M-210,78.6c0-1.9,1.5-3.4,3.3-3.4c1.8,0,3.3,1.5,3.3,3.4c0,1.9-1.5,3.4-3.3,3.4    C-208.5,82-210,80.5-210,78.6z"
-   id="path4020" />
-	</g>
-</g>
-<g
-   id="g4022">
-	<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M-165,77.5h-1v-2c0-0.6-0.4-1-1-1v-1c0-0.6-0.4-1-1-1h-8   c-0.6,0-1,0.4-1,1v1c-0.6,0-1,0.4-1,1v2h-1c-0.6,0-1,0.4-1,1v5c0,0.6,0.4,1,1,1h2v-1h0.5l-1.5,3h12l-1.5-3h0.5v1h2c0.6,0,1-0.4,1-1   v-5C-164,77.9-164.4,77.5-165,77.5z M-176.5,80.5h-1c-0.3,0-0.5-0.2-0.5-0.5c0-0.3,0.2-0.5,0.5-0.5h1c0.3,0,0.5,0.2,0.5,0.5   C-176,80.2-176.2,80.5-176.5,80.5z M-176,85.5l0.9-2h6.2l0.9,2H-176z M-168,77.5c0,0.6-0.4,1-1,1h-6c-0.6,0-1-0.4-1-1v-3   c0-0.6,0.4-1,1-1h6c0.6,0,1,0.4,1,1V77.5z"
-   id="path4024" />
-</g>
-<g
-   id="g4026">
-	<path
-   fill="#00A3F2"
-   d="M-135,73l1.9,1.9l-2.6,2.6c-0.5,0.5-0.5,1.4,0.1,2c0.6,0.6,1.5,0.6,2,0.1l2.6-2.6l1.9,1.9v-6H-135z    M-138.5,80.4l-2.6,2.6L-143,81v6h6l-1.9-1.9l2.6-2.6c0.5-0.5,0.5-1.4-0.1-2C-137.1,79.9-138,79.9-138.5,80.4z"
-   id="path4028" />
-</g>
-<g
-   id="g4030">
-	<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M-93.5,73.5c-0.6-0.6-1.5-0.6-2-0.1l-2.6,2.6L-100,74v6h6   l-1.9-1.9l2.6-2.6C-92.9,75-92.9,74.1-93.5,73.5z M-104.1,81.9l-2.6,2.6c-0.5,0.5-0.5,1.4,0.1,2c0.6,0.6,1.5,0.6,2,0.1l2.6-2.6   l1.9,1.9v-6h-6L-104.1,81.9z"
-   id="path4032" />
-</g>
-<g
-   id="g4034">
-	<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M14.6,75.1l-2.3,2.3c-0.5,0.5-1.3,0.5-1.7,0   c-0.5-0.5-0.5-1.2,0-1.7l2.4-2.3c-0.6-0.3-1.2-0.5-1.9-0.5C8.8,72.9,7,74.7,7,77c0,0.5,0.1,1.1,0.3,1.5l-5.9,5.8   c-0.6,0.6-0.6,1.7,0,2.3c0.6,0.6,1.7,0.6,2.3,0l6-5.9c0.4,0.2,0.9,0.3,1.4,0.3c2.2,0,4.1-1.8,4.1-4.1   C15.1,76.3,14.9,75.7,14.6,75.1z M2.5,86.4c-0.5,0-0.9-0.4-0.9-0.9c0-0.5,0.4-0.9,0.9-0.9c0.5,0,0.9,0.4,0.9,0.9   C3.4,86,3,86.4,2.5,86.4z"
-   id="path4036" />
-</g>
-<path
-   fill="#00A3F2"
-   d="M-22.7,83.9l-1.1-1.1c0.2-0.3,0.3-0.6,0.5-0.9c0.1-0.3,0.2-0.6,0.3-0.9l1.6,0c0.3,0,0.5-0.2,0.5-0.5l0-1  c0-0.3-0.2-0.5-0.5-0.5l-1.6,0c-0.1-0.6-0.4-1.2-0.7-1.8l1.1-1.1c0.2-0.2,0.2-0.5,0-0.7l-0.7-0.7c-0.2-0.2-0.5-0.2-0.7,0l-1.1,1.1  c-0.3-0.2-0.6-0.3-0.9-0.5c-0.3-0.1-0.6-0.2-0.9-0.3l0-1.6c0-0.3-0.2-0.5-0.5-0.5l-1,0c-0.3,0-0.5,0.2-0.5,0.5l0,1.6  c-0.6,0.1-1.2,0.4-1.8,0.7l-1.1-1.1c-0.2-0.2-0.5-0.2-0.7,0l-0.7,0.7c-0.2,0.2-0.2,0.5,0,0.7l1.1,1.1c-0.2,0.3-0.3,0.6-0.5,0.9  c-0.1,0.3-0.2,0.6-0.3,0.9l-1.6,0c-0.3,0-0.5,0.2-0.5,0.5l0,1c0,0.3,0.2,0.5,0.5,0.5l1.6,0c0.1,0.6,0.4,1.2,0.7,1.8l-1.1,1.1  c-0.2,0.2-0.2,0.5,0,0.7l0.7,0.7c0.2,0.2,0.5,0.2,0.7,0l1.1-1.1c0.3,0.2,0.6,0.3,0.9,0.5c0.3,0.1,0.6,0.2,0.9,0.3l0,1.6  c0,0.3,0.2,0.5,0.5,0.5l1,0c0.3,0,0.5-0.2,0.5-0.5l0-1.6c0.6-0.1,1.2-0.4,1.8-0.7l1.1,1.1c0.2,0.2,0.5,0.2,0.7,0l0.7-0.7  C-22.5,84.4-22.5,84.1-22.7,83.9z M-28.8,82.1c-1.2-0.5-1.7-1.8-1.3-3c0.5-1.2,1.8-1.7,3-1.3c1.2,0.5,1.7,1.8,1.3,3  C-26.4,82-27.7,82.6-28.8,82.1z"
-   id="path4038" />
-<g
-   id="g4040">
-	<g
-   id="g4042">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M-62,77h-4c-0.6,0-1,0.4-1,1v4c0,0.6,0.4,1,1,1h4    c0.6,0,1-0.4,1-1v-4C-61,77.4-61.4,77-62,77z M-62,81c0,0.6-0.4,1-1,1h-2c-0.6,0-1-0.4-1-1v-1c0-0.6,0.4-1,1-1h2c0.6,0,1,0.4,1,1    V81z M-64,87l3-3h-6L-64,87z M-67,76h6l-3-3L-67,76z M-60,76.9v6l3-3L-60,76.9z M-68,82.9v-6l-3,3L-68,82.9z"
-   id="path4044" />
-	</g>
-</g>
-<g
-   id="g4046">
-	<g
-   id="g4048">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   d="M37.5,76.5h13c0.8,0,1.5-0.7,1.5-1.5c0-0.8-0.7-1.5-1.5-1.5h-13    c-0.8,0-1.5,0.7-1.5,1.5C36,75.8,36.7,76.5,37.5,76.5z M50.5,78.5h-13c-0.8,0-1.5,0.7-1.5,1.5c0,0.8,0.7,1.5,1.5,1.5h13    c0.8,0,1.5-0.7,1.5-1.5C52,79.2,51.3,78.5,50.5,78.5z M50.5,83.5h-13c-0.8,0-1.5,0.7-1.5,1.5c0,0.8,0.7,1.5,1.5,1.5h13    c0.8,0,1.5-0.7,1.5-1.5C52,84.2,51.3,83.5,50.5,83.5z"
-   id="path4050" />
-	</g>
-</g>
-<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M85.6,87c-0.8,0-1.5-0.2-2.3-1.3c-0.8-1.1-1.7-2.5-1.7-2.5  s-0.7-0.9-1.1-1.6c-0.4-0.7-1.1-0.5-1.1-0.5s-2.8-4.6-3.3-5.4c-0.7-1,0.6-2.7,0.6-2.7l4.4,7c0,0,1.3,1.9,1.9,2.3  c0.5,0.4,1.4-0.4,2.8,0.9C87.7,85,87.1,87,85.6,87z M85.4,84.1c-0.9-1-1.7-0.9-1.9-0.6c-0.2,0.3,0,1.2,0.4,1.7  c0.4,0.5,0.8,0.7,1.4,0.7C85.9,86,86.4,85.2,85.4,84.1z M81.6,79.4l-1.2-1.8l2.9-4.6c0,0,1.2,1.7,0.6,2.7  C83.6,76.1,82.5,78,81.6,79.4z M77,82.3c0.3-0.3,1-1.1,1.4-1.7l0.8,1.2c-0.4,0.6-0.9,1.4-0.9,1.4s-0.9,1.4-1.7,2.5  c-0.8,1.1-1.5,1.3-2.3,1.3c-1.4,0-2.1-2-0.1-3.8C75.6,82,76.5,82.7,77,82.3z M74.6,84.1c-0.9,1-0.4,1.8,0.2,1.8c0.6,0,1-0.2,1.4-0.7  c0.4-0.5,0.6-1.5,0.4-1.7C76.3,83.2,75.5,83.1,74.6,84.1z"
-   id="path4052" />
-<g
-   id="g4054">
-	<g
-   id="g4056">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M-243,111c0-0.1-2-2-2-2c-1.7,0-5,0-5,0c-0.6,0-1,0.4-1,1v8    c0,0.6,0.4,1,1,1h4v-6.1c0-0.3,0.2-0.5,0.5-0.5h2.5V111z M-246,112v-2l2,2H-246z M-239,113c-1.7,0-5,0-5,0c-0.6,0-1,0.4-1,1v8    c0,0.6,0.4,1,1,1h6c0.6,0,1-0.4,1-1c0,0,0-4.8,0-7C-237,115-239,113-239,113z M-240,116v-2l2,2H-240z"
-   id="path4058" />
-	</g>
-</g>
-<g
-   id="g4060">
-	<g
-   id="g4062">
-		<path
-   fill="#00A3F2"
-   d="M-204.5,111h-1.3l0,0c0,0-0.2-2-2.2-2c-2,0-2.2,2-2.2,2l0,0h-1.3c-0.8,0-1.5,0.7-1.5,1.5v9    c0,0.8,0.7,1.5,1.5,1.5h7c0.8,0,1.5-0.7,1.5-1.5v-9C-203,111.7-203.7,111-204.5,111z M-210.7,112.1l0.8-0.4l0.4-0.2l0-0.4    c0-0.2,0.2-1.3,1.5-1.3c1.2,0,1.4,1.1,1.5,1.3l0,0.4l0.4,0.2l0.8,0.4l0.3,0.7h-6.1L-210.7,112.1z M-210.1,120.4l-2.8-4.9l3.3-1.9    h4.3l1.8,3.1L-210.1,120.4z"
-   id="path4064" />
-	</g>
-</g>
-<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M-177,115h10v2h-10V115z"
-   id="path4066" />
-<g
-   id="g4068">
-	<g
-   id="g4070">
-		<polygon
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   points="-131,115 -135,115 -135,111 -137,111 -137,115 -141,115    -141,117 -137,117 -137,121 -135,121 -135,117 -131,117   "
-   id="polygon4072" />
-	</g>
-</g>
-<g
-   id="g4074">
-	<path
-   fill="#00A3F2"
-   d="M-94,111.7l-3,2.7v-2c0-0.8-0.6-1.4-1.3-1.4h-7.4c-0.7,0-1.3,0.6-1.3,1.4v7.2c0,0.8,0.6,1.4,1.3,1.4h7.4   c0.7,0,1.3-0.6,1.3-1.4v-2.1l3,2.7c0.3,0.3,0.6,0.4,1,0.3v-9.1C-93.3,111.4-93.7,111.5-94,111.7z"
-   id="path4076" />
-</g>
-<g
-   id="g4078">
-	<g
-   id="g4080">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M-61.9,112h-3l3.8,4l-3.8,4h3.1l3.8-4L-61.9,112z M-66.9,112h-3    l3.8,4l-3.8,4h3.1l3.8-4L-66.9,112z"
-   id="path4082" />
-	</g>
-</g>
-<g
-   id="g4084">
-	<g
-   id="g4086">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M-23,111.5h-2l-3-3l-3,3h-2c-1.1,0-2,0.9-2,2v8c0,1.1,0.9,2,2,2    h10c1.1,0,2-0.9,2-2v-8C-21,112.4-21.9,111.5-23,111.5z M-32,121.5c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1S-31.4,121.5-32,121.5z     M-32,118.5c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1S-31.4,118.5-32,118.5z M-32,115.5c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1    S-31.4,115.5-32,115.5z M-23,121.5h-7v-2h7V121.5z M-23,118.5h-7v-2h7V118.5z M-23,115.5h-7v-2h7V115.5z"
-   id="path4088" />
-	</g>
-</g>
-<g
-   id="g4090">
-	<g
-   id="g4092">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M2,115h7c0.6,0,1-0.4,1-1v-4c0-0.6-0.4-1-1-1H2c-0.6,0-1,0.4-1,1    v4C1,114.6,1.4,115,2,115z M14,109h-2c-0.6,0-1,0.4-1,1v4c0,0.6,0.4,1,1,1h2c0.6,0,1-0.4,1-1v-4C15,109.4,14.6,109,14,109z     M14,116H8c-0.6,0-1,0.4-1,1v5c0,0.6,0.4,1,1,1h6c0.6,0,1-0.4,1-1v-5C15,116.4,14.6,116,14,116z M5,116H2c-0.6,0-1,0.4-1,1v5    c0,0.6,0.4,1,1,1h3c0.6,0,1-0.4,1-1v-5C6,116.4,5.6,116,5,116z"
-   id="path4094" />
-	</g>
-</g>
-<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M45.8,116c0,0-0.6,0.8-1.8,0.8c-1.2,0-1.8-0.8-1.8-0.8l-6-5.1  c0.3-0.5,0.9-0.9,1.6-0.9h12.4c0.7,0,1.3,0.4,1.6,0.9L45.8,116z M42.2,117.7c0,0,0.6,0.8,1.8,0.8c1.2,0,1.8-0.8,1.8-0.8l6.2-5.4v8  c0,0.9-0.8,1.7-1.8,1.7H37.8c-1,0-1.8-0.8-1.8-1.7v-8L42.2,117.7z"
-   id="path4096" />
-<g
-   id="g4098">
-	<g
-   id="g4100">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M-237.5,145h-13c-0.8,0-1.5,0.7-1.5,1.5v11    c0,0.8,0.7,1.5,1.5,1.5h13c0.8,0,1.5-0.7,1.5-1.5v-11C-236,145.7-236.7,145-237.5,145z M-245.5,146c0.3,0,0.5,0.2,0.5,0.5    c0,0.3-0.2,0.5-0.5,0.5c-0.3,0-0.5-0.2-0.5-0.5C-246,146.2-245.8,146-245.5,146z M-247.6,146c0.3,0,0.5,0.2,0.5,0.5    c0,0.3-0.2,0.5-0.5,0.5s-0.5-0.2-0.5-0.5C-248.1,146.2-247.8,146-247.6,146z M-249.5,146c0.3,0,0.5,0.2,0.5,0.5    c0,0.3-0.2,0.5-0.5,0.5s-0.5-0.2-0.5-0.5C-250,146.2-249.8,146-249.5,146z M-250,156v-6c0-0.6,0.4-1,1-1h7v8h-7    C-249.6,157-250,156.6-250,156z M-238,156c0,0.6-0.4,1-1,1h-1v-8h1c0.6,0,1,0.4,1,1V156z"
-   id="path4102" />
-	</g>
-</g>
-<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#00A3F2"
-   d="M-213.2,156c-1.3-1.2-2.2-2.8-2.2-4.6c0-3.6,3.3-6.5,7.4-6.5  c4.1,0,7.4,2.9,7.4,6.5c0,3.6-3.3,6.5-7.4,6.5c-0.8,0-1.6-0.1-2.4-0.3c-1.8,0.7-4.3,1.7-4.5,1.4C-213.9,157.9-213.5,156.8-213.2,156  z"
-   id="path4104" />
-<rect
-   id="_x3C_Slice_x3E_"
-   fill="none"
-   width="16"
-   height="16" />
-</svg>
\ 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="100%" height="100%">
+  <path fill-rule="evenodd" fill="#00a3f2" d="M-238.2,6h-6.1l2.7-2.7c0.4-0.4,0.5-1.1,0.2-1.4l-1.2-1.2   c-0.3-0.3-1-0.3-1.4,0.2l-6.4,6.4c-0.1,0.1-0.1,0.2-0.2,0.2l0,0c0,0,0,0,0,0c0,0.1-0.1,0.1-0.1,0.1c0,0.1-0.1,0.2-0.1,0.3   c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0.1,0,0.2,0.1,0.3c0,0.1,0.1,0.1,0.1,0.1c0,0,0,0,0,0l0,0c0.1,0.1,0.1,0.2,0.2,0.2l6.4,6.4   c0.4,0.4,1.1,0.5,1.4,0.2l1.2-1.2c0.3-0.3,0.3-1-0.2-1.4l-2.8-2.8h6.2c0.6,0,1-0.4,1-1V7C-237.2,6.4-237.6,6-238.2,6z"/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M-212.7,6.3l-1,1c-0.2,0.2-0.2,0.4-0.2,0.7c0,0.3,0,0.5,0.2,0.7   l0.8,0.9l4.5,4.5c0.5,0.5,1.2,0.6,1.6,0.2l0.8-0.9c0.4-0.4,0.3-1.1-0.2-1.6l-1.8-1.8h4.7c0.6,0,1-0.5,1-1V7c0-0.6-0.5-1-1-1h-4.8   l1.9-1.9c0.5-0.5,0.6-1.3,0.2-1.6l-0.8-0.9c-0.4-0.4-1.1-0.3-1.6,0.2L-212.7,6.3z"/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M-167.3,9.7l1-1c0.2-0.2,0.2-0.4,0.2-0.7c0-0.3,0-0.5-0.2-0.7   l-0.8-0.9l-4.5-4.5c-0.5-0.5-1.2-0.6-1.6-0.2l-0.8,0.9c-0.4,0.4-0.3,1.1,0.2,1.6l1.8,1.8h-4.7c-0.6,0-1,0.5-1,1v2c0,0.6,0.5,1,1,1   h4.8l-1.9,1.9c-0.5,0.5-0.6,1.3-0.2,1.6l0.8,0.9c0.4,0.4,1.1,0.3,1.6-0.2L-167.3,9.7z"/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M-129.5,8h-7l2.8-2.8c-0.7-0.5-1.4-0.7-2.3-0.7c-2.2,0-4,1.8-4,4  c0,2.2,1.8,4,4,4c1.4,0,2.7-0.7,3.4-1.9l2.3,1c-1.1,2-3.2,3.4-5.7,3.4c-3.6,0-6.5-2.9-6.5-6.5c0-3.6,2.9-6.5,6.5-6.5  c1.5,0,2.9,0.5,4.1,1.4l2.4-2.4V8z"/>
+  <polygon fill="#00a3f2" points="-93.6,3.8 -95.8,1.7 -100,5.9 -104.3,1.6 -106.4,3.8    -102.1,8 -106.3,12.2 -104.1,14.3 -99.9,10.2 -95.7,14.4 -93.6,12.2 -97.8,8.1   "/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M-64,1l-8,7h2l6-5l6,5h2L-64,1z M-69,8v7h4v-5h2v5h4V8l-5-4L-69,8   z"/>
+  <path fill="#00a3f2" d="M-28,3.6l1,2l0.5,0.9l1,0.2l2.3,0.4l-1.7,1.8l-0.7,0.7l0.1,1l0.4,2.4l-2-1l-0.9-0.5l-0.9,0.5l-2,1l0.4-2.4  l0.1-1l-0.7-0.7l-1.7-1.8l2.4-0.4l1-0.2l0.5-0.9L-28,3.6 M-28,0c-0.3,0-0.6,0.2-0.8,0.7l-2,4.1l-4.3,0.7c-1,0.2-1.2,0.9-0.5,1.6  l3.1,3.3l-0.7,4.6c-0.1,0.7,0.2,1.1,0.7,1.1c0.2,0,0.4-0.1,0.6-0.2l3.9-2.1l3.9,2.1c0.2,0.1,0.5,0.2,0.6,0.2c0.5,0,0.8-0.4,0.7-1.1  l-0.7-4.6l3.1-3.3c0.7-0.7,0.4-1.4-0.5-1.6l-4.3-0.7l-2-4.1C-27.4,0.2-27.7,0-28,0L-28,0z"/>
+  <path fill="#00a3f2" style="fill:#0095dd;fill-opacity:1" d="M8,0C7.7,0,7.4,0.2,7.2,0.7l-2,4.1L0.9,5.5c-1,0.2-1.2,0.9-0.5,1.6l3.1,3.3l-0.7,4.6C2.7,15.6,3,16,3.4,16  c0.2,0,0.4-0.1,0.6-0.2L8,13.7l3.9,2.1c0.2,0.1,0.5,0.2,0.6,0.2c0.5,0,0.8-0.4,0.7-1.1l-0.7-4.6l3.1-3.3c0.7-0.7,0.4-1.4-0.5-1.6  l-4.3-0.7l-2-4.1C8.6,0.2,8.3,0,8,0L8,0z"/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M44,15.2c-4,0-7.2-3.2-7.2-7.2c0-4,3.2-7.2,7.2-7.2  c4,0,7.2,3.2,7.2,7.2C51.2,12,48,15.2,44,15.2z M44,3c-2.8,0-5,2.2-5,5c0,2.7,2.2,5,5,5c2.8,0,5-2.2,5-5C49,5.3,46.8,3,44,3z   M43.7,8.9C43.3,8.8,43,8.4,43,8V5c0-0.6,0.4-1,1-1c0.6,0,1,0.4,1,1v2.8c1.1,1.1,2,3.2,2,3.2S44.8,10,43.7,8.9z"/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M86.7,9.1l-5.6,5.5C80.8,14.9,80.4,15,80,15  c-0.4,0-0.8-0.1-1.1-0.4l-5.6-5.5C72.7,8.5,72.9,8,73.8,8H77l0-6c0-0.6,0.4-1,1-1h4c0.6,0,1,0.4,1,1v6h3.2C87.1,8,87.3,8.5,86.7,9.1  z"/>
+  <path fill="#00a3f2" d="M-241,52c0.5,0,1-0.4,1-1v-4c0,0,0.1-0.8,0.8-0.8c0.6,0,0.6,0.8,1.8,0.8c0.6,0,1.5-0.2,1.5-2  c0-1.8-0.9-2-1.5-2c-1.1,0-1.1,0.8-1.8,0.8c-0.6,0-0.8-0.8-0.8-0.8v-2c0-0.6-0.4-1-1-1h-3c0,0-0.8-0.1-0.8-0.8  c0-0.6,0.8-0.6,0.8-1.8c0-0.6-0.2-1.5-2-1.5c-1.8,0-2,0.9-2,1.5c0,1.1,0.8,1.1,0.8,1.8c0,0.6-0.8,0.8-0.8,0.8h-3c-0.5,0-1,0.4-1,1  l0,2.5c0,0-0.1,1.5,1.1,1.5c0.8,0,0.9-1,1.9-1c0.5,0,1,0.5,1,1.6c0,1-0.5,1.6-1,1.6c-1,0-1.1-1-1.9-1c-1.2,0-1.1,1.5-1.1,1.5l0,3.5  c0,0.6,0.4,1,1,1h3.8c0,0,1.5,0.1,1.5-1.1c0-0.8-1-0.9-1-1.9c0-0.5,0.7-1.2,1.8-1.2c1,0,1.8,0.7,1.8,1.2c0,1-1,1.1-1,1.9  c0,1.2,1.5,1.1,1.5,1.1H-241z"/>
+  <path fill-rule="evenodd" d="M-200.4,41.9h-0.3v0h-14.4v0h-0.3c-0.2,0-0.4,0.2-0.4,0.4c0,0,0.3,2.2,0.5,4.4   c0.2,2.5,0.2,4.2,0.2,4.2c0,0.2,0.2,0.4,0.4,0.4h13.7c0.2,0,0.4-0.2,0.4-0.4c0,0,0.1-2.1,0.2-4.2c0.1-2.2,0.5-4.4,0.5-4.4   C-200.1,42.1-200.2,41.9-200.4,41.9z"/>
+  <path fill-rule="evenodd" d="M-200.8,41.3v-2c0-0.3-0.2-0.5-0.5-0.5l-6.7,0l-0.8-1.1c0,0-0.6-0.9-1.2-0.9h-4.2   c-0.6,0-1,0.5-1,1v1l0,2.5H-200.8z"/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M-169,37h-7.5c-0.8,0-1.5,0.7-1.5,1.5v11c0,0.8,0.7,1.5,1.5,1.5    h9c0.8,0,1.5-0.7,1.5-1.5V40L-169,37z M-170,41v-3.3l3.3,3.3H-170z"/>
+  <path fill-rule="evenodd" d="M-132.5,38c-0.4,0.2-0.9,0.6-1.3,1.2c-0.3,0.4-0.5,0.9-0.8,1.3    c0.7,0.3,1.3,0.8,1.7,1.4c0.4,0.7,0.7,1.5,0.6,2.3c-0.1,1.3-1,2.4-2.1,3c-0.5-0.5-1.4-2.1-1.4-2.1c0,0,0,1.8-0.6,3    c-0.4,0.8-0.9,1.5-1.6,2.1c1,0.4,2,0.6,3,0.6l0-0.1c0,0,0.1,0.1,0.1,0.1c2.1,0,4.1-0.3,4.1-0.3s-0.9-0.6-1.3-0.9    c1.3-0.7,2.2-2,2.5-3.3c0.2-0.5,0.3-1.1,0.4-1.7C-128.7,41.9-130.2,39.3-132.5,38z M-139.8,44.2c0-1.4,0.8-2.8,2.2-3.5    c0.5,0.5,1.6,2,1.6,2s0-3.6,1.2-5.6c-4.3-0.5-6.8,0.3-6.8,0.3s1.2,0.4,1.6,0.8c-0.1,0.1-0.2,0.1-0.3,0.2c-1,0.7-1.7,1.6-2.1,2.7    c-0.3,0.6-0.5,1.3-0.5,2c-0.3,2.8,1.1,5.4,3.4,6.7c0.4-0.3,0.8-0.6,1.2-1.1c0.4-0.4,0.7-0.9,1-1.4    C-138.7,46.9-139.7,45.7-139.8,44.2z"/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M-96.6,41.5c-3.3-4-9.6-4.5-9.6-4.5c-0.4,0-0.8,0.3-0.8,0.7v1.4    c0,0.4,0.3,0.7,0.8,0.7c0,0,4.5,0.1,7.1,3.2c3.5,3.6,3.2,7.2,3.2,7.2c0,0.4,0.3,0.8,0.8,0.8h1.5c0.4,0,0.7-0.3,0.7-0.8    C-93,50.2-93.3,44.5-96.6,41.5z M-106.2,42c-0.4,0-0.8,0.3-0.8,0.7V44c0,0.4,0.3,0.7,0.8,0.7c0,0,2.4,0.1,3.8,1.4    c1.9,1.7,1.8,4.2,1.8,4.2c0,0.4,0.2,0.8,0.6,0.8h1.5c0.4,0,0.5-0.3,0.5-0.8c0,0-0.4-3.9-2.5-5.9C-102.5,42.4-106.2,42-106.2,42z     M-105,47c-1.1,0-2,0.9-2,2c0,1.1,0.9,2,2,2c1.1,0,2-0.9,2-2C-103,47.9-103.9,47-105,47z"/>
+  <path fill="none" d="M-102.6,34.4c0.5,0,1-0.4,1-1v-4c0,0,0.1-0.8,0.8-0.8c0.6,0,0.6,0.8,1.8,0.8c0.6,0,1.5-0.2,1.5-2  c0-1.8-0.9-2-1.5-2c-1.1,0-1.1,0.8-1.8,0.8c-0.6,0-0.8-0.8-0.8-0.8v-2c0-0.6-0.4-1-1-1h-3c0,0-0.8-0.1-0.8-0.8  c0-0.6,0.8-0.6,0.8-1.8c0-0.6-0.2-1.5-2-1.5c-1.8,0-2,0.9-2,1.5c0,1.1,0.8,1.1,0.8,1.8c0,0.6-0.8,0.8-0.8,0.8h-3c-0.5,0-1,0.4-1,1  l0,2.5c0,0-0.1,1.5,1.1,1.5c0.8,0,0.9-1,1.9-1c0.5,0,1,0.5,1,1.6c0,1-0.5,1.6-1,1.6c-1,0-1.1-1-1.9-1c-1.2,0-1.1,1.5-1.1,1.5l0,3.5  c0,0.6,0.4,1,1,1h3.8c0,0,1.5,0.1,1.5-1.1c0-0.8-1-0.9-1-1.9c0-0.5,0.7-1.2,1.8-1.2c1,0,1.8,0.7,1.8,1.2c0,1-1,1.1-1,1.9  c0,1.2,1.5,1.1,1.5,1.1H-102.6z"/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M-63,46.7l-0.3-0.1L-63,52l2.6-3.8L-63,46.7z M-63.3,46l0.3,0    l6,2.9V36l-14,11l4.6-0.6L-63,52l-1.9-5.7l-0.3-0.1l0.3,0L-65,46l7-8L-63.3,46L-63.3,46z"/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M-23,37h-10c-1.1,0-2,0.9-2,2v10c0,1.1,0.9,2,2,2h10    c1.1,0,2-0.9,2-2V39C-21,37.9-21.9,37-23,37z M-23,46c0,1.7-1.3,2-3,2h-4c-1.7,0-3-1.3-3-3v-4c0-1.7,1.3-3,3-3h4c1.7,0,3,1.3,3,3    V46z"/>
+  <path fill="#00a3f2" d="M-23.7,42.6c0-0.8-0.2-1.5-0.6-2c-0.4-0.5-1-0.7-1.7-0.7c-0.4,0-0.8,0.1-1.1,0.3s-0.6,0.4-0.8,0.8  c-0.2-0.4-0.4-0.6-0.7-0.8c-0.3-0.2-0.7-0.2-1.2-0.2c-0.4,0-0.7,0-1.1,0.1s-0.7,0.2-1,0.4l0.3,0.7c0.6-0.3,1.2-0.5,1.7-0.5  c0.4,0,0.8,0.1,1,0.3c0.2,0.2,0.3,0.6,0.3,1.1v0.4l-1,0c-0.9,0-1.6,0.2-2.1,0.5c-0.5,0.3-0.7,0.8-0.7,1.4c0,0.6,0.2,1,0.5,1.3  c0.3,0.3,0.8,0.5,1.4,0.5c0.5,0,0.9-0.1,1.3-0.3c0.4-0.2,0.7-0.5,1-1c0.5,0.9,1.2,1.3,2.3,1.3c0.4,0,0.7,0,1-0.1  c0.3-0.1,0.6-0.2,0.9-0.3v-0.8c-0.3,0.1-0.6,0.3-0.9,0.3c-0.3,0.1-0.6,0.1-0.9,0.1c-1.2,0-1.8-0.7-1.8-2.2h3.9V42.6z M-28.5,43.6  c0,0.6-0.2,1-0.5,1.3c-0.3,0.3-0.7,0.5-1.3,0.5c-0.3,0-0.6-0.1-0.8-0.2c-0.2-0.2-0.3-0.4-0.3-0.8c0-0.4,0.2-0.7,0.5-0.9  c0.3-0.2,0.8-0.3,1.5-0.3l0.9,0V43.6z M-27.5,42.4c0-0.6,0.2-1,0.4-1.3c0.3-0.3,0.6-0.5,1.1-0.5c0.4,0,0.8,0.2,1,0.5  c0.2,0.3,0.4,0.8,0.4,1.3H-27.5z"/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M14.5,37h-13C0.7,37,0,37.7,0,38.5v11C0,50.3,0.7,51,1.5,51h13    c0.8,0,1.5-0.7,1.5-1.5v-11C16,37.7,15.3,37,14.5,37z M6.5,38C6.8,38,7,38.2,7,38.5C7,38.8,6.8,39,6.5,39C6.2,39,6,38.8,6,38.5    C6,38.2,6.2,38,6.5,38z M4.4,38c0.3,0,0.5,0.2,0.5,0.5c0,0.3-0.2,0.5-0.5,0.5c-0.3,0-0.5-0.2-0.5-0.5C3.9,38.2,4.2,38,4.4,38z     M2.5,38C2.8,38,3,38.2,3,38.5C3,38.8,2.8,39,2.5,39C2.2,39,2,38.8,2,38.5C2,38.2,2.2,38,2.5,38z M14,48c0,0.6-0.4,1-1,1H3    c-0.6,0-1-0.4-1-1v-6c0-0.6,0.4-1,1-1h10c0.6,0,1,0.4,1,1V48z"/>
+  <path fill="#00a3f2" d="M51.2,45.9L51.2,45.9c-0.4-0.1-0.7-0.3-1-0.6c-0.1-0.1-0.1-0.1-0.2-0.2c-0.1-0.1-0.1-0.1-0.2-0.2  c0-0.1-0.1-0.1-0.1-0.2c0-0.1-0.1-0.1-0.1-0.2c-0.3-0.6-0.4-1.5-0.5-2.4c-0.3-2.2-0.1-3.8-3-3.8h-4.4c-2.9,0-2.6,1.6-2.9,3.8  c-0.1,0.9-0.3,1.8-0.6,2.4c0,0,0,0,0,0c-0.1,0.1-0.1,0.2-0.2,0.3c0,0,0,0-0.1,0.1c-0.1,0.2-0.2,0.3-0.4,0.4  c-0.3,0.2-0.5,0.4-0.9,0.5l0,0C36.4,46,36,46.3,36,46.8v1.9c0,0.5,0.4,0.9,0.9,0.9h14.1c0.5,0,0.9-0.4,0.9-0.9v-1.9  C52,46.3,51.6,46,51.2,45.9z M46.4,43.8c0,0.1-0.1,0.2-0.2,0.2h-1.6v1.6c0,0.1-0.1,0.2-0.2,0.2h-0.5c-0.1,0-0.2-0.1-0.2-0.2V44h-1.6  c-0.1,0-0.2-0.1-0.2-0.2v-0.5c0-0.1,0.1-0.2,0.2-0.2h1.6v-1.6c0-0.1,0.1-0.2,0.2-0.2h0.5c0.1,0,0.2,0.1,0.2,0.2v1.6h1.6  c0.1,0,0.2,0.1,0.2,0.2V43.8z"/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M87.7,42c-0.1,1.1,0.2,2.5-1.3,4.4c-1.6,2.1-3.1,2.1-3.4,2.1  c-1.8-0.1-2-1.5-3-1.5c-0.9,0-1.6,1.4-3,1.5c-0.3,0-1.9,0-3.4-2c-1.5-1.9-1.2-3.3-1.3-4.4S72,39.7,72,39.7s0.7,0.7,1.6,0.8  c0.9,0.1,1.1-0.3,3-0.9c2.1-0.6,3.4,1.9,3.4,1.9s1.4-2.4,3.4-1.9c1.9,0.6,2,0.9,2.9,0.9c0.9-0.1,1.7-0.8,1.7-0.8S87.8,40.9,87.7,42z   M76.9,42.5c-1.1-0.3-1.6,0.2-2.1,0.4C74.4,43,74,43.1,74,43.1s0.1,0.7,1.2,1.2c1.1,0.6,3.5,0.3,3.5,0.3S78.9,42.9,76.9,42.5z   M85.2,42.9c-0.5-0.2-1-0.6-2.1-0.4c-2,0.4-1.8,2.1-1.8,2.1s2.4,0.3,3.5-0.3c1.1-0.6,1.2-1.2,1.2-1.2S85.6,43,85.2,42.9z"/>
+  <path fill-rule="evenodd" d="M-237.5,84.9l-3.3-3.3c0.5-0.9,0.9-1.9,0.9-2.9c0-3-2.4-5.5-5.5-5.5    c-3,0-5.5,2.4-5.5,5.5c0,3,2.4,5.5,5.5,5.5c1.1,0,2.1-0.3,3-0.9l3.3,3.3c0.4,0.4,1,0.4,1.4,0l0.2-0.2    C-237.1,85.9-237.1,85.3-237.5,84.9z M-245.4,82c-1.8,0-3.3-1.5-3.3-3.4c0-1.9,1.5-3.4,3.3-3.4c1.8,0,3.3,1.5,3.3,3.4    C-242,80.5-243.5,82-245.4,82z"/>
+  <path fill-rule="evenodd" d="M-214.5,86.3l0.2,0.2c0.4,0.4,1,0.4,1.4,0l3.3-3.3c0.9,0.6,1.9,0.9,3,0.9    c3,0,5.5-2.4,5.5-5.5c0-3-2.4-5.5-5.5-5.5c-3,0-5.5,2.4-5.5,5.5c0,1.1,0.3,2.1,0.9,2.9l-3.3,3.3    C-214.9,85.3-214.9,85.9-214.5,86.3z M-210,78.6c0-1.9,1.5-3.4,3.3-3.4c1.8,0,3.3,1.5,3.3,3.4c0,1.9-1.5,3.4-3.3,3.4    C-208.5,82-210,80.5-210,78.6z"/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M-165,77.5h-1v-2c0-0.6-0.4-1-1-1v-1c0-0.6-0.4-1-1-1h-8   c-0.6,0-1,0.4-1,1v1c-0.6,0-1,0.4-1,1v2h-1c-0.6,0-1,0.4-1,1v5c0,0.6,0.4,1,1,1h2v-1h0.5l-1.5,3h12l-1.5-3h0.5v1h2c0.6,0,1-0.4,1-1   v-5C-164,77.9-164.4,77.5-165,77.5z M-176.5,80.5h-1c-0.3,0-0.5-0.2-0.5-0.5c0-0.3,0.2-0.5,0.5-0.5h1c0.3,0,0.5,0.2,0.5,0.5   C-176,80.2-176.2,80.5-176.5,80.5z M-176,85.5l0.9-2h6.2l0.9,2H-176z M-168,77.5c0,0.6-0.4,1-1,1h-6c-0.6,0-1-0.4-1-1v-3   c0-0.6,0.4-1,1-1h6c0.6,0,1,0.4,1,1V77.5z"/>
+  <path fill="#00a3f2" d="M-135,73l1.9,1.9l-2.6,2.6c-0.5,0.5-0.5,1.4,0.1,2c0.6,0.6,1.5,0.6,2,0.1l2.6-2.6l1.9,1.9v-6H-135z    M-138.5,80.4l-2.6,2.6L-143,81v6h6l-1.9-1.9l2.6-2.6c0.5-0.5,0.5-1.4-0.1-2C-137.1,79.9-138,79.9-138.5,80.4z"/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M-93.5,73.5c-0.6-0.6-1.5-0.6-2-0.1l-2.6,2.6L-100,74v6h6   l-1.9-1.9l2.6-2.6C-92.9,75-92.9,74.1-93.5,73.5z M-104.1,81.9l-2.6,2.6c-0.5,0.5-0.5,1.4,0.1,2c0.6,0.6,1.5,0.6,2,0.1l2.6-2.6   l1.9,1.9v-6h-6L-104.1,81.9z"/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M14.6,75.1l-2.3,2.3c-0.5,0.5-1.3,0.5-1.7,0   c-0.5-0.5-0.5-1.2,0-1.7l2.4-2.3c-0.6-0.3-1.2-0.5-1.9-0.5C8.8,72.9,7,74.7,7,77c0,0.5,0.1,1.1,0.3,1.5l-5.9,5.8   c-0.6,0.6-0.6,1.7,0,2.3c0.6,0.6,1.7,0.6,2.3,0l6-5.9c0.4,0.2,0.9,0.3,1.4,0.3c2.2,0,4.1-1.8,4.1-4.1   C15.1,76.3,14.9,75.7,14.6,75.1z M2.5,86.4c-0.5,0-0.9-0.4-0.9-0.9c0-0.5,0.4-0.9,0.9-0.9c0.5,0,0.9,0.4,0.9,0.9   C3.4,86,3,86.4,2.5,86.4z"/>
+  <path fill="#00a3f2" d="M-22.7,83.9l-1.1-1.1c0.2-0.3,0.3-0.6,0.5-0.9c0.1-0.3,0.2-0.6,0.3-0.9l1.6,0c0.3,0,0.5-0.2,0.5-0.5l0-1  c0-0.3-0.2-0.5-0.5-0.5l-1.6,0c-0.1-0.6-0.4-1.2-0.7-1.8l1.1-1.1c0.2-0.2,0.2-0.5,0-0.7l-0.7-0.7c-0.2-0.2-0.5-0.2-0.7,0l-1.1,1.1  c-0.3-0.2-0.6-0.3-0.9-0.5c-0.3-0.1-0.6-0.2-0.9-0.3l0-1.6c0-0.3-0.2-0.5-0.5-0.5l-1,0c-0.3,0-0.5,0.2-0.5,0.5l0,1.6  c-0.6,0.1-1.2,0.4-1.8,0.7l-1.1-1.1c-0.2-0.2-0.5-0.2-0.7,0l-0.7,0.7c-0.2,0.2-0.2,0.5,0,0.7l1.1,1.1c-0.2,0.3-0.3,0.6-0.5,0.9  c-0.1,0.3-0.2,0.6-0.3,0.9l-1.6,0c-0.3,0-0.5,0.2-0.5,0.5l0,1c0,0.3,0.2,0.5,0.5,0.5l1.6,0c0.1,0.6,0.4,1.2,0.7,1.8l-1.1,1.1  c-0.2,0.2-0.2,0.5,0,0.7l0.7,0.7c0.2,0.2,0.5,0.2,0.7,0l1.1-1.1c0.3,0.2,0.6,0.3,0.9,0.5c0.3,0.1,0.6,0.2,0.9,0.3l0,1.6  c0,0.3,0.2,0.5,0.5,0.5l1,0c0.3,0,0.5-0.2,0.5-0.5l0-1.6c0.6-0.1,1.2-0.4,1.8-0.7l1.1,1.1c0.2,0.2,0.5,0.2,0.7,0l0.7-0.7  C-22.5,84.4-22.5,84.1-22.7,83.9z M-28.8,82.1c-1.2-0.5-1.7-1.8-1.3-3c0.5-1.2,1.8-1.7,3-1.3c1.2,0.5,1.7,1.8,1.3,3  C-26.4,82-27.7,82.6-28.8,82.1z"/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M-62,77h-4c-0.6,0-1,0.4-1,1v4c0,0.6,0.4,1,1,1h4    c0.6,0,1-0.4,1-1v-4C-61,77.4-61.4,77-62,77z M-62,81c0,0.6-0.4,1-1,1h-2c-0.6,0-1-0.4-1-1v-1c0-0.6,0.4-1,1-1h2c0.6,0,1,0.4,1,1    V81z M-64,87l3-3h-6L-64,87z M-67,76h6l-3-3L-67,76z M-60,76.9v6l3-3L-60,76.9z M-68,82.9v-6l-3,3L-68,82.9z"/>
+  <path fill-rule="evenodd" d="M37.5,76.5h13c0.8,0,1.5-0.7,1.5-1.5c0-0.8-0.7-1.5-1.5-1.5h-13    c-0.8,0-1.5,0.7-1.5,1.5C36,75.8,36.7,76.5,37.5,76.5z M50.5,78.5h-13c-0.8,0-1.5,0.7-1.5,1.5c0,0.8,0.7,1.5,1.5,1.5h13    c0.8,0,1.5-0.7,1.5-1.5C52,79.2,51.3,78.5,50.5,78.5z M50.5,83.5h-13c-0.8,0-1.5,0.7-1.5,1.5c0,0.8,0.7,1.5,1.5,1.5h13    c0.8,0,1.5-0.7,1.5-1.5C52,84.2,51.3,83.5,50.5,83.5z"/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M85.6,87c-0.8,0-1.5-0.2-2.3-1.3c-0.8-1.1-1.7-2.5-1.7-2.5  s-0.7-0.9-1.1-1.6c-0.4-0.7-1.1-0.5-1.1-0.5s-2.8-4.6-3.3-5.4c-0.7-1,0.6-2.7,0.6-2.7l4.4,7c0,0,1.3,1.9,1.9,2.3  c0.5,0.4,1.4-0.4,2.8,0.9C87.7,85,87.1,87,85.6,87z M85.4,84.1c-0.9-1-1.7-0.9-1.9-0.6c-0.2,0.3,0,1.2,0.4,1.7  c0.4,0.5,0.8,0.7,1.4,0.7C85.9,86,86.4,85.2,85.4,84.1z M81.6,79.4l-1.2-1.8l2.9-4.6c0,0,1.2,1.7,0.6,2.7  C83.6,76.1,82.5,78,81.6,79.4z M77,82.3c0.3-0.3,1-1.1,1.4-1.7l0.8,1.2c-0.4,0.6-0.9,1.4-0.9,1.4s-0.9,1.4-1.7,2.5  c-0.8,1.1-1.5,1.3-2.3,1.3c-1.4,0-2.1-2-0.1-3.8C75.6,82,76.5,82.7,77,82.3z M74.6,84.1c-0.9,1-0.4,1.8,0.2,1.8c0.6,0,1-0.2,1.4-0.7  c0.4-0.5,0.6-1.5,0.4-1.7C76.3,83.2,75.5,83.1,74.6,84.1z"/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M-243,111c0-0.1-2-2-2-2c-1.7,0-5,0-5,0c-0.6,0-1,0.4-1,1v8    c0,0.6,0.4,1,1,1h4v-6.1c0-0.3,0.2-0.5,0.5-0.5h2.5V111z M-246,112v-2l2,2H-246z M-239,113c-1.7,0-5,0-5,0c-0.6,0-1,0.4-1,1v8    c0,0.6,0.4,1,1,1h6c0.6,0,1-0.4,1-1c0,0,0-4.8,0-7C-237,115-239,113-239,113z M-240,116v-2l2,2H-240z"/>
+  <path fill="#00a3f2" d="M-204.5,111h-1.3l0,0c0,0-0.2-2-2.2-2c-2,0-2.2,2-2.2,2l0,0h-1.3c-0.8,0-1.5,0.7-1.5,1.5v9    c0,0.8,0.7,1.5,1.5,1.5h7c0.8,0,1.5-0.7,1.5-1.5v-9C-203,111.7-203.7,111-204.5,111z M-210.7,112.1l0.8-0.4l0.4-0.2l0-0.4    c0-0.2,0.2-1.3,1.5-1.3c1.2,0,1.4,1.1,1.5,1.3l0,0.4l0.4,0.2l0.8,0.4l0.3,0.7h-6.1L-210.7,112.1z M-210.1,120.4l-2.8-4.9l3.3-1.9    h4.3l1.8,3.1L-210.1,120.4z"/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M-177,115h10v2h-10V115z"/>
+  <polygon fill="#00a3f2" points="-131,115 -135,115 -135,111 -137,111 -137,115 -141,115    -141,117 -137,117 -137,121 -135,121 -135,117 -131,117   "/>
+  <path fill="#00a3f2" d="M-94,111.7l-3,2.7v-2c0-0.8-0.6-1.4-1.3-1.4h-7.4c-0.7,0-1.3,0.6-1.3,1.4v7.2c0,0.8,0.6,1.4,1.3,1.4h7.4   c0.7,0,1.3-0.6,1.3-1.4v-2.1l3,2.7c0.3,0.3,0.6,0.4,1,0.3v-9.1C-93.3,111.4-93.7,111.5-94,111.7z"/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M-61.9,112h-3l3.8,4l-3.8,4h3.1l3.8-4L-61.9,112z M-66.9,112h-3    l3.8,4l-3.8,4h3.1l3.8-4L-66.9,112z"/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M-23,111.5h-2l-3-3l-3,3h-2c-1.1,0-2,0.9-2,2v8c0,1.1,0.9,2,2,2    h10c1.1,0,2-0.9,2-2v-8C-21,112.4-21.9,111.5-23,111.5z M-32,121.5c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1S-31.4,121.5-32,121.5z     M-32,118.5c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1S-31.4,118.5-32,118.5z M-32,115.5c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1    S-31.4,115.5-32,115.5z M-23,121.5h-7v-2h7V121.5z M-23,118.5h-7v-2h7V118.5z M-23,115.5h-7v-2h7V115.5z"/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M2,115h7c0.6,0,1-0.4,1-1v-4c0-0.6-0.4-1-1-1H2c-0.6,0-1,0.4-1,1    v4C1,114.6,1.4,115,2,115z M14,109h-2c-0.6,0-1,0.4-1,1v4c0,0.6,0.4,1,1,1h2c0.6,0,1-0.4,1-1v-4C15,109.4,14.6,109,14,109z     M14,116H8c-0.6,0-1,0.4-1,1v5c0,0.6,0.4,1,1,1h6c0.6,0,1-0.4,1-1v-5C15,116.4,14.6,116,14,116z M5,116H2c-0.6,0-1,0.4-1,1v5    c0,0.6,0.4,1,1,1h3c0.6,0,1-0.4,1-1v-5C6,116.4,5.6,116,5,116z"/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M45.8,116c0,0-0.6,0.8-1.8,0.8c-1.2,0-1.8-0.8-1.8-0.8l-6-5.1  c0.3-0.5,0.9-0.9,1.6-0.9h12.4c0.7,0,1.3,0.4,1.6,0.9L45.8,116z M42.2,117.7c0,0,0.6,0.8,1.8,0.8c1.2,0,1.8-0.8,1.8-0.8l6.2-5.4v8  c0,0.9-0.8,1.7-1.8,1.7H37.8c-1,0-1.8-0.8-1.8-1.7v-8L42.2,117.7z"/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M-237.5,145h-13c-0.8,0-1.5,0.7-1.5,1.5v11    c0,0.8,0.7,1.5,1.5,1.5h13c0.8,0,1.5-0.7,1.5-1.5v-11C-236,145.7-236.7,145-237.5,145z M-245.5,146c0.3,0,0.5,0.2,0.5,0.5    c0,0.3-0.2,0.5-0.5,0.5c-0.3,0-0.5-0.2-0.5-0.5C-246,146.2-245.8,146-245.5,146z M-247.6,146c0.3,0,0.5,0.2,0.5,0.5    c0,0.3-0.2,0.5-0.5,0.5s-0.5-0.2-0.5-0.5C-248.1,146.2-247.8,146-247.6,146z M-249.5,146c0.3,0,0.5,0.2,0.5,0.5    c0,0.3-0.2,0.5-0.5,0.5s-0.5-0.2-0.5-0.5C-250,146.2-249.8,146-249.5,146z M-250,156v-6c0-0.6,0.4-1,1-1h7v8h-7    C-249.6,157-250,156.6-250,156z M-238,156c0,0.6-0.4,1-1,1h-1v-8h1c0.6,0,1,0.4,1,1V156z"/>
+  <path fill-rule="evenodd" fill="#00a3f2" d="M-213.2,156c-1.3-1.2-2.2-2.8-2.2-4.6c0-3.6,3.3-6.5,7.4-6.5  c4.1,0,7.4,2.9,7.4,6.5c0,3.6-3.3,6.5-7.4,6.5c-0.8,0-1.6-0.1-2.4-0.3c-1.8,0.7-4.3,1.7-4.5,1.4C-213.9,157.9-213.5,156.8-213.2,156  z"/>
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/heartbeat-star-off.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/heartbeat-star-off.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/heartbeat-star-off.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/heartbeat-star-off.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,428 +1,50 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Toolbar"
-   x="0px"
-   y="0px"
-   viewBox="0 0 16 16"
-   enable-background="new 0 0 16 16"
-   xml:space="preserve"
-   inkscape:version="0.48.5 r10040"
-   width="100%"
-   height="100%"
-   sodipodi:docname="star-off.svg"><metadata
-   id="metadata5255"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-   id="defs5253" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="710"
-   inkscape:window-height="480"
-   id="namedview5251"
-   showgrid="false"
-   inkscape:zoom="14.75"
-   inkscape:cx="7.6064963"
-   inkscape:cy="8"
-   inkscape:window-x="0"
-   inkscape:window-y="0"
-   inkscape:window-maximized="0"
-   inkscape:current-layer="Toolbar" />
-<g
-   id="g5070">
-	<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M-238.2,6h-6.1l2.7-2.7c0.4-0.4,0.5-1.1,0.2-1.4l-1.2-1.2   c-0.3-0.3-1-0.3-1.4,0.2l-6.4,6.4c-0.1,0.1-0.1,0.2-0.2,0.2l0,0c0,0,0,0,0,0c0,0.1-0.1,0.1-0.1,0.1c0,0.1-0.1,0.2-0.1,0.3   c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0.1,0,0.2,0.1,0.3c0,0.1,0.1,0.1,0.1,0.1c0,0,0,0,0,0l0,0c0.1,0.1,0.1,0.2,0.2,0.2l6.4,6.4   c0.4,0.4,1.1,0.5,1.4,0.2l1.2-1.2c0.3-0.3,0.3-1-0.2-1.4l-2.8-2.8h6.2c0.6,0,1-0.4,1-1V7C-237.2,6.4-237.6,6-238.2,6z"
-   id="path5072" />
-</g>
-<g
-   id="g5074">
-	<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M-212.7,6.3l-1,1c-0.2,0.2-0.2,0.4-0.2,0.7c0,0.3,0,0.5,0.2,0.7   l0.8,0.9l4.5,4.5c0.5,0.5,1.2,0.6,1.6,0.2l0.8-0.9c0.4-0.4,0.3-1.1-0.2-1.6l-1.8-1.8h4.7c0.6,0,1-0.5,1-1V7c0-0.6-0.5-1-1-1h-4.8   l1.9-1.9c0.5-0.5,0.6-1.3,0.2-1.6l-0.8-0.9c-0.4-0.4-1.1-0.3-1.6,0.2L-212.7,6.3z"
-   id="path5076" />
-</g>
-<g
-   id="g5078">
-	<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M-167.3,9.7l1-1c0.2-0.2,0.2-0.4,0.2-0.7c0-0.3,0-0.5-0.2-0.7   l-0.8-0.9l-4.5-4.5c-0.5-0.5-1.2-0.6-1.6-0.2l-0.8,0.9c-0.4,0.4-0.3,1.1,0.2,1.6l1.8,1.8h-4.7c-0.6,0-1,0.5-1,1v2c0,0.6,0.5,1,1,1   h4.8l-1.9,1.9c-0.5,0.5-0.6,1.3-0.2,1.6l0.8,0.9c0.4,0.4,1.1,0.3,1.6-0.2L-167.3,9.7z"
-   id="path5080" />
-</g>
-<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M-129.5,8h-7l2.8-2.8c-0.7-0.5-1.4-0.7-2.3-0.7c-2.2,0-4,1.8-4,4  c0,2.2,1.8,4,4,4c1.4,0,2.7-0.7,3.4-1.9l2.3,1c-1.1,2-3.2,3.4-5.7,3.4c-3.6,0-6.5-2.9-6.5-6.5c0-3.6,2.9-6.5,6.5-6.5  c1.5,0,2.9,0.5,4.1,1.4l2.4-2.4V8z"
-   id="path5082" />
-<g
-   id="g5084">
-	<g
-   id="g5086">
-		<polygon
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   points="-93.6,3.8 -95.8,1.7 -100,5.9 -104.3,1.6 -106.4,3.8     -102.1,8 -106.3,12.2 -104.1,14.3 -99.9,10.2 -95.7,14.4 -93.6,12.2 -97.8,8.1   "
-   id="polygon5088" />
-	</g>
-</g>
-<g
-   id="g5090">
-	<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M-64,1l-8,7h2l6-5l6,5h2L-64,1z M-69,8v7h4v-5h2v5h4V8l-5-4L-69,8   z"
-   id="path5092" />
-</g>
-<path
-   fill="#231F20"
-   d="M-28,3.6l1,2l0.5,0.9l1,0.2l2.3,0.4l-1.7,1.8l-0.7,0.7l0.1,1l0.4,2.4l-2-1l-0.9-0.5l-0.9,0.5l-2,1l0.4-2.4  l0.1-1l-0.7-0.7l-1.7-1.8l2.4-0.4l1-0.2l0.5-0.9L-28,3.6 M-28,0c-0.3,0-0.6,0.2-0.8,0.7l-2,4.1l-4.3,0.7c-1,0.2-1.2,0.9-0.5,1.6  l3.1,3.3l-0.7,4.6c-0.1,0.7,0.2,1.1,0.7,1.1c0.2,0,0.4-0.1,0.6-0.2l3.9-2.1l3.9,2.1c0.2,0.1,0.5,0.2,0.6,0.2c0.5,0,0.8-0.4,0.7-1.1  l-0.7-4.6l3.1-3.3c0.7-0.7,0.4-1.4-0.5-1.6l-4.3-0.7l-2-4.1C-27.4,0.2-27.7,0-28,0L-28,0z"
-   id="path5094" />
-<path
-   fill="#231F20"
-   d="M8,0C7.7,0,7.4,0.2,7.2,0.7l-2,4.1L0.9,5.5c-1,0.2-1.2,0.9-0.5,1.6l3.1,3.3l-0.7,4.6C2.7,15.6,3,16,3.4,16  c0.2,0,0.4-0.1,0.6-0.2L8,13.7l3.9,2.1c0.2,0.1,0.5,0.2,0.6,0.2c0.5,0,0.8-0.4,0.7-1.1l-0.7-4.6l3.1-3.3c0.7-0.7,0.4-1.4-0.5-1.6  l-4.3-0.7l-2-4.1C8.6,0.2,8.3,0,8,0L8,0z"
-   id="path5096"
-   style="fill:#c0c0c0;fill-opacity:1" />
-<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M44,15.2c-4,0-7.2-3.2-7.2-7.2c0-4,3.2-7.2,7.2-7.2  c4,0,7.2,3.2,7.2,7.2C51.2,12,48,15.2,44,15.2z M44,3c-2.8,0-5,2.2-5,5c0,2.7,2.2,5,5,5c2.8,0,5-2.2,5-5C49,5.3,46.8,3,44,3z   M43.7,8.9C43.3,8.8,43,8.4,43,8V5c0-0.6,0.4-1,1-1c0.6,0,1,0.4,1,1v2.8c1.1,1.1,2,3.2,2,3.2S44.8,10,43.7,8.9z"
-   id="path5098" />
-<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M86.7,9.1l-5.6,5.5C80.8,14.9,80.4,15,80,15  c-0.4,0-0.8-0.1-1.1-0.4l-5.6-5.5C72.7,8.5,72.9,8,73.8,8H77l0-6c0-0.6,0.4-1,1-1h4c0.6,0,1,0.4,1,1v6h3.2C87.1,8,87.3,8.5,86.7,9.1  z"
-   id="path5100" />
-<path
-   fill="#231F20"
-   d="M-241,52c0.5,0,1-0.4,1-1v-4c0,0,0.1-0.8,0.8-0.8c0.6,0,0.6,0.8,1.8,0.8c0.6,0,1.5-0.2,1.5-2  c0-1.8-0.9-2-1.5-2c-1.1,0-1.1,0.8-1.8,0.8c-0.6,0-0.8-0.8-0.8-0.8v-2c0-0.6-0.4-1-1-1h-3c0,0-0.8-0.1-0.8-0.8  c0-0.6,0.8-0.6,0.8-1.8c0-0.6-0.2-1.5-2-1.5c-1.8,0-2,0.9-2,1.5c0,1.1,0.8,1.1,0.8,1.8c0,0.6-0.8,0.8-0.8,0.8h-3c-0.5,0-1,0.4-1,1  l0,2.5c0,0-0.1,1.5,1.1,1.5c0.8,0,0.9-1,1.9-1c0.5,0,1,0.5,1,1.6c0,1-0.5,1.6-1,1.6c-1,0-1.1-1-1.9-1c-1.2,0-1.1,1.5-1.1,1.5l0,3.5  c0,0.6,0.4,1,1,1h3.8c0,0,1.5,0.1,1.5-1.1c0-0.8-1-0.9-1-1.9c0-0.5,0.7-1.2,1.8-1.2c1,0,1.8,0.7,1.8,1.2c0,1-1,1.1-1,1.9  c0,1.2,1.5,1.1,1.5,1.1H-241z"
-   id="path5102" />
-<g
-   id="g5104">
-	<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   d="M-200.4,41.9h-0.3v0h-14.4v0h-0.3c-0.2,0-0.4,0.2-0.4,0.4c0,0,0.3,2.2,0.5,4.4   c0.2,2.5,0.2,4.2,0.2,4.2c0,0.2,0.2,0.4,0.4,0.4h13.7c0.2,0,0.4-0.2,0.4-0.4c0,0,0.1-2.1,0.2-4.2c0.1-2.2,0.5-4.4,0.5-4.4   C-200.1,42.1-200.2,41.9-200.4,41.9z"
-   id="path5106" />
-	<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   d="M-200.8,41.3v-2c0-0.3-0.2-0.5-0.5-0.5l-6.7,0l-0.8-1.1c0,0-0.6-0.9-1.2-0.9h-4.2   c-0.6,0-1,0.5-1,1v1l0,2.5H-200.8z"
-   id="path5108" />
-</g>
-<g
-   id="g5110">
-	<g
-   id="g5112">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M-169,37h-7.5c-0.8,0-1.5,0.7-1.5,1.5v11c0,0.8,0.7,1.5,1.5,1.5    h9c0.8,0,1.5-0.7,1.5-1.5V40L-169,37z M-170,41v-3.3l3.3,3.3H-170z"
-   id="path5114" />
-	</g>
-</g>
-<g
-   id="g5116">
-	<g
-   id="g5118">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   d="M-132.5,38c-0.4,0.2-0.9,0.6-1.3,1.2c-0.3,0.4-0.5,0.9-0.8,1.3    c0.7,0.3,1.3,0.8,1.7,1.4c0.4,0.7,0.7,1.5,0.6,2.3c-0.1,1.3-1,2.4-2.1,3c-0.5-0.5-1.4-2.1-1.4-2.1c0,0,0,1.8-0.6,3    c-0.4,0.8-0.9,1.5-1.6,2.1c1,0.4,2,0.6,3,0.6l0-0.1c0,0,0.1,0.1,0.1,0.1c2.1,0,4.1-0.3,4.1-0.3s-0.9-0.6-1.3-0.9    c1.3-0.7,2.2-2,2.5-3.3c0.2-0.5,0.3-1.1,0.4-1.7C-128.7,41.9-130.2,39.3-132.5,38z M-139.8,44.2c0-1.4,0.8-2.8,2.2-3.5    c0.5,0.5,1.6,2,1.6,2s0-3.6,1.2-5.6c-4.3-0.5-6.8,0.3-6.8,0.3s1.2,0.4,1.6,0.8c-0.1,0.1-0.2,0.1-0.3,0.2c-1,0.7-1.7,1.6-2.1,2.7    c-0.3,0.6-0.5,1.3-0.5,2c-0.3,2.8,1.1,5.4,3.4,6.7c0.4-0.3,0.8-0.6,1.2-1.1c0.4-0.4,0.7-0.9,1-1.4    C-138.7,46.9-139.7,45.7-139.8,44.2z"
-   id="path5120" />
-	</g>
-</g>
-<g
-   id="g5122">
-	<g
-   id="g5124">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M-96.6,41.5c-3.3-4-9.6-4.5-9.6-4.5c-0.4,0-0.8,0.3-0.8,0.7v1.4    c0,0.4,0.3,0.7,0.8,0.7c0,0,4.5,0.1,7.1,3.2c3.5,3.6,3.2,7.2,3.2,7.2c0,0.4,0.3,0.8,0.8,0.8h1.5c0.4,0,0.7-0.3,0.7-0.8    C-93,50.2-93.3,44.5-96.6,41.5z M-106.2,42c-0.4,0-0.8,0.3-0.8,0.7V44c0,0.4,0.3,0.7,0.8,0.7c0,0,2.4,0.1,3.8,1.4    c1.9,1.7,1.8,4.2,1.8,4.2c0,0.4,0.2,0.8,0.6,0.8h1.5c0.4,0,0.5-0.3,0.5-0.8c0,0-0.4-3.9-2.5-5.9C-102.5,42.4-106.2,42-106.2,42z     M-105,47c-1.1,0-2,0.9-2,2c0,1.1,0.9,2,2,2c1.1,0,2-0.9,2-2C-103,47.9-103.9,47-105,47z"
-   id="path5126" />
-	</g>
-</g>
-<path
-   fill="none"
-   d="M-102.6,34.4c0.5,0,1-0.4,1-1v-4c0,0,0.1-0.8,0.8-0.8c0.6,0,0.6,0.8,1.8,0.8c0.6,0,1.5-0.2,1.5-2  c0-1.8-0.9-2-1.5-2c-1.1,0-1.1,0.8-1.8,0.8c-0.6,0-0.8-0.8-0.8-0.8v-2c0-0.6-0.4-1-1-1h-3c0,0-0.8-0.1-0.8-0.8  c0-0.6,0.8-0.6,0.8-1.8c0-0.6-0.2-1.5-2-1.5c-1.8,0-2,0.9-2,1.5c0,1.1,0.8,1.1,0.8,1.8c0,0.6-0.8,0.8-0.8,0.8h-3c-0.5,0-1,0.4-1,1  l0,2.5c0,0-0.1,1.5,1.1,1.5c0.8,0,0.9-1,1.9-1c0.5,0,1,0.5,1,1.6c0,1-0.5,1.6-1,1.6c-1,0-1.1-1-1.9-1c-1.2,0-1.1,1.5-1.1,1.5l0,3.5  c0,0.6,0.4,1,1,1h3.8c0,0,1.5,0.1,1.5-1.1c0-0.8-1-0.9-1-1.9c0-0.5,0.7-1.2,1.8-1.2c1,0,1.8,0.7,1.8,1.2c0,1-1,1.1-1,1.9  c0,1.2,1.5,1.1,1.5,1.1H-102.6z"
-   id="path5128" />
-<g
-   id="g5130">
-	<g
-   id="g5132">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M-63,46.7l-0.3-0.1L-63,52l2.6-3.8L-63,46.7z M-63.3,46l0.3,0    l6,2.9V36l-14,11l4.6-0.6L-63,52l-1.9-5.7l-0.3-0.1l0.3,0L-65,46l7-8L-63.3,46L-63.3,46z"
-   id="path5134" />
-	</g>
-</g>
-<g
-   id="g5136">
-	<g
-   id="g5138">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M-23,37h-10c-1.1,0-2,0.9-2,2v10c0,1.1,0.9,2,2,2h10    c1.1,0,2-0.9,2-2V39C-21,37.9-21.9,37-23,37z M-23,46c0,1.7-1.3,2-3,2h-4c-1.7,0-3-1.3-3-3v-4c0-1.7,1.3-3,3-3h4c1.7,0,3,1.3,3,3    V46z"
-   id="path5140" />
-	</g>
-</g>
-<path
-   fill="#231F20"
-   d="M-23.7,42.6c0-0.8-0.2-1.5-0.6-2c-0.4-0.5-1-0.7-1.7-0.7c-0.4,0-0.8,0.1-1.1,0.3s-0.6,0.4-0.8,0.8  c-0.2-0.4-0.4-0.6-0.7-0.8c-0.3-0.2-0.7-0.2-1.2-0.2c-0.4,0-0.7,0-1.1,0.1s-0.7,0.2-1,0.4l0.3,0.7c0.6-0.3,1.2-0.5,1.7-0.5  c0.4,0,0.8,0.1,1,0.3c0.2,0.2,0.3,0.6,0.3,1.1v0.4l-1,0c-0.9,0-1.6,0.2-2.1,0.5c-0.5,0.3-0.7,0.8-0.7,1.4c0,0.6,0.2,1,0.5,1.3  c0.3,0.3,0.8,0.5,1.4,0.5c0.5,0,0.9-0.1,1.3-0.3c0.4-0.2,0.7-0.5,1-1c0.5,0.9,1.2,1.3,2.3,1.3c0.4,0,0.7,0,1-0.1  c0.3-0.1,0.6-0.2,0.9-0.3v-0.8c-0.3,0.1-0.6,0.3-0.9,0.3c-0.3,0.1-0.6,0.1-0.9,0.1c-1.2,0-1.8-0.7-1.8-2.2h3.9V42.6z M-28.5,43.6  c0,0.6-0.2,1-0.5,1.3c-0.3,0.3-0.7,0.5-1.3,0.5c-0.3,0-0.6-0.1-0.8-0.2c-0.2-0.2-0.3-0.4-0.3-0.8c0-0.4,0.2-0.7,0.5-0.9  c0.3-0.2,0.8-0.3,1.5-0.3l0.9,0V43.6z M-27.5,42.4c0-0.6,0.2-1,0.4-1.3c0.3-0.3,0.6-0.5,1.1-0.5c0.4,0,0.8,0.2,1,0.5  c0.2,0.3,0.4,0.8,0.4,1.3H-27.5z"
-   id="path5142" />
-<g
-   id="g5144">
-	<g
-   id="g5146">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M14.5,37h-13C0.7,37,0,37.7,0,38.5v11C0,50.3,0.7,51,1.5,51h13    c0.8,0,1.5-0.7,1.5-1.5v-11C16,37.7,15.3,37,14.5,37z M6.5,38C6.8,38,7,38.2,7,38.5C7,38.8,6.8,39,6.5,39C6.2,39,6,38.8,6,38.5    C6,38.2,6.2,38,6.5,38z M4.4,38c0.3,0,0.5,0.2,0.5,0.5c0,0.3-0.2,0.5-0.5,0.5c-0.3,0-0.5-0.2-0.5-0.5C3.9,38.2,4.2,38,4.4,38z     M2.5,38C2.8,38,3,38.2,3,38.5C3,38.8,2.8,39,2.5,39C2.2,39,2,38.8,2,38.5C2,38.2,2.2,38,2.5,38z M14,48c0,0.6-0.4,1-1,1H3    c-0.6,0-1-0.4-1-1v-6c0-0.6,0.4-1,1-1h10c0.6,0,1,0.4,1,1V48z"
-   id="path5148" />
-	</g>
-</g>
-<path
-   fill="#231F20"
-   d="M51.2,45.9L51.2,45.9c-0.4-0.1-0.7-0.3-1-0.6c-0.1-0.1-0.1-0.1-0.2-0.2c-0.1-0.1-0.1-0.1-0.2-0.2  c0-0.1-0.1-0.1-0.1-0.2c0-0.1-0.1-0.1-0.1-0.2c-0.3-0.6-0.4-1.5-0.5-2.4c-0.3-2.2-0.1-3.8-3-3.8h-4.4c-2.9,0-2.6,1.6-2.9,3.8  c-0.1,0.9-0.3,1.8-0.6,2.4c0,0,0,0,0,0c-0.1,0.1-0.1,0.2-0.2,0.3c0,0,0,0-0.1,0.1c-0.1,0.2-0.2,0.3-0.4,0.4  c-0.3,0.2-0.5,0.4-0.9,0.5l0,0C36.4,46,36,46.3,36,46.8v1.9c0,0.5,0.4,0.9,0.9,0.9h14.1c0.5,0,0.9-0.4,0.9-0.9v-1.9  C52,46.3,51.6,46,51.2,45.9z M46.4,43.8c0,0.1-0.1,0.2-0.2,0.2h-1.6v1.6c0,0.1-0.1,0.2-0.2,0.2h-0.5c-0.1,0-0.2-0.1-0.2-0.2V44h-1.6  c-0.1,0-0.2-0.1-0.2-0.2v-0.5c0-0.1,0.1-0.2,0.2-0.2h1.6v-1.6c0-0.1,0.1-0.2,0.2-0.2h0.5c0.1,0,0.2,0.1,0.2,0.2v1.6h1.6  c0.1,0,0.2,0.1,0.2,0.2V43.8z"
-   id="path5150" />
-<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M87.7,42c-0.1,1.1,0.2,2.5-1.3,4.4c-1.6,2.1-3.1,2.1-3.4,2.1  c-1.8-0.1-2-1.5-3-1.5c-0.9,0-1.6,1.4-3,1.5c-0.3,0-1.9,0-3.4-2c-1.5-1.9-1.2-3.3-1.3-4.4S72,39.7,72,39.7s0.7,0.7,1.6,0.8  c0.9,0.1,1.1-0.3,3-0.9c2.1-0.6,3.4,1.9,3.4,1.9s1.4-2.4,3.4-1.9c1.9,0.6,2,0.9,2.9,0.9c0.9-0.1,1.7-0.8,1.7-0.8S87.8,40.9,87.7,42z   M76.9,42.5c-1.1-0.3-1.6,0.2-2.1,0.4C74.4,43,74,43.1,74,43.1s0.1,0.7,1.2,1.2c1.1,0.6,3.5,0.3,3.5,0.3S78.9,42.9,76.9,42.5z   M85.2,42.9c-0.5-0.2-1-0.6-2.1-0.4c-2,0.4-1.8,2.1-1.8,2.1s2.4,0.3,3.5-0.3c1.1-0.6,1.2-1.2,1.2-1.2S85.6,43,85.2,42.9z"
-   id="path5152" />
-<g
-   id="g5154">
-	<g
-   id="g5156">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   d="M-237.5,84.9l-3.3-3.3c0.5-0.9,0.9-1.9,0.9-2.9c0-3-2.4-5.5-5.5-5.5    c-3,0-5.5,2.4-5.5,5.5c0,3,2.4,5.5,5.5,5.5c1.1,0,2.1-0.3,3-0.9l3.3,3.3c0.4,0.4,1,0.4,1.4,0l0.2-0.2    C-237.1,85.9-237.1,85.3-237.5,84.9z M-245.4,82c-1.8,0-3.3-1.5-3.3-3.4c0-1.9,1.5-3.4,3.3-3.4c1.8,0,3.3,1.5,3.3,3.4    C-242,80.5-243.5,82-245.4,82z"
-   id="path5158" />
-	</g>
-</g>
-<g
-   id="g5160">
-	<g
-   id="g5162">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   d="M-214.5,86.3l0.2,0.2c0.4,0.4,1,0.4,1.4,0l3.3-3.3c0.9,0.6,1.9,0.9,3,0.9    c3,0,5.5-2.4,5.5-5.5c0-3-2.4-5.5-5.5-5.5c-3,0-5.5,2.4-5.5,5.5c0,1.1,0.3,2.1,0.9,2.9l-3.3,3.3    C-214.9,85.3-214.9,85.9-214.5,86.3z M-210,78.6c0-1.9,1.5-3.4,3.3-3.4c1.8,0,3.3,1.5,3.3,3.4c0,1.9-1.5,3.4-3.3,3.4    C-208.5,82-210,80.5-210,78.6z"
-   id="path5164" />
-	</g>
-</g>
-<g
-   id="g5166">
-	<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M-165,77.5h-1v-2c0-0.6-0.4-1-1-1v-1c0-0.6-0.4-1-1-1h-8   c-0.6,0-1,0.4-1,1v1c-0.6,0-1,0.4-1,1v2h-1c-0.6,0-1,0.4-1,1v5c0,0.6,0.4,1,1,1h2v-1h0.5l-1.5,3h12l-1.5-3h0.5v1h2c0.6,0,1-0.4,1-1   v-5C-164,77.9-164.4,77.5-165,77.5z M-176.5,80.5h-1c-0.3,0-0.5-0.2-0.5-0.5c0-0.3,0.2-0.5,0.5-0.5h1c0.3,0,0.5,0.2,0.5,0.5   C-176,80.2-176.2,80.5-176.5,80.5z M-176,85.5l0.9-2h6.2l0.9,2H-176z M-168,77.5c0,0.6-0.4,1-1,1h-6c-0.6,0-1-0.4-1-1v-3   c0-0.6,0.4-1,1-1h6c0.6,0,1,0.4,1,1V77.5z"
-   id="path5168" />
-</g>
-<g
-   id="g5170">
-	<path
-   fill="#231F20"
-   d="M-135,73l1.9,1.9l-2.6,2.6c-0.5,0.5-0.5,1.4,0.1,2c0.6,0.6,1.5,0.6,2,0.1l2.6-2.6l1.9,1.9v-6H-135z    M-138.5,80.4l-2.6,2.6L-143,81v6h6l-1.9-1.9l2.6-2.6c0.5-0.5,0.5-1.4-0.1-2C-137.1,79.9-138,79.9-138.5,80.4z"
-   id="path5172" />
-</g>
-<g
-   id="g5174">
-	<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M-93.5,73.5c-0.6-0.6-1.5-0.6-2-0.1l-2.6,2.6L-100,74v6h6   l-1.9-1.9l2.6-2.6C-92.9,75-92.9,74.1-93.5,73.5z M-104.1,81.9l-2.6,2.6c-0.5,0.5-0.5,1.4,0.1,2c0.6,0.6,1.5,0.6,2,0.1l2.6-2.6   l1.9,1.9v-6h-6L-104.1,81.9z"
-   id="path5176" />
-</g>
-<g
-   id="g5178">
-	<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M14.6,75.1l-2.3,2.3c-0.5,0.5-1.3,0.5-1.7,0   c-0.5-0.5-0.5-1.2,0-1.7l2.4-2.3c-0.6-0.3-1.2-0.5-1.9-0.5C8.8,72.9,7,74.7,7,77c0,0.5,0.1,1.1,0.3,1.5l-5.9,5.8   c-0.6,0.6-0.6,1.7,0,2.3c0.6,0.6,1.7,0.6,2.3,0l6-5.9c0.4,0.2,0.9,0.3,1.4,0.3c2.2,0,4.1-1.8,4.1-4.1   C15.1,76.3,14.9,75.7,14.6,75.1z M2.5,86.4c-0.5,0-0.9-0.4-0.9-0.9c0-0.5,0.4-0.9,0.9-0.9c0.5,0,0.9,0.4,0.9,0.9   C3.4,86,3,86.4,2.5,86.4z"
-   id="path5180" />
-</g>
-<path
-   fill="#231F20"
-   d="M-22.7,83.9l-1.1-1.1c0.2-0.3,0.3-0.6,0.5-0.9c0.1-0.3,0.2-0.6,0.3-0.9l1.6,0c0.3,0,0.5-0.2,0.5-0.5l0-1  c0-0.3-0.2-0.5-0.5-0.5l-1.6,0c-0.1-0.6-0.4-1.2-0.7-1.8l1.1-1.1c0.2-0.2,0.2-0.5,0-0.7l-0.7-0.7c-0.2-0.2-0.5-0.2-0.7,0l-1.1,1.1  c-0.3-0.2-0.6-0.3-0.9-0.5c-0.3-0.1-0.6-0.2-0.9-0.3l0-1.6c0-0.3-0.2-0.5-0.5-0.5l-1,0c-0.3,0-0.5,0.2-0.5,0.5l0,1.6  c-0.6,0.1-1.2,0.4-1.8,0.7l-1.1-1.1c-0.2-0.2-0.5-0.2-0.7,0l-0.7,0.7c-0.2,0.2-0.2,0.5,0,0.7l1.1,1.1c-0.2,0.3-0.3,0.6-0.5,0.9  c-0.1,0.3-0.2,0.6-0.3,0.9l-1.6,0c-0.3,0-0.5,0.2-0.5,0.5l0,1c0,0.3,0.2,0.5,0.5,0.5l1.6,0c0.1,0.6,0.4,1.2,0.7,1.8l-1.1,1.1  c-0.2,0.2-0.2,0.5,0,0.7l0.7,0.7c0.2,0.2,0.5,0.2,0.7,0l1.1-1.1c0.3,0.2,0.6,0.3,0.9,0.5c0.3,0.1,0.6,0.2,0.9,0.3l0,1.6  c0,0.3,0.2,0.5,0.5,0.5l1,0c0.3,0,0.5-0.2,0.5-0.5l0-1.6c0.6-0.1,1.2-0.4,1.8-0.7l1.1,1.1c0.2,0.2,0.5,0.2,0.7,0l0.7-0.7  C-22.5,84.4-22.5,84.1-22.7,83.9z M-28.8,82.1c-1.2-0.5-1.7-1.8-1.3-3c0.5-1.2,1.8-1.7,3-1.3c1.2,0.5,1.7,1.8,1.3,3  C-26.4,82-27.7,82.6-28.8,82.1z"
-   id="path5182" />
-<g
-   id="g5184">
-	<g
-   id="g5186">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M-62,77h-4c-0.6,0-1,0.4-1,1v4c0,0.6,0.4,1,1,1h4    c0.6,0,1-0.4,1-1v-4C-61,77.4-61.4,77-62,77z M-62,81c0,0.6-0.4,1-1,1h-2c-0.6,0-1-0.4-1-1v-1c0-0.6,0.4-1,1-1h2c0.6,0,1,0.4,1,1    V81z M-64,87l3-3h-6L-64,87z M-67,76h6l-3-3L-67,76z M-60,76.9v6l3-3L-60,76.9z M-68,82.9v-6l-3,3L-68,82.9z"
-   id="path5188" />
-	</g>
-</g>
-<g
-   id="g5190">
-	<g
-   id="g5192">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   d="M37.5,76.5h13c0.8,0,1.5-0.7,1.5-1.5c0-0.8-0.7-1.5-1.5-1.5h-13    c-0.8,0-1.5,0.7-1.5,1.5C36,75.8,36.7,76.5,37.5,76.5z M50.5,78.5h-13c-0.8,0-1.5,0.7-1.5,1.5c0,0.8,0.7,1.5,1.5,1.5h13    c0.8,0,1.5-0.7,1.5-1.5C52,79.2,51.3,78.5,50.5,78.5z M50.5,83.5h-13c-0.8,0-1.5,0.7-1.5,1.5c0,0.8,0.7,1.5,1.5,1.5h13    c0.8,0,1.5-0.7,1.5-1.5C52,84.2,51.3,83.5,50.5,83.5z"
-   id="path5194" />
-	</g>
-</g>
-<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M85.6,87c-0.8,0-1.5-0.2-2.3-1.3c-0.8-1.1-1.7-2.5-1.7-2.5  s-0.7-0.9-1.1-1.6c-0.4-0.7-1.1-0.5-1.1-0.5s-2.8-4.6-3.3-5.4c-0.7-1,0.6-2.7,0.6-2.7l4.4,7c0,0,1.3,1.9,1.9,2.3  c0.5,0.4,1.4-0.4,2.8,0.9C87.7,85,87.1,87,85.6,87z M85.4,84.1c-0.9-1-1.7-0.9-1.9-0.6c-0.2,0.3,0,1.2,0.4,1.7  c0.4,0.5,0.8,0.7,1.4,0.7C85.9,86,86.4,85.2,85.4,84.1z M81.6,79.4l-1.2-1.8l2.9-4.6c0,0,1.2,1.7,0.6,2.7  C83.6,76.1,82.5,78,81.6,79.4z M77,82.3c0.3-0.3,1-1.1,1.4-1.7l0.8,1.2c-0.4,0.6-0.9,1.4-0.9,1.4s-0.9,1.4-1.7,2.5  c-0.8,1.1-1.5,1.3-2.3,1.3c-1.4,0-2.1-2-0.1-3.8C75.6,82,76.5,82.7,77,82.3z M74.6,84.1c-0.9,1-0.4,1.8,0.2,1.8c0.6,0,1-0.2,1.4-0.7  c0.4-0.5,0.6-1.5,0.4-1.7C76.3,83.2,75.5,83.1,74.6,84.1z"
-   id="path5196" />
-<g
-   id="g5198">
-	<g
-   id="g5200">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M-243,111c0-0.1-2-2-2-2c-1.7,0-5,0-5,0c-0.6,0-1,0.4-1,1v8    c0,0.6,0.4,1,1,1h4v-6.1c0-0.3,0.2-0.5,0.5-0.5h2.5V111z M-246,112v-2l2,2H-246z M-239,113c-1.7,0-5,0-5,0c-0.6,0-1,0.4-1,1v8    c0,0.6,0.4,1,1,1h6c0.6,0,1-0.4,1-1c0,0,0-4.8,0-7C-237,115-239,113-239,113z M-240,116v-2l2,2H-240z"
-   id="path5202" />
-	</g>
-</g>
-<g
-   id="g5204">
-	<g
-   id="g5206">
-		<path
-   fill="#231F20"
-   d="M-204.5,111h-1.3l0,0c0,0-0.2-2-2.2-2c-2,0-2.2,2-2.2,2l0,0h-1.3c-0.8,0-1.5,0.7-1.5,1.5v9    c0,0.8,0.7,1.5,1.5,1.5h7c0.8,0,1.5-0.7,1.5-1.5v-9C-203,111.7-203.7,111-204.5,111z M-210.7,112.1l0.8-0.4l0.4-0.2l0-0.4    c0-0.2,0.2-1.3,1.5-1.3c1.2,0,1.4,1.1,1.5,1.3l0,0.4l0.4,0.2l0.8,0.4l0.3,0.7h-6.1L-210.7,112.1z M-210.1,120.4l-2.8-4.9l3.3-1.9    h4.3l1.8,3.1L-210.1,120.4z"
-   id="path5208" />
-	</g>
-</g>
-<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M-177,115h10v2h-10V115z"
-   id="path5210" />
-<g
-   id="g5212">
-	<g
-   id="g5214">
-		<polygon
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   points="-131,115 -135,115 -135,111 -137,111 -137,115 -141,115     -141,117 -137,117 -137,121 -135,121 -135,117 -131,117   "
-   id="polygon5216" />
-	</g>
-</g>
-<g
-   id="g5218">
-	<path
-   fill="#231F20"
-   d="M-94,111.7l-3,2.7v-2c0-0.8-0.6-1.4-1.3-1.4h-7.4c-0.7,0-1.3,0.6-1.3,1.4v7.2c0,0.8,0.6,1.4,1.3,1.4h7.4   c0.7,0,1.3-0.6,1.3-1.4v-2.1l3,2.7c0.3,0.3,0.6,0.4,1,0.3v-9.1C-93.3,111.4-93.7,111.5-94,111.7z"
-   id="path5220" />
-</g>
-<g
-   id="g5222">
-	<g
-   id="g5224">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M-61.9,112h-3l3.8,4l-3.8,4h3.1l3.8-4L-61.9,112z M-66.9,112h-3    l3.8,4l-3.8,4h3.1l3.8-4L-66.9,112z"
-   id="path5226" />
-	</g>
-</g>
-<g
-   id="g5228">
-	<g
-   id="g5230">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M-23,111.5h-2l-3-3l-3,3h-2c-1.1,0-2,0.9-2,2v8c0,1.1,0.9,2,2,2    h10c1.1,0,2-0.9,2-2v-8C-21,112.4-21.9,111.5-23,111.5z M-32,121.5c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1S-31.4,121.5-32,121.5z     M-32,118.5c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1S-31.4,118.5-32,118.5z M-32,115.5c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1    S-31.4,115.5-32,115.5z M-23,121.5h-7v-2h7V121.5z M-23,118.5h-7v-2h7V118.5z M-23,115.5h-7v-2h7V115.5z"
-   id="path5232" />
-	</g>
-</g>
-<g
-   id="g5234">
-	<g
-   id="g5236">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M2,115h7c0.6,0,1-0.4,1-1v-4c0-0.6-0.4-1-1-1H2c-0.6,0-1,0.4-1,1    v4C1,114.6,1.4,115,2,115z M14,109h-2c-0.6,0-1,0.4-1,1v4c0,0.6,0.4,1,1,1h2c0.6,0,1-0.4,1-1v-4C15,109.4,14.6,109,14,109z     M14,116H8c-0.6,0-1,0.4-1,1v5c0,0.6,0.4,1,1,1h6c0.6,0,1-0.4,1-1v-5C15,116.4,14.6,116,14,116z M5,116H2c-0.6,0-1,0.4-1,1v5    c0,0.6,0.4,1,1,1h3c0.6,0,1-0.4,1-1v-5C6,116.4,5.6,116,5,116z"
-   id="path5238" />
-	</g>
-</g>
-<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M45.8,116c0,0-0.6,0.8-1.8,0.8c-1.2,0-1.8-0.8-1.8-0.8l-6-5.1  c0.3-0.5,0.9-0.9,1.6-0.9h12.4c0.7,0,1.3,0.4,1.6,0.9L45.8,116z M42.2,117.7c0,0,0.6,0.8,1.8,0.8c1.2,0,1.8-0.8,1.8-0.8l6.2-5.4v8  c0,0.9-0.8,1.7-1.8,1.7H37.8c-1,0-1.8-0.8-1.8-1.7v-8L42.2,117.7z"
-   id="path5240" />
-<g
-   id="g5242">
-	<g
-   id="g5244">
-		<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M-237.5,145h-13c-0.8,0-1.5,0.7-1.5,1.5v11    c0,0.8,0.7,1.5,1.5,1.5h13c0.8,0,1.5-0.7,1.5-1.5v-11C-236,145.7-236.7,145-237.5,145z M-245.5,146c0.3,0,0.5,0.2,0.5,0.5    c0,0.3-0.2,0.5-0.5,0.5c-0.3,0-0.5-0.2-0.5-0.5C-246,146.2-245.8,146-245.5,146z M-247.6,146c0.3,0,0.5,0.2,0.5,0.5    c0,0.3-0.2,0.5-0.5,0.5s-0.5-0.2-0.5-0.5C-248.1,146.2-247.8,146-247.6,146z M-249.5,146c0.3,0,0.5,0.2,0.5,0.5    c0,0.3-0.2,0.5-0.5,0.5s-0.5-0.2-0.5-0.5C-250,146.2-249.8,146-249.5,146z M-250,156v-6c0-0.6,0.4-1,1-1h7v8h-7    C-249.6,157-250,156.6-250,156z M-238,156c0,0.6-0.4,1-1,1h-1v-8h1c0.6,0,1,0.4,1,1V156z"
-   id="path5246" />
-	</g>
-</g>
-<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="#231F20"
-   d="M-213.2,156c-1.3-1.2-2.2-2.8-2.2-4.6c0-3.6,3.3-6.5,7.4-6.5  c4.1,0,7.4,2.9,7.4,6.5c0,3.6-3.3,6.5-7.4,6.5c-0.8,0-1.6-0.1-2.4-0.3c-1.8,0.7-4.3,1.7-4.5,1.4C-213.9,157.9-213.5,156.8-213.2,156  z"
-   id="path5248" />
-<rect
-   id="_x3C_Slice_x3E_"
-   fill="none"
-   width="16"
-   height="16" />
-</svg>
\ 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="100%" height="100%">
+  <path fill-rule="evenodd" fill="#231f20" d="M-238.2,6h-6.1l2.7-2.7c0.4-0.4,0.5-1.1,0.2-1.4l-1.2-1.2   c-0.3-0.3-1-0.3-1.4,0.2l-6.4,6.4c-0.1,0.1-0.1,0.2-0.2,0.2l0,0c0,0,0,0,0,0c0,0.1-0.1,0.1-0.1,0.1c0,0.1-0.1,0.2-0.1,0.3   c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0.1,0,0.2,0.1,0.3c0,0.1,0.1,0.1,0.1,0.1c0,0,0,0,0,0l0,0c0.1,0.1,0.1,0.2,0.2,0.2l6.4,6.4   c0.4,0.4,1.1,0.5,1.4,0.2l1.2-1.2c0.3-0.3,0.3-1-0.2-1.4l-2.8-2.8h6.2c0.6,0,1-0.4,1-1V7C-237.2,6.4-237.6,6-238.2,6z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M-212.7,6.3l-1,1c-0.2,0.2-0.2,0.4-0.2,0.7c0,0.3,0,0.5,0.2,0.7   l0.8,0.9l4.5,4.5c0.5,0.5,1.2,0.6,1.6,0.2l0.8-0.9c0.4-0.4,0.3-1.1-0.2-1.6l-1.8-1.8h4.7c0.6,0,1-0.5,1-1V7c0-0.6-0.5-1-1-1h-4.8   l1.9-1.9c0.5-0.5,0.6-1.3,0.2-1.6l-0.8-0.9c-0.4-0.4-1.1-0.3-1.6,0.2L-212.7,6.3z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M-167.3,9.7l1-1c0.2-0.2,0.2-0.4,0.2-0.7c0-0.3,0-0.5-0.2-0.7   l-0.8-0.9l-4.5-4.5c-0.5-0.5-1.2-0.6-1.6-0.2l-0.8,0.9c-0.4,0.4-0.3,1.1,0.2,1.6l1.8,1.8h-4.7c-0.6,0-1,0.5-1,1v2c0,0.6,0.5,1,1,1   h4.8l-1.9,1.9c-0.5,0.5-0.6,1.3-0.2,1.6l0.8,0.9c0.4,0.4,1.1,0.3,1.6-0.2L-167.3,9.7z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M-129.5,8h-7l2.8-2.8c-0.7-0.5-1.4-0.7-2.3-0.7c-2.2,0-4,1.8-4,4  c0,2.2,1.8,4,4,4c1.4,0,2.7-0.7,3.4-1.9l2.3,1c-1.1,2-3.2,3.4-5.7,3.4c-3.6,0-6.5-2.9-6.5-6.5c0-3.6,2.9-6.5,6.5-6.5  c1.5,0,2.9,0.5,4.1,1.4l2.4-2.4V8z"/>
+  <polygon fill="#231f20" points="-93.6,3.8 -95.8,1.7 -100,5.9 -104.3,1.6 -106.4,3.8     -102.1,8 -106.3,12.2 -104.1,14.3 -99.9,10.2 -95.7,14.4 -93.6,12.2 -97.8,8.1   "/>
+  <path fill-rule="evenodd" fill="#231f20" d="M-64,1l-8,7h2l6-5l6,5h2L-64,1z M-69,8v7h4v-5h2v5h4V8l-5-4L-69,8   z"/>
+  <path fill="#231f20" d="M-28,3.6l1,2l0.5,0.9l1,0.2l2.3,0.4l-1.7,1.8l-0.7,0.7l0.1,1l0.4,2.4l-2-1l-0.9-0.5l-0.9,0.5l-2,1l0.4-2.4  l0.1-1l-0.7-0.7l-1.7-1.8l2.4-0.4l1-0.2l0.5-0.9L-28,3.6 M-28,0c-0.3,0-0.6,0.2-0.8,0.7l-2,4.1l-4.3,0.7c-1,0.2-1.2,0.9-0.5,1.6  l3.1,3.3l-0.7,4.6c-0.1,0.7,0.2,1.1,0.7,1.1c0.2,0,0.4-0.1,0.6-0.2l3.9-2.1l3.9,2.1c0.2,0.1,0.5,0.2,0.6,0.2c0.5,0,0.8-0.4,0.7-1.1  l-0.7-4.6l3.1-3.3c0.7-0.7,0.4-1.4-0.5-1.6l-4.3-0.7l-2-4.1C-27.4,0.2-27.7,0-28,0L-28,0z"/>
+  <path fill="#231f20" style="fill:#c0c0c0;fill-opacity:1" d="M8,0C7.7,0,7.4,0.2,7.2,0.7l-2,4.1L0.9,5.5c-1,0.2-1.2,0.9-0.5,1.6l3.1,3.3l-0.7,4.6C2.7,15.6,3,16,3.4,16  c0.2,0,0.4-0.1,0.6-0.2L8,13.7l3.9,2.1c0.2,0.1,0.5,0.2,0.6,0.2c0.5,0,0.8-0.4,0.7-1.1l-0.7-4.6l3.1-3.3c0.7-0.7,0.4-1.4-0.5-1.6  l-4.3-0.7l-2-4.1C8.6,0.2,8.3,0,8,0L8,0z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M44,15.2c-4,0-7.2-3.2-7.2-7.2c0-4,3.2-7.2,7.2-7.2  c4,0,7.2,3.2,7.2,7.2C51.2,12,48,15.2,44,15.2z M44,3c-2.8,0-5,2.2-5,5c0,2.7,2.2,5,5,5c2.8,0,5-2.2,5-5C49,5.3,46.8,3,44,3z   M43.7,8.9C43.3,8.8,43,8.4,43,8V5c0-0.6,0.4-1,1-1c0.6,0,1,0.4,1,1v2.8c1.1,1.1,2,3.2,2,3.2S44.8,10,43.7,8.9z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M86.7,9.1l-5.6,5.5C80.8,14.9,80.4,15,80,15  c-0.4,0-0.8-0.1-1.1-0.4l-5.6-5.5C72.7,8.5,72.9,8,73.8,8H77l0-6c0-0.6,0.4-1,1-1h4c0.6,0,1,0.4,1,1v6h3.2C87.1,8,87.3,8.5,86.7,9.1  z"/>
+  <path fill="#231f20" d="M-241,52c0.5,0,1-0.4,1-1v-4c0,0,0.1-0.8,0.8-0.8c0.6,0,0.6,0.8,1.8,0.8c0.6,0,1.5-0.2,1.5-2  c0-1.8-0.9-2-1.5-2c-1.1,0-1.1,0.8-1.8,0.8c-0.6,0-0.8-0.8-0.8-0.8v-2c0-0.6-0.4-1-1-1h-3c0,0-0.8-0.1-0.8-0.8  c0-0.6,0.8-0.6,0.8-1.8c0-0.6-0.2-1.5-2-1.5c-1.8,0-2,0.9-2,1.5c0,1.1,0.8,1.1,0.8,1.8c0,0.6-0.8,0.8-0.8,0.8h-3c-0.5,0-1,0.4-1,1  l0,2.5c0,0-0.1,1.5,1.1,1.5c0.8,0,0.9-1,1.9-1c0.5,0,1,0.5,1,1.6c0,1-0.5,1.6-1,1.6c-1,0-1.1-1-1.9-1c-1.2,0-1.1,1.5-1.1,1.5l0,3.5  c0,0.6,0.4,1,1,1h3.8c0,0,1.5,0.1,1.5-1.1c0-0.8-1-0.9-1-1.9c0-0.5,0.7-1.2,1.8-1.2c1,0,1.8,0.7,1.8,1.2c0,1-1,1.1-1,1.9  c0,1.2,1.5,1.1,1.5,1.1H-241z"/>
+  <path fill-rule="evenodd" d="M-200.4,41.9h-0.3v0h-14.4v0h-0.3c-0.2,0-0.4,0.2-0.4,0.4c0,0,0.3,2.2,0.5,4.4   c0.2,2.5,0.2,4.2,0.2,4.2c0,0.2,0.2,0.4,0.4,0.4h13.7c0.2,0,0.4-0.2,0.4-0.4c0,0,0.1-2.1,0.2-4.2c0.1-2.2,0.5-4.4,0.5-4.4   C-200.1,42.1-200.2,41.9-200.4,41.9z"/>
+  <path fill-rule="evenodd" d="M-200.8,41.3v-2c0-0.3-0.2-0.5-0.5-0.5l-6.7,0l-0.8-1.1c0,0-0.6-0.9-1.2-0.9h-4.2   c-0.6,0-1,0.5-1,1v1l0,2.5H-200.8z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M-169,37h-7.5c-0.8,0-1.5,0.7-1.5,1.5v11c0,0.8,0.7,1.5,1.5,1.5    h9c0.8,0,1.5-0.7,1.5-1.5V40L-169,37z M-170,41v-3.3l3.3,3.3H-170z"/>
+  <path fill-rule="evenodd" d="M-132.5,38c-0.4,0.2-0.9,0.6-1.3,1.2c-0.3,0.4-0.5,0.9-0.8,1.3    c0.7,0.3,1.3,0.8,1.7,1.4c0.4,0.7,0.7,1.5,0.6,2.3c-0.1,1.3-1,2.4-2.1,3c-0.5-0.5-1.4-2.1-1.4-2.1c0,0,0,1.8-0.6,3    c-0.4,0.8-0.9,1.5-1.6,2.1c1,0.4,2,0.6,3,0.6l0-0.1c0,0,0.1,0.1,0.1,0.1c2.1,0,4.1-0.3,4.1-0.3s-0.9-0.6-1.3-0.9    c1.3-0.7,2.2-2,2.5-3.3c0.2-0.5,0.3-1.1,0.4-1.7C-128.7,41.9-130.2,39.3-132.5,38z M-139.8,44.2c0-1.4,0.8-2.8,2.2-3.5    c0.5,0.5,1.6,2,1.6,2s0-3.6,1.2-5.6c-4.3-0.5-6.8,0.3-6.8,0.3s1.2,0.4,1.6,0.8c-0.1,0.1-0.2,0.1-0.3,0.2c-1,0.7-1.7,1.6-2.1,2.7    c-0.3,0.6-0.5,1.3-0.5,2c-0.3,2.8,1.1,5.4,3.4,6.7c0.4-0.3,0.8-0.6,1.2-1.1c0.4-0.4,0.7-0.9,1-1.4    C-138.7,46.9-139.7,45.7-139.8,44.2z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M-96.6,41.5c-3.3-4-9.6-4.5-9.6-4.5c-0.4,0-0.8,0.3-0.8,0.7v1.4    c0,0.4,0.3,0.7,0.8,0.7c0,0,4.5,0.1,7.1,3.2c3.5,3.6,3.2,7.2,3.2,7.2c0,0.4,0.3,0.8,0.8,0.8h1.5c0.4,0,0.7-0.3,0.7-0.8    C-93,50.2-93.3,44.5-96.6,41.5z M-106.2,42c-0.4,0-0.8,0.3-0.8,0.7V44c0,0.4,0.3,0.7,0.8,0.7c0,0,2.4,0.1,3.8,1.4    c1.9,1.7,1.8,4.2,1.8,4.2c0,0.4,0.2,0.8,0.6,0.8h1.5c0.4,0,0.5-0.3,0.5-0.8c0,0-0.4-3.9-2.5-5.9C-102.5,42.4-106.2,42-106.2,42z     M-105,47c-1.1,0-2,0.9-2,2c0,1.1,0.9,2,2,2c1.1,0,2-0.9,2-2C-103,47.9-103.9,47-105,47z"/>
+  <path fill="none" d="M-102.6,34.4c0.5,0,1-0.4,1-1v-4c0,0,0.1-0.8,0.8-0.8c0.6,0,0.6,0.8,1.8,0.8c0.6,0,1.5-0.2,1.5-2  c0-1.8-0.9-2-1.5-2c-1.1,0-1.1,0.8-1.8,0.8c-0.6,0-0.8-0.8-0.8-0.8v-2c0-0.6-0.4-1-1-1h-3c0,0-0.8-0.1-0.8-0.8  c0-0.6,0.8-0.6,0.8-1.8c0-0.6-0.2-1.5-2-1.5c-1.8,0-2,0.9-2,1.5c0,1.1,0.8,1.1,0.8,1.8c0,0.6-0.8,0.8-0.8,0.8h-3c-0.5,0-1,0.4-1,1  l0,2.5c0,0-0.1,1.5,1.1,1.5c0.8,0,0.9-1,1.9-1c0.5,0,1,0.5,1,1.6c0,1-0.5,1.6-1,1.6c-1,0-1.1-1-1.9-1c-1.2,0-1.1,1.5-1.1,1.5l0,3.5  c0,0.6,0.4,1,1,1h3.8c0,0,1.5,0.1,1.5-1.1c0-0.8-1-0.9-1-1.9c0-0.5,0.7-1.2,1.8-1.2c1,0,1.8,0.7,1.8,1.2c0,1-1,1.1-1,1.9  c0,1.2,1.5,1.1,1.5,1.1H-102.6z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M-63,46.7l-0.3-0.1L-63,52l2.6-3.8L-63,46.7z M-63.3,46l0.3,0    l6,2.9V36l-14,11l4.6-0.6L-63,52l-1.9-5.7l-0.3-0.1l0.3,0L-65,46l7-8L-63.3,46L-63.3,46z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M-23,37h-10c-1.1,0-2,0.9-2,2v10c0,1.1,0.9,2,2,2h10    c1.1,0,2-0.9,2-2V39C-21,37.9-21.9,37-23,37z M-23,46c0,1.7-1.3,2-3,2h-4c-1.7,0-3-1.3-3-3v-4c0-1.7,1.3-3,3-3h4c1.7,0,3,1.3,3,3    V46z"/>
+  <path fill="#231f20" d="M-23.7,42.6c0-0.8-0.2-1.5-0.6-2c-0.4-0.5-1-0.7-1.7-0.7c-0.4,0-0.8,0.1-1.1,0.3s-0.6,0.4-0.8,0.8  c-0.2-0.4-0.4-0.6-0.7-0.8c-0.3-0.2-0.7-0.2-1.2-0.2c-0.4,0-0.7,0-1.1,0.1s-0.7,0.2-1,0.4l0.3,0.7c0.6-0.3,1.2-0.5,1.7-0.5  c0.4,0,0.8,0.1,1,0.3c0.2,0.2,0.3,0.6,0.3,1.1v0.4l-1,0c-0.9,0-1.6,0.2-2.1,0.5c-0.5,0.3-0.7,0.8-0.7,1.4c0,0.6,0.2,1,0.5,1.3  c0.3,0.3,0.8,0.5,1.4,0.5c0.5,0,0.9-0.1,1.3-0.3c0.4-0.2,0.7-0.5,1-1c0.5,0.9,1.2,1.3,2.3,1.3c0.4,0,0.7,0,1-0.1  c0.3-0.1,0.6-0.2,0.9-0.3v-0.8c-0.3,0.1-0.6,0.3-0.9,0.3c-0.3,0.1-0.6,0.1-0.9,0.1c-1.2,0-1.8-0.7-1.8-2.2h3.9V42.6z M-28.5,43.6  c0,0.6-0.2,1-0.5,1.3c-0.3,0.3-0.7,0.5-1.3,0.5c-0.3,0-0.6-0.1-0.8-0.2c-0.2-0.2-0.3-0.4-0.3-0.8c0-0.4,0.2-0.7,0.5-0.9  c0.3-0.2,0.8-0.3,1.5-0.3l0.9,0V43.6z M-27.5,42.4c0-0.6,0.2-1,0.4-1.3c0.3-0.3,0.6-0.5,1.1-0.5c0.4,0,0.8,0.2,1,0.5  c0.2,0.3,0.4,0.8,0.4,1.3H-27.5z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M14.5,37h-13C0.7,37,0,37.7,0,38.5v11C0,50.3,0.7,51,1.5,51h13    c0.8,0,1.5-0.7,1.5-1.5v-11C16,37.7,15.3,37,14.5,37z M6.5,38C6.8,38,7,38.2,7,38.5C7,38.8,6.8,39,6.5,39C6.2,39,6,38.8,6,38.5    C6,38.2,6.2,38,6.5,38z M4.4,38c0.3,0,0.5,0.2,0.5,0.5c0,0.3-0.2,0.5-0.5,0.5c-0.3,0-0.5-0.2-0.5-0.5C3.9,38.2,4.2,38,4.4,38z     M2.5,38C2.8,38,3,38.2,3,38.5C3,38.8,2.8,39,2.5,39C2.2,39,2,38.8,2,38.5C2,38.2,2.2,38,2.5,38z M14,48c0,0.6-0.4,1-1,1H3    c-0.6,0-1-0.4-1-1v-6c0-0.6,0.4-1,1-1h10c0.6,0,1,0.4,1,1V48z"/>
+  <path fill="#231f20" d="M51.2,45.9L51.2,45.9c-0.4-0.1-0.7-0.3-1-0.6c-0.1-0.1-0.1-0.1-0.2-0.2c-0.1-0.1-0.1-0.1-0.2-0.2  c0-0.1-0.1-0.1-0.1-0.2c0-0.1-0.1-0.1-0.1-0.2c-0.3-0.6-0.4-1.5-0.5-2.4c-0.3-2.2-0.1-3.8-3-3.8h-4.4c-2.9,0-2.6,1.6-2.9,3.8  c-0.1,0.9-0.3,1.8-0.6,2.4c0,0,0,0,0,0c-0.1,0.1-0.1,0.2-0.2,0.3c0,0,0,0-0.1,0.1c-0.1,0.2-0.2,0.3-0.4,0.4  c-0.3,0.2-0.5,0.4-0.9,0.5l0,0C36.4,46,36,46.3,36,46.8v1.9c0,0.5,0.4,0.9,0.9,0.9h14.1c0.5,0,0.9-0.4,0.9-0.9v-1.9  C52,46.3,51.6,46,51.2,45.9z M46.4,43.8c0,0.1-0.1,0.2-0.2,0.2h-1.6v1.6c0,0.1-0.1,0.2-0.2,0.2h-0.5c-0.1,0-0.2-0.1-0.2-0.2V44h-1.6  c-0.1,0-0.2-0.1-0.2-0.2v-0.5c0-0.1,0.1-0.2,0.2-0.2h1.6v-1.6c0-0.1,0.1-0.2,0.2-0.2h0.5c0.1,0,0.2,0.1,0.2,0.2v1.6h1.6  c0.1,0,0.2,0.1,0.2,0.2V43.8z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M87.7,42c-0.1,1.1,0.2,2.5-1.3,4.4c-1.6,2.1-3.1,2.1-3.4,2.1  c-1.8-0.1-2-1.5-3-1.5c-0.9,0-1.6,1.4-3,1.5c-0.3,0-1.9,0-3.4-2c-1.5-1.9-1.2-3.3-1.3-4.4S72,39.7,72,39.7s0.7,0.7,1.6,0.8  c0.9,0.1,1.1-0.3,3-0.9c2.1-0.6,3.4,1.9,3.4,1.9s1.4-2.4,3.4-1.9c1.9,0.6,2,0.9,2.9,0.9c0.9-0.1,1.7-0.8,1.7-0.8S87.8,40.9,87.7,42z   M76.9,42.5c-1.1-0.3-1.6,0.2-2.1,0.4C74.4,43,74,43.1,74,43.1s0.1,0.7,1.2,1.2c1.1,0.6,3.5,0.3,3.5,0.3S78.9,42.9,76.9,42.5z   M85.2,42.9c-0.5-0.2-1-0.6-2.1-0.4c-2,0.4-1.8,2.1-1.8,2.1s2.4,0.3,3.5-0.3c1.1-0.6,1.2-1.2,1.2-1.2S85.6,43,85.2,42.9z"/>
+  <path fill-rule="evenodd" d="M-237.5,84.9l-3.3-3.3c0.5-0.9,0.9-1.9,0.9-2.9c0-3-2.4-5.5-5.5-5.5    c-3,0-5.5,2.4-5.5,5.5c0,3,2.4,5.5,5.5,5.5c1.1,0,2.1-0.3,3-0.9l3.3,3.3c0.4,0.4,1,0.4,1.4,0l0.2-0.2    C-237.1,85.9-237.1,85.3-237.5,84.9z M-245.4,82c-1.8,0-3.3-1.5-3.3-3.4c0-1.9,1.5-3.4,3.3-3.4c1.8,0,3.3,1.5,3.3,3.4    C-242,80.5-243.5,82-245.4,82z"/>
+  <path fill-rule="evenodd" d="M-214.5,86.3l0.2,0.2c0.4,0.4,1,0.4,1.4,0l3.3-3.3c0.9,0.6,1.9,0.9,3,0.9    c3,0,5.5-2.4,5.5-5.5c0-3-2.4-5.5-5.5-5.5c-3,0-5.5,2.4-5.5,5.5c0,1.1,0.3,2.1,0.9,2.9l-3.3,3.3    C-214.9,85.3-214.9,85.9-214.5,86.3z M-210,78.6c0-1.9,1.5-3.4,3.3-3.4c1.8,0,3.3,1.5,3.3,3.4c0,1.9-1.5,3.4-3.3,3.4    C-208.5,82-210,80.5-210,78.6z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M-165,77.5h-1v-2c0-0.6-0.4-1-1-1v-1c0-0.6-0.4-1-1-1h-8   c-0.6,0-1,0.4-1,1v1c-0.6,0-1,0.4-1,1v2h-1c-0.6,0-1,0.4-1,1v5c0,0.6,0.4,1,1,1h2v-1h0.5l-1.5,3h12l-1.5-3h0.5v1h2c0.6,0,1-0.4,1-1   v-5C-164,77.9-164.4,77.5-165,77.5z M-176.5,80.5h-1c-0.3,0-0.5-0.2-0.5-0.5c0-0.3,0.2-0.5,0.5-0.5h1c0.3,0,0.5,0.2,0.5,0.5   C-176,80.2-176.2,80.5-176.5,80.5z M-176,85.5l0.9-2h6.2l0.9,2H-176z M-168,77.5c0,0.6-0.4,1-1,1h-6c-0.6,0-1-0.4-1-1v-3   c0-0.6,0.4-1,1-1h6c0.6,0,1,0.4,1,1V77.5z"/>
+  <path fill="#231f20" d="M-135,73l1.9,1.9l-2.6,2.6c-0.5,0.5-0.5,1.4,0.1,2c0.6,0.6,1.5,0.6,2,0.1l2.6-2.6l1.9,1.9v-6H-135z    M-138.5,80.4l-2.6,2.6L-143,81v6h6l-1.9-1.9l2.6-2.6c0.5-0.5,0.5-1.4-0.1-2C-137.1,79.9-138,79.9-138.5,80.4z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M-93.5,73.5c-0.6-0.6-1.5-0.6-2-0.1l-2.6,2.6L-100,74v6h6   l-1.9-1.9l2.6-2.6C-92.9,75-92.9,74.1-93.5,73.5z M-104.1,81.9l-2.6,2.6c-0.5,0.5-0.5,1.4,0.1,2c0.6,0.6,1.5,0.6,2,0.1l2.6-2.6   l1.9,1.9v-6h-6L-104.1,81.9z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M14.6,75.1l-2.3,2.3c-0.5,0.5-1.3,0.5-1.7,0   c-0.5-0.5-0.5-1.2,0-1.7l2.4-2.3c-0.6-0.3-1.2-0.5-1.9-0.5C8.8,72.9,7,74.7,7,77c0,0.5,0.1,1.1,0.3,1.5l-5.9,5.8   c-0.6,0.6-0.6,1.7,0,2.3c0.6,0.6,1.7,0.6,2.3,0l6-5.9c0.4,0.2,0.9,0.3,1.4,0.3c2.2,0,4.1-1.8,4.1-4.1   C15.1,76.3,14.9,75.7,14.6,75.1z M2.5,86.4c-0.5,0-0.9-0.4-0.9-0.9c0-0.5,0.4-0.9,0.9-0.9c0.5,0,0.9,0.4,0.9,0.9   C3.4,86,3,86.4,2.5,86.4z"/>
+  <path fill="#231f20" d="M-22.7,83.9l-1.1-1.1c0.2-0.3,0.3-0.6,0.5-0.9c0.1-0.3,0.2-0.6,0.3-0.9l1.6,0c0.3,0,0.5-0.2,0.5-0.5l0-1  c0-0.3-0.2-0.5-0.5-0.5l-1.6,0c-0.1-0.6-0.4-1.2-0.7-1.8l1.1-1.1c0.2-0.2,0.2-0.5,0-0.7l-0.7-0.7c-0.2-0.2-0.5-0.2-0.7,0l-1.1,1.1  c-0.3-0.2-0.6-0.3-0.9-0.5c-0.3-0.1-0.6-0.2-0.9-0.3l0-1.6c0-0.3-0.2-0.5-0.5-0.5l-1,0c-0.3,0-0.5,0.2-0.5,0.5l0,1.6  c-0.6,0.1-1.2,0.4-1.8,0.7l-1.1-1.1c-0.2-0.2-0.5-0.2-0.7,0l-0.7,0.7c-0.2,0.2-0.2,0.5,0,0.7l1.1,1.1c-0.2,0.3-0.3,0.6-0.5,0.9  c-0.1,0.3-0.2,0.6-0.3,0.9l-1.6,0c-0.3,0-0.5,0.2-0.5,0.5l0,1c0,0.3,0.2,0.5,0.5,0.5l1.6,0c0.1,0.6,0.4,1.2,0.7,1.8l-1.1,1.1  c-0.2,0.2-0.2,0.5,0,0.7l0.7,0.7c0.2,0.2,0.5,0.2,0.7,0l1.1-1.1c0.3,0.2,0.6,0.3,0.9,0.5c0.3,0.1,0.6,0.2,0.9,0.3l0,1.6  c0,0.3,0.2,0.5,0.5,0.5l1,0c0.3,0,0.5-0.2,0.5-0.5l0-1.6c0.6-0.1,1.2-0.4,1.8-0.7l1.1,1.1c0.2,0.2,0.5,0.2,0.7,0l0.7-0.7  C-22.5,84.4-22.5,84.1-22.7,83.9z M-28.8,82.1c-1.2-0.5-1.7-1.8-1.3-3c0.5-1.2,1.8-1.7,3-1.3c1.2,0.5,1.7,1.8,1.3,3  C-26.4,82-27.7,82.6-28.8,82.1z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M-62,77h-4c-0.6,0-1,0.4-1,1v4c0,0.6,0.4,1,1,1h4    c0.6,0,1-0.4,1-1v-4C-61,77.4-61.4,77-62,77z M-62,81c0,0.6-0.4,1-1,1h-2c-0.6,0-1-0.4-1-1v-1c0-0.6,0.4-1,1-1h2c0.6,0,1,0.4,1,1    V81z M-64,87l3-3h-6L-64,87z M-67,76h6l-3-3L-67,76z M-60,76.9v6l3-3L-60,76.9z M-68,82.9v-6l-3,3L-68,82.9z"/>
+  <path fill-rule="evenodd" d="M37.5,76.5h13c0.8,0,1.5-0.7,1.5-1.5c0-0.8-0.7-1.5-1.5-1.5h-13    c-0.8,0-1.5,0.7-1.5,1.5C36,75.8,36.7,76.5,37.5,76.5z M50.5,78.5h-13c-0.8,0-1.5,0.7-1.5,1.5c0,0.8,0.7,1.5,1.5,1.5h13    c0.8,0,1.5-0.7,1.5-1.5C52,79.2,51.3,78.5,50.5,78.5z M50.5,83.5h-13c-0.8,0-1.5,0.7-1.5,1.5c0,0.8,0.7,1.5,1.5,1.5h13    c0.8,0,1.5-0.7,1.5-1.5C52,84.2,51.3,83.5,50.5,83.5z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M85.6,87c-0.8,0-1.5-0.2-2.3-1.3c-0.8-1.1-1.7-2.5-1.7-2.5  s-0.7-0.9-1.1-1.6c-0.4-0.7-1.1-0.5-1.1-0.5s-2.8-4.6-3.3-5.4c-0.7-1,0.6-2.7,0.6-2.7l4.4,7c0,0,1.3,1.9,1.9,2.3  c0.5,0.4,1.4-0.4,2.8,0.9C87.7,85,87.1,87,85.6,87z M85.4,84.1c-0.9-1-1.7-0.9-1.9-0.6c-0.2,0.3,0,1.2,0.4,1.7  c0.4,0.5,0.8,0.7,1.4,0.7C85.9,86,86.4,85.2,85.4,84.1z M81.6,79.4l-1.2-1.8l2.9-4.6c0,0,1.2,1.7,0.6,2.7  C83.6,76.1,82.5,78,81.6,79.4z M77,82.3c0.3-0.3,1-1.1,1.4-1.7l0.8,1.2c-0.4,0.6-0.9,1.4-0.9,1.4s-0.9,1.4-1.7,2.5  c-0.8,1.1-1.5,1.3-2.3,1.3c-1.4,0-2.1-2-0.1-3.8C75.6,82,76.5,82.7,77,82.3z M74.6,84.1c-0.9,1-0.4,1.8,0.2,1.8c0.6,0,1-0.2,1.4-0.7  c0.4-0.5,0.6-1.5,0.4-1.7C76.3,83.2,75.5,83.1,74.6,84.1z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M-243,111c0-0.1-2-2-2-2c-1.7,0-5,0-5,0c-0.6,0-1,0.4-1,1v8    c0,0.6,0.4,1,1,1h4v-6.1c0-0.3,0.2-0.5,0.5-0.5h2.5V111z M-246,112v-2l2,2H-246z M-239,113c-1.7,0-5,0-5,0c-0.6,0-1,0.4-1,1v8    c0,0.6,0.4,1,1,1h6c0.6,0,1-0.4,1-1c0,0,0-4.8,0-7C-237,115-239,113-239,113z M-240,116v-2l2,2H-240z"/>
+  <path fill="#231f20" d="M-204.5,111h-1.3l0,0c0,0-0.2-2-2.2-2c-2,0-2.2,2-2.2,2l0,0h-1.3c-0.8,0-1.5,0.7-1.5,1.5v9    c0,0.8,0.7,1.5,1.5,1.5h7c0.8,0,1.5-0.7,1.5-1.5v-9C-203,111.7-203.7,111-204.5,111z M-210.7,112.1l0.8-0.4l0.4-0.2l0-0.4    c0-0.2,0.2-1.3,1.5-1.3c1.2,0,1.4,1.1,1.5,1.3l0,0.4l0.4,0.2l0.8,0.4l0.3,0.7h-6.1L-210.7,112.1z M-210.1,120.4l-2.8-4.9l3.3-1.9    h4.3l1.8,3.1L-210.1,120.4z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M-177,115h10v2h-10V115z"/>
+  <polygon fill="#231f20" points="-131,115 -135,115 -135,111 -137,111 -137,115 -141,115     -141,117 -137,117 -137,121 -135,121 -135,117 -131,117   "/>
+  <path fill="#231f20" d="M-94,111.7l-3,2.7v-2c0-0.8-0.6-1.4-1.3-1.4h-7.4c-0.7,0-1.3,0.6-1.3,1.4v7.2c0,0.8,0.6,1.4,1.3,1.4h7.4   c0.7,0,1.3-0.6,1.3-1.4v-2.1l3,2.7c0.3,0.3,0.6,0.4,1,0.3v-9.1C-93.3,111.4-93.7,111.5-94,111.7z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M-61.9,112h-3l3.8,4l-3.8,4h3.1l3.8-4L-61.9,112z M-66.9,112h-3    l3.8,4l-3.8,4h3.1l3.8-4L-66.9,112z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M-23,111.5h-2l-3-3l-3,3h-2c-1.1,0-2,0.9-2,2v8c0,1.1,0.9,2,2,2    h10c1.1,0,2-0.9,2-2v-8C-21,112.4-21.9,111.5-23,111.5z M-32,121.5c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1S-31.4,121.5-32,121.5z     M-32,118.5c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1S-31.4,118.5-32,118.5z M-32,115.5c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1    S-31.4,115.5-32,115.5z M-23,121.5h-7v-2h7V121.5z M-23,118.5h-7v-2h7V118.5z M-23,115.5h-7v-2h7V115.5z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M2,115h7c0.6,0,1-0.4,1-1v-4c0-0.6-0.4-1-1-1H2c-0.6,0-1,0.4-1,1    v4C1,114.6,1.4,115,2,115z M14,109h-2c-0.6,0-1,0.4-1,1v4c0,0.6,0.4,1,1,1h2c0.6,0,1-0.4,1-1v-4C15,109.4,14.6,109,14,109z     M14,116H8c-0.6,0-1,0.4-1,1v5c0,0.6,0.4,1,1,1h6c0.6,0,1-0.4,1-1v-5C15,116.4,14.6,116,14,116z M5,116H2c-0.6,0-1,0.4-1,1v5    c0,0.6,0.4,1,1,1h3c0.6,0,1-0.4,1-1v-5C6,116.4,5.6,116,5,116z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M45.8,116c0,0-0.6,0.8-1.8,0.8c-1.2,0-1.8-0.8-1.8-0.8l-6-5.1  c0.3-0.5,0.9-0.9,1.6-0.9h12.4c0.7,0,1.3,0.4,1.6,0.9L45.8,116z M42.2,117.7c0,0,0.6,0.8,1.8,0.8c1.2,0,1.8-0.8,1.8-0.8l6.2-5.4v8  c0,0.9-0.8,1.7-1.8,1.7H37.8c-1,0-1.8-0.8-1.8-1.7v-8L42.2,117.7z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M-237.5,145h-13c-0.8,0-1.5,0.7-1.5,1.5v11    c0,0.8,0.7,1.5,1.5,1.5h13c0.8,0,1.5-0.7,1.5-1.5v-11C-236,145.7-236.7,145-237.5,145z M-245.5,146c0.3,0,0.5,0.2,0.5,0.5    c0,0.3-0.2,0.5-0.5,0.5c-0.3,0-0.5-0.2-0.5-0.5C-246,146.2-245.8,146-245.5,146z M-247.6,146c0.3,0,0.5,0.2,0.5,0.5    c0,0.3-0.2,0.5-0.5,0.5s-0.5-0.2-0.5-0.5C-248.1,146.2-247.8,146-247.6,146z M-249.5,146c0.3,0,0.5,0.2,0.5,0.5    c0,0.3-0.2,0.5-0.5,0.5s-0.5-0.2-0.5-0.5C-250,146.2-249.8,146-249.5,146z M-250,156v-6c0-0.6,0.4-1,1-1h7v8h-7    C-249.6,157-250,156.6-250,156z M-238,156c0,0.6-0.4,1-1,1h-1v-8h1c0.6,0,1,0.4,1,1V156z"/>
+  <path fill-rule="evenodd" fill="#231f20" d="M-213.2,156c-1.3-1.2-2.2-2.8-2.2-4.6c0-3.6,3.3-6.5,7.4-6.5  c4.1,0,7.4,2.9,7.4,6.5c0,3.6-3.3,6.5-7.4,6.5c-0.8,0-1.6-0.1-2.4-0.3c-1.8,0.7-4.3,1.7-4.5,1.4C-213.9,157.9-213.5,156.8-213.2,156  z"/>
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/incontent-icons/session-restore.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/incontent-icons/session-restore.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/incontent-icons/session-restore.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/incontent-icons/session-restore.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" viewBox="0 0 60 60" enable-background="new 0 0 60 60">
-  <linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="30" y1="10" x2="30" y2="50">
-    <stop offset="0" style="stop-color: #fedb00"/>
-    <stop offset="1" style="stop-color: #fcce00"/>
-  </linearGradient>
-  <path fill="url(#gradient)" d="M49.316,42.867L33.829,12.7c-0.879-1.715-2.274-2.7-3.828-2.7c-1.554,0-2.949,0.985-3.829,2.702
-    L10.685,42.864c-0.869,1.69-0.913,3.482-0.121,4.909C11.35,49.187,12.817,50,14.591,50h30.82c1.772,0,3.24-0.81,4.023-2.224
-    C50.227,46.349,50.185,44.56,49.316,42.867z M32.176,22.304l-0.48,14.304h-3.424L27.76,22.304H32.176z M30,44.896
-    c-1.44,0-2.592-1.184-2.592-2.592c0-1.44,1.152-2.592,2.592-2.592c1.472,0,2.592,1.152,2.592,2.592
-    C32.592,43.712,31.472,44.896,30,44.896z"/>
-</svg>
\ 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 60">
+  <defs>
+    <linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="30" y1="10" x2="30" y2="50">
+      <stop offset="0" style="stop-color: #fedb00"/>
+      <stop offset="1" style="stop-color: #fcce00"/>
+    </linearGradient>
+  </defs>
+  <path fill="url(#gradient)" d="M49.316,42.867L33.829,12.7c-0.879-1.715-2.274-2.7-3.828-2.7c-1.554,0-2.949,0.985-3.829,2.702 L10.685,42.864c-0.869,1.69-0.913,3.482-0.121,4.909C11.35,49.187,12.817,50,14.591,50h30.82c1.772,0,3.24-0.81,4.023-2.224 C50.227,46.349,50.185,44.56,49.316,42.867z M32.176,22.304l-0.48,14.304h-3.424L27.76,22.304H32.176z M30,44.896 c-1.44,0-2.592-1.184-2.592-2.592c0-1.44,1.152-2.592,2.592-2.592c1.472,0,2.592,1.152,2.592,2.592 C32.592,43.712,31.472,44.896,30,44.896z"/>
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/incontent-icons/tab-crashed.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/incontent-icons/tab-crashed.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/incontent-icons/tab-crashed.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/incontent-icons/tab-crashed.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" viewBox="0 0 60 60" enable-background="new 0 0 60 60">
-  <linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="30" y1="12.8499" x2="30" y2="47.1501">
-    <stop offset="0" style="stop-color: #e63b2e"/>
-    <stop offset="1" style="stop-color: #c33931"/>
-  </linearGradient>
-  <path fill-rule="evenodd" clip-rule="evenodd" fill="url(#gradient)" d="M49.048,17.648H29.004
-    c-2.289-0.016-2.809-1.142-3.165-2.401c-0.359-1.269-1.076-2.397-3.229-2.397c-5.775,0-5.42,0-6.167,0
-    c-2.153,0-2.87,1.127-3.229,2.397c-0.359,1.269-0.882,2.403-3.214,2.403h0.94c-0.519,0.008-0.937,0.433-0.937,0.958v27.583
-    c0,0.53,0.426,0.959,0.952,0.959h38.093c0.526,0,0.952-0.429,0.952-0.959V18.607C50,18.077,49.574,17.648,49.048,17.648z
-     M18.441,27.932c0-2.119,1.705-3.837,3.809-3.837c2.103,0,3.809,1.718,3.809,3.837c0,2.119-1.705,3.837-3.809,3.837
-    C20.146,31.769,18.441,30.051,18.441,27.932z M36.717,41.83c-1.525,0-1.525-2.305-6.864-2.305c-5.339,0-5.339,2.305-6.864,2.305
-    c-0.842,0-1.526-0.512-1.526-1.537c0-1.024,1.271-3.842,8.39-3.842c7.119,0,8.39,2.804,8.39,3.842
-    C38.243,41.331,37.56,41.83,36.717,41.83z M37.485,31.769c-2.104,0-3.809-1.718-3.809-3.837c0-2.119,1.705-3.837,3.809-3.837
-    c2.104,0,3.809,1.718,3.809,3.837C41.294,30.051,39.588,31.769,37.485,31.769z"/>
-</svg>
\ 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 60">
+  <defs>
+    <linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="30" y1="12.85" x2="30" y2="47.15">
+      <stop offset="0" style="stop-color: #e63b2e"/>
+      <stop offset="1" style="stop-color: #c33931"/>
+    </linearGradient>
+  </defs>
+  <path fill-rule="evenodd" clip-rule="evenodd" fill="url(#gradient)" d="M49.048,17.648H29.004 c-2.289-0.016-2.809-1.142-3.165-2.401c-0.359-1.269-1.076-2.397-3.229-2.397c-5.775,0-5.42,0-6.167,0 c-2.153,0-2.87,1.127-3.229,2.397c-0.359,1.269-0.882,2.403-3.214,2.403h0.94c-0.519,0.008-0.937,0.433-0.937,0.958v27.583 c0,0.53,0.426,0.959,0.952,0.959h38.093c0.526,0,0.952-0.429,0.952-0.959V18.607C50,18.077,49.574,17.648,49.048,17.648z M18.441,27.932c0-2.119,1.705-3.837,3.809-3.837c2.103,0,3.809,1.718,3.809,3.837c0,2.119-1.705,3.837-3.809,3.837 C20.146,31.769,18.441,30.051,18.441,27.932z M36.717,41.83c-1.525,0-1.525-2.305-6.864-2.305c-5.339,0-5.339,2.305-6.864,2.305 c-0.842,0-1.526-0.512-1.526-1.537c0-1.024,1.271-3.842,8.39-3.842c7.119,0,8.39,2.804,8.39,3.842 C38.243,41.331,37.56,41.83,36.717,41.83z M37.485,31.769c-2.104,0-3.809-1.718-3.809-3.837c0-2.119,1.705-3.837,3.809-3.837 c2.104,0,3.809,1.718,3.809,3.837C41.294,30.051,39.588,31.769,37.485,31.769z"/>
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/incontent-icons/welcome-back.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/incontent-icons/welcome-back.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/incontent-icons/welcome-back.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/incontent-icons/welcome-back.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 60 60" enable-background="new 0 0 60 60">
-  <linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="0" y1="30" x2="60" y2="30">
-    <stop offset="0" style="stop-color: #fd6b0c"/>
-    <stop offset="1" style="stop-color: #e65206"/>
-  </linearGradient>
-  <path fill="url(#gradient)" d="M45.844,41.272c0.018-0.08,0.039-0.156,0.055-0.239c0.097-0.35,0.164-0.735,0.215-1.136
-    c0.375-0.835,0.747-2.172,0.5-3.936c-0.021-0.326-0.073-0.669-0.14-1.018c4.957-3.957,24.499-20.957,5.137-29.039
-    c0,0,4.23,6.9-2.898,13.92c-4.332,4.266-5.37,8.436-5.058,11.538c0,0,0.036,0.21,0.096,0.564c-1.62-2.178-5.652-4.53-14.256-2.022
-    c-8.736,2.544-7.476,4.518-9.234,3.606c0,0-0.93-2.166-3.564-4.452c0,0,0.726-4.416-0.42-5.472
-    c-1.146-1.062-2.628,2.244-5.346,3.432c-2.712,1.188-6.234,2.928-6.57,6.024l-3.39,2.328c0,0-1.446,0.684-0.81,1.32
-    c0.636,0.636,1.698,1.44,3.012,1.314c1.314-0.126,2.928-0.51,4.158-0.168c1.23,0.336,2.202,2.67,4.872,6.102
-    c0,0,2.142,4.542,6.936,5.412c0.036,0.024,0.072,0.054,0.108,0.078c1.404,1.026,4.584,3.336,5.148,3.834
-    c0.744,0.636,7.422,1.158,9.486,0.474c0,0-0.6-3.408-5.04-1.944c0,0-2.082,0.078-4.59-2.892c0.228-0.072,0.456-0.156,0.69-0.252
-    c1.056-0.402,2.184-0.966,3.39-1.728c0,0,1.542-0.774,3.846-1.356c0,0,2.497-0.555,4.376,0.455c2.542,1.829,6.483,2.442,12.58-0.566
-    c0,0,5.357,5.102,7.575,8.644c0,0,4.916-1.89-5.065-11.76C51.643,42.336,47.455,42.801,45.844,41.272z"/>
-</svg>
\ 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 60">
+  <defs>
+    <linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="0" y1="30" x2="60" y2="30">
+      <stop offset="0" style="stop-color: #fd6b0c"/>
+      <stop offset="1" style="stop-color: #e65206"/>
+    </linearGradient>
+  </defs>
+  <path fill="url(#gradient)" d="M45.844,41.272c0.018-0.08,0.039-0.156,0.055-0.239c0.097-0.35,0.164-0.735,0.215-1.136 c0.375-0.835,0.747-2.172,0.5-3.936c-0.021-0.326-0.073-0.669-0.14-1.018c4.957-3.957,24.499-20.957,5.137-29.039 c0,0,4.23,6.9-2.898,13.92c-4.332,4.266-5.37,8.436-5.058,11.538c0,0,0.036,0.21,0.096,0.564c-1.62-2.178-5.652-4.53-14.256-2.022 c-8.736,2.544-7.476,4.518-9.234,3.606c0,0-0.93-2.166-3.564-4.452c0,0,0.726-4.416-0.42-5.472 c-1.146-1.062-2.628,2.244-5.346,3.432c-2.712,1.188-6.234,2.928-6.57,6.024l-3.39,2.328c0,0-1.446,0.684-0.81,1.32 c0.636,0.636,1.698,1.44,3.012,1.314c1.314-0.126,2.928-0.51,4.158-0.168c1.23,0.336,2.202,2.67,4.872,6.102 c0,0,2.142,4.542,6.936,5.412c0.036,0.024,0.072,0.054,0.108,0.078c1.404,1.026,4.584,3.336,5.148,3.834 c0.744,0.636,7.422,1.158,9.486,0.474c0,0-0.6-3.408-5.04-1.944c0,0-2.082,0.078-4.59-2.892c0.228-0.072,0.456-0.156,0.69-0.252 c1.056-0.402,2.184-0.966,3.39-1.728c0,0,1.542-0.774,3.846-1.356c0,0,2.497-0.555,4.376,0.455c2.542,1.829,6.483,2.442,12.58-0.566 c0,0,5.357,5.102,7.575,8.644c0,0,4.916-1.89-5.065-11.76C51.643,42.336,47.455,42.801,45.844,41.272z"/>
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/incontentprefs/default-profile-image.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/incontentprefs/default-profile-image.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/incontentprefs/default-profile-image.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/incontentprefs/default-profile-image.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<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 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
-<path fill="#C3CFD8" d="M500-0.3c276.1,0,500,223.9,500,500s-223.9,500-500,500S0,775.8,0,499.7C0,223.5,223.9-0.3,500-0.3z"/>
-<circle fill="#FFFFFF" cx="500" cy="317" r="139.1"/>
-<path fill="#FFFFFF" d="M751.8,643.6L751.8,643.6c0.1-2.3,0.2-4.6,0.2-6.9c0-68-55.3-127-136.2-156.3L505.9,590.4h0
-	c-0.4,29.8-1.4,58.8-2.8,86.6c-1,0.1-2,0.3-3.1,0.3s-2-0.2-3.1-0.3c-1.4-27.9-2.4-56.9-2.8-86.7h0L384.3,480.4
-	C303.3,509.7,248,568.7,248,636.7c0,2.3,0.1,4.6,0.2,6.9l7.4,49.7c57.1,72,145.4,118.2,244.4,118.2c99,0,187.3-46.2,244.4-118.2
-	L751.8,643.6z"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000">
+  <path fill="#c3cfd8" d="M500-0.3c276.1,0,500,223.9,500,500s-223.9,500-500,500S0,775.8,0,499.7C0,223.5,223.9-0.3,500-0.3z"/>
+  <circle fill="#fff" cx="500" cy="317" r="139.1"/>
+  <path fill="#fff" d="M751.8,643.6L751.8,643.6c0.1-2.3,0.2-4.6,0.2-6.9c0-68-55.3-127-136.2-156.3L505.9,590.4h0 c-0.4,29.8-1.4,58.8-2.8,86.6c-1,0.1-2,0.3-3.1,0.3s-2-0.2-3.1-0.3c-1.4-27.9-2.4-56.9-2.8-86.7h0L384.3,480.4 C303.3,509.7,248,568.7,248,636.7c0,2.3,0.1,4.6,0.2,6.9l7.4,49.7c57.1,72,145.4,118.2,244.4,118.2c99,0,187.3-46.2,244.4-118.2 L751.8,643.6z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/incontentprefs/icons.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/incontentprefs/icons.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/incontentprefs/icons.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/incontentprefs/icons.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     viewBox="0 0 24 24">
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24">
   <style>
     use:not(:target) {
       display: none;
@@ -15,99 +16,32 @@
       fill: ThreeDHighlight;
     }
   </style>
-  <defs style="display: none;">
+  <defs>
     <g id="general-shape">
-      <path
-        d="M18.97,3H5.03C3.914,3,3,3.914,3,5.03v13.94C3,20.086,3.914,21,5.03,21H18.97c1.117,0,2.03-0.914,2.03-2.03
-        V5.03C21,3.914,20.086,3,18.97,3z M5.35,19.326c-0.404,0-0.731-0.327-0.731-0.731c0-0.404,0.327-0.731,0.731-0.731
-        c0.404,0,0.731,0.327,0.731,0.731C6.081,19,5.754,19.326,5.35,19.326z M5.35,6.168c-0.403,0-0.731-0.328-0.731-0.731
-        c0-0.404,0.328-0.731,0.731-0.731c0.403,0,0.731,0.327,0.731,0.731C6.081,5.84,5.753,6.168,5.35,6.168z M15.243,14.035
-        c0,0.229-0.186,0.416-0.414,0.416c-0.229,0-0.415,0.186-0.415,0.414v3.347c0,0.228-0.185,0.384-0.414,0.384l-4.141,0.03
-        c-0.227,0-0.414-0.186-0.414-0.414v-3.347c0-0.228-0.185-0.414-0.414-0.414c-0.227,0-0.414-0.187-0.414-0.416V6.582
-        c0-0.229,0.187-0.414,0.414-0.414h5.798c0.228,0,0.414,0.185,0.414,0.414V14.035z M18.509,19.326c-0.404,0-0.731-0.327-0.731-0.731
-        c0-0.404,0.327-0.731,0.731-0.731c0.404,0,0.731,0.327,0.731,0.731C19.24,19,18.913,19.326,18.509,19.326z M18.509,6.168
-        c-0.404,0-0.731-0.328-0.731-0.731c0-0.404,0.327-0.731,0.731-0.731c0.404,0,0.731,0.327,0.731,0.731
-        C19.24,5.84,18.913,6.168,18.509,6.168z"/>
-      <path
-        d="M12.757,7.824h-1.657c-0.456,0-0.828,0.373-0.828,0.828v8.282c0,0.456,0.373,0.828,0.828,0.828h1.657
-        c0.456,0,0.828-0.373,0.828-0.828V8.652C13.586,8.196,13.213,7.824,12.757,7.824z"/>
+      <path d="M18.97,3H5.03C3.914,3,3,3.914,3,5.03v13.94C3,20.086,3.914,21,5.03,21H18.97c1.117,0,2.03-0.914,2.03-2.03 V5.03C21,3.914,20.086,3,18.97,3z M5.35,19.326c-0.404,0-0.731-0.327-0.731-0.731c0-0.404,0.327-0.731,0.731-0.731 c0.404,0,0.731,0.327,0.731,0.731C6.081,19,5.754,19.326,5.35,19.326z M5.35,6.168c-0.403,0-0.731-0.328-0.731-0.731 c0-0.404,0.328-0.731,0.731-0.731c0.403,0,0.731,0.327,0.731,0.731C6.081,5.84,5.753,6.168,5.35,6.168z M15.243,14.035 c0,0.229-0.186,0.416-0.414,0.416c-0.229,0-0.415,0.186-0.415,0.414v3.347c0,0.228-0.185,0.384-0.414,0.384l-4.141,0.03 c-0.227,0-0.414-0.186-0.414-0.414v-3.347c0-0.228-0.185-0.414-0.414-0.414c-0.227,0-0.414-0.187-0.414-0.416V6.582 c0-0.229,0.187-0.414,0.414-0.414h5.798c0.228,0,0.414,0.185,0.414,0.414V14.035z M18.509,19.326c-0.404,0-0.731-0.327-0.731-0.731 c0-0.404,0.327-0.731,0.731-0.731c0.404,0,0.731,0.327,0.731,0.731C19.24,19,18.913,19.326,18.509,19.326z M18.509,6.168 c-0.404,0-0.731-0.328-0.731-0.731c0-0.404,0.327-0.731,0.731-0.731c0.404,0,0.731,0.327,0.731,0.731 C19.24,5.84,18.913,6.168,18.509,6.168z"/>
+      <path d="M12.757,7.824h-1.657c-0.456,0-0.828,0.373-0.828,0.828v8.282c0,0.456,0.373,0.828,0.828,0.828h1.657 c0.456,0,0.828-0.373,0.828-0.828V8.652C13.586,8.196,13.213,7.824,12.757,7.824z"/>
     </g>
     <g id="search-shape">
-      <path
-        d="M2,10.018c0,4.43,3.585,8.019,8.009,8.019
-        c1.603,0,3.095-0.473,4.348-1.285l4.806,4.81c0.58,0.583,1.523,0.583,2.105,0l0.296-0.297c0.582-0.583,0.582-1.527,0-2.11
-        l-4.808-4.814c0.8-1.247,1.265-2.73,1.265-4.323c0-4.43-3.587-8.018-8.012-8.018C5.585,2,2,5.589,2,10.018z M5.104,10.021
-        c0-2.716,2.196-4.915,4.906-4.915c2.71,0,4.908,2.199,4.908,4.915c0,2.712-2.198,4.911-4.908,4.911
-        C7.3,14.931,5.104,12.732,5.104,10.021z"/>
+      <path d="M2,10.018c0,4.43,3.585,8.019,8.009,8.019 c1.603,0,3.095-0.473,4.348-1.285l4.806,4.81c0.58,0.583,1.523,0.583,2.105,0l0.296-0.297c0.582-0.583,0.582-1.527,0-2.11 l-4.808-4.814c0.8-1.247,1.265-2.73,1.265-4.323c0-4.43-3.587-8.018-8.012-8.018C5.585,2,2,5.589,2,10.018z M5.104,10.021 c0-2.716,2.196-4.915,4.906-4.915c2.71,0,4.908,2.199,4.908,4.915c0,2.712-2.198,4.911-4.908,4.911 C7.3,14.931,5.104,12.732,5.104,10.021z"/>
     </g>
     <g id="content-shape">
-      <path
-        d="M16.286,2H5.571C4.388,2,3.429,2.96,3.429,4.143v15.714
-        C3.429,21.04,4.388,22,5.571,22h12.857c1.185,0,2.143-0.96,2.143-2.143V6.286L16.286,2z M18.945,19.223c0,0.22-0.18,0.4-0.4,0.4
-        h-13.2c-0.22,0-0.4-0.18-0.4-0.4v-0.846c0-0.22,0.18-0.4,0.4-0.4h13.2c0.22,0,0.4,0.18,0.4,0.4V19.223z M18.945,15.223
-        c0,0.22-0.18,0.4-0.4,0.4h-13.2c-0.22,0-0.4-0.18-0.4-0.4v-0.846c0-0.22,0.18-0.4,0.4-0.4h13.2c0.22,0,0.4,0.18,0.4,0.4V15.223z
-         M18.945,11.229c0,0.22-0.18,0.4-0.4,0.4h-13.2c-0.22,0-0.4-0.18-0.4-0.4v-0.846c0-0.22,0.18-0.4,0.4-0.4h13.2
-        c0.22,0,0.4,0.18,0.4,0.4V11.229z M14.833,7.707v-4.65l4.65,4.65H14.833z"/>
+      <path d="M16.286,2H5.571C4.388,2,3.429,2.96,3.429,4.143v15.714 C3.429,21.04,4.388,22,5.571,22h12.857c1.185,0,2.143-0.96,2.143-2.143V6.286L16.286,2z M18.945,19.223c0,0.22-0.18,0.4-0.4,0.4 h-13.2c-0.22,0-0.4-0.18-0.4-0.4v-0.846c0-0.22,0.18-0.4,0.4-0.4h13.2c0.22,0,0.4,0.18,0.4,0.4V19.223z M18.945,15.223 c0,0.22-0.18,0.4-0.4,0.4h-13.2c-0.22,0-0.4-0.18-0.4-0.4v-0.846c0-0.22,0.18-0.4,0.4-0.4h13.2c0.22,0,0.4,0.18,0.4,0.4V15.223z M18.945,11.229c0,0.22-0.18,0.4-0.4,0.4h-13.2c-0.22,0-0.4-0.18-0.4-0.4v-0.846c0-0.22,0.18-0.4,0.4-0.4h13.2 c0.22,0,0.4,0.18,0.4,0.4V11.229z M14.833,7.707v-4.65l4.65,4.65H14.833z"/>
     </g>
     <g id="applications-shape">
-      <path
-        d="M16.673,8.914C16.089,4.122,13.248,1,12,1c-1.25,0-3.986,3.122-4.767,7.914l-3.122,3.131v7.889h2.268
-        l2.978-3.436c0.28,0.29,0.737,1.666,1.065,1.858h3.155c0.331-0.193,0.789-1.569,1.068-1.858l3.123,3.436h2.12v-7.84L16.673,8.914z
-         M12.042,8.735c-0.604,0-1.279,0.06-1.818,0.165c0.478-1.453,1.345-3.117,1.781-3.117c0.435,0,1.301,1.655,1.775,3.1
-        C13.265,8.789,12.615,8.735,12.042,8.735z M12.524,19.145c0.076,0.196,0.119,0.602,0.119,0.86c0,0.66-0.524,1.074-0.687,1.074
-        c-0.163,0-0.615-0.414-0.615-1.074c0-0.257,0.045-0.664,0.119-0.86h-0.754c-0.089,0.345-0.39,1.005-0.39,1.408
-        c0,1.458,1.328,2.447,1.686,2.447c0.359,0,1.686-0.951,1.686-2.407c0-0.404-0.301-1.103-0.388-1.449H12.524z"/>
+      <path d="M16.673,8.914C16.089,4.122,13.248,1,12,1c-1.25,0-3.986,3.122-4.767,7.914l-3.122,3.131v7.889h2.268 l2.978-3.436c0.28,0.29,0.737,1.666,1.065,1.858h3.155c0.331-0.193,0.789-1.569,1.068-1.858l3.123,3.436h2.12v-7.84L16.673,8.914z M12.042,8.735c-0.604,0-1.279,0.06-1.818,0.165c0.478-1.453,1.345-3.117,1.781-3.117c0.435,0,1.301,1.655,1.775,3.1 C13.265,8.789,12.615,8.735,12.042,8.735z M12.524,19.145c0.076,0.196,0.119,0.602,0.119,0.86c0,0.66-0.524,1.074-0.687,1.074 c-0.163,0-0.615-0.414-0.615-1.074c0-0.257,0.045-0.664,0.119-0.86h-0.754c-0.089,0.345-0.39,1.005-0.39,1.408 c0,1.458,1.328,2.447,1.686,2.447c0.359,0,1.686-0.951,1.686-2.407c0-0.404-0.301-1.103-0.388-1.449H12.524z"/>
     </g>
     <g id="privacy-shape">
-      <path
-        d="M21.632,9.541c-0.083,1.403,0.246,3.079-1.597,5.498
-        c-1.965,2.578-3.914,2.594-4.284,2.575c-2.249-0.117-2.502-1.875-3.792-1.875c-1.13,0-2.012,1.745-3.711,1.836
-        c-0.37,0.02-2.319,0.042-4.284-2.536c-1.841-2.419-1.514-4.095-1.597-5.498C2.287,8.138,2,6.618,2,6.618s0.887,0.895,2.033,0.973
-        C5.179,7.67,5.394,7.191,7.811,6.501C10.424,5.752,12,8.814,12,8.814s1.776-3.016,4.189-2.313c2.414,0.7,2.515,1.169,3.661,1.091
-        C20.996,7.513,22,6.618,22,6.618S21.713,8.138,21.632,9.541z M8.117,10.129c-1.429-0.314-2.028,0.223-2.642,0.451
-        c-0.534,0.202-1.02,0.264-1.02,0.264s0.083,0.819,1.515,1.521c1.432,0.703,4.37,0.338,4.37,0.338S10.651,10.687,8.117,10.129z
-         M18.525,10.58c-0.612-0.228-1.212-0.765-2.642-0.451c-2.534,0.558-2.223,2.573-2.223,2.573s2.938,0.365,4.37-0.338
-        c1.432-0.702,1.515-1.521,1.515-1.521S19.059,10.782,18.525,10.58z"/>
+      <path d="M21.632,9.541c-0.083,1.403,0.246,3.079-1.597,5.498 c-1.965,2.578-3.914,2.594-4.284,2.575c-2.249-0.117-2.502-1.875-3.792-1.875c-1.13,0-2.012,1.745-3.711,1.836 c-0.37,0.02-2.319,0.042-4.284-2.536c-1.841-2.419-1.514-4.095-1.597-5.498C2.287,8.138,2,6.618,2,6.618s0.887,0.895,2.033,0.973 C5.179,7.67,5.394,7.191,7.811,6.501C10.424,5.752,12,8.814,12,8.814s1.776-3.016,4.189-2.313c2.414,0.7,2.515,1.169,3.661,1.091 C20.996,7.513,22,6.618,22,6.618S21.713,8.138,21.632,9.541z M8.117,10.129c-1.429-0.314-2.028,0.223-2.642,0.451 c-0.534,0.202-1.02,0.264-1.02,0.264s0.083,0.819,1.515,1.521c1.432,0.703,4.37,0.338,4.37,0.338S10.651,10.687,8.117,10.129z M18.525,10.58c-0.612-0.228-1.212-0.765-2.642-0.451c-2.534,0.558-2.223,2.573-2.223,2.573s2.938,0.365,4.37-0.338 c1.432-0.702,1.515-1.521,1.515-1.521S19.059,10.782,18.525,10.58z"/>
     </g>
     <g id="security-shape">
-      <path
-        d="M18.909,9.783h-0.863V8.086C18.046,4.725,15.339,2,12,2
-        C8.661,2,5.954,4.725,5.954,8.086v1.697H5.091c-0.955,0-1.728,0.779-1.728,1.739v8.738c0,0.961,0.773,1.74,1.728,1.74h13.818
-        c0.954,0,1.728-0.779,1.728-1.74v-8.738C20.637,10.562,19.863,9.783,18.909,9.783z M8.545,8.086c0-1.92,1.547-3.478,3.455-3.478
-        c1.908,0,3.455,1.557,3.455,3.478v1.697h-6.91V8.086z M5.181,16.092l-0.909-1.2v-2.284l2.728,3.483H5.181z M8.818,16.092
-        l-2.773-3.657h1.727l2.864,3.657H8.818z M12,16.092l-2.773-3.657h1.727l2.864,3.657H12z M15.637,16.092l-2.773-3.657h1.727
-        l2.864,3.657H15.637z M19.728,16.092h-0.455l-2.773-3.657h1.727l1.501,1.916V16.092z"/>
+      <path d="M18.909,9.783h-0.863V8.086C18.046,4.725,15.339,2,12,2 C8.661,2,5.954,4.725,5.954,8.086v1.697H5.091c-0.955,0-1.728,0.779-1.728,1.739v8.738c0,0.961,0.773,1.74,1.728,1.74h13.818 c0.954,0,1.728-0.779,1.728-1.74v-8.738C20.637,10.562,19.863,9.783,18.909,9.783z M8.545,8.086c0-1.92,1.547-3.478,3.455-3.478 c1.908,0,3.455,1.557,3.455,3.478v1.697h-6.91V8.086z M5.181,16.092l-0.909-1.2v-2.284l2.728,3.483H5.181z M8.818,16.092 l-2.773-3.657h1.727l2.864,3.657H8.818z M12,16.092l-2.773-3.657h1.727l2.864,3.657H12z M15.637,16.092l-2.773-3.657h1.727 l2.864,3.657H15.637z M19.728,16.092h-0.455l-2.773-3.657h1.727l1.501,1.916V16.092z"/>
     </g>
     <g id="sync-shape">
-      <path
-        d="M17.024,3.351 c-0.562,0.331 -1.311,0.879 -1.821,1.698 -0.367,0.592 -0.752,1.288 -1.08,1.914 0.987,0.413 1.862,1.095
-        2.476,2.029 0.614,0.957 0.929,2.122 0.83,3.351 -0.201,1.787 -1.359,3.433 -3.046,4.36 -0.696,-0.774 -1.951,-2.945
-        -1.951,-2.945 -0.007,0.007 -0.004,2.556 -0.871,4.334 -0.573,1.184 -1.24,2.202 -2.305,2.995 1.431,0.51 2.915,0.886
-        4.282,0.909 l 0.162,0.002 c 2.99,0.021 5.844,-0.48 5.844,-0.48 0,0 -1.236,-0.802 -1.808,-1.346 1.86,-1.072 3.111,-2.791
-        3.634,-4.708 0.283,-0.759 0.478,-1.566 0.57,-2.409 C 22.383,9.011 20.33,5.278 17.024,3.351 Z M 6.569,12.302 C 6.526,10.271
-        7.755,8.327 9.644,7.29 c 0.696,0.774 2.32,2.899 2.32,2.899 0,0 -0.064,-5.157 1.657,-7.973 -6.097,-0.668 -9.69,0.443
-        -9.69,0.443 0,0 1.763,0.607 2.333,1.136 C 6.122,3.891 5.984,3.992 5.85,4.096 4.4,5.064 3.368,6.449 2.825,7.994 2.436,8.892
-        2.171,9.863 2.06,10.887 1.622,14.886 3.629,18.572 6.871,20.515 7.39,20.124 7.975,19.631 8.61,18.983 9.189,18.389 9.647,17.682
-        10.021,16.967 8.082,16.208 6.714,14.404 6.569,12.302 Z"/>
+      <path d="M17.024,3.351 c-0.562,0.331 -1.311,0.879 -1.821,1.698 -0.367,0.592 -0.752,1.288 -1.08,1.914 0.987,0.413 1.862,1.095 2.476,2.029 0.614,0.957 0.929,2.122 0.83,3.351 -0.201,1.787 -1.359,3.433 -3.046,4.36 -0.696,-0.774 -1.951,-2.945 -1.951,-2.945 -0.007,0.007 -0.004,2.556 -0.871,4.334 -0.573,1.184 -1.24,2.202 -2.305,2.995 1.431,0.51 2.915,0.886 4.282,0.909 l 0.162,0.002 c 2.99,0.021 5.844,-0.48 5.844,-0.48 0,0 -1.236,-0.802 -1.808,-1.346 1.86,-1.072 3.111,-2.791 3.634,-4.708 0.283,-0.759 0.478,-1.566 0.57,-2.409 C 22.383,9.011 20.33,5.278 17.024,3.351 Z M 6.569,12.302 C 6.526,10.271 7.755,8.327 9.644,7.29 c 0.696,0.774 2.32,2.899 2.32,2.899 0,0 -0.064,-5.157 1.657,-7.973 -6.097,-0.668 -9.69,0.443 -9.69,0.443 0,0 1.763,0.607 2.333,1.136 C 6.122,3.891 5.984,3.992 5.85,4.096 4.4,5.064 3.368,6.449 2.825,7.994 2.436,8.892 2.171,9.863 2.06,10.887 1.622,14.886 3.629,18.572 6.871,20.515 7.39,20.124 7.975,19.631 8.61,18.983 9.189,18.389 9.647,17.682 10.021,16.967 8.082,16.208 6.714,14.404 6.569,12.302 Z"/>
     </g>
     <g id="advanced-shape">
-      <path
-        d="M19.173,16.163c0.004,0.04,0.007,0.08,0.007,0.121c0,1.748-3.197,3.165-7.14,3.165 c-3.943,0-7.14-1.417-7.14-3.165c0
-        -0.037,0.003-0.073,0.006-0.109C3.11,16.572,2,17.243,2,18.341C2,20.362,6.477,22,12,22 c5.523,0,10-1.638,10-3.659
-        C22,17.22,20.922,16.553,19.173,16.163z"/>
-      <path
-        d="M18.224,15.979c0.006-0.11-0.018-0.285-0.054-0.39c0,0-0.762-2.205-1.176-3.403
-        c-0.624-1.807-2.112-6.139-2.112-6.139c-0.036-0.104-0.031-0.273,0.01-0.376l0.497-1.234c0.041-0.102,0.116-0.266,0.166-0.364
-        l0.986-1.942c0.05-0.098,0.013-0.133-0.081-0.077L9.965,5.871c-0.095,0.056-0.203,0.186-0.24,0.29c0,0-0.252,0.7-0.412,1.144
-        C8.64,9.173,7.968,11.04,7.296,12.908c-0.26,0.723-0.52,1.446-0.78,2.168c-0.056,0.156-0.112,0.311-0.168,0.466
-        c-0.093,0.26-0.049,0.617,0.032,0.881c0.237,0.763,1.001,1.189,1.708,1.435c0.611,0.213,1.254,0.328,1.895,0.403
-        c0.895,0.105,1.805,0.14,2.706,0.112c1.356-0.041,2.767-0.261,4.004-0.846c0.429-0.203,0.854-0.459,1.174-0.816
-        c0.121-0.135,0.226-0.287,0.297-0.455C18.215,16.134,18.224,15.979,18.224,15.979z M14.063,16.131
-        c0.019,0.108-0.046,0.156-0.143,0.104l-1.466-0.772c-0.097-0.052-0.257-0.052-0.354,0l-1.466,0.773
-        c-0.097,0.052-0.162,0.004-0.143-0.104l0.28-1.636c0.019-0.109-0.031-0.261-0.109-0.338l-1.186-1.158
-        c-0.079-0.077-0.054-0.153,0.055-0.169l1.638-0.239c0.109-0.016,0.238-0.11,0.286-0.209l0.733-1.488
-        c0.049-0.099,0.128-0.099,0.177,0l0.733,1.488c0.049,0.099,0.178,0.193,0.286,0.209l1.639,0.239
-        c0.109,0.016,0.134,0.092,0.055,0.169l-1.186,1.158c-0.079,0.077-0.128,0.229-0.109,0.338L14.063,16.131z"/>
+      <path d="M19.173,16.163c0.004,0.04,0.007,0.08,0.007,0.121c0,1.748-3.197,3.165-7.14,3.165 c-3.943,0-7.14-1.417-7.14-3.165c0 -0.037,0.003-0.073,0.006-0.109C3.11,16.572,2,17.243,2,18.341C2,20.362,6.477,22,12,22 c5.523,0,10-1.638,10-3.659 C22,17.22,20.922,16.553,19.173,16.163z"/>
+      <path d="M18.224,15.979c0.006-0.11-0.018-0.285-0.054-0.39c0,0-0.762-2.205-1.176-3.403 c-0.624-1.807-2.112-6.139-2.112-6.139c-0.036-0.104-0.031-0.273,0.01-0.376l0.497-1.234c0.041-0.102,0.116-0.266,0.166-0.364 l0.986-1.942c0.05-0.098,0.013-0.133-0.081-0.077L9.965,5.871c-0.095,0.056-0.203,0.186-0.24,0.29c0,0-0.252,0.7-0.412,1.144 C8.64,9.173,7.968,11.04,7.296,12.908c-0.26,0.723-0.52,1.446-0.78,2.168c-0.056,0.156-0.112,0.311-0.168,0.466 c-0.093,0.26-0.049,0.617,0.032,0.881c0.237,0.763,1.001,1.189,1.708,1.435c0.611,0.213,1.254,0.328,1.895,0.403 c0.895,0.105,1.805,0.14,2.706,0.112c1.356-0.041,2.767-0.261,4.004-0.846c0.429-0.203,0.854-0.459,1.174-0.816 c0.121-0.135,0.226-0.287,0.297-0.455C18.215,16.134,18.224,15.979,18.224,15.979z M14.063,16.131 c0.019,0.108-0.046,0.156-0.143,0.104l-1.466-0.772c-0.097-0.052-0.257-0.052-0.354,0l-1.466,0.773 c-0.097,0.052-0.162,0.004-0.143-0.104l0.28-1.636c0.019-0.109-0.031-0.261-0.109-0.338l-1.186-1.158 c-0.079-0.077-0.054-0.153,0.055-0.169l1.638-0.239c0.109-0.016,0.238-0.11,0.286-0.209l0.733-1.488 c0.049-0.099,0.128-0.099,0.177,0l0.733,1.488c0.049,0.099,0.178,0.193,0.286,0.209l1.639,0.239 c0.109,0.016,0.134,0.092,0.055,0.169l-1.186,1.158c-0.079,0.077-0.128,0.229-0.109,0.338L14.063,16.131z"/>
     </g>
   </defs>
   <use id="general" xlink:href="#general-shape"/>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/incontentprefs/preferences.inc.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/incontentprefs/preferences.inc.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/incontentprefs/preferences.inc.css	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/incontentprefs/preferences.inc.css	2015-05-25 20:43:04.000000000 +0000
@@ -10,7 +10,6 @@
   padding: 0;
   font: message-box;
   font-size: 1.25rem;
-  line-height: 22px;
 }
 
 * {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/login-doorhanger.inc.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/login-doorhanger.inc.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/login-doorhanger.inc.css	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/login-doorhanger.inc.css	2015-05-25 20:43:04.000000000 +0000
@@ -8,11 +8,25 @@
   max-height: 20em;
 }
 
+.login-fill-item[disabled] {
+  color: #888;
+  background-color: #fff;
+}
+
+.login-fill-item[disabled][selected] {
+  background-color: #eef;
+}
+
 .login-hostname {
   margin: 4px;
   font-weight: bold;
 }
 
+.login-fill-item.different-hostname > .login-hostname {
+  color: #888;
+  font-style: italic;
+}
+
 .login-username {
   margin: 4px;
   color: #888;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/newtab/controls.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/newtab/controls.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/newtab/controls.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/newtab/controls.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,116 +1,85 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<svg version="1.1"
-     id="icons-enhanced-tiles"
-     xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     x="0"
-     y="0"
-     width="288"
-     height="32"
-     viewBox="0 0 288 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="288" height="32" viewBox="0 0 288 32">
   <defs>
-    <style type="text/css"><![CDATA[
+    <style>
       /* Glyph Styles */
-
       .glyphShape-style {
         fill: #737373;
       }
-
       .glyphShape-style-pin {
         fill: #b4b4b4;
       }
-
       .glyphShape-style-hover-gear {
         fill: #4a90e2;
       }
-
       .glyphShape-style-hover-pin {
         fill: #4a90e2;
       }
-
       .glyphShape-style-hover-delete {
         fill: #ea0000;
       }
-
       .glyphShape-style-hover-active {
         fill: #231f20;
       }
-
       /* Circle Background Styles */
-
       .glyphShape-style-circle {
         fill: #fff;
       }
-
       .glyphShape-style-circle-dropshadow {
         fill: #000;
         fill-opacity: .5;
         filter: url(#filter-shadow-drop);
       }
-      ]]></style>
-
+    </style>
     <filter id="filter-shadow-drop" x="-10%" y="-10%" width="120%" height="120%">
       <feOffset in="SourceAlpha" dx="0" dy=".75" result="filter-shadow-drop-offset" />
       <feGaussianBlur in="filter-shadow-drop-offset" stdDeviation="1" result="filter-shadow-drop-blur"/>
     </filter>
-
-    <path    id="glyphShape-gear" d="M28,16c0-1.7,0.9-3.1,2-3.3c-0.4-1.5-0.9-2.9-1.7-4.2c-0.9,0.7-2.6,0.3-3.8-0.9c-1.2-1.2-1.6-2.8-0.9-3.8 c-1.3-0.8-2.7-1.4-4.2-1.7c-0.2,1.1-1.6,2-3.3,2S13,3.1,12.8,2c-1.5,0.4-2.9,0.9-4.2,1.7c0.7,0.9,0.3,2.6-0.9,3.8 c-1.4,1.1-3,1.5-4,0.9C2.9,9.7,2.4,11.2,2,12.7c1.1,0.2,2,1.6,2,3.3s-0.9,3.1-2,3.3c0.4,1.5,0.9,2.9,1.7,4.2 c0.9-0.7,2.6-0.3,3.8,0.9c1.2,1.2,1.6,2.8,0.9,3.8c1.3,0.8,2.7,1.4,4.2,1.7c0.2-1.1,1.6-2,3.3-2s3.1,0.9,3.3,2 c1.5-0.4,2.9-0.9,4.2-1.7c-0.7-0.9-0.3-2.6,0.9-3.8c1.3-1.2,2.8-1.6,3.8-0.9c0.8-1.3,1.4-2.7,1.7-4.2C28.9,19.1,28,17.7,28,16z M16,24c-4.4,0-8-3.6-8-8s3.6-8,8-8s8,3.6,8,8S20.4,24,16,24z" />
-
-    <circle  id="glyphShape-circle" cx="16" cy="16" r="14" />
-
-    <path    id="glyphShape-pin" d="M19,15v-5h2V7H11v3h2v5l-3,2v2h5c0,4.5,0.4,8,1,8s1-3.5,1-8h5v-2L19,15z" />
-    <polygon id="glyphShape-delete" points="23,11 21,9 16,14 11,9 9,11 14,16 9,21 11,23 16,18 21,23 23,21 18,16" />
-
+    <path id="glyphShape-gear" d="M28,16c0-1.7,0.9-3.1,2-3.3c-0.4-1.5-0.9-2.9-1.7-4.2c-0.9,0.7-2.6,0.3-3.8-0.9c-1.2-1.2-1.6-2.8-0.9-3.8 c-1.3-0.8-2.7-1.4-4.2-1.7c-0.2,1.1-1.6,2-3.3,2S13,3.1,12.8,2c-1.5,0.4-2.9,0.9-4.2,1.7c0.7,0.9,0.3,2.6-0.9,3.8 c-1.4,1.1-3,1.5-4,0.9C2.9,9.7,2.4,11.2,2,12.7c1.1,0.2,2,1.6,2,3.3s-0.9,3.1-2,3.3c0.4,1.5,0.9,2.9,1.7,4.2 c0.9-0.7,2.6-0.3,3.8,0.9c1.2,1.2,1.6,2.8,0.9,3.8c1.3,0.8,2.7,1.4,4.2,1.7c0.2-1.1,1.6-2,3.3-2s3.1,0.9,3.3,2 c1.5-0.4,2.9-0.9,4.2-1.7c-0.7-0.9-0.3-2.6,0.9-3.8c1.3-1.2,2.8-1.6,3.8-0.9c0.8-1.3,1.4-2.7,1.7-4.2C28.9,19.1,28,17.7,28,16z M16,24c-4.4,0-8-3.6-8-8s3.6-8,8-8s8,3.6,8,8S20.4,24,16,24z"/>
+    <circle id="glyphShape-circle" cx="16" cy="16" r="14"/>
+    <path id="glyphShape-pin" d="M19,15v-5h2V7H11v3h2v5l-3,2v2h5c0,4.5,0.4,8,1,8s1-3.5,1-8h5v-2L19,15z"/>
+    <polygon id="glyphShape-delete" points="23,11 21,9 16,14 11,9 9,11 14,16 9,21 11,23 16,18 21,23 23,21 18,16"/>
   </defs>
-
   <g id="icon-gear-default">
-    <use xlink:href="#glyphShape-gear"   class="glyphShape-style" />
+    <use xlink:href="#glyphShape-gear" class="glyphShape-style"/>
   </g>
-
   <g id="icon-gear-default" transform="translate(32)">
-    <use xlink:href="#glyphShape-gear"   class="glyphShape-style-hover-gear" />
+    <use xlink:href="#glyphShape-gear" class="glyphShape-style-hover-gear"/>
   </g>
-
   <g id="icon-pin-default" transform="translate(64)">
-    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle-dropshadow" />
-    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle" />
-    <use xlink:href="#glyphShape-pin"    class="glyphShape-style" />
+    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle-dropshadow"/>
+    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle"/>
+    <use xlink:href="#glyphShape-pin" class="glyphShape-style"/>
   </g>
-
   <g id="icon-pin-hover" transform="translate(96)">
-    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle-dropshadow" />
-    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle" />
-    <use xlink:href="#glyphShape-pin"    class="glyphShape-style-hover-pin" />
+    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle-dropshadow"/>
+    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle"/>
+    <use xlink:href="#glyphShape-pin" class="glyphShape-style-hover-pin"/>
   </g>
-
   <g id="icon-pin-hover-active" transform="translate(128)">
-    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle-dropshadow" />
-    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle" />
-    <use xlink:href="#glyphShape-pin"    class="glyphShape-style-hover-active" />
+    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle-dropshadow"/>
+    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle"/>
+    <use xlink:href="#glyphShape-pin" class="glyphShape-style-hover-active"/>
   </g>
-
   <g id="icon-delete-default" transform="translate(160)">
-    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle-dropshadow" />
-    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle" />
-    <use xlink:href="#glyphShape-delete" class="glyphShape-style" />
+    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle-dropshadow"/>
+    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle"/>
+    <use xlink:href="#glyphShape-delete" class="glyphShape-style"/>
   </g>
-
   <g id="icon-delete-hover" transform="translate(192)">
-    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle-dropshadow" />
-    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle" />
-    <use xlink:href="#glyphShape-delete" class="glyphShape-style-hover-delete" />
+    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle-dropshadow"/>
+    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle"/>
+    <use xlink:href="#glyphShape-delete" class="glyphShape-style-hover-delete"/>
   </g>
-
   <g id="icon-delete-hover-active" transform="translate(224)">
-    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle-dropshadow" />
-    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle" />
-    <use xlink:href="#glyphShape-delete" class="glyphShape-style-hover-active" />
+    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle-dropshadow"/>
+    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle"/>
+    <use xlink:href="#glyphShape-delete" class="glyphShape-style-hover-active"/>
   </g>
-
   <g id="icon-pin-default" transform="translate(256)">
-    <use xlink:href="#glyphShape-pin"    class="glyphShape-style-pin" />
+    <use xlink:href="#glyphShape-pin" class="glyphShape-style-pin"/>
   </g>
-
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/newtab/newTab.inc.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/newtab/newTab.inc.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/newtab/newTab.inc.css	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/newtab/newTab.inc.css	2015-05-25 20:43:04.000000000 +0000
@@ -87,7 +87,9 @@
 }
 
 /* CELLS */
-.newtab-cell {
+.newtab-cell,
+.newtab-intro-cell,
+.newtab-intro-cell-hover {
   background-color: rgba(255,255,255,.2);
   border-radius: 8px;
 }
@@ -106,12 +108,19 @@
 }
 
 .newtab-cell:not([ignorehover]) > .newtab-site:hover,
-.newtab-site[dragged] {
+.newtab-site[dragged],
+.newtab-intro-cell-hover {
   border: 2px solid white;
   box-shadow: 0 0 6px 2px #4cb1ff;
   margin: -2px;
 }
 
+.newtab-intro-cell .newtab-thumbnail,
+.newtab-intro-cell-hover .newtab-thumbnail {
+  background-color: #cae1f4;
+  background-image: url("chrome://browser/skin/newtab/whimsycorn.png");
+}
+
 .newtab-site[dragged] {
   transition-property: box-shadow, background-color;
   background-color: rgb(242,242,242);
@@ -164,7 +173,7 @@
 }
 
 .newtab-site[pinned] .newtab-title {
-  padding: 0 15px;
+  -moz-padding-start: 24px;
 }
 
 .newtab-site[pinned] .newtab-title::before {
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/newtab/whimsycorn.png and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/newtab/whimsycorn.png differ
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/notification-icons.inc.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/notification-icons.inc.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/notification-icons.inc.css	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/notification-icons.inc.css	2015-05-25 20:43:04.000000000 +0000
@@ -19,14 +19,32 @@
 }
 
 .popup-notification-icon[popupid="xpinstall-disabled"],
-.popup-notification-icon[popupid="addon-progress"],
-.popup-notification-icon[popupid="addon-install-blocked"],
-.popup-notification-icon[popupid="addon-install-failed"],
-.popup-notification-icon[popupid="addon-install-confirmation"],
+.popup-notification-icon[popupid="addon-install-blocked"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-blocked.svg);
+}
+
+.popup-notification-icon[popupid="addon-progress"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-downloading.svg);
+}
+
+.popup-notification-icon[popupid="addon-install-failed"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-error.svg);
+}
+
+.popup-notification-icon[popupid="addon-install-confirmation"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-confirm.svg);
+}
+
+#addon-install-confirmation-notification[warning] .popup-notification-icon[popupid="addon-install-confirmation"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-warning.svg);
+}
+
 .popup-notification-icon[popupid="addon-install-complete"] {
-  list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png);
-  width: 32px;
-  height: 32px;
+  list-style-image: url(chrome://browser/skin/addons/addon-install-installed.svg);
+}
+
+.popup-notification-icon[popupid="addon-install-restart"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-restart.svg);
 }
 
 .popup-notification-icon[popupid="click-to-play-plugins"] {
@@ -128,7 +146,15 @@
 }
 
 #addons-notification-icon {
-  list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.png);
+  list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default);
+}
+
+#addons-notification-icon:hover {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#hover);
+}
+
+#addons-notification-icon:hover:active {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#active);
 }
 
 .indexedDB-notification-icon,
@@ -140,6 +166,12 @@
   list-style-image: url(chrome://mozapps/skin/passwordmgr/key-16.png);
 }
 
+#login-fill-notification-icon {
+  /* Temporary icon until the capture and fill doorhangers are unified. */
+  list-style-image: url(chrome://mozapps/skin/passwordmgr/key-16.png);
+  transform: scaleX(-1);
+}
+
 .webapps-notification-icon,
 #webapps-notification-icon {
   list-style-image: url(chrome://global/skin/icons/webapps-16.png);
@@ -307,10 +339,7 @@
     list-style-image: url(chrome://global/skin/icons/question-32.png);
   }
 
-  #addons-notification-icon {
-    list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png);
-  }
-
+  #login-fill-notification-icon,
   #password-notification-icon {
     list-style-image: url(chrome://mozapps/skin/passwordmgr/key-16@2x.png);
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/reader/readerMode.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/reader/readerMode.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/reader/readerMode.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/reader/readerMode.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,34 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- x="0"
- y="0"
- width="48"
- height="16"
- viewBox="0 0 48 16">
-<defs>
-  <path id="glyphShape-readerMode-book" d="M5.5,5h-2C3.2,5,3,5.2,3,5.5S3.2,6,3.5,6h2 C5.8,6,6,5.8,6,5.5S5.8,5,5.5,5z M5.5,7h-2C3.2,7,3,7.2,3,7.5S3.2,8,3.5,8h2C5.8,8,6,7.8,6,7.5S5.8,7,5.5,7z M5.5,9h-2 C3.2,9,3,9.2,3,9.5S3.2,10,3.5,10h2C5.8,10,6,9.8,6,9.5S5.8,9,5.5,9z M15.4,2c0,0-3.1,0-4.4,0S8.1,2.5,8,4.3C7.9,2.5,6.3,2,5,2 S0.6,2,0.6,2C0.3,2,0,2.3,0,2.7v9.6C0,12.6,0.3,13,0.6,13c0,0,2.6,0,4.4,0c1.6,0,2.8,1,3,2.3C8.2,14,9.4,13,11,13 c1.8,0,4.4,0,4.4,0c0.4,0,0.6-0.4,0.6-0.8V2.7C16,2.3,15.7,2,15.4,2z M14,11L14,11c-0.2,0-1.6,0-3,0c-1.6,0-2.9,0.8-3,2.2 C7.9,11.8,6.6,11,5,11c-1.4,0-2.8,0-3,0l0,0l0,0V4c0,0,2.7,0,3.5,0C6.6,4,8,5.5,8,6.8C8,5.5,9.4,4,10.5,4C11.3,4,14,4,14,4V11 L14,11z"/>
-  <linearGradient id="gradient-state-default" x1="0%" y1="0%" x2="0" y2="100%">
-    <stop stop-color="#989898" offset="0%"/>
-    <stop stop-color="#808080" offset="100%"/>
-  </linearGradient>
-  <linearGradient id="gradient-state-hover" x1="0%" y1="0%" x2="0" y2="100%">
-    <stop stop-color="#24aef4" offset="0%"/>
-    <stop stop-color="#177bdb" offset="100%"/>
-  </linearGradient>
-  <linearGradient id="gradient-state-pressed" x1="0%" y1="0%" x2="0" y2="100%">
-    <stop stop-color="#ff9300" offset="0%"/>
-    <stop stop-color="#ff5500" offset="100%"/>
-  </linearGradient>
-  <style type="text/css">
-    .icon-state-default { fill: url(#gradient-state-default); }
-    .icon-state-hover   { fill: url(#gradient-state-hover); }
-    .icon-state-pressed { fill: url(#gradient-state-pressed); }
-  </style>
-</defs>
-<use xlink:href="#glyphShape-readerMode-book" class="icon-state-default"/>
-<use xlink:href="#glyphShape-readerMode-book" class="icon-state-hover"    transform="translate(16)"/>
-<use xlink:href="#glyphShape-readerMode-book" class="icon-state-pressed"  transform="translate(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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="16" viewBox="0 0 48 16">
+  <defs>
+    <path id="glyphShape-readerMode-book" d="M5.5,5h-2C3.2,5,3,5.2,3,5.5S3.2,6,3.5,6h2 C5.8,6,6,5.8,6,5.5S5.8,5,5.5,5z M5.5,7h-2C3.2,7,3,7.2,3,7.5S3.2,8,3.5,8h2C5.8,8,6,7.8,6,7.5S5.8,7,5.5,7z M5.5,9h-2 C3.2,9,3,9.2,3,9.5S3.2,10,3.5,10h2C5.8,10,6,9.8,6,9.5S5.8,9,5.5,9z M15.4,2c0,0-3.1,0-4.4,0S8.1,2.5,8,4.3C7.9,2.5,6.3,2,5,2 S0.6,2,0.6,2C0.3,2,0,2.3,0,2.7v9.6C0,12.6,0.3,13,0.6,13c0,0,2.6,0,4.4,0c1.6,0,2.8,1,3,2.3C8.2,14,9.4,13,11,13 c1.8,0,4.4,0,4.4,0c0.4,0,0.6-0.4,0.6-0.8V2.7C16,2.3,15.7,2,15.4,2z M14,11L14,11c-0.2,0-1.6,0-3,0c-1.6,0-2.9,0.8-3,2.2 C7.9,11.8,6.6,11,5,11c-1.4,0-2.8,0-3,0l0,0l0,0V4c0,0,2.7,0,3.5,0C6.6,4,8,5.5,8,6.8C8,5.5,9.4,4,10.5,4C11.3,4,14,4,14,4V11 L14,11z"/>
+    <linearGradient id="gradient-state-default" x1="0%" y1="0%" x2="0" y2="100%">
+      <stop stop-color="#989898" offset="0%"/>
+      <stop stop-color="#808080" offset="100%"/>
+    </linearGradient>
+    <linearGradient id="gradient-state-hover" x1="0%" y1="0%" x2="0" y2="100%">
+      <stop stop-color="#24aef4" offset="0%"/>
+      <stop stop-color="#177bdb" offset="100%"/>
+    </linearGradient>
+    <linearGradient id="gradient-state-pressed" x1="0%" y1="0%" x2="0" y2="100%">
+      <stop stop-color="#ff9300" offset="0%"/>
+      <stop stop-color="#ff5500" offset="100%"/>
+    </linearGradient>
+    <style>
+      .icon-state-default { fill: url(#gradient-state-default); }
+      .icon-state-hover   { fill: url(#gradient-state-hover); }
+      .icon-state-pressed { fill: url(#gradient-state-pressed); }
+    </style>
+  </defs>
+  <use xlink:href="#glyphShape-readerMode-book" class="icon-state-default"/>
+  <use xlink:href="#glyphShape-readerMode-book" class="icon-state-hover" transform="translate(16)"/>
+  <use xlink:href="#glyphShape-readerMode-book" class="icon-state-pressed" transform="translate(32)"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/readinglist/icons.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/readinglist/icons.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/readinglist/icons.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/readinglist/icons.svg	2015-05-25 20:43:04.000000000 +0000
@@ -2,55 +2,42 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     viewBox="0 0 14 14"
-     xml:space="preserve">
-
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 14 14">
   <defs>
-    <style type="text/css">
+    <style>
       use:not(:target) {
         display: none;
       }
-
       #addpage, #alreadyadded {
         fill: #808080;
       }
       #addpage-hover, #alreadyadded-hover {
-        fill: #555555;
+        fill: #555;
       }
       #addpage-active, #alreadyadded-active {
-        fill: #0095DD;
+        fill: #0095dd;
       }
     </style>
-
     <mask id="plus-mask">
-      <rect width="100%" height="100%" fill="white"/>
+      <rect width="100%" height="100%" fill="#fff"/>
       <rect x="3" y="6" width="8" height="2"/>
       <rect x="6" y="3" width="2" height="8"/>
     </mask>
-
     <mask id="minus-mask">
-      <rect width="100%" height="100%" fill="white"/>
+      <rect width="100%" height="100%" fill="#fff"/>
       <rect x="3" y="6" width="8" height="2"/>
     </mask>
-
     <g id="addpage-shape">
       <circle cx="7" cy="7" r="6" mask="url(#plus-mask)"/>
     </g>
-
     <g id="removepage-shape">
       <circle cx="7" cy="7" r="6" mask="url(#minus-mask)"/>
     </g>
-
   </defs>
-
-  <use id="addpage"                 xlink:href="#addpage-shape"/>
-  <use id="addpage-hover"           xlink:href="#addpage-shape"/>
-  <use id="addpage-active"          xlink:href="#addpage-shape"/>
-
-  <use id="alreadyadded"            xlink:href="#removepage-shape"/>
-  <use id="alreadyadded-hover"      xlink:href="#removepage-shape"/>
-  <use id="alreadyadded-active"     xlink:href="#removepage-shape"/>
-
+  <use id="addpage" xlink:href="#addpage-shape"/>
+  <use id="addpage-hover" xlink:href="#addpage-shape"/>
+  <use id="addpage-active" xlink:href="#addpage-shape"/>
+  <use id="alreadyadded" xlink:href="#removepage-shape"/>
+  <use id="alreadyadded-hover" xlink:href="#removepage-shape"/>
+  <use id="alreadyadded-active" xlink:href="#removepage-shape"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/readinglist/readinglist-icon.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/readinglist/readinglist-icon.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/readinglist/readinglist-icon.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/readinglist/readinglist-icon.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16">
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
   <rect x="4.8" y="6.4" fill="#808080" width="11.2" height="3.2"/>
   <rect x="4.8" y="11.2" fill="#808080" width="11.2" height="3.2"/>
   <rect x="4.8" y="1.6" fill="#808080" width="11.2" height="3.2"/>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/search/history-icon.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/search/history-icon.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/search/history-icon.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/search/history-icon.svg	2015-05-25 20:43:04.000000000 +0000
@@ -2,31 +2,21 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     x="0"
-     y="0"
-     width="16"
-     height="16"
-     viewBox="0 0 16 16">
-<style type="text/css">
-
-use:not(:target) {
-  display: none;
-}
-
-use {
-  fill: graytext;
-}
-
-use[id$="-active"] {
-  fill: HighlightText;
-}
-
-</style>
-<defs style="display:none">
-  <path id="search-history-glyph" d="M8,1C4.1,1,1,4.1,1,8c0,3.9,3.1,7,7,7c3.9,0,7-3.1,7-7 C15,4.1,11.9,1,8,1z M8,13.3c-2.9,0-5.3-2.4-5.3-5.3S5.1,2.7,8,2.7c2.9,0,5.3,2.4,5.3,5.3S10.9,13.3,8,13.3z M10.5,7H9V5 c0-0.6-0.4-1-1-1S7,4.4,7,5v3c0,0.6,0.4,1,1,1h2.5c0.6,0,1-0.4,1-1C11.5,7.4,11.1,7,10.5,7z"/>
-</defs>
-<use id="search-history-icon" xlink:href="#search-history-glyph"/>
-<use id="search-history-icon-active" xlink:href="#search-history-glyph"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: graytext;
+    }
+    use[id$="-active"] {
+      fill: HighlightText;
+    }
+  </style>
+  <defs>
+    <path id="search-history-glyph" d="M8,1C4.1,1,1,4.1,1,8c0,3.9,3.1,7,7,7c3.9,0,7-3.1,7-7 C15,4.1,11.9,1,8,1z M8,13.3c-2.9,0-5.3-2.4-5.3-5.3S5.1,2.7,8,2.7c2.9,0,5.3,2.4,5.3,5.3S10.9,13.3,8,13.3z M10.5,7H9V5 c0-0.6-0.4-1-1-1S7,4.4,7,5v3c0,0.6,0.4,1,1,1h2.5c0.6,0,1-0.4,1-1C11.5,7.4,11.1,7,10.5,7z"/>
+  </defs>
+  <use id="search-history-icon" xlink:href="#search-history-glyph"/>
+  <use id="search-history-icon-active" xlink:href="#search-history-glyph"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/social/chat-icons.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/social/chat-icons.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/social/chat-icons.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/social/chat-icons.svg	2015-05-25 20:43:04.000000000 +0000
@@ -2,44 +2,34 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     x="0px" y="0px"
-     viewBox="-3 -3 16 16"
-     enable-background="new 0 0 16 16"
-     xml:space="preserve">
-<style>
-use:not(:target) {
-  display: none;
-}
-
-use {
-  fill: #c1c1c1;
-}
-
-use[id$="-active"] {
-  fill: #c1c1c1;
-}
-
-use[id$="-disabled"] {
-  fill: #c1c1c1;
-}
-</style>
-<defs>
-  <polygon id="close-shape" fill-rule="evenodd" clip-rule="evenodd" points="10,1.717 8.336,0.049 5.024,3.369 1.663,0 0,1.668
-    3.36,5.037 0.098,8.307 1.762,9.975 5.025,6.705 8.311,10 9.975,8.332 6.688,5.037"/>
-  <path id="dropdown-shape" fill-rule="evenodd" clip-rule="evenodd" d="M9,3L4.984,7L1,3H9z"/>
-  <polygon id="expand-shape" fill-rule="evenodd" clip-rule="evenodd" points="10,0 4.838,0 6.506,1.669 0,8.175 1.825,10 8.331,3.494
-    10,5.162"/>
-  <rect id="minimize-shape" y="3.6" fill-rule="evenodd" clip-rule="evenodd" width="10" height="2.8"/>
-</defs>
-<use id="close"               xlink:href="#close-shape"/>
-<use id="close-active"        xlink:href="#close-shape"/>
-<use id="close-disabled"      xlink:href="#close-shape"/>
-<use id="expand"              xlink:href="#expand-shape"/>
-<use id="expand-active"       xlink:href="#expand-shape"/>
-<use id="expand-disabled"     xlink:href="#expand-shape"/>
-<use id="minimize"            xlink:href="#minimize-shape"/>
-<use id="minimize-active"     xlink:href="#minimize-shape"/>
-<use id="minimize-disabled"   xlink:href="#minimize-shape"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-3 -3 16 16">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: #c1c1c1;
+    }
+    use[id$="-active"] {
+      fill: #c1c1c1;
+    }
+    use[id$="-disabled"] {
+      fill: #c1c1c1;
+    }
+  </style>
+  <defs>
+    <polygon id="close-shape" points="10,1.717 8.336,0.049 5.024,3.369 1.663,0 0,1.668 3.36,5.037 0.098,8.307 1.762,9.975 5.025,6.705 8.311,10 9.975,8.332 6.688,5.037"/>
+    <path id="dropdown-shape" fill-rule="evenodd" d="M9,3L4.984,7L1,3H9z"/>
+    <polygon id="expand-shape" points="10,0 4.838,0 6.506,1.669 0,8.175 1.825,10 8.331,3.494 10,5.162"/>
+    <rect id="minimize-shape" y="3.6" width="10" height="2.8"/>
+  </defs>
+  <use id="close" xlink:href="#close-shape"/>
+  <use id="close-active" xlink:href="#close-shape"/>
+  <use id="close-disabled" xlink:href="#close-shape"/>
+  <use id="expand" xlink:href="#expand-shape"/>
+  <use id="expand-active" xlink:href="#expand-shape"/>
+  <use id="expand-disabled" xlink:href="#expand-shape"/>
+  <use id="minimize" xlink:href="#minimize-shape"/>
+  <use id="minimize-active" xlink:href="#minimize-shape"/>
+  <use id="minimize-disabled" xlink:href="#minimize-shape"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/tabbrowser/crashed.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/tabbrowser/crashed.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/tabbrowser/crashed.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/tabbrowser/crashed.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     viewBox="22 22 16 16">
-  <linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="30" y1="23" x2="30" y2="37">
-    <stop offset="0" style="stop-color: #e63b2e"/>
-    <stop offset="1" style="stop-color: #c33931"/>
-  </linearGradient>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="22 22 16 16">
+  <defs>
+    <linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="30" y1="23" x2="30" y2="37">
+      <stop offset="0" style="stop-color: #e63b2e"/>
+      <stop offset="1" style="stop-color: #c33931"/>
+    </linearGradient>
+  </defs>
   <circle fill="url(#gradient)" cx="30" cy="30" r="7"/>
   <path fill="#fff" d="M31.03,33.304c0,0.6-0.479,1.092-1.091,1.092c-0.6,0-1.079-0.492-1.079-1.092 c0-0.588,0.479-1.079,1.079-1.079C30.551,32.225,31.03,32.716,31.03,33.304z M29.171,31.133l-0.24-5.253h2.015l-0.24,5.253H29.171z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/tab-selected.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/tab-selected.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/tab-selected.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/tab-selected.svg	2015-05-25 20:43:04.000000000 +0000
@@ -1,18 +1,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/. -->
-
-<svg version="1.1"
-     xmlns="http://www.w3.org/2000/svg"
-     xmlns:svg="http://www.w3.org/2000/svg"
-     width="30px"
-     height="31px"
-     preserveAspectRatio="none">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" width="30px" height="31px" preserveAspectRatio="none">
   <defs>
-    <style><![CDATA[
-
+    <style>
 %filter substitution
-
 %ifdef XP_MACOSX
 %include ../osx/shared.inc
 %elif defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
@@ -20,7 +12,6 @@
 %else
 %include ../windows/windowsShared.inc
 %endif
-
       #tab-background-fill {
         background-color: @fgTabBackgroundColor@;
         background-image: @fgTabTexture@;
@@ -28,7 +19,6 @@
         height: 100%;
         width: 100%;
       }
-
 %ifdef XP_WIN
       @media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
              (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
@@ -37,10 +27,8 @@
         }
       }
 %endif
-    ]]></style>
-
+    </style>
 %include ../../base/content/tab-shape.inc.svg
-
   </defs>
   <foreignObject width="30" height="31" clip-path="url(#tab-curve-clip-path-@TAB_SIDE@)">
     <div id="tab-background-fill" xmlns="http://www.w3.org/1999/xhtml"></div>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/update-badge.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/update-badge.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/shared/update-badge.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/shared/update-badge.svg	2015-05-25 20:43:04.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/. -->
 <svg xmlns="http://www.w3.org/2000/svg" width="10px" height="10px">
   <polygon points="4,9 4,5 2,5 5,1 8,5 6,5 6,9" fill="#fff"/>
-</svg>
\ No newline at end of file
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/windows/browser.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/windows/browser.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/windows/browser.css	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/windows/browser.css	2015-05-25 20:43:05.000000000 +0000
@@ -2153,10 +2153,10 @@
 
 %include ../shared/notification-icons.inc.css
 
-.popup-notification-description[popupid="addon-progress"],
-.popup-notification-description[popupid="addon-install-confirmation"] {
-  width: 27em;
-  max-width: 27em;
+.popup-notification-body[popupid="addon-progress"],
+.popup-notification-body[popupid="addon-install-confirmation"] {
+  width: 28em;
+  max-width: 28em;
 }
 
 .addon-install-confirmation-name {
@@ -2172,10 +2172,6 @@
   outline: 1px dotted -moz-DialogText;
 }
 
-#pointerLock-cancel {
-  margin: 0px;
-}
-
 /* Translation infobar */
 
 %include ../shared/translation/infobar.inc.css
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/windows/content-contextmenu.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/windows/content-contextmenu.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/windows/content-contextmenu.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/windows/content-contextmenu.svg	2015-05-25 20:43:05.000000000 +0000
@@ -2,72 +2,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/. -->
-<svg 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">
-<style>
-use:not(:target) {
-  display: none;
-}
-
-use {
-  fill: menutext;
-}
-
-use[id$="-active"] {
-  fill: -moz-menuhovertext;
-}
-
-use[id$="-disabled"] {
-  fill: graytext;
-}
-</style>
-<defs style="display:none">
-  <path id="back-shape" fill-rule="evenodd" clip-rule="evenodd" d="M1.192,8.893L2.21,9.964c0.064,0.065,0.136,0.117,0.214,0.159
-    l5.199,5.301c0.607,0.63,1.465,0.764,1.915,0.297l1.02-1.082c0.449-0.467,0.32-1.357-0.288-1.99l-2.116-2.158h5.705
-    c0.671,0,1.215-0.544,1.215-1.215v-2.43c0-0.671-0.544-1.215-1.215-1.215H8.094l2.271-2.309c0.609-0.626,0.737-1.512,0.288-1.974
-    L9.635,0.278C9.184-0.188,8.327-0.055,7.718,0.575L2.479,5.901C2.38,5.946,2.289,6.008,2.21,6.089L1.192,7.171
-    c-0.21,0.219-0.293,0.53-0.26,0.864C0.899,8.367,0.981,8.676,1.192,8.893z"/>
-  <path id="forward-shape" fill-rule="evenodd" clip-rule="evenodd" d="M14.808,7.107L13.79,6.036c-0.064-0.065-0.136-0.117-0.214-0.159
-    L8.377,0.576C7.77-0.054,6.912-0.189,6.461,0.278L5.441,1.36c-0.449,0.467-0.32,1.357,0.288,1.99l2.116,2.158H2.14
-    c-0.671,0-1.215,0.544-1.215,1.215v2.43c0,0.671,0.544,1.215,1.215,1.215h5.765l-2.271,2.309c-0.609,0.626-0.737,1.512-0.288,1.974
-    l1.019,1.072c0.451,0.465,1.308,0.332,1.917-0.297l5.238-5.326c0.1-0.045,0.191-0.107,0.269-0.188l1.019-1.082
-    c0.21-0.219,0.293-0.53,0.26-0.864C15.101,7.633,15.019,7.324,14.808,7.107z"/>
-  <path id="reload-shape" fill-rule="evenodd" clip-rule="evenodd" d="M15.429,8h-8l3.207-3.207C9.889,4.265,8.986,3.947,8,3.947
-    c-2.554,0-4.625,2.071-4.625,4.625S5.446,13.196,8,13.196c1.638,0,3.069-0.857,3.891-2.141l2.576,1.104
-    C13.199,14.439,10.794,16,8,16c-4.103,0-7.429-3.326-7.429-7.429S3.897,1.143,8,1.143c1.762,0,3.366,0.624,4.631,1.654L15.429,0V8z"/>
-  <polygon id="stop-shape" fill-rule="evenodd" clip-rule="evenodd" points="16,2.748 13.338,0.079 8.038,5.391 2.661,0 0,2.669
-    5.377,8.059 0.157,13.292 2.819,15.961 8.039,10.728 13.298,16 15.959,13.331 10.701,8.06"/>
-  <path id="bookmark-shape" d="M8.008,3.632l0.986,2.012l0.452,0.922l1.014,0.169l2.326,0.389l-1.719,1.799l-0.676,0.708l0.145,0.967
-    L10.896,13l-1.959-1.039l-0.937-0.497l-0.937,0.497l-1.957,1.038L5.468,10.6l0.146-0.968L4.937,8.924L3.219,7.126l2.351-0.39
-    l1.023-0.17l0.45-0.934L8.008,3.632 M8,0C7.72,0,7.44,0.217,7.228,0.65L5.242,4.766L0.907,5.485c-0.958,0.159-1.195,0.861-0.53,1.56
-    l3.113,3.258l-0.69,4.583c-0.105,0.689,0.172,1.092,0.658,1.092c0.185,0,0.399-0.058,0.635-0.181l3.906-2.072l3.906,2.072
-    c0.236,0.123,0.45,0.181,0.635,0.181c0.486,0,0.762-0.403,0.659-1.092l-0.687-4.583l3.109-3.255c0.666-0.702,0.428-1.404-0.53-1.564
-    l-4.303-0.719L8.772,0.65C8.56,0.217,8.28,0,8,0L8,0z"/>
-  <path id="bookmarked-shape" d="M8,0C7.719,0,7.438,0.217,7.225,0.651L5.233,4.773l-4.35,0.72c-0.961,0.159-1.199,0.862-0.531,1.562
-    l3.124,3.262l-0.692,4.589C2.679,15.596,2.957,16,3.444,16c0.185,0,0.401-0.058,0.637-0.181L8,13.744l3.919,2.075
-    C12.156,15.942,12.372,16,12.557,16c0.487,0,0.764-0.404,0.661-1.094l-0.69-4.589l3.12-3.259c0.668-0.703,0.43-1.406-0.532-1.566
-    l-4.317-0.72L8.775,0.651C8.562,0.217,8.281,0,8,0L8,0z"/>
-</defs>
-<use id="back"                xlink:href="#back-shape"/>
-<use id="back-active"         xlink:href="#back-shape"/>
-<use id="back-disabled"       xlink:href="#back-shape"/>
-<use id="forward"             xlink:href="#forward-shape"/>
-<use id="forward-active"      xlink:href="#forward-shape"/>
-<use id="forward-disabled"    xlink:href="#forward-shape"/>
-<use id="reload"              xlink:href="#reload-shape"/>
-<use id="reload-active"       xlink:href="#reload-shape"/>
-<use id="reload-disabled"     xlink:href="#reload-shape"/>
-<use id="stop"                xlink:href="#stop-shape"/>
-<use id="stop-active"         xlink:href="#stop-shape"/>
-<use id="stop-disabled"       xlink:href="#stop-shape"/>
-<use id="bookmark"            xlink:href="#bookmark-shape"/>
-<use id="bookmark-active"     xlink:href="#bookmark-shape"/>
-<use id="bookmark-disabled"   xlink:href="#bookmark-shape"/>
-<use id="bookmarked"          xlink:href="#bookmarked-shape"/>
-<use id="bookmarked-active"   xlink:href="#bookmarked-shape"/>
-<use id="bookmarked-disabled" xlink:href="#bookmarked-shape"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: menutext;
+    }
+    use[id$="-active"] {
+      fill: -moz-menuhovertext;
+    }
+    use[id$="-disabled"] {
+      fill: graytext;
+    }
+  </style>
+  <defs>
+    <path id="back-shape" fill-rule="evenodd" d="M1.192,8.893L2.21,9.964c0.064,0.065,0.136,0.117,0.214,0.159 l5.199,5.301c0.607,0.63,1.465,0.764,1.915,0.297l1.02-1.082c0.449-0.467,0.32-1.357-0.288-1.99l-2.116-2.158h5.705 c0.671,0,1.215-0.544,1.215-1.215v-2.43c0-0.671-0.544-1.215-1.215-1.215H8.094l2.271-2.309c0.609-0.626,0.737-1.512,0.288-1.974 L9.635,0.278C9.184-0.188,8.327-0.055,7.718,0.575L2.479,5.901C2.38,5.946,2.289,6.008,2.21,6.089L1.192,7.171 c-0.21,0.219-0.293,0.53-0.26,0.864C0.899,8.367,0.981,8.676,1.192,8.893z"/>
+    <path id="forward-shape" fill-rule="evenodd" d="M14.808,7.107L13.79,6.036c-0.064-0.065-0.136-0.117-0.214-0.159 L8.377,0.576C7.77-0.054,6.912-0.189,6.461,0.278L5.441,1.36c-0.449,0.467-0.32,1.357,0.288,1.99l2.116,2.158H2.14 c-0.671,0-1.215,0.544-1.215,1.215v2.43c0,0.671,0.544,1.215,1.215,1.215h5.765l-2.271,2.309c-0.609,0.626-0.737,1.512-0.288,1.974 l1.019,1.072c0.451,0.465,1.308,0.332,1.917-0.297l5.238-5.326c0.1-0.045,0.191-0.107,0.269-0.188l1.019-1.082 c0.21-0.219,0.293-0.53,0.26-0.864C15.101,7.633,15.019,7.324,14.808,7.107z"/>
+    <path id="reload-shape" fill-rule="evenodd" d="M15.429,8h-8l3.207-3.207C9.889,4.265,8.986,3.947,8,3.947 c-2.554,0-4.625,2.071-4.625,4.625S5.446,13.196,8,13.196c1.638,0,3.069-0.857,3.891-2.141l2.576,1.104 C13.199,14.439,10.794,16,8,16c-4.103,0-7.429-3.326-7.429-7.429S3.897,1.143,8,1.143c1.762,0,3.366,0.624,4.631,1.654L15.429,0V8z"/>
+    <polygon id="stop-shape" points="16,2.748 13.338,0.079 8.038,5.391 2.661,0 0,2.669 5.377,8.059 0.157,13.292 2.819,15.961 8.039,10.728 13.298,16 15.959,13.331 10.701,8.06"/>
+    <path id="bookmark-shape" d="M8.008,3.632l0.986,2.012l0.452,0.922l1.014,0.169l2.326,0.389l-1.719,1.799l-0.676,0.708l0.145,0.967 L10.896,13l-1.959-1.039l-0.937-0.497l-0.937,0.497l-1.957,1.038L5.468,10.6l0.146-0.968L4.937,8.924L3.219,7.126l2.351-0.39 l1.023-0.17l0.45-0.934L8.008,3.632 M8,0C7.72,0,7.44,0.217,7.228,0.65L5.242,4.766L0.907,5.485c-0.958,0.159-1.195,0.861-0.53,1.56 l3.113,3.258l-0.69,4.583c-0.105,0.689,0.172,1.092,0.658,1.092c0.185,0,0.399-0.058,0.635-0.181l3.906-2.072l3.906,2.072 c0.236,0.123,0.45,0.181,0.635,0.181c0.486,0,0.762-0.403,0.659-1.092l-0.687-4.583l3.109-3.255c0.666-0.702,0.428-1.404-0.53-1.564 l-4.303-0.719L8.772,0.65C8.56,0.217,8.28,0,8,0L8,0z"/>
+    <path id="bookmarked-shape" d="M8,0C7.719,0,7.438,0.217,7.225,0.651L5.233,4.773l-4.35,0.72c-0.961,0.159-1.199,0.862-0.531,1.562 l3.124,3.262l-0.692,4.589C2.679,15.596,2.957,16,3.444,16c0.185,0,0.401-0.058,0.637-0.181L8,13.744l3.919,2.075 C12.156,15.942,12.372,16,12.557,16c0.487,0,0.764-0.404,0.661-1.094l-0.69-4.589l3.12-3.259c0.668-0.703,0.43-1.406-0.532-1.566 l-4.317-0.72L8.775,0.651C8.562,0.217,8.281,0,8,0L8,0z"/>
+  </defs>
+  <use id="back" xlink:href="#back-shape"/>
+  <use id="back-active" xlink:href="#back-shape"/>
+  <use id="back-disabled" xlink:href="#back-shape"/>
+  <use id="forward" xlink:href="#forward-shape"/>
+  <use id="forward-active" xlink:href="#forward-shape"/>
+  <use id="forward-disabled" xlink:href="#forward-shape"/>
+  <use id="reload" xlink:href="#reload-shape"/>
+  <use id="reload-active" xlink:href="#reload-shape"/>
+  <use id="reload-disabled" xlink:href="#reload-shape"/>
+  <use id="stop" xlink:href="#stop-shape"/>
+  <use id="stop-active" xlink:href="#stop-shape"/>
+  <use id="stop-disabled" xlink:href="#stop-shape"/>
+  <use id="bookmark" xlink:href="#bookmark-shape"/>
+  <use id="bookmark-active" xlink:href="#bookmark-shape"/>
+  <use id="bookmark-disabled" xlink:href="#bookmark-shape"/>
+  <use id="bookmarked" xlink:href="#bookmarked-shape"/>
+  <use id="bookmarked-active" xlink:href="#bookmarked-shape"/>
+  <use id="bookmarked-disabled" xlink:href="#bookmarked-shape"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/windows/customizableui/menu-arrow.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/windows/customizableui/menu-arrow.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/windows/customizableui/menu-arrow.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/windows/customizableui/menu-arrow.svg	2015-05-25 20:43:05.000000000 +0000
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     x="0"
-     y="0"
-     height="16"
-     width="16"
-     viewBox="0 0 16 16">
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="16" width="16" viewBox="0 0 16 16">
   <style>
     use:not(:target) {
       display: none;
@@ -20,7 +17,7 @@
       fill: HighlightText;
     }
   </style>
-  <defs style="display: none;">
+  <defs>
     <path id="arrow-shape" d="m 6,4 0,8 5,-4 z"/>
   </defs>
   <use id="arrow" xlink:href="#arrow-shape"/>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/windows/devedition.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/windows/devedition.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/windows/devedition.css	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/windows/devedition.css	2015-05-25 20:43:05.000000000 +0000
@@ -10,6 +10,27 @@
   --chrome-nav-bar-separator-color: rgba(10, 31, 51, 0.35);
 }
 
+/* The window background is white due to no accentcolor in the lightweight
+   theme. It can't be changed to transparent when there is no compositor
+   (Win XP or 7 in classic / basic theme), or else dragging and focus become
+   broken. So instead just show the normal titlebar in that case, and override
+   the window color as transparent when the compositor is available. */
+@media not all and (-moz-windows-compositor) {
+  #main-window[tabsintitlebar] #titlebar:-moz-lwtheme {
+    visibility: visible;
+  }
+
+  #main-window {
+    background: var(--chrome-background-color) !important;
+  }
+}
+
+@media (-moz-windows-compositor) {
+  #main-window {
+    background: transparent !important;
+  }
+}
+
 #TabsToolbar::after {
   display: none;
 }
@@ -26,6 +47,20 @@
   box-shadow: none !important;
 }
 
+
+/* Force 1x image for back/forward button for now, otherwise it breaks the
+   layout - Bug 1165360. */
+@media (min-resolution: 1.1dppx) {
+  #back-button,
+  #forward-button {
+    list-style-image: url("chrome://browser/skin/Toolbar.png");
+  }
+  /* The back button region is already set in devedition.inc.css */
+  #forward-button {
+    -moz-image-region: rect(0px, 72px, 18px, 54px);
+  }
+}
+
 #forward-button > .toolbarbutton-icon {
   -moz-border-start: none !important;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/windows/devtools/profiler.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/windows/devtools/profiler.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/windows/devtools/profiler.css	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/windows/devtools/profiler.css	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/. */
-
-%include ../../shared/devtools/profiler.inc.css
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/windows/devtools/timeline.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/windows/devtools/timeline.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/windows/devtools/timeline.css	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/windows/devtools/timeline.css	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/. */
-
-%include ../../shared/devtools/timeline.inc.css
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/windows/jar.mn firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/windows/jar.mn
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/windows/jar.mn	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/windows/jar.mn	2015-05-25 20:43:05.000000000 +0000
@@ -22,6 +22,14 @@
 #endif
         skin/classic/browser/aboutTabCrashed.css                     (../shared/aboutTabCrashed.css)
         skin/classic/browser/actionicon-tab.png
+        skin/classic/browser/addons/addon-install-blocked.svg        (../shared/addons/addon-install-blocked.svg)
+        skin/classic/browser/addons/addon-install-confirm.svg        (../shared/addons/addon-install-confirm.svg)
+        skin/classic/browser/addons/addon-install-downloading.svg    (../shared/addons/addon-install-downloading.svg)
+        skin/classic/browser/addons/addon-install-error.svg          (../shared/addons/addon-install-error.svg)
+        skin/classic/browser/addons/addon-install-installed.svg      (../shared/addons/addon-install-installed.svg)
+        skin/classic/browser/addons/addon-install-restart.svg        (../shared/addons/addon-install-restart.svg)
+        skin/classic/browser/addons/addon-install-warning.svg        (../shared/addons/addon-install-warning.svg)
+        skin/classic/browser/addons/addon-install-anchor.svg         (../shared/addons/addon-install-anchor.svg)
 *       skin/classic/browser/browser.css
 *       skin/classic/browser/devedition.css
 *       skin/classic/browser/browser-lightweightTheme.css
@@ -187,6 +195,7 @@
         skin/classic/browser/feeds/subscribe-ui.css                  (feeds/subscribe-ui.css)
 *       skin/classic/browser/newtab/newTab.css                       (newtab/newTab.css)
         skin/classic/browser/newtab/controls.svg                     (../shared/newtab/controls.svg)
+        skin/classic/browser/newtab/whimsycorn.png                   (../shared/newtab/whimsycorn.png)
         skin/classic/browser/panic-panel/header.png                  (../shared/panic-panel/header.png)
         skin/classic/browser/panic-panel/header-small.png            (../shared/panic-panel/header-small.png)
         skin/classic/browser/panic-panel/icons.png                   (../shared/panic-panel/icons.png)
@@ -365,9 +374,7 @@
 *       skin/classic/browser/devtools/canvasdebugger.css            (devtools/canvasdebugger.css)
 *       skin/classic/browser/devtools/debugger.css                  (devtools/debugger.css)
 *       skin/classic/browser/devtools/netmonitor.css                (devtools/netmonitor.css)
-*       skin/classic/browser/devtools/profiler.css                  (devtools/profiler.css)
 *       skin/classic/browser/devtools/performance.css               (devtools/performance.css)
-*       skin/classic/browser/devtools/timeline.css                  (devtools/timeline.css)
         skin/classic/browser/devtools/timeline-filter.svg           (../shared/devtools/images/timeline-filter.svg)
 *       skin/classic/browser/devtools/scratchpad.css                (devtools/scratchpad.css)
 *       skin/classic/browser/devtools/shadereditor.css              (devtools/shadereditor.css)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/windows/keyhole-forward-mask.svg firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/windows/keyhole-forward-mask.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/windows/keyhole-forward-mask.svg	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/windows/keyhole-forward-mask.svg	2015-05-25 20:43:05.000000000 +0000
@@ -2,14 +2,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/. -->
-
 <svg xmlns="http://www.w3.org/2000/svg">
   <mask id="mask" maskContentUnits="objectBoundingBox">
-    <rect x="0" y="0" width="1" height="1" fill="white"/>
+    <rect x="0" y="0" width="1" height="1" fill="#fff"/>
     <circle cx="-0.46" cy="0.5" r="0.63"/>
   </mask>
   <mask id="mask-hover" maskContentUnits="objectBoundingBox">
-    <rect x="0" y="0" width="1" height="1" fill="white"/>
+    <rect x="0" y="0" width="1" height="1" fill="#fff"/>
     <circle cx="-0.35" cy="0.5" r="0.58"/>
   </mask>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/windows/preferences/aboutPermissions.css firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/windows/preferences/aboutPermissions.css
--- firefox-trunk-41.0~a1~hg20150513r243603/browser/themes/windows/preferences/aboutPermissions.css	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/browser/themes/windows/preferences/aboutPermissions.css	2015-05-25 20:43:05.000000000 +0000
@@ -2,13 +2,16 @@
  * License, v. 2.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 url("chrome://global/skin/inContentUI.css");
+@import url("chrome://global/skin/in-content/common.css");
 
+#permissions-content {
+  padding-top: 48px;
+  -moz-padding-end: 0; /* no padding to move the scroll bar to the edge */
+}
 
 /* sites box */
 
 #sites-box {
-  padding: 10px;
   width: 25em;
 }
 
@@ -17,9 +20,6 @@
 }
 
 #sites-list {
-  -moz-appearance: none;
-  border: 1px solid rgba(0, 0, 0, 0.32);
-  background-color: rgba(255, 255, 255, 0.4);
   margin: 5px 0 0 0;
 }
 
@@ -42,13 +42,17 @@
 /* permissions box */
 
 #permissions-box {
-  padding-top: 10px;
+  -moz-padding-start: 10px;
+}
+
+#permissions-list {
   overflow-y: auto;
+  padding-top: 5px;
+  -moz-padding-end: 44px;
 }
 
 #site-description {
   font-size: 125%;
-  -moz-margin-start: 6px; /* to match button margin */
 }
 
 #site-label {
@@ -57,10 +61,22 @@
   margin-bottom: 0;
 }
 
+#site-visit-count {
+  margin-bottom: 0;
+}
+
 #defaults-description {
   font-size: 125%;
   font-weight: bold;
-  -moz-margin-start: 6px;
+}
+
+#header-deck {
+  -moz-margin-end: 44px;
+}
+
+#site-header,
+#defaults-header {
+  margin-bottom: 1px;
 }
 
 .pref-item {
@@ -112,12 +128,16 @@
 
 .pref-title {
   font-size: 125%;
+  -moz-margin-start: 4px;
   margin-bottom: 0;
   font-weight: bold;
 }
 
 .pref-menulist {
-  margin-left: 6px;
-  margin-right: 6px;
-  min-width: 10em; /* native menulists ellipsize their longest entries by default on many themes */
+  min-width: 10em;
+ }
+
+#cookies-label,
+#passwords-label {
+  -moz-margin-start: 4px; /* align with the menulists */
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/build/autoconf/android.m4 firefox-trunk-41.0~a1~hg20150524r245419/build/autoconf/android.m4
--- firefox-trunk-41.0~a1~hg20150513r243603/build/autoconf/android.m4	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/build/autoconf/android.m4	2015-05-25 20:43:05.000000000 +0000
@@ -133,17 +133,6 @@
         AC_MSG_ERROR([not found. Please check your NDK. With the current configuration, it should be in $android_platform])
     fi
 
-    dnl Old NDK support. If minimum requirement is changed to NDK r8b,
-    dnl please remove this.
-    case "$target_cpu" in
-    i?86)
-        if ! test -e "$android_toolchain"/bin/"$android_tool_prefix"-gcc; then
-            dnl Old NDK toolchain name
-            android_tool_prefix="i686-android-linux"
-        fi
-        ;;
-    esac
-
     dnl set up compilers
     TOOLCHAIN_PREFIX="$android_toolchain/bin/$android_tool_prefix-"
     AS="$android_toolchain"/bin/"$android_tool_prefix"-as
@@ -223,18 +212,14 @@
 
     if test -z "$STLPORT_CPPFLAGS$STLPORT_LIBS"; then
         if test -n "$MOZ_ANDROID_LIBSTDCXX" ; then
-            if test -e "$android_ndk/sources/cxx-stl/gnu-libstdc++/$android_gnu_compiler_version/libs/$ANDROID_CPU_ARCH/libgnustl_static.a"; then
-                # android-ndk-r8b
-                STLPORT_LIBS="-L$android_ndk/sources/cxx-stl/gnu-libstdc++/$android_gnu_compiler_version/libs/$ANDROID_CPU_ARCH/ -lgnustl_static"
-                STLPORT_CPPFLAGS="-I$android_ndk/sources/cxx-stl/gnu-libstdc++/$android_gnu_compiler_version/include -I$android_ndk/sources/cxx-stl/gnu-libstdc++/$android_gnu_compiler_version/libs/$ANDROID_CPU_ARCH/include -I$android_ndk/sources/cxx-stl/gnu-libstdc++/$android_gnu_compiler_version/include/backward"
-            elif test -e "$android_ndk/sources/cxx-stl/gnu-libstdc++/libs/$ANDROID_CPU_ARCH/libgnustl_static.a"; then
-                # android-ndk-r7, android-ndk-r7b, android-ndk-r8
-                STLPORT_LIBS="-L$android_ndk/sources/cxx-stl/gnu-libstdc++/libs/$ANDROID_CPU_ARCH/ -lgnustl_static"
-                STLPORT_CPPFLAGS="-I$android_ndk/sources/cxx-stl/gnu-libstdc++/include -I$android_ndk/sources/cxx-stl/gnu-libstdc++/libs/$ANDROID_CPU_ARCH/include"
-            elif test -e "$android_ndk/sources/cxx-stl/gnu-libstdc++/libs/$ANDROID_CPU_ARCH/libstdc++.a"; then
-                # android-ndk-r5c, android-ndk-r6, android-ndk-r6b
-                STLPORT_CPPFLAGS="-I$android_ndk/sources/cxx-stl/gnu-libstdc++/include -I$android_ndk/sources/cxx-stl/gnu-libstdc++/libs/$ANDROID_CPU_ARCH/include"
-                STLPORT_LIBS="-L$android_ndk/sources/cxx-stl/gnu-libstdc++/libs/$ANDROID_CPU_ARCH/ -lstdc++"
+            # android-ndk-r8b and later
+            ndk_base="$android_ndk/sources/cxx-stl/gnu-libstdc++/$android_gnu_compiler_version"
+            ndk_libs="$ndk_base/libs/$ANDROID_CPU_ARCH"
+            ndk_include="$ndk_base/include"
+
+            if test -e "$ndk_libs/libgnustl_static.a"; then
+                STLPORT_LIBS="-L$ndk_libs -lgnustl_static"
+                STLPORT_CPPFLAGS="-I$ndk_include -I$ndk_include/backward -I$ndk_libs/include"
             else
                 AC_MSG_ERROR([Couldn't find path to gnu-libstdc++ in the android ndk])
             fi
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/build/autoconf/icu.m4 firefox-trunk-41.0~a1~hg20150524r245419/build/autoconf/icu.m4
--- firefox-trunk-41.0~a1~hg20150513r243603/build/autoconf/icu.m4	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/build/autoconf/icu.m4	2015-05-25 20:43:05.000000000 +0000
@@ -19,7 +19,7 @@
 if test -n "$MOZ_NATIVE_ICU"; then
     PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
     MOZ_SHARED_ICU=1
-elif test -n "$gonkdir" -a "$ANDROID_VERSION" -ge 17; then
+elif test -n "$gonkdir" && test "$ANDROID_VERSION" -ge 17; then
     dnl Use system's ICU since version is 50.1+.
     if test -d "$gonkdir/external/icu/icu4c/source"; then
         dnl gonk-L (API version is 21)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/build/clang-plugin/clang-plugin.cpp firefox-trunk-41.0~a1~hg20150524r245419/build/clang-plugin/clang-plugin.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/build/clang-plugin/clang-plugin.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/build/clang-plugin/clang-plugin.cpp	2015-05-25 20:43:06.000000000 +0000
@@ -690,11 +690,19 @@
       )).bind("node"),
     &nanExprChecker);
 
+  // First, look for direct parents of the MemberExpr.
   astMatcher.addMatcher(callExpr(callee(functionDecl(hasNoAddRefReleaseOnReturnAttr()).bind("func")),
                                  hasParent(memberExpr(isAddRefOrRelease(),
                                                       hasParent(callExpr())).bind("member")
       )).bind("node"),
     &noAddRefReleaseOnReturnChecker);
+  // Then, look for MemberExpr that need to be casted to the right type using
+  // an intermediary CastExpr before we get to the CallExpr.
+  astMatcher.addMatcher(callExpr(callee(functionDecl(hasNoAddRefReleaseOnReturnAttr()).bind("func")),
+                                 hasParent(castExpr(hasParent(memberExpr(isAddRefOrRelease(),
+                                                                         hasParent(callExpr())).bind("member"))))
+      ).bind("node"),
+    &noAddRefReleaseOnReturnChecker);
 
   astMatcher.addMatcher(lambdaExpr(
             hasDescendant(declRefExpr(hasType(pointerType(pointee(isRefCounted())))).bind("node"))
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/build/clang-plugin/tests/TestNoAddRefReleaseOnReturn.cpp firefox-trunk-41.0~a1~hg20150524r245419/build/clang-plugin/tests/TestNoAddRefReleaseOnReturn.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/build/clang-plugin/tests/TestNoAddRefReleaseOnReturn.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/build/clang-plugin/tests/TestNoAddRefReleaseOnReturn.cpp	2015-05-25 20:43:06.000000000 +0000
@@ -6,12 +6,20 @@
   void foo();
 };
 
+struct TestD : Test {};
+
 struct S {
   Test* f() MOZ_NO_ADDREF_RELEASE_ON_RETURN;
   Test& g() MOZ_NO_ADDREF_RELEASE_ON_RETURN;
   Test  h() MOZ_NO_ADDREF_RELEASE_ON_RETURN;
 };
 
+struct SD {
+  TestD* f() MOZ_NO_ADDREF_RELEASE_ON_RETURN;
+  TestD& g() MOZ_NO_ADDREF_RELEASE_ON_RETURN;
+  TestD  h() MOZ_NO_ADDREF_RELEASE_ON_RETURN;
+};
+
 template<class T>
 struct X {
   T* f() MOZ_NO_ADDREF_RELEASE_ON_RETURN;
@@ -28,6 +36,10 @@
 Test& g() MOZ_NO_ADDREF_RELEASE_ON_RETURN;
 Test  h() MOZ_NO_ADDREF_RELEASE_ON_RETURN;
 
+TestD* fd() MOZ_NO_ADDREF_RELEASE_ON_RETURN;
+TestD& gd() MOZ_NO_ADDREF_RELEASE_ON_RETURN;
+TestD  hd() MOZ_NO_ADDREF_RELEASE_ON_RETURN;
+
 void test() {
   S s;
   s.f()->AddRef(); // expected-error{{'AddRef' cannot be called on the return value of 'f'}}
@@ -39,6 +51,16 @@
   s.h().AddRef(); // expected-error{{'AddRef' cannot be called on the return value of 'h'}}
   s.h().Release(); // expected-error{{'Release' cannot be called on the return value of 'h'}}
   s.h().foo();
+  SD sd;
+  sd.f()->AddRef(); // expected-error{{'AddRef' cannot be called on the return value of 'f'}}
+  sd.f()->Release(); // expected-error{{'Release' cannot be called on the return value of 'f'}}
+  sd.f()->foo();
+  sd.g().AddRef(); // expected-error{{'AddRef' cannot be called on the return value of 'g'}}
+  sd.g().Release(); // expected-error{{'Release' cannot be called on the return value of 'g'}}
+  sd.g().foo();
+  sd.h().AddRef(); // expected-error{{'AddRef' cannot be called on the return value of 'h'}}
+  sd.h().Release(); // expected-error{{'Release' cannot be called on the return value of 'h'}}
+  sd.h().foo();
   X<Test> x;
   x.f()->AddRef(); // expected-error{{'AddRef' cannot be called on the return value of 'f'}}
   x.f()->Release(); // expected-error{{'Release' cannot be called on the return value of 'f'}}
@@ -49,10 +71,24 @@
   x.h().AddRef(); // expected-error{{'AddRef' cannot be called on the return value of 'h'}}
   x.h().Release(); // expected-error{{'Release' cannot be called on the return value of 'h'}}
   x.h().foo();
+  X<TestD> xd;
+  xd.f()->AddRef(); // expected-error{{'AddRef' cannot be called on the return value of 'f'}}
+  xd.f()->Release(); // expected-error{{'Release' cannot be called on the return value of 'f'}}
+  xd.f()->foo();
+  xd.g().AddRef(); // expected-error{{'AddRef' cannot be called on the return value of 'g'}}
+  xd.g().Release(); // expected-error{{'Release' cannot be called on the return value of 'g'}}
+  xd.g().foo();
+  xd.h().AddRef(); // expected-error{{'AddRef' cannot be called on the return value of 'h'}}
+  xd.h().Release(); // expected-error{{'Release' cannot be called on the return value of 'h'}}
+  xd.h().foo();
   SP<Test> sp;
   sp->AddRef(); // expected-error{{'AddRef' cannot be called on the return value of 'operator->'}}
   sp->Release(); // expected-error{{'Release' cannot be called on the return value of 'operator->'}}
   sp->foo();
+  SP<TestD> spd;
+  spd->AddRef(); // expected-error{{'AddRef' cannot be called on the return value of 'operator->'}}
+  spd->Release(); // expected-error{{'Release' cannot be called on the return value of 'operator->'}}
+  spd->foo();
   f()->AddRef(); // expected-error{{'AddRef' cannot be called on the return value of 'f'}}
   f()->Release(); // expected-error{{'Release' cannot be called on the return value of 'f'}}
   f()->foo();
@@ -62,4 +98,13 @@
   h().AddRef(); // expected-error{{'AddRef' cannot be called on the return value of 'h'}}
   h().Release(); // expected-error{{'Release' cannot be called on the return value of 'h'}}
   h().foo();
+  fd()->AddRef(); // expected-error{{'AddRef' cannot be called on the return value of 'fd'}}
+  fd()->Release(); // expected-error{{'Release' cannot be called on the return value of 'fd'}}
+  fd()->foo();
+  gd().AddRef(); // expected-error{{'AddRef' cannot be called on the return value of 'gd'}}
+  gd().Release(); // expected-error{{'Release' cannot be called on the return value of 'gd'}}
+  gd().foo();
+  hd().AddRef(); // expected-error{{'AddRef' cannot be called on the return value of 'hd'}}
+  hd().Release(); // expected-error{{'Release' cannot be called on the return value of 'hd'}}
+  hd().foo();
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/build/gen_mach_buildprops.py firefox-trunk-41.0~a1~hg20150524r245419/build/gen_mach_buildprops.py
--- firefox-trunk-41.0~a1~hg20150513r243603/build/gen_mach_buildprops.py	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/build/gen_mach_buildprops.py	2015-05-25 20:43:06.000000000 +0000
@@ -40,7 +40,7 @@
         '%sMarHash' % martype: mar_hash,
     }
 
-def getUrlProperties(filename):
+def getUrlProperties(filename, package):
     # let's create a switch case using name-spaces/dict
     # rather than a long if/else with duplicate code
     property_conditions = [
@@ -56,10 +56,10 @@
         ('partialMarUrl', lambda m: m.endswith('.mar') and '.partial.' in m),
         ('codeCoverageURL', lambda m: m.endswith('code-coverage-gcno.zip')),
         ('sdkUrl', lambda m: m.endswith(('sdk.tar.bz2', 'sdk.zip'))),
-        # packageUrl must be last!
-        ('packageUrl', lambda m: True),
+        ('testPackagesUrl', lambda m: m.endswith('test_packages.json')),
+        ('packageUrl', lambda m: m.endswith(package)),
     ]
-    url_re = re.compile(r'''^(https?://.*?\.(?:tar\.bz2|dmg|zip|apk|rpm|mar|tar\.gz))$''')
+    url_re = re.compile(r'''^(https?://.*?\.(?:tar\.bz2|dmg|zip|apk|rpm|mar|tar\.gz|json))$''')
     properties = {}
 
     try:
@@ -100,10 +100,13 @@
     parser.add_argument("--upload-files", required=True, nargs="+",
                         action="store", dest="upload_files",
                         help="List of files to be uploaded.")
+    parser.add_argument("--package", required=True,
+                        action="store", dest="package",
+                        help="Filename of the build package")
     args = parser.parse_args()
 
     json_data = getMarProperties(args.complete_mar_file)
-    json_data.update(getUrlProperties(args.upload_output))
+    json_data.update(getUrlProperties(args.upload_output, args.package))
     if args.partial_mar_file:
         json_data.update(getMarProperties(args.partial_mar_file, partial=True))
 
@@ -117,6 +120,7 @@
             json_data['partialInfo'] = getPartialInfo(json_data)
 
     json_data['uploadFiles'] = args.upload_files
+    json_data['packageFilename'] = args.package
 
     with open('mach_build_properties.json', 'w') as outfile:
         json.dump(json_data, outfile, indent=4)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/build/gen_test_packages_manifest.py firefox-trunk-41.0~a1~hg20150524r245419/build/gen_test_packages_manifest.py
--- firefox-trunk-41.0~a1~hg20150513r243603/build/gen_test_packages_manifest.py	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/build/gen_test_packages_manifest.py	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,63 @@
+#!/usr/bin/python
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import json
+
+from argparse import ArgumentParser
+
+ALL_HARNESSES = [
+    'common', # Harnesses without a specific package will look here.
+    'mochitest',
+    'reftest',
+    'webapprt',
+    'xpcshell',
+    'cppunittest',
+    'jittest',
+    'mozbase',
+]
+
+PACKAGE_SPECIFIED_HARNESSES = [
+]
+
+
+def parse_args():
+    parser = ArgumentParser(description='Generate a test_packages.json file to tell automation which harnesses require which test packages.')
+    parser.add_argument("--common", required=True,
+                        action="store", dest="tests_common",
+                        help="Name of the \"common\" archive, a package to be used by all harnesses.")
+    parser.add_argument("--jsshell", required=True,
+                        action="store", dest="jsshell",
+                        help="Name of the jsshell zip.")
+    for harness in PACKAGE_SPECIFIED_HARNESSES:
+        parser.add_argument("--%s" % harness, required=True,
+                            action="store", dest=harness,
+                            help="Name of the %s zip." % harness)
+    parser.add_argument("--dest-file", required=True,
+                        action="store", dest="destfile",
+                        help="Path to the output file to be written.")
+    return parser.parse_args()
+
+def generate_package_data(args):
+    # Generate a dictionary mapping test harness names (exactly as they're known to
+    # mozharness and testsuite-targets.mk, ideally) to the set of archive names that
+    # harness depends on to run.
+    # mozharness will use this file to determine what test zips to download,
+    # which will be an optimization once parts of the main zip are split to harness
+    # specific zips.
+    tests_common = args.tests_common
+    jsshell = args.jsshell
+
+    harness_requirements = dict([(k, [tests_common]) for k in ALL_HARNESSES])
+    harness_requirements['jittest'].append(jsshell)
+    for harness in PACKAGE_SPECIFIED_HARNESSES:
+        harness_requirements[harness].append(getattr(args, harness))
+    return harness_requirements
+
+if __name__ == '__main__':
+    args = parse_args()
+    packages_data = generate_package_data(args)
+    with open(args.destfile, 'w') as of:
+        json.dump(packages_data, of, indent=4)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/build/mach_bootstrap.py firefox-trunk-41.0~a1~hg20150524r245419/build/mach_bootstrap.py
--- firefox-trunk-41.0~a1~hg20150513r243603/build/mach_bootstrap.py	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/build/mach_bootstrap.py	2015-05-25 20:43:06.000000000 +0000
@@ -37,6 +37,7 @@
     'python/which',
     'python/pystache',
     'python/pyyaml/lib',
+    'build',
     'build/pymake',
     'config',
     'dom/bindings',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/build/mobile/b2gautomation.py firefox-trunk-41.0~a1~hg20150524r245419/build/mobile/b2gautomation.py
--- firefox-trunk-41.0~a1~hg20150513r243603/build/mobile/b2gautomation.py	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/build/mobile/b2gautomation.py	2015-05-25 20:43:06.000000000 +0000
@@ -276,9 +276,24 @@
         if 'b2g' not in session:
             raise Exception("bad session value %s returned by start_session" % session)
 
-        if self.context_chrome:
-            self.marionette.set_context(self.marionette.CONTEXT_CHROME)
-        else:
+        self.marionette.set_context(self.marionette.CONTEXT_CHROME)
+        self.marionette.execute_script("""
+            let SECURITY_PREF = "security.turn_off_all_security_so_that_viruses_can_take_over_this_computer";
+            Components.utils.import("resource://gre/modules/Services.jsm");
+            Services.prefs.setBoolPref(SECURITY_PREF, true);
+
+            if (!testUtils.hasOwnProperty("specialPowersObserver")) {
+              let loader = Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
+                .getService(Components.interfaces.mozIJSSubScriptLoader);
+              loader.loadSubScript("chrome://specialpowers/content/SpecialPowersObserver.js",
+                testUtils);
+              testUtils.specialPowersObserver = new testUtils.SpecialPowersObserver();
+              testUtils.specialPowersObserver.init();
+              testUtils.specialPowersObserver._loadFrameScript();
+            }
+            """)
+
+        if not self.context_chrome:
             self.marionette.set_context(self.marionette.CONTEXT_CONTENT)
 
         # run the script that starts the tests
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/build/moz-automation.mk firefox-trunk-41.0~a1~hg20150524r245419/build/moz-automation.mk
--- firefox-trunk-41.0~a1~hg20150513r243603/build/moz-automation.mk	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/build/moz-automation.mk	2015-05-25 20:43:06.000000000 +0000
@@ -99,7 +99,7 @@
 automation/update-packaging: automation/pretty-update-packaging
 
 automation/build: $(addprefix automation/,$(MOZ_AUTOMATION_TIERS))
-	$(PYTHON) $(topsrcdir)/build/gen_mach_buildprops.py --complete-mar-file $(DIST)/$(COMPLETE_MAR) $(addprefix --partial-mar-file ,$(wildcard $(DIST)/$(PARTIAL_MAR))) --upload-output $(AUTOMATION_UPLOAD_OUTPUT) --upload-files $(abspath $(UPLOAD_FILES))
+	$(PYTHON) $(topsrcdir)/build/gen_mach_buildprops.py --complete-mar-file $(DIST)/$(COMPLETE_MAR) $(addprefix --partial-mar-file ,$(wildcard $(DIST)/$(PARTIAL_MAR))) --upload-output $(AUTOMATION_UPLOAD_OUTPUT) --upload-files $(abspath $(UPLOAD_FILES)) --package $(PACKAGE)
 
 # We need the log from make upload to grep it for urls in order to set
 # properties.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/caps/BasePrincipal.cpp firefox-trunk-41.0~a1~hg20150524r245419/caps/BasePrincipal.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/caps/BasePrincipal.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/caps/BasePrincipal.cpp	2015-05-25 20:43:09.000000000 +0000
@@ -0,0 +1,259 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 sw=2 et tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozilla/BasePrincipal.h"
+
+#include "nsIContentSecurityPolicy.h"
+#include "nsIObjectInputStream.h"
+#include "nsIObjectOutputStream.h"
+
+#include "nsPrincipal.h"
+#include "nsNetUtil.h"
+#include "nsNullPrincipal.h"
+#include "nsScriptSecurityManager.h"
+
+#include "mozilla/dom/CSPDictionariesBinding.h"
+#include "mozilla/dom/ToJSValue.h"
+
+namespace mozilla {
+
+void
+OriginAttributes::CreateSuffix(nsACString& aStr)
+{
+  aStr.Truncate();
+  MOZ_RELEASE_ASSERT(mAppId != nsIScriptSecurityManager::UNKNOWN_APP_ID);
+  int attrCount = 0;
+
+  if (mAppId != nsIScriptSecurityManager::NO_APP_ID) {
+    aStr.Append(attrCount++ ? "&appId=" : "!appId=");
+    aStr.AppendInt(mAppId);
+  }
+
+  if (mInBrowser) {
+    aStr.Append(attrCount++ ? "&inBrowser=1" : "!inBrowser=1");
+  }
+}
+
+void
+OriginAttributes::Serialize(nsIObjectOutputStream* aStream) const
+{
+  aStream->Write32(mAppId);
+  aStream->WriteBoolean(mInBrowser);
+}
+
+nsresult
+OriginAttributes::Deserialize(nsIObjectInputStream* aStream)
+{
+  nsresult rv = aStream->Read32(&mAppId);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = aStream->ReadBoolean(&mInBrowser);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+BasePrincipal::GetOrigin(nsACString& aOrigin)
+{
+  nsresult rv = GetOriginInternal(aOrigin);
+  NS_ENSURE_SUCCESS(rv, rv);
+  nsAutoCString suffix;
+  mOriginAttributes.CreateSuffix(suffix);
+  aOrigin.Append(suffix);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+BasePrincipal::GetOriginNoSuffix(nsACString& aOrigin)
+{
+  return GetOriginInternal(aOrigin);
+}
+
+bool
+BasePrincipal::Subsumes(nsIPrincipal* aOther, DocumentDomainConsideration aConsideration)
+{
+  MOZ_RELEASE_ASSERT(aOther, "The caller is performing a nonsensical security check!");
+  return SubsumesInternal(aOther, aConsideration);
+}
+
+NS_IMETHODIMP
+BasePrincipal::Equals(nsIPrincipal *aOther, bool *aResult)
+{
+
+  *aResult = Subsumes(aOther, DontConsiderDocumentDomain) &&
+             Cast(aOther)->Subsumes(this, DontConsiderDocumentDomain);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+BasePrincipal::EqualsConsideringDomain(nsIPrincipal *aOther, bool *aResult)
+{
+  *aResult = Subsumes(aOther, ConsiderDocumentDomain) &&
+             Cast(aOther)->Subsumes(this, ConsiderDocumentDomain);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+BasePrincipal::Subsumes(nsIPrincipal *aOther, bool *aResult)
+{
+  *aResult = Subsumes(aOther, DontConsiderDocumentDomain);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+BasePrincipal::SubsumesConsideringDomain(nsIPrincipal *aOther, bool *aResult)
+{
+  *aResult = Subsumes(aOther, ConsiderDocumentDomain);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+BasePrincipal::GetCsp(nsIContentSecurityPolicy** aCsp)
+{
+  NS_IF_ADDREF(*aCsp = mCSP);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+BasePrincipal::SetCsp(nsIContentSecurityPolicy* aCsp)
+{
+  // If CSP was already set, it should not be destroyed!  Instead, it should
+  // get set anew when a new principal is created.
+  if (mCSP)
+    return NS_ERROR_ALREADY_INITIALIZED;
+
+  mCSP = aCsp;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+BasePrincipal::GetCspJSON(nsAString& outCSPinJSON)
+{
+  outCSPinJSON.Truncate();
+  dom::CSPPolicies jsonPolicies;
+
+  if (!mCSP) {
+    jsonPolicies.ToJSON(outCSPinJSON);
+    return NS_OK;
+  }
+  return mCSP->ToJSON(outCSPinJSON);
+}
+
+NS_IMETHODIMP
+BasePrincipal::GetIsNullPrincipal(bool* aIsNullPrincipal)
+{
+  *aIsNullPrincipal = false;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+BasePrincipal::GetJarPrefix(nsACString& aJarPrefix)
+{
+  MOZ_ASSERT(AppId() != nsIScriptSecurityManager::UNKNOWN_APP_ID);
+
+  mozilla::GetJarPrefix(AppId(), IsInBrowserElement(), aJarPrefix);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+BasePrincipal::GetOriginAttributes(JSContext* aCx, JS::MutableHandle<JS::Value> aVal)
+{
+  if (NS_WARN_IF(!ToJSValue(aCx, mOriginAttributes, aVal))) {
+    return NS_ERROR_FAILURE;
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+BasePrincipal::GetOriginSuffix(nsACString& aOriginAttributes)
+{
+  mOriginAttributes.CreateSuffix(aOriginAttributes);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+BasePrincipal::GetCookieJar(nsACString& aCookieJar)
+{
+  // We just forward to .jarPrefix for now, which is a nice compact
+  // stringification of the (appId, inBrowser) tuple. This will eventaully be
+  // swapped out for an origin attribute - see the comment in nsIPrincipal.idl.
+  return GetJarPrefix(aCookieJar);
+}
+
+NS_IMETHODIMP
+BasePrincipal::GetAppStatus(uint16_t* aAppStatus)
+{
+  if (AppId() == nsIScriptSecurityManager::UNKNOWN_APP_ID) {
+    NS_WARNING("Asking for app status on a principal with an unknown app id");
+    *aAppStatus = nsIPrincipal::APP_STATUS_NOT_INSTALLED;
+    return NS_OK;
+  }
+
+  *aAppStatus = nsScriptSecurityManager::AppStatusForPrincipal(this);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+BasePrincipal::GetAppId(uint32_t* aAppId)
+{
+  if (AppId() == nsIScriptSecurityManager::UNKNOWN_APP_ID) {
+    MOZ_ASSERT(false);
+    *aAppId = nsIScriptSecurityManager::NO_APP_ID;
+    return NS_OK;
+  }
+
+  *aAppId = AppId();
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+BasePrincipal::GetIsInBrowserElement(bool* aIsInBrowserElement)
+{
+  *aIsInBrowserElement = IsInBrowserElement();
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+BasePrincipal::GetUnknownAppId(bool* aUnknownAppId)
+{
+  *aUnknownAppId = AppId() == nsIScriptSecurityManager::UNKNOWN_APP_ID;
+  return NS_OK;
+}
+
+already_AddRefed<BasePrincipal>
+BasePrincipal::CreateCodebasePrincipal(nsIURI* aURI, OriginAttributes& aAttrs)
+{
+  // If the URI is supposed to inherit the security context of whoever loads it,
+  // we shouldn't make a codebase principal for it.
+  bool inheritsPrincipal;
+  nsresult rv = NS_URIChainHasFlags(aURI, nsIProtocolHandler::URI_INHERITS_SECURITY_CONTEXT,
+                                    &inheritsPrincipal);
+  nsCOMPtr<nsIPrincipal> principal;
+  if (NS_FAILED(rv) || inheritsPrincipal) {
+    return nsNullPrincipal::Create();
+  }
+
+  // Check whether the URI knows what its principal is supposed to be.
+  nsCOMPtr<nsIURIWithPrincipal> uriPrinc = do_QueryInterface(aURI);
+  if (uriPrinc) {
+    nsCOMPtr<nsIPrincipal> principal;
+    uriPrinc->GetPrincipal(getter_AddRefs(principal));
+    if (!principal) {
+      return nsNullPrincipal::Create();
+    }
+    nsRefPtr<BasePrincipal> concrete = Cast(principal);
+    return concrete.forget();
+  }
+
+  // Mint a codebase principal.
+  nsRefPtr<nsPrincipal> codebase = new nsPrincipal();
+  rv = codebase->Init(aURI, aAttrs);
+  NS_ENSURE_SUCCESS(rv, nullptr);
+  return codebase.forget();
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/caps/BasePrincipal.h firefox-trunk-41.0~a1~hg20150524r245419/caps/BasePrincipal.h
--- firefox-trunk-41.0~a1~hg20150513r243603/caps/BasePrincipal.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/caps/BasePrincipal.h	2015-05-25 20:43:09.000000000 +0000
@@ -0,0 +1,105 @@
+/* -*- 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_BasePrincipal_h
+#define mozilla_BasePrincipal_h
+
+#include "nsIPrincipal.h"
+#include "nsIScriptSecurityManager.h"
+#include "nsJSPrincipals.h"
+
+#include "mozilla/dom/SystemDictionariesBinding.h"
+
+class nsIObjectOutputStream;
+class nsIObjectInputStream;
+
+namespace mozilla {
+
+class OriginAttributes : public dom::OriginAttributesDictionary
+{
+public:
+  OriginAttributes() {}
+  OriginAttributes(uint32_t aAppId, bool aInBrowser)
+  {
+    mAppId = aAppId;
+    mInBrowser = aInBrowser;
+  }
+
+  bool operator==(const OriginAttributes& aOther) const
+  {
+    return mAppId == aOther.mAppId &&
+           mInBrowser == aOther.mInBrowser;
+  }
+  bool operator!=(const OriginAttributes& aOther) const
+  {
+    return !(*this == aOther);
+  }
+
+  // Serializes non-default values into the suffix format, i.e.
+  // |!key1=value1&key2=value2|. If there are no non-default attributes, this
+  // returns an empty string.
+  void CreateSuffix(nsACString& aStr);
+
+  void Serialize(nsIObjectOutputStream* aStream) const;
+  nsresult Deserialize(nsIObjectInputStream* aStream);
+};
+
+/*
+ * Base class from which all nsIPrincipal implementations inherit. Use this for
+ * default implementations and other commonalities between principal
+ * implementations.
+ *
+ * We should merge nsJSPrincipals into this class at some point.
+ */
+class BasePrincipal : public nsJSPrincipals
+{
+public:
+  BasePrincipal() {}
+
+  enum DocumentDomainConsideration { DontConsiderDocumentDomain, ConsiderDocumentDomain};
+  bool Subsumes(nsIPrincipal* aOther, DocumentDomainConsideration aConsideration);
+
+  NS_IMETHOD GetOrigin(nsACString& aOrigin) final;
+  NS_IMETHOD GetOriginNoSuffix(nsACString& aOrigin) final;
+  NS_IMETHOD Equals(nsIPrincipal* other, bool* _retval) final;
+  NS_IMETHOD EqualsConsideringDomain(nsIPrincipal* other, bool* _retval) final;
+  NS_IMETHOD Subsumes(nsIPrincipal* other, bool* _retval) final;
+  NS_IMETHOD SubsumesConsideringDomain(nsIPrincipal* other, bool* _retval) final;
+  NS_IMETHOD GetCsp(nsIContentSecurityPolicy** aCsp) override;
+  NS_IMETHOD SetCsp(nsIContentSecurityPolicy* aCsp) override;
+  NS_IMETHOD GetCspJSON(nsAString& outCSPinJSON) override;
+  NS_IMETHOD GetIsNullPrincipal(bool* aIsNullPrincipal) override;
+  NS_IMETHOD GetJarPrefix(nsACString& aJarPrefix) final;
+  NS_IMETHOD GetOriginAttributes(JSContext* aCx, JS::MutableHandle<JS::Value> aVal) final;
+  NS_IMETHOD GetOriginSuffix(nsACString& aOriginSuffix) final;
+  NS_IMETHOD GetCookieJar(nsACString& aCookieJar) final;
+  NS_IMETHOD GetAppStatus(uint16_t* aAppStatus) final;
+  NS_IMETHOD GetAppId(uint32_t* aAppStatus) final;
+  NS_IMETHOD GetIsInBrowserElement(bool* aIsInBrowserElement) final;
+  NS_IMETHOD GetUnknownAppId(bool* aUnknownAppId) final;
+
+  virtual bool IsOnCSSUnprefixingWhitelist() override { return false; }
+
+  static BasePrincipal* Cast(nsIPrincipal* aPrin) { return static_cast<BasePrincipal*>(aPrin); }
+  static already_AddRefed<BasePrincipal> CreateCodebasePrincipal(nsIURI* aURI, OriginAttributes& aAttrs);
+
+  const OriginAttributes& OriginAttributesRef() { return mOriginAttributes; }
+  uint32_t AppId() const { return mOriginAttributes.mAppId; }
+  bool IsInBrowserElement() const { return mOriginAttributes.mInBrowser; }
+
+protected:
+  virtual ~BasePrincipal() {}
+
+  virtual nsresult GetOriginInternal(nsACString& aOrigin) = 0;
+  virtual bool SubsumesInternal(nsIPrincipal* aOther, DocumentDomainConsideration aConsider) = 0;
+
+  nsCOMPtr<nsIContentSecurityPolicy> mCSP;
+  OriginAttributes mOriginAttributes;
+};
+
+} // namespace mozilla
+
+#endif /* mozilla_BasePrincipal_h */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/caps/moz.build firefox-trunk-41.0~a1~hg20150524r245419/caps/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/caps/moz.build	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/caps/moz.build	2015-05-25 20:43:09.000000000 +0000
@@ -6,6 +6,8 @@
 
 TEST_DIRS += ['tests/mochitest']
 
+XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
+
 XPIDL_SOURCES += [
     'nsIDomainPolicy.idl',
     'nsIPrincipal.idl',
@@ -20,7 +22,12 @@
     'nsNullPrincipalURI.h',
 ]
 
+EXPORTS.mozilla = [
+    'BasePrincipal.h'
+]
+
 UNIFIED_SOURCES += [
+    'BasePrincipal.cpp',
     'DomainPolicy.cpp',
     'nsJSPrincipals.cpp',
     'nsNullPrincipal.cpp',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/caps/nsIPrincipal.idl firefox-trunk-41.0~a1~hg20150524r245419/caps/nsIPrincipal.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/caps/nsIPrincipal.idl	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/caps/nsIPrincipal.idl	2015-05-25 20:43:09.000000000 +0000
@@ -20,7 +20,7 @@
 [ptr] native JSPrincipals(JSPrincipals);
 [ptr] native PrincipalArray(nsTArray<nsCOMPtr<nsIPrincipal> >);
 
-[scriptable, builtinclass, uuid(264fe8ca-c382-11e4-95a6-782bcbaebb28)]
+[scriptable, builtinclass, uuid(49c2faf0-b6de-4640-8d0f-e0217baa8627)]
 interface nsIPrincipal : nsISerializable
 {
     /**
@@ -66,15 +66,6 @@
     [noscript] attribute nsIURI domain;
 
     /**
-     * The origin of this principal's codebase URI.
-     * An origin is defined as: scheme + host + port.
-     */
-    // XXXcaa this should probably be turned into an nsIURI.
-    // The system principal's origin should be some caps namespace
-    // with a chrome URI.  All of chrome should probably be the same.
-    readonly attribute string origin;
-
-    /**
      * Returns whether the other principal is equal to or weaker than this
      * principal. Principals are equal if they are the same object or they
      * have the same origin.
@@ -143,6 +134,13 @@
     [noscript] attribute nsIContentSecurityPolicy csp;
 
     /**
+     * The CSP of the principal in JSON notation.
+     * Note, that the CSP itself is not exposed to JS, but script
+     * should be able to obtain a JSON representation of the CSP.
+     */
+    readonly attribute AString cspJSON;
+
+    /**
      * Returns the jar prefix of the principal.
      * The jar prefix is a string that can be used to isolate data or
      * permissions between different principals while taking into account
@@ -158,6 +156,79 @@
     readonly attribute AUTF8String jarPrefix;
 
     /**
+     * A dictionary of the non-default origin attributes associated with this
+     * nsIPrincipal.
+     *
+     * Attributes are tokens that are taken into account when determining whether
+     * two principals are same-origin - if any attributes differ, the principals
+     * are cross-origin, even if the scheme, host, and port are the same.
+     * Attributes should also be considered for all security and bucketing decisions,
+     * even those which make non-standard comparisons (like cookies, which ignore
+     * scheme, or quotas, which ignore subdomains).
+     *
+     * If you're looking for an easy-to-use canonical stringification of the origin
+     * attributes, see |originSuffix| below.
+     */
+    [implicit_jscontext]
+    readonly attribute jsval originAttributes;
+
+    /**
+     * A canonical representation of the origin for this principal. This
+     * consists of a base string (which, for codebase principals, is of the
+     * format scheme://host:port), concatenated with |originAttributes| (see
+     * below).
+     *
+     * We maintain the invariant that principalA.equals(principalB) if and only
+     * if principalA.origin == principalB.origin.
+     */
+    readonly attribute ACString origin;
+
+    /**
+     * The base part of |origin| without the concatenation with |originSuffix|.
+     * This doesn't have the important invariants described above with |origin|,
+     * and as such should only be used for legacy situations.
+     */
+    readonly attribute ACString originNoSuffix;
+
+    /**
+     * A string of the form !key1=value1&key2=value2, where each pair represents
+     * an attribute with a non-default value. If all attributes have default
+     * values, this is the empty string.
+     *
+     * The value of .originSuffix is automatically serialized into .origin, so any
+     * consumers using that are automatically origin-attribute-aware. Consumers with
+     * special requirements must inspect and compare .originSuffix manually.
+     *
+     * originsuffix are intended to be a replacement for jarPrefix, which will
+     * eventually be removed.
+     */
+    readonly attribute AUTF8String originSuffix;
+
+    /**
+     * Opaque string token representing the "cookie jar" associated with this
+     * principal. Cookie jars are intended to be a tag associated with persistent
+     * data (like cookies, localStorage data, etc) such that all data associated
+     * with a given cookie jar can be quickly located and (for example) deleted.
+     * Code from many origins may share a given cookie jar, so callers still need
+     * to consult .origin (or equivalent) to compartmentalize data - the cookie
+     * jar should _only_ be used as a tag in the manner described above.
+     *
+     * If two principals are in different cookie jars, they must be cross-origin.
+     * As such, the information making up the cookie jar token must be contained
+     * in the originAttributes (i.e. cookieJar must be a function of / derivable
+     * from originAttributes). Long term, the intention is for the cookie jar
+     * identifier to simply be an origin attribute. But we don't have that
+     * attribute yet, and we also need to concatenate the appId and inBrowser
+     * attributes until those go away.
+     *
+     * This getter is designed to hide these details from consumers so that they
+     * don't need to be updated when we swap out the implementation. For that
+     * reason, callers should treat the string as opaque and not rely on the
+     * current format.
+     */
+    readonly attribute ACString cookieJar;
+
+    /**
      * The base domain of the codebase URI to which this principal pertains
      * (generally the document URI), handling null principals and
      * non-hierarchical schemes correctly.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/caps/nsIScriptSecurityManager.idl firefox-trunk-41.0~a1~hg20150524r245419/caps/nsIScriptSecurityManager.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/caps/nsIScriptSecurityManager.idl	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/caps/nsIScriptSecurityManager.idl	2015-05-25 20:43:09.000000000 +0000
@@ -26,7 +26,7 @@
 [ptr] native JSObjectPtr(JSObject);
 [ptr] native DomainPolicyClonePtr(mozilla::dom::DomainPolicyClone);
 
-[scriptable, uuid(ba602ca6-dc7a-457e-a57a-ee5b343fd863)]
+[scriptable, uuid(f4c578b8-5bac-4ba1-9582-f1140e09a3b4)]
 interface nsIScriptSecurityManager : nsISupports
 {
     /**
@@ -179,13 +179,29 @@
     nsIPrincipal getNoAppCodebasePrincipal(in nsIURI uri);
 
     /**
-     * Legacy name for getNoAppCodebasePrincipal.
+     * Legacy method for getting a principal with no origin attributes.
      *
-     * @deprecated use getNoAppCodebasePrincipal instead.
+     * @deprecated use createCodebasePrincipal instead.
      */
     [deprecated] nsIPrincipal getCodebasePrincipal(in nsIURI uri);
 
     /**
+     * Returns a principal whose origin is composed of |uri| and |originAttributes|.
+     * See nsIPrincipal.h for a description of origin attributes, and
+     * SystemDictionaries.webidl for a list of origin attributes and their defaults.
+     */
+    [implicit_jscontext]
+    nsIPrincipal createCodebasePrincipal(in nsIURI uri, in jsval originAttributes);
+
+    /**
+     * Returns a unique nonce principal with |originAttributes|.
+     * See nsIPrincipal.h for a description of origin attributes, and
+     * SystemDictionaries.webidl for a list of origin attributes and their defaults.
+     */
+    [implicit_jscontext]
+    nsIPrincipal createNullPrincipal(in jsval originAttributes);
+
+    /**
      * Returns OK if aSourceURI and target have the same "origin"
      * (scheme, host, and port).
      * ReportError flag suppresses error reports for functions that
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/caps/nsJSPrincipals.cpp firefox-trunk-41.0~a1~hg20150524r245419/caps/nsJSPrincipals.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/caps/nsJSPrincipals.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/caps/nsJSPrincipals.cpp	2015-05-25 20:43:09.000000000 +0000
@@ -19,6 +19,30 @@
 // for mozilla::dom::workers::kJSPrincipalsDebugToken
 #include "mozilla/dom/workers/Workers.h"
 
+NS_IMETHODIMP_(MozExternalRefCountType)
+nsJSPrincipals::AddRef()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  NS_PRECONDITION(int32_t(refcount) >= 0, "illegal refcnt");
+  nsrefcnt count = ++refcount;
+  NS_LOG_ADDREF(this, count, "nsJSPrincipals", sizeof(*this));
+  return count;
+}
+
+NS_IMETHODIMP_(MozExternalRefCountType)
+nsJSPrincipals::Release()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  NS_PRECONDITION(0 != refcount, "dup release");
+  nsrefcnt count = --refcount;
+  NS_LOG_RELEASE(this, count, "nsJSPrincipals");
+  if (count == 0) {
+    delete this;
+  }
+
+  return count;
+}
+
 /* static */ bool
 nsJSPrincipals::Subsume(JSPrincipals *jsprin, JSPrincipals *other)
 {
@@ -59,7 +83,9 @@
 JSPrincipals::dump()
 {
     if (debugToken == nsJSPrincipals::DEBUG_TOKEN) {
-        static_cast<nsJSPrincipals *>(this)->dumpImpl();
+      nsAutoCString str;
+      static_cast<nsJSPrincipals *>(this)->GetScriptLocation(str);
+      fprintf(stderr, "nsIPrincipal (%p) = %s\n", static_cast<void*>(this), str.get());
     } else if (debugToken == mozilla::dom::workers::kJSPrincipalsDebugToken) {
         fprintf(stderr, "Web Worker principal singleton (%p)\n", this);
     } else {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/caps/nsJSPrincipals.h firefox-trunk-41.0~a1~hg20150524r245419/caps/nsJSPrincipals.h
--- firefox-trunk-41.0~a1~hg20150513r243603/caps/nsJSPrincipals.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/caps/nsJSPrincipals.h	2015-05-25 20:43:09.000000000 +0000
@@ -9,46 +9,47 @@
 #include "jsapi.h"
 #include "nsIPrincipal.h"
 
-struct nsJSPrincipals : nsIPrincipal, JSPrincipals
+class nsJSPrincipals : public nsIPrincipal, public JSPrincipals
 {
+public:
+  /* SpiderMonkey security callbacks. */
   static bool Subsume(JSPrincipals *jsprin, JSPrincipals *other);
   static void Destroy(JSPrincipals *jsprin);
 
   /*
    * Get a weak reference to nsIPrincipal associated with the given JS
-   * principal.
+   * principal, and vice-versa.
    */
   static nsJSPrincipals* get(JSPrincipals *principals) {
     nsJSPrincipals *self = static_cast<nsJSPrincipals *>(principals);
     MOZ_ASSERT_IF(self, self->debugToken == DEBUG_TOKEN);
     return self;
   }
-  
   static nsJSPrincipals* get(nsIPrincipal *principal) {
     nsJSPrincipals *self = static_cast<nsJSPrincipals *>(principal);
     MOZ_ASSERT_IF(self, self->debugToken == DEBUG_TOKEN);
     return self;
   }
 
+  NS_IMETHOD_(MozExternalRefCountType) AddRef(void) override;
+  NS_IMETHOD_(MozExternalRefCountType) Release(void) override;
+
   nsJSPrincipals() {
     refcount = 0;
     setDebugToken(DEBUG_TOKEN);
   }
 
-  virtual ~nsJSPrincipals() {
-    setDebugToken(0);
-  }
-
   /**
    * Return a string that can be used as JS script filename in error reports.
    */
   virtual void GetScriptLocation(nsACString &aStr) = 0;
+  static const uint32_t DEBUG_TOKEN = 0x0bf41760;
 
-#ifdef DEBUG
-  virtual void dumpImpl() = 0;
-#endif
+protected:
+  virtual ~nsJSPrincipals() {
+    setDebugToken(0);
+  }
 
-  static const uint32_t DEBUG_TOKEN = 0x0bf41760;
 };
 
 #endif /* nsJSPrincipals_h__ */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/caps/nsNullPrincipal.cpp firefox-trunk-41.0~a1~hg20150524r245419/caps/nsNullPrincipal.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/caps/nsNullPrincipal.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/caps/nsNullPrincipal.cpp	2015-05-25 20:43:09.000000000 +0000
@@ -17,8 +17,6 @@
 #include "nsMemory.h"
 #include "nsNetUtil.h"
 #include "nsIClassInfoImpl.h"
-#include "nsIObjectInputStream.h"
-#include "nsIObjectOutputStream.h"
 #include "nsNetCID.h"
 #include "nsError.h"
 #include "nsIScriptSecurityManager.h"
@@ -37,61 +35,29 @@
                             nsIPrincipal,
                             nsISerializable)
 
-NS_IMETHODIMP_(MozExternalRefCountType)
-nsNullPrincipal::AddRef()
-{
-  NS_PRECONDITION(int32_t(refcount) >= 0, "illegal refcnt");
-  nsrefcnt count = ++refcount;
-  NS_LOG_ADDREF(this, count, "nsNullPrincipal", sizeof(*this));
-  return count;
-}
-
-NS_IMETHODIMP_(MozExternalRefCountType)
-nsNullPrincipal::Release()
-{
-  NS_PRECONDITION(0 != refcount, "dup release");
-  nsrefcnt count = --refcount;
-  NS_LOG_RELEASE(this, count, "nsNullPrincipal");
-  if (count == 0) {
-    delete this;
-  }
-
-  return count;
-}
-
-nsNullPrincipal::nsNullPrincipal()
-{
-}
-
-nsNullPrincipal::~nsNullPrincipal()
-{
-}
-
 /* static */ already_AddRefed<nsNullPrincipal>
 nsNullPrincipal::CreateWithInheritedAttributes(nsIPrincipal* aInheritFrom)
 {
   nsRefPtr<nsNullPrincipal> nullPrin = new nsNullPrincipal();
-  nsresult rv = nullPrin->Init(aInheritFrom->GetAppId(),
-                               aInheritFrom->GetIsInBrowserElement());
+  nsresult rv = nullPrin->Init(Cast(aInheritFrom)->OriginAttributesRef());
   return NS_SUCCEEDED(rv) ? nullPrin.forget() : nullptr;
 }
 
 /* static */ already_AddRefed<nsNullPrincipal>
-nsNullPrincipal::Create(uint32_t aAppId, bool aInMozBrowser)
+nsNullPrincipal::Create(const OriginAttributes& aOriginAttributes)
 {
   nsRefPtr<nsNullPrincipal> nullPrin = new nsNullPrincipal();
-  nsresult rv = nullPrin->Init(aAppId, aInMozBrowser);
+  nsresult rv = nullPrin->Init(aOriginAttributes);
   NS_ENSURE_SUCCESS(rv, nullptr);
 
   return nullPrin.forget();
 }
 
 nsresult
-nsNullPrincipal::Init(uint32_t aAppId, bool aInMozBrowser)
+nsNullPrincipal::Init(const OriginAttributes& aOriginAttributes)
 {
-  MOZ_ASSERT(aAppId != nsIScriptSecurityManager::UNKNOWN_APP_ID);
-  mAppId = aAppId;
-  mInMozBrowser = aInMozBrowser;
+  mOriginAttributes = aOriginAttributes;
+  MOZ_ASSERT(AppId() != nsIScriptSecurityManager::UNKNOWN_APP_ID);
 
   mURI = nsNullPrincipalURI::Create();
   NS_ENSURE_TRUE(mURI, NS_ERROR_NOT_AVAILABLE);
@@ -105,35 +71,11 @@
   mURI->GetSpec(aStr);
 }
 
-#ifdef DEBUG
-void nsNullPrincipal::dumpImpl()
-{
-  nsAutoCString str;
-  mURI->GetSpec(str);
-  fprintf(stderr, "nsNullPrincipal (%p) = %s\n", this, str.get());
-}
-#endif 
-
 /**
  * nsIPrincipal implementation
  */
 
 NS_IMETHODIMP
-nsNullPrincipal::Equals(nsIPrincipal *aOther, bool *aResult)
-{
-  // Just equal to ourselves.  Note that nsPrincipal::Equals will return false
-  // for us since we have a unique domain/origin/etc.
-  *aResult = (aOther == this);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNullPrincipal::EqualsConsideringDomain(nsIPrincipal *aOther, bool *aResult)
-{
-  return Equals(aOther, aResult);
-}
-
-NS_IMETHODIMP
 nsNullPrincipal::GetHashValue(uint32_t *aResult)
 {
   *aResult = (NS_PTR_TO_INT32(this) >> 2);
@@ -147,25 +89,6 @@
 }
 
 NS_IMETHODIMP
-nsNullPrincipal::GetCsp(nsIContentSecurityPolicy** aCsp)
-{
-  NS_IF_ADDREF(*aCsp = mCSP);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNullPrincipal::SetCsp(nsIContentSecurityPolicy* aCsp)
-{
-  // If CSP was already set, it should not be destroyed!  Instead, it should
-  // get set anew when a new principal is created.
-  if (mCSP)
-    return NS_ERROR_ALREADY_INITIALIZED;
-
-  mCSP = aCsp;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
 nsNullPrincipal::GetDomain(nsIURI** aDomain)
 {
   return NS_EnsureSafeToReturn(mURI, aDomain);
@@ -179,35 +102,10 @@
   return NS_ERROR_NOT_AVAILABLE;
 }
 
-NS_IMETHODIMP 
-nsNullPrincipal::GetOrigin(char** aOrigin)
-{
-  *aOrigin = nullptr;
-  
-  nsAutoCString str;
-  nsresult rv = mURI->GetSpec(str);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  *aOrigin = ToNewCString(str);
-  NS_ENSURE_TRUE(*aOrigin, NS_ERROR_OUT_OF_MEMORY);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNullPrincipal::Subsumes(nsIPrincipal *aOther, bool *aResult)
-{
-  // We don't subsume anything except ourselves.  Note that nsPrincipal::Equals
-  // will return false for us, since we're not about:blank and not Equals to
-  // reasonable nsPrincipals.
-  *aResult = (aOther == this);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNullPrincipal::SubsumesConsideringDomain(nsIPrincipal *aOther, bool *aResult)
+nsresult
+nsNullPrincipal::GetOriginInternal(nsACString& aOrigin)
 {
-  return Subsumes(aOther, aResult);
+  return mURI->GetSpec(aOrigin);
 }
 
 NS_IMETHODIMP
@@ -239,41 +137,6 @@
 }
 
 NS_IMETHODIMP
-nsNullPrincipal::GetJarPrefix(nsACString& aJarPrefix)
-{
-  aJarPrefix.Truncate();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNullPrincipal::GetAppStatus(uint16_t* aAppStatus)
-{
-  *aAppStatus = nsScriptSecurityManager::AppStatusForPrincipal(this);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNullPrincipal::GetAppId(uint32_t* aAppId)
-{
-  *aAppId = mAppId;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNullPrincipal::GetIsInBrowserElement(bool* aIsInBrowserElement)
-{
-  *aIsInBrowserElement = mInMozBrowser;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNullPrincipal::GetUnknownAppId(bool* aUnknownAppId)
-{
-  *aUnknownAppId = false;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
 nsNullPrincipal::GetIsNullPrincipal(bool* aIsNullPrincipal)
 {
   *aIsNullPrincipal = true;
@@ -287,12 +150,6 @@
   return mURI->GetPath(aBaseDomain);
 }
 
-bool
-nsNullPrincipal::IsOnCSSUnprefixingWhitelist()
-{
-  return false;
-}
-
 /**
  * nsISerializable implementation
  */
@@ -303,20 +160,13 @@
   // that the Init() method has already been invoked by the time we deserialize.
   // This is in contrast to nsPrincipal, which uses NS_GENERIC_FACTORY_CONSTRUCTOR,
   // in which case ::Read needs to invoke Init().
-  nsresult rv = aStream->Read32(&mAppId);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = aStream->ReadBoolean(&mInMozBrowser);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
+  return mOriginAttributes.Deserialize(aStream);
 }
 
 NS_IMETHODIMP
 nsNullPrincipal::Write(nsIObjectOutputStream* aStream)
 {
-  aStream->Write32(mAppId);
-  aStream->WriteBoolean(mInMozBrowser);
+  OriginAttributesRef().Serialize(aStream);
   return NS_OK;
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/caps/nsNullPrincipal.h firefox-trunk-41.0~a1~hg20150524r245419/caps/nsNullPrincipal.h
--- firefox-trunk-41.0~a1~hg20150513r243603/caps/nsNullPrincipal.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/caps/nsNullPrincipal.h	2015-05-25 20:43:09.000000000 +0000
@@ -18,6 +18,8 @@
 #include "nsCOMPtr.h"
 #include "nsIContentSecurityPolicy.h"
 
+#include "mozilla/BasePrincipal.h"
+
 class nsIURI;
 
 #define NS_NULLPRINCIPAL_CID \
@@ -27,48 +29,47 @@
 
 #define NS_NULLPRINCIPAL_SCHEME "moz-nullprincipal"
 
-class nsNullPrincipal final : public nsJSPrincipals
+class nsNullPrincipal final : public mozilla::BasePrincipal
 {
 public:
   // This should only be used by deserialization, and the factory constructor.
   // Other consumers should use the Create and CreateWithInheritedAttributes
   // methods.
-  nsNullPrincipal();
-
-  // Our refcount is managed by nsJSPrincipals.  Use this macro to avoid an
-  // extra refcount member.
+  nsNullPrincipal() {}
 
-  // FIXME: bug 327245 -- I sorta wish there were a clean way to share the
-  // nsJSPrincipals munging code between the various principal classes without
-  // giving up the NS_DECL_NSIPRINCIPAL goodness.
-  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_NSIPRINCIPAL
   NS_DECL_NSISERIALIZABLE
 
+  NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) override;
+  NS_IMETHOD GetHashValue(uint32_t* aHashValue) override;
+  NS_IMETHOD GetURI(nsIURI** aURI) override;
+  NS_IMETHOD GetDomain(nsIURI** aDomain) override;
+  NS_IMETHOD SetDomain(nsIURI* aDomain) override;
+  NS_IMETHOD CheckMayLoad(nsIURI* uri, bool report, bool allowIfInheritsPrincipal) override;
+  NS_IMETHOD GetIsNullPrincipal(bool* aIsNullPrincipal) override;
+  NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) override;
+  nsresult GetOriginInternal(nsACString& aOrigin) override;
+
   // Returns null on failure.
   static already_AddRefed<nsNullPrincipal> CreateWithInheritedAttributes(nsIPrincipal *aInheritFrom);
 
   // Returns null on failure.
   static already_AddRefed<nsNullPrincipal>
-    Create(uint32_t aAppId = nsIScriptSecurityManager::NO_APP_ID,
-           bool aInMozBrowser = false);
+    Create(const mozilla::OriginAttributes& aOriginAttributes = mozilla::OriginAttributes());
 
-  nsresult Init(uint32_t aAppId = nsIScriptSecurityManager::NO_APP_ID,
-                bool aInMozBrowser = false);
+  nsresult Init(const mozilla::OriginAttributes& aOriginAttributes = mozilla::OriginAttributes());
 
   virtual void GetScriptLocation(nsACString &aStr) override;
 
-#ifdef DEBUG
-  virtual void dumpImpl() override;
-#endif 
-
  protected:
-  virtual ~nsNullPrincipal();
+  virtual ~nsNullPrincipal() {}
+
+  bool SubsumesInternal(nsIPrincipal* aOther, DocumentDomainConsideration aConsideration) override
+  {
+    return aOther == this;
+  }
 
   nsCOMPtr<nsIURI> mURI;
   nsCOMPtr<nsIContentSecurityPolicy> mCSP;
-  uint32_t mAppId;
-  bool mInMozBrowser;
 };
 
 #endif // nsNullPrincipal_h__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/caps/nsPrincipal.cpp firefox-trunk-41.0~a1~hg20150524r245419/caps/nsPrincipal.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/caps/nsPrincipal.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/caps/nsPrincipal.cpp	2015-05-25 20:43:09.000000000 +0000
@@ -15,8 +15,6 @@
 #include "nsIURI.h"
 #include "nsJSPrincipals.h"
 #include "nsIEffectiveTLDService.h"
-#include "nsIObjectInputStream.h"
-#include "nsIObjectOutputStream.h"
 #include "nsIClassInfoImpl.h"
 #include "nsIProtocolHandler.h"
 #include "nsError.h"
@@ -46,68 +44,6 @@
     !isMutable;
 }
 
-// Static member variables
-const char nsBasePrincipal::sInvalid[] = "Invalid";
-
-NS_IMETHODIMP_(MozExternalRefCountType)
-nsBasePrincipal::AddRef()
-{
-  NS_PRECONDITION(int32_t(refcount) >= 0, "illegal refcnt");
-  // XXXcaa does this need to be threadsafe?  See bug 143559.
-  nsrefcnt count = ++refcount;
-  NS_LOG_ADDREF(this, count, "nsBasePrincipal", sizeof(*this));
-  return count;
-}
-
-NS_IMETHODIMP_(MozExternalRefCountType)
-nsBasePrincipal::Release()
-{
-  NS_PRECONDITION(0 != refcount, "dup release");
-  nsrefcnt count = --refcount;
-  NS_LOG_RELEASE(this, count, "nsBasePrincipal");
-  if (count == 0) {
-    delete this;
-  }
-
-  return count;
-}
-
-nsBasePrincipal::nsBasePrincipal()
-{
-}
-
-nsBasePrincipal::~nsBasePrincipal(void)
-{
-}
-
-NS_IMETHODIMP
-nsBasePrincipal::GetCsp(nsIContentSecurityPolicy** aCsp)
-{
-  NS_IF_ADDREF(*aCsp = mCSP);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsBasePrincipal::SetCsp(nsIContentSecurityPolicy* aCsp)
-{
-  // If CSP was already set, it should not be destroyed!  Instead, it should
-  // get set anew when a new principal is created.
-  if (mCSP)
-    return NS_ERROR_ALREADY_INITIALIZED;
-
-  mCSP = aCsp;
-  return NS_OK;
-}
-
-#ifdef DEBUG
-void nsPrincipal::dumpImpl()
-{
-  nsAutoCString str;
-  GetScriptLocation(str);
-  fprintf(stderr, "nsPrincipal (%p) = %s\n", static_cast<void*>(this), str.get());
-}
-#endif 
-
 NS_IMPL_CLASSINFO(nsPrincipal, nullptr, nsIClassInfo::MAIN_THREAD_ONLY,
                   NS_PRINCIPAL_CID)
 NS_IMPL_QUERY_INTERFACE_CI(nsPrincipal,
@@ -116,8 +52,6 @@
 NS_IMPL_CI_INTERFACE_GETTER(nsPrincipal,
                             nsIPrincipal,
                             nsISerializable)
-NS_IMPL_ADDREF_INHERITED(nsPrincipal, nsBasePrincipal)
-NS_IMPL_RELEASE_INHERITED(nsPrincipal, nsBasePrincipal)
 
 // Called at startup:
 /* static */ void
@@ -133,9 +67,7 @@
 }
 
 nsPrincipal::nsPrincipal()
-  : mAppId(nsIScriptSecurityManager::UNKNOWN_APP_ID)
-  , mInMozBrowser(false)
-  , mCodebaseImmutable(false)
+  : mCodebaseImmutable(false)
   , mDomainImmutable(false)
   , mInitialized(false)
 { }
@@ -144,9 +76,7 @@
 { }
 
 nsresult
-nsPrincipal::Init(nsIURI *aCodebase,
-                  uint32_t aAppId,
-                  bool aInMozBrowser)
+nsPrincipal::Init(nsIURI *aCodebase, const OriginAttributes& aOriginAttributes)
 {
   NS_ENSURE_STATE(!mInitialized);
   NS_ENSURE_ARG(aCodebase);
@@ -155,9 +85,7 @@
 
   mCodebase = NS_TryToMakeImmutable(aCodebase);
   mCodebaseImmutable = URIIsImmutable(mCodebase);
-
-  mAppId = aAppId;
-  mInMozBrowser = aInMozBrowser;
+  mOriginAttributes = aOriginAttributes;
 
   return NS_OK;
 }
@@ -169,14 +97,12 @@
 }
 
 /* static */ nsresult
-nsPrincipal::GetOriginForURI(nsIURI* aURI, char **aOrigin)
+nsPrincipal::GetOriginForURI(nsIURI* aURI, nsACString& aOrigin)
 {
   if (!aURI) {
     return NS_ERROR_FAILURE;
   }
 
-  *aOrigin = nullptr;
-
   nsCOMPtr<nsIURI> origin = NS_GetInnermostURI(aURI);
   if (!origin) {
     return NS_ERROR_FAILURE;
@@ -210,120 +136,64 @@
       hostPort.AppendInt(port, 10);
     }
 
-    nsAutoCString scheme;
-    rv = origin->GetScheme(scheme);
+    rv = origin->GetScheme(aOrigin);
     NS_ENSURE_SUCCESS(rv, rv);
-
-    *aOrigin = ToNewCString(scheme + NS_LITERAL_CSTRING("://") + hostPort);
+    aOrigin.AppendLiteral("://");
+    aOrigin.Append(hostPort);
   }
   else {
-    // Some URIs (e.g., nsSimpleURI) don't support asciiHost. Just
-    // get the full spec.
-    nsAutoCString spec;
-    // XXX nsMozIconURI and nsJARURI don't implement this correctly, they
-    // both fall back to GetSpec.  That needs to be fixed.
-    rv = origin->GetAsciiSpec(spec);
+    rv = origin->GetAsciiSpec(aOrigin);
     NS_ENSURE_SUCCESS(rv, rv);
-
-    *aOrigin = ToNewCString(spec);
   }
 
-  return *aOrigin ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+  return NS_OK;
 }
 
-NS_IMETHODIMP
-nsPrincipal::GetOrigin(char **aOrigin)
+nsresult
+nsPrincipal::GetOriginInternal(nsACString& aOrigin)
 {
   return GetOriginForURI(mCodebase, aOrigin);
 }
 
-NS_IMETHODIMP
-nsPrincipal::EqualsConsideringDomain(nsIPrincipal *aOther, bool *aResult)
+bool
+nsPrincipal::SubsumesInternal(nsIPrincipal* aOther,
+                              BasePrincipal::DocumentDomainConsideration aConsideration)
 {
-  *aResult = false;
-
-  if (!aOther) {
-    NS_WARNING("Need a principal to compare this to!");
-    return NS_OK;
-  }
+  MOZ_ASSERT(aOther);
 
+  // For nsPrincipal, Subsumes is equivalent to Equals.
   if (aOther == this) {
-    *aResult = true;
-    return NS_OK;
+    return true;
   }
 
-  if (!nsScriptSecurityManager::AppAttributesEqual(this, aOther)) {
-      return NS_OK;
+  if (OriginAttributesRef() != Cast(aOther)->OriginAttributesRef()) {
+    return false;
   }
 
   // If either the subject or the object has changed its principal by
   // explicitly setting document.domain then the other must also have
   // done so in order to be considered the same origin. This prevents
   // DNS spoofing based on document.domain (154930)
-
-  nsCOMPtr<nsIURI> thisURI;
-  this->GetDomain(getter_AddRefs(thisURI));
-  bool thisSetDomain = !!thisURI;
-  if (!thisURI) {
-      this->GetURI(getter_AddRefs(thisURI));
-  }
-
-  nsCOMPtr<nsIURI> otherURI;
-  aOther->GetDomain(getter_AddRefs(otherURI));
-  bool otherSetDomain = !!otherURI;
-  if (!otherURI) {
-      aOther->GetURI(getter_AddRefs(otherURI));
-  }
-
-  *aResult = thisSetDomain == otherSetDomain &&
-             nsScriptSecurityManager::SecurityCompareURIs(thisURI, otherURI);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsPrincipal::Equals(nsIPrincipal *aOther, bool *aResult)
-{
-  *aResult = false;
-
-  if (!aOther) {
-    NS_WARNING("Need a principal to compare this to!");
-    return NS_OK;
-  }
-
-  if (aOther == this) {
-    *aResult = true;
-    return NS_OK;
-  }
-
-  if (!nsScriptSecurityManager::AppAttributesEqual(this, aOther)) {
-    return NS_OK;
-  }
-
-  nsCOMPtr<nsIURI> otherURI;
-  nsresult rv = aOther->GetURI(getter_AddRefs(otherURI));
-  if (NS_FAILED(rv)) {
-    return rv;
+  nsresult rv;
+  if (aConsideration == ConsiderDocumentDomain) {
+    // Get .domain on each principal.
+    nsCOMPtr<nsIURI> thisDomain, otherDomain;
+    GetDomain(getter_AddRefs(thisDomain));
+    aOther->GetDomain(getter_AddRefs(otherDomain));
+
+    // If either has .domain set, we have equality i.f.f. the domains match.
+    // Otherwise, we fall through to the non-document-domain-considering case.
+    if (thisDomain || otherDomain) {
+      return nsScriptSecurityManager::SecurityCompareURIs(thisDomain, otherDomain);
+    }
   }
 
-  NS_ASSERTION(mCodebase,
-               "shouldn't be calling this on principals from preferences");
+    nsCOMPtr<nsIURI> otherURI;
+    rv = aOther->GetURI(getter_AddRefs(otherURI));
+    NS_ENSURE_SUCCESS(rv, false);
 
   // Compare codebases.
-  *aResult = nsScriptSecurityManager::SecurityCompareURIs(mCodebase,
-                                                          otherURI);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsPrincipal::Subsumes(nsIPrincipal *aOther, bool *aResult)
-{
-  return Equals(aOther, aResult);
-}
-
-NS_IMETHODIMP
-nsPrincipal::SubsumesConsideringDomain(nsIPrincipal *aOther, bool *aResult)
-{
-  return EqualsConsideringDomain(aOther, aResult);
+  return nsScriptSecurityManager::SecurityCompareURIs(mCodebase, otherURI);
 }
 
 NS_IMETHODIMP
@@ -436,56 +306,6 @@
 }
 
 NS_IMETHODIMP
-nsPrincipal::GetJarPrefix(nsACString& aJarPrefix)
-{
-  MOZ_ASSERT(mAppId != nsIScriptSecurityManager::UNKNOWN_APP_ID);
-
-  mozilla::GetJarPrefix(mAppId, mInMozBrowser, aJarPrefix);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsPrincipal::GetAppStatus(uint16_t* aAppStatus)
-{
-  *aAppStatus = GetAppStatus();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsPrincipal::GetAppId(uint32_t* aAppId)
-{
-  if (mAppId == nsIScriptSecurityManager::UNKNOWN_APP_ID) {
-    MOZ_ASSERT(false);
-    *aAppId = nsIScriptSecurityManager::NO_APP_ID;
-    return NS_OK;
-  }
-
-  *aAppId = mAppId;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsPrincipal::GetIsInBrowserElement(bool* aIsInBrowserElement)
-{
-  *aIsInBrowserElement = mInMozBrowser;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsPrincipal::GetUnknownAppId(bool* aUnknownAppId)
-{
-  *aUnknownAppId = mAppId == nsIScriptSecurityManager::UNKNOWN_APP_ID;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsPrincipal::GetIsNullPrincipal(bool* aIsNullPrincipal)
-{
-  *aIsNullPrincipal = false;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
 nsPrincipal::GetBaseDomain(nsACString& aBaseDomain)
 {
   // For a file URI, we return the file path.
@@ -540,12 +360,8 @@
 
   domain = do_QueryInterface(supports);
 
-  uint32_t appId;
-  rv = aStream->Read32(&appId);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  bool inMozBrowser;
-  rv = aStream->ReadBoolean(&inMozBrowser);
+  OriginAttributes attrs;
+  rv = attrs.Deserialize(aStream);
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = NS_ReadOptionalObject(aStream, true, getter_AddRefs(supports));
@@ -554,7 +370,7 @@
   // This may be null.
   nsCOMPtr<nsIContentSecurityPolicy> csp = do_QueryInterface(supports, &rv);
 
-  rv = Init(codebase, appId, inMozBrowser);
+  rv = Init(codebase, attrs);
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = SetCsp(csp);
@@ -588,8 +404,7 @@
     return rv;
   }
 
-  aStream->Write32(mAppId);
-  aStream->WriteBoolean(mInMozBrowser);
+  OriginAttributesRef().Serialize(aStream);
 
   rv = NS_WriteOptionalCompoundObject(aStream, mCSP,
                                       NS_GET_IID(nsIContentSecurityPolicy),
@@ -604,16 +419,6 @@
   return NS_OK;
 }
 
-uint16_t
-nsPrincipal::GetAppStatus()
-{
-  if (mAppId == nsIScriptSecurityManager::UNKNOWN_APP_ID) {
-    NS_WARNING("Asking for app status on a principal with an unknown app id");
-    return nsIPrincipal::APP_STATUS_NOT_INSTALLED;
-  }
-  return nsScriptSecurityManager::AppStatusForPrincipal(this);
-}
-
 // Helper-function to indicate whether the CSS Unprefixing Service
 // whitelist should include dummy domains that are only intended for
 // use in testing. (Controlled by a pref.)
@@ -681,6 +486,15 @@
     NS_LITERAL_CSTRING("mw.nikkei.com"),
     NS_LITERAL_CSTRING("www.nhk.or.jp"),
     NS_LITERAL_CSTRING("www.tokyo-sports.co.jp"),
+    NS_LITERAL_CSTRING("www.bellemaison.jp"),
+    NS_LITERAL_CSTRING("www.kuronekoyamato.co.jp"),
+    NS_LITERAL_CSTRING("s.tsite.jp"),
+    NS_LITERAL_CSTRING("formassist.jp"), // for orico.jp
+    NS_LITERAL_CSTRING("sp.m.reuters.co.jp"),
+    NS_LITERAL_CSTRING("www.atre.co.jp"),
+    NS_LITERAL_CSTRING("www.jtb.co.jp"),
+    NS_LITERAL_CSTRING("www.sharp.co.jp"),
+    NS_LITERAL_CSTRING("www.biccamera.com"),
   };
   static const size_t sNumFullDomainsOnWhitelist =
     MOZ_ARRAY_LENGTH(sFullDomainsOnWhitelist);
@@ -706,8 +520,10 @@
     // 0th entry only active when testing:
     NS_LITERAL_CSTRING("test2.example.org"),
     NS_LITERAL_CSTRING("tbcdn.cn"), // for m.taobao.com
+    NS_LITERAL_CSTRING("alicdn.com"), // for m.taobao.com
     NS_LITERAL_CSTRING("dpfile.com"), // for m.dianping.com
     NS_LITERAL_CSTRING("hao123img.com"), // for hao123.com
+    NS_LITERAL_CSTRING("tabelog.k-img.com"), // for s.tabelog.com
   };
   static const size_t sNumBaseDomainsOnWhitelist =
     MOZ_ARRAY_LENGTH(sBaseDomainsOnWhitelist);
@@ -790,8 +606,6 @@
 
 /************************************************************************************************************************/
 
-static const char EXPANDED_PRINCIPAL_SPEC[] = "[Expanded Principal]";
-
 NS_IMPL_CLASSINFO(nsExpandedPrincipal, nullptr, nsIClassInfo::MAIN_THREAD_ONLY,
                   NS_EXPANDEDPRINCIPAL_CID)
 NS_IMPL_QUERY_INTERFACE_CI(nsExpandedPrincipal,
@@ -800,12 +614,40 @@
 NS_IMPL_CI_INTERFACE_GETTER(nsExpandedPrincipal,
                              nsIPrincipal,
                              nsIExpandedPrincipal)
-NS_IMPL_ADDREF_INHERITED(nsExpandedPrincipal, nsBasePrincipal)
-NS_IMPL_RELEASE_INHERITED(nsExpandedPrincipal, nsBasePrincipal)
+
+struct OriginComparator
+{
+  bool LessThan(nsIPrincipal* a, nsIPrincipal* b) const
+  {
+    nsAutoCString originA;
+    nsresult rv = a->GetOrigin(originA);
+    NS_ENSURE_SUCCESS(rv, false);
+    nsAutoCString originB;
+    rv = b->GetOrigin(originB);
+    NS_ENSURE_SUCCESS(rv, false);
+    return originA < originB;
+  }
+
+  bool Equals(nsIPrincipal* a, nsIPrincipal* b) const
+  {
+    nsAutoCString originA;
+    nsresult rv = a->GetOrigin(originA);
+    NS_ENSURE_SUCCESS(rv, false);
+    nsAutoCString originB;
+    rv = b->GetOrigin(originB);
+    NS_ENSURE_SUCCESS(rv, false);
+    return a == b;
+  }
+};
 
 nsExpandedPrincipal::nsExpandedPrincipal(nsTArray<nsCOMPtr <nsIPrincipal> > &aWhiteList)
 {
-  mPrincipals.AppendElements(aWhiteList);
+  // We force the principals to be sorted by origin so that nsExpandedPrincipal
+  // origins can have a canonical form.
+  OriginComparator c;
+  for (size_t i = 0; i < aWhiteList.Length(); ++i) {
+    mPrincipals.InsertElementSorted(aWhiteList[i], c);
+  }
 }
 
 nsExpandedPrincipal::~nsExpandedPrincipal()
@@ -824,102 +666,52 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsExpandedPrincipal::GetOrigin(char** aOrigin)
+nsresult
+nsExpandedPrincipal::GetOriginInternal(nsACString& aOrigin)
 {
-  *aOrigin = ToNewCString(NS_LITERAL_CSTRING(EXPANDED_PRINCIPAL_SPEC));
-  return *aOrigin ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
-}
+  aOrigin.AssignLiteral("[Expanded Principal [");
+  for (size_t i = 0; i < mPrincipals.Length(); ++i) {
+    if (i != 0) {
+      aOrigin.AppendLiteral(", ");
+    }
 
-typedef nsresult (NS_STDCALL nsIPrincipal::*nsIPrincipalMemFn)(nsIPrincipal* aOther,
-                                                               bool* aResult);
-#define CALL_MEMBER_FUNCTION(THIS,MEM_FN)  ((THIS)->*(MEM_FN))
-
-// nsExpandedPrincipal::Equals and nsExpandedPrincipal::EqualsConsideringDomain
-// shares the same logic. The difference only that Equals requires 'this'
-// and 'aOther' to Subsume each other while EqualsConsideringDomain requires
-// bidirectional SubsumesConsideringDomain.
-static nsresult
-Equals(nsExpandedPrincipal* aThis, nsIPrincipalMemFn aFn, nsIPrincipal* aOther,
-       bool* aResult)
-{
-  // If (and only if) 'aThis' and 'aOther' both Subsume/SubsumesConsideringDomain
-  // each other, then they are Equal.
-  *aResult = false;
-  // Calling the corresponding subsume function on this (aFn).
-  nsresult rv = CALL_MEMBER_FUNCTION(aThis, aFn)(aOther, aResult);
-  NS_ENSURE_SUCCESS(rv, rv);
-  if (!*aResult)
-    return NS_OK;
+    nsAutoCString subOrigin;
+    nsresult rv = mPrincipals.ElementAt(i)->GetOrigin(subOrigin);
+    NS_ENSURE_SUCCESS(rv, rv);
+    aOrigin.Append(subOrigin);
+  }
 
-  // Calling the corresponding subsume function on aOther (aFn).
-  rv = CALL_MEMBER_FUNCTION(aOther, aFn)(aThis, aResult);
-  NS_ENSURE_SUCCESS(rv, rv);
+  aOrigin.Append("]]");
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsExpandedPrincipal::Equals(nsIPrincipal* aOther, bool* aResult)
-{
-  return ::Equals(this, &nsIPrincipal::Subsumes, aOther, aResult);
-}
-
-NS_IMETHODIMP
-nsExpandedPrincipal::EqualsConsideringDomain(nsIPrincipal* aOther, bool* aResult)
-{
-  return ::Equals(this, &nsIPrincipal::SubsumesConsideringDomain, aOther, aResult);
-}
-
-// nsExpandedPrincipal::Subsumes and nsExpandedPrincipal::SubsumesConsideringDomain
-// shares the same logic. The difference only that Subsumes calls are replaced
-//with SubsumesConsideringDomain calls in the second case.
-static nsresult
-Subsumes(nsExpandedPrincipal* aThis, nsIPrincipalMemFn aFn, nsIPrincipal* aOther,
-         bool* aResult)
+bool
+nsExpandedPrincipal::SubsumesInternal(nsIPrincipal* aOther,
+                                      BasePrincipal::DocumentDomainConsideration aConsideration)
 {
-  nsresult rv;
+  // If aOther is an ExpandedPrincipal too, we break it down into its component
+  // nsIPrincipals, and check subsumes on each one.
   nsCOMPtr<nsIExpandedPrincipal> expanded = do_QueryInterface(aOther);
   if (expanded) {
-    // If aOther is an ExpandedPrincipal too, check if all of its
-    // principals are subsumed.
     nsTArray< nsCOMPtr<nsIPrincipal> >* otherList;
     expanded->GetWhiteList(&otherList);
     for (uint32_t i = 0; i < otherList->Length(); ++i){
-      rv = CALL_MEMBER_FUNCTION(aThis, aFn)((*otherList)[i], aResult);
-      NS_ENSURE_SUCCESS(rv, rv);
-      if (!*aResult) {
-        // If we don't subsume at least one principal of aOther, return false.
-        return NS_OK;
-      }
-    }
-  } else {
-    // For a regular aOther, one of our principals must subsume it.
-    nsTArray< nsCOMPtr<nsIPrincipal> >* list;
-    aThis->GetWhiteList(&list);
-    for (uint32_t i = 0; i < list->Length(); ++i){
-      rv = CALL_MEMBER_FUNCTION((*list)[i], aFn)(aOther, aResult);
-      NS_ENSURE_SUCCESS(rv, rv);
-      if (*aResult) {
-        // If one of our principal subsumes it, return true.
-        return NS_OK;
+      if (!SubsumesInternal((*otherList)[i], aConsideration)) {
+        return false;
       }
     }
+    return true;
   }
-  return NS_OK;
-}
-
-#undef CALL_MEMBER_FUNCTION
 
-NS_IMETHODIMP
-nsExpandedPrincipal::Subsumes(nsIPrincipal* aOther, bool* aResult)
-{
-  return ::Subsumes(this, &nsIPrincipal::Subsumes, aOther, aResult);
-}
+  // We're dealing with a regular principal. One of our principals must subsume
+  // it.
+  for (uint32_t i = 0; i < mPrincipals.Length(); ++i) {
+    if (Cast(mPrincipals[i])->Subsumes(aOther, aConsideration)) {
+      return true;
+    }
+  }
 
-NS_IMETHODIMP
-nsExpandedPrincipal::SubsumesConsideringDomain(nsIPrincipal* aOther, bool* aResult)
-{
-  return ::Subsumes(this, &nsIPrincipal::SubsumesConsideringDomain, aOther, aResult);
+  return false;
 }
 
 NS_IMETHODIMP
@@ -956,48 +748,6 @@
 }
 
 NS_IMETHODIMP
-nsExpandedPrincipal::GetJarPrefix(nsACString& aJarPrefix)
-{
-  aJarPrefix.Truncate();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsExpandedPrincipal::GetAppStatus(uint16_t* aAppStatus)
-{
-  *aAppStatus = nsIPrincipal::APP_STATUS_NOT_INSTALLED;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsExpandedPrincipal::GetAppId(uint32_t* aAppId)
-{
-  *aAppId = nsIScriptSecurityManager::NO_APP_ID;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsExpandedPrincipal::GetIsInBrowserElement(bool* aIsInBrowserElement)
-{
-  *aIsInBrowserElement = false;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsExpandedPrincipal::GetUnknownAppId(bool* aUnknownAppId)
-{
-  *aUnknownAppId = false;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsExpandedPrincipal::GetIsNullPrincipal(bool* aIsNullPrincipal)
-{
-  *aIsNullPrincipal = false;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
 nsExpandedPrincipal::GetBaseDomain(nsACString& aBaseDomain)
 {
   return NS_ERROR_NOT_AVAILABLE;
@@ -1015,9 +765,7 @@
 void
 nsExpandedPrincipal::GetScriptLocation(nsACString& aStr)
 {
-  aStr.Assign(EXPANDED_PRINCIPAL_SPEC);
-  aStr.AppendLiteral(" (");
-
+  aStr.Assign("[Expanded Principal [");
   for (size_t i = 0; i < mPrincipals.Length(); ++i) {
     if (i != 0) {
       aStr.AppendLiteral(", ");
@@ -1029,15 +777,8 @@
     aStr.Append(spec);
 
   }
-  aStr.Append(")");
-}
-
-#ifdef DEBUG
-void nsExpandedPrincipal::dumpImpl()
-{
-  fprintf(stderr, "nsExpandedPrincipal (%p)\n", static_cast<void*>(this));
+  aStr.Append("]]");
 }
-#endif 
 
 //////////////////////////////////////////
 // Methods implementing nsISerializable //
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/caps/nsPrincipal.h firefox-trunk-41.0~a1~hg20150524r245419/caps/nsPrincipal.h
--- firefox-trunk-41.0~a1~hg20150513r243603/caps/nsPrincipal.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/caps/nsPrincipal.h	2015-05-25 20:43:09.000000000 +0000
@@ -11,69 +11,30 @@
 #include "nsJSPrincipals.h"
 #include "nsTArray.h"
 #include "nsAutoPtr.h"
+#include "nsIContentSecurityPolicy.h"
 #include "nsIProtocolHandler.h"
 #include "nsNetUtil.h"
 #include "nsScriptSecurityManager.h"
+#include "mozilla/BasePrincipal.h"
 
-class nsBasePrincipal : public nsJSPrincipals
+class nsPrincipal final : public mozilla::BasePrincipal
 {
 public:
-  nsBasePrincipal();
-
-protected:
-  virtual ~nsBasePrincipal();
-
-public:
-  NS_IMETHOD_(MozExternalRefCountType) AddRef(void);
-  NS_IMETHOD_(MozExternalRefCountType) Release(void);
-  NS_IMETHOD GetCsp(nsIContentSecurityPolicy** aCsp);
-  NS_IMETHOD SetCsp(nsIContentSecurityPolicy* aCsp);
-public:
-
-  static const char sInvalid[];
-
-protected:
-
-#ifdef DEBUG
-  virtual void dumpImpl() = 0;
-#endif
-
-  nsCOMPtr<nsIContentSecurityPolicy> mCSP;
-};
-
-class nsPrincipal final : public nsBasePrincipal
-{
-public:
-  NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSISERIALIZABLE
-  NS_IMETHOD Equals(nsIPrincipal* other, bool* _retval) override;
-  NS_IMETHOD EqualsConsideringDomain(nsIPrincipal* other, bool* _retval) override;
+  NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) override;
   NS_IMETHOD GetHashValue(uint32_t* aHashValue) override;
   NS_IMETHOD GetURI(nsIURI** aURI) override;
   NS_IMETHOD GetDomain(nsIURI** aDomain) override;
   NS_IMETHOD SetDomain(nsIURI* aDomain) override;
-  NS_IMETHOD GetOrigin(char** aOrigin) override;
-  NS_IMETHOD Subsumes(nsIPrincipal* other, bool* _retval) override;
-  NS_IMETHOD SubsumesConsideringDomain(nsIPrincipal* other, bool* _retval) override;
   NS_IMETHOD CheckMayLoad(nsIURI* uri, bool report, bool allowIfInheritsPrincipal) override;
-  NS_IMETHOD GetJarPrefix(nsACString& aJarPrefix) override;
-  NS_IMETHOD GetAppStatus(uint16_t* aAppStatus) override;
-  NS_IMETHOD GetAppId(uint32_t* aAppStatus) override;
-  NS_IMETHOD GetIsInBrowserElement(bool* aIsInBrowserElement) override;
-  NS_IMETHOD GetUnknownAppId(bool* aUnknownAppId) override;
-  NS_IMETHOD GetIsNullPrincipal(bool* aIsNullPrincipal) override;
   NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) override;
   virtual bool IsOnCSSUnprefixingWhitelist() override;
-#ifdef DEBUG
-  virtual void dumpImpl() override;
-#endif
+  nsresult GetOriginInternal(nsACString& aOrigin) override;
 
   nsPrincipal();
 
   // Init() must be called before the principal is in a usable state.
-  nsresult Init(nsIURI* aCodebase,
-                uint32_t aAppId,
-                bool aInMozBrowser);
+  nsresult Init(nsIURI* aCodebase, const mozilla::OriginAttributes& aOriginAttributes);
 
   virtual void GetScriptLocation(nsACString& aStr) override;
   void SetURI(nsIURI* aURI);
@@ -98,7 +59,7 @@
   /**
    * Computes the puny-encoded origin of aURI.
    */
-  static nsresult GetOriginForURI(nsIURI* aURI, char **aOrigin);
+  static nsresult GetOriginForURI(nsIURI* aURI, nsACString& aOrigin);
 
   /**
    * Called at startup to setup static data, e.g. about:config pref-observers.
@@ -107,8 +68,6 @@
 
   nsCOMPtr<nsIURI> mDomain;
   nsCOMPtr<nsIURI> mCodebase;
-  uint32_t mAppId;
-  bool mInMozBrowser;
   // If mCodebaseImmutable is true, mCodebase is non-null and immutable
   bool mCodebaseImmutable;
   bool mDomainImmutable;
@@ -118,47 +77,33 @@
 protected:
   virtual ~nsPrincipal();
 
-  /**
-   * Returns the app status of the principal based on mAppId and mInMozBrowser.
-   */
-  uint16_t GetAppStatus();
+  bool SubsumesInternal(nsIPrincipal* aOther, DocumentDomainConsideration aConsideration) override;
 };
 
-class nsExpandedPrincipal : public nsIExpandedPrincipal, public nsBasePrincipal
+class nsExpandedPrincipal : public nsIExpandedPrincipal, public mozilla::BasePrincipal
 {
 public:
   explicit nsExpandedPrincipal(nsTArray< nsCOMPtr<nsIPrincipal> > &aWhiteList);
 
-protected:
-  virtual ~nsExpandedPrincipal();
-
-public:
-  NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIEXPANDEDPRINCIPAL
   NS_DECL_NSISERIALIZABLE
-  NS_IMETHOD Equals(nsIPrincipal* other, bool* _retval) override;
-  NS_IMETHOD EqualsConsideringDomain(nsIPrincipal* other, bool* _retval) override;
+  NS_IMETHODIMP_(MozExternalRefCountType) AddRef() override { return nsJSPrincipals::AddRef(); };
+  NS_IMETHODIMP_(MozExternalRefCountType) Release() override { return nsJSPrincipals::Release(); };
+  NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) override;
   NS_IMETHOD GetHashValue(uint32_t* aHashValue) override;
   NS_IMETHOD GetURI(nsIURI** aURI) override;
   NS_IMETHOD GetDomain(nsIURI** aDomain) override;
   NS_IMETHOD SetDomain(nsIURI* aDomain) override;
-  NS_IMETHOD GetOrigin(char** aOrigin) override;
-  NS_IMETHOD Subsumes(nsIPrincipal* other, bool* _retval) override;
-  NS_IMETHOD SubsumesConsideringDomain(nsIPrincipal* other, bool* _retval) override;
   NS_IMETHOD CheckMayLoad(nsIURI* uri, bool report, bool allowIfInheritsPrincipal) override;
-  NS_IMETHOD GetJarPrefix(nsACString& aJarPrefix) override;
-  NS_IMETHOD GetAppStatus(uint16_t* aAppStatus) override;
-  NS_IMETHOD GetAppId(uint32_t* aAppStatus) override;
-  NS_IMETHOD GetIsInBrowserElement(bool* aIsInBrowserElement) override;
-  NS_IMETHOD GetUnknownAppId(bool* aUnknownAppId) override;
-  NS_IMETHOD GetIsNullPrincipal(bool* aIsNullPrincipal) override;
   NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) override;
   virtual bool IsOnCSSUnprefixingWhitelist() override;
-#ifdef DEBUG
-  virtual void dumpImpl() override;
-#endif
-  
   virtual void GetScriptLocation(nsACString &aStr) override;
+  nsresult GetOriginInternal(nsACString& aOrigin) override;
+
+protected:
+  virtual ~nsExpandedPrincipal();
+
+  bool SubsumesInternal(nsIPrincipal* aOther, DocumentDomainConsideration aConsideration) override;
 
 private:
   nsTArray< nsCOMPtr<nsIPrincipal> > mPrincipals;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/caps/nsScriptSecurityManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/caps/nsScriptSecurityManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/caps/nsScriptSecurityManager.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/caps/nsScriptSecurityManager.cpp	2015-05-25 20:43:09.000000000 +0000
@@ -19,6 +19,7 @@
 #include "nsINestedURI.h"
 #include "nspr.h"
 #include "nsJSPrincipals.h"
+#include "mozilla/BasePrincipal.h"
 #include "nsSystemPrincipal.h"
 #include "nsPrincipal.h"
 #include "nsNullPrincipal.h"
@@ -280,29 +281,21 @@
     NS_ENSURE_SUCCESS(app->GetAppStatus(&status),
                       nsIPrincipal::APP_STATUS_NOT_INSTALLED);
 
-    nsAutoCString origin;
-    NS_ENSURE_SUCCESS(aPrin->GetOrigin(getter_Copies(origin)),
-                      nsIPrincipal::APP_STATUS_NOT_INSTALLED);
     nsString appOrigin;
     NS_ENSURE_SUCCESS(app->GetOrigin(appOrigin),
                       nsIPrincipal::APP_STATUS_NOT_INSTALLED);
-
-    // We go from string -> nsIURI -> origin to be sure we
-    // compare two punny-encoded origins.
     nsCOMPtr<nsIURI> appURI;
     NS_ENSURE_SUCCESS(NS_NewURI(getter_AddRefs(appURI), appOrigin),
                       nsIPrincipal::APP_STATUS_NOT_INSTALLED);
 
-    nsAutoCString appOriginPunned;
-    NS_ENSURE_SUCCESS(nsPrincipal::GetOriginForURI(appURI, getter_Copies(appOriginPunned)),
-                      nsIPrincipal::APP_STATUS_NOT_INSTALLED);
-
-    if (!appOriginPunned.Equals(origin)) {
-        return nsIPrincipal::APP_STATUS_NOT_INSTALLED;
-    }
-
-    return status;
-
+    // The app could contain a cross-origin iframe - make sure that the content
+    // is actually same-origin with the app.
+    MOZ_ASSERT(inMozBrowser == false, "Checked this above");
+    OriginAttributes attrs(appId, false);
+    nsCOMPtr<nsIPrincipal> appPrin = BasePrincipal::CreateCodebasePrincipal(appURI, attrs);
+    NS_ENSURE_TRUE(appPrin, nsIPrincipal::APP_STATUS_NOT_INSTALLED);
+    return aPrin->Equals(appPrin) ? status
+                                  : nsIPrincipal::APP_STATUS_NOT_INSTALLED;
 }
 
 /*
@@ -378,8 +371,10 @@
         return GetLoadContextCodebasePrincipal(uri, loadContext, aPrincipal);
     }
 
-    return GetCodebasePrincipalInternal(uri, UNKNOWN_APP_ID,
-        /* isInBrowserElement */ false, aPrincipal);
+    OriginAttributes attrs(UNKNOWN_APP_ID, false);
+    nsCOMPtr<nsIPrincipal> prin = BasePrincipal::CreateCodebasePrincipal(uri, attrs);
+    prin.forget(aPrincipal);
+    return *aPrincipal ? NS_OK : NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
@@ -487,26 +482,6 @@
     return SecurityHashURI(uri);
 }
 
-/* static */ bool
-nsScriptSecurityManager::AppAttributesEqual(nsIPrincipal* aFirst,
-                                            nsIPrincipal* aSecond)
-{
-    MOZ_ASSERT(aFirst && aSecond, "Don't pass null pointers!");
-
-    uint32_t firstAppId = nsIScriptSecurityManager::UNKNOWN_APP_ID;
-    if (!aFirst->GetUnknownAppId()) {
-        firstAppId = aFirst->GetAppId();
-    }
-
-    uint32_t secondAppId = nsIScriptSecurityManager::UNKNOWN_APP_ID;
-    if (!aSecond->GetUnknownAppId()) {
-        secondAppId = aSecond->GetAppId();
-    }
-
-    return ((firstAppId == secondAppId) &&
-            (aFirst->GetIsInBrowserElement() == aSecond->GetIsInBrowserElement()));
-}
-
 NS_IMETHODIMP
 nsScriptSecurityManager::CheckLoadURIFromScript(JSContext *cx, nsIURI *aURI)
 {
@@ -724,10 +699,10 @@
             auto themeOrigin = Preferences::GetCString("b2g.theme.origin");
             if (themeOrigin) {
                 nsAutoCString targetOrigin;
-                nsPrincipal::GetOriginForURI(targetBaseURI, getter_Copies(targetOrigin));
+                nsPrincipal::GetOriginForURI(targetBaseURI, targetOrigin);
                 if (targetOrigin.Equals(themeOrigin)) {
                     nsAutoCString pOrigin;
-                    aPrincipal->GetOrigin(getter_Copies(pOrigin));
+                    aPrincipal->GetOrigin(pOrigin);
                     return nsContentUtils::IsExactSitePermAllow(aPrincipal, "themeable") ||
                            pOrigin.Equals(themeOrigin)
                         ? NS_OK : NS_ERROR_DOM_BAD_URI;
@@ -999,55 +974,24 @@
     return NS_OK;
 }
 
-nsresult
-nsScriptSecurityManager::CreateCodebasePrincipal(nsIURI* aURI, uint32_t aAppId,
-                                                 bool aInMozBrowser,
-                                                 nsIPrincipal **result)
-{
-    // I _think_ it's safe to not create null principals here based on aURI.
-    // At least all the callers would do the right thing in those cases, as far
-    // as I can tell.  --bz
-
-    nsCOMPtr<nsIURIWithPrincipal> uriPrinc = do_QueryInterface(aURI);
-    if (uriPrinc) {
-        nsCOMPtr<nsIPrincipal> principal;
-        uriPrinc->GetPrincipal(getter_AddRefs(principal));
-        if (!principal) {
-            principal = nsNullPrincipal::Create();
-            NS_ENSURE_TRUE(principal, NS_ERROR_FAILURE);
-        }
-
-        principal.forget(result);
-
-        return NS_OK;
-    }
-
-    nsRefPtr<nsPrincipal> codebase = new nsPrincipal();
-
-    nsresult rv = codebase->Init(aURI, aAppId, aInMozBrowser);
-    if (NS_FAILED(rv))
-        return rv;
-
-    NS_ADDREF(*result = codebase);
-
-    return NS_OK;
-}
-
 NS_IMETHODIMP
 nsScriptSecurityManager::GetSimpleCodebasePrincipal(nsIURI* aURI,
                                                     nsIPrincipal** aPrincipal)
 {
-  return GetCodebasePrincipalInternal(aURI,
-                                      nsIScriptSecurityManager::UNKNOWN_APP_ID,
-                                      false, aPrincipal);
+  OriginAttributes attrs(UNKNOWN_APP_ID, false);
+  nsCOMPtr<nsIPrincipal> prin = BasePrincipal::CreateCodebasePrincipal(aURI, attrs);
+  prin.forget(aPrincipal);
+  return *aPrincipal ? NS_OK : NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
 nsScriptSecurityManager::GetNoAppCodebasePrincipal(nsIURI* aURI,
                                                    nsIPrincipal** aPrincipal)
 {
-  return GetCodebasePrincipalInternal(aURI,  nsIScriptSecurityManager::NO_APP_ID,
-                                      false, aPrincipal);
+  OriginAttributes attrs(NO_APP_ID, false);
+  nsCOMPtr<nsIPrincipal> prin = BasePrincipal::CreateCodebasePrincipal(aURI, attrs);
+  prin.forget(aPrincipal);
+  return *aPrincipal ? NS_OK : NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
@@ -1058,6 +1002,33 @@
 }
 
 NS_IMETHODIMP
+nsScriptSecurityManager::CreateCodebasePrincipal(nsIURI* aURI, JS::Handle<JS::Value> aOriginAttributes,
+                                                 JSContext* aCx, nsIPrincipal** aPrincipal)
+{
+  OriginAttributes attrs;
+  if (!aOriginAttributes.isObject() || !attrs.Init(aCx, aOriginAttributes)) {
+      return NS_ERROR_INVALID_ARG;
+  }
+  nsCOMPtr<nsIPrincipal> prin = BasePrincipal::CreateCodebasePrincipal(aURI, attrs);
+  prin.forget(aPrincipal);
+  return *aPrincipal ? NS_OK : NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
+nsScriptSecurityManager::CreateNullPrincipal(JS::Handle<JS::Value> aOriginAttributes,
+                                             JSContext* aCx, nsIPrincipal** aPrincipal)
+{
+  OriginAttributes attrs;
+  if (!aOriginAttributes.isObject() || !attrs.Init(aCx, aOriginAttributes)) {
+      return NS_ERROR_INVALID_ARG;
+  }
+  nsCOMPtr<nsIPrincipal> prin = nsNullPrincipal::Create(attrs);
+  NS_ENSURE_TRUE(prin, NS_ERROR_FAILURE);
+  prin.forget(aPrincipal);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
 nsScriptSecurityManager::GetAppCodebasePrincipal(nsIURI* aURI,
                                                  uint32_t aAppId,
                                                  bool aInMozBrowser,
@@ -1066,7 +1037,10 @@
   NS_ENSURE_TRUE(aAppId != nsIScriptSecurityManager::UNKNOWN_APP_ID,
                  NS_ERROR_INVALID_ARG);
 
-  return GetCodebasePrincipalInternal(aURI, aAppId, aInMozBrowser, aPrincipal);
+  OriginAttributes attrs(aAppId, aInMozBrowser);
+  nsCOMPtr<nsIPrincipal> prin = BasePrincipal::CreateCodebasePrincipal(aURI, attrs);
+  prin.forget(aPrincipal);
+  return *aPrincipal ? NS_OK : NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
@@ -1075,14 +1049,13 @@
                                   nsILoadContext* aLoadContext,
                                   nsIPrincipal** aPrincipal)
 {
-  uint32_t appId;
-  aLoadContext->GetAppId(&appId);
-  bool isInBrowserElement;
-  aLoadContext->GetIsInBrowserElement(&isInBrowserElement);
-  return GetCodebasePrincipalInternal(aURI,
-                                      appId,
-                                      isInBrowserElement,
-                                      aPrincipal);
+  // XXXbholley - Make this more general in bug 1165466.
+  OriginAttributes attrs;
+  aLoadContext->GetAppId(&attrs.mAppId);
+  aLoadContext->GetIsInBrowserElement(&attrs.mInBrowser);
+  nsCOMPtr<nsIPrincipal> prin = BasePrincipal::CreateCodebasePrincipal(aURI, attrs);
+  prin.forget(aPrincipal);
+  return *aPrincipal ? NS_OK : NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
@@ -1090,37 +1063,11 @@
                                                       nsIDocShell* aDocShell,
                                                       nsIPrincipal** aPrincipal)
 {
-  return GetCodebasePrincipalInternal(aURI,
-                                      aDocShell->GetAppId(),
-                                      aDocShell->GetIsInBrowserElement(),
-                                      aPrincipal);
-}
-
-nsresult
-nsScriptSecurityManager::GetCodebasePrincipalInternal(nsIURI *aURI,
-                                                      uint32_t aAppId,
-                                                      bool aInMozBrowser,
-                                                      nsIPrincipal **result)
-{
-    NS_ENSURE_ARG(aURI);
-
-    bool inheritsPrincipal;
-    nsresult rv =
-        NS_URIChainHasFlags(aURI,
-                            nsIProtocolHandler::URI_INHERITS_SECURITY_CONTEXT,
-                            &inheritsPrincipal);
-    nsCOMPtr<nsIPrincipal> principal;
-    if (NS_FAILED(rv) || inheritsPrincipal) {
-        principal = nsNullPrincipal::Create();
-        NS_ENSURE_TRUE(principal, NS_ERROR_FAILURE);
-    } else {
-        rv = CreateCodebasePrincipal(aURI, aAppId, aInMozBrowser,
-                                     getter_AddRefs(principal));
-        NS_ENSURE_SUCCESS(rv, rv);
-    }
-    principal.forget(result);
-
-    return NS_OK;
+  // XXXbholley - Make this more general in bug 1165466.
+  OriginAttributes attrs(aDocShell->GetAppId(), aDocShell->GetIsInBrowserElement());
+  nsCOMPtr<nsIPrincipal> prin = BasePrincipal::CreateCodebasePrincipal(aURI, attrs);
+  prin.forget(aPrincipal);
+  return *aPrincipal ? NS_OK : NS_ERROR_FAILURE;
 }
 
 // static
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/caps/nsScriptSecurityManager.h firefox-trunk-41.0~a1~hg20150524r245419/caps/nsScriptSecurityManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/caps/nsScriptSecurityManager.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/caps/nsScriptSecurityManager.h	2015-05-25 20:43:09.000000000 +0000
@@ -22,6 +22,10 @@
 class nsIStringBundle;
 class nsSystemPrincipal;
 
+namespace mozilla {
+class OriginAttributes;
+}
+
 /////////////////////////////
 // nsScriptSecurityManager //
 /////////////////////////////
@@ -80,22 +84,6 @@
         return sStrictFileOriginPolicy;
     }
 
-    /**
-     * Returns true if the two principals share the same app attributes.
-     *
-     * App attributes are appId and the inBrowserElement flag.
-     * Two principals have the same app attributes if those information are
-     * equals.
-     * This method helps keeping principals from different apps isolated from
-     * each other. Also, it helps making sure mozbrowser (web views) and their
-     * parent are isolated from each other. All those entities do not share the
-     * same data (cookies, IndexedDB, localStorage, etc.) so we shouldn't allow
-     * violating that principle.
-     */
-    static bool
-    AppAttributesEqual(nsIPrincipal* aFirst,
-                       nsIPrincipal* aSecond);
-
     void DeactivateDomainPolicy();
 
 private:
@@ -116,15 +104,6 @@
     static nsIPrincipal* doGetObjectPrincipal(JSObject* obj);
 
     nsresult
-    GetCodebasePrincipalInternal(nsIURI* aURI, uint32_t aAppId,
-                                 bool aInMozBrowser,
-                                 nsIPrincipal** result);
-
-    nsresult
-    CreateCodebasePrincipal(nsIURI* aURI, uint32_t aAppId, bool aInMozBrowser,
-                            nsIPrincipal** result);
-
-    nsresult
     Init();
 
     nsresult
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/caps/nsSystemPrincipal.cpp firefox-trunk-41.0~a1~hg20150524r245419/caps/nsSystemPrincipal.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/caps/nsSystemPrincipal.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/caps/nsSystemPrincipal.cpp	2015-05-25 20:43:09.000000000 +0000
@@ -29,76 +29,19 @@
                             nsIPrincipal,
                             nsISerializable)
 
-NS_IMETHODIMP_(MozExternalRefCountType)
-nsSystemPrincipal::AddRef()
-{
-  NS_PRECONDITION(int32_t(refcount) >= 0, "illegal refcnt");
-  nsrefcnt count = ++refcount;
-  NS_LOG_ADDREF(this, count, "nsSystemPrincipal", sizeof(*this));
-  return count;
-}
-
-NS_IMETHODIMP_(MozExternalRefCountType)
-nsSystemPrincipal::Release()
-{
-  NS_PRECONDITION(0 != refcount, "dup release");
-  nsrefcnt count = --refcount;
-  NS_LOG_RELEASE(this, count, "nsSystemPrincipal");
-  if (count == 0) {
-    delete this;
-  }
-
-  return count;
-}
-
-static const char SYSTEM_PRINCIPAL_SPEC[] = "[System Principal]";
+#define SYSTEM_PRINCIPAL_SPEC "[System Principal]"
 
 void
 nsSystemPrincipal::GetScriptLocation(nsACString &aStr)
 {
-    aStr.Assign(SYSTEM_PRINCIPAL_SPEC);
-}
-
-#ifdef DEBUG
-void nsSystemPrincipal::dumpImpl()
-{
-  fprintf(stderr, "nsSystemPrincipal (%p)\n", this);
+    aStr.AssignLiteral(SYSTEM_PRINCIPAL_SPEC);
 }
-#endif 
-
 
 ///////////////////////////////////////
 // Methods implementing nsIPrincipal //
 ///////////////////////////////////////
 
 NS_IMETHODIMP
-nsSystemPrincipal::Equals(nsIPrincipal *other, bool *result)
-{
-    *result = (other == this);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSystemPrincipal::EqualsConsideringDomain(nsIPrincipal *other, bool *result)
-{
-    return Equals(other, result);
-}
-
-NS_IMETHODIMP
-nsSystemPrincipal::Subsumes(nsIPrincipal *other, bool *result)
-{
-    *result = true;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSystemPrincipal::SubsumesConsideringDomain(nsIPrincipal *other, bool *result)
-{
-    *result = true;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
 nsSystemPrincipal::CheckMayLoad(nsIURI* uri, bool aReport, bool aAllowIfInheritsPrincipal)
 {
     return NS_OK;
@@ -118,11 +61,11 @@
     return NS_OK;
 }
 
-NS_IMETHODIMP 
-nsSystemPrincipal::GetOrigin(char** aOrigin)
+nsresult
+nsSystemPrincipal::GetOriginInternal(nsACString& aOrigin)
 {
-    *aOrigin = ToNewCString(NS_LITERAL_CSTRING(SYSTEM_PRINCIPAL_SPEC));
-    return *aOrigin ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+    aOrigin.AssignLiteral(SYSTEM_PRINCIPAL_SPEC);
+    return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -153,61 +96,12 @@
 }
 
 NS_IMETHODIMP
-nsSystemPrincipal::GetJarPrefix(nsACString& aJarPrefix)
-{
-  aJarPrefix.Truncate();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSystemPrincipal::GetAppStatus(uint16_t* aAppStatus)
-{
-  *aAppStatus = nsIPrincipal::APP_STATUS_NOT_INSTALLED;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSystemPrincipal::GetAppId(uint32_t* aAppId)
-{
-  *aAppId = nsIScriptSecurityManager::NO_APP_ID;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSystemPrincipal::GetIsInBrowserElement(bool* aIsInBrowserElement)
-{
-  *aIsInBrowserElement = false;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSystemPrincipal::GetUnknownAppId(bool* aUnknownAppId)
-{
-  *aUnknownAppId = false;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSystemPrincipal::GetIsNullPrincipal(bool* aIsNullPrincipal)
-{
-  *aIsNullPrincipal = false;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
 nsSystemPrincipal::GetBaseDomain(nsACString& aBaseDomain)
 {
   // No base domain for chrome.
   return NS_OK;
 }
 
-bool
-nsSystemPrincipal::IsOnCSSUnprefixingWhitelist()
-{
-  // chrome stylesheets should not be fed to the CSS Unprefixing Service.
-  return false;
-}
-
 //////////////////////////////////////////
 // Methods implementing nsISerializable //
 //////////////////////////////////////////
@@ -225,15 +119,3 @@
     // no-op: CID is sufficient to identify the mSystemPrincipal singleton
     return NS_OK;
 }
-
-/////////////////////////////////////////////
-// Constructor, Destructor, initialization //
-/////////////////////////////////////////////
-
-nsSystemPrincipal::nsSystemPrincipal()
-{
-}
-
-nsSystemPrincipal::~nsSystemPrincipal()
-{
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/caps/nsSystemPrincipal.h firefox-trunk-41.0~a1~hg20150524r245419/caps/nsSystemPrincipal.h
--- firefox-trunk-41.0~a1~hg20150513r243603/caps/nsSystemPrincipal.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/caps/nsSystemPrincipal.h	2015-05-25 20:43:09.000000000 +0000
@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- 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/. */
@@ -11,34 +12,40 @@
 #include "nsIPrincipal.h"
 #include "nsJSPrincipals.h"
 
+#include "mozilla/BasePrincipal.h"
+
 #define NS_SYSTEMPRINCIPAL_CID \
 { 0x4a6212db, 0xaccb, 0x11d3, \
 { 0xb7, 0x65, 0x0, 0x60, 0xb0, 0xb6, 0xce, 0xcb }}
 #define NS_SYSTEMPRINCIPAL_CONTRACTID "@mozilla.org/systemprincipal;1"
 
 
-class nsSystemPrincipal final : public nsJSPrincipals
+class nsSystemPrincipal final : public mozilla::BasePrincipal
 {
 public:
-    // Our refcount is managed by nsJSPrincipals.  Use this macro to avoid
-    // an extra refcount member.
-    NS_DECL_ISUPPORTS_INHERITED
-    NS_DECL_NSIPRINCIPAL
-    NS_DECL_NSISERIALIZABLE
-
-    nsSystemPrincipal();
-
-    virtual void GetScriptLocation(nsACString &aStr) override;
-
-#ifdef DEBUG
-    virtual void dumpImpl() override;
-#endif 
+  NS_DECL_NSISERIALIZABLE
+  NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) override;
+  NS_IMETHOD GetHashValue(uint32_t* aHashValue) override;
+  NS_IMETHOD GetURI(nsIURI** aURI) override;
+  NS_IMETHOD GetDomain(nsIURI** aDomain) override;
+  NS_IMETHOD SetDomain(nsIURI* aDomain) override;
+  NS_IMETHOD CheckMayLoad(nsIURI* uri, bool report, bool allowIfInheritsPrincipal) override;
+  NS_IMETHOD GetCsp(nsIContentSecurityPolicy** aCsp) override;
+  NS_IMETHOD SetCsp(nsIContentSecurityPolicy* aCsp) override;
+  NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) override;
+  nsresult GetOriginInternal(nsACString& aOrigin) override;
+
+  nsSystemPrincipal() {}
+
+  virtual void GetScriptLocation(nsACString &aStr) override;
 
 protected:
-    virtual ~nsSystemPrincipal(void);
+  virtual ~nsSystemPrincipal(void) {}
 
-    // XXX Probably unnecessary.  See bug 143559.
-    NS_DECL_OWNINGTHREAD
+  bool SubsumesInternal(nsIPrincipal *aOther, DocumentDomainConsideration aConsideration) override
+  {
+    return true;
+  }
 };
 
 #endif // nsSystemPrincipal_h__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/caps/tests/unit/test_origin.js firefox-trunk-41.0~a1~hg20150524r245419/caps/tests/unit/test_origin.js
--- firefox-trunk-41.0~a1~hg20150513r243603/caps/tests/unit/test_origin.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/caps/tests/unit/test_origin.js	2015-05-25 20:43:09.000000000 +0000
@@ -0,0 +1,101 @@
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/BrowserUtils.jsm");
+var ssm = Services.scriptSecurityManager;
+function makeURI(uri) { return Services.io.newURI(uri, null, null); }
+
+function checkThrows(f) {
+  var threw = false;
+  try { f(); } catch (e) { threw = true }
+  do_check_true(threw);
+}
+
+function checkCrossOrigin(a, b) {
+  do_check_false(a.equals(b));
+  do_check_false(a.equalsConsideringDomain(b));
+  do_check_false(a.subsumes(b));
+  do_check_false(a.subsumesConsideringDomain(b));
+  do_check_false(b.subsumes(a));
+  do_check_false(b.subsumesConsideringDomain(a));
+  do_check_eq(a.cookieJar === b.cookieJar,
+              a.originAttributes.appId == b.originAttributes.appId &&
+              a.originAttributes.inBrowser == b.originAttributes.inBrowser);
+}
+
+function checkOriginAttributes(prin, appId, inBrowser, suffix) {
+  do_check_eq(prin.originAttributes.appId, appId || 0);
+  do_check_eq(prin.originAttributes.inBrowser, inBrowser || false);
+  do_check_eq(prin.originSuffix, suffix || '');
+  if (!prin.isNullPrincipal && !prin.origin.startsWith('[')) {
+    do_check_true(BrowserUtils.principalFromOrigin(prin.origin).equals(prin));
+  } else {
+    checkThrows(() => BrowserUtils.principalFromOrigin(prin.origin));
+  }
+}
+
+function run_test() {
+  // Attributeless origins.
+  do_check_eq(ssm.getSystemPrincipal().origin, '[System Principal]');
+  checkOriginAttributes(ssm.getSystemPrincipal());
+  var exampleOrg = ssm.createCodebasePrincipal(makeURI('http://example.org'), {});
+  do_check_eq(exampleOrg.origin, 'http://example.org');
+  checkOriginAttributes(exampleOrg);
+  var exampleCom = ssm.createCodebasePrincipal(makeURI('https://www.example.com:123'), {});
+  do_check_eq(exampleCom.origin, 'https://www.example.com:123');
+  checkOriginAttributes(exampleCom);
+  var nullPrin = Cu.getObjectPrincipal(new Cu.Sandbox(null));
+  do_check_true(/^moz-nullprincipal:\{([0-9]|[a-z]|\-){36}\}$/.test(nullPrin.origin));
+  checkOriginAttributes(nullPrin);
+  var ep = Cu.getObjectPrincipal(new Cu.Sandbox([exampleCom, nullPrin, exampleOrg]));
+  checkOriginAttributes(ep);
+  checkCrossOrigin(exampleCom, exampleOrg);
+  checkCrossOrigin(exampleOrg, nullPrin);
+
+  // nsEP origins should be in lexical order.
+  do_check_eq(ep.origin, `[Expanded Principal [${exampleOrg.origin}, ${exampleCom.origin}, ${nullPrin.origin}]]`);
+
+  // Make sure createCodebasePrincipal does what the rest of gecko does.
+  do_check_true(exampleOrg.equals(Cu.getObjectPrincipal(new Cu.Sandbox('http://example.org'))));
+
+  //
+  // Test origin attributes.
+  //
+
+  // Just app.
+  var exampleOrg_app = ssm.createCodebasePrincipal(makeURI('http://example.org'), {appId: 42});
+  var nullPrin_app = ssm.createNullPrincipal({appId: 42});
+  checkOriginAttributes(exampleOrg_app, 42, false, '!appId=42');
+  checkOriginAttributes(nullPrin_app, 42, false, '!appId=42');
+  do_check_eq(exampleOrg_app.origin, 'http://example.org!appId=42');
+
+  // Just browser.
+  var exampleOrg_browser = ssm.createCodebasePrincipal(makeURI('http://example.org'), {inBrowser: true});
+  var nullPrin_browser = ssm.createNullPrincipal({inBrowser: true});
+  checkOriginAttributes(exampleOrg_browser, 0, true, '!inBrowser=1');
+  checkOriginAttributes(nullPrin_browser, 0, true, '!inBrowser=1');
+  do_check_eq(exampleOrg_browser.origin, 'http://example.org!inBrowser=1');
+
+  // App and browser.
+  var exampleOrg_appBrowser = ssm.createCodebasePrincipal(makeURI('http://example.org'), {inBrowser: true, appId: 42});
+  var nullPrin_appBrowser = ssm.createNullPrincipal({inBrowser: true, appId: 42});
+  checkOriginAttributes(exampleOrg_appBrowser, 42, true, '!appId=42&inBrowser=1');
+  checkOriginAttributes(nullPrin_appBrowser, 42, true, '!appId=42&inBrowser=1');
+  do_check_eq(exampleOrg_appBrowser.origin, 'http://example.org!appId=42&inBrowser=1');
+
+  // App and browser, different domain.
+  var exampleCom_appBrowser = ssm.createCodebasePrincipal(makeURI('https://www.example.com:123'), {appId: 42, inBrowser: true});
+  checkOriginAttributes(exampleCom_appBrowser, 42, true, '!appId=42&inBrowser=1');
+  do_check_eq(exampleCom_appBrowser.origin, 'https://www.example.com:123!appId=42&inBrowser=1');
+
+  // Check that all of the above are cross-origin.
+  checkCrossOrigin(exampleOrg_app, exampleOrg);
+  checkCrossOrigin(exampleOrg_app, nullPrin_app);
+  checkCrossOrigin(exampleOrg_browser, exampleOrg_app);
+  checkCrossOrigin(exampleOrg_browser, nullPrin_browser);
+  checkCrossOrigin(exampleOrg_appBrowser, exampleOrg_app);
+  checkCrossOrigin(exampleOrg_appBrowser, nullPrin_appBrowser);
+  checkCrossOrigin(exampleOrg_appBrowser, exampleCom_appBrowser);
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/caps/tests/unit/xpcshell.ini firefox-trunk-41.0~a1~hg20150524r245419/caps/tests/unit/xpcshell.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/caps/tests/unit/xpcshell.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/caps/tests/unit/xpcshell.ini	2015-05-25 20:43:09.000000000 +0000
@@ -0,0 +1,5 @@
+[DEFAULT]
+head =
+tail =
+
+[test_origin.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/CLOBBER firefox-trunk-41.0~a1~hg20150524r245419/CLOBBER
--- firefox-trunk-41.0~a1~hg20150513r243603/CLOBBER	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/CLOBBER	2015-05-25 20:42:33.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.
 
-Merge day clobber
\ No newline at end of file
+Bug 1166031 - NSS update hit needs-clobber bustage.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/config/external/nss/Makefile.in firefox-trunk-41.0~a1~hg20150524r245419/config/external/nss/Makefile.in
--- firefox-trunk-41.0~a1~hg20150513r243603/config/external/nss/Makefile.in	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/config/external/nss/Makefile.in	2015-05-25 20:43:09.000000000 +0000
@@ -374,7 +374,7 @@
 # OS_LIBS comes from having mozcrt as a dependency in moz.build.
 DLLFLAGS := $(OS_LIBS)
 else
-DLLFLAGS := -LIBPATH:$(ABS_DIST)/lib -DEFAULTLIB:mozglue
+DLLFLAGS := -LIBPATH:$(ABS_DIST)/../mozglue/build -DEFAULTLIB:mozglue
 endif
 export DLLFLAGS
 endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/config/gcc_hidden_dso_handle.h firefox-trunk-41.0~a1~hg20150524r245419/config/gcc_hidden_dso_handle.h
--- firefox-trunk-41.0~a1~hg20150513r243603/config/gcc_hidden_dso_handle.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/config/gcc_hidden_dso_handle.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifdef __cplusplus
-extern "C"
-#endif
-void *__dso_handle;
-
-/* Begin all files as hidden visibility */
-#pragma GCC visibility push(hidden)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/config/makefiles/xpidl/Makefile.in firefox-trunk-41.0~a1~hg20150524r245419/config/makefiles/xpidl/Makefile.in
--- firefox-trunk-41.0~a1~hg20150513r243603/config/makefiles/xpidl/Makefile.in	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/config/makefiles/xpidl/Makefile.in	2015-05-25 20:43:09.000000000 +0000
@@ -43,6 +43,16 @@
 		$(dist_include_dir) $(@D) $(idl_deps_dir) $(libxul_sdk_includes) \
 		$(basename $(notdir $@)) $($(basename $(notdir $@))_deps)
 
+# Chrome manifests may be written from several Makefiles at various times during
+# the build. The 'buildlist' action adds to the file if it already exists, but
+# if it does exist, make considers it to be up-to-date (as we have no inputs to
+# depend on). We use FORCE to ensure that we always add the interface manifest,
+# whether or not the chrome manifest already exists.
+%/chrome.manifest: FORCE
+	$(call py_action,buildlist,$@ 'manifest components/interfaces.manifest')
+
+chrome_manifests := @chrome_manifests@
+
 xpidl_modules := @xpidl_modules@
 xpt_files := @xpt_files@
 
@@ -52,7 +62,7 @@
 
 GARBAGE += $(xpt_files) $(depends_files)
 
-xpidl:: $(xpt_files)
+xpidl:: $(xpt_files) $(chrome_manifests)
 
 $(xpt_files): $(process_py) $(call mkdir_deps,$(idl_deps_dir) $(dist_include_dir))
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/config/rules.mk firefox-trunk-41.0~a1~hg20150524r245419/config/rules.mk
--- firefox-trunk-41.0~a1~hg20150513r243603/config/rules.mk	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/config/rules.mk	2015-05-25 20:43:09.000000000 +0000
@@ -1168,21 +1168,6 @@
 endif
 
 ################################################################################
-# Install a linked .xpt into the appropriate place.
-# This should ideally be performed by the non-recursive idl make file. Some day.
-ifdef XPT_NAME #{
-
-ifndef NO_DIST_INSTALL
-ifndef NO_INTERFACES_MANIFEST
-export:: $(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
-endif
-
-endif #} XPT_NAME
-
-################################################################################
 # Copy each element of EXTRA_COMPONENTS to $(FINAL_TARGET)/components
 ifdef EXTRA_COMPONENTS
 misc:: $(EXTRA_COMPONENTS)
@@ -1320,7 +1305,7 @@
 endif
 endif
 	@echo 'Packaging $(XPI_PKGNAME).xpi...'
-	cd $(FINAL_TARGET) && $(ZIP) -qr ../$(XPI_PKGNAME).xpi *
+	$(call py_action,zip,-C $(FINAL_TARGET) ../$(XPI_PKGNAME).xpi '*')
 endif
 
 # See comment above about moving this out of the tools tier.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/config/system-headers firefox-trunk-41.0~a1~hg20150524r245419/config/system-headers
--- firefox-trunk-41.0~a1~hg20150513r243603/config/system-headers	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/config/system-headers	2015-05-25 20:43:09.000000000 +0000
@@ -238,10 +238,6 @@
 builtin.h
 Button.h
 byteswap.h
-#if MOZ_TREE_CAIRO!=1
-#define WRAP_CAIRO_HEADERS
-#endif
-#ifdef WRAP_CAIRO_HEADERS
 pixman.h
 cairo.h
 cairo-atsui.h
@@ -258,7 +254,6 @@
 cairo-directfb.h
 cairo-qpainter.h
 cairo-qt.h
-#endif
 dfiff.h
 exception
 ffi.h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/configure.in firefox-trunk-41.0~a1~hg20150524r245419/configure.in
--- firefox-trunk-41.0~a1~hg20150513r243603/configure.in	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/configure.in	2015-05-25 20:43:09.000000000 +0000
@@ -166,24 +166,6 @@
     AC_MSG_ERROR([perl not found in \$PATH])
 fi
 
-if test -n "$GAIADIR" -a ! -d "$GAIADIR" ; then
-    AC_MSG_ERROR([GAIADIR '$GAIADIR' isn't a valid directory])
-fi
-
-AC_SUBST(GAIADIR)
-if test -n "$GAIADIR" ; then
-    AC_DEFINE(PACKAGE_GAIA)
-fi
-
-if test -n "$FXOS_SIMULATOR" -a -z "$GAIADIR" ; then
-    AC_MSG_ERROR([FXOS_SIMULATOR=1 requires GAIADIR to be defined])
-fi
-
-if test -n "$FXOS_SIMULATOR" ; then
-    AC_DEFINE(FXOS_SIMULATOR)
-    AC_SUBST(FXOS_SIMULATOR)
-fi
-
 if test -n "$MOZTTDIR" -a ! -d "$MOZTTDIR" ; then
     AC_MSG_ERROR([MOZTTDIR '$MOZTTDIR' isn't a valid directory])
 fi
@@ -430,8 +412,18 @@
 MOZ_CHECK_COMPILER_WRAPPER
 
 MOZ_PATH_PROG(RUSTC, rustc)
+if test -n "$RUSTC"; then
+  AC_MSG_CHECKING([rustc version])
+  RUSTC_VERSION=`$RUSTC --version | cut -d ' ' -f 2`
+  # Parse out semversion elements.
+  _RUSTC_MAJOR_VERSION=`echo ${RUSTC_VERSION} | cut -d . -f 1`
+  _RUSTC_MINOR_VERSION=`echo ${RUSTC_VERSION} | cut -d . -f 2`
+  _RUSTC_EXTRA_VERSION=`echo ${RUSTC_VERSION} | cut -d . -f 3 | cut -d + -f 1`
+  _RUSTC_PATCH_VERSION=`echo ${_RUSTC_EXTRA_VERSION} | cut -d '-' -f 1`
+  AC_MSG_RESULT([$RUSTC_VERSION (v${_RUSTC_MAJOR_VERSION}.${_RUSTC_MINOR_VERSION}.${_RUSTC_PATCH_VERSION})])
+fi
 MOZ_ARG_ENABLE_BOOL([rust],
-                    [  --enable-rust  Include rust language sources],
+                    [  --enable-rust           Include rust language sources],
                     [MOZ_RUST=1],
                     [MOZ_RUST= ])
 if test -z "$RUSTC" -a -n "$MOZ_RUST"; then
@@ -439,6 +431,14 @@
     To compile rust language sources, you must have 'rustc' in your path.
     See http://www.rust-lang.org/ for more information.])
 fi
+if test -n "$MOZ_RUST" -a -z "$_RUSTC_MAJOR_VERSION" -o \
+  "$_RUSTC_MAJOR_VERSION" -lt 1; then
+  AC_MSG_ERROR([Rust compiler ${RUSTC_VERSION} is too old.
+    To compile rust language sources please install at least
+    version 1.0 of the 'rustc' toolchain and make sure it is
+    first in your path.
+    You can verify this by typing 'rustc --version'.])
+fi
 AC_SUBST(MOZ_RUST)
 
 dnl ========================================================
@@ -466,6 +466,24 @@
 AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
 
 dnl ========================================================
+dnl Special MacOS X checks
+dnl ========================================================
+
+if test -n "$MACOSX_DEPLOYMENT_TARGET" -a -n "$MOZ_RUST"; then
+  AC_MSG_CHECKING([MacOS X compatibility with rust])
+  # rustc doesn't support MacOS X 10.6 or earlier.
+  # https://github.com/rust-lang/rust/issues/25342
+  _MACOSX_TARGET_MINOR=`echo "$MACOSX_DEPLOYMENT_TARGET" | cut -d. -f2`
+  if test "$_MACOSX_TARGET_MINOR" -lt 7; then
+    AC_MSG_ERROR([rustc does not support MacOS X $MACOSX_DEPLOYMENT_TARGET
+      Add 'ac_add_options --enable-macos-target=10.7' (or later)
+      to mozconfig, or disable rust support.])
+  else
+    AC_MSG_RESULT([$MACOSX_DEPLOYMENT_TARGET is ok])
+  fi
+fi
+
+dnl ========================================================
 dnl Special win32 checks
 dnl ========================================================
 
@@ -549,6 +567,9 @@
             CFLAGS="$CFLAGS -Wv:18"
             CXXFLAGS="$CXXFLAGS -Wv:18"
 
+            # -Zc:sizedDealloc- disables C++14 global sized deallocation (see bug 1160146)
+            CXXFLAGS="$CXXFLAGS -Zc:sizedDealloc-"
+
             # https://connect.microsoft.com/VisualStudio/feedback/details/888527/warnings-on-dbghelp-h
             # for dbghelp.h, imagehlp.h, and shobj.h
             # C4091: 'typedef ': ignored on left of '' when no variable is declared
@@ -2638,17 +2659,10 @@
   AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE)
   case "$OS_TARGET" in
   Darwin)
-    VISIBILITY_FLAGS='-fvisibility=hidden'
+    VISIBILITY_FLAGS='-fvisibility=hidden -fvisibility-inlines-hidden'
     ;;
   *)
-    case $GCC_VERSION in
-    4.6*)
-      VISIBILITY_FLAGS='-I$(DIST)/system_wrappers -include $(MOZILLA_DIR)/config/gcc_hidden_dso_handle.h'
-      ;;
-    *)
-      VISIBILITY_FLAGS='-I$(DIST)/system_wrappers -include $(MOZILLA_DIR)/config/gcc_hidden.h'
-      ;;
-    esac
+    VISIBILITY_FLAGS='-I$(DIST)/system_wrappers -include $(MOZILLA_DIR)/config/gcc_hidden.h'
     WRAP_SYSTEM_INCLUDES=1
     ;;
   esac
@@ -3872,11 +3886,6 @@
 VPX_ARM_ASM=
 LIBJPEG_TURBO_AS=
 LIBJPEG_TURBO_ASFLAGS=
-LIBJPEG_TURBO_X86_ASM=
-LIBJPEG_TURBO_X64_ASM=
-LIBJPEG_TURBO_ARM_ASM=
-LIBJPEG_TURBO_ARM64_ASM=
-LIBJPEG_TURBO_MIPS_ASM=
 MOZ_PERMISSIONS=1
 MOZ_PLACES=1
 MOZ_SOCIAL=1
@@ -3924,6 +3933,9 @@
 MOZ_CONTENT_SANDBOX=
 MOZ_GMP_SANDBOX=
 MOZ_SANDBOX=1
+MOZ_BINARY_EXTENSIONS=
+MOZ_ADDON_SIGNING=
+MOZ_REQUIRE_SIGNING=
 
 case "$target_os" in
     mingw*)
@@ -4087,6 +4099,19 @@
 fi
 AC_SUBST(MOZ_ANDROID_RESOURCE_CONSTRAINED)
 
+dnl ========================================================
+dnl = Trademarked Branding
+dnl ========================================================
+MOZ_ARG_ENABLE_BOOL(official-branding,
+[  --enable-official-branding
+                          Enable Official mozilla.org Branding
+                          Do not distribute builds with
+                          --enable-official-branding unless you have
+                          permission to use trademarks per
+                          http://www.mozilla.org/foundation/trademarks/ .],
+    MOZ_OFFICIAL_BRANDING=1,
+    MOZ_OFFICIAL_BRANDING=)
+
 # Allow the application to influence configure with a confvars.sh script.
 AC_MSG_CHECKING([if app-specific confvars.sh exists])
 if test -f "${srcdir}/${MOZ_BUILD_APP}/confvars.sh" ; then
@@ -4493,7 +4518,7 @@
             if test "$NS_PRINTING"; then
                 PKG_CHECK_MODULES(MOZ_QT_WIDGETS, Qt5PrintSupport, ,
                 [
-                  AC_MSG_ERROR([$MOZ_QT_PKG_ERRORS Need qtbase widgets development package])
+                  AC_MSG_ERROR([$MOZ_QT_PKG_ERRORS Need qt5 printsupport development package])
                 ])
                 MOZ_QT_LIBS="$MOZ_QT_LIBS $MOZ_QT_WIDGETS_LIBS"
                 MOZ_QT_CFLAGS="$MOZ_QT_CFLAGS $MOZ_QT_WIDGETS_CFLAGS"
@@ -4662,28 +4687,14 @@
     MOZ_UI_LOCALE=$enableval )
 AC_SUBST(MOZ_UI_LOCALE)
 
-dnl ========================================================
-dnl = Trademarked Branding
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(official-branding,
-[  --enable-official-branding
-                          Enable Official mozilla.org Branding
-                          Do not distribute builds with
-                          --enable-official-branding unless you have
-                          permission to use trademarks per
-                          http://www.mozilla.org/foundation/trademarks/ .],
-[
+AC_SUBST(MOZ_OFFICIAL_BRANDING)
+if test -n "$MOZ_OFFICIAL_BRANDING"; then
   if test -z "$MOZ_OFFICIAL_BRANDING_DIRECTORY"; then
     AC_MSG_ERROR([You must specify MOZ_OFFICIAL_BRANDING_DIRECTORY to use --enable-official-branding.])
   else
     MOZ_BRANDING_DIRECTORY=${MOZ_OFFICIAL_BRANDING_DIRECTORY}
-    MOZ_OFFICIAL_BRANDING=1
+    AC_DEFINE(MOZ_OFFICIAL_BRANDING)
   fi
-], MOZ_OFFICIAL_BRANDING=)
-
-AC_SUBST(MOZ_OFFICIAL_BRANDING)
-if test -n "$MOZ_OFFICIAL_BRANDING"; then
-  AC_DEFINE(MOZ_OFFICIAL_BRANDING)
 fi
 
 MOZ_ARG_WITH_STRING(branding,
@@ -4788,7 +4799,7 @@
     MOZ_ARG_DISABLE_BOOL(gconf,
     [  --disable-gconf      Disable Gconf support ],
         MOZ_ENABLE_GCONF=,
-        MOZ_ENABLE_GCONF=force)
+        MOZ_ENABLE_GCONF=1)
 
     if test "$MOZ_ENABLE_GCONF"
     then
@@ -4796,11 +4807,12 @@
             MOZ_GCONF_LIBS=`$PKG_CONFIG --libs gobject-2.0`
             MOZ_ENABLE_GCONF=1
         ],[
-            if test "$MOZ_ENABLE_GCONF" = "force"
+            if test -n "$MOZ_ENABLE_GCONF";
             then
                 AC_MSG_ERROR([* * * Could not find gconf-2.0 ])
+            else
+                AC_MSG_WARN([Many automated tests will fail with --disable-gconf. See bug 1167201.])
             fi
-            MOZ_ENABLE_GCONF=
         ])
     fi
 
@@ -5318,6 +5330,11 @@
     MOZ_EME=1
 fi;
 
+if test "$MOZ_WIDGET_TOOLKIT" = "gonk" -a -n "$MOZ_FMP4" -a "$ANDROID_VERSION" -ge "18"; then
+    MOZ_GONK_MEDIACODEC=1
+    AC_SUBST(MOZ_GONK_MEDIACODEC)
+fi
+
 dnl ========================================================
 dnl = EME support
 dnl ========================================================
@@ -6116,55 +6133,47 @@
 if test -n "$MOZ_LIBJPEG_TURBO"; then
 
   dnl Do we support libjpeg-turbo on this platform?
-  case "$OS_ARCH:$OS_TEST" in
-  Darwin:i?86)
+  case "$OS_ARCH:$CPU_ARCH" in
+  Darwin:x86)
     LIBJPEG_TURBO_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC -DMACHO"
-    LIBJPEG_TURBO_X86_ASM=1
   ;;
   Darwin:x86_64)
     LIBJPEG_TURBO_ASFLAGS="-f macho64 -rnasm -pnasm -D__x86_64__ -DPIC -DMACHO"
-    LIBJPEG_TURBO_X64_ASM=1
   ;;
-  WINNT:x86|WINNT:i?86)
+  WINNT:x86)
     LIBJPEG_TURBO_ASFLAGS="-f win32 -rnasm -pnasm -DPIC -DWIN32"
-    LIBJPEG_TURBO_X86_ASM=1
   ;;
   WINNT:x86_64)
     LIBJPEG_TURBO_ASFLAGS="-f win64 -rnasm -pnasm -D__x86_64__ -DPIC -DWIN64 -DMSVC"
-    LIBJPEG_TURBO_X64_ASM=1
   ;;
-  *:arm*)
+  *:arm)
     LIBJPEG_TURBO_ASFLAGS="-march=armv7-a -mfpu=neon"
-    LIBJPEG_TURBO_ARM_ASM=1
   ;;
-  *:aarch64*)
+  *:aarch64)
     LIBJPEG_TURBO_ASFLAGS="-march=armv8-a"
-    LIBJPEG_TURBO_ARM64_ASM=1
   ;;
-  *:mips*)
+  *:mips)
     LIBJPEG_TURBO_ASFLAGS="-mdspr2"
-    LIBJPEG_TURBO_MIPS_ASM=1
   ;;
-  *:x86|*:i?86)
+  *:x86)
     if $CC -E -dM -</dev/null | grep -q __ELF__; then
       LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
-      LIBJPEG_TURBO_X86_ASM=1
     fi
   ;;
   *:x86_64)
     if $CC -E -dM -</dev/null | grep -q __ELF__; then
       LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
-      LIBJPEG_TURBO_X64_ASM=1
     fi
   ;;
   esac
-
 fi
 
+if test -n "$LIBJPEG_TURBO_ASFLAGS"; then
+  case "$CPU_ARCH" in
 dnl If we're on an x86 or x64 system which supports libjpeg-turbo's asm routines
 dnl and --disable-libjpeg-turbo wasn't passed, check for Yasm, and error out if
 dnl it doesn't exist or we have too old of a version.
-if test -n "$LIBJPEG_TURBO_X86_ASM" -o -n "$LIBJPEG_TURBO_X64_ASM" ; then
+  x86_64|x86)
     LIBJPEG_TURBO_AS=$YASM
 
     if test -z "$LIBJPEG_TURBO_AS" ; then
@@ -6182,21 +6191,12 @@
             AC_MSG_ERROR([Yasm 1.1 or greater is required to build with libjpeg-turbo's optimized JPEG decoding routines, but you appear to have version $_YASM_MAJOR_VERSION.$_YASM_MINOR_VERSION.  Upgrade to the newest version or configure with --disable-libjpeg-turbo to use the pure C JPEG decoder.  See https://developer.mozilla.org/en/YASM for more details.])
         fi
     fi
-fi
-
-dnl If we're on an ARM system which supports libjpeg-turbo's asm routines and
-dnl --disable-libjpeg-turbo wasn't passed, use the C compiler as the assembler.
-if test -n "$LIBJPEG_TURBO_ARM_ASM" ; then
-    echo "Using $AS as the assembler for ARM code."
+  ;;
+dnl On other platforms, use the C compiler as the assembler.
+  *)
     LIBJPEG_TURBO_AS=$AS
-fi
-
-if test -n "$LIBJPEG_TURBO_X86_ASM"; then
-    AC_DEFINE(LIBJPEG_TURBO_X86_ASM)
-elif test -n "$LIBJPEG_TURBO_X64_ASM"; then
-    AC_DEFINE(LIBJPEG_TURBO_X64_ASM)
-elif test -n "$LIBJPEG_TURBO_ARM_ASM"; then
-    AC_DEFINE(LIBJPEG_TURBO_ARM_ASM)
+  ;;
+  esac
 elif test -n "$MOZ_LIBJPEG_TURBO"; then
     dnl Warn if we're not building the optimized routines, even though the user
     dnl didn't specify --disable-libjpeg-turbo.
@@ -7275,7 +7275,7 @@
     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_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_mutex_trylock,--wrap=pthread_join,--wrap=pipe,--wrap=pipe2"
     fi
-    if test "$MOZ_WIDGET_TOOLKIT" = android; then
+    if test "$MOZ_WIDGET_TOOLKIT" = android -a "$MOZ_ANDROID_MIN_SDK_VERSION" -lt 11; then
         MOZ_GLUE_WRAP_LDFLAGS="${MOZ_GLUE_WRAP_LDFLAGS} -Wl,--wrap=getaddrinfo,--wrap=freeaddrinfo,--wrap=gai_strerror"
     fi
 fi
@@ -7470,6 +7470,29 @@
 AC_SUBST(MOZ_DISABLE_STARTUPCACHE)
 
 dnl ========================================================
+dnl = Enable packaging Gaia with B2G desktop
+dnl ========================================================
+if test x"$MOZ_WIDGET_TOOLKIT" != x"gonk"; then
+    if test -n "$GAIADIR" -a ! -d "$GAIADIR" ; then
+        AC_MSG_ERROR([GAIADIR '$GAIADIR' isn't a valid directory])
+    fi
+
+    AC_SUBST(GAIADIR)
+    if test -n "$GAIADIR" ; then
+        AC_DEFINE(PACKAGE_GAIA)
+    fi
+
+    if test -n "$FXOS_SIMULATOR" -a -z "$GAIADIR" ; then
+        AC_MSG_ERROR([FXOS_SIMULATOR=1 requires GAIADIR to be defined])
+    fi
+
+    if test -n "$FXOS_SIMULATOR" ; then
+        AC_DEFINE(FXOS_SIMULATOR)
+        AC_SUBST(FXOS_SIMULATOR)
+    fi
+fi
+
+dnl ========================================================
 dnl = Enable Radio Interface for B2G (Gonk usually)
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(b2g-ril,
@@ -8054,13 +8077,7 @@
 dnl Check for pixman and cairo
 dnl ========================================================
 
-if test "$MOZ_WIDGET_TOOLKIT" = "gtk3" ; then
-  # cairo-gtk3 can be build with system-cairo only
-  MOZ_TREE_CAIRO=
-else
-  MOZ_TREE_CAIRO=1
-fi
-
+MOZ_TREE_CAIRO=1
 MOZ_ARG_ENABLE_BOOL(system-cairo,
 [  --enable-system-cairo   Use system cairo (located with pkgconfig)],
 MOZ_TREE_CAIRO=,
@@ -8152,9 +8169,6 @@
           MOZ_CHECK_HEADER(d3d10.h, MOZ_ENABLE_D3D10_LAYER=1)
         fi
         ;;
-      gtk3)
-        AC_MSG_ERROR([cairo-gtk3 toolkit is incompatible with in-tree cairo. Please add --enable-system-cairo to your build config.])
-        ;;
     esac
     if test "$USE_FC_FREETYPE"; then
         FC_FONT_FEATURE="#define CAIRO_HAS_FC_FONT 1"
@@ -8546,6 +8560,13 @@
 AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
 AC_SUBST(MOZ_LINKER_EXTRACT)
 
+AC_SUBST(MOZ_ADDON_SIGNING)
+AC_SUBST(MOZ_REQUIRE_SIGNING)
+
+if test -n "$MOZ_BINARY_EXTENSIONS"; then
+  AC_DEFINE(MOZ_BINARY_EXTENSIONS)
+fi
+
 AC_SUBST(MOZ_JSDOWNLOADS)
 if test -n "$MOZ_JSDOWNLOADS"; then
   AC_DEFINE(MOZ_JSDOWNLOADS)
@@ -8872,11 +8893,6 @@
 AC_SUBST(MOZ_CODE_COVERAGE)
 AC_SUBST(LIBJPEG_TURBO_AS)
 AC_SUBST_LIST(LIBJPEG_TURBO_ASFLAGS)
-AC_SUBST(LIBJPEG_TURBO_X86_ASM)
-AC_SUBST(LIBJPEG_TURBO_X64_ASM)
-AC_SUBST(LIBJPEG_TURBO_ARM_ASM)
-AC_SUBST(LIBJPEG_TURBO_ARM64_ASM)
-AC_SUBST(LIBJPEG_TURBO_MIPS_ASM)
 
 AC_SUBST(MOZ_PACKAGE_JSSHELL)
 AC_SUBST(MOZ_FOLD_LIBS)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/db/sqlite3/src/sqlite.def firefox-trunk-41.0~a1~hg20150524r245419/db/sqlite3/src/sqlite.def
--- firefox-trunk-41.0~a1~hg20150513r243603/db/sqlite3/src/sqlite.def	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/db/sqlite3/src/sqlite.def	2015-05-25 20:43:09.000000000 +0000
@@ -51,6 +51,7 @@
         sqlite3_create_function16
         sqlite3_create_module
         sqlite3_data_count
+        sqlite3_db_filename
         sqlite3_db_handle
         sqlite3_db_mutex
         sqlite3_db_status
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/debian/changelog firefox-trunk-41.0~a1~hg20150524r245419/debian/changelog
--- firefox-trunk-41.0~a1~hg20150513r243603/debian/changelog	2015-05-13 18:19:24.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/debian/changelog	2015-05-25 21:42:21.000000000 +0000
@@ -1,8 +1,9 @@
-firefox-trunk (41.0~a1~hg20150513r243603-0ubuntu1~umd1) vivid; urgency=medium
+firefox-trunk (41.0~a1~hg20150524r245419-0ubuntu1~umd1) vivid; urgency=medium
 
-  * New upstream snapshot
+  * Refresh patches
+    - update debian/patches/dont-include-hyphenation-patterns.patch
 
- -- Chris Coulson <chris.coulson@canonical.com>  Wed, 13 May 2015 19:05:03 +0100
+ -- Chris Coulson <chris.coulson@canonical.com>  Wed, 20 May 2015 17:20:18 +0100
 
 firefox-trunk (40.0~a1~hg20150429r241647-0ubuntu1) vivid; urgency=medium
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/debian/patches/dont-include-hyphenation-patterns.patch firefox-trunk-41.0~a1~hg20150524r245419/debian/patches/dont-include-hyphenation-patterns.patch
--- firefox-trunk-41.0~a1~hg20150513r243603/debian/patches/dont-include-hyphenation-patterns.patch	2015-05-13 18:19:24.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/debian/patches/dont-include-hyphenation-patterns.patch	2015-05-25 21:42:21.000000000 +0000
@@ -3,10 +3,10 @@
 Forwarded: not-needed
 Bug-Ubuntu: https://launchpad.net/bugs/894166
 
-Index: firefox-trunk-40.0~a1~hg20150401r237023/browser/installer/package-manifest.in
+Index: firefox-trunk-41.0~a1~hg20150520r244718/browser/installer/package-manifest.in
 ===================================================================
---- firefox-trunk-40.0~a1~hg20150401r237023.orig/browser/installer/package-manifest.in	2015-04-01 22:07:25.906238109 +0100
-+++ firefox-trunk-40.0~a1~hg20150401r237023/browser/installer/package-manifest.in	2015-04-01 22:12:27.274873401 +0100
+--- firefox-trunk-41.0~a1~hg20150520r244718.orig/browser/installer/package-manifest.in	2015-05-20 17:21:48.341912623 +0100
++++ firefox-trunk-41.0~a1~hg20150520r244718/browser/installer/package-manifest.in	2015-05-20 17:25:30.858923264 +0100
 @@ -51,7 +51,7 @@
  @RESPATH@/browser/defaults/profile/localstore.rdf
  @RESPATH@/browser/defaults/profile/mimeTypes.rdf
@@ -14,5 +14,5 @@
 -@RESPATH@/hyphenation/*
 +; @RESPATH@/hyphenation/*
  @RESPATH@/browser/@PREF_DIR@/firefox-l10n.js
- @RESPATH@/browser/searchplugins/*
  #ifdef HAVE_MAKENSISU
+ @BINPATH@/uninstall/helper.exe
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/base/moz.build firefox-trunk-41.0~a1~hg20150524r245419/docshell/base/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/base/moz.build	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/base/moz.build	2015-05-25 20:43:11.000000000 +0000
@@ -69,7 +69,7 @@
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '../shistory/src',
+    '/docshell/shistory',
     '/dom/base',
     '/layout/base',
     '/layout/generic',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/base/nsDocShell.cpp firefox-trunk-41.0~a1~hg20150524r245419/docshell/base/nsDocShell.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/base/nsDocShell.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/base/nsDocShell.cpp	2015-05-25 20:43:11.000000000 +0000
@@ -151,7 +151,7 @@
 
 #include "nsIJARChannel.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "nsISelectionDisplay.h"
 
@@ -926,7 +926,7 @@
     gDocShellLeakLog = PR_NewLogModule("nsDocShellLeak");
   }
   if (gDocShellLeakLog) {
-    PR_LOG(gDocShellLeakLog, PR_LOG_DEBUG, ("DOCSHELL %p created\n", this));
+    MOZ_LOG(gDocShellLeakLog, PR_LOG_DEBUG, ("DOCSHELL %p created\n", this));
   }
 
 #ifdef DEBUG
@@ -958,7 +958,7 @@
   }
 
   if (gDocShellLeakLog) {
-    PR_LOG(gDocShellLeakLog, PR_LOG_DEBUG, ("DOCSHELL %p destroyed\n", this));
+    MOZ_LOG(gDocShellLeakLog, PR_LOG_DEBUG, ("DOCSHELL %p destroyed\n", this));
   }
 
 #ifdef DEBUG
@@ -1095,7 +1095,7 @@
     }
 
 #if defined(DEBUG)
-    PR_LOG(gDocShellLog, PR_LOG_DEBUG,
+    MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,
            ("nsDocShell[%p]: returning app cache container %p",
             this, domDoc.get()));
 #endif
@@ -1421,7 +1421,7 @@
   if (PR_LOG_TEST(gDocShellLog, PR_LOG_DEBUG)) {
     nsAutoCString uristr;
     aURI->GetAsciiSpec(uristr);
-    PR_LOG(gDocShellLog, PR_LOG_DEBUG,
+    MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,
            ("nsDocShell[%p]: loading %s with flags 0x%08x",
             this, uristr.get(), aLoadFlags));
   }
@@ -1540,7 +1540,7 @@
 
   if (shEntry) {
 #ifdef DEBUG
-    PR_LOG(gDocShellLog, PR_LOG_DEBUG,
+    MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,
            ("nsDocShell[%p]: loading from session history", this));
 #endif
 
@@ -2997,7 +2997,7 @@
       marker->mName = NS_ConvertUTF8toUTF16(startPayload->GetName());
       marker->mStart = startPayload->GetTime();
       marker->mEnd = startPayload->GetTime();
-      startPayload->AddDetails(*marker);
+      startPayload->AddDetails(aCx, *marker);
       continue;
     }
 
@@ -3045,8 +3045,8 @@
               if (isPaint) {
                 marker->mRectangles.Construct(layerRectangles);
               }
-              startPayload->AddDetails(*marker);
-              endPayload->AddDetails(*marker);
+              startPayload->AddDetails(aCx, *marker);
+              endPayload->AddDetails(aCx, *marker);
             }
 
             // We want the start to be dropped either way.
@@ -5313,7 +5313,7 @@
       chanName.AssignLiteral("<no channel>");
     }
 
-    PR_LOG(gDocShellLog, PR_LOG_DEBUG,
+    MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,
            ("nsDocShell[%p]::LoadErrorPage(\"%s\", \"%s\", {...}, [%s])\n", this,
             spec.get(), NS_ConvertUTF16toUTF8(aURL).get(), chanName.get()));
   }
@@ -6685,11 +6685,7 @@
                                   nsIDocShellLoadInfo* aLoadInfo,
                                   bool aFirstParty)
 {
-  uint32_t appId;
-  nsresult rv = GetAppId(&appId);
-  if (NS_FAILED(rv)) {
-    return false;
-  }
+  uint32_t appId = nsIDocShell::GetAppId();
 
   if (appId != nsIScriptSecurityManager::NO_APP_ID &&
       appId != nsIScriptSecurityManager::UNKNOWN_APP_ID) {
@@ -6697,7 +6693,7 @@
       do_GetService(APPS_SERVICE_CONTRACTID);
     NS_ASSERTION(appsService, "No AppsService available");
     nsCOMPtr<nsIURI> redirect;
-    rv = appsService->GetRedirect(appId, aURI, getter_AddRefs(redirect));
+    nsresult rv = appsService->GetRedirect(appId, aURI, getter_AddRefs(redirect));
     if (NS_SUCCEEDED(rv) && redirect) {
       rv = LoadURI(redirect, aLoadInfo, nsIWebNavigation::LOAD_FLAGS_NONE,
                    aFirstParty);
@@ -11168,7 +11164,7 @@
       chanName.AssignLiteral("<no channel>");
     }
 
-    PR_LOG(gDocShellLog, PR_LOG_DEBUG,
+    MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,
            ("nsDocShell[%p]::OnNewURI(\"%s\", [%s], 0x%x)\n", this, spec.get(),
             chanName.get(), aLoadType));
   }
@@ -11233,7 +11229,7 @@
   // XXX This log message is almost useless because |updateSHistory|
   //     and |updateGHistory| are not correct at this point.
 
-  PR_LOG(gDocShellLog, PR_LOG_DEBUG,
+  MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,
          ("  shAvailable=%i updateSHistory=%i updateGHistory=%i"
           " equalURI=%i\n",
           shAvailable, updateSHistory, updateGHistory, equalUri));
@@ -11788,7 +11784,7 @@
       chanName.AssignLiteral("<no channel>");
     }
 
-    PR_LOG(gDocShellLog, PR_LOG_DEBUG,
+    MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,
            ("nsDocShell[%p]::AddToSessionHistory(\"%s\", [%s])\n",
             this, spec.get(), chanName.get()));
   }
@@ -13845,9 +13841,7 @@
 NS_IMETHODIMP
 nsDocShell::GetAppManifestURL(nsAString& aAppManifestURL)
 {
-  uint32_t appId;
-  GetAppId(&appId);
-
+  uint32_t appId = nsIDocShell::GetAppId();
   if (appId != nsIScriptSecurityManager::NO_APP_ID &&
       appId != nsIScriptSecurityManager::UNKNOWN_APP_ID) {
     nsCOMPtr<nsIAppsService> appsService =
@@ -13918,27 +13912,61 @@
 {
 public:
   JavascriptTimelineMarker(nsDocShell* aDocShell, const char* aName,
-                           const char* aReason)
+                           const char* aReason,
+                           const char16_t* aFunctionName,
+                           const char16_t* aFileName,
+                           uint32_t aLineNumber)
     : TimelineMarker(aDocShell, aName, TRACING_INTERVAL_START,
-                     NS_ConvertUTF8toUTF16(aReason))
+                     NS_ConvertUTF8toUTF16(aReason),
+                     NO_STACK)
+    , mFunctionName(aFunctionName)
+    , mFileName(aFileName)
+    , mLineNumber(aLineNumber)
   {
   }
 
-  void AddDetails(mozilla::dom::ProfileTimelineMarker& aMarker) override
+  void AddDetails(JSContext* aCx, mozilla::dom::ProfileTimelineMarker& aMarker)
+    override
   {
     aMarker.mCauseName.Construct(GetCause());
+
+    if (!mFunctionName.IsEmpty() || !mFileName.IsEmpty()) {
+      ProfileTimelineStackFrame stackFrame;
+      stackFrame.mLine.Construct(mLineNumber);
+      stackFrame.mSource.Construct(mFileName);
+      stackFrame.mFunctionDisplayName.Construct(mFunctionName);
+
+      JS::Rooted<JS::Value> newStack(aCx);
+      if (ToJSValue(aCx, stackFrame, &newStack)) {
+        if (newStack.isObject()) {
+          aMarker.mStack = &newStack.toObject();
+        }
+      } else {
+        JS_ClearPendingException(aCx);
+      }
+    }
   }
+
+private:
+  nsString mFunctionName;
+  nsString mFileName;
+  uint32_t mLineNumber;
 };
 
 void
-nsDocShell::NotifyJSRunToCompletionStart(const char* aReason)
+nsDocShell::NotifyJSRunToCompletionStart(const char* aReason,
+                                         const char16_t* aFunctionName,
+                                         const char16_t* aFilename,
+                                         const uint32_t aLineNumber)
 {
   bool timelineOn = nsIDocShell::GetRecordProfileTimelineMarkers();
 
   // If first start, mark interval start.
   if (timelineOn && mJSRunToCompletionDepth == 0) {
     mozilla::UniquePtr<TimelineMarker> marker =
-      MakeUnique<JavascriptTimelineMarker>(this, "Javascript", aReason);
+      MakeUnique<JavascriptTimelineMarker>(this, "Javascript", aReason,
+                                           aFunctionName, aFilename,
+                                           aLineNumber);
     AddProfileTimelineMarker(Move(marker));
   }
   mJSRunToCompletionDepth++;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/base/nsIDocShell.idl firefox-trunk-41.0~a1~hg20150524r245419/docshell/base/nsIDocShell.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/base/nsIDocShell.idl	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/base/nsIDocShell.idl	2015-05-25 20:43:11.000000000 +0000
@@ -54,7 +54,7 @@
  
 typedef unsigned long nsLoadFlags;
 
-[scriptable, builtinclass, uuid(bf78de98-9e88-498d-bc19-0e138f683939)]
+[scriptable, builtinclass, uuid(696b32a1-3cf1-4909-b501-474b25fc7954)]
 interface nsIDocShell : nsIDocShellTreeItem
 {
   /**
@@ -1039,7 +1039,10 @@
    * that execution has stopped.  This only occurs when the Timeline devtool
    * is collecting information.
    */
-  [noscript,notxpcom,nostdcall] void notifyJSRunToCompletionStart(in string aReason);
+  [noscript,notxpcom,nostdcall] void notifyJSRunToCompletionStart(in string aReason,
+                                                                  in wstring functionName,
+                                                                  in wstring fileName,
+                                                                  in unsigned long lineNumber);
   [noscript,notxpcom,nostdcall] void notifyJSRunToCompletionStop();
 
   /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/base/TimelineMarker.cpp firefox-trunk-41.0~a1~hg20150524r245419/docshell/base/TimelineMarker.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/base/TimelineMarker.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/base/TimelineMarker.cpp	2015-05-25 20:43:10.000000000 +0000
@@ -22,7 +22,8 @@
 
 TimelineMarker::TimelineMarker(nsDocShell* aDocShell, const char* aName,
                                TracingMetadata aMetaData,
-                               const nsAString& aCause)
+                               const nsAString& aCause,
+                               TimelineStackRequest aStackRequest)
   : mName(aName)
   , mMetaData(aMetaData)
   , mCause(aCause)
@@ -30,7 +31,7 @@
   MOZ_COUNT_CTOR(TimelineMarker);
   MOZ_ASSERT(aName);
   aDocShell->Now(&mTime);
-  if (aMetaData == TRACING_INTERVAL_START) {
+  if (aMetaData == TRACING_INTERVAL_START && aStackRequest != NO_STACK) {
     CaptureStack();
   }
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/base/TimelineMarker.h firefox-trunk-41.0~a1~hg20150524r245419/docshell/base/TimelineMarker.h
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/base/TimelineMarker.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/base/TimelineMarker.h	2015-05-25 20:43:10.000000000 +0000
@@ -21,12 +21,15 @@
 class TimelineMarker
 {
 public:
+  enum TimelineStackRequest { STACK, NO_STACK };
+
   TimelineMarker(nsDocShell* aDocShell, const char* aName,
                  TracingMetadata aMetaData);
 
   TimelineMarker(nsDocShell* aDocShell, const char* aName,
                  TracingMetadata aMetaData,
-                 const nsAString& aCause);
+                 const nsAString& aCause,
+                 TimelineStackRequest aStackRequest = STACK);
 
   virtual ~TimelineMarker();
 
@@ -43,7 +46,9 @@
   // called on both the starting and ending markers of a pair.
   // Ordinarily the ending marker doesn't need to do anything
   // here.
-  virtual void AddDetails(mozilla::dom::ProfileTimelineMarker& aMarker) {}
+  virtual void AddDetails(JSContext* aCx,
+                          mozilla::dom::ProfileTimelineMarker& aMarker)
+  {}
 
   virtual void AddLayerRectangles(
       mozilla::dom::Sequence<mozilla::dom::ProfileTimelineLayerRect>&)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/build/moz.build firefox-trunk-41.0~a1~hg20150524r245419/docshell/build/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/build/moz.build	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/build/moz.build	2015-05-25 20:43:11.000000000 +0000
@@ -13,12 +13,12 @@
 ]
 
 LOCAL_INCLUDES += [
-    '../base',
-    '../shistory/src/',
+    '/docshell/base',
+    '/docshell/shistory',
     '/uriloader/base',
     '/uriloader/exthandler',
     '/uriloader/prefetch',
-    ]
+]
 
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
     LOCAL_INCLUDES += ['/uriloader/exthandler/mac']
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/moz.build firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/moz.build	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/moz.build	2015-05-25 20:43:11.000000000 +0000
@@ -4,5 +4,33 @@
 # License, v. 2.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 += ['public', 'src']
+XPIDL_SOURCES += [
+    'nsIBFCacheEntry.idl',
+    'nsISHContainer.idl',
+    'nsISHEntry.idl',
+    'nsISHistory.idl',
+    'nsISHistoryInternal.idl',
+    'nsISHistoryListener.idl',
+    'nsISHTransaction.idl',
+]
 
+XPIDL_MODULE = 'shistory'
+
+EXPORTS += [
+    'nsSHEntryShared.h',
+]
+
+UNIFIED_SOURCES += [
+    'nsSHEntry.cpp',
+    'nsSHEntryShared.cpp',
+    'nsSHistory.cpp',
+    'nsSHTransaction.cpp',
+]
+
+FAIL_ON_WARNINGS = True
+
+LOCAL_INCLUDES += [
+    '/docshell/base',
+]
+
+FINAL_LIBRARY = 'xul'
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsIBFCacheEntry.idl firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsIBFCacheEntry.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsIBFCacheEntry.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsIBFCacheEntry.idl	2015-05-25 20:43:11.000000000 +0000
@@ -0,0 +1,18 @@
+/* -*- 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 "nsISupports.idl"
+
+/**
+ * This interface lets you evict a document from the back/forward cache.
+ */
+[scriptable, uuid(a576060e-c7df-4d81-aa8c-5b52bd6ad25d)]
+interface nsIBFCacheEntry : nsISupports
+{
+  void RemoveFromBFCacheSync();
+  void RemoveFromBFCacheAsync();
+
+  readonly attribute unsigned long long ID;
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsISHContainer.idl firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsISHContainer.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsISHContainer.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsISHContainer.idl	2015-05-25 20:43:11.000000000 +0000
@@ -0,0 +1,49 @@
+/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsISupports.idl"
+
+interface nsISHEntry;
+
+/**
+ * The nsISHEntryContainer. The interface to access child entries
+ * of an nsISHEntry.
+ * 
+ */
+
+[scriptable, uuid(67dd0357-8372-4122-bff6-217435e8b7e4)]
+interface nsISHContainer : nsISupports
+{
+	/**
+     * The current number of nsISHEntries which are immediate children of the 
+	 * current SHEntry
+     */
+	readonly attribute long childCount;
+
+	/**
+	 * Add a new child SHEntry.  If offset is -1 adds to the end of the list.
+	 */
+	void AddChild(in nsISHEntry child, in long offset);
+
+	/**
+	 * Removes a child SHEntry
+	 */
+	void RemoveChild(in nsISHEntry child);
+
+	/**
+	 * Get child at an index
+	 */
+	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 firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsISHEntry.idl firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsISHEntry.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsISHEntry.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsISHEntry.idl	2015-05-25 20:43:11.000000000 +0000
@@ -0,0 +1,326 @@
+/* -*- 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/. */
+
+/**
+ * The interface to nsISHentry. Each document or subframe in 
+ * Session History will have a nsISHEntry associated with it which will
+ * hold all information required to recreate the document from history
+ * 
+ */
+
+#include "nsISupports.idl"
+
+interface nsILayoutHistoryState;
+interface nsIContentViewer;
+interface nsIURI;
+interface nsIInputStream;
+interface nsIDocShellTreeItem;
+interface nsISupportsArray;
+interface nsIStructuredCloneContainer;
+interface nsIBFCacheEntry;
+
+%{C++
+#include "nsRect.h"
+class nsDocShellEditorData;
+class nsSHEntryShared;
+%}
+[ref] native nsIntRect(nsIntRect);
+[ptr] native nsDocShellEditorDataPtr(nsDocShellEditorData);
+[ptr] native nsSHEntryShared(nsSHEntryShared);
+
+[scriptable, uuid(d5fbeb10-f373-4677-b69a-2694aa706cac)]
+interface nsISHEntry : nsISupports
+{
+    /**
+     * A readonly property that returns the URI
+     * of the current entry. The object returned is
+     * of type nsIURI
+     */
+    readonly attribute nsIURI URI;
+
+    /**
+     * A readonly property that returns the title
+     * of the current entry.  The object returned
+     * is a encoded string
+     */
+    readonly attribute wstring title;
+
+    /**
+     * A readonly property that returns a boolean
+     * flag which indicates if the entry was created as a
+     * result of a subframe navigation. This flag will be
+     * 'false' when a frameset page is visited for
+     * the first time. This flag will be 'true' for all
+     * history entries created as a result of a subframe
+     * navigation.
+     */
+    readonly attribute boolean isSubFrame;
+
+    /** URI for the document */
+    void setURI(in nsIURI aURI);
+
+    /** 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;
+
+    /** Whether the content viewer is marked "sticky" */
+    attribute boolean sticky;
+
+    /** Saved state of the global window object */
+    attribute nsISupports windowState;
+
+    /**
+     * Saved position and dimensions of the content viewer; we must adjust the
+     * root view's widget accordingly if this has changed when the presentation
+     * is restored.
+     */
+    [noscript] void getViewerBounds(in nsIntRect bounds);
+    [noscript] void setViewerBounds([const] in nsIntRect bounds);
+
+    /**
+     * Saved child docshells corresponding to contentViewer.  The child shells
+     * are restored as children of the parent docshell, in this order, when the
+     * parent docshell restores a saved presentation.
+     */
+
+    /** Append a child shell to the end of our list. */
+    void addChildShell(in nsIDocShellTreeItem shell);
+
+    /**
+     * Get the child shell at |index|; returns null if |index| is out of bounds.
+     */
+    nsIDocShellTreeItem childShellAt(in long index);
+
+    /**
+     * Clear the child shell list.
+     */
+    void clearChildShells();
+
+    /** Saved refresh URI list for the content viewer */
+    attribute nsISupportsArray refreshURIList;
+
+    /**
+     * Ensure that the cached presentation members are self-consistent.
+     * If either |contentViewer| or |windowState| are null, then all of the
+     * following members are cleared/reset:
+     *  contentViewer, sticky, windowState, viewerBounds, childShells,
+     *  refreshURIList.
+     */
+    void syncPresentationState();
+
+    /** Title for the document */
+    void setTitle(in AString aTitle);
+
+    /** Post Data for the document */
+    attribute nsIInputStream postData;
+
+    /** LayoutHistoryState for scroll position and form values */
+    attribute nsILayoutHistoryState layoutHistoryState;
+
+    /** parent of this entry */
+    attribute nsISHEntry parent;
+
+    /**
+     * The loadType for this entry. This is typically loadHistory except
+     * when reload is pressed, it has the appropriate reload flag
+     */
+    attribute unsigned long loadType;
+
+    /**
+     * An ID to help identify this entry from others during
+     * subframe navigation
+     */
+    attribute unsigned long ID;
+
+    /** attribute to set and get the cache key for the entry */
+    attribute nsISupports cacheKey;
+
+    /** attribute to indicate whether layoutHistoryState should be saved */
+    attribute boolean saveLayoutStateFlag;
+
+    /** attribute to indicate whether the page is already expired in cache */
+    attribute boolean expirationStatus;
+
+    /**
+     * attribute to indicate the content-type of the document that this
+     * is a session history entry for
+     */
+    attribute ACString contentType; 
+
+    /**
+     * If we created this SHEntry via history.pushState or modified it via
+     * history.replaceState, and if we changed the SHEntry's URI via the
+     * push/replaceState call, and if the SHEntry's new URI differs from its
+     * old URI by more than just the hash, then we set this field to true.
+     *
+     * Additionally, if this SHEntry was created by calling pushState from a
+     * SHEntry whose URI was modified, this SHEntry's URIWasModified field is
+     * true.
+     *
+     */
+    attribute boolean URIWasModified;
+ 
+    /** Set/Get scrollers' positon in anchored pages */
+    void setScrollPosition(in long x, in long y);
+    void getScrollPosition(out long x, out long y);
+
+    /** Additional ways to create an entry */
+    [noscript] void create(in nsIURI URI, in AString title,
+                           in nsIInputStream inputStream,
+                           in nsILayoutHistoryState layoutHistoryState,
+                           in nsISupports cacheKey, in ACString contentType,
+                           in nsISupports owner,
+                           in unsigned long long docshellID,
+                           in boolean dynamicCreation);
+
+    nsISHEntry clone();
+
+    /** Attribute that indicates if this entry is for a subframe navigation */
+    void setIsSubFrame(in boolean aFlag);
+
+    /** Return any content viewer present in or below this node in the
+        nsSHEntry tree.  This will differ from contentViewer in the case
+        where a child nsSHEntry has the content viewer for this tree. */
+    nsIContentViewer getAnyContentViewer(out nsISHEntry ownerEntry);
+
+    /**
+     * Get the owner, if any, that was associated with the channel
+     * that the document that was loaded to create this history entry
+     * came from.
+     */
+    attribute nsISupports owner;
+
+    /**
+     * Get/set data associated with this history state via a pushState() call,
+     * serialized using structured clone.
+     **/
+    attribute nsIStructuredCloneContainer stateData;
+
+    /**
+     * Gets the owning pointer to the editor data assosicated with
+     * this shistory entry. This forgets its pointer, so free it when
+     * you're done.
+     */
+    [noscript, notxpcom] nsDocShellEditorDataPtr forgetEditorData();
+
+    /**
+     * Sets the owning pointer to the editor data assosicated with
+     * this shistory entry. Unless forgetEditorData() is called, this
+     * shentry will destroy the editor data when it's destroyed.
+     */
+    [noscript, notxpcom] void setEditorData(in nsDocShellEditorDataPtr aData);
+
+    /** Returns true if this shistory entry is storing a detached editor. */
+    [noscript, notxpcom] boolean hasDetachedEditor();
+
+    /**
+     * Returns true if the related docshell was added because of
+     * dynamic addition of an iframe/frame.
+     */
+    boolean isDynamicallyAdded();
+
+    /**
+     * Returns true if any of the child entries returns true
+     * when isDynamicallyAdded is called on it.
+     */
+    boolean hasDynamicallyAddedChild();
+
+    /**
+     * The history ID of the docshell.
+     */
+    attribute unsigned long long docshellID;
+
+    readonly attribute nsIBFCacheEntry BFCacheEntry;
+
+    /**
+     * Does this SHEntry point to the given BFCache entry?  If so, evicting
+     * the BFCache entry will evict the SHEntry, since the two entries
+     * correspond to the same document.
+     */
+    [notxpcom, noscript]
+    boolean hasBFCacheEntry(in nsIBFCacheEntry aEntry);
+
+    /**
+     * Adopt aEntry's BFCacheEntry, so now both this and aEntry point to
+     * aEntry's BFCacheEntry.
+     */
+    void adoptBFCacheEntry(in nsISHEntry aEntry);
+
+    /**
+     * Create a new BFCache entry and drop our reference to our old one.  This
+     * call unlinks this SHEntry from any other SHEntries for its document.
+     */
+    void abandonBFCacheEntry();
+
+    /**
+     * Does this SHEntry correspond to the same document as aEntry?  This is
+     * true iff the two SHEntries have the same BFCacheEntry.  So in
+     * particular, sharesDocumentWith(aEntry) is guaranteed to return true if
+     * it's preceeded by a call to adoptBFCacheEntry(aEntry).
+     */
+    boolean sharesDocumentWith(in nsISHEntry aEntry);
+
+    /**
+     * True if this SHEntry corresponds to a document created by a srcdoc iframe.
+     * Set when a value is assigned to  srcdocData.
+     */
+    readonly attribute boolean isSrcdocEntry;
+
+    /**
+     * Contents of the srcdoc attribute in a srcdoc iframe to be loaded instead
+     * of the URI.  Similar to a Data URI, this information is needed to
+     * recreate the document at a later stage.
+     * Setting this sets isSrcdocEntry to true
+     */
+    attribute AString srcdocData;
+
+    /**
+     * When isSrcdocEntry is true, this contains the baseURI of the srcdoc
+     * document for use in situations where it cannot otherwise be determined,
+     * for example with view-source.
+     */
+    attribute nsIURI baseURI;
+};
+
+[scriptable, uuid(bb66ac35-253b-471f-a317-3ece940f04c5)]
+interface nsISHEntryInternal : nsISupports
+{
+    [notxpcom] void RemoveFromBFCacheAsync();
+    [notxpcom] void RemoveFromBFCacheSync();
+
+    /**
+     * A number that is assigned by the sHistory when the entry is activated
+     */
+    attribute unsigned long lastTouched;
+
+    /**
+     * Some state, particularly that related to the back/forward cache, is
+     * shared between SHEntries which correspond to the same document.  This
+     * method gets a pointer to that shared state.
+     *
+     * This shared state is the SHEntry's BFCacheEntry.  So
+     * hasBFCacheEntry(getSharedState()) is guaranteed to return true.
+     */
+    [noscript, notxpcom]
+    nsSHEntryShared getSharedState();
+};
+
+%{ C++
+// {BFD1A791-AD9F-11d3-BDC7-0050040A9B44}
+#define NS_SHENTRY_CID \
+{0xbfd1a791, 0xad9f, 0x11d3, {0xbd, 0xc7, 0x0, 0x50, 0x4, 0xa, 0x9b, 0x44}}
+
+#define NS_SHENTRY_CONTRACTID \
+    "@mozilla.org/browser/session-history-entry;1"
+
+%}
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsISHistory.idl firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsISHistory.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsISHistory.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsISHistory.idl	2015-05-25 20:43:11.000000000 +0000
@@ -0,0 +1,162 @@
+/* -*- Mode: C++; tab-width: 2; 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 "nsISupports.idl"
+
+interface nsISHEntry;
+interface nsISHistoryListener;
+interface nsISimpleEnumerator;
+/**
+ * An interface to the primary properties of the Session History
+ * component. In an embedded browser environment, the nsIWebBrowser
+ * object creates an instance of session history for each open window.
+ * A handle to the session history object can be obtained from
+ * nsIWebNavigation. In a non-embedded situation, the  owner of the
+ * session history component must create a instance of it and set
+ * it in the nsIWebNavigation object.
+ * This interface is accessible from javascript.
+ */
+ 
+
+%{C++
+#define NS_SHISTORY_CID \
+{0x7b807041, 0xe60a, 0x4384, {0x93, 0x5f, 0xaf, 0x30, 0x61, 0xd8, 0xb8, 0x15}}
+
+#define NS_SHISTORY_CONTRACTID "@mozilla.org/browser/shistory;1"
+%}
+
+[scriptable, uuid(7b807041-e60a-4384-935f-af3061d8b815)]
+interface nsISHistory: nsISupports
+{
+  /**
+   * A readonly property of the interface that returns 
+   * the number of toplevel documents currently available
+   * in session history.
+   */
+   readonly attribute long count;
+
+  /**
+   * A readonly property of the interface that returns 
+   * the index of the current document in session history.
+   */
+   readonly attribute long index;
+
+  /**
+   * A readonly property of the interface that returns 
+   * the index of the last document that started to load and
+   * didn't finished yet. When document finishes the loading
+   * value -1 is returned.
+   */
+   readonly attribute long requestedIndex;
+
+  /**
+   * A read/write property of the interface, used to Get/Set
+   * the maximum number of toplevel documents, session history 
+   * can hold for each instance. 
+   */
+   attribute long maxLength;
+
+  /**
+   * Called to obtain handle to the history entry at a
+   * given index.
+   *
+   * @param index             The index value whose entry is requested.
+   *                          The oldest entry is located at index == 0.
+   * @param modifyIndex       A boolean flag that indicates if the current
+   *                          index of session history should be modified 
+   *                          to the parameter index.
+   *
+   * @return                  <code>NS_OK</code> history entry for 
+   *                          the index is obtained successfully.
+   *                          <code>NS_ERROR_FAILURE</code> Error in obtaining
+   *                          history entry for the given index.
+   */
+   nsISHEntry getEntryAtIndex(in long index, in boolean modifyIndex);
+
+
+  /**
+   * Called to purge older documents from history.
+   * Documents can be removed from session history for various 
+   * reasons. For example to  control memory usage of the browser, to 
+   * prevent users from loading documents from history, to erase evidence of
+   * prior page loads etc...
+   *
+   * @param numEntries        The number of toplevel documents to be
+   *                          purged from history. During purge operation,
+   *                          the latest documents are maintained and older 
+   *                          'numEntries' documents are removed from history.
+   * @throws                  <code>NS_SUCCESS_LOSS_OF_INSIGNIFICANT_DATA</code> Purge was vetod.
+   * @throws                  <code>NS_ERROR_FAILURE</code> numEntries is
+   *                          invalid or out of bounds with the size of history.
+   *                          
+   */
+   void PurgeHistory(in long numEntries);
+
+  /**
+   * Called to register a listener for the session history component.
+   * Listeners are notified when pages are loaded or purged from history.
+   * 
+   * @param aListener         Listener object to be notified for all
+   *                          page loads that initiate in session history.
+   *
+   * @note                    A listener object must implement 
+   *                          nsISHistoryListener and nsSupportsWeakReference
+   *
+   * @see nsISHistoryListener
+   * @see nsSupportsWeakReference
+   */
+   void addSHistoryListener(in nsISHistoryListener aListener);
+
+  /**
+   * Called to remove a listener for the session history component.
+   * Listeners are notified when pages are loaded from history.
+   * 
+   * @param aListener         Listener object to be removed from 
+   *                          session history.
+   *
+   * @note                    A listener object must implement 
+   *                          nsISHistoryListener and nsSupportsWeakReference
+   * @see nsISHistoryListener
+   * @see nsSupportsWeakReference
+   */ 
+   void removeSHistoryListener(in nsISHistoryListener aListener);
+
+  /**
+   * Called to obtain a enumerator for all the  documents stored in 
+   * session history. The enumerator object thus returned by this method
+   * can be traversed using nsISimpleEnumerator. 
+   *
+   * @note  To access individual history entries of the enumerator, perform the
+   *        following steps:
+   *        1) Call nsISHistory->GetSHistoryEnumerator() to obtain handle 
+   *           the nsISimpleEnumerator object.
+   *        2) Use nsISimpleEnumerator->GetNext() on the object returned
+   *           by step #1 to obtain handle to the next object in the list. 
+   *           The object returned by this step is of type nsISupports.
+   *        3) Perform a QueryInterface on the object returned by step #2 
+   *           to nsISHEntry.
+   *        4) Use nsISHEntry to access properties of each history entry. 
+   *
+   * @see nsISimpleEnumerator
+   * @see nsISHEntry
+   * @see QueryInterface()
+   * @see do_QueryInterface()
+   */
+   readonly attribute nsISimpleEnumerator SHistoryEnumerator;
+
+   void reloadCurrentEntry();
+
+   /**
+   * Called to obtain the index to a given history entry.
+   *
+   * @param aEntry            The entry to obtain the index of.
+   *
+   * @return                  <code>NS_OK</code> index for the history entry
+   *                          is obtained successfully.
+   *                          <code>NS_ERROR_FAILURE</code> Error in obtaining
+   *                          index for the given history entry.
+   */
+   long getIndexOfEntry(in nsISHEntry aEntry);
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsISHistoryInternal.idl firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsISHistoryInternal.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsISHistoryInternal.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsISHistoryInternal.idl	2015-05-25 20:43:11.000000000 +0000
@@ -0,0 +1,104 @@
+/* -*- Mode: C++; tab-width: 2; 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 "nsISupports.idl"
+
+interface nsIBFCacheEntry;
+interface nsISHEntry;
+interface nsISHistoryListener;
+interface nsISHTransaction;
+interface nsIDocShell;
+interface nsIURI;
+
+%{C++
+#define NS_SHISTORY_INTERNAL_CID \
+{ 0x3dfb2f54, 0x378d, 0x4d3c, \
+  { 0xa9, 0xf9, 0x95, 0xdd, 0x26, 0x73, 0x24, 0x8c } }
+
+#define NS_SHISTORY_INTERNAL_CONTRACTID "@mozilla.org/browser/shistory-internal;1"
+
+#include "nsTArrayForwardDeclare.h"
+%}
+
+[ref] native nsDocshellIDArray(nsTArray<uint64_t>);
+
+[scriptable, uuid(3dfb2f54-378d-4d3c-a9f9-95dd2673248c)]
+interface nsISHistoryInternal: nsISupports
+{
+  /**
+   * Add a new Entry to the History List
+   * @param aEntry - The entry to add
+   * @param aPersist - If true this specifies that the entry should persist
+   * in the list.  If false, this means that when new entries are added
+   * this element will not appear in the session history list.
+   */
+   void  addEntry(in nsISHEntry aEntry, in boolean aPersist);
+
+  /**
+   * Get the root transaction
+   */
+   readonly attribute nsISHTransaction rootTransaction;
+
+  /**
+   * Sets the toplevel docshell object to which this SHistory object belongs to.
+   */
+   void setRootDocShell(in nsIDocShell rootDocShell);
+
+  /** 
+   * Update the index maintained by sessionHistory
+   */
+   void updateIndex();
+
+  /**
+   * Replace the nsISHEntry at a particular index
+   * @param aIndex - The index at which the entry should be replaced
+   * @param aReplaceEntry - The replacement entry for the index.
+   */
+   void replaceEntry(in long aIndex, in nsISHEntry aReplaceEntry);
+
+  /**
+   * Notifies all registered session history listeners about an impending
+   * reload.
+   *
+   * @param aReloadURI    The URI of the document to be reloaded.
+   * @param aReloadFlags  Flags that indicate how the document is to be
+   *                      refreshed. See constants on the nsIWebNavigation
+   *                      interface.
+   * @return              Whether the operation can proceed.
+   */
+   boolean notifyOnHistoryReload(in nsIURI aReloadURI, in unsigned long aReloadFlags);
+
+   /**
+    * Evict content viewers which don't lie in the "safe" range around aIndex.
+    * In practice, this should leave us with no more than gHistoryMaxViewers
+    * viewers associated with this SHistory object.
+    *
+    * Also make sure that the total number of content viewers in all windows is
+    * not greater than our global max; if it is, evict viewers as appropriate.
+    *
+    * @param aIndex - The index around which the "safe" range is centered.  In
+    *   general, if you just navigated the history, aIndex should be the index
+    *   history was navigated to.
+    */
+   void evictOutOfRangeContentViewers(in long aIndex);
+   
+   /**
+    * Evict the content viewer associated with a bfcache entry
+    * that has timed out.
+    */
+   void evictExpiredContentViewerForEntry(in nsIBFCacheEntry aEntry);
+
+   /**
+    * Evict all the content viewers in this session history
+    */
+   void evictAllContentViewers();
+
+   /**
+    * Removes entries from the history if their docshellID is in
+    * aIDs array.
+    */
+  [noscript, notxpcom] void RemoveEntries(in nsDocshellIDArray aIDs,
+                                          in long aStartIndex);
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsISHistoryListener.idl firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsISHistoryListener.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsISHistoryListener.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsISHistoryListener.idl	2015-05-25 20:43:11.000000000 +0000
@@ -0,0 +1,100 @@
+/* -*- 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"
+
+interface nsIURI;
+
+/**
+ * nsISHistoryListener defines the interface one can implement to receive
+ * notifications about activities in session history and to be able to
+ * cancel them.
+ *
+ * A session history listener will be notified when pages are added, removed
+ * and loaded from session history. It can prevent any action (except adding
+ * a new session history entry) from happening by returning false from the
+ * corresponding callback method.
+ *
+ * A session history listener can be registered on a particular nsISHistory
+ * instance via the nsISHistory::addSHistoryListener() method.
+ */
+[scriptable, uuid(125c0833-746a-400e-9b89-d2d18545c08a)]
+interface nsISHistoryListener : nsISupports 
+{
+  /**
+   * Called when a new document is added to session history. New documents are
+   * added to session history by docshell when new pages are loaded in a frame
+   * or content area, for example via nsIWebNavigation::loadURI()
+   *
+   * @param aNewURI     The URI of the document to be added to session history.
+   */
+   void OnHistoryNewEntry(in nsIURI aNewURI);
+
+  /**
+   * Called when navigating to a previous session history entry, for example
+   * due to a nsIWebNavigation::goBack() call.
+   *
+   * @param aBackURI    The URI of the session history entry being navigated to.
+   * @return            Whether the operation can proceed.
+   */
+   boolean OnHistoryGoBack(in nsIURI aBackURI);
+
+  /**
+   * Called when navigating to a next session history entry, for example
+   * due to a nsIWebNavigation::goForward() call.
+   *
+   * @param aForwardURI   The URI of the session history entry being navigated to.
+   * @return              Whether the operation can proceed.
+   */
+   boolean OnHistoryGoForward(in nsIURI aForwardURI);
+
+  /** 
+   * Called when the current document is reloaded, for example due to a
+   * nsIWebNavigation::reload() call.
+   *
+   * @param aReloadURI    The URI of the document to be reloaded.
+   * @param aReloadFlags  Flags that indicate how the document is to be 
+   *                      refreshed. See constants on the nsIWebNavigation
+   *                      interface.
+   * @return              Whether the operation can proceed.
+   *
+   * @see  nsIWebNavigation
+   */
+   boolean OnHistoryReload(in nsIURI aReloadURI, in unsigned long aReloadFlags);
+
+  /**
+   * Called when navigating to a session history entry by index, for example,
+   * when nsIWebNavigation::gotoIndex() is called.
+   *
+   * @param aIndex        The index in session history of the entry to be loaded.
+   * @param aGotoURI      The URI of the session history entry to be loaded.
+   * @return              Whether the operation can proceed.
+   */
+   boolean OnHistoryGotoIndex(in long aIndex, in nsIURI aGotoURI);
+
+  /**
+   * Called when entries are removed from session history. Entries can be
+   * removed from session history for various reasons, for example to control
+   * the memory usage of the browser, to prevent users from loading documents
+   * from history, to erase evidence of prior page loads, etc.
+   *
+   * To purge documents from session history call nsISHistory::PurgeHistory()
+   *
+   * @param aNumEntries   The number of entries to be removed from session history.
+   * @return              Whether the operation can proceed.
+   */
+   boolean OnHistoryPurge(in long aNumEntries);
+
+  /**
+   * Called when an entry is replaced in the session history. Entries are
+   * replaced when navigating away from non-persistent history entries (such as
+   * about pages) and when history.replaceState is called.
+   *
+   * @param aIndex        The index in session history of the entry being
+  *                       replaced
+   */
+   void OnHistoryReplaceEntry(in long aIndex);
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsISHTransaction.idl firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsISHTransaction.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsISHTransaction.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsISHTransaction.idl	2015-05-25 20:43:11.000000000 +0000
@@ -0,0 +1,56 @@
+/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsISupports.idl"
+
+interface nsISHEntry;
+
+/**
+ * The nsISHTransaction.
+ */
+
+
+[scriptable, uuid(2EDF705F-D252-4971-9F09-71DD0F760DC6)]
+interface nsISHTransaction : nsISupports
+{
+	/**
+     * The nsISHEntry for the current transaction
+     */
+	attribute nsISHEntry sHEntry;
+
+	/**
+	 * The parent of this transaction
+	 */
+	attribute nsISHTransaction prev;
+
+	/**
+	 * The legitimate child of this transaction 
+	 */
+	attribute nsISHTransaction next;
+
+	/**
+	 *	Specifies if this transaction should persist.  If not it will be replaced
+	 * by new additions to the list.
+	 */
+	attribute boolean persist;
+
+	/**
+	 * Create a transaction with parent and History Entry 
+	 */
+	 void create(in nsISHEntry aSHEntry, in nsISHTransaction aPrev);
+};
+
+%{ C++
+// {BFD1A792-AD9F-11d3-BDC7-0050040A9B44}
+
+
+#define NS_SHTRANSACTION_CID \
+{0xbfd1a792, 0xad9f, 0x11d3, {0xbd, 0xc7, 0x0, 0x50, 0x4, 0xa, 0x9b, 0x44}}
+
+#define NS_SHTRANSACTION_CONTRACTID \
+    "@mozilla.org/browser/session-history-transaction;1"
+
+%}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsSHEntry.cpp firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsSHEntry.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsSHEntry.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsSHEntry.cpp	2015-05-25 20:43:11.000000000 +0000
@@ -0,0 +1,884 @@
+/* -*- 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 "nsSHEntry.h"
+#include "nsIDocShellLoadInfo.h"
+#include "nsIDocShellTreeItem.h"
+#include "nsDocShellEditorData.h"
+#include "nsSHEntryShared.h"
+#include "nsILayoutHistoryState.h"
+#include "nsIContentViewer.h"
+#include "nsISupportsArray.h"
+#include "nsIStructuredCloneContainer.h"
+#include "nsIInputStream.h"
+#include "nsIURI.h"
+#include "mozilla/net/ReferrerPolicy.h"
+#include <algorithm>
+
+namespace dom = mozilla::dom;
+
+static uint32_t gEntryID = 0;
+
+nsSHEntry::nsSHEntry()
+  : mShared(new nsSHEntryShared())
+  , mReferrerPolicy(mozilla::net::RP_Default)
+  , mLoadType(0)
+  , mID(gEntryID++)
+  , mScrollPositionX(0)
+  , mScrollPositionY(0)
+  , mParent(nullptr)
+  , mURIWasModified(false)
+  , mIsSrcdocEntry(false)
+{
+}
+
+nsSHEntry::nsSHEntry(const nsSHEntry& aOther)
+  : mShared(aOther.mShared)
+  , mURI(aOther.mURI)
+  , mReferrerURI(aOther.mReferrerURI)
+  , mReferrerPolicy(aOther.mReferrerPolicy)
+  , mTitle(aOther.mTitle)
+  , mPostData(aOther.mPostData)
+  , mLoadType(0)         // XXX why not copy?
+  , mID(aOther.mID)
+  , mScrollPositionX(0)  // XXX why not copy?
+  , mScrollPositionY(0)  // XXX why not copy?
+  , mParent(aOther.mParent)
+  , mURIWasModified(aOther.mURIWasModified)
+  , mStateData(aOther.mStateData)
+  , mIsSrcdocEntry(aOther.mIsSrcdocEntry)
+  , mSrcdocData(aOther.mSrcdocData)
+  , mBaseURI(aOther.mBaseURI)
+{
+}
+
+static bool
+ClearParentPtr(nsISHEntry* aEntry, void* /* aData */)
+{
+  if (aEntry) {
+    aEntry->SetParent(nullptr);
+  }
+  return true;
+}
+
+nsSHEntry::~nsSHEntry()
+{
+  // Null out the mParent pointers on all our kids.
+  mChildren.EnumerateForwards(ClearParentPtr, nullptr);
+}
+
+NS_IMPL_ISUPPORTS(nsSHEntry, nsISHContainer, nsISHEntry, nsISHEntryInternal)
+
+NS_IMETHODIMP
+nsSHEntry::SetScrollPosition(int32_t aX, int32_t aY)
+{
+  mScrollPositionX = aX;
+  mScrollPositionY = aY;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetScrollPosition(int32_t* aX, int32_t* aY)
+{
+  *aX = mScrollPositionX;
+  *aY = mScrollPositionY;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetURIWasModified(bool* aOut)
+{
+  *aOut = mURIWasModified;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SetURIWasModified(bool aIn)
+{
+  mURIWasModified = aIn;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetURI(nsIURI** aURI)
+{
+  *aURI = mURI;
+  NS_IF_ADDREF(*aURI);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SetURI(nsIURI* aURI)
+{
+  mURI = aURI;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetReferrerURI(nsIURI** aReferrerURI)
+{
+  *aReferrerURI = mReferrerURI;
+  NS_IF_ADDREF(*aReferrerURI);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SetReferrerURI(nsIURI* aReferrerURI)
+{
+  mReferrerURI = aReferrerURI;
+  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)
+{
+  return mShared->SetContentViewer(aViewer);
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetContentViewer(nsIContentViewer** aResult)
+{
+  *aResult = mShared->mContentViewer;
+  NS_IF_ADDREF(*aResult);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetAnyContentViewer(nsISHEntry** aOwnerEntry,
+                               nsIContentViewer** aResult)
+{
+  // Find a content viewer in the root node or any of its children,
+  // assuming that there is only one content viewer total in any one
+  // nsSHEntry tree
+  GetContentViewer(aResult);
+  if (*aResult) {
+#ifdef DEBUG_PAGE_CACHE
+    printf("Found content viewer\n");
+#endif
+    *aOwnerEntry = this;
+    NS_ADDREF(*aOwnerEntry);
+    return NS_OK;
+  }
+  // The root SHEntry doesn't have a ContentViewer, so check child nodes
+  for (int32_t i = 0; i < mChildren.Count(); i++) {
+    nsISHEntry* child = mChildren[i];
+    if (child) {
+#ifdef DEBUG_PAGE_CACHE
+      printf("Evaluating SHEntry child %d\n", i);
+#endif
+      child->GetAnyContentViewer(aOwnerEntry, aResult);
+      if (*aResult) {
+        return NS_OK;
+      }
+    }
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SetSticky(bool aSticky)
+{
+  mShared->mSticky = aSticky;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetSticky(bool* aSticky)
+{
+  *aSticky = mShared->mSticky;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetTitle(char16_t** aTitle)
+{
+  // Check for empty title...
+  if (mTitle.IsEmpty() && mURI) {
+    // Default title is the URL.
+    nsAutoCString spec;
+    if (NS_SUCCEEDED(mURI->GetSpec(spec))) {
+      AppendUTF8toUTF16(spec, mTitle);
+    }
+  }
+
+  *aTitle = ToNewUnicode(mTitle);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SetTitle(const nsAString& aTitle)
+{
+  mTitle = aTitle;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetPostData(nsIInputStream** aResult)
+{
+  *aResult = mPostData;
+  NS_IF_ADDREF(*aResult);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SetPostData(nsIInputStream* aPostData)
+{
+  mPostData = aPostData;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetLayoutHistoryState(nsILayoutHistoryState** aResult)
+{
+  *aResult = mShared->mLayoutHistoryState;
+  NS_IF_ADDREF(*aResult);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SetLayoutHistoryState(nsILayoutHistoryState* aState)
+{
+  mShared->mLayoutHistoryState = aState;
+  if (mShared->mLayoutHistoryState) {
+    mShared->mLayoutHistoryState->SetScrollPositionOnly(
+      !mShared->mSaveLayoutState);
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetLoadType(uint32_t* aResult)
+{
+  *aResult = mLoadType;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SetLoadType(uint32_t aLoadType)
+{
+  mLoadType = aLoadType;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetID(uint32_t* aResult)
+{
+  *aResult = mID;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SetID(uint32_t aID)
+{
+  mID = aID;
+  return NS_OK;
+}
+
+nsSHEntryShared*
+nsSHEntry::GetSharedState()
+{
+  return mShared;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetIsSubFrame(bool* aFlag)
+{
+  *aFlag = mShared->mIsFrameNavigation;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SetIsSubFrame(bool aFlag)
+{
+  mShared->mIsFrameNavigation = aFlag;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetCacheKey(nsISupports** aResult)
+{
+  *aResult = mShared->mCacheKey;
+  NS_IF_ADDREF(*aResult);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SetCacheKey(nsISupports* aCacheKey)
+{
+  mShared->mCacheKey = aCacheKey;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetSaveLayoutStateFlag(bool* aFlag)
+{
+  *aFlag = mShared->mSaveLayoutState;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SetSaveLayoutStateFlag(bool aFlag)
+{
+  mShared->mSaveLayoutState = aFlag;
+  if (mShared->mLayoutHistoryState) {
+    mShared->mLayoutHistoryState->SetScrollPositionOnly(!aFlag);
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetExpirationStatus(bool* aFlag)
+{
+  *aFlag = mShared->mExpired;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SetExpirationStatus(bool aFlag)
+{
+  mShared->mExpired = aFlag;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetContentType(nsACString& aContentType)
+{
+  aContentType = mShared->mContentType;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SetContentType(const nsACString& aContentType)
+{
+  mShared->mContentType = aContentType;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::Create(nsIURI* aURI, const nsAString& aTitle,
+                  nsIInputStream* aInputStream,
+                  nsILayoutHistoryState* aLayoutHistoryState,
+                  nsISupports* aCacheKey, const nsACString& aContentType,
+                  nsISupports* aOwner, uint64_t aDocShellID,
+                  bool aDynamicCreation)
+{
+  mURI = aURI;
+  mTitle = aTitle;
+  mPostData = aInputStream;
+
+  // Set the LoadType by default to loadHistory during creation
+  mLoadType = (uint32_t)nsIDocShellLoadInfo::loadHistory;
+
+  mShared->mCacheKey = aCacheKey;
+  mShared->mContentType = aContentType;
+  mShared->mOwner = aOwner;
+  mShared->mDocShellID = aDocShellID;
+  mShared->mDynamicallyCreated = aDynamicCreation;
+
+  // By default all entries are set false for subframe flag.
+  // nsDocShell::CloneAndReplace() which creates entries for
+  // all subframe navigations, sets the flag to true.
+  mShared->mIsFrameNavigation = false;
+
+  // By default we save LayoutHistoryState
+  mShared->mSaveLayoutState = true;
+  mShared->mLayoutHistoryState = aLayoutHistoryState;
+
+  // By default the page is not expired
+  mShared->mExpired = false;
+
+  mIsSrcdocEntry = false;
+  mSrcdocData = NullString();
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::Clone(nsISHEntry** aResult)
+{
+  *aResult = new nsSHEntry(*this);
+  NS_ADDREF(*aResult);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetParent(nsISHEntry** aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+  *aResult = mParent;
+  NS_IF_ADDREF(*aResult);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SetParent(nsISHEntry* aParent)
+{
+  /* parent not Addrefed on purpose to avoid cyclic reference
+   * Null parent is OK
+   *
+   * XXX this method should not be scriptable if this is the case!!
+   */
+  mParent = aParent;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SetWindowState(nsISupports* aState)
+{
+  mShared->mWindowState = aState;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetWindowState(nsISupports** aState)
+{
+  NS_IF_ADDREF(*aState = mShared->mWindowState);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SetViewerBounds(const nsIntRect& aBounds)
+{
+  mShared->mViewerBounds = aBounds;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetViewerBounds(nsIntRect& aBounds)
+{
+  aBounds = mShared->mViewerBounds;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetOwner(nsISupports** aOwner)
+{
+  NS_IF_ADDREF(*aOwner = mShared->mOwner);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SetOwner(nsISupports* aOwner)
+{
+  mShared->mOwner = aOwner;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetBFCacheEntry(nsIBFCacheEntry** aEntry)
+{
+  NS_ENSURE_ARG_POINTER(aEntry);
+  NS_IF_ADDREF(*aEntry = mShared);
+  return NS_OK;
+}
+
+bool
+nsSHEntry::HasBFCacheEntry(nsIBFCacheEntry* aEntry)
+{
+  return static_cast<nsIBFCacheEntry*>(mShared) == aEntry;
+}
+
+NS_IMETHODIMP
+nsSHEntry::AdoptBFCacheEntry(nsISHEntry* aEntry)
+{
+  nsCOMPtr<nsISHEntryInternal> shEntry = do_QueryInterface(aEntry);
+  NS_ENSURE_STATE(shEntry);
+
+  nsSHEntryShared* shared = shEntry->GetSharedState();
+  NS_ENSURE_STATE(shared);
+
+  mShared = shared;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SharesDocumentWith(nsISHEntry* aEntry, bool* aOut)
+{
+  NS_ENSURE_ARG_POINTER(aOut);
+
+  nsCOMPtr<nsISHEntryInternal> internal = do_QueryInterface(aEntry);
+  NS_ENSURE_STATE(internal);
+
+  *aOut = mShared == internal->GetSharedState();
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::AbandonBFCacheEntry()
+{
+  mShared = nsSHEntryShared::Duplicate(mShared);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetIsSrcdocEntry(bool* aIsSrcdocEntry)
+{
+  *aIsSrcdocEntry = mIsSrcdocEntry;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetSrcdocData(nsAString& aSrcdocData)
+{
+  aSrcdocData = mSrcdocData;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SetSrcdocData(const nsAString& aSrcdocData)
+{
+  mSrcdocData = aSrcdocData;
+  mIsSrcdocEntry = true;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetBaseURI(nsIURI** aBaseURI)
+{
+  *aBaseURI = mBaseURI;
+  NS_IF_ADDREF(*aBaseURI);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SetBaseURI(nsIURI* aBaseURI)
+{
+  mBaseURI = aBaseURI;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetChildCount(int32_t* aCount)
+{
+  *aCount = mChildren.Count();
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::AddChild(nsISHEntry* aChild, int32_t aOffset)
+{
+  if (aChild) {
+    NS_ENSURE_SUCCESS(aChild->SetParent(this), NS_ERROR_FAILURE);
+  }
+
+  if (aOffset < 0) {
+    mChildren.AppendObject(aChild);
+    return NS_OK;
+  }
+
+  //
+  // Bug 52670: Ensure children are added in order.
+  //
+  //  Later frames in the child list may load faster and get appended
+  //  before earlier frames, causing session history to be scrambled.
+  //  By growing the list here, they are added to the right position.
+  //
+  //  Assert that aOffset will not be so high as to grow us a lot.
+  //
+  NS_ASSERTION(aOffset < (mChildren.Count() + 1023), "Large frames array!\n");
+
+  bool newChildIsDyn = false;
+  if (aChild) {
+    aChild->IsDynamicallyAdded(&newChildIsDyn);
+  }
+
+  // If the new child is dynamically added, try to add it to aOffset, but if
+  // there are non-dynamically added children, the child must be after those.
+  if (newChildIsDyn) {
+    int32_t lastNonDyn = aOffset - 1;
+    for (int32_t i = aOffset; i < mChildren.Count(); ++i) {
+      nsISHEntry* entry = mChildren[i];
+      if (entry) {
+        bool dyn = false;
+        entry->IsDynamicallyAdded(&dyn);
+        if (dyn) {
+          break;
+        } else {
+          lastNonDyn = i;
+        }
+      }
+    }
+    // InsertObjectAt allows only appending one object.
+    // If aOffset is larger than Count(), we must first manually
+    // set the capacity.
+    if (aOffset > mChildren.Count()) {
+      mChildren.SetCount(aOffset);
+    }
+    if (!mChildren.InsertObjectAt(aChild, lastNonDyn + 1)) {
+      NS_WARNING("Adding a child failed!");
+      aChild->SetParent(nullptr);
+      return NS_ERROR_FAILURE;
+    }
+  } else {
+    // If the new child isn't dynamically added, it should be set to aOffset.
+    // If there are dynamically added children before that, those must be
+    // moved to be after aOffset.
+    if (mChildren.Count() > 0) {
+      int32_t start = std::min(mChildren.Count() - 1, aOffset);
+      int32_t dynEntryIndex = -1;
+      nsISHEntry* dynEntry = nullptr;
+      for (int32_t i = start; i >= 0; --i) {
+        nsISHEntry* entry = mChildren[i];
+        if (entry) {
+          bool dyn = false;
+          entry->IsDynamicallyAdded(&dyn);
+          if (dyn) {
+            dynEntryIndex = i;
+            dynEntry = entry;
+          } else {
+            break;
+          }
+        }
+      }
+
+      if (dynEntry) {
+        nsCOMArray<nsISHEntry> tmp;
+        tmp.SetCount(aOffset - dynEntryIndex + 1);
+        mChildren.InsertObjectsAt(tmp, dynEntryIndex);
+        NS_ASSERTION(mChildren[aOffset + 1] == dynEntry, "Whaat?");
+      }
+    }
+
+    // Make sure there isn't anything at aOffset.
+    if (aOffset < mChildren.Count()) {
+      nsISHEntry* oldChild = mChildren[aOffset];
+      if (oldChild && oldChild != aChild) {
+        NS_ERROR("Adding a child where we already have a child? This may misbehave");
+        oldChild->SetParent(nullptr);
+      }
+    }
+
+    if (!mChildren.ReplaceObjectAt(aChild, aOffset)) {
+      NS_WARNING("Adding a child failed!");
+      aChild->SetParent(nullptr);
+      return NS_ERROR_FAILURE;
+    }
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::RemoveChild(nsISHEntry* aChild)
+{
+  NS_ENSURE_TRUE(aChild, NS_ERROR_FAILURE);
+  bool childRemoved = false;
+  bool dynamic = false;
+  aChild->IsDynamicallyAdded(&dynamic);
+  if (dynamic) {
+    childRemoved = mChildren.RemoveObject(aChild);
+  } else {
+    int32_t index = mChildren.IndexOfObject(aChild);
+    if (index >= 0) {
+      childRemoved = mChildren.ReplaceObjectAt(nullptr, index);
+    }
+  }
+  if (childRemoved) {
+    aChild->SetParent(nullptr);
+
+    // reduce the child count, i.e. remove empty children at the end
+    for (int32_t i = mChildren.Count() - 1; i >= 0 && !mChildren[i]; --i) {
+      if (!mChildren.RemoveObjectAt(i)) {
+        break;
+      }
+    }
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetChildAt(int32_t aIndex, nsISHEntry** aResult)
+{
+  if (aIndex >= 0 && aIndex < mChildren.Count()) {
+    *aResult = mChildren[aIndex];
+    // yes, mChildren can have holes in it.  AddChild's offset parameter makes
+    // that possible.
+    NS_IF_ADDREF(*aResult);
+  } else {
+    *aResult = nullptr;
+  }
+  return NS_OK;
+}
+
+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");
+  mShared->mChildShells.AppendObject(aShell);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::ChildShellAt(int32_t aIndex, nsIDocShellTreeItem** aShell)
+{
+  NS_IF_ADDREF(*aShell = mShared->mChildShells.SafeObjectAt(aIndex));
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::ClearChildShells()
+{
+  mShared->mChildShells.Clear();
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetRefreshURIList(nsISupportsArray** aList)
+{
+  NS_IF_ADDREF(*aList = mShared->mRefreshURIList);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SetRefreshURIList(nsISupportsArray* aList)
+{
+  mShared->mRefreshURIList = aList;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SyncPresentationState()
+{
+  return mShared->SyncPresentationState();
+}
+
+void
+nsSHEntry::RemoveFromBFCacheSync()
+{
+  mShared->RemoveFromBFCacheSync();
+}
+
+void
+nsSHEntry::RemoveFromBFCacheAsync()
+{
+  mShared->RemoveFromBFCacheAsync();
+}
+
+nsDocShellEditorData*
+nsSHEntry::ForgetEditorData()
+{
+  // XXX jlebar Check how this is used.
+  return mShared->mEditorData.forget();
+}
+
+void
+nsSHEntry::SetEditorData(nsDocShellEditorData* aData)
+{
+  NS_ASSERTION(!(aData && mShared->mEditorData),
+               "We're going to overwrite an owning ref!");
+  if (mShared->mEditorData != aData) {
+    mShared->mEditorData = aData;
+  }
+}
+
+bool
+nsSHEntry::HasDetachedEditor()
+{
+  return mShared->mEditorData != nullptr;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetStateData(nsIStructuredCloneContainer** aContainer)
+{
+  NS_ENSURE_ARG_POINTER(aContainer);
+  NS_IF_ADDREF(*aContainer = mStateData);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SetStateData(nsIStructuredCloneContainer* aContainer)
+{
+  mStateData = aContainer;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::IsDynamicallyAdded(bool* aAdded)
+{
+  *aAdded = mShared->mDynamicallyCreated;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::HasDynamicallyAddedChild(bool* aAdded)
+{
+  *aAdded = false;
+  for (int32_t i = 0; i < mChildren.Count(); ++i) {
+    nsISHEntry* entry = mChildren[i];
+    if (entry) {
+      entry->IsDynamicallyAdded(aAdded);
+      if (*aAdded) {
+        break;
+      }
+    }
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetDocshellID(uint64_t* aID)
+{
+  *aID = mShared->mDocShellID;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SetDocshellID(uint64_t aID)
+{
+  mShared->mDocShellID = aID;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::GetLastTouched(uint32_t* aLastTouched)
+{
+  *aLastTouched = mShared->mLastTouched;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEntry::SetLastTouched(uint32_t aLastTouched)
+{
+  mShared->mLastTouched = aLastTouched;
+  return NS_OK;
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsSHEntry.h firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsSHEntry.h
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsSHEntry.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsSHEntry.h	2015-05-25 20:43:11.000000000 +0000
@@ -0,0 +1,69 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef nsSHEntry_h
+#define nsSHEntry_h
+
+// Helper Classes
+#include "nsCOMPtr.h"
+#include "nsAutoPtr.h"
+#include "nsCOMArray.h"
+#include "nsString.h"
+#include "mozilla/Attributes.h"
+
+// Interfaces needed
+#include "nsISHEntry.h"
+#include "nsISHContainer.h"
+
+class nsSHEntryShared;
+class nsIInputStream;
+class nsIURI;
+
+class nsSHEntry final : public nsISHEntry,
+                        public nsISHContainer,
+                        public nsISHEntryInternal
+{
+public:
+  nsSHEntry();
+  nsSHEntry(const nsSHEntry& aOther);
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSISHENTRY
+  NS_DECL_NSISHENTRYINTERNAL
+  NS_DECL_NSISHCONTAINER
+
+  void DropPresentationState();
+
+  static nsresult Startup();
+  static void Shutdown();
+
+private:
+  ~nsSHEntry();
+
+  // We share the state in here with other SHEntries which correspond to the
+  // same document.
+  nsRefPtr<nsSHEntryShared> mShared;
+
+  // 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;
+  uint32_t mID;
+  int32_t mScrollPositionX;
+  int32_t mScrollPositionY;
+  nsISHEntry* mParent;
+  nsCOMArray<nsISHEntry> mChildren;
+  bool mURIWasModified;
+  nsCOMPtr<nsIStructuredCloneContainer> mStateData;
+  bool mIsSrcdocEntry;
+  nsString mSrcdocData;
+  nsCOMPtr<nsIURI> mBaseURI;
+};
+
+#endif /* nsSHEntry_h */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsSHEntryShared.cpp firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsSHEntryShared.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsSHEntryShared.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsSHEntryShared.cpp	2015-05-25 20:43:11.000000000 +0000
@@ -0,0 +1,375 @@
+/* -*- 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 "nsSHEntryShared.h"
+
+#include "nsIDOMDocument.h"
+#include "nsISHistory.h"
+#include "nsISHistoryInternal.h"
+#include "nsIDocument.h"
+#include "nsIWebNavigation.h"
+#include "nsIContentViewer.h"
+#include "nsIDocShell.h"
+#include "nsIDocShellTreeItem.h"
+#include "nsDocShellEditorData.h"
+#include "nsThreadUtils.h"
+#include "nsILayoutHistoryState.h"
+#include "mozilla/Attributes.h"
+#include "mozilla/Preferences.h"
+#include "nsISupportsArray.h"
+
+namespace dom = mozilla::dom;
+
+namespace {
+
+uint64_t gSHEntrySharedID = 0;
+
+} // anonymous namespace
+
+#define CONTENT_VIEWER_TIMEOUT_SECONDS "browser.sessionhistory.contentViewerTimeout"
+// Default this to time out unused content viewers after 30 minutes
+#define CONTENT_VIEWER_TIMEOUT_SECONDS_DEFAULT (30 * 60)
+
+typedef nsExpirationTracker<nsSHEntryShared, 3> HistoryTrackerBase;
+class HistoryTracker final : public HistoryTrackerBase
+{
+public:
+  explicit HistoryTracker(uint32_t aTimeout)
+    : HistoryTrackerBase(1000 * aTimeout / 2)
+  {
+  }
+
+protected:
+  virtual void NotifyExpired(nsSHEntryShared* aObj)
+  {
+    RemoveObject(aObj);
+    aObj->Expire();
+  }
+};
+
+static HistoryTracker* gHistoryTracker = nullptr;
+
+void
+nsSHEntryShared::EnsureHistoryTracker()
+{
+  if (!gHistoryTracker) {
+    // nsExpirationTracker doesn't allow one to change the timer period,
+    // so just set it once when the history tracker is used for the first time.
+    gHistoryTracker = new HistoryTracker(
+      mozilla::Preferences::GetUint(CONTENT_VIEWER_TIMEOUT_SECONDS,
+                                    CONTENT_VIEWER_TIMEOUT_SECONDS_DEFAULT));
+  }
+}
+
+void
+nsSHEntryShared::Shutdown()
+{
+  delete gHistoryTracker;
+  gHistoryTracker = nullptr;
+}
+
+nsSHEntryShared::nsSHEntryShared()
+  : mDocShellID(0)
+  , mIsFrameNavigation(false)
+  , mSaveLayoutState(true)
+  , mSticky(true)
+  , mDynamicallyCreated(false)
+  , mLastTouched(0)
+  , mID(gSHEntrySharedID++)
+  , mExpired(false)
+  , mViewerBounds(0, 0, 0, 0)
+{
+}
+
+nsSHEntryShared::~nsSHEntryShared()
+{
+  RemoveFromExpirationTracker();
+
+#ifdef DEBUG
+  if (gHistoryTracker) {
+    // Check that we're not still on track to expire.  We shouldn't be, because
+    // we just removed ourselves!
+    nsExpirationTracker<nsSHEntryShared, 3>::Iterator iterator(gHistoryTracker);
+
+    nsSHEntryShared* elem;
+    while ((elem = iterator.Next()) != nullptr) {
+      NS_ASSERTION(elem != this, "Found dead entry still in the tracker!");
+    }
+  }
+#endif
+
+  if (mContentViewer) {
+    RemoveFromBFCacheSync();
+  }
+}
+
+NS_IMPL_ISUPPORTS(nsSHEntryShared, nsIBFCacheEntry, nsIMutationObserver)
+
+already_AddRefed<nsSHEntryShared>
+nsSHEntryShared::Duplicate(nsSHEntryShared* aEntry)
+{
+  nsRefPtr<nsSHEntryShared> newEntry = new nsSHEntryShared();
+
+  newEntry->mDocShellID = aEntry->mDocShellID;
+  newEntry->mChildShells.AppendObjects(aEntry->mChildShells);
+  newEntry->mOwner = aEntry->mOwner;
+  newEntry->mContentType.Assign(aEntry->mContentType);
+  newEntry->mIsFrameNavigation = aEntry->mIsFrameNavigation;
+  newEntry->mSaveLayoutState = aEntry->mSaveLayoutState;
+  newEntry->mSticky = aEntry->mSticky;
+  newEntry->mDynamicallyCreated = aEntry->mDynamicallyCreated;
+  newEntry->mCacheKey = aEntry->mCacheKey;
+  newEntry->mLastTouched = aEntry->mLastTouched;
+
+  return newEntry.forget();
+}
+
+void
+nsSHEntryShared::RemoveFromExpirationTracker()
+{
+  if (gHistoryTracker && GetExpirationState()->IsTracked()) {
+    gHistoryTracker->RemoveObject(this);
+  }
+}
+
+nsresult
+nsSHEntryShared::SyncPresentationState()
+{
+  if (mContentViewer && mWindowState) {
+    // If we have a content viewer and a window state, we should be ok.
+    return NS_OK;
+  }
+
+  DropPresentationState();
+
+  return NS_OK;
+}
+
+void
+nsSHEntryShared::DropPresentationState()
+{
+  nsRefPtr<nsSHEntryShared> kungFuDeathGrip = this;
+
+  if (mDocument) {
+    mDocument->SetBFCacheEntry(nullptr);
+    mDocument->RemoveMutationObserver(this);
+    mDocument = nullptr;
+  }
+  if (mContentViewer) {
+    mContentViewer->ClearHistoryEntry();
+  }
+
+  RemoveFromExpirationTracker();
+  mContentViewer = nullptr;
+  mSticky = true;
+  mWindowState = nullptr;
+  mViewerBounds.SetRect(0, 0, 0, 0);
+  mChildShells.Clear();
+  mRefreshURIList = nullptr;
+  mEditorData = nullptr;
+}
+
+void
+nsSHEntryShared::Expire()
+{
+  // This entry has timed out. If we still have a content viewer, we need to
+  // evict it.
+  if (!mContentViewer) {
+    return;
+  }
+  nsCOMPtr<nsIDocShell> container;
+  mContentViewer->GetContainer(getter_AddRefs(container));
+  nsCOMPtr<nsIDocShellTreeItem> treeItem = do_QueryInterface(container);
+  if (!treeItem) {
+    return;
+  }
+  // We need to find the root DocShell since only that object has an
+  // SHistory and we need the SHistory to evict content viewers
+  nsCOMPtr<nsIDocShellTreeItem> root;
+  treeItem->GetSameTypeRootTreeItem(getter_AddRefs(root));
+  nsCOMPtr<nsIWebNavigation> webNav = do_QueryInterface(root);
+  nsCOMPtr<nsISHistory> history;
+  webNav->GetSessionHistory(getter_AddRefs(history));
+  nsCOMPtr<nsISHistoryInternal> historyInt = do_QueryInterface(history);
+  if (!historyInt) {
+    return;
+  }
+  historyInt->EvictExpiredContentViewerForEntry(this);
+}
+
+nsresult
+nsSHEntryShared::SetContentViewer(nsIContentViewer* aViewer)
+{
+  NS_PRECONDITION(!aViewer || !mContentViewer,
+                  "SHEntryShared already contains viewer");
+
+  if (mContentViewer || !aViewer) {
+    DropPresentationState();
+  }
+
+  mContentViewer = aViewer;
+
+  if (mContentViewer) {
+    EnsureHistoryTracker();
+    gHistoryTracker->AddObject(this);
+
+    nsCOMPtr<nsIDOMDocument> domDoc;
+    mContentViewer->GetDOMDocument(getter_AddRefs(domDoc));
+    // Store observed document in strong pointer in case it is removed from
+    // the contentviewer
+    mDocument = do_QueryInterface(domDoc);
+    if (mDocument) {
+      mDocument->SetBFCacheEntry(this);
+      mDocument->AddMutationObserver(this);
+    }
+  }
+
+  return NS_OK;
+}
+
+nsresult
+nsSHEntryShared::RemoveFromBFCacheSync()
+{
+  NS_ASSERTION(mContentViewer && mDocument, "we're not in the bfcache!");
+
+  nsCOMPtr<nsIContentViewer> viewer = mContentViewer;
+  DropPresentationState();
+
+  // Warning! The call to DropPresentationState could have dropped the last
+  // reference to this object, so don't access members beyond here.
+
+  if (viewer) {
+    viewer->Destroy();
+  }
+
+  return NS_OK;
+}
+
+class DestroyViewerEvent : public nsRunnable
+{
+public:
+  DestroyViewerEvent(nsIContentViewer* aViewer, nsIDocument* aDocument)
+    : mViewer(aViewer)
+    , mDocument(aDocument)
+  {
+  }
+
+  NS_IMETHOD Run()
+  {
+    if (mViewer) {
+      mViewer->Destroy();
+    }
+    return NS_OK;
+  }
+
+  nsCOMPtr<nsIContentViewer> mViewer;
+  nsCOMPtr<nsIDocument> mDocument;
+};
+
+nsresult
+nsSHEntryShared::RemoveFromBFCacheAsync()
+{
+  NS_ASSERTION(mContentViewer && mDocument, "we're not in the bfcache!");
+
+  // Release the reference to the contentviewer asynchronously so that the
+  // document doesn't get nuked mid-mutation.
+
+  nsCOMPtr<nsIRunnable> evt = new DestroyViewerEvent(mContentViewer, mDocument);
+  nsresult rv = NS_DispatchToCurrentThread(evt);
+  if (NS_FAILED(rv)) {
+    NS_WARNING("failed to dispatch DestroyViewerEvent");
+  } else {
+    // Drop presentation. Only do this if we succeeded in posting the event
+    // since otherwise the document could be torn down mid-mutation, causing
+    // crashes.
+    DropPresentationState();
+  }
+
+  // Careful! The call to DropPresentationState could have dropped the last
+  // reference to this nsSHEntryShared, so don't access members beyond here.
+
+  return NS_OK;
+}
+
+nsresult
+nsSHEntryShared::GetID(uint64_t* aID)
+{
+  *aID = mID;
+  return NS_OK;
+}
+
+void
+nsSHEntryShared::NodeWillBeDestroyed(const nsINode* aNode)
+{
+  NS_NOTREACHED("Document destroyed while we're holding a strong ref to it");
+}
+
+void
+nsSHEntryShared::CharacterDataWillChange(nsIDocument* aDocument,
+                                         nsIContent* aContent,
+                                         CharacterDataChangeInfo* aInfo)
+{
+}
+
+void
+nsSHEntryShared::CharacterDataChanged(nsIDocument* aDocument,
+                                      nsIContent* aContent,
+                                      CharacterDataChangeInfo* aInfo)
+{
+  RemoveFromBFCacheAsync();
+}
+
+void
+nsSHEntryShared::AttributeWillChange(nsIDocument* aDocument,
+                                     dom::Element* aContent,
+                                     int32_t aNameSpaceID,
+                                     nsIAtom* aAttribute,
+                                     int32_t aModType)
+{
+}
+
+void
+nsSHEntryShared::AttributeChanged(nsIDocument* aDocument,
+                                  dom::Element* aElement,
+                                  int32_t aNameSpaceID,
+                                  nsIAtom* aAttribute,
+                                  int32_t aModType)
+{
+  RemoveFromBFCacheAsync();
+}
+
+void
+nsSHEntryShared::ContentAppended(nsIDocument* aDocument,
+                                 nsIContent* aContainer,
+                                 nsIContent* aFirstNewContent,
+                                 int32_t /* unused */)
+{
+  RemoveFromBFCacheAsync();
+}
+
+void
+nsSHEntryShared::ContentInserted(nsIDocument* aDocument,
+                                 nsIContent* aContainer,
+                                 nsIContent* aChild,
+                                 int32_t /* unused */)
+{
+  RemoveFromBFCacheAsync();
+}
+
+void
+nsSHEntryShared::ContentRemoved(nsIDocument* aDocument,
+                                nsIContent* aContainer,
+                                nsIContent* aChild,
+                                int32_t aIndexInContainer,
+                                nsIContent* aPreviousSibling)
+{
+  RemoveFromBFCacheAsync();
+}
+
+void
+nsSHEntryShared::ParentChainChanged(nsIContent* aContent)
+{
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsSHEntryShared.h firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsSHEntryShared.h
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsSHEntryShared.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsSHEntryShared.h	2015-05-25 20:43:11.000000000 +0000
@@ -0,0 +1,96 @@
+/* -*- 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 nsSHEntryShared_h__
+#define nsSHEntryShared_h__
+
+#include "nsCOMPtr.h"
+#include "nsAutoPtr.h"
+#include "nsCOMArray.h"
+#include "nsIBFCacheEntry.h"
+#include "nsIMutationObserver.h"
+#include "nsExpirationTracker.h"
+#include "nsRect.h"
+#include "nsString.h"
+#include "mozilla/Attributes.h"
+
+class nsSHEntry;
+class nsISHEntry;
+class nsIDocument;
+class nsIContentViewer;
+class nsIDocShellTreeItem;
+class nsILayoutHistoryState;
+class nsDocShellEditorData;
+class nsISupportsArray;
+
+// A document may have multiple SHEntries, either due to hash navigations or
+// calls to history.pushState.  SHEntries corresponding to the same document
+// share many members; in particular, they share state related to the
+// back/forward cache.
+//
+// nsSHEntryShared is the vehicle for this sharing.
+class nsSHEntryShared final
+  : public nsIBFCacheEntry
+  , public nsIMutationObserver
+{
+public:
+  static void EnsureHistoryTracker();
+  static void Shutdown();
+
+  nsSHEntryShared();
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIMUTATIONOBSERVER
+  NS_DECL_NSIBFCACHEENTRY
+
+private:
+  ~nsSHEntryShared();
+
+  friend class nsSHEntry;
+
+  friend class HistoryTracker;
+  friend class nsExpirationTracker<nsSHEntryShared, 3>;
+  nsExpirationState *GetExpirationState() { return &mExpirationState; }
+
+  static already_AddRefed<nsSHEntryShared> Duplicate(nsSHEntryShared* aEntry);
+
+  void RemoveFromExpirationTracker();
+  void Expire();
+  nsresult SyncPresentationState();
+  void DropPresentationState();
+
+  nsresult SetContentViewer(nsIContentViewer* aViewer);
+
+  // See nsISHEntry.idl for an explanation of these members.
+
+  // These members are copied by nsSHEntryShared::Duplicate().  If you add a
+  // member here, be sure to update the Duplicate() implementation.
+  uint64_t mDocShellID;
+  nsCOMArray<nsIDocShellTreeItem> mChildShells;
+  nsCOMPtr<nsISupports> mOwner;
+  nsCString mContentType;
+  bool mIsFrameNavigation;
+  bool mSaveLayoutState;
+  bool mSticky;
+  bool mDynamicallyCreated;
+  nsCOMPtr<nsISupports> mCacheKey;
+  uint32_t mLastTouched;
+
+  // These members aren't copied by nsSHEntryShared::Duplicate() because
+  // they're specific to a particular content viewer.
+  uint64_t mID;
+  nsCOMPtr<nsIContentViewer> mContentViewer;
+  nsCOMPtr<nsIDocument> mDocument;
+  nsCOMPtr<nsILayoutHistoryState> mLayoutHistoryState;
+  bool mExpired;
+  nsCOMPtr<nsISupports> mWindowState;
+  nsIntRect mViewerBounds;
+  nsCOMPtr<nsISupportsArray> mRefreshURIList;
+  nsExpirationState mExpirationState;
+  nsAutoPtr<nsDocShellEditorData> mEditorData;
+};
+
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsSHistory.cpp firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsSHistory.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsSHistory.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsSHistory.cpp	2015-05-25 20:43:11.000000000 +0000
@@ -0,0 +1,1837 @@
+/* -*- 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 "nsSHistory.h"
+#include <algorithm>
+
+// Helper Classes
+#include "mozilla/Preferences.h"
+#include "mozilla/StaticPtr.h"
+
+// Interfaces Needed
+#include "nsILayoutHistoryState.h"
+#include "nsIDocShell.h"
+#include "nsIDocShellLoadInfo.h"
+#include "nsISHContainer.h"
+#include "nsIDocShellTreeItem.h"
+#include "nsIURI.h"
+#include "nsIContentViewer.h"
+#include "nsIObserverService.h"
+#include "prclist.h"
+#include "mozilla/Services.h"
+#include "nsTArray.h"
+#include "nsCOMArray.h"
+#include "nsDocShell.h"
+#include "mozilla/Attributes.h"
+#include "nsISHEntry.h"
+#include "nsISHTransaction.h"
+#include "nsISHistoryListener.h"
+#include "nsComponentManagerUtils.h"
+
+// For calculating max history entries and max cachable contentviewers
+#include "prsystem.h"
+#include "mozilla/MathAlgorithms.h"
+
+using namespace mozilla;
+
+#define PREF_SHISTORY_SIZE "browser.sessionhistory.max_entries"
+#define PREF_SHISTORY_MAX_TOTAL_VIEWERS "browser.sessionhistory.max_total_viewers"
+
+static const char* kObservedPrefs[] = {
+  PREF_SHISTORY_SIZE,
+  PREF_SHISTORY_MAX_TOTAL_VIEWERS,
+  nullptr
+};
+
+static int32_t gHistoryMaxSize = 50;
+// Max viewers allowed per SHistory objects
+static const int32_t gHistoryMaxViewers = 3;
+// List of all SHistory objects, used for content viewer cache eviction
+static PRCList gSHistoryList;
+// Max viewers allowed total, across all SHistory objects - negative default
+// means we will calculate how many viewers to cache based on total memory
+int32_t nsSHistory::sHistoryMaxTotalViewers = -1;
+
+// A counter that is used to be able to know the order in which
+// entries were touched, so that we can evict older entries first.
+static uint32_t gTouchCounter = 0;
+
+static PRLogModuleInfo*
+GetSHistoryLog()
+{
+  static PRLogModuleInfo* sLog;
+  if (!sLog) {
+    sLog = PR_NewLogModule("nsSHistory");
+  }
+  return sLog;
+}
+#define LOG(format) MOZ_LOG(GetSHistoryLog(), PR_LOG_DEBUG, format)
+
+// This macro makes it easier to print a log message which includes a URI's
+// spec.  Example use:
+//
+//  nsIURI *uri = [...];
+//  LOG_SPEC(("The URI is %s.", _spec), uri);
+//
+#define LOG_SPEC(format, uri)                              \
+  PR_BEGIN_MACRO                                           \
+    if (PR_LOG_TEST(GetSHistoryLog(), PR_LOG_DEBUG)) {     \
+      nsAutoCString _specStr(NS_LITERAL_CSTRING("(null)"));\
+      if (uri) {                                           \
+        uri->GetSpec(_specStr);                            \
+      }                                                    \
+      const char* _spec = _specStr.get();                  \
+      LOG(format);                                         \
+    }                                                      \
+  PR_END_MACRO
+
+// This macro makes it easy to log a message including an SHEntry's URI.
+// For example:
+//
+//  nsCOMPtr<nsISHEntry> shentry = [...];
+//  LOG_SHENTRY_SPEC(("shentry %p has uri %s.", shentry.get(), _spec), shentry);
+//
+#define LOG_SHENTRY_SPEC(format, shentry)                  \
+  PR_BEGIN_MACRO                                           \
+    if (PR_LOG_TEST(GetSHistoryLog(), PR_LOG_DEBUG)) {     \
+      nsCOMPtr<nsIURI> uri;                                \
+      shentry->GetURI(getter_AddRefs(uri));                \
+      LOG_SPEC(format, uri);                               \
+    }                                                      \
+  PR_END_MACRO
+
+// Iterates over all registered session history listeners.
+#define ITERATE_LISTENERS(body)                            \
+  PR_BEGIN_MACRO                                           \
+  {                                                        \
+    nsAutoTObserverArray<nsWeakPtr, 2>::EndLimitedIterator \
+      iter(mListeners);                                    \
+    while (iter.HasMore()) {                               \
+      nsCOMPtr<nsISHistoryListener> listener =             \
+        do_QueryReferent(iter.GetNext());                  \
+      if (listener) {                                      \
+        body                                               \
+      }                                                    \
+    }                                                      \
+  }                                                        \
+  PR_END_MACRO
+
+// Calls a given method on all registered session history listeners.
+#define NOTIFY_LISTENERS(method, args)                     \
+  ITERATE_LISTENERS(                                       \
+    listener->method args;                                 \
+  );
+
+// Calls a given method on all registered session history listeners.
+// Listeners may return 'false' to cancel an action so make sure that we
+// set the return value to 'false' if one of the listeners wants to cancel.
+#define NOTIFY_LISTENERS_CANCELABLE(method, retval, args)  \
+  PR_BEGIN_MACRO                                           \
+  {                                                        \
+    bool canceled = false;                                 \
+    retval = true;                                         \
+    ITERATE_LISTENERS(                                     \
+      listener->method args;                               \
+      if (!retval) {                                       \
+        canceled = true;                                   \
+      }                                                    \
+    );                                                     \
+    if (canceled) {                                        \
+      retval = false;                                      \
+    }                                                      \
+  }                                                        \
+  PR_END_MACRO
+
+enum HistCmd
+{
+  HIST_CMD_BACK,
+  HIST_CMD_FORWARD,
+  HIST_CMD_GOTOINDEX,
+  HIST_CMD_RELOAD
+};
+
+class nsSHistoryObserver final : public nsIObserver
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIOBSERVER
+
+  nsSHistoryObserver() {}
+
+protected:
+  ~nsSHistoryObserver() {}
+};
+
+StaticRefPtr<nsSHistoryObserver> gObserver;
+
+NS_IMPL_ISUPPORTS(nsSHistoryObserver, nsIObserver)
+
+NS_IMETHODIMP
+nsSHistoryObserver::Observe(nsISupports* aSubject, const char* aTopic,
+                            const char16_t* aData)
+{
+  if (!strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID)) {
+    nsSHistory::UpdatePrefs();
+    nsSHistory::GloballyEvictContentViewers();
+  } else if (!strcmp(aTopic, "cacheservice:empty-cache") ||
+             !strcmp(aTopic, "memory-pressure")) {
+    nsSHistory::GloballyEvictAllContentViewers();
+  }
+
+  return NS_OK;
+}
+
+namespace {
+
+already_AddRefed<nsIContentViewer>
+GetContentViewerForTransaction(nsISHTransaction* aTrans)
+{
+  nsCOMPtr<nsISHEntry> entry;
+  aTrans->GetSHEntry(getter_AddRefs(entry));
+  if (!entry) {
+    return nullptr;
+  }
+
+  nsCOMPtr<nsISHEntry> ownerEntry;
+  nsCOMPtr<nsIContentViewer> viewer;
+  entry->GetAnyContentViewer(getter_AddRefs(ownerEntry),
+                             getter_AddRefs(viewer));
+  return viewer.forget();
+}
+
+void
+EvictContentViewerForTransaction(nsISHTransaction* aTrans)
+{
+  nsCOMPtr<nsISHEntry> entry;
+  aTrans->GetSHEntry(getter_AddRefs(entry));
+  nsCOMPtr<nsIContentViewer> viewer;
+  nsCOMPtr<nsISHEntry> ownerEntry;
+  entry->GetAnyContentViewer(getter_AddRefs(ownerEntry),
+                             getter_AddRefs(viewer));
+  if (viewer) {
+    NS_ASSERTION(ownerEntry, "Content viewer exists but its SHEntry is null");
+
+    LOG_SHENTRY_SPEC(("Evicting content viewer 0x%p for "
+                      "owning SHEntry 0x%p at %s.",
+                      viewer.get(), ownerEntry.get(), _spec),
+                     ownerEntry);
+
+    // Drop the presentation state before destroying the viewer, so that
+    // document teardown is able to correctly persist the state.
+    ownerEntry->SetContentViewer(nullptr);
+    ownerEntry->SyncPresentationState();
+    viewer->Destroy();
+  }
+}
+
+} // anonymous namespace
+
+nsSHistory::nsSHistory()
+  : mIndex(-1)
+  , mLength(0)
+  , mRequestedIndex(-1)
+{
+  // Add this new SHistory object to the list
+  PR_APPEND_LINK(this, &gSHistoryList);
+}
+
+nsSHistory::~nsSHistory()
+{
+  // Remove this SHistory object from the list
+  PR_REMOVE_LINK(this);
+}
+
+NS_IMPL_ADDREF(nsSHistory)
+NS_IMPL_RELEASE(nsSHistory)
+
+NS_INTERFACE_MAP_BEGIN(nsSHistory)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISHistory)
+  NS_INTERFACE_MAP_ENTRY(nsISHistory)
+  NS_INTERFACE_MAP_ENTRY(nsIWebNavigation)
+  NS_INTERFACE_MAP_ENTRY(nsISHistoryInternal)
+NS_INTERFACE_MAP_END
+
+// static
+uint32_t
+nsSHistory::CalcMaxTotalViewers()
+{
+  // Calculate an estimate of how many ContentViewers we should cache based
+  // on RAM.  This assumes that the average ContentViewer is 4MB (conservative)
+  // and caps the max at 8 ContentViewers
+  //
+  // TODO: Should we split the cache memory betw. ContentViewer caching and
+  // nsCacheService?
+  //
+  // RAM      ContentViewers
+  // -----------------------
+  // 32   Mb       0
+  // 64   Mb       1
+  // 128  Mb       2
+  // 256  Mb       3
+  // 512  Mb       5
+  // 1024 Mb       8
+  // 2048 Mb       8
+  // 4096 Mb       8
+  uint64_t bytes = PR_GetPhysicalMemorySize();
+
+  if (bytes == 0) {
+    return 0;
+  }
+
+  // Conversion from unsigned int64_t to double doesn't work on all platforms.
+  // We need to truncate the value at INT64_MAX to make sure we don't
+  // overflow.
+  if (bytes > INT64_MAX) {
+    bytes = INT64_MAX;
+  }
+
+  double kBytesD = (double)(bytes >> 10);
+
+  // This is essentially the same calculation as for nsCacheService,
+  // except that we divide the final memory calculation by 4, since
+  // we assume each ContentViewer takes on average 4MB
+  uint32_t viewers = 0;
+  double x = std::log(kBytesD) / std::log(2.0) - 14;
+  if (x > 0) {
+    viewers = (uint32_t)(x * x - x + 2.001); // add .001 for rounding
+    viewers /= 4;
+  }
+
+  // Cap it off at 8 max
+  if (viewers > 8) {
+    viewers = 8;
+  }
+  return viewers;
+}
+
+// static
+void
+nsSHistory::UpdatePrefs()
+{
+  Preferences::GetInt(PREF_SHISTORY_SIZE, &gHistoryMaxSize);
+  Preferences::GetInt(PREF_SHISTORY_MAX_TOTAL_VIEWERS,
+                      &sHistoryMaxTotalViewers);
+  // If the pref is negative, that means we calculate how many viewers
+  // we think we should cache, based on total memory
+  if (sHistoryMaxTotalViewers < 0) {
+    sHistoryMaxTotalViewers = CalcMaxTotalViewers();
+  }
+}
+
+// static
+nsresult
+nsSHistory::Startup()
+{
+  UpdatePrefs();
+
+  // The goal of this is to unbreak users who have inadvertently set their
+  // session history size to less than the default value.
+  int32_t defaultHistoryMaxSize =
+    Preferences::GetDefaultInt(PREF_SHISTORY_SIZE, 50);
+  if (gHistoryMaxSize < defaultHistoryMaxSize) {
+    gHistoryMaxSize = defaultHistoryMaxSize;
+  }
+
+  // Allow the user to override the max total number of cached viewers,
+  // but keep the per SHistory cached viewer limit constant
+  if (!gObserver) {
+    gObserver = new nsSHistoryObserver();
+    Preferences::AddStrongObservers(gObserver, kObservedPrefs);
+
+    nsCOMPtr<nsIObserverService> obsSvc =
+      mozilla::services::GetObserverService();
+    if (obsSvc) {
+      // Observe empty-cache notifications so tahat clearing the disk/memory
+      // cache will also evict all content viewers.
+      obsSvc->AddObserver(gObserver, "cacheservice:empty-cache", false);
+
+      // Same for memory-pressure notifications
+      obsSvc->AddObserver(gObserver, "memory-pressure", false);
+    }
+  }
+
+  // Initialize the global list of all SHistory objects
+  PR_INIT_CLIST(&gSHistoryList);
+  return NS_OK;
+}
+
+// static
+void
+nsSHistory::Shutdown()
+{
+  if (gObserver) {
+    Preferences::RemoveObservers(gObserver, kObservedPrefs);
+    nsCOMPtr<nsIObserverService> obsSvc =
+      mozilla::services::GetObserverService();
+    if (obsSvc) {
+      obsSvc->RemoveObserver(gObserver, "cacheservice:empty-cache");
+      obsSvc->RemoveObserver(gObserver, "memory-pressure");
+    }
+    gObserver = nullptr;
+  }
+}
+
+/* Add an entry to the History list at mIndex and
+ * increment the index to point to the new entry
+ */
+NS_IMETHODIMP
+nsSHistory::AddEntry(nsISHEntry* aSHEntry, bool aPersist)
+{
+  NS_ENSURE_ARG(aSHEntry);
+
+  nsCOMPtr<nsISHTransaction> currentTxn;
+
+  if (mListRoot) {
+    GetTransactionAtIndex(mIndex, getter_AddRefs(currentTxn));
+  }
+
+  bool currentPersist = true;
+  if (currentTxn) {
+    currentTxn->GetPersist(&currentPersist);
+  }
+
+  int32_t currentIndex = mIndex;
+
+  if (!currentPersist) {
+    NOTIFY_LISTENERS(OnHistoryReplaceEntry, (currentIndex));
+    NS_ENSURE_SUCCESS(currentTxn->SetSHEntry(aSHEntry), NS_ERROR_FAILURE);
+    currentTxn->SetPersist(aPersist);
+    return NS_OK;
+  }
+
+  nsCOMPtr<nsISHTransaction> txn(
+    do_CreateInstance(NS_SHTRANSACTION_CONTRACTID));
+  NS_ENSURE_TRUE(txn, NS_ERROR_FAILURE);
+
+  nsCOMPtr<nsIURI> uri;
+  aSHEntry->GetURI(getter_AddRefs(uri));
+  NOTIFY_LISTENERS(OnHistoryNewEntry, (uri));
+
+  // If a listener has changed mIndex, we need to get currentTxn again,
+  // otherwise we'll be left at an inconsistent state (see bug 320742)
+  if (currentIndex != mIndex) {
+    GetTransactionAtIndex(mIndex, getter_AddRefs(currentTxn));
+  }
+
+  // Set the ShEntry and parent for the transaction. setting the
+  // parent will properly set the parent child relationship
+  txn->SetPersist(aPersist);
+  NS_ENSURE_SUCCESS(txn->Create(aSHEntry, currentTxn), NS_ERROR_FAILURE);
+
+  // A little tricky math here...  Basically when adding an object regardless of
+  // what the length was before, it should always be set back to the current and
+  // lop off the forward.
+  mLength = (++mIndex + 1);
+
+  // If this is the very first transaction, initialize the list
+  if (!mListRoot) {
+    mListRoot = txn;
+  }
+
+  // Purge History list if it is too long
+  if (gHistoryMaxSize >= 0 && mLength > gHistoryMaxSize) {
+    PurgeHistory(mLength - gHistoryMaxSize);
+  }
+
+  RemoveDynEntries(mIndex - 1, mIndex);
+  return NS_OK;
+}
+
+/* Get size of the history list */
+NS_IMETHODIMP
+nsSHistory::GetCount(int32_t* aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+  *aResult = mLength;
+  return NS_OK;
+}
+
+/* Get index of the history list */
+NS_IMETHODIMP
+nsSHistory::GetIndex(int32_t* aResult)
+{
+  NS_PRECONDITION(aResult, "null out param?");
+  *aResult = mIndex;
+  return NS_OK;
+}
+
+/* Get the requestedIndex */
+NS_IMETHODIMP
+nsSHistory::GetRequestedIndex(int32_t* aResult)
+{
+  NS_PRECONDITION(aResult, "null out param?");
+  *aResult = mRequestedIndex;
+  return NS_OK;
+}
+
+/* Get the entry at a given index */
+NS_IMETHODIMP
+nsSHistory::GetEntryAtIndex(int32_t aIndex, bool aModifyIndex,
+                            nsISHEntry** aResult)
+{
+  nsresult rv;
+  nsCOMPtr<nsISHTransaction> txn;
+
+  /* GetTransactionAtIndex ensures aResult is valid and validates aIndex */
+  rv = GetTransactionAtIndex(aIndex, getter_AddRefs(txn));
+  if (NS_SUCCEEDED(rv) && txn) {
+    // Get the Entry from the transaction
+    rv = txn->GetSHEntry(aResult);
+    if (NS_SUCCEEDED(rv) && (*aResult)) {
+      // Set mIndex to the requested index, if asked to do so..
+      if (aModifyIndex) {
+        mIndex = aIndex;
+      }
+    }
+  }
+  return rv;
+}
+
+/* Get the transaction at a given index */
+NS_IMETHODIMP
+nsSHistory::GetTransactionAtIndex(int32_t aIndex, nsISHTransaction** aResult)
+{
+  nsresult rv;
+  NS_ENSURE_ARG_POINTER(aResult);
+
+  if (mLength <= 0 || aIndex < 0 || aIndex >= mLength) {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (!mListRoot) {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (aIndex == 0) {
+    *aResult = mListRoot;
+    NS_ADDREF(*aResult);
+    return NS_OK;
+  }
+
+  int32_t cnt = 0;
+  nsCOMPtr<nsISHTransaction> tempPtr;
+  rv = GetRootTransaction(getter_AddRefs(tempPtr));
+  if (NS_FAILED(rv) || !tempPtr) {
+    return NS_ERROR_FAILURE;
+  }
+
+  while (true) {
+    nsCOMPtr<nsISHTransaction> ptr;
+    rv = tempPtr->GetNext(getter_AddRefs(ptr));
+    if (NS_SUCCEEDED(rv) && ptr) {
+      cnt++;
+      if (cnt == aIndex) {
+        ptr.forget(aResult);
+        break;
+      } else {
+        tempPtr = ptr;
+        continue;
+      }
+    } else {
+      return NS_ERROR_FAILURE;
+    }
+  }
+
+  return NS_OK;
+}
+
+/* Get the index of a given entry */
+NS_IMETHODIMP
+nsSHistory::GetIndexOfEntry(nsISHEntry* aSHEntry, int32_t* aResult)
+{
+  NS_ENSURE_ARG(aSHEntry);
+  NS_ENSURE_ARG_POINTER(aResult);
+  *aResult = -1;
+
+  if (mLength <= 0) {
+    return NS_ERROR_FAILURE;
+  }
+
+  nsCOMPtr<nsISHTransaction> currentTxn;
+  int32_t cnt = 0;
+
+  nsresult rv = GetRootTransaction(getter_AddRefs(currentTxn));
+  if (NS_FAILED(rv) || !currentTxn) {
+    return NS_ERROR_FAILURE;
+  }
+
+  while (true) {
+    nsCOMPtr<nsISHEntry> entry;
+    rv = currentTxn->GetSHEntry(getter_AddRefs(entry));
+    if (NS_FAILED(rv) || !entry) {
+      return NS_ERROR_FAILURE;
+    }
+
+    if (aSHEntry == entry) {
+      *aResult = cnt;
+      break;
+    }
+
+    rv = currentTxn->GetNext(getter_AddRefs(currentTxn));
+    if (NS_FAILED(rv) || !currentTxn) {
+      return NS_ERROR_FAILURE;
+    }
+
+    cnt++;
+  }
+
+  return NS_OK;
+}
+
+#ifdef DEBUG
+nsresult
+nsSHistory::PrintHistory()
+{
+  nsCOMPtr<nsISHTransaction> txn;
+  int32_t index = 0;
+  nsresult rv;
+
+  if (!mListRoot) {
+    return NS_ERROR_FAILURE;
+  }
+
+  txn = mListRoot;
+
+  while (1) {
+    if (!txn) {
+      break;
+    }
+    nsCOMPtr<nsISHEntry> entry;
+    rv = txn->GetSHEntry(getter_AddRefs(entry));
+    if (NS_FAILED(rv) && !entry) {
+      return NS_ERROR_FAILURE;
+    }
+
+    nsCOMPtr<nsILayoutHistoryState> layoutHistoryState;
+    nsCOMPtr<nsIURI> uri;
+    nsXPIDLString title;
+
+    entry->GetLayoutHistoryState(getter_AddRefs(layoutHistoryState));
+    entry->GetURI(getter_AddRefs(uri));
+    entry->GetTitle(getter_Copies(title));
+
+#if 0
+    nsAutoCString url;
+    if (uri) {
+      uri->GetSpec(url);
+    }
+
+    printf("**** SH Transaction #%d, Entry = %x\n", index, entry.get());
+    printf("\t\t URL = %s\n", url.get());
+
+    printf("\t\t Title = %s\n", NS_LossyConvertUTF16toASCII(title).get());
+    printf("\t\t layout History Data = %x\n", layoutHistoryState.get());
+#endif
+
+    nsCOMPtr<nsISHTransaction> next;
+    rv = txn->GetNext(getter_AddRefs(next));
+    if (NS_SUCCEEDED(rv) && next) {
+      txn = next;
+      index++;
+      continue;
+    } else {
+      break;
+    }
+  }
+
+  return NS_OK;
+}
+#endif
+
+NS_IMETHODIMP
+nsSHistory::GetRootTransaction(nsISHTransaction** aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+  *aResult = mListRoot;
+  NS_IF_ADDREF(*aResult);
+  return NS_OK;
+}
+
+/* Get the max size of the history list */
+NS_IMETHODIMP
+nsSHistory::GetMaxLength(int32_t* aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+  *aResult = gHistoryMaxSize;
+  return NS_OK;
+}
+
+/* Set the max size of the history list */
+NS_IMETHODIMP
+nsSHistory::SetMaxLength(int32_t aMaxSize)
+{
+  if (aMaxSize < 0) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+
+  gHistoryMaxSize = aMaxSize;
+  if (mLength > aMaxSize) {
+    PurgeHistory(mLength - aMaxSize);
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHistory::PurgeHistory(int32_t aEntries)
+{
+  if (mLength <= 0 || aEntries <= 0) {
+    return NS_ERROR_FAILURE;
+  }
+
+  aEntries = std::min(aEntries, mLength);
+
+  bool purgeHistory = true;
+  NOTIFY_LISTENERS_CANCELABLE(OnHistoryPurge, purgeHistory,
+                              (aEntries, &purgeHistory));
+
+  if (!purgeHistory) {
+    // Listener asked us not to purge
+    return NS_SUCCESS_LOSS_OF_INSIGNIFICANT_DATA;
+  }
+
+  int32_t cnt = 0;
+  while (cnt < aEntries) {
+    nsCOMPtr<nsISHTransaction> nextTxn;
+    if (mListRoot) {
+      mListRoot->GetNext(getter_AddRefs(nextTxn));
+      mListRoot->SetNext(nullptr);
+    }
+    mListRoot = nextTxn;
+    if (mListRoot) {
+      mListRoot->SetPrev(nullptr);
+    }
+    cnt++;
+  }
+  mLength -= cnt;
+  mIndex -= cnt;
+
+  // Now if we were not at the end of the history, mIndex could have
+  // become far too negative.  If so, just set it to -1.
+  if (mIndex < -1) {
+    mIndex = -1;
+  }
+
+  if (mRootDocShell) {
+    mRootDocShell->HistoryPurged(cnt);
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHistory::AddSHistoryListener(nsISHistoryListener* aListener)
+{
+  NS_ENSURE_ARG_POINTER(aListener);
+
+  // Check if the listener supports Weak Reference. This is a must.
+  // This listener functionality is used by embedders and we want to
+  // have the right ownership with who ever listens to SHistory
+  nsWeakPtr listener = do_GetWeakReference(aListener);
+  if (!listener) {
+    return NS_ERROR_FAILURE;
+  }
+
+  return mListeners.AppendElementUnlessExists(listener) ?
+    NS_OK : NS_ERROR_OUT_OF_MEMORY;
+}
+
+NS_IMETHODIMP
+nsSHistory::RemoveSHistoryListener(nsISHistoryListener* aListener)
+{
+  // Make sure the listener that wants to be removed is the
+  // one we have in store.
+  nsWeakPtr listener = do_GetWeakReference(aListener);
+  mListeners.RemoveElement(listener);
+  return NS_OK;
+}
+
+/* Replace an entry in the History list at a particular index.
+ * Do not update index or count.
+ */
+NS_IMETHODIMP
+nsSHistory::ReplaceEntry(int32_t aIndex, nsISHEntry* aReplaceEntry)
+{
+  NS_ENSURE_ARG(aReplaceEntry);
+  nsresult rv;
+  nsCOMPtr<nsISHTransaction> currentTxn;
+
+  if (!mListRoot) {
+    // Session History is not initialised.
+    return NS_ERROR_FAILURE;
+  }
+
+  rv = GetTransactionAtIndex(aIndex, getter_AddRefs(currentTxn));
+
+  if (currentTxn) {
+    NOTIFY_LISTENERS(OnHistoryReplaceEntry, (aIndex));
+
+    // Set the replacement entry in the transaction
+    rv = currentTxn->SetSHEntry(aReplaceEntry);
+    rv = currentTxn->SetPersist(true);
+  }
+  return rv;
+}
+
+NS_IMETHODIMP
+nsSHistory::NotifyOnHistoryReload(nsIURI* aReloadURI, uint32_t aReloadFlags,
+                                  bool* aCanReload)
+{
+  NOTIFY_LISTENERS_CANCELABLE(OnHistoryReload, *aCanReload,
+                              (aReloadURI, aReloadFlags, aCanReload));
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHistory::EvictOutOfRangeContentViewers(int32_t aIndex)
+{
+  // Check our per SHistory object limit in the currently navigated SHistory
+  EvictOutOfRangeWindowContentViewers(aIndex);
+  // Check our total limit across all SHistory objects
+  GloballyEvictContentViewers();
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHistory::EvictAllContentViewers()
+{
+  // XXXbz we don't actually do a good job of evicting things as we should, so
+  // we might have viewers quite far from mIndex.  So just evict everything.
+  nsCOMPtr<nsISHTransaction> trans = mListRoot;
+  while (trans) {
+    EvictContentViewerForTransaction(trans);
+
+    nsISHTransaction* temp = trans;
+    temp->GetNext(getter_AddRefs(trans));
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHistory::GetCanGoBack(bool* aCanGoBack)
+{
+  NS_ENSURE_ARG_POINTER(aCanGoBack);
+  *aCanGoBack = false;
+
+  int32_t index = -1;
+  NS_ENSURE_SUCCESS(GetIndex(&index), NS_ERROR_FAILURE);
+  if (index > 0) {
+    *aCanGoBack = true;
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHistory::GetCanGoForward(bool* aCanGoForward)
+{
+  NS_ENSURE_ARG_POINTER(aCanGoForward);
+  *aCanGoForward = false;
+
+  int32_t index = -1;
+  int32_t count = -1;
+
+  NS_ENSURE_SUCCESS(GetIndex(&index), NS_ERROR_FAILURE);
+  NS_ENSURE_SUCCESS(GetCount(&count), NS_ERROR_FAILURE);
+
+  if (index >= 0 && index < (count - 1)) {
+    *aCanGoForward = true;
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHistory::GoBack()
+{
+  bool canGoBack = false;
+
+  GetCanGoBack(&canGoBack);
+  if (!canGoBack) {
+    return NS_ERROR_UNEXPECTED;
+  }
+  return LoadEntry(mIndex - 1, nsIDocShellLoadInfo::loadHistory, HIST_CMD_BACK);
+}
+
+NS_IMETHODIMP
+nsSHistory::GoForward()
+{
+  bool canGoForward = false;
+
+  GetCanGoForward(&canGoForward);
+  if (!canGoForward) {
+    return NS_ERROR_UNEXPECTED;
+  }
+  return LoadEntry(mIndex + 1, nsIDocShellLoadInfo::loadHistory,
+                   HIST_CMD_FORWARD);
+}
+
+NS_IMETHODIMP
+nsSHistory::Reload(uint32_t aReloadFlags)
+{
+  nsDocShellInfoLoadType loadType;
+  if (aReloadFlags & nsIWebNavigation::LOAD_FLAGS_BYPASS_PROXY &&
+      aReloadFlags & nsIWebNavigation::LOAD_FLAGS_BYPASS_CACHE) {
+    loadType = nsIDocShellLoadInfo::loadReloadBypassProxyAndCache;
+  } else if (aReloadFlags & nsIWebNavigation::LOAD_FLAGS_BYPASS_PROXY) {
+    loadType = nsIDocShellLoadInfo::loadReloadBypassProxy;
+  } else if (aReloadFlags & nsIWebNavigation::LOAD_FLAGS_BYPASS_CACHE) {
+    loadType = nsIDocShellLoadInfo::loadReloadBypassCache;
+  } else if (aReloadFlags & nsIWebNavigation::LOAD_FLAGS_CHARSET_CHANGE) {
+    loadType = nsIDocShellLoadInfo::loadReloadCharsetChange;
+  } else if (aReloadFlags & nsIWebNavigation::LOAD_FLAGS_ALLOW_MIXED_CONTENT) {
+    loadType = nsIDocShellLoadInfo::loadReloadMixedContent;
+  } else {
+    loadType = nsIDocShellLoadInfo::loadReloadNormal;
+  }
+
+  // We are reloading. Send Reload notifications.
+  // nsDocShellLoadFlagType is not public, where as nsIWebNavigation
+  // is public. So send the reload notifications with the
+  // nsIWebNavigation flags.
+  bool canNavigate = true;
+  nsCOMPtr<nsIURI> currentURI;
+  GetCurrentURI(getter_AddRefs(currentURI));
+  NOTIFY_LISTENERS_CANCELABLE(OnHistoryReload, canNavigate,
+                              (currentURI, aReloadFlags, &canNavigate));
+  if (!canNavigate) {
+    return NS_OK;
+  }
+
+  return LoadEntry(mIndex, loadType, HIST_CMD_RELOAD);
+}
+
+NS_IMETHODIMP
+nsSHistory::ReloadCurrentEntry()
+{
+  // Notify listeners
+  bool canNavigate = true;
+  nsCOMPtr<nsIURI> currentURI;
+  GetCurrentURI(getter_AddRefs(currentURI));
+  NOTIFY_LISTENERS_CANCELABLE(OnHistoryGotoIndex, canNavigate,
+                              (mIndex, currentURI, &canNavigate));
+  if (!canNavigate) {
+    return NS_OK;
+  }
+
+  return LoadEntry(mIndex, nsIDocShellLoadInfo::loadHistory, HIST_CMD_RELOAD);
+}
+
+void
+nsSHistory::EvictOutOfRangeWindowContentViewers(int32_t aIndex)
+{
+  // XXX rename method to EvictContentViewersExceptAroundIndex, or something.
+
+  // We need to release all content viewers that are no longer in the range
+  //
+  //  aIndex - gHistoryMaxViewers to aIndex + gHistoryMaxViewers
+  //
+  // to ensure that this SHistory object isn't responsible for more than
+  // gHistoryMaxViewers content viewers.  But our job is complicated by the
+  // fact that two transactions which are related by either hash navigations or
+  // history.pushState will have the same content viewer.
+  //
+  // To illustrate the issue, suppose gHistoryMaxViewers = 3 and we have four
+  // linked transactions in our history.  Suppose we then add a new content
+  // viewer and call into this function.  So the history looks like:
+  //
+  //   A A A A B
+  //     +     *
+  //
+  // where the letters are content viewers and + and * denote the beginning and
+  // end of the range aIndex +/- gHistoryMaxViewers.
+  //
+  // Although one copy of the content viewer A exists outside the range, we
+  // don't want to evict A, because it has other copies in range!
+  //
+  // We therefore adjust our eviction strategy to read:
+  //
+  //   Evict each content viewer outside the range aIndex -/+
+  //   gHistoryMaxViewers, unless that content viewer also appears within the
+  //   range.
+  //
+  // (Note that it's entirely legal to have two copies of one content viewer
+  // separated by a different content viewer -- call pushState twice, go back
+  // once, and refresh -- so we can't rely on identical viewers only appearing
+  // adjacent to one another.)
+
+  if (aIndex < 0) {
+    return;
+  }
+  NS_ENSURE_TRUE_VOID(aIndex < mLength);
+
+  // Calculate the range that's safe from eviction.
+  int32_t startSafeIndex = std::max(0, aIndex - gHistoryMaxViewers);
+  int32_t endSafeIndex = std::min(mLength, aIndex + gHistoryMaxViewers);
+
+  LOG(("EvictOutOfRangeWindowContentViewers(index=%d), "
+       "mLength=%d. Safe range [%d, %d]",
+       aIndex, mLength, startSafeIndex, endSafeIndex));
+
+  // The content viewers in range aIndex -/+ gHistoryMaxViewers will not be
+  // evicted.  Collect a set of them so we don't accidentally evict one of them
+  // if it appears outside this range.
+  nsCOMArray<nsIContentViewer> safeViewers;
+  nsCOMPtr<nsISHTransaction> trans;
+  GetTransactionAtIndex(startSafeIndex, getter_AddRefs(trans));
+  for (int32_t i = startSafeIndex; trans && i <= endSafeIndex; i++) {
+    nsCOMPtr<nsIContentViewer> viewer = GetContentViewerForTransaction(trans);
+    safeViewers.AppendObject(viewer);
+    nsISHTransaction* temp = trans;
+    temp->GetNext(getter_AddRefs(trans));
+  }
+
+  // Walk the SHistory list and evict any content viewers that aren't safe.
+  GetTransactionAtIndex(0, getter_AddRefs(trans));
+  while (trans) {
+    nsCOMPtr<nsIContentViewer> viewer = GetContentViewerForTransaction(trans);
+    if (safeViewers.IndexOf(viewer) == -1) {
+      EvictContentViewerForTransaction(trans);
+    }
+
+    nsISHTransaction* temp = trans;
+    temp->GetNext(getter_AddRefs(trans));
+  }
+}
+
+namespace {
+
+class TransactionAndDistance
+{
+public:
+  TransactionAndDistance(nsISHTransaction* aTrans, uint32_t aDist)
+    : mTransaction(aTrans)
+    , mDistance(aDist)
+  {
+    mViewer = GetContentViewerForTransaction(aTrans);
+    NS_ASSERTION(mViewer, "Transaction should have a content viewer");
+
+    nsCOMPtr<nsISHEntry> shentry;
+    mTransaction->GetSHEntry(getter_AddRefs(shentry));
+
+    nsCOMPtr<nsISHEntryInternal> shentryInternal = do_QueryInterface(shentry);
+    if (shentryInternal) {
+      shentryInternal->GetLastTouched(&mLastTouched);
+    } else {
+      NS_WARNING("Can't cast to nsISHEntryInternal?");
+      mLastTouched = 0;
+    }
+  }
+
+  bool operator<(const TransactionAndDistance& aOther) const
+  {
+    // Compare distances first, and fall back to last-accessed times.
+    if (aOther.mDistance != this->mDistance) {
+      return this->mDistance < aOther.mDistance;
+    }
+
+    return this->mLastTouched < aOther.mLastTouched;
+  }
+
+  bool operator==(const TransactionAndDistance& aOther) const
+  {
+    // This is a little silly; we need == so the default comaprator can be
+    // instantiated, but this function is never actually called when we sort
+    // the list of TransactionAndDistance objects.
+    return aOther.mDistance == this->mDistance &&
+           aOther.mLastTouched == this->mLastTouched;
+  }
+
+  nsCOMPtr<nsISHTransaction> mTransaction;
+  nsCOMPtr<nsIContentViewer> mViewer;
+  uint32_t mLastTouched;
+  int32_t mDistance;
+};
+
+} // anonymous namespace
+
+// static
+void
+nsSHistory::GloballyEvictContentViewers()
+{
+  // First, collect from each SHistory object the transactions which have a
+  // cached content viewer.  Associate with each transaction its distance from
+  // its SHistory's current index.
+
+  nsTArray<TransactionAndDistance> transactions;
+
+  PRCList* listEntry = PR_LIST_HEAD(&gSHistoryList);
+  while (listEntry != &gSHistoryList) {
+    nsSHistory* shist = static_cast<nsSHistory*>(listEntry);
+
+    // Maintain a list of the transactions which have viewers and belong to
+    // this particular shist object.  We'll add this list to the global list,
+    // |transactions|, eventually.
+    nsTArray<TransactionAndDistance> shTransactions;
+
+    // Content viewers are likely to exist only within shist->mIndex -/+
+    // gHistoryMaxViewers, so only search within that range.
+    //
+    // A content viewer might exist outside that range due to either:
+    //
+    //   * history.pushState or hash navigations, in which case a copy of the
+    //     content viewer should exist within the range, or
+    //
+    //   * bugs which cause us not to call nsSHistory::EvictContentViewers()
+    //     often enough.  Once we do call EvictContentViewers() for the
+    //     SHistory object in question, we'll do a full search of its history
+    //     and evict the out-of-range content viewers, so we don't bother here.
+    //
+    int32_t startIndex = std::max(0, shist->mIndex - gHistoryMaxViewers);
+    int32_t endIndex = std::min(shist->mLength - 1,
+                                shist->mIndex + gHistoryMaxViewers);
+    nsCOMPtr<nsISHTransaction> trans;
+    shist->GetTransactionAtIndex(startIndex, getter_AddRefs(trans));
+    for (int32_t i = startIndex; trans && i <= endIndex; i++) {
+      nsCOMPtr<nsIContentViewer> contentViewer =
+        GetContentViewerForTransaction(trans);
+
+      if (contentViewer) {
+        // Because one content viewer might belong to multiple SHEntries, we
+        // have to search through shTransactions to see if we already know
+        // about this content viewer.  If we find the viewer, update its
+        // distance from the SHistory's index and continue.
+        bool found = false;
+        for (uint32_t j = 0; j < shTransactions.Length(); j++) {
+          TransactionAndDistance& container = shTransactions[j];
+          if (container.mViewer == contentViewer) {
+            container.mDistance = std::min(container.mDistance,
+                                           DeprecatedAbs(i - shist->mIndex));
+            found = true;
+            break;
+          }
+        }
+
+        // If we didn't find a TransactionAndDistance for this content viewer,
+        // make a new one.
+        if (!found) {
+          TransactionAndDistance container(trans,
+                                           DeprecatedAbs(i - shist->mIndex));
+          shTransactions.AppendElement(container);
+        }
+      }
+
+      nsISHTransaction* temp = trans;
+      temp->GetNext(getter_AddRefs(trans));
+    }
+
+    // We've found all the transactions belonging to shist which have viewers.
+    // Add those transactions to our global list and move on.
+    transactions.AppendElements(shTransactions);
+    listEntry = PR_NEXT_LINK(shist);
+  }
+
+  // We now have collected all cached content viewers.  First check that we
+  // have enough that we actually need to evict some.
+  if ((int32_t)transactions.Length() <= sHistoryMaxTotalViewers) {
+    return;
+  }
+
+  // If we need to evict, sort our list of transactions and evict the largest
+  // ones.  (We could of course get better algorithmic complexity here by using
+  // a heap or something more clever.  But sHistoryMaxTotalViewers isn't large,
+  // so let's not worry about it.)
+  transactions.Sort();
+
+  for (int32_t i = transactions.Length() - 1; i >= sHistoryMaxTotalViewers;
+       --i) {
+    EvictContentViewerForTransaction(transactions[i].mTransaction);
+  }
+}
+
+nsresult
+nsSHistory::EvictExpiredContentViewerForEntry(nsIBFCacheEntry* aEntry)
+{
+  int32_t startIndex = std::max(0, mIndex - gHistoryMaxViewers);
+  int32_t endIndex = std::min(mLength - 1, mIndex + gHistoryMaxViewers);
+  nsCOMPtr<nsISHTransaction> trans;
+  GetTransactionAtIndex(startIndex, getter_AddRefs(trans));
+
+  int32_t i;
+  for (i = startIndex; trans && i <= endIndex; ++i) {
+    nsCOMPtr<nsISHEntry> entry;
+    trans->GetSHEntry(getter_AddRefs(entry));
+
+    // Does entry have the same BFCacheEntry as the argument to this method?
+    if (entry->HasBFCacheEntry(aEntry)) {
+      break;
+    }
+
+    nsISHTransaction* temp = trans;
+    temp->GetNext(getter_AddRefs(trans));
+  }
+  if (i > endIndex) {
+    return NS_OK;
+  }
+
+  if (i == mIndex) {
+    NS_WARNING("How did the current SHEntry expire?");
+    return NS_OK;
+  }
+
+  EvictContentViewerForTransaction(trans);
+
+  return NS_OK;
+}
+
+// Evicts all content viewers in all history objects.  This is very
+// inefficient, because it requires a linear search through all SHistory
+// objects for each viewer to be evicted.  However, this method is called
+// infrequently -- only when the disk or memory cache is cleared.
+
+// static
+void
+nsSHistory::GloballyEvictAllContentViewers()
+{
+  int32_t maxViewers = sHistoryMaxTotalViewers;
+  sHistoryMaxTotalViewers = 0;
+  GloballyEvictContentViewers();
+  sHistoryMaxTotalViewers = maxViewers;
+}
+
+void
+GetDynamicChildren(nsISHContainer* aContainer,
+                   nsTArray<uint64_t>& aDocshellIDs,
+                   bool aOnlyTopLevelDynamic)
+{
+  int32_t count = 0;
+  aContainer->GetChildCount(&count);
+  for (int32_t i = 0; i < count; ++i) {
+    nsCOMPtr<nsISHEntry> child;
+    aContainer->GetChildAt(i, getter_AddRefs(child));
+    if (child) {
+      bool dynAdded = false;
+      child->IsDynamicallyAdded(&dynAdded);
+      if (dynAdded) {
+        uint64_t docshellID = 0;
+        child->GetDocshellID(&docshellID);
+        aDocshellIDs.AppendElement(docshellID);
+      }
+      if (!dynAdded || !aOnlyTopLevelDynamic) {
+        nsCOMPtr<nsISHContainer> childAsContainer = do_QueryInterface(child);
+        if (childAsContainer) {
+          GetDynamicChildren(childAsContainer, aDocshellIDs,
+                             aOnlyTopLevelDynamic);
+        }
+      }
+    }
+  }
+}
+
+bool
+RemoveFromSessionHistoryContainer(nsISHContainer* aContainer,
+                                  nsTArray<uint64_t>& aDocshellIDs)
+{
+  nsCOMPtr<nsISHEntry> root = do_QueryInterface(aContainer);
+  NS_ENSURE_TRUE(root, false);
+
+  bool didRemove = false;
+  int32_t childCount = 0;
+  aContainer->GetChildCount(&childCount);
+  for (int32_t i = childCount - 1; i >= 0; --i) {
+    nsCOMPtr<nsISHEntry> child;
+    aContainer->GetChildAt(i, getter_AddRefs(child));
+    if (child) {
+      uint64_t docshelldID = 0;
+      child->GetDocshellID(&docshelldID);
+      if (aDocshellIDs.Contains(docshelldID)) {
+        didRemove = true;
+        aContainer->RemoveChild(child);
+      } else {
+        nsCOMPtr<nsISHContainer> container = do_QueryInterface(child);
+        if (container) {
+          bool childRemoved =
+            RemoveFromSessionHistoryContainer(container, aDocshellIDs);
+          if (childRemoved) {
+            didRemove = true;
+          }
+        }
+      }
+    }
+  }
+  return didRemove;
+}
+
+bool
+RemoveChildEntries(nsISHistory* aHistory, int32_t aIndex,
+                   nsTArray<uint64_t>& aEntryIDs)
+{
+  nsCOMPtr<nsISHEntry> rootHE;
+  aHistory->GetEntryAtIndex(aIndex, false, getter_AddRefs(rootHE));
+  nsCOMPtr<nsISHContainer> root = do_QueryInterface(rootHE);
+  return root ? RemoveFromSessionHistoryContainer(root, aEntryIDs) : false;
+}
+
+bool
+IsSameTree(nsISHEntry* aEntry1, nsISHEntry* aEntry2)
+{
+  if (!aEntry1 && !aEntry2) {
+    return true;
+  }
+  if ((!aEntry1 && aEntry2) || (aEntry1 && !aEntry2)) {
+    return false;
+  }
+  uint32_t id1, id2;
+  aEntry1->GetID(&id1);
+  aEntry2->GetID(&id2);
+  if (id1 != id2) {
+    return false;
+  }
+
+  nsCOMPtr<nsISHContainer> container1 = do_QueryInterface(aEntry1);
+  nsCOMPtr<nsISHContainer> container2 = do_QueryInterface(aEntry2);
+  int32_t count1, count2;
+  container1->GetChildCount(&count1);
+  container2->GetChildCount(&count2);
+  // We allow null entries in the end of the child list.
+  int32_t count = std::max(count1, count2);
+  for (int32_t i = 0; i < count; ++i) {
+    nsCOMPtr<nsISHEntry> child1, child2;
+    container1->GetChildAt(i, getter_AddRefs(child1));
+    container2->GetChildAt(i, getter_AddRefs(child2));
+    if (!IsSameTree(child1, child2)) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+bool
+nsSHistory::RemoveDuplicate(int32_t aIndex, bool aKeepNext)
+{
+  NS_ASSERTION(aIndex >= 0, "aIndex must be >= 0!");
+  NS_ASSERTION(aIndex != 0 || aKeepNext,
+               "If we're removing index 0 we must be keeping the next");
+  NS_ASSERTION(aIndex != mIndex, "Shouldn't remove mIndex!");
+  int32_t compareIndex = aKeepNext ? aIndex + 1 : aIndex - 1;
+  nsCOMPtr<nsISHEntry> root1, root2;
+  GetEntryAtIndex(aIndex, false, getter_AddRefs(root1));
+  GetEntryAtIndex(compareIndex, false, getter_AddRefs(root2));
+  if (IsSameTree(root1, root2)) {
+    nsCOMPtr<nsISHTransaction> txToRemove, txToKeep, txNext, txPrev;
+    GetTransactionAtIndex(aIndex, getter_AddRefs(txToRemove));
+    GetTransactionAtIndex(compareIndex, getter_AddRefs(txToKeep));
+    NS_ENSURE_TRUE(txToRemove, false);
+    NS_ENSURE_TRUE(txToKeep, false);
+    txToRemove->GetNext(getter_AddRefs(txNext));
+    txToRemove->GetPrev(getter_AddRefs(txPrev));
+    txToRemove->SetNext(nullptr);
+    txToRemove->SetPrev(nullptr);
+    if (aKeepNext) {
+      if (txPrev) {
+        txPrev->SetNext(txToKeep);
+      } else {
+        txToKeep->SetPrev(nullptr);
+      }
+    } else {
+      txToKeep->SetNext(txNext);
+    }
+
+    if (aIndex == 0 && aKeepNext) {
+      NS_ASSERTION(txToRemove == mListRoot,
+                   "Transaction at index 0 should be mListRoot!");
+      // We're removing the very first session history transaction!
+      mListRoot = txToKeep;
+    }
+    if (mRootDocShell) {
+      static_cast<nsDocShell*>(mRootDocShell)->HistoryTransactionRemoved(aIndex);
+    }
+
+    // Adjust our indices to reflect the removed transaction
+    if (mIndex > aIndex) {
+      mIndex = mIndex - 1;
+    }
+
+    // NB: If the transaction we are removing is the transaction currently
+    // being navigated to (mRequestedIndex) then we adjust the index
+    // only if we're not keeping the next entry (because if we are keeping
+    // the next entry (because the current is a duplicate of the next), then
+    // that entry slides into the spot that we're currently pointing to.
+    // We don't do this adjustment for mIndex because mIndex cannot equal
+    // aIndex.
+
+    // NB: We don't need to guard on mRequestedIndex being nonzero here,
+    // because either they're strictly greater than aIndex which is at least
+    // zero, or they are equal to aIndex in which case aKeepNext must be true
+    // if aIndex is zero.
+    if (mRequestedIndex > aIndex || (mRequestedIndex == aIndex && !aKeepNext)) {
+      mRequestedIndex = mRequestedIndex - 1;
+    }
+    --mLength;
+    return true;
+  }
+  return false;
+}
+
+NS_IMETHODIMP_(void)
+nsSHistory::RemoveEntries(nsTArray<uint64_t>& aIDs, int32_t aStartIndex)
+{
+  int32_t index = aStartIndex;
+  while (index >= 0 && RemoveChildEntries(this, --index, aIDs)) {
+  }
+  int32_t minIndex = index;
+  index = aStartIndex;
+  while (index >= 0 && RemoveChildEntries(this, index++, aIDs)) {
+  }
+
+  // We need to remove duplicate nsSHEntry trees.
+  bool didRemove = false;
+  while (index > minIndex) {
+    if (index != mIndex) {
+      didRemove = RemoveDuplicate(index, index < mIndex) || didRemove;
+    }
+    --index;
+  }
+  if (didRemove && mRootDocShell) {
+    nsCOMPtr<nsIRunnable> ev =
+      NS_NewRunnableMethod(static_cast<nsDocShell*>(mRootDocShell),
+                           &nsDocShell::FireDummyOnLocationChange);
+    NS_DispatchToCurrentThread(ev);
+  }
+}
+
+void
+nsSHistory::RemoveDynEntries(int32_t aOldIndex, int32_t aNewIndex)
+{
+  // Search for the entries which are in the current index,
+  // but not in the new one.
+  nsCOMPtr<nsISHEntry> originalSH;
+  GetEntryAtIndex(aOldIndex, false, getter_AddRefs(originalSH));
+  nsCOMPtr<nsISHContainer> originalContainer = do_QueryInterface(originalSH);
+  nsAutoTArray<uint64_t, 16> toBeRemovedEntries;
+  if (originalContainer) {
+    nsTArray<uint64_t> originalDynDocShellIDs;
+    GetDynamicChildren(originalContainer, originalDynDocShellIDs, true);
+    if (originalDynDocShellIDs.Length()) {
+      nsCOMPtr<nsISHEntry> currentSH;
+      GetEntryAtIndex(aNewIndex, false, getter_AddRefs(currentSH));
+      nsCOMPtr<nsISHContainer> newContainer = do_QueryInterface(currentSH);
+      if (newContainer) {
+        nsTArray<uint64_t> newDynDocShellIDs;
+        GetDynamicChildren(newContainer, newDynDocShellIDs, false);
+        for (uint32_t i = 0; i < originalDynDocShellIDs.Length(); ++i) {
+          if (!newDynDocShellIDs.Contains(originalDynDocShellIDs[i])) {
+            toBeRemovedEntries.AppendElement(originalDynDocShellIDs[i]);
+          }
+        }
+      }
+    }
+  }
+  if (toBeRemovedEntries.Length()) {
+    RemoveEntries(toBeRemovedEntries, aOldIndex);
+  }
+}
+
+NS_IMETHODIMP
+nsSHistory::UpdateIndex()
+{
+  // Update the actual index with the right value.
+  if (mIndex != mRequestedIndex && mRequestedIndex != -1) {
+    RemoveDynEntries(mIndex, mRequestedIndex);
+    mIndex = mRequestedIndex;
+  }
+
+  mRequestedIndex = -1;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHistory::Stop(uint32_t aStopFlags)
+{
+  // Not implemented
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHistory::GetDocument(nsIDOMDocument** aDocument)
+{
+  // Not implemented
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHistory::GetCurrentURI(nsIURI** aResultURI)
+{
+  NS_ENSURE_ARG_POINTER(aResultURI);
+  nsresult rv;
+
+  nsCOMPtr<nsISHEntry> currentEntry;
+  rv = GetEntryAtIndex(mIndex, false, getter_AddRefs(currentEntry));
+  if (NS_FAILED(rv) && !currentEntry) {
+    return rv;
+  }
+  rv = currentEntry->GetURI(aResultURI);
+  return rv;
+}
+
+NS_IMETHODIMP
+nsSHistory::GetReferringURI(nsIURI** aURI)
+{
+  *aURI = nullptr;
+  // Not implemented
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHistory::SetSessionHistory(nsISHistory* aSessionHistory)
+{
+  // Not implemented
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHistory::GetSessionHistory(nsISHistory** aSessionHistory)
+{
+  // Not implemented
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHistory::LoadURIWithOptions(const char16_t* aURI,
+                               uint32_t aLoadFlags,
+                               nsIURI* aReferringURI,
+                               uint32_t aReferrerPolicy,
+                               nsIInputStream* aPostStream,
+                               nsIInputStream* aExtraHeaderStream,
+                               nsIURI* aBaseURI)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHistory::LoadURI(const char16_t* aURI,
+                    uint32_t aLoadFlags,
+                    nsIURI* aReferringURI,
+                    nsIInputStream* aPostStream,
+                    nsIInputStream* aExtraHeaderStream)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHistory::GotoIndex(int32_t aIndex)
+{
+  return LoadEntry(aIndex, nsIDocShellLoadInfo::loadHistory,
+                   HIST_CMD_GOTOINDEX);
+}
+
+nsresult
+nsSHistory::LoadNextPossibleEntry(int32_t aNewIndex, long aLoadType,
+                                  uint32_t aHistCmd)
+{
+  mRequestedIndex = -1;
+  if (aNewIndex < mIndex) {
+    return LoadEntry(aNewIndex - 1, aLoadType, aHistCmd);
+  }
+  if (aNewIndex > mIndex) {
+    return LoadEntry(aNewIndex + 1, aLoadType, aHistCmd);
+  }
+  return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
+nsSHistory::LoadEntry(int32_t aIndex, long aLoadType, uint32_t aHistCmd)
+{
+  nsCOMPtr<nsIDocShell> docShell;
+  // Keep note of requested history index in mRequestedIndex.
+  mRequestedIndex = aIndex;
+
+  nsCOMPtr<nsISHEntry> prevEntry;
+  GetEntryAtIndex(mIndex, false, getter_AddRefs(prevEntry));
+
+  nsCOMPtr<nsISHEntry> nextEntry;
+  GetEntryAtIndex(mRequestedIndex, false, getter_AddRefs(nextEntry));
+  if (!nextEntry || !prevEntry) {
+    mRequestedIndex = -1;
+    return NS_ERROR_FAILURE;
+  }
+
+  // Remember that this entry is getting loaded at this point in the sequence
+  nsCOMPtr<nsISHEntryInternal> entryInternal = do_QueryInterface(nextEntry);
+
+  if (entryInternal) {
+    entryInternal->SetLastTouched(++gTouchCounter);
+  }
+
+  // Send appropriate listener notifications
+  bool canNavigate = true;
+  // Get the uri for the entry we are about to visit
+  nsCOMPtr<nsIURI> nextURI;
+  nextEntry->GetURI(getter_AddRefs(nextURI));
+
+  if (aHistCmd == HIST_CMD_BACK) {
+    // We are going back one entry. Send GoBack notifications
+    NOTIFY_LISTENERS_CANCELABLE(OnHistoryGoBack, canNavigate,
+                                (nextURI, &canNavigate));
+  } else if (aHistCmd == HIST_CMD_FORWARD) {
+    // We are going forward. Send GoForward notification
+    NOTIFY_LISTENERS_CANCELABLE(OnHistoryGoForward, canNavigate,
+                                (nextURI, &canNavigate));
+  } else if (aHistCmd == HIST_CMD_GOTOINDEX) {
+    // We are going somewhere else. This is not reload either
+    NOTIFY_LISTENERS_CANCELABLE(OnHistoryGotoIndex, canNavigate,
+                                (aIndex, nextURI, &canNavigate));
+  }
+
+  if (!canNavigate) {
+    // If the listener asked us not to proceed with
+    // the operation, simply return.
+    mRequestedIndex = -1;
+    return NS_OK;  // XXX Maybe I can return some other error code?
+  }
+
+  nsCOMPtr<nsIURI> nexturi;
+  int32_t pCount = 0;
+  int32_t nCount = 0;
+  nsCOMPtr<nsISHContainer> prevAsContainer(do_QueryInterface(prevEntry));
+  nsCOMPtr<nsISHContainer> nextAsContainer(do_QueryInterface(nextEntry));
+  if (prevAsContainer && nextAsContainer) {
+    prevAsContainer->GetChildCount(&pCount);
+    nextAsContainer->GetChildCount(&nCount);
+  }
+
+  nsCOMPtr<nsIDocShellLoadInfo> loadInfo;
+  if (mRequestedIndex == mIndex) {
+    // Possibly a reload case
+    docShell = mRootDocShell;
+  } else {
+    // Going back or forward.
+    if (pCount > 0 && nCount > 0) {
+      /* THis is a subframe navigation. Go find
+       * the docshell in which load should happen
+       */
+      bool frameFound = false;
+      nsresult rv = CompareFrames(prevEntry, nextEntry, mRootDocShell,
+                                  aLoadType, &frameFound);
+      if (!frameFound) {
+        // We did not successfully find the subframe in which
+        // the new url was to be loaded. Go further in the history.
+        return LoadNextPossibleEntry(aIndex, aLoadType, aHistCmd);
+      }
+      return rv;
+    } else {
+      // Loading top level page.
+      uint32_t prevID = 0;
+      uint32_t nextID = 0;
+      prevEntry->GetID(&prevID);
+      nextEntry->GetID(&nextID);
+      if (prevID == nextID) {
+        // Try harder to find something new to load.
+        // This may happen for example if some page removed iframes dynamically.
+        return LoadNextPossibleEntry(aIndex, aLoadType, aHistCmd);
+      }
+      docShell = mRootDocShell;
+    }
+  }
+
+  if (!docShell) {
+    // we did not successfully go to the proper index.
+    // return error.
+    mRequestedIndex = -1;
+    return NS_ERROR_FAILURE;
+  }
+
+  // Start the load on the appropriate docshell
+  return InitiateLoad(nextEntry, docShell, aLoadType);
+}
+
+nsresult
+nsSHistory::CompareFrames(nsISHEntry* aPrevEntry, nsISHEntry* aNextEntry,
+                          nsIDocShell* aParent, long aLoadType,
+                          bool* aIsFrameFound)
+{
+  if (!aPrevEntry || !aNextEntry || !aParent) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // We should be comparing only entries which were created for the
+  // same docshell. This is here to just prevent anything strange happening.
+  // This check could be possibly an assertion.
+  uint64_t prevdID, nextdID;
+  aPrevEntry->GetDocshellID(&prevdID);
+  aNextEntry->GetDocshellID(&nextdID);
+  NS_ENSURE_STATE(prevdID == nextdID);
+
+  nsresult result = NS_OK;
+  uint32_t prevID, nextID;
+
+  aPrevEntry->GetID(&prevID);
+  aNextEntry->GetID(&nextID);
+
+  // Check the IDs to verify if the pages are different.
+  if (prevID != nextID) {
+    if (aIsFrameFound) {
+      *aIsFrameFound = true;
+    }
+    // Set the Subframe flag of the entry to indicate that
+    // it is subframe navigation
+    aNextEntry->SetIsSubFrame(true);
+    InitiateLoad(aNextEntry, aParent, aLoadType);
+    return NS_OK;
+  }
+
+  // The root entries are the same, so compare any child frames
+  int32_t pcnt = 0;
+  int32_t ncnt = 0;
+  int32_t dsCount = 0;
+  nsCOMPtr<nsISHContainer> prevContainer(do_QueryInterface(aPrevEntry));
+  nsCOMPtr<nsISHContainer> nextContainer(do_QueryInterface(aNextEntry));
+
+  if (!aParent || !prevContainer || !nextContainer) {
+    return NS_ERROR_FAILURE;
+  }
+
+  prevContainer->GetChildCount(&pcnt);
+  nextContainer->GetChildCount(&ncnt);
+  aParent->GetChildCount(&dsCount);
+
+  // Create an array for child docshells.
+  nsCOMArray<nsIDocShell> docshells;
+  for (int32_t i = 0; i < dsCount; ++i) {
+    nsCOMPtr<nsIDocShellTreeItem> treeItem;
+    aParent->GetChildAt(i, getter_AddRefs(treeItem));
+    nsCOMPtr<nsIDocShell> shell = do_QueryInterface(treeItem);
+    if (shell) {
+      docshells.AppendObject(shell);
+    }
+  }
+
+  // Search for something to load next.
+  for (int32_t i = 0; i < ncnt; ++i) {
+    // First get an entry which may cause a new page to be loaded.
+    nsCOMPtr<nsISHEntry> nChild;
+    nextContainer->GetChildAt(i, getter_AddRefs(nChild));
+    if (!nChild) {
+      continue;
+    }
+    uint64_t docshellID = 0;
+    nChild->GetDocshellID(&docshellID);
+
+    // Then find the associated docshell.
+    nsIDocShell* dsChild = nullptr;
+    int32_t count = docshells.Count();
+    for (int32_t j = 0; j < count; ++j) {
+      uint64_t shellID = 0;
+      nsIDocShell* shell = docshells[j];
+      shell->GetHistoryID(&shellID);
+      if (shellID == docshellID) {
+        dsChild = shell;
+        break;
+      }
+    }
+    if (!dsChild) {
+      continue;
+    }
+
+    // Then look at the previous entries to see if there was
+    // an entry for the docshell.
+    nsCOMPtr<nsISHEntry> pChild;
+    for (int32_t k = 0; k < pcnt; ++k) {
+      nsCOMPtr<nsISHEntry> child;
+      prevContainer->GetChildAt(k, getter_AddRefs(child));
+      if (child) {
+        uint64_t dID = 0;
+        child->GetDocshellID(&dID);
+        if (dID == docshellID) {
+          pChild = child;
+          break;
+        }
+      }
+    }
+
+    // Finally recursively call this method.
+    // This will either load a new page to shell or some subshell or
+    // do nothing.
+    CompareFrames(pChild, nChild, dsChild, aLoadType, aIsFrameFound);
+  }
+  return result;
+}
+
+nsresult
+nsSHistory::InitiateLoad(nsISHEntry* aFrameEntry, nsIDocShell* aFrameDS,
+                         long aLoadType)
+{
+  NS_ENSURE_STATE(aFrameDS && aFrameEntry);
+
+  nsCOMPtr<nsIDocShellLoadInfo> loadInfo;
+
+  /* Set the loadType in the SHEntry too to  what was passed on.
+   * This will be passed on to child subframes later in nsDocShell,
+   * so that proper loadType is maintained through out a frameset
+   */
+  aFrameEntry->SetLoadType(aLoadType);
+  aFrameDS->CreateLoadInfo(getter_AddRefs(loadInfo));
+
+  loadInfo->SetLoadType(aLoadType);
+  loadInfo->SetSHEntry(aFrameEntry);
+
+  nsCOMPtr<nsIURI> nextURI;
+  aFrameEntry->GetURI(getter_AddRefs(nextURI));
+  // Time   to initiate a document load
+  return aFrameDS->LoadURI(nextURI, loadInfo,
+                           nsIWebNavigation::LOAD_FLAGS_NONE, false);
+
+}
+
+NS_IMETHODIMP
+nsSHistory::SetRootDocShell(nsIDocShell* aDocShell)
+{
+  mRootDocShell = aDocShell;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHistory::GetSHistoryEnumerator(nsISimpleEnumerator** aEnumerator)
+{
+  NS_ENSURE_ARG_POINTER(aEnumerator);
+  nsRefPtr<nsSHEnumerator> iterator = new nsSHEnumerator(this);
+  iterator.forget(aEnumerator);
+  return NS_OK;
+}
+
+nsSHEnumerator::nsSHEnumerator(nsSHistory* aSHistory) : mIndex(-1)
+{
+  mSHistory = aSHistory;
+}
+
+nsSHEnumerator::~nsSHEnumerator()
+{
+  mSHistory = nullptr;
+}
+
+NS_IMPL_ISUPPORTS(nsSHEnumerator, nsISimpleEnumerator)
+
+NS_IMETHODIMP
+nsSHEnumerator::HasMoreElements(bool* aReturn)
+{
+  int32_t cnt;
+  *aReturn = false;
+  mSHistory->GetCount(&cnt);
+  if (mIndex >= -1 && mIndex < (cnt - 1)) {
+    *aReturn = true;
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHEnumerator::GetNext(nsISupports** aItem)
+{
+  NS_ENSURE_ARG_POINTER(aItem);
+  int32_t cnt = 0;
+
+  nsresult result = NS_ERROR_FAILURE;
+  mSHistory->GetCount(&cnt);
+  if (mIndex < (cnt - 1)) {
+    mIndex++;
+    nsCOMPtr<nsISHEntry> hEntry;
+    result = mSHistory->GetEntryAtIndex(mIndex, false, getter_AddRefs(hEntry));
+    if (hEntry) {
+      result = CallQueryInterface(hEntry, aItem);
+    }
+  }
+  return result;
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsSHistory.h firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsSHistory.h
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsSHistory.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsSHistory.h	2015-05-25 20:43:11.000000000 +0000
@@ -0,0 +1,119 @@
+/* -*- 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 nsSHistory_h
+#define nsSHistory_h
+
+#include "nsCOMPtr.h"
+#include "nsISHistory.h"
+#include "nsISHistoryInternal.h"
+#include "nsIWebNavigation.h"
+#include "nsISimpleEnumerator.h"
+#include "nsTObserverArray.h"
+#include "nsWeakPtr.h"
+
+#include "prclist.h"
+
+class nsIDocShell;
+class nsSHEnumerator;
+class nsSHistoryObserver;
+class nsISHEntry;
+class nsISHTransaction;
+
+class nsSHistory final : public PRCList,
+                         public nsISHistory,
+                         public nsISHistoryInternal,
+                         public nsIWebNavigation
+{
+public:
+  nsSHistory();
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSISHISTORY
+  NS_DECL_NSISHISTORYINTERNAL
+  NS_DECL_NSIWEBNAVIGATION
+
+  // One time initialization method called upon docshell module construction
+  static nsresult Startup();
+  static void Shutdown();
+  static void UpdatePrefs();
+
+  // Max number of total cached content viewers.  If the pref
+  // browser.sessionhistory.max_total_viewers is negative, then
+  // this value is calculated based on the total amount of memory.
+  // Otherwise, it comes straight from the pref.
+  static uint32_t GetMaxTotalViewers() { return sHistoryMaxTotalViewers; }
+
+protected:
+  virtual ~nsSHistory();
+  friend class nsSHEnumerator;
+  friend class nsSHistoryObserver;
+
+  // Could become part of nsIWebNavigation
+  NS_IMETHOD GetTransactionAtIndex(int32_t aIndex, nsISHTransaction** aResult);
+  nsresult CompareFrames(nsISHEntry* aPrevEntry, nsISHEntry* aNextEntry,
+                         nsIDocShell* aRootDocShell, long aLoadType,
+                         bool* aIsFrameFound);
+  nsresult InitiateLoad(nsISHEntry* aFrameEntry, nsIDocShell* aFrameDS,
+                        long aLoadType);
+
+  NS_IMETHOD LoadEntry(int32_t aIndex, long aLoadType, uint32_t aHistCmd);
+
+#ifdef DEBUG
+  nsresult PrintHistory();
+#endif
+
+  // Evict content viewers in this window which don't lie in the "safe" range
+  // around aIndex.
+  void EvictOutOfRangeWindowContentViewers(int32_t aIndex);
+  static void GloballyEvictContentViewers();
+  static void GloballyEvictAllContentViewers();
+
+  // Calculates a max number of total
+  // content viewers to cache, based on amount of total memory
+  static uint32_t CalcMaxTotalViewers();
+
+  void RemoveDynEntries(int32_t aOldIndex, int32_t aNewIndex);
+
+  nsresult LoadNextPossibleEntry(int32_t aNewIndex, long aLoadType,
+                                 uint32_t aHistCmd);
+
+protected:
+  // aIndex is the index of the transaction which may be removed.
+  // If aKeepNext is true, aIndex is compared to aIndex + 1,
+  // otherwise comparison is done to aIndex - 1.
+  bool RemoveDuplicate(int32_t aIndex, bool aKeepNext);
+
+  nsCOMPtr<nsISHTransaction> mListRoot;
+  int32_t mIndex;
+  int32_t mLength;
+  int32_t mRequestedIndex;
+  // Session History listeners
+  nsAutoTObserverArray<nsWeakPtr, 2> mListeners;
+  // Weak reference. Do not refcount this.
+  nsIDocShell* mRootDocShell;
+
+  // Max viewers allowed total, across all SHistory objects
+  static int32_t sHistoryMaxTotalViewers;
+};
+
+class nsSHEnumerator : public nsISimpleEnumerator
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSISIMPLEENUMERATOR
+
+  explicit nsSHEnumerator(nsSHistory* aHistory);
+
+protected:
+  friend class nsSHistory;
+  virtual ~nsSHEnumerator();
+
+private:
+  int32_t mIndex;
+  nsSHistory* mSHistory;
+};
+
+#endif /* nsSHistory */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsSHTransaction.cpp firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsSHTransaction.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsSHTransaction.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsSHTransaction.cpp	2015-05-25 20:43:11.000000000 +0000
@@ -0,0 +1,107 @@
+/* -*- 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 "nsSHTransaction.h"
+#include "nsISHEntry.h"
+
+nsSHTransaction::nsSHTransaction()
+  : mPersist(true)
+  , mPrev(nullptr)
+{
+}
+
+nsSHTransaction::~nsSHTransaction()
+{
+}
+
+NS_IMPL_ADDREF(nsSHTransaction)
+NS_IMPL_RELEASE(nsSHTransaction)
+
+NS_INTERFACE_MAP_BEGIN(nsSHTransaction)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISHTransaction)
+  NS_INTERFACE_MAP_ENTRY(nsISHTransaction)
+NS_INTERFACE_MAP_END
+
+NS_IMETHODIMP
+nsSHTransaction::Create(nsISHEntry* aSHEntry, nsISHTransaction* aPrev)
+{
+  SetSHEntry(aSHEntry);
+  if (aPrev) {
+    aPrev->SetNext(this);
+  }
+
+  SetPrev(aPrev);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHTransaction::GetSHEntry(nsISHEntry** aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+  *aResult = mSHEntry;
+  NS_IF_ADDREF(*aResult);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHTransaction::SetSHEntry(nsISHEntry* aSHEntry)
+{
+  mSHEntry = aSHEntry;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHTransaction::GetNext(nsISHTransaction** aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+  *aResult = mNext;
+  NS_IF_ADDREF(*aResult);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHTransaction::SetNext(nsISHTransaction* aNext)
+{
+  if (aNext) {
+    NS_ENSURE_SUCCESS(aNext->SetPrev(this), NS_ERROR_FAILURE);
+  }
+
+  mNext = aNext;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHTransaction::SetPrev(nsISHTransaction* aPrev)
+{
+  /* This is weak reference to parent. Do not Addref it */
+  mPrev = aPrev;
+  return NS_OK;
+}
+
+nsresult
+nsSHTransaction::GetPrev(nsISHTransaction** aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+  *aResult = mPrev;
+  NS_IF_ADDREF(*aResult);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHTransaction::SetPersist(bool aPersist)
+{
+  mPersist = aPersist;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSHTransaction::GetPersist(bool* aPersist)
+{
+  NS_ENSURE_ARG_POINTER(aPersist);
+
+  *aPersist = mPersist;
+  return NS_OK;
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsSHTransaction.h firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsSHTransaction.h
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/nsSHTransaction.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/nsSHTransaction.h	2015-05-25 20:43:11.000000000 +0000
@@ -0,0 +1,37 @@
+/* -*- 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 nsSHTransaction_h
+#define nsSHTransaction_h
+
+// Helper Classes
+#include "nsCOMPtr.h"
+
+// Needed interfaces
+#include "nsISHTransaction.h"
+
+class nsISHEntry;
+
+class nsSHTransaction : public nsISHTransaction
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSISHTRANSACTION
+
+  nsSHTransaction();
+
+protected:
+  virtual ~nsSHTransaction();
+
+protected:
+  bool mPersist;
+
+  nsISHTransaction* mPrev;  // Weak Reference
+  nsCOMPtr<nsISHTransaction> mNext;
+  nsCOMPtr<nsISHEntry> mSHEntry;
+};
+
+#endif /* nsSHTransaction_h */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/public/moz.build firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/public/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/public/moz.build	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/public/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPIDL_SOURCES += [
-    'nsIBFCacheEntry.idl',
-    'nsISHContainer.idl',
-    'nsISHEntry.idl',
-    'nsISHistory.idl',
-    'nsISHistoryInternal.idl',
-    'nsISHistoryListener.idl',
-    'nsISHTransaction.idl',
-]
-
-XPIDL_MODULE = 'shistory'
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/public/nsIBFCacheEntry.idl firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/public/nsIBFCacheEntry.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/public/nsIBFCacheEntry.idl	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/public/nsIBFCacheEntry.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +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 "nsISupports.idl"
-
-/**
- * This interface lets you evict a document from the back/forward cache.
- */
-[scriptable, uuid(a576060e-c7df-4d81-aa8c-5b52bd6ad25d)]
-interface nsIBFCacheEntry : nsISupports
-{
-  void RemoveFromBFCacheSync();
-  void RemoveFromBFCacheAsync();
-
-  readonly attribute unsigned long long ID;
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/public/nsISHContainer.idl firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/public/nsISHContainer.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/public/nsISHContainer.idl	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/public/nsISHContainer.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-
-interface nsISHEntry;
-
-/**
- * The nsISHEntryContainer. The interface to access child entries
- * of an nsISHEntry.
- * 
- */
-
-[scriptable, uuid(67dd0357-8372-4122-bff6-217435e8b7e4)]
-interface nsISHContainer : nsISupports
-{
-	/**
-     * The current number of nsISHEntries which are immediate children of the 
-	 * current SHEntry
-     */
-	readonly attribute long childCount;
-
-	/**
-	 * Add a new child SHEntry.  If offset is -1 adds to the end of the list.
-	 */
-	void AddChild(in nsISHEntry child, in long offset);
-
-	/**
-	 * Removes a child SHEntry
-	 */
-	void RemoveChild(in nsISHEntry child);
-
-	/**
-	 * Get child at an index
-	 */
-	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 firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/public/nsISHEntry.idl firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/public/nsISHEntry.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/public/nsISHEntry.idl	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/public/nsISHEntry.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,326 +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/. */
-
-/**
- * The interface to nsISHentry. Each document or subframe in 
- * Session History will have a nsISHEntry associated with it which will
- * hold all information required to recreate the document from history
- * 
- */
-
-#include "nsISupports.idl"
-
-interface nsILayoutHistoryState;
-interface nsIContentViewer;
-interface nsIURI;
-interface nsIInputStream;
-interface nsIDocShellTreeItem;
-interface nsISupportsArray;
-interface nsIStructuredCloneContainer;
-interface nsIBFCacheEntry;
-
-%{C++
-#include "nsRect.h"
-class nsDocShellEditorData;
-class nsSHEntryShared;
-%}
-[ref] native nsIntRect(nsIntRect);
-[ptr] native nsDocShellEditorDataPtr(nsDocShellEditorData);
-[ptr] native nsSHEntryShared(nsSHEntryShared);
-
-[scriptable, uuid(d5fbeb10-f373-4677-b69a-2694aa706cac)]
-interface nsISHEntry : nsISupports
-{
-    /**
-     * A readonly property that returns the URI
-     * of the current entry. The object returned is
-     * of type nsIURI
-     */
-    readonly attribute nsIURI URI;
-
-    /**
-     * A readonly property that returns the title
-     * of the current entry.  The object returned
-     * is a encoded string
-     */
-    readonly attribute wstring title;
-
-    /**
-     * A readonly property that returns a boolean
-     * flag which indicates if the entry was created as a
-     * result of a subframe navigation. This flag will be
-     * 'false' when a frameset page is visited for
-     * the first time. This flag will be 'true' for all
-     * history entries created as a result of a subframe
-     * navigation.
-     */
-    readonly attribute boolean isSubFrame;
-
-    /** URI for the document */
-    void setURI(in nsIURI aURI);
-
-    /** 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;
-
-    /** Whether the content viewer is marked "sticky" */
-    attribute boolean sticky;
-
-    /** Saved state of the global window object */
-    attribute nsISupports windowState;
-
-    /**
-     * Saved position and dimensions of the content viewer; we must adjust the
-     * root view's widget accordingly if this has changed when the presentation
-     * is restored.
-     */
-    [noscript] void getViewerBounds(in nsIntRect bounds);
-    [noscript] void setViewerBounds([const] in nsIntRect bounds);
-
-    /**
-     * Saved child docshells corresponding to contentViewer.  The child shells
-     * are restored as children of the parent docshell, in this order, when the
-     * parent docshell restores a saved presentation.
-     */
-
-    /** Append a child shell to the end of our list. */
-    void addChildShell(in nsIDocShellTreeItem shell);
-
-    /**
-     * Get the child shell at |index|; returns null if |index| is out of bounds.
-     */
-    nsIDocShellTreeItem childShellAt(in long index);
-
-    /**
-     * Clear the child shell list.
-     */
-    void clearChildShells();
-
-    /** Saved refresh URI list for the content viewer */
-    attribute nsISupportsArray refreshURIList;
-
-    /**
-     * Ensure that the cached presentation members are self-consistent.
-     * If either |contentViewer| or |windowState| are null, then all of the
-     * following members are cleared/reset:
-     *  contentViewer, sticky, windowState, viewerBounds, childShells,
-     *  refreshURIList.
-     */
-    void syncPresentationState();
-
-    /** Title for the document */
-    void setTitle(in AString aTitle);
-
-    /** Post Data for the document */
-    attribute nsIInputStream postData;
-
-    /** LayoutHistoryState for scroll position and form values */
-    attribute nsILayoutHistoryState layoutHistoryState;
-
-    /** parent of this entry */
-    attribute nsISHEntry parent;
-
-    /**
-     * The loadType for this entry. This is typically loadHistory except
-     * when reload is pressed, it has the appropriate reload flag
-     */
-    attribute unsigned long loadType;
-
-    /**
-     * An ID to help identify this entry from others during
-     * subframe navigation
-     */
-    attribute unsigned long ID;
-
-    /** attribute to set and get the cache key for the entry */
-    attribute nsISupports cacheKey;
-
-    /** attribute to indicate whether layoutHistoryState should be saved */
-    attribute boolean saveLayoutStateFlag;
-
-    /** attribute to indicate whether the page is already expired in cache */
-    attribute boolean expirationStatus;
-
-    /**
-     * attribute to indicate the content-type of the document that this
-     * is a session history entry for
-     */
-    attribute ACString contentType; 
-
-    /**
-     * If we created this SHEntry via history.pushState or modified it via
-     * history.replaceState, and if we changed the SHEntry's URI via the
-     * push/replaceState call, and if the SHEntry's new URI differs from its
-     * old URI by more than just the hash, then we set this field to true.
-     *
-     * Additionally, if this SHEntry was created by calling pushState from a
-     * SHEntry whose URI was modified, this SHEntry's URIWasModified field is
-     * true.
-     *
-     */
-    attribute boolean URIWasModified;
- 
-    /** Set/Get scrollers' positon in anchored pages */
-    void setScrollPosition(in long x, in long y);
-    void getScrollPosition(out long x, out long y);
-
-    /** Additional ways to create an entry */
-    [noscript] void create(in nsIURI URI, in AString title,
-                           in nsIInputStream inputStream,
-                           in nsILayoutHistoryState layoutHistoryState,
-                           in nsISupports cacheKey, in ACString contentType,
-                           in nsISupports owner,
-                           in unsigned long long docshellID,
-                           in boolean dynamicCreation);
-
-    nsISHEntry clone();
-
-    /** Attribute that indicates if this entry is for a subframe navigation */
-    void setIsSubFrame(in boolean aFlag);
-
-    /** Return any content viewer present in or below this node in the
-        nsSHEntry tree.  This will differ from contentViewer in the case
-        where a child nsSHEntry has the content viewer for this tree. */
-    nsIContentViewer getAnyContentViewer(out nsISHEntry ownerEntry);
-
-    /**
-     * Get the owner, if any, that was associated with the channel
-     * that the document that was loaded to create this history entry
-     * came from.
-     */
-    attribute nsISupports owner;
-
-    /**
-     * Get/set data associated with this history state via a pushState() call,
-     * serialized using structured clone.
-     **/
-    attribute nsIStructuredCloneContainer stateData;
-
-    /**
-     * Gets the owning pointer to the editor data assosicated with
-     * this shistory entry. This forgets its pointer, so free it when
-     * you're done.
-     */
-    [noscript, notxpcom] nsDocShellEditorDataPtr forgetEditorData();
-
-    /**
-     * Sets the owning pointer to the editor data assosicated with
-     * this shistory entry. Unless forgetEditorData() is called, this
-     * shentry will destroy the editor data when it's destroyed.
-     */
-    [noscript, notxpcom] void setEditorData(in nsDocShellEditorDataPtr aData);
-
-    /** Returns true if this shistory entry is storing a detached editor. */
-    [noscript, notxpcom] boolean hasDetachedEditor();
-
-    /**
-     * Returns true if the related docshell was added because of
-     * dynamic addition of an iframe/frame.
-     */
-    boolean isDynamicallyAdded();
-
-    /**
-     * Returns true if any of the child entries returns true
-     * when isDynamicallyAdded is called on it.
-     */
-    boolean hasDynamicallyAddedChild();
-
-    /**
-     * The history ID of the docshell.
-     */
-    attribute unsigned long long docshellID;
-
-    readonly attribute nsIBFCacheEntry BFCacheEntry;
-
-    /**
-     * Does this SHEntry point to the given BFCache entry?  If so, evicting
-     * the BFCache entry will evict the SHEntry, since the two entries
-     * correspond to the same document.
-     */
-    [notxpcom, noscript]
-    boolean hasBFCacheEntry(in nsIBFCacheEntry aEntry);
-
-    /**
-     * Adopt aEntry's BFCacheEntry, so now both this and aEntry point to
-     * aEntry's BFCacheEntry.
-     */
-    void adoptBFCacheEntry(in nsISHEntry aEntry);
-
-    /**
-     * Create a new BFCache entry and drop our reference to our old one.  This
-     * call unlinks this SHEntry from any other SHEntries for its document.
-     */
-    void abandonBFCacheEntry();
-
-    /**
-     * Does this SHEntry correspond to the same document as aEntry?  This is
-     * true iff the two SHEntries have the same BFCacheEntry.  So in
-     * particular, sharesDocumentWith(aEntry) is guaranteed to return true if
-     * it's preceeded by a call to adoptBFCacheEntry(aEntry).
-     */
-    boolean sharesDocumentWith(in nsISHEntry aEntry);
-
-    /**
-     * True if this SHEntry corresponds to a document created by a srcdoc iframe.
-     * Set when a value is assigned to  srcdocData.
-     */
-    readonly attribute boolean isSrcdocEntry;
-
-    /**
-     * Contents of the srcdoc attribute in a srcdoc iframe to be loaded instead
-     * of the URI.  Similar to a Data URI, this information is needed to
-     * recreate the document at a later stage.
-     * Setting this sets isSrcdocEntry to true
-     */
-    attribute AString srcdocData;
-
-    /**
-     * When isSrcdocEntry is true, this contains the baseURI of the srcdoc
-     * document for use in situations where it cannot otherwise be determined,
-     * for example with view-source.
-     */
-    attribute nsIURI baseURI;
-};
-
-[scriptable, uuid(bb66ac35-253b-471f-a317-3ece940f04c5)]
-interface nsISHEntryInternal : nsISupports
-{
-    [notxpcom] void RemoveFromBFCacheAsync();
-    [notxpcom] void RemoveFromBFCacheSync();
-
-    /**
-     * A number that is assigned by the sHistory when the entry is activated
-     */
-    attribute unsigned long lastTouched;
-
-    /**
-     * Some state, particularly that related to the back/forward cache, is
-     * shared between SHEntries which correspond to the same document.  This
-     * method gets a pointer to that shared state.
-     *
-     * This shared state is the SHEntry's BFCacheEntry.  So
-     * hasBFCacheEntry(getSharedState()) is guaranteed to return true.
-     */
-    [noscript, notxpcom]
-    nsSHEntryShared getSharedState();
-};
-
-%{ C++
-// {BFD1A791-AD9F-11d3-BDC7-0050040A9B44}
-#define NS_SHENTRY_CID \
-{0xbfd1a791, 0xad9f, 0x11d3, {0xbd, 0xc7, 0x0, 0x50, 0x4, 0xa, 0x9b, 0x44}}
-
-#define NS_SHENTRY_CONTRACTID \
-    "@mozilla.org/browser/session-history-entry;1"
-
-%}
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/public/nsISHistory.idl firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/public/nsISHistory.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/public/nsISHistory.idl	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/public/nsISHistory.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,162 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; 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 "nsISupports.idl"
-
-interface nsISHEntry;
-interface nsISHistoryListener;
-interface nsISimpleEnumerator;
-/**
- * An interface to the primary properties of the Session History
- * component. In an embedded browser environment, the nsIWebBrowser
- * object creates an instance of session history for each open window.
- * A handle to the session history object can be obtained from
- * nsIWebNavigation. In a non-embedded situation, the  owner of the
- * session history component must create a instance of it and set
- * it in the nsIWebNavigation object.
- * This interface is accessible from javascript.
- */
- 
-
-%{C++
-#define NS_SHISTORY_CID \
-{0x7b807041, 0xe60a, 0x4384, {0x93, 0x5f, 0xaf, 0x30, 0x61, 0xd8, 0xb8, 0x15}}
-
-#define NS_SHISTORY_CONTRACTID "@mozilla.org/browser/shistory;1"
-%}
-
-[scriptable, uuid(7b807041-e60a-4384-935f-af3061d8b815)]
-interface nsISHistory: nsISupports
-{
-  /**
-   * A readonly property of the interface that returns 
-   * the number of toplevel documents currently available
-   * in session history.
-   */
-   readonly attribute long count;
-
-  /**
-   * A readonly property of the interface that returns 
-   * the index of the current document in session history.
-   */
-   readonly attribute long index;
-
-  /**
-   * A readonly property of the interface that returns 
-   * the index of the last document that started to load and
-   * didn't finished yet. When document finishes the loading
-   * value -1 is returned.
-   */
-   readonly attribute long requestedIndex;
-
-  /**
-   * A read/write property of the interface, used to Get/Set
-   * the maximum number of toplevel documents, session history 
-   * can hold for each instance. 
-   */
-   attribute long maxLength;
-
-  /**
-   * Called to obtain handle to the history entry at a
-   * given index.
-   *
-   * @param index             The index value whose entry is requested.
-   *                          The oldest entry is located at index == 0.
-   * @param modifyIndex       A boolean flag that indicates if the current
-   *                          index of session history should be modified 
-   *                          to the parameter index.
-   *
-   * @return                  <code>NS_OK</code> history entry for 
-   *                          the index is obtained successfully.
-   *                          <code>NS_ERROR_FAILURE</code> Error in obtaining
-   *                          history entry for the given index.
-   */
-   nsISHEntry getEntryAtIndex(in long index, in boolean modifyIndex);
-
-
-  /**
-   * Called to purge older documents from history.
-   * Documents can be removed from session history for various 
-   * reasons. For example to  control memory usage of the browser, to 
-   * prevent users from loading documents from history, to erase evidence of
-   * prior page loads etc...
-   *
-   * @param numEntries        The number of toplevel documents to be
-   *                          purged from history. During purge operation,
-   *                          the latest documents are maintained and older 
-   *                          'numEntries' documents are removed from history.
-   * @throws                  <code>NS_SUCCESS_LOSS_OF_INSIGNIFICANT_DATA</code> Purge was vetod.
-   * @throws                  <code>NS_ERROR_FAILURE</code> numEntries is
-   *                          invalid or out of bounds with the size of history.
-   *                          
-   */
-   void PurgeHistory(in long numEntries);
-
-  /**
-   * Called to register a listener for the session history component.
-   * Listeners are notified when pages are loaded or purged from history.
-   * 
-   * @param aListener         Listener object to be notified for all
-   *                          page loads that initiate in session history.
-   *
-   * @note                    A listener object must implement 
-   *                          nsISHistoryListener and nsSupportsWeakReference
-   *
-   * @see nsISHistoryListener
-   * @see nsSupportsWeakReference
-   */
-   void addSHistoryListener(in nsISHistoryListener aListener);
-
-  /**
-   * Called to remove a listener for the session history component.
-   * Listeners are notified when pages are loaded from history.
-   * 
-   * @param aListener         Listener object to be removed from 
-   *                          session history.
-   *
-   * @note                    A listener object must implement 
-   *                          nsISHistoryListener and nsSupportsWeakReference
-   * @see nsISHistoryListener
-   * @see nsSupportsWeakReference
-   */ 
-   void removeSHistoryListener(in nsISHistoryListener aListener);
-
-  /**
-   * Called to obtain a enumerator for all the  documents stored in 
-   * session history. The enumerator object thus returned by this method
-   * can be traversed using nsISimpleEnumerator. 
-   *
-   * @note  To access individual history entries of the enumerator, perform the
-   *        following steps:
-   *        1) Call nsISHistory->GetSHistoryEnumerator() to obtain handle 
-   *           the nsISimpleEnumerator object.
-   *        2) Use nsISimpleEnumerator->GetNext() on the object returned
-   *           by step #1 to obtain handle to the next object in the list. 
-   *           The object returned by this step is of type nsISupports.
-   *        3) Perform a QueryInterface on the object returned by step #2 
-   *           to nsISHEntry.
-   *        4) Use nsISHEntry to access properties of each history entry. 
-   *
-   * @see nsISimpleEnumerator
-   * @see nsISHEntry
-   * @see QueryInterface()
-   * @see do_QueryInterface()
-   */
-   readonly attribute nsISimpleEnumerator SHistoryEnumerator;
-
-   void reloadCurrentEntry();
-
-   /**
-   * Called to obtain the index to a given history entry.
-   *
-   * @param aEntry            The entry to obtain the index of.
-   *
-   * @return                  <code>NS_OK</code> index for the history entry
-   *                          is obtained successfully.
-   *                          <code>NS_ERROR_FAILURE</code> Error in obtaining
-   *                          index for the given history entry.
-   */
-   long getIndexOfEntry(in nsISHEntry aEntry);
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/public/nsISHistoryInternal.idl firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/public/nsISHistoryInternal.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/public/nsISHistoryInternal.idl	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/public/nsISHistoryInternal.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,104 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; 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 "nsISupports.idl"
-
-interface nsIBFCacheEntry;
-interface nsISHEntry;
-interface nsISHistoryListener;
-interface nsISHTransaction;
-interface nsIDocShell;
-interface nsIURI;
-
-%{C++
-#define NS_SHISTORY_INTERNAL_CID \
-{ 0x3dfb2f54, 0x378d, 0x4d3c, \
-  { 0xa9, 0xf9, 0x95, 0xdd, 0x26, 0x73, 0x24, 0x8c } }
-
-#define NS_SHISTORY_INTERNAL_CONTRACTID "@mozilla.org/browser/shistory-internal;1"
-
-#include "nsTArrayForwardDeclare.h"
-%}
-
-[ref] native nsDocshellIDArray(nsTArray<uint64_t>);
-
-[scriptable, uuid(3dfb2f54-378d-4d3c-a9f9-95dd2673248c)]
-interface nsISHistoryInternal: nsISupports
-{
-  /**
-   * Add a new Entry to the History List
-   * @param aEntry - The entry to add
-   * @param aPersist - If true this specifies that the entry should persist
-   * in the list.  If false, this means that when new entries are added
-   * this element will not appear in the session history list.
-   */
-   void  addEntry(in nsISHEntry aEntry, in boolean aPersist);
-
-  /**
-   * Get the root transaction
-   */
-   readonly attribute nsISHTransaction rootTransaction;
-
-  /**
-   * Sets the toplevel docshell object to which this SHistory object belongs to.
-   */
-   void setRootDocShell(in nsIDocShell rootDocShell);
-
-  /** 
-   * Update the index maintained by sessionHistory
-   */
-   void updateIndex();
-
-  /**
-   * Replace the nsISHEntry at a particular index
-   * @param aIndex - The index at which the entry should be replaced
-   * @param aReplaceEntry - The replacement entry for the index.
-   */
-   void replaceEntry(in long aIndex, in nsISHEntry aReplaceEntry);
-
-  /**
-   * Notifies all registered session history listeners about an impending
-   * reload.
-   *
-   * @param aReloadURI    The URI of the document to be reloaded.
-   * @param aReloadFlags  Flags that indicate how the document is to be
-   *                      refreshed. See constants on the nsIWebNavigation
-   *                      interface.
-   * @return              Whether the operation can proceed.
-   */
-   boolean notifyOnHistoryReload(in nsIURI aReloadURI, in unsigned long aReloadFlags);
-
-   /**
-    * Evict content viewers which don't lie in the "safe" range around aIndex.
-    * In practice, this should leave us with no more than gHistoryMaxViewers
-    * viewers associated with this SHistory object.
-    *
-    * Also make sure that the total number of content viewers in all windows is
-    * not greater than our global max; if it is, evict viewers as appropriate.
-    *
-    * @param aIndex - The index around which the "safe" range is centered.  In
-    *   general, if you just navigated the history, aIndex should be the index
-    *   history was navigated to.
-    */
-   void evictOutOfRangeContentViewers(in long aIndex);
-   
-   /**
-    * Evict the content viewer associated with a bfcache entry
-    * that has timed out.
-    */
-   void evictExpiredContentViewerForEntry(in nsIBFCacheEntry aEntry);
-
-   /**
-    * Evict all the content viewers in this session history
-    */
-   void evictAllContentViewers();
-
-   /**
-    * Removes entries from the history if their docshellID is in
-    * aIDs array.
-    */
-  [noscript, notxpcom] void RemoveEntries(in nsDocshellIDArray aIDs,
-                                          in long aStartIndex);
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/public/nsISHistoryListener.idl firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/public/nsISHistoryListener.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/public/nsISHistoryListener.idl	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/public/nsISHistoryListener.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,100 +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 "nsISupports.idl"
-
-interface nsIURI;
-
-/**
- * nsISHistoryListener defines the interface one can implement to receive
- * notifications about activities in session history and to be able to
- * cancel them.
- *
- * A session history listener will be notified when pages are added, removed
- * and loaded from session history. It can prevent any action (except adding
- * a new session history entry) from happening by returning false from the
- * corresponding callback method.
- *
- * A session history listener can be registered on a particular nsISHistory
- * instance via the nsISHistory::addSHistoryListener() method.
- */
-[scriptable, uuid(125c0833-746a-400e-9b89-d2d18545c08a)]
-interface nsISHistoryListener : nsISupports 
-{
-  /**
-   * Called when a new document is added to session history. New documents are
-   * added to session history by docshell when new pages are loaded in a frame
-   * or content area, for example via nsIWebNavigation::loadURI()
-   *
-   * @param aNewURI     The URI of the document to be added to session history.
-   */
-   void OnHistoryNewEntry(in nsIURI aNewURI);
-
-  /**
-   * Called when navigating to a previous session history entry, for example
-   * due to a nsIWebNavigation::goBack() call.
-   *
-   * @param aBackURI    The URI of the session history entry being navigated to.
-   * @return            Whether the operation can proceed.
-   */
-   boolean OnHistoryGoBack(in nsIURI aBackURI);
-
-  /**
-   * Called when navigating to a next session history entry, for example
-   * due to a nsIWebNavigation::goForward() call.
-   *
-   * @param aForwardURI   The URI of the session history entry being navigated to.
-   * @return              Whether the operation can proceed.
-   */
-   boolean OnHistoryGoForward(in nsIURI aForwardURI);
-
-  /** 
-   * Called when the current document is reloaded, for example due to a
-   * nsIWebNavigation::reload() call.
-   *
-   * @param aReloadURI    The URI of the document to be reloaded.
-   * @param aReloadFlags  Flags that indicate how the document is to be 
-   *                      refreshed. See constants on the nsIWebNavigation
-   *                      interface.
-   * @return              Whether the operation can proceed.
-   *
-   * @see  nsIWebNavigation
-   */
-   boolean OnHistoryReload(in nsIURI aReloadURI, in unsigned long aReloadFlags);
-
-  /**
-   * Called when navigating to a session history entry by index, for example,
-   * when nsIWebNavigation::gotoIndex() is called.
-   *
-   * @param aIndex        The index in session history of the entry to be loaded.
-   * @param aGotoURI      The URI of the session history entry to be loaded.
-   * @return              Whether the operation can proceed.
-   */
-   boolean OnHistoryGotoIndex(in long aIndex, in nsIURI aGotoURI);
-
-  /**
-   * Called when entries are removed from session history. Entries can be
-   * removed from session history for various reasons, for example to control
-   * the memory usage of the browser, to prevent users from loading documents
-   * from history, to erase evidence of prior page loads, etc.
-   *
-   * To purge documents from session history call nsISHistory::PurgeHistory()
-   *
-   * @param aNumEntries   The number of entries to be removed from session history.
-   * @return              Whether the operation can proceed.
-   */
-   boolean OnHistoryPurge(in long aNumEntries);
-
-  /**
-   * Called when an entry is replaced in the session history. Entries are
-   * replaced when navigating away from non-persistent history entries (such as
-   * about pages) and when history.replaceState is called.
-   *
-   * @param aIndex        The index in session history of the entry being
-  *                       replaced
-   */
-   void OnHistoryReplaceEntry(in long aIndex);
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/public/nsISHTransaction.idl firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/public/nsISHTransaction.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/public/nsISHTransaction.idl	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/public/nsISHTransaction.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-
-interface nsISHEntry;
-
-/**
- * The nsISHTransaction.
- */
-
-
-[scriptable, uuid(2EDF705F-D252-4971-9F09-71DD0F760DC6)]
-interface nsISHTransaction : nsISupports
-{
-	/**
-     * The nsISHEntry for the current transaction
-     */
-	attribute nsISHEntry sHEntry;
-
-	/**
-	 * The parent of this transaction
-	 */
-	attribute nsISHTransaction prev;
-
-	/**
-	 * The legitimate child of this transaction 
-	 */
-	attribute nsISHTransaction next;
-
-	/**
-	 *	Specifies if this transaction should persist.  If not it will be replaced
-	 * by new additions to the list.
-	 */
-	attribute boolean persist;
-
-	/**
-	 * Create a transaction with parent and History Entry 
-	 */
-	 void create(in nsISHEntry aSHEntry, in nsISHTransaction aPrev);
-};
-
-%{ C++
-// {BFD1A792-AD9F-11d3-BDC7-0050040A9B44}
-
-
-#define NS_SHTRANSACTION_CID \
-{0xbfd1a792, 0xad9f, 0x11d3, {0xbd, 0xc7, 0x0, 0x50, 0x4, 0xa, 0x9b, 0x44}}
-
-#define NS_SHTRANSACTION_CONTRACTID \
-    "@mozilla.org/browser/session-history-transaction;1"
-
-%}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/src/moz.build firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/src/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/src/moz.build	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/src/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXPORTS += [
-    'nsSHEntryShared.h',
-]
-
-UNIFIED_SOURCES += [
-    'nsSHEntry.cpp',
-    'nsSHEntryShared.cpp',
-    'nsSHistory.cpp',
-    'nsSHTransaction.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-LOCAL_INCLUDES += [
-    '/docshell/base',
-]
-
-FINAL_LIBRARY = 'xul'
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/src/nsSHEntry.cpp firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/src/nsSHEntry.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/src/nsSHEntry.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/src/nsSHEntry.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,884 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsSHEntry.h"
-#include "nsIDocShellLoadInfo.h"
-#include "nsIDocShellTreeItem.h"
-#include "nsDocShellEditorData.h"
-#include "nsSHEntryShared.h"
-#include "nsILayoutHistoryState.h"
-#include "nsIContentViewer.h"
-#include "nsISupportsArray.h"
-#include "nsIStructuredCloneContainer.h"
-#include "nsIInputStream.h"
-#include "nsIURI.h"
-#include "mozilla/net/ReferrerPolicy.h"
-#include <algorithm>
-
-namespace dom = mozilla::dom;
-
-static uint32_t gEntryID = 0;
-
-nsSHEntry::nsSHEntry()
-  : mShared(new nsSHEntryShared())
-  , mReferrerPolicy(mozilla::net::RP_Default)
-  , mLoadType(0)
-  , mID(gEntryID++)
-  , mScrollPositionX(0)
-  , mScrollPositionY(0)
-  , mParent(nullptr)
-  , mURIWasModified(false)
-  , mIsSrcdocEntry(false)
-{
-}
-
-nsSHEntry::nsSHEntry(const nsSHEntry& aOther)
-  : mShared(aOther.mShared)
-  , mURI(aOther.mURI)
-  , mReferrerURI(aOther.mReferrerURI)
-  , mReferrerPolicy(aOther.mReferrerPolicy)
-  , mTitle(aOther.mTitle)
-  , mPostData(aOther.mPostData)
-  , mLoadType(0)         // XXX why not copy?
-  , mID(aOther.mID)
-  , mScrollPositionX(0)  // XXX why not copy?
-  , mScrollPositionY(0)  // XXX why not copy?
-  , mParent(aOther.mParent)
-  , mURIWasModified(aOther.mURIWasModified)
-  , mStateData(aOther.mStateData)
-  , mIsSrcdocEntry(aOther.mIsSrcdocEntry)
-  , mSrcdocData(aOther.mSrcdocData)
-  , mBaseURI(aOther.mBaseURI)
-{
-}
-
-static bool
-ClearParentPtr(nsISHEntry* aEntry, void* /* aData */)
-{
-  if (aEntry) {
-    aEntry->SetParent(nullptr);
-  }
-  return true;
-}
-
-nsSHEntry::~nsSHEntry()
-{
-  // Null out the mParent pointers on all our kids.
-  mChildren.EnumerateForwards(ClearParentPtr, nullptr);
-}
-
-NS_IMPL_ISUPPORTS(nsSHEntry, nsISHContainer, nsISHEntry, nsISHEntryInternal)
-
-NS_IMETHODIMP
-nsSHEntry::SetScrollPosition(int32_t aX, int32_t aY)
-{
-  mScrollPositionX = aX;
-  mScrollPositionY = aY;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetScrollPosition(int32_t* aX, int32_t* aY)
-{
-  *aX = mScrollPositionX;
-  *aY = mScrollPositionY;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetURIWasModified(bool* aOut)
-{
-  *aOut = mURIWasModified;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetURIWasModified(bool aIn)
-{
-  mURIWasModified = aIn;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetURI(nsIURI** aURI)
-{
-  *aURI = mURI;
-  NS_IF_ADDREF(*aURI);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetURI(nsIURI* aURI)
-{
-  mURI = aURI;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetReferrerURI(nsIURI** aReferrerURI)
-{
-  *aReferrerURI = mReferrerURI;
-  NS_IF_ADDREF(*aReferrerURI);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetReferrerURI(nsIURI* aReferrerURI)
-{
-  mReferrerURI = aReferrerURI;
-  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)
-{
-  return mShared->SetContentViewer(aViewer);
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetContentViewer(nsIContentViewer** aResult)
-{
-  *aResult = mShared->mContentViewer;
-  NS_IF_ADDREF(*aResult);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetAnyContentViewer(nsISHEntry** aOwnerEntry,
-                               nsIContentViewer** aResult)
-{
-  // Find a content viewer in the root node or any of its children,
-  // assuming that there is only one content viewer total in any one
-  // nsSHEntry tree
-  GetContentViewer(aResult);
-  if (*aResult) {
-#ifdef DEBUG_PAGE_CACHE
-    printf("Found content viewer\n");
-#endif
-    *aOwnerEntry = this;
-    NS_ADDREF(*aOwnerEntry);
-    return NS_OK;
-  }
-  // The root SHEntry doesn't have a ContentViewer, so check child nodes
-  for (int32_t i = 0; i < mChildren.Count(); i++) {
-    nsISHEntry* child = mChildren[i];
-    if (child) {
-#ifdef DEBUG_PAGE_CACHE
-      printf("Evaluating SHEntry child %d\n", i);
-#endif
-      child->GetAnyContentViewer(aOwnerEntry, aResult);
-      if (*aResult) {
-        return NS_OK;
-      }
-    }
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetSticky(bool aSticky)
-{
-  mShared->mSticky = aSticky;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetSticky(bool* aSticky)
-{
-  *aSticky = mShared->mSticky;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetTitle(char16_t** aTitle)
-{
-  // Check for empty title...
-  if (mTitle.IsEmpty() && mURI) {
-    // Default title is the URL.
-    nsAutoCString spec;
-    if (NS_SUCCEEDED(mURI->GetSpec(spec))) {
-      AppendUTF8toUTF16(spec, mTitle);
-    }
-  }
-
-  *aTitle = ToNewUnicode(mTitle);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetTitle(const nsAString& aTitle)
-{
-  mTitle = aTitle;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetPostData(nsIInputStream** aResult)
-{
-  *aResult = mPostData;
-  NS_IF_ADDREF(*aResult);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetPostData(nsIInputStream* aPostData)
-{
-  mPostData = aPostData;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetLayoutHistoryState(nsILayoutHistoryState** aResult)
-{
-  *aResult = mShared->mLayoutHistoryState;
-  NS_IF_ADDREF(*aResult);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetLayoutHistoryState(nsILayoutHistoryState* aState)
-{
-  mShared->mLayoutHistoryState = aState;
-  if (mShared->mLayoutHistoryState) {
-    mShared->mLayoutHistoryState->SetScrollPositionOnly(
-      !mShared->mSaveLayoutState);
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetLoadType(uint32_t* aResult)
-{
-  *aResult = mLoadType;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetLoadType(uint32_t aLoadType)
-{
-  mLoadType = aLoadType;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetID(uint32_t* aResult)
-{
-  *aResult = mID;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetID(uint32_t aID)
-{
-  mID = aID;
-  return NS_OK;
-}
-
-nsSHEntryShared*
-nsSHEntry::GetSharedState()
-{
-  return mShared;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetIsSubFrame(bool* aFlag)
-{
-  *aFlag = mShared->mIsFrameNavigation;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetIsSubFrame(bool aFlag)
-{
-  mShared->mIsFrameNavigation = aFlag;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetCacheKey(nsISupports** aResult)
-{
-  *aResult = mShared->mCacheKey;
-  NS_IF_ADDREF(*aResult);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetCacheKey(nsISupports* aCacheKey)
-{
-  mShared->mCacheKey = aCacheKey;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetSaveLayoutStateFlag(bool* aFlag)
-{
-  *aFlag = mShared->mSaveLayoutState;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetSaveLayoutStateFlag(bool aFlag)
-{
-  mShared->mSaveLayoutState = aFlag;
-  if (mShared->mLayoutHistoryState) {
-    mShared->mLayoutHistoryState->SetScrollPositionOnly(!aFlag);
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetExpirationStatus(bool* aFlag)
-{
-  *aFlag = mShared->mExpired;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetExpirationStatus(bool aFlag)
-{
-  mShared->mExpired = aFlag;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetContentType(nsACString& aContentType)
-{
-  aContentType = mShared->mContentType;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetContentType(const nsACString& aContentType)
-{
-  mShared->mContentType = aContentType;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::Create(nsIURI* aURI, const nsAString& aTitle,
-                  nsIInputStream* aInputStream,
-                  nsILayoutHistoryState* aLayoutHistoryState,
-                  nsISupports* aCacheKey, const nsACString& aContentType,
-                  nsISupports* aOwner, uint64_t aDocShellID,
-                  bool aDynamicCreation)
-{
-  mURI = aURI;
-  mTitle = aTitle;
-  mPostData = aInputStream;
-
-  // Set the LoadType by default to loadHistory during creation
-  mLoadType = (uint32_t)nsIDocShellLoadInfo::loadHistory;
-
-  mShared->mCacheKey = aCacheKey;
-  mShared->mContentType = aContentType;
-  mShared->mOwner = aOwner;
-  mShared->mDocShellID = aDocShellID;
-  mShared->mDynamicallyCreated = aDynamicCreation;
-
-  // By default all entries are set false for subframe flag.
-  // nsDocShell::CloneAndReplace() which creates entries for
-  // all subframe navigations, sets the flag to true.
-  mShared->mIsFrameNavigation = false;
-
-  // By default we save LayoutHistoryState
-  mShared->mSaveLayoutState = true;
-  mShared->mLayoutHistoryState = aLayoutHistoryState;
-
-  // By default the page is not expired
-  mShared->mExpired = false;
-
-  mIsSrcdocEntry = false;
-  mSrcdocData = NullString();
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::Clone(nsISHEntry** aResult)
-{
-  *aResult = new nsSHEntry(*this);
-  NS_ADDREF(*aResult);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetParent(nsISHEntry** aResult)
-{
-  NS_ENSURE_ARG_POINTER(aResult);
-  *aResult = mParent;
-  NS_IF_ADDREF(*aResult);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetParent(nsISHEntry* aParent)
-{
-  /* parent not Addrefed on purpose to avoid cyclic reference
-   * Null parent is OK
-   *
-   * XXX this method should not be scriptable if this is the case!!
-   */
-  mParent = aParent;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetWindowState(nsISupports* aState)
-{
-  mShared->mWindowState = aState;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetWindowState(nsISupports** aState)
-{
-  NS_IF_ADDREF(*aState = mShared->mWindowState);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetViewerBounds(const nsIntRect& aBounds)
-{
-  mShared->mViewerBounds = aBounds;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetViewerBounds(nsIntRect& aBounds)
-{
-  aBounds = mShared->mViewerBounds;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetOwner(nsISupports** aOwner)
-{
-  NS_IF_ADDREF(*aOwner = mShared->mOwner);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetOwner(nsISupports* aOwner)
-{
-  mShared->mOwner = aOwner;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetBFCacheEntry(nsIBFCacheEntry** aEntry)
-{
-  NS_ENSURE_ARG_POINTER(aEntry);
-  NS_IF_ADDREF(*aEntry = mShared);
-  return NS_OK;
-}
-
-bool
-nsSHEntry::HasBFCacheEntry(nsIBFCacheEntry* aEntry)
-{
-  return static_cast<nsIBFCacheEntry*>(mShared) == aEntry;
-}
-
-NS_IMETHODIMP
-nsSHEntry::AdoptBFCacheEntry(nsISHEntry* aEntry)
-{
-  nsCOMPtr<nsISHEntryInternal> shEntry = do_QueryInterface(aEntry);
-  NS_ENSURE_STATE(shEntry);
-
-  nsSHEntryShared* shared = shEntry->GetSharedState();
-  NS_ENSURE_STATE(shared);
-
-  mShared = shared;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SharesDocumentWith(nsISHEntry* aEntry, bool* aOut)
-{
-  NS_ENSURE_ARG_POINTER(aOut);
-
-  nsCOMPtr<nsISHEntryInternal> internal = do_QueryInterface(aEntry);
-  NS_ENSURE_STATE(internal);
-
-  *aOut = mShared == internal->GetSharedState();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::AbandonBFCacheEntry()
-{
-  mShared = nsSHEntryShared::Duplicate(mShared);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetIsSrcdocEntry(bool* aIsSrcdocEntry)
-{
-  *aIsSrcdocEntry = mIsSrcdocEntry;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetSrcdocData(nsAString& aSrcdocData)
-{
-  aSrcdocData = mSrcdocData;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetSrcdocData(const nsAString& aSrcdocData)
-{
-  mSrcdocData = aSrcdocData;
-  mIsSrcdocEntry = true;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetBaseURI(nsIURI** aBaseURI)
-{
-  *aBaseURI = mBaseURI;
-  NS_IF_ADDREF(*aBaseURI);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetBaseURI(nsIURI* aBaseURI)
-{
-  mBaseURI = aBaseURI;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetChildCount(int32_t* aCount)
-{
-  *aCount = mChildren.Count();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::AddChild(nsISHEntry* aChild, int32_t aOffset)
-{
-  if (aChild) {
-    NS_ENSURE_SUCCESS(aChild->SetParent(this), NS_ERROR_FAILURE);
-  }
-
-  if (aOffset < 0) {
-    mChildren.AppendObject(aChild);
-    return NS_OK;
-  }
-
-  //
-  // Bug 52670: Ensure children are added in order.
-  //
-  //  Later frames in the child list may load faster and get appended
-  //  before earlier frames, causing session history to be scrambled.
-  //  By growing the list here, they are added to the right position.
-  //
-  //  Assert that aOffset will not be so high as to grow us a lot.
-  //
-  NS_ASSERTION(aOffset < (mChildren.Count() + 1023), "Large frames array!\n");
-
-  bool newChildIsDyn = false;
-  if (aChild) {
-    aChild->IsDynamicallyAdded(&newChildIsDyn);
-  }
-
-  // If the new child is dynamically added, try to add it to aOffset, but if
-  // there are non-dynamically added children, the child must be after those.
-  if (newChildIsDyn) {
-    int32_t lastNonDyn = aOffset - 1;
-    for (int32_t i = aOffset; i < mChildren.Count(); ++i) {
-      nsISHEntry* entry = mChildren[i];
-      if (entry) {
-        bool dyn = false;
-        entry->IsDynamicallyAdded(&dyn);
-        if (dyn) {
-          break;
-        } else {
-          lastNonDyn = i;
-        }
-      }
-    }
-    // InsertObjectAt allows only appending one object.
-    // If aOffset is larger than Count(), we must first manually
-    // set the capacity.
-    if (aOffset > mChildren.Count()) {
-      mChildren.SetCount(aOffset);
-    }
-    if (!mChildren.InsertObjectAt(aChild, lastNonDyn + 1)) {
-      NS_WARNING("Adding a child failed!");
-      aChild->SetParent(nullptr);
-      return NS_ERROR_FAILURE;
-    }
-  } else {
-    // If the new child isn't dynamically added, it should be set to aOffset.
-    // If there are dynamically added children before that, those must be
-    // moved to be after aOffset.
-    if (mChildren.Count() > 0) {
-      int32_t start = std::min(mChildren.Count() - 1, aOffset);
-      int32_t dynEntryIndex = -1;
-      nsISHEntry* dynEntry = nullptr;
-      for (int32_t i = start; i >= 0; --i) {
-        nsISHEntry* entry = mChildren[i];
-        if (entry) {
-          bool dyn = false;
-          entry->IsDynamicallyAdded(&dyn);
-          if (dyn) {
-            dynEntryIndex = i;
-            dynEntry = entry;
-          } else {
-            break;
-          }
-        }
-      }
-
-      if (dynEntry) {
-        nsCOMArray<nsISHEntry> tmp;
-        tmp.SetCount(aOffset - dynEntryIndex + 1);
-        mChildren.InsertObjectsAt(tmp, dynEntryIndex);
-        NS_ASSERTION(mChildren[aOffset + 1] == dynEntry, "Whaat?");
-      }
-    }
-
-    // Make sure there isn't anything at aOffset.
-    if (aOffset < mChildren.Count()) {
-      nsISHEntry* oldChild = mChildren[aOffset];
-      if (oldChild && oldChild != aChild) {
-        NS_ERROR("Adding a child where we already have a child? This may misbehave");
-        oldChild->SetParent(nullptr);
-      }
-    }
-
-    if (!mChildren.ReplaceObjectAt(aChild, aOffset)) {
-      NS_WARNING("Adding a child failed!");
-      aChild->SetParent(nullptr);
-      return NS_ERROR_FAILURE;
-    }
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::RemoveChild(nsISHEntry* aChild)
-{
-  NS_ENSURE_TRUE(aChild, NS_ERROR_FAILURE);
-  bool childRemoved = false;
-  bool dynamic = false;
-  aChild->IsDynamicallyAdded(&dynamic);
-  if (dynamic) {
-    childRemoved = mChildren.RemoveObject(aChild);
-  } else {
-    int32_t index = mChildren.IndexOfObject(aChild);
-    if (index >= 0) {
-      childRemoved = mChildren.ReplaceObjectAt(nullptr, index);
-    }
-  }
-  if (childRemoved) {
-    aChild->SetParent(nullptr);
-
-    // reduce the child count, i.e. remove empty children at the end
-    for (int32_t i = mChildren.Count() - 1; i >= 0 && !mChildren[i]; --i) {
-      if (!mChildren.RemoveObjectAt(i)) {
-        break;
-      }
-    }
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetChildAt(int32_t aIndex, nsISHEntry** aResult)
-{
-  if (aIndex >= 0 && aIndex < mChildren.Count()) {
-    *aResult = mChildren[aIndex];
-    // yes, mChildren can have holes in it.  AddChild's offset parameter makes
-    // that possible.
-    NS_IF_ADDREF(*aResult);
-  } else {
-    *aResult = nullptr;
-  }
-  return NS_OK;
-}
-
-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");
-  mShared->mChildShells.AppendObject(aShell);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::ChildShellAt(int32_t aIndex, nsIDocShellTreeItem** aShell)
-{
-  NS_IF_ADDREF(*aShell = mShared->mChildShells.SafeObjectAt(aIndex));
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::ClearChildShells()
-{
-  mShared->mChildShells.Clear();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetRefreshURIList(nsISupportsArray** aList)
-{
-  NS_IF_ADDREF(*aList = mShared->mRefreshURIList);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetRefreshURIList(nsISupportsArray* aList)
-{
-  mShared->mRefreshURIList = aList;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SyncPresentationState()
-{
-  return mShared->SyncPresentationState();
-}
-
-void
-nsSHEntry::RemoveFromBFCacheSync()
-{
-  mShared->RemoveFromBFCacheSync();
-}
-
-void
-nsSHEntry::RemoveFromBFCacheAsync()
-{
-  mShared->RemoveFromBFCacheAsync();
-}
-
-nsDocShellEditorData*
-nsSHEntry::ForgetEditorData()
-{
-  // XXX jlebar Check how this is used.
-  return mShared->mEditorData.forget();
-}
-
-void
-nsSHEntry::SetEditorData(nsDocShellEditorData* aData)
-{
-  NS_ASSERTION(!(aData && mShared->mEditorData),
-               "We're going to overwrite an owning ref!");
-  if (mShared->mEditorData != aData) {
-    mShared->mEditorData = aData;
-  }
-}
-
-bool
-nsSHEntry::HasDetachedEditor()
-{
-  return mShared->mEditorData != nullptr;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetStateData(nsIStructuredCloneContainer** aContainer)
-{
-  NS_ENSURE_ARG_POINTER(aContainer);
-  NS_IF_ADDREF(*aContainer = mStateData);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetStateData(nsIStructuredCloneContainer* aContainer)
-{
-  mStateData = aContainer;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::IsDynamicallyAdded(bool* aAdded)
-{
-  *aAdded = mShared->mDynamicallyCreated;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::HasDynamicallyAddedChild(bool* aAdded)
-{
-  *aAdded = false;
-  for (int32_t i = 0; i < mChildren.Count(); ++i) {
-    nsISHEntry* entry = mChildren[i];
-    if (entry) {
-      entry->IsDynamicallyAdded(aAdded);
-      if (*aAdded) {
-        break;
-      }
-    }
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetDocshellID(uint64_t* aID)
-{
-  *aID = mShared->mDocShellID;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetDocshellID(uint64_t aID)
-{
-  mShared->mDocShellID = aID;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetLastTouched(uint32_t* aLastTouched)
-{
-  *aLastTouched = mShared->mLastTouched;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetLastTouched(uint32_t aLastTouched)
-{
-  mShared->mLastTouched = aLastTouched;
-  return NS_OK;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/src/nsSHEntry.h firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/src/nsSHEntry.h
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/src/nsSHEntry.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/src/nsSHEntry.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: 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 nsSHEntry_h
-#define nsSHEntry_h
-
-// Helper Classes
-#include "nsCOMPtr.h"
-#include "nsAutoPtr.h"
-#include "nsCOMArray.h"
-#include "nsString.h"
-#include "mozilla/Attributes.h"
-
-// Interfaces needed
-#include "nsISHEntry.h"
-#include "nsISHContainer.h"
-
-class nsSHEntryShared;
-class nsIInputStream;
-class nsIURI;
-
-class nsSHEntry final : public nsISHEntry,
-                        public nsISHContainer,
-                        public nsISHEntryInternal
-{
-public:
-  nsSHEntry();
-  nsSHEntry(const nsSHEntry& aOther);
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSISHENTRY
-  NS_DECL_NSISHENTRYINTERNAL
-  NS_DECL_NSISHCONTAINER
-
-  void DropPresentationState();
-
-  static nsresult Startup();
-  static void Shutdown();
-
-private:
-  ~nsSHEntry();
-
-  // We share the state in here with other SHEntries which correspond to the
-  // same document.
-  nsRefPtr<nsSHEntryShared> mShared;
-
-  // 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;
-  uint32_t mID;
-  int32_t mScrollPositionX;
-  int32_t mScrollPositionY;
-  nsISHEntry* mParent;
-  nsCOMArray<nsISHEntry> mChildren;
-  bool mURIWasModified;
-  nsCOMPtr<nsIStructuredCloneContainer> mStateData;
-  bool mIsSrcdocEntry;
-  nsString mSrcdocData;
-  nsCOMPtr<nsIURI> mBaseURI;
-};
-
-#endif /* nsSHEntry_h */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/src/nsSHEntryShared.cpp firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/src/nsSHEntryShared.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/src/nsSHEntryShared.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/src/nsSHEntryShared.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,375 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsSHEntryShared.h"
-
-#include "nsIDOMDocument.h"
-#include "nsISHistory.h"
-#include "nsISHistoryInternal.h"
-#include "nsIDocument.h"
-#include "nsIWebNavigation.h"
-#include "nsIContentViewer.h"
-#include "nsIDocShell.h"
-#include "nsIDocShellTreeItem.h"
-#include "nsDocShellEditorData.h"
-#include "nsThreadUtils.h"
-#include "nsILayoutHistoryState.h"
-#include "mozilla/Attributes.h"
-#include "mozilla/Preferences.h"
-#include "nsISupportsArray.h"
-
-namespace dom = mozilla::dom;
-
-namespace {
-
-uint64_t gSHEntrySharedID = 0;
-
-} // anonymous namespace
-
-#define CONTENT_VIEWER_TIMEOUT_SECONDS "browser.sessionhistory.contentViewerTimeout"
-// Default this to time out unused content viewers after 30 minutes
-#define CONTENT_VIEWER_TIMEOUT_SECONDS_DEFAULT (30 * 60)
-
-typedef nsExpirationTracker<nsSHEntryShared, 3> HistoryTrackerBase;
-class HistoryTracker final : public HistoryTrackerBase
-{
-public:
-  explicit HistoryTracker(uint32_t aTimeout)
-    : HistoryTrackerBase(1000 * aTimeout / 2)
-  {
-  }
-
-protected:
-  virtual void NotifyExpired(nsSHEntryShared* aObj)
-  {
-    RemoveObject(aObj);
-    aObj->Expire();
-  }
-};
-
-static HistoryTracker* gHistoryTracker = nullptr;
-
-void
-nsSHEntryShared::EnsureHistoryTracker()
-{
-  if (!gHistoryTracker) {
-    // nsExpirationTracker doesn't allow one to change the timer period,
-    // so just set it once when the history tracker is used for the first time.
-    gHistoryTracker = new HistoryTracker(
-      mozilla::Preferences::GetUint(CONTENT_VIEWER_TIMEOUT_SECONDS,
-                                    CONTENT_VIEWER_TIMEOUT_SECONDS_DEFAULT));
-  }
-}
-
-void
-nsSHEntryShared::Shutdown()
-{
-  delete gHistoryTracker;
-  gHistoryTracker = nullptr;
-}
-
-nsSHEntryShared::nsSHEntryShared()
-  : mDocShellID(0)
-  , mIsFrameNavigation(false)
-  , mSaveLayoutState(true)
-  , mSticky(true)
-  , mDynamicallyCreated(false)
-  , mLastTouched(0)
-  , mID(gSHEntrySharedID++)
-  , mExpired(false)
-  , mViewerBounds(0, 0, 0, 0)
-{
-}
-
-nsSHEntryShared::~nsSHEntryShared()
-{
-  RemoveFromExpirationTracker();
-
-#ifdef DEBUG
-  if (gHistoryTracker) {
-    // Check that we're not still on track to expire.  We shouldn't be, because
-    // we just removed ourselves!
-    nsExpirationTracker<nsSHEntryShared, 3>::Iterator iterator(gHistoryTracker);
-
-    nsSHEntryShared* elem;
-    while ((elem = iterator.Next()) != nullptr) {
-      NS_ASSERTION(elem != this, "Found dead entry still in the tracker!");
-    }
-  }
-#endif
-
-  if (mContentViewer) {
-    RemoveFromBFCacheSync();
-  }
-}
-
-NS_IMPL_ISUPPORTS(nsSHEntryShared, nsIBFCacheEntry, nsIMutationObserver)
-
-already_AddRefed<nsSHEntryShared>
-nsSHEntryShared::Duplicate(nsSHEntryShared* aEntry)
-{
-  nsRefPtr<nsSHEntryShared> newEntry = new nsSHEntryShared();
-
-  newEntry->mDocShellID = aEntry->mDocShellID;
-  newEntry->mChildShells.AppendObjects(aEntry->mChildShells);
-  newEntry->mOwner = aEntry->mOwner;
-  newEntry->mContentType.Assign(aEntry->mContentType);
-  newEntry->mIsFrameNavigation = aEntry->mIsFrameNavigation;
-  newEntry->mSaveLayoutState = aEntry->mSaveLayoutState;
-  newEntry->mSticky = aEntry->mSticky;
-  newEntry->mDynamicallyCreated = aEntry->mDynamicallyCreated;
-  newEntry->mCacheKey = aEntry->mCacheKey;
-  newEntry->mLastTouched = aEntry->mLastTouched;
-
-  return newEntry.forget();
-}
-
-void
-nsSHEntryShared::RemoveFromExpirationTracker()
-{
-  if (gHistoryTracker && GetExpirationState()->IsTracked()) {
-    gHistoryTracker->RemoveObject(this);
-  }
-}
-
-nsresult
-nsSHEntryShared::SyncPresentationState()
-{
-  if (mContentViewer && mWindowState) {
-    // If we have a content viewer and a window state, we should be ok.
-    return NS_OK;
-  }
-
-  DropPresentationState();
-
-  return NS_OK;
-}
-
-void
-nsSHEntryShared::DropPresentationState()
-{
-  nsRefPtr<nsSHEntryShared> kungFuDeathGrip = this;
-
-  if (mDocument) {
-    mDocument->SetBFCacheEntry(nullptr);
-    mDocument->RemoveMutationObserver(this);
-    mDocument = nullptr;
-  }
-  if (mContentViewer) {
-    mContentViewer->ClearHistoryEntry();
-  }
-
-  RemoveFromExpirationTracker();
-  mContentViewer = nullptr;
-  mSticky = true;
-  mWindowState = nullptr;
-  mViewerBounds.SetRect(0, 0, 0, 0);
-  mChildShells.Clear();
-  mRefreshURIList = nullptr;
-  mEditorData = nullptr;
-}
-
-void
-nsSHEntryShared::Expire()
-{
-  // This entry has timed out. If we still have a content viewer, we need to
-  // evict it.
-  if (!mContentViewer) {
-    return;
-  }
-  nsCOMPtr<nsIDocShell> container;
-  mContentViewer->GetContainer(getter_AddRefs(container));
-  nsCOMPtr<nsIDocShellTreeItem> treeItem = do_QueryInterface(container);
-  if (!treeItem) {
-    return;
-  }
-  // We need to find the root DocShell since only that object has an
-  // SHistory and we need the SHistory to evict content viewers
-  nsCOMPtr<nsIDocShellTreeItem> root;
-  treeItem->GetSameTypeRootTreeItem(getter_AddRefs(root));
-  nsCOMPtr<nsIWebNavigation> webNav = do_QueryInterface(root);
-  nsCOMPtr<nsISHistory> history;
-  webNav->GetSessionHistory(getter_AddRefs(history));
-  nsCOMPtr<nsISHistoryInternal> historyInt = do_QueryInterface(history);
-  if (!historyInt) {
-    return;
-  }
-  historyInt->EvictExpiredContentViewerForEntry(this);
-}
-
-nsresult
-nsSHEntryShared::SetContentViewer(nsIContentViewer* aViewer)
-{
-  NS_PRECONDITION(!aViewer || !mContentViewer,
-                  "SHEntryShared already contains viewer");
-
-  if (mContentViewer || !aViewer) {
-    DropPresentationState();
-  }
-
-  mContentViewer = aViewer;
-
-  if (mContentViewer) {
-    EnsureHistoryTracker();
-    gHistoryTracker->AddObject(this);
-
-    nsCOMPtr<nsIDOMDocument> domDoc;
-    mContentViewer->GetDOMDocument(getter_AddRefs(domDoc));
-    // Store observed document in strong pointer in case it is removed from
-    // the contentviewer
-    mDocument = do_QueryInterface(domDoc);
-    if (mDocument) {
-      mDocument->SetBFCacheEntry(this);
-      mDocument->AddMutationObserver(this);
-    }
-  }
-
-  return NS_OK;
-}
-
-nsresult
-nsSHEntryShared::RemoveFromBFCacheSync()
-{
-  NS_ASSERTION(mContentViewer && mDocument, "we're not in the bfcache!");
-
-  nsCOMPtr<nsIContentViewer> viewer = mContentViewer;
-  DropPresentationState();
-
-  // Warning! The call to DropPresentationState could have dropped the last
-  // reference to this object, so don't access members beyond here.
-
-  if (viewer) {
-    viewer->Destroy();
-  }
-
-  return NS_OK;
-}
-
-class DestroyViewerEvent : public nsRunnable
-{
-public:
-  DestroyViewerEvent(nsIContentViewer* aViewer, nsIDocument* aDocument)
-    : mViewer(aViewer)
-    , mDocument(aDocument)
-  {
-  }
-
-  NS_IMETHOD Run()
-  {
-    if (mViewer) {
-      mViewer->Destroy();
-    }
-    return NS_OK;
-  }
-
-  nsCOMPtr<nsIContentViewer> mViewer;
-  nsCOMPtr<nsIDocument> mDocument;
-};
-
-nsresult
-nsSHEntryShared::RemoveFromBFCacheAsync()
-{
-  NS_ASSERTION(mContentViewer && mDocument, "we're not in the bfcache!");
-
-  // Release the reference to the contentviewer asynchronously so that the
-  // document doesn't get nuked mid-mutation.
-
-  nsCOMPtr<nsIRunnable> evt = new DestroyViewerEvent(mContentViewer, mDocument);
-  nsresult rv = NS_DispatchToCurrentThread(evt);
-  if (NS_FAILED(rv)) {
-    NS_WARNING("failed to dispatch DestroyViewerEvent");
-  } else {
-    // Drop presentation. Only do this if we succeeded in posting the event
-    // since otherwise the document could be torn down mid-mutation, causing
-    // crashes.
-    DropPresentationState();
-  }
-
-  // Careful! The call to DropPresentationState could have dropped the last
-  // reference to this nsSHEntryShared, so don't access members beyond here.
-
-  return NS_OK;
-}
-
-nsresult
-nsSHEntryShared::GetID(uint64_t* aID)
-{
-  *aID = mID;
-  return NS_OK;
-}
-
-void
-nsSHEntryShared::NodeWillBeDestroyed(const nsINode* aNode)
-{
-  NS_NOTREACHED("Document destroyed while we're holding a strong ref to it");
-}
-
-void
-nsSHEntryShared::CharacterDataWillChange(nsIDocument* aDocument,
-                                         nsIContent* aContent,
-                                         CharacterDataChangeInfo* aInfo)
-{
-}
-
-void
-nsSHEntryShared::CharacterDataChanged(nsIDocument* aDocument,
-                                      nsIContent* aContent,
-                                      CharacterDataChangeInfo* aInfo)
-{
-  RemoveFromBFCacheAsync();
-}
-
-void
-nsSHEntryShared::AttributeWillChange(nsIDocument* aDocument,
-                                     dom::Element* aContent,
-                                     int32_t aNameSpaceID,
-                                     nsIAtom* aAttribute,
-                                     int32_t aModType)
-{
-}
-
-void
-nsSHEntryShared::AttributeChanged(nsIDocument* aDocument,
-                                  dom::Element* aElement,
-                                  int32_t aNameSpaceID,
-                                  nsIAtom* aAttribute,
-                                  int32_t aModType)
-{
-  RemoveFromBFCacheAsync();
-}
-
-void
-nsSHEntryShared::ContentAppended(nsIDocument* aDocument,
-                                 nsIContent* aContainer,
-                                 nsIContent* aFirstNewContent,
-                                 int32_t /* unused */)
-{
-  RemoveFromBFCacheAsync();
-}
-
-void
-nsSHEntryShared::ContentInserted(nsIDocument* aDocument,
-                                 nsIContent* aContainer,
-                                 nsIContent* aChild,
-                                 int32_t /* unused */)
-{
-  RemoveFromBFCacheAsync();
-}
-
-void
-nsSHEntryShared::ContentRemoved(nsIDocument* aDocument,
-                                nsIContent* aContainer,
-                                nsIContent* aChild,
-                                int32_t aIndexInContainer,
-                                nsIContent* aPreviousSibling)
-{
-  RemoveFromBFCacheAsync();
-}
-
-void
-nsSHEntryShared::ParentChainChanged(nsIContent* aContent)
-{
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/src/nsSHEntryShared.h firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/src/nsSHEntryShared.h
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/src/nsSHEntryShared.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/src/nsSHEntryShared.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nsSHEntryShared_h__
-#define nsSHEntryShared_h__
-
-#include "nsCOMPtr.h"
-#include "nsAutoPtr.h"
-#include "nsCOMArray.h"
-#include "nsIBFCacheEntry.h"
-#include "nsIMutationObserver.h"
-#include "nsExpirationTracker.h"
-#include "nsRect.h"
-#include "nsString.h"
-#include "mozilla/Attributes.h"
-
-class nsSHEntry;
-class nsISHEntry;
-class nsIDocument;
-class nsIContentViewer;
-class nsIDocShellTreeItem;
-class nsILayoutHistoryState;
-class nsDocShellEditorData;
-class nsISupportsArray;
-
-// A document may have multiple SHEntries, either due to hash navigations or
-// calls to history.pushState.  SHEntries corresponding to the same document
-// share many members; in particular, they share state related to the
-// back/forward cache.
-//
-// nsSHEntryShared is the vehicle for this sharing.
-class nsSHEntryShared final
-  : public nsIBFCacheEntry
-  , public nsIMutationObserver
-{
-public:
-  static void EnsureHistoryTracker();
-  static void Shutdown();
-
-  nsSHEntryShared();
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIMUTATIONOBSERVER
-  NS_DECL_NSIBFCACHEENTRY
-
-private:
-  ~nsSHEntryShared();
-
-  friend class nsSHEntry;
-
-  friend class HistoryTracker;
-  friend class nsExpirationTracker<nsSHEntryShared, 3>;
-  nsExpirationState *GetExpirationState() { return &mExpirationState; }
-
-  static already_AddRefed<nsSHEntryShared> Duplicate(nsSHEntryShared* aEntry);
-
-  void RemoveFromExpirationTracker();
-  void Expire();
-  nsresult SyncPresentationState();
-  void DropPresentationState();
-
-  nsresult SetContentViewer(nsIContentViewer* aViewer);
-
-  // See nsISHEntry.idl for an explanation of these members.
-
-  // These members are copied by nsSHEntryShared::Duplicate().  If you add a
-  // member here, be sure to update the Duplicate() implementation.
-  uint64_t mDocShellID;
-  nsCOMArray<nsIDocShellTreeItem> mChildShells;
-  nsCOMPtr<nsISupports> mOwner;
-  nsCString mContentType;
-  bool mIsFrameNavigation;
-  bool mSaveLayoutState;
-  bool mSticky;
-  bool mDynamicallyCreated;
-  nsCOMPtr<nsISupports> mCacheKey;
-  uint32_t mLastTouched;
-
-  // These members aren't copied by nsSHEntryShared::Duplicate() because
-  // they're specific to a particular content viewer.
-  uint64_t mID;
-  nsCOMPtr<nsIContentViewer> mContentViewer;
-  nsCOMPtr<nsIDocument> mDocument;
-  nsCOMPtr<nsILayoutHistoryState> mLayoutHistoryState;
-  bool mExpired;
-  nsCOMPtr<nsISupports> mWindowState;
-  nsIntRect mViewerBounds;
-  nsCOMPtr<nsISupportsArray> mRefreshURIList;
-  nsExpirationState mExpirationState;
-  nsAutoPtr<nsDocShellEditorData> mEditorData;
-};
-
-#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/src/nsSHistory.cpp firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/src/nsSHistory.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/src/nsSHistory.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/src/nsSHistory.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,1837 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsSHistory.h"
-#include <algorithm>
-
-// Helper Classes
-#include "mozilla/Preferences.h"
-#include "mozilla/StaticPtr.h"
-
-// Interfaces Needed
-#include "nsILayoutHistoryState.h"
-#include "nsIDocShell.h"
-#include "nsIDocShellLoadInfo.h"
-#include "nsISHContainer.h"
-#include "nsIDocShellTreeItem.h"
-#include "nsIURI.h"
-#include "nsIContentViewer.h"
-#include "nsIObserverService.h"
-#include "prclist.h"
-#include "mozilla/Services.h"
-#include "nsTArray.h"
-#include "nsCOMArray.h"
-#include "nsDocShell.h"
-#include "mozilla/Attributes.h"
-#include "nsISHEntry.h"
-#include "nsISHTransaction.h"
-#include "nsISHistoryListener.h"
-#include "nsComponentManagerUtils.h"
-
-// For calculating max history entries and max cachable contentviewers
-#include "prsystem.h"
-#include "mozilla/MathAlgorithms.h"
-
-using namespace mozilla;
-
-#define PREF_SHISTORY_SIZE "browser.sessionhistory.max_entries"
-#define PREF_SHISTORY_MAX_TOTAL_VIEWERS "browser.sessionhistory.max_total_viewers"
-
-static const char* kObservedPrefs[] = {
-  PREF_SHISTORY_SIZE,
-  PREF_SHISTORY_MAX_TOTAL_VIEWERS,
-  nullptr
-};
-
-static int32_t gHistoryMaxSize = 50;
-// Max viewers allowed per SHistory objects
-static const int32_t gHistoryMaxViewers = 3;
-// List of all SHistory objects, used for content viewer cache eviction
-static PRCList gSHistoryList;
-// Max viewers allowed total, across all SHistory objects - negative default
-// means we will calculate how many viewers to cache based on total memory
-int32_t nsSHistory::sHistoryMaxTotalViewers = -1;
-
-// A counter that is used to be able to know the order in which
-// entries were touched, so that we can evict older entries first.
-static uint32_t gTouchCounter = 0;
-
-static PRLogModuleInfo*
-GetSHistoryLog()
-{
-  static PRLogModuleInfo* sLog;
-  if (!sLog) {
-    sLog = PR_NewLogModule("nsSHistory");
-  }
-  return sLog;
-}
-#define LOG(format) PR_LOG(GetSHistoryLog(), PR_LOG_DEBUG, format)
-
-// This macro makes it easier to print a log message which includes a URI's
-// spec.  Example use:
-//
-//  nsIURI *uri = [...];
-//  LOG_SPEC(("The URI is %s.", _spec), uri);
-//
-#define LOG_SPEC(format, uri)                              \
-  PR_BEGIN_MACRO                                           \
-    if (PR_LOG_TEST(GetSHistoryLog(), PR_LOG_DEBUG)) {     \
-      nsAutoCString _specStr(NS_LITERAL_CSTRING("(null)"));\
-      if (uri) {                                           \
-        uri->GetSpec(_specStr);                            \
-      }                                                    \
-      const char* _spec = _specStr.get();                  \
-      LOG(format);                                         \
-    }                                                      \
-  PR_END_MACRO
-
-// This macro makes it easy to log a message including an SHEntry's URI.
-// For example:
-//
-//  nsCOMPtr<nsISHEntry> shentry = [...];
-//  LOG_SHENTRY_SPEC(("shentry %p has uri %s.", shentry.get(), _spec), shentry);
-//
-#define LOG_SHENTRY_SPEC(format, shentry)                  \
-  PR_BEGIN_MACRO                                           \
-    if (PR_LOG_TEST(GetSHistoryLog(), PR_LOG_DEBUG)) {     \
-      nsCOMPtr<nsIURI> uri;                                \
-      shentry->GetURI(getter_AddRefs(uri));                \
-      LOG_SPEC(format, uri);                               \
-    }                                                      \
-  PR_END_MACRO
-
-// Iterates over all registered session history listeners.
-#define ITERATE_LISTENERS(body)                            \
-  PR_BEGIN_MACRO                                           \
-  {                                                        \
-    nsAutoTObserverArray<nsWeakPtr, 2>::EndLimitedIterator \
-      iter(mListeners);                                    \
-    while (iter.HasMore()) {                               \
-      nsCOMPtr<nsISHistoryListener> listener =             \
-        do_QueryReferent(iter.GetNext());                  \
-      if (listener) {                                      \
-        body                                               \
-      }                                                    \
-    }                                                      \
-  }                                                        \
-  PR_END_MACRO
-
-// Calls a given method on all registered session history listeners.
-#define NOTIFY_LISTENERS(method, args)                     \
-  ITERATE_LISTENERS(                                       \
-    listener->method args;                                 \
-  );
-
-// Calls a given method on all registered session history listeners.
-// Listeners may return 'false' to cancel an action so make sure that we
-// set the return value to 'false' if one of the listeners wants to cancel.
-#define NOTIFY_LISTENERS_CANCELABLE(method, retval, args)  \
-  PR_BEGIN_MACRO                                           \
-  {                                                        \
-    bool canceled = false;                                 \
-    retval = true;                                         \
-    ITERATE_LISTENERS(                                     \
-      listener->method args;                               \
-      if (!retval) {                                       \
-        canceled = true;                                   \
-      }                                                    \
-    );                                                     \
-    if (canceled) {                                        \
-      retval = false;                                      \
-    }                                                      \
-  }                                                        \
-  PR_END_MACRO
-
-enum HistCmd
-{
-  HIST_CMD_BACK,
-  HIST_CMD_FORWARD,
-  HIST_CMD_GOTOINDEX,
-  HIST_CMD_RELOAD
-};
-
-class nsSHistoryObserver final : public nsIObserver
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIOBSERVER
-
-  nsSHistoryObserver() {}
-
-protected:
-  ~nsSHistoryObserver() {}
-};
-
-StaticRefPtr<nsSHistoryObserver> gObserver;
-
-NS_IMPL_ISUPPORTS(nsSHistoryObserver, nsIObserver)
-
-NS_IMETHODIMP
-nsSHistoryObserver::Observe(nsISupports* aSubject, const char* aTopic,
-                            const char16_t* aData)
-{
-  if (!strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID)) {
-    nsSHistory::UpdatePrefs();
-    nsSHistory::GloballyEvictContentViewers();
-  } else if (!strcmp(aTopic, "cacheservice:empty-cache") ||
-             !strcmp(aTopic, "memory-pressure")) {
-    nsSHistory::GloballyEvictAllContentViewers();
-  }
-
-  return NS_OK;
-}
-
-namespace {
-
-already_AddRefed<nsIContentViewer>
-GetContentViewerForTransaction(nsISHTransaction* aTrans)
-{
-  nsCOMPtr<nsISHEntry> entry;
-  aTrans->GetSHEntry(getter_AddRefs(entry));
-  if (!entry) {
-    return nullptr;
-  }
-
-  nsCOMPtr<nsISHEntry> ownerEntry;
-  nsCOMPtr<nsIContentViewer> viewer;
-  entry->GetAnyContentViewer(getter_AddRefs(ownerEntry),
-                             getter_AddRefs(viewer));
-  return viewer.forget();
-}
-
-void
-EvictContentViewerForTransaction(nsISHTransaction* aTrans)
-{
-  nsCOMPtr<nsISHEntry> entry;
-  aTrans->GetSHEntry(getter_AddRefs(entry));
-  nsCOMPtr<nsIContentViewer> viewer;
-  nsCOMPtr<nsISHEntry> ownerEntry;
-  entry->GetAnyContentViewer(getter_AddRefs(ownerEntry),
-                             getter_AddRefs(viewer));
-  if (viewer) {
-    NS_ASSERTION(ownerEntry, "Content viewer exists but its SHEntry is null");
-
-    LOG_SHENTRY_SPEC(("Evicting content viewer 0x%p for "
-                      "owning SHEntry 0x%p at %s.",
-                      viewer.get(), ownerEntry.get(), _spec),
-                     ownerEntry);
-
-    // Drop the presentation state before destroying the viewer, so that
-    // document teardown is able to correctly persist the state.
-    ownerEntry->SetContentViewer(nullptr);
-    ownerEntry->SyncPresentationState();
-    viewer->Destroy();
-  }
-}
-
-} // anonymous namespace
-
-nsSHistory::nsSHistory()
-  : mIndex(-1)
-  , mLength(0)
-  , mRequestedIndex(-1)
-{
-  // Add this new SHistory object to the list
-  PR_APPEND_LINK(this, &gSHistoryList);
-}
-
-nsSHistory::~nsSHistory()
-{
-  // Remove this SHistory object from the list
-  PR_REMOVE_LINK(this);
-}
-
-NS_IMPL_ADDREF(nsSHistory)
-NS_IMPL_RELEASE(nsSHistory)
-
-NS_INTERFACE_MAP_BEGIN(nsSHistory)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISHistory)
-  NS_INTERFACE_MAP_ENTRY(nsISHistory)
-  NS_INTERFACE_MAP_ENTRY(nsIWebNavigation)
-  NS_INTERFACE_MAP_ENTRY(nsISHistoryInternal)
-NS_INTERFACE_MAP_END
-
-// static
-uint32_t
-nsSHistory::CalcMaxTotalViewers()
-{
-  // Calculate an estimate of how many ContentViewers we should cache based
-  // on RAM.  This assumes that the average ContentViewer is 4MB (conservative)
-  // and caps the max at 8 ContentViewers
-  //
-  // TODO: Should we split the cache memory betw. ContentViewer caching and
-  // nsCacheService?
-  //
-  // RAM      ContentViewers
-  // -----------------------
-  // 32   Mb       0
-  // 64   Mb       1
-  // 128  Mb       2
-  // 256  Mb       3
-  // 512  Mb       5
-  // 1024 Mb       8
-  // 2048 Mb       8
-  // 4096 Mb       8
-  uint64_t bytes = PR_GetPhysicalMemorySize();
-
-  if (bytes == 0) {
-    return 0;
-  }
-
-  // Conversion from unsigned int64_t to double doesn't work on all platforms.
-  // We need to truncate the value at INT64_MAX to make sure we don't
-  // overflow.
-  if (bytes > INT64_MAX) {
-    bytes = INT64_MAX;
-  }
-
-  double kBytesD = (double)(bytes >> 10);
-
-  // This is essentially the same calculation as for nsCacheService,
-  // except that we divide the final memory calculation by 4, since
-  // we assume each ContentViewer takes on average 4MB
-  uint32_t viewers = 0;
-  double x = std::log(kBytesD) / std::log(2.0) - 14;
-  if (x > 0) {
-    viewers = (uint32_t)(x * x - x + 2.001); // add .001 for rounding
-    viewers /= 4;
-  }
-
-  // Cap it off at 8 max
-  if (viewers > 8) {
-    viewers = 8;
-  }
-  return viewers;
-}
-
-// static
-void
-nsSHistory::UpdatePrefs()
-{
-  Preferences::GetInt(PREF_SHISTORY_SIZE, &gHistoryMaxSize);
-  Preferences::GetInt(PREF_SHISTORY_MAX_TOTAL_VIEWERS,
-                      &sHistoryMaxTotalViewers);
-  // If the pref is negative, that means we calculate how many viewers
-  // we think we should cache, based on total memory
-  if (sHistoryMaxTotalViewers < 0) {
-    sHistoryMaxTotalViewers = CalcMaxTotalViewers();
-  }
-}
-
-// static
-nsresult
-nsSHistory::Startup()
-{
-  UpdatePrefs();
-
-  // The goal of this is to unbreak users who have inadvertently set their
-  // session history size to less than the default value.
-  int32_t defaultHistoryMaxSize =
-    Preferences::GetDefaultInt(PREF_SHISTORY_SIZE, 50);
-  if (gHistoryMaxSize < defaultHistoryMaxSize) {
-    gHistoryMaxSize = defaultHistoryMaxSize;
-  }
-
-  // Allow the user to override the max total number of cached viewers,
-  // but keep the per SHistory cached viewer limit constant
-  if (!gObserver) {
-    gObserver = new nsSHistoryObserver();
-    Preferences::AddStrongObservers(gObserver, kObservedPrefs);
-
-    nsCOMPtr<nsIObserverService> obsSvc =
-      mozilla::services::GetObserverService();
-    if (obsSvc) {
-      // Observe empty-cache notifications so tahat clearing the disk/memory
-      // cache will also evict all content viewers.
-      obsSvc->AddObserver(gObserver, "cacheservice:empty-cache", false);
-
-      // Same for memory-pressure notifications
-      obsSvc->AddObserver(gObserver, "memory-pressure", false);
-    }
-  }
-
-  // Initialize the global list of all SHistory objects
-  PR_INIT_CLIST(&gSHistoryList);
-  return NS_OK;
-}
-
-// static
-void
-nsSHistory::Shutdown()
-{
-  if (gObserver) {
-    Preferences::RemoveObservers(gObserver, kObservedPrefs);
-    nsCOMPtr<nsIObserverService> obsSvc =
-      mozilla::services::GetObserverService();
-    if (obsSvc) {
-      obsSvc->RemoveObserver(gObserver, "cacheservice:empty-cache");
-      obsSvc->RemoveObserver(gObserver, "memory-pressure");
-    }
-    gObserver = nullptr;
-  }
-}
-
-/* Add an entry to the History list at mIndex and
- * increment the index to point to the new entry
- */
-NS_IMETHODIMP
-nsSHistory::AddEntry(nsISHEntry* aSHEntry, bool aPersist)
-{
-  NS_ENSURE_ARG(aSHEntry);
-
-  nsCOMPtr<nsISHTransaction> currentTxn;
-
-  if (mListRoot) {
-    GetTransactionAtIndex(mIndex, getter_AddRefs(currentTxn));
-  }
-
-  bool currentPersist = true;
-  if (currentTxn) {
-    currentTxn->GetPersist(&currentPersist);
-  }
-
-  int32_t currentIndex = mIndex;
-
-  if (!currentPersist) {
-    NOTIFY_LISTENERS(OnHistoryReplaceEntry, (currentIndex));
-    NS_ENSURE_SUCCESS(currentTxn->SetSHEntry(aSHEntry), NS_ERROR_FAILURE);
-    currentTxn->SetPersist(aPersist);
-    return NS_OK;
-  }
-
-  nsCOMPtr<nsISHTransaction> txn(
-    do_CreateInstance(NS_SHTRANSACTION_CONTRACTID));
-  NS_ENSURE_TRUE(txn, NS_ERROR_FAILURE);
-
-  nsCOMPtr<nsIURI> uri;
-  aSHEntry->GetURI(getter_AddRefs(uri));
-  NOTIFY_LISTENERS(OnHistoryNewEntry, (uri));
-
-  // If a listener has changed mIndex, we need to get currentTxn again,
-  // otherwise we'll be left at an inconsistent state (see bug 320742)
-  if (currentIndex != mIndex) {
-    GetTransactionAtIndex(mIndex, getter_AddRefs(currentTxn));
-  }
-
-  // Set the ShEntry and parent for the transaction. setting the
-  // parent will properly set the parent child relationship
-  txn->SetPersist(aPersist);
-  NS_ENSURE_SUCCESS(txn->Create(aSHEntry, currentTxn), NS_ERROR_FAILURE);
-
-  // A little tricky math here...  Basically when adding an object regardless of
-  // what the length was before, it should always be set back to the current and
-  // lop off the forward.
-  mLength = (++mIndex + 1);
-
-  // If this is the very first transaction, initialize the list
-  if (!mListRoot) {
-    mListRoot = txn;
-  }
-
-  // Purge History list if it is too long
-  if (gHistoryMaxSize >= 0 && mLength > gHistoryMaxSize) {
-    PurgeHistory(mLength - gHistoryMaxSize);
-  }
-
-  RemoveDynEntries(mIndex - 1, mIndex);
-  return NS_OK;
-}
-
-/* Get size of the history list */
-NS_IMETHODIMP
-nsSHistory::GetCount(int32_t* aResult)
-{
-  NS_ENSURE_ARG_POINTER(aResult);
-  *aResult = mLength;
-  return NS_OK;
-}
-
-/* Get index of the history list */
-NS_IMETHODIMP
-nsSHistory::GetIndex(int32_t* aResult)
-{
-  NS_PRECONDITION(aResult, "null out param?");
-  *aResult = mIndex;
-  return NS_OK;
-}
-
-/* Get the requestedIndex */
-NS_IMETHODIMP
-nsSHistory::GetRequestedIndex(int32_t* aResult)
-{
-  NS_PRECONDITION(aResult, "null out param?");
-  *aResult = mRequestedIndex;
-  return NS_OK;
-}
-
-/* Get the entry at a given index */
-NS_IMETHODIMP
-nsSHistory::GetEntryAtIndex(int32_t aIndex, bool aModifyIndex,
-                            nsISHEntry** aResult)
-{
-  nsresult rv;
-  nsCOMPtr<nsISHTransaction> txn;
-
-  /* GetTransactionAtIndex ensures aResult is valid and validates aIndex */
-  rv = GetTransactionAtIndex(aIndex, getter_AddRefs(txn));
-  if (NS_SUCCEEDED(rv) && txn) {
-    // Get the Entry from the transaction
-    rv = txn->GetSHEntry(aResult);
-    if (NS_SUCCEEDED(rv) && (*aResult)) {
-      // Set mIndex to the requested index, if asked to do so..
-      if (aModifyIndex) {
-        mIndex = aIndex;
-      }
-    }
-  }
-  return rv;
-}
-
-/* Get the transaction at a given index */
-NS_IMETHODIMP
-nsSHistory::GetTransactionAtIndex(int32_t aIndex, nsISHTransaction** aResult)
-{
-  nsresult rv;
-  NS_ENSURE_ARG_POINTER(aResult);
-
-  if (mLength <= 0 || aIndex < 0 || aIndex >= mLength) {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (!mListRoot) {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (aIndex == 0) {
-    *aResult = mListRoot;
-    NS_ADDREF(*aResult);
-    return NS_OK;
-  }
-
-  int32_t cnt = 0;
-  nsCOMPtr<nsISHTransaction> tempPtr;
-  rv = GetRootTransaction(getter_AddRefs(tempPtr));
-  if (NS_FAILED(rv) || !tempPtr) {
-    return NS_ERROR_FAILURE;
-  }
-
-  while (true) {
-    nsCOMPtr<nsISHTransaction> ptr;
-    rv = tempPtr->GetNext(getter_AddRefs(ptr));
-    if (NS_SUCCEEDED(rv) && ptr) {
-      cnt++;
-      if (cnt == aIndex) {
-        ptr.forget(aResult);
-        break;
-      } else {
-        tempPtr = ptr;
-        continue;
-      }
-    } else {
-      return NS_ERROR_FAILURE;
-    }
-  }
-
-  return NS_OK;
-}
-
-/* Get the index of a given entry */
-NS_IMETHODIMP
-nsSHistory::GetIndexOfEntry(nsISHEntry* aSHEntry, int32_t* aResult)
-{
-  NS_ENSURE_ARG(aSHEntry);
-  NS_ENSURE_ARG_POINTER(aResult);
-  *aResult = -1;
-
-  if (mLength <= 0) {
-    return NS_ERROR_FAILURE;
-  }
-
-  nsCOMPtr<nsISHTransaction> currentTxn;
-  int32_t cnt = 0;
-
-  nsresult rv = GetRootTransaction(getter_AddRefs(currentTxn));
-  if (NS_FAILED(rv) || !currentTxn) {
-    return NS_ERROR_FAILURE;
-  }
-
-  while (true) {
-    nsCOMPtr<nsISHEntry> entry;
-    rv = currentTxn->GetSHEntry(getter_AddRefs(entry));
-    if (NS_FAILED(rv) || !entry) {
-      return NS_ERROR_FAILURE;
-    }
-
-    if (aSHEntry == entry) {
-      *aResult = cnt;
-      break;
-    }
-
-    rv = currentTxn->GetNext(getter_AddRefs(currentTxn));
-    if (NS_FAILED(rv) || !currentTxn) {
-      return NS_ERROR_FAILURE;
-    }
-
-    cnt++;
-  }
-
-  return NS_OK;
-}
-
-#ifdef DEBUG
-nsresult
-nsSHistory::PrintHistory()
-{
-  nsCOMPtr<nsISHTransaction> txn;
-  int32_t index = 0;
-  nsresult rv;
-
-  if (!mListRoot) {
-    return NS_ERROR_FAILURE;
-  }
-
-  txn = mListRoot;
-
-  while (1) {
-    if (!txn) {
-      break;
-    }
-    nsCOMPtr<nsISHEntry> entry;
-    rv = txn->GetSHEntry(getter_AddRefs(entry));
-    if (NS_FAILED(rv) && !entry) {
-      return NS_ERROR_FAILURE;
-    }
-
-    nsCOMPtr<nsILayoutHistoryState> layoutHistoryState;
-    nsCOMPtr<nsIURI> uri;
-    nsXPIDLString title;
-
-    entry->GetLayoutHistoryState(getter_AddRefs(layoutHistoryState));
-    entry->GetURI(getter_AddRefs(uri));
-    entry->GetTitle(getter_Copies(title));
-
-#if 0
-    nsAutoCString url;
-    if (uri) {
-      uri->GetSpec(url);
-    }
-
-    printf("**** SH Transaction #%d, Entry = %x\n", index, entry.get());
-    printf("\t\t URL = %s\n", url.get());
-
-    printf("\t\t Title = %s\n", NS_LossyConvertUTF16toASCII(title).get());
-    printf("\t\t layout History Data = %x\n", layoutHistoryState.get());
-#endif
-
-    nsCOMPtr<nsISHTransaction> next;
-    rv = txn->GetNext(getter_AddRefs(next));
-    if (NS_SUCCEEDED(rv) && next) {
-      txn = next;
-      index++;
-      continue;
-    } else {
-      break;
-    }
-  }
-
-  return NS_OK;
-}
-#endif
-
-NS_IMETHODIMP
-nsSHistory::GetRootTransaction(nsISHTransaction** aResult)
-{
-  NS_ENSURE_ARG_POINTER(aResult);
-  *aResult = mListRoot;
-  NS_IF_ADDREF(*aResult);
-  return NS_OK;
-}
-
-/* Get the max size of the history list */
-NS_IMETHODIMP
-nsSHistory::GetMaxLength(int32_t* aResult)
-{
-  NS_ENSURE_ARG_POINTER(aResult);
-  *aResult = gHistoryMaxSize;
-  return NS_OK;
-}
-
-/* Set the max size of the history list */
-NS_IMETHODIMP
-nsSHistory::SetMaxLength(int32_t aMaxSize)
-{
-  if (aMaxSize < 0) {
-    return NS_ERROR_ILLEGAL_VALUE;
-  }
-
-  gHistoryMaxSize = aMaxSize;
-  if (mLength > aMaxSize) {
-    PurgeHistory(mLength - aMaxSize);
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHistory::PurgeHistory(int32_t aEntries)
-{
-  if (mLength <= 0 || aEntries <= 0) {
-    return NS_ERROR_FAILURE;
-  }
-
-  aEntries = std::min(aEntries, mLength);
-
-  bool purgeHistory = true;
-  NOTIFY_LISTENERS_CANCELABLE(OnHistoryPurge, purgeHistory,
-                              (aEntries, &purgeHistory));
-
-  if (!purgeHistory) {
-    // Listener asked us not to purge
-    return NS_SUCCESS_LOSS_OF_INSIGNIFICANT_DATA;
-  }
-
-  int32_t cnt = 0;
-  while (cnt < aEntries) {
-    nsCOMPtr<nsISHTransaction> nextTxn;
-    if (mListRoot) {
-      mListRoot->GetNext(getter_AddRefs(nextTxn));
-      mListRoot->SetNext(nullptr);
-    }
-    mListRoot = nextTxn;
-    if (mListRoot) {
-      mListRoot->SetPrev(nullptr);
-    }
-    cnt++;
-  }
-  mLength -= cnt;
-  mIndex -= cnt;
-
-  // Now if we were not at the end of the history, mIndex could have
-  // become far too negative.  If so, just set it to -1.
-  if (mIndex < -1) {
-    mIndex = -1;
-  }
-
-  if (mRootDocShell) {
-    mRootDocShell->HistoryPurged(cnt);
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHistory::AddSHistoryListener(nsISHistoryListener* aListener)
-{
-  NS_ENSURE_ARG_POINTER(aListener);
-
-  // Check if the listener supports Weak Reference. This is a must.
-  // This listener functionality is used by embedders and we want to
-  // have the right ownership with who ever listens to SHistory
-  nsWeakPtr listener = do_GetWeakReference(aListener);
-  if (!listener) {
-    return NS_ERROR_FAILURE;
-  }
-
-  return mListeners.AppendElementUnlessExists(listener) ?
-    NS_OK : NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP
-nsSHistory::RemoveSHistoryListener(nsISHistoryListener* aListener)
-{
-  // Make sure the listener that wants to be removed is the
-  // one we have in store.
-  nsWeakPtr listener = do_GetWeakReference(aListener);
-  mListeners.RemoveElement(listener);
-  return NS_OK;
-}
-
-/* Replace an entry in the History list at a particular index.
- * Do not update index or count.
- */
-NS_IMETHODIMP
-nsSHistory::ReplaceEntry(int32_t aIndex, nsISHEntry* aReplaceEntry)
-{
-  NS_ENSURE_ARG(aReplaceEntry);
-  nsresult rv;
-  nsCOMPtr<nsISHTransaction> currentTxn;
-
-  if (!mListRoot) {
-    // Session History is not initialised.
-    return NS_ERROR_FAILURE;
-  }
-
-  rv = GetTransactionAtIndex(aIndex, getter_AddRefs(currentTxn));
-
-  if (currentTxn) {
-    NOTIFY_LISTENERS(OnHistoryReplaceEntry, (aIndex));
-
-    // Set the replacement entry in the transaction
-    rv = currentTxn->SetSHEntry(aReplaceEntry);
-    rv = currentTxn->SetPersist(true);
-  }
-  return rv;
-}
-
-NS_IMETHODIMP
-nsSHistory::NotifyOnHistoryReload(nsIURI* aReloadURI, uint32_t aReloadFlags,
-                                  bool* aCanReload)
-{
-  NOTIFY_LISTENERS_CANCELABLE(OnHistoryReload, *aCanReload,
-                              (aReloadURI, aReloadFlags, aCanReload));
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHistory::EvictOutOfRangeContentViewers(int32_t aIndex)
-{
-  // Check our per SHistory object limit in the currently navigated SHistory
-  EvictOutOfRangeWindowContentViewers(aIndex);
-  // Check our total limit across all SHistory objects
-  GloballyEvictContentViewers();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHistory::EvictAllContentViewers()
-{
-  // XXXbz we don't actually do a good job of evicting things as we should, so
-  // we might have viewers quite far from mIndex.  So just evict everything.
-  nsCOMPtr<nsISHTransaction> trans = mListRoot;
-  while (trans) {
-    EvictContentViewerForTransaction(trans);
-
-    nsISHTransaction* temp = trans;
-    temp->GetNext(getter_AddRefs(trans));
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHistory::GetCanGoBack(bool* aCanGoBack)
-{
-  NS_ENSURE_ARG_POINTER(aCanGoBack);
-  *aCanGoBack = false;
-
-  int32_t index = -1;
-  NS_ENSURE_SUCCESS(GetIndex(&index), NS_ERROR_FAILURE);
-  if (index > 0) {
-    *aCanGoBack = true;
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHistory::GetCanGoForward(bool* aCanGoForward)
-{
-  NS_ENSURE_ARG_POINTER(aCanGoForward);
-  *aCanGoForward = false;
-
-  int32_t index = -1;
-  int32_t count = -1;
-
-  NS_ENSURE_SUCCESS(GetIndex(&index), NS_ERROR_FAILURE);
-  NS_ENSURE_SUCCESS(GetCount(&count), NS_ERROR_FAILURE);
-
-  if (index >= 0 && index < (count - 1)) {
-    *aCanGoForward = true;
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHistory::GoBack()
-{
-  bool canGoBack = false;
-
-  GetCanGoBack(&canGoBack);
-  if (!canGoBack) {
-    return NS_ERROR_UNEXPECTED;
-  }
-  return LoadEntry(mIndex - 1, nsIDocShellLoadInfo::loadHistory, HIST_CMD_BACK);
-}
-
-NS_IMETHODIMP
-nsSHistory::GoForward()
-{
-  bool canGoForward = false;
-
-  GetCanGoForward(&canGoForward);
-  if (!canGoForward) {
-    return NS_ERROR_UNEXPECTED;
-  }
-  return LoadEntry(mIndex + 1, nsIDocShellLoadInfo::loadHistory,
-                   HIST_CMD_FORWARD);
-}
-
-NS_IMETHODIMP
-nsSHistory::Reload(uint32_t aReloadFlags)
-{
-  nsDocShellInfoLoadType loadType;
-  if (aReloadFlags & nsIWebNavigation::LOAD_FLAGS_BYPASS_PROXY &&
-      aReloadFlags & nsIWebNavigation::LOAD_FLAGS_BYPASS_CACHE) {
-    loadType = nsIDocShellLoadInfo::loadReloadBypassProxyAndCache;
-  } else if (aReloadFlags & nsIWebNavigation::LOAD_FLAGS_BYPASS_PROXY) {
-    loadType = nsIDocShellLoadInfo::loadReloadBypassProxy;
-  } else if (aReloadFlags & nsIWebNavigation::LOAD_FLAGS_BYPASS_CACHE) {
-    loadType = nsIDocShellLoadInfo::loadReloadBypassCache;
-  } else if (aReloadFlags & nsIWebNavigation::LOAD_FLAGS_CHARSET_CHANGE) {
-    loadType = nsIDocShellLoadInfo::loadReloadCharsetChange;
-  } else if (aReloadFlags & nsIWebNavigation::LOAD_FLAGS_ALLOW_MIXED_CONTENT) {
-    loadType = nsIDocShellLoadInfo::loadReloadMixedContent;
-  } else {
-    loadType = nsIDocShellLoadInfo::loadReloadNormal;
-  }
-
-  // We are reloading. Send Reload notifications.
-  // nsDocShellLoadFlagType is not public, where as nsIWebNavigation
-  // is public. So send the reload notifications with the
-  // nsIWebNavigation flags.
-  bool canNavigate = true;
-  nsCOMPtr<nsIURI> currentURI;
-  GetCurrentURI(getter_AddRefs(currentURI));
-  NOTIFY_LISTENERS_CANCELABLE(OnHistoryReload, canNavigate,
-                              (currentURI, aReloadFlags, &canNavigate));
-  if (!canNavigate) {
-    return NS_OK;
-  }
-
-  return LoadEntry(mIndex, loadType, HIST_CMD_RELOAD);
-}
-
-NS_IMETHODIMP
-nsSHistory::ReloadCurrentEntry()
-{
-  // Notify listeners
-  bool canNavigate = true;
-  nsCOMPtr<nsIURI> currentURI;
-  GetCurrentURI(getter_AddRefs(currentURI));
-  NOTIFY_LISTENERS_CANCELABLE(OnHistoryGotoIndex, canNavigate,
-                              (mIndex, currentURI, &canNavigate));
-  if (!canNavigate) {
-    return NS_OK;
-  }
-
-  return LoadEntry(mIndex, nsIDocShellLoadInfo::loadHistory, HIST_CMD_RELOAD);
-}
-
-void
-nsSHistory::EvictOutOfRangeWindowContentViewers(int32_t aIndex)
-{
-  // XXX rename method to EvictContentViewersExceptAroundIndex, or something.
-
-  // We need to release all content viewers that are no longer in the range
-  //
-  //  aIndex - gHistoryMaxViewers to aIndex + gHistoryMaxViewers
-  //
-  // to ensure that this SHistory object isn't responsible for more than
-  // gHistoryMaxViewers content viewers.  But our job is complicated by the
-  // fact that two transactions which are related by either hash navigations or
-  // history.pushState will have the same content viewer.
-  //
-  // To illustrate the issue, suppose gHistoryMaxViewers = 3 and we have four
-  // linked transactions in our history.  Suppose we then add a new content
-  // viewer and call into this function.  So the history looks like:
-  //
-  //   A A A A B
-  //     +     *
-  //
-  // where the letters are content viewers and + and * denote the beginning and
-  // end of the range aIndex +/- gHistoryMaxViewers.
-  //
-  // Although one copy of the content viewer A exists outside the range, we
-  // don't want to evict A, because it has other copies in range!
-  //
-  // We therefore adjust our eviction strategy to read:
-  //
-  //   Evict each content viewer outside the range aIndex -/+
-  //   gHistoryMaxViewers, unless that content viewer also appears within the
-  //   range.
-  //
-  // (Note that it's entirely legal to have two copies of one content viewer
-  // separated by a different content viewer -- call pushState twice, go back
-  // once, and refresh -- so we can't rely on identical viewers only appearing
-  // adjacent to one another.)
-
-  if (aIndex < 0) {
-    return;
-  }
-  NS_ENSURE_TRUE_VOID(aIndex < mLength);
-
-  // Calculate the range that's safe from eviction.
-  int32_t startSafeIndex = std::max(0, aIndex - gHistoryMaxViewers);
-  int32_t endSafeIndex = std::min(mLength, aIndex + gHistoryMaxViewers);
-
-  LOG(("EvictOutOfRangeWindowContentViewers(index=%d), "
-       "mLength=%d. Safe range [%d, %d]",
-       aIndex, mLength, startSafeIndex, endSafeIndex));
-
-  // The content viewers in range aIndex -/+ gHistoryMaxViewers will not be
-  // evicted.  Collect a set of them so we don't accidentally evict one of them
-  // if it appears outside this range.
-  nsCOMArray<nsIContentViewer> safeViewers;
-  nsCOMPtr<nsISHTransaction> trans;
-  GetTransactionAtIndex(startSafeIndex, getter_AddRefs(trans));
-  for (int32_t i = startSafeIndex; trans && i <= endSafeIndex; i++) {
-    nsCOMPtr<nsIContentViewer> viewer = GetContentViewerForTransaction(trans);
-    safeViewers.AppendObject(viewer);
-    nsISHTransaction* temp = trans;
-    temp->GetNext(getter_AddRefs(trans));
-  }
-
-  // Walk the SHistory list and evict any content viewers that aren't safe.
-  GetTransactionAtIndex(0, getter_AddRefs(trans));
-  while (trans) {
-    nsCOMPtr<nsIContentViewer> viewer = GetContentViewerForTransaction(trans);
-    if (safeViewers.IndexOf(viewer) == -1) {
-      EvictContentViewerForTransaction(trans);
-    }
-
-    nsISHTransaction* temp = trans;
-    temp->GetNext(getter_AddRefs(trans));
-  }
-}
-
-namespace {
-
-class TransactionAndDistance
-{
-public:
-  TransactionAndDistance(nsISHTransaction* aTrans, uint32_t aDist)
-    : mTransaction(aTrans)
-    , mDistance(aDist)
-  {
-    mViewer = GetContentViewerForTransaction(aTrans);
-    NS_ASSERTION(mViewer, "Transaction should have a content viewer");
-
-    nsCOMPtr<nsISHEntry> shentry;
-    mTransaction->GetSHEntry(getter_AddRefs(shentry));
-
-    nsCOMPtr<nsISHEntryInternal> shentryInternal = do_QueryInterface(shentry);
-    if (shentryInternal) {
-      shentryInternal->GetLastTouched(&mLastTouched);
-    } else {
-      NS_WARNING("Can't cast to nsISHEntryInternal?");
-      mLastTouched = 0;
-    }
-  }
-
-  bool operator<(const TransactionAndDistance& aOther) const
-  {
-    // Compare distances first, and fall back to last-accessed times.
-    if (aOther.mDistance != this->mDistance) {
-      return this->mDistance < aOther.mDistance;
-    }
-
-    return this->mLastTouched < aOther.mLastTouched;
-  }
-
-  bool operator==(const TransactionAndDistance& aOther) const
-  {
-    // This is a little silly; we need == so the default comaprator can be
-    // instantiated, but this function is never actually called when we sort
-    // the list of TransactionAndDistance objects.
-    return aOther.mDistance == this->mDistance &&
-           aOther.mLastTouched == this->mLastTouched;
-  }
-
-  nsCOMPtr<nsISHTransaction> mTransaction;
-  nsCOMPtr<nsIContentViewer> mViewer;
-  uint32_t mLastTouched;
-  int32_t mDistance;
-};
-
-} // anonymous namespace
-
-// static
-void
-nsSHistory::GloballyEvictContentViewers()
-{
-  // First, collect from each SHistory object the transactions which have a
-  // cached content viewer.  Associate with each transaction its distance from
-  // its SHistory's current index.
-
-  nsTArray<TransactionAndDistance> transactions;
-
-  PRCList* listEntry = PR_LIST_HEAD(&gSHistoryList);
-  while (listEntry != &gSHistoryList) {
-    nsSHistory* shist = static_cast<nsSHistory*>(listEntry);
-
-    // Maintain a list of the transactions which have viewers and belong to
-    // this particular shist object.  We'll add this list to the global list,
-    // |transactions|, eventually.
-    nsTArray<TransactionAndDistance> shTransactions;
-
-    // Content viewers are likely to exist only within shist->mIndex -/+
-    // gHistoryMaxViewers, so only search within that range.
-    //
-    // A content viewer might exist outside that range due to either:
-    //
-    //   * history.pushState or hash navigations, in which case a copy of the
-    //     content viewer should exist within the range, or
-    //
-    //   * bugs which cause us not to call nsSHistory::EvictContentViewers()
-    //     often enough.  Once we do call EvictContentViewers() for the
-    //     SHistory object in question, we'll do a full search of its history
-    //     and evict the out-of-range content viewers, so we don't bother here.
-    //
-    int32_t startIndex = std::max(0, shist->mIndex - gHistoryMaxViewers);
-    int32_t endIndex = std::min(shist->mLength - 1,
-                                shist->mIndex + gHistoryMaxViewers);
-    nsCOMPtr<nsISHTransaction> trans;
-    shist->GetTransactionAtIndex(startIndex, getter_AddRefs(trans));
-    for (int32_t i = startIndex; trans && i <= endIndex; i++) {
-      nsCOMPtr<nsIContentViewer> contentViewer =
-        GetContentViewerForTransaction(trans);
-
-      if (contentViewer) {
-        // Because one content viewer might belong to multiple SHEntries, we
-        // have to search through shTransactions to see if we already know
-        // about this content viewer.  If we find the viewer, update its
-        // distance from the SHistory's index and continue.
-        bool found = false;
-        for (uint32_t j = 0; j < shTransactions.Length(); j++) {
-          TransactionAndDistance& container = shTransactions[j];
-          if (container.mViewer == contentViewer) {
-            container.mDistance = std::min(container.mDistance,
-                                           DeprecatedAbs(i - shist->mIndex));
-            found = true;
-            break;
-          }
-        }
-
-        // If we didn't find a TransactionAndDistance for this content viewer,
-        // make a new one.
-        if (!found) {
-          TransactionAndDistance container(trans,
-                                           DeprecatedAbs(i - shist->mIndex));
-          shTransactions.AppendElement(container);
-        }
-      }
-
-      nsISHTransaction* temp = trans;
-      temp->GetNext(getter_AddRefs(trans));
-    }
-
-    // We've found all the transactions belonging to shist which have viewers.
-    // Add those transactions to our global list and move on.
-    transactions.AppendElements(shTransactions);
-    listEntry = PR_NEXT_LINK(shist);
-  }
-
-  // We now have collected all cached content viewers.  First check that we
-  // have enough that we actually need to evict some.
-  if ((int32_t)transactions.Length() <= sHistoryMaxTotalViewers) {
-    return;
-  }
-
-  // If we need to evict, sort our list of transactions and evict the largest
-  // ones.  (We could of course get better algorithmic complexity here by using
-  // a heap or something more clever.  But sHistoryMaxTotalViewers isn't large,
-  // so let's not worry about it.)
-  transactions.Sort();
-
-  for (int32_t i = transactions.Length() - 1; i >= sHistoryMaxTotalViewers;
-       --i) {
-    EvictContentViewerForTransaction(transactions[i].mTransaction);
-  }
-}
-
-nsresult
-nsSHistory::EvictExpiredContentViewerForEntry(nsIBFCacheEntry* aEntry)
-{
-  int32_t startIndex = std::max(0, mIndex - gHistoryMaxViewers);
-  int32_t endIndex = std::min(mLength - 1, mIndex + gHistoryMaxViewers);
-  nsCOMPtr<nsISHTransaction> trans;
-  GetTransactionAtIndex(startIndex, getter_AddRefs(trans));
-
-  int32_t i;
-  for (i = startIndex; trans && i <= endIndex; ++i) {
-    nsCOMPtr<nsISHEntry> entry;
-    trans->GetSHEntry(getter_AddRefs(entry));
-
-    // Does entry have the same BFCacheEntry as the argument to this method?
-    if (entry->HasBFCacheEntry(aEntry)) {
-      break;
-    }
-
-    nsISHTransaction* temp = trans;
-    temp->GetNext(getter_AddRefs(trans));
-  }
-  if (i > endIndex) {
-    return NS_OK;
-  }
-
-  if (i == mIndex) {
-    NS_WARNING("How did the current SHEntry expire?");
-    return NS_OK;
-  }
-
-  EvictContentViewerForTransaction(trans);
-
-  return NS_OK;
-}
-
-// Evicts all content viewers in all history objects.  This is very
-// inefficient, because it requires a linear search through all SHistory
-// objects for each viewer to be evicted.  However, this method is called
-// infrequently -- only when the disk or memory cache is cleared.
-
-// static
-void
-nsSHistory::GloballyEvictAllContentViewers()
-{
-  int32_t maxViewers = sHistoryMaxTotalViewers;
-  sHistoryMaxTotalViewers = 0;
-  GloballyEvictContentViewers();
-  sHistoryMaxTotalViewers = maxViewers;
-}
-
-void
-GetDynamicChildren(nsISHContainer* aContainer,
-                   nsTArray<uint64_t>& aDocshellIDs,
-                   bool aOnlyTopLevelDynamic)
-{
-  int32_t count = 0;
-  aContainer->GetChildCount(&count);
-  for (int32_t i = 0; i < count; ++i) {
-    nsCOMPtr<nsISHEntry> child;
-    aContainer->GetChildAt(i, getter_AddRefs(child));
-    if (child) {
-      bool dynAdded = false;
-      child->IsDynamicallyAdded(&dynAdded);
-      if (dynAdded) {
-        uint64_t docshellID = 0;
-        child->GetDocshellID(&docshellID);
-        aDocshellIDs.AppendElement(docshellID);
-      }
-      if (!dynAdded || !aOnlyTopLevelDynamic) {
-        nsCOMPtr<nsISHContainer> childAsContainer = do_QueryInterface(child);
-        if (childAsContainer) {
-          GetDynamicChildren(childAsContainer, aDocshellIDs,
-                             aOnlyTopLevelDynamic);
-        }
-      }
-    }
-  }
-}
-
-bool
-RemoveFromSessionHistoryContainer(nsISHContainer* aContainer,
-                                  nsTArray<uint64_t>& aDocshellIDs)
-{
-  nsCOMPtr<nsISHEntry> root = do_QueryInterface(aContainer);
-  NS_ENSURE_TRUE(root, false);
-
-  bool didRemove = false;
-  int32_t childCount = 0;
-  aContainer->GetChildCount(&childCount);
-  for (int32_t i = childCount - 1; i >= 0; --i) {
-    nsCOMPtr<nsISHEntry> child;
-    aContainer->GetChildAt(i, getter_AddRefs(child));
-    if (child) {
-      uint64_t docshelldID = 0;
-      child->GetDocshellID(&docshelldID);
-      if (aDocshellIDs.Contains(docshelldID)) {
-        didRemove = true;
-        aContainer->RemoveChild(child);
-      } else {
-        nsCOMPtr<nsISHContainer> container = do_QueryInterface(child);
-        if (container) {
-          bool childRemoved =
-            RemoveFromSessionHistoryContainer(container, aDocshellIDs);
-          if (childRemoved) {
-            didRemove = true;
-          }
-        }
-      }
-    }
-  }
-  return didRemove;
-}
-
-bool
-RemoveChildEntries(nsISHistory* aHistory, int32_t aIndex,
-                   nsTArray<uint64_t>& aEntryIDs)
-{
-  nsCOMPtr<nsISHEntry> rootHE;
-  aHistory->GetEntryAtIndex(aIndex, false, getter_AddRefs(rootHE));
-  nsCOMPtr<nsISHContainer> root = do_QueryInterface(rootHE);
-  return root ? RemoveFromSessionHistoryContainer(root, aEntryIDs) : false;
-}
-
-bool
-IsSameTree(nsISHEntry* aEntry1, nsISHEntry* aEntry2)
-{
-  if (!aEntry1 && !aEntry2) {
-    return true;
-  }
-  if ((!aEntry1 && aEntry2) || (aEntry1 && !aEntry2)) {
-    return false;
-  }
-  uint32_t id1, id2;
-  aEntry1->GetID(&id1);
-  aEntry2->GetID(&id2);
-  if (id1 != id2) {
-    return false;
-  }
-
-  nsCOMPtr<nsISHContainer> container1 = do_QueryInterface(aEntry1);
-  nsCOMPtr<nsISHContainer> container2 = do_QueryInterface(aEntry2);
-  int32_t count1, count2;
-  container1->GetChildCount(&count1);
-  container2->GetChildCount(&count2);
-  // We allow null entries in the end of the child list.
-  int32_t count = std::max(count1, count2);
-  for (int32_t i = 0; i < count; ++i) {
-    nsCOMPtr<nsISHEntry> child1, child2;
-    container1->GetChildAt(i, getter_AddRefs(child1));
-    container2->GetChildAt(i, getter_AddRefs(child2));
-    if (!IsSameTree(child1, child2)) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-bool
-nsSHistory::RemoveDuplicate(int32_t aIndex, bool aKeepNext)
-{
-  NS_ASSERTION(aIndex >= 0, "aIndex must be >= 0!");
-  NS_ASSERTION(aIndex != 0 || aKeepNext,
-               "If we're removing index 0 we must be keeping the next");
-  NS_ASSERTION(aIndex != mIndex, "Shouldn't remove mIndex!");
-  int32_t compareIndex = aKeepNext ? aIndex + 1 : aIndex - 1;
-  nsCOMPtr<nsISHEntry> root1, root2;
-  GetEntryAtIndex(aIndex, false, getter_AddRefs(root1));
-  GetEntryAtIndex(compareIndex, false, getter_AddRefs(root2));
-  if (IsSameTree(root1, root2)) {
-    nsCOMPtr<nsISHTransaction> txToRemove, txToKeep, txNext, txPrev;
-    GetTransactionAtIndex(aIndex, getter_AddRefs(txToRemove));
-    GetTransactionAtIndex(compareIndex, getter_AddRefs(txToKeep));
-    NS_ENSURE_TRUE(txToRemove, false);
-    NS_ENSURE_TRUE(txToKeep, false);
-    txToRemove->GetNext(getter_AddRefs(txNext));
-    txToRemove->GetPrev(getter_AddRefs(txPrev));
-    txToRemove->SetNext(nullptr);
-    txToRemove->SetPrev(nullptr);
-    if (aKeepNext) {
-      if (txPrev) {
-        txPrev->SetNext(txToKeep);
-      } else {
-        txToKeep->SetPrev(nullptr);
-      }
-    } else {
-      txToKeep->SetNext(txNext);
-    }
-
-    if (aIndex == 0 && aKeepNext) {
-      NS_ASSERTION(txToRemove == mListRoot,
-                   "Transaction at index 0 should be mListRoot!");
-      // We're removing the very first session history transaction!
-      mListRoot = txToKeep;
-    }
-    if (mRootDocShell) {
-      static_cast<nsDocShell*>(mRootDocShell)->HistoryTransactionRemoved(aIndex);
-    }
-
-    // Adjust our indices to reflect the removed transaction
-    if (mIndex > aIndex) {
-      mIndex = mIndex - 1;
-    }
-
-    // NB: If the transaction we are removing is the transaction currently
-    // being navigated to (mRequestedIndex) then we adjust the index
-    // only if we're not keeping the next entry (because if we are keeping
-    // the next entry (because the current is a duplicate of the next), then
-    // that entry slides into the spot that we're currently pointing to.
-    // We don't do this adjustment for mIndex because mIndex cannot equal
-    // aIndex.
-
-    // NB: We don't need to guard on mRequestedIndex being nonzero here,
-    // because either they're strictly greater than aIndex which is at least
-    // zero, or they are equal to aIndex in which case aKeepNext must be true
-    // if aIndex is zero.
-    if (mRequestedIndex > aIndex || (mRequestedIndex == aIndex && !aKeepNext)) {
-      mRequestedIndex = mRequestedIndex - 1;
-    }
-    --mLength;
-    return true;
-  }
-  return false;
-}
-
-NS_IMETHODIMP_(void)
-nsSHistory::RemoveEntries(nsTArray<uint64_t>& aIDs, int32_t aStartIndex)
-{
-  int32_t index = aStartIndex;
-  while (index >= 0 && RemoveChildEntries(this, --index, aIDs)) {
-  }
-  int32_t minIndex = index;
-  index = aStartIndex;
-  while (index >= 0 && RemoveChildEntries(this, index++, aIDs)) {
-  }
-
-  // We need to remove duplicate nsSHEntry trees.
-  bool didRemove = false;
-  while (index > minIndex) {
-    if (index != mIndex) {
-      didRemove = RemoveDuplicate(index, index < mIndex) || didRemove;
-    }
-    --index;
-  }
-  if (didRemove && mRootDocShell) {
-    nsCOMPtr<nsIRunnable> ev =
-      NS_NewRunnableMethod(static_cast<nsDocShell*>(mRootDocShell),
-                           &nsDocShell::FireDummyOnLocationChange);
-    NS_DispatchToCurrentThread(ev);
-  }
-}
-
-void
-nsSHistory::RemoveDynEntries(int32_t aOldIndex, int32_t aNewIndex)
-{
-  // Search for the entries which are in the current index,
-  // but not in the new one.
-  nsCOMPtr<nsISHEntry> originalSH;
-  GetEntryAtIndex(aOldIndex, false, getter_AddRefs(originalSH));
-  nsCOMPtr<nsISHContainer> originalContainer = do_QueryInterface(originalSH);
-  nsAutoTArray<uint64_t, 16> toBeRemovedEntries;
-  if (originalContainer) {
-    nsTArray<uint64_t> originalDynDocShellIDs;
-    GetDynamicChildren(originalContainer, originalDynDocShellIDs, true);
-    if (originalDynDocShellIDs.Length()) {
-      nsCOMPtr<nsISHEntry> currentSH;
-      GetEntryAtIndex(aNewIndex, false, getter_AddRefs(currentSH));
-      nsCOMPtr<nsISHContainer> newContainer = do_QueryInterface(currentSH);
-      if (newContainer) {
-        nsTArray<uint64_t> newDynDocShellIDs;
-        GetDynamicChildren(newContainer, newDynDocShellIDs, false);
-        for (uint32_t i = 0; i < originalDynDocShellIDs.Length(); ++i) {
-          if (!newDynDocShellIDs.Contains(originalDynDocShellIDs[i])) {
-            toBeRemovedEntries.AppendElement(originalDynDocShellIDs[i]);
-          }
-        }
-      }
-    }
-  }
-  if (toBeRemovedEntries.Length()) {
-    RemoveEntries(toBeRemovedEntries, aOldIndex);
-  }
-}
-
-NS_IMETHODIMP
-nsSHistory::UpdateIndex()
-{
-  // Update the actual index with the right value.
-  if (mIndex != mRequestedIndex && mRequestedIndex != -1) {
-    RemoveDynEntries(mIndex, mRequestedIndex);
-    mIndex = mRequestedIndex;
-  }
-
-  mRequestedIndex = -1;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHistory::Stop(uint32_t aStopFlags)
-{
-  // Not implemented
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHistory::GetDocument(nsIDOMDocument** aDocument)
-{
-  // Not implemented
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHistory::GetCurrentURI(nsIURI** aResultURI)
-{
-  NS_ENSURE_ARG_POINTER(aResultURI);
-  nsresult rv;
-
-  nsCOMPtr<nsISHEntry> currentEntry;
-  rv = GetEntryAtIndex(mIndex, false, getter_AddRefs(currentEntry));
-  if (NS_FAILED(rv) && !currentEntry) {
-    return rv;
-  }
-  rv = currentEntry->GetURI(aResultURI);
-  return rv;
-}
-
-NS_IMETHODIMP
-nsSHistory::GetReferringURI(nsIURI** aURI)
-{
-  *aURI = nullptr;
-  // Not implemented
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHistory::SetSessionHistory(nsISHistory* aSessionHistory)
-{
-  // Not implemented
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHistory::GetSessionHistory(nsISHistory** aSessionHistory)
-{
-  // Not implemented
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHistory::LoadURIWithOptions(const char16_t* aURI,
-                               uint32_t aLoadFlags,
-                               nsIURI* aReferringURI,
-                               uint32_t aReferrerPolicy,
-                               nsIInputStream* aPostStream,
-                               nsIInputStream* aExtraHeaderStream,
-                               nsIURI* aBaseURI)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHistory::LoadURI(const char16_t* aURI,
-                    uint32_t aLoadFlags,
-                    nsIURI* aReferringURI,
-                    nsIInputStream* aPostStream,
-                    nsIInputStream* aExtraHeaderStream)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHistory::GotoIndex(int32_t aIndex)
-{
-  return LoadEntry(aIndex, nsIDocShellLoadInfo::loadHistory,
-                   HIST_CMD_GOTOINDEX);
-}
-
-nsresult
-nsSHistory::LoadNextPossibleEntry(int32_t aNewIndex, long aLoadType,
-                                  uint32_t aHistCmd)
-{
-  mRequestedIndex = -1;
-  if (aNewIndex < mIndex) {
-    return LoadEntry(aNewIndex - 1, aLoadType, aHistCmd);
-  }
-  if (aNewIndex > mIndex) {
-    return LoadEntry(aNewIndex + 1, aLoadType, aHistCmd);
-  }
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsSHistory::LoadEntry(int32_t aIndex, long aLoadType, uint32_t aHistCmd)
-{
-  nsCOMPtr<nsIDocShell> docShell;
-  // Keep note of requested history index in mRequestedIndex.
-  mRequestedIndex = aIndex;
-
-  nsCOMPtr<nsISHEntry> prevEntry;
-  GetEntryAtIndex(mIndex, false, getter_AddRefs(prevEntry));
-
-  nsCOMPtr<nsISHEntry> nextEntry;
-  GetEntryAtIndex(mRequestedIndex, false, getter_AddRefs(nextEntry));
-  if (!nextEntry || !prevEntry) {
-    mRequestedIndex = -1;
-    return NS_ERROR_FAILURE;
-  }
-
-  // Remember that this entry is getting loaded at this point in the sequence
-  nsCOMPtr<nsISHEntryInternal> entryInternal = do_QueryInterface(nextEntry);
-
-  if (entryInternal) {
-    entryInternal->SetLastTouched(++gTouchCounter);
-  }
-
-  // Send appropriate listener notifications
-  bool canNavigate = true;
-  // Get the uri for the entry we are about to visit
-  nsCOMPtr<nsIURI> nextURI;
-  nextEntry->GetURI(getter_AddRefs(nextURI));
-
-  if (aHistCmd == HIST_CMD_BACK) {
-    // We are going back one entry. Send GoBack notifications
-    NOTIFY_LISTENERS_CANCELABLE(OnHistoryGoBack, canNavigate,
-                                (nextURI, &canNavigate));
-  } else if (aHistCmd == HIST_CMD_FORWARD) {
-    // We are going forward. Send GoForward notification
-    NOTIFY_LISTENERS_CANCELABLE(OnHistoryGoForward, canNavigate,
-                                (nextURI, &canNavigate));
-  } else if (aHistCmd == HIST_CMD_GOTOINDEX) {
-    // We are going somewhere else. This is not reload either
-    NOTIFY_LISTENERS_CANCELABLE(OnHistoryGotoIndex, canNavigate,
-                                (aIndex, nextURI, &canNavigate));
-  }
-
-  if (!canNavigate) {
-    // If the listener asked us not to proceed with
-    // the operation, simply return.
-    mRequestedIndex = -1;
-    return NS_OK;  // XXX Maybe I can return some other error code?
-  }
-
-  nsCOMPtr<nsIURI> nexturi;
-  int32_t pCount = 0;
-  int32_t nCount = 0;
-  nsCOMPtr<nsISHContainer> prevAsContainer(do_QueryInterface(prevEntry));
-  nsCOMPtr<nsISHContainer> nextAsContainer(do_QueryInterface(nextEntry));
-  if (prevAsContainer && nextAsContainer) {
-    prevAsContainer->GetChildCount(&pCount);
-    nextAsContainer->GetChildCount(&nCount);
-  }
-
-  nsCOMPtr<nsIDocShellLoadInfo> loadInfo;
-  if (mRequestedIndex == mIndex) {
-    // Possibly a reload case
-    docShell = mRootDocShell;
-  } else {
-    // Going back or forward.
-    if (pCount > 0 && nCount > 0) {
-      /* THis is a subframe navigation. Go find
-       * the docshell in which load should happen
-       */
-      bool frameFound = false;
-      nsresult rv = CompareFrames(prevEntry, nextEntry, mRootDocShell,
-                                  aLoadType, &frameFound);
-      if (!frameFound) {
-        // We did not successfully find the subframe in which
-        // the new url was to be loaded. Go further in the history.
-        return LoadNextPossibleEntry(aIndex, aLoadType, aHistCmd);
-      }
-      return rv;
-    } else {
-      // Loading top level page.
-      uint32_t prevID = 0;
-      uint32_t nextID = 0;
-      prevEntry->GetID(&prevID);
-      nextEntry->GetID(&nextID);
-      if (prevID == nextID) {
-        // Try harder to find something new to load.
-        // This may happen for example if some page removed iframes dynamically.
-        return LoadNextPossibleEntry(aIndex, aLoadType, aHistCmd);
-      }
-      docShell = mRootDocShell;
-    }
-  }
-
-  if (!docShell) {
-    // we did not successfully go to the proper index.
-    // return error.
-    mRequestedIndex = -1;
-    return NS_ERROR_FAILURE;
-  }
-
-  // Start the load on the appropriate docshell
-  return InitiateLoad(nextEntry, docShell, aLoadType);
-}
-
-nsresult
-nsSHistory::CompareFrames(nsISHEntry* aPrevEntry, nsISHEntry* aNextEntry,
-                          nsIDocShell* aParent, long aLoadType,
-                          bool* aIsFrameFound)
-{
-  if (!aPrevEntry || !aNextEntry || !aParent) {
-    return NS_ERROR_FAILURE;
-  }
-
-  // We should be comparing only entries which were created for the
-  // same docshell. This is here to just prevent anything strange happening.
-  // This check could be possibly an assertion.
-  uint64_t prevdID, nextdID;
-  aPrevEntry->GetDocshellID(&prevdID);
-  aNextEntry->GetDocshellID(&nextdID);
-  NS_ENSURE_STATE(prevdID == nextdID);
-
-  nsresult result = NS_OK;
-  uint32_t prevID, nextID;
-
-  aPrevEntry->GetID(&prevID);
-  aNextEntry->GetID(&nextID);
-
-  // Check the IDs to verify if the pages are different.
-  if (prevID != nextID) {
-    if (aIsFrameFound) {
-      *aIsFrameFound = true;
-    }
-    // Set the Subframe flag of the entry to indicate that
-    // it is subframe navigation
-    aNextEntry->SetIsSubFrame(true);
-    InitiateLoad(aNextEntry, aParent, aLoadType);
-    return NS_OK;
-  }
-
-  // The root entries are the same, so compare any child frames
-  int32_t pcnt = 0;
-  int32_t ncnt = 0;
-  int32_t dsCount = 0;
-  nsCOMPtr<nsISHContainer> prevContainer(do_QueryInterface(aPrevEntry));
-  nsCOMPtr<nsISHContainer> nextContainer(do_QueryInterface(aNextEntry));
-
-  if (!aParent || !prevContainer || !nextContainer) {
-    return NS_ERROR_FAILURE;
-  }
-
-  prevContainer->GetChildCount(&pcnt);
-  nextContainer->GetChildCount(&ncnt);
-  aParent->GetChildCount(&dsCount);
-
-  // Create an array for child docshells.
-  nsCOMArray<nsIDocShell> docshells;
-  for (int32_t i = 0; i < dsCount; ++i) {
-    nsCOMPtr<nsIDocShellTreeItem> treeItem;
-    aParent->GetChildAt(i, getter_AddRefs(treeItem));
-    nsCOMPtr<nsIDocShell> shell = do_QueryInterface(treeItem);
-    if (shell) {
-      docshells.AppendObject(shell);
-    }
-  }
-
-  // Search for something to load next.
-  for (int32_t i = 0; i < ncnt; ++i) {
-    // First get an entry which may cause a new page to be loaded.
-    nsCOMPtr<nsISHEntry> nChild;
-    nextContainer->GetChildAt(i, getter_AddRefs(nChild));
-    if (!nChild) {
-      continue;
-    }
-    uint64_t docshellID = 0;
-    nChild->GetDocshellID(&docshellID);
-
-    // Then find the associated docshell.
-    nsIDocShell* dsChild = nullptr;
-    int32_t count = docshells.Count();
-    for (int32_t j = 0; j < count; ++j) {
-      uint64_t shellID = 0;
-      nsIDocShell* shell = docshells[j];
-      shell->GetHistoryID(&shellID);
-      if (shellID == docshellID) {
-        dsChild = shell;
-        break;
-      }
-    }
-    if (!dsChild) {
-      continue;
-    }
-
-    // Then look at the previous entries to see if there was
-    // an entry for the docshell.
-    nsCOMPtr<nsISHEntry> pChild;
-    for (int32_t k = 0; k < pcnt; ++k) {
-      nsCOMPtr<nsISHEntry> child;
-      prevContainer->GetChildAt(k, getter_AddRefs(child));
-      if (child) {
-        uint64_t dID = 0;
-        child->GetDocshellID(&dID);
-        if (dID == docshellID) {
-          pChild = child;
-          break;
-        }
-      }
-    }
-
-    // Finally recursively call this method.
-    // This will either load a new page to shell or some subshell or
-    // do nothing.
-    CompareFrames(pChild, nChild, dsChild, aLoadType, aIsFrameFound);
-  }
-  return result;
-}
-
-nsresult
-nsSHistory::InitiateLoad(nsISHEntry* aFrameEntry, nsIDocShell* aFrameDS,
-                         long aLoadType)
-{
-  NS_ENSURE_STATE(aFrameDS && aFrameEntry);
-
-  nsCOMPtr<nsIDocShellLoadInfo> loadInfo;
-
-  /* Set the loadType in the SHEntry too to  what was passed on.
-   * This will be passed on to child subframes later in nsDocShell,
-   * so that proper loadType is maintained through out a frameset
-   */
-  aFrameEntry->SetLoadType(aLoadType);
-  aFrameDS->CreateLoadInfo(getter_AddRefs(loadInfo));
-
-  loadInfo->SetLoadType(aLoadType);
-  loadInfo->SetSHEntry(aFrameEntry);
-
-  nsCOMPtr<nsIURI> nextURI;
-  aFrameEntry->GetURI(getter_AddRefs(nextURI));
-  // Time   to initiate a document load
-  return aFrameDS->LoadURI(nextURI, loadInfo,
-                           nsIWebNavigation::LOAD_FLAGS_NONE, false);
-
-}
-
-NS_IMETHODIMP
-nsSHistory::SetRootDocShell(nsIDocShell* aDocShell)
-{
-  mRootDocShell = aDocShell;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHistory::GetSHistoryEnumerator(nsISimpleEnumerator** aEnumerator)
-{
-  NS_ENSURE_ARG_POINTER(aEnumerator);
-  nsRefPtr<nsSHEnumerator> iterator = new nsSHEnumerator(this);
-  iterator.forget(aEnumerator);
-  return NS_OK;
-}
-
-nsSHEnumerator::nsSHEnumerator(nsSHistory* aSHistory) : mIndex(-1)
-{
-  mSHistory = aSHistory;
-}
-
-nsSHEnumerator::~nsSHEnumerator()
-{
-  mSHistory = nullptr;
-}
-
-NS_IMPL_ISUPPORTS(nsSHEnumerator, nsISimpleEnumerator)
-
-NS_IMETHODIMP
-nsSHEnumerator::HasMoreElements(bool* aReturn)
-{
-  int32_t cnt;
-  *aReturn = false;
-  mSHistory->GetCount(&cnt);
-  if (mIndex >= -1 && mIndex < (cnt - 1)) {
-    *aReturn = true;
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEnumerator::GetNext(nsISupports** aItem)
-{
-  NS_ENSURE_ARG_POINTER(aItem);
-  int32_t cnt = 0;
-
-  nsresult result = NS_ERROR_FAILURE;
-  mSHistory->GetCount(&cnt);
-  if (mIndex < (cnt - 1)) {
-    mIndex++;
-    nsCOMPtr<nsISHEntry> hEntry;
-    result = mSHistory->GetEntryAtIndex(mIndex, false, getter_AddRefs(hEntry));
-    if (hEntry) {
-      result = CallQueryInterface(hEntry, aItem);
-    }
-  }
-  return result;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/src/nsSHistory.h firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/src/nsSHistory.h
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/src/nsSHistory.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/src/nsSHistory.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,119 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nsSHistory_h
-#define nsSHistory_h
-
-#include "nsCOMPtr.h"
-#include "nsISHistory.h"
-#include "nsISHistoryInternal.h"
-#include "nsIWebNavigation.h"
-#include "nsISimpleEnumerator.h"
-#include "nsTObserverArray.h"
-#include "nsWeakPtr.h"
-
-#include "prclist.h"
-
-class nsIDocShell;
-class nsSHEnumerator;
-class nsSHistoryObserver;
-class nsISHEntry;
-class nsISHTransaction;
-
-class nsSHistory final : public PRCList,
-                         public nsISHistory,
-                         public nsISHistoryInternal,
-                         public nsIWebNavigation
-{
-public:
-  nsSHistory();
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSISHISTORY
-  NS_DECL_NSISHISTORYINTERNAL
-  NS_DECL_NSIWEBNAVIGATION
-
-  // One time initialization method called upon docshell module construction
-  static nsresult Startup();
-  static void Shutdown();
-  static void UpdatePrefs();
-
-  // Max number of total cached content viewers.  If the pref
-  // browser.sessionhistory.max_total_viewers is negative, then
-  // this value is calculated based on the total amount of memory.
-  // Otherwise, it comes straight from the pref.
-  static uint32_t GetMaxTotalViewers() { return sHistoryMaxTotalViewers; }
-
-protected:
-  virtual ~nsSHistory();
-  friend class nsSHEnumerator;
-  friend class nsSHistoryObserver;
-
-  // Could become part of nsIWebNavigation
-  NS_IMETHOD GetTransactionAtIndex(int32_t aIndex, nsISHTransaction** aResult);
-  nsresult CompareFrames(nsISHEntry* aPrevEntry, nsISHEntry* aNextEntry,
-                         nsIDocShell* aRootDocShell, long aLoadType,
-                         bool* aIsFrameFound);
-  nsresult InitiateLoad(nsISHEntry* aFrameEntry, nsIDocShell* aFrameDS,
-                        long aLoadType);
-
-  NS_IMETHOD LoadEntry(int32_t aIndex, long aLoadType, uint32_t aHistCmd);
-
-#ifdef DEBUG
-  nsresult PrintHistory();
-#endif
-
-  // Evict content viewers in this window which don't lie in the "safe" range
-  // around aIndex.
-  void EvictOutOfRangeWindowContentViewers(int32_t aIndex);
-  static void GloballyEvictContentViewers();
-  static void GloballyEvictAllContentViewers();
-
-  // Calculates a max number of total
-  // content viewers to cache, based on amount of total memory
-  static uint32_t CalcMaxTotalViewers();
-
-  void RemoveDynEntries(int32_t aOldIndex, int32_t aNewIndex);
-
-  nsresult LoadNextPossibleEntry(int32_t aNewIndex, long aLoadType,
-                                 uint32_t aHistCmd);
-
-protected:
-  // aIndex is the index of the transaction which may be removed.
-  // If aKeepNext is true, aIndex is compared to aIndex + 1,
-  // otherwise comparison is done to aIndex - 1.
-  bool RemoveDuplicate(int32_t aIndex, bool aKeepNext);
-
-  nsCOMPtr<nsISHTransaction> mListRoot;
-  int32_t mIndex;
-  int32_t mLength;
-  int32_t mRequestedIndex;
-  // Session History listeners
-  nsAutoTObserverArray<nsWeakPtr, 2> mListeners;
-  // Weak reference. Do not refcount this.
-  nsIDocShell* mRootDocShell;
-
-  // Max viewers allowed total, across all SHistory objects
-  static int32_t sHistoryMaxTotalViewers;
-};
-
-class nsSHEnumerator : public nsISimpleEnumerator
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSISIMPLEENUMERATOR
-
-  explicit nsSHEnumerator(nsSHistory* aHistory);
-
-protected:
-  friend class nsSHistory;
-  virtual ~nsSHEnumerator();
-
-private:
-  int32_t mIndex;
-  nsSHistory* mSHistory;
-};
-
-#endif /* nsSHistory */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/src/nsSHTransaction.cpp firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/src/nsSHTransaction.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/src/nsSHTransaction.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/src/nsSHTransaction.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsSHTransaction.h"
-#include "nsISHEntry.h"
-
-nsSHTransaction::nsSHTransaction()
-  : mPersist(true)
-  , mPrev(nullptr)
-{
-}
-
-nsSHTransaction::~nsSHTransaction()
-{
-}
-
-NS_IMPL_ADDREF(nsSHTransaction)
-NS_IMPL_RELEASE(nsSHTransaction)
-
-NS_INTERFACE_MAP_BEGIN(nsSHTransaction)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISHTransaction)
-  NS_INTERFACE_MAP_ENTRY(nsISHTransaction)
-NS_INTERFACE_MAP_END
-
-NS_IMETHODIMP
-nsSHTransaction::Create(nsISHEntry* aSHEntry, nsISHTransaction* aPrev)
-{
-  SetSHEntry(aSHEntry);
-  if (aPrev) {
-    aPrev->SetNext(this);
-  }
-
-  SetPrev(aPrev);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHTransaction::GetSHEntry(nsISHEntry** aResult)
-{
-  NS_ENSURE_ARG_POINTER(aResult);
-  *aResult = mSHEntry;
-  NS_IF_ADDREF(*aResult);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHTransaction::SetSHEntry(nsISHEntry* aSHEntry)
-{
-  mSHEntry = aSHEntry;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHTransaction::GetNext(nsISHTransaction** aResult)
-{
-  NS_ENSURE_ARG_POINTER(aResult);
-  *aResult = mNext;
-  NS_IF_ADDREF(*aResult);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHTransaction::SetNext(nsISHTransaction* aNext)
-{
-  if (aNext) {
-    NS_ENSURE_SUCCESS(aNext->SetPrev(this), NS_ERROR_FAILURE);
-  }
-
-  mNext = aNext;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHTransaction::SetPrev(nsISHTransaction* aPrev)
-{
-  /* This is weak reference to parent. Do not Addref it */
-  mPrev = aPrev;
-  return NS_OK;
-}
-
-nsresult
-nsSHTransaction::GetPrev(nsISHTransaction** aResult)
-{
-  NS_ENSURE_ARG_POINTER(aResult);
-  *aResult = mPrev;
-  NS_IF_ADDREF(*aResult);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHTransaction::SetPersist(bool aPersist)
-{
-  mPersist = aPersist;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHTransaction::GetPersist(bool* aPersist)
-{
-  NS_ENSURE_ARG_POINTER(aPersist);
-
-  *aPersist = mPersist;
-  return NS_OK;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/src/nsSHTransaction.h firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/src/nsSHTransaction.h
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/shistory/src/nsSHTransaction.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/shistory/src/nsSHTransaction.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nsSHTransaction_h
-#define nsSHTransaction_h
-
-// Helper Classes
-#include "nsCOMPtr.h"
-
-// Needed interfaces
-#include "nsISHTransaction.h"
-
-class nsISHEntry;
-
-class nsSHTransaction : public nsISHTransaction
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSISHTRANSACTION
-
-  nsSHTransaction();
-
-protected:
-  virtual ~nsSHTransaction();
-
-protected:
-  bool mPersist;
-
-  nsISHTransaction* mPrev;  // Weak Reference
-  nsCOMPtr<nsISHTransaction> mNext;
-  nsCOMPtr<nsISHEntry> mSHEntry;
-};
-
-#endif /* nsSHTransaction_h */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/test/browser/browser_bug503832.js firefox-trunk-41.0~a1~hg20150524r245419/docshell/test/browser/browser_bug503832.js
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/test/browser/browser_bug503832.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/test/browser/browser_bug503832.js	2015-05-25 20:43:11.000000000 +0000
@@ -2,53 +2,51 @@
  * https://bugzilla.mozilla.org/show_bug.cgi?id=503832
  */
 
-function test() {
-    waitForExplicitFinish();
-
+add_task(function* () {
     var pagetitle = "Page Title for Bug 503832";
     var pageurl = "http://mochi.test:8888/browser/docshell/test/browser/file_bug503832.html";
     var fragmenturl = "http://mochi.test:8888/browser/docshell/test/browser/file_bug503832.html#firefox";
 
-    /* Global history observer that triggers for the two test URLs above. */
-    var historyObserver = {
-        onBeginUpdateBatch: function() {},
-        onEndUpdateBatch: function() {},
-        onVisit: function(aURI, aVisitID, aTime, aSessionId, aReferringId,
-                          aTransitionType, _added) {},
-        onTitleChanged: function(aURI, aPageTitle) {
-            aURI = aURI.spec;
-            switch (aURI) {
-            case pageurl:
-                is(aPageTitle, pagetitle, "Correct page title for " + aURI);
-                return;
-            case fragmenturl:
-                is(aPageTitle, pagetitle, "Correct page title for " + aURI);
-                // If titles for fragment URLs aren't set, this code
-                // branch won't be called and the test will timeout,
-                // resulting in a failure
-                historyService.removeObserver(historyObserver, false);
-
-                gBrowser.removeCurrentTab();
+    var historyService = Cc["@mozilla.org/browser/nav-history-service;1"]
+                         .getService(Ci.nsINavHistoryService);
 
-                finish();
+    let fragmentPromise = new Promise(resolve => {
+        /* Global history observer that triggers for the two test URLs above. */
+        var historyObserver = {
+            onBeginUpdateBatch: function() {},
+            onEndUpdateBatch: function() {},
+            onVisit: function(aURI, aVisitID, aTime, aSessionId, aReferringId,
+                              aTransitionType, _added) {},
+            onTitleChanged: function(aURI, aPageTitle) {
+                aURI = aURI.spec;
+                switch (aURI) {
+                case pageurl:
+                    is(aPageTitle, pagetitle, "Correct page title for " + aURI);
+                    return;
+                case fragmenturl:
+                    is(aPageTitle, pagetitle, "Correct page title for " + aURI);
+                    // If titles for fragment URLs aren't set, this code
+                    // branch won't be called and the test will timeout,
+                    // resulting in a failure
+                    historyService.removeObserver(historyObserver, false);
+                    resolve();
+                }
+            },
+            onDeleteURI: function(aURI) {},
+            onClearHistory: function() {},
+            onPageChanged: function(aURI, aWhat, aValue) {},
+            onDeleteVisits: function () {},
+            QueryInterface: function(iid) {
+                if (iid.equals(Ci.nsINavHistoryObserver) ||
+                    iid.equals(Ci.nsISupports)) {
+                    return this;
+                }
+                throw Cr.NS_ERROR_NO_INTERFACE;
             }
-        },
-        onDeleteURI: function(aURI) {},
-        onClearHistory: function() {},
-        onPageChanged: function(aURI, aWhat, aValue) {},
-        onDeleteVisits: function () {},
-        QueryInterface: function(iid) {
-            if (iid.equals(Ci.nsINavHistoryObserver) ||
-                iid.equals(Ci.nsISupports)) {
-                return this;
-            }
-            throw Cr.NS_ERROR_NO_INTERFACE;
-        }
-    };
+        };
 
-    var historyService = Cc["@mozilla.org/browser/nav-history-service;1"]
-                         .getService(Ci.nsINavHistoryService);
-    historyService.addObserver(historyObserver, false);
+        historyService.addObserver(historyObserver, false);
+    });
 
     /* Queries nsINavHistoryService and returns a single history entry
      * for a given URI */
@@ -71,18 +69,6 @@
         return node;
     }
 
-
-    function onPageLoad() {
-        gBrowser.selectedBrowser.removeEventListener(
-            "DOMContentLoaded", onPageLoad, true);
-
-        // Now that the page is loaded, click on fragment link
-        EventUtils.sendMouseEvent({type:'click'}, 'firefox-link',
-                                  gBrowser.selectedBrowser.contentWindow);
-
-        // Test finishes in historyObserver.onTitleChanged() above
-    }
-
     // Make sure neither of the test pages haven't been loaded before.
     var info = getNavHistoryEntry(makeURI(pageurl));
     ok(!info, "The test page must not have been visited already.");
@@ -90,8 +76,12 @@
     ok(!info, "The fragment test page must not have been visited already.");
 
     // Now open the test page in a new tab
-    gBrowser.selectedTab = gBrowser.addTab();
-    gBrowser.selectedBrowser.addEventListener(
-        "DOMContentLoaded", onPageLoad, true);
-    content.location = pageurl;
-}
+    yield BrowserTestUtils.openNewForegroundTab(gBrowser, pageurl);
+
+    // Now that the page is loaded, click on fragment link
+    yield BrowserTestUtils.synthesizeMouseAtCenter("#firefox-link", {},
+                                                   gBrowser.selectedBrowser);
+    yield fragmentPromise;
+
+    gBrowser.removeCurrentTab();
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/test/browser/browser.ini firefox-trunk-41.0~a1~hg20150524r245419/docshell/test/browser/browser.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/test/browser/browser.ini	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/test/browser/browser.ini	2015-05-25 20:43:11.000000000 +0000
@@ -80,7 +80,7 @@
 [browser_bug441169.js]
 skip-if = buildapp == 'mulet'
 [browser_bug503832.js]
-skip-if = buildapp == 'mulet' || e10s # Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
+skip-if = buildapp == 'mulet'
 [browser_bug554155.js]
 [browser_bug655270.js]
 skip-if = e10s # Bug ?????? - PlacesUtils.history.addObserver notifications don't seem to fire
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/test/browser/browser_timelineMarkers-frame-04.js firefox-trunk-41.0~a1~hg20150524r245419/docshell/test/browser/browser_timelineMarkers-frame-04.js
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/test/browser/browser_timelineMarkers-frame-04.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/test/browser/browser_timelineMarkers-frame-04.js	2015-05-25 20:43:11.000000000 +0000
@@ -26,6 +26,8 @@
     // cause.
     let jsMarkers = markers.filter(m => m.name == "Javascript" && m.causeName);
     ok(jsMarkers.length > 0, "Got some Javascript markers");
+    is(jsMarkers[0].stack.functionDisplayName, "do_xhr",
+       "Javascript marker has entry point name");
   }
 }];
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/docshell/test/chrome/docshell_helpers.js firefox-trunk-41.0~a1~hg20150524r245419/docshell/test/chrome/docshell_helpers.js
--- firefox-trunk-41.0~a1~hg20150513r243603/docshell/test/chrome/docshell_helpers.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/docshell/test/chrome/docshell_helpers.js	2015-05-25 20:43:11.000000000 +0000
@@ -1,7 +1,7 @@
 /**  
  * Import common SimpleTest methods so that they're usable in this window.
  */
-var imports = [ "SimpleTest", "is", "isnot", "ise", "ok", "onerror", "todo",
+var imports = [ "SimpleTest", "is", "isnot", "ok", "onerror", "todo",
   "todo_is", "todo_isnot" ];
 for each (var name in imports) {
   window[name] = window.opener.wrappedJSObject[name];
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/activities/ActivitiesService.jsm firefox-trunk-41.0~a1~hg20150524r245419/dom/activities/ActivitiesService.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/activities/ActivitiesService.jsm	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/activities/ActivitiesService.jsm	2015-05-25 20:43:12.000000000 +0000
@@ -427,13 +427,16 @@
         break;
 
       case "Activities:Register":
-        let self = this;
         this.db.add(msg,
           function onSuccess(aEvent) {
+            debug("Activities:Register:OK");
+            Services.obs.notifyObservers(null, "new-activity-registered-success", null);
             mm.sendAsyncMessage("Activities:Register:OK", null);
           },
           function onError(aEvent) {
             msg.error = "REGISTER_ERROR";
+            debug("Activities:Register:KO");
+            Services.obs.notifyObservers(null, "new-activity-registered-failure", null);
             mm.sendAsyncMessage("Activities:Register:KO", msg);
           });
         break;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/activities/Activity.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/activities/Activity.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/activities/Activity.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/activities/Activity.cpp	2015-05-25 20:43:12.000000000 +0000
@@ -68,10 +68,18 @@
   mProxy = do_CreateInstance("@mozilla.org/dom/activities/proxy;1", &rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
+  // We're about the pass the dictionary to a JS-implemented component, so
+  // rehydrate it in a system scode so that security wrappers don't get in the
+  // way. See bug 1161748 comment 16.
+  bool ok;
   JS::Rooted<JS::Value> optionsValue(aCx);
-  if (!ToJSValue(aCx, aOptions, &optionsValue)) {
-    return NS_ERROR_FAILURE;
+  {
+    JSAutoCompartment ac(aCx, xpc::PrivilegedJunkScope());
+    ok = ToJSValue(aCx, aOptions, &optionsValue);
+    NS_ENSURE_TRUE(ok, NS_ERROR_FAILURE);
   }
+  ok = JS_WrapValue(aCx, &optionsValue);
+  NS_ENSURE_TRUE(ok, NS_ERROR_FAILURE);
 
   mProxy->StartActivity(static_cast<nsIDOMDOMRequest*>(this), optionsValue, aWindow);
   return NS_OK;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/activities/tests/mochi/test_dev_mode_activity.html firefox-trunk-41.0~a1~hg20150524r245419/dom/activities/tests/mochi/test_dev_mode_activity.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/activities/tests/mochi/test_dev_mode_activity.html	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/activities/tests/mochi/test_dev_mode_activity.html	2015-05-25 20:43:12.000000000 +0000
@@ -184,8 +184,14 @@
   }
 }
 
+var obsService = Cc["@mozilla.org/observer-service;1"]
+                   .getService(Ci.nsIObserverService);
+
+obsService.addObserver(continueTest, "new-activity-registered-success", false);
+obsService.addObserver(continueTest, "new-activity-registered-failure", false);
+
 /**
-  * Test exporting and importing hosted and packaged apps.
+  * Test dev mode activity.
   */
 function runTest() {
   SpecialPowers.setAllAppsLaunchable(true);
@@ -227,6 +233,9 @@
   var systemApp = request.result;
   ok(systemApp, "systemApp is non-null");
 
+  // yielding for the activity install observer.
+  yield undefined;
+
   activity = new MozActivity({ name: "import-app" });
   activity.onerror = function() {
     ok(true, "2) No dev mode, system app installed");
@@ -241,6 +250,9 @@
   var otherApp = request.result;
   ok(otherApp, "otherApp is non-null");
 
+  // yielding for the activity install observer.
+  yield undefined;
+
   activity = new MozActivity({ name: "import-app" });
   activity.onerror = function() {
     ok(true, "3) No dev mode, system app and other app installed");
@@ -249,7 +261,7 @@
   activity.onsuccess = unexpectedSuccess("3) No dev mode, system app and other app installed");
   yield undefined;
 
-  // 4) Dev mode, no system app installed.
+  // 4) Dev mode, system app and other app installed.
   SpecialPowers.pushPrefEnv(
         {'set': [["dom.apps.developer_mode", true]]},
         continueTest);
@@ -260,8 +272,8 @@
     ok(true, "4) Dev mode, system app and other app installed");
     continueTest();
   }
-  activity.onerror = function(aError) {
-    ok(false, "Got error: " + aError.name);
+  activity.onerror = function(aEvent) {
+    ok(false, "4) Got error: " + aEvent.error.name);
     finish();
   }
   yield undefined;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/animation/Animation.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/animation/Animation.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/animation/Animation.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/animation/Animation.cpp	2015-05-25 20:43:12.000000000 +0000
@@ -89,7 +89,7 @@
     mReady->MaybeResolve(this);
   }
 
-  UpdateTiming();
+  UpdateTiming(SeekFlag::NoSeek);
   PostUpdate();
 }
 
@@ -120,14 +120,17 @@
   SilentlySetCurrentTime(aSeekTime);
 
   if (mPendingState == PendingState::PausePending) {
-    CancelPendingTasks();
+    // Finish the pause operation
+    mHoldTime.SetValue(aSeekTime);
+    mStartTime.SetNull();
+
     if (mReady) {
       mReady->MaybeResolve(this);
     }
+    CancelPendingTasks();
   }
 
-  UpdateFinishedState(true);
-  UpdateEffect();
+  UpdateTiming(SeekFlag::DidSeek);
   PostUpdate();
 }
 
@@ -199,7 +202,7 @@
   }
   if (!mFinished) {
     aRv.Throw(NS_ERROR_FAILURE);
-  } else if (IsFinished()) {
+  } else if (PlayState() == AnimationPlayState::Finished) {
     mFinished->MaybeResolve(this);
   }
   return mFinished;
@@ -227,27 +230,46 @@
 
   SetCurrentTime(limit);
 
-  if (mPendingState == PendingState::PlayPending) {
+  // If we are paused or play-pending we need to fill in the start time in
+  // order to transition to the finished state.
+  //
+  // We only do this, however, if we have an active timeline. If we have an
+  // inactive timeline we can't transition into the finished state just like
+  // we can't transition to the running state (this finished state is really
+  // a substate of the running state).
+  if (mStartTime.IsNull() &&
+      mTimeline &&
+      !mTimeline->GetCurrentTime().IsNull()) {
+    mStartTime.SetValue(mTimeline->GetCurrentTime().Value() -
+                        limit.MultDouble(1.0 / mPlaybackRate));
+  }
+
+  // If we just resolved the start time for a pause-pending animation, we need
+  // to clear the task. We don't do this as a branch of the above however since
+  // we can have a play-pending animation with a resolved start time if we
+  // aborted a pause operation.
+  if (mPendingState == PendingState::PlayPending &&
+      !mStartTime.IsNull()) {
     CancelPendingTasks();
     if (mReady) {
       mReady->MaybeResolve(this);
     }
   }
-  UpdateFinishedState(true);
+  UpdateTiming(SeekFlag::DidSeek);
   PostUpdate();
 }
 
 void
-Animation::Play(LimitBehavior aLimitBehavior)
+Animation::Play(ErrorResult& aRv, LimitBehavior aLimitBehavior)
 {
-  DoPlay(aLimitBehavior);
+  DoPlay(aRv, aLimitBehavior);
   PostUpdate();
 }
 
 void
-Animation::Pause()
+Animation::Pause(ErrorResult& aRv)
 {
-  DoPause();
+  DoPause(aRv);
   PostUpdate();
 }
 
@@ -311,7 +333,7 @@
     FinishPendingAt(mTimeline->GetCurrentTime().Value());
   }
 
-  UpdateTiming();
+  UpdateTiming(SeekFlag::NoSeek);
 }
 
 void
@@ -532,7 +554,7 @@
     mEffect->ComposeStyle(aStyleRule, aSetProperties);
 
     if (updatedHoldTime) {
-      UpdateTiming();
+      UpdateTiming(SeekFlag::NoSeek);
     }
 
     mFinishedAtLastComposeStyle = (playState == AnimationPlayState::Finished);
@@ -541,16 +563,10 @@
 
 // http://w3c.github.io/web-animations/#play-an-animation
 void
-Animation::DoPlay(LimitBehavior aLimitBehavior)
+Animation::DoPlay(ErrorResult& aRv, LimitBehavior aLimitBehavior)
 {
   bool abortedPause = mPendingState == PendingState::PausePending;
 
-  bool reuseReadyPromise = false;
-  if (mPendingState != PendingState::NotPending) {
-    CancelPendingTasks();
-    reuseReadyPromise = true;
-  }
-
   Nullable<TimeDuration> currentTime = GetCurrentTime();
   if (mPlaybackRate > 0.0 &&
       (currentTime.IsNull() ||
@@ -563,11 +579,21 @@
               (aLimitBehavior == LimitBehavior::AutoRewind &&
                (currentTime.Value().ToMilliseconds() <= 0.0 ||
                 currentTime.Value() > EffectEnd())))) {
+    if (EffectEnd() == TimeDuration::Forever()) {
+      aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
+      return;
+    }
     mHoldTime.SetValue(TimeDuration(EffectEnd()));
   } else if (mPlaybackRate == 0.0 && currentTime.IsNull()) {
     mHoldTime.SetValue(TimeDuration(0));
   }
 
+  bool reuseReadyPromise = false;
+  if (mPendingState != PendingState::NotPending) {
+    CancelPendingTasks();
+    reuseReadyPromise = true;
+  }
+
   // If the hold time is null then we're either already playing normally (and
   // we can ignore this call) or we aborted a pending pause operation (in which
   // case, for consistency, we need to go through the motions of doing an
@@ -576,10 +602,18 @@
     return;
   }
 
-  // Clear the start time until we resolve a new one (unless we are aborting
-  // a pending pause operation, in which case we keep the old start time so
-  // that the animation continues moving uninterrupted by the aborted pause).
-  if (!abortedPause) {
+  // Clear the start time until we resolve a new one. We do this except
+  // for the case where we are aborting a pause and don't have a hold time.
+  //
+  // If we're aborting a pause and *do* have a hold time (e.g. because
+  // the animation is finished or we just applied the auto-rewind behavior
+  // above) we should respect it by clearing the start time. If we *don't*
+  // have a hold time we should keep the current start time so that the
+  // the animation continues moving uninterrupted by the aborted pause.
+  //
+  // (If we're not aborting a pause, mHoldTime must be resolved by now
+  //  or else we would have returned above.)
+  if (!mHoldTime.IsNull()) {
     mStartTime.SetNull();
   }
 
@@ -600,17 +634,30 @@
   tracker->AddPlayPending(*this);
 
   // We may have updated the current time when we set the hold time above.
-  UpdateTiming();
+  UpdateTiming(SeekFlag::NoSeek);
 }
 
 // http://w3c.github.io/web-animations/#pause-an-animation
 void
-Animation::DoPause()
+Animation::DoPause(ErrorResult& aRv)
 {
   if (IsPausedOrPausing()) {
     return;
   }
 
+  // If we are transitioning from idle, fill in the current time
+  if (GetCurrentTime().IsNull()) {
+    if (mPlaybackRate >= 0.0) {
+      mHoldTime.SetValue(TimeDuration(0));
+    } else {
+      if (EffectEnd() == TimeDuration::Forever()) {
+        aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
+        return;
+      }
+      mHoldTime.SetValue(TimeDuration(EffectEnd()));
+    }
+  }
+
   bool reuseReadyPromise = false;
   if (mPendingState == PendingState::PlayPending) {
     CancelPendingTasks();
@@ -638,7 +685,7 @@
   PendingAnimationTracker* tracker = doc->GetOrCreatePendingAnimationTracker();
   tracker->AddPausePending(*this);
 
-  UpdateFinishedState();
+  UpdateTiming(SeekFlag::NoSeek);
 }
 
 void
@@ -666,7 +713,7 @@
   }
   mPendingState = PendingState::NotPending;
 
-  UpdateTiming();
+  UpdateTiming(SeekFlag::NoSeek);
 
   if (mReady) {
     mReady->MaybeResolve(this);
@@ -686,7 +733,7 @@
   mStartTime.SetNull();
   mPendingState = PendingState::NotPending;
 
-  UpdateTiming();
+  UpdateTiming(SeekFlag::NoSeek);
 
   if (mReady) {
     mReady->MaybeResolve(this);
@@ -694,16 +741,16 @@
 }
 
 void
-Animation::UpdateTiming()
+Animation::UpdateTiming(SeekFlag aSeekFlag)
 {
   // We call UpdateFinishedState before UpdateEffect because the former
   // can change the current time, which is used by the latter.
-  UpdateFinishedState();
+  UpdateFinishedState(aSeekFlag);
   UpdateEffect();
 }
 
 void
-Animation::UpdateFinishedState(bool aSeekFlag)
+Animation::UpdateFinishedState(SeekFlag aSeekFlag)
 {
   Nullable<TimeDuration> currentTime = GetCurrentTime();
   TimeDuration effectEnd = TimeDuration(EffectEnd());
@@ -713,7 +760,7 @@
     if (mPlaybackRate > 0.0 &&
         !currentTime.IsNull() &&
         currentTime.Value() >= effectEnd) {
-      if (aSeekFlag) {
+      if (aSeekFlag == SeekFlag::DidSeek) {
         mHoldTime = currentTime;
       } else if (!mPreviousCurrentTime.IsNull()) {
         mHoldTime.SetValue(std::max(mPreviousCurrentTime.Value(), effectEnd));
@@ -723,14 +770,14 @@
     } else if (mPlaybackRate < 0.0 &&
                !currentTime.IsNull() &&
                currentTime.Value().ToMilliseconds() <= 0.0) {
-      if (aSeekFlag) {
+      if (aSeekFlag == SeekFlag::DidSeek) {
         mHoldTime = currentTime;
       } else {
         mHoldTime.SetValue(0);
       }
     } else if (mPlaybackRate != 0.0 &&
                !currentTime.IsNull()) {
-      if (aSeekFlag && !mHoldTime.IsNull()) {
+      if (aSeekFlag == SeekFlag::DidSeek && !mHoldTime.IsNull()) {
         mStartTime.SetValue(mTimeline->GetCurrentTime().Value() -
                               (mHoldTime.Value().MultDouble(1 / mPlaybackRate)));
       }
@@ -738,7 +785,7 @@
     }
   }
 
-  bool currentFinishedState = IsFinished();
+  bool currentFinishedState = PlayState() == AnimationPlayState::Finished;
   if (currentFinishedState && !mIsPreviousStateFinished) {
     if (mFinished) {
       mFinished->MaybeResolve(this);
@@ -807,19 +854,6 @@
 }
 
 bool
-Animation::IsFinished() const
-{
-  // Unfortunately there's some weirdness in the spec at the moment where if
-  // you're finished and paused, the playState is paused. This prevents us
-  // from just checking |PlayState() == AnimationPlayState::Finished| here,
-  // and we need this much more messy check to see if we're finished.
-  Nullable<TimeDuration> currentTime = GetCurrentTime();
-  return !currentTime.IsNull() &&
-      ((mPlaybackRate > 0.0 && currentTime.Value() >= EffectEnd()) ||
-       (mPlaybackRate < 0.0 && currentTime.Value().ToMilliseconds() <= 0.0));
-}
-
-bool
 Animation::IsPossiblyOrphanedPendingAnimation() const
 {
   // Check if we are pending but might never start because we are not being
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/animation/Animation.h firefox-trunk-41.0~a1~hg20150524r245419/dom/animation/Animation.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/animation/Animation.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/animation/Animation.h	2015-05-25 20:43:12.000000000 +0000
@@ -101,8 +101,8 @@
   virtual Promise* GetFinished(ErrorResult& aRv);
   void Cancel();
   virtual void Finish(ErrorResult& aRv);
-  virtual void Play(LimitBehavior aLimitBehavior);
-  virtual void Pause();
+  virtual void Play(ErrorResult& aRv, LimitBehavior aLimitBehavior);
+  virtual void Pause(ErrorResult& aRv);
   bool IsRunningOnCompositor() const { return mIsRunningOnCompositor; }
 
   // Wrapper functions for Animation DOM methods when called
@@ -117,13 +117,16 @@
   void SetCurrentTimeAsDouble(const Nullable<double>& aCurrentTime,
                               ErrorResult& aRv);
   virtual AnimationPlayState PlayStateFromJS() const { return PlayState(); }
-  virtual void PlayFromJS() { Play(LimitBehavior::AutoRewind); }
+  virtual void PlayFromJS(ErrorResult& aRv)
+  {
+    Play(aRv, LimitBehavior::AutoRewind);
+  }
   /**
    * PauseFromJS is currently only here for symmetry with PlayFromJS but
    * in future we will likely have to flush style in
    * CSSAnimation::PauseFromJS so we leave it for now.
    */
-  void PauseFromJS() { Pause(); }
+  void PauseFromJS(ErrorResult& aRv) { Pause(aRv); }
   // Wrapper functions for Animation DOM methods when called from style.
   //
   // Typically these DOM methods also notify style of changes but when
@@ -243,9 +246,8 @@
    * "Playing" is different to "running". An animation in its delay phase is
    * still running but we only consider it playing when it is in its active
    * interval. This definition is used for fetching the animations that are
-   * are candidates for running on the compositor (since we don't ship
-   * animations to the compositor when they are in their delay phase or
-   * paused).
+   * candidates for running on the compositor (since we don't ship animations
+   * to the compositor when they are in their delay phase or paused).
    */
   bool IsPlaying() const
   {
@@ -281,8 +283,8 @@
   void SilentlySetCurrentTime(const TimeDuration& aNewCurrentTime);
   void SilentlySetPlaybackRate(double aPlaybackRate);
   void DoCancel();
-  void DoPlay(LimitBehavior aLimitBehavior);
-  void DoPause();
+  void DoPlay(ErrorResult& aRv, LimitBehavior aLimitBehavior);
+  void DoPause(ErrorResult& aRv);
   void ResumeAt(const TimeDuration& aReadyTime);
   void PauseAt(const TimeDuration& aReadyTime);
   void FinishPendingAt(const TimeDuration& aReadyTime)
@@ -296,11 +298,21 @@
     }
   }
 
-  void UpdateTiming();
-  void UpdateFinishedState(bool aSeekFlag = false);
+  /**
+   * Finishing behavior depends on if changes to timing occurred due
+   * to a seek or regular playback.
+   */
+  enum class SeekFlag {
+    NoSeek,
+    DidSeek
+  };
+
+  void UpdateTiming(SeekFlag aSeekFlag);
+  void UpdateFinishedState(SeekFlag aSeekFlag);
   void UpdateEffect();
   void FlushStyle() const;
   void PostUpdate();
+
   /**
    * Remove this animation from the pending animation tracker and reset
    * mPendingState as necessary. The caller is responsible for resolving or
@@ -308,8 +320,6 @@
    */
   void CancelPendingTasks();
 
-  bool IsFinished() const;
-
   bool IsPossiblyOrphanedPendingAnimation() const;
   StickyTimeDuration EffectEnd() const;
 
@@ -327,7 +337,7 @@
   Nullable<TimeDuration> mPreviousCurrentTime; // Animation timescale
   double mPlaybackRate;
 
-  // A Promise that is replaced on each call to Play() (and in future Pause())
+  // A Promise that is replaced on each call to Play()
   // and fulfilled when Play() is successfully completed.
   // This object is lazily created by GetReady.
   // See http://w3c.github.io/web-animations/#current-ready-promise
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/animation/KeyframeEffect.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/animation/KeyframeEffect.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/animation/KeyframeEffect.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/animation/KeyframeEffect.cpp	2015-05-25 20:43:12.000000000 +0000
@@ -54,9 +54,9 @@
   }
 }
 
-// In the Web Animations model, the time fraction can be outside the range
+// In the Web Animations model, the iteration progress can be outside the range
 // [0.0, 1.0] but it shouldn't be Infinity.
-const double ComputedTiming::kNullTimeFraction = PositiveInfinity<double>();
+const double ComputedTiming::kNullProgress = PositiveInfinity<double>();
 
 namespace dom {
 
@@ -125,7 +125,7 @@
     result.mPhase = ComputedTiming::AnimationPhase_After;
     if (!aTiming.FillsForwards()) {
       // The animation isn't active or filling at this time.
-      result.mTimeFraction = ComputedTiming::kNullTimeFraction;
+      result.mProgress = ComputedTiming::kNullProgress;
       return result;
     }
     activeTime = result.mActiveDuration;
@@ -138,7 +138,7 @@
     result.mPhase = ComputedTiming::AnimationPhase_Before;
     if (!aTiming.FillsBackwards()) {
       // The animation isn't active or filling at this time.
-      result.mTimeFraction = ComputedTiming::kNullTimeFraction;
+      result.mProgress = ComputedTiming::kNullProgress;
       return result;
     }
     // activeTime is zero
@@ -180,19 +180,18 @@
 
   // Normalize the iteration time into a fraction of the iteration duration.
   if (result.mPhase == ComputedTiming::AnimationPhase_Before) {
-    result.mTimeFraction = 0.0;
+    result.mProgress = 0.0;
   } else if (result.mPhase == ComputedTiming::AnimationPhase_After) {
-    result.mTimeFraction = isEndOfFinalIteration
-                         ? 1.0
-                         : fmod(aTiming.mIterationCount, 1.0f);
+    result.mProgress = isEndOfFinalIteration
+                       ? 1.0
+                       : fmod(aTiming.mIterationCount, 1.0f);
   } else {
     // We are in the active phase so the iteration duration can't be zero.
     MOZ_ASSERT(aTiming.mIterationDuration != zeroDuration,
                "In the active phase of a zero-duration animation?");
-    result.mTimeFraction =
-      aTiming.mIterationDuration == TimeDuration::Forever()
-      ? 0.0
-      : iterationTime / aTiming.mIterationDuration;
+    result.mProgress = aTiming.mIterationDuration == TimeDuration::Forever()
+                       ? 0.0
+                       : iterationTime / aTiming.mIterationDuration;
   }
 
   bool thisIterationReverse = false;
@@ -211,7 +210,7 @@
       break;
   }
   if (thisIterationReverse) {
-    result.mTimeFraction = 1.0 - result.mTimeFraction;
+    result.mProgress = 1.0 - result.mProgress;
   }
 
   return result;
@@ -267,7 +266,7 @@
   }
 
   ComputedTiming computedTiming = GetComputedTiming();
-  return computedTiming.mTimeFraction != ComputedTiming::kNullTimeFraction;
+  return computedTiming.mProgress != ComputedTiming::kNullProgress;
 }
 
 const AnimationProperty*
@@ -306,15 +305,15 @@
 {
   ComputedTiming computedTiming = GetComputedTiming();
 
-  // If the time fraction is null, we don't have fill data for the current
+  // If the progress is null, we don't have fill data for the current
   // time so we shouldn't animate.
-  if (computedTiming.mTimeFraction == ComputedTiming::kNullTimeFraction) {
+  if (computedTiming.mProgress == ComputedTiming::kNullProgress) {
     return;
   }
 
-  MOZ_ASSERT(0.0 <= computedTiming.mTimeFraction &&
-             computedTiming.mTimeFraction <= 1.0,
-             "timing fraction should be in [0-1]");
+  MOZ_ASSERT(0.0 <= computedTiming.mProgress &&
+             computedTiming.mProgress <= 1.0,
+             "iteration progress should be in [0-1]");
 
   for (size_t propIdx = 0, propEnd = mProperties.Length();
        propIdx != propEnd; ++propIdx)
@@ -351,11 +350,11 @@
     // FIXME: Maybe cache the current segment?
     const AnimationPropertySegment *segment = prop.mSegments.Elements(),
                                 *segmentEnd = segment + prop.mSegments.Length();
-    while (segment->mToKey < computedTiming.mTimeFraction) {
+    while (segment->mToKey < computedTiming.mProgress) {
       MOZ_ASSERT(segment->mFromKey < segment->mToKey, "incorrect keys");
       ++segment;
       if (segment == segmentEnd) {
-        MOZ_ASSERT_UNREACHABLE("incorrect time fraction");
+        MOZ_ASSERT_UNREACHABLE("incorrect iteration progress");
         break; // in order to continue in outer loop (just below)
       }
       MOZ_ASSERT(segment->mFromKey == (segment-1)->mToKey, "incorrect keys");
@@ -375,7 +374,7 @@
     }
 
     double positionInSegment =
-      (computedTiming.mTimeFraction - segment->mFromKey) /
+      (computedTiming.mProgress - segment->mFromKey) /
       (segment->mToKey - segment->mFromKey);
     double valuePosition =
       segment->mTimingFunction.GetValue(positionInSegment);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/animation/KeyframeEffect.h firefox-trunk-41.0~a1~hg20150524r245419/dom/animation/KeyframeEffect.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/animation/KeyframeEffect.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/animation/KeyframeEffect.h	2015-05-25 20:43:12.000000000 +0000
@@ -72,24 +72,25 @@
 struct ComputedTiming
 {
   ComputedTiming()
-    : mTimeFraction(kNullTimeFraction)
+    : mProgress(kNullProgress)
     , mCurrentIteration(0)
     , mPhase(AnimationPhase_Null)
   { }
 
-  static const double kNullTimeFraction;
+  static const double kNullProgress;
 
   // The total duration of the animation including all iterations.
   // Will equal StickyTimeDuration::Forever() if the animation repeats
   // indefinitely.
   StickyTimeDuration mActiveDuration;
 
-  // Will be kNullTimeFraction if the animation is neither animating nor
+  // Progress towards the end of the current iteration. If the effect is
+  // being sampled backwards, this will go from 1.0 to 0.0.
+  // Will be kNullProgress if the animation is neither animating nor
   // filling at the sampled time.
-  double mTimeFraction;
+  double mProgress;
 
-  // Zero-based iteration index (meaningless if mTimeFraction is
-  // kNullTimeFraction).
+  // Zero-based iteration index (meaningless if mProgress is kNullProgress).
   uint64_t mCurrentIteration;
 
   enum {
@@ -275,9 +276,9 @@
   // active duration are calculated. All other members of the returned object
   // are given a null/initial value.
   //
-  // This function returns ComputedTiming::kNullTimeFraction for the
-  // mTimeFraction member of the return value if the animation should not be
-  // run (because it is not currently active and is not filling at this time).
+  // This function returns ComputedTiming::kNullProgress for the mProgress
+  // member of the return value if the animation should not be run
+  // (because it is not currently active and is not filling at this time).
   static ComputedTiming
   GetComputedTimingAt(const Nullable<TimeDuration>& aLocalTime,
                       const AnimationTiming& aTiming);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/animation/test/css-animations/file_animation-currenttime.html firefox-trunk-41.0~a1~hg20150524r245419/dom/animation/test/css-animations/file_animation-currenttime.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/animation/test/css-animations/file_animation-currenttime.html	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/animation/test/css-animations/file_animation-currenttime.html	2015-05-25 20:43:12.000000000 +0000
@@ -542,6 +542,29 @@
                 'The currentTime of a cancelled animation should be null');
 }, 'Animation.currentTime after cancelling');
 
+async_test(function(t) {
+  var div = addDiv(t, {'class': 'animated-div'});
+  div.style.animation = 'anim 100s';
+
+  var animation = div.getAnimations()[0];
+  animation.ready.then(t.step_func(function() {
+    animation.finish();
+
+    // Initiate a pause then abort it
+    animation.pause();
+    animation.play();
+
+    // Wait to return to running state
+    return animation.ready;
+  })).then(t.step_func(function() {
+    assert_true(animation.currentTime < 100 * 1000,
+                'After aborting a pause when finished, the currentTime should'
+                + ' jump back towards the start of the animation');
+    t.done();
+  }));
+}, 'After aborting a pause when finished, the call to play() should rewind'
+   + ' the current time');
+
 done();
     </script>
   </body>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/animation/test/css-animations/file_animation-finished.html firefox-trunk-41.0~a1~hg20150524r245419/dom/animation/test/css-animations/file_animation-finished.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/animation/test/css-animations/file_animation-finished.html	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/animation/test/css-animations/file_animation-finished.html	2015-05-25 20:43:12.000000000 +0000
@@ -48,7 +48,7 @@
 
   var previousFinishedPromise = animation.finished;
 
-  animation.currentTime = ANIM_DURATION;
+  animation.finish();
 
   animation.finished.then(t.step_func(function() {
     assert_equals(animation.finished, previousFinishedPromise,
@@ -73,7 +73,7 @@
 
   var previousFinishedPromise;
 
-  animation.currentTime = ANIM_DURATION;
+  animation.finish();
 
   animation.finished.then(t.step_func(function() {
     previousFinishedPromise = animation.finished;
@@ -100,7 +100,7 @@
 
   var previousFinishedPromise = animation.finished;
 
-  animation.currentTime = ANIM_DURATION;
+  animation.finish();
 
   animation.finished.then(t.step_func(function() {
     animation.currentTime = ANIM_DURATION + 1000;
@@ -117,6 +117,59 @@
   div.style.animation = ANIM_PROP_VAL;
   var animation = div.getAnimations()[0];
 
+  // Setup callback to run if finished promise is resolved
+  var finishPromiseResolved = false;
+  animation.finished.then(function() {
+    finishPromiseResolved = true;
+  });
+
+  animation.ready.then(t.step_func(function() {
+    // Jump to mid-way in interval and pause
+    animation.currentTime = ANIM_DURATION / 2;
+    animation.pause();
+    return animation.ready;
+  })).then(t.step_func(function() {
+    // Jump to the end
+    // (But don't use finish() since that should unpause as well)
+    animation.currentTime = ANIM_DURATION;
+    return waitForAnimationFrames(2);
+  })).then(t.step_func(function() {
+    assert_false(finishPromiseResolved,
+                 'Finished promise should not resolve when paused');
+    t.done();
+  }));
+}, 'Finished promise does not resolve when paused');
+
+async_test(function(t) {
+  var div = addDiv(t);
+  div.style.animation = ANIM_PROP_VAL;
+  var animation = div.getAnimations()[0];
+
+  // Setup callback to run if finished promise is resolved
+  var finishPromiseResolved = false;
+  animation.finished.then(function() {
+    finishPromiseResolved = true;
+  });
+
+  animation.ready.then(t.step_func(function() {
+    // Jump to mid-way in interval and pause
+    animation.currentTime = ANIM_DURATION / 2;
+    animation.pause();
+    // Jump to the end
+    animation.currentTime = ANIM_DURATION;
+    return waitForAnimationFrames(2);
+  })).then(t.step_func(function() {
+    assert_false(finishPromiseResolved,
+                 'Finished promise should not resolve when pause-pending');
+    t.done();
+  }));
+}, 'Finished promise does not resolve when pause-pending');
+
+async_test(function(t) {
+  var div = addDiv(t);
+  div.style.animation = ANIM_PROP_VAL;
+  var animation = div.getAnimations()[0];
+
   animation.currentTime = ANIM_DURATION;
   animation.finished.then(t.step_func(function(resolvedAnimation) {
     assert_equals(resolvedAnimation, animation,
@@ -223,11 +276,11 @@
     animation.cancel();
     assert_not_equals(animation.finished, previousFinishedPromise,
                       'A new finished promise should be created when'
-                      + ' cancelling a finished player');
+                      + ' cancelling a finished animation');
   })).then(t.step_func(function() {
     t.done();
   }));
-}, 'cancelling an already-finished player replaces the finished promise');
+}, 'cancelling an already-finished animation replaces the finished promise');
 
 async_test(function(t) {
   var div = addDiv(t);
@@ -250,7 +303,7 @@
   assert_not_equals(animation.finished, previousFinishedPromise,
                     'A redundant call to cancel() should still generate a new'
                     + ' finished promise');
-}, 'cancelling an idle player still replaces the finished promise');
+}, 'cancelling an idle animation still replaces the finished promise');
 
 async_test(function(t) {
   var div = addDiv(t);
@@ -260,26 +313,32 @@
   const HALF_DUR = ANIM_DURATION / 2;
   const QUARTER_DUR = ANIM_DURATION / 4;
 
-  animation.currentTime = HALF_DUR;
-  div.style.animationDuration = QUARTER_DUR + 'ms';
-  // Animation should now be finished
+  var gotNextFrame = false;
+  var currentTimeBeforeShortening;
 
-  // Below we use gotNextFrame to check that shortening of the animation
-  // duration causes the finished promise to resolve, rather than it just
-  // getting resolved on the next animation frame. This relies on the fact
-  // that the promises are resolved as a micro-task before the next frame
-  // happens.
+  animation.currentTime = HALF_DUR;
+  animation.ready.then(t.step_func(function() {
+    currentTimeBeforeShortening = animation.currentTime;
 
-  window.getComputedStyle(div).animationDuration; // flush style
-  var gotNextFrame = false;
-  waitForFrame().then(function() {
-    gotNextFrame = true;
-  });
+    div.style.animationDuration = QUARTER_DUR + 'ms';
+    window.getComputedStyle(div).animationDuration; // flush style
+    // Animation should now be finished
+
+    // Below we use gotNextFrame to check that shortening of the animation
+    // duration causes the finished promise to resolve, rather than it just
+    // getting resolved on the next animation frame. This relies on the fact
+    // that the promises are resolved as a micro-task before the next frame
+    // happens.
+
+    waitForFrame().then(function() {
+      gotNextFrame = true;
+    });
 
-  animation.finished.then(t.step_func(function() {
+    return animation.finished;
+  })).then(t.step_func(function() {
     assert_false(gotNextFrame, 'shortening of the animation duration should ' +
                                'resolve the finished promise');
-    assert_equals(animation.currentTime, HALF_DUR,
+    assert_equals(animation.currentTime, currentTimeBeforeShortening,
                   'currentTime should be unchanged when duration shortened');
     var previousFinishedPromise = animation.finished;
     div.style.animationDuration = ANIM_DURATION + 'ms'; // now active again
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/animation/test/css-animations/file_animation-finish.html firefox-trunk-41.0~a1~hg20150524r245419/dom/animation/test/css-animations/file_animation-finish.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/animation/test/css-animations/file_animation-finish.html	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/animation/test/css-animations/file_animation-finish.html	2015-05-25 20:43:12.000000000 +0000
@@ -121,24 +121,108 @@
                   'should be set back to zero');
     t.done();
   }));
-}, 'Test finishing of reversed animation with with a current time less ' +
-   'than zero');
+}, 'Test finishing of reversed animation with a current time less than zero');
 
 async_test(function(t) {
   var div = addDiv(t);
+  div.style.animation = ANIM_PROP_VAL + ' paused';
+  var animation = div.getAnimations()[0];
+
+  animation.ready.then(t.step_func(function() {
+    animation.finish();
+    assert_equals(animation.playState, 'finished',
+                  'The play state of a paused animation should become ' +
+                  '"finished" after finish() is called');
+    assert_approx_equals(animation.startTime,
+                         animation.timeline.currentTime - ANIM_DURATION,
+                         0.0001,
+                         'The start time of a paused animation should be set ' +
+                         'after calling finish()');
+    t.done();
+  }));
+}, 'Test finish() while paused');
+
+test(function(t) {
+  var div = addDiv(t);
+  div.style.animation = ANIM_PROP_VAL + ' paused';
+  var animation = div.getAnimations()[0];
+
+  // Update playbackRate so we can test that the calculated startTime
+  // respects it
+  animation.playbackRate = 2;
+
+  // While animation is still pause-pending call finish()
+  animation.finish();
+
+  assert_equals(animation.playState, 'finished',
+                'The play state of a pause-pending animation should become ' +
+                '"finished" after finish() is called');
+  assert_approx_equals(animation.startTime,
+                       animation.timeline.currentTime - ANIM_DURATION / 2,
+                       0.0001,
+                       'The start time of a pause-pending animation should ' +
+                       'be set after calling finish()');
+}, 'Test finish() while pause-pending with positive playbackRate');
+
+test(function(t) {
+  var div = addDiv(t);
+  div.style.animation = ANIM_PROP_VAL + ' paused';
+  var animation = div.getAnimations()[0];
+
+  animation.playbackRate = -2;
+  animation.finish();
+
+  assert_equals(animation.playState, 'finished',
+                'The play state of a pause-pending animation should become ' +
+                '"finished" after finish() is called');
+  assert_equals(animation.startTime, animation.timeline.currentTime,
+                'The start time of a pause-pending animation should be ' +
+                'set after calling finish()');
+}, 'Test finish() while pause-pending with negative playbackRate');
+
+test(function(t) {
+  var div = addDiv(t);
   div.style.animation = ANIM_PROP_VAL;
   var animation = div.getAnimations()[0];
 
-  animation.pause();
+  animation.playbackRate = 0.5;
+  animation.finish();
+
+  assert_equals(animation.playState, 'finished',
+                'The play state of a play-pending animation should become ' +
+                '"finished" after finish() is called');
+  assert_approx_equals(animation.startTime,
+                       animation.timeline.currentTime - ANIM_DURATION / 0.5,
+                       0.0001,
+                       'The start time of a play-pending animation should ' +
+                       'be set after calling finish()');
+}, 'Test finish() while play-pending');
+
+// FIXME: Add a test for when we are play-pending without an active timeline.
+// - In that case even after calling finish() we should still be pending but
+//   the current time should be updated
+
+async_test(function(t) {
+  var div = addDiv(t);
+  div.style.animation = ANIM_PROP_VAL;
+  var animation = div.getAnimations()[0];
 
   animation.ready.then(t.step_func(function() {
+    // Trigger pause
+    animation.pause();
+    // Then abort
+    animation.play();
+
+    // We are now in the unusual situation of being play-pending whilst having
+    // a resolved start time. Check that finish() still triggers a transition
+    // to the finished state immediately.
     animation.finish();
-    assert_equals(animation.playState, 'paused',
-                  'The play state of a paused animation should remain ' +
-                  '"paused" even after finish() is called');
+    assert_equals(animation.playState, 'finished',
+                  'After aborting a pause then calling finish() the play ' +
+                  'state of an animation should become "finished" immediately');
     t.done();
   }));
-}, 'Test paused state after finishing of animation');
+}, 'Test finish() during aborted pause');
 
 async_test(function(t) {
   var div = addDiv(t, {'class': 'animated-div'});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/animation/test/css-animations/file_animation-pausing.html firefox-trunk-41.0~a1~hg20150524r245419/dom/animation/test/css-animations/file_animation-pausing.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/animation/test/css-animations/file_animation-pausing.html	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/animation/test/css-animations/file_animation-pausing.html	2015-05-25 20:43:12.000000000 +0000
@@ -186,8 +186,14 @@
 
     // Set current time
     animation.currentTime = 5000;
-    assert_equals(animation.playState, 'running',
-                  'Animation is running immediately after setting currentTime');
+    assert_equals(animation.playState, 'paused',
+                  'Animation is paused immediately after setting currentTime');
+    assert_equals(animation.startTime, null,
+                  'Animation startTime is unresolved immediately after ' +
+                  'setting currentTime');
+    assert_equals(animation.currentTime, 5000,
+                  'Animation currentTime does not change when forcing a ' +
+                  'pause operation to complete');
 
     // The ready promise should now be resolved. If it's not then test will
     // probably time out before anything else happens that causes it to resolve.
@@ -195,7 +201,61 @@
   })).then(t.step_func(function() {
     t.done();
   }));
-}, 'Setting the current time cancels a pending pause');
+}, 'Setting the current time completes a pending pause');
+
+async_test(function(t) {
+  var div = addDiv(t, { style: 'animation: anim 1000s' });
+  var animation = div.getAnimations()[0];
+
+  // Go to idle state then pause
+  animation.cancel();
+  animation.pause();
+
+  assert_equals(animation.currentTime, 0, 'currentTime is set to 0');
+  assert_equals(animation.startTime, null, 'startTime is not set');
+  assert_equals(animation.playState, 'pending', 'initially pause-pending');
+
+  // Check it still resolves as expected
+  animation.ready.then(t.step_func(function() {
+    assert_equals(animation.playState, 'paused',
+                  'resolves to paused state asynchronously');
+    assert_equals(animation.currentTime, 0,
+                  'keeps the initially set currentTime');
+    t.done();
+  }));
+}, 'pause() from idle');
+
+async_test(function(t) {
+  var div = addDiv(t, { style: 'animation: anim 1000s' });
+  var animation = div.getAnimations()[0];
+
+  animation.cancel();
+  animation.playbackRate = -1;
+  animation.pause();
+
+  assert_equals(animation.currentTime, 1000 * 1000,
+                'currentTime is set to the effect end');
+
+  animation.ready.then(t.step_func(function() {
+    assert_equals(animation.currentTime, 1000 * 1000,
+                  'keeps the initially set currentTime');
+    t.done();
+  }));
+}, 'pause() from idle with a negative playbackRate');
+
+test(function(t) {
+  var div = addDiv(t, { style: 'animation: anim 1000s infinite' });
+  var animation = div.getAnimations()[0];
+
+  animation.cancel();
+  animation.playbackRate = -1;
+
+  assert_throws('InvalidStateError',
+                function () { animation.pause(); },
+                'Expect InvalidStateError exception on calling pause() ' +
+                'from idle with a negative playbackRate and ' +
+                'infinite-duration animation');
+}, 'pause() from idle with a negative playbackRate and endless effect');
 
 done();
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/animation/test/css-animations/file_animation-play.html firefox-trunk-41.0~a1~hg20150524r245419/dom/animation/test/css-animations/file_animation-play.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/animation/test/css-animations/file_animation-play.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/animation/test/css-animations/file_animation-play.html	2015-05-25 20:43:12.000000000 +0000
@@ -0,0 +1,35 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src="../testcommon.js"></script>
+<style>
+@keyframes abc {
+  to { transform: translate(10px) }
+}
+</style>
+<body>
+<script>
+'use strict';
+
+async_test(function(t) {
+  var div = addDiv(t, { style: 'animation: abc 100s infinite' });
+  var animation = div.getAnimations()[0];
+
+  animation.ready.then(t.step_func(function() {
+    // Seek to a time outside the active range so that play() will have to
+    // snap back to the start
+    animation.currentTime = -5000;
+    animation.playbackRate = -1;
+
+    assert_throws('InvalidStateError',
+                  function () { animation.play(); },
+                  'Expect InvalidStateError exception on calling play() ' +
+                  'with a negative playbackRate and infinite-duration ' +
+                  'animation');
+    t.done();
+  }));
+}, 'play() throws when seeking an infinite-duration animation played in ' +
+   'reverse');
+
+done();
+</script>
+</body>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/animation/test/css-animations/test_animation-play.html firefox-trunk-41.0~a1~hg20150524r245419/dom/animation/test/css-animations/test_animation-play.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/animation/test/css-animations/test_animation-play.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/animation/test/css-animations/test_animation-play.html	2015-05-25 20:43:12.000000000 +0000
@@ -0,0 +1,15 @@
+<!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';
+setup({explicit_done: true});
+SpecialPowers.pushPrefEnv(
+  { "set": [["dom.animations-api.core.enabled", true]]},
+  function() {
+    window.open("file_animation-play.html");
+  });
+</script>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/animation/test/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/animation/test/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/animation/test/mochitest.ini	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/animation/test/mochitest.ini	2015-05-25 20:43:12.000000000 +0000
@@ -14,6 +14,8 @@
 support-files = css-animations/file_animation-finished.html
 [css-animations/test_animation-pausing.html]
 support-files = css-animations/file_animation-pausing.html
+[css-animations/test_animation-play.html]
+support-files = css-animations/file_animation-play.html
 [css-animations/test_animation-playstate.html]
 support-files = css-animations/file_animation-playstate.html
 [css-animations/test_animation-ready.html]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/animation/test/testcommon.js firefox-trunk-41.0~a1~hg20150524r245419/dom/animation/test/testcommon.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/animation/test/testcommon.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/animation/test/testcommon.js	2015-05-25 20:43:12.000000000 +0000
@@ -80,7 +80,7 @@
 for (var funcName of ["async_test", "assert_not_equals", "assert_equals",
                       "assert_approx_equals", "assert_less_than_equal",
                       "assert_between_inclusive", "assert_true", "assert_false",
-                      "test"]) {
+                      "assert_throws", "test"]) {
   window[funcName] = opener[funcName].bind(opener);
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/apps/AppsServiceChild.jsm firefox-trunk-41.0~a1~hg20150524r245419/dom/apps/AppsServiceChild.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/apps/AppsServiceChild.jsm	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/apps/AppsServiceChild.jsm	2015-05-25 20:43:12.000000000 +0000
@@ -103,12 +103,6 @@
       this.cpmm.addMessageListener(aMsgName, this);
     }).bind(this));
 
-    this.resetList();
-
-    Services.obs.addObserver(this, "xpcom-shutdown", false);
-  },
-
-  resetList: function() {
     this.cpmm.sendAsyncMessage("Webapps:RegisterForMessages", {
       messages: APPS_IPC_MSG_NAMES
     });
@@ -116,7 +110,6 @@
     // We need to prime the cache with the list of apps.
     let list = this.cpmm.sendSyncMessage("Webapps:GetList", { })[0];
     this.webapps = list.webapps;
-
     // We need a fast mapping from localId -> app, so we add an index.
     // We also add the manifest to the app object.
     this.localIdIndex = { };
@@ -125,6 +118,8 @@
       this.localIdIndex[app.localId] = app;
       app.manifest = list.manifests[id];
     }
+
+    Services.obs.addObserver(this, "xpcom-shutdown", false);
   },
 
   observe: function(aSubject, aTopic, aData) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/apps/AppsUtils.jsm firefox-trunk-41.0~a1~hg20150524r245419/dom/apps/AppsUtils.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/apps/AppsUtils.jsm	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/apps/AppsUtils.jsm	2015-05-25 20:43:12.000000000 +0000
@@ -696,17 +696,13 @@
       let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
       file.initWithPath(aPath);
 
-      let channel = NetUtil.newChannel2(file,
-                                        null,
-                                        null,
-                                        null,      // aLoadingNode
-                                        Services.scriptSecurityManager.getSystemPrincipal(),
-                                        null,      // aTriggeringPrincipal
-                                        Ci.nsILoadInfo.SEC_NORMAL,
-                                        Ci.nsIContentPolicy.TYPE_OTHER);
+      let channel = NetUtil.newChannel({
+        uri: NetUtil.newURI(file),
+        loadUsingSystemPrincipal: true});
+
       channel.contentType = "application/json";
 
-      NetUtil.asyncFetch2(channel, function(aStream, aResult) {
+      NetUtil.asyncFetch(channel, function(aStream, aResult) {
         if (!Components.isSuccessCode(aResult)) {
           deferred.resolve(null);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/apps/ImportExport.jsm firefox-trunk-41.0~a1~hg20150524r245419/dom/apps/ImportExport.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/apps/ImportExport.jsm	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/apps/ImportExport.jsm	2015-05-25 20:43:12.000000000 +0000
@@ -14,6 +14,8 @@
 Cu.import("resource://gre/modules/Promise.jsm");
 Cu.import("resource://gre/modules/Webapps.jsm");
 
+Cu.importGlobalProperties(['File']);
+
 XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
   "resource://gre/modules/FileUtils.jsm");
 
@@ -284,7 +286,7 @@
       throw "NoBlobFound";
     }
 
-    let isFileBlob = aBlob instanceof Ci.nsIDOMFile;
+    let isFileBlob = aBlob instanceof File;
     // We can't QI the DOMFile to nsIFile, so we need to create one.
     let zipFile = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
     if (!isFileBlob) {
@@ -498,7 +500,7 @@
       throw "NoBlobFound";
     }
 
-    let isFileBlob = aBlob instanceof Ci.nsIDOMFile;
+    let isFileBlob = aBlob instanceof File;
     // We can't QI the DOMFile to nsIFile, so we need to create one.
     let zipFile = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
     if (!isFileBlob) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/apps/OfflineCacheInstaller.jsm firefox-trunk-41.0~a1~hg20150524r245419/dom/apps/OfflineCacheInstaller.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/apps/OfflineCacheInstaller.jsm	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/apps/OfflineCacheInstaller.jsm	2015-05-25 20:43:12.000000000 +0000
@@ -91,16 +91,12 @@
 
 function readFile(aFile, aPrincipal, aCallback) {
 
-  let channel = NetUtil.newChannel2(aFile,
-                                    null,
-                                    null,
-                                    null,      // aLoadingNode
-                                    aPrincipal,
-                                    null,      // aTriggeringPrincipal
-                                    Ci.nsILoadInfo.SEC_NORMAL,
-                                    Ci.nsIContentPolicy.TYPE_OTHER);
+  let channel = NetUtil.newChannel({
+    uri: NetUtil.newURI(aFile),
+    loadingPrincipal: aPrincipal,
+    contentPolicyType: Ci.nsIContentPolicy.TYPE_OTHER});
   channel.contentType = "plain/text";
-  NetUtil.asyncFetch2(channel, function(aStream, aResult) {
+  NetUtil.asyncFetch(channel, function(aStream, aResult) {
     if (!Components.isSuccessCode(aResult)) {
       Cu.reportError("OfflineCacheInstaller: Could not read file " + aFile.path);
       if (aCallback)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/apps/tests/addons/script2.js firefox-trunk-41.0~a1~hg20150524r245419/dom/apps/tests/addons/script2.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/apps/tests/addons/script2.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/apps/tests/addons/script2.js	2015-05-25 20:43:12.000000000 +0000
@@ -1,4 +1,4 @@
 document.addEventListener("DOMContentLoaded", function() {
   var head = document.getElementById("header2");
   head.innerHTML = "Customized content";
-}, false);
\ No newline at end of file
+}, false);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/apps/tests/addons/script.js firefox-trunk-41.0~a1~hg20150524r245419/dom/apps/tests/addons/script.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/apps/tests/addons/script.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/apps/tests/addons/script.js	2015-05-25 20:43:12.000000000 +0000
@@ -1,4 +1,4 @@
 document.addEventListener("DOMContentLoaded", function() {
   var head = document.getElementById("header");
   head.innerHTML = "Hello World!";
-}, false);
\ No newline at end of file
+}, false);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/apps/TrustedHostedAppsUtils.jsm firefox-trunk-41.0~a1~hg20150524r245419/dom/apps/TrustedHostedAppsUtils.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/apps/TrustedHostedAppsUtils.jsm	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/apps/TrustedHostedAppsUtils.jsm	2015-05-25 20:43:12.000000000 +0000
@@ -203,15 +203,11 @@
     let principal = Services.scriptSecurityManager.getAppCodebasePrincipal(
                       aApp.origin, aApp.localId, false);
 
-    let mRequestChannel = NetUtil.newChannel2(aApp.manifestURL,
-                                              null,
-                                              null,
-                                              null,      // aLoadingNode
-                                              principal,
-                                              null,      // aTriggeringPrincipal
-                                              Ci.nsILoadInfo.SEC_NORMAL,
-                                              Ci.nsIContentPolicy.TYPE_OTHER)
-                                 .QueryInterface(Ci.nsIHttpChannel);
+    let mRequestChannel = NetUtil.newChannel({
+      uri: aApp.manifestURL,
+      loadingPrincipal: principal,
+      contentPolicyType: Ci.nsIContentPolicy.TYPE_OTHER}
+    ).QueryInterface(Ci.nsIHttpChannel);
     mRequestChannel.loadFlags |= Ci.nsIRequest.INHIBIT_CACHING;
     mRequestChannel.notificationCallbacks =
       AppsUtils.createLoadContext(aAppId, false);
@@ -232,15 +228,11 @@
       return;
     }
 
-    let sRequestChannel = NetUtil.newChannel2(signatureURL,
-                                              null,
-                                              null,
-                                              null,      // aLoadingNode
-                                              principal,
-                                              null,      // aTriggeringPrincipal
-                                              Ci.nsILoadInfo.SEC_NORMAL,
-                                              Ci.nsIContentPolicy.TYPE_OTHER)
-      .QueryInterface(Ci.nsIHttpChannel);
+    let sRequestChannel = NetUtil.newChannel({
+      uri: signatureURL,
+      loadingPrincipal: principal,
+      contentPolicyType: Ci.nsIContentPolicy.TYPE_OTHER}
+    ).QueryInterface(Ci.nsIHttpChannel);
     sRequestChannel.loadFlags |= Ci.nsIRequest.INHIBIT_CACHING;
     sRequestChannel.notificationCallbacks =
       AppsUtils.createLoadContext(aAppId, false);
@@ -256,11 +248,11 @@
 
     Promise.all([
       new Promise((resolve, reject) => {
-        NetUtil.asyncFetch2(mRequestChannel,
+        NetUtil.asyncFetch(mRequestChannel,
                             getAsyncFetchCallback(resolve, reject));
       }),
       new Promise((resolve, reject) => {
-        NetUtil.asyncFetch2(sRequestChannel,
+        NetUtil.asyncFetch(sRequestChannel,
                             getAsyncFetchCallback(resolve, reject));
       })
     ]).then(([aManifestStream, aSignatureStream]) => {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/apps/UserCustomizations.jsm firefox-trunk-41.0~a1~hg20150524r245419/dom/apps/UserCustomizations.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/apps/UserCustomizations.jsm	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/apps/UserCustomizations.jsm	2015-05-25 20:43:12.000000000 +0000
@@ -238,7 +238,12 @@
       }
 
       try {
-        Services.scriptloader.loadSubScript(aScript, sandbox, "UTF-8");
+        let options = {
+          target: sandbox,
+          charset: "UTF-8",
+          async: true
+        }
+        Services.scriptloader.loadSubScriptWithOptions(aScript, options);
         if (!this._loaded[manifestURL]) {
           this._loaded[manifestURL] = { css: [], scripts: [] };
         }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/apps/Webapps.js firefox-trunk-41.0~a1~hg20150524r245419/dom/apps/Webapps.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/apps/Webapps.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/apps/Webapps.js	2015-05-25 20:43:12.000000000 +0000
@@ -549,7 +549,8 @@
   },
 
   get enabled() {
-    return this._proxy.enabled;
+    let value = this._proxy.enabled;
+    return (value === undefined ? true : value);
   },
 
   download: function() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/apps/Webapps.jsm firefox-trunk-41.0~a1~hg20150524r245419/dom/apps/Webapps.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/apps/Webapps.jsm	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/apps/Webapps.jsm	2015-05-25 20:43:12.000000000 +0000
@@ -3527,25 +3527,17 @@
                       appURI, aNewApp.localId, false);
 
     if (aIsLocalFileInstall) {
-      requestChannel = NetUtil.newChannel2(aFullPackagePath,
-                                           null,
-                                           null,
-                                           null,      // aLoadingNode
-                                           principal,
-                                           null,      // aTriggeringPrincipal
-                                           Ci.nsILoadInfo.SEC_NORMAL,
-                                           Ci.nsIContentPolicy.TYPE_OTHER)
-                              .QueryInterface(Ci.nsIFileChannel);
+      requestChannel = NetUtil.newChannel({
+        uri: aFullPackagePath,
+        loadingPrincipal: principal,
+        contentPolicyType: Ci.nsIContentPolicy.TYPE_OTHER}
+      ).QueryInterface(Ci.nsIFileChannel);
     } else {
-      requestChannel = NetUtil.newChannel2(aFullPackagePath,
-                                           null,
-                                           null,
-                                           null,      // aLoadingNode
-                                           principal,
-                                           null,      // aTriggeringPrincipal
-                                           Ci.nsILoadInfo.SEC_NORMAL,
-                                           Ci.nsIContentPolicy.TYPE_OTHER)
-                              .QueryInterface(Ci.nsIHttpChannel);
+      requestChannel = NetUtil.newChannel({
+        uri: aFullPackagePath,
+        loadingPrincipal: principal,
+        contentPolicyType: Ci.nsIContentPolicy.TYPE_OTHER}
+      ).QueryInterface(Ci.nsIHttpChannel);
       requestChannel.loadFlags |= Ci.nsIRequest.INHIBIT_CACHING;
     }
 
@@ -3640,7 +3632,10 @@
     let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
     file.initWithPath(aFilePath);
 
-    NetUtil.asyncFetch2(file, function(inputStream, status) {
+    NetUtil.asyncFetch({
+      uri: NetUtil.newURI(file),
+      loadUsingSystemPrincipal: true
+    }, function(inputStream, status) {
       if (!Components.isSuccessCode(status)) {
         debug("Error reading " + aFilePath + ": " + e);
         deferred.reject();
@@ -3667,12 +3662,7 @@
       debug("File hash computed: " + hash);
 
       deferred.resolve(hash);
-    },
-    null,      // aLoadingNode
-    Services.scriptSecurityManager.getSystemPrincipal(),
-    null,      // aTriggeringPrincipal
-    Ci.nsILoadInfo.SEC_NORMAL,
-    Ci.nsIContentPolicy.TYPE_OTHER);
+    });
 
     return deferred.promise;
   },
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/archivereader/ArchiveReader.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/archivereader/ArchiveReader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/archivereader/ArchiveReader.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/archivereader/ArchiveReader.cpp	2015-05-25 20:43:13.000000000 +0000
@@ -95,8 +95,12 @@
 ArchiveReader::GetInputStream(nsIInputStream** aInputStream)
 {
   // Getting the input stream
-  mBlobImpl->GetInternalStream(aInputStream);
-  NS_ENSURE_TRUE(*aInputStream, NS_ERROR_UNEXPECTED);
+  ErrorResult rv;
+  mBlobImpl->GetInternalStream(aInputStream, rv);
+  if (NS_WARN_IF(rv.Failed())) {
+    return rv.StealNSResult();
+  }
+
   return NS_OK;
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/archivereader/ArchiveRequest.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/archivereader/ArchiveRequest.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/archivereader/ArchiveRequest.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/archivereader/ArchiveRequest.cpp	2015-05-25 20:43:13.000000000 +0000
@@ -177,7 +177,6 @@
                                    nsTArray<nsRefPtr<File>>& aFileList)
 {
   JS::Rooted<JSObject*> array(aCx, JS_NewArrayObject(aCx, aFileList.Length()));
-  nsresult rv;
 
   if (!array) {
     return NS_ERROR_OUT_OF_MEMORY;
@@ -188,14 +187,12 @@
     nsRefPtr<File> file = aFileList[i];
 
     nsString filename;
-    rv = file->GetName(filename);
-    NS_ENSURE_SUCCESS(rv, rv);
+    file->GetName(filename);
 
     str = JS_NewUCStringCopyZ(aCx, filename.get());
     NS_ENSURE_TRUE(str, NS_ERROR_OUT_OF_MEMORY);
 
-    if (NS_FAILED(rv) ||
-        !JS_DefineElement(aCx, array, i, str, JSPROP_ENUMERATE)) {
+    if (!JS_DefineElement(aCx, array, i, str, JSPROP_ENUMERATE)) {
       return NS_ERROR_FAILURE;
     }
   }
@@ -217,8 +214,7 @@
     nsRefPtr<File> file = aFileList[i];
 
     nsString filename;
-    nsresult rv = file->GetName(filename);
-    NS_ENSURE_SUCCESS(rv, rv);
+    file->GetName(filename);
 
     if (filename == mFilename) {
       if (!ToJSValue(aCx, file, aValue)) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/archivereader/ArchiveZipFile.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/archivereader/ArchiveZipFile.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/archivereader/ArchiveZipFile.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/archivereader/ArchiveZipFile.cpp	2015-05-25 20:43:13.000000000 +0000
@@ -355,23 +355,24 @@
 
 // ArchiveZipBlobImpl
 
-nsresult
-ArchiveZipBlobImpl::GetInternalStream(nsIInputStream** aStream)
+void
+ArchiveZipBlobImpl::GetInternalStream(nsIInputStream** aStream,
+                                      ErrorResult& aRv)
 {
   if (mLength > INT32_MAX) {
-    return NS_ERROR_FAILURE;
+    aRv.Throw(NS_ERROR_FAILURE);
+    return;
   }
 
-  ErrorResult rv;
-  uint64_t size = mBlobImpl->GetSize(rv);
-  if (NS_WARN_IF(rv.Failed())) {
-    return rv.StealNSResult();
+  uint64_t size = mBlobImpl->GetSize(aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return;
   }
 
   nsCOMPtr<nsIInputStream> inputStream;
-  rv = mBlobImpl->GetInternalStream(getter_AddRefs(inputStream));
-  if (NS_WARN_IF(rv.Failed()) || !inputStream) {
-    return NS_ERROR_UNEXPECTED;
+  mBlobImpl->GetInternalStream(getter_AddRefs(inputStream), aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return;
   }
 
   nsRefPtr<ArchiveInputStream> stream = new ArchiveInputStream(size,
@@ -382,7 +383,6 @@
                                                                mCentral);
 
   stream.forget(aStream);
-  return NS_OK;
 }
 
 already_AddRefed<mozilla::dom::BlobImpl>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/archivereader/ArchiveZipFile.h firefox-trunk-41.0~a1~hg20150524r245419/dom/archivereader/ArchiveZipFile.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/archivereader/ArchiveZipFile.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/archivereader/ArchiveZipFile.h	2015-05-25 20:43:13.000000000 +0000
@@ -56,7 +56,9 @@
   }
 
   // Overrides:
-  virtual nsresult GetInternalStream(nsIInputStream**) override;
+  virtual void GetInternalStream(nsIInputStream** aInputStream,
+                                 ErrorResult& aRv) override;
+
 protected:
   virtual ~ArchiveZipBlobImpl()
   {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/asmjscache/AsmJSCache.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/asmjscache/AsmJSCache.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/asmjscache/AsmJSCache.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/asmjscache/AsmJSCache.cpp	2015-05-25 20:43:13.000000000 +0000
@@ -1851,6 +1851,10 @@
   }
 
   virtual void
+  PerformIdleMaintenance() override
+  { }
+
+  virtual void
   ShutdownWorkThreads() override
   { }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/Console.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/Console.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/Console.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/Console.cpp	2015-05-25 20:43:13.000000000 +0000
@@ -1019,7 +1019,8 @@
     return GetCause() == aOther.GetCause();
   }
 
-  virtual void AddDetails(mozilla::dom::ProfileTimelineMarker& aMarker) override
+  virtual void AddDetails(JSContext* aCx,
+                          mozilla::dom::ProfileTimelineMarker& aMarker) override
   {
     if (GetMetaData() == TRACING_INTERVAL_START) {
       aMarker.mCauseName.Construct(GetCause());
@@ -1041,7 +1042,8 @@
     MOZ_ASSERT(aMetaData == TRACING_TIMESTAMP);
   }
 
-  virtual void AddDetails(mozilla::dom::ProfileTimelineMarker& aMarker) override
+  virtual void AddDetails(JSContext* aCx,
+                          mozilla::dom::ProfileTimelineMarker& aMarker) override
   {
     if (!GetCause().IsEmpty()) {
       aMarker.mCauseName.Construct(GetCause());
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/contentAreaDropListener.js firefox-trunk-41.0~a1~hg20150524r245419/dom/base/contentAreaDropListener.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/contentAreaDropListener.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/contentAreaDropListener.js	2015-05-25 20:43:14.000000000 +0000
@@ -3,6 +3,7 @@
  * 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/osfile.jsm");
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
@@ -42,13 +43,9 @@
     // For shortcuts, we want to check for the file type last, so that the
     // url pointed to in one of the url types is found first before the file
     // type, which points to the actual file.
-    let file = dt.mozGetDataAt("application/x-moz-file", 0);
-    if (file instanceof Ci.nsIFile) {
-      let ioService = Cc["@mozilla.org/network/io-service;1"].
-                        getService(Ci.nsIIOService);
-      let fileHandler = ioService.getProtocolHandler("file")
-                                 .QueryInterface(Ci.nsIFileProtocolHandler);
-      return [fileHandler.getURLSpecFromFile(file), file.leafName];
+    let files = dt.files;
+    if (files && files.length) {
+      return [OS.Path.toFileURI(files[0].mozFullPath), files[0].name];
     }
 
     return [ ];
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/crashtests/1157995.html firefox-trunk-41.0~a1~hg20150524r245419/dom/base/crashtests/1157995.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/crashtests/1157995.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/crashtests/1157995.html	2015-05-25 20:43:14.000000000 +0000
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<body>
+  <script>
+    // This should not leak.
+    var a = navigator;
+    navigator.mediaDevices._ = null;
+  </script>
+</body>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/crashtests/crashtests.list firefox-trunk-41.0~a1~hg20150524r245419/dom/base/crashtests/crashtests.list
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/crashtests/crashtests.list	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/crashtests/crashtests.list	2015-05-25 20:43:15.000000000 +0000
@@ -202,3 +202,4 @@
 load xhr_html_nullresponse.html
 load structured_clone_container_throws.html
 load 1154598.xhtml
+load 1157995.html
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/Element.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/Element.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/Element.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/Element.cpp	2015-05-25 20:43:13.000000000 +0000
@@ -3103,13 +3103,6 @@
 static const char*
 GetFullScreenError(nsIDocument* aDoc)
 {
-  // Block fullscreen requests in the chrome document when the fullscreen API
-  // is configured for content only.
-  if (nsContentUtils::IsFullscreenApiContentOnly() &&
-      nsContentUtils::IsChromeDoc(aDoc)) {
-    return "FullScreenDeniedContentOnly";
-  }
-
   nsCOMPtr<nsPIDOMWindow> win = aDoc->GetWindow();
   if (aDoc->NodePrincipal()->GetAppStatus() >= nsIPrincipal::APP_STATUS_INSTALLED) {
     // Request is in a web app and in the same origin as the web app.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/Element.h firefox-trunk-41.0~a1~hg20150524r245419/dom/base/Element.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/Element.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/Element.h	2015-05-25 20:43:13.000000000 +0000
@@ -19,6 +19,7 @@
 #include "mozilla/dom/DirectionalityUtils.h"
 #include "nsIDOMElement.h"
 #include "nsILinkHandler.h"
+#include "nsINodeList.h"
 #include "nsNodeUtils.h"
 #include "nsAttrAndChildArray.h"
 #include "mozFlushType.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/File.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/File.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/File.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/File.cpp	2015-05-25 20:43:13.000000000 +0000
@@ -283,52 +283,16 @@
   return blob.forget();
 }
 
-NS_IMETHODIMP
-Blob::GetSize(uint64_t* aSize)
-{
-  MOZ_ASSERT(aSize);
-
-  ErrorResult rv;
-  *aSize = GetSize(rv);
-  return rv.StealNSResult();
-}
-
 uint64_t
 Blob::GetSize(ErrorResult& aRv)
 {
   return mImpl->GetSize(aRv);
 }
 
-NS_IMETHODIMP
+void
 Blob::GetType(nsAString &aType)
 {
   mImpl->GetType(aType);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Blob::Slice(int64_t aStart, int64_t aEnd,
-            const nsAString& aContentType, uint8_t aArgc,
-            nsIDOMBlob **aBlob)
-{
-  Optional<int64_t> start;
-  if (aArgc > 0) {
-    start.Construct(aStart);
-  }
-
-  Optional<int64_t> end;
-  if (aArgc > 1) {
-    end.Construct(aEnd);
-  }
-
-  ErrorResult rv;
-  nsRefPtr<Blob> blob = Slice(start, end, aContentType, rv);
-  if (rv.Failed()) {
-    return rv.StealNSResult();
-  }
-
-  blob.forget(aBlob);
-  return NS_OK;
 }
 
 already_AddRefed<Blob>
@@ -406,13 +370,13 @@
   return blob.forget();
 }
 
-NS_IMETHODIMP_(int64_t)
+int64_t
 Blob::GetFileId()
 {
   return mImpl->GetFileId();
 }
 
-NS_IMETHODIMP_(void)
+void
 Blob::AddFileInfo(indexedDB::FileInfo* aFileInfo)
 {
   mImpl->AddFileInfo(aFileInfo);
@@ -424,37 +388,21 @@
   return mImpl->GetFileInfo(aFileManager);
 }
 
-NS_IMETHODIMP_(bool)
-Blob::IsMemoryFile()
+bool
+Blob::IsMemoryFile() const
 {
   return mImpl->IsMemoryFile();
 }
 
-NS_IMETHODIMP
-Blob::GetInternalStream(nsIInputStream** aStream)
+void
+Blob::GetInternalStream(nsIInputStream** aStream, ErrorResult& aRv)
 {
-  return mImpl->GetInternalStream(aStream);
+  mImpl->GetInternalStream(aStream, aRv);
 }
 
 ////////////////////////////////////////////////////////////////////////////
 // mozilla::dom::File implementation
 
-NS_IMPL_CYCLE_COLLECTION_CLASS(File)
-
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(File, Blob)
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
-
-NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(File, Blob)
-NS_IMPL_CYCLE_COLLECTION_UNLINK_END
-
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(File)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMFile)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMFile)
-NS_INTERFACE_MAP_END_INHERITING(Blob)
-
-NS_IMPL_ADDREF_INHERITED(File, Blob)
-NS_IMPL_RELEASE_INHERITED(File, Blob)
-
 File::File(nsISupports* aParent, BlobImpl* aImpl)
   : Blob(aParent, aImpl)
 {
@@ -553,17 +501,16 @@
   return FileBinding::Wrap(aCx, this, aGivenProto);
 }
 
-NS_IMETHODIMP
+void
 File::GetName(nsAString& aFileName)
 {
   mImpl->GetName(aFileName);
-  return NS_OK;
 }
 
-NS_IMETHODIMP
-File::GetPath(nsAString& aPath)
+void
+File::GetPath(nsAString& aPath, ErrorResult& aRv)
 {
-  return mImpl->GetPath(aPath);
+  mImpl->GetPath(aPath, aRv);
 }
 
 Date
@@ -583,53 +530,16 @@
   return mImpl->GetLastModified(aRv);
 }
 
-NS_IMETHODIMP
-File::GetLastModifiedDate(JSContext* aCx,
-                          JS::MutableHandle<JS::Value> aDate)
-{
-  ErrorResult rv;
-  Date value = GetLastModifiedDate(rv);
-  if (rv.Failed()) {
-    return rv.StealNSResult();
-  }
-
-  if (!value.ToDateObject(aCx, aDate)) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-File::GetMozFullPath(nsAString& aFileName)
-{
-  ErrorResult rv;
-  GetMozFullPath(aFileName, rv);
-  return rv.StealNSResult();
-}
-
 void
 File::GetMozFullPath(nsAString& aFilename, ErrorResult& aRv)
 {
   mImpl->GetMozFullPath(aFilename, aRv);
 }
 
-NS_IMETHODIMP
-File::GetMozFullPathInternal(nsAString& aFileName)
-{
-  ErrorResult rv;
-  mImpl->GetMozFullPathInternal(aFileName, rv);
-  return rv.StealNSResult();
-}
-
-NS_IMETHODIMP
-File::GetMozLastModifiedDate(int64_t* aDate)
+void
+File::GetMozFullPathInternal(nsAString& aFileName, ErrorResult& aRv)
 {
-  MOZ_ASSERT(aDate);
-
-  ErrorResult rv;
-  *aDate = GetLastModified(rv);
-  return rv.StealNSResult();
+  mImpl->GetMozFullPathInternal(aFileName, aRv);
 }
 
 // Makes sure that aStart and aEnd is less then or equal to aSize and greater
@@ -817,12 +727,11 @@
   aName = mName;
 }
 
-nsresult
-BlobImplBase::GetPath(nsAString& aPath)
+void
+BlobImplBase::GetPath(nsAString& aPath, ErrorResult& aRv)
 {
   NS_ASSERTION(mIsFile, "Should only be called on files");
   aPath = mPath;
-  return NS_OK;
 }
 
 void
@@ -966,16 +875,17 @@
 {
   MOZ_ASSERT(aContentLength);
 
-  nsresult rv;
+  ErrorResult rv;
 
   nsCOMPtr<nsIInputStream> stream;
-  rv = GetInternalStream(getter_AddRefs(stream));
-  NS_ENSURE_SUCCESS(rv, rv);
+  GetInternalStream(getter_AddRefs(stream), rv);
+  if (NS_WARN_IF(rv.Failed())) {
+    return rv.StealNSResult();
+  }
 
-  ErrorResult error;
-  *aContentLength = GetSize(error);
-  if (NS_WARN_IF(error.Failed())) {
-    return error.StealNSResult();
+  *aContentLength = GetSize(rv);
+  if (NS_WARN_IF(rv.Failed())) {
+    return rv.StealNSResult();
   }
 
   nsAutoString contentType;
@@ -1019,6 +929,13 @@
   return rv;
 }
 
+/* static */ uint64_t
+BlobImplBase::NextSerialNumber()
+{
+  static Atomic<uint64_t> nextSerialNumber;
+  return nextSerialNumber++;
+}
+
 ////////////////////////////////////////////////////////////////////////////
 // BlobImplFile implementation
 
@@ -1118,13 +1035,16 @@
   nsIFileInputStream::DEFER_OPEN |
   nsIFileInputStream::SHARE_DELETE;
 
-nsresult
-BlobImplFile::GetInternalStream(nsIInputStream** aStream)
+void
+BlobImplFile::GetInternalStream(nsIInputStream** aStream, ErrorResult& aRv)
 {
-  return mWholeFile ?
-    NS_NewLocalFileInputStream(aStream, mFile, -1, -1, sFileStreamFlags) :
-    NS_NewPartialLocalFileInputStream(aStream, mFile, mStart, mLength,
-                                      -1, -1, sFileStreamFlags);
+  if (mWholeFile) {
+    aRv = NS_NewLocalFileInputStream(aStream, mFile, -1, -1, sFileStreamFlags);
+    return;
+  }
+
+  aRv = NS_NewPartialLocalFileInputStream(aStream, mFile, mStart, mLength,
+                                          -1, -1, sFileStreamFlags);
 }
 
 void
@@ -1151,13 +1071,15 @@
   return impl.forget();
 }
 
-nsresult
-BlobImplMemory::GetInternalStream(nsIInputStream** aStream)
+void
+BlobImplMemory::GetInternalStream(nsIInputStream** aStream, ErrorResult& aRv)
 {
-  if (mLength > INT32_MAX)
-    return NS_ERROR_FAILURE;
+  if (mLength > INT32_MAX) {
+    aRv.Throw(NS_ERROR_FAILURE);
+    return;
+  }
 
-  return DataOwnerAdapter::Create(mDataOwner, mStart, mLength, aStream);
+  aRv = DataOwnerAdapter::Create(mDataOwner, mStart, mLength, aStream);
 }
 
 /* static */ StaticMutex
@@ -1283,13 +1205,13 @@
   return impl.forget();
 }
 
-nsresult
-BlobImplTemporaryBlob::GetInternalStream(nsIInputStream** aStream)
+void
+BlobImplTemporaryBlob::GetInternalStream(nsIInputStream** aStream,
+                                         ErrorResult& aRv)
 {
   nsCOMPtr<nsIInputStream> stream =
     new nsTemporaryFileInputStream(mFileDescOwner, mStartPos, mStartPos + mLength);
   stream.forget(aStream);
-  return NS_OK;
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -1321,9 +1243,9 @@
 }
 
 NS_IMETHODIMP
-FileList::Item(uint32_t aIndex, nsIDOMFile **aFile)
+FileList::Item(uint32_t aIndex, nsISupports** aFile)
 {
-  nsRefPtr<File> file = Item(aIndex);
+  nsCOMPtr<nsIDOMBlob> file = Item(aIndex);
   file.forget(aFile);
   return NS_OK;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/File.h firefox-trunk-41.0~a1~hg20150524r245419/dom/base/File.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/File.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/File.h	2015-05-25 20:43:13.000000000 +0000
@@ -20,7 +20,7 @@
 #include "nsAutoPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsCOMPtr.h"
-#include "nsIDOMFile.h"
+#include "nsIDOMBlob.h"
 #include "nsIDOMFileList.h"
 #include "nsIFile.h"
 #include "nsIMutable.h"
@@ -110,12 +110,27 @@
   CreateSlice(uint64_t aStart, uint64_t aLength, const nsAString& aContentType,
               ErrorResult& aRv);
 
+  void
+  GetInternalStream(nsIInputStream** aStream, ErrorResult& aRv);
+
+  int64_t
+  GetFileId();
+
+  indexedDB::FileInfo*
+  GetFileInfo(indexedDB::FileManager* aFileManager);
+
+  void
+  AddFileInfo(indexedDB::FileInfo* aFileInfo);
+
   // WebIDL methods
   nsISupports* GetParentObject() const
   {
     return mParent;
   }
 
+  bool
+  IsMemoryFile() const;
+
   // Blob constructor
   static already_AddRefed<Blob>
   Constructor(const GlobalObject& aGlobal, ErrorResult& aRv);
@@ -132,7 +147,7 @@
 
   uint64_t GetSize(ErrorResult& aRv);
 
-  // XPCOM GetType is OK
+  void GetType(nsAString& aType);
 
   already_AddRefed<Blob> Slice(const Optional<int64_t>& aStart,
                                const Optional<int64_t>& aEnd,
@@ -157,17 +172,10 @@
 };
 
 class File final : public Blob
-                 , public nsIDOMFile
 {
   friend class Blob;
 
 public:
-  NS_DECL_NSIDOMFILE
-  NS_FORWARD_NSIDOMBLOB(Blob::)
-
-  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(File, Blob);
-
   // Note: BlobImpl must be a File in order to use this method.
   // Check impl->IsFile().
   static File*
@@ -245,15 +253,18 @@
               const ChromeFilePropertyBag& aBag,
               ErrorResult& aRv);
 
-  // XPCOM GetName is OK
+  void GetName(nsAString& aName);
 
   int64_t GetLastModified(ErrorResult& aRv);
 
   Date GetLastModifiedDate(ErrorResult& aRv);
 
+  void GetPath(nsAString& aName, ErrorResult& aRv);
 
   void GetMozFullPath(nsAString& aFilename, ErrorResult& aRv);
 
+  void GetMozFullPathInternal(nsAString& aName, ErrorResult& aRv);
+
 protected:
   virtual bool HasFileInterface() const override { return true; }
 
@@ -276,7 +287,7 @@
 
   virtual void GetName(nsAString& aName) = 0;
 
-  virtual nsresult GetPath(nsAString& aName) = 0;
+  virtual void GetPath(nsAString& aName, ErrorResult& aRv) = 0;
 
   virtual int64_t GetLastModified(ErrorResult& aRv) = 0;
 
@@ -290,6 +301,14 @@
 
   virtual void GetType(nsAString& aType) = 0;
 
+  /**
+   * An effectively-unique serial number identifying this instance of FileImpl.
+   *
+   * Implementations should obtain a serial number from
+   * FileImplBase::NextSerialNumber().
+   */
+  virtual uint64_t GetSerialNumber() const = 0;
+
   already_AddRefed<BlobImpl>
   Slice(const Optional<int64_t>& aStart, const Optional<int64_t>& aEnd,
         const nsAString& aContentType, ErrorResult& aRv);
@@ -301,7 +320,8 @@
   virtual const nsTArray<nsRefPtr<BlobImpl>>*
   GetSubBlobImpls() const = 0;
 
-  virtual nsresult GetInternalStream(nsIInputStream** aStream) = 0;
+  virtual void GetInternalStream(nsIInputStream** aStream,
+                                 ErrorResult& aRv) = 0;
 
   virtual int64_t GetFileId() = 0;
 
@@ -356,6 +376,7 @@
     , mStart(0)
     , mLength(aLength)
     , mLastModificationDate(aLastModifiedDate)
+    , mSerialNumber(NextSerialNumber())
   {
     // Ensure non-null mContentType by default
     mContentType.SetIsVoid(false);
@@ -370,6 +391,7 @@
     , mStart(0)
     , mLength(aLength)
     , mLastModificationDate(INT64_MAX)
+    , mSerialNumber(NextSerialNumber())
   {
     // Ensure non-null mContentType by default
     mContentType.SetIsVoid(false);
@@ -382,6 +404,7 @@
     , mStart(0)
     , mLength(aLength)
     , mLastModificationDate(INT64_MAX)
+    , mSerialNumber(NextSerialNumber())
   {
     // Ensure non-null mContentType by default
     mContentType.SetIsVoid(false);
@@ -395,6 +418,7 @@
     , mStart(aStart)
     , mLength(aLength)
     , mLastModificationDate(INT64_MAX)
+    , mSerialNumber(NextSerialNumber())
   {
     NS_ASSERTION(aLength != UINT64_MAX,
                  "Must know length when creating slice");
@@ -404,7 +428,7 @@
 
   virtual void GetName(nsAString& aName) override;
 
-  virtual nsresult GetPath(nsAString& aName) override;
+  virtual void GetPath(nsAString& aName, ErrorResult& aRv) override;
 
   virtual int64_t GetLastModified(ErrorResult& aRv) override;
 
@@ -422,6 +446,8 @@
 
   virtual void GetType(nsAString& aType) override;
 
+  virtual uint64_t GetSerialNumber() const override { return mSerialNumber; }
+
   virtual already_AddRefed<BlobImpl>
   CreateSlice(uint64_t aStart, uint64_t aLength,
               const nsAString& aContentType, ErrorResult& aRv) override
@@ -435,9 +461,10 @@
     return nullptr;
   }
 
-  virtual nsresult GetInternalStream(nsIInputStream** aStream) override
+  virtual void GetInternalStream(nsIInputStream** aStream,
+                                 ErrorResult& aRv) override
   {
-    return NS_ERROR_NOT_IMPLEMENTED;
+    aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
   }
 
   virtual int64_t GetFileId() override;
@@ -508,6 +535,13 @@
 protected:
   virtual ~BlobImplBase() {}
 
+  /**
+   * Returns a new, effectively-unique serial number. This should be used
+   * by implementations to obtain a serial number for GetSerialNumber().
+   * The implementation is thread safe.
+   */
+  static uint64_t NextSerialNumber();
+
   indexedDB::FileInfo* GetFileInfo() const
   {
     NS_ASSERTION(IsStoredFile(), "Should only be called on stored files!");
@@ -528,6 +562,8 @@
 
   int64_t mLastModificationDate;
 
+  const uint64_t mSerialNumber;
+
   // Protected by IndexedDatabaseManager::FileMutex()
   nsTArray<nsRefPtr<indexedDB::FileInfo>> mFileInfos;
 };
@@ -557,7 +593,8 @@
     NS_ASSERTION(mDataOwner && mDataOwner->mData, "must have data");
   }
 
-  virtual nsresult GetInternalStream(nsIInputStream** aStream) override;
+  virtual void GetInternalStream(nsIInputStream** aStream,
+                                 ErrorResult& aRv) override;
 
   virtual already_AddRefed<BlobImpl>
   CreateSlice(uint64_t aStart, uint64_t aLength,
@@ -643,7 +680,8 @@
     mFileDescOwner = new nsTemporaryFileInputStream::FileDescOwner(aFD);
   }
 
-  virtual nsresult GetInternalStream(nsIInputStream** aStream) override;
+  virtual void GetInternalStream(nsIInputStream** aStream,
+                                 ErrorResult& aRv) override;
 
   virtual already_AddRefed<BlobImpl>
   CreateSlice(uint64_t aStart, uint64_t aLength,
@@ -785,7 +823,8 @@
   virtual void SetLastModified(int64_t aLastModified) override;
   virtual void GetMozFullPathInternal(nsAString& aFullPath,
                                       ErrorResult& aRv) override;
-  virtual nsresult GetInternalStream(nsIInputStream**) override;
+  virtual void GetInternalStream(nsIInputStream** aInputStream,
+                                 ErrorResult& aRv) override;
 
   void SetPath(const nsAString& aFullPath);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/FileIOObject.h firefox-trunk-41.0~a1~hg20150524r245419/dom/base/FileIOObject.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/FileIOObject.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/FileIOObject.h	2015-05-25 20:43:13.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include "mozilla/DOMEventTargetHelper.h"
 #include "nsIFile.h"
-#include "nsIDOMFile.h"
 #include "nsITimer.h"
 #include "nsCOMPtr.h"
 #include "nsIAsyncInputStream.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/FragmentOrElement.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/FragmentOrElement.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/FragmentOrElement.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/FragmentOrElement.cpp	2015-05-25 20:43:13.000000000 +0000
@@ -13,6 +13,7 @@
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Likely.h"
 #include "mozilla/MemoryReporting.h"
+#include "mozilla/SegmentedVector.h"
 #include "mozilla/StaticPtr.h"
 
 #include "mozilla/dom/FragmentOrElement.h"
@@ -126,6 +127,7 @@
 
 #include "nsStyledElement.h"
 #include "nsIContentInlines.h"
+#include "nsChildContentList.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -1156,7 +1158,7 @@
 FragmentOrElement::GetTextContentInternal(nsAString& aTextContent,
                                           ErrorResult& aError)
 {
-  if(!nsContentUtils::GetNodeTextContent(this, true, aTextContent)) {
+  if(!nsContentUtils::GetNodeTextContent(this, true, aTextContent, fallible)) {
     aError.Throw(NS_ERROR_OUT_OF_MEMORY);
   }
 }
@@ -1225,24 +1227,12 @@
 
 //----------------------------------------------------------------------
 
-// nsISupports implementation
-
-#define SUBTREE_UNBINDINGS_PER_RUNNABLE 500
-
-class ContentUnbinder : public nsRunnable
+class ContentUnbinder
 {
-public:
-  ContentUnbinder()
-  {
-    mLast = this;
-  }
-
-  ~ContentUnbinder()
-  {
-    Run();
-  }
+  static const size_t kSegmentSize = sizeof(void*) * 512;
+  typedef SegmentedVector<nsCOMPtr<nsIContent>, kSegmentSize, InfallibleAllocPolicy> ContentArray;
 
-  void UnbindSubtree(nsIContent* aNode)
+  static void UnbindSubtree(nsIContent* aNode)
   {
     if (aNode->NodeType() != nsIDOMNode::ELEMENT_NODE &&
         aNode->NodeType() != nsIDOMNode::DOCUMENT_FRAGMENT_NODE) {
@@ -1268,76 +1258,56 @@
     }
   }
 
-  NS_IMETHOD Run()
+  // These two methods are based on DeferredFinalizerImpl.
+
+  static void*
+  AppendContentUnbinderPointer(void* aData, void* aObject)
   {
-    nsAutoScriptBlocker scriptBlocker;
-    uint32_t len = mSubtreeRoots.Length();
-    if (len) {
-      PRTime start = PR_Now();
-      for (uint32_t i = 0; i < len; ++i) {
-        UnbindSubtree(mSubtreeRoots[i]);
-      }
-      mSubtreeRoots.Clear();
-      Telemetry::Accumulate(Telemetry::CYCLE_COLLECTOR_CONTENT_UNBIND,
-                            uint32_t(PR_Now() - start) / PR_USEC_PER_MSEC);
-    }
-    nsCycleCollector_dispatchDeferredDeletion();
-    if (this == sContentUnbinder) {
-      sContentUnbinder = nullptr;
-      if (mNext) {
-        nsRefPtr<ContentUnbinder> next;
-        next.swap(mNext);
-        sContentUnbinder = next;
-        next->mLast = mLast;
-        mLast = nullptr;
-        NS_DispatchToMainThread(next);
-      }
+    ContentArray* contentArray = static_cast<ContentArray*>(aData);
+    if (!contentArray) {
+      contentArray = new ContentArray();
     }
-    return NS_OK;
+
+    contentArray->InfallibleAppend(dont_AddRef(static_cast<nsIContent*>(aObject)));
+    return contentArray;
   }
 
-  static void UnbindAll()
+  static bool
+  DeferredFinalize(uint32_t aSliceBudget, void* aData)
   {
-    nsRefPtr<ContentUnbinder> ub = sContentUnbinder;
-    sContentUnbinder = nullptr;
-    while (ub) {
-      ub->Run();
-      ub = ub->mNext;
+    MOZ_ASSERT(aSliceBudget > 0, "nonsensical/useless call with aSliceBudget == 0");
+    nsAutoScriptBlocker scriptBlocker;
+    ContentArray* contentArray = static_cast<ContentArray*>(aData);
+
+    size_t numToRemove = contentArray->Length();
+    if (aSliceBudget < numToRemove) {
+      numToRemove = aSliceBudget;
+    }
+
+    for (size_t i = 0; i < numToRemove; ++i) {
+      nsCOMPtr<nsIContent> element = contentArray->GetLast().forget();
+      contentArray->PopLast();
+      UnbindSubtree(element);
+    }
+
+    nsCycleCollector_dispatchDeferredDeletion();
+
+    if (contentArray->Length() == 0) {
+      delete contentArray;
+      return true;
     }
+    return false;
   }
 
-  static void Append(nsIContent* aSubtreeRoot)
+public:
+  static void
+  Append(nsIContent* aSubtreeRoot)
   {
-    if (!sContentUnbinder) {
-      sContentUnbinder = new ContentUnbinder();
-      nsCOMPtr<nsIRunnable> e = sContentUnbinder;
-      NS_DispatchToMainThread(e);
-    }
-
-    if (sContentUnbinder->mLast->mSubtreeRoots.Length() >=
-        SUBTREE_UNBINDINGS_PER_RUNNABLE) {
-      sContentUnbinder->mLast->mNext = new ContentUnbinder();
-      sContentUnbinder->mLast = sContentUnbinder->mLast->mNext;
-    }
-    sContentUnbinder->mLast->mSubtreeRoots.AppendElement(aSubtreeRoot);
-  }
-
-private:
-  nsAutoTArray<nsCOMPtr<nsIContent>,
-               SUBTREE_UNBINDINGS_PER_RUNNABLE> mSubtreeRoots;
-  nsRefPtr<ContentUnbinder>                     mNext;
-  ContentUnbinder*                              mLast;
-  static ContentUnbinder*                       sContentUnbinder;
+    nsCOMPtr<nsIContent> root = aSubtreeRoot;
+    mozilla::DeferredFinalize(AppendContentUnbinderPointer, DeferredFinalize, root.forget().take());
+  }
 };
 
-ContentUnbinder* ContentUnbinder::sContentUnbinder = nullptr;
-
-void
-FragmentOrElement::ClearContentUnbinder()
-{
-  ContentUnbinder::UnbindAll();
-}
-
 NS_IMPL_CYCLE_COLLECTION_CLASS(FragmentOrElement)
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(FragmentOrElement)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/FragmentOrElement.h firefox-trunk-41.0~a1~hg20150524r245419/dom/base/FragmentOrElement.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/FragmentOrElement.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/FragmentOrElement.h	2015-05-25 20:43:13.000000000 +0000
@@ -215,7 +215,6 @@
     mRefCnt.RemovePurple();
   }
 
-  static void ClearContentUnbinder();
   static bool CanSkip(nsINode* aNode, bool aRemovingAllowed);
   static bool CanSkipInCC(nsINode* aNode);
   static bool CanSkipThis(nsINode* aNode);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/gen-usecounters.py firefox-trunk-41.0~a1~hg20150524r245419/dom/base/gen-usecounters.py
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/gen-usecounters.py	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/gen-usecounters.py	2015-05-25 20:43:15.000000000 +0000
@@ -0,0 +1,79 @@
+#!/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/.
+
+from __future__ import print_function
+
+import json
+import os
+import sys
+sys.path.append(os.path.dirname(__file__))
+
+import usecounters
+
+AUTOGENERATED_WARNING_COMMENT = "/* THIS FILE IS AUTOGENERATED BY gen-usercounters.py - DO NOT EDIT */"
+
+def generate_list(f, counters):
+    def print_optional_macro_declare(name):
+        print('''
+#ifndef %(name)s
+#define %(name)s(interface_, name_) // nothing
+#define DEFINED_%(name)s
+#endif
+''' % { 'name': name }, file=f)
+
+    def print_optional_macro_undeclare(name):
+        print('''
+#ifdef DEFINED_%(name)s
+#undef DEFINED_%(name)s
+#undef %(name)s
+#endif
+''' % { 'name': name }, file=f)
+
+    print(AUTOGENERATED_WARNING_COMMENT, file=f)
+
+    print_optional_macro_declare('USE_COUNTER_DOM_METHOD')
+    print_optional_macro_declare('USE_COUNTER_DOM_ATTRIBUTE')
+    print_optional_macro_declare('USE_COUNTER_CSS_PROPERTY')
+
+    for counter in counters:
+        if counter['type'] == 'method':
+            print('USE_COUNTER_DOM_METHOD(%s, %s)' % (counter['interface_name'], counter['method_name']), file=f)
+        elif counter['type'] == 'attribute':
+            print('USE_COUNTER_DOM_ATTRIBUTE(%s, %s)' % (counter['interface_name'], counter['attribute_name']), file=f)
+        elif counter['type'] == 'property':
+            prop = counter['property_name']
+            print('USE_COUNTER_CSS_PROPERTY(%s, %s)' % (prop, prop.replace('-', '_')), file=f)
+
+    print_optional_macro_undeclare('USE_COUNTER_DOM_METHOD')
+    print_optional_macro_undeclare('USE_COUNTER_DOM_ATTRIBUTE')
+    print_optional_macro_undeclare('USE_COUNTER_CSS_PROPERTY')
+
+def generate_property_map(f, counters):
+    print(AUTOGENERATED_WARNING_COMMENT, file=f)
+    print('''
+enum {
+  // XXX is this the right define?
+  #define CSS_PROP_LIST_INCLUDE_LOGICAL
+  #define CSS_PROP(name_, id_, method_, flags_, pref_, parsevariant_,     \\
+                   kwtable_, stylestruct_, stylestructoffset_, animtype_) \\
+    USE_COUNTER_FOR_CSS_PROPERTY_##id_ = eUseCounter_UNKNOWN,
+  #include "nsCSSPropList.h"
+  #undef CSS_PROP
+  #undef CSS_PROP_LIST_INCLUDE_LOGICAL
+};
+''', file=f)
+    for counter in counters:
+        if counter['type'] == 'property':
+            prop = counter['property_name'].replace('-', '_')
+            print('#define USE_COUNTER_FOR_CSS_PROPERTY_%s eUseCounter_property_%s' % (prop, prop), file=f)
+
+def use_counter_list(output_header, conf_filename):
+    counters = usecounters.read_conf(conf_filename)
+    generate_list(output_header, counters)
+
+def property_map(output_map, conf_filename):
+    counters = usecounters.read_conf(conf_filename)
+    generate_property_map(output_map, counters)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/ImageEncoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/ImageEncoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/ImageEncoder.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/ImageEncoder.cpp	2015-05-25 20:43:13.000000000 +0000
@@ -392,7 +392,8 @@
                                   aOptions);
     } else {
       RefPtr<gfx::DataSourceSurface> dataSurface;
-      dataSurface = GetBRGADataSourceSurfaceSync(aImage);
+      RefPtr<layers::Image> image(aImage);
+      dataSurface = GetBRGADataSourceSurfaceSync(image.forget());
 
       DataSourceSurface::MappedSurface map;
       if (!dataSurface->Map(gfx::DataSourceSurface::MapType::READ, &map)) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/Makefile.in firefox-trunk-41.0~a1~hg20150524r245419/dom/base/Makefile.in
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/Makefile.in	2015-05-25 20:43:13.000000000 +0000
@@ -0,0 +1,8 @@
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+INSTALL_TARGETS += usecounterlist
+usecounterlist_FILES := UseCounterList.h
+usecounterlist_DEST = $(DIST)/include/mozilla/dom
+usecounterlist_TARGET := export
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/MessagePort.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/MessagePort.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/MessagePort.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/MessagePort.cpp	2015-05-25 20:43:13.000000000 +0000
@@ -224,7 +224,7 @@
     port->BindToOwner(scInfo->mPort->GetOwner());
     scInfo->mPorts.Put(port, nullptr);
 
-    JS::Rooted<JSObject*> obj(aCx, port->WrapObject(aCx, JS::NullPtr()));
+    JS::Rooted<JSObject*> obj(aCx, port->WrapObject(aCx, nullptr));
     if (!obj || !JS_WrapObject(aCx, &obj)) {
       return false;
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/base/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/moz.build	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/moz.build	2015-05-25 20:43:15.000000000 +0000
@@ -11,10 +11,10 @@
     'nsIContentPolicy.idl',
     'nsIContentPolicyBase.idl',
     'nsIDocumentEncoder.idl',
+    'nsIDOMBlob.idl',
     'nsIDOMDataChannel.idl',
     'nsIDOMDOMCursor.idl',
     'nsIDOMDOMRequest.idl',
-    'nsIDOMFile.idl',
     'nsIDOMFileList.idl',
     'nsIDOMFileReader.idl',
     'nsIDOMFormData.idl',
@@ -53,6 +53,7 @@
     'nsAttrValue.h',
     'nsAttrValueInlines.h',
     'nsCaseTreatment.h',
+    'nsChildContentList.h',
     'nsContentCID.h',
     'nsContentCreatorFunctions.h',
     'nsContentList.h',
@@ -144,6 +145,7 @@
     'CORSMode.h',
     'FeedWriterEnabled.h',
     'TextInputProcessor.h',
+    'UseCounter.h',
 ]
 
 EXPORTS.mozilla.dom += [
@@ -382,8 +384,6 @@
     'contentAreaDropListener.manifest',
     'messageWakeupService.js',
     'messageWakeupService.manifest',
-    'SiteSpecificUserAgent.js',
-    'SiteSpecificUserAgent.manifest',
     'SlowScriptDebug.js',
     'SlowScriptDebug.manifest',
 ]
@@ -423,7 +423,7 @@
     '/dom/xslt/xpath',
     '/dom/xul',
     '/gfx/2d',
-    '/image/src',
+    '/image',
     '/js/xpconnect/src',
     '/js/xpconnect/wrappers',
     '/layout/base',
@@ -469,3 +469,16 @@
 
 if CONFIG['MOZ_X11']:
     CXXFLAGS += CONFIG['TK_CFLAGS']
+
+GENERATED_FILES += [
+    'PropertyUseCounterMap.inc',
+    'UseCounterList.h',
+]
+
+countermap = GENERATED_FILES['PropertyUseCounterMap.inc']
+countermap.script = 'gen-usecounters.py:property_map'
+countermap.inputs = ['UseCounters.conf']
+
+counterlist = GENERATED_FILES['UseCounterList.h']
+counterlist.script = 'gen-usecounters.py:use_counter_list'
+counterlist.inputs = ['UseCounters.conf']
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/MultipartBlobImpl.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/MultipartBlobImpl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/MultipartBlobImpl.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/MultipartBlobImpl.cpp	2015-05-25 20:43:13.000000000 +0000
@@ -25,30 +25,36 @@
 
 NS_IMPL_ISUPPORTS_INHERITED0(MultipartBlobImpl, BlobImpl)
 
-nsresult
-MultipartBlobImpl::GetInternalStream(nsIInputStream** aStream)
+void
+MultipartBlobImpl::GetInternalStream(nsIInputStream** aStream,
+                                     ErrorResult& aRv)
 {
-  nsresult rv;
   *aStream = nullptr;
 
   nsCOMPtr<nsIMultiplexInputStream> stream =
     do_CreateInstance("@mozilla.org/io/multiplex-input-stream;1");
-  NS_ENSURE_TRUE(stream, NS_ERROR_FAILURE);
+  if (NS_WARN_IF(!stream)) {
+    aRv.Throw(NS_ERROR_FAILURE);
+    return;
+  }
 
   uint32_t i;
   for (i = 0; i < mBlobImpls.Length(); i++) {
     nsCOMPtr<nsIInputStream> scratchStream;
     BlobImpl* blobImpl = mBlobImpls.ElementAt(i).get();
 
-    rv = blobImpl->GetInternalStream(getter_AddRefs(scratchStream));
-    NS_ENSURE_SUCCESS(rv, rv);
+    blobImpl->GetInternalStream(getter_AddRefs(scratchStream), aRv);
+    if (NS_WARN_IF(aRv.Failed())) {
+      return;
+    }
 
-    rv = stream->AppendStream(scratchStream);
-    NS_ENSURE_SUCCESS(rv, rv);
+    aRv = stream->AppendStream(scratchStream);
+    if (NS_WARN_IF(aRv.Failed())) {
+      return;
+    }
   }
 
   stream.forget(aStream);
-  return NS_OK;
 }
 
 already_AddRefed<BlobImpl>
@@ -359,15 +365,13 @@
   nsRefPtr<File> blob = File::CreateFromFile(aWindow, aFile, aBag.mTemporary);
 
   // Pre-cache size.
-  uint64_t unused;
-  aRv = blob->GetSize(&unused);
+  blob->GetSize(aRv);
   if (NS_WARN_IF(aRv.Failed())) {
     return;
   }
 
   // Pre-cache modified date.
-  int64_t unusedDate;
-  aRv = blob->GetMozLastModifiedDate(&unusedDate);
+  blob->GetLastModified(aRv);
   if (NS_WARN_IF(aRv.Failed())) {
     return;
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/MultipartBlobImpl.h firefox-trunk-41.0~a1~hg20150524r245419/dom/base/MultipartBlobImpl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/MultipartBlobImpl.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/MultipartBlobImpl.h	2015-05-25 20:43:13.000000000 +0000
@@ -92,7 +92,8 @@
     return mLength;
   }
 
-  virtual nsresult GetInternalStream(nsIInputStream** aInputStream) override;
+  virtual void GetInternalStream(nsIInputStream** aInputStream,
+                                 ErrorResult& aRv) override;
 
   virtual const nsTArray<nsRefPtr<BlobImpl>>* GetSubBlobImpls() const override
   {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/Navigator.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/Navigator.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/Navigator.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/Navigator.cpp	2015-05-25 20:43:13.000000000 +0000
@@ -201,6 +201,7 @@
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mAudioChannelManager)
 #endif
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mCameraManager)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMediaDevices)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMessagesManager)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mDeviceStorageStores)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mTimeManager)
@@ -307,6 +308,7 @@
 #endif
 
   mCameraManager = nullptr;
+  mMediaDevices = nullptr;
 
   if (mMessagesManager) {
     mMessagesManager = nullptr;
@@ -1214,17 +1216,13 @@
 
     } else if (aData.Value().IsBlob()) {
       Blob& blob = aData.Value().GetAsBlob();
-      rv = blob.GetInternalStream(getter_AddRefs(in));
-      if (NS_FAILED(rv)) {
-        aRv.Throw(NS_ERROR_FAILURE);
+      blob.GetInternalStream(getter_AddRefs(in), aRv);
+      if (NS_WARN_IF(aRv.Failed())) {
         return false;
       }
+
       nsAutoString type;
-      rv = blob.GetType(type);
-      if (NS_FAILED(rv)) {
-        aRv.Throw(NS_ERROR_FAILURE);
-        return false;
-      }
+      blob.GetType(type);
       mimeType = NS_ConvertUTF16toUTF8(type);
 
     } else if (aData.Value().IsFormData()) {
@@ -1510,6 +1508,12 @@
   }
 #endif
 
+  // Mirror the dom.apps.developer_mode pref to let apps get it read-only.
+  if (aName.EqualsLiteral("dom.apps.developer_mode")) {
+    p->MaybeResolve(Preferences::GetBool("dom.apps.developer_mode", false));
+    return p.forget();
+  }
+
   p->MaybeResolve(JS::UndefinedHandleValue);
   return p.forget();
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsCCUncollectableMarker.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsCCUncollectableMarker.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsCCUncollectableMarker.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsCCUncollectableMarker.cpp	2015-05-25 20:43:15.000000000 +0000
@@ -317,8 +317,6 @@
                                  const char16_t* aData)
 {
   if (!strcmp(aTopic, "xpcom-shutdown")) {
-    Element::ClearContentUnbinder();
-
     nsCOMPtr<nsIObserverService> obs =
       mozilla::services::GetObserverService();
     if (!obs)
@@ -343,9 +341,6 @@
     !strcmp(aTopic, "cycle-collector-forget-skippable");
 
   bool prepareForCC = !strcmp(aTopic, "cycle-collector-begin");
-  if (prepareForCC) {
-    Element::ClearContentUnbinder();
-  }
 
   // Increase generation to effectively unmark all current objects
   if (!++sGeneration) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsChildContentList.h firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsChildContentList.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsChildContentList.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsChildContentList.h	2015-05-25 20:43:15.000000000 +0000
@@ -0,0 +1,63 @@
+/* -*- 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 nsChildContentList_h__
+#define nsChildContentList_h__
+
+#include "nsISupportsImpl.h"
+#include "nsINodeList.h"            // base class
+#include "js/TypeDecls.h"     // for Handle, Value, JSObject, JSContext
+
+class nsIContent;
+class nsINode;
+
+/**
+ * Class that implements the nsIDOMNodeList interface (a list of children of
+ * the content), by holding a reference to the content and delegating GetLength
+ * and Item to its existing child list.
+ * @see nsIDOMNodeList
+ */
+class nsChildContentList final : public nsINodeList
+{
+public:
+  explicit nsChildContentList(nsINode* aNode)
+    : mNode(aNode)
+  {
+  }
+
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS(nsChildContentList)
+
+  // nsWrapperCache
+  virtual JSObject* WrapObject(JSContext *cx, JS::Handle<JSObject*> aGivenProto) override;
+
+  // nsIDOMNodeList interface
+  NS_DECL_NSIDOMNODELIST
+
+  // nsINodeList interface
+  virtual int32_t IndexOf(nsIContent* aContent) override;
+  virtual nsIContent* Item(uint32_t aIndex) override;
+
+  void DropReference()
+  {
+    mNode = nullptr;
+  }
+
+  virtual nsINode* GetParentObject() override
+  {
+    return mNode;
+  }
+
+private:
+  ~nsChildContentList() {}
+
+  // The node whose children make up the list.
+  // This is a non-owning ref which is safe because it's set to nullptr by
+  // DropReference() by the node slots get destroyed.
+  nsINode* MOZ_NON_OWNING_REF mNode;
+};
+
+#endif /* nsChildContentList_h__ */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsContentList.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsContentList.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsContentList.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsContentList.cpp	2015-05-25 20:43:15.000000000 +0000
@@ -153,7 +153,7 @@
 }
 
 // Hashtable for storing nsContentLists
-static PLDHashTable gContentListHashTable;
+static PLDHashTable2* gContentListHashTable;
 
 #define RECENTLY_USED_CONTENT_LIST_CACHE_SIZE 31
 static nsContentList*
@@ -215,19 +215,17 @@
   };
 
   // Initialize the hashtable if needed.
-  if (!gContentListHashTable.IsInitialized()) {
-    PL_DHashTableInit(&gContentListHashTable, &hash_table_ops,
-                      sizeof(ContentListHashEntry));
+  if (!gContentListHashTable) {
+    gContentListHashTable =
+      new PLDHashTable2(&hash_table_ops, sizeof(ContentListHashEntry));
   }
 
   ContentListHashEntry *entry = nullptr;
   // First we look in our hashtable.  Then we create a content list if needed
-  if (gContentListHashTable.IsInitialized()) {
-    entry = static_cast<ContentListHashEntry *>
-      (PL_DHashTableAdd(&gContentListHashTable, &hashKey, fallible));
-    if (entry)
-      list = entry->mContentList;
-  }
+  entry = static_cast<ContentListHashEntry *>
+    (PL_DHashTableAdd(gContentListHashTable, &hashKey, fallible));
+  if (entry)
+    list = entry->mContentList;
 
   if (!list) {
     // We need to create a ContentList and add it to our new entry, if
@@ -272,7 +270,7 @@
 }
 
 // Hashtable for storing nsCacheableFuncStringContentList
-static PLDHashTable gFuncStringContentListHashTable;
+static PLDHashTable2* gFuncStringContentListHashTable;
 
 struct FuncStringContentListHashEntry : public PLDHashEntryHdr
 {
@@ -321,18 +319,18 @@
   };
 
   // Initialize the hashtable if needed.
-  if (!gFuncStringContentListHashTable.IsInitialized()) {
-    PL_DHashTableInit(&gFuncStringContentListHashTable, &hash_table_ops,
-                      sizeof(FuncStringContentListHashEntry));
+  if (!gFuncStringContentListHashTable) {
+    gFuncStringContentListHashTable =
+      new PLDHashTable2(&hash_table_ops, sizeof(FuncStringContentListHashEntry));
   }
 
   FuncStringContentListHashEntry *entry = nullptr;
   // First we look in our hashtable.  Then we create a content list if needed
-  if (gFuncStringContentListHashTable.IsInitialized()) {
+  if (gFuncStringContentListHashTable) {
     nsFuncStringCacheKey hashKey(aRootNode, aFunc, aString);
 
     entry = static_cast<FuncStringContentListHashEntry *>
-      (PL_DHashTableAdd(&gFuncStringContentListHashTable, &hashKey, fallible));
+      (PL_DHashTableAdd(gFuncStringContentListHashTable, &hashKey, fallible));
     if (entry) {
       list = entry->mContentList;
 #ifdef DEBUG
@@ -970,13 +968,14 @@
     sRecentlyUsedContentLists[recentlyUsedCacheIndex] = nullptr;
   }
 
-  if (!gContentListHashTable.IsInitialized())
+  if (!gContentListHashTable)
     return;
 
-  PL_DHashTableRemove(&gContentListHashTable, &key);
+  PL_DHashTableRemove(gContentListHashTable, &key);
 
-  if (gContentListHashTable.EntryCount() == 0) {
-    PL_DHashTableFinish(&gContentListHashTable);
+  if (gContentListHashTable->EntryCount() == 0) {
+    delete gContentListHashTable;
+    gContentListHashTable = nullptr;
   }
 }
 
@@ -1008,15 +1007,16 @@
 void
 nsCacheableFuncStringContentList::RemoveFromFuncStringHashtable()
 {
-  if (!gFuncStringContentListHashTable.IsInitialized()) {
+  if (!gFuncStringContentListHashTable) {
     return;
   }
 
   nsFuncStringCacheKey key(mRootNode, mFunc, mString);
-  PL_DHashTableRemove(&gFuncStringContentListHashTable, &key);
+  PL_DHashTableRemove(gFuncStringContentListHashTable, &key);
 
-  if (gFuncStringContentListHashTable.EntryCount() == 0) {
-    PL_DHashTableFinish(&gFuncStringContentListHashTable);
+  if (gFuncStringContentListHashTable->EntryCount() == 0) {
+    delete gFuncStringContentListHashTable;
+    gFuncStringContentListHashTable = nullptr;
   }
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsContentPermissionHelper.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsContentPermissionHelper.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsContentPermissionHelper.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsContentPermissionHelper.cpp	2015-05-25 20:43:15.000000000 +0000
@@ -14,6 +14,7 @@
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/Element.h"
+#include "mozilla/dom/Event.h"
 #include "mozilla/dom/PContentPermission.h"
 #include "mozilla/dom/PermissionMessageUtils.h"
 #include "mozilla/dom/PContentPermissionRequestParent.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsContentPolicy.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsContentPolicy.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsContentPolicy.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsContentPolicy.cpp	2015-05-25 20:43:15.000000000 +0000
@@ -8,7 +8,7 @@
  * Implementation of the "@mozilla.org/layout/content-policy;1" contract.
  */
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "nsISupports.h"
 #include "nsXPCOM.h"
@@ -22,9 +22,7 @@
 
 NS_IMPL_ISUPPORTS(nsContentPolicy, nsIContentPolicy)
 
-#ifdef PR_LOGGING
 static PRLogModuleInfo* gConPolLog;
-#endif
 
 nsresult
 NS_NewContentPolicy(nsIContentPolicy **aResult)
@@ -40,11 +38,9 @@
     : mPolicies(NS_CONTENTPOLICY_CATEGORY)
     , mSimplePolicies(NS_SIMPLECONTENTPOLICY_CATEGORY)
 {
-#ifdef PR_LOGGING
     if (! gConPolLog) {
         gConPolLog = PR_NewLogModule("nsContentPolicy");
     }
-#endif
 }
 
 nsContentPolicy::~nsContentPolicy()
@@ -187,14 +183,12 @@
     return NS_OK;
 }
 
-#ifdef PR_LOGGING
-
 //uses the parameters from ShouldXYZ to produce and log a message
 //logType must be a literal string constant
 #define LOG_CHECK(logType)                                                    \
   PR_BEGIN_MACRO                                                              \
-    /* skip all this nonsense if the call failed */                           \
-    if (NS_SUCCEEDED(rv)) {                                                   \
+    /* skip all this nonsense if the call failed or logging is disabled */    \
+    if (NS_SUCCEEDED(rv) && PR_LOG_TEST(gConPolLog, PR_LOG_DEBUG)) {          \
       const char *resultName;                                                 \
       if (decision) {                                                         \
         resultName = NS_CP_ResponseName(*decision);                           \
@@ -209,19 +203,13 @@
       if (requestingLocation) {                                               \
           requestingLocation->GetSpec(refSpec);                               \
       }                                                                       \
-      PR_LOG(gConPolLog, PR_LOG_DEBUG,                                        \
+      MOZ_LOG(gConPolLog, PR_LOG_DEBUG,                                        \
              ("Content Policy: " logType ": <%s> <Ref:%s> result=%s",         \
               spec.get(), refSpec.get(), resultName)                          \
              );                                                               \
     }                                                                         \
   PR_END_MACRO
 
-#else //!defined(PR_LOGGING)
-
-#define LOG_CHECK(logType)
-
-#endif //!defined(PR_LOGGING)
-
 NS_IMETHODIMP
 nsContentPolicy::ShouldLoad(uint32_t          contentType,
                             nsIURI           *contentLocation,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsContentPolicyUtils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsContentPolicyUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsContentPolicyUtils.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsContentPolicyUtils.h	2015-05-25 20:43:15.000000000 +0000
@@ -56,7 +56,6 @@
   case nsIContentPolicy:: name :   \
     return #name
 
-#ifdef PR_LOGGING
 /**
  * Returns a string corresponding to the name of the response constant, or
  * "<Unknown Response>" if an unknown response value is given.
@@ -119,8 +118,6 @@
   }
 }
 
-#endif // defined(PR_LOGGING)
-
 #undef CASE_RETURN
 
 /* Passes on parameters from its "caller"'s context. */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsContentSink.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsContentSink.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsContentSink.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsContentSink.cpp	2015-05-25 20:43:15.000000000 +0000
@@ -33,7 +33,6 @@
 #include "nsIApplicationCacheContainer.h"
 #include "nsIApplicationCacheChannel.h"
 #include "nsIScriptSecurityManager.h"
-#include "nsISpeculativeConnect.h"
 #include "nsICookieService.h"
 #include "nsContentUtils.h"
 #include "nsNodeInfoManager.h"
@@ -878,20 +877,15 @@
 void
 nsContentSink::Preconnect(const nsAString &aHref)
 {
-  nsCOMPtr<nsISpeculativeConnect>
-    speculator(do_QueryInterface(nsContentUtils::GetIOService()));
-  if (!speculator) {
-    return;
-  }
-
   // construct URI using document charset
   const nsACString& charset = mDocument->GetDocumentCharacterSet();
   nsCOMPtr<nsIURI> uri;
   NS_NewURI(getter_AddRefs(uri), aHref,
             charset.IsEmpty() ? nullptr : PromiseFlatCString(charset).get(),
             mDocument->GetDocBaseURI());
-  if (uri) {
-    speculator->SpeculativeConnect(uri, nullptr);
+
+  if (uri && mDocument) {
+    mDocument->MaybePreconnect(uri);
   }
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsContentSink.h firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsContentSink.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsContentSink.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsContentSink.h	2015-05-25 20:43:15.000000000 +0000
@@ -24,7 +24,7 @@
 #include "nsITimer.h"
 #include "nsStubDocumentObserver.h"
 #include "nsIContentSink.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsThreadUtils.h"
 
@@ -163,10 +163,9 @@
   void PrefetchHref(const nsAString &aHref, nsINode *aSource,
                     bool aExplicit);
 
-  // For both PrefetchDNS() and Preconnect() aHref can either be the usual
+  // For PrefetchDNS() aHref can either be the usual
   // URI format or of the form "//www.hostname.com" without a scheme.
   void PrefetchDNS(const nsAString &aHref);
-  void Preconnect(const nsAString &aHref);
 
   // Gets the cache key (used to identify items in a cache) of the channel.
   nsresult GetChannelCacheKey(nsIChannel* aChannel, nsACString& aCacheKey);
@@ -224,6 +223,10 @@
   // element and calls the above method.
   void ProcessOfflineManifest(nsIContent *aElement);
 
+  // For Preconnect() aHref can either be the usual
+  // URI format or of the form "//www.hostname.com" without a scheme.
+  void Preconnect(const nsAString &aHref);
+
 protected:
   // Tries to scroll to the URI's named anchor. Once we've successfully
   // done that, further calls to this method will be ignored.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsContentUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsContentUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsContentUtils.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsContentUtils.cpp	2015-05-25 20:43:15.000000000 +0000
@@ -247,7 +247,6 @@
 bool nsContentUtils::sInitialized = false;
 bool nsContentUtils::sIsFullScreenApiEnabled = false;
 bool nsContentUtils::sTrustedFullScreenOnly = true;
-bool nsContentUtils::sFullscreenApiIsContentOnly = false;
 bool nsContentUtils::sIsPerformanceTimingEnabled = false;
 bool nsContentUtils::sIsResourceTimingEnabled = false;
 bool nsContentUtils::sIsUserTimingLoggingEnabled = false;
@@ -337,7 +336,7 @@
 static NS_DEFINE_CID(kParserServiceCID, NS_PARSERSERVICE_CID);
 static NS_DEFINE_CID(kCParserCID, NS_PARSER_CID);
 
-static PLDHashTable sEventListenerManagersHash;
+static PLDHashTable2* sEventListenerManagersHash;
 
 class DOMEventListenerManagersHashReporter final : public nsIMemoryReporter
 {
@@ -353,9 +352,9 @@
   {
     // We don't measure the |EventListenerManager| objects pointed to by the
     // entries because those references are non-owning.
-    int64_t amount = sEventListenerManagersHash.IsInitialized()
+    int64_t amount = sEventListenerManagersHash
                    ? PL_DHashTableSizeOfExcludingThis(
-                       &sEventListenerManagersHash, nullptr, MallocSizeOf)
+                       sEventListenerManagersHash, nullptr, MallocSizeOf)
                    : 0;
 
     return MOZ_COLLECT_REPORT(
@@ -488,7 +487,7 @@
   if (!InitializeEventTable())
     return NS_ERROR_FAILURE;
 
-  if (!sEventListenerManagersHash.IsInitialized()) {
+  if (!sEventListenerManagersHash) {
     static const PLDHashTableOps hash_table_ops =
     {
       PL_DHashVoidPtrKeyStub,
@@ -498,8 +497,8 @@
       EventListenerManagerHashInitEntry
     };
 
-    PL_DHashTableInit(&sEventListenerManagersHash, &hash_table_ops,
-                      sizeof(EventListenerManagerMapEntry));
+    sEventListenerManagersHash =
+      new PLDHashTable2(&hash_table_ops, sizeof(EventListenerManagerMapEntry));
 
     RegisterStrongMemoryReporter(new DOMEventListenerManagersHashReporter());
   }
@@ -512,12 +511,6 @@
   Preferences::AddBoolVarCache(&sIsFullScreenApiEnabled,
                                "full-screen-api.enabled");
 
-  // Note: We deliberately read this pref here because this code runs
-  // before the profile loads, so users' changes to this pref in about:config
-  // won't have any effect on behaviour. We don't really want users messing
-  // with this pref, as it affects the security model of the fullscreen API.
-  sFullscreenApiIsContentOnly = Preferences::GetBool("full-screen-api.content-only", false);
-
   Preferences::AddBoolVarCache(&sTrustedFullScreenOnly,
                                "full-screen-api.allow-trusted-requests-only");
 
@@ -1810,8 +1803,8 @@
   delete sUserDefinedEvents;
   sUserDefinedEvents = nullptr;
 
-  if (sEventListenerManagersHash.IsInitialized()) {
-    NS_ASSERTION(sEventListenerManagersHash.EntryCount() == 0,
+  if (sEventListenerManagersHash) {
+    NS_ASSERTION(sEventListenerManagersHash->EntryCount() == 0,
                  "Event listener manager hash not empty at shutdown!");
 
     // See comment above.
@@ -1823,8 +1816,9 @@
     // it could leave dangling references in DOMClassInfo's preserved
     // wrapper table.
 
-    if (sEventListenerManagersHash.EntryCount() == 0) {
-      PL_DHashTableFinish(&sEventListenerManagersHash);
+    if (sEventListenerManagersHash->EntryCount() == 0) {
+      delete sEventListenerManagersHash;
+      sEventListenerManagersHash = nullptr;
     }
   }
 
@@ -3989,8 +3983,8 @@
 void
 nsContentUtils::UnmarkGrayJSListenersInCCGenerationDocuments(uint32_t aGeneration)
 {
-  if (sEventListenerManagersHash.IsInitialized()) {
-    PL_DHashTableEnumerate(&sEventListenerManagersHash, ListenerEnumerator,
+  if (sEventListenerManagersHash) {
+    PL_DHashTableEnumerate(sEventListenerManagersHash, ListenerEnumerator,
                            &aGeneration);
   }
 }
@@ -4000,14 +3994,14 @@
 nsContentUtils::TraverseListenerManager(nsINode *aNode,
                                         nsCycleCollectionTraversalCallback &cb)
 {
-  if (!sEventListenerManagersHash.IsInitialized()) {
+  if (!sEventListenerManagersHash) {
     // We're already shut down, just return.
     return;
   }
 
   EventListenerManagerMapEntry *entry =
     static_cast<EventListenerManagerMapEntry *>
-               (PL_DHashTableSearch(&sEventListenerManagersHash, aNode));
+               (PL_DHashTableSearch(sEventListenerManagersHash, aNode));
   if (entry) {
     CycleCollectionNoteChild(cb, entry->mListenerManager.get(),
                              "[via hash] mListenerManager");
@@ -4017,7 +4011,7 @@
 EventListenerManager*
 nsContentUtils::GetListenerManagerForNode(nsINode *aNode)
 {
-  if (!sEventListenerManagersHash.IsInitialized()) {
+  if (!sEventListenerManagersHash) {
     // We're already shut down, don't bother creating an event listener
     // manager.
 
@@ -4026,7 +4020,7 @@
 
   EventListenerManagerMapEntry *entry =
     static_cast<EventListenerManagerMapEntry *>
-      (PL_DHashTableAdd(&sEventListenerManagersHash, aNode, fallible));
+      (PL_DHashTableAdd(sEventListenerManagersHash, aNode, fallible));
 
   if (!entry) {
     return nullptr;
@@ -4048,7 +4042,7 @@
     return nullptr;
   }
 
-  if (!sEventListenerManagersHash.IsInitialized()) {
+  if (!sEventListenerManagersHash) {
     // We're already shut down, don't bother creating an event listener
     // manager.
 
@@ -4057,7 +4051,7 @@
 
   EventListenerManagerMapEntry *entry =
     static_cast<EventListenerManagerMapEntry *>
-               (PL_DHashTableSearch(&sEventListenerManagersHash, aNode));
+               (PL_DHashTableSearch(sEventListenerManagersHash, aNode));
   if (entry) {
     return entry->mListenerManager;
   }
@@ -4069,16 +4063,16 @@
 void
 nsContentUtils::RemoveListenerManager(nsINode *aNode)
 {
-  if (sEventListenerManagersHash.IsInitialized()) {
+  if (sEventListenerManagersHash) {
     EventListenerManagerMapEntry *entry =
       static_cast<EventListenerManagerMapEntry *>
-                 (PL_DHashTableSearch(&sEventListenerManagersHash, aNode));
+                 (PL_DHashTableSearch(sEventListenerManagersHash, aNode));
     if (entry) {
       nsRefPtr<EventListenerManager> listenerManager;
       listenerManager.swap(entry->mListenerManager);
       // Remove the entry and *then* do operations that could cause further
       // modification of sEventListenerManagersHash.  See bug 334177.
-      PL_DHashTableRawRemove(&sEventListenerManagersHash, entry);
+      PL_DHashTableRawRemove(sEventListenerManagersHash, entry);
       if (listenerManager) {
         listenerManager->Disconnect();
       }
@@ -6636,13 +6630,6 @@
 
 /* static */
 bool
-nsContentUtils::IsFullscreenApiContentOnly()
-{
-  return sFullscreenApiIsContentOnly;
-}
-
-/* static */
-bool
 nsContentUtils::HaveEqualPrincipals(nsIDocument* aDoc1, nsIDocument* aDoc2)
 {
   if (!aDoc1 || !aDoc2) {
@@ -6751,16 +6738,16 @@
 
 /* static */
 nsIDocument*
-nsContentUtils::GetFullscreenAncestor(nsIDocument* aDoc)
+nsContentUtils::GetRootDocument(nsIDocument* aDoc)
 {
+  if (!aDoc) {
+    return nullptr;
+  }
   nsIDocument* doc = aDoc;
-  while (doc) {
-    if (doc->IsFullScreenDoc()) {
-      return doc;
-    }
+  while (doc->GetParentDocument()) {
     doc = doc->GetParentDocument();
   }
-  return nullptr;
+  return doc;
 }
 
 /* static */
@@ -7070,10 +7057,19 @@
 }
 
 bool
-nsContentUtils::GetNodeTextContent(nsINode* aNode, bool aDeep, nsAString& aResult)
+nsContentUtils::GetNodeTextContent(nsINode* aNode, bool aDeep, nsAString& aResult,
+                                   const fallible_t& aFallible)
 {
   aResult.Truncate();
-  return AppendNodeTextContent(aNode, aDeep, aResult, fallible);
+  return AppendNodeTextContent(aNode, aDeep, aResult, aFallible);
+}
+
+void
+nsContentUtils::GetNodeTextContent(nsINode* aNode, bool aDeep, nsAString& aResult)
+{
+  if (!GetNodeTextContent(aNode, aDeep, aResult, fallible)) {
+    NS_ABORT_OOM(0); // Unfortunately we don't know the allocation size
+  }
 }
 
 void
@@ -7763,4 +7759,4 @@
   if (doc->IsShowing() == aFireIfShowing) {
     doc->OnPageShow(true, aChromeEventHandler);
   }
-}
\ No newline at end of file
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsContentUtils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsContentUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsContentUtils.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsContentUtils.h	2015-05-25 20:43:15.000000000 +0000
@@ -1279,6 +1279,9 @@
    */
   MOZ_WARN_UNUSED_RESULT
   static bool GetNodeTextContent(nsINode* aNode, bool aDeep,
+                                 nsAString& aResult, const mozilla::fallible_t&);
+
+  static void GetNodeTextContent(nsINode* aNode, bool aDeep,
                                  nsAString& aResult);
 
   /**
@@ -1860,32 +1863,6 @@
    */
   static bool IsRequestFullScreenAllowed();
 
-  /**
-   * Returns true if the DOM fullscreen API is restricted to content only.
-   * This mirrors the pref "full-screen-api.content-only". If this is true,
-   * fullscreen requests in chrome are denied, and fullscreen requests in
-   * content stop percolating upwards before they reach chrome documents.
-   * That is, when an element in content requests fullscreen, only its
-   * containing frames that are in content are also made fullscreen, not
-   * the containing frame in the chrome document.
-   *
-   * Note if the fullscreen API is running in content only mode then multiple
-   * branches of a doctree can be fullscreen at the same time, but no fullscreen
-   * document will have a common ancestor with another fullscreen document
-   * that is also fullscreen (since the only common ancestor they can have
-   * is the chrome document, and that can't be fullscreen). i.e. multiple
-   * child documents of the chrome document can be fullscreen, but the chrome
-   * document won't be fullscreen.
-   *
-   * Making the fullscreen API content only is useful on platforms where we
-   * still want chrome to be visible or accessible while content is
-   * fullscreen.
-   *
-   * Note that if the fullscreen API is content only, chrome can still go
-   * fullscreen by setting the "fullScreen" attribute on its XUL window.
-   */
-  static bool IsFullscreenApiContentOnly();
-
   /*
    * Returns true if the performance timing APIs are enabled.
    */
@@ -1948,12 +1925,10 @@
   static bool HasPluginWithUncontrolledEventDispatch(nsIContent* aContent);
 
   /**
-   * Returns the document that is the closest ancestor to aDoc that is
-   * fullscreen. If aDoc is fullscreen this returns aDoc. If aDoc is not
-   * fullscreen and none of aDoc's ancestors are fullscreen this returns
-   * nullptr.
+   * Returns the root document in a document hierarchy. Normally this
+   * will be the chrome document.
    */
-  static nsIDocument* GetFullscreenAncestor(nsIDocument* aDoc);
+  static nsIDocument* GetRootDocument(nsIDocument* aDoc);
 
   /**
    * Returns true if aWin and the current pointer lock document
@@ -2452,7 +2427,6 @@
   static bool sAllowXULXBL_for_file;
   static bool sIsFullScreenApiEnabled;
   static bool sTrustedFullScreenOnly;
-  static bool sFullscreenApiIsContentOnly;
   static uint32_t sHandlingInputTimeout;
   static bool sIsPerformanceTimingEnabled;
   static bool sIsResourceTimingEnabled;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsDocument.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsDocument.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsDocument.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsDocument.cpp	2015-05-25 20:43:15.000000000 +0000
@@ -18,7 +18,7 @@
 #include "mozilla/Likely.h"
 #include <algorithm>
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "plstr.h"
 #include "prprf.h"
 
@@ -229,6 +229,8 @@
 #include "mozilla/dom/BoxObject.h"
 #include "gfxVR.h"
 
+#include "nsISpeculativeConnect.h"
+
 #ifdef MOZ_MEDIA_NAVIGATOR
 #include "mozilla/MediaManager.h"
 #endif // MOZ_MEDIA_NAVIGATOR
@@ -241,10 +243,8 @@
 
 typedef nsTArray<Link*> LinkArray;
 
-#ifdef PR_LOGGING
 static PRLogModuleInfo* gDocumentLeakPRLog;
 static PRLogModuleInfo* gCspPRLog;
-#endif
 
 #define NAME_NOT_VALID ((nsSimpleContentList*)1)
 
@@ -1591,17 +1591,15 @@
 {
   SetContentTypeInternal(nsDependentCString(aContentType));
 
-#ifdef PR_LOGGING
   if (!gDocumentLeakPRLog)
     gDocumentLeakPRLog = PR_NewLogModule("DocumentLeak");
 
   if (gDocumentLeakPRLog)
-    PR_LOG(gDocumentLeakPRLog, PR_LOG_DEBUG,
+    MOZ_LOG(gDocumentLeakPRLog, PR_LOG_DEBUG,
            ("DOCUMENT %p created", this));
 
   if (!gCspPRLog)
     gCspPRLog = PR_NewLogModule("CSP");
-#endif
 
   // Start out mLastStyleSheetSet as null, per spec
   SetDOMStringToNull(mLastStyleSheetSet);
@@ -1640,11 +1638,9 @@
 
 nsDocument::~nsDocument()
 {
-#ifdef PR_LOGGING
   if (gDocumentLeakPRLog)
-    PR_LOG(gDocumentLeakPRLog, PR_LOG_DEBUG,
+    MOZ_LOG(gDocumentLeakPRLog, PR_LOG_DEBUG,
            ("DOCUMENT %p destroyed", this));
-#endif
 
   NS_ASSERTION(!mIsShowing, "Destroying a currently-showing document");
 
@@ -2309,13 +2305,11 @@
 {
   NS_PRECONDITION(aURI, "Null URI passed to ResetToURI");
 
-#ifdef PR_LOGGING
   if (gDocumentLeakPRLog && PR_LOG_TEST(gDocumentLeakPRLog, PR_LOG_DEBUG)) {
     nsAutoCString spec;
     aURI->GetSpec(spec);
     PR_LogPrint("DOCUMENT %p ResetToURI %s", this, spec.get());
   }
-#endif
 
   mSecurityInfo = nullptr;
 
@@ -2644,7 +2638,6 @@
                               nsIStreamListener **aDocListener,
                               bool aReset, nsIContentSink* aSink)
 {
-#ifdef PR_LOGGING
   if (gDocumentLeakPRLog && PR_LOG_TEST(gDocumentLeakPRLog, PR_LOG_DEBUG)) {
     nsCOMPtr<nsIURI> uri;
     aChannel->GetURI(getter_AddRefs(uri));
@@ -2653,17 +2646,9 @@
       uri->GetSpec(spec);
     PR_LogPrint("DOCUMENT %p StartDocumentLoad %s", this, spec.get());
   }
-#endif
 
-#ifdef DEBUG
-  {
-    uint32_t appId;
-    nsresult rv = NodePrincipal()->GetAppId(&appId);
-    NS_ENSURE_SUCCESS(rv, rv);
-    MOZ_ASSERT(appId != nsIScriptSecurityManager::UNKNOWN_APP_ID,
-               "Document should never have UNKNOWN_APP_ID");
-  }
-#endif
+  MOZ_ASSERT(NodePrincipal()->GetAppId() != nsIScriptSecurityManager::UNKNOWN_APP_ID,
+             "Document should never have UNKNOWN_APP_ID");
 
   MOZ_ASSERT(GetReadyStateEnum() == nsIDocument::READYSTATE_UNINITIALIZED,
              "Bad readyState");
@@ -2787,13 +2772,11 @@
       const nsSubstring& policy = tokenizer.nextToken();
       rv = csp->AppendPolicy(policy, aReportOnly);
       NS_ENSURE_SUCCESS(rv, rv);
-#ifdef PR_LOGGING
       {
-        PR_LOG(gCspPRLog, PR_LOG_DEBUG,
+        MOZ_LOG(gCspPRLog, PR_LOG_DEBUG,
                 ("CSP refined with policy: \"%s\"",
                 NS_ConvertUTF16toUTF8(policy).get()));
       }
-#endif
   }
   return NS_OK;
 }
@@ -2830,10 +2813,8 @@
 {
   nsCOMPtr<nsIContentSecurityPolicy> csp;
   if (!CSPService::sCSPEnabled) {
-#ifdef PR_LOGGING
-    PR_LOG(gCspPRLog, PR_LOG_DEBUG,
+    MOZ_LOG(gCspPRLog, PR_LOG_DEBUG,
            ("CSP is disabled, skipping CSP init for document %p", this));
-#endif
     return NS_OK;
   }
 
@@ -2864,16 +2845,14 @@
   if (appStatus != nsIPrincipal::APP_STATUS_NOT_INSTALLED) {
     nsCOMPtr<nsIAppsService> appsService = do_GetService(APPS_SERVICE_CONTRACTID);
     if (appsService) {
-      uint32_t appId = 0;
-      if (NS_SUCCEEDED(principal->GetAppId(&appId))) {
-        appsService->GetManifestCSPByLocalId(appId, appManifestCSP);
-        if (!appManifestCSP.IsEmpty()) {
-          applyAppManifestCSP = true;
-        }
-        appsService->GetDefaultCSPByLocalId(appId, appDefaultCSP);
-        if (!appDefaultCSP.IsEmpty()) {
-          applyAppDefaultCSP = true;
-        }
+      uint32_t appId = principal->GetAppId();
+      appsService->GetManifestCSPByLocalId(appId, appManifestCSP);
+      if (!appManifestCSP.IsEmpty()) {
+        applyAppManifestCSP = true;
+      }
+      appsService->GetDefaultCSPByLocalId(appId, appDefaultCSP);
+      if (!appDefaultCSP.IsEmpty()) {
+        applyAppDefaultCSP = true;
       }
     }
   }
@@ -2887,22 +2866,21 @@
       !applyLoopCSP &&
       cspHeaderValue.IsEmpty() &&
       cspROHeaderValue.IsEmpty()) {
-#ifdef PR_LOGGING
-    nsCOMPtr<nsIURI> chanURI;
-    aChannel->GetURI(getter_AddRefs(chanURI));
-    nsAutoCString aspec;
-    chanURI->GetAsciiSpec(aspec);
-    PR_LOG(gCspPRLog, PR_LOG_DEBUG,
-           ("no CSP for document, %s, %s",
-            aspec.get(),
-            applyAppDefaultCSP ? "is app" : "not an app"));
-#endif
+    if (PR_LOG_TEST(gCspPRLog, PR_LOG_DEBUG)) {
+      nsCOMPtr<nsIURI> chanURI;
+      aChannel->GetURI(getter_AddRefs(chanURI));
+      nsAutoCString aspec;
+      chanURI->GetAsciiSpec(aspec);
+      MOZ_LOG(gCspPRLog, PR_LOG_DEBUG,
+             ("no CSP for document, %s, %s",
+              aspec.get(),
+              applyAppDefaultCSP ? "is app" : "not an app"));
+    }
+
     return NS_OK;
   }
 
-#ifdef PR_LOGGING
-  PR_LOG(gCspPRLog, PR_LOG_DEBUG, ("Document is an app or CSP header specified %p", this));
-#endif
+  MOZ_LOG(gCspPRLog, PR_LOG_DEBUG, ("Document is an app or CSP header specified %p", this));
 
   nsresult rv;
 
@@ -2921,12 +2899,10 @@
     NS_ENSURE_SUCCESS(rv, rv);
 
     if (csp) {
-#ifdef PR_LOGGING
-      PR_LOG(gCspPRLog, PR_LOG_DEBUG, ("%s %s %s",
+      MOZ_LOG(gCspPRLog, PR_LOG_DEBUG, ("%s %s %s",
            "This document is sharing principal with another document.",
            "Since the document is an app, CSP was already set.",
            "Skipping attempt to set CSP."));
-#endif
       return NS_OK;
     }
   }
@@ -2934,9 +2910,7 @@
   csp = do_CreateInstance("@mozilla.org/cspcontext;1", &rv);
 
   if (NS_FAILED(rv)) {
-#ifdef PR_LOGGING
-    PR_LOG(gCspPRLog, PR_LOG_DEBUG, ("Failed to create CSP object: %x", rv));
-#endif
+    MOZ_LOG(gCspPRLog, PR_LOG_DEBUG, ("Failed to create CSP object: %x", rv));
     return rv;
   }
 
@@ -2989,10 +2963,8 @@
     rv = csp->PermitsAncestry(docShell, &safeAncestry);
 
     if (NS_FAILED(rv) || !safeAncestry) {
-#ifdef PR_LOGGING
-      PR_LOG(gCspPRLog, PR_LOG_DEBUG,
+      MOZ_LOG(gCspPRLog, PR_LOG_DEBUG,
               ("CSP doesn't like frame's ancestry, not loading."));
-#endif
       // stop!  ERROR page!
       aChannel->Cancel(NS_ERROR_CSP_FRAME_ANCESTOR_VIOLATION);
     }
@@ -3011,13 +2983,11 @@
       mReferrerPolicySet = true;
     } else if (mReferrerPolicy != referrerPolicy) {
       mReferrerPolicy = mozilla::net::RP_No_Referrer;
-#ifdef PR_LOGGING
       {
-        PR_LOG(gCspPRLog, PR_LOG_DEBUG, ("%s %s",
+        MOZ_LOG(gCspPRLog, PR_LOG_DEBUG, ("%s %s",
                 "CSP wants to set referrer, but nsDocument"
                 "already has it set. No referrers will be sent"));
       }
-#endif
     }
 
     // Referrer Policy is set separately for the speculative parser in
@@ -3027,10 +2997,8 @@
 
   rv = principal->SetCsp(csp);
   NS_ENSURE_SUCCESS(rv, rv);
-#ifdef PR_LOGGING
-  PR_LOG(gCspPRLog, PR_LOG_DEBUG,
+  MOZ_LOG(gCspPRLog, PR_LOG_DEBUG,
          ("Inserted CSP into principal %p", principal));
-#endif
 
   return NS_OK;
 }
@@ -4031,7 +3999,7 @@
         SubDocInitEntry
       };
 
-      mSubDocuments = new PLDHashTable(&hash_table_ops, sizeof(SubDocMapEntry));
+      mSubDocuments = new PLDHashTable2(&hash_table_ops, sizeof(SubDocMapEntry));
     }
 
     // Add a mapping to the hash table
@@ -5130,6 +5098,10 @@
   // Unpin references to preloaded images
   mPreloadingImages.Clear();
 
+  // DOM manipulation after content loaded should not care if the element
+  // came from the preloader.
+  mPreloadedPreconnects.Clear();
+
   if (mTiming) {
     mTiming->NotifyDOMContentLoadedStart(nsIDocument::GetDocumentURI());
   }
@@ -7114,8 +7086,7 @@
   nsIContent* title = GetTitleContent(aNamespace);
   if (!title)
     return;
-  if(!nsContentUtils::GetNodeTextContent(title, false, aTitle))
-    NS_RUNTIMEABORT("OOM");
+  nsContentUtils::GetNodeTextContent(title, false, aTitle);
 }
 
 NS_IMETHODIMP
@@ -9845,6 +9816,23 @@
 }
 
 void
+nsDocument::MaybePreconnect(nsIURI* uri)
+{
+  if (mPreloadedPreconnects.Contains(uri)) {
+    return;
+  }
+  mPreloadedPreconnects.Put(uri, true);
+
+  nsCOMPtr<nsISpeculativeConnect>
+    speculator(do_QueryInterface(nsContentUtils::GetIOService()));
+  if (!speculator) {
+    return;
+  }
+
+  speculator->SpeculativeConnect(uri, nullptr);
+}
+
+void
 nsDocument::ForgetImagePreload(nsIURI* aURI)
 {
   // Checking count is faster than hashing the URI in the common
@@ -11085,35 +11073,17 @@
   nsRefPtr<gfx::VRHMDInfo> mHMD;
 };
 
-static nsIDocument*
-GetFullscreenRootDocument(nsIDocument* aDoc)
-{
-  if (!aDoc) {
-    return nullptr;
-  }
-  nsIDocument* doc = aDoc;
-  nsIDocument* parent;
-  while ((parent = doc->GetParentDocument()) &&
-         (!nsContentUtils::IsFullscreenApiContentOnly() ||
-          !nsContentUtils::IsChromeDoc(parent))) {
-    doc = parent;
-  }
-  return doc;
-}
-
 static void
 SetWindowFullScreen(nsIDocument* aDoc, bool aValue, gfx::VRHMDInfo *aVRHMD = nullptr)
 {
   // Maintain list of fullscreen root documents.
-  nsCOMPtr<nsIDocument> root = GetFullscreenRootDocument(aDoc);
+  nsCOMPtr<nsIDocument> root = nsContentUtils::GetRootDocument(aDoc);
   if (aValue) {
     FullscreenRoots::Add(root);
   } else {
     FullscreenRoots::Remove(root);
   }
-  if (!nsContentUtils::IsFullscreenApiContentOnly()) {
-    nsContentUtils::AddScriptRunner(new nsSetWindowFullScreen(aDoc, aValue, aVRHMD));
-  }
+  nsContentUtils::AddScriptRunner(new nsSetWindowFullScreen(aDoc, aValue, aVRHMD));
 }
 
 class nsCallExitFullscreen : public nsRunnable {
@@ -11143,35 +11113,6 @@
   nsDocument::ExitFullscreen(aDoc);
 }
 
-// Returns true if the document is a direct child of a cross process parent
-// mozbrowser iframe or TabParent. This is the case when the document has
-// a null parent and its DocShell reports that it is a browser frame, or
-// we can get a TabChild from it.
-static bool
-HasCrossProcessParent(nsIDocument* aDocument)
-{
-  if (XRE_GetProcessType() != GeckoProcessType_Content) {
-    return false;
-  }
-  if (aDocument->GetParentDocument() != nullptr) {
-    return false;
-  }
-  nsPIDOMWindow* win = aDocument->GetWindow();
-  if (!win) {
-    return false;
-  }
-  nsCOMPtr<nsIDocShell> docShell = win->GetDocShell();
-  if (!docShell) {
-    return false;
-  }
-  TabChild* tabChild(TabChild::GetFrom(docShell));
-  if (!tabChild) {
-    return false;
-  }
-
-  return true;
-}
-
 static bool
 CountFullscreenSubDocuments(nsIDocument* aDoc, void* aData)
 {
@@ -11211,21 +11152,6 @@
     NS_ASSERTION(!aDocument->IsFullScreenDoc(), "Should reset full-screen");
     nsTArray<nsIDocument*>* changed = reinterpret_cast<nsTArray<nsIDocument*>*>(aData);
     changed->AppendElement(aDocument);
-
-    if (HasCrossProcessParent(aDocument)) {
-      // We're at the top of the content-process side doc tree. Ask the parent
-      // process to exit fullscreen.
-      nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
-      os->NotifyObservers(aDocument, "ask-parent-to-exit-fullscreen", nullptr);
-    }
-
-    // Dispatch a notification so that if this document has any
-    // cross-process subdocuments, they'll be notified to exit fullscreen.
-    // The BrowserElementParent listens for this event and performs the
-    // cross process notification if it has a remote child process.
-    nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
-    os->NotifyObservers(aDocument, "ask-children-to-exit-fullscreen", nullptr);
-
     aDocument->EnumerateSubDocuments(ResetFullScreen, aData);
   }
   return true;
@@ -11263,11 +11189,13 @@
   NS_ASSERTION(!root->IsFullScreenDoc(),
     "Fullscreen root should no longer be a fullscreen doc...");
 
-  // Dispatch MozExitedDomFullscreen to the last document in
+  // Dispatch MozDOMFullscreen:Exited to the last document in
   // the list since we want this event to follow the same path
-  // MozEnteredDomFullscreen dispatched.
-  nsRefPtr<AsyncEventDispatcher> asyncDispatcher = new AsyncEventDispatcher(
-    changed.LastElement(), NS_LITERAL_STRING("MozExitedDomFullscreen"), true, true);
+  // MozDOMFullscreen:Entered dispatched.
+  nsRefPtr<AsyncEventDispatcher> asyncDispatcher =
+    new AsyncEventDispatcher(changed.LastElement(),
+                             NS_LITERAL_STRING("MozDOMFullscreen:Exited"),
+                             true, true);
   asyncDispatcher->PostDOMEvent();
   // Move the top-level window out of fullscreen mode.
   SetWindowFullScreen(root, false);
@@ -11318,7 +11246,7 @@
   }
   // Otherwise we could be either in a non-fullscreen doc tree, or we're
   // below the fullscreen doc. Start the search from the root.
-  nsIDocument* root = GetFullscreenRootDocument(aDoc);
+  nsIDocument* root = nsContentUtils::GetRootDocument(aDoc);
   // Check that the root is actually fullscreen so we don't waste time walking
   // around its descendants.
   if (!root->IsFullScreenDoc()) {
@@ -11333,10 +11261,6 @@
 {
   NS_ASSERTION(!IsFullScreenDoc() || !FullscreenRoots::IsEmpty(),
     "Should have at least 1 fullscreen root when fullscreen!");
-  NS_ASSERTION(!nsContentUtils::IsFullscreenApiContentOnly() ||
-               !nsContentUtils::IsChromeDoc(this),
-               "Should not run RestorePreviousFullScreenState() on "
-               "chrome document when fullscreen is content only");
 
   if (!IsFullScreenDoc() || !GetWindow() || FullscreenRoots::IsEmpty()) {
     return;
@@ -11351,12 +11275,6 @@
 
   nsCOMPtr<nsIDocument> fullScreenDoc = GetFullscreenLeaf(this);
 
-  // The fullscreen document may contain a <iframe mozbrowser> element which
-  // has a cross process child. So send a notification so that its browser
-  // parent will send a message to its child process to also exit fullscreen.
-  nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
-  os->NotifyObservers(fullScreenDoc, "ask-children-to-exit-fullscreen", nullptr);
-
   // Clear full-screen stacks in all descendant in process documents, bottom up.
   nsIDocument* doc = fullScreenDoc;
   while (doc != this) {
@@ -11374,12 +11292,6 @@
     UnlockPointer();
     DispatchFullScreenChange(doc);
     if (static_cast<nsDocument*>(doc)->mFullScreenStack.IsEmpty()) {
-      if (HasCrossProcessParent(doc)) {
-        // Send notification to the parent process to tell it to rollback to
-        // the previous fullscreen elements in its fullscreen element stacks.
-        nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
-        os->NotifyObservers(doc, "ask-parent-to-rollback-fullscreen", nullptr);
-      }
       // Full-screen stack in document is empty. Go back up to the parent
       // document. We'll pop the containing element off its stack, and use
       // its next full-screen element as the full-screen element.
@@ -11397,25 +11309,12 @@
             (!nsContentUtils::IsSitePermAllow(doc->NodePrincipal(), "fullscreen") &&
              !static_cast<nsDocument*>(doc)->mIsApprovedForFullscreen)) {
           nsRefPtr<AsyncEventDispatcher> asyncDispatcher =
-            new AsyncEventDispatcher(doc,
-                  NS_LITERAL_STRING("MozEnteredDomFullscreen"),
-                  true,
-                  true);
+            new AsyncEventDispatcher(
+                doc, NS_LITERAL_STRING("MozDOMFullscreen:NewOrigin"),
+                /* Bubbles */ true, /* ChromeOnly */ true);
           asyncDispatcher->PostDOMEvent();
         }
       }
-
-      if (!nsContentUtils::HaveEqualPrincipals(doc, fullScreenDoc)) {
-        // The origin which is fullscreen changed. Send a notification to
-        // the root process so that a warning or approval UI can be shown
-        // as necessary.
-        nsAutoString origin;
-        nsContentUtils::GetUTFOrigin(doc->NodePrincipal(), origin);
-        nsIDocument* root = GetFullscreenRootDocument(doc);
-        nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
-        os->NotifyObservers(root, "fullscreen-origin-change", origin.get());
-      }
-
       break;
     }
   }
@@ -11423,10 +11322,10 @@
   if (doc == nullptr) {
     // We moved all documents in this doctree out of fullscreen mode,
     // move the top-level window out of fullscreen mode.
-    NS_ASSERTION(!GetFullscreenRootDocument(this)->IsFullScreenDoc(),
-      "Should have cleared all docs' stacks");
+    NS_ASSERTION(!nsContentUtils::GetRootDocument(this)->IsFullScreenDoc(),
+                 "Should have cleared all docs' stacks");
     nsRefPtr<AsyncEventDispatcher> asyncDispatcher = new AsyncEventDispatcher(
-      this, NS_LITERAL_STRING("MozExitedDomFullscreen"), true, true);
+      this, NS_LITERAL_STRING("MozDOMFullscreen:Exited"), true, true);
     asyncDispatcher->PostDOMEvent();
     SetWindowFullScreen(this, false);
   }
@@ -11511,8 +11410,7 @@
 nsresult
 nsDocument::AddFullscreenApprovedObserver()
 {
-  if (mHasFullscreenApprovedObserver ||
-      !Preferences::GetBool("full-screen-api.approval-required")) {
+  if (mHasFullscreenApprovedObserver) {
     return NS_OK;
   }
 
@@ -11679,32 +11577,17 @@
   return activeWindow == rootWin;
 }
 
-nsresult nsDocument::RemoteFrameFullscreenChanged(nsIDOMElement* aFrameElement,
-                                                  const nsAString& aOrigin)
+nsresult nsDocument::RemoteFrameFullscreenChanged(nsIDOMElement* aFrameElement)
 {
   // Ensure the frame element is the fullscreen element in this document.
   // 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,
+  RequestFullScreen(content->AsElement(), opts,
                     /* aWasCallerChrome */ false,
                     /* aNotifyOnOriginChange */ false);
 
-  // Origin changed in child process, send notifiction, so that chrome can
-  // update the UI to reflect the fullscreen origin change if necessary.
-  // The BrowserElementChild listens on this, and forwards it over its
-  // parent process, where it is redispatched. Chrome (in the root process,
-  // which could be *this* process) listens for this notification so that
-  // it can show a warning or approval UI.
-  if (!aOrigin.IsEmpty()) {
-    nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
-    os->NotifyObservers(GetFullscreenRootDocument(this),
-                        "fullscreen-origin-change",
-                        PromiseFlatString(aOrigin).get());
-  }
-
   return NS_OK;
 }
 
@@ -11745,13 +11628,6 @@
     LogFullScreenDenied(true, "FullScreenDeniedLostWindow", this);
     return;
   }
-  if (nsContentUtils::IsFullscreenApiContentOnly() &&
-      nsContentUtils::IsChromeDoc(this)) {
-    // Block fullscreen requests in the chrome document when the fullscreen API
-    // is configured for content only.
-    LogFullScreenDenied(true, "FullScreenDeniedContentOnly", this);
-    return;
-  }
   if (!IsFullScreenEnabled(aWasCallerChrome, true)) {
     // IsFullScreenEnabled calls LogFullScreenDenied, no need to log.
     return;
@@ -11798,7 +11674,7 @@
 
   // Remember the root document, so that if a full-screen document is hidden
   // we can reset full-screen state in the remaining visible full-screen documents.
-  nsIDocument* fullScreenRootDoc = GetFullscreenRootDocument(this);
+  nsIDocument* fullScreenRootDoc = nsContentUtils::GetRootDocument(this);
   if (fullScreenRootDoc->IsFullScreenDoc()) {
     // A document is already in fullscreen, unlock the mouse pointer
     // before setting a new document to fullscreen
@@ -11874,19 +11750,32 @@
       nsContentUtils::IsSitePermAllow(NodePrincipal(), "fullscreen");
   }
 
-  // If this document, or a document with the same principal has not
-  // already been approved for fullscreen this fullscreen-session, dispatch
-  // an event so that chrome knows to pop up a warning/approval UI.
-  // Note previousFullscreenDoc=nullptr upon first entry, so we always
-  // take this path on the first time we enter fullscreen in a fullscreen
-  // session.
-  if (!mIsApprovedForFullscreen ||
+  // If it is the first entry of the fullscreen, trigger an event so
+  // that the UI can response to this change, e.g. hide chrome, or
+  // notifying parent process to enter fullscreen. Note that chrome
+  // code may also want to listen to MozDOMFullscreen:NewOrigin event
+  // to pop up warning/approval UI.
+  if (!previousFullscreenDoc) {
+    nsRefPtr<AsyncEventDispatcher> asyncDispatcher =
+      new AsyncEventDispatcher(
+        this, NS_LITERAL_STRING("MozDOMFullscreen:Entered"),
+        /* Bubbles */ true, /* ChromeOnly */ true);
+    asyncDispatcher->PostDOMEvent();
+  }
+
+  // The origin which is fullscreen gets changed. Trigger an event so
+  // that the chrome knows to pop up a warning/approval UI. Note that
+  // previousFullscreenDoc == nullptr upon first entry, so we always
+  // take this path on the first entry. Also note that, in a multi-
+  // process browser, the code in content process is responsible for
+  // sending message with the origin to its parent, and the parent
+  // shouldn't rely on this event itself.
+  if (aNotifyOnOriginChange &&
       !nsContentUtils::HaveEqualPrincipals(previousFullscreenDoc, this)) {
     nsRefPtr<AsyncEventDispatcher> asyncDispatcher =
-      new AsyncEventDispatcher(this,
-                               NS_LITERAL_STRING("MozEnteredDomFullscreen"),
-                               true,
-                               true);
+      new AsyncEventDispatcher(
+        this, NS_LITERAL_STRING("MozDOMFullscreen:NewOrigin"),
+        /* Bubbles */ true, /* ChromeOnly */ true);
     asyncDispatcher->PostDOMEvent();
   }
 
@@ -11903,21 +11792,6 @@
     "GetMozFullScreenElement should match GetFullScreenElement()");
 #endif
 
-  // The origin which is fullscreen changed, send a notifiction so that the
-  // root document knows the origin of the document which requested fullscreen.
-  // This is used for the fullscreen approval UI. If we're in a child
-  // process, the root BrowserElementChild listens for this notification,
-  // and forwards it across to its BrowserElementParent, which
-  // re-broadcasts the message for the root document in its process.
-  if (aNotifyOnOriginChange &&
-      !nsContentUtils::HaveEqualPrincipals(previousFullscreenDoc, this)) {
-    nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
-    nsIDocument* root = GetFullscreenRootDocument(this);
-    nsAutoString origin;
-    nsContentUtils::GetUTFOrigin(NodePrincipal(), origin);
-    os->NotifyObservers(root, "fullscreen-origin-change", origin.get());
-  }
-
   // Make the window full-screen. Note we must make the state changes above
   // before making the window full-screen, as then the document reports as
   // being in full-screen mode when the chrome "fullscreen" event fires,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsDocument.h firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsDocument.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsDocument.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsDocument.h	2015-05-25 20:43:15.000000000 +0000
@@ -1115,6 +1115,8 @@
                                  ReferrerPolicy aReferrerPolicy) override;
   virtual void ForgetImagePreload(nsIURI* aURI) override;
 
+  virtual void MaybePreconnect(nsIURI* uri) override;
+
   virtual void PreloadStyle(nsIURI* uri, const nsAString& charset,
                             const nsAString& aCrossOriginAttr,
                             ReferrerPolicy aReferrerPolicy) override;
@@ -1179,8 +1181,8 @@
   virtual bool IsFullscreenLeaf() override;
   virtual bool IsFullScreenDoc() override;
   virtual void SetApprovedForFullscreen(bool aIsApproved) override;
-  virtual nsresult RemoteFrameFullscreenChanged(nsIDOMElement* aFrameElement,
-                                                const nsAString& aNewOrigin) override;
+  virtual nsresult
+    RemoteFrameFullscreenChanged(nsIDOMElement* aFrameElement) override;
 
   virtual nsresult RemoteFrameFullscreenReverted() override;
   virtual nsIDocument* GetFullscreenRoot() override;
@@ -1217,13 +1219,13 @@
   // This is called asynchronously by nsIDocument::AsyncRequestFullScreen()
   // to move this document into full-screen mode if allowed. aWasCallerChrome
   // should be true when nsIDocument::AsyncRequestFullScreen() was called
-  // by chrome code. aNotifyOnOriginChange denotes whether we should send a
-  // fullscreen-origin-change notification if requesting fullscreen in this
+  // by chrome code. aNotifyOnOriginChange denotes whether we should trigger
+  // a MozFullscreenOriginChanged event if requesting fullscreen in this
   // document causes the origin which is fullscreen to change. We may want to
-  // *not* send this notification if we're calling RequestFullscreen() as part
+  // *not* send this notification if we're calling RequestFullScreen() as part
   // of a continuation of a request in a subdocument, whereupon the caller will
-  // need to send the notification with the origin of the document which
-  // originally requested fullscreen, not *this* document's origin.
+  // need to send some notification itself 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,
@@ -1518,7 +1520,7 @@
 
   nsTArray<nsIObserver*> mCharSetObservers;
 
-  PLDHashTable *mSubDocuments;
+  PLDHashTable2 *mSubDocuments;
 
   // Array of owning references to all children
   nsAttrAndChildArray mChildren;
@@ -1785,6 +1787,11 @@
   // about it anymore.
   nsRefPtrHashtable<nsURIHashKey, imgIRequest> mPreloadingImages;
 
+  // A list of preconnects initiated by the preloader. This prevents
+  // the same uri from being used more than once, and allows the dom
+  // builder to not repeat the work of the preloader.
+  nsDataHashtable< nsURIHashKey, bool> mPreloadedPreconnects;
+
   // Current depth of picture elements from parser
   int32_t mPreloadPictureDepth;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsDOMDataChannel.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsDOMDataChannel.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsDOMDataChannel.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsDOMDataChannel.cpp	2015-05-25 20:43:15.000000000 +0000
@@ -7,13 +7,11 @@
 #include "nsDOMDataChannel.h"
 
 #include "base/basictypes.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetDataChannelLog();
-#endif
 #undef LOG
-#define LOG(args) PR_LOG(GetDataChannelLog(), PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(GetDataChannelLog(), PR_LOG_DEBUG, args)
 
 
 #include "nsDOMDataChannelDeclarations.h"
@@ -272,16 +270,13 @@
   MOZ_ASSERT(NS_IsMainThread(), "Not running on main thread");
 
   nsCOMPtr<nsIInputStream> msgStream;
-  nsresult rv = aData.GetInternalStream(getter_AddRefs(msgStream));
-  if (NS_FAILED(rv)) {
-    aRv.Throw(rv);
+  aData.GetInternalStream(getter_AddRefs(msgStream), aRv);
+  if (NS_WARN_IF(aRv.Failed())){
     return;
   }
 
-  uint64_t msgLength;
-  rv = aData.GetSize(&msgLength);
-  if (NS_FAILED(rv)) {
-    aRv.Throw(rv);
+  uint64_t msgLength = aData.GetSize(aRv);
+  if (NS_WARN_IF(aRv.Failed())){
     return;
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsDOMFileReader.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsDOMFileReader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsDOMFileReader.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsDOMFileReader.cpp	2015-05-25 20:43:15.000000000 +0000
@@ -238,9 +238,7 @@
   SetDOMStringToNull(mResult);
   mResultArrayBuffer = nullptr;
 
-  if (mAsyncStream) {
-    mAsyncStream = nullptr;
-  }
+  mAsyncStream = nullptr;
   mBlob = nullptr;
 
   //Clean up memory buffer
@@ -281,7 +279,8 @@
   // Make sure we drop all the objects that could hold files open now.
   nsCOMPtr<nsIAsyncInputStream> stream;
   mAsyncStream.swap(stream);
-  nsCOMPtr<nsIDOMBlob> blob;
+
+  nsRefPtr<Blob> blob;
   mBlob.swap(blob);
 
   aSuccessEvent = NS_LITERAL_STRING(LOAD_STR);
@@ -408,9 +407,8 @@
   }
 
   nsCOMPtr<nsIInputStream> stream;
-  rv = mBlob->GetInternalStream(getter_AddRefs(stream));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    aRv.Throw(rv);
+  mBlob->GetInternalStream(getter_AddRefs(stream), aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
     return;
   }
 
@@ -439,8 +437,10 @@
   mAsyncStream = do_QueryInterface(wrapper);
   MOZ_ASSERT(mAsyncStream);
 
-  mTotal = mozilla::dom::kUnknownSize;
-  mBlob->GetSize(&mTotal);
+  mTotal = mBlob->GetSize(aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return;
+  }
 
   rv = DoAsyncWait(mAsyncStream);
   if (NS_WARN_IF(NS_FAILED(rv))) {
@@ -462,7 +462,7 @@
 }
 
 nsresult
-nsDOMFileReader::GetAsText(nsIDOMBlob *aBlob,
+nsDOMFileReader::GetAsText(Blob *aBlob,
                            const nsACString &aCharset,
                            const char *aFileData,
                            uint32_t aDataLen,
@@ -502,17 +502,16 @@
 }
 
 nsresult
-nsDOMFileReader::GetAsDataURL(nsIDOMBlob *aBlob,
+nsDOMFileReader::GetAsDataURL(Blob *aBlob,
                               const char *aFileData,
                               uint32_t aDataLen,
                               nsAString& aResult)
 {
   aResult.AssignLiteral("data:");
 
-  nsresult rv;
   nsString contentType;
-  rv = aBlob->GetType(contentType);
-  if (NS_SUCCEEDED(rv) && !contentType.IsEmpty()) {
+  aBlob->GetType(contentType);
+  if (!contentType.IsEmpty()) {
     aResult.Append(contentType);
   } else {
     aResult.AppendLiteral("application/octet-stream");
@@ -520,7 +519,7 @@
   aResult.AppendLiteral(";base64,");
 
   nsCString encodedData;
-  rv = Base64Encode(Substring(aFileData, aDataLen), encodedData);
+  nsresult rv = Base64Encode(Substring(aFileData, aDataLen), encodedData);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (!AppendASCIItoUTF16(encodedData, aResult, fallible)) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsDOMFileReader.h firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsDOMFileReader.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsDOMFileReader.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsDOMFileReader.h	2015-05-25 20:43:15.000000000 +0000
@@ -128,10 +128,10 @@
   void ReadFileContent(Blob& aBlob,
                        const nsAString &aCharset, eDataFormat aDataFormat,
                        ErrorResult& aRv);
-  nsresult GetAsText(nsIDOMBlob *aBlob, const nsACString &aCharset,
+  nsresult GetAsText(Blob *aBlob, const nsACString &aCharset,
                      const char *aFileData, uint32_t aDataLen,
                      nsAString &aResult);
-  nsresult GetAsDataURL(nsIDOMBlob *aBlob, const char *aFileData,
+  nsresult GetAsDataURL(Blob *aBlob, const char *aFileData,
                         uint32_t aDataLen, nsAString &aResult);
 
   void FreeFileData() {
@@ -141,7 +141,7 @@
   }
 
   char *mFileData;
-  nsCOMPtr<nsIDOMBlob> mBlob;
+  nsRefPtr<Blob> mBlob;
   nsCString mCharset;
   uint32_t mDataLen;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsDOMMutationObserver.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsDOMMutationObserver.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsDOMMutationObserver.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsDOMMutationObserver.cpp	2015-05-25 20:43:15.000000000 +0000
@@ -760,7 +760,7 @@
 
   mozilla::dom::Sequence<mozilla::dom::OwningNonNull<nsDOMMutationRecord> >
     mutations;
-  if (mutations.SetCapacity(mPendingMutationCount)) {
+  if (mutations.SetCapacity(mPendingMutationCount, mozilla::fallible)) {
     // We can't use TakeRecords easily here, because it deals with a
     // different type of array, and we want to optimize out any extra copying.
     nsRefPtr<nsDOMMutationRecord> current;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsDOMWindowUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsDOMWindowUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsDOMWindowUtils.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsDOMWindowUtils.cpp	2015-05-25 20:43:15.000000000 +0000
@@ -18,6 +18,7 @@
 #include "nsFocusManager.h"
 #include "nsFrameManager.h"
 #include "nsRefreshDriver.h"
+#include "mozilla/dom/BlobBinding.h"
 #include "mozilla/dom/Touch.h"
 #include "mozilla/PendingAnimationTracker.h"
 #include "nsIObjectLoadingContent.h"
@@ -58,6 +59,7 @@
 #include "nsIContentViewer.h"
 #include "mozilla/StyleAnimationValue.h"
 #include "mozilla/dom/File.h"
+#include "mozilla/dom/FileBinding.h"
 #include "mozilla/dom/DOMRect.h"
 #include <algorithm>
 
@@ -2592,7 +2594,7 @@
 
 NS_IMETHODIMP
 nsDOMWindowUtils::WrapDOMFile(nsIFile *aFile,
-                              nsIDOMFile **aDOMFile)
+                              nsISupports **aDOMFile)
 {
   MOZ_RELEASE_ASSERT(nsContentUtils::IsCallerChrome());
 
@@ -2608,8 +2610,8 @@
     return NS_ERROR_FAILURE;
   }
 
-  nsRefPtr<File> file = File::CreateFromFile(innerWindow, aFile);
-  file.forget(aDOMFile);
+  nsCOMPtr<nsIDOMBlob> blob = File::CreateFromFile(innerWindow, aFile);
+  blob.forget(aDOMFile);
   return NS_OK;
 }
 
@@ -2832,11 +2834,8 @@
     return NS_OK;
   }
 
-  nsISupports* nativeObj =
-    nsContentUtils::XPConnect()->GetNativeOfWrapper(aCx, obj);
-
-  nsCOMPtr<nsIDOMBlob> blob = do_QueryInterface(nativeObj);
-  if (blob) {
+  Blob* blob = nullptr;
+  if (NS_SUCCEEDED(UNWRAP_OBJECT(Blob, obj, blob))) {
     *_retval = blob->GetFileId();
     return NS_OK;
   }
@@ -2858,15 +2857,13 @@
 
   JSObject* obj = aFile.toObjectOrNull();
 
-  nsISupports* nativeObj =
-    nsContentUtils::XPConnect()->GetNativeOfWrapper(aCx, obj);
-
-  nsCOMPtr<nsIDOMFile> file = do_QueryInterface(nativeObj);
-  if (file) {
+  File* file = nullptr;
+  if (NS_SUCCEEDED(UNWRAP_OBJECT(File, obj, file))) {
     nsString filePath;
-    nsresult rv = file->GetMozFullPathInternal(filePath);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
+    ErrorResult rv;
+    file->GetMozFullPathInternal(filePath, rv);
+    if (NS_WARN_IF(rv.Failed())) {
+      return rv.StealNSResult();
     }
 
     _retval = filePath;
@@ -3075,15 +3072,14 @@
 }
 
 nsresult
-nsDOMWindowUtils::RemoteFrameFullscreenChanged(nsIDOMElement* aFrameElement,
-                                            const nsAString& aNewOrigin)
+nsDOMWindowUtils::RemoteFrameFullscreenChanged(nsIDOMElement* aFrameElement)
 {
   MOZ_RELEASE_ASSERT(nsContentUtils::IsCallerChrome());
 
   nsCOMPtr<nsIDocument> doc = GetDocument();
   NS_ENSURE_STATE(doc);
 
-  doc->RemoteFrameFullscreenChanged(aFrameElement, aNewOrigin);
+  doc->RemoteFrameFullscreenChanged(aFrameElement);
   return NS_OK;
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsFocusManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsFocusManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsFocusManager.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsFocusManager.cpp	2015-05-25 20:43:15.000000000 +0000
@@ -71,38 +71,27 @@
 using namespace mozilla::dom;
 using namespace mozilla::widget;
 
-#ifdef PR_LOGGING
-
 // Two types of focus pr logging are available:
 //   'Focus' for normal focus manager calls
 //   'FocusNavigation' for tab and document navigation
 PRLogModuleInfo* gFocusLog;
 PRLogModuleInfo* gFocusNavigationLog;
 
-#define LOGFOCUS(args) PR_LOG(gFocusLog, 4, args)
-#define LOGFOCUSNAVIGATION(args) PR_LOG(gFocusNavigationLog, 4, args)
+#define LOGFOCUS(args) MOZ_LOG(gFocusLog, PR_LOG_DEBUG, args)
+#define LOGFOCUSNAVIGATION(args) MOZ_LOG(gFocusNavigationLog, PR_LOG_DEBUG, args)
 
 #define LOGTAG(log, format, content)                            \
-  {                                                             \
+  if (PR_LOG_TEST(log, PR_LOG_DEBUG)) {                         \
     nsAutoCString tag(NS_LITERAL_CSTRING("(none)"));            \
     if (content) {                                              \
       content->NodeInfo()->NameAtom()->ToUTF8String(tag);       \
     }                                                           \
-    PR_LOG(log, 4, (format, tag.get()));                        \
+    MOZ_LOG(log, PR_LOG_DEBUG, (format, tag.get()));             \
   }
 
 #define LOGCONTENT(format, content) LOGTAG(gFocusLog, format, content)
 #define LOGCONTENTNAVIGATION(format, content) LOGTAG(gFocusNavigationLog, format, content)
 
-#else
-
-#define LOGFOCUS(args)
-#define LOGFOCUSNAVIGATION(args)
-#define LOGCONTENT(format, content)
-#define LOGCONTENTNAVIGATION(format, content)
-
-#endif
-
 struct nsDelayedBlurOrFocusEvent
 {
   nsDelayedBlurOrFocusEvent(uint32_t aType,
@@ -198,10 +187,8 @@
   NS_ADDREF(fm);
   sInstance = fm;
 
-#ifdef PR_LOGGING
   gFocusLog = PR_NewLogModule("Focus");
   gFocusNavigationLog = PR_NewLogModule("FocusNavigation");
-#endif
 
   nsIContent::sTabFocusModelAppliesToXUL =
     Preferences::GetBool("accessibility.tabfocus_applies_to_xul",
@@ -493,7 +480,6 @@
 {
   *aElement = nullptr;
 
-#ifdef PR_LOGGING
   LOGFOCUS(("<<MoveFocus begin Type: %d Flags: %x>>", aType, aFlags));
 
   if (PR_LOG_TEST(gFocusLog, PR_LOG_DEBUG) && mFocusedWindow) {
@@ -506,7 +492,6 @@
   }
 
   LOGCONTENT("  Current Focus: %s", mFocusedContent.get());
-#endif
 
   // use FLAG_BYMOVEFOCUS when switching focus with MoveFocus unless one of
   // the other focus methods is already set, or we're just moving to the root
@@ -653,7 +638,6 @@
   nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aWindow);
   NS_ENSURE_TRUE(window && window->IsOuterWindow(), NS_ERROR_INVALID_ARG);
 
-#ifdef PR_LOGGING
   if (PR_LOG_TEST(gFocusLog, PR_LOG_DEBUG)) {
     LOGFOCUS(("Window %p Raised [Currently: %p %p]", aWindow, mActiveWindow.get(), mFocusedWindow.get()));
     nsAutoCString spec;
@@ -670,7 +654,6 @@
       }
     }
   }
-#endif
 
   if (mActiveWindow == window) {
     // The window is already active, so there is no need to focus anything,
@@ -751,7 +734,6 @@
   nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aWindow);
   NS_ENSURE_TRUE(window && window->IsOuterWindow(), NS_ERROR_INVALID_ARG);
 
-#ifdef PR_LOGGING
   if (PR_LOG_TEST(gFocusLog, PR_LOG_DEBUG)) {
     LOGFOCUS(("Window %p Lowered [Currently: %p %p]", aWindow, mActiveWindow.get(), mFocusedWindow.get()));
     nsAutoCString spec;
@@ -768,7 +750,6 @@
       }
     }
   }
-#endif
 
   if (mActiveWindow != window)
     return NS_OK;
@@ -871,7 +852,6 @@
 
   window = window->GetOuterWindow();
 
-#ifdef PR_LOGGING
   if (PR_LOG_TEST(gFocusLog, PR_LOG_DEBUG)) {
     LOGFOCUS(("Window %p Shown [Currently: %p %p]", window.get(), mActiveWindow.get(), mFocusedWindow.get()));
     nsAutoCString spec;
@@ -889,7 +869,6 @@
       }
     }
   }
-#endif
 
   if (nsCOMPtr<nsITabChild> child = do_GetInterface(window->GetDocShell())) {
     bool active = static_cast<TabChild*>(child.get())->ParentIsActive();
@@ -928,7 +907,6 @@
 
   window = window->GetOuterWindow();
 
-#ifdef PR_LOGGING
   if (PR_LOG_TEST(gFocusLog, PR_LOG_DEBUG)) {
     LOGFOCUS(("Window %p Hidden [Currently: %p %p]", window.get(), mActiveWindow.get(), mFocusedWindow.get()));
     nsAutoCString spec;
@@ -954,7 +932,6 @@
       }
     }
   }
-#endif
 
   if (!IsSameOrAncestor(window, mFocusedWindow))
     return NS_OK;
@@ -1254,16 +1231,15 @@
   // key input if a windowed plugin is focused, so just exit fullscreen
   // to guard against phishing.
 #ifndef XP_MACOSX
-  nsIDocument* fullscreenAncestor;
   if (contentToFocus &&
-      (fullscreenAncestor = nsContentUtils::GetFullscreenAncestor(contentToFocus->OwnerDoc())) &&
+      nsContentUtils::GetRootDocument(contentToFocus->OwnerDoc())->IsFullScreenDoc() &&
       nsContentUtils::HasPluginWithUncontrolledEventDispatch(contentToFocus)) {
     nsContentUtils::ReportToConsole(nsIScriptError::warningFlag,
                                     NS_LITERAL_CSTRING("DOM"),
                                     contentToFocus->OwnerDoc(),
                                     nsContentUtils::eDOM_PROPERTIES,
                                     "FocusedWindowedPluginWhileFullScreen");
-    nsIDocument::ExitFullscreen(fullscreenAncestor, /* async */ true);
+    nsIDocument::ExitFullscreen(contentToFocus->OwnerDoc(), /* async */ true);
   }
 #endif
 
@@ -1799,7 +1775,6 @@
     clearFirstFocusEvent = true;
   }
 
-#ifdef PR_LOGGING
   LOGCONTENT("Element %s has been focused", aContent);
 
   if (PR_LOG_TEST(gFocusLog, PR_LOG_DEBUG)) {
@@ -1810,7 +1785,6 @@
     LOGFOCUS((" [Newdoc: %d FocusChanged: %d Raised: %d Flags: %x]",
              aIsNewDocument, aFocusChanged, aWindowRaised, aFlags));
   }
-#endif
 
   if (aIsNewDocument) {
     // if this is a new document, update the parent chain of frames so that
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsFrameLoader.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsFrameLoader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsFrameLoader.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsFrameLoader.cpp	2015-05-25 20:43:15.000000000 +0000
@@ -23,7 +23,6 @@
 #include "nsIContentViewer.h"
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
-#include "nsIDOMFile.h"
 #include "nsPIDOMWindow.h"
 #include "nsIWebNavigation.h"
 #include "nsIWebProgress.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsFrameMessageManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsFrameMessageManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsFrameMessageManager.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsFrameMessageManager.cpp	2015-05-25 20:43:15.000000000 +0000
@@ -675,7 +675,7 @@
   //    properly cases when interface is implemented in JS and used
   //    as a dictionary.
   nsAutoString json;
-  NS_ENSURE_TRUE(JS_Stringify(aCx, &v, JS::NullPtr(), JS::NullHandleValue,
+  NS_ENSURE_TRUE(JS_Stringify(aCx, &v, nullptr, JS::NullHandleValue,
                               JSONCreator, &json), false);
   NS_ENSURE_TRUE(!json.IsEmpty(), false);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsGlobalWindow.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsGlobalWindow.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsGlobalWindow.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsGlobalWindow.cpp	2015-05-25 20:43:15.000000000 +0000
@@ -174,7 +174,7 @@
 #include "nsFrameLoader.h"
 #include "nsISupportsPrimitives.h"
 #include "nsXPCOMCID.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prenv.h"
 #include "prprf.h"
 
@@ -246,9 +246,7 @@
 #include <android/log.h>
 #endif
 
-#ifdef PR_LOGGING
 static PRLogModuleInfo* gDOMLeakPRLog;
-#endif
 
 #ifdef XP_WIN
 #include <process.h>
@@ -1212,11 +1210,9 @@
   }
 #endif
 
-#ifdef PR_LOGGING
   if (gDOMLeakPRLog)
-    PR_LOG(gDOMLeakPRLog, PR_LOG_DEBUG,
+    MOZ_LOG(gDOMLeakPRLog, PR_LOG_DEBUG,
            ("DOMWINDOW %p created outer=%p", this, aOuterWindow));
-#endif
 
   NS_ASSERTION(sWindowsById, "Windows hash table must be created!");
   NS_ASSERTION(!sWindowsById->Get(mWindowID),
@@ -1248,10 +1244,8 @@
   NS_ASSERTION(gEntropyCollector,
                "gEntropyCollector should have been initialized!");
 
-#ifdef PR_LOGGING
   gDOMLeakPRLog = PR_NewLogModule("DOMLeak");
   NS_ASSERTION(gDOMLeakPRLog, "gDOMLeakPRLog should have been initialized!");
-#endif
 
   sWindowsById = new WindowByIdTable();
 }
@@ -1306,11 +1300,9 @@
   }
 #endif
 
-#ifdef PR_LOGGING
   if (gDOMLeakPRLog)
-    PR_LOG(gDOMLeakPRLog, PR_LOG_DEBUG,
+    MOZ_LOG(gDOMLeakPRLog, PR_LOG_DEBUG,
            ("DOMWINDOW %p destroyed", this));
-#endif
 
   if (IsOuterWindow()) {
     JSObject *proxy = GetWrapperPreserveColor();
@@ -2812,7 +2804,6 @@
   NS_PRECONDITION(IsInnerWindow(), "Must only be called on inner windows");
   MOZ_ASSERT(aDocument);
 
-#ifdef PR_LOGGING
   if (gDOMLeakPRLog && PR_LOG_TEST(gDOMLeakPRLog, PR_LOG_DEBUG)) {
     nsIURI *uri = aDocument->GetDocumentURI();
     nsAutoCString spec;
@@ -2820,7 +2811,6 @@
       uri->GetSpec(spec);
     PR_LogPrint("DOMWINDOW %p SetNewDocument %s", this, spec.get());
   }
-#endif
 
   mDoc = aDocument;
   ClearDocumentDependentSlots(aCx);
@@ -8160,7 +8150,7 @@
     port->BindToOwner(scInfo->window);
     scInfo->ports.Put(port, nullptr);
 
-    JS::Rooted<JSObject*> obj(aCx, port->WrapObject(aCx, JS::NullPtr()));
+    JS::Rooted<JSObject*> obj(aCx, port->WrapObject(aCx, nullptr));
     if (JS_WrapObject(aCx, &obj)) {
       MOZ_ASSERT(port->GetOwner() == scInfo->window);
       returnObject.set(obj);
@@ -8438,13 +8428,8 @@
     nsCOMPtr<nsIPrincipal> principal = nsContentUtils::SubjectPrincipal();
     MOZ_ASSERT(principal);
 
-    uint32_t appId;
-    if (NS_WARN_IF(NS_FAILED(principal->GetAppId(&appId))))
-      return;
-
-    bool isInBrowser;
-    if (NS_WARN_IF(NS_FAILED(principal->GetIsInBrowserElement(&isInBrowser))))
-      return;
+    uint32_t appId = principal->GetAppId();
+    bool isInBrowser = principal->GetIsInBrowserElement();
 
     // Create a nsIPrincipal inheriting the app/browser attributes from the
     // caller.
@@ -10573,11 +10558,9 @@
   }
 
   if (mSessionStorage) {
-#ifdef PR_LOGGING
     if (PR_LOG_TEST(gDOMLeakPRLog, PR_LOG_DEBUG)) {
       PR_LogPrint("nsGlobalWindow %p has %p sessionStorage", this, mSessionStorage.get());
     }
-#endif
     bool canAccess = mSessionStorage->CanAccess(principal);
     NS_ASSERTION(canAccess,
                  "This window owned sessionStorage "
@@ -10626,11 +10609,9 @@
     mSessionStorage = static_cast<DOMStorage*>(storage.get());
     MOZ_ASSERT(mSessionStorage);
 
-#ifdef PR_LOGGING
     if (PR_LOG_TEST(gDOMLeakPRLog, PR_LOG_DEBUG)) {
       PR_LogPrint("nsGlobalWindow %p tried to get a new sessionStorage %p", this, mSessionStorage.get());
     }
-#endif
 
     if (!mSessionStorage) {
       aError.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
@@ -10638,11 +10619,9 @@
     }
   }
 
-#ifdef PR_LOGGING
   if (PR_LOG_TEST(gDOMLeakPRLog, PR_LOG_DEBUG)) {
     PR_LogPrint("nsGlobalWindow %p returns %p sessionStorage", this, mSessionStorage.get());
   }
-#endif
 
   return mSessionStorage;
 }
@@ -11558,12 +11537,10 @@
         return NS_OK;
       }
 
-#ifdef PR_LOGGING
       if (PR_LOG_TEST(gDOMLeakPRLog, PR_LOG_DEBUG)) {
         PR_LogPrint("nsGlobalWindow %p with sessionStorage %p passing event from %p",
                     this, mSessionStorage.get(), changingStorage.get());
       }
-#endif
 
       fireMozStorageChanged = mSessionStorage == changingStorage;
       break;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsGlobalWindow.h firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsGlobalWindow.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsGlobalWindow.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsGlobalWindow.h	2015-05-25 20:43:15.000000000 +0000
@@ -408,7 +408,7 @@
                                 bool aUseCapture,
                                 const mozilla::dom::Nullable<bool>& aWantsUntrusted,
                                 mozilla::ErrorResult& aRv) override;
-  virtual nsIDOMWindow* GetOwnerGlobal() override
+  virtual nsIDOMWindow* GetOwnerGlobalForBindings() override
   {
     if (IsOuterWindow()) {
       return this;
@@ -417,6 +417,15 @@
     return GetOuterFromCurrentInner(this);
   }
 
+  virtual nsIGlobalObject* GetOwnerGlobal() const override
+  {
+    if (IsOuterWindow()) {
+      return GetCurrentInnerWindowInternal();
+    }
+
+    return const_cast<nsGlobalWindow*>(this);
+  }
+
   // nsPIDOMWindow
   virtual nsPIDOMWindow* GetPrivateRoot() override;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsHostObjectProtocolHandler.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsHostObjectProtocolHandler.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsHostObjectProtocolHandler.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsHostObjectProtocolHandler.cpp	2015-05-25 20:43:15.000000000 +0000
@@ -205,9 +205,9 @@
                                         void* aUserArg)
   {
     EnumArg* envp = static_cast<EnumArg*>(aUserArg);
-    nsCOMPtr<nsIDOMBlob> blob;
+    nsCOMPtr<nsIDOMBlob> tmp = do_QueryInterface(aInfo->mObject);
+    nsRefPtr<Blob> blob = static_cast<Blob*>(tmp.get());
 
-    blob = do_QueryInterface(aInfo->mObject);
     if (blob) {
       NS_NAMED_LITERAL_CSTRING
         (desc, "A blob URL allocated with URL.createObjectURL; the referenced "
@@ -226,7 +226,10 @@
       bool isMemoryFile = blob->IsMemoryFile();
 
       if (isMemoryFile) {
-        if (NS_FAILED(blob->GetSize(&size))) {
+        ErrorResult rv;
+        size = blob->GetSize(rv);
+        if (NS_WARN_IF(rv.Failed())) {
+          rv.SuppressException();
           size = 0;
         }
       }
@@ -462,13 +465,18 @@
 }
 
 static nsISupports*
+GetDataObjectForSpec(const nsACString& aSpec)
+{
+  DataInfo* info = GetDataInfo(aSpec);
+  return info ? info->mObject : nullptr;
+}
+
+static nsISupports*
 GetDataObject(nsIURI* aURI)
 {
   nsCString spec;
   aURI->GetSpec(spec);
-
-  DataInfo* info = GetDataInfo(spec);
-  return info ? info->mObject : nullptr;
+  return GetDataObjectForSpec(spec);
 }
 
 // -----------------------------------------------------------------------
@@ -544,9 +552,12 @@
   }
 #endif
 
+  ErrorResult rv;
   nsCOMPtr<nsIInputStream> stream;
-  nsresult rv = blob->GetInternalStream(getter_AddRefs(stream));
-  NS_ENSURE_SUCCESS(rv, rv);
+  blob->GetInternalStream(getter_AddRefs(stream), rv);
+  if (NS_WARN_IF(rv.Failed())) {
+    return rv.StealNSResult();
+  }
 
   nsCOMPtr<nsIChannel> channel;
   rv = NS_NewInputStreamChannelInternal(getter_AddRefs(channel),
@@ -555,7 +566,9 @@
                                         EmptyCString(), // aContentType
                                         EmptyCString(), // aContentCharset
                                         aLoadInfo);
-  NS_ENSURE_SUCCESS(rv, rv);
+  if (NS_WARN_IF(rv.Failed())) {
+    return rv.StealNSResult();
+  }
 
   nsString type;
   blob->GetType(type);
@@ -566,10 +579,9 @@
     channel->SetContentDispositionFilename(filename);
   }
 
-  ErrorResult error;
-  uint64_t size = blob->GetSize(error);
-  if (NS_WARN_IF(error.Failed())) {
-    return error.StealNSResult();
+  uint64_t size = blob->GetSize(rv);
+  if (NS_WARN_IF(rv.Failed())) {
+    return rv.StealNSResult();
   }
 
   channel->SetOriginalURI(uri);
@@ -641,15 +653,35 @@
 }
 
 nsresult
+NS_GetBlobForBlobURISpec(const nsACString& aSpec, BlobImpl** aBlob)
+{
+  *aBlob = nullptr;
+
+  nsCOMPtr<BlobImpl> blob = do_QueryInterface(GetDataObjectForSpec(aSpec));
+  if (!blob) {
+    return NS_ERROR_DOM_BAD_URI;
+  }
+
+  blob.forget(aBlob);
+  return NS_OK;
+}
+
+nsresult
 NS_GetStreamForBlobURI(nsIURI* aURI, nsIInputStream** aStream)
 {
   nsRefPtr<BlobImpl> blobImpl;
-  nsresult rv = NS_GetBlobForBlobURI(aURI, getter_AddRefs(blobImpl));
-  if (NS_FAILED(rv)) {
-    return rv;
+  ErrorResult rv;
+  rv = NS_GetBlobForBlobURI(aURI, getter_AddRefs(blobImpl));
+  if (NS_WARN_IF(rv.Failed())) {
+    return rv.StealNSResult();
   }
 
-  return blobImpl->GetInternalStream(aStream);
+  blobImpl->GetInternalStream(aStream, rv);
+  if (NS_WARN_IF(rv.Failed())) {
+    return rv.StealNSResult();
+  }
+
+  return NS_OK;
 }
 
 nsresult
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsHostObjectProtocolHandler.h firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsHostObjectProtocolHandler.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsHostObjectProtocolHandler.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsHostObjectProtocolHandler.h	2015-05-25 20:43:15.000000000 +0000
@@ -125,6 +125,9 @@
 NS_GetBlobForBlobURI(nsIURI* aURI, mozilla::dom::BlobImpl** aBlob);
 
 extern nsresult
+NS_GetBlobForBlobURISpec(const nsACString& aSpec, mozilla::dom::BlobImpl** aBlob);
+
+extern nsresult
 NS_GetStreamForBlobURI(nsIURI* aURI, nsIInputStream** aStream);
 
 extern nsresult
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsIDocument.h firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsIDocument.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsIDocument.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsIDocument.h	2015-05-25 20:43:15.000000000 +0000
@@ -151,8 +151,8 @@
 } // namespace mozilla
 
 #define NS_IDOCUMENT_IID \
-{ 0x0b78eabe, 0x8b94, 0x4ea1, \
-  { 0x93, 0x31, 0x5d, 0x48, 0xe8, 0x3a, 0xda, 0x95 } }
+{ 0xdcfa30f2, 0x2197, 0x421f, \
+  { 0xa7, 0x5a, 0x3e, 0x70, 0x18, 0x08, 0xde, 0x81 } }
 
 // Enum for requesting a particular type of document when creating a doc
 enum DocumentFlavor {
@@ -1094,11 +1094,10 @@
    * Called when a frame in a child process has entered fullscreen or when a
    * fullscreen frame in a child process changes to another origin.
    * aFrameElement is the frame element which contains the child-process
-   * fullscreen document, and aNewOrigin is the origin of the new fullscreen
-   * document.
+   * fullscreen document.
    */
-  virtual nsresult RemoteFrameFullscreenChanged(nsIDOMElement* aFrameElement,
-                                                const nsAString& aNewOrigin) = 0;
+  virtual nsresult
+    RemoteFrameFullscreenChanged(nsIDOMElement* aFrameElement) = 0;
 
   /**
    * Called when a frame in a remote child document has rolled back fullscreen
@@ -1161,10 +1160,7 @@
    *
    * Note that the fullscreen leaf is the bottom-most document which is
    * fullscreen, it may have non-fullscreen child documents. The fullscreen
-   * root is usually the chrome document, but if fullscreen is content-only,
-   * (see the comment in nsContentUtils.h on IsFullscreenApiContentOnly())
-   * the fullscreen root will be a direct child of the chrome document, and
-   * there may be other branches of the same doctree that are fullscreen.
+   * root is normally the chrome document.
    *
    * If aRunAsync is true, fullscreen is executed asynchronously.
    *
@@ -2021,6 +2017,11 @@
    */
   virtual bool IsDocumentRightToLeft() { return false; }
 
+  /**
+   * Called by Parser for link rel=preconnect
+   */
+  virtual void MaybePreconnect(nsIURI* uri) = 0;
+
   enum DocumentTheme {
     Doc_Theme_Uninitialized, // not determined yet
     Doc_Theme_None,
@@ -2872,7 +2873,7 @@
   nsTArray<nsWeakPtr> mBlockedTrackingNodes;
 
   // Weak reference to mScriptGlobalObject QI:d to nsPIDOMWindow,
-  // updated on every set of mSecriptGlobalObject.
+  // updated on every set of mScriptGlobalObject.
   nsPIDOMWindow *mWindow;
 
   nsCOMPtr<nsIDocumentEncoder> mCachedEncoder;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsIDOMBlob.idl firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsIDOMBlob.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsIDOMBlob.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsIDOMBlob.idl	2015-05-25 20:43:15.000000000 +0000
@@ -0,0 +1,12 @@
+/* -*- 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"
+
+[scriptable, builtinclass, uuid(f344146a-ee1f-417e-8a68-6984ca56f0ae)]
+interface nsIDOMBlob : nsISupports
+{
+  // Just an empty interface.
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsIDOMFile.idl firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsIDOMFile.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsIDOMFile.idl	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsIDOMFile.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +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 "nsISupports.idl"
-
-%{C++
-namespace mozilla {
-namespace dom {
-namespace indexedDB {
-class FileInfo;
-class FileManager;
-}
-}
-}
-
-%}
-
-[ptr] native FileInfo(mozilla::dom::indexedDB::FileInfo);
-[ptr] native FileManager(mozilla::dom::indexedDB::FileManager);
-
-interface nsIDOMFileError;
-interface nsIInputStream;
-interface nsIURI;
-interface nsIPrincipal;
-interface nsIDOMBlob;
-
-[scriptable, builtinclass, uuid(6ef56697-7c9c-41ac-83df-e01c079fb1d1)]
-interface nsIDOMBlob : nsISupports
-{
-  readonly attribute unsigned long long size;
-  readonly attribute DOMString type;
-
-  [noscript] readonly attribute nsIInputStream internalStream;
-
-  [optional_argc] nsIDOMBlob slice([optional] in long long start,
-                                   [optional] in long long end,
-                                   [optional] in DOMString contentType);
-
-  // Get internal id of stored file. Returns -1 if it is not a stored file.
-  // Intended only for testing. It can be called on any thread.
-  [notxpcom] long long getFileId();
-
-  // Called when the blob was successfully stored in a database or when
-  // the blob is initialized from a database. It can be called on any thread.
-  [notxpcom] void addFileInfo(in FileInfo aFileInfo);
-
-  // Called before the blob is stored in a database to decide if it can be
-  // shared or needs to be copied. It can be called on any thread.
-  [notxpcom] FileInfo getFileInfo(in FileManager aFileManager);
-
-  // Return true if this blob is a memory file.
-  [notxpcom] bool isMemoryFile();
-};
-
-// We want to avoid multiple inheritance of nsIDOMBlob so we can downcast from
-// nsIDOMBlob to Blob safely.  Our chain is:
-//  - Blob -> nsIDOMBlob
-//  - File -> nsIDOMFile and Blob
-[scriptable, builtinclass, uuid(cc28cf12-f1d4-44ff-843f-9289aa14613b)]
-interface nsIDOMFile : nsISupports
-{
-  readonly attribute DOMString name;
-
-  readonly attribute DOMString path;
-
-  [implicit_jscontext]
-  readonly attribute jsval lastModifiedDate;
-
-  readonly attribute DOMString mozFullPath;
-
-  // This performs no security checks!
-  [noscript] readonly attribute DOMString mozFullPathInternal;
-
-  [noscript] readonly attribute int64_t mozLastModifiedDate;
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsIDOMFileList.idl firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsIDOMFileList.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsIDOMFileList.idl	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsIDOMFileList.idl	2015-05-25 20:43:15.000000000 +0000
@@ -5,11 +5,10 @@
 
 #include "nsISupports.idl"
 
-interface nsIDOMFile;
-
-[uuid(283aa7b2-da81-4c72-aea2-9797b440fe34)]
+[uuid(57128a85-34de-42db-a252-84dd57724a59)]
 interface nsIDOMFileList : nsISupports
 {
   readonly attribute unsigned long length;
-  nsIDOMFile item(in unsigned long index);
+  // returns a DOM File object
+  nsISupports item(in unsigned long index);
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsINode.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsINode.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsINode.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsINode.cpp	2015-05-25 20:43:15.000000000 +0000
@@ -105,10 +105,16 @@
 #include "nsDOMMutationObserver.h"
 #include "GeometryUtils.h"
 #include "nsIAnimationObserver.h"
+#include "nsChildContentList.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
 
+nsINode::nsSlots::nsSlots()
+  : mWeakReference(nullptr)
+{
+}
+
 nsINode::nsSlots::~nsSlots()
 {
   if (mChildNodes) {
@@ -1296,13 +1302,20 @@
 }
 
 nsIDOMWindow*
-nsINode::GetOwnerGlobal()
+nsINode::GetOwnerGlobalForBindings()
 {
   bool dummy;
   return nsPIDOMWindow::GetOuterFromCurrentInner(
     static_cast<nsGlobalWindow*>(OwnerDoc()->GetScriptHandlingObject(dummy)));
 }
 
+nsIGlobalObject*
+nsINode::GetOwnerGlobal() const
+{
+  bool dummy;
+  return OwnerDoc()->GetScriptHandlingObject(dummy);
+}
+
 bool
 nsINode::UnoptimizableCCNode() const
 {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsINode.h firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsINode.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsINode.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsINode.h	2015-05-25 20:43:15.000000000 +0000
@@ -12,7 +12,6 @@
 #include "nsGkAtoms.h"              // for nsGkAtoms::baseURIProperty
 #include "nsIDOMNode.h"
 #include "mozilla/dom/NodeInfo.h"            // member (in nsCOMPtr)
-#include "nsINodeList.h"            // base class
 #include "nsIVariant.h"             // for use in GetUserData()
 #include "nsNodeInfoManager.h"      // for use in NodePrincipal()
 #include "nsPropertyTable.h"        // for typedefs
@@ -44,6 +43,7 @@
 class nsIFrame;
 class nsIMutationObserver;
 class nsINode;
+class nsINodeList;
 class nsIPresShell;
 class nsIPrincipal;
 class nsIURI;
@@ -234,52 +234,6 @@
   static uint64_t sGeneration;
 };
 
-/**
- * Class that implements the nsIDOMNodeList interface (a list of children of
- * the content), by holding a reference to the content and delegating GetLength
- * and Item to its existing child list.
- * @see nsIDOMNodeList
- */
-class nsChildContentList final : public nsINodeList
-{
-public:
-  explicit nsChildContentList(nsINode* aNode)
-    : mNode(aNode)
-  {
-  }
-
-  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-  NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS(nsChildContentList)
-
-  // nsWrapperCache
-  virtual JSObject* WrapObject(JSContext *cx, JS::Handle<JSObject*> aGivenProto) override;
-
-  // nsIDOMNodeList interface
-  NS_DECL_NSIDOMNODELIST
-
-  // nsINodeList interface
-  virtual int32_t IndexOf(nsIContent* aContent) override;
-  virtual nsIContent* Item(uint32_t aIndex) override;
-
-  void DropReference()
-  {
-    mNode = nullptr;
-  }
-
-  virtual nsINode* GetParentObject() override
-  {
-    return mNode;
-  }
-
-private:
-  ~nsChildContentList() {}
-
-  // The node whose children make up the list.
-  // This is a non-owning ref which is safe because it's set to nullptr by
-  // DropReference() by the node slots get destroyed.
-  nsINode* MOZ_NON_OWNING_REF mNode;
-};
-
 // This should be used for any nsINode sub-class that has fields of its own
 // that it needs to measure;  any sub-class that doesn't use it will inherit
 // SizeOfExcludingThis from its super-class.  SizeOfIncludingThis() need not be
@@ -988,7 +942,8 @@
                                 const mozilla::dom::Nullable<bool>& aWantsUntrusted,
                                 mozilla::ErrorResult& aRv) override;
   using nsIDOMEventTarget::AddSystemEventListener;
-  virtual nsIDOMWindow* GetOwnerGlobal() override;
+  virtual nsIDOMWindow* GetOwnerGlobalForBindings() override;
+  virtual nsIGlobalObject* GetOwnerGlobal() const override;
 
   /**
    * Adds a mutation observer to be notified when this node, or any of its
@@ -1066,10 +1021,7 @@
   class nsSlots
   {
   public:
-    nsSlots()
-      : mWeakReference(nullptr)
-    {
-    }
+    nsSlots();
 
     // If needed we could remove the vtable pointer this dtor causes by
     // putting a DestroySlots function on nsINode
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsINodeList.h firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsINodeList.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsINodeList.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsINodeList.h	2015-05-25 20:43:15.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "nsIDOMNodeList.h"
 #include "nsWrapperCache.h"
+#include "nsIContent.h"
 
 // IID for the nsINodeList interface
 #define NS_INODELIST_IID \
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsInProcessTabChildGlobal.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsInProcessTabChildGlobal.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsInProcessTabChildGlobal.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsInProcessTabChildGlobal.cpp	2015-05-25 20:43:16.000000000 +0000
@@ -26,6 +26,7 @@
 using mozilla::dom::StructuredCloneData;
 using mozilla::dom::StructuredCloneClosure;
 using namespace mozilla;
+using namespace mozilla::dom;
 
 bool
 nsInProcessTabChildGlobal::DoSendBlockingMessage(JSContext* aCx,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsISelectionController.idl firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsISelectionController.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsISelectionController.idl	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsISelectionController.idl	2015-05-25 20:43:16.000000000 +0000
@@ -16,7 +16,7 @@
 interface nsISelection;
 interface nsISelectionDisplay;
 
-[scriptable, uuid(7835DE46-DB36-4BB7-8684-1049A0C13049)]
+[scriptable, uuid(82c3a9df-9bd6-4da2-b561-d85a9eec5caa)]
 interface nsISelectionController : nsISelectionDisplay
 {
    const short SELECTION_NONE=0;
@@ -266,6 +266,11 @@
     boolean checkVisibility(in nsIDOMNode node, in short startOffset, in short endOffset);
     [noscript,nostdcall] boolean checkVisibilityContent(in nsIContent node, in short startOffset, in short endOffset);
 
+  /**
+   * Returns the current visibility status of the selection carets, and allows
+   * the visibility to be turned off, or on (if a selection exists).
+   */
+    attribute boolean selectionCaretsVisibility;
 };
 %{ C++
    #define NS_ISELECTIONCONTROLLER_CID \
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsJSEnvironment.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsJSEnvironment.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsJSEnvironment.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsJSEnvironment.cpp	2015-05-25 20:43:16.000000000 +0000
@@ -77,7 +77,7 @@
 #endif
 #include "AccessCheck.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prthread.h"
 
 #include "mozilla/Preferences.h"
@@ -2483,7 +2483,7 @@
       if (!key->ReadStructuredClone(reader)) {
         result = nullptr;
       } else {
-        result = key->WrapObject(cx, JS::NullPtr());
+        result = key->WrapObject(cx, nullptr);
       }
     }
     return result;
@@ -2539,7 +2539,7 @@
     {
       nsRefPtr<MozNDEFRecord> ndefRecord = new MozNDEFRecord(global);
       result = ndefRecord->ReadStructuredClone(cx, reader) ?
-               ndefRecord->WrapObject(cx, JS::NullPtr()) : nullptr;
+               ndefRecord->WrapObject(cx, nullptr) : nullptr;
     }
     return result;
 #else
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsJSTimeoutHandler.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsJSTimeoutHandler.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsJSTimeoutHandler.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsJSTimeoutHandler.cpp	2015-05-25 20:43:16.000000000 +0000
@@ -363,7 +363,7 @@
     uint32_t argCount = std::max(argc, 2u) - 2;
 
     FallibleTArray<JS::Heap<JS::Value> > args;
-    if (!args.SetCapacity(argCount)) {
+    if (!args.SetCapacity(argCount, fallible)) {
       // No need to drop here, since we already have a non-null mFunction
       return NS_ERROR_OUT_OF_MEMORY;
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsNodeInfoManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsNodeInfoManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsNodeInfoManager.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsNodeInfoManager.cpp	2015-05-25 20:43:16.000000000 +0000
@@ -34,11 +34,9 @@
 using namespace mozilla;
 using mozilla::dom::NodeInfo;
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
-#ifdef PR_LOGGING
 static PRLogModuleInfo* gNodeInfoManagerLeakPRLog;
-#endif
 
 PLHashNumber
 nsNodeInfoManager::GetNodeInfoInnerHashValue(const void *key)
@@ -117,14 +115,12 @@
 {
   nsLayoutStatics::AddRef();
 
-#ifdef PR_LOGGING
   if (!gNodeInfoManagerLeakPRLog)
     gNodeInfoManagerLeakPRLog = PR_NewLogModule("NodeInfoManagerLeak");
 
   if (gNodeInfoManagerLeakPRLog)
-    PR_LOG(gNodeInfoManagerLeakPRLog, PR_LOG_DEBUG,
+    MOZ_LOG(gNodeInfoManagerLeakPRLog, PR_LOG_DEBUG,
            ("NODEINFOMANAGER %p created", this));
-#endif
 
   mNodeInfoHash = PL_NewHashTable(32, GetNodeInfoInnerHashValue,
                                   NodeInfoInnerKeyCompare,
@@ -142,11 +138,9 @@
 
   mBindingManager = nullptr;
 
-#ifdef PR_LOGGING
   if (gNodeInfoManagerLeakPRLog)
-    PR_LOG(gNodeInfoManagerLeakPRLog, PR_LOG_DEBUG,
+    MOZ_LOG(gNodeInfoManagerLeakPRLog, PR_LOG_DEBUG,
            ("NODEINFOMANAGER %p destroyed", this));
-#endif
 
   nsLayoutStatics::Release();
 }
@@ -201,11 +195,9 @@
 
   mDocument = aDocument;
 
-#ifdef PR_LOGGING
   if (gNodeInfoManagerLeakPRLog)
-    PR_LOG(gNodeInfoManagerLeakPRLog, PR_LOG_DEBUG,
+    MOZ_LOG(gNodeInfoManagerLeakPRLog, PR_LOG_DEBUG,
            ("NODEINFOMANAGER %p Init document=%p", this, aDocument));
-#endif
 
   return NS_OK;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsNodeUtils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsNodeUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsNodeUtils.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsNodeUtils.h	2015-05-25 20:43:16.000000000 +0000
@@ -160,7 +160,7 @@
                         nsINode **aResult)
   {
     return CloneAndAdopt(aNode, true, aDeep, aNewNodeInfoManager,
-                         JS::NullPtr(), aNodesWithProperties, nullptr, aResult);
+                         nullptr, aNodesWithProperties, nullptr, aResult);
   }
 
   /**
@@ -169,7 +169,7 @@
   static nsresult Clone(nsINode *aNode, bool aDeep, nsINode **aResult)
   {
     nsCOMArray<nsINode> dummyNodeWithProperties;
-    return CloneAndAdopt(aNode, true, aDeep, nullptr, JS::NullPtr(),
+    return CloneAndAdopt(aNode, true, aDeep, nullptr, nullptr,
                          dummyNodeWithProperties, aNode->GetParent(), aResult);
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsObjectLoadingContent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsObjectLoadingContent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsObjectLoadingContent.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsObjectLoadingContent.cpp	2015-05-25 20:43:16.000000000 +0000
@@ -44,7 +44,7 @@
 
 // Util headers
 #include "prenv.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "nsAutoPtr.h"
 #include "nsCURILoader.h"
@@ -106,7 +106,6 @@
 using namespace mozilla;
 using namespace mozilla::dom;
 
-#ifdef PR_LOGGING
 static PRLogModuleInfo*
 GetObjectLog()
 {
@@ -115,9 +114,8 @@
     sLog = PR_NewLogModule("objlc");
   return sLog;
 }
-#endif
 
-#define LOG(args) PR_LOG(GetObjectLog(), PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(GetObjectLog(), PR_LOG_DEBUG, args)
 #define LOG_ENABLED() PR_LOG_TEST(GetObjectLog(), PR_LOG_DEBUG)
 
 static bool
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsPIWindowRoot.h firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsPIWindowRoot.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsPIWindowRoot.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsPIWindowRoot.h	2015-05-25 20:43:16.000000000 +0000
@@ -38,7 +38,6 @@
 
   virtual void SetParentTarget(mozilla::dom::EventTarget* aTarget) = 0;
   virtual mozilla::dom::EventTarget* GetParentTarget() = 0;
-  virtual nsIDOMWindow* GetOwnerGlobal() override = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsPIWindowRoot, NS_IWINDOWROOT_IID)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsPropertyTable.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsPropertyTable.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsPropertyTable.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsPropertyTable.cpp	2015-05-25 20:43:16.000000000 +0000
@@ -57,7 +57,7 @@
   size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf);
 
   nsCOMPtr<nsIAtom>  mName;           // property name
-  PLDHashTable       mObjectValueMap; // map of object/value pairs
+  PLDHashTable2      mObjectValueMap; // map of object/value pairs
   NSPropertyDtorFunc mDtorFunc;       // property specific value dtor function
   void*              mDtorData;       // pointer to pass to dtor
   bool               mTransfer;       // whether to transfer in
@@ -229,7 +229,7 @@
   // value is destroyed
   nsresult result = NS_OK;
   PropertyListMapEntry *entry = static_cast<PropertyListMapEntry*>
-    (PL_DHashTableAdd(&propertyList->mObjectValueMap, aObject, fallible));
+    (PL_DHashTableAdd(&propertyList->mObjectValueMap, aObject, mozilla::fallible));
   if (!entry)
     return NS_ERROR_OUT_OF_MEMORY;
   // A nullptr entry->key is the sign that the entry has just been allocated
@@ -287,21 +287,18 @@
                                             void               *aDtorData,
                                             bool                aTransfer)
   : mName(aName),
+    mObjectValueMap(PL_DHashGetStubOps(), sizeof(PropertyListMapEntry)),
     mDtorFunc(aDtorFunc),
     mDtorData(aDtorData),
     mTransfer(aTransfer),
     mNext(nullptr)
 {
-  PL_DHashTableInit(&mObjectValueMap, PL_DHashGetStubOps(),
-                    sizeof(PropertyListMapEntry));
 }
 
 nsPropertyTable::PropertyList::~PropertyList()
 {
-  PL_DHashTableFinish(&mObjectValueMap);
 }
 
-
 static PLDHashOperator
 DestroyPropertyEnumerator(PLDHashTable *table, PLDHashEntryHdr *hdr,
                           uint32_t number, void *arg)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsQueryContentEventResult.h firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsQueryContentEventResult.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsQueryContentEventResult.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsQueryContentEventResult.h	2015-05-25 20:43:16.000000000 +0000
@@ -10,6 +10,7 @@
 #include "nsIQueryContentEventResult.h"
 #include "nsString.h"
 #include "nsRect.h"
+#include "Units.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/EventForwards.h"
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsScriptLoader.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsScriptLoader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsScriptLoader.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsScriptLoader.cpp	2015-05-25 20:43:16.000000000 +0000
@@ -40,7 +40,7 @@
 #include "nsThreadUtils.h"
 #include "nsDocShellCID.h"
 #include "nsIContentSecurityPolicy.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsCRT.h"
 #include "nsContentCreatorFunctions.h"
 #include "nsCORSListenerProxy.h"
@@ -54,9 +54,7 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/unused.h"
 
-#ifdef PR_LOGGING
 static PRLogModuleInfo* gCspPRLog;
-#endif
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -109,10 +107,8 @@
     mBlockingDOMContentLoaded(false)
 {
   // enable logging for CSP
-#ifdef PR_LOGGING
   if (!gCspPRLog)
     gCspPRLog = PR_NewLogModule("CSP");
-#endif
 }
 
 nsScriptLoader::~nsScriptLoader()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsStyleLinkElement.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsStyleLinkElement.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsStyleLinkElement.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsStyleLinkElement.cpp	2015-05-25 20:43:16.000000000 +0000
@@ -404,7 +404,7 @@
   nsresult rv = NS_OK;
   if (isInline) {
     nsAutoString text;
-    if (!nsContentUtils::GetNodeTextContent(thisContent, false, text)) {
+    if (!nsContentUtils::GetNodeTextContent(thisContent, false, text, fallible)) {
       return NS_ERROR_OUT_OF_MEMORY;
     }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsTreeSanitizer.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsTreeSanitizer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsTreeSanitizer.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsTreeSanitizer.cpp	2015-05-25 20:43:16.000000000 +0000
@@ -1396,9 +1396,8 @@
         NS_ASSERTION(ns == kNameSpaceID_XHTML || ns == kNameSpaceID_SVG,
             "Should have only HTML or SVG here!");
         nsAutoString styleText;
-        if (!nsContentUtils::GetNodeTextContent(node, false, styleText)) {
-          NS_RUNTIMEABORT("OOM");
-        }
+        nsContentUtils::GetNodeTextContent(node, false, styleText);
+
         nsAutoString sanitizedStyle;
         nsCOMPtr<nsIURI> baseURI = node->GetBaseURI();
         if (SanitizeStyleSheet(styleText,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsWindowRoot.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsWindowRoot.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsWindowRoot.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsWindowRoot.cpp	2015-05-25 20:43:16.000000000 +0000
@@ -188,11 +188,20 @@
 }
 
 nsIDOMWindow*
-nsWindowRoot::GetOwnerGlobal()
+nsWindowRoot::GetOwnerGlobalForBindings()
 {
   return GetWindow();
 }
 
+nsIGlobalObject*
+nsWindowRoot::GetOwnerGlobal() const
+{
+  nsCOMPtr<nsIGlobalObject> global =
+    do_QueryInterface(mWindow->GetCurrentInnerWindow());
+  // We're still holding a ref to it, so returning the raw pointer is ok...
+  return global;
+}
+
 nsPIDOMWindow*
 nsWindowRoot::GetWindow()
 {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsWindowRoot.h firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsWindowRoot.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsWindowRoot.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsWindowRoot.h	2015-05-25 20:43:16.000000000 +0000
@@ -59,7 +59,8 @@
     mParent = aTarget;
   }
   virtual mozilla::dom::EventTarget* GetParentTarget() override { return mParent; }
-  virtual nsIDOMWindow* GetOwnerGlobal() override;
+  virtual nsIDOMWindow* GetOwnerGlobalForBindings() override;
+  virtual nsIGlobalObject* GetOwnerGlobal() const override;
 
   nsIGlobalObject* GetParentObject();
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsXMLHttpRequest.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsXMLHttpRequest.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/nsXMLHttpRequest.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/nsXMLHttpRequest.cpp	2015-05-25 20:43:16.000000000 +0000
@@ -391,29 +391,33 @@
   }
 
   // Check for permissions.
-  nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(GetOwner());
-  if (!window || !window->GetDocShell()) {
-    return;
-  }
-
   // Chrome is always allowed access, so do the permission check only
   // for non-chrome pages.
   if (!IsSystemXHR() && aSystem) {
-    nsCOMPtr<nsIDocument> doc = window->GetExtantDoc();
-    if (!doc) {
+    nsIGlobalObject* global = GetOwnerGlobal();
+    if (NS_WARN_IF(!global)) {
+      SetParameters(aAnon, false);
+      return;
+    }
+
+    nsIPrincipal* principal = global->PrincipalOrNull();
+    if (NS_WARN_IF(!principal)) {
+      SetParameters(aAnon, false);
       return;
     }
 
-    nsCOMPtr<nsIPrincipal> principal = doc->NodePrincipal();
     nsCOMPtr<nsIPermissionManager> permMgr =
       services::GetPermissionManager();
-    if (!permMgr)
+    if (NS_WARN_IF(!permMgr)) {
+      SetParameters(aAnon, false);
       return;
+    }
 
     uint32_t permission;
     nsresult rv =
       permMgr->TestPermissionFromPrincipal(principal, "systemXHR", &permission);
     if (NS_FAILED(rv) || permission != nsIPermissionManager::ALLOW_ACTION) {
+      SetParameters(aAnon, false);
       return;
     }
   }
@@ -1852,9 +1856,7 @@
   } else if (xmlHttpRequest->mResponseType == XML_HTTP_RESPONSE_TYPE_DEFAULT &&
              xmlHttpRequest->mResponseXML) {
     // Copy for our own use
-    uint32_t previousLength = xmlHttpRequest->mResponseBody.Length();
-    xmlHttpRequest->mResponseBody.Append(fromRawSegment,count);
-    if (count > 0 && xmlHttpRequest->mResponseBody.Length() == previousLength) {
+    if (!xmlHttpRequest->mResponseBody.Append(fromRawSegment, count, fallible)) {
       return NS_ERROR_OUT_OF_MEMORY;
     }
   } else if (xmlHttpRequest->mResponseType == XML_HTTP_RESPONSE_TYPE_DEFAULT ||
@@ -1949,7 +1951,12 @@
 
   if (cancelable) {
     // We don't have to read from the local file for the blob response
-    mDOMBlob->GetSize(&mDataAvailable);
+    ErrorResult error;
+    mDataAvailable = mDOMBlob->GetSize(error);
+    if (NS_WARN_IF(error.Failed())) {
+      return error.StealNSResult();
+    }
+
     ChangeState(XML_HTTP_REQUEST_LOADING);
     return request->Cancel(NS_OK);
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/ScriptSettings.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/ScriptSettings.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/ScriptSettings.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/ScriptSettings.cpp	2015-05-25 20:43:14.000000000 +0000
@@ -529,7 +529,6 @@
               aCx ? aCx : FindJSContext(aGlobalObject))
   , ScriptSettingsStackEntry(aGlobalObject, /* aCandidate = */ true)
   , mWebIDLCallerPrincipal(nullptr)
-  , mDocShellForJSRunToCompletion(nullptr)
   , mIsMainThread(aIsMainThread)
 {
   MOZ_ASSERT(aGlobalObject);
@@ -540,23 +539,12 @@
   }
 
   if (aIsMainThread && gRunToCompletionListeners > 0) {
-    nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aGlobalObject);
-    if (window) {
-        mDocShellForJSRunToCompletion = window->GetDocShell();
-    }
-  }
-
-  if (mDocShellForJSRunToCompletion) {
-    mDocShellForJSRunToCompletion->NotifyJSRunToCompletionStart(aReason);
+    mDocShellEntryMonitor.emplace(cx(), aReason);
   }
 }
 
 AutoEntryScript::~AutoEntryScript()
 {
-  if (mDocShellForJSRunToCompletion) {
-    mDocShellForJSRunToCompletion->NotifyJSRunToCompletionStop();
-  }
-
   if (mIsMainThread) {
     nsContentUtils::LeaveMicroTask();
   }
@@ -567,6 +555,76 @@
   JS_MaybeGC(cx());
 }
 
+AutoEntryScript::DocshellEntryMonitor::DocshellEntryMonitor(JSContext* aCx,
+                                                            const char* aReason)
+  : JS::dbg::AutoEntryMonitor(aCx)
+  , mReason(aReason)
+{
+}
+
+void
+AutoEntryScript::DocshellEntryMonitor::Entry(JSContext* aCx, JSFunction* aFunction,
+                                             JSScript* aScript)
+{
+  JS::Rooted<JSFunction*> rootedFunction(aCx);
+  if (aFunction) {
+    rootedFunction = aFunction;
+  }
+  JS::Rooted<JSScript*> rootedScript(aCx);
+  if (aScript) {
+    rootedScript = aScript;
+  }
+
+  nsCOMPtr<nsPIDOMWindow> window =
+    do_QueryInterface(xpc::NativeGlobal(JS::CurrentGlobalOrNull(aCx)));
+  if (!window || !window->GetDocShell() ||
+      !window->GetDocShell()->GetRecordProfileTimelineMarkers()) {
+    return;
+  }
+
+  nsCOMPtr<nsIDocShell> docShellForJSRunToCompletion = window->GetDocShell();
+  nsString filename;
+  uint32_t lineNumber = 0;
+
+  js::AutoStableStringChars functionName(aCx);
+  if (rootedFunction) {
+    JS::Rooted<JSString*> displayId(aCx, JS_GetFunctionDisplayId(rootedFunction));
+    if (displayId) {
+      functionName.initTwoByte(aCx, displayId);
+    }
+  }
+
+  if (!rootedScript) {
+    rootedScript = JS_GetFunctionScript(aCx, rootedFunction);
+  }
+  if (rootedScript) {
+    filename = NS_ConvertUTF8toUTF16(JS_GetScriptFilename(rootedScript));
+    lineNumber = JS_GetScriptBaseLineNumber(aCx, rootedScript);
+  }
+
+  if (!filename.IsEmpty() || functionName.isTwoByte()) {
+    const char16_t* functionNameChars = functionName.isTwoByte() ?
+      functionName.twoByteChars() : nullptr;
+
+    docShellForJSRunToCompletion->NotifyJSRunToCompletionStart(mReason,
+                                                               functionNameChars,
+                                                               filename.BeginReading(),
+                                                               lineNumber);
+  }
+}
+
+void
+AutoEntryScript::DocshellEntryMonitor::Exit(JSContext* aCx)
+{
+  nsCOMPtr<nsPIDOMWindow> window =
+    do_QueryInterface(xpc::NativeGlobal(JS::CurrentGlobalOrNull(aCx)));
+  // Not really worth checking GetRecordProfileTimelineMarkers here.
+  if (window && window->GetDocShell()) {
+    nsCOMPtr<nsIDocShell> docShellForJSRunToCompletion = window->GetDocShell();
+    docShellForJSRunToCompletion->NotifyJSRunToCompletionStop();
+  }
+}
+
 AutoIncumbentScript::AutoIncumbentScript(nsIGlobalObject* aGlobalObject)
   : ScriptSettingsStackEntry(aGlobalObject, /* aCandidate = */ false)
   , mCallerOverride(nsContentUtils::GetCurrentJSContextForThread())
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/ScriptSettings.h firefox-trunk-41.0~a1~hg20150524r245419/dom/base/ScriptSettings.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/ScriptSettings.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/ScriptSettings.h	2015-05-25 20:43:14.000000000 +0000
@@ -16,6 +16,7 @@
 #include "mozilla/Maybe.h"
 
 #include "jsapi.h"
+#include "js/Debug.h"
 
 class nsPIDOMWindow;
 class nsGlobalWindow;
@@ -339,6 +340,30 @@
   }
 
 private:
+  // A subclass of AutoEntryMonitor that notifies the docshell.
+  class DocshellEntryMonitor : public JS::dbg::AutoEntryMonitor
+  {
+  public:
+    DocshellEntryMonitor(JSContext* aCx, const char* aReason);
+
+    void Entry(JSContext* aCx, JSFunction* aFunction) override
+    {
+      Entry(aCx, aFunction, nullptr);
+    }
+
+    void Entry(JSContext* aCx, JSScript* aScript) override
+    {
+      Entry(aCx, nullptr, aScript);
+    }
+
+    void Exit(JSContext* aCx) override;
+
+  private:
+    void Entry(JSContext* aCx, JSFunction* aFunction, JSScript* aScript);
+
+    const char* mReason;
+  };
+
   // It's safe to make this a weak pointer, since it's the subject principal
   // when we go on the stack, so can't go away until after we're gone.  In
   // particular, this is only used from the CallSetup constructor, and only in
@@ -349,7 +374,7 @@
   nsIPrincipal* MOZ_NON_OWNING_REF mWebIDLCallerPrincipal;
   friend nsIPrincipal* GetWebIDLCallerPrincipal();
 
-  nsCOMPtr<nsIDocShell> mDocShellForJSRunToCompletion;
+  Maybe<DocshellEntryMonitor> mDocShellEntryMonitor;
 
   bool mIsMainThread;
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/csp/test_CSP_referrerdirective.html firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/csp/test_CSP_referrerdirective.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/csp/test_CSP_referrerdirective.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/csp/test_CSP_referrerdirective.html	2015-05-25 20:43:17.000000000 +0000
@@ -44,7 +44,7 @@
                         'crossorigin': 'origin',
                           'downgrade': 'origin' }},
 
-  'origin-when-crossorigin':  { 'csp': "script-src * 'unsafe-inline'; referrer origin-when-crossorigin",
+  'origin-when-cross-origin':  { 'csp': "script-src * 'unsafe-inline'; referrer origin-when-cross-origin",
           'expected': {  'sameorigin': 'full',
                         'crossorigin': 'origin',
                           'downgrade': 'origin' }},
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/mochitest.ini	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/mochitest.ini	2015-05-25 20:43:17.000000000 +0000
@@ -242,6 +242,7 @@
   w3element_traversal.svg
   wholeTexty-helper.xml
   file_nonascii_blob_url.html
+  referrerHelper.js
 
 [test_anonymousContent_api.html]
 [test_anonymousContent_append_after_reflow.html]
@@ -613,6 +614,7 @@
 [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]
+support-files = referrerHelper.js
 [test_bug704320_preload.html]
 [test_bug707142.html]
 [test_bug708620.html]
@@ -665,6 +667,8 @@
 [test_bug1075702.html]
 [test_bug1101364.html]
 skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android'
+[test_bug1163743.html]
+support-files = referrerHelper.js
 [test_caretPositionFromPoint.html]
 [test_classList.html]
 # This test fails on the Mac for some reason
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/referrerHelper.js firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/referrerHelper.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/referrerHelper.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/referrerHelper.js	2015-05-25 20:43:17.000000000 +0000
@@ -0,0 +1,76 @@
+/**
+ * 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();
+    }});
+
+
+/**
+ * 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();
+        });
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_bug1075702.html firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_bug1075702.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_bug1075702.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_bug1075702.html	2015-05-25 20:43:18.000000000 +0000
@@ -46,7 +46,7 @@
     test1.addEventListener("DOMAttrModified", mutationHandler, true);
     var removedNodeAccordingToRemoveNamedItemNS = test1.attributes.removeNamedItemNS(null, "x");
     test1.removeEventListener("DOMAttrModified", mutationHandler, true);
-    ise(removedNodeAccordingToEvent, removedNodeAccordingToRemoveNamedItemNS, "Node removed according to event is not same as node removed by removeNamedItemNS.");
+    is(removedNodeAccordingToEvent, removedNodeAccordingToRemoveNamedItemNS, "Node removed according to event is not same as node removed by removeNamedItemNS.");
   }
 
   testremoveNamedItemNS();
@@ -59,7 +59,7 @@
     test2.addEventListener("DOMAttrModified", mutationHandler, true);
     var removedNodeAccordingToRemoveNamedItem = test2.attributes.removeNamedItem("x");
     test2.removeEventListener("DOMAttrModified", mutationHandler, true);
-    ise(removedNodeAccordingToEvent, removedNodeAccordingToRemoveNamedItem, "Node removed according to event is not same as node removed by removeNamedItem.");
+    is(removedNodeAccordingToEvent, removedNodeAccordingToRemoveNamedItem, "Node removed according to event is not same as node removed by removeNamedItem.");
   }
 
   testremoveNamedItem();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_bug1091883.html firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_bug1091883.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_bug1091883.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_bug1091883.html	2015-05-25 20:43:18.000000000 +0000
@@ -5,7 +5,7 @@
 -->
 <head>
   <meta charset="utf-8">
-  <meta name="referrer" content="origin-when-crossorigin">
+  <meta name="referrer" content="origin-when-cross-origin">
   <title>Test for Bug 1091883</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
@@ -26,7 +26,7 @@
 // includes a "frame" that includes a "subframe"; and then this test
 // navigates this "subframe" to the "target".  Both the referrer and
 // the triggering principal are this test, i.e., "http://mochi.test:8888".
-// Since the referrer policy is origin-when-crossorigin, we expect to have
+// Since the referrer policy is origin-when-cross-origin, we expect to have
 // a full referrer if and only if the target is also "http://mochi.test:8888";
 // in all other cases, the referrer needs to be the origin alone.
 var numTests = numOrigins * numOrigins * numOrigins;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_bug1163743.html firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_bug1163743.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_bug1163743.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_bug1163743.html	2015-05-25 20:43:18.000000000 +0000
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+This checks if the origin-when-crossorigin policy works.
+https://bugzilla.mozilla.org/show_bug.cgi?id=1163743
+-->
+
+<head>
+  <meta charset="utf-8">
+  <title>Test policies for Bug 1163743</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="referrerHelper.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(); };
+
+/**
+ * testing legacy support for origin-when-crossorigin (1163743)
+ */
+var tests = (function() {
+  var iframe = document.getElementById("testframe");
+  const sjs = "/tests/dom/base/test/bug704320.sjs?action=generate-policy-test";
+
+  // origin when crossorigin (trimming whitespace)
+  yield resetCounter();
+  yield iframe.src = sjs + "&policy=" + escape(' origin-when-crossorigin');
+  yield checkResults("origin-when-cross-origin", ["origin", "full"]);
+
+  // complete.  Be sure to yield so we don't call this twice.
+  yield SimpleTest.finish();
+})();
+
+</script>
+</head>
+
+<body onload="tests.next();">
+  <iframe id="testframe"></iframe>
+
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_bug704320.html firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_bug704320.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_bug704320.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_bug704320.html	2015-05-25 20:43:18.000000000 +0000
@@ -26,25 +26,25 @@
   '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://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=http&scheme-to=http&policy=origin-when-crossorigin',
+  'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=http&scheme-to=http&policy=origin-when-cross-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',
-  'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=http&scheme-to=https&policy=origin-when-crossorigin',
+  'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=http&scheme-to=https&policy=origin-when-cross-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://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=https&scheme-to=http&policy=origin-when-crossorigin',
+  'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=https&scheme-to=http&policy=origin-when-cross-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',
-  'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=https&scheme-to=https&policy=origin-when-crossorigin'
+  'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=https&scheme-to=https&policy=origin-when-cross-origin'
 ];
 
 var expectedResults = {
@@ -58,14 +58,14 @@
       'no-referrer': '',
       'unsafe-url': '',
       'origin': '',
-      'origin-when-crossorigin': '',
+      'origin-when-cross-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',
-      'origin-when-crossorigin': 'http://example.com',
+      'origin-when-cross-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
@@ -73,7 +73,7 @@
       'no-referrer': '',
       'unsafe-url': '',
       'origin': '',
-      'origin-when-crossorigin': '',
+      'origin-when-cross-origin': '',
       'no-referrer-when-downgrade': ''
     },
     // Encrypted
@@ -81,7 +81,7 @@
       'no-referrer': '',
       'unsafe-url': '',
       'origin': '',
-      'origin-when-crossorigin': '',
+      'origin-when-cross-origin': '',
       'no-referrer-when-downgrade': ''
     }
   },
@@ -91,28 +91,28 @@
       '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',
-      'origin-when-crossorigin': 'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-2nd-level-iframe&scheme-from=http&scheme-to=http&policy=origin-when-crossorigin&type=form',
+      'origin-when-cross-origin': 'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-2nd-level-iframe&scheme-from=http&scheme-to=http&policy=origin-when-cross-origin&type=form',
       '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',
-      'origin-when-crossorigin': 'http://example.com',
+      'origin-when-cross-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',
-      'origin-when-crossorigin': 'https://example.com',
+      'origin-when-cross-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',
-      'origin-when-crossorigin': 'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-2nd-level-iframe&scheme-from=https&scheme-to=https&policy=origin-when-crossorigin&type=form',
+      'origin-when-cross-origin': 'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-2nd-level-iframe&scheme-from=https&scheme-to=https&policy=origin-when-cross-origin&type=form',
       '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'
     }
   },
@@ -122,28 +122,28 @@
       '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',
-      'origin-when-crossorigin': 'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-2nd-level-iframe&scheme-from=http&scheme-to=http&policy=origin-when-crossorigin&type=window.location',
+      'origin-when-cross-origin': 'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-2nd-level-iframe&scheme-from=http&scheme-to=http&policy=origin-when-cross-origin&type=window.location',
       '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',
-      'origin-when-crossorigin': 'http://example.com',
+      'origin-when-cross-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',
-      'origin-when-crossorigin': 'https://example.com',
+      'origin-when-cross-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',
-      'origin-when-crossorigin': 'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-2nd-level-iframe&scheme-from=https&scheme-to=https&policy=origin-when-crossorigin&type=window.location',
+      'origin-when-cross-origin': 'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-2nd-level-iframe&scheme-from=https&scheme-to=https&policy=origin-when-cross-origin&type=window.location',
       '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'
     }
   },
@@ -152,28 +152,28 @@
       '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',
-      'origin-when-crossorigin': 'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=http&scheme-to=http&policy=origin-when-crossorigin',
+      'origin-when-cross-origin': 'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=http&scheme-to=http&policy=origin-when-cross-origin',
       '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',
-      'origin-when-crossorigin': 'http://example.com',
+      'origin-when-cross-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',
-      'origin-when-crossorigin': 'https://example.com',
+      'origin-when-cross-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',
-      'origin-when-crossorigin': 'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=https&scheme-to=https&policy=origin-when-crossorigin',
+      'origin-when-cross-origin': 'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=https&scheme-to=https&policy=origin-when-cross-origin',
       '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'
     }
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_bug704320_policyset.html firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_bug704320_policyset.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_bug704320_policyset.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_bug704320_policyset.html	2015-05-25 20:43:18.000000000 +0000
@@ -9,6 +9,7 @@
   <meta charset="utf-8">
   <title>Test policies for Bug 704320</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="referrerHelper.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
 <script type="application/javascript;version=1.7">
@@ -17,24 +18,6 @@
 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.
@@ -82,8 +65,8 @@
 
   // origin when cross-origin (trimming whitespace)
   yield resetCounter();
-  yield iframe.src = sjs + "&policy=" + escape(' origin-when-crossorigin');
-  yield checkResults("origin-when-crossorigin", ["origin", "full"]);
+  yield iframe.src = sjs + "&policy=" + escape(' origin-when-cross-origin');
+  yield checkResults("origin-when-cross-origin", ["origin", "full"]);
 
   // according to the spec section 4.1:
   // "If the meta element lacks a content attribute, or if that attribute’s
@@ -109,65 +92,6 @@
   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>
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_bug891952.html firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_bug891952.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_bug891952.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_bug891952.html	2015-05-25 20:43:18.000000000 +0000
@@ -16,30 +16,30 @@
       var all = document.all;
       is(all["content"], $("content"), "Should find the content");
       ok(!("" in all), "Should not have an empty string prop on document.all");
-      ise(all[""], undefined, "Should not get empty string on document.all");
-      ise(all.namedItem(""), null,
-          "namedItem for empty string should return null on document.all");
+      is(all[""], undefined, "Should not get empty string on document.all");
+      is(all.namedItem(""), null,
+         "namedItem for empty string should return null on document.all");
 
       var divs = document.getElementsByTagName("div");
       ok(!("" in divs), "Should not have an empty string prop on getElementsByTagName");
-      ise(divs[""], undefined, "Should not get empty string on getElementsByTagName");
-      ise(divs.namedItem(""), null,
-          "namedItem for empty string should return null on getElementsByTagName");
+      is(divs[""], undefined, "Should not get empty string on getElementsByTagName");
+      is(divs.namedItem(""), null,
+         "namedItem for empty string should return null on getElementsByTagName");
       var forms = document.forms;
       ok(!("" in forms), "Should not have an empty string prop on document.forms");
-      ise(forms[""], undefined, "Should not get empty string on document.forms");
-      ise(forms.namedItem(""), null,
-          "namedItem for empty string should return null on document.forms");
+      is(forms[""], undefined, "Should not get empty string on document.forms");
+      is(forms.namedItem(""), null,
+         "namedItem for empty string should return null on document.forms");
 
       var form = $("form");
       ok(!("" in form), "Should not have an empty string prop on form");
-      ise(form[""], undefined, "Should not get empty string on form");
+      is(form[""], undefined, "Should not get empty string on form");
 
       var formEls = $("form").elements;
       ok(!("" in formEls), "Should not have an empty string prop on form.elements");
-      ise(formEls[""], undefined, "Should not get empty string on form.elements");
-      ise(formEls.namedItem(""), null,
-          "namedItem for empty string should return null on form.elements");
+      is(formEls[""], undefined, "Should not get empty string on form.elements");
+      is(formEls.namedItem(""), null,
+         "namedItem for empty string should return null on form.elements");
       SimpleTest.finish();
     });
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_bug927196.html firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_bug927196.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_bug927196.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_bug927196.html	2015-05-25 20:43:18.000000000 +0000
@@ -21,18 +21,18 @@
 
 function startTest() {
   req = new XMLHttpRequest({mozSystem: true});
-  is(req.mozAnon, true, "XMLHttpRequest should be mozAnon");
+  is(req.mozAnon, true, "XMLHttpRequest should be mozAnon (3)");
 
   req = new XMLHttpRequest({mozAnon: true});
-  is(req.mozAnon, true, "XMLHttpRequest should be mozAnon");
-  is(req.mozSystem, false, "XMLHttpRequest should not be mozSystem");
+  is(req.mozAnon, true, "XMLHttpRequest should be mozAnon (4)");
+  is(req.mozSystem, false, "XMLHttpRequest should not be mozSystem (4)");
 
   req = new XMLHttpRequest({mozAnon: true, mozSystem: true});
-  is(req.mozAnon, true, "XMLHttpRequest should be mozAnon");
-  is(req.mozSystem, true, "XMLHttpRequest should be mozSystem");
+  is(req.mozAnon, true, "XMLHttpRequest should be mozAnon (5)");
+  is(req.mozSystem, true, "XMLHttpRequest should be mozSystem (5)");
 
   req = new XMLHttpRequest({mozAnon: false, mozSystem: true});
-  is(req.mozAnon, true, "XMLHttpRequest should be mozAnon");
+  is(req.mozAnon, true, "XMLHttpRequest should be mozAnon (6)");
 
   SimpleTest.finish();
 }
@@ -44,8 +44,8 @@
 is(req.mozSystem, false, "XMLHttpRequest should not be mozSystem");
 
 req = new XMLHttpRequest({mozAnon: true, mozSystem: true});
-is(req.mozAnon, false, "XMLHttpRequest should be mozAnon");
-is(req.mozSystem, false, "XMLHttpRequest should not be mozSystem");
+is(req.mozAnon, true, "XMLHttpRequest should be mozAnon (2)");
+is(req.mozSystem, false, "XMLHttpRequest should not be mozSystem (2)");
 
 addLoadEvent(function() {
    SpecialPowers.pushPermissions([{'type': 'systemXHR', 'allow': true, 'context': document}], startTest);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_bug999456.html firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_bug999456.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_bug999456.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_bug999456.html	2015-05-25 20:43:19.000000000 +0000
@@ -14,7 +14,7 @@
 
   SimpleTest.waitForExplicitFinish();
   addEventListener("load", function (e) {
-    ise(e.cancelable, false, "Load events should not be cancelable");
+    is(e.cancelable, false, "Load events should not be cancelable");
     SimpleTest.finish();
   });
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_getFeature_with_perm.html firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_getFeature_with_perm.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_getFeature_with_perm.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_getFeature_with_perm.html	2015-05-25 20:43:19.000000000 +0000
@@ -76,13 +76,31 @@
   }
 }
 
+function testDevMode(aExpected) {
+  return function() {
+    navigator.getFeature("dom.apps.developer_mode").then(res => {
+      is(res, aExpected, "dom.apps.developer_mode is " + aExpected);
+      runNextTest();
+    }, function() {
+      ok(false, "The Promise should not be rejected");
+    });
+  }
+}
+
+function enableDevMode() {
+  SpecialPowers.pushPrefEnv({"set": [["dom.apps.developer_mode", true]]}, runNextTest);
+}
+
 var currentTest = -1;
 var tests = [
   testNotSupported,
   testNotSupportedManifest,
   testSupported,
   createManifestTest("manifest.origin"),
-  createManifestTest("manifest.redirects")
+  createManifestTest("manifest.redirects"),
+  testDevMode(false),
+  enableDevMode,
+  testDevMode(true)
 ];
 
 function runNextTest() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_hasFeature.html firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_hasFeature.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_hasFeature.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_hasFeature.html	2015-05-25 20:43:19.000000000 +0000
@@ -54,10 +54,10 @@
   });
   Promise.all(promises).then(function(values) {
     for (var i = 0; i < values.length; ++i) {
-      ise(values[i], APIEndPoints[i].enabled,
-          "Endpoint " + APIEndPoints[i].name + " resolved with the correct value. " +
-          "If this is failing because you're changing how an API is exposed, you " +
-          "must contact the Marketplace team to let them know about the change.");
+      is(values[i], APIEndPoints[i].enabled,
+         "Endpoint " + APIEndPoints[i].name + " resolved with the correct value. " +
+         "If this is failing because you're changing how an API is exposed, you " +
+         "must contact the Marketplace team to let them know about the change.");
     }
     SimpleTest.finish();
   }, function() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_history_state_null.html firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_history_state_null.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_history_state_null.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_history_state_null.html	2015-05-25 20:43:19.000000000 +0000
@@ -10,7 +10,7 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   <script type="application/javascript">
   /** Test for Bug 949471 **/
-    ise(history.state, null, "history.state should be null by default");
+    is(history.state, null, "history.state should be null by default");
   </script>
 </head>
 <body>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_url_empty_port.html firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_url_empty_port.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_url_empty_port.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_url_empty_port.html	2015-05-25 20:43:19.000000000 +0000
@@ -26,27 +26,27 @@
   var url = new URL('http://www.example.com:8080');
   is(url.port, '8080', 'URL.port is 8080');
   url.port = '';
-  ise(url.port, '', 'URL.port is \'\'');
+  is(url.port, '', 'URL.port is \'\'');
   url.port = 0;
-  ise(url.port, '0', 'URL.port is 0');
+  is(url.port, '0', 'URL.port is 0');
 
   var link = document.getElementById("link");
   is(link.port, '8080', 'URL.port is 8080');
   link.port = '';
   is(link.href, 'http://www.example.com/', "link.href matches");
-  ise(link.port, '', 'URL.port is \'\'');
+  is(link.port, '', 'URL.port is \'\'');
   link.port = 0;
   is(link.href, 'http://www.example.com:0/', "link.href matches");
-  ise(link.port, '0', 'URL.port is 0');
+  is(link.port, '0', 'URL.port is 0');
 
   var area = document.getElementById("area");
   is(area.port, '8080', 'URL.port is 8080');
   area.port = '';
   is(area.href, 'http://www.example.com/', "area.href matches");
-  ise(area.port, '', 'URL.port is \'\'');
+  is(area.port, '', 'URL.port is \'\'');
   area.port = 0;
   is(area.href, 'http://www.example.com:0/', "area.href matches");
-  ise(area.port, '0', 'URL.port is 0');
+  is(area.port, '0', 'URL.port is 0');
 
   </script>
 </body>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_window_define_nonconfigurable.html firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_window_define_nonconfigurable.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_window_define_nonconfigurable.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_window_define_nonconfigurable.html	2015-05-25 20:43:20.000000000 +0000
@@ -15,19 +15,19 @@
     Object.defineProperty(window, "nosuchprop", { value: 5 });
     throw "didn't throw";
   } catch (e) {
-    ise(e instanceof TypeError, true,
-        "defineProperty(window) with a non-configurable property should " +
-        "throw a TypeError, instead got: " + e);
-    ise(Object.getOwnPropertyDescriptor(window, "nosuchprop"), undefined,
-        'Window should not have property after an attempt to define it failed');
+    is(e instanceof TypeError, true,
+       "defineProperty(window) with a non-configurable property should " +
+       "throw a TypeError, instead got: " + e);
+    is(Object.getOwnPropertyDescriptor(window, "nosuchprop"), undefined,
+       'Window should not have property after an attempt to define it failed');
   }
 
   Object.defineProperty(window, "nosuchprop", { value: 7, configurable: true });
   var desc = Object.getOwnPropertyDescriptor(window, "nosuchprop");
-  ise(typeof(desc), "object", "Should have a property now");
-  ise(desc.configurable, true, "Property should be configurable");
-  ise(desc.writable, false, "Property should be readonly");
-  ise(desc.value, 7, "Property should have the right value");
+  is(typeof(desc), "object", "Should have a property now");
+  is(desc.configurable, true, "Property should be configurable");
+  is(desc.writable, false, "Property should be readonly");
+  is(desc.value, 7, "Property should have the right value");
   </script>
 </head>
 <body>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_window_named_frame_enumeration.html firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_window_named_frame_enumeration.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_window_named_frame_enumeration.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_window_named_frame_enumeration.html	2015-05-25 20:43:20.000000000 +0000
@@ -58,8 +58,8 @@
     is(names3.indexOf("crossorigin"), -1,
        "Frame with cross-origin changed name should not be in GSP own prop list");
 
-    ise(Object.getOwnPropertyDescriptor(gsp, ""), undefined,
-        "Should not have empty string as a named frame");
+    is(Object.getOwnPropertyDescriptor(gsp, ""), undefined,
+       "Should not have empty string as a named frame");
     isnot(Object.getOwnPropertyDescriptor(gsp, "x"), undefined,
         "Should have about:blank subframe as a named frame");
     isnot(Object.getOwnPropertyDescriptor(gsp, "y"), undefined,
@@ -68,8 +68,8 @@
         "Should have cross-origin subframe as a named frame");
     isnot(Object.getOwnPropertyDescriptor(gsp, "sameorigin"), undefined,
           "Should have same-origin changed name as a named frame");
-    ise(Object.getOwnPropertyDescriptor(gsp, "crossorigin"), undefined,
-        "Should not have cross-origin-origin changed name as a named frame");
+    is(Object.getOwnPropertyDescriptor(gsp, "crossorigin"), undefined,
+       "Should not have cross-origin-origin changed name as a named frame");
     SimpleTest.finish();
   });
   </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_XHR.html firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_XHR.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_XHR.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_XHR.html	2015-05-25 20:43:17.000000000 +0000
@@ -107,7 +107,7 @@
 function checkSetResponseType(xhr, type) {
   var didthrow = false;
   try { xhr.responseType = type; } catch (e) { didthrow = true; }
-  ise(xhr.responseType, type, "responseType should be " + type);
+  is(xhr.responseType, type, "responseType should be " + type);
   ok(!didthrow, "should not have thrown when setting responseType");
 }
 function checkSetResponseTypeThrows(xhr, type) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_xhr_send.html firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_xhr_send.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/test_xhr_send.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/test_xhr_send.html	2015-05-25 20:43:20.000000000 +0000
@@ -28,7 +28,7 @@
   var x = new XMLHttpRequest();
   x.open("POST", "echo.sjs");
   x.onload = function() {
-      ise(x.responseText, "somedata", "Should have processed POST");
+      is(x.responseText, "somedata", "Should have processed POST");
       undefinedPostTest();
     }
     x.send({toString: function() { return "somedata"; }});
@@ -38,7 +38,7 @@
   var x = new XMLHttpRequest();
   x.open("POST", "echo.sjs");
   x.onload = function() {
-      ise(x.responseText, "undefined", "Should have processed POST");
+      is(x.responseText, "undefined", "Should have processed POST");
       nullPostTest();
     }
     x.send({toString: function() { return undefined; }});
@@ -48,7 +48,7 @@
   var x = new XMLHttpRequest();
   x.open("POST", "echo.sjs");
   x.onload = function() {
-      ise(x.responseText, "null", "Should have processed POST");
+      is(x.responseText, "null", "Should have processed POST");
       testExceptionInToString();
     }
     x.send({toString: function() { return null; }});
@@ -64,7 +64,7 @@
   try {
     x.send({toString: function() { throw "dummy"; }});
   } catch(ex) {
-    ise(ex, "dummy");
+    is(ex, "dummy");
     SimpleTest.finish();
   }
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/unit/test_cspreports.js firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/unit/test_cspreports.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/unit/test_cspreports.js	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/unit/test_cspreports.js	2015-05-25 20:43:20.000000000 +0000
@@ -71,14 +71,9 @@
   var selfuri = NetUtil.newURI(REPORT_SERVER_URI +
                                ":" + REPORT_SERVER_PORT +
                                "/foo/self");
-  var selfchan = NetUtil.newChannel2(selfuri,
-                                     null,
-                                     null,
-                                     null,      // aLoadingNode
-                                     Services.scriptSecurityManager.getSystemPrincipal(),
-                                     null,      // aTriggeringPrincipal
-                                     Ci.nsILoadInfo.SEC_NORMAL,
-                                     Ci.nsIContentPolicy.TYPE_OTHER);
+  var selfchan = NetUtil.newChannel({
+    uri: selfuri,
+    loadUsingSystemPrincipal: true});
 
   dump("Created test " + id + " : " + policy + "\n\n");
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/unit/test_thirdpartyutil.js firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/unit/test_thirdpartyutil.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/test/unit/test_thirdpartyutil.js	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/test/unit/test_thirdpartyutil.js	2015-05-25 20:43:20.000000000 +0000
@@ -41,44 +41,16 @@
   let spec2 = "http://bar.com/bar.html";
   let uri1 = NetUtil.newURI(spec1);
   let uri2 = NetUtil.newURI(spec2);
-  let channel1 = NetUtil.newChannel2(uri1,
-                                     null,
-                                     null,
-                                     null,      // aLoadingNode
-                                     Services.scriptSecurityManager.getSystemPrincipal(),
-                                     null,      // aTriggeringPrincipal
-                                     Ci.nsILoadInfo.SEC_NORMAL,
-                                     Ci.nsIContentPolicy.TYPE_OTHER);
-  let channel2 = NetUtil.newChannel2(uri2,
-                                     null,
-                                     null,
-                                     null,      // aLoadingNode
-                                     Services.scriptSecurityManager.getSystemPrincipal(),
-                                     null,      // aTriggeringPrincipal
-                                     Ci.nsILoadInfo.SEC_NORMAL,
-                                     Ci.nsIContentPolicy.TYPE_OTHER);
+  let channel1 = NetUtil.newChannel({uri: uri1, loadUsingSystemPrincipal: true});
+  let channel2 = NetUtil.newChannel({uri: uri2, loadUsingSystemPrincipal: true});
 
   // Create some file:// URIs.
   let filespec1 = "file://foo.txt";
   let filespec2 = "file://bar.txt";
   let fileuri1 = NetUtil.newURI(filespec1);
   let fileuri2 = NetUtil.newURI(filespec2);
-  let filechannel1 = NetUtil.newChannel2(fileuri1,
-                                         null,
-                                         null,
-                                         null,      // aLoadingNode
-                                         Services.scriptSecurityManager.getSystemPrincipal(),
-                                         null,      // aTriggeringPrincipal
-                                         Ci.nsILoadInfo.SEC_NORMAL,
-                                         Ci.nsIContentPolicy.TYPE_OTHER);
-  let filechannel2 = NetUtil.newChannel2(fileuri2,
-                                         null,
-                                         null,
-                                         null,      // aLoadingNode
-                                         Services.scriptSecurityManager.getSystemPrincipal(),
-                                         null,      // aTriggeringPrincipal
-                                         Ci.nsILoadInfo.SEC_NORMAL,
-                                         Ci.nsIContentPolicy.TYPE_OTHER);
+  let filechannel1 = NetUtil.newChannel({uri: fileuri1, loadUsingSystemPrincipal: true});
+  let filechannel2 = NetUtil.newChannel({uri: fileuri2, loadUsingSystemPrincipal: true});
 
   // Test isThirdPartyURI.
   do_check_false(util.isThirdPartyURI(uri1, uri1));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/ThirdPartyUtil.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/ThirdPartyUtil.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/ThirdPartyUtil.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/ThirdPartyUtil.cpp	2015-05-25 20:43:14.000000000 +0000
@@ -14,7 +14,7 @@
 #include "nsIScriptObjectPrincipal.h"
 #include "nsIURI.h"
 #include "nsThreadUtils.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 NS_IMPL_ISUPPORTS(ThirdPartyUtil, mozIThirdPartyUtil)
 
@@ -23,7 +23,7 @@
 //
 static PRLogModuleInfo *gThirdPartyLog;
 #undef LOG
-#define LOG(args)     PR_LOG(gThirdPartyLog, PR_LOG_DEBUG, args)
+#define LOG(args)     MOZ_LOG(gThirdPartyLog, PR_LOG_DEBUG, args)
 
 nsresult
 ThirdPartyUtil::Init()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/UseCounter.h firefox-trunk-41.0~a1~hg20150524r245419/dom/base/UseCounter.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/UseCounter.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/UseCounter.h	2015-05-25 20:43:14.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 UseCounter_h_
+#define UseCounter_h_
+
+namespace mozilla {
+
+enum UseCounter {
+  eUseCounter_UNKNOWN = -1,
+#define USE_COUNTER_DOM_METHOD(interface_, name_) \
+    eUseCounter_##interface_##_##name_,
+#define USE_COUNTER_DOM_ATTRIBUTE(interface_, name_) \
+    eUseCounter_##interface_##_##name_,
+#define USE_COUNTER_CSS_PROPERTY(name_, id_) \
+    eUseCounter_property_##id_,
+#include "mozilla/dom/UseCounterList.h"
+#undef USE_COUNTER_DOM_METHOD
+#undef USE_COUNTER_DOM_ATTRIBUTE
+#undef USE_COUNTER_CSS_PROPERTY
+  eUseCounter_Count
+};
+
+}
+
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/UseCounters.conf firefox-trunk-41.0~a1~hg20150524r245419/dom/base/UseCounters.conf
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/UseCounters.conf	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/UseCounters.conf	2015-05-25 20:43:14.000000000 +0000
@@ -0,0 +1,33 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+// This file defines a list of use counters, which are things that can
+// record usage of Web platform features and then report this information
+// through Telemetry.
+//
+// The format of this file is very strict.  Each line can be:
+//
+//   (a) a blank line
+//
+//   (b) a comment, which is a line that begins with "//"
+//
+//   (c) an #if/ifdef/else/endif preprocessor directive
+//
+//   (d) one of three possible use counter declarations:
+//
+//         method <IDL interface name>.<IDL operation name>
+//         attribute <IDL interface name>.<IDL attribute name>
+//         property <CSS property name>
+//
+// To actually cause use counters to be incremented, DOM methods
+// and attributes must have a [UseCounter] extended attribute in
+// the Web IDL file, and CSS properties must be declared with
+// the CSS_PROPERTY_HAS_USE_COUNTER flag in nsCSSPropList.h.
+//
+// You might reasonably ask why we have this file and we require
+// annotating things with [UseCounter] in the relevant WebIDL file as
+// well.  Generating things from bindings codegen and ensuring all the
+// dependencies were correct would have been rather difficult, and
+// annotating the WebIDL files does nothing for identifying CSS
+// property usage, which we would also like to track.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/usecounters.py firefox-trunk-41.0~a1~hg20150524r245419/dom/base/usecounters.py
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/usecounters.py	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/usecounters.py	2015-05-25 20:43:20.000000000 +0000
@@ -0,0 +1,78 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.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 buildconfig
+import collections
+import re
+import StringIO
+import sys
+
+from mozbuild.preprocessor import preprocess
+
+def read_conf(conf_filename):
+    # Invoking the preprocessor ourselves is easier than writing build rules
+    # to do it for us.
+    processed = StringIO.StringIO()
+    preprocess(includes=[conf_filename],
+               defines=buildconfig.defines,
+               output=processed)
+
+    # Can't read/write from a single StringIO, so make a new one for reading.
+    stream = StringIO.StringIO(processed.getvalue())
+
+    def parse_counters(stream):
+        for line_num, line in enumerate(stream):
+            line = line.rstrip('\n')
+            if not line or line.startswith('//'):
+                # empty line or comment
+                continue
+            m = re.match(r'method ([A-Za-z0-9]+)\.([A-Za-z0-9]+)$', line)
+            if m:
+                interface_name, method_name = m.groups()
+                yield { 'type': 'method',
+                        'interface_name': interface_name,
+                        'method_name': method_name }
+                continue
+            m = re.match(r'attribute ([A-Za-z0-9]+)\.([A-Za-z0-9]+)$', line)
+            if m:
+                interface_name, attribute_name = m.groups()
+                yield { 'type': 'attribute',
+                        'interface_name': interface_name,
+                        'attribute_name': attribute_name }
+                continue
+            m = re.match(r'property ([a-z0-9-]+)$', line)
+            if m:
+                property_name = m.group(1)
+                yield { 'type': 'property',
+                        'property_name': property_name }
+                continue
+            raise ValueError('error parsing %s at line %d' % (conf_filename, line_num))
+
+    return parse_counters(stream)
+
+def generate_histograms(filename):
+    # The mapping for use counters to telemetry histograms depends on the
+    # ordering of items in the dictionary.
+    items = collections.OrderedDict()
+    for counter in read_conf(filename):
+        def append_counter(name, desc):
+            items[name] = { 'expires_in_version': 'never',
+                            'kind' : 'boolean',
+                            'description': desc }
+
+        def append_counters(name, desc):
+            append_counter('USE_COUNTER_%s_DOCUMENT' % name, 'Whether a document %s' % desc)
+            append_counter('USE_COUNTER_%s_PAGE' % name, 'Whether a page %s' % desc)
+
+        if counter['type'] == 'method':
+            method = '%s.%s' % (counter['interface_name'], counter['method_name'])
+            append_counters(method.replace('.', '_').upper(), 'called %s' % method)
+        elif counter['type'] == 'attribute':
+            attr = '%s.%s' % (counter['interface_name'], counter['attribute_name'])
+            append_counters(attr.replace('.', '_').upper(), 'got or set %s' % attr)
+        elif counter['type'] == 'property':
+            prop = counter['property_name']
+            append_counters('PROPERTY_%s' % prop.replace('-', '_').upper(), "used the '%s' property" % prop)
+
+    return items
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/base/WebSocket.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/base/WebSocket.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/base/WebSocket.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/base/WebSocket.cpp	2015-05-25 20:43:14.000000000 +0000
@@ -116,10 +116,10 @@
             ErrorResult& aRv,
             bool* aConnectionFailed);
 
-  void AsyncOpen(ErrorResult& aRv);
+  void AsyncOpen(nsIPrincipal* aPrincipal, ErrorResult& aRv);
 
   nsresult ParseURL(const nsAString& aURL);
-  nsresult InitializeConnection();
+  nsresult InitializeConnection(nsIPrincipal* aPrincipal);
 
   // These methods when called can release the WebSocket object
   void FailConnection(uint16_t reasonCode,
@@ -185,8 +185,7 @@
   nsCString mURI;
   nsCString mRequestedProtocolList;
 
-  nsCOMPtr<nsIPrincipal> mPrincipal;
-  nsWeakPtr              mOriginDocument;
+  nsWeakPtr mOriginDocument;
 
   // Web Socket owner information:
   // - the script file name, UTF8 encoded.
@@ -985,24 +984,14 @@
   JSContext* mCx;
 };
 
-class InitRunnable final : public WorkerMainThreadRunnable
+class WebSocketMainThreadRunnable : public WorkerMainThreadRunnable
 {
 public:
-  InitRunnable(WebSocketImpl* aImpl, const nsAString& aURL,
-               nsTArray<nsString>& aProtocolArray,
-               const nsACString& aScriptFile, uint32_t aScriptLine,
-               ErrorResult& aRv, bool* aConnectionFailed)
-    : WorkerMainThreadRunnable(aImpl->mWorkerPrivate)
-    , mImpl(aImpl)
-    , mURL(aURL)
-    , mProtocolArray(aProtocolArray)
-    , mScriptFile(aScriptFile)
-    , mScriptLine(aScriptLine)
-    , mRv(aRv)
-    , mConnectionFailed(aConnectionFailed)
+  WebSocketMainThreadRunnable(WorkerPrivate* aWorkerPrivate)
+    : WorkerMainThreadRunnable(aWorkerPrivate)
   {
-    MOZ_ASSERT(mWorkerPrivate);
-    mWorkerPrivate->AssertIsOnWorkerThread();
+    MOZ_ASSERT(aWorkerPrivate);
+    aWorkerPrivate->AssertIsOnWorkerThread();
   }
 
   bool MainThreadRun() override
@@ -1020,11 +1009,37 @@
       return InitWithWindow(window);
     }
 
-    return InitWindowless();
+    return InitWindowless(wp);
   }
 
-private:
-  bool InitWithWindow(nsPIDOMWindow* aWindow)
+protected:
+  virtual bool InitWithWindow(nsPIDOMWindow* aWindow) = 0;
+
+  virtual bool InitWindowless(WorkerPrivate* aTopLevelWorkerPrivate) = 0;
+};
+
+class InitRunnable final : public WebSocketMainThreadRunnable
+{
+public:
+  InitRunnable(WebSocketImpl* aImpl, const nsAString& aURL,
+               nsTArray<nsString>& aProtocolArray,
+               const nsACString& aScriptFile, uint32_t aScriptLine,
+               ErrorResult& aRv, bool* aConnectionFailed)
+    : WebSocketMainThreadRunnable(aImpl->mWorkerPrivate)
+    , mImpl(aImpl)
+    , mURL(aURL)
+    , mProtocolArray(aProtocolArray)
+    , mScriptFile(aScriptFile)
+    , mScriptLine(aScriptLine)
+    , mRv(aRv)
+    , mConnectionFailed(aConnectionFailed)
+  {
+    MOZ_ASSERT(mWorkerPrivate);
+    mWorkerPrivate->AssertIsOnWorkerThread();
+  }
+
+protected:
+  virtual bool InitWithWindow(nsPIDOMWindow* aWindow) override
   {
     AutoJSAPI jsapi;
     if (NS_WARN_IF(!jsapi.Init(aWindow))) {
@@ -1051,19 +1066,14 @@
     return true;
   }
 
-  bool InitWindowless()
+  virtual bool InitWindowless(WorkerPrivate* aTopLevelWorkerPrivate) override
   {
     MOZ_ASSERT(NS_IsMainThread());
+    MOZ_ASSERT(aTopLevelWorkerPrivate && !aTopLevelWorkerPrivate->GetWindow());
 
-    WorkerPrivate* wp = mWorkerPrivate;
-    while (wp->GetParent()) {
-      wp = wp->GetParent();
-    }
-
-    MOZ_ASSERT(!wp->GetWindow());
-
-    mImpl->Init(nullptr, wp->GetPrincipal(), mURL, mProtocolArray, mScriptFile,
-                mScriptLine, mRv, mConnectionFailed);
+    mImpl->Init(nullptr, aTopLevelWorkerPrivate->GetPrincipal(), mURL,
+                mProtocolArray, mScriptFile, mScriptLine, mRv,
+                mConnectionFailed);
     return true;
   }
 
@@ -1078,11 +1088,11 @@
   bool* mConnectionFailed;
 };
 
-class AsyncOpenRunnable final : public WorkerMainThreadRunnable
+class AsyncOpenRunnable final : public WebSocketMainThreadRunnable
 {
 public:
   AsyncOpenRunnable(WebSocketImpl* aImpl, ErrorResult& aRv)
-    : WorkerMainThreadRunnable(aImpl->mWorkerPrivate)
+    : WebSocketMainThreadRunnable(aImpl->mWorkerPrivate)
     , mImpl(aImpl)
     , mRv(aRv)
   {
@@ -1090,10 +1100,33 @@
     mWorkerPrivate->AssertIsOnWorkerThread();
   }
 
-  bool MainThreadRun() override
+protected:
+  virtual bool InitWithWindow(nsPIDOMWindow* aWindow) override
   {
     AssertIsOnMainThread();
-    mImpl->AsyncOpen(mRv);
+
+    nsIDocument* doc = aWindow->GetExtantDoc();
+    if (!doc) {
+      mRv.Throw(NS_ERROR_FAILURE);
+      return true;
+    }
+
+    nsCOMPtr<nsIPrincipal> principal = doc->NodePrincipal();
+    if (!principal) {
+      mRv.Throw(NS_ERROR_FAILURE);
+      return true;
+    }
+
+    mImpl->AsyncOpen(principal, mRv);
+    return true;
+  }
+
+  virtual bool InitWindowless(WorkerPrivate* aTopLevelWorkerPrivate) override
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+    MOZ_ASSERT(aTopLevelWorkerPrivate && !aTopLevelWorkerPrivate->GetWindow());
+
+    mImpl->AsyncOpen(aTopLevelWorkerPrivate->GetPrincipal(), mRv);
     return true;
   }
 
@@ -1253,7 +1286,8 @@
   }
 
   if (NS_IsMainThread()) {
-    webSocket->mImpl->AsyncOpen(aRv);
+    MOZ_ASSERT(principal);
+    webSocket->mImpl->AsyncOpen(principal, aRv);
   } else {
     nsRefPtr<AsyncOpenRunnable> runnable =
       new AsyncOpenRunnable(webSocket->mImpl, aRv);
@@ -1306,7 +1340,6 @@
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(WebSocket,
                                                   DOMEventTargetHelper)
   if (tmp->mImpl) {
-    NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mImpl->mPrincipal)
     NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mImpl->mChannel)
   }
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
@@ -1314,7 +1347,6 @@
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(WebSocket,
                                                 DOMEventTargetHelper)
   if (tmp->mImpl) {
-    NS_IMPL_CYCLE_COLLECTION_UNLINK(mImpl->mPrincipal)
     NS_IMPL_CYCLE_COLLECTION_UNLINK(mImpl->mChannel)
     tmp->mImpl->Disconnect();
     MOZ_ASSERT(!tmp->mImpl);
@@ -1361,8 +1393,6 @@
   // because of some error.
   nsRefPtr<WebSocketImpl> kungfuDeathGrip = this;
 
-  mPrincipal = aPrincipal;
-
   // Attempt to kill "ghost" websocket: but usually too early for check to fail
   aRv = mWebSocket->CheckInnerWindowCorrectness();
   if (NS_WARN_IF(aRv.Failed())) {
@@ -1489,7 +1519,7 @@
   mOriginDocument = do_GetWeakReference(originDoc);
   aRv = NS_CheckContentLoadPolicy(nsIContentPolicy::TYPE_WEBSOCKET,
                                   uri,
-                                  mPrincipal,
+                                  aPrincipal,
                                   originDoc,
                                   EmptyCString(),
                                   nullptr,
@@ -1509,7 +1539,7 @@
   // the constructor should throw a SYNTAX_ERROR only if it fails to parse the
   // url parameter, so don't throw if InitializeConnection fails, and call
   // onerror/onclose asynchronously
-  if (NS_FAILED(InitializeConnection())) {
+  if (NS_FAILED(InitializeConnection(aPrincipal))) {
     *aConnectionFailed = true;
   } else {
     *aConnectionFailed = false;
@@ -1517,12 +1547,12 @@
 }
 
 void
-WebSocketImpl::AsyncOpen(ErrorResult& aRv)
+WebSocketImpl::AsyncOpen(nsIPrincipal* aPrincipal, ErrorResult& aRv)
 {
   MOZ_ASSERT(NS_IsMainThread(), "Not running on main thread");
 
   nsCString asciiOrigin;
-  aRv = nsContentUtils::GetASCIIOrigin(mPrincipal, asciiOrigin);
+  aRv = nsContentUtils::GetASCIIOrigin(aPrincipal, asciiOrigin);
   if (NS_WARN_IF(aRv.Failed())) {
     return;
   }
@@ -1561,7 +1591,7 @@
 };
 
 nsresult
-WebSocketImpl::InitializeConnection()
+WebSocketImpl::InitializeConnection(nsIPrincipal* aPrincipal)
 {
   AssertIsOnMainThread();
   MOZ_ASSERT(!mChannel, "mChannel should be null");
@@ -1601,8 +1631,8 @@
   mOriginDocument = nullptr;
 
   wsChannel->InitLoadInfo(doc ? doc->AsDOMNode() : nullptr,
-                          doc ? doc->NodePrincipal() : mPrincipal.get(),
-                          mPrincipal,
+                          doc ? doc->NodePrincipal() : aPrincipal,
+                          aPrincipal,
                           nsILoadInfo::SEC_NORMAL,
                           nsIContentPolicy::TYPE_WEBSOCKET);
 
@@ -1792,53 +1822,6 @@
   return DispatchDOMEvent(nullptr, event, nullptr, nullptr);
 }
 
-namespace {
-
-class PrefEnabledRunnable final : public WorkerMainThreadRunnable
-{
-public:
-  explicit PrefEnabledRunnable(WorkerPrivate* aWorkerPrivate)
-    : WorkerMainThreadRunnable(aWorkerPrivate)
-    , mEnabled(false)
-  { }
-
-  bool MainThreadRun() override
-  {
-    AssertIsOnMainThread();
-    mEnabled = Preferences::GetBool("dom.workers.websocket.enabled", false);
-    return true;
-  }
-
-  bool IsEnabled() const
-  {
-    return mEnabled;
-  }
-
-private:
-  bool mEnabled;
-};
-
-} // anonymous namespace
-
-bool
-WebSocket::PrefEnabled(JSContext* /* aCx */, JSObject* /* aGlobal */)
-{
-  // WebSockets are always enabled on main-thread.
-  if (NS_IsMainThread()) {
-    return true;
-  }
-
-  WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate();
-  MOZ_ASSERT(workerPrivate);
-  workerPrivate->AssertIsOnWorkerThread();
-
-  nsRefPtr<PrefEnabledRunnable> runnable =
-    new PrefEnabledRunnable(workerPrivate);
-  runnable->Dispatch(workerPrivate->GetJSContext());
-
-  return runnable->IsEnabled();
-}
-
 nsresult
 WebSocketImpl::ParseURL(const nsAString& aURL)
 {
@@ -2215,16 +2198,13 @@
   AssertIsOnTargetThread();
 
   nsCOMPtr<nsIInputStream> msgStream;
-  nsresult rv = aData.GetInternalStream(getter_AddRefs(msgStream));
-  if (NS_FAILED(rv)) {
-    aRv.Throw(rv);
+  aData.GetInternalStream(getter_AddRefs(msgStream), aRv);
+  if (NS_WARN_IF(aRv.Failed())){
     return;
   }
 
-  uint64_t msgLength;
-  rv = aData.GetSize(&msgLength);
-  if (NS_FAILED(rv)) {
-    aRv.Throw(rv);
+  uint64_t msgLength = aData.GetSize(aRv);
+  if (NS_WARN_IF(aRv.Failed())){
     return;
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/BindingUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/BindingUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/BindingUtils.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/BindingUtils.cpp	2015-05-25 20:43:20.000000000 +0000
@@ -854,7 +854,7 @@
   if (cache && cache->IsDOMBinding()) {
       JS::Rooted<JSObject*> obj(aCx, cache->GetWrapper());
       if (!obj) {
-        obj = cache->WrapObject(aCx, JS::NullPtr());
+        obj = cache->WrapObject(aCx, nullptr);
       }
 
       if (obj && aAllowNativeWrapper && !JS_WrapObject(aCx, &obj)) {
@@ -1820,7 +1820,7 @@
                                 JS::MutableHandle<JS::Value> aValue,
                                 nsAString& aJSON) const
 {
-  return JS_Stringify(aCx, aValue, JS::NullPtr(), JS::NullHandleValue,
+  return JS_Stringify(aCx, aValue, nullptr, JS::NullHandleValue,
                       AppendJSONToString, &aJSON);
 }
 
@@ -1895,7 +1895,7 @@
   JS::Rooted<JSObject*> propertyHolder(aCx);
   JS::Rooted<JSObject*> copyFrom(aCx, isProxy ? expandoObject : aObj);
   if (copyFrom) {
-    propertyHolder = JS_NewObjectWithGivenProto(aCx, nullptr, JS::NullPtr());
+    propertyHolder = JS_NewObjectWithGivenProto(aCx, nullptr, nullptr);
     if (!propertyHolder) {
       return NS_ERROR_OUT_OF_MEMORY;
     }
@@ -2411,7 +2411,7 @@
 #ifdef DEBUG
 void
 VerifyTraceProtoAndIfaceCacheCalled(JS::CallbackTracer *trc, void **thingp,
-                                    JSGCTraceKind kind)
+                                    JS::TraceKind kind)
 {
     // We don't do anything here, we only want to verify that
     // TraceProtoAndIfaceCache was called.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/BindingUtils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/BindingUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/BindingUtils.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/BindingUtils.h	2015-05-25 20:43:20.000000000 +0000
@@ -528,7 +528,7 @@
 #ifdef DEBUG
 void
 VerifyTraceProtoAndIfaceCacheCalled(JS::CallbackTracer *trc, void **thingp,
-                                    JSGCTraceKind kind);
+                                    JS::TraceKind kind);
 
 struct VerifyTraceProtoAndIfaceCacheCalledTracer : public JS::CallbackTracer
 {
@@ -933,7 +933,7 @@
       return false;
     }
 
-    obj = value->WrapObject(cx, JS::NullPtr());
+    obj = value->WrapObject(cx, nullptr);
     if (!obj) {
       // At this point, obj is null, so just return false.
       // Callers seem to be testing JS_IsExceptionPending(cx) to
@@ -1041,7 +1041,7 @@
     }
 
     MOZ_ASSERT(js::IsObjectInContextCompartment(scope, cx));
-    if (!value->WrapObject(cx, JS::NullPtr(), &obj)) {
+    if (!value->WrapObject(cx, nullptr, &obj)) {
       return false;
     }
   }
@@ -1087,7 +1087,7 @@
     }
 
     MOZ_ASSERT(js::IsObjectInContextCompartment(scope, cx));
-    if (!value->WrapObject(cx, JS::NullPtr(), &obj)) {
+    if (!value->WrapObject(cx, nullptr, &obj)) {
       return false;
     }
 
@@ -1523,7 +1523,7 @@
     if (!CouldBeDOMBinding(parent)) {
       obj = WrapNativeParentFallback<T>::Wrap(cx, parent, cache);
     } else {
-      obj = parent->WrapObject(cx, JS::NullPtr());
+      obj = parent->WrapObject(cx, nullptr);
     }
 
     return obj;
@@ -3024,7 +3024,7 @@
                                  JS::DontFireOnNewGlobalHook, aOptions));
   if (!aGlobal) {
     NS_WARNING("Failed to create global");
-    return JS::NullPtr();
+    return nullptr;
   }
 
   JSAutoCompartment ac(aCx, aGlobal);
@@ -3039,7 +3039,7 @@
                                     CreateGlobalOptions<T>::ProtoAndIfaceCacheKind);
 
     if (!CreateGlobalOptions<T>::PostCreateGlobal(aCx, aGlobal)) {
-      return JS::NullPtr();
+      return nullptr;
     }
   }
 
@@ -3047,13 +3047,13 @@
       !CreateGlobalOptions<T>::ForceInitStandardClassesToFalse &&
       !JS_InitStandardClasses(aCx, aGlobal)) {
     NS_WARNING("Failed to init standard classes");
-    return JS::NullPtr();
+    return nullptr;
   }
 
   JS::Handle<JSObject*> proto = GetProto(aCx, aGlobal);
   if (!proto || !JS_SplicePrototype(aCx, aGlobal, proto)) {
     NS_WARNING("Failed to set proto");
-    return JS::NullPtr();
+    return nullptr;
   }
 
   return proto;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/Codegen.py firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/Codegen.py
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/Codegen.py	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/Codegen.py	2015-05-25 20:43:20.000000000 +0000
@@ -651,6 +651,7 @@
 
 
 def NeedsGeneratedHasInstance(descriptor):
+    assert descriptor.interface.hasInterfaceObject()
     return descriptor.hasXPConnectImpls or descriptor.interface.isConsequential()
 
 def InterfaceObjectProtoGetter(descriptor):
@@ -1020,6 +1021,7 @@
          # Grab the includes for the things that involve XPCOM interfaces
         hasInstanceIncludes = set("nsIDOM" + d.interface.identifier.name + ".h" for d
                                   in descriptors if
+                                  d.interface.hasInterfaceObject() and
                                   NeedsGeneratedHasInstance(d) and
                                   d.interface.hasInterfacePrototypeObject())
 
@@ -1086,8 +1088,7 @@
             elif unrolled.isDictionary():
                 headerSet.add(self.getDeclarationFilename(unrolled.inner))
             elif unrolled.isCallback():
-                # Callbacks are both a type and an object
-                headerSet.add(self.getDeclarationFilename(unrolled))
+                headerSet.add(self.getDeclarationFilename(unrolled.callback))
             elif unrolled.isFloat() and not unrolled.isUnrestricted():
                 # Restricted floats are tested for finiteness
                 bindingHeaders.add("mozilla/FloatingPoint.h")
@@ -1276,7 +1277,7 @@
                     # Callbacks always use strong refs, so we need to include
                     # the right header to be able to Release() in our inlined
                     # code.
-                    headers.add(CGHeaders.getDeclarationFilename(f))
+                    headers.add(CGHeaders.getDeclarationFilename(f.callback))
                 elif f.isMozMap():
                     headers.add("mozilla/dom/MozMap.h")
                     # And add headers for the type we're parametrized over
@@ -1778,6 +1779,7 @@
                 Argument('JS::Handle<JSObject*>', 'obj'),
                 Argument('JS::MutableHandle<JS::Value>', 'vp'),
                 Argument('bool*', 'bp')]
+        assert descriptor.interface.hasInterfaceObject()
         CGAbstractStaticMethod.__init__(self, descriptor, HASINSTANCE_HOOK_NAME,
                                         'bool', args)
 
@@ -2867,7 +2869,7 @@
             """
             /* Make sure our global is sane.  Hopefully we can remove this sometime */
             if (!(js::GetObjectClass(aGlobal)->flags & JSCLASS_DOM_GLOBAL)) {
-              return JS::NullPtr();
+              return nullptr;
             }
 
             /* Check to see whether the interface objects are already installed */
@@ -5130,7 +5132,8 @@
         assert not type.treatNonObjectAsNull() or type.nullable()
         assert not type.treatNonObjectAsNull() or not type.treatNonCallableAsNull()
 
-        name = type.unroll().identifier.name
+        callback = type.unroll().callback
+        name = callback.identifier.name
         if type.nullable():
             declType = CGGeneric("nsRefPtr<%s>" % name)
         else:
@@ -5602,7 +5605,7 @@
             rooterDecl +
             dedent("""
                 if (${argc} > ${index}) {
-                  if (!${declName}.SetCapacity(${argc} - ${index})) {
+                  if (!${declName}.SetCapacity(${argc} - ${index}, mozilla::fallible)) {
                     JS_ReportOutOfMemory(cx);
                     return false;
                   }
@@ -6233,7 +6236,7 @@
             result = CGGeneric("auto")
         return result, None, None, None, conversion
     if returnType.isCallback():
-        name = returnType.unroll().identifier.name
+        name = returnType.unroll().callback.identifier.name
         return CGGeneric("nsRefPtr<%s>" % name), None, None, None, None
     if returnType.isAny():
         if isMember:
@@ -8782,7 +8785,7 @@
         return CGGeneric(type.inner.identifier.name)
 
     if type.isCallback():
-        return CGGeneric("%s&" % type.unroll().identifier.name)
+        return CGGeneric("%s&" % type.unroll().callback.identifier.name)
 
     if type.isAny():
         return CGGeneric("JS::Value")
@@ -9929,7 +9932,7 @@
             }
             // OK to pass null as "proxy" because it's ignored if
             // shadowPrototypeProperties is true
-            return AppendNamedPropertyIds(cx, JS::NullPtr(), names, true, props);
+            return AppendNamedPropertyIds(cx, nullptr, names, true, props);
             """))
 
 
@@ -12414,7 +12417,7 @@
             # Note: Spidermonkey interfaces are typedefs, so can't be
             # forward-declared
             elif t.isCallback():
-                builder.addInMozillaDom(str(t))
+                builder.addInMozillaDom(t.callback.identifier.name)
             elif t.isDictionary():
                 builder.addInMozillaDom(t.inner.identifier.name, isStruct=True)
             elif t.isCallbackInterface():
@@ -12441,12 +12444,12 @@
             builder.add(d.nativeType + "Atoms", isStruct=True)
 
         for callback in mainCallbacks:
-            forwardDeclareForType(callback)
+            builder.addInMozillaDom(callback.identifier.name)
             for t in getTypesFromCallback(callback):
                 forwardDeclareForType(t, workerness='mainthreadonly')
 
         for callback in workerCallbacks:
-            forwardDeclareForType(callback)
+            builder.addInMozillaDom(callback.identifier.name)
             for t in getTypesFromCallback(callback):
                 forwardDeclareForType(t, workerness='workeronly')
 
@@ -12829,7 +12832,7 @@
             # .forget() to get our already_AddRefed.
             return result.define(), "nullptr", "return ${declName}.forget();\n"
         if type.isCallback():
-            return ("already_AddRefed<%s>" % type.unroll().identifier.name,
+            return ("already_AddRefed<%s>" % type.unroll().callback.identifier.name,
                     "nullptr", "return ${declName}.forget();\n")
         if type.isAny():
             if isMember:
@@ -13059,7 +13062,7 @@
                 else:
                     declType = "%s&"
             if type.isCallback():
-                name = type.unroll().identifier.name
+                name = type.unroll().callback.identifier.name
             else:
                 name = type.unroll().inner.identifier.name
             return declType % name, False, False
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/Configuration.py firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/Configuration.py
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/Configuration.py	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/Configuration.py	2015-05-25 20:43:20.000000000 +0000
@@ -48,11 +48,10 @@
                         "%s\n"
                         "%s" %
                         (thing.location, thing.implementor.location))
-            # Some toplevel things are sadly types, and those have an
-            # isInterface that doesn't mean the same thing as IDLObject's
-            # isInterface()...
-            if (not isinstance(thing, IDLInterface) and
-                not isinstance(thing, IDLExternalInterface)):
+
+            assert not thing.isType();
+
+            if not thing.isInterface():
                 continue
             iface = thing
             self.interfaces[iface.identifier.name] = iface
@@ -800,9 +799,9 @@
     def doFindCallbacksAndDictionaries(types, callbacks, dictionaries):
         unhandledTypes = set()
         for type in types:
-            if type.isCallback() and type not in callbacks:
-                unhandledTypes |= getFlatTypes(getTypesFromCallback(type))
-                callbacks.add(type)
+            if type.isCallback() and type.callback not in callbacks:
+                unhandledTypes |= getFlatTypes(getTypesFromCallback(type.callback))
+                callbacks.add(type.callback)
             elif type.isDictionary() and type.inner not in dictionaries:
                 d = type.inner
                 unhandledTypes |= getFlatTypes(getTypesFromDictionary(d))
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/DOMJSProxyHandler.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/DOMJSProxyHandler.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/DOMJSProxyHandler.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/DOMJSProxyHandler.cpp	2015-05-25 20:43:20.000000000 +0000
@@ -118,7 +118,7 @@
   }
 
   JS::Rooted<JSObject*> expando(cx,
-    JS_NewObjectWithGivenProto(cx, nullptr, JS::NullPtr()));
+    JS_NewObjectWithGivenProto(cx, nullptr, nullptr));
   if (!expando) {
     return nullptr;
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/parser/WebIDL.py firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/parser/WebIDL.py
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/parser/WebIDL.py	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/parser/WebIDL.py	2015-05-25 20:43:20.000000000 +0000
@@ -164,6 +164,9 @@
     def isUnion(self):
         return False
 
+    def isTypedef(self):
+        return False
+
     def getUserData(self, key, default):
         return self.userData.get(key, default)
 
@@ -1789,11 +1792,11 @@
 
     def treatNonCallableAsNull(self):
         assert self.tag() == IDLType.Tags.callback
-        return self.nullable() and self.inner._treatNonCallableAsNull
+        return self.nullable() and self.inner.callback._treatNonCallableAsNull
 
     def treatNonObjectAsNull(self):
         assert self.tag() == IDLType.Tags.callback
-        return self.nullable() and self.inner._treatNonObjectAsNull
+        return self.nullable() and self.inner.callback._treatNonObjectAsNull
 
     def addExtendedAttributes(self, attrs):
         assert len(attrs) == 0
@@ -1833,11 +1836,17 @@
 
         assert obj
         if obj.isType():
-            # obj itself might not be complete; deal with that.
-            assert obj != self
-            if not obj.isComplete():
-                obj = obj.complete(scope)
-            return obj
+            print obj
+        assert not obj.isType()
+        if obj.isTypedef():
+            assert self.name.name == obj.identifier.name
+            typedefType = IDLTypedefType(self.location, obj.innerType,
+                                         obj.identifier)
+            assert not typedefType.isComplete()
+            return typedefType.complete(scope)
+        elif obj.isCallback() and not obj.isInterface():
+            assert self.name.name == obj.identifier.name
+            return IDLCallbackType(self.location, obj)
 
         if self._promiseInnerType and not self._promiseInnerType.isComplete():
             self._promiseInnerType = self._promiseInnerType.complete(scope)
@@ -2358,23 +2367,17 @@
     def _getDependentObjects(self):
         return self.inner._getDependentObjects()
 
-class IDLTypedefType(IDLType, IDLObjectWithIdentifier):
+class IDLTypedefType(IDLType):
     def __init__(self, location, innerType, name):
-        IDLType.__init__(self, location, innerType.name)
-
-        identifier = IDLUnresolvedIdentifier(location, name)
-
-        IDLObjectWithIdentifier.__init__(self, location, None, identifier)
-
+        IDLType.__init__(self, location, name)
         self.inner = innerType
-        self.name = name
         self.builtin = False
 
     def __eq__(self, other):
         return isinstance(other, IDLTypedefType) and self.inner == other.inner
 
     def __str__(self):
-        return self.identifier.name
+        return self.name
 
     def nullable(self):
         return self.inner.nullable()
@@ -2442,16 +2445,6 @@
         assert self.inner.isComplete()
         return self.inner
 
-    def finish(self, parentScope):
-        # Maybe the IDLObjectWithIdentifier for the typedef should be
-        # a separate thing from the type?  If that happens, we can
-        # remove some hackery around avoiding isInterface() in
-        # Configuration.py.
-        self.complete(parentScope)
-
-    def validate(self):
-        pass
-
     # Do we need a resolveType impl?  I don't think it's particularly useful....
 
     def tag(self):
@@ -2466,6 +2459,31 @@
     def _getDependentObjects(self):
         return self.inner._getDependentObjects()
 
+class IDLTypedef(IDLObjectWithIdentifier):
+    def __init__(self, location, parentScope, innerType, name):
+        identifier = IDLUnresolvedIdentifier(location, name)
+        IDLObjectWithIdentifier.__init__(self, location, parentScope, identifier)
+        self.innerType = innerType
+
+    def __str__(self):
+        return "Typedef %s %s" % (self.identifier.name, self.innerType)
+
+    def finish(self, parentScope):
+        if not self.innerType.isComplete():
+            self.innerType = self.innerType.complete(parentScope)
+
+    def validate(self):
+        pass
+
+    def isTypedef(self):
+        return True
+
+    def addExtendedAttributes(self, attrs):
+        assert len(attrs) == 0
+
+    def _getDependentObjects(self):
+        return self.innerType._getDependentObjects()
+
 class IDLWrapperType(IDLType):
     def __init__(self, location, inner, promiseInnerType=None):
         IDLType.__init__(self, location, inner.identifier.name)
@@ -3655,12 +3673,10 @@
     def canHaveMissingValue(self):
         return self.optional and not self.defaultValue
 
-class IDLCallbackType(IDLType, IDLObjectWithScope):
+class IDLCallback(IDLObjectWithScope):
     def __init__(self, location, parentScope, identifier, returnType, arguments):
         assert isinstance(returnType, IDLType)
 
-        IDLType.__init__(self, location, identifier.name)
-
         self._returnType = returnType
         # Clone the list
         self._arguments = list(arguments)
@@ -3680,9 +3696,6 @@
     def signatures(self):
         return [(self._returnType, self._arguments)]
 
-    def tag(self):
-        return IDLType.Tags.callback
-
     def finish(self, scope):
         if not self._returnType.isComplete():
             type = self._returnType.complete(scope)
@@ -3706,14 +3719,6 @@
     def validate(self):
         pass
 
-    def isDistinguishableFrom(self, other):
-        if other.isUnion():
-            # Just forward to the union; it'll deal
-            return other.isDistinguishableFrom(self)
-        return (other.isPrimitive() or other.isString() or other.isEnum() or
-                other.isNonCallbackInterface() or other.isDate() or
-                other.isSequence())
-
     def addExtendedAttributes(self, attrs):
         unhandledAttrs = []
         for attr in attrs:
@@ -3732,6 +3737,28 @@
     def _getDependentObjects(self):
         return set([self._returnType] + self._arguments)
 
+class IDLCallbackType(IDLType):
+    def __init__(self, location, callback):
+        IDLType.__init__(self, location, callback.identifier.name)
+        self.callback = callback
+
+    def isCallback(self):
+        return True
+
+    def tag(self):
+        return IDLType.Tags.callback
+
+    def isDistinguishableFrom(self, other):
+        if other.isUnion():
+            # Just forward to the union; it'll deal
+            return other.isDistinguishableFrom(self)
+        return (other.isPrimitive() or other.isString() or other.isEnum() or
+                other.isNonCallbackInterface() or other.isDate() or
+                other.isSequence())
+
+    def _getDependentObjects(self):
+        return self.callback._getDependentObjects()
+
 class IDLMethodOverload:
     """
     A class that represents a single overload of a WebIDL method.  This is not
@@ -4738,8 +4765,8 @@
             CallbackRest : IDENTIFIER EQUALS ReturnType LPAREN ArgumentList RPAREN SEMICOLON
         """
         identifier = IDLUnresolvedIdentifier(self.getLocation(p, 1), p[1])
-        p[0] = IDLCallbackType(self.getLocation(p, 1), self.globalScope(),
-                               identifier, p[3], p[5])
+        p[0] = IDLCallback(self.getLocation(p, 1), self.globalScope(),
+                           identifier, p[3], p[5])
 
     def p_ExceptionMembers(self, p):
         """
@@ -4752,8 +4779,8 @@
         """
             Typedef : TYPEDEF Type IDENTIFIER SEMICOLON
         """
-        typedef = IDLTypedefType(self.getLocation(p, 1), p[2], p[3])
-        typedef.resolve(self.globalScope())
+        typedef = IDLTypedef(self.getLocation(p, 1), self.globalScope(),
+                             p[2], p[3])
         p[0] = typedef
 
     def p_ImplementsStatement(self, p):
@@ -5488,8 +5515,12 @@
         try:
             if self.globalScope()._lookupIdentifier(p[1]):
                 obj = self.globalScope()._lookupIdentifier(p[1])
-                if obj.isType():
-                    type = obj
+                assert not obj.isType()
+                if obj.isTypedef():
+                    type = IDLTypedefType(self.getLocation(p, 1), obj.innerType,
+                                          obj.identifier.name)
+                elif obj.isCallback() and not obj.isInterface():
+                    type = IDLCallbackType(self.getLocation(p, 1), obj)
                 else:
                     type = IDLWrapperType(self.getLocation(p, 1), p[1])
                 p[0] = self.handleModifiers(type, p[2])
@@ -5825,9 +5856,7 @@
         for x in xrange(IDLBuiltinType.Types.ArrayBuffer, IDLBuiltinType.Types.Float64Array + 1):
             builtin = BuiltinTypes[x]
             name = builtin.name
-
-            typedef = IDLTypedefType(BuiltinLocation("<builtin type>"), builtin, name)
-            typedef.resolve(scope)
+            typedef = IDLTypedef(BuiltinLocation("<builtin type>"), scope, builtin, name)
 
     @ staticmethod
     def handleModifiers(type, modifiers):
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/StructuredClone.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/StructuredClone.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/StructuredClone.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/StructuredClone.cpp	2015-05-25 20:43:20.000000000 +0000
@@ -32,7 +32,7 @@
     nsRefPtr<ImageData> imageData = new ImageData(width, height,
                                                   dataArray.toObject());
     // Wrap it in a JS::Value.
-    if (!imageData->WrapObject(aCx, JS::NullPtr(), &result)) {
+    if (!imageData->WrapObject(aCx, nullptr, &result)) {
       return nullptr;
     }
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/test/test_bug707564-chrome.html firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/test/test_bug707564-chrome.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/test/test_bug707564-chrome.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/test/test_bug707564-chrome.html	2015-05-25 20:43:20.000000000 +0000
@@ -23,14 +23,14 @@
 function test()
 {
   var nav = document.getElementById("t1").contentWindow.navigator;
-  ise(nav.foopy, undefined, "We should have an Xray now");
+  is(nav.foopy, undefined, "We should have an Xray now");
   is(nav.wrappedJSObject.foopy, 5, "We should have the right navigator object");
   var props = Object.getOwnPropertyNames(nav);
   isnot(props.indexOf("mozApps"), -1,
         "Should enumerate a mozApps property on navigator xray");
 
   var nav = document.getElementById("t2").contentWindow.navigator;
-  ise(nav.foopy, undefined, "We should have an Xray now again");
+  is(nav.foopy, undefined, "We should have an Xray now again");
   is(nav.wrappedJSObject.foopy, 5, "We should have the right navigator object again");
   var found = false;
   for (var name in nav) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/test/test_callback_default_thisval.html firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/test/test_callback_default_thisval.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/test/test_callback_default_thisval.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/test/test_callback_default_thisval.html	2015-05-25 20:43:21.000000000 +0000
@@ -15,7 +15,7 @@
 
   function f() {
     "use strict";
-    ise(this, undefined, "Should have undefined this value");
+    is(this, undefined, "Should have undefined this value");
     SimpleTest.finish();
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/test/TestCodeGen.webidl firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/test/TestCodeGen.webidl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/test/TestCodeGen.webidl	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/test/TestCodeGen.webidl	2015-05-25 20:43:20.000000000 +0000
@@ -7,6 +7,7 @@
 typedef long myLong;
 typedef TestInterface AnotherNameForTestInterface;
 typedef TestInterface? NullableTestInterface;
+typedef CustomEventInit TestDictionaryTypedef;
 
 interface TestExternalInterface;
 
@@ -1019,6 +1020,7 @@
   required object requiredObject;
 
   CustomEventInit customEventInit;
+  TestDictionaryTypedef dictionaryTypedef;
 };
 
 dictionary ParentDict : GrandparentDict {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/test/test_document_location_via_xray_cached.html firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/test/test_document_location_via_xray_cached.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/test/test_document_location_via_xray_cached.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/test/test_document_location_via_xray_cached.html	2015-05-25 20:43:21.000000000 +0000
@@ -23,7 +23,7 @@
 function test()
 {
   var loc = document.getElementById("t").contentWindow.document.location;
-  ise(loc.toString, loc.toString, "Unforgeable method on the Xray should be cached");
+  is(loc.toString, loc.toString, "Unforgeable method on the Xray should be cached");
   SimpleTest.finish();
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/test/test_dom_xrays.html firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/test/test_dom_xrays.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/test/test_dom_xrays.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/test/test_dom_xrays.html	2015-05-25 20:43:21.000000000 +0000
@@ -32,16 +32,16 @@
     var value = values.shift();
     if (typeof value == "undefined") {
       ok(!obj.hasOwnProperty(name), "hasOwnProperty shouldn't see \"" + name + "\" through Xrays");
-      ise(Object.getOwnPropertyDescriptor(obj, name), undefined, "getOwnPropertyDescriptor shouldn't see \"" + name + "\" through Xrays");
+      is(Object.getOwnPropertyDescriptor(obj, name), undefined, "getOwnPropertyDescriptor shouldn't see \"" + name + "\" through Xrays");
       ok(Object.keys(obj).indexOf(name) == -1, "Enumerating the Xray should not return \"" + name + "\"");
     } else {
       ok(obj.hasOwnProperty(name), "hasOwnProperty should see \"" + name + "\" through Xrays");
       var pd = Object.getOwnPropertyDescriptor(obj, name);
       ok(pd, "getOwnPropertyDescriptor should see \"" + name + "\" through Xrays");
       if (pd && pd.get) {
-        ise(pd.get.call(instance), value, "Should get the right value for \"" + name + "\" through Xrays");
+        is(pd.get.call(instance), value, "Should get the right value for \"" + name + "\" through Xrays");
       } else {
-        ise(obj[name], value, "Should get the right value for \"" + name + "\" through Xrays");
+        is(obj[name], value, "Should get the right value for \"" + name + "\" through Xrays");
       }
       if (pd && pd.enumerable) {
         ok(Object.keys(obj).indexOf("" + name) > -1, "Enumerating the Xray should return \"" + name + "\"");
@@ -62,13 +62,13 @@
   var doc = document.getElementById("t").contentDocument;
 
   var winProto = Object.getPrototypeOf(win);
-  ise(winProto, win.Window.prototype, "The proto chain of the Xray should mirror the prototype chain of the Xrayed object");
+  is(winProto, win.Window.prototype, "The proto chain of the Xray should mirror the prototype chain of the Xrayed object");
 
   var namedPropertiesObject = Object.getPrototypeOf(winProto);
-  ise(Cu.getClassName(namedPropertiesObject, /* unwrap = */ true), "WindowProperties", "The proto chain of the Xray should mirror the prototype chain of the Xrayed object");
+  is(Cu.getClassName(namedPropertiesObject, /* unwrap = */ true), "WindowProperties", "The proto chain of the Xray should mirror the prototype chain of the Xrayed object");
 
   var eventTargetProto = Object.getPrototypeOf(namedPropertiesObject);
-  ise(eventTargetProto, win.EventTarget.prototype, "The proto chain of the Xray should mirror the prototype chain of the Xrayed object");
+  is(eventTargetProto, win.EventTarget.prototype, "The proto chain of the Xray should mirror the prototype chain of the Xrayed object");
 
   // Xrays need to filter expandos.
   checkWindowXrayProperty(win, "expando", undefined);
@@ -94,44 +94,44 @@
   while ((proto = Object.getPrototypeOf(obj))) {
     obj = proto;
   }
-  ise(obj, win.Object.prototype, "Object.prototype should be at the end of the prototype chain");
+  is(obj, win.Object.prototype, "Object.prototype should be at the end of the prototype chain");
 
   // Named properties shouldn't shadow WebIDL- or ECMAScript-defined properties.
   checkWindowXrayProperty(win, "addEventListener", undefined, undefined, undefined, eventTargetProto.addEventListener);
-  ise(win.addEventListener, eventTargetProto.addEventListener, "Named properties shouldn't shadow WebIDL-defined properties");
+  is(win.addEventListener, eventTargetProto.addEventListener, "Named properties shouldn't shadow WebIDL-defined properties");
 
-  ise(win.toString, win.Object.prototype.toString, "Named properties shouldn't shadow ECMAScript-defined properties");
+  is(win.toString, win.Object.prototype.toString, "Named properties shouldn't shadow ECMAScript-defined properties");
 
   // HTMLDocument
   // Unforgeable properties live on the instance.
   checkXrayProperty(doc, "location", [ win.location ]);
-  ise(String(win.location), document.getElementById("t").src,
-      "Should have the right stringification");
+  is(String(win.location), document.getElementById("t").src,
+     "Should have the right stringification");
 
   // HTMLHtmlElement
   var elem = doc.documentElement;
 
   var elemProto = Object.getPrototypeOf(elem);
-  ise(elemProto, win.HTMLHtmlElement.prototype, "The proto chain of the Xray should mirror the prototype chain of the Xrayed object");
+  is(elemProto, win.HTMLHtmlElement.prototype, "The proto chain of the Xray should mirror the prototype chain of the Xrayed object");
 
   elemProto = Object.getPrototypeOf(elemProto);
-  ise(elemProto, win.HTMLElement.prototype, "The proto chain of the Xray should mirror the prototype chain of the Xrayed object");
+  is(elemProto, win.HTMLElement.prototype, "The proto chain of the Xray should mirror the prototype chain of the Xrayed object");
 
   elemProto = Object.getPrototypeOf(elemProto);
-  ise(elemProto, win.Element.prototype, "The proto chain of the Xray should mirror the prototype chain of the Xrayed object");
+  is(elemProto, win.Element.prototype, "The proto chain of the Xray should mirror the prototype chain of the Xrayed object");
 
   elemProto = Object.getPrototypeOf(elemProto);
-  ise(elemProto, win.Node.prototype, "The proto chain of the Xray should mirror the prototype chain of the Xrayed object");
+  is(elemProto, win.Node.prototype, "The proto chain of the Xray should mirror the prototype chain of the Xrayed object");
 
   elemProto = Object.getPrototypeOf(elemProto);
-  ise(elemProto, win.EventTarget.prototype, "The proto chain of the Xray should mirror the prototype chain of the Xrayed object");
+  is(elemProto, win.EventTarget.prototype, "The proto chain of the Xray should mirror the prototype chain of the Xrayed object");
 
   // Xrays need to filter expandos.
   ok(!("expando" in elem), "Xrays should filter expandos");
 
   // WebIDL-defined properties live on the prototype.
   checkXrayProperty(elem, "version", [ undefined, "" ]);
-  ise(elem.version, "", "WebIDL properties should be exposed through Xrays");
+  is(elem.version, "", "WebIDL properties should be exposed through Xrays");
 
   // HTMLCollection
   var coll = doc.getElementsByTagName("iframe");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/test/test_exception_options_from_jsimplemented.html firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/test/test_exception_options_from_jsimplemented.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/test/test_exception_options_from_jsimplemented.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/test/test_exception_options_from_jsimplemented.html	2015-05-25 20:43:21.000000000 +0000
@@ -22,16 +22,16 @@
       ok(e instanceof Error, "Should have an Error here");
       ok(!(e instanceof DOMException), "Should not have DOMException here");
       ok(!("code" in e), "Should not have a 'code' property");
-      ise(e.name, "Error", "Should not have an interesting name here");
-      ise(e.message, "We are a DOMError", "Should have the right message");
-      ise(e.stack,
-          "doTest@http://mochi.test:8888/tests/dom/bindings/test/test_exception_options_from_jsimplemented.html:20:7\n",
-          "Exception stack should still only show our code");
-      ise(e.fileName,
-          "http://mochi.test:8888/tests/dom/bindings/test/test_exception_options_from_jsimplemented.html",
-          "Should have the right file name");
-      ise(e.lineNumber, 20, "Should have the right line number");
-      ise(e.columnNumber, 6, "Should have the right column number");
+      is(e.name, "Error", "Should not have an interesting name here");
+      is(e.message, "We are a DOMError", "Should have the right message");
+      is(e.stack,
+         "doTest@http://mochi.test:8888/tests/dom/bindings/test/test_exception_options_from_jsimplemented.html:20:7\n",
+         "Exception stack should still only show our code");
+      is(e.fileName,
+         "http://mochi.test:8888/tests/dom/bindings/test/test_exception_options_from_jsimplemented.html",
+         "Should have the right file name");
+      is(e.lineNumber, 20, "Should have the right line number");
+      is(e.columnNumber, 6, "Should have the right column number");
     }
 
     try {
@@ -39,18 +39,18 @@
     } catch (e) {
       ok(e instanceof Error, "Should also have an Error here");
       ok(e instanceof DOMException, "Should have DOMException here");
-      ise(e.name, "NotSupportedError", "Should have the right name here");
-      ise(e.message, "We are a DOMException",
-          "Should also have the right message");
-      ise(e.code, DOMException.NOT_SUPPORTED_ERR,
-          "Should have the right 'code'");
-      ise(e.stack,
-          "doTest@http://mochi.test:8888/tests/dom/bindings/test/test_exception_options_from_jsimplemented.html:38:7\n",
-          "Exception stack should still only show our code");
-      ise(e.filename,
-          "http://mochi.test:8888/tests/dom/bindings/test/test_exception_options_from_jsimplemented.html",
-          "Should still have the right file name");
-      ise(e.lineNumber, 38, "Should still have the right line number");
+      is(e.name, "NotSupportedError", "Should have the right name here");
+      is(e.message, "We are a DOMException",
+         "Should also have the right message");
+      is(e.code, DOMException.NOT_SUPPORTED_ERR,
+         "Should have the right 'code'");
+      is(e.stack,
+         "doTest@http://mochi.test:8888/tests/dom/bindings/test/test_exception_options_from_jsimplemented.html:38:7\n",
+         "Exception stack should still only show our code");
+      is(e.filename,
+         "http://mochi.test:8888/tests/dom/bindings/test/test_exception_options_from_jsimplemented.html",
+         "Should still have the right file name");
+      is(e.lineNumber, 38, "Should still have the right line number");
       todo_is(e.columnNumber, 7,
               "No column number support for DOMException yet");
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/test/test_promise_rejections_from_jsimplemented.html firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/test/test_promise_rejections_from_jsimplemented.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/test/test_promise_rejections_from_jsimplemented.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/test/test_promise_rejections_from_jsimplemented.html	2015-05-25 20:43:21.000000000 +0000
@@ -15,20 +15,20 @@
   SimpleTest.waitForExplicitFinish();
 
   function checkExn(lineNumber, name, message, code, filename, testNumber, stack, exn) {
-    ise(exn.lineNumber, lineNumber,
-        "Should have the right line number in test " + testNumber);
-    ise(exn.name, name,
-        "Should have the right exception name in test " + testNumber);
-    ise("filename" in exn ? exn.filename : exn.fileName, filename,
-        "Should have the right file name in test " + testNumber);
-    ise(exn.message, message,
-        "Should have the right message in test " + testNumber);
-    ise(exn.code, code, "Should have the right .code in test " + testNumber);
+    is(exn.lineNumber, lineNumber,
+       "Should have the right line number in test " + testNumber);
+    is(exn.name, name,
+       "Should have the right exception name in test " + testNumber);
+    is("filename" in exn ? exn.filename : exn.fileName, filename,
+       "Should have the right file name in test " + testNumber);
+    is(exn.message, message,
+       "Should have the right message in test " + testNumber);
+    is(exn.code, code, "Should have the right .code in test " + testNumber);
     if (message === "") {
-      ise(exn.name, "NS_ERROR_UNEXPECTED",
-          "Should have one of our synthetic exceptions in test " + testNumber);
+      is(exn.name, "NS_ERROR_UNEXPECTED",
+         "Should have one of our synthetic exceptions in test " + testNumber);
     }
-    ise(exn.stack, stack, "Should have the right stack in test " + testNumber);
+    is(exn.stack, stack, "Should have the right stack in test " + testNumber);
   }
 
   function ensurePromiseFail(testNumber, value) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/test/test_sequence_detection.html firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/test/test_sequence_detection.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/test/test_sequence_detection.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/test/test_sequence_detection.html	2015-05-25 20:43:21.000000000 +0000
@@ -22,7 +22,7 @@
       testInterfaceJS.testSequenceOverload(nonIterableObject);
       ok(false, "Should have thrown in the overload case");  // see long comment above!
     } catch (e) {
-      ise(e.name, "TypeError", "Should get a TypeError for the overload case");
+      is(e.name, "TypeError", "Should get a TypeError for the overload case");
       ok(e.message.includes("not iterable"),
          "Should have a message about being non-iterable in the overload case");
     }
@@ -31,7 +31,7 @@
       testInterfaceJS.testSequenceUnion(nonIterableObject);
       ok(false, "Should have thrown in the union case");
     } catch (e) {
-      ise(e.name, "TypeError", "Should get a TypeError for the union case");
+      is(e.name, "TypeError", "Should get a TypeError for the union case");
       ok(e.message.includes("not iterable"),
          "Should have a message about being non-iterable in the union case");
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/test/test_setWithNamedGetterNoNamedSetter.html firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/test/test_setWithNamedGetterNoNamedSetter.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/test/test_setWithNamedGetterNoNamedSetter.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/test/test_setWithNamedGetterNoNamedSetter.html	2015-05-25 20:43:21.000000000 +0000
@@ -22,15 +22,15 @@
   /** Test for Bug 1043690 **/
   var f = document.querySelector("form");
   var i = document.querySelector("input");
-  ise(f.getAttribute("action"), null, "Should have no action attribute");
-  ise(f.action, i, "form.action should be the input");
+  is(f.getAttribute("action"), null, "Should have no action attribute");
+  is(f.action, i, "form.action should be the input");
   f.action = "http://example.org";
-  ise(f.getAttribute("action"), "http://example.org",
-      "Should have an action attribute now");
-  ise(f.action, i, "form.action should still be the input");
+  is(f.getAttribute("action"), "http://example.org",
+     "Should have an action attribute now");
+  is(f.action, i, "form.action should still be the input");
   i.remove();
-  ise(f.action, "http://example.org/",
-      "form.action should no longer be shadowed");
+  is(f.action, "http://example.org/",
+     "form.action should no longer be shadowed");
 
 
   </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/test/test_treat_non_object_as_null.html firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/test/test_treat_non_object_as_null.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/test/test_treat_non_object_as_null.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/test/test_treat_non_object_as_null.html	2015-05-25 20:43:21.000000000 +0000
@@ -17,13 +17,13 @@
     
     (function() {
        onvolumechange = x;
-       ise(onvolumechange, x,
-           "Should preserve an object value when assigning to event handler");
+       is(onvolumechange, x,
+          "Should preserve an object value when assigning to event handler");
        // Test that we don't try to actually call the non-callable object
        window.dispatchEvent(new Event("volumechange"));
        onvolumechange = 5;
-       ise(onvolumechange, null,
-           "Non-object values should become null when assigning to event handler");
+       is(onvolumechange, null,
+          "Non-object values should become null when assigning to event handler");
     })();
   </script>
 </head>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/ToJSValue.h firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/ToJSValue.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bindings/ToJSValue.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bindings/ToJSValue.h	2015-05-25 20:43:20.000000000 +0000
@@ -172,7 +172,7 @@
 }
 
 // Accept objects that inherit from nsISupports but not nsWrapperCache (e.g.
-// nsIDOMFile).
+// DOM File).
 template <class T>
 MOZ_WARN_UNUSED_RESULT
 typename EnableIf<!IsBaseOf<nsWrapperCache, T>::value &&
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothDaemonConnector.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothDaemonConnector.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothDaemonConnector.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothDaemonConnector.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -0,0 +1,182 @@
+/* -*- 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 "BluetoothDaemonConnector.h"
+#include <fcntl.h>
+#include "nsThreadUtils.h"
+
+BEGIN_BLUETOOTH_NAMESPACE
+
+BluetoothDaemonConnector::BluetoothDaemonConnector(
+  const nsACString& aSocketName)
+  : mSocketName(aSocketName)
+{ }
+
+BluetoothDaemonConnector::~BluetoothDaemonConnector()
+{ }
+
+nsresult
+BluetoothDaemonConnector::CreateSocket(int& aFd) const
+{
+  aFd = socket(AF_UNIX, SOCK_SEQPACKET, 0);
+  if (aFd < 0) {
+    BT_WARNING("Could not open Bluetooth daemon socket!");
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+nsresult
+BluetoothDaemonConnector::SetSocketFlags(int aFd) const
+{
+  static const int sReuseAddress = 1;
+
+  // Set close-on-exec bit.
+  int flags = TEMP_FAILURE_RETRY(fcntl(aFd, F_GETFD));
+  if (flags < 0) {
+    return NS_ERROR_FAILURE;
+  }
+  flags |= FD_CLOEXEC;
+  int res = TEMP_FAILURE_RETRY(fcntl(aFd, F_SETFD, flags));
+  if (res < 0) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // Set non-blocking status flag.
+  flags = TEMP_FAILURE_RETRY(fcntl(aFd, F_GETFL));
+  if (flags < 0) {
+    return NS_ERROR_FAILURE;
+  }
+  flags |= O_NONBLOCK;
+  res = TEMP_FAILURE_RETRY(fcntl(aFd, F_SETFL, flags));
+  if (res < 0) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // Set socket addr to be reused even if kernel is still waiting to close.
+  res = setsockopt(aFd, SOL_SOCKET, SO_REUSEADDR, &sReuseAddress,
+                   sizeof(sReuseAddress));
+  if (res < 0) {
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+nsresult
+BluetoothDaemonConnector::CreateAddress(struct sockaddr& aAddress,
+                                        socklen_t& aAddressLength) const
+{
+  static const size_t sNameOffset = 1;
+
+  struct sockaddr_un* address =
+    reinterpret_cast<struct sockaddr_un*>(&aAddress);
+
+  size_t namesiz = mSocketName.Length() + 1; // include trailing '\0'
+
+  if (NS_WARN_IF((sNameOffset + namesiz) > sizeof(address->sun_path))) {
+    return NS_ERROR_FAILURE;
+  }
+
+  address->sun_family = AF_UNIX;
+  memset(address->sun_path, '\0', sNameOffset); // abstract socket
+  memcpy(address->sun_path + sNameOffset, mSocketName.get(), namesiz);
+
+  aAddressLength =
+    offsetof(struct sockaddr_un, sun_path) + sNameOffset + namesiz;
+
+  return NS_OK;
+}
+
+// |UnixSocketConnector|
+
+nsresult
+BluetoothDaemonConnector::ConvertAddressToString(
+  const struct sockaddr& aAddress, socklen_t aAddressLength,
+  nsACString& aAddressString)
+{
+  MOZ_ASSERT(aAddress.sa_family == AF_UNIX);
+
+  const struct sockaddr_un* un =
+    reinterpret_cast<const struct sockaddr_un*>(&aAddress);
+
+  size_t len = aAddressLength - offsetof(struct sockaddr_un, sun_path);
+
+  aAddressString.Assign(un->sun_path, len);
+
+  return NS_OK;
+}
+
+nsresult
+BluetoothDaemonConnector::CreateListenSocket(struct sockaddr* aAddress,
+                                             socklen_t* aAddressLength,
+                                             int& aListenFd)
+{
+  ScopedClose fd;
+
+  nsresult rv = CreateSocket(fd.rwget());
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = SetSocketFlags(fd);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  if (aAddress && aAddressLength) {
+    rv = CreateAddress(*aAddress, *aAddressLength);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+  }
+
+  aListenFd = fd.forget();
+
+  return NS_OK;
+}
+
+nsresult
+BluetoothDaemonConnector::AcceptStreamSocket(int aListenFd,
+                                             struct sockaddr* aAddress,
+                                             socklen_t* aAddressLength,
+                                             int& aStreamFd)
+{
+  ScopedClose fd(
+    TEMP_FAILURE_RETRY(accept(aListenFd, aAddress, aAddressLength)));
+  if (fd < 0) {
+    NS_WARNING("Cannot accept file descriptor!");
+    return NS_ERROR_FAILURE;
+  }
+  nsresult rv = SetSocketFlags(fd);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  aStreamFd = fd.forget();
+
+  return NS_OK;
+}
+
+nsresult
+BluetoothDaemonConnector::CreateStreamSocket(struct sockaddr* aAddress,
+                                             socklen_t* aAddressLength,
+                                             int& aStreamFd)
+{
+  MOZ_CRASH("|BluetoothDaemonConnector| does not support "
+            "creating stream sockets.");
+  return NS_ERROR_ABORT;
+}
+
+nsresult
+BluetoothDaemonConnector::Duplicate(UnixSocketConnector*& aConnector)
+{
+  aConnector = new BluetoothDaemonConnector(*this);
+
+  return NS_OK;
+}
+
+END_BLUETOOTH_NAMESPACE
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothDaemonConnector.h firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothDaemonConnector.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothDaemonConnector.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothDaemonConnector.h	2015-05-25 20:43:21.000000000 +0000
@@ -0,0 +1,56 @@
+/* -*- 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_bluetoothdaemonconnector_h
+#define mozilla_dom_bluetooth_bluedroid_bluetoothdaemonconnector_h
+
+#include "mozilla/dom/bluetooth/BluetoothCommon.h"
+#include "mozilla/ipc/UnixSocketConnector.h"
+
+BEGIN_BLUETOOTH_NAMESPACE
+
+class BluetoothDaemonConnector final
+  : public mozilla::ipc::UnixSocketConnector
+{
+public:
+  BluetoothDaemonConnector(const nsACString& aSocketName);
+  ~BluetoothDaemonConnector();
+
+  // Methods for |UnixSocketConnector|
+  //
+
+  nsresult ConvertAddressToString(const struct sockaddr& aAddress,
+                                  socklen_t aAddressLength,
+                                  nsACString& aAddressString) override;
+
+  nsresult CreateListenSocket(struct sockaddr* aAddress,
+                              socklen_t* aAddressLength,
+                              int& aListenFd) override;
+
+  nsresult AcceptStreamSocket(int aListenFd,
+                              struct sockaddr* aAddress,
+                              socklen_t* aAddressLen,
+                              int& aStreamFd) override;
+
+  nsresult CreateStreamSocket(struct sockaddr* aAddress,
+                              socklen_t* aAddressLength,
+                              int& aStreamFd) override;
+
+  nsresult Duplicate(UnixSocketConnector*& aConnector) override;
+
+private:
+  nsresult CreateSocket(int& aFd) const;
+  nsresult SetSocketFlags(int aFd) const;
+  nsresult CreateAddress(struct sockaddr& aAddress,
+                         socklen_t& aAddressLength) const;
+
+  nsCString mSocketName;
+};
+
+END_BLUETOOTH_NAMESPACE
+
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -10,13 +10,13 @@
 #include <stdlib.h>
 #include "BluetoothDaemonA2dpInterface.h"
 #include "BluetoothDaemonAvrcpInterface.h"
+#include "BluetoothDaemonConnector.h"
 #include "BluetoothDaemonHandsfreeInterface.h"
 #include "BluetoothDaemonHelpers.h"
 #include "BluetoothDaemonSetupInterface.h"
 #include "BluetoothDaemonSocketInterface.h"
 #include "BluetoothInterfaceHelpers.h"
 #include "mozilla/ipc/ListenSocket.h"
-#include "mozilla/ipc/UnixSocketConnector.h"
 #include "mozilla/unused.h"
 #include "prrng.h"
 
@@ -1694,24 +1694,18 @@
   void OnConnectError() override;
   void OnDisconnect() override;
 
-  // ConnectionOrientedSocket
-  //
-
-  ConnectionOrientedSocketIO* GetIO() override;
-
 private:
   BluetoothDaemonInterface* mInterface;
   BluetoothDaemonInterface::Channel mChannel;
-  BluetoothDaemonPDUConsumer* mConsumer;
 };
 
 BluetoothDaemonChannel::BluetoothDaemonChannel(
   BluetoothDaemonInterface* aInterface,
   BluetoothDaemonInterface::Channel aChannel,
   BluetoothDaemonPDUConsumer* aConsumer)
-  : mInterface(aInterface)
+  : BluetoothDaemonConnection(aConsumer)
+  , mInterface(aInterface)
   , mChannel(aChannel)
-  , mConsumer(aConsumer)
 { }
 
 void
@@ -1741,12 +1735,6 @@
   mInterface->OnDisconnect(mChannel);
 }
 
-ConnectionOrientedSocketIO*
-BluetoothDaemonChannel::GetIO()
-{
-  return PrepareAccept(mConsumer);
-}
-
 //
 // Interface
 //
@@ -1911,9 +1899,9 @@
       } else if (
         NS_WARN_IF(mNtfChannel->GetConnectionStatus() == SOCKET_CONNECTED)) {
         /* Notification channel should not be open; let's close it. */
-        mNtfChannel->CloseSocket();
+        mNtfChannel->Close();
       }
-      if (!mListenSocket->Listen(mNtfChannel)) {
+      if (NS_FAILED(mListenSocket->Listen(mNtfChannel))) {
         OnConnectError(NTF_CHANNEL);
       }
       break;
@@ -1942,7 +1930,7 @@
   switch (aChannel) {
     case NTF_CHANNEL:
       // Close command channel
-      mCmdChannel->CloseSocket();
+      mCmdChannel->Close();
     case CMD_CHANNEL:
       // Stop daemon and close listen socket
       unused << NS_WARN_IF(property_set("ctl.stop", "bluetoothd"));
@@ -2018,78 +2006,6 @@
   }
 }
 
-class BluetoothDaemonSocketConnector final
-  : public mozilla::ipc::UnixSocketConnector
-{
-public:
-  BluetoothDaemonSocketConnector(const nsACString& aSocketName)
-    : mSocketName(aSocketName)
-  { }
-
-  int
-  Create() override
-  {
-    MOZ_ASSERT(!NS_IsMainThread());
-
-    int fd = socket(AF_UNIX, SOCK_SEQPACKET, 0);
-    if (fd < 0) {
-      BT_WARNING("Could not open socket!");
-      return -1;
-    }
-    return fd;
-  }
-
-  bool
-  CreateAddr(bool aIsServer,
-             socklen_t& aAddrSize,
-             sockaddr_any& aAddr,
-             const char* aAddress) override
-  {
-    static const size_t sNameOffset = 1;
-
-    size_t namesiz = mSocketName.Length() + 1; /* include trailing '\0' */
-
-    if ((sNameOffset + namesiz) > sizeof(aAddr.un.sun_path)) {
-      BT_WARNING("Address too long for socket struct!");
-      return false;
-    }
-
-    memset(aAddr.un.sun_path, '\0', sNameOffset); // abstract socket
-    memcpy(aAddr.un.sun_path + sNameOffset, mSocketName.get(), namesiz);
-    aAddr.un.sun_family = AF_UNIX;
-
-    aAddrSize = offsetof(struct sockaddr_un, sun_path) + sNameOffset + namesiz;
-
-    return true;
-  }
-
-  bool
-  SetUp(int aFd) override
-  {
-    if (TEMP_FAILURE_RETRY(fcntl(aFd, F_SETFL, O_NONBLOCK)) < 0) {
-      BT_WARNING("Failed to set non-blocking I/O.");
-      return false;
-    }
-    return true;
-  }
-
-  bool
-  SetUpListenSocket(int aFd) override
-  {
-    return true;
-  }
-
-  void
-  GetSocketAddr(const sockaddr_any& aAddr, nsAString& aAddrStr) override
-  {
-    // Unused.
-    MOZ_CRASH("This should never be called!");
-  }
-
-private:
-  nsCString mSocketName;
-};
-
 nsresult
 BluetoothDaemonInterface::CreateRandomAddressString(
   const nsACString& aPrefix, unsigned long aPostfixLength,
@@ -2165,7 +2081,7 @@
   BluetoothNotificationHandler* aNotificationHandler,
   BluetoothResultHandler* aRes)
 {
-  static const char BASE_SOCKET_NAME[] = "bluetoothd";
+#define BASE_SOCKET_NAME "bluetoothd"
   static unsigned long POSTFIX_LENGTH = 16;
 
   // If we could not cleanup properly before and an old
@@ -2192,7 +2108,7 @@
   } else if (
     NS_WARN_IF(mCmdChannel->GetConnectionStatus() == SOCKET_CONNECTED)) {
     // Command channel should not be open; let's close it.
-    mCmdChannel->CloseSocket();
+    mCmdChannel->Close();
   }
 
   // The listen socket's name is generated with a random postfix. This
@@ -2205,12 +2121,12 @@
                                           POSTFIX_LENGTH,
                                           mListenSocketName);
   if (NS_FAILED(rv)) {
-    mListenSocketName = BASE_SOCKET_NAME;
+    mListenSocketName.AssignLiteral(BASE_SOCKET_NAME);
   }
 
-  bool success = mListenSocket->Listen(
-    new BluetoothDaemonSocketConnector(mListenSocketName), mCmdChannel);
-  if (!success) {
+  rv = mListenSocket->Listen(new BluetoothDaemonConnector(mListenSocketName),
+                             mCmdChannel);
+  if (NS_FAILED(rv)) {
     OnConnectError(CMD_CHANNEL);
     return;
   }
@@ -2254,7 +2170,7 @@
       mInterface->mProtocol->UnregisterModuleCmd(0x01, this);
     } else {
       // Cleanup, step 3: Close command channel
-      mInterface->mCmdChannel->CloseSocket();
+      mInterface->mCmdChannel->Close();
     }
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothGattManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothGattManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothGattManager.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothGattManager.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -1423,6 +1423,8 @@
   BT_APPEND_NAMED_VALUE(properties, "Address", nsString(aBdAddr));
   BT_APPEND_NAMED_VALUE(properties, "Rssi", static_cast<int32_t>(aRssi));
   BT_APPEND_NAMED_VALUE(properties, "GattAdv", advData);
+  BT_APPEND_NAMED_VALUE(properties, "Type",
+    static_cast<uint32_t>(TYPE_OF_DEVICE_BLE));
 
   BluetoothService* bs = BluetoothService::Get();
   NS_ENSURE_TRUE_VOID(bs);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothHALInterface.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothHALInterface.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothHALInterface.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothHALInterface.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -640,6 +640,8 @@
 
   if (NS_SUCCEEDED(Convert(aRemoteAddr, remoteAddr)) &&
       false /* TODO: we don't support any values for aName currently */) {
+    // silence uninitialized variable warning for |name|
+    name = static_cast<bt_property_type_t>(0);
     status = mInterface->get_remote_device_property(&remoteAddr, name);
   } else {
     status = BT_STATUS_PARM_INVALID;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothOppManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothOppManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothOppManager.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothOppManager.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -72,14 +72,14 @@
 class BluetoothOppManager::SendFileBatch final
 {
 public:
-  SendFileBatch(const nsAString& aDeviceAddress, nsIDOMBlob* aBlob)
+  SendFileBatch(const nsAString& aDeviceAddress, Blob* aBlob)
     : mDeviceAddress(aDeviceAddress)
   {
     mBlobs.AppendElement(aBlob);
   }
 
   nsString mDeviceAddress;
-  nsCOMArray<nsIDOMBlob> mBlobs;
+  nsTArray<nsRefPtr<Blob>> mBlobs;
 };
 
 NS_IMETHODIMP
@@ -89,7 +89,6 @@
 {
   MOZ_ASSERT(sBluetoothOppManager);
 
-  // if state of any volume was changed
   if (!strcmp(aTopic, NS_VOLUME_STATE_CHANGED)) {
     HandleVolumeStateChanged(aSubject);
     return NS_OK;
@@ -184,7 +183,7 @@
   void Run() override
   {
     MOZ_ASSERT(NS_IsMainThread());
-    mSocket->CloseSocket();
+    mSocket->Close();
   }
 
 private:
@@ -283,7 +282,7 @@
 
   // Stop listening because currently we only support one connection at a time.
   if (mServerSocket) {
-    mServerSocket->CloseSocket();
+    mServerSocket->Close();
     mServerSocket = nullptr;
   }
 
@@ -314,31 +313,25 @@
 {
   MOZ_ASSERT(NS_IsMainThread());
 
-  // We will disconnect OPP connection no matter which volume becomes non
-  // STATE_MOUNTED, since user may select files scattered in multiple volumes
-  // in a single transfer, (e.g., user selects 2 files to transfer, one is in
-  // internal volume and the other is in external volume).
-
   if (!mConnected) {
     return;
   }
 
-  // get volume interface and state
+  /**
+   * Disconnect ongoing OPP connection when a volume becomes non-mounted, in
+   * case files of transfer are located on that volume. |OnSocketDisconnect|
+   * will handle incomplete file transfers.
+   */
+
   nsCOMPtr<nsIVolume> vol = do_QueryInterface(aSubject);
   if (!vol) {
     return;
   }
+
   int32_t state;
   vol->GetState(&state);
   if (nsIVolume::STATE_MOUNTED != state) {
-    // Here is for unexpected physical removal of any storage.
-    // By checking the volume state change, we should release the unavailable
-    // storage to prevent being killed by vold.
-    // Disconnect any connected OPP connection since volume state becomes
-    // non STATE_MOUNTED. Then |OnSocketDisconnect| would also be called to
-    // handle remaining files during send(|DiscardBlobsToSend|) or
-    // receive(|DeleteReceivedFile|).
-    BT_LOGR("Volume state is not STATE_MOUNTED. Abort any ongoing OPP connection.");
+    BT_LOGR("Volume becomes non-mounted. Abort ongoing OPP connection");
     Disconnect(nullptr);
   }
 }
@@ -359,7 +352,7 @@
    * BT restarts.
    */
   if (mServerSocket) {
-    mServerSocket->CloseSocket();
+    mServerSocket->Close();
     mServerSocket = nullptr;
   }
 
@@ -420,7 +413,7 @@
 
 bool
 BluetoothOppManager::SendFile(const nsAString& aDeviceAddress,
-                              nsIDOMBlob* aBlob)
+                              Blob* aBlob)
 {
   MOZ_ASSERT(NS_IsMainThread());
 
@@ -434,7 +427,7 @@
 
 void
 BluetoothOppManager::AppendBlobToSend(const nsAString& aDeviceAddress,
-                                      nsIDOMBlob* aBlob)
+                                      Blob* aBlob)
 {
   MOZ_ASSERT(NS_IsMainThread());
 
@@ -742,10 +735,8 @@
   if (aHeader.Has(ObexHeaderId::Body) ||
       aHeader.Has(ObexHeaderId::EndOfBody)) {
     uint8_t* bodyPtr;
-    aHeader.GetBody(&bodyPtr);
+    aHeader.GetBody(&bodyPtr, &mBodySegmentLength);
     mBodySegment = bodyPtr;
-
-    aHeader.GetBodyLength(&mBodySegmentLength);
   }
 }
 
@@ -753,19 +744,13 @@
 BluetoothOppManager::ExtractBlobHeaders()
 {
   RetrieveSentFileName();
+  mBlob->GetType(mContentType);
 
-  nsresult rv = mBlob->GetType(mContentType);
-  if (NS_FAILED(rv)) {
-    BT_WARNING("Can't get content type");
-    SendDisconnectRequest();
-    return false;
-  }
-
-  uint64_t fileLength;
-  rv = mBlob->GetSize(&fileLength);
-  if (NS_FAILED(rv)) {
-    BT_WARNING("Can't get file size");
+  ErrorResult rv;
+  uint64_t fileLength = mBlob->GetSize(rv);
+  if (NS_WARN_IF(rv.Failed())) {
     SendDisconnectRequest();
+    rv.SuppressException();
     return false;
   }
 
@@ -782,9 +767,9 @@
 
   mFileLength = fileLength;
   rv = NS_NewThread(getter_AddRefs(mReadFileThread));
-  if (NS_FAILED(rv)) {
-    BT_WARNING("Can't create thread");
+  if (NS_WARN_IF(rv.Failed())) {
     SendDisconnectRequest();
+    rv.SuppressException();
     return false;
   }
 
@@ -796,7 +781,7 @@
 {
   mFileName.Truncate();
 
-  nsCOMPtr<nsIDOMFile> file = do_QueryInterface(mBlob);
+  nsRefPtr<File> file = static_cast<Blob*>(mBlob.get())->ToFile();
   if (file) {
     file->GetName(mFileName);
   }
@@ -914,10 +899,19 @@
 {
   MOZ_ASSERT(NS_IsMainThread());
 
-  uint8_t opCode;
+  /**
+   * Ensure
+   * - valid access to data[0], i.e., opCode
+   * - received packet length smaller than max packet length
+   */
   int receivedLength = aMessage->GetSize();
-  const uint8_t* data = aMessage->GetData();
+  if (receivedLength < 1 || receivedLength > MAX_PACKET_LENGTH) {
+    ReplyError(ObexResponseCode::BadRequest);
+    return;
+  }
 
+  uint8_t opCode;
+  const uint8_t* data = aMessage->GetData();
   if (mPutPacketReceivedLength > 0) {
     opCode = mPutFinalFlag ? ObexRequestCode::PutFinal : ObexRequestCode::Put;
   } else {
@@ -933,12 +927,13 @@
     }
   }
 
-  ObexHeaderSet pktHeaders(opCode);
+  ObexHeaderSet pktHeaders;
   if (opCode == ObexRequestCode::Connect) {
     // Section 3.3.1 "Connect", IrOBEX 1.2
     // [opcode:1][length:2][version:1][flags:1][MaxPktSizeWeCanReceive:2]
     // [Headers:var]
-    if (!ParseHeaders(&data[7], receivedLength - 7, &pktHeaders)) {
+    if (receivedLength < 7 ||
+        !ParseHeaders(&data[7], receivedLength - 7, &pktHeaders)) {
       ReplyError(ObexResponseCode::BadRequest);
       return;
     }
@@ -948,7 +943,8 @@
   } else if (opCode == ObexRequestCode::Abort) {
     // Section 3.3.5 "Abort", IrOBEX 1.2
     // [opcode:1][length:2][Headers:var]
-    if (!ParseHeaders(&data[3], receivedLength - 3, &pktHeaders)) {
+    if (receivedLength < 3 ||
+        !ParseHeaders(&data[3], receivedLength - 3, &pktHeaders)) {
       ReplyError(ObexResponseCode::BadRequest);
       return;
     }
@@ -958,7 +954,8 @@
   } else if (opCode == ObexRequestCode::Disconnect) {
     // Section 3.3.2 "Disconnect", IrOBEX 1.2
     // [opcode:1][length:2][Headers:var]
-    if (!ParseHeaders(&data[3], receivedLength - 3, &pktHeaders)) {
+    if (receivedLength < 3 ||
+        !ParseHeaders(&data[3], receivedLength - 3, &pktHeaders)) {
       ReplyError(ObexResponseCode::BadRequest);
       return;
     }
@@ -1041,6 +1038,13 @@
 {
   MOZ_ASSERT(NS_IsMainThread());
 
+  // Ensure valid access to data[0], i.e., opCode
+  int receivedLength = aMessage->GetSize();
+  if (receivedLength < 1) {
+    BT_LOGR("Receive empty response packet");
+    return;
+  }
+
   const uint8_t* data = aMessage->GetData();
   uint8_t opCode = data[0];
 
@@ -1098,6 +1102,13 @@
 
     AfterOppConnected();
 
+    // Ensure valid access to remote information
+    if (receivedLength < 7) {
+      BT_LOGR("The length of connect response packet is invalid");
+      SendDisconnectRequest();
+      return;
+    }
+
     // Keep remote information
     mRemoteObexVersion = data[3];
     mRemoteConnectionFlags = data[4];
@@ -1124,12 +1135,12 @@
       mUpdateProgressCounter = mSentFileLength / kUpdateProgressBase + 1;
     }
 
-    nsresult rv;
+    ErrorResult rv;
     if (!mInputStream) {
-      rv = mBlob->GetInternalStream(getter_AddRefs(mInputStream));
-      if (NS_FAILED(rv)) {
-        BT_WARNING("Can't get internal stream of blob");
+      mBlob->GetInternalStream(getter_AddRefs(mInputStream), rv);
+      if (NS_WARN_IF(rv.Failed())) {
         SendDisconnectRequest();
+        rv.SuppressException();
         return;
       }
     }
@@ -1137,9 +1148,10 @@
     nsRefPtr<ReadFileTask> task = new ReadFileTask(mInputStream,
                                                    mRemoteMaxPacketLength);
     rv = mReadFileThread->Dispatch(task, NS_DISPATCH_NORMAL);
-    if (NS_FAILED(rv)) {
-      BT_WARNING("Cannot dispatch read file task!");
+    if (NS_WARN_IF(rv.Failed())) {
       SendDisconnectRequest();
+      rv.SuppressException();
+      return;
     }
   } else {
     BT_WARNING("Unhandled ObexRequestCode");
@@ -1203,7 +1215,7 @@
 
   int index = 3;
   index += AppendHeaderName(&req[index], mRemoteMaxPacketLength - index,
-                            (char*)fileName, (len + 1) * 2);
+                            fileName, (len + 1) * 2);
   index += AppendHeaderLength(&req[index], aFileSize);
 
   // This is final put packet if file size equals to 0
@@ -1561,7 +1573,7 @@
 BluetoothOppManager::Disconnect(BluetoothProfileController* aController)
 {
   if (mSocket) {
-    mSocket->CloseSocket();
+    mSocket->Close();
   } else {
     BT_WARNING("%s: No ongoing file transfer to stop", __FUNCTION__);
   }
@@ -1575,10 +1587,12 @@
   nsCOMPtr<nsIVolumeService> volumeSrv =
     do_GetService(NS_VOLUMESERVICE_CONTRACTID);
   NS_ENSURE_TRUE(volumeSrv, false);
-  nsresult rv;
-  rv = volumeSrv->CreateMountLock(NS_LITERAL_STRING("sdcard"),
-                                  getter_AddRefs(mMountLock));
-  NS_ENSURE_SUCCESS(rv, false);
+
+  NS_ENSURE_SUCCESS(
+    volumeSrv->CreateMountLock(NS_LITERAL_STRING("sdcard"),
+                               getter_AddRefs(mMountLock)),
+    false);
+
   return true;
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothOppManager.h firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothOppManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothOppManager.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothOppManager.h	2015-05-25 20:43:21.000000000 +0000
@@ -14,13 +14,13 @@
 #include "mozilla/ipc/SocketBase.h"
 #include "nsCOMArray.h"
 
-class nsIDOMBlob;
 class nsIOutputStream;
 class nsIInputStream;
 class nsIVolumeMountLock;
 
 namespace mozilla {
 namespace dom {
+class Blob;
 class BlobParent;
 }
 }
@@ -55,7 +55,7 @@
   bool Listen();
 
   bool SendFile(const nsAString& aDeviceAddress, BlobParent* aActor);
-  bool SendFile(const nsAString& aDeviceAddress, nsIDOMBlob* aBlob);
+  bool SendFile(const nsAString& aDeviceAddress, Blob* aBlob);
   bool StopSendingFile();
   bool ConfirmReceivingFile(bool aConfirm);
 
@@ -76,7 +76,6 @@
   BluetoothOppManager();
   bool Init();
   void HandleShutdown();
-
   void HandleVolumeStateChanged(nsISupports* aSubject);
 
   void StartFileTransfer();
@@ -102,7 +101,7 @@
   void NotifyAboutFileChange();
   bool AcquireSdcardMountLock();
   void SendObexData(uint8_t* aData, uint8_t aOpcode, int aSize);
-  void AppendBlobToSend(const nsAString& aDeviceAddress, nsIDOMBlob* aBlob);
+  void AppendBlobToSend(const nsAString& aDeviceAddress, Blob* aBlob);
   void DiscardBlobsToSend();
   bool ProcessNextBatch();
   void ConnectInternal(const nsAString& aDeviceAddress);
@@ -147,12 +146,6 @@
   int mUpdateProgressCounter;
 
   /**
-   * When it is true and the target service on target device couldn't be found,
-   * refreshing SDP records is necessary.
-   */
-  bool mNeedsUpdatingSdpRecords;
-
-  /**
    * Set when StopSendingFile() is called.
    */
   bool mAbortFlag;
@@ -199,7 +192,7 @@
   nsAutoArrayPtr<uint8_t> mReceivedDataBuffer;
 
   int mCurrentBlobIndex;
-  nsCOMPtr<nsIDOMBlob> mBlob;
+  nsRefPtr<Blob> mBlob;
   nsTArray<SendFileBatch> mBatches;
 
   /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothPbapManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothPbapManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothPbapManager.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothPbapManager.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -0,0 +1,573 @@
+/* -*- 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 "base/basictypes.h"
+#include "BluetoothPbapManager.h"
+
+#include "BluetoothService.h"
+#include "BluetoothSocket.h"
+#include "BluetoothUuid.h"
+#include "ObexBase.h"
+
+#include "mozilla/RefPtr.h"
+#include "mozilla/Services.h"
+#include "mozilla/StaticPtr.h"
+#include "nsAutoPtr.h"
+#include "nsIObserver.h"
+#include "nsIObserverService.h"
+
+USING_BLUETOOTH_NAMESPACE
+using namespace mozilla;
+using namespace mozilla::dom;
+using namespace mozilla::ipc;
+
+namespace {
+  // UUID of PBAP PSE
+  static const BluetoothUuid kPbapPSE = {
+    {
+      0x00, 0x00, 0x11, 0x2F, 0x00, 0x00, 0x10, 0x00,
+      0x80, 0x00, 0x00, 0x80, 0x5F, 0x9B, 0x34, 0xFB
+    }
+  };
+
+  // UUID used in PBAP OBEX target header
+  static const BluetoothUuid kPbapObexTarget = {
+    {
+      0x79, 0x61, 0x35, 0xF0, 0xF0, 0xC5, 0x11, 0xD8,
+      0x09, 0x66, 0x08, 0x00, 0x20, 0x0C, 0x9A, 0x66
+    }
+  };
+
+  StaticRefPtr<BluetoothPbapManager> sPbapManager;
+  static bool sInShutdown = false;
+}
+
+BEGIN_BLUETOOTH_NAMESPACE
+
+NS_IMETHODIMP
+BluetoothPbapManager::Observe(nsISupports* aSubject,
+                              const char* aTopic,
+                              const char16_t* aData)
+{
+  MOZ_ASSERT(sPbapManager);
+
+  if (!strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) {
+    HandleShutdown();
+    return NS_OK;
+  }
+
+  MOZ_ASSERT(false, "PbapManager got unexpected topic!");
+  return NS_ERROR_UNEXPECTED;
+}
+
+void
+BluetoothPbapManager::HandleShutdown()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  sInShutdown = true;
+  Disconnect(nullptr);
+  sPbapManager = nullptr;
+}
+
+BluetoothPbapManager::BluetoothPbapManager() : mConnected(false)
+{
+  mDeviceAddress.AssignLiteral(BLUETOOTH_ADDRESS_NONE);
+  mCurrentPath.AssignLiteral("");
+}
+
+BluetoothPbapManager::~BluetoothPbapManager()
+{
+  nsCOMPtr<nsIObserverService> obs = services::GetObserverService();
+  if (NS_WARN_IF(!obs)) {
+    return;
+  }
+
+  NS_WARN_IF(NS_FAILED(
+    obs->RemoveObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID)));
+}
+
+bool
+BluetoothPbapManager::Init()
+{
+  nsCOMPtr<nsIObserverService> obs = services::GetObserverService();
+  if (NS_WARN_IF(!obs)) {
+    return false;
+  }
+
+  if (NS_WARN_IF(NS_FAILED(
+        obs->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, false)))) {
+    return false;
+  }
+
+  /**
+   * We don't start listening here as BluetoothServiceBluedroid calls Listen()
+   * immediately when BT stops.
+   *
+   * If we start listening here, the listening fails when device boots up since
+   * Listen() is called again and restarts server socket. The restart causes
+   * absence of read events when device boots up.
+   */
+
+  return true;
+}
+
+//static
+BluetoothPbapManager*
+BluetoothPbapManager::Get()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  // Exit early if sPbapManager already exists
+  if (sPbapManager) {
+    return sPbapManager;
+  }
+
+  // Do not create a new instance if we're in shutdown
+  if (NS_WARN_IF(sInShutdown)) {
+    return nullptr;
+  }
+
+  // Create a new instance, register, and return
+  BluetoothPbapManager *manager = new BluetoothPbapManager();
+  if (NS_WARN_IF(!manager->Init())) {
+    return nullptr;
+  }
+
+  sPbapManager = manager;
+  return sPbapManager;
+}
+
+bool
+BluetoothPbapManager::Listen()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  // Fail to listen if |mSocket| already exists
+  if (NS_WARN_IF(mSocket)) {
+    return false;
+  }
+
+  /**
+   * Restart server socket since its underlying fd becomes invalid when
+   * BT stops; otherwise no more read events would be received even if
+   * BT restarts.
+   */
+  if (mServerSocket) {
+    mServerSocket->Close();
+    mServerSocket = nullptr;
+  }
+
+  mServerSocket =
+    new BluetoothSocket(this, BluetoothSocketType::RFCOMM, false, true);
+
+  if (NS_WARN_IF(!mServerSocket->ListenSocket(
+                    NS_LITERAL_STRING("OBEX Phonebook Access Server"),
+                    kPbapPSE,
+                    BluetoothReservedChannels::CHANNEL_PBAP_PSE))) {
+    mServerSocket = nullptr;
+    return false;
+  }
+
+  BT_LOGR("PBAP socket is listening");
+  return true;
+}
+
+// Virtual function of class SocketConsumer
+void
+BluetoothPbapManager::ReceiveSocketData(BluetoothSocket* aSocket,
+                                        nsAutoPtr<UnixSocketBuffer>& aMessage)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  /**
+   * Ensure
+   * - valid access to data[0], i.e., opCode
+   * - received packet length smaller than max packet length
+   */
+  int receivedLength = aMessage->GetSize();
+  if (receivedLength < 1 || receivedLength > MAX_PACKET_LENGTH) {
+    ReplyError(ObexResponseCode::BadRequest);
+    return;
+  }
+
+  const uint8_t* data = aMessage->GetData();
+  uint8_t opCode = data[0];
+  ObexHeaderSet pktHeaders;
+  switch (opCode) {
+    case ObexRequestCode::Connect:
+      // Section 3.3.1 "Connect", IrOBEX 1.2
+      // [opcode:1][length:2][version:1][flags:1][MaxPktSizeWeCanReceive:2]
+      // [Headers:var]
+      if (receivedLength < 7 ||
+          !ParseHeaders(&data[7], receivedLength - 7, &pktHeaders)) {
+        ReplyError(ObexResponseCode::BadRequest);
+        return;
+      }
+
+      // Section 6.4 "Establishing an OBEX Session", PBAP 1.2
+      // The OBEX header target shall equal to kPbapObexTarget.
+      if (!CompareHeaderTarget(pktHeaders)) {
+        ReplyError(ObexResponseCode::BadRequest);
+        return;
+      }
+
+      ReplyToConnect();
+      AfterPbapConnected();
+      break;
+    case ObexRequestCode::Disconnect:
+    case ObexRequestCode::Abort:
+      // Section 3.3.2 "Disconnect" and Section 3.3.5 "Abort", IrOBEX 1.2
+      // The format of request packet of "Disconnect" and "Abort" are the same
+      // [opcode:1][length:2][Headers:var]
+      if (receivedLength < 3 ||
+          !ParseHeaders(&data[3], receivedLength - 3, &pktHeaders)) {
+        ReplyError(ObexResponseCode::BadRequest);
+        return;
+      }
+
+      ReplyToDisconnectOrAbort();
+      AfterPbapDisconnected();
+      break;
+    case ObexRequestCode::SetPath: {
+        // Section 3.3.6 "SetPath", IrOBEX 1.2
+        // [opcode:1][length:2][flags:1][contants:1][Headers:var]
+        if (receivedLength < 5 ||
+            !ParseHeaders(&data[5], receivedLength - 5, &pktHeaders)) {
+          ReplyError(ObexResponseCode::BadRequest);
+          return;
+        }
+
+        uint8_t response = SetPhoneBookPath(data[3], pktHeaders);
+        if (response != ObexResponseCode::Success) {
+          ReplyError(response);
+          return;
+        }
+
+        ReplyToSetPath();
+      }
+      break;
+    case ObexRequestCode::Put:
+    case ObexRequestCode::PutFinal:
+    case ObexRequestCode::Get:
+    case ObexRequestCode::GetFinal:
+      ReplyError(ObexResponseCode::BadRequest);
+      BT_LOGR("Unsupported ObexRequestCode %x", opCode);
+      break;
+    default:
+      ReplyError(ObexResponseCode::NotImplemented);
+      BT_LOGR("Unrecognized ObexRequestCode %x", opCode);
+      break;
+  }
+}
+
+bool
+BluetoothPbapManager::CompareHeaderTarget(const ObexHeaderSet& aHeader)
+{
+  if (!aHeader.Has(ObexHeaderId::Target)) {
+    BT_LOGR("No ObexHeaderId::Target in header");
+    return false;
+  }
+
+  uint8_t* targetPtr;
+  int targetLength;
+  aHeader.GetTarget(&targetPtr, &targetLength);
+
+  if (targetLength != sizeof(BluetoothUuid)) {
+    BT_LOGR("Length mismatch: %d != 16", targetLength);
+    return false;
+  }
+
+  for (uint8_t i = 0; i < sizeof(BluetoothUuid); i++) {
+    if (targetPtr[i] != kPbapObexTarget.mUuid[i]) {
+      BT_LOGR("UUID mismatch: received target[%d]=0x%x != 0x%x",
+              i, targetPtr[i], kPbapObexTarget.mUuid[i]);
+      return false;
+    }
+  }
+
+  return true;
+}
+
+uint8_t
+BluetoothPbapManager::SetPhoneBookPath(uint8_t flags,
+                                       const ObexHeaderSet& aHeader)
+{
+  // Section 5.2 "SetPhoneBook Function", PBAP 1.2
+  // flags bit 1 must be 1 and bit 2~7 be 0
+  if ((flags >> 1) != 1) {
+    BT_LOGR("Illegal flags [0x%x]: bits 1~7 must be 0x01", flags);
+    return ObexResponseCode::BadRequest;
+  }
+
+  nsString newPath = mCurrentPath;
+
+  /**
+   * Three cases:
+   * 1) Go up 1 level   - flags bit 0 is 1
+   * 2) Go back to root - flags bit 0 is 0 AND name header is empty
+   * 3) Go down 1 level - flags bit 0 is 0 AND name header is not empty,
+   *                      where name header is the name of child folder
+   */
+  if (flags & 1) {
+    // Go up 1 level
+    if (!newPath.IsEmpty()) {
+      newPath = StringHead(newPath, newPath.RFindChar('/'));
+    }
+  } else {
+    MOZ_ASSERT(aHeader.Has(ObexHeaderId::Name));
+
+    nsString childFolderName;
+    aHeader.GetName(childFolderName);
+    if (childFolderName.IsEmpty()) {
+      // Go back to root
+      newPath.AssignLiteral("");
+    } else {
+      // Go down 1 level
+      newPath.AppendLiteral("/");
+      newPath.Append(childFolderName);
+    }
+  }
+
+  // Ensure the new path is legal
+  if (!IsLegalPath(newPath)) {
+    BT_LOGR("Illegal phone book path [%s]",
+            NS_ConvertUTF16toUTF8(newPath).get());
+    return ObexResponseCode::NotFound;
+  }
+
+  mCurrentPath = newPath;
+  BT_LOGR("current path [%s]", NS_ConvertUTF16toUTF8(mCurrentPath).get());
+
+  return ObexResponseCode::Success;
+}
+
+bool
+BluetoothPbapManager::IsLegalPath(const nsAString& aPath)
+{
+  static const char* sLegalPaths[] = {
+    "", // root
+    "/telecom",
+    "/telecom/pb",
+    "/telecom/ich",
+    "/telecom/och",
+    "/telecom/mch",
+    "/telecom/cch",
+    "/SIM1",
+    "/SIM1/telecom",
+    "/SIM1/telecom/pb",
+    "/SIM1/telecom/ich",
+    "/SIM1/telecom/och",
+    "/SIM1/telecom/mch",
+    "/SIM1/telecom/cch"
+  };
+
+  NS_ConvertUTF16toUTF8 path(aPath);
+  for (uint8_t i = 0; i < MOZ_ARRAY_LENGTH(sLegalPaths); i++) {
+    if (!strcmp(path.get(), sLegalPaths[i])) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+void
+BluetoothPbapManager::AfterPbapConnected()
+{
+  mCurrentPath.AssignLiteral("");
+  mConnected = true;
+}
+
+void
+BluetoothPbapManager::AfterPbapDisconnected()
+{
+  mConnected = false;
+}
+
+bool
+BluetoothPbapManager::IsConnected()
+{
+  return mConnected;
+}
+
+void
+BluetoothPbapManager::GetAddress(nsAString& aDeviceAddress)
+{
+  return mSocket->GetAddress(aDeviceAddress);
+}
+
+void
+BluetoothPbapManager::ReplyToConnect()
+{
+  if (mConnected) {
+    return;
+  }
+
+  // Section 3.3.1 "Connect", IrOBEX 1.2
+  // [opcode:1][length:2][version:1][flags:1][MaxPktSizeWeCanReceive:2]
+  // [Headers:var]
+  uint8_t req[255];
+  int index = 7;
+
+  req[3] = 0x10; // version=1.0
+  req[4] = 0x00; // flag=0x00
+  req[5] = BluetoothPbapManager::MAX_PACKET_LENGTH >> 8;
+  req[6] = (uint8_t)BluetoothPbapManager::MAX_PACKET_LENGTH;
+
+  // Section 6.4 "Establishing an OBEX Session", PBAP 1.2
+  // Headers: [Who:16][Connection ID]
+  index += AppendHeaderWho(&req[index], 255, kPbapObexTarget.mUuid,
+                           sizeof(BluetoothUuid));
+  index += AppendHeaderConnectionId(&req[index], 0x01);
+
+  SendObexData(req, ObexResponseCode::Success, index);
+}
+
+void
+BluetoothPbapManager::ReplyToDisconnectOrAbort()
+{
+  if (!mConnected) {
+    return;
+  }
+
+  // Section 3.3.2 "Disconnect" and Section 3.3.5 "Abort", IrOBEX 1.2
+  // The format of response packet of "Disconnect" and "Abort" are the same
+  // [opcode:1][length:2][Headers:var]
+  uint8_t req[255];
+  int index = 3;
+
+  SendObexData(req, ObexResponseCode::Success, index);
+}
+
+void
+BluetoothPbapManager::ReplyToSetPath()
+{
+  if (!mConnected) {
+    return;
+  }
+
+  // Section 3.3.6 "SetPath", IrOBEX 1.2
+  // [opcode:1][length:2][Headers:var]
+  uint8_t req[255];
+  int index = 3;
+
+  SendObexData(req, ObexResponseCode::Success, index);
+}
+
+void
+BluetoothPbapManager::ReplyError(uint8_t aError)
+{
+  BT_LOGR("[0x%x]", aError);
+
+  // Section 3.2 "Response Format", IrOBEX 1.2
+  // [opcode:1][length:2][Headers:var]
+  uint8_t req[255];
+  int index = 3;
+
+  SendObexData(req, aError, index);
+}
+
+void
+BluetoothPbapManager::SendObexData(uint8_t* aData, uint8_t aOpcode, int aSize)
+{
+  SetObexPacketInfo(aData, aOpcode, aSize);
+  mSocket->SendSocketData(new UnixSocketRawData(aData, aSize));
+}
+
+void
+BluetoothPbapManager::OnSocketConnectSuccess(BluetoothSocket* aSocket)
+{
+  MOZ_ASSERT(aSocket);
+  MOZ_ASSERT(aSocket == mServerSocket);
+  MOZ_ASSERT(!mSocket);
+
+  BT_LOGR("PBAP socket is connected");
+
+  // Close server socket as only one session is allowed at a time
+  mServerSocket.swap(mSocket);
+
+  // Cache device address since we can't get socket address when a remote
+  // device disconnect with us.
+  mSocket->GetAddress(mDeviceAddress);
+}
+
+void
+BluetoothPbapManager::OnSocketConnectError(BluetoothSocket* aSocket)
+{
+  mServerSocket = nullptr;
+  mSocket = nullptr;
+}
+
+void
+BluetoothPbapManager::OnSocketDisconnect(BluetoothSocket* aSocket)
+{
+  MOZ_ASSERT(aSocket);
+
+  if (aSocket != mSocket) {
+    // Do nothing when a listening server socket is closed.
+    return;
+  }
+
+  AfterPbapDisconnected();
+  mDeviceAddress.AssignLiteral(BLUETOOTH_ADDRESS_NONE);
+  mSocket = nullptr;
+
+  Listen();
+}
+
+void
+BluetoothPbapManager::Disconnect(BluetoothProfileController* aController)
+{
+  if (mSocket) {
+    mSocket->Close();
+  } else {
+    BT_WARNING("%s: No ongoing connection to disconnect", __FUNCTION__);
+  }
+}
+
+NS_IMPL_ISUPPORTS(BluetoothPbapManager, nsIObserver)
+
+void
+BluetoothPbapManager::Connect(const nsAString& aDeviceAddress,
+                              BluetoothProfileController* aController)
+{
+  MOZ_ASSERT(false);
+}
+
+void
+BluetoothPbapManager::OnGetServiceChannel(const nsAString& aDeviceAddress,
+                                          const nsAString& aServiceUuid,
+                                          int aChannel)
+{
+  MOZ_ASSERT(false);
+}
+
+void
+BluetoothPbapManager::OnUpdateSdpRecords(const nsAString& aDeviceAddress)
+{
+  MOZ_ASSERT(false);
+}
+
+void
+BluetoothPbapManager::OnConnect(const nsAString& aErrorStr)
+{
+  MOZ_ASSERT(false);
+}
+
+void
+BluetoothPbapManager::OnDisconnect(const nsAString& aErrorStr)
+{
+  MOZ_ASSERT(false);
+}
+
+void
+BluetoothPbapManager::Reset()
+{
+  MOZ_ASSERT(false);
+}
+
+END_BLUETOOTH_NAMESPACE
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothPbapManager.h firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothPbapManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothPbapManager.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothPbapManager.h	2015-05-25 20:43:21.000000000 +0000
@@ -0,0 +1,80 @@
+/* -*- 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_bluetoothpbapmanager_h__
+#define mozilla_dom_bluetooth_bluetoothpbapmanager_h__
+
+#include "BluetoothCommon.h"
+#include "BluetoothProfileManagerBase.h"
+#include "BluetoothSocketObserver.h"
+#include "mozilla/ipc/SocketBase.h"
+
+BEGIN_BLUETOOTH_NAMESPACE
+
+class BluetoothSocket;
+class ObexHeaderSet;
+
+class BluetoothPbapManager : public BluetoothSocketObserver
+                          , public BluetoothProfileManagerBase
+{
+public:
+  BT_DECL_PROFILE_MGR_BASE
+  BT_DECL_SOCKET_OBSERVER
+  virtual void GetName(nsACString& aName)
+  {
+    aName.AssignLiteral("PBAP");
+  }
+
+  static const int MAX_PACKET_LENGTH = 0xFFFE;
+
+  static BluetoothPbapManager* Get();
+  bool Listen();
+
+protected:
+  virtual ~BluetoothPbapManager();
+
+private:
+  BluetoothPbapManager();
+  bool Init();
+  void HandleShutdown();
+
+  void ReplyToConnect();
+  void ReplyToDisconnectOrAbort();
+  void ReplyToSetPath();
+  void ReplyError(uint8_t aError);
+  void SendObexData(uint8_t* aData, uint8_t aOpcode, int aSize);
+
+  uint8_t SetPhoneBookPath(uint8_t flags, const ObexHeaderSet& aHeader);
+  bool CompareHeaderTarget(const ObexHeaderSet& aHeader);
+  bool IsLegalPath(const nsAString& aPath);
+  void AfterPbapConnected();
+  void AfterPbapDisconnected();
+
+  /**
+   * Current phonebook path
+   */
+  nsString mCurrentPath;
+
+  /**
+   * OBEX session status. Set when OBEX session is established.
+   */
+  bool mConnected;
+  nsString mDeviceAddress;
+
+  // If a connection has been established, mSocket will be the socket
+  // communicating with the remote socket. We maintain the invariant that if
+  // mSocket is non-null, mServerSocket must be null (and vice versa).
+  nsRefPtr<BluetoothSocket> mSocket;
+
+  // Server socket. Once an inbound connection is established, it will hand
+  // over the ownership to mSocket, and get a new server socket while Listen()
+  // is called.
+  nsRefPtr<BluetoothSocket> mServerSocket;
+};
+
+END_BLUETOOTH_NAMESPACE
+
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -31,6 +31,7 @@
 // TODO: Support HID
 #endif
 #include "BluetoothOppManager.h"
+#include "BluetoothPbapManager.h"
 #include "BluetoothProfileController.h"
 #include "BluetoothReplyRunnable.h"
 #include "BluetoothUtils.h"
@@ -44,8 +45,6 @@
 #include "nsDataHashtable.h"
 #endif
 
-#ifdef MOZ_B2G_BT_API_V2
-
 #define ENSURE_BLUETOOTH_IS_READY(runnable, result)                    \
   do {                                                                 \
     if (!sBtInterface || !IsEnabled()) {                               \
@@ -64,6 +63,8 @@
     }                                                                  \
   } while(0)
 
+#ifdef MOZ_B2G_BT_API_V2
+
 #define ENSURE_GATT_MGR_IS_READY_VOID(gatt, runnable)                  \
   do {                                                                 \
     if (!gatt) {                                                       \
@@ -133,15 +134,6 @@
 /**
  *  Static functions
  */
-bool
-BluetoothServiceBluedroid::EnsureBluetoothHalLoad()
-{
-  sBtInterface = BluetoothInterface::GetInstance();
-  NS_ENSURE_TRUE(sBtInterface, false);
-
-  return true;
-}
-
 class BluetoothServiceBluedroid::EnableResultHandler final
   : public BluetoothResultHandler
 {
@@ -292,9 +284,9 @@
  */
 BluetoothServiceBluedroid::BluetoothServiceBluedroid()
 {
-  if (!EnsureBluetoothHalLoad()) {
-    BT_LOGR("Error! Failed to load bluedroid library.");
-    return;
+  sBtInterface = BluetoothInterface::GetInstance();
+  if (!sBtInterface) {
+    BT_LOGR("Error! Failed to get instance of bluetooth interface");
   }
 }
 
@@ -333,35 +325,30 @@
 {
   MOZ_ASSERT(NS_IsMainThread());
 
-  BluetoothProfileManagerBase* profile;
-  profile = BluetoothHfpManager::Get();
-  NS_ENSURE_TRUE(profile, NS_ERROR_FAILURE);
-  if (profile->IsConnected()) {
-    profile->Disconnect(nullptr);
-  } else {
-    profile->Reset();
-  }
-
-  profile = BluetoothOppManager::Get();
-  NS_ENSURE_TRUE(profile, NS_ERROR_FAILURE);
-  if (profile->IsConnected()) {
-    profile->Disconnect(nullptr);
-  }
-
-  profile = BluetoothA2dpManager::Get();
-  NS_ENSURE_TRUE(profile, NS_ERROR_FAILURE);
-  if (profile->IsConnected()) {
-    profile->Disconnect(nullptr);
-  } else {
-    profile->Reset();
-  }
-
-  profile = BluetoothHidManager::Get();
-  NS_ENSURE_TRUE(profile, NS_ERROR_FAILURE);
-  if (profile->IsConnected()) {
-    profile->Disconnect(nullptr);
-  } else {
-    profile->Reset();
+  static BluetoothProfileManagerBase* sProfiles[] = {
+    BluetoothHfpManager::Get(),
+    BluetoothA2dpManager::Get(),
+    BluetoothOppManager::Get(),
+    BluetoothPbapManager::Get(),
+    BluetoothHidManager::Get()
+  };
+
+  // Disconnect all connected profiles
+  for (uint8_t i = 0; i < MOZ_ARRAY_LENGTH(sProfiles); i++) {
+    nsCString profileName;
+    sProfiles[i]->GetName(profileName);
+
+    if (NS_WARN_IF(!sProfiles[i])) {
+      BT_LOGR("Profile manager [%s] is null", profileName.get());
+      return NS_ERROR_FAILURE;
+    }
+
+    if (sProfiles[i]->IsConnected()) {
+      sProfiles[i]->Disconnect(nullptr);
+    } else if (!profileName.EqualsLiteral("OPP") &&
+               !profileName.EqualsLiteral("PBAP")) {
+      sProfiles[i]->Reset();
+    }
   }
 
   // aRunnable will be a nullptr during starup and shutdown
@@ -598,24 +585,6 @@
 }
 #else
 
-#define ENSURE_BLUETOOTH_IS_READY(runnable, result)                    \
-  do {                                                                 \
-    if (!sBtInterface || !IsEnabled()) {                               \
-      NS_NAMED_LITERAL_STRING(errorStr, "Bluetooth is not ready");     \
-      DispatchBluetoothReply(runnable, BluetoothValue(), errorStr);    \
-      return result;                                                   \
-    }                                                                  \
-  } while(0)
-
-#define ENSURE_BLUETOOTH_IS_READY_VOID(runnable)                       \
-  do {                                                                 \
-    if (!sBtInterface || !IsEnabled()) {                               \
-      NS_NAMED_LITERAL_STRING(errorStr, "Bluetooth is not ready");     \
-      DispatchBluetoothReply(runnable, BluetoothValue(), errorStr);    \
-      return;                                                          \
-    }                                                                  \
-  } while(0)
-
 // Audio: Major service class = 0x100 (Bit 21 is set)
 #define SET_AUDIO_BIT(cod)               (cod |= 0x200000)
 // Rendering: Major service class = 0x20 (Bit 18 is set)
@@ -637,6 +606,7 @@
 static nsTArray<nsRefPtr<BluetoothReplyRunnable> > sBondingRunnableArray;
 static nsTArray<nsRefPtr<BluetoothReplyRunnable> > sUnbondingRunnableArray;
 static bool sAdapterDiscoverable(false);
+static bool sAdapterDiscovering(false);
 static bool sIsRestart(false);
 static bool sIsFirstTimeToggleOffBt(false);
 static uint32_t sAdapterDiscoverableTimeout(0);
@@ -760,15 +730,6 @@
 /**
  *  Static functions
  */
-bool
-BluetoothServiceBluedroid::EnsureBluetoothHalLoad()
-{
-  sBtInterface = BluetoothInterface::GetInstance();
-  NS_ENSURE_TRUE(sBtInterface, false);
-
-  return true;
-}
-
 class BluetoothServiceBluedroid::EnableResultHandler final
   : public BluetoothResultHandler
 {
@@ -939,8 +900,7 @@
     replyError.AppendLiteral(":BT_STATUS_FAIL");
   }
 
-  DispatchBluetoothReply(aBluetoothReplyRunnable, BluetoothValue(true),
-                         replyError);
+  DispatchReplyError(aBluetoothReplyRunnable, replyError);
 }
 
 /**
@@ -948,9 +908,9 @@
  */
 BluetoothServiceBluedroid::BluetoothServiceBluedroid()
 {
-  if (!EnsureBluetoothHalLoad()) {
-    BT_LOGR("Error! Failed to load bluedroid library.");
-    return;
+  sBtInterface = BluetoothInterface::GetInstance();
+  if (!sBtInterface) {
+    BT_LOGR("Error! Failed to get instance of bluetooth interface");
   }
 }
 
@@ -1060,7 +1020,7 @@
   BT_APPEND_NAMED_VALUE(v.get_ArrayOfBluetoothNamedValue(),
                         "Devices", sAdapterBondedAddressArray);
 
-  DispatchBluetoothReply(aRunnable, v, EmptyString());
+  DispatchReplySuccess(aRunnable, v);
 
   return NS_OK;
 }
@@ -1101,8 +1061,7 @@
     /* dispatch result after final pending operation */
     if (--sRequestedDeviceCountArray[0] == 0) {
       if (!sGetDeviceRunnableArray.IsEmpty()) {
-        DispatchBluetoothReply(sGetDeviceRunnableArray[0],
-                               sRemoteDevicesPack, EmptyString());
+        DispatchReplySuccess(sGetDeviceRunnableArray[0], sRemoteDevicesPack);
         sGetDeviceRunnableArray.RemoveElementAt(0);
       }
 
@@ -1150,8 +1109,7 @@
     BluetoothUuidHelper::GetBluetoothProfileManager(aServiceUuid);
   if (!profile) {
     InfallibleTArray<BluetoothNamedValue> emptyArr;
-    DispatchBluetoothReply(aRunnable, emptyArr,
-                           NS_LITERAL_STRING(ERR_UNKNOWN_PROFILE));
+    DispatchReplyError(aRunnable, NS_LITERAL_STRING(ERR_UNKNOWN_PROFILE));
     return NS_OK;
   }
 
@@ -1165,7 +1123,7 @@
   int requestedDeviceCount = deviceAddresses.Length();
   if (requestedDeviceCount == 0) {
     InfallibleTArray<BluetoothNamedValue> emptyArr;
-    DispatchBluetoothReply(aRunnable, emptyArr, EmptyString());
+    DispatchReplySuccess(aRunnable, emptyArr);
     return NS_OK;
   }
 #endif
@@ -1199,8 +1157,7 @@
 #else
   int requestedDeviceCount = aDeviceAddress.Length();
   if (requestedDeviceCount == 0) {
-    InfallibleTArray<BluetoothNamedValue> emptyArr;
-    DispatchBluetoothReply(aRunnable, BluetoothValue(emptyArr), EmptyString());
+    DispatchReplySuccess(aRunnable, InfallibleTArray<BluetoothNamedValue>());
     return NS_OK;
   }
 
@@ -1236,7 +1193,7 @@
   void StartDiscovery() override
   {
     MOZ_ASSERT(NS_IsMainThread());
-    DispatchBluetoothReply(mRunnable, true, EmptyString());
+    DispatchReplySuccess(mRunnable);
   }
 
   void OnError(BluetoothStatus aStatus) override
@@ -1285,7 +1242,7 @@
   void CancelDiscovery() override
   {
     MOZ_ASSERT(NS_IsMainThread());
-    DispatchBluetoothReply(mRunnable, true, EmptyString());
+    DispatchReplySuccess(mRunnable);
   }
 
   void OnError(BluetoothStatus aStatus) override
@@ -1555,7 +1512,7 @@
 
   void PinReply() override
   {
-    DispatchBluetoothReply(mRunnable, BluetoothValue(true), EmptyString());
+    DispatchReplySuccess(mRunnable);
   }
 
   void OnError(BluetoothStatus aStatus) override
@@ -1655,7 +1612,7 @@
 
   void SspReply() override
   {
-    DispatchBluetoothReply(mRunnable, BluetoothValue(true), EmptyString());
+    DispatchReplySuccess(mRunnable);
   }
 
   void OnError(BluetoothStatus aStatus) override
@@ -1788,10 +1745,10 @@
   BluetoothProfileManagerBase* profile =
     BluetoothUuidHelper::GetBluetoothProfileManager(aServiceUuid);
   if (profile) {
-    DispatchBluetoothReply(aRunnable, profile->IsConnected(), EmptyString());
+    DispatchReplySuccess(aRunnable, profile->IsConnected());
   } else {
     BT_WARNING("Can't find profile manager with uuid: %x", aServiceUuid);
-    DispatchBluetoothReply(aRunnable, false, EmptyString());
+    DispatchReplySuccess(aRunnable, false);
   }
 }
 #endif
@@ -1809,7 +1766,6 @@
   // has been determined when calling 'Connect()'. Nevertheless, keep
   // it for future use.
 
-#ifdef MOZ_B2G_BT_API_V2
   BluetoothOppManager* opp = BluetoothOppManager::Get();
   if (!opp || !opp->SendFile(aDeviceAddress, aBlobParent)) {
     DispatchReplyError(aRunnable, NS_LITERAL_STRING("SendFile failed"));
@@ -1817,20 +1773,11 @@
   }
 
   DispatchReplySuccess(aRunnable);
-#else
-  BluetoothOppManager* opp = BluetoothOppManager::Get();
-  nsAutoString errorStr;
-  if (!opp || !opp->SendFile(aDeviceAddress, aBlobParent)) {
-    errorStr.AssignLiteral("Calling SendFile() failed");
-  }
-
-  DispatchBluetoothReply(aRunnable, BluetoothValue(true), errorStr);
-#endif
 }
 
 void
 BluetoothServiceBluedroid::SendFile(const nsAString& aDeviceAddress,
-                                    nsIDOMBlob* aBlob,
+                                    Blob* aBlob,
                                     BluetoothReplyRunnable* aRunnable)
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -1840,7 +1787,6 @@
   // has been determined when calling 'Connect()'. Nevertheless, keep
   // it for future use.
 
-#ifdef MOZ_B2G_BT_API_V2
   BluetoothOppManager* opp = BluetoothOppManager::Get();
   if (!opp || !opp->SendFile(aDeviceAddress, aBlob)) {
     DispatchReplyError(aRunnable, NS_LITERAL_STRING("SendFile failed"));
@@ -1848,15 +1794,6 @@
   }
 
   DispatchReplySuccess(aRunnable);
-#else
-  BluetoothOppManager* opp = BluetoothOppManager::Get();
-  nsAutoString errorStr;
-  if (!opp || !opp->SendFile(aDeviceAddress, aBlob)) {
-    errorStr.AssignLiteral("Calling SendFile() failed");
-  }
-
-  DispatchBluetoothReply(aRunnable, BluetoothValue(true), errorStr);
-#endif
 }
 
 void
@@ -1870,7 +1807,6 @@
   // has been determined when calling 'Connect()'. Nevertheless, keep
   // it for future use.
 
-#ifdef MOZ_B2G_BT_API_V2
   BluetoothOppManager* opp = BluetoothOppManager::Get();
   nsAutoString errorStr;
   if (!opp || !opp->StopSendingFile()) {
@@ -1879,15 +1815,6 @@
   }
 
   DispatchReplySuccess(aRunnable);
-#else
-  BluetoothOppManager* opp = BluetoothOppManager::Get();
-  nsAutoString errorStr;
-  if (!opp || !opp->StopSendingFile()) {
-    errorStr.AssignLiteral("Calling StopSendingFile() failed");
-  }
-
-  DispatchBluetoothReply(aRunnable, BluetoothValue(true), errorStr);
-#endif
 }
 
 void
@@ -1902,7 +1829,6 @@
   // has been determined when calling 'Connect()'. Nevertheless, keep
   // it for future use.
 
-#ifdef MOZ_B2G_BT_API_V2
   BluetoothOppManager* opp = BluetoothOppManager::Get();
   nsAutoString errorStr;
   if (!opp || !opp->ConfirmReceivingFile(aConfirm)) {
@@ -1912,15 +1838,6 @@
   }
 
   DispatchReplySuccess(aRunnable);
-#else
-  BluetoothOppManager* opp = BluetoothOppManager::Get();
-  nsAutoString errorStr;
-  if (!opp || !opp->ConfirmReceivingFile(aConfirm)) {
-    errorStr.AssignLiteral("Calling ConfirmReceivingFile() failed");
-  }
-
-  DispatchBluetoothReply(aRunnable, BluetoothValue(true), errorStr);
-#endif
 }
 
 void
@@ -1928,7 +1845,6 @@
 {
   MOZ_ASSERT(NS_IsMainThread());
 
-#ifdef MOZ_B2G_BT_API_V2
   BluetoothHfpManager* hfp = BluetoothHfpManager::Get();
   if (!hfp || !hfp->ConnectSco()) {
     DispatchReplyError(aRunnable, NS_LITERAL_STRING("ConnectSco failed"));
@@ -1936,16 +1852,6 @@
   }
 
   DispatchReplySuccess(aRunnable);
-#else
-  BluetoothHfpManager* hfp = BluetoothHfpManager::Get();
-  if (!hfp || !hfp->ConnectSco()) {
-    NS_NAMED_LITERAL_STRING(replyError, "Calling ConnectSco() failed");
-    DispatchBluetoothReply(aRunnable, BluetoothValue(), replyError);
-    return;
-  }
-
-  DispatchBluetoothReply(aRunnable, BluetoothValue(true), EmptyString());
-#endif
 }
 
 void
@@ -1953,7 +1859,6 @@
 {
   MOZ_ASSERT(NS_IsMainThread());
 
-#ifdef MOZ_B2G_BT_API_V2
   BluetoothHfpManager* hfp = BluetoothHfpManager::Get();
   if (!hfp || !hfp->DisconnectSco()) {
     DispatchReplyError(aRunnable, NS_LITERAL_STRING("DisconnectSco failed"));
@@ -1961,16 +1866,6 @@
   }
 
   DispatchReplySuccess(aRunnable);
-#else
-  BluetoothHfpManager* hfp = BluetoothHfpManager::Get();
-  if (!hfp || !hfp->DisconnectSco()) {
-    NS_NAMED_LITERAL_STRING(replyError, "Calling DisconnectSco() failed");
-    DispatchBluetoothReply(aRunnable, BluetoothValue(), replyError);
-    return;
-  }
-
-  DispatchBluetoothReply(aRunnable, BluetoothValue(true), EmptyString());
-#endif
 }
 
 void
@@ -1978,7 +1873,6 @@
 {
   MOZ_ASSERT(NS_IsMainThread());
 
-#ifdef MOZ_B2G_BT_API_V2
   BluetoothHfpManager* hfp = BluetoothHfpManager::Get();
   if (!hfp) {
     DispatchReplyError(aRunnable, NS_LITERAL_STRING("IsScoConnected failed"));
@@ -1986,16 +1880,6 @@
   }
 
   DispatchReplySuccess(aRunnable, BluetoothValue(hfp->IsScoConnected()));
-#else
-  BluetoothHfpManager* hfp = BluetoothHfpManager::Get();
-  if (!hfp) {
-    NS_NAMED_LITERAL_STRING(replyError, "Fail to get BluetoothHfpManager");
-    DispatchBluetoothReply(aRunnable, BluetoothValue(), replyError);
-    return;
-  }
-
-  DispatchBluetoothReply(aRunnable, hfp->IsScoConnected(), EmptyString());
-#endif
 }
 
 void
@@ -2012,11 +1896,7 @@
     a2dp->UpdateMetaData(aTitle, aArtist, aAlbum, aMediaNumber,
                          aTotalMediaCount, aDuration);
   }
-#ifdef MOZ_B2G_BT_API_V2
   DispatchReplySuccess(aRunnable);
-#else
-  DispatchBluetoothReply(aRunnable, BluetoothValue(true), EmptyString());
-#endif
 }
 
 void
@@ -2031,11 +1911,7 @@
       PlayStatusStringToControlPlayStatus(aPlayStatus);
     a2dp->UpdatePlayStatus(aDuration, aPosition, playStatus);
   }
-#ifdef MOZ_B2G_BT_API_V2
   DispatchReplySuccess(aRunnable);
-#else
-  DispatchBluetoothReply(aRunnable, BluetoothValue(true), EmptyString());
-#endif
 }
 
 void
@@ -2253,11 +2129,16 @@
       BluetoothNamedValue(NS_ConvertUTF8toUTF16("Discoverable"), false),
       new SetAdapterPropertyDiscoverableResultHandler());
 
-    // Trigger BluetoothOppManager to listen
+    // Trigger OPP & PBAP managers to listen
     BluetoothOppManager* opp = BluetoothOppManager::Get();
     if (!opp || !opp->Listen()) {
       BT_LOGR("Fail to start BluetoothOppManager listening");
     }
+
+    BluetoothPbapManager* pbap = BluetoothPbapManager::Get();
+    if (!pbap || !pbap->Listen()) {
+      BT_LOGR("Fail to start BluetoothPbapManager listening");
+    }
   }
 
   // Resolve promise if existed
@@ -2284,6 +2165,11 @@
       BluetoothA2dpManager::DeinitA2dpInterface
     };
 
+    // Set discoverable cache to default value after state becomes BT_STATE_OFF.
+    if (sAdapterDiscoverable) {
+      sAdapterDiscoverable = false;
+    }
+
     // Cleanup bluetooth interfaces after BT state becomes BT_STATE_OFF.
     nsRefPtr<ProfileDeinitResultHandler> res =
       new ProfileDeinitResultHandler(MOZ_ARRAY_LENGTH(sDeinitManager));
@@ -2318,12 +2204,18 @@
     bs->AdapterAddedReceived();
     bs->TryFiringAdapterAdded();
 
-    // Trigger BluetoothOppManager to listen
+    // Trigger OPP & PBAP managers to listen
     BluetoothOppManager* opp = BluetoothOppManager::Get();
     if (!opp || !opp->Listen()) {
       BT_LOGR("Fail to start BluetoothOppManager listening");
     }
+
+    BluetoothPbapManager* pbap = BluetoothPbapManager::Get();
+    if (!pbap || !pbap->Listen()) {
+      BT_LOGR("Fail to start BluetoothPbapManager listening");
+    }
   }
+
   // After ProfileManagers deinit and cleanup, now restarts bluetooth daemon
   if (sIsRestart && !aState) {
     BT_LOGR("sIsRestart and off, now restart");
@@ -2361,11 +2253,16 @@
       BT_APPEND_NAMED_VALUE(propertiesArray, "Name", sAdapterBdName);
 
     } else if (p.mType == PROPERTY_ADAPTER_SCAN_MODE) {
-      sAdapterDiscoverable =
-        (p.mScanMode == SCAN_MODE_CONNECTABLE_DISCOVERABLE);
-      BT_APPEND_NAMED_VALUE(propertiesArray, "Discoverable",
-                            sAdapterDiscoverable);
 
+      // If BT is not enabled, Bluetooth scan mode should be non-discoverable
+      // by defalut. 'AdapterStateChangedNotification' would set the default
+      // properties to bluetooth backend once Bluetooth is enabled.
+      if (IsEnabled()) {
+        sAdapterDiscoverable =
+          (p.mScanMode == SCAN_MODE_CONNECTABLE_DISCOVERABLE);
+        BT_APPEND_NAMED_VALUE(propertiesArray, "Discoverable",
+                              sAdapterDiscoverable);
+      }
     } else if (p.mType == PROPERTY_ADAPTER_BONDED_DEVICES) {
       // We have to cache addresses of bonded devices. Unlike BlueZ,
       // Bluedroid would not send another PROPERTY_ADAPTER_BONDED_DEVICES
@@ -2421,7 +2318,10 @@
     } else if (p.mType == PROPERTY_ADAPTER_SCAN_MODE) {
       BluetoothScanMode newMode = p.mScanMode;
 
-      if (newMode == SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
+      // If BT is not enabled, Bluetooth scan mode should be non-discoverable
+      // by defalut. 'AdapterStateChangedNotification' would set the default
+      // properties to bluetooth backend once Bluetooth is enabled.
+      if (newMode == SCAN_MODE_CONNECTABLE_DISCOVERABLE && IsEnabled()) {
         propertyValue = sAdapterDiscoverable = true;
       } else {
         propertyValue = sAdapterDiscoverable = false;
@@ -2469,10 +2369,8 @@
                                    BluetoothValue(props)));
 
   // Send reply for SetProperty
-
   if (!sSetPropertyRunnableArray.IsEmpty()) {
-    DispatchBluetoothReply(sSetPropertyRunnableArray[0],
-                           BluetoothValue(true), EmptyString());
+    DispatchReplySuccess(sSetPropertyRunnableArray[0]);
     sSetPropertyRunnableArray.RemoveElementAt(0);
   }
 #endif
@@ -2483,8 +2381,9 @@
  *
  *   (1) automatically by Bluedroid when BT is turning on, or
  *   (2) as result of remote device properties update during discovery, or
- *   (3) as result of GetRemoteDeviceProperties, or
- *   (4) as result of GetRemoteServices.
+ *   (3) as result of CreateBond, or
+ *   (4) as result of GetRemoteDeviceProperties, or
+ *   (5) as result of GetRemoteServices.
  */
 void
 BluetoothServiceBluedroid::RemoteDevicePropertiesNotification(
@@ -2658,15 +2557,17 @@
     /**
      * This is possible when
      *
-     *  (1) the callback is called after Bluetooth is turned on, or
-     *  (2) remote device properties get updated during discovery.
-     *
-     * For (2), fire 'devicefound' again to update device name.
-     * See bug 1076553 for more information.
+     *  (1) the callback is called when BT is turning on, or
+     *  (2) remote device properties get updated during discovery, or
+     *  (3) as result of CreateBond
      */
-    DistributeSignal(BluetoothSignal(NS_LITERAL_STRING("DeviceFound"),
-                                     NS_LITERAL_STRING(KEY_ADAPTER),
-                                     BluetoothValue(props)));
+    if (sAdapterDiscovering) {
+      // Fire 'devicefound' again to update device name for (2).
+      // See bug 1076553 for more information.
+      DistributeSignal(BluetoothSignal(NS_LITERAL_STRING("DeviceFound"),
+                                       NS_LITERAL_STRING(KEY_ADAPTER),
+                                       BluetoothValue(props)));
+    }
     return;
   }
 
@@ -2676,8 +2577,7 @@
 
   if (--sRequestedDeviceCountArray[0] == 0) {
     if (!sGetDeviceRunnableArray.IsEmpty()) {
-      DispatchBluetoothReply(sGetDeviceRunnableArray[0],
-                             sRemoteDevicesPack, EmptyString());
+      DispatchReplySuccess(sGetDeviceRunnableArray[0], sRemoteDevicesPack);
       sGetDeviceRunnableArray.RemoveElementAt(0);
     }
 
@@ -2805,16 +2705,17 @@
 #else
   MOZ_ASSERT(NS_IsMainThread());
 
-  bool isDiscovering = (aState == true);
+  sAdapterDiscovering = aState;
 
   DistributeSignal(
     BluetoothSignal(NS_LITERAL_STRING(DISCOVERY_STATE_CHANGED_ID),
-                    NS_LITERAL_STRING(KEY_ADAPTER), isDiscovering));
+                    NS_LITERAL_STRING(KEY_ADAPTER), sAdapterDiscovering));
 
   // Distribute "PropertyChanged" signal to notice adapter this change since
   // Bluedroid don' treat "discovering" as a property of adapter.
   InfallibleTArray<BluetoothNamedValue> props;
-  BT_APPEND_NAMED_VALUE(props, "Discovering", BluetoothValue(isDiscovering));
+  BT_APPEND_NAMED_VALUE(props, "Discovering",
+                        BluetoothValue(sAdapterDiscovering));
   DistributeSignal(BluetoothSignal(NS_LITERAL_STRING("PropertyChanged"),
                                    NS_LITERAL_STRING(KEY_ADAPTER),
                                    BluetoothValue(props)));
@@ -3042,13 +2943,11 @@
                                        BluetoothValue(propertiesChangeArray)));
 
       if (bonded && !sBondingRunnableArray.IsEmpty()) {
-        DispatchBluetoothReply(sBondingRunnableArray[0],
-                               BluetoothValue(true), EmptyString());
+        DispatchReplySuccess(sBondingRunnableArray[0]);
 
         sBondingRunnableArray.RemoveElementAt(0);
       } else if (!bonded && !sUnbondingRunnableArray.IsEmpty()) {
-        DispatchBluetoothReply(sUnbondingRunnableArray[0],
-                               BluetoothValue(true), EmptyString());
+        DispatchReplySuccess(sUnbondingRunnableArray[0]);
 
         sUnbondingRunnableArray.RemoveElementAt(0);
       }
@@ -3074,9 +2973,8 @@
                                  BluetoothValue(propertiesArray)));
 
       if (!sBondingRunnableArray.IsEmpty()) {
-        DispatchBluetoothReply(sBondingRunnableArray[0],
-                               BluetoothValue(true),
-                               NS_LITERAL_STRING("Authentication failure"));
+        DispatchReplyError(sBondingRunnableArray[0],
+                           NS_LITERAL_STRING("Authentication failure"));
         sBondingRunnableArray.RemoveElementAt(0);
       }
       break;
@@ -3085,9 +2983,8 @@
       BT_WARNING("Got an unhandled status of BondStateChangedCallback!");
       // Dispatch a reply to unblock the waiting status of pairing.
       if (!sBondingRunnableArray.IsEmpty()) {
-        DispatchBluetoothReply(sBondingRunnableArray[0],
-                               BluetoothValue(true),
-                               NS_LITERAL_STRING("Internal failure"));
+        DispatchReplyError(sBondingRunnableArray[0],
+                           NS_LITERAL_STRING("Internal failure"));
         sBondingRunnableArray.RemoveElementAt(0);
       }
       break;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.h firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.h	2015-05-25 20:43:21.000000000 +0000
@@ -130,7 +130,7 @@
 
   virtual void
   SendFile(const nsAString& aDeviceAddress,
-           nsIDOMBlob* aBlob,
+           Blob* aBlob,
            BluetoothReplyRunnable* aRunnable);
 
   virtual void
@@ -312,7 +312,6 @@
 protected:
   static nsresult StartGonkBluetooth();
   static nsresult StopGonkBluetooth();
-  static bool EnsureBluetoothHalLoad();
 
   static void ConnectDisconnect(bool aConnect,
                                 const nsAString& aDeviceAddress,
@@ -435,7 +434,7 @@
 
   virtual void
   SendFile(const nsAString& aDeviceAddress,
-           nsIDOMBlob* aBlob,
+           Blob* aBlob,
            BluetoothReplyRunnable* aRunnable);
 
   virtual void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothSocket.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothSocket.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothSocket.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothSocket.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -743,7 +743,7 @@
 // |SocketBase|
 
 void
-BluetoothSocket::CloseSocket()
+BluetoothSocket::Close()
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(sBluetoothSocketInterface);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothSocket.h firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothSocket.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/BluetoothSocket.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/BluetoothSocket.h	2015-05-25 20:43:21.000000000 +0000
@@ -63,7 +63,7 @@
   // Methods for |SocketBase|
   //
 
-  void CloseSocket() override;
+  void Close() override;
 
   void OnConnectSuccess() override;
   void OnConnectError() override;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -227,7 +227,6 @@
 void
 BluetoothHfpManager::Reset()
 {
-  mFirstCKPD = false;
   // Phone & Device CIND
   ResetCallArray();
   // Clear Sco state
@@ -1315,8 +1314,6 @@
 {
   MOZ_ASSERT(NS_IsMainThread());
 
-  mFirstCKPD = true;
-
   /**
    * On the one hand, notify the controller that we've done for outbound
    * connections. On the other hand, we do nothing for inbound connections.
@@ -1658,16 +1655,7 @@
        * If there's no SCO, set up a SCO link.
        */
       ConnectSco();
-    } else if (mFirstCKPD) {
-      /*
-       * Bluetooth HSP spec 4.2 & 4.3
-       * The SCO link connection may be set up prior to receiving the AT+CKPD=200
-       * command from the HS.
-       *
-       * Once FxOS initiates a SCO connection before receiving the
-       * AT+CKPD=200, we should ignore this key press.
-       */
-     } else {
+    } else {
       /*
        * Bluetooth HSP spec 4.5
        * There are two ways to release SCO: sending CHUP to dialer or closing
@@ -1676,10 +1664,8 @@
        */
       NotifyDialer(NS_LITERAL_STRING("CHUP"));
     }
-    mFirstCKPD = false;
   } else {
     // BLDN
-    mDialingRequestProcessed = false;
 
     NotifyDialer(NS_LITERAL_STRING("BLDN"));
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.h firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.h	2015-05-25 20:43:21.000000000 +0000
@@ -211,8 +211,8 @@
   int mCurrentVgs;
   int mCurrentVgm;
   bool mReceiveVgsFlag;
+  // This flag is for HFP only, not for HSP.
   bool mDialingRequestProcessed;
-  bool mFirstCKPD;
   PhoneType mPhoneType;
   nsString mDeviceAddress;
   nsString mMsisdn;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/hfp-fallback/BluetoothHfpManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/hfp-fallback/BluetoothHfpManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/hfp-fallback/BluetoothHfpManager.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/hfp-fallback/BluetoothHfpManager.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -201,6 +201,17 @@
   return false;
 }
 
+void
+BluetoothHfpManager::HandleBackendError()
+{
+  /**
+   * TODO: 
+   *   Reset connection state and audio state to DISCONNECTED to handle backend
+   *   error. The state change triggers UI status bar update as ordinary
+   *   bluetooth turn-off sequence.
+   */
+}
+
 bool
 BluetoothHfpManager::DisconnectSco()
 {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/hfp-fallback/BluetoothHfpManager.h firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/hfp-fallback/BluetoothHfpManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluedroid/hfp-fallback/BluetoothHfpManager.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluedroid/hfp-fallback/BluetoothHfpManager.h	2015-05-25 20:43:21.000000000 +0000
@@ -34,6 +34,8 @@
 
   bool ConnectSco();
   bool DisconnectSco();
+  // Handle unexpected backend crash
+  void HandleBackendError();
 
 protected:
   virtual ~BluetoothHfpManager() { }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluetooth1/BluetoothProfileController.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluetooth1/BluetoothProfileController.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluetooth1/BluetoothProfileController.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluetooth1/BluetoothProfileController.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -116,8 +116,7 @@
       profile = BluetoothHidManager::Get();
       break;
     default:
-      DispatchBluetoothReply(mRunnable, BluetoothValue(),
-                             NS_LITERAL_STRING(ERR_UNKNOWN_PROFILE));
+      DispatchReplyError(mRunnable, NS_LITERAL_STRING(ERR_UNKNOWN_PROFILE));
       mCallback();
       return;
   }
@@ -130,8 +129,8 @@
                                        bool aCheckConnected)
 {
   if (!aProfile) {
-    DispatchBluetoothReply(mRunnable, BluetoothValue(),
-                           NS_LITERAL_STRING(ERR_NO_AVAILABLE_RESOURCE));
+    DispatchReplyError(mRunnable,
+                       NS_LITERAL_STRING(ERR_NO_AVAILABLE_RESOURCE));
     mCallback();
     return;
   }
@@ -266,13 +265,11 @@
   // The action has completed, so the DOM request should be replied then invoke
   // the callback.
   if (mSuccess) {
-    DispatchBluetoothReply(mRunnable, BluetoothValue(true), EmptyString());
+    DispatchReplySuccess(mRunnable);
   } else if (mConnect) {
-    DispatchBluetoothReply(mRunnable, BluetoothValue(true),
-                           NS_LITERAL_STRING(ERR_CONNECTION_FAILED));
+    DispatchReplyError(mRunnable, NS_LITERAL_STRING(ERR_CONNECTION_FAILED));
   } else {
-    DispatchBluetoothReply(mRunnable, BluetoothValue(true),
-                           NS_LITERAL_STRING(ERR_DISCONNECTION_FAILED));
+    DispatchReplyError(mRunnable, NS_LITERAL_STRING(ERR_DISCONNECTION_FAILED));
   }
 
   mCallback();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluetooth1/BluetoothService.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluetooth1/BluetoothService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluetooth1/BluetoothService.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluetooth1/BluetoothService.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -15,6 +15,9 @@
 #include "BluetoothManager.h"
 #include "BluetoothOppManager.h"
 #include "BluetoothParent.h"
+#if defined(MOZ_B2G_BT_BLUEDROID)
+#include "BluetoothPbapManager.h"
+#endif
 #include "BluetoothReplyRunnable.h"
 #include "BluetoothServiceChildProcess.h"
 #include "BluetoothUtils.h"
@@ -408,35 +411,32 @@
 {
   MOZ_ASSERT(NS_IsMainThread());
 
-  BluetoothProfileManagerBase* profile;
-  profile = BluetoothHfpManager::Get();
-  NS_ENSURE_TRUE(profile, NS_ERROR_FAILURE);
-  if (profile->IsConnected()) {
-    profile->Disconnect(nullptr);
-  } else {
-    profile->Reset();
-  }
-
-  profile = BluetoothOppManager::Get();
-  NS_ENSURE_TRUE(profile, NS_ERROR_FAILURE);
-  if (profile->IsConnected()) {
-    profile->Disconnect(nullptr);
-  }
+  static BluetoothProfileManagerBase* sProfiles[] = {
+    BluetoothHfpManager::Get(),
+    BluetoothA2dpManager::Get(),
+    BluetoothOppManager::Get(),
+#if defined(MOZ_B2G_BT_BLUEDROID)
+    BluetoothPbapManager::Get(),
+#endif
+    BluetoothHidManager::Get()
+  };
 
-  profile = BluetoothA2dpManager::Get();
-  NS_ENSURE_TRUE(profile, NS_ERROR_FAILURE);
-  if (profile->IsConnected()) {
-    profile->Disconnect(nullptr);
-  } else {
-    profile->Reset();
-  }
+  // Disconnect all connected profiles
+  for (uint8_t i = 0; i < MOZ_ARRAY_LENGTH(sProfiles); i++) {
+    nsCString profileName;
+    sProfiles[i]->GetName(profileName);
+
+    if (NS_WARN_IF(!sProfiles[i])) {
+      BT_LOGR("Profile manager [%s] is null", profileName.get());
+      return NS_ERROR_FAILURE;
+    }
 
-  profile = BluetoothHidManager::Get();
-  NS_ENSURE_TRUE(profile, NS_ERROR_FAILURE);
-  if (profile->IsConnected()) {
-    profile->Disconnect(nullptr);
-  } else {
-    profile->Reset();
+    if (sProfiles[i]->IsConnected()) {
+      sProfiles[i]->Disconnect(nullptr);
+    } else if (!profileName.EqualsLiteral("OPP") &&
+               !profileName.EqualsLiteral("PBAP")) {
+      sProfiles[i]->Reset();
+    }
   }
 
   mAdapterAddedReceived = false;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluetooth1/BluetoothService.h firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluetooth1/BluetoothService.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluetooth1/BluetoothService.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluetooth1/BluetoothService.h	2015-05-25 20:43:21.000000000 +0000
@@ -11,15 +11,13 @@
 #include "BluetoothProfileManagerBase.h"
 #include "nsAutoPtr.h"
 #include "nsClassHashtable.h"
-#include "nsIDOMFile.h"
 #include "nsIObserver.h"
 #include "nsTObserverArray.h"
 #include "nsThreadUtils.h"
 
-class nsIDOMBlob;
-
 namespace mozilla {
 namespace dom {
+class Blob;
 class BlobChild;
 class BlobParent;
 }
@@ -241,7 +239,7 @@
 
   virtual void
   SendFile(const nsAString& aDeviceAddress,
-           nsIDOMBlob* aBlob,
+           Blob* aBlob,
            BluetoothReplyRunnable* aRunnable) = 0;
 
   virtual void
@@ -394,7 +392,6 @@
   static BluetoothService*
   Create();
 
-
   typedef nsClassHashtable<nsStringHashKey, BluetoothSignalObserverList >
   BluetoothSignalObserverTable;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluetooth1/ipc/BluetoothServiceChildProcess.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluetooth1/ipc/BluetoothServiceChildProcess.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluetooth1/ipc/BluetoothServiceChildProcess.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluetooth1/ipc/BluetoothServiceChildProcess.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -266,7 +266,7 @@
 void
 BluetoothServiceChildProcess::SendFile(
   const nsAString& aDeviceAddress,
-  nsIDOMBlob* aBlobChild,
+  Blob* aBlobChild,
   BluetoothReplyRunnable* aRunnable)
 {
   // Parent-process-only method
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluetooth1/ipc/BluetoothServiceChildProcess.h firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluetooth1/ipc/BluetoothServiceChildProcess.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluetooth1/ipc/BluetoothServiceChildProcess.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluetooth1/ipc/BluetoothServiceChildProcess.h	2015-05-25 20:43:21.000000000 +0000
@@ -111,7 +111,7 @@
 
   virtual void
   SendFile(const nsAString& aDeviceAddress,
-           nsIDOMBlob* aBlob,
+           Blob* aBlob,
            BluetoothReplyRunnable* aRunnable) override;
 
   virtual void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluetooth2/BluetoothAdapter.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluetooth2/BluetoothAdapter.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluetooth2/BluetoothAdapter.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluetooth2/BluetoothAdapter.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -648,7 +648,7 @@
   BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE);
 
   // Reject the request if there's no ongoing LE Scan using this handle.
-  BT_ENSURE_TRUE_REJECT(!mLeScanHandleArray.Contains(&aDiscoveryHandle),
+  BT_ENSURE_TRUE_REJECT(mLeScanHandleArray.Contains(&aDiscoveryHandle),
                         promise,
                         NS_ERROR_DOM_BLUETOOTH_DONE);
 
@@ -983,7 +983,7 @@
   nsAutoCString appOrigin;
 
   doc->NodePrincipal()->GetAppStatus(&appStatus);
-  doc->NodePrincipal()->GetOrigin(getter_Copies(appOrigin));
+  doc->NodePrincipal()->GetOriginNoSuffix(appOrigin);
 
   return appStatus == nsIPrincipal::APP_STATUS_CERTIFIED &&
          appOrigin.EqualsLiteral(BLUETOOTH_APP_ORIGIN);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluetooth2/BluetoothService.h firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluetooth2/BluetoothService.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluetooth2/BluetoothService.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluetooth2/BluetoothService.h	2015-05-25 20:43:21.000000000 +0000
@@ -12,15 +12,13 @@
 #include "BluetoothProfileManagerBase.h"
 #include "nsAutoPtr.h"
 #include "nsClassHashtable.h"
-#include "nsIDOMFile.h"
 #include "nsIObserver.h"
 #include "nsTObserverArray.h"
 #include "nsThreadUtils.h"
 
-class nsIDOMBlob;
-
 namespace mozilla {
 namespace dom {
+class Blob;
 class BlobChild;
 class BlobParent;
 }
@@ -295,7 +293,7 @@
 
   virtual void
   SendFile(const nsAString& aDeviceAddress,
-           nsIDOMBlob* aBlob,
+           Blob* aBlob,
            BluetoothReplyRunnable* aRunnable) = 0;
 
   virtual void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluetooth2/ipc/BluetoothServiceChildProcess.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluetooth2/ipc/BluetoothServiceChildProcess.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluetooth2/ipc/BluetoothServiceChildProcess.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluetooth2/ipc/BluetoothServiceChildProcess.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -316,7 +316,7 @@
 void
 BluetoothServiceChildProcess::SendFile(
   const nsAString& aDeviceAddress,
-  nsIDOMBlob* aBlobChild,
+  Blob* aBlobChild,
   BluetoothReplyRunnable* aRunnable)
 {
   // Parent-process-only method
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluetooth2/ipc/BluetoothServiceChildProcess.h firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluetooth2/ipc/BluetoothServiceChildProcess.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluetooth2/ipc/BluetoothServiceChildProcess.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluetooth2/ipc/BluetoothServiceChildProcess.h	2015-05-25 20:43:21.000000000 +0000
@@ -140,7 +140,7 @@
 
   virtual void
   SendFile(const nsAString& aDeviceAddress,
-           nsIDOMBlob* aBlob,
+           Blob* aBlob,
            BluetoothReplyRunnable* aRunnable) override;
 
   virtual void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/BluetoothUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/BluetoothUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/BluetoothUtils.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/BluetoothUtils.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -270,7 +270,6 @@
   return true;
 }
 
-#ifdef MOZ_B2G_BT_API_V2
 void
 DispatchReplySuccess(BluetoothReplyRunnable* aRunnable)
 {
@@ -297,8 +296,14 @@
   MOZ_ASSERT(aRunnable);
   MOZ_ASSERT(!aErrorStr.IsEmpty());
 
+  // Reply will be deleted by the runnable after running on main thread
+#if MOZ_B2G_BT_API_V2
   BluetoothReply* reply =
     new BluetoothReply(BluetoothReplyError(STATUS_FAIL, nsString(aErrorStr)));
+#else
+  BluetoothReply* reply =
+    new BluetoothReply(BluetoothReplyError(nsString(aErrorStr)));
+#endif
 
   aRunnable->SetReply(reply); // runnable will delete reply after Run()
   NS_WARN_IF(NS_FAILED(NS_DispatchToMainThread(aRunnable)));
@@ -311,8 +316,15 @@
   MOZ_ASSERT(aRunnable);
   MOZ_ASSERT(aStatus != STATUS_SUCCESS);
 
+  // Reply will be deleted by the runnable after running on main thread
+#if MOZ_B2G_BT_API_V2
   BluetoothReply* reply =
     new BluetoothReply(BluetoothReplyError(aStatus, EmptyString()));
+#else
+  BluetoothReply* reply =
+    new BluetoothReply(
+      BluetoothReplyError(NS_LITERAL_STRING("Internal error")));
+#endif
 
   aRunnable->SetReply(reply); // runnable will delete reply after Run()
   NS_WARN_IF(NS_FAILED(NS_DispatchToMainThread(aRunnable)));
@@ -331,50 +343,14 @@
 
   BluetoothService* bs = BluetoothService::Get();
   NS_ENSURE_TRUE_VOID(bs);
+
+#ifdef MOZ_B2G_BT_API_V2
   bs->DistributeSignal(aType, NS_LITERAL_STRING(KEY_ADAPTER), data);
-}
 #else
-// TODO: remove with bluetooth1
-void
-DispatchBluetoothReply(BluetoothReplyRunnable* aRunnable,
-                       const BluetoothValue& aValue,
-                       const nsAString& aErrorStr)
-{
-  // Reply will be deleted by the runnable after running on main thread
-  BluetoothReply* reply;
-  if (!aErrorStr.IsEmpty()) {
-    nsString err(aErrorStr);
-    reply = new BluetoothReply(BluetoothReplyError(err));
-  } else {
-    MOZ_ASSERT(aValue.type() != BluetoothValue::T__None);
-    reply = new BluetoothReply(BluetoothReplySuccess(aValue));
-  }
-
-  aRunnable->SetReply(reply);
-  if (NS_FAILED(NS_DispatchToMainThread(aRunnable))) {
-    BT_WARNING("Failed to dispatch to main thread!");
-  }
-}
-
-// TODO: remove with bluetooth1
-void
-DispatchStatusChangedEvent(const nsAString& aType,
-                           const nsAString& aAddress,
-                           bool aStatus)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  InfallibleTArray<BluetoothNamedValue> data;
-  BT_APPEND_NAMED_VALUE(data, "address", nsString(aAddress));
-  BT_APPEND_NAMED_VALUE(data, "status", aStatus);
-
   BluetoothSignal signal(nsString(aType), NS_LITERAL_STRING(KEY_ADAPTER), data);
-
-  BluetoothService* bs = BluetoothService::Get();
-  NS_ENSURE_TRUE_VOID(bs);
   bs->DistributeSignal(signal);
-}
 #endif
+}
 
 bool
 IsMainProcess()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/BluetoothUtils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/BluetoothUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/BluetoothUtils.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/BluetoothUtils.h	2015-05-25 20:43:21.000000000 +0000
@@ -127,7 +127,6 @@
 // Dispatch bluetooth reply to main thread
 //
 
-#ifdef MOZ_B2G_BT_API_V2
 /**
  * Dispatch successful bluetooth reply with NO value to reply request.
  *
@@ -177,19 +176,6 @@
 void
 DispatchReplyError(BluetoothReplyRunnable* aRunnable,
                    const enum BluetoothStatus aStatus);
-#else
-// TODO: remove with bluetooth1
-void
-DispatchBluetoothReply(BluetoothReplyRunnable* aRunnable,
-                       const BluetoothValue& aValue,
-                       const nsAString& aErrorStr);
-
-// TODO: remove with bluetooth1
-void
-DispatchStatusChangedEvent(const nsAString& aType,
-                           const nsAString& aDeviceAddress,
-                           bool aStatus);
-#endif
 
 void
 DispatchStatusChangedEvent(const nsAString& aType,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluez/BluetoothDBusService.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluez/BluetoothDBusService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluez/BluetoothDBusService.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluez/BluetoothDBusService.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -420,7 +420,6 @@
   return sBluetoothThread->Dispatch(aRunnable, NS_DISPATCH_NORMAL);
 }
 
-#ifdef MOZ_B2G_BT_API_V2
 static void
 DispatchBluetoothReply(BluetoothReplyRunnable* aRunnable,
                        const BluetoothValue& aValue,
@@ -432,9 +431,6 @@
     DispatchReplySuccess(aRunnable, aValue);
   }
 }
-#else
-// Missing in bluetooth1
-#endif
 
 BluetoothDBusService::BluetoothDBusService()
 {
@@ -4161,7 +4157,7 @@
 
 void
 BluetoothDBusService::SendFile(const nsAString& aDeviceAddress,
-                               nsIDOMBlob* aBlob,
+                               Blob* aBlob,
                                BluetoothReplyRunnable* aRunnable)
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -4698,14 +4694,14 @@
 void
 BluetoothDBusService::StartLeScanInternal(
   const nsTArray<nsString>& aServiceUuids,
-  BluetoothReplyRunnable* aRunnable);
+  BluetoothReplyRunnable* aRunnable)
 {
 }
 
 void
 BluetoothDBusService::StopLeScanInternal(
   const nsAString& aAppUuid,
-  BluetoothReplyRunnable* aRunnable);
+  BluetoothReplyRunnable* aRunnable)
 {
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluez/BluetoothDBusService.h firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluez/BluetoothDBusService.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluez/BluetoothDBusService.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluez/BluetoothDBusService.h	2015-05-25 20:43:21.000000000 +0000
@@ -174,7 +174,7 @@
 
   virtual void
   SendFile(const nsAString& aDeviceAddress,
-           nsIDOMBlob* aBlob,
+           Blob* aBlob,
            BluetoothReplyRunnable* aRunnable) override;
 
   virtual void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluez/BluetoothHfpManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluez/BluetoothHfpManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluez/BluetoothHfpManager.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluez/BluetoothHfpManager.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -1916,12 +1916,7 @@
 {
   // For active connection request, we need to reply the DOMRequest
   if (mScoRunnable) {
-#ifdef MOZ_B2G_BT_API_V2
     DispatchReplySuccess(mScoRunnable);
-#else
-    DispatchBluetoothReply(mScoRunnable,
-                           BluetoothValue(true), EmptyString());
-#endif
     mScoRunnable = nullptr;
   }
 
@@ -1935,13 +1930,8 @@
 BluetoothHfpManager::OnScoConnectError()
 {
   if (mScoRunnable) {
-#ifdef MOZ_B2G_BT_API_V2
     DispatchReplyError(mScoRunnable,
                        NS_LITERAL_STRING("Failed to create SCO socket!"));
-#else
-    NS_NAMED_LITERAL_STRING(replyError, "Failed to create SCO socket!");
-    DispatchBluetoothReply(mScoRunnable, BluetoothValue(), replyError);
-#endif
     mScoRunnable = nullptr;
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluez/BluetoothOppManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluez/BluetoothOppManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluez/BluetoothOppManager.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluez/BluetoothOppManager.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -73,16 +73,17 @@
   static bool sInShutdown = false;
 }
 
-class mozilla::dom::bluetooth::SendFileBatch {
+class mozilla::dom::bluetooth::SendFileBatch
+{
 public:
-  SendFileBatch(const nsAString& aDeviceAddress, nsIDOMBlob* aBlob)
+  SendFileBatch(const nsAString& aDeviceAddress, Blob* aBlob)
     : mDeviceAddress(aDeviceAddress)
   {
     mBlobs.AppendElement(aBlob);
   }
 
   nsString mDeviceAddress;
-  nsCOMArray<nsIDOMBlob> mBlobs;
+  nsTArray<nsRefPtr<Blob>> mBlobs;
 };
 
 NS_IMETHODIMP
@@ -385,14 +386,14 @@
   MOZ_ASSERT(NS_IsMainThread());
 
   nsRefPtr<BlobImpl> impl = aActor->GetBlobImpl();
-  nsCOMPtr<nsIDOMBlob> blob = Blob::Create(nullptr, impl);
+  nsRefPtr<Blob> blob = Blob::Create(nullptr, impl);
 
-  return SendFile(aDeviceAddress, blob.get());
+  return SendFile(aDeviceAddress, blob);
 }
 
 bool
 BluetoothOppManager::SendFile(const nsAString& aDeviceAddress,
-                              nsIDOMBlob* aBlob)
+                              Blob* aBlob)
 {
   MOZ_ASSERT(NS_IsMainThread());
 
@@ -406,7 +407,7 @@
 
 void
 BluetoothOppManager::AppendBlobToSend(const nsAString& aDeviceAddress,
-                                      nsIDOMBlob* aBlob)
+                                      Blob* aBlob)
 {
   MOZ_ASSERT(NS_IsMainThread());
 
@@ -714,10 +715,8 @@
   if (aHeader.Has(ObexHeaderId::Body) ||
       aHeader.Has(ObexHeaderId::EndOfBody)) {
     uint8_t* bodyPtr;
-    aHeader.GetBody(&bodyPtr);
+    aHeader.GetBody(&bodyPtr, &mBodySegmentLength);
     mBodySegment = bodyPtr;
-
-    aHeader.GetBodyLength(&mBodySegmentLength);
   }
 }
 
@@ -725,19 +724,13 @@
 BluetoothOppManager::ExtractBlobHeaders()
 {
   RetrieveSentFileName();
+  mBlob->GetType(mContentType);
 
-  nsresult rv = mBlob->GetType(mContentType);
-  if (NS_FAILED(rv)) {
-    BT_WARNING("Can't get content type");
-    SendDisconnectRequest();
-    return false;
-  }
-
-  uint64_t fileLength;
-  rv = mBlob->GetSize(&fileLength);
-  if (NS_FAILED(rv)) {
-    BT_WARNING("Can't get file size");
+  ErrorResult rv;
+  uint64_t fileLength = mBlob->GetSize(rv);
+  if (NS_WARN_IF(rv.Failed())) {
     SendDisconnectRequest();
+    rv.SuppressException();
     return false;
   }
 
@@ -754,9 +747,9 @@
 
   mFileLength = fileLength;
   rv = NS_NewThread(getter_AddRefs(mReadFileThread));
-  if (NS_FAILED(rv)) {
-    BT_WARNING("Can't create thread");
+  if (NS_WARN_IF(rv.Failed())) {
     SendDisconnectRequest();
+    rv.SuppressException();
     return false;
   }
 
@@ -768,7 +761,7 @@
 {
   mFileName.Truncate();
 
-  nsCOMPtr<nsIDOMFile> file = do_QueryInterface(mBlob);
+  nsRefPtr<File> file = mBlob->ToFile();
   if (file) {
     file->GetName(mFileName);
   }
@@ -885,10 +878,19 @@
 {
   MOZ_ASSERT(NS_IsMainThread());
 
-  uint8_t opCode;
+  /**
+   * Ensure
+   * - valid access to data[0], i.e., opCode
+   * - received packet length smaller than max packet length
+   */
   int receivedLength = aMessage->GetSize();
-  const uint8_t* data = aMessage->GetData();
+  if (receivedLength < 1 || receivedLength > MAX_PACKET_LENGTH) {
+    ReplyError(ObexResponseCode::BadRequest);
+    return;
+  }
 
+  uint8_t opCode;
+  const uint8_t* data = aMessage->GetData();
   if (mPutPacketReceivedLength > 0) {
     opCode = mPutFinalFlag ? ObexRequestCode::PutFinal : ObexRequestCode::Put;
   } else {
@@ -904,12 +906,13 @@
     }
   }
 
-  ObexHeaderSet pktHeaders(opCode);
+  ObexHeaderSet pktHeaders;
   if (opCode == ObexRequestCode::Connect) {
     // Section 3.3.1 "Connect", IrOBEX 1.2
     // [opcode:1][length:2][version:1][flags:1][MaxPktSizeWeCanReceive:2]
     // [Headers:var]
-    if (!ParseHeaders(&data[7], receivedLength - 7, &pktHeaders)) {
+    if (receivedLength < 7 ||
+        !ParseHeaders(&data[7], receivedLength - 7, &pktHeaders)) {
       ReplyError(ObexResponseCode::BadRequest);
       return;
     }
@@ -919,7 +922,8 @@
   } else if (opCode == ObexRequestCode::Abort) {
     // Section 3.3.5 "Abort", IrOBEX 1.2
     // [opcode:1][length:2][Headers:var]
-    if (!ParseHeaders(&data[3], receivedLength - 3, &pktHeaders)) {
+    if (receivedLength < 3 ||
+        !ParseHeaders(&data[3], receivedLength - 3, &pktHeaders)) {
       ReplyError(ObexResponseCode::BadRequest);
       return;
     }
@@ -929,7 +933,8 @@
   } else if (opCode == ObexRequestCode::Disconnect) {
     // Section 3.3.2 "Disconnect", IrOBEX 1.2
     // [opcode:1][length:2][Headers:var]
-    if (!ParseHeaders(&data[3], receivedLength - 3, &pktHeaders)) {
+    if (receivedLength < 3 ||
+        !ParseHeaders(&data[3], receivedLength - 3, &pktHeaders)) {
       ReplyError(ObexResponseCode::BadRequest);
       return;
     }
@@ -1012,6 +1017,13 @@
 {
   MOZ_ASSERT(NS_IsMainThread());
 
+  // Ensure valid access to data[0], i.e., opCode
+  int receivedLength = aMessage->GetSize();
+  if (receivedLength < 1) {
+    BT_LOGR("Receive empty response packet");
+    return;
+  }
+
   const uint8_t* data = aMessage->GetData();
   uint8_t opCode = data[0];
 
@@ -1069,6 +1081,13 @@
 
     AfterOppConnected();
 
+    // Ensure valid access to remote information
+    if (receivedLength < 7) {
+      BT_LOGR("The length of connect response packet is invalid");
+      SendDisconnectRequest();
+      return;
+    }
+
     // Keep remote information
     mRemoteObexVersion = data[3];
     mRemoteConnectionFlags = data[4];
@@ -1095,12 +1114,12 @@
       mUpdateProgressCounter = mSentFileLength / kUpdateProgressBase + 1;
     }
 
-    nsresult rv;
+    ErrorResult rv;
     if (!mInputStream) {
-      rv = mBlob->GetInternalStream(getter_AddRefs(mInputStream));
-      if (NS_FAILED(rv)) {
-        BT_WARNING("Can't get internal stream of blob");
+      mBlob->GetInternalStream(getter_AddRefs(mInputStream), rv);
+      if (NS_WARN_IF(rv.Failed())) {
         SendDisconnectRequest();
+        rv.SuppressException();
         return;
       }
     }
@@ -1108,9 +1127,10 @@
     nsRefPtr<ReadFileTask> task = new ReadFileTask(mInputStream,
                                                    mRemoteMaxPacketLength);
     rv = mReadFileThread->Dispatch(task, NS_DISPATCH_NORMAL);
-    if (NS_FAILED(rv)) {
-      BT_WARNING("Cannot dispatch read file task!");
+    if (NS_WARN_IF(rv.Failed())) {
       SendDisconnectRequest();
+      rv.SuppressException();
+      return;
     }
   } else {
     BT_WARNING("Unhandled ObexRequestCode");
@@ -1170,7 +1190,7 @@
 
   int index = 3;
   index += AppendHeaderName(&req[index], mRemoteMaxPacketLength - index,
-                            (char*)fileName, (len + 1) * 2);
+                            fileName, (len + 1) * 2);
   index += AppendHeaderLength(&req[index], aFileSize);
 
   // This is final put packet if file size equals to 0
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluez/BluetoothOppManager.h firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluez/BluetoothOppManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluez/BluetoothOppManager.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluez/BluetoothOppManager.h	2015-05-25 20:43:21.000000000 +0000
@@ -14,13 +14,13 @@
 #include "mozilla/ipc/SocketBase.h"
 #include "nsCOMArray.h"
 
-class nsIDOMBlob;
 class nsIOutputStream;
 class nsIInputStream;
 class nsIVolumeMountLock;
 
 namespace mozilla {
 namespace dom {
+class Blob;
 class BlobParent;
 }
 }
@@ -51,7 +51,7 @@
   bool Listen();
 
   bool SendFile(const nsAString& aDeviceAddress, BlobParent* aActor);
-  bool SendFile(const nsAString& aDeviceAddress, nsIDOMBlob* aBlob);
+  bool SendFile(const nsAString& aDeviceAddress, Blob* aBlob);
   bool StopSendingFile();
   bool ConfirmReceivingFile(bool aConfirm);
 
@@ -96,7 +96,7 @@
   void NotifyAboutFileChange();
   bool AcquireSdcardMountLock();
   void SendObexData(uint8_t* aData, uint8_t aOpcode, int aSize);
-  void AppendBlobToSend(const nsAString& aDeviceAddress, nsIDOMBlob* aBlob);
+  void AppendBlobToSend(const nsAString& aDeviceAddress, Blob* aBlob);
   void DiscardBlobsToSend();
   bool ProcessNextBatch();
   void ConnectInternal(const nsAString& aDeviceAddress);
@@ -193,7 +193,7 @@
   nsAutoArrayPtr<uint8_t> mReceivedDataBuffer;
 
   int mCurrentBlobIndex;
-  nsCOMPtr<nsIDOMBlob> mBlob;
+  nsRefPtr<Blob> mBlob;
   nsTArray<SendFileBatch> mBatches;
 
   /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluez/BluetoothSocket.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluez/BluetoothSocket.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluez/BluetoothSocket.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluez/BluetoothSocket.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -30,11 +30,10 @@
 public:
   BluetoothSocketIO(MessageLoop* mIOLoop,
                     BluetoothSocket* aConsumer,
-                    UnixSocketConnector* aConnector,
-                    const nsACString& aAddress);
+                    UnixSocketConnector* aConnector);
   ~BluetoothSocketIO();
 
-  void        GetSocketAddr(nsAString& aAddrStr) const;
+  void GetSocketAddr(nsAString& aAddrStr) const;
 
   BluetoothSocket* GetBluetoothSocket();
   DataSocket* GetDataSocket();
@@ -94,9 +93,6 @@
 
   void FireSocketError();
 
-  // Set up flags on file descriptor.
-  static bool SetSocketFlags(int aFd);
-
   /**
    * Consumer pointer. Non-thread safe RefPtr, so should only be manipulated
    * directly from main thread. All non-main-thread accesses should happen with
@@ -115,19 +111,14 @@
   bool mShuttingDownOnIOThread;
 
   /**
-   * Address we are connecting to, assuming we are creating a client connection.
-   */
-  nsCString mAddress;
-
-  /**
-   * Size of the socket address struct
+   * Number of valid bytes in |mAddress|
    */
-  socklen_t mAddrSize;
+  socklen_t mAddressLength;
 
   /**
-   * Address struct of the socket currently in use
+   * Address structure of the socket currently in use
    */
-  sockaddr_any mAddr;
+  struct sockaddr_storage mAddress;
 
   /**
    * Task member for delayed connect task. Should only be access on main thread.
@@ -143,13 +134,12 @@
 BluetoothSocket::BluetoothSocketIO::BluetoothSocketIO(
   MessageLoop* mIOLoop,
   BluetoothSocket* aConsumer,
-  UnixSocketConnector* aConnector,
-  const nsACString& aAddress)
+  UnixSocketConnector* aConnector)
   : UnixSocketWatcher(mIOLoop)
   , mConsumer(aConsumer)
   , mConnector(aConnector)
   , mShuttingDownOnIOThread(false)
-  , mAddress(aAddress)
+  , mAddressLength(0)
   , mDelayedConnectTask(nullptr)
 {
   MOZ_ASSERT(mConsumer);
@@ -170,7 +160,17 @@
     aAddrStr.Truncate();
     return;
   }
-  mConnector->GetSocketAddr(mAddr, aAddrStr);
+
+  nsCString addressString;
+  nsresult rv = mConnector->ConvertAddressToString(
+    *reinterpret_cast<const struct sockaddr*>(&mAddress), mAddressLength,
+    addressString);
+  if (NS_FAILED(rv)) {
+    aAddrStr.Truncate();
+    return;
+  }
+
+  aAddrStr.Assign(NS_ConvertUTF8toUTF16(addressString));
 }
 
 BluetoothSocket*
@@ -221,34 +221,20 @@
   MOZ_ASSERT(mConnector);
 
   if (!IsOpen()) {
-    int fd = mConnector->Create();
-    if (fd < 0) {
-      NS_WARNING("Cannot create socket fd!");
-      FireSocketError();
-      return;
-    }
-    if (!SetSocketFlags(fd)) {
-      NS_WARNING("Cannot set socket flags!");
-      FireSocketError();
-      return;
-    }
-    if (!mConnector->SetUpListenSocket(fd)) {
-      NS_WARNING("Could not set up listen socket!");
-      FireSocketError();
-      return;
-    }
-    // This will set things we don't particularly care about, but it will hand
-    // back the correct structure size which is what we do care about.
-    if (!mConnector->CreateAddr(true, mAddrSize, mAddr, nullptr)) {
-      NS_WARNING("Cannot create socket address!");
+    mAddressLength = sizeof(mAddress);
+
+    int fd;
+    nsresult rv = mConnector->CreateListenSocket(
+      reinterpret_cast<struct sockaddr*>(&mAddress), &mAddressLength, fd);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
       FireSocketError();
       return;
     }
     SetFd(fd);
 
     // calls OnListening on success, or OnError otherwise
-    nsresult rv = UnixSocketWatcher::Listen(
-      reinterpret_cast<struct sockaddr*>(&mAddr), mAddrSize);
+    rv = UnixSocketWatcher::Listen(
+      reinterpret_cast<struct sockaddr*>(&mAddress), mAddressLength);
     NS_WARN_IF(NS_FAILED(rv));
   }
 }
@@ -260,24 +246,12 @@
   MOZ_ASSERT(mConnector);
 
   if (!IsOpen()) {
-    int fd = mConnector->Create();
-    if (fd < 0) {
-      NS_WARNING("Cannot create socket fd!");
-      FireSocketError();
-      return;
-    }
-    if (!SetSocketFlags(fd)) {
-      NS_WARNING("Cannot set socket flags!");
-      FireSocketError();
-      return;
-    }
-    if (!mConnector->SetUp(fd)) {
-      NS_WARNING("Could not set up socket!");
-      FireSocketError();
-      return;
-    }
-    if (!mConnector->CreateAddr(false, mAddrSize, mAddr, mAddress.get())) {
-      NS_WARNING("Cannot create socket address!");
+    mAddressLength = sizeof(mAddress);
+
+    int fd;
+    nsresult rv = mConnector->CreateStreamSocket(
+      reinterpret_cast<struct sockaddr*>(&mAddress), &mAddressLength, fd);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
       FireSocketError();
       return;
     }
@@ -286,7 +260,7 @@
 
   // calls OnConnected() on success, or OnError() otherwise
   nsresult rv = UnixSocketWatcher::Connect(
-    reinterpret_cast<struct sockaddr*>(&mAddr), mAddrSize);
+    reinterpret_cast<struct sockaddr*>(&mAddress), mAddressLength);
   NS_WARN_IF(NS_FAILED(rv));
 }
 
@@ -338,18 +312,14 @@
 
   RemoveWatchers(READ_WATCHER|WRITE_WATCHER);
 
-  socklen_t mAddrSize = sizeof(mAddr);
-  int fd = TEMP_FAILURE_RETRY(accept(GetFd(),
-    reinterpret_cast<struct sockaddr*>(&mAddr), &mAddrSize));
-  if (fd < 0) {
-    OnError("accept", errno);
-    return;
-  }
-  if (!SetSocketFlags(fd)) {
-    return;
-  }
-  if (!mConnector->SetUp(fd)) {
-    NS_WARNING("Could not set up socket!");
+  mAddressLength = sizeof(mAddress);
+
+  int fd;
+  nsresult rv = mConnector->AcceptStreamSocket(
+    GetFd(),
+    reinterpret_cast<struct sockaddr*>(&mAddress), &mAddressLength, fd);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    FireSocketError();
     return;
   }
 
@@ -411,38 +381,6 @@
 
 }
 
-bool
-BluetoothSocket::BluetoothSocketIO::SetSocketFlags(int aFd)
-{
-  // Set socket addr to be reused even if kernel is still waiting to close
-  int n = 1;
-  if (setsockopt(aFd, SOL_SOCKET, SO_REUSEADDR, &n, sizeof(n)) < 0) {
-    return false;
-  }
-
-  // Set close-on-exec bit.
-  int flags = TEMP_FAILURE_RETRY(fcntl(aFd, F_GETFD));
-  if (-1 == flags) {
-    return false;
-  }
-  flags |= FD_CLOEXEC;
-  if (-1 == TEMP_FAILURE_RETRY(fcntl(aFd, F_SETFD, flags))) {
-    return false;
-  }
-
-  // Set non-blocking status flag.
-  flags = TEMP_FAILURE_RETRY(fcntl(aFd, F_GETFL));
-  if (-1 == flags) {
-    return false;
-  }
-  flags |= O_NONBLOCK;
-  if (-1 == TEMP_FAILURE_RETRY(fcntl(aFd, F_SETFL, flags))) {
-    return false;
-  }
-
-  return true;
-}
-
 // |DataSocketIO|
 
 nsresult
@@ -646,7 +584,8 @@
   MOZ_ASSERT(!aDeviceAddress.IsEmpty());
 
   nsAutoPtr<BluetoothUnixSocketConnector> c(
-    new BluetoothUnixSocketConnector(mType, aChannel, mAuth, mEncrypt));
+    new BluetoothUnixSocketConnector(NS_ConvertUTF16toUTF8(aDeviceAddress),
+                                     mType, aChannel, mAuth, mEncrypt));
 
   if (!ConnectSocket(c.forget(),
                      NS_ConvertUTF16toUTF8(aDeviceAddress).BeginReading())) {
@@ -668,7 +607,8 @@
   MOZ_ASSERT(NS_IsMainThread());
 
   nsAutoPtr<BluetoothUnixSocketConnector> c(
-    new BluetoothUnixSocketConnector(mType, aChannel, mAuth, mEncrypt));
+    new BluetoothUnixSocketConnector(NS_LITERAL_CSTRING(BLUETOOTH_ADDRESS_NONE),
+                                     mType, aChannel, mAuth, mEncrypt));
 
   if (!ListenSocket(c.forget())) {
     nsAutoString addr;
@@ -728,9 +668,8 @@
     return false;
   }
 
-  nsCString addr(aAddress);
   MessageLoop* ioLoop = XRE_GetIOMessageLoop();
-  mIO = new BluetoothSocketIO(ioLoop, this, connector.forget(), addr);
+  mIO = new BluetoothSocketIO(ioLoop, this, connector.forget());
   SetConnectionStatus(SOCKET_CONNECTING);
   if (aDelayMs > 0) {
     DelayedConnectTask* connectTask = new DelayedConnectTask(mIO);
@@ -755,10 +694,12 @@
     return false;
   }
 
-  mIO = new BluetoothSocketIO(
-    XRE_GetIOMessageLoop(), this, connector.forget(), EmptyCString());
+  MessageLoop* ioLoop = XRE_GetIOMessageLoop();
+
+  mIO = new BluetoothSocketIO(ioLoop, this, connector.forget());
   SetConnectionStatus(SOCKET_LISTENING);
-  XRE_GetIOMessageLoop()->PostTask(FROM_HERE, new ListenTask(mIO));
+  ioLoop->PostTask(FROM_HERE, new ListenTask(mIO));
+
   return true;
 }
 
@@ -779,7 +720,7 @@
 // |SocketBase|
 
 void
-BluetoothSocket::CloseSocket()
+BluetoothSocket::Close()
 {
   MOZ_ASSERT(NS_IsMainThread());
   if (!mIO) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluez/BluetoothSocket.h firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluez/BluetoothSocket.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluez/BluetoothSocket.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluez/BluetoothSocket.h	2015-05-25 20:43:21.000000000 +0000
@@ -38,7 +38,7 @@
               int aChannel);
   inline void Disconnect()
   {
-    CloseSocket();
+    Close();
   }
 
   inline void GetAddress(nsAString& aDeviceAddress)
@@ -102,7 +102,7 @@
   // Methods for |SocketBase|
   //
 
-  void CloseSocket() override;
+  void Close() override;
 
   void OnConnectSuccess() override;
   void OnConnectError() override;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluez/BluetoothUnixSocketConnector.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluez/BluetoothUnixSocketConnector.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluez/BluetoothUnixSocketConnector.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluez/BluetoothUnixSocketConnector.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -1,5 +1,6 @@
 /* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
 /* vim: set ts=2 et sw=2 tw=80: */
+
 /*
  * Copyright 2009, The Android Open Source Project
  *
@@ -15,123 +16,175 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * NOTE: Due to being based on the dbus compatibility layer for
- * android's bluetooth implementation, this file is licensed under the
- * apache license instead of MPL.
- *
+ * NOTE: Due to being based on the D-Bus compatibility layer for
+ * Android's Bluetooth implementation, this file is licensed under the
+ * Apache License instead of MPL.
  */
 
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#include <sys/socket.h>
-#ifdef MOZ_B2G_BT_BLUEZ
+#include "BluetoothUnixSocketConnector.h"
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/l2cap.h>
 #include <bluetooth/rfcomm.h>
 #include <bluetooth/sco.h>
-#endif
-#include "BluetoothUnixSocketConnector.h"
-#include "nsThreadUtils.h"
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <sys/socket.h>
+#include <unistd.h>
+#include "nsThreadUtils.h" // For NS_IsMainThread.
 
 using namespace mozilla::ipc;
-USING_BLUETOOTH_NAMESPACE
+
+BEGIN_BLUETOOTH_NAMESPACE
 
 static const int RFCOMM_SO_SNDBUF = 70 * 1024;  // 70 KB send buffer
 static const int L2CAP_SO_SNDBUF = 400 * 1024;  // 400 KB send buffer
 static const int L2CAP_SO_RCVBUF = 400 * 1024;  // 400 KB receive buffer
 static const int L2CAP_MAX_MTU = 65000;
 
-#ifdef MOZ_B2G_BT_BLUEZ
-static
-int get_bdaddr(const char *str, bdaddr_t *ba)
-{
-  char *d = ((char*)ba) + 5, *endp;
-  for (int i = 0; i < 6; i++) {
-    *d-- = strtol(str, &endp, 16);
-    MOZ_ASSERT(!(*endp != ':' && i != 5));
-    str = endp + 1;
-  }
-  return 0;
-}
-
-static
-void get_bdaddr_as_string(const bdaddr_t *ba, char *str) {
-    const uint8_t *b = (const uint8_t *)ba;
-    sprintf(str, "%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X",
-            b[5], b[4], b[3], b[2], b[1], b[0]);
-}
-
-#endif
-
 BluetoothUnixSocketConnector::BluetoothUnixSocketConnector(
+  const nsACString& aAddressString,
   BluetoothSocketType aType,
   int aChannel,
   bool aAuth,
-  bool aEncrypt) : mType(aType)
-                 , mChannel(aChannel)
-                 , mAuth(aAuth)
-                 , mEncrypt(aEncrypt)
+  bool aEncrypt)
+  : mAddressString(aAddressString)
+  , mType(aType)
+  , mChannel(aChannel)
+  , mAuth(aAuth)
+  , mEncrypt(aEncrypt)
+{ }
+
+BluetoothUnixSocketConnector::~BluetoothUnixSocketConnector()
+{ }
+
+nsresult
+BluetoothUnixSocketConnector::CreateSocket(int& aFd) const
 {
+  static const int sType[] = {
+    [0] = 0,
+    [BluetoothSocketType::RFCOMM] = SOCK_STREAM,
+    [BluetoothSocketType::SCO] = SOCK_SEQPACKET,
+    [BluetoothSocketType::L2CAP] = SOCK_SEQPACKET,
+    [BluetoothSocketType::EL2CAP] = SOCK_STREAM
+  };
+  static const int sProtocol[] = {
+    [0] = 0,
+    [BluetoothSocketType::RFCOMM] = BTPROTO_RFCOMM,
+    [BluetoothSocketType::SCO] = BTPROTO_SCO,
+    [BluetoothSocketType::L2CAP] = BTPROTO_L2CAP,
+    [BluetoothSocketType::EL2CAP] = BTPROTO_L2CAP
+  };
+
+  MOZ_ASSERT(mType < MOZ_ARRAY_LENGTH(sType));
+  MOZ_ASSERT(mType < MOZ_ARRAY_LENGTH(sProtocol));
+
+  aFd = socket(AF_BLUETOOTH, sType[mType], sProtocol[mType]);
+  if (aFd < 0) {
+    BT_LOGR("Could not open Bluetooth socket!");
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
 }
 
-bool
-BluetoothUnixSocketConnector::SetUp(int aFd)
+nsresult
+BluetoothUnixSocketConnector::SetSocketFlags(int aFd) const
 {
-#ifdef MOZ_B2G_BT_BLUEZ
-  int lm = 0;
-  int sndbuf, rcvbuf;
+  static const int sReuseAddress = 1;
+
+  // Set close-on-exec bit.
+  int flags = TEMP_FAILURE_RETRY(fcntl(aFd, F_GETFD));
+  if (flags < 0) {
+    return NS_ERROR_FAILURE;
+  }
+  flags |= FD_CLOEXEC;
+  int res = TEMP_FAILURE_RETRY(fcntl(aFd, F_SETFD, flags));
+  if (res < 0) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // Set non-blocking status flag.
+  flags = TEMP_FAILURE_RETRY(fcntl(aFd, F_GETFL));
+  if (flags < 0) {
+    return NS_ERROR_FAILURE;
+  }
+  flags |= O_NONBLOCK;
+  res = TEMP_FAILURE_RETRY(fcntl(aFd, F_SETFL, flags));
+  if (res < 0) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // Set socket addr to be reused even if kernel is still waiting to close.
+  res = setsockopt(aFd, SOL_SOCKET, SO_REUSEADDR, &sReuseAddress,
+                   sizeof(sReuseAddress));
+  if (res < 0) {
+    return NS_ERROR_FAILURE;
+  }
+
+  int lm;
 
-  /* kernel does not yet support LM for SCO */
   switch (mType) {
-  case BluetoothSocketType::RFCOMM:
-    lm |= mAuth ? RFCOMM_LM_AUTH : 0;
-    lm |= mEncrypt ? RFCOMM_LM_ENCRYPT : 0;
-    break;
-  case BluetoothSocketType::L2CAP:
-  case BluetoothSocketType::EL2CAP:
-    lm |= mAuth ? L2CAP_LM_AUTH : 0;
-    lm |= mEncrypt ? L2CAP_LM_ENCRYPT : 0;
-    break;
-  case BluetoothSocketType::SCO:
-    break;
-  default:
-    MOZ_CRASH("Unknown socket type!");
+    case BluetoothSocketType::RFCOMM:
+      lm |= mAuth ? RFCOMM_LM_AUTH : 0;
+      lm |= mEncrypt ? RFCOMM_LM_ENCRYPT : 0;
+      break;
+    case BluetoothSocketType::L2CAP:
+    case BluetoothSocketType::EL2CAP:
+      lm |= mAuth ? L2CAP_LM_AUTH : 0;
+      lm |= mEncrypt ? L2CAP_LM_ENCRYPT : 0;
+      break;
+    default:
+      // kernel does not yet support LM for SCO
+      lm = 0;
+      break;
   }
 
   if (lm) {
-    if (mType == BluetoothSocketType::RFCOMM) {
-      if (setsockopt(aFd, SOL_RFCOMM, RFCOMM_LM, &lm, sizeof(lm))) {
-        BT_WARNING("setsockopt(RFCOMM_LM) failed, throwing");
-        return false;
-      }
-    } else if (mType == BluetoothSocketType::L2CAP ||
-               mType == BluetoothSocketType::EL2CAP) {
-      if (setsockopt(aFd, SOL_L2CAP, L2CAP_LM, &lm, sizeof(lm))) {
-        BT_WARNING("setsockopt(L2CAP_LM) failed, throwing");
-        return false;
-      }
+    static const int sLevel[] = {
+      [0] = 0,
+      [BluetoothSocketType::RFCOMM] = SOL_RFCOMM,
+      [BluetoothSocketType::SCO] = 0,
+      [BluetoothSocketType::L2CAP] = SOL_L2CAP,
+      [BluetoothSocketType::EL2CAP] = SOL_L2CAP
+    };
+    static const int sOptname[] = {
+      [0] = 0,
+      [BluetoothSocketType::RFCOMM] = RFCOMM_LM,
+      [BluetoothSocketType::SCO] = 0,
+      [BluetoothSocketType::L2CAP] = L2CAP_LM,
+      [BluetoothSocketType::EL2CAP] = L2CAP_LM
+    };
+
+    MOZ_ASSERT(mType < MOZ_ARRAY_LENGTH(sLevel));
+    MOZ_ASSERT(mType < MOZ_ARRAY_LENGTH(sOptname));
+
+    if (setsockopt(aFd, sLevel[mType], sOptname[mType], &lm, sizeof(lm)) < 0) {
+      BT_LOGR("setsockopt(RFCOMM_LM) failed, throwing");
+      return NS_ERROR_FAILURE;
     }
   }
 
   if (mType == BluetoothSocketType::RFCOMM) {
-    sndbuf = RFCOMM_SO_SNDBUF;
+
+    /* Setting RFCOMM socket options */
+
+    int sndbuf = RFCOMM_SO_SNDBUF;
     if (setsockopt(aFd, SOL_SOCKET, SO_SNDBUF, &sndbuf, sizeof(sndbuf))) {
       BT_WARNING("setsockopt(SO_SNDBUF) failed, throwing");
-      return false;
+      return NS_ERROR_FAILURE;
     }
   }
 
-  /* Setting L2CAP socket options */
   if (mType == BluetoothSocketType::L2CAP ||
       mType == BluetoothSocketType::EL2CAP) {
+
+    /* Setting L2CAP/EL2CAP socket options */
+
     struct l2cap_options opts;
     socklen_t optlen = sizeof(opts);
-    int err;
-    err = getsockopt(aFd, SOL_L2CAP, L2CAP_OPTIONS, &opts, &optlen);
-    if (!err) {
+    int res = getsockopt(aFd, SOL_L2CAP, L2CAP_OPTIONS, &opts, &optlen);
+    if (!res) {
       /* setting MTU for [E]L2CAP */
       opts.omtu = opts.imtu = L2CAP_MAX_MTU;
 
@@ -144,142 +197,223 @@
         opts.max_tx = 10;
       }
 
-      err = setsockopt(aFd, SOL_L2CAP, L2CAP_OPTIONS, &opts, optlen);
+      setsockopt(aFd, SOL_L2CAP, L2CAP_OPTIONS, &opts, optlen);
     }
 
-    /* Set larger SNDBUF & RCVBUF for EL2CAP connections */
     if (mType == BluetoothSocketType::EL2CAP) {
-      sndbuf = L2CAP_SO_SNDBUF;
-      if (setsockopt(aFd, SOL_SOCKET, SO_SNDBUF, &sndbuf, sizeof(sndbuf))) {
-        BT_WARNING("setsockopt(SO_SNDBUF) failed, throwing");
-        return false;
+
+      /* Set larger SNDBUF and RCVBUF for EL2CAP connections */
+
+      int sndbuf = L2CAP_SO_SNDBUF;
+      if (setsockopt(aFd, SOL_SOCKET, SO_SNDBUF, &sndbuf, sizeof(sndbuf)) < 0) {
+        BT_LOGR("setsockopt(SO_SNDBUF) failed, throwing");
+        return NS_ERROR_FAILURE;
       }
 
-      rcvbuf = L2CAP_SO_RCVBUF;
-      if (setsockopt(aFd, SOL_SOCKET, SO_RCVBUF, &rcvbuf, sizeof(rcvbuf))) {
-        BT_WARNING("setsockopt(SO_RCVBUF) failed, throwing");
-        return false;
+      int rcvbuf = L2CAP_SO_RCVBUF;
+      if (setsockopt(aFd, SOL_SOCKET, SO_RCVBUF, &rcvbuf, sizeof(rcvbuf)) < 0) {
+        BT_LOGR("setsockopt(SO_RCVBUF) failed, throwing");
+        return NS_ERROR_FAILURE;
       }
     }
   }
-#endif
-  return true;
+
+  return NS_OK;
 }
 
-bool
-BluetoothUnixSocketConnector::SetUpListenSocket(int aFd)
+nsresult
+BluetoothUnixSocketConnector::CreateAddress(struct sockaddr& aAddress,
+                                            socklen_t& aAddressLength) const
 {
-  // Nothing to do here.
-  return true;
+  switch (mType) {
+    case BluetoothSocketType::RFCOMM: {
+        struct sockaddr_rc* rc =
+          reinterpret_cast<struct sockaddr_rc*>(&aAddress);
+        rc->rc_family = AF_BLUETOOTH;
+        nsresult rv = ConvertAddressString(mAddressString.get(),
+                                           rc->rc_bdaddr);
+        if (NS_FAILED(rv)) {
+          return rv;
+        }
+        rc->rc_channel = mChannel;
+        aAddressLength = sizeof(*rc);
+      }
+      break;
+    case BluetoothSocketType::L2CAP:
+    case BluetoothSocketType::EL2CAP: {
+        struct sockaddr_l2* l2 =
+          reinterpret_cast<struct sockaddr_l2*>(&aAddress);
+        l2->l2_family = AF_BLUETOOTH;
+        l2->l2_psm = mChannel;
+        nsresult rv = ConvertAddressString(mAddressString.get(),
+                                           l2->l2_bdaddr);
+        if (NS_FAILED(rv)) {
+          return rv;
+        }
+        l2->l2_cid = 0;
+        aAddressLength = sizeof(*l2);
+      }
+      break;
+    case BluetoothSocketType::SCO: {
+        struct sockaddr_sco* sco =
+          reinterpret_cast<struct sockaddr_sco*>(&aAddress);
+        sco->sco_family = AF_BLUETOOTH;
+        nsresult rv = ConvertAddressString(mAddressString.get(),
+                                           sco->sco_bdaddr);
+        if (NS_FAILED(rv)) {
+          return rv;
+        }
+        sco->sco_pkt_type = 0;
+        aAddressLength = sizeof(*sco);
+      }
+      break;
+    default:
+      MOZ_CRASH("Socket type unknown!");
+      return NS_ERROR_ABORT;
+  }
+
+  return NS_OK;
 }
 
-int
-BluetoothUnixSocketConnector::Create()
+nsresult
+BluetoothUnixSocketConnector::ConvertAddressString(const char* aAddressString,
+                                                   bdaddr_t& aAddress)
 {
-  MOZ_ASSERT(!NS_IsMainThread());
-  int fd = -1;
+  char* d = reinterpret_cast<char*>(aAddress.b) + 5;
 
-#ifdef MOZ_B2G_BT_BLUEZ
-  switch (mType) {
-  case BluetoothSocketType::RFCOMM:
-    fd = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
-    break;
-  case BluetoothSocketType::SCO:
-    fd = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_SCO);
-    break;
-  case BluetoothSocketType::L2CAP:
-    fd = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP);
-    break;
-  case BluetoothSocketType::EL2CAP:
-    fd = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_L2CAP);
-    break;
-  default:
-    MOZ_CRASH();
+  for (size_t i = 0; i < MOZ_ARRAY_LENGTH(aAddress.b); ++i) {
+    char* endp;
+    *d-- = strtoul(aAddressString, &endp, 16);
+    MOZ_ASSERT(!(*endp != ':' && i != 5));
+    aAddressString = endp + 1;
   }
+  return NS_OK;
+}
 
-  if (fd < 0) {
-    BT_WARNING("Could not open bluetooth socket!");
-    return -1;
-  }
+// |UnixSocketConnector|
+
+nsresult
+BluetoothUnixSocketConnector::ConvertAddressToString(
+  const struct sockaddr& aAddress, socklen_t aAddressLength,
+  nsACString& aAddressString)
+{
+  MOZ_ASSERT(aAddress.sa_family == AF_BLUETOOTH);
+
+  const uint8_t* b;
 
-  if (!SetUp(fd)) {
-    BT_WARNING("Could not set up socket!");
-    return -1;
+  switch (mType) {
+    case BluetoothSocketType::RFCOMM: {
+        const struct sockaddr_rc* rc =
+          reinterpret_cast<const struct sockaddr_rc*>(&aAddress);
+        b = rc->rc_bdaddr.b;
+      }
+      break;
+    case BluetoothSocketType::SCO: {
+        const struct sockaddr_sco* sco =
+          reinterpret_cast<const struct sockaddr_sco*>(&aAddress);
+        b = sco->sco_bdaddr.b;
+      }
+      break;
+    case BluetoothSocketType::L2CAP:
+    case BluetoothSocketType::EL2CAP: {
+        const struct sockaddr_l2* l2 =
+          reinterpret_cast<const struct sockaddr_l2*>(&aAddress);
+        b = l2->l2_bdaddr.b;
+      }
+      break;
   }
-#endif
-  return fd;
+
+  char str[32];
+  snprintf(str, sizeof(str), "%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X",
+           b[5], b[4], b[3], b[2], b[1], b[0]);
+
+  aAddressString.Assign(str);
+
+  return NS_OK;
 }
 
-bool
-BluetoothUnixSocketConnector::CreateAddr(bool aIsServer,
-                                         socklen_t& aAddrSize,
-                                         sockaddr_any& aAddr,
-                                         const char* aAddress)
+nsresult
+BluetoothUnixSocketConnector::CreateListenSocket(struct sockaddr* aAddress,
+                                                 socklen_t* aAddressLength,
+                                                 int& aListenFd)
 {
-#ifdef MOZ_B2G_BT_BLUEZ
-  // Set to BDADDR_ANY, if it's not a server, we'll reset.
-  bdaddr_t bd_address_obj = {{0, 0, 0, 0, 0, 0}};
-
-  if (!aIsServer && aAddress && strlen(aAddress) > 0) {
-    if (get_bdaddr(aAddress, &bd_address_obj)) {
-      BT_WARNING("Can't get bluetooth address!");
-      return false;
+  ScopedClose fd;
+
+  nsresult rv = CreateSocket(fd.rwget());
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = SetSocketFlags(fd);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  if (aAddress && aAddressLength) {
+    rv = CreateAddress(*aAddress, *aAddressLength);
+    if (NS_FAILED(rv)) {
+      return rv;
     }
   }
 
-  // Initialize
-  memset(&aAddr, 0, sizeof(aAddr));
+  aListenFd = fd.forget();
 
-  switch (mType) {
-  case BluetoothSocketType::RFCOMM:
-    struct sockaddr_rc addr_rc;
-    aAddrSize = sizeof(addr_rc);
-    aAddr.rc.rc_family = AF_BLUETOOTH;
-    aAddr.rc.rc_channel = mChannel;
-    memcpy(&aAddr.rc.rc_bdaddr, &bd_address_obj, sizeof(bd_address_obj));
-    break;
-  case BluetoothSocketType::L2CAP:
-  case BluetoothSocketType::EL2CAP:
-    struct sockaddr_l2 addr_l2;
-    aAddrSize = sizeof(addr_l2);
-    aAddr.l2.l2_family = AF_BLUETOOTH;
-    aAddr.l2.l2_psm = mChannel;
-    memcpy(&aAddr.l2.l2_bdaddr, &bd_address_obj, sizeof(bdaddr_t));
-    break;
-  case BluetoothSocketType::SCO:
-    struct sockaddr_sco addr_sco;
-    aAddrSize = sizeof(addr_sco);
-    aAddr.sco.sco_family = AF_BLUETOOTH;
-    memcpy(&aAddr.sco.sco_bdaddr, &bd_address_obj, sizeof(bd_address_obj));
-    break;
-  default:
-    BT_WARNING("Socket type unknown!");
-    return false;
+  return NS_OK;
+}
+
+nsresult
+BluetoothUnixSocketConnector::AcceptStreamSocket(int aListenFd,
+                                                 struct sockaddr* aAddress,
+                                                 socklen_t* aAddressLength,
+                                                 int& aStreamFd)
+{
+  ScopedClose fd(
+    TEMP_FAILURE_RETRY(accept(aListenFd, aAddress, aAddressLength)));
+  if (fd < 0) {
+    NS_WARNING("Cannot accept file descriptor!");
+    return NS_ERROR_FAILURE;
+  }
+  nsresult rv = SetSocketFlags(fd);
+  if (NS_FAILED(rv)) {
+    return rv;
   }
-#endif
-  return true;
+
+  aStreamFd = fd.forget();
+
+  return NS_OK;
 }
 
-void
-BluetoothUnixSocketConnector::GetSocketAddr(const sockaddr_any& aAddr,
-                                            nsAString& aAddrStr)
+nsresult
+BluetoothUnixSocketConnector::CreateStreamSocket(struct sockaddr* aAddress,
+                                                 socklen_t* aAddressLength,
+                                                 int& aStreamFd)
 {
-#ifdef MOZ_B2G_BT_BLUEZ
-  char addr[18];
-  switch (mType) {
-  case BluetoothSocketType::RFCOMM:
-    get_bdaddr_as_string((bdaddr_t*)(&aAddr.rc.rc_bdaddr), addr);
-    break;
-  case BluetoothSocketType::SCO:
-    get_bdaddr_as_string((bdaddr_t*)(&aAddr.sco.sco_bdaddr), addr);
-    break;
-  case BluetoothSocketType::L2CAP:
-  case BluetoothSocketType::EL2CAP:
-    get_bdaddr_as_string((bdaddr_t*)(&aAddr.l2.l2_bdaddr), addr);
-    break;
-  default:
-    MOZ_CRASH("Socket should be either RFCOMM or SCO!");
+  ScopedClose fd;
+
+  nsresult rv = CreateSocket(fd.rwget());
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = SetSocketFlags(fd);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  if (aAddress && aAddressLength) {
+    rv = CreateAddress(*aAddress, *aAddressLength);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
   }
-  aAddrStr.AssignASCII(addr);
-#endif
+
+  aStreamFd = fd.forget();
+
+  return NS_OK;
 }
+
+nsresult
+BluetoothUnixSocketConnector::Duplicate(UnixSocketConnector*& aConnector)
+{
+  aConnector = new BluetoothUnixSocketConnector(*this);
+
+  return NS_OK;
+}
+
+END_BLUETOOTH_NAMESPACE
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluez/BluetoothUnixSocketConnector.h firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluez/BluetoothUnixSocketConnector.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/bluez/BluetoothUnixSocketConnector.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/bluez/BluetoothUnixSocketConnector.h	2015-05-25 20:43:21.000000000 +0000
@@ -8,29 +8,50 @@
 #define mozilla_dom_bluetooth_BluetoothUnixSocketConnector_h
 
 #include "BluetoothCommon.h"
-#include <sys/socket.h>
-#include <mozilla/ipc/UnixSocketConnector.h>
+#include "mozilla/ipc/UnixSocketConnector.h"
 
 BEGIN_BLUETOOTH_NAMESPACE
 
-class BluetoothUnixSocketConnector : public mozilla::ipc::UnixSocketConnector
+class BluetoothUnixSocketConnector final
+  : public mozilla::ipc::UnixSocketConnector
 {
 public:
-  BluetoothUnixSocketConnector(BluetoothSocketType aType, int aChannel,
-                               bool aAuth, bool aEncrypt);
-  virtual ~BluetoothUnixSocketConnector()
-  {}
-  virtual int Create() override;
-  virtual bool CreateAddr(bool aIsServer,
-                          socklen_t& aAddrSize,
-                          mozilla::ipc::sockaddr_any& aAddr,
-                          const char* aAddress) override;
-  virtual bool SetUp(int aFd) override;
-  virtual bool SetUpListenSocket(int aFd) override;
-  virtual void GetSocketAddr(const mozilla::ipc::sockaddr_any& aAddr,
-                             nsAString& aAddrStr) override;
+  BluetoothUnixSocketConnector(const nsACString& aAddressString,
+                               BluetoothSocketType aType,
+                               int aChannel, bool aAuth, bool aEncrypt);
+  ~BluetoothUnixSocketConnector();
+
+  // Methods for |UnixSocketConnector|
+  //
+
+  nsresult ConvertAddressToString(const struct sockaddr& aAddress,
+                                  socklen_t aAddressLength,
+                                  nsACString& aAddressString) override;
+
+  nsresult CreateListenSocket(struct sockaddr* aAddress,
+                              socklen_t* aAddressLength,
+                              int& aListenFd) override;
+
+  nsresult AcceptStreamSocket(int aListenFd,
+                              struct sockaddr* aAddress,
+                              socklen_t* aAddressLen,
+                              int& aStreamFd) override;
+
+  nsresult CreateStreamSocket(struct sockaddr* aAddress,
+                              socklen_t* aAddressLength,
+                              int& aStreamFd) override;
+
+  nsresult Duplicate(UnixSocketConnector*& aConnector) override;
 
 private:
+  nsresult CreateSocket(int& aFd) const;
+  nsresult SetSocketFlags(int aFd) const;
+  nsresult CreateAddress(struct sockaddr& aAddress,
+                         socklen_t& aAddressLength) const;
+  static nsresult ConvertAddressString(const char* aAddressString,
+                                       bdaddr_t& aAddress);
+
+  nsCString mAddressString;
   BluetoothSocketType mType;
   int mChannel;
   bool mAuth;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/moz.build	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/moz.build	2015-05-25 20:43:21.000000000 +0000
@@ -94,6 +94,7 @@
                 'bluedroid/BluetoothAvrcpHALInterface.cpp',
                 'bluedroid/BluetoothDaemonA2dpInterface.cpp',
                 'bluedroid/BluetoothDaemonAvrcpInterface.cpp',
+                'bluedroid/BluetoothDaemonConnector.cpp',
                 'bluedroid/BluetoothDaemonHandsfreeInterface.cpp',
                 'bluedroid/BluetoothDaemonHelpers.cpp',
                 'bluedroid/BluetoothDaemonInterface.cpp',
@@ -104,6 +105,7 @@
                 'bluedroid/BluetoothHALInterface.cpp',
                 'bluedroid/BluetoothHandsfreeHALInterface.cpp',
                 'bluedroid/BluetoothOppManager.cpp',
+                'bluedroid/BluetoothPbapManager.cpp',
                 'bluedroid/BluetoothServiceBluedroid.cpp',
                 'bluedroid/BluetoothSocket.cpp',
                 'bluedroid/BluetoothSocketHALInterface.cpp',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/ObexBase.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/ObexBase.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/ObexBase.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/ObexBase.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -8,70 +8,91 @@
 
 BEGIN_BLUETOOTH_NAMESPACE
 
+//
+// Internal functions
+//
+
+/**
+ * Append byte array and length to header
+ */
 int
-AppendHeaderName(uint8_t* aRetBuf, int aBufferSize, const char* aName,
-                 int aLength)
+AppendHeader(uint8_t aHeaderId, uint8_t* aRetBuf, int aBufferSize,
+             const uint8_t* aData, int aLength)
 {
   int headerLength = aLength + 3;
 
-  aRetBuf[0] = ObexHeaderId::Name;
+  aRetBuf[0] = aHeaderId;
   aRetBuf[1] = (headerLength & 0xFF00) >> 8;
   aRetBuf[2] = headerLength & 0x00FF;
-
-  memcpy(&aRetBuf[3], aName, (aLength < aBufferSize - 3)? aLength
-                                                        : aBufferSize - 3);
+  memcpy(&aRetBuf[3], aData, (aLength < aBufferSize - 3) ? aLength
+                                                         : aBufferSize - 3);
 
   return headerLength;
 }
 
+/**
+ * Append 4-byte integer to header
+ */
 int
-AppendHeaderBody(uint8_t* aRetBuf, int aBufferSize, const uint8_t* aData,
-                 int aLength)
+AppendHeader(uint8_t aHeaderId, uint8_t* aRetBuf, int aValue)
 {
-  int headerLength = aLength + 3;
+  aRetBuf[0] = aHeaderId;
+  aRetBuf[1] = (aValue & 0xFF000000) >> 24;
+  aRetBuf[2] = (aValue & 0x00FF0000) >> 16;
+  aRetBuf[3] = (aValue & 0x0000FF00) >> 8;
+  aRetBuf[4] = aValue & 0x000000FF;
 
-  aRetBuf[0] = ObexHeaderId::Body;
-  aRetBuf[1] = (headerLength & 0xFF00) >> 8;
-  aRetBuf[2] = headerLength & 0x00FF;
+  return 5;
+}
 
-  memcpy(&aRetBuf[3], aData, (aLength < aBufferSize - 3)? aLength
-                                                        : aBufferSize - 3);
+//
+// Exposed functions
+//
 
-  return headerLength;
+int
+AppendHeaderName(uint8_t* aRetBuf, int aBufferSize, const uint8_t* aName,
+                 int aLength)
+{
+  return AppendHeader(ObexHeaderId::Name, aRetBuf, aBufferSize,
+                      aName, aLength);
 }
 
 int
-AppendHeaderEndOfBody(uint8_t* aRetBuf)
+AppendHeaderBody(uint8_t* aRetBuf, int aBufferSize, const uint8_t* aBody,
+                 int aLength)
 {
-  aRetBuf[0] = ObexHeaderId::EndOfBody;
-  aRetBuf[1] = 0x00;
-  aRetBuf[2] = 0x03;
+  return AppendHeader(ObexHeaderId::Body, aRetBuf, aBufferSize,
+                      aBody, aLength);
+}
 
-  return 3;
+int
+AppendHeaderWho(uint8_t* aRetBuf, int aBufferSize, const uint8_t* aWho,
+                int aLength)
+{
+  return AppendHeader(ObexHeaderId::Who, aRetBuf, aBufferSize,
+                      aWho, aLength);
 }
 
 int
 AppendHeaderLength(uint8_t* aRetBuf, int aObjectLength)
 {
-  aRetBuf[0] = ObexHeaderId::Length;
-  aRetBuf[1] = (aObjectLength & 0xFF000000) >> 24;
-  aRetBuf[2] = (aObjectLength & 0x00FF0000) >> 16;
-  aRetBuf[3] = (aObjectLength & 0x0000FF00) >> 8;
-  aRetBuf[4] = aObjectLength & 0x000000FF;
-
-  return 5;
+  return AppendHeader(ObexHeaderId::Length, aRetBuf, aObjectLength);
 }
 
 int
 AppendHeaderConnectionId(uint8_t* aRetBuf, int aConnectionId)
 {
-  aRetBuf[0] = ObexHeaderId::ConnectionId;
-  aRetBuf[1] = (aConnectionId & 0xFF000000) >> 24;
-  aRetBuf[2] = (aConnectionId & 0x00FF0000) >> 16;
-  aRetBuf[3] = (aConnectionId & 0x0000FF00) >> 8;
-  aRetBuf[4] = aConnectionId & 0x000000FF;
+  return AppendHeader(ObexHeaderId::ConnectionId, aRetBuf, aConnectionId);
+}
 
-  return 5;
+int
+AppendHeaderEndOfBody(uint8_t* aRetBuf)
+{
+  aRetBuf[0] = ObexHeaderId::EndOfBody;
+  aRetBuf[1] = 0x00;
+  aRetBuf[2] = 0x03;
+
+  return 3;
 }
 
 void
@@ -119,7 +140,7 @@
         break;
     }
 
-    // Length check to prevent from memory pollusion.
+    // Length check to prevent from memory pollution.
     if (ptr + contentLength > aHeaderStart + aTotalLength) {
       // Severe error occurred. We can't even believe the received data, so
       // clear all headers.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/ObexBase.h firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/ObexBase.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/bluetooth/ObexBase.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/bluetooth/ObexBase.h	2015-05-25 20:43:21.000000000 +0000
@@ -126,7 +126,7 @@
 class ObexHeaderSet
 {
 public:
-  ObexHeaderSet(uint8_t aOpcode) : mOpcode(aOpcode)
+  ObexHeaderSet()
   {
   }
 
@@ -199,31 +199,36 @@
     }
   }
 
-  void GetBodyLength(int* aRetBodyLength) const
+  void GetBody(uint8_t** aRetBody, int* aRetBodyLength) const
   {
     int length = mHeaders.Length();
+    *aRetBody = nullptr;
     *aRetBodyLength = 0;
 
     for (int i = 0; i < length; ++i) {
       if (mHeaders[i]->mId == ObexHeaderId::Body ||
           mHeaders[i]->mId == ObexHeaderId::EndOfBody) {
+        uint8_t* ptr = mHeaders[i]->mData.get();
+        *aRetBody = new uint8_t[mHeaders[i]->mDataLength];
+        memcpy(*aRetBody, ptr, mHeaders[i]->mDataLength);
         *aRetBodyLength = mHeaders[i]->mDataLength;
         return;
       }
     }
   }
 
-  void GetBody(uint8_t** aRetBody) const
+  void GetTarget(uint8_t** aRetTarget, int* aRetTargetLength) const
   {
     int length = mHeaders.Length();
-    *aRetBody = nullptr;
+    *aRetTarget = nullptr;
+    *aRetTargetLength = 0;
 
     for (int i = 0; i < length; ++i) {
-      if (mHeaders[i]->mId == ObexHeaderId::Body ||
-          mHeaders[i]->mId == ObexHeaderId::EndOfBody) {
+      if (mHeaders[i]->mId == ObexHeaderId::Target) {
         uint8_t* ptr = mHeaders[i]->mData.get();
-        *aRetBody = new uint8_t[mHeaders[i]->mDataLength];
-        memcpy(*aRetBody, ptr, mHeaders[i]->mDataLength);
+        *aRetTarget = new uint8_t[mHeaders[i]->mDataLength];
+        memcpy(*aRetTarget, ptr, mHeaders[i]->mDataLength);
+        *aRetTargetLength = mHeaders[i]->mDataLength;
         return;
       }
     }
@@ -247,17 +252,18 @@
   }
 
 private:
-  uint8_t mOpcode;
   nsTArray<nsAutoPtr<ObexHeader> > mHeaders;
 };
 
-int AppendHeaderName(uint8_t* aRetBuf, int aBufferSize, const char* aName,
+int AppendHeaderName(uint8_t* aRetBuf, int aBufferSize, const uint8_t* aName,
                      int aLength);
-int AppendHeaderBody(uint8_t* aRetBuf, int aBufferSize, const uint8_t* aData,
+int AppendHeaderBody(uint8_t* aRetBuf, int aBufferSize, const uint8_t* aBody,
                      int aLength);
-int AppendHeaderEndOfBody(uint8_t* aRetBuf);
+int AppendHeaderWho(uint8_t* aRetBuf, int aBufferSize, const uint8_t* aWho,
+                    int aLength);
 int AppendHeaderLength(uint8_t* aRetBuf, int aObjectLength);
 int AppendHeaderConnectionId(uint8_t* aRetBuf, int aConnectionId);
+int AppendHeaderEndOfBody(uint8_t* aRetBuf);
 void SetObexPacketInfo(uint8_t* aRetBuf, uint8_t aOpcode, int aPacketLength);
 
 /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/BrowserElementChildPreload.js firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/BrowserElementChildPreload.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/BrowserElementChildPreload.js	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/BrowserElementChildPreload.js	2015-05-25 20:43:21.000000000 +0000
@@ -50,9 +50,6 @@
 let CERTIFICATE_ERROR_PAGE_PREF = 'security.alternate_certificate_error_page';
 
 const OBSERVED_EVENTS = [
-  'fullscreen-origin-change',
-  'ask-parent-to-exit-fullscreen',
-  'ask-parent-to-rollback-fullscreen',
   'xpcom-shutdown',
   'activity-done'
 ];
@@ -147,6 +144,21 @@
                      /* useCapture = */ true,
                      /* wantsUntrusted = */ false);
 
+    addEventListener("MozDOMFullscreen:Entered",
+                     this._mozEnteredDomFullscreen.bind(this),
+                     /* useCapture = */ true,
+                     /* wantsUntrusted = */ false);
+
+    addEventListener("MozDOMFullscreen:NewOrigin",
+                     this._mozFullscreenOriginChange.bind(this),
+                     /* useCapture = */ true,
+                     /* wantsUntrusted = */ false);
+
+    addEventListener("MozDOMFullscreen:Exited",
+                     this._mozExitedDomFullscreen.bind(this),
+                     /* useCapture = */ true,
+                     /* wantsUntrusted = */ false);
+
     addEventListener('DOMMetaAdded',
                      this._metaChangedHandler.bind(this),
                      /* useCapture = */ true,
@@ -259,15 +271,6 @@
     if (topic == 'activity-done' && docShell !== subject)
       return;
     switch (topic) {
-      case 'fullscreen-origin-change':
-        sendAsyncMsg('fullscreen-origin-change', { _payload_: data });
-        break;
-      case 'ask-parent-to-exit-fullscreen':
-        sendAsyncMsg('exit-fullscreen');
-        break;
-      case 'ask-parent-to-rollback-fullscreen':
-        sendAsyncMsg('rollback-fullscreen');
-        break;
       case 'activity-done':
         sendAsyncMsg('activitydone', { success: (data == 'activity-success') });
         break;
@@ -956,6 +959,20 @@
     });
   },
 
+  _mozEnteredDomFullscreen: function(e) {
+    sendAsyncMsg("entered-dom-fullscreen");
+  },
+
+  _mozFullscreenOriginChange: function(e) {
+    sendAsyncMsg("fullscreen-origin-change", {
+      origin: e.target.nodePrincipal.origin
+    });
+  },
+
+  _mozExitedDomFullscreen: function(e) {
+    sendAsyncMsg("exited-dom-fullscreen");
+  },
+
   _getContentDimensions: function() {
     return {
       width: content.document.body.scrollWidth,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/BrowserElementParent.js firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/BrowserElementParent.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/BrowserElementParent.js	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/BrowserElementParent.js	2015-05-25 20:43:21.000000000 +0000
@@ -85,7 +85,6 @@
   this._pendingSetInputMethodActive = [];
   this._nextPaintListeners = [];
 
-  Services.obs.addObserver(this, 'ask-children-to-exit-fullscreen', /* ownsWeak = */ true);
   Services.obs.addObserver(this, 'oop-frameloader-crashed', /* ownsWeak = */ true);
   Services.obs.addObserver(this, 'copypaste-docommand', /* ownsWeak = */ true);
 }
@@ -130,6 +129,11 @@
     BrowserElementPromptService.mapFrameToBrowserElementParent(this._frameElement, this);
     this._setupMessageListener();
     this._registerAppManifest();
+
+    let els = Cc["@mozilla.org/eventlistenerservice;1"]
+                .getService(Ci.nsIEventListenerService);
+    els.addSystemEventListener(this._window.document, "mozfullscreenchange",
+                               this._fullscreenChange.bind(this), true);
   },
 
   _runPendingAPICall: function() {
@@ -191,9 +195,9 @@
       "got-contentdimensions": this._gotDOMRequestResult,
       "got-can-go-back": this._gotDOMRequestResult,
       "got-can-go-forward": this._gotDOMRequestResult,
-      "fullscreen-origin-change": this._remoteFullscreenOriginChange,
-      "rollback-fullscreen": this._remoteFrameFullscreenReverted,
-      "exit-fullscreen": this._exitFullscreen,
+      "entered-dom-fullscreen": this._enteredDomFullscreen,
+      "fullscreen-origin-change": this._fullscreenOriginChange,
+      "exited-dom-fullscreen": this._exitedDomFullscreen,
       "got-visible": this._gotDOMRequestResult,
       "visibilitychange": this._childVisibilityChange,
       "got-set-input-method-active": this._gotDOMRequestResult,
@@ -936,19 +940,27 @@
     this._fireEventFromMsg(data);
   },
 
-  _exitFullscreen: function() {
-    this._windowUtils.exitFullscreen();
+  _enteredDomFullscreen: function() {
+    this._windowUtils.remoteFrameFullscreenChanged(this._frameElement);
   },
 
-  _remoteFullscreenOriginChange: function(data) {
-    let origin = data.json._payload_;
-    this._windowUtils.remoteFrameFullscreenChanged(this._frameElement, origin);
+  _fullscreenOriginChange: function(data) {
+    Services.obs.notifyObservers(
+      this._frameElement, "fullscreen-origin-change", data.json.origin);
   },
 
-  _remoteFrameFullscreenReverted: function(data) {
+  _exitedDomFullscreen: function(data) {
     this._windowUtils.remoteFrameFullscreenReverted();
   },
 
+  _fullscreenChange: function(evt) {
+    if (this._isAlive() && evt.target == this._window.document) {
+      if (!this._window.document.mozFullScreen) {
+        this._sendAsyncMsg("exit-fullscreen");
+      }
+    }
+  },
+
   _fireFatalError: function() {
     let evt = this._createEvent('error', {type: 'fatal'},
                                 /* cancelable = */ false);
@@ -962,13 +974,6 @@
         this._fireFatalError();
       }
       break;
-    case 'ask-children-to-exit-fullscreen':
-      if (this._isAlive() &&
-          this._frameElement.ownerDocument == subject &&
-          this._frameLoader.QueryInterface(Ci.nsIFrameLoader).tabParent) {
-        this._sendAsyncMsg('exit-fullscreen');
-      }
-      break;
     case 'copypaste-docommand':
       if (this._isAlive() && this._frameElement.isEqualNode(subject.wrappedJSObject)) {
         this._sendAsyncMsg('do-command', { command: data });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/mochitest/browserElementTestHelpers.js firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/mochitest/browserElementTestHelpers.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/mochitest/browserElementTestHelpers.js	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/mochitest/browserElementTestHelpers.js	2015-05-25 20:43:21.000000000 +0000
@@ -53,8 +53,7 @@
       ['dom.ipc.processPriorityManager.BACKGROUND.LRUPoolLevels', 2],
       ['dom.ipc.processPriorityManager.FOREGROUND.LRUPoolLevels', 2],
       ['dom.ipc.processPriorityManager.testMode', true],
-      ['dom.ipc.processPriorityManager.enabled', true],
-      ['dom.ipc.processCount', 3]
+      ['dom.ipc.processPriorityManager.enabled', true]
     );
   },
 
@@ -223,43 +222,6 @@
           resolve();
         } else {
           reject();
-        }
-      }
-    );
-  });
-}
-
-// Returns a promise which is resolved or rejected the next time the process
-// childID delays its priority change. We resolve if the priority matches
-// expectedPriority, and we reject otherwise.
-
-function expectPriorityDelay(childID, expectedPriority) {
-  return new Promise(function(resolve, reject) {
-    var observed = false;
-    browserElementTestHelpers.addProcessPriorityObserver(
-      'process-priority-delayed',
-      function(subject, topic, data) {
-        if (observed) {
-          return;
-        }
-
-        var [id, priority] = data.split(":");
-        if (id != childID) {
-          return;
-        }
-
-        // Make sure we run the is() calls in this observer only once, otherwise
-        // we'll expect /every/ priority change to match expectedPriority.
-        observed = true;
-
-        is(priority, expectedPriority,
-           'Expected delayed priority change of childID ' + childID +
-           ' to ' + expectedPriority);
-
-        if (priority == expectedPriority) {
-          resolve();
-        } else {
-          reject();
         }
       }
     );
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/mochitest/priority/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/mochitest/priority/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/mochitest/priority/mochitest.ini	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/mochitest/priority/mochitest.ini	2015-05-25 20:43:22.000000000 +0000
@@ -27,4 +27,3 @@
 [test_WebGLContextLost.html]
 disabled = bug 865844
 support-files = file_WebGLContextLost.html
-[test_DelayedBackgroundTransition.html]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/mochitest/priority/test_Audio.html firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/mochitest/priority/test_Audio.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/mochitest/priority/test_Audio.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/mochitest/priority/test_Audio.html	2015-05-25 20:43:22.000000000 +0000
@@ -18,17 +18,6 @@
 browserElementTestHelpers.addPermission();
 browserElementTestHelpers.enableProcessPriorityManager();
 
-// ProcessPriorityManager requires at least one process in foreground
-// so that other processes can transit freely between foreground and
-// background.
-function setupTest() {
-  var foreground = document.createElement('iframe');
-  foreground.setAttribute('mozbrowser', true);
-  foreground.src = browserElementTestHelpers.emptyPage;
-  expectMozbrowserEvent(foreground, 'loadend').then(runTest);
-  document.body.appendChild(foreground);
-}
-
 function runTest() {
   var iframe = document.createElement('iframe');
   iframe.setAttribute('mozbrowser', true);
@@ -62,7 +51,7 @@
 // service.  This is controled by the media.useAudioChannelService pref.
 addEventListener('testready', function() {
   SpecialPowers.pushPrefEnv({set: [['media.useAudioChannelService', true]]},
-                            setupTest);
+                            runTest);
 });
 
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/mochitest/priority/test_Background.html firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/mochitest/priority/test_Background.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/mochitest/priority/test_Background.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/mochitest/priority/test_Background.html	2015-05-25 20:43:22.000000000 +0000
@@ -19,17 +19,6 @@
 browserElementTestHelpers.addPermission();
 browserElementTestHelpers.enableProcessPriorityManager();
 
-// ProcessPriorityManager requires at least one process in foreground
-// so that other processes can transit freely between foreground and
-// background.
-function setupTest() {
-  var foreground = document.createElement('iframe');
-  foreground.setAttribute('mozbrowser', true);
-  foreground.src = browserElementTestHelpers.emptyPage;
-  expectMozbrowserEvent(foreground, 'loadend').then(runTest);
-  document.body.appendChild(foreground);
-}
-
 function runTest() {
   var iframe = document.createElement('iframe');
   iframe.setAttribute('mozbrowser', true);
@@ -58,7 +47,7 @@
   document.body.appendChild(iframe);
 }
 
-addEventListener('testready', setupTest);
+addEventListener('testready', runTest);
 
 </script>
 </body>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/mochitest/priority/test_BackgroundLRU.html firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/mochitest/priority/test_BackgroundLRU.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/mochitest/priority/test_BackgroundLRU.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/mochitest/priority/test_BackgroundLRU.html	2015-05-25 20:43:22.000000000 +0000
@@ -20,17 +20,6 @@
 browserElementTestHelpers.enableProcessPriorityManager();
 SpecialPowers.addPermission("embed-apps", true, document);
 
-// ProcessPriorityManager requires at least one process in foreground
-// so that other processes can transit freely between foreground and
-// background.
-function setupTest() {
-  var foreground = document.createElement('iframe');
-  foreground.setAttribute('mozbrowser', true);
-  foreground.src = browserElementTestHelpers.emptyPage;
-  expectMozbrowserEvent(foreground, 'loadend').then(runTest);
-  document.body.appendChild(foreground);
-}
-
 function runTest() {
   var iframe1 = document.createElement('iframe');
   iframe1.setAttribute('mozbrowser', true);
@@ -79,7 +68,7 @@
   document.body.appendChild(iframe1);
 }
 
-addEventListener('testready', setupTest);
+addEventListener('testready', runTest);
 
 </script>
 </body>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/mochitest/priority/test_DelayedBackgroundTransition.html firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/mochitest/priority/test_DelayedBackgroundTransition.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/mochitest/priority/test_DelayedBackgroundTransition.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/mochitest/priority/test_DelayedBackgroundTransition.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-Test that a process won't transit to BACKGROUND priority unless
-there is at least one FOREGROUND process.
--->
-<head>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="../browserElementTestHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-  <script type="application/javascript;version=1.7">
-    "use strict";
-
-    SimpleTest.waitForExplicitFinish();
-    browserElementTestHelpers.setEnabledPref(true);
-    browserElementTestHelpers.addPermission();
-    browserElementTestHelpers.enableProcessPriorityManager();
-
-    function insertForegroundFrame() {
-      var foreground = document.createElement('iframe');
-      foreground.setAttribute('mozbrowser', true);
-      foreground.setAttribute('id', 'foreground');
-      foreground.src = browserElementTestHelpers.emptyPage;
-      expectMozbrowserEvent(foreground, 'loadend');
-      document.body.appendChild(foreground);
-    }
-
-    function runTest() {
-      var iframe = document.createElement('iframe');
-      iframe.setAttribute('mozbrowser', true);
-      iframe.src = browserElementTestHelpers.emptyPage;
-
-      var childID = null;
-      Promise.all([
-        expectProcessCreated('FOREGROUND').then(function(chid) {
-          childID = chid;
-        }),
-        expectMozbrowserEvent(iframe, 'loadend')
-      ]).then(function() {
-        var p = expectPriorityDelay(childID, 'BACKGROUND');
-        iframe.setVisible(false);
-        return p;
-      }).then(function() {
-        var p = expectPriorityChange(childID, 'BACKGROUND');
-        insertForegroundFrame();
-        return p;
-      }).then(function() {
-        var p = expectPriorityChange(childID, 'FOREGROUND');
-        iframe.setVisible(true);
-        return p;
-      }).then(SimpleTest.finish);
-
-      document.body.appendChild(iframe);
-    }
-
-    addEventListener('testready', runTest);
-  </script>
-</body>
-</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/mochitest/priority/test_ExpectingSystemMessage2.html firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/mochitest/priority/test_ExpectingSystemMessage2.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/mochitest/priority/test_ExpectingSystemMessage2.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/mochitest/priority/test_ExpectingSystemMessage2.html	2015-05-25 20:43:22.000000000 +0000
@@ -33,17 +33,6 @@
                                               isInBrowserElement: true });
 });
 
-// ProcessPriorityManager requires at least one process in foreground
-// so that other processes can transit freely between foreground and
-// background.
-function setupTest() {
-  var foreground = document.createElement('iframe');
-  foreground.setAttribute('mozbrowser', true);
-  foreground.src = browserElementTestHelpers.emptyPage;
-  expectMozbrowserEvent(foreground, 'loadend').then(runTest);
-  document.body.appendChild(foreground);
-}
-
 function runTest() {
   var iframe = document.createElement('iframe');
   iframe.setAttribute('mozbrowser', true);
@@ -73,7 +62,7 @@
   // set the timeout to a large value.
   SpecialPowers.pushPrefEnv(
     {set: [["dom.ipc.systemMessageCPULockTimeoutSec", 99999]]},
-    setupTest);
+    runTest);
 });
 
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/mochitest/priority/test_Keyboard.html firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/mochitest/priority/test_Keyboard.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/mochitest/priority/test_Keyboard.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/mochitest/priority/test_Keyboard.html	2015-05-25 20:43:22.000000000 +0000
@@ -19,17 +19,6 @@
 browserElementTestHelpers.addPermission();
 browserElementTestHelpers.enableProcessPriorityManager();
 
-// ProcessPriorityManager requires at least one process in foreground
-// so that other processes can transit freely between foreground and
-// background.
-function setupTest() {
-  var foreground = document.createElement('iframe');
-  foreground.setAttribute('mozbrowser', true);
-  foreground.src = browserElementTestHelpers.emptyPage;
-  expectMozbrowserEvent(foreground, 'loadend').then(runTest);
-  document.body.appendChild(foreground);
-}
-
 function runTest() {
   var iframe = document.createElement('iframe');
   iframe.setAttribute('mozbrowser', true);
@@ -59,7 +48,7 @@
   document.body.appendChild(iframe);
 }
 
-addEventListener('testready', setupTest);
+addEventListener('testready', runTest);
 
 </script>
 </body>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/mochitest/priority/test_MultipleFrames.html firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/mochitest/priority/test_MultipleFrames.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/mochitest/priority/test_MultipleFrames.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/mochitest/priority/test_MultipleFrames.html	2015-05-25 20:43:22.000000000 +0000
@@ -19,17 +19,6 @@
 browserElementTestHelpers.addPermission();
 browserElementTestHelpers.enableProcessPriorityManager();
 
-// ProcessPriorityManager requires at least one process in foreground
-// so that other processes can transit freely between foreground and
-// background.
-function setupTest() {
-  var foreground = document.createElement('iframe');
-  foreground.setAttribute('mozbrowser', true);
-  foreground.src = browserElementTestHelpers.emptyPage;
-  expectMozbrowserEvent(foreground, 'loadend').then(runTest);
-  document.body.appendChild(foreground);
-}
-
 function runTest() {
   var iframe = document.createElement('iframe');
   iframe.setAttribute('mozbrowser', true);
@@ -64,7 +53,7 @@
   document.body.appendChild(iframe);
 }
 
-addEventListener('testready', setupTest);
+addEventListener('testready', runTest);
 </script>
 </body>
 </html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/mochitest/priority/test_NestedFrames.html firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/mochitest/priority/test_NestedFrames.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/mochitest/priority/test_NestedFrames.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/mochitest/priority/test_NestedFrames.html	2015-05-25 20:43:22.000000000 +0000
@@ -32,17 +32,6 @@
                                               isInBrowserElement: true });
 });
 
-// ProcessPriorityManager requires at least one process in foreground
-// so that other processes can transit freely between foreground and
-// background.
-function setupTest() {
-  var foreground = document.createElement('iframe');
-  foreground.setAttribute('mozbrowser', true);
-  foreground.src = browserElementTestHelpers.emptyPage;
-  expectMozbrowserEvent(foreground, 'loadend').then(runTest);
-  document.body.appendChild(foreground);
-}
-
 function runTest() {
   // Set up the following hierarchy of frames:
   //
@@ -80,7 +69,7 @@
   document.body.appendChild(iframe);
 }
 
-addEventListener('testready', setupTest);
+addEventListener('testready', runTest);
 
 </script>
 </body>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/mochitest/priority/test_Visibility.html firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/mochitest/priority/test_Visibility.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/mochitest/priority/test_Visibility.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/mochitest/priority/test_Visibility.html	2015-05-25 20:43:22.000000000 +0000
@@ -18,17 +18,6 @@
 browserElementTestHelpers.addPermission();
 browserElementTestHelpers.enableProcessPriorityManager();
 
-// ProcessPriorityManager requires at least one process in foreground
-// so that other processes can transit freely between foreground and
-// background.
-function setupTest() {
-  var foreground = document.createElement('iframe');
-  foreground.setAttribute('mozbrowser', true);
-  foreground.src = browserElementTestHelpers.emptyPage;
-  expectMozbrowserEvent(foreground, 'loadend').then(runTest);
-  document.body.appendChild(foreground);
-}
-
 function runTest() {
   var iframe = document.createElement('iframe');
   iframe.setAttribute('mozbrowser', true);
@@ -57,7 +46,7 @@
   document.body.appendChild(iframe);
 }
 
-addEventListener('testready', setupTest);
+addEventListener('testready', runTest);
 </script>
 </body>
 </html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/mochitest/priority/test_WebGLContextLost.html firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/mochitest/priority/test_WebGLContextLost.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/browser-element/mochitest/priority/test_WebGLContextLost.html	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/browser-element/mochitest/priority/test_WebGLContextLost.html	2015-05-25 20:43:22.000000000 +0000
@@ -19,17 +19,6 @@
 browserElementTestHelpers.addPermission();
 browserElementTestHelpers.enableProcessPriorityManager();
 
-// ProcessPriorityManager requires at least one process in foreground
-// so that other processes can transit freely between foreground and
-// background.
-function setupTest() {
-  var foreground = document.createElement('iframe');
-  foreground.setAttribute('mozbrowser', true);
-  foreground.src = browserElementTestHelpers.emptyPage;
-  expectMozbrowserEvent(foreground, 'loadend').then(runTest);
-  document.body.appendChild(foreground);
-}
-
 function runTest() {
   var iframe = document.createElement('iframe');
   iframe.setAttribute('mozbrowser', true);
@@ -102,7 +91,7 @@
   // shouldn't hurt things, and anyway this setting mirrors what we do on B2G,
   // which is what we're trying to test!
   SpecialPowers.pushPrefEnv({set: [["webgl.force-enabled", true]]},
-                            setupTest);
+                            runTest);
 });
 
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/cache/Context.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/cache/Context.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/cache/Context.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/cache/Context.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -464,7 +464,7 @@
     // mData may be nullptr
     MOZ_ASSERT(mTarget);
     MOZ_ASSERT(mAction);
-    MOZ_ASSERT(mQuotaInfo.mDir);
+    // mQuotaInfo.mDir may be nullptr if QuotaInitRunnable failed
     MOZ_ASSERT(mInitiatingThread);
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/cache/DBAction.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/cache/DBAction.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/cache/DBAction.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/cache/DBAction.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -54,6 +54,12 @@
     return;
   }
 
+  rv = dbDir->Append(NS_LITERAL_STRING("cache"));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    aResolver->Resolve(rv);
+    return;
+  }
+
   nsCOMPtr<mozIStorageConnection> conn;
 
   // Attempt to reuse the connection opened by a previous Action.
@@ -63,12 +69,6 @@
 
   // If there is no previous Action, then we must open one.
   if (!conn) {
-    rv = dbDir->Append(NS_LITERAL_STRING("cache"));
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      aResolver->Resolve(rv);
-      return;
-    }
-
     rv = OpenConnection(aQuotaInfo, dbDir, getter_AddRefs(conn));
     if (NS_WARN_IF(NS_FAILED(rv))) {
       aResolver->Resolve(rv);
@@ -187,6 +187,9 @@
   nsresult rv = aDBFile->Remove(false);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
+  // Note, the -wal journal file will be automatically deleted by sqlite when
+  // the new database is created.  No need to explicitly delete it here.
+
   // Delete the morgue as well.
   rv = BodyDeleteDir(aDBDir);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/cache/DBSchema.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/cache/DBSchema.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/cache/DBSchema.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/cache/DBSchema.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -18,6 +18,7 @@
 #include "nsTArray.h"
 #include "nsCRT.h"
 #include "nsHttp.h"
+#include "nsICryptoHash.h"
 #include "mozilla/dom/HeadersBinding.h"
 #include "mozilla/dom/RequestBinding.h"
 #include "mozilla/dom/ResponseBinding.h"
@@ -28,11 +29,11 @@
 namespace cache {
 namespace db {
 
-const int32_t kMaxWipeSchemaVersion = 7;
+const int32_t kMaxWipeSchemaVersion = 9;
 
 namespace {
 
-const int32_t kLatestSchemaVersion = 7;
+const int32_t kLatestSchemaVersion = 9;
 const int32_t kMaxEntriesPerStatement = 255;
 
 } // anonymous namespace
@@ -151,6 +152,14 @@
 
 typedef int32_t EntryId;
 
+struct IdCount
+{
+  IdCount() : mId(-1), mCount(0) { }
+  explicit IdCount(int32_t aId) : mId(aId), mCount(1) { }
+  int32_t mId;
+  int32_t mCount;
+};
+
 static nsresult QueryAll(mozIStorageConnection* aConn, CacheId aCacheId,
                          nsTArray<EntryId>& aEntryIdListOut);
 static nsresult QueryCache(mozIStorageConnection* aConn, CacheId aCacheId,
@@ -164,7 +173,14 @@
 static nsresult DeleteEntries(mozIStorageConnection* aConn,
                               const nsTArray<EntryId>& aEntryIdList,
                               nsTArray<nsID>& aDeletedBodyIdListOut,
+                              nsTArray<IdCount>& aDeletedSecurityIdListOut,
                               uint32_t aPos=0, int32_t aLen=-1);
+static nsresult InsertSecurity(mozIStorageConnection* aConn,
+                               const nsACString& aData, int32_t *aIdOut);
+static nsresult DeleteSecurityInfo(mozIStorageConnection* aConn, int32_t aId,
+                                   int32_t aCount);
+static nsresult DeleteSecurityInfoList(mozIStorageConnection* aConn,
+                                       const nsTArray<IdCount>& aDeletedStorageIdList);
 static nsresult InsertEntry(mozIStorageConnection* aConn, CacheId aCacheId,
                             const CacheRequest& aRequest,
                             const nsID* aRequestBodyId,
@@ -181,10 +197,14 @@
 static nsresult BindListParamsToQuery(mozIStorageStatement* aState,
                                       const nsTArray<EntryId>& aEntryIdList,
                                       uint32_t aPos, int32_t aLen);
-static nsresult BindId(mozIStorageStatement* aState, uint32_t aPos,
+static nsresult BindId(mozIStorageStatement* aState, const nsACString& aName,
                        const nsID* aId);
 static nsresult ExtractId(mozIStorageStatement* aState, uint32_t aPos,
                           nsID* aIdOut);
+static nsresult CreateAndBindKeyStatement(mozIStorageConnection* aConn,
+                                          const char* aQueryFormat,
+                                          const nsAString& aKey,
+                                          mozIStorageStatement** aStateOut);
 } // anonymous namespace
 
 nsresult
@@ -241,6 +261,24 @@
     ));
     if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
+    // Security blobs are quite large and duplicated for every Response from
+    // the same https origin.  This table is used to de-duplicate this data.
+    rv = aConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+      "CREATE TABLE security_info ("
+        "id INTEGER NOT NULL PRIMARY KEY, "
+        "hash BLOB NOT NULL, "  // first 8-bytes of the sha1 hash of data column
+        "data BLOB NOT NULL, "  // full security info data, usually a few KB
+        "refcount INTEGER NOT NULL"
+      ");"
+    ));
+    if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+    // Index the smaller hash value instead of the large security data blob.
+    rv = aConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+      "CREATE INDEX security_info_hash_index ON security_info (hash);"
+    ));
+    if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
     rv = aConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
       "CREATE TABLE entries ("
         "id INTEGER NOT NULL PRIMARY KEY, "
@@ -261,7 +299,7 @@
         "response_status_text TEXT NOT NULL, "
         "response_headers_guard INTEGER NOT NULL, "
         "response_body_id TEXT NULL, "
-        "response_security_info BLOB NULL, "
+        "response_security_info_id INTEGER NULL REFERENCES security_info(id), "
         "cache_id INTEGER NOT NULL REFERENCES caches(id) ON DELETE CASCADE"
       ");"
     ));
@@ -343,12 +381,12 @@
   // need to happen regardless of the schema.
 
   nsAutoCString pragmas(
-#if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GONK)
-    // Switch the journaling mode to TRUNCATE to avoid changing the directory
-    // structure at the conclusion of every transaction for devices with slower
-    // file systems.
-    "PRAGMA journal_mode = TRUNCATE; "
-#endif
+    "PRAGMA journal_mode = WAL; "
+    // Use default mozStorage 32kb page size for now
+    // WAL journal can grow to 512kb before being flushed to disk
+    "PRAGMA wal_autocheckpoint = 16; "
+    // Always truncate the journal back to 512kb after large transactions
+    "PRAGMA journal_size_limit = 524288; "
     "PRAGMA foreign_keys = ON; "
 
     // Note, the default encoding of UTF-8 is preferred.  mozStorage does all
@@ -406,17 +444,22 @@
   nsresult rv = QueryAll(aConn, aCacheId, matches);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = DeleteEntries(aConn, matches, aDeletedBodyIdListOut);
+  nsAutoTArray<IdCount, 16> deletedSecurityIdList;
+  rv = DeleteEntries(aConn, matches, aDeletedBodyIdListOut,
+                     deletedSecurityIdList);
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  rv = DeleteSecurityInfoList(aConn, deletedSecurityIdList);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
   // Delete the remainder of the cache using cascade semantics.
   nsCOMPtr<mozIStorageStatement> state;
   rv = aConn->CreateStatement(NS_LITERAL_CSTRING(
-    "DELETE FROM caches WHERE id=?1;"
+    "DELETE FROM caches WHERE id=:id;"
   ), getter_AddRefs(state));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindInt64Parameter(0, aCacheId);
+  rv = state->BindInt64ByName(NS_LITERAL_CSTRING("id"), aCacheId);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
   rv = state->Execute();
@@ -438,11 +481,11 @@
 
   nsCOMPtr<mozIStorageStatement> state;
   nsresult rv = aConn->CreateStatement(NS_LITERAL_CSTRING(
-    "SELECT COUNT(*) FROM storage WHERE cache_id=?1;"
+    "SELECT COUNT(*) FROM storage WHERE cache_id=:cache_id;"
   ), getter_AddRefs(state));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindInt64Parameter(0, aCacheId);
+  rv = state->BindInt64ByName(NS_LITERAL_CSTRING("cache_id"), aCacheId);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
   bool hasMoreData = false;
@@ -538,13 +581,20 @@
   nsresult rv = QueryCache(aConn, aCacheId, aRequest, params, matches);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = DeleteEntries(aConn, matches, aDeletedBodyIdListOut);
+  nsAutoTArray<IdCount, 16> deletedSecurityIdList;
+  rv = DeleteEntries(aConn, matches, aDeletedBodyIdListOut,
+                     deletedSecurityIdList);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
   rv = InsertEntry(aConn, aCacheId, aRequest, aRequestBodyId, aResponse,
                    aResponseBodyId);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
+  // Delete the security values after doing the insert to avoid churning
+  // the security table when its not necessary.
+  rv = DeleteSecurityInfoList(aConn, deletedSecurityIdList);
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
   return rv;
 }
 
@@ -568,7 +618,12 @@
     return rv;
   }
 
-  rv = DeleteEntries(aConn, matches, aDeletedBodyIdListOut);
+  nsAutoTArray<IdCount, 16> deletedSecurityIdList;
+  rv = DeleteEntries(aConn, matches, aDeletedBodyIdListOut,
+                     deletedSecurityIdList);
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  rv = DeleteSecurityInfoList(aConn, deletedSecurityIdList);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
   *aSuccessOut = true;
@@ -646,11 +701,11 @@
 
   nsCOMPtr<mozIStorageStatement> state;
   rv = aConn->CreateStatement(NS_LITERAL_CSTRING(
-    "SELECT cache_id FROM storage WHERE namespace=?1 ORDER BY rowid;"
+    "SELECT cache_id FROM storage WHERE namespace=:namespace ORDER BY rowid;"
   ), getter_AddRefs(state));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindInt32Parameter(0, aNamespace);
+  rv = state->BindInt32ByName(NS_LITERAL_CSTRING("namespace"), aNamespace);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
   nsAutoTArray<CacheId, 32> cacheIdList;
@@ -690,17 +745,19 @@
 
   *aFoundCacheOut = false;
 
-  // Use IS for matching the key since an EmptryString() key maps to NULL.
-  nsCOMPtr<mozIStorageStatement> state;
-  nsresult rv = aConn->CreateStatement(NS_LITERAL_CSTRING(
-    "SELECT cache_id FROM storage WHERE namespace=?1 AND key IS ?2 ORDER BY rowid;"
-  ), getter_AddRefs(state));
-  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+  // How we constrain the key column depends on the value of our key.  Use
+  // a format string for the query and let CreateAndBindKeyStatement() fill
+  // it in for us.
+  const char* query = "SELECT cache_id FROM storage "
+                      "WHERE namespace=:namespace AND %s "
+                      "ORDER BY rowid;";
 
-  rv = state->BindInt32Parameter(0, aNamespace);
+  nsCOMPtr<mozIStorageStatement> state;
+  nsresult rv = CreateAndBindKeyStatement(aConn, query, aKey,
+                                          getter_AddRefs(state));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindStringAsBlobParameter(1, aKey);
+  rv = state->BindInt32ByName(NS_LITERAL_CSTRING("namespace"), aNamespace);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
   bool hasMoreData = false;
@@ -727,17 +784,18 @@
 
   nsCOMPtr<mozIStorageStatement> state;
   nsresult rv = aConn->CreateStatement(NS_LITERAL_CSTRING(
-    "INSERT INTO storage (namespace, key, cache_id) VALUES(?1, ?2, ?3);"
+    "INSERT INTO storage (namespace, key, cache_id) "
+                 "VALUES (:namespace, :key, :cache_id);"
   ), getter_AddRefs(state));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindInt32Parameter(0, aNamespace);
+  rv = state->BindInt32ByName(NS_LITERAL_CSTRING("namespace"), aNamespace);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindStringAsBlobParameter(1, aKey);
+  rv = state->BindStringAsBlobByName(NS_LITERAL_CSTRING("key"), aKey);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindInt64Parameter(2, aCacheId);
+  rv = state->BindInt64ByName(NS_LITERAL_CSTRING("cache_id"), aCacheId);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
   rv = state->Execute();
@@ -753,17 +811,17 @@
   MOZ_ASSERT(!NS_IsMainThread());
   MOZ_ASSERT(aConn);
 
-  // Use IS for matching the key since an EmptryString() key maps to NULL.
-  nsCOMPtr<mozIStorageStatement> state;
-  nsresult rv = aConn->CreateStatement(NS_LITERAL_CSTRING(
-    "DELETE FROM storage WHERE namespace=?1 AND key IS ?2;"
-  ), getter_AddRefs(state));
-  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+  // How we constrain the key column depends on the value of our key.  Use
+  // a format string for the query and let CreateAndBindKeyStatement() fill
+  // it in for us.
+  const char *query = "DELETE FROM storage WHERE namespace=:namespace AND %s;";
 
-  rv = state->BindInt32Parameter(0, aNamespace);
+  nsCOMPtr<mozIStorageStatement> state;
+  nsresult rv = CreateAndBindKeyStatement(aConn, query, aKey,
+                                          getter_AddRefs(state));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindStringAsBlobParameter(1, aKey);
+  rv = state->BindInt32ByName(NS_LITERAL_CSTRING("namespace"), aNamespace);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
   rv = state->Execute();
@@ -781,11 +839,11 @@
 
   nsCOMPtr<mozIStorageStatement> state;
   nsresult rv = aConn->CreateStatement(NS_LITERAL_CSTRING(
-    "SELECT key FROM storage WHERE namespace=?1 ORDER BY rowid;"
+    "SELECT key FROM storage WHERE namespace=:namespace ORDER BY rowid;"
   ), getter_AddRefs(state));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindInt32Parameter(0, aNamespace);
+  rv = state->BindInt32ByName(NS_LITERAL_CSTRING("namespace"), aNamespace);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
   bool hasMoreData = false;
@@ -811,11 +869,11 @@
 
   nsCOMPtr<mozIStorageStatement> state;
   nsresult rv = aConn->CreateStatement(NS_LITERAL_CSTRING(
-    "SELECT id FROM entries WHERE cache_id=?1 ORDER BY id;"
+    "SELECT id FROM entries WHERE cache_id=:cache_id ORDER BY id;"
   ), getter_AddRefs(state));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindInt64Parameter(0, aCacheId);
+  rv = state->BindInt64ByName(NS_LITERAL_CSTRING("cache_id"), aCacheId);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
   bool hasMoreData = false;
@@ -851,7 +909,7 @@
     "FROM entries "
     "LEFT OUTER JOIN response_headers ON entries.id=response_headers.entry_id "
                                     "AND response_headers.name='vary' "
-    "WHERE entries.cache_id=?1 "
+    "WHERE entries.cache_id=:cache_id "
       "AND entries."
   );
 
@@ -864,16 +922,16 @@
     query.AppendLiteral("request_url");
   }
 
-  query.AppendLiteral("=?2 GROUP BY entries.id ORDER BY entries.id;");
+  query.AppendLiteral("=:url GROUP BY entries.id ORDER BY entries.id;");
 
   nsCOMPtr<mozIStorageStatement> state;
   nsresult rv = aConn->CreateStatement(query, getter_AddRefs(state));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindInt64Parameter(0, aCacheId);
+  rv = state->BindInt64ByName(NS_LITERAL_CSTRING("cache_id"), aCacheId);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindStringParameter(1, urlToMatch);
+  rv = state->BindStringByName(NS_LITERAL_CSTRING("url"), urlToMatch);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
   bool hasMoreData = false;
@@ -919,11 +977,11 @@
   nsCOMPtr<mozIStorageStatement> state;
   nsresult rv = aConn->CreateStatement(NS_LITERAL_CSTRING(
     "SELECT value FROM response_headers "
-    "WHERE name='vary' AND entry_id=?1;"
+    "WHERE name='vary' AND entry_id=:entry_id;"
   ), getter_AddRefs(state));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindInt32Parameter(0, entryId);
+  rv = state->BindInt32ByName(NS_LITERAL_CSTRING("entry_id"), entryId);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
   nsAutoTArray<nsCString, 8> varyValues;
@@ -943,11 +1001,11 @@
   state->Reset();
   rv = aConn->CreateStatement(NS_LITERAL_CSTRING(
     "SELECT name, value FROM request_headers "
-    "WHERE entry_id=?1;"
+    "WHERE entry_id=:entry_id;"
   ), getter_AddRefs(state));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindInt32Parameter(0, entryId);
+  rv = state->BindInt32ByName(NS_LITERAL_CSTRING("entry_id"), entryId);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
   nsRefPtr<InternalHeaders> cachedHeaders =
@@ -1022,6 +1080,7 @@
 DeleteEntries(mozIStorageConnection* aConn,
               const nsTArray<EntryId>& aEntryIdList,
               nsTArray<nsID>& aDeletedBodyIdListOut,
+              nsTArray<IdCount>& aDeletedSecurityIdListOut,
               uint32_t aPos, int32_t aLen)
 {
   MOZ_ASSERT(!NS_IsMainThread());
@@ -1046,7 +1105,7 @@
       int32_t max = kMaxEntriesPerStatement;
       int32_t curLen = std::min(max, remaining);
       nsresult rv = DeleteEntries(aConn, aEntryIdList, aDeletedBodyIdListOut,
-                                  curPos, curLen);
+                                  aDeletedSecurityIdListOut, curPos, curLen);
       if (NS_FAILED(rv)) { return rv; }
 
       curPos += curLen;
@@ -1057,7 +1116,8 @@
 
   nsCOMPtr<mozIStorageStatement> state;
   nsAutoCString query(
-    "SELECT request_body_id, response_body_id FROM entries WHERE id IN ("
+    "SELECT request_body_id, response_body_id, response_security_info_id "
+    "FROM entries WHERE id IN ("
   );
   AppendListParamsToQuery(query, aEntryIdList, aPos, aLen);
   query.AppendLiteral(")");
@@ -1084,6 +1144,33 @@
         aDeletedBodyIdListOut.AppendElement(id);
       }
     }
+
+    // and then a possible third entry for the security id
+    bool isNull = false;
+    rv = state->GetIsNull(2, &isNull);
+    if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+    if (!isNull) {
+      int32_t securityId = -1;
+      rv = state->GetInt32(2, &securityId);
+      if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+      // First try to increment the count for this ID if we're already
+      // seen it
+      bool found = false;
+      for (uint32_t i = 0; i < aDeletedSecurityIdListOut.Length(); ++i) {
+        if (aDeletedSecurityIdListOut[i].mId == securityId) {
+          found = true;
+          aDeletedSecurityIdListOut[i].mCount += 1;
+          break;
+        }
+      }
+
+      // Otherwise add a new entry for this ID with a count of 1
+      if (!found) {
+        aDeletedSecurityIdListOut.AppendElement(IdCount(securityId));
+      }
+    }
   }
 
   // Dependent records removed via ON DELETE CASCADE
@@ -1107,6 +1194,194 @@
 }
 
 nsresult
+InsertSecurity(mozIStorageConnection* aConn, const nsACString& aData,
+               int32_t *aIdOut)
+{
+  MOZ_ASSERT(aConn);
+  MOZ_ASSERT(aIdOut);
+  MOZ_ASSERT(!aData.IsEmpty());
+
+  // We want to use an index to find existing security blobs, but indexing
+  // the full blob would be quite expensive.  Instead, we index a small
+  // hash value.  Calculate this hash as the first 8 bytes of the SHA1 of
+  // the full data.
+  nsresult rv;
+  nsCOMPtr<nsICryptoHash> crypto =
+    do_CreateInstance(NS_CRYPTO_HASH_CONTRACTID, &rv);
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  rv = crypto->Init(nsICryptoHash::SHA1);
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  rv = crypto->Update(reinterpret_cast<const uint8_t*>(aData.BeginReading()),
+                      aData.Length());
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  nsAutoCString fullHash;
+  rv = crypto->Finish(false /* based64 result */, fullHash);
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  nsDependentCSubstring hash(fullHash, 0, 8);
+
+  // Next, search for an existing entry for this blob by comparing the hash
+  // value first and then the full data.  SQLite is smart enough to use
+  // the index on the hash to search the table before doing the expensive
+  // comparison of the large data column.  (This was verified with EXPLAIN.)
+  nsCOMPtr<mozIStorageStatement> state;
+  rv = aConn->CreateStatement(NS_LITERAL_CSTRING(
+    // Note that hash and data are blobs, but we can use = here since the
+    // columns are NOT NULL.
+    "SELECT id, refcount FROM security_info WHERE hash=:hash AND data=:data;"
+  ), getter_AddRefs(state));
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  rv = state->BindUTF8StringAsBlobByName(NS_LITERAL_CSTRING("hash"), hash);
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  rv = state->BindUTF8StringAsBlobByName(NS_LITERAL_CSTRING("data"), aData);
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  bool hasMoreData = false;
+  rv = state->ExecuteStep(&hasMoreData);
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  // This security info blob is already in the database
+  if (hasMoreData) {
+    // get the existing security blob id to return
+    rv = state->GetInt32(0, aIdOut);
+    if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+    int32_t refcount = -1;
+    rv = state->GetInt32(1, &refcount);
+    if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+    // But first, update the refcount in the database.
+    refcount += 1;
+
+    rv = aConn->CreateStatement(NS_LITERAL_CSTRING(
+      "UPDATE security_info SET refcount=:refcount WHERE id=:id;"
+    ), getter_AddRefs(state));
+    if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+    rv = state->BindInt32ByName(NS_LITERAL_CSTRING("refcount"), refcount);
+    if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+    rv = state->BindInt32ByName(NS_LITERAL_CSTRING("id"), *aIdOut);
+    if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+    rv = state->Execute();
+    if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+    return NS_OK;
+  }
+
+  // This is a new security info blob.  Create a new row in the security table
+  // with an initial refcount of 1.
+  rv = aConn->CreateStatement(NS_LITERAL_CSTRING(
+    "INSERT INTO security_info (hash, data, refcount) VALUES (:hash, :data, 1);"
+  ), getter_AddRefs(state));
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  rv = state->BindUTF8StringAsBlobByName(NS_LITERAL_CSTRING("hash"), hash);
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  rv = state->BindUTF8StringAsBlobByName(NS_LITERAL_CSTRING("data"), aData);
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  rv = state->Execute();
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  rv = aConn->CreateStatement(NS_LITERAL_CSTRING(
+    "SELECT last_insert_rowid()"
+  ), getter_AddRefs(state));
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  hasMoreData = false;
+  rv = state->ExecuteStep(&hasMoreData);
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  rv = state->GetInt32(0, aIdOut);
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  return NS_OK;
+}
+
+nsresult
+DeleteSecurityInfo(mozIStorageConnection* aConn, int32_t aId, int32_t aCount)
+{
+  // First, we need to determine the current refcount for this security blob.
+  nsCOMPtr<mozIStorageStatement> state;
+  nsresult rv = aConn->CreateStatement(NS_LITERAL_CSTRING(
+    "SELECT refcount FROM security_info WHERE id=:id;"
+  ), getter_AddRefs(state));
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  rv = state->BindInt32ByName(NS_LITERAL_CSTRING("id"), aId);
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  bool hasMoreData = false;
+  rv = state->ExecuteStep(&hasMoreData);
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  int32_t refcount = -1;
+  rv = state->GetInt32(0, &refcount);
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  MOZ_ASSERT(refcount >= aCount);
+
+  // Next, calculate the new refcount
+  int32_t newCount = refcount - aCount;
+
+  // If the last reference to this security blob was removed we can
+  // just remove the entire row.
+  if (newCount == 0) {
+    rv = aConn->CreateStatement(NS_LITERAL_CSTRING(
+      "DELETE FROM security_info WHERE id=:id;"
+    ), getter_AddRefs(state));
+    if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+    rv = state->BindInt32ByName(NS_LITERAL_CSTRING("id"), aId);
+    if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+    rv = state->Execute();
+    if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+    return NS_OK;
+  }
+
+  // Otherwise update the refcount in the table to reflect the reduced
+  // number of references to the security blob.
+  rv = aConn->CreateStatement(NS_LITERAL_CSTRING(
+    "UPDATE security_info SET refcount=:refcount WHERE id=:id;"
+  ), getter_AddRefs(state));
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  rv = state->BindInt32ByName(NS_LITERAL_CSTRING("refcount"), newCount);
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  rv = state->BindInt32ByName(NS_LITERAL_CSTRING("id"), aId);
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  rv = state->Execute();
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  return NS_OK;
+}
+
+nsresult
+DeleteSecurityInfoList(mozIStorageConnection* aConn,
+                        const nsTArray<IdCount>& aDeletedStorageIdList)
+{
+  for (uint32_t i = 0; i < aDeletedStorageIdList.Length(); ++i) {
+    nsresult rv = DeleteSecurityInfo(aConn, aDeletedStorageIdList[i].mId,
+                                     aDeletedStorageIdList[i].mCount);
+    if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+  }
+
+  return NS_OK;
+}
+
+nsresult
 InsertEntry(mozIStorageConnection* aConn, CacheId aCacheId,
             const CacheRequest& aRequest,
             const nsID* aRequestBodyId,
@@ -1116,8 +1391,16 @@
   MOZ_ASSERT(!NS_IsMainThread());
   MOZ_ASSERT(aConn);
 
+  nsresult rv = NS_OK;
+  int32_t securityId = -1;
+
+  if (!aResponse.securityInfo().IsEmpty()) {
+    rv = InsertSecurity(aConn, aResponse.securityInfo(), &securityId);
+    if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+  }
+
   nsCOMPtr<mozIStorageStatement> state;
-  nsresult rv = aConn->CreateStatement(NS_LITERAL_CSTRING(
+  rv = aConn->CreateStatement(NS_LITERAL_CSTRING(
     "INSERT INTO entries ("
       "request_method, "
       "request_url, "
@@ -1136,73 +1419,107 @@
       "response_status_text, "
       "response_headers_guard, "
       "response_body_id, "
-      "response_security_info, "
+      "response_security_info_id, "
       "cache_id "
-    ") VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15, ?16, ?17, ?18, ?19)"
+    ") VALUES ("
+      ":request_method, "
+      ":request_url, "
+      ":request_url_no_query, "
+      ":request_referrer, "
+      ":request_headers_guard, "
+      ":request_mode, "
+      ":request_credentials, "
+      ":request_contentpolicytype, "
+      ":request_context, "
+      ":request_cache, "
+      ":request_body_id, "
+      ":response_type, "
+      ":response_url, "
+      ":response_status, "
+      ":response_status_text, "
+      ":response_headers_guard, "
+      ":response_body_id, "
+      ":response_security_info_id, "
+      ":cache_id "
+    ");"
   ), getter_AddRefs(state));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindUTF8StringParameter(0, aRequest.method());
+  rv = state->BindUTF8StringByName(NS_LITERAL_CSTRING("request_method"),
+                                   aRequest.method());
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindStringParameter(1, aRequest.url());
+  rv = state->BindStringByName(NS_LITERAL_CSTRING("request_url"),
+                               aRequest.url());
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindStringParameter(2, aRequest.urlWithoutQuery());
+  rv = state->BindStringByName(NS_LITERAL_CSTRING("request_url_no_query"),
+                               aRequest.urlWithoutQuery());
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindStringParameter(3, aRequest.referrer());
+  rv = state->BindStringByName(NS_LITERAL_CSTRING("request_referrer"),
+                               aRequest.referrer());
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindInt32Parameter(4,
+  rv = state->BindInt32ByName(NS_LITERAL_CSTRING("request_headers_guard"),
     static_cast<int32_t>(aRequest.headersGuard()));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindInt32Parameter(5, static_cast<int32_t>(aRequest.mode()));
+  rv = state->BindInt32ByName(NS_LITERAL_CSTRING("request_mode"),
+                              static_cast<int32_t>(aRequest.mode()));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindInt32Parameter(6,
+  rv = state->BindInt32ByName(NS_LITERAL_CSTRING("request_credentials"),
     static_cast<int32_t>(aRequest.credentials()));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindInt32Parameter(7,
+  rv = state->BindInt32ByName(NS_LITERAL_CSTRING("request_contentpolicytype"),
     static_cast<int32_t>(aRequest.contentPolicyType()));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindInt32Parameter(8,
+  rv = state->BindInt32ByName(NS_LITERAL_CSTRING("request_context"),
     static_cast<int32_t>(aRequest.context()));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindInt32Parameter(9,
+  rv = state->BindInt32ByName(NS_LITERAL_CSTRING("request_cache"),
     static_cast<int32_t>(aRequest.requestCache()));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = BindId(state, 10, aRequestBodyId);
+  rv = BindId(state, NS_LITERAL_CSTRING("request_body_id"), aRequestBodyId);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindInt32Parameter(11, static_cast<int32_t>(aResponse.type()));
+  rv = state->BindInt32ByName(NS_LITERAL_CSTRING("response_type"),
+                              static_cast<int32_t>(aResponse.type()));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindStringParameter(12, aResponse.url());
+  rv = state->BindStringByName(NS_LITERAL_CSTRING("response_url"),
+                               aResponse.url());
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindInt32Parameter(13, aResponse.status());
+  rv = state->BindInt32ByName(NS_LITERAL_CSTRING("response_status"),
+                              aResponse.status());
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindUTF8StringParameter(14, aResponse.statusText());
+  rv = state->BindUTF8StringByName(NS_LITERAL_CSTRING("response_status_text"),
+                                   aResponse.statusText());
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindInt32Parameter(15,
+  rv = state->BindInt32ByName(NS_LITERAL_CSTRING("response_headers_guard"),
     static_cast<int32_t>(aResponse.headersGuard()));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = BindId(state, 16, aResponseBodyId);
+  rv = BindId(state, NS_LITERAL_CSTRING("response_body_id"), aResponseBodyId);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindUTF8StringAsBlobParameter(17, aResponse.securityInfo());
+  if (aResponse.securityInfo().IsEmpty()) {
+    rv = state->BindNullByName(NS_LITERAL_CSTRING("response_security_info_id"));
+  } else {
+    rv = state->BindInt32ByName(NS_LITERAL_CSTRING("response_security_info_id"),
+                                securityId);
+  }
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindInt64Parameter(18, aCacheId);
+  rv = state->BindInt64ByName(NS_LITERAL_CSTRING("cache_id"), aCacheId);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
   rv = state->Execute();
@@ -1226,19 +1543,21 @@
       "name, "
       "value, "
       "entry_id "
-    ") VALUES (?1, ?2, ?3)"
+    ") VALUES (:name, :value, :entry_id)"
   ), getter_AddRefs(state));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
   const nsTArray<HeadersEntry>& requestHeaders = aRequest.headers();
   for (uint32_t i = 0; i < requestHeaders.Length(); ++i) {
-    rv = state->BindUTF8StringParameter(0, requestHeaders[i].name());
+    rv = state->BindUTF8StringByName(NS_LITERAL_CSTRING("name"),
+                                     requestHeaders[i].name());
     if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-    rv = state->BindUTF8StringParameter(1, requestHeaders[i].value());
+    rv = state->BindUTF8StringByName(NS_LITERAL_CSTRING("value"),
+                                     requestHeaders[i].value());
     if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-    rv = state->BindInt32Parameter(2, entryId);
+    rv = state->BindInt32ByName(NS_LITERAL_CSTRING("entry_id"), entryId);
     if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
     rv = state->Execute();
@@ -1250,19 +1569,21 @@
       "name, "
       "value, "
       "entry_id "
-    ") VALUES (?1, ?2, ?3)"
+    ") VALUES (:name, :value, :entry_id)"
   ), getter_AddRefs(state));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
   const nsTArray<HeadersEntry>& responseHeaders = aResponse.headers();
   for (uint32_t i = 0; i < responseHeaders.Length(); ++i) {
-    rv = state->BindUTF8StringParameter(0, responseHeaders[i].name());
+    rv = state->BindUTF8StringByName(NS_LITERAL_CSTRING("name"),
+                                     responseHeaders[i].name());
     if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-    rv = state->BindUTF8StringParameter(1, responseHeaders[i].value());
+    rv = state->BindUTF8StringByName(NS_LITERAL_CSTRING("value"),
+                                     responseHeaders[i].value());
     if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-    rv = state->BindInt32Parameter(2, entryId);
+    rv = state->BindInt32ByName(NS_LITERAL_CSTRING("entry_id"), entryId);
     if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
     rv = state->Execute();
@@ -1283,19 +1604,21 @@
   nsCOMPtr<mozIStorageStatement> state;
   nsresult rv = aConn->CreateStatement(NS_LITERAL_CSTRING(
     "SELECT "
-      "response_type, "
-      "response_url, "
-      "response_status, "
-      "response_status_text, "
-      "response_headers_guard, "
-      "response_body_id, "
-      "response_security_info "
+      "entries.response_type, "
+      "entries.response_url, "
+      "entries.response_status, "
+      "entries.response_status_text, "
+      "entries.response_headers_guard, "
+      "entries.response_body_id, "
+      "security_info.data "
     "FROM entries "
-    "WHERE id=?1;"
+    "LEFT OUTER JOIN security_info "
+    "ON entries.response_security_info_id=security_info.id "
+    "WHERE entries.id=:id;"
   ), getter_AddRefs(state));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindInt32Parameter(0, aEntryId);
+  rv = state->BindInt32ByName(NS_LITERAL_CSTRING("id"), aEntryId);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
   bool hasMoreData = false;
@@ -1342,11 +1665,11 @@
       "name, "
       "value "
     "FROM response_headers "
-    "WHERE entry_id=?1;"
+    "WHERE entry_id=:entry_id;"
   ), getter_AddRefs(state));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindInt32Parameter(0, aEntryId);
+  rv = state->BindInt32ByName(NS_LITERAL_CSTRING("entry_id"), aEntryId);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
   while (NS_SUCCEEDED(state->ExecuteStep(&hasMoreData)) && hasMoreData) {
@@ -1387,11 +1710,11 @@
       "request_cache, "
       "request_body_id "
     "FROM entries "
-    "WHERE id=?1;"
+    "WHERE id=:id;"
   ), getter_AddRefs(state));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindInt32Parameter(0, aEntryId);
+  rv = state->BindInt32ByName(NS_LITERAL_CSTRING("id"), aEntryId);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
   bool hasMoreData = false;
@@ -1460,11 +1783,11 @@
       "name, "
       "value "
     "FROM request_headers "
-    "WHERE entry_id=?1;"
+    "WHERE entry_id=:entry_id;"
   ), getter_AddRefs(state));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
-  rv = state->BindInt32Parameter(0, aEntryId);
+  rv = state->BindInt32ByName(NS_LITERAL_CSTRING("entry_id"), aEntryId);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
   while (NS_SUCCEEDED(state->ExecuteStep(&hasMoreData)) && hasMoreData) {
@@ -1506,28 +1829,28 @@
   MOZ_ASSERT(!NS_IsMainThread());
   MOZ_ASSERT((aPos + aLen) <= aEntryIdList.Length());
   for (int32_t i = aPos; i < aLen; ++i) {
-    nsresult rv = aState->BindInt32Parameter(i, aEntryIdList[i]);
+    nsresult rv = aState->BindInt32ByIndex(i, aEntryIdList[i]);
     NS_ENSURE_SUCCESS(rv, rv);
   }
   return NS_OK;
 }
 
 nsresult
-BindId(mozIStorageStatement* aState, uint32_t aPos, const nsID* aId)
+BindId(mozIStorageStatement* aState, const nsACString& aName, const nsID* aId)
 {
   MOZ_ASSERT(!NS_IsMainThread());
   MOZ_ASSERT(aState);
   nsresult rv;
 
   if (!aId) {
-    rv = aState->BindNullParameter(aPos);
+    rv = aState->BindNullByName(aName);
     if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
     return rv;
   }
 
   char idBuf[NSID_LENGTH];
   aId->ToProvidedString(idBuf);
-  rv = aState->BindUTF8StringParameter(aPos, nsAutoCString(idBuf));
+  rv = aState->BindUTF8StringByName(aName, nsAutoCString(idBuf));
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
   return rv;
@@ -1549,6 +1872,45 @@
 
   return rv;
 }
+
+nsresult
+CreateAndBindKeyStatement(mozIStorageConnection* aConn,
+                          const char* aQueryFormat,
+                          const nsAString& aKey,
+                          mozIStorageStatement** aStateOut)
+{
+  MOZ_ASSERT(aConn);
+  MOZ_ASSERT(aQueryFormat);
+  MOZ_ASSERT(aStateOut);
+
+  // The key is stored as a blob to avoid encoding issues.  An empty string
+  // is mapped to NULL for blobs.  Normally we would just write the query
+  // as "key IS :key" to do the proper NULL checking, but that prevents
+  // sqlite from using the key index.  Therefore use "IS NULL" explicitly
+  // if the key is empty, otherwise use "=:key" so that sqlite uses the
+  // index.
+  const char* constraint = nullptr;
+  if (aKey.IsEmpty()) {
+    constraint = "key IS NULL";
+  } else {
+    constraint = "key=:key";
+  }
+
+  nsPrintfCString query(aQueryFormat, constraint);
+
+  nsCOMPtr<mozIStorageStatement> state;
+  nsresult rv = aConn->CreateStatement(query, getter_AddRefs(state));
+  if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+
+  if (!aKey.IsEmpty()) {
+    rv = state->BindStringAsBlobByName(NS_LITERAL_CSTRING("key"), aKey);
+    if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
+  }
+
+  state.forget(aStateOut);
+
+  return rv;
+}
 
 } // anonymouns namespace
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/cache/ManagerId.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/cache/ManagerId.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/cache/ManagerId.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/cache/ManagerId.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -33,7 +33,7 @@
   // TODO: consider using QuotaManager's modified origin here (bug 1112071)
 
   nsAutoCString origin;
-  nsresult rv = aPrincipal->GetOrigin(getter_Copies(origin));
+  nsresult rv = aPrincipal->GetOriginNoSuffix(origin);
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
   uint32_t appId;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/cache/PrincipalVerifier.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/cache/PrincipalVerifier.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/cache/PrincipalVerifier.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/cache/PrincipalVerifier.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -150,7 +150,7 @@
   // is a synthetic [System Principal] string.
   if (!ssm->IsSystemPrincipal(principal)) {
     nsAutoCString origin;
-    rv = principal->GetOrigin(getter_Copies(origin));
+    rv = principal->GetOriginNoSuffix(origin);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       DispatchToInitiatingThread(rv);
       return;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/cache/QuotaClient.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/cache/QuotaClient.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/cache/QuotaClient.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/cache/QuotaClient.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -110,7 +110,13 @@
   InitOrigin(PersistenceType aPersistenceType, const nsACString& aGroup,
              const nsACString& aOrigin, UsageInfo* aUsageInfo) override
   {
-    return NS_OK;
+    // The QuotaManager passes a nullptr UsageInfo if there is no quota being
+    // enforced against the origin.
+    if (!aUsageInfo) {
+      return NS_OK;
+    }
+
+    return GetUsageForOrigin(aPersistenceType, aGroup, aOrigin, aUsageInfo);
   }
 
   virtual nsresult
@@ -118,6 +124,8 @@
                     const nsACString& aOrigin,
                     UsageInfo* aUsageInfo) override
   {
+    MOZ_ASSERT(aUsageInfo);
+
     QuotaManager* qm = QuotaManager::Get();
     MOZ_ASSERT(qm);
 
@@ -218,6 +226,9 @@
     }
   }
 
+  virtual void
+  PerformIdleMaintenance() override
+  { }
 
   virtual void
   ShutdownWorkThreads() override
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/cache/test/mochitest/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/cache/test/mochitest/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/cache/test/mochitest/mochitest.ini	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/cache/test/mochitest/mochitest.ini	2015-05-25 20:43:23.000000000 +0000
@@ -20,6 +20,7 @@
   test_cache_requestCache.js
   test_cache_delete.js
   test_cache_put_reorder.js
+  test_cache_https.js
 
 [test_cache.html]
 [test_cache_add.html]
@@ -33,3 +34,6 @@
 [test_cache_requestCache.html]
 [test_cache_delete.html]
 [test_cache_put_reorder.html]
+[test_cache_https.html]
+  skip-if = buildapp == 'b2g' # bug 1162353
+[test_cache_restart.html]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/cache/test/mochitest/test_cache_https.html firefox-trunk-41.0~a1~hg20150524r245419/dom/cache/test/mochitest/test_cache_https.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/cache/test/mochitest/test_cache_https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/cache/test/mochitest/test_cache_https.html	2015-05-25 20:43:23.000000000 +0000
@@ -0,0 +1,20 @@
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Validate Interfaces Exposed to Workers</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="driver.js"></script>
+</head>
+<body>
+<iframe id="frame"></iframe>
+<script class="testbody" type="text/javascript">
+  runTests("test_cache_https.js")
+    .then(function() {
+      SimpleTest.finish();
+    });
+</script>
+</body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/cache/test/mochitest/test_cache_https.js firefox-trunk-41.0~a1~hg20150524r245419/dom/cache/test/mochitest/test_cache_https.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/cache/test/mochitest/test_cache_https.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/cache/test/mochitest/test_cache_https.js	2015-05-25 20:43:23.000000000 +0000
@@ -0,0 +1,23 @@
+var cache = null;
+var name = 'https_' + context;
+var urlBase = 'https://example.com/tests/dom/cache/test/mochitest';
+var url1 = urlBase + '/test_cache.js';
+var url2 = urlBase + '/test_cache_add.js';
+
+caches.open(name).then(function(c) {
+  cache = c;
+  return cache.addAll([new Request(url1, { mode: 'no-cors' }),
+                       new Request(url2, { mode: 'no-cors' })]);
+}).then(function() {
+  return cache.delete(url1);
+}).then(function(result) {
+  ok(result, 'Cache entry should be deleted');
+  return cache.delete(url2);
+}).then(function(result) {
+  ok(result, 'Cache entry should be deleted');
+  cache = null;
+  return caches.delete(name);
+}).then(function(result) {
+  ok(result, 'Cache should be deleted');
+  testDone();
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/cache/test/mochitest/test_cache_restart.html firefox-trunk-41.0~a1~hg20150524r245419/dom/cache/test/mochitest/test_cache_restart.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/cache/test/mochitest/test_cache_restart.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/cache/test/mochitest/test_cache_restart.html	2015-05-25 20:43:23.000000000 +0000
@@ -0,0 +1,61 @@
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test Cache with QuotaManager Restart</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="text/javascript">
+function resetStorage() {
+  return new Promise(function(resolve, reject) {
+    var principal = SpecialPowers.wrap(document).nodePrincipal;
+    var appId, inBrowser;
+    var nsIPrincipal = SpecialPowers.Components.interfaces.nsIPrincipal;
+    if (principal.appId != nsIPrincipal.UNKNOWN_APP_ID &&
+        principal.appId != nsIPrincipal.NO_APP_ID) {
+      appId = principal.appId;
+      inBrowser = principal.isInBrowserElement;
+    }
+    SpecialPowers.resetStorageForURI(document.documentURI, resolve, appId,
+                                     inBrowser);
+  });
+}
+
+SimpleTest.waitForExplicitFinish();
+SpecialPowers.pushPrefEnv({
+  "set": [["dom.caches.enabled", true],
+          ["dom.quotaManager.testing", true]],
+}, function() {
+  var name = 'foo';
+  var url = './test_cache_add.js';
+  var cache;
+  caches.open(name).then(function(c) {
+    cache = c;
+    return cache.add(url);
+  }).then(function() {
+    return resetStorage();
+  }).then(function() {
+    return cache.match(url).then(function(resp) {
+      ok(false, 'old cache reference should not work after reset');
+    }).catch(function(err) {
+      ok(true, 'old cache reference should not work after reset');
+    });
+  }).then(function() {
+    return caches.open(name);
+  }).then(function(c) {
+    cache = c;
+    return cache.match(url);
+  }).then(function(resp) {
+    ok(!!resp, 'cache should work after QM reset');
+    return caches.delete(name);
+  }).then(function(success) {
+    ok(success, 'cache should be deleted');
+    SimpleTest.finish();
+  });
+});
+</script>
+</body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/camera/CameraCommon.h firefox-trunk-41.0~a1~hg20150524r245419/dom/camera/CameraCommon.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/camera/CameraCommon.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/camera/CameraCommon.h	2015-05-25 20:43:23.000000000 +0000
@@ -15,14 +15,10 @@
 #endif
 #endif
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetCameraLog();
-#define DOM_CAMERA_LOG( type, ... ) PR_LOG(GetCameraLog(), (PRLogModuleLevel)type, ( __VA_ARGS__ ))
-#else
-#define DOM_CAMERA_LOG( type, ... )
-#endif
+#define DOM_CAMERA_LOG( type, ... ) MOZ_LOG(GetCameraLog(), (PRLogModuleLevel)type, ( __VA_ARGS__ ))
 
 #define DOM_CAMERA_LOGA( ... )      DOM_CAMERA_LOG( 0, __VA_ARGS__ )
 
@@ -42,16 +38,12 @@
  * DOM_CAMERA_LOGR() can be called before 'gCameraLog' is set, so
  * we need to handle this one a little differently.
  */
-#ifdef PR_LOGGING
 #define DOM_CAMERA_LOGR( ... )                                  \
   do {                                                          \
     if (GetCameraLog()) {                                       \
       DOM_CAMERA_LOG( DOM_CAMERA_LOG_REFERENCES, __VA_ARGS__ ); \
     }                                                           \
   } while (0)
-#else
-#define DOM_CAMERA_LOGR( ... )
-#endif
 #define DOM_CAMERA_LOGT( ... )      DOM_CAMERA_LOG( DOM_CAMERA_LOG_TRACE, __VA_ARGS__ )
 #define DOM_CAMERA_LOGI( ... )      DOM_CAMERA_LOG( DOM_CAMERA_LOG_INFO, __VA_ARGS__ )
 #define DOM_CAMERA_LOGW( ... )      DOM_CAMERA_LOG( DOM_CAMERA_LOG_WARNING, __VA_ARGS__ )
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/camera/CameraControlImpl.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/camera/CameraControlImpl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/camera/CameraControlImpl.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/camera/CameraControlImpl.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -92,7 +92,6 @@
     return;
   }
 
-#ifdef PR_LOGGING
   const char* state[] = { "uninitialized", "closed", "open", "failed" };
   MOZ_ASSERT(aNewState >= 0);
   if (static_cast<unsigned int>(aNewState) < sizeof(state) / sizeof(state[0])) {
@@ -101,7 +100,6 @@
   } else {
     DOM_CAMERA_LOGE("OnHardwareStateChange: got invalid HardwareState value %d\n", aNewState);
   }
-#endif
 
   mHardwareState = aNewState;
   mHardwareStateChangeReason = aReason;
@@ -221,7 +219,6 @@
     return;
   }
 
-#ifdef PR_LOGGING
   const char* state[] = { "stopped", "paused", "started" };
   MOZ_ASSERT(aNewState >= 0);
   if (static_cast<unsigned int>(aNewState) < sizeof(state) / sizeof(state[0])) {
@@ -229,7 +226,6 @@
   } else {
     DOM_CAMERA_LOGE("OnPreviewStateChange: got unknown PreviewState value %d\n", aNewState);
   }
-#endif
 
   mPreviewState = aNewState;
 
@@ -280,7 +276,6 @@
   //  the Camera Thread.
   RwLockAutoEnterRead lock(mListenerLock);
 
-#ifdef PR_LOGGING
   const char* context[] = {
     "StartCamera",
     "StopCamera",
@@ -305,7 +300,6 @@
     DOM_CAMERA_LOGE("CameraControlImpl::OnUserError : aContext=%d, aError=0x%x\n",
       aContext, aError);
   }
-#endif
 
   for (uint32_t i = 0; i < mListeners.Length(); ++i) {
     CameraControlListener* l = mListeners[i];
@@ -321,7 +315,6 @@
   //  the Camera Thread.
   RwLockAutoEnterRead lock(mListenerLock);
 
-#ifdef PR_LOGGING
   const char* context[] = {
     "Camera Service"
   };
@@ -332,7 +325,6 @@
     DOM_CAMERA_LOGE("CameraControlImpl::OnSystemError : aContext=%d, aError=0x%x\n",
       aContext, aError);
   }
-#endif
 
   for (uint32_t i = 0; i < mListeners.Length(); ++i) {
     CameraControlListener* l = mListeners[i];
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/camera/DOMCameraControl.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/camera/DOMCameraControl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/camera/DOMCameraControl.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/camera/DOMCameraControl.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -1374,7 +1374,7 @@
   Sequence<OwningNonNull<DOMCameraDetectedFace> > faces;
   uint32_t len = aFaces.Length();
 
-  if (faces.SetCapacity(len)) {
+  if (faces.SetCapacity(len, fallible)) {
     for (uint32_t i = 0; i < len; ++i) {
       *faces.AppendElement() =
         new DOMCameraDetectedFace(static_cast<DOMMediaStream*>(this), aFaces[i]);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/camera/GonkCameraControl.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/camera/GonkCameraControl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/camera/GonkCameraControl.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/camera/GonkCameraControl.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -2246,12 +2246,7 @@
               CameraControlListener::SystemContext aWhere,
               int32_t aArg1, int32_t aArg2)
 {
-#ifdef PR_LOGGING
   DOM_CAMERA_LOGE("OnSystemError : aWhere=%d, aArg1=%d, aArg2=%d\n", aWhere, aArg1, aArg2);
-#else
-  unused << aArg1;
-  unused << aArg2;
-#endif
   gc->OnSystemError(aWhere, NS_ERROR_FAILURE);
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/camera/test/camera_common.js firefox-trunk-41.0~a1~hg20150524r245419/dom/camera/test/camera_common.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/camera/test/camera_common.js	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/camera/test/camera_common.js	2015-05-25 20:43:23.000000000 +0000
@@ -454,4 +454,4 @@
   },
 };
 
-ise(SpecialPowers.sanityCheck(), "foo", "SpecialPowers passed sanity check");
+is(SpecialPowers.sanityCheck(), "foo", "SpecialPowers passed sanity check");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/camera/TestGonkCameraHardware.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/camera/TestGonkCameraHardware.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/camera/TestGonkCameraHardware.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/camera/TestGonkCameraHardware.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -110,16 +110,19 @@
 
       if (blob) {
         static const uint64_t MAX_FILE_SIZE = 2147483647;
-        uint64_t dataLength = 0;
-        nsresult rv = blob->GetSize(&dataLength);
 
-        if (NS_WARN_IF(NS_FAILED(rv) || dataLength > MAX_FILE_SIZE)) {
+        ErrorResult rv;
+        uint64_t dataLength = blob->GetSize(rv);
+
+        if (NS_WARN_IF(rv.Failed()) || NS_WARN_IF(dataLength > MAX_FILE_SIZE)) {
+          rv.SuppressException();
           return NS_OK;
         }
 
         nsCOMPtr<nsIInputStream> inputStream;
-        rv = blob->GetInternalStream(getter_AddRefs(inputStream));
-        if (NS_WARN_IF(NS_FAILED(rv))) {
+        blob->GetInternalStream(getter_AddRefs(inputStream), rv);
+        if (NS_WARN_IF(rv.Failed())) {
+          rv.SuppressException();
           return NS_OK;
         }
 
@@ -127,7 +130,8 @@
         rv = NS_ReadInputStreamToBuffer(inputStream,
                                         reinterpret_cast<void**>(&data),
                                         static_cast<uint32_t>(dataLength));
-        if (NS_WARN_IF(NS_FAILED(rv))) {
+        if (NS_WARN_IF(rv.Failed())) {
+          rv.SuppressException();
           delete [] data;
           return NS_OK;
         }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/CanvasRenderingContext2D.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/CanvasRenderingContext2D.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/CanvasRenderingContext2D.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/CanvasRenderingContext2D.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -4079,14 +4079,16 @@
   roundedOutSourceRect.RoundOut();
   mgfx::IntRect roundedOutSourceRectInt;
   if (!roundedOutSourceRect.ToIntRect(&roundedOutSourceRectInt)) {
-    return aSurface;
+    RefPtr<SourceSurface> surface(aSurface);
+    return surface.forget();
   }
 
   RefPtr<DrawTarget> subrectDT =
     aTargetDT->CreateSimilarDrawTarget(roundedOutSourceRectInt.Size(), SurfaceFormat::B8G8R8A8);
 
   if (!subrectDT) {
-    return aSurface;
+    RefPtr<SourceSurface> surface(aSurface);
+    return surface.forget();
   }
 
   *aSourceRect -= roundedOutSourceRect.TopLeft();
@@ -5634,15 +5636,18 @@
   if (mPath &&
       (mPath->GetBackendType() == aTarget->GetBackendType()) &&
       (mPath->GetFillRule() == fillRule)) {
-    return mPath;
+    RefPtr<gfx::Path> path(mPath);
+    return path.forget();
   }
 
   if (!mPath) {
     // if there is no path, there must be a pathbuilder
     MOZ_ASSERT(mPathBuilder);
     mPath = mPathBuilder->Finish();
-    if (!mPath)
-      return mPath;
+    if (!mPath) {
+      RefPtr<gfx::Path> path(mPath);
+      return path.forget();
+    }
 
     mPathBuilder = nullptr;
   }
@@ -5657,7 +5662,8 @@
     mPath = tmpPathBuilder->Finish();
   }
 
-  return mPath;
+  RefPtr<gfx::Path> path(mPath);
+  return path.forget();
 }
 
 void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/moz.build	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/moz.build	2015-05-25 20:43:24.000000000 +0000
@@ -142,7 +142,7 @@
     '/dom/svg',
     '/dom/xul',
     '/gfx/gl',
-    '/image/src',
+    '/image',
     '/js/xpconnect/src',
     '/layout/generic',
     '/layout/style',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/test/captureStream_common.js firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/test/captureStream_common.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/test/captureStream_common.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/test/captureStream_common.js	2015-05-25 20:43:24.000000000 +0000
@@ -0,0 +1,174 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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";
+
+/*
+ * Util base class to help test a captured canvas element. Initializes the
+ * output canvas (used for testing the color of video elements), and optionally
+ * overrides the default element |width| and |height|.
+ */
+function CaptureStreamTestHelper(width, height) {
+  this.cout = document.createElement('canvas');
+  if (width) {
+    this.elemWidth = width;
+  }
+  if (height) {
+    this.elemHeight = height;
+  }
+  this.cout.width = this.elemWidth;
+  this.cout.height = this.elemHeight;
+  document.body.appendChild(this.cout);
+}
+
+CaptureStreamTestHelper.prototype = {
+  /* Predefined colors for use in the methods below. */
+  black: { data: [0, 0, 0, 255], name: "black" },
+  green: { data: [0, 255, 0, 255], name: "green" },
+  red: { data: [255, 0, 0, 255], name: "red" },
+
+  /* Default element size for createAndAppendElement() */
+  elemWidth: 100,
+  elemHeight: 100,
+
+  /* Request a frame from the stream played by |video|. */
+  requestFrame: function (video) {
+    info("Requesting frame from " + video.id);
+    video.mozSrcObject.requestFrame();
+  },
+
+  /* Tests the top left pixel of |video| against |refData|. Format [R,G,B,A]. */
+  testPixel: function (video, refData, threshold) {
+    var ctxout = this.cout.getContext('2d');
+    ctxout.drawImage(video, 0, 0);
+    var pixel = ctxout.getImageData(0, 0, 1, 1).data;
+    return pixel.every((val, i) => Math.abs(val - refData[i]) <= threshold);
+  },
+
+  /*
+   * Returns a promise that resolves when the pixel matches. Use |threshold|
+   * for fuzzy matching the color on each channel, in the range [0,255].
+   */
+  waitForPixel: function (video, refColor, threshold, infoString) {
+    return new Promise(resolve => {
+      info("Testing " + video.id + " against [" + refColor.data.join(',') + "]");
+      CaptureStreamTestHelper2D.prototype.clear.call(this, this.cout);
+      video.ontimeupdate = () => {
+        if (this.testPixel(video, refColor.data, threshold)) {
+          ok(true, video.id + " " + infoString);
+          video.ontimeupdate = null;
+          resolve();
+        }
+      };
+    });
+  },
+
+  /*
+   * Returns a promise that resolves after |timeout| ms of playback or when a
+   * pixel of |video| becomes the color |refData|. The test is failed if the
+   * timeout is not reached.
+   */
+  waitForPixelToTimeout: function (video, refColor, threshold, timeout, infoString) {
+    return new Promise(resolve => {
+      info("Waiting for " + video.id + " to time out after " + timeout +
+           "ms against [" + refColor.data.join(',') + "] - " + refColor.name);
+      CaptureStreamTestHelper2D.prototype.clear.call(this, this.cout);
+      var startTime = video.currentTime;
+      video.ontimeupdate = () => {
+        if (this.testPixel(video, refColor.data, threshold)) {
+          ok(false, video.id + " " + infoString);
+          video.ontimeupdate = null;
+          resolve();
+        } else if (video.currentTime > startTime + (timeout / 1000.0)) {
+          ok(true, video.id + " " + infoString);
+          video.ontimeupdate = null;
+          resolve();
+        }
+      };
+    });
+  },
+
+  /* Create an element of type |type| with id |id| and append it to the body. */
+  createAndAppendElement: function (type, id) {
+    var e = document.createElement(type);
+    e.id = id;
+    e.width = this.elemWidth;
+    e.height = this.elemHeight;
+    if (type === 'video') {
+      e.autoplay = true;
+    }
+    document.body.appendChild(e);
+    return e;
+  },
+}
+
+/* Sub class holding 2D-Canvas specific helpers. */
+function CaptureStreamTestHelper2D(width, height) {
+  CaptureStreamTestHelper.call(this, width, height);
+}
+
+CaptureStreamTestHelper2D.prototype = Object.create(CaptureStreamTestHelper.prototype);
+CaptureStreamTestHelper2D.prototype.constructor = CaptureStreamTestHelper2D;
+
+/* Clear all drawn content on |canvas|. */
+CaptureStreamTestHelper2D.prototype.clear = function(canvas) {
+  var ctx = canvas.getContext('2d');
+  ctx.clearRect(0, 0, canvas.width, canvas.height);
+};
+
+/* Draw the color |color| to the source canvas |canvas|. Format [R,G,B,A]. */
+CaptureStreamTestHelper2D.prototype.drawColor = function(canvas, color) {
+  var ctx = canvas.getContext('2d');
+  var rgba = color.data.slice(); // Copy to not overwrite the original array
+  info("Drawing color " + rgba.join(','));
+  rgba[3] = rgba[3] / 255.0; // Convert opacity to double in range [0,1]
+  ctx.fillStyle = "rgba(" + rgba.join(',') + ")";
+
+  // Only fill top left corner to test that output is not flipped or rotated.
+  ctx.fillRect(0, 0, canvas.width / 2, canvas.height / 2);
+};
+
+/* Test that the given 2d canvas is NOT origin-clean. */
+CaptureStreamTestHelper2D.prototype.testNotClean = function(canvas) {
+  var ctx = canvas.getContext('2d');
+  var error = "OK";
+  try {
+    var data = ctx.getImageData(0, 0, 1, 1);
+  } catch(e) {
+    error = e.name;
+  }
+  is(error, "SecurityError",
+     "Canvas '" + canvas.id + "' should not be origin-clean");
+};
+
+/* Sub class holding WebGL specific helpers. */
+function CaptureStreamTestHelperWebGL(width, height) {
+  CaptureStreamTestHelper.call(this, width, height);
+}
+
+CaptureStreamTestHelperWebGL.prototype = Object.create(CaptureStreamTestHelper.prototype);
+CaptureStreamTestHelperWebGL.prototype.constructor = CaptureStreamTestHelperWebGL;
+
+/* Set the (uniform) color location for future draw calls. */
+CaptureStreamTestHelperWebGL.prototype.setFragmentColorLocation = function(colorLocation) {
+  this.colorLocation = colorLocation;
+};
+
+/* Clear the given WebGL context with |color|. */
+CaptureStreamTestHelperWebGL.prototype.clearColor = function(canvas, color) {
+  info("WebGL: clearColor(" + color.name + ")");
+  var gl = canvas.getContext('webgl');
+  var conv = color.data.map(i => i / 255.0);
+  gl.clearColor(conv[0], conv[1], conv[2], conv[3]);
+  gl.clear(gl.COLOR_BUFFER_BIT);
+};
+
+/* Set an already setFragmentColorLocation() to |color| and drawArrays() */
+CaptureStreamTestHelperWebGL.prototype.drawColor = function(canvas, color) {
+  info("WebGL: drawArrays(" + color.name + ")");
+  var gl = canvas.getContext('webgl');
+  var conv = color.data.map(i => i / 255.0);
+  gl.uniform4f(this.colorLocation, conv[0], conv[1], conv[2], conv[3]);
+  gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4);
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/test/crossorigin/test_canvas2d_crossorigin.html firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/test/crossorigin/test_canvas2d_crossorigin.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/test/crossorigin/test_canvas2d_crossorigin.html	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/test/crossorigin/test_canvas2d_crossorigin.html	2015-05-25 20:43:24.000000000 +0000
@@ -73,6 +73,17 @@
                 "drawImage then get image data on " + url +
                 " with crossOrigin=" + this.crossOrigin);
 
+    try {
+      c.captureStream(0);
+      actual_error = OK;
+    } catch (e) {
+      actual_error = e.name;
+    }
+
+    verifyError(actual_error, expected_error,
+                "drawImage then capture stream on " + url +
+                " with crossOrigin=" + this.crossOrigin);
+
     // Now test patterns
     c = document.createElement("canvas");
     c.width = this.width;
@@ -91,6 +102,17 @@
                 "createPattern+fill then get image data on " + url +
                 " with crossOrigin=" + this.crossOrigin);
 
+    try {
+      c.captureStream(0);
+      actual_error = OK;
+    } catch (e) {
+      actual_error = e.name;
+    }
+
+    verifyError(actual_error, expected_error,
+                "createPattern+fill then capture stream on " + url +
+                " with crossOrigin=" + this.crossOrigin);
+
     testDone();
   };
 
@@ -130,56 +152,64 @@
   [ "foobar", "anonymous" ]
 ];
 
-for (var imgIdx = 0; imgIdx < imageFiles.length; ++imgIdx) {
-  for (var hostnameIdx = 0; hostnameIdx < hostnames.length; ++hostnameIdx) {
-    var hostnameData = hostnames[hostnameIdx];
-    var url = "http://" + hostnameData[0] + testPath + imageFiles[imgIdx][0];
-    for (var attrValIdx = 0; attrValIdx < attrValues.length; ++attrValIdx) {
-      var attrValData = attrValues[attrValIdx];
-      // Now compute the expected result
-      var expected_error;
-      if (hostnameData[1] == "same-origin") {
-        // Same-origin; these should all Just Work
-        expected_error = OK;
-      } else {
-        // Cross-origin
-        is(hostnameData[1], "cross-origin",
-           "what sort of host is " + hostnameData[0]);
-        var CORSMode = attrValData[1];
-        if (CORSMode == "none") {
-          // Doesn't matter what headers the server sends; we're not
-          // using CORS on our end.
-          expected_error = "SecurityError";
+function beginTest() {
+  for (var imgIdx = 0; imgIdx < imageFiles.length; ++imgIdx) {
+    for (var hostnameIdx = 0; hostnameIdx < hostnames.length; ++hostnameIdx) {
+      var hostnameData = hostnames[hostnameIdx];
+      var url = "http://" + hostnameData[0] + testPath + imageFiles[imgIdx][0];
+      for (var attrValIdx = 0; attrValIdx < attrValues.length; ++attrValIdx) {
+        var attrValData = attrValues[attrValIdx];
+        // Now compute the expected result
+        var expected_error;
+        if (hostnameData[1] == "same-origin") {
+          // Same-origin; these should all Just Work
+          expected_error = OK;
         } else {
-          // Check whether the server will let us talk to them
-          var CORSHeaders = imageFiles[imgIdx][1];
-          // We're going to look for CORS headers from the server
-          if (CORSHeaders == "none") {
-            // No CORS headers from server; load will fail.
-            expected_error = BAD_URI_ERR;
-          } else if (CORSHeaders == "allow-all-anon") {
-            // Server only allows anonymous requests
-            if (CORSMode == "anonymous") {
-              expected_error = OK;
-            } else {
-              is(CORSMode, "use-credentials",
-                 "What other CORS modes are there?");
-              // A load with credentials against a server that only
-              // allows anonymous loads will fail.
+          // Cross-origin
+          is(hostnameData[1], "cross-origin",
+             "what sort of host is " + hostnameData[0]);
+          var CORSMode = attrValData[1];
+          if (CORSMode == "none") {
+            // Doesn't matter what headers the server sends; we're not
+            // using CORS on our end.
+            expected_error = "SecurityError";
+          } else {
+            // Check whether the server will let us talk to them
+            var CORSHeaders = imageFiles[imgIdx][1];
+            // We're going to look for CORS headers from the server
+            if (CORSHeaders == "none") {
+              // No CORS headers from server; load will fail.
               expected_error = BAD_URI_ERR;
+            } else if (CORSHeaders == "allow-all-anon") {
+              // Server only allows anonymous requests
+              if (CORSMode == "anonymous") {
+                expected_error = OK;
+              } else {
+                is(CORSMode, "use-credentials",
+                   "What other CORS modes are there?");
+                // A load with credentials against a server that only
+                // allows anonymous loads will fail.
+                expected_error = BAD_URI_ERR;
+              }
+            } else {
+              is(CORSHeaders, "allow-single-server-creds",
+                 "What other CORS headers could there be?");
+              // Our server should allow both anonymous and non-anonymous requests
+              expected_error = OK;
             }
-          } else {
-            is(CORSHeaders, "allow-single-server-creds",
-               "What other CORS headers could there be?");
-            // Our server should allow both anonymous and non-anonymous requests
-            expected_error = OK;
           }
         }
+        testImage(url, attrValData[0], expected_error);
       }
-      testImage(url, attrValData[0], expected_error);
     }
   }
 }
+
+var prefs = [
+  [ "canvas.capturestream.enabled", true ],
+];
+SpecialPowers.pushPrefEnv({ "set" : prefs }, beginTest);
+
 </script>
 </pre>
 </body>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/test/crossorigin/test_video_crossorigin.html firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/test/crossorigin/test_video_crossorigin.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/test/crossorigin/test_video_crossorigin.html	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/test/crossorigin/test_video_crossorigin.html	2015-05-25 20:43:24.000000000 +0000
@@ -28,11 +28,7 @@
   return c;
 }
 
-function testCanvasDrawImage(v) {
-  var c = createCanvas(v.width, v.height);
-  var ctx = c.getContext("2d");
-  ctx.drawImage(v, 0, 0);
-
+function checkGetImageData(ctx, v) {
   try {
     var data = ctx.getImageData(0, 0, 1, 1);
     ok(true, "drawImage '" + v.src + "' then getImageData with crossOrigin='" + v.crossOrigin + "' worked");
@@ -42,22 +38,54 @@
   }
 }
 
+function checkGetImageDataTainted(ctx, v) {
+  try {
+    var data = ctx.getImageData(0, 0, 1, 1);
+    ok(false, "changing the CORS mode should not allow reading data from remote videos");
+  } catch (error) {
+    ok(error.name === "SecurityError", "changing the CORS mode, drawImage '" + v.src + "' then getImageData with crossOrigin='" + v.crossOrigin + "' failed");
+  }
+}
+
+function checkCaptureStream(c, v) {
+  try {
+    var stream = c.captureStream(0);
+    ok(true, "drawImage '" + v.src + "' then captureStream with crossOrigin='" + v.crossOrigin + "' worked");
+  } catch(error) {
+    ok(!v.crossOrigin && error.name === "SecurityError", "drawImage '" + v.src + "' then captureStream with crossOrigin='" + v.crossOrigin + "' failed");
+    v.tainted = true;
+  }
+}
+
+function checkCaptureStreamTainted(c, v) {
+  try {
+    var stream = c.captureStream(0);
+    ok(false, "changing the CORS mode should not allow capturing a stream from remote videos");
+  } catch (error) {
+    ok(error.name === "SecurityError", "changing the CORS mode, drawImage '" + v.src + "' then captureStream with crossOrigin='" + v.crossOrigin + "' failed");
+  }
+}
+
+function testCanvasDrawImage(v) {
+  var c = createCanvas(v.width, v.height);
+  var ctx = c.getContext("2d");
+  ctx.drawImage(v, 0, 0);
+
+  checkGetImageData(ctx, v);
+  checkCaptureStream(c, v);
+}
+
 function testCanvasCreatePattern(v) {
   var c = createCanvas(v.width, v.height);
   var ctx = c.getContext("2d");
   ctx.fillStyle = ctx.createPattern(v, "");
   ctx.fillRect(0, 0, c.width, c.height);
 
-  try {
-    var data = ctx.getImageData(0, 0, 1, 1);
-    ok(true, "createPattern '" + v.src + "' then getImageData with crossOrigin='" + v.crossOrigin + "' worked");
-  } catch(error) {
-    ok(!v.crossOrigin && error.name === "SecurityError", "createPattern '" + v.src + "' then getImageData with crossOrigin='" + v.crossOrigin + "' failed");
-    v.tainted = true;
-  }
+  checkGetImageData(ctx, v);
+  checkCaptureStream(c, v);
 }
 
-function testWebGL(v) {
+function testWebGL(gl, v) {
   var tex = gl.createTexture();
   gl.bindTexture(gl.TEXTURE_2D, tex);
 
@@ -75,12 +103,8 @@
   var ctx = c.getContext("2d");
   ctx.drawImage(v, 0, 0);
 
-  try {
-    var data = ctx.getImageData(0, 0, 1, 1);
-    ok(false, "changing the CORS mode should not allow reading data from remote videos");
-  } catch (error) {
-    ok(error.name === "SecurityError", "changing the CORS mode, drawImage '" + v.src + "' then getImageData with crossOrigin='" + v.crossOrigin + "' failed");
-  }
+  checkGetImageDataTainted(ctx, v);
+  checkCaptureStreamTainted(c, v);
 }
 
 function vidDataSuccess(e) {
@@ -88,8 +112,8 @@
 
   testCanvasDrawImage(e.target);
   testCanvasCreatePattern(e.target);
-  if (gl) {
-    testWebGL(e.target);
+  if (document.gl) {
+    testWebGL(document.gl, e.target);
   }
   // If we change the CORS mode after loading the file without CORS it should still throw a security error
   if (e.target.tainted) {
@@ -121,7 +145,7 @@
     v.crossOrigin = test.cors;
   }
   v.token = token;
-  manager.started(token);
+  document.manager.started(token);
   v.autoplay = true;
   v.preload = "auto";
   v.style.display = "none";
@@ -140,53 +164,59 @@
 function doneTest(e) {
   var v = e.target;
   v.parentNode.removeChild(v);
-  manager.finished(v.token);
+  document.manager.finished(v.token);
 }
 
-var videoFile = getPlayableVideo(gSmallTests);
-if (!videoFile) {
-  SimpleTest.finish();
-}
-videoFile = "?name=tests/dom/media/test/" + videoFile.name + "&type=" + videoFile.type;
-
-var gl;
-try {
-  gl = createCanvas(16, 16).getContext("experimental-webgl");
-} catch (ex) {
-  // Mac OS X 10.5 doesn't support WebGL, so we won't run the WebGL tests
+function beginTest() {
+  var videoFile = getPlayableVideo(gSmallTests);
+  if (!videoFile) {
+    SimpleTest.finish();
+  }
+  videoFile = "?name=tests/dom/media/test/" + videoFile.name + "&type=" + videoFile.type;
+
+  document.manager = new MediaTestManager;
+  var corsTests = [];
+
+  const host = "http://example.com/tests/dom/canvas/test/crossorigin/video.sjs";
+  const serverAttrValues = [
+    [ "&cors=none", "none" ],
+    [ "&cors=anonymous", "anonymous" ],
+    [ "&cors=use-credentials", "use-credentials" ]
+  ];
+  const clientAttrValues = [
+    [ "missing-value-default", "none" ],
+    [ "", "anonymous" ],
+    [ "just-crossOrigin-without-value", "anonymous" ],
+    [ "anonymous", "anonymous" ],
+    [ "use-credentials", "use-credentials" ],
+    [ "foobar", "anonymous" ]
+  ];
+
+  // Build the video file test array
+  for (var i = 0; i < serverAttrValues.length; i++) {
+    for (var n = 0; n < clientAttrValues.length; n++) {
+      corsTests.push({
+        name: host + videoFile + serverAttrValues[i][0],
+        nameIntent: serverAttrValues[i][1],
+        cors: clientAttrValues[n][0],
+        corsIntent: clientAttrValues[n][1]
+      });
+    }
+  }
+  try {
+    document.gl = createCanvas(16, 16).getContext("experimental-webgl");
+  } catch (ex) {
+    // Mac OS X 10.5 doesn't support WebGL, so we won't run the WebGL tests
+  }
+  document.manager.runTests(corsTests, startTest);
 }
 
-var manager = new MediaTestManager;
-var corsTests = [];
-
-const host = "http://example.com/tests/dom/canvas/test/crossorigin/video.sjs";
-const serverAttrValues = [
-  [ "&cors=none", "none" ],
-  [ "&cors=anonymous", "anonymous" ],
-  [ "&cors=use-credentials", "use-credentials" ]
+var prefs = [
+  [ "canvas.capturestream.enabled", true ],
 ];
-const clientAttrValues = [
-  [ "missing-value-default", "none" ],
-  [ "", "anonymous" ],
-  [ "just-crossOrigin-without-value", "anonymous" ],
-  [ "anonymous", "anonymous" ],
-  [ "use-credentials", "use-credentials" ],
-  [ "foobar", "anonymous" ]
-];
-
-// Build the video file test array
-for (var i = 0; i < serverAttrValues.length; i++) {
-	for (var n = 0; n < clientAttrValues.length; n++) {
-		corsTests.push({
-      name: host + videoFile + serverAttrValues[i][0],
-      nameIntent: serverAttrValues[i][1],
-      cors: clientAttrValues[n][0],
-      corsIntent: clientAttrValues[n][1]
-    });
-	}
-}
 
-manager.runTests(corsTests, startTest);
+SimpleTest.waitForExplicitFinish();
+SpecialPowers.pushPrefEnv({ "set" : prefs }, beginTest);
 
 </script>
 </pre>
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/test/image_red_crossorigin_credentials.png and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/test/image_red_crossorigin_credentials.png differ
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/test/image_red_crossorigin_credentials.png^headers^ firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/test/image_red_crossorigin_credentials.png^headers^
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/test/image_red_crossorigin_credentials.png^headers^	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/test/image_red_crossorigin_credentials.png^headers^	2015-05-25 20:43:24.000000000 +0000
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: http://mochi.test:8888
+Access-Control-Allow-Credentials: true
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/test/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/test/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/test/mochitest.ini	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/test/mochitest.ini	2015-05-25 20:43:24.000000000 +0000
@@ -14,6 +14,8 @@
   image_green.png
   image_red-16x16.png
   image_red.png
+  image_red_crossorigin_credentials.png
+  image_red_crossorigin_credentials.png^headers^
   image_redtransparent.png
   image_rgrg-256x256.png
   image_rrgg-256x256.png
@@ -224,6 +226,8 @@
 [test_hitregion_event.html]
 skip-if = os == "android" || appname == "b2g"
 [test_canvas_strokeStyle_getter.html]
+[test_capture.html]
+support-files = captureStream_common.js
 [test_drawImageIncomplete.html]
 [test_drawImage_document_domain.html]
 [test_drawImage_edge_cases.html]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/test/test_capture.html firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/test/test_capture.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/test/test_capture.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/test/test_capture.html	2015-05-25 20:43:25.000000000 +0000
@@ -0,0 +1,111 @@
+<!DOCTYPE HTML>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+
+<title>Canvas2D test: CaptureStream()</title>
+
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<script src="captureStream_common.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<script>
+var c;       // Canvas element captured by streams.
+var h;       // CaptureStreamTestHelper holding utility test functions.
+var vauto;   // Video element with captureStream stream in automatic mode.
+var vmanual; // Video element with captureStream stream in manual (fps 0) mode.
+var vrate;   // Video element with captureStream stream with fixed frame rate.
+
+function checkDrawColorInitialRed() {
+  info("Checking that all video elements become red after first drawColor(red).");
+
+  h.drawColor(c, h.red);
+
+  vauto.mozSrcObject = c.captureStream();
+  vmanual.mozSrcObject = c.captureStream(0);
+  vrate.mozSrcObject = c.captureStream(10);
+
+  ok(h.testPixel(vauto, [0, 0, 0, 0], 0), "vauto hould not be drawn to before stable state");
+  ok(h.testPixel(vrate, [0, 0, 0, 0], 0), "vrate Should not be drawn to before stable state");
+  ok(h.testPixel(vmanual, [0, 0, 0, 0], 0), "vmanual Should not be drawn to before stable state");
+
+  return Promise.resolve()
+    .then(() => h.waitForPixel(vauto, h.red, 0, "should become red automatically"))
+    .then(() => h.waitForPixel(vrate, h.red, 0, "should become red automatically"))
+    .then(() => h.waitForPixel(vmanual, h.red, 0, "should become red when we get" +
+                                               " to stable state (first frame)"));
+}
+
+function checkDrawColorGreen() {
+  info("Checking that drawColor(green) propagates properly to video elements.");
+  h.drawColor(c, h.green);
+
+  return Promise.resolve()
+    .then(() => h.waitForPixel(vauto, h.green, 0, "should become green automatically"))
+    .then(() => h.waitForPixel(vrate, h.green, 0, "should become green automatically"))
+    .then(() => h.waitForPixel(vmanual, h.red, 0, "should still be red"))
+    .then(() => h.requestFrame(vmanual))
+    .then(() => h.waitForPixel(vmanual, h.green, 0, "should become green after requstFrame()"));
+}
+
+function checkRequestFrameOrderGuarantee() {
+  info("Checking that requestFrame() immediately before and after drawColor() " +
+       "calls results in the expected frame seen in the stream.");
+
+  return Promise.resolve()
+    .then(() => h.waitForPixel(vmanual, h.green, 0, "should still be green"))
+    .then(() => h.drawColor(c, h.red))   // 1. Draw canvas red
+    .then(() => h.requestFrame(vmanual)) // 2. Immediately request a frame
+    .then(() => h.drawColor(c, h.green)) // 3. Immediately draw canvas green
+    .then(() => h.waitForPixel(vmanual, h.red, 0, "should become red after call order test"))
+    .then(() => h.waitForPixelToTimeout(vmanual, h.green, 0, 500, "should not become green after call order test"));
+}
+
+function checkDrawImageNotCleanRed() {
+  info("Checking that drawImage with not origin-clean image renders streams useless.");
+  var ctx = c.getContext('2d');
+  var notCleanRed = new Image();
+
+  return new Promise((resolve, reject) => {
+    notCleanRed.onload = resolve;
+    notCleanRed.onerror = () => reject(new Error("Failed to load tainted image."));
+    notCleanRed.src = "http://example.com/tests/dom/canvas/test/image_red_crossorigin_credentials.png";
+    document.body.appendChild(notCleanRed);
+  })
+    .then(() => ctx.drawImage(notCleanRed, 0, 0, c.width, c.height))
+    .then(() => h.testNotClean(c))
+    .then(() => h.waitForPixelToTimeout(vauto, h.red, 0, 1000, "should not become red"))
+    .then(() => h.waitForPixelToTimeout(vrate, h.red, 0, 0, "should not become red"))
+    .then(() => h.waitForPixel(vmanual, h.green, 0, "should still be green"))
+    .then(() => h.requestFrame(vmanual))
+    .then(() => h.waitForPixelToTimeout(vmanual, h.red, 0, 1000, "should not become red"));
+}
+
+function finish() {
+  ok(true, 'Test complete.');
+  SimpleTest.finish();
+}
+
+function beginTest() {
+  h = new CaptureStreamTestHelper2D();
+
+  c = h.createAndAppendElement('canvas', 'c');
+  vauto = h.createAndAppendElement('video', 'vauto');
+  vmanual = h.createAndAppendElement('video', 'vmanual');
+  vrate = h.createAndAppendElement('video', 'vrate');
+
+  Promise.resolve()
+    .then(checkDrawColorInitialRed)
+    .then(checkDrawColorGreen)
+    .then(checkRequestFrameOrderGuarantee)
+    .then(checkDrawColorGreen) // Restore video elements to green.
+    .then(checkDrawImageNotCleanRed)
+    .then(finish);
+}
+
+SimpleTest.waitForExplicitFinish();
+
+var prefs = [
+  [ "canvas.capturestream.enabled", true ],
+];
+SpecialPowers.pushPrefEnv({ "set" : prefs }, beginTest);
+</script>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/test/webgl-mochitest/test_capture.html firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/test/webgl-mochitest/test_capture.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/test/webgl-mochitest/test_capture.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/test/webgl-mochitest/test_capture.html	2015-05-25 20:43:28.000000000 +0000
@@ -0,0 +1,200 @@
+<!DOCTYPE HTML>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+
+<title>WebGL test: CaptureStream()</title>
+
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<script src="../captureStream_common.js">
+<script src="driver-info.js"></script>
+<script src="webgl-util.js"></script>
+<script id="vs" type="x-shader/x-vertex">
+
+attribute vec2 aVertCoord;
+
+void main(void) {
+  gl_Position = vec4(aVertCoord, 0.0, 1.0);
+}
+
+</script>
+<script id="fs" type="x-shader/x-fragment">
+
+precision mediump float;
+uniform vec4 uColor;
+
+void main(void) {
+  gl_FragColor = uColor;
+}
+
+</script>
+<body>
+<script>
+
+// Globals. Initialized during beginTest().
+var c;       // Canvas element captured by streams.
+var gl;      // WebGLContext of |c|.
+var h;       // CaptureStreamTestHelper holding utility test functions.
+var vauto;   // Video element with captureStream stream in automatic mode.
+var vmanual; // Video element with captureStream stream in manual (fps 0) mode.
+var vrate;   // Video element with captureStream stream with fixed frame rate.
+
+/* Fails the test if there was a GL error */
+function checkGLError(info) {
+  var error = gl.getError();
+  // Comparing strings for sake of log output in hex format.
+  is("0x" + error.toString(16), "0x0", "WebGL error [" + info + "]");
+}
+
+function checkClearColorInitialRed() {
+  info("Checking that clearing to red works for first frame.");
+
+  h.clearColor(c, h.red);
+
+  vauto.mozSrcObject = c.captureStream();
+  vmanual.mozSrcObject = c.captureStream(0);
+  vrate.mozSrcObject = c.captureStream(10);
+
+  ok(h.testPixel(vauto, [0, 0, 0, 0], 0), "Should not be drawn to before stable state");
+  ok(h.testPixel(vrate, [0, 0, 0, 0], 0), "Should not be drawn to before stable state");
+  ok(h.testPixel(vmanual, [0, 0, 0, 0], 0), "Should not be drawn to before stable state");
+
+  return Promise.resolve()
+    .then(() => h.waitForPixel(vauto, h.red, 0, "should become red automatically"))
+    .then(() => h.waitForPixel(vrate, h.red, 0, "should become red automatically"))
+    .then(() => h.waitForPixel(vmanual, h.red, 0, "should become red when we get to stable state (first frame)"))
+}
+
+function checkDrawColorGreen() {
+  info("Checking that drawColor() results in green frames.");
+  h.drawColor(c, h.green);
+  checkGLError('after DrawColor');
+  return Promise.resolve()
+    .then(() => h.waitForPixel(vauto, h.green, 0, "should become green automatically"))
+    .then(() => h.waitForPixel(vrate, h.green, 0, "should become green automatically"))
+    .then(() => h.waitForPixel(vmanual, h.red, 0, "should still be red"))
+    .then(() => h.requestFrame(vmanual))
+    .then(() => h.waitForPixel(vmanual, h.green, 0, "should become green after requstFrame()"))
+}
+
+function checkClearColorRed() {
+  info("Checking that clearing to red works.");
+  h.clearColor(c, h.red);
+  return Promise.resolve()
+    .then(() => h.waitForPixel(vauto, h.red, 0, "should become red automatically"))
+    .then(() => h.waitForPixel(vrate, h.red, 0, "should become red automatically"))
+    .then(() => h.waitForPixel(vmanual, h.green, 0, "should still be green"))
+    .then(() => h.requestFrame(vmanual))
+    .then(() => h.waitForPixel(vmanual, h.red, 0, "should become red after requestFrame()"))
+}
+
+function checkRequestFrameOrderGuarantee() {
+  info("Checking that requestFrame() immediately before and after draw " +
+       "calls results in the expected frame seen in the stream.");
+  return Promise.resolve()
+    .then(() => h.waitForPixel(vmanual, h.red, 0, "should still be red"))
+    .then(() => h.drawColor(c, h.green)) // 1. Draw canvas green
+    .then(() => h.requestFrame(vmanual)) // 2. Immediately request a frame
+    .then(() => h.clearColor(c, h.red))  // 3. Immediately clear to red
+    .then(() => h.waitForPixel(vmanual, h.green, 0, "should become green after call order test"))
+    .then(() => h.waitForPixelToTimeout(vmanual, h.red, 0, 500, "should not become red after call order test"));
+}
+
+function checkCapturingForbidden() {
+  info("Checking that capturing a WebGL context with " +
+       "`preservDrawingBuffer: false` is forbidden.");
+  var c2 = h.createAndAppendElement("canvas", "c2");
+  var gl2 = WebGLUtil.getWebGL("c2", false, { preserveDrawingBuffer: false });
+
+  var checkThrows = function(f, expected, fName) {
+    try {
+      f();
+      ok(false, fName + " should throw when not preserving drawing buffer");
+    } catch(e) {
+      is(e.name, expected, fName + " forbidden when not preserving drawing buffer");
+    }
+  };
+
+  checkThrows(() => c2.captureStream(), "NS_ERROR_FAILURE", "captureStream()");
+  checkThrows(() => c2.captureStream(0), "NS_ERROR_FAILURE", "captureStream(0)");
+  checkThrows(() => c2.captureStream(10), "NS_ERROR_FAILURE", "captureStream(10)");
+}
+
+function finish() {
+  ok(true, 'Test complete.');
+  SimpleTest.finish();
+}
+
+function beginTest() {
+  h = new CaptureStreamTestHelperWebGL();
+
+  c = h.createAndAppendElement('canvas', 'c');
+  vauto = h.createAndAppendElement('video', 'vauto');
+  vmanual = h.createAndAppendElement('video', 'vmanual');
+  vrate = h.createAndAppendElement('video', 'vrate');
+
+  gl = WebGLUtil.getWebGL('c', false, { preserveDrawingBuffer: true });
+  if (!gl) {
+    todo(false, 'WebGL is unavailable.');
+    finish();
+    return;
+  }
+
+  function errorFunc(str) {
+    ok(false, 'Error: ' + str);
+  }
+  WebGLUtil.setErrorFunc(errorFunc);
+  WebGLUtil.setWarningFunc(errorFunc);
+
+  gl.disable(gl.DEPTH_TEST);
+
+  prog = WebGLUtil.createProgramByIds(gl, 'vs', 'fs');
+  if (!prog) {
+    ok(false, 'Program linking should succeed.');
+    return;
+  }
+
+  // Setup vertex coordinates for drawing a rectangle across the whole canvas.
+
+  prog.aVertCoord = gl.getAttribLocation(prog, "aVertCoord");
+  ok(prog.aVertCoord >= 0, '`aVertCoord` should be valid.');
+
+  var vertCoordArr = new Float32Array([
+    -1, -1,
+     1, -1,
+    -1,  1,
+     1,  1,
+  ]);
+  var vertCoordBuff = gl.createBuffer();
+  gl.bindBuffer(gl.ARRAY_BUFFER, vertCoordBuff);
+  gl.bufferData(gl.ARRAY_BUFFER, vertCoordArr, gl.STATIC_DRAW);
+
+  gl.useProgram(prog);
+  gl.enableVertexAttribArray(prog.aVertCoord);
+  gl.vertexAttribPointer(prog.aVertCoord, 2, gl.FLOAT, false, 0, 0);
+
+  // Setup the helper with a pointer to how to change fragment color.
+
+  var uColorLocation = gl.getUniformLocation(prog, "uColor");
+  h.setFragmentColorLocation(uColorLocation);
+
+  checkGLError('after setup');
+
+  // Run tests.
+
+  Promise.resolve()
+    .then(checkClearColorInitialRed)
+    .then(checkDrawColorGreen)
+    .then(checkClearColorRed)
+    .then(checkRequestFrameOrderGuarantee)
+    .then(checkCapturingForbidden)
+    .then(finish);
+}
+
+SimpleTest.waitForExplicitFinish();
+
+var prefs = [
+  [ "canvas.capturestream.enabled", true ],
+];
+SpecialPowers.pushPrefEnv({ "set" : prefs }, beginTest);
+</script>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/test/webgl-mochitest/webgl-util.js firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/test/webgl-mochitest/webgl-util.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/test/webgl-mochitest/webgl-util.js	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/test/webgl-mochitest/webgl-util.js	2015-05-25 20:43:28.000000000 +0000
@@ -34,19 +34,19 @@
   // ---------------------------------------------------------------------------
   // WebGL helpers
 
-  function getWebGL(canvasId, requireConformant) {
+  function getWebGL(canvasId, requireConformant, attributes) {
     // `requireConformant` will default to falsey if it is not supplied.
 
     var canvas = document.getElementById(canvasId);
 
     var gl = null;
     try {
-      gl = canvas.getContext('webgl');
+      gl = canvas.getContext('webgl', attributes);
     } catch(e) {}
 
     if (!gl && !requireConformant) {
       try {
-        gl = canvas.getContext('experimental-webgl');
+        gl = canvas.getContext('experimental-webgl', attributes);
       } catch(e) {}
     }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/test/webgl-mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/test/webgl-mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/test/webgl-mochitest.ini	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/test/webgl-mochitest.ini	2015-05-25 20:43:28.000000000 +0000
@@ -9,6 +9,8 @@
 [webgl-mochitest/test_backbuffer_channels.html]
 fail-if = (os == 'b2g')
 [webgl-mochitest/test_depth_readpixels.html]
+[webgl-mochitest/test_capture.html]
+support-files = captureStream_common.js
 [webgl-mochitest/test_draw.html]
 [webgl-mochitest/test_fb_param.html]
 [webgl-mochitest/test_fb_param_crash.html]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/WebGLContext.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/WebGLContext.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/WebGLContext.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/WebGLContext.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -194,6 +194,7 @@
     , premultipliedAlpha(true)
     , antialias(true)
     , preserveDrawingBuffer(false)
+    , failIfMajorPerformanceCaveat(false)
 {
     // Set default alpha state based on preference.
     if (Preferences::GetBool("webgl.default-no-alpha", false))
@@ -431,6 +432,7 @@
     newOpts.premultipliedAlpha = attributes.mPremultipliedAlpha;
     newOpts.antialias = attributes.mAntialias;
     newOpts.preserveDrawingBuffer = attributes.mPreserveDrawingBuffer;
+    newOpts.failIfMajorPerformanceCaveat = attributes.mFailIfMajorPerformanceCaveat;
 
     if (attributes.mAlpha.WasPassed())
         newOpts.alpha = attributes.mAlpha.Value();
@@ -500,6 +502,30 @@
     return status != nsIGfxInfo::FEATURE_STATUS_OK;
 }
 
+static bool
+HasAcceleratedLayers(const nsCOMPtr<nsIGfxInfo>& gfxInfo)
+{
+    int32_t status;
+
+    gfxInfo->GetFeatureStatus(nsIGfxInfo::FEATURE_DIRECT3D_9_LAYERS, &status);
+    if (status)
+        return true;
+    gfxInfo->GetFeatureStatus(nsIGfxInfo::FEATURE_DIRECT3D_10_LAYERS, &status);
+    if (status)
+        return true;
+    gfxInfo->GetFeatureStatus(nsIGfxInfo::FEATURE_DIRECT3D_10_1_LAYERS, &status);
+    if (status)
+        return true;
+    gfxInfo->GetFeatureStatus(nsIGfxInfo::FEATURE_DIRECT3D_11_LAYERS, &status);
+    if (status)
+        return true;
+    gfxInfo->GetFeatureStatus(nsIGfxInfo::FEATURE_OPENGL_LAYERS, &status);
+    if (status)
+        return true;
+
+    return false;
+}
+
 static already_AddRefed<GLContext>
 CreateHeadlessNativeGL(bool forceEnabled, const nsCOMPtr<nsIGfxInfo>& gfxInfo,
                        bool requireCompatProfile, WebGLContext* webgl)
@@ -569,7 +595,6 @@
     return gl.forget();
 }
 
-
 static already_AddRefed<GLContext>
 CreateHeadlessGL(bool forceEnabled, const nsCOMPtr<nsIGfxInfo>& gfxInfo,
                  WebGLContext* webgl)
@@ -873,6 +898,18 @@
         return NS_ERROR_FAILURE;
     }
 
+    nsCOMPtr<nsIGfxInfo> gfxInfo = do_GetService("@mozilla.org/gfx/info;1");
+    bool failIfMajorPerformanceCaveat =
+                    !gfxPrefs::WebGLDisableFailIfMajorPerformanceCaveat() &&
+                    !HasAcceleratedLayers(gfxInfo);
+    if (failIfMajorPerformanceCaveat) {
+        Nullable<dom::WebGLContextAttributes> contextAttributes;
+        this->GetContextAttributes(contextAttributes);
+        if (contextAttributes.Value().mFailIfMajorPerformanceCaveat) {
+            return NS_ERROR_FAILURE;
+        }
+    }
+
     // Alright, now let's start trying.
     bool forceEnabled = Preferences::GetBool("webgl.force-enabled", false);
     ScopedGfxFeatureReporter reporter("WebGL", forceEnabled);
@@ -1255,6 +1292,7 @@
     result.mAntialias = mOptions.antialias;
     result.mPremultipliedAlpha = mOptions.premultipliedAlpha;
     result.mPreserveDrawingBuffer = mOptions.preserveDrawingBuffer;
+    result.mFailIfMajorPerformanceCaveat = mOptions.failIfMajorPerformanceCaveat;
 }
 
 /* [noscript] DOMString mozGetUnderlyingParamString(in GLenum pname); */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/WebGLContext.h firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/WebGLContext.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/WebGLContext.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/WebGLContext.h	2015-05-25 20:43:23.000000000 +0000
@@ -128,6 +128,7 @@
     bool premultipliedAlpha;
     bool antialias;
     bool preserveDrawingBuffer;
+    bool failIfMajorPerformanceCaveat;
 };
 
 // From WebGLContextUtils
@@ -310,6 +311,8 @@
 
     bool IsPremultAlpha() const { return mOptions.premultipliedAlpha; }
 
+    bool IsPreservingDrawingBuffer() const { return mOptions.preserveDrawingBuffer; }
+
     bool PresentScreenBuffer();
 
     // a number that increments every time we have an event that causes
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/WebGLElementArrayCache.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/WebGLElementArrayCache.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/canvas/WebGLElementArrayCache.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/canvas/WebGLElementArrayCache.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -376,7 +376,7 @@
     // Step #0: If needed, resize our tree data storage.
     if (requiredNumLeaves != NumLeaves()) {
         // See class comment for why we the tree storage size is 2 * numLeaves.
-        if (!mTreeData.SetLength(2 * requiredNumLeaves)) {
+        if (!mTreeData.SetLength(2 * requiredNumLeaves, fallible)) {
             mTreeData.SetLength(0);
             return false;
         }
@@ -470,7 +470,7 @@
 WebGLElementArrayCache::BufferData(const void* ptr, size_t byteLength)
 {
     if (mBytes.Length() != byteLength) {
-        if (!mBytes.SetLength(byteLength)) {
+        if (!mBytes.SetLength(byteLength, fallible)) {
             mBytes.SetLength(0);
             return false;
         }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/contacts/fallback/ContactDB.jsm firefox-trunk-41.0~a1~hg20150524r245419/dom/contacts/fallback/ContactDB.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/contacts/fallback/ContactDB.jsm	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/contacts/fallback/ContactDB.jsm	2015-05-25 20:43:28.000000000 +0000
@@ -124,14 +124,10 @@
         }
       }
 
-      let chan = jsm.NetUtil.newChannel2(contactsFile,
-                                         null,
-                                         null,
-                                         null,      // aLoadingNode
-                                         Services.scriptSecurityManager.getSystemPrincipal(),
-                                         null,      // aTriggeringPrincipal
-                                         Ci.nsILoadInfo.SEC_NORMAL,
-                                         Ci.nsIContentPolicy.TYPE_OTHER);
+      let chan = jsm.NetUtil.newChannel({
+        uri: NetUtil.newURI(contactsFile),
+        loadUsingSystemPrincipal: true});
+
       let stream = chan.open();
       // Obtain a converter to read from a UTF-8 encoded input stream.
       let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/contacts/tests/shared.js firefox-trunk-41.0~a1~hg20150524r245419/dom/contacts/tests/shared.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/contacts/tests/shared.js	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/contacts/tests/shared.js	2015-05-25 20:43:28.000000000 +0000
@@ -249,7 +249,7 @@
   }
   str1 = optArray(str1).map(normalize_falsy).filter(v => v != "");
   str2 = optArray(str2).map(normalize_falsy).filter(v => v != "");
-  ise(JSON.stringify(str1), JSON.stringify(str2), msg);
+  is(JSON.stringify(str1), JSON.stringify(str2), msg);
 }
 
 function checkPref(pref1, pref2) {
@@ -260,7 +260,7 @@
       pref2 = false;
     }
   }
-  ise(!!pref1, !!pref2, "Same pref");
+  is(!!pref1, !!pref2, "Same pref");
 }
 
 function checkAddress(adr1, adr2) {
@@ -332,7 +332,7 @@
     ok(true, msg);
     return;
   }
-  ise(array1.length, array2.length, "Same length");
+  is(array1.length, array2.length, "Same length");
   for (var i = 0; i < array1.length; ++i) {
     func(array1[i], array2[i], msg);
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/contacts/tests/test_contacts_basics2.html firefox-trunk-41.0~a1~hg20150524r245419/dom/contacts/tests/test_contacts_basics2.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/contacts/tests/test_contacts_basics2.html	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/contacts/tests/test_contacts_basics2.html	2015-05-25 20:43:28.000000000 +0000
@@ -702,13 +702,13 @@
       impp: [{value: undefined}],
       tel: [{value: undefined}],
     });
-    ise(c.adr[0].streetAddress, undefined, "adr.streetAddress is undefined");
-    ise(c.adr[0].locality, undefined, "adr.locality is undefined");
-    ise(c.adr[0].pref, undefined, "adr.pref is undefined");
-    ise(c.email[0].value, undefined, "email.value is undefined");
-    ise(c.url[0].value, undefined, "url.value is undefined");
-    ise(c.impp[0].value, undefined, "impp.value is undefined");
-    ise(c.tel[0].value, undefined, "tel.value is undefined");
+    is(c.adr[0].streetAddress, undefined, "adr.streetAddress is undefined");
+    is(c.adr[0].locality, undefined, "adr.locality is undefined");
+    is(c.adr[0].pref, undefined, "adr.pref is undefined");
+    is(c.email[0].value, undefined, "email.value is undefined");
+    is(c.url[0].value, undefined, "url.value is undefined");
+    is(c.impp[0].value, undefined, "impp.value is undefined");
+    is(c.tel[0].value, undefined, "tel.value is undefined");
     next();
   },
   function() {
@@ -764,7 +764,7 @@
     req.onsuccess = function() {
       req = navigator.mozContacts.find(defaultOptions);
       req.onsuccess = function() {
-        ise(req.result.length, 1, "Got 1 contact");
+        is(req.result.length, 1, "Got 1 contact");
         checkContacts(req.result[0], properties1);
         next();
       };
@@ -788,7 +788,7 @@
     ok(true, "mozContact.init works as expected");
     var c = new mozContact({name: ["Foo"]});
     c.init({name: ["Bar"]});
-    ise(c.name[0], "Bar", "Same name");
+    is(c.name[0], "Bar", "Same name");
     next();
   },
   function() {
@@ -801,7 +801,7 @@
     ok(true, "mozContact.init resets properties");
     var c = new mozContact({jobTitle: ["Software Engineer"]});
     c.init({nickname: ["Jobless Johnny"]});
-    ise(c.nickname[0], "Jobless Johnny", "Same nickname");
+    is(c.nickname[0], "Jobless Johnny", "Same nickname");
     ok(!c.jobTitle, "jobTitle is not set");
     next();
   },
@@ -818,7 +818,7 @@
           filterValue: c.id
         });
         req.onsuccess = function() {
-          ise(req.result.length, 0, "Successfully removed contact by ID");
+          is(req.result.length, 0, "Successfully removed contact by ID");
           next();
         };
         req.onerror = onFailure;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/contacts/tests/test_contacts_blobs.html firefox-trunk-41.0~a1~hg20150524r245419/dom/contacts/tests/test_contacts_blobs.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/contacts/tests/test_contacts_blobs.html	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/contacts/tests/test_contacts_blobs.html	2015-05-25 20:43:28.000000000 +0000
@@ -96,8 +96,8 @@
      "blob1 is an instance of File");
   isnot(blob2 instanceof File, true,
      "blob2 is an instance of File");
-  ise(blob1.size, blob2.size, "Same size");
-  ise(blob1.type, blob2.type, "Same type");
+  is(blob1.size, blob2.size, "Same size");
+  is(blob1.type, blob2.type, "Same type");
 
   var buffer1;
   var buffer2;
@@ -125,7 +125,7 @@
 {
   is(blobs1 instanceof Array, true, "blobs1 is an array object");
   is(blobs2 instanceof Array, true, "blobs2 is an array object");
-  ise(blobs1.length, blobs2.length, "Same length");
+  is(blobs1.length, blobs2.length, "Same length");
 
   if (!blobs1.length) {
     next();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/contacts/tests/test_contacts_international.html firefox-trunk-41.0~a1~hg20150524r245419/dom/contacts/tests/test_contacts_international.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/contacts/tests/test_contacts_international.html	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/contacts/tests/test_contacts_international.html	2015-05-25 20:43:28.000000000 +0000
@@ -95,9 +95,9 @@
                    filterValue: number1.local};
     req = mozContacts.find(options);
     req.onsuccess = function () {
-      ise(req.result.length, 1, "Found exactly 1 contact.");
+      is(req.result.length, 1, "Found exactly 1 contact.");
       findResult1 = req.result[0];
-      ise(findResult1.id, sample_id1, "Same ID");
+      is(findResult1.id, sample_id1, "Same ID");
       next();
     };
     req.onerror = onFailure;
@@ -109,7 +109,7 @@
                    filterValue: number1.international};
     req = mozContacts.find(options);
     req.onsuccess = function () {
-      ise(req.result.length, 0, "Found exactly 0 contacts.");
+      is(req.result.length, 0, "Found exactly 0 contacts.");
       next();
     };
     req.onerror = onFailure;
@@ -122,7 +122,7 @@
                    filterValue: shortNumber};
     req = mozContacts.find(options);
     req.onsuccess = function() {
-      ise(req.result.length, 0, "The prefix short number should not match any contact.");
+      is(req.result.length, 0, "The prefix short number should not match any contact.");
       next();
     };
     req.onerror = onFailure;
@@ -135,7 +135,7 @@
                    filterValue: shortNumber};
     req = mozContacts.find(options);
     req.onsuccess = function() {
-      ise(req.result.length, 0, "The suffix short number should not match any contact.");
+      is(req.result.length, 0, "The suffix short number should not match any contact.");
       next();
     };
     req.onerror = onFailure;
@@ -147,7 +147,7 @@
                    filterValue: shortNumber};
     req = mozContacts.find(options);
     req.onsuccess = function() {
-      ise(req.result.length, 1, "Found the contact equally matching the shortNumber.");
+      is(req.result.length, 1, "Found the contact equally matching the shortNumber.");
       next();
     };
     req.onerror = onFailure;
@@ -171,7 +171,7 @@
                    filterValue: number1.local};
     req = mozContacts.find(options);
     req.onsuccess = function () {
-      ise(req.result.length, 0, "Found exactly 0 contact.");
+      is(req.result.length, 0, "Found exactly 0 contact.");
       next();
     };
     req.onerror = onFailure;
@@ -183,7 +183,7 @@
                    filterValue: number1.international};
     req = mozContacts.find(options);
     req.onsuccess = function () {
-      ise(req.result.length, 0, "Found exactly 0 contact.");
+      is(req.result.length, 0, "Found exactly 0 contact.");
       next();
     };
     req.onerror = onFailure;
@@ -195,9 +195,9 @@
                    filterValue: number2.local};
     req = mozContacts.find(options);
     req.onsuccess = function () {
-      ise(req.result.length, 1, "Found exactly 1 contact.");
+      is(req.result.length, 1, "Found exactly 1 contact.");
       findResult1 = req.result[0];
-      ise(findResult1.id, sample_id1, "Same ID");
+      is(findResult1.id, sample_id1, "Same ID");
       next();
     };
     req.onerror = onFailure;
@@ -209,7 +209,7 @@
                    filterValue: number2.international};
     req = mozContacts.find(options);
     req.onsuccess = function () {
-      ise(req.result.length, 0, "Found exactly 1 contact.");
+      is(req.result.length, 0, "Found exactly 1 contact.");
       next();
     };
     req.onerror = onFailure;
@@ -241,9 +241,9 @@
                    filterValue: number3.local};
     req = mozContacts.find(options);
     req.onsuccess = function () {
-      ise(req.result.length, 1, "Found exactly 1 contact.");
+      is(req.result.length, 1, "Found exactly 1 contact.");
       findResult1 = req.result[0];
-      ise(findResult1.id, sample_id1, "Same ID");
+      is(findResult1.id, sample_id1, "Same ID");
       next();
     };
     req.onerror = onFailure;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/contacts/tests/test_contacts_substringmatchingCL.html firefox-trunk-41.0~a1~hg20150524r245419/dom/contacts/tests/test_contacts_substringmatchingCL.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/contacts/tests/test_contacts_substringmatchingCL.html	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/contacts/tests/test_contacts_substringmatchingCL.html	2015-05-25 20:43:28.000000000 +0000
@@ -54,9 +54,9 @@
       filterValue: number.international
     });
     req.onsuccess = function () {
-      ise(req.result.length, 1, "Found exactly 1 contact.");
+      is(req.result.length, 1, "Found exactly 1 contact.");
       findResult1 = req.result[0];
-      ise(findResult1.id, sample_id1, "Same ID");
+      is(findResult1.id, sample_id1, "Same ID");
       next();
     };
     req.onerror = onFailure;
@@ -69,7 +69,7 @@
       filterValue: number.local
     });
     req.onsuccess = function () {
-      ise(req.result.length, 1, "Found 0 contacts.");
+      is(req.result.length, 1, "Found 0 contacts.");
       next();
     };
     req.onerror = onFailure;
@@ -92,7 +92,7 @@
     ok(true, "Retrieving all contacts");
     req = mozContacts.find({});
     req.onsuccess = function () {
-      ise(req.result.length, 1, "One contact.");
+      is(req.result.length, 1, "One contact.");
       findResult1 = req.result[0];
       next();
     };
@@ -106,10 +106,10 @@
       filterValue: number.international.slice(-8)
     });
     req.onsuccess = function () {
-      ise(req.result.length, 1, "Found exactly 1 contact.");
+      is(req.result.length, 1, "Found exactly 1 contact.");
       findResult1 = req.result[0];
-      ise(findResult1.id, sample_id1, "Same ID");
-      ise(findResult1.tel[0].value, number.international, "Same Value");
+      is(findResult1.id, sample_id1, "Same ID");
+      is(findResult1.tel[0].value, number.international, "Same Value");
       next();
     };
     req.onerror = onFailure;
@@ -122,10 +122,10 @@
       filterValue: number.international.slice(-9)
     });
     req.onsuccess = function () {
-      ise(req.result.length, 1, "Found exactly 1 contact.");
+      is(req.result.length, 1, "Found exactly 1 contact.");
       findResult1 = req.result[0];
-      ise(findResult1.id, sample_id1, "Same ID");
-      ise(findResult1.tel[0].value, number.international, "Same Value");
+      is(findResult1.id, sample_id1, "Same ID");
+      is(findResult1.tel[0].value, number.international, "Same Value");
       next();
     };
     req.onerror = onFailure;
@@ -138,7 +138,7 @@
       filterValue: number.international.slice(-6)
     });
     req.onsuccess = function () {
-      ise(req.result.length, 0, "Found exactly zero contacts.");
+      is(req.result.length, 0, "Found exactly zero contacts.");
       next();
     };
     req.onerror = onFailure;
@@ -161,7 +161,7 @@
     ok(true, "Retrieving all contacts");
     req = mozContacts.find({});
     req.onsuccess = function () {
-      ise(req.result.length, 1, "One contact.");
+      is(req.result.length, 1, "One contact.");
       findResult1 = req.result[0];
       next();
     };
@@ -175,10 +175,10 @@
       filterValue: "022" + landlineNumber.slice(-7)
     });
     req.onsuccess = function () {
-      ise(req.result.length, 1, "Found exactly 1 contact.");
+      is(req.result.length, 1, "Found exactly 1 contact.");
       findResult1 = req.result[0];
-      ise(findResult1.id, sample_id1, "Same ID");
-      ise(findResult1.tel[0].value, landlineNumber, "Same Value");
+      is(findResult1.id, sample_id1, "Same ID");
+      is(findResult1.tel[0].value, landlineNumber, "Same Value");
       next();
     };
     req.onerror = onFailure;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/contacts/tests/test_migration.html firefox-trunk-41.0~a1~hg20150524r245419/dom/contacts/tests/test_migration.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/contacts/tests/test_migration.html	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/contacts/tests/test_migration.html	2015-05-25 20:43:28.000000000 +0000
@@ -86,7 +86,7 @@
     var req = mozContacts.getCount();
     req.onsuccess = function onsuccess() {
       ok(true, "Could access the mozContacts API");
-      ise(this.result, contactsCount, "Contacts count is correct");
+      is(this.result, contactsCount, "Contacts count is correct");
       next();
     };
 
@@ -104,7 +104,7 @@
     var req = mozContacts.find();
     req.onsuccess = function onsuccess() {
       if (this.result) {
-        ise(this.result.length, contactsCount, "Contacts array length is correct");
+        is(this.result.length, contactsCount, "Contacts array length is correct");
         allContacts = this.result;
         next();
       } else {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/crypto/CryptoBuffer.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/crypto/CryptoBuffer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/crypto/CryptoBuffer.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/crypto/CryptoBuffer.cpp	2015-05-25 20:43:28.000000000 +0000
@@ -17,13 +17,14 @@
 {
   // Same as in nsTArray_Impl::operator=, but return the value
   // returned from ReplaceElementsAt to enable OOM detection
-  return ReplaceElementsAt(0, Length(), aData.Elements(), aData.Length());
+  return ReplaceElementsAt(0, Length(), aData.Elements(), aData.Length(),
+                           fallible);
 }
 
 uint8_t*
 CryptoBuffer::Assign(const uint8_t* aData, uint32_t aLength)
 {
-  return ReplaceElementsAt(0, Length(), aData, aLength);
+  return ReplaceElementsAt(0, Length(), aData, aLength, fallible);
 }
 
 uint8_t*
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/crypto/test/test-vectors.js firefox-trunk-41.0~a1~hg20150524r245419/dom/crypto/test/test-vectors.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/crypto/test/test-vectors.js	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/crypto/test/test-vectors.js	2015-05-25 20:43:28.000000000 +0000
@@ -659,19 +659,20 @@
     }
   },
 
-  // RFC 2409 <http://tools.ietf.org/html/rfc2409#section-6.1>
+  // RFC 2409 <http://tools.ietf.org/html/rfc2409#section-6.2>
   dh: {
     prime: util.hex2abv(
       "ffffffffffffffffc90fdaa22168c234c4c6628b80dc1cd129024e088a67cc74" +
       "020bbea63b139b22514a08798e3404ddef9519b3cd3a431b302b0a6df25f1437" +
-      "4fe1356d6d51c245e485b576625e7ec6f44c42e9a63a3620ffffffffffffffff"
+      "4fe1356d6d51c245e485b576625e7ec6f44c42e9a637ed6b0bff5cb6f406b7ed" +
+      "ee386bfb5a899fa5ae9f24117c4b1fe649286651ece65381ffffffffffffffff"
     ),
 
     prime2: util.hex2abv(
-      "ffffffffffffffffc90fdaa22168c234c4c6628b80dc1cd129024e088a67cc74" +
-      "020bbea63b139b22514a08798e3404ddef9519b3cd3a431b302b0a6df25f1437" +
-      "4fe1356d6d51c245e485b576625e7ec6f44c42e9a637ed6b0bff5cb6f406b7ed" +
-      "ee386bfb5a899fa5ae9f24117c4b1fe649286651ece65381ffffffffffffffff"
+      "8b79f180cbd3f282de92e8b8f2d092674ffda61f01ed961f8ef04a1b7a3709ff" +
+      "748c2abf6226cf0c4538e48838193da456e92ee530ef7aa703e741585e475b26" +
+      "cd64fa97819181cef27de2449cd385c49c9b030f89873b5b7eaf063a788f00db" +
+      "3cb670c73846bc4f76af062d672bde8f29806b81548411ab48b99aebfd9c2d09"
     ),
   },
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/crypto/WebCryptoCommon.h firefox-trunk-41.0~a1~hg20150524r245419/dom/crypto/WebCryptoCommon.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/crypto/WebCryptoCommon.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/crypto/WebCryptoCommon.h	2015-05-25 20:43:28.000000000 +0000
@@ -152,7 +152,7 @@
   }
 
   if (length > 0) {
-    if (!aBuffer.SetLength(length)) {
+    if (!aBuffer.SetLength(length, fallible)) {
       return false;
     }
     ret = JS_ReadBytes(aReader, aBuffer.Elements(), aBuffer.Length());
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/crypto/WebCryptoTask.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/crypto/WebCryptoTask.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/crypto/WebCryptoTask.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/crypto/WebCryptoTask.cpp	2015-05-25 20:43:28.000000000 +0000
@@ -555,7 +555,7 @@
     // Initialize the output buffer (enough space for padding / a full tag)
     uint32_t dataLen = mData.Length();
     uint32_t maxLen = dataLen + 16;
-    if (!mResult.SetLength(maxLen)) {
+    if (!mResult.SetLength(maxLen, fallible)) {
       return NS_ERROR_DOM_UNKNOWN_ERR;
     }
     uint32_t outLen = 0;
@@ -679,7 +679,7 @@
 
       // Encrypt and return the wrapped key
       // AES-KW encryption results in a wrapped key 64 bits longer
-      if (!mResult.SetLength(mData.Length() + 8)) {
+      if (!mResult.SetLength(mData.Length() + 8, fallible)) {
         return NS_ERROR_DOM_OPERATION_ERR;
       }
       SECItem resultItem = {siBuffer, mResult.Elements(),
@@ -811,7 +811,7 @@
 
     // Ciphertext is an integer mod the modulus, so it will be
     // no longer than mStrength octets
-    if (!mResult.SetLength(mStrength)) {
+    if (!mResult.SetLength(mStrength, fallible)) {
       return NS_ERROR_DOM_UNKNOWN_ERR;
     }
 
@@ -901,7 +901,7 @@
   virtual nsresult DoCrypto() override
   {
     // Initialize the output buffer
-    if (!mResult.SetLength(HASH_LENGTH_MAX)) {
+    if (!mResult.SetLength(HASH_LENGTH_MAX, fallible)) {
       return NS_ERROR_DOM_UNKNOWN_ERR;
     }
 
@@ -1183,7 +1183,7 @@
   {
     // Resize the result buffer
     uint32_t hashLen = HASH_ResultLenByOidTag(mOidTag);
-    if (!mResult.SetLength(hashLen)) {
+    if (!mResult.SetLength(hashLen, fallible)) {
       return NS_ERROR_DOM_UNKNOWN_ERR;
     }
 
@@ -2597,7 +2597,7 @@
       return NS_ERROR_DOM_DATA_ERR;
     }
 
-    if (!mResult.SetLength(mLength)) {
+    if (!mResult.SetLength(mLength, fallible)) {
       return NS_ERROR_DOM_UNKNOWN_ERR;
     }
 
@@ -2696,7 +2696,7 @@
       return NS_ERROR_DOM_DATA_ERR;
     }
 
-    if (!mResult.SetLength(mLength)) {
+    if (!mResult.SetLength(mLength, fallible)) {
       return NS_ERROR_DOM_UNKNOWN_ERR;
     }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/datastore/DataStoreChangeNotifier.jsm firefox-trunk-41.0~a1~hg20150524r245419/dom/datastore/DataStoreChangeNotifier.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/datastore/DataStoreChangeNotifier.jsm	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/datastore/DataStoreChangeNotifier.jsm	2015-05-25 20:43:28.000000000 +0000
@@ -146,14 +146,7 @@
 
     // No check has to be done when the message is 'child-process-shutdown'.
     if (aMessage.name != "child-process-shutdown") {
-      if (!("principal" in aMessage)) {
-        return;
-      }
-      let secMan = Cc["@mozilla.org/scriptsecuritymanager;1"]
-                     .getService(Ci.nsIScriptSecurityManager);
-      let uri = Services.io.newURI(aMessage.principal.origin, null, null);
-      let principal = secMan.getAppCodebasePrincipal(uri,
-        aMessage.principal.appId, aMessage.principal.isInBrowserElement);
+      let principal = aMessage.principal;
       if (!principal || !dataStoreService.checkPermission(principal)) {
         return;
       }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/devicestorage/DeviceStorageRequestChild.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/devicestorage/DeviceStorageRequestChild.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/devicestorage/DeviceStorageRequestChild.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/devicestorage/DeviceStorageRequestChild.cpp	2015-05-25 20:43:28.000000000 +0000
@@ -110,7 +110,7 @@
 
       AutoJSContext cx;
 
-      JS::Rooted<JSObject*> obj(cx, blob->WrapObject(cx, JS::NullPtr()));
+      JS::Rooted<JSObject*> obj(cx, blob->WrapObject(cx, nullptr));
       MOZ_ASSERT(obj);
 
       JS::Rooted<JS::Value> result(cx, JS::ObjectValue(*obj));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/devicestorage/DeviceStorageRequestParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/devicestorage/DeviceStorageRequestParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/devicestorage/DeviceStorageRequestParent.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/devicestorage/DeviceStorageRequestParent.cpp	2015-05-25 20:43:28.000000000 +0000
@@ -47,8 +47,10 @@
       BlobParent* bp = static_cast<BlobParent*>(p.blobParent());
       nsRefPtr<BlobImpl> blobImpl = bp->GetBlobImpl();
 
+      ErrorResult rv;
       nsCOMPtr<nsIInputStream> stream;
-      blobImpl->GetInternalStream(getter_AddRefs(stream));
+      blobImpl->GetInternalStream(getter_AddRefs(stream), rv);
+      MOZ_ASSERT(!rv.Failed());
 
       nsRefPtr<CancelableRunnable> r = new WriteFileEvent(this, dsf, stream,
                                                           DEVICE_STORAGE_REQUEST_CREATE);
@@ -70,8 +72,10 @@
       BlobParent* bp = static_cast<BlobParent*>(p.blobParent());
       nsRefPtr<BlobImpl> blobImpl = bp->GetBlobImpl();
 
+      ErrorResult rv;
       nsCOMPtr<nsIInputStream> stream;
-      blobImpl->GetInternalStream(getter_AddRefs(stream));
+      blobImpl->GetInternalStream(getter_AddRefs(stream), rv);
+      MOZ_ASSERT(!rv.Failed());
 
       nsRefPtr<CancelableRunnable> r = new WriteFileEvent(this, dsf, stream,
                                                           DEVICE_STORAGE_REQUEST_APPEND);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/devicestorage/nsDeviceStorage.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/devicestorage/nsDeviceStorage.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/devicestorage/nsDeviceStorage.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/devicestorage/nsDeviceStorage.cpp	2015-05-25 20:43:28.000000000 +0000
@@ -279,9 +279,7 @@
   MOZ_ASSERT(aBlob);
 
   nsString mimeType;
-  if (NS_FAILED(aBlob->GetType(mimeType))) {
-    return false;
-  }
+  aBlob->GetType(mimeType);
 
   if (aType.EqualsLiteral(DEVICESTORAGE_PICTURES)) {
     return StringBeginsWith(mimeType, NS_LITERAL_STRING("image/"));
@@ -2631,12 +2629,18 @@
   {
     MOZ_ASSERT(!NS_IsMainThread());
 
+    ErrorResult rv;
     nsCOMPtr<nsIInputStream> stream;
-    mBlobImpl->GetInternalStream(getter_AddRefs(stream));
+    mBlobImpl->GetInternalStream(getter_AddRefs(stream), rv);
+    if (NS_WARN_IF(rv.Failed())) {
+      rv.SuppressException();
+      nsCOMPtr<nsIRunnable> event =
+        new PostErrorEvent(mRequest.forget(), POST_ERROR_EVENT_UNKNOWN);
+      return NS_DispatchToMainThread(event);
+    }
 
     bool check = false;
     mFile->mFile->Exists(&check);
-    nsresult rv;
 
     if (mRequestType == DEVICE_STORAGE_REQUEST_APPEND) {
       if (!check) {
@@ -2653,7 +2657,8 @@
         return NS_DispatchToMainThread(event);
       }
       rv = mFile->Write(stream);
-      if (NS_FAILED(rv)) {
+      if (NS_WARN_IF(rv.Failed())) {
+        rv.SuppressException();
         mFile->mFile->Remove(false);
       }
     } else {
@@ -2662,7 +2667,9 @@
       return NS_DispatchToMainThread(event);
     }
 
-    if (NS_FAILED(rv)) {
+    if (NS_WARN_IF(rv.Failed())) {
+      rv.SuppressException();
+
       nsCOMPtr<nsIRunnable> event =
         new PostErrorEvent(mRequest.forget(), POST_ERROR_EVENT_UNKNOWN);
       return NS_DispatchToMainThread(event);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/downloads/tests/test_downloads_navigator_object.html firefox-trunk-41.0~a1~hg20150524r245419/dom/downloads/tests/test_downloads_navigator_object.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/downloads/tests/test_downloads_navigator_object.html	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/downloads/tests/test_downloads_navigator_object.html	2015-05-25 20:43:28.000000000 +0000
@@ -48,7 +48,7 @@
     SpecialPowers.pushPermissions([
       {type: "downloads", allow: 0, context: document}
     ], function() {
-      ise(frames[0].navigator.mozDownloadManager, null, "navigator.mozDownloadManager is null when the page doesn't have permissions");
+      is(frames[0].navigator.mozDownloadManager, null, "navigator.mozDownloadManager is null when the page doesn't have permissions");
       next();
     });
   },
@@ -57,7 +57,7 @@
     SpecialPowers.pushPrefEnv({
       set: [["dom.mozDownloads.enabled", false]]
     }, function() {
-      ise(navigator.mozDownloadManager, undefined, "navigator.mozDownloadManager is undefined");
+      is(navigator.mozDownloadManager, undefined, "navigator.mozDownloadManager is undefined");
       next();
     });
   },
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/events/ContentEventHandler.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/events/ContentEventHandler.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/events/ContentEventHandler.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/events/ContentEventHandler.cpp	2015-05-25 20:43:29.000000000 +0000
@@ -1053,6 +1053,7 @@
       NS_ENSURE_SUCCESS(rv, rv);
       aEvent->mReply.mRect = LayoutDevicePixel::FromUntyped(
         caretRect.ToOutsidePixels(caretFrame->PresContext()->AppUnitsPerDevPixel()));
+      aEvent->mReply.mWritingMode = caretFrame->GetWritingMode();
       aEvent->mReply.mOffset = aEvent->mInput.mOffset;
       aEvent->mSucceeded = true;
       return NS_OK;
@@ -1086,6 +1087,7 @@
 
   aEvent->mReply.mRect = LayoutDevicePixel::FromUntyped(
       rect.ToOutsidePixels(mPresContext->AppUnitsPerDevPixel()));
+  aEvent->mReply.mWritingMode = frame->GetWritingMode();
   aEvent->mSucceeded = true;
   return NS_OK;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/events/DOMEventTargetHelper.h firefox-trunk-41.0~a1~hg20150524r245419/dom/events/DOMEventTargetHelper.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/events/DOMEventTargetHelper.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/events/DOMEventTargetHelper.h	2015-05-25 20:43:29.000000000 +0000
@@ -121,7 +121,7 @@
                        JSContext* aCx,
                        JS::Value* aValue);
   using dom::EventTarget::GetEventHandler;
-  virtual nsIDOMWindow* GetOwnerGlobal() override
+  virtual nsIDOMWindow* GetOwnerGlobalForBindings() override
   {
     return nsPIDOMWindow::GetOuterFromCurrentInner(GetOwner());
   }
@@ -140,7 +140,12 @@
   void BindToOwner(nsPIDOMWindow* aOwner);
   void BindToOwner(DOMEventTargetHelper* aOther);
   virtual void DisconnectFromOwner();                   
-  nsIGlobalObject* GetParentObject() const {
+  nsIGlobalObject* GetParentObject() const
+  {
+    return GetOwnerGlobal();
+  }
+  virtual nsIGlobalObject* GetOwnerGlobal() const override
+  {
     nsCOMPtr<nsIGlobalObject> parentObject = do_QueryReferent(mParentObject);
     return parentObject;
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/events/DragEvent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/events/DragEvent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/events/DragEvent.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/events/DragEvent.cpp	2015-05-25 20:43:29.000000000 +0000
@@ -148,6 +148,7 @@
                          aParam.mCtrlKey, aParam.mAltKey, aParam.mShiftKey,
                          aParam.mMetaKey, aParam.mButton, aParam.mRelatedTarget,
                          aParam.mDataTransfer);
+  e->InitializeExtraMouseEventDictionaryMembers(aParam);
   e->SetTrusted(trusted);
   return e.forget();
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/events/EventDispatcher.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/events/EventDispatcher.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/events/EventDispatcher.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/events/EventDispatcher.cpp	2015-05-25 20:43:29.000000000 +0000
@@ -858,13 +858,6 @@
   }
   if (aEventType.LowerCaseEqualsLiteral("scrollareaevent"))
     return NS_NewDOMScrollAreaEvent(aDOMEvent, aOwner, aPresContext, nullptr);
-  if (aEventType.LowerCaseEqualsLiteral("closeevent")) {
-    CloseEventInit init;
-    nsRefPtr<CloseEvent> event =
-      CloseEvent::Constructor(aOwner, EmptyString(), init);
-    event.forget(aDOMEvent);
-    return NS_OK;
-  }
   // XXXkhuey Chrome supports popstateevent here, even though it provides no
   // initPopStateEvent method.  This is nuts ... but copying it is unlikely to
   // break the web.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/events/EventListenerManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/events/EventListenerManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/events/EventListenerManager.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/events/EventListenerManager.cpp	2015-05-25 20:43:29.000000000 +0000
@@ -1037,7 +1037,8 @@
   {
   }
 
-  virtual void AddDetails(mozilla::dom::ProfileTimelineMarker& aMarker) override
+  virtual void AddDetails(JSContext* aCx,
+                          mozilla::dom::ProfileTimelineMarker& aMarker) override
   {
     if (GetMetaData() == TRACING_INTERVAL_START) {
       aMarker.mType.Construct(GetCause());
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/events/EventTarget.h firefox-trunk-41.0~a1~hg20150524r245419/dom/events/EventTarget.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/events/EventTarget.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/events/EventTarget.h	2015-05-25 20:43:29.000000000 +0000
@@ -12,6 +12,7 @@
 #include "nsIAtom.h"
 
 class nsIDOMWindow;
+class nsIGlobalObject;
 
 namespace mozilla {
 
@@ -27,8 +28,8 @@
 
 // IID for the dom::EventTarget interface
 #define NS_EVENTTARGET_IID \
-{ 0xce3817d0, 0x177b, 0x402f, \
- { 0xae, 0x75, 0xf8, 0x4e, 0xbe, 0x5a, 0x07, 0xc3 } }
+{ 0x605158a9, 0xe229, 0x45b1, \
+ { 0xbc, 0x12, 0x02, 0x9f, 0xa3, 0xa9, 0x3f, 0xcb } }
 
 class EventTarget : public nsIDOMEventTarget,
                     public nsWrapperCache
@@ -69,7 +70,12 @@
   // Returns an outer window that corresponds to the inner window this event
   // target is associated with.  Will return null if the inner window is not the
   // current inner or if there is no window around at all.
-  virtual nsIDOMWindow* GetOwnerGlobal() = 0;
+  virtual nsIDOMWindow* GetOwnerGlobalForBindings() = 0;
+
+  // The global object this event target is associated with, if any.
+  // This may be an inner window or some other global object.  This
+  // will never be an outer window.
+  virtual nsIGlobalObject* GetOwnerGlobal() const = 0;
 
   /**
    * Get the event listener manager, creating it if it does not already exist.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/events/IMEContentObserver.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/events/IMEContentObserver.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/events/IMEContentObserver.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/events/IMEContentObserver.cpp	2015-05-25 20:43:29.000000000 +0000
@@ -32,6 +32,7 @@
 #include "nsPresContext.h"
 #include "nsThreadUtils.h"
 #include "nsWeakReference.h"
+#include "WritingModes.h"
 
 namespace mozilla {
 
@@ -247,6 +248,12 @@
   }
 }
 
+nsPresContext*
+IMEContentObserver::GetPresContext() const
+{
+  return mESM ? mESM->GetPresContext() : nullptr;
+}
+
 void
 IMEContentObserver::Destroy()
 {
@@ -331,12 +338,39 @@
 
   NS_IMETHOD Run()
   {
-    if (mDispatcher->GetWidget()) {
-      IMENotification notification(NOTIFY_IME_OF_SELECTION_CHANGE);
-      notification.mSelectionChangeData.mCausedByComposition =
-         mCausedByComposition;
-      mDispatcher->GetWidget()->NotifyIME(notification);
+    nsCOMPtr<nsIWidget> widget = mDispatcher->GetWidget();
+    nsPresContext* presContext = mDispatcher->GetPresContext();
+    if (!widget || !presContext) {
+      return NS_OK;
+    }
+
+    // XXX Cannot we cache some information for reducing the cost to compute
+    //     selection offset and writing mode?
+    WidgetQueryContentEvent selection(true, NS_QUERY_SELECTED_TEXT, widget);
+    ContentEventHandler handler(presContext);
+    handler.OnQuerySelectedText(&selection);
+    if (NS_WARN_IF(!selection.mSucceeded)) {
+      return NS_OK;
+    }
+
+    // The widget might be destroyed during querying the content since it
+    // causes flushing layout.
+    widget = mDispatcher->GetWidget();
+    if (!widget || NS_WARN_IF(widget->Destroyed())) {
+      return NS_OK;
     }
+
+    IMENotification notification(NOTIFY_IME_OF_SELECTION_CHANGE);
+    notification.mSelectionChangeData.mOffset =
+      selection.mReply.mOffset;
+    notification.mSelectionChangeData.mLength =
+      selection.mReply.mString.Length();
+    notification.mSelectionChangeData.SetWritingMode(
+                                        selection.GetWritingMode());
+    notification.mSelectionChangeData.mReversed = selection.mReply.mReversed;
+    notification.mSelectionChangeData.mCausedByComposition =
+      mCausedByComposition;
+    widget->NotifyIME(notification);
     return NS_OK;
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/events/IMEContentObserver.h firefox-trunk-41.0~a1~hg20150524r245419/dom/events/IMEContentObserver.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/events/IMEContentObserver.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/events/IMEContentObserver.h	2015-05-25 20:43:29.000000000 +0000
@@ -79,6 +79,7 @@
     return mUpdatePreference.WantDuringDeactive();
   }
   nsIWidget* GetWidget() const { return mWidget; }
+  nsPresContext* GetPresContext() const;
   nsresult GetSelectionAndRoot(nsISelection** aSelection,
                                nsIContent** aRoot) const;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/events/IMEStateManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/events/IMEStateManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/events/IMEStateManager.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/events/IMEStateManager.cpp	2015-05-25 20:43:29.000000000 +0000
@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "mozilla/IMEStateManager.h"
 
@@ -41,7 +41,6 @@
 using namespace dom;
 using namespace widget;
 
-#ifdef PR_LOGGING
 /**
  * When a method is called, log its arguments and/or related static variables
  * with PR_LOG_ALWAYS.  However, if it puts too many logs like
@@ -177,7 +176,6 @@
       return "unacceptable IME notification message";
   }
 }
-#endif // #ifdef PR_LOGGING
 
 nsIContent* IMEStateManager::sContent = nullptr;
 nsPresContext* IMEStateManager::sPresContext = nullptr;
@@ -194,18 +192,16 @@
 void
 IMEStateManager::Init()
 {
-#ifdef PR_LOGGING
   if (!sISMLog) {
     sISMLog = PR_NewLogModule("IMEStateManager");
   }
-#endif
 }
 
 // static
 void
 IMEStateManager::Shutdown()
 {
-  PR_LOG(sISMLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
     ("ISM: IMEStateManager::Shutdown(), "
      "sTextCompositions=0x%p, sTextCompositions->Length()=%u",
      sTextCompositions, sTextCompositions ? sTextCompositions->Length() : 0));
@@ -226,21 +222,19 @@
     TextCompositionArray::index_type i =
       sTextCompositions->IndexOf(aPresContext);
     if (i != TextCompositionArray::NoIndex) {
-      PR_LOG(sISMLog, PR_LOG_DEBUG,
+      MOZ_LOG(sISMLog, PR_LOG_DEBUG,
         ("ISM:   IMEStateManager::OnDestroyPresContext(), "
          "removing TextComposition instance from the array (index=%u)", i));
       // there should be only one composition per presContext object.
       sTextCompositions->ElementAt(i)->Destroy();
       sTextCompositions->RemoveElementAt(i);
-#if defined DEBUG || PR_LOGGING
       if (sTextCompositions->IndexOf(aPresContext) !=
             TextCompositionArray::NoIndex) {
-        PR_LOG(sISMLog, PR_LOG_ERROR,
+        MOZ_LOG(sISMLog, PR_LOG_ERROR,
           ("ISM:   IMEStateManager::OnDestroyPresContext(), FAILED to remove "
            "TextComposition instance from the array"));
         MOZ_CRASH("Failed to remove TextComposition instance from the array");
       }
-#endif // #if defined DEBUG || PR_LOGGING
     }
   }
 
@@ -248,7 +242,7 @@
     return NS_OK;
   }
 
-  PR_LOG(sISMLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
     ("ISM: IMEStateManager::OnDestroyPresContext(aPresContext=0x%p), "
      "sPresContext=0x%p, sContent=0x%p, sTextCompositions=0x%p",
      aPresContext, sPresContext, sContent, sTextCompositions));
@@ -280,7 +274,7 @@
       sTextCompositions->GetCompositionInContent(aPresContext, aContent);
 
     if (compositionInContent) {
-      PR_LOG(sISMLog, PR_LOG_DEBUG,
+      MOZ_LOG(sISMLog, PR_LOG_DEBUG,
         ("ISM:   IMEStateManager::OnRemoveContent(), "
          "composition is in the content"));
 
@@ -303,7 +297,7 @@
     return NS_OK;
   }
 
-  PR_LOG(sISMLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
     ("ISM: IMEStateManager::OnRemoveContent(aPresContext=0x%p, "
      "aContent=0x%p), sPresContext=0x%p, sContent=0x%p, sTextCompositions=0x%p",
      aPresContext, aContent, sPresContext, sContent, sTextCompositions));
@@ -331,7 +325,7 @@
                                nsIContent* aContent,
                                InputContextAction::Cause aCause)
 {
-  PR_LOG(sISMLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
     ("ISM: IMEStateManager::OnChangeFocus(aPresContext=0x%p, "
      "aContent=0x%p, aCause=%s)",
      aPresContext, aContent, GetActionCauseName(aCause)));
@@ -346,7 +340,7 @@
                                        nsIContent* aContent,
                                        InputContextAction aAction)
 {
-  PR_LOG(sISMLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
     ("ISM: IMEStateManager::OnChangeFocusInternal(aPresContext=0x%p, "
      "aContent=0x%p, aAction={ mCause=%s, mFocusChange=%s }), "
      "sPresContext=0x%p, sContent=0x%p, sActiveIMEContentObserver=0x%p",
@@ -374,7 +368,7 @@
   }
 
   if (!aPresContext) {
-    PR_LOG(sISMLog, PR_LOG_DEBUG,
+    MOZ_LOG(sISMLog, PR_LOG_DEBUG,
       ("ISM:   IMEStateManager::OnChangeFocusInternal(), "
        "no nsPresContext is being activated"));
     return NS_OK;
@@ -384,7 +378,7 @@
     (sPresContext == aPresContext) ? oldWidget.get() :
                                      aPresContext->GetRootWidget();
   if (NS_WARN_IF(!widget)) {
-    PR_LOG(sISMLog, PR_LOG_ERROR,
+    MOZ_LOG(sISMLog, PR_LOG_ERROR,
       ("ISM:   IMEStateManager::OnChangeFocusInternal(), FAILED due to "
        "no widget to manage its IME state"));
     return NS_OK;
@@ -402,7 +396,7 @@
   // on focus to the main process... but this cannot cause bugs like missed keypresses.
   // (It just means a lot of needless IPC.)
   if ((newState.mEnabled == IMEState::DISABLED) && TabParent::GetIMETabParent()) {
-    PR_LOG(sISMLog, PR_LOG_DEBUG,
+    MOZ_LOG(sISMLog, PR_LOG_DEBUG,
       ("ISM:   IMEStateManager::OnChangeFocusInternal(), "
        "Parent process cancels to set DISABLED state because the content process "
        "has IME focus and has already sets IME state"));  
@@ -417,7 +411,7 @@
     // we should do it.
     InputContext context = widget->GetInputContext();
     if (context.mIMEState.mEnabled == newState.mEnabled) {
-      PR_LOG(sISMLog, PR_LOG_DEBUG,
+      MOZ_LOG(sISMLog, PR_LOG_DEBUG,
         ("ISM:   IMEStateManager::OnChangeFocusInternal(), "
          "neither focus nor IME state is changing"));
       return NS_OK;
@@ -456,7 +450,7 @@
 void
 IMEStateManager::OnInstalledMenuKeyboardListener(bool aInstalling)
 {
-  PR_LOG(sISMLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
     ("ISM: IMEStateManager::OnInstalledMenuKeyboardListener(aInstalling=%s), "
      "sInstalledMenuKeyboardListener=%s",
      GetBoolName(aInstalling), GetBoolName(sInstalledMenuKeyboardListener)));
@@ -475,27 +469,27 @@
                                             nsIContent* aContent,
                                             nsIDOMMouseEvent* aMouseEvent)
 {
-  PR_LOG(sISMLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
     ("ISM: IMEStateManager::OnMouseButtonEventInEditor(aPresContext=0x%p, "
      "aContent=0x%p, aMouseEvent=0x%p), sPresContext=0x%p, sContent=0x%p",
      aPresContext, aContent, aMouseEvent, sPresContext, sContent));
 
   if (sPresContext != aPresContext || sContent != aContent) {
-    PR_LOG(sISMLog, PR_LOG_DEBUG,
+    MOZ_LOG(sISMLog, PR_LOG_DEBUG,
       ("ISM:   IMEStateManager::OnMouseButtonEventInEditor(), "
        "the mouse event isn't fired on the editor managed by ISM"));
     return false;
   }
 
   if (!sActiveIMEContentObserver) {
-    PR_LOG(sISMLog, PR_LOG_DEBUG,
+    MOZ_LOG(sISMLog, PR_LOG_DEBUG,
       ("ISM:   IMEStateManager::OnMouseButtonEventInEditor(), "
        "there is no active IMEContentObserver"));
     return false;
   }
 
   if (!sActiveIMEContentObserver->IsManaging(aPresContext, aContent)) {
-    PR_LOG(sISMLog, PR_LOG_DEBUG,
+    MOZ_LOG(sISMLog, PR_LOG_DEBUG,
       ("ISM:   IMEStateManager::OnMouseButtonEventInEditor(), "
        "the active IMEContentObserver isn't managing the editor"));
     return false;
@@ -504,7 +498,7 @@
   WidgetMouseEvent* internalEvent =
     aMouseEvent->GetInternalNSEvent()->AsMouseEvent();
   if (NS_WARN_IF(!internalEvent)) {
-    PR_LOG(sISMLog, PR_LOG_DEBUG,
+    MOZ_LOG(sISMLog, PR_LOG_DEBUG,
       ("ISM:   IMEStateManager::OnMouseButtonEventInEditor(), "
        "the internal event of aMouseEvent isn't WidgetMouseEvent"));
     return false;
@@ -513,15 +507,15 @@
   bool consumed =
     sActiveIMEContentObserver->OnMouseButtonEvent(aPresContext, internalEvent);
 
-#ifdef PR_LOGGING
-  nsAutoString eventType;
-  aMouseEvent->GetType(eventType);
-  PR_LOG(sISMLog, PR_LOG_ALWAYS,
-    ("ISM:   IMEStateManager::OnMouseButtonEventInEditor(), "
-     "mouse event (type=%s, button=%d) is %s",
-     NS_ConvertUTF16toUTF8(eventType).get(), internalEvent->button,
-     consumed ? "consumed" : "not consumed"));
-#endif
+  if (PR_LOG_TEST(sISMLog, PR_LOG_ALWAYS)) {
+    nsAutoString eventType;
+    aMouseEvent->GetType(eventType);
+    MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
+      ("ISM:   IMEStateManager::OnMouseButtonEventInEditor(), "
+       "mouse event (type=%s, button=%d) is %s",
+       NS_ConvertUTF16toUTF8(eventType).get(), internalEvent->button,
+       consumed ? "consumed" : "not consumed"));
+  }
 
   return consumed;
 }
@@ -532,13 +526,13 @@
                                  nsIContent* aContent,
                                  nsIDOMMouseEvent* aMouseEvent)
 {
-  PR_LOG(sISMLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
     ("ISM: IMEStateManager::OnClickInEditor(aPresContext=0x%p, aContent=0x%p, "
      "aMouseEvent=0x%p), sPresContext=0x%p, sContent=0x%p",
      aPresContext, aContent, aMouseEvent, sPresContext, sContent));
 
   if (sPresContext != aPresContext || sContent != aContent) {
-    PR_LOG(sISMLog, PR_LOG_DEBUG,
+    MOZ_LOG(sISMLog, PR_LOG_DEBUG,
       ("ISM:   IMEStateManager::OnClickInEditor(), "
        "the mouse event isn't fired on the editor managed by ISM"));
     return;
@@ -551,7 +545,7 @@
   nsresult rv = aMouseEvent->GetIsTrusted(&isTrusted);
   NS_ENSURE_SUCCESS_VOID(rv);
   if (!isTrusted) {
-    PR_LOG(sISMLog, PR_LOG_DEBUG,
+    MOZ_LOG(sISMLog, PR_LOG_DEBUG,
       ("ISM:   IMEStateManager::OnClickInEditor(), "
        "the mouse event isn't a trusted event"));
     return; // ignore untrusted event.
@@ -561,7 +555,7 @@
   rv = aMouseEvent->GetButton(&button);
   NS_ENSURE_SUCCESS_VOID(rv);
   if (button != 0) {
-    PR_LOG(sISMLog, PR_LOG_DEBUG,
+    MOZ_LOG(sISMLog, PR_LOG_DEBUG,
       ("ISM:   IMEStateManager::OnClickInEditor(), "
        "the mouse event isn't a left mouse button event"));
     return; // not a left click event.
@@ -571,7 +565,7 @@
   rv = aMouseEvent->GetDetail(&clickCount);
   NS_ENSURE_SUCCESS_VOID(rv);
   if (clickCount != 1) {
-    PR_LOG(sISMLog, PR_LOG_DEBUG,
+    MOZ_LOG(sISMLog, PR_LOG_DEBUG,
       ("ISM:   IMEStateManager::OnClickInEditor(), "
        "the mouse event isn't a single click event"));
     return; // should notify only first click event.
@@ -589,7 +583,7 @@
                                  nsIContent* aContent,
                                  nsIEditor* aEditor)
 {
-  PR_LOG(sISMLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
     ("ISM: IMEStateManager::OnFocusInEditor(aPresContext=0x%p, aContent=0x%p, "
      "aEditor=0x%p), sPresContext=0x%p, sContent=0x%p, "
      "sActiveIMEContentObserver=0x%p",
@@ -597,7 +591,7 @@
      sActiveIMEContentObserver));
 
   if (sPresContext != aPresContext || sContent != aContent) {
-    PR_LOG(sISMLog, PR_LOG_DEBUG,
+    MOZ_LOG(sISMLog, PR_LOG_DEBUG,
       ("ISM:   IMEStateManager::OnFocusInEditor(), "
        "an editor not managed by ISM gets focus"));
     return;
@@ -607,7 +601,7 @@
   // we need to recreate the instance.
   if (sActiveIMEContentObserver) {
     if (sActiveIMEContentObserver->IsManaging(aPresContext, aContent)) {
-      PR_LOG(sISMLog, PR_LOG_DEBUG,
+      MOZ_LOG(sISMLog, PR_LOG_DEBUG,
         ("ISM:   IMEStateManager::OnFocusInEditor(), "
          "the editor is already being managed by sActiveIMEContentObserver"));
       return;
@@ -624,7 +618,7 @@
                                 nsIContent* aContent,
                                 nsIEditor* aEditor)
 {
-  PR_LOG(sISMLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
     ("ISM: IMEStateManager::UpdateIMEState(aNewIMEState={ mEnabled=%s, "
      "mOpen=%s }, aContent=0x%p, aEditor=0x%p), "
      "sPresContext=0x%p, sContent=0x%p, sActiveIMEContentObserver=0x%p, "
@@ -635,21 +629,21 @@
      GetBoolName(sIsGettingNewIMEState)));
 
   if (sIsGettingNewIMEState) {
-    PR_LOG(sISMLog, PR_LOG_DEBUG,
+    MOZ_LOG(sISMLog, PR_LOG_DEBUG,
       ("ISM:   IMEStateManager::UpdateIMEState(), "
        "does nothing because of called while getting new IME state"));
     return;
   }
 
   if (NS_WARN_IF(!sPresContext)) {
-    PR_LOG(sISMLog, PR_LOG_ERROR,
+    MOZ_LOG(sISMLog, PR_LOG_ERROR,
       ("ISM:   IMEStateManager::UpdateIMEState(), FAILED due to "
        "no managing nsPresContext"));
     return;
   }
   nsCOMPtr<nsIWidget> widget = sPresContext->GetRootWidget();
   if (NS_WARN_IF(!widget)) {
-    PR_LOG(sISMLog, PR_LOG_ERROR,
+    MOZ_LOG(sISMLog, PR_LOG_ERROR,
       ("ISM:   IMEStateManager::UpdateIMEState(), FAILED due to "
        "no widget for the managing nsPresContext"));
     return;
@@ -690,7 +684,7 @@
 IMEStateManager::GetNewIMEState(nsPresContext* aPresContext,
                                 nsIContent*    aContent)
 {
-  PR_LOG(sISMLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
     ("ISM: IMEStateManager::GetNewIMEState(aPresContext=0x%p, aContent=0x%p), "
      "sInstalledMenuKeyboardListener=%s",
      aPresContext, aContent, GetBoolName(sInstalledMenuKeyboardListener)));
@@ -698,14 +692,14 @@
   // On Printing or Print Preview, we don't need IME.
   if (aPresContext->Type() == nsPresContext::eContext_PrintPreview ||
       aPresContext->Type() == nsPresContext::eContext_Print) {
-    PR_LOG(sISMLog, PR_LOG_DEBUG,
+    MOZ_LOG(sISMLog, PR_LOG_DEBUG,
       ("ISM:   IMEStateManager::GetNewIMEState() returns DISABLED because "
        "the nsPresContext is for print or print preview"));
     return IMEState(IMEState::DISABLED);
   }
 
   if (sInstalledMenuKeyboardListener) {
-    PR_LOG(sISMLog, PR_LOG_DEBUG,
+    MOZ_LOG(sISMLog, PR_LOG_DEBUG,
       ("ISM:   IMEStateManager::GetNewIMEState() returns DISABLED because "
        "menu keyboard listener was installed"));
     return IMEState(IMEState::DISABLED);
@@ -716,12 +710,12 @@
     // editable, such case is design mode.
     nsIDocument* doc = aPresContext->Document();
     if (doc && doc->HasFlag(NODE_IS_EDITABLE)) {
-      PR_LOG(sISMLog, PR_LOG_DEBUG,
+      MOZ_LOG(sISMLog, PR_LOG_DEBUG,
         ("ISM:   IMEStateManager::GetNewIMEState() returns ENABLED because "
          "design mode editor has focus"));
       return IMEState(IMEState::ENABLED);
     }
-    PR_LOG(sISMLog, PR_LOG_DEBUG,
+    MOZ_LOG(sISMLog, PR_LOG_DEBUG,
       ("ISM:   IMEStateManager::GetNewIMEState() returns DISABLED because "
        "no content has focus"));
     return IMEState(IMEState::DISABLED);
@@ -735,7 +729,7 @@
   GettingNewIMEStateBlocker blocker;
 
   IMEState newIMEState = aContent->GetDesiredIMEState();
-  PR_LOG(sISMLog, PR_LOG_DEBUG,
+  MOZ_LOG(sISMLog, PR_LOG_DEBUG,
     ("ISM:   IMEStateManager::GetNewIMEState() returns { mEnabled=%s, "
      "mOpen=%s }",
      GetIMEStateEnabledName(newIMEState.mEnabled),
@@ -756,7 +750,7 @@
     nsCOMPtr<nsIObserverService> observerService =
       services::GetObserverService();
     if (observerService) {
-      PR_LOG(sISMLog, PR_LOG_ALWAYS,
+      MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
         ("ISM: IMEEnabledStateChangedEvent::Run(), notifies observers of "
          "\"ime-enabled-state-changed\""));
       nsAutoString state;
@@ -778,7 +772,7 @@
                              nsIWidget* aWidget,
                              InputContextAction aAction)
 {
-  PR_LOG(sISMLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
     ("ISM: IMEStateManager::SetIMEState(aState={ mEnabled=%s, mOpen=%s }, "
      "aContent=0x%p, aWidget=0x%p, aAction={ mCause=%s, mFocusChange=%s })",
      GetIMEStateEnabledName(aState.mEnabled),
@@ -864,7 +858,7 @@
   }
 
 
-  PR_LOG(sISMLog, PR_LOG_DEBUG,
+  MOZ_LOG(sISMLog, PR_LOG_DEBUG,
     ("ISM:   IMEStateManager::SetIMEState(), "
      "calling nsIWidget::SetInputContext(context={ mIMEState={ mEnabled=%s, "
      "mOpen=%s }, mHTMLInputType=\"%s\", mHTMLInputInputmode=\"%s\", "
@@ -906,7 +900,7 @@
                    EventDispatchingCallback* aCallBack,
                    bool aIsSynthesized)
 {
-  PR_LOG(sISMLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
     ("ISM: IMEStateManager::DispatchCompositionEvent(aNode=0x%p, "
      "aPresContext=0x%p, aCompositionEvent={ message=%s, "
      "mFlags={ mIsTrusted=%s, mPropagationStopped=%s } }, "
@@ -935,7 +929,7 @@
     if (NS_WARN_IF(aIsSynthesized)) {
       return;
     }
-    PR_LOG(sISMLog, PR_LOG_DEBUG,
+    MOZ_LOG(sISMLog, PR_LOG_DEBUG,
       ("ISM:   IMEStateManager::DispatchCompositionEvent(), "
        "adding new TextComposition to the array"));
     MOZ_ASSERT(aCompositionEvent->message == NS_COMPOSITION_START);
@@ -971,7 +965,7 @@
     TextCompositionArray::index_type i =
       sTextCompositions->IndexOf(aCompositionEvent->widget);
     if (i != TextCompositionArray::NoIndex) {
-      PR_LOG(sISMLog, PR_LOG_DEBUG,
+      MOZ_LOG(sISMLog, PR_LOG_DEBUG,
         ("ISM:   IMEStateManager::DispatchCompositionEvent(), "
          "removing TextComposition from the array since NS_COMPOSTION_END "
          "was dispatched"));
@@ -989,7 +983,7 @@
   // Note that this method is never called for synthesized events for emulating
   // commit or cancel composition.
 
-  PR_LOG(sISMLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
     ("ISM: IMEStateManager::OnCompositionEventDiscarded(aCompositionEvent={ "
      "message=%s, mFlags={ mIsTrusted=%s } })",
      GetEventMessageName(aCompositionEvent->message),
@@ -1012,7 +1006,7 @@
     // a TextComposition instance for the composition was already removed from
     // the array and destroyed in OnDestroyPresContext().  Therefore, we may
     // fail to retrieve a TextComposition instance here.
-    PR_LOG(sISMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
       ("ISM:   IMEStateManager::OnCompositionEventDiscarded(), "
        "TextComposition instance for the widget has already gone"));
     return;
@@ -1033,14 +1027,14 @@
   bool isSynthesizedForTests =
     composition && composition->IsSynthesizedForTests();
 
-  PR_LOG(sISMLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
     ("ISM: IMEStateManager::NotifyIME(aMessage=%s, aWidget=0x%p), "
      "composition=0x%p, composition->IsSynthesizedForTests()=%s",
      GetNotifyIMEMessageName(aMessage), aWidget, composition.get(),
      GetBoolName(isSynthesizedForTests)));
 
   if (NS_WARN_IF(!aWidget)) {
-    PR_LOG(sISMLog, PR_LOG_ERROR,
+    MOZ_LOG(sISMLog, PR_LOG_ERROR,
       ("ISM:   IMEStateManager::NotifyIME(), FAILED due to no widget"));
     return NS_ERROR_INVALID_ARG;
   }
@@ -1068,7 +1062,7 @@
 IMEStateManager::NotifyIME(IMEMessage aMessage,
                            nsPresContext* aPresContext)
 {
-  PR_LOG(sISMLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
     ("ISM: IMEStateManager::NotifyIME(aMessage=%s, aPresContext=0x%p)",
      GetNotifyIMEMessageName(aMessage), aPresContext));
 
@@ -1076,7 +1070,7 @@
 
   nsIWidget* widget = aPresContext->GetRootWidget();
   if (NS_WARN_IF(!widget)) {
-    PR_LOG(sISMLog, PR_LOG_ERROR,
+    MOZ_LOG(sISMLog, PR_LOG_ERROR,
       ("ISM:   IMEStateManager::NotifyIME(), FAILED due to no widget for the "
        "nsPresContext"));
     return NS_ERROR_NOT_AVAILABLE;
@@ -1152,18 +1146,18 @@
 void
 IMEStateManager::DestroyIMEContentObserver()
 {
-  PR_LOG(sISMLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
     ("ISM: IMEStateManager::DestroyIMEContentObserver(), "
      "sActiveIMEContentObserver=0x%p",
      sActiveIMEContentObserver));
 
   if (!sActiveIMEContentObserver) {
-    PR_LOG(sISMLog, PR_LOG_DEBUG,
+    MOZ_LOG(sISMLog, PR_LOG_DEBUG,
       ("ISM:   IMEStateManager::DestroyIMEContentObserver() does nothing"));
     return;
   }
 
-  PR_LOG(sISMLog, PR_LOG_DEBUG,
+  MOZ_LOG(sISMLog, PR_LOG_DEBUG,
     ("ISM:   IMEStateManager::DestroyIMEContentObserver(), destroying "
      "the active IMEContentObserver..."));
   nsRefPtr<IMEContentObserver> tsm;
@@ -1175,7 +1169,7 @@
 void
 IMEStateManager::CreateIMEContentObserver(nsIEditor* aEditor)
 {
-  PR_LOG(sISMLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
     ("ISM: IMEStateManager::CreateIMEContentObserver(aEditor=0x%p), "
      "sPresContext=0x%p, sContent=0x%p, sActiveIMEContentObserver=0x%p, "
      "sActiveIMEContentObserver->IsManaging(sPresContext, sContent)=%s",
@@ -1184,7 +1178,7 @@
        sActiveIMEContentObserver->IsManaging(sPresContext, sContent) : false)));
 
   if (NS_WARN_IF(sActiveIMEContentObserver)) {
-    PR_LOG(sISMLog, PR_LOG_ERROR,
+    MOZ_LOG(sISMLog, PR_LOG_ERROR,
       ("ISM:   IMEStateManager::CreateIMEContentObserver(), FAILED due to "
        "there is already an active IMEContentObserver"));
     MOZ_ASSERT(sActiveIMEContentObserver->IsManaging(sPresContext, sContent));
@@ -1193,7 +1187,7 @@
 
   nsCOMPtr<nsIWidget> widget = sPresContext->GetRootWidget();
   if (!widget) {
-    PR_LOG(sISMLog, PR_LOG_ERROR,
+    MOZ_LOG(sISMLog, PR_LOG_ERROR,
       ("ISM:   IMEStateManager::CreateIMEContentObserver(), FAILED due to "
        "there is a root widget for the nsPresContext"));
     return; // Sometimes, there are no widgets.
@@ -1201,7 +1195,7 @@
 
   // If it's not text ediable, we don't need to create IMEContentObserver.
   if (!IsEditableIMEState(widget)) {
-    PR_LOG(sISMLog, PR_LOG_DEBUG,
+    MOZ_LOG(sISMLog, PR_LOG_DEBUG,
       ("ISM:   IMEStateManager::CreateIMEContentObserver() doesn't create "
        "IMEContentObserver because of non-editable IME state"));
     return;
@@ -1213,7 +1207,7 @@
     sInitializeIsTestingIME = false;
   }
 
-  PR_LOG(sISMLog, PR_LOG_DEBUG,
+  MOZ_LOG(sISMLog, PR_LOG_DEBUG,
     ("ISM:   IMEStateManager::CreateIMEContentObserver() is creating an "
      "IMEContentObserver instance..."));
   sActiveIMEContentObserver = new IMEContentObserver();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/events/MouseEvent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/events/MouseEvent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/events/MouseEvent.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/events/MouseEvent.cpp	2015-05-25 20:43:29.000000000 +0000
@@ -138,6 +138,15 @@
   }
 }
 
+void
+MouseEvent::InitializeExtraMouseEventDictionaryMembers(const MouseEventInit& aParam)
+{
+  InitModifiers(aParam);
+  mEvent->AsMouseEventBase()->buttons = aParam.mButtons;
+  mMovementPoint.x = aParam.mMovementX;
+  mMovementPoint.y = aParam.mMovementY;
+}
+
 already_AddRefed<MouseEvent>
 MouseEvent::Constructor(const GlobalObject& aGlobal,
                         const nsAString& aType,
@@ -153,11 +162,8 @@
                     aParam.mCtrlKey, aParam.mAltKey, aParam.mShiftKey,
                     aParam.mMetaKey, aParam.mButton, aParam.mRelatedTarget,
                     aRv);
-  e->InitModifiers(aParam);
+  e->InitializeExtraMouseEventDictionaryMembers(aParam);
   e->SetTrusted(trusted);
-  MOZ_RELEASE_ASSERT(e->mEvent->AsMouseEventBase(),
-                     "mEvent of MouseEvent must inherit WidgetMouseEventBase");
-  e->mEvent->AsMouseEventBase()->buttons = aParam.mButtons;
 
   return e.forget();
 }
@@ -305,7 +311,7 @@
 MouseEvent::GetMozMovementX(int32_t* aMovementX)
 {
   NS_ENSURE_ARG_POINTER(aMovementX);
-  *aMovementX = MozMovementX();
+  *aMovementX = MovementX();
 
   return NS_OK;
 }
@@ -314,7 +320,7 @@
 MouseEvent::GetMozMovementY(int32_t* aMovementY)
 {
   NS_ENSURE_ARG_POINTER(aMovementY);
-  *aMovementY = MozMovementY();
+  *aMovementY = MovementY();
 
   return NS_OK;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/events/MouseEvent.h firefox-trunk-41.0~a1~hg20150524r245419/dom/events/MouseEvent.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/events/MouseEvent.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/events/MouseEvent.h	2015-05-25 20:43:29.000000000 +0000
@@ -69,6 +69,9 @@
                          aShiftKey, aMetaKey, aButton,
                          aRelatedTarget);
   }
+
+  void InitializeExtraMouseEventDictionaryMembers(const MouseEventInit& aParam);
+
   bool GetModifierState(const nsAString& aKeyArg)
   {
     return GetModifierStateInternal(aKeyArg);
@@ -77,11 +80,11 @@
                                                   const nsAString& aType,
                                                   const MouseEventInit& aParam,
                                                   ErrorResult& aRv);
-  int32_t MozMovementX()
+  int32_t MovementX()
   {
     return GetMovementPoint().x;
   }
-  int32_t MozMovementY()
+  int32_t MovementY()
   {
     return GetMovementPoint().y;
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/events/PointerEvent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/events/PointerEvent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/events/PointerEvent.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/events/PointerEvent.cpp	2015-05-25 20:43:29.000000000 +0000
@@ -82,7 +82,7 @@
                     aParam.mScreenY, aParam.mClientX, aParam.mClientY,
                     false, false, false, false, aParam.mButton,
                     aParam.mRelatedTarget);
-  e->InitModifiers(aParam);
+  e->InitializeExtraMouseEventDictionaryMembers(aParam);
 
   WidgetPointerEvent* widgetEvent = e->mEvent->AsPointerEvent();
   widgetEvent->pointerId = aParam.mPointerId;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/events/test/test_bug1013412.html firefox-trunk-41.0~a1~hg20150524r245419/dom/events/test/test_bug1013412.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/events/test/test_bug1013412.html	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/events/test/test_bug1013412.html	2015-05-25 20:43:29.000000000 +0000
@@ -93,8 +93,15 @@
   SimpleTest.finish();
 }
 
+function startTest() {
+  // If we allow smooth scrolling the "smooth" scrolling may cause the page to
+  // glide past the scrollbox (which is supposed to stop the scrolling) and so
+  // we might end up at the bottom of the page.
+  SpecialPowers.pushPrefEnv({"set": [["general.smoothScroll", false]]}, runTest);
+}
+
 SimpleTest.waitForExplicitFinish();
-SimpleTest.waitForFocus(runTest, window);
+SimpleTest.waitForFocus(startTest, window);
 
 </script>
 </pre>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/events/test/test_dom_mouse_event.html firefox-trunk-41.0~a1~hg20150524r245419/dom/events/test/test_dom_mouse_event.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/events/test/test_dom_mouse_event.html	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/events/test/test_dom_mouse_event.html	2015-05-25 20:43:29.000000000 +0000
@@ -107,6 +107,10 @@
     }
     is(e.isTrusted, false, description + "isTrusted returns wrong value");
     is(e.buttons, 0, description + "buttons returns wrong value");
+    is(e.movementX, 0, description + "movementX returns wrong value");
+    is(e.movementY, 0, description + "movementY returns wrong value");
+    is(e.movementX, e.mozMovementX);
+    is(e.movementY, e.mozMovementY);
 
     // getModifierState() tests
     is(e.getModifierState("Shift"), kTest.shiftKey,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/events/test/test_eventctors.html firefox-trunk-41.0~a1~hg20150524r245419/dom/events/test/test_eventctors.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/events/test/test_eventctors.html	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/events/test/test_eventctors.html	2015-05-25 20:43:29.000000000 +0000
@@ -696,11 +696,14 @@
 ok(ex, "MouseEvent: First parameter is required!");
 ex = false;
 
-e = new MouseEvent("hello");
+e = new MouseEvent("hello",  { buttons: 1, movementX: 2, movementY: 3});
 is(e.type, "hello", "MouseEvent: Wrong event type!");
 ok(!e.isTrusted, "MouseEvent: Event shouldn't be trusted!");
 ok(!e.bubbles, "MouseEvent: Event shouldn't bubble!");
 ok(!e.cancelable, "MouseEvent: Event shouldn't be cancelable!");
+is(e.buttons, 1);
+is(e.movementX, 2);
+is(e.movementY, 3);
 document.dispatchEvent(e);
 is(receivedEvent, e, "MouseEvent: Wrong event!");
 
@@ -724,7 +727,7 @@
   { modifierSymbolLock: false },
   { button: 0 },
   { buttons: 0 },
-  { relatedTarget: null }
+  { relatedTarget: null },
 ];
 
 var testProps =
@@ -811,8 +814,11 @@
 ok(ex, "WheelEvent: First parameter is required!");
 ex = false;
 
-e = new WheelEvent("hello");
+e = new WheelEvent("hello",  { buttons: 1, movementX: 2, movementY: 3});
 is(e.type, "hello", "WheelEvent: Wrong event type!");
+is(e.buttons, 1);
+is(e.movementX, 2);
+is(e.movementY, 3);
 ok(!e.isTrusted, "WheelEvent: Event shouldn't be trusted!");
 ok(!e.bubbles, "WheelEvent: Event shouldn't bubble!");
 ok(!e.cancelable, "WheelEvent: Event shouldn't be cancelable!");
@@ -907,8 +913,11 @@
 ok(ex, "DragEvent: First parameter is required!");
 ex = false;
 
-e = new DragEvent("hello");
+e = new DragEvent("hello", { buttons: 1, movementX: 2, movementY: 3});
 is(e.type, "hello", "DragEvent: Wrong event type!");
+is(e.buttons, 1);
+is(e.movementX, 2);
+is(e.movementY, 3);
 document.dispatchEvent(e);
 is(receivedEvent, e, "DragEvent: Wrong event!");
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/events/Touch.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/events/Touch.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/events/Touch.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/events/Touch.cpp	2015-05-25 20:43:29.000000000 +0000
@@ -136,21 +136,16 @@
   return TouchBinding::Wrap(aCx, this, aGivenProto);
 }
 
-// Parent ourselves to the window of the target. This achieves the desirable
+// Parent ourselves to the global of the target. This achieves the desirable
 // effects of parenting to the target, but avoids making the touch inaccessible
 // when the target happens to be NAC and therefore reflected into the XBL scope.
-EventTarget*
+nsIGlobalObject*
 Touch::GetParentObject()
 {
   if (!mTarget) {
     return nullptr;
   }
-  nsCOMPtr<nsPIDOMWindow> outer = do_QueryInterface(mTarget->GetOwnerGlobal());
-  if (!outer) {
-    return nullptr;
-  }
-  MOZ_ASSERT(outer->IsOuterWindow());
-  return static_cast<nsGlobalWindow*>(outer->GetCurrentInnerWindow());
+  return mTarget->GetOwnerGlobal();
 }
 
 } // namespace dom
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/events/TouchEvent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/events/TouchEvent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/events/TouchEvent.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/events/TouchEvent.cpp	2015-05-25 20:43:29.000000000 +0000
@@ -10,15 +10,10 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/TouchEvents.h"
 #include "nsContentUtils.h"
+#include "mozilla/WidgetUtils.h"
 
 namespace mozilla {
 
-#ifdef XP_WIN
-namespace widget {
-extern int32_t IsTouchDeviceSupportPresent();
-} // namespace widget
-#endif // #ifdef XP_WIN
-
 namespace dom {
 
 /******************************************************************************
@@ -188,8 +183,7 @@
 {
   bool prefValue = false;
   int32_t flag = 0;
-  if (NS_SUCCEEDED(Preferences::GetInt("dom.w3c_touch_events.enabled",
-                                        &flag))) {
+  if (NS_SUCCEEDED(Preferences::GetInt("dom.w3c_touch_events.enabled", &flag))) {
     if (flag == 2) {
 #ifdef XP_WIN
       static bool sDidCheckTouchDeviceSupport = false;
@@ -197,7 +191,7 @@
       // On Windows we auto-detect based on device support.
       if (!sDidCheckTouchDeviceSupport) {
         sDidCheckTouchDeviceSupport = true;
-        sIsTouchDeviceSupportPresent = widget::IsTouchDeviceSupportPresent();
+        sIsTouchDeviceSupportPresent = WidgetUtils::IsTouchDeviceSupportPresent();
       }
       prefValue = sIsTouchDeviceSupportPresent;
 #else
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/events/Touch.h firefox-trunk-41.0~a1~hg20150524r245419/dom/events/Touch.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/events/Touch.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/events/Touch.h	2015-05-25 20:43:29.000000000 +0000
@@ -57,7 +57,7 @@
 
   virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
-  EventTarget* GetParentObject();
+  nsIGlobalObject* GetParentObject();
 
   // WebIDL
   int32_t Identifier() const { return mIdentifier; }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/events/UIEvent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/events/UIEvent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/events/UIEvent.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/events/UIEvent.cpp	2015-05-25 20:43:29.000000000 +0000
@@ -114,7 +114,7 @@
 nsIntPoint
 UIEvent::GetMovementPoint()
 {
-  if (mPrivateDataDuplicated) {
+  if (mPrivateDataDuplicated || mEventIsInternal) {
     return mMovementPoint;
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/events/WheelEvent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/events/WheelEvent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/events/WheelEvent.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/events/WheelEvent.cpp	2015-05-25 20:43:29.000000000 +0000
@@ -164,8 +164,7 @@
                           aParam.mButton, aParam.mRelatedTarget,
                           EmptyString(), aParam.mDeltaX,
                           aParam.mDeltaY, aParam.mDeltaZ, aParam.mDeltaMode);
-  e->InitModifiers(aParam);
-  e->mEvent->AsWheelEvent()->buttons = aParam.mButtons;
+  e->InitializeExtraMouseEventDictionaryMembers(aParam);
   e->SetTrusted(trusted);
   return e.forget();
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/fetch/Fetch.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/fetch/Fetch.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/fetch/Fetch.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/fetch/Fetch.cpp	2015-05-25 20:43:30.000000000 +0000
@@ -450,9 +450,10 @@
                 nsCString& aContentType)
 {
   nsRefPtr<BlobImpl> impl = aBlob.Impl();
-  nsresult rv = impl->GetInternalStream(aStream);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
+  ErrorResult rv;
+  impl->GetInternalStream(aStream, rv);
+  if (NS_WARN_IF(rv.Failed())) {
+    return rv.StealNSResult();
   }
 
   nsAutoString type;
@@ -1527,7 +1528,7 @@
       data.Adopt(reinterpret_cast<char*>(aResult), aResultLength);
       autoFree.Reset();
 
-      NS_NAMED_LITERAL_CSTRING(formDataMimeType, NS_LITERAL_CSTRING("multipart/form-data"));
+      NS_NAMED_LITERAL_CSTRING(formDataMimeType, "multipart/form-data");
 
       // Allow semicolon separated boundary/encoding suffix like multipart/form-data; boundary=
       // but disallow multipart/form-datafoobar.
@@ -1550,7 +1551,7 @@
         MOZ_ASSERT(fd);
         localPromise->MaybeResolve(fd);
       } else {
-        NS_NAMED_LITERAL_CSTRING(urlDataMimeType, NS_LITERAL_CSTRING("application/x-www-form-urlencoded"));
+        NS_NAMED_LITERAL_CSTRING(urlDataMimeType, "application/x-www-form-urlencoded");
         bool isValidUrlEncodedMimeType = StringBeginsWith(mMimeType, urlDataMimeType);
 
         if (isValidUrlEncodedMimeType && mMimeType.Length() > urlDataMimeType.Length()) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/fetch/FetchDriver.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/fetch/FetchDriver.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/fetch/FetchDriver.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/fetch/FetchDriver.cpp	2015-05-25 20:43:30.000000000 +0000
@@ -217,36 +217,34 @@
     }
 
     nsRefPtr<InternalResponse> response = new InternalResponse(200, NS_LITERAL_CSTRING("OK"));
-    {
-      ErrorResult result;
-      uint64_t size = blob->GetSize(result);
-      if (NS_WARN_IF(result.Failed())) {
-        FailWithNetworkError();
-        return result.StealNSResult();
-      }
+    ErrorResult result;
+    uint64_t size = blob->GetSize(result);
+    if (NS_WARN_IF(result.Failed())) {
+      FailWithNetworkError();
+      return result.StealNSResult();
+    }
 
-      nsAutoString sizeStr;
-      sizeStr.AppendInt(size);
-      response->Headers()->Append(NS_LITERAL_CSTRING("Content-Length"), NS_ConvertUTF16toUTF8(sizeStr), result);
-      if (NS_WARN_IF(result.Failed())) {
-        FailWithNetworkError();
-        return result.StealNSResult();
-      }
+    nsAutoString sizeStr;
+    sizeStr.AppendInt(size);
+    response->Headers()->Append(NS_LITERAL_CSTRING("Content-Length"), NS_ConvertUTF16toUTF8(sizeStr), result);
+    if (NS_WARN_IF(result.Failed())) {
+      FailWithNetworkError();
+      return result.StealNSResult();
+    }
 
-      nsAutoString type;
-      blob->GetType(type);
-      response->Headers()->Append(NS_LITERAL_CSTRING("Content-Type"), NS_ConvertUTF16toUTF8(type), result);
-      if (NS_WARN_IF(result.Failed())) {
-        FailWithNetworkError();
-        return result.StealNSResult();
-      }
+    nsAutoString type;
+    blob->GetType(type);
+    response->Headers()->Append(NS_LITERAL_CSTRING("Content-Type"), NS_ConvertUTF16toUTF8(type), result);
+    if (NS_WARN_IF(result.Failed())) {
+      FailWithNetworkError();
+      return result.StealNSResult();
     }
 
     nsCOMPtr<nsIInputStream> stream;
-    rv = blob->GetInternalStream(getter_AddRefs(stream));
-    if (NS_WARN_IF(NS_FAILED(rv))) {
+    blob->GetInternalStream(getter_AddRefs(stream), result);
+    if (NS_WARN_IF(result.Failed())) {
       FailWithNetworkError();
-      return rv;
+      return result.StealNSResult();
     }
 
     response->SetBody(stream);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/fetch/InternalResponse.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/fetch/InternalResponse.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/fetch/InternalResponse.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/fetch/InternalResponse.cpp	2015-05-25 20:43:30.000000000 +0000
@@ -6,8 +6,6 @@
 
 #include "InternalResponse.h"
 
-#include "nsIDOMFile.h"
-
 #include "mozilla/dom/InternalHeaders.h"
 #include "nsStreamUtils.h"
 #include "nsSerializationHelper.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/fetch/Request.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/fetch/Request.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/fetch/Request.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/fetch/Request.cpp	2015-05-25 20:43:30.000000000 +0000
@@ -127,6 +127,7 @@
                      const RequestInit& aInit, ErrorResult& aRv)
 {
   nsRefPtr<InternalRequest> request;
+  bool inputRequestHasBody = false;
 
   nsCOMPtr<nsIGlobalObject> global = do_QueryInterface(aGlobal.GetAsSupports());
 
@@ -135,6 +136,7 @@
     nsCOMPtr<nsIInputStream> body;
     inputReq->GetBody(getter_AddRefs(body));
     if (body) {
+      inputRequestHasBody = true;
       if (inputReq->BodyUsed()) {
         aRv.ThrowTypeError(MSG_FETCH_BODY_CONSUMED_ERROR);
         return nullptr;
@@ -288,7 +290,7 @@
     return nullptr;
   }
 
-  if (aInit.mBody.WasPassed()) {
+  if (aInit.mBody.WasPassed() || inputRequestHasBody) {
     // HEAD and GET are not allowed to have a body.
     nsAutoCString method;
     request->GetMethod(method);
@@ -297,7 +299,9 @@
       aRv.ThrowTypeError(MSG_NO_BODY_ALLOWED_FOR_GET_AND_HEAD);
       return nullptr;
     }
+  }
 
+  if (aInit.mBody.WasPassed()) {
     const OwningArrayBufferOrArrayBufferViewOrBlobOrFormDataOrUSVStringOrURLSearchParams& bodyInit = aInit.mBody.Value();
     nsCOMPtr<nsIInputStream> stream;
     nsAutoCString contentType;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/filehandle/FileHandle.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/filehandle/FileHandle.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/filehandle/FileHandle.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/filehandle/FileHandle.cpp	2015-05-25 20:43:30.000000000 +0000
@@ -632,8 +632,8 @@
   }
 
   nsCOMPtr<nsIInputStream> stream;
-  aRv = file.GetInternalStream(getter_AddRefs(stream));
-  if (aRv.Failed()) {
+  file.GetInternalStream(getter_AddRefs(stream), aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
     return nullptr;
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/filesystem/CreateFileTask.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/filesystem/CreateFileTask.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/filesystem/CreateFileTask.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/filesystem/CreateFileTask.cpp	2015-05-25 20:43:30.000000000 +0000
@@ -40,8 +40,8 @@
   GetOutputBufferSize();
   if (aBlobData) {
     if (FileSystemUtils::IsParentProcess()) {
-      nsresult rv = aBlobData->GetInternalStream(getter_AddRefs(mBlobStream));
-      NS_WARN_IF(NS_FAILED(rv));
+      aBlobData->GetInternalStream(getter_AddRefs(mBlobStream), aRv);
+      NS_WARN_IF(aRv.Failed());
     } else {
       mBlobData = aBlobData;
     }
@@ -56,8 +56,8 @@
 }
 
 CreateFileTask::CreateFileTask(FileSystemBase* aFileSystem,
-                       const FileSystemCreateFileParams& aParam,
-                       FileSystemRequestParent* aParent)
+                               const FileSystemCreateFileParams& aParam,
+                               FileSystemRequestParent* aParent)
   : FileSystemTaskBase(aFileSystem, aParam, aParent)
   , mReplace(false)
 {
@@ -82,8 +82,11 @@
   nsRefPtr<BlobImpl> blobImpl = bp->GetBlobImpl();
   MOZ_ASSERT(blobImpl, "blobData should not be null.");
 
-  nsresult rv = blobImpl->GetInternalStream(getter_AddRefs(mBlobStream));
-  NS_WARN_IF(NS_FAILED(rv));
+  ErrorResult rv;
+  blobImpl->GetInternalStream(getter_AddRefs(mBlobStream), rv);
+  if (NS_WARN_IF(rv.Failed())) {
+    rv.SuppressException();
+  }
 }
 
 CreateFileTask::~CreateFileTask()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/geolocation/nsGeolocation.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/geolocation/nsGeolocation.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/geolocation/nsGeolocation.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/geolocation/nsGeolocation.cpp	2015-05-25 20:43:30.000000000 +0000
@@ -465,15 +465,7 @@
     return NS_OK;
   }
 
-  // Kick off the geo device, if it isn't already running
   nsRefPtr<nsGeolocationService> gs = nsGeolocationService::GetGeolocationService();
-  nsresult rv = gs->StartDevice(GetPrincipal());
-
-  if (NS_FAILED(rv)) {
-    // Location provider error
-    NotifyError(nsIDOMGeoPositionError::POSITION_UNAVAILABLE);
-    return NS_OK;
-  }
 
   bool canUseCache = false;
   CachedPositionAndAccuracy lastPosition = gs->GetCachedPosition();
@@ -497,6 +489,15 @@
     // getCurrentPosition requests serviced by the cache
     // will now be owned by the RequestSendLocationEvent
     Update(lastPosition.position);
+  } else {
+    // Kick off the geo device, if it isn't already running
+    nsresult rv = gs->StartDevice(GetPrincipal());
+
+    if (NS_FAILED(rv)) {
+      // Location provider error
+      NotifyError(nsIDOMGeoPositionError::POSITION_UNAVAILABLE);
+      return NS_OK;
+    }
   }
 
   if (mIsWatchPositionRequest || !canUseCache) {
@@ -957,7 +958,9 @@
 NS_IMETHODIMP
 nsGeolocationService::Update(nsIDOMGeoPosition *aSomewhere)
 {
-  SetCachedPosition(aSomewhere);
+  if (aSomewhere) {
+    SetCachedPosition(aSomewhere);
+  }
 
   for (uint32_t i = 0; i< mGeolocators.Length(); i++) {
     mGeolocators[i]->Update(aSomewhere);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLAnchorElement.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLAnchorElement.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLAnchorElement.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLAnchorElement.cpp	2015-05-25 20:43:30.000000000 +0000
@@ -344,7 +344,7 @@
 NS_IMETHODIMP    
 HTMLAnchorElement::GetText(nsAString& aText)
 {
-  if(!nsContentUtils::GetNodeTextContent(this, true, aText)) {
+  if(!nsContentUtils::GetNodeTextContent(this, true, aText, fallible)) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
   return NS_OK;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLCanvasElement.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLCanvasElement.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLCanvasElement.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLCanvasElement.cpp	2015-05-25 20:43:30.000000000 +0000
@@ -13,6 +13,7 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Base64.h"
 #include "mozilla/CheckedInt.h"
+#include "mozilla/dom/CanvasCaptureMediaStream.h"
 #include "mozilla/dom/CanvasRenderingContext2D.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/HTMLCanvasElementBinding.h"
@@ -405,6 +406,53 @@
   return mPrintCallback;
 }
 
+already_AddRefed<CanvasCaptureMediaStream>
+HTMLCanvasElement::CaptureStream(const Optional<double>& aFrameRate,
+                                 ErrorResult& aRv)
+{
+  if (IsWriteOnly()) {
+    aRv.Throw(NS_ERROR_DOM_SECURITY_ERR);
+    return nullptr;
+  }
+
+  nsIDOMWindow* window = OwnerDoc()->GetInnerWindow();
+  if (!window) {
+    aRv.Throw(NS_ERROR_FAILURE);
+    return nullptr;
+  }
+
+  if (!mCurrentContext) {
+    aRv.Throw(NS_ERROR_NOT_INITIALIZED);
+    return nullptr;
+  }
+
+  if (mCurrentContextType != CanvasContextType::Canvas2D) {
+    WebGLContext* gl = static_cast<WebGLContext*>(mCurrentContext.get());
+    if (!gl->IsPreservingDrawingBuffer()) {
+      aRv.Throw(NS_ERROR_FAILURE);
+      return nullptr;
+    }
+  }
+
+  nsRefPtr<CanvasCaptureMediaStream> stream =
+    CanvasCaptureMediaStream::CreateSourceStream(window, this);
+  if (!stream) {
+    aRv.Throw(NS_ERROR_FAILURE);
+    return nullptr;
+  }
+
+  nsRefPtr<nsIPrincipal> principal = NodePrincipal();
+  stream->CombineWithPrincipal(principal);
+
+  TrackID videoTrackId = 1;
+  nsresult rv = stream->Init(aFrameRate, videoTrackId);
+  if (NS_FAILED(rv)) {
+    aRv.Throw(rv);
+    return nullptr;
+  }
+  return stream.forget();
+}
+
 nsresult
 HTMLCanvasElement::ExtractData(nsAString& aType,
                                const nsAString& aOptions,
@@ -558,9 +606,12 @@
     nsresult ReceiveBlob(already_AddRefed<Blob> aBlob)
     {
       nsRefPtr<Blob> blob = aBlob;
-      uint64_t size;
-      nsresult rv = blob->GetSize(&size);
-      if (NS_SUCCEEDED(rv)) {
+
+      ErrorResult rv;
+      uint64_t size = blob->GetSize(rv);
+      if (rv.Failed()) {
+        rv.SuppressException();
+      } else {
         AutoJSAPI jsapi;
         if (jsapi.Init(mGlobal)) {
           JS_updateMallocCounter(jsapi.cx(), size);
@@ -569,13 +620,12 @@
 
       nsRefPtr<Blob> newBlob = Blob::Create(mGlobal, blob->Impl());
 
-      mozilla::ErrorResult error;
-      mFileCallback->Call(*newBlob, error);
+      mFileCallback->Call(*newBlob, rv);
 
       mGlobal = nullptr;
       mFileCallback = nullptr;
 
-      return error.StealNSResult();
+      return rv.StealNSResult();
     }
 
     nsCOMPtr<nsIGlobalObject> mGlobal;
@@ -599,16 +649,22 @@
                                 const nsAString& aType,
                                 ErrorResult& aRv)
 {
-  nsCOMPtr<nsIDOMFile> file;
+  nsCOMPtr<nsISupports> file;
   aRv = MozGetAsFile(aName, aType, getter_AddRefs(file));
-  nsRefPtr<File> tmp = static_cast<File*>(file.get());
-  return tmp.forget();
+  if (NS_WARN_IF(aRv.Failed())) {
+    return nullptr;
+  }
+
+  nsCOMPtr<nsIDOMBlob> blob = do_QueryInterface(file);
+  nsRefPtr<Blob> domBlob = static_cast<Blob*>(blob.get());
+  MOZ_ASSERT(domBlob->IsFile());
+  return domBlob->ToFile();
 }
 
 NS_IMETHODIMP
 HTMLCanvasElement::MozGetAsFile(const nsAString& aName,
                                 const nsAString& aType,
-                                nsIDOMFile** aResult)
+                                nsISupports** aResult)
 {
   OwnerDoc()->WarnOnceAbout(nsIDocument::eMozGetAsFile);
 
@@ -624,7 +680,7 @@
 nsresult
 HTMLCanvasElement::MozGetAsBlobImpl(const nsAString& aName,
                                     const nsAString& aType,
-                                    nsIDOMFile** aResult)
+                                    nsISupports** aResult)
 {
   nsCOMPtr<nsIInputStream> stream;
   nsAutoString type(aType);
@@ -648,7 +704,7 @@
   nsCOMPtr<nsPIDOMWindow> win = do_QueryInterface(OwnerDoc()->GetScopeObject());
 
   // The File takes ownership of the buffer
-  nsRefPtr<File> file =
+  nsCOMPtr<nsIDOMBlob> file =
     File::CreateMemoryFile(win, imgData, (uint32_t)imgSize, aName, type,
                            PR_Now());
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLCanvasElement.h firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLCanvasElement.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLCanvasElement.h	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLCanvasElement.h	2015-05-25 20:43:30.000000000 +0000
@@ -29,7 +29,7 @@
 }
 
 namespace dom {
-
+class CanvasCaptureMediaStream;
 class File;
 class FileCallback;
 class HTMLCanvasPrintState;
@@ -126,6 +126,9 @@
   PrintCallback* GetMozPrintCallback() const;
   void SetMozPrintCallback(PrintCallback* aCallback);
 
+  already_AddRefed<CanvasCaptureMediaStream>
+  CaptureStream(const Optional<double>& aFrameRate, ErrorResult& aRv);
+
   /**
    * Get the size in pixels of this canvas element
    */
@@ -234,7 +237,7 @@
                          nsAString& aDataURL);
   nsresult MozGetAsBlobImpl(const nsAString& aName,
                             const nsAString& aType,
-                            nsIDOMFile** aResult);
+                            nsISupports** aResult);
   void CallPrintCallback();
 
   CanvasContextType mCurrentContextType;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLElement.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLElement.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLElement.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLElement.cpp	2015-05-25 20:43:30.000000000 +0000
@@ -49,7 +49,7 @@
    */
   if (mNodeInfo->Equals(nsGkAtoms::xmp) ||
       mNodeInfo->Equals(nsGkAtoms::plaintext)) {
-    if (!nsContentUtils::GetNodeTextContent(this, false, aInnerHTML)) {
+    if (!nsContentUtils::GetNodeTextContent(this, false, aInnerHTML, fallible)) {
       return NS_ERROR_OUT_OF_MEMORY;
     }
     return NS_OK;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLInputElement.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLInputElement.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLInputElement.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLInputElement.cpp	2015-05-25 20:43:30.000000000 +0000
@@ -405,7 +405,9 @@
       MOZ_ASSERT(blobImpl);
       blobImpl->SetPath(Substring(path, 0, uint32_t(length)));
     }
-    *aResult = domFile.forget().downcast<nsIDOMFile>().take();
+
+    nsCOMPtr<nsIDOMBlob> blob = domFile.get();
+    blob.forget(aResult);
     LookupAndCacheNext();
     return NS_OK;
   }
@@ -488,23 +490,28 @@
 
 /**
  * This may return nullptr if aDomFile's implementation of
- * nsIDOMFile::mozFullPathInternal does not successfully return a non-empty
+ * File::mozFullPathInternal does not successfully return a non-empty
  * string that is a valid path. This can happen on Firefox OS, for example,
  * where the file picker can create Blobs.
  */
 static already_AddRefed<nsIFile>
-DOMFileToLocalFile(nsIDOMFile* aDomFile)
+DOMFileToLocalFile(File* aDomFile)
 {
   nsString path;
-  nsresult rv = aDomFile->GetMozFullPathInternal(path);
-  if (NS_FAILED(rv) || path.IsEmpty()) {
+  ErrorResult rv;
+  aDomFile->GetMozFullPathInternal(path, rv);
+  if (rv.Failed() || path.IsEmpty()) {
+    rv.SuppressException();
     return nullptr;
   }
 
   nsCOMPtr<nsIFile> localFile;
   rv = NS_NewNativeLocalFile(NS_ConvertUTF16toUTF8(path), true,
                              getter_AddRefs(localFile));
-  NS_ENSURE_SUCCESS(rv, nullptr);
+  if (NS_WARN_IF(rv.Failed())) {
+    rv.SuppressException();
+    return nullptr;
+  }
 
   return localFile.forget();
 }
@@ -532,9 +539,9 @@
       nsCOMPtr<nsISupports> tmp;
       while (NS_SUCCEEDED(iter->HasMoreElements(&hasMore)) && hasMore) {
         iter->GetNext(getter_AddRefs(tmp));
-        nsCOMPtr<nsIDOMFile> domFile = do_QueryInterface(tmp);
-        MOZ_ASSERT(domFile);
-        mFileList.AppendElement(static_cast<File*>(domFile.get()));
+        nsCOMPtr<nsIDOMBlob> domBlob = do_QueryInterface(tmp);
+        MOZ_ASSERT(domBlob);
+        mFileList.AppendElement(static_cast<File*>(domBlob.get()));
         mFileListLength = mFileList.Length();
         if (mCanceled) {
           MOZ_ASSERT(!mInput, "This is bad - how did this happen?");
@@ -691,20 +698,23 @@
 
     while (NS_SUCCEEDED(iter->HasMoreElements(&hasMore)) && hasMore) {
       iter->GetNext(getter_AddRefs(tmp));
-      nsCOMPtr<nsIDOMFile> domFile = do_QueryInterface(tmp);
-      NS_WARN_IF_FALSE(domFile,
+      nsCOMPtr<nsIDOMBlob> domBlob = do_QueryInterface(tmp);
+      NS_WARN_IF_FALSE(domBlob,
                        "Null file object from FilePicker's file enumerator?");
-      if (domFile) {
-        newFiles.AppendElement(static_cast<File*>(domFile.get()));
+      if (domBlob) {
+        newFiles.AppendElement(static_cast<File*>(domBlob.get()));
       }
     }
   } else {
     MOZ_ASSERT(mode == static_cast<int16_t>(nsIFilePicker::modeOpen));
-    nsCOMPtr<nsIDOMFile> domFile;
-    nsresult rv = mFilePicker->GetDomfile(getter_AddRefs(domFile));
+    nsCOMPtr<nsISupports> tmp;
+    nsresult rv = mFilePicker->GetDomfile(getter_AddRefs(tmp));
     NS_ENSURE_SUCCESS(rv, rv);
-    if (domFile) {
-      newFiles.AppendElement(static_cast<File*>(domFile.get()));
+
+    nsCOMPtr<nsIDOMBlob> blob = do_QueryInterface(tmp);
+    if (blob) {
+      nsRefPtr<File> file = static_cast<Blob*>(blob.get())->ToFile();
+      newFiles.AppendElement(file);
     }
   }
 
@@ -969,7 +979,11 @@
       aType != FILE_PICKER_DIRECTORY) {
     nsString path;
 
-    oldFiles[0]->GetMozFullPathInternal(path);
+    ErrorResult error;
+    oldFiles[0]->GetMozFullPathInternal(path, error);
+    if (NS_WARN_IF(error.Failed())) {
+      return error.StealNSResult();
+    }
 
     nsCOMPtr<nsIFile> localFile;
     rv = NS_NewLocalFile(path, false, getter_AddRefs(localFile));
@@ -1708,7 +1722,12 @@
         // XXX We'd love to assert that this can't happen, but some mochitests
         // use SpecialPowers to circumvent our more sane security model.
         if (!mFiles.IsEmpty()) {
-          return mFiles[0]->GetMozFullPath(aValue);
+          ErrorResult rv;
+          mFiles[0]->GetMozFullPath(aValue, rv);
+          if (NS_WARN_IF(rv.Failed())) {
+            return rv.StealNSResult();
+          }
+          return NS_OK;
         }
         else {
           aValue.Truncate();
@@ -1716,8 +1735,10 @@
 #endif
       } else {
         // Just return the leaf name
-        if (mFiles.IsEmpty() || NS_FAILED(mFiles[0]->GetName(aValue))) {
+        if (mFiles.IsEmpty()) {
           aValue.Truncate();
+        } else {
+          mFiles[0]->GetName(aValue);
         }
       }
 
@@ -2307,11 +2328,16 @@
 }
 
 void
-HTMLInputElement::MozGetFileNameArray(nsTArray< nsString >& aArray)
+HTMLInputElement::MozGetFileNameArray(nsTArray<nsString>& aArray,
+                                      ErrorResult& aRv)
 {
   for (uint32_t i = 0; i < mFiles.Length(); i++) {
     nsString str;
-    mFiles[i]->GetMozFullPathInternal(str);
+    mFiles[i]->GetMozFullPathInternal(str, aRv);
+    if (NS_WARN_IF(aRv.Failed())) {
+      return;
+    }
+
     aArray.AppendElement(str);
   }
 }
@@ -2326,8 +2352,12 @@
     return NS_ERROR_DOM_SECURITY_ERR;
   }
 
+  ErrorResult rv;
   nsTArray<nsString> array;
-  MozGetFileNameArray(array);
+  MozGetFileNameArray(array, rv);
+  if (NS_WARN_IF(rv.Failed())) {
+    return rv.StealNSResult();
+  }
 
   *aLength = array.Length();
   char16_t** ret =
@@ -2687,7 +2717,11 @@
   if (mFiles.IsEmpty()) {
     mFirstFilePath.Truncate();
   } else {
-    mFiles[0]->GetMozFullPath(mFirstFilePath);
+    ErrorResult rv;
+    mFiles[0]->GetMozFullPath(mFirstFilePath, rv);
+    if (NS_WARN_IF(rv.Failed())) {
+      rv.SuppressException();
+    }
   }
 #endif
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLInputElement.h firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLInputElement.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLInputElement.h	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLInputElement.h	2015-05-25 20:43:30.000000000 +0000
@@ -713,7 +713,7 @@
 
   int32_t GetTextLength(ErrorResult& aRv);
 
-  void MozGetFileNameArray(nsTArray< nsString >& aFileNames);
+  void MozGetFileNameArray(nsTArray<nsString>& aFileNames, ErrorResult& aRv);
 
   void MozSetFileNameArray(const Sequence< nsString >& aFileNames, ErrorResult& aRv);
   void MozSetFileArray(const Sequence<OwningNonNull<File>>& aFiles);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLLinkElement.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLLinkElement.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLLinkElement.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLLinkElement.cpp	2015-05-25 20:43:30.000000000 +0000
@@ -21,7 +21,6 @@
 #include "nsIDOMEvent.h"
 #include "nsIDOMStyleSheet.h"
 #include "nsINode.h"
-#include "nsISpeculativeConnect.h"
 #include "nsIStyleSheet.h"
 #include "nsIStyleSheetLinkingElement.h"
 #include "nsIURL.h"
@@ -182,6 +181,8 @@
   // be under a different xml:base, so forget the cached state now.
   Link::ResetLinkState(false, Link::ElementHasHref());
 
+  // If this is reinserted back into the document it will not be
+  // from the parser.
   nsCOMPtr<nsIDocument> oldDoc = GetUncomposedDoc();
 
   // Check for a ShadowRoot because link elements are inert in a
@@ -311,12 +312,11 @@
     return;
   }
 
-  nsCOMPtr<nsISpeculativeConnect>
-    speculator(do_QueryInterface(nsContentUtils::GetIOService()));
-  if (speculator) {
+  nsIDocument *owner = OwnerDoc();
+  if (owner) {
     nsCOMPtr<nsIURI> uri = GetHrefURI();
     if (uri) {
-      speculator->SpeculativeConnect(uri, nullptr);
+      owner->MaybePreconnect(uri);
     }
   }
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLMediaElement.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLMediaElement.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLMediaElement.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLMediaElement.cpp	2015-05-25 20:43:30.000000000 +0000
@@ -92,15 +92,10 @@
 #include "nsRange.h"
 #include <algorithm>
 
-#ifdef PR_LOGGING
 static PRLogModuleInfo* gMediaElementLog;
 static PRLogModuleInfo* gMediaElementEventsLog;
-#define LOG(type, msg) PR_LOG(gMediaElementLog, type, msg)
-#define LOG_EVENT(type, msg) PR_LOG(gMediaElementEventsLog, type, msg)
-#else
-#define LOG(type, msg)
-#define LOG_EVENT(type, msg)
-#endif
+#define LOG(type, msg) MOZ_LOG(gMediaElementLog, type, msg)
+#define LOG_EVENT(type, msg) MOZ_LOG(gMediaElementEventsLog, type, msg)
 
 #include "nsIContentSecurityPolicy.h"
 
@@ -1489,10 +1484,12 @@
 
   // Clamp the seek target to inside the seekable ranges.
   nsRefPtr<dom::TimeRanges> seekable = new dom::TimeRanges();
-  if (NS_FAILED(mDecoder->GetSeekable(seekable))) {
+  media::TimeIntervals seekableIntervals = mDecoder->GetSeekable();
+  if (seekableIntervals.IsInvalid()) {
     aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
     return;
   }
+  seekableIntervals.ToTimeRanges(seekable);
   uint32_t length = 0;
   seekable->GetLength(&length);
   if (!length) {
@@ -1606,9 +1603,8 @@
 {
   nsRefPtr<TimeRanges> ranges = new TimeRanges();
   if (mDecoder && mReadyState > nsIDOMHTMLMediaElement::HAVE_NOTHING) {
-    mDecoder->GetSeekable(ranges);
+    mDecoder->GetSeekable().ToTimeRanges(ranges);
   }
-  ranges->Normalize();
   return ranges.forget();
 }
 
@@ -2094,14 +2090,12 @@
     mDisableVideo(false),
     mElementInTreeState(ELEMENT_NOT_INTREE)
 {
-#ifdef PR_LOGGING
   if (!gMediaElementLog) {
     gMediaElementLog = PR_NewLogModule("nsMediaElement");
   }
   if (!gMediaElementEventsLog) {
     gMediaElementEventsLog = PR_NewLogModule("nsMediaElementEvents");
   }
-#endif
 
   mAudioChannel = AudioChannelService::GetDefaultAudioChannel();
 
@@ -3597,7 +3591,6 @@
   ChangeReadyState(nsIDOMHTMLMediaElement::HAVE_FUTURE_DATA);
 }
 
-#ifdef PR_LOGGING
 static const char* const gReadyStateToString[] = {
   "HAVE_NOTHING",
   "HAVE_METADATA",
@@ -3605,7 +3598,6 @@
   "HAVE_FUTURE_DATA",
   "HAVE_ENOUGH_DATA"
 };
-#endif
 
 void HTMLMediaElement::ChangeReadyState(nsMediaReadyState aState)
 {
@@ -3657,14 +3649,12 @@
   }
 }
 
-#ifdef PR_LOGGING
 static const char* const gNetworkStateToString[] = {
   "EMPTY",
   "IDLE",
   "LOADING",
   "NO_SOURCE"
  };
-#endif
 
 void HTMLMediaElement::ChangeNetworkState(nsMediaNetworkState aState)
 {
@@ -4180,12 +4170,12 @@
   nsRefPtr<TimeRanges> ranges = new TimeRanges();
   if (mReadyState > nsIDOMHTMLMediaElement::HAVE_NOTHING) {
     if (mDecoder) {
-      // If GetBuffered fails we ignore the error result and just return the
-      // time ranges we found up till the error.
-      mDecoder->GetBuffered(ranges);
+      media::TimeIntervals buffered = mDecoder->GetBuffered();
+      if (!buffered.IsInvalid()) {
+        buffered.ToTimeRanges(ranges);
+      }
     }
   }
-  ranges->Normalize();
   return ranges.forget();
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLMenuItemElement.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLMenuItemElement.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLMenuItemElement.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLMenuItemElement.cpp	2015-05-25 20:43:30.000000000 +0000
@@ -372,9 +372,7 @@
 HTMLMenuItemElement::GetText(nsAString& aText)
 {
   nsAutoString text;
-  if (!nsContentUtils::GetNodeTextContent(this, false, text)) {
-    NS_RUNTIMEABORT("OOM");
-  }
+  nsContentUtils::GetNodeTextContent(this, false, text);
 
   text.CompressWhitespace(true, true);
   aText = text;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLOutputElement.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLOutputElement.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLOutputElement.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLOutputElement.cpp	2015-05-25 20:43:31.000000000 +0000
@@ -147,9 +147,7 @@
 void
 HTMLOutputElement::GetValue(nsAString& aValue)
 {
-  if (!nsContentUtils::GetNodeTextContent(this, true, aValue)) {
-    NS_RUNTIMEABORT("OOM");
-  }
+  nsContentUtils::GetNodeTextContent(this, true, aValue);
 }
 
 void
@@ -180,9 +178,7 @@
 void HTMLOutputElement::DescendantsChanged()
 {
   if (mIsDoneAddingChildren && mValueModeFlag == eModeDefault) {
-    if (!nsContentUtils::GetNodeTextContent(this, true, mDefaultValue)) {
-      NS_RUNTIMEABORT("OOM");
-    }
+    nsContentUtils::GetNodeTextContent(this, true, mDefaultValue);
   }
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLScriptElement.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLScriptElement.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLScriptElement.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLScriptElement.cpp	2015-05-25 20:43:31.000000000 +0000
@@ -110,7 +110,7 @@
 NS_IMETHODIMP
 HTMLScriptElement::GetText(nsAString& aValue)
 {
-  if (!nsContentUtils::GetNodeTextContent(this, false, aValue)) {
+  if (!nsContentUtils::GetNodeTextContent(this, false, aValue, fallible)) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
   return NS_OK;
@@ -222,7 +222,7 @@
 NS_IMETHODIMP
 HTMLScriptElement::GetInnerHTML(nsAString& aInnerHTML)
 {
-  if (!nsContentUtils::GetNodeTextContent(this, false, aInnerHTML)) {
+  if (!nsContentUtils::GetNodeTextContent(this, false, aInnerHTML, fallible)) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
   return NS_OK;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLStyleElement.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLStyleElement.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLStyleElement.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLStyleElement.cpp	2015-05-25 20:43:31.000000000 +0000
@@ -214,7 +214,7 @@
 NS_IMETHODIMP
 HTMLStyleElement::GetInnerHTML(nsAString& aInnerHTML)
 {
-  if (!nsContentUtils::GetNodeTextContent(this, false, aInnerHTML)) {
+  if (!nsContentUtils::GetNodeTextContent(this, false, aInnerHTML, fallible)) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
   return NS_OK;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLTextAreaElement.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLTextAreaElement.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLTextAreaElement.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLTextAreaElement.cpp	2015-05-25 20:43:31.000000000 +0000
@@ -362,7 +362,7 @@
 NS_IMETHODIMP
 HTMLTextAreaElement::GetDefaultValue(nsAString& aDefaultValue)
 {
-  if (!nsContentUtils::GetNodeTextContent(this, false, aDefaultValue)) {
+  if (!nsContentUtils::GetNodeTextContent(this, false, aDefaultValue, fallible)) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
   return NS_OK;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLTitleElement.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLTitleElement.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLTitleElement.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLTitleElement.cpp	2015-05-25 20:43:31.000000000 +0000
@@ -42,7 +42,7 @@
 void
 HTMLTitleElement::GetText(DOMString& aText, ErrorResult& aError)
 {
-  if (!nsContentUtils::GetNodeTextContent(this, false, aText)) {
+  if (!nsContentUtils::GetNodeTextContent(this, false, aText, fallible)) {
     aError = NS_ERROR_OUT_OF_MEMORY;
   }
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLTrackElement.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLTrackElement.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/HTMLTrackElement.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/HTMLTrackElement.cpp	2015-05-25 20:43:31.000000000 +0000
@@ -40,12 +40,8 @@
 #include "nsThreadUtils.h"
 #include "nsVideoFrame.h"
 
-#ifdef PR_LOGGING
 static PRLogModuleInfo* gTrackElementLog;
-#define LOG(type, msg) PR_LOG(gTrackElementLog, type, msg)
-#else
-#define LOG(type, msg)
-#endif
+#define LOG(type, msg) MOZ_LOG(gTrackElementLog, type, msg)
 
 // Replace the usual NS_IMPL_NS_NEW_HTML_ELEMENT(Track) so
 // we can return an UnknownElement instead when pref'd off.
@@ -80,11 +76,9 @@
 HTMLTrackElement::HTMLTrackElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
   : nsGenericHTMLElement(aNodeInfo)
 {
-#ifdef PR_LOGGING
   if (!gTrackElementLog) {
     gTrackElementLog = PR_NewLogModule("nsTrackElement");
   }
-#endif
 }
 
 HTMLTrackElement::~HTMLTrackElement()
@@ -127,7 +121,7 @@
 HTMLTrackElement::IsWebVTTEnabled()
 {
   // Our callee does not use its arguments.
-  return HTMLTrackElementBinding::ConstructorEnabled(nullptr, JS::NullPtr());
+  return HTMLTrackElementBinding::ConstructorEnabled(nullptr, nullptr);
 }
 
 TextTrack*
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/nsFormSubmission.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/html/nsFormSubmission.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/nsFormSubmission.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/nsFormSubmission.cpp	2015-05-25 20:43:31.000000000 +0000
@@ -18,7 +18,6 @@
 #include "nsAttrValueInlines.h"
 #include "nsISaveAsCharset.h"
 #include "nsIFile.h"
-#include "nsIDOMFile.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsStringStream.h"
 #include "nsIURI.h"
@@ -451,15 +450,13 @@
   nsCOMPtr<nsIInputStream> fileStream;
   if (aFile) {
     nsAutoString filename16;
-    rv = aFile->GetName(filename16);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
+    aFile->GetName(filename16);
 
+    ErrorResult error;
     nsAutoString filepath16;
-    rv = aFile->GetPath(filepath16);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
+    aFile->GetPath(filepath16, error);
+    if (NS_WARN_IF(error.Failed())) {
+      return error.StealNSResult();
     }
 
     if (!filepath16.IsEmpty()) {
@@ -472,8 +469,8 @@
 
     // Get content type
     nsAutoString contentType16;
-    rv = aFile->GetType(contentType16);
-    if (NS_FAILED(rv) || contentType16.IsEmpty()) {
+    aFile->GetType(contentType16);
+    if (contentType16.IsEmpty()) {
       contentType16.AssignLiteral("application/octet-stream");
     }
     contentType.Adopt(nsLinebreakConverter::
@@ -482,8 +479,11 @@
                                         nsLinebreakConverter::eLinebreakSpace));
 
     // Get input stream
-    rv = aFile->GetInternalStream(getter_AddRefs(fileStream));
-    NS_ENSURE_SUCCESS(rv, rv);
+    aFile->GetInternalStream(getter_AddRefs(fileStream), error);
+    if (NS_WARN_IF(error.Failed())) {
+      return error.StealNSResult();
+    }
+
     if (fileStream) {
       // Create buffered stream (for efficiency)
       nsCOMPtr<nsIInputStream> bufferedStream;
@@ -516,14 +516,19 @@
 
   // We should not try to append an invalid stream. That will happen for example
   // if we try to update a file that actually do not exist.
-  uint64_t size;
-  if (fileStream && NS_SUCCEEDED(aFile->GetSize(&size))) {
-    // We need to dump the data up to this point into the POST data stream here,
-    // since we're about to add the file input stream
-    AddPostDataStream();
+  if (fileStream) {
+    ErrorResult error;
+    uint64_t size = aFile->GetSize(error);
+    if (error.Failed()) {
+      error.SuppressException();
+    } else {
+      // We need to dump the data up to this point into the POST data stream
+      // here, since we're about to add the file input stream
+      AddPostDataStream();
 
-    mPostDataStream->AppendStream(fileStream);
-    mTotalLength += size;
+      mPostDataStream->AppendStream(fileStream);
+      mTotalLength += size;
+    }
   }
 
   // CRLF after file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/nsHTMLContentSink.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/html/nsHTMLContentSink.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/nsHTMLContentSink.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/nsHTMLContentSink.cpp	2015-05-25 20:43:31.000000000 +0000
@@ -28,7 +28,7 @@
 #include "nsIAppShell.h"
 #include "nsCRT.h"
 #include "prtime.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsNodeUtils.h"
 #include "nsIContent.h"
 #include "mozilla/dom/Element.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/nsHTMLDocument.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/html/nsHTMLDocument.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/nsHTMLDocument.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/nsHTMLDocument.cpp	2015-05-25 20:43:31.000000000 +0000
@@ -3534,6 +3534,14 @@
 bool
 nsHTMLDocument::QueryCommandSupported(const nsAString& commandID)
 {
+  // Gecko technically supports the paste command, but non-privileged content
+  // will be unable to call it. For that reason, we report that paste is
+  // not supported to this non-privileged content (as it effectively is).
+  bool restricted = commandID.LowerCaseEqualsLiteral("paste");
+  if (restricted && !nsContentUtils::IsCallerChrome()) {
+    return false;
+  }
+
   // commandID is supported if it can be converted to a Midas command
   nsAutoCString cmdToDispatch;
   return ConvertToMidasInternalCommand(commandID, cmdToDispatch);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/nsTextEditorState.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/html/nsTextEditorState.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/nsTextEditorState.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/nsTextEditorState.cpp	2015-05-25 20:43:31.000000000 +0000
@@ -245,6 +245,9 @@
   NS_IMETHOD CheckVisibility(nsIDOMNode *node, int16_t startOffset, int16_t EndOffset, bool* _retval) override;
   virtual nsresult CheckVisibilityContent(nsIContent* aNode, int16_t aStartOffset, int16_t aEndOffset, bool* aRetval) override;
 
+  NS_IMETHOD GetSelectionCaretsVisibility(bool* aOutVisibility) override;
+  NS_IMETHOD SetSelectionCaretsVisibility(bool aVisibility) override;
+
 private:
   nsRefPtr<nsFrameSelection> mFrameSelection;
   nsCOMPtr<nsIContent>       mLimiter;
@@ -640,6 +643,36 @@
 
 }
 
+NS_IMETHODIMP
+nsTextInputSelectionImpl::GetSelectionCaretsVisibility(bool* aOutVisibility)
+{
+  if (!mPresShellWeak) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+
+  nsresult result;
+  nsCOMPtr<nsISelectionController> shell = do_QueryReferent(mPresShellWeak, &result);
+  if (shell) {
+    return shell->GetSelectionCaretsVisibility(aOutVisibility);
+  }
+  return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
+nsTextInputSelectionImpl::SetSelectionCaretsVisibility(bool aVisibility)
+{
+  if (!mPresShellWeak) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+
+  nsresult result;
+  nsCOMPtr<nsISelectionController> shell = do_QueryReferent(mPresShellWeak, &result);
+  if (shell) {
+    return shell->SetSelectionCaretsVisibility(aVisibility);
+  }
+  return NS_ERROR_FAILURE;
+}
+
 nsresult
 nsTextInputSelectionImpl::CheckVisibilityContent(nsIContent* aNode,
                                                  int16_t aStartOffset,
@@ -897,6 +930,12 @@
 NS_IMETHODIMP
 nsTextInputListener::EditAction()
 {
+  if (!mFrame) {
+    // We've been disconnected from the nsTextEditorState object, nothing to do
+    // here.
+    return NS_OK;
+  }
+
   nsWeakFrame weakFrame = mFrame;
 
   nsITextControlFrame* frameBase = do_QueryFrame(mFrame);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/test/file_fullscreen-api-keys.html firefox-trunk-41.0~a1~hg20150524r245419/dom/html/test/file_fullscreen-api-keys.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/test/file_fullscreen-api-keys.html	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/test/file_fullscreen-api-keys.html	2015-05-25 20:43:32.000000000 +0000
@@ -92,8 +92,12 @@
 
 function testNextKey() {
   if (!document.mozFullScreen) {
-    addFullscreenChangeContinuation("enter", reallyTestNextKey);
-    document.body.mozRequestFullScreen();
+    // Async request fullscreen to avoid the request be accidentally
+    // cancelled due to unfinished clean-up of exiting fullscreen.
+    setTimeout(() => {
+      addFullscreenChangeContinuation("enter", reallyTestNextKey);
+      document.body.mozRequestFullScreen();
+    }, 0);
   }
   else {
     reallyTestNextKey();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/test/file_fullscreen-utils.js firefox-trunk-41.0~a1~hg20150524r245419/dom/html/test/file_fullscreen-utils.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/test/file_fullscreen-utils.js	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/test/file_fullscreen-utils.js	2015-05-25 20:43:32.000000000 +0000
@@ -20,23 +20,6 @@
          window.outerHeight == normalSize.h;
 }
 
-function ok(condition, msg) {
-  opener.ok(condition, "[rollback] " + msg);
-  if (!condition) {
-    opener.finish();
-  }
-}
-
-// On Linux we sometimes receive fullscreenchange events before the window
-// has finished transitioning to fullscreen. This can cause problems and
-// test failures, so work around it on Linux until we can get a proper fix.
-const workAroundFullscreenTransition = navigator.userAgent.indexOf("Linux") != -1;
-
-if (workAroundFullscreenTransition) {
-  SimpleTest.requestFlakyTimeout("We need to wait an arbitrary and non-zero " +
-    "amount of time in case of the Linux specific workaround to avoid busy-waiting.");
-}
-
 // Adds a listener that will be called once a fullscreen transition
 // is complete. When type==='enter', callback is called when we've
 // received a fullscreenchange event, and the fullscreen transition is
@@ -48,53 +31,39 @@
 // the current document.
 function addFullscreenChangeContinuation(type, callback, inDoc) {
   var doc = inDoc || document;
-  var listener = null;
-  if (type === "enter") {
-    // when entering fullscreen, ensure we don't call 'callback' until the
-    // enter transition is complete.
-    listener = function(event) {
-      doc.removeEventListener("mozfullscreenchange", listener, false);
-      if (!workAroundFullscreenTransition) {
-        callback(event);
-        return;
-      }
-      if (!inFullscreenMode()) {
-        opener.todo(false, "fullscreenchange before entering fullscreen complete! " +
-                    " window.fullScreen=" + window.fullScreen +
-                    " normal=(" + normalSize.w + "," + normalSize.h + ")" +
-                    " outerWidth=" + window.outerWidth + " width=" + window.screen.width +
-                    " outerHeight=" + window.outerHeight + " height=" + window.screen.height);
-        setTimeout(function(){listener(event);}, 100);
-        return;
-      }
-      setTimeout(function(){callback(event)}, 0);
-    };
-  } else if (type === "exit") {
-    listener = function(event) {
-      doc.removeEventListener("mozfullscreenchange", listener, false);
-      if (!workAroundFullscreenTransition) {
-        callback(event);
-        return;
-      }
-      if (!document.mozFullScreenElement && !inNormalMode()) {
-        opener.todo(false, "fullscreenchange before exiting fullscreen complete! " +
-                    " window.fullScreen=" + window.fullScreen +
-                    " normal=(" + normalSize.w + "," + normalSize.h + ")" +
-                    " outerWidth=" + window.outerWidth + " width=" + window.screen.width +
-                    " outerHeight=" + window.outerHeight + " height=" + window.screen.height);
-        // 'document' (*not* 'doc') has no fullscreen element, so we're trying
-        // to completely exit fullscreen mode. Wait until the transition
-        // to normal mode is complete before calling callback.
-        setTimeout(function(){listener(event);}, 100);
-        return;
+  function checkCondition() {
+    if (type == "enter") {
+      return inFullscreenMode();
+    } else if (type == "exit") {
+      // If we just revert the state to a previous fullscreen state,
+      // the window won't back to the normal mode. Hence we check
+      // mozFullScreenElement first here.
+      return doc.mozFullScreenElement || inNormalMode();
+    } else {
+      throw "'type' must be either 'enter', or 'exit'.";
+    }
+  }
+  function invokeCallback(event) {
+    // Use async call after a paint to workaround unfinished fullscreen
+    // change even when the window size has changed on Linux.
+    requestAnimationFrame(() => setTimeout(() => callback(event), 0), 0);
+  }
+  function onFullscreenChange(event) {
+    doc.removeEventListener("mozfullscreenchange", onFullscreenChange, false);
+    if (checkCondition()) {
+      invokeCallback(event);
+      return;
+    }
+    var win = doc.defaultView;
+    function onResize() {
+      if (checkCondition()) {
+        win.removeEventListener("resize", onResize, false);
+        invokeCallback(event);
       }
-      opener.info("[rollback] Exited fullscreen");
-      setTimeout(function(){callback(event);}, 0);
-    };
-  } else {
-    throw "'type' must be either 'enter', or 'exit'.";
+    }
+    win.addEventListener("resize", onResize, false);
   }
-  doc.addEventListener("mozfullscreenchange", listener, false);
+  doc.addEventListener("mozfullscreenchange", onFullscreenChange, false);
 }
 
 // Calls |callback| when the next fullscreenerror is dispatched to inDoc||document.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/test/forms/test_input_attributes_reflection.html firefox-trunk-41.0~a1~hg20150524r245419/dom/html/test/forms/test_input_attributes_reflection.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/test/forms/test_input_attributes_reflection.html	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/test/forms/test_input_attributes_reflection.html	2015-05-25 20:43:32.000000000 +0000
@@ -29,7 +29,7 @@
   is(element.getAttribute(attr), '12', 'setting ' + attr + ' changes the content attribute');
 
   element.removeAttribute(attr);
-  ise(element.getAttribute(attr), null);
+  is(element.getAttribute(attr), null);
 
   element = document.createElement('input');
   element.type = 'image';
@@ -46,7 +46,7 @@
   is(element.getAttribute(attr), '12', 'setting ' + attr + ' changes the content attribute');
 
   element.removeAttribute(attr);
-  ise(element.getAttribute(attr), null);
+  is(element.getAttribute(attr), null);
 }
 
 // .accept
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/test/forms/test_input_autocomplete.html firefox-trunk-41.0~a1~hg20150524r245419/dom/html/test/forms/test_input_autocomplete.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/test/forms/test_input_autocomplete.html	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/test/forms/test_input_autocomplete.html	2015-05-25 20:43:32.000000000 +0000
@@ -66,8 +66,8 @@
       field.removeAttribute("autocomplete");
     else
       field.setAttribute("autocomplete", test[0]);
-    ise(field.autocomplete, test[1], "Checking @autocomplete for @type=" + type + " of: " + test[0]);
-    ise(field.autocomplete, test[1], "Checking cached @autocomplete for @type=" + type + " of: " + test[0]);
+    is(field.autocomplete, test[1], "Checking @autocomplete for @type=" + type + " of: " + test[0]);
+    is(field.autocomplete, test[1], "Checking cached @autocomplete for @type=" + type + " of: " + test[0]);
   }
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/test/forms/test_radio_radionodelist.html firefox-trunk-41.0~a1~hg20150524r245419/dom/html/test/forms/test_radio_radionodelist.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/test/forms/test_radio_radionodelist.html	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/test/forms/test_radio_radionodelist.html	2015-05-25 20:43:32.000000000 +0000
@@ -22,7 +22,7 @@
 /** Test for Bug 779723 **/
 
 var rdoList = document.forms[0].elements.namedItem('rdo');
-ise(rdoList.value, "", "The value attribute should be empty");
+is(rdoList.value, "", "The value attribute should be empty");
 
 document.getElementById('r2').checked = true;
 ok(rdoList.value, "2", "The value attribute should be 2");
@@ -33,20 +33,20 @@
 document.getElementById('r1').value = 1;
 ok(rdoList.value, "1", "The value attribute should be 1");
 
-ise(rdoList.value, document.getElementById('r1').value,
-   "The value attribute should be equal to the first checked radio input element's value");
+is(rdoList.value, document.getElementById('r1').value,
+  "The value attribute should be equal to the first checked radio input element's value");
 ok(!document.getElementById('r2').checked,
    "The second radio input element should not be checked");
 
 rdoList.value = '2';
-ise(rdoList.value, document.getElementById('r2').value,
-   "The value attribute should be equal to the second radio input element's value");
+is(rdoList.value, document.getElementById('r2').value,
+  "The value attribute should be equal to the second radio input element's value");
 ok(document.getElementById('r2').checked,
    "The second radio input element should be checked");
 
 rdoList.value = '3';
-ise(rdoList.value, document.getElementById('r2').value,
-   "The value attribute should be the second radio input element's value");
+is(rdoList.value, document.getElementById('r2').value,
+  "The value attribute should be the second radio input element's value");
 ok(document.getElementById('r2').checked,
    "The second radio input element should be checked");
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/test/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/html/test/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/test/mochitest.ini	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/test/mochitest.ini	2015-05-25 20:43:33.000000000 +0000
@@ -595,3 +595,4 @@
 skip-if = buildapp == 'b2g' # bug 1129014
 [test_img_complete.html]
 [test_viewport_resize.html]
+skip-if = os == 'win' || os == 'mac' # bug 1163911
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/test/reflect.js firefox-trunk-41.0~a1~hg20150524r245419/dom/html/test/reflect.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/test/reflect.js	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/test/reflect.js	2015-05-25 20:43:33.000000000 +0000
@@ -273,7 +273,7 @@
   if (nullable) {
     // The missing value default is null, which is typeof == "object"
     is(typeof element[idlAttr], "object", "'" + idlAttr + "' IDL attribute should be null, which has typeof == object");
-    ise(element[idlAttr], null, "'" + idlAttr + "' IDL attribute should be null");
+    is(element[idlAttr], null, "'" + idlAttr + "' IDL attribute should be null");
   } else {
     is(typeof element[idlAttr], "string", "'" + idlAttr + "' IDL attribute should be a string");
   }
@@ -286,54 +286,54 @@
 
   // Explicitly check the default value.
   element.removeAttribute(contentAttr);
-  ise(element[idlAttr], defaultValueMissing,
-      "When no attribute is set, the value should be the default value.");
+  is(element[idlAttr], defaultValueMissing,
+     "When no attribute is set, the value should be the default value.");
 
   // Check valid values.
   validValues.forEach(function (v) {
     element.setAttribute(contentAttr, v);
-    ise(element[idlAttr], v,
-        "'" + v + "' should be accepted as a valid value for " + idlAttr);
-    ise(element.getAttribute(contentAttr), v,
-        "Content attribute should return the value it has been set to.");
+    is(element[idlAttr], v,
+       "'" + v + "' should be accepted as a valid value for " + idlAttr);
+    is(element.getAttribute(contentAttr), v,
+       "Content attribute should return the value it has been set to.");
     element.removeAttribute(contentAttr);
 
     element.setAttribute(contentAttr, v.toUpperCase());
-    ise(element[idlAttr], v,
-        "Enumerated attributes should be case-insensitive.");
-    ise(element.getAttribute(contentAttr), v.toUpperCase(),
-        "Content attribute should not be lower-cased.");
+    is(element[idlAttr], v,
+       "Enumerated attributes should be case-insensitive.");
+    is(element.getAttribute(contentAttr), v.toUpperCase(),
+       "Content attribute should not be lower-cased.");
     element.removeAttribute(contentAttr);
 
     element[idlAttr] = v;
-    ise(element[idlAttr], v,
-        "'" + v + "' should be accepted as a valid value for " + idlAttr);
-    ise(element.getAttribute(contentAttr), v,
-        "Content attribute should return the value it has been set to.");
+    is(element[idlAttr], v,
+       "'" + v + "' should be accepted as a valid value for " + idlAttr);
+    is(element.getAttribute(contentAttr), v,
+       "Content attribute should return the value it has been set to.");
     element.removeAttribute(contentAttr);
 
     element[idlAttr] = v.toUpperCase();
-    ise(element[idlAttr], v,
-        "Enumerated attributes should be case-insensitive.");
-    ise(element.getAttribute(contentAttr), v.toUpperCase(),
-        "Content attribute should not be lower-cased.");
+    is(element[idlAttr], v,
+       "Enumerated attributes should be case-insensitive.");
+    is(element.getAttribute(contentAttr), v.toUpperCase(),
+       "Content attribute should not be lower-cased.");
     element.removeAttribute(contentAttr);
   });
 
   // Check invalid values.
   invalidValues.forEach(function (v) {
     element.setAttribute(contentAttr, v);
-    ise(element[idlAttr], defaultValueInvalid,
-        "When the content attribute is set to an invalid value, the default value should be returned.");
-    ise(element.getAttribute(contentAttr), v,
-        "Content attribute should not have been changed.");
+    is(element[idlAttr], defaultValueInvalid,
+       "When the content attribute is set to an invalid value, the default value should be returned.");
+    is(element.getAttribute(contentAttr), v,
+       "Content attribute should not have been changed.");
     element.removeAttribute(contentAttr);
 
     element[idlAttr] = v;
-    ise(element[idlAttr], defaultValueInvalid,
-        "When the value is set to an invalid value, the default value should be returned.");
-    ise(element.getAttribute(contentAttr), v,
-        "Content attribute should not have been changed.");
+    is(element[idlAttr], defaultValueInvalid,
+       "When the value is set to an invalid value, the default value should be returned.");
+    is(element.getAttribute(contentAttr), v,
+       "Content attribute should not have been changed.");
     element.removeAttribute(contentAttr);
   });
 
@@ -370,8 +370,8 @@
   });
 
   if (nullable) {
-    ise(defaultValueMissing, null,
-	"Missing default value should be null for nullable attributes");
+    is(defaultValueMissing, null,
+       "Missing default value should be null for nullable attributes");
     ok(validValues.length > 0, "We better have at least one valid value");
     element.setAttribute(contentAttr, validValues[0]);
     ok(element.hasAttribute(contentAttr),
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/html/test/test_fullscreen-api.html firefox-trunk-41.0~a1~hg20150524r245419/dom/html/test/test_fullscreen-api.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/html/test/test_fullscreen-api.html	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/html/test/test_fullscreen-api.html	2015-05-25 20:43:33.000000000 +0000
@@ -52,6 +52,10 @@
 const isOSXMtnLion = navigator.userAgent.indexOf("Mac OS X 10.8") != -1;
 const isOSXYosemite = navigator.userAgent.indexOf("Mac OS X 10.10") != -1;
 
+function finish() {
+  SimpleTest.finish();
+}
+
 function nextTest() {
   if (isWinXP) {
     todo(false, "Can't reliably run full-screen tests on Windows XP due to bug 704010");
@@ -73,6 +77,7 @@
 
 function runNextTest() {
   if (gTestIndex < gTestWindows.length) {
+    info("Run test " + gTestWindows[gTestIndex]);
     testWindow = window.open(gTestWindows[gTestIndex], "", "width=500,height=500");
     // We'll wait for the window to load, then make sure our window is refocused
     // before starting the test, which will get kicked off on "focus".
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/icc/gonk/IccService.js firefox-trunk-41.0~a1~hg20150524r245419/dom/icc/gonk/IccService.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/icc/gonk/IccService.js	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/icc/gonk/IccService.js	2015-05-25 20:43:34.000000000 +0000
@@ -482,6 +482,60 @@
 
       aCallback.notifySuccessWithBoolean(aResponse.result);
     });
+  },
+
+  iccOpenChannel: function(aAid, aCallback) {
+    this._radioInterface.sendWorkerMessage("iccOpenChannel",
+                                           { aid: aAid },
+                                           (aResponse) => {
+      if (aResponse.errorMsg) {
+        aCallback.notifyError(aResponse.errorMsg);
+        return;
+      }
+
+      aCallback.notifyOpenChannelSuccess(aResponse.channel);
+    });
+  },
+
+  iccExchangeAPDU: function(aChannel, aCla, aIns, aP1, aP2, aP3, aData, aCallback) {
+    if (!aData) {
+      if (DEBUG) debug('data is not set , aP3 : ' + aP3);
+    }
+
+    let apdu = {
+      cla: aCla,
+      command: aIns,
+      p1: aP1,
+      p2: aP2,
+      p3: aP3,
+      data: aData
+    };
+
+    this._radioInterface.sendWorkerMessage("iccExchangeAPDU",
+                                           { channel: aChannel, apdu: apdu },
+                                           (aResponse) => {
+      if (aResponse.errorMsg) {
+        aCallback.notifyError(aResponse.errorMsg);
+        return;
+      }
+
+      aCallback.notifyExchangeAPDUResponse(aResponse.sw1,
+                                           aResponse.sw2,
+                                           aResponse.simResponse);
+    });
+  },
+
+  iccCloseChannel: function(aChannel, aCallback) {
+    this._radioInterface.sendWorkerMessage("iccCloseChannel",
+                                           { channel: aChannel },
+                                           (aResponse) => {
+      if (aResponse.errorMsg) {
+        aCallback.notifyError(aResponse.errorMsg);
+        return;
+      }
+
+      aCallback.notifyCloseChannelSuccess();
+    });
   }
 };
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/icc/interfaces/nsIIccProvider.idl firefox-trunk-41.0~a1~hg20150524r245419/dom/icc/interfaces/nsIIccProvider.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/icc/interfaces/nsIIccProvider.idl	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/icc/interfaces/nsIIccProvider.idl	2015-05-25 20:43:34.000000000 +0000
@@ -6,51 +6,12 @@
 
 interface nsIDOMDOMRequest;
 interface nsIDOMWindow;
-interface nsIIccInfo;
 interface nsIIccListener;
 
-[scriptable, uuid(6136acab-b50e-494a-a86d-df392a032897)]
-interface nsIIccChannelCallback : nsISupports
-{
-  /**
-   * Callback function to notify on successfully opening a logical channel.
-   *
-   * @param channel
-   *        The Channel Number/Handle that is successfully opened.
-   */
-  void notifyOpenChannelSuccess(in long channel);
-
-  /**
-   * Callback function to notify on successfully closing the logical channel.
-   *
-   */
-  void notifyCloseChannelSuccess();
-
-  /**
-   * Callback function to notify the status of 'iccExchangeAPDU' command.
-   *
-   * @param sw1
-   *        Response's First Status Byte
-   * @param sw2
-   *        Response's Second Status Byte
-   * @param data
-   *        Response's data
-   */
-  void notifyExchangeAPDUResponse(in octet sw1,
-                                  in octet sw2,
-                                  in DOMString data);
-
-  /**
-   * Callback function to notify error
-   *
-   */
-  void notifyError(in DOMString error);
-};
-
 /**
  * XPCOM component (in the content process) that provides the ICC information.
  */
-[scriptable, uuid(7dd6e186-b007-11e4-9b7e-7717d7863cb8)]
+[scriptable, uuid(2fbacfc4-f52d-11e4-9667-33b72f279d14)]
 interface nsIIccProvider : nsISupports
 {
   /**
@@ -91,32 +52,4 @@
                                  in unsigned long contactType,
                                  in jsval contact,
                                  in DOMString pin2);
-
-  /**
-   * Secure Card Icc communication channel
-   */
-  void iccOpenChannel(in unsigned long clientId,
-                      in DOMString aid,
-                      in nsIIccChannelCallback callback);
-
-  /**
-   * Exchange Command APDU (C-APDU) with SIM on the given logical channel.
-   * Note that 'P3' parameter could be Le/Lc depending on command APDU case.
-   * For Case 1 scenario (when only command header is present), the value
-   * of 'P3' should be set to '-1' explicitly.
-   * Refer to 3G TS 31.101 , 10.2 'Command APDU Structure' for all the cases.
-   */
-  void iccExchangeAPDU(in unsigned long clientId,
-                       in long channel,
-                       in octet cla,
-                       in octet ins,
-                       in octet p1,
-                       in octet p2,
-                       in short p3,
-                       in DOMString data,
-                       in nsIIccChannelCallback callback);
-
-  void iccCloseChannel(in unsigned long clientId,
-                       in long channel,
-                       in nsIIccChannelCallback callback);
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/icc/interfaces/nsIIccService.idl firefox-trunk-41.0~a1~hg20150524r245419/dom/icc/interfaces/nsIIccService.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/icc/interfaces/nsIIccService.idl	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/icc/interfaces/nsIIccService.idl	2015-05-25 20:43:34.000000000 +0000
@@ -63,6 +63,44 @@
   void notifyCardLockError(in DOMString aErrorMsg, in long aRetryCount);
 };
 
+[scriptable, uuid(6136acab-b50e-494a-a86d-df392a032897)]
+interface nsIIccChannelCallback : nsISupports
+{
+  /**
+   * Callback function to notify on successfully opening a logical channel.
+   *
+   * @param channel
+   *        The Channel Number/Handle that is successfully opened.
+   */
+  void notifyOpenChannelSuccess(in long channel);
+
+  /**
+   * Callback function to notify on successfully closing the logical channel.
+   *
+   */
+  void notifyCloseChannelSuccess();
+
+  /**
+   * Callback function to notify the status of 'iccExchangeAPDU' command.
+   *
+   * @param sw1
+   *        Response's First Status Byte
+   * @param sw2
+   *        Response's Second Status Byte
+   * @param data
+   *        Response's data
+   */
+  void notifyExchangeAPDUResponse(in octet sw1,
+                                  in octet sw2,
+                                  in DOMString data);
+
+  /**
+   * Callback function to notify error
+   *
+   */
+  void notifyError(in DOMString error);
+};
+
 %{C++
 #define ICC_SERVICE_CID \
   { 0xbab0277a, 0x900e, 0x11e4, { 0x80, 0xc7, 0xdb, 0xd7, 0xad, 0x05, 0x24, 0x01 } }
@@ -97,7 +135,7 @@
 /**
  * XPCOM component that provides the access to the selected ICC.
  */
-[scriptable, uuid(20a99186-e4cb-11e4-a5f9-938abcf7c826)]
+[scriptable, uuid(6ad6b686-f52d-11e4-942d-db2884bd9242)]
 interface nsIIcc : nsISupports
 {
   /**
@@ -331,4 +369,61 @@
    */
   void getServiceStateEnabled(in unsigned long aService,
                               in nsIIccCallback aCallback);
+
+  /**
+   * Open Secure Card Icc communication channel
+   *
+   * @param aAid
+   *        Card Application Id in this UICC.
+   * @param aCallback
+   *        An instance of nsIIccChannelCallback.
+   *        nsIIccChannelCallback::notifyOpenChannelSuccess() if success.
+   *        nsIIccChannelCallback::notifyError(), otherwise.
+   */
+  void iccOpenChannel(in DOMString aAid,
+                      in nsIIccChannelCallback aCallback);
+
+  /**
+   * Exchange Command APDU (C-APDU) with UICC on the given logical channel.
+   * Note that 'P3' parameter could be Le/Lc depending on command APDU case.
+   * For Case 1 scenario (when only command header is present), the value
+   * of 'P3' should be set to '-1' explicitly.
+   * Refer to 3G TS 31.101 , 10.2 'Command APDU Structure' for all the cases.
+   *
+   * @param aChannel
+   *        given logical channel.
+   * @param aCla
+   *        APDU class.
+   * @param aIns
+   *        Instruction code.
+   * @param aP1, aP2, aP3
+   *        P1, P2, P3 parameters in APDU.
+   * @param aData
+   *        The hex data to be sent by this PDU.
+   * @param aCallback
+   *        An instance of nsIIccChannelCallback.
+   *        nsIIccChannelCallback::notifyExchangeAPDUResponse() if success.
+   *        nsIIccChannelCallback::notifyError(), otherwise.
+   */
+  void iccExchangeAPDU(in long aChannel,
+                       in octet aCla,
+                       in octet aIns,
+                       in octet aP1,
+                       in octet aP2,
+                       in short aP3,
+                       in DOMString aData,
+                       in nsIIccChannelCallback aCallback);
+
+  /**
+   * Close Secure Card Icc communication channel
+   *
+   * @param aChannel
+   *        Channel to be closed.
+   * @param aCallback
+   *        An instance of nsIIccChannelCallback.
+   *        nsIIccChannelCallback::notifyCloseChannelSuccess() if success.
+   *        nsIIccChannelCallback::notifyError(), otherwise.
+   */
+  void iccCloseChannel(in long aChannel,
+                       in nsIIccChannelCallback aCallback);
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/icc/ipc/IccChild.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/icc/ipc/IccChild.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/icc/ipc/IccChild.cpp	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/icc/ipc/IccChild.cpp	2015-05-25 20:43:34.000000000 +0000
@@ -265,6 +265,26 @@
     ? NS_OK : NS_ERROR_FAILURE;
 }
 
+NS_IMETHODIMP
+IccChild::IccOpenChannel(const nsAString& aAid, nsIIccChannelCallback* aCallback)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+IccChild::IccExchangeAPDU(int32_t aChannel, uint8_t aCla, uint8_t aIns, uint8_t aP1,
+                          uint8_t aP2, int16_t aP3, const nsAString & aData,
+                          nsIIccChannelCallback* aCallback)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+IccChild::IccCloseChannel(int32_t aChannel, nsIIccChannelCallback* aCallback)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 /**
  * PIccRequestChild Implementation.
  */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/icc/tests/marionette/manifest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/icc/tests/marionette/manifest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/icc/tests/marionette/manifest.ini	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/icc/tests/marionette/manifest.ini	2015-05-25 20:43:34.000000000 +0000
@@ -3,7 +3,8 @@
 browser = false
 qemu = true
 
-[test_icc_contact.js]
+[test_icc_contact_read.js]
+[test_icc_contact_add.js]
 [test_icc_card_lock_get_retry_count.js]
 [test_icc_card_lock_change_pin.js]
 [test_icc_card_lock_enable_pin.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/icc/tests/marionette/test_icc_contact_add.js firefox-trunk-41.0~a1~hg20150524r245419/dom/icc/tests/marionette/test_icc_contact_add.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/icc/tests/marionette/test_icc_contact_add.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/icc/tests/marionette/test_icc_contact_add.js	2015-05-25 20:43:34.000000000 +0000
@@ -0,0 +1,70 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+MARIONETTE_TIMEOUT = 90000;
+MARIONETTE_HEAD_JS = "head.js";
+
+let TEST_ADD_DATA = [{
+    name: ["add"],
+    tel: [{value: "0912345678"}],
+    email:[]
+  }];
+
+function testAddContact(aIcc, aType, aMozContact, aPin2) {
+  log("testAddContact: type=" + aType + ", pin2=" + aPin2);
+  let contact = new mozContact(aMozContact);
+
+  return aIcc.updateContact(aType, contact, aPin2)
+    .then((aResult) => {
+      is(aResult.name[0], aMozContact.name[0]);
+      is(aResult.tel[0].value, aMozContact.tel[0].value);
+
+      // Get ICC contact for checking new contact
+      return aIcc.readContacts(aType)
+        .then((aResult) => {
+          let contact = aResult[aResult.length - 1];
+
+          is(contact.name[0], aMozContact.name[0]);
+          is(contact.tel[0].value, aMozContact.tel[0].value);
+          is(contact.id, aIcc.iccInfo.iccid + aResult.length);
+
+          return contact.id;
+        })
+        .then((aContactId) => {
+          // Clean up contact
+          return removeContact(aIcc, aContactId, aType, aPin2);
+        });
+    }, (aError) => {
+      if (aType === "fdn" && aPin2 === undefined) {
+        ok(aError.name === "SimPin2",
+           "expected error when pin2 is not provided");
+      } else {
+        ok(false, "Cannot add " + aType + " contact: " + aError.name);
+      }
+    })
+}
+
+function removeContact(aIcc, aContactId, aType, aPin2) {
+  log("removeContact: contactId=" + aContactId +
+      ", type=" + aType + ", pin2=" + aPin2);
+
+  let contact = new mozContact({});
+  contact.id = aIcc.iccInfo.iccid + aContactId;
+
+  return aIcc.updateContact(aType, contact, aPin2);
+}
+
+// Start tests
+startTestCommon(function() {
+  let icc = getMozIcc();
+
+  for (let i = 0; i < TEST_ADD_DATA.length; i++) {
+    let test_data = TEST_ADD_DATA[i];
+    // Test add adn contacts
+    return testAddContact(icc, "adn", test_data)
+      // Test add fdn contacts
+      .then(() => testAddContact(icc, "fdn", test_data, "0000"))
+      // Test add fdn contacts without passing pin2
+      .then(() => testAddContact(icc, "fdn", test_data));
+  }
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/icc/tests/marionette/test_icc_contact.js firefox-trunk-41.0~a1~hg20150524r245419/dom/icc/tests/marionette/test_icc_contact.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/icc/tests/marionette/test_icc_contact.js	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/icc/tests/marionette/test_icc_contact.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,85 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-MARIONETTE_TIMEOUT = 60000;
-MARIONETTE_HEAD_JS = "head.js";
-
-function testReadContacts(aIcc, aType) {
-  log("testReadContacts: type=" + aType);
-  let iccId = aIcc.iccInfo.iccid;
-  return aIcc.readContacts(aType)
-    .then((aResult) => {
-      is(Array.isArray(aResult), true);
-
-      is(aResult[0].name[0], "Mozilla");
-      is(aResult[0].tel[0].value, "15555218201");
-      is(aResult[0].id, iccId + "1");
-
-      is(aResult[1].name[0], "Saßê黃");
-      is(aResult[1].tel[0].value, "15555218202");
-      is(aResult[1].id, iccId + "2");
-
-      is(aResult[2].name[0], "Fire 火");
-      is(aResult[2].tel[0].value, "15555218203");
-      is(aResult[2].id, iccId + "3");
-
-      is(aResult[3].name[0], "Huang 黃");
-      is(aResult[3].tel[0].value, "15555218204");
-      is(aResult[3].id, iccId + "4");
-    }, (aError) => {
-      ok(false, "Cannot get " + aType + " contacts");
-    });
-}
-
-function testAddContact(aIcc, aType, aPin2) {
-  log("testAddContact: type=" + aType + ", pin2=" + aPin2);
-  let contact = new mozContact({
-    name: ["add"],
-    tel: [{value: "0912345678"}],
-    email:[]
-  });
-
-  return aIcc.updateContact(aType, contact, aPin2)
-    .then((aResult) => {
-      is(aResult.id, aIcc.iccInfo.iccid + "5");
-      is(aResult.name[0], "add");
-      is(aResult.tel[0].value, "0912345678");
-      // Get ICC contact for checking new contact
-      return aIcc.readContacts(aType)
-        .then((aResult) => {
-          // There are 4 SIM contacts which are harded in emulator
-          is(aResult.length, 5);
-
-          is(aResult[4].name[0], "add");
-          is(aResult[4].tel[0].value, "0912345678");
-          is(aResult[4].id, aIcc.iccInfo.iccid + "5");
-        }, (aError) => {
-          ok(false, "Cannot get " + aType + " contacts: " + aError.name);
-        })
-    }, (aError) => {
-      if (aType === "fdn" && aPin2 === undefined) {
-        ok(aError.name === "SimPin2",
-           "expected error when pin2 is not provided");
-      } else {
-        ok(false, "Cannot add " + aType + " contact: " + aError.name);
-      }
-    });
-}
-
-// Start tests
-startTestCommon(function() {
-  let icc = getMozIcc();
-
-  // Test read adn contacts
-  return testReadContacts(icc, "adn")
-    // Test add adn contacts
-    .then(() => testAddContact(icc, "adn"))
-    // Test read fdn contact
-    .then(() => testReadContacts(icc, "fdn"))
-    // Test add fdn contacts
-    .then(() => testAddContact(icc, "fdn", "0000"))
-    // Test add fdn contacts without passing pin2
-    .then(() => testAddContact(icc, "fdn"))
-    // Test read sdn contacts
-    .then(() => testReadContacts(icc, "sdn"));
-});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/icc/tests/marionette/test_icc_contact_read.js firefox-trunk-41.0~a1~hg20150524r245419/dom/icc/tests/marionette/test_icc_contact_read.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/icc/tests/marionette/test_icc_contact_read.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/icc/tests/marionette/test_icc_contact_read.js	2015-05-25 20:43:34.000000000 +0000
@@ -0,0 +1,50 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+MARIONETTE_TIMEOUT = 60000;
+MARIONETTE_HEAD_JS = "head.js";
+
+function testReadContacts(aIcc, aType) {
+  log("testReadContacts: type=" + aType);
+  let iccId = aIcc.iccInfo.iccid;
+  return aIcc.readContacts(aType)
+    .then((aResult) => {
+      is(Array.isArray(aResult), true);
+      is(aResult.length, 4, "Check contact number.");
+
+      // Alpha Id(Encoded with GSM 8 bit): "Mozilla", Dialling Number: 15555218201
+      is(aResult[0].name[0], "Mozilla");
+      is(aResult[0].tel[0].value, "15555218201");
+      is(aResult[0].id, iccId + "1");
+
+      // Alpha Id(Encoded with UCS2 0x80: "Saßê\u9ec3", Dialling Number: 15555218202
+      is(aResult[1].name[0], "Saßê黃");
+      is(aResult[1].tel[0].value, "15555218202");
+      is(aResult[1].id, iccId + "2");
+
+      // Alpha Id(Encoded with UCS2 0x81): "Fire \u706b", Dialling Number: 15555218203
+      is(aResult[2].name[0], "Fire 火");
+      is(aResult[2].tel[0].value, "15555218203");
+      is(aResult[2].id, iccId + "3");
+
+      // Alpha Id(Encoded with UCS2 0x82): "Huang \u9ec3", Dialling Number: 15555218204
+      is(aResult[3].name[0], "Huang 黃");
+      is(aResult[3].tel[0].value, "15555218204");
+      is(aResult[3].id, iccId + "4");
+    }, (aError) => {
+      ok(false, "Cannot get " + aType + " contacts");
+    });
+}
+
+
+// Start tests
+startTestCommon(function() {
+  let icc = getMozIcc();
+
+  // Test read adn contacts
+  return testReadContacts(icc, "adn")
+    // Test read fdn contact
+    .then(() => testReadContacts(icc, "fdn"))
+    // Test read sdn contacts
+    .then(() => testReadContacts(icc, "sdn"));
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/identity/DOMIdentity.jsm firefox-trunk-41.0~a1~hg20150524r245419/dom/identity/DOMIdentity.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/identity/DOMIdentity.jsm	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/identity/DOMIdentity.jsm	2015-05-25 20:43:34.000000000 +0000
@@ -277,14 +277,9 @@
       if (!aMessage.principal) {
         return false;
       }
-      let secMan = Cc["@mozilla.org/scriptsecuritymanager;1"]
-                     .getService(Ci.nsIScriptSecurityManager);
-      let uri = Services.io.newURI(aMessage.principal.origin, null, null);
-      let principal = secMan.getAppCodebasePrincipal(uri,
-        aMessage.principal.appId, aMessage.principal.isInBrowserElement);
 
       let permission =
-        permissionManager.testPermissionFromPrincipal(principal,
+        permissionManager.testPermissionFromPrincipal(aMessage.principal,
                                                       FXA_PERMISSION);
       return permission != Ci.nsIPermissionManager.UNKNOWN_ACTION &&
              permission != Ci.nsIPermissionManager.DENY_ACTION;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/imptests/editing/selecttest/test_collapse.html firefox-trunk-41.0~a1~hg20150524r245419/dom/imptests/editing/selecttest/test_collapse.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/imptests/editing/selecttest/test_collapse.html	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/imptests/editing/selecttest/test_collapse.html	2015-05-25 20:43:34.000000000 +0000
@@ -8,7 +8,7 @@
 "use strict";
 
 if (W3CTest.runner) {
-  W3CTest.runner.requestLongerTimeout(2);
+  W3CTest.runner.requestLongerTimeout(5);
 }
 
 function testCollapse(range, point) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/imptests/failures/editing/conformancetest/test_event.html.json firefox-trunk-41.0~a1~hg20150524r245419/dom/imptests/failures/editing/conformancetest/test_event.html.json
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/imptests/failures/editing/conformancetest/test_event.html.json	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/imptests/failures/editing/conformancetest/test_event.html.json	2015-05-25 20:43:34.000000000 +0000
@@ -187,9 +187,8 @@
   "Command insertHorizontalRule, value \"id\": input event, canceled":true,
   "Command insertHorizontalRule, value \"id\": beforeinput event, uncanceled":true,
   "Command insertHorizontalRule, value \"id\": input event, uncanceled":true,
-  "Command insertHTML, value \"\": execCommand() must not throw, canceled":true,
   "Command insertHTML, value \"\": beforeinput event, canceled":true,
-  "Command insertHTML, value \"\": execCommand() must not throw, uncanceled":true,
+  "Command insertHTML, value \"\": input event, canceled":true,
   "Command insertHTML, value \"\": beforeinput event, uncanceled":true,
   "Command insertHTML, value \"\": input event, uncanceled":true,
   "Command insertHTML, value \"quasit\": beforeinput event, canceled":true,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/imptests/failures/editing/conformancetest/test_runtest.html.json firefox-trunk-41.0~a1~hg20150524r245419/dom/imptests/failures/editing/conformancetest/test_runtest.html.json
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/imptests/failures/editing/conformancetest/test_runtest.html.json	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/imptests/failures/editing/conformancetest/test_runtest.html.json	2015-05-25 20:43:34.000000000 +0000
@@ -3801,9 +3801,6 @@
   "[[\"inserthtml\",\"<!--abc-->\"]] \"<p><br>{}</p>\" compare innerHTML":true,
   "[[\"inserthtml\",\"<!--abc-->\"]] \"<p><!--foo--><span><br></span>{}<!--bar--></p>\" compare innerHTML":true,
   "[[\"inserthtml\",\"<!--abc-->\"]] \"<p><span><!--foo--><br><!--bar--></span>{}</p>\" compare innerHTML":true,
-  "[[\"inserthtml\",\"\"]] \"foo[bar]baz\": execCommand(\"inserthtml\", false, \"\") return value":true,
-  "[[\"inserthtml\",\"\"]] \"foo[bar]baz\" compare innerHTML":true,
-  "[[\"inserthtml\",\"\\u0000\"]] \"foo[bar]baz\" compare innerHTML":true,
   "[[\"stylewithcss\",\"true\"],[\"inserthtml\",\"<b>\"]] \"foo[bar]baz\" compare innerHTML":true,
   "[[\"stylewithcss\",\"false\"],[\"inserthtml\",\"<b>\"]] \"foo[bar]baz\" compare innerHTML":true,
   "[[\"defaultparagraphseparator\",\"div\"],[\"inserthtml\",\"<p>abc\"]] \"<p>foo[bar]baz\": execCommand(\"defaultparagraphseparator\", false, \"div\") return value":true,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/imptests/html/html/dom/elements/global-attributes/reftest.list firefox-trunk-41.0~a1~hg20150524r245419/dom/imptests/html/html/dom/elements/global-attributes/reftest.list
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/imptests/html/html/dom/elements/global-attributes/reftest.list	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/imptests/html/html/dom/elements/global-attributes/reftest.list	2015-05-25 20:43:36.000000000 +0000
@@ -46,10 +46,10 @@
 == dir_auto-pre-N-EN.html dir_auto-pre-N-EN-ref.html
 == dir_auto-R.html dir_auto-R-ref.html
 == dir_auto-textarea-mixed.html dir_auto-textarea-mixed-ref.html
-fails-if(B2G) == dir_auto-textarea-N-between-Rs.html dir_auto-textarea-N-between-Rs-ref.html # B2G scrollbar on opposite side
+fails-if(B2G||Mulet) == dir_auto-textarea-N-between-Rs.html dir_auto-textarea-N-between-Rs-ref.html # B2G scrollbar on opposite side
 == dir_auto-textarea-N-EN.html dir_auto-textarea-N-EN-ref.html
 == dir_auto-textarea-script-mixed.html dir_auto-textarea-script-mixed-ref.html
-fails-if(B2G) == dir_auto-textarea-script-N-between-Rs.html dir_auto-textarea-script-N-between-Rs-ref.html # B2G scrollbar on reference only
+fails-if(B2G||Mulet) == dir_auto-textarea-script-N-between-Rs.html dir_auto-textarea-script-N-between-Rs-ref.html # B2G scrollbar on reference only
 == dir_auto-textarea-script-N-EN.html dir_auto-textarea-script-N-EN-ref.html
 == lang-xyzzy.html lang-xyzzy-ref.html
 == lang-xmllang-01.html lang-xmllang-01-ref.html
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/imptests/html/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/imptests/html/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/imptests/html/mochitest.ini	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/imptests/html/mochitest.ini	2015-05-25 20:43:36.000000000 +0000
@@ -253,7 +253,7 @@
 [dom/ranges/test_Range-isPointInRange.html]
 skip-if = (toolkit == 'gonk' && debug) #b2g-debug(debug-only failure)
 [dom/ranges/test_Range-mutations.html]
-skip-if = buildapp == 'b2g' || android_version == '18' #Test timed out. Bug 1078287
+skip-if = buildapp == 'b2g' || (toolkit == 'android') #Test timed out. Bug 1078287
 [dom/ranges/test_Range-selectNode.html]
 skip-if = (toolkit == 'gonk' && debug) #b2g-debug(debug-only failure)
 [dom/ranges/test_Range-set.html]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/ActorsParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/ActorsParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/ActorsParent.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/ActorsParent.cpp	2015-05-25 20:43:36.000000000 +0000
@@ -22,6 +22,7 @@
 #include "mozilla/AppProcessChecker.h"
 #include "mozilla/AutoRestore.h"
 #include "mozilla/Endian.h"
+#include "mozilla/Hal.h"
 #include "mozilla/LazyIdleThread.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/Preferences.h"
@@ -66,6 +67,7 @@
 #include "nsIEventTarget.h"
 #include "nsIFile.h"
 #include "nsIFileURL.h"
+#include "nsIIdleService.h"
 #include "nsIInputStream.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsInterfaceHashtable.h"
@@ -85,17 +87,16 @@
 #include "nsPrintfCString.h"
 #include "nsRefPtrHashtable.h"
 #include "nsString.h"
+#include "nsThreadPool.h"
 #include "nsThreadUtils.h"
 #include "nsXPCOMCID.h"
 #include "PermissionRequestBase.h"
 #include "ProfilerHelpers.h"
+#include "prsystem.h"
+#include "prtime.h"
 #include "ReportInternalError.h"
 #include "snappy/snappy.h"
 
-#ifdef MOZ_NUWA_PROCESS
-#include "nsThread.h"
-#endif
-
 #define DISABLE_ASSERTS_FOR_FUZZING 0
 
 #if DISABLE_ASSERTS_FOR_FUZZING
@@ -105,7 +106,7 @@
 #endif
 
 #define IDB_DEBUG_LOG(_args)                                                   \
-  PR_LOG(IndexedDatabaseManager::GetLoggingModule(),                           \
+  MOZ_LOG(IndexedDatabaseManager::GetLoggingModule(),                           \
          PR_LOG_DEBUG,                                                         \
          _args )
 
@@ -206,21 +207,21 @@
               "Idle thread limit must be less than total thread limit!");
 
 // The length of time that database connections will be held open after all
-// transactions have completed.
-const uint32_t kConnectionIdleCheckpointsMS = 2 * 1000; // 2 seconds
+// transactions have completed before doing idle maintenance.
+const uint32_t kConnectionIdleMaintenanceMS = 2 * 1000; // 2 seconds
 
 // The length of time that database connections will be held open after all
-// transactions and checkpointing  have completed.
+// transactions and maintenance have completed.
 const uint32_t kConnectionIdleCloseMS = 10 * 1000; // 10 seconds
 
 // The length of time that idle threads will stay alive before being shut down.
 const uint32_t kConnectionThreadIdleMS = 30 * 1000; // 30 seconds
 
-const char kSavepointClause[] = "SAVEPOINT sp;";
+#define SAVEPOINT_CLAUSE "SAVEPOINT sp;"
 
 const uint32_t kFileCopyBufferSize = 32768;
 
-const char kJournalDirectoryName[] = "journals";
+#define JOURNAL_DIRECTORY_NAME "journals"
 
 const char kFileManagerDirectoryNameSuffix[] = ".files";
 const char kSQLiteJournalSuffix[] = ".sqlite-journal";
@@ -231,21 +232,17 @@
 
 #define IDB_PREFIX "indexedDB"
 
-#ifdef MOZ_CHILD_PERMISSIONS
-const char kPermissionString[] = IDB_PREFIX;
-#endif // MOZ_CHILD_PERMISSIONS
-
-const char kPermissionStringChromeBase[] = IDB_PREFIX "-chrome-";
-const char kPermissionStringChromeReadSuffix[] = "-read";
-const char kPermissionStringChromeWriteSuffix[] = "-write";
-
-#undef IDB_PREFIX
+#define PERMISSION_STRING_CHROME_BASE IDB_PREFIX "-chrome-"
+#define PERMISSION_STRING_CHROME_READ_SUFFIX "-read"
+#define PERMISSION_STRING_CHROME_WRITE_SUFFIX "-write"
 
 enum AppId {
   kNoAppId = nsIScriptSecurityManager::NO_APP_ID,
   kUnknownAppId = nsIScriptSecurityManager::UNKNOWN_APP_ID
 };
 
+const char kIdleServiceContractId[] = "@mozilla.org/widget/idleservice;1";
+
 #ifdef DEBUG
 
 const int32_t kDEBUGThreadPriority = nsISupportsPriority::PRIORITY_NORMAL;
@@ -257,6 +254,14 @@
 
 #endif
 
+const bool kRunningXPCShellTests =
+#ifdef ENABLE_TESTS
+  !!PR_GetEnv("XPCSHELL_TEST_PROFILE_DIR")
+#else
+  false
+#endif
+  ;
+
 struct FreeDeleter
 {
   void
@@ -2722,7 +2727,8 @@
   }
 
   // Update the array with the new addition.
-  if (NS_WARN_IF(!indexValues.SetCapacity(indexValues.Length() + 1))) {
+  if (NS_WARN_IF(!indexValues.SetCapacity(indexValues.Length() + 1,
+                                          fallible))) {
     IDB_REPORT_INTERNAL_ERR();
     return NS_ERROR_OUT_OF_MEMORY;
   }
@@ -3542,6 +3548,7 @@
                    PersistenceType aPersistenceType,
                    const nsACString& aGroup,
                    const nsACString& aOrigin,
+                   uint32_t aTelemetryId,
                    nsIFileURL** aResult)
 {
   MOZ_ASSERT(aDatabaseFile);
@@ -3559,10 +3566,18 @@
   nsAutoCString type;
   PersistenceTypeToText(aPersistenceType, type);
 
+  nsAutoCString telemetryFilenameClause;
+  if (aTelemetryId) {
+    telemetryFilenameClause.AssignLiteral("&telemetryFilename=indexedDB-");
+    telemetryFilenameClause.AppendInt(aTelemetryId);
+    telemetryFilenameClause.AppendLiteral(".sqlite");
+  }
+
   rv = fileUrl->SetQuery(NS_LITERAL_CSTRING("persistenceType=") + type +
                          NS_LITERAL_CSTRING("&group=") + aGroup +
                          NS_LITERAL_CSTRING("&origin=") + aOrigin +
-                         NS_LITERAL_CSTRING("&cache=private"));
+                         NS_LITERAL_CSTRING("&cache=private") +
+                         telemetryFilenameClause);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -3810,6 +3825,7 @@
                         PersistenceType aPersistenceType,
                         const nsACString& aGroup,
                         const nsACString& aOrigin,
+                        uint32_t aTelemetryId,
                         mozIStorageConnection** aConnection)
 {
   AssertIsOnIOThread();
@@ -3837,7 +3853,11 @@
   }
 
   nsCOMPtr<nsIFileURL> dbFileUrl;
-  rv = GetDatabaseFileURL(aDBFile, aPersistenceType, aGroup, aOrigin,
+  rv = GetDatabaseFileURL(aDBFile,
+                          aPersistenceType,
+                          aGroup,
+                          aOrigin,
+                          aTelemetryId,
                           getter_AddRefs(dbFileUrl));
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
@@ -4255,30 +4275,24 @@
 }
 
 nsresult
-GetStorageConnection(const nsAString& aDatabaseFilePath,
+GetStorageConnection(nsIFile* aDatabaseFile,
                      PersistenceType aPersistenceType,
                      const nsACString& aGroup,
                      const nsACString& aOrigin,
+                     uint32_t aTelemetryId,
                      mozIStorageConnection** aConnection)
 {
   MOZ_ASSERT(!NS_IsMainThread());
   MOZ_ASSERT(!IsOnBackgroundThread());
-  MOZ_ASSERT(!aDatabaseFilePath.IsEmpty());
-  MOZ_ASSERT(StringEndsWith(aDatabaseFilePath, NS_LITERAL_STRING(".sqlite")));
+  MOZ_ASSERT(aDatabaseFile);
   MOZ_ASSERT(aConnection);
 
   PROFILER_LABEL("IndexedDB",
                  "GetStorageConnection",
                  js::ProfileEntry::Category::STORAGE);
 
-  nsCOMPtr<nsIFile> dbFile = GetFileForPath(aDatabaseFilePath);
-  if (NS_WARN_IF(!dbFile)) {
-    IDB_REPORT_INTERNAL_ERR();
-    return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
-  }
-
   bool exists;
-  nsresult rv = dbFile->Exists(&exists);
+  nsresult rv = aDatabaseFile->Exists(&exists);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -4289,7 +4303,11 @@
   }
 
   nsCOMPtr<nsIFileURL> dbFileUrl;
-  rv = GetDatabaseFileURL(dbFile, aPersistenceType, aGroup, aOrigin,
+  rv = GetDatabaseFileURL(aDatabaseFile,
+                          aPersistenceType,
+                          aGroup,
+                          aOrigin,
+                          aTelemetryId,
                           getter_AddRefs(dbFileUrl));
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
@@ -4321,6 +4339,34 @@
   return NS_OK;
 }
 
+nsresult
+GetStorageConnection(const nsAString& aDatabaseFilePath,
+                     PersistenceType aPersistenceType,
+                     const nsACString& aGroup,
+                     const nsACString& aOrigin,
+                     uint32_t aTelemetryId,
+                     mozIStorageConnection** aConnection)
+{
+  MOZ_ASSERT(!NS_IsMainThread());
+  MOZ_ASSERT(!IsOnBackgroundThread());
+  MOZ_ASSERT(!aDatabaseFilePath.IsEmpty());
+  MOZ_ASSERT(StringEndsWith(aDatabaseFilePath, NS_LITERAL_STRING(".sqlite")));
+  MOZ_ASSERT(aConnection);
+
+  nsCOMPtr<nsIFile> dbFile = GetFileForPath(aDatabaseFilePath);
+  if (NS_WARN_IF(!dbFile)) {
+    IDB_REPORT_INTERNAL_ERR();
+    return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
+  }
+
+  return GetStorageConnection(dbFile,
+                              aPersistenceType,
+                              aGroup,
+                              aOrigin,
+                              aTelemetryId,
+                              aConnection);
+}
+
 /*******************************************************************************
  * ConnectionPool declarations
  ******************************************************************************/
@@ -4329,6 +4375,13 @@
 {
   friend class ConnectionPool;
 
+  enum CheckpointMode
+  {
+    CheckpointMode_Full,
+    CheckpointMode_Restart,
+    CheckpointMode_Truncate
+  };
+
 public:
   class AutoSavepoint;
   class CachedStatement;
@@ -4340,6 +4393,7 @@
   nsInterfaceHashtable<nsCStringHashKey, mozIStorageStatement>
     mCachedStatements;
   nsRefPtr<UpdateRefcountFunction> mUpdateRefcountFunction;
+  bool mInReadTransaction;
   bool mInWriteTransaction;
 
 #ifdef DEBUG
@@ -4380,20 +4434,11 @@
   GetCachedStatement(const nsACString& aQuery,
                      CachedStatement* aCachedStatement);
 
-  template <size_t N>
   nsresult
-  GetCachedStatement(const char (&aQuery)[N],
-                     CachedStatement* aCachedStatement)
-  {
-    static_assert(N > 1, "Must have a non-empty string!");
-    AssertIsOnConnectionThread();
-    MOZ_ASSERT(aCachedStatement);
-
-    return GetCachedStatement(NS_LITERAL_CSTRING(aQuery), aCachedStatement);
-  }
+  BeginWriteTransaction();
 
   nsresult
-  BeginWriteTransaction();
+  CommitWriteTransaction();
 
   void
   RollbackWriteTransaction();
@@ -4411,7 +4456,15 @@
   RollbackSavepoint();
 
   nsresult
-  Checkpoint(bool aIdle);
+  Checkpoint()
+  {
+    AssertIsOnConnectionThread();
+
+    return CheckpointInternal(CheckpointMode_Full);
+  }
+
+  void
+  DoIdleProcessing(bool aNeedsCheckpoint);
 
   void
   Close();
@@ -4424,6 +4477,19 @@
 
   nsresult
   Init();
+
+  nsresult
+  CheckpointInternal(CheckpointMode aMode);
+
+  nsresult
+  GetFreelistCount(CachedStatement& aCachedStatement, uint32_t* aFreelistCount);
+
+  nsresult
+  ReclaimFreePagesWhileIdle(CachedStatement& aFreelistStatement,
+                            CachedStatement& aRollbackStatement,
+                            uint32_t aFreelistCount,
+                            bool aNeedsCheckpoint,
+                            bool* aFreedSomePages);
 };
 
 class MOZ_STACK_CLASS DatabaseConnection::AutoSavepoint final
@@ -4628,11 +4694,11 @@
 
 private:
   class ConnectionRunnable;
-  class CheckpointConnectionRunnable;
   class CloseConnectionRunnable;
   struct DatabaseInfo;
   struct DatabasesCompleteCallback;
   class FinishCallbackWrapper;
+  class IdleConnectionRunnable;
   struct IdleDatabaseInfo;
   struct IdleResource;
   struct IdleThreadInfo;
@@ -4646,6 +4712,7 @@
 
   nsTArray<IdleThreadInfo> mIdleThreads;
   nsTArray<IdleDatabaseInfo> mIdleDatabases;
+  nsTArray<DatabaseInfo*> mDatabasesPerformingIdleMaintenance;
   nsCOMPtr<nsITimer> mIdleTimer;
   TimeStamp mTargetIdleTime;
 
@@ -4756,7 +4823,7 @@
   MaybeFireCallback(DatabasesCompleteCallback* aCallback);
 
   void
-  CheckpointDatabase(DatabaseInfo* aDatabaseInfo);
+  PerformIdleDatabaseMaintenance(DatabaseInfo* aDatabaseInfo);
 
   void
   CloseDatabase(DatabaseInfo* aDatabaseInfo);
@@ -4780,19 +4847,21 @@
   { }
 };
 
-class ConnectionPool::CheckpointConnectionRunnable final
+class ConnectionPool::IdleConnectionRunnable final
   : public ConnectionRunnable
 {
+  bool mNeedsCheckpoint;
+
 public:
-  explicit
-  CheckpointConnectionRunnable(DatabaseInfo* aDatabaseInfo)
+  IdleConnectionRunnable(DatabaseInfo* aDatabaseInfo, bool aNeedsCheckpoint)
     : ConnectionRunnable(aDatabaseInfo)
+    , mNeedsCheckpoint(aNeedsCheckpoint)
   { }
 
   NS_DECL_ISUPPORTS_INHERITED
 
 private:
-  ~CheckpointConnectionRunnable()
+  ~IdleConnectionRunnable()
   { }
 
   NS_DECL_NSIRUNNABLE
@@ -4820,9 +4889,6 @@
 {
   nsCOMPtr<nsIThread> mThread;
   nsRefPtr<ThreadRunnable> mRunnable;
-#ifdef MOZ_NUWA_PROCESS
-  bool mNuwaWorking;
-#endif
 
   ThreadInfo();
 
@@ -4830,17 +4896,6 @@
   ThreadInfo(const ThreadInfo& aOther);
 
   ~ThreadInfo();
-
-  void
-  NuwaSetWorking(bool aWorking)
-#ifdef MOZ_NUWA_PROCESS
-    ;
-#else
-  {
-    AssertIsOnBackgroundThread();
-    MOZ_ASSERT(mThread);
-  }
-#endif
 };
 
 struct ConnectionPool::DatabaseInfo final
@@ -4858,6 +4913,7 @@
   uint32_t mReadTransactionCount;
   uint32_t mWriteTransactionCount;
   bool mNeedsCheckpoint;
+  bool mIdle;
   bool mCloseOnIdle;
   bool mClosing;
 
@@ -5554,6 +5610,7 @@
   const nsCString mId;
   const nsString mFilePath;
   uint32_t mFileHandleCount;
+  const uint32_t mTelemetryId;
   const PersistenceType mPersistenceType;
   const bool mChromeWriteAccessAllowed;
   bool mClosed;
@@ -5568,6 +5625,7 @@
            const PrincipalInfo& aPrincipalInfo,
            const nsACString& aGroup,
            const nsACString& aOrigin,
+           uint32_t aTelemetryId,
            FullDatabaseMetadata* aMetadata,
            FileManager* aFileManager,
            already_AddRefed<DatabaseOfflineStorage> aOfflineStorage,
@@ -5617,6 +5675,12 @@
     return mId;
   }
 
+  uint32_t
+  TelemetryId() const
+  {
+    return mTelemetryId;
+  }
+
   PersistenceType
   Type() const
   {
@@ -5859,8 +5923,9 @@
 
     nsCOMPtr<nsIInputStream> inputStream;
     if (mBlobImpl) {
-      MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
-        mBlobImpl->GetInternalStream(getter_AddRefs(inputStream))));
+      ErrorResult rv;
+      mBlobImpl->GetInternalStream(getter_AddRefs(inputStream), rv);
+      MOZ_ALWAYS_TRUE(!rv.Failed());
     }
 
     return inputStream.forget();
@@ -6617,6 +6682,8 @@
   // cycles.
   VersionChangeOp* mVersionChangeOp;
 
+  uint32_t mTelemetryId;
+
 public:
   OpenDatabaseOp(Factory* aFactory,
                  already_AddRefed<ContentParent> aContentParent,
@@ -7728,19 +7795,59 @@
 
 class QuotaClient final
   : public mozilla::dom::quota::Client
+  , public nsIObserver
 {
+  // The number of seconds we will wait after receiving the idle-daily
+  // notification before beginning maintenance.
+  static const uint32_t kIdleObserverTimeSec = 1;
+
+  // The minimum amount of time that has passed since the last vacuum before we
+  // will attempt to analyze the database for fragmentation.
+  static const PRTime kMinVacuumAge =
+    PRTime(PR_USEC_PER_SEC) * 60 * 60 * 24 * 7;
+
+  // If the percent of database pages that are not in contiguous order is higher
+  // than this percentage we will attempt a vacuum.
+  static const int32_t kPercentUnorderedThreshold = 30;
+
+  // If the percent of file size growth since the last vacuum is higher than
+  // this percentage we will attempt a vacuum.
+  static const int32_t kPercentFileSizeGrowthThreshold = 10;
+
+  // The number of freelist pages beyond which we will favor an incremental
+  // vacuum over a full vacuum.
+  static const int32_t kMaxFreelistThreshold = 5;
+
+  // If the percent of unused file bytes in the database exceeds this percentage
+  // then we will attempt a full vacuum.
+  static const int32_t kPercentUnusedThreshold = 20;
+
+  class AutoProgressHandler;
+  struct MaintenanceInfoBase;
+  struct MultipleMaintenanceInfo;
   class ShutdownWorkThreadsRunnable;
-  friend class ShutdownWorkThreadsRunnable;
-
+  struct SingleMaintenanceInfo;
   class WaitForTransactionsRunnable;
-  friend class WaitForTransactionsRunnable;
+
+  typedef nsClassHashtable<nsCStringHashKey, MultipleMaintenanceInfo>
+          MaintenanceInfoHashtable;
+
+  enum MaintenanceAction {
+    MaintenanceAction_Nothing = 0,
+    MaintenanceAction_IncrementalVacuum,
+    MaintenanceAction_FullVacuum
+  };
 
   static QuotaClient* sInstance;
 
   nsCOMPtr<nsIEventTarget> mBackgroundThread;
   nsRefPtr<ShutdownWorkThreadsRunnable> mShutdownRunnable;
-
+  nsRefPtr<nsThreadPool> mMaintenanceThreadPool;
+  PRTime mMaintenanceStartTime;
+  Atomic<uint32_t> mMaintenanceRunId;
+  UniquePtr<MaintenanceInfoHashtable> mMaintenanceInfoHashtable;
   bool mShutdownRequested;
+  bool mIdleObserverRegistered;
 
 public:
   QuotaClient();
@@ -7781,10 +7888,21 @@
     return mShutdownRequested;
   }
 
+  bool
+  IdleMaintenanceMustEnd(uint32_t aRunId) const
+  {
+    if (mMaintenanceRunId != aRunId) {
+      MOZ_ASSERT(mMaintenanceRunId > aRunId);
+      return true;
+    }
+
+    return false;
+  }
+
   void
   NoteBackgroundThread(nsIEventTarget* aBackgroundThread);
 
-  NS_INLINE_DECL_REFCOUNTING(QuotaClient, override)
+  NS_DECL_THREADSAFE_ISUPPORTS
 
   virtual mozilla::dom::quota::Client::Type
   GetType() override;
@@ -7814,6 +7932,9 @@
                             nsIRunnable* aCallback) override;
 
   virtual void
+  PerformIdleMaintenance() override;
+
+  virtual void
   ShutdownWorkThreads() override;
 
 private:
@@ -7828,6 +7949,238 @@
   GetUsageForDirectoryInternal(nsIFile* aDirectory,
                                UsageInfo* aUsageInfo,
                                bool aDatabaseFiles);
+
+  void
+  RemoveIdleObserver();
+
+  void
+  StartIdleMaintenance();
+
+  void
+  StopIdleMaintenance();
+
+  // Runs on mMaintenanceThreadPool. Once it finds databases it will queue a
+  // runnable that calls BlockQuotaManagerForIdleMaintenance.
+  void
+  FindDatabasesForIdleMaintenance(uint32_t aRunId);
+
+  // Runs on the main thread. Once QuotaManager has blocked it will call
+  // ScheduleIdleMaintenance.
+  void
+  BlockQuotaManagerForIdleMaintenance(
+                                    uint32_t aRunId,
+                                    MultipleMaintenanceInfo&& aMaintenanceInfo);
+
+  // Runs on the main thread. It dispatches a runnable for each database that
+  // will call PerformIdleMaintenanceOnDatabase.
+  void
+  ScheduleIdleMaintenance(uint32_t aRunId, const nsACString& aKey);
+
+  // Runs on mMaintenanceThreadPool. Does maintenance on one database and then
+  // dispatches a runnable back to the main thread to call
+  // MaybeUnblockQuotaManagerForIdleMaintenance.
+  void
+  PerformIdleMaintenanceOnDatabase(uint32_t aRunId,
+                                   const nsACString& aKey,
+                                   SingleMaintenanceInfo&& aMaintenanceInfo);
+
+  // Runs on mMaintenanceThreadPool as part of PerformIdleMaintenanceOnDatabase.
+  void
+  PerformIdleMaintenanceOnDatabaseInternal(
+                                 uint32_t aRunId,
+                                 const SingleMaintenanceInfo& aMaintenanceInfo);
+
+  // Runs on mMaintenanceThreadPool as part of PerformIdleMaintenanceOnDatabase.
+  nsresult
+  CheckIntegrity(mozIStorageConnection* aConnection, bool* aOk);
+
+  // Runs on mMaintenanceThreadPool as part of PerformIdleMaintenanceOnDatabase.
+  nsresult
+  DetermineMaintenanceAction(mozIStorageConnection* aConnection,
+                             nsIFile* aDatabaseFile,
+                             MaintenanceAction* aMaintenanceAction);
+
+  // Runs on mMaintenanceThreadPool as part of PerformIdleMaintenanceOnDatabase.
+  void
+  IncrementalVacuum(mozIStorageConnection* aConnection);
+
+  // Runs on mMaintenanceThreadPool as part of PerformIdleMaintenanceOnDatabase.
+  void
+  FullVacuum(mozIStorageConnection* aConnection,
+             nsIFile* aDatabaseFile);
+
+  // Runs on the main thread. Checks to see if all database maintenance has
+  // finished and then calls UnblockQuotaManagerForIdleMaintenance.
+  void
+  MaybeUnblockQuotaManagerForIdleMaintenance(
+                                     const nsACString& aKey,
+                                     const nsAString& aDatabasePath);
+
+  // Runs on the main thread.
+  void
+  UnblockQuotaManagerForIdleMaintenance(
+                               const MultipleMaintenanceInfo& aMaintenanceInfo);
+
+  NS_DECL_NSIOBSERVER
+};
+
+class MOZ_STACK_CLASS QuotaClient::AutoProgressHandler final
+  : public mozIStorageProgressHandler
+{
+  QuotaClient* mQuotaClient;
+  mozIStorageConnection* mConnection;
+  uint32_t mRunId;
+
+  NS_DECL_OWNINGTHREAD
+
+  // This class is stack-based so we never actually allow AddRef/Release to do
+  // anything. But we need to know if any consumer *thinks* that they have a
+  // reference to this object so we track the reference countin DEBUG builds.
+  DebugOnly<nsrefcnt> mDEBUGRefCnt;
+
+public:
+  AutoProgressHandler(QuotaClient* aQuotaClient, uint32_t aRunId)
+    : mQuotaClient(aQuotaClient)
+    , mConnection(nullptr)
+    , mRunId(aRunId)
+    , mDEBUGRefCnt(0)
+  {
+    MOZ_ASSERT(!NS_IsMainThread());
+    MOZ_ASSERT(!IsOnBackgroundThread());
+    NS_ASSERT_OWNINGTHREAD(QuotaClient::AutoProgressHandler);
+    MOZ_ASSERT(aQuotaClient);
+  }
+
+  ~AutoProgressHandler()
+  {
+    NS_ASSERT_OWNINGTHREAD(QuotaClient::AutoProgressHandler);
+
+    if (mConnection) {
+      Unregister();
+    }
+
+    MOZ_ASSERT(!mDEBUGRefCnt);
+  }
+
+  nsresult
+  Register(mozIStorageConnection* aConnection);
+
+  // We don't want the mRefCnt member but this class does not "inherit"
+  // nsISupports.
+  NS_DECL_ISUPPORTS_INHERITED
+
+private:
+  void
+  Unregister();
+
+  NS_DECL_MOZISTORAGEPROGRESSHANDLER
+
+  // Not available for the heap!
+  void*
+  operator new(size_t) = delete;
+  void*
+  operator new[](size_t) = delete;
+  void
+  operator delete(void*) = delete;
+  void
+  operator delete[](void*) = delete;
+};
+
+struct QuotaClient::MaintenanceInfoBase
+{
+  const nsCString mGroup;
+  const nsCString mOrigin;
+  const PersistenceType mPersistenceType;
+
+protected:
+  MaintenanceInfoBase(const nsACString& aGroup,
+                      const nsACString& aOrigin,
+                      PersistenceType aPersistenceType)
+    : mGroup(aGroup)
+    , mOrigin(aOrigin)
+    , mPersistenceType(aPersistenceType)
+  {
+    MOZ_ASSERT(!aGroup.IsEmpty());
+    MOZ_ASSERT(!aOrigin.IsEmpty());
+    MOZ_ASSERT(aPersistenceType != PERSISTENCE_TYPE_INVALID);
+
+    MOZ_COUNT_CTOR(QuotaClient::MaintenanceInfoBase);
+  }
+
+  MaintenanceInfoBase(MaintenanceInfoBase&& aOther)
+    : mGroup(Move(aOther.mGroup))
+    , mOrigin(Move(aOther.mOrigin))
+    , mPersistenceType(Move(aOther.mPersistenceType))
+  {
+    MOZ_COUNT_CTOR(QuotaClient::MaintenanceInfoBase);
+  }
+
+  ~MaintenanceInfoBase()
+  {
+    MOZ_COUNT_DTOR(QuotaClient::MaintenanceInfoBase);
+  }
+
+  MaintenanceInfoBase(const MaintenanceInfoBase& aOther) = delete;
+};
+
+struct QuotaClient::SingleMaintenanceInfo final
+  : public MaintenanceInfoBase
+{
+  const nsString mDatabasePath;
+
+  SingleMaintenanceInfo(const nsACString& aGroup,
+                        const nsACString& aOrigin,
+                        PersistenceType aPersistenceType,
+                        const nsAString& aDatabasePath)
+   : MaintenanceInfoBase(aGroup, aOrigin, aPersistenceType)
+   , mDatabasePath(aDatabasePath)
+  {
+    MOZ_ASSERT(!aDatabasePath.IsEmpty());
+  }
+
+  SingleMaintenanceInfo(SingleMaintenanceInfo&& aOther)
+    : MaintenanceInfoBase(Move(aOther))
+    , mDatabasePath(Move(aOther.mDatabasePath))
+  {
+    MOZ_ASSERT(!mDatabasePath.IsEmpty());
+  }
+
+  SingleMaintenanceInfo(const SingleMaintenanceInfo& aOther) = delete;
+};
+
+struct QuotaClient::MultipleMaintenanceInfo final
+  : public MaintenanceInfoBase
+{
+  nsTArray<nsString> mDatabasePaths;
+
+  MultipleMaintenanceInfo(const nsACString& aGroup,
+                          const nsACString& aOrigin,
+                          PersistenceType aPersistenceType,
+                          nsTArray<nsString>&& aDatabasePaths)
+   : MaintenanceInfoBase(aGroup, aOrigin, aPersistenceType)
+   , mDatabasePaths(Move(aDatabasePaths))
+  {
+#ifdef DEBUG
+    MOZ_ASSERT(!mDatabasePaths.IsEmpty());
+    for (const nsString& databasePath : mDatabasePaths) {
+      MOZ_ASSERT(!databasePath.IsEmpty());
+    }
+#endif
+  }
+
+  MultipleMaintenanceInfo(MultipleMaintenanceInfo&& aOther)
+    : MaintenanceInfoBase(Move(aOther))
+    , mDatabasePaths(Move(aOther.mDatabasePaths))
+  {
+#ifdef DEBUG
+    MOZ_ASSERT(!mDatabasePaths.IsEmpty());
+    for (const nsString& databasePath : mDatabasePaths) {
+      MOZ_ASSERT(!databasePath.IsEmpty());
+    }
+#endif
+  }
+
+  MultipleMaintenanceInfo(const MultipleMaintenanceInfo& aOther) = delete;
 };
 
 class QuotaClient::ShutdownWorkThreadsRunnable final
@@ -7836,7 +8189,6 @@
   nsRefPtr<QuotaClient> mQuotaClient;
 
 public:
-
   explicit ShutdownWorkThreadsRunnable(QuotaClient* aQuotaClient)
     : mQuotaClient(aQuotaClient)
   {
@@ -8126,14 +8478,15 @@
 
   const uint32_t count = aFiles.Length();
 
-  if (NS_WARN_IF(!aActors.SetCapacity(count))) {
+  if (NS_WARN_IF(!aActors.SetCapacity(count, fallible))) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
   const bool collectFileInfos =
     !BackgroundParent::IsOtherProcessActor(aBackgroundActor);
 
-  if (collectFileInfos && NS_WARN_IF(!aFileInfos.SetCapacity(count))) {
+  if (collectFileInfos &&
+      NS_WARN_IF(!aFileInfos.SetCapacity(count, fallible))) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
@@ -8200,12 +8553,102 @@
 
 StaticAutoPtr<DatabaseLoggingInfoHashtable> gLoggingInfoHashtable;
 
+typedef nsDataHashtable<nsUint32HashKey, uint32_t> TelemetryIdHashtable;
+
+StaticAutoPtr<TelemetryIdHashtable> gTelemetryIdHashtable;
+
+// Protects all reads and writes to gTelemetryIdHashtable.
+StaticAutoPtr<Mutex> gTelemetryIdMutex;
+
 #ifdef DEBUG
 
 StaticRefPtr<DEBUGThreadSlower> gDEBUGThreadSlower;
 
 #endif // DEBUG
 
+
+uint32_t
+TelemetryIdForFile(nsIFile* aFile)
+{
+  // May be called on any thread!
+
+  MOZ_ASSERT(aFile);
+  MOZ_ASSERT(gTelemetryIdMutex);
+
+  // The storage directory is structured like this:
+  //
+  //   <profile>/storage/<persistence>/<origin>/idb/<filename>.sqlite
+  //
+  // For the purposes of this function we're only concerned with the
+  // <persistence>, <origin>, and <filename> pieces.
+
+  nsString filename;
+  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(aFile->GetLeafName(filename)));
+
+  // Make sure we were given a database file.
+  NS_NAMED_LITERAL_STRING(sqliteExtension, ".sqlite");
+
+  MOZ_ASSERT(StringEndsWith(filename, sqliteExtension));
+
+  filename.Truncate(filename.Length() - sqliteExtension.Length());
+
+  // Get the "idb" directory.
+  nsCOMPtr<nsIFile> idbDirectory;
+  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(aFile->GetParent(getter_AddRefs(idbDirectory))));
+
+  DebugOnly<nsString> idbLeafName;
+  MOZ_ASSERT(NS_SUCCEEDED(idbDirectory->GetLeafName(idbLeafName)));
+  MOZ_ASSERT(static_cast<nsString&>(idbLeafName).EqualsLiteral("idb"));
+
+  // Get the <origin> directory.
+  nsCOMPtr<nsIFile> originDirectory;
+  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
+    idbDirectory->GetParent(getter_AddRefs(originDirectory))));
+
+  nsString origin;
+  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(originDirectory->GetLeafName(origin)));
+
+  // Any databases in these directories are owned by the application and should
+  // not have their filenames masked. Hopefully they also appear in the
+  // Telemetry.cpp whitelist.
+  if (origin.EqualsLiteral("chrome") ||
+      origin.EqualsLiteral("moz-safe-about+home")) {
+    return 0;
+  }
+
+  // Get the <persistence> directory.
+  nsCOMPtr<nsIFile> persistenceDirectory;
+  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
+    originDirectory->GetParent(getter_AddRefs(persistenceDirectory))));
+
+  nsString persistence;
+  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(persistenceDirectory->GetLeafName(persistence)));
+
+  NS_NAMED_LITERAL_STRING(separator, "*");
+
+  uint32_t hashValue = HashString(persistence + separator +
+                                  origin + separator +
+                                  filename);
+
+  MutexAutoLock lock(*gTelemetryIdMutex);
+
+  if (!gTelemetryIdHashtable) {
+    gTelemetryIdHashtable = new TelemetryIdHashtable();
+  }
+
+  uint32_t id;
+  if (!gTelemetryIdHashtable->Get(hashValue, &id)) {
+    static uint32_t sNextId = 1;
+
+    // We're locked, no need for atomics.
+    id = sNextId++;
+
+    gTelemetryIdHashtable->Put(hashValue, id);
+  }
+
+  return id;
+}
+
 } // anonymous namespace
 
 /*******************************************************************************
@@ -8319,6 +8762,7 @@
                                       FileManager* aFileManager)
   : mStorageConnection(aStorageConnection)
   , mFileManager(aFileManager)
+  , mInReadTransaction(false)
   , mInWriteTransaction(false)
 #ifdef DEBUG
   , mDEBUGSavepointCount(0)
@@ -8344,10 +8788,11 @@
 DatabaseConnection::Init()
 {
   AssertIsOnConnectionThread();
+  MOZ_ASSERT(!mInReadTransaction);
   MOZ_ASSERT(!mInWriteTransaction);
 
   CachedStatement stmt;
-  nsresult rv = GetCachedStatement("BEGIN", &stmt);
+  nsresult rv = GetCachedStatement(NS_LITERAL_CSTRING("BEGIN;"), &stmt);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -8357,6 +8802,8 @@
     return rv;
   }
 
+  mInReadTransaction = true;
+
   return NS_OK;
 }
 
@@ -8406,6 +8853,7 @@
 {
   AssertIsOnConnectionThread();
   MOZ_ASSERT(mStorageConnection);
+  MOZ_ASSERT(mInReadTransaction);
   MOZ_ASSERT(!mInWriteTransaction);
 
   PROFILER_LABEL("IndexedDB",
@@ -8414,7 +8862,8 @@
 
   // Release our read locks.
   CachedStatement rollbackStmt;
-  nsresult rv = GetCachedStatement("ROLLBACK", &rollbackStmt);
+  nsresult rv =
+    GetCachedStatement(NS_LITERAL_CSTRING("ROLLBACK;"), &rollbackStmt);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -8424,6 +8873,8 @@
     return rv;
   }
 
+  mInReadTransaction = false;
+
   if (!mUpdateRefcountFunction) {
     MOZ_ASSERT(mFileManager);
 
@@ -8442,7 +8893,7 @@
   }
 
   CachedStatement beginStmt;
-  rv = GetCachedStatement("BEGIN IMMEDIATE", &beginStmt);
+  rv = GetCachedStatement(NS_LITERAL_CSTRING("BEGIN IMMEDIATE;"), &beginStmt);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -8476,22 +8927,50 @@
   return NS_OK;
 }
 
-void
-DatabaseConnection::RollbackWriteTransaction()
+nsresult
+DatabaseConnection::CommitWriteTransaction()
 {
   AssertIsOnConnectionThread();
   MOZ_ASSERT(mStorageConnection);
+  MOZ_ASSERT(!mInReadTransaction);
+  MOZ_ASSERT(mInWriteTransaction);
 
   PROFILER_LABEL("IndexedDB",
-                 "DatabaseConnection::RollbackWriteTransaction",
+                 "DatabaseConnection::CommitWriteTransaction",
                  js::ProfileEntry::Category::STORAGE);
 
-  if (!mInWriteTransaction) {
-    return;
+  CachedStatement stmt;
+  nsresult rv = GetCachedStatement(NS_LITERAL_CSTRING("COMMIT;"), &stmt);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
   }
 
-  DatabaseConnection::CachedStatement stmt;
-  nsresult rv = GetCachedStatement("ROLLBACK", &stmt);
+  rv = stmt->Execute();
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  mInWriteTransaction = false;
+  return NS_OK;
+}
+
+void
+DatabaseConnection::RollbackWriteTransaction()
+{
+  AssertIsOnConnectionThread();
+  MOZ_ASSERT(!mInReadTransaction);
+  MOZ_ASSERT(mStorageConnection);
+
+  PROFILER_LABEL("IndexedDB",
+                 "DatabaseConnection::RollbackWriteTransaction",
+                 js::ProfileEntry::Category::STORAGE);
+
+  if (!mInWriteTransaction) {
+    return;
+  }
+
+  DatabaseConnection::CachedStatement stmt;
+  nsresult rv = GetCachedStatement(NS_LITERAL_CSTRING("ROLLBACK;"), &stmt);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return;
   }
@@ -8499,6 +8978,8 @@
   // This may fail if SQLite already rolled back the transaction so ignore any
   // errors.
   unused << stmt->Execute();
+
+  mInWriteTransaction = false;
 }
 
 void
@@ -8506,6 +8987,8 @@
 {
   AssertIsOnConnectionThread();
   MOZ_ASSERT(mStorageConnection);
+  MOZ_ASSERT(!mInReadTransaction);
+  MOZ_ASSERT(!mInWriteTransaction);
 
   PROFILER_LABEL("IndexedDB",
                  "DatabaseConnection::FinishWriteTransaction",
@@ -8515,14 +8998,8 @@
     mUpdateRefcountFunction->Reset();
   }
 
-  if (!mInWriteTransaction) {
-    return;
-  }
-
-  mInWriteTransaction = false;
-
   CachedStatement stmt;
-  nsresult rv = GetCachedStatement("BEGIN", &stmt);
+  nsresult rv = GetCachedStatement(NS_LITERAL_CSTRING("BEGIN;"), &stmt);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return;
   }
@@ -8531,6 +9008,8 @@
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return;
   }
+
+  mInReadTransaction = true;
 }
 
 nsresult
@@ -8546,7 +9025,7 @@
                  js::ProfileEntry::Category::STORAGE);
 
   CachedStatement stmt;
-  nsresult rv = GetCachedStatement(kSavepointClause, &stmt);
+  nsresult rv = GetCachedStatement(NS_LITERAL_CSTRING(SAVEPOINT_CLAUSE), &stmt);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -8580,7 +9059,7 @@
 
   CachedStatement stmt;
   nsresult rv = GetCachedStatement(
-    NS_LITERAL_CSTRING("RELEASE ") + NS_LITERAL_CSTRING(kSavepointClause),
+    NS_LITERAL_CSTRING("RELEASE " SAVEPOINT_CLAUSE),
     &stmt);
   if (NS_SUCCEEDED(rv)) {
     rv = stmt->Execute();
@@ -8618,7 +9097,7 @@
 
   CachedStatement stmt;
   nsresult rv = GetCachedStatement(
-    NS_LITERAL_CSTRING("ROLLBACK TO ") + NS_LITERAL_CSTRING(kSavepointClause),
+    NS_LITERAL_CSTRING("ROLLBACK TO " SAVEPOINT_CLAUSE),
     &stmt);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
@@ -8632,31 +9111,46 @@
 }
 
 nsresult
-DatabaseConnection::Checkpoint(bool aIdle)
+DatabaseConnection::CheckpointInternal(CheckpointMode aMode)
 {
   AssertIsOnConnectionThread();
+  MOZ_ASSERT(!mInReadTransaction);
+  MOZ_ASSERT(!mInWriteTransaction);
 
   PROFILER_LABEL("IndexedDB",
-                 "DatabaseConnection::Checkpoint",
+                 "DatabaseConnection::CheckpointInternal",
                  js::ProfileEntry::Category::STORAGE);
 
-  nsAutoCString checkpointMode;
-  if (aIdle) {
-    // When idle we want to reclaim disk space.
-    checkpointMode.AssignLiteral("TRUNCATE");
-  } else {
-    // We're being called at the end of a READ_WRITE_FLUSH transaction so make
-    // sure that the database is completely checkpointed and flushed to disk.
-    checkpointMode.AssignLiteral("FULL");
+  nsAutoCString stmtString;
+  stmtString.AssignLiteral("PRAGMA wal_checkpoint(");
+
+  switch (aMode) {
+    case CheckpointMode_Full:
+      // Ensures that the database is completely checkpointed and flushed to
+      // disk.
+      stmtString.AppendLiteral("FULL");
+      break;
+
+    case CheckpointMode_Restart:
+      // Like CheckpointMode_Full, but also ensures that the next write will
+      // start overwriting the existing WAL file rather than letting the WAL
+      // file grow.
+      stmtString.AppendLiteral("RESTART");
+      break;
+
+    case CheckpointMode_Truncate:
+      // Like CheckpointMode_Restart but also truncates the existing WAL file.
+      stmtString.AppendLiteral("TRUNCATE");
+      break;
+
+    default:
+      MOZ_CRASH("Unknown CheckpointMode!");
   }
 
+  stmtString.AppendLiteral(");");
+
   CachedStatement stmt;
-  nsresult rv =
-    GetCachedStatement(
-      NS_LITERAL_CSTRING("PRAGMA wal_checkpoint(") +
-      checkpointMode +
-      NS_LITERAL_CSTRING(")"),
-      &stmt);
+  nsresult rv = GetCachedStatement(stmtString, &stmt);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -8670,6 +9164,246 @@
 }
 
 void
+DatabaseConnection::DoIdleProcessing(bool aNeedsCheckpoint)
+{
+  AssertIsOnConnectionThread();
+  MOZ_ASSERT(mInReadTransaction);
+  MOZ_ASSERT(!mInWriteTransaction);
+
+  PROFILER_LABEL("IndexedDB",
+                 "DatabaseConnection::DoIdleProcessing",
+                 js::ProfileEntry::Category::STORAGE);
+
+  DatabaseConnection::CachedStatement freelistStmt;
+  uint32_t freelistCount;
+  nsresult rv = GetFreelistCount(freelistStmt, &freelistCount);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    freelistCount = 0;
+  }
+
+  CachedStatement rollbackStmt;
+  CachedStatement beginStmt;
+  if (aNeedsCheckpoint || freelistCount) {
+    rv = GetCachedStatement(NS_LITERAL_CSTRING("ROLLBACK;"), &rollbackStmt);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return;
+    }
+
+    rv = GetCachedStatement(NS_LITERAL_CSTRING("BEGIN;"), &beginStmt);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return;
+    }
+
+    // Release the connection's normal transaction. It's possible that it could
+    // fail, but that isn't a problem here.
+    unused << rollbackStmt->Execute();
+
+    mInReadTransaction = false;
+  }
+
+  bool freedSomePages = false;
+
+  if (freelistCount) {
+    rv = ReclaimFreePagesWhileIdle(freelistStmt,
+                                   rollbackStmt,
+                                   freelistCount,
+                                   aNeedsCheckpoint,
+                                   &freedSomePages);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      MOZ_ASSERT(!freedSomePages);
+    }
+
+    // Make sure we didn't leave a transaction running.
+    MOZ_ASSERT(!mInReadTransaction);
+    MOZ_ASSERT(!mInWriteTransaction);
+  }
+
+  // Truncate the WAL if we were asked to or if we managed to free some space.
+  if (aNeedsCheckpoint || freedSomePages) {
+    rv = CheckpointInternal(CheckpointMode_Truncate);
+    unused << NS_WARN_IF(NS_FAILED(rv));
+  }
+
+  // Finally try to restart the read transaction if we rolled it back earlier.
+  if (beginStmt) {
+    rv = beginStmt->Execute();
+    if (NS_SUCCEEDED(rv)) {
+      mInReadTransaction = true;
+    } else {
+      NS_WARNING("Falied to restart read transaction!");
+    }
+  }
+}
+
+nsresult
+DatabaseConnection::ReclaimFreePagesWhileIdle(
+                                            CachedStatement& aFreelistStatement,
+                                            CachedStatement& aRollbackStatement,
+                                            uint32_t aFreelistCount,
+                                            bool aNeedsCheckpoint,
+                                            bool* aFreedSomePages)
+{
+  AssertIsOnConnectionThread();
+  MOZ_ASSERT(aFreelistStatement);
+  MOZ_ASSERT(aRollbackStatement);
+  MOZ_ASSERT(aFreelistCount);
+  MOZ_ASSERT(aFreedSomePages);
+  MOZ_ASSERT(!mInReadTransaction);
+  MOZ_ASSERT(!mInWriteTransaction);
+
+  PROFILER_LABEL("IndexedDB",
+                 "DatabaseConnection::ReclaimFreePagesWhileIdle",
+                 js::ProfileEntry::Category::STORAGE);
+
+  // Make sure we don't keep working if anything else needs this thread.
+  nsIThread* currentThread = NS_GetCurrentThread();
+  MOZ_ASSERT(currentThread);
+
+  if (NS_HasPendingEvents(currentThread)) {
+    *aFreedSomePages = false;
+    return NS_OK;
+  }
+
+  // Only try to free 10% at a time so that we can bail out if this connection
+  // suddenly becomes active or if the thread is needed otherwise.
+  nsAutoCString stmtString;
+  stmtString.AssignLiteral("PRAGMA incremental_vacuum(");
+  stmtString.AppendInt(std::max(uint64_t(1), uint64_t(aFreelistCount / 10)));
+  stmtString.AppendLiteral(");");
+
+  // Make all the statements we'll need up front.
+  CachedStatement incrementalVacuumStmt;
+  nsresult rv = GetCachedStatement(stmtString, &incrementalVacuumStmt);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  CachedStatement beginImmediateStmt;
+  rv = GetCachedStatement(NS_LITERAL_CSTRING("BEGIN IMMEDIATE;"),
+                          &beginImmediateStmt);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  CachedStatement commitStmt;
+  rv = GetCachedStatement(NS_LITERAL_CSTRING("COMMIT;"), &commitStmt);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  if (aNeedsCheckpoint) {
+    // Freeing pages is a journaled operation, so it will require additional WAL
+    // space. However, we're idle and are about to checkpoint anyway, so doing a
+    // RESTART checkpoint here should allow us to reuse any existing space.
+    rv = CheckpointInternal(CheckpointMode_Restart);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+  }
+
+  // Start the write transaction.
+  rv = beginImmediateStmt->Execute();
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  mInWriteTransaction = true;
+
+  bool freedSomePages = false;
+
+  while (aFreelistCount) {
+    if (NS_HasPendingEvents(currentThread)) {
+      // Something else wants to use the thread so roll back this transaction.
+      // It's ok if we never make progress here because the idle service should
+      // eventually reclaim this space.
+      rv = NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
+      break;
+    }
+
+    rv = incrementalVacuumStmt->Execute();
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      break;
+    }
+
+    freedSomePages = true;
+
+    rv = GetFreelistCount(aFreelistStatement, &aFreelistCount);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      break;
+    }
+  }
+
+  if (NS_SUCCEEDED(rv) && freedSomePages) {
+    // Commit the write transaction.
+    rv = commitStmt->Execute();
+    if (NS_SUCCEEDED(rv)) {
+      mInWriteTransaction = false;
+    } else {
+      NS_WARNING("Failed to commit!");
+    }
+  }
+
+  if (NS_FAILED(rv)) {
+    MOZ_ASSERT(mInWriteTransaction);
+
+    // Something failed, make sure we roll everything back.
+    unused << aRollbackStatement->Execute();
+
+    mInWriteTransaction = false;
+
+    return rv;
+  }
+
+  *aFreedSomePages = freedSomePages;
+  return NS_OK;
+}
+
+nsresult
+DatabaseConnection::GetFreelistCount(CachedStatement& aCachedStatement,
+                                     uint32_t* aFreelistCount)
+{
+  AssertIsOnConnectionThread();
+  MOZ_ASSERT(aFreelistCount);
+
+  PROFILER_LABEL("IndexedDB",
+                 "DatabaseConnection::GetFreelistCount",
+                 js::ProfileEntry::Category::STORAGE);
+
+  nsresult rv;
+
+  if (!aCachedStatement) {
+    rv = GetCachedStatement(NS_LITERAL_CSTRING("PRAGMA freelist_count;"),
+                            &aCachedStatement);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+  }
+
+  bool hasResult;
+  rv = aCachedStatement->ExecuteStep(&hasResult);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  MOZ_ASSERT(hasResult);
+
+  // Make sure this statement is reset when leaving this function since we're
+  // not using the normal stack-based protection of CachedStatement.
+  mozStorageStatementScoper scoper(aCachedStatement);
+
+  int32_t freelistCount;
+  rv = aCachedStatement->GetInt32(0, &freelistCount);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  MOZ_ASSERT(freelistCount >= 0);
+
+  *aFreelistCount = uint32_t(freelistCount);
+  return NS_OK;
+}
+
+void
 DatabaseConnection::Close()
 {
   AssertIsOnConnectionThread();
@@ -9245,10 +9979,10 @@
 
   nsresult rv;
   if (!mUpdateStatement) {
-    rv = connection->GetCachedStatement(
+    rv = connection->GetCachedStatement(NS_LITERAL_CSTRING(
       "UPDATE file "
       "SET refcount = refcount + :delta "
-      "WHERE id = :id",
+      "WHERE id = :id"),
       &mUpdateStatement);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
@@ -9280,10 +10014,10 @@
 
   if (rows > 0) {
     if (!mSelectStatement) {
-      rv = connection->GetCachedStatement(
+      rv = connection->GetCachedStatement(NS_LITERAL_CSTRING(
         "SELECT id "
         "FROM file "
-        "WHERE id = :id",
+        "WHERE id = :id"),
         &mSelectStatement);
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
@@ -9313,9 +10047,9 @@
   }
 
   if (!mInsertStatement) {
-    rv = connection->GetCachedStatement(
+    rv = connection->GetCachedStatement(NS_LITERAL_CSTRING(
       "INSERT INTO file (id, refcount) "
-      "VALUES(:id, :delta)",
+      "VALUES(:id, :delta)"),
       &mInsertStatement);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
@@ -9419,8 +10153,8 @@
     IdleDatabaseInfo& info = self->mIdleDatabases[index];
 
     if (now >= info.mIdleTime) {
-      if (info.mDatabaseInfo->mNeedsCheckpoint) {
-        self->CheckpointDatabase(info.mDatabaseInfo);
+      if (info.mDatabaseInfo->mIdle) {
+        self->PerformIdleDatabaseMaintenance(info.mDatabaseInfo);
       } else {
         self->CloseDatabase(info.mDatabaseInfo);
       }
@@ -9485,6 +10219,7 @@
                            aDatabase->Type(),
                            aDatabase->Group(),
                            aDatabase->Origin(),
+                           aDatabase->TelemetryId(),
                            getter_AddRefs(storageConnection));
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
@@ -9868,8 +10603,6 @@
   MOZ_ASSERT(aThreadInfo.mRunnable);
   MOZ_ASSERT(mTotalThreadCount);
 
-  aThreadInfo.NuwaSetWorking(/* aWorking */ false);
-
   nsRefPtr<ThreadRunnable> runnable;
   aThreadInfo.mRunnable.swap(runnable);
 
@@ -9900,13 +10633,19 @@
                  js::ProfileEntry::Category::STORAGE);
 
   if (!mIdleDatabases.IsEmpty()) {
-    for (uint32_t count = mIdleDatabases.Length(), index = 0;
-         index < count;
-         index++) {
-      CloseDatabase(mIdleDatabases[index].mDatabaseInfo);
+    for (IdleDatabaseInfo& idleInfo : mIdleDatabases) {
+      CloseDatabase(idleInfo.mDatabaseInfo);
     }
     mIdleDatabases.Clear();
   }
+
+  if (!mDatabasesPerformingIdleMaintenance.IsEmpty()) {
+    for (DatabaseInfo* dbInfo : mDatabasesPerformingIdleMaintenance) {
+      MOZ_ASSERT(dbInfo);
+      CloseDatabase(dbInfo);
+    }
+    mDatabasesPerformingIdleMaintenance.Clear();
+  }
 }
 
 void
@@ -9943,6 +10682,8 @@
   DatabaseInfo* dbInfo = aTransactionInfo->mDatabaseInfo;
   MOZ_ASSERT(dbInfo);
 
+  dbInfo->mIdle = false;
+
   if (dbInfo->mClosing) {
     MOZ_ASSERT(!mIdleDatabases.Contains(dbInfo));
     MOZ_ASSERT(
@@ -9977,6 +10718,23 @@
         } else {
           NS_WARNING("Failed to make new thread!");
         }
+      } else if (!mDatabasesPerformingIdleMaintenance.IsEmpty()) {
+        // We need a thread right now so force all idle processing to stop by
+        // posting a dummy runnable to each thread that might be doing idle
+        // maintenance.
+        nsCOMPtr<nsIRunnable> runnable = new nsRunnable();
+
+        for (uint32_t index = mDatabasesPerformingIdleMaintenance.Length();
+             index > 0;
+             index--) {
+          DatabaseInfo* dbInfo = mDatabasesPerformingIdleMaintenance[index - 1];
+          MOZ_ASSERT(dbInfo);
+          MOZ_ASSERT(dbInfo->mThreadInfo.mThread);
+
+          MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
+            dbInfo->mThreadInfo.mThread->Dispatch(runnable,
+                                                  NS_DISPATCH_NORMAL)));
+        }
       }
 
       if (!created) {
@@ -9998,8 +10756,6 @@
 
       AdjustIdleTimer();
     }
-
-    dbInfo->mThreadInfo.NuwaSetWorking(/* aWorking */ true);
   }
 
   MOZ_ASSERT(dbInfo->mThreadInfo.mThread);
@@ -10146,6 +10902,9 @@
 #endif
 
   if (!dbInfo->TotalTransactionCount()) {
+    MOZ_ASSERT(!dbInfo->mIdle);
+    dbInfo->mIdle = true;
+
     NoteIdleDatabase(dbInfo);
   }
 }
@@ -10219,8 +10978,6 @@
     return;
   }
 
-  aDatabaseInfo->mThreadInfo.NuwaSetWorking(/* aWorking */ false);
-
   mIdleDatabases.InsertElementSorted(aDatabaseInfo);
 
   AdjustIdleTimer();
@@ -10264,8 +11021,6 @@
       } else {
         MOZ_ASSERT(!mIdleThreads.Contains(aDatabaseInfo->mThreadInfo));
 
-        aDatabaseInfo->mThreadInfo.NuwaSetWorking(/* aWorking */ false);
-
         mIdleThreads.InsertElementSorted(aDatabaseInfo->mThreadInfo);
 
         aDatabaseInfo->mThreadInfo.mRunnable = nullptr;
@@ -10362,21 +11117,26 @@
 }
 
 void
-ConnectionPool::CheckpointDatabase(DatabaseInfo* aDatabaseInfo)
+ConnectionPool::PerformIdleDatabaseMaintenance(DatabaseInfo* aDatabaseInfo)
 {
   AssertIsOnOwningThread();
   MOZ_ASSERT(aDatabaseInfo);
   MOZ_ASSERT(!aDatabaseInfo->TotalTransactionCount());
   MOZ_ASSERT(aDatabaseInfo->mThreadInfo.mThread);
   MOZ_ASSERT(aDatabaseInfo->mThreadInfo.mRunnable);
-  MOZ_ASSERT(aDatabaseInfo->mNeedsCheckpoint);
+  MOZ_ASSERT(aDatabaseInfo->mIdle);
   MOZ_ASSERT(!aDatabaseInfo->mCloseOnIdle);
   MOZ_ASSERT(!aDatabaseInfo->mClosing);
+  MOZ_ASSERT(mIdleDatabases.Contains(aDatabaseInfo));
+  MOZ_ASSERT(!mDatabasesPerformingIdleMaintenance.Contains(aDatabaseInfo));
+
+  nsCOMPtr<nsIRunnable> runnable =
+    new IdleConnectionRunnable(aDatabaseInfo, aDatabaseInfo->mNeedsCheckpoint);
 
   aDatabaseInfo->mNeedsCheckpoint = false;
+  aDatabaseInfo->mIdle = false;
 
-  nsCOMPtr<nsIRunnable> runnable =
-    new CheckpointConnectionRunnable(aDatabaseInfo);
+  mDatabasesPerformingIdleMaintenance.AppendElement(aDatabaseInfo);
 
   MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
     aDatabaseInfo->mThreadInfo.mThread->Dispatch(runnable,
@@ -10393,13 +11153,12 @@
   MOZ_ASSERT(aDatabaseInfo->mThreadInfo.mRunnable);
   MOZ_ASSERT(!aDatabaseInfo->mClosing);
 
+  aDatabaseInfo->mIdle = false;
   aDatabaseInfo->mNeedsCheckpoint = false;
   aDatabaseInfo->mClosing = true;
 
   nsCOMPtr<nsIRunnable> runnable = new CloseConnectionRunnable(aDatabaseInfo);
 
-  aDatabaseInfo->mThreadInfo.NuwaSetWorking(/* aWorking */ true);
-
   MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
     aDatabaseInfo->mThreadInfo.mThread->Dispatch(runnable,
                                                  NS_DISPATCH_NORMAL)));
@@ -10416,7 +11175,8 @@
                  js::ProfileEntry::Category::STORAGE);
 
   if (DatabaseInfo* dbInfo = mDatabases.Get(aDatabaseId)) {
-    if (mIdleDatabases.RemoveElement(dbInfo)) {
+    if (mIdleDatabases.RemoveElement(dbInfo) ||
+        mDatabasesPerformingIdleMaintenance.RemoveElement(dbInfo)) {
       CloseDatabase(dbInfo);
       AdjustIdleTimer();
     } else {
@@ -10441,38 +11201,43 @@
   MOZ_ASSERT(mOwningThread);
 }
 
-NS_IMPL_ISUPPORTS_INHERITED0(ConnectionPool::CheckpointConnectionRunnable,
+NS_IMPL_ISUPPORTS_INHERITED0(ConnectionPool::IdleConnectionRunnable,
                              ConnectionPool::ConnectionRunnable)
 
 NS_IMETHODIMP
 ConnectionPool::
-CheckpointConnectionRunnable::Run()
+IdleConnectionRunnable::Run()
 {
   MOZ_ASSERT(mDatabaseInfo);
+  MOZ_ASSERT(!mDatabaseInfo->mIdle);
 
-  PROFILER_LABEL("IndexedDB",
-                 "ConnectionPool::CheckpointConnectionRunnable::Run",
-                 js::ProfileEntry::Category::STORAGE);
+  nsCOMPtr<nsIEventTarget> owningThread;
+  mOwningThread.swap(owningThread);
 
-  if (mOwningThread) {
+  if (owningThread) {
     mDatabaseInfo->AssertIsOnConnectionThread();
     MOZ_ASSERT(mDatabaseInfo->mConnection);
-
-    nsCOMPtr<nsIEventTarget> owningThread;
-    mOwningThread.swap(owningThread);
-
-    mDatabaseInfo->mConnection->Checkpoint(/* aIdle */ true);
+    mDatabaseInfo->mConnection->DoIdleProcessing(mNeedsCheckpoint);
 
     MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
       owningThread->Dispatch(this, NS_DISPATCH_NORMAL)));
     return NS_OK;
   }
 
-  if (!mDatabaseInfo->TotalTransactionCount()) {
-    nsRefPtr<ConnectionPool> connectionPool = mDatabaseInfo->mConnectionPool;
-    MOZ_ASSERT(connectionPool);
+  nsRefPtr<ConnectionPool> connectionPool = mDatabaseInfo->mConnectionPool;
+  MOZ_ASSERT(connectionPool);
+
+  if (mDatabaseInfo->mClosing) {
+    MOZ_ASSERT(!connectionPool->
+                 mDatabasesPerformingIdleMaintenance.Contains(mDatabaseInfo));
+  } else {
+    MOZ_ALWAYS_TRUE(
+      connectionPool->
+        mDatabasesPerformingIdleMaintenance.RemoveElement(mDatabaseInfo));
 
-    connectionPool->NoteIdleDatabase(mDatabaseInfo);
+    if (!mDatabaseInfo->TotalTransactionCount()) {
+      connectionPool->NoteIdleDatabase(mDatabaseInfo);
+    }
   }
 
   return NS_OK;
@@ -10533,6 +11298,7 @@
   , mReadTransactionCount(0)
   , mWriteTransactionCount(0)
   , mNeedsCheckpoint(false)
+  , mIdle(false)
   , mCloseOnIdle(false)
   , mClosing(false)
 #ifdef DEBUG
@@ -10748,9 +11514,6 @@
 
 ConnectionPool::
 ThreadInfo::ThreadInfo()
-#ifdef MOZ_NUWA_PROCESS
-  : mNuwaWorking(false)
-#endif
 {
   AssertIsOnBackgroundThread();
 
@@ -10761,9 +11524,6 @@
 ThreadInfo::ThreadInfo(const ThreadInfo& aOther)
   : mThread(aOther.mThread)
   , mRunnable(aOther.mRunnable)
-#ifdef MOZ_NUWA_PROCESS
-  , mNuwaWorking(false)
-#endif
 {
   AssertIsOnBackgroundThread();
   MOZ_ASSERT(aOther.mThread);
@@ -10777,52 +11537,9 @@
 {
   AssertIsOnBackgroundThread();
 
-#ifdef MOZ_NUWA_PROCESS
-  MOZ_ASSERT(!mNuwaWorking);
-#endif
-
   MOZ_COUNT_DTOR(ConnectionPool::ThreadInfo);
 }
 
-#ifdef MOZ_NUWA_PROCESS
-
-void
-ConnectionPool::
-ThreadInfo::NuwaSetWorking(bool aWorking)
-{
-  AssertIsOnBackgroundThread();
-  MOZ_ASSERT(mThread);
-
-  if (mNuwaWorking == aWorking) {
-    return;
-  }
-
-  nsCOMPtr<nsIRunnable> runnable = NS_NewRunnableFunction(
-    [aWorking]
-    {
-      MOZ_ASSERT(!IsOnBackgroundThread());
-      MOZ_ASSERT(!NS_IsMainThread());
-
-      auto* thread = static_cast<nsThread*>(NS_GetCurrentThread());
-      MOZ_ASSERT(thread);
-
-      if (aWorking) {
-        thread->SetWorking();
-      } else {
-        thread->SetIdle();
-      }
-    }
-  );
-  MOZ_ASSERT(runnable);
-
-  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
-    mThread->Dispatch(runnable, NS_DISPATCH_NORMAL)));
-
-  mNuwaWorking = aWorking;
-}
-
-#endif // MOZ_NUWA_PROCESS
-
 ConnectionPool::
 IdleResource::IdleResource(const TimeStamp& aIdleTime)
   : mIdleTime(aIdleTime)
@@ -10854,9 +11571,9 @@
 ConnectionPool::
 IdleDatabaseInfo::IdleDatabaseInfo(DatabaseInfo* aDatabaseInfo)
   : IdleResource(TimeStamp::NowLoRes() +
-                 (aDatabaseInfo->mNeedsCheckpoint ?
-                 TimeDuration::FromMilliseconds(kConnectionIdleCheckpointsMS) :
-                 TimeDuration::FromMilliseconds(kConnectionIdleCloseMS)))
+                 (aDatabaseInfo->mIdle ?
+                  TimeDuration::FromMilliseconds(kConnectionIdleMaintenanceMS) :
+                  TimeDuration::FromMilliseconds(kConnectionIdleCloseMS)))
   , mDatabaseInfo(aDatabaseInfo)
 {
   AssertIsOnBackgroundThread();
@@ -11554,6 +12271,7 @@
                    const PrincipalInfo& aPrincipalInfo,
                    const nsACString& aGroup,
                    const nsACString& aOrigin,
+                   uint32_t aTelemetryId,
                    FullDatabaseMetadata* aMetadata,
                    FileManager* aFileManager,
                    already_AddRefed<DatabaseOfflineStorage> aOfflineStorage,
@@ -11568,6 +12286,7 @@
   , mId(aMetadata->mDatabaseId)
   , mFilePath(aMetadata->mFilePath)
   , mFileHandleCount(0)
+  , mTelemetryId(aTelemetryId)
   , mPersistenceType(aMetadata->mCommonMetadata.persistenceType())
   , mChromeWriteAccessAllowed(aChromeWriteAccessAllowed)
   , mClosed(false)
@@ -11605,7 +12324,7 @@
       }
 
       FallibleTArray<nsRefPtr<TransactionBase>> transactions;
-      if (NS_WARN_IF(!transactions.SetCapacity(count))) {
+      if (NS_WARN_IF(!transactions.SetCapacity(count, fallible))) {
         return false;
       }
 
@@ -11953,7 +12672,7 @@
   }
 
   FallibleTArray<nsRefPtr<FullObjectStoreMetadata>> fallibleObjectStores;
-  if (NS_WARN_IF(!fallibleObjectStores.SetCapacity(nameCount))) {
+  if (NS_WARN_IF(!fallibleObjectStores.SetCapacity(nameCount, fallible))) {
     return nullptr;
   }
 
@@ -14270,8 +14989,7 @@
     return rv;
   }
 
-  NS_ConvertASCIItoUTF16 dirName(NS_LITERAL_CSTRING(kJournalDirectoryName));
-  rv = journalDirectory->Append(dirName);
+  rv = journalDirectory->Append(NS_LITERAL_STRING(JOURNAL_DIRECTORY_NAME));
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -14491,7 +15209,8 @@
                            nsIFile* aDatabaseFile,
                            PersistenceType aPersistenceType,
                            const nsACString& aGroup,
-                           const nsACString& aOrigin)
+                           const nsACString& aOrigin,
+                           uint32_t aTelemetryId)
 {
   AssertIsOnIOThread();
   MOZ_ASSERT(aDirectory);
@@ -14523,8 +15242,7 @@
     return rv;
   }
 
-  NS_ConvertASCIItoUTF16 dirName(NS_LITERAL_CSTRING(kJournalDirectoryName));
-  rv = journalDirectory->Append(dirName);
+  rv = journalDirectory->Append(NS_LITERAL_STRING(JOURNAL_DIRECTORY_NAME));
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -14564,6 +15282,7 @@
                                    aPersistenceType,
                                    aGroup,
                                    aOrigin,
+                                   aTelemetryId,
                                    getter_AddRefs(connection));
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
@@ -14707,7 +15426,7 @@
       return rv;
     }
 
-    if (leafName.EqualsLiteral(kJournalDirectoryName)) {
+    if (leafName.EqualsLiteral(JOURNAL_DIRECTORY_NAME)) {
       continue;
     }
 
@@ -14735,10 +15454,18 @@
 QuotaClient* QuotaClient::sInstance = nullptr;
 
 QuotaClient::QuotaClient()
-  : mShutdownRequested(false)
+  : mMaintenanceStartTime(0)
+  , mMaintenanceRunId(0)
+  , mShutdownRequested(false)
+  , mIdleObserverRegistered(false)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(!sInstance, "We expect this to be a singleton!");
+  MOZ_ASSERT(!gTelemetryIdMutex);
+
+  // Always create this so that later access to gTelemetryIdHashtable can be
+  // properly synchronized.
+  gTelemetryIdMutex = new Mutex("IndexedDB gTelemetryIdMutex");
 
   sInstance = this;
 }
@@ -14747,6 +15474,15 @@
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(sInstance == this, "We expect this to be a singleton!");
+  MOZ_ASSERT(gTelemetryIdMutex);
+  MOZ_ASSERT(!mMaintenanceThreadPool);
+  MOZ_ASSERT_IF(mMaintenanceInfoHashtable, !mMaintenanceInfoHashtable->Count());
+  MOZ_ASSERT(!mIdleObserverRegistered);
+
+  // No one else should be able to touch gTelemetryIdHashtable now that the
+  // QuotaClient has gone away.
+  gTelemetryIdHashtable = nullptr;
+  gTelemetryIdMutex = nullptr;
 
   sInstance = nullptr;
 }
@@ -14761,6 +15497,8 @@
   mBackgroundThread = aBackgroundThread;
 }
 
+NS_IMPL_ISUPPORTS(QuotaClient, nsIObserver)
+
 mozilla::dom::quota::Client::Type
 QuotaClient::GetType()
 {
@@ -14996,7 +15734,8 @@
                                     initInfo.mDatabaseFile,
                                     aPersistenceType,
                                     aGroup,
-                                    aOrigin);
+                                    aOrigin,
+                                    TelemetryIdForFile(initInfo.mDatabaseFile));
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
@@ -15143,170 +15882,1209 @@
     }
   }
 
-  if (databaseIds.IsEmpty()) {
-    MOZ_ALWAYS_TRUE(NS_SUCCEEDED(NS_DispatchToCurrentThread(aCallback)));
-    return;
+  if (databaseIds.IsEmpty()) {
+    MOZ_ALWAYS_TRUE(NS_SUCCEEDED(NS_DispatchToCurrentThread(aCallback)));
+    return;
+  }
+
+  MOZ_ASSERT(backgroundThread);
+
+  nsCOMPtr<nsIRunnable> runnable =
+    new WaitForTransactionsRunnable(this, databaseIds, aCallback);
+  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
+    backgroundThread->Dispatch(runnable, NS_DISPATCH_NORMAL)));
+}
+
+void
+QuotaClient::PerformIdleMaintenance()
+{
+  using namespace mozilla::hal;
+
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(!mShutdownRequested);
+
+  // If we're running on battery power then skip all idle maintenance since we
+  // would otherwise be doing lots of disk I/O.
+  BatteryInformation batteryInfo;
+
+#ifdef MOZ_WIDGET_ANDROID
+  // Android XPCShell doesn't load the AndroidBridge that is needed to make
+  // GetCurrentBatteryInformation work...
+  if (!kRunningXPCShellTests)
+#endif
+  {
+    GetCurrentBatteryInformation(&batteryInfo);
+  }
+
+  // If we're running XPCShell because we always want to be able to test this
+  // code so pretend that we're always charging.
+  if (kRunningXPCShellTests) {
+    batteryInfo.level() = 100;
+    batteryInfo.charging() = true;
+  }
+
+  if (NS_WARN_IF(!batteryInfo.charging())) {
+    return;
+  }
+
+  // Make sure that the IndexedDatabaseManager is running so that we can check
+  // for low disk space mode.
+  IndexedDatabaseManager* mgr = IndexedDatabaseManager::GetOrCreate();
+  if (NS_WARN_IF(!mgr)) {
+    return;
+  }
+
+  if (kRunningXPCShellTests) {
+    // We don't want user activity to impact this code if we're running tests.
+    unused << Observe(nullptr, OBSERVER_TOPIC_IDLE, nullptr);
+  } else if (!mIdleObserverRegistered) {
+    nsCOMPtr<nsIIdleService> idleService =
+      do_GetService(kIdleServiceContractId);
+    MOZ_ASSERT(idleService);
+
+    MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
+      idleService->AddIdleObserver(this, kIdleObserverTimeSec)));
+
+    mIdleObserverRegistered = true;
+  }
+}
+
+void
+QuotaClient::ShutdownWorkThreads()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(!mShutdownRunnable);
+  MOZ_ASSERT(!mShutdownRequested);
+
+  StopIdleMaintenance();
+
+  mShutdownRequested = true;
+
+  if (mBackgroundThread) {
+    nsRefPtr<ShutdownWorkThreadsRunnable> runnable =
+      new ShutdownWorkThreadsRunnable(this);
+
+    if (NS_SUCCEEDED(mBackgroundThread->Dispatch(runnable,
+                                                 NS_DISPATCH_NORMAL))) {
+      mShutdownRunnable = Move(runnable);
+    }
+  }
+
+  FileService::Shutdown();
+
+  if (mMaintenanceThreadPool) {
+    mMaintenanceThreadPool->Shutdown();
+    mMaintenanceThreadPool = nullptr;
+  }
+
+  if (mShutdownRunnable) {
+    nsIThread* currentThread = NS_GetCurrentThread();
+    MOZ_ASSERT(currentThread);
+
+    while (mShutdownRunnable) {
+      MOZ_ALWAYS_TRUE(NS_ProcessNextEvent(currentThread));
+    }
+  }
+}
+
+nsresult
+QuotaClient::GetDirectory(PersistenceType aPersistenceType,
+                          const nsACString& aOrigin, nsIFile** aDirectory)
+{
+  QuotaManager* quotaManager = QuotaManager::Get();
+  NS_ASSERTION(quotaManager, "This should never fail!");
+
+  nsCOMPtr<nsIFile> directory;
+  nsresult rv = quotaManager->GetDirectoryForOrigin(aPersistenceType, aOrigin,
+                                                    getter_AddRefs(directory));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  MOZ_ASSERT(directory);
+
+  rv = directory->Append(NS_LITERAL_STRING(IDB_DIRECTORY_NAME));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  directory.forget(aDirectory);
+  return NS_OK;
+}
+
+nsresult
+QuotaClient::GetUsageForDirectoryInternal(nsIFile* aDirectory,
+                                          UsageInfo* aUsageInfo,
+                                          bool aDatabaseFiles)
+{
+  AssertIsOnIOThread();
+  MOZ_ASSERT(aDirectory);
+  MOZ_ASSERT(aUsageInfo);
+
+  nsCOMPtr<nsISimpleEnumerator> entries;
+  nsresult rv = aDirectory->GetDirectoryEntries(getter_AddRefs(entries));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  if (!entries) {
+    return NS_OK;
+  }
+
+  const NS_ConvertASCIItoUTF16 journalSuffix(
+    kSQLiteJournalSuffix,
+    LiteralStringLength(kSQLiteJournalSuffix));
+  const NS_ConvertASCIItoUTF16 shmSuffix(kSQLiteSHMSuffix,
+                                         LiteralStringLength(kSQLiteSHMSuffix));
+
+  bool hasMore;
+  while (NS_SUCCEEDED((rv = entries->HasMoreElements(&hasMore))) &&
+         hasMore &&
+         !aUsageInfo->Canceled()) {
+    nsCOMPtr<nsISupports> entry;
+    rv = entries->GetNext(getter_AddRefs(entry));
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+
+    nsCOMPtr<nsIFile> file = do_QueryInterface(entry);
+    MOZ_ASSERT(file);
+
+    nsString leafName;
+    rv = file->GetLeafName(leafName);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+
+    // Journal files and sqlite-shm files don't count towards usage.
+    if (StringEndsWith(leafName, journalSuffix) ||
+        StringEndsWith(leafName, shmSuffix)) {
+      continue;
+    }
+
+    bool isDirectory;
+    rv = file->IsDirectory(&isDirectory);
+    if (rv == NS_ERROR_FILE_NOT_FOUND ||
+        rv == NS_ERROR_FILE_TARGET_DOES_NOT_EXIST) {
+      continue;
+    }
+
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+
+    if (isDirectory) {
+      if (aDatabaseFiles) {
+        rv = GetUsageForDirectoryInternal(file, aUsageInfo, false);
+        if (NS_WARN_IF(NS_FAILED(rv))) {
+          return rv;
+        }
+      } else {
+        nsString leafName;
+        rv = file->GetLeafName(leafName);
+        if (NS_WARN_IF(NS_FAILED(rv))) {
+          return rv;
+        }
+
+        if (!leafName.EqualsLiteral(JOURNAL_DIRECTORY_NAME)) {
+          NS_WARNING("Unknown directory found!");
+        }
+      }
+
+      continue;
+    }
+
+    int64_t fileSize;
+    rv = file->GetFileSize(&fileSize);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+
+    MOZ_ASSERT(fileSize >= 0);
+
+    if (aDatabaseFiles) {
+      aUsageInfo->AppendToDatabaseUsage(uint64_t(fileSize));
+    } else {
+      aUsageInfo->AppendToFileUsage(uint64_t(fileSize));
+    }
+  }
+
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  return NS_OK;
+}
+
+void
+QuotaClient::RemoveIdleObserver()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  if (mIdleObserverRegistered) {
+    nsCOMPtr<nsIIdleService> idleService =
+      do_GetService(kIdleServiceContractId);
+    MOZ_ASSERT(idleService);
+
+    MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
+      idleService->RemoveIdleObserver(this, kIdleObserverTimeSec)));
+
+    mIdleObserverRegistered = false;
+  }
+}
+
+void
+QuotaClient::StartIdleMaintenance()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(!mShutdownRequested);
+
+  if (!mMaintenanceThreadPool) {
+    nsRefPtr<nsThreadPool> threadPool = new nsThreadPool();
+
+    // PR_GetNumberOfProcessors() can return -1 on error, so make sure we
+    // don't set some huge number here. We add 2 in case some threads block on
+    // the disk I/O.
+    const uint32_t threadCount =
+      std::max(int32_t(PR_GetNumberOfProcessors()), int32_t(1)) +
+      2;
+
+    MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
+      threadPool->SetThreadLimit(threadCount)));
+
+    // Don't keep more than one idle thread.
+    MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
+      threadPool->SetIdleThreadLimit(1)));
+
+    // Don't keep idle threads alive very long.
+    MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
+      threadPool->SetIdleThreadTimeout(5 * PR_MSEC_PER_SEC)));
+
+    MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
+      threadPool->SetName(NS_LITERAL_CSTRING("IndexedDB Mnt"))));
+
+    mMaintenanceThreadPool = Move(threadPool);
+  }
+
+  mMaintenanceStartTime = PR_Now();
+  MOZ_ASSERT(mMaintenanceStartTime);
+
+  if (!mMaintenanceInfoHashtable) {
+    mMaintenanceInfoHashtable = MakeUnique<MaintenanceInfoHashtable>();
+  }
+
+  nsCOMPtr<nsIRunnable> runnable =
+    NS_NewRunnableMethodWithArg<uint32_t>(
+      this,
+      &QuotaClient::FindDatabasesForIdleMaintenance,
+      mMaintenanceRunId);
+  MOZ_ASSERT(runnable);
+
+  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
+    mMaintenanceThreadPool->Dispatch(runnable, NS_DISPATCH_NORMAL)));
+}
+
+void
+QuotaClient::StopIdleMaintenance()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(!mShutdownRequested);
+
+  RemoveIdleObserver();
+
+  mMaintenanceRunId++;
+}
+
+void
+QuotaClient::FindDatabasesForIdleMaintenance(uint32_t aRunId)
+{
+  MOZ_ASSERT(!NS_IsMainThread());
+  MOZ_ASSERT(!IsOnBackgroundThread());
+  MOZ_ASSERT(mMaintenanceThreadPool);
+
+  // The storage directory is structured like this:
+  //
+  //   <profile>/storage/<persistence>/<origin>/idb/*.sqlite
+  //
+  // We have to find all database files that match any persistence type and any
+  // origin. We ignore anything out of the ordinary for now.
+
+  if (IdleMaintenanceMustEnd(aRunId)) {
+    return;
+  }
+
+  QuotaManager* quotaManager = QuotaManager::Get();
+  MOZ_ASSERT(quotaManager);
+
+  nsCOMPtr<nsIFile> storageDir = GetFileForPath(quotaManager->GetStoragePath());
+  MOZ_ASSERT(storageDir);
+
+  bool exists;
+  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(storageDir->Exists(&exists)));
+  if (!exists) {
+    return;
+  }
+
+  bool isDirectory;
+  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(storageDir->IsDirectory(&isDirectory)));
+  if (NS_WARN_IF(!isDirectory)) {
+    return;
+  }
+
+  // There are currently only 3 persistence types, and we want to iterate them
+  // in this order:
+  static const PersistenceType kPersistenceTypes[] = {
+    PERSISTENCE_TYPE_PERSISTENT,
+    PERSISTENCE_TYPE_DEFAULT,
+    PERSISTENCE_TYPE_TEMPORARY
+  };
+
+  static_assert((sizeof(kPersistenceTypes) / sizeof(kPersistenceTypes[0])) ==
+                  size_t(PERSISTENCE_TYPE_INVALID),
+                "Something changed with available persistence types!");
+
+  NS_NAMED_LITERAL_STRING(idbDirName, IDB_DIRECTORY_NAME);
+  NS_NAMED_LITERAL_STRING(sqliteExtension, ".sqlite");
+
+  for (const PersistenceType persistenceType : kPersistenceTypes) {
+    // Loop over "<persistence>" directories.
+    if (IdleMaintenanceMustEnd(aRunId)) {
+      return;
+    }
+
+    nsAutoCString persistenceTypeString;
+    if (persistenceType == PERSISTENCE_TYPE_PERSISTENT) {
+      // XXX This shouldn't be a special case...
+      persistenceTypeString.AssignLiteral("permanent");
+    } else {
+      PersistenceTypeToText(persistenceType, persistenceTypeString);
+    }
+
+    nsCOMPtr<nsIFile> persistenceDir;
+    MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
+      storageDir->Clone(getter_AddRefs(persistenceDir))));
+    MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
+      persistenceDir->Append(NS_ConvertASCIItoUTF16(persistenceTypeString))));
+
+    MOZ_ALWAYS_TRUE(NS_SUCCEEDED(persistenceDir->Exists(&exists)));
+    if (!exists) {
+      continue;
+    }
+
+    MOZ_ALWAYS_TRUE(NS_SUCCEEDED(persistenceDir->IsDirectory(&isDirectory)));
+    if (NS_WARN_IF(!isDirectory)) {
+      continue;
+    }
+
+    nsCOMPtr<nsISimpleEnumerator> persistenceDirEntries;
+    MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
+      persistenceDir->GetDirectoryEntries(
+        getter_AddRefs(persistenceDirEntries))));
+    if (!persistenceDirEntries) {
+      continue;
+    }
+
+    while (true) {
+      // Loop over "<origin>/idb" directories.
+      if (IdleMaintenanceMustEnd(aRunId)) {
+        return;
+      }
+
+      bool persistenceDirHasMoreEntries;
+      MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
+        persistenceDirEntries->HasMoreElements(&persistenceDirHasMoreEntries)));
+
+      if (!persistenceDirHasMoreEntries) {
+        break;
+      }
+
+      nsCOMPtr<nsISupports> persistenceDirEntry;
+      MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
+        persistenceDirEntries->GetNext(getter_AddRefs(persistenceDirEntry))));
+
+      nsCOMPtr<nsIFile> originDir = do_QueryInterface(persistenceDirEntry);
+      MOZ_ASSERT(originDir);
+
+      MOZ_ASSERT(NS_SUCCEEDED(originDir->Exists(&exists)));
+      MOZ_ASSERT(exists);
+
+      MOZ_ALWAYS_TRUE(NS_SUCCEEDED(originDir->IsDirectory(&isDirectory)));
+      if (!isDirectory) {
+        continue;
+      }
+
+      nsCOMPtr<nsIFile> idbDir;
+      MOZ_ALWAYS_TRUE(NS_SUCCEEDED(originDir->Clone(getter_AddRefs(idbDir))));
+
+      MOZ_ALWAYS_TRUE(NS_SUCCEEDED(idbDir->Append(idbDirName)));
+
+      MOZ_ALWAYS_TRUE(NS_SUCCEEDED(idbDir->Exists(&exists)));
+      if (!exists) {
+        continue;
+      }
+
+      MOZ_ALWAYS_TRUE(NS_SUCCEEDED(idbDir->IsDirectory(&isDirectory)));
+      if (NS_WARN_IF(!isDirectory)) {
+        continue;
+      }
+
+      nsCOMPtr<nsISimpleEnumerator> idbDirEntries;
+      MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
+        idbDir->GetDirectoryEntries(getter_AddRefs(idbDirEntries))));
+      if (!idbDirEntries) {
+        continue;
+      }
+
+      nsCString group;
+      nsCString origin;
+      nsTArray<nsString> databasePaths;
+
+      while (true) {
+        // Loop over files in the "idb" directory.
+        if (IdleMaintenanceMustEnd(aRunId)) {
+          return;
+        }
+
+        bool idbDirHasMoreEntries;
+        MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
+          idbDirEntries->HasMoreElements(&idbDirHasMoreEntries)));
+
+        if (!idbDirHasMoreEntries) {
+          break;
+        }
+
+        nsCOMPtr<nsISupports> idbDirEntry;
+        MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
+          idbDirEntries->GetNext(getter_AddRefs(idbDirEntry))));
+
+        nsCOMPtr<nsIFile> idbDirFile = do_QueryInterface(idbDirEntry);
+        MOZ_ASSERT(idbDirFile);
+
+        nsString idbFilePath;
+        MOZ_ALWAYS_TRUE(NS_SUCCEEDED(idbDirFile->GetPath(idbFilePath)));
+
+        if (!StringEndsWith(idbFilePath, sqliteExtension)) {
+          continue;
+        }
+
+        MOZ_ASSERT(NS_SUCCEEDED(idbDirFile->Exists(&exists)));
+        MOZ_ASSERT(exists);
+
+        MOZ_ALWAYS_TRUE(NS_SUCCEEDED(idbDirFile->IsDirectory(&isDirectory)));
+        if (isDirectory) {
+          continue;
+        }
+
+        // Found a database.
+        if (databasePaths.IsEmpty()) {
+          MOZ_ASSERT(group.IsEmpty());
+          MOZ_ASSERT(origin.IsEmpty());
+
+          int64_t dummyTimeStamp;
+          bool dummyIsApp;
+          if (NS_WARN_IF(NS_FAILED(
+                QuotaManager::GetDirectoryMetadata(originDir,
+                                                   &dummyTimeStamp,
+                                                   group,
+                                                   origin,
+                                                   &dummyIsApp)))) {
+            // Not much we can do here...
+            continue;
+          }
+        }
+
+        MOZ_ASSERT(!databasePaths.Contains(idbFilePath));
+
+        databasePaths.AppendElement(idbFilePath);
+      }
+
+      if (!databasePaths.IsEmpty()) {
+        nsCOMPtr<nsIRunnable> runnable =
+          NS_NewRunnableMethodWithArgs<uint32_t, MultipleMaintenanceInfo&&>(
+            this,
+            &QuotaClient::BlockQuotaManagerForIdleMaintenance,
+            aRunId,
+            MultipleMaintenanceInfo(group,
+                                    origin,
+                                    persistenceType,
+                                    Move(databasePaths)));
+        MOZ_ASSERT(runnable);
+
+        MOZ_ALWAYS_TRUE(NS_SUCCEEDED(NS_DispatchToMainThread(runnable)));
+      }
+    }
+  }
+}
+
+void
+QuotaClient::BlockQuotaManagerForIdleMaintenance(
+                                     uint32_t aRunId,
+                                     MultipleMaintenanceInfo&& aMaintenanceInfo)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  if (IdleMaintenanceMustEnd(aRunId)) {
+    return;
+  }
+
+  MOZ_ASSERT(mMaintenanceInfoHashtable);
+
+  nsAutoCString key;
+  key.AppendInt(aMaintenanceInfo.mPersistenceType);
+  key.Append('*');
+  key.Append(aMaintenanceInfo.mOrigin);
+
+  MOZ_ASSERT(!mMaintenanceInfoHashtable->Get(key));
+
+  nsCOMPtr<nsIRunnable> runnable =
+    NS_NewRunnableMethodWithArgs<uint32_t, const nsCString>(
+      this,
+      &QuotaClient::ScheduleIdleMaintenance,
+      aRunId,
+      key);
+  MOZ_ASSERT(runnable);
+
+  QuotaManager* quotaManager = QuotaManager::Get();
+  MOZ_ASSERT(quotaManager);
+
+  OriginOrPatternString oops =
+    OriginOrPatternString::FromOrigin(aMaintenanceInfo.mOrigin);
+
+  Nullable<PersistenceType> npt(aMaintenanceInfo.mPersistenceType);
+
+  nsresult rv =
+    quotaManager->WaitForOpenAllowed(oops, npt, EmptyCString(), runnable);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return;
+  }
+
+  mMaintenanceInfoHashtable->Put(
+    key,
+    new MultipleMaintenanceInfo(Move(aMaintenanceInfo)));
+}
+
+void
+QuotaClient::ScheduleIdleMaintenance(uint32_t aRunId, const nsACString& aKey)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(!aKey.IsEmpty());
+
+  MultipleMaintenanceInfo* maintenanceInfo;
+  MOZ_ALWAYS_TRUE(mMaintenanceInfoHashtable->Get(aKey, &maintenanceInfo));
+  MOZ_ASSERT(maintenanceInfo);
+
+  if (IdleMaintenanceMustEnd(aRunId)) {
+    // We got canceled, unblock the QuotaManager.
+#ifdef DEBUG
+    maintenanceInfo->mDatabasePaths.Clear();
+#endif
+
+    UnblockQuotaManagerForIdleMaintenance(*maintenanceInfo);
+
+    mMaintenanceInfoHashtable->Remove(aKey);
+    return;
+  }
+
+  MOZ_ASSERT(mMaintenanceThreadPool);
+
+  for (const nsString& databasePath : maintenanceInfo->mDatabasePaths) {
+    nsCOMPtr<nsIRunnable> runnable =
+      NS_NewRunnableMethodWithArgs<uint32_t,
+                                   nsCString,
+                                   SingleMaintenanceInfo&&>(
+        this,
+        &QuotaClient::PerformIdleMaintenanceOnDatabase,
+        aRunId,
+        aKey,
+        SingleMaintenanceInfo(maintenanceInfo->mGroup,
+                              maintenanceInfo->mOrigin,
+                              maintenanceInfo->mPersistenceType,
+                              databasePath));
+    MOZ_ASSERT(runnable);
+
+    MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
+      mMaintenanceThreadPool->Dispatch(runnable, NS_DISPATCH_NORMAL)));
+  }
+}
+
+void
+QuotaClient::PerformIdleMaintenanceOnDatabase(
+                                       uint32_t aRunId,
+                                       const nsACString& aKey,
+                                       SingleMaintenanceInfo&& aMaintenanceInfo)
+{
+  MOZ_ASSERT(!NS_IsMainThread());
+  MOZ_ASSERT(!IsOnBackgroundThread());
+  MOZ_ASSERT(mMaintenanceThreadPool);
+  MOZ_ASSERT(mMaintenanceStartTime);
+  MOZ_ASSERT(!aMaintenanceInfo.mDatabasePath.IsEmpty());
+  MOZ_ASSERT(!aMaintenanceInfo.mGroup.IsEmpty());
+  MOZ_ASSERT(!aMaintenanceInfo.mOrigin.IsEmpty());
+
+  PerformIdleMaintenanceOnDatabaseInternal(aRunId, aMaintenanceInfo);
+
+  nsCOMPtr<nsIRunnable> runnable =
+    NS_NewRunnableMethodWithArgs<nsCString, nsString>(
+      this,
+      &QuotaClient::MaybeUnblockQuotaManagerForIdleMaintenance,
+      aKey,
+      aMaintenanceInfo.mDatabasePath);
+  MOZ_ASSERT(runnable);
+
+  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(NS_DispatchToMainThread(runnable)));
+}
+
+void
+QuotaClient::PerformIdleMaintenanceOnDatabaseInternal(
+                                  uint32_t aRunId,
+                                  const SingleMaintenanceInfo& aMaintenanceInfo)
+{
+  MOZ_ASSERT(!NS_IsMainThread());
+  MOZ_ASSERT(!IsOnBackgroundThread());
+  MOZ_ASSERT(mMaintenanceThreadPool);
+  MOZ_ASSERT(mMaintenanceStartTime);
+  MOZ_ASSERT(!aMaintenanceInfo.mDatabasePath.IsEmpty());
+  MOZ_ASSERT(!aMaintenanceInfo.mGroup.IsEmpty());
+  MOZ_ASSERT(!aMaintenanceInfo.mOrigin.IsEmpty());
+
+  nsCOMPtr<nsIFile> databaseFile =
+    GetFileForPath(aMaintenanceInfo.mDatabasePath);
+  MOZ_ASSERT(databaseFile);
+
+  nsCOMPtr<mozIStorageConnection> connection;
+  nsresult rv = GetStorageConnection(databaseFile,
+                                     aMaintenanceInfo.mPersistenceType,
+                                     aMaintenanceInfo.mGroup,
+                                     aMaintenanceInfo.mOrigin,
+                                     TelemetryIdForFile(databaseFile),
+                                     getter_AddRefs(connection));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return;
+  }
+
+  if (IdleMaintenanceMustEnd(aRunId)) {
+    return;
+  }
+
+  AutoProgressHandler progressHandler(this, aRunId);
+  if (NS_WARN_IF(NS_FAILED(progressHandler.Register(connection)))) {
+    return;
+  }
+
+  bool databaseIsOk;
+  rv = CheckIntegrity(connection, &databaseIsOk);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return;
+  }
+
+  if (NS_WARN_IF(!databaseIsOk)) {
+    // XXX Handle this somehow! Probably need to clear all storage for the
+    //     origin. Needs followup.
+    MOZ_ASSERT(false, "Database corruption detected!");
+    return;
+  }
+
+  if (IdleMaintenanceMustEnd(aRunId)) {
+    return;
+  }
+
+  MaintenanceAction maintenanceAction;
+  rv = DetermineMaintenanceAction(connection, databaseFile, &maintenanceAction);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return;
+  }
+
+  if (IdleMaintenanceMustEnd(aRunId)) {
+    return;
+  }
+
+  switch (maintenanceAction) {
+    case MaintenanceAction_Nothing:
+      break;
+
+    case MaintenanceAction_IncrementalVacuum:
+      IncrementalVacuum(connection);
+      break;
+
+    case MaintenanceAction_FullVacuum:
+      FullVacuum(connection, databaseFile);
+      break;
+
+    default:
+      MOZ_CRASH("Unknown MaintenanceAction!");
+  }
+}
+
+nsresult
+QuotaClient::CheckIntegrity(mozIStorageConnection* aConnection, bool* aOk)
+{
+  MOZ_ASSERT(!NS_IsMainThread());
+  MOZ_ASSERT(!IsOnBackgroundThread());
+  MOZ_ASSERT(aConnection);
+  MOZ_ASSERT(aOk);
+
+  nsresult rv;
+
+  // First do a full integrity_check. Scope statements tightly here because
+  // later operations require zero live statements.
+  {
+    nsCOMPtr<mozIStorageStatement> stmt;
+    rv = aConnection->CreateStatement(NS_LITERAL_CSTRING(
+      "PRAGMA integrity_check(1);"
+    ), getter_AddRefs(stmt));
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+
+    bool hasResult;
+    rv = stmt->ExecuteStep(&hasResult);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+
+    MOZ_ASSERT(hasResult);
+
+    nsString result;
+    rv = stmt->GetString(0, result);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+
+    if (NS_WARN_IF(!result.EqualsLiteral("ok"))) {
+      *aOk = false;
+      return NS_OK;
+    }
+  }
+
+  // Now enable and check for foreign key constraints.
+  {
+    int32_t foreignKeysWereEnabled;
+    {
+      nsCOMPtr<mozIStorageStatement> stmt;
+      rv = aConnection->CreateStatement(NS_LITERAL_CSTRING(
+        "PRAGMA foreign_keys;"
+      ), getter_AddRefs(stmt));
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return rv;
+      }
+
+      bool hasResult;
+      rv = stmt->ExecuteStep(&hasResult);
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return rv;
+      }
+
+      MOZ_ASSERT(hasResult);
+
+      rv = stmt->GetInt32(0, &foreignKeysWereEnabled);
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return rv;
+      }
+    }
+
+    bool changedForeignKeys;
+    if (foreignKeysWereEnabled) {
+      changedForeignKeys = false;
+    } else {
+      rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+        "PRAGMA foreign_keys = ON;"
+      ));
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return rv;
+      }
+
+      changedForeignKeys = true;
+    }
+
+    bool foreignKeyError;
+    {
+      nsCOMPtr<mozIStorageStatement> stmt;
+      rv = aConnection->CreateStatement(NS_LITERAL_CSTRING(
+        "PRAGMA foreign_key_check;"
+      ), getter_AddRefs(stmt));
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return rv;
+      }
+
+      rv = stmt->ExecuteStep(&foreignKeyError);
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return rv;
+      }
+    }
+
+    if (changedForeignKeys) {
+      nsAutoCString stmtSQL;
+      stmtSQL.AssignLiteral("PRAGMA foreign_keys = ");
+      if (foreignKeysWereEnabled) {
+        stmtSQL.AppendLiteral("ON");
+      } else {
+        stmtSQL.AppendLiteral("OFF");
+      }
+      stmtSQL.Append(';');
+
+      rv = aConnection->ExecuteSimpleSQL(stmtSQL);
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return rv;
+      }
+    }
+
+    if (foreignKeyError) {
+      *aOk = false;
+      return NS_OK;
+    }
+  }
+
+  *aOk = true;
+  return NS_OK;
+}
+
+nsresult
+QuotaClient::DetermineMaintenanceAction(mozIStorageConnection* aConnection,
+                                        nsIFile* aDatabaseFile,
+                                        MaintenanceAction* aMaintenanceAction)
+{
+  MOZ_ASSERT(!NS_IsMainThread());
+  MOZ_ASSERT(!IsOnBackgroundThread());
+  MOZ_ASSERT(aConnection);
+  MOZ_ASSERT(aDatabaseFile);
+  MOZ_ASSERT(aMaintenanceAction);
+
+  int32_t schemaVersion;
+  nsresult rv = aConnection->GetSchemaVersion(&schemaVersion);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  // Don't do anything if the schema version is less than 18; before that
+  // version no databases had |auto_vacuum == INCREMENTAL| set and we didn't
+  // track the values needed for the heuristics below.
+  if (schemaVersion < MakeSchemaVersion(18, 0)) {
+    *aMaintenanceAction = MaintenanceAction_Nothing;
+    return NS_OK;
+  }
+
+  bool lowDiskSpace = IndexedDatabaseManager::InLowDiskSpaceMode();
+
+  if (kRunningXPCShellTests) {
+    // If we're running XPCShell then we want to test both the low disk space
+    // and normal disk space code paths so pick semi-randomly based on the
+    // current time.
+    lowDiskSpace = ((PR_Now() / PR_USEC_PER_MSEC) % 2) == 0;
+  }
+
+  // If we're low on disk space then the best we can hope for is that an
+  // incremental vacuum might free some space. That is a journaled operation so
+  // it may not be possible even then.
+  if (lowDiskSpace) {
+    *aMaintenanceAction = MaintenanceAction_IncrementalVacuum;
+    return NS_OK;
+  }
+
+  // This method shouldn't make any permanent changes to the database, so make
+  // sure everything gets rolled back when we leave.
+  mozStorageTransaction transaction(aConnection,
+                                    /* aCommitOnComplete */ false);
+
+  // Check to see when we last vacuumed this database.
+  nsCOMPtr<mozIStorageStatement> stmt;
+  rv = aConnection->CreateStatement(NS_LITERAL_CSTRING(
+    "SELECT last_vacuum_time, last_vacuum_size "
+      "FROM database;"
+  ), getter_AddRefs(stmt));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  bool hasResult;
+  rv = stmt->ExecuteStep(&hasResult);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  MOZ_ASSERT(hasResult);
+
+  PRTime lastVacuumTime;
+  rv = stmt->GetInt64(0, &lastVacuumTime);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  int64_t lastVacuumSize;
+  rv = stmt->GetInt64(1, &lastVacuumSize);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  MOZ_ASSERT(lastVacuumSize > 0);
+
+  // This shouldn't really be possible...
+  if (NS_WARN_IF(mMaintenanceStartTime <= lastVacuumTime)) {
+    *aMaintenanceAction = MaintenanceAction_Nothing;
+    return NS_OK;
+  }
+
+  if (mMaintenanceStartTime - lastVacuumTime < kMinVacuumAge) {
+    *aMaintenanceAction = MaintenanceAction_IncrementalVacuum;
+    return NS_OK;
+  }
+
+  // It has been more than a week since the database was vacuumed, so gather
+  // statistics on its usage to see if vacuuming is worthwhile.
+  rv = aConnection->EnableModule(NS_LITERAL_CSTRING("dbstat"));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  // Create a temporary copy of the dbstat table to speed up the queries that
+  // come later.
+  rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+    "CREATE VIRTUAL TABLE __stats__ USING dbstat;"
+    "CREATE TEMP TABLE __temp_stats__ AS SELECT * FROM __stats__;"
+  ));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  // Calculate the percentage of the database pages that are not in contiguous
+  // order.
+  rv = aConnection->CreateStatement(NS_LITERAL_CSTRING(
+    "SELECT SUM(__ts1__.pageno != __ts2__.pageno + 1) * 100.0 / COUNT(*) "
+      "FROM __temp_stats__ AS __ts1__, __temp_stats__ AS __ts2__ "
+      "WHERE __ts1__.name = __ts2__.name "
+      "AND __ts1__.rowid = __ts2__.rowid + 1;"
+  ), getter_AddRefs(stmt));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  rv = stmt->ExecuteStep(&hasResult);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  MOZ_ASSERT(hasResult);
+
+  int32_t percentUnordered;
+  rv = stmt->GetInt32(0, &percentUnordered);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  MOZ_ASSERT(percentUnordered >= 0);
+  MOZ_ASSERT(percentUnordered <= 100);
+
+  if (percentUnordered >= kPercentUnorderedThreshold) {
+    *aMaintenanceAction = MaintenanceAction_FullVacuum;
+    return NS_OK;
+  }
+
+  // Don't try a full vacuum if the file hasn't grown by 10%.
+  int64_t currentFileSize;
+  rv = aDatabaseFile->GetFileSize(&currentFileSize);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  if (currentFileSize <= lastVacuumSize ||
+      (((currentFileSize - lastVacuumSize) * 100 / currentFileSize) <
+         kPercentFileSizeGrowthThreshold)) {
+    *aMaintenanceAction = MaintenanceAction_IncrementalVacuum;
+    return NS_OK;
+  }
+
+  // See if there are any free pages that we can reclaim.
+  rv = aConnection->CreateStatement(NS_LITERAL_CSTRING(
+    "PRAGMA freelist_count;"
+  ), getter_AddRefs(stmt));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  rv = stmt->ExecuteStep(&hasResult);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  MOZ_ASSERT(hasResult);
+
+  int32_t freelistCount;
+  rv = stmt->GetInt32(0, &freelistCount);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
   }
 
-  MOZ_ASSERT(backgroundThread);
+  MOZ_ASSERT(freelistCount >= 0);
 
-  nsCOMPtr<nsIRunnable> runnable =
-    new WaitForTransactionsRunnable(this, databaseIds, aCallback);
-  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
-    backgroundThread->Dispatch(runnable, NS_DISPATCH_NORMAL)));
-}
+  // If we have too many free pages then we should try an incremental vacuum. If
+  // that causes too much fragmentation then we'll try a full vacuum later.
+  if (freelistCount > kMaxFreelistThreshold) {
+    *aMaintenanceAction = MaintenanceAction_IncrementalVacuum;
+    return NS_OK;
+  }
 
-void
-QuotaClient::ShutdownWorkThreads()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(!mShutdownRunnable);
-  MOZ_ASSERT(!mShutdownRequested);
+  // Calculate the percentage of unused bytes on pages in the database.
+  rv = aConnection->CreateStatement(NS_LITERAL_CSTRING(
+    "SELECT SUM(unused) * 100.0 / SUM(pgsize) "
+      "FROM __temp_stats__;"
+  ), getter_AddRefs(stmt));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
 
-  mShutdownRequested = true;
+  rv = stmt->ExecuteStep(&hasResult);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
 
-  if (mBackgroundThread) {
-    nsRefPtr<ShutdownWorkThreadsRunnable> runnable =
-      new ShutdownWorkThreadsRunnable(this);
+  MOZ_ASSERT(hasResult);
 
-    if (NS_FAILED(mBackgroundThread->Dispatch(runnable, NS_DISPATCH_NORMAL))) {
-      // This can happen if the thread has shut down already.
-      return;
-    }
+  int32_t percentUnused;
+  rv = stmt->GetInt32(0, &percentUnused);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
 
-    nsIThread* currentThread = NS_GetCurrentThread();
-    MOZ_ASSERT(currentThread);
+  MOZ_ASSERT(percentUnused >= 0);
+  MOZ_ASSERT(percentUnused <= 100);
 
-    mShutdownRunnable.swap(runnable);
+  *aMaintenanceAction = percentUnused >= kPercentUnusedThreshold ?
+                        MaintenanceAction_FullVacuum :
+                        MaintenanceAction_IncrementalVacuum;
+  return NS_OK;
+}
 
-    while (mShutdownRunnable) {
-      MOZ_ALWAYS_TRUE(NS_ProcessNextEvent(currentThread));
-    }
-  }
+void
+QuotaClient::IncrementalVacuum(mozIStorageConnection* aConnection)
+{
+  MOZ_ASSERT(!NS_IsMainThread());
+  MOZ_ASSERT(!IsOnBackgroundThread());
+  MOZ_ASSERT(aConnection);
 
-  FileService::Shutdown();
+  nsresult rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+    "PRAGMA incremental_vacuum;"
+  ));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return;
+  }
 }
 
-nsresult
-QuotaClient::GetDirectory(PersistenceType aPersistenceType,
-                          const nsACString& aOrigin, nsIFile** aDirectory)
+void
+QuotaClient::FullVacuum(mozIStorageConnection* aConnection,
+                        nsIFile* aDatabaseFile)
 {
-  QuotaManager* quotaManager = QuotaManager::Get();
-  NS_ASSERTION(quotaManager, "This should never fail!");
+  MOZ_ASSERT(!NS_IsMainThread());
+  MOZ_ASSERT(!IsOnBackgroundThread());
+  MOZ_ASSERT(aConnection);
+  MOZ_ASSERT(aDatabaseFile);
 
-  nsCOMPtr<nsIFile> directory;
-  nsresult rv = quotaManager->GetDirectoryForOrigin(aPersistenceType, aOrigin,
-                                                    getter_AddRefs(directory));
+  nsresult rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+    "VACUUM;"
+  ));
   if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
+    return;
   }
 
-  MOZ_ASSERT(directory);
+  PRTime vacuumTime = PR_Now();
+  MOZ_ASSERT(vacuumTime > 0);
 
-  rv = directory->Append(NS_LITERAL_STRING(IDB_DIRECTORY_NAME));
+  int64_t fileSize;
+  rv = aDatabaseFile->GetFileSize(&fileSize);
   if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
+    return;
   }
 
-  directory.forget(aDirectory);
-  return NS_OK;
-}
+  MOZ_ASSERT(fileSize > 0);
 
-nsresult
-QuotaClient::GetUsageForDirectoryInternal(nsIFile* aDirectory,
-                                          UsageInfo* aUsageInfo,
-                                          bool aDatabaseFiles)
-{
-  AssertIsOnIOThread();
-  MOZ_ASSERT(aDirectory);
-  MOZ_ASSERT(aUsageInfo);
+  nsCOMPtr<mozIStorageStatement> stmt;
+  rv = aConnection->CreateStatement(NS_LITERAL_CSTRING(
+    "UPDATE database "
+      "SET last_vacuum_time = :time"
+        ", last_vacuum_size = :size;"
+  ), getter_AddRefs(stmt));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return;
+  }
 
-  nsCOMPtr<nsISimpleEnumerator> entries;
-  nsresult rv = aDirectory->GetDirectoryEntries(getter_AddRefs(entries));
+  rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("time"), vacuumTime);
   if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
+    return;
   }
 
-  if (!entries) {
-    return NS_OK;
+  rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("size"), fileSize);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return;
   }
 
-  const NS_ConvertASCIItoUTF16 shmSuffix(kSQLiteSHMSuffix,
-                                         LiteralStringLength(kSQLiteSHMSuffix));
+  rv = stmt->Execute();
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return;
+  }
+}
 
-  bool hasMore;
-  while (NS_SUCCEEDED((rv = entries->HasMoreElements(&hasMore))) &&
-         hasMore &&
-         !aUsageInfo->Canceled()) {
-    nsCOMPtr<nsISupports> entry;
-    rv = entries->GetNext(getter_AddRefs(entry));
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
+void
+QuotaClient::MaybeUnblockQuotaManagerForIdleMaintenance(
+                                                 const nsACString& aKey,
+                                                 const nsAString& aDatabasePath)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(!aKey.IsEmpty());
+  MOZ_ASSERT(!aDatabasePath.IsEmpty());
+  MOZ_ASSERT(mMaintenanceInfoHashtable);
 
-    nsCOMPtr<nsIFile> file = do_QueryInterface(entry);
-    MOZ_ASSERT(file);
+  MultipleMaintenanceInfo* maintenanceInfo;
+  MOZ_ALWAYS_TRUE(mMaintenanceInfoHashtable->Get(aKey, &maintenanceInfo));
+  MOZ_ASSERT(maintenanceInfo);
 
-    nsString leafName;
-    rv = file->GetLeafName(leafName);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
+  MOZ_ALWAYS_TRUE(maintenanceInfo->mDatabasePaths.RemoveElement(aDatabasePath));
 
-    if (StringEndsWith(leafName, shmSuffix)) {
-      continue;
-    }
+  if (maintenanceInfo->mDatabasePaths.IsEmpty()) {
+    UnblockQuotaManagerForIdleMaintenance(*maintenanceInfo);
 
-    bool isDirectory;
-    rv = file->IsDirectory(&isDirectory);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
+    // This will delete |maintenanceInfo|.
+    mMaintenanceInfoHashtable->Remove(aKey);
+  }
+}
 
-    if (isDirectory) {
-      if (aDatabaseFiles) {
-        rv = GetUsageForDirectoryInternal(file, aUsageInfo, false);
-        if (NS_WARN_IF(NS_FAILED(rv))) {
-          return rv;
-        }
-      } else {
-        nsString leafName;
-        rv = file->GetLeafName(leafName);
-        if (NS_WARN_IF(NS_FAILED(rv))) {
-          return rv;
-        }
+void
+QuotaClient::UnblockQuotaManagerForIdleMaintenance(
+                                const MultipleMaintenanceInfo& aMaintenanceInfo)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(!aMaintenanceInfo.mOrigin.IsEmpty());
+  MOZ_ASSERT(aMaintenanceInfo.mDatabasePaths.IsEmpty());
 
-        if (!leafName.EqualsLiteral(kJournalDirectoryName)) {
-          NS_WARNING("Unknown directory found!");
-        }
-      }
+  QuotaManager* quotaManager = QuotaManager::Get();
+  MOZ_ASSERT(quotaManager);
 
-      continue;
-    }
+  OriginOrPatternString oops =
+    OriginOrPatternString::FromOrigin(aMaintenanceInfo.mOrigin);
 
-    int64_t fileSize;
-    rv = file->GetFileSize(&fileSize);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
+  Nullable<PersistenceType> npt(aMaintenanceInfo.mPersistenceType);
 
-    MOZ_ASSERT(fileSize >= 0);
+  quotaManager->AllowNextSynchronizedOp(oops, npt, EmptyCString());
+}
 
-    if (aDatabaseFiles) {
-      aUsageInfo->AppendToDatabaseUsage(uint64_t(fileSize));
-    } else {
-      aUsageInfo->AppendToFileUsage(uint64_t(fileSize));
-    }
+NS_IMETHODIMP
+QuotaClient::Observe(nsISupports* aSubject,
+                     const char* aTopic,
+                     const char16_t* aData)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  if (!strcmp(aTopic, OBSERVER_TOPIC_IDLE)) {
+    StartIdleMaintenance();
+    return NS_OK;
   }
 
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
+  if (!strcmp(aTopic, OBSERVER_TOPIC_ACTIVE)) {
+    StopIdleMaintenance();
+    return NS_OK;
   }
 
+  MOZ_ASSERT_UNREACHABLE("Should never get here!");
   return NS_OK;
 }
 
-
 void
 QuotaClient::
 WaitForTransactionsRunnable::MaybeWaitForTransactions()
@@ -15417,6 +17195,84 @@
   return NS_OK;
 }
 
+nsresult
+QuotaClient::
+AutoProgressHandler::Register(mozIStorageConnection* aConnection)
+{
+  MOZ_ASSERT(!NS_IsMainThread());
+  MOZ_ASSERT(!IsOnBackgroundThread());
+  MOZ_ASSERT(aConnection);
+
+  // We want to quickly bail out of any operation if the user becomes active, so
+  // use a small granularity here since database performance isn't critical.
+  static const int32_t kProgressGranularity = 50;
+
+  nsCOMPtr<mozIStorageProgressHandler> oldHandler;
+  nsresult rv = aConnection->SetProgressHandler(kProgressGranularity,
+                                                this,
+                                                getter_AddRefs(oldHandler));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  MOZ_ASSERT(!oldHandler);
+  mConnection = aConnection;
+
+  return NS_OK;
+}
+
+void
+QuotaClient::
+AutoProgressHandler::Unregister()
+{
+  MOZ_ASSERT(!NS_IsMainThread());
+  MOZ_ASSERT(!IsOnBackgroundThread());
+  MOZ_ASSERT(mConnection);
+
+  nsCOMPtr<mozIStorageProgressHandler> oldHandler;
+  nsresult rv = mConnection->RemoveProgressHandler(getter_AddRefs(oldHandler));
+  unused << NS_WARN_IF(NS_FAILED(rv));
+
+  MOZ_ASSERT_IF(NS_SUCCEEDED(rv), oldHandler == this);
+}
+
+NS_IMETHODIMP_(MozExternalRefCountType)
+QuotaClient::
+AutoProgressHandler::AddRef()
+{
+  NS_ASSERT_OWNINGTHREAD(QuotaClient::AutoProgressHandler);
+
+  mDEBUGRefCnt++;
+  return 2;
+}
+
+NS_IMETHODIMP_(MozExternalRefCountType)
+QuotaClient::
+AutoProgressHandler::Release()
+{
+  NS_ASSERT_OWNINGTHREAD(QuotaClient::AutoProgressHandler);
+
+  mDEBUGRefCnt--;
+  return 1;
+}
+
+NS_IMPL_QUERY_INTERFACE(QuotaClient::AutoProgressHandler,
+                        mozIStorageProgressHandler)
+
+NS_IMETHODIMP
+QuotaClient::
+AutoProgressHandler::OnProgress(mozIStorageConnection* aConnection,
+                                bool* _retval)
+{
+  NS_ASSERT_OWNINGTHREAD(QuotaClient::AutoProgressHandler);
+  MOZ_ASSERT(aConnection);
+  MOZ_ASSERT(mConnection == aConnection);
+  MOZ_ASSERT(_retval);
+
+  *_retval = mQuotaClient->IdleMaintenanceMustEnd(mRunId);
+  return NS_OK;
+}
+
 NS_IMPL_ISUPPORTS_INHERITED0(QuotaClient::ShutdownWorkThreadsRunnable,
                              nsRunnable)
 
@@ -15797,7 +17653,7 @@
   }
 
   AutoFallibleTArray<uint8_t, 512> uncompressed;
-  if (NS_WARN_IF(!uncompressed.SetLength(uncompressedLength))) {
+  if (NS_WARN_IF(!uncompressed.SetLength(uncompressedLength, fallible))) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
@@ -15984,7 +17840,7 @@
     return NS_OK;
   }
 
-  if (NS_WARN_IF(!aIndexValues.SetCapacity(count))) {
+  if (NS_WARN_IF(!aIndexValues.SetCapacity(count, fallible))) {
     IDB_REPORT_INTERNAL_ERR();
     return NS_ERROR_OUT_OF_MEMORY;
   }
@@ -16044,19 +17900,19 @@
     if (stmt) {
       stmt.Reset();
     } else if (info.mUnique) {
-      rv = aConnection->GetCachedStatement(
+      rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
         "INSERT INTO unique_index_data "
           "(index_id, value, object_store_id, object_data_key) "
-          "VALUES (:index_id, :value, :object_store_id, :object_data_key);",
+          "VALUES (:index_id, :value, :object_store_id, :object_data_key);"),
         &stmt);
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
       }
     } else {
-      rv = aConnection->GetCachedStatement(
+      rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
         "INSERT OR IGNORE INTO index_data "
           "(index_id, value, object_data_key, object_store_id) "
-          "VALUES (:index_id, :value, :object_data_key, :object_store_id);",
+          "VALUES (:index_id, :value, :object_data_key, :object_store_id);"),
         &stmt);
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
@@ -16146,20 +18002,20 @@
     if (stmt) {
       stmt.Reset();
     } else if (indexValue.mUnique) {
-      rv = aConnection->GetCachedStatement(
+      rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
         "DELETE FROM unique_index_data "
           "WHERE index_id = :index_id "
-          "AND value = :value;",
+          "AND value = :value;"),
         &stmt);
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
       }
     } else {
-      rv = aConnection->GetCachedStatement(
+      rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
         "DELETE FROM index_data "
           "WHERE index_id = :index_id "
           "AND value = :value "
-          "AND object_data_key = :object_data_key;",
+          "AND object_data_key = :object_data_key;"),
         &stmt);
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
@@ -16222,11 +18078,11 @@
   DatabaseConnection::CachedStatement selectStmt;
 
   if (singleRowOnly) {
-    rv = aConnection->GetCachedStatement(
+    rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
       "SELECT index_data_values "
         "FROM object_data "
         "WHERE object_store_id = :object_store_id "
-        "AND key = :key;",
+        "AND key = :key;"),
       &selectStmt);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
@@ -16246,12 +18102,13 @@
                                   keyRangeClause);
     }
 
-    rv = aConnection->GetCachedStatement(
-      NS_LITERAL_CSTRING("SELECT index_data_values, key "
-                           "FROM object_data "
-                           "WHERE object_store_id = :") + objectStoreIdString +
-      keyRangeClause +
-      NS_LITERAL_CSTRING(";"),
+    rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
+      "SELECT index_data_values, key "
+        "FROM object_data "
+        "WHERE object_store_id = :") +
+        objectStoreIdString +
+        keyRangeClause +
+        NS_LITERAL_CSTRING(";"),
       &selectStmt);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
@@ -16299,10 +18156,10 @@
     if (deleteStmt) {
       MOZ_ALWAYS_TRUE(NS_SUCCEEDED(deleteStmt->Reset()));
     } else {
-      rv = aConnection->GetCachedStatement(
+      rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
         "DELETE FROM object_data "
           "WHERE object_store_id = :object_store_id "
-          "AND key = :key;",
+          "AND key = :key;"),
         &deleteStmt);
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
@@ -16363,11 +18220,11 @@
   MOZ_ASSERT(!indexDataValuesLength == !(indexDataValues.get()));
 
   DatabaseConnection::CachedStatement updateStmt;
-  rv = aConnection->GetCachedStatement(
+  rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
     "UPDATE object_data "
       "SET index_data_values = :index_data_values "
       "WHERE object_store_id = :object_store_id "
-      "AND key = :key;",
+      "AND key = :key;"),
     &updateStmt);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
@@ -16424,10 +18281,10 @@
   DatabaseConnection::CachedStatement stmt;
 
   MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
-    aConnection->GetCachedStatement(
+    aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
       "SELECT id "
         "FROM object_store_index "
-        "WHERE object_store_id = :object_store_id;",
+        "WHERE object_store_id = :object_store_id;"),
       &stmt)));
 
   MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
@@ -16786,10 +18643,10 @@
       // Check to make sure that the child process has access to the database it
       // is accessing.
       NS_NAMED_LITERAL_CSTRING(permissionStringBase,
-                               kPermissionStringChromeBase);
+                               PERMISSION_STRING_CHROME_BASE);
       NS_ConvertUTF16toUTF8 databaseName(mCommonParams.metadata().name());
-      NS_NAMED_LITERAL_CSTRING(readSuffix, kPermissionStringChromeReadSuffix);
-      NS_NAMED_LITERAL_CSTRING(writeSuffix, kPermissionStringChromeWriteSuffix);
+      NS_NAMED_LITERAL_CSTRING(readSuffix, PERMISSION_STRING_CHROME_READ_SUFFIX);
+      NS_NAMED_LITERAL_CSTRING(writeSuffix, PERMISSION_STRING_CHROME_WRITE_SUFFIX);
 
       const nsAutoCString permissionStringWrite =
         permissionStringBase + databaseName + writeSuffix;
@@ -16878,7 +18735,7 @@
       }
 
       uint32_t intPermission =
-        mozilla::CheckPermission(aContentParent, principal, kPermissionString);
+        mozilla::CheckPermission(aContentParent, principal, IDB_PREFIX);
 
       permission =
         PermissionRequestBase::PermissionValueForIntPermission(intPermission);
@@ -17207,6 +19064,7 @@
   , mMetadata(new FullDatabaseMetadata(aParams.metadata()))
   , mRequestedVersion(aParams.metadata().version())
   , mVersionChangeOp(nullptr)
+  , mTelemetryId(0)
 {
   auto& optionalContentParentId =
     const_cast<OptionalContentId&>(mOptionalContentParentId);
@@ -17350,6 +19208,8 @@
     return rv;
   }
 
+  mTelemetryId = TelemetryIdForFile(dbFile);
+
   rv = dbFile->GetPath(mDatabaseFilePath);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
@@ -17375,6 +19235,7 @@
                                persistenceType,
                                mGroup,
                                mOrigin,
+                               mTelemetryId,
                                getter_AddRefs(connection));
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
@@ -18077,6 +19938,7 @@
                            mCommonParams.principalInfo(),
                            mGroup,
                            mOrigin,
+                           mTelemetryId,
                            mMetadata,
                            mFileManager,
                            mOfflineStorage.forget(),
@@ -18371,18 +20233,17 @@
     return rv;
   }
 
-  NS_NAMED_LITERAL_CSTRING(version, "version");
-
   DatabaseConnection::CachedStatement updateStmt;
-  rv = aConnection->GetCachedStatement(
-    NS_LITERAL_CSTRING("UPDATE database "
-                       "SET version = :") + version,
+  rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
+    "UPDATE database "
+      "SET version = :version;"),
     &updateStmt);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
 
-  rv = updateStmt->BindInt64ByName(version, int64_t(mRequestedVersion));
+  rv = updateStmt->BindInt64ByName(NS_LITERAL_CSTRING("version"),
+                                   int64_t(mRequestedVersion));
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -19424,7 +21285,8 @@
 
   DatabaseConnection::CachedStatement pragmaStmt;
   MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
-    aConnection->GetCachedStatement("PRAGMA foreign_keys;", &pragmaStmt)));
+    aConnection->GetCachedStatement(NS_LITERAL_CSTRING("PRAGMA foreign_keys;"),
+                                    &pragmaStmt)));
 
   bool hasResult;
   MOZ_ALWAYS_TRUE(NS_SUCCEEDED(pragmaStmt->ExecuteStep(&hasResult)));
@@ -19438,7 +21300,9 @@
 
   DatabaseConnection::CachedStatement checkStmt;
   MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
-    aConnection->GetCachedStatement("PRAGMA foreign_key_check;", &checkStmt)));
+    aConnection->GetCachedStatement(
+      NS_LITERAL_CSTRING("PRAGMA foreign_key_check;"),
+      &checkStmt)));
 
   MOZ_ALWAYS_TRUE(NS_SUCCEEDED(checkStmt->ExecuteStep(&hasResult)));
 
@@ -19490,23 +21354,16 @@
           if (NS_SUCCEEDED(mResultCode)) {
             AssertForeignKeyConsistency(connection);
 
-            DatabaseConnection::CachedStatement stmt;
-            mResultCode = connection->GetCachedStatement("COMMIT", &stmt);
-            NS_WARN_IF_FALSE(NS_SUCCEEDED(mResultCode),
-                             "Failed to get 'COMMIT' statement!");
-
-            if (NS_SUCCEEDED(mResultCode)) {
-              mResultCode = stmt->Execute();
-              NS_WARN_IF_FALSE(NS_SUCCEEDED(mResultCode), "Commit failed!");
-
-              if (mTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH &&
-                  NS_SUCCEEDED(mResultCode)) {
-                mResultCode = connection->Checkpoint(/* aIdle */ false);
-              }
+            mResultCode = connection->CommitWriteTransaction();
+            NS_WARN_IF_FALSE(NS_SUCCEEDED(mResultCode), "Commit failed!");
 
-              if (NS_SUCCEEDED(mResultCode) && fileRefcountFunction) {
-                fileRefcountFunction->DidCommit();
-              }
+            if (NS_SUCCEEDED(mResultCode) &&
+                mTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH) {
+              mResultCode = connection->Checkpoint();
+            }
+
+            if (NS_SUCCEEDED(mResultCode) && fileRefcountFunction) {
+              fileRefcountFunction->DidCommit();
             }
           }
         }
@@ -19642,10 +21499,10 @@
     // have thrown an error long before now...
     DatabaseConnection::CachedStatement stmt;
     MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
-      aConnection->GetCachedStatement(
+      aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
         "SELECT name "
           "FROM object_store "
-          "WHERE name = :name;",
+          "WHERE name = :name;"),
         &stmt)));
 
     MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
@@ -19664,9 +21521,9 @@
   }
 
   DatabaseConnection::CachedStatement stmt;
-  rv = aConnection->GetCachedStatement(
+  rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
     "INSERT INTO object_store (id, auto_increment, name, key_path) "
-    "VALUES (:id, :auto_increment, :name, :key_path)",
+      "VALUES (:id, :auto_increment, :name, :key_path);"),
     &stmt);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
@@ -19742,9 +21599,9 @@
     // Make sure |mIsLastObjectStore| is telling the truth.
     DatabaseConnection::CachedStatement stmt;
     MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
-      aConnection->GetCachedStatement(
+      aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
         "SELECT id "
-          "FROM object_store;",
+          "FROM object_store;"),
         &stmt)));
 
     bool foundThisObjectStore = false;
@@ -19789,8 +21646,8 @@
   if (mIsLastObjectStore) {
     // We can just delete everything if this is the last object store.
     DatabaseConnection::CachedStatement stmt;
-    rv = aConnection->GetCachedStatement(
-      "DELETE FROM index_data;",
+    rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
+      "DELETE FROM index_data;"),
       &stmt);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
@@ -19801,8 +21658,8 @@
       return rv;
     }
 
-    rv = aConnection->GetCachedStatement(
-      "DELETE FROM unique_index_data;",
+    rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
+      "DELETE FROM unique_index_data;"),
       &stmt);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
@@ -19813,8 +21670,8 @@
       return rv;
     }
 
-    rv = aConnection->GetCachedStatement(
-      "DELETE FROM object_data;",
+    rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
+      "DELETE FROM object_data;"),
       &stmt);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
@@ -19825,8 +21682,8 @@
       return rv;
     }
 
-    rv = aConnection->GetCachedStatement(
-      "DELETE FROM object_store_index;",
+    rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
+      "DELETE FROM object_store_index;"),
       &stmt);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
@@ -19837,8 +21694,8 @@
       return rv;
     }
 
-    rv = aConnection->GetCachedStatement(
-      "DELETE FROM object_store;",
+    rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
+      "DELETE FROM object_store;"),
       &stmt);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
@@ -19860,9 +21717,9 @@
 
       // Now clean up the object store index table.
       DatabaseConnection::CachedStatement stmt;
-      rv = aConnection->GetCachedStatement(
+      rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
         "DELETE FROM object_store_index "
-          "WHERE object_store_id = :object_store_id;",
+          "WHERE object_store_id = :object_store_id;"),
         &stmt);
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
@@ -19882,9 +21739,9 @@
       // We only have to worry about object data if this object store has no
       // indexes.
       DatabaseConnection::CachedStatement stmt;
-      rv = aConnection->GetCachedStatement(
+      rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
         "DELETE FROM object_data "
-          "WHERE object_store_id = :object_store_id;",
+          "WHERE object_store_id = :object_store_id;"),
         &stmt);
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
@@ -19903,9 +21760,9 @@
     }
 
     DatabaseConnection::CachedStatement stmt;
-    rv = aConnection->GetCachedStatement(
+    rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
       "DELETE FROM object_store "
-        "WHERE id = :object_store_id;",
+        "WHERE id = :object_store_id;"),
       &stmt);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
@@ -20027,11 +21884,11 @@
   MOZ_ASSERT(storageConnection);
 
   DatabaseConnection::CachedStatement stmt;
-  nsresult rv = aConnection->GetCachedStatement(
+  nsresult rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
     "UPDATE object_data "
       "SET index_data_values = update_index_data_values "
         "(key, index_data_values, file_ids, data) "
-      "WHERE object_store_id = :object_store_id;",
+      "WHERE object_store_id = :object_store_id;"),
     &stmt);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
@@ -20108,11 +21965,11 @@
     // we should have thrown an error long before now...
     DatabaseConnection::CachedStatement stmt;
     MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
-      aConnection->GetCachedStatement(
+      aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
         "SELECT name "
           "FROM object_store_index "
           "WHERE object_store_id = :osid "
-          "AND name = :name;",
+          "AND name = :name;"),
         &stmt)));
     MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
       stmt->BindInt64ByName(NS_LITERAL_CSTRING("osid"), mObjectStoreId)));
@@ -20133,10 +21990,10 @@
   }
 
   DatabaseConnection::CachedStatement stmt;
-  rv = aConnection->GetCachedStatement(
+  rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
     "INSERT INTO object_store_index (id, name, key_path, unique_index, "
                                     "multientry, object_store_id) "
-    "VALUES (:id, :name, :key_path, :unique, :multientry, :osid)",
+    "VALUES (:id, :name, :key_path, :unique, :multientry, :osid)"),
     &stmt);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
@@ -20419,7 +22276,7 @@
   const uint32_t updateInfoCount = updateInfos.Length();
 
   if (NS_WARN_IF(!indexValues.SetCapacity(indexValues.Length() +
-                                          updateInfoCount))) {
+                                          updateInfoCount, fallible))) {
     IDB_REPORT_INTERNAL_ERR();
     return NS_ERROR_OUT_OF_MEMORY;
   }
@@ -20538,11 +22395,11 @@
     // There is no need to parse the previous entry in the index_data_values
     // column if this is the last index. Simply set it to NULL.
     DatabaseConnection::CachedStatement stmt;
-    nsresult rv = aConnection->GetCachedStatement(
+    nsresult rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
       "UPDATE object_data "
         "SET index_data_values = NULL "
         "WHERE object_store_id = :object_store_id "
-        "AND key = :key;",
+        "AND key = :key;"),
       &stmt);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
@@ -20636,10 +22493,10 @@
     // Make sure |mIsLastIndex| is telling the truth.
     DatabaseConnection::CachedStatement stmt;
     MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
-      aConnection->GetCachedStatement(
+      aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
         "SELECT id "
           "FROM object_store_index "
-          "WHERE object_store_id = :object_store_id;",
+          "WHERE object_store_id = :object_store_id;"),
         &stmt)));
 
     MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
@@ -20689,15 +22546,15 @@
   // The cost of having an index on this field is too high.
   if (mUnique) {
     if (mIsLastIndex) {
-      rv = aConnection->GetCachedStatement(
+      rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
         "/* do not warn (bug someone else) */ "
         "SELECT value, object_data_key "
           "FROM unique_index_data "
           "WHERE index_id = :index_id "
-          "ORDER BY object_data_key ASC;",
+          "ORDER BY object_data_key ASC;"),
         &selectStmt);
     } else {
-      rv = aConnection->GetCachedStatement(
+      rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
         "/* do not warn (bug out) */ "
         "SELECT unique_index_data.value, "
                "unique_index_data.object_data_key, "
@@ -20707,21 +22564,21 @@
           "ON unique_index_data.object_data_key = object_data.key "
           "WHERE unique_index_data.index_id = :index_id "
           "AND object_data.object_store_id = :object_store_id "
-          "ORDER BY unique_index_data.object_data_key ASC;",
+          "ORDER BY unique_index_data.object_data_key ASC;"),
         &selectStmt);
     }
   } else {
     if (mIsLastIndex) {
-      rv = aConnection->GetCachedStatement(
+      rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
         "/* do not warn (bug me not) */ "
         "SELECT value, object_data_key "
           "FROM index_data "
           "WHERE index_id = :index_id "
           "AND object_store_id = :object_store_id "
-          "ORDER BY object_data_key ASC;",
+          "ORDER BY object_data_key ASC;"),
         &selectStmt);
     } else {
-      rv = aConnection->GetCachedStatement(
+      rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
         "/* do not warn (bug off) */ "
         "SELECT index_data.value, "
                "index_data.object_data_key, "
@@ -20731,7 +22588,7 @@
           "ON index_data.object_data_key = object_data.key "
           "WHERE index_data.index_id = :index_id "
           "AND object_data.object_store_id = :object_store_id "
-          "ORDER BY index_data.object_data_key ASC;",
+          "ORDER BY index_data.object_data_key ASC;"),
         &selectStmt);
     }
   }
@@ -20832,17 +22689,17 @@
         MOZ_ALWAYS_TRUE(NS_SUCCEEDED(deleteIndexRowStmt->Reset()));
     } else {
       if (mUnique) {
-        rv = aConnection->GetCachedStatement(
+        rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
           "DELETE FROM unique_index_data "
             "WHERE index_id = :index_id "
-            "AND value = :value;",
+            "AND value = :value;"),
           &deleteIndexRowStmt);
       } else {
-        rv = aConnection->GetCachedStatement(
+        rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
           "DELETE FROM index_data "
             "WHERE index_id = :index_id "
             "AND value = :value "
-            "AND object_data_key = :object_data_key;",
+            "AND object_data_key = :object_data_key;"),
           &deleteIndexRowStmt);
       }
       if (NS_WARN_IF(NS_FAILED(rv))) {
@@ -20890,9 +22747,9 @@
   }
 
   DatabaseConnection::CachedStatement deleteStmt;
-  rv = aConnection->GetCachedStatement(
+  rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
     "DELETE FROM object_store_index "
-      "WHERE id = :index_id;",
+      "WHERE id = :index_id;"),
     &deleteStmt);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
@@ -21024,11 +22881,11 @@
   MOZ_ASSERT(mObjectStoreHasIndexes);
 
   DatabaseConnection::CachedStatement indexValuesStmt;
-  nsresult rv = aConnection->GetCachedStatement(
+  nsresult rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
     "SELECT index_data_values "
       "FROM object_data "
       "WHERE object_store_id = :object_store_id "
-      "AND key = :key;",
+      "AND key = :key;"),
     &indexValuesStmt);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
@@ -21174,7 +23031,7 @@
   if (!files.IsEmpty()) {
     const uint32_t count = files.Length();
 
-    if (NS_WARN_IF(!mStoredFileInfos.SetCapacity(count))) {
+    if (NS_WARN_IF(!mStoredFileInfos.SetCapacity(count, fallible))) {
       return false;
     }
 
@@ -21273,16 +23130,16 @@
   // detectable errors rather than corrupting data.
   DatabaseConnection::CachedStatement stmt;
   if (!mOverwrite || keyUnset) {
-    rv = aConnection->GetCachedStatement(
+    rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
       "INSERT INTO object_data "
         "(object_store_id, key, file_ids, data) "
-        "VALUES (:osid, :key, :file_ids, :data);",
+        "VALUES (:osid, :key, :file_ids, :data);"),
       &stmt);
   } else {
-    rv = aConnection->GetCachedStatement(
+    rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
       "INSERT OR REPLACE INTO object_data "
         "(object_store_id, key, file_ids, data) "
-        "VALUES (:osid, :key, :file_ids, :data);",
+        "VALUES (:osid, :key, :file_ids, :data);"),
     &stmt);
   }
   if (NS_WARN_IF(NS_FAILED(rv))) {
@@ -21783,7 +23640,8 @@
 
     if (!mResponse.IsEmpty()) {
       FallibleTArray<SerializedStructuredCloneReadInfo> fallibleCloneInfos;
-      if (NS_WARN_IF(!fallibleCloneInfos.SetLength(mResponse.Length()))) {
+      if (NS_WARN_IF(!fallibleCloneInfos.SetLength(mResponse.Length(),
+                                                   fallible))) {
         aResponse = NS_ERROR_OUT_OF_MEMORY;
         return;
       }
@@ -22037,9 +23895,9 @@
     }
   } else {
     DatabaseConnection::CachedStatement stmt;
-    rv = aConnection->GetCachedStatement(
+    rv = aConnection->GetCachedStatement(NS_LITERAL_CSTRING(
       "DELETE FROM object_data "
-        "WHERE object_store_id = :object_store_id;",
+        "WHERE object_store_id = :object_store_id;"),
       &stmt);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
@@ -22331,7 +24189,8 @@
 
     if (!mResponse.IsEmpty()) {
       FallibleTArray<SerializedStructuredCloneReadInfo> fallibleCloneInfos;
-      if (NS_WARN_IF(!fallibleCloneInfos.SetLength(mResponse.Length()))) {
+      if (NS_WARN_IF(!fallibleCloneInfos.SetLength(mResponse.Length(),
+                                                   fallible))) {
         aResponse = NS_ERROR_OUT_OF_MEMORY;
         return;
       }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/FileManager.h firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/FileManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/FileManager.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/FileManager.h	2015-05-25 20:43:36.000000000 +0000
@@ -54,7 +54,8 @@
                 nsIFile* aDatabaseFile,
                 PersistenceType aPersistenceType,
                 const nsACString& aGroup,
-                const nsACString& aOrigin);
+                const nsACString& aOrigin,
+                uint32_t aTelemetryId);
 
   static nsresult
   GetUsage(nsIFile* aDirectory, uint64_t* aUsage);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/FileSnapshot.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/FileSnapshot.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/FileSnapshot.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/FileSnapshot.cpp	2015-05-25 20:43:36.000000000 +0000
@@ -90,24 +90,23 @@
 
 NS_IMPL_ISUPPORTS_INHERITED(BlobImplSnapshot, BlobImpl, PIBlobImplSnapshot)
 
-nsresult
-BlobImplSnapshot::GetInternalStream(nsIInputStream** aStream)
+void
+BlobImplSnapshot::GetInternalStream(nsIInputStream** aStream,
+                                    ErrorResult& aRv)
 {
   AssertSanity();
 
   nsCOMPtr<EventTarget> et = do_QueryReferent(mFileHandle);
   nsRefPtr<IDBFileHandle> fileHandle = static_cast<IDBFileHandle*>(et.get());
   if (!fileHandle) {
-    return NS_ERROR_DOM_FILEHANDLE_INACTIVE_ERR;
+    aRv.Throw(NS_ERROR_DOM_FILEHANDLE_INACTIVE_ERR);
+    return;
   }
 
-  nsresult rv = fileHandle->OpenInputStream(mWholeFile, mStart, mLength,
-                                            aStream);
-  if (NS_FAILED(rv)) {
-    return rv;
+  aRv = fileHandle->OpenInputStream(mWholeFile, mStart, mLength, aStream);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return;
   }
-
-  return NS_OK;
 }
 
 already_AddRefed<BlobImpl>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/FileSnapshot.h firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/FileSnapshot.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/FileSnapshot.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/FileSnapshot.h	2015-05-25 20:43:36.000000000 +0000
@@ -76,8 +76,8 @@
   virtual void
   GetMozFullPathInternal(nsAString& aFullPath, ErrorResult& aRv) override;
 
-  virtual nsresult
-  GetInternalStream(nsIInputStream** aStream) override;
+  virtual void
+  GetInternalStream(nsIInputStream** aStream, ErrorResult& aRv) override;
 
   virtual bool MayBeClonedToOtherThreads() const override
   {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/IDBMutableFile.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/IDBMutableFile.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/IDBMutableFile.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/IDBMutableFile.cpp	2015-05-25 20:43:37.000000000 +0000
@@ -27,7 +27,6 @@
 #include "nsContentUtils.h"
 #include "nsDebug.h"
 #include "nsError.h"
-#include "nsIDOMFile.h"
 #include "nsIPrincipal.h"
 
 namespace mozilla {
@@ -328,7 +327,7 @@
   return mFileInfo->Id();
 }
 
-already_AddRefed<nsIDOMFile>
+already_AddRefed<File>
 IDBMutableFile::CreateFileObject(IDBFileHandle* aFileHandle,
                                  MetadataParameters* aMetadataParams)
 {
@@ -393,12 +392,10 @@
 
   auto fileHandle = static_cast<IDBFileHandle*>(mFileHandle.get());
 
-  nsCOMPtr<nsIDOMFile> domFile =
+  nsRefPtr<File> domFile =
     mMutableFile->CreateFileObject(fileHandle, mParams);
 
-  nsresult rv =
-    nsContentUtils::WrapNative(aCx, domFile, &NS_GET_IID(nsIDOMFile), aVal);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
+  if (!ToJSValue(aCx, domFile, aVal)) {
     return NS_ERROR_DOM_FILEHANDLE_UNKNOWN_ERR;
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/IDBMutableFile.h firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/IDBMutableFile.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/IDBMutableFile.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/IDBMutableFile.h	2015-05-25 20:43:37.000000000 +0000
@@ -18,7 +18,6 @@
 #include "nsAutoPtr.h"
 #include "nsCycleCollectionParticipant.h"
 
-class nsIDOMFile;
 class nsPIDOMWindow;
 
 namespace mozilla {
@@ -28,6 +27,7 @@
 namespace dom {
 
 class DOMRequest;
+class File;
 class MetadataParameters;
 
 namespace indexedDB {
@@ -83,7 +83,7 @@
     return mFileInfo;
   }
 
-  already_AddRefed<nsIDOMFile>
+  already_AddRefed<File>
   CreateFileObject(IDBFileHandle* aFileHandle,
                    MetadataParameters* aMetadataParams);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/IDBObjectStore.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/IDBObjectStore.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/IDBObjectStore.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/IDBObjectStore.cpp	2015-05-25 20:43:37.000000000 +0000
@@ -302,13 +302,14 @@
   {
     Blob* blob = nullptr;
     if (NS_SUCCEEDED(UNWRAP_OBJECT(Blob, aObj, blob))) {
-      uint64_t size;
-      MOZ_ALWAYS_TRUE(NS_SUCCEEDED(blob->GetSize(&size)));
+      ErrorResult rv;
+      uint64_t size = blob->GetSize(rv);
+      MOZ_ASSERT(!rv.Failed());
 
       size = NativeEndian::swapToLittleEndian(size);
 
       nsString type;
-      MOZ_ALWAYS_TRUE(NS_SUCCEEDED(blob->GetType(type)));
+      blob->GetType(type);
 
       NS_ConvertUTF16toUTF8 convType(type);
       uint32_t convTypeLength =
@@ -334,14 +335,14 @@
 
       nsRefPtr<File> file = blob->ToFile();
       if (file) {
-        int64_t lastModifiedDate;
-        MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
-          file->GetMozLastModifiedDate(&lastModifiedDate)));
+        ErrorResult rv;
+        int64_t lastModifiedDate = file->GetLastModified(rv);
+        MOZ_ALWAYS_TRUE(!rv.Failed());
 
         lastModifiedDate = NativeEndian::swapToLittleEndian(lastModifiedDate);
 
         nsString name;
-        MOZ_ALWAYS_TRUE(NS_SUCCEEDED(file->GetName(name)));
+        file->GetName(name);
 
         NS_ConvertUTF16toUTF8 convName(name);
         uint32_t convNameLength =
@@ -587,7 +588,7 @@
                              aFile.mFileInfo.forget());
     MOZ_ASSERT(mutableFile);
 
-    JS::Rooted<JSObject*> result(aCx, mutableFile->WrapObject(aCx, JS::NullPtr()));
+    JS::Rooted<JSObject*> result(aCx, mutableFile->WrapObject(aCx, nullptr));
     if (NS_WARN_IF(!result)) {
       return false;
     }
@@ -1178,7 +1179,8 @@
   }
 
   FallibleTArray<uint8_t> cloneData;
-  if (NS_WARN_IF(!cloneData.SetLength(cloneWriteInfo.mCloneBuffer.nbytes()))) {
+  if (NS_WARN_IF(!cloneData.SetLength(cloneWriteInfo.mCloneBuffer.nbytes(),
+                                      fallible))) {
     aRv = NS_ERROR_OUT_OF_MEMORY;
     return nullptr;
   }
@@ -1206,7 +1208,7 @@
     const uint32_t count = blobOrFileInfos.Length();
 
     FallibleTArray<DatabaseFileOrMutableFileId> fileActorOrMutableFileIds;
-    if (NS_WARN_IF(!fileActorOrMutableFileIds.SetCapacity(count))) {
+    if (NS_WARN_IF(!fileActorOrMutableFileIds.SetCapacity(count, fallible))) {
       aRv = NS_ERROR_OUT_OF_MEMORY;
       return nullptr;
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/IDBTransaction.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/IDBTransaction.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/IDBTransaction.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/IDBTransaction.cpp	2015-05-25 20:43:37.000000000 +0000
@@ -17,7 +17,6 @@
 #include "mozilla/dom/DOMStringList.h"
 #include "mozilla/ipc/BackgroundChild.h"
 #include "nsIAppShell.h"
-#include "nsIDOMFile.h"
 #include "nsPIDOMWindow.h"
 #include "nsServiceManagerUtils.h"
 #include "nsTHashtable.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/IndexedDatabaseManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/IndexedDatabaseManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/IndexedDatabaseManager.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/IndexedDatabaseManager.cpp	2015-05-25 20:43:37.000000000 +0000
@@ -35,7 +35,7 @@
 #include "nsContentUtils.h"
 #include "nsGlobalWindow.h"
 #include "nsThreadUtils.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "IDBEvents.h"
 #include "IDBFactory.h"
@@ -428,7 +428,8 @@
   nsEventStatus status = nsEventStatus_eIgnore;
 
   if (NS_IsMainThread()) {
-    if (nsIDOMWindow* window = eventTarget->GetOwnerGlobal()) {
+    nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(eventTarget->GetOwnerGlobal());
+    if (window) {
       nsCOMPtr<nsIScriptGlobalObject> sgo = do_QueryInterface(window);
       MOZ_ASSERT(sgo);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/moz.build	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/moz.build	2015-05-25 20:43:37.000000000 +0000
@@ -96,4 +96,5 @@
     '/dom/workers',
     '/ipc/glue',
     '/xpcom/build',
+    '/xpcom/threads',
 ]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/ProfilerHelpers.h firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/ProfilerHelpers.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/ProfilerHelpers.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/ProfilerHelpers.h	2015-05-25 20:43:37.000000000 +0000
@@ -27,7 +27,7 @@
 #include "nsID.h"
 #include "nsIDOMEvent.h"
 #include "nsString.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 // Include this last to avoid path problems on Windows.
 #include "ActorsChild.h"
@@ -297,7 +297,7 @@
       va_end(args);
     }
 
-    PR_LOG(logModule, logLevel, ("%s", message.get()));
+    MOZ_LOG(logModule, logLevel, ("%s", message.get()));
 
     if (aUseProfiler) {
       PROFILER_MARKER(message.get());
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/test/file.js firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/test/file.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/test/file.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/test/file.js	2015-05-25 20:43:37.000000000 +0000
@@ -94,12 +94,11 @@
 {
   is(blob1 instanceof Components.interfaces.nsIDOMBlob, true,
      "Instance of nsIDOMBlob");
-  is(blob1 instanceof Components.interfaces.nsIDOMFile,
-     blob2 instanceof Components.interfaces.nsIDOMFile,
-     "Instance of nsIDOMFile");
+  is(blob1 instanceof File, blob2 instanceof File,
+     "Instance of DOM File");
   is(blob1.size, blob2.size, "Correct size");
   is(blob1.type, blob2.type, "Correct type");
-  if (blob2 instanceof Components.interfaces.nsIDOMFile) {
+  if (blob2 instanceof File) {
     is(blob1.name, blob2.name, "Correct name");
   }
   is(utils.getFileId(blob1), fileId, "Correct file id");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/test/unit/test_idle_maintenance.js firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/test/unit/test_idle_maintenance.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/test/unit/test_idle_maintenance.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/test/unit/test_idle_maintenance.js	2015-05-25 20:43:37.000000000 +0000
@@ -0,0 +1,136 @@
+/**
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+var testGenerator = testSteps();
+
+function testSteps()
+{
+  let uri = Cc["@mozilla.org/network/io-service;1"].
+            getService(Ci.nsIIOService).
+            newURI("https://www.example.com", null, null);
+  let principal = Cc["@mozilla.org/scriptsecuritymanager;1"].
+                  getService(Ci.nsIScriptSecurityManager).
+                  getNoAppCodebasePrincipal(uri);
+
+  info("Setting permissions");
+
+  let permMgr =
+    Cc["@mozilla.org/permissionmanager;1"].getService(Ci.nsIPermissionManager);
+  permMgr.add(uri, "indexedDB", Ci.nsIPermissionManager.ALLOW_ACTION);
+
+  info("Setting idle preferences to prevent real 'idle-daily' notification");
+
+  let prefs =
+    Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
+  prefs.setIntPref("idle.lastDailyNotification", (Date.now() / 1000) - 10);
+
+  info("Activating real idle service");
+
+  do_get_idle();
+
+  info("Creating databases");
+
+  let quotaManager =
+    Cc["@mozilla.org/dom/quota/manager;1"].getService(Ci.nsIQuotaManager);
+
+  let dbCount = 0;
+
+  for (let persistence of ["persistent", "temporary", "default"]) {
+    for (let i = 1; i <= 5; i++) {
+      let dbName = "foo-" + i;
+      let dbPersistence = persistence;
+      let req = indexedDB.openForPrincipal(principal,
+                                           dbName,
+                                           { version: 1,
+                                             storage: dbPersistence });
+      req.onerror = event => {
+        if (dbPersistence != "persistent") {
+          errorHandler(event);
+          return;
+        }
+
+        // Explicit persistence is currently blocked on mobile.
+        info("Failed to create persistent database '" + dbPersistence + "/" +
+             dbName + "', hopefully this is on mobile!");
+
+        event.preventDefault();
+
+        if (!(--dbCount)) {
+          continueToNextStep();
+        }
+      };
+      req.onupgradeneeded = event => {
+        let db = event.target.result;
+        let objectStore = db.createObjectStore("foo");
+
+        // Add lots of data...
+        for (let j = 0; j < 100; j++) {
+          objectStore.add("abcdefghijklmnopqrstuvwxyz0123456789", j);
+        }
+
+        // And then clear it so that maintenance has some space to reclaim.
+        objectStore.clear();
+      };
+      req.onsuccess = event => {
+        let db = event.target.result;
+        ok(db, "Created database '" + dbPersistence + "/" + dbName + "'");
+
+        db.close();
+
+        if (!(--dbCount)) {
+          continueToNextStep();
+        }
+      };
+      dbCount++;
+    }
+  }
+  yield undefined;
+
+  info("Getting usage before maintenance");
+
+  let usageBeforeMaintenance;
+
+  quotaManager.getUsageForURI(uri, (url, usage) => {
+    ok(usage > 0, "Usage is non-zero");
+    usageBeforeMaintenance = usage;
+    continueToNextStep();
+  });
+  yield undefined;
+
+  info("Sending fake 'idle-daily' notification to QuotaManager");
+
+  let observer = quotaManager.QueryInterface(Ci.nsIObserver);
+  observer.observe(null, "idle-daily", "");
+
+  info("Waiting for maintenance to start");
+
+  // This time is totally arbitrary. Most likely directory scanning will have
+  // completed, QuotaManager locks will be acquired, and  maintenance tasks will
+  // be scheduled before this time has elapsed, so we will be testing the
+  // maintenance code. However, if something is slow then this will test
+  // shutting down in the middle of maintenance.
+  setTimeout(continueToNextStep, 10000);
+  yield undefined;
+
+  info("Getting usage after maintenance");
+
+  let usageAfterMaintenance;
+
+  quotaManager.getUsageForURI(uri, (url, usage) => {
+    ok(usage > 0, "Usage is non-zero");
+    usageAfterMaintenance = usage;
+    continueToNextStep();
+  });
+  yield undefined;
+
+  info("Usage before: " + usageBeforeMaintenance + ". " +
+       "Usage after: " + usageAfterMaintenance);
+
+  ok(usageAfterMaintenance <= usageBeforeMaintenance,
+     "Maintenance decreased file sizes or left them the same");
+
+  finishTest();
+  yield undefined;
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/test/unit/xpcshell-parent-process.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/test/unit/xpcshell-parent-process.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/indexedDB/test/unit/xpcshell-parent-process.ini	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/indexedDB/test/unit/xpcshell-parent-process.ini	2015-05-25 20:43:37.000000000 +0000
@@ -26,6 +26,7 @@
 [test_defaultStorageUpgrade.js]
 [test_globalObjects_ipc.js]
 skip-if = toolkit == 'android'
+[test_idle_maintenance.js]
 [test_invalidate.js]
 # disabled for the moment.
 skip-if = true
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/inputmethod/forms.js firefox-trunk-41.0~a1~hg20150524r245419/dom/inputmethod/forms.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/inputmethod/forms.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/inputmethod/forms.js	2015-05-25 20:43:37.000000000 +0000
@@ -193,7 +193,9 @@
     addEventListener("focus", this, true, false);
     addEventListener("blur", this, true, false);
     addEventListener("resize", this, true, false);
-    addEventListener("submit", this, true, false);
+    // We should not blur the fucus if the submit event is cancelled,
+    // therefore we are binding our event listener in the bubbling phase here.
+    addEventListener("submit", this, false, false);
     addEventListener("pagehide", this, true, false);
     addEventListener("beforeunload", this, true, false);
     addEventListener("input", this, true, false);
@@ -399,7 +401,7 @@
         }
         // fall through
       case "submit":
-        if (this.focusedElement) {
+        if (this.focusedElement && !evt.defaultPrevented) {
           this.focusedElement.blur();
         }
         break;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/interfaces/base/nsIDOMWindowUtils.idl firefox-trunk-41.0~a1~hg20150524r245419/dom/interfaces/base/nsIDOMWindowUtils.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/interfaces/base/nsIDOMWindowUtils.idl	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/interfaces/base/nsIDOMWindowUtils.idl	2015-05-25 20:43:38.000000000 +0000
@@ -39,8 +39,6 @@
 interface nsITransferable;
 interface nsIQueryContentEventResult;
 interface nsIDOMWindow;
-interface nsIDOMBlob;
-interface nsIDOMFile;
 interface nsIFile;
 interface nsIDOMClientRect;
 interface nsIURI;
@@ -51,7 +49,7 @@
 interface nsIContentPermissionRequest;
 interface nsIObserver;
 
-[scriptable, uuid(1a75c351-d115-4d51-94df-731dd1723a1f)]
+[scriptable, uuid(0ce789cc-3fb6-48b8-a58e-32deefc337b4)]
 interface nsIDOMWindowUtils : nsISupports {
 
   /**
@@ -1185,11 +1183,9 @@
    * Called when the remote child frame has changed its fullscreen state,
    * when entering fullscreen, and when the origin which is fullscreen changes.
    * aFrameElement is the iframe element which contains the child-process
-   * fullscreen document, and aNewOrigin is the origin of the new fullscreen
-   * document.
+   * fullscreen document.
    */
-  void remoteFrameFullscreenChanged(in nsIDOMElement aFrameElement,
-                                    in AString aNewOrigin);
+  void remoteFrameFullscreenChanged(in nsIDOMElement aFrameElement);
 
   /**
    * Called when the remote frame has popped all fullscreen elements off its
@@ -1445,9 +1441,10 @@
                                   in AString value2);
 
   /**
-   * Wrap an nsIFile in an nsIDOMFile
+   * Wrap an nsIFile in an DOM File
+   * Returns a File object.
    */
-  nsIDOMFile wrapDOMFile(in nsIFile aFile);
+  nsISupports wrapDOMFile(in nsIFile aFile);
 
   /**
    * Get the type of the currently focused html input, if any.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/interfaces/base/nsITabParent.idl firefox-trunk-41.0~a1~hg20150524r245419/dom/interfaces/base/nsITabParent.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/interfaces/base/nsITabParent.idl	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/interfaces/base/nsITabParent.idl	2015-05-25 20:43:38.000000000 +0000
@@ -5,7 +5,7 @@
 
 #include "domstubs.idl"
 
-[scriptable, uuid(b19038ba-0d75-40d2-be35-742e26d33bf9)]
+[scriptable, uuid(4d4576eb-ecfe-47b9-93b8-4121518621ad)]
 interface nsITabParent : nsISupports
 {
   void injectTouchEvent(in AString aType,
@@ -26,4 +26,6 @@
   void setIsDocShellActive(in bool aIsActive);
 
   readonly attribute uint64_t tabId;
+
+  readonly attribute boolean hasContentOpener;
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/interfaces/html/nsIDOMHTMLCanvasElement.idl firefox-trunk-41.0~a1~hg20150524r245419/dom/interfaces/html/nsIDOMHTMLCanvasElement.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/interfaces/html/nsIDOMHTMLCanvasElement.idl	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/interfaces/html/nsIDOMHTMLCanvasElement.idl	2015-05-25 20:43:38.000000000 +0000
@@ -16,11 +16,10 @@
  */
 
 interface nsIDOMBlob;
-interface nsIDOMFile;
 interface nsIVariant;
 interface nsIInputStreamCallback;
 
-[uuid(8978d1c5-2981-4678-a1c3-b0b7bae04fbc)]
+[uuid(2c984658-2e7c-4774-8ac5-cf1b39f8bec3)]
 interface nsIDOMHTMLCanvasElement : nsISupports
 {
   attribute unsigned long width;
@@ -38,7 +37,8 @@
   // Valid calls are
   // mozGetAsFile(name);              -- defaults to image/png
   // mozGetAsFile(name, type);        -- uses given type
-  nsIDOMFile mozGetAsFile(in DOMString name, [optional] in DOMString type);
+  // The return value is a File object.
+  nsISupports mozGetAsFile(in DOMString name, [optional] in DOMString type);
 
   // A Mozilla-only extension to get a canvas context backed by double-buffered
   // shared memory. Only privileged callers can call this.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/interfaces/notification/nsINotificationStorage.idl firefox-trunk-41.0~a1~hg20150524r245419/dom/interfaces/notification/nsINotificationStorage.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/interfaces/notification/nsINotificationStorage.idl	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/interfaces/notification/nsINotificationStorage.idl	2015-05-25 20:43:38.000000000 +0000
@@ -41,7 +41,7 @@
 /**
  * Interface for notification persistence layer.
  */
-[scriptable, uuid(f5145be6-e34b-468b-84da-c8c4c1ad60fe)]
+[scriptable, uuid(cac01fb0-c2eb-4252-b2f4-5b1fac933bd4)]
 interface nsINotificationStorage : nsISupports
 {
 
@@ -94,6 +94,20 @@
    */
   void delete(in DOMString origin,
               in DOMString id);
+
+  /**
+   * Notifications are not supposed to be persistent, according to spec, at
+   * least for now. But we want to be able to have this behavior on B2G. Thus,
+   * this method will check if the origin sending the notifications is a valid
+   * registered app with a manifest or not. Hence, a webpage that has none
+   * will have its notification sent and available (via Notification.get())
+   * during the life time of the page.
+   *
+   * @param origin: Origin from which the notification is sent.
+   *
+   * @return boolean
+   */
+  boolean canPut(in DOMString origin);
 };
 
 %{C++
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/interfaces/security/nsIContentSecurityPolicy.idl firefox-trunk-41.0~a1~hg20150524r245419/dom/interfaces/security/nsIContentSecurityPolicy.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/interfaces/security/nsIContentSecurityPolicy.idl	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/interfaces/security/nsIContentSecurityPolicy.idl	2015-05-25 20:43:38.000000000 +0000
@@ -20,7 +20,7 @@
 
 typedef unsigned short CSPDirective;
 
-[scriptable, uuid(68434447-b816-4473-a731-efc4f6d59902)]
+[scriptable, uuid(459fe61a-203e-4460-9ced-352a9bd3aa71)]
 interface nsIContentSecurityPolicy : nsISerializable
 {
   /**
@@ -282,4 +282,9 @@
 #define CSP_VIOLATION_TOPIC "csp-on-violate-policy"
 %}
 
+  /**
+   * Returns the CSP in JSON notation.
+   */
+  AString toJSON();
+
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/Blob.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/Blob.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/Blob.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/Blob.cpp	2015-05-25 20:43:38.000000000 +0000
@@ -693,18 +693,19 @@
     return sliceImpl.forget();
   }
 
-  virtual nsresult
-  GetInternalStream(nsIInputStream** aStream) override
+  virtual void
+  GetInternalStream(nsIInputStream** aStream, ErrorResult& aRv) override
   {
-    NS_ENSURE_ARG_POINTER(aStream);
+    if (NS_WARN_IF(!aStream)) {
+      aRv.Throw(NS_ERROR_FAILURE);
+      return;
+    }
 
     nsString emptyString;
-    nsresult rv = NS_NewStringInputStream(aStream, emptyString);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
+    aRv = NS_NewStringInputStream(aStream, emptyString);
+    if (NS_WARN_IF(aRv.Failed())) {
+      return;
     }
-
-    return NS_OK;
   }
 };
 
@@ -752,14 +753,16 @@
     MOZ_CRASH("Not implemented");
   }
 
-  virtual nsresult
-  GetInternalStream(nsIInputStream** aStream) override
+  virtual void
+  GetInternalStream(nsIInputStream** aStream, ErrorResult& aRv) override
   {
-    NS_ENSURE_ARG_POINTER(aStream);
+    if (NS_WARN_IF(!aStream)) {
+      aRv.Throw(NS_ERROR_FAILURE);
+      return;
+    }
 
     nsCOMPtr<nsIInputStream> inputStream = mInputStream;
     inputStream.forget(aStream);
-    return NS_OK;
   }
 };
 
@@ -968,7 +971,7 @@
   }
 
   FallibleTArray<nsRefPtr<BlobImpl>> fallibleBlobImpls;
-  if (NS_WARN_IF(!fallibleBlobImpls.SetLength(aBlobDatas.Length()))) {
+  if (NS_WARN_IF(!fallibleBlobImpls.SetLength(aBlobDatas.Length(), fallible))) {
     return nullptr;
   }
 
@@ -1092,9 +1095,10 @@
 
   MOZ_ASSERT(aBlobImpl->IsMemoryFile());
 
+  ErrorResult rv;
   nsCOMPtr<nsIInputStream> inputStream;
-  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
-    aBlobImpl->GetInternalStream(getter_AddRefs(inputStream))));
+  aBlobImpl->GetInternalStream(getter_AddRefs(inputStream), rv);
+  MOZ_ALWAYS_TRUE(!rv.Failed());
 
   DebugOnly<bool> isNonBlocking;
   MOZ_ASSERT(NS_SUCCEEDED(inputStream->IsNonBlocking(&isNonBlocking)));
@@ -1922,8 +1926,8 @@
               const nsAString& aContentType,
               ErrorResult& aRv) override;
 
-  virtual nsresult
-  GetInternalStream(nsIInputStream** aStream) override;
+  virtual void
+  GetInternalStream(nsIInputStream** aStream, ErrorResult& aRv) override;
 
   virtual int64_t
   GetFileId() override;
@@ -2064,8 +2068,8 @@
   virtual void
   GetName(nsAString& aName) override;
 
-  virtual nsresult
-  GetPath(nsAString& aPath) override;
+  virtual void
+  GetPath(nsAString& aPath, ErrorResult& aRv) override;
 
   virtual int64_t
   GetLastModified(ErrorResult& aRv) override;
@@ -2085,6 +2089,9 @@
   virtual void
   GetType(nsAString& aType) override;
 
+  virtual uint64_t
+  GetSerialNumber() const override;
+
   virtual already_AddRefed<BlobImpl>
   CreateSlice(uint64_t aStart,
               uint64_t aLength,
@@ -2094,8 +2101,8 @@
   virtual const nsTArray<nsRefPtr<BlobImpl>>*
   GetSubBlobImpls() const override;
 
-  virtual nsresult
-  GetInternalStream(nsIInputStream** aStream) override;
+  virtual void
+  GetInternalStream(nsIInputStream** aStream, ErrorResult& aRv) override;
 
   virtual int64_t
   GetFileId() override;
@@ -2361,29 +2368,31 @@
   return slice.forget();
 }
 
-nsresult
+void
 BlobChild::
-RemoteBlobImpl::GetInternalStream(nsIInputStream** aStream)
+RemoteBlobImpl::GetInternalStream(nsIInputStream** aStream, ErrorResult& aRv)
 {
   // May be called on any thread.
   if (mSameProcessBlobImpl) {
     MOZ_ASSERT(gProcessType == GeckoProcessType_Default);
 
     nsCOMPtr<nsIInputStream> realStream;
-    nsresult rv =
-      mSameProcessBlobImpl->GetInternalStream(getter_AddRefs(realStream));
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
+    mSameProcessBlobImpl->GetInternalStream(getter_AddRefs(realStream), aRv);
+    if (NS_WARN_IF(aRv.Failed())) {
+      return;
     }
 
     nsRefPtr<BlobInputStreamTether> tether =
       new BlobInputStreamTether(realStream, mSameProcessBlobImpl);
     tether.forget(aStream);
-    return NS_OK;
+    return;
   }
 
   nsRefPtr<CreateStreamHelper> helper = new CreateStreamHelper(this);
-  return helper->GetStream(aStream);
+  aRv = helper->GetStream(aStream);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return;
+  }
 }
 
 int64_t
@@ -2742,11 +2751,11 @@
   mBlobImpl->GetName(aName);
 }
 
-nsresult
+void
 BlobParent::
-RemoteBlobImpl::GetPath(nsAString& aPath)
+RemoteBlobImpl::GetPath(nsAString& aPath, ErrorResult& aRv)
 {
-  return mBlobImpl->GetPath(aPath);
+  mBlobImpl->GetPath(aPath, aRv);
 }
 
 int64_t
@@ -2791,6 +2800,13 @@
   mBlobImpl->GetType(aType);
 }
 
+uint64_t
+BlobParent::
+RemoteBlobImpl::GetSerialNumber() const
+{
+  return mBlobImpl->GetSerialNumber();
+}
+
 already_AddRefed<BlobImpl>
 BlobParent::
 RemoteBlobImpl::CreateSlice(uint64_t aStart,
@@ -2808,11 +2824,11 @@
   return mBlobImpl->GetSubBlobImpls();
 }
 
-nsresult
+void
 BlobParent::
-RemoteBlobImpl::GetInternalStream(nsIInputStream** aStream)
+RemoteBlobImpl::GetInternalStream(nsIInputStream** aStream, ErrorResult& aRv)
 {
-  return mBlobImpl->GetInternalStream(aStream);
+  mBlobImpl->GetInternalStream(aStream, aRv);
 }
 
 int64_t
@@ -3316,8 +3332,9 @@
   if (gProcessType == GeckoProcessType_Default) {
     nsCOMPtr<PIBlobImplSnapshot> snapshot = do_QueryInterface(aBlobImpl);
     if (snapshot) {
-      MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
-        aBlobImpl->GetInternalStream(getter_AddRefs(snapshotInputStream))));
+      ErrorResult rv;
+      aBlobImpl->GetInternalStream(getter_AddRefs(snapshotInputStream), rv);
+      MOZ_ALWAYS_TRUE(!rv.Failed());
     }
   }
 
@@ -4273,7 +4290,7 @@
   }
 
   nsCOMPtr<nsIInputStream> stream;
-  errorResult = blobImpl->GetInternalStream(getter_AddRefs(stream));
+  blobImpl->GetInternalStream(getter_AddRefs(stream), errorResult);
   if (NS_WARN_IF(errorResult.Failed())) {
     return false;
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/ContentChild.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/ContentChild.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/ContentChild.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/ContentChild.cpp	2015-05-25 20:43:38.000000000 +0000
@@ -538,12 +538,6 @@
 
 ContentChild* ContentChild::sSingleton;
 
-static void
-PostForkPreload()
-{
-    TabChild::PostForkPreload();
-}
-
 // Performs initialization that is not fork-safe, i.e. that must be done after
 // forking from the Nuwa process.
 static void
@@ -554,7 +548,6 @@
     if (IsNuwaProcess()) {
         return;
     }
-    PostForkPreload();
 
     nsCOMPtr<nsIPermissionManager> permManager =
         services::GetPermissionManager();
@@ -1356,6 +1349,7 @@
 {
     // This runs after AllocPBrowserChild() returns and the IPC machinery for this
     // PBrowserChild has been set up.
+
     nsCOMPtr<nsIObserverService> os = services::GetObserverService();
     if (os) {
         nsITabChild* tc =
@@ -2201,11 +2195,8 @@
 ContentChild::RecvFlushMemory(const nsString& reason)
 {
 #ifdef MOZ_NUWA_PROCESS
-    if (IsNuwaProcess() || ManagedPBrowserChild().Length() == 0) {
+    if (IsNuwaProcess()) {
         // Don't flush memory in the nuwa process: the GC thread could be frozen.
-        // If there's no PBrowser child, don't flush memory, either. GC writes
-        // to copy-on-write pages and makes preallocated process take more memory
-        // before it actually becomes an app.
         return true;
     }
 #endif
@@ -2282,6 +2273,12 @@
     mAppInfo.ID.Assign(ID);
     mAppInfo.vendor.Assign(vendor);
 
+    return true;
+}
+
+bool
+ContentChild::RecvAppInit()
+{
     if (!Preferences::GetBool("dom.ipc.processPrelaunch.enabled", false)) {
         return true;
     }
@@ -2293,35 +2290,20 @@
     // BrowserElementChild.js.
     if ((mIsForApp || mIsForBrowser)
 #ifdef MOZ_NUWA_PROCESS
-        && IsNuwaProcess()
+        && !IsNuwaProcess()
 #endif
        ) {
         PreloadSlowThings();
-#ifndef MOZ_NUWA_PROCESS
-        PostForkPreload();
-#endif
     }
 
 #ifdef MOZ_NUWA_PROCESS
-    // Some modules are initialized in preloading. We need to wait until the
-    // tasks they dispatched to chrome process are done.
-    if (IsNuwaProcess()) {
-        SendNuwaWaitForFreeze();
-    }
-#endif
-    return true;
-}
-
-bool
-ContentChild::RecvNuwaFreeze()
-{
-#ifdef MOZ_NUWA_PROCESS
     if (IsNuwaProcess()) {
         ContentChild::GetSingleton()->RecvGarbageCollect();
         MessageLoop::current()->PostTask(
             FROM_HERE, NewRunnableFunction(OnFinishNuwaPreparation));
     }
 #endif
+
     return true;
 }
 
@@ -2598,36 +2580,6 @@
       DoNuwaFork();
     }
 }
-
-class NuwaForkCaller: public nsRunnable
-{
-public:
-    NS_IMETHODIMP
-    Run() {
-        // We want to ensure that the PBackground actor gets cloned in the Nuwa
-        // process before we freeze. Also, we have to do this to avoid deadlock.
-        // Protocols that are "opened" (e.g. PBackground, PCompositor) block the
-        // main thread to wait for the IPC thread during the open operation.
-        // NuwaSpawnWait() blocks the IPC thread to wait for the main thread when
-        // the Nuwa process is forked. Unless we ensure that the two cannot happen
-        // at the same time then we risk deadlock. Spinning the event loop here
-        // guarantees the ordering is safe for PBackground.
-        if (!BackgroundChild::GetForCurrentThread()) {
-            // Dispatch ourself again.
-            NS_DispatchToMainThread(this, NS_DISPATCH_NORMAL);
-        } else {
-            MessageLoop* ioloop = XRE_GetIOMessageLoop();
-            ioloop->PostTask(FROM_HERE, NewRunnableFunction(RunNuwaFork));
-        }
-        return NS_OK;
-    }
-private:
-    virtual
-    ~NuwaForkCaller()
-    {
-    }
-};
-
 #endif
 
 bool
@@ -2639,9 +2591,22 @@
     }
     sNuwaForking = true;
 
-    nsRefPtr<NuwaForkCaller> runnable = new NuwaForkCaller();
-    NS_DispatchToMainThread(runnable, NS_DISPATCH_NORMAL);
+    // We want to ensure that the PBackground actor gets cloned in the Nuwa
+    // process before we freeze. Also, we have to do this to avoid deadlock.
+    // Protocols that are "opened" (e.g. PBackground, PCompositor) block the
+    // main thread to wait for the IPC thread during the open operation.
+    // NuwaSpawnWait() blocks the IPC thread to wait for the main thread when
+    // the Nuwa process is forked. Unless we ensure that the two cannot happen
+    // at the same time then we risk deadlock. Spinning the event loop here
+    // guarantees the ordering is safe for PBackground.
+    while (!BackgroundChild::GetForCurrentThread()) {
+        if (NS_WARN_IF(!NS_ProcessNextEvent())) {
+            return false;
+        }
+    }
 
+    MessageLoop* ioloop = XRE_GetIOMessageLoop();
+    ioloop->PostTask(FROM_HERE, NewRunnableFunction(RunNuwaFork));
     return true;
 #else
     return false; // Makes the underlying IPC channel abort.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/ContentChild.h firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/ContentChild.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/ContentChild.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/ContentChild.h	2015-05-25 20:43:38.000000000 +0000
@@ -345,6 +345,7 @@
     virtual bool RecvAppInfo(const nsCString& version, const nsCString& buildID,
                              const nsCString& name, const nsCString& UAName,
                              const nsCString& ID, const nsCString& vendor) override;
+    virtual bool RecvAppInit() override;
 
     virtual bool RecvLastPrivateDocShellDestroyed() override;
 
@@ -378,8 +379,6 @@
 
     virtual bool RecvNotifyPhoneStateChange(const nsString& state) override;
 
-    virtual bool RecvNuwaFreeze() override;
-
     void AddIdleObserver(nsIObserver* aObserver, uint32_t aIdleTimeInS);
     void RemoveIdleObserver(nsIObserver* aObserver, uint32_t aIdleTimeInS);
     virtual bool RecvNotifyIdleObserver(const uint64_t& aObserver,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/ContentParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/ContentParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/ContentParent.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/ContentParent.cpp	2015-05-25 20:43:38.000000000 +0000
@@ -140,7 +140,6 @@
 #include "nsServiceManagerUtils.h"
 #include "nsStyleSheetService.h"
 #include "nsThreadUtils.h"
-#include "nsThreadManager.h"
 #include "nsToolkitCompsCID.h"
 #include "nsWidgetsCID.h"
 #include "PreallocatedProcessManager.h"
@@ -1563,28 +1562,6 @@
 NS_IMPL_ISUPPORTS(SystemMessageHandledListener,
                   nsITimerCallback)
 
-#ifdef MOZ_NUWA_PROCESS
-class NuwaFreezeListener : public nsThreadManager::AllThreadsWereIdleListener
-{
-public:
-    NuwaFreezeListener(ContentParent* parent)
-        : mParent(parent)
-    {
-    }
-
-    void OnAllThreadsWereIdle()
-    {
-        unused << mParent->SendNuwaFreeze();
-        nsThreadManager::get()->RemoveAllThreadsWereIdleListener(this);
-    }
-private:
-    nsRefPtr<ContentParent> mParent;
-    virtual ~NuwaFreezeListener()
-    {
-    }
-};
-#endif // MOZ_NUWA_PROCESS
-
 } // anonymous namespace
 
 void
@@ -2362,8 +2339,6 @@
         priority = PROCESS_PRIORITY_FOREGROUND;
     }
 
-    mSendPermissionUpdates = aTemplate->mSendPermissionUpdates;
-
     InitInternal(priority,
                  false, /* Setup Off-main thread compositing */
                  false  /* Send registered chrome */);
@@ -2426,6 +2401,18 @@
     // must come after the Open() call above.
     ProcessPriorityManager::SetProcessPriority(this, aInitialPriority);
 
+    if (gAppData) {
+        nsCString version(gAppData->version);
+        nsCString buildID(gAppData->buildID);
+        nsCString name(gAppData->name);
+        nsCString UAName(gAppData->UAName);
+        nsCString ID(gAppData->ID);
+        nsCString vendor(gAppData->vendor);
+
+        // Sending all information to content process.
+        unused << SendAppInfo(version, buildID, name, UAName, ID, vendor);
+    }
+
     if (aSetupOffMainThreadCompositing) {
         // NB: internally, this will send an IPC message to the child
         // process to get it to create the CompositorChild.  This
@@ -2457,15 +2444,8 @@
     }
 
     if (gAppData) {
-        nsCString version(gAppData->version);
-        nsCString buildID(gAppData->buildID);
-        nsCString name(gAppData->name);
-        nsCString UAName(gAppData->UAName);
-        nsCString ID(gAppData->ID);
-        nsCString vendor(gAppData->vendor);
-
         // Sending all information to content process.
-        unused << SendAppInfo(version, buildID, name, UAName, ID, vendor);
+        unused << SendAppInit();
     }
 
     nsStyleSheetService *sheetService = nsStyleSheetService::GetInstance();
@@ -2522,7 +2502,7 @@
 
 #ifdef MOZ_NUWA_PROCESS
 bool
-ContentParent::IsNuwaProcess() const
+ContentParent::IsNuwaProcess()
 {
     return mIsNuwaProcess;
 }
@@ -2548,7 +2528,7 @@
 ContentParent::RecvReadFontList(InfallibleTArray<FontListEntry>* retValue)
 {
 #ifdef ANDROID
-    gfxAndroidPlatform::GetPlatform()->GetFontList(retValue);
+    gfxAndroidPlatform::GetPlatform()->GetSystemFontList(retValue);
 #endif
     return true;
 }
@@ -2898,19 +2878,6 @@
 }
 
 bool
-ContentParent::RecvNuwaWaitForFreeze()
-{
-#ifdef MOZ_NUWA_PROCESS
-    nsRefPtr<NuwaFreezeListener> listener = new NuwaFreezeListener(this);
-    nsThreadManager::get()->AddAllThreadsWereIdleListener(listener);
-    return true;
-#else // MOZ_NUWA_PROCESS
-    NS_ERROR("ContentParent::RecvNuwaWaitForFreeze() not implemented!");
-    return false;
-#endif // MOZ_NUWA_PROCESS
-}
-
-bool
 ContentParent::RecvAddNewProcess(const uint32_t& aPid,
                                  InfallibleTArray<ProtocolFdMapping>&& aFds)
 {
@@ -4283,7 +4250,7 @@
     if (!principal) {
       return true;
     }
-    principal->GetOrigin(getter_Copies(origin));
+    principal->GetOrigin(origin);
     nsRefPtr<nsGeolocationSettings> gs = nsGeolocationSettings::GetGeolocationSettings();
     if (gs) {
       gs->PutWatchOrigin(mGeolocationWatchID, origin);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/ContentParent.h firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/ContentParent.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/ContentParent.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/ContentParent.h	2015-05-25 20:43:38.000000000 +0000
@@ -233,7 +233,7 @@
       return mIsForBrowser;
     }
 #ifdef MOZ_NUWA_PROCESS
-    bool IsNuwaProcess() const;
+    bool IsNuwaProcess();
 #endif
 
     GeckoChildProcessHost* Process() {
@@ -247,11 +247,7 @@
     }
 
     bool NeedsPermissionsUpdate() const {
-#ifdef MOZ_NUWA_PROCESS
-        return !IsNuwaProcess() && mSendPermissionUpdates;
-#else
         return mSendPermissionUpdates;
-#endif
     }
 
     bool NeedsDataStoreInfos() const {
@@ -783,8 +779,6 @@
 
     virtual bool RecvNuwaReady() override;
 
-    virtual bool RecvNuwaWaitForFreeze() override;
-
     virtual bool RecvAddNewProcess(const uint32_t& aPid,
                                    InfallibleTArray<ProtocolFdMapping>&& aFds) override;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/ContentProcess.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/ContentProcess.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/ContentProcess.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/ContentProcess.cpp	2015-05-25 20:43:38.000000000 +0000
@@ -10,6 +10,7 @@
 
 #if defined(XP_WIN) && defined(MOZ_CONTENT_SANDBOX)
 #include "mozilla/Preferences.h"
+#include "mozilla/WindowsVersion.h"
 #include "nsDirectoryService.h"
 #include "nsDirectoryServiceDefs.h"
 #endif
@@ -20,72 +21,48 @@
 namespace dom {
 
 #if defined(XP_WIN) && defined(MOZ_CONTENT_SANDBOX)
-static already_AddRefed<nsIFile>
-GetLowIntegrityTemp()
-{
-  MOZ_ASSERT(nsDirectoryService::gService,
-    "GetLowIntegrityTemp relies on nsDirectoryService being initialized");
-
-  // A low integrity temp only currently makes sense for sandbox pref level 1.
-  if (Preferences::GetInt("security.sandbox.content.level") != 1) {
-    return nullptr;
-  }
-
-  nsCOMPtr<nsIFile> lowIntegrityTemp;
-  nsresult rv = nsDirectoryService::gService->Get(NS_WIN_LOW_INTEGRITY_TEMP,
-                                                  NS_GET_IID(nsIFile),
-                                                  getter_AddRefs(lowIntegrityTemp));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return nullptr;
-  }
-
-  return lowIntegrityTemp.forget();
-}
-
 static void
 SetUpSandboxEnvironment()
 {
   MOZ_ASSERT(nsDirectoryService::gService,
     "SetUpSandboxEnvironment relies on nsDirectoryService being initialized");
 
-  // Setup to use a low integrity temp if available.
-  nsCOMPtr<nsIFile> lowIntegrityTemp = GetLowIntegrityTemp();
-  if (!lowIntegrityTemp) {
+  // A low integrity temp only currently makes sense for Vista or Later and
+  // sandbox pref level 1.
+  if (!IsVistaOrLater() ||
+      Preferences::GetInt("security.sandbox.content.level") != 1) {
     return;
   }
 
-  // Undefine returns a failure if the property is not already set.
-  unused << nsDirectoryService::gService->Undefine(NS_OS_TEMP_DIR);
-  nsresult rv = nsDirectoryService::gService->Set(NS_OS_TEMP_DIR, lowIntegrityTemp);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
+  nsAdoptingString tempDirSuffix =
+    Preferences::GetString("security.sandbox.content.tempDirSuffix");
+  if (tempDirSuffix.IsEmpty()) {
+    NS_WARNING("Low integrity temp suffix pref not set.");
     return;
   }
 
-  // Set TEMP and TMP environment variables.
-  nsAutoString lowIntegrityTempPath;
-  rv = lowIntegrityTemp->GetPath(lowIntegrityTempPath);
+  // Get the base low integrity Mozilla temp directory.
+  nsCOMPtr<nsIFile> lowIntegrityTemp;
+  nsresult rv = nsDirectoryService::gService->Get(NS_WIN_LOW_INTEGRITY_TEMP_BASE,
+                                                  NS_GET_IID(nsIFile),
+                                                  getter_AddRefs(lowIntegrityTemp));
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return;
   }
 
-  bool setOK = SetEnvironmentVariableW(L"TEMP", lowIntegrityTempPath.get());
-  NS_WARN_IF_FALSE(setOK, "Failed to set TEMP to low integrity temp path");
-  setOK = SetEnvironmentVariableW(L"TMP", lowIntegrityTempPath.get());
-  NS_WARN_IF_FALSE(setOK, "Failed to set TMP to low integrity temp path");
-}
-
-static void
-CleanUpSandboxEnvironment()
-{
-  // Remove low integrity temp if it exists.
-  nsCOMPtr<nsIFile> lowIntegrityTemp = GetLowIntegrityTemp();
-  if (!lowIntegrityTemp) {
+  // Append our profile specific temp name.
+  rv = lowIntegrityTemp->Append(NS_LITERAL_STRING("Temp-") + tempDirSuffix);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
     return;
   }
 
-  // Don't check the return value as the directory will only have been created
-  // if it has been used.
-  unused << lowIntegrityTemp->Remove(/* aRecursive */ true);
+  // Change the gecko defined temp directory to our low integrity one.
+  // Undefine returns a failure if the property is not already set.
+  unused << nsDirectoryService::gService->Undefine(NS_OS_TEMP_DIR);
+  rv = nsDirectoryService::gService->Set(NS_OS_TEMP_DIR, lowIntegrityTemp);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return;
+  }
 }
 #endif
 
@@ -111,12 +88,11 @@
     return true;
 }
 
+// Note: CleanUp() never gets called in non-debug builds because we exit early
+// in ContentChild::ActorDestroy().
 void
 ContentProcess::CleanUp()
 {
-#if defined(XP_WIN) && defined(MOZ_CONTENT_SANDBOX)
-    CleanUpSandboxEnvironment();
-#endif
     mXREEmbed.Stop();
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/FilePickerParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/FilePickerParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/FilePickerParent.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/FilePickerParent.cpp	2015-05-25 20:43:39.000000000 +0000
@@ -8,7 +8,6 @@
 #include "nsComponentManagerUtils.h"
 #include "nsNetCID.h"
 #include "nsIDocument.h"
-#include "nsIDOMFile.h"
 #include "nsIDOMWindow.h"
 #include "nsIFile.h"
 #include "nsISimpleEnumerator.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/FilePickerParent.h firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/FilePickerParent.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/FilePickerParent.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/FilePickerParent.h	2015-05-25 20:43:39.000000000 +0000
@@ -7,7 +7,6 @@
 #ifndef mozilla_dom_FilePickerParent_h
 #define mozilla_dom_FilePickerParent_h
 
-#include "nsIDOMFile.h"
 #include "nsIEventTarget.h"
 #include "nsIFilePicker.h"
 #include "nsCOMArray.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/jar.mn firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/jar.mn
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/jar.mn	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/jar.mn	2015-05-25 20:43:39.000000000 +0000
@@ -12,4 +12,3 @@
         content/global/manifestMessages.js (manifestMessages.js)
         content/global/PushServiceChildPreload.js (../push/PushServiceChildPreload.js)
         content/global/preload.js (preload.js)
-        content/global/post-fork-preload.js (post-fork-preload.js)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/PBrowser.ipdl firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/PBrowser.ipdl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/PBrowser.ipdl	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/PBrowser.ipdl	2015-05-25 20:43:39.000000000 +0000
@@ -60,6 +60,7 @@
 using nsIWidget::TouchPointerState from "nsIWidget.h";
 using struct LookAndFeelInt from "mozilla/widget/WidgetMessageUtils.h";
 using struct mozilla::OwningSerializedStructuredCloneBuffer from "ipc/IPCMessageUtils.h";
+using nsEventStatus from "mozilla/EventForwards.h";
 
 namespace mozilla {
 namespace dom {
@@ -348,6 +349,11 @@
     sync GetDefaultScale() returns (double value);
 
     /**
+     * Gets maximum of touch points at current device.
+     */
+    sync GetMaxTouchPoints() returns (uint32_t value);
+
+    /**
      * Set the native cursor.
      * @param value
      *   The widget cursor to set.
@@ -357,6 +363,30 @@
      */
     SetCursor(uint32_t value, bool force);
 
+    /**
+     * Set the native cursor using a custom image.
+     * @param cursorData
+     *   Serialized image data.
+     * @param width
+     *   Width of the image.
+     * @param height
+     *   Height of the image.
+     * @param stride
+     *   Stride used in the image data.
+     * @param format
+     *   Image format, see gfx::SurfaceFormat for possible values.
+     * @param hotspotX
+     *   Horizontal hotspot of the image, as specified by the css cursor property.
+     * @param hotspotY
+     *   Vertical hotspot of the image, as specified by the css cursor property.
+     * @param force
+     *   Invalidate any locally cached cursor settings and force an
+     *   update.
+     */
+    SetCustomCursor(nsCString cursorData, uint32_t width, uint32_t height,
+                    uint32_t stride, uint8_t format,
+                    uint32_t hotspotX, uint32_t hotspotY, bool force);
+
     SetBackgroundColor(nscolor color);
 
     /**
@@ -589,8 +619,14 @@
     RealMouseButtonEvent(WidgetMouseEvent event);
     RealKeyEvent(WidgetKeyboardEvent event, MaybeNativeKeyBinding keyBinding);
     MouseWheelEvent(WidgetWheelEvent event, ScrollableLayerGuid aGuid, uint64_t aInputBlockId);
-    RealTouchEvent(WidgetTouchEvent aEvent, ScrollableLayerGuid aGuid, uint64_t aInputBlockId);
-    RealTouchMoveEvent(WidgetTouchEvent aEvent, ScrollableLayerGuid aGuid, uint64_t aInputBlockId);
+    RealTouchEvent(WidgetTouchEvent aEvent,
+                   ScrollableLayerGuid aGuid,
+                   uint64_t aInputBlockId,
+                   nsEventStatus aApzResponse);
+    RealTouchMoveEvent(WidgetTouchEvent aEvent,
+                       ScrollableLayerGuid aGuid,
+                       uint64_t aInputBlockId,
+                       nsEventStatus aApzResponse);
     RealDragEvent(WidgetDragEvent aEvent, uint32_t aDragAction, uint32_t aDropEffect);
 
     /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/PContent.ipdl firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/PContent.ipdl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/PContent.ipdl	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/PContent.ipdl	2015-05-25 20:43:39.000000000 +0000
@@ -565,6 +565,7 @@
 
     AppInfo(nsCString version, nsCString buildID, nsCString name, nsCString UAName,
             nsCString ID, nsCString vendor);
+    AppInit();
 
     // Notify child that last-pb-context-exited notification was observed
     LastPrivateDocShellDestroyed();
@@ -631,7 +632,6 @@
     InvokeDragSession(IPCDataTransfer[] transfers, uint32_t action);
 
     EndDragSession(bool aDoneDrag, bool aUserCancelled);
-    NuwaFreeze();
 
     async DomainSetChanged(uint32_t aSetType, uint32_t aChangeType, OptionalURIParams aDomain);
 
@@ -898,9 +898,6 @@
     async SystemMessageHandled();
 
     NuwaReady();
-    // Sent when nuwa finished its initialization process and is waiting for
-    // parent's signal to make it freeze.
-    NuwaWaitForFreeze();
 
     sync AddNewProcess(uint32_t pid, ProtocolFdMapping[] aFds);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/post-fork-preload.js firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/post-fork-preload.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/post-fork-preload.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/post-fork-preload.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-// Preload some things, in an attempt to make app startup faster.
-//
-// This script is run when the preallocated process starts.  It is injected as
-// a frame script.
-// If Nuwa process is enabled, this script will run in preallocated process
-// forked by Nuwa.
-
-(function (global) {
-  "use strict";
-
-  Components.utils.import("resource://gre/modules/AppsServiceChild.jsm");
-  Components.classes["@mozilla.org/network/protocol-proxy-service;1"].
-    getService(Ci["nsIProtocolProxyService"]);
-
-  DOMApplicationRegistry.resetList();
-})(this);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/PreallocatedProcessManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/PreallocatedProcessManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/PreallocatedProcessManager.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/PreallocatedProcessManager.cpp	2015-05-25 20:43:39.000000000 +0000
@@ -18,6 +18,10 @@
 #include "ipc/Nuwa.h"
 #endif
 
+#ifdef MOZ_B2G_LOADER
+#include "ProcessUtils.h"
+#endif
+
 // This number is fairly arbitrary ... the intention is to put off
 // launching another app process until the last one has finished
 // loading its content, to reduce CPU/memory/IO contention.
@@ -133,7 +137,14 @@
     os->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID,
                     /* weakRef = */ false);
   }
-  RereadPrefs();
+#ifdef MOZ_B2G_LOADER
+  if (!mozilla::ipc::ProcLoaderIsInitialized()) {
+    Disable();
+  } else
+#endif
+  {
+    RereadPrefs();
+  }
 }
 
 NS_IMETHODIMP
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/preload.js firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/preload.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/preload.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/preload.js	2015-05-25 20:43:39.000000000 +0000
@@ -6,7 +6,6 @@
 //
 // This script is run when the preallocated process starts.  It is injected as
 // a frame script.
-// If nuwa is enabled, this script will run in Nuwa process before frozen.
 
 const BrowserElementIsPreloaded = true;
 
@@ -59,6 +58,7 @@
   Cc["@mozilla.org/network/idn-service;1"].getService(Ci["nsIIDNService"]);
   Cc["@mozilla.org/network/io-service;1"].getService(Ci["nsIIOService2"]);
   Cc["@mozilla.org/network/mime-hdrparam;1"].getService(Ci["nsIMIMEHeaderParam"]);
+  Cc["@mozilla.org/network/protocol-proxy-service;1"].getService(Ci["nsIProtocolProxyService"]);
   Cc["@mozilla.org/network/socket-transport-service;1"].getService(Ci["nsISocketTransportService"]);
   Cc["@mozilla.org/network/stream-transport-service;1"].getService(Ci["nsIStreamTransportService"]);
   Cc["@mozilla.org/network/url-parser;1?auth=maybe"].getService(Ci["nsIURLParser"]);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/ProcessPriorityManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/ProcessPriorityManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/ProcessPriorityManager.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/ProcessPriorityManager.cpp	2015-05-25 20:43:39.000000000 +0000
@@ -15,7 +15,7 @@
 #include "mozilla/Services.h"
 #include "mozilla/unused.h"
 #include "AudioChannelService.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsPrintfCString.h"
 #include "nsXULAppAPI.h"
 #include "nsIFrameLoader.h"
@@ -38,8 +38,6 @@
 #undef LOG
 #endif
 
-#include <utility>
-
 // Use LOGP inside a ParticularProcessPriorityManager method; use LOG
 // everywhere else.  LOGP prints out information about the particular process
 // priority manager.
@@ -69,8 +67,7 @@
        fmt "\n", \
        NameWithComma().get(), \
        static_cast<uint64_t>(ChildID()), Pid(), ##__VA_ARGS__)
-
-#elif defined(PR_LOGGING)
+#else
   static PRLogModuleInfo*
   GetPPMLog()
   {
@@ -80,16 +77,13 @@
     return sLog;
   }
 #  define LOG(fmt, ...) \
-     PR_LOG(GetPPMLog(), PR_LOG_DEBUG, \
+     MOZ_LOG(GetPPMLog(), PR_LOG_DEBUG, \
             ("ProcessPriorityManager - " fmt, ##__VA_ARGS__))
 #  define LOGP(fmt, ...) \
-     PR_LOG(GetPPMLog(), PR_LOG_DEBUG, \
+     MOZ_LOG(GetPPMLog(), PR_LOG_DEBUG, \
             ("ProcessPriorityManager[%schild-id=%" PRIu64 ", pid=%d] - " fmt, \
             NameWithComma().get(), \
             static_cast<uint64_t>(ChildID()), Pid(), ##__VA_ARGS__))
-#else
-#define LOG(fmt, ...)
-#define LOGP(fmt, ...)
 #endif
 
 using namespace mozilla;
@@ -208,26 +202,6 @@
    */
   void Unfreeze();
 
-  /**
-   * Return the number of processes that have
-   * PROCESS_PRIORITY_FOREGROUND priority.
-   */
-  uint32_t NumberOfForegroundProcesses();
-
-  /**
-   * Register a priority change to be performed at later time.
-   */
-  void ScheduleDelayedSetPriority(
-    ParticularProcessPriorityManager* aParticularManager,
-    hal::ProcessPriority aPriority);
-
-  /**
-   * Perform the registered priority change unless
-   * aLastParticularManager is the same as the registered one.
-   */
-  void PerformDelayedSetPriority(
-    ParticularProcessPriorityManager* aLastParticularManager);
-
 private:
   static bool sPrefListenersRegistered;
   static bool sInitialized;
@@ -247,6 +221,7 @@
 
   void ObserveContentParentCreated(nsISupports* aContentParent);
   void ObserveContentParentDestroyed(nsISupports* aSubject);
+  void ObserveScreenStateChanged(const char16_t* aData);
 
   nsDataHashtable<nsUint64HashKey, nsRefPtr<ParticularProcessPriorityManager> >
     mParticularManagers;
@@ -262,10 +237,6 @@
 
   /** Contains a pseudo-LRU list of foreground processes */
   ProcessLRUPool mForegroundLRUPool;
-
-  /** Contains the delayed priority change request */
-  std::pair<nsRefPtr<ParticularProcessPriorityManager>, hal::ProcessPriority>
-    mDelayedSetPriority;
 };
 
 /**
@@ -455,7 +426,6 @@
 {
   MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
   RegisterWakeLockObserver(this);
-  mDelayedSetPriority = std::make_pair(nullptr, PROCESS_PRIORITY_UNKNOWN);
 }
 
 ProcessPriorityManagerImpl::~ProcessPriorityManagerImpl()
@@ -477,6 +447,7 @@
   if (os) {
     os->AddObserver(this, "ipc:content-created", /* ownsWeak */ false);
     os->AddObserver(this, "ipc:content-shutdown", /* ownsWeak */ false);
+    os->AddObserver(this, "screen-state-changed", /* ownsWeak */ false);
   }
 }
 
@@ -491,6 +462,8 @@
     ObserveContentParentCreated(aSubject);
   } else if (topic.EqualsLiteral("ipc:content-shutdown")) {
     ObserveContentParentDestroyed(aSubject);
+  } else if (topic.EqualsLiteral("screen-state-changed")) {
+    ObserveScreenStateChanged(aData);
   } else {
     MOZ_ASSERT(false);
   }
@@ -572,10 +545,40 @@
     if (mHighPriorityChildIDs.Contains(childID)) {
       mHighPriorityChildIDs.RemoveEntry(childID);
     }
+  }
+}
 
-    if (mDelayedSetPriority.first == pppm) {
-      mDelayedSetPriority = std::make_pair(nullptr, PROCESS_PRIORITY_UNKNOWN);
-    }
+static PLDHashOperator
+FreezeParticularProcessPriorityManagers(
+  const uint64_t& aKey,
+  nsRefPtr<ParticularProcessPriorityManager> aValue,
+  void* aUserData)
+{
+  aValue->Freeze();
+  return PL_DHASH_NEXT;
+}
+
+static PLDHashOperator
+UnfreezeParticularProcessPriorityManagers(
+  const uint64_t& aKey,
+  nsRefPtr<ParticularProcessPriorityManager> aValue,
+  void* aUserData)
+{
+  aValue->Unfreeze();
+  return PL_DHASH_NEXT;
+}
+
+void
+ProcessPriorityManagerImpl::ObserveScreenStateChanged(const char16_t* aData)
+{
+  if (NS_LITERAL_STRING("on").Equals(aData)) {
+    sFrozen = false;
+    mParticularManagers.EnumerateRead(
+      &UnfreezeParticularProcessPriorityManagers, nullptr);
+  } else {
+    sFrozen = true;
+    mParticularManagers.EnumerateRead(
+      &FreezeParticularProcessPriorityManagers, nullptr);
   }
 }
 
@@ -638,91 +641,6 @@
   }
 }
 
-static PLDHashOperator
-FreezeParticularProcessPriorityManagers(
-  const uint64_t& aKey,
-  nsRefPtr<ParticularProcessPriorityManager> aValue,
-  void* aUserData)
-{
-  aValue->Freeze();
-  return PL_DHASH_NEXT;
-}
-
-void
-ProcessPriorityManagerImpl::Freeze()
-{
-  sFrozen = true;
-  mParticularManagers.EnumerateRead(&FreezeParticularProcessPriorityManagers,
-                                    nullptr);
-}
-
-static PLDHashOperator
-UnfreezeParticularProcessPriorityManagers(
-  const uint64_t& aKey,
-  nsRefPtr<ParticularProcessPriorityManager> aValue,
-  void* aUserData)
-{
-  aValue->Unfreeze();
-  return PL_DHASH_NEXT;
-}
-
-void
-ProcessPriorityManagerImpl::Unfreeze()
-{
-  sFrozen = false;
-  mParticularManagers.EnumerateRead(&UnfreezeParticularProcessPriorityManagers,
-                                    nullptr);
-}
-
-static PLDHashOperator
-CountNumberOfForegroundProcesses(
-  const uint64_t& aKey,
-  nsRefPtr<ParticularProcessPriorityManager> aValue,
-  void* aUserData)
-{
-  uint32_t* accumulator = static_cast<uint32_t*>(aUserData);
-  if (aValue->CurrentPriority() == PROCESS_PRIORITY_FOREGROUND ||
-      aValue->CurrentPriority() == PROCESS_PRIORITY_FOREGROUND_HIGH) {
-    (*accumulator)++;
-  }
-  return PL_DHASH_NEXT;
-}
-
-uint32_t
-ProcessPriorityManagerImpl::NumberOfForegroundProcesses()
-{
-  uint32_t accumulator = 0;
-  mParticularManagers.EnumerateRead(&CountNumberOfForegroundProcesses,
-                                    &accumulator);
-  return accumulator;
-}
-
-void
-ProcessPriorityManagerImpl::ScheduleDelayedSetPriority(
-  ParticularProcessPriorityManager* aParticularManager,
-  ProcessPriority aPriority)
-{
-  mDelayedSetPriority = std::make_pair(aParticularManager, aPriority);
-}
-
-void
-ProcessPriorityManagerImpl::PerformDelayedSetPriority(
-  ParticularProcessPriorityManager* aLastParticularManager)
-{
-  nsRefPtr<ParticularProcessPriorityManager> pppm = mDelayedSetPriority.first;
-  ProcessPriority priority = mDelayedSetPriority.second;
-
-  mDelayedSetPriority = std::make_pair(nullptr, PROCESS_PRIORITY_UNKNOWN);
-
-  if (pppm == aLastParticularManager) {
-    return;
-  }
-
-  if (pppm && priority != PROCESS_PRIORITY_UNKNOWN) {
-    pppm->SetPriorityNow(priority);
-  }
-}
-
 NS_IMPL_ISUPPORTS(ParticularProcessPriorityManager,
                   nsIObserver,
                   nsITimerCallback,
@@ -936,6 +854,10 @@
   nsCOMPtr<nsIFrameLoader> fl = do_QueryInterface(aSubject);
   NS_ENSURE_TRUE_VOID(fl);
 
+  if (mFrozen) {
+    return; // Ignore visibility changes when the screen is off
+  }
+
   TabParent* tp = TabParent::GetFrom(fl);
   if (!tp) {
     return;
@@ -1090,9 +1012,7 @@
     return PROCESS_PRIORITY_BACKGROUND_PERCEIVABLE;
   }
 
-  return HasAppType("homescreen") ?
-         PROCESS_PRIORITY_BACKGROUND_HOMESCREEN :
-         PROCESS_PRIORITY_BACKGROUND;
+  return PROCESS_PRIORITY_BACKGROUND;
 }
 
 void
@@ -1129,20 +1049,6 @@
 
   ProcessPriority oldPriority = mPriority;
 
-  if (oldPriority == PROCESS_PRIORITY_FOREGROUND &&
-      aPriority < PROCESS_PRIORITY_FOREGROUND &&
-      ProcessPriorityManagerImpl::GetSingleton()->
-        NumberOfForegroundProcesses() == 1) {
-    LOGP("Attempting to demote the last foreground process is delayed.");
-
-    ProcessPriorityManagerImpl::GetSingleton()->
-      ScheduleDelayedSetPriority(this, aPriority);
-
-    FireTestOnlyObserverNotification("process-priority-delayed",
-      ProcessPriorityToString(aPriority));
-    return;
-  }
-
   mPriority = aPriority;
   hal::SetProcessPriority(Pid(), mPriority);
 
@@ -1159,12 +1065,6 @@
 
   FireTestOnlyObserverNotification("process-priority-set",
     ProcessPriorityToString(mPriority));
-
-  if (aPriority >= PROCESS_PRIORITY_FOREGROUND) {
-    LOGP("More than one foreground processes. Run delayed priority change");
-    ProcessPriorityManagerImpl::GetSingleton()->
-      PerformDelayedSetPriority(this);
-  }
 }
 
 void
@@ -1177,7 +1077,6 @@
 ParticularProcessPriorityManager::Unfreeze()
 {
   mFrozen = false;
-  ResetPriorityNow();
 }
 
 void
@@ -1485,24 +1384,4 @@
   }
 }
 
-/* static */ void
-ProcessPriorityManager::Freeze()
-{
-  ProcessPriorityManagerImpl* singleton =
-    ProcessPriorityManagerImpl::GetSingleton();
-  if (singleton) {
-    singleton->Freeze();
-  }
-}
-
-/* static */ void
-ProcessPriorityManager::Unfreeze()
-{
-  ProcessPriorityManagerImpl* singleton =
-    ProcessPriorityManagerImpl::GetSingleton();
-  if (singleton) {
-    singleton->Unfreeze();
-  }
-}
-
 } // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/ProcessPriorityManager.h firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/ProcessPriorityManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/ProcessPriorityManager.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/ProcessPriorityManager.h	2015-05-25 20:43:39.000000000 +0000
@@ -74,17 +74,6 @@
    */
   static bool AnyProcessHasHighPriority();
 
-  /**
-   * Prevents processes from changing priority until unfrozen.
-   */
-  static void Freeze();
-
-  /**
-   * Allow process' priorities to change again.  This will immediately adjust
-   * processes whose priority change did not happen because of the freeze.
-   */
-  static void Unfreeze();
-
 private:
   ProcessPriorityManager();
   DISALLOW_EVIL_CONSTRUCTORS(ProcessPriorityManager);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/TabChild.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/TabChild.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/TabChild.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/TabChild.cpp	2015-05-25 20:43:39.000000000 +0000
@@ -88,6 +88,7 @@
 #include "nsNetUtil.h"
 #include "nsIPermissionManager.h"
 #include "nsIScriptError.h"
+#include "mozilla/EventForwards.h"
 
 #define BROWSER_ELEMENT_CHILD_SCRIPT \
     NS_LITERAL_STRING("chrome://global/content/BrowserElementChild.js")
@@ -336,11 +337,26 @@
 
   FrameMetrics metrics(mLastRootMetrics);
   metrics.SetViewport(CSSRect(CSSPoint(), viewport));
+
+  // Calculate the composition bounds based on mInnerSize, excluding the sizes
+  // of the scrollbars if they are not overlay scrollbars.
+  ScreenSize compositionSize(mInnerSize);
+  nsCOMPtr<nsIPresShell> shell = GetPresShell();
+  if (shell) {
+    nsMargin scrollbarsAppUnits =
+        nsLayoutUtils::ScrollbarAreaToExcludeFromCompositionBoundsFor(shell->GetRootScrollFrame());
+    // Scrollbars are not subject to scaling, so CSS pixels = screen pixels for them.
+    ScreenMargin scrollbars = CSSMargin::FromAppUnits(scrollbarsAppUnits)
+                            * CSSToScreenScale(1.0f);
+    compositionSize.width -= scrollbars.LeftRight();
+    compositionSize.height -= scrollbars.TopBottom();
+  }
+
   metrics.SetCompositionBounds(ParentLayerRect(
       ParentLayerPoint(),
-      ParentLayerSize(ViewAs<ParentLayerPixel>(mInnerSize, PixelCastJustification::ScreenIsParentLayerForRoot))));
+      ParentLayerSize(ViewAs<ParentLayerPixel>(compositionSize, PixelCastJustification::ScreenIsParentLayerForRoot))));
   metrics.SetRootCompositionSize(
-      ScreenSize(mInnerSize) * ScreenToLayoutDeviceScale(1.0f) / metrics.GetDevPixelsPerCSSPixel());
+      ScreenSize(compositionSize) * ScreenToLayoutDeviceScale(1.0f) / metrics.GetDevPixelsPerCSSPixel());
 
   // This change to the zoom accounts for all types of changes I can conceive:
   // 1. screen size changes, CSS viewport does not (pages with no meta viewport
@@ -361,7 +377,6 @@
 
   // Changing the zoom when we're not doing a first paint will get ignored
   // by AsyncPanZoomController and causes a blurry flash.
-  nsCOMPtr<nsIPresShell> shell = GetPresShell();
   bool isFirstPaint = true;
   if (shell) {
     isFirstPaint = shell->GetIsFirstPaint();
@@ -774,21 +789,6 @@
     ClearOnShutdown(&sPreallocatedTab);
 }
 
-/*static*/ void
-TabChild::PostForkPreload()
-{
-    // Preallocated Tab can be null if we are forked directly from b2g. In such
-    // case we don't need to preload anything, just return.
-    if (!sPreallocatedTab) {
-        return;
-    }
-
-    // Rebuild connections to parent.
-    sPreallocatedTab->RecvLoadRemoteScript(
-      NS_LITERAL_STRING("chrome://global/content/post-fork-preload.js"),
-      true);
-}
-
 /*static*/ already_AddRefed<TabChild>
 TabChild::Create(nsIContentChild* aManager,
                  const TabId& aTabId,
@@ -2379,7 +2379,8 @@
 bool
 TabChild::RecvRealTouchEvent(const WidgetTouchEvent& aEvent,
                              const ScrollableLayerGuid& aGuid,
-                             const uint64_t& aInputBlockId)
+                             const uint64_t& aInputBlockId,
+                             const nsEventStatus& aApzResponse)
 {
   TABC_LOG("Receiving touch event of type %d\n", aEvent.message);
 
@@ -2407,17 +2408,17 @@
     return true;
   }
 
-  mAPZEventState->ProcessTouchEvent(localEvent, aGuid, aInputBlockId,
-                                    nsEventStatus_eIgnore);
+  mAPZEventState->ProcessTouchEvent(localEvent, aGuid, aInputBlockId, aApzResponse);
   return true;
 }
 
 bool
 TabChild::RecvRealTouchMoveEvent(const WidgetTouchEvent& aEvent,
                                  const ScrollableLayerGuid& aGuid,
-                                 const uint64_t& aInputBlockId)
+                                 const uint64_t& aInputBlockId,
+                                 const nsEventStatus& aApzResponse)
 {
-  return RecvRealTouchEvent(aEvent, aGuid, aInputBlockId);
+  return RecvRealTouchEvent(aEvent, aGuid, aInputBlockId, aApzResponse);
 }
 
 bool
@@ -2967,6 +2968,13 @@
 }
 
 void
+TabChild::GetMaxTouchPoints(uint32_t* aTouchPoints)
+{
+  // Fallback to a sync call.
+  SendGetMaxTouchPoints(aTouchPoints);
+}
+
+void
 TabChild::NotifyPainted()
 {
     if (!mNotified) {
@@ -2978,17 +2986,23 @@
 void
 TabChild::MakeVisible()
 {
-    if (mWidget) {
-        mWidget->Show(true);
-    }
+  CompositorChild* compositor = CompositorChild::Get();
+  compositor->SendNotifyVisible(mLayersId);
+
+  if (mWidget) {
+    mWidget->Show(true);
+  }
 }
 
 void
 TabChild::MakeHidden()
 {
-    if (mWidget) {
-        mWidget->Show(false);
-    }
+  CompositorChild* compositor = CompositorChild::Get();
+  compositor->SendNotifyHidden(mLayersId);
+
+  if (mWidget) {
+    mWidget->Show(false);
+  }
 }
 
 void
@@ -3130,6 +3144,17 @@
   manager->DidComposite(aTransactionId);
 }
 
+void
+TabChild::ClearCachedResources()
+{
+  MOZ_ASSERT(mWidget);
+  MOZ_ASSERT(mWidget->GetLayerManager());
+  MOZ_ASSERT(mWidget->GetLayerManager()->GetBackendType() == LayersBackend::LAYERS_CLIENT);
+
+  ClientLayerManager *manager = static_cast<ClientLayerManager*>(mWidget->GetLayerManager());
+  manager->ClearCachedResources();
+}
+
 NS_IMETHODIMP
 TabChild::OnShowTooltip(int32_t aXCoords, int32_t aYCoords, const char16_t *aTipText)
 {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/TabChild.h firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/TabChild.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/TabChild.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/TabChild.h	2015-05-25 20:43:39.000000000 +0000
@@ -263,7 +263,6 @@
      * on the critical path.
      */
     static void PreloadSlowThings();
-    static void PostForkPreload();
 
     /** Return a TabChild with the given attributes. */
     static already_AddRefed<TabChild>
@@ -363,10 +362,12 @@
                                      const uint64_t& aInputBlockId) override;
     virtual bool RecvRealTouchEvent(const WidgetTouchEvent& aEvent,
                                     const ScrollableLayerGuid& aGuid,
-                                    const uint64_t& aInputBlockId) override;
+                                    const uint64_t& aInputBlockId,
+                                    const nsEventStatus& aApzResponse) override;
     virtual bool RecvRealTouchMoveEvent(const WidgetTouchEvent& aEvent,
                                         const ScrollableLayerGuid& aGuid,
-                                        const uint64_t& aInputBlockId) override;
+                                        const uint64_t& aInputBlockId,
+                                        const nsEventStatus& aApzResponse) override;
     virtual bool RecvKeyEvent(const nsString& aType,
                               const int32_t&  aKeyCode,
                               const int32_t&  aCharCode,
@@ -429,6 +430,8 @@
     void GetDPI(float* aDPI);
     void GetDefaultScale(double *aScale);
 
+    void GetMaxTouchPoints(uint32_t* aTouchPoints);
+
     ScreenOrientation GetOrientation() { return mOrientation; }
 
     void SetBackgroundColor(const nscolor& aColor);
@@ -472,6 +475,7 @@
     static TabChild* GetFrom(uint64_t aLayersId);
 
     void DidComposite(uint64_t aTransactionId);
+    void ClearCachedResources();
 
     static inline TabChild*
     GetFrom(nsIDOMWindow* aWindow)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/TabMessageUtils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/TabMessageUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/TabMessageUtils.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/TabMessageUtils.h	2015-05-25 20:43:39.000000000 +0000
@@ -96,7 +96,14 @@
                                     mozilla::dom::AUDIO_CHANNEL_STATE_LAST>
 { };
 
-}
 
+template <>
+struct ParamTraits<nsEventStatus>
+  : public ContiguousEnumSerializer<nsEventStatus,
+                                    nsEventStatus_eIgnore,
+                                    nsEventStatus_eSentinel>
+{ };
+
+}
 
 #endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/TabParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/TabParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/TabParent.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/TabParent.cpp	2015-05-25 20:43:39.000000000 +0000
@@ -84,6 +84,8 @@
 #include "gfxPrefs.h"
 #include "nsILoginManagerPrompter.h"
 #include "nsPIWindowRoot.h"
+#include "gfxDrawable.h"
+#include "ImageOps.h"
 #include <algorithm>
 
 using namespace mozilla::dom;
@@ -284,6 +286,7 @@
   , mNeedLayerTreeReadyNotification(false)
   , mCursor(nsCursor(-1))
   , mTabSetsCursor(false)
+  , mHasContentOpener(false)
 {
   MOZ_ASSERT(aManager);
 }
@@ -609,6 +612,11 @@
   NS_ENSURE_SUCCESS(rv, false);
 
   TabParent* newTab = TabParent::GetFrom(aNewTab);
+  MOZ_ASSERT(newTab);
+
+  // Content has requested that we open this new content window, so
+  // we must have an opener.
+  newTab->SetHasContentOpener(true);
 
   nsCOMPtr<nsIContent> frame(do_QueryInterface(mFrameElement));
 
@@ -1223,7 +1231,9 @@
     if (event.message == NS_MOUSE_ENTER_WIDGET ||
         event.message == NS_MOUSE_OVER) {
       mTabSetsCursor = true;
-      if (mCursor != nsCursor(-1)) {
+      if (mCustomCursor) {
+        widget->SetCursor(mCustomCursor, mCustomCursorHotspotX, mCustomCursorHotspotY);
+      } else if (mCursor != nsCursor(-1)) {
         widget->SetCursor(mCursor);
       }
       // We don't actually want to forward NS_MOUSE_ENTER_WIDGET messages.
@@ -1303,7 +1313,7 @@
 
   ScrollableLayerGuid guid;
   uint64_t blockId;
-  ApzAwareEventRoutingToChild(&guid, &blockId);
+  ApzAwareEventRoutingToChild(&guid, &blockId, nullptr);
   event.refPoint += GetChildProcessOffset();
   return PBrowserParent::SendMouseWheelEvent(event, guid, blockId);
 }
@@ -1618,7 +1628,8 @@
 
   ScrollableLayerGuid guid;
   uint64_t blockId;
-  ApzAwareEventRoutingToChild(&guid, &blockId);
+  nsEventStatus apzResponse;
+  ApzAwareEventRoutingToChild(&guid, &blockId, &apzResponse);
 
   if (mIsDestroyed) {
     return false;
@@ -1630,8 +1641,8 @@
   }
 
   return (event.message == NS_TOUCH_MOVE) ?
-    PBrowserParent::SendRealTouchMoveEvent(event, guid, blockId) :
-    PBrowserParent::SendRealTouchEvent(event, guid, blockId);
+    PBrowserParent::SendRealTouchMoveEvent(event, guid, blockId, apzResponse) :
+    PBrowserParent::SendRealTouchEvent(event, guid, blockId, apzResponse);
 }
 
 bool
@@ -1703,6 +1714,7 @@
 TabParent::RecvSetCursor(const uint32_t& aCursor, const bool& aForce)
 {
   mCursor = static_cast<nsCursor>(aCursor);
+  mCustomCursor = nullptr;
 
   nsCOMPtr<nsIWidget> widget = GetWidget();
   if (widget) {
@@ -1717,6 +1729,46 @@
 }
 
 bool
+TabParent::RecvSetCustomCursor(const nsCString& aCursorData,
+                               const uint32_t& aWidth,
+                               const uint32_t& aHeight,
+                               const uint32_t& aStride,
+                               const uint8_t& aFormat,
+                               const uint32_t& aHotspotX,
+                               const uint32_t& aHotspotY,
+                               const bool& aForce)
+{
+  mCursor = nsCursor(-1);
+
+  nsCOMPtr<nsIWidget> widget = GetWidget();
+  if (widget) {
+    if (aForce) {
+      widget->ClearCachedCursor();
+    }
+
+    if (mTabSetsCursor) {
+      const gfxIntSize size(aWidth, aHeight);
+
+      mozilla::RefPtr<gfx::DataSourceSurface> customCursor = new mozilla::gfx::SourceSurfaceRawData();
+      mozilla::gfx::SourceSurfaceRawData* raw = static_cast<mozilla::gfx::SourceSurfaceRawData*>(customCursor.get());
+      raw->InitWrappingData(
+        reinterpret_cast<uint8_t*>(const_cast<nsCString&>(aCursorData).BeginWriting()),
+        size, aStride, static_cast<mozilla::gfx::SurfaceFormat>(aFormat), false);
+      raw->GuaranteePersistance();
+
+      nsRefPtr<gfxDrawable> drawable = new gfxSurfaceDrawable(customCursor, size);
+      nsCOMPtr<imgIContainer> cursorImage(image::ImageOps::CreateFromDrawable(drawable));
+      widget->SetCursor(cursorImage, aHotspotX, aHotspotY);
+      mCustomCursor = cursorImage;
+      mCustomCursorHotspotX = aHotspotX;
+      mCustomCursorHotspotY = aHotspotY;
+    }
+  }
+
+  return true;
+}
+
+bool
 TabParent::RecvSetBackgroundColor(const nscolor& aColor)
 {
   if (RenderFrameParent* frame = GetRenderFrame()) {
@@ -1894,6 +1946,15 @@
         (updatePreference.WantChangesCausedByComposition() ||
          !aCausedByComposition)) {
       IMENotification notification(NOTIFY_IME_OF_SELECTION_CHANGE);
+      notification.mSelectionChangeData.mOffset =
+        std::min(mIMESelectionAnchor, mIMESelectionFocus);
+      notification.mSelectionChangeData.mLength =
+        mIMESelectionAnchor > mIMESelectionFocus ?
+          mIMESelectionAnchor - mIMESelectionFocus :
+          mIMESelectionFocus - mIMESelectionAnchor;
+      notification.mSelectionChangeData.mReversed =
+        mIMESelectionFocus < mIMESelectionAnchor;
+      notification.mSelectionChangeData.SetWritingMode(mWritingMode);
       notification.mSelectionChangeData.mCausedByComposition =
         aCausedByComposition;
       widget->NotifyIME(notification);
@@ -2496,6 +2557,18 @@
 }
 
 bool
+TabParent::RecvGetMaxTouchPoints(uint32_t* aTouchPoints)
+{
+  nsCOMPtr<nsIWidget> widget = GetWidget();
+  if (widget) {
+    *aTouchPoints = widget->GetMaxTouchPoints();
+  } else {
+    *aTouchPoints = 0;
+  }
+  return true;
+}
+
+bool
 TabParent::RecvGetWidgetNativeData(WindowsHandle* aValue)
 {
   *aValue = 0;
@@ -2700,7 +2773,8 @@
 
 void
 TabParent::ApzAwareEventRoutingToChild(ScrollableLayerGuid* aOutTargetGuid,
-                                       uint64_t* aOutInputBlockId)
+                                       uint64_t* aOutInputBlockId,
+                                       nsEventStatus* aOutApzResponse)
 {
   if (gfxPrefs::AsyncPanZoomEnabled()) {
     if (aOutTargetGuid) {
@@ -2720,6 +2794,9 @@
     if (aOutInputBlockId) {
       *aOutInputBlockId = InputAPZContext::GetInputBlockId();
     }
+    if (aOutApzResponse) {
+      *aOutApzResponse = InputAPZContext::GetApzResponse();
+    }
 
     // Let the widget know that the event will be sent to the child process,
     // which will (hopefully) send a confirmation notice back to APZ.
@@ -2897,6 +2974,19 @@
   return NS_OK;
 }
 
+NS_IMETHODIMP
+TabParent::GetHasContentOpener(bool* aResult)
+{
+  *aResult = mHasContentOpener;
+  return NS_OK;
+}
+
+void
+TabParent::SetHasContentOpener(bool aHasContentOpener)
+{
+  mHasContentOpener = aHasContentOpener;
+}
+
 class LayerTreeUpdateRunnable final
   : public nsRunnable
 {
@@ -3069,15 +3159,16 @@
   NS_IMETHOD SetOriginalURI(nsIURI*) NO_IMPL
   NS_IMETHOD GetURI(nsIURI** aUri) override
   {
-    NS_IF_ADDREF(mUri);
-    *aUri = mUri;
+    nsCOMPtr<nsIURI> copy = mUri;
+    copy.forget(aUri);
     return NS_OK;
   }
   NS_IMETHOD GetOwner(nsISupports**) NO_IMPL
   NS_IMETHOD SetOwner(nsISupports*) NO_IMPL
   NS_IMETHOD GetLoadInfo(nsILoadInfo** aLoadInfo) override
   {
-    NS_IF_ADDREF(*aLoadInfo = mLoadInfo);
+    nsCOMPtr<nsILoadInfo> copy = mLoadInfo;
+    copy.forget(aLoadInfo);
     return NS_OK;
   }
   NS_IMETHOD SetLoadInfo(nsILoadInfo* aLoadInfo) override
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/TabParent.h firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/TabParent.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/TabParent.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/TabParent.h	2015-05-25 20:43:39.000000000 +0000
@@ -208,6 +208,14 @@
                                            nsTArray<nsCString>&& aEnabledCommands,
                                            nsTArray<nsCString>&& aDisabledCommands) override;
     virtual bool RecvSetCursor(const uint32_t& aValue, const bool& aForce) override;
+    virtual bool RecvSetCustomCursor(const nsCString& aUri,
+                                     const uint32_t& aWidth,
+                                     const uint32_t& aHeight,
+                                     const uint32_t& aStride,
+                                     const uint8_t& aFormat,
+                                     const uint32_t& aHotspotX,
+                                     const uint32_t& aHotspotY,
+                                     const bool& aForce) override;
     virtual bool RecvSetBackgroundColor(const nscolor& aValue) override;
     virtual bool RecvSetStatus(const uint32_t& aType, const nsString& aStatus) override;
     virtual bool RecvIsParentWindowMainWidgetVisible(bool* aIsVisible) override;
@@ -216,6 +224,7 @@
     virtual bool RecvGetTabOffset(LayoutDeviceIntPoint* aPoint) override;
     virtual bool RecvGetDPI(float* aValue) override;
     virtual bool RecvGetDefaultScale(double* aValue) override;
+    virtual bool RecvGetMaxTouchPoints(uint32_t* aTouchPoints) override;
     virtual bool RecvGetWidgetNativeData(WindowsHandle* aValue) override;
     virtual bool RecvZoomToRect(const uint32_t& aPresShellId,
                                 const ViewID& aViewId,
@@ -458,6 +467,8 @@
     bool InitBrowserConfiguration(const nsCString& aURI,
                                   BrowserConfiguration& aConfiguration);
 
+    void SetHasContentOpener(bool aHasContentOpener);
+
     // IME
     static TabParent *mIMETabParent;
     nsString mIMECacheText;
@@ -499,18 +510,17 @@
 
     // Update state prior to routing an APZ-aware event to the child process.
     // |aOutTargetGuid| will contain the identifier
-    // of the APZC instance that handled the event. aOutTargetGuid may be
-    // null.
+    // of the APZC instance that handled the event. aOutTargetGuid may be null.
     // |aOutInputBlockId| will contain the identifier of the input block
-    // that this event was added to, if there was one. aOutInputBlockId may
-    // be null.
+    // that this event was added to, if there was one. aOutInputBlockId may be null.
+    // |aOutApzResponse| will contain the response that the APZ gave when processing
+    // the input block; this is used for generating appropriate pointercancel events.
     void ApzAwareEventRoutingToChild(ScrollableLayerGuid* aOutTargetGuid,
-                                     uint64_t* aOutInputBlockId);
-    // When true, we've initiated normal shutdown and notified our
-    // managing PContent.
+                                     uint64_t* aOutInputBlockId,
+                                     nsEventStatus* aOutApzResponse);
+    // When true, we've initiated normal shutdown and notified our managing PContent.
     bool mMarkedDestroying;
-    // When true, the TabParent is invalid and we should not send IPC messages
-    // anymore.
+    // When true, the TabParent is invalid and we should not send IPC messages anymore.
     bool mIsDestroyed;
     // Whether we have already sent a FileDescriptor for the app package.
     bool mAppPackageFileDescriptorSent;
@@ -598,6 +608,8 @@
     // Cached cursor setting from TabChild.  When the cursor is over the tab,
     // it should take this appearance.
     nsCursor mCursor;
+    nsCOMPtr<imgIContainer> mCustomCursor;
+    uint32_t mCustomCursorHotspotX, mCustomCursorHotspotY;
 
     // True if the cursor changes from the TabChild should change the widget
     // cursor.  This happens whenever the cursor is in the tab's region.
@@ -605,6 +617,7 @@
 
     nsRefPtr<nsIPresShell> mPresShellWithRefreshListener;
 
+    bool mHasContentOpener;
 private:
     // This is used when APZ needs to find the TabParent associated with a layer
     // to dispatch events.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/tests/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/tests/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/ipc/tests/mochitest.ini	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/ipc/tests/mochitest.ini	2015-05-25 20:43:39.000000000 +0000
@@ -14,9 +14,9 @@
 [test_cpow_cookies.html]
 skip-if = buildapp == 'b2g' || buildapp == 'mulet'
 [test_NuwaProcessCreation.html]
-skip-if = toolkit != 'gonk'
+skip-if = true # bug 1166923
 [test_NuwaProcessDeadlock.html]
-skip-if = toolkit != 'gonk'
+skip-if = true # bug 1166923
 [test_child_docshell.html]
 skip-if = toolkit == 'cocoa' # disabled due to hangs, see changeset 6852e7c47edf
 [test_CrashService_crash.html]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/json/nsJSON.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/json/nsJSON.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/json/nsJSON.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/json/nsJSON.cpp	2015-05-25 20:43:39.000000000 +0000
@@ -186,7 +186,7 @@
 
   nsJSONWriter writer;
   JS::Rooted<JS::Value> vp(cx, *value);
-  if (!JS_Stringify(cx, &vp, JS::NullPtr(), JS::NullHandleValue, WriteCallback, &writer)) {
+  if (!JS_Stringify(cx, &vp, nullptr, JS::NullHandleValue, WriteCallback, &writer)) {
     return NS_ERROR_XPC_BAD_CONVERT_JS;
   }
   *value = vp;
@@ -245,7 +245,7 @@
     return NS_ERROR_INVALID_ARG;
 
   // We're good now; try to stringify
-  if (!JS_Stringify(cx, &val, JS::NullPtr(), JS::NullHandleValue, WriteCallback, writer))
+  if (!JS_Stringify(cx, &val, nullptr, JS::NullHandleValue, WriteCallback, writer))
     return NS_ERROR_FAILURE;
 
   return NS_OK;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/locales/en-US/chrome/dom/dom.properties firefox-trunk-41.0~a1~hg20150524r245419/dom/locales/en-US/chrome/dom/dom.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/locales/en-US/chrome/dom/dom.properties	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/locales/en-US/chrome/dom/dom.properties	2015-05-25 20:43:39.000000000 +0000
@@ -79,7 +79,6 @@
 FullScreenDeniedSubDocFullScreen=Request for full-screen was denied because a subdocument of the document requesting full-screen is already full-screen.
 FullScreenDeniedNotDescendant=Request for full-screen was denied because requesting element is not a descendant of the current full-screen element.
 FullScreenDeniedNotFocusedTab=Request for full-screen was denied because requesting element is not in the currently focused tab.
-FullScreenDeniedContentOnly=Request for full-screen was denied because requesting element is in the chrome document and the fullscreen API is configured for content only.
 RemovedFullScreenElement=Exited full-screen because full-screen element was removed from document.
 FocusedWindowedPluginWhileFullScreen=Exited full-screen because windowed plugin was focused.
 HTMLSyncXHRWarning=HTML parsing in XMLHttpRequest is not supported in the synchronous mode.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/ManifestImageObjectProcessor.jsm firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/ManifestImageObjectProcessor.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/ManifestImageObjectProcessor.jsm	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/ManifestImageObjectProcessor.jsm	2015-05-25 20:43:39.000000000 +0000
@@ -0,0 +1,174 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
+ * ManifestImageObjectProcessor
+ * Implementation of Image Object processing algorithms from:
+ * http://www.w3.org/2008/webapps/manifest/#image-object-and-its-members
+ *
+ * This is intended to be used in conjunction with ManifestProcessor.jsm
+ *
+ * Creates an object to process Image Objects as defined by the
+ * W3C specification. This is used to process things like the
+ * icon member and the splash_screen member.
+ *
+ * Usage:
+ *
+ *   .process(aManifest, aBaseURL, aMemberName);
+ *
+ */
+/*exported EXPORTED_SYMBOLS*/
+/*globals Components*/
+'use strict';
+this.EXPORTED_SYMBOLS = ['ManifestImageObjectProcessor']; // jshint ignore:line
+const imports = {};
+const {
+  utils: Cu,
+  classes: Cc,
+  interfaces: Ci
+} = Components;
+Cu.import('resource://gre/modules/XPCOMUtils.jsm');
+Cu.importGlobalProperties(['URL']);
+imports.netutil = Cc['@mozilla.org/network/util;1']
+  .getService(Ci.nsINetUtil);
+
+function ManifestImageObjectProcessor(aConsole, aExtractor) {
+  this.console = aConsole;
+  this.extractor = aExtractor;
+}
+
+// Static getters
+Object.defineProperties(ManifestImageObjectProcessor, {
+  'decimals': {
+    get: function() {
+      return /^\d+$/;
+    }
+  },
+  'anyRegEx': {
+    get: function() {
+      return new RegExp('any', 'i');
+    }
+  }
+});
+
+ManifestImageObjectProcessor.prototype.process = function(
+  aManifest, aBaseURL, aMemberName
+) {
+  const spec = {
+    objectName: 'manifest',
+    object: aManifest,
+    property: aMemberName,
+    expectedType: 'array',
+    trim: false
+  };
+  const extractor = this.extractor;
+  const images = [];
+  const value = extractor.extractValue(spec);
+  if (Array.isArray(value)) {
+    // Filter out images whose "src" is not useful.
+    value.filter(item => !!processSrcMember(item, aBaseURL))
+      .map(toImageObject)
+      .forEach(image => images.push(image));
+  }
+  return images;
+
+  function toImageObject(aImageSpec) {
+    return {
+      'src': processSrcMember(aImageSpec, aBaseURL),
+      'type': processTypeMember(aImageSpec),
+      'sizes': processSizesMember(aImageSpec),
+      'density': processDensityMember(aImageSpec),
+      'background_color': processBackgroundColorMember(aImageSpec)
+    };
+  }
+
+  function processTypeMember(aImage) {
+    const charset = {};
+    const hadCharset = {};
+    const spec = {
+      objectName: 'image',
+      object: aImage,
+      property: 'type',
+      expectedType: 'string',
+      trim: true
+    };
+    let value = extractor.extractValue(spec);
+    if (value) {
+      value = imports.netutil.parseContentType(value, charset, hadCharset);
+    }
+    return value || undefined;
+  }
+
+  function processDensityMember(aImage) {
+    const value = parseFloat(aImage.density);
+    const validNum = Number.isNaN(value) || value === +Infinity || value <=
+      0;
+    return (validNum) ? 1.0 : value;
+  }
+
+  function processSrcMember(aImage, aBaseURL) {
+    const spec = {
+      objectName: 'image',
+      object: aImage,
+      property: 'src',
+      expectedType: 'string',
+      trim: false
+    };
+    const value = extractor.extractValue(spec);
+    let url;
+    if (value && value.length) {
+      try {
+        url = new URL(value, aBaseURL).href;
+      } catch (e) {}
+    }
+    return url;
+  }
+
+  function processSizesMember(aImage) {
+    const sizes = new Set();
+    const spec = {
+      objectName: 'image',
+      object: aImage,
+      property: 'sizes',
+      expectedType: 'string',
+      trim: true
+    };
+    const value = extractor.extractValue(spec);
+    if (value) {
+      // Split on whitespace and filter out invalid values.
+      value.split(/\s+/)
+        .filter(isValidSizeValue)
+        .forEach(size => sizes.add(size));
+    }
+    return sizes;
+    // Implementation of HTML's link@size attribute checker.
+    function isValidSizeValue(aSize) {
+      const size = aSize.toLowerCase();
+      if (ManifestImageObjectProcessor.anyRegEx.test(aSize)) {
+        return true;
+      }
+      if (!size.includes('x') || size.indexOf('x') !== size.lastIndexOf('x')) {
+        return false;
+      }
+      // Split left of x for width, after x for height.
+      const widthAndHeight = size.split('x');
+      const w = widthAndHeight.shift();
+      const h = widthAndHeight.join('x');
+      const validStarts = !w.startsWith('0') && !h.startsWith('0');
+      const validDecimals = ManifestImageObjectProcessor.decimals.test(w + h);
+      return (validStarts && validDecimals);
+    }
+  }
+
+  function processBackgroundColorMember(aImage) {
+    const spec = {
+      objectName: 'image',
+      object: aImage,
+      property: 'background_color',
+      expectedType: 'string',
+      trim: true
+    };
+    return extractor.extractColorValue(spec);
+  }
+};
+this.ManifestImageObjectProcessor = ManifestImageObjectProcessor; // jshint ignore:line
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/ManifestProcessor.jsm firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/ManifestProcessor.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/ManifestProcessor.jsm	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/ManifestProcessor.jsm	2015-05-25 20:43:39.000000000 +0000
@@ -1,7 +1,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-/* 
+/*
  * ManifestProcessor
  * Implementation of processing algorithms from:
  * http://www.w3.org/2008/webapps/manifest/
@@ -12,6 +12,9 @@
  *
  *   .process({jsonText,manifestURL,docURL});
  *
+ * Depends on ManifestImageObjectProcessor to process things like
+ * icons and splash_screens.
+ *
  * TODO: The constructor should accept the UA's supported orientations.
  * TODO: The constructor should accept the UA's supported display modes.
  * TODO: hook up developer tools to console. (1086997).
@@ -20,46 +23,15 @@
 /*JSLint options in comment below: */
 /*globals Components, XPCOMUtils*/
 'use strict';
-this.EXPORTED_SYMBOLS = ['ManifestProcessor'];
+this.EXPORTED_SYMBOLS = ['ManifestProcessor']; // jshint ignore:line
 const imports = {};
 const {
-  utils: Cu,
-  classes: Cc,
-  interfaces: Ci
+  utils: Cu
 } = Components;
 Cu.import('resource://gre/modules/XPCOMUtils.jsm');
 Cu.importGlobalProperties(['URL']);
 XPCOMUtils.defineLazyModuleGetter(imports, 'Services',
   'resource://gre/modules/Services.jsm');
-imports.netutil = Cc['@mozilla.org/network/util;1'].getService(Ci.nsINetUtil);
-// Helper function extracts values from manifest members
-// and reports conformance violations.
-function extractValue({
-  objectName,
-  object,
-  property,
-  expectedType,
-  trim
-}, console) {
-  const value = object[property];
-  const isArray = Array.isArray(value);
-  // We need to special-case "array", as it's not a JS primitive.
-  const type = (isArray) ? 'array' : typeof value;
-  if (type !== expectedType) {
-    if (type !== 'undefined') {
-      let msg = `Expected the ${objectName}'s ${property} `;
-      msg += `member to a be a ${expectedType}.`;
-      console.log(msg);
-    }
-    return undefined;
-  }
-  // Trim string and returned undefined if the empty string.
-  const shouldTrim = expectedType === 'string' && value && trim;
-  if (shouldTrim) {
-    return value.trim() || undefined;
-  }
-  return value;
-}
 const displayModes = new Set(['fullscreen', 'standalone', 'minimal-ui',
   'browser'
 ]);
@@ -70,6 +42,13 @@
 const {
   ConsoleAPI
 } = Cu.import('resource://gre/modules/devtools/Console.jsm');
+const {
+  ManifestImageObjectProcessor: ImgObjProcessor
+} = Cu.import('resource://gre/modules/ManifestImageObjectProcessor.jsm');
+
+const {
+  ManifestValueExtractor
+} = Cu.import('resource://gre/modules/ManifestValueExtractor.jsm');
 
 function ManifestProcessor() {}
 
@@ -93,23 +72,22 @@
 });
 
 ManifestProcessor.prototype = {
-
-  // process method: processes json text into a clean manifest
+  // process() method processes JSON text into a clean manifest
   // that conforms with the W3C specification. Takes an object
   // expecting the following dictionary items:
-  //  * jsonText: the JSON string to be processd.
-  //  * manifestURL: the URL of the manifest, to resolve URLs.
-  //  * docURL: the URL of the owner doc, for security checks.
+  //  * aJsonText: the JSON string to be processed.
+  //  * aManifestURL: the URL of the manifest, to resolve URLs.
+  //  * aDocURL: the URL of the owner doc, for security checks
   process({
     jsonText: aJsonText,
     manifestURL: aManifestURL,
     docURL: aDocURL
   }) {
-    const manifestURL = new URL(aManifestURL);
-    const docURL = new URL(aDocURL);
     const console = new ConsoleAPI({
       prefix: 'Web Manifest: '
     });
+    const manifestURL = new URL(aManifestURL);
+    const docURL = new URL(aDocURL);
     let rawManifest = {};
     try {
       rawManifest = JSON.parse(aJsonText);
@@ -119,16 +97,24 @@
       console.warn(msg);
       rawManifest = {};
     }
+    const extractor = new ManifestValueExtractor(console);
+    const imgObjProcessor = new ImgObjProcessor(console, extractor);
     const processedManifest = {
-      start_url: processStartURLMember(rawManifest, manifestURL, docURL),
-      display: processDisplayMember(rawManifest),
-      orientation: processOrientationMember(rawManifest),
-      name: processNameMember(rawManifest),
-      icons: IconsProcessor.process(rawManifest, manifestURL, console),
-      short_name: processShortNameMember(rawManifest),
+      'start_url': processStartURLMember(rawManifest, manifestURL, docURL),
+      'display': processDisplayMember(rawManifest),
+      'orientation': processOrientationMember(rawManifest),
+      'name': processNameMember(rawManifest),
+      'icons': imgObjProcessor.process(
+        rawManifest, manifestURL, 'icons'
+      ),
+      'splash_screens': imgObjProcessor.process(
+        rawManifest, manifestURL, 'splash_screens'
+      ),
+      'short_name': processShortNameMember(rawManifest),
+      'theme_color': processThemeColorMember(rawManifest),
     };
     processedManifest.scope = processScopeMember(rawManifest, manifestURL,
-      docURL, new URL(processedManifest.start_url));
+      docURL, new URL(processedManifest['start_url'])); // jshint ignore:line
 
     return processedManifest;
 
@@ -140,7 +126,7 @@
         expectedType: 'string',
         trim: true
       };
-      return extractValue(spec, console);
+      return extractor.extractValue(spec);
     }
 
     function processShortNameMember(aManifest) {
@@ -151,7 +137,7 @@
         expectedType: 'string',
         trim: true
       };
-      return extractValue(spec, console);
+      return extractor.extractValue(spec);
     }
 
     function processOrientationMember(aManifest) {
@@ -162,7 +148,7 @@
         expectedType: 'string',
         trim: true
       };
-      const value = extractValue(spec, console);
+      const value = extractor.extractValue(spec);
       if (ManifestProcessor.orientationTypes.has(value)) {
         return value;
       }
@@ -178,7 +164,7 @@
         expectedType: 'string',
         trim: true
       };
-      const value = extractValue(spec, console);
+      const value = extractor.extractValue(spec);
       if (ManifestProcessor.displayModes.has(value)) {
         return value;
       }
@@ -194,7 +180,7 @@
         trim: false
       };
       let scopeURL;
-      const value = extractValue(spec, console);
+      const value = extractor.extractValue(spec);
       if (value === undefined || value === '') {
         return undefined;
       }
@@ -230,7 +216,7 @@
         trim: false
       };
       let result = new URL(aDocURL).href;
-      const value = extractValue(spec, console);
+      const value = extractor.extractValue(spec);
       if (value === undefined || value === '') {
         return result;
       }
@@ -249,128 +235,18 @@
       }
       return result;
     }
-  }
-};
-this.ManifestProcessor = ManifestProcessor;
-
-function IconsProcessor() {}
-
-// Static getters
-Object.defineProperties(IconsProcessor, {
-  'onlyDecimals': {
-    get: function() {
-      return /^\d+$/;
-    }
-  },
-  'anyRegEx': {
-    get: function() {
-      return new RegExp('any', 'i');
-    }
-  }
-});
 
-IconsProcessor.process = function(aManifest, aBaseURL, console) {
-  const spec = {
-    objectName: 'manifest',
-    object: aManifest,
-    property: 'icons',
-    expectedType: 'array',
-    trim: false
-  };
-  const icons = [];
-  const value = extractValue(spec, console);
-  if (Array.isArray(value)) {
-    // Filter out icons whose "src" is not useful.
-    value.filter(item => !!processSrcMember(item, aBaseURL))
-      .map(toIconObject)
-      .forEach(icon => icons.push(icon));
-  }
-  return icons;
-
-  function toIconObject(aIconData) {
-    return {
-      src: processSrcMember(aIconData, aBaseURL),
-      type: processTypeMember(aIconData),
-      sizes: processSizesMember(aIconData),
-      density: processDensityMember(aIconData)
-    };
-  }
-
-  function processTypeMember(aIcon) {
-    const charset = {};
-    const hadCharset = {};
-    const spec = {
-      objectName: 'icon',
-      object: aIcon,
-      property: 'type',
-      expectedType: 'string',
-      trim: true
-    };
-    let value = extractValue(spec, console);
-    if (value) {
-      value = imports.netutil.parseContentType(value, charset, hadCharset);
-    }
-    return value || undefined;
-  }
-
-  function processDensityMember(aIcon) {
-    const value = parseFloat(aIcon.density);
-    const validNum = Number.isNaN(value) || value === +Infinity || value <=
-      0;
-    return (validNum) ? 1.0 : value;
-  }
-
-  function processSrcMember(aIcon, aBaseURL) {
-    const spec = {
-      objectName: 'icon',
-      object: aIcon,
-      property: 'src',
-      expectedType: 'string',
-      trim: false
-    };
-    const value = extractValue(spec, console);
-    let url;
-    if (value && value.length) {
-      try {
-        url = new URL(value, aBaseURL).href;
-      } catch (e) {}
-    }
-    return url;
-  }
-
-  function processSizesMember(aIcon) {
-    const sizes = new Set(),
-      spec = {
-        objectName: 'icon',
-        object: aIcon,
-        property: 'sizes',
+    function processThemeColorMember(aManifest) {
+      const spec = {
+        objectName: 'manifest',
+        object: aManifest,
+        property: 'theme_color',
         expectedType: 'string',
         trim: true
-      },
-      value = extractValue(spec, console);
-    if (value) {
-      // Split on whitespace and filter out invalid values.
-      value.split(/\s+/)
-        .filter(isValidSizeValue)
-        .forEach(size => sizes.add(size));
-    }
-    return sizes;
-    // Implementation of HTML's link@size attribute checker.
-    function isValidSizeValue(aSize) {
-      const size = aSize.toLowerCase();
-      if (IconsProcessor.anyRegEx.test(aSize)) {
-        return true;
-      }
-      if (!size.includes('x') || size.indexOf('x') !== size.lastIndexOf('x')) {
-        return false;
-      }
-      // Split left of x for width, after x for height.
-      const widthAndHeight = size.split('x');
-      const w = widthAndHeight.shift();
-      const h = widthAndHeight.join('x');
-      const validStarts = !w.startsWith('0') && !h.startsWith('0');
-      const validDecimals = IconsProcessor.onlyDecimals.test(w + h);
-      return (validStarts && validDecimals);
+      };
+      return extractor.extractColorValue(spec);
     }
   }
 };
+
+this.ManifestProcessor = ManifestProcessor; // jshint ignore:line
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/ManifestValueExtractor.jsm firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/ManifestValueExtractor.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/ManifestValueExtractor.jsm	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/ManifestValueExtractor.jsm	2015-05-25 20:43:39.000000000 +0000
@@ -0,0 +1,68 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://www.mozilla.org/MPL/2.0/. */
+/*
+ * Helper functions extract values from manifest members
+ * and reports conformance violations.
+ */
+/*globals Components*/
+'use strict';
+const imports = {};
+const {
+  classes: Cc,
+  interfaces: Ci
+} = Components;
+imports.DOMUtils = Cc['@mozilla.org/inspector/dom-utils;1']
+  .getService(Ci.inIDOMUtils);
+
+this.EXPORTED_SYMBOLS = ['ManifestValueExtractor']; // jshint ignore:line
+
+function ManifestValueExtractor(aConsole) {
+  this.console = aConsole;
+}
+
+ManifestValueExtractor.prototype = {
+  // This function takes a 'spec' object and destructures
+  // it to extract a value. If the value is of th wrong type, it
+  // warns the developer and returns undefined.
+  //  expectType: is the type of a JS primitive (string, number, etc.)
+  //  object: is the object from which to extract the value.
+  //  objectName: string used to construct the developer warning.
+  //  property: the name of the property being extracted.
+  //  trim: boolean, if the value should be trimmed (used by string type).
+  extractValue({
+    expectedType, object, objectName, property, trim
+  }) {
+    const value = object[property];
+    const isArray = Array.isArray(value);
+    // We need to special-case "array", as it's not a JS primitive.
+    const type = (isArray) ? 'array' : typeof value;
+    if (type !== expectedType) {
+      if (type !== 'undefined') {
+        let msg = `Expected the ${objectName}'s ${property} `;
+        msg += `member to be a ${expectedType}.`;
+        this.console.log(msg);
+      }
+      return undefined;
+    }
+    // Trim string and returned undefined if the empty string.
+    const shouldTrim = expectedType === 'string' && value && trim;
+    if (shouldTrim) {
+      return value.trim() || undefined;
+    }
+    return value;
+  },
+  extractColorValue(spec) {
+    const value = this.extractValue(spec);
+    let color;
+    if (imports.DOMUtils.isValidCSSColor(value)) {
+      color = value;
+    } else {
+      const msg = `background_color: ${value} is not a valid CSS color.`;
+      this.console.warn(msg);
+    }
+    return color;
+  }
+};
+
+this.ManifestValueExtractor = ManifestValueExtractor; // jshint ignore:line
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/moz.build	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/moz.build	2015-05-25 20:43:39.000000000 +0000
@@ -5,9 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXTRA_JS_MODULES += [
+    'ManifestImageObjectProcessor.jsm',
     'ManifestObtainer.jsm',
     'ManifestProcessor.jsm',
+    'ManifestValueExtractor.jsm'
 ]
 
 MOCHITEST_MANIFESTS += ['test/mochitest.ini']
-BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
\ No newline at end of file
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/mochitest.ini	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/mochitest.ini	2015-05-25 20:43:39.000000000 +0000
@@ -4,14 +4,16 @@
 	resource.sjs
 	manifestLoader.html
 
-[test_IconsProcessor_density.html]
-[test_IconsProcessor_sizes.html]
-[test_IconsProcessor_src.html]
-[test_IconsProcessor_type.html]
+[test_ImageObjectProcessor_background_color.html]
+[test_ImageObjectProcessor_density.html]
+[test_ImageObjectProcessor_sizes.html]
+[test_ImageObjectProcessor_src.html]
+[test_ImageObjectProcessor_type.html]
 [test_ManifestProcessor_display.html]
 [test_ManifestProcessor_icons.html]
 [test_ManifestProcessor_JSON.html]
 [test_ManifestProcessor_name_and_short_name.html]
 [test_ManifestProcessor_orientation.html]
 [test_ManifestProcessor_start_url.html]
-[test_ManifestProcessor_scope.html]
\ No newline at end of file
+[test_ManifestProcessor_scope.html]
+[test_ManifestProcessor_splash_screens.html]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_IconsProcessor_density.html firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_IconsProcessor_density.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_IconsProcessor_density.html	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_IconsProcessor_density.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1079453
--->
-<head>
-  <meta charset="utf-8">
-  <title>Test for Bug 1079453</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-  <script src="common.js"></script>
-  <script>
-/**
- * icon member's density member
- * https://w3c.github.io/manifest/#density-member
- **/
-'use strict';
-
-var testIcon = {
-  icons: [{
-    src: 'test',
-    density: undefined
-  }]
-};
-
-var iconDensityValueTests = [null, {},
-  [], false, '', -0, '-0', -1.0000, -123131132, -1.2e+200,
-  'Infinity', '-Infinity',
-  '-1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
-  '1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
-];
-
-iconDensityValueTests.forEach((density) => {
-  var expected = `Expect density to default to 1.0.`;
-  testIcon.icons[0].density = density;
-  data.jsonText = JSON.stringify(testIcon);
-  var result = processor.process(data);
-  ise(result.icons[0].density, 1.0, expected);
-});
-
-testIcon = {
-  icons: [{
-    src: 'test',
-    density: undefined
-  }]
-};
-
-var parseFloatTests = [3.14, '3.14', `${whiteSpace}3.14${whiteSpace}`, 12e300];
-parseFloatTests.forEach((testNumber) => {
-  var expected = `Expect density to be ${parseFloat(testNumber)}.`;
-  testIcon.icons[0].density = testNumber;
-  data.jsonText = JSON.stringify(testIcon);
-  var result = processor.process(data);
-  ise(result.icons[0].density, parseFloat(testNumber), expected);
-});
-  </script>
-</head>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_IconsProcessor_sizes.html firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_IconsProcessor_sizes.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_IconsProcessor_sizes.html	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_IconsProcessor_sizes.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1079453
--->
-<head>
-  <meta charset="utf-8">
-  <title>Test for Bug 1079453</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-  <script src="common.js"></script>
-  <script>
-/**
- * icon member's sizes property
- * https://w3c.github.io/manifest/#sizes-member
- **/
-'use strict';
-var validSizes = [{
-  test: '16x16',
-  expect: ['16x16']
-}, {
-  test: 'hello 16x16 16x16',
-  expect: ['16x16']
-}, {
-  test: '32x32 16 48x48 12',
-  expect: ['32x32', '48x48']
-}, {
-  test: `${whiteSpace}128x128${whiteSpace}512x512 8192x8192 32768x32768${whiteSpace}`,
-  expect: ['128x128', '512x512', '8192x8192', '32768x32768']
-}, {
-  test: 'any',
-  expect: ['any']
-}, {
-  test: 'Any',
-  expect: ['Any']
-}, {
-  test: '16x32',
-  expect: ['16x32']
-}, {
-  test: '17x33',
-  expect: ['17x33']
-}, {
-  test: '32x32 32x32',
-  expect: ['32x32']
-}, {
-  test: '32X32',
-  expect: ['32X32']
-}, {
-  test: 'any 32x32',
-  expect: ['any', '32x32']
-}];
-
-var testIcon = {
-  icons: [{
-    src: 'test',
-    sizes: undefined
-  }]
-};
-
-validSizes.forEach(({
-  test, expect
-}) => {
-  testIcon.icons[0].sizes = test;
-  data.jsonText = JSON.stringify(testIcon);
-  var result = processor.process(data);
-  var sizes = result.icons[0].sizes;
-  for (var expectedSize of expect) {
-    var expected = `Expect sizes to contain ${expectedSize}`;
-    ise(sizes.has(expectedSize), true, expected);
-  }
-  expected = `Expect the size of the set to be ${expect.length}.`;
-  ise(sizes.size, expect.length, expected);
-});
-
-var testIcon = {
-  icons: [{
-    src: 'test',
-    sizes: undefined
-  }]
-};
-
-var invalidSizes = ['invalid', '', ' ', '16 x 16', '32', '21', '16xx16', '16 x x 6'];
-invalidSizes.forEach((invalidSize) => {
-  var expected = 'Expect invalid sizes to return an empty set.';
-  testIcon.icons[0].sizes = invalidSize;
-  data.jsonText = JSON.stringify(testIcon);
-  var result = processor.process(data);
-  var sizes = result.icons[0].sizes;
-  ise(sizes.size, 0, expected);
-});
-
-typeTests.forEach((type) => {
-  var expected = `Expect non-string sizes to be empty set: ${typeof type}.`;
-  testIcon.icons[0].sizes = type;
-  data.jsonText = JSON.stringify(testIcon);
-  var result = processor.process(data);
-  var sizes = result.icons[0].sizes;
-  ise(sizes.size, 0, expected);
-});
-  </script>
-</head>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_IconsProcessor_src.html firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_IconsProcessor_src.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_IconsProcessor_src.html	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_IconsProcessor_src.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,110 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1079453
--->
-<head>
-  <meta charset="utf-8">
-  <title>Test for Bug 1079453</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-  <script src="common.js"></script>
-  <script>
-/**
- * icon member's src member
- * https://w3c.github.io/manifest/#src-member
- **/
-'use strict';
-var noSrc = {
-  icons: [{}, {
-    src: []
-  }, {
-    src: {}
-  }, {
-    src: null
-  }, {
-    density: '1'
-  }, {
-    type: 'image/jpg'
-  }, {
-    sizes: '1x1,2x2'
-  }, {
-    density: '1',
-    sizes: 'any',
-    type: 'image/jpg'
-  }]
-};
-
-var expected = `Expect icons without a src prop to be filtered out.`;
-data.jsonText = JSON.stringify(noSrc);
-var result = processor.process(data);
-ise(result.icons.length, 0, expected);
-
-var invalidSrc = {
-  icons: [{
-    src: null
-  }, {
-    src: 1
-  }, {
-    src: []
-  }, {
-    src: {}
-  }, {
-    src: true
-  }, {
-    src: ''
-  }]
-};
-
-var expected = `Expect icons with invalid src prop to be filtered out.`;
-data.jsonText = JSON.stringify(noSrc);
-var result = processor.process(data);
-ise(result.icons.length, 0, expected);
-
-var expected = `Expect icon's src to be a string.`;
-var withSrc = {
-  icons: [{
-    src: 'pass'
-  }]
-};
-data.jsonText = JSON.stringify(withSrc);
-var result = processor.process(data);
-ise(typeof result.icons[0].src, "string", expected);
-
-var expected = `Expect only icons with a src prop to be kept.`;
-var withSrc = {
-  icons: [{
-    src: 'pass'
-  }, {
-    src: 'pass',
-    density: 1
-  }, {}, {
-    foo: 'foo'
-  }]
-};
-data.jsonText = JSON.stringify(withSrc);
-var result = processor.process(data);
-ise(result.icons.length, 2, expected);
-
-var expectedURL = new URL('pass', manifestURL);
-for (var icon of result.icons) {
-  var expected = `Expect src prop to be ${expectedURL.toString()}`;
-  ise(icon.src.toString(), expectedURL.toString(), expected);
-}
-
-//Resolve URLs relative to manfiest
-var URLs = ['path', '/path', '../../path'];
-
-URLs.forEach((url) => {
-  var expected = `Resolve icon src URLs relative to manifest.`;
-  data.jsonText = JSON.stringify({
-    icons: [{
-      src: url
-    }]
-  });
-  var absURL = new URL(url, manifestURL).toString();
-  var result = processor.process(data);
-  ise(result.icons[0].src.toString(), absURL, expected);
-});
-  </script>
-</head>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_IconsProcessor_type.html firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_IconsProcessor_type.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_IconsProcessor_type.html	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_IconsProcessor_type.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1079453
--->
-<head>
-  <meta charset="utf-8">
-  <title>Test for Bug 1079453</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-  <script src="common.js"></script>
-  <script>
-/**
- * icon member's type property
- * https://w3c.github.io/manifest/#type-member
- **/
-
-'use strict';
-var testIcon = {
-  icons: [{
-    src: 'test',
-    type: undefined
-  }]
-};
-
-var invalidMimeTypes = ['application / text', 'test;test', ';test?test', 'application\\text'];
-invalidMimeTypes.forEach((invalidMime) => {
-  var expected = `Expect invalid mime to be treated like undefined.`;
-  testIcon.icons[0].type = invalidMime;
-  data.jsonText = JSON.stringify(testIcon);
-  var result = processor.process(data);
-  ise(result.icons[0].type, undefined, expected);
-});
-
-var validTypes = [
-  'image/jpeg',
-  'IMAGE/jPeG',
-  `${whiteSpace}image/jpeg${whiteSpace}`,
-  'image/JPEG; whatever=something',
-  'image/JPEG;whatever'
-];
-
-validTypes.forEach((validMime) => {
-  var expected = `Expect valid mime to be parsed to : image/jpeg.`;
-  testIcon.icons[0].type = validMime;
-  data.jsonText = JSON.stringify(testIcon);
-  var result = processor.process(data);
-  ise(result.icons[0].type, 'image/jpeg', expected);
-});
-  </script>
-</head>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ImageObjectProcessor_background_color.html firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ImageObjectProcessor_background_color.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ImageObjectProcessor_background_color.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ImageObjectProcessor_background_color.html	2015-05-25 20:43:39.000000000 +0000
@@ -0,0 +1,84 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1162808
+-->
+
+<head>
+    <meta charset="utf-8">
+    <title>Test for Bug 1162808</title>
+    <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+    <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+    <script src="common.js"></script>
+    <script type="application/javascript">
+/**
+ * Image object's type member
+ * https://w3c.github.io/manifest/#type-member
+ *
+ * Checks that invalid and valid colors are processed correctly.
+ **/
+ /*globals data, processor, is*/
+'use strict';
+var testIcon = {
+  icons: [{
+    src: 'test',
+    'background_color': undefined
+  }]
+};
+
+// Test invalid colors.
+var invalidColors = [
+  'marooon',
+  'f000000',
+  '#ff00000',
+  'rgb(255 0 0)',
+  'rgb(100, 0%, 0%)',
+  'rgb(255,0)',
+  'rgb(300 0 0)',
+  'rbg(255,-10,0)',
+  'rgb(110, 0%, 0%)',
+  '(255,0,0) }',
+  'rgba(255)',
+  ' rgb(100%,0%,0%) }',
+  'hsl 120, 100%, 50%',
+  'hsla{120, 100%, 50%, 1}'
+];
+invalidColors.forEach((invalidColor) => {
+  var expected = `Treat invalid color (${invalidColor}) as undefined.`;
+  testIcon.icons[0].background_color = invalidColor;
+  data.jsonText = JSON.stringify(testIcon);
+  var result = processor.process(data);
+  is(result.icons[0].background_color, undefined, expected);
+});
+
+// Test valid colors.
+var validColors = [
+  'maroon',
+  '#f00',
+  '#ff0000',
+  'rgb(255,0,0)',
+  'rgb(100%, 0%, 0%)',
+  'rgb(255,0,0)',
+  'rgb(300,0,0)',
+  'rgb(255,-10,0)',
+  'rgb(110%, 0%, 0%)',
+  'rgb(255,0,0)',
+  'rgba(255,0,0,1)',
+  'rgb(100%,0%,0%)',
+  'rgba(100%,0%,0%,1)',
+  'rgba(0,0,255,0.5)',
+  'rgba(100%, 50%, 0%, 0.1)',
+  'hsl(120, 100%, 50%)',
+  'hsla(120, 100%, 50%, 1)'
+];
+
+validColors.forEach((color) => {
+  var expected = `Treat valid CSS color (${color}) as valid input.`;
+  testIcon.icons[0].background_color = color;
+  data.jsonText = JSON.stringify(testIcon);
+  var result = processor.process(data);
+  is(result.icons[0].background_color, color, expected);
+});
+</script>
+</head>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1162808">Mozilla Bug 1162808</a>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ImageObjectProcessor_density.html firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ImageObjectProcessor_density.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ImageObjectProcessor_density.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ImageObjectProcessor_density.html	2015-05-25 20:43:39.000000000 +0000
@@ -0,0 +1,57 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1079453
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 1079453</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script src="common.js"></script>
+  <script>
+/**
+ * Image object density member
+ * https://w3c.github.io/manifest/#density-member
+ **/
+'use strict';
+
+var testIcon = {
+  icons: [{
+    src: 'test',
+    density: undefined
+  }]
+};
+
+var iconDensityValueTests = [null, {},
+  [], false, '', -0, '-0', -1.0000, -123131132, -1.2e+200,
+  'Infinity', '-Infinity',
+  '-1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
+  '1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
+];
+
+iconDensityValueTests.forEach((density) => {
+  var expected = `Expect density to default to 1.0.`;
+  testIcon.icons[0].density = density;
+  data.jsonText = JSON.stringify(testIcon);
+  var result = processor.process(data);
+  is(result.icons[0].density, 1.0, expected);
+});
+
+testIcon = {
+  icons: [{
+    src: 'test',
+    density: undefined
+  }]
+};
+
+var parseFloatTests = [3.14, '3.14', `${whiteSpace}3.14${whiteSpace}`, 12e300];
+parseFloatTests.forEach((testNumber) => {
+  var expected = `Expect density to be ${parseFloat(testNumber)}.`;
+  testIcon.icons[0].density = testNumber;
+  data.jsonText = JSON.stringify(testIcon);
+  var result = processor.process(data);
+  is(result.icons[0].density, parseFloat(testNumber), expected);
+});
+  </script>
+</head>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ImageObjectProcessor_sizes.html firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ImageObjectProcessor_sizes.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ImageObjectProcessor_sizes.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ImageObjectProcessor_sizes.html	2015-05-25 20:43:39.000000000 +0000
@@ -0,0 +1,101 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1079453
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 1079453</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script src="common.js"></script>
+  <script>
+/**
+ * Image object's sizes member
+ * https://w3c.github.io/manifest/#sizes-member
+ **/
+'use strict';
+var validSizes = [{
+  test: '16x16',
+  expect: ['16x16']
+}, {
+  test: 'hello 16x16 16x16',
+  expect: ['16x16']
+}, {
+  test: '32x32 16 48x48 12',
+  expect: ['32x32', '48x48']
+}, {
+  test: `${whiteSpace}128x128${whiteSpace}512x512 8192x8192 32768x32768${whiteSpace}`,
+  expect: ['128x128', '512x512', '8192x8192', '32768x32768']
+}, {
+  test: 'any',
+  expect: ['any']
+}, {
+  test: 'Any',
+  expect: ['Any']
+}, {
+  test: '16x32',
+  expect: ['16x32']
+}, {
+  test: '17x33',
+  expect: ['17x33']
+}, {
+  test: '32x32 32x32',
+  expect: ['32x32']
+}, {
+  test: '32X32',
+  expect: ['32X32']
+}, {
+  test: 'any 32x32',
+  expect: ['any', '32x32']
+}];
+
+var testIcon = {
+  icons: [{
+    src: 'test',
+    sizes: undefined
+  }]
+};
+
+validSizes.forEach(({
+  test, expect
+}) => {
+  testIcon.icons[0].sizes = test;
+  data.jsonText = JSON.stringify(testIcon);
+  var result = processor.process(data);
+  var sizes = result.icons[0].sizes;
+  for (var expectedSize of expect) {
+    var expected = `Expect sizes to contain ${expectedSize}`;
+    is(sizes.has(expectedSize), true, expected);
+  }
+  expected = `Expect the size of the set to be ${expect.length}.`;
+  is(sizes.size, expect.length, expected);
+});
+
+var testIcon = {
+  icons: [{
+    src: 'test',
+    sizes: undefined
+  }]
+};
+
+var invalidSizes = ['invalid', '', ' ', '16 x 16', '32', '21', '16xx16', '16 x x 6'];
+invalidSizes.forEach((invalidSize) => {
+  var expected = 'Expect invalid sizes to return an empty set.';
+  testIcon.icons[0].sizes = invalidSize;
+  data.jsonText = JSON.stringify(testIcon);
+  var result = processor.process(data);
+  var sizes = result.icons[0].sizes;
+  is(sizes.size, 0, expected);
+});
+
+typeTests.forEach((type) => {
+  var expected = `Expect non-string sizes to be empty set: ${typeof type}.`;
+  testIcon.icons[0].sizes = type;
+  data.jsonText = JSON.stringify(testIcon);
+  var result = processor.process(data);
+  var sizes = result.icons[0].sizes;
+  is(sizes.size, 0, expected);
+});
+  </script>
+</head>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ImageObjectProcessor_src.html firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ImageObjectProcessor_src.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ImageObjectProcessor_src.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ImageObjectProcessor_src.html	2015-05-25 20:43:39.000000000 +0000
@@ -0,0 +1,110 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1079453
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 1079453</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script src="common.js"></script>
+  <script>
+/**
+ * Image object's src member
+ * https://w3c.github.io/manifest/#src-member
+ **/
+'use strict';
+var noSrc = {
+  icons: [{}, {
+    src: []
+  }, {
+    src: {}
+  }, {
+    src: null
+  }, {
+    density: '1'
+  }, {
+    type: 'image/jpg'
+  }, {
+    sizes: '1x1,2x2'
+  }, {
+    density: '1',
+    sizes: 'any',
+    type: 'image/jpg'
+  }]
+};
+
+var expected = `Expect icons without a src prop to be filtered out.`;
+data.jsonText = JSON.stringify(noSrc);
+var result = processor.process(data);
+is(result.icons.length, 0, expected);
+
+var invalidSrc = {
+  icons: [{
+    src: null
+  }, {
+    src: 1
+  }, {
+    src: []
+  }, {
+    src: {}
+  }, {
+    src: true
+  }, {
+    src: ''
+  }]
+};
+
+var expected = `Expect icons with invalid src prop to be filtered out.`;
+data.jsonText = JSON.stringify(noSrc);
+var result = processor.process(data);
+is(result.icons.length, 0, expected);
+
+var expected = `Expect icon's src to be a string.`;
+var withSrc = {
+  icons: [{
+    src: 'pass'
+  }]
+};
+data.jsonText = JSON.stringify(withSrc);
+var result = processor.process(data);
+is(typeof result.icons[0].src, "string", expected);
+
+var expected = `Expect only icons with a src prop to be kept.`;
+var withSrc = {
+  icons: [{
+    src: 'pass'
+  }, {
+    src: 'pass',
+    density: 1
+  }, {}, {
+    foo: 'foo'
+  }]
+};
+data.jsonText = JSON.stringify(withSrc);
+var result = processor.process(data);
+is(result.icons.length, 2, expected);
+
+var expectedURL = new URL('pass', manifestURL);
+for (var icon of result.icons) {
+  var expected = `Expect src prop to be ${expectedURL.toString()}`;
+  is(icon.src.toString(), expectedURL.toString(), expected);
+}
+
+//Resolve URLs relative to manfiest
+var URLs = ['path', '/path', '../../path'];
+
+URLs.forEach((url) => {
+  var expected = `Resolve icon src URLs relative to manifest.`;
+  data.jsonText = JSON.stringify({
+    icons: [{
+      src: url
+    }]
+  });
+  var absURL = new URL(url, manifestURL).toString();
+  var result = processor.process(data);
+  is(result.icons[0].src.toString(), absURL, expected);
+});
+  </script>
+</head>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ImageObjectProcessor_type.html firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ImageObjectProcessor_type.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ImageObjectProcessor_type.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ImageObjectProcessor_type.html	2015-05-25 20:43:39.000000000 +0000
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1079453
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 1079453</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script src="common.js"></script>
+  <script>
+/**
+ * Image object's type property
+ * https://w3c.github.io/manifest/#type-member
+ **/
+
+'use strict';
+var testIcon = {
+  icons: [{
+    src: 'test',
+    type: undefined
+  }]
+};
+
+var invalidMimeTypes = ['application / text', 'test;test', ';test?test', 'application\\text'];
+invalidMimeTypes.forEach((invalidMime) => {
+  var expected = `Expect invalid mime to be treated like undefined.`;
+  testIcon.icons[0].type = invalidMime;
+  data.jsonText = JSON.stringify(testIcon);
+  var result = processor.process(data);
+  is(result.icons[0].type, undefined, expected);
+});
+
+var validTypes = [
+  'image/jpeg',
+  'IMAGE/jPeG',
+  `${whiteSpace}image/jpeg${whiteSpace}`,
+  'image/JPEG; whatever=something',
+  'image/JPEG;whatever'
+];
+
+validTypes.forEach((validMime) => {
+  var expected = `Expect valid mime to be parsed to : image/jpeg.`;
+  testIcon.icons[0].type = validMime;
+  data.jsonText = JSON.stringify(testIcon);
+  var result = processor.process(data);
+  is(result.icons[0].type, 'image/jpeg', expected);
+});
+  </script>
+</head>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ManifestProcessor_display.html firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ManifestProcessor_display.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ManifestProcessor_display.html	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ManifestProcessor_display.html	2015-05-25 20:43:39.000000000 +0000
@@ -22,7 +22,7 @@
     display: type
   });
   var result = processor.process(data);
-  ise(result.display, 'browser', expected);
+  is(result.display, 'browser', expected);
 });
 
 /*Test valid modes*/
@@ -33,7 +33,7 @@
     display: mode
   });
   var result = processor.process(data);
-  ise(result.display, mode, expected);
+  is(result.display, mode, expected);
 });
 
 //trim tests
@@ -44,7 +44,7 @@
     display: expandedDisplay
   });
   var result = processor.process(data);
-  ise(result.display, display, expected);
+  is(result.display, display, expected);
 });
 
 //Unknown modes
@@ -55,7 +55,7 @@
     display: invalidMode
   });
   var result = processor.process(data);
-  ise(result.display, 'browser', expected);
+  is(result.display, 'browser', expected);
 });
   </script>
 </head>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ManifestProcessor_icons.html firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ManifestProcessor_icons.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ManifestProcessor_icons.html	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ManifestProcessor_icons.html	2015-05-25 20:43:39.000000000 +0000
@@ -24,7 +24,7 @@
   });
   var result = processor.process(data);
   var y = SpecialPowers.unwrap(result.icons);
-  ise(result.icons.length, 0, expected);
+  is(result.icons.length, 0, expected);
 });
   </script>
 </head>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ManifestProcessor_JSON.html firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ManifestProcessor_JSON.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ManifestProcessor_JSON.html	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ManifestProcessor_JSON.html	2015-05-25 20:43:39.000000000 +0000
@@ -20,7 +20,7 @@
   var expected = `Expect to recover from invalid JSON: ${testString}`;
   data.jsonText = testString;
   var result = processor.process(data);
-  SimpleTest.ise(result.start_url, docURL.href, expected);
+  SimpleTest.is(result.start_url, docURL.href, expected);
 });
 
 var validButUnhelpful = ["1", 1, "", "[{}]", "null"];
@@ -28,7 +28,7 @@
   var expected = `Expect to recover from invalid JSON: ${testString}`;
   data.jsonText = testString;
   var result = processor.process(data);
-  SimpleTest.ise(result.start_url, docURL.href, expected);
+  SimpleTest.is(result.start_url, docURL.href, expected);
 });
   </script>
 </head>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ManifestProcessor_name_and_short_name.html firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ManifestProcessor_name_and_short_name.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ManifestProcessor_name_and_short_name.html	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ManifestProcessor_name_and_short_name.html	2015-05-25 20:43:39.000000000 +0000
@@ -34,7 +34,7 @@
     obj[prop] = trimmableString;
     data.jsonText = JSON.stringify(obj);
     var result = processor.process(data);
-    ise(result[prop], 'pass', assetion);
+    is(result[prop], 'pass', assetion);
   });
 });
 
@@ -72,7 +72,7 @@
     obj[prop] = name;
     data.jsonText = JSON.stringify(obj);
     var result = processor.process(data);
-    ise(result[prop], name, expected);
+    is(result[prop], name, expected);
   });
 });
   </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ManifestProcessor_orientation.html firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ManifestProcessor_orientation.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ManifestProcessor_orientation.html	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ManifestProcessor_orientation.html	2015-05-25 20:43:39.000000000 +0000
@@ -22,7 +22,7 @@
     orientation: type
   });
   var result = processor.process(data);
-  ise(result.orientation, '', expected);
+  is(result.orientation, '', expected);
 });
 
 
@@ -43,7 +43,7 @@
     orientation: orientation
   });
   var result = processor.process(data);
-  ise(result.orientation, orientation, expected);
+  is(result.orientation, orientation, expected);
 });
 
 var invalidOrientations = [
@@ -66,7 +66,7 @@
     orientation: orientation
   });
   var result = processor.process(data);
-  ise(result.orientation, "", expected);
+  is(result.orientation, "", expected);
 });
 
 //Trim tests
@@ -77,7 +77,7 @@
     orientation: expandedOrientation
   });
   var result = processor.process(data);
-  ise(result.orientation, orientation, expected);
+  is(result.orientation, orientation, expected);
 });
   </script>
 </head>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ManifestProcessor_scope.html firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ManifestProcessor_scope.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ManifestProcessor_scope.html	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ManifestProcessor_scope.html	2015-05-25 20:43:39.000000000 +0000
@@ -21,7 +21,7 @@
     scope: type
   });
   var result = processor.process(data);
-  ise(result.scope, undefined, expected);
+  is(result.scope, undefined, expected);
 });
 
 var expected = 'Expect different origin to be treated as undefined';
@@ -29,14 +29,14 @@
   scope: 'http://not-same-origin'
 });
 var result = processor.process(data);
-ise(result.scope, undefined, expected);
+is(result.scope, undefined, expected);
 
 var expected = 'Expect the empty string to be treated as undefined.';
 data.jsonText = JSON.stringify({
   scope: ''
 });
 var result = processor.process(data);
-ise(result.scope, undefined, expected);
+is(result.scope, undefined, expected);
 
 var expected = 'Resolve URLs relative to manifest.';
 var URLs = ['path', '/path', '../../path'];
@@ -47,7 +47,7 @@
   });
   var absURL = new URL(url, manifestURL).toString();
   var result = processor.process(data);
-  ise(result.scope, absURL, expected);
+  is(result.scope, absURL, expected);
 });
 
 var expected = 'If start URL is not in scope, return undefined.';
@@ -56,7 +56,7 @@
   start_url: 'bar'
 });
 var result = processor.process(data);
-ise(result.scope, undefined, expected);
+is(result.scope, undefined, expected);
 
 var expected = 'If start URL is in scope, use the scope.';
 data.jsonText = JSON.stringify({
@@ -64,10 +64,10 @@
   scope: 'foo'
 });
 var result = processor.process(data);
-ise(result.scope.toString(), new URL('foo', manifestURL).toString(), expected);
+is(result.scope.toString(), new URL('foo', manifestURL).toString(), expected);
 
 var expected = 'Expect start_url to be ' + new URL('foobar', manifestURL).toString();
-ise(result.start_url.toString(), new URL('foobar', manifestURL).toString(), expected);
+is(result.start_url.toString(), new URL('foobar', manifestURL).toString(), expected);
 
 var expected = 'If start URL is in scope, use the scope.';
 data.jsonText = JSON.stringify({
@@ -75,7 +75,7 @@
   scope: '/foo/'
 });
 var result = processor.process(data);
-ise(result.scope.toString(), new URL('/foo/', manifestURL).toString(), expected);
+is(result.scope.toString(), new URL('/foo/', manifestURL).toString(), expected);
 
 var expected = 'If start URL is in scope, use the scope.';
 data.jsonText = JSON.stringify({
@@ -83,7 +83,7 @@
   scope: '../foo/'
 });
 var result = processor.process(data);
-ise(result.scope.toString(), new URL('/foo/', manifestURL).toString(), expected);
+is(result.scope.toString(), new URL('/foo/', manifestURL).toString(), expected);
 
   </script>
 </head>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ManifestProcessor_splash_screens.html firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ManifestProcessor_splash_screens.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ManifestProcessor_splash_screens.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ManifestProcessor_splash_screens.html	2015-05-25 20:43:39.000000000 +0000
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1162808
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 1162808</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script src="common.js"></script>
+  <script>
+/**
+ * Manifest splash_screens member
+ * http://www.w3.org/TR/appmanifest/#splash_screens-member
+ **/
+
+'use strict';
+
+typeTests.forEach((type) => {
+  var expected = `Expect non-array splash_screens to be empty: ${typeof type}.`;
+  data.jsonText = JSON.stringify({
+    splash_screens: type
+  });
+  var result = processor.process(data);
+  is(result.splash_screens.length, 0, expected);
+});
+</script>
+</head>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ManifestProcessor_start_url.html firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ManifestProcessor_start_url.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/manifest/test/test_ManifestProcessor_start_url.html	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/manifest/test/test_ManifestProcessor_start_url.html	2015-05-25 20:43:39.000000000 +0000
@@ -21,7 +21,7 @@
     start_url: type
   });
   var result = processor.process(data);
-  ise(result.start_url.toString(), docURL.toString(), expected);
+  is(result.start_url.toString(), docURL.toString(), expected);
 });
 
 //Not same origin
@@ -30,7 +30,7 @@
   start_url: 'http://not-same-origin'
 });
 var result = processor.process(data);
-ise(result.start_url.toString(), docURL.toString(), expected);
+is(result.start_url.toString(), docURL.toString(), expected);
 
 //Empty string test
 var expected = `Expect empty string for start_url to become document's URL.`;
@@ -38,7 +38,7 @@
   start_url: ''
 });
 var result = processor.process(data);
-ise(result.start_url.toString(), docURL.toString(), expected);
+is(result.start_url.toString(), docURL.toString(), expected);
 
 //Resolve URLs relative to manfiest
 var URLs = ['path', '/path', '../../path',
@@ -53,7 +53,7 @@
   });
   var absURL = new URL(url, manifestURL).toString();
   var result = processor.process(data);
-  ise(result.start_url.toString(), absURL, expected);
+  is(result.start_url.toString(), absURL, expected);
 });
   </script>
 </head>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/AbstractThread.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/AbstractThread.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/AbstractThread.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/AbstractThread.cpp	2015-05-25 20:43:39.000000000 +0000
@@ -51,7 +51,7 @@
   {
     nsCOMPtr<nsIRunnable> r = aRunnable;
     AbstractThread* currentThread;
-    if (aReason != TailDispatch && (currentThread = GetCurrent()) && currentThread->RequiresTailDispatch()) {
+    if (aReason != TailDispatch && (currentThread = GetCurrent()) && RequiresTailDispatch(currentThread)) {
       currentThread->TailDispatcher().AddTask(this, r.forget(), aFailureHandling);
       return;
     }
@@ -101,6 +101,14 @@
   Maybe<AutoTaskDispatcher> mTailDispatcher;
 };
 
+bool
+AbstractThread::RequiresTailDispatch(AbstractThread* aThread) const
+{
+  // We require tail dispatch if both the source and destination
+  // threads support it.
+  return SupportsTailDispatch() && aThread->SupportsTailDispatch();
+}
+
 AbstractThread*
 AbstractThread::MainThread()
 {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/AbstractThread.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/AbstractThread.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/AbstractThread.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/AbstractThread.h	2015-05-25 20:43:39.000000000 +0000
@@ -40,7 +40,7 @@
   // if the caller is not running in an AbstractThread.
   static AbstractThread* GetCurrent() { return sCurrentThreadTLS.get(); }
 
-  AbstractThread(bool aRequireTailDispatch) : mRequireTailDispatch(aRequireTailDispatch) {}
+  AbstractThread(bool aSupportsTailDispatch) : mSupportsTailDispatch(aSupportsTailDispatch) {}
 
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(AbstractThread);
 
@@ -63,9 +63,12 @@
   // threads which support it.
   virtual TaskDispatcher& TailDispatcher() = 0;
 
-  // Returns true if this task queue requires all dispatches performed by its
-  // tasks to go through the tail dispatcher.
-  bool RequiresTailDispatch() const { return mRequireTailDispatch; }
+  // Returns true if this supports the tail dispatcher.
+  bool SupportsTailDispatch() const { return mSupportsTailDispatch; }
+
+  // Returns true if this thread requires all dispatches originating from
+  // aThread go through the tail dispatcher.
+  bool RequiresTailDispatch(AbstractThread* aThread) const;
 
   virtual MediaTaskQueue* AsTaskQueue() { MOZ_CRASH("Not a task queue!"); }
   virtual nsIThread* AsXPCOMThread() { MOZ_CRASH("Not an XPCOM thread!"); }
@@ -82,7 +85,7 @@
 
   // True if we want to require that every task dispatched from tasks running in
   // this queue go through our queue's tail dispatcher.
-  const bool mRequireTailDispatch;
+  const bool mSupportsTailDispatch;
 };
 
 } // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/android/AndroidMediaPluginHost.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/android/AndroidMediaPluginHost.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/android/AndroidMediaPluginHost.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/android/AndroidMediaPluginHost.cpp	2015-05-25 20:43:40.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 "mozilla/Preferences.h"
-#include "mozilla/dom/TimeRanges.h"
 #include "MediaResource.h"
 #include "mozilla/dom/HTMLMediaElement.h"
 #include "AndroidMediaPluginHost.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/android/AndroidMediaReader.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/android/AndroidMediaReader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/android/AndroidMediaReader.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/android/AndroidMediaReader.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -5,7 +5,6 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "AndroidMediaReader.h"
 #include "mozilla/TimeStamp.h"
-#include "mozilla/dom/TimeRanges.h"
 #include "mozilla/gfx/Point.h"
 #include "MediaResource.h"
 #include "VideoUtils.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/apple/AppleMP3Reader.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/apple/AppleMP3Reader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/apple/AppleMP3Reader.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/apple/AppleMP3Reader.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -21,16 +21,10 @@
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* gMediaDecoderLog;
-#define LOGE(...) PR_LOG(gMediaDecoderLog, PR_LOG_ERROR, (__VA_ARGS__))
-#define LOGW(...) PR_LOG(gMediaDecoderLog, PR_LOG_WARNING, (__VA_ARGS__))
-#define LOGD(...) PR_LOG(gMediaDecoderLog, PR_LOG_DEBUG, (__VA_ARGS__))
-#else
-#define LOGE(...)
-#define LOGW(...)
-#define LOGD(...)
-#endif
+#define LOGE(...) MOZ_LOG(gMediaDecoderLog, PR_LOG_ERROR, (__VA_ARGS__))
+#define LOGW(...) MOZ_LOG(gMediaDecoderLog, PR_LOG_WARNING, (__VA_ARGS__))
+#define LOGD(...) MOZ_LOG(gMediaDecoderLog, PR_LOG_DEBUG, (__VA_ARGS__))
 
 #define PROPERTY_ID_FORMAT "%c%c%c%c"
 #define PROPERTY_ID_PRINT(x) ((x) >> 24), \
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/AudioSink.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/AudioSink.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/AudioSink.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/AudioSink.cpp	2015-05-25 20:43:39.000000000 +0000
@@ -10,20 +10,11 @@
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* gMediaDecoderLog;
 #define SINK_LOG(msg, ...) \
-  PR_LOG(gMediaDecoderLog, PR_LOG_DEBUG, ("AudioSink=%p " msg, this, ##__VA_ARGS__))
-#define SINK_LOG_V(msg, ...)                      \
-  PR_BEGIN_MACRO                                  \
-    if (!PR_GetEnv("MOZ_QUIET")) {                \
-      SINK_LOG(msg, ##__VA_ARGS__); \
-    }                                             \
-  PR_END_MACRO
-#else
-#define SINK_LOG(msg, ...)
-#define SINK_LOG_V(msg, ...)
-#endif
+  MOZ_LOG(gMediaDecoderLog, PR_LOG_DEBUG, ("AudioSink=%p " msg, this, ##__VA_ARGS__))
+#define SINK_LOG_V(msg, ...) \
+  MOZ_LOG(gMediaDecoderLog, PR_LOG_DEBUG+1, ("AudioSink=%p " msg, this, ##__VA_ARGS__))
 
 AudioSink::OnAudioEndTimeUpdateTask::OnAudioEndTimeUpdateTask(
                                      MediaDecoderStateMachine* aStateMachine)
@@ -47,7 +38,8 @@
   MutexAutoLock lock(mMutex);
   if (mStateMachine) {
     mEndTime = aEndTime;
-    mStateMachine->TaskQueue()->Dispatch(this);
+    nsRefPtr<AudioSink::OnAudioEndTimeUpdateTask> runnable(this);
+    mStateMachine->TaskQueue()->Dispatch(runnable.forget());
   }
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/AudioStream.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/AudioStream.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/AudioStream.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/AudioStream.cpp	2015-05-25 20:43:39.000000000 +0000
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <math.h>
 #include <string.h>
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prdtoa.h"
 #include "AudioStream.h"
 #include "VideoUtils.h"
@@ -28,13 +28,9 @@
 #undef LOG
 #endif
 
-#ifdef PR_LOGGING
 PRLogModuleInfo* gAudioStreamLog = nullptr;
 // For simple logs
-#define LOG(x) PR_LOG(gAudioStreamLog, PR_LOG_DEBUG, x)
-#else
-#define LOG(x)
-#endif
+#define LOG(x) MOZ_LOG(gAudioStreamLog, PR_LOG_DEBUG, x)
 
 /**
  * When MOZ_DUMP_AUDIO is set in the environment (to anything),
@@ -333,7 +329,7 @@
     return NS_ERROR_FAILURE;
   }
 
-  PR_LOG(gAudioStreamLog, PR_LOG_DEBUG,
+  MOZ_LOG(gAudioStreamLog, PR_LOG_DEBUG,
     ("%s  channels: %d, rate: %d for %p", __FUNCTION__, aNumChannels, aRate, this));
   mInRate = mOutRate = aRate;
   mChannels = aNumChannels;
@@ -550,12 +546,12 @@
     if (mLatencyRequest == LowLatency || mNeedsStart) {
       StartUnlocked(); // mState = STARTED or ERRORED
       mNeedsStart = false;
-      PR_LOG(gAudioStreamLog, PR_LOG_WARNING,
+      MOZ_LOG(gAudioStreamLog, PR_LOG_WARNING,
              ("Started waiting %s-latency stream",
               mLatencyRequest == LowLatency ? "low" : "high"));
     } else {
       // high latency, not full - OR Pause() was called before we got here
-      PR_LOG(gAudioStreamLog, PR_LOG_DEBUG,
+      MOZ_LOG(gAudioStreamLog, PR_LOG_DEBUG,
              ("Not starting waiting %s-latency stream",
               mLatencyRequest == LowLatency ? "low" : "high"));
     }
@@ -648,7 +644,7 @@
           remains = mBuffer.Length() - bytesToCopy; // Free up just enough space
         }
         // account for dropping samples
-        PR_LOG(gAudioStreamLog, PR_LOG_WARNING, ("Stream %p dropping %u bytes (%u frames)in Write()",
+        MOZ_LOG(gAudioStreamLog, PR_LOG_WARNING, ("Stream %p dropping %u bytes (%u frames)in Write()",
             this, mBuffer.Length() - remains, BytesToFrames(mBuffer.Length() - remains)));
         mReadPoint += BytesToFrames(mBuffer.Length() - remains);
         mBuffer.ContractTo(remains);
@@ -656,14 +652,14 @@
         // If we are not playing, but our buffer is full, start playing to make
         // room for soon-to-be-decoded data.
         if (mState != STARTED && mState != RUNNING) {
-          PR_LOG(gAudioStreamLog, PR_LOG_WARNING, ("Starting stream %p in Write (%u waiting)",
+          MOZ_LOG(gAudioStreamLog, PR_LOG_WARNING, ("Starting stream %p in Write (%u waiting)",
                                                  this, bytesToCopy));
           StartUnlocked();
           if (mState == ERRORED) {
             return NS_ERROR_FAILURE;
           }
         }
-        PR_LOG(gAudioStreamLog, PR_LOG_WARNING, ("Stream %p waiting in Write() (%u waiting)",
+        MOZ_LOG(gAudioStreamLog, PR_LOG_WARNING, ("Stream %p waiting in Write() (%u waiting)",
                                                  this, bytesToCopy));
         mon.Wait();
       }
@@ -1071,29 +1067,25 @@
     // we start getting callbacks.
     // Simple version - contract on first callback only.
     if (mLatencyRequest == LowLatency) {
-#ifdef PR_LOGGING
       uint32_t old_len = mBuffer.Length();
-#endif
       available = mBuffer.ContractTo(FramesToBytes(aFrames));
-#ifdef PR_LOGGING
       TimeStamp now = TimeStamp::Now();
       if (!mStartTime.IsNull()) {
         int64_t timeMs = (now - mStartTime).ToMilliseconds();
-        PR_LOG(gAudioStreamLog, PR_LOG_WARNING,
+        MOZ_LOG(gAudioStreamLog, PR_LOG_WARNING,
                ("Stream took %lldms to start after first Write() @ %u", timeMs, mOutRate));
       } else {
-        PR_LOG(gAudioStreamLog, PR_LOG_WARNING,
+        MOZ_LOG(gAudioStreamLog, PR_LOG_WARNING,
           ("Stream started before Write() @ %u", mOutRate));
       }
 
       if (old_len != available) {
         // Note that we may have dropped samples in Write() as well!
-        PR_LOG(gAudioStreamLog, PR_LOG_WARNING,
+        MOZ_LOG(gAudioStreamLog, PR_LOG_WARNING,
                ("AudioStream %p dropped %u + %u initial frames @ %u", this,
                  mReadPoint, BytesToFrames(old_len - available), mOutRate));
         mReadPoint += BytesToFrames(old_len - available);
       }
-#endif
     }
     mState = RUNNING;
   }
@@ -1130,7 +1122,7 @@
     uint8_t* rpos = static_cast<uint8_t*>(aBuffer) + FramesToBytes(aFrames - underrunFrames);
     memset(rpos, 0, FramesToBytes(underrunFrames));
     if (underrunFrames) {
-      PR_LOG(gAudioStreamLog, PR_LOG_WARNING,
+      MOZ_LOG(gAudioStreamLog, PR_LOG_WARNING,
              ("AudioStream %p lost %d frames", this, underrunFrames));
     }
     servicedFrames += underrunFrames;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/bridge/IPeerConnection.idl firefox-trunk-41.0~a1~hg20150524r245419/dom/media/bridge/IPeerConnection.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/bridge/IPeerConnection.idl	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/bridge/IPeerConnection.idl	2015-05-25 20:43:40.000000000 +0000
@@ -28,7 +28,7 @@
 {
 };
 
-[scriptable, uuid(c9c31639-1a49-4533-8429-f6a348c4d8c3)]
+[scriptable, uuid(14afc8e7-e421-4d0c-99a5-69308d871481)]
 interface IPeerConnection : nsISupports
 {
   const unsigned long kHintAudio = 0x00000001;
@@ -38,6 +38,7 @@
   const long kActionOffer = 0;
   const long kActionAnswer = 1;
   const long kActionPRAnswer = 2;
+  const long kActionRollback = 3;
 
   const long kIceGathering = 0;
   const long kIceWaiting = 1;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/CanvasCaptureMediaStream.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/CanvasCaptureMediaStream.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/CanvasCaptureMediaStream.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/CanvasCaptureMediaStream.cpp	2015-05-25 20:43:39.000000000 +0000
@@ -0,0 +1,341 @@
+/* -*- 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 "CanvasCaptureMediaStream.h"
+#include "DOMMediaStream.h"
+#include "gfxPlatform.h"
+#include "ImageContainer.h"
+#include "MediaStreamGraph.h"
+#include "mozilla/Mutex.h"
+#include "mozilla/dom/CanvasCaptureMediaStreamBinding.h"
+#include "mozilla/dom/HTMLCanvasElement.h"
+#include "nsIAppShell.h"
+#include "nsWidgetsCID.h"
+
+static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
+
+using namespace mozilla::layers;
+using namespace mozilla::gfx;
+
+namespace mozilla {
+namespace dom {
+
+class OutputStreamDriver::StreamListener : public MediaStreamListener
+{
+public:
+  explicit StreamListener(OutputStreamDriver* aDriver,
+                          SourceMediaStream* aSourceStream)
+    : mSourceStream(aSourceStream)
+    , mMutex("CanvasCaptureMediaStream::OSD::StreamListener")
+    , mDriver(aDriver)
+  {
+    MOZ_ASSERT(mDriver);
+    MOZ_ASSERT(mSourceStream);
+  }
+
+  void Forget() {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    MutexAutoLock lock(mMutex);
+    mDriver = nullptr;
+  }
+
+  virtual void NotifyPull(MediaStreamGraph* aGraph, StreamTime aDesiredTime) override
+  {
+    // Called on the MediaStreamGraph thread.
+
+    MutexAutoLock lock(mMutex);
+    if (mDriver) {
+      mDriver->NotifyPull(aDesiredTime);
+    } else {
+      // The DOM stream is dead, let's end it
+      mSourceStream->EndAllTrackAndFinish();
+    }
+  }
+
+protected:
+  ~StreamListener() { }
+
+private:
+  nsRefPtr<SourceMediaStream> mSourceStream;
+
+  // The below members are protected by mMutex.
+  Mutex mMutex;
+  // This is a raw pointer to avoid a reference cycle with OutputStreamDriver.
+  // Accessed on main and MediaStreamGraph threads, set on main thread.
+  OutputStreamDriver* mDriver;
+};
+
+OutputStreamDriver::OutputStreamDriver(CanvasCaptureMediaStream* aDOMStream,
+                                       const TrackID& aTrackId)
+  : mDOMStream(aDOMStream)
+  , mSourceStream(nullptr)
+  , mStarted(false)
+  , mStreamListener(nullptr)
+  , mTrackId(aTrackId)
+  , mMutex("CanvasCaptureMediaStream::OutputStreamDriver")
+  , mImage(nullptr)
+{
+  MOZ_ASSERT(mDOMStream);
+}
+
+OutputStreamDriver::~OutputStreamDriver()
+{
+  if (mStreamListener) {
+    // MediaStreamGraph will keep the listener alive until it can finish the
+    // stream on the next NotifyPull().
+    mStreamListener->Forget();
+  }
+}
+
+nsresult
+OutputStreamDriver::Start()
+{
+  if (mStarted) {
+    return NS_ERROR_ALREADY_INITIALIZED;
+  }
+
+  MOZ_ASSERT(mDOMStream);
+
+  mDOMStream->CreateDOMTrack(mTrackId, MediaSegment::VIDEO);
+
+  mSourceStream = mDOMStream->GetStream()->AsSourceStream();
+  MOZ_ASSERT(mSourceStream);
+
+  mStreamListener = new StreamListener(this, mSourceStream);
+  mSourceStream->AddListener(mStreamListener);
+  mSourceStream->AddTrack(mTrackId, 0, new VideoSegment());
+  mSourceStream->AdvanceKnownTracksTime(STREAM_TIME_MAX);
+  mSourceStream->SetPullEnabled(true);
+
+  // Run StartInternal() in stable state to allow it to directly capture a frame
+  nsCOMPtr<nsIRunnable> runnable =
+    NS_NewRunnableMethod(this, &OutputStreamDriver::StartInternal);
+  nsCOMPtr<nsIAppShell> appShell = do_GetService(kAppShellCID);
+  appShell->RunInStableState(runnable);
+
+  mStarted = true;
+  return NS_OK;
+}
+
+void
+OutputStreamDriver::ForgetDOMStream()
+{
+  if (mStreamListener) {
+    mStreamListener->Forget();
+  }
+  mDOMStream = nullptr;
+}
+
+void
+OutputStreamDriver::AppendToTrack(StreamTime aDuration)
+{
+  MOZ_ASSERT(mSourceStream);
+
+  MutexAutoLock lock(mMutex);
+
+  nsRefPtr<Image> image = mImage;
+  IntSize size = image ? image->GetSize() : IntSize(0, 0);
+  VideoSegment segment;
+  segment.AppendFrame(image.forget(), aDuration, size);
+
+  mSourceStream->AppendToTrack(mTrackId, &segment);
+}
+
+void
+OutputStreamDriver::NotifyPull(StreamTime aDesiredTime)
+{
+  StreamTime delta = aDesiredTime - mSourceStream->GetEndOfAppendedData(mTrackId);
+  if (delta > 0) {
+    // nullptr images are allowed
+    AppendToTrack(delta);
+  }
+}
+
+void
+OutputStreamDriver::SetImage(Image* aImage)
+{
+  MutexAutoLock lock(mMutex);
+  mImage = aImage;
+}
+
+// ----------------------------------------------------------------------
+
+class TimerDriver : public OutputStreamDriver
+                  , public nsITimerCallback
+{
+public:
+  explicit TimerDriver(CanvasCaptureMediaStream* aDOMStream,
+                       const double& aFPS,
+                       const TrackID& aTrackId)
+    : OutputStreamDriver(aDOMStream, aTrackId)
+    , mFPS(aFPS)
+    , mTimer(nullptr)
+  {
+  }
+
+  void ForgetDOMStream() override
+  {
+    if (mTimer) {
+      mTimer->Cancel();
+      mTimer = nullptr;
+    }
+    OutputStreamDriver::ForgetDOMStream();
+  }
+
+  nsresult
+  TakeSnapshot()
+  {
+    // mDOMStream can't be killed while we're on main thread
+    MOZ_ASSERT(NS_IsMainThread());
+    MOZ_ASSERT(DOMStream());
+
+    if (!DOMStream()->Canvas()) {
+      // DOMStream's canvas pointer was garbage collected. We can abort now.
+      return NS_ERROR_NOT_AVAILABLE;
+    }
+    MOZ_ASSERT(DOMStream()->Canvas());
+
+    if (DOMStream()->Canvas()->IsWriteOnly()) {
+      return NS_ERROR_DOM_SECURITY_ERR;
+    }
+
+    // Pass `nullptr` to force alpha-premult.
+    RefPtr<SourceSurface> snapshot = DOMStream()->Canvas()->GetSurfaceSnapshot(nullptr);
+    if (!snapshot) {
+      return NS_ERROR_FAILURE;
+    }
+
+    RefPtr<SourceSurface> opt = gfxPlatform::GetPlatform()
+      ->ScreenReferenceDrawTarget()->OptimizeSourceSurface(snapshot);
+    if (!opt) {
+      return NS_ERROR_FAILURE;
+    }
+
+    CairoImage::Data imageData;
+    imageData.mSize = opt->GetSize();
+    imageData.mSourceSurface = opt;
+
+    RefPtr<CairoImage> image = new layers::CairoImage();
+    image->SetData(imageData);
+
+    SetImage(image);
+    return NS_OK;
+  }
+
+  NS_IMETHODIMP
+  Notify(nsITimer* aTimer) override
+  {
+    nsresult rv = TakeSnapshot();
+    if (NS_FAILED(rv)) {
+      aTimer->Cancel();
+    }
+    return rv;
+  }
+
+  virtual void RequestFrame() override
+  {
+    TakeSnapshot();
+  }
+
+  NS_DECL_ISUPPORTS_INHERITED
+
+protected:
+  virtual ~TimerDriver() {}
+
+  virtual void StartInternal() override
+  {
+    // Always capture at least one frame.
+    DebugOnly<nsresult> rv = TakeSnapshot();
+    MOZ_ASSERT(NS_SUCCEEDED(rv));
+
+    if (mFPS == 0.0) {
+      return;
+    }
+
+    mTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
+    if (!mTimer) {
+      return;
+    }
+    mTimer->InitWithCallback(this, int(1000 / mFPS), nsITimer::TYPE_REPEATING_SLACK);
+  }
+
+private:
+  const double mFPS;
+  nsCOMPtr<nsITimer> mTimer;
+};
+
+NS_IMPL_ADDREF_INHERITED(TimerDriver, OutputStreamDriver)
+NS_IMPL_RELEASE_INHERITED(TimerDriver, OutputStreamDriver)
+NS_IMPL_QUERY_INTERFACE(TimerDriver, nsITimerCallback)
+
+// ----------------------------------------------------------------------
+
+NS_IMPL_CYCLE_COLLECTION_INHERITED(CanvasCaptureMediaStream, DOMMediaStream,
+                                   mCanvas)
+
+NS_IMPL_ADDREF_INHERITED(CanvasCaptureMediaStream, DOMMediaStream)
+NS_IMPL_RELEASE_INHERITED(CanvasCaptureMediaStream, DOMMediaStream)
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(CanvasCaptureMediaStream)
+NS_INTERFACE_MAP_END_INHERITING(DOMMediaStream)
+
+CanvasCaptureMediaStream::CanvasCaptureMediaStream(HTMLCanvasElement* aCanvas)
+  : mCanvas(aCanvas)
+  , mOutputStreamDriver(nullptr)
+{
+}
+
+CanvasCaptureMediaStream::~CanvasCaptureMediaStream()
+{
+  if (mOutputStreamDriver) {
+    mOutputStreamDriver->ForgetDOMStream();
+  }
+}
+
+JSObject*
+CanvasCaptureMediaStream::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
+{
+  return dom::CanvasCaptureMediaStreamBinding::Wrap(aCx, this, aGivenProto);
+}
+
+void
+CanvasCaptureMediaStream::RequestFrame()
+{
+  if (mOutputStreamDriver) {
+    mOutputStreamDriver->RequestFrame();
+  }
+}
+
+nsresult
+CanvasCaptureMediaStream::Init(const dom::Optional<double>& aFPS,
+                               const TrackID& aTrackId)
+{
+  if (!aFPS.WasPassed()) {
+    // TODO (Bug 1152298): Implement a real AutoDriver.
+    // We use a 30FPS TimerDriver for now.
+    mOutputStreamDriver = new TimerDriver(this, 30.0, aTrackId);
+  } else if (aFPS.Value() < 0) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  } else {
+    // Cap frame rate to 60 FPS for sanity
+    double fps = std::min(60.0, aFPS.Value());
+    mOutputStreamDriver = new TimerDriver(this, fps, aTrackId);
+  }
+  return mOutputStreamDriver->Start();
+}
+
+already_AddRefed<CanvasCaptureMediaStream>
+CanvasCaptureMediaStream::CreateSourceStream(nsIDOMWindow* aWindow,
+                                             HTMLCanvasElement* aCanvas)
+{
+  nsRefPtr<CanvasCaptureMediaStream> stream = new CanvasCaptureMediaStream(aCanvas);
+  stream->InitSourceStream(aWindow);
+  return stream.forget();
+}
+
+} // namespace dom
+} // namespace mozilla
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/CanvasCaptureMediaStream.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/CanvasCaptureMediaStream.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/CanvasCaptureMediaStream.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/CanvasCaptureMediaStream.h	2015-05-25 20:43:39.000000000 +0000
@@ -0,0 +1,108 @@
+/* -*- 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_dom_CanvasCaptureMediaStream_h_
+#define mozilla_dom_CanvasCaptureMediaStream_h_
+
+namespace mozilla {
+class DOMMediaStream;
+class MediaStreamListener;
+class SourceMediaStream;
+
+namespace layers {
+class Image;
+}
+
+namespace dom {
+class CanvasCaptureMediaStream;
+class HTMLCanvasElement;
+
+class OutputStreamDriver
+{
+public:
+  OutputStreamDriver(CanvasCaptureMediaStream* aDOMStream,
+                     const TrackID& aTrackId);
+
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(OutputStreamDriver);
+
+  nsresult Start();
+
+  virtual void ForgetDOMStream();
+
+  virtual void RequestFrame() { }
+
+  CanvasCaptureMediaStream* DOMStream() const { return mDOMStream; }
+
+protected:
+  virtual ~OutputStreamDriver();
+  class StreamListener;
+
+  /*
+   * Appends mImage to video track for the desired duration.
+   */
+  void AppendToTrack(StreamTime aDuration);
+  void NotifyPull(StreamTime aDesiredTime);
+
+  /*
+   * Sub classes can SetImage() to update the image being appended to the
+   * output stream. It will be appended on the next NotifyPull from MSG.
+   */
+  void SetImage(layers::Image* aImage);
+
+  /*
+   * Called in main thread stable state to initialize sub classes.
+   */
+  virtual void StartInternal() = 0;
+
+private:
+  // This is a raw pointer to avoid a reference cycle between OutputStreamDriver
+  // and CanvasCaptureMediaStream. ForgetDOMStream() will be called by
+  // ~CanvasCaptureMediaStream() to make sure we don't do anything illegal.
+  CanvasCaptureMediaStream* mDOMStream;
+  nsRefPtr<SourceMediaStream> mSourceStream;
+  bool mStarted;
+  nsRefPtr<StreamListener> mStreamListener;
+  const TrackID mTrackId;
+
+  // The below members are protected by mMutex.
+  Mutex mMutex;
+  nsRefPtr<layers::Image> mImage;
+};
+
+class CanvasCaptureMediaStream: public DOMMediaStream
+{
+public:
+  explicit CanvasCaptureMediaStream(HTMLCanvasElement* aCanvas);
+
+  NS_DECL_ISUPPORTS_INHERITED
+  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(CanvasCaptureMediaStream, DOMMediaStream)
+
+  nsresult Init(const dom::Optional<double>& aFPS, const TrackID& aTrackId);
+
+  virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
+
+  // WebIDL
+  HTMLCanvasElement* Canvas() const { return mCanvas; }
+  void RequestFrame();
+
+  /**
+   * Create a CanvasCaptureMediaStream whose underlying stream is a SourceMediaStream.
+   */
+  static already_AddRefed<CanvasCaptureMediaStream>
+  CreateSourceStream(nsIDOMWindow* aWindow,
+                     HTMLCanvasElement* aCanvas);
+
+protected:
+  ~CanvasCaptureMediaStream();
+
+private:
+  nsRefPtr<HTMLCanvasElement> mCanvas;
+  nsRefPtr<OutputStreamDriver> mOutputStreamDriver;
+};
+
+} // namespace dom
+} // namespace mozilla
+
+#endif /* mozilla_dom_CanvasCaptureMediaStream_h_ */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/CubebUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/CubebUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/CubebUtils.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/CubebUtils.cpp	2015-05-25 20:43:39.000000000 +0000
@@ -126,9 +126,7 @@
 
 void InitLibrary()
 {
-#ifdef PR_LOGGING
   gAudioStreamLog = PR_NewLogModule("AudioStream");
-#endif
   PrefChanged(PREF_VOLUME_SCALE, nullptr);
   Preferences::RegisterCallback(PrefChanged, PREF_VOLUME_SCALE);
   PrefChanged(PREF_CUBEB_LATENCY, nullptr);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/DecodedStream.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/DecodedStream.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/DecodedStream.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/DecodedStream.cpp	2015-05-25 20:43:39.000000000 +0000
@@ -0,0 +1,213 @@
+/* -*- 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 "DecodedStream.h"
+#include "MediaStreamGraph.h"
+#include "MediaDecoder.h"
+
+namespace mozilla {
+
+class DecodedStreamGraphListener : public MediaStreamListener {
+  typedef MediaStreamListener::MediaStreamGraphEvent MediaStreamGraphEvent;
+public:
+  DecodedStreamGraphListener(MediaStream* aStream, DecodedStreamData* aData)
+    : mData(aData)
+    , mMutex("DecodedStreamGraphListener::mMutex")
+    , mStream(aStream)
+    , mLastOutputTime(aStream->StreamTimeToMicroseconds(aStream->GetCurrentTime()))
+    , mStreamFinishedOnMainThread(false) {}
+
+  void NotifyOutput(MediaStreamGraph* aGraph, GraphTime aCurrentTime) override
+  {
+    MutexAutoLock lock(mMutex);
+    if (mStream) {
+      mLastOutputTime = mStream->StreamTimeToMicroseconds(mStream->GraphTimeToStreamTime(aCurrentTime));
+    }
+  }
+
+  void NotifyEvent(MediaStreamGraph* aGraph, MediaStreamGraphEvent event) override
+  {
+    if (event == EVENT_FINISHED) {
+      nsCOMPtr<nsIRunnable> event =
+        NS_NewRunnableMethod(this, &DecodedStreamGraphListener::DoNotifyFinished);
+      aGraph->DispatchToMainThreadAfterStreamStateUpdate(event.forget());
+    }
+  }
+
+  void DoNotifyFinished()
+  {
+    MutexAutoLock lock(mMutex);
+    mStreamFinishedOnMainThread = true;
+  }
+
+  int64_t GetLastOutputTime()
+  {
+    MutexAutoLock lock(mMutex);
+    return mLastOutputTime;
+  }
+
+  void Forget()
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+    mData = nullptr;
+    MutexAutoLock lock(mMutex);
+    mStream = nullptr;
+  }
+
+  bool IsFinishedOnMainThread()
+  {
+    MutexAutoLock lock(mMutex);
+    return mStreamFinishedOnMainThread;
+  }
+
+private:
+  // Main thread only
+  DecodedStreamData* mData;
+
+  Mutex mMutex;
+  // Members below are protected by mMutex.
+  nsRefPtr<MediaStream> mStream;
+  int64_t mLastOutputTime; // microseconds
+  bool mStreamFinishedOnMainThread;
+};
+
+DecodedStreamData::DecodedStreamData(MediaDecoder* aDecoder,
+                                     int64_t aInitialTime,
+                                     SourceMediaStream* aStream)
+  : mAudioFramesWritten(0)
+  , mInitialTime(aInitialTime)
+  , mNextVideoTime(-1)
+  , mNextAudioTime(-1)
+  , mDecoder(aDecoder)
+  , mStreamInitialized(false)
+  , mHaveSentFinish(false)
+  , mHaveSentFinishAudio(false)
+  , mHaveSentFinishVideo(false)
+  , mStream(aStream)
+  , mHaveBlockedForPlayState(false)
+  , mHaveBlockedForStateMachineNotPlaying(false)
+  , mEOSVideoCompensation(false)
+{
+  mListener = new DecodedStreamGraphListener(mStream, this);
+  mStream->AddListener(mListener);
+}
+
+DecodedStreamData::~DecodedStreamData()
+{
+  mListener->Forget();
+  mStream->Destroy();
+}
+
+bool
+DecodedStreamData::IsFinished() const
+{
+  return mListener->IsFinishedOnMainThread();
+}
+
+int64_t
+DecodedStreamData::GetClock() const
+{
+  return mInitialTime + mListener->GetLastOutputTime();
+}
+
+class OutputStreamListener : public MediaStreamListener {
+  typedef MediaStreamListener::MediaStreamGraphEvent MediaStreamGraphEvent;
+public:
+  OutputStreamListener(MediaDecoder* aDecoder, MediaStream* aStream)
+    : mDecoder(aDecoder), mStream(aStream) {}
+
+  void NotifyEvent(MediaStreamGraph* aGraph, MediaStreamGraphEvent event) override
+  {
+    if (event == EVENT_FINISHED) {
+      nsCOMPtr<nsIRunnable> r = NS_NewRunnableMethod(
+        this, &OutputStreamListener::DoNotifyFinished);
+      aGraph->DispatchToMainThreadAfterStreamStateUpdate(r.forget());
+    }
+  }
+
+  void Forget()
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+    mDecoder = nullptr;
+  }
+
+private:
+  void DoNotifyFinished()
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+    if (!mDecoder) {
+      return;
+    }
+
+    // Remove the finished stream so it won't block the decoded stream.
+    ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
+    auto& streams = mDecoder->OutputStreams();
+    // Don't read |mDecoder| in the loop since removing the element will lead
+    // to ~OutputStreamData() which will call Forget() to reset |mDecoder|.
+    for (int32_t i = streams.Length() - 1; i >= 0; --i) {
+      auto& os = streams[i];
+      MediaStream* p = os.mStream.get();
+      if (p == mStream.get()) {
+        if (os.mPort) {
+          os.mPort->Destroy();
+          os.mPort = nullptr;
+        }
+        streams.RemoveElementAt(i);
+        break;
+      }
+    }
+  }
+
+  // Main thread only
+  MediaDecoder* mDecoder;
+  nsRefPtr<MediaStream> mStream;
+};
+
+OutputStreamData::OutputStreamData()
+{
+  //
+}
+
+OutputStreamData::~OutputStreamData()
+{
+  mListener->Forget();
+}
+
+void
+OutputStreamData::Init(MediaDecoder* aDecoder, ProcessedMediaStream* aStream)
+{
+  mStream = aStream;
+  mListener = new OutputStreamListener(aDecoder, aStream);
+  aStream->AddListener(mListener);
+}
+
+DecodedStreamData*
+DecodedStream::GetData()
+{
+  return mData.get();
+}
+
+void
+DecodedStream::DestroyData()
+{
+  mData = nullptr;
+}
+
+void
+DecodedStream::RecreateData(MediaDecoder* aDecoder, int64_t aInitialTime,
+                            SourceMediaStream* aStream)
+{
+  MOZ_ASSERT(!mData);
+  mData.reset(new DecodedStreamData(aDecoder, aInitialTime, aStream));
+}
+
+nsTArray<OutputStreamData>&
+DecodedStream::OutputStreams()
+{
+  return mOutputStreams;
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/DecodedStream.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/DecodedStream.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/DecodedStream.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/DecodedStream.h	2015-05-25 20:43:39.000000000 +0000
@@ -0,0 +1,115 @@
+/* -*- 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 DecodedStream_h_
+#define DecodedStream_h_
+
+#include "nsRefPtr.h"
+#include "nsTArray.h"
+#include "mozilla/UniquePtr.h"
+#include "mozilla/gfx/Point.h"
+
+namespace mozilla {
+
+class MediaDecoder;
+class MediaInputPort;
+class SourceMediaStream;
+class ProcessedMediaStream;
+class DecodedStreamGraphListener;
+class OutputStreamData;
+class OutputStreamListener;
+
+namespace layers {
+class Image;
+}
+
+/*
+ * All MediaStream-related data is protected by the decoder's monitor.
+ * We have at most one DecodedStreamDaata per MediaDecoder. Its stream
+ * is used as the input for each ProcessedMediaStream created by calls to
+ * captureStream(UntilEnded). Seeking creates a new source stream, as does
+ * replaying after the input as ended. In the latter case, the new source is
+ * not connected to streams created by captureStreamUntilEnded.
+ */
+class DecodedStreamData {
+public:
+  DecodedStreamData(MediaDecoder* aDecoder, int64_t aInitialTime,
+                    SourceMediaStream* aStream);
+  ~DecodedStreamData();
+  bool IsFinished() const;
+  int64_t GetClock() const;
+
+  /* The following group of fields are protected by the decoder's monitor
+   * and can be read or written on any thread.
+   */
+  // Count of audio frames written to the stream
+  int64_t mAudioFramesWritten;
+  // Saved value of aInitialTime. Timestamp of the first audio and/or
+  // video packet written.
+  const int64_t mInitialTime; // microseconds
+  // mNextVideoTime is the end timestamp for the last packet sent to the stream.
+  // Therefore video packets starting at or after this time need to be copied
+  // to the output stream.
+  int64_t mNextVideoTime; // microseconds
+  int64_t mNextAudioTime; // microseconds
+  MediaDecoder* mDecoder;
+  // The last video image sent to the stream. Useful if we need to replicate
+  // the image.
+  nsRefPtr<layers::Image> mLastVideoImage;
+  gfx::IntSize mLastVideoImageDisplaySize;
+  // This is set to true when the stream is initialized (audio and
+  // video tracks added).
+  bool mStreamInitialized;
+  bool mHaveSentFinish;
+  bool mHaveSentFinishAudio;
+  bool mHaveSentFinishVideo;
+
+  // The decoder is responsible for calling Destroy() on this stream.
+  const nsRefPtr<SourceMediaStream> mStream;
+  nsRefPtr<DecodedStreamGraphListener> mListener;
+  // True when we've explicitly blocked this stream because we're
+  // not in PLAY_STATE_PLAYING. Used on the main thread only.
+  bool mHaveBlockedForPlayState;
+  // We also have an explicit blocker on the stream when
+  // mDecoderStateMachine is non-null and MediaDecoderStateMachine is false.
+  bool mHaveBlockedForStateMachineNotPlaying;
+  // True if we need to send a compensation video frame to ensure the
+  // StreamTime going forward.
+  bool mEOSVideoCompensation;
+};
+
+class OutputStreamData {
+public:
+  // Compiler-generated default constructor needs the complete definition
+  // of OutputStreamListener when constructing OutputStreamData. Provide our
+  // own default constructor for forward declaration of OutputStreamListener
+  // to work.
+  OutputStreamData();
+  ~OutputStreamData();
+  void Init(MediaDecoder* aDecoder, ProcessedMediaStream* aStream);
+  nsRefPtr<ProcessedMediaStream> mStream;
+  // mPort connects DecodedStreamData::mStream to our mStream.
+  nsRefPtr<MediaInputPort> mPort;
+  nsRefPtr<OutputStreamListener> mListener;
+};
+
+class DecodedStream {
+public:
+  DecodedStreamData* GetData();
+  void DestroyData();
+  void RecreateData(MediaDecoder* aDecoder, int64_t aInitialTime,
+                    SourceMediaStream* aStream);
+  nsTArray<OutputStreamData>& OutputStreams();
+
+private:
+  UniquePtr<DecodedStreamData> mData;
+  // Data about MediaStreams that are being fed by the decoder.
+  nsTArray<OutputStreamData> mOutputStreams;
+};
+
+} // namespace mozilla
+
+#endif // DecodedStream_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/DecoderTraits.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/DecoderTraits.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/DecoderTraits.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/DecoderTraits.cpp	2015-05-25 20:43:39.000000000 +0000
@@ -71,7 +71,9 @@
 #ifdef MOZ_FMP4
 #include "MP4Reader.h"
 #include "MP4Decoder.h"
+#include "MP4Demuxer.h"
 #endif
+#include "MediaFormatReader.h"
 
 namespace mozilla
 {
@@ -659,7 +661,9 @@
   }
 #ifdef MOZ_FMP4
   if (IsMP4SupportedType(aType)) {
-    decoderReader = new MP4Reader(aDecoder);
+    decoderReader = Preferences::GetBool("media.format-reader.mp4", true) ?
+      static_cast<MediaDecoderReader*>(new MediaFormatReader(aDecoder, new MP4Demuxer(aDecoder->GetResource()))) :
+      static_cast<MediaDecoderReader*>(new MP4Reader(aDecoder));
   } else
 #endif
 #ifdef MOZ_GSTREAMER
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/directshow/AudioSinkFilter.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/directshow/AudioSinkFilter.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/directshow/AudioSinkFilter.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/directshow/AudioSinkFilter.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -8,7 +8,7 @@
 #include "AudioSinkFilter.h"
 #include "AudioSinkInputPin.h"
 #include "VideoUtils.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 
 #include <initguid.h>
@@ -23,12 +23,8 @@
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
 PRLogModuleInfo* GetDirectShowLog();
-#define LOG(...) PR_LOG(GetDirectShowLog(), PR_LOG_DEBUG, (__VA_ARGS__))
-#else
-#define LOG(...)
-#endif
+#define LOG(...) MOZ_LOG(GetDirectShowLog(), PR_LOG_DEBUG, (__VA_ARGS__))
 
 AudioSinkFilter::AudioSinkFilter(const wchar_t* aObjectName, HRESULT* aOutResult)
   : BaseFilter(aObjectName, CLSID_MozAudioSinkFilter),
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/directshow/AudioSinkInputPin.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/directshow/AudioSinkInputPin.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/directshow/AudioSinkInputPin.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/directshow/AudioSinkInputPin.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -7,7 +7,7 @@
 #include "AudioSinkInputPin.h"
 #include "AudioSinkFilter.h"
 #include "SampleSink.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include <wmsdkidl.h>
 
@@ -15,12 +15,8 @@
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
 PRLogModuleInfo* GetDirectShowLog();
-#define LOG(...) PR_LOG(GetDirectShowLog(), PR_LOG_DEBUG, (__VA_ARGS__))
-#else
-#define LOG(...)
-#endif
+#define LOG(...) MOZ_LOG(GetDirectShowLog(), PR_LOG_DEBUG, (__VA_ARGS__))
 
 AudioSinkInputPin::AudioSinkInputPin(wchar_t* aObjectName,
                                      AudioSinkFilter* aFilter,
@@ -143,7 +139,7 @@
     return nullptr;
   RefPtr<IMediaSeeking> seeking;
   peer->QueryInterface(static_cast<IMediaSeeking**>(byRef(seeking)));
-  return seeking;
+  return seeking.forget();
 }
 
 HRESULT
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/directshow/DirectShowReader.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/directshow/DirectShowReader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/directshow/DirectShowReader.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/directshow/DirectShowReader.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -17,8 +17,6 @@
 namespace mozilla {
 
 
-#ifdef PR_LOGGING
-
 PRLogModuleInfo*
 GetDirectShowLog() {
   static PRLogModuleInfo* log = nullptr;
@@ -28,11 +26,7 @@
   return log;
 }
 
-#define LOG(...) PR_LOG(GetDirectShowLog(), PR_LOG_DEBUG, (__VA_ARGS__))
-
-#else
-#define LOG(...)
-#endif
+#define LOG(...) MOZ_LOG(GetDirectShowLog(), PR_LOG_DEBUG, (__VA_ARGS__))
 
 DirectShowReader::DirectShowReader(AbstractMediaDecoder* aDecoder)
   : MediaDecoderReader(aDecoder),
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/directshow/DirectShowUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/directshow/DirectShowUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/directshow/DirectShowUtils.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/directshow/DirectShowUtils.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -16,8 +16,6 @@
 
 namespace mozilla {
 
-#if defined(PR_LOGGING)
-
 // Create a table which maps GUIDs to a string representation of the GUID.
 // This is useful for debugging purposes, for logging the GUIDs of media types.
 // This is only available when logging is enabled, i.e. not in release builds.
@@ -48,7 +46,6 @@
   }
   return "Unknown";
 }
-#endif // PR_LOGGING
 
 void
 RemoveGraphFromRunningObjectTable(DWORD aRotRegister)
@@ -301,7 +298,7 @@
     bool matches = FALSE;
     if (SUCCEEDED(MatchUnconnectedPin(pin, aPinDir, &matches)) &&
         matches) {
-      return pin;
+      return pin.forget();
     }
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/directshow/DirectShowUtils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/directshow/DirectShowUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/directshow/DirectShowUtils.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/directshow/DirectShowUtils.h	2015-05-25 20:43:40.000000000 +0000
@@ -17,7 +17,7 @@
 #undef GetPrevSibling
 
 #include "DShowTools.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 namespace mozilla {
 
@@ -112,11 +112,8 @@
   return double(aRefTime) / 10000000;
 }
 
-
-#if defined(PR_LOGGING)
 const char*
 GetDirectShowGuidName(const GUID& aGuid);
-#endif
 
 } // namespace mozilla
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/directshow/SampleSink.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/directshow/SampleSink.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/directshow/SampleSink.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/directshow/SampleSink.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -8,18 +8,14 @@
 #include "AudioSinkFilter.h"
 #include "AudioSinkInputPin.h"
 #include "VideoUtils.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 using namespace mozilla::media;
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
 PRLogModuleInfo* GetDirectShowLog();
-#define LOG(...) PR_LOG(GetDirectShowLog(), PR_LOG_DEBUG, (__VA_ARGS__))
-#else
-#define LOG(...)
-#endif
+#define LOG(...) MOZ_LOG(GetDirectShowLog(), PR_LOG_DEBUG, (__VA_ARGS__))
 
 SampleSink::SampleSink()
   : mMonitor("SampleSink"),
@@ -69,13 +65,13 @@
     mon.Wait();
   }
 
-#ifdef PR_LOGGING
-  REFERENCE_TIME start = 0, end = 0;
-  HRESULT hr = aSample->GetMediaTime(&start, &end);
-  LOG("SampleSink::Receive() [%4.2lf-%4.2lf]",
-      (double)RefTimeToUsecs(start) / USECS_PER_S,
-      (double)RefTimeToUsecs(end) / USECS_PER_S);
-#endif
+  if (PR_LOG_TEST(GetDirectShowLog(), PR_LOG_DEBUG)) {
+    REFERENCE_TIME start = 0, end = 0;
+    HRESULT hr = aSample->GetMediaTime(&start, &end);
+    LOG("SampleSink::Receive() [%4.2lf-%4.2lf]",
+        (double)RefTimeToUsecs(start) / USECS_PER_S,
+        (double)RefTimeToUsecs(end) / USECS_PER_S);
+  }
 
   mSample = aSample;
   // Notify the signal, to awaken the consumer thread in WaitForSample()
@@ -106,13 +102,13 @@
   }
   aOutSample = mSample;
 
-#ifdef PR_LOGGING
-  int64_t start = 0, end = 0;
-  mSample->GetMediaTime(&start, &end);
-  LOG("SampleSink::Extract() [%4.2lf-%4.2lf]",
-      (double)RefTimeToUsecs(start) / USECS_PER_S,
-      (double)RefTimeToUsecs(end) / USECS_PER_S);
-#endif
+  if (PR_LOG_TEST(GetDirectShowLog(), PR_LOG_DEBUG)) {
+    int64_t start = 0, end = 0;
+    mSample->GetMediaTime(&start, &end);
+    LOG("SampleSink::Extract() [%4.2lf-%4.2lf]",
+        (double)RefTimeToUsecs(start) / USECS_PER_S,
+        (double)RefTimeToUsecs(end) / USECS_PER_S);
+  }
 
   mSample = nullptr;
   // Notify the signal, to awaken the producer thread in Receive()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/directshow/SourceFilter.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/directshow/SourceFilter.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/directshow/SourceFilter.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/directshow/SourceFilter.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -9,7 +9,7 @@
 #include "mozilla/RefPtr.h"
 #include "DirectShowUtils.h"
 #include "MP3FrameParser.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include <algorithm>
 
 using namespace mozilla::media;
@@ -19,9 +19,9 @@
 // Define to trace what's on...
 //#define DEBUG_SOURCE_TRACE 1
 
-#if defined(PR_LOGGING) && defined (DEBUG_SOURCE_TRACE)
+#if defined (DEBUG_SOURCE_TRACE)
 PRLogModuleInfo* GetDirectShowLog();
-#define DIRECTSHOW_LOG(...) PR_LOG(GetDirectShowLog(), PR_LOG_DEBUG, (__VA_ARGS__))
+#define DIRECTSHOW_LOG(...) MOZ_LOG(GetDirectShowLog(), PR_LOG_DEBUG, (__VA_ARGS__))
 #else
 #define DIRECTSHOW_LOG(...)
 #endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/DOMMediaStream.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/DOMMediaStream.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/DOMMediaStream.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/DOMMediaStream.cpp	2015-05-25 20:43:39.000000000 +0000
@@ -14,6 +14,7 @@
 #include "mozilla/dom/AudioTrackList.h"
 #include "mozilla/dom/VideoTrack.h"
 #include "mozilla/dom/VideoTrackList.h"
+#include "mozilla/dom/HTMLCanvasElement.h"
 #include "MediaStreamGraph.h"
 #include "AudioStreamTrack.h"
 #include "VideoStreamTrack.h"
@@ -666,3 +667,4 @@
   stream->InitTrackUnionStream(aWindow, aGraph);
   return stream.forget();
 }
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/DOMMediaStream.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/DOMMediaStream.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/DOMMediaStream.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/DOMMediaStream.h	2015-05-25 20:43:39.000000000 +0000
@@ -36,6 +36,7 @@
 
 namespace dom {
 class AudioNode;
+class HTMLCanvasElement;
 class MediaStreamTrack;
 class AudioStreamTrack;
 class VideoStreamTrack;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/eme/CDMCaps.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/eme/CDMCaps.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/eme/CDMCaps.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/eme/CDMCaps.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -51,7 +51,6 @@
   mData.Unlock();
 }
 
-#ifdef PR_LOGGING
 static void
 TestCap(uint64_t aFlag,
         uint64_t aCaps,
@@ -77,7 +76,6 @@
   TestCap(GMP_EME_CAP_DECRYPT_AND_DECODE_VIDEO, aCaps, NS_LITERAL_CSTRING("DecryptAndDecodeVideo"), capsStr);
   return capsStr;
 }
-#endif // PR_LOGGING
 
 void
 CDMCaps::AutoLock::SetCaps(uint64_t aCaps)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/eme/EMEUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/eme/EMEUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/eme/EMEUtils.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/eme/EMEUtils.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -8,8 +8,6 @@
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
-
 PRLogModuleInfo* GetEMELog() {
   static PRLogModuleInfo* log = nullptr;
   if (!log) {
@@ -26,8 +24,6 @@
   return log;
 }
 
-#endif
-
 static bool
 ContainsOnlyDigits(const nsAString& aString)
 {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/eme/EMEUtils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/eme/EMEUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/eme/EMEUtils.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/eme/EMEUtils.h	2015-05-25 20:43:40.000000000 +0000
@@ -7,33 +7,21 @@
 #ifndef EME_LOG_H_
 #define EME_LOG_H_
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsString.h"
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
-
-  #ifndef EME_LOG
-    PRLogModuleInfo* GetEMELog();
-    #define EME_LOG(...) PR_LOG(GetEMELog(), PR_LOG_DEBUG, (__VA_ARGS__))
-  #endif
-
-  #ifndef EME_VERBOSE_LOG
-    PRLogModuleInfo* GetEMEVerboseLog();
-    #define EME_VERBOSE_LOG(...) PR_LOG(GetEMEVerboseLog(), PR_LOG_DEBUG, (__VA_ARGS__))
-  #else
-    #ifndef EME_LOG
-      #define EME_LOG(...)
-    #endif
-
-    #ifndef EME_VERBOSE_LOG
-      #define EME_VERBOSE_LOG(...)
-    #endif
-  #endif
-
+#ifndef EME_LOG
+  PRLogModuleInfo* GetEMELog();
+  #define EME_LOG(...) MOZ_LOG(GetEMELog(), PR_LOG_DEBUG, (__VA_ARGS__))
+  #define EME_LOG_ENABLED() PR_LOG_TEST(GetEMELog(), PR_LOG_DEBUG)
+#endif
+
+#ifndef EME_VERBOSE_LOG
+  PRLogModuleInfo* GetEMEVerboseLog();
+  #define EME_VERBOSE_LOG(...) MOZ_LOG(GetEMEVerboseLog(), PR_LOG_DEBUG, (__VA_ARGS__))
 #else
-
   #ifndef EME_LOG
     #define EME_LOG(...)
   #endif
@@ -41,8 +29,7 @@
   #ifndef EME_VERBOSE_LOG
     #define EME_VERBOSE_LOG(...)
   #endif
-
-#endif // PR_LOGGING
+#endif
 
 #define NO_CDM_VERSION -1
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/eme/MediaKeySession.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/eme/MediaKeySession.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/eme/MediaKeySession.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/eme/MediaKeySession.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -60,7 +60,7 @@
   if (aRv.Failed()) {
     return;
   }
-  mClosed = mKeys->MakePromise(aRv);
+  mClosed = MakePromise(aRv);
 }
 
 void MediaKeySession::SetSessionId(const nsAString& aSessionId)
@@ -138,24 +138,24 @@
 
   mKeyStatusMap->Update(keyStatuses);
 
-#ifdef PR_LOGGING
-  nsAutoCString message(
-    nsPrintfCString("MediaKeySession[%p,'%s'] key statuses change {",
-                    this, NS_ConvertUTF16toUTF8(mSessionId).get()));
-  for (const CDMCaps::KeyStatus& status : keyStatuses) {
-    nsAutoCString base64KeyId;
-    nsDependentCSubstring rawKeyId(reinterpret_cast<const char*>(status.mId.Elements()),
-                                   status.mId.Length());
-    nsresult rv = Base64Encode(rawKeyId, base64KeyId);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      continue;
+  if (EME_LOG_ENABLED()) {
+    nsAutoCString message(
+      nsPrintfCString("MediaKeySession[%p,'%s'] key statuses change {",
+                      this, NS_ConvertUTF16toUTF8(mSessionId).get()));
+    for (const CDMCaps::KeyStatus& status : keyStatuses) {
+      nsAutoCString base64KeyId;
+      nsDependentCSubstring rawKeyId(reinterpret_cast<const char*>(status.mId.Elements()),
+                                     status.mId.Length());
+      nsresult rv = Base64Encode(rawKeyId, base64KeyId);
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        continue;
+      }
+      message.Append(nsPrintfCString(" (%s,%s)", base64KeyId.get(),
+        MediaKeyStatusValues::strings[status.mStatus].value));
     }
-    message.Append(nsPrintfCString(" (%s,%s)", base64KeyId.get(),
-      MediaKeyStatusValues::strings[status.mStatus].value));
+    message.Append(" }");
+    EME_LOG(message.get());
   }
-  message.Append(" }");
-  EME_LOG(message.get());
-#endif
 }
 
 MediaKeyStatusMap*
@@ -169,7 +169,7 @@
                                  const ArrayBufferViewOrArrayBuffer& aInitData,
                                  ErrorResult& aRv)
 {
-  nsRefPtr<Promise> promise(mKeys->MakePromise(aRv));
+  nsRefPtr<Promise> promise(MakePromise(aRv));
   if (aRv.Failed()) {
     return nullptr;
   }
@@ -193,17 +193,17 @@
     return promise.forget();
   }
 
-#ifdef PR_LOGGING
   // Convert initData to base64 for easier logging.
   // Note: UpdateSession() Move()s the data out of the array, so we have
   // to copy it here.
   nsAutoCString base64InitData;
-  nsDependentCSubstring rawInitData(reinterpret_cast<const char*>(data.Elements()),
-    data.Length());
-  if (NS_FAILED(Base64Encode(rawInitData, base64InitData))) {
-    NS_WARNING("Failed to base64 encode initData for logging");
+  if (EME_LOG_ENABLED()) {
+    nsDependentCSubstring rawInitData(reinterpret_cast<const char*>(data.Elements()),
+      data.Length());
+    if (NS_FAILED(Base64Encode(rawInitData, base64InitData))) {
+      NS_WARNING("Failed to base64 encode initData for logging");
+    }
   }
-#endif
 
   PromiseId pid = mKeys->StorePromise(promise);
   mKeys->GetCDMProxy()->CreateSession(Token(),
@@ -224,7 +224,7 @@
 already_AddRefed<Promise>
 MediaKeySession::Load(const nsAString& aSessionId, ErrorResult& aRv)
 {
-  nsRefPtr<Promise> promise(mKeys->MakePromise(aRv));
+  nsRefPtr<Promise> promise(MakePromise(aRv));
   if (aRv.Failed()) {
     return nullptr;
   }
@@ -265,7 +265,7 @@
 already_AddRefed<Promise>
 MediaKeySession::Update(const ArrayBufferViewOrArrayBuffer& aResponse, ErrorResult& aRv)
 {
-  nsRefPtr<Promise> promise(mKeys->MakePromise(aRv));
+  nsRefPtr<Promise> promise(MakePromise(aRv));
   if (aRv.Failed()) {
     return nullptr;
   }
@@ -280,17 +280,17 @@
   }
 
 
-#ifdef PR_LOGGING
   // Convert response to base64 for easier logging.
   // Note: UpdateSession() Move()s the data out of the array, so we have
   // to copy it here.
   nsAutoCString base64Response;
-  nsDependentCSubstring rawResponse(reinterpret_cast<const char*>(data.Elements()),
-    data.Length());
-  if (NS_FAILED(Base64Encode(rawResponse, base64Response))) {
-    NS_WARNING("Failed to base64 encode response for logging");
+  if (EME_LOG_ENABLED()) {
+    nsDependentCSubstring rawResponse(reinterpret_cast<const char*>(data.Elements()),
+      data.Length());
+    if (NS_FAILED(Base64Encode(rawResponse, base64Response))) {
+      NS_WARNING("Failed to base64 encode response for logging");
+    }
   }
-#endif
 
   PromiseId pid = mKeys->StorePromise(promise);
   mKeys->GetCDMProxy()->UpdateSession(mSessionId,
@@ -310,7 +310,7 @@
 already_AddRefed<Promise>
 MediaKeySession::Close(ErrorResult& aRv)
 {
-  nsRefPtr<Promise> promise(mKeys->MakePromise(aRv));
+  nsRefPtr<Promise> promise(MakePromise(aRv));
   if (aRv.Failed()) {
     return nullptr;
   }
@@ -352,7 +352,7 @@
 already_AddRefed<Promise>
 MediaKeySession::Remove(ErrorResult& aRv)
 {
-  nsRefPtr<Promise> promise(mKeys->MakePromise(aRv));
+  nsRefPtr<Promise> promise(MakePromise(aRv));
   if (aRv.Failed()) {
     return nullptr;
   }
@@ -382,18 +382,18 @@
 MediaKeySession::DispatchKeyMessage(MediaKeyMessageType aMessageType,
                                     const nsTArray<uint8_t>& aMessage)
 {
-#ifdef PR_LOGGING
-  nsAutoCString base64MsgData;
-  nsDependentCSubstring rawMsgData(reinterpret_cast<const char*>(aMessage.Elements()),
-                                   aMessage.Length());
-  if (NS_FAILED(Base64Encode(rawMsgData, base64MsgData))) {
-    NS_WARNING("Failed to base64 encode message for logging");
-  }
-  EME_LOG("MediaKeySession[%p,'%s'] DispatchKeyMessage() type=%s message(base64)='%s'",
-          this, NS_ConvertUTF16toUTF8(mSessionId).get(),
-          MediaKeyMessageTypeValues::strings[uint32_t(aMessageType)].value,
-          base64MsgData.get());
-#endif
+  if (EME_LOG_ENABLED()) {
+    nsAutoCString base64MsgData;
+    nsDependentCSubstring rawMsgData(reinterpret_cast<const char*>(aMessage.Elements()),
+                                     aMessage.Length());
+    if (NS_FAILED(Base64Encode(rawMsgData, base64MsgData))) {
+      NS_WARNING("Failed to base64 encode message for logging");
+    }
+    EME_LOG("MediaKeySession[%p,'%s'] DispatchKeyMessage() type=%s message(base64)='%s'",
+            this, NS_ConvertUTF16toUTF8(mSessionId).get(),
+            MediaKeyMessageTypeValues::strings[uint32_t(aMessageType)].value,
+            base64MsgData.get());
+  }
 
   nsRefPtr<MediaKeyMessageEvent> event(
     MediaKeyMessageEvent::Constructor(this, aMessageType, aMessage));
@@ -434,5 +434,17 @@
   return mToken;
 }
 
+already_AddRefed<Promise>
+MediaKeySession::MakePromise(ErrorResult& aRv)
+{
+  nsCOMPtr<nsIGlobalObject> global = do_QueryInterface(GetParentObject());
+  if (!global) {
+    NS_WARNING("Passed non-global to MediaKeys ctor!");
+    aRv.Throw(NS_ERROR_UNEXPECTED);
+    return nullptr;
+  }
+  return Promise::Create(global, aRv);
+}
+
 } // namespace dom
 } // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/eme/MediaKeySession.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/eme/MediaKeySession.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/eme/MediaKeySession.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/eme/MediaKeySession.h	2015-05-25 20:43:40.000000000 +0000
@@ -97,6 +97,7 @@
   ~MediaKeySession();
 
   void UpdateKeyStatusMap();
+  already_AddRefed<Promise> MakePromise(ErrorResult& aRv);
 
   nsRefPtr<Promise> mClosed;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/EncodedBufferCache.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/EncodedBufferCache.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/EncodedBufferCache.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/EncodedBufferCache.cpp	2015-05-25 20:43:39.000000000 +0000
@@ -20,9 +20,24 @@
   mEncodedBuffers.AppendElement()->SwapElements(aBuf);
 
   if (!mTempFileEnabled && mDataSize > mMaxMemoryStorage) {
-    nsresult rv = NS_OpenAnonymousTemporaryFile(&mFD);
+    nsresult rv;
+    PRFileDesc* tempFD = nullptr;
+    {
+      // Release the mMutex because there is a sync dispatch to mainthread in
+      // NS_OpenAnonymousTemporaryFile.
+      MutexAutoUnlock unlock(mMutex);
+      rv = NS_OpenAnonymousTemporaryFile(&tempFD);
+    }
     if (!NS_FAILED(rv)) {
-      mTempFileEnabled = true;
+      // Check the mDataSize again since we release the mMutex before.
+      if (mDataSize > mMaxMemoryStorage) {
+        mFD = tempFD;
+        mTempFileEnabled = true;
+      } else {
+        // Close the tempFD because the data had been taken during the
+        // MutexAutoUnlock.
+        PR_Close(tempFD);
+      }
     }
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/encoder/MediaEncoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/encoder/MediaEncoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/encoder/MediaEncoder.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/encoder/MediaEncoder.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -6,7 +6,7 @@
 #include "MediaDecoder.h"
 #include "nsIPrincipal.h"
 #include "nsMimeTypes.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/StaticPtr.h"
 
@@ -31,12 +31,8 @@
 #undef LOG
 #endif
 
-#ifdef PR_LOGGING
 PRLogModuleInfo* gMediaEncoderLog;
-#define LOG(type, msg) PR_LOG(gMediaEncoderLog, type, msg)
-#else
-#define LOG(type, msg)
-#endif
+#define LOG(type, msg) MOZ_LOG(gMediaEncoderLog, type, msg)
 
 namespace mozilla {
 
@@ -79,11 +75,9 @@
 already_AddRefed<MediaEncoder>
 MediaEncoder::CreateEncoder(const nsAString& aMIMEType, uint8_t aTrackTypes)
 {
-#ifdef PR_LOGGING
   if (!gMediaEncoderLog) {
     gMediaEncoderLog = PR_NewLogModule("MediaEncoder");
   }
-#endif
   PROFILER_LABEL("MediaEncoder", "CreateEncoder",
     js::ProfileEntry::Category::OTHER);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/encoder/TrackEncoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/encoder/TrackEncoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/encoder/TrackEncoder.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/encoder/TrackEncoder.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -5,7 +5,7 @@
 #include "TrackEncoder.h"
 #include "AudioChannelFormat.h"
 #include "MediaStreamGraph.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "VideoUtils.h"
 
 #undef LOG
@@ -18,12 +18,8 @@
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
 PRLogModuleInfo* gTrackEncoderLog;
-#define TRACK_LOG(type, msg) PR_LOG(gTrackEncoderLog, type, msg)
-#else
-#define TRACK_LOG(type, msg)
-#endif
+#define TRACK_LOG(type, msg) MOZ_LOG(gTrackEncoderLog, type, msg)
 
 static const int DEFAULT_CHANNELS = 1;
 static const int DEFAULT_SAMPLING_RATE = 16000;
@@ -38,16 +34,12 @@
   , mInitialized(false)
   , mEndOfStream(false)
   , mCanceled(false)
-#ifdef PR_LOGGING
   , mAudioInitCounter(0)
   , mVideoInitCounter(0)
-#endif
 {
-#ifdef PR_LOGGING
   if (!gTrackEncoderLog) {
     gTrackEncoderLog = PR_NewLogModule("TrackEncoder");
   }
-#endif
 }
 
 void
@@ -65,10 +57,8 @@
 
   // Check and initialize parameters for codec encoder.
   if (!mInitialized) {
-#ifdef PR_LOGGING
     mAudioInitCounter++;
     TRACK_LOG(PR_LOG_DEBUG, ("Init the audio encoder %d times", mAudioInitCounter));
-#endif
     AudioSegment::ChunkIterator iter(const_cast<AudioSegment&>(audio));
     while (!iter.IsEnded()) {
       AudioChunk chunk = *iter;
@@ -193,10 +183,8 @@
 
    // Check and initialize parameters for codec encoder.
   if (!mInitialized) {
-#ifdef PR_LOGGING
     mVideoInitCounter++;
     TRACK_LOG(PR_LOG_DEBUG, ("Init the video encoder %d times", mVideoInitCounter));
-#endif
     VideoSegment::ChunkIterator iter(const_cast<VideoSegment&>(video));
     while (!iter.IsEnded()) {
       VideoChunk chunk = *iter;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/encoder/TrackEncoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/encoder/TrackEncoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/encoder/TrackEncoder.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/encoder/TrackEncoder.h	2015-05-25 20:43:40.000000000 +0000
@@ -129,11 +129,9 @@
    */
   bool mCanceled;
 
-#ifdef PR_LOGGING
   // How many times we have tried to initialize the encoder.
   uint32_t mAudioInitCounter;
   uint32_t mVideoInitCounter;
-#endif
 };
 
 class AudioTrackEncoder : public TrackEncoder
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/encoder/VorbisTrackEncoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/encoder/VorbisTrackEncoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/encoder/VorbisTrackEncoder.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/encoder/VorbisTrackEncoder.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -17,23 +17,17 @@
 namespace mozilla {
 
 #undef LOG
-#ifdef PR_LOGGING
 PRLogModuleInfo* gVorbisTrackEncoderLog;
-#define VORBISLOG(msg, ...) PR_LOG(gVorbisTrackEncoderLog, PR_LOG_DEBUG, \
+#define VORBISLOG(msg, ...) MOZ_LOG(gVorbisTrackEncoderLog, PR_LOG_DEBUG, \
                              (msg, ##__VA_ARGS__))
-#else
-#define VORBISLOG(msg, ...)
-#endif
 
 VorbisTrackEncoder::VorbisTrackEncoder()
   : AudioTrackEncoder()
 {
   MOZ_COUNT_CTOR(VorbisTrackEncoder);
-#ifdef PR_LOGGING
   if (!gVorbisTrackEncoderLog) {
     gVorbisTrackEncoderLog = PR_NewLogModule("VorbisTrackEncoder");
   }
-#endif
 }
 
 VorbisTrackEncoder::~VorbisTrackEncoder()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/encoder/VP8TrackEncoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/encoder/VP8TrackEncoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/encoder/VP8TrackEncoder.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/encoder/VP8TrackEncoder.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -15,14 +15,10 @@
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
 PRLogModuleInfo* gVP8TrackEncoderLog;
-#define VP8LOG(msg, ...) PR_LOG(gVP8TrackEncoderLog, PR_LOG_DEBUG, \
+#define VP8LOG(msg, ...) MOZ_LOG(gVP8TrackEncoderLog, PR_LOG_DEBUG, \
                                   (msg, ##__VA_ARGS__))
 // Debug logging macro with object pointer and class name.
-#else
-#define VP8LOG(msg, ...)
-#endif
 
 #define DEFAULT_BITRATE 2500 // in kbit/s
 #define DEFAULT_ENCODE_FRAMERATE 30
@@ -38,11 +34,9 @@
   , mVPXImageWrapper(new vpx_image_t())
 {
   MOZ_COUNT_CTOR(VP8TrackEncoder);
-#ifdef PR_LOGGING
   if (!gVP8TrackEncoderLog) {
     gVP8TrackEncoderLog = PR_NewLogModule("VP8TrackEncoder");
   }
-#endif
 }
 
 VP8TrackEncoder::~VP8TrackEncoder()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/android/AndroidDecoderModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/android/AndroidDecoderModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/android/AndroidDecoderModule.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/android/AndroidDecoderModule.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,651 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "AndroidDecoderModule.h"
-#include "AndroidBridge.h"
-#include "GLBlitHelper.h"
-#include "GLContext.h"
-#include "GLContextEGL.h"
-#include "GLContextProvider.h"
-#include "GLImages.h"
-#include "GLLibraryEGL.h"
-
-#include "MediaData.h"
-#include "MediaInfo.h"
-
-#include "nsThreadUtils.h"
-#include "nsAutoPtr.h"
-#include "nsPromiseFlatString.h"
-
-#include <jni.h>
-#include <string.h>
-
-using namespace mozilla;
-using namespace mozilla::gl;
-using namespace mozilla::widget::sdk;
-
-namespace mozilla {
-
-static MediaCodec::LocalRef CreateDecoder(const nsACString& aMimeType)
-{
-  MediaCodec::LocalRef codec;
-  NS_ENSURE_SUCCESS(MediaCodec::CreateDecoderByType(PromiseFlatCString(aMimeType).get(), &codec), nullptr);
-  return codec;
-}
-
-class VideoDataDecoder : public MediaCodecDataDecoder {
-public:
-  VideoDataDecoder(const VideoInfo& aConfig,
-                   MediaFormat::Param aFormat, MediaDataDecoderCallback* aCallback,
-                   layers::ImageContainer* aImageContainer)
-    : MediaCodecDataDecoder(MediaData::Type::VIDEO_DATA, aConfig.mMimeType, aFormat, aCallback)
-    , mImageContainer(aImageContainer)
-    , mConfig(aConfig)
-  {
-
-  }
-
-  nsresult Init() override {
-    mSurfaceTexture = AndroidSurfaceTexture::Create();
-    if (!mSurfaceTexture) {
-      NS_WARNING("Failed to create SurfaceTexture for video decode\n");
-      return NS_ERROR_FAILURE;
-    }
-
-    return InitDecoder(mSurfaceTexture->JavaSurface());
-  }
-
-  void Cleanup() override {
-    mGLContext = nullptr;
-  }
-
-  virtual nsresult Input(MediaRawData* aSample) override {
-    return MediaCodecDataDecoder::Input(aSample);
-  }
-
-  bool WantCopy() {
-    // Allocating a texture is incredibly slow on PowerVR
-    return mGLContext->Vendor() != GLVendor::Imagination;
-  }
-
-  EGLImage CopySurface(layers::Image* img) {
-    mGLContext->MakeCurrent();
-
-    GLuint tex = CreateTextureForOffscreen(mGLContext, mGLContext->GetGLFormats(),
-                                           img->GetSize());
-
-    auto helper = mGLContext->BlitHelper();
-    const gl::OriginPos destOrigin = gl::OriginPos::TopLeft;
-    if (!helper->BlitImageToTexture(img, img->GetSize(), tex, LOCAL_GL_TEXTURE_2D,
-                                    destOrigin))
-    {
-      mGLContext->fDeleteTextures(1, &tex);
-      return nullptr;
-    }
-
-    EGLint attribs[] = {
-      LOCAL_EGL_IMAGE_PRESERVED_KHR, LOCAL_EGL_TRUE,
-      LOCAL_EGL_NONE, LOCAL_EGL_NONE
-    };
-
-    EGLContext eglContext = static_cast<GLContextEGL*>(mGLContext.get())->GetEGLContext();
-    EGLImage eglImage = sEGLLibrary.fCreateImage(EGL_DISPLAY(), eglContext,
-                                                 LOCAL_EGL_GL_TEXTURE_2D_KHR,
-                                                 (EGLClientBuffer)tex, attribs);
-    mGLContext->fDeleteTextures(1, &tex);
-
-    return eglImage;
-  }
-
-  virtual nsresult PostOutput(BufferInfo::Param aInfo, MediaFormat::Param aFormat, Microseconds aDuration) override {
-    if (!EnsureGLContext()) {
-      return NS_ERROR_FAILURE;
-    }
-
-    nsRefPtr<layers::Image> img = mImageContainer->CreateImage(ImageFormat::SURFACE_TEXTURE);
-    layers::SurfaceTextureImage::Data data;
-    data.mSurfTex = mSurfaceTexture.get();
-    data.mSize = mConfig.mDisplay;
-    data.mOriginPos = gl::OriginPos::BottomLeft;
-
-    layers::SurfaceTextureImage* stImg = static_cast<layers::SurfaceTextureImage*>(img.get());
-    stImg->SetData(data);
-
-    if (WantCopy()) {
-      EGLImage eglImage = CopySurface(img);
-      if (!eglImage) {
-        return NS_ERROR_FAILURE;
-      }
-
-      EGLSync eglSync = nullptr;
-      if (sEGLLibrary.IsExtensionSupported(GLLibraryEGL::KHR_fence_sync) &&
-          mGLContext->IsExtensionSupported(GLContext::OES_EGL_sync))
-      {
-        MOZ_ASSERT(mGLContext->IsCurrent());
-        eglSync = sEGLLibrary.fCreateSync(EGL_DISPLAY(),
-                                          LOCAL_EGL_SYNC_FENCE,
-                                          nullptr);
-        MOZ_ASSERT(eglSync);
-        mGLContext->fFlush();
-      } else {
-        NS_WARNING("No EGL fence support detected, rendering artifacts may occur!");
-      }
-
-      img = mImageContainer->CreateImage(ImageFormat::EGLIMAGE);
-      layers::EGLImageImage::Data data;
-      data.mImage = eglImage;
-      data.mSync = eglSync;
-      data.mOwns = true;
-      data.mSize = mConfig.mDisplay;
-      data.mOriginPos = gl::OriginPos::TopLeft;
-
-      layers::EGLImageImage* typedImg = static_cast<layers::EGLImageImage*>(img.get());
-      typedImg->SetData(data);
-    }
-
-    nsresult rv;
-    int32_t flags;
-    NS_ENSURE_SUCCESS(rv = aInfo->Flags(&flags), rv);
-
-    bool isSync = !!(flags & MediaCodec::BUFFER_FLAG_SYNC_FRAME);
-
-    int32_t offset;
-    NS_ENSURE_SUCCESS(rv = aInfo->Offset(&offset), rv);
-
-    int64_t presentationTimeUs;
-    NS_ENSURE_SUCCESS(rv = aInfo->PresentationTimeUs(&presentationTimeUs), rv);
-
-    nsRefPtr<VideoData> v =
-      VideoData::CreateFromImage(mConfig,
-                                 mImageContainer,
-                                 offset,
-                                 presentationTimeUs,
-                                 aDuration,
-                                 img,
-                                 isSync,
-                                 presentationTimeUs,
-                                 gfx::IntRect(0, 0,
-                                              mConfig.mDisplay.width,
-                                              mConfig.mDisplay.height));
-    mCallback->Output(v);
-    return NS_OK;
-  }
-
-protected:
-  bool EnsureGLContext() {
-    if (mGLContext) {
-      return true;
-    }
-
-    mGLContext = GLContextProvider::CreateHeadless(false);
-    return mGLContext;
-  }
-
-  layers::ImageContainer* mImageContainer;
-  const VideoInfo& mConfig;
-  RefPtr<AndroidSurfaceTexture> mSurfaceTexture;
-  nsRefPtr<GLContext> mGLContext;
-};
-
-class AudioDataDecoder : public MediaCodecDataDecoder {
-private:
-  uint8_t csd0[2];
-
-public:
-  AudioDataDecoder(const AudioInfo& aConfig, MediaFormat::Param aFormat, MediaDataDecoderCallback* aCallback)
-    : MediaCodecDataDecoder(MediaData::Type::AUDIO_DATA, aConfig.mMimeType, aFormat, aCallback)
-  {
-    JNIEnv* env = GetJNIForThread();
-
-    jni::Object::LocalRef buffer(env);
-    NS_ENSURE_SUCCESS_VOID(aFormat->GetByteBuffer(NS_LITERAL_STRING("csd-0"), &buffer));
-
-    if (!buffer && aConfig.mCodecSpecificConfig->Length() >= 2) {
-      csd0[0] = (*aConfig.mCodecSpecificConfig)[0];
-      csd0[1] = (*aConfig.mCodecSpecificConfig)[1];
-
-      buffer = jni::Object::LocalRef::Adopt(env, env->NewDirectByteBuffer(csd0, 2));
-      NS_ENSURE_SUCCESS_VOID(aFormat->SetByteBuffer(NS_LITERAL_STRING("csd-0"), buffer));
-    }
-  }
-
-  nsresult Output(BufferInfo::Param aInfo, void* aBuffer, MediaFormat::Param aFormat, Microseconds aDuration) {
-    // The output on Android is always 16-bit signed
-
-    nsresult rv;
-    int32_t numChannels;
-    NS_ENSURE_SUCCESS(rv =
-        aFormat->GetInteger(NS_LITERAL_STRING("channel-count"), &numChannels), rv);
-
-    int32_t sampleRate;
-    NS_ENSURE_SUCCESS(rv =
-        aFormat->GetInteger(NS_LITERAL_STRING("sample-rate"), &sampleRate), rv);
-
-    int32_t size;
-    NS_ENSURE_SUCCESS(rv = aInfo->Size(&size), rv);
-
-    const int32_t numFrames = (size / numChannels) / 2;
-    AudioDataValue* audio = new AudioDataValue[size];
-    PodCopy(audio, static_cast<AudioDataValue*>(aBuffer), size);
-
-    int32_t offset;
-    NS_ENSURE_SUCCESS(rv = aInfo->Offset(&offset), rv);
-
-    int64_t presentationTimeUs;
-    NS_ENSURE_SUCCESS(rv = aInfo->PresentationTimeUs(&presentationTimeUs), rv);
-
-    nsRefPtr<AudioData> data = new AudioData(offset, presentationTimeUs,
-                                             aDuration,
-                                             numFrames,
-                                             audio,
-                                             numChannels,
-                                             sampleRate);
-    mCallback->Output(data);
-    return NS_OK;
-  }
-};
-
-
-bool AndroidDecoderModule::SupportsMimeType(const nsACString& aMimeType)
-{
-  if (aMimeType.EqualsLiteral("video/mp4") ||
-      aMimeType.EqualsLiteral("video/avc")) {
-    return true;
-  }
-  return static_cast<bool>(mozilla::CreateDecoder(aMimeType));
-}
-
-already_AddRefed<MediaDataDecoder>
-AndroidDecoderModule::CreateVideoDecoder(
-                                const VideoInfo& aConfig,
-                                layers::LayersBackend aLayersBackend,
-                                layers::ImageContainer* aImageContainer,
-                                FlushableMediaTaskQueue* aVideoTaskQueue,
-                                MediaDataDecoderCallback* aCallback)
-{
-  MediaFormat::LocalRef format;
-
-  NS_ENSURE_SUCCESS(MediaFormat::CreateVideoFormat(
-      aConfig.mMimeType,
-      aConfig.mDisplay.width,
-      aConfig.mDisplay.height,
-      &format), nullptr);
-
-  nsRefPtr<MediaDataDecoder> decoder =
-    new VideoDataDecoder(aConfig, format, aCallback, aImageContainer);
-
-  return decoder.forget();
-}
-
-already_AddRefed<MediaDataDecoder>
-AndroidDecoderModule::CreateAudioDecoder(const AudioInfo& aConfig,
-                                         FlushableMediaTaskQueue* aAudioTaskQueue,
-                                         MediaDataDecoderCallback* aCallback)
-{
-  MOZ_ASSERT(aConfig.mBitDepth == 16, "We only handle 16-bit audio!");
-
-  MediaFormat::LocalRef format;
-
-  NS_ENSURE_SUCCESS(MediaFormat::CreateAudioFormat(
-      aConfig.mMimeType,
-      aConfig.mBitDepth,
-      aConfig.mChannels,
-      &format), nullptr);
-
-  nsRefPtr<MediaDataDecoder> decoder =
-    new AudioDataDecoder(aConfig, format, aCallback);
-
-  return decoder.forget();
-
-}
-
-PlatformDecoderModule::ConversionRequired
-AndroidDecoderModule::DecoderNeedsConversion(const TrackInfo& aConfig) const
-{
-  if (aConfig.IsVideo()) {
-    return kNeedAnnexB;
-  } else {
-    return kNeedNone;
-  }
-}
-
-MediaCodecDataDecoder::MediaCodecDataDecoder(MediaData::Type aType,
-                                             const nsACString& aMimeType,
-                                             MediaFormat::Param aFormat,
-                                             MediaDataDecoderCallback* aCallback)
-  : mType(aType)
-  , mMimeType(aMimeType)
-  , mFormat(aFormat)
-  , mCallback(aCallback)
-  , mInputBuffers(nullptr)
-  , mOutputBuffers(nullptr)
-  , mMonitor("MediaCodecDataDecoder::mMonitor")
-  , mFlushing(false)
-  , mDraining(false)
-  , mStopping(false)
-{
-
-}
-
-MediaCodecDataDecoder::~MediaCodecDataDecoder()
-{
-  Shutdown();
-}
-
-nsresult MediaCodecDataDecoder::Init()
-{
-  return InitDecoder(nullptr);
-}
-
-nsresult MediaCodecDataDecoder::InitDecoder(Surface::Param aSurface)
-{
-  mDecoder = CreateDecoder(mMimeType);
-  if (!mDecoder) {
-    mCallback->Error();
-    return NS_ERROR_FAILURE;
-  }
-
-  nsresult rv;
-  NS_ENSURE_SUCCESS(rv = mDecoder->Configure(mFormat, aSurface, nullptr, 0), rv);
-  NS_ENSURE_SUCCESS(rv = mDecoder->Start(), rv);
-
-  NS_ENSURE_SUCCESS(rv = ResetInputBuffers(), rv);
-  NS_ENSURE_SUCCESS(rv = ResetOutputBuffers(), rv);
-
-  NS_NewNamedThread("MC Decoder", getter_AddRefs(mThread),
-                    NS_NewRunnableMethod(this, &MediaCodecDataDecoder::DecoderLoop));
-
-  return NS_OK;
-}
-
-// 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; \
-  }
-
-nsresult MediaCodecDataDecoder::GetInputBuffer(JNIEnv* env, int index, jni::Object::LocalRef* buffer)
-{
-  bool retried = false;
-  while (!*buffer) {
-    *buffer = jni::Object::LocalRef::Adopt(env->GetObjectArrayElement(mInputBuffers.Get(), index));
-    if (!*buffer) {
-      if (!retried) {
-        // Reset the input buffers and then try again
-        nsresult res = ResetInputBuffers();
-        if (NS_FAILED(res)) {
-          return res;
-        }
-        retried = true;
-      } else {
-        // We already tried resetting the input buffers, return an error
-        return NS_ERROR_FAILURE;
-      }
-    }
-  }
-
-  return NS_OK;
-}
-
-void MediaCodecDataDecoder::DecoderLoop()
-{
-  bool outputDone = false;
-
-  bool draining = false;
-  bool waitingEOF = false;
-
-  AutoLocalJNIFrame frame(GetJNIForThread(), 1);
-  nsRefPtr<MediaRawData> sample;
-
-  MediaFormat::LocalRef outputFormat(frame.GetEnv());
-  nsresult res;
-
-  for (;;) {
-    {
-      MonitorAutoLock lock(mMonitor);
-      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();
-        }
-        lock.Wait();
-      }
-
-      if (mStopping) {
-        // Get out of the loop. This is the only exit point.
-        break;
-      }
-
-      if (mFlushing) {
-        mDecoder->Flush();
-        ClearQueue();
-        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");
-
-      int32_t inputIndex;
-      res = mDecoder->DequeueInputBuffer(DECODER_TIMEOUT, &inputIndex);
-      HANDLE_DECODER_ERROR();
-
-      if (inputIndex >= 0) {
-        res = mDecoder->QueueInputBuffer(inputIndex, 0, 0, 0, MediaCodec::BUFFER_FLAG_END_OF_STREAM);
-        HANDLE_DECODER_ERROR();
-
-        waitingEOF = true;
-      }
-    }
-
-    if (sample) {
-      // We have a sample, try to feed it to the decoder
-      int inputIndex;
-      res = mDecoder->DequeueInputBuffer(DECODER_TIMEOUT, &inputIndex);
-      HANDLE_DECODER_ERROR();
-
-      if (inputIndex >= 0) {
-        jni::Object::LocalRef buffer(frame.GetEnv());
-        res = GetInputBuffer(frame.GetEnv(), inputIndex, &buffer);
-        HANDLE_DECODER_ERROR();
-
-        void* directBuffer = frame.GetEnv()->GetDirectBufferAddress(buffer.Get());
-
-        MOZ_ASSERT(frame.GetEnv()->GetDirectBufferCapacity(buffer.Get()) >= sample->mSize,
-          "Decoder buffer is not large enough for sample");
-
-        {
-          // We're feeding this to the decoder, so remove it from the queue
-          MonitorAutoLock lock(mMonitor);
-          mQueue.pop();
-        }
-
-        PodCopy((uint8_t*)directBuffer, sample->mData, sample->mSize);
-
-        res = mDecoder->QueueInputBuffer(inputIndex, 0, sample->mSize,
-                                         sample->mTime, 0);
-        HANDLE_DECODER_ERROR();
-
-        mDurations.push(sample->mDuration);
-        sample = nullptr;
-        outputDone = false;
-      }
-    }
-
-    if (!outputDone) {
-      BufferInfo::LocalRef bufferInfo;
-      res = BufferInfo::New(&bufferInfo);
-      HANDLE_DECODER_ERROR();
-
-      int32_t outputStatus;
-      res = mDecoder->DequeueOutputBuffer(bufferInfo, DECODER_TIMEOUT, &outputStatus);
-      HANDLE_DECODER_ERROR();
-
-      if (outputStatus == MediaCodec::INFO_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::INFO_OUTPUT_BUFFERS_CHANGED) {
-        res = ResetOutputBuffers();
-        HANDLE_DECODER_ERROR();
-      } else if (outputStatus == MediaCodec::INFO_OUTPUT_FORMAT_CHANGED) {
-        res = mDecoder->GetOutputFormat(ReturnTo(&outputFormat));
-        HANDLE_DECODER_ERROR();
-      } else if (outputStatus < 0) {
-        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 {
-        int32_t flags;
-        res = bufferInfo->Flags(&flags);
-        HANDLE_DECODER_ERROR();
-
-        // We have a valid buffer index >= 0 here
-        if (flags & MediaCodec::BUFFER_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");
-
-        Microseconds duration = 0;
-        if (!mDurations.empty()) {
-          duration = mDurations.front();
-          mDurations.pop();
-        }
-
-        auto buffer = jni::Object::LocalRef::Adopt(
-            frame.GetEnv()->GetObjectArrayElement(mOutputBuffers.Get(), outputStatus));
-        if (buffer) {
-          // The buffer will be null on Android L if we are decoding to a Surface
-          void* directBuffer = frame.GetEnv()->GetDirectBufferAddress(buffer.Get());
-          Output(bufferInfo, directBuffer, outputFormat, duration);
-        }
-
-        // The Surface will be updated at this point (for video)
-        mDecoder->ReleaseOutputBuffer(outputStatus, true);
-
-        PostOutput(bufferInfo, outputFormat, duration);
-      }
-    }
-  }
-
-  Cleanup();
-
-  // We're done
-  MonitorAutoLock lock(mMonitor);
-  mStopping = false;
-  mMonitor.Notify();
-}
-
-void MediaCodecDataDecoder::ClearQueue()
-{
-  mMonitor.AssertCurrentThreadOwns();
-  while (!mQueue.empty()) {
-    mQueue.pop();
-  }
-  while (!mDurations.empty()) {
-    mDurations.pop();
-  }
-}
-
-nsresult MediaCodecDataDecoder::Input(MediaRawData* aSample) {
-  MonitorAutoLock lock(mMonitor);
-  mQueue.push(aSample);
-  lock.NotifyAll();
-
-  return NS_OK;
-}
-
-nsresult MediaCodecDataDecoder::ResetInputBuffers()
-{
-  return mDecoder->GetInputBuffers(ReturnTo(&mInputBuffers));
-}
-
-nsresult MediaCodecDataDecoder::ResetOutputBuffers()
-{
-  return mDecoder->GetOutputBuffers(ReturnTo(&mOutputBuffers));
-}
-
-nsresult MediaCodecDataDecoder::Flush() {
-  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();
-
-  return NS_OK;
-}
-
-
-nsresult MediaCodecDataDecoder::Shutdown() {
-  MonitorAutoLock lock(mMonitor);
-
-  if (!mThread || mStopping) {
-    // Already shutdown or in the process of doing so
-    return NS_OK;
-  }
-
-  mStopping = true;
-  lock.Notify();
-
-  while (mStopping) {
-    lock.Wait();
-  }
-
-  mThread->Shutdown();
-  mThread = nullptr;
-
-  mDecoder->Stop();
-  mDecoder->Release();
-
-  return NS_OK;
-}
-
-} // mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/android/AndroidDecoderModule.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/android/AndroidDecoderModule.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/android/AndroidDecoderModule.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/android/AndroidDecoderModule.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef AndroidDecoderModule_h_
-#define AndroidDecoderModule_h_
-
-#include "PlatformDecoderModule.h"
-#include "AndroidSurfaceTexture.h"
-
-#include "MediaCodec.h"
-#include "mozilla/Monitor.h"
-
-#include <queue>
-
-namespace mozilla {
-
-typedef std::queue<nsRefPtr<MediaRawData>> SampleQueue;
-
-class AndroidDecoderModule : public PlatformDecoderModule {
-public:
-  virtual already_AddRefed<MediaDataDecoder>
-  CreateVideoDecoder(const VideoInfo& aConfig,
-                     layers::LayersBackend aLayersBackend,
-                     layers::ImageContainer* aImageContainer,
-                     FlushableMediaTaskQueue* aVideoTaskQueue,
-                     MediaDataDecoderCallback* aCallback) override;
-
-  virtual already_AddRefed<MediaDataDecoder>
-  CreateAudioDecoder(const AudioInfo& aConfig,
-                     FlushableMediaTaskQueue* aAudioTaskQueue,
-                     MediaDataDecoderCallback* aCallback) override;
-
-
-  AndroidDecoderModule() {}
-  virtual ~AndroidDecoderModule() {}
-
-  virtual bool SupportsMimeType(const nsACString& aMimeType) override;
-
-  virtual ConversionRequired
-  DecoderNeedsConversion(const TrackInfo& aConfig) const override;
-};
-
-class MediaCodecDataDecoder : public MediaDataDecoder {
-public:
-
-  MediaCodecDataDecoder(MediaData::Type aType,
-                        const nsACString& aMimeType,
-                        widget::sdk::MediaFormat::Param aFormat,
-                        MediaDataDecoderCallback* aCallback);
-
-  virtual ~MediaCodecDataDecoder();
-
-  virtual nsresult Init() override;
-  virtual nsresult Flush() override;
-  virtual nsresult Drain() override;
-  virtual nsresult Shutdown() override;
-  virtual nsresult Input(MediaRawData* aSample);
-
-protected:
-  friend class AndroidDecoderModule;
-
-  MediaData::Type mType;
-
-  nsAutoCString mMimeType;
-  widget::sdk::MediaFormat::GlobalRef mFormat;
-
-  MediaDataDecoderCallback* mCallback;
-
-  widget::sdk::MediaCodec::GlobalRef mDecoder;
-
-  jni::ObjectArray::GlobalRef mInputBuffers;
-  jni::ObjectArray::GlobalRef mOutputBuffers;
-
-  nsCOMPtr<nsIThread> mThread;
-
-  // Only these members are protected by mMonitor.
-  Monitor mMonitor;
-  bool mFlushing;
-  bool mDraining;
-  bool mStopping;
-
-  SampleQueue mQueue;
-  std::queue<Microseconds> mDurations;
-
-  virtual nsresult InitDecoder(widget::sdk::Surface::Param aSurface);
-
-  virtual nsresult Output(widget::sdk::BufferInfo::Param aInfo, void* aBuffer, widget::sdk::MediaFormat::Param aFormat, Microseconds aDuration) { return NS_OK; }
-  virtual nsresult PostOutput(widget::sdk::BufferInfo::Param aInfo, widget::sdk::MediaFormat::Param aFormat, Microseconds aDuration) { return NS_OK; }
-  virtual void Cleanup() {};
-
-  nsresult ResetInputBuffers();
-  nsresult ResetOutputBuffers();
-
-  void DecoderLoop();
-  nsresult GetInputBuffer(JNIEnv* env, int index, jni::Object::LocalRef* buffer);
-  virtual void ClearQueue();
-};
-
-} // namwspace mozilla
-
-#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleATDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleATDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleATDecoder.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleATDecoder.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,511 +0,0 @@
-/* -*- 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 "AppleUtils.h"
-#include "MP4Reader.h"
-#include "MP4Decoder.h"
-#include "mp4_demuxer/Adts.h"
-#include "MediaInfo.h"
-#include "AppleATDecoder.h"
-#include "prlog.h"
-
-#ifdef PR_LOGGING
-PRLogModuleInfo* GetAppleMediaLog();
-#define LOG(...) PR_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__))
-#else
-#define LOG(...)
-#endif
-#define FourCC2Str(n) ((char[5]){(char)(n >> 24), (char)(n >> 16), (char)(n >> 8), (char)(n), 0})
-
-namespace mozilla {
-
-AppleATDecoder::AppleATDecoder(const AudioInfo& aConfig,
-                               FlushableMediaTaskQueue* aAudioTaskQueue,
-                               MediaDataDecoderCallback* aCallback)
-  : mConfig(aConfig)
-  , mFileStreamError(false)
-  , mTaskQueue(aAudioTaskQueue)
-  , mCallback(aCallback)
-  , mConverter(nullptr)
-  , mStream(nullptr)
-{
-  MOZ_COUNT_CTOR(AppleATDecoder);
-  LOG("Creating Apple AudioToolbox decoder");
-  LOG("Audio Decoder configuration: %s %d Hz %d channels %d bits per channel",
-      mConfig.mMimeType.get(),
-      mConfig.mRate,
-      mConfig.mChannels,
-      mConfig.mBitDepth);
-
-  if (mConfig.mMimeType.EqualsLiteral("audio/mpeg")) {
-    mFormatID = kAudioFormatMPEGLayer3;
-  } else if (mConfig.mMimeType.EqualsLiteral("audio/mp4a-latm")) {
-    mFormatID = kAudioFormatMPEG4AAC;
-  } else {
-    mFormatID = 0;
-  }
-}
-
-AppleATDecoder::~AppleATDecoder()
-{
-  MOZ_COUNT_DTOR(AppleATDecoder);
-  MOZ_ASSERT(!mConverter);
-}
-
-nsresult
-AppleATDecoder::Init()
-{
-  if (!mFormatID) {
-    NS_ERROR("Non recognised format");
-    return NS_ERROR_FAILURE;
-  }
-  return NS_OK;
-}
-
-nsresult
-AppleATDecoder::Input(MediaRawData* aSample)
-{
-  LOG("mp4 input sample %p %lld us %lld pts%s %llu bytes audio",
-      aSample,
-      aSample->mDuration,
-      aSample->mTime,
-      aSample->mKeyframe ? " keyframe" : "",
-      (unsigned long long)aSample->mSize);
-
-  // Queue a task to perform the actual decoding on a separate thread.
-  mTaskQueue->Dispatch(
-      NS_NewRunnableMethodWithArg<nsRefPtr<MediaRawData>>(
-        this,
-        &AppleATDecoder::SubmitSample,
-        nsRefPtr<MediaRawData>(aSample)));
-
-  return NS_OK;
-}
-
-nsresult
-AppleATDecoder::Flush()
-{
-  LOG("Flushing AudioToolbox AAC decoder");
-  mTaskQueue->Flush();
-  mQueuedSamples.Clear();
-  OSStatus rv = AudioConverterReset(mConverter);
-  if (rv) {
-    LOG("Error %d resetting AudioConverter", rv);
-    return NS_ERROR_FAILURE;
-  }
-  return NS_OK;
-}
-
-nsresult
-AppleATDecoder::Drain()
-{
-  LOG("Draining AudioToolbox AAC decoder");
-  mTaskQueue->AwaitIdle();
-  mCallback->DrainComplete();
-  return Flush();
-}
-
-nsresult
-AppleATDecoder::Shutdown()
-{
-  LOG("Shutdown: Apple AudioToolbox AAC decoder");
-  mQueuedSamples.Clear();
-  OSStatus rv = AudioConverterDispose(mConverter);
-  if (rv) {
-    LOG("error %d disposing of AudioConverter", rv);
-    return NS_ERROR_FAILURE;
-  }
-  mConverter = nullptr;
-
-  if (mStream) {
-    rv = AudioFileStreamClose(mStream);
-    if (rv) {
-      LOG("error %d disposing of AudioFileStream", rv);
-      return NS_ERROR_FAILURE;
-    }
-    mStream = nullptr;
-  }
-  return NS_OK;
-}
-
-struct PassthroughUserData {
-  UInt32 mChannels;
-  UInt32 mDataSize;
-  const void* mData;
-  AudioStreamPacketDescription mPacket;
-};
-
-// Error value we pass through the decoder to signal that nothing
-// has gone wrong during decoding and we're done processing the packet.
-const uint32_t kNoMoreDataErr = 'MOAR';
-
-static OSStatus
-_PassthroughInputDataCallback(AudioConverterRef aAudioConverter,
-                              UInt32* aNumDataPackets /* in/out */,
-                              AudioBufferList* aData /* in/out */,
-                              AudioStreamPacketDescription** aPacketDesc,
-                              void* aUserData)
-{
-  PassthroughUserData* userData = (PassthroughUserData*)aUserData;
-  if (!userData->mDataSize) {
-    *aNumDataPackets = 0;
-    return kNoMoreDataErr;
-  }
-
-  if (aPacketDesc) {
-    userData->mPacket.mStartOffset = 0;
-    userData->mPacket.mVariableFramesInPacket = 0;
-    userData->mPacket.mDataByteSize = userData->mDataSize;
-    *aPacketDesc = &userData->mPacket;
-  }
-
-  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::SubmitSample(MediaRawData* aSample)
-{
-  nsresult rv = NS_OK;
-  if (!mConverter) {
-    rv = SetupDecoder(aSample);
-    if (rv != NS_OK && rv != NS_ERROR_NOT_INITIALIZED) {
-      mCallback->Error();
-      return;
-    }
-  }
-
-  mQueuedSamples.AppendElement(aSample);
-
-  if (rv == NS_OK) {
-    for (size_t i = 0; i < mQueuedSamples.Length(); i++) {
-      if (NS_FAILED(DecodeSample(mQueuedSamples[i]))) {
-        mQueuedSamples.Clear();
-        mCallback->Error();
-        return;
-      }
-    }
-    mQueuedSamples.Clear();
-  }
-
-  if (mTaskQueue->IsEmpty()) {
-    mCallback->InputExhausted();
-  }
-}
-
-nsresult
-AppleATDecoder::DecodeSample(MediaRawData* 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 * channels;
-
-  // Descriptions for _decompressed_ audio packets. ignored.
-  nsAutoArrayPtr<AudioStreamPacketDescription>
-    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.
-  PassthroughUserData userData =
-    { channels, (UInt32)aSample->mSize, aSample->mData };
-
-  // Decompressed audio buffer
-  nsAutoArrayPtr<AudioDataValue> decoded(new AudioDataValue[maxDecodedSamples]);
-
-  do {
-    AudioBufferList decBuffer;
-    decBuffer.mNumberBuffers = 1;
-    decBuffer.mBuffers[0].mNumberChannels = channels;
-    decBuffer.mBuffers[0].mDataByteSize =
-      maxDecodedSamples * sizeof(AudioDataValue);
-    decBuffer.mBuffers[0].mData = decoded.get();
-
-    // in: the max number of packets we can handle from the decoder.
-    // out: the number of packets the decoder is actually returning.
-    UInt32 numFrames = MAX_AUDIO_FRAMES;
-
-    OSStatus rv = AudioConverterFillComplexBuffer(mConverter,
-                                                  _PassthroughInputDataCallback,
-                                                  &userData,
-                                                  &numFrames /* in/out */,
-                                                  &decBuffer,
-                                                  packets.get());
-
-    if (rv && rv != kNoMoreDataErr) {
-      LOG("Error decoding audio stream: %d\n", rv);
-      return NS_ERROR_FAILURE;
-    }
-
-    if (numFrames) {
-      outputData.AppendElements(decoded.get(), numFrames * channels);
-    }
-
-    if (rv == kNoMoreDataErr) {
-      break;
-    }
-  } while (true);
-
-  if (outputData.IsEmpty()) {
-    return NS_OK;
-  }
-
-  size_t numFrames = outputData.Length() / channels;
-  int rate = mOutputFormat.mSampleRate;
-  CheckedInt<Microseconds> duration = FramesToUsecs(numFrames, rate);
-  if (!duration.isValid()) {
-    NS_WARNING("Invalid count of accumulated audio samples");
-    return NS_ERROR_FAILURE;
-  }
-
-#ifdef LOG_SAMPLE_DECODE
-  LOG("pushed audio at time %lfs; duration %lfs\n",
-      (double)aSample->mTime / USECS_PER_S,
-      (double)duration.value() / USECS_PER_S);
-#endif
-
-  nsAutoArrayPtr<AudioDataValue> data(new AudioDataValue[outputData.Length()]);
-  PodCopy(data.get(), &outputData[0], outputData.Length());
-  nsRefPtr<AudioData> audio = new AudioData(aSample->mOffset,
-                                            aSample->mTime,
-                                            duration.value(),
-                                            numFrames,
-                                            data.forget(),
-                                            channels,
-                                            rate);
-  mCallback->Output(audio);
-  return NS_OK;
-}
-
-nsresult
-AppleATDecoder::GetInputAudioDescription(AudioStreamBasicDescription& aDesc,
-                                         const nsTArray<uint8_t>& aExtraData)
-{
-  // 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.mExtendedProfile;
-  }
-  formatInfo.mMagicCookieSize = aExtraData.Length();
-  formatInfo.mMagicCookie = aExtraData.Elements();
-
-  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.mChannels;
-  aDesc.mSampleRate = mConfig.mRate;
-  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;
-}
-
-nsresult
-AppleATDecoder::SetupDecoder(MediaRawData* aSample)
-{
-  if (mFormatID == kAudioFormatMPEG4AAC &&
-      mConfig.mExtendedProfile == 2) {
-    // Check for implicit SBR signalling if stream is AAC-LC
-    // This will provide us with an updated magic cookie for use with
-    // GetInputAudioDescription.
-    if (NS_SUCCEEDED(GetImplicitAACMagicCookie(aSample)) &&
-        !mMagicCookie.Length()) {
-      // nothing found yet, will try again later
-      return NS_ERROR_NOT_INITIALIZED;
-    }
-    // An error occurred, fallback to using default stream description
-  }
-
-  LOG("Initializing Apple AudioToolbox decoder");
-
-  AudioStreamBasicDescription inputFormat;
-  PodZero(&inputFormat);
-  nsresult rv =
-    GetInputAudioDescription(inputFormat,
-                             mMagicCookie.Length() ?
-                                 mMagicCookie : *mConfig.mExtraData);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-  // 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", status);
-    mConverter = nullptr;
-    return NS_ERROR_FAILURE;
-  }
-  return NS_OK;
-}
-
-static void
-_MetadataCallback(void* aAppleATDecoder,
-                  AudioFileStreamID aStream,
-                  AudioFileStreamPropertyID aProperty,
-                  UInt32* aFlags)
-{
-  AppleATDecoder* decoder = static_cast<AppleATDecoder*>(aAppleATDecoder);
-  LOG("MetadataCallback receiving: '%s'", FourCC2Str(aProperty));
-  if (aProperty == kAudioFileStreamProperty_MagicCookieData) {
-    UInt32 size;
-    Boolean writeable;
-    OSStatus rv = AudioFileStreamGetPropertyInfo(aStream,
-                                                 aProperty,
-                                                 &size,
-                                                 &writeable);
-    if (rv) {
-      LOG("Couldn't get property info for '%s' (%s)",
-          FourCC2Str(aProperty), FourCC2Str(rv));
-      decoder->mFileStreamError = true;
-      return;
-    }
-    nsAutoArrayPtr<uint8_t> data(new uint8_t[size]);
-    rv = AudioFileStreamGetProperty(aStream, aProperty,
-                                    &size, data);
-    if (rv) {
-      LOG("Couldn't get property '%s' (%s)",
-          FourCC2Str(aProperty), FourCC2Str(rv));
-      decoder->mFileStreamError = true;
-      return;
-    }
-    decoder->mMagicCookie.AppendElements(data.get(), size);
-  }
-}
-
-static void
-_SampleCallback(void* aSBR,
-                UInt32 aNumBytes,
-                UInt32 aNumPackets,
-                const void* aData,
-                AudioStreamPacketDescription* aPackets)
-{
-}
-
-nsresult
-AppleATDecoder::GetImplicitAACMagicCookie(const MediaRawData* aSample)
-{
-  // Prepend ADTS header to AAC audio.
-  nsRefPtr<MediaRawData> adtssample(aSample->Clone());
-  if (!adtssample) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-  int8_t frequency_index =
-    mp4_demuxer::Adts::GetFrequencyIndex(mConfig.mRate);
-
-  bool rv = mp4_demuxer::Adts::ConvertSample(mConfig.mChannels,
-                                             frequency_index,
-                                             mConfig.mProfile,
-                                             adtssample);
-  if (!rv) {
-    NS_WARNING("Failed to apply ADTS header");
-    return NS_ERROR_FAILURE;
-  }
-  if (!mStream) {
-    OSStatus rv = AudioFileStreamOpen(this,
-                                      _MetadataCallback,
-                                      _SampleCallback,
-                                      kAudioFileAAC_ADTSType,
-                                      &mStream);
-    if (rv) {
-      NS_WARNING("Couldn't open AudioFileStream");
-      return NS_ERROR_FAILURE;
-    }
-  }
-
-  OSStatus status = AudioFileStreamParseBytes(mStream,
-                                              adtssample->mSize,
-                                              adtssample->mData,
-                                              0 /* discontinuity */);
-  if (status) {
-    NS_WARNING("Couldn't parse sample");
-  }
-
-  if (status || mFileStreamError || mMagicCookie.Length()) {
-    // We have decoded a magic cookie or an error occurred as such
-    // we won't need the stream any longer.
-    AudioFileStreamClose(mStream);
-    mStream = nullptr;
-  }
-
-  return (mFileStreamError || status) ? NS_ERROR_FAILURE : NS_OK;
-}
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleATDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleATDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleATDecoder.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleATDecoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-/* -*- 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_AppleATDecoder_h
-#define mozilla_AppleATDecoder_h
-
-#include <AudioToolbox/AudioToolbox.h>
-#include "PlatformDecoderModule.h"
-#include "mozilla/ReentrantMonitor.h"
-#include "mozilla/Vector.h"
-#include "nsIThread.h"
-
-namespace mozilla {
-
-class FlushableMediaTaskQueue;
-class MediaDataDecoderCallback;
-
-class AppleATDecoder : public MediaDataDecoder {
-public:
-  AppleATDecoder(const AudioInfo& aConfig,
-                 FlushableMediaTaskQueue* aVideoTaskQueue,
-                 MediaDataDecoderCallback* aCallback);
-  virtual ~AppleATDecoder();
-
-  virtual nsresult Init() override;
-  virtual nsresult Input(MediaRawData* aSample) override;
-  virtual nsresult Flush() override;
-  virtual nsresult Drain() override;
-  virtual nsresult Shutdown() override;
-
-  // Callbacks also need access to the config.
-  const AudioInfo& mConfig;
-
-  // Use to extract magic cookie for HE-AAC detection.
-  nsTArray<uint8_t> mMagicCookie;
-  // Will be set to true should an error occurred while attempting to retrieve
-  // the magic cookie property.
-  bool mFileStreamError;
-
-private:
-  nsRefPtr<FlushableMediaTaskQueue> mTaskQueue;
-  MediaDataDecoderCallback* mCallback;
-  AudioConverterRef mConverter;
-  AudioStreamBasicDescription mOutputFormat;
-  UInt32 mFormatID;
-  AudioFileStreamID mStream;
-  nsTArray<nsRefPtr<MediaRawData>> mQueuedSamples;
-
-  void SubmitSample(MediaRawData* aSample);
-  nsresult DecodeSample(MediaRawData* aSample);
-  nsresult GetInputAudioDescription(AudioStreamBasicDescription& aDesc,
-                                    const nsTArray<uint8_t>& aExtraData);
-  // Setup AudioConverter once all information required has been gathered.
-  // Will return NS_ERROR_NOT_INITIALIZED if more data is required.
-  nsresult SetupDecoder(MediaRawData* aSample);
-  nsresult GetImplicitAACMagicCookie(const MediaRawData* aSample);
-};
-
-} // namespace mozilla
-
-#endif // mozilla_AppleATDecoder_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleCMFunctions.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleCMFunctions.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleCMFunctions.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleCMFunctions.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-/* -*- 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/. */
-
-// Construct references to each of the CoreMedia symbols we use.
-
-LINK_FUNC(VideoFormatDescriptionCreate)
-LINK_FUNC(BlockBufferCreateWithMemoryBlock)
-LINK_FUNC(SampleBufferCreate)
-LINK_FUNC(TimeMake)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleCMLinker.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleCMLinker.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleCMLinker.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleCMLinker.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,138 +0,0 @@
-/* -*- 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 <dlfcn.h>
-
-#include "AppleCMLinker.h"
-#include "MainThreadUtils.h"
-#include "mozilla/ArrayUtils.h"
-#include "nsCocoaFeatures.h"
-#include "nsDebug.h"
-
-#ifdef PR_LOGGING
-PRLogModuleInfo* GetAppleMediaLog();
-#define LOG(...) PR_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__))
-#else
-#define LOG(...)
-#endif
-
-namespace mozilla {
-
-AppleCMLinker::LinkStatus
-AppleCMLinker::sLinkStatus = LinkStatus_INIT;
-
-void* AppleCMLinker::sLink = nullptr;
-nsrefcnt AppleCMLinker::sRefCount = 0;
-CFStringRef AppleCMLinker::skPropExtensionAtoms = nullptr;
-CFStringRef AppleCMLinker::skPropFullRangeVideo = nullptr;
-
-#define LINK_FUNC(func) typeof(CM ## func) CM ## func;
-#include "AppleCMFunctions.h"
-#undef LINK_FUNC
-
-/* static */ bool
-AppleCMLinker::Link()
-{
-  // Bump our reference count every time we're called.
-  // Add a lock or change the thread assertion if
-  // you need to call this off the main thread.
-  MOZ_ASSERT(NS_IsMainThread());
-  ++sRefCount;
-
-  if (sLinkStatus) {
-    return sLinkStatus == LinkStatus_SUCCEEDED;
-  }
-
-  const char* dlnames[] =
-    { "/System/Library/Frameworks/CoreMedia.framework/CoreMedia",
-      "/System/Library/PrivateFrameworks/CoreMedia.framework/CoreMedia" };
-  bool dlfound = false;
-  for (size_t i = 0; i < ArrayLength(dlnames); i++) {
-    if ((sLink = dlopen(dlnames[i], RTLD_NOW | RTLD_LOCAL))) {
-      dlfound = true;
-      break;
-    }
-  }
-  if (!dlfound) {
-    NS_WARNING("Couldn't load CoreMedia framework");
-    goto fail;
-  }
-
-  if (nsCocoaFeatures::OnLionOrLater()) {
-#define LINK_FUNC2(func)                                       \
-  func = (typeof(func))dlsym(sLink, #func);                    \
-  if (!func) {                                                 \
-    NS_WARNING("Couldn't load CoreMedia function " #func );    \
-    goto fail;                                                 \
-  }
-#define LINK_FUNC(func) LINK_FUNC2(CM ## func)
-#include "AppleCMFunctions.h"
-#undef LINK_FUNC
-#undef LINK_FUNC2
-
-    skPropExtensionAtoms =
-      GetIOConst("kCMFormatDescriptionExtension_SampleDescriptionExtensionAtoms");
-
-    skPropFullRangeVideo =
-      GetIOConst("kCMFormatDescriptionExtension_FullRangeVideo");
-
-  } else {
-#define LINK_FUNC2(cm, fig)                                    \
-  cm = (typeof(cm))dlsym(sLink, #fig);                         \
-  if (!cm) {                                                   \
-    NS_WARNING("Couldn't load CoreMedia function " #fig );     \
-    goto fail;                                                 \
-  }
-#define LINK_FUNC(func) LINK_FUNC2(CM ## func, Fig ## func)
-#include "AppleCMFunctions.h"
-#undef LINK_FUNC
-#undef LINK_FUNC2
-
-    skPropExtensionAtoms =
-      GetIOConst("kFigFormatDescriptionExtension_SampleDescriptionExtensionAtoms");
-  }
-
-  if (!skPropExtensionAtoms) {
-    goto fail;
-  }
-
-  LOG("Loaded CoreMedia framework.");
-  sLinkStatus = LinkStatus_SUCCEEDED;
-  return true;
-
-fail:
-  Unlink();
-
-  sLinkStatus = LinkStatus_FAILED;
-  return false;
-}
-
-/* static */ void
-AppleCMLinker::Unlink()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(sRefCount > 0, "Unbalanced Unlink()");
-  --sRefCount;
-  if (sLink && sRefCount < 1) {
-    LOG("Unlinking CoreMedia framework.");
-    dlclose(sLink);
-    sLink = nullptr;
-    sLinkStatus = LinkStatus_INIT;
-  }
-}
-
-/* static */ CFStringRef
-AppleCMLinker::GetIOConst(const char* symbol)
-{
-  CFStringRef* address = (CFStringRef*)dlsym(sLink, symbol);
-  if (!address) {
-    return nullptr;
-  }
-
-  return *address;
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleCMLinker.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleCMLinker.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleCMLinker.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleCMLinker.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-/* -*- 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 AppleCMLinker_h
-#define AppleCMLinker_h
-
-extern "C" {
-#pragma GCC visibility push(default)
-#include <CoreMedia/CoreMedia.h>
-#pragma GCC visibility pop
-}
-
-#include "nscore.h"
-
-namespace mozilla {
-
-class AppleCMLinker
-{
-public:
-  static bool Link();
-  static void Unlink();
-  static CFStringRef skPropExtensionAtoms;
-  static CFStringRef skPropFullRangeVideo;
-
-private:
-  static void* sLink;
-  static nsrefcnt sRefCount;
-
-  static enum LinkStatus {
-    LinkStatus_INIT = 0,
-    LinkStatus_FAILED,
-    LinkStatus_SUCCEEDED
-  } sLinkStatus;
-
-  static CFStringRef GetIOConst(const char* symbol);
-};
-
-#define LINK_FUNC(func) extern typeof(CM ## func)* CM ## func;
-#include "AppleCMFunctions.h"
-#undef LINK_FUNC
-
-} // namespace mozilla
-
-#endif // AppleCMLinker_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleDecoderModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleDecoderModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleDecoderModule.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleDecoderModule.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,216 +0,0 @@
-/* -*- 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 "AppleATDecoder.h"
-#include "AppleCMLinker.h"
-#include "AppleDecoderModule.h"
-#include "AppleVDADecoder.h"
-#include "AppleVDALinker.h"
-#include "AppleVTDecoder.h"
-#include "AppleVTLinker.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/DebugOnly.h"
-#include "prlog.h"
-
-#ifdef PR_LOGGING
-PRLogModuleInfo* GetAppleMediaLog() {
-  static PRLogModuleInfo* log = nullptr;
-  if (!log) {
-    log = PR_NewLogModule("AppleMedia");
-  }
-  return log;
-}
-#endif
-
-namespace mozilla {
-
-bool AppleDecoderModule::sInitialized = false;
-bool AppleDecoderModule::sIsVTAvailable = false;
-bool AppleDecoderModule::sIsVTHWAvailable = false;
-bool AppleDecoderModule::sIsVDAAvailable = false;
-bool AppleDecoderModule::sForceVDA = false;
-
-class LinkTask : public nsRunnable {
-public:
-  NS_IMETHOD Run() override {
-    MOZ_ASSERT(NS_IsMainThread(), "Must be on main thread.");
-    MOZ_ASSERT(AppleDecoderModule::sInitialized);
-    if (AppleDecoderModule::sIsVDAAvailable) {
-      AppleVDALinker::Link();
-    }
-    if (AppleDecoderModule::sIsVTAvailable) {
-      AppleVTLinker::Link();
-      AppleCMLinker::Link();
-    }
-    return NS_OK;
-  }
-};
-
-class UnlinkTask : public nsRunnable {
-public:
-  NS_IMETHOD Run() override {
-    MOZ_ASSERT(NS_IsMainThread(), "Must be on main thread.");
-    MOZ_ASSERT(AppleDecoderModule::sInitialized);
-    if (AppleDecoderModule::sIsVDAAvailable) {
-      AppleVDALinker::Unlink();
-    }
-    if (AppleDecoderModule::sIsVTAvailable) {
-      AppleVTLinker::Unlink();
-      AppleCMLinker::Unlink();
-    }
-    return NS_OK;
-  }
-};
-
-AppleDecoderModule::AppleDecoderModule()
-{
-}
-
-AppleDecoderModule::~AppleDecoderModule()
-{
-  nsCOMPtr<nsIRunnable> task(new UnlinkTask());
-  if (!NS_IsMainThread()) {
-    NS_DispatchToMainThread(task);
-  } else {
-    task->Run();
-  }
-}
-
-/* static */
-void
-AppleDecoderModule::Init()
-{
-  MOZ_ASSERT(NS_IsMainThread(), "Must be on main thread.");
-
-  if (sInitialized) {
-    return;
-  }
-
-  Preferences::AddBoolVarCache(&sForceVDA, "media.apple.forcevda", false);
-
-  // dlopen VideoDecodeAcceleration.framework if it's available.
-  sIsVDAAvailable = AppleVDALinker::Link();
-
-  // dlopen CoreMedia.framework if it's available.
-  bool haveCoreMedia = AppleCMLinker::Link();
-  // dlopen VideoToolbox.framework if it's available.
-  // We must link both CM and VideoToolbox framework to allow for proper
-  // paired Link/Unlink calls
-  bool haveVideoToolbox = AppleVTLinker::Link();
-  sIsVTAvailable = haveCoreMedia && haveVideoToolbox;
-
-  sIsVTHWAvailable = AppleVTLinker::skPropEnableHWAccel != nullptr;
-
-  if (sIsVDAAvailable) {
-    AppleVDALinker::Unlink();
-  }
-  if (sIsVTAvailable) {
-    AppleVTLinker::Unlink();
-    AppleCMLinker::Unlink();
-  }
-  sInitialized = true;
-}
-
-class InitTask : public nsRunnable {
-public:
-  NS_IMETHOD Run() override {
-    MOZ_ASSERT(NS_IsMainThread(), "Must be on main thread.");
-    AppleDecoderModule::Init();
-    return NS_OK;
-  }
-};
-
-/* static */
-nsresult
-AppleDecoderModule::CanDecode()
-{
-  if (!sInitialized) {
-    // Note: We can be called on the main thread from MP4Decoder::CanHandleMediaType().
-    if (NS_IsMainThread()) {
-      Init();
-    } else {
-      nsCOMPtr<nsIRunnable> task(new InitTask());
-      NS_DispatchToMainThread(task, NS_DISPATCH_SYNC);
-    }
-  }
-
-  return (sIsVDAAvailable || sIsVTAvailable) ? NS_OK : NS_ERROR_NO_INTERFACE;
-}
-
-nsresult
-AppleDecoderModule::Startup()
-{
-  if (!sIsVDAAvailable && !sIsVTAvailable) {
-    return NS_ERROR_FAILURE;
-  }
-
-  // Note: We can be called on the main thread from MP4Decoder::CanHandleMediaType().
-  nsCOMPtr<nsIRunnable> task(new LinkTask());
-  if (!NS_IsMainThread()) {
-    NS_DispatchToMainThread(task, NS_DISPATCH_SYNC);
-  } else {
-    task->Run();
-  }
-
-  return NS_OK;
-}
-
-already_AddRefed<MediaDataDecoder>
-AppleDecoderModule::CreateVideoDecoder(const VideoInfo& aConfig,
-                                       layers::LayersBackend aLayersBackend,
-                                       layers::ImageContainer* aImageContainer,
-                                       FlushableMediaTaskQueue* aVideoTaskQueue,
-                                       MediaDataDecoderCallback* aCallback)
-{
-  nsRefPtr<MediaDataDecoder> decoder;
-
-  if (sIsVDAAvailable && (!sIsVTHWAvailable || sForceVDA)) {
-    decoder =
-      AppleVDADecoder::CreateVDADecoder(aConfig,
-                                        aVideoTaskQueue,
-                                        aCallback,
-                                        aImageContainer);
-    if (decoder) {
-      return decoder.forget();
-    }
-  }
-  // We fallback here if VDA isn't available, or is available but isn't
-  // supported by the current platform.
-  if (sIsVTAvailable) {
-    decoder =
-      new AppleVTDecoder(aConfig, aVideoTaskQueue, aCallback, aImageContainer);
-  }
-  return decoder.forget();
-}
-
-already_AddRefed<MediaDataDecoder>
-AppleDecoderModule::CreateAudioDecoder(const AudioInfo& aConfig,
-                                       FlushableMediaTaskQueue* aAudioTaskQueue,
-                                       MediaDataDecoderCallback* aCallback)
-{
-  nsRefPtr<MediaDataDecoder> decoder =
-    new AppleATDecoder(aConfig, aAudioTaskQueue, aCallback);
-  return decoder.forget();
-}
-
-bool
-AppleDecoderModule::SupportsMimeType(const nsACString& aMimeType)
-{
-  return aMimeType.EqualsLiteral("audio/mpeg") ||
-    PlatformDecoderModule::SupportsMimeType(aMimeType);
-}
-
-PlatformDecoderModule::ConversionRequired
-AppleDecoderModule::DecoderNeedsConversion(const TrackInfo& aConfig) const
-{
-  if (aConfig.IsVideo()) {
-    return kNeedAVCC;
-  } else {
-    return kNeedNone;
-  }
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleDecoderModule.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleDecoderModule.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleDecoderModule.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleDecoderModule.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-/* -*- 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_AppleDecoderModule_h
-#define mozilla_AppleDecoderModule_h
-
-#include "PlatformDecoderModule.h"
-
-namespace mozilla {
-
-class AppleDecoderModule : public PlatformDecoderModule {
-public:
-  AppleDecoderModule();
-  virtual ~AppleDecoderModule();
-
-  virtual nsresult Startup() override;
-
-  // Decode thread.
-  virtual already_AddRefed<MediaDataDecoder>
-  CreateVideoDecoder(const VideoInfo& aConfig,
-                     layers::LayersBackend aLayersBackend,
-                     layers::ImageContainer* aImageContainer,
-                     FlushableMediaTaskQueue* aVideoTaskQueue,
-                     MediaDataDecoderCallback* aCallback) override;
-
-  // Decode thread.
-  virtual already_AddRefed<MediaDataDecoder>
-  CreateAudioDecoder(const AudioInfo& aConfig,
-                     FlushableMediaTaskQueue* aAudioTaskQueue,
-                     MediaDataDecoderCallback* aCallback) override;
-
-  virtual bool SupportsMimeType(const nsACString& aMimeType) override;
-
-  virtual ConversionRequired
-  DecoderNeedsConversion(const TrackInfo& aConfig) const override;
-
-  static void Init();
-  static nsresult CanDecode();
-
-private:
-  friend class InitTask;
-  friend class LinkTask;
-  friend class UnlinkTask;
-
-  static bool sInitialized;
-  static bool sIsVTAvailable;
-  static bool sIsVTHWAvailable;
-  static bool sIsVDAAvailable;
-  static bool sForceVDA;
-};
-
-} // namespace mozilla
-
-#endif // mozilla_AppleDecoderModule_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleUtils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleUtils.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleUtils.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +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/. */
-
-// Utility functions to help with Apple API calls.
-
-#ifndef mozilla_AppleUtils_h
-#define mozilla_AppleUtils_h
-
-#include "mozilla/Attributes.h"
-
-namespace mozilla {
-
-// Wrapper class to call CFRelease on reference types
-// when they go out of scope.
-template <class T>
-class AutoCFRelease {
-public:
-  MOZ_IMPLICIT AutoCFRelease(T aRef)
-    : mRef(aRef)
-  {
-  }
-  ~AutoCFRelease()
-  {
-    if (mRef) {
-      CFRelease(mRef);
-    }
-  }
-  // Return the wrapped ref so it can be used as an in parameter.
-  operator T()
-  {
-    return mRef;
-  }
-  // Return a pointer to the wrapped ref for use as an out parameter.
-  T* receive()
-  {
-    return &mRef;
-  }
-
-private:
-  // Copy operator isn't supported and is not implemented.
-  AutoCFRelease<T>& operator=(const AutoCFRelease<T>&);
-  T mRef;
-};
-
-} // namespace mozilla
-
-#endif // mozilla_AppleUtils_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleVDADecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleVDADecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleVDADecoder.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleVDADecoder.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,517 +0,0 @@
-/* -*- 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 <CoreFoundation/CFString.h>
-
-#include "AppleUtils.h"
-#include "AppleVDADecoder.h"
-#include "AppleVDALinker.h"
-#include "MediaInfo.h"
-#include "mp4_demuxer/H264.h"
-#include "MP4Decoder.h"
-#include "MediaData.h"
-#include "MacIOSurfaceImage.h"
-#include "mozilla/ArrayUtils.h"
-#include "nsAutoPtr.h"
-#include "nsCocoaFeatures.h"
-#include "nsThreadUtils.h"
-#include "prlog.h"
-#include "VideoUtils.h"
-#include <algorithm>
-#include "gfxPlatform.h"
-
-#ifdef PR_LOGGING
-PRLogModuleInfo* GetAppleMediaLog();
-#define LOG(...) PR_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__))
-//#define LOG_MEDIA_SHA1
-#else
-#define LOG(...)
-#endif
-
-namespace mozilla {
-
-AppleVDADecoder::AppleVDADecoder(const VideoInfo& aConfig,
-                               FlushableMediaTaskQueue* aVideoTaskQueue,
-                               MediaDataDecoderCallback* aCallback,
-                               layers::ImageContainer* aImageContainer)
-  : mTaskQueue(aVideoTaskQueue)
-  , mCallback(aCallback)
-  , mImageContainer(aImageContainer)
-  , mPictureWidth(aConfig.mImage.width)
-  , mPictureHeight(aConfig.mImage.height)
-  , mDisplayWidth(aConfig.mDisplay.width)
-  , mDisplayHeight(aConfig.mDisplay.height)
-  , mDecoder(nullptr)
-  , mIs106(!nsCocoaFeatures::OnLionOrLater())
-{
-  MOZ_COUNT_CTOR(AppleVDADecoder);
-  // TODO: Verify aConfig.mime_type.
-
-  mExtraData = aConfig.mExtraData;
-  mMaxRefFrames = 4;
-  // Retrieve video dimensions from H264 SPS NAL.
-  mp4_demuxer::SPSData spsdata;
-  if (mp4_demuxer::H264::DecodeSPSFromExtraData(mExtraData, spsdata)) {
-    // max_num_ref_frames determines the size of the sliding window
-    // we need to queue that many frames in order to guarantee proper
-    // pts frames ordering. Use a minimum of 4 to ensure proper playback of
-    // non compliant videos.
-    mMaxRefFrames =
-      std::min(std::max(mMaxRefFrames, spsdata.max_num_ref_frames + 1), 16u);
-  }
-
-  LOG("Creating AppleVDADecoder for %dx%d (%dx%d) h.264 video",
-      mPictureWidth,
-      mPictureHeight,
-      mDisplayWidth,
-      mDisplayHeight
-     );
-}
-
-AppleVDADecoder::~AppleVDADecoder()
-{
-  MOZ_COUNT_DTOR(AppleVDADecoder);
-}
-
-nsresult
-AppleVDADecoder::Init()
-{
-  if (!gfxPlatform::CanUseHardwareVideoDecoding()) {
-    // This GPU is blacklisted for hardware decoding.
-    return NS_ERROR_FAILURE;
-  }
-
-  if (mDecoder) {
-    return NS_OK;
-  }
-  nsresult rv = InitializeSession();
-  return rv;
-}
-
-nsresult
-AppleVDADecoder::Shutdown()
-{
-  if (mDecoder) {
-    LOG("%s: cleaning up decoder %p", __func__, mDecoder);
-    VDADecoderDestroy(mDecoder);
-    mDecoder = nullptr;
-  }
-  return NS_OK;
-}
-
-nsresult
-AppleVDADecoder::Input(MediaRawData* aSample)
-{
-  LOG("mp4 input sample %p pts %lld duration %lld us%s %d bytes",
-      aSample,
-      aSample->mTime,
-      aSample->mDuration,
-      aSample->mKeyframe ? " keyframe" : "",
-      aSample->mSize);
-
-  mTaskQueue->Dispatch(
-      NS_NewRunnableMethodWithArg<nsRefPtr<MediaRawData>>(
-          this,
-          &AppleVDADecoder::SubmitFrame,
-          nsRefPtr<MediaRawData>(aSample)));
-  return NS_OK;
-}
-
-nsresult
-AppleVDADecoder::Flush()
-{
-  mTaskQueue->Flush();
-  OSStatus rv = VDADecoderFlush(mDecoder, 0 /*dont emit*/);
-  if (rv != noErr) {
-    LOG("AppleVDADecoder::Flush failed waiting for platform decoder "
-        "with error:%d.", rv);
-  }
-  ClearReorderedFrames();
-
-  return NS_OK;
-}
-
-nsresult
-AppleVDADecoder::Drain()
-{
-  mTaskQueue->AwaitIdle();
-  OSStatus rv = VDADecoderFlush(mDecoder, kVDADecoderFlush_EmitFrames);
-  if (rv != noErr) {
-    LOG("AppleVDADecoder::Drain failed waiting for platform decoder "
-        "with error:%d.", rv);
-  }
-  DrainReorderedFrames();
-  mCallback->DrainComplete();
-  return NS_OK;
-}
-
-//
-// Implementation details.
-//
-
-// Callback passed to the VideoToolbox decoder for returning data.
-// This needs to be static because the API takes a C-style pair of
-// function and userdata pointers. This validates parameters and
-// forwards the decoded image back to an object method.
-static void
-PlatformCallback(void* decompressionOutputRefCon,
-                 CFDictionaryRef frameInfo,
-                 OSStatus status,
-                 VDADecodeInfoFlags infoFlags,
-                 CVImageBufferRef image)
-{
-  LOG("AppleVDADecoder[%s] status %d flags %d retainCount %ld",
-      __func__, status, infoFlags, CFGetRetainCount(frameInfo));
-
-  // Validate our arguments.
-  // According to Apple's TN2267
-  // The output callback is still called for all flushed frames,
-  // but no image buffers will be returned.
-  // FIXME: Distinguish between errors and empty flushed frames.
-  if (status != noErr || !image) {
-    NS_WARNING("AppleVDADecoder decoder returned no data");
-    return;
-  }
-  MOZ_ASSERT(CFGetTypeID(image) == CVPixelBufferGetTypeID(),
-             "AppleVDADecoder returned an unexpected image type");
-
-  if (infoFlags & kVDADecodeInfo_FrameDropped)
-  {
-    NS_WARNING("  ...frame dropped...");
-    return;
-  }
-
-  AppleVDADecoder* decoder =
-    static_cast<AppleVDADecoder*>(decompressionOutputRefCon);
-
-  AutoCFRelease<CFNumberRef> ptsref =
-    (CFNumberRef)CFDictionaryGetValue(frameInfo, CFSTR("FRAME_PTS"));
-  AutoCFRelease<CFNumberRef> dtsref =
-    (CFNumberRef)CFDictionaryGetValue(frameInfo, CFSTR("FRAME_DTS"));
-  AutoCFRelease<CFNumberRef> durref =
-    (CFNumberRef)CFDictionaryGetValue(frameInfo, CFSTR("FRAME_DURATION"));
-  AutoCFRelease<CFNumberRef> boref =
-    (CFNumberRef)CFDictionaryGetValue(frameInfo, CFSTR("FRAME_OFFSET"));
-  AutoCFRelease<CFNumberRef> kfref =
-    (CFNumberRef)CFDictionaryGetValue(frameInfo, CFSTR("FRAME_KEYFRAME"));
-
-  Microseconds dts;
-  Microseconds pts;
-  Microseconds duration;
-  int64_t byte_offset;
-  char is_sync_point;
-
-  CFNumberGetValue(ptsref, kCFNumberSInt64Type, &pts);
-  CFNumberGetValue(dtsref, kCFNumberSInt64Type, &dts);
-  CFNumberGetValue(durref, kCFNumberSInt64Type, &duration);
-  CFNumberGetValue(boref, kCFNumberSInt64Type, &byte_offset);
-  CFNumberGetValue(kfref, kCFNumberSInt8Type, &is_sync_point);
-
-  nsAutoPtr<AppleVDADecoder::AppleFrameRef> frameRef(
-    new AppleVDADecoder::AppleFrameRef(dts,
-    pts,
-    duration,
-    byte_offset,
-    is_sync_point == 1));
-
-  // Forward the data back to an object method which can access
-  // the correct MP4Reader callback.
-  decoder->OutputFrame(image, frameRef);
-}
-
-AppleVDADecoder::AppleFrameRef*
-AppleVDADecoder::CreateAppleFrameRef(const MediaRawData* aSample)
-{
-  MOZ_ASSERT(aSample);
-  return new AppleFrameRef(*aSample);
-}
-
-void
-AppleVDADecoder::DrainReorderedFrames()
-{
-  while (!mReorderQueue.IsEmpty()) {
-    mCallback->Output(mReorderQueue.Pop());
-  }
-}
-
-void
-AppleVDADecoder::ClearReorderedFrames()
-{
-  while (!mReorderQueue.IsEmpty()) {
-    mReorderQueue.Pop();
-  }
-}
-
-// Copy and return a decoded frame.
-nsresult
-AppleVDADecoder::OutputFrame(CVPixelBufferRef aImage,
-                             nsAutoPtr<AppleVDADecoder::AppleFrameRef> aFrameRef)
-{
-  IOSurfacePtr surface = MacIOSurfaceLib::CVPixelBufferGetIOSurface(aImage);
-  MOZ_ASSERT(surface, "Decoder didn't return an IOSurface backed buffer");
-
-  LOG("mp4 output frame %lld dts %lld pts %lld duration %lld us%s",
-    aFrameRef->byte_offset,
-    aFrameRef->decode_timestamp,
-    aFrameRef->composition_timestamp,
-    aFrameRef->duration,
-    aFrameRef->is_sync_point ? " keyframe" : ""
-  );
-
-  nsRefPtr<MacIOSurface> macSurface = new MacIOSurface(surface);
-  // Bounds.
-  VideoInfo info;
-  info.mDisplay = nsIntSize(mDisplayWidth, mDisplayHeight);
-  gfx::IntRect visible = gfx::IntRect(0,
-                                      0,
-                                      mPictureWidth,
-                                      mPictureHeight);
-
-  nsRefPtr<layers::Image> image =
-    mImageContainer->CreateImage(ImageFormat::MAC_IOSURFACE);
-  layers::MacIOSurfaceImage* videoImage =
-    static_cast<layers::MacIOSurfaceImage*>(image.get());
-  videoImage->SetSurface(macSurface);
-
-  nsRefPtr<VideoData> data;
-  data = VideoData::CreateFromImage(info,
-                                    mImageContainer,
-                                    aFrameRef->byte_offset,
-                                    aFrameRef->composition_timestamp,
-                                    aFrameRef->duration, image.forget(),
-                                    aFrameRef->is_sync_point,
-                                    aFrameRef->decode_timestamp,
-                                    visible);
-
-  if (!data) {
-    NS_ERROR("Couldn't create VideoData for frame");
-    mCallback->Error();
-    return NS_ERROR_FAILURE;
-  }
-
-  // Frames come out in DTS order but we need to output them
-  // in composition order.
-  mReorderQueue.Push(data);
-  while (mReorderQueue.Length() > mMaxRefFrames) {
-    mCallback->Output(mReorderQueue.Pop());
-  }
-  LOG("%llu decoded frames queued",
-      static_cast<unsigned long long>(mReorderQueue.Length()));
-
-  return NS_OK;
-}
-
-nsresult
-AppleVDADecoder::SubmitFrame(MediaRawData* aSample)
-{
-  AutoCFRelease<CFDataRef> block =
-    CFDataCreate(kCFAllocatorDefault, aSample->mData, aSample->mSize);
-  if (!block) {
-    NS_ERROR("Couldn't create CFData");
-    return NS_ERROR_FAILURE;
-  }
-
-  AutoCFRelease<CFNumberRef> pts =
-    CFNumberCreate(kCFAllocatorDefault,
-                   kCFNumberSInt64Type,
-                   &aSample->mTime);
-  AutoCFRelease<CFNumberRef> dts =
-    CFNumberCreate(kCFAllocatorDefault,
-                   kCFNumberSInt64Type,
-                   &aSample->mTimecode);
-  AutoCFRelease<CFNumberRef> duration =
-    CFNumberCreate(kCFAllocatorDefault,
-                   kCFNumberSInt64Type,
-                   &aSample->mDuration);
-  AutoCFRelease<CFNumberRef> byte_offset =
-    CFNumberCreate(kCFAllocatorDefault,
-                   kCFNumberSInt64Type,
-                   &aSample->mOffset);
-  char keyframe = aSample->mKeyframe ? 1 : 0;
-  AutoCFRelease<CFNumberRef> cfkeyframe =
-    CFNumberCreate(kCFAllocatorDefault,
-                   kCFNumberSInt8Type,
-                   &keyframe);
-
-  const void* keys[] = { CFSTR("FRAME_PTS"),
-                         CFSTR("FRAME_DTS"),
-                         CFSTR("FRAME_DURATION"),
-                         CFSTR("FRAME_OFFSET"),
-                         CFSTR("FRAME_KEYFRAME") };
-  const void* values[] = { pts,
-                           dts,
-                           duration,
-                           byte_offset,
-                           cfkeyframe };
-  static_assert(ArrayLength(keys) == ArrayLength(values),
-                "Non matching keys/values array size");
-
-  AutoCFRelease<CFDictionaryRef> frameInfo =
-    CFDictionaryCreate(kCFAllocatorDefault,
-                       keys,
-                       values,
-                       ArrayLength(keys),
-                       &kCFTypeDictionaryKeyCallBacks,
-                       &kCFTypeDictionaryValueCallBacks);
-
-  OSStatus rv = VDADecoderDecode(mDecoder,
-                                 0,
-                                 block,
-                                 frameInfo);
-
-  if (rv != noErr) {
-    NS_WARNING("AppleVDADecoder: Couldn't pass frame to decoder");
-    mCallback->Error();
-    return NS_ERROR_FAILURE;
-  }
-
-  if (mIs106) {
-    // TN2267:
-    // frameInfo: A CFDictionaryRef containing information to be returned in
-    // the output callback for this frame.
-    // This dictionary can contain client provided information associated with
-    // the frame being decoded, for example presentation time.
-    // The CFDictionaryRef will be retained by the framework.
-    // In 10.6, it is released one too many. So retain it.
-    CFRetain(frameInfo);
-  }
-
-  // Ask for more data.
-  if (mTaskQueue->IsEmpty()) {
-    LOG("AppleVDADecoder task queue empty; requesting more data");
-    mCallback->InputExhausted();
-  }
-
-  return NS_OK;
-}
-
-nsresult
-AppleVDADecoder::InitializeSession()
-{
-  OSStatus rv;
-
-  AutoCFRelease<CFDictionaryRef> decoderConfig =
-    CreateDecoderSpecification();
-
-  AutoCFRelease<CFDictionaryRef> outputConfiguration =
-    CreateOutputConfiguration();
-
-  rv =
-    VDADecoderCreate(decoderConfig,
-                     outputConfiguration,
-                     (VDADecoderOutputCallback*)PlatformCallback,
-                     this,
-                     &mDecoder);
-
-  if (rv != noErr) {
-    NS_WARNING("AppleVDADecoder: Couldn't create hardware VDA decoder");
-    return NS_ERROR_FAILURE;
-  }
-
-  return NS_OK;
-}
-
-CFDictionaryRef
-AppleVDADecoder::CreateDecoderSpecification()
-{
-  const uint8_t* extradata = mExtraData->Elements();
-  int extrasize = mExtraData->Length();
-
-  OSType format = 'avc1';
-  AutoCFRelease<CFNumberRef> avc_width  =
-    CFNumberCreate(kCFAllocatorDefault,
-                   kCFNumberSInt32Type,
-                   &mPictureWidth);
-  AutoCFRelease<CFNumberRef> avc_height =
-    CFNumberCreate(kCFAllocatorDefault,
-                   kCFNumberSInt32Type,
-                   &mPictureHeight);
-  AutoCFRelease<CFNumberRef> avc_format =
-    CFNumberCreate(kCFAllocatorDefault,
-                   kCFNumberSInt32Type,
-                   &format);
-  AutoCFRelease<CFDataRef> avc_data =
-    CFDataCreate(kCFAllocatorDefault,
-                 extradata,
-                 extrasize);
-
-  const void* decoderKeys[] = { AppleVDALinker::skPropWidth,
-                                AppleVDALinker::skPropHeight,
-                                AppleVDALinker::skPropSourceFormat,
-                                AppleVDALinker::skPropAVCCData };
-  const void* decoderValue[] = { avc_width,
-                                 avc_height,
-                                 avc_format,
-                                 avc_data };
-  static_assert(ArrayLength(decoderKeys) == ArrayLength(decoderValue),
-                "Non matching keys/values array size");
-
-  return CFDictionaryCreate(kCFAllocatorDefault,
-                            decoderKeys,
-                            decoderValue,
-                            ArrayLength(decoderKeys),
-                            &kCFTypeDictionaryKeyCallBacks,
-                            &kCFTypeDictionaryValueCallBacks);
-}
-
-CFDictionaryRef
-AppleVDADecoder::CreateOutputConfiguration()
-{
-  // Construct IOSurface Properties
-  const void* IOSurfaceKeys[] = { MacIOSurfaceLib::kPropIsGlobal };
-  const void* IOSurfaceValues[] = { kCFBooleanTrue };
-  static_assert(ArrayLength(IOSurfaceKeys) == ArrayLength(IOSurfaceValues),
-                "Non matching keys/values array size");
-
-  // Contruct output configuration.
-  AutoCFRelease<CFDictionaryRef> IOSurfaceProperties =
-    CFDictionaryCreate(kCFAllocatorDefault,
-                       IOSurfaceKeys,
-                       IOSurfaceValues,
-                       ArrayLength(IOSurfaceKeys),
-                       &kCFTypeDictionaryKeyCallBacks,
-                       &kCFTypeDictionaryValueCallBacks);
-
-  SInt32 PixelFormatTypeValue = kCVPixelFormatType_32BGRA;
-  AutoCFRelease<CFNumberRef> PixelFormatTypeNumber =
-    CFNumberCreate(kCFAllocatorDefault,
-                   kCFNumberSInt32Type,
-                   &PixelFormatTypeValue);
-
-  const void* outputKeys[] = { kCVPixelBufferIOSurfacePropertiesKey,
-                               kCVPixelBufferPixelFormatTypeKey,
-                               kCVPixelBufferOpenGLCompatibilityKey };
-  const void* outputValues[] = { IOSurfaceProperties,
-                                 PixelFormatTypeNumber,
-                                 kCFBooleanTrue };
-  static_assert(ArrayLength(outputKeys) == ArrayLength(outputValues),
-                "Non matching keys/values array size");
-
-  return CFDictionaryCreate(kCFAllocatorDefault,
-                            outputKeys,
-                            outputValues,
-                            ArrayLength(outputKeys),
-                            &kCFTypeDictionaryKeyCallBacks,
-                            &kCFTypeDictionaryValueCallBacks);
-}
-
-/* static */
-already_AddRefed<AppleVDADecoder>
-AppleVDADecoder::CreateVDADecoder(
-  const VideoInfo& aConfig,
-  FlushableMediaTaskQueue* aVideoTaskQueue,
-  MediaDataDecoderCallback* aCallback,
-  layers::ImageContainer* aImageContainer)
-{
-  nsRefPtr<AppleVDADecoder> decoder =
-    new AppleVDADecoder(aConfig, aVideoTaskQueue, aCallback, aImageContainer);
-  if (NS_FAILED(decoder->Init())) {
-    return nullptr;
-  }
-  return decoder.forget();
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleVDADecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleVDADecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleVDADecoder.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleVDADecoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-/* -*- 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_AppleVDADecoder_h
-#define mozilla_AppleVDADecoder_h
-
-#include "PlatformDecoderModule.h"
-#include "mozilla/ReentrantMonitor.h"
-#include "MP4Reader.h"
-#include "MP4Decoder.h"
-#include "nsIThread.h"
-#include "ReorderQueue.h"
-
-#include "VideoDecodeAcceleration/VDADecoder.h"
-
-namespace mozilla {
-
-class FlushableMediaTaskQueue;
-class MediaDataDecoderCallback;
-namespace layers {
-  class ImageContainer;
-}
-
-class AppleVDADecoder : public MediaDataDecoder {
-public:
-  class AppleFrameRef {
-  public:
-    Microseconds decode_timestamp;
-    Microseconds composition_timestamp;
-    Microseconds duration;
-    int64_t byte_offset;
-    bool is_sync_point;
-
-    explicit AppleFrameRef(const MediaRawData& aSample)
-      : decode_timestamp(aSample.mTimecode)
-      , composition_timestamp(aSample.mTime)
-      , duration(aSample.mDuration)
-      , byte_offset(aSample.mOffset)
-      , is_sync_point(aSample.mKeyframe)
-    {
-    }
-
-    AppleFrameRef(Microseconds aDts,
-                  Microseconds aPts,
-                  Microseconds aDuration,
-                  int64_t aByte_offset,
-                  bool aIs_sync_point)
-      : decode_timestamp(aDts)
-      , composition_timestamp(aPts)
-      , duration(aDuration)
-      , byte_offset(aByte_offset)
-      , is_sync_point(aIs_sync_point)
-    {
-    }
-  };
-
-  // Return a new created AppleVDADecoder or nullptr if media or hardware is
-  // not supported by current configuration.
-  static already_AddRefed<AppleVDADecoder> CreateVDADecoder(
-    const VideoInfo& aConfig,
-    FlushableMediaTaskQueue* aVideoTaskQueue,
-    MediaDataDecoderCallback* aCallback,
-    layers::ImageContainer* aImageContainer);
-
-  AppleVDADecoder(const VideoInfo& aConfig,
-                  FlushableMediaTaskQueue* aVideoTaskQueue,
-                  MediaDataDecoderCallback* aCallback,
-                  layers::ImageContainer* aImageContainer);
-  virtual ~AppleVDADecoder();
-  virtual nsresult Init() override;
-  virtual nsresult Input(MediaRawData* aSample) override;
-  virtual nsresult Flush() override;
-  virtual nsresult Drain() override;
-  virtual nsresult Shutdown() override;
-  virtual bool IsHardwareAccelerated() const override
-  {
-    return true;
-  }
-
-  nsresult OutputFrame(CVPixelBufferRef aImage,
-                       nsAutoPtr<AppleFrameRef> aFrameRef);
-
- protected:
-  AppleFrameRef* CreateAppleFrameRef(const MediaRawData* aSample);
-  void DrainReorderedFrames();
-  void ClearReorderedFrames();
-  CFDictionaryRef CreateOutputConfiguration();
-
-  nsRefPtr<MediaByteBuffer> mExtraData;
-  nsRefPtr<FlushableMediaTaskQueue> mTaskQueue;
-  MediaDataDecoderCallback* mCallback;
-  nsRefPtr<layers::ImageContainer> mImageContainer;
-  ReorderQueue mReorderQueue;
-  uint32_t mPictureWidth;
-  uint32_t mPictureHeight;
-  uint32_t mDisplayWidth;
-  uint32_t mDisplayHeight;
-  uint32_t mMaxRefFrames;
-
-private:
-  VDADecoder mDecoder;
-  bool mIs106;
-
-  // Method to pass a frame to VideoToolbox for decoding.
-  nsresult SubmitFrame(MediaRawData* aSample);
-  // Method to set up the decompression session.
-  nsresult InitializeSession();
-  CFDictionaryRef CreateDecoderSpecification();
-};
-
-} // namespace mozilla
-
-#endif // mozilla_AppleVDADecoder_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleVDAFunctions.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleVDAFunctions.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleVDAFunctions.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleVDAFunctions.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-/* -*- 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/. */
-
-// Construct references to each of the VDA symbols we use.
-
-LINK_FUNC(VDADecoderCreate)
-LINK_FUNC(VDADecoderDecode)
-LINK_FUNC(VDADecoderFlush)
-LINK_FUNC(VDADecoderDestroy)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleVDALinker.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleVDALinker.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleVDALinker.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleVDALinker.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,123 +0,0 @@
-/* -*- 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 <dlfcn.h>
-
-#include "AppleVDALinker.h"
-#include "MainThreadUtils.h"
-#include "nsDebug.h"
-
-#ifdef PR_LOGGING
-PRLogModuleInfo* GetAppleMediaLog();
-#define LOG(...) PR_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__))
-#else
-#define LOG(...)
-#endif
-
-namespace mozilla {
-
-AppleVDALinker::LinkStatus
-AppleVDALinker::sLinkStatus = LinkStatus_INIT;
-
-void* AppleVDALinker::sLink = nullptr;
-nsrefcnt AppleVDALinker::sRefCount = 0;
-CFStringRef AppleVDALinker::skPropWidth = nullptr;
-CFStringRef AppleVDALinker::skPropHeight = nullptr;
-CFStringRef AppleVDALinker::skPropSourceFormat = nullptr;
-CFStringRef AppleVDALinker::skPropAVCCData = nullptr;
-
-#define LINK_FUNC(func) typeof(func) func;
-#include "AppleVDAFunctions.h"
-#undef LINK_FUNC
-
-/* static */ bool
-AppleVDALinker::Link()
-{
-  // Bump our reference count every time we're called.
-  // Add a lock or change the thread assertion if
-  // you need to call this off the main thread.
-  MOZ_ASSERT(NS_IsMainThread());
-  ++sRefCount;
-
-  if (sLinkStatus) {
-    return sLinkStatus == LinkStatus_SUCCEEDED;
-  }
-
-  const char* dlname =
-    "/System/Library/Frameworks/VideoDecodeAcceleration.framework/VideoDecodeAcceleration";
-
-  if (!(sLink = dlopen(dlname, RTLD_NOW | RTLD_LOCAL))) {
-    NS_WARNING("Couldn't load VideoDecodeAcceleration framework");
-    goto fail;
-  }
-
-#define LINK_FUNC(func)                                                   \
-  func = (typeof(func))dlsym(sLink, #func);                               \
-  if (!func) {                                                            \
-    NS_WARNING("Couldn't load VideoDecodeAcceleration function " #func ); \
-    goto fail;                                                            \
-  }
-#include "AppleVDAFunctions.h"
-#undef LINK_FUNC
-
-  skPropWidth = GetIOConst("kVDADecoderConfiguration_Width");
-  skPropHeight = GetIOConst("kVDADecoderConfiguration_Height");
-  skPropSourceFormat = GetIOConst("kVDADecoderConfiguration_SourceFormat");
-  skPropAVCCData = GetIOConst("kVDADecoderConfiguration_avcCData");
-
-  if (!skPropWidth || !skPropHeight || !skPropSourceFormat || !skPropAVCCData) {
-    goto fail;
-  }
-
-  LOG("Loaded VideoDecodeAcceleration framework.");
-  sLinkStatus = LinkStatus_SUCCEEDED;
-  return true;
-
-fail:
-  Unlink();
-
-  sLinkStatus = LinkStatus_FAILED;
-  return false;
-}
-
-/* static */ void
-AppleVDALinker::Unlink()
-{
-  // We'll be called by multiple Decoders, one intantiated for
-  // each media element. Therefore we receive must maintain a
-  // reference count to avoidunloading our symbols when other
-  // instances still need them.
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(sRefCount > 0, "Unbalanced Unlink()");
-  --sRefCount;
-  if (sLink && sRefCount < 1) {
-    LOG("Unlinking VideoDecodeAcceleration framework.");
-#define LINK_FUNC(func)                                                   \
-    func = nullptr;
-#include "AppleVDAFunctions.h"
-#undef LINK_FUNC
-    dlclose(sLink);
-    sLink = nullptr;
-    skPropWidth = nullptr;
-    skPropHeight = nullptr;
-    skPropSourceFormat = nullptr;
-    skPropAVCCData = nullptr;
-    sLinkStatus = LinkStatus_INIT;
-  }
-}
-
-/* static */ CFStringRef
-AppleVDALinker::GetIOConst(const char* symbol)
-{
-  CFStringRef* address = (CFStringRef*)dlsym(sLink, symbol);
-  if (!address) {
-    return nullptr;
-  }
-
-  return *address;
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleVDALinker.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleVDALinker.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleVDALinker.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleVDALinker.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-/* -*- 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 AppleVDALinker_h
-#define AppleVDALinker_h
-
-extern "C" {
-#pragma GCC visibility push(default)
-#include "VideoDecodeAcceleration/VDADecoder.h"
-#pragma GCC visibility pop
-}
-
-#include "nscore.h"
-
-namespace mozilla {
-
-class AppleVDALinker
-{
-public:
-  static bool Link();
-  static void Unlink();
-  static CFStringRef skPropWidth;
-  static CFStringRef skPropHeight;
-  static CFStringRef skPropSourceFormat;
-  static CFStringRef skPropAVCCData;
-
-private:
-  static void* sLink;
-  static nsrefcnt sRefCount;
-
-  static enum LinkStatus {
-    LinkStatus_INIT = 0,
-    LinkStatus_FAILED,
-    LinkStatus_SUCCEEDED
-  } sLinkStatus;
-
-  static CFStringRef GetIOConst(const char* symbol);
-};
-
-#define LINK_FUNC(func) extern typeof(func)* func;
-#include "AppleVDAFunctions.h"
-#undef LINK_FUNC
-
-} // namespace mozilla
-
-#endif // AppleVDALinker_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleVTDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleVTDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleVTDecoder.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleVTDecoder.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,403 +0,0 @@
-/* -*- 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 <CoreFoundation/CFString.h>
-
-#include "AppleCMLinker.h"
-#include "AppleUtils.h"
-#include "AppleVTDecoder.h"
-#include "AppleVTLinker.h"
-#include "mp4_demuxer/H264.h"
-#include "MediaData.h"
-#include "MacIOSurfaceImage.h"
-#include "mozilla/ArrayUtils.h"
-#include "nsAutoPtr.h"
-#include "nsThreadUtils.h"
-#include "prlog.h"
-#include "VideoUtils.h"
-#include "gfxPlatform.h"
-
-#ifdef PR_LOGGING
-PRLogModuleInfo* GetAppleMediaLog();
-#define LOG(...) PR_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__))
-//#define LOG_MEDIA_SHA1
-#else
-#define LOG(...)
-#endif
-
-#ifdef LOG_MEDIA_SHA1
-#include "mozilla/SHA1.h"
-#endif
-
-namespace mozilla {
-
-AppleVTDecoder::AppleVTDecoder(const VideoInfo& aConfig,
-                               FlushableMediaTaskQueue* aVideoTaskQueue,
-                               MediaDataDecoderCallback* aCallback,
-                               layers::ImageContainer* aImageContainer)
-  : AppleVDADecoder(aConfig, aVideoTaskQueue, aCallback, aImageContainer)
-  , mFormat(nullptr)
-  , mSession(nullptr)
-  , mIsHardwareAccelerated(false)
-{
-  MOZ_COUNT_CTOR(AppleVTDecoder);
-  // TODO: Verify aConfig.mime_type.
-  LOG("Creating AppleVTDecoder for %dx%d h.264 video",
-      mDisplayWidth,
-      mDisplayHeight
-     );
-}
-
-AppleVTDecoder::~AppleVTDecoder()
-{
-  MOZ_COUNT_DTOR(AppleVTDecoder);
-}
-
-nsresult
-AppleVTDecoder::Init()
-{
-  nsresult rv = InitializeSession();
-  return rv;
-}
-
-nsresult
-AppleVTDecoder::Shutdown()
-{
-  if (mSession) {
-    LOG("%s: cleaning up session %p", __func__, mSession);
-    VTDecompressionSessionInvalidate(mSession);
-    CFRelease(mSession);
-    mSession = nullptr;
-  }
-  if (mFormat) {
-    LOG("%s: releasing format %p", __func__, mFormat);
-    CFRelease(mFormat);
-    mFormat = nullptr;
-  }
-  return NS_OK;
-}
-
-nsresult
-AppleVTDecoder::Input(MediaRawData* aSample)
-{
-  LOG("mp4 input sample %p pts %lld duration %lld us%s %d bytes",
-      aSample,
-      aSample->mTime,
-      aSample->mDuration,
-      aSample->mKeyframe ? " keyframe" : "",
-      aSample->mSize);
-
-#ifdef LOG_MEDIA_SHA1
-  SHA1Sum hash;
-  hash.update(aSample->data, aSample->size);
-  uint8_t digest_buf[SHA1Sum::kHashSize];
-  hash.finish(digest_buf);
-  nsAutoCString digest;
-  for (size_t i = 0; i < sizeof(digest_buf); i++) {
-    digest.AppendPrintf("%02x", digest_buf[i]);
-  }
-  LOG("    sha1 %s", digest.get());
-#endif // LOG_MEDIA_SHA1
-
-  mTaskQueue->Dispatch(
-      NS_NewRunnableMethodWithArg<nsRefPtr<MediaRawData>>(
-          this,
-          &AppleVTDecoder::SubmitFrame,
-          nsRefPtr<MediaRawData>(aSample)));
-  return NS_OK;
-}
-
-nsresult
-AppleVTDecoder::Flush()
-{
-  mTaskQueue->Flush();
-  nsresult rv = WaitForAsynchronousFrames();
-  if (NS_FAILED(rv)) {
-    LOG("AppleVTDecoder::Flush failed waiting for platform decoder "
-        "with error:%d.", rv);
-  }
-  ClearReorderedFrames();
-
-  return rv;
-}
-
-nsresult
-AppleVTDecoder::Drain()
-{
-  mTaskQueue->AwaitIdle();
-  nsresult rv = WaitForAsynchronousFrames();
-  if (NS_FAILED(rv)) {
-    LOG("AppleVTDecoder::Drain failed waiting for platform decoder "
-        "with error:%d.", rv);
-  }
-  DrainReorderedFrames();
-  mCallback->DrainComplete();
-  return NS_OK;
-}
-
-//
-// Implementation details.
-//
-
-// Callback passed to the VideoToolbox decoder for returning data.
-// This needs to be static because the API takes a C-style pair of
-// function and userdata pointers. This validates parameters and
-// forwards the decoded image back to an object method.
-static void
-PlatformCallback(void* decompressionOutputRefCon,
-                 void* sourceFrameRefCon,
-                 OSStatus status,
-                 VTDecodeInfoFlags flags,
-                 CVImageBufferRef image,
-                 CMTime presentationTimeStamp,
-                 CMTime presentationDuration)
-{
-  LOG("AppleVideoDecoder %s status %d flags %d", __func__, status, flags);
-
-  AppleVTDecoder* decoder =
-    static_cast<AppleVTDecoder*>(decompressionOutputRefCon);
-  nsAutoPtr<AppleVTDecoder::AppleFrameRef> frameRef(
-    static_cast<AppleVTDecoder::AppleFrameRef*>(sourceFrameRefCon));
-
-  // Validate our arguments.
-  if (status != noErr || !image) {
-    NS_WARNING("VideoToolbox decoder returned no data");
-    return;
-  }
-  if (flags & kVTDecodeInfo_FrameDropped) {
-    NS_WARNING("  ...frame tagged as dropped...");
-  }
-  MOZ_ASSERT(CFGetTypeID(image) == CVPixelBufferGetTypeID(),
-    "VideoToolbox returned an unexpected image type");
-
-  // Forward the data back to an object method which can access
-  // the correct MP4Reader callback.
-  decoder->OutputFrame(image, frameRef);
-}
-
-nsresult
-AppleVTDecoder::WaitForAsynchronousFrames()
-{
-  OSStatus rv = VTDecompressionSessionWaitForAsynchronousFrames(mSession);
-  if (rv != noErr) {
-    LOG("AppleVTDecoder: Error %d waiting for asynchronous frames", rv);
-    return NS_ERROR_FAILURE;
-  }
-  return NS_OK;
-}
-
-// Helper to fill in a timestamp structure.
-static CMSampleTimingInfo
-TimingInfoFromSample(MediaRawData* aSample)
-{
-  CMSampleTimingInfo timestamp;
-
-  timestamp.duration = CMTimeMake(aSample->mDuration, USECS_PER_S);
-  timestamp.presentationTimeStamp =
-    CMTimeMake(aSample->mTime, USECS_PER_S);
-  timestamp.decodeTimeStamp =
-    CMTimeMake(aSample->mTimecode, USECS_PER_S);
-
-  return timestamp;
-}
-
-nsresult
-AppleVTDecoder::SubmitFrame(MediaRawData* aSample)
-{
-  // For some reason this gives me a double-free error with stagefright.
-  AutoCFRelease<CMBlockBufferRef> block = nullptr;
-  AutoCFRelease<CMSampleBufferRef> sample = nullptr;
-  VTDecodeInfoFlags infoFlags;
-  OSStatus rv;
-
-  // FIXME: This copies the sample data. I think we can provide
-  // a custom block source which reuses the aSample buffer.
-  // But note that there may be a problem keeping the samples
-  // alive over multiple frames.
-  rv = CMBlockBufferCreateWithMemoryBlock(kCFAllocatorDefault, // Struct allocator.
-                                          const_cast<uint8_t*>(aSample->mData),
-                                          aSample->mSize,
-                                          kCFAllocatorNull, // Block allocator.
-                                          NULL, // Block source.
-                                          0,    // Data offset.
-                                          aSample->mSize,
-                                          false,
-                                          block.receive());
-  if (rv != noErr) {
-    NS_ERROR("Couldn't create CMBlockBuffer");
-    return NS_ERROR_FAILURE;
-  }
-  CMSampleTimingInfo timestamp = TimingInfoFromSample(aSample);
-  rv = CMSampleBufferCreate(kCFAllocatorDefault, block, true, 0, 0, mFormat, 1, 1, &timestamp, 0, NULL, sample.receive());
-  if (rv != noErr) {
-    NS_ERROR("Couldn't create CMSampleBuffer");
-    return NS_ERROR_FAILURE;
-  }
-
-  VTDecodeFrameFlags decodeFlags =
-    kVTDecodeFrame_EnableAsynchronousDecompression;
-  rv = VTDecompressionSessionDecodeFrame(mSession,
-                                         sample,
-                                         decodeFlags,
-                                         CreateAppleFrameRef(aSample),
-                                         &infoFlags);
-  if (rv != noErr && !(infoFlags & kVTDecodeInfo_FrameDropped)) {
-    LOG("AppleVTDecoder: Error %d VTDecompressionSessionDecodeFrame", rv);
-    NS_WARNING("Couldn't pass frame to decoder");
-    mCallback->Error();
-    return NS_ERROR_FAILURE;
-  }
-
-  // Ask for more data.
-  if (mTaskQueue->IsEmpty()) {
-    LOG("AppleVTDecoder task queue empty; requesting more data");
-    mCallback->InputExhausted();
-  }
-
-  return NS_OK;
-}
-
-nsresult
-AppleVTDecoder::InitializeSession()
-{
-  OSStatus rv;
-
-#ifdef LOG_MEDIA_SHA1
-  SHA1Sum avc_hash;
-  avc_hash.update(mExtraData->Elements(),mExtraData->Length());
-  uint8_t digest_buf[SHA1Sum::kHashSize];
-  avc_hash.finish(digest_buf);
-  nsAutoCString avc_digest;
-  for (size_t i = 0; i < sizeof(digest_buf); i++) {
-    avc_digest.AppendPrintf("%02x", digest_buf[i]);
-  }
-  LOG("AVCDecoderConfig %ld bytes sha1 %s",
-      mExtraData->Length(), avc_digest.get());
-#endif // LOG_MEDIA_SHA1
-
-  AutoCFRelease<CFDictionaryRef> extensions = CreateDecoderExtensions();
-
-  rv = CMVideoFormatDescriptionCreate(kCFAllocatorDefault,
-                                      kCMVideoCodecType_H264,
-                                      mPictureWidth,
-                                      mPictureHeight,
-                                      extensions,
-                                      &mFormat);
-  if (rv != noErr) {
-    NS_ERROR("Couldn't create format description!");
-    return NS_ERROR_FAILURE;
-  }
-
-  // Contruct video decoder selection spec.
-  AutoCFRelease<CFDictionaryRef> spec = CreateDecoderSpecification();
-
-  // Contruct output configuration.
-  AutoCFRelease<CFDictionaryRef> outputConfiguration =
-    CreateOutputConfiguration();
-
-  VTDecompressionOutputCallbackRecord cb = { PlatformCallback, this };
-  rv = VTDecompressionSessionCreate(kCFAllocatorDefault,
-                                    mFormat,
-                                    spec, // Video decoder selection.
-                                    outputConfiguration, // Output video format.
-                                    &cb,
-                                    &mSession);
-
-  if (rv != noErr) {
-    NS_ERROR("Couldn't create decompression session!");
-    return NS_ERROR_FAILURE;
-  }
-
-  if (AppleVTLinker::skPropUsingHWAccel) {
-    CFBooleanRef isUsingHW = nullptr;
-    rv = VTSessionCopyProperty(mSession,
-                               AppleVTLinker::skPropUsingHWAccel,
-                               kCFAllocatorDefault,
-                               &isUsingHW);
-    if (rv != noErr) {
-      LOG("AppleVTDecoder: system doesn't support hardware acceleration");
-    }
-    mIsHardwareAccelerated = rv == noErr && isUsingHW == kCFBooleanTrue;
-    LOG("AppleVTDecoder: %s hardware accelerated decoding",
-        mIsHardwareAccelerated ? "using" : "not using");
-  } else {
-    LOG("AppleVTDecoder: couldn't determine hardware acceleration status.");
-  }
-  return NS_OK;
-}
-
-CFDictionaryRef
-AppleVTDecoder::CreateDecoderExtensions()
-{
-  AutoCFRelease<CFDataRef> avc_data =
-    CFDataCreate(kCFAllocatorDefault,
-                 mExtraData->Elements(),
-                 mExtraData->Length());
-
-  const void* atomsKey[] = { CFSTR("avcC") };
-  const void* atomsValue[] = { avc_data };
-  static_assert(ArrayLength(atomsKey) == ArrayLength(atomsValue),
-                "Non matching keys/values array size");
-
-  AutoCFRelease<CFDictionaryRef> atoms =
-    CFDictionaryCreate(kCFAllocatorDefault,
-                       atomsKey,
-                       atomsValue,
-                       ArrayLength(atomsKey),
-                       &kCFTypeDictionaryKeyCallBacks,
-                       &kCFTypeDictionaryValueCallBacks);
-
-  const void* extensionKeys[] =
-    { kCVImageBufferChromaLocationBottomFieldKey,
-      kCVImageBufferChromaLocationTopFieldKey,
-      AppleCMLinker::skPropExtensionAtoms,
-      AppleCMLinker::skPropFullRangeVideo /* Not defined in 10.6 */ };
-
-  const void* extensionValues[] =
-    { kCVImageBufferChromaLocation_Left,
-      kCVImageBufferChromaLocation_Left,
-      atoms,
-      kCFBooleanTrue };
-  static_assert(ArrayLength(extensionKeys) == ArrayLength(extensionValues),
-                "Non matching keys/values array size");
-
-  return CFDictionaryCreate(kCFAllocatorDefault,
-                            extensionKeys,
-                            extensionValues,
-                            AppleCMLinker::skPropFullRangeVideo ?
-                              ArrayLength(extensionKeys) :
-                              ArrayLength(extensionKeys) - 1,
-                            &kCFTypeDictionaryKeyCallBacks,
-                            &kCFTypeDictionaryValueCallBacks);
-}
-
-CFDictionaryRef
-AppleVTDecoder::CreateDecoderSpecification()
-{
-  if (!AppleVTLinker::skPropEnableHWAccel) {
-    return nullptr;
-  }
-
-  const void* specKeys[] = { AppleVTLinker::skPropEnableHWAccel };
-  const void* specValues[1];
-  if (gfxPlatform::CanUseHardwareVideoDecoding()) {
-    specValues[0] = kCFBooleanTrue;
-  } else {
-    // This GPU is blacklisted for hardware decoding.
-    specValues[0] = kCFBooleanFalse;
-  }
-  static_assert(ArrayLength(specKeys) == ArrayLength(specValues),
-                "Non matching keys/values array size");
-
-  return CFDictionaryCreate(kCFAllocatorDefault,
-                            specKeys,
-                            specValues,
-                            ArrayLength(specKeys),
-                            &kCFTypeDictionaryKeyCallBacks,
-                            &kCFTypeDictionaryValueCallBacks);
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleVTDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleVTDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleVTDecoder.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleVTDecoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-/* -*- 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_AppleVTDecoder_h
-#define mozilla_AppleVTDecoder_h
-
-#include "AppleVDADecoder.h"
-
-#include "VideoToolbox/VideoToolbox.h"
-
-namespace mozilla {
-
-class AppleVTDecoder : public AppleVDADecoder {
-public:
-  AppleVTDecoder(const VideoInfo& aConfig,
-                 FlushableMediaTaskQueue* aVideoTaskQueue,
-                 MediaDataDecoderCallback* aCallback,
-                 layers::ImageContainer* aImageContainer);
-  virtual ~AppleVTDecoder();
-  virtual nsresult Init() override;
-  virtual nsresult Input(MediaRawData* aSample) override;
-  virtual nsresult Flush() override;
-  virtual nsresult Drain() override;
-  virtual nsresult Shutdown() override;
-  virtual bool IsHardwareAccelerated() const override
-  {
-    return mIsHardwareAccelerated;
-  }
-
-private:
-  CMVideoFormatDescriptionRef mFormat;
-  VTDecompressionSessionRef mSession;
-
-  // Method to pass a frame to VideoToolbox for decoding.
-  nsresult SubmitFrame(MediaRawData* aSample);
-  // Method to set up the decompression session.
-  nsresult InitializeSession();
-  nsresult WaitForAsynchronousFrames();
-  CFDictionaryRef CreateDecoderSpecification();
-  CFDictionaryRef CreateDecoderExtensions();
-  bool mIsHardwareAccelerated;
-};
-
-} // namespace mozilla
-
-#endif // mozilla_AppleVTDecoder_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleVTFunctions.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleVTFunctions.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleVTFunctions.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleVTFunctions.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-/* -*- 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/. */
-
-// Construct references to each of the VideoToolbox symbols we use.
-
-LINK_FUNC(VTDecompressionSessionCreate)
-LINK_FUNC(VTDecompressionSessionDecodeFrame)
-LINK_FUNC(VTDecompressionSessionInvalidate)
-LINK_FUNC(VTDecompressionSessionWaitForAsynchronousFrames)
-LINK_FUNC(VTSessionCopyProperty)
-LINK_FUNC(VTSessionCopySupportedPropertyDictionary)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleVTLinker.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleVTLinker.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleVTLinker.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleVTLinker.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,124 +0,0 @@
-/* -*- 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 <dlfcn.h>
-
-#include "AppleVTLinker.h"
-#include "MainThreadUtils.h"
-#include "mozilla/ArrayUtils.h"
-#include "nsDebug.h"
-
-#ifdef PR_LOGGING
-PRLogModuleInfo* GetAppleMediaLog();
-#define LOG(...) PR_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__))
-#else
-#define LOG(...)
-#endif
-
-namespace mozilla {
-
-AppleVTLinker::LinkStatus
-AppleVTLinker::sLinkStatus = LinkStatus_INIT;
-
-void* AppleVTLinker::sLink = nullptr;
-nsrefcnt AppleVTLinker::sRefCount = 0;
-CFStringRef AppleVTLinker::skPropEnableHWAccel = nullptr;
-CFStringRef AppleVTLinker::skPropUsingHWAccel = nullptr;
-
-#define LINK_FUNC(func) typeof(func) func;
-#include "AppleVTFunctions.h"
-#undef LINK_FUNC
-
-/* static */ bool
-AppleVTLinker::Link()
-{
-  // Bump our reference count every time we're called.
-  // Add a lock or change the thread assertion if
-  // you need to call this off the main thread.
-  MOZ_ASSERT(NS_IsMainThread());
-  ++sRefCount;
-
-  if (sLinkStatus) {
-    return sLinkStatus == LinkStatus_SUCCEEDED;
-  }
-
-  const char* dlnames[] =
-    { "/System/Library/Frameworks/VideoToolbox.framework/VideoToolbox",
-      "/System/Library/PrivateFrameworks/VideoToolbox.framework/VideoToolbox" };
-  bool dlfound = false;
-  for (size_t i = 0; i < ArrayLength(dlnames); i++) {
-    if ((sLink = dlopen(dlnames[i], RTLD_NOW | RTLD_LOCAL))) {
-      dlfound = true;
-      break;
-    }
-  }
-  if (!dlfound) {
-    NS_WARNING("Couldn't load VideoToolbox framework");
-    goto fail;
-  }
-
-#define LINK_FUNC(func)                                        \
-  func = (typeof(func))dlsym(sLink, #func);                    \
-  if (!func) {                                                 \
-    NS_WARNING("Couldn't load VideoToolbox function " #func ); \
-    goto fail;                                                 \
-  }
-#include "AppleVTFunctions.h"
-#undef LINK_FUNC
-
-  // Will only resolve in 10.9 and later.
-  skPropEnableHWAccel =
-    GetIOConst("kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder");
-  skPropUsingHWAccel =
-    GetIOConst("kVTDecompressionPropertyKey_UsingHardwareAcceleratedVideoDecoder");
-
-  LOG("Loaded VideoToolbox framework.");
-  sLinkStatus = LinkStatus_SUCCEEDED;
-  return true;
-
-fail:
-  Unlink();
-
-  sLinkStatus = LinkStatus_FAILED;
-  return false;
-}
-
-/* static */ void
-AppleVTLinker::Unlink()
-{
-  // We'll be called by multiple Decoders, one intantiated for
-  // each media element. Therefore we receive must maintain a
-  // reference count to avoidunloading our symbols when other
-  // instances still need them.
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(sRefCount > 0, "Unbalanced Unlink()");
-  --sRefCount;
-  if (sLink && sRefCount < 1) {
-    LOG("Unlinking VideoToolbox framework.");
-#define LINK_FUNC(func)                                                   \
-    func = nullptr;
-#include "AppleVTFunctions.h"
-#undef LINK_FUNC
-    dlclose(sLink);
-    sLink = nullptr;
-    skPropEnableHWAccel = nullptr;
-    skPropUsingHWAccel = nullptr;
-    sLinkStatus = LinkStatus_INIT;
-  }
-}
-
-/* static */ CFStringRef
-AppleVTLinker::GetIOConst(const char* symbol)
-{
-  CFStringRef* address = (CFStringRef*)dlsym(sLink, symbol);
-  if (!address) {
-    return nullptr;
-  }
-
-  return *address;
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleVTLinker.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleVTLinker.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/AppleVTLinker.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/AppleVTLinker.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-/* -*- 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 AppleVTLinker_h
-#define AppleVTLinker_h
-
-extern "C" {
-#pragma GCC visibility push(default)
-#include "VideoToolbox/VideoToolbox.h"
-#pragma GCC visibility pop
-}
-
-#include "nscore.h"
-
-namespace mozilla {
-
-class AppleVTLinker
-{
-public:
-  static bool Link();
-  static void Unlink();
-  static CFStringRef skPropEnableHWAccel;
-  static CFStringRef skPropUsingHWAccel;
-
-private:
-  static void* sLink;
-  static nsrefcnt sRefCount;
-
-  static enum LinkStatus {
-    LinkStatus_INIT = 0,
-    LinkStatus_FAILED,
-    LinkStatus_SUCCEEDED
-  } sLinkStatus;
-
-  static CFStringRef GetIOConst(const char* symbol);
-};
-
-#define LINK_FUNC(func) extern typeof(func)* func;
-#include "AppleVTFunctions.h"
-#undef LINK_FUNC
-
-} // namespace mozilla
-
-#endif // AppleVTLinker_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/ReorderQueue.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/ReorderQueue.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/ReorderQueue.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/ReorderQueue.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-// Queue for ordering decoded video frames by presentation time.
-// Decoders often return frames out of order, which we need to
-// buffer so we can forward them in correct presentation order.
-
-#ifndef mozilla_ReorderQueue_h
-#define mozilla_ReorderQueue_h
-
-#include <MediaData.h>
-#include <nsTPriorityQueue.h>
-
-namespace mozilla {
-
-struct ReorderQueueComparator
-{
-  bool LessThan(VideoData* const& a, VideoData* const& b) const
-  {
-    return a->mTime < b->mTime;
-  }
-};
-
-typedef nsTPriorityQueue<nsRefPtr<VideoData>, ReorderQueueComparator> ReorderQueue;
-
-} // namespace mozilla
-
-#endif // mozilla_ReorderQueue_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/VideoDecodeAcceleration/VDADecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/VideoDecodeAcceleration/VDADecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/VideoDecodeAcceleration/VDADecoder.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/VideoDecodeAcceleration/VDADecoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-/* -*- 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/. */
-
-// Stub header for VideoDecodeAcceleration framework API.
-// This is a private Framework on 10.6 see:
-// https://developer.apple.com/library/mac/technotes/tn2267/_index.html
-// We include our own copy so we can build on MacOS versions
-// where it's not available.
-
-#ifndef mozilla_VideoDecodeAcceleration_VDADecoder_h
-#define mozilla_VideoDecodeAcceleration_VDADecoder_h
-
-#include <CoreFoundation/CoreFoundation.h>
-#include <CoreVideo/CoreVideo.h>
-
-typedef uint32_t VDADecodeFrameFlags;
-typedef uint32_t VDADecodeInfoFlags;
-
-enum {
-  kVDADecodeInfo_Asynchronous = 1UL << 0,
-  kVDADecodeInfo_FrameDropped = 1UL << 1
-};
-
-enum {
-  kVDADecoderFlush_EmitFrames = 1 << 0
-};
-
-typedef struct OpaqueVDADecoder* VDADecoder;
-
-typedef void (*VDADecoderOutputCallback)
-  (void* decompressionOutputRefCon,
-   CFDictionaryRef frameInfo,
-   OSStatus status,
-   uint32_t infoFlags,
-   CVImageBufferRef imageBuffer);
-
-OSStatus
-VDADecoderCreate(
-  CFDictionaryRef decoderConfiguration,
-  CFDictionaryRef destinationImageBufferAttributes, /* can be NULL */
-  VDADecoderOutputCallback* outputCallback,
-  void* decoderOutputCallbackRefcon,
-  VDADecoder* decoderOut);
-
-OSStatus
-VDADecoderDecode(
-  VDADecoder decoder,
-  uint32_t decodeFlags,
-  CFTypeRef compressedBuffer,
-  CFDictionaryRef frameInfo); /* can be NULL */
-
-OSStatus
-VDADecoderFlush(
-  VDADecoder decoder,
-  uint32_t flushFlags);
-
-OSStatus
-VDADecoderDestroy(VDADecoder decoder);
-
-#endif // mozilla_VideoDecodeAcceleration_VDADecoder_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/VideoToolbox/VideoToolbox.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/VideoToolbox/VideoToolbox.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/apple/VideoToolbox/VideoToolbox.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/apple/VideoToolbox/VideoToolbox.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-/* -*- 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/. */
-
-// Stub header for VideoToolbox framework API.
-// We include our own copy so we can build on MacOS versions
-// where it's not available.
-
-#ifndef mozilla_VideoToolbox_VideoToolbox_h
-#define mozilla_VideoToolbox_VideoToolbox_h
-
-// CoreMedia is available starting in OS X 10.7,
-// so we need to dlopen it as well to run on 10.6,
-// but we can depend on the real framework headers at build time.
-
-#include <CoreFoundation/CoreFoundation.h>
-#include <CoreMedia/CoreMedia.h>
-#include <CoreVideo/CVPixelBuffer.h>
-
-typedef uint32_t VTDecodeFrameFlags;
-typedef uint32_t VTDecodeInfoFlags;
-enum {
-  kVTDecodeInfo_Asynchronous = 1UL << 0,
-  kVTDecodeInfo_FrameDropped = 1UL << 1,
-};
-enum {
-  kVTDecodeFrame_EnableAsynchronousDecompression = 1<<0,
-  kVTDecodeFrame_DoNotOutputFrame = 1<<1,
-  kVTDecodeFrame_1xRealTimePlayback = 1<<2,
-  kVTDecodeFrame_EnableTemporalProcessing = 1<<3,
-};
-
-typedef CFTypeRef VTSessionRef;
-typedef struct OpaqueVTDecompressionSession* VTDecompressionSessionRef;
-typedef void (*VTDecompressionOutputCallback)(
-    void*,
-    void*,
-    OSStatus,
-    VTDecodeInfoFlags,
-    CVImageBufferRef,
-    CMTime,
-    CMTime
-);
-typedef struct VTDecompressionOutputCallbackRecord {
-    VTDecompressionOutputCallback decompressionOutputCallback;
-    void*                         decompressionOutputRefCon;
-} VTDecompressionOutputCallbackRecord;
-
-OSStatus
-VTDecompressionSessionCreate(
-    CFAllocatorRef,
-    CMVideoFormatDescriptionRef,
-    CFDictionaryRef,
-    CFDictionaryRef,
-    const VTDecompressionOutputCallbackRecord*,
-    VTDecompressionSessionRef*
-);
-
-OSStatus
-VTDecompressionSessionDecodeFrame(
-    VTDecompressionSessionRef,
-    CMSampleBufferRef,
-    VTDecodeFrameFlags,
-    void*,
-    VTDecodeInfoFlags*
-);
-
-OSStatus
-VTDecompressionSessionWaitForAsynchronousFrames(
-    VTDecompressionSessionRef
-);
-
-void
-VTDecompressionSessionInvalidate(
-    VTDecompressionSessionRef
-);
-
-OSStatus
-VTSessionCopyProperty(
-    VTSessionRef,
-    CFStringRef,
-    CFAllocatorRef,
-    void*
-);
-
-OSStatus
-VTSessionCopySupportedPropertyDictionary(
-    VTSessionRef,
-    CFDictionaryRef*
-);
-
-#endif // mozilla_VideoToolbox_VideoToolbox_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/BlankDecoderModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/BlankDecoderModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/BlankDecoderModule.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/BlankDecoderModule.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,260 +0,0 @@
-/* -*- 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 "MediaDecoderReader.h"
-#include "PlatformDecoderModule.h"
-#include "nsRect.h"
-#include "mozilla/RefPtr.h"
-#include "mozilla/CheckedInt.h"
-#include "VideoUtils.h"
-#include "ImageContainer.h"
-#include "MediaInfo.h"
-#include "MediaTaskQueue.h"
-
-namespace mozilla {
-
-// Decoder that uses a passed in object's Create function to create blank
-// MediaData objects.
-template<class BlankMediaDataCreator>
-class BlankMediaDataDecoder : public MediaDataDecoder {
-public:
-
-  BlankMediaDataDecoder(BlankMediaDataCreator* aCreator,
-                        FlushableMediaTaskQueue* aTaskQueue,
-                        MediaDataDecoderCallback* aCallback)
-    : mCreator(aCreator)
-    , mTaskQueue(aTaskQueue)
-    , mCallback(aCallback)
-  {
-  }
-
-  virtual nsresult Init() override {
-    return NS_OK;
-  }
-
-  virtual nsresult Shutdown() override {
-    return NS_OK;
-  }
-
-  class OutputEvent : public nsRunnable {
-  public:
-    OutputEvent(MediaRawData* aSample,
-                MediaDataDecoderCallback* aCallback,
-                BlankMediaDataCreator* aCreator)
-      : mSample(aSample)
-      , mCreator(aCreator)
-      , mCallback(aCallback)
-    {
-    }
-    NS_IMETHOD Run() override
-    {
-      nsRefPtr<MediaData> data = mCreator->Create(mSample->mTime,
-                                                  mSample->mDuration,
-                                                  mSample->mOffset);
-      mCallback->Output(data);
-      return NS_OK;
-    }
-  private:
-    nsRefPtr<MediaRawData> mSample;
-    BlankMediaDataCreator* mCreator;
-    MediaDataDecoderCallback* mCallback;
-  };
-
-  virtual nsresult Input(MediaRawData* aSample) override
-  {
-    // The MediaDataDecoder must delete the sample when we're finished
-    // with it, so the OutputEvent stores it in an nsAutoPtr and deletes
-    // it once it's run.
-    RefPtr<nsIRunnable> r(new OutputEvent(aSample, mCallback, mCreator));
-    mTaskQueue->Dispatch(r);
-    return NS_OK;
-  }
-
-  virtual nsresult Flush() override {
-    mTaskQueue->Flush();
-    return NS_OK;
-  }
-
-  virtual nsresult Drain() override {
-    mCallback->DrainComplete();
-    return NS_OK;
-  }
-
-private:
-  nsAutoPtr<BlankMediaDataCreator> mCreator;
-  RefPtr<FlushableMediaTaskQueue> mTaskQueue;
-  MediaDataDecoderCallback* mCallback;
-};
-
-class BlankVideoDataCreator {
-public:
-  BlankVideoDataCreator(uint32_t aFrameWidth,
-                        uint32_t aFrameHeight,
-                        layers::ImageContainer* aImageContainer)
-    : mFrameWidth(aFrameWidth)
-    , mFrameHeight(aFrameHeight)
-    , mImageContainer(aImageContainer)
-  {
-    mInfo.mDisplay = nsIntSize(mFrameWidth, mFrameHeight);
-    mPicture = gfx::IntRect(0, 0, mFrameWidth, mFrameHeight);
-  }
-
-  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,
-    // 2x2 subsampled. Have the data pointers of each frame point to the
-    // first plane, they'll always be zero'd memory anyway.
-    nsAutoArrayPtr<uint8_t> frame(new uint8_t[mFrameWidth * mFrameHeight]);
-    memset(frame, 0, mFrameWidth * mFrameHeight);
-    VideoData::YCbCrBuffer buffer;
-
-    // Y plane.
-    buffer.mPlanes[0].mData = frame;
-    buffer.mPlanes[0].mStride = mFrameWidth;
-    buffer.mPlanes[0].mHeight = mFrameHeight;
-    buffer.mPlanes[0].mWidth = mFrameWidth;
-    buffer.mPlanes[0].mOffset = 0;
-    buffer.mPlanes[0].mSkip = 0;
-
-    // Cb plane.
-    buffer.mPlanes[1].mData = frame;
-    buffer.mPlanes[1].mStride = mFrameWidth / 2;
-    buffer.mPlanes[1].mHeight = mFrameHeight / 2;
-    buffer.mPlanes[1].mWidth = mFrameWidth / 2;
-    buffer.mPlanes[1].mOffset = 0;
-    buffer.mPlanes[1].mSkip = 0;
-
-    // Cr plane.
-    buffer.mPlanes[2].mData = frame;
-    buffer.mPlanes[2].mStride = mFrameWidth / 2;
-    buffer.mPlanes[2].mHeight = mFrameHeight / 2;
-    buffer.mPlanes[2].mWidth = mFrameWidth / 2;
-    buffer.mPlanes[2].mOffset = 0;
-    buffer.mPlanes[2].mSkip = 0;
-
-    return VideoData::Create(mInfo,
-                             mImageContainer,
-                             nullptr,
-                             aOffsetInStream,
-                             aDTS,
-                             aDuration,
-                             buffer,
-                             true,
-                             aDTS,
-                             mPicture);
-  }
-private:
-  VideoInfo mInfo;
-  gfx::IntRect mPicture;
-  uint32_t mFrameWidth;
-  uint32_t mFrameHeight;
-  RefPtr<layers::ImageContainer> mImageContainer;
-};
-
-
-class BlankAudioDataCreator {
-public:
-  BlankAudioDataCreator(uint32_t aChannelCount, uint32_t aSampleRate)
-    : mFrameSum(0), mChannelCount(aChannelCount), mSampleRate(aSampleRate)
-  {
-  }
-
-  MediaData* Create(Microseconds aDTS,
-                    Microseconds aDuration,
-                    int64_t aOffsetInStream)
-  {
-    // Convert duration to frames. We add 1 to duration to account for
-    // rounding errors, so we get a consistent tone.
-    CheckedInt64 frames = UsecsToFrames(aDuration+1, mSampleRate);
-    if (!frames.isValid() ||
-        !mChannelCount ||
-        !mSampleRate ||
-        frames.value() > (UINT32_MAX / mChannelCount)) {
-      return nullptr;
-    }
-    AudioDataValue* samples = new AudioDataValue[frames.value() * mChannelCount];
-    // Fill the sound buffer with an A4 tone.
-    static const float pi = 3.14159265f;
-    static const float noteHz = 440.0f;
-    for (int i = 0; i < frames.value(); i++) {
-      float f = sin(2 * pi * noteHz * mFrameSum / mSampleRate);
-      for (unsigned c = 0; c < mChannelCount; c++) {
-        samples[i * mChannelCount + c] = AudioDataValue(f);
-      }
-      mFrameSum++;
-    }
-    return new AudioData(aOffsetInStream,
-                         aDTS,
-                         aDuration,
-                         uint32_t(frames.value()),
-                         samples,
-                         mChannelCount,
-                         mSampleRate);
-  }
-
-private:
-  int64_t mFrameSum;
-  uint32_t mChannelCount;
-  uint32_t mSampleRate;
-};
-
-class BlankDecoderModule : public PlatformDecoderModule {
-public:
-
-  // Decode thread.
-  virtual already_AddRefed<MediaDataDecoder>
-  CreateVideoDecoder(const VideoInfo& aConfig,
-                     layers::LayersBackend aLayersBackend,
-                     layers::ImageContainer* aImageContainer,
-                     FlushableMediaTaskQueue* aVideoTaskQueue,
-                     MediaDataDecoderCallback* aCallback) override {
-    BlankVideoDataCreator* creator = new BlankVideoDataCreator(
-      aConfig.mDisplay.width, aConfig.mDisplay.height, aImageContainer);
-    nsRefPtr<MediaDataDecoder> decoder =
-      new BlankMediaDataDecoder<BlankVideoDataCreator>(creator,
-                                                       aVideoTaskQueue,
-                                                       aCallback);
-    return decoder.forget();
-  }
-
-  // Decode thread.
-  virtual already_AddRefed<MediaDataDecoder>
-  CreateAudioDecoder(const AudioInfo& aConfig,
-                     FlushableMediaTaskQueue* aAudioTaskQueue,
-                     MediaDataDecoderCallback* aCallback) override {
-    BlankAudioDataCreator* creator = new BlankAudioDataCreator(
-      aConfig.mChannels, aConfig.mRate);
-
-    nsRefPtr<MediaDataDecoder> decoder =
-      new BlankMediaDataDecoder<BlankAudioDataCreator>(creator,
-                                                       aAudioTaskQueue,
-                                                       aCallback);
-    return decoder.forget();
-  }
-
-  virtual bool
-  SupportsMimeType(const nsACString& aMimeType) override
-  {
-    return true;
-  }
-
-  virtual ConversionRequired
-  DecoderNeedsConversion(const TrackInfo& aConfig) const override
-  {
-    return kNeedNone;
-  }
-
-};
-
-already_AddRefed<PlatformDecoderModule> CreateBlankDecoderModule()
-{
-  nsRefPtr<PlatformDecoderModule> pdm = new BlankDecoderModule();
-  return pdm.forget();
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/eme/EMEAudioDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/eme/EMEAudioDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/eme/EMEAudioDecoder.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/eme/EMEAudioDecoder.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-/* -*- 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 "EMEAudioDecoder.h"
-#include "mozilla/CDMProxy.h"
-
-namespace mozilla {
-
-void
-EMEAudioCallbackAdapter::Error(GMPErr aErr)
-{
-  if (aErr == GMPNoKeyErr) {
-    // The GMP failed to decrypt a frame due to not having a key. This can
-    // happen if a key expires or a session is closed during playback.
-    NS_WARNING("GMP failed to decrypt due to lack of key");
-    return;
-  }
-  AudioCallbackAdapter::Error(aErr);
-}
-
-void
-EMEAudioDecoder::InitTags(nsTArray<nsCString>& aTags)
-{
-  GMPAudioDecoder::InitTags(aTags);
-  aTags.AppendElement(NS_ConvertUTF16toUTF8(mProxy->KeySystem()));
-}
-
-nsCString
-EMEAudioDecoder::GetNodeId()
-{
-  return mProxy->GetNodeId();
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/eme/EMEAudioDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/eme/EMEAudioDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/eme/EMEAudioDecoder.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/eme/EMEAudioDecoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/* -*- 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 EMEAudioDecoder_h_
-#define EMEAudioDecoder_h_
-
-#include "GMPAudioDecoder.h"
-#include "PlatformDecoderModule.h"
-
-namespace mozilla {
-
-class EMEAudioCallbackAdapter : public AudioCallbackAdapter {
-public:
-  explicit EMEAudioCallbackAdapter(MediaDataDecoderCallbackProxy* aCallback)
-   : AudioCallbackAdapter(aCallback)
-  {}
-
-  virtual void Error(GMPErr aErr) override;
-};
-
-class EMEAudioDecoder : public GMPAudioDecoder {
-public:
-  EMEAudioDecoder(CDMProxy* aProxy,
-                  const AudioInfo& aConfig,
-                  MediaTaskQueue* aTaskQueue,
-                  MediaDataDecoderCallbackProxy* aCallback)
-   : GMPAudioDecoder(aConfig, aTaskQueue, aCallback, new EMEAudioCallbackAdapter(aCallback))
-   , mProxy(aProxy)
-  {
-  }
-
-private:
-  virtual void InitTags(nsTArray<nsCString>& aTags) override;
-  virtual nsCString GetNodeId() override;
-
-  nsRefPtr<CDMProxy> mProxy;
-};
-
-} // namespace mozilla
-
-#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/eme/EMEDecoderModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/eme/EMEDecoderModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/eme/EMEDecoderModule.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/eme/EMEDecoderModule.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,289 +0,0 @@
-/* -*- 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 "EMEDecoderModule.h"
-#include "EMEAudioDecoder.h"
-#include "EMEVideoDecoder.h"
-#include "MediaDataDecoderProxy.h"
-#include "mozIGeckoMediaPluginService.h"
-#include "mozilla/CDMProxy.h"
-#include "mozilla/unused.h"
-#include "nsServiceManagerUtils.h"
-#include "MediaInfo.h"
-
-namespace mozilla {
-
-class EMEDecryptor : public MediaDataDecoder {
-
-public:
-
-  EMEDecryptor(MediaDataDecoder* aDecoder,
-               MediaDataDecoderCallback* aCallback,
-               CDMProxy* aProxy,
-               MediaTaskQueue* aDecodeTaskQueue)
-    : mDecoder(aDecoder)
-    , mCallback(aCallback)
-    , mTaskQueue(aDecodeTaskQueue)
-    , mProxy(aProxy)
-    , mSamplesWaitingForKey(new SamplesWaitingForKey(this, mTaskQueue, mProxy))
-    , mIsShutdown(false)
-  {
-  }
-
-  virtual nsresult Init() override {
-    MOZ_ASSERT(!mIsShutdown);
-    return mDecoder->Init();
-  }
-
-  class DeliverDecrypted : public DecryptionClient {
-  public:
-    explicit DeliverDecrypted(EMEDecryptor* aDecryptor)
-      : mDecryptor(aDecryptor)
-    { }
-    virtual void Decrypted(GMPErr aResult, MediaRawData* aSample) override {
-      mDecryptor->Decrypted(aResult, aSample);
-      mDecryptor = nullptr;
-    }
-  private:
-    nsRefPtr<EMEDecryptor> mDecryptor;
-  };
-
-  virtual nsresult Input(MediaRawData* aSample) override {
-    MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
-    MOZ_ASSERT(!mIsShutdown);
-    if (mSamplesWaitingForKey->WaitIfKeyNotUsable(aSample)) {
-      return NS_OK;
-    }
-
-    nsAutoPtr<MediaRawDataWriter> writer(aSample->CreateWriter());
-    mProxy->GetSessionIdsForKeyId(aSample->mCrypto.mKeyId,
-                                  writer->mCrypto.mSessionIds);
-
-    mProxy->Decrypt(aSample, new DeliverDecrypted(this), mTaskQueue);
-    return NS_OK;
-  }
-
-  void Decrypted(GMPErr aResult, MediaRawData* aSample) {
-    MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
-    if (mIsShutdown) {
-      NS_WARNING("EME decrypted sample arrived after shutdown");
-      return;
-    }
-    if (aResult == GMPNoKeyErr) {
-      // Key became unusable after we sent the sample to CDM to decrypt.
-      // Call Input() again, so that the sample is enqueued for decryption
-      // if the key becomes usable again.
-      Input(aSample);
-    } else if (GMP_FAILED(aResult)) {
-      if (mCallback) {
-        mCallback->Error();
-      }
-      MOZ_ASSERT(!aSample);
-    } else {
-      MOZ_ASSERT(!mIsShutdown);
-      nsresult rv = mDecoder->Input(aSample);
-      unused << NS_WARN_IF(NS_FAILED(rv));
-    }
-  }
-
-  virtual nsresult Flush() override {
-    MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
-    MOZ_ASSERT(!mIsShutdown);
-    nsresult rv = mDecoder->Flush();
-    unused << NS_WARN_IF(NS_FAILED(rv));
-    mSamplesWaitingForKey->Flush();
-    return rv;
-  }
-
-  virtual nsresult Drain() override {
-    MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
-    MOZ_ASSERT(!mIsShutdown);
-    nsresult rv = mDecoder->Drain();
-    unused << NS_WARN_IF(NS_FAILED(rv));
-    return rv;
-  }
-
-  virtual nsresult Shutdown() override {
-    MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
-    MOZ_ASSERT(!mIsShutdown);
-    mIsShutdown = true;
-    nsresult rv = mDecoder->Shutdown();
-    unused << NS_WARN_IF(NS_FAILED(rv));
-    mSamplesWaitingForKey->BreakCycles();
-    mSamplesWaitingForKey = nullptr;
-    mDecoder = nullptr;
-    mProxy = nullptr;
-    mCallback = nullptr;
-    return rv;
-  }
-
-private:
-
-  nsRefPtr<MediaDataDecoder> mDecoder;
-  MediaDataDecoderCallback* mCallback;
-  nsRefPtr<MediaTaskQueue> mTaskQueue;
-  nsRefPtr<CDMProxy> mProxy;
-  nsRefPtr<SamplesWaitingForKey> mSamplesWaitingForKey;
-  bool mIsShutdown;
-};
-
-class EMEMediaDataDecoderProxy : public MediaDataDecoderProxy {
-public:
-  EMEMediaDataDecoderProxy(nsIThread* aProxyThread, MediaDataDecoderCallback* aCallback, CDMProxy* aProxy, FlushableMediaTaskQueue* aTaskQueue)
-   : MediaDataDecoderProxy(aProxyThread, aCallback)
-   , mSamplesWaitingForKey(new SamplesWaitingForKey(this, aTaskQueue, aProxy))
-   , mProxy(aProxy)
-  {
-  }
-
-  virtual nsresult Input(MediaRawData* aSample) override;
-  virtual nsresult Shutdown() override;
-
-private:
-  nsRefPtr<SamplesWaitingForKey> mSamplesWaitingForKey;
-  nsRefPtr<CDMProxy> mProxy;
-};
-
-nsresult
-EMEMediaDataDecoderProxy::Input(MediaRawData* aSample)
-{
-  if (mSamplesWaitingForKey->WaitIfKeyNotUsable(aSample)) {
-    return NS_OK;
-  }
-
-  nsAutoPtr<MediaRawDataWriter> writer(aSample->CreateWriter());
-  mProxy->GetSessionIdsForKeyId(aSample->mCrypto.mKeyId,
-                                writer->mCrypto.mSessionIds);
-
-  return MediaDataDecoderProxy::Input(aSample);
-}
-
-nsresult
-EMEMediaDataDecoderProxy::Shutdown()
-{
-  nsresult rv = MediaDataDecoderProxy::Shutdown();
-
-  mSamplesWaitingForKey->BreakCycles();
-  mSamplesWaitingForKey = nullptr;
-  mProxy = nullptr;
-
-  return rv;
-}
-
-EMEDecoderModule::EMEDecoderModule(CDMProxy* aProxy,
-                                   PlatformDecoderModule* aPDM,
-                                   bool aCDMDecodesAudio,
-                                   bool aCDMDecodesVideo)
-  : mProxy(aProxy)
-  , mPDM(aPDM)
-  , mCDMDecodesAudio(aCDMDecodesAudio)
-  , mCDMDecodesVideo(aCDMDecodesVideo)
-{
-}
-
-EMEDecoderModule::~EMEDecoderModule()
-{
-}
-
-static already_AddRefed<MediaDataDecoderProxy>
-CreateDecoderWrapper(MediaDataDecoderCallback* aCallback, CDMProxy* aProxy, FlushableMediaTaskQueue* aTaskQueue)
-{
-  nsCOMPtr<mozIGeckoMediaPluginService> gmpService = do_GetService("@mozilla.org/gecko-media-plugin-service;1");
-  if (!gmpService) {
-    return nullptr;
-  }
-
-  nsCOMPtr<nsIThread> thread;
-  nsresult rv = gmpService->GetThread(getter_AddRefs(thread));
-  if (NS_FAILED(rv)) {
-    return nullptr;
-  }
-
-  nsRefPtr<MediaDataDecoderProxy> decoder(new EMEMediaDataDecoderProxy(thread, aCallback, aProxy, aTaskQueue));
-  return decoder.forget();
-}
-
-already_AddRefed<MediaDataDecoder>
-EMEDecoderModule::CreateVideoDecoder(const VideoInfo& aConfig,
-                                     layers::LayersBackend aLayersBackend,
-                                     layers::ImageContainer* aImageContainer,
-                                     FlushableMediaTaskQueue* aVideoTaskQueue,
-                                     MediaDataDecoderCallback* aCallback)
-{
-  if (mCDMDecodesVideo && aConfig.mCrypto.mValid) {
-    nsRefPtr<MediaDataDecoderProxy> wrapper = CreateDecoderWrapper(aCallback, mProxy, aVideoTaskQueue);
-    wrapper->SetProxyTarget(new EMEVideoDecoder(mProxy,
-                                                aConfig,
-                                                aLayersBackend,
-                                                aImageContainer,
-                                                aVideoTaskQueue,
-                                                wrapper->Callback()));
-    return wrapper.forget();
-  }
-
-  nsRefPtr<MediaDataDecoder> decoder(
-    mPDM->CreateDecoder(aConfig,
-                        aVideoTaskQueue,
-                        aCallback,
-                        aLayersBackend,
-                        aImageContainer));
-  if (!decoder) {
-    return nullptr;
-  }
-
-  if (!aConfig.mCrypto.mValid) {
-    return decoder.forget();
-  }
-
-  nsRefPtr<MediaDataDecoder> emeDecoder(new EMEDecryptor(decoder,
-                                                         aCallback,
-                                                         mProxy,
-                                                         AbstractThread::GetCurrent()->AsTaskQueue()));
-  return emeDecoder.forget();
-}
-
-already_AddRefed<MediaDataDecoder>
-EMEDecoderModule::CreateAudioDecoder(const AudioInfo& aConfig,
-                                     FlushableMediaTaskQueue* aAudioTaskQueue,
-                                     MediaDataDecoderCallback* aCallback)
-{
-  if (mCDMDecodesAudio && aConfig.mCrypto.mValid) {
-    nsRefPtr<MediaDataDecoderProxy> wrapper = CreateDecoderWrapper(aCallback, mProxy, aAudioTaskQueue);
-    wrapper->SetProxyTarget(new EMEAudioDecoder(mProxy,
-                                                aConfig,
-                                                aAudioTaskQueue,
-                                                wrapper->Callback()));
-    return wrapper.forget();
-  }
-
-  nsRefPtr<MediaDataDecoder> decoder(
-    mPDM->CreateDecoder(aConfig, aAudioTaskQueue, aCallback));
-  if (!decoder) {
-    return nullptr;
-  }
-
-  if (!aConfig.mCrypto.mValid) {
-    return decoder.forget();
-  }
-
-  nsRefPtr<MediaDataDecoder> emeDecoder(new EMEDecryptor(decoder,
-                                                         aCallback,
-                                                         mProxy,
-                                                         AbstractThread::GetCurrent()->AsTaskQueue()));
-  return emeDecoder.forget();
-}
-
-PlatformDecoderModule::ConversionRequired
-EMEDecoderModule::DecoderNeedsConversion(const TrackInfo& aConfig) const
-{
-  if (aConfig.IsVideo()) {
-    return kNeedAVCC;
-  } else {
-    return kNeedNone;
-  }
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/eme/EMEDecoderModule.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/eme/EMEDecoderModule.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/eme/EMEDecoderModule.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/eme/EMEDecoderModule.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-/* -*- 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(EMEDecoderModule_h_)
-#define EMEDecoderModule_h_
-
-#include "PlatformDecoderModule.h"
-#include "gmp-decryption.h"
-
-namespace mozilla {
-
-class CDMProxy;
-
-class EMEDecoderModule : public PlatformDecoderModule {
-private:
-
-public:
-  EMEDecoderModule(CDMProxy* aProxy,
-                   PlatformDecoderModule* aPDM,
-                   bool aCDMDecodesAudio,
-                   bool aCDMDecodesVideo);
-
-  virtual ~EMEDecoderModule();
-
-  // Decode thread.
-  virtual already_AddRefed<MediaDataDecoder>
-  CreateVideoDecoder(const VideoInfo& aConfig,
-                    layers::LayersBackend aLayersBackend,
-                    layers::ImageContainer* aImageContainer,
-                    FlushableMediaTaskQueue* aVideoTaskQueue,
-                    MediaDataDecoderCallback* aCallback) override;
-
-  // Decode thread.
-  virtual already_AddRefed<MediaDataDecoder>
-  CreateAudioDecoder(const AudioInfo& aConfig,
-                     FlushableMediaTaskQueue* aAudioTaskQueue,
-                     MediaDataDecoderCallback* aCallback) override;
-
-  virtual ConversionRequired
-  DecoderNeedsConversion(const TrackInfo& aConfig) const override;
-
-private:
-  nsRefPtr<CDMProxy> mProxy;
-  // Will be null if CDM has decoding capability.
-  nsRefPtr<PlatformDecoderModule> mPDM;
-  // We run the PDM on its own task queue.
-  nsRefPtr<MediaTaskQueue> mTaskQueue;
-  bool mCDMDecodesAudio;
-  bool mCDMDecodesVideo;
-
-};
-
-} // namespace mozilla
-
-#endif // EMEDecoderModule_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/eme/EMEVideoDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/eme/EMEVideoDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/eme/EMEVideoDecoder.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/eme/EMEVideoDecoder.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-/* -*- 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 "EMEVideoDecoder.h"
-#include "GMPVideoEncodedFrameImpl.h"
-#include "mozilla/CDMProxy.h"
-#include "MediaData.h"
-
-namespace mozilla {
-
-void
-EMEVideoCallbackAdapter::Error(GMPErr aErr)
-{
-  if (aErr == GMPNoKeyErr) {
-    // The GMP failed to decrypt a frame due to not having a key. This can
-    // happen if a key expires or a session is closed during playback.
-    NS_WARNING("GMP failed to decrypt due to lack of key");
-    return;
-  }
-  VideoCallbackAdapter::Error(aErr);
-}
-
-void
-EMEVideoDecoder::InitTags(nsTArray<nsCString>& aTags)
-{
-  GMPVideoDecoder::InitTags(aTags);
-  aTags.AppendElement(NS_ConvertUTF16toUTF8(mProxy->KeySystem()));
-}
-
-nsCString
-EMEVideoDecoder::GetNodeId()
-{
-  return mProxy->GetNodeId();
-}
-
-GMPUniquePtr<GMPVideoEncodedFrame>
-EMEVideoDecoder::CreateFrame(MediaRawData* aSample)
-{
-  GMPUniquePtr<GMPVideoEncodedFrame> frame = GMPVideoDecoder::CreateFrame(aSample);
-  if (frame && aSample->mCrypto.mValid) {
-    static_cast<gmp::GMPVideoEncodedFrameImpl*>(frame.get())->InitCrypto(aSample->mCrypto);
-  }
-  return frame;
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/eme/EMEVideoDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/eme/EMEVideoDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/eme/EMEVideoDecoder.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/eme/EMEVideoDecoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-/* -*- 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 EMEVideoDecoder_h_
-#define EMEVideoDecoder_h_
-
-#include "GMPVideoDecoder.h"
-#include "PlatformDecoderModule.h"
-
-namespace mozilla {
-
-class CDMProxy;
-class MediaTaskQueue;
-
-class EMEVideoCallbackAdapter : public VideoCallbackAdapter {
-public:
-  EMEVideoCallbackAdapter(MediaDataDecoderCallbackProxy* aCallback,
-                          VideoInfo aVideoInfo,
-                          layers::ImageContainer* aImageContainer)
-   : VideoCallbackAdapter(aCallback, aVideoInfo, aImageContainer)
-  {}
-
-  virtual void Error(GMPErr aErr) override;
-};
-
-class EMEVideoDecoder : public GMPVideoDecoder {
-public:
-  EMEVideoDecoder(CDMProxy* aProxy,
-                  const VideoInfo& aConfig,
-                  layers::LayersBackend aLayersBackend,
-                  layers::ImageContainer* aImageContainer,
-                  MediaTaskQueue* aTaskQueue,
-                  MediaDataDecoderCallbackProxy* aCallback)
-   : GMPVideoDecoder(aConfig,
-                     aLayersBackend,
-                     aImageContainer,
-                     aTaskQueue,
-                     aCallback,
-                     new EMEVideoCallbackAdapter(aCallback,
-                                                 VideoInfo(aConfig.mDisplay.width,
-                                                           aConfig.mDisplay.height),
-                                                 aImageContainer))
-   , mProxy(aProxy)
-  {
-  }
-
-private:
-  virtual void InitTags(nsTArray<nsCString>& aTags) override;
-  virtual nsCString GetNodeId() override;
-  virtual GMPUniquePtr<GMPVideoEncodedFrame> CreateFrame(MediaRawData* aSample) override;
-
-  nsRefPtr<CDMProxy> mProxy;
-};
-
-}
-
-#endif // EMEVideoDecoder_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/eme/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/eme/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/eme/moz.build	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/eme/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +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 += [
-    'EMEAudioDecoder.h',
-    'EMEDecoderModule.h',
-    'EMEVideoDecoder.h',
-    'SamplesWaitingForKey.h',
-]
-
-UNIFIED_SOURCES += [
-    'EMEAudioDecoder.cpp',
-    'EMEDecoderModule.cpp',
-    'EMEVideoDecoder.cpp',
-    'SamplesWaitingForKey.cpp',
-]
-
-include('/ipc/chromium/chromium-config.mozbuild')
-
-FINAL_LIBRARY = 'xul'
-
-FAIL_ON_WARNINGS = True
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    DEFINES['NOMINMAX'] = True
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/eme/SamplesWaitingForKey.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/eme/SamplesWaitingForKey.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/eme/SamplesWaitingForKey.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/eme/SamplesWaitingForKey.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "SamplesWaitingForKey.h"
-#include "mozilla/CDMProxy.h"
-#include "mozilla/CDMCaps.h"
-#include "MediaData.h"
-
-namespace mozilla {
-
-SamplesWaitingForKey::SamplesWaitingForKey(MediaDataDecoder* aDecoder,
-                                           MediaTaskQueue* aTaskQueue,
-                                           CDMProxy* aProxy)
-  : mMutex("SamplesWaitingForKey")
-  , mDecoder(aDecoder)
-  , mTaskQueue(aTaskQueue)
-  , mProxy(aProxy)
-{
-}
-
-SamplesWaitingForKey::~SamplesWaitingForKey()
-{
-}
-
-bool
-SamplesWaitingForKey::WaitIfKeyNotUsable(MediaRawData* aSample)
-{
-  if (!aSample || !aSample->mCrypto.mValid || !mProxy) {
-    return false;
-  }
-  CDMCaps::AutoLock caps(mProxy->Capabilites());
-  const auto& keyid = aSample->mCrypto.mKeyId;
-  if (!caps.IsKeyUsable(keyid)) {
-    {
-      MutexAutoLock lock(mMutex);
-      mSamples.AppendElement(aSample);
-    }
-    caps.NotifyWhenKeyIdUsable(aSample->mCrypto.mKeyId, this);
-    return true;
-  }
-  return false;
-}
-
-void
-SamplesWaitingForKey::NotifyUsable(const CencKeyId& aKeyId)
-{
-  MutexAutoLock lock(mMutex);
-  size_t i = 0;
-  while (i < mSamples.Length()) {
-    if (aKeyId == mSamples[i]->mCrypto.mKeyId) {
-      RefPtr<nsIRunnable> task;
-      task = NS_NewRunnableMethodWithArg<nsRefPtr<MediaRawData>>(mDecoder,
-                                                     &MediaDataDecoder::Input,
-                                                     nsRefPtr<MediaRawData>(mSamples[i]));
-      mSamples.RemoveElementAt(i);
-      mTaskQueue->Dispatch(task.forget());
-    } else {
-      i++;
-    }
-  }
-}
-
-void
-SamplesWaitingForKey::Flush()
-{
-  MutexAutoLock lock(mMutex);
-  mSamples.Clear();
-}
-
-void
-SamplesWaitingForKey::BreakCycles()
-{
-  MutexAutoLock lock(mMutex);
-  mDecoder = nullptr;
-  mTaskQueue = nullptr;
-  mProxy = nullptr;
-  mSamples.Clear();
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/eme/SamplesWaitingForKey.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/eme/SamplesWaitingForKey.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/eme/SamplesWaitingForKey.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/eme/SamplesWaitingForKey.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-/* -*- 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 SamplesWaitingForKey_h_
-#define SamplesWaitingForKey_h_
-
-#include "MediaTaskQueue.h"
-#include "PlatformDecoderModule.h"
-
-namespace mozilla {
-
-typedef nsTArray<uint8_t> CencKeyId;
-
-class CDMProxy;
-
-// Encapsulates the task of waiting for the CDMProxy to have the necessary
-// keys to decypt a given sample.
-class SamplesWaitingForKey {
-public:
-
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(SamplesWaitingForKey)
-
-  explicit SamplesWaitingForKey(MediaDataDecoder* aDecoder,
-                                MediaTaskQueue* aTaskQueue,
-                                CDMProxy* aProxy);
-
-  // Returns true if we need to wait for a key to become usable.
-  // Will callback MediaDataDecoder::Input(aSample) on mDecoder once the
-  // sample is ready to be decrypted. The order of input samples is
-  // preserved.
-  bool WaitIfKeyNotUsable(MediaRawData* aSample);
-
-  void NotifyUsable(const CencKeyId& aKeyId);
-
-  void Flush();
-
-  void BreakCycles();
-
-protected:
-  ~SamplesWaitingForKey();
-
-private:
-  Mutex mMutex;
-  nsRefPtr<MediaDataDecoder> mDecoder;
-  nsRefPtr<MediaTaskQueue> mTaskQueue;
-  nsRefPtr<CDMProxy> mProxy;
-  nsTArray<nsRefPtr<MediaRawData>> mSamples;
-};
-
-} // namespace mozilla
-
-#endif //  SamplesWaitingForKey_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegAudioDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegAudioDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegAudioDecoder.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegAudioDecoder.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,184 +0,0 @@
-/* -*- 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 "MediaTaskQueue.h"
-#include "FFmpegRuntimeLinker.h"
-
-#include "FFmpegAudioDecoder.h"
-
-#define MAX_CHANNELS 16
-
-namespace mozilla
-{
-
-FFmpegAudioDecoder<LIBAV_VER>::FFmpegAudioDecoder(
-  FlushableMediaTaskQueue* aTaskQueue, MediaDataDecoderCallback* aCallback,
-  const AudioInfo& aConfig)
-  : FFmpegDataDecoder(aTaskQueue, GetCodecId(aConfig.mMimeType))
-  , mCallback(aCallback)
-{
-  MOZ_COUNT_CTOR(FFmpegAudioDecoder);
-  // Use a new MediaByteBuffer as the object will be modified during initialization.
-  mExtraData = new MediaByteBuffer;
-  mExtraData->AppendElements(*aConfig.mCodecSpecificConfig);
-}
-
-nsresult
-FFmpegAudioDecoder<LIBAV_VER>::Init()
-{
-  nsresult rv = FFmpegDataDecoder::Init();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-static AudioDataValue*
-CopyAndPackAudio(AVFrame* aFrame, uint32_t aNumChannels, uint32_t aNumAFrames)
-{
-  MOZ_ASSERT(aNumChannels <= MAX_CHANNELS);
-
-  nsAutoArrayPtr<AudioDataValue> audio(
-    new AudioDataValue[aNumChannels * aNumAFrames]);
-
-  if (aFrame->format == AV_SAMPLE_FMT_FLT) {
-    // Audio data already packed. No need to do anything other than copy it
-    // into a buffer we own.
-    memcpy(audio, aFrame->data[0],
-           aNumChannels * aNumAFrames * sizeof(AudioDataValue));
-  } else if (aFrame->format == AV_SAMPLE_FMT_FLTP) {
-    // Planar audio data. Pack it into something we can understand.
-    AudioDataValue* tmp = audio;
-    AudioDataValue** data = reinterpret_cast<AudioDataValue**>(aFrame->data);
-    for (uint32_t frame = 0; frame < aNumAFrames; frame++) {
-      for (uint32_t channel = 0; channel < aNumChannels; channel++) {
-        *tmp++ = data[channel][frame];
-      }
-    }
-  } else if (aFrame->format == AV_SAMPLE_FMT_S16) {
-    // Audio data already packed. Need to convert from S16 to 32 bits Float
-    AudioDataValue* tmp = audio;
-    int16_t* data = reinterpret_cast<int16_t**>(aFrame->data)[0];
-    for (uint32_t frame = 0; frame < aNumAFrames; frame++) {
-      for (uint32_t channel = 0; channel < aNumChannels; channel++) {
-        *tmp++ = AudioSampleToFloat(*data++);
-      }
-    }
-  } else if (aFrame->format == AV_SAMPLE_FMT_S16P) {
-    // Planar audio data. Convert it from S16 to 32 bits float
-    // and pack it into something we can understand.
-    AudioDataValue* tmp = audio;
-    int16_t** data = reinterpret_cast<int16_t**>(aFrame->data);
-    for (uint32_t frame = 0; frame < aNumAFrames; frame++) {
-      for (uint32_t channel = 0; channel < aNumChannels; channel++) {
-        *tmp++ = AudioSampleToFloat(data[channel][frame]);
-      }
-    }
-  }
-
-  return audio.forget();
-}
-
-void
-FFmpegAudioDecoder<LIBAV_VER>::DecodePacket(MediaRawData* aSample)
-{
-  AVPacket packet;
-  av_init_packet(&packet);
-
-  packet.data = const_cast<uint8_t*>(aSample->mData);
-  packet.size = aSample->mSize;
-
-  if (!PrepareFrame()) {
-    NS_WARNING("FFmpeg audio decoder failed to allocate frame.");
-    mCallback->Error();
-    return;
-  }
-
-  int64_t samplePosition = aSample->mOffset;
-  Microseconds pts = aSample->mTime;
-
-  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;
-    }
-
-    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;
-      }
-
-      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();
-  }
-}
-
-nsresult
-FFmpegAudioDecoder<LIBAV_VER>::Input(MediaRawData* aSample)
-{
-  mTaskQueue->Dispatch(NS_NewRunnableMethodWithArg<nsRefPtr<MediaRawData> >(
-    this, &FFmpegAudioDecoder::DecodePacket, nsRefPtr<MediaRawData>(aSample)));
-
-  return NS_OK;
-}
-
-nsresult
-FFmpegAudioDecoder<LIBAV_VER>::Drain()
-{
-  mTaskQueue->AwaitIdle();
-  mCallback->DrainComplete();
-  return Flush();
-}
-
-AVCodecID
-FFmpegAudioDecoder<LIBAV_VER>::GetCodecId(const nsACString& aMimeType)
-{
-  if (aMimeType.EqualsLiteral("audio/mpeg")) {
-    return AV_CODEC_ID_MP3;
-  }
-
-  if (aMimeType.EqualsLiteral("audio/mp4a-latm")) {
-    return AV_CODEC_ID_AAC;
-  }
-
-  return AV_CODEC_ID_NONE;
-}
-
-FFmpegAudioDecoder<LIBAV_VER>::~FFmpegAudioDecoder()
-{
-  MOZ_COUNT_DTOR(FFmpegAudioDecoder);
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegAudioDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegAudioDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegAudioDecoder.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegAudioDecoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-/* -*- 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 __FFmpegAACDecoder_h__
-#define __FFmpegAACDecoder_h__
-
-#include "FFmpegDataDecoder.h"
-
-namespace mozilla
-{
-
-template <int V> class FFmpegAudioDecoder
-{
-};
-
-template <>
-class FFmpegAudioDecoder<LIBAV_VER> : public FFmpegDataDecoder<LIBAV_VER>
-{
-public:
-  FFmpegAudioDecoder(FlushableMediaTaskQueue* aTaskQueue,
-                     MediaDataDecoderCallback* aCallback,
-                     const AudioInfo& aConfig);
-  virtual ~FFmpegAudioDecoder();
-
-  virtual nsresult Init() override;
-  virtual nsresult Input(MediaRawData* aSample) override;
-  virtual nsresult Drain() override;
-  static AVCodecID GetCodecId(const nsACString& aMimeType);
-
-private:
-  void DecodePacket(MediaRawData* aSample);
-
-  MediaDataDecoderCallback* mCallback;
-};
-
-} // namespace mozilla
-
-#endif // __FFmpegAACDecoder_h__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegDataDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegDataDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegDataDecoder.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegDataDecoder.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,180 +0,0 @@
-/* -*- 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 <string.h>
-#include <unistd.h>
-
-#include "MediaTaskQueue.h"
-#include "FFmpegLibs.h"
-#include "FFmpegLog.h"
-#include "FFmpegDataDecoder.h"
-#include "prsystem.h"
-
-namespace mozilla
-{
-
-bool FFmpegDataDecoder<LIBAV_VER>::sFFmpegInitDone = false;
-StaticMutex FFmpegDataDecoder<LIBAV_VER>::sMonitor;
-
-FFmpegDataDecoder<LIBAV_VER>::FFmpegDataDecoder(FlushableMediaTaskQueue* aTaskQueue,
-                                                AVCodecID aCodecID)
-  : mTaskQueue(aTaskQueue)
-  , mCodecContext(nullptr)
-  , mFrame(NULL)
-  , mExtraData(nullptr)
-  , mCodecID(aCodecID)
-{
-  MOZ_COUNT_CTOR(FFmpegDataDecoder);
-}
-
-FFmpegDataDecoder<LIBAV_VER>::~FFmpegDataDecoder()
-{
-  MOZ_COUNT_DTOR(FFmpegDataDecoder);
-}
-
-/**
- * FFmpeg calls back to this function with a list of pixel formats it supports.
- * We choose a pixel format that we support and return it.
- * For now, we just look for YUV420P as it is the only non-HW accelerated format
- * supported by FFmpeg's H264 decoder.
- */
-static PixelFormat
-ChoosePixelFormat(AVCodecContext* aCodecContext, const PixelFormat* aFormats)
-{
-  FFMPEG_LOG("Choosing FFmpeg pixel format for video decoding.");
-  for (; *aFormats > -1; aFormats++) {
-    if (*aFormats == PIX_FMT_YUV420P) {
-      FFMPEG_LOG("Requesting pixel format YUV420P.");
-      return PIX_FMT_YUV420P;
-    }
-  }
-
-  NS_WARNING("FFmpeg does not share any supported pixel formats.");
-  return PIX_FMT_NONE;
-}
-
-nsresult
-FFmpegDataDecoder<LIBAV_VER>::Init()
-{
-  StaticMutexAutoLock mon(sMonitor);
-
-  FFMPEG_LOG("Initialising FFmpeg decoder.");
-
-  if (!sFFmpegInitDone) {
-    av_register_all();
-#ifdef DEBUG
-    av_log_set_level(AV_LOG_DEBUG);
-#endif
-    sFFmpegInitDone = true;
-  }
-
-  AVCodec* codec = avcodec_find_decoder(mCodecID);
-  if (!codec) {
-    NS_WARNING("Couldn't find ffmpeg decoder");
-    return NS_ERROR_FAILURE;
-  }
-
-  if (!(mCodecContext = avcodec_alloc_context3(codec))) {
-    NS_WARNING("Couldn't init ffmpeg context");
-    return NS_ERROR_FAILURE;
-  }
-
-  mCodecContext->opaque = this;
-
-  // FFmpeg takes this as a suggestion for what format to use for audio samples.
-  mCodecContext->request_sample_fmt = AV_SAMPLE_FMT_FLT;
-
-  // FFmpeg will call back to this to negotiate a video pixel format.
-  mCodecContext->get_format = ChoosePixelFormat;
-
-  mCodecContext->thread_count = PR_GetNumberOfProcessors();
-  mCodecContext->thread_type = FF_THREAD_SLICE | FF_THREAD_FRAME;
-  mCodecContext->thread_safe_callbacks = false;
-
-  if (mExtraData) {
-    mCodecContext->extradata_size = mExtraData->Length();
-    // FFmpeg may use SIMD instructions to access the data which reads the
-    // data in 32 bytes block. Must ensure we have enough data to read.
-    mExtraData->AppendElements(FF_INPUT_BUFFER_PADDING_SIZE);
-    mCodecContext->extradata = mExtraData->Elements();
-  } else {
-    mCodecContext->extradata_size = 0;
-  }
-
-  if (codec->capabilities & CODEC_CAP_DR1) {
-    mCodecContext->flags |= CODEC_FLAG_EMU_EDGE;
-  }
-
-  if (avcodec_open2(mCodecContext, codec, nullptr) < 0) {
-    NS_WARNING("Couldn't initialise ffmpeg decoder");
-    return NS_ERROR_FAILURE;
-  }
-
-  if (mCodecContext->codec_type == AVMEDIA_TYPE_AUDIO &&
-      mCodecContext->sample_fmt != AV_SAMPLE_FMT_FLT &&
-      mCodecContext->sample_fmt != AV_SAMPLE_FMT_FLTP &&
-      mCodecContext->sample_fmt != AV_SAMPLE_FMT_S16 &&
-      mCodecContext->sample_fmt != AV_SAMPLE_FMT_S16P) {
-    NS_WARNING("FFmpeg audio decoder outputs unsupported audio format.");
-    return NS_ERROR_FAILURE;
-  }
-
-  FFMPEG_LOG("FFmpeg init successful.");
-  return NS_OK;
-}
-
-nsresult
-FFmpegDataDecoder<LIBAV_VER>::Flush()
-{
-  mTaskQueue->Flush();
-  avcodec_flush_buffers(mCodecContext);
-  return NS_OK;
-}
-
-nsresult
-FFmpegDataDecoder<LIBAV_VER>::Shutdown()
-{
-  StaticMutexAutoLock mon(sMonitor);
-
-  if (sFFmpegInitDone) {
-    avcodec_close(mCodecContext);
-    av_freep(&mCodecContext);
-#if LIBAVCODEC_VERSION_MAJOR >= 55
-    av_frame_free(&mFrame);
-#elif LIBAVCODEC_VERSION_MAJOR == 54
-    avcodec_free_frame(&mFrame);
-#else
-    delete mFrame;
-    mFrame = nullptr;
-#endif
-  }
-  return NS_OK;
-}
-
-AVFrame*
-FFmpegDataDecoder<LIBAV_VER>::PrepareFrame()
-{
-#if LIBAVCODEC_VERSION_MAJOR >= 55
-  if (mFrame) {
-    av_frame_unref(mFrame);
-  } else {
-    mFrame = av_frame_alloc();
-  }
-#elif LIBAVCODEC_VERSION_MAJOR == 54
-  if (mFrame) {
-    avcodec_get_frame_defaults(mFrame);
-  } else {
-    mFrame = avcodec_alloc_frame();
-  }
-#else
-  delete mFrame;
-  mFrame = new AVFrame;
-  avcodec_get_frame_defaults(mFrame);
-#endif
-  return mFrame;
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegDataDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegDataDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegDataDecoder.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegDataDecoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-/* -*- 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 __FFmpegDataDecoder_h__
-#define __FFmpegDataDecoder_h__
-
-#include "PlatformDecoderModule.h"
-#include "FFmpegLibs.h"
-#include "mozilla/StaticMutex.h"
-#include "mp4_demuxer/mp4_demuxer.h"
-
-namespace mozilla
-{
-
-template <int V>
-class FFmpegDataDecoder : public MediaDataDecoder
-{
-};
-
-template <>
-class FFmpegDataDecoder<LIBAV_VER> : public MediaDataDecoder
-{
-public:
-  FFmpegDataDecoder(FlushableMediaTaskQueue* aTaskQueue, AVCodecID aCodecID);
-  virtual ~FFmpegDataDecoder();
-
-  static bool Link();
-
-  virtual nsresult Init() override;
-  virtual nsresult Input(MediaRawData* aSample) override = 0;
-  virtual nsresult Flush() override;
-  virtual nsresult Drain() override = 0;
-  virtual nsresult Shutdown() override;
-
-protected:
-  AVFrame*        PrepareFrame();
-
-  FlushableMediaTaskQueue* mTaskQueue;
-  AVCodecContext* mCodecContext;
-  AVFrame*        mFrame;
-  nsRefPtr<MediaByteBuffer> mExtraData;
-
-private:
-  static bool sFFmpegInitDone;
-  static StaticMutex sMonitor;
-
-  AVCodecID mCodecID;
-};
-
-} // namespace mozilla
-
-#endif // __FFmpegDataDecoder_h__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegDecoderModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegDecoderModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegDecoderModule.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegDecoderModule.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-/* -*- 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 "FFmpegDecoderModule.h"
-
-namespace mozilla {
-
-template class FFmpegDecoderModule<LIBAV_VER>;
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegDecoderModule.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegDecoderModule.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegDecoderModule.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegDecoderModule.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +0,0 @@
-/* -*- 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 __FFmpegDecoderModule_h__
-#define __FFmpegDecoderModule_h__
-
-#include "PlatformDecoderModule.h"
-#include "FFmpegAudioDecoder.h"
-#include "FFmpegH264Decoder.h"
-
-namespace mozilla
-{
-
-template <int V>
-class FFmpegDecoderModule : public PlatformDecoderModule
-{
-public:
-  static already_AddRefed<PlatformDecoderModule>
-  Create()
-  {
-    nsRefPtr<PlatformDecoderModule> pdm = new FFmpegDecoderModule();
-    return pdm.forget();
-  }
-
-  FFmpegDecoderModule() {}
-  virtual ~FFmpegDecoderModule() {}
-
-  virtual already_AddRefed<MediaDataDecoder>
-  CreateVideoDecoder(const VideoInfo& aConfig,
-                     layers::LayersBackend aLayersBackend,
-                     layers::ImageContainer* aImageContainer,
-                     FlushableMediaTaskQueue* aVideoTaskQueue,
-                     MediaDataDecoderCallback* aCallback) override
-  {
-    nsRefPtr<MediaDataDecoder> decoder =
-      new FFmpegH264Decoder<V>(aVideoTaskQueue, aCallback, aConfig,
-                               aImageContainer);
-    return decoder.forget();
-  }
-
-  virtual already_AddRefed<MediaDataDecoder>
-  CreateAudioDecoder(const AudioInfo& aConfig,
-                     FlushableMediaTaskQueue* aAudioTaskQueue,
-                     MediaDataDecoderCallback* aCallback) override
-  {
-    nsRefPtr<MediaDataDecoder> decoder =
-      new FFmpegAudioDecoder<V>(aAudioTaskQueue, aCallback, aConfig);
-    return decoder.forget();
-  }
-
-  virtual bool SupportsMimeType(const nsACString& aMimeType) override
-  {
-    return FFmpegAudioDecoder<V>::GetCodecId(aMimeType) != AV_CODEC_ID_NONE ||
-      FFmpegH264Decoder<V>::GetCodecId(aMimeType) != AV_CODEC_ID_NONE;
-  }
-
-  virtual ConversionRequired
-  DecoderNeedsConversion(const TrackInfo& aConfig) const override
-  {
-    if (aConfig.IsVideo() &&
-        (aConfig.mMimeType.EqualsLiteral("video/avc") ||
-         aConfig.mMimeType.EqualsLiteral("video/mp4"))) {
-      return PlatformDecoderModule::kNeedAVCC;
-    } else {
-      return kNeedNone;
-    }
-  }
-
-};
-
-} // namespace mozilla
-
-#endif // __FFmpegDecoderModule_h__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegFunctionList.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegFunctionList.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegFunctionList.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegFunctionList.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* libavformat */
-AV_FUNC(av_register_all, 0)
-
-/* libavcodec */
-AV_FUNC(avcodec_align_dimensions2, 0)
-AV_FUNC(avcodec_get_frame_defaults, 0)
-AV_FUNC(avcodec_close, 0)
-AV_FUNC(avcodec_decode_audio4, 0)
-AV_FUNC(avcodec_decode_video2, 0)
-AV_FUNC(avcodec_default_get_buffer, 0)
-AV_FUNC(avcodec_default_release_buffer, 0)
-AV_FUNC(avcodec_find_decoder, 0)
-AV_FUNC(avcodec_flush_buffers, 0)
-AV_FUNC(avcodec_alloc_context3, 0)
-AV_FUNC(avcodec_get_edge_width, 0)
-AV_FUNC(avcodec_open2, 0)
-AV_FUNC(av_init_packet, 0)
-AV_FUNC(av_dict_get, 0)
-
-/* libavutil */
-AV_FUNC(av_image_fill_linesizes, 0)
-AV_FUNC(av_image_fill_pointers, 0)
-AV_FUNC(av_log_set_level, 0)
-AV_FUNC(av_malloc, 0)
-AV_FUNC(av_freep, 0)
-
-#if defined(LIBAVCODEC_VERSION_MAJOR) || defined(LIBAVCODEC_ALLVERSION)
-#if LIBAVCODEC_VERSION_MAJOR == 54 || defined(LIBAVCODEC_ALLVERSION)
-/* libavutil v54 only */
-AV_FUNC(avcodec_alloc_frame, 54)
-AV_FUNC(avcodec_free_frame, 54)
-#endif
-#if LIBAVCODEC_VERSION_MAJOR >= 55 || defined(LIBAVCODEC_ALLVERSION)
-/* libavutil v55 only */
-AV_FUNC(av_frame_alloc, 55)
-AV_FUNC(av_frame_free, 55)
-AV_FUNC(av_frame_unref, 55)
-#endif
-#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,298 +0,0 @@
-/* -*- 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 "MediaTaskQueue.h"
-#include "nsThreadUtils.h"
-#include "nsAutoPtr.h"
-#include "ImageContainer.h"
-
-#include "MediaInfo.h"
-
-#include "FFmpegH264Decoder.h"
-
-#define GECKO_FRAME_TYPE 0x00093CC0
-
-typedef mozilla::layers::Image Image;
-typedef mozilla::layers::PlanarYCbCrImage PlanarYCbCrImage;
-
-namespace mozilla
-{
-
-FFmpegH264Decoder<LIBAV_VER>::FFmpegH264Decoder(
-  FlushableMediaTaskQueue* aTaskQueue, MediaDataDecoderCallback* aCallback,
-  const VideoInfo& aConfig,
-  ImageContainer* aImageContainer)
-  : FFmpegDataDecoder(aTaskQueue, GetCodecId(aConfig.mMimeType))
-  , mCallback(aCallback)
-  , mImageContainer(aImageContainer)
-  , mDisplayWidth(aConfig.mDisplay.width)
-  , mDisplayHeight(aConfig.mDisplay.height)
-{
-  MOZ_COUNT_CTOR(FFmpegH264Decoder);
-  // Use a new MediaByteBuffer as the object will be modified during initialization.
-  mExtraData = new MediaByteBuffer;
-  mExtraData->AppendElements(*aConfig.mExtraData);
-}
-
-nsresult
-FFmpegH264Decoder<LIBAV_VER>::Init()
-{
-  nsresult rv = FFmpegDataDecoder::Init();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  mCodecContext->get_buffer = AllocateBufferCb;
-  mCodecContext->release_buffer = ReleaseBufferCb;
-
-  return NS_OK;
-}
-
-FFmpegH264Decoder<LIBAV_VER>::DecodeResult
-FFmpegH264Decoder<LIBAV_VER>::DoDecodeFrame(MediaRawData* aSample)
-{
-  AVPacket packet;
-  av_init_packet(&packet);
-
-  packet.data = const_cast<uint8_t*>(aSample->mData);
-  packet.size = aSample->mSize;
-  packet.dts = aSample->mTimecode;
-  packet.pts = aSample->mTime;
-  packet.flags = aSample->mKeyframe ? AV_PKT_FLAG_KEY : 0;
-  packet.pos = aSample->mOffset;
-
-  if (!PrepareFrame()) {
-    NS_WARNING("FFmpeg h264 decoder failed to allocate frame.");
-    mCallback->Error();
-    return DecodeResult::DECODE_ERROR;
-  }
-
-  int decoded;
-  int bytesConsumed =
-    avcodec_decode_video2(mCodecContext, mFrame, &decoded, &packet);
-
-  if (bytesConsumed < 0) {
-    NS_WARNING("FFmpeg video decoder error.");
-    mCallback->Error();
-    return DecodeResult::DECODE_ERROR;
-  }
-
-  // If we've decoded a frame then we need to output it
-  if (decoded) {
-    VideoInfo info;
-    info.mDisplay = nsIntSize(mDisplayWidth, mDisplayHeight);
-
-    VideoData::YCbCrBuffer b;
-    b.mPlanes[0].mData = mFrame->data[0];
-    b.mPlanes[0].mStride = mFrame->linesize[0];
-    b.mPlanes[0].mHeight = mFrame->height;
-    b.mPlanes[0].mWidth = mFrame->width;
-    b.mPlanes[0].mOffset = b.mPlanes[0].mSkip = 0;
-
-    b.mPlanes[1].mData = mFrame->data[1];
-    b.mPlanes[1].mStride = mFrame->linesize[1];
-    b.mPlanes[1].mHeight = (mFrame->height + 1) >> 1;
-    b.mPlanes[1].mWidth = (mFrame->width + 1) >> 1;
-    b.mPlanes[1].mOffset = b.mPlanes[1].mSkip = 0;
-
-    b.mPlanes[2].mData = mFrame->data[2];
-    b.mPlanes[2].mStride = mFrame->linesize[2];
-    b.mPlanes[2].mHeight = (mFrame->height + 1) >> 1;
-    b.mPlanes[2].mWidth = (mFrame->width + 1) >> 1;
-    b.mPlanes[2].mOffset = b.mPlanes[2].mSkip = 0;
-
-    nsRefPtr<VideoData> v = VideoData::Create(info,
-                                              mImageContainer,
-                                              aSample->mOffset,
-                                              mFrame->pkt_pts,
-                                              aSample->mDuration,
-                                              b,
-                                              aSample->mKeyframe,
-                                              -1,
-                                              gfx::IntRect(0, 0, mCodecContext->width, mCodecContext->height));
-    if (!v) {
-      NS_WARNING("image allocation error.");
-      mCallback->Error();
-      return DecodeResult::DECODE_ERROR;
-    }
-    mCallback->Output(v);
-    return DecodeResult::DECODE_FRAME;
-  }
-  return DecodeResult::DECODE_NO_FRAME;
-}
-
-void
-FFmpegH264Decoder<LIBAV_VER>::DecodeFrame(MediaRawData* aSample)
-{
-  if (DoDecodeFrame(aSample) != DecodeResult::DECODE_ERROR &&
-      mTaskQueue->IsEmpty()) {
-    mCallback->InputExhausted();
-  }
-}
-
-/* static */ int
-FFmpegH264Decoder<LIBAV_VER>::AllocateBufferCb(AVCodecContext* aCodecContext,
-                                               AVFrame* aFrame)
-{
-  MOZ_ASSERT(aCodecContext->codec_type == AVMEDIA_TYPE_VIDEO);
-
-  FFmpegH264Decoder* self =
-    static_cast<FFmpegH264Decoder*>(aCodecContext->opaque);
-
-  switch (aCodecContext->pix_fmt) {
-  case PIX_FMT_YUV420P:
-    return self->AllocateYUV420PVideoBuffer(aCodecContext, aFrame);
-  default:
-    return avcodec_default_get_buffer(aCodecContext, aFrame);
-  }
-}
-
-/* static */ void
-FFmpegH264Decoder<LIBAV_VER>::ReleaseBufferCb(AVCodecContext* aCodecContext,
-                                              AVFrame* aFrame)
-{
-  switch (aCodecContext->pix_fmt) {
-    case PIX_FMT_YUV420P: {
-      Image* image = static_cast<Image*>(aFrame->opaque);
-      if (image) {
-        image->Release();
-      }
-      for (uint32_t i = 0; i < AV_NUM_DATA_POINTERS; i++) {
-        aFrame->data[i] = nullptr;
-      }
-      break;
-    }
-    default:
-      avcodec_default_release_buffer(aCodecContext, aFrame);
-      break;
-  }
-}
-
-int
-FFmpegH264Decoder<LIBAV_VER>::AllocateYUV420PVideoBuffer(
-  AVCodecContext* aCodecContext, AVFrame* aFrame)
-{
-  bool needAlign = aCodecContext->codec->capabilities & CODEC_CAP_DR1;
-  int edgeWidth =  needAlign ? avcodec_get_edge_width() : 0;
-  int decodeWidth = aCodecContext->width + edgeWidth * 2;
-  // Make sure the decodeWidth is a multiple of 32, so a UV plane stride will be
-  // a multiple of 16. FFmpeg uses SSE2 accelerated code to copy a frame line by
-  // line.
-  decodeWidth = (decodeWidth + 31) & ~31;
-  int decodeHeight = aCodecContext->height + edgeWidth * 2;
-
-  if (needAlign) {
-    // Align width and height to account for CODEC_FLAG_EMU_EDGE.
-    int stride_align[AV_NUM_DATA_POINTERS];
-    avcodec_align_dimensions2(aCodecContext, &decodeWidth, &decodeHeight,
-                              stride_align);
-  }
-
-  // Get strides for each plane.
-  av_image_fill_linesizes(aFrame->linesize, aCodecContext->pix_fmt,
-                          decodeWidth);
-
-  // Let FFmpeg set up its YUV plane pointers and tell us how much memory we
-  // need.
-  // Note that we're passing |nullptr| here as the base address as we haven't
-  // allocated our image yet. We will adjust |aFrame->data| below.
-  size_t allocSize =
-    av_image_fill_pointers(aFrame->data, aCodecContext->pix_fmt, decodeHeight,
-                           nullptr /* base address */, aFrame->linesize);
-
-  nsRefPtr<Image> image =
-    mImageContainer->CreateImage(ImageFormat::PLANAR_YCBCR);
-  PlanarYCbCrImage* ycbcr = static_cast<PlanarYCbCrImage*>(image.get());
-  uint8_t* buffer = ycbcr->AllocateAndGetNewBuffer(allocSize + 64);
-  // FFmpeg requires a 16/32 bytes-aligned buffer, align it on 64 to be safe
-  buffer = reinterpret_cast<uint8_t*>((reinterpret_cast<uintptr_t>(buffer) + 63) & ~63);
-
-  if (!buffer) {
-    NS_WARNING("Failed to allocate buffer for FFmpeg video decoding");
-    return -1;
-  }
-
-  // Now that we've allocated our image, we can add its address to the offsets
-  // set by |av_image_fill_pointers| above. We also have to add |edgeWidth|
-  // pixels of padding here.
-  for (uint32_t i = 0; i < AV_NUM_DATA_POINTERS; i++) {
-    // The C planes are half the resolution of the Y plane, so we need to halve
-    // the edge width here.
-    uint32_t planeEdgeWidth = edgeWidth / (i ? 2 : 1);
-
-    // Add buffer offset, plus a horizontal bar |edgeWidth| pixels high at the
-    // top of the frame, plus |edgeWidth| pixels from the left of the frame.
-    aFrame->data[i] += reinterpret_cast<ptrdiff_t>(
-      buffer + planeEdgeWidth * aFrame->linesize[i] + planeEdgeWidth);
-  }
-
-  // Unused, but needs to be non-zero to keep ffmpeg happy.
-  aFrame->type = GECKO_FRAME_TYPE;
-
-  aFrame->extended_data = aFrame->data;
-  aFrame->width = aCodecContext->width;
-  aFrame->height = aCodecContext->height;
-
-  aFrame->opaque = static_cast<void*>(image.forget().take());
-
-  return 0;
-}
-
-nsresult
-FFmpegH264Decoder<LIBAV_VER>::Input(MediaRawData* aSample)
-{
-  mTaskQueue->Dispatch(
-    NS_NewRunnableMethodWithArg<nsRefPtr<MediaRawData>>(
-      this, &FFmpegH264Decoder<LIBAV_VER>::DecodeFrame,
-      nsRefPtr<MediaRawData>(aSample)));
-
-  return NS_OK;
-}
-
-void
-FFmpegH264Decoder<LIBAV_VER>::DoDrain()
-{
-  nsRefPtr<MediaRawData> empty(new MediaRawData());
-  while (DoDecodeFrame(empty) == DecodeResult::DECODE_FRAME) {
-  }
-  mCallback->DrainComplete();
-}
-
-nsresult
-FFmpegH264Decoder<LIBAV_VER>::Drain()
-{
-  mTaskQueue->Dispatch(
-    NS_NewRunnableMethod(this, &FFmpegH264Decoder<LIBAV_VER>::DoDrain));
-
-  return NS_OK;
-}
-
-nsresult
-FFmpegH264Decoder<LIBAV_VER>::Flush()
-{
-  nsresult rv = FFmpegDataDecoder::Flush();
-  // Even if the above fails we may as well clear our frame queue.
-  return rv;
-}
-
-FFmpegH264Decoder<LIBAV_VER>::~FFmpegH264Decoder()
-{
-  MOZ_COUNT_DTOR(FFmpegH264Decoder);
-}
-
-AVCodecID
-FFmpegH264Decoder<LIBAV_VER>::GetCodecId(const nsACString& aMimeType)
-{
-  if (aMimeType.EqualsLiteral("video/avc") || aMimeType.EqualsLiteral("video/mp4")) {
-    return AV_CODEC_ID_H264;
-  }
-
-  if (aMimeType.EqualsLiteral("video/x-vnd.on2.vp6")) {
-    return AV_CODEC_ID_VP6F;
-  }
-
-  return AV_CODEC_ID_NONE;
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegH264Decoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegH264Decoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegH264Decoder.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegH264Decoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-/* -*- 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 __FFmpegH264Decoder_h__
-#define __FFmpegH264Decoder_h__
-
-#include "FFmpegDataDecoder.h"
-
-namespace mozilla
-{
-
-template <int V>
-class FFmpegH264Decoder : public FFmpegDataDecoder<V>
-{
-};
-
-template <>
-class FFmpegH264Decoder<LIBAV_VER> : public FFmpegDataDecoder<LIBAV_VER>
-{
-  typedef mozilla::layers::Image Image;
-  typedef mozilla::layers::ImageContainer ImageContainer;
-
-  enum DecodeResult {
-    DECODE_FRAME,
-    DECODE_NO_FRAME,
-    DECODE_ERROR
-  };
-
-public:
-  FFmpegH264Decoder(FlushableMediaTaskQueue* aTaskQueue,
-                    MediaDataDecoderCallback* aCallback,
-                    const VideoInfo& aConfig,
-                    ImageContainer* aImageContainer);
-  virtual ~FFmpegH264Decoder();
-
-  virtual nsresult Init() override;
-  virtual nsresult Input(MediaRawData* aSample) override;
-  virtual nsresult Drain() override;
-  virtual nsresult Flush() override;
-  static AVCodecID GetCodecId(const nsACString& aMimeType);
-
-private:
-  void DecodeFrame(MediaRawData* aSample);
-  DecodeResult DoDecodeFrame(MediaRawData* aSample);
-  void DoDrain();
-  void OutputDelayedFrames();
-
-  /**
-   * This method allocates a buffer for FFmpeg's decoder, wrapped in an Image.
-   * Currently it only supports Planar YUV420, which appears to be the only
-   * non-hardware accelerated image format that FFmpeg's H264 decoder is
-   * capable of outputting.
-   */
-  int AllocateYUV420PVideoBuffer(AVCodecContext* aCodecContext,
-                                 AVFrame* aFrame);
-
-  static int AllocateBufferCb(AVCodecContext* aCodecContext, AVFrame* aFrame);
-  static void ReleaseBufferCb(AVCodecContext* aCodecContext, AVFrame* aFrame);
-
-  MediaDataDecoderCallback* mCallback;
-  nsRefPtr<ImageContainer> mImageContainer;
-  uint32_t mDisplayWidth;
-  uint32_t mDisplayHeight;
-};
-
-} // namespace mozilla
-
-#endif // __FFmpegH264Decoder_h__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegLibs.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegLibs.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegLibs.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegLibs.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-/* -*- 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 __FFmpegLibs_h__
-#define __FFmpegLibs_h__
-
-extern "C" {
-#pragma GCC visibility push(default)
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libavutil/imgutils.h>
-#pragma GCC visibility pop
-}
-
-#if LIBAVCODEC_VERSION_MAJOR < 55
-#define AV_CODEC_ID_VP6F CODEC_ID_VP6F
-#define AV_CODEC_ID_H264 CODEC_ID_H264
-#define AV_CODEC_ID_AAC CODEC_ID_AAC
-#define AV_CODEC_ID_MP3 CODEC_ID_MP3
-#define AV_CODEC_ID_NONE CODEC_ID_NONE
-typedef CodecID AVCodecID;
-#endif
-
-enum { LIBAV_VER = LIBAVFORMAT_VERSION_MAJOR };
-
-namespace mozilla {
-
-#define AV_FUNC(func, ver) extern typeof(func)* func;
-#include "FFmpegFunctionList.h"
-#undef AV_FUNC
-
-}
-
-#endif // __FFmpegLibs_h__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegLog.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegLog.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegLog.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegLog.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-/* -*- 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 "prlog.h"
-
-PRLogModuleInfo* GetFFmpegDecoderLog()
-{
-  static PRLogModuleInfo* sFFmpegDecoderLog = nullptr;
-  if (!sFFmpegDecoderLog) {
-    sFFmpegDecoderLog = PR_NewLogModule("FFmpegDecoderModule");
-  }
-  return sFFmpegDecoderLog;
-}
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegLog.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegLog.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegLog.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegLog.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-/* -*- 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 __FFmpegLog_h__
-#define __FFmpegLog_h__
-
-#ifdef PR_LOGGING
-extern PRLogModuleInfo* GetFFmpegDecoderLog();
-#define FFMPEG_LOG(...) PR_LOG(GetFFmpegDecoderLog(), PR_LOG_DEBUG, (__VA_ARGS__))
-#else
-#define FFMPEG_LOG(...)
-#endif
-
-#endif // __FFmpegLog_h__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegRuntimeLinker.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegRuntimeLinker.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegRuntimeLinker.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegRuntimeLinker.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-/* -*- 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 <dlfcn.h>
-
-#include "FFmpegRuntimeLinker.h"
-#include "mozilla/ArrayUtils.h"
-#include "FFmpegLog.h"
-
-#define NUM_ELEMENTS(X) (sizeof(X) / sizeof((X)[0]))
-
-namespace mozilla
-{
-
-FFmpegRuntimeLinker::LinkStatus FFmpegRuntimeLinker::sLinkStatus =
-  LinkStatus_INIT;
-
-struct AvFormatLib
-{
-  const char* Name;
-  already_AddRefed<PlatformDecoderModule> (*Factory)();
-  uint32_t Version;
-};
-
-template <int V> class FFmpegDecoderModule
-{
-public:
-  static already_AddRefed<PlatformDecoderModule> Create();
-};
-
-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 },
-  { "libavformat.56.dylib", FFmpegDecoderModule<55>::Create, 55 },
-  { "libavformat.55.dylib", FFmpegDecoderModule<55>::Create, 55 },
-  { "libavformat.54.dylib", FFmpegDecoderModule<54>::Create, 54 },
-  { "libavformat.53.dylib", FFmpegDecoderModule<53>::Create, 53 },
-};
-
-void* FFmpegRuntimeLinker::sLinkedLib = nullptr;
-const AvFormatLib* FFmpegRuntimeLinker::sLib = nullptr;
-
-#define AV_FUNC(func, ver) void (*func)();
-#define LIBAVCODEC_ALLVERSION
-#include "FFmpegFunctionList.h"
-#undef LIBAVCODEC_ALLVERSION
-#undef AV_FUNC
-
-/* static */ bool
-FFmpegRuntimeLinker::Link()
-{
-  if (sLinkStatus) {
-    return sLinkStatus == LinkStatus_SUCCEEDED;
-  }
-
-  for (size_t i = 0; i < ArrayLength(sLibs); i++) {
-    const AvFormatLib* lib = &sLibs[i];
-    sLinkedLib = dlopen(lib->Name, RTLD_NOW | RTLD_LOCAL);
-    if (sLinkedLib) {
-      if (Bind(lib->Name, lib->Version)) {
-        sLib = lib;
-        sLinkStatus = LinkStatus_SUCCEEDED;
-        return true;
-      }
-      // Shouldn't happen but if it does then we try the next lib..
-      Unlink();
-    }
-  }
-
-  FFMPEG_LOG("H264/AAC codecs unsupported without [");
-  for (size_t i = 0; i < ArrayLength(sLibs); i++) {
-    FFMPEG_LOG("%s %s", i ? "," : "", sLibs[i].Name);
-  }
-  FFMPEG_LOG(" ]\n");
-
-  Unlink();
-
-  sLinkStatus = LinkStatus_FAILED;
-  return false;
-}
-
-/* static */ bool
-FFmpegRuntimeLinker::Bind(const char* aLibName, uint32_t Version)
-{
-#define LIBAVCODEC_ALLVERSION
-#define AV_FUNC(func, ver)                                                     \
-  if (ver == 0 || ver == Version) {                                            \
-    if (!(func = (typeof(func))dlsym(sLinkedLib, #func))) {                    \
-      FFMPEG_LOG("Couldn't load function " #func " from %s.", aLibName);       \
-      return false;                                                            \
-    }                                                                          \
-  }
-#include "FFmpegFunctionList.h"
-#undef AV_FUNC
-#undef LIBAVCODEC_ALLVERSION
-  return true;
-}
-
-/* static */ already_AddRefed<PlatformDecoderModule>
-FFmpegRuntimeLinker::CreateDecoderModule()
-{
-  if (!Link()) {
-    return nullptr;
-  }
-  nsRefPtr<PlatformDecoderModule> module = sLib->Factory();
-  return module.forget();
-}
-
-/* static */ void
-FFmpegRuntimeLinker::Unlink()
-{
-  if (sLinkedLib) {
-    dlclose(sLinkedLib);
-    sLinkedLib = nullptr;
-    sLib = nullptr;
-    sLinkStatus = LinkStatus_INIT;
-  }
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegRuntimeLinker.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegRuntimeLinker.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/FFmpegRuntimeLinker.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/FFmpegRuntimeLinker.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-/* -*- 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 __FFmpegRuntimeLinker_h__
-#define __FFmpegRuntimeLinker_h__
-
-#include "PlatformDecoderModule.h"
-#include <stdint.h>
-
-namespace mozilla
-{
-
-struct AvFormatLib;
-
-class FFmpegRuntimeLinker
-{
-public:
-  static bool Link();
-  static void Unlink();
-  static already_AddRefed<PlatformDecoderModule> CreateDecoderModule();
-
-private:
-  static void* sLinkedLib;
-  static const AvFormatLib* sLib;
-
-  static bool Bind(const char* aLibName, uint32_t Version);
-
-  static enum LinkStatus {
-    LinkStatus_INIT = 0,
-    LinkStatus_FAILED,
-    LinkStatus_SUCCEEDED
-  } sLinkStatus;
-};
-
-}
-
-#endif // __FFmpegRuntimeLinker_h__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/COPYING.LGPLv2.1 firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/COPYING.LGPLv2.1
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/COPYING.LGPLv2.1	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/COPYING.LGPLv2.1	1970-01-01 00:00:00.000000000 +0000
@@ -1,504 +0,0 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/avcodec.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/avcodec.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/avcodec.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/avcodec.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,4761 +0,0 @@
-/*
- * copyright (c) 2001 Fabrice Bellard
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_AVCODEC_H
-#define AVCODEC_AVCODEC_H
-
-/**
- * @file
- * external API header
- */
-
-#include <errno.h>
-#include "libavutil/samplefmt.h"
-#include "libavutil/avutil.h"
-#include "libavutil/cpu.h"
-#include "libavutil/dict.h"
-#include "libavutil/log.h"
-#include "libavutil/pixfmt.h"
-#include "libavutil/rational.h"
-
-#include "libavcodec/version.h"
-/**
- * @defgroup libavc Encoding/Decoding Library
- * @{
- *
- * @defgroup lavc_decoding Decoding
- * @{
- * @}
- *
- * @defgroup lavc_encoding Encoding
- * @{
- * @}
- *
- * @defgroup lavc_codec Codecs
- * @{
- * @defgroup lavc_codec_native Native Codecs
- * @{
- * @}
- * @defgroup lavc_codec_wrappers External library wrappers
- * @{
- * @}
- * @defgroup lavc_codec_hwaccel Hardware Accelerators bridge
- * @{
- * @}
- * @}
- * @defgroup lavc_internal Internal
- * @{
- * @}
- * @}
- *
- */
-
-
-/**
- * Identify the syntax and semantics of the bitstream.
- * The principle is roughly:
- * Two decoders with the same ID can decode the same streams.
- * Two encoders with the same ID can encode compatible streams.
- * There may be slight deviations from the principle due to implementation
- * details.
- *
- * If you add a codec ID to this list, add it so that
- * 1. no value of a existing codec ID changes (that would break ABI),
- * 2. it is as close as possible to similar codecs.
- */
-enum CodecID {
-    CODEC_ID_NONE,
-
-    /* video codecs */
-    CODEC_ID_MPEG1VIDEO,
-    CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
-    CODEC_ID_MPEG2VIDEO_XVMC,
-    CODEC_ID_H261,
-    CODEC_ID_H263,
-    CODEC_ID_RV10,
-    CODEC_ID_RV20,
-    CODEC_ID_MJPEG,
-    CODEC_ID_MJPEGB,
-    CODEC_ID_LJPEG,
-    CODEC_ID_SP5X,
-    CODEC_ID_JPEGLS,
-    CODEC_ID_MPEG4,
-    CODEC_ID_RAWVIDEO,
-    CODEC_ID_MSMPEG4V1,
-    CODEC_ID_MSMPEG4V2,
-    CODEC_ID_MSMPEG4V3,
-    CODEC_ID_WMV1,
-    CODEC_ID_WMV2,
-    CODEC_ID_H263P,
-    CODEC_ID_H263I,
-    CODEC_ID_FLV1,
-    CODEC_ID_SVQ1,
-    CODEC_ID_SVQ3,
-    CODEC_ID_DVVIDEO,
-    CODEC_ID_HUFFYUV,
-    CODEC_ID_CYUV,
-    CODEC_ID_H264,
-    CODEC_ID_INDEO3,
-    CODEC_ID_VP3,
-    CODEC_ID_THEORA,
-    CODEC_ID_ASV1,
-    CODEC_ID_ASV2,
-    CODEC_ID_FFV1,
-    CODEC_ID_4XM,
-    CODEC_ID_VCR1,
-    CODEC_ID_CLJR,
-    CODEC_ID_MDEC,
-    CODEC_ID_ROQ,
-    CODEC_ID_INTERPLAY_VIDEO,
-    CODEC_ID_XAN_WC3,
-    CODEC_ID_XAN_WC4,
-    CODEC_ID_RPZA,
-    CODEC_ID_CINEPAK,
-    CODEC_ID_WS_VQA,
-    CODEC_ID_MSRLE,
-    CODEC_ID_MSVIDEO1,
-    CODEC_ID_IDCIN,
-    CODEC_ID_8BPS,
-    CODEC_ID_SMC,
-    CODEC_ID_FLIC,
-    CODEC_ID_TRUEMOTION1,
-    CODEC_ID_VMDVIDEO,
-    CODEC_ID_MSZH,
-    CODEC_ID_ZLIB,
-    CODEC_ID_QTRLE,
-    CODEC_ID_SNOW,
-    CODEC_ID_TSCC,
-    CODEC_ID_ULTI,
-    CODEC_ID_QDRAW,
-    CODEC_ID_VIXL,
-    CODEC_ID_QPEG,
-    CODEC_ID_PNG,
-    CODEC_ID_PPM,
-    CODEC_ID_PBM,
-    CODEC_ID_PGM,
-    CODEC_ID_PGMYUV,
-    CODEC_ID_PAM,
-    CODEC_ID_FFVHUFF,
-    CODEC_ID_RV30,
-    CODEC_ID_RV40,
-    CODEC_ID_VC1,
-    CODEC_ID_WMV3,
-    CODEC_ID_LOCO,
-    CODEC_ID_WNV1,
-    CODEC_ID_AASC,
-    CODEC_ID_INDEO2,
-    CODEC_ID_FRAPS,
-    CODEC_ID_TRUEMOTION2,
-    CODEC_ID_BMP,
-    CODEC_ID_CSCD,
-    CODEC_ID_MMVIDEO,
-    CODEC_ID_ZMBV,
-    CODEC_ID_AVS,
-    CODEC_ID_SMACKVIDEO,
-    CODEC_ID_NUV,
-    CODEC_ID_KMVC,
-    CODEC_ID_FLASHSV,
-    CODEC_ID_CAVS,
-    CODEC_ID_JPEG2000,
-    CODEC_ID_VMNC,
-    CODEC_ID_VP5,
-    CODEC_ID_VP6,
-    CODEC_ID_VP6F,
-    CODEC_ID_TARGA,
-    CODEC_ID_DSICINVIDEO,
-    CODEC_ID_TIERTEXSEQVIDEO,
-    CODEC_ID_TIFF,
-    CODEC_ID_GIF,
-#if LIBAVCODEC_VERSION_MAJOR == 53
-    CODEC_ID_FFH264,
-#endif
-    CODEC_ID_DXA,
-    CODEC_ID_DNXHD,
-    CODEC_ID_THP,
-    CODEC_ID_SGI,
-    CODEC_ID_C93,
-    CODEC_ID_BETHSOFTVID,
-    CODEC_ID_PTX,
-    CODEC_ID_TXD,
-    CODEC_ID_VP6A,
-    CODEC_ID_AMV,
-    CODEC_ID_VB,
-    CODEC_ID_PCX,
-    CODEC_ID_SUNRAST,
-    CODEC_ID_INDEO4,
-    CODEC_ID_INDEO5,
-    CODEC_ID_MIMIC,
-    CODEC_ID_RL2,
-#if LIBAVCODEC_VERSION_MAJOR == 53
-    CODEC_ID_8SVX_EXP,
-    CODEC_ID_8SVX_FIB,
-#endif
-    CODEC_ID_ESCAPE124,
-    CODEC_ID_DIRAC,
-    CODEC_ID_BFI,
-    CODEC_ID_CMV,
-    CODEC_ID_MOTIONPIXELS,
-    CODEC_ID_TGV,
-    CODEC_ID_TGQ,
-    CODEC_ID_TQI,
-    CODEC_ID_AURA,
-    CODEC_ID_AURA2,
-    CODEC_ID_V210X,
-    CODEC_ID_TMV,
-    CODEC_ID_V210,
-    CODEC_ID_DPX,
-    CODEC_ID_MAD,
-    CODEC_ID_FRWU,
-    CODEC_ID_FLASHSV2,
-    CODEC_ID_CDGRAPHICS,
-    CODEC_ID_R210,
-    CODEC_ID_ANM,
-    CODEC_ID_BINKVIDEO,
-    CODEC_ID_IFF_ILBM,
-    CODEC_ID_IFF_BYTERUN1,
-    CODEC_ID_KGV1,
-    CODEC_ID_YOP,
-    CODEC_ID_VP8,
-    CODEC_ID_PICTOR,
-    CODEC_ID_ANSI,
-    CODEC_ID_A64_MULTI,
-    CODEC_ID_A64_MULTI5,
-    CODEC_ID_R10K,
-    CODEC_ID_MXPEG,
-    CODEC_ID_LAGARITH,
-    CODEC_ID_PRORES,
-    CODEC_ID_JV,
-    CODEC_ID_DFA,
-    CODEC_ID_WMV3IMAGE,
-    CODEC_ID_VC1IMAGE,
-#if LIBAVCODEC_VERSION_MAJOR == 53
-    CODEC_ID_G723_1,
-    CODEC_ID_G729,
-#endif
-    CODEC_ID_UTVIDEO,
-    CODEC_ID_BMV_VIDEO,
-    CODEC_ID_VBLE,
-    CODEC_ID_DXTORY,
-    CODEC_ID_V410,
-
-    /* various PCM "codecs" */
-    CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs
-    CODEC_ID_PCM_S16LE = 0x10000,
-    CODEC_ID_PCM_S16BE,
-    CODEC_ID_PCM_U16LE,
-    CODEC_ID_PCM_U16BE,
-    CODEC_ID_PCM_S8,
-    CODEC_ID_PCM_U8,
-    CODEC_ID_PCM_MULAW,
-    CODEC_ID_PCM_ALAW,
-    CODEC_ID_PCM_S32LE,
-    CODEC_ID_PCM_S32BE,
-    CODEC_ID_PCM_U32LE,
-    CODEC_ID_PCM_U32BE,
-    CODEC_ID_PCM_S24LE,
-    CODEC_ID_PCM_S24BE,
-    CODEC_ID_PCM_U24LE,
-    CODEC_ID_PCM_U24BE,
-    CODEC_ID_PCM_S24DAUD,
-    CODEC_ID_PCM_ZORK,
-    CODEC_ID_PCM_S16LE_PLANAR,
-    CODEC_ID_PCM_DVD,
-    CODEC_ID_PCM_F32BE,
-    CODEC_ID_PCM_F32LE,
-    CODEC_ID_PCM_F64BE,
-    CODEC_ID_PCM_F64LE,
-    CODEC_ID_PCM_BLURAY,
-    CODEC_ID_PCM_LXF,
-    CODEC_ID_S302M,
-    CODEC_ID_PCM_S8_PLANAR,
-
-    /* various ADPCM codecs */
-    CODEC_ID_ADPCM_IMA_QT = 0x11000,
-    CODEC_ID_ADPCM_IMA_WAV,
-    CODEC_ID_ADPCM_IMA_DK3,
-    CODEC_ID_ADPCM_IMA_DK4,
-    CODEC_ID_ADPCM_IMA_WS,
-    CODEC_ID_ADPCM_IMA_SMJPEG,
-    CODEC_ID_ADPCM_MS,
-    CODEC_ID_ADPCM_4XM,
-    CODEC_ID_ADPCM_XA,
-    CODEC_ID_ADPCM_ADX,
-    CODEC_ID_ADPCM_EA,
-    CODEC_ID_ADPCM_G726,
-    CODEC_ID_ADPCM_CT,
-    CODEC_ID_ADPCM_SWF,
-    CODEC_ID_ADPCM_YAMAHA,
-    CODEC_ID_ADPCM_SBPRO_4,
-    CODEC_ID_ADPCM_SBPRO_3,
-    CODEC_ID_ADPCM_SBPRO_2,
-    CODEC_ID_ADPCM_THP,
-    CODEC_ID_ADPCM_IMA_AMV,
-    CODEC_ID_ADPCM_EA_R1,
-    CODEC_ID_ADPCM_EA_R3,
-    CODEC_ID_ADPCM_EA_R2,
-    CODEC_ID_ADPCM_IMA_EA_SEAD,
-    CODEC_ID_ADPCM_IMA_EA_EACS,
-    CODEC_ID_ADPCM_EA_XAS,
-    CODEC_ID_ADPCM_EA_MAXIS_XA,
-    CODEC_ID_ADPCM_IMA_ISS,
-    CODEC_ID_ADPCM_G722,
-
-    /* AMR */
-    CODEC_ID_AMR_NB = 0x12000,
-    CODEC_ID_AMR_WB,
-
-    /* RealAudio codecs*/
-    CODEC_ID_RA_144 = 0x13000,
-    CODEC_ID_RA_288,
-
-    /* various DPCM codecs */
-    CODEC_ID_ROQ_DPCM = 0x14000,
-    CODEC_ID_INTERPLAY_DPCM,
-    CODEC_ID_XAN_DPCM,
-    CODEC_ID_SOL_DPCM,
-
-    /* audio codecs */
-    CODEC_ID_MP2 = 0x15000,
-    CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
-    CODEC_ID_AAC,
-    CODEC_ID_AC3,
-    CODEC_ID_DTS,
-    CODEC_ID_VORBIS,
-    CODEC_ID_DVAUDIO,
-    CODEC_ID_WMAV1,
-    CODEC_ID_WMAV2,
-    CODEC_ID_MACE3,
-    CODEC_ID_MACE6,
-    CODEC_ID_VMDAUDIO,
-#if LIBAVCODEC_VERSION_MAJOR == 53
-    CODEC_ID_SONIC,
-    CODEC_ID_SONIC_LS,
-#endif
-    CODEC_ID_FLAC,
-    CODEC_ID_MP3ADU,
-    CODEC_ID_MP3ON4,
-    CODEC_ID_SHORTEN,
-    CODEC_ID_ALAC,
-    CODEC_ID_WESTWOOD_SND1,
-    CODEC_ID_GSM, ///< as in Berlin toast format
-    CODEC_ID_QDM2,
-    CODEC_ID_COOK,
-    CODEC_ID_TRUESPEECH,
-    CODEC_ID_TTA,
-    CODEC_ID_SMACKAUDIO,
-    CODEC_ID_QCELP,
-    CODEC_ID_WAVPACK,
-    CODEC_ID_DSICINAUDIO,
-    CODEC_ID_IMC,
-    CODEC_ID_MUSEPACK7,
-    CODEC_ID_MLP,
-    CODEC_ID_GSM_MS, /* as found in WAV */
-    CODEC_ID_ATRAC3,
-    CODEC_ID_VOXWARE,
-    CODEC_ID_APE,
-    CODEC_ID_NELLYMOSER,
-    CODEC_ID_MUSEPACK8,
-    CODEC_ID_SPEEX,
-    CODEC_ID_WMAVOICE,
-    CODEC_ID_WMAPRO,
-    CODEC_ID_WMALOSSLESS,
-    CODEC_ID_ATRAC3P,
-    CODEC_ID_EAC3,
-    CODEC_ID_SIPR,
-    CODEC_ID_MP1,
-    CODEC_ID_TWINVQ,
-    CODEC_ID_TRUEHD,
-    CODEC_ID_MP4ALS,
-    CODEC_ID_ATRAC1,
-    CODEC_ID_BINKAUDIO_RDFT,
-    CODEC_ID_BINKAUDIO_DCT,
-    CODEC_ID_AAC_LATM,
-    CODEC_ID_QDMC,
-    CODEC_ID_CELT,
-#if LIBAVCODEC_VERSION_MAJOR > 53
-    CODEC_ID_G723_1,
-    CODEC_ID_G729,
-    CODEC_ID_8SVX_EXP,
-    CODEC_ID_8SVX_FIB,
-#endif
-    CODEC_ID_BMV_AUDIO,
-
-    /* subtitle codecs */
-    CODEC_ID_FIRST_SUBTITLE = 0x17000,          ///< A dummy ID pointing at the start of subtitle codecs.
-    CODEC_ID_DVD_SUBTITLE = 0x17000,
-    CODEC_ID_DVB_SUBTITLE,
-    CODEC_ID_TEXT,  ///< raw UTF-8 text
-    CODEC_ID_XSUB,
-    CODEC_ID_SSA,
-    CODEC_ID_MOV_TEXT,
-    CODEC_ID_HDMV_PGS_SUBTITLE,
-    CODEC_ID_DVB_TELETEXT,
-    CODEC_ID_SRT,
-
-    /* other specific kind of codecs (generally used for attachments) */
-    CODEC_ID_FIRST_UNKNOWN = 0x18000,           ///< A dummy ID pointing at the start of various fake codecs.
-    CODEC_ID_TTF = 0x18000,
-
-    CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it
-
-    CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
-                                * stream (only used by libavformat) */
-    CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
-                                * stream (only used by libavformat) */
-    CODEC_ID_FFMETADATA = 0x21000,   ///< Dummy codec for streams containing only metadata information.
-};
-
-#if FF_API_OLD_SAMPLE_FMT
-#define SampleFormat AVSampleFormat
-
-#define SAMPLE_FMT_NONE AV_SAMPLE_FMT_NONE
-#define SAMPLE_FMT_U8   AV_SAMPLE_FMT_U8
-#define SAMPLE_FMT_S16  AV_SAMPLE_FMT_S16
-#define SAMPLE_FMT_S32  AV_SAMPLE_FMT_S32
-#define SAMPLE_FMT_FLT  AV_SAMPLE_FMT_FLT
-#define SAMPLE_FMT_DBL  AV_SAMPLE_FMT_DBL
-#define SAMPLE_FMT_NB   AV_SAMPLE_FMT_NB
-#endif
-
-#if FF_API_OLD_AUDIOCONVERT
-#include "libavutil/audioconvert.h"
-
-/* Audio channel masks */
-#define CH_FRONT_LEFT            AV_CH_FRONT_LEFT
-#define CH_FRONT_RIGHT           AV_CH_FRONT_RIGHT
-#define CH_FRONT_CENTER          AV_CH_FRONT_CENTER
-#define CH_LOW_FREQUENCY         AV_CH_LOW_FREQUENCY
-#define CH_BACK_LEFT             AV_CH_BACK_LEFT
-#define CH_BACK_RIGHT            AV_CH_BACK_RIGHT
-#define CH_FRONT_LEFT_OF_CENTER  AV_CH_FRONT_LEFT_OF_CENTER
-#define CH_FRONT_RIGHT_OF_CENTER AV_CH_FRONT_RIGHT_OF_CENTER
-#define CH_BACK_CENTER           AV_CH_BACK_CENTER
-#define CH_SIDE_LEFT             AV_CH_SIDE_LEFT
-#define CH_SIDE_RIGHT            AV_CH_SIDE_RIGHT
-#define CH_TOP_CENTER            AV_CH_TOP_CENTER
-#define CH_TOP_FRONT_LEFT        AV_CH_TOP_FRONT_LEFT
-#define CH_TOP_FRONT_CENTER      AV_CH_TOP_FRONT_CENTER
-#define CH_TOP_FRONT_RIGHT       AV_CH_TOP_FRONT_RIGHT
-#define CH_TOP_BACK_LEFT         AV_CH_TOP_BACK_LEFT
-#define CH_TOP_BACK_CENTER       AV_CH_TOP_BACK_CENTER
-#define CH_TOP_BACK_RIGHT        AV_CH_TOP_BACK_RIGHT
-#define CH_STEREO_LEFT           AV_CH_STEREO_LEFT
-#define CH_STEREO_RIGHT          AV_CH_STEREO_RIGHT
-
-/** Channel mask value used for AVCodecContext.request_channel_layout
-    to indicate that the user requests the channel order of the decoder output
-    to be the native codec channel order. */
-#define CH_LAYOUT_NATIVE         AV_CH_LAYOUT_NATIVE
-
-/* Audio channel convenience macros */
-#define CH_LAYOUT_MONO           AV_CH_LAYOUT_MONO
-#define CH_LAYOUT_STEREO         AV_CH_LAYOUT_STEREO
-#define CH_LAYOUT_2_1            AV_CH_LAYOUT_2_1
-#define CH_LAYOUT_SURROUND       AV_CH_LAYOUT_SURROUND
-#define CH_LAYOUT_4POINT0        AV_CH_LAYOUT_4POINT0
-#define CH_LAYOUT_2_2            AV_CH_LAYOUT_2_2
-#define CH_LAYOUT_QUAD           AV_CH_LAYOUT_QUAD
-#define CH_LAYOUT_5POINT0        AV_CH_LAYOUT_5POINT0
-#define CH_LAYOUT_5POINT1        AV_CH_LAYOUT_5POINT1
-#define CH_LAYOUT_5POINT0_BACK   AV_CH_LAYOUT_5POINT0_BACK
-#define CH_LAYOUT_5POINT1_BACK   AV_CH_LAYOUT_5POINT1_BACK
-#define CH_LAYOUT_7POINT0        AV_CH_LAYOUT_7POINT0
-#define CH_LAYOUT_7POINT1        AV_CH_LAYOUT_7POINT1
-#define CH_LAYOUT_7POINT1_WIDE   AV_CH_LAYOUT_7POINT1_WIDE
-#define CH_LAYOUT_STEREO_DOWNMIX AV_CH_LAYOUT_STEREO_DOWNMIX
-#endif
-
-#if FF_API_OLD_DECODE_AUDIO
-/* in bytes */
-#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
-#endif
-
-/**
- * Required number of additionally allocated bytes at the end of the input bitstream for decoding.
- * This is mainly needed because some optimized bitstream readers read
- * 32 or 64 bit at once and could read over the end.<br>
- * Note: If the first 23 bits of the additional bytes are not 0, then damaged
- * MPEG bitstreams could cause overread and segfault.
- */
-#define FF_INPUT_BUFFER_PADDING_SIZE 8
-
-/**
- * minimum encoding buffer size
- * Used to avoid some checks during header writing.
- */
-#define FF_MIN_BUFFER_SIZE 16384
-
-
-/**
- * motion estimation type.
- */
-enum Motion_Est_ID {
-    ME_ZERO = 1,    ///< no search, that is use 0,0 vector whenever one is needed
-    ME_FULL,
-    ME_LOG,
-    ME_PHODS,
-    ME_EPZS,        ///< enhanced predictive zonal search
-    ME_X1,          ///< reserved for experiments
-    ME_HEX,         ///< hexagon based search
-    ME_UMH,         ///< uneven multi-hexagon search
-    ME_ITER,        ///< iterative search
-    ME_TESA,        ///< transformed exhaustive search algorithm
-};
-
-enum AVDiscard{
-    /* We leave some space between them for extensions (drop some
-     * keyframes for intra-only or drop just some bidir frames). */
-    AVDISCARD_NONE   =-16, ///< discard nothing
-    AVDISCARD_DEFAULT=  0, ///< discard useless packets like 0 size packets in avi
-    AVDISCARD_NONREF =  8, ///< discard all non reference
-    AVDISCARD_BIDIR  = 16, ///< discard all bidirectional frames
-    AVDISCARD_NONKEY = 32, ///< discard all frames except keyframes
-    AVDISCARD_ALL    = 48, ///< discard all
-};
-
-enum AVColorPrimaries{
-    AVCOL_PRI_BT709      =1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B
-    AVCOL_PRI_UNSPECIFIED=2,
-    AVCOL_PRI_BT470M     =4,
-    AVCOL_PRI_BT470BG    =5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM
-    AVCOL_PRI_SMPTE170M  =6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
-    AVCOL_PRI_SMPTE240M  =7, ///< functionally identical to above
-    AVCOL_PRI_FILM       =8,
-    AVCOL_PRI_NB           , ///< Not part of ABI
-};
-
-enum AVColorTransferCharacteristic{
-    AVCOL_TRC_BT709      =1, ///< also ITU-R BT1361
-    AVCOL_TRC_UNSPECIFIED=2,
-    AVCOL_TRC_GAMMA22    =4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
-    AVCOL_TRC_GAMMA28    =5, ///< also ITU-R BT470BG
-    AVCOL_TRC_NB           , ///< Not part of ABI
-};
-
-enum AVColorSpace{
-    AVCOL_SPC_RGB        =0,
-    AVCOL_SPC_BT709      =1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
-    AVCOL_SPC_UNSPECIFIED=2,
-    AVCOL_SPC_FCC        =4,
-    AVCOL_SPC_BT470BG    =5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
-    AVCOL_SPC_SMPTE170M  =6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
-    AVCOL_SPC_SMPTE240M  =7,
-    AVCOL_SPC_NB           , ///< Not part of ABI
-};
-
-enum AVColorRange{
-    AVCOL_RANGE_UNSPECIFIED=0,
-    AVCOL_RANGE_MPEG       =1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges
-    AVCOL_RANGE_JPEG       =2, ///< the normal     2^n-1   "JPEG" YUV ranges
-    AVCOL_RANGE_NB           , ///< Not part of ABI
-};
-
-/**
- *  X   X      3 4 X      X are luma samples,
- *             1 2        1-6 are possible chroma positions
- *  X   X      5 6 X      0 is undefined/unknown position
- */
-enum AVChromaLocation{
-    AVCHROMA_LOC_UNSPECIFIED=0,
-    AVCHROMA_LOC_LEFT       =1, ///< mpeg2/4, h264 default
-    AVCHROMA_LOC_CENTER     =2, ///< mpeg1, jpeg, h263
-    AVCHROMA_LOC_TOPLEFT    =3, ///< DV
-    AVCHROMA_LOC_TOP        =4,
-    AVCHROMA_LOC_BOTTOMLEFT =5,
-    AVCHROMA_LOC_BOTTOM     =6,
-    AVCHROMA_LOC_NB           , ///< Not part of ABI
-};
-
-#if FF_API_FLAC_GLOBAL_OPTS
-/**
- * LPC analysis type
- */
-enum AVLPCType {
-    AV_LPC_TYPE_DEFAULT     = -1, ///< use the codec default LPC type
-    AV_LPC_TYPE_NONE        =  0, ///< do not use LPC prediction or use all zero coefficients
-    AV_LPC_TYPE_FIXED       =  1, ///< fixed LPC coefficients
-    AV_LPC_TYPE_LEVINSON    =  2, ///< Levinson-Durbin recursion
-    AV_LPC_TYPE_CHOLESKY    =  3, ///< Cholesky factorization
-    AV_LPC_TYPE_NB              , ///< Not part of ABI
-};
-#endif
-
-enum AVAudioServiceType {
-    AV_AUDIO_SERVICE_TYPE_MAIN              = 0,
-    AV_AUDIO_SERVICE_TYPE_EFFECTS           = 1,
-    AV_AUDIO_SERVICE_TYPE_VISUALLY_IMPAIRED = 2,
-    AV_AUDIO_SERVICE_TYPE_HEARING_IMPAIRED  = 3,
-    AV_AUDIO_SERVICE_TYPE_DIALOGUE          = 4,
-    AV_AUDIO_SERVICE_TYPE_COMMENTARY        = 5,
-    AV_AUDIO_SERVICE_TYPE_EMERGENCY         = 6,
-    AV_AUDIO_SERVICE_TYPE_VOICE_OVER        = 7,
-    AV_AUDIO_SERVICE_TYPE_KARAOKE           = 8,
-    AV_AUDIO_SERVICE_TYPE_NB                   , ///< Not part of ABI
-};
-
-typedef struct RcOverride{
-    int start_frame;
-    int end_frame;
-    int qscale; // If this is 0 then quality_factor will be used instead.
-    float quality_factor;
-} RcOverride;
-
-#define FF_MAX_B_FRAMES 16
-
-/* encoding support
-   These flags can be passed in AVCodecContext.flags before initialization.
-   Note: Not everything is supported yet.
-*/
-
-#define CODEC_FLAG_QSCALE 0x0002  ///< Use fixed qscale.
-#define CODEC_FLAG_4MV    0x0004  ///< 4 MV per MB allowed / advanced prediction for H.263.
-#define CODEC_FLAG_QPEL   0x0010  ///< Use qpel MC.
-#define CODEC_FLAG_GMC    0x0020  ///< Use GMC.
-#define CODEC_FLAG_MV0    0x0040  ///< Always try a MB with MV=<0,0>.
-/**
- * The parent program guarantees that the input for B-frames containing
- * streams is not written to for at least s->max_b_frames+1 frames, if
- * this is not set the input will be copied.
- */
-#define CODEC_FLAG_INPUT_PRESERVED 0x0100
-#define CODEC_FLAG_PASS1           0x0200   ///< Use internal 2pass ratecontrol in first pass mode.
-#define CODEC_FLAG_PASS2           0x0400   ///< Use internal 2pass ratecontrol in second pass mode.
-#define CODEC_FLAG_GRAY            0x2000   ///< Only decode/encode grayscale.
-#define CODEC_FLAG_EMU_EDGE        0x4000   ///< Don't draw edges.
-#define CODEC_FLAG_PSNR            0x8000   ///< error[?] variables will be set during encoding.
-#define CODEC_FLAG_TRUNCATED       0x00010000 /** Input bitstream might be truncated at a random
-                                                  location instead of only at frame boundaries. */
-#define CODEC_FLAG_NORMALIZE_AQP  0x00020000 ///< Normalize adaptive quantization.
-#define CODEC_FLAG_INTERLACED_DCT 0x00040000 ///< Use interlaced DCT.
-#define CODEC_FLAG_LOW_DELAY      0x00080000 ///< Force low delay.
-#define CODEC_FLAG_GLOBAL_HEADER  0x00400000 ///< Place global headers in extradata instead of every keyframe.
-#define CODEC_FLAG_BITEXACT       0x00800000 ///< Use only bitexact stuff (except (I)DCT).
-/* Fx : Flag for h263+ extra options */
-#define CODEC_FLAG_AC_PRED        0x01000000 ///< H.263 advanced intra coding / MPEG-4 AC prediction
-#define CODEC_FLAG_CBP_RD         0x04000000 ///< Use rate distortion optimization for cbp.
-#define CODEC_FLAG_QP_RD          0x08000000 ///< Use rate distortion optimization for qp selectioon.
-#define CODEC_FLAG_LOOP_FILTER    0x00000800 ///< loop filter
-#define CODEC_FLAG_INTERLACED_ME  0x20000000 ///< interlaced motion estimation
-#define CODEC_FLAG_CLOSED_GOP     0x80000000
-#define CODEC_FLAG2_FAST          0x00000001 ///< Allow non spec compliant speedup tricks.
-#define CODEC_FLAG2_STRICT_GOP    0x00000002 ///< Strictly enforce GOP size.
-#define CODEC_FLAG2_NO_OUTPUT     0x00000004 ///< Skip bitstream encoding.
-#define CODEC_FLAG2_LOCAL_HEADER  0x00000008 ///< Place global headers at every keyframe instead of in extradata.
-#define CODEC_FLAG2_SKIP_RD       0x00004000 ///< RD optimal MB level residual skipping
-#define CODEC_FLAG2_CHUNKS        0x00008000 ///< Input bitstream might be truncated at a packet boundaries instead of only at frame boundaries.
-/**
- * @defgroup deprecated_flags Deprecated codec flags
- * Use corresponding private codec options instead.
- * @{
- */
-#if FF_API_MPEGVIDEO_GLOBAL_OPTS
-#define CODEC_FLAG_OBMC           0x00000001 ///< OBMC
-#define CODEC_FLAG_H263P_AIV      0x00000008 ///< H.263 alternative inter VLC
-#define CODEC_FLAG_PART   0x0080  ///< Use data partitioning.
-#define CODEC_FLAG_ALT_SCAN       0x00100000 ///< Use alternate scan.
-#define CODEC_FLAG_H263P_UMV      0x02000000 ///< unlimited motion vector
-#define CODEC_FLAG_H263P_SLICE_STRUCT 0x10000000
-#define CODEC_FLAG_SVCD_SCAN_OFFSET 0x40000000 ///< Will reserve space for SVCD scan offset user data.
-#define CODEC_FLAG2_INTRA_VLC     0x00000800 ///< Use MPEG-2 intra VLC table.
-#define CODEC_FLAG2_DROP_FRAME_TIMECODE 0x00002000 ///< timecode is in drop frame format.
-#define CODEC_FLAG2_NON_LINEAR_QUANT 0x00010000 ///< Use MPEG-2 nonlinear quantizer.
-#endif
-#if FF_API_MJPEG_GLOBAL_OPTS
-#define CODEC_FLAG_EXTERN_HUFF     0x1000   ///< Use external Huffman table (for MJPEG).
-#endif
-#if FF_API_X264_GLOBAL_OPTS
-#define CODEC_FLAG2_BPYRAMID      0x00000010 ///< H.264 allow B-frames to be used as references.
-#define CODEC_FLAG2_WPRED         0x00000020 ///< H.264 weighted biprediction for B-frames
-#define CODEC_FLAG2_MIXED_REFS    0x00000040 ///< H.264 one reference per partition, as opposed to one reference per macroblock
-#define CODEC_FLAG2_8X8DCT        0x00000080 ///< H.264 high profile 8x8 transform
-#define CODEC_FLAG2_FASTPSKIP     0x00000100 ///< H.264 fast pskip
-#define CODEC_FLAG2_AUD           0x00000200 ///< H.264 access unit delimiters
-#define CODEC_FLAG2_BRDO          0x00000400 ///< B-frame rate-distortion optimization
-#define CODEC_FLAG2_MBTREE        0x00040000 ///< Use macroblock tree ratecontrol (x264 only)
-#define CODEC_FLAG2_PSY           0x00080000 ///< Use psycho visual optimizations.
-#define CODEC_FLAG2_SSIM          0x00100000 ///< Compute SSIM during encoding, error[] values are undefined.
-#define CODEC_FLAG2_INTRA_REFRESH 0x00200000 ///< Use periodic insertion of intra blocks instead of keyframes.
-#endif
-#if FF_API_SNOW_GLOBAL_OPTS
-#define CODEC_FLAG2_MEMC_ONLY     0x00001000 ///< Only do ME/MC (I frames -> ref, P frame -> ME+MC).
-#endif
-#if FF_API_LAME_GLOBAL_OPTS
-#define CODEC_FLAG2_BIT_RESERVOIR 0x00020000 ///< Use a bit reservoir when encoding if possible
-#endif
-/**
- * @}
- */
-
-/* Unsupported options :
- *              Syntax Arithmetic coding (SAC)
- *              Reference Picture Selection
- *              Independent Segment Decoding */
-/* /Fx */
-/* codec capabilities */
-
-#define CODEC_CAP_DRAW_HORIZ_BAND 0x0001 ///< Decoder can use draw_horiz_band callback.
-/**
- * Codec uses get_buffer() for allocating buffers and supports custom allocators.
- * If not set, it might not use get_buffer() at all or use operations that
- * assume the buffer was allocated by avcodec_default_get_buffer.
- */
-#define CODEC_CAP_DR1             0x0002
-#if FF_API_PARSE_FRAME
-/* If 'parse_only' field is true, then avcodec_parse_frame() can be used. */
-#define CODEC_CAP_PARSE_ONLY      0x0004
-#endif
-#define CODEC_CAP_TRUNCATED       0x0008
-/* Codec can export data for HW decoding (XvMC). */
-#define CODEC_CAP_HWACCEL         0x0010
-/**
- * Encoder or decoder requires flushing with NULL input at the end in order to
- * give the complete and correct output.
- *
- * NOTE: If this flag is not set, the codec is guaranteed to never be fed with
- *       with NULL data. The user can still send NULL data to the public encode
- *       or decode function, but libavcodec will not pass it along to the codec
- *       unless this flag is set.
- *
- * Decoders:
- * The decoder has a non-zero delay and needs to be fed with avpkt->data=NULL,
- * avpkt->size=0 at the end to get the delayed data until the decoder no longer
- * returns frames.
- *
- * Encoders:
- * The encoder needs to be fed with NULL data at the end of encoding until the
- * encoder no longer returns data.
- *
- * NOTE: For encoders implementing the AVCodec.encode2() function, setting this
- *       flag also means that the encoder must set the pts and duration for
- *       each output packet. If this flag is not set, the pts and duration will
- *       be determined by libavcodec from the input frame.
- */
-#define CODEC_CAP_DELAY           0x0020
-/**
- * Codec can be fed a final frame with a smaller size.
- * This can be used to prevent truncation of the last audio samples.
- */
-#define CODEC_CAP_SMALL_LAST_FRAME 0x0040
-/**
- * Codec can export data for HW decoding (VDPAU).
- */
-#define CODEC_CAP_HWACCEL_VDPAU    0x0080
-/**
- * Codec can output multiple frames per AVPacket
- * Normally demuxers return one frame at a time, demuxers which do not do
- * are connected to a parser to split what they return into proper frames.
- * This flag is reserved to the very rare category of codecs which have a
- * bitstream that cannot be split into frames without timeconsuming
- * operations like full decoding. Demuxers carring such bitstreams thus
- * may return multiple frames in a packet. This has many disadvantages like
- * prohibiting stream copy in many cases thus it should only be considered
- * as a last resort.
- */
-#define CODEC_CAP_SUBFRAMES        0x0100
-/**
- * Codec is experimental and is thus avoided in favor of non experimental
- * encoders
- */
-#define CODEC_CAP_EXPERIMENTAL     0x0200
-/**
- * Codec should fill in channel configuration and samplerate instead of container
- */
-#define CODEC_CAP_CHANNEL_CONF     0x0400
-/**
- * Codec is able to deal with negative linesizes
- */
-#define CODEC_CAP_NEG_LINESIZES    0x0800
-/**
- * Codec supports frame-level multithreading.
- */
-#define CODEC_CAP_FRAME_THREADS    0x1000
-/**
- * Codec supports slice-based (or partition-based) multithreading.
- */
-#define CODEC_CAP_SLICE_THREADS    0x2000
-/**
- * Codec supports changed parameters at any point.
- */
-#define CODEC_CAP_PARAM_CHANGE     0x4000
-/**
- * Codec supports avctx->thread_count == 0 (auto).
- */
-#define CODEC_CAP_AUTO_THREADS     0x8000
-/**
- * Audio encoder supports receiving a different number of samples in each call.
- */
-#define CODEC_CAP_VARIABLE_FRAME_SIZE 0x10000
-
-//The following defines may change, don't expect compatibility if you use them.
-#define MB_TYPE_INTRA4x4   0x0001
-#define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific
-#define MB_TYPE_INTRA_PCM  0x0004 //FIXME H.264-specific
-#define MB_TYPE_16x16      0x0008
-#define MB_TYPE_16x8       0x0010
-#define MB_TYPE_8x16       0x0020
-#define MB_TYPE_8x8        0x0040
-#define MB_TYPE_INTERLACED 0x0080
-#define MB_TYPE_DIRECT2    0x0100 //FIXME
-#define MB_TYPE_ACPRED     0x0200
-#define MB_TYPE_GMC        0x0400
-#define MB_TYPE_SKIP       0x0800
-#define MB_TYPE_P0L0       0x1000
-#define MB_TYPE_P1L0       0x2000
-#define MB_TYPE_P0L1       0x4000
-#define MB_TYPE_P1L1       0x8000
-#define MB_TYPE_L0         (MB_TYPE_P0L0 | MB_TYPE_P1L0)
-#define MB_TYPE_L1         (MB_TYPE_P0L1 | MB_TYPE_P1L1)
-#define MB_TYPE_L0L1       (MB_TYPE_L0   | MB_TYPE_L1)
-#define MB_TYPE_QUANT      0x00010000
-#define MB_TYPE_CBP        0x00020000
-//Note bits 24-31 are reserved for codec specific use (h264 ref0, mpeg1 0mv, ...)
-
-/**
- * Pan Scan area.
- * This specifies the area which should be displayed.
- * Note there may be multiple such areas for one frame.
- */
-typedef struct AVPanScan{
-    /**
-     * id
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int id;
-
-    /**
-     * width and height in 1/16 pel
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int width;
-    int height;
-
-    /**
-     * position of the top left corner in 1/16 pel for up to 3 fields/frames
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int16_t position[3][2];
-}AVPanScan;
-
-#define FF_QSCALE_TYPE_MPEG1 0
-#define FF_QSCALE_TYPE_MPEG2 1
-#define FF_QSCALE_TYPE_H264  2
-#define FF_QSCALE_TYPE_VP56  3
-
-#define FF_BUFFER_TYPE_INTERNAL 1
-#define FF_BUFFER_TYPE_USER     2 ///< direct rendering buffers (image is (de)allocated by user)
-#define FF_BUFFER_TYPE_SHARED   4 ///< Buffer from somewhere else; don't deallocate image (data/base), all other tables are not shared.
-#define FF_BUFFER_TYPE_COPY     8 ///< Just a (modified) copy of some other buffer, don't deallocate anything.
-
-#if FF_API_OLD_FF_PICT_TYPES
-/* DEPRECATED, directly use the AV_PICTURE_TYPE_* enum values */
-#define FF_I_TYPE  AV_PICTURE_TYPE_I  ///< Intra
-#define FF_P_TYPE  AV_PICTURE_TYPE_P  ///< Predicted
-#define FF_B_TYPE  AV_PICTURE_TYPE_B  ///< Bi-dir predicted
-#define FF_S_TYPE  AV_PICTURE_TYPE_S  ///< S(GMC)-VOP MPEG4
-#define FF_SI_TYPE AV_PICTURE_TYPE_SI ///< Switching Intra
-#define FF_SP_TYPE AV_PICTURE_TYPE_SP ///< Switching Predicted
-#define FF_BI_TYPE AV_PICTURE_TYPE_BI
-#endif
-
-#define FF_BUFFER_HINTS_VALID    0x01 // Buffer hints value is meaningful (if 0 ignore).
-#define FF_BUFFER_HINTS_READABLE 0x02 // Codec will read from buffer.
-#define FF_BUFFER_HINTS_PRESERVE 0x04 // User must not alter buffer content.
-#define FF_BUFFER_HINTS_REUSABLE 0x08 // Codec will reuse the buffer (update).
-
-enum AVPacketSideDataType {
-    AV_PKT_DATA_PALETTE,
-    AV_PKT_DATA_NEW_EXTRADATA,
-    AV_PKT_DATA_PARAM_CHANGE,
-};
-
-typedef struct AVPacket {
-    /**
-     * Presentation timestamp in AVStream->time_base units; the time at which
-     * the decompressed packet will be presented to the user.
-     * Can be AV_NOPTS_VALUE if it is not stored in the file.
-     * pts MUST be larger or equal to dts as presentation cannot happen before
-     * decompression, unless one wants to view hex dumps. Some formats misuse
-     * the terms dts and pts/cts to mean something different. Such timestamps
-     * must be converted to true pts/dts before they are stored in AVPacket.
-     */
-    int64_t pts;
-    /**
-     * Decompression timestamp in AVStream->time_base units; the time at which
-     * the packet is decompressed.
-     * Can be AV_NOPTS_VALUE if it is not stored in the file.
-     */
-    int64_t dts;
-    uint8_t *data;
-    int   size;
-    int   stream_index;
-    /**
-     * A combination of AV_PKT_FLAG values
-     */
-    int   flags;
-    /**
-     * Additional packet data that can be provided by the container.
-     * Packet can contain several types of side information.
-     */
-    struct {
-        uint8_t *data;
-        int      size;
-        enum AVPacketSideDataType type;
-    } *side_data;
-    int side_data_elems;
-
-    /**
-     * Duration of this packet in AVStream->time_base units, 0 if unknown.
-     * Equals next_pts - this_pts in presentation order.
-     */
-    int   duration;
-    void  (*destruct)(struct AVPacket *);
-    void  *priv;
-    int64_t pos;                            ///< byte position in stream, -1 if unknown
-
-    /**
-     * Time difference in AVStream->time_base units from the pts of this
-     * packet to the point at which the output from the decoder has converged
-     * independent from the availability of previous frames. That is, the
-     * frames are virtually identical no matter if decoding started from
-     * the very first frame or from this keyframe.
-     * Is AV_NOPTS_VALUE if unknown.
-     * This field is not the display duration of the current packet.
-     * This field has no meaning if the packet does not have AV_PKT_FLAG_KEY
-     * set.
-     *
-     * The purpose of this field is to allow seeking in streams that have no
-     * keyframes in the conventional sense. It corresponds to the
-     * recovery point SEI in H.264 and match_time_delta in NUT. It is also
-     * essential for some types of subtitle streams to ensure that all
-     * subtitles are correctly displayed after seeking.
-     */
-    int64_t convergence_duration;
-} AVPacket;
-#define AV_PKT_FLAG_KEY     0x0001 ///< The packet contains a keyframe
-#define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted
-
-/**
- * An AV_PKT_DATA_PARAM_CHANGE side data packet is laid out as follows:
- * u32le param_flags
- * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT)
- *     s32le channel_count
- * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT)
- *     u64le channel_layout
- * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE)
- *     s32le sample_rate
- * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS)
- *     s32le width
- *     s32le height
- */
-
-enum AVSideDataParamChangeFlags {
-    AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT  = 0x0001,
-    AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT = 0x0002,
-    AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE    = 0x0004,
-    AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS     = 0x0008,
-};
-
-/**
- * Audio Video Frame.
- * New fields can be added to the end of AVFRAME with minor version
- * bumps. Removal, reordering and changes to existing fields require
- * a major version bump.
- * sizeof(AVFrame) must not be used outside libav*.
- */
-typedef struct AVFrame {
-#if FF_API_DATA_POINTERS
-#define AV_NUM_DATA_POINTERS 4
-#else
-#define AV_NUM_DATA_POINTERS 8
-#endif
-    /**
-     * pointer to the picture/channel planes.
-     * This might be different from the first allocated byte
-     * - encoding: Set by user
-     * - decoding: set by AVCodecContext.get_buffer()
-     */
-    uint8_t *data[AV_NUM_DATA_POINTERS];
-
-    /**
-     * Size, in bytes, of the data for each picture/channel plane.
-     *
-     * For audio, only linesize[0] may be set. For planar audio, each channel
-     * plane must be the same size.
-     *
-     * - encoding: Set by user (video only)
-     * - decoding: set by AVCodecContext.get_buffer()
-     */
-    int linesize[AV_NUM_DATA_POINTERS];
-
-    /**
-     * pointer to the first allocated byte of the picture. Can be used in get_buffer/release_buffer.
-     * This isn't used by libavcodec unless the default get/release_buffer() is used.
-     * - encoding:
-     * - decoding:
-     */
-    uint8_t *base[AV_NUM_DATA_POINTERS];
-    /**
-     * 1 -> keyframe, 0-> not
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    int key_frame;
-
-    /**
-     * Picture type of the frame, see ?_TYPE below.
-     * - encoding: Set by libavcodec. for coded_picture (and set by user for input).
-     * - decoding: Set by libavcodec.
-     */
-    enum AVPictureType pict_type;
-
-    /**
-     * presentation timestamp in time_base units (time when frame should be shown to user)
-     * If AV_NOPTS_VALUE then frame_rate = 1/time_base will be assumed.
-     * - encoding: MUST be set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int64_t pts;
-
-    /**
-     * picture number in bitstream order
-     * - encoding: set by
-     * - decoding: Set by libavcodec.
-     */
-    int coded_picture_number;
-    /**
-     * picture number in display order
-     * - encoding: set by
-     * - decoding: Set by libavcodec.
-     */
-    int display_picture_number;
-
-    /**
-     * quality (between 1 (good) and FF_LAMBDA_MAX (bad))
-     * - encoding: Set by libavcodec. for coded_picture (and set by user for input).
-     * - decoding: Set by libavcodec.
-     */
-    int quality;
-
-#if FF_API_AVFRAME_AGE
-    /**
-     * @deprecated unused
-     */
-    attribute_deprecated int age;
-#endif
-
-    /**
-     * is this picture used as reference
-     * The values for this are the same as the MpegEncContext.picture_structure
-     * variable, that is 1->top field, 2->bottom field, 3->frame/both fields.
-     * Set to 4 for delayed, non-reference frames.
-     * - encoding: unused
-     * - decoding: Set by libavcodec. (before get_buffer() call)).
-     */
-    int reference;
-
-    /**
-     * QP table
-     * - encoding: unused
-     * - decoding: Set by libavcodec.
-     */
-    int8_t *qscale_table;
-    /**
-     * QP store stride
-     * - encoding: unused
-     * - decoding: Set by libavcodec.
-     */
-    int qstride;
-
-    /**
-     * mbskip_table[mb]>=1 if MB didn't change
-     * stride= mb_width = (width+15)>>4
-     * - encoding: unused
-     * - decoding: Set by libavcodec.
-     */
-    uint8_t *mbskip_table;
-
-    /**
-     * motion vector table
-     * @code
-     * example:
-     * int mv_sample_log2= 4 - motion_subsample_log2;
-     * int mb_width= (width+15)>>4;
-     * int mv_stride= (mb_width << mv_sample_log2) + 1;
-     * motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y];
-     * @endcode
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int16_t (*motion_val[2])[2];
-
-    /**
-     * macroblock type table
-     * mb_type_base + mb_width + 2
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    uint32_t *mb_type;
-
-    /**
-     * log2 of the size of the block which a single vector in motion_val represents:
-     * (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2)
-     * - encoding: unused
-     * - decoding: Set by libavcodec.
-     */
-    uint8_t motion_subsample_log2;
-
-    /**
-     * for some private data of the user
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    void *opaque;
-
-    /**
-     * error
-     * - encoding: Set by libavcodec. if flags&CODEC_FLAG_PSNR.
-     * - decoding: unused
-     */
-    uint64_t error[AV_NUM_DATA_POINTERS];
-
-    /**
-     * type of the buffer (to keep track of who has to deallocate data[*])
-     * - encoding: Set by the one who allocates it.
-     * - decoding: Set by the one who allocates it.
-     * Note: User allocated (direct rendering) & internal buffers cannot coexist currently.
-     */
-    int type;
-
-    /**
-     * When decoding, this signals how much the picture must be delayed.
-     * extra_delay = repeat_pict / (2*fps)
-     * - encoding: unused
-     * - decoding: Set by libavcodec.
-     */
-    int repeat_pict;
-
-    /**
-     *
-     */
-    int qscale_type;
-
-    /**
-     * The content of the picture is interlaced.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec. (default 0)
-     */
-    int interlaced_frame;
-
-    /**
-     * If the content is interlaced, is top field displayed first.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int top_field_first;
-
-    /**
-     * Pan scan.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    AVPanScan *pan_scan;
-
-    /**
-     * Tell user application that palette has changed from previous frame.
-     * - encoding: ??? (no palette-enabled encoder yet)
-     * - decoding: Set by libavcodec. (default 0).
-     */
-    int palette_has_changed;
-
-    /**
-     * codec suggestion on buffer type if != 0
-     * - encoding: unused
-     * - decoding: Set by libavcodec. (before get_buffer() call)).
-     */
-    int buffer_hints;
-
-    /**
-     * DCT coefficients
-     * - encoding: unused
-     * - decoding: Set by libavcodec.
-     */
-    short *dct_coeff;
-
-    /**
-     * motion reference frame index
-     * the order in which these are stored can depend on the codec.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int8_t *ref_index[2];
-
-    /**
-     * reordered opaque 64bit (generally an integer or a double precision float
-     * PTS but can be anything).
-     * The user sets AVCodecContext.reordered_opaque to represent the input at
-     * that time,
-     * the decoder reorders values as needed and sets AVFrame.reordered_opaque
-     * to exactly one of the values provided by the user through AVCodecContext.reordered_opaque
-     * @deprecated in favor of pkt_pts
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    int64_t reordered_opaque;
-
-    /**
-     * hardware accelerator private data (Libav-allocated)
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    void *hwaccel_picture_private;
-
-    /**
-     * reordered pts from the last AVPacket that has been input into the decoder
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    int64_t pkt_pts;
-
-    /**
-     * dts from the last AVPacket that has been input into the decoder
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    int64_t pkt_dts;
-
-    /**
-     * the AVCodecContext which ff_thread_get_buffer() was last called on
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    struct AVCodecContext *owner;
-
-    /**
-     * used by multithreading to store frame-specific info
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    void *thread_opaque;
-
-    /**
-     * number of audio samples (per channel) described by this frame
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    int nb_samples;
-
-    /**
-     * pointers to the data planes/channels.
-     *
-     * For video, this should simply point to data[].
-     *
-     * For planar audio, each channel has a separate data pointer, and
-     * linesize[0] contains the size of each channel buffer.
-     * For packed audio, there is just one data pointer, and linesize[0]
-     * contains the total size of the buffer for all channels.
-     *
-     * Note: Both data and extended_data will always be set by get_buffer(),
-     * but for planar audio with more channels that can fit in data,
-     * extended_data must be used by the decoder in order to access all
-     * channels.
-     *
-     * encoding: unused
-     * decoding: set by AVCodecContext.get_buffer()
-     */
-    uint8_t **extended_data;
-
-    /**
-     * sample aspect ratio for the video frame, 0/1 if unknown\unspecified
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    AVRational sample_aspect_ratio;
-
-    /**
-     * width and height of the video frame
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    int width, height;
-
-    /**
-     * format of the frame, -1 if unknown or unset
-     * Values correspond to enum PixelFormat for video frames,
-     * enum AVSampleFormat for audio)
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    int format;
-} AVFrame;
-
-struct AVCodecInternal;
-
-enum AVFieldOrder {
-    AV_FIELD_UNKNOWN,
-    AV_FIELD_PROGRESSIVE,
-    AV_FIELD_TT,          //< Top coded_first, top displayed first
-    AV_FIELD_BB,          //< Bottom coded first, bottom displayed first
-    AV_FIELD_TB,          //< Top coded first, bottom displayed first
-    AV_FIELD_BT,          //< Bottom coded first, top displayed first
-};
-
-/**
- * main external API structure.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVCodecContext) must not be used outside libav*.
- */
-typedef struct AVCodecContext {
-    /**
-     * information on struct for av_log
-     * - set by avcodec_alloc_context3
-     */
-    const AVClass *av_class;
-    /**
-     * the average bitrate
-     * - encoding: Set by user; unused for constant quantizer encoding.
-     * - decoding: Set by libavcodec. 0 or some bitrate if this info is available in the stream.
-     */
-    int bit_rate;
-
-    /**
-     * number of bits the bitstream is allowed to diverge from the reference.
-     *           the reference can be CBR (for CBR pass1) or VBR (for pass2)
-     * - encoding: Set by user; unused for constant quantizer encoding.
-     * - decoding: unused
-     */
-    int bit_rate_tolerance;
-
-    /**
-     * CODEC_FLAG_*.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int flags;
-
-    /**
-     * Some codecs need additional format info. It is stored here.
-     * If any muxer uses this then ALL demuxers/parsers AND encoders for the
-     * specific codec MUST set it correctly otherwise stream copy breaks.
-     * In general use of this field by muxers is not recommended.
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec. (FIXME: Is this OK?)
-     */
-    int sub_id;
-
-    /**
-     * Motion estimation algorithm used for video coding.
-     * 1 (zero), 2 (full), 3 (log), 4 (phods), 5 (epzs), 6 (x1), 7 (hex),
-     * 8 (umh), 9 (iter), 10 (tesa) [7, 8, 10 are x264 specific, 9 is snow specific]
-     * - encoding: MUST be set by user.
-     * - decoding: unused
-     */
-    int me_method;
-
-    /**
-     * some codecs need / can use extradata like Huffman tables.
-     * mjpeg: Huffman tables
-     * rv10: additional flags
-     * mpeg4: global headers (they can be in the bitstream or here)
-     * The allocated memory should be FF_INPUT_BUFFER_PADDING_SIZE bytes larger
-     * than extradata_size to avoid prolems if it is read with the bitstream reader.
-     * The bytewise contents of extradata must not depend on the architecture or CPU endianness.
-     * - encoding: Set/allocated/freed by libavcodec.
-     * - decoding: Set/allocated/freed by user.
-     */
-    uint8_t *extradata;
-    int extradata_size;
-
-    /**
-     * This is the fundamental unit of time (in seconds) in terms
-     * of which frame timestamps are represented. For fixed-fps content,
-     * timebase should be 1/framerate and timestamp increments should be
-     * identically 1.
-     * - encoding: MUST be set by user.
-     * - decoding: Set by libavcodec.
-     */
-    AVRational time_base;
-
-    /* video only */
-    /**
-     * picture width / height.
-     * - encoding: MUST be set by user.
-     * - decoding: Set by libavcodec.
-     * Note: For compatibility it is possible to set this instead of
-     * coded_width/height before decoding.
-     */
-    int width, height;
-
-#define FF_ASPECT_EXTENDED 15
-
-    /**
-     * the number of pictures in a group of pictures, or 0 for intra_only
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int gop_size;
-
-    /**
-     * Pixel format, see PIX_FMT_xxx.
-     * May be set by the demuxer if known from headers.
-     * May be overriden by the decoder if it knows better.
-     * - encoding: Set by user.
-     * - decoding: Set by user if known, overridden by libavcodec if known
-     */
-    enum PixelFormat pix_fmt;
-
-    /**
-     * If non NULL, 'draw_horiz_band' is called by the libavcodec
-     * decoder to draw a horizontal band. It improves cache usage. Not
-     * all codecs can do that. You must check the codec capabilities
-     * beforehand.
-     * When multithreading is used, it may be called from multiple threads
-     * at the same time; threads might draw different parts of the same AVFrame,
-     * or multiple AVFrames, and there is no guarantee that slices will be drawn
-     * in order.
-     * The function is also used by hardware acceleration APIs.
-     * It is called at least once during frame decoding to pass
-     * the data needed for hardware render.
-     * In that mode instead of pixel data, AVFrame points to
-     * a structure specific to the acceleration API. The application
-     * reads the structure and can change some fields to indicate progress
-     * or mark state.
-     * - encoding: unused
-     * - decoding: Set by user.
-     * @param height the height of the slice
-     * @param y the y position of the slice
-     * @param type 1->top field, 2->bottom field, 3->frame
-     * @param offset offset into the AVFrame.data from which the slice should be read
-     */
-    void (*draw_horiz_band)(struct AVCodecContext *s,
-                            const AVFrame *src, int offset[AV_NUM_DATA_POINTERS],
-                            int y, int type, int height);
-
-    /* audio only */
-    int sample_rate; ///< samples per second
-    int channels;    ///< number of audio channels
-
-    /**
-     * audio sample format
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    enum AVSampleFormat sample_fmt;  ///< sample format
-
-    /* The following data should not be initialized. */
-    /**
-     * Samples per packet, initialized when calling 'init'.
-     */
-    int frame_size;
-    int frame_number;   ///< audio or video frame number
-
-    /**
-     * Number of frames the decoded output will be delayed relative to
-     * the encoded input.
-     * - encoding: Set by libavcodec.
-     * - decoding: unused
-     */
-    int delay;
-
-    /* - encoding parameters */
-    float qcompress;  ///< amount of qscale change between easy & hard scenes (0.0-1.0)
-    float qblur;      ///< amount of qscale smoothing over time (0.0-1.0)
-
-    /**
-     * minimum quantizer
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int qmin;
-
-    /**
-     * maximum quantizer
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int qmax;
-
-    /**
-     * maximum quantizer difference between frames
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int max_qdiff;
-
-    /**
-     * maximum number of B-frames between non-B-frames
-     * Note: The output will be delayed by max_b_frames+1 relative to the input.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int max_b_frames;
-
-    /**
-     * qscale factor between IP and B-frames
-     * If > 0 then the last P-frame quantizer will be used (q= lastp_q*factor+offset).
-     * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float b_quant_factor;
-
-    /** obsolete FIXME remove */
-    int rc_strategy;
-#define FF_RC_STRATEGY_XVID 1
-
-    int b_frame_strategy;
-
-    struct AVCodec *codec;
-
-    void *priv_data;
-
-    int rtp_payload_size;   /* The size of the RTP payload: the coder will  */
-                            /* do its best to deliver a chunk with size     */
-                            /* below rtp_payload_size, the chunk will start */
-                            /* with a start code on some codecs like H.263. */
-                            /* This doesn't take account of any particular  */
-                            /* headers inside the transmitted RTP payload.  */
-
-
-    /* The RTP callback: This function is called    */
-    /* every time the encoder has a packet to send. */
-    /* It depends on the encoder if the data starts */
-    /* with a Start Code (it should). H.263 does.   */
-    /* mb_nb contains the number of macroblocks     */
-    /* encoded in the RTP payload.                  */
-    void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb);
-
-    /* statistics, used for 2-pass encoding */
-    int mv_bits;
-    int header_bits;
-    int i_tex_bits;
-    int p_tex_bits;
-    int i_count;
-    int p_count;
-    int skip_count;
-    int misc_bits;
-
-    /**
-     * number of bits used for the previously encoded frame
-     * - encoding: Set by libavcodec.
-     * - decoding: unused
-     */
-    int frame_bits;
-
-    /**
-     * Private data of the user, can be used to carry app specific stuff.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    void *opaque;
-
-    char codec_name[32];
-    enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
-    enum CodecID codec_id; /* see CODEC_ID_xxx */
-
-    /**
-     * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
-     * This is used to work around some encoder bugs.
-     * A demuxer should set this to what is stored in the field used to identify the codec.
-     * If there are multiple such fields in a container then the demuxer should choose the one
-     * which maximizes the information about the used codec.
-     * If the codec tag field in a container is larger than 32 bits then the demuxer should
-     * remap the longer ID to 32 bits with a table or other structure. Alternatively a new
-     * extra_codec_tag + size could be added but for this a clear advantage must be demonstrated
-     * first.
-     * - encoding: Set by user, if not then the default based on codec_id will be used.
-     * - decoding: Set by user, will be converted to uppercase by libavcodec during init.
-     */
-    unsigned int codec_tag;
-
-    /**
-     * Work around bugs in encoders which sometimes cannot be detected automatically.
-     * - encoding: Set by user
-     * - decoding: Set by user
-     */
-    int workaround_bugs;
-#define FF_BUG_AUTODETECT       1  ///< autodetection
-#define FF_BUG_OLD_MSMPEG4      2
-#define FF_BUG_XVID_ILACE       4
-#define FF_BUG_UMP4             8
-#define FF_BUG_NO_PADDING       16
-#define FF_BUG_AMV              32
-#define FF_BUG_AC_VLC           0  ///< Will be removed, libavcodec can now handle these non-compliant files by default.
-#define FF_BUG_QPEL_CHROMA      64
-#define FF_BUG_STD_QPEL         128
-#define FF_BUG_QPEL_CHROMA2     256
-#define FF_BUG_DIRECT_BLOCKSIZE 512
-#define FF_BUG_EDGE             1024
-#define FF_BUG_HPEL_CHROMA      2048
-#define FF_BUG_DC_CLIP          4096
-#define FF_BUG_MS               8192 ///< Work around various bugs in Microsoft's broken decoders.
-#define FF_BUG_TRUNCATED       16384
-//#define FF_BUG_FAKE_SCALABILITY 16 //Autodetection should work 100%.
-
-    /**
-     * luma single coefficient elimination threshold
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int luma_elim_threshold;
-
-    /**
-     * chroma single coeff elimination threshold
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int chroma_elim_threshold;
-
-    /**
-     * strictly follow the standard (MPEG4, ...).
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     * Setting this to STRICT or higher means the encoder and decoder will
-     * generally do stupid things, whereas setting it to unofficial or lower
-     * will mean the encoder might produce output that is not supported by all
-     * spec-compliant decoders. Decoders don't differentiate between normal,
-     * unofficial and experimental (that is, they always try to decode things
-     * when they can) unless they are explicitly asked to behave stupidly
-     * (=strictly conform to the specs)
-     */
-    int strict_std_compliance;
-#define FF_COMPLIANCE_VERY_STRICT   2 ///< Strictly conform to an older more strict version of the spec or reference software.
-#define FF_COMPLIANCE_STRICT        1 ///< Strictly conform to all the things in the spec no matter what consequences.
-#define FF_COMPLIANCE_NORMAL        0
-#define FF_COMPLIANCE_UNOFFICIAL   -1 ///< Allow unofficial extensions
-#define FF_COMPLIANCE_EXPERIMENTAL -2 ///< Allow nonstandardized experimental things.
-
-    /**
-     * qscale offset between IP and B-frames
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float b_quant_offset;
-
-#if FF_API_ER
-    /**
-     * Error recognition; higher values will detect more errors but may
-     * misdetect some more or less valid parts as errors.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    attribute_deprecated int error_recognition;
-#define FF_ER_CAREFUL         1
-#define FF_ER_COMPLIANT       2
-#define FF_ER_AGGRESSIVE      3
-#define FF_ER_VERY_AGGRESSIVE 4
-#define FF_ER_EXPLODE         5
-#endif /* FF_API_ER */
-
-    /**
-     * Called at the beginning of each frame to get a buffer for it.
-     *
-     * The function will set AVFrame.data[], AVFrame.linesize[].
-     * AVFrame.extended_data[] must also be set, but it should be the same as
-     * AVFrame.data[] except for planar audio with more channels than can fit
-     * in AVFrame.data[]. In that case, AVFrame.data[] shall still contain as
-     * many data pointers as it can hold.
-     *
-     * if CODEC_CAP_DR1 is not set then get_buffer() must call
-     * avcodec_default_get_buffer() instead of providing buffers allocated by
-     * some other means.
-     *
-     * AVFrame.data[] should be 32- or 16-byte-aligned unless the CPU doesn't
-     * need it. avcodec_default_get_buffer() aligns the output buffer properly,
-     * but if get_buffer() is overridden then alignment considerations should
-     * be taken into account.
-     *
-     * @see avcodec_default_get_buffer()
-     *
-     * Video:
-     *
-     * If pic.reference is set then the frame will be read later by libavcodec.
-     * avcodec_align_dimensions2() should be used to find the required width and
-     * height, as they normally need to be rounded up to the next multiple of 16.
-     *
-     * If frame multithreading is used and thread_safe_callbacks is set,
-     * it may be called from a different thread, but not from more than one at
-     * once. Does not need to be reentrant.
-     *
-     * @see release_buffer(), reget_buffer()
-     * @see avcodec_align_dimensions2()
-     *
-     * Audio:
-     *
-     * Decoders request a buffer of a particular size by setting
-     * AVFrame.nb_samples prior to calling get_buffer(). The decoder may,
-     * however, utilize only part of the buffer by setting AVFrame.nb_samples
-     * to a smaller value in the output frame.
-     *
-     * Decoders cannot use the buffer after returning from
-     * avcodec_decode_audio4(), so they will not call release_buffer(), as it
-     * is assumed to be released immediately upon return.
-     *
-     * As a convenience, av_samples_get_buffer_size() and
-     * av_samples_fill_arrays() in libavutil may be used by custom get_buffer()
-     * functions to find the required data size and to fill data pointers and
-     * linesize. In AVFrame.linesize, only linesize[0] may be set for audio
-     * since all planes must be the same size.
-     *
-     * @see av_samples_get_buffer_size(), av_samples_fill_arrays()
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec, user can override.
-     */
-    int (*get_buffer)(struct AVCodecContext *c, AVFrame *pic);
-
-    /**
-     * Called to release buffers which were allocated with get_buffer.
-     * A released buffer can be reused in get_buffer().
-     * pic.data[*] must be set to NULL.
-     * May be called from a different thread if frame multithreading is used,
-     * but not by more than one thread at once, so does not need to be reentrant.
-     * - encoding: unused
-     * - decoding: Set by libavcodec, user can override.
-     */
-    void (*release_buffer)(struct AVCodecContext *c, AVFrame *pic);
-
-    /**
-     * Size of the frame reordering buffer in the decoder.
-     * For MPEG-2 it is 1 IPB or 0 low delay IP.
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    int has_b_frames;
-
-    /**
-     * number of bytes per packet if constant and known or 0
-     * Used by some WAV based audio codecs.
-     */
-    int block_align;
-
-#if FF_API_PARSE_FRAME
-    /**
-     * If true, only parsing is done. The frame data is returned.
-     * Only MPEG audio decoders support this now.
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    attribute_deprecated int parse_only;
-#endif
-
-    /**
-     * 0-> h263 quant 1-> mpeg quant
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mpeg_quant;
-
-    /**
-     * pass1 encoding statistics output buffer
-     * - encoding: Set by libavcodec.
-     * - decoding: unused
-     */
-    char *stats_out;
-
-    /**
-     * pass2 encoding statistics input buffer
-     * Concatenated stuff from stats_out of pass1 should be placed here.
-     * - encoding: Allocated/set/freed by user.
-     * - decoding: unused
-     */
-    char *stats_in;
-
-    /**
-     * ratecontrol qmin qmax limiting method
-     * 0-> clipping, 1-> use a nice continous function to limit qscale wthin qmin/qmax.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float rc_qsquish;
-
-    float rc_qmod_amp;
-    int rc_qmod_freq;
-
-    /**
-     * ratecontrol override, see RcOverride
-     * - encoding: Allocated/set/freed by user.
-     * - decoding: unused
-     */
-    RcOverride *rc_override;
-    int rc_override_count;
-
-    /**
-     * rate control equation
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    const char *rc_eq;
-
-    /**
-     * maximum bitrate
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rc_max_rate;
-
-    /**
-     * minimum bitrate
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rc_min_rate;
-
-    /**
-     * decoder bitstream buffer size
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rc_buffer_size;
-    float rc_buffer_aggressivity;
-
-    /**
-     * qscale factor between P and I-frames
-     * If > 0 then the last p frame quantizer will be used (q= lastp_q*factor+offset).
-     * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float i_quant_factor;
-
-    /**
-     * qscale offset between P and I-frames
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float i_quant_offset;
-
-    /**
-     * initial complexity for pass1 ratecontrol
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float rc_initial_cplx;
-
-    /**
-     * DCT algorithm, see FF_DCT_* below
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int dct_algo;
-#define FF_DCT_AUTO    0
-#define FF_DCT_FASTINT 1
-#define FF_DCT_INT     2
-#define FF_DCT_MMX     3
-#define FF_DCT_MLIB    4
-#define FF_DCT_ALTIVEC 5
-#define FF_DCT_FAAN    6
-
-    /**
-     * luminance masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float lumi_masking;
-
-    /**
-     * temporary complexity masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float temporal_cplx_masking;
-
-    /**
-     * spatial complexity masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float spatial_cplx_masking;
-
-    /**
-     * p block masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float p_masking;
-
-    /**
-     * darkness masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float dark_masking;
-
-    /**
-     * IDCT algorithm, see FF_IDCT_* below.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int idct_algo;
-#define FF_IDCT_AUTO          0
-#define FF_IDCT_INT           1
-#define FF_IDCT_SIMPLE        2
-#define FF_IDCT_SIMPLEMMX     3
-#define FF_IDCT_LIBMPEG2MMX   4
-#define FF_IDCT_PS2           5
-#define FF_IDCT_MLIB          6
-#define FF_IDCT_ARM           7
-#define FF_IDCT_ALTIVEC       8
-#define FF_IDCT_SH4           9
-#define FF_IDCT_SIMPLEARM     10
-#define FF_IDCT_H264          11
-#define FF_IDCT_VP3           12
-#define FF_IDCT_IPP           13
-#define FF_IDCT_XVIDMMX       14
-#define FF_IDCT_CAVS          15
-#define FF_IDCT_SIMPLEARMV5TE 16
-#define FF_IDCT_SIMPLEARMV6   17
-#define FF_IDCT_SIMPLEVIS     18
-#define FF_IDCT_WMV2          19
-#define FF_IDCT_FAAN          20
-#define FF_IDCT_EA            21
-#define FF_IDCT_SIMPLENEON    22
-#define FF_IDCT_SIMPLEALPHA   23
-#define FF_IDCT_BINK          24
-
-    /**
-     * slice count
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by user (or 0).
-     */
-    int slice_count;
-    /**
-     * slice offsets in the frame in bytes
-     * - encoding: Set/allocated by libavcodec.
-     * - decoding: Set/allocated by user (or NULL).
-     */
-    int *slice_offset;
-
-    /**
-     * error concealment flags
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int error_concealment;
-#define FF_EC_GUESS_MVS   1
-#define FF_EC_DEBLOCK     2
-
-    /**
-     * dsp_mask could be add used to disable unwanted CPU features
-     * CPU features (i.e. MMX, SSE. ...)
-     *
-     * With the FORCE flag you may instead enable given CPU features.
-     * (Dangerous: Usable in case of misdetection, improper usage however will
-     * result into program crash.)
-     */
-    unsigned dsp_mask;
-
-    /**
-     * bits per sample/pixel from the demuxer (needed for huffyuv).
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by user.
-     */
-     int bits_per_coded_sample;
-
-    /**
-     * prediction method (needed for huffyuv)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-     int prediction_method;
-#define FF_PRED_LEFT   0
-#define FF_PRED_PLANE  1
-#define FF_PRED_MEDIAN 2
-
-    /**
-     * sample aspect ratio (0 if unknown)
-     * That is the width of a pixel divided by the height of the pixel.
-     * Numerator and denominator must be relatively prime and smaller than 256 for some video standards.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    AVRational sample_aspect_ratio;
-
-    /**
-     * the picture in the bitstream
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    AVFrame *coded_frame;
-
-    /**
-     * debug
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int debug;
-#define FF_DEBUG_PICT_INFO   1
-#define FF_DEBUG_RC          2
-#define FF_DEBUG_BITSTREAM   4
-#define FF_DEBUG_MB_TYPE     8
-#define FF_DEBUG_QP          16
-#define FF_DEBUG_MV          32
-#define FF_DEBUG_DCT_COEFF   0x00000040
-#define FF_DEBUG_SKIP        0x00000080
-#define FF_DEBUG_STARTCODE   0x00000100
-#define FF_DEBUG_PTS         0x00000200
-#define FF_DEBUG_ER          0x00000400
-#define FF_DEBUG_MMCO        0x00000800
-#define FF_DEBUG_BUGS        0x00001000
-#define FF_DEBUG_VIS_QP      0x00002000
-#define FF_DEBUG_VIS_MB_TYPE 0x00004000
-#define FF_DEBUG_BUFFERS     0x00008000
-#define FF_DEBUG_THREADS     0x00010000
-
-    /**
-     * debug
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int debug_mv;
-#define FF_DEBUG_VIS_MV_P_FOR  0x00000001 //visualize forward predicted MVs of P frames
-#define FF_DEBUG_VIS_MV_B_FOR  0x00000002 //visualize forward predicted MVs of B frames
-#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
-
-    /**
-     * error
-     * - encoding: Set by libavcodec if flags&CODEC_FLAG_PSNR.
-     * - decoding: unused
-     */
-    uint64_t error[AV_NUM_DATA_POINTERS];
-
-    /**
-     * motion estimation comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_cmp;
-    /**
-     * subpixel motion estimation comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_sub_cmp;
-    /**
-     * macroblock comparison function (not supported yet)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_cmp;
-    /**
-     * interlaced DCT comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int ildct_cmp;
-#define FF_CMP_SAD    0
-#define FF_CMP_SSE    1
-#define FF_CMP_SATD   2
-#define FF_CMP_DCT    3
-#define FF_CMP_PSNR   4
-#define FF_CMP_BIT    5
-#define FF_CMP_RD     6
-#define FF_CMP_ZERO   7
-#define FF_CMP_VSAD   8
-#define FF_CMP_VSSE   9
-#define FF_CMP_NSSE   10
-#define FF_CMP_W53    11
-#define FF_CMP_W97    12
-#define FF_CMP_DCTMAX 13
-#define FF_CMP_DCT264 14
-#define FF_CMP_CHROMA 256
-
-    /**
-     * ME diamond size & shape
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int dia_size;
-
-    /**
-     * amount of previous MV predictors (2a+1 x 2a+1 square)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int last_predictor_count;
-
-    /**
-     * prepass for motion estimation
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int pre_me;
-
-    /**
-     * motion estimation prepass comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_pre_cmp;
-
-    /**
-     * ME prepass diamond size & shape
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int pre_dia_size;
-
-    /**
-     * subpel ME quality
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_subpel_quality;
-
-    /**
-     * callback to negotiate the pixelFormat
-     * @param fmt is the list of formats which are supported by the codec,
-     * it is terminated by -1 as 0 is a valid format, the formats are ordered by quality.
-     * The first is always the native one.
-     * @return the chosen format
-     * - encoding: unused
-     * - decoding: Set by user, if not set the native format will be chosen.
-     */
-    enum PixelFormat (*get_format)(struct AVCodecContext *s, const enum PixelFormat * fmt);
-
-    /**
-     * DTG active format information (additional aspect ratio
-     * information only used in DVB MPEG-2 transport streams)
-     * 0 if not set.
-     *
-     * - encoding: unused
-     * - decoding: Set by decoder.
-     */
-    int dtg_active_format;
-#define FF_DTG_AFD_SAME         8
-#define FF_DTG_AFD_4_3          9
-#define FF_DTG_AFD_16_9         10
-#define FF_DTG_AFD_14_9         11
-#define FF_DTG_AFD_4_3_SP_14_9  13
-#define FF_DTG_AFD_16_9_SP_14_9 14
-#define FF_DTG_AFD_SP_4_3       15
-
-    /**
-     * maximum motion estimation search range in subpel units
-     * If 0 then no limit.
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_range;
-
-    /**
-     * intra quantizer bias
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int intra_quant_bias;
-#define FF_DEFAULT_QUANT_BIAS 999999
-
-    /**
-     * inter quantizer bias
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int inter_quant_bias;
-
-    /**
-     * color table ID
-     * - encoding: unused
-     * - decoding: Which clrtable should be used for 8bit RGB images.
-     *             Tables have to be stored somewhere. FIXME
-     */
-    int color_table_id;
-
-#if FF_API_INTERNAL_CONTEXT
-    /**
-     * internal_buffer count
-     * Don't touch, used by libavcodec default_get_buffer().
-     * @deprecated this field was moved to an internal context
-     */
-    attribute_deprecated int internal_buffer_count;
-
-    /**
-     * internal_buffers
-     * Don't touch, used by libavcodec default_get_buffer().
-     * @deprecated this field was moved to an internal context
-     */
-    attribute_deprecated void *internal_buffer;
-#endif
-
-    /**
-     * Global quality for codecs which cannot change it per frame.
-     * This should be proportional to MPEG-1/2/4 qscale.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int global_quality;
-
-#define FF_CODER_TYPE_VLC       0
-#define FF_CODER_TYPE_AC        1
-#define FF_CODER_TYPE_RAW       2
-#define FF_CODER_TYPE_RLE       3
-#define FF_CODER_TYPE_DEFLATE   4
-    /**
-     * coder type
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int coder_type;
-
-    /**
-     * context model
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int context_model;
-#if 0
-    /**
-     *
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    uint8_t * (*realloc)(struct AVCodecContext *s, uint8_t *buf, int buf_size);
-#endif
-
-    /**
-     * slice flags
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int slice_flags;
-#define SLICE_FLAG_CODED_ORDER    0x0001 ///< draw_horiz_band() is called in coded order instead of display
-#define SLICE_FLAG_ALLOW_FIELD    0x0002 ///< allow draw_horiz_band() with field slices (MPEG2 field pics)
-#define SLICE_FLAG_ALLOW_PLANE    0x0004 ///< allow draw_horiz_band() with 1 component at a time (SVQ1)
-
-    /**
-     * XVideo Motion Acceleration
-     * - encoding: forbidden
-     * - decoding: set by decoder
-     */
-    int xvmc_acceleration;
-
-    /**
-     * macroblock decision mode
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_decision;
-#define FF_MB_DECISION_SIMPLE 0        ///< uses mb_cmp
-#define FF_MB_DECISION_BITS   1        ///< chooses the one which needs the fewest bits
-#define FF_MB_DECISION_RD     2        ///< rate distortion
-
-    /**
-     * custom intra quantization matrix
-     * - encoding: Set by user, can be NULL.
-     * - decoding: Set by libavcodec.
-     */
-    uint16_t *intra_matrix;
-
-    /**
-     * custom inter quantization matrix
-     * - encoding: Set by user, can be NULL.
-     * - decoding: Set by libavcodec.
-     */
-    uint16_t *inter_matrix;
-
-    /**
-     * fourcc from the AVI stream header (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
-     * This is used to work around some encoder bugs.
-     * - encoding: unused
-     * - decoding: Set by user, will be converted to uppercase by libavcodec during init.
-     */
-    unsigned int stream_codec_tag;
-
-    /**
-     * scene change detection threshold
-     * 0 is default, larger means fewer detected scene changes.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int scenechange_threshold;
-
-    /**
-     * minimum Lagrange multipler
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int lmin;
-
-    /**
-     * maximum Lagrange multipler
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int lmax;
-
-#if FF_API_PALETTE_CONTROL
-    /**
-     * palette control structure
-     * - encoding: ??? (no palette-enabled encoder yet)
-     * - decoding: Set by user.
-     */
-    struct AVPaletteControl *palctrl;
-#endif
-
-    /**
-     * noise reduction strength
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int noise_reduction;
-
-    /**
-     * Called at the beginning of a frame to get cr buffer for it.
-     * Buffer type (size, hints) must be the same. libavcodec won't check it.
-     * libavcodec will pass previous buffer in pic, function should return
-     * same buffer or new buffer with old frame "painted" into it.
-     * If pic.data[0] == NULL must behave like get_buffer().
-     * if CODEC_CAP_DR1 is not set then reget_buffer() must call
-     * avcodec_default_reget_buffer() instead of providing buffers allocated by
-     * some other means.
-     * - encoding: unused
-     * - decoding: Set by libavcodec, user can override.
-     */
-    int (*reget_buffer)(struct AVCodecContext *c, AVFrame *pic);
-
-    /**
-     * Number of bits which should be loaded into the rc buffer before decoding starts.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rc_initial_buffer_occupancy;
-
-    /**
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int inter_threshold;
-
-    /**
-     * CODEC_FLAG2_*
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int flags2;
-
-    /**
-     * Simulates errors in the bitstream to test error concealment.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int error_rate;
-
-#if FF_API_ANTIALIAS_ALGO
-    /**
-     * MP3 antialias algorithm, see FF_AA_* below.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    attribute_deprecated int antialias_algo;
-#define FF_AA_AUTO    0
-#define FF_AA_FASTINT 1 //not implemented yet
-#define FF_AA_INT     2
-#define FF_AA_FLOAT   3
-#endif
-
-    /**
-     * quantizer noise shaping
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int quantizer_noise_shaping;
-
-    /**
-     * thread count
-     * is used to decide how many independent tasks should be passed to execute()
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int thread_count;
-
-    /**
-     * The codec may call this to execute several independent things.
-     * It will return only after finishing all tasks.
-     * The user may replace this with some multithreaded implementation,
-     * the default implementation will execute the parts serially.
-     * @param count the number of things to execute
-     * - encoding: Set by libavcodec, user can override.
-     * - decoding: Set by libavcodec, user can override.
-     */
-    int (*execute)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg), void *arg2, int *ret, int count, int size);
-
-    /**
-     * thread opaque
-     * Can be used by execute() to store some per AVCodecContext stuff.
-     * - encoding: set by execute()
-     * - decoding: set by execute()
-     */
-    void *thread_opaque;
-
-    /**
-     * Motion estimation threshold below which no motion estimation is
-     * performed, but instead the user specified motion vectors are used.
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-     int me_threshold;
-
-    /**
-     * Macroblock threshold below which the user specified macroblock types will be used.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-     int mb_threshold;
-
-    /**
-     * precision of the intra DC coefficient - 8
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-     int intra_dc_precision;
-
-    /**
-     * noise vs. sse weight for the nsse comparsion function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-     int nsse_weight;
-
-    /**
-     * Number of macroblock rows at the top which are skipped.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-     int skip_top;
-
-    /**
-     * Number of macroblock rows at the bottom which are skipped.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-     int skip_bottom;
-
-    /**
-     * profile
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-     int profile;
-#define FF_PROFILE_UNKNOWN -99
-#define FF_PROFILE_RESERVED -100
-
-#define FF_PROFILE_AAC_MAIN 0
-#define FF_PROFILE_AAC_LOW  1
-#define FF_PROFILE_AAC_SSR  2
-#define FF_PROFILE_AAC_LTP  3
-
-#define FF_PROFILE_DTS         20
-#define FF_PROFILE_DTS_ES      30
-#define FF_PROFILE_DTS_96_24   40
-#define FF_PROFILE_DTS_HD_HRA  50
-#define FF_PROFILE_DTS_HD_MA   60
-
-#define FF_PROFILE_MPEG2_422    0
-#define FF_PROFILE_MPEG2_HIGH   1
-#define FF_PROFILE_MPEG2_SS     2
-#define FF_PROFILE_MPEG2_SNR_SCALABLE  3
-#define FF_PROFILE_MPEG2_MAIN   4
-#define FF_PROFILE_MPEG2_SIMPLE 5
-
-#define FF_PROFILE_H264_CONSTRAINED  (1<<9)  // 8+1; constraint_set1_flag
-#define FF_PROFILE_H264_INTRA        (1<<11) // 8+3; constraint_set3_flag
-
-#define FF_PROFILE_H264_BASELINE             66
-#define FF_PROFILE_H264_CONSTRAINED_BASELINE (66|FF_PROFILE_H264_CONSTRAINED)
-#define FF_PROFILE_H264_MAIN                 77
-#define FF_PROFILE_H264_EXTENDED             88
-#define FF_PROFILE_H264_HIGH                 100
-#define FF_PROFILE_H264_HIGH_10              110
-#define FF_PROFILE_H264_HIGH_10_INTRA        (110|FF_PROFILE_H264_INTRA)
-#define FF_PROFILE_H264_HIGH_422             122
-#define FF_PROFILE_H264_HIGH_422_INTRA       (122|FF_PROFILE_H264_INTRA)
-#define FF_PROFILE_H264_HIGH_444             144
-#define FF_PROFILE_H264_HIGH_444_PREDICTIVE  244
-#define FF_PROFILE_H264_HIGH_444_INTRA       (244|FF_PROFILE_H264_INTRA)
-#define FF_PROFILE_H264_CAVLC_444            44
-
-#define FF_PROFILE_VC1_SIMPLE   0
-#define FF_PROFILE_VC1_MAIN     1
-#define FF_PROFILE_VC1_COMPLEX  2
-#define FF_PROFILE_VC1_ADVANCED 3
-
-#define FF_PROFILE_MPEG4_SIMPLE                     0
-#define FF_PROFILE_MPEG4_SIMPLE_SCALABLE            1
-#define FF_PROFILE_MPEG4_CORE                       2
-#define FF_PROFILE_MPEG4_MAIN                       3
-#define FF_PROFILE_MPEG4_N_BIT                      4
-#define FF_PROFILE_MPEG4_SCALABLE_TEXTURE           5
-#define FF_PROFILE_MPEG4_SIMPLE_FACE_ANIMATION      6
-#define FF_PROFILE_MPEG4_BASIC_ANIMATED_TEXTURE     7
-#define FF_PROFILE_MPEG4_HYBRID                     8
-#define FF_PROFILE_MPEG4_ADVANCED_REAL_TIME         9
-#define FF_PROFILE_MPEG4_CORE_SCALABLE             10
-#define FF_PROFILE_MPEG4_ADVANCED_CODING           11
-#define FF_PROFILE_MPEG4_ADVANCED_CORE             12
-#define FF_PROFILE_MPEG4_ADVANCED_SCALABLE_TEXTURE 13
-#define FF_PROFILE_MPEG4_SIMPLE_STUDIO             14
-#define FF_PROFILE_MPEG4_ADVANCED_SIMPLE           15
-
-    /**
-     * level
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-     int level;
-#define FF_LEVEL_UNKNOWN -99
-
-    /**
-     * low resolution decoding, 1-> 1/2 size, 2->1/4 size
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-     int lowres;
-
-    /**
-     * Bitstream width / height, may be different from width/height if lowres enabled.
-     * - encoding: unused
-     * - decoding: Set by user before init if known. Codec should override / dynamically change if needed.
-     */
-    int coded_width, coded_height;
-
-    /**
-     * frame skip threshold
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int frame_skip_threshold;
-
-    /**
-     * frame skip factor
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int frame_skip_factor;
-
-    /**
-     * frame skip exponent
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int frame_skip_exp;
-
-    /**
-     * frame skip comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int frame_skip_cmp;
-
-    /**
-     * Border processing masking, raises the quantizer for mbs on the borders
-     * of the picture.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float border_masking;
-
-    /**
-     * minimum MB lagrange multipler
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_lmin;
-
-    /**
-     * maximum MB lagrange multipler
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_lmax;
-
-    /**
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_penalty_compensation;
-
-    /**
-     *
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    enum AVDiscard skip_loop_filter;
-
-    /**
-     *
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    enum AVDiscard skip_idct;
-
-    /**
-     *
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    enum AVDiscard skip_frame;
-
-    /**
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int bidir_refine;
-
-    /**
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int brd_scale;
-
-#if FF_API_X264_GLOBAL_OPTS
-    /**
-     * constant rate factor - quality-based VBR - values ~correspond to qps
-     * - encoding: Set by user.
-     * - decoding: unused
-     *   @deprecated use 'crf' libx264 private option
-     */
-    attribute_deprecated float crf;
-
-    /**
-     * constant quantization parameter rate control method
-     * - encoding: Set by user.
-     * - decoding: unused
-     *   @deprecated use 'cqp' libx264 private option
-     */
-    attribute_deprecated int cqp;
-#endif
-
-    /**
-     * minimum GOP size
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int keyint_min;
-
-    /**
-     * number of reference frames
-     * - encoding: Set by user.
-     * - decoding: Set by lavc.
-     */
-    int refs;
-
-    /**
-     * chroma qp offset from luma
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int chromaoffset;
-
-#if FF_API_X264_GLOBAL_OPTS
-    /**
-     * Influence how often B-frames are used.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    attribute_deprecated int bframebias;
-#endif
-
-    /**
-     * trellis RD quantization
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int trellis;
-
-#if FF_API_X264_GLOBAL_OPTS
-    /**
-     * Reduce fluctuations in qp (before curve compression).
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    attribute_deprecated float complexityblur;
-
-    /**
-     * in-loop deblocking filter alphac0 parameter
-     * alpha is in the range -6...6
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    attribute_deprecated int deblockalpha;
-
-    /**
-     * in-loop deblocking filter beta parameter
-     * beta is in the range -6...6
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    attribute_deprecated int deblockbeta;
-
-    /**
-     * macroblock subpartition sizes to consider - p8x8, p4x4, b8x8, i8x8, i4x4
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    attribute_deprecated int partitions;
-#define X264_PART_I4X4 0x001  /* Analyze i4x4 */
-#define X264_PART_I8X8 0x002  /* Analyze i8x8 (requires 8x8 transform) */
-#define X264_PART_P8X8 0x010  /* Analyze p16x8, p8x16 and p8x8 */
-#define X264_PART_P4X4 0x020  /* Analyze p8x4, p4x8, p4x4 */
-#define X264_PART_B8X8 0x100  /* Analyze b16x8, b8x16 and b8x8 */
-
-    /**
-     * direct MV prediction mode - 0 (none), 1 (spatial), 2 (temporal), 3 (auto)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    attribute_deprecated int directpred;
-#endif
-
-    /**
-     * Audio cutoff bandwidth (0 means "automatic")
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int cutoff;
-
-    /**
-     * Multiplied by qscale for each frame and added to scene_change_score.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int scenechange_factor;
-
-    /**
-     *
-     * Note: Value depends upon the compare function used for fullpel ME.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mv0_threshold;
-
-    /**
-     * Adjust sensitivity of b_frame_strategy 1.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int b_sensitivity;
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int compression_level;
-#define FF_COMPRESSION_DEFAULT -1
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int min_prediction_order;
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int max_prediction_order;
-
-#if FF_API_FLAC_GLOBAL_OPTS
-    /**
-     * @name FLAC options
-     * @deprecated Use FLAC encoder private options instead.
-     * @{
-     */
-
-    /**
-     * LPC coefficient precision - used by FLAC encoder
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    attribute_deprecated int lpc_coeff_precision;
-
-    /**
-     * search method for selecting prediction order
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    attribute_deprecated int prediction_order_method;
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    attribute_deprecated int min_partition_order;
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    attribute_deprecated int max_partition_order;
-    /**
-     * @}
-     */
-#endif
-
-    /**
-     * GOP timecode frame start number, in non drop frame format
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int64_t timecode_frame_start;
-
-#if FF_API_REQUEST_CHANNELS
-    /**
-     * Decoder should decode to this many channels if it can (0 for default)
-     * - encoding: unused
-     * - decoding: Set by user.
-     * @deprecated Deprecated in favor of request_channel_layout.
-     */
-    int request_channels;
-#endif
-
-#if FF_API_DRC_SCALE
-    /**
-     * Percentage of dynamic range compression to be applied by the decoder.
-     * The default value is 1.0, corresponding to full compression.
-     * - encoding: unused
-     * - decoding: Set by user.
-     * @deprecated use AC3 decoder private option instead.
-     */
-    attribute_deprecated float drc_scale;
-#endif
-
-    /**
-     * opaque 64bit number (generally a PTS) that will be reordered and
-     * output in AVFrame.reordered_opaque
-     * @deprecated in favor of pkt_pts
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int64_t reordered_opaque;
-
-    /**
-     * Bits per sample/pixel of internal libavcodec pixel/sample format.
-     * - encoding: set by user.
-     * - decoding: set by libavcodec.
-     */
-    int bits_per_raw_sample;
-
-    /**
-     * Audio channel layout.
-     * - encoding: set by user.
-     * - decoding: set by libavcodec.
-     */
-    uint64_t channel_layout;
-
-    /**
-     * Request decoder to use this channel layout if it can (0 for default)
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    uint64_t request_channel_layout;
-
-    /**
-     * Ratecontrol attempt to use, at maximum, <value> of what can be used without an underflow.
-     * - encoding: Set by user.
-     * - decoding: unused.
-     */
-    float rc_max_available_vbv_use;
-
-    /**
-     * Ratecontrol attempt to use, at least, <value> times the amount needed to prevent a vbv overflow.
-     * - encoding: Set by user.
-     * - decoding: unused.
-     */
-    float rc_min_vbv_overflow_use;
-
-    /**
-     * Hardware accelerator in use
-     * - encoding: unused.
-     * - decoding: Set by libavcodec
-     */
-    struct AVHWAccel *hwaccel;
-
-    /**
-     * For some codecs, the time base is closer to the field rate than the frame rate.
-     * Most notably, H.264 and MPEG-2 specify time_base as half of frame duration
-     * if no telecine is used ...
-     *
-     * Set to time_base ticks per frame. Default 1, e.g., H.264/MPEG-2 set it to 2.
-     */
-    int ticks_per_frame;
-
-    /**
-     * Hardware accelerator context.
-     * For some hardware accelerators, a global context needs to be
-     * provided by the user. In that case, this holds display-dependent
-     * data Libav cannot instantiate itself. Please refer to the
-     * Libav HW accelerator documentation to know how to fill this
-     * is. e.g. for VA API, this is a struct vaapi_context.
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    void *hwaccel_context;
-
-    /**
-     * Chromaticity coordinates of the source primaries.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorPrimaries color_primaries;
-
-    /**
-     * Color Transfer Characteristic.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorTransferCharacteristic color_trc;
-
-    /**
-     * YUV colorspace type.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorSpace colorspace;
-
-    /**
-     * MPEG vs JPEG YUV range.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorRange color_range;
-
-    /**
-     * This defines the location of chroma samples.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVChromaLocation chroma_sample_location;
-
-    /**
-     * The codec may call this to execute several independent things.
-     * It will return only after finishing all tasks.
-     * The user may replace this with some multithreaded implementation,
-     * the default implementation will execute the parts serially.
-     * Also see avcodec_thread_init and e.g. the --enable-pthread configure option.
-     * @param c context passed also to func
-     * @param count the number of things to execute
-     * @param arg2 argument passed unchanged to func
-     * @param ret return values of executed functions, must have space for "count" values. May be NULL.
-     * @param func function that will be called count times, with jobnr from 0 to count-1.
-     *             threadnr will be in the range 0 to c->thread_count-1 < MAX_THREADS and so that no
-     *             two instances of func executing at the same time will have the same threadnr.
-     * @return always 0 currently, but code should handle a future improvement where when any call to func
-     *         returns < 0 no further calls to func may be done and < 0 is returned.
-     * - encoding: Set by libavcodec, user can override.
-     * - decoding: Set by libavcodec, user can override.
-     */
-    int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count);
-
-#if FF_API_X264_GLOBAL_OPTS
-    /**
-     * explicit P-frame weighted prediction analysis method
-     * 0: off
-     * 1: fast blind weighting (one reference duplicate with -1 offset)
-     * 2: smart weighting (full fade detection analysis)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    attribute_deprecated int weighted_p_pred;
-
-    /**
-     * AQ mode
-     * 0: Disabled
-     * 1: Variance AQ (complexity mask)
-     * 2: Auto-variance AQ (experimental)
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    attribute_deprecated int aq_mode;
-
-    /**
-     * AQ strength
-     * Reduces blocking and blurring in flat and textured areas.
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    attribute_deprecated float aq_strength;
-
-    /**
-     * PSY RD
-     * Strength of psychovisual optimization
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    attribute_deprecated float psy_rd;
-
-    /**
-     * PSY trellis
-     * Strength of psychovisual optimization
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    attribute_deprecated float psy_trellis;
-
-    /**
-     * RC lookahead
-     * Number of frames for frametype and ratecontrol lookahead
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    attribute_deprecated int rc_lookahead;
-
-    /**
-     * Constant rate factor maximum
-     * With CRF encoding mode and VBV restrictions enabled, prevents quality from being worse
-     * than crf_max, even if doing so would violate VBV restrictions.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    attribute_deprecated float crf_max;
-#endif
-
-    int log_level_offset;
-
-#if FF_API_FLAC_GLOBAL_OPTS
-    /**
-     * Determine which LPC analysis algorithm to use.
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    attribute_deprecated enum AVLPCType lpc_type;
-
-    /**
-     * Number of passes to use for Cholesky factorization during LPC analysis
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    attribute_deprecated int lpc_passes;
-#endif
-
-    /**
-     * Number of slices.
-     * Indicates number of picture subdivisions. Used for parallelized
-     * decoding.
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    int slices;
-
-    /**
-     * Header containing style information for text subtitles.
-     * For SUBTITLE_ASS subtitle type, it should contain the whole ASS
-     * [Script Info] and [V4+ Styles] section, plus the [Events] line and
-     * the Format line following. It shouldn't include any Dialogue line.
-     * - encoding: Set/allocated/freed by user (before avcodec_open2())
-     * - decoding: Set/allocated/freed by libavcodec (by avcodec_open2())
-     */
-    uint8_t *subtitle_header;
-    int subtitle_header_size;
-
-    /**
-     * Current packet as passed into the decoder, to avoid having
-     * to pass the packet into every function. Currently only valid
-     * inside lavc and get/release_buffer callbacks.
-     * - decoding: set by avcodec_decode_*, read by get_buffer() for setting pkt_pts
-     * - encoding: unused
-     */
-    AVPacket *pkt;
-
-#if FF_API_INTERNAL_CONTEXT
-    /**
-     * Whether this is a copy of the context which had init() called on it.
-     * This is used by multithreading - shared tables and picture pointers
-     * should be freed from the original context only.
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     *
-     * @deprecated this field has been moved to an internal context
-     */
-    attribute_deprecated int is_copy;
-#endif
-
-    /**
-     * Which multithreading methods to use.
-     * Use of FF_THREAD_FRAME will increase decoding delay by one frame per thread,
-     * so clients which cannot provide future frames should not use it.
-     *
-     * - encoding: Set by user, otherwise the default is used.
-     * - decoding: Set by user, otherwise the default is used.
-     */
-    int thread_type;
-#define FF_THREAD_FRAME   1 ///< Decode more than one frame at once
-#define FF_THREAD_SLICE   2 ///< Decode more than one part of a single frame at once
-
-    /**
-     * Which multithreading methods are in use by the codec.
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    int active_thread_type;
-
-    /**
-     * Set by the client if its custom get_buffer() callback can be called
-     * from another thread, which allows faster multithreaded decoding.
-     * draw_horiz_band() will be called from other threads regardless of this setting.
-     * Ignored if the default get_buffer() is used.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int thread_safe_callbacks;
-
-    /**
-     * VBV delay coded in the last frame (in periods of a 27 MHz clock).
-     * Used for compliant TS muxing.
-     * - encoding: Set by libavcodec.
-     * - decoding: unused.
-     */
-    uint64_t vbv_delay;
-
-    /**
-     * Type of service that the audio stream conveys.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    enum AVAudioServiceType audio_service_type;
-
-    /**
-     * Used to request a sample format from the decoder.
-     * - encoding: unused.
-     * - decoding: Set by user.
-     */
-    enum AVSampleFormat request_sample_fmt;
-
-    /**
-     * Error recognition; may misdetect some more or less valid parts as errors.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int err_recognition;
-#define AV_EF_CRCCHECK  (1<<0)
-#define AV_EF_BITSTREAM (1<<1)
-#define AV_EF_BUFFER    (1<<2)
-#define AV_EF_EXPLODE   (1<<3)
-
-    /**
-     * Private context used for internal data.
-     *
-     * Unlike priv_data, this is not codec-specific. It is used in general
-     * libavcodec functions.
-     */
-    struct AVCodecInternal *internal;
-
-    /** Field order
-     * - encoding: set by libavcodec
-     * - decoding: Set by libavcodec
-     */
-    enum AVFieldOrder field_order;
-} AVCodecContext;
-
-/**
- * AVProfile.
- */
-typedef struct AVProfile {
-    int profile;
-    const char *name; ///< short name for the profile
-} AVProfile;
-
-typedef struct AVCodecDefault AVCodecDefault;
-
-/**
- * AVCodec.
- */
-typedef struct AVCodec {
-    /**
-     * Name of the codec implementation.
-     * The name is globally unique among encoders and among decoders (but an
-     * encoder and a decoder can share the same name).
-     * This is the primary way to find a codec from the user perspective.
-     */
-    const char *name;
-    enum AVMediaType type;
-    enum CodecID id;
-    int priv_data_size;
-    int (*init)(AVCodecContext *);
-    int (*encode)(AVCodecContext *, uint8_t *buf, int buf_size, void *data);
-    int (*close)(AVCodecContext *);
-    int (*decode)(AVCodecContext *, void *outdata, int *outdata_size, AVPacket *avpkt);
-    /**
-     * Codec capabilities.
-     * see CODEC_CAP_*
-     */
-    int capabilities;
-    struct AVCodec *next;
-    /**
-     * Flush buffers.
-     * Will be called when seeking
-     */
-    void (*flush)(AVCodecContext *);
-    const AVRational *supported_framerates; ///< array of supported framerates, or NULL if any, array is terminated by {0,0}
-    const enum PixelFormat *pix_fmts;       ///< array of supported pixel formats, or NULL if unknown, array is terminated by -1
-    /**
-     * Descriptive name for the codec, meant to be more human readable than name.
-     * You should use the NULL_IF_CONFIG_SMALL() macro to define it.
-     */
-    const char *long_name;
-    const int *supported_samplerates;       ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
-    const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1
-    const uint64_t *channel_layouts;         ///< array of support channel layouts, or NULL if unknown. array is terminated by 0
-    uint8_t max_lowres;                     ///< maximum value for lowres supported by the decoder
-    const AVClass *priv_class;              ///< AVClass for the private context
-    const AVProfile *profiles;              ///< array of recognized profiles, or NULL if unknown, array is terminated by {FF_PROFILE_UNKNOWN}
-
-    /**
-     * @name Frame-level threading support functions
-     * @{
-     */
-    /**
-     * If defined, called on thread contexts when they are created.
-     * If the codec allocates writable tables in init(), re-allocate them here.
-     * priv_data will be set to a copy of the original.
-     */
-    int (*init_thread_copy)(AVCodecContext *);
-    /**
-     * Copy necessary context variables from a previous thread context to the current one.
-     * If not defined, the next thread will start automatically; otherwise, the codec
-     * must call ff_thread_finish_setup().
-     *
-     * dst and src will (rarely) point to the same context, in which case memcpy should be skipped.
-     */
-    int (*update_thread_context)(AVCodecContext *dst, const AVCodecContext *src);
-    /** @} */
-
-    /**
-     * Private codec-specific defaults.
-     */
-    const AVCodecDefault *defaults;
-
-    /**
-     * Initialize codec static data, called from avcodec_register().
-     */
-    void (*init_static_data)(struct AVCodec *codec);
-
-    /**
-     * Encode data to an AVPacket.
-     *
-     * @param      avctx          codec context
-     * @param      avpkt          output AVPacket (may contain a user-provided buffer)
-     * @param[in]  frame          AVFrame containing the raw data to be encoded
-     * @param[out] got_packet_ptr encoder sets to 0 or 1 to indicate that a
-     *                            non-empty packet was returned in avpkt.
-     * @return 0 on success, negative error code on failure
-     */
-    int (*encode2)(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame,
-                   int *got_packet_ptr);
-} AVCodec;
-
-/**
- * AVHWAccel.
- */
-typedef struct AVHWAccel {
-    /**
-     * Name of the hardware accelerated codec.
-     * The name is globally unique among encoders and among decoders (but an
-     * encoder and a decoder can share the same name).
-     */
-    const char *name;
-
-    /**
-     * Type of codec implemented by the hardware accelerator.
-     *
-     * See AVMEDIA_TYPE_xxx
-     */
-    enum AVMediaType type;
-
-    /**
-     * Codec implemented by the hardware accelerator.
-     *
-     * See CODEC_ID_xxx
-     */
-    enum CodecID id;
-
-    /**
-     * Supported pixel format.
-     *
-     * Only hardware accelerated formats are supported here.
-     */
-    enum PixelFormat pix_fmt;
-
-    /**
-     * Hardware accelerated codec capabilities.
-     * see FF_HWACCEL_CODEC_CAP_*
-     */
-    int capabilities;
-
-    struct AVHWAccel *next;
-
-    /**
-     * Called at the beginning of each frame or field picture.
-     *
-     * Meaningful frame information (codec specific) is guaranteed to
-     * be parsed at this point. This function is mandatory.
-     *
-     * Note that buf can be NULL along with buf_size set to 0.
-     * Otherwise, this means the whole frame is available at this point.
-     *
-     * @param avctx the codec context
-     * @param buf the frame data buffer base
-     * @param buf_size the size of the frame in bytes
-     * @return zero if successful, a negative value otherwise
-     */
-    int (*start_frame)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size);
-
-    /**
-     * Callback for each slice.
-     *
-     * Meaningful slice information (codec specific) is guaranteed to
-     * be parsed at this point. This function is mandatory.
-     *
-     * @param avctx the codec context
-     * @param buf the slice data buffer base
-     * @param buf_size the size of the slice in bytes
-     * @return zero if successful, a negative value otherwise
-     */
-    int (*decode_slice)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size);
-
-    /**
-     * Called at the end of each frame or field picture.
-     *
-     * The whole picture is parsed at this point and can now be sent
-     * to the hardware accelerator. This function is mandatory.
-     *
-     * @param avctx the codec context
-     * @return zero if successful, a negative value otherwise
-     */
-    int (*end_frame)(AVCodecContext *avctx);
-
-    /**
-     * Size of HW accelerator private data.
-     *
-     * Private data is allocated with av_mallocz() before
-     * AVCodecContext.get_buffer() and deallocated after
-     * AVCodecContext.release_buffer().
-     */
-    int priv_data_size;
-} AVHWAccel;
-
-/**
- * four components are given, that's all.
- * the last component is alpha
- */
-typedef struct AVPicture {
-    uint8_t *data[AV_NUM_DATA_POINTERS];
-    int linesize[AV_NUM_DATA_POINTERS];     ///< number of bytes per line
-} AVPicture;
-
-#define AVPALETTE_SIZE 1024
-#define AVPALETTE_COUNT 256
-#if FF_API_PALETTE_CONTROL
-/**
- * AVPaletteControl
- * This structure defines a method for communicating palette changes
- * between and demuxer and a decoder.
- *
- * @deprecated Use AVPacket to send palette changes instead.
- * This is totally broken.
- */
-typedef struct AVPaletteControl {
-
-    /* Demuxer sets this to 1 to indicate the palette has changed;
-     * decoder resets to 0. */
-    int palette_changed;
-
-    /* 4-byte ARGB palette entries, stored in native byte order; note that
-     * the individual palette components should be on a 8-bit scale; if
-     * the palette data comes from an IBM VGA native format, the component
-     * data is probably 6 bits in size and needs to be scaled. */
-    unsigned int palette[AVPALETTE_COUNT];
-
-} AVPaletteControl attribute_deprecated;
-#endif
-
-enum AVSubtitleType {
-    SUBTITLE_NONE,
-
-    SUBTITLE_BITMAP,                ///< A bitmap, pict will be set
-
-    /**
-     * Plain text, the text field must be set by the decoder and is
-     * authoritative. ass and pict fields may contain approximations.
-     */
-    SUBTITLE_TEXT,
-
-    /**
-     * Formatted text, the ass field must be set by the decoder and is
-     * authoritative. pict and text fields may contain approximations.
-     */
-    SUBTITLE_ASS,
-};
-
-typedef struct AVSubtitleRect {
-    int x;         ///< top left corner  of pict, undefined when pict is not set
-    int y;         ///< top left corner  of pict, undefined when pict is not set
-    int w;         ///< width            of pict, undefined when pict is not set
-    int h;         ///< height           of pict, undefined when pict is not set
-    int nb_colors; ///< number of colors in pict, undefined when pict is not set
-
-    /**
-     * data+linesize for the bitmap of this subtitle.
-     * can be set for text/ass as well once they where rendered
-     */
-    AVPicture pict;
-    enum AVSubtitleType type;
-
-    char *text;                     ///< 0 terminated plain UTF-8 text
-
-    /**
-     * 0 terminated ASS/SSA compatible event line.
-     * The pressentation of this is unaffected by the other values in this
-     * struct.
-     */
-    char *ass;
-} AVSubtitleRect;
-
-typedef struct AVSubtitle {
-    uint16_t format; /* 0 = graphics */
-    uint32_t start_display_time; /* relative to packet pts, in ms */
-    uint32_t end_display_time; /* relative to packet pts, in ms */
-    unsigned num_rects;
-    AVSubtitleRect **rects;
-    int64_t pts;    ///< Same as packet pts, in AV_TIME_BASE
-} AVSubtitle;
-
-/* packet functions */
-
-/**
- * @deprecated use NULL instead
- */
-attribute_deprecated void av_destruct_packet_nofree(AVPacket *pkt);
-
-/**
- * Default packet destructor.
- */
-void av_destruct_packet(AVPacket *pkt);
-
-/**
- * Initialize optional fields of a packet with default values.
- *
- * @param pkt packet
- */
-void av_init_packet(AVPacket *pkt);
-
-/**
- * Allocate the payload of a packet and initialize its fields with
- * default values.
- *
- * @param pkt packet
- * @param size wanted payload size
- * @return 0 if OK, AVERROR_xxx otherwise
- */
-int av_new_packet(AVPacket *pkt, int size);
-
-/**
- * Reduce packet size, correctly zeroing padding
- *
- * @param pkt packet
- * @param size new size
- */
-void av_shrink_packet(AVPacket *pkt, int size);
-
-/**
- * Increase packet size, correctly zeroing padding
- *
- * @param pkt packet
- * @param grow_by number of bytes by which to increase the size of the packet
- */
-int av_grow_packet(AVPacket *pkt, int grow_by);
-
-/**
- * @warning This is a hack - the packet memory allocation stuff is broken. The
- * packet is allocated if it was not really allocated.
- */
-int av_dup_packet(AVPacket *pkt);
-
-/**
- * Free a packet.
- *
- * @param pkt packet to free
- */
-void av_free_packet(AVPacket *pkt);
-
-/**
- * Allocate new information of a packet.
- *
- * @param pkt packet
- * @param type side information type
- * @param size side information size
- * @return pointer to fresh allocated data or NULL otherwise
- */
-uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
-                                 int size);
-
-/**
- * Get side information from packet.
- *
- * @param pkt packet
- * @param type desired side information type
- * @param size pointer for side information size to store (optional)
- * @return pointer to data if present or NULL otherwise
- */
-uint8_t* av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
-                                 int *size);
-
-/* resample.c */
-
-struct ReSampleContext;
-struct AVResampleContext;
-
-typedef struct ReSampleContext ReSampleContext;
-
-/**
- *  Initialize audio resampling context.
- *
- * @param output_channels  number of output channels
- * @param input_channels   number of input channels
- * @param output_rate      output sample rate
- * @param input_rate       input sample rate
- * @param sample_fmt_out   requested output sample format
- * @param sample_fmt_in    input sample format
- * @param filter_length    length of each FIR filter in the filterbank relative to the cutoff frequency
- * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
- * @param linear           if 1 then the used FIR filter will be linearly interpolated
-                           between the 2 closest, if 0 the closest will be used
- * @param cutoff           cutoff frequency, 1.0 corresponds to half the output sampling rate
- * @return allocated ReSampleContext, NULL if error occurred
- */
-ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
-                                        int output_rate, int input_rate,
-                                        enum AVSampleFormat sample_fmt_out,
-                                        enum AVSampleFormat sample_fmt_in,
-                                        int filter_length, int log2_phase_count,
-                                        int linear, double cutoff);
-
-int audio_resample(ReSampleContext *s, short *output, short *input, int nb_samples);
-
-/**
- * Free resample context.
- *
- * @param s a non-NULL pointer to a resample context previously
- *          created with av_audio_resample_init()
- */
-void audio_resample_close(ReSampleContext *s);
-
-
-/**
- * Initialize an audio resampler.
- * Note, if either rate is not an integer then simply scale both rates up so they are.
- * @param filter_length length of each FIR filter in the filterbank relative to the cutoff freq
- * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
- * @param linear If 1 then the used FIR filter will be linearly interpolated
-                 between the 2 closest, if 0 the closest will be used
- * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate
- */
-struct AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_length, int log2_phase_count, int linear, double cutoff);
-
-/**
- * Resample an array of samples using a previously configured context.
- * @param src an array of unconsumed samples
- * @param consumed the number of samples of src which have been consumed are returned here
- * @param src_size the number of unconsumed samples available
- * @param dst_size the amount of space in samples available in dst
- * @param update_ctx If this is 0 then the context will not be modified, that way several channels can be resampled with the same context.
- * @return the number of samples written in dst or -1 if an error occurred
- */
-int av_resample(struct AVResampleContext *c, short *dst, short *src, int *consumed, int src_size, int dst_size, int update_ctx);
-
-
-/**
- * Compensate samplerate/timestamp drift. The compensation is done by changing
- * the resampler parameters, so no audible clicks or similar distortions occur
- * @param compensation_distance distance in output samples over which the compensation should be performed
- * @param sample_delta number of output samples which should be output less
- *
- * example: av_resample_compensate(c, 10, 500)
- * here instead of 510 samples only 500 samples would be output
- *
- * note, due to rounding the actual compensation might be slightly different,
- * especially if the compensation_distance is large and the in_rate used during init is small
- */
-void av_resample_compensate(struct AVResampleContext *c, int sample_delta, int compensation_distance);
-void av_resample_close(struct AVResampleContext *c);
-
-/**
- * Allocate memory for a picture.  Call avpicture_free() to free it.
- *
- * @see avpicture_fill()
- *
- * @param picture the picture to be filled in
- * @param pix_fmt the format of the picture
- * @param width the width of the picture
- * @param height the height of the picture
- * @return zero if successful, a negative value if not
- */
-int avpicture_alloc(AVPicture *picture, enum PixelFormat pix_fmt, int width, int height);
-
-/**
- * Free a picture previously allocated by avpicture_alloc().
- * The data buffer used by the AVPicture is freed, but the AVPicture structure
- * itself is not.
- *
- * @param picture the AVPicture to be freed
- */
-void avpicture_free(AVPicture *picture);
-
-/**
- * Fill in the AVPicture fields.
- * The fields of the given AVPicture are filled in by using the 'ptr' address
- * which points to the image data buffer. Depending on the specified picture
- * format, one or multiple image data pointers and line sizes will be set.
- * If a planar format is specified, several pointers will be set pointing to
- * the different picture planes and the line sizes of the different planes
- * will be stored in the lines_sizes array.
- * Call with ptr == NULL to get the required size for the ptr buffer.
- *
- * To allocate the buffer and fill in the AVPicture fields in one call,
- * use avpicture_alloc().
- *
- * @param picture AVPicture whose fields are to be filled in
- * @param ptr Buffer which will contain or contains the actual image data
- * @param pix_fmt The format in which the picture data is stored.
- * @param width the width of the image in pixels
- * @param height the height of the image in pixels
- * @return size of the image data in bytes
- */
-int avpicture_fill(AVPicture *picture, uint8_t *ptr,
-                   enum PixelFormat pix_fmt, int width, int height);
-
-/**
- * Copy pixel data from an AVPicture into a buffer.
- * The data is stored compactly, without any gaps for alignment or padding
- * which may be applied by avpicture_fill().
- *
- * @see avpicture_get_size()
- *
- * @param[in] src AVPicture containing image data
- * @param[in] pix_fmt The format in which the picture data is stored.
- * @param[in] width the width of the image in pixels.
- * @param[in] height the height of the image in pixels.
- * @param[out] dest A buffer into which picture data will be copied.
- * @param[in] dest_size The size of 'dest'.
- * @return The number of bytes written to dest, or a negative value (error code) on error.
- */
-int avpicture_layout(const AVPicture* src, enum PixelFormat pix_fmt, int width, int height,
-                     unsigned char *dest, int dest_size);
-
-/**
- * Calculate the size in bytes that a picture of the given width and height
- * would occupy if stored in the given picture format.
- * Note that this returns the size of a compact representation as generated
- * by avpicture_layout(), which can be smaller than the size required for e.g.
- * avpicture_fill().
- *
- * @param pix_fmt the given picture format
- * @param width the width of the image
- * @param height the height of the image
- * @return Image data size in bytes or -1 on error (e.g. too large dimensions).
- */
-int avpicture_get_size(enum PixelFormat pix_fmt, int width, int height);
-void avcodec_get_chroma_sub_sample(enum PixelFormat pix_fmt, int *h_shift, int *v_shift);
-
-#if FF_API_GET_PIX_FMT_NAME
-/**
- * @deprecated Deprecated in favor of av_get_pix_fmt_name().
- */
-attribute_deprecated
-const char *avcodec_get_pix_fmt_name(enum PixelFormat pix_fmt);
-#endif
-
-void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
-
-/**
- * Return a value representing the fourCC code associated to the
- * pixel format pix_fmt, or 0 if no associated fourCC code can be
- * found.
- */
-unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat pix_fmt);
-
-/**
- * Put a string representing the codec tag codec_tag in buf.
- *
- * @param buf_size size in bytes of buf
- * @return the length of the string that would have been generated if
- * enough space had been available, excluding the trailing null
- */
-size_t av_get_codec_tag_string(char *buf, size_t buf_size, unsigned int codec_tag);
-
-#define FF_LOSS_RESOLUTION  0x0001 /**< loss due to resolution change */
-#define FF_LOSS_DEPTH       0x0002 /**< loss due to color depth change */
-#define FF_LOSS_COLORSPACE  0x0004 /**< loss due to color space conversion */
-#define FF_LOSS_ALPHA       0x0008 /**< loss of alpha bits */
-#define FF_LOSS_COLORQUANT  0x0010 /**< loss due to color quantization */
-#define FF_LOSS_CHROMA      0x0020 /**< loss of chroma (e.g. RGB to gray conversion) */
-
-/**
- * Compute what kind of losses will occur when converting from one specific
- * pixel format to another.
- * When converting from one pixel format to another, information loss may occur.
- * For example, when converting from RGB24 to GRAY, the color information will
- * be lost. Similarly, other losses occur when converting from some formats to
- * other formats. These losses can involve loss of chroma, but also loss of
- * resolution, loss of color depth, loss due to the color space conversion, loss
- * of the alpha bits or loss due to color quantization.
- * avcodec_get_fix_fmt_loss() informs you about the various types of losses
- * which will occur when converting from one pixel format to another.
- *
- * @param[in] dst_pix_fmt destination pixel format
- * @param[in] src_pix_fmt source pixel format
- * @param[in] has_alpha Whether the source pixel format alpha channel is used.
- * @return Combination of flags informing you what kind of losses will occur.
- */
-int avcodec_get_pix_fmt_loss(enum PixelFormat dst_pix_fmt, enum PixelFormat src_pix_fmt,
-                             int has_alpha);
-
-/**
- * Find the best pixel format to convert to given a certain source pixel
- * format.  When converting from one pixel format to another, information loss
- * may occur.  For example, when converting from RGB24 to GRAY, the color
- * information will be lost. Similarly, other losses occur when converting from
- * some formats to other formats. avcodec_find_best_pix_fmt() searches which of
- * the given pixel formats should be used to suffer the least amount of loss.
- * The pixel formats from which it chooses one, are determined by the
- * pix_fmt_mask parameter.
- *
- * @code
- * src_pix_fmt = PIX_FMT_YUV420P;
- * pix_fmt_mask = (1 << PIX_FMT_YUV422P) || (1 << PIX_FMT_RGB24);
- * dst_pix_fmt = avcodec_find_best_pix_fmt(pix_fmt_mask, src_pix_fmt, alpha, &loss);
- * @endcode
- *
- * @param[in] pix_fmt_mask bitmask determining which pixel format to choose from
- * @param[in] src_pix_fmt source pixel format
- * @param[in] has_alpha Whether the source pixel format alpha channel is used.
- * @param[out] loss_ptr Combination of flags informing you what kind of losses will occur.
- * @return The best pixel format to convert to or -1 if none was found.
- */
-enum PixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum PixelFormat src_pix_fmt,
-                              int has_alpha, int *loss_ptr);
-
-#if FF_API_GET_ALPHA_INFO
-#define FF_ALPHA_TRANSP       0x0001 /* image has some totally transparent pixels */
-#define FF_ALPHA_SEMI_TRANSP  0x0002 /* image has some transparent pixels */
-
-/**
- * Tell if an image really has transparent alpha values.
- * @return ored mask of FF_ALPHA_xxx constants
- */
-attribute_deprecated
-int img_get_alpha_info(const AVPicture *src,
-                       enum PixelFormat pix_fmt, int width, int height);
-#endif
-
-/* deinterlace a picture */
-/* deinterlace - if not supported return -1 */
-int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
-                          enum PixelFormat pix_fmt, int width, int height);
-
-/* external high level API */
-
-/**
- * If c is NULL, returns the first registered codec,
- * if c is non-NULL, returns the next registered codec after c,
- * or NULL if c is the last one.
- */
-AVCodec *av_codec_next(AVCodec *c);
-
-/**
- * Return the LIBAVCODEC_VERSION_INT constant.
- */
-unsigned avcodec_version(void);
-
-/**
- * Return the libavcodec build-time configuration.
- */
-const char *avcodec_configuration(void);
-
-/**
- * Return the libavcodec license.
- */
-const char *avcodec_license(void);
-
-#if FF_API_AVCODEC_INIT
-/**
- * @deprecated this function is called automatically from avcodec_register()
- * and avcodec_register_all(), there is no need to call it manually
- */
-attribute_deprecated
-void avcodec_init(void);
-#endif
-
-/**
- * Register the codec codec and initialize libavcodec.
- *
- * @warning either this function or avcodec_register_all() must be called
- * before any other libavcodec functions.
- *
- * @see avcodec_register_all()
- */
-void avcodec_register(AVCodec *codec);
-
-/**
- * Find a registered encoder with a matching codec ID.
- *
- * @param id CodecID of the requested encoder
- * @return An encoder if one was found, NULL otherwise.
- */
-AVCodec *avcodec_find_encoder(enum CodecID id);
-
-/**
- * Find a registered encoder with the specified name.
- *
- * @param name name of the requested encoder
- * @return An encoder if one was found, NULL otherwise.
- */
-AVCodec *avcodec_find_encoder_by_name(const char *name);
-
-/**
- * Find a registered decoder with a matching codec ID.
- *
- * @param id CodecID of the requested decoder
- * @return A decoder if one was found, NULL otherwise.
- */
-AVCodec *avcodec_find_decoder(enum CodecID id);
-
-/**
- * Find a registered decoder with the specified name.
- *
- * @param name name of the requested decoder
- * @return A decoder if one was found, NULL otherwise.
- */
-AVCodec *avcodec_find_decoder_by_name(const char *name);
-void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode);
-
-/**
- * Return a name for the specified profile, if available.
- *
- * @param codec the codec that is searched for the given profile
- * @param profile the profile value for which a name is requested
- * @return A name for the profile if found, NULL otherwise.
- */
-const char *av_get_profile_name(const AVCodec *codec, int profile);
-
-#if FF_API_ALLOC_CONTEXT
-/**
- * Set the fields of the given AVCodecContext to default values.
- *
- * @param s The AVCodecContext of which the fields should be set to default values.
- * @deprecated use avcodec_get_context_defaults3
- */
-attribute_deprecated
-void avcodec_get_context_defaults(AVCodecContext *s);
-
-/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
- *  we WILL change its arguments and name a few times! */
-attribute_deprecated
-void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType);
-#endif
-
-/**
- * Set the fields of the given AVCodecContext to default values corresponding
- * to the given codec (defaults may be codec-dependent).
- *
- * Do not call this function if a non-NULL codec has been passed
- * to avcodec_alloc_context3() that allocated this AVCodecContext.
- * If codec is non-NULL, it is illegal to call avcodec_open2() with a
- * different codec on this AVCodecContext.
- */
-int avcodec_get_context_defaults3(AVCodecContext *s, AVCodec *codec);
-
-#if FF_API_ALLOC_CONTEXT
-/**
- * Allocate an AVCodecContext and set its fields to default values.  The
- * resulting struct can be deallocated by simply calling av_free().
- *
- * @return An AVCodecContext filled with default values or NULL on failure.
- * @see avcodec_get_context_defaults
- *
- * @deprecated use avcodec_alloc_context3()
- */
-attribute_deprecated
-AVCodecContext *avcodec_alloc_context(void);
-
-/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
- *  we WILL change its arguments and name a few times! */
-attribute_deprecated
-AVCodecContext *avcodec_alloc_context2(enum AVMediaType);
-#endif
-
-/**
- * Allocate an AVCodecContext and set its fields to default values.  The
- * resulting struct can be deallocated by calling avcodec_close() on it followed
- * by av_free().
- *
- * @param codec if non-NULL, allocate private data and initialize defaults
- *              for the given codec. It is illegal to then call avcodec_open2()
- *              with a different codec.
- *
- * @return An AVCodecContext filled with default values or NULL on failure.
- * @see avcodec_get_context_defaults
- */
-AVCodecContext *avcodec_alloc_context3(AVCodec *codec);
-
-/**
- * Copy the settings of the source AVCodecContext into the destination
- * AVCodecContext. The resulting destination codec context will be
- * unopened, i.e. you are required to call avcodec_open2() before you
- * can use this AVCodecContext to decode/encode video/audio data.
- *
- * @param dest target codec context, should be initialized with
- *             avcodec_alloc_context3(), but otherwise uninitialized
- * @param src source codec context
- * @return AVERROR() on error (e.g. memory allocation error), 0 on success
- */
-int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src);
-
-/**
- * Set the fields of the given AVFrame to default values.
- *
- * @param pic The AVFrame of which the fields should be set to default values.
- */
-void avcodec_get_frame_defaults(AVFrame *pic);
-
-/**
- * Allocate an AVFrame and set its fields to default values.  The resulting
- * struct can be deallocated by simply calling av_free().
- *
- * @return An AVFrame filled with default values or NULL on failure.
- * @see avcodec_get_frame_defaults
- */
-AVFrame *avcodec_alloc_frame(void);
-
-int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic);
-void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic);
-int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic);
-
-/**
- * Return the amount of padding in pixels which the get_buffer callback must
- * provide around the edge of the image for codecs which do not have the
- * CODEC_FLAG_EMU_EDGE flag.
- *
- * @return Required padding in pixels.
- */
-unsigned avcodec_get_edge_width(void);
-/**
- * Modify width and height values so that they will result in a memory
- * buffer that is acceptable for the codec if you do not use any horizontal
- * padding.
- *
- * May only be used if a codec with CODEC_CAP_DR1 has been opened.
- * If CODEC_FLAG_EMU_EDGE is not set, the dimensions must have been increased
- * according to avcodec_get_edge_width() before.
- */
-void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height);
-/**
- * Modify width and height values so that they will result in a memory
- * buffer that is acceptable for the codec if you also ensure that all
- * line sizes are a multiple of the respective linesize_align[i].
- *
- * May only be used if a codec with CODEC_CAP_DR1 has been opened.
- * If CODEC_FLAG_EMU_EDGE is not set, the dimensions must have been increased
- * according to avcodec_get_edge_width() before.
- */
-void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
-                               int linesize_align[AV_NUM_DATA_POINTERS]);
-
-enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat * fmt);
-
-#if FF_API_THREAD_INIT
-/**
- * @deprecated Set s->thread_count before calling avcodec_open2() instead of calling this.
- */
-attribute_deprecated
-int avcodec_thread_init(AVCodecContext *s, int thread_count);
-#endif
-
-int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size);
-int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count);
-//FIXME func typedef
-
-#if FF_API_AVCODEC_OPEN
-/**
- * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
- * function the context has to be allocated.
- *
- * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(),
- * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for
- * retrieving a codec.
- *
- * @warning This function is not thread safe!
- *
- * @code
- * avcodec_register_all();
- * codec = avcodec_find_decoder(CODEC_ID_H264);
- * if (!codec)
- *     exit(1);
- *
- * context = avcodec_alloc_context3(codec);
- *
- * if (avcodec_open(context, codec) < 0)
- *     exit(1);
- * @endcode
- *
- * @param avctx The context which will be set up to use the given codec.
- * @param codec The codec to use within the context.
- * @return zero on success, a negative value on error
- * @see avcodec_alloc_context3, avcodec_find_decoder, avcodec_find_encoder, avcodec_close
- *
- * @deprecated use avcodec_open2
- */
-attribute_deprecated
-int avcodec_open(AVCodecContext *avctx, AVCodec *codec);
-#endif
-
-/**
- * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
- * function the context has to be allocated with avcodec_alloc_context3().
- *
- * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(),
- * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for
- * retrieving a codec.
- *
- * @warning This function is not thread safe!
- *
- * @code
- * avcodec_register_all();
- * av_dict_set(&opts, "b", "2.5M", 0);
- * codec = avcodec_find_decoder(CODEC_ID_H264);
- * if (!codec)
- *     exit(1);
- *
- * context = avcodec_alloc_context3(codec);
- *
- * if (avcodec_open2(context, codec, opts) < 0)
- *     exit(1);
- * @endcode
- *
- * @param avctx The context to initialize.
- * @param codec The codec to open this context for. If a non-NULL codec has been
- *              previously passed to avcodec_alloc_context3() or
- *              avcodec_get_context_defaults3() for this context, then this
- *              parameter MUST be either NULL or equal to the previously passed
- *              codec.
- * @param options A dictionary filled with AVCodecContext and codec-private options.
- *                On return this object will be filled with options that were not found.
- *
- * @return zero on success, a negative value on error
- * @see avcodec_alloc_context3(), avcodec_find_decoder(), avcodec_find_encoder(),
- *      av_dict_set(), av_opt_find().
- */
-int avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options);
-
-#if FF_API_OLD_DECODE_AUDIO
-/**
- * Wrapper function which calls avcodec_decode_audio4.
- *
- * @deprecated Use avcodec_decode_audio4 instead.
- *
- * Decode the audio frame of size avpkt->size from avpkt->data into samples.
- * Some decoders may support multiple frames in a single AVPacket, such
- * decoders would then just decode the first frame. In this case,
- * avcodec_decode_audio3 has to be called again with an AVPacket that contains
- * the remaining data in order to decode the second frame etc.
- * If no frame
- * could be outputted, frame_size_ptr is zero. Otherwise, it is the
- * decompressed frame size in bytes.
- *
- * @warning You must set frame_size_ptr to the allocated size of the
- * output buffer before calling avcodec_decode_audio3().
- *
- * @warning The input buffer must be FF_INPUT_BUFFER_PADDING_SIZE larger than
- * the actual read bytes because some optimized bitstream readers read 32 or 64
- * bits at once and could read over the end.
- *
- * @warning The end of the input buffer avpkt->data should be set to 0 to ensure that
- * no overreading happens for damaged MPEG streams.
- *
- * @warning You must not provide a custom get_buffer() when using
- * avcodec_decode_audio3().  Doing so will override it with
- * avcodec_default_get_buffer.  Use avcodec_decode_audio4() instead,
- * which does allow the application to provide a custom get_buffer().
- *
- * @note You might have to align the input buffer avpkt->data and output buffer
- * samples. The alignment requirements depend on the CPU: On some CPUs it isn't
- * necessary at all, on others it won't work at all if not aligned and on others
- * it will work but it will have an impact on performance.
- *
- * In practice, avpkt->data should have 4 byte alignment at minimum and
- * samples should be 16 byte aligned unless the CPU doesn't need it
- * (AltiVec and SSE do).
- *
- * @note Codecs which have the CODEC_CAP_DELAY capability set have a delay
- * between input and output, these need to be fed with avpkt->data=NULL,
- * avpkt->size=0 at the end to return the remaining frames.
- *
- * @param avctx the codec context
- * @param[out] samples the output buffer, sample type in avctx->sample_fmt
- *                     If the sample format is planar, each channel plane will
- *                     be the same size, with no padding between channels.
- * @param[in,out] frame_size_ptr the output buffer size in bytes
- * @param[in] avpkt The input AVPacket containing the input buffer.
- *            You can create such packet with av_init_packet() and by then setting
- *            data and size, some decoders might in addition need other fields.
- *            All decoders are designed to use the least fields possible though.
- * @return On error a negative value is returned, otherwise the number of bytes
- * used or zero if no frame data was decompressed (used) from the input AVPacket.
- */
-attribute_deprecated int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples,
-                         int *frame_size_ptr,
-                         AVPacket *avpkt);
-#endif
-
-/**
- * Decode the audio frame of size avpkt->size from avpkt->data into frame.
- *
- * Some decoders may support multiple frames in a single AVPacket. Such
- * decoders would then just decode the first frame. In this case,
- * avcodec_decode_audio4 has to be called again with an AVPacket containing
- * the remaining data in order to decode the second frame, etc...
- * Even if no frames are returned, the packet needs to be fed to the decoder
- * with remaining data until it is completely consumed or an error occurs.
- *
- * @warning The input buffer, avpkt->data must be FF_INPUT_BUFFER_PADDING_SIZE
- *          larger than the actual read bytes because some optimized bitstream
- *          readers read 32 or 64 bits at once and could read over the end.
- *
- * @note You might have to align the input buffer. The alignment requirements
- *       depend on the CPU and the decoder.
- *
- * @param      avctx the codec context
- * @param[out] frame The AVFrame in which to store decoded audio samples.
- *                   Decoders request a buffer of a particular size by setting
- *                   AVFrame.nb_samples prior to calling get_buffer(). The
- *                   decoder may, however, only utilize part of the buffer by
- *                   setting AVFrame.nb_samples to a smaller value in the
- *                   output frame.
- * @param[out] got_frame_ptr Zero if no frame could be decoded, otherwise it is
- *                           non-zero.
- * @param[in]  avpkt The input AVPacket containing the input buffer.
- *                   At least avpkt->data and avpkt->size should be set. Some
- *                   decoders might also require additional fields to be set.
- * @return A negative error code is returned if an error occurred during
- *         decoding, otherwise the number of bytes consumed from the input
- *         AVPacket is returned.
- */
-int avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame,
-                          int *got_frame_ptr, AVPacket *avpkt);
-
-/**
- * Decode the video frame of size avpkt->size from avpkt->data into picture.
- * Some decoders may support multiple frames in a single AVPacket, such
- * decoders would then just decode the first frame.
- *
- * @warning The input buffer must be FF_INPUT_BUFFER_PADDING_SIZE larger than
- * the actual read bytes because some optimized bitstream readers read 32 or 64
- * bits at once and could read over the end.
- *
- * @warning The end of the input buffer buf should be set to 0 to ensure that
- * no overreading happens for damaged MPEG streams.
- *
- * @note You might have to align the input buffer avpkt->data.
- * The alignment requirements depend on the CPU: on some CPUs it isn't
- * necessary at all, on others it won't work at all if not aligned and on others
- * it will work but it will have an impact on performance.
- *
- * In practice, avpkt->data should have 4 byte alignment at minimum.
- *
- * @note Codecs which have the CODEC_CAP_DELAY capability set have a delay
- * between input and output, these need to be fed with avpkt->data=NULL,
- * avpkt->size=0 at the end to return the remaining frames.
- *
- * @param avctx the codec context
- * @param[out] picture The AVFrame in which the decoded video frame will be stored.
- *             Use avcodec_alloc_frame to get an AVFrame, the codec will
- *             allocate memory for the actual bitmap.
- *             with default get/release_buffer(), the decoder frees/reuses the bitmap as it sees fit.
- *             with overridden get/release_buffer() (needs CODEC_CAP_DR1) the user decides into what buffer the decoder
- *                   decodes and the decoder tells the user once it does not need the data anymore,
- *                   the user app can at this point free/reuse/keep the memory as it sees fit.
- *
- * @param[in] avpkt The input AVpacket containing the input buffer.
- *            You can create such packet with av_init_packet() and by then setting
- *            data and size, some decoders might in addition need other fields like
- *            flags&AV_PKT_FLAG_KEY. All decoders are designed to use the least
- *            fields possible.
- * @param[in,out] got_picture_ptr Zero if no frame could be decompressed, otherwise, it is nonzero.
- * @return On error a negative value is returned, otherwise the number of bytes
- * used or zero if no frame could be decompressed.
- */
-int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
-                         int *got_picture_ptr,
-                         AVPacket *avpkt);
-
-/**
- * Decode a subtitle message.
- * Return a negative value on error, otherwise return the number of bytes used.
- * If no subtitle could be decompressed, got_sub_ptr is zero.
- * Otherwise, the subtitle is stored in *sub.
- * Note that CODEC_CAP_DR1 is not available for subtitle codecs. This is for
- * simplicity, because the performance difference is expect to be negligible
- * and reusing a get_buffer written for video codecs would probably perform badly
- * due to a potentially very different allocation pattern.
- *
- * @param avctx the codec context
- * @param[out] sub The AVSubtitle in which the decoded subtitle will be stored, must be
-                   freed with avsubtitle_free if *got_sub_ptr is set.
- * @param[in,out] got_sub_ptr Zero if no subtitle could be decompressed, otherwise, it is nonzero.
- * @param[in] avpkt The input AVPacket containing the input buffer.
- */
-int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
-                            int *got_sub_ptr,
-                            AVPacket *avpkt);
-
-/**
- * Free all allocated data in the given subtitle struct.
- *
- * @param sub AVSubtitle to free.
- */
-void avsubtitle_free(AVSubtitle *sub);
-
-#if FF_API_OLD_ENCODE_AUDIO
-/**
- * Encode an audio frame from samples into buf.
- *
- * @deprecated Use avcodec_encode_audio2 instead.
- *
- * @note The output buffer should be at least FF_MIN_BUFFER_SIZE bytes large.
- * However, for codecs with avctx->frame_size equal to 0 (e.g. PCM) the user
- * will know how much space is needed because it depends on the value passed
- * in buf_size as described below. In that case a lower value can be used.
- *
- * @param avctx the codec context
- * @param[out] buf the output buffer
- * @param[in] buf_size the output buffer size
- * @param[in] samples the input buffer containing the samples
- * The number of samples read from this buffer is frame_size*channels,
- * both of which are defined in avctx.
- * For codecs which have avctx->frame_size equal to 0 (e.g. PCM) the number of
- * samples read from samples is equal to:
- * buf_size * 8 / (avctx->channels * av_get_bits_per_sample(avctx->codec_id))
- * This also implies that av_get_bits_per_sample() must not return 0 for these
- * codecs.
- * @return On error a negative value is returned, on success zero or the number
- * of bytes used to encode the data read from the input buffer.
- */
-int attribute_deprecated avcodec_encode_audio(AVCodecContext *avctx,
-                                              uint8_t *buf, int buf_size,
-                                              const short *samples);
-#endif
-
-/**
- * Encode a frame of audio.
- *
- * Takes input samples from frame and writes the next output packet, if
- * available, to avpkt. The output packet does not necessarily contain data for
- * the most recent frame, as encoders can delay, split, and combine input frames
- * internally as needed.
- *
- * @param avctx     codec context
- * @param avpkt     output AVPacket.
- *                  The user can supply an output buffer by setting
- *                  avpkt->data and avpkt->size prior to calling the
- *                  function, but if the size of the user-provided data is not
- *                  large enough, encoding will fail. All other AVPacket fields
- *                  will be reset by the encoder using av_init_packet(). If
- *                  avpkt->data is NULL, the encoder will allocate it.
- *                  The encoder will set avpkt->size to the size of the
- *                  output packet.
- * @param[in] frame AVFrame containing the raw audio data to be encoded.
- *                  May be NULL when flushing an encoder that has the
- *                  CODEC_CAP_DELAY capability set.
- *                  There are 2 codec capabilities that affect the allowed
- *                  values of frame->nb_samples.
- *                  If CODEC_CAP_SMALL_LAST_FRAME is set, then only the final
- *                  frame may be smaller than avctx->frame_size, and all other
- *                  frames must be equal to avctx->frame_size.
- *                  If CODEC_CAP_VARIABLE_FRAME_SIZE is set, then each frame
- *                  can have any number of samples.
- *                  If neither is set, frame->nb_samples must be equal to
- *                  avctx->frame_size for all frames.
- * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the
- *                            output packet is non-empty, and to 0 if it is
- *                            empty. If the function returns an error, the
- *                            packet can be assumed to be invalid, and the
- *                            value of got_packet_ptr is undefined and should
- *                            not be used.
- * @return          0 on success, negative error code on failure
- */
-int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt,
-                          const AVFrame *frame, int *got_packet_ptr);
-
-/**
- * Fill audio frame data and linesize.
- * AVFrame extended_data channel pointers are allocated if necessary for
- * planar audio.
- *
- * @param frame       the AVFrame
- *                    frame->nb_samples must be set prior to calling the
- *                    function. This function fills in frame->data,
- *                    frame->extended_data, frame->linesize[0].
- * @param nb_channels channel count
- * @param sample_fmt  sample format
- * @param buf         buffer to use for frame data
- * @param buf_size    size of buffer
- * @param align       plane size sample alignment
- * @return            0 on success, negative error code on failure
- */
-int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels,
-                             enum AVSampleFormat sample_fmt, const uint8_t *buf,
-                             int buf_size, int align);
-
-/**
- * Encode a video frame from pict into buf.
- * The input picture should be
- * stored using a specific format, namely avctx.pix_fmt.
- *
- * @param avctx the codec context
- * @param[out] buf the output buffer for the bitstream of encoded frame
- * @param[in] buf_size the size of the output buffer in bytes
- * @param[in] pict the input picture to encode
- * @return On error a negative value is returned, on success zero or the number
- * of bytes used from the output buffer.
- */
-int avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size,
-                         const AVFrame *pict);
-int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size,
-                            const AVSubtitle *sub);
-
-/**
- * Close a given AVCodecContext and free all the data associated with it
- * (but not the AVCodecContext itself).
- *
- * Calling this function on an AVCodecContext that hasn't been opened will free
- * the codec-specific data allocated in avcodec_alloc_context3() /
- * avcodec_get_context_defaults3() with a non-NULL codec. Subsequent calls will
- * do nothing.
- */
-int avcodec_close(AVCodecContext *avctx);
-
-/**
- * Register all the codecs, parsers and bitstream filters which were enabled at
- * configuration time. If you do not call this function you can select exactly
- * which formats you want to support, by using the individual registration
- * functions.
- *
- * @see avcodec_register
- * @see av_register_codec_parser
- * @see av_register_bitstream_filter
- */
-void avcodec_register_all(void);
-
-/**
- * Flush buffers, should be called when seeking or when switching to a different stream.
- */
-void avcodec_flush_buffers(AVCodecContext *avctx);
-
-void avcodec_default_free_buffers(AVCodecContext *s);
-
-/* misc useful functions */
-
-#if FF_API_OLD_FF_PICT_TYPES
-/**
- * Return a single letter to describe the given picture type pict_type.
- *
- * @param[in] pict_type the picture type
- * @return A single character representing the picture type.
- * @deprecated Use av_get_picture_type_char() instead.
- */
-attribute_deprecated
-char av_get_pict_type_char(int pict_type);
-#endif
-
-/**
- * Return codec bits per sample.
- *
- * @param[in] codec_id the codec
- * @return Number of bits per sample or zero if unknown for the given codec.
- */
-int av_get_bits_per_sample(enum CodecID codec_id);
-
-#if FF_API_OLD_SAMPLE_FMT
-/**
- * @deprecated Use av_get_bytes_per_sample() instead.
- */
-attribute_deprecated
-int av_get_bits_per_sample_format(enum AVSampleFormat sample_fmt);
-#endif
-
-/* frame parsing */
-typedef struct AVCodecParserContext {
-    void *priv_data;
-    struct AVCodecParser *parser;
-    int64_t frame_offset; /* offset of the current frame */
-    int64_t cur_offset; /* current offset
-                           (incremented by each av_parser_parse()) */
-    int64_t next_frame_offset; /* offset of the next frame */
-    /* video info */
-    int pict_type; /* XXX: Put it back in AVCodecContext. */
-    /**
-     * This field is used for proper frame duration computation in lavf.
-     * It signals, how much longer the frame duration of the current frame
-     * is compared to normal frame duration.
-     *
-     * frame_duration = (1 + repeat_pict) * time_base
-     *
-     * It is used by codecs like H.264 to display telecined material.
-     */
-    int repeat_pict; /* XXX: Put it back in AVCodecContext. */
-    int64_t pts;     /* pts of the current frame */
-    int64_t dts;     /* dts of the current frame */
-
-    /* private data */
-    int64_t last_pts;
-    int64_t last_dts;
-    int fetch_timestamp;
-
-#define AV_PARSER_PTS_NB 4
-    int cur_frame_start_index;
-    int64_t cur_frame_offset[AV_PARSER_PTS_NB];
-    int64_t cur_frame_pts[AV_PARSER_PTS_NB];
-    int64_t cur_frame_dts[AV_PARSER_PTS_NB];
-
-    int flags;
-#define PARSER_FLAG_COMPLETE_FRAMES           0x0001
-#define PARSER_FLAG_ONCE                      0x0002
-/// Set if the parser has a valid file offset
-#define PARSER_FLAG_FETCHED_OFFSET            0x0004
-
-    int64_t offset;      ///< byte offset from starting packet start
-    int64_t cur_frame_end[AV_PARSER_PTS_NB];
-
-    /**
-     * Set by parser to 1 for key frames and 0 for non-key frames.
-     * It is initialized to -1, so if the parser doesn't set this flag,
-     * old-style fallback using AV_PICTURE_TYPE_I picture type as key frames
-     * will be used.
-     */
-    int key_frame;
-
-    /**
-     * Time difference in stream time base units from the pts of this
-     * packet to the point at which the output from the decoder has converged
-     * independent from the availability of previous frames. That is, the
-     * frames are virtually identical no matter if decoding started from
-     * the very first frame or from this keyframe.
-     * Is AV_NOPTS_VALUE if unknown.
-     * This field is not the display duration of the current frame.
-     * This field has no meaning if the packet does not have AV_PKT_FLAG_KEY
-     * set.
-     *
-     * The purpose of this field is to allow seeking in streams that have no
-     * keyframes in the conventional sense. It corresponds to the
-     * recovery point SEI in H.264 and match_time_delta in NUT. It is also
-     * essential for some types of subtitle streams to ensure that all
-     * subtitles are correctly displayed after seeking.
-     */
-    int64_t convergence_duration;
-
-    // Timestamp generation support:
-    /**
-     * Synchronization point for start of timestamp generation.
-     *
-     * Set to >0 for sync point, 0 for no sync point and <0 for undefined
-     * (default).
-     *
-     * For example, this corresponds to presence of H.264 buffering period
-     * SEI message.
-     */
-    int dts_sync_point;
-
-    /**
-     * Offset of the current timestamp against last timestamp sync point in
-     * units of AVCodecContext.time_base.
-     *
-     * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
-     * contain a valid timestamp offset.
-     *
-     * Note that the timestamp of sync point has usually a nonzero
-     * dts_ref_dts_delta, which refers to the previous sync point. Offset of
-     * the next frame after timestamp sync point will be usually 1.
-     *
-     * For example, this corresponds to H.264 cpb_removal_delay.
-     */
-    int dts_ref_dts_delta;
-
-    /**
-     * Presentation delay of current frame in units of AVCodecContext.time_base.
-     *
-     * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
-     * contain valid non-negative timestamp delta (presentation time of a frame
-     * must not lie in the past).
-     *
-     * This delay represents the difference between decoding and presentation
-     * time of the frame.
-     *
-     * For example, this corresponds to H.264 dpb_output_delay.
-     */
-    int pts_dts_delta;
-
-    /**
-     * Position of the packet in file.
-     *
-     * Analogous to cur_frame_pts/dts
-     */
-    int64_t cur_frame_pos[AV_PARSER_PTS_NB];
-
-    /**
-     * Byte position of currently parsed frame in stream.
-     */
-    int64_t pos;
-
-    /**
-     * Previous frame byte position.
-     */
-    int64_t last_pos;
-} AVCodecParserContext;
-
-typedef struct AVCodecParser {
-    int codec_ids[5]; /* several codec IDs are permitted */
-    int priv_data_size;
-    int (*parser_init)(AVCodecParserContext *s);
-    int (*parser_parse)(AVCodecParserContext *s,
-                        AVCodecContext *avctx,
-                        const uint8_t **poutbuf, int *poutbuf_size,
-                        const uint8_t *buf, int buf_size);
-    void (*parser_close)(AVCodecParserContext *s);
-    int (*split)(AVCodecContext *avctx, const uint8_t *buf, int buf_size);
-    struct AVCodecParser *next;
-} AVCodecParser;
-
-AVCodecParser *av_parser_next(AVCodecParser *c);
-
-void av_register_codec_parser(AVCodecParser *parser);
-AVCodecParserContext *av_parser_init(int codec_id);
-
-/**
- * Parse a packet.
- *
- * @param s             parser context.
- * @param avctx         codec context.
- * @param poutbuf       set to pointer to parsed buffer or NULL if not yet finished.
- * @param poutbuf_size  set to size of parsed buffer or zero if not yet finished.
- * @param buf           input buffer.
- * @param buf_size      input length, to signal EOF, this should be 0 (so that the last frame can be output).
- * @param pts           input presentation timestamp.
- * @param dts           input decoding timestamp.
- * @param pos           input byte position in stream.
- * @return the number of bytes of the input bitstream used.
- *
- * Example:
- * @code
- *   while(in_len){
- *       len = av_parser_parse2(myparser, AVCodecContext, &data, &size,
- *                                        in_data, in_len,
- *                                        pts, dts, pos);
- *       in_data += len;
- *       in_len  -= len;
- *
- *       if(size)
- *          decode_frame(data, size);
- *   }
- * @endcode
- */
-int av_parser_parse2(AVCodecParserContext *s,
-                     AVCodecContext *avctx,
-                     uint8_t **poutbuf, int *poutbuf_size,
-                     const uint8_t *buf, int buf_size,
-                     int64_t pts, int64_t dts,
-                     int64_t pos);
-
-int av_parser_change(AVCodecParserContext *s,
-                     AVCodecContext *avctx,
-                     uint8_t **poutbuf, int *poutbuf_size,
-                     const uint8_t *buf, int buf_size, int keyframe);
-void av_parser_close(AVCodecParserContext *s);
-
-
-typedef struct AVBitStreamFilterContext {
-    void *priv_data;
-    struct AVBitStreamFilter *filter;
-    AVCodecParserContext *parser;
-    struct AVBitStreamFilterContext *next;
-} AVBitStreamFilterContext;
-
-
-typedef struct AVBitStreamFilter {
-    const char *name;
-    int priv_data_size;
-    int (*filter)(AVBitStreamFilterContext *bsfc,
-                  AVCodecContext *avctx, const char *args,
-                  uint8_t **poutbuf, int *poutbuf_size,
-                  const uint8_t *buf, int buf_size, int keyframe);
-    void (*close)(AVBitStreamFilterContext *bsfc);
-    struct AVBitStreamFilter *next;
-} AVBitStreamFilter;
-
-void av_register_bitstream_filter(AVBitStreamFilter *bsf);
-AVBitStreamFilterContext *av_bitstream_filter_init(const char *name);
-int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc,
-                               AVCodecContext *avctx, const char *args,
-                               uint8_t **poutbuf, int *poutbuf_size,
-                               const uint8_t *buf, int buf_size, int keyframe);
-void av_bitstream_filter_close(AVBitStreamFilterContext *bsf);
-
-AVBitStreamFilter *av_bitstream_filter_next(AVBitStreamFilter *f);
-
-/* memory */
-
-/**
- * Reallocate the given block if it is not large enough, otherwise do nothing.
- *
- * @see av_realloc
- */
-void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size);
-
-/**
- * Allocate a buffer, reusing the given one if large enough.
- *
- * Contrary to av_fast_realloc the current buffer contents might not be
- * preserved and on error the old buffer is freed, thus no special
- * handling to avoid memleaks is necessary.
- *
- * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer
- * @param size size of the buffer *ptr points to
- * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and
- *                 *size 0 if an error occurred.
- */
-void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size);
-
-/**
- * Copy image src to dst. Wraps av_picture_data_copy() above.
- */
-void av_picture_copy(AVPicture *dst, const AVPicture *src,
-                     enum PixelFormat pix_fmt, int width, int height);
-
-/**
- * Crop image top and left side.
- */
-int av_picture_crop(AVPicture *dst, const AVPicture *src,
-                    enum PixelFormat pix_fmt, int top_band, int left_band);
-
-/**
- * Pad image.
- */
-int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, enum PixelFormat pix_fmt,
-            int padtop, int padbottom, int padleft, int padright, int *color);
-
-/**
- * Encode extradata length to a buffer. Used by xiph codecs.
- *
- * @param s buffer to write to; must be at least (v/255+1) bytes long
- * @param v size of extradata in bytes
- * @return number of bytes written to the buffer.
- */
-unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
-
-/**
- * Log a generic warning message about a missing feature. This function is
- * intended to be used internally by Libav (libavcodec, libavformat, etc.)
- * only, and would normally not be used by applications.
- * @param[in] avc a pointer to an arbitrary struct of which the first field is
- * a pointer to an AVClass struct
- * @param[in] feature string containing the name of the missing feature
- * @param[in] want_sample indicates if samples are wanted which exhibit this feature.
- * If want_sample is non-zero, additional verbage will be added to the log
- * message which tells the user how to report samples to the development
- * mailing list.
- */
-void av_log_missing_feature(void *avc, const char *feature, int want_sample);
-
-/**
- * Log a generic warning message asking for a sample. This function is
- * intended to be used internally by Libav (libavcodec, libavformat, etc.)
- * only, and would normally not be used by applications.
- * @param[in] avc a pointer to an arbitrary struct of which the first field is
- * a pointer to an AVClass struct
- * @param[in] msg string containing an optional message, or NULL if no message
- */
-void av_log_ask_for_sample(void *avc, const char *msg, ...) av_printf_format(2, 3);
-
-/**
- * Register the hardware accelerator hwaccel.
- */
-void av_register_hwaccel(AVHWAccel *hwaccel);
-
-/**
- * If hwaccel is NULL, returns the first registered hardware accelerator,
- * if hwaccel is non-NULL, returns the next registered hardware accelerator
- * after hwaccel, or NULL if hwaccel is the last one.
- */
-AVHWAccel *av_hwaccel_next(AVHWAccel *hwaccel);
-
-
-/**
- * Lock operation used by lockmgr
- */
-enum AVLockOp {
-  AV_LOCK_CREATE,  ///< Create a mutex
-  AV_LOCK_OBTAIN,  ///< Lock the mutex
-  AV_LOCK_RELEASE, ///< Unlock the mutex
-  AV_LOCK_DESTROY, ///< Free mutex resources
-};
-
-/**
- * Register a user provided lock manager supporting the operations
- * specified by AVLockOp. mutex points to a (void *) where the
- * lockmgr should store/get a pointer to a user allocated mutex. It's
- * NULL upon AV_LOCK_CREATE and != NULL for all other ops.
- *
- * @param cb User defined callback. Note: Libav may invoke calls to this
- *           callback during the call to av_lockmgr_register().
- *           Thus, the application must be prepared to handle that.
- *           If cb is set to NULL the lockmgr will be unregistered.
- *           Also note that during unregistration the previously registered
- *           lockmgr callback may also be invoked.
- */
-int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op));
-
-/**
- * Get the type of the given codec.
- */
-enum AVMediaType avcodec_get_type(enum CodecID codec_id);
-
-/**
- * Get the AVClass for AVCodecContext. It can be used in combination with
- * AV_OPT_SEARCH_FAKE_OBJ for examining options.
- *
- * @see av_opt_find().
- */
-const AVClass *avcodec_get_class(void);
-
-/**
- * @return a positive value if s is open (i.e. avcodec_open2() was called on it
- * with no corresponding avcodec_close()), 0 otherwise.
- */
-int avcodec_is_open(AVCodecContext *s);
-
-#endif /* AVCODEC_AVCODEC_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/avfft.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/avfft.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/avfft.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/avfft.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,99 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_AVFFT_H
-#define AVCODEC_AVFFT_H
-
-typedef float FFTSample;
-
-typedef struct FFTComplex {
-    FFTSample re, im;
-} FFTComplex;
-
-typedef struct FFTContext FFTContext;
-
-/**
- * Set up a complex FFT.
- * @param nbits           log2 of the length of the input array
- * @param inverse         if 0 perform the forward transform, if 1 perform the inverse
- */
-FFTContext *av_fft_init(int nbits, int inverse);
-
-/**
- * Do the permutation needed BEFORE calling ff_fft_calc().
- */
-void av_fft_permute(FFTContext *s, FFTComplex *z);
-
-/**
- * Do a complex FFT with the parameters defined in av_fft_init(). The
- * input data must be permuted before. No 1.0/sqrt(n) normalization is done.
- */
-void av_fft_calc(FFTContext *s, FFTComplex *z);
-
-void av_fft_end(FFTContext *s);
-
-FFTContext *av_mdct_init(int nbits, int inverse, double scale);
-void av_imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input);
-void av_imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input);
-void av_mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input);
-void av_mdct_end(FFTContext *s);
-
-/* Real Discrete Fourier Transform */
-
-enum RDFTransformType {
-    DFT_R2C,
-    IDFT_C2R,
-    IDFT_R2C,
-    DFT_C2R,
-};
-
-typedef struct RDFTContext RDFTContext;
-
-/**
- * Set up a real FFT.
- * @param nbits           log2 of the length of the input array
- * @param trans           the type of transform
- */
-RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans);
-void av_rdft_calc(RDFTContext *s, FFTSample *data);
-void av_rdft_end(RDFTContext *s);
-
-/* Discrete Cosine Transform */
-
-typedef struct DCTContext DCTContext;
-
-enum DCTTransformType {
-    DCT_II = 0,
-    DCT_III,
-    DCT_I,
-    DST_I,
-};
-
-/**
- * Set up DCT.
- * @param nbits           size of the input array:
- *                        (1 << nbits)     for DCT-II, DCT-III and DST-I
- *                        (1 << nbits) + 1 for DCT-I
- *
- * @note the first element of the input of DST-I is ignored
- */
-DCTContext *av_dct_init(int nbits, enum DCTTransformType type);
-void av_dct_calc(DCTContext *s, FFTSample *data);
-void av_dct_end (DCTContext *s);
-
-#endif /* AVCODEC_AVFFT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/dxva2.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/dxva2.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/dxva2.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/dxva2.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-/*
- * DXVA2 HW acceleration
- *
- * copyright (c) 2009 Laurent Aimar
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_DXVA_H
-#define AVCODEC_DXVA_H
-
-#include <stdint.h>
-
-#include <d3d9.h>
-#include <dxva2api.h>
-
-#define FF_DXVA2_WORKAROUND_SCALING_LIST_ZIGZAG 1 ///< Work around for DXVA2 and old UVD/UVD+ ATI video cards
-
-/**
- * This structure is used to provides the necessary configurations and data
- * to the DXVA2 Libav HWAccel implementation.
- *
- * The application must make it available as AVCodecContext.hwaccel_context.
- */
-struct dxva_context {
-    /**
-     * DXVA2 decoder object
-     */
-    IDirectXVideoDecoder *decoder;
-
-    /**
-     * DXVA2 configuration used to create the decoder
-     */
-    const DXVA2_ConfigPictureDecode *cfg;
-
-    /**
-     * The number of surface in the surface array
-     */
-    unsigned surface_count;
-
-    /**
-     * The array of Direct3D surfaces used to create the decoder
-     */
-    LPDIRECT3DSURFACE9 *surface;
-
-    /**
-     * A bit field configuring the workarounds needed for using the decoder
-     */
-    uint64_t workaround;
-
-    /**
-     * Private to the Libav AVHWAccel implementation
-     */
-    unsigned report_id;
-};
-
-#endif /* AVCODEC_DXVA_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/old_codec_ids.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/old_codec_ids.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/old_codec_ids.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/old_codec_ids.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,398 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_OLD_CODEC_IDS_H
-#define AVCODEC_OLD_CODEC_IDS_H
-
-#include "libavutil/common.h"
-
-/*
- * This header exists to prevent new codec IDs from being accidentally added to
- * the deprecated list.
- * Do not include it directly. It will be removed on next major bump
- *
- * Do not add new items to this list. Use the AVCodecID enum instead.
- */
-
-    CODEC_ID_NONE = AV_CODEC_ID_NONE,
-
-    /* video codecs */
-    CODEC_ID_MPEG1VIDEO,
-    CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
-    CODEC_ID_MPEG2VIDEO_XVMC,
-    CODEC_ID_H261,
-    CODEC_ID_H263,
-    CODEC_ID_RV10,
-    CODEC_ID_RV20,
-    CODEC_ID_MJPEG,
-    CODEC_ID_MJPEGB,
-    CODEC_ID_LJPEG,
-    CODEC_ID_SP5X,
-    CODEC_ID_JPEGLS,
-    CODEC_ID_MPEG4,
-    CODEC_ID_RAWVIDEO,
-    CODEC_ID_MSMPEG4V1,
-    CODEC_ID_MSMPEG4V2,
-    CODEC_ID_MSMPEG4V3,
-    CODEC_ID_WMV1,
-    CODEC_ID_WMV2,
-    CODEC_ID_H263P,
-    CODEC_ID_H263I,
-    CODEC_ID_FLV1,
-    CODEC_ID_SVQ1,
-    CODEC_ID_SVQ3,
-    CODEC_ID_DVVIDEO,
-    CODEC_ID_HUFFYUV,
-    CODEC_ID_CYUV,
-    CODEC_ID_H264,
-    CODEC_ID_INDEO3,
-    CODEC_ID_VP3,
-    CODEC_ID_THEORA,
-    CODEC_ID_ASV1,
-    CODEC_ID_ASV2,
-    CODEC_ID_FFV1,
-    CODEC_ID_4XM,
-    CODEC_ID_VCR1,
-    CODEC_ID_CLJR,
-    CODEC_ID_MDEC,
-    CODEC_ID_ROQ,
-    CODEC_ID_INTERPLAY_VIDEO,
-    CODEC_ID_XAN_WC3,
-    CODEC_ID_XAN_WC4,
-    CODEC_ID_RPZA,
-    CODEC_ID_CINEPAK,
-    CODEC_ID_WS_VQA,
-    CODEC_ID_MSRLE,
-    CODEC_ID_MSVIDEO1,
-    CODEC_ID_IDCIN,
-    CODEC_ID_8BPS,
-    CODEC_ID_SMC,
-    CODEC_ID_FLIC,
-    CODEC_ID_TRUEMOTION1,
-    CODEC_ID_VMDVIDEO,
-    CODEC_ID_MSZH,
-    CODEC_ID_ZLIB,
-    CODEC_ID_QTRLE,
-    CODEC_ID_SNOW,
-    CODEC_ID_TSCC,
-    CODEC_ID_ULTI,
-    CODEC_ID_QDRAW,
-    CODEC_ID_VIXL,
-    CODEC_ID_QPEG,
-    CODEC_ID_PNG,
-    CODEC_ID_PPM,
-    CODEC_ID_PBM,
-    CODEC_ID_PGM,
-    CODEC_ID_PGMYUV,
-    CODEC_ID_PAM,
-    CODEC_ID_FFVHUFF,
-    CODEC_ID_RV30,
-    CODEC_ID_RV40,
-    CODEC_ID_VC1,
-    CODEC_ID_WMV3,
-    CODEC_ID_LOCO,
-    CODEC_ID_WNV1,
-    CODEC_ID_AASC,
-    CODEC_ID_INDEO2,
-    CODEC_ID_FRAPS,
-    CODEC_ID_TRUEMOTION2,
-    CODEC_ID_BMP,
-    CODEC_ID_CSCD,
-    CODEC_ID_MMVIDEO,
-    CODEC_ID_ZMBV,
-    CODEC_ID_AVS,
-    CODEC_ID_SMACKVIDEO,
-    CODEC_ID_NUV,
-    CODEC_ID_KMVC,
-    CODEC_ID_FLASHSV,
-    CODEC_ID_CAVS,
-    CODEC_ID_JPEG2000,
-    CODEC_ID_VMNC,
-    CODEC_ID_VP5,
-    CODEC_ID_VP6,
-    CODEC_ID_VP6F,
-    CODEC_ID_TARGA,
-    CODEC_ID_DSICINVIDEO,
-    CODEC_ID_TIERTEXSEQVIDEO,
-    CODEC_ID_TIFF,
-    CODEC_ID_GIF,
-    CODEC_ID_DXA,
-    CODEC_ID_DNXHD,
-    CODEC_ID_THP,
-    CODEC_ID_SGI,
-    CODEC_ID_C93,
-    CODEC_ID_BETHSOFTVID,
-    CODEC_ID_PTX,
-    CODEC_ID_TXD,
-    CODEC_ID_VP6A,
-    CODEC_ID_AMV,
-    CODEC_ID_VB,
-    CODEC_ID_PCX,
-    CODEC_ID_SUNRAST,
-    CODEC_ID_INDEO4,
-    CODEC_ID_INDEO5,
-    CODEC_ID_MIMIC,
-    CODEC_ID_RL2,
-    CODEC_ID_ESCAPE124,
-    CODEC_ID_DIRAC,
-    CODEC_ID_BFI,
-    CODEC_ID_CMV,
-    CODEC_ID_MOTIONPIXELS,
-    CODEC_ID_TGV,
-    CODEC_ID_TGQ,
-    CODEC_ID_TQI,
-    CODEC_ID_AURA,
-    CODEC_ID_AURA2,
-    CODEC_ID_V210X,
-    CODEC_ID_TMV,
-    CODEC_ID_V210,
-    CODEC_ID_DPX,
-    CODEC_ID_MAD,
-    CODEC_ID_FRWU,
-    CODEC_ID_FLASHSV2,
-    CODEC_ID_CDGRAPHICS,
-    CODEC_ID_R210,
-    CODEC_ID_ANM,
-    CODEC_ID_BINKVIDEO,
-    CODEC_ID_IFF_ILBM,
-    CODEC_ID_IFF_BYTERUN1,
-    CODEC_ID_KGV1,
-    CODEC_ID_YOP,
-    CODEC_ID_VP8,
-    CODEC_ID_PICTOR,
-    CODEC_ID_ANSI,
-    CODEC_ID_A64_MULTI,
-    CODEC_ID_A64_MULTI5,
-    CODEC_ID_R10K,
-    CODEC_ID_MXPEG,
-    CODEC_ID_LAGARITH,
-    CODEC_ID_PRORES,
-    CODEC_ID_JV,
-    CODEC_ID_DFA,
-    CODEC_ID_WMV3IMAGE,
-    CODEC_ID_VC1IMAGE,
-    CODEC_ID_UTVIDEO,
-    CODEC_ID_BMV_VIDEO,
-    CODEC_ID_VBLE,
-    CODEC_ID_DXTORY,
-    CODEC_ID_V410,
-    CODEC_ID_XWD,
-    CODEC_ID_CDXL,
-    CODEC_ID_XBM,
-    CODEC_ID_ZEROCODEC,
-    CODEC_ID_MSS1,
-    CODEC_ID_MSA1,
-    CODEC_ID_TSCC2,
-    CODEC_ID_MTS2,
-    CODEC_ID_CLLC,
-    CODEC_ID_Y41P       = MKBETAG('Y','4','1','P'),
-    CODEC_ID_ESCAPE130  = MKBETAG('E','1','3','0'),
-    CODEC_ID_EXR        = MKBETAG('0','E','X','R'),
-    CODEC_ID_AVRP       = MKBETAG('A','V','R','P'),
-
-    CODEC_ID_G2M        = MKBETAG( 0 ,'G','2','M'),
-    CODEC_ID_AVUI       = MKBETAG('A','V','U','I'),
-    CODEC_ID_AYUV       = MKBETAG('A','Y','U','V'),
-    CODEC_ID_V308       = MKBETAG('V','3','0','8'),
-    CODEC_ID_V408       = MKBETAG('V','4','0','8'),
-    CODEC_ID_YUV4       = MKBETAG('Y','U','V','4'),
-    CODEC_ID_SANM       = MKBETAG('S','A','N','M'),
-    CODEC_ID_PAF_VIDEO  = MKBETAG('P','A','F','V'),
-
-    /* various PCM "codecs" */
-    CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs
-    CODEC_ID_PCM_S16LE = 0x10000,
-    CODEC_ID_PCM_S16BE,
-    CODEC_ID_PCM_U16LE,
-    CODEC_ID_PCM_U16BE,
-    CODEC_ID_PCM_S8,
-    CODEC_ID_PCM_U8,
-    CODEC_ID_PCM_MULAW,
-    CODEC_ID_PCM_ALAW,
-    CODEC_ID_PCM_S32LE,
-    CODEC_ID_PCM_S32BE,
-    CODEC_ID_PCM_U32LE,
-    CODEC_ID_PCM_U32BE,
-    CODEC_ID_PCM_S24LE,
-    CODEC_ID_PCM_S24BE,
-    CODEC_ID_PCM_U24LE,
-    CODEC_ID_PCM_U24BE,
-    CODEC_ID_PCM_S24DAUD,
-    CODEC_ID_PCM_ZORK,
-    CODEC_ID_PCM_S16LE_PLANAR,
-    CODEC_ID_PCM_DVD,
-    CODEC_ID_PCM_F32BE,
-    CODEC_ID_PCM_F32LE,
-    CODEC_ID_PCM_F64BE,
-    CODEC_ID_PCM_F64LE,
-    CODEC_ID_PCM_BLURAY,
-    CODEC_ID_PCM_LXF,
-    CODEC_ID_S302M,
-    CODEC_ID_PCM_S8_PLANAR,
-
-    /* various ADPCM codecs */
-    CODEC_ID_ADPCM_IMA_QT = 0x11000,
-    CODEC_ID_ADPCM_IMA_WAV,
-    CODEC_ID_ADPCM_IMA_DK3,
-    CODEC_ID_ADPCM_IMA_DK4,
-    CODEC_ID_ADPCM_IMA_WS,
-    CODEC_ID_ADPCM_IMA_SMJPEG,
-    CODEC_ID_ADPCM_MS,
-    CODEC_ID_ADPCM_4XM,
-    CODEC_ID_ADPCM_XA,
-    CODEC_ID_ADPCM_ADX,
-    CODEC_ID_ADPCM_EA,
-    CODEC_ID_ADPCM_G726,
-    CODEC_ID_ADPCM_CT,
-    CODEC_ID_ADPCM_SWF,
-    CODEC_ID_ADPCM_YAMAHA,
-    CODEC_ID_ADPCM_SBPRO_4,
-    CODEC_ID_ADPCM_SBPRO_3,
-    CODEC_ID_ADPCM_SBPRO_2,
-    CODEC_ID_ADPCM_THP,
-    CODEC_ID_ADPCM_IMA_AMV,
-    CODEC_ID_ADPCM_EA_R1,
-    CODEC_ID_ADPCM_EA_R3,
-    CODEC_ID_ADPCM_EA_R2,
-    CODEC_ID_ADPCM_IMA_EA_SEAD,
-    CODEC_ID_ADPCM_IMA_EA_EACS,
-    CODEC_ID_ADPCM_EA_XAS,
-    CODEC_ID_ADPCM_EA_MAXIS_XA,
-    CODEC_ID_ADPCM_IMA_ISS,
-    CODEC_ID_ADPCM_G722,
-    CODEC_ID_ADPCM_IMA_APC,
-    CODEC_ID_VIMA       = MKBETAG('V','I','M','A'),
-
-    /* AMR */
-    CODEC_ID_AMR_NB = 0x12000,
-    CODEC_ID_AMR_WB,
-
-    /* RealAudio codecs*/
-    CODEC_ID_RA_144 = 0x13000,
-    CODEC_ID_RA_288,
-
-    /* various DPCM codecs */
-    CODEC_ID_ROQ_DPCM = 0x14000,
-    CODEC_ID_INTERPLAY_DPCM,
-    CODEC_ID_XAN_DPCM,
-    CODEC_ID_SOL_DPCM,
-
-    /* audio codecs */
-    CODEC_ID_MP2 = 0x15000,
-    CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
-    CODEC_ID_AAC,
-    CODEC_ID_AC3,
-    CODEC_ID_DTS,
-    CODEC_ID_VORBIS,
-    CODEC_ID_DVAUDIO,
-    CODEC_ID_WMAV1,
-    CODEC_ID_WMAV2,
-    CODEC_ID_MACE3,
-    CODEC_ID_MACE6,
-    CODEC_ID_VMDAUDIO,
-    CODEC_ID_FLAC,
-    CODEC_ID_MP3ADU,
-    CODEC_ID_MP3ON4,
-    CODEC_ID_SHORTEN,
-    CODEC_ID_ALAC,
-    CODEC_ID_WESTWOOD_SND1,
-    CODEC_ID_GSM, ///< as in Berlin toast format
-    CODEC_ID_QDM2,
-    CODEC_ID_COOK,
-    CODEC_ID_TRUESPEECH,
-    CODEC_ID_TTA,
-    CODEC_ID_SMACKAUDIO,
-    CODEC_ID_QCELP,
-    CODEC_ID_WAVPACK,
-    CODEC_ID_DSICINAUDIO,
-    CODEC_ID_IMC,
-    CODEC_ID_MUSEPACK7,
-    CODEC_ID_MLP,
-    CODEC_ID_GSM_MS, /* as found in WAV */
-    CODEC_ID_ATRAC3,
-    CODEC_ID_VOXWARE,
-    CODEC_ID_APE,
-    CODEC_ID_NELLYMOSER,
-    CODEC_ID_MUSEPACK8,
-    CODEC_ID_SPEEX,
-    CODEC_ID_WMAVOICE,
-    CODEC_ID_WMAPRO,
-    CODEC_ID_WMALOSSLESS,
-    CODEC_ID_ATRAC3P,
-    CODEC_ID_EAC3,
-    CODEC_ID_SIPR,
-    CODEC_ID_MP1,
-    CODEC_ID_TWINVQ,
-    CODEC_ID_TRUEHD,
-    CODEC_ID_MP4ALS,
-    CODEC_ID_ATRAC1,
-    CODEC_ID_BINKAUDIO_RDFT,
-    CODEC_ID_BINKAUDIO_DCT,
-    CODEC_ID_AAC_LATM,
-    CODEC_ID_QDMC,
-    CODEC_ID_CELT,
-    CODEC_ID_G723_1,
-    CODEC_ID_G729,
-    CODEC_ID_8SVX_EXP,
-    CODEC_ID_8SVX_FIB,
-    CODEC_ID_BMV_AUDIO,
-    CODEC_ID_RALF,
-    CODEC_ID_IAC,
-    CODEC_ID_ILBC,
-    CODEC_ID_FFWAVESYNTH = MKBETAG('F','F','W','S'),
-    CODEC_ID_8SVX_RAW    = MKBETAG('8','S','V','X'),
-    CODEC_ID_SONIC       = MKBETAG('S','O','N','C'),
-    CODEC_ID_SONIC_LS    = MKBETAG('S','O','N','L'),
-    CODEC_ID_PAF_AUDIO   = MKBETAG('P','A','F','A'),
-    CODEC_ID_OPUS        = MKBETAG('O','P','U','S'),
-
-    /* subtitle codecs */
-    CODEC_ID_FIRST_SUBTITLE = 0x17000,          ///< A dummy ID pointing at the start of subtitle codecs.
-    CODEC_ID_DVD_SUBTITLE = 0x17000,
-    CODEC_ID_DVB_SUBTITLE,
-    CODEC_ID_TEXT,  ///< raw UTF-8 text
-    CODEC_ID_XSUB,
-    CODEC_ID_SSA,
-    CODEC_ID_MOV_TEXT,
-    CODEC_ID_HDMV_PGS_SUBTITLE,
-    CODEC_ID_DVB_TELETEXT,
-    CODEC_ID_SRT,
-    CODEC_ID_MICRODVD   = MKBETAG('m','D','V','D'),
-    CODEC_ID_EIA_608    = MKBETAG('c','6','0','8'),
-    CODEC_ID_JACOSUB    = MKBETAG('J','S','U','B'),
-    CODEC_ID_SAMI       = MKBETAG('S','A','M','I'),
-    CODEC_ID_REALTEXT   = MKBETAG('R','T','X','T'),
-    CODEC_ID_SUBVIEWER  = MKBETAG('S','u','b','V'),
-
-    /* other specific kind of codecs (generally used for attachments) */
-    CODEC_ID_FIRST_UNKNOWN = 0x18000,           ///< A dummy ID pointing at the start of various fake codecs.
-    CODEC_ID_TTF = 0x18000,
-    CODEC_ID_BINTEXT    = MKBETAG('B','T','X','T'),
-    CODEC_ID_XBIN       = MKBETAG('X','B','I','N'),
-    CODEC_ID_IDF        = MKBETAG( 0 ,'I','D','F'),
-    CODEC_ID_OTF        = MKBETAG( 0 ,'O','T','F'),
-
-    CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it
-
-    CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
-                                * stream (only used by libavformat) */
-    CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
-                                * stream (only used by libavformat) */
-    CODEC_ID_FFMETADATA = 0x21000,   ///< Dummy codec for streams containing only metadata information.
-
-#endif /* AVCODEC_OLD_CODEC_IDS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/opt.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/opt.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/opt.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/opt.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * This header is provided for compatibility only and will be removed
- * on next major bump
- */
-
-#ifndef AVCODEC_OPT_H
-#define AVCODEC_OPT_H
-
-#include "libavcodec/version.h"
-
-#if FF_API_OPT_H
-#include "libavutil/opt.h"
-#endif
-
-#endif /* AVCODEC_OPT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/vaapi.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/vaapi.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/vaapi.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/vaapi.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,167 +0,0 @@
-/*
- * Video Acceleration API (shared data between Libav and the video player)
- * HW decode acceleration for MPEG-2, MPEG-4, H.264 and VC-1
- *
- * Copyright (C) 2008-2009 Splitted-Desktop Systems
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VAAPI_H
-#define AVCODEC_VAAPI_H
-
-#include <stdint.h>
-
-/**
- * @defgroup VAAPI_Decoding VA API Decoding
- * @ingroup Decoder
- * @{
- */
-
-/**
- * This structure is used to share data between the Libav library and
- * the client video application.
- * This shall be zero-allocated and available as
- * AVCodecContext.hwaccel_context. All user members can be set once
- * during initialization or through each AVCodecContext.get_buffer()
- * function call. In any case, they must be valid prior to calling
- * decoding functions.
- */
-struct vaapi_context {
-    /**
-     * Window system dependent data
-     *
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    void *display;
-
-    /**
-     * Configuration ID
-     *
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    uint32_t config_id;
-
-    /**
-     * Context ID (video decode pipeline)
-     *
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    uint32_t context_id;
-
-    /**
-     * VAPictureParameterBuffer ID
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t pic_param_buf_id;
-
-    /**
-     * VAIQMatrixBuffer ID
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t iq_matrix_buf_id;
-
-    /**
-     * VABitPlaneBuffer ID (for VC-1 decoding)
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t bitplane_buf_id;
-
-    /**
-     * Slice parameter/data buffer IDs
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t *slice_buf_ids;
-
-    /**
-     * Number of effective slice buffer IDs to send to the HW
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int n_slice_buf_ids;
-
-    /**
-     * Size of pre-allocated slice_buf_ids
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int slice_buf_ids_alloc;
-
-    /**
-     * Pointer to VASliceParameterBuffers
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    void *slice_params;
-
-    /**
-     * Size of a VASliceParameterBuffer element
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int slice_param_size;
-
-    /**
-     * Size of pre-allocated slice_params
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int slice_params_alloc;
-
-    /**
-     * Number of slices currently filled in
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int slice_count;
-
-    /**
-     * Pointer to slice data buffer base
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    const uint8_t *slice_data;
-
-    /**
-     * Current size of slice data
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t slice_data_size;
-};
-
-/* @} */
-
-#endif /* AVCODEC_VAAPI_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/vda.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/vda.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/vda.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/vda.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,144 +0,0 @@
-/*
- * VDA HW acceleration
- *
- * copyright (c) 2011 Sebastien Zwickert
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VDA_H
-#define AVCODEC_VDA_H
-
-#include <pthread.h>
-#include <stdint.h>
-
-// emmintrin.h is unable to compile with -std=c99 -Werror=missing-prototypes
-// http://openradar.appspot.com/8026390
-#undef __GNUC_STDC_INLINE__
-
-#define Picture QuickdrawPicture
-#include <VideoDecodeAcceleration/VDADecoder.h>
-#undef Picture
-
-/**
- *  This structure is used to store a decoded frame information and data.
- */
-typedef struct vda_frame {
-    /**
-    * The PTS of the frame.
-    *
-    * - encoding: unused
-    * - decoding: Set/Unset by libavcodec.
-    */
-    int64_t             pts;
-
-    /**
-    * The CoreVideo buffer that contains the decoded data.
-    *
-    * - encoding: unused
-    * - decoding: Set/Unset by libavcodec.
-    */
-    CVPixelBufferRef    cv_buffer;
-
-    /**
-    * A pointer to the next frame.
-    *
-    * - encoding: unused
-    * - decoding: Set/Unset by libavcodec.
-    */
-    struct vda_frame    *next_frame;
-} vda_frame;
-
-/**
- * This structure is used to provide the necessary configurations and data
- * to the VDA Libav HWAccel implementation.
- *
- * The application must make it available as AVCodecContext.hwaccel_context.
- */
-struct vda_context {
-    /**
-    * VDA decoder object.
-    *
-    * - encoding: unused
-    * - decoding: Set/Unset by libavcodec.
-    */
-    VDADecoder          decoder;
-
-    /**
-    * VDA frames queue ordered by presentation timestamp.
-    *
-    * - encoding: unused
-    * - decoding: Set/Unset by libavcodec.
-    */
-    vda_frame           *queue;
-
-    /**
-    * Mutex for locking queue operations.
-    *
-    * - encoding: unused
-    * - decoding: Set/Unset by libavcodec.
-    */
-    pthread_mutex_t     queue_mutex;
-
-    /**
-    * The frame width.
-    *
-    * - encoding: unused
-    * - decoding: Set/Unset by user.
-    */
-    int                 width;
-
-    /**
-    * The frame height.
-    *
-    * - encoding: unused
-    * - decoding: Set/Unset by user.
-    */
-    int                 height;
-
-    /**
-    * The frame format.
-    *
-    * - encoding: unused
-    * - decoding: Set/Unset by user.
-    */
-    int                 format;
-
-    /**
-    * The pixel format for output image buffers.
-    *
-    * - encoding: unused
-    * - decoding: Set/Unset by user.
-    */
-    OSType              cv_pix_fmt_type;
-};
-
-/** Create the video decoder. */
-int ff_vda_create_decoder(struct vda_context *vda_ctx,
-                          uint8_t *extradata,
-                          int extradata_size);
-
-/** Destroy the video decoder. */
-int ff_vda_destroy_decoder(struct vda_context *vda_ctx);
-
-/** Return the top frame of the queue. */
-vda_frame *ff_vda_queue_pop(struct vda_context *vda_ctx);
-
-/** Release the given frame. */
-void ff_vda_release_vda_frame(vda_frame *frame);
-
-#endif /* AVCODEC_VDA_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/vdpau.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/vdpau.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/vdpau.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/vdpau.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-/*
- * The Video Decode and Presentation API for UNIX (VDPAU) is used for
- * hardware-accelerated decoding of MPEG-1/2, H.264 and VC-1.
- *
- * Copyright (C) 2008 NVIDIA
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VDPAU_H
-#define AVCODEC_VDPAU_H
-
-/**
- * @defgroup Decoder VDPAU Decoder and Renderer
- *
- * VDPAU hardware acceleration has two modules
- * - VDPAU decoding
- * - VDPAU presentation
- *
- * The VDPAU decoding module parses all headers using Libav
- * parsing mechanisms and uses VDPAU for the actual decoding.
- *
- * As per the current implementation, the actual decoding
- * and rendering (API calls) are done as part of the VDPAU
- * presentation (vo_vdpau.c) module.
- *
- * @defgroup  VDPAU_Decoding VDPAU Decoding
- * @ingroup Decoder
- * @{
- */
-
-#include <vdpau/vdpau.h>
-#include <vdpau/vdpau_x11.h>
-
-/** @brief The videoSurface is used for rendering. */
-#define FF_VDPAU_STATE_USED_FOR_RENDER 1
-
-/**
- * @brief The videoSurface is needed for reference/prediction.
- * The codec manipulates this.
- */
-#define FF_VDPAU_STATE_USED_FOR_REFERENCE 2
-
-/**
- * @brief This structure is used as a callback between the Libav
- * decoder (vd_) and presentation (vo_) module.
- * This is used for defining a video frame containing surface,
- * picture parameter, bitstream information etc which are passed
- * between the Libav decoder and its clients.
- */
-struct vdpau_render_state {
-    VdpVideoSurface surface; ///< Used as rendered surface, never changed.
-
-    int state; ///< Holds FF_VDPAU_STATE_* values.
-
-    /** picture parameter information for all supported codecs */
-    union VdpPictureInfo {
-        VdpPictureInfoH264        h264;
-        VdpPictureInfoMPEG1Or2    mpeg;
-        VdpPictureInfoVC1          vc1;
-        VdpPictureInfoMPEG4Part2 mpeg4;
-    } info;
-
-    /** Describe size/location of the compressed video data.
-        Set to 0 when freeing bitstream_buffers. */
-    int bitstream_buffers_allocated;
-    int bitstream_buffers_used;
-    /** The user is responsible for freeing this buffer using av_freep(). */
-    VdpBitstreamBuffer *bitstream_buffers;
-};
-
-/* @}*/
-
-#endif /* AVCODEC_VDPAU_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/version.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/version.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/version.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/version.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,126 +0,0 @@
-/*
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VERSION_H
-#define AVCODEC_VERSION_H
-
-#define LIBAVCODEC_VERSION_MAJOR 53
-#define LIBAVCODEC_VERSION_MINOR 35
-#define LIBAVCODEC_VERSION_MICRO  0
-
-#define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
-                                               LIBAVCODEC_VERSION_MINOR, \
-                                               LIBAVCODEC_VERSION_MICRO)
-#define LIBAVCODEC_VERSION      AV_VERSION(LIBAVCODEC_VERSION_MAJOR,    \
-                                           LIBAVCODEC_VERSION_MINOR,    \
-                                           LIBAVCODEC_VERSION_MICRO)
-#define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
-
-#define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
-
-/**
- * Those FF_API_* defines are not part of public API.
- * They may change, break or disappear at any time.
- */
-#ifndef FF_API_PALETTE_CONTROL
-#define FF_API_PALETTE_CONTROL  (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_OLD_SAMPLE_FMT
-#define FF_API_OLD_SAMPLE_FMT   (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_OLD_AUDIOCONVERT
-#define FF_API_OLD_AUDIOCONVERT (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_ANTIALIAS_ALGO
-#define FF_API_ANTIALIAS_ALGO   (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_REQUEST_CHANNELS
-#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_OPT_H
-#define FF_API_OPT_H            (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_THREAD_INIT
-#define FF_API_THREAD_INIT      (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_OLD_FF_PICT_TYPES
-#define FF_API_OLD_FF_PICT_TYPES (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_FLAC_GLOBAL_OPTS
-#define FF_API_FLAC_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_GET_PIX_FMT_NAME
-#define FF_API_GET_PIX_FMT_NAME (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_ALLOC_CONTEXT
-#define FF_API_ALLOC_CONTEXT    (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_AVCODEC_OPEN
-#define FF_API_AVCODEC_OPEN     (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_DRC_SCALE
-#define FF_API_DRC_SCALE        (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_ER
-#define FF_API_ER               (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_AVCODEC_INIT
-#define FF_API_AVCODEC_INIT     (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_X264_GLOBAL_OPTS
-#define FF_API_X264_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_MPEGVIDEO_GLOBAL_OPTS
-#define FF_API_MPEGVIDEO_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_LAME_GLOBAL_OPTS
-#define FF_API_LAME_GLOBAL_OPTS  (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_SNOW_GLOBAL_OPTS
-#define FF_API_SNOW_GLOBAL_OPTS  (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_MJPEG_GLOBAL_OPTS
-#define FF_API_MJPEG_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_GET_ALPHA_INFO
-#define FF_API_GET_ALPHA_INFO    (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_PARSE_FRAME
-#define FF_API_PARSE_FRAME (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_INTERNAL_CONTEXT
-#define FF_API_INTERNAL_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_TIFFENC_COMPLEVEL
-#define FF_API_TIFFENC_COMPLEVEL (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_DATA_POINTERS
-#define FF_API_DATA_POINTERS (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_OLD_DECODE_AUDIO
-#define FF_API_OLD_DECODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_AVFRAME_AGE
-#define FF_API_AVFRAME_AGE (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_OLD_ENCODE_AUDIO
-#define FF_API_OLD_ENCODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-
-#endif /* AVCODEC_VERSION_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/xvmc.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/xvmc.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/xvmc.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/xvmc.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,151 +0,0 @@
-/*
- * Copyright (C) 2003 Ivan Kalvachev
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_XVMC_H
-#define AVCODEC_XVMC_H
-
-#include <X11/extensions/XvMC.h>
-
-#include "avcodec.h"
-
-#define AV_XVMC_ID                    0x1DC711C0  /**< special value to ensure that regular pixel routines haven't corrupted the struct
-                                                       the number is 1337 speak for the letters IDCT MCo (motion compensation) */
-
-struct xvmc_pix_fmt {
-    /** The field contains the special constant value AV_XVMC_ID.
-        It is used as a test that the application correctly uses the API,
-        and that there is no corruption caused by pixel routines.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             xvmc_id;
-
-    /** Pointer to the block array allocated by XvMCCreateBlocks().
-        The array has to be freed by XvMCDestroyBlocks().
-        Each group of 64 values represents one data block of differential
-        pixel information (in MoCo mode) or coefficients for IDCT.
-        - application - set the pointer during initialization
-        - libavcodec  - fills coefficients/pixel data into the array
-    */
-    short*          data_blocks;
-
-    /** Pointer to the macroblock description array allocated by
-        XvMCCreateMacroBlocks() and freed by XvMCDestroyMacroBlocks().
-        - application - set the pointer during initialization
-        - libavcodec  - fills description data into the array
-    */
-    XvMCMacroBlock* mv_blocks;
-
-    /** Number of macroblock descriptions that can be stored in the mv_blocks
-        array.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             allocated_mv_blocks;
-
-    /** Number of blocks that can be stored at once in the data_blocks array.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             allocated_data_blocks;
-
-    /** Indicate that the hardware would interpret data_blocks as IDCT
-        coefficients and perform IDCT on them.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             idct;
-
-    /** In MoCo mode it indicates that intra macroblocks are assumed to be in
-        unsigned format; same as the XVMC_INTRA_UNSIGNED flag.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             unsigned_intra;
-
-    /** Pointer to the surface allocated by XvMCCreateSurface().
-        It has to be freed by XvMCDestroySurface() on application exit.
-        It identifies the frame and its state on the video hardware.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    XvMCSurface*    p_surface;
-
-/** Set by the decoder before calling ff_draw_horiz_band(),
-    needed by the XvMCRenderSurface function. */
-//@{
-    /** Pointer to the surface used as past reference
-        - application - unchanged
-        - libavcodec  - set
-    */
-    XvMCSurface*    p_past_surface;
-
-    /** Pointer to the surface used as future reference
-        - application - unchanged
-        - libavcodec  - set
-    */
-    XvMCSurface*    p_future_surface;
-
-    /** top/bottom field or frame
-        - application - unchanged
-        - libavcodec  - set
-    */
-    unsigned int    picture_structure;
-
-    /** XVMC_SECOND_FIELD - 1st or 2nd field in the sequence
-        - application - unchanged
-        - libavcodec  - set
-    */
-    unsigned int    flags;
-//}@
-
-    /** Number of macroblock descriptions in the mv_blocks array
-        that have already been passed to the hardware.
-        - application - zeroes it on get_buffer().
-                        A successful ff_draw_horiz_band() may increment it
-                        with filled_mb_block_num or zero both.
-        - libavcodec  - unchanged
-    */
-    int             start_mv_blocks_num;
-
-    /** Number of new macroblock descriptions in the mv_blocks array (after
-        start_mv_blocks_num) that are filled by libavcodec and have to be
-        passed to the hardware.
-        - application - zeroes it on get_buffer() or after successful
-                        ff_draw_horiz_band().
-        - libavcodec  - increment with one of each stored MB
-    */
-    int             filled_mv_blocks_num;
-
-    /** Number of the the next free data block; one data block consists of
-        64 short values in the data_blocks array.
-        All blocks before this one have already been claimed by placing their
-        position into the corresponding block description structure field,
-        that are part of the mv_blocks array.
-        - application - zeroes it on get_buffer().
-                        A successful ff_draw_horiz_band() may zero it together
-                        with start_mb_blocks_num.
-        - libavcodec  - each decoded macroblock increases it by the number
-                        of coded blocks it contains.
-    */
-    int             next_free_data_block_num;
-};
-
-#endif /* AVCODEC_XVMC_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavformat/avformat.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavformat/avformat.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavformat/avformat.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavformat/avformat.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,2026 +0,0 @@
-/*
- * copyright (c) 2001 Fabrice Bellard
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVFORMAT_AVFORMAT_H
-#define AVFORMAT_AVFORMAT_H
-
-/**
- * @file
- * @ingroup libavf
- * Main libavformat public API header
- */
-
-/**
- * @defgroup libavf I/O and Muxing/Demuxing Library
- * @{
- *
- * Libavformat (lavf) is a library for dealing with various media container
- * formats. Its main two purposes are demuxing - i.e. splitting a media file
- * into component streams, and the reverse process of muxing - writing supplied
- * data in a specified container format. It also has an @ref lavf_io
- * "I/O module" which supports a number of protocols for accessing the data (e.g.
- * file, tcp, http and others). Before using lavf, you need to call
- * av_register_all() to register all compiled muxers, demuxers and protocols.
- * Unless you are absolutely sure you won't use libavformat's network
- * capabilities, you should also call avformat_network_init().
- *
- * A supported input format is described by an AVInputFormat struct, conversely
- * an output format is described by AVOutputFormat. You can iterate over all
- * registered input/output formats using the av_iformat_next() /
- * av_oformat_next() functions. The protocols layer is not part of the public
- * API, so you can only get the names of supported protocols with the
- * avio_enum_protocols() function.
- *
- * Main lavf structure used for both muxing and demuxing is AVFormatContext,
- * which exports all information about the file being read or written. As with
- * most Libav structures, its size is not part of public ABI, so it cannot be
- * allocated on stack or directly with av_malloc(). To create an
- * AVFormatContext, use avformat_alloc_context() (some functions, like
- * avformat_open_input() might do that for you).
- *
- * Most importantly an AVFormatContext contains:
- * @li the @ref AVFormatContext.iformat "input" or @ref AVFormatContext.oformat
- * "output" format. It is either autodetected or set by user for input;
- * always set by user for output.
- * @li an @ref AVFormatContext.streams "array" of AVStreams, which describe all
- * elementary streams stored in the file. AVStreams are typically referred to
- * using their index in this array.
- * @li an @ref AVFormatContext.pb "I/O context". It is either opened by lavf or
- * set by user for input, always set by user for output (unless you are dealing
- * with an AVFMT_NOFILE format).
- *
- * @defgroup lavf_decoding Demuxing
- * @{
- * Demuxers read a media file and split it into chunks of data (@em packets). A
- * @ref AVPacket "packet" contains one or more frames which belong a single
- * elementary stream. In lavf API this process is represented by the
- * avformat_open_input() function for opening a file, av_read_frame() for
- * reading a single packet and finally avformat_close_input(), which does the
- * cleanup.
- *
- * @section lavf_decoding_open Opening a media file
- * The minimum information required to open a file is its URL or filename, which
- * is passed to avformat_open_input(), as in the following code:
- * @code
- * const char    *url = "in.mp3";
- * AVFormatContext *s = NULL;
- * int ret = avformat_open_input(&s, url, NULL, NULL);
- * if (ret < 0)
- *     abort();
- * @endcode
- * The above code attempts to allocate an AVFormatContext, open the
- * specified file (autodetecting the format) and read the header, exporting the
- * information stored there into s. Some formats do not have a header or do not
- * store enough information there, so it is recommended that you call the
- * avformat_find_stream_info() function which tries to read and decode a few
- * frames to find missing information.
- *
- * In some cases you might want to preallocate an AVFormatContext yourself with
- * avformat_alloc_context() and do some tweaking on it before passing it to
- * avformat_open_input(). One such case is when you want to use custom functions
- * for reading input data instead of lavf internal I/O layer.
- * To do that, create your own AVIOContext with avio_alloc_context(), passing
- * your reading callbacks to it. Then set the @em pb field of your
- * AVFormatContext to newly created AVIOContext.
- *
- * After you have finished reading the file, you must close it with
- * avformat_close_input(). It will free everything associated with the file.
- *
- * @section lavf_decoding_read Reading from an opened file
- *
- * @section lavf_decoding_seek Seeking
- * @}
- *
- * @defgroup lavf_encoding Muxing
- * @{
- * @}
- *
- * @defgroup lavf_io I/O Read/Write
- * @{
- * @}
- *
- * @defgroup lavf_codec Demuxers
- * @{
- * @defgroup lavf_codec_native Native Demuxers
- * @{
- * @}
- * @defgroup lavf_codec_wrappers External library wrappers
- * @{
- * @}
- * @}
- * @defgroup lavf_protos I/O Protocols
- * @{
- * @}
- * @defgroup lavf_internal Internal
- * @{
- * @}
- * @}
- *
- */
-
-#include <time.h>
-#include <stdio.h>  /* FILE */
-#include "libavcodec/avcodec.h"
-#include "libavutil/dict.h"
-#include "libavutil/log.h"
-
-#include "avio.h"
-#include "libavformat/version.h"
-
-struct AVFormatContext;
-
-
-/**
- * @defgroup metadata_api Public Metadata API
- * @{
- * @ingroup libavf
- * The metadata API allows libavformat to export metadata tags to a client
- * application when demuxing. Conversely it allows a client application to
- * set metadata when muxing.
- *
- * Metadata is exported or set as pairs of key/value strings in the 'metadata'
- * fields of the AVFormatContext, AVStream, AVChapter and AVProgram structs
- * using the @ref lavu_dict "AVDictionary" API. Like all strings in Libav,
- * metadata is assumed to be UTF-8 encoded Unicode. Note that metadata
- * exported by demuxers isn't checked to be valid UTF-8 in most cases.
- *
- * Important concepts to keep in mind:
- * -  Keys are unique; there can never be 2 tags with the same key. This is
- *    also meant semantically, i.e., a demuxer should not knowingly produce
- *    several keys that are literally different but semantically identical.
- *    E.g., key=Author5, key=Author6. In this example, all authors must be
- *    placed in the same tag.
- * -  Metadata is flat, not hierarchical; there are no subtags. If you
- *    want to store, e.g., the email address of the child of producer Alice
- *    and actor Bob, that could have key=alice_and_bobs_childs_email_address.
- * -  Several modifiers can be applied to the tag name. This is done by
- *    appending a dash character ('-') and the modifier name in the order
- *    they appear in the list below -- e.g. foo-eng-sort, not foo-sort-eng.
- *    -  language -- a tag whose value is localized for a particular language
- *       is appended with the ISO 639-2/B 3-letter language code.
- *       For example: Author-ger=Michael, Author-eng=Mike
- *       The original/default language is in the unqualified "Author" tag.
- *       A demuxer should set a default if it sets any translated tag.
- *    -  sorting  -- a modified version of a tag that should be used for
- *       sorting will have '-sort' appended. E.g. artist="The Beatles",
- *       artist-sort="Beatles, The".
- *
- * -  Demuxers attempt to export metadata in a generic format, however tags
- *    with no generic equivalents are left as they are stored in the container.
- *    Follows a list of generic tag names:
- *
- @verbatim
- album        -- name of the set this work belongs to
- album_artist -- main creator of the set/album, if different from artist.
-                 e.g. "Various Artists" for compilation albums.
- artist       -- main creator of the work
- comment      -- any additional description of the file.
- composer     -- who composed the work, if different from artist.
- copyright    -- name of copyright holder.
- creation_time-- date when the file was created, preferably in ISO 8601.
- date         -- date when the work was created, preferably in ISO 8601.
- disc         -- number of a subset, e.g. disc in a multi-disc collection.
- encoder      -- name/settings of the software/hardware that produced the file.
- encoded_by   -- person/group who created the file.
- filename     -- original name of the file.
- genre        -- <self-evident>.
- language     -- main language in which the work is performed, preferably
-                 in ISO 639-2 format. Multiple languages can be specified by
-                 separating them with commas.
- performer    -- artist who performed the work, if different from artist.
-                 E.g for "Also sprach Zarathustra", artist would be "Richard
-                 Strauss" and performer "London Philharmonic Orchestra".
- publisher    -- name of the label/publisher.
- service_name     -- name of the service in broadcasting (channel name).
- service_provider -- name of the service provider in broadcasting.
- title        -- name of the work.
- track        -- number of this work in the set, can be in form current/total.
- variant_bitrate -- the total bitrate of the bitrate variant that the current stream is part of
- @endverbatim
- *
- * Look in the examples section for an application example how to use the Metadata API.
- *
- * @}
- */
-
-#if FF_API_OLD_METADATA2
-/**
- * @defgroup old_metadata Old metadata API
- * The following functions are deprecated, use
- * their equivalents from libavutil/dict.h instead.
- * @{
- */
-
-#define AV_METADATA_MATCH_CASE      AV_DICT_MATCH_CASE
-#define AV_METADATA_IGNORE_SUFFIX   AV_DICT_IGNORE_SUFFIX
-#define AV_METADATA_DONT_STRDUP_KEY AV_DICT_DONT_STRDUP_KEY
-#define AV_METADATA_DONT_STRDUP_VAL AV_DICT_DONT_STRDUP_VAL
-#define AV_METADATA_DONT_OVERWRITE  AV_DICT_DONT_OVERWRITE
-
-typedef attribute_deprecated AVDictionary AVMetadata;
-typedef attribute_deprecated AVDictionaryEntry  AVMetadataTag;
-
-typedef struct AVMetadataConv AVMetadataConv;
-
-/**
- * Get a metadata element with matching key.
- *
- * @param prev Set to the previous matching element to find the next.
- *             If set to NULL the first matching element is returned.
- * @param flags Allows case as well as suffix-insensitive comparisons.
- * @return Found tag or NULL, changing key or value leads to undefined behavior.
- */
-attribute_deprecated AVDictionaryEntry *
-av_metadata_get(AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags);
-
-/**
- * Set the given tag in *pm, overwriting an existing tag.
- *
- * @param pm pointer to a pointer to a metadata struct. If *pm is NULL
- * a metadata struct is allocated and put in *pm.
- * @param key tag key to add to *pm (will be av_strduped depending on flags)
- * @param value tag value to add to *pm (will be av_strduped depending on flags).
- *        Passing a NULL value will cause an existing tag to be deleted.
- * @return >= 0 on success otherwise an error code <0
- */
-attribute_deprecated int av_metadata_set2(AVDictionary **pm, const char *key, const char *value, int flags);
-
-/**
- * This function is provided for compatibility reason and currently does nothing.
- */
-attribute_deprecated void av_metadata_conv(struct AVFormatContext *ctx, const AVMetadataConv *d_conv,
-                                                                        const AVMetadataConv *s_conv);
-
-/**
- * Copy metadata from one AVDictionary struct into another.
- * @param dst pointer to a pointer to a AVDictionary struct. If *dst is NULL,
- *            this function will allocate a struct for you and put it in *dst
- * @param src pointer to source AVDictionary struct
- * @param flags flags to use when setting metadata in *dst
- * @note metadata is read using the AV_DICT_IGNORE_SUFFIX flag
- */
-attribute_deprecated void av_metadata_copy(AVDictionary **dst, AVDictionary *src, int flags);
-
-/**
- * Free all the memory allocated for an AVDictionary struct.
- */
-attribute_deprecated void av_metadata_free(AVDictionary **m);
-/**
- * @}
- */
-#endif
-
-
-/* packet functions */
-
-
-/**
- * Allocate and read the payload of a packet and initialize its
- * fields with default values.
- *
- * @param pkt packet
- * @param size desired payload size
- * @return >0 (read size) if OK, AVERROR_xxx otherwise
- */
-int av_get_packet(AVIOContext *s, AVPacket *pkt, int size);
-
-
-/**
- * Read data and append it to the current content of the AVPacket.
- * If pkt->size is 0 this is identical to av_get_packet.
- * Note that this uses av_grow_packet and thus involves a realloc
- * which is inefficient. Thus this function should only be used
- * when there is no reasonable way to know (an upper bound of)
- * the final size.
- *
- * @param pkt packet
- * @param size amount of data to read
- * @return >0 (read size) if OK, AVERROR_xxx otherwise, previous data
- *         will not be lost even if an error occurs.
- */
-int av_append_packet(AVIOContext *s, AVPacket *pkt, int size);
-
-/*************************************************/
-/* fractional numbers for exact pts handling */
-
-/**
- * The exact value of the fractional number is: 'val + num / den'.
- * num is assumed to be 0 <= num < den.
- */
-typedef struct AVFrac {
-    int64_t val, num, den;
-} AVFrac;
-
-/*************************************************/
-/* input/output formats */
-
-struct AVCodecTag;
-
-/**
- * This structure contains the data a format has to probe a file.
- */
-typedef struct AVProbeData {
-    const char *filename;
-    unsigned char *buf; /**< Buffer must have AVPROBE_PADDING_SIZE of extra allocated bytes filled with zero. */
-    int buf_size;       /**< Size of buf except extra allocated bytes */
-} AVProbeData;
-
-#define AVPROBE_SCORE_MAX 100               ///< maximum score, half of that is used for file-extension-based detection
-#define AVPROBE_PADDING_SIZE 32             ///< extra allocated bytes at the end of the probe buffer
-
-typedef struct AVFormatParameters {
-#if FF_API_FORMAT_PARAMETERS
-    attribute_deprecated AVRational time_base;
-    attribute_deprecated int sample_rate;
-    attribute_deprecated int channels;
-    attribute_deprecated int width;
-    attribute_deprecated int height;
-    attribute_deprecated enum PixelFormat pix_fmt;
-    attribute_deprecated int channel; /**< Used to select DV channel. */
-    attribute_deprecated const char *standard; /**< deprecated, use demuxer-specific options instead. */
-    attribute_deprecated unsigned int mpeg2ts_raw:1;  /**< deprecated, use mpegtsraw demuxer */
-    /**< deprecated, use mpegtsraw demuxer-specific options instead */
-    attribute_deprecated unsigned int mpeg2ts_compute_pcr:1;
-    attribute_deprecated unsigned int initial_pause:1;       /**< Do not begin to play the stream
-                                                                  immediately (RTSP only). */
-    attribute_deprecated unsigned int prealloced_context:1;
-#endif
-} AVFormatParameters;
-
-/// Demuxer will use avio_open, no opened file should be provided by the caller.
-#define AVFMT_NOFILE        0x0001
-#define AVFMT_NEEDNUMBER    0x0002 /**< Needs '%d' in filename. */
-#define AVFMT_SHOW_IDS      0x0008 /**< Show format stream IDs numbers. */
-#define AVFMT_RAWPICTURE    0x0020 /**< Format wants AVPicture structure for
-                                      raw picture data. */
-#define AVFMT_GLOBALHEADER  0x0040 /**< Format wants global header. */
-#define AVFMT_NOTIMESTAMPS  0x0080 /**< Format does not need / have any timestamps. */
-#define AVFMT_GENERIC_INDEX 0x0100 /**< Use generic index building code. */
-#define AVFMT_TS_DISCONT    0x0200 /**< Format allows timestamp discontinuities. Note, muxers always require valid (monotone) timestamps */
-#define AVFMT_VARIABLE_FPS  0x0400 /**< Format allows variable fps. */
-#define AVFMT_NODIMENSIONS  0x0800 /**< Format does not need width/height */
-#define AVFMT_NOSTREAMS     0x1000 /**< Format does not require any streams */
-#define AVFMT_NOBINSEARCH   0x2000 /**< Format does not allow to fallback to binary search via read_timestamp */
-#define AVFMT_NOGENSEARCH   0x4000 /**< Format does not allow to fallback to generic search */
-#define AVFMT_NO_BYTE_SEEK  0x8000 /**< Format does not allow seeking by bytes */
-
-/**
- * @addtogroup lavf_encoding
- * @{
- */
-typedef struct AVOutputFormat {
-    const char *name;
-    /**
-     * Descriptive name for the format, meant to be more human-readable
-     * than name. You should use the NULL_IF_CONFIG_SMALL() macro
-     * to define it.
-     */
-    const char *long_name;
-    const char *mime_type;
-    const char *extensions; /**< comma-separated filename extensions */
-    /**
-     * size of private data so that it can be allocated in the wrapper
-     */
-    int priv_data_size;
-    /* output support */
-    enum CodecID audio_codec; /**< default audio codec */
-    enum CodecID video_codec; /**< default video codec */
-    int (*write_header)(struct AVFormatContext *);
-    int (*write_packet)(struct AVFormatContext *, AVPacket *pkt);
-    int (*write_trailer)(struct AVFormatContext *);
-    /**
-     * can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_RAWPICTURE,
-     * AVFMT_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS,
-     * AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS
-     */
-    int flags;
-    /**
-     * Currently only used to set pixel format if not YUV420P.
-     */
-    int (*set_parameters)(struct AVFormatContext *, AVFormatParameters *);
-    int (*interleave_packet)(struct AVFormatContext *, AVPacket *out,
-                             AVPacket *in, int flush);
-
-    /**
-     * List of supported codec_id-codec_tag pairs, ordered by "better
-     * choice first". The arrays are all terminated by CODEC_ID_NONE.
-     */
-    const struct AVCodecTag * const *codec_tag;
-
-    enum CodecID subtitle_codec; /**< default subtitle codec */
-
-#if FF_API_OLD_METADATA2
-    const AVMetadataConv *metadata_conv;
-#endif
-
-    const AVClass *priv_class; ///< AVClass for the private context
-
-    /**
-     * Test if the given codec can be stored in this container.
-     *
-     * @return 1 if the codec is supported, 0 if it is not.
-     *         A negative number if unknown.
-     */
-    int (*query_codec)(enum CodecID id, int std_compliance);
-
-    /* private fields */
-    struct AVOutputFormat *next;
-} AVOutputFormat;
-/**
- * @}
- */
-
-/**
- * @addtogroup lavf_decoding
- * @{
- */
-typedef struct AVInputFormat {
-    /**
-     * A comma separated list of short names for the format. New names
-     * may be appended with a minor bump.
-     */
-    const char *name;
-
-    /**
-     * Descriptive name for the format, meant to be more human-readable
-     * than name. You should use the NULL_IF_CONFIG_SMALL() macro
-     * to define it.
-     */
-    const char *long_name;
-
-    /**
-     * Size of private data so that it can be allocated in the wrapper.
-     */
-    int priv_data_size;
-
-    /**
-     * Tell if a given file has a chance of being parsed as this format.
-     * The buffer provided is guaranteed to be AVPROBE_PADDING_SIZE bytes
-     * big so you do not have to check for that unless you need more.
-     */
-    int (*read_probe)(AVProbeData *);
-
-    /**
-     * Read the format header and initialize the AVFormatContext
-     * structure. Return 0 if OK. 'ap' if non-NULL contains
-     * additional parameters. Only used in raw format right
-     * now. 'av_new_stream' should be called to create new streams.
-     */
-    int (*read_header)(struct AVFormatContext *,
-                       AVFormatParameters *ap);
-
-    /**
-     * Read one packet and put it in 'pkt'. pts and flags are also
-     * set. 'av_new_stream' can be called only if the flag
-     * AVFMTCTX_NOHEADER is used and only in the calling thread (not in a
-     * background thread).
-     * @return 0 on success, < 0 on error.
-     *         When returning an error, pkt must not have been allocated
-     *         or must be freed before returning
-     */
-    int (*read_packet)(struct AVFormatContext *, AVPacket *pkt);
-
-    /**
-     * Close the stream. The AVFormatContext and AVStreams are not
-     * freed by this function
-     */
-    int (*read_close)(struct AVFormatContext *);
-
-    /**
-     * Seek to a given timestamp relative to the frames in
-     * stream component stream_index.
-     * @param stream_index Must not be -1.
-     * @param flags Selects which direction should be preferred if no exact
-     *              match is available.
-     * @return >= 0 on success (but not necessarily the new offset)
-     */
-    int (*read_seek)(struct AVFormatContext *,
-                     int stream_index, int64_t timestamp, int flags);
-
-    /**
-     * Get the next timestamp in stream[stream_index].time_base units.
-     * @return the timestamp or AV_NOPTS_VALUE if an error occurred
-     */
-    int64_t (*read_timestamp)(struct AVFormatContext *s, int stream_index,
-                              int64_t *pos, int64_t pos_limit);
-
-    /**
-     * Can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_SHOW_IDS,
-     * AVFMT_GENERIC_INDEX, AVFMT_TS_DISCONT, AVFMT_NOBINSEARCH,
-     * AVFMT_NOGENSEARCH, AVFMT_NO_BYTE_SEEK.
-     */
-    int flags;
-
-    /**
-     * If extensions are defined, then no probe is done. You should
-     * usually not use extension format guessing because it is not
-     * reliable enough
-     */
-    const char *extensions;
-
-    /**
-     * General purpose read-only value that the format can use.
-     */
-    int value;
-
-    /**
-     * Start/resume playing - only meaningful if using a network-based format
-     * (RTSP).
-     */
-    int (*read_play)(struct AVFormatContext *);
-
-    /**
-     * Pause playing - only meaningful if using a network-based format
-     * (RTSP).
-     */
-    int (*read_pause)(struct AVFormatContext *);
-
-    const struct AVCodecTag * const *codec_tag;
-
-    /**
-     * Seek to timestamp ts.
-     * Seeking will be done so that the point from which all active streams
-     * can be presented successfully will be closest to ts and within min/max_ts.
-     * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
-     */
-    int (*read_seek2)(struct AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
-
-#if FF_API_OLD_METADATA2
-    const AVMetadataConv *metadata_conv;
-#endif
-
-    const AVClass *priv_class; ///< AVClass for the private context
-
-    /* private fields */
-    struct AVInputFormat *next;
-} AVInputFormat;
-/**
- * @}
- */
-
-enum AVStreamParseType {
-    AVSTREAM_PARSE_NONE,
-    AVSTREAM_PARSE_FULL,       /**< full parsing and repack */
-    AVSTREAM_PARSE_HEADERS,    /**< Only parse headers, do not repack. */
-    AVSTREAM_PARSE_TIMESTAMPS, /**< full parsing and interpolation of timestamps for frames not starting on a packet boundary */
-    AVSTREAM_PARSE_FULL_ONCE,  /**< full parsing and repack of the first frame only, only implemented for H.264 currently */
-};
-
-typedef struct AVIndexEntry {
-    int64_t pos;
-    int64_t timestamp;
-#define AVINDEX_KEYFRAME 0x0001
-    int flags:2;
-    int size:30; //Yeah, trying to keep the size of this small to reduce memory requirements (it is 24 vs. 32 bytes due to possible 8-byte alignment).
-    int min_distance;         /**< Minimum distance between this and the previous keyframe, used to avoid unneeded searching. */
-} AVIndexEntry;
-
-#define AV_DISPOSITION_DEFAULT   0x0001
-#define AV_DISPOSITION_DUB       0x0002
-#define AV_DISPOSITION_ORIGINAL  0x0004
-#define AV_DISPOSITION_COMMENT   0x0008
-#define AV_DISPOSITION_LYRICS    0x0010
-#define AV_DISPOSITION_KARAOKE   0x0020
-
-/**
- * Track should be used during playback by default.
- * Useful for subtitle track that should be displayed
- * even when user did not explicitly ask for subtitles.
- */
-#define AV_DISPOSITION_FORCED    0x0040
-#define AV_DISPOSITION_HEARING_IMPAIRED  0x0080  /**< stream for hearing impaired audiences */
-#define AV_DISPOSITION_VISUAL_IMPAIRED   0x0100  /**< stream for visual impaired audiences */
-#define AV_DISPOSITION_CLEAN_EFFECTS     0x0200  /**< stream without voice */
-
-/**
- * Stream structure.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVStream) must not be used outside libav*.
- */
-typedef struct AVStream {
-    int index;    /**< stream index in AVFormatContext */
-    int id;       /**< format-specific stream ID */
-    AVCodecContext *codec; /**< codec context */
-    /**
-     * Real base framerate of the stream.
-     * This is the lowest framerate with which all timestamps can be
-     * represented accurately (it is the least common multiple of all
-     * framerates in the stream). Note, this value is just a guess!
-     * For example, if the time base is 1/90000 and all frames have either
-     * approximately 3600 or 1800 timer ticks, then r_frame_rate will be 50/1.
-     */
-    AVRational r_frame_rate;
-    void *priv_data;
-
-#if FF_API_REORDER_PRIVATE
-    /* internal data used in av_find_stream_info() */
-    int64_t first_dts;
-#endif
-
-    /**
-     * encoding: pts generation when outputting stream
-     */
-    struct AVFrac pts;
-
-    /**
-     * This is the fundamental unit of time (in seconds) in terms
-     * of which frame timestamps are represented. For fixed-fps content,
-     * time base should be 1/framerate and timestamp increments should be 1.
-     * decoding: set by libavformat
-     * encoding: set by libavformat in av_write_header
-     */
-    AVRational time_base;
-#if FF_API_REORDER_PRIVATE
-    int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
-#endif
-#if FF_API_STREAM_COPY
-    /* ffmpeg.c private use */
-    attribute_deprecated int stream_copy; /**< If set, just copy stream. */
-#endif
-    enum AVDiscard discard; ///< Selects which packets can be discarded at will and do not need to be demuxed.
-
-#if FF_API_AVSTREAM_QUALITY
-    //FIXME move stuff to a flags field?
-    /**
-     * Quality, as it has been removed from AVCodecContext and put in AVVideoFrame.
-     * MN: dunno if that is the right place for it
-     */
-    attribute_deprecated float quality;
-#endif
-
-    /**
-     * Decoding: pts of the first frame of the stream, in stream time base.
-     * Only set this if you are absolutely 100% sure that the value you set
-     * it to really is the pts of the first frame.
-     * This may be undefined (AV_NOPTS_VALUE).
-     */
-    int64_t start_time;
-
-    /**
-     * Decoding: duration of the stream, in stream time base.
-     * If a source file does not specify a duration, but does specify
-     * a bitrate, this value will be estimated from bitrate and file size.
-     */
-    int64_t duration;
-
-#if FF_API_REORDER_PRIVATE
-    /* av_read_frame() support */
-    enum AVStreamParseType need_parsing;
-    struct AVCodecParserContext *parser;
-
-    int64_t cur_dts;
-    int last_IP_duration;
-    int64_t last_IP_pts;
-    /* av_seek_frame() support */
-    AVIndexEntry *index_entries; /**< Only used if the format does not
-                                    support seeking natively. */
-    int nb_index_entries;
-    unsigned int index_entries_allocated_size;
-#endif
-
-    int64_t nb_frames;                 ///< number of frames in this stream if known or 0
-
-    int disposition; /**< AV_DISPOSITION_* bit field */
-
-#if FF_API_REORDER_PRIVATE
-    AVProbeData probe_data;
-#define MAX_REORDER_DELAY 16
-    int64_t pts_buffer[MAX_REORDER_DELAY+1];
-#endif
-
-    /**
-     * sample aspect ratio (0 if unknown)
-     * - encoding: Set by user.
-     * - decoding: Set by libavformat.
-     */
-    AVRational sample_aspect_ratio;
-
-    AVDictionary *metadata;
-
-#if FF_API_REORDER_PRIVATE
-    /* Intended mostly for av_read_frame() support. Not supposed to be used by */
-    /* external applications; try to use something else if at all possible.    */
-    const uint8_t *cur_ptr;
-    int cur_len;
-    AVPacket cur_pkt;
-
-    // Timestamp generation support:
-    /**
-     * Timestamp corresponding to the last dts sync point.
-     *
-     * Initialized when AVCodecParserContext.dts_sync_point >= 0 and
-     * a DTS is received from the underlying container. Otherwise set to
-     * AV_NOPTS_VALUE by default.
-     */
-    int64_t reference_dts;
-
-    /**
-     * Number of packets to buffer for codec probing
-     * NOT PART OF PUBLIC API
-     */
-#define MAX_PROBE_PACKETS 2500
-    int probe_packets;
-
-    /**
-     * last packet in packet_buffer for this stream when muxing.
-     * Used internally, NOT PART OF PUBLIC API, do not read or
-     * write from outside of libav*
-     */
-    struct AVPacketList *last_in_packet_buffer;
-#endif
-
-    /**
-     * Average framerate
-     */
-    AVRational avg_frame_rate;
-
-    /*****************************************************************
-     * All fields below this line are not part of the public API. They
-     * may not be used outside of libavformat and can be changed and
-     * removed at will.
-     * New public fields should be added right above.
-     *****************************************************************
-     */
-
-    /**
-     * Number of frames that have been demuxed during av_find_stream_info()
-     */
-    int codec_info_nb_frames;
-
-    /**
-     * Stream information used internally by av_find_stream_info()
-     */
-#define MAX_STD_TIMEBASES (60*12+5)
-    struct {
-        int64_t last_dts;
-        int64_t duration_gcd;
-        int duration_count;
-        double duration_error[MAX_STD_TIMEBASES];
-        int64_t codec_info_duration;
-        int nb_decoded_frames;
-    } *info;
-#if !FF_API_REORDER_PRIVATE
-    const uint8_t *cur_ptr;
-    int cur_len;
-    AVPacket cur_pkt;
-
-    // Timestamp generation support:
-    /**
-     * Timestamp corresponding to the last dts sync point.
-     *
-     * Initialized when AVCodecParserContext.dts_sync_point >= 0 and
-     * a DTS is received from the underlying container. Otherwise set to
-     * AV_NOPTS_VALUE by default.
-     */
-    int64_t reference_dts;
-    int64_t first_dts;
-    int64_t cur_dts;
-    int last_IP_duration;
-    int64_t last_IP_pts;
-
-    /**
-     * Number of packets to buffer for codec probing
-     */
-#define MAX_PROBE_PACKETS 2500
-    int probe_packets;
-
-    /**
-     * last packet in packet_buffer for this stream when muxing.
-     */
-    struct AVPacketList *last_in_packet_buffer;
-    AVProbeData probe_data;
-#define MAX_REORDER_DELAY 16
-    int64_t pts_buffer[MAX_REORDER_DELAY+1];
-    /* av_read_frame() support */
-    enum AVStreamParseType need_parsing;
-    struct AVCodecParserContext *parser;
-
-    AVIndexEntry *index_entries; /**< Only used if the format does not
-                                    support seeking natively. */
-    int nb_index_entries;
-    unsigned int index_entries_allocated_size;
-
-    int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
-#endif
-} AVStream;
-
-#define AV_PROGRAM_RUNNING 1
-
-/**
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVProgram) must not be used outside libav*.
- */
-typedef struct AVProgram {
-    int            id;
-    int            flags;
-    enum AVDiscard discard;        ///< selects which program to discard and which to feed to the caller
-    unsigned int   *stream_index;
-    unsigned int   nb_stream_indexes;
-    AVDictionary *metadata;
-} AVProgram;
-
-#define AVFMTCTX_NOHEADER      0x0001 /**< signal that no header is present
-                                         (streams are added dynamically) */
-
-typedef struct AVChapter {
-    int id;                 ///< unique ID to identify the chapter
-    AVRational time_base;   ///< time base in which the start/end timestamps are specified
-    int64_t start, end;     ///< chapter start/end time in time_base units
-    AVDictionary *metadata;
-} AVChapter;
-
-/**
- * Format I/O context.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVFormatContext) must not be used outside libav*, use
- * avformat_alloc_context() to create an AVFormatContext.
- */
-typedef struct AVFormatContext {
-    /**
-     * A class for logging and AVOptions. Set by avformat_alloc_context().
-     * Exports (de)muxer private options if they exist.
-     */
-    const AVClass *av_class;
-
-    /**
-     * Can only be iformat or oformat, not both at the same time.
-     *
-     * decoding: set by avformat_open_input().
-     * encoding: set by the user.
-     */
-    struct AVInputFormat *iformat;
-    struct AVOutputFormat *oformat;
-
-    /**
-     * Format private data. This is an AVOptions-enabled struct
-     * if and only if iformat/oformat.priv_class is not NULL.
-     */
-    void *priv_data;
-
-    /*
-     * I/O context.
-     *
-     * decoding: either set by the user before avformat_open_input() (then
-     * the user must close it manually) or set by avformat_open_input().
-     * encoding: set by the user.
-     *
-     * Do NOT set this field if AVFMT_NOFILE flag is set in
-     * iformat/oformat.flags. In such a case, the (de)muxer will handle
-     * I/O in some other way and this field will be NULL.
-     */
-    AVIOContext *pb;
-
-    /**
-     * A list of all streams in the file. New streams are created with
-     * avformat_new_stream().
-     *
-     * decoding: streams are created by libavformat in avformat_open_input().
-     * If AVFMTCTX_NOHEADER is set in ctx_flags, then new streams may also
-     * appear in av_read_frame().
-     * encoding: streams are created by the user before avformat_write_header().
-     */
-    unsigned int nb_streams;
-    AVStream **streams;
-
-    char filename[1024]; /**< input or output filename */
-    /* stream info */
-#if FF_API_TIMESTAMP
-    /**
-     * @deprecated use 'creation_time' metadata tag instead
-     */
-    attribute_deprecated int64_t timestamp;
-#endif
-
-    int ctx_flags; /**< Format-specific flags, see AVFMTCTX_xx */
-#if FF_API_REORDER_PRIVATE
-    /* private data for pts handling (do not modify directly). */
-    /**
-     * This buffer is only needed when packets were already buffered but
-     * not decoded, for example to get the codec parameters in MPEG
-     * streams.
-     */
-    struct AVPacketList *packet_buffer;
-#endif
-
-    /**
-     * Decoding: position of the first frame of the component, in
-     * AV_TIME_BASE fractional seconds. NEVER set this value directly:
-     * It is deduced from the AVStream values.
-     */
-    int64_t start_time;
-
-    /**
-     * Decoding: duration of the stream, in AV_TIME_BASE fractional
-     * seconds. Only set this value if you know none of the individual stream
-     * durations and also do not set any of them. This is deduced from the
-     * AVStream values if not set.
-     */
-    int64_t duration;
-
-#if FF_API_FILESIZE
-    /**
-     * decoding: total file size, 0 if unknown
-     */
-    attribute_deprecated int64_t file_size;
-#endif
-
-    /**
-     * Decoding: total stream bitrate in bit/s, 0 if not
-     * available. Never set it directly if the file_size and the
-     * duration are known as Libav can compute it automatically.
-     */
-    int bit_rate;
-
-#if FF_API_REORDER_PRIVATE
-    /* av_read_frame() support */
-    AVStream *cur_st;
-
-    /* av_seek_frame() support */
-    int64_t data_offset; /**< offset of the first packet */
-#endif
-
-#if FF_API_MUXRATE
-    /**
-     * use mpeg muxer private options instead
-     */
-    attribute_deprecated int mux_rate;
-#endif
-    unsigned int packet_size;
-#if FF_API_PRELOAD
-    attribute_deprecated int preload;
-#endif
-    int max_delay;
-
-#if FF_API_LOOP_OUTPUT
-#define AVFMT_NOOUTPUTLOOP -1
-#define AVFMT_INFINITEOUTPUTLOOP 0
-    /**
-     * number of times to loop output in formats that support it
-     *
-     * @deprecated use the 'loop' private option in the gif muxer.
-     */
-    attribute_deprecated int loop_output;
-#endif
-
-    int flags;
-#define AVFMT_FLAG_GENPTS       0x0001 ///< Generate missing pts even if it requires parsing future frames.
-#define AVFMT_FLAG_IGNIDX       0x0002 ///< Ignore index.
-#define AVFMT_FLAG_NONBLOCK     0x0004 ///< Do not block when reading packets from input.
-#define AVFMT_FLAG_IGNDTS       0x0008 ///< Ignore DTS on frames that contain both DTS & PTS
-#define AVFMT_FLAG_NOFILLIN     0x0010 ///< Do not infer any values from other values, just return what is stored in the container
-#define AVFMT_FLAG_NOPARSE      0x0020 ///< Do not use AVParsers, you also must set AVFMT_FLAG_NOFILLIN as the fillin code works on frames and no parsing -> no frames. Also seeking to frames can not work if parsing to find frame boundaries has been disabled
-#if FF_API_FLAG_RTP_HINT
-#define AVFMT_FLAG_RTP_HINT     0x0040 ///< Deprecated, use the -movflags rtphint muxer specific AVOption instead
-#endif
-#define AVFMT_FLAG_CUSTOM_IO    0x0080 ///< The caller has supplied a custom AVIOContext, don't avio_close() it.
-#define AVFMT_FLAG_DISCARD_CORRUPT  0x0100 ///< Discard frames marked corrupted
-
-#if FF_API_LOOP_INPUT
-    /**
-     * @deprecated, use the 'loop' img2 demuxer private option.
-     */
-    attribute_deprecated int loop_input;
-#endif
-
-    /**
-     * decoding: size of data to probe; encoding: unused.
-     */
-    unsigned int probesize;
-
-    /**
-     * decoding: maximum time (in AV_TIME_BASE units) during which the input should
-     * be analyzed in avformat_find_stream_info().
-     */
-    int max_analyze_duration;
-
-    const uint8_t *key;
-    int keylen;
-
-    unsigned int nb_programs;
-    AVProgram **programs;
-
-    /**
-     * Forced video codec_id.
-     * Demuxing: Set by user.
-     */
-    enum CodecID video_codec_id;
-
-    /**
-     * Forced audio codec_id.
-     * Demuxing: Set by user.
-     */
-    enum CodecID audio_codec_id;
-
-    /**
-     * Forced subtitle codec_id.
-     * Demuxing: Set by user.
-     */
-    enum CodecID subtitle_codec_id;
-
-    /**
-     * Maximum amount of memory in bytes to use for the index of each stream.
-     * If the index exceeds this size, entries will be discarded as
-     * needed to maintain a smaller size. This can lead to slower or less
-     * accurate seeking (depends on demuxer).
-     * Demuxers for which a full in-memory index is mandatory will ignore
-     * this.
-     * muxing  : unused
-     * demuxing: set by user
-     */
-    unsigned int max_index_size;
-
-    /**
-     * Maximum amount of memory in bytes to use for buffering frames
-     * obtained from realtime capture devices.
-     */
-    unsigned int max_picture_buffer;
-
-    unsigned int nb_chapters;
-    AVChapter **chapters;
-
-    /**
-     * Flags to enable debugging.
-     */
-    int debug;
-#define FF_FDEBUG_TS        0x0001
-
-#if FF_API_REORDER_PRIVATE
-    /**
-     * Raw packets from the demuxer, prior to parsing and decoding.
-     * This buffer is used for buffering packets until the codec can
-     * be identified, as parsing cannot be done without knowing the
-     * codec.
-     */
-    struct AVPacketList *raw_packet_buffer;
-    struct AVPacketList *raw_packet_buffer_end;
-
-    struct AVPacketList *packet_buffer_end;
-#endif
-
-    AVDictionary *metadata;
-
-#if FF_API_REORDER_PRIVATE
-    /**
-     * Remaining size available for raw_packet_buffer, in bytes.
-     * NOT PART OF PUBLIC API
-     */
-#define RAW_PACKET_BUFFER_SIZE 2500000
-    int raw_packet_buffer_remaining_size;
-#endif
-
-    /**
-     * Start time of the stream in real world time, in microseconds
-     * since the unix epoch (00:00 1st January 1970). That is, pts=0
-     * in the stream was captured at this real world time.
-     * - encoding: Set by user.
-     * - decoding: Unused.
-     */
-    int64_t start_time_realtime;
-
-    /**
-     * decoding: number of frames used to probe fps
-     */
-    int fps_probe_size;
-
-    /**
-     * Error recognition; higher values will detect more errors but may
-     * misdetect some more or less valid parts as errors.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int error_recognition;
-
-    /**
-     * Custom interrupt callbacks for the I/O layer.
-     *
-     * decoding: set by the user before avformat_open_input().
-     * encoding: set by the user before avformat_write_header()
-     * (mainly useful for AVFMT_NOFILE formats). The callback
-     * should also be passed to avio_open2() if it's used to
-     * open the file.
-     */
-    AVIOInterruptCB interrupt_callback;
-
-    /*****************************************************************
-     * All fields below this line are not part of the public API. They
-     * may not be used outside of libavformat and can be changed and
-     * removed at will.
-     * New public fields should be added right above.
-     *****************************************************************
-     */
-#if !FF_API_REORDER_PRIVATE
-    /**
-     * Raw packets from the demuxer, prior to parsing and decoding.
-     * This buffer is used for buffering packets until the codec can
-     * be identified, as parsing cannot be done without knowing the
-     * codec.
-     */
-    struct AVPacketList *raw_packet_buffer;
-    struct AVPacketList *raw_packet_buffer_end;
-    /**
-     * Remaining size available for raw_packet_buffer, in bytes.
-     */
-#define RAW_PACKET_BUFFER_SIZE 2500000
-    int raw_packet_buffer_remaining_size;
-
-    /**
-     * This buffer is only needed when packets were already buffered but
-     * not decoded, for example to get the codec parameters in MPEG
-     * streams.
-     */
-    struct AVPacketList *packet_buffer;
-    struct AVPacketList *packet_buffer_end;
-
-    /* av_read_frame() support */
-    AVStream *cur_st;
-
-    /* av_seek_frame() support */
-    int64_t data_offset; /**< offset of the first packet */
-#endif
-} AVFormatContext;
-
-typedef struct AVPacketList {
-    AVPacket pkt;
-    struct AVPacketList *next;
-} AVPacketList;
-
-
-/**
- * @defgroup lavf_core Core functions
- * @ingroup libavf
- *
- * Functions for querying libavformat capabilities, allocating core structures,
- * etc.
- * @{
- */
-
-/**
- * Return the LIBAVFORMAT_VERSION_INT constant.
- */
-unsigned avformat_version(void);
-
-/**
- * Return the libavformat build-time configuration.
- */
-const char *avformat_configuration(void);
-
-/**
- * Return the libavformat license.
- */
-const char *avformat_license(void);
-
-/**
- * Initialize libavformat and register all the muxers, demuxers and
- * protocols. If you do not call this function, then you can select
- * exactly which formats you want to support.
- *
- * @see av_register_input_format()
- * @see av_register_output_format()
- * @see av_register_protocol()
- */
-void av_register_all(void);
-
-void av_register_input_format(AVInputFormat *format);
-void av_register_output_format(AVOutputFormat *format);
-
-/**
- * Do global initialization of network components. This is optional,
- * but recommended, since it avoids the overhead of implicitly
- * doing the setup for each session.
- *
- * Calling this function will become mandatory if using network
- * protocols at some major version bump.
- */
-int avformat_network_init(void);
-
-/**
- * Undo the initialization done by avformat_network_init.
- */
-int avformat_network_deinit(void);
-
-/**
- * If f is NULL, returns the first registered input format,
- * if f is non-NULL, returns the next registered input format after f
- * or NULL if f is the last one.
- */
-AVInputFormat  *av_iformat_next(AVInputFormat  *f);
-
-/**
- * If f is NULL, returns the first registered output format,
- * if f is non-NULL, returns the next registered output format after f
- * or NULL if f is the last one.
- */
-AVOutputFormat *av_oformat_next(AVOutputFormat *f);
-
-/**
- * Allocate an AVFormatContext.
- * avformat_free_context() can be used to free the context and everything
- * allocated by the framework within it.
- */
-AVFormatContext *avformat_alloc_context(void);
-
-/**
- * Free an AVFormatContext and all its streams.
- * @param s context to free
- */
-void avformat_free_context(AVFormatContext *s);
-
-/**
- * Get the AVClass for AVFormatContext. It can be used in combination with
- * AV_OPT_SEARCH_FAKE_OBJ for examining options.
- *
- * @see av_opt_find().
- */
-const AVClass *avformat_get_class(void);
-
-/**
- * Add a new stream to a media file.
- *
- * When demuxing, it is called by the demuxer in read_header(). If the
- * flag AVFMTCTX_NOHEADER is set in s.ctx_flags, then it may also
- * be called in read_packet().
- *
- * When muxing, should be called by the user before avformat_write_header().
- *
- * @param c If non-NULL, the AVCodecContext corresponding to the new stream
- * will be initialized to use this codec. This is needed for e.g. codec-specific
- * defaults to be set, so codec should be provided if it is known.
- *
- * @return newly created stream or NULL on error.
- */
-AVStream *avformat_new_stream(AVFormatContext *s, AVCodec *c);
-
-AVProgram *av_new_program(AVFormatContext *s, int id);
-
-/**
- * @}
- */
-
-
-#if FF_API_GUESS_IMG2_CODEC
-attribute_deprecated enum CodecID av_guess_image2_codec(const char *filename);
-#endif
-
-#if FF_API_PKT_DUMP
-attribute_deprecated void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload);
-attribute_deprecated void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt,
-                                          int dump_payload);
-#endif
-
-
-/**
- * @addtogroup lavf_decoding
- * @{
- */
-
-/**
- * Find AVInputFormat based on the short name of the input format.
- */
-AVInputFormat *av_find_input_format(const char *short_name);
-
-/**
- * Guess the file format.
- *
- * @param is_opened Whether the file is already opened; determines whether
- *                  demuxers with or without AVFMT_NOFILE are probed.
- */
-AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened);
-
-/**
- * Guess the file format.
- *
- * @param is_opened Whether the file is already opened; determines whether
- *                  demuxers with or without AVFMT_NOFILE are probed.
- * @param score_max A probe score larger that this is required to accept a
- *                  detection, the variable is set to the actual detection
- *                  score afterwards.
- *                  If the score is <= AVPROBE_SCORE_MAX / 4 it is recommended
- *                  to retry with a larger probe buffer.
- */
-AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max);
-
-/**
- * Probe a bytestream to determine the input format. Each time a probe returns
- * with a score that is too low, the probe buffer size is increased and another
- * attempt is made. When the maximum probe size is reached, the input format
- * with the highest score is returned.
- *
- * @param pb the bytestream to probe
- * @param fmt the input format is put here
- * @param filename the filename of the stream
- * @param logctx the log context
- * @param offset the offset within the bytestream to probe from
- * @param max_probe_size the maximum probe buffer size (zero for default)
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code otherwise
- */
-int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
-                          const char *filename, void *logctx,
-                          unsigned int offset, unsigned int max_probe_size);
-
-#if FF_API_FORMAT_PARAMETERS
-/**
- * Allocate all the structures needed to read an input stream.
- *        This does not open the needed codecs for decoding the stream[s].
- * @deprecated use avformat_open_input instead.
- */
-attribute_deprecated int av_open_input_stream(AVFormatContext **ic_ptr,
-                         AVIOContext *pb, const char *filename,
-                         AVInputFormat *fmt, AVFormatParameters *ap);
-
-/**
- * Open a media file as input. The codecs are not opened. Only the file
- * header (if present) is read.
- *
- * @param ic_ptr The opened media file handle is put here.
- * @param filename filename to open
- * @param fmt If non-NULL, force the file format to use.
- * @param buf_size optional buffer size (zero if default is OK)
- * @param ap Additional parameters needed when opening the file
- *           (NULL if default).
- * @return 0 if OK, AVERROR_xxx otherwise
- *
- * @deprecated use avformat_open_input instead.
- */
-attribute_deprecated int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
-                       AVInputFormat *fmt,
-                       int buf_size,
-                       AVFormatParameters *ap);
-#endif
-
-/**
- * Open an input stream and read the header. The codecs are not opened.
- * The stream must be closed with av_close_input_file().
- *
- * @param ps Pointer to user-supplied AVFormatContext (allocated by avformat_alloc_context).
- *           May be a pointer to NULL, in which case an AVFormatContext is allocated by this
- *           function and written into ps.
- *           Note that a user-supplied AVFormatContext will be freed on failure.
- * @param filename Name of the stream to open.
- * @param fmt If non-NULL, this parameter forces a specific input format.
- *            Otherwise the format is autodetected.
- * @param options  A dictionary filled with AVFormatContext and demuxer-private options.
- *                 On return this parameter will be destroyed and replaced with a dict containing
- *                 options that were not found. May be NULL.
- *
- * @return 0 on success, a negative AVERROR on failure.
- *
- * @note If you want to use custom IO, preallocate the format context and set its pb field.
- */
-int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputFormat *fmt, AVDictionary **options);
-
-#if FF_API_FORMAT_PARAMETERS
-/**
- * Read packets of a media file to get stream information. This
- * is useful for file formats with no headers such as MPEG. This
- * function also computes the real framerate in case of MPEG-2 repeat
- * frame mode.
- * The logical file position is not changed by this function;
- * examined packets may be buffered for later processing.
- *
- * @param ic media file handle
- * @return >=0 if OK, AVERROR_xxx on error
- * @todo Let the user decide somehow what information is needed so that
- *       we do not waste time getting stuff the user does not need.
- *
- * @deprecated use avformat_find_stream_info.
- */
-attribute_deprecated
-int av_find_stream_info(AVFormatContext *ic);
-#endif
-
-/**
- * Read packets of a media file to get stream information. This
- * is useful for file formats with no headers such as MPEG. This
- * function also computes the real framerate in case of MPEG-2 repeat
- * frame mode.
- * The logical file position is not changed by this function;
- * examined packets may be buffered for later processing.
- *
- * @param ic media file handle
- * @param options  If non-NULL, an ic.nb_streams long array of pointers to
- *                 dictionaries, where i-th member contains options for
- *                 codec corresponding to i-th stream.
- *                 On return each dictionary will be filled with options that were not found.
- * @return >=0 if OK, AVERROR_xxx on error
- *
- * @note this function isn't guaranteed to open all the codecs, so
- *       options being non-empty at return is a perfectly normal behavior.
- *
- * @todo Let the user decide somehow what information is needed so that
- *       we do not waste time getting stuff the user does not need.
- */
-int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options);
-
-/**
- * Find the "best" stream in the file.
- * The best stream is determined according to various heuristics as the most
- * likely to be what the user expects.
- * If the decoder parameter is non-NULL, av_find_best_stream will find the
- * default decoder for the stream's codec; streams for which no decoder can
- * be found are ignored.
- *
- * @param ic                media file handle
- * @param type              stream type: video, audio, subtitles, etc.
- * @param wanted_stream_nb  user-requested stream number,
- *                          or -1 for automatic selection
- * @param related_stream    try to find a stream related (eg. in the same
- *                          program) to this one, or -1 if none
- * @param decoder_ret       if non-NULL, returns the decoder for the
- *                          selected stream
- * @param flags             flags; none are currently defined
- * @return  the non-negative stream number in case of success,
- *          AVERROR_STREAM_NOT_FOUND if no stream with the requested type
- *          could be found,
- *          AVERROR_DECODER_NOT_FOUND if streams were found but no decoder
- * @note  If av_find_best_stream returns successfully and decoder_ret is not
- *        NULL, then *decoder_ret is guaranteed to be set to a valid AVCodec.
- */
-int av_find_best_stream(AVFormatContext *ic,
-                        enum AVMediaType type,
-                        int wanted_stream_nb,
-                        int related_stream,
-                        AVCodec **decoder_ret,
-                        int flags);
-
-/**
- * Read a transport packet from a media file.
- *
- * This function is obsolete and should never be used.
- * Use av_read_frame() instead.
- *
- * @param s media file handle
- * @param pkt is filled
- * @return 0 if OK, AVERROR_xxx on error
- */
-int av_read_packet(AVFormatContext *s, AVPacket *pkt);
-
-/**
- * Return the next frame of a stream.
- * This function returns what is stored in the file, and does not validate
- * that what is there are valid frames for the decoder. It will split what is
- * stored in the file into frames and return one for each call. It will not
- * omit invalid data between valid frames so as to give the decoder the maximum
- * information possible for decoding.
- *
- * The returned packet is valid
- * until the next av_read_frame() or until av_close_input_file() and
- * must be freed with av_free_packet. For video, the packet contains
- * exactly one frame. For audio, it contains an integer number of
- * frames if each frame has a known fixed size (e.g. PCM or ADPCM
- * data). If the audio frames have a variable size (e.g. MPEG audio),
- * then it contains one frame.
- *
- * pkt->pts, pkt->dts and pkt->duration are always set to correct
- * values in AVStream.time_base units (and guessed if the format cannot
- * provide them). pkt->pts can be AV_NOPTS_VALUE if the video format
- * has B-frames, so it is better to rely on pkt->dts if you do not
- * decompress the payload.
- *
- * @return 0 if OK, < 0 on error or end of file
- */
-int av_read_frame(AVFormatContext *s, AVPacket *pkt);
-
-/**
- * Seek to the keyframe at timestamp.
- * 'timestamp' in 'stream_index'.
- * @param stream_index If stream_index is (-1), a default
- * stream is selected, and timestamp is automatically converted
- * from AV_TIME_BASE units to the stream specific time_base.
- * @param timestamp Timestamp in AVStream.time_base units
- *        or, if no stream is specified, in AV_TIME_BASE units.
- * @param flags flags which select direction and seeking mode
- * @return >= 0 on success
- */
-int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp,
-                  int flags);
-
-/**
- * Seek to timestamp ts.
- * Seeking will be done so that the point from which all active streams
- * can be presented successfully will be closest to ts and within min/max_ts.
- * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
- *
- * If flags contain AVSEEK_FLAG_BYTE, then all timestamps are in bytes and
- * are the file position (this may not be supported by all demuxers).
- * If flags contain AVSEEK_FLAG_FRAME, then all timestamps are in frames
- * in the stream with stream_index (this may not be supported by all demuxers).
- * Otherwise all timestamps are in units of the stream selected by stream_index
- * or if stream_index is -1, in AV_TIME_BASE units.
- * If flags contain AVSEEK_FLAG_ANY, then non-keyframes are treated as
- * keyframes (this may not be supported by all demuxers).
- *
- * @param stream_index index of the stream which is used as time base reference
- * @param min_ts smallest acceptable timestamp
- * @param ts target timestamp
- * @param max_ts largest acceptable timestamp
- * @param flags flags
- * @return >=0 on success, error code otherwise
- *
- * @note This is part of the new seek API which is still under construction.
- *       Thus do not use this yet. It may change at any time, do not expect
- *       ABI compatibility yet!
- */
-int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
-
-/**
- * Start playing a network-based stream (e.g. RTSP stream) at the
- * current position.
- */
-int av_read_play(AVFormatContext *s);
-
-/**
- * Pause a network-based stream (e.g. RTSP stream).
- *
- * Use av_read_play() to resume it.
- */
-int av_read_pause(AVFormatContext *s);
-
-#if FF_API_FORMAT_PARAMETERS
-/**
- * Free a AVFormatContext allocated by av_open_input_stream.
- * @param s context to free
- * @deprecated use av_close_input_file()
- */
-attribute_deprecated
-void av_close_input_stream(AVFormatContext *s);
-#endif
-
-#if FF_API_CLOSE_INPUT_FILE
-/**
- * @deprecated use avformat_close_input()
- * Close a media file (but not its codecs).
- *
- * @param s media file handle
- */
-attribute_deprecated
-void av_close_input_file(AVFormatContext *s);
-#endif
-
-/**
- * Close an opened input AVFormatContext. Free it and all its contents
- * and set *s to NULL.
- */
-void avformat_close_input(AVFormatContext **s);
-/**
- * @}
- */
-
-#if FF_API_NEW_STREAM
-/**
- * Add a new stream to a media file.
- *
- * Can only be called in the read_header() function. If the flag
- * AVFMTCTX_NOHEADER is in the format context, then new streams
- * can be added in read_packet too.
- *
- * @param s media file handle
- * @param id file-format-dependent stream ID
- */
-attribute_deprecated
-AVStream *av_new_stream(AVFormatContext *s, int id);
-#endif
-
-#if FF_API_SET_PTS_INFO
-/**
- * @deprecated this function is not supposed to be called outside of lavf
- */
-attribute_deprecated
-void av_set_pts_info(AVStream *s, int pts_wrap_bits,
-                     unsigned int pts_num, unsigned int pts_den);
-#endif
-
-#define AVSEEK_FLAG_BACKWARD 1 ///< seek backward
-#define AVSEEK_FLAG_BYTE     2 ///< seeking based on position in bytes
-#define AVSEEK_FLAG_ANY      4 ///< seek to any frame, even non-keyframes
-#define AVSEEK_FLAG_FRAME    8 ///< seeking based on frame number
-
-#if FF_API_SEEK_PUBLIC
-attribute_deprecated
-int av_seek_frame_binary(AVFormatContext *s, int stream_index,
-                         int64_t target_ts, int flags);
-attribute_deprecated
-void av_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp);
-attribute_deprecated
-int64_t av_gen_search(AVFormatContext *s, int stream_index,
-                      int64_t target_ts, int64_t pos_min,
-                      int64_t pos_max, int64_t pos_limit,
-                      int64_t ts_min, int64_t ts_max,
-                      int flags, int64_t *ts_ret,
-                      int64_t (*read_timestamp)(struct AVFormatContext *, int , int64_t *, int64_t ));
-#endif
-
-#if FF_API_FORMAT_PARAMETERS
-/**
- * @deprecated pass the options to avformat_write_header directly.
- */
-attribute_deprecated int av_set_parameters(AVFormatContext *s, AVFormatParameters *ap);
-#endif
-
-/**
- * @addtogroup lavf_encoding
- * @{
- */
-/**
- * Allocate the stream private data and write the stream header to
- * an output media file.
- *
- * @param s Media file handle, must be allocated with avformat_alloc_context().
- *          Its oformat field must be set to the desired output format;
- *          Its pb field must be set to an already openened AVIOContext.
- * @param options  An AVDictionary filled with AVFormatContext and muxer-private options.
- *                 On return this parameter will be destroyed and replaced with a dict containing
- *                 options that were not found. May be NULL.
- *
- * @return 0 on success, negative AVERROR on failure.
- *
- * @see av_opt_find, av_dict_set, avio_open, av_oformat_next.
- */
-int avformat_write_header(AVFormatContext *s, AVDictionary **options);
-
-#if FF_API_FORMAT_PARAMETERS
-/**
- * Allocate the stream private data and write the stream header to an
- * output media file.
- * @note: this sets stream time-bases, if possible to stream->codec->time_base
- * but for some formats it might also be some other time base
- *
- * @param s media file handle
- * @return 0 if OK, AVERROR_xxx on error
- *
- * @deprecated use avformat_write_header.
- */
-attribute_deprecated int av_write_header(AVFormatContext *s);
-#endif
-
-/**
- * Write a packet to an output media file.
- *
- * The packet shall contain one audio or video frame.
- * The packet must be correctly interleaved according to the container
- * specification, if not then av_interleaved_write_frame must be used.
- *
- * @param s media file handle
- * @param pkt The packet, which contains the stream_index, buf/buf_size,
-              dts/pts, ...
- * @return < 0 on error, = 0 if OK, 1 if end of stream wanted
- */
-int av_write_frame(AVFormatContext *s, AVPacket *pkt);
-
-/**
- * Write a packet to an output media file ensuring correct interleaving.
- *
- * The packet must contain one audio or video frame.
- * If the packets are already correctly interleaved, the application should
- * call av_write_frame() instead as it is slightly faster. It is also important
- * to keep in mind that completely non-interleaved input will need huge amounts
- * of memory to interleave with this, so it is preferable to interleave at the
- * demuxer level.
- *
- * @param s media file handle
- * @param pkt The packet containing the data to be written. Libavformat takes
- * ownership of the data and will free it when it sees fit using the packet's
- * @ref AVPacket.destruct "destruct" field. The caller must not access the data
- * after this function returns, as it may already be freed.
- * Packet's @ref AVPacket.stream_index "stream_index" field must be set to the
- * index of the corresponding stream in @ref AVFormatContext.streams
- * "s.streams".
- * It is very strongly recommended that timing information (@ref AVPacket.pts
- * "pts", @ref AVPacket.dts "dts" @ref AVPacket.duration "duration") is set to
- * correct values.
- *
- * @return 0 on success, a negative AVERROR on error.
- */
-int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt);
-
-/**
- * Interleave a packet per dts in an output media file.
- *
- * Packets with pkt->destruct == av_destruct_packet will be freed inside this
- * function, so they cannot be used after it. Note that calling av_free_packet()
- * on them is still safe.
- *
- * @param s media file handle
- * @param out the interleaved packet will be output here
- * @param pkt the input packet
- * @param flush 1 if no further packets are available as input and all
- *              remaining packets should be output
- * @return 1 if a packet was output, 0 if no packet could be output,
- *         < 0 if an error occurred
- */
-int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
-                                 AVPacket *pkt, int flush);
-
-/**
- * Write the stream trailer to an output media file and free the
- * file private data.
- *
- * May only be called after a successful call to av_write_header.
- *
- * @param s media file handle
- * @return 0 if OK, AVERROR_xxx on error
- */
-int av_write_trailer(AVFormatContext *s);
-
-/**
- * Return the output format in the list of registered output formats
- * which best matches the provided parameters, or return NULL if
- * there is no match.
- *
- * @param short_name if non-NULL checks if short_name matches with the
- * names of the registered formats
- * @param filename if non-NULL checks if filename terminates with the
- * extensions of the registered formats
- * @param mime_type if non-NULL checks if mime_type matches with the
- * MIME type of the registered formats
- */
-AVOutputFormat *av_guess_format(const char *short_name,
-                                const char *filename,
-                                const char *mime_type);
-
-/**
- * Guess the codec ID based upon muxer and filename.
- */
-enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
-                            const char *filename, const char *mime_type,
-                            enum AVMediaType type);
-
-/**
- * @}
- */
-
-
-/**
- * @defgroup lavf_misc Utility functions
- * @ingroup libavf
- * @{
- *
- * Miscelaneous utility functions related to both muxing and demuxing
- * (or neither).
- */
-
-/**
- * Send a nice hexadecimal dump of a buffer to the specified file stream.
- *
- * @param f The file stream pointer where the dump should be sent to.
- * @param buf buffer
- * @param size buffer size
- *
- * @see av_hex_dump_log, av_pkt_dump2, av_pkt_dump_log2
- */
-void av_hex_dump(FILE *f, uint8_t *buf, int size);
-
-/**
- * Send a nice hexadecimal dump of a buffer to the log.
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- * pointer to an AVClass struct.
- * @param level The importance level of the message, lower values signifying
- * higher importance.
- * @param buf buffer
- * @param size buffer size
- *
- * @see av_hex_dump, av_pkt_dump2, av_pkt_dump_log2
- */
-void av_hex_dump_log(void *avcl, int level, uint8_t *buf, int size);
-
-/**
- * Send a nice dump of a packet to the specified file stream.
- *
- * @param f The file stream pointer where the dump should be sent to.
- * @param pkt packet to dump
- * @param dump_payload True if the payload must be displayed, too.
- * @param st AVStream that the packet belongs to
- */
-void av_pkt_dump2(FILE *f, AVPacket *pkt, int dump_payload, AVStream *st);
-
-
-/**
- * Send a nice dump of a packet to the log.
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- * pointer to an AVClass struct.
- * @param level The importance level of the message, lower values signifying
- * higher importance.
- * @param pkt packet to dump
- * @param dump_payload True if the payload must be displayed, too.
- * @param st AVStream that the packet belongs to
- */
-void av_pkt_dump_log2(void *avcl, int level, AVPacket *pkt, int dump_payload,
-                      AVStream *st);
-
-/**
- * Get the CodecID for the given codec tag tag.
- * If no codec id is found returns CODEC_ID_NONE.
- *
- * @param tags list of supported codec_id-codec_tag pairs, as stored
- * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
- */
-enum CodecID av_codec_get_id(const struct AVCodecTag * const *tags, unsigned int tag);
-
-/**
- * Get the codec tag for the given codec id id.
- * If no codec tag is found returns 0.
- *
- * @param tags list of supported codec_id-codec_tag pairs, as stored
- * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
- */
-unsigned int av_codec_get_tag(const struct AVCodecTag * const *tags, enum CodecID id);
-
-int av_find_default_stream_index(AVFormatContext *s);
-
-/**
- * Get the index for a specific timestamp.
- * @param flags if AVSEEK_FLAG_BACKWARD then the returned index will correspond
- *                 to the timestamp which is <= the requested one, if backward
- *                 is 0, then it will be >=
- *              if AVSEEK_FLAG_ANY seek to any frame, only keyframes otherwise
- * @return < 0 if no such timestamp could be found
- */
-int av_index_search_timestamp(AVStream *st, int64_t timestamp, int flags);
-
-/**
- * Add an index entry into a sorted list. Update the entry if the list
- * already contains it.
- *
- * @param timestamp timestamp in the time base of the given stream
- */
-int av_add_index_entry(AVStream *st, int64_t pos, int64_t timestamp,
-                       int size, int distance, int flags);
-
-
-/**
- * Split a URL string into components.
- *
- * The pointers to buffers for storing individual components may be null,
- * in order to ignore that component. Buffers for components not found are
- * set to empty strings. If the port is not found, it is set to a negative
- * value.
- *
- * @param proto the buffer for the protocol
- * @param proto_size the size of the proto buffer
- * @param authorization the buffer for the authorization
- * @param authorization_size the size of the authorization buffer
- * @param hostname the buffer for the host name
- * @param hostname_size the size of the hostname buffer
- * @param port_ptr a pointer to store the port number in
- * @param path the buffer for the path
- * @param path_size the size of the path buffer
- * @param url the URL to split
- */
-void av_url_split(char *proto,         int proto_size,
-                  char *authorization, int authorization_size,
-                  char *hostname,      int hostname_size,
-                  int *port_ptr,
-                  char *path,          int path_size,
-                  const char *url);
-
-#if FF_API_DUMP_FORMAT
-attribute_deprecated void dump_format(AVFormatContext *ic,
-                                      int index,
-                                      const char *url,
-                                      int is_output);
-#endif
-
-void av_dump_format(AVFormatContext *ic,
-                    int index,
-                    const char *url,
-                    int is_output);
-
-#if FF_API_PARSE_DATE
-/**
- * Parse datestr and return a corresponding number of microseconds.
- *
- * @param datestr String representing a date or a duration.
- * See av_parse_time() for the syntax of the provided string.
- * @deprecated in favor of av_parse_time()
- */
-attribute_deprecated
-int64_t parse_date(const char *datestr, int duration);
-#endif
-
-/**
- * Get the current time in microseconds.
- */
-int64_t av_gettime(void);
-
-#if FF_API_FIND_INFO_TAG
-/**
- * @deprecated use av_find_info_tag in libavutil instead.
- */
-attribute_deprecated int find_info_tag(char *arg, int arg_size, const char *tag1, const char *info);
-#endif
-
-/**
- * Return in 'buf' the path with '%d' replaced by a number.
- *
- * Also handles the '%0nd' format where 'n' is the total number
- * of digits and '%%'.
- *
- * @param buf destination buffer
- * @param buf_size destination buffer size
- * @param path numbered sequence string
- * @param number frame number
- * @return 0 if OK, -1 on format error
- */
-int av_get_frame_filename(char *buf, int buf_size,
-                          const char *path, int number);
-
-/**
- * Check whether filename actually is a numbered sequence generator.
- *
- * @param filename possible numbered sequence string
- * @return 1 if a valid numbered sequence string, 0 otherwise
- */
-int av_filename_number_test(const char *filename);
-
-/**
- * Generate an SDP for an RTP session.
- *
- * @param ac array of AVFormatContexts describing the RTP streams. If the
- *           array is composed by only one context, such context can contain
- *           multiple AVStreams (one AVStream per RTP stream). Otherwise,
- *           all the contexts in the array (an AVCodecContext per RTP stream)
- *           must contain only one AVStream.
- * @param n_files number of AVCodecContexts contained in ac
- * @param buf buffer where the SDP will be stored (must be allocated by
- *            the caller)
- * @param size the size of the buffer
- * @return 0 if OK, AVERROR_xxx on error
- */
-int av_sdp_create(AVFormatContext *ac[], int n_files, char *buf, int size);
-
-#if FF_API_SDP_CREATE
-attribute_deprecated int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size);
-#endif
-
-/**
- * Return a positive value if the given filename has one of the given
- * extensions, 0 otherwise.
- *
- * @param extensions a comma-separated list of filename extensions
- */
-int av_match_ext(const char *filename, const char *extensions);
-
-/**
- * Test if the given container can store a codec.
- *
- * @param std_compliance standards compliance level, one of FF_COMPLIANCE_*
- *
- * @return 1 if codec with ID codec_id can be stored in ofmt, 0 if it cannot.
- *         A negative number if this information is not available.
- */
-int avformat_query_codec(AVOutputFormat *ofmt, enum CodecID codec_id, int std_compliance);
-
-/**
- * @defgroup riff_fourcc RIFF FourCCs
- * @{
- * Get the tables mapping RIFF FourCCs to libavcodec CodecIDs. The tables are
- * meant to be passed to av_codec_get_id()/av_codec_get_tag() as in the
- * following code:
- * @code
- * uint32_t tag = MKTAG('H', '2', '6', '4');
- * const struct AVCodecTag *table[] = { avformat_get_riff_video_tags(), 0 };
- * enum CodecID id = av_codec_get_id(table, tag);
- * @endcode
- */
-/**
- * @return the table mapping RIFF FourCCs for video to libavcodec CodecID.
- */
-const struct AVCodecTag *avformat_get_riff_video_tags(void);
-/**
- * @return the table mapping RIFF FourCCs for audio to CodecID.
- */
-const struct AVCodecTag *avformat_get_riff_audio_tags(void);
-/**
- * @}
- */
-
-/**
- * @}
- */
-
-#endif /* AVFORMAT_AVFORMAT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavformat/avio.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavformat/avio.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavformat/avio.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavformat/avio.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,688 +0,0 @@
-/*
- * copyright (c) 2001 Fabrice Bellard
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-#ifndef AVFORMAT_AVIO_H
-#define AVFORMAT_AVIO_H
-
-/**
- * @file
- * @ingroup lavf_io
- * Buffered I/O operations
- */
-
-#include <stdint.h>
-
-#include "libavutil/common.h"
-#include "libavutil/dict.h"
-#include "libavutil/log.h"
-
-#include "libavformat/version.h"
-
-
-#define AVIO_SEEKABLE_NORMAL 0x0001 /**< Seeking works like for a local file */
-
-/**
- * Callback for checking whether to abort blocking functions.
- * AVERROR_EXIT is returned in this case by the interrupted
- * function. During blocking operations, callback is called with
- * opaque as parameter. If the callback returns 1, the
- * blocking operation will be aborted.
- *
- * No members can be added to this struct without a major bump, if
- * new elements have been added after this struct in AVFormatContext
- * or AVIOContext.
- */
-typedef struct {
-    int (*callback)(void*);
-    void *opaque;
-} AVIOInterruptCB;
-
-/**
- * Bytestream IO Context.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVIOContext) must not be used outside libav*.
- *
- * @note None of the function pointers in AVIOContext should be called
- *       directly, they should only be set by the client application
- *       when implementing custom I/O. Normally these are set to the
- *       function pointers specified in avio_alloc_context()
- */
-typedef struct {
-#if !FF_API_OLD_AVIO
-    /**
-     * A class for private options.
-     *
-     * If this AVIOContext is created by avio_open2(), av_class is set and
-     * passes the options down to protocols.
-     *
-     * If this AVIOContext is manually allocated, then av_class may be set by
-     * the caller.
-     *
-     * warning -- this field can be NULL, be sure to not pass this AVIOContext
-     * to any av_opt_* functions in that case.
-     */
-    AVClass *av_class;
-#endif
-    unsigned char *buffer;  /**< Start of the buffer. */
-    int buffer_size;        /**< Maximum buffer size */
-    unsigned char *buf_ptr; /**< Current position in the buffer */
-    unsigned char *buf_end; /**< End of the data, may be less than
-                                 buffer+buffer_size if the read function returned
-                                 less data than requested, e.g. for streams where
-                                 no more data has been received yet. */
-    void *opaque;           /**< A private pointer, passed to the read/write/seek/...
-                                 functions. */
-    int (*read_packet)(void *opaque, uint8_t *buf, int buf_size);
-    int (*write_packet)(void *opaque, uint8_t *buf, int buf_size);
-    int64_t (*seek)(void *opaque, int64_t offset, int whence);
-    int64_t pos;            /**< position in the file of the current buffer */
-    int must_flush;         /**< true if the next seek should flush */
-    int eof_reached;        /**< true if eof reached */
-    int write_flag;         /**< true if open for writing */
-#if FF_API_OLD_AVIO
-    attribute_deprecated int is_streamed;
-#endif
-    int max_packet_size;
-    unsigned long checksum;
-    unsigned char *checksum_ptr;
-    unsigned long (*update_checksum)(unsigned long checksum, const uint8_t *buf, unsigned int size);
-    int error;              /**< contains the error code or 0 if no error happened */
-    /**
-     * Pause or resume playback for network streaming protocols - e.g. MMS.
-     */
-    int (*read_pause)(void *opaque, int pause);
-    /**
-     * Seek to a given timestamp in stream with the specified stream_index.
-     * Needed for some network streaming protocols which don't support seeking
-     * to byte position.
-     */
-    int64_t (*read_seek)(void *opaque, int stream_index,
-                         int64_t timestamp, int flags);
-    /**
-     * A combination of AVIO_SEEKABLE_ flags or 0 when the stream is not seekable.
-     */
-    int seekable;
-} AVIOContext;
-
-/* unbuffered I/O */
-
-#if FF_API_OLD_AVIO
-/**
- * URL Context.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(URLContext) must not be used outside libav*.
- * @deprecated This struct will be made private
- */
-typedef struct URLContext {
-    const AVClass *av_class; ///< information for av_log(). Set by url_open().
-    struct URLProtocol *prot;
-    int flags;
-    int is_streamed;  /**< true if streamed (no seek possible), default = false */
-    int max_packet_size;  /**< if non zero, the stream is packetized with this max packet size */
-    void *priv_data;
-    char *filename; /**< specified URL */
-    int is_connected;
-    AVIOInterruptCB interrupt_callback;
-} URLContext;
-
-#define URL_PROTOCOL_FLAG_NESTED_SCHEME 1 /*< The protocol name can be the first part of a nested protocol scheme */
-#define URL_PROTOCOL_FLAG_NETWORK       2 /*< The protocol uses network */
-
-/**
- * @deprecated This struct is to be made private. Use the higher-level
- *             AVIOContext-based API instead.
- */
-typedef struct URLProtocol {
-    const char *name;
-    int (*url_open)(URLContext *h, const char *url, int flags);
-    int (*url_read)(URLContext *h, unsigned char *buf, int size);
-    int (*url_write)(URLContext *h, const unsigned char *buf, int size);
-    int64_t (*url_seek)(URLContext *h, int64_t pos, int whence);
-    int (*url_close)(URLContext *h);
-    struct URLProtocol *next;
-    int (*url_read_pause)(URLContext *h, int pause);
-    int64_t (*url_read_seek)(URLContext *h, int stream_index,
-                             int64_t timestamp, int flags);
-    int (*url_get_file_handle)(URLContext *h);
-    int priv_data_size;
-    const AVClass *priv_data_class;
-    int flags;
-    int (*url_check)(URLContext *h, int mask);
-} URLProtocol;
-
-typedef struct URLPollEntry {
-    URLContext *handle;
-    int events;
-    int revents;
-} URLPollEntry;
-
-/* not implemented */
-attribute_deprecated int url_poll(URLPollEntry *poll_table, int n, int timeout);
-
-/**
- * @name URL open modes
- * The flags argument to url_open and cosins must be one of the following
- * constants, optionally ORed with other flags.
- * @{
- */
-#define URL_RDONLY 1  /**< read-only */
-#define URL_WRONLY 2  /**< write-only */
-#define URL_RDWR   (URL_RDONLY|URL_WRONLY)  /**< read-write */
-/**
- * @}
- */
-
-/**
- * Use non-blocking mode.
- * If this flag is set, operations on the context will return
- * AVERROR(EAGAIN) if they can not be performed immediately.
- * If this flag is not set, operations on the context will never return
- * AVERROR(EAGAIN).
- * Note that this flag does not affect the opening/connecting of the
- * context. Connecting a protocol will always block if necessary (e.g. on
- * network protocols) but never hang (e.g. on busy devices).
- * Warning: non-blocking protocols is work-in-progress; this flag may be
- * silently ignored.
- */
-#define URL_FLAG_NONBLOCK 8
-
-typedef int URLInterruptCB(void);
-extern URLInterruptCB *url_interrupt_cb;
-
-/**
- * @defgroup old_url_funcs Old url_* functions
- * The following functions are deprecated. Use the buffered API based on #AVIOContext instead.
- * @{
- * @ingroup lavf_io
- */
-attribute_deprecated int url_open_protocol (URLContext **puc, struct URLProtocol *up,
-                                            const char *url, int flags);
-attribute_deprecated int url_alloc(URLContext **h, const char *url, int flags);
-attribute_deprecated int url_connect(URLContext *h);
-attribute_deprecated int url_open(URLContext **h, const char *url, int flags);
-attribute_deprecated int url_read(URLContext *h, unsigned char *buf, int size);
-attribute_deprecated int url_read_complete(URLContext *h, unsigned char *buf, int size);
-attribute_deprecated int url_write(URLContext *h, const unsigned char *buf, int size);
-attribute_deprecated int64_t url_seek(URLContext *h, int64_t pos, int whence);
-attribute_deprecated int url_close(URLContext *h);
-attribute_deprecated int64_t url_filesize(URLContext *h);
-attribute_deprecated int url_get_file_handle(URLContext *h);
-attribute_deprecated int url_get_max_packet_size(URLContext *h);
-attribute_deprecated void url_get_filename(URLContext *h, char *buf, int buf_size);
-attribute_deprecated int av_url_read_pause(URLContext *h, int pause);
-attribute_deprecated int64_t av_url_read_seek(URLContext *h, int stream_index,
-                                              int64_t timestamp, int flags);
-attribute_deprecated void url_set_interrupt_cb(int (*interrupt_cb)(void));
-/**
- * If protocol is NULL, returns the first registered protocol,
- * if protocol is non-NULL, returns the next registered protocol after protocol,
- * or NULL if protocol is the last one.
- */
-attribute_deprecated URLProtocol *av_protocol_next(URLProtocol *p);
-/**
- * Register the URLProtocol protocol.
- *
- * @param size the size of the URLProtocol struct referenced
- */
-attribute_deprecated int av_register_protocol2(URLProtocol *protocol, int size);
-/**
- * @}
- */
-
-
-typedef attribute_deprecated AVIOContext ByteIOContext;
-
-attribute_deprecated int init_put_byte(AVIOContext *s,
-                  unsigned char *buffer,
-                  int buffer_size,
-                  int write_flag,
-                  void *opaque,
-                  int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
-                  int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
-                  int64_t (*seek)(void *opaque, int64_t offset, int whence));
-attribute_deprecated AVIOContext *av_alloc_put_byte(
-                  unsigned char *buffer,
-                  int buffer_size,
-                  int write_flag,
-                  void *opaque,
-                  int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
-                  int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
-                  int64_t (*seek)(void *opaque, int64_t offset, int whence));
-
-/**
- * @defgroup old_avio_funcs Old put_/get_*() functions
- * The following functions are deprecated. Use the "avio_"-prefixed functions instead.
- * @{
- * @ingroup lavf_io
- */
-attribute_deprecated int          get_buffer(AVIOContext *s, unsigned char *buf, int size);
-attribute_deprecated int          get_partial_buffer(AVIOContext *s, unsigned char *buf, int size);
-attribute_deprecated int          get_byte(AVIOContext *s);
-attribute_deprecated unsigned int get_le16(AVIOContext *s);
-attribute_deprecated unsigned int get_le24(AVIOContext *s);
-attribute_deprecated unsigned int get_le32(AVIOContext *s);
-attribute_deprecated uint64_t     get_le64(AVIOContext *s);
-attribute_deprecated unsigned int get_be16(AVIOContext *s);
-attribute_deprecated unsigned int get_be24(AVIOContext *s);
-attribute_deprecated unsigned int get_be32(AVIOContext *s);
-attribute_deprecated uint64_t     get_be64(AVIOContext *s);
-
-attribute_deprecated void         put_byte(AVIOContext *s, int b);
-attribute_deprecated void         put_nbyte(AVIOContext *s, int b, int count);
-attribute_deprecated void         put_buffer(AVIOContext *s, const unsigned char *buf, int size);
-attribute_deprecated void         put_le64(AVIOContext *s, uint64_t val);
-attribute_deprecated void         put_be64(AVIOContext *s, uint64_t val);
-attribute_deprecated void         put_le32(AVIOContext *s, unsigned int val);
-attribute_deprecated void         put_be32(AVIOContext *s, unsigned int val);
-attribute_deprecated void         put_le24(AVIOContext *s, unsigned int val);
-attribute_deprecated void         put_be24(AVIOContext *s, unsigned int val);
-attribute_deprecated void         put_le16(AVIOContext *s, unsigned int val);
-attribute_deprecated void         put_be16(AVIOContext *s, unsigned int val);
-attribute_deprecated void         put_tag(AVIOContext *s, const char *tag);
-/**
- * @}
- */
-
-attribute_deprecated int     av_url_read_fpause(AVIOContext *h,    int pause);
-attribute_deprecated int64_t av_url_read_fseek (AVIOContext *h,    int stream_index,
-                                                int64_t timestamp, int flags);
-
-/**
- * @defgroup old_url_f_funcs Old url_f* functions
- * The following functions are deprecated, use the "avio_"-prefixed functions instead.
- * @{
- * @ingroup lavf_io
- */
-attribute_deprecated int url_fopen( AVIOContext **s, const char *url, int flags);
-attribute_deprecated int url_fclose(AVIOContext *s);
-attribute_deprecated int64_t url_fseek(AVIOContext *s, int64_t offset, int whence);
-attribute_deprecated int url_fskip(AVIOContext *s, int64_t offset);
-attribute_deprecated int64_t url_ftell(AVIOContext *s);
-attribute_deprecated int64_t url_fsize(AVIOContext *s);
-#define URL_EOF (-1)
-attribute_deprecated int url_fgetc(AVIOContext *s);
-attribute_deprecated int url_setbufsize(AVIOContext *s, int buf_size);
-attribute_deprecated int url_fprintf(AVIOContext *s, const char *fmt, ...) av_printf_format(2, 3);
-attribute_deprecated void put_flush_packet(AVIOContext *s);
-attribute_deprecated int url_open_dyn_buf(AVIOContext **s);
-attribute_deprecated int url_open_dyn_packet_buf(AVIOContext **s, int max_packet_size);
-attribute_deprecated int url_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer);
-attribute_deprecated int url_fdopen(AVIOContext **s, URLContext *h);
-/**
- * @}
- */
-
-/**
- * @deprecated use AVIOContext.eof_reached
- */
-attribute_deprecated int url_feof(AVIOContext *s);
-attribute_deprecated int url_ferror(AVIOContext *s);
-
-attribute_deprecated int udp_set_remote_url(URLContext *h, const char *uri);
-attribute_deprecated int udp_get_local_port(URLContext *h);
-
-attribute_deprecated void init_checksum(AVIOContext *s,
-                   unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len),
-                   unsigned long checksum);
-attribute_deprecated unsigned long get_checksum(AVIOContext *s);
-attribute_deprecated void put_strz(AVIOContext *s, const char *buf);
-/** @note unlike fgets, the EOL character is not returned and a whole
-    line is parsed. return NULL if first char read was EOF */
-attribute_deprecated char *url_fgets(AVIOContext *s, char *buf, int buf_size);
-/**
- * @deprecated use avio_get_str instead
- */
-attribute_deprecated char *get_strz(AVIOContext *s, char *buf, int maxlen);
-/**
- * @deprecated Use AVIOContext.seekable field directly.
- */
-attribute_deprecated static inline int url_is_streamed(AVIOContext *s)
-{
-    return !s->seekable;
-}
-attribute_deprecated URLContext *url_fileno(AVIOContext *s);
-
-/**
- * @deprecated use AVIOContext.max_packet_size directly.
- */
-attribute_deprecated int url_fget_max_packet_size(AVIOContext *s);
-
-attribute_deprecated int url_open_buf(AVIOContext **s, uint8_t *buf, int buf_size, int flags);
-
-/** return the written or read size */
-attribute_deprecated int url_close_buf(AVIOContext *s);
-
-/**
- * Return a non-zero value if the resource indicated by url
- * exists, 0 otherwise.
- * @deprecated Use avio_check instead.
- */
-attribute_deprecated int url_exist(const char *url);
-#endif // FF_API_OLD_AVIO
-
-/**
- * Return AVIO_FLAG_* access flags corresponding to the access permissions
- * of the resource in url, or a negative value corresponding to an
- * AVERROR code in case of failure. The returned access flags are
- * masked by the value in flags.
- *
- * @note This function is intrinsically unsafe, in the sense that the
- * checked resource may change its existence or permission status from
- * one call to another. Thus you should not trust the returned value,
- * unless you are sure that no other processes are accessing the
- * checked resource.
- */
-int avio_check(const char *url, int flags);
-
-#if FF_API_OLD_INTERRUPT_CB
-/**
- * The callback is called in blocking functions to test regulary if
- * asynchronous interruption is needed. AVERROR_EXIT is returned
- * in this case by the interrupted function. 'NULL' means no interrupt
- * callback is given.
- * @deprecated Use interrupt_callback in AVFormatContext/avio_open2
- *             instead.
- */
-attribute_deprecated void avio_set_interrupt_cb(int (*interrupt_cb)(void));
-#endif
-
-/**
- * Allocate and initialize an AVIOContext for buffered I/O. It must be later
- * freed with av_free().
- *
- * @param buffer Memory block for input/output operations via AVIOContext.
- *        The buffer must be allocated with av_malloc() and friends.
- * @param buffer_size The buffer size is very important for performance.
- *        For protocols with fixed blocksize it should be set to this blocksize.
- *        For others a typical size is a cache page, e.g. 4kb.
- * @param write_flag Set to 1 if the buffer should be writable, 0 otherwise.
- * @param opaque An opaque pointer to user-specific data.
- * @param read_packet  A function for refilling the buffer, may be NULL.
- * @param write_packet A function for writing the buffer contents, may be NULL.
- * @param seek A function for seeking to specified byte position, may be NULL.
- *
- * @return Allocated AVIOContext or NULL on failure.
- */
-AVIOContext *avio_alloc_context(
-                  unsigned char *buffer,
-                  int buffer_size,
-                  int write_flag,
-                  void *opaque,
-                  int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
-                  int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
-                  int64_t (*seek)(void *opaque, int64_t offset, int whence));
-
-void avio_w8(AVIOContext *s, int b);
-void avio_write(AVIOContext *s, const unsigned char *buf, int size);
-void avio_wl64(AVIOContext *s, uint64_t val);
-void avio_wb64(AVIOContext *s, uint64_t val);
-void avio_wl32(AVIOContext *s, unsigned int val);
-void avio_wb32(AVIOContext *s, unsigned int val);
-void avio_wl24(AVIOContext *s, unsigned int val);
-void avio_wb24(AVIOContext *s, unsigned int val);
-void avio_wl16(AVIOContext *s, unsigned int val);
-void avio_wb16(AVIOContext *s, unsigned int val);
-
-/**
- * Write a NULL-terminated string.
- * @return number of bytes written.
- */
-int avio_put_str(AVIOContext *s, const char *str);
-
-/**
- * Convert an UTF-8 string to UTF-16LE and write it.
- * @return number of bytes written.
- */
-int avio_put_str16le(AVIOContext *s, const char *str);
-
-/**
- * Passing this as the "whence" parameter to a seek function causes it to
- * return the filesize without seeking anywhere. Supporting this is optional.
- * If it is not supported then the seek function will return <0.
- */
-#define AVSEEK_SIZE 0x10000
-
-/**
- * Oring this flag as into the "whence" parameter to a seek function causes it to
- * seek by any means (like reopening and linear reading) or other normally unreasonble
- * means that can be extreemly slow.
- * This may be ignored by the seek code.
- */
-#define AVSEEK_FORCE 0x20000
-
-/**
- * fseek() equivalent for AVIOContext.
- * @return new position or AVERROR.
- */
-int64_t avio_seek(AVIOContext *s, int64_t offset, int whence);
-
-/**
- * Skip given number of bytes forward
- * @return new position or AVERROR.
- */
-static av_always_inline int64_t avio_skip(AVIOContext *s, int64_t offset)
-{
-    return avio_seek(s, offset, SEEK_CUR);
-}
-
-/**
- * ftell() equivalent for AVIOContext.
- * @return position or AVERROR.
- */
-static av_always_inline int64_t avio_tell(AVIOContext *s)
-{
-    return avio_seek(s, 0, SEEK_CUR);
-}
-
-/**
- * Get the filesize.
- * @return filesize or AVERROR
- */
-int64_t avio_size(AVIOContext *s);
-
-/** @warning currently size is limited */
-int avio_printf(AVIOContext *s, const char *fmt, ...) av_printf_format(2, 3);
-
-void avio_flush(AVIOContext *s);
-
-
-/**
- * Read size bytes from AVIOContext into buf.
- * @return number of bytes read or AVERROR
- */
-int avio_read(AVIOContext *s, unsigned char *buf, int size);
-
-/**
- * @name Functions for reading from AVIOContext
- * @{
- *
- * @note return 0 if EOF, so you cannot use it if EOF handling is
- *       necessary
- */
-int          avio_r8  (AVIOContext *s);
-unsigned int avio_rl16(AVIOContext *s);
-unsigned int avio_rl24(AVIOContext *s);
-unsigned int avio_rl32(AVIOContext *s);
-uint64_t     avio_rl64(AVIOContext *s);
-unsigned int avio_rb16(AVIOContext *s);
-unsigned int avio_rb24(AVIOContext *s);
-unsigned int avio_rb32(AVIOContext *s);
-uint64_t     avio_rb64(AVIOContext *s);
-/**
- * @}
- */
-
-/**
- * Read a string from pb into buf. The reading will terminate when either
- * a NULL character was encountered, maxlen bytes have been read, or nothing
- * more can be read from pb. The result is guaranteed to be NULL-terminated, it
- * will be truncated if buf is too small.
- * Note that the string is not interpreted or validated in any way, it
- * might get truncated in the middle of a sequence for multi-byte encodings.
- *
- * @return number of bytes read (is always <= maxlen).
- * If reading ends on EOF or error, the return value will be one more than
- * bytes actually read.
- */
-int avio_get_str(AVIOContext *pb, int maxlen, char *buf, int buflen);
-
-/**
- * Read a UTF-16 string from pb and convert it to UTF-8.
- * The reading will terminate when either a null or invalid character was
- * encountered or maxlen bytes have been read.
- * @return number of bytes read (is always <= maxlen)
- */
-int avio_get_str16le(AVIOContext *pb, int maxlen, char *buf, int buflen);
-int avio_get_str16be(AVIOContext *pb, int maxlen, char *buf, int buflen);
-
-
-/**
- * @name URL open modes
- * The flags argument to avio_open must be one of the following
- * constants, optionally ORed with other flags.
- * @{
- */
-#define AVIO_FLAG_READ  1                                      /**< read-only */
-#define AVIO_FLAG_WRITE 2                                      /**< write-only */
-#define AVIO_FLAG_READ_WRITE (AVIO_FLAG_READ|AVIO_FLAG_WRITE)  /**< read-write pseudo flag */
-/**
- * @}
- */
-
-/**
- * Use non-blocking mode.
- * If this flag is set, operations on the context will return
- * AVERROR(EAGAIN) if they can not be performed immediately.
- * If this flag is not set, operations on the context will never return
- * AVERROR(EAGAIN).
- * Note that this flag does not affect the opening/connecting of the
- * context. Connecting a protocol will always block if necessary (e.g. on
- * network protocols) but never hang (e.g. on busy devices).
- * Warning: non-blocking protocols is work-in-progress; this flag may be
- * silently ignored.
- */
-#define AVIO_FLAG_NONBLOCK 8
-
-/**
- * Create and initialize a AVIOContext for accessing the
- * resource indicated by url.
- * @note When the resource indicated by url has been opened in
- * read+write mode, the AVIOContext can be used only for writing.
- *
- * @param s Used to return the pointer to the created AVIOContext.
- * In case of failure the pointed to value is set to NULL.
- * @param flags flags which control how the resource indicated by url
- * is to be opened
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure
- */
-int avio_open(AVIOContext **s, const char *url, int flags);
-
-/**
- * Create and initialize a AVIOContext for accessing the
- * resource indicated by url.
- * @note When the resource indicated by url has been opened in
- * read+write mode, the AVIOContext can be used only for writing.
- *
- * @param s Used to return the pointer to the created AVIOContext.
- * In case of failure the pointed to value is set to NULL.
- * @param flags flags which control how the resource indicated by url
- * is to be opened
- * @param int_cb an interrupt callback to be used at the protocols level
- * @param options  A dictionary filled with protocol-private options. On return
- * this parameter will be destroyed and replaced with a dict containing options
- * that were not found. May be NULL.
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure
- */
-int avio_open2(AVIOContext **s, const char *url, int flags,
-               const AVIOInterruptCB *int_cb, AVDictionary **options);
-
-/**
- * Close the resource accessed by the AVIOContext s and free it.
- * This function can only be used if s was opened by avio_open().
- *
- * @return 0 on success, an AVERROR < 0 on error.
- */
-int avio_close(AVIOContext *s);
-
-/**
- * Open a write only memory stream.
- *
- * @param s new IO context
- * @return zero if no error.
- */
-int avio_open_dyn_buf(AVIOContext **s);
-
-/**
- * Return the written size and a pointer to the buffer. The buffer
- * must be freed with av_free().
- * Padding of FF_INPUT_BUFFER_PADDING_SIZE is added to the buffer.
- *
- * @param s IO context
- * @param pbuffer pointer to a byte buffer
- * @return the length of the byte buffer
- */
-int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer);
-
-/**
- * Iterate through names of available protocols.
- *
- * @param opaque A private pointer representing current protocol.
- *        It must be a pointer to NULL on first iteration and will
- *        be updated by successive calls to avio_enum_protocols.
- * @param output If set to 1, iterate over output protocols,
- *               otherwise over input protocols.
- *
- * @return A static string containing the name of current protocol or NULL
- */
-const char *avio_enum_protocols(void **opaque, int output);
-
-/**
- * Pause and resume playing - only meaningful if using a network streaming
- * protocol (e.g. MMS).
- * @param pause 1 for pause, 0 for resume
- */
-int     avio_pause(AVIOContext *h, int pause);
-
-/**
- * Seek to a given timestamp relative to some component stream.
- * Only meaningful if using a network streaming protocol (e.g. MMS.).
- * @param stream_index The stream index that the timestamp is relative to.
- *        If stream_index is (-1) the timestamp should be in AV_TIME_BASE
- *        units from the beginning of the presentation.
- *        If a stream_index >= 0 is used and the protocol does not support
- *        seeking based on component streams, the call will fail with ENOTSUP.
- * @param timestamp timestamp in AVStream.time_base units
- *        or if there is no stream specified then in AV_TIME_BASE units.
- * @param flags Optional combination of AVSEEK_FLAG_BACKWARD, AVSEEK_FLAG_BYTE
- *        and AVSEEK_FLAG_ANY. The protocol may silently ignore
- *        AVSEEK_FLAG_BACKWARD and AVSEEK_FLAG_ANY, but AVSEEK_FLAG_BYTE will
- *        fail with ENOTSUP if used and not supported.
- * @return >= 0 on success
- * @see AVInputFormat::read_seek
- */
-int64_t avio_seek_time(AVIOContext *h, int stream_index,
-                       int64_t timestamp, int flags);
-
-#endif /* AVFORMAT_AVIO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavformat/version.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavformat/version.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavformat/version.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavformat/version.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,126 +0,0 @@
-/*
- * Version macros.
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVFORMAT_VERSION_H
-#define AVFORMAT_VERSION_H
-
-/**
- * @file
- * @ingroup libavf
- * Libavformat version macros
- */
-
-#include "libavutil/avutil.h"
-
-#define LIBAVFORMAT_VERSION_MAJOR 53
-#define LIBAVFORMAT_VERSION_MINOR 21
-#define LIBAVFORMAT_VERSION_MICRO  1
-
-#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
-                                               LIBAVFORMAT_VERSION_MINOR, \
-                                               LIBAVFORMAT_VERSION_MICRO)
-#define LIBAVFORMAT_VERSION     AV_VERSION(LIBAVFORMAT_VERSION_MAJOR,   \
-                                           LIBAVFORMAT_VERSION_MINOR,   \
-                                           LIBAVFORMAT_VERSION_MICRO)
-#define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
-
-#define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
-
-/**
- * Those FF_API_* defines are not part of public API.
- * They may change, break or disappear at any time.
- */
-#ifndef FF_API_OLD_METADATA2
-#define FF_API_OLD_METADATA2           (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_OLD_AVIO
-#define FF_API_OLD_AVIO                (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_DUMP_FORMAT
-#define FF_API_DUMP_FORMAT             (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_PARSE_DATE
-#define FF_API_PARSE_DATE              (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_FIND_INFO_TAG
-#define FF_API_FIND_INFO_TAG           (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_PKT_DUMP
-#define FF_API_PKT_DUMP                (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_GUESS_IMG2_CODEC
-#define FF_API_GUESS_IMG2_CODEC        (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_SDP_CREATE
-#define FF_API_SDP_CREATE              (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_FORMAT_PARAMETERS
-#define FF_API_FORMAT_PARAMETERS       (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_FLAG_RTP_HINT
-#define FF_API_FLAG_RTP_HINT           (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_AVSTREAM_QUALITY
-#define FF_API_AVSTREAM_QUALITY        (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_LOOP_INPUT
-#define FF_API_LOOP_INPUT              (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_LOOP_OUTPUT
-#define FF_API_LOOP_OUTPUT             (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_TIMESTAMP
-#define FF_API_TIMESTAMP               (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_FILESIZE
-#define FF_API_FILESIZE                (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_MUXRATE
-#define FF_API_MUXRATE                 (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_RTSP_URL_OPTIONS
-#define FF_API_RTSP_URL_OPTIONS        (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_NEW_STREAM
-#define FF_API_NEW_STREAM              (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_PRELOAD
-#define FF_API_PRELOAD                 (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_STREAM_COPY
-#define FF_API_STREAM_COPY             (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_SEEK_PUBLIC
-#define FF_API_SEEK_PUBLIC             (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_REORDER_PRIVATE
-#define FF_API_REORDER_PRIVATE         (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_OLD_INTERRUPT_CB
-#define FF_API_OLD_INTERRUPT_CB        (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_SET_PTS_INFO
-#define FF_API_SET_PTS_INFO            (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_CLOSE_INPUT_FILE
-#define FF_API_CLOSE_INPUT_FILE        (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
-
-#endif /* AVFORMAT_VERSION_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/adler32.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/adler32.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/adler32.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/adler32.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/*
- * copyright (c) 2006 Mans Rullgard
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_ADLER32_H
-#define AVUTIL_ADLER32_H
-
-#include <stdint.h>
-#include "attributes.h"
-
-/**
- * @ingroup lavu_crypto
- * Calculate the Adler32 checksum of a buffer.
- *
- * Passing the return value to a subsequent av_adler32_update() call
- * allows the checksum of multiple buffers to be calculated as though
- * they were concatenated.
- *
- * @param adler initial checksum value
- * @param buf   pointer to input buffer
- * @param len   size of input buffer
- * @return      updated checksum
- */
-unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf,
-                                unsigned int len) av_pure;
-
-#endif /* AVUTIL_ADLER32_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/aes.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/aes.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/aes.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/aes.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-/*
- * copyright (c) 2007 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_AES_H
-#define AVUTIL_AES_H
-
-#include <stdint.h>
-
-/**
- * @defgroup lavu_aes AES
- * @ingroup lavu_crypto
- * @{
- */
-
-extern const int av_aes_size;
-
-struct AVAES;
-
-/**
- * Initialize an AVAES context.
- * @param key_bits 128, 192 or 256
- * @param decrypt 0 for encryption, 1 for decryption
- */
-int av_aes_init(struct AVAES *a, const uint8_t *key, int key_bits, int decrypt);
-
-/**
- * Encrypt or decrypt a buffer using a previously initialized context.
- * @param count number of 16 byte blocks
- * @param dst destination array, can be equal to src
- * @param src source array, can be equal to dst
- * @param iv initialization vector for CBC mode, if NULL then ECB will be used
- * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_aes_crypt(struct AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_AES_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/attributes.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/attributes.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/attributes.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/attributes.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,136 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Macro definitions for various function/variable attributes
- */
-
-#ifndef AVUTIL_ATTRIBUTES_H
-#define AVUTIL_ATTRIBUTES_H
-
-#ifdef __GNUC__
-#    define AV_GCC_VERSION_AT_LEAST(x,y) (__GNUC__ > x || __GNUC__ == x && __GNUC_MINOR__ >= y)
-#else
-#    define AV_GCC_VERSION_AT_LEAST(x,y) 0
-#endif
-
-#ifndef av_always_inline
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_always_inline __attribute__((always_inline)) inline
-#else
-#    define av_always_inline inline
-#endif
-#endif
-
-#ifndef av_noinline
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_noinline __attribute__((noinline))
-#else
-#    define av_noinline
-#endif
-#endif
-
-#ifndef av_pure
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_pure __attribute__((pure))
-#else
-#    define av_pure
-#endif
-#endif
-
-#ifndef av_const
-#if AV_GCC_VERSION_AT_LEAST(2,6)
-#    define av_const __attribute__((const))
-#else
-#    define av_const
-#endif
-#endif
-
-#ifndef av_cold
-#if AV_GCC_VERSION_AT_LEAST(4,3)
-#    define av_cold __attribute__((cold))
-#else
-#    define av_cold
-#endif
-#endif
-
-#ifndef av_flatten
-#if AV_GCC_VERSION_AT_LEAST(4,1)
-#    define av_flatten __attribute__((flatten))
-#else
-#    define av_flatten
-#endif
-#endif
-
-#ifndef attribute_deprecated
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define attribute_deprecated __attribute__((deprecated))
-#else
-#    define attribute_deprecated
-#endif
-#endif
-
-#ifndef av_unused
-#if defined(__GNUC__)
-#    define av_unused __attribute__((unused))
-#else
-#    define av_unused
-#endif
-#endif
-
-/**
- * Mark a variable as used and prevent the compiler from optimizing it
- * away.  This is useful for variables accessed only from inline
- * assembler without the compiler being aware.
- */
-#ifndef av_used
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_used __attribute__((used))
-#else
-#    define av_used
-#endif
-#endif
-
-#ifndef av_alias
-#if AV_GCC_VERSION_AT_LEAST(3,3)
-#   define av_alias __attribute__((may_alias))
-#else
-#   define av_alias
-#endif
-#endif
-
-#ifndef av_uninit
-#if defined(__GNUC__) && !defined(__ICC)
-#    define av_uninit(x) x=x
-#else
-#    define av_uninit(x) x
-#endif
-#endif
-
-#ifdef __GNUC__
-#    define av_builtin_constant_p __builtin_constant_p
-#    define av_printf_format(fmtpos, attrpos) __attribute__((__format__(__printf__, fmtpos, attrpos)))
-#else
-#    define av_builtin_constant_p(x) 0
-#    define av_printf_format(fmtpos, attrpos)
-#endif
-
-#endif /* AVUTIL_ATTRIBUTES_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/audioconvert.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/audioconvert.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/audioconvert.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/audioconvert.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- * Copyright (c) 2008 Peter Ross
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_AUDIOCONVERT_H
-#define AVUTIL_AUDIOCONVERT_H
-
-#include <stdint.h>
-
-/**
- * @file
- * audio conversion routines
- */
-
-/**
- * @addtogroup lavu_audio
- * @{
- */
-
-/**
- * @defgroup channel_masks Audio channel masks
- * @{
- */
-#define AV_CH_FRONT_LEFT             0x00000001
-#define AV_CH_FRONT_RIGHT            0x00000002
-#define AV_CH_FRONT_CENTER           0x00000004
-#define AV_CH_LOW_FREQUENCY          0x00000008
-#define AV_CH_BACK_LEFT              0x00000010
-#define AV_CH_BACK_RIGHT             0x00000020
-#define AV_CH_FRONT_LEFT_OF_CENTER   0x00000040
-#define AV_CH_FRONT_RIGHT_OF_CENTER  0x00000080
-#define AV_CH_BACK_CENTER            0x00000100
-#define AV_CH_SIDE_LEFT              0x00000200
-#define AV_CH_SIDE_RIGHT             0x00000400
-#define AV_CH_TOP_CENTER             0x00000800
-#define AV_CH_TOP_FRONT_LEFT         0x00001000
-#define AV_CH_TOP_FRONT_CENTER       0x00002000
-#define AV_CH_TOP_FRONT_RIGHT        0x00004000
-#define AV_CH_TOP_BACK_LEFT          0x00008000
-#define AV_CH_TOP_BACK_CENTER        0x00010000
-#define AV_CH_TOP_BACK_RIGHT         0x00020000
-#define AV_CH_STEREO_LEFT            0x20000000  ///< Stereo downmix.
-#define AV_CH_STEREO_RIGHT           0x40000000  ///< See AV_CH_STEREO_LEFT.
-#define AV_CH_WIDE_LEFT              0x0000000080000000ULL
-#define AV_CH_WIDE_RIGHT             0x0000000100000000ULL
-#define AV_CH_SURROUND_DIRECT_LEFT   0x0000000200000000ULL
-#define AV_CH_SURROUND_DIRECT_RIGHT  0x0000000400000000ULL
-
-/** Channel mask value used for AVCodecContext.request_channel_layout
-    to indicate that the user requests the channel order of the decoder output
-    to be the native codec channel order. */
-#define AV_CH_LAYOUT_NATIVE          0x8000000000000000ULL
-
-/**
- * @}
- * @defgroup channel_mask_c Audio channel convenience macros
- * @{
- * */
-#define AV_CH_LAYOUT_MONO              (AV_CH_FRONT_CENTER)
-#define AV_CH_LAYOUT_STEREO            (AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT)
-#define AV_CH_LAYOUT_2POINT1           (AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_2_1               (AV_CH_LAYOUT_STEREO|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_SURROUND          (AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER)
-#define AV_CH_LAYOUT_3POINT1           (AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_4POINT0           (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_4POINT1           (AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_2_2               (AV_CH_LAYOUT_STEREO|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
-#define AV_CH_LAYOUT_QUAD              (AV_CH_LAYOUT_STEREO|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_5POINT0           (AV_CH_LAYOUT_SURROUND|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
-#define AV_CH_LAYOUT_5POINT1           (AV_CH_LAYOUT_5POINT0|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_5POINT0_BACK      (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_5POINT1_BACK      (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_6POINT0           (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_6POINT0_FRONT     (AV_CH_LAYOUT_2_2|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
-#define AV_CH_LAYOUT_HEXAGONAL         (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_6POINT1           (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_6POINT1_BACK      (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_6POINT1_FRONT     (AV_CH_LAYOUT_6POINT0_FRONT|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_7POINT0           (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_7POINT0_FRONT     (AV_CH_LAYOUT_5POINT0|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
-#define AV_CH_LAYOUT_7POINT1           (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_7POINT1_WIDE      (AV_CH_LAYOUT_5POINT1|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
-#define AV_CH_LAYOUT_OCTAGONAL         (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_STEREO_DOWNMIX    (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT)
-
-/**
- * @}
- */
-
-/**
- * Return a channel layout id that matches name, 0 if no match.
- */
-uint64_t av_get_channel_layout(const char *name);
-
-/**
- * Return a description of a channel layout.
- * If nb_channels is <= 0, it is guessed from the channel_layout.
- *
- * @param buf put here the string containing the channel layout
- * @param buf_size size in bytes of the buffer
- */
-void av_get_channel_layout_string(char *buf, int buf_size, int nb_channels, uint64_t channel_layout);
-
-/**
- * Return the number of channels in the channel layout.
- */
-int av_get_channel_layout_nb_channels(uint64_t channel_layout);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_AUDIOCONVERT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/audio_fifo.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/audio_fifo.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/audio_fifo.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/audio_fifo.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,146 +0,0 @@
-/*
- * Audio FIFO
- * Copyright (c) 2012 Justin Ruggles <justin.ruggles@gmail.com>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Audio FIFO Buffer
- */
-
-#ifndef AVUTIL_AUDIO_FIFO_H
-#define AVUTIL_AUDIO_FIFO_H
-
-#include "avutil.h"
-#include "fifo.h"
-#include "samplefmt.h"
-
-/**
- * @addtogroup lavu_audio
- * @{
- */
-
-/**
- * Context for an Audio FIFO Buffer.
- *
- * - Operates at the sample level rather than the byte level.
- * - Supports multiple channels with either planar or packed sample format.
- * - Automatic reallocation when writing to a full buffer.
- */
-typedef struct AVAudioFifo AVAudioFifo;
-
-/**
- * Free an AVAudioFifo.
- *
- * @param af  AVAudioFifo to free
- */
-void av_audio_fifo_free(AVAudioFifo *af);
-
-/**
- * Allocate an AVAudioFifo.
- *
- * @param sample_fmt  sample format
- * @param channels    number of channels
- * @param nb_samples  initial allocation size, in samples
- * @return            newly allocated AVAudioFifo, or NULL on error
- */
-AVAudioFifo *av_audio_fifo_alloc(enum AVSampleFormat sample_fmt, int channels,
-                                 int nb_samples);
-
-/**
- * Reallocate an AVAudioFifo.
- *
- * @param af          AVAudioFifo to reallocate
- * @param nb_samples  new allocation size, in samples
- * @return            0 if OK, or negative AVERROR code on failure
- */
-int av_audio_fifo_realloc(AVAudioFifo *af, int nb_samples);
-
-/**
- * Write data to an AVAudioFifo.
- *
- * The AVAudioFifo will be reallocated automatically if the available space
- * is less than nb_samples.
- *
- * @see enum AVSampleFormat
- * The documentation for AVSampleFormat describes the data layout.
- *
- * @param af          AVAudioFifo to write to
- * @param data        audio data plane pointers
- * @param nb_samples  number of samples to write
- * @return            number of samples actually written, or negative AVERROR
- *                    code on failure.
- */
-int av_audio_fifo_write(AVAudioFifo *af, void **data, int nb_samples);
-
-/**
- * Read data from an AVAudioFifo.
- *
- * @see enum AVSampleFormat
- * The documentation for AVSampleFormat describes the data layout.
- *
- * @param af          AVAudioFifo to read from
- * @param data        audio data plane pointers
- * @param nb_samples  number of samples to read
- * @return            number of samples actually read, or negative AVERROR code
- *                    on failure.
- */
-int av_audio_fifo_read(AVAudioFifo *af, void **data, int nb_samples);
-
-/**
- * Drain data from an AVAudioFifo.
- *
- * Removes the data without reading it.
- *
- * @param af          AVAudioFifo to drain
- * @param nb_samples  number of samples to drain
- * @return            0 if OK, or negative AVERROR code on failure
- */
-int av_audio_fifo_drain(AVAudioFifo *af, int nb_samples);
-
-/**
- * Reset the AVAudioFifo buffer.
- *
- * This empties all data in the buffer.
- *
- * @param af  AVAudioFifo to reset
- */
-void av_audio_fifo_reset(AVAudioFifo *af);
-
-/**
- * Get the current number of samples in the AVAudioFifo available for reading.
- *
- * @param af  the AVAudioFifo to query
- * @return    number of samples available for reading
- */
-int av_audio_fifo_size(AVAudioFifo *af);
-
-/**
- * Get the current number of samples in the AVAudioFifo available for writing.
- *
- * @param af  the AVAudioFifo to query
- * @return    number of samples available for writing
- */
-int av_audio_fifo_space(AVAudioFifo *af);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_AUDIO_FIFO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/avassert.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/avassert.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/avassert.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/avassert.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-/*
- * copyright (c) 2010 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * simple assert() macros that are a bit more flexible than ISO C assert().
- * @author Michael Niedermayer <michaelni@gmx.at>
- */
-
-#ifndef AVUTIL_AVASSERT_H
-#define AVUTIL_AVASSERT_H
-
-#include <stdlib.h>
-#include "avutil.h"
-#include "log.h"
-
-/**
- * assert() equivalent, that is always enabled.
- */
-#define av_assert0(cond) do {                                           \
-    if (!(cond)) {                                                      \
-        av_log(NULL, AV_LOG_FATAL, "Assertion %s failed at %s:%d\n",    \
-               AV_STRINGIFY(cond), __FILE__, __LINE__);                 \
-        abort();                                                        \
-    }                                                                   \
-} while (0)
-
-
-/**
- * assert() equivalent, that does not lie in speed critical code.
- * These asserts() thus can be enabled without fearing speedloss.
- */
-#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 0
-#define av_assert1(cond) av_assert0(cond)
-#else
-#define av_assert1(cond) ((void)0)
-#endif
-
-
-/**
- * assert() equivalent, that does lie in speed critical code.
- */
-#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 1
-#define av_assert2(cond) av_assert0(cond)
-#else
-#define av_assert2(cond) ((void)0)
-#endif
-
-#endif /* AVUTIL_AVASSERT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/avconfig.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/avconfig.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/avconfig.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/avconfig.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-/* Generated by ffconf */
-#ifndef AVUTIL_AVCONFIG_H
-#define AVUTIL_AVCONFIG_H
-#define AV_HAVE_BIGENDIAN 0
-#define AV_HAVE_FAST_UNALIGNED 1
-#endif /* AVUTIL_AVCONFIG_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/avstring.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/avstring.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/avstring.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/avstring.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 2007 Mans Rullgard
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_AVSTRING_H
-#define AVUTIL_AVSTRING_H
-
-#include <stddef.h>
-#include "attributes.h"
-
-/**
- * @addtogroup lavu_string
- * @{
- */
-
-/**
- * Return non-zero if pfx is a prefix of str. If it is, *ptr is set to
- * the address of the first character in str after the prefix.
- *
- * @param str input string
- * @param pfx prefix to test
- * @param ptr updated if the prefix is matched inside str
- * @return non-zero if the prefix matches, zero otherwise
- */
-int av_strstart(const char *str, const char *pfx, const char **ptr);
-
-/**
- * Return non-zero if pfx is a prefix of str independent of case. If
- * it is, *ptr is set to the address of the first character in str
- * after the prefix.
- *
- * @param str input string
- * @param pfx prefix to test
- * @param ptr updated if the prefix is matched inside str
- * @return non-zero if the prefix matches, zero otherwise
- */
-int av_stristart(const char *str, const char *pfx, const char **ptr);
-
-/**
- * Locate the first case-independent occurrence in the string haystack
- * of the string needle.  A zero-length string needle is considered to
- * match at the start of haystack.
- *
- * This function is a case-insensitive version of the standard strstr().
- *
- * @param haystack string to search in
- * @param needle   string to search for
- * @return         pointer to the located match within haystack
- *                 or a null pointer if no match
- */
-char *av_stristr(const char *haystack, const char *needle);
-
-/**
- * Copy the string src to dst, but no more than size - 1 bytes, and
- * null-terminate dst.
- *
- * This function is the same as BSD strlcpy().
- *
- * @param dst destination buffer
- * @param src source string
- * @param size size of destination buffer
- * @return the length of src
- *
- * @warning since the return value is the length of src, src absolutely
- * _must_ be a properly 0-terminated string, otherwise this will read beyond
- * the end of the buffer and possibly crash.
- */
-size_t av_strlcpy(char *dst, const char *src, size_t size);
-
-/**
- * Append the string src to the string dst, but to a total length of
- * no more than size - 1 bytes, and null-terminate dst.
- *
- * This function is similar to BSD strlcat(), but differs when
- * size <= strlen(dst).
- *
- * @param dst destination buffer
- * @param src source string
- * @param size size of destination buffer
- * @return the total length of src and dst
- *
- * @warning since the return value use the length of src and dst, these
- * absolutely _must_ be a properly 0-terminated strings, otherwise this
- * will read beyond the end of the buffer and possibly crash.
- */
-size_t av_strlcat(char *dst, const char *src, size_t size);
-
-/**
- * Append output to a string, according to a format. Never write out of
- * the destination buffer, and always put a terminating 0 within
- * the buffer.
- * @param dst destination buffer (string to which the output is
- *  appended)
- * @param size total size of the destination buffer
- * @param fmt printf-compatible format string, specifying how the
- *  following parameters are used
- * @return the length of the string that would have been generated
- *  if enough space had been available
- */
-size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...) av_printf_format(3, 4);
-
-/**
- * Convert a number to a av_malloced string.
- */
-char *av_d2str(double d);
-
-/**
- * Unescape the given string until a non escaped terminating char,
- * and return the token corresponding to the unescaped string.
- *
- * The normal \ and ' escaping is supported. Leading and trailing
- * whitespaces are removed, unless they are escaped with '\' or are
- * enclosed between ''.
- *
- * @param buf the buffer to parse, buf will be updated to point to the
- * terminating char
- * @param term a 0-terminated list of terminating chars
- * @return the malloced unescaped string, which must be av_freed by
- * the user, NULL in case of allocation failure
- */
-char *av_get_token(const char **buf, const char *term);
-
-/**
- * Locale-independent conversion of ASCII characters to uppercase.
- */
-static inline int av_toupper(int c)
-{
-    if (c >= 'a' && c <= 'z')
-        c ^= 0x20;
-    return c;
-}
-
-/**
- * Locale-independent conversion of ASCII characters to lowercase.
- */
-static inline int av_tolower(int c)
-{
-    if (c >= 'A' && c <= 'Z')
-        c ^= 0x20;
-    return c;
-}
-
-/*
- * Locale-independent case-insensitive compare.
- * @note This means only ASCII-range characters are case-insensitive
- */
-int av_strcasecmp(const char *a, const char *b);
-
-/**
- * Locale-independent case-insensitive compare.
- * @note This means only ASCII-range characters are case-insensitive
- */
-int av_strncasecmp(const char *a, const char *b, size_t n);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_AVSTRING_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/avutil.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/avutil.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/avutil.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/avutil.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,326 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_AVUTIL_H
-#define AVUTIL_AVUTIL_H
-
-/**
- * @file
- * external API header
- */
-
-/**
- * @mainpage
- *
- * @section libav_intro Introduction
- *
- * This document describe the usage of the different libraries
- * provided by Libav.
- *
- * @li @ref libavc "libavcodec" encoding/decoding library
- * @li @subpage libavfilter graph based frame editing library
- * @li @ref libavf "libavformat" I/O and muxing/demuxing library
- * @li @ref lavd "libavdevice" special devices muxing/demuxing library
- * @li @ref lavu "libavutil" common utility library
- * @li @subpage libpostproc post processing library
- * @li @subpage libswscale  color conversion and scaling library
- *
- */
-
-/**
- * @defgroup lavu Common utility functions
- *
- * @brief
- * libavutil contains the code shared across all the other Libav
- * libraries
- *
- * @note In order to use the functions provided by avutil you must include
- * the specific header.
- *
- * @{
- *
- * @defgroup lavu_crypto Crypto and Hashing
- *
- * @{
- * @}
- *
- * @defgroup lavu_math Maths
- * @{
- *
- * @}
- *
- * @defgroup lavu_string String Manipulation
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_mem Memory Management
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_data Data Structures
- * @{
- *
- * @}
- *
- * @defgroup lavu_audio Audio related
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_error Error Codes
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_misc Other
- *
- * @{
- *
- * @defgroup lavu_internal Internal
- *
- * Not exported functions, for internal usage only
- *
- * @{
- *
- * @}
- */
-
-
-/**
- * @defgroup preproc_misc Preprocessor String Macros
- *
- * String manipulation macros
- *
- * @{
- */
-
-#define AV_STRINGIFY(s)         AV_TOSTRING(s)
-#define AV_TOSTRING(s) #s
-
-#define AV_GLUE(a, b) a ## b
-#define AV_JOIN(a, b) AV_GLUE(a, b)
-
-#define AV_PRAGMA(s) _Pragma(#s)
-
-/**
- * @}
- */
-
-/**
- * @defgroup version_utils Library Version Macros
- *
- * Useful to check and match library version in order to maintain
- * backward compatibility.
- *
- * @{
- */
-
-#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
-#define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c
-#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
-
-/**
- * @}
- *
- * @defgroup lavu_ver Version and Build diagnostics
- *
- * Macros and function useful to check at compiletime and at runtime
- * which version of libavutil is in use.
- *
- * @{
- */
-
-#define LIBAVUTIL_VERSION_MAJOR 51
-#define LIBAVUTIL_VERSION_MINOR 22
-#define LIBAVUTIL_VERSION_MICRO  1
-
-#define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
-                                               LIBAVUTIL_VERSION_MINOR, \
-                                               LIBAVUTIL_VERSION_MICRO)
-#define LIBAVUTIL_VERSION       AV_VERSION(LIBAVUTIL_VERSION_MAJOR,     \
-                                           LIBAVUTIL_VERSION_MINOR,     \
-                                           LIBAVUTIL_VERSION_MICRO)
-#define LIBAVUTIL_BUILD         LIBAVUTIL_VERSION_INT
-
-#define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
-
-/**
- * @}
- *
- * @defgroup depr_guards Deprecation guards
- * Those FF_API_* defines are not part of public API.
- * They may change, break or disappear at any time.
- *
- * They are used mostly internally to mark code that will be removed
- * on the next major version.
- *
- * @{
- */
-#ifndef FF_API_GET_BITS_PER_SAMPLE_FMT
-#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 52)
-#endif
-#ifndef FF_API_FIND_OPT
-#define FF_API_FIND_OPT                 (LIBAVUTIL_VERSION_MAJOR < 52)
-#endif
-#ifndef FF_API_AV_FIFO_PEEK
-#define FF_API_AV_FIFO_PEEK             (LIBAVUTIL_VERSION_MAJOR < 52)
-#endif
-#ifndef FF_API_OLD_AVOPTIONS
-#define FF_API_OLD_AVOPTIONS            (LIBAVUTIL_VERSION_MAJOR < 52)
-#endif
-
-/**
- * @}
- */
-
-/**
- * @addtogroup lavu_ver
- * @{
- */
-
-/**
- * Return the LIBAVUTIL_VERSION_INT constant.
- */
-unsigned avutil_version(void);
-
-/**
- * Return the libavutil build-time configuration.
- */
-const char *avutil_configuration(void);
-
-/**
- * Return the libavutil license.
- */
-const char *avutil_license(void);
-
-/**
- * @}
- */
-
-/**
- * @addtogroup lavu_media Media Type
- * @brief Media Type
- */
-
-enum AVMediaType {
-    AVMEDIA_TYPE_UNKNOWN = -1,  ///< Usually treated as AVMEDIA_TYPE_DATA
-    AVMEDIA_TYPE_VIDEO,
-    AVMEDIA_TYPE_AUDIO,
-    AVMEDIA_TYPE_DATA,          ///< Opaque data information usually continuous
-    AVMEDIA_TYPE_SUBTITLE,
-    AVMEDIA_TYPE_ATTACHMENT,    ///< Opaque data information usually sparse
-    AVMEDIA_TYPE_NB
-};
-
-/**
- * @defgroup lavu_const Constants
- * @{
- *
- * @defgroup lavu_enc Encoding specific
- *
- * @note those definition should move to avcodec
- * @{
- */
-
-#define FF_LAMBDA_SHIFT 7
-#define FF_LAMBDA_SCALE (1<<FF_LAMBDA_SHIFT)
-#define FF_QP2LAMBDA 118 ///< factor to convert from H.263 QP to lambda
-#define FF_LAMBDA_MAX (256*128-1)
-
-#define FF_QUALITY_SCALE FF_LAMBDA_SCALE //FIXME maybe remove
-
-/**
- * @}
- * @defgroup lavu_time Timestamp specific
- *
- * Libav internal timebase and timestamp definitions
- *
- * @{
- */
-
-/**
- * @brief Undefined timestamp value
- *
- * Usually reported by demuxer that work on containers that do not provide
- * either pts or dts.
- */
-
-#define AV_NOPTS_VALUE          INT64_C(0x8000000000000000)
-
-/**
- * Internal time base represented as integer
- */
-
-#define AV_TIME_BASE            1000000
-
-/**
- * Internal time base represented as fractional value
- */
-
-#define AV_TIME_BASE_Q          (AVRational){1, AV_TIME_BASE}
-
-/**
- * @}
- * @}
- * @defgroup lavu_picture Image related
- *
- * AVPicture types, pixel formats and basic image planes manipulation.
- *
- * @{
- */
-
-enum AVPictureType {
-    AV_PICTURE_TYPE_I = 1, ///< Intra
-    AV_PICTURE_TYPE_P,     ///< Predicted
-    AV_PICTURE_TYPE_B,     ///< Bi-dir predicted
-    AV_PICTURE_TYPE_S,     ///< S(GMC)-VOP MPEG4
-    AV_PICTURE_TYPE_SI,    ///< Switching Intra
-    AV_PICTURE_TYPE_SP,    ///< Switching Predicted
-    AV_PICTURE_TYPE_BI,    ///< BI type
-};
-
-/**
- * Return a single letter to describe the given picture type
- * pict_type.
- *
- * @param[in] pict_type the picture type @return a single character
- * representing the picture type, '?' if pict_type is unknown
- */
-char av_get_picture_type_char(enum AVPictureType pict_type);
-
-/**
- * @}
- */
-
-#include "common.h"
-#include "error.h"
-
-/**
- * @}
- * @}
- */
-
-#endif /* AVUTIL_AVUTIL_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/base64.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/base64.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/base64.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/base64.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2006 Ryan Martell. (rdm4@martellventures.com)
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_BASE64_H
-#define AVUTIL_BASE64_H
-
-#include <stdint.h>
-
-/**
- * @defgroup lavu_base64 Base64
- * @ingroup lavu_crypto
- * @{
- */
-
-
-/**
- * Decode a base64-encoded string.
- *
- * @param out      buffer for decoded data
- * @param in       null-terminated input string
- * @param out_size size in bytes of the out buffer, must be at
- *                 least 3/4 of the length of in
- * @return         number of bytes written, or a negative value in case of
- *                 invalid input
- */
-int av_base64_decode(uint8_t *out, const char *in, int out_size);
-
-/**
- * Encode data to base64 and null-terminate.
- *
- * @param out      buffer for encoded data
- * @param out_size size in bytes of the output buffer, must be at
- *                 least AV_BASE64_SIZE(in_size)
- * @param in_size  size in bytes of the 'in' buffer
- * @return         'out' or NULL in case of error
- */
-char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size);
-
-/**
- * Calculate the output size needed to base64-encode x bytes.
- */
-#define AV_BASE64_SIZE(x)  (((x)+2) / 3 * 4 + 1)
-
- /**
-  * @}
-  */
-
-#endif /* AVUTIL_BASE64_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/blowfish.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/blowfish.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/blowfish.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/blowfish.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-/*
- * Blowfish algorithm
- * Copyright (c) 2012 Samuel Pitoiset
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_BLOWFISH_H
-#define AVUTIL_BLOWFISH_H
-
-#include <stdint.h>
-
-/**
- * @defgroup lavu_blowfish Blowfish
- * @ingroup lavu_crypto
- * @{
- */
-
-#define AV_BF_ROUNDS 16
-
-typedef struct AVBlowfish {
-    uint32_t p[AV_BF_ROUNDS + 2];
-    uint32_t s[4][256];
-} AVBlowfish;
-
-/**
- * Initialize an AVBlowfish context.
- *
- * @param ctx an AVBlowfish context
- * @param key a key
- * @param key_len length of the key
- */
-void av_blowfish_init(struct AVBlowfish *ctx, const uint8_t *key, int key_len);
-
-/**
- * Encrypt or decrypt a buffer using a previously initialized context.
- *
- * @param ctx an AVBlowfish context
- * @param xl left four bytes halves of input to be encrypted
- * @param xr right four bytes halves of input to be encrypted
- * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_blowfish_crypt_ecb(struct AVBlowfish *ctx, uint32_t *xl, uint32_t *xr,
-                           int decrypt);
-
-/**
- * Encrypt or decrypt a buffer using a previously initialized context.
- *
- * @param ctx an AVBlowfish context
- * @param dst destination array, can be equal to src
- * @param src source array, can be equal to dst
- * @param count number of 8 byte blocks
- * @param iv initialization vector for CBC mode, if NULL ECB will be used
- * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_blowfish_crypt(struct AVBlowfish *ctx, uint8_t *dst, const uint8_t *src,
-                       int count, uint8_t *iv, int decrypt);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_BLOWFISH_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/bprint.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/bprint.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/bprint.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/bprint.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2012 Nicolas George
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_BPRINT_H
-#define AVUTIL_BPRINT_H
-
-#include "attributes.h"
-
-/**
- * Define a structure with extra padding to a fixed size
- * This helps ensuring binary compatibility with future versions.
- */
-#define FF_PAD_STRUCTURE(size, ...) \
-    __VA_ARGS__ \
-    char reserved_padding[size - sizeof(struct { __VA_ARGS__ })];
-
-/**
- * Buffer to print data progressively
- *
- * The string buffer grows as necessary and is always 0-terminated.
- * The content of the string is never accessed, and thus is
- * encoding-agnostic and can even hold binary data.
- *
- * Small buffers are kept in the structure itself, and thus require no
- * memory allocation at all (unless the contents of the buffer is needed
- * after the structure goes out of scope). This is almost as lightweight as
- * declaring a local "char buf[512]".
- *
- * The length of the string can go beyond the allocated size: the buffer is
- * then truncated, but the functions still keep account of the actual total
- * length.
- *
- * In other words, buf->len can be greater than buf->size and records the
- * total length of what would have been to the buffer if there had been
- * enough memory.
- *
- * Append operations do not need to be tested for failure: if a memory
- * allocation fails, data stop being appended to the buffer, but the length
- * is still updated. This situation can be tested with
- * av_bprint_is_complete().
- *
- * The size_max field determines several possible behaviours:
- *
- * size_max = -1 (= UINT_MAX) or any large value will let the buffer be
- * reallocated as necessary, with an amortized linear cost.
- *
- * size_max = 0 prevents writing anything to the buffer: only the total
- * length is computed. The write operations can then possibly be repeated in
- * a buffer with exactly the necessary size
- * (using size_init = size_max = len + 1).
- *
- * size_max = 1 is automatically replaced by the exact size available in the
- * structure itself, thus ensuring no dynamic memory allocation. The
- * internal buffer is large enough to hold a reasonable paragraph of text,
- * such as the current paragraph.
- */
-typedef struct AVBPrint {
-    FF_PAD_STRUCTURE(1024,
-    char *str;         /** string so far */
-    unsigned len;      /** length so far */
-    unsigned size;     /** allocated memory */
-    unsigned size_max; /** maximum allocated memory */
-    char reserved_internal_buffer[1];
-    )
-} AVBPrint;
-
-/**
- * Convenience macros for special values for av_bprint_init() size_max
- * parameter.
- */
-#define AV_BPRINT_SIZE_UNLIMITED  ((unsigned)-1)
-#define AV_BPRINT_SIZE_AUTOMATIC  1
-#define AV_BPRINT_SIZE_COUNT_ONLY 0
-
-/**
- * Init a print buffer.
- *
- * @param buf        buffer to init
- * @param size_init  initial size (including the final 0)
- * @param size_max   maximum size;
- *                   0 means do not write anything, just count the length;
- *                   1 is replaced by the maximum value for automatic storage;
- *                   any large value means that the internal buffer will be
- *                   reallocated as needed up to that limit; -1 is converted to
- *                   UINT_MAX, the largest limit possible.
- *                   Check also AV_BPRINT_SIZE_* macros.
- */
-void av_bprint_init(AVBPrint *buf, unsigned size_init, unsigned size_max);
-
-/**
- * Init a print buffer using a pre-existing buffer.
- *
- * The buffer will not be reallocated.
- *
- * @param buf     buffer structure to init
- * @param buffer  byte buffer to use for the string data
- * @param size    size of buffer
- */
-void av_bprint_init_for_buffer(AVBPrint *buf, char *buffer, unsigned size);
-
-/**
- * Append a formated string to a print buffer.
- */
-void av_bprintf(AVBPrint *buf, const char *fmt, ...) av_printf_format(2, 3);
-
-/**
- * Append char c n times to a print buffer.
- */
-void av_bprint_chars(AVBPrint *buf, char c, unsigned n);
-
-/**
- * Allocate bytes in the buffer for external use.
- *
- * @param[in]  buf          buffer structure
- * @param[in]  size         required size
- * @param[out] mem          pointer to the memory area
- * @param[out] actual_size  size of the memory area after allocation;
- *                          can be larger or smaller than size
- */
-void av_bprint_get_buffer(AVBPrint *buf, unsigned size,
-                          unsigned char **mem, unsigned *actual_size);
-
-/**
- * Reset the string to "" but keep internal allocated data.
- */
-void av_bprint_clear(AVBPrint *buf);
-
-/**
- * Test if the print buffer is complete (not truncated).
- *
- * It may have been truncated due to a memory allocation failure
- * or the size_max limit (compare size and size_max if necessary).
- */
-static inline int av_bprint_is_complete(AVBPrint *buf)
-{
-    return buf->len < buf->size;
-}
-
-/**
- * Finalize a print buffer.
- *
- * The print buffer can no longer be used afterwards,
- * but the len and size fields are still valid.
- *
- * @arg[out] ret_str  if not NULL, used to return a permanent copy of the
- *                    buffer contents, or NULL if memory allocation fails;
- *                    if NULL, the buffer is discarded and freed
- * @return  0 for success or error code (probably AVERROR(ENOMEM))
- */
-int av_bprint_finalize(AVBPrint *buf, char **ret_str);
-
-#endif /* AVUTIL_BPRINT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/bswap.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/bswap.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/bswap.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/bswap.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * byte swapping routines
- */
-
-#ifndef AVUTIL_BSWAP_H
-#define AVUTIL_BSWAP_H
-
-#include <stdint.h>
-#include "libavutil/avconfig.h"
-#include "attributes.h"
-
-#ifdef HAVE_AV_CONFIG_H
-
-#include "config.h"
-
-#if   ARCH_ARM
-#   include "arm/bswap.h"
-#elif ARCH_AVR32
-#   include "avr32/bswap.h"
-#elif ARCH_BFIN
-#   include "bfin/bswap.h"
-#elif ARCH_SH4
-#   include "sh4/bswap.h"
-#elif ARCH_X86
-#   include "x86/bswap.h"
-#endif
-
-#endif /* HAVE_AV_CONFIG_H */
-
-#define AV_BSWAP16C(x) (((x) << 8 & 0xff00)  | ((x) >> 8 & 0x00ff))
-#define AV_BSWAP32C(x) (AV_BSWAP16C(x) << 16 | AV_BSWAP16C((x) >> 16))
-#define AV_BSWAP64C(x) (AV_BSWAP32C(x) << 32 | AV_BSWAP32C((x) >> 32))
-
-#define AV_BSWAPC(s, x) AV_BSWAP##s##C(x)
-
-#ifndef av_bswap16
-static av_always_inline av_const uint16_t av_bswap16(uint16_t x)
-{
-    x= (x>>8) | (x<<8);
-    return x;
-}
-#endif
-
-#ifndef av_bswap32
-static av_always_inline av_const uint32_t av_bswap32(uint32_t x)
-{
-    return AV_BSWAP32C(x);
-}
-#endif
-
-#ifndef av_bswap64
-static inline uint64_t av_const av_bswap64(uint64_t x)
-{
-    return (uint64_t)av_bswap32(x) << 32 | av_bswap32(x >> 32);
-}
-#endif
-
-// be2ne ... big-endian to native-endian
-// le2ne ... little-endian to native-endian
-
-#if AV_HAVE_BIGENDIAN
-#define av_be2ne16(x) (x)
-#define av_be2ne32(x) (x)
-#define av_be2ne64(x) (x)
-#define av_le2ne16(x) av_bswap16(x)
-#define av_le2ne32(x) av_bswap32(x)
-#define av_le2ne64(x) av_bswap64(x)
-#define AV_BE2NEC(s, x) (x)
-#define AV_LE2NEC(s, x) AV_BSWAPC(s, x)
-#else
-#define av_be2ne16(x) av_bswap16(x)
-#define av_be2ne32(x) av_bswap32(x)
-#define av_be2ne64(x) av_bswap64(x)
-#define av_le2ne16(x) (x)
-#define av_le2ne32(x) (x)
-#define av_le2ne64(x) (x)
-#define AV_BE2NEC(s, x) AV_BSWAPC(s, x)
-#define AV_LE2NEC(s, x) (x)
-#endif
-
-#define AV_BE2NE16C(x) AV_BE2NEC(16, x)
-#define AV_BE2NE32C(x) AV_BE2NEC(32, x)
-#define AV_BE2NE64C(x) AV_BE2NEC(64, x)
-#define AV_LE2NE16C(x) AV_LE2NEC(16, x)
-#define AV_LE2NE32C(x) AV_LE2NEC(32, x)
-#define AV_LE2NE64C(x) AV_LE2NEC(64, x)
-
-#endif /* AVUTIL_BSWAP_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/common.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/common.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/common.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/common.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,398 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * common internal and external API header
- */
-
-#ifndef AVUTIL_COMMON_H
-#define AVUTIL_COMMON_H
-
-#include <ctype.h>
-#include <errno.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "attributes.h"
-#include "libavutil/avconfig.h"
-
-#if AV_HAVE_BIGENDIAN
-#   define AV_NE(be, le) (be)
-#else
-#   define AV_NE(be, le) (le)
-#endif
-
-//rounded division & shift
-#define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
-/* assume b>0 */
-#define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b))
-#define FFABS(a) ((a) >= 0 ? (a) : (-(a)))
-#define FFSIGN(a) ((a) > 0 ? 1 : -1)
-
-#define FFMAX(a,b) ((a) > (b) ? (a) : (b))
-#define FFMAX3(a,b,c) FFMAX(FFMAX(a,b),c)
-#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
-#define FFMIN3(a,b,c) FFMIN(FFMIN(a,b),c)
-
-#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
-#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
-#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))
-
-/* misc math functions */
-extern const uint8_t ff_log2_tab[256];
-
-extern const uint8_t av_reverse[256];
-
-static av_always_inline av_const int av_log2_c(unsigned int v)
-{
-    int n = 0;
-    if (v & 0xffff0000) {
-        v >>= 16;
-        n += 16;
-    }
-    if (v & 0xff00) {
-        v >>= 8;
-        n += 8;
-    }
-    n += ff_log2_tab[v];
-
-    return n;
-}
-
-static av_always_inline av_const int av_log2_16bit_c(unsigned int v)
-{
-    int n = 0;
-    if (v & 0xff00) {
-        v >>= 8;
-        n += 8;
-    }
-    n += ff_log2_tab[v];
-
-    return n;
-}
-
-#ifdef HAVE_AV_CONFIG_H
-#   include "config.h"
-#   include "intmath.h"
-#endif
-
-/* Pull in unguarded fallback defines at the end of this file. */
-#include "common.h"
-
-/**
- * Clip a signed integer value into the amin-amax range.
- * @param a value to clip
- * @param amin minimum value of the clip range
- * @param amax maximum value of the clip range
- * @return clipped value
- */
-static av_always_inline av_const int av_clip_c(int a, int amin, int amax)
-{
-    if      (a < amin) return amin;
-    else if (a > amax) return amax;
-    else               return a;
-}
-
-/**
- * Clip a signed integer value into the 0-255 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const uint8_t av_clip_uint8_c(int a)
-{
-    if (a&(~0xFF)) return (-a)>>31;
-    else           return a;
-}
-
-/**
- * Clip a signed integer value into the -128,127 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const int8_t av_clip_int8_c(int a)
-{
-    if ((a+0x80) & ~0xFF) return (a>>31) ^ 0x7F;
-    else                  return a;
-}
-
-/**
- * Clip a signed integer value into the 0-65535 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const uint16_t av_clip_uint16_c(int a)
-{
-    if (a&(~0xFFFF)) return (-a)>>31;
-    else             return a;
-}
-
-/**
- * Clip a signed integer value into the -32768,32767 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const int16_t av_clip_int16_c(int a)
-{
-    if ((a+0x8000) & ~0xFFFF) return (a>>31) ^ 0x7FFF;
-    else                      return a;
-}
-
-/**
- * Clip a signed 64-bit integer value into the -2147483648,2147483647 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const int32_t av_clipl_int32_c(int64_t a)
-{
-    if ((a+0x80000000u) & ~UINT64_C(0xFFFFFFFF)) return (a>>63) ^ 0x7FFFFFFF;
-    else                                         return a;
-}
-
-/**
- * Clip a signed integer to an unsigned power of two range.
- * @param  a value to clip
- * @param  p bit position to clip at
- * @return clipped value
- */
-static av_always_inline av_const unsigned av_clip_uintp2_c(int a, int p)
-{
-    if (a & ~((1<<p) - 1)) return -a >> 31 & ((1<<p) - 1);
-    else                   return  a;
-}
-
-/**
- * Clip a float value into the amin-amax range.
- * @param a value to clip
- * @param amin minimum value of the clip range
- * @param amax maximum value of the clip range
- * @return clipped value
- */
-static av_always_inline av_const float av_clipf_c(float a, float amin, float amax)
-{
-    if      (a < amin) return amin;
-    else if (a > amax) return amax;
-    else               return a;
-}
-
-/** Compute ceil(log2(x)).
- * @param x value used to compute ceil(log2(x))
- * @return computed ceiling of log2(x)
- */
-static av_always_inline av_const int av_ceil_log2_c(int x)
-{
-    return av_log2((x - 1) << 1);
-}
-
-/**
- * Count number of bits set to one in x
- * @param x value to count bits of
- * @return the number of bits set to one in x
- */
-static av_always_inline av_const int av_popcount_c(uint32_t x)
-{
-    x -= (x >> 1) & 0x55555555;
-    x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
-    x = (x + (x >> 4)) & 0x0F0F0F0F;
-    x += x >> 8;
-    return (x + (x >> 16)) & 0x3F;
-}
-
-/**
- * Count number of bits set to one in x
- * @param x value to count bits of
- * @return the number of bits set to one in x
- */
-static av_always_inline av_const int av_popcount64_c(uint64_t x)
-{
-    return av_popcount(x) + av_popcount(x >> 32);
-}
-
-#define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24))
-#define MKBETAG(a,b,c,d) ((d) | ((c) << 8) | ((b) << 16) | ((unsigned)(a) << 24))
-
-/**
- * Convert a UTF-8 character (up to 4 bytes) to its 32-bit UCS-4 encoded form.
- *
- * @param val      Output value, must be an lvalue of type uint32_t.
- * @param GET_BYTE Expression reading one byte from the input.
- *                 Evaluated up to 7 times (4 for the currently
- *                 assigned Unicode range).  With a memory buffer
- *                 input, this could be *ptr++.
- * @param ERROR    Expression to be evaluated on invalid input,
- *                 typically a goto statement.
- */
-#define GET_UTF8(val, GET_BYTE, ERROR)\
-    val= GET_BYTE;\
-    {\
-        int ones= 7 - av_log2(val ^ 255);\
-        if(ones==1)\
-            ERROR\
-        val&= 127>>ones;\
-        while(--ones > 0){\
-            int tmp= GET_BYTE - 128;\
-            if(tmp>>6)\
-                ERROR\
-            val= (val<<6) + tmp;\
-        }\
-    }
-
-/**
- * Convert a UTF-16 character (2 or 4 bytes) to its 32-bit UCS-4 encoded form.
- *
- * @param val       Output value, must be an lvalue of type uint32_t.
- * @param GET_16BIT Expression returning two bytes of UTF-16 data converted
- *                  to native byte order.  Evaluated one or two times.
- * @param ERROR     Expression to be evaluated on invalid input,
- *                  typically a goto statement.
- */
-#define GET_UTF16(val, GET_16BIT, ERROR)\
-    val = GET_16BIT;\
-    {\
-        unsigned int hi = val - 0xD800;\
-        if (hi < 0x800) {\
-            val = GET_16BIT - 0xDC00;\
-            if (val > 0x3FFU || hi > 0x3FFU)\
-                ERROR\
-            val += (hi<<10) + 0x10000;\
-        }\
-    }\
-
-/**
- * @def PUT_UTF8(val, tmp, PUT_BYTE)
- * Convert a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes long).
- * @param val is an input-only argument and should be of type uint32_t. It holds
- * a UCS-4 encoded Unicode character that is to be converted to UTF-8. If
- * val is given as a function it is executed only once.
- * @param tmp is a temporary variable and should be of type uint8_t. It
- * represents an intermediate value during conversion that is to be
- * output by PUT_BYTE.
- * @param PUT_BYTE writes the converted UTF-8 bytes to any proper destination.
- * It could be a function or a statement, and uses tmp as the input byte.
- * For example, PUT_BYTE could be "*output++ = tmp;" PUT_BYTE will be
- * executed up to 4 times for values in the valid UTF-8 range and up to
- * 7 times in the general case, depending on the length of the converted
- * Unicode character.
- */
-#define PUT_UTF8(val, tmp, PUT_BYTE)\
-    {\
-        int bytes, shift;\
-        uint32_t in = val;\
-        if (in < 0x80) {\
-            tmp = in;\
-            PUT_BYTE\
-        } else {\
-            bytes = (av_log2(in) + 4) / 5;\
-            shift = (bytes - 1) * 6;\
-            tmp = (256 - (256 >> bytes)) | (in >> shift);\
-            PUT_BYTE\
-            while (shift >= 6) {\
-                shift -= 6;\
-                tmp = 0x80 | ((in >> shift) & 0x3f);\
-                PUT_BYTE\
-            }\
-        }\
-    }
-
-/**
- * @def PUT_UTF16(val, tmp, PUT_16BIT)
- * Convert a 32-bit Unicode character to its UTF-16 encoded form (2 or 4 bytes).
- * @param val is an input-only argument and should be of type uint32_t. It holds
- * a UCS-4 encoded Unicode character that is to be converted to UTF-16. If
- * val is given as a function it is executed only once.
- * @param tmp is a temporary variable and should be of type uint16_t. It
- * represents an intermediate value during conversion that is to be
- * output by PUT_16BIT.
- * @param PUT_16BIT writes the converted UTF-16 data to any proper destination
- * in desired endianness. It could be a function or a statement, and uses tmp
- * as the input byte.  For example, PUT_BYTE could be "*output++ = tmp;"
- * PUT_BYTE will be executed 1 or 2 times depending on input character.
- */
-#define PUT_UTF16(val, tmp, PUT_16BIT)\
-    {\
-        uint32_t in = val;\
-        if (in < 0x10000) {\
-            tmp = in;\
-            PUT_16BIT\
-        } else {\
-            tmp = 0xD800 | ((in - 0x10000) >> 10);\
-            PUT_16BIT\
-            tmp = 0xDC00 | ((in - 0x10000) & 0x3FF);\
-            PUT_16BIT\
-        }\
-    }\
-
-
-
-#include "mem.h"
-
-#ifdef HAVE_AV_CONFIG_H
-#    include "internal.h"
-#endif /* HAVE_AV_CONFIG_H */
-
-#endif /* AVUTIL_COMMON_H */
-
-/*
- * The following definitions are outside the multiple inclusion guard
- * to ensure they are immediately available in intmath.h.
- */
-
-#ifndef av_log2
-#   define av_log2       av_log2_c
-#endif
-#ifndef av_log2_16bit
-#   define av_log2_16bit av_log2_16bit_c
-#endif
-#ifndef av_ceil_log2
-#   define av_ceil_log2     av_ceil_log2_c
-#endif
-#ifndef av_clip
-#   define av_clip          av_clip_c
-#endif
-#ifndef av_clip_uint8
-#   define av_clip_uint8    av_clip_uint8_c
-#endif
-#ifndef av_clip_int8
-#   define av_clip_int8     av_clip_int8_c
-#endif
-#ifndef av_clip_uint16
-#   define av_clip_uint16   av_clip_uint16_c
-#endif
-#ifndef av_clip_int16
-#   define av_clip_int16    av_clip_int16_c
-#endif
-#ifndef av_clipl_int32
-#   define av_clipl_int32   av_clipl_int32_c
-#endif
-#ifndef av_clip_uintp2
-#   define av_clip_uintp2   av_clip_uintp2_c
-#endif
-#ifndef av_clipf
-#   define av_clipf         av_clipf_c
-#endif
-#ifndef av_popcount
-#   define av_popcount      av_popcount_c
-#endif
-#ifndef av_popcount64
-#   define av_popcount64    av_popcount64_c
-#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/cpu.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/cpu.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/cpu.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/cpu.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_CPU_H
-#define AVUTIL_CPU_H
-
-#define AV_CPU_FLAG_FORCE    0x80000000 /* force usage of selected flags (OR) */
-
-    /* lower 16 bits - CPU features */
-#define AV_CPU_FLAG_MMX          0x0001 ///< standard MMX
-#define AV_CPU_FLAG_MMX2         0x0002 ///< SSE integer functions or AMD MMX ext
-#define AV_CPU_FLAG_3DNOW        0x0004 ///< AMD 3DNOW
-#define AV_CPU_FLAG_SSE          0x0008 ///< SSE functions
-#define AV_CPU_FLAG_SSE2         0x0010 ///< PIV SSE2 functions
-#define AV_CPU_FLAG_SSE2SLOW 0x40000000 ///< SSE2 supported, but usually not faster
-#define AV_CPU_FLAG_3DNOWEXT     0x0020 ///< AMD 3DNowExt
-#define AV_CPU_FLAG_SSE3         0x0040 ///< Prescott SSE3 functions
-#define AV_CPU_FLAG_SSE3SLOW 0x20000000 ///< SSE3 supported, but usually not faster
-#define AV_CPU_FLAG_SSSE3        0x0080 ///< Conroe SSSE3 functions
-#define AV_CPU_FLAG_ATOM     0x10000000 ///< Atom processor, some SSSE3 instructions are slower
-#define AV_CPU_FLAG_SSE4         0x0100 ///< Penryn SSE4.1 functions
-#define AV_CPU_FLAG_SSE42        0x0200 ///< Nehalem SSE4.2 functions
-#define AV_CPU_FLAG_AVX          0x4000 ///< AVX functions: requires OS support even if YMM registers aren't used
-#define AV_CPU_FLAG_XOP          0x0400 ///< Bulldozer XOP functions
-#define AV_CPU_FLAG_FMA4         0x0800 ///< Bulldozer FMA4 functions
-#define AV_CPU_FLAG_IWMMXT       0x0100 ///< XScale IWMMXT
-#define AV_CPU_FLAG_ALTIVEC      0x0001 ///< standard
-
-/**
- * Return the flags which specify extensions supported by the CPU.
- */
-int av_get_cpu_flags(void);
-
-/* The following CPU-specific functions shall not be called directly. */
-int ff_get_cpu_flags_arm(void);
-int ff_get_cpu_flags_ppc(void);
-int ff_get_cpu_flags_x86(void);
-
-#endif /* AVUTIL_CPU_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/crc.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/crc.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/crc.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/crc.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_CRC_H
-#define AVUTIL_CRC_H
-
-#include <stdint.h>
-#include <stddef.h>
-#include "attributes.h"
-
-typedef uint32_t AVCRC;
-
-typedef enum {
-    AV_CRC_8_ATM,
-    AV_CRC_16_ANSI,
-    AV_CRC_16_CCITT,
-    AV_CRC_32_IEEE,
-    AV_CRC_32_IEEE_LE,  /*< reversed bitorder version of AV_CRC_32_IEEE */
-    AV_CRC_MAX,         /*< Not part of public API! Do not use outside libavutil. */
-}AVCRCId;
-
-int av_crc_init(AVCRC *ctx, int le, int bits, uint32_t poly, int ctx_size);
-const AVCRC *av_crc_get_table(AVCRCId crc_id);
-uint32_t av_crc(const AVCRC *ctx, uint32_t start_crc, const uint8_t *buffer, size_t length) av_pure;
-
-#endif /* AVUTIL_CRC_H */
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/dict.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/dict.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/dict.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/dict.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,121 +0,0 @@
-/*
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Public dictionary API.
- */
-
-#ifndef AVUTIL_DICT_H
-#define AVUTIL_DICT_H
-
-/**
- * @addtogroup lavu_dict AVDictionary
- * @ingroup lavu_data
- *
- * @brief Simple key:value store
- *
- * @{
- * Dictionaries are used for storing key:value pairs. To create
- * an AVDictionary, simply pass an address of a NULL pointer to
- * av_dict_set(). NULL can be used as an empty dictionary wherever
- * a pointer to an AVDictionary is required.
- * Use av_dict_get() to retrieve an entry or iterate over all
- * entries and finally av_dict_free() to free the dictionary
- * and all its contents.
- *
- * @code
- * AVDictionary *d = NULL;                // "create" an empty dictionary
- * av_dict_set(&d, "foo", "bar", 0);      // add an entry
- *
- * char *k = av_strdup("key");            // if your strings are already allocated,
- * char *v = av_strdup("value");          // you can avoid copying them like this
- * av_dict_set(&d, k, v, AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
- *
- * AVDictionaryEntry *t = NULL;
- * while (t = av_dict_get(d, "", t, AV_DICT_IGNORE_SUFFIX)) {
- *     <....>                             // iterate over all entries in d
- * }
- *
- * av_dict_free(&d);
- * @endcode
- *
- */
-
-#define AV_DICT_MATCH_CASE      1
-#define AV_DICT_IGNORE_SUFFIX   2
-#define AV_DICT_DONT_STRDUP_KEY 4   /**< Take ownership of a key that's been
-                                         allocated with av_malloc() and children. */
-#define AV_DICT_DONT_STRDUP_VAL 8   /**< Take ownership of a value that's been
-                                         allocated with av_malloc() and chilren. */
-#define AV_DICT_DONT_OVERWRITE 16   ///< Don't overwrite existing entries.
-#define AV_DICT_APPEND         32   /**< If the entry already exists, append to it.  Note that no
-                                      delimiter is added, the strings are simply concatenated. */
-
-typedef struct {
-    char *key;
-    char *value;
-} AVDictionaryEntry;
-
-typedef struct AVDictionary AVDictionary;
-
-/**
- * Get a dictionary entry with matching key.
- *
- * @param prev Set to the previous matching element to find the next.
- *             If set to NULL the first matching element is returned.
- * @param flags Allows case as well as suffix-insensitive comparisons.
- * @return Found entry or NULL, changing key or value leads to undefined behavior.
- */
-AVDictionaryEntry *
-av_dict_get(AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags);
-
-/**
- * Set the given entry in *pm, overwriting an existing entry.
- *
- * @param pm pointer to a pointer to a dictionary struct. If *pm is NULL
- * a dictionary struct is allocated and put in *pm.
- * @param key entry key to add to *pm (will be av_strduped depending on flags)
- * @param value entry value to add to *pm (will be av_strduped depending on flags).
- *        Passing a NULL value will cause an existing tag to be deleted.
- * @return >= 0 on success otherwise an error code <0
- */
-int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags);
-
-/**
- * Copy entries from one AVDictionary struct into another.
- * @param dst pointer to a pointer to a AVDictionary struct. If *dst is NULL,
- *            this function will allocate a struct for you and put it in *dst
- * @param src pointer to source AVDictionary struct
- * @param flags flags to use when setting entries in *dst
- * @note metadata is read using the AV_DICT_IGNORE_SUFFIX flag
- */
-void av_dict_copy(AVDictionary **dst, AVDictionary *src, int flags);
-
-/**
- * Free all the memory allocated for an AVDictionary struct
- * and all keys and values.
- */
-void av_dict_free(AVDictionary **m);
-
-/**
- * @}
- */
-
-#endif // AVUTIL_DICT_H
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/error.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/error.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/error.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/error.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * error code definitions
- */
-
-#ifndef AVUTIL_ERROR_H
-#define AVUTIL_ERROR_H
-
-#include <errno.h>
-#include "avutil.h"
-
-/**
- * @addtogroup lavu_error
- *
- * @{
- */
-
-
-/* error handling */
-#if EDOM > 0
-#define AVERROR(e) (-(e))   ///< Returns a negative error code from a POSIX error code, to return from library functions.
-#define AVUNERROR(e) (-(e)) ///< Returns a POSIX error code from a library function error return value.
-#else
-/* Some platforms have E* and errno already negated. */
-#define AVERROR(e) (e)
-#define AVUNERROR(e) (e)
-#endif
-
-#define AVERROR_BSF_NOT_FOUND      (-MKTAG(0xF8,'B','S','F')) ///< Bitstream filter not found
-#define AVERROR_DECODER_NOT_FOUND  (-MKTAG(0xF8,'D','E','C')) ///< Decoder not found
-#define AVERROR_DEMUXER_NOT_FOUND  (-MKTAG(0xF8,'D','E','M')) ///< Demuxer not found
-#define AVERROR_ENCODER_NOT_FOUND  (-MKTAG(0xF8,'E','N','C')) ///< Encoder not found
-#define AVERROR_EOF                (-MKTAG( 'E','O','F',' ')) ///< End of file
-#define AVERROR_EXIT               (-MKTAG( 'E','X','I','T')) ///< Immediate exit was requested; the called function should not be restarted
-#define AVERROR_FILTER_NOT_FOUND   (-MKTAG(0xF8,'F','I','L')) ///< Filter not found
-#define AVERROR_INVALIDDATA        (-MKTAG( 'I','N','D','A')) ///< Invalid data found when processing input
-#define AVERROR_MUXER_NOT_FOUND    (-MKTAG(0xF8,'M','U','X')) ///< Muxer not found
-#define AVERROR_OPTION_NOT_FOUND   (-MKTAG(0xF8,'O','P','T')) ///< Option not found
-#define AVERROR_PATCHWELCOME       (-MKTAG( 'P','A','W','E')) ///< Not yet implemented in Libav, patches welcome
-#define AVERROR_PROTOCOL_NOT_FOUND (-MKTAG(0xF8,'P','R','O')) ///< Protocol not found
-#define AVERROR_STREAM_NOT_FOUND   (-MKTAG(0xF8,'S','T','R')) ///< Stream not found
-#define AVERROR_BUG                (-MKTAG( 'B','U','G',' ')) ///< Bug detected, please report the issue
-#define AVERROR_UNKNOWN            (-MKTAG( 'U','N','K','N')) ///< Unknown error, typically from an external library
-
-/**
- * Put a description of the AVERROR code errnum in errbuf.
- * In case of failure the global variable errno is set to indicate the
- * error. Even in case of failure av_strerror() will print a generic
- * error message indicating the errnum provided to errbuf.
- *
- * @param errnum      error code to describe
- * @param errbuf      buffer to which description is written
- * @param errbuf_size the size in bytes of errbuf
- * @return 0 on success, a negative value if a description for errnum
- * cannot be found
- */
-int av_strerror(int errnum, char *errbuf, size_t errbuf_size);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_ERROR_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/eval.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/eval.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/eval.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/eval.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2002 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * simple arithmetic expression evaluator
- */
-
-#ifndef AVUTIL_EVAL_H
-#define AVUTIL_EVAL_H
-
-#include "avutil.h"
-
-typedef struct AVExpr AVExpr;
-
-/**
- * Parse and evaluate an expression.
- * Note, this is significantly slower than av_expr_eval().
- *
- * @param res a pointer to a double where is put the result value of
- * the expression, or NAN in case of error
- * @param s expression as a zero terminated string, for example "1+2^3+5*5+sin(2/3)"
- * @param const_names NULL terminated array of zero terminated strings of constant identifiers, for example {"PI", "E", 0}
- * @param const_values a zero terminated array of values for the identifiers from const_names
- * @param func1_names NULL terminated array of zero terminated strings of funcs1 identifiers
- * @param funcs1 NULL terminated array of function pointers for functions which take 1 argument
- * @param func2_names NULL terminated array of zero terminated strings of funcs2 identifiers
- * @param funcs2 NULL terminated array of function pointers for functions which take 2 arguments
- * @param opaque a pointer which will be passed to all functions from funcs1 and funcs2
- * @param log_ctx parent logging context
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code otherwise
- */
-int av_expr_parse_and_eval(double *res, const char *s,
-                           const char * const *const_names, const double *const_values,
-                           const char * const *func1_names, double (* const *funcs1)(void *, double),
-                           const char * const *func2_names, double (* const *funcs2)(void *, double, double),
-                           void *opaque, int log_offset, void *log_ctx);
-
-/**
- * Parse an expression.
- *
- * @param expr a pointer where is put an AVExpr containing the parsed
- * value in case of successful parsing, or NULL otherwise.
- * The pointed to AVExpr must be freed with av_expr_free() by the user
- * when it is not needed anymore.
- * @param s expression as a zero terminated string, for example "1+2^3+5*5+sin(2/3)"
- * @param const_names NULL terminated array of zero terminated strings of constant identifiers, for example {"PI", "E", 0}
- * @param func1_names NULL terminated array of zero terminated strings of funcs1 identifiers
- * @param funcs1 NULL terminated array of function pointers for functions which take 1 argument
- * @param func2_names NULL terminated array of zero terminated strings of funcs2 identifiers
- * @param funcs2 NULL terminated array of function pointers for functions which take 2 arguments
- * @param log_ctx parent logging context
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code otherwise
- */
-int av_expr_parse(AVExpr **expr, const char *s,
-                  const char * const *const_names,
-                  const char * const *func1_names, double (* const *funcs1)(void *, double),
-                  const char * const *func2_names, double (* const *funcs2)(void *, double, double),
-                  int log_offset, void *log_ctx);
-
-/**
- * Evaluate a previously parsed expression.
- *
- * @param const_values a zero terminated array of values for the identifiers from av_expr_parse() const_names
- * @param opaque a pointer which will be passed to all functions from funcs1 and funcs2
- * @return the value of the expression
- */
-double av_expr_eval(AVExpr *e, const double *const_values, void *opaque);
-
-/**
- * Free a parsed expression previously created with av_expr_parse().
- */
-void av_expr_free(AVExpr *e);
-
-/**
- * Parse the string in numstr and return its value as a double. If
- * the string is empty, contains only whitespaces, or does not contain
- * an initial substring that has the expected syntax for a
- * floating-point number, no conversion is performed. In this case,
- * returns a value of zero and the value returned in tail is the value
- * of numstr.
- *
- * @param numstr a string representing a number, may contain one of
- * the International System number postfixes, for example 'K', 'M',
- * 'G'. If 'i' is appended after the postfix, powers of 2 are used
- * instead of powers of 10. The 'B' postfix multiplies the value for
- * 8, and can be appended after another postfix or used alone. This
- * allows using for example 'KB', 'MiB', 'G' and 'B' as postfix.
- * @param tail if non-NULL puts here the pointer to the char next
- * after the last parsed character
- */
-double av_strtod(const char *numstr, char **tail);
-
-#endif /* AVUTIL_EVAL_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/fifo.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/fifo.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/fifo.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/fifo.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,141 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * a very simple circular buffer FIFO implementation
- */
-
-#ifndef AVUTIL_FIFO_H
-#define AVUTIL_FIFO_H
-
-#include <stdint.h>
-#include "avutil.h"
-
-typedef struct AVFifoBuffer {
-    uint8_t *buffer;
-    uint8_t *rptr, *wptr, *end;
-    uint32_t rndx, wndx;
-} AVFifoBuffer;
-
-/**
- * Initialize an AVFifoBuffer.
- * @param size of FIFO
- * @return AVFifoBuffer or NULL in case of memory allocation failure
- */
-AVFifoBuffer *av_fifo_alloc(unsigned int size);
-
-/**
- * Free an AVFifoBuffer.
- * @param f AVFifoBuffer to free
- */
-void av_fifo_free(AVFifoBuffer *f);
-
-/**
- * Reset the AVFifoBuffer to the state right after av_fifo_alloc, in particular it is emptied.
- * @param f AVFifoBuffer to reset
- */
-void av_fifo_reset(AVFifoBuffer *f);
-
-/**
- * Return the amount of data in bytes in the AVFifoBuffer, that is the
- * amount of data you can read from it.
- * @param f AVFifoBuffer to read from
- * @return size
- */
-int av_fifo_size(AVFifoBuffer *f);
-
-/**
- * Return the amount of space in bytes in the AVFifoBuffer, that is the
- * amount of data you can write into it.
- * @param f AVFifoBuffer to write into
- * @return size
- */
-int av_fifo_space(AVFifoBuffer *f);
-
-/**
- * Feed data from an AVFifoBuffer to a user-supplied callback.
- * @param f AVFifoBuffer to read from
- * @param buf_size number of bytes to read
- * @param func generic read function
- * @param dest data destination
- */
-int av_fifo_generic_read(AVFifoBuffer *f, void *dest, int buf_size, void (*func)(void*, void*, int));
-
-/**
- * Feed data from a user-supplied callback to an AVFifoBuffer.
- * @param f AVFifoBuffer to write to
- * @param src data source; non-const since it may be used as a
- * modifiable context by the function defined in func
- * @param size number of bytes to write
- * @param func generic write function; the first parameter is src,
- * the second is dest_buf, the third is dest_buf_size.
- * func must return the number of bytes written to dest_buf, or <= 0 to
- * indicate no more data available to write.
- * If func is NULL, src is interpreted as a simple byte array for source data.
- * @return the number of bytes written to the FIFO
- */
-int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int));
-
-/**
- * Resize an AVFifoBuffer.
- * @param f AVFifoBuffer to resize
- * @param size new AVFifoBuffer size in bytes
- * @return <0 for failure, >=0 otherwise
- */
-int av_fifo_realloc2(AVFifoBuffer *f, unsigned int size);
-
-/**
- * Read and discard the specified amount of data from an AVFifoBuffer.
- * @param f AVFifoBuffer to read from
- * @param size amount of data to read in bytes
- */
-void av_fifo_drain(AVFifoBuffer *f, int size);
-
-/**
- * Return a pointer to the data stored in a FIFO buffer at a certain offset.
- * The FIFO buffer is not modified.
- *
- * @param f    AVFifoBuffer to peek at, f must be non-NULL
- * @param offs an offset in bytes, its absolute value must be less
- *             than the used buffer size or the returned pointer will
- *             point outside to the buffer data.
- *             The used buffer size can be checked with av_fifo_size().
- */
-static inline uint8_t *av_fifo_peek2(const AVFifoBuffer *f, int offs)
-{
-    uint8_t *ptr = f->rptr + offs;
-    if (ptr >= f->end)
-        ptr = f->buffer + (ptr - f->end);
-    else if (ptr < f->buffer)
-        ptr = f->end - (f->buffer - ptr);
-    return ptr;
-}
-
-#if FF_API_AV_FIFO_PEEK
-/**
- * @deprecated Use av_fifo_peek2() instead.
- */
-attribute_deprecated
-static inline uint8_t av_fifo_peek(AVFifoBuffer *f, int offs)
-{
-    return *av_fifo_peek2(f, offs);
-}
-#endif
-
-#endif /* AVUTIL_FIFO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/file.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/file.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/file.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/file.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_FILE_H
-#define AVUTIL_FILE_H
-
-#include "avutil.h"
-
-/**
- * @file
- * Misc file utilities.
- */
-
-/**
- * Read the file with name filename, and put its content in a newly
- * allocated buffer or map it with mmap() when available.
- * In case of success set *bufptr to the read or mmapped buffer, and
- * *size to the size in bytes of the buffer in *bufptr.
- * The returned buffer must be released with av_file_unmap().
- *
- * @param log_offset loglevel offset used for logging
- * @param log_ctx context used for logging
- * @return a non negative number in case of success, a negative value
- * corresponding to an AVERROR error code in case of failure
- */
-int av_file_map(const char *filename, uint8_t **bufptr, size_t *size,
-                int log_offset, void *log_ctx);
-
-/**
- * Unmap or free the buffer bufptr created by av_file_map().
- *
- * @param size size in bytes of bufptr, must be the same as returned
- * by av_file_map()
- */
-void av_file_unmap(uint8_t *bufptr, size_t size);
-
-#endif /* AVUTIL_FILE_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/imgutils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/imgutils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/imgutils.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/imgutils.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,138 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_IMGUTILS_H
-#define AVUTIL_IMGUTILS_H
-
-/**
- * @file
- * misc image utilities
- *
- * @addtogroup lavu_picture
- * @{
- */
-
-#include "avutil.h"
-#include "pixdesc.h"
-
-/**
- * Compute the max pixel step for each plane of an image with a
- * format described by pixdesc.
- *
- * The pixel step is the distance in bytes between the first byte of
- * the group of bytes which describe a pixel component and the first
- * byte of the successive group in the same plane for the same
- * component.
- *
- * @param max_pixsteps an array which is filled with the max pixel step
- * for each plane. Since a plane may contain different pixel
- * components, the computed max_pixsteps[plane] is relative to the
- * component in the plane with the max pixel step.
- * @param max_pixstep_comps an array which is filled with the component
- * for each plane which has the max pixel step. May be NULL.
- */
-void av_image_fill_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4],
-                                const AVPixFmtDescriptor *pixdesc);
-
-/**
- * Compute the size of an image line with format pix_fmt and width
- * width for the plane plane.
- *
- * @return the computed size in bytes
- */
-int av_image_get_linesize(enum PixelFormat pix_fmt, int width, int plane);
-
-/**
- * Fill plane linesizes for an image with pixel format pix_fmt and
- * width width.
- *
- * @param linesizes array to be filled with the linesize for each plane
- * @return >= 0 in case of success, a negative error code otherwise
- */
-int av_image_fill_linesizes(int linesizes[4], enum PixelFormat pix_fmt, int width);
-
-/**
- * Fill plane data pointers for an image with pixel format pix_fmt and
- * height height.
- *
- * @param data pointers array to be filled with the pointer for each image plane
- * @param ptr the pointer to a buffer which will contain the image
- * @param linesizes the array containing the linesize for each
- * plane, should be filled by av_image_fill_linesizes()
- * @return the size in bytes required for the image buffer, a negative
- * error code in case of failure
- */
-int av_image_fill_pointers(uint8_t *data[4], enum PixelFormat pix_fmt, int height,
-                           uint8_t *ptr, const int linesizes[4]);
-
-/**
- * Allocate an image with size w and h and pixel format pix_fmt, and
- * fill pointers and linesizes accordingly.
- * The allocated image buffer has to be freed by using
- * av_freep(&pointers[0]).
- *
- * @param align the value to use for buffer size alignment
- * @return the size in bytes required for the image buffer, a negative
- * error code in case of failure
- */
-int av_image_alloc(uint8_t *pointers[4], int linesizes[4],
-                   int w, int h, enum PixelFormat pix_fmt, int align);
-
-/**
- * Copy image plane from src to dst.
- * That is, copy "height" number of lines of "bytewidth" bytes each.
- * The first byte of each successive line is separated by *_linesize
- * bytes.
- *
- * @param dst_linesize linesize for the image plane in dst
- * @param src_linesize linesize for the image plane in src
- */
-void av_image_copy_plane(uint8_t       *dst, int dst_linesize,
-                         const uint8_t *src, int src_linesize,
-                         int bytewidth, int height);
-
-/**
- * Copy image in src_data to dst_data.
- *
- * @param dst_linesizes linesizes for the image in dst_data
- * @param src_linesizes linesizes for the image in src_data
- */
-void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4],
-                   const uint8_t *src_data[4], const int src_linesizes[4],
-                   enum PixelFormat pix_fmt, int width, int height);
-
-/**
- * Check if the given dimension of an image is valid, meaning that all
- * bytes of the image can be addressed with a signed int.
- *
- * @param w the width of the picture
- * @param h the height of the picture
- * @param log_offset the offset to sum to the log level for logging with log_ctx
- * @param log_ctx the parent logging context, it may be NULL
- * @return >= 0 if valid, a negative error code otherwise
- */
-int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx);
-
-int ff_set_systematic_pal2(uint32_t pal[256], enum PixelFormat pix_fmt);
-
-/**
- * @}
- */
-
-
-#endif /* AVUTIL_IMGUTILS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/intfloat.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/intfloat.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/intfloat.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/intfloat.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2011 Mans Rullgard
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_INTFLOAT_H
-#define AVUTIL_INTFLOAT_H
-
-#include <stdint.h>
-#include "attributes.h"
-
-union av_intfloat32 {
-    uint32_t i;
-    float    f;
-};
-
-union av_intfloat64 {
-    uint64_t i;
-    double   f;
-};
-
-/**
- * Reinterpret a 32-bit integer as a float.
- */
-static av_always_inline float av_int2float(uint32_t i)
-{
-    union av_intfloat32 v = { .i = i };
-    return v.f;
-}
-
-/**
- * Reinterpret a float as a 32-bit integer.
- */
-static av_always_inline uint32_t av_float2int(float f)
-{
-    union av_intfloat32 v = { .f = f };
-    return v.i;
-}
-
-/**
- * Reinterpret a 64-bit integer as a double.
- */
-static av_always_inline double av_int2double(uint64_t i)
-{
-    union av_intfloat64 v = { .i = i };
-    return v.f;
-}
-
-/**
- * Reinterpret a double as a 64-bit integer.
- */
-static av_always_inline uint64_t av_double2int(double f)
-{
-    union av_intfloat64 v = { .f = f };
-    return v.i;
-}
-
-#endif /* AVUTIL_INTFLOAT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/intfloat_readwrite.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/intfloat_readwrite.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/intfloat_readwrite.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/intfloat_readwrite.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-/*
- * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_INTFLOAT_READWRITE_H
-#define AVUTIL_INTFLOAT_READWRITE_H
-
-#include <stdint.h>
-#include "attributes.h"
-
-/* IEEE 80 bits extended float */
-typedef struct AVExtFloat  {
-    uint8_t exponent[2];
-    uint8_t mantissa[8];
-} AVExtFloat;
-
-attribute_deprecated double av_int2dbl(int64_t v) av_const;
-attribute_deprecated float av_int2flt(int32_t v) av_const;
-attribute_deprecated double av_ext2dbl(const AVExtFloat ext) av_const;
-attribute_deprecated int64_t av_dbl2int(double d) av_const;
-attribute_deprecated int32_t av_flt2int(float d) av_const;
-attribute_deprecated AVExtFloat av_dbl2ext(double d) av_const;
-
-#endif /* AVUTIL_INTFLOAT_READWRITE_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/intreadwrite.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/intreadwrite.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/intreadwrite.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/intreadwrite.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,522 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_INTREADWRITE_H
-#define AVUTIL_INTREADWRITE_H
-
-#include <stdint.h>
-#include "libavutil/avconfig.h"
-#include "attributes.h"
-#include "bswap.h"
-
-typedef union {
-    uint64_t u64;
-    uint32_t u32[2];
-    uint16_t u16[4];
-    uint8_t  u8 [8];
-    double   f64;
-    float    f32[2];
-} av_alias av_alias64;
-
-typedef union {
-    uint32_t u32;
-    uint16_t u16[2];
-    uint8_t  u8 [4];
-    float    f32;
-} av_alias av_alias32;
-
-typedef union {
-    uint16_t u16;
-    uint8_t  u8 [2];
-} av_alias av_alias16;
-
-/*
- * Arch-specific headers can provide any combination of
- * AV_[RW][BLN](16|24|32|64) and AV_(COPY|SWAP|ZERO)(64|128) macros.
- * Preprocessor symbols must be defined, even if these are implemented
- * as inline functions.
- */
-
-#ifdef HAVE_AV_CONFIG_H
-
-#include "config.h"
-
-#if   ARCH_ARM
-#   include "arm/intreadwrite.h"
-#elif ARCH_AVR32
-#   include "avr32/intreadwrite.h"
-#elif ARCH_MIPS
-#   include "mips/intreadwrite.h"
-#elif ARCH_PPC
-#   include "ppc/intreadwrite.h"
-#elif ARCH_TOMI
-#   include "tomi/intreadwrite.h"
-#elif ARCH_X86
-#   include "x86/intreadwrite.h"
-#endif
-
-#endif /* HAVE_AV_CONFIG_H */
-
-/*
- * Map AV_RNXX <-> AV_R[BL]XX for all variants provided by per-arch headers.
- */
-
-#if AV_HAVE_BIGENDIAN
-
-#   if    defined(AV_RN16) && !defined(AV_RB16)
-#       define AV_RB16(p) AV_RN16(p)
-#   elif !defined(AV_RN16) &&  defined(AV_RB16)
-#       define AV_RN16(p) AV_RB16(p)
-#   endif
-
-#   if    defined(AV_WN16) && !defined(AV_WB16)
-#       define AV_WB16(p, v) AV_WN16(p, v)
-#   elif !defined(AV_WN16) &&  defined(AV_WB16)
-#       define AV_WN16(p, v) AV_WB16(p, v)
-#   endif
-
-#   if    defined(AV_RN24) && !defined(AV_RB24)
-#       define AV_RB24(p) AV_RN24(p)
-#   elif !defined(AV_RN24) &&  defined(AV_RB24)
-#       define AV_RN24(p) AV_RB24(p)
-#   endif
-
-#   if    defined(AV_WN24) && !defined(AV_WB24)
-#       define AV_WB24(p, v) AV_WN24(p, v)
-#   elif !defined(AV_WN24) &&  defined(AV_WB24)
-#       define AV_WN24(p, v) AV_WB24(p, v)
-#   endif
-
-#   if    defined(AV_RN32) && !defined(AV_RB32)
-#       define AV_RB32(p) AV_RN32(p)
-#   elif !defined(AV_RN32) &&  defined(AV_RB32)
-#       define AV_RN32(p) AV_RB32(p)
-#   endif
-
-#   if    defined(AV_WN32) && !defined(AV_WB32)
-#       define AV_WB32(p, v) AV_WN32(p, v)
-#   elif !defined(AV_WN32) &&  defined(AV_WB32)
-#       define AV_WN32(p, v) AV_WB32(p, v)
-#   endif
-
-#   if    defined(AV_RN64) && !defined(AV_RB64)
-#       define AV_RB64(p) AV_RN64(p)
-#   elif !defined(AV_RN64) &&  defined(AV_RB64)
-#       define AV_RN64(p) AV_RB64(p)
-#   endif
-
-#   if    defined(AV_WN64) && !defined(AV_WB64)
-#       define AV_WB64(p, v) AV_WN64(p, v)
-#   elif !defined(AV_WN64) &&  defined(AV_WB64)
-#       define AV_WN64(p, v) AV_WB64(p, v)
-#   endif
-
-#else /* AV_HAVE_BIGENDIAN */
-
-#   if    defined(AV_RN16) && !defined(AV_RL16)
-#       define AV_RL16(p) AV_RN16(p)
-#   elif !defined(AV_RN16) &&  defined(AV_RL16)
-#       define AV_RN16(p) AV_RL16(p)
-#   endif
-
-#   if    defined(AV_WN16) && !defined(AV_WL16)
-#       define AV_WL16(p, v) AV_WN16(p, v)
-#   elif !defined(AV_WN16) &&  defined(AV_WL16)
-#       define AV_WN16(p, v) AV_WL16(p, v)
-#   endif
-
-#   if    defined(AV_RN24) && !defined(AV_RL24)
-#       define AV_RL24(p) AV_RN24(p)
-#   elif !defined(AV_RN24) &&  defined(AV_RL24)
-#       define AV_RN24(p) AV_RL24(p)
-#   endif
-
-#   if    defined(AV_WN24) && !defined(AV_WL24)
-#       define AV_WL24(p, v) AV_WN24(p, v)
-#   elif !defined(AV_WN24) &&  defined(AV_WL24)
-#       define AV_WN24(p, v) AV_WL24(p, v)
-#   endif
-
-#   if    defined(AV_RN32) && !defined(AV_RL32)
-#       define AV_RL32(p) AV_RN32(p)
-#   elif !defined(AV_RN32) &&  defined(AV_RL32)
-#       define AV_RN32(p) AV_RL32(p)
-#   endif
-
-#   if    defined(AV_WN32) && !defined(AV_WL32)
-#       define AV_WL32(p, v) AV_WN32(p, v)
-#   elif !defined(AV_WN32) &&  defined(AV_WL32)
-#       define AV_WN32(p, v) AV_WL32(p, v)
-#   endif
-
-#   if    defined(AV_RN64) && !defined(AV_RL64)
-#       define AV_RL64(p) AV_RN64(p)
-#   elif !defined(AV_RN64) &&  defined(AV_RL64)
-#       define AV_RN64(p) AV_RL64(p)
-#   endif
-
-#   if    defined(AV_WN64) && !defined(AV_WL64)
-#       define AV_WL64(p, v) AV_WN64(p, v)
-#   elif !defined(AV_WN64) &&  defined(AV_WL64)
-#       define AV_WN64(p, v) AV_WL64(p, v)
-#   endif
-
-#endif /* !AV_HAVE_BIGENDIAN */
-
-/*
- * Define AV_[RW]N helper macros to simplify definitions not provided
- * by per-arch headers.
- */
-
-#if defined(__GNUC__) && !defined(__TI_COMPILER_VERSION__)
-
-union unaligned_64 { uint64_t l; } __attribute__((packed)) av_alias;
-union unaligned_32 { uint32_t l; } __attribute__((packed)) av_alias;
-union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias;
-
-#   define AV_RN(s, p) (((const union unaligned_##s *) (p))->l)
-#   define AV_WN(s, p, v) ((((union unaligned_##s *) (p))->l) = (v))
-
-#elif defined(__DECC)
-
-#   define AV_RN(s, p) (*((const __unaligned uint##s##_t*)(p)))
-#   define AV_WN(s, p, v) (*((__unaligned uint##s##_t*)(p)) = (v))
-
-#elif AV_HAVE_FAST_UNALIGNED
-
-#   define AV_RN(s, p) (((const av_alias##s*)(p))->u##s)
-#   define AV_WN(s, p, v) (((av_alias##s*)(p))->u##s = (v))
-
-#else
-
-#ifndef AV_RB16
-#   define AV_RB16(x)                           \
-    ((((const uint8_t*)(x))[0] << 8) |          \
-      ((const uint8_t*)(x))[1])
-#endif
-#ifndef AV_WB16
-#   define AV_WB16(p, d) do {                   \
-        ((uint8_t*)(p))[1] = (d);               \
-        ((uint8_t*)(p))[0] = (d)>>8;            \
-    } while(0)
-#endif
-
-#ifndef AV_RL16
-#   define AV_RL16(x)                           \
-    ((((const uint8_t*)(x))[1] << 8) |          \
-      ((const uint8_t*)(x))[0])
-#endif
-#ifndef AV_WL16
-#   define AV_WL16(p, d) do {                   \
-        ((uint8_t*)(p))[0] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-    } while(0)
-#endif
-
-#ifndef AV_RB32
-#   define AV_RB32(x)                                \
-    (((uint32_t)((const uint8_t*)(x))[0] << 24) |    \
-               (((const uint8_t*)(x))[1] << 16) |    \
-               (((const uint8_t*)(x))[2] <<  8) |    \
-                ((const uint8_t*)(x))[3])
-#endif
-#ifndef AV_WB32
-#   define AV_WB32(p, d) do {                   \
-        ((uint8_t*)(p))[3] = (d);               \
-        ((uint8_t*)(p))[2] = (d)>>8;            \
-        ((uint8_t*)(p))[1] = (d)>>16;           \
-        ((uint8_t*)(p))[0] = (d)>>24;           \
-    } while(0)
-#endif
-
-#ifndef AV_RL32
-#   define AV_RL32(x)                                \
-    (((uint32_t)((const uint8_t*)(x))[3] << 24) |    \
-               (((const uint8_t*)(x))[2] << 16) |    \
-               (((const uint8_t*)(x))[1] <<  8) |    \
-                ((const uint8_t*)(x))[0])
-#endif
-#ifndef AV_WL32
-#   define AV_WL32(p, d) do {                   \
-        ((uint8_t*)(p))[0] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-        ((uint8_t*)(p))[2] = (d)>>16;           \
-        ((uint8_t*)(p))[3] = (d)>>24;           \
-    } while(0)
-#endif
-
-#ifndef AV_RB64
-#   define AV_RB64(x)                                   \
-    (((uint64_t)((const uint8_t*)(x))[0] << 56) |       \
-     ((uint64_t)((const uint8_t*)(x))[1] << 48) |       \
-     ((uint64_t)((const uint8_t*)(x))[2] << 40) |       \
-     ((uint64_t)((const uint8_t*)(x))[3] << 32) |       \
-     ((uint64_t)((const uint8_t*)(x))[4] << 24) |       \
-     ((uint64_t)((const uint8_t*)(x))[5] << 16) |       \
-     ((uint64_t)((const uint8_t*)(x))[6] <<  8) |       \
-      (uint64_t)((const uint8_t*)(x))[7])
-#endif
-#ifndef AV_WB64
-#   define AV_WB64(p, d) do {                   \
-        ((uint8_t*)(p))[7] = (d);               \
-        ((uint8_t*)(p))[6] = (d)>>8;            \
-        ((uint8_t*)(p))[5] = (d)>>16;           \
-        ((uint8_t*)(p))[4] = (d)>>24;           \
-        ((uint8_t*)(p))[3] = (d)>>32;           \
-        ((uint8_t*)(p))[2] = (d)>>40;           \
-        ((uint8_t*)(p))[1] = (d)>>48;           \
-        ((uint8_t*)(p))[0] = (d)>>56;           \
-    } while(0)
-#endif
-
-#ifndef AV_RL64
-#   define AV_RL64(x)                                   \
-    (((uint64_t)((const uint8_t*)(x))[7] << 56) |       \
-     ((uint64_t)((const uint8_t*)(x))[6] << 48) |       \
-     ((uint64_t)((const uint8_t*)(x))[5] << 40) |       \
-     ((uint64_t)((const uint8_t*)(x))[4] << 32) |       \
-     ((uint64_t)((const uint8_t*)(x))[3] << 24) |       \
-     ((uint64_t)((const uint8_t*)(x))[2] << 16) |       \
-     ((uint64_t)((const uint8_t*)(x))[1] <<  8) |       \
-      (uint64_t)((const uint8_t*)(x))[0])
-#endif
-#ifndef AV_WL64
-#   define AV_WL64(p, d) do {                   \
-        ((uint8_t*)(p))[0] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-        ((uint8_t*)(p))[2] = (d)>>16;           \
-        ((uint8_t*)(p))[3] = (d)>>24;           \
-        ((uint8_t*)(p))[4] = (d)>>32;           \
-        ((uint8_t*)(p))[5] = (d)>>40;           \
-        ((uint8_t*)(p))[6] = (d)>>48;           \
-        ((uint8_t*)(p))[7] = (d)>>56;           \
-    } while(0)
-#endif
-
-#if AV_HAVE_BIGENDIAN
-#   define AV_RN(s, p)    AV_RB##s(p)
-#   define AV_WN(s, p, v) AV_WB##s(p, v)
-#else
-#   define AV_RN(s, p)    AV_RL##s(p)
-#   define AV_WN(s, p, v) AV_WL##s(p, v)
-#endif
-
-#endif /* HAVE_FAST_UNALIGNED */
-
-#ifndef AV_RN16
-#   define AV_RN16(p) AV_RN(16, p)
-#endif
-
-#ifndef AV_RN32
-#   define AV_RN32(p) AV_RN(32, p)
-#endif
-
-#ifndef AV_RN64
-#   define AV_RN64(p) AV_RN(64, p)
-#endif
-
-#ifndef AV_WN16
-#   define AV_WN16(p, v) AV_WN(16, p, v)
-#endif
-
-#ifndef AV_WN32
-#   define AV_WN32(p, v) AV_WN(32, p, v)
-#endif
-
-#ifndef AV_WN64
-#   define AV_WN64(p, v) AV_WN(64, p, v)
-#endif
-
-#if AV_HAVE_BIGENDIAN
-#   define AV_RB(s, p)    AV_RN##s(p)
-#   define AV_WB(s, p, v) AV_WN##s(p, v)
-#   define AV_RL(s, p)    av_bswap##s(AV_RN##s(p))
-#   define AV_WL(s, p, v) AV_WN##s(p, av_bswap##s(v))
-#else
-#   define AV_RB(s, p)    av_bswap##s(AV_RN##s(p))
-#   define AV_WB(s, p, v) AV_WN##s(p, av_bswap##s(v))
-#   define AV_RL(s, p)    AV_RN##s(p)
-#   define AV_WL(s, p, v) AV_WN##s(p, v)
-#endif
-
-#define AV_RB8(x)     (((const uint8_t*)(x))[0])
-#define AV_WB8(p, d)  do { ((uint8_t*)(p))[0] = (d); } while(0)
-
-#define AV_RL8(x)     AV_RB8(x)
-#define AV_WL8(p, d)  AV_WB8(p, d)
-
-#ifndef AV_RB16
-#   define AV_RB16(p)    AV_RB(16, p)
-#endif
-#ifndef AV_WB16
-#   define AV_WB16(p, v) AV_WB(16, p, v)
-#endif
-
-#ifndef AV_RL16
-#   define AV_RL16(p)    AV_RL(16, p)
-#endif
-#ifndef AV_WL16
-#   define AV_WL16(p, v) AV_WL(16, p, v)
-#endif
-
-#ifndef AV_RB32
-#   define AV_RB32(p)    AV_RB(32, p)
-#endif
-#ifndef AV_WB32
-#   define AV_WB32(p, v) AV_WB(32, p, v)
-#endif
-
-#ifndef AV_RL32
-#   define AV_RL32(p)    AV_RL(32, p)
-#endif
-#ifndef AV_WL32
-#   define AV_WL32(p, v) AV_WL(32, p, v)
-#endif
-
-#ifndef AV_RB64
-#   define AV_RB64(p)    AV_RB(64, p)
-#endif
-#ifndef AV_WB64
-#   define AV_WB64(p, v) AV_WB(64, p, v)
-#endif
-
-#ifndef AV_RL64
-#   define AV_RL64(p)    AV_RL(64, p)
-#endif
-#ifndef AV_WL64
-#   define AV_WL64(p, v) AV_WL(64, p, v)
-#endif
-
-#ifndef AV_RB24
-#   define AV_RB24(x)                           \
-    ((((const uint8_t*)(x))[0] << 16) |         \
-     (((const uint8_t*)(x))[1] <<  8) |         \
-      ((const uint8_t*)(x))[2])
-#endif
-#ifndef AV_WB24
-#   define AV_WB24(p, d) do {                   \
-        ((uint8_t*)(p))[2] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-        ((uint8_t*)(p))[0] = (d)>>16;           \
-    } while(0)
-#endif
-
-#ifndef AV_RL24
-#   define AV_RL24(x)                           \
-    ((((const uint8_t*)(x))[2] << 16) |         \
-     (((const uint8_t*)(x))[1] <<  8) |         \
-      ((const uint8_t*)(x))[0])
-#endif
-#ifndef AV_WL24
-#   define AV_WL24(p, d) do {                   \
-        ((uint8_t*)(p))[0] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-        ((uint8_t*)(p))[2] = (d)>>16;           \
-    } while(0)
-#endif
-
-/*
- * The AV_[RW]NA macros access naturally aligned data
- * in a type-safe way.
- */
-
-#define AV_RNA(s, p)    (((const av_alias##s*)(p))->u##s)
-#define AV_WNA(s, p, v) (((av_alias##s*)(p))->u##s = (v))
-
-#ifndef AV_RN16A
-#   define AV_RN16A(p) AV_RNA(16, p)
-#endif
-
-#ifndef AV_RN32A
-#   define AV_RN32A(p) AV_RNA(32, p)
-#endif
-
-#ifndef AV_RN64A
-#   define AV_RN64A(p) AV_RNA(64, p)
-#endif
-
-#ifndef AV_WN16A
-#   define AV_WN16A(p, v) AV_WNA(16, p, v)
-#endif
-
-#ifndef AV_WN32A
-#   define AV_WN32A(p, v) AV_WNA(32, p, v)
-#endif
-
-#ifndef AV_WN64A
-#   define AV_WN64A(p, v) AV_WNA(64, p, v)
-#endif
-
-/* Parameters for AV_COPY*, AV_SWAP*, AV_ZERO* must be
- * naturally aligned. They may be implemented using MMX,
- * so emms_c() must be called before using any float code
- * afterwards.
- */
-
-#define AV_COPY(n, d, s) \
-    (((av_alias##n*)(d))->u##n = ((const av_alias##n*)(s))->u##n)
-
-#ifndef AV_COPY16
-#   define AV_COPY16(d, s) AV_COPY(16, d, s)
-#endif
-
-#ifndef AV_COPY32
-#   define AV_COPY32(d, s) AV_COPY(32, d, s)
-#endif
-
-#ifndef AV_COPY64
-#   define AV_COPY64(d, s) AV_COPY(64, d, s)
-#endif
-
-#ifndef AV_COPY128
-#   define AV_COPY128(d, s)                    \
-    do {                                       \
-        AV_COPY64(d, s);                       \
-        AV_COPY64((char*)(d)+8, (char*)(s)+8); \
-    } while(0)
-#endif
-
-#define AV_SWAP(n, a, b) FFSWAP(av_alias##n, *(av_alias##n*)(a), *(av_alias##n*)(b))
-
-#ifndef AV_SWAP64
-#   define AV_SWAP64(a, b) AV_SWAP(64, a, b)
-#endif
-
-#define AV_ZERO(n, d) (((av_alias##n*)(d))->u##n = 0)
-
-#ifndef AV_ZERO16
-#   define AV_ZERO16(d) AV_ZERO(16, d)
-#endif
-
-#ifndef AV_ZERO32
-#   define AV_ZERO32(d) AV_ZERO(32, d)
-#endif
-
-#ifndef AV_ZERO64
-#   define AV_ZERO64(d) AV_ZERO(64, d)
-#endif
-
-#ifndef AV_ZERO128
-#   define AV_ZERO128(d)         \
-    do {                         \
-        AV_ZERO64(d);            \
-        AV_ZERO64((char*)(d)+8); \
-    } while(0)
-#endif
-
-#endif /* AVUTIL_INTREADWRITE_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/lfg.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/lfg.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/lfg.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/lfg.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-/*
- * Lagged Fibonacci PRNG
- * Copyright (c) 2008 Michael Niedermayer
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_LFG_H
-#define AVUTIL_LFG_H
-
-typedef struct {
-    unsigned int state[64];
-    int index;
-} AVLFG;
-
-void av_lfg_init(AVLFG *c, unsigned int seed);
-
-/**
- * Get the next random unsigned 32-bit number using an ALFG.
- *
- * Please also consider a simple LCG like state= state*1664525+1013904223,
- * it may be good enough and faster for your specific use case.
- */
-static inline unsigned int av_lfg_get(AVLFG *c){
-    c->state[c->index & 63] = c->state[(c->index-24) & 63] + c->state[(c->index-55) & 63];
-    return c->state[c->index++ & 63];
-}
-
-/**
- * Get the next random unsigned 32-bit number using a MLFG.
- *
- * Please also consider av_lfg_get() above, it is faster.
- */
-static inline unsigned int av_mlfg_get(AVLFG *c){
-    unsigned int a= c->state[(c->index-55) & 63];
-    unsigned int b= c->state[(c->index-24) & 63];
-    return c->state[c->index++ & 63] = 2*a*b+a+b;
-}
-
-/**
- * Get the next two numbers generated by a Box-Muller Gaussian
- * generator using the random numbers issued by lfg.
- *
- * @param out array where the two generated numbers are placed
- */
-void av_bmg_get(AVLFG *lfg, double out[2]);
-
-#endif /* AVUTIL_LFG_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/log.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/log.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/log.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/log.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,172 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_LOG_H
-#define AVUTIL_LOG_H
-
-#include <stdarg.h>
-#include "avutil.h"
-#include "attributes.h"
-
-/**
- * Describe the class of an AVClass context structure. That is an
- * arbitrary struct of which the first field is a pointer to an
- * AVClass struct (e.g. AVCodecContext, AVFormatContext etc.).
- */
-typedef struct AVClass {
-    /**
-     * The name of the class; usually it is the same name as the
-     * context structure type to which the AVClass is associated.
-     */
-    const char* class_name;
-
-    /**
-     * A pointer to a function which returns the name of a context
-     * instance ctx associated with the class.
-     */
-    const char* (*item_name)(void* ctx);
-
-    /**
-     * a pointer to the first option specified in the class if any or NULL
-     *
-     * @see av_set_default_options()
-     */
-    const struct AVOption *option;
-
-    /**
-     * LIBAVUTIL_VERSION with which this structure was created.
-     * This is used to allow fields to be added without requiring major
-     * version bumps everywhere.
-     */
-
-    int version;
-
-    /**
-     * Offset in the structure where log_level_offset is stored.
-     * 0 means there is no such variable
-     */
-    int log_level_offset_offset;
-
-    /**
-     * Offset in the structure where a pointer to the parent context for loging is stored.
-     * for example a decoder that uses eval.c could pass its AVCodecContext to eval as such
-     * parent context. And a av_log() implementation could then display the parent context
-     * can be NULL of course
-     */
-    int parent_log_context_offset;
-
-    /**
-     * Return next AVOptions-enabled child or NULL
-     */
-    void* (*child_next)(void *obj, void *prev);
-
-    /**
-     * Return an AVClass corresponding to next potential
-     * AVOptions-enabled child.
-     *
-     * The difference between child_next and this is that
-     * child_next iterates over _already existing_ objects, while
-     * child_class_next iterates over _all possible_ children.
-     */
-    const struct AVClass* (*child_class_next)(const struct AVClass *prev);
-} AVClass;
-
-/* av_log API */
-
-#define AV_LOG_QUIET    -8
-
-/**
- * Something went really wrong and we will crash now.
- */
-#define AV_LOG_PANIC     0
-
-/**
- * Something went wrong and recovery is not possible.
- * For example, no header was found for a format which depends
- * on headers or an illegal combination of parameters is used.
- */
-#define AV_LOG_FATAL     8
-
-/**
- * Something went wrong and cannot losslessly be recovered.
- * However, not all future data is affected.
- */
-#define AV_LOG_ERROR    16
-
-/**
- * Something somehow does not look correct. This may or may not
- * lead to problems. An example would be the use of '-vstrict -2'.
- */
-#define AV_LOG_WARNING  24
-
-#define AV_LOG_INFO     32
-#define AV_LOG_VERBOSE  40
-
-/**
- * Stuff which is only useful for libav* developers.
- */
-#define AV_LOG_DEBUG    48
-
-/**
- * Send the specified message to the log if the level is less than or equal
- * to the current av_log_level. By default, all logging messages are sent to
- * stderr. This behavior can be altered by setting a different av_vlog callback
- * function.
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- * pointer to an AVClass struct.
- * @param level The importance level of the message, lower values signifying
- * higher importance.
- * @param fmt The format string (printf-compatible) that specifies how
- * subsequent arguments are converted to output.
- * @see av_vlog
- */
-void av_log(void *avcl, int level, const char *fmt, ...) av_printf_format(3, 4);
-
-void av_vlog(void *avcl, int level, const char *fmt, va_list);
-int av_log_get_level(void);
-void av_log_set_level(int);
-void av_log_set_callback(void (*)(void*, int, const char*, va_list));
-void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl);
-const char* av_default_item_name(void* ctx);
-
-/**
- * av_dlog macros
- * Useful to print debug messages that shouldn't get compiled in normally.
- */
-
-#ifdef DEBUG
-#    define av_dlog(pctx, ...) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__)
-#else
-#    define av_dlog(pctx, ...)
-#endif
-
-/**
- * Skip repeated messages, this requires the user app to use av_log() instead of
- * (f)printf as the 2 would otherwise interfere and lead to
- * "Last message repeated x times" messages below (f)printf messages with some
- * bad luck.
- * Also to receive the last, "last repeated" line if any, the user app must
- * call av_log(NULL, AV_LOG_QUIET, ""); at the end
- */
-#define AV_LOG_SKIP_REPEATED 1
-void av_log_set_flags(int arg);
-
-#endif /* AVUTIL_LOG_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/lzo.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/lzo.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/lzo.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/lzo.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-/*
- * LZO 1x decompression
- * copyright (c) 2006 Reimar Doeffinger
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_LZO_H
-#define AVUTIL_LZO_H
-
-/**
- * @defgroup lavu_lzo LZO
- * @ingroup lavu_crypto
- *
- * @{
- */
-
-#include <stdint.h>
-
-/** @name Error flags returned by av_lzo1x_decode
-  * @{ */
-/// end of the input buffer reached before decoding finished
-#define AV_LZO_INPUT_DEPLETED 1
-/// decoded data did not fit into output buffer
-#define AV_LZO_OUTPUT_FULL 2
-/// a reference to previously decoded data was wrong
-#define AV_LZO_INVALID_BACKPTR 4
-/// a non-specific error in the compressed bitstream
-#define AV_LZO_ERROR 8
-/** @} */
-
-#define AV_LZO_INPUT_PADDING 8
-#define AV_LZO_OUTPUT_PADDING 12
-
-/**
- * @brief Decodes LZO 1x compressed data.
- * @param out output buffer
- * @param outlen size of output buffer, number of bytes left are returned here
- * @param in input buffer
- * @param inlen size of input buffer, number of bytes left are returned here
- * @return 0 on success, otherwise a combination of the error flags above
- *
- * Make sure all buffers are appropriately padded, in must provide
- * AV_LZO_INPUT_PADDING, out must provide AV_LZO_OUTPUT_PADDING additional bytes.
- */
-int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen);
-
-/**
- * @brief deliberately overlapping memcpy implementation
- * @param dst destination buffer; must be padded with 12 additional bytes
- * @param back how many bytes back we start (the initial size of the overlapping window)
- * @param cnt number of bytes to copy, must be >= 0
- *
- * cnt > back is valid, this will copy the bytes we just copied,
- * thus creating a repeating pattern with a period length of back.
- */
-void av_memcpy_backptr(uint8_t *dst, int back, int cnt);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_LZO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/mathematics.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/mathematics.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/mathematics.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/mathematics.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,122 +0,0 @@
-/*
- * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_MATHEMATICS_H
-#define AVUTIL_MATHEMATICS_H
-
-#include <stdint.h>
-#include <math.h>
-#include "attributes.h"
-#include "rational.h"
-
-#ifndef M_E
-#define M_E            2.7182818284590452354   /* e */
-#endif
-#ifndef M_LN2
-#define M_LN2          0.69314718055994530942  /* log_e 2 */
-#endif
-#ifndef M_LN10
-#define M_LN10         2.30258509299404568402  /* log_e 10 */
-#endif
-#ifndef M_LOG2_10
-#define M_LOG2_10      3.32192809488736234787  /* log_2 10 */
-#endif
-#ifndef M_PHI
-#define M_PHI          1.61803398874989484820   /* phi / golden ratio */
-#endif
-#ifndef M_PI
-#define M_PI           3.14159265358979323846  /* pi */
-#endif
-#ifndef M_SQRT1_2
-#define M_SQRT1_2      0.70710678118654752440  /* 1/sqrt(2) */
-#endif
-#ifndef M_SQRT2
-#define M_SQRT2        1.41421356237309504880  /* sqrt(2) */
-#endif
-#ifndef NAN
-#define NAN            (0.0/0.0)
-#endif
-#ifndef INFINITY
-#define INFINITY       (1.0/0.0)
-#endif
-
-/**
- * @addtogroup lavu_math
- * @{
- */
-
-
-enum AVRounding {
-    AV_ROUND_ZERO     = 0, ///< Round toward zero.
-    AV_ROUND_INF      = 1, ///< Round away from zero.
-    AV_ROUND_DOWN     = 2, ///< Round toward -infinity.
-    AV_ROUND_UP       = 3, ///< Round toward +infinity.
-    AV_ROUND_NEAR_INF = 5, ///< Round to nearest and halfway cases away from zero.
-};
-
-/**
- * Return the greatest common divisor of a and b.
- * If both a and b are 0 or either or both are <0 then behavior is
- * undefined.
- */
-int64_t av_const av_gcd(int64_t a, int64_t b);
-
-/**
- * Rescale a 64-bit integer with rounding to nearest.
- * A simple a*b/c isn't possible as it can overflow.
- */
-int64_t av_rescale(int64_t a, int64_t b, int64_t c) av_const;
-
-/**
- * Rescale a 64-bit integer with specified rounding.
- * A simple a*b/c isn't possible as it can overflow.
- */
-int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding) av_const;
-
-/**
- * Rescale a 64-bit integer by 2 rational numbers.
- */
-int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const;
-
-/**
- * Compare 2 timestamps each in its own timebases.
- * The result of the function is undefined if one of the timestamps
- * is outside the int64_t range when represented in the others timebase.
- * @return -1 if ts_a is before ts_b, 1 if ts_a is after ts_b or 0 if they represent the same position
- */
-int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b);
-
-/**
- * Compare 2 integers modulo mod.
- * That is we compare integers a and b for which only the least
- * significant log2(mod) bits are known.
- *
- * @param mod must be a power of 2
- * @return a negative value if a is smaller than b
- *         a positive value if a is greater than b
- *         0                if a equals          b
- */
-int64_t av_compare_mod(uint64_t a, uint64_t b, uint64_t mod);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_MATHEMATICS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/md5.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/md5.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/md5.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/md5.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_MD5_H
-#define AVUTIL_MD5_H
-
-#include <stdint.h>
-
-/**
- * @defgroup lavu_md5 MD5
- * @ingroup lavu_crypto
- * @{
- */
-
-extern const int av_md5_size;
-
-struct AVMD5;
-
-void av_md5_init(struct AVMD5 *ctx);
-void av_md5_update(struct AVMD5 *ctx, const uint8_t *src, const int len);
-void av_md5_final(struct AVMD5 *ctx, uint8_t *dst);
-void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_MD5_H */
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/mem.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/mem.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/mem.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/mem.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,136 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * memory handling functions
- */
-
-#ifndef AVUTIL_MEM_H
-#define AVUTIL_MEM_H
-
-#include "attributes.h"
-#include "avutil.h"
-
-/**
- * @addtogroup lavu_mem
- * @{
- */
-
-
-#if defined(__ICC) && _ICC < 1200 || defined(__SUNPRO_C)
-    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
-    #define DECLARE_ASM_CONST(n,t,v)    const t __attribute__ ((aligned (n))) v
-#elif defined(__TI_COMPILER_VERSION__)
-    #define DECLARE_ALIGNED(n,t,v)                      \
-        AV_PRAGMA(DATA_ALIGN(v,n))                      \
-        t __attribute__((aligned(n))) v
-    #define DECLARE_ASM_CONST(n,t,v)                    \
-        AV_PRAGMA(DATA_ALIGN(v,n))                      \
-        static const t __attribute__((aligned(n))) v
-#elif defined(__GNUC__)
-    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
-    #define DECLARE_ASM_CONST(n,t,v)    static const t av_used __attribute__ ((aligned (n))) v
-#elif defined(_MSC_VER)
-    #define DECLARE_ALIGNED(n,t,v)      __declspec(align(n)) t v
-    #define DECLARE_ASM_CONST(n,t,v)    __declspec(align(n)) static const t v
-#else
-    #define DECLARE_ALIGNED(n,t,v)      t v
-    #define DECLARE_ASM_CONST(n,t,v)    static const t v
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-    #define av_malloc_attrib __attribute__((__malloc__))
-#else
-    #define av_malloc_attrib
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(4,3)
-    #define av_alloc_size(n) __attribute__((alloc_size(n)))
-#else
-    #define av_alloc_size(n)
-#endif
-
-/**
- * Allocate a block of size bytes with alignment suitable for all
- * memory accesses (including vectors if available on the CPU).
- * @param size Size in bytes for the memory block to be allocated.
- * @return Pointer to the allocated block, NULL if the block cannot
- * be allocated.
- * @see av_mallocz()
- */
-void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1);
-
-/**
- * Allocate or reallocate a block of memory.
- * If ptr is NULL and size > 0, allocate a new block. If
- * size is zero, free the memory block pointed to by ptr.
- * @param ptr Pointer to a memory block already allocated with
- * av_malloc(z)() or av_realloc() or NULL.
- * @param size Size in bytes for the memory block to be allocated or
- * reallocated.
- * @return Pointer to a newly reallocated block or NULL if the block
- * cannot be reallocated or the function is used to free the memory block.
- * @see av_fast_realloc()
- */
-void *av_realloc(void *ptr, size_t size) av_alloc_size(2);
-
-/**
- * Free a memory block which has been allocated with av_malloc(z)() or
- * av_realloc().
- * @param ptr Pointer to the memory block which should be freed.
- * @note ptr = NULL is explicitly allowed.
- * @note It is recommended that you use av_freep() instead.
- * @see av_freep()
- */
-void av_free(void *ptr);
-
-/**
- * Allocate a block of size bytes with alignment suitable for all
- * memory accesses (including vectors if available on the CPU) and
- * zero all the bytes of the block.
- * @param size Size in bytes for the memory block to be allocated.
- * @return Pointer to the allocated block, NULL if it cannot be allocated.
- * @see av_malloc()
- */
-void *av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1);
-
-/**
- * Duplicate the string s.
- * @param s string to be duplicated
- * @return Pointer to a newly allocated string containing a
- * copy of s or NULL if the string cannot be allocated.
- */
-char *av_strdup(const char *s) av_malloc_attrib;
-
-/**
- * Free a memory block which has been allocated with av_malloc(z)() or
- * av_realloc() and set the pointer pointing to it to NULL.
- * @param ptr Pointer to the pointer to the memory block which should
- * be freed.
- * @see av_free()
- */
-void av_freep(void *ptr);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_MEM_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/old_pix_fmts.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/old_pix_fmts.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/old_pix_fmts.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/old_pix_fmts.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,171 +0,0 @@
-/*
- * copyright (c) 2006-2012 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_OLD_PIX_FMTS_H
-#define AVUTIL_OLD_PIX_FMTS_H
-
-/*
- * This header exists to prevent new pixel formats from being accidentally added
- * to the deprecated list.
- * Do not include it directly. It will be removed on next major bump
- *
- * Do not add new items to this list. Use the AVPixelFormat enum instead.
- */
-    PIX_FMT_NONE = AV_PIX_FMT_NONE,
-    PIX_FMT_YUV420P,   ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
-    PIX_FMT_YUYV422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
-    PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
-    PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
-    PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
-    PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
-    PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
-    PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
-    PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
-    PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
-    PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
-    PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
-    PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
-    PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
-    PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
-    PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
-    PIX_FMT_XVMC_MPEG2_IDCT,
-    PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
-    PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
-    PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
-    PIX_FMT_BGR4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
-    PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
-    PIX_FMT_RGB8,      ///< packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
-    PIX_FMT_RGB4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
-    PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
-    PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
-    PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
-
-    PIX_FMT_ARGB,      ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
-    PIX_FMT_RGBA,      ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
-    PIX_FMT_ABGR,      ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
-    PIX_FMT_BGRA,      ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
-
-    PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
-    PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
-    PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
-    PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
-    PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
-    PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
-    PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
-
-    PIX_FMT_RGB565BE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian
-    PIX_FMT_RGB565LE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), little-endian
-    PIX_FMT_RGB555BE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
-    PIX_FMT_RGB555LE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
-
-    PIX_FMT_BGR565BE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), big-endian
-    PIX_FMT_BGR565LE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), little-endian
-    PIX_FMT_BGR555BE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
-    PIX_FMT_BGR555LE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
-
-    PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
-    PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
-    PIX_FMT_VAAPI_VLD,  ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-
-    PIX_FMT_YUV420P16LE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV420P16BE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV422P16LE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_VDPAU_MPEG4,  ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
-
-    PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
-    PIX_FMT_RGB444BE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
-    PIX_FMT_BGR444LE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
-    PIX_FMT_BGR444BE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
-    PIX_FMT_GRAY8A,    ///< 8bit gray, 8bit alpha
-    PIX_FMT_BGR48BE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
-    PIX_FMT_BGR48LE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
-
-    //the following 10 formats have the disadvantage of needing 1 format for each bit depth, thus
-    //If you want to support multiple bit depths, then using PIX_FMT_YUV420P16* with the bpp stored separately
-    //is better
-    PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_VDA_VLD,    ///< hardware decoding through VDA
-
-#ifdef AV_PIX_FMT_ABI_GIT_MASTER
-    PIX_FMT_RGBA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
-    PIX_FMT_RGBA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-    PIX_FMT_BGRA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
-    PIX_FMT_BGRA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-#endif
-    PIX_FMT_GBRP,      ///< planar GBR 4:4:4 24bpp
-    PIX_FMT_GBRP9BE,   ///< planar GBR 4:4:4 27bpp, big endian
-    PIX_FMT_GBRP9LE,   ///< planar GBR 4:4:4 27bpp, little endian
-    PIX_FMT_GBRP10BE,  ///< planar GBR 4:4:4 30bpp, big endian
-    PIX_FMT_GBRP10LE,  ///< planar GBR 4:4:4 30bpp, little endian
-    PIX_FMT_GBRP16BE,  ///< planar GBR 4:4:4 48bpp, big endian
-    PIX_FMT_GBRP16LE,  ///< planar GBR 4:4:4 48bpp, little endian
-
-#ifndef AV_PIX_FMT_ABI_GIT_MASTER
-    PIX_FMT_RGBA64BE=0x123,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
-    PIX_FMT_RGBA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-    PIX_FMT_BGRA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
-    PIX_FMT_BGRA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-#endif
-    PIX_FMT_0RGB=0x123+4,      ///< packed RGB 8:8:8, 32bpp, 0RGB0RGB...
-    PIX_FMT_RGB0,      ///< packed RGB 8:8:8, 32bpp, RGB0RGB0...
-    PIX_FMT_0BGR,      ///< packed BGR 8:8:8, 32bpp, 0BGR0BGR...
-    PIX_FMT_BGR0,      ///< packed BGR 8:8:8, 32bpp, BGR0BGR0...
-    PIX_FMT_YUVA444P,  ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples)
-    PIX_FMT_YUVA422P,  ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
-
-    PIX_FMT_YUV420P12BE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV420P12LE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV420P14BE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV420P14LE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV422P12BE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV422P12LE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_YUV422P14BE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV422P14LE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_YUV444P12BE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_YUV444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV444P14BE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_YUV444P14LE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_GBRP12BE,    ///< planar GBR 4:4:4 36bpp, big endian
-    PIX_FMT_GBRP12LE,    ///< planar GBR 4:4:4 36bpp, little endian
-    PIX_FMT_GBRP14BE,    ///< planar GBR 4:4:4 42bpp, big endian
-    PIX_FMT_GBRP14LE,    ///< planar GBR 4:4:4 42bpp, little endian
-
-    PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
-#endif /* AVUTIL_OLD_PIX_FMTS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/opt.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/opt.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/opt.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/opt.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,591 +0,0 @@
-/*
- * AVOptions
- * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_OPT_H
-#define AVUTIL_OPT_H
-
-/**
- * @file
- * AVOptions
- */
-
-#include "rational.h"
-#include "avutil.h"
-#include "dict.h"
-#include "log.h"
-
-/**
- * @defgroup avoptions AVOptions
- * @ingroup lavu_data
- * @{
- * AVOptions provide a generic system to declare options on arbitrary structs
- * ("objects"). An option can have a help text, a type and a range of possible
- * values. Options may then be enumerated, read and written to.
- *
- * @section avoptions_implement Implementing AVOptions
- * This section describes how to add AVOptions capabilities to a struct.
- *
- * All AVOptions-related information is stored in an AVClass. Therefore
- * the first member of the struct must be a pointer to an AVClass describing it.
- * The option field of the AVClass must be set to a NULL-terminated static array
- * of AVOptions. Each AVOption must have a non-empty name, a type, a default
- * value and for number-type AVOptions also a range of allowed values. It must
- * also declare an offset in bytes from the start of the struct, where the field
- * associated with this AVOption is located. Other fields in the AVOption struct
- * should also be set when applicable, but are not required.
- *
- * The following example illustrates an AVOptions-enabled struct:
- * @code
- * typedef struct test_struct {
- *     AVClass *class;
- *     int      int_opt;
- *     char    *str_opt;
- *     uint8_t *bin_opt;
- *     int      bin_len;
- * } test_struct;
- *
- * static const AVOption options[] = {
- *   { "test_int", "This is a test option of int type.", offsetof(test_struct, int_opt),
- *     AV_OPT_TYPE_INT, { -1 }, INT_MIN, INT_MAX },
- *   { "test_str", "This is a test option of string type.", offsetof(test_struct, str_opt),
- *     AV_OPT_TYPE_STRING },
- *   { "test_bin", "This is a test option of binary type.", offsetof(test_struct, bin_opt),
- *     AV_OPT_TYPE_BINARY },
- *   { NULL },
- * };
- *
- * static const AVClass test_class = {
- *     .class_name = "test class",
- *     .item_name  = av_default_item_name,
- *     .option     = options,
- *     .version    = LIBAVUTIL_VERSION_INT,
- * };
- * @endcode
- *
- * Next, when allocating your struct, you must ensure that the AVClass pointer
- * is set to the correct value. Then, av_opt_set_defaults() must be called to
- * initialize defaults. After that the struct is ready to be used with the
- * AVOptions API.
- *
- * When cleaning up, you may use the av_opt_free() function to automatically
- * free all the allocated string and binary options.
- *
- * Continuing with the above example:
- *
- * @code
- * test_struct *alloc_test_struct(void)
- * {
- *     test_struct *ret = av_malloc(sizeof(*ret));
- *     ret->class = &test_class;
- *     av_opt_set_defaults(ret);
- *     return ret;
- * }
- * void free_test_struct(test_struct **foo)
- * {
- *     av_opt_free(*foo);
- *     av_freep(foo);
- * }
- * @endcode
- *
- * @subsection avoptions_implement_nesting Nesting
- *      It may happen that an AVOptions-enabled struct contains another
- *      AVOptions-enabled struct as a member (e.g. AVCodecContext in
- *      libavcodec exports generic options, while its priv_data field exports
- *      codec-specific options). In such a case, it is possible to set up the
- *      parent struct to export a child's options. To do that, simply
- *      implement AVClass.child_next() and AVClass.child_class_next() in the
- *      parent struct's AVClass.
- *      Assuming that the test_struct from above now also contains a
- *      child_struct field:
- *
- *      @code
- *      typedef struct child_struct {
- *          AVClass *class;
- *          int flags_opt;
- *      } child_struct;
- *      static const AVOption child_opts[] = {
- *          { "test_flags", "This is a test option of flags type.",
- *            offsetof(child_struct, flags_opt), AV_OPT_TYPE_FLAGS, { 0 }, INT_MIN, INT_MAX },
- *          { NULL },
- *      };
- *      static const AVClass child_class = {
- *          .class_name = "child class",
- *          .item_name  = av_default_item_name,
- *          .option     = child_opts,
- *          .version    = LIBAVUTIL_VERSION_INT,
- *      };
- *
- *      void *child_next(void *obj, void *prev)
- *      {
- *          test_struct *t = obj;
- *          if (!prev && t->child_struct)
- *              return t->child_struct;
- *          return NULL
- *      }
- *      const AVClass child_class_next(const AVClass *prev)
- *      {
- *          return prev ? NULL : &child_class;
- *      }
- *      @endcode
- *      Putting child_next() and child_class_next() as defined above into
- *      test_class will now make child_struct's options accessible through
- *      test_struct (again, proper setup as described above needs to be done on
- *      child_struct right after it is created).
- *
- *      From the above example it might not be clear why both child_next()
- *      and child_class_next() are needed. The distinction is that child_next()
- *      iterates over actually existing objects, while child_class_next()
- *      iterates over all possible child classes. E.g. if an AVCodecContext
- *      was initialized to use a codec which has private options, then its
- *      child_next() will return AVCodecContext.priv_data and finish
- *      iterating. OTOH child_class_next() on AVCodecContext.av_class will
- *      iterate over all available codecs with private options.
- *
- * @subsection avoptions_implement_named_constants Named constants
- *      It is possible to create named constants for options. Simply set the unit
- *      field of the option the constants should apply to to a string and
- *      create the constants themselves as options of type AV_OPT_TYPE_CONST
- *      with their unit field set to the same string.
- *      Their default_val field should contain the value of the named
- *      constant.
- *      For example, to add some named constants for the test_flags option
- *      above, put the following into the child_opts array:
- *      @code
- *      { "test_flags", "This is a test option of flags type.",
- *        offsetof(child_struct, flags_opt), AV_OPT_TYPE_FLAGS, { 0 }, INT_MIN, INT_MAX, "test_unit" },
- *      { "flag1", "This is a flag with value 16", 0, AV_OPT_TYPE_CONST, { 16 }, 0, 0, "test_unit" },
- *      @endcode
- *
- * @section avoptions_use Using AVOptions
- * This section deals with accessing options in an AVOptions-enabled struct.
- * Such structs in Libav are e.g. AVCodecContext in libavcodec or
- * AVFormatContext in libavformat.
- *
- * @subsection avoptions_use_examine Examining AVOptions
- * The basic functions for examining options are av_opt_next(), which iterates
- * over all options defined for one object, and av_opt_find(), which searches
- * for an option with the given name.
- *
- * The situation is more complicated with nesting. An AVOptions-enabled struct
- * may have AVOptions-enabled children. Passing the AV_OPT_SEARCH_CHILDREN flag
- * to av_opt_find() will make the function search children recursively.
- *
- * For enumerating there are basically two cases. The first is when you want to
- * get all options that may potentially exist on the struct and its children
- * (e.g.  when constructing documentation). In that case you should call
- * av_opt_child_class_next() recursively on the parent struct's AVClass.  The
- * second case is when you have an already initialized struct with all its
- * children and you want to get all options that can be actually written or read
- * from it. In that case you should call av_opt_child_next() recursively (and
- * av_opt_next() on each result).
- *
- * @subsection avoptions_use_get_set Reading and writing AVOptions
- * When setting options, you often have a string read directly from the
- * user. In such a case, simply passing it to av_opt_set() is enough. For
- * non-string type options, av_opt_set() will parse the string according to the
- * option type.
- *
- * Similarly av_opt_get() will read any option type and convert it to a string
- * which will be returned. Do not forget that the string is allocated, so you
- * have to free it with av_free().
- *
- * In some cases it may be more convenient to put all options into an
- * AVDictionary and call av_opt_set_dict() on it. A specific case of this
- * are the format/codec open functions in lavf/lavc which take a dictionary
- * filled with option as a parameter. This allows to set some options
- * that cannot be set otherwise, since e.g. the input file format is not known
- * before the file is actually opened.
- */
-
-enum AVOptionType{
-    AV_OPT_TYPE_FLAGS,
-    AV_OPT_TYPE_INT,
-    AV_OPT_TYPE_INT64,
-    AV_OPT_TYPE_DOUBLE,
-    AV_OPT_TYPE_FLOAT,
-    AV_OPT_TYPE_STRING,
-    AV_OPT_TYPE_RATIONAL,
-    AV_OPT_TYPE_BINARY,  ///< offset must point to a pointer immediately followed by an int for the length
-    AV_OPT_TYPE_CONST = 128,
-#if FF_API_OLD_AVOPTIONS
-    FF_OPT_TYPE_FLAGS = 0,
-    FF_OPT_TYPE_INT,
-    FF_OPT_TYPE_INT64,
-    FF_OPT_TYPE_DOUBLE,
-    FF_OPT_TYPE_FLOAT,
-    FF_OPT_TYPE_STRING,
-    FF_OPT_TYPE_RATIONAL,
-    FF_OPT_TYPE_BINARY,  ///< offset must point to a pointer immediately followed by an int for the length
-    FF_OPT_TYPE_CONST=128,
-#endif
-};
-
-/**
- * AVOption
- */
-typedef struct AVOption {
-    const char *name;
-
-    /**
-     * short English help text
-     * @todo What about other languages?
-     */
-    const char *help;
-
-    /**
-     * The offset relative to the context structure where the option
-     * value is stored. It should be 0 for named constants.
-     */
-    int offset;
-    enum AVOptionType type;
-
-    /**
-     * the default value for scalar options
-     */
-    union {
-        double dbl;
-        const char *str;
-        /* TODO those are unused now */
-        int64_t i64;
-        AVRational q;
-    } default_val;
-    double min;                 ///< minimum valid value for the option
-    double max;                 ///< maximum valid value for the option
-
-    int flags;
-#define AV_OPT_FLAG_ENCODING_PARAM  1   ///< a generic parameter which can be set by the user for muxing or encoding
-#define AV_OPT_FLAG_DECODING_PARAM  2   ///< a generic parameter which can be set by the user for demuxing or decoding
-#define AV_OPT_FLAG_METADATA        4   ///< some data extracted or inserted into the file like title, comment, ...
-#define AV_OPT_FLAG_AUDIO_PARAM     8
-#define AV_OPT_FLAG_VIDEO_PARAM     16
-#define AV_OPT_FLAG_SUBTITLE_PARAM  32
-//FIXME think about enc-audio, ... style flags
-
-    /**
-     * The logical unit to which the option belongs. Non-constant
-     * options and corresponding named constants share the same
-     * unit. May be NULL.
-     */
-    const char *unit;
-} AVOption;
-
-#if FF_API_FIND_OPT
-/**
- * Look for an option in obj. Look only for the options which
- * have the flags set as specified in mask and flags (that is,
- * for which it is the case that opt->flags & mask == flags).
- *
- * @param[in] obj a pointer to a struct whose first element is a
- * pointer to an AVClass
- * @param[in] name the name of the option to look for
- * @param[in] unit the unit of the option to look for, or any if NULL
- * @return a pointer to the option found, or NULL if no option
- * has been found
- *
- * @deprecated use av_opt_find.
- */
-attribute_deprecated
-const AVOption *av_find_opt(void *obj, const char *name, const char *unit, int mask, int flags);
-#endif
-
-#if FF_API_OLD_AVOPTIONS
-/**
- * Set the field of obj with the given name to value.
- *
- * @param[in] obj A struct whose first element is a pointer to an
- * AVClass.
- * @param[in] name the name of the field to set
- * @param[in] val The value to set. If the field is not of a string
- * type, then the given string is parsed.
- * SI postfixes and some named scalars are supported.
- * If the field is of a numeric type, it has to be a numeric or named
- * scalar. Behavior with more than one scalar and +- infix operators
- * is undefined.
- * If the field is of a flags type, it has to be a sequence of numeric
- * scalars or named flags separated by '+' or '-'. Prefixing a flag
- * with '+' causes it to be set without affecting the other flags;
- * similarly, '-' unsets a flag.
- * @param[out] o_out if non-NULL put here a pointer to the AVOption
- * found
- * @param alloc this parameter is currently ignored
- * @return 0 if the value has been set, or an AVERROR code in case of
- * error:
- * AVERROR_OPTION_NOT_FOUND if no matching option exists
- * AVERROR(ERANGE) if the value is out of range
- * AVERROR(EINVAL) if the value is not valid
- * @deprecated use av_opt_set()
- */
-attribute_deprecated
-int av_set_string3(void *obj, const char *name, const char *val, int alloc, const AVOption **o_out);
-
-attribute_deprecated const AVOption *av_set_double(void *obj, const char *name, double n);
-attribute_deprecated const AVOption *av_set_q(void *obj, const char *name, AVRational n);
-attribute_deprecated const AVOption *av_set_int(void *obj, const char *name, int64_t n);
-
-attribute_deprecated double av_get_double(void *obj, const char *name, const AVOption **o_out);
-attribute_deprecated AVRational av_get_q(void *obj, const char *name, const AVOption **o_out);
-attribute_deprecated int64_t av_get_int(void *obj, const char *name, const AVOption **o_out);
-attribute_deprecated const char *av_get_string(void *obj, const char *name, const AVOption **o_out, char *buf, int buf_len);
-attribute_deprecated const AVOption *av_next_option(void *obj, const AVOption *last);
-#endif
-
-/**
- * Show the obj options.
- *
- * @param req_flags requested flags for the options to show. Show only the
- * options for which it is opt->flags & req_flags.
- * @param rej_flags rejected flags for the options to show. Show only the
- * options for which it is !(opt->flags & req_flags).
- * @param av_log_obj log context to use for showing the options
- */
-int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags);
-
-/**
- * Set the values of all AVOption fields to their default values.
- *
- * @param s an AVOption-enabled struct (its first member must be a pointer to AVClass)
- */
-void av_opt_set_defaults(void *s);
-
-#if FF_API_OLD_AVOPTIONS
-attribute_deprecated
-void av_opt_set_defaults2(void *s, int mask, int flags);
-#endif
-
-/**
- * Parse the key/value pairs list in opts. For each key/value pair
- * found, stores the value in the field in ctx that is named like the
- * key. ctx must be an AVClass context, storing is done using
- * AVOptions.
- *
- * @param key_val_sep a 0-terminated list of characters used to
- * separate key from value
- * @param pairs_sep a 0-terminated list of characters used to separate
- * two pairs from each other
- * @return the number of successfully set key/value pairs, or a negative
- * value corresponding to an AVERROR code in case of error:
- * AVERROR(EINVAL) if opts cannot be parsed,
- * the error code issued by av_set_string3() if a key/value pair
- * cannot be set
- */
-int av_set_options_string(void *ctx, const char *opts,
-                          const char *key_val_sep, const char *pairs_sep);
-
-/**
- * Free all string and binary options in obj.
- */
-void av_opt_free(void *obj);
-
-/**
- * Check whether a particular flag is set in a flags field.
- *
- * @param field_name the name of the flag field option
- * @param flag_name the name of the flag to check
- * @return non-zero if the flag is set, zero if the flag isn't set,
- *         isn't of the right type, or the flags field doesn't exist.
- */
-int av_opt_flag_is_set(void *obj, const char *field_name, const char *flag_name);
-
-/*
- * Set all the options from a given dictionary on an object.
- *
- * @param obj a struct whose first element is a pointer to AVClass
- * @param options options to process. This dictionary will be freed and replaced
- *                by a new one containing all options not found in obj.
- *                Of course this new dictionary needs to be freed by caller
- *                with av_dict_free().
- *
- * @return 0 on success, a negative AVERROR if some option was found in obj,
- *         but could not be set.
- *
- * @see av_dict_copy()
- */
-int av_opt_set_dict(void *obj, struct AVDictionary **options);
-
-/**
- * @defgroup opt_eval_funcs Evaluating option strings
- * @{
- * This group of functions can be used to evaluate option strings
- * and get numbers out of them. They do the same thing as av_opt_set(),
- * except the result is written into the caller-supplied pointer.
- *
- * @param obj a struct whose first element is a pointer to AVClass.
- * @param o an option for which the string is to be evaluated.
- * @param val string to be evaluated.
- * @param *_out value of the string will be written here.
- *
- * @return 0 on success, a negative number on failure.
- */
-int av_opt_eval_flags (void *obj, const AVOption *o, const char *val, int        *flags_out);
-int av_opt_eval_int   (void *obj, const AVOption *o, const char *val, int        *int_out);
-int av_opt_eval_int64 (void *obj, const AVOption *o, const char *val, int64_t    *int64_out);
-int av_opt_eval_float (void *obj, const AVOption *o, const char *val, float      *float_out);
-int av_opt_eval_double(void *obj, const AVOption *o, const char *val, double     *double_out);
-int av_opt_eval_q     (void *obj, const AVOption *o, const char *val, AVRational *q_out);
-/**
- * @}
- */
-
-#define AV_OPT_SEARCH_CHILDREN   0x0001 /**< Search in possible children of the
-                                             given object first. */
-/**
- *  The obj passed to av_opt_find() is fake -- only a double pointer to AVClass
- *  instead of a required pointer to a struct containing AVClass. This is
- *  useful for searching for options without needing to allocate the corresponding
- *  object.
- */
-#define AV_OPT_SEARCH_FAKE_OBJ   0x0002
-
-/**
- * Look for an option in an object. Consider only options which
- * have all the specified flags set.
- *
- * @param[in] obj A pointer to a struct whose first element is a
- *                pointer to an AVClass.
- *                Alternatively a double pointer to an AVClass, if
- *                AV_OPT_SEARCH_FAKE_OBJ search flag is set.
- * @param[in] name The name of the option to look for.
- * @param[in] unit When searching for named constants, name of the unit
- *                 it belongs to.
- * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG).
- * @param search_flags A combination of AV_OPT_SEARCH_*.
- *
- * @return A pointer to the option found, or NULL if no option
- *         was found.
- *
- * @note Options found with AV_OPT_SEARCH_CHILDREN flag may not be settable
- * directly with av_set_string3(). Use special calls which take an options
- * AVDictionary (e.g. avformat_open_input()) to set options found with this
- * flag.
- */
-const AVOption *av_opt_find(void *obj, const char *name, const char *unit,
-                            int opt_flags, int search_flags);
-
-/**
- * Look for an option in an object. Consider only options which
- * have all the specified flags set.
- *
- * @param[in] obj A pointer to a struct whose first element is a
- *                pointer to an AVClass.
- *                Alternatively a double pointer to an AVClass, if
- *                AV_OPT_SEARCH_FAKE_OBJ search flag is set.
- * @param[in] name The name of the option to look for.
- * @param[in] unit When searching for named constants, name of the unit
- *                 it belongs to.
- * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG).
- * @param search_flags A combination of AV_OPT_SEARCH_*.
- * @param[out] target_obj if non-NULL, an object to which the option belongs will be
- * written here. It may be different from obj if AV_OPT_SEARCH_CHILDREN is present
- * in search_flags. This parameter is ignored if search_flags contain
- * AV_OPT_SEARCH_FAKE_OBJ.
- *
- * @return A pointer to the option found, or NULL if no option
- *         was found.
- */
-const AVOption *av_opt_find2(void *obj, const char *name, const char *unit,
-                             int opt_flags, int search_flags, void **target_obj);
-
-/**
- * Iterate over all AVOptions belonging to obj.
- *
- * @param obj an AVOptions-enabled struct or a double pointer to an
- *            AVClass describing it.
- * @param prev result of the previous call to av_opt_next() on this object
- *             or NULL
- * @return next AVOption or NULL
- */
-const AVOption *av_opt_next(void *obj, const AVOption *prev);
-
-/**
- * Iterate over AVOptions-enabled children of obj.
- *
- * @param prev result of a previous call to this function or NULL
- * @return next AVOptions-enabled child or NULL
- */
-void *av_opt_child_next(void *obj, void *prev);
-
-/**
- * Iterate over potential AVOptions-enabled children of parent.
- *
- * @param prev result of a previous call to this function or NULL
- * @return AVClass corresponding to next potential child or NULL
- */
-const AVClass *av_opt_child_class_next(const AVClass *parent, const AVClass *prev);
-
-/**
- * @defgroup opt_set_funcs Option setting functions
- * @{
- * Those functions set the field of obj with the given name to value.
- *
- * @param[in] obj A struct whose first element is a pointer to an AVClass.
- * @param[in] name the name of the field to set
- * @param[in] val The value to set. In case of av_opt_set() if the field is not
- * of a string type, then the given string is parsed.
- * SI postfixes and some named scalars are supported.
- * If the field is of a numeric type, it has to be a numeric or named
- * scalar. Behavior with more than one scalar and +- infix operators
- * is undefined.
- * If the field is of a flags type, it has to be a sequence of numeric
- * scalars or named flags separated by '+' or '-'. Prefixing a flag
- * with '+' causes it to be set without affecting the other flags;
- * similarly, '-' unsets a flag.
- * @param search_flags flags passed to av_opt_find2. I.e. if AV_OPT_SEARCH_CHILDREN
- * is passed here, then the option may be set on a child of obj.
- *
- * @return 0 if the value has been set, or an AVERROR code in case of
- * error:
- * AVERROR_OPTION_NOT_FOUND if no matching option exists
- * AVERROR(ERANGE) if the value is out of range
- * AVERROR(EINVAL) if the value is not valid
- */
-int av_opt_set       (void *obj, const char *name, const char *val, int search_flags);
-int av_opt_set_int   (void *obj, const char *name, int64_t     val, int search_flags);
-int av_opt_set_double(void *obj, const char *name, double      val, int search_flags);
-int av_opt_set_q     (void *obj, const char *name, AVRational  val, int search_flags);
-/**
- * @}
- */
-
-/**
- * @defgroup opt_get_funcs Option getting functions
- * @{
- * Those functions get a value of the option with the given name from an object.
- *
- * @param[in] obj a struct whose first element is a pointer to an AVClass.
- * @param[in] name name of the option to get.
- * @param[in] search_flags flags passed to av_opt_find2. I.e. if AV_OPT_SEARCH_CHILDREN
- * is passed here, then the option may be found in a child of obj.
- * @param[out] out_val value of the option will be written here
- * @return 0 on success, a negative error code otherwise
- */
-/**
- * @note the returned string will av_malloc()ed and must be av_free()ed by the caller
- */
-int av_opt_get       (void *obj, const char *name, int search_flags, uint8_t   **out_val);
-int av_opt_get_int   (void *obj, const char *name, int search_flags, int64_t    *out_val);
-int av_opt_get_double(void *obj, const char *name, int search_flags, double     *out_val);
-int av_opt_get_q     (void *obj, const char *name, int search_flags, AVRational *out_val);
-/**
- * @}
- * @}
- */
-
-#endif /* AVUTIL_OPT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/parseutils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/parseutils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/parseutils.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/parseutils.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,124 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_PARSEUTILS_H
-#define AVUTIL_PARSEUTILS_H
-
-#include <time.h>
-
-#include "rational.h"
-
-/**
- * @file
- * misc parsing utilities
- */
-
-/**
- * Parse str and put in width_ptr and height_ptr the detected values.
- *
- * @param[in,out] width_ptr pointer to the variable which will contain the detected
- * width value
- * @param[in,out] height_ptr pointer to the variable which will contain the detected
- * height value
- * @param[in] str the string to parse: it has to be a string in the format
- * width x height or a valid video size abbreviation.
- * @return >= 0 on success, a negative error code otherwise
- */
-int av_parse_video_size(int *width_ptr, int *height_ptr, const char *str);
-
-/**
- * Parse str and store the detected values in *rate.
- *
- * @param[in,out] rate pointer to the AVRational which will contain the detected
- * frame rate
- * @param[in] str the string to parse: it has to be a string in the format
- * rate_num / rate_den, a float number or a valid video rate abbreviation
- * @return >= 0 on success, a negative error code otherwise
- */
-int av_parse_video_rate(AVRational *rate, const char *str);
-
-/**
- * Put the RGBA values that correspond to color_string in rgba_color.
- *
- * @param color_string a string specifying a color. It can be the name of
- * a color (case insensitive match) or a [0x|#]RRGGBB[AA] sequence,
- * possibly followed by "@" and a string representing the alpha
- * component.
- * The alpha component may be a string composed by "0x" followed by an
- * hexadecimal number or a decimal number between 0.0 and 1.0, which
- * represents the opacity value (0x00/0.0 means completely transparent,
- * 0xff/1.0 completely opaque).
- * If the alpha component is not specified then 0xff is assumed.
- * The string "random" will result in a random color.
- * @param slen length of the initial part of color_string containing the
- * color. It can be set to -1 if color_string is a null terminated string
- * containing nothing else than the color.
- * @return >= 0 in case of success, a negative value in case of
- * failure (for example if color_string cannot be parsed).
- */
-int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen,
-                   void *log_ctx);
-
-/**
- * Parse timestr and return in *time a corresponding number of
- * microseconds.
- *
- * @param timeval puts here the number of microseconds corresponding
- * to the string in timestr. If the string represents a duration, it
- * is the number of microseconds contained in the time interval.  If
- * the string is a date, is the number of microseconds since 1st of
- * January, 1970 up to the time of the parsed date.  If timestr cannot
- * be successfully parsed, set *time to INT64_MIN.
-
- * @param timestr a string representing a date or a duration.
- * - If a date the syntax is:
- * @code
- * [{YYYY-MM-DD|YYYYMMDD}[T|t| ]]{{HH[:MM[:SS[.m...]]]}|{HH[MM[SS[.m...]]]}}[Z]
- * now
- * @endcode
- * If the value is "now" it takes the current time.
- * Time is local time unless Z is appended, in which case it is
- * interpreted as UTC.
- * If the year-month-day part is not specified it takes the current
- * year-month-day.
- * - If a duration the syntax is:
- * @code
- * [-]HH[:MM[:SS[.m...]]]
- * [-]S+[.m...]
- * @endcode
- * @param duration flag which tells how to interpret timestr, if not
- * zero timestr is interpreted as a duration, otherwise as a date
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code otherwise
- */
-int av_parse_time(int64_t *timeval, const char *timestr, int duration);
-
-/**
- * Attempt to find a specific tag in a URL.
- *
- * syntax: '?tag1=val1&tag2=val2...'. Little URL decoding is done.
- * Return 1 if found.
- */
-int av_find_info_tag(char *arg, int arg_size, const char *tag1, const char *info);
-
-/**
- * Convert the decomposed UTC time in tm to a time_t value.
- */
-time_t av_timegm(struct tm *tm);
-
-#endif /* AVUTIL_PARSEUTILS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/pixdesc.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/pixdesc.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/pixdesc.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/pixdesc.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,177 +0,0 @@
-/*
- * pixel format descriptor
- * Copyright (c) 2009 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_PIXDESC_H
-#define AVUTIL_PIXDESC_H
-
-#include <inttypes.h>
-#include "pixfmt.h"
-
-typedef struct AVComponentDescriptor{
-    uint16_t plane        :2;            ///< which of the 4 planes contains the component
-
-    /**
-     * Number of elements between 2 horizontally consecutive pixels minus 1.
-     * Elements are bits for bitstream formats, bytes otherwise.
-     */
-    uint16_t step_minus1  :3;
-
-    /**
-     * Number of elements before the component of the first pixel plus 1.
-     * Elements are bits for bitstream formats, bytes otherwise.
-     */
-    uint16_t offset_plus1 :3;
-    uint16_t shift        :3;            ///< number of least significant bits that must be shifted away to get the value
-    uint16_t depth_minus1 :4;            ///< number of bits in the component minus 1
-}AVComponentDescriptor;
-
-/**
- * Descriptor that unambiguously describes how the bits of a pixel are
- * stored in the up to 4 data planes of an image. It also stores the
- * subsampling factors and number of components.
- *
- * @note This is separate of the colorspace (RGB, YCbCr, YPbPr, JPEG-style YUV
- *       and all the YUV variants) AVPixFmtDescriptor just stores how values
- *       are stored not what these values represent.
- */
-typedef struct AVPixFmtDescriptor{
-    const char *name;
-    uint8_t nb_components;      ///< The number of components each pixel has, (1-4)
-
-    /**
-     * Amount to shift the luma width right to find the chroma width.
-     * For YV12 this is 1 for example.
-     * chroma_width = -((-luma_width) >> log2_chroma_w)
-     * The note above is needed to ensure rounding up.
-     * This value only refers to the chroma components.
-     */
-    uint8_t log2_chroma_w;      ///< chroma_width = -((-luma_width )>>log2_chroma_w)
-
-    /**
-     * Amount to shift the luma height right to find the chroma height.
-     * For YV12 this is 1 for example.
-     * chroma_height= -((-luma_height) >> log2_chroma_h)
-     * The note above is needed to ensure rounding up.
-     * This value only refers to the chroma components.
-     */
-    uint8_t log2_chroma_h;
-    uint8_t flags;
-
-    /**
-     * Parameters that describe how pixels are packed. If the format
-     * has chroma components, they must be stored in comp[1] and
-     * comp[2].
-     */
-    AVComponentDescriptor comp[4];
-}AVPixFmtDescriptor;
-
-#define PIX_FMT_BE        1 ///< Pixel format is big-endian.
-#define PIX_FMT_PAL       2 ///< Pixel format has a palette in data[1], values are indexes in this palette.
-#define PIX_FMT_BITSTREAM 4 ///< All values of a component are bit-wise packed end to end.
-#define PIX_FMT_HWACCEL   8 ///< Pixel format is an HW accelerated format.
-#define PIX_FMT_PLANAR   16 ///< At least one pixel component is not in the first data plane
-#define PIX_FMT_RGB      32 ///< The pixel format contains RGB-like data (as opposed to YUV/grayscale)
-
-/**
- * The array of all the pixel format descriptors.
- */
-extern const AVPixFmtDescriptor av_pix_fmt_descriptors[];
-
-/**
- * Read a line from an image, and write the values of the
- * pixel format component c to dst.
- *
- * @param data the array containing the pointers to the planes of the image
- * @param linesize the array containing the linesizes of the image
- * @param desc the pixel format descriptor for the image
- * @param x the horizontal coordinate of the first pixel to read
- * @param y the vertical coordinate of the first pixel to read
- * @param w the width of the line to read, that is the number of
- * values to write to dst
- * @param read_pal_component if not zero and the format is a paletted
- * format writes the values corresponding to the palette
- * component c in data[1] to dst, rather than the palette indexes in
- * data[0]. The behavior is undefined if the format is not paletted.
- */
-void av_read_image_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4],
-                        const AVPixFmtDescriptor *desc, int x, int y, int c, int w, int read_pal_component);
-
-/**
- * Write the values from src to the pixel format component c of an
- * image line.
- *
- * @param src array containing the values to write
- * @param data the array containing the pointers to the planes of the
- * image to write into. It is supposed to be zeroed.
- * @param linesize the array containing the linesizes of the image
- * @param desc the pixel format descriptor for the image
- * @param x the horizontal coordinate of the first pixel to write
- * @param y the vertical coordinate of the first pixel to write
- * @param w the width of the line to write, that is the number of
- * values to write to the image line
- */
-void av_write_image_line(const uint16_t *src, uint8_t *data[4], const int linesize[4],
-                         const AVPixFmtDescriptor *desc, int x, int y, int c, int w);
-
-/**
- * Return the pixel format corresponding to name.
- *
- * If there is no pixel format with name name, then looks for a
- * pixel format with the name corresponding to the native endian
- * format of name.
- * For example in a little-endian system, first looks for "gray16",
- * then for "gray16le".
- *
- * Finally if no pixel format has been found, returns PIX_FMT_NONE.
- */
-enum PixelFormat av_get_pix_fmt(const char *name);
-
-/**
- * Return the short name for a pixel format, NULL in case pix_fmt is
- * unknown.
- *
- * @see av_get_pix_fmt(), av_get_pix_fmt_string()
- */
-const char *av_get_pix_fmt_name(enum PixelFormat pix_fmt);
-
-/**
- * Print in buf the string corresponding to the pixel format with
- * number pix_fmt, or an header if pix_fmt is negative.
- *
- * @param buf the buffer where to write the string
- * @param buf_size the size of buf
- * @param pix_fmt the number of the pixel format to print the
- * corresponding info string, or a negative value to print the
- * corresponding header.
- */
-char *av_get_pix_fmt_string (char *buf, int buf_size, enum PixelFormat pix_fmt);
-
-/**
- * Return the number of bits per pixel used by the pixel format
- * described by pixdesc.
- *
- * The returned number of bits refers to the number of bits actually
- * used for storing the pixel information, that is padding bits are
- * not counted.
- */
-int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc);
-
-#endif /* AVUTIL_PIXDESC_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/pixfmt.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/pixfmt.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/pixfmt.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/pixfmt.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,198 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_PIXFMT_H
-#define AVUTIL_PIXFMT_H
-
-/**
- * @file
- * pixel format definitions
- *
- */
-
-#include "libavutil/avconfig.h"
-
-/**
- * Pixel format.
- *
- * @note
- * PIX_FMT_RGB32 is handled in an endian-specific manner. An RGBA
- * color is put together as:
- *  (A << 24) | (R << 16) | (G << 8) | B
- * This is stored as BGRA on little-endian CPU architectures and ARGB on
- * big-endian CPUs.
- *
- * @par
- * When the pixel format is palettized RGB (PIX_FMT_PAL8), the palettized
- * image data is stored in AVFrame.data[0]. The palette is transported in
- * AVFrame.data[1], is 1024 bytes long (256 4-byte entries) and is
- * formatted the same as in PIX_FMT_RGB32 described above (i.e., it is
- * also endian-specific). Note also that the individual RGB palette
- * components stored in AVFrame.data[1] should be in the range 0..255.
- * This is important as many custom PAL8 video codecs that were designed
- * to run on the IBM VGA graphics adapter use 6-bit palette components.
- *
- * @par
- * For all the 8bit per pixel formats, an RGB32 palette is in data[1] like
- * for pal8. This palette is filled in automatically by the function
- * allocating the picture.
- *
- * @note
- * make sure that all newly added big endian formats have pix_fmt&1==1
- * and that all newly added little endian formats have pix_fmt&1==0
- * this allows simpler detection of big vs little endian.
- */
-enum PixelFormat {
-    PIX_FMT_NONE= -1,
-    PIX_FMT_YUV420P,   ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
-    PIX_FMT_YUYV422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
-    PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
-    PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
-    PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
-    PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
-    PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
-    PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
-    PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
-    PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
-    PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
-    PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
-    PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
-    PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
-    PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
-    PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
-    PIX_FMT_XVMC_MPEG2_IDCT,
-    PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
-    PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
-    PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
-    PIX_FMT_BGR4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
-    PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
-    PIX_FMT_RGB8,      ///< packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
-    PIX_FMT_RGB4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
-    PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
-    PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
-    PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
-
-    PIX_FMT_ARGB,      ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
-    PIX_FMT_RGBA,      ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
-    PIX_FMT_ABGR,      ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
-    PIX_FMT_BGRA,      ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
-
-    PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
-    PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
-    PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
-    PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
-    PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
-    PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
-    PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
-
-    PIX_FMT_RGB565BE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian
-    PIX_FMT_RGB565LE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), little-endian
-    PIX_FMT_RGB555BE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
-    PIX_FMT_RGB555LE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
-
-    PIX_FMT_BGR565BE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), big-endian
-    PIX_FMT_BGR565LE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), little-endian
-    PIX_FMT_BGR555BE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
-    PIX_FMT_BGR555LE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
-
-    PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
-    PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
-    PIX_FMT_VAAPI_VLD,  ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-
-    PIX_FMT_YUV420P16LE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV420P16BE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV422P16LE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_VDPAU_MPEG4,  ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
-
-    PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
-    PIX_FMT_RGB444BE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
-    PIX_FMT_BGR444LE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
-    PIX_FMT_BGR444BE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
-    PIX_FMT_Y400A,     ///< 8bit gray, 8bit alpha
-    PIX_FMT_BGR48BE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
-    PIX_FMT_BGR48LE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
-    PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_VDA_VLD,    ///< hardware decoding through VDA
-    PIX_FMT_GBRP,      ///< planar GBR 4:4:4 24bpp
-    PIX_FMT_GBRP9BE,   ///< planar GBR 4:4:4 27bpp, big endian
-    PIX_FMT_GBRP9LE,   ///< planar GBR 4:4:4 27bpp, little endian
-    PIX_FMT_GBRP10BE,  ///< planar GBR 4:4:4 30bpp, big endian
-    PIX_FMT_GBRP10LE,  ///< planar GBR 4:4:4 30bpp, little endian
-    PIX_FMT_GBRP16BE,  ///< planar GBR 4:4:4 48bpp, big endian
-    PIX_FMT_GBRP16LE,  ///< planar GBR 4:4:4 48bpp, little endian
-    PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
-};
-
-#if AV_HAVE_BIGENDIAN
-#   define PIX_FMT_NE(be, le) PIX_FMT_##be
-#else
-#   define PIX_FMT_NE(be, le) PIX_FMT_##le
-#endif
-
-#define PIX_FMT_RGB32   PIX_FMT_NE(ARGB, BGRA)
-#define PIX_FMT_RGB32_1 PIX_FMT_NE(RGBA, ABGR)
-#define PIX_FMT_BGR32   PIX_FMT_NE(ABGR, RGBA)
-#define PIX_FMT_BGR32_1 PIX_FMT_NE(BGRA, ARGB)
-
-#define PIX_FMT_GRAY16 PIX_FMT_NE(GRAY16BE, GRAY16LE)
-#define PIX_FMT_RGB48  PIX_FMT_NE(RGB48BE,  RGB48LE)
-#define PIX_FMT_RGB565 PIX_FMT_NE(RGB565BE, RGB565LE)
-#define PIX_FMT_RGB555 PIX_FMT_NE(RGB555BE, RGB555LE)
-#define PIX_FMT_RGB444 PIX_FMT_NE(RGB444BE, RGB444LE)
-#define PIX_FMT_BGR48  PIX_FMT_NE(BGR48BE,  BGR48LE)
-#define PIX_FMT_BGR565 PIX_FMT_NE(BGR565BE, BGR565LE)
-#define PIX_FMT_BGR555 PIX_FMT_NE(BGR555BE, BGR555LE)
-#define PIX_FMT_BGR444 PIX_FMT_NE(BGR444BE, BGR444LE)
-
-#define PIX_FMT_YUV420P9  PIX_FMT_NE(YUV420P9BE , YUV420P9LE)
-#define PIX_FMT_YUV422P9  PIX_FMT_NE(YUV422P9BE , YUV422P9LE)
-#define PIX_FMT_YUV444P9  PIX_FMT_NE(YUV444P9BE , YUV444P9LE)
-#define PIX_FMT_YUV420P10 PIX_FMT_NE(YUV420P10BE, YUV420P10LE)
-#define PIX_FMT_YUV422P10 PIX_FMT_NE(YUV422P10BE, YUV422P10LE)
-#define PIX_FMT_YUV444P10 PIX_FMT_NE(YUV444P10BE, YUV444P10LE)
-#define PIX_FMT_YUV420P16 PIX_FMT_NE(YUV420P16BE, YUV420P16LE)
-#define PIX_FMT_YUV422P16 PIX_FMT_NE(YUV422P16BE, YUV422P16LE)
-#define PIX_FMT_YUV444P16 PIX_FMT_NE(YUV444P16BE, YUV444P16LE)
-
-#define PIX_FMT_GBRP9     PIX_FMT_NE(GBRP9BE ,    GBRP9LE)
-#define PIX_FMT_GBRP10    PIX_FMT_NE(GBRP10BE,    GBRP10LE)
-#define PIX_FMT_GBRP16    PIX_FMT_NE(GBRP16BE,    GBRP16LE)
-
-#endif /* AVUTIL_PIXFMT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/random_seed.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/random_seed.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/random_seed.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/random_seed.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2009 Baptiste Coudurier <baptiste.coudurier@gmail.com>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_RANDOM_SEED_H
-#define AVUTIL_RANDOM_SEED_H
-
-#include <stdint.h>
-/**
- * @addtogroup lavu_crypto
- * @{
- */
-
-/**
- * Get random data.
- *
- * This function can be called repeatedly to generate more random bits
- * as needed. It is generally quite slow, and usually used to seed a
- * PRNG.  As it uses /dev/urandom and /dev/random, the quality of the
- * returned random data depends on the platform.
- */
-uint32_t av_get_random_seed(void);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_RANDOM_SEED_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/rational.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/rational.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/rational.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/rational.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,144 +0,0 @@
-/*
- * rational numbers
- * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * rational numbers
- * @author Michael Niedermayer <michaelni@gmx.at>
- */
-
-#ifndef AVUTIL_RATIONAL_H
-#define AVUTIL_RATIONAL_H
-
-#include <stdint.h>
-#include <limits.h>
-#include "attributes.h"
-
-/**
- * @addtogroup lavu_math
- * @{
- */
-
-/**
- * rational number numerator/denominator
- */
-typedef struct AVRational{
-    int num; ///< numerator
-    int den; ///< denominator
-} AVRational;
-
-/**
- * Compare two rationals.
- * @param a first rational
- * @param b second rational
- * @return 0 if a==b, 1 if a>b, -1 if a<b, and INT_MIN if one of the
- * values is of the form 0/0
- */
-static inline int av_cmp_q(AVRational a, AVRational b){
-    const int64_t tmp= a.num * (int64_t)b.den - b.num * (int64_t)a.den;
-
-    if(tmp) return ((tmp ^ a.den ^ b.den)>>63)|1;
-    else if(b.den && a.den) return 0;
-    else if(a.num && b.num) return (a.num>>31) - (b.num>>31);
-    else                    return INT_MIN;
-}
-
-/**
- * Convert rational to double.
- * @param a rational to convert
- * @return (double) a
- */
-static inline double av_q2d(AVRational a){
-    return a.num / (double) a.den;
-}
-
-/**
- * Reduce a fraction.
- * This is useful for framerate calculations.
- * @param dst_num destination numerator
- * @param dst_den destination denominator
- * @param num source numerator
- * @param den source denominator
- * @param max the maximum allowed for dst_num & dst_den
- * @return 1 if exact, 0 otherwise
- */
-int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max);
-
-/**
- * Multiply two rationals.
- * @param b first rational
- * @param c second rational
- * @return b*c
- */
-AVRational av_mul_q(AVRational b, AVRational c) av_const;
-
-/**
- * Divide one rational by another.
- * @param b first rational
- * @param c second rational
- * @return b/c
- */
-AVRational av_div_q(AVRational b, AVRational c) av_const;
-
-/**
- * Add two rationals.
- * @param b first rational
- * @param c second rational
- * @return b+c
- */
-AVRational av_add_q(AVRational b, AVRational c) av_const;
-
-/**
- * Subtract one rational from another.
- * @param b first rational
- * @param c second rational
- * @return b-c
- */
-AVRational av_sub_q(AVRational b, AVRational c) av_const;
-
-/**
- * Convert a double precision floating point number to a rational.
- * inf is expressed as {1,0} or {-1,0} depending on the sign.
- *
- * @param d double to convert
- * @param max the maximum allowed numerator and denominator
- * @return (AVRational) d
- */
-AVRational av_d2q(double d, int max) av_const;
-
-/**
- * @return 1 if q1 is nearer to q than q2, -1 if q2 is nearer
- * than q1, 0 if they have the same distance.
- */
-int av_nearer_q(AVRational q, AVRational q1, AVRational q2);
-
-/**
- * Find the nearest value in q_list to q.
- * @param q_list an array of rationals terminated by {0, 0}
- * @return the index of the nearest value found in the array
- */
-int av_find_nearest_q_idx(AVRational q, const AVRational* q_list);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_RATIONAL_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/samplefmt.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/samplefmt.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/samplefmt.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/samplefmt.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,148 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_SAMPLEFMT_H
-#define AVUTIL_SAMPLEFMT_H
-
-#include "avutil.h"
-
-/**
- * all in native-endian format
- */
-enum AVSampleFormat {
-    AV_SAMPLE_FMT_NONE = -1,
-    AV_SAMPLE_FMT_U8,          ///< unsigned 8 bits
-    AV_SAMPLE_FMT_S16,         ///< signed 16 bits
-    AV_SAMPLE_FMT_S32,         ///< signed 32 bits
-    AV_SAMPLE_FMT_FLT,         ///< float
-    AV_SAMPLE_FMT_DBL,         ///< double
-
-    AV_SAMPLE_FMT_U8P,         ///< unsigned 8 bits, planar
-    AV_SAMPLE_FMT_S16P,        ///< signed 16 bits, planar
-    AV_SAMPLE_FMT_S32P,        ///< signed 32 bits, planar
-    AV_SAMPLE_FMT_FLTP,        ///< float, planar
-    AV_SAMPLE_FMT_DBLP,        ///< double, planar
-
-    AV_SAMPLE_FMT_NB           ///< Number of sample formats. DO NOT USE if linking dynamically
-};
-
-/**
- * Return the name of sample_fmt, or NULL if sample_fmt is not
- * recognized.
- */
-const char *av_get_sample_fmt_name(enum AVSampleFormat sample_fmt);
-
-/**
- * Return a sample format corresponding to name, or AV_SAMPLE_FMT_NONE
- * on error.
- */
-enum AVSampleFormat av_get_sample_fmt(const char *name);
-
-/**
- * Generate a string corresponding to the sample format with
- * sample_fmt, or a header if sample_fmt is negative.
- *
- * @param buf the buffer where to write the string
- * @param buf_size the size of buf
- * @param sample_fmt the number of the sample format to print the
- * corresponding info string, or a negative value to print the
- * corresponding header.
- * @return the pointer to the filled buffer or NULL if sample_fmt is
- * unknown or in case of other errors
- */
-char *av_get_sample_fmt_string(char *buf, int buf_size, enum AVSampleFormat sample_fmt);
-
-#if FF_API_GET_BITS_PER_SAMPLE_FMT
-/**
- * @deprecated Use av_get_bytes_per_sample() instead.
- */
-attribute_deprecated
-int av_get_bits_per_sample_fmt(enum AVSampleFormat sample_fmt);
-#endif
-
-/**
- * Return number of bytes per sample.
- *
- * @param sample_fmt the sample format
- * @return number of bytes per sample or zero if unknown for the given
- * sample format
- */
-int av_get_bytes_per_sample(enum AVSampleFormat sample_fmt);
-
-/**
- * Check if the sample format is planar.
- *
- * @param sample_fmt the sample format to inspect
- * @return 1 if the sample format is planar, 0 if it is interleaved
- */
-int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt);
-
-/**
- * Get the required buffer size for the given audio parameters.
- *
- * @param[out] linesize calculated linesize, may be NULL
- * @param nb_channels   the number of channels
- * @param nb_samples    the number of samples in a single channel
- * @param sample_fmt    the sample format
- * @return              required buffer size, or negative error code on failure
- */
-int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples,
-                               enum AVSampleFormat sample_fmt, int align);
-
-/**
- * Fill channel data pointers and linesize for samples with sample
- * format sample_fmt.
- *
- * The pointers array is filled with the pointers to the samples data:
- * for planar, set the start point of each channel's data within the buffer,
- * for packed, set the start point of the entire buffer only.
- *
- * The linesize array is filled with the aligned size of each channel's data
- * buffer for planar layout, or the aligned size of the buffer for all channels
- * for packed layout.
- *
- * @param[out] audio_data  array to be filled with the pointer for each channel
- * @param[out] linesize    calculated linesize
- * @param buf              the pointer to a buffer containing the samples
- * @param nb_channels      the number of channels
- * @param nb_samples       the number of samples in a single channel
- * @param sample_fmt       the sample format
- * @param align            buffer size alignment (1 = no alignment required)
- * @return                 0 on success or a negative error code on failure
- */
-int av_samples_fill_arrays(uint8_t **audio_data, int *linesize, uint8_t *buf,
-                           int nb_channels, int nb_samples,
-                           enum AVSampleFormat sample_fmt, int align);
-
-/**
- * Allocate a samples buffer for nb_samples samples, and fill data pointers and
- * linesize accordingly.
- * The allocated samples buffer can be freed by using av_freep(&audio_data[0])
- *
- * @param[out] audio_data  array to be filled with the pointer for each channel
- * @param[out] linesize    aligned size for audio buffer(s)
- * @param nb_channels      number of audio channels
- * @param nb_samples       number of samples per channel
- * @param align            buffer size alignment (1 = no alignment required)
- * @return                 0 on success or a negative error code on failure
- * @see av_samples_fill_arrays()
- */
-int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels,
-                     int nb_samples, enum AVSampleFormat sample_fmt, int align);
-
-#endif /* AVUTIL_SAMPLEFMT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/sha.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/sha.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/sha.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/sha.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_SHA_H
-#define AVUTIL_SHA_H
-
-#include <stdint.h>
-
-/**
- * @defgroup lavu_sha SHA
- * @ingroup lavu_crypto
- * @{
- */
-
-extern const int av_sha_size;
-
-struct AVSHA;
-
-/**
- * Initialize SHA-1 or SHA-2 hashing.
- *
- * @param context pointer to the function context (of size av_sha_size)
- * @param bits    number of bits in digest (SHA-1 - 160 bits, SHA-2 224 or 256 bits)
- * @return        zero if initialization succeeded, -1 otherwise
- */
-int av_sha_init(struct AVSHA* context, int bits);
-
-/**
- * Update hash value.
- *
- * @param context hash function context
- * @param data    input data to update hash with
- * @param len     input data length
- */
-void av_sha_update(struct AVSHA* context, const uint8_t* data, unsigned int len);
-
-/**
- * Finish hashing and output digest value.
- *
- * @param context hash function context
- * @param digest  buffer where output digest value is stored
- */
-void av_sha_final(struct AVSHA* context, uint8_t *digest);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_SHA_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/timecode.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/timecode.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/timecode.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/timecode.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2006 Smartjog S.A.S, Baptiste Coudurier <baptiste.coudurier@gmail.com>
- * Copyright (c) 2011-2012 Smartjog S.A.S, Clément Bœsch <clement.boesch@smartjog.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Timecode helpers header
- */
-
-#ifndef AVUTIL_TIMECODE_H
-#define AVUTIL_TIMECODE_H
-
-#include <stdint.h>
-#include "rational.h"
-
-#define AV_TIMECODE_STR_SIZE 16
-
-enum AVTimecodeFlag {
-    AV_TIMECODE_FLAG_DROPFRAME      = 1<<0, ///< timecode is drop frame
-    AV_TIMECODE_FLAG_24HOURSMAX     = 1<<1, ///< timecode wraps after 24 hours
-    AV_TIMECODE_FLAG_ALLOWNEGATIVE  = 1<<2, ///< negative time values are allowed
-};
-
-typedef struct {
-    int start;          ///< timecode frame start (first base frame number)
-    uint32_t flags;     ///< flags such as drop frame, +24 hours support, ...
-    AVRational rate;    ///< frame rate in rational form
-    unsigned fps;       ///< frame per second; must be consistent with the rate field
-} AVTimecode;
-
-/**
- * Adjust frame number for NTSC drop frame time code.
- *
- * @param framenum frame number to adjust
- * @param fps      frame per second, 30 or 60
- * @return         adjusted frame number
- * @warning        adjustment is only valid in NTSC 29.97 and 59.94
- */
-int av_timecode_adjust_ntsc_framenum2(int framenum, int fps);
-
-/**
- * Convert frame number to SMPTE 12M binary representation.
- *
- * @param tc       timecode data correctly initialized
- * @param framenum frame number
- * @return         the SMPTE binary representation
- *
- * @note Frame number adjustment is automatically done in case of drop timecode,
- *       you do NOT have to call av_timecode_adjust_ntsc_framenum2().
- * @note The frame number is relative to tc->start.
- * @note Color frame (CF), binary group flags (BGF) and biphase mark polarity
- *       correction (PC) bits are set to zero.
- */
-uint32_t av_timecode_get_smpte_from_framenum(const AVTimecode *tc, int framenum);
-
-/**
- * Load timecode string in buf.
- *
- * @param buf      destination buffer, must be at least AV_TIMECODE_STR_SIZE long
- * @param tc       timecode data correctly initialized
- * @param framenum frame number
- * @return         the buf parameter
- *
- * @note Timecode representation can be a negative timecode and have more than
- *       24 hours, but will only be honored if the flags are correctly set.
- * @note The frame number is relative to tc->start.
- */
-char *av_timecode_make_string(const AVTimecode *tc, char *buf, int framenum);
-
-/**
- * Get the timecode string from the SMPTE timecode format.
- *
- * @param buf        destination buffer, must be at least AV_TIMECODE_STR_SIZE long
- * @param tcsmpte    the 32-bit SMPTE timecode
- * @param prevent_df prevent the use of a drop flag when it is known the DF bit
- *                   is arbitrary
- * @return           the buf parameter
- */
-char *av_timecode_make_smpte_tc_string(char *buf, uint32_t tcsmpte, int prevent_df);
-
-/**
- * Get the timecode string from the 25-bit timecode format (MPEG GOP format).
- *
- * @param buf     destination buffer, must be at least AV_TIMECODE_STR_SIZE long
- * @param tc25bit the 25-bits timecode
- * @return        the buf parameter
- */
-char *av_timecode_make_mpeg_tc_string(char *buf, uint32_t tc25bit);
-
-/**
- * Init a timecode struct with the passed parameters.
- *
- * @param log_ctx     a pointer to an arbitrary struct of which the first field
- *                    is a pointer to an AVClass struct (used for av_log)
- * @param tc          pointer to an allocated AVTimecode
- * @param rate        frame rate in rational form
- * @param flags       miscellaneous flags such as drop frame, +24 hours, ...
- *                    (see AVTimecodeFlag)
- * @param frame_start the first frame number
- * @return            0 on success, AVERROR otherwise
- */
-int av_timecode_init(AVTimecode *tc, AVRational rate, int flags, int frame_start, void *log_ctx);
-
-/**
- * Parse timecode representation (hh:mm:ss[:;.]ff).
- *
- * @param log_ctx a pointer to an arbitrary struct of which the first field is a
- *                pointer to an AVClass struct (used for av_log).
- * @param tc      pointer to an allocated AVTimecode
- * @param rate    frame rate in rational form
- * @param str     timecode string which will determine the frame start
- * @return        0 on success, AVERROR otherwise
- */
-int av_timecode_init_from_string(AVTimecode *tc, AVRational rate, const char *str, void *log_ctx);
-
-/**
- * Check if the timecode feature is available for the given frame rate
- *
- * @return 0 if supported, <0 otherwise
- */
-int av_timecode_check_frame_rate(AVRational rate);
-
-#endif /* AVUTIL_TIMECODE_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/time.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/time.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/time.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/time.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2000-2003 Fabrice Bellard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_TIME_H
-#define AVUTIL_TIME_H
-
-#include <stdint.h>
-
-/**
- * Get the current time in microseconds.
- */
-int64_t av_gettime(void);
-
-/**
- * Sleep for a period of time.  Although the duration is expressed in
- * microseconds, the actual delay may be rounded to the precision of the
- * system timer.
- *
- * @param  usec Number of microseconds to sleep.
- * @return zero on success or (negative) error code.
- */
-int av_usleep(unsigned usec);
-
-#endif /* AVUTIL_TIME_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/timestamp.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/timestamp.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/timestamp.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/timestamp.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * timestamp utils, mostly useful for debugging/logging purposes
- */
-
-#ifndef AVUTIL_TIMESTAMP_H
-#define AVUTIL_TIMESTAMP_H
-
-#include "common.h"
-
-#define AV_TS_MAX_STRING_SIZE 32
-
-/**
- * Fill the provided buffer with a string containing a timestamp
- * representation.
- *
- * @param buf a buffer with size in bytes of at least AV_TS_MAX_STRING_SIZE
- * @param ts the timestamp to represent
- * @return the buffer in input
- */
-static inline char *av_ts_make_string(char *buf, int64_t ts)
-{
-    if (ts == AV_NOPTS_VALUE) snprintf(buf, AV_TS_MAX_STRING_SIZE, "NOPTS");
-    else                      snprintf(buf, AV_TS_MAX_STRING_SIZE, "%"PRId64"", ts);
-    return buf;
-}
-
-/**
- * Convenience macro, the return value should be used only directly in
- * function arguments but never stand-alone.
- */
-#define av_ts2str(ts) av_ts_make_string((char[AV_TS_MAX_STRING_SIZE]){0}, ts)
-
-/**
- * Fill the provided buffer with a string containing a timestamp time
- * representation.
- *
- * @param buf a buffer with size in bytes of at least AV_TS_MAX_STRING_SIZE
- * @param ts the timestamp to represent
- * @param tb the timebase of the timestamp
- * @return the buffer in input
- */
-static inline char *av_ts_make_time_string(char *buf, int64_t ts, AVRational *tb)
-{
-    if (ts == AV_NOPTS_VALUE) snprintf(buf, AV_TS_MAX_STRING_SIZE, "NOPTS");
-    else                      snprintf(buf, AV_TS_MAX_STRING_SIZE, "%.6g", av_q2d(*tb) * ts);
-    return buf;
-}
-
-/**
- * Convenience macro, the return value should be used only directly in
- * function arguments but never stand-alone.
- */
-#define av_ts2timestr(ts, tb) av_ts_make_time_string((char[AV_TS_MAX_STRING_SIZE]){0}, ts, tb)
-
-#endif /* AVUTIL_TIMESTAMP_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/version.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/version.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/version.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/version.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,132 +0,0 @@
-/*
- * copyright (c) 2003 Fabrice Bellard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_VERSION_H
-#define AVUTIL_VERSION_H
-
-/**
- * @defgroup preproc_misc Preprocessor String Macros
- *
- * String manipulation macros
- *
- * @{
- */
-
-#define AV_STRINGIFY(s)         AV_TOSTRING(s)
-#define AV_TOSTRING(s) #s
-
-#define AV_GLUE(a, b) a ## b
-#define AV_JOIN(a, b) AV_GLUE(a, b)
-
-#define AV_PRAGMA(s) _Pragma(#s)
-
-/**
- * @}
- */
-
-/**
- * @defgroup version_utils Library Version Macros
- *
- * Useful to check and match library version in order to maintain
- * backward compatibility.
- *
- * @{
- */
-
-#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
-#define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c
-#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
-
-/**
- * @}
- */
-
-
-/**
- * @file
- * @ingroup lavu
- * Libavutil version macros
- */
-
-/**
- * @defgroup lavu_ver Version and Build diagnostics
- *
- * Macros and function useful to check at compiletime and at runtime
- * which version of libavutil is in use.
- *
- * @{
- */
-
-#define LIBAVUTIL_VERSION_MAJOR  52
-#define LIBAVUTIL_VERSION_MINOR   5
-#define LIBAVUTIL_VERSION_MICRO 100
-
-#define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
-                                               LIBAVUTIL_VERSION_MINOR, \
-                                               LIBAVUTIL_VERSION_MICRO)
-#define LIBAVUTIL_VERSION       AV_VERSION(LIBAVUTIL_VERSION_MAJOR,     \
-                                           LIBAVUTIL_VERSION_MINOR,     \
-                                           LIBAVUTIL_VERSION_MICRO)
-#define LIBAVUTIL_BUILD         LIBAVUTIL_VERSION_INT
-
-#define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
-
-/**
- * @}
- *
- * @defgroup depr_guards Deprecation guards
- * FF_API_* defines may be placed below to indicate public API that will be
- * dropped at a future version bump. The defines themselves are not part of
- * the public API and may change, break or disappear at any time.
- *
- * @{
- */
-
-#ifndef FF_API_OLD_EVAL_NAMES
-#define FF_API_OLD_EVAL_NAMES           (LIBAVUTIL_VERSION_MAJOR < 52)
-#endif
-#ifndef FF_API_GET_BITS_PER_SAMPLE_FMT
-#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_FIND_OPT
-#define FF_API_FIND_OPT                 (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_OLD_AVOPTIONS
-#define FF_API_OLD_AVOPTIONS            (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_PIX_FMT
-#define FF_API_PIX_FMT                  (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_CONTEXT_SIZE
-#define FF_API_CONTEXT_SIZE             (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_PIX_FMT_DESC
-#define FF_API_PIX_FMT_DESC             (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_AV_REVERSE
-#define FF_API_AV_REVERSE               (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_VERSION_H */
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/xtea.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/xtea.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/include/libavutil/xtea.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/include/libavutil/xtea.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-/*
- * A 32-bit implementation of the XTEA algorithm
- * Copyright (c) 2012 Samuel Pitoiset
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_XTEA_H
-#define AVUTIL_XTEA_H
-
-#include <stdint.h>
-
-/**
- * @defgroup lavu_xtea XTEA
- * @ingroup lavu_crypto
- * @{
- */
-
-typedef struct AVXTEA {
-    uint32_t key[16];
-} AVXTEA;
-
-/**
- * Initialize an AVXTEA context.
- *
- * @param ctx an AVXTEA context
- * @param key a key of 16 bytes used for encryption/decryption
- */
-void av_xtea_init(struct AVXTEA *ctx, const uint8_t key[16]);
-
-/**
- * Encrypt or decrypt a buffer using a previously initialized context.
- *
- * @param ctx an AVXTEA context
- * @param dst destination array, can be equal to src
- * @param src source array, can be equal to dst
- * @param count number of 8 byte blocks
- * @param iv initialization vector for CBC mode, if NULL then ECB will be used
- * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_xtea_crypt(struct AVXTEA *ctx, uint8_t *dst, const uint8_t *src,
-                   int count, uint8_t *iv, int decrypt);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_XTEA_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav53/moz.build	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav53/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +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 += [
-    '../FFmpegAudioDecoder.cpp',
-    '../FFmpegDataDecoder.cpp',
-    '../FFmpegDecoderModule.cpp',
-    '../FFmpegH264Decoder.cpp',
-]
-LOCAL_INCLUDES += [
-    '..',
-    'include',
-]
-
-FINAL_LIBRARY = 'xul'
-
-FAIL_ON_WARNINGS = True
-
-if CONFIG['CLANG_CXX']:
-  CXXFLAGS += [
-    '-Wno-unknown-attributes',
-  ]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/COPYING.LGPLv2.1 firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/COPYING.LGPLv2.1
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/COPYING.LGPLv2.1	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/COPYING.LGPLv2.1	1970-01-01 00:00:00.000000000 +0000
@@ -1,504 +0,0 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/avcodec.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/avcodec.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/avcodec.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/avcodec.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,4658 +0,0 @@
-/*
- * copyright (c) 2001 Fabrice Bellard
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_AVCODEC_H
-#define AVCODEC_AVCODEC_H
-
-/**
- * @file
- * external API header
- */
-
-#include <errno.h>
-#include "libavutil/samplefmt.h"
-#include "libavutil/avutil.h"
-#include "libavutil/cpu.h"
-#include "libavutil/dict.h"
-#include "libavutil/log.h"
-#include "libavutil/pixfmt.h"
-#include "libavutil/rational.h"
-
-#include "libavcodec/version.h"
-/**
- * @defgroup libavc Encoding/Decoding Library
- * @{
- *
- * @defgroup lavc_decoding Decoding
- * @{
- * @}
- *
- * @defgroup lavc_encoding Encoding
- * @{
- * @}
- *
- * @defgroup lavc_codec Codecs
- * @{
- * @defgroup lavc_codec_native Native Codecs
- * @{
- * @}
- * @defgroup lavc_codec_wrappers External library wrappers
- * @{
- * @}
- * @defgroup lavc_codec_hwaccel Hardware Accelerators bridge
- * @{
- * @}
- * @}
- * @defgroup lavc_internal Internal
- * @{
- * @}
- * @}
- *
- */
-
-/**
- * @defgroup lavc_core Core functions/structures.
- * @ingroup libavc
- *
- * Basic definitions, functions for querying libavcodec capabilities,
- * allocating core structures, etc.
- * @{
- */
-
-
-/**
- * Identify the syntax and semantics of the bitstream.
- * The principle is roughly:
- * Two decoders with the same ID can decode the same streams.
- * Two encoders with the same ID can encode compatible streams.
- * There may be slight deviations from the principle due to implementation
- * details.
- *
- * If you add a codec ID to this list, add it so that
- * 1. no value of a existing codec ID changes (that would break ABI),
- * 2. it is as close as possible to similar codecs.
- *
- * After adding new codec IDs, do not forget to add an entry to the codec
- * descriptor list and bump libavcodec minor version.
- */
-enum AVCodecID {
-    AV_CODEC_ID_NONE,
-
-    /* video codecs */
-    AV_CODEC_ID_MPEG1VIDEO,
-    AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
-    AV_CODEC_ID_MPEG2VIDEO_XVMC,
-    AV_CODEC_ID_H261,
-    AV_CODEC_ID_H263,
-    AV_CODEC_ID_RV10,
-    AV_CODEC_ID_RV20,
-    AV_CODEC_ID_MJPEG,
-    AV_CODEC_ID_MJPEGB,
-    AV_CODEC_ID_LJPEG,
-    AV_CODEC_ID_SP5X,
-    AV_CODEC_ID_JPEGLS,
-    AV_CODEC_ID_MPEG4,
-    AV_CODEC_ID_RAWVIDEO,
-    AV_CODEC_ID_MSMPEG4V1,
-    AV_CODEC_ID_MSMPEG4V2,
-    AV_CODEC_ID_MSMPEG4V3,
-    AV_CODEC_ID_WMV1,
-    AV_CODEC_ID_WMV2,
-    AV_CODEC_ID_H263P,
-    AV_CODEC_ID_H263I,
-    AV_CODEC_ID_FLV1,
-    AV_CODEC_ID_SVQ1,
-    AV_CODEC_ID_SVQ3,
-    AV_CODEC_ID_DVVIDEO,
-    AV_CODEC_ID_HUFFYUV,
-    AV_CODEC_ID_CYUV,
-    AV_CODEC_ID_H264,
-    AV_CODEC_ID_INDEO3,
-    AV_CODEC_ID_VP3,
-    AV_CODEC_ID_THEORA,
-    AV_CODEC_ID_ASV1,
-    AV_CODEC_ID_ASV2,
-    AV_CODEC_ID_FFV1,
-    AV_CODEC_ID_4XM,
-    AV_CODEC_ID_VCR1,
-    AV_CODEC_ID_CLJR,
-    AV_CODEC_ID_MDEC,
-    AV_CODEC_ID_ROQ,
-    AV_CODEC_ID_INTERPLAY_VIDEO,
-    AV_CODEC_ID_XAN_WC3,
-    AV_CODEC_ID_XAN_WC4,
-    AV_CODEC_ID_RPZA,
-    AV_CODEC_ID_CINEPAK,
-    AV_CODEC_ID_WS_VQA,
-    AV_CODEC_ID_MSRLE,
-    AV_CODEC_ID_MSVIDEO1,
-    AV_CODEC_ID_IDCIN,
-    AV_CODEC_ID_8BPS,
-    AV_CODEC_ID_SMC,
-    AV_CODEC_ID_FLIC,
-    AV_CODEC_ID_TRUEMOTION1,
-    AV_CODEC_ID_VMDVIDEO,
-    AV_CODEC_ID_MSZH,
-    AV_CODEC_ID_ZLIB,
-    AV_CODEC_ID_QTRLE,
-    AV_CODEC_ID_SNOW,
-    AV_CODEC_ID_TSCC,
-    AV_CODEC_ID_ULTI,
-    AV_CODEC_ID_QDRAW,
-    AV_CODEC_ID_VIXL,
-    AV_CODEC_ID_QPEG,
-    AV_CODEC_ID_PNG,
-    AV_CODEC_ID_PPM,
-    AV_CODEC_ID_PBM,
-    AV_CODEC_ID_PGM,
-    AV_CODEC_ID_PGMYUV,
-    AV_CODEC_ID_PAM,
-    AV_CODEC_ID_FFVHUFF,
-    AV_CODEC_ID_RV30,
-    AV_CODEC_ID_RV40,
-    AV_CODEC_ID_VC1,
-    AV_CODEC_ID_WMV3,
-    AV_CODEC_ID_LOCO,
-    AV_CODEC_ID_WNV1,
-    AV_CODEC_ID_AASC,
-    AV_CODEC_ID_INDEO2,
-    AV_CODEC_ID_FRAPS,
-    AV_CODEC_ID_TRUEMOTION2,
-    AV_CODEC_ID_BMP,
-    AV_CODEC_ID_CSCD,
-    AV_CODEC_ID_MMVIDEO,
-    AV_CODEC_ID_ZMBV,
-    AV_CODEC_ID_AVS,
-    AV_CODEC_ID_SMACKVIDEO,
-    AV_CODEC_ID_NUV,
-    AV_CODEC_ID_KMVC,
-    AV_CODEC_ID_FLASHSV,
-    AV_CODEC_ID_CAVS,
-    AV_CODEC_ID_JPEG2000,
-    AV_CODEC_ID_VMNC,
-    AV_CODEC_ID_VP5,
-    AV_CODEC_ID_VP6,
-    AV_CODEC_ID_VP6F,
-    AV_CODEC_ID_TARGA,
-    AV_CODEC_ID_DSICINVIDEO,
-    AV_CODEC_ID_TIERTEXSEQVIDEO,
-    AV_CODEC_ID_TIFF,
-    AV_CODEC_ID_GIF,
-    AV_CODEC_ID_DXA,
-    AV_CODEC_ID_DNXHD,
-    AV_CODEC_ID_THP,
-    AV_CODEC_ID_SGI,
-    AV_CODEC_ID_C93,
-    AV_CODEC_ID_BETHSOFTVID,
-    AV_CODEC_ID_PTX,
-    AV_CODEC_ID_TXD,
-    AV_CODEC_ID_VP6A,
-    AV_CODEC_ID_AMV,
-    AV_CODEC_ID_VB,
-    AV_CODEC_ID_PCX,
-    AV_CODEC_ID_SUNRAST,
-    AV_CODEC_ID_INDEO4,
-    AV_CODEC_ID_INDEO5,
-    AV_CODEC_ID_MIMIC,
-    AV_CODEC_ID_RL2,
-    AV_CODEC_ID_ESCAPE124,
-    AV_CODEC_ID_DIRAC,
-    AV_CODEC_ID_BFI,
-    AV_CODEC_ID_CMV,
-    AV_CODEC_ID_MOTIONPIXELS,
-    AV_CODEC_ID_TGV,
-    AV_CODEC_ID_TGQ,
-    AV_CODEC_ID_TQI,
-    AV_CODEC_ID_AURA,
-    AV_CODEC_ID_AURA2,
-    AV_CODEC_ID_V210X,
-    AV_CODEC_ID_TMV,
-    AV_CODEC_ID_V210,
-    AV_CODEC_ID_DPX,
-    AV_CODEC_ID_MAD,
-    AV_CODEC_ID_FRWU,
-    AV_CODEC_ID_FLASHSV2,
-    AV_CODEC_ID_CDGRAPHICS,
-    AV_CODEC_ID_R210,
-    AV_CODEC_ID_ANM,
-    AV_CODEC_ID_BINKVIDEO,
-    AV_CODEC_ID_IFF_ILBM,
-    AV_CODEC_ID_IFF_BYTERUN1,
-    AV_CODEC_ID_KGV1,
-    AV_CODEC_ID_YOP,
-    AV_CODEC_ID_VP8,
-    AV_CODEC_ID_PICTOR,
-    AV_CODEC_ID_ANSI,
-    AV_CODEC_ID_A64_MULTI,
-    AV_CODEC_ID_A64_MULTI5,
-    AV_CODEC_ID_R10K,
-    AV_CODEC_ID_MXPEG,
-    AV_CODEC_ID_LAGARITH,
-    AV_CODEC_ID_PRORES,
-    AV_CODEC_ID_JV,
-    AV_CODEC_ID_DFA,
-    AV_CODEC_ID_WMV3IMAGE,
-    AV_CODEC_ID_VC1IMAGE,
-    AV_CODEC_ID_UTVIDEO,
-    AV_CODEC_ID_BMV_VIDEO,
-    AV_CODEC_ID_VBLE,
-    AV_CODEC_ID_DXTORY,
-    AV_CODEC_ID_V410,
-    AV_CODEC_ID_XWD,
-    AV_CODEC_ID_CDXL,
-    AV_CODEC_ID_XBM,
-    AV_CODEC_ID_ZEROCODEC,
-    AV_CODEC_ID_MSS1,
-    AV_CODEC_ID_MSA1,
-    AV_CODEC_ID_TSCC2,
-    AV_CODEC_ID_MTS2,
-    AV_CODEC_ID_CLLC,
-    AV_CODEC_ID_MSS2,
-
-    /* various PCM "codecs" */
-    AV_CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs
-    AV_CODEC_ID_PCM_S16LE = 0x10000,
-    AV_CODEC_ID_PCM_S16BE,
-    AV_CODEC_ID_PCM_U16LE,
-    AV_CODEC_ID_PCM_U16BE,
-    AV_CODEC_ID_PCM_S8,
-    AV_CODEC_ID_PCM_U8,
-    AV_CODEC_ID_PCM_MULAW,
-    AV_CODEC_ID_PCM_ALAW,
-    AV_CODEC_ID_PCM_S32LE,
-    AV_CODEC_ID_PCM_S32BE,
-    AV_CODEC_ID_PCM_U32LE,
-    AV_CODEC_ID_PCM_U32BE,
-    AV_CODEC_ID_PCM_S24LE,
-    AV_CODEC_ID_PCM_S24BE,
-    AV_CODEC_ID_PCM_U24LE,
-    AV_CODEC_ID_PCM_U24BE,
-    AV_CODEC_ID_PCM_S24DAUD,
-    AV_CODEC_ID_PCM_ZORK,
-    AV_CODEC_ID_PCM_S16LE_PLANAR,
-    AV_CODEC_ID_PCM_DVD,
-    AV_CODEC_ID_PCM_F32BE,
-    AV_CODEC_ID_PCM_F32LE,
-    AV_CODEC_ID_PCM_F64BE,
-    AV_CODEC_ID_PCM_F64LE,
-    AV_CODEC_ID_PCM_BLURAY,
-    AV_CODEC_ID_PCM_LXF,
-    AV_CODEC_ID_S302M,
-    AV_CODEC_ID_PCM_S8_PLANAR,
-
-    /* various ADPCM codecs */
-    AV_CODEC_ID_ADPCM_IMA_QT = 0x11000,
-    AV_CODEC_ID_ADPCM_IMA_WAV,
-    AV_CODEC_ID_ADPCM_IMA_DK3,
-    AV_CODEC_ID_ADPCM_IMA_DK4,
-    AV_CODEC_ID_ADPCM_IMA_WS,
-    AV_CODEC_ID_ADPCM_IMA_SMJPEG,
-    AV_CODEC_ID_ADPCM_MS,
-    AV_CODEC_ID_ADPCM_4XM,
-    AV_CODEC_ID_ADPCM_XA,
-    AV_CODEC_ID_ADPCM_ADX,
-    AV_CODEC_ID_ADPCM_EA,
-    AV_CODEC_ID_ADPCM_G726,
-    AV_CODEC_ID_ADPCM_CT,
-    AV_CODEC_ID_ADPCM_SWF,
-    AV_CODEC_ID_ADPCM_YAMAHA,
-    AV_CODEC_ID_ADPCM_SBPRO_4,
-    AV_CODEC_ID_ADPCM_SBPRO_3,
-    AV_CODEC_ID_ADPCM_SBPRO_2,
-    AV_CODEC_ID_ADPCM_THP,
-    AV_CODEC_ID_ADPCM_IMA_AMV,
-    AV_CODEC_ID_ADPCM_EA_R1,
-    AV_CODEC_ID_ADPCM_EA_R3,
-    AV_CODEC_ID_ADPCM_EA_R2,
-    AV_CODEC_ID_ADPCM_IMA_EA_SEAD,
-    AV_CODEC_ID_ADPCM_IMA_EA_EACS,
-    AV_CODEC_ID_ADPCM_EA_XAS,
-    AV_CODEC_ID_ADPCM_EA_MAXIS_XA,
-    AV_CODEC_ID_ADPCM_IMA_ISS,
-    AV_CODEC_ID_ADPCM_G722,
-    AV_CODEC_ID_ADPCM_IMA_APC,
-
-    /* AMR */
-    AV_CODEC_ID_AMR_NB = 0x12000,
-    AV_CODEC_ID_AMR_WB,
-
-    /* RealAudio codecs*/
-    AV_CODEC_ID_RA_144 = 0x13000,
-    AV_CODEC_ID_RA_288,
-
-    /* various DPCM codecs */
-    AV_CODEC_ID_ROQ_DPCM = 0x14000,
-    AV_CODEC_ID_INTERPLAY_DPCM,
-    AV_CODEC_ID_XAN_DPCM,
-    AV_CODEC_ID_SOL_DPCM,
-
-    /* audio codecs */
-    AV_CODEC_ID_MP2 = 0x15000,
-    AV_CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
-    AV_CODEC_ID_AAC,
-    AV_CODEC_ID_AC3,
-    AV_CODEC_ID_DTS,
-    AV_CODEC_ID_VORBIS,
-    AV_CODEC_ID_DVAUDIO,
-    AV_CODEC_ID_WMAV1,
-    AV_CODEC_ID_WMAV2,
-    AV_CODEC_ID_MACE3,
-    AV_CODEC_ID_MACE6,
-    AV_CODEC_ID_VMDAUDIO,
-    AV_CODEC_ID_FLAC,
-    AV_CODEC_ID_MP3ADU,
-    AV_CODEC_ID_MP3ON4,
-    AV_CODEC_ID_SHORTEN,
-    AV_CODEC_ID_ALAC,
-    AV_CODEC_ID_WESTWOOD_SND1,
-    AV_CODEC_ID_GSM, ///< as in Berlin toast format
-    AV_CODEC_ID_QDM2,
-    AV_CODEC_ID_COOK,
-    AV_CODEC_ID_TRUESPEECH,
-    AV_CODEC_ID_TTA,
-    AV_CODEC_ID_SMACKAUDIO,
-    AV_CODEC_ID_QCELP,
-    AV_CODEC_ID_WAVPACK,
-    AV_CODEC_ID_DSICINAUDIO,
-    AV_CODEC_ID_IMC,
-    AV_CODEC_ID_MUSEPACK7,
-    AV_CODEC_ID_MLP,
-    AV_CODEC_ID_GSM_MS, /* as found in WAV */
-    AV_CODEC_ID_ATRAC3,
-    AV_CODEC_ID_VOXWARE,
-    AV_CODEC_ID_APE,
-    AV_CODEC_ID_NELLYMOSER,
-    AV_CODEC_ID_MUSEPACK8,
-    AV_CODEC_ID_SPEEX,
-    AV_CODEC_ID_WMAVOICE,
-    AV_CODEC_ID_WMAPRO,
-    AV_CODEC_ID_WMALOSSLESS,
-    AV_CODEC_ID_ATRAC3P,
-    AV_CODEC_ID_EAC3,
-    AV_CODEC_ID_SIPR,
-    AV_CODEC_ID_MP1,
-    AV_CODEC_ID_TWINVQ,
-    AV_CODEC_ID_TRUEHD,
-    AV_CODEC_ID_MP4ALS,
-    AV_CODEC_ID_ATRAC1,
-    AV_CODEC_ID_BINKAUDIO_RDFT,
-    AV_CODEC_ID_BINKAUDIO_DCT,
-    AV_CODEC_ID_AAC_LATM,
-    AV_CODEC_ID_QDMC,
-    AV_CODEC_ID_CELT,
-    AV_CODEC_ID_G723_1,
-    AV_CODEC_ID_G729,
-    AV_CODEC_ID_8SVX_EXP,
-    AV_CODEC_ID_8SVX_FIB,
-    AV_CODEC_ID_BMV_AUDIO,
-    AV_CODEC_ID_RALF,
-    AV_CODEC_ID_IAC,
-    AV_CODEC_ID_ILBC,
-    AV_CODEC_ID_OPUS,
-    AV_CODEC_ID_COMFORT_NOISE,
-    AV_CODEC_ID_TAK,
-
-    /* subtitle codecs */
-    AV_CODEC_ID_FIRST_SUBTITLE = 0x17000,          ///< A dummy ID pointing at the start of subtitle codecs.
-    AV_CODEC_ID_DVD_SUBTITLE = 0x17000,
-    AV_CODEC_ID_DVB_SUBTITLE,
-    AV_CODEC_ID_TEXT,  ///< raw UTF-8 text
-    AV_CODEC_ID_XSUB,
-    AV_CODEC_ID_SSA,
-    AV_CODEC_ID_MOV_TEXT,
-    AV_CODEC_ID_HDMV_PGS_SUBTITLE,
-    AV_CODEC_ID_DVB_TELETEXT,
-    AV_CODEC_ID_SRT,
-
-    /* other specific kind of codecs (generally used for attachments) */
-    AV_CODEC_ID_FIRST_UNKNOWN = 0x18000,           ///< A dummy ID pointing at the start of various fake codecs.
-    AV_CODEC_ID_TTF = 0x18000,
-
-    AV_CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf should attempt to identify it
-
-    AV_CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
-                                * stream (only used by libavformat) */
-    AV_CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
-                                * stream (only used by libavformat) */
-    AV_CODEC_ID_FFMETADATA = 0x21000,   ///< Dummy codec for streams containing only metadata information.
-
-#if FF_API_CODEC_ID
-#include "old_codec_ids.h"
-#endif
-};
-
-#if FF_API_CODEC_ID
-#define CodecID AVCodecID
-#endif
-
-/**
- * This struct describes the properties of a single codec described by an
- * AVCodecID.
- * @see avcodec_get_descriptor()
- */
-typedef struct AVCodecDescriptor {
-    enum AVCodecID     id;
-    enum AVMediaType type;
-    /**
-     * Name of the codec described by this descriptor. It is non-empty and
-     * unique for each codec descriptor. It should contain alphanumeric
-     * characters and '_' only.
-     */
-    const char      *name;
-    /**
-     * A more descriptive name for this codec. May be NULL.
-     */
-    const char *long_name;
-    /**
-     * Codec properties, a combination of AV_CODEC_PROP_* flags.
-     */
-    int             props;
-} AVCodecDescriptor;
-
-/**
- * Codec uses only intra compression.
- * Video codecs only.
- */
-#define AV_CODEC_PROP_INTRA_ONLY    (1 << 0)
-/**
- * Codec supports lossy compression. Audio and video codecs only.
- * @note a codec may support both lossy and lossless
- * compression modes
- */
-#define AV_CODEC_PROP_LOSSY         (1 << 1)
-/**
- * Codec supports lossless compression. Audio and video codecs only.
- */
-#define AV_CODEC_PROP_LOSSLESS      (1 << 2)
-
-#if FF_API_OLD_DECODE_AUDIO
-/* in bytes */
-#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
-#endif
-
-/**
- * @ingroup lavc_decoding
- * Required number of additionally allocated bytes at the end of the input bitstream for decoding.
- * This is mainly needed because some optimized bitstream readers read
- * 32 or 64 bit at once and could read over the end.<br>
- * Note: If the first 23 bits of the additional bytes are not 0, then damaged
- * MPEG bitstreams could cause overread and segfault.
- */
-#define FF_INPUT_BUFFER_PADDING_SIZE 8
-
-/**
- * @ingroup lavc_encoding
- * minimum encoding buffer size
- * Used to avoid some checks during header writing.
- */
-#define FF_MIN_BUFFER_SIZE 16384
-
-
-/**
- * @ingroup lavc_encoding
- * motion estimation type.
- */
-enum Motion_Est_ID {
-    ME_ZERO = 1,    ///< no search, that is use 0,0 vector whenever one is needed
-    ME_FULL,
-    ME_LOG,
-    ME_PHODS,
-    ME_EPZS,        ///< enhanced predictive zonal search
-    ME_X1,          ///< reserved for experiments
-    ME_HEX,         ///< hexagon based search
-    ME_UMH,         ///< uneven multi-hexagon search
-    ME_ITER,        ///< iterative search
-    ME_TESA,        ///< transformed exhaustive search algorithm
-};
-
-/**
- * @ingroup lavc_decoding
- */
-enum AVDiscard{
-    /* We leave some space between them for extensions (drop some
-     * keyframes for intra-only or drop just some bidir frames). */
-    AVDISCARD_NONE    =-16, ///< discard nothing
-    AVDISCARD_DEFAULT =  0, ///< discard useless packets like 0 size packets in avi
-    AVDISCARD_NONREF  =  8, ///< discard all non reference
-    AVDISCARD_BIDIR   = 16, ///< discard all bidirectional frames
-    AVDISCARD_NONKEY  = 32, ///< discard all frames except keyframes
-    AVDISCARD_ALL     = 48, ///< discard all
-};
-
-enum AVColorPrimaries{
-    AVCOL_PRI_BT709       = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B
-    AVCOL_PRI_UNSPECIFIED = 2,
-    AVCOL_PRI_BT470M      = 4,
-    AVCOL_PRI_BT470BG     = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM
-    AVCOL_PRI_SMPTE170M   = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
-    AVCOL_PRI_SMPTE240M   = 7, ///< functionally identical to above
-    AVCOL_PRI_FILM        = 8,
-    AVCOL_PRI_NB             , ///< Not part of ABI
-};
-
-enum AVColorTransferCharacteristic{
-    AVCOL_TRC_BT709       = 1, ///< also ITU-R BT1361
-    AVCOL_TRC_UNSPECIFIED = 2,
-    AVCOL_TRC_GAMMA22     = 4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
-    AVCOL_TRC_GAMMA28     = 5, ///< also ITU-R BT470BG
-    AVCOL_TRC_SMPTE240M   = 7,
-    AVCOL_TRC_NB             , ///< Not part of ABI
-};
-
-enum AVColorSpace{
-    AVCOL_SPC_RGB         = 0,
-    AVCOL_SPC_BT709       = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
-    AVCOL_SPC_UNSPECIFIED = 2,
-    AVCOL_SPC_FCC         = 4,
-    AVCOL_SPC_BT470BG     = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
-    AVCOL_SPC_SMPTE170M   = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
-    AVCOL_SPC_SMPTE240M   = 7,
-    AVCOL_SPC_YCOCG       = 8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
-    AVCOL_SPC_NB             , ///< Not part of ABI
-};
-
-enum AVColorRange{
-    AVCOL_RANGE_UNSPECIFIED = 0,
-    AVCOL_RANGE_MPEG        = 1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges
-    AVCOL_RANGE_JPEG        = 2, ///< the normal     2^n-1   "JPEG" YUV ranges
-    AVCOL_RANGE_NB             , ///< Not part of ABI
-};
-
-/**
- *  X   X      3 4 X      X are luma samples,
- *             1 2        1-6 are possible chroma positions
- *  X   X      5 6 X      0 is undefined/unknown position
- */
-enum AVChromaLocation{
-    AVCHROMA_LOC_UNSPECIFIED = 0,
-    AVCHROMA_LOC_LEFT        = 1, ///< mpeg2/4, h264 default
-    AVCHROMA_LOC_CENTER      = 2, ///< mpeg1, jpeg, h263
-    AVCHROMA_LOC_TOPLEFT     = 3, ///< DV
-    AVCHROMA_LOC_TOP         = 4,
-    AVCHROMA_LOC_BOTTOMLEFT  = 5,
-    AVCHROMA_LOC_BOTTOM      = 6,
-    AVCHROMA_LOC_NB             , ///< Not part of ABI
-};
-
-enum AVAudioServiceType {
-    AV_AUDIO_SERVICE_TYPE_MAIN              = 0,
-    AV_AUDIO_SERVICE_TYPE_EFFECTS           = 1,
-    AV_AUDIO_SERVICE_TYPE_VISUALLY_IMPAIRED = 2,
-    AV_AUDIO_SERVICE_TYPE_HEARING_IMPAIRED  = 3,
-    AV_AUDIO_SERVICE_TYPE_DIALOGUE          = 4,
-    AV_AUDIO_SERVICE_TYPE_COMMENTARY        = 5,
-    AV_AUDIO_SERVICE_TYPE_EMERGENCY         = 6,
-    AV_AUDIO_SERVICE_TYPE_VOICE_OVER        = 7,
-    AV_AUDIO_SERVICE_TYPE_KARAOKE           = 8,
-    AV_AUDIO_SERVICE_TYPE_NB                   , ///< Not part of ABI
-};
-
-/**
- * @ingroup lavc_encoding
- */
-typedef struct RcOverride{
-    int start_frame;
-    int end_frame;
-    int qscale; // If this is 0 then quality_factor will be used instead.
-    float quality_factor;
-} RcOverride;
-
-#define FF_MAX_B_FRAMES 16
-
-/* encoding support
-   These flags can be passed in AVCodecContext.flags before initialization.
-   Note: Not everything is supported yet.
-*/
-
-#define CODEC_FLAG_QSCALE 0x0002  ///< Use fixed qscale.
-#define CODEC_FLAG_4MV    0x0004  ///< 4 MV per MB allowed / advanced prediction for H.263.
-#define CODEC_FLAG_QPEL   0x0010  ///< Use qpel MC.
-#define CODEC_FLAG_GMC    0x0020  ///< Use GMC.
-#define CODEC_FLAG_MV0    0x0040  ///< Always try a MB with MV=<0,0>.
-/**
- * The parent program guarantees that the input for B-frames containing
- * streams is not written to for at least s->max_b_frames+1 frames, if
- * this is not set the input will be copied.
- */
-#define CODEC_FLAG_INPUT_PRESERVED 0x0100
-#define CODEC_FLAG_PASS1           0x0200   ///< Use internal 2pass ratecontrol in first pass mode.
-#define CODEC_FLAG_PASS2           0x0400   ///< Use internal 2pass ratecontrol in second pass mode.
-#define CODEC_FLAG_GRAY            0x2000   ///< Only decode/encode grayscale.
-#define CODEC_FLAG_EMU_EDGE        0x4000   ///< Don't draw edges.
-#define CODEC_FLAG_PSNR            0x8000   ///< error[?] variables will be set during encoding.
-#define CODEC_FLAG_TRUNCATED       0x00010000 /** Input bitstream might be truncated at a random
-                                                  location instead of only at frame boundaries. */
-#define CODEC_FLAG_NORMALIZE_AQP  0x00020000 ///< Normalize adaptive quantization.
-#define CODEC_FLAG_INTERLACED_DCT 0x00040000 ///< Use interlaced DCT.
-#define CODEC_FLAG_LOW_DELAY      0x00080000 ///< Force low delay.
-#define CODEC_FLAG_GLOBAL_HEADER  0x00400000 ///< Place global headers in extradata instead of every keyframe.
-#define CODEC_FLAG_BITEXACT       0x00800000 ///< Use only bitexact stuff (except (I)DCT).
-/* Fx : Flag for h263+ extra options */
-#define CODEC_FLAG_AC_PRED        0x01000000 ///< H.263 advanced intra coding / MPEG-4 AC prediction
-#define CODEC_FLAG_LOOP_FILTER    0x00000800 ///< loop filter
-#define CODEC_FLAG_INTERLACED_ME  0x20000000 ///< interlaced motion estimation
-#define CODEC_FLAG_CLOSED_GOP     0x80000000
-#define CODEC_FLAG2_FAST          0x00000001 ///< Allow non spec compliant speedup tricks.
-#define CODEC_FLAG2_NO_OUTPUT     0x00000004 ///< Skip bitstream encoding.
-#define CODEC_FLAG2_LOCAL_HEADER  0x00000008 ///< Place global headers at every keyframe instead of in extradata.
-#if FF_API_MPV_GLOBAL_OPTS
-#define CODEC_FLAG_CBP_RD         0x04000000 ///< Use rate distortion optimization for cbp.
-#define CODEC_FLAG_QP_RD          0x08000000 ///< Use rate distortion optimization for qp selectioon.
-#define CODEC_FLAG2_STRICT_GOP    0x00000002 ///< Strictly enforce GOP size.
-#define CODEC_FLAG2_SKIP_RD       0x00004000 ///< RD optimal MB level residual skipping
-#endif
-#define CODEC_FLAG2_CHUNKS        0x00008000 ///< Input bitstream might be truncated at a packet boundaries instead of only at frame boundaries.
-
-/* Unsupported options :
- *              Syntax Arithmetic coding (SAC)
- *              Reference Picture Selection
- *              Independent Segment Decoding */
-/* /Fx */
-/* codec capabilities */
-
-#define CODEC_CAP_DRAW_HORIZ_BAND 0x0001 ///< Decoder can use draw_horiz_band callback.
-/**
- * Codec uses get_buffer() for allocating buffers and supports custom allocators.
- * If not set, it might not use get_buffer() at all or use operations that
- * assume the buffer was allocated by avcodec_default_get_buffer.
- */
-#define CODEC_CAP_DR1             0x0002
-#define CODEC_CAP_TRUNCATED       0x0008
-/* Codec can export data for HW decoding (XvMC). */
-#define CODEC_CAP_HWACCEL         0x0010
-/**
- * Encoder or decoder requires flushing with NULL input at the end in order to
- * give the complete and correct output.
- *
- * NOTE: If this flag is not set, the codec is guaranteed to never be fed with
- *       with NULL data. The user can still send NULL data to the public encode
- *       or decode function, but libavcodec will not pass it along to the codec
- *       unless this flag is set.
- *
- * Decoders:
- * The decoder has a non-zero delay and needs to be fed with avpkt->data=NULL,
- * avpkt->size=0 at the end to get the delayed data until the decoder no longer
- * returns frames.
- *
- * Encoders:
- * The encoder needs to be fed with NULL data at the end of encoding until the
- * encoder no longer returns data.
- *
- * NOTE: For encoders implementing the AVCodec.encode2() function, setting this
- *       flag also means that the encoder must set the pts and duration for
- *       each output packet. If this flag is not set, the pts and duration will
- *       be determined by libavcodec from the input frame.
- */
-#define CODEC_CAP_DELAY           0x0020
-/**
- * Codec can be fed a final frame with a smaller size.
- * This can be used to prevent truncation of the last audio samples.
- */
-#define CODEC_CAP_SMALL_LAST_FRAME 0x0040
-/**
- * Codec can export data for HW decoding (VDPAU).
- */
-#define CODEC_CAP_HWACCEL_VDPAU    0x0080
-/**
- * Codec can output multiple frames per AVPacket
- * Normally demuxers return one frame at a time, demuxers which do not do
- * are connected to a parser to split what they return into proper frames.
- * This flag is reserved to the very rare category of codecs which have a
- * bitstream that cannot be split into frames without timeconsuming
- * operations like full decoding. Demuxers carring such bitstreams thus
- * may return multiple frames in a packet. This has many disadvantages like
- * prohibiting stream copy in many cases thus it should only be considered
- * as a last resort.
- */
-#define CODEC_CAP_SUBFRAMES        0x0100
-/**
- * Codec is experimental and is thus avoided in favor of non experimental
- * encoders
- */
-#define CODEC_CAP_EXPERIMENTAL     0x0200
-/**
- * Codec should fill in channel configuration and samplerate instead of container
- */
-#define CODEC_CAP_CHANNEL_CONF     0x0400
-/**
- * Codec is able to deal with negative linesizes
- */
-#define CODEC_CAP_NEG_LINESIZES    0x0800
-/**
- * Codec supports frame-level multithreading.
- */
-#define CODEC_CAP_FRAME_THREADS    0x1000
-/**
- * Codec supports slice-based (or partition-based) multithreading.
- */
-#define CODEC_CAP_SLICE_THREADS    0x2000
-/**
- * Codec supports changed parameters at any point.
- */
-#define CODEC_CAP_PARAM_CHANGE     0x4000
-/**
- * Codec supports avctx->thread_count == 0 (auto).
- */
-#define CODEC_CAP_AUTO_THREADS     0x8000
-/**
- * Audio encoder supports receiving a different number of samples in each call.
- */
-#define CODEC_CAP_VARIABLE_FRAME_SIZE 0x10000
-
-//The following defines may change, don't expect compatibility if you use them.
-#define MB_TYPE_INTRA4x4   0x0001
-#define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific
-#define MB_TYPE_INTRA_PCM  0x0004 //FIXME H.264-specific
-#define MB_TYPE_16x16      0x0008
-#define MB_TYPE_16x8       0x0010
-#define MB_TYPE_8x16       0x0020
-#define MB_TYPE_8x8        0x0040
-#define MB_TYPE_INTERLACED 0x0080
-#define MB_TYPE_DIRECT2    0x0100 //FIXME
-#define MB_TYPE_ACPRED     0x0200
-#define MB_TYPE_GMC        0x0400
-#define MB_TYPE_SKIP       0x0800
-#define MB_TYPE_P0L0       0x1000
-#define MB_TYPE_P1L0       0x2000
-#define MB_TYPE_P0L1       0x4000
-#define MB_TYPE_P1L1       0x8000
-#define MB_TYPE_L0         (MB_TYPE_P0L0 | MB_TYPE_P1L0)
-#define MB_TYPE_L1         (MB_TYPE_P0L1 | MB_TYPE_P1L1)
-#define MB_TYPE_L0L1       (MB_TYPE_L0   | MB_TYPE_L1)
-#define MB_TYPE_QUANT      0x00010000
-#define MB_TYPE_CBP        0x00020000
-//Note bits 24-31 are reserved for codec specific use (h264 ref0, mpeg1 0mv, ...)
-
-/**
- * Pan Scan area.
- * This specifies the area which should be displayed.
- * Note there may be multiple such areas for one frame.
- */
-typedef struct AVPanScan{
-    /**
-     * id
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int id;
-
-    /**
-     * width and height in 1/16 pel
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int width;
-    int height;
-
-    /**
-     * position of the top left corner in 1/16 pel for up to 3 fields/frames
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int16_t position[3][2];
-}AVPanScan;
-
-#define FF_QSCALE_TYPE_MPEG1 0
-#define FF_QSCALE_TYPE_MPEG2 1
-#define FF_QSCALE_TYPE_H264  2
-#define FF_QSCALE_TYPE_VP56  3
-
-#define FF_BUFFER_TYPE_INTERNAL 1
-#define FF_BUFFER_TYPE_USER     2 ///< direct rendering buffers (image is (de)allocated by user)
-#define FF_BUFFER_TYPE_SHARED   4 ///< Buffer from somewhere else; don't deallocate image (data/base), all other tables are not shared.
-#define FF_BUFFER_TYPE_COPY     8 ///< Just a (modified) copy of some other buffer, don't deallocate anything.
-
-#define FF_BUFFER_HINTS_VALID    0x01 // Buffer hints value is meaningful (if 0 ignore).
-#define FF_BUFFER_HINTS_READABLE 0x02 // Codec will read from buffer.
-#define FF_BUFFER_HINTS_PRESERVE 0x04 // User must not alter buffer content.
-#define FF_BUFFER_HINTS_REUSABLE 0x08 // Codec will reuse the buffer (update).
-
-/**
- * @defgroup lavc_packet AVPacket
- *
- * Types and functions for working with AVPacket.
- * @{
- */
-enum AVPacketSideDataType {
-    AV_PKT_DATA_PALETTE,
-    AV_PKT_DATA_NEW_EXTRADATA,
-
-    /**
-     * An AV_PKT_DATA_PARAM_CHANGE side data packet is laid out as follows:
-     * @code
-     * u32le param_flags
-     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT)
-     *     s32le channel_count
-     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT)
-     *     u64le channel_layout
-     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE)
-     *     s32le sample_rate
-     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS)
-     *     s32le width
-     *     s32le height
-     * @endcode
-     */
-    AV_PKT_DATA_PARAM_CHANGE,
-
-    /**
-     * An AV_PKT_DATA_H263_MB_INFO side data packet contains a number of
-     * structures with info about macroblocks relevant to splitting the
-     * packet into smaller packets on macroblock edges (e.g. as for RFC 2190).
-     * That is, it does not necessarily contain info about all macroblocks,
-     * as long as the distance between macroblocks in the info is smaller
-     * than the target payload size.
-     * Each MB info structure is 12 bytes, and is laid out as follows:
-     * @code
-     * u32le bit offset from the start of the packet
-     * u8    current quantizer at the start of the macroblock
-     * u8    GOB number
-     * u16le macroblock address within the GOB
-     * u8    horizontal MV predictor
-     * u8    vertical MV predictor
-     * u8    horizontal MV predictor for block number 3
-     * u8    vertical MV predictor for block number 3
-     * @endcode
-     */
-    AV_PKT_DATA_H263_MB_INFO,
-};
-
-/**
- * This structure stores compressed data. It is typically exported by demuxers
- * and then passed as input to decoders, or received as output from encoders and
- * then passed to muxers.
- *
- * For video, it should typically contain one compressed frame. For audio it may
- * contain several compressed frames.
- *
- * AVPacket is one of the few structs in Libav, whose size is a part of public
- * ABI. Thus it may be allocated on stack and no new fields can be added to it
- * without libavcodec and libavformat major bump.
- *
- * The semantics of data ownership depends on the destruct field.
- * If it is set, the packet data is dynamically allocated and is valid
- * indefinitely until av_free_packet() is called (which in turn calls the
- * destruct callback to free the data). If destruct is not set, the packet data
- * is typically backed by some static buffer somewhere and is only valid for a
- * limited time (e.g. until the next read call when demuxing).
- *
- * The side data is always allocated with av_malloc() and is freed in
- * av_free_packet().
- */
-typedef struct AVPacket {
-    /**
-     * Presentation timestamp in AVStream->time_base units; the time at which
-     * the decompressed packet will be presented to the user.
-     * Can be AV_NOPTS_VALUE if it is not stored in the file.
-     * pts MUST be larger or equal to dts as presentation cannot happen before
-     * decompression, unless one wants to view hex dumps. Some formats misuse
-     * the terms dts and pts/cts to mean something different. Such timestamps
-     * must be converted to true pts/dts before they are stored in AVPacket.
-     */
-    int64_t pts;
-    /**
-     * Decompression timestamp in AVStream->time_base units; the time at which
-     * the packet is decompressed.
-     * Can be AV_NOPTS_VALUE if it is not stored in the file.
-     */
-    int64_t dts;
-    uint8_t *data;
-    int   size;
-    int   stream_index;
-    /**
-     * A combination of AV_PKT_FLAG values
-     */
-    int   flags;
-    /**
-     * Additional packet data that can be provided by the container.
-     * Packet can contain several types of side information.
-     */
-    struct {
-        uint8_t *data;
-        int      size;
-        enum AVPacketSideDataType type;
-    } *side_data;
-    int side_data_elems;
-
-    /**
-     * Duration of this packet in AVStream->time_base units, 0 if unknown.
-     * Equals next_pts - this_pts in presentation order.
-     */
-    int   duration;
-    void  (*destruct)(struct AVPacket *);
-    void  *priv;
-    int64_t pos;                            ///< byte position in stream, -1 if unknown
-
-    /**
-     * Time difference in AVStream->time_base units from the pts of this
-     * packet to the point at which the output from the decoder has converged
-     * independent from the availability of previous frames. That is, the
-     * frames are virtually identical no matter if decoding started from
-     * the very first frame or from this keyframe.
-     * Is AV_NOPTS_VALUE if unknown.
-     * This field is not the display duration of the current packet.
-     * This field has no meaning if the packet does not have AV_PKT_FLAG_KEY
-     * set.
-     *
-     * The purpose of this field is to allow seeking in streams that have no
-     * keyframes in the conventional sense. It corresponds to the
-     * recovery point SEI in H.264 and match_time_delta in NUT. It is also
-     * essential for some types of subtitle streams to ensure that all
-     * subtitles are correctly displayed after seeking.
-     */
-    int64_t convergence_duration;
-} AVPacket;
-#define AV_PKT_FLAG_KEY     0x0001 ///< The packet contains a keyframe
-#define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted
-
-enum AVSideDataParamChangeFlags {
-    AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT  = 0x0001,
-    AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT = 0x0002,
-    AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE    = 0x0004,
-    AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS     = 0x0008,
-};
-/**
- * @}
- */
-
-/**
- * This structure describes decoded (raw) audio or video data.
- *
- * AVFrame must be allocated using avcodec_alloc_frame() and freed with
- * avcodec_free_frame(). Note that this allocates only the AVFrame itself. The
- * buffers for the data must be managed through other means.
- *
- * AVFrame is typically allocated once and then reused multiple times to hold
- * different data (e.g. a single AVFrame to hold frames received from a
- * decoder). In such a case, avcodec_get_frame_defaults() should be used to
- * reset the frame to its original clean state before it is reused again.
- *
- * sizeof(AVFrame) is not a part of the public ABI, so new fields may be added
- * to the end with a minor bump.
- */
-typedef struct AVFrame {
-#define AV_NUM_DATA_POINTERS 8
-    /**
-     * pointer to the picture/channel planes.
-     * This might be different from the first allocated byte
-     * - encoding: Set by user
-     * - decoding: set by AVCodecContext.get_buffer()
-     */
-    uint8_t *data[AV_NUM_DATA_POINTERS];
-
-    /**
-     * Size, in bytes, of the data for each picture/channel plane.
-     *
-     * For audio, only linesize[0] may be set. For planar audio, each channel
-     * plane must be the same size.
-     *
-     * - encoding: Set by user
-     * - decoding: set by AVCodecContext.get_buffer()
-     */
-    int linesize[AV_NUM_DATA_POINTERS];
-
-    /**
-     * pointers to the data planes/channels.
-     *
-     * For video, this should simply point to data[].
-     *
-     * For planar audio, each channel has a separate data pointer, and
-     * linesize[0] contains the size of each channel buffer.
-     * For packed audio, there is just one data pointer, and linesize[0]
-     * contains the total size of the buffer for all channels.
-     *
-     * Note: Both data and extended_data will always be set by get_buffer(),
-     * but for planar audio with more channels that can fit in data,
-     * extended_data must be used by the decoder in order to access all
-     * channels.
-     *
-     * encoding: set by user
-     * decoding: set by AVCodecContext.get_buffer()
-     */
-    uint8_t **extended_data;
-
-    /**
-     * width and height of the video frame
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    int width, height;
-
-    /**
-     * number of audio samples (per channel) described by this frame
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    int nb_samples;
-
-    /**
-     * format of the frame, -1 if unknown or unset
-     * Values correspond to enum AVPixelFormat for video frames,
-     * enum AVSampleFormat for audio)
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    int format;
-
-    /**
-     * 1 -> keyframe, 0-> not
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    int key_frame;
-
-    /**
-     * Picture type of the frame, see ?_TYPE below.
-     * - encoding: Set by libavcodec. for coded_picture (and set by user for input).
-     * - decoding: Set by libavcodec.
-     */
-    enum AVPictureType pict_type;
-
-    /**
-     * pointer to the first allocated byte of the picture. Can be used in get_buffer/release_buffer.
-     * This isn't used by libavcodec unless the default get/release_buffer() is used.
-     * - encoding:
-     * - decoding:
-     */
-    uint8_t *base[AV_NUM_DATA_POINTERS];
-
-    /**
-     * sample aspect ratio for the video frame, 0/1 if unknown/unspecified
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    AVRational sample_aspect_ratio;
-
-    /**
-     * presentation timestamp in time_base units (time when frame should be shown to user)
-     * If AV_NOPTS_VALUE then frame_rate = 1/time_base will be assumed.
-     * - encoding: MUST be set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int64_t pts;
-
-    /**
-     * pts copied from the AVPacket that was decoded to produce this frame
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    int64_t pkt_pts;
-
-    /**
-     * dts copied from the AVPacket that triggered returning this frame
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    int64_t pkt_dts;
-
-    /**
-     * picture number in bitstream order
-     * - encoding: set by
-     * - decoding: Set by libavcodec.
-     */
-    int coded_picture_number;
-    /**
-     * picture number in display order
-     * - encoding: set by
-     * - decoding: Set by libavcodec.
-     */
-    int display_picture_number;
-
-    /**
-     * quality (between 1 (good) and FF_LAMBDA_MAX (bad))
-     * - encoding: Set by libavcodec. for coded_picture (and set by user for input).
-     * - decoding: Set by libavcodec.
-     */
-    int quality;
-
-    /**
-     * is this picture used as reference
-     * The values for this are the same as the MpegEncContext.picture_structure
-     * variable, that is 1->top field, 2->bottom field, 3->frame/both fields.
-     * Set to 4 for delayed, non-reference frames.
-     * - encoding: unused
-     * - decoding: Set by libavcodec. (before get_buffer() call)).
-     */
-    int reference;
-
-    /**
-     * QP table
-     * - encoding: unused
-     * - decoding: Set by libavcodec.
-     */
-    int8_t *qscale_table;
-    /**
-     * QP store stride
-     * - encoding: unused
-     * - decoding: Set by libavcodec.
-     */
-    int qstride;
-
-    /**
-     *
-     */
-    int qscale_type;
-
-    /**
-     * mbskip_table[mb]>=1 if MB didn't change
-     * stride= mb_width = (width+15)>>4
-     * - encoding: unused
-     * - decoding: Set by libavcodec.
-     */
-    uint8_t *mbskip_table;
-
-    /**
-     * motion vector table
-     * @code
-     * example:
-     * int mv_sample_log2= 4 - motion_subsample_log2;
-     * int mb_width= (width+15)>>4;
-     * int mv_stride= (mb_width << mv_sample_log2) + 1;
-     * motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y];
-     * @endcode
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int16_t (*motion_val[2])[2];
-
-    /**
-     * macroblock type table
-     * mb_type_base + mb_width + 2
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    uint32_t *mb_type;
-
-    /**
-     * DCT coefficients
-     * - encoding: unused
-     * - decoding: Set by libavcodec.
-     */
-    short *dct_coeff;
-
-    /**
-     * motion reference frame index
-     * the order in which these are stored can depend on the codec.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int8_t *ref_index[2];
-
-    /**
-     * for some private data of the user
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    void *opaque;
-
-    /**
-     * error
-     * - encoding: Set by libavcodec. if flags&CODEC_FLAG_PSNR.
-     * - decoding: unused
-     */
-    uint64_t error[AV_NUM_DATA_POINTERS];
-
-    /**
-     * type of the buffer (to keep track of who has to deallocate data[*])
-     * - encoding: Set by the one who allocates it.
-     * - decoding: Set by the one who allocates it.
-     * Note: User allocated (direct rendering) & internal buffers cannot coexist currently.
-     */
-    int type;
-
-    /**
-     * When decoding, this signals how much the picture must be delayed.
-     * extra_delay = repeat_pict / (2*fps)
-     * - encoding: unused
-     * - decoding: Set by libavcodec.
-     */
-    int repeat_pict;
-
-    /**
-     * The content of the picture is interlaced.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec. (default 0)
-     */
-    int interlaced_frame;
-
-    /**
-     * If the content is interlaced, is top field displayed first.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int top_field_first;
-
-    /**
-     * Tell user application that palette has changed from previous frame.
-     * - encoding: ??? (no palette-enabled encoder yet)
-     * - decoding: Set by libavcodec. (default 0).
-     */
-    int palette_has_changed;
-
-    /**
-     * codec suggestion on buffer type if != 0
-     * - encoding: unused
-     * - decoding: Set by libavcodec. (before get_buffer() call)).
-     */
-    int buffer_hints;
-
-    /**
-     * Pan scan.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    AVPanScan *pan_scan;
-
-    /**
-     * reordered opaque 64bit (generally an integer or a double precision float
-     * PTS but can be anything).
-     * The user sets AVCodecContext.reordered_opaque to represent the input at
-     * that time,
-     * the decoder reorders values as needed and sets AVFrame.reordered_opaque
-     * to exactly one of the values provided by the user through AVCodecContext.reordered_opaque
-     * @deprecated in favor of pkt_pts
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    int64_t reordered_opaque;
-
-    /**
-     * hardware accelerator private data (Libav-allocated)
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    void *hwaccel_picture_private;
-
-    /**
-     * the AVCodecContext which ff_thread_get_buffer() was last called on
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    struct AVCodecContext *owner;
-
-    /**
-     * used by multithreading to store frame-specific info
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    void *thread_opaque;
-
-    /**
-     * log2 of the size of the block which a single vector in motion_val represents:
-     * (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2)
-     * - encoding: unused
-     * - decoding: Set by libavcodec.
-     */
-    uint8_t motion_subsample_log2;
-
-    /**
-     * Sample rate of the audio data.
-     *
-     * - encoding: unused
-     * - decoding: set by get_buffer()
-     */
-    int sample_rate;
-
-    /**
-     * Channel layout of the audio data.
-     *
-     * - encoding: unused
-     * - decoding: set by get_buffer()
-     */
-    uint64_t channel_layout;
-} AVFrame;
-
-struct AVCodecInternal;
-
-enum AVFieldOrder {
-    AV_FIELD_UNKNOWN,
-    AV_FIELD_PROGRESSIVE,
-    AV_FIELD_TT,          //< Top coded_first, top displayed first
-    AV_FIELD_BB,          //< Bottom coded first, bottom displayed first
-    AV_FIELD_TB,          //< Top coded first, bottom displayed first
-    AV_FIELD_BT,          //< Bottom coded first, top displayed first
-};
-
-/**
- * main external API structure.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVCodecContext) must not be used outside libav*.
- */
-typedef struct AVCodecContext {
-    /**
-     * information on struct for av_log
-     * - set by avcodec_alloc_context3
-     */
-    const AVClass *av_class;
-    int log_level_offset;
-
-    enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
-    const struct AVCodec  *codec;
-    char             codec_name[32];
-    enum AVCodecID     codec_id; /* see AV_CODEC_ID_xxx */
-
-    /**
-     * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
-     * This is used to work around some encoder bugs.
-     * A demuxer should set this to what is stored in the field used to identify the codec.
-     * If there are multiple such fields in a container then the demuxer should choose the one
-     * which maximizes the information about the used codec.
-     * If the codec tag field in a container is larger than 32 bits then the demuxer should
-     * remap the longer ID to 32 bits with a table or other structure. Alternatively a new
-     * extra_codec_tag + size could be added but for this a clear advantage must be demonstrated
-     * first.
-     * - encoding: Set by user, if not then the default based on codec_id will be used.
-     * - decoding: Set by user, will be converted to uppercase by libavcodec during init.
-     */
-    unsigned int codec_tag;
-
-    /**
-     * fourcc from the AVI stream header (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
-     * This is used to work around some encoder bugs.
-     * - encoding: unused
-     * - decoding: Set by user, will be converted to uppercase by libavcodec during init.
-     */
-    unsigned int stream_codec_tag;
-
-#if FF_API_SUB_ID
-    /**
-     * @deprecated this field is unused
-     */
-    attribute_deprecated int sub_id;
-#endif
-
-    void *priv_data;
-
-    /**
-     * Private context used for internal data.
-     *
-     * Unlike priv_data, this is not codec-specific. It is used in general
-     * libavcodec functions.
-     */
-    struct AVCodecInternal *internal;
-
-    /**
-     * Private data of the user, can be used to carry app specific stuff.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    void *opaque;
-
-    /**
-     * the average bitrate
-     * - encoding: Set by user; unused for constant quantizer encoding.
-     * - decoding: Set by libavcodec. 0 or some bitrate if this info is available in the stream.
-     */
-    int bit_rate;
-
-    /**
-     * number of bits the bitstream is allowed to diverge from the reference.
-     *           the reference can be CBR (for CBR pass1) or VBR (for pass2)
-     * - encoding: Set by user; unused for constant quantizer encoding.
-     * - decoding: unused
-     */
-    int bit_rate_tolerance;
-
-    /**
-     * Global quality for codecs which cannot change it per frame.
-     * This should be proportional to MPEG-1/2/4 qscale.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int global_quality;
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int compression_level;
-#define FF_COMPRESSION_DEFAULT -1
-
-    /**
-     * CODEC_FLAG_*.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int flags;
-
-    /**
-     * CODEC_FLAG2_*
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int flags2;
-
-    /**
-     * some codecs need / can use extradata like Huffman tables.
-     * mjpeg: Huffman tables
-     * rv10: additional flags
-     * mpeg4: global headers (they can be in the bitstream or here)
-     * The allocated memory should be FF_INPUT_BUFFER_PADDING_SIZE bytes larger
-     * than extradata_size to avoid prolems if it is read with the bitstream reader.
-     * The bytewise contents of extradata must not depend on the architecture or CPU endianness.
-     * - encoding: Set/allocated/freed by libavcodec.
-     * - decoding: Set/allocated/freed by user.
-     */
-    uint8_t *extradata;
-    int extradata_size;
-
-    /**
-     * This is the fundamental unit of time (in seconds) in terms
-     * of which frame timestamps are represented. For fixed-fps content,
-     * timebase should be 1/framerate and timestamp increments should be
-     * identically 1.
-     * - encoding: MUST be set by user.
-     * - decoding: Set by libavcodec.
-     */
-    AVRational time_base;
-
-    /**
-     * For some codecs, the time base is closer to the field rate than the frame rate.
-     * Most notably, H.264 and MPEG-2 specify time_base as half of frame duration
-     * if no telecine is used ...
-     *
-     * Set to time_base ticks per frame. Default 1, e.g., H.264/MPEG-2 set it to 2.
-     */
-    int ticks_per_frame;
-
-    /**
-     * Codec delay.
-     *
-     * Video:
-     *   Number of frames the decoded output will be delayed relative to the
-     *   encoded input.
-     *
-     * Audio:
-     *   For encoding, this is the number of "priming" samples added to the
-     *   beginning of the stream. The decoded output will be delayed by this
-     *   many samples relative to the input to the encoder. Note that this
-     *   field is purely informational and does not directly affect the pts
-     *   output by the encoder, which should always be based on the actual
-     *   presentation time, including any delay.
-     *   For decoding, this is the number of samples the decoder needs to
-     *   output before the decoder's output is valid. When seeking, you should
-     *   start decoding this many samples prior to your desired seek point.
-     *
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    int delay;
-
-
-    /* video only */
-    /**
-     * picture width / height.
-     * - encoding: MUST be set by user.
-     * - decoding: Set by libavcodec.
-     * Note: For compatibility it is possible to set this instead of
-     * coded_width/height before decoding.
-     */
-    int width, height;
-
-    /**
-     * Bitstream width / height, may be different from width/height.
-     * - encoding: unused
-     * - decoding: Set by user before init if known. Codec should override / dynamically change if needed.
-     */
-    int coded_width, coded_height;
-
-#define FF_ASPECT_EXTENDED 15
-
-    /**
-     * the number of pictures in a group of pictures, or 0 for intra_only
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int gop_size;
-
-    /**
-     * Pixel format, see AV_PIX_FMT_xxx.
-     * May be set by the demuxer if known from headers.
-     * May be overriden by the decoder if it knows better.
-     * - encoding: Set by user.
-     * - decoding: Set by user if known, overridden by libavcodec if known
-     */
-    enum AVPixelFormat pix_fmt;
-
-    /**
-     * Motion estimation algorithm used for video coding.
-     * 1 (zero), 2 (full), 3 (log), 4 (phods), 5 (epzs), 6 (x1), 7 (hex),
-     * 8 (umh), 9 (iter), 10 (tesa) [7, 8, 10 are x264 specific, 9 is snow specific]
-     * - encoding: MUST be set by user.
-     * - decoding: unused
-     */
-    int me_method;
-
-    /**
-     * If non NULL, 'draw_horiz_band' is called by the libavcodec
-     * decoder to draw a horizontal band. It improves cache usage. Not
-     * all codecs can do that. You must check the codec capabilities
-     * beforehand.
-     * When multithreading is used, it may be called from multiple threads
-     * at the same time; threads might draw different parts of the same AVFrame,
-     * or multiple AVFrames, and there is no guarantee that slices will be drawn
-     * in order.
-     * The function is also used by hardware acceleration APIs.
-     * It is called at least once during frame decoding to pass
-     * the data needed for hardware render.
-     * In that mode instead of pixel data, AVFrame points to
-     * a structure specific to the acceleration API. The application
-     * reads the structure and can change some fields to indicate progress
-     * or mark state.
-     * - encoding: unused
-     * - decoding: Set by user.
-     * @param height the height of the slice
-     * @param y the y position of the slice
-     * @param type 1->top field, 2->bottom field, 3->frame
-     * @param offset offset into the AVFrame.data from which the slice should be read
-     */
-    void (*draw_horiz_band)(struct AVCodecContext *s,
-                            const AVFrame *src, int offset[AV_NUM_DATA_POINTERS],
-                            int y, int type, int height);
-
-    /**
-     * callback to negotiate the pixelFormat
-     * @param fmt is the list of formats which are supported by the codec,
-     * it is terminated by -1 as 0 is a valid format, the formats are ordered by quality.
-     * The first is always the native one.
-     * @return the chosen format
-     * - encoding: unused
-     * - decoding: Set by user, if not set the native format will be chosen.
-     */
-    enum AVPixelFormat (*get_format)(struct AVCodecContext *s, const enum AVPixelFormat * fmt);
-
-    /**
-     * maximum number of B-frames between non-B-frames
-     * Note: The output will be delayed by max_b_frames+1 relative to the input.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int max_b_frames;
-
-    /**
-     * qscale factor between IP and B-frames
-     * If > 0 then the last P-frame quantizer will be used (q= lastp_q*factor+offset).
-     * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float b_quant_factor;
-
-    /** obsolete FIXME remove */
-    int rc_strategy;
-#define FF_RC_STRATEGY_XVID 1
-
-    int b_frame_strategy;
-
-#if FF_API_MPV_GLOBAL_OPTS
-    /**
-     * luma single coefficient elimination threshold
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    attribute_deprecated int luma_elim_threshold;
-
-    /**
-     * chroma single coeff elimination threshold
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    attribute_deprecated int chroma_elim_threshold;
-#endif
-
-    /**
-     * qscale offset between IP and B-frames
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float b_quant_offset;
-
-    /**
-     * Size of the frame reordering buffer in the decoder.
-     * For MPEG-2 it is 1 IPB or 0 low delay IP.
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    int has_b_frames;
-
-    /**
-     * 0-> h263 quant 1-> mpeg quant
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mpeg_quant;
-
-    /**
-     * qscale factor between P and I-frames
-     * If > 0 then the last p frame quantizer will be used (q= lastp_q*factor+offset).
-     * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float i_quant_factor;
-
-    /**
-     * qscale offset between P and I-frames
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float i_quant_offset;
-
-    /**
-     * luminance masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float lumi_masking;
-
-    /**
-     * temporary complexity masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float temporal_cplx_masking;
-
-    /**
-     * spatial complexity masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float spatial_cplx_masking;
-
-    /**
-     * p block masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float p_masking;
-
-    /**
-     * darkness masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float dark_masking;
-
-    /**
-     * slice count
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by user (or 0).
-     */
-    int slice_count;
-    /**
-     * prediction method (needed for huffyuv)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-     int prediction_method;
-#define FF_PRED_LEFT   0
-#define FF_PRED_PLANE  1
-#define FF_PRED_MEDIAN 2
-
-    /**
-     * slice offsets in the frame in bytes
-     * - encoding: Set/allocated by libavcodec.
-     * - decoding: Set/allocated by user (or NULL).
-     */
-    int *slice_offset;
-
-    /**
-     * sample aspect ratio (0 if unknown)
-     * That is the width of a pixel divided by the height of the pixel.
-     * Numerator and denominator must be relatively prime and smaller than 256 for some video standards.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    AVRational sample_aspect_ratio;
-
-    /**
-     * motion estimation comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_cmp;
-    /**
-     * subpixel motion estimation comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_sub_cmp;
-    /**
-     * macroblock comparison function (not supported yet)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_cmp;
-    /**
-     * interlaced DCT comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int ildct_cmp;
-#define FF_CMP_SAD    0
-#define FF_CMP_SSE    1
-#define FF_CMP_SATD   2
-#define FF_CMP_DCT    3
-#define FF_CMP_PSNR   4
-#define FF_CMP_BIT    5
-#define FF_CMP_RD     6
-#define FF_CMP_ZERO   7
-#define FF_CMP_VSAD   8
-#define FF_CMP_VSSE   9
-#define FF_CMP_NSSE   10
-#define FF_CMP_W53    11
-#define FF_CMP_W97    12
-#define FF_CMP_DCTMAX 13
-#define FF_CMP_DCT264 14
-#define FF_CMP_CHROMA 256
-
-    /**
-     * ME diamond size & shape
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int dia_size;
-
-    /**
-     * amount of previous MV predictors (2a+1 x 2a+1 square)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int last_predictor_count;
-
-    /**
-     * prepass for motion estimation
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int pre_me;
-
-    /**
-     * motion estimation prepass comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_pre_cmp;
-
-    /**
-     * ME prepass diamond size & shape
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int pre_dia_size;
-
-    /**
-     * subpel ME quality
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_subpel_quality;
-
-    /**
-     * DTG active format information (additional aspect ratio
-     * information only used in DVB MPEG-2 transport streams)
-     * 0 if not set.
-     *
-     * - encoding: unused
-     * - decoding: Set by decoder.
-     */
-    int dtg_active_format;
-#define FF_DTG_AFD_SAME         8
-#define FF_DTG_AFD_4_3          9
-#define FF_DTG_AFD_16_9         10
-#define FF_DTG_AFD_14_9         11
-#define FF_DTG_AFD_4_3_SP_14_9  13
-#define FF_DTG_AFD_16_9_SP_14_9 14
-#define FF_DTG_AFD_SP_4_3       15
-
-    /**
-     * maximum motion estimation search range in subpel units
-     * If 0 then no limit.
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_range;
-
-    /**
-     * intra quantizer bias
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int intra_quant_bias;
-#define FF_DEFAULT_QUANT_BIAS 999999
-
-    /**
-     * inter quantizer bias
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int inter_quant_bias;
-
-#if FF_API_COLOR_TABLE_ID
-    /**
-     * color table ID
-     * - encoding: unused
-     * - decoding: Which clrtable should be used for 8bit RGB images.
-     *             Tables have to be stored somewhere. FIXME
-     */
-    attribute_deprecated int color_table_id;
-#endif
-
-    /**
-     * slice flags
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int slice_flags;
-#define SLICE_FLAG_CODED_ORDER    0x0001 ///< draw_horiz_band() is called in coded order instead of display
-#define SLICE_FLAG_ALLOW_FIELD    0x0002 ///< allow draw_horiz_band() with field slices (MPEG2 field pics)
-#define SLICE_FLAG_ALLOW_PLANE    0x0004 ///< allow draw_horiz_band() with 1 component at a time (SVQ1)
-
-    /**
-     * XVideo Motion Acceleration
-     * - encoding: forbidden
-     * - decoding: set by decoder
-     */
-    int xvmc_acceleration;
-
-    /**
-     * macroblock decision mode
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_decision;
-#define FF_MB_DECISION_SIMPLE 0        ///< uses mb_cmp
-#define FF_MB_DECISION_BITS   1        ///< chooses the one which needs the fewest bits
-#define FF_MB_DECISION_RD     2        ///< rate distortion
-
-    /**
-     * custom intra quantization matrix
-     * - encoding: Set by user, can be NULL.
-     * - decoding: Set by libavcodec.
-     */
-    uint16_t *intra_matrix;
-
-    /**
-     * custom inter quantization matrix
-     * - encoding: Set by user, can be NULL.
-     * - decoding: Set by libavcodec.
-     */
-    uint16_t *inter_matrix;
-
-    /**
-     * scene change detection threshold
-     * 0 is default, larger means fewer detected scene changes.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int scenechange_threshold;
-
-    /**
-     * noise reduction strength
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int noise_reduction;
-
-#if FF_API_INTER_THRESHOLD
-    /**
-     * @deprecated this field is unused
-     */
-    attribute_deprecated int inter_threshold;
-#endif
-
-#if FF_API_MPV_GLOBAL_OPTS
-    /**
-     * @deprecated use mpegvideo private options instead
-     */
-    attribute_deprecated int quantizer_noise_shaping;
-#endif
-
-    /**
-     * Motion estimation threshold below which no motion estimation is
-     * performed, but instead the user specified motion vectors are used.
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_threshold;
-
-    /**
-     * Macroblock threshold below which the user specified macroblock types will be used.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_threshold;
-
-    /**
-     * precision of the intra DC coefficient - 8
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int intra_dc_precision;
-
-    /**
-     * Number of macroblock rows at the top which are skipped.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int skip_top;
-
-    /**
-     * Number of macroblock rows at the bottom which are skipped.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int skip_bottom;
-
-    /**
-     * Border processing masking, raises the quantizer for mbs on the borders
-     * of the picture.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float border_masking;
-
-    /**
-     * minimum MB lagrange multipler
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_lmin;
-
-    /**
-     * maximum MB lagrange multipler
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_lmax;
-
-    /**
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_penalty_compensation;
-
-    /**
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int bidir_refine;
-
-    /**
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int brd_scale;
-
-    /**
-     * minimum GOP size
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int keyint_min;
-
-    /**
-     * number of reference frames
-     * - encoding: Set by user.
-     * - decoding: Set by lavc.
-     */
-    int refs;
-
-    /**
-     * chroma qp offset from luma
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int chromaoffset;
-
-    /**
-     * Multiplied by qscale for each frame and added to scene_change_score.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int scenechange_factor;
-
-    /**
-     *
-     * Note: Value depends upon the compare function used for fullpel ME.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mv0_threshold;
-
-    /**
-     * Adjust sensitivity of b_frame_strategy 1.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int b_sensitivity;
-
-    /**
-     * Chromaticity coordinates of the source primaries.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorPrimaries color_primaries;
-
-    /**
-     * Color Transfer Characteristic.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorTransferCharacteristic color_trc;
-
-    /**
-     * YUV colorspace type.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorSpace colorspace;
-
-    /**
-     * MPEG vs JPEG YUV range.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorRange color_range;
-
-    /**
-     * This defines the location of chroma samples.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVChromaLocation chroma_sample_location;
-
-    /**
-     * Number of slices.
-     * Indicates number of picture subdivisions. Used for parallelized
-     * decoding.
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    int slices;
-
-    /** Field order
-     * - encoding: set by libavcodec
-     * - decoding: Set by libavcodec
-     */
-    enum AVFieldOrder field_order;
-
-    /* audio only */
-    int sample_rate; ///< samples per second
-    int channels;    ///< number of audio channels
-
-    /**
-     * audio sample format
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    enum AVSampleFormat sample_fmt;  ///< sample format
-
-    /* The following data should not be initialized. */
-    /**
-     * Number of samples per channel in an audio frame.
-     *
-     * - encoding: set by libavcodec in avcodec_open2(). Each submitted frame
-     *   except the last must contain exactly frame_size samples per channel.
-     *   May be 0 when the codec has CODEC_CAP_VARIABLE_FRAME_SIZE set, then the
-     *   frame size is not restricted.
-     * - decoding: may be set by some decoders to indicate constant frame size
-     */
-    int frame_size;
-
-    /**
-     * Frame counter, set by libavcodec.
-     *
-     * - decoding: total number of frames returned from the decoder so far.
-     * - encoding: total number of frames passed to the encoder so far.
-     *
-     *   @note the counter is not incremented if encoding/decoding resulted in
-     *   an error.
-     */
-    int frame_number;
-
-    /**
-     * number of bytes per packet if constant and known or 0
-     * Used by some WAV based audio codecs.
-     */
-    int block_align;
-
-    /**
-     * Audio cutoff bandwidth (0 means "automatic")
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int cutoff;
-
-#if FF_API_REQUEST_CHANNELS
-    /**
-     * Decoder should decode to this many channels if it can (0 for default)
-     * - encoding: unused
-     * - decoding: Set by user.
-     * @deprecated Deprecated in favor of request_channel_layout.
-     */
-    int request_channels;
-#endif
-
-    /**
-     * Audio channel layout.
-     * - encoding: set by user.
-     * - decoding: set by libavcodec.
-     */
-    uint64_t channel_layout;
-
-    /**
-     * Request decoder to use this channel layout if it can (0 for default)
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    uint64_t request_channel_layout;
-
-    /**
-     * Type of service that the audio stream conveys.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    enum AVAudioServiceType audio_service_type;
-
-    /**
-     * Used to request a sample format from the decoder.
-     * - encoding: unused.
-     * - decoding: Set by user.
-     */
-    enum AVSampleFormat request_sample_fmt;
-
-    /**
-     * Called at the beginning of each frame to get a buffer for it.
-     *
-     * The function will set AVFrame.data[], AVFrame.linesize[].
-     * AVFrame.extended_data[] must also be set, but it should be the same as
-     * AVFrame.data[] except for planar audio with more channels than can fit
-     * in AVFrame.data[]. In that case, AVFrame.data[] shall still contain as
-     * many data pointers as it can hold.
-     *
-     * if CODEC_CAP_DR1 is not set then get_buffer() must call
-     * avcodec_default_get_buffer() instead of providing buffers allocated by
-     * some other means.
-     *
-     * AVFrame.data[] should be 32- or 16-byte-aligned unless the CPU doesn't
-     * need it. avcodec_default_get_buffer() aligns the output buffer properly,
-     * but if get_buffer() is overridden then alignment considerations should
-     * be taken into account.
-     *
-     * @see avcodec_default_get_buffer()
-     *
-     * Video:
-     *
-     * If pic.reference is set then the frame will be read later by libavcodec.
-     * avcodec_align_dimensions2() should be used to find the required width and
-     * height, as they normally need to be rounded up to the next multiple of 16.
-     *
-     * If frame multithreading is used and thread_safe_callbacks is set,
-     * it may be called from a different thread, but not from more than one at
-     * once. Does not need to be reentrant.
-     *
-     * @see release_buffer(), reget_buffer()
-     * @see avcodec_align_dimensions2()
-     *
-     * Audio:
-     *
-     * Decoders request a buffer of a particular size by setting
-     * AVFrame.nb_samples prior to calling get_buffer(). The decoder may,
-     * however, utilize only part of the buffer by setting AVFrame.nb_samples
-     * to a smaller value in the output frame.
-     *
-     * Decoders cannot use the buffer after returning from
-     * avcodec_decode_audio4(), so they will not call release_buffer(), as it
-     * is assumed to be released immediately upon return. In some rare cases,
-     * a decoder may need to call get_buffer() more than once in a single
-     * call to avcodec_decode_audio4(). In that case, when get_buffer() is
-     * called again after it has already been called once, the previously
-     * acquired buffer is assumed to be released at that time and may not be
-     * reused by the decoder.
-     *
-     * As a convenience, av_samples_get_buffer_size() and
-     * av_samples_fill_arrays() in libavutil may be used by custom get_buffer()
-     * functions to find the required data size and to fill data pointers and
-     * linesize. In AVFrame.linesize, only linesize[0] may be set for audio
-     * since all planes must be the same size.
-     *
-     * @see av_samples_get_buffer_size(), av_samples_fill_arrays()
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec, user can override.
-     */
-    int (*get_buffer)(struct AVCodecContext *c, AVFrame *pic);
-
-    /**
-     * Called to release buffers which were allocated with get_buffer.
-     * A released buffer can be reused in get_buffer().
-     * pic.data[*] must be set to NULL.
-     * May be called from a different thread if frame multithreading is used,
-     * but not by more than one thread at once, so does not need to be reentrant.
-     * - encoding: unused
-     * - decoding: Set by libavcodec, user can override.
-     */
-    void (*release_buffer)(struct AVCodecContext *c, AVFrame *pic);
-
-    /**
-     * Called at the beginning of a frame to get cr buffer for it.
-     * Buffer type (size, hints) must be the same. libavcodec won't check it.
-     * libavcodec will pass previous buffer in pic, function should return
-     * same buffer or new buffer with old frame "painted" into it.
-     * If pic.data[0] == NULL must behave like get_buffer().
-     * if CODEC_CAP_DR1 is not set then reget_buffer() must call
-     * avcodec_default_reget_buffer() instead of providing buffers allocated by
-     * some other means.
-     * - encoding: unused
-     * - decoding: Set by libavcodec, user can override.
-     */
-    int (*reget_buffer)(struct AVCodecContext *c, AVFrame *pic);
-
-
-    /* - encoding parameters */
-    float qcompress;  ///< amount of qscale change between easy & hard scenes (0.0-1.0)
-    float qblur;      ///< amount of qscale smoothing over time (0.0-1.0)
-
-    /**
-     * minimum quantizer
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int qmin;
-
-    /**
-     * maximum quantizer
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int qmax;
-
-    /**
-     * maximum quantizer difference between frames
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int max_qdiff;
-
-    /**
-     * ratecontrol qmin qmax limiting method
-     * 0-> clipping, 1-> use a nice continuous function to limit qscale wthin qmin/qmax.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float rc_qsquish;
-
-    float rc_qmod_amp;
-    int rc_qmod_freq;
-
-    /**
-     * decoder bitstream buffer size
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rc_buffer_size;
-
-    /**
-     * ratecontrol override, see RcOverride
-     * - encoding: Allocated/set/freed by user.
-     * - decoding: unused
-     */
-    int rc_override_count;
-    RcOverride *rc_override;
-
-    /**
-     * rate control equation
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    const char *rc_eq;
-
-    /**
-     * maximum bitrate
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rc_max_rate;
-
-    /**
-     * minimum bitrate
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rc_min_rate;
-
-    float rc_buffer_aggressivity;
-
-    /**
-     * initial complexity for pass1 ratecontrol
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float rc_initial_cplx;
-
-    /**
-     * Ratecontrol attempt to use, at maximum, <value> of what can be used without an underflow.
-     * - encoding: Set by user.
-     * - decoding: unused.
-     */
-    float rc_max_available_vbv_use;
-
-    /**
-     * Ratecontrol attempt to use, at least, <value> times the amount needed to prevent a vbv overflow.
-     * - encoding: Set by user.
-     * - decoding: unused.
-     */
-    float rc_min_vbv_overflow_use;
-
-    /**
-     * Number of bits which should be loaded into the rc buffer before decoding starts.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rc_initial_buffer_occupancy;
-
-#define FF_CODER_TYPE_VLC       0
-#define FF_CODER_TYPE_AC        1
-#define FF_CODER_TYPE_RAW       2
-#define FF_CODER_TYPE_RLE       3
-#define FF_CODER_TYPE_DEFLATE   4
-    /**
-     * coder type
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int coder_type;
-
-    /**
-     * context model
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int context_model;
-
-    /**
-     * minimum Lagrange multipler
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int lmin;
-
-    /**
-     * maximum Lagrange multipler
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int lmax;
-
-    /**
-     * frame skip threshold
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int frame_skip_threshold;
-
-    /**
-     * frame skip factor
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int frame_skip_factor;
-
-    /**
-     * frame skip exponent
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int frame_skip_exp;
-
-    /**
-     * frame skip comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int frame_skip_cmp;
-
-    /**
-     * trellis RD quantization
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int trellis;
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int min_prediction_order;
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int max_prediction_order;
-
-    /**
-     * GOP timecode frame start number, in non drop frame format
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int64_t timecode_frame_start;
-
-    /* The RTP callback: This function is called    */
-    /* every time the encoder has a packet to send. */
-    /* It depends on the encoder if the data starts */
-    /* with a Start Code (it should). H.263 does.   */
-    /* mb_nb contains the number of macroblocks     */
-    /* encoded in the RTP payload.                  */
-    void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb);
-
-    int rtp_payload_size;   /* The size of the RTP payload: the coder will  */
-                            /* do its best to deliver a chunk with size     */
-                            /* below rtp_payload_size, the chunk will start */
-                            /* with a start code on some codecs like H.263. */
-                            /* This doesn't take account of any particular  */
-                            /* headers inside the transmitted RTP payload.  */
-
-    /* statistics, used for 2-pass encoding */
-    int mv_bits;
-    int header_bits;
-    int i_tex_bits;
-    int p_tex_bits;
-    int i_count;
-    int p_count;
-    int skip_count;
-    int misc_bits;
-
-    /**
-     * number of bits used for the previously encoded frame
-     * - encoding: Set by libavcodec.
-     * - decoding: unused
-     */
-    int frame_bits;
-
-    /**
-     * pass1 encoding statistics output buffer
-     * - encoding: Set by libavcodec.
-     * - decoding: unused
-     */
-    char *stats_out;
-
-    /**
-     * pass2 encoding statistics input buffer
-     * Concatenated stuff from stats_out of pass1 should be placed here.
-     * - encoding: Allocated/set/freed by user.
-     * - decoding: unused
-     */
-    char *stats_in;
-
-    /**
-     * Work around bugs in encoders which sometimes cannot be detected automatically.
-     * - encoding: Set by user
-     * - decoding: Set by user
-     */
-    int workaround_bugs;
-#define FF_BUG_AUTODETECT       1  ///< autodetection
-#define FF_BUG_OLD_MSMPEG4      2
-#define FF_BUG_XVID_ILACE       4
-#define FF_BUG_UMP4             8
-#define FF_BUG_NO_PADDING       16
-#define FF_BUG_AMV              32
-#define FF_BUG_AC_VLC           0  ///< Will be removed, libavcodec can now handle these non-compliant files by default.
-#define FF_BUG_QPEL_CHROMA      64
-#define FF_BUG_STD_QPEL         128
-#define FF_BUG_QPEL_CHROMA2     256
-#define FF_BUG_DIRECT_BLOCKSIZE 512
-#define FF_BUG_EDGE             1024
-#define FF_BUG_HPEL_CHROMA      2048
-#define FF_BUG_DC_CLIP          4096
-#define FF_BUG_MS               8192 ///< Work around various bugs in Microsoft's broken decoders.
-#define FF_BUG_TRUNCATED       16384
-
-    /**
-     * strictly follow the standard (MPEG4, ...).
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     * Setting this to STRICT or higher means the encoder and decoder will
-     * generally do stupid things, whereas setting it to unofficial or lower
-     * will mean the encoder might produce output that is not supported by all
-     * spec-compliant decoders. Decoders don't differentiate between normal,
-     * unofficial and experimental (that is, they always try to decode things
-     * when they can) unless they are explicitly asked to behave stupidly
-     * (=strictly conform to the specs)
-     */
-    int strict_std_compliance;
-#define FF_COMPLIANCE_VERY_STRICT   2 ///< Strictly conform to an older more strict version of the spec or reference software.
-#define FF_COMPLIANCE_STRICT        1 ///< Strictly conform to all the things in the spec no matter what consequences.
-#define FF_COMPLIANCE_NORMAL        0
-#define FF_COMPLIANCE_UNOFFICIAL   -1 ///< Allow unofficial extensions
-#define FF_COMPLIANCE_EXPERIMENTAL -2 ///< Allow nonstandardized experimental things.
-
-    /**
-     * error concealment flags
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int error_concealment;
-#define FF_EC_GUESS_MVS   1
-#define FF_EC_DEBLOCK     2
-
-    /**
-     * debug
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int debug;
-#define FF_DEBUG_PICT_INFO   1
-#define FF_DEBUG_RC          2
-#define FF_DEBUG_BITSTREAM   4
-#define FF_DEBUG_MB_TYPE     8
-#define FF_DEBUG_QP          16
-#define FF_DEBUG_MV          32
-#define FF_DEBUG_DCT_COEFF   0x00000040
-#define FF_DEBUG_SKIP        0x00000080
-#define FF_DEBUG_STARTCODE   0x00000100
-#define FF_DEBUG_PTS         0x00000200
-#define FF_DEBUG_ER          0x00000400
-#define FF_DEBUG_MMCO        0x00000800
-#define FF_DEBUG_BUGS        0x00001000
-#define FF_DEBUG_VIS_QP      0x00002000
-#define FF_DEBUG_VIS_MB_TYPE 0x00004000
-#define FF_DEBUG_BUFFERS     0x00008000
-#define FF_DEBUG_THREADS     0x00010000
-
-    /**
-     * debug
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int debug_mv;
-#define FF_DEBUG_VIS_MV_P_FOR  0x00000001 //visualize forward predicted MVs of P frames
-#define FF_DEBUG_VIS_MV_B_FOR  0x00000002 //visualize forward predicted MVs of B frames
-#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
-
-    /**
-     * Error recognition; may misdetect some more or less valid parts as errors.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int err_recognition;
-#define AV_EF_CRCCHECK  (1<<0)
-#define AV_EF_BITSTREAM (1<<1)
-#define AV_EF_BUFFER    (1<<2)
-#define AV_EF_EXPLODE   (1<<3)
-
-    /**
-     * opaque 64bit number (generally a PTS) that will be reordered and
-     * output in AVFrame.reordered_opaque
-     * @deprecated in favor of pkt_pts
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int64_t reordered_opaque;
-
-    /**
-     * Hardware accelerator in use
-     * - encoding: unused.
-     * - decoding: Set by libavcodec
-     */
-    struct AVHWAccel *hwaccel;
-
-    /**
-     * Hardware accelerator context.
-     * For some hardware accelerators, a global context needs to be
-     * provided by the user. In that case, this holds display-dependent
-     * data Libav cannot instantiate itself. Please refer to the
-     * Libav HW accelerator documentation to know how to fill this
-     * is. e.g. for VA API, this is a struct vaapi_context.
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    void *hwaccel_context;
-
-    /**
-     * error
-     * - encoding: Set by libavcodec if flags&CODEC_FLAG_PSNR.
-     * - decoding: unused
-     */
-    uint64_t error[AV_NUM_DATA_POINTERS];
-
-    /**
-     * DCT algorithm, see FF_DCT_* below
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int dct_algo;
-#define FF_DCT_AUTO    0
-#define FF_DCT_FASTINT 1
-#define FF_DCT_INT     2
-#define FF_DCT_MMX     3
-#define FF_DCT_ALTIVEC 5
-#define FF_DCT_FAAN    6
-
-    /**
-     * IDCT algorithm, see FF_IDCT_* below.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int idct_algo;
-#define FF_IDCT_AUTO          0
-#define FF_IDCT_INT           1
-#define FF_IDCT_SIMPLE        2
-#define FF_IDCT_SIMPLEMMX     3
-#if FF_API_LIBMPEG2
-#define FF_IDCT_LIBMPEG2MMX   4
-#endif
-#if FF_API_MMI
-#define FF_IDCT_MMI           5
-#endif
-#define FF_IDCT_ARM           7
-#define FF_IDCT_ALTIVEC       8
-#define FF_IDCT_SH4           9
-#define FF_IDCT_SIMPLEARM     10
-#define FF_IDCT_H264          11
-#define FF_IDCT_VP3           12
-#define FF_IDCT_IPP           13
-#define FF_IDCT_XVIDMMX       14
-#define FF_IDCT_CAVS          15
-#define FF_IDCT_SIMPLEARMV5TE 16
-#define FF_IDCT_SIMPLEARMV6   17
-#define FF_IDCT_SIMPLEVIS     18
-#define FF_IDCT_WMV2          19
-#define FF_IDCT_FAAN          20
-#define FF_IDCT_EA            21
-#define FF_IDCT_SIMPLENEON    22
-#define FF_IDCT_SIMPLEALPHA   23
-#define FF_IDCT_BINK          24
-
-#if FF_API_DSP_MASK
-    /**
-     * Unused.
-     * @deprecated use av_set_cpu_flags_mask() instead.
-     */
-    attribute_deprecated unsigned dsp_mask;
-#endif
-
-    /**
-     * bits per sample/pixel from the demuxer (needed for huffyuv).
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by user.
-     */
-     int bits_per_coded_sample;
-
-    /**
-     * Bits per sample/pixel of internal libavcodec pixel/sample format.
-     * - encoding: set by user.
-     * - decoding: set by libavcodec.
-     */
-    int bits_per_raw_sample;
-
-    /**
-     * low resolution decoding, 1-> 1/2 size, 2->1/4 size
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    attribute_deprecated int lowres;
-
-    /**
-     * the picture in the bitstream
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    AVFrame *coded_frame;
-
-    /**
-     * thread count
-     * is used to decide how many independent tasks should be passed to execute()
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int thread_count;
-
-    /**
-     * Which multithreading methods to use.
-     * Use of FF_THREAD_FRAME will increase decoding delay by one frame per thread,
-     * so clients which cannot provide future frames should not use it.
-     *
-     * - encoding: Set by user, otherwise the default is used.
-     * - decoding: Set by user, otherwise the default is used.
-     */
-    int thread_type;
-#define FF_THREAD_FRAME   1 ///< Decode more than one frame at once
-#define FF_THREAD_SLICE   2 ///< Decode more than one part of a single frame at once
-
-    /**
-     * Which multithreading methods are in use by the codec.
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    int active_thread_type;
-
-    /**
-     * Set by the client if its custom get_buffer() callback can be called
-     * synchronously from another thread, which allows faster multithreaded decoding.
-     * draw_horiz_band() will be called from other threads regardless of this setting.
-     * Ignored if the default get_buffer() is used.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int thread_safe_callbacks;
-
-    /**
-     * The codec may call this to execute several independent things.
-     * It will return only after finishing all tasks.
-     * The user may replace this with some multithreaded implementation,
-     * the default implementation will execute the parts serially.
-     * @param count the number of things to execute
-     * - encoding: Set by libavcodec, user can override.
-     * - decoding: Set by libavcodec, user can override.
-     */
-    int (*execute)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg), void *arg2, int *ret, int count, int size);
-
-    /**
-     * The codec may call this to execute several independent things.
-     * It will return only after finishing all tasks.
-     * The user may replace this with some multithreaded implementation,
-     * the default implementation will execute the parts serially.
-     * Also see avcodec_thread_init and e.g. the --enable-pthread configure option.
-     * @param c context passed also to func
-     * @param count the number of things to execute
-     * @param arg2 argument passed unchanged to func
-     * @param ret return values of executed functions, must have space for "count" values. May be NULL.
-     * @param func function that will be called count times, with jobnr from 0 to count-1.
-     *             threadnr will be in the range 0 to c->thread_count-1 < MAX_THREADS and so that no
-     *             two instances of func executing at the same time will have the same threadnr.
-     * @return always 0 currently, but code should handle a future improvement where when any call to func
-     *         returns < 0 no further calls to func may be done and < 0 is returned.
-     * - encoding: Set by libavcodec, user can override.
-     * - decoding: Set by libavcodec, user can override.
-     */
-    int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count);
-
-    /**
-     * thread opaque
-     * Can be used by execute() to store some per AVCodecContext stuff.
-     * - encoding: set by execute()
-     * - decoding: set by execute()
-     */
-    void *thread_opaque;
-
-    /**
-     * noise vs. sse weight for the nsse comparsion function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-     int nsse_weight;
-
-    /**
-     * profile
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-     int profile;
-#define FF_PROFILE_UNKNOWN -99
-#define FF_PROFILE_RESERVED -100
-
-#define FF_PROFILE_AAC_MAIN 0
-#define FF_PROFILE_AAC_LOW  1
-#define FF_PROFILE_AAC_SSR  2
-#define FF_PROFILE_AAC_LTP  3
-#define FF_PROFILE_AAC_HE   4
-#define FF_PROFILE_AAC_HE_V2 28
-#define FF_PROFILE_AAC_LD   22
-#define FF_PROFILE_AAC_ELD  38
-
-#define FF_PROFILE_DTS         20
-#define FF_PROFILE_DTS_ES      30
-#define FF_PROFILE_DTS_96_24   40
-#define FF_PROFILE_DTS_HD_HRA  50
-#define FF_PROFILE_DTS_HD_MA   60
-
-#define FF_PROFILE_MPEG2_422    0
-#define FF_PROFILE_MPEG2_HIGH   1
-#define FF_PROFILE_MPEG2_SS     2
-#define FF_PROFILE_MPEG2_SNR_SCALABLE  3
-#define FF_PROFILE_MPEG2_MAIN   4
-#define FF_PROFILE_MPEG2_SIMPLE 5
-
-#define FF_PROFILE_H264_CONSTRAINED  (1<<9)  // 8+1; constraint_set1_flag
-#define FF_PROFILE_H264_INTRA        (1<<11) // 8+3; constraint_set3_flag
-
-#define FF_PROFILE_H264_BASELINE             66
-#define FF_PROFILE_H264_CONSTRAINED_BASELINE (66|FF_PROFILE_H264_CONSTRAINED)
-#define FF_PROFILE_H264_MAIN                 77
-#define FF_PROFILE_H264_EXTENDED             88
-#define FF_PROFILE_H264_HIGH                 100
-#define FF_PROFILE_H264_HIGH_10              110
-#define FF_PROFILE_H264_HIGH_10_INTRA        (110|FF_PROFILE_H264_INTRA)
-#define FF_PROFILE_H264_HIGH_422             122
-#define FF_PROFILE_H264_HIGH_422_INTRA       (122|FF_PROFILE_H264_INTRA)
-#define FF_PROFILE_H264_HIGH_444             144
-#define FF_PROFILE_H264_HIGH_444_PREDICTIVE  244
-#define FF_PROFILE_H264_HIGH_444_INTRA       (244|FF_PROFILE_H264_INTRA)
-#define FF_PROFILE_H264_CAVLC_444            44
-
-#define FF_PROFILE_VC1_SIMPLE   0
-#define FF_PROFILE_VC1_MAIN     1
-#define FF_PROFILE_VC1_COMPLEX  2
-#define FF_PROFILE_VC1_ADVANCED 3
-
-#define FF_PROFILE_MPEG4_SIMPLE                     0
-#define FF_PROFILE_MPEG4_SIMPLE_SCALABLE            1
-#define FF_PROFILE_MPEG4_CORE                       2
-#define FF_PROFILE_MPEG4_MAIN                       3
-#define FF_PROFILE_MPEG4_N_BIT                      4
-#define FF_PROFILE_MPEG4_SCALABLE_TEXTURE           5
-#define FF_PROFILE_MPEG4_SIMPLE_FACE_ANIMATION      6
-#define FF_PROFILE_MPEG4_BASIC_ANIMATED_TEXTURE     7
-#define FF_PROFILE_MPEG4_HYBRID                     8
-#define FF_PROFILE_MPEG4_ADVANCED_REAL_TIME         9
-#define FF_PROFILE_MPEG4_CORE_SCALABLE             10
-#define FF_PROFILE_MPEG4_ADVANCED_CODING           11
-#define FF_PROFILE_MPEG4_ADVANCED_CORE             12
-#define FF_PROFILE_MPEG4_ADVANCED_SCALABLE_TEXTURE 13
-#define FF_PROFILE_MPEG4_SIMPLE_STUDIO             14
-#define FF_PROFILE_MPEG4_ADVANCED_SIMPLE           15
-
-    /**
-     * level
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-     int level;
-#define FF_LEVEL_UNKNOWN -99
-
-    /**
-     *
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    enum AVDiscard skip_loop_filter;
-
-    /**
-     *
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    enum AVDiscard skip_idct;
-
-    /**
-     *
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    enum AVDiscard skip_frame;
-
-    /**
-     * Header containing style information for text subtitles.
-     * For SUBTITLE_ASS subtitle type, it should contain the whole ASS
-     * [Script Info] and [V4+ Styles] section, plus the [Events] line and
-     * the Format line following. It shouldn't include any Dialogue line.
-     * - encoding: Set/allocated/freed by user (before avcodec_open2())
-     * - decoding: Set/allocated/freed by libavcodec (by avcodec_open2())
-     */
-    uint8_t *subtitle_header;
-    int subtitle_header_size;
-
-    /**
-     * Simulates errors in the bitstream to test error concealment.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int error_rate;
-
-    /**
-     * Current packet as passed into the decoder, to avoid having
-     * to pass the packet into every function. Currently only valid
-     * inside lavc and get/release_buffer callbacks.
-     * - decoding: set by avcodec_decode_*, read by get_buffer() for setting pkt_pts
-     * - encoding: unused
-     */
-    AVPacket *pkt;
-
-    /**
-     * VBV delay coded in the last frame (in periods of a 27 MHz clock).
-     * Used for compliant TS muxing.
-     * - encoding: Set by libavcodec.
-     * - decoding: unused.
-     */
-    uint64_t vbv_delay;
-} AVCodecContext;
-
-/**
- * AVProfile.
- */
-typedef struct AVProfile {
-    int profile;
-    const char *name; ///< short name for the profile
-} AVProfile;
-
-typedef struct AVCodecDefault AVCodecDefault;
-
-struct AVSubtitle;
-
-/**
- * AVCodec.
- */
-typedef struct AVCodec {
-    /**
-     * Name of the codec implementation.
-     * The name is globally unique among encoders and among decoders (but an
-     * encoder and a decoder can share the same name).
-     * This is the primary way to find a codec from the user perspective.
-     */
-    const char *name;
-    /**
-     * Descriptive name for the codec, meant to be more human readable than name.
-     * You should use the NULL_IF_CONFIG_SMALL() macro to define it.
-     */
-    const char *long_name;
-    enum AVMediaType type;
-    enum AVCodecID id;
-    /**
-     * Codec capabilities.
-     * see CODEC_CAP_*
-     */
-    int capabilities;
-    const AVRational *supported_framerates; ///< array of supported framerates, or NULL if any, array is terminated by {0,0}
-    const enum AVPixelFormat *pix_fmts;     ///< array of supported pixel formats, or NULL if unknown, array is terminated by -1
-    const int *supported_samplerates;       ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
-    const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1
-    const uint64_t *channel_layouts;         ///< array of support channel layouts, or NULL if unknown. array is terminated by 0
-    attribute_deprecated uint8_t max_lowres; ///< maximum value for lowres supported by the decoder
-    const AVClass *priv_class;              ///< AVClass for the private context
-    const AVProfile *profiles;              ///< array of recognized profiles, or NULL if unknown, array is terminated by {FF_PROFILE_UNKNOWN}
-
-    /*****************************************************************
-     * No fields below this line are part of the public API. They
-     * may not be used outside of libavcodec and can be changed and
-     * removed at will.
-     * New public fields should be added right above.
-     *****************************************************************
-     */
-    int priv_data_size;
-    struct AVCodec *next;
-    /**
-     * @name Frame-level threading support functions
-     * @{
-     */
-    /**
-     * If defined, called on thread contexts when they are created.
-     * If the codec allocates writable tables in init(), re-allocate them here.
-     * priv_data will be set to a copy of the original.
-     */
-    int (*init_thread_copy)(AVCodecContext *);
-    /**
-     * Copy necessary context variables from a previous thread context to the current one.
-     * If not defined, the next thread will start automatically; otherwise, the codec
-     * must call ff_thread_finish_setup().
-     *
-     * dst and src will (rarely) point to the same context, in which case memcpy should be skipped.
-     */
-    int (*update_thread_context)(AVCodecContext *dst, const AVCodecContext *src);
-    /** @} */
-
-    /**
-     * Private codec-specific defaults.
-     */
-    const AVCodecDefault *defaults;
-
-    /**
-     * Initialize codec static data, called from avcodec_register().
-     */
-    void (*init_static_data)(struct AVCodec *codec);
-
-    int (*init)(AVCodecContext *);
-    int (*encode_sub)(AVCodecContext *, uint8_t *buf, int buf_size,
-                      const struct AVSubtitle *sub);
-    /**
-     * Encode data to an AVPacket.
-     *
-     * @param      avctx          codec context
-     * @param      avpkt          output AVPacket (may contain a user-provided buffer)
-     * @param[in]  frame          AVFrame containing the raw data to be encoded
-     * @param[out] got_packet_ptr encoder sets to 0 or 1 to indicate that a
-     *                            non-empty packet was returned in avpkt.
-     * @return 0 on success, negative error code on failure
-     */
-    int (*encode2)(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame,
-                   int *got_packet_ptr);
-    int (*decode)(AVCodecContext *, void *outdata, int *outdata_size, AVPacket *avpkt);
-    int (*close)(AVCodecContext *);
-    /**
-     * Flush buffers.
-     * Will be called when seeking
-     */
-    void (*flush)(AVCodecContext *);
-} AVCodec;
-
-/**
- * AVHWAccel.
- */
-typedef struct AVHWAccel {
-    /**
-     * Name of the hardware accelerated codec.
-     * The name is globally unique among encoders and among decoders (but an
-     * encoder and a decoder can share the same name).
-     */
-    const char *name;
-
-    /**
-     * Type of codec implemented by the hardware accelerator.
-     *
-     * See AVMEDIA_TYPE_xxx
-     */
-    enum AVMediaType type;
-
-    /**
-     * Codec implemented by the hardware accelerator.
-     *
-     * See AV_CODEC_ID_xxx
-     */
-    enum AVCodecID id;
-
-    /**
-     * Supported pixel format.
-     *
-     * Only hardware accelerated formats are supported here.
-     */
-    enum AVPixelFormat pix_fmt;
-
-    /**
-     * Hardware accelerated codec capabilities.
-     * see FF_HWACCEL_CODEC_CAP_*
-     */
-    int capabilities;
-
-    struct AVHWAccel *next;
-
-    /**
-     * Called at the beginning of each frame or field picture.
-     *
-     * Meaningful frame information (codec specific) is guaranteed to
-     * be parsed at this point. This function is mandatory.
-     *
-     * Note that buf can be NULL along with buf_size set to 0.
-     * Otherwise, this means the whole frame is available at this point.
-     *
-     * @param avctx the codec context
-     * @param buf the frame data buffer base
-     * @param buf_size the size of the frame in bytes
-     * @return zero if successful, a negative value otherwise
-     */
-    int (*start_frame)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size);
-
-    /**
-     * Callback for each slice.
-     *
-     * Meaningful slice information (codec specific) is guaranteed to
-     * be parsed at this point. This function is mandatory.
-     *
-     * @param avctx the codec context
-     * @param buf the slice data buffer base
-     * @param buf_size the size of the slice in bytes
-     * @return zero if successful, a negative value otherwise
-     */
-    int (*decode_slice)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size);
-
-    /**
-     * Called at the end of each frame or field picture.
-     *
-     * The whole picture is parsed at this point and can now be sent
-     * to the hardware accelerator. This function is mandatory.
-     *
-     * @param avctx the codec context
-     * @return zero if successful, a negative value otherwise
-     */
-    int (*end_frame)(AVCodecContext *avctx);
-
-    /**
-     * Size of HW accelerator private data.
-     *
-     * Private data is allocated with av_mallocz() before
-     * AVCodecContext.get_buffer() and deallocated after
-     * AVCodecContext.release_buffer().
-     */
-    int priv_data_size;
-} AVHWAccel;
-
-/**
- * @defgroup lavc_picture AVPicture
- *
- * Functions for working with AVPicture
- * @{
- */
-
-/**
- * four components are given, that's all.
- * the last component is alpha
- */
-typedef struct AVPicture {
-    uint8_t *data[AV_NUM_DATA_POINTERS];
-    int linesize[AV_NUM_DATA_POINTERS];     ///< number of bytes per line
-} AVPicture;
-
-/**
- * @}
- */
-
-#define AVPALETTE_SIZE 1024
-#define AVPALETTE_COUNT 256
-
-enum AVSubtitleType {
-    SUBTITLE_NONE,
-
-    SUBTITLE_BITMAP,                ///< A bitmap, pict will be set
-
-    /**
-     * Plain text, the text field must be set by the decoder and is
-     * authoritative. ass and pict fields may contain approximations.
-     */
-    SUBTITLE_TEXT,
-
-    /**
-     * Formatted text, the ass field must be set by the decoder and is
-     * authoritative. pict and text fields may contain approximations.
-     */
-    SUBTITLE_ASS,
-};
-
-#define AV_SUBTITLE_FLAG_FORCED 0x00000001
-
-typedef struct AVSubtitleRect {
-    int x;         ///< top left corner  of pict, undefined when pict is not set
-    int y;         ///< top left corner  of pict, undefined when pict is not set
-    int w;         ///< width            of pict, undefined when pict is not set
-    int h;         ///< height           of pict, undefined when pict is not set
-    int nb_colors; ///< number of colors in pict, undefined when pict is not set
-
-    /**
-     * data+linesize for the bitmap of this subtitle.
-     * can be set for text/ass as well once they where rendered
-     */
-    AVPicture pict;
-    enum AVSubtitleType type;
-
-    char *text;                     ///< 0 terminated plain UTF-8 text
-
-    /**
-     * 0 terminated ASS/SSA compatible event line.
-     * The pressentation of this is unaffected by the other values in this
-     * struct.
-     */
-    char *ass;
-    int flags;
-} AVSubtitleRect;
-
-typedef struct AVSubtitle {
-    uint16_t format; /* 0 = graphics */
-    uint32_t start_display_time; /* relative to packet pts, in ms */
-    uint32_t end_display_time; /* relative to packet pts, in ms */
-    unsigned num_rects;
-    AVSubtitleRect **rects;
-    int64_t pts;    ///< Same as packet pts, in AV_TIME_BASE
-} AVSubtitle;
-
-/**
- * If c is NULL, returns the first registered codec,
- * if c is non-NULL, returns the next registered codec after c,
- * or NULL if c is the last one.
- */
-AVCodec *av_codec_next(const AVCodec *c);
-
-/**
- * Return the LIBAVCODEC_VERSION_INT constant.
- */
-unsigned avcodec_version(void);
-
-/**
- * Return the libavcodec build-time configuration.
- */
-const char *avcodec_configuration(void);
-
-/**
- * Return the libavcodec license.
- */
-const char *avcodec_license(void);
-
-/**
- * Register the codec codec and initialize libavcodec.
- *
- * @warning either this function or avcodec_register_all() must be called
- * before any other libavcodec functions.
- *
- * @see avcodec_register_all()
- */
-void avcodec_register(AVCodec *codec);
-
-/**
- * Register all the codecs, parsers and bitstream filters which were enabled at
- * configuration time. If you do not call this function you can select exactly
- * which formats you want to support, by using the individual registration
- * functions.
- *
- * @see avcodec_register
- * @see av_register_codec_parser
- * @see av_register_bitstream_filter
- */
-void avcodec_register_all(void);
-
-/**
- * Allocate an AVCodecContext and set its fields to default values.  The
- * resulting struct can be deallocated by calling avcodec_close() on it followed
- * by av_free().
- *
- * @param codec if non-NULL, allocate private data and initialize defaults
- *              for the given codec. It is illegal to then call avcodec_open2()
- *              with a different codec.
- *              If NULL, then the codec-specific defaults won't be initialized,
- *              which may result in suboptimal default settings (this is
- *              important mainly for encoders, e.g. libx264).
- *
- * @return An AVCodecContext filled with default values or NULL on failure.
- * @see avcodec_get_context_defaults
- */
-AVCodecContext *avcodec_alloc_context3(const AVCodec *codec);
-
-/**
- * Set the fields of the given AVCodecContext to default values corresponding
- * to the given codec (defaults may be codec-dependent).
- *
- * Do not call this function if a non-NULL codec has been passed
- * to avcodec_alloc_context3() that allocated this AVCodecContext.
- * If codec is non-NULL, it is illegal to call avcodec_open2() with a
- * different codec on this AVCodecContext.
- */
-int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec);
-
-/**
- * Get the AVClass for AVCodecContext. It can be used in combination with
- * AV_OPT_SEARCH_FAKE_OBJ for examining options.
- *
- * @see av_opt_find().
- */
-const AVClass *avcodec_get_class(void);
-
-/**
- * Copy the settings of the source AVCodecContext into the destination
- * AVCodecContext. The resulting destination codec context will be
- * unopened, i.e. you are required to call avcodec_open2() before you
- * can use this AVCodecContext to decode/encode video/audio data.
- *
- * @param dest target codec context, should be initialized with
- *             avcodec_alloc_context3(), but otherwise uninitialized
- * @param src source codec context
- * @return AVERROR() on error (e.g. memory allocation error), 0 on success
- */
-int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src);
-
-/**
- * Allocate an AVFrame and set its fields to default values.  The resulting
- * struct must be freed using avcodec_free_frame().
- *
- * @return An AVFrame filled with default values or NULL on failure.
- * @see avcodec_get_frame_defaults
- */
-AVFrame *avcodec_alloc_frame(void);
-
-/**
- * Set the fields of the given AVFrame to default values.
- *
- * @param frame The AVFrame of which the fields should be set to default values.
- */
-void avcodec_get_frame_defaults(AVFrame *frame);
-
-/**
- * Free the frame and any dynamically allocated objects in it,
- * e.g. extended_data.
- *
- * @param frame frame to be freed. The pointer will be set to NULL.
- *
- * @warning this function does NOT free the data buffers themselves
- * (it does not know how, since they might have been allocated with
- *  a custom get_buffer()).
- */
-void avcodec_free_frame(AVFrame **frame);
-
-/**
- * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
- * function the context has to be allocated with avcodec_alloc_context3().
- *
- * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(),
- * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for
- * retrieving a codec.
- *
- * @warning This function is not thread safe!
- *
- * @code
- * avcodec_register_all();
- * av_dict_set(&opts, "b", "2.5M", 0);
- * codec = avcodec_find_decoder(AV_CODEC_ID_H264);
- * if (!codec)
- *     exit(1);
- *
- * context = avcodec_alloc_context3(codec);
- *
- * if (avcodec_open2(context, codec, opts) < 0)
- *     exit(1);
- * @endcode
- *
- * @param avctx The context to initialize.
- * @param codec The codec to open this context for. If a non-NULL codec has been
- *              previously passed to avcodec_alloc_context3() or
- *              avcodec_get_context_defaults3() for this context, then this
- *              parameter MUST be either NULL or equal to the previously passed
- *              codec.
- * @param options A dictionary filled with AVCodecContext and codec-private options.
- *                On return this object will be filled with options that were not found.
- *
- * @return zero on success, a negative value on error
- * @see avcodec_alloc_context3(), avcodec_find_decoder(), avcodec_find_encoder(),
- *      av_dict_set(), av_opt_find().
- */
-int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options);
-
-/**
- * Close a given AVCodecContext and free all the data associated with it
- * (but not the AVCodecContext itself).
- *
- * Calling this function on an AVCodecContext that hasn't been opened will free
- * the codec-specific data allocated in avcodec_alloc_context3() /
- * avcodec_get_context_defaults3() with a non-NULL codec. Subsequent calls will
- * do nothing.
- */
-int avcodec_close(AVCodecContext *avctx);
-
-/**
- * Free all allocated data in the given subtitle struct.
- *
- * @param sub AVSubtitle to free.
- */
-void avsubtitle_free(AVSubtitle *sub);
-
-/**
- * @}
- */
-
-/**
- * @addtogroup lavc_packet
- * @{
- */
-
-/**
- * Default packet destructor.
- */
-void av_destruct_packet(AVPacket *pkt);
-
-/**
- * Initialize optional fields of a packet with default values.
- *
- * Note, this does not touch the data and size members, which have to be
- * initialized separately.
- *
- * @param pkt packet
- */
-void av_init_packet(AVPacket *pkt);
-
-/**
- * Allocate the payload of a packet and initialize its fields with
- * default values.
- *
- * @param pkt packet
- * @param size wanted payload size
- * @return 0 if OK, AVERROR_xxx otherwise
- */
-int av_new_packet(AVPacket *pkt, int size);
-
-/**
- * Reduce packet size, correctly zeroing padding
- *
- * @param pkt packet
- * @param size new size
- */
-void av_shrink_packet(AVPacket *pkt, int size);
-
-/**
- * Increase packet size, correctly zeroing padding
- *
- * @param pkt packet
- * @param grow_by number of bytes by which to increase the size of the packet
- */
-int av_grow_packet(AVPacket *pkt, int grow_by);
-
-/**
- * @warning This is a hack - the packet memory allocation stuff is broken. The
- * packet is allocated if it was not really allocated.
- */
-int av_dup_packet(AVPacket *pkt);
-
-/**
- * Free a packet.
- *
- * @param pkt packet to free
- */
-void av_free_packet(AVPacket *pkt);
-
-/**
- * Allocate new information of a packet.
- *
- * @param pkt packet
- * @param type side information type
- * @param size side information size
- * @return pointer to fresh allocated data or NULL otherwise
- */
-uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
-                                 int size);
-
-/**
- * Shrink the already allocated side data buffer
- *
- * @param pkt packet
- * @param type side information type
- * @param size new side information size
- * @return 0 on success, < 0 on failure
- */
-int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
-                               int size);
-
-/**
- * Get side information from packet.
- *
- * @param pkt packet
- * @param type desired side information type
- * @param size pointer for side information size to store (optional)
- * @return pointer to data if present or NULL otherwise
- */
-uint8_t* av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
-                                 int *size);
-
-/**
- * @}
- */
-
-/**
- * @addtogroup lavc_decoding
- * @{
- */
-
-/**
- * Find a registered decoder with a matching codec ID.
- *
- * @param id AVCodecID of the requested decoder
- * @return A decoder if one was found, NULL otherwise.
- */
-AVCodec *avcodec_find_decoder(enum AVCodecID id);
-
-/**
- * Find a registered decoder with the specified name.
- *
- * @param name name of the requested decoder
- * @return A decoder if one was found, NULL otherwise.
- */
-AVCodec *avcodec_find_decoder_by_name(const char *name);
-
-int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic);
-void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic);
-int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic);
-
-/**
- * Return the amount of padding in pixels which the get_buffer callback must
- * provide around the edge of the image for codecs which do not have the
- * CODEC_FLAG_EMU_EDGE flag.
- *
- * @return Required padding in pixels.
- */
-unsigned avcodec_get_edge_width(void);
-
-/**
- * Modify width and height values so that they will result in a memory
- * buffer that is acceptable for the codec if you do not use any horizontal
- * padding.
- *
- * May only be used if a codec with CODEC_CAP_DR1 has been opened.
- * If CODEC_FLAG_EMU_EDGE is not set, the dimensions must have been increased
- * according to avcodec_get_edge_width() before.
- */
-void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height);
-
-/**
- * Modify width and height values so that they will result in a memory
- * buffer that is acceptable for the codec if you also ensure that all
- * line sizes are a multiple of the respective linesize_align[i].
- *
- * May only be used if a codec with CODEC_CAP_DR1 has been opened.
- * If CODEC_FLAG_EMU_EDGE is not set, the dimensions must have been increased
- * according to avcodec_get_edge_width() before.
- */
-void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
-                               int linesize_align[AV_NUM_DATA_POINTERS]);
-
-#if FF_API_OLD_DECODE_AUDIO
-/**
- * Wrapper function which calls avcodec_decode_audio4.
- *
- * @deprecated Use avcodec_decode_audio4 instead.
- *
- * Decode the audio frame of size avpkt->size from avpkt->data into samples.
- * Some decoders may support multiple frames in a single AVPacket, such
- * decoders would then just decode the first frame. In this case,
- * avcodec_decode_audio3 has to be called again with an AVPacket that contains
- * the remaining data in order to decode the second frame etc.
- * If no frame
- * could be outputted, frame_size_ptr is zero. Otherwise, it is the
- * decompressed frame size in bytes.
- *
- * @warning You must set frame_size_ptr to the allocated size of the
- * output buffer before calling avcodec_decode_audio3().
- *
- * @warning The input buffer must be FF_INPUT_BUFFER_PADDING_SIZE larger than
- * the actual read bytes because some optimized bitstream readers read 32 or 64
- * bits at once and could read over the end.
- *
- * @warning The end of the input buffer avpkt->data should be set to 0 to ensure that
- * no overreading happens for damaged MPEG streams.
- *
- * @warning You must not provide a custom get_buffer() when using
- * avcodec_decode_audio3().  Doing so will override it with
- * avcodec_default_get_buffer.  Use avcodec_decode_audio4() instead,
- * which does allow the application to provide a custom get_buffer().
- *
- * @note You might have to align the input buffer avpkt->data and output buffer
- * samples. The alignment requirements depend on the CPU: On some CPUs it isn't
- * necessary at all, on others it won't work at all if not aligned and on others
- * it will work but it will have an impact on performance.
- *
- * In practice, avpkt->data should have 4 byte alignment at minimum and
- * samples should be 16 byte aligned unless the CPU doesn't need it
- * (AltiVec and SSE do).
- *
- * @note Codecs which have the CODEC_CAP_DELAY capability set have a delay
- * between input and output, these need to be fed with avpkt->data=NULL,
- * avpkt->size=0 at the end to return the remaining frames.
- *
- * @param avctx the codec context
- * @param[out] samples the output buffer, sample type in avctx->sample_fmt
- *                     If the sample format is planar, each channel plane will
- *                     be the same size, with no padding between channels.
- * @param[in,out] frame_size_ptr the output buffer size in bytes
- * @param[in] avpkt The input AVPacket containing the input buffer.
- *            You can create such packet with av_init_packet() and by then setting
- *            data and size, some decoders might in addition need other fields.
- *            All decoders are designed to use the least fields possible though.
- * @return On error a negative value is returned, otherwise the number of bytes
- * used or zero if no frame data was decompressed (used) from the input AVPacket.
- */
-attribute_deprecated int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples,
-                         int *frame_size_ptr,
-                         AVPacket *avpkt);
-#endif
-
-/**
- * Decode the audio frame of size avpkt->size from avpkt->data into frame.
- *
- * Some decoders may support multiple frames in a single AVPacket. Such
- * decoders would then just decode the first frame. In this case,
- * avcodec_decode_audio4 has to be called again with an AVPacket containing
- * the remaining data in order to decode the second frame, etc...
- * Even if no frames are returned, the packet needs to be fed to the decoder
- * with remaining data until it is completely consumed or an error occurs.
- *
- * @warning The input buffer, avpkt->data must be FF_INPUT_BUFFER_PADDING_SIZE
- *          larger than the actual read bytes because some optimized bitstream
- *          readers read 32 or 64 bits at once and could read over the end.
- *
- * @note You might have to align the input buffer. The alignment requirements
- *       depend on the CPU and the decoder.
- *
- * @param      avctx the codec context
- * @param[out] frame The AVFrame in which to store decoded audio samples.
- *                   Decoders request a buffer of a particular size by setting
- *                   AVFrame.nb_samples prior to calling get_buffer(). The
- *                   decoder may, however, only utilize part of the buffer by
- *                   setting AVFrame.nb_samples to a smaller value in the
- *                   output frame.
- * @param[out] got_frame_ptr Zero if no frame could be decoded, otherwise it is
- *                           non-zero.
- * @param[in]  avpkt The input AVPacket containing the input buffer.
- *                   At least avpkt->data and avpkt->size should be set. Some
- *                   decoders might also require additional fields to be set.
- * @return A negative error code is returned if an error occurred during
- *         decoding, otherwise the number of bytes consumed from the input
- *         AVPacket is returned.
- */
-int avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame,
-                          int *got_frame_ptr, AVPacket *avpkt);
-
-/**
- * Decode the video frame of size avpkt->size from avpkt->data into picture.
- * Some decoders may support multiple frames in a single AVPacket, such
- * decoders would then just decode the first frame.
- *
- * @warning The input buffer must be FF_INPUT_BUFFER_PADDING_SIZE larger than
- * the actual read bytes because some optimized bitstream readers read 32 or 64
- * bits at once and could read over the end.
- *
- * @warning The end of the input buffer buf should be set to 0 to ensure that
- * no overreading happens for damaged MPEG streams.
- *
- * @note You might have to align the input buffer avpkt->data.
- * The alignment requirements depend on the CPU: on some CPUs it isn't
- * necessary at all, on others it won't work at all if not aligned and on others
- * it will work but it will have an impact on performance.
- *
- * In practice, avpkt->data should have 4 byte alignment at minimum.
- *
- * @note Codecs which have the CODEC_CAP_DELAY capability set have a delay
- * between input and output, these need to be fed with avpkt->data=NULL,
- * avpkt->size=0 at the end to return the remaining frames.
- *
- * @param avctx the codec context
- * @param[out] picture The AVFrame in which the decoded video frame will be stored.
- *             Use avcodec_alloc_frame to get an AVFrame, the codec will
- *             allocate memory for the actual bitmap.
- *             with default get/release_buffer(), the decoder frees/reuses the bitmap as it sees fit.
- *             with overridden get/release_buffer() (needs CODEC_CAP_DR1) the user decides into what buffer the decoder
- *                   decodes and the decoder tells the user once it does not need the data anymore,
- *                   the user app can at this point free/reuse/keep the memory as it sees fit.
- *
- * @param[in] avpkt The input AVpacket containing the input buffer.
- *            You can create such packet with av_init_packet() and by then setting
- *            data and size, some decoders might in addition need other fields like
- *            flags&AV_PKT_FLAG_KEY. All decoders are designed to use the least
- *            fields possible.
- * @param[in,out] got_picture_ptr Zero if no frame could be decompressed, otherwise, it is nonzero.
- * @return On error a negative value is returned, otherwise the number of bytes
- * used or zero if no frame could be decompressed.
- */
-int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
-                         int *got_picture_ptr,
-                         AVPacket *avpkt);
-
-/**
- * Decode a subtitle message.
- * Return a negative value on error, otherwise return the number of bytes used.
- * If no subtitle could be decompressed, got_sub_ptr is zero.
- * Otherwise, the subtitle is stored in *sub.
- * Note that CODEC_CAP_DR1 is not available for subtitle codecs. This is for
- * simplicity, because the performance difference is expect to be negligible
- * and reusing a get_buffer written for video codecs would probably perform badly
- * due to a potentially very different allocation pattern.
- *
- * @param avctx the codec context
- * @param[out] sub The AVSubtitle in which the decoded subtitle will be stored, must be
-                   freed with avsubtitle_free if *got_sub_ptr is set.
- * @param[in,out] got_sub_ptr Zero if no subtitle could be decompressed, otherwise, it is nonzero.
- * @param[in] avpkt The input AVPacket containing the input buffer.
- */
-int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
-                            int *got_sub_ptr,
-                            AVPacket *avpkt);
-
-/**
- * @defgroup lavc_parsing Frame parsing
- * @{
- */
-
-typedef struct AVCodecParserContext {
-    void *priv_data;
-    struct AVCodecParser *parser;
-    int64_t frame_offset; /* offset of the current frame */
-    int64_t cur_offset; /* current offset
-                           (incremented by each av_parser_parse()) */
-    int64_t next_frame_offset; /* offset of the next frame */
-    /* video info */
-    int pict_type; /* XXX: Put it back in AVCodecContext. */
-    /**
-     * This field is used for proper frame duration computation in lavf.
-     * It signals, how much longer the frame duration of the current frame
-     * is compared to normal frame duration.
-     *
-     * frame_duration = (1 + repeat_pict) * time_base
-     *
-     * It is used by codecs like H.264 to display telecined material.
-     */
-    int repeat_pict; /* XXX: Put it back in AVCodecContext. */
-    int64_t pts;     /* pts of the current frame */
-    int64_t dts;     /* dts of the current frame */
-
-    /* private data */
-    int64_t last_pts;
-    int64_t last_dts;
-    int fetch_timestamp;
-
-#define AV_PARSER_PTS_NB 4
-    int cur_frame_start_index;
-    int64_t cur_frame_offset[AV_PARSER_PTS_NB];
-    int64_t cur_frame_pts[AV_PARSER_PTS_NB];
-    int64_t cur_frame_dts[AV_PARSER_PTS_NB];
-
-    int flags;
-#define PARSER_FLAG_COMPLETE_FRAMES           0x0001
-#define PARSER_FLAG_ONCE                      0x0002
-/// Set if the parser has a valid file offset
-#define PARSER_FLAG_FETCHED_OFFSET            0x0004
-
-    int64_t offset;      ///< byte offset from starting packet start
-    int64_t cur_frame_end[AV_PARSER_PTS_NB];
-
-    /**
-     * Set by parser to 1 for key frames and 0 for non-key frames.
-     * It is initialized to -1, so if the parser doesn't set this flag,
-     * old-style fallback using AV_PICTURE_TYPE_I picture type as key frames
-     * will be used.
-     */
-    int key_frame;
-
-    /**
-     * Time difference in stream time base units from the pts of this
-     * packet to the point at which the output from the decoder has converged
-     * independent from the availability of previous frames. That is, the
-     * frames are virtually identical no matter if decoding started from
-     * the very first frame or from this keyframe.
-     * Is AV_NOPTS_VALUE if unknown.
-     * This field is not the display duration of the current frame.
-     * This field has no meaning if the packet does not have AV_PKT_FLAG_KEY
-     * set.
-     *
-     * The purpose of this field is to allow seeking in streams that have no
-     * keyframes in the conventional sense. It corresponds to the
-     * recovery point SEI in H.264 and match_time_delta in NUT. It is also
-     * essential for some types of subtitle streams to ensure that all
-     * subtitles are correctly displayed after seeking.
-     */
-    int64_t convergence_duration;
-
-    // Timestamp generation support:
-    /**
-     * Synchronization point for start of timestamp generation.
-     *
-     * Set to >0 for sync point, 0 for no sync point and <0 for undefined
-     * (default).
-     *
-     * For example, this corresponds to presence of H.264 buffering period
-     * SEI message.
-     */
-    int dts_sync_point;
-
-    /**
-     * Offset of the current timestamp against last timestamp sync point in
-     * units of AVCodecContext.time_base.
-     *
-     * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
-     * contain a valid timestamp offset.
-     *
-     * Note that the timestamp of sync point has usually a nonzero
-     * dts_ref_dts_delta, which refers to the previous sync point. Offset of
-     * the next frame after timestamp sync point will be usually 1.
-     *
-     * For example, this corresponds to H.264 cpb_removal_delay.
-     */
-    int dts_ref_dts_delta;
-
-    /**
-     * Presentation delay of current frame in units of AVCodecContext.time_base.
-     *
-     * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
-     * contain valid non-negative timestamp delta (presentation time of a frame
-     * must not lie in the past).
-     *
-     * This delay represents the difference between decoding and presentation
-     * time of the frame.
-     *
-     * For example, this corresponds to H.264 dpb_output_delay.
-     */
-    int pts_dts_delta;
-
-    /**
-     * Position of the packet in file.
-     *
-     * Analogous to cur_frame_pts/dts
-     */
-    int64_t cur_frame_pos[AV_PARSER_PTS_NB];
-
-    /**
-     * Byte position of currently parsed frame in stream.
-     */
-    int64_t pos;
-
-    /**
-     * Previous frame byte position.
-     */
-    int64_t last_pos;
-
-    /**
-     * Duration of the current frame.
-     * For audio, this is in units of 1 / AVCodecContext.sample_rate.
-     * For all other types, this is in units of AVCodecContext.time_base.
-     */
-    int duration;
-} AVCodecParserContext;
-
-typedef struct AVCodecParser {
-    int codec_ids[5]; /* several codec IDs are permitted */
-    int priv_data_size;
-    int (*parser_init)(AVCodecParserContext *s);
-    int (*parser_parse)(AVCodecParserContext *s,
-                        AVCodecContext *avctx,
-                        const uint8_t **poutbuf, int *poutbuf_size,
-                        const uint8_t *buf, int buf_size);
-    void (*parser_close)(AVCodecParserContext *s);
-    int (*split)(AVCodecContext *avctx, const uint8_t *buf, int buf_size);
-    struct AVCodecParser *next;
-} AVCodecParser;
-
-AVCodecParser *av_parser_next(AVCodecParser *c);
-
-void av_register_codec_parser(AVCodecParser *parser);
-AVCodecParserContext *av_parser_init(int codec_id);
-
-/**
- * Parse a packet.
- *
- * @param s             parser context.
- * @param avctx         codec context.
- * @param poutbuf       set to pointer to parsed buffer or NULL if not yet finished.
- * @param poutbuf_size  set to size of parsed buffer or zero if not yet finished.
- * @param buf           input buffer.
- * @param buf_size      input length, to signal EOF, this should be 0 (so that the last frame can be output).
- * @param pts           input presentation timestamp.
- * @param dts           input decoding timestamp.
- * @param pos           input byte position in stream.
- * @return the number of bytes of the input bitstream used.
- *
- * Example:
- * @code
- *   while(in_len){
- *       len = av_parser_parse2(myparser, AVCodecContext, &data, &size,
- *                                        in_data, in_len,
- *                                        pts, dts, pos);
- *       in_data += len;
- *       in_len  -= len;
- *
- *       if(size)
- *          decode_frame(data, size);
- *   }
- * @endcode
- */
-int av_parser_parse2(AVCodecParserContext *s,
-                     AVCodecContext *avctx,
-                     uint8_t **poutbuf, int *poutbuf_size,
-                     const uint8_t *buf, int buf_size,
-                     int64_t pts, int64_t dts,
-                     int64_t pos);
-
-/**
- * @return 0 if the output buffer is a subset of the input, 1 if it is allocated and must be freed
- * @deprecated use AVBitstreamFilter
- */
-int av_parser_change(AVCodecParserContext *s,
-                     AVCodecContext *avctx,
-                     uint8_t **poutbuf, int *poutbuf_size,
-                     const uint8_t *buf, int buf_size, int keyframe);
-void av_parser_close(AVCodecParserContext *s);
-
-/**
- * @}
- * @}
- */
-
-/**
- * @addtogroup lavc_encoding
- * @{
- */
-
-/**
- * Find a registered encoder with a matching codec ID.
- *
- * @param id AVCodecID of the requested encoder
- * @return An encoder if one was found, NULL otherwise.
- */
-AVCodec *avcodec_find_encoder(enum AVCodecID id);
-
-/**
- * Find a registered encoder with the specified name.
- *
- * @param name name of the requested encoder
- * @return An encoder if one was found, NULL otherwise.
- */
-AVCodec *avcodec_find_encoder_by_name(const char *name);
-
-#if FF_API_OLD_ENCODE_AUDIO
-/**
- * Encode an audio frame from samples into buf.
- *
- * @deprecated Use avcodec_encode_audio2 instead.
- *
- * @note The output buffer should be at least FF_MIN_BUFFER_SIZE bytes large.
- * However, for codecs with avctx->frame_size equal to 0 (e.g. PCM) the user
- * will know how much space is needed because it depends on the value passed
- * in buf_size as described below. In that case a lower value can be used.
- *
- * @param avctx the codec context
- * @param[out] buf the output buffer
- * @param[in] buf_size the output buffer size
- * @param[in] samples the input buffer containing the samples
- * The number of samples read from this buffer is frame_size*channels,
- * both of which are defined in avctx.
- * For codecs which have avctx->frame_size equal to 0 (e.g. PCM) the number of
- * samples read from samples is equal to:
- * buf_size * 8 / (avctx->channels * av_get_bits_per_sample(avctx->codec_id))
- * This also implies that av_get_bits_per_sample() must not return 0 for these
- * codecs.
- * @return On error a negative value is returned, on success zero or the number
- * of bytes used to encode the data read from the input buffer.
- */
-int attribute_deprecated avcodec_encode_audio(AVCodecContext *avctx,
-                                              uint8_t *buf, int buf_size,
-                                              const short *samples);
-#endif
-
-/**
- * Encode a frame of audio.
- *
- * Takes input samples from frame and writes the next output packet, if
- * available, to avpkt. The output packet does not necessarily contain data for
- * the most recent frame, as encoders can delay, split, and combine input frames
- * internally as needed.
- *
- * @param avctx     codec context
- * @param avpkt     output AVPacket.
- *                  The user can supply an output buffer by setting
- *                  avpkt->data and avpkt->size prior to calling the
- *                  function, but if the size of the user-provided data is not
- *                  large enough, encoding will fail. All other AVPacket fields
- *                  will be reset by the encoder using av_init_packet(). If
- *                  avpkt->data is NULL, the encoder will allocate it.
- *                  The encoder will set avpkt->size to the size of the
- *                  output packet.
- *
- *                  If this function fails or produces no output, avpkt will be
- *                  freed using av_free_packet() (i.e. avpkt->destruct will be
- *                  called to free the user supplied buffer).
- * @param[in] frame AVFrame containing the raw audio data to be encoded.
- *                  May be NULL when flushing an encoder that has the
- *                  CODEC_CAP_DELAY capability set.
- *                  If CODEC_CAP_VARIABLE_FRAME_SIZE is set, then each frame
- *                  can have any number of samples.
- *                  If it is not set, frame->nb_samples must be equal to
- *                  avctx->frame_size for all frames except the last.
- *                  The final frame may be smaller than avctx->frame_size.
- * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the
- *                            output packet is non-empty, and to 0 if it is
- *                            empty. If the function returns an error, the
- *                            packet can be assumed to be invalid, and the
- *                            value of got_packet_ptr is undefined and should
- *                            not be used.
- * @return          0 on success, negative error code on failure
- */
-int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt,
-                          const AVFrame *frame, int *got_packet_ptr);
-
-#if FF_API_OLD_ENCODE_VIDEO
-/**
- * @deprecated use avcodec_encode_video2() instead.
- *
- * Encode a video frame from pict into buf.
- * The input picture should be
- * stored using a specific format, namely avctx.pix_fmt.
- *
- * @param avctx the codec context
- * @param[out] buf the output buffer for the bitstream of encoded frame
- * @param[in] buf_size the size of the output buffer in bytes
- * @param[in] pict the input picture to encode
- * @return On error a negative value is returned, on success zero or the number
- * of bytes used from the output buffer.
- */
-attribute_deprecated
-int avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size,
-                         const AVFrame *pict);
-#endif
-
-/**
- * Encode a frame of video.
- *
- * Takes input raw video data from frame and writes the next output packet, if
- * available, to avpkt. The output packet does not necessarily contain data for
- * the most recent frame, as encoders can delay and reorder input frames
- * internally as needed.
- *
- * @param avctx     codec context
- * @param avpkt     output AVPacket.
- *                  The user can supply an output buffer by setting
- *                  avpkt->data and avpkt->size prior to calling the
- *                  function, but if the size of the user-provided data is not
- *                  large enough, encoding will fail. All other AVPacket fields
- *                  will be reset by the encoder using av_init_packet(). If
- *                  avpkt->data is NULL, the encoder will allocate it.
- *                  The encoder will set avpkt->size to the size of the
- *                  output packet. The returned data (if any) belongs to the
- *                  caller, he is responsible for freeing it.
- *
- *                  If this function fails or produces no output, avpkt will be
- *                  freed using av_free_packet() (i.e. avpkt->destruct will be
- *                  called to free the user supplied buffer).
- * @param[in] frame AVFrame containing the raw video data to be encoded.
- *                  May be NULL when flushing an encoder that has the
- *                  CODEC_CAP_DELAY capability set.
- * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the
- *                            output packet is non-empty, and to 0 if it is
- *                            empty. If the function returns an error, the
- *                            packet can be assumed to be invalid, and the
- *                            value of got_packet_ptr is undefined and should
- *                            not be used.
- * @return          0 on success, negative error code on failure
- */
-int avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt,
-                          const AVFrame *frame, int *got_packet_ptr);
-
-int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size,
-                            const AVSubtitle *sub);
-
-
-/**
- * @}
- */
-
-#if FF_API_AVCODEC_RESAMPLE
-/**
- * @defgroup lavc_resample Audio resampling
- * @ingroup libavc
- * @deprecated use libavresample instead
- *
- * @{
- */
-struct ReSampleContext;
-struct AVResampleContext;
-
-typedef struct ReSampleContext ReSampleContext;
-
-/**
- *  Initialize audio resampling context.
- *
- * @param output_channels  number of output channels
- * @param input_channels   number of input channels
- * @param output_rate      output sample rate
- * @param input_rate       input sample rate
- * @param sample_fmt_out   requested output sample format
- * @param sample_fmt_in    input sample format
- * @param filter_length    length of each FIR filter in the filterbank relative to the cutoff frequency
- * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
- * @param linear           if 1 then the used FIR filter will be linearly interpolated
-                           between the 2 closest, if 0 the closest will be used
- * @param cutoff           cutoff frequency, 1.0 corresponds to half the output sampling rate
- * @return allocated ReSampleContext, NULL if error occurred
- */
-attribute_deprecated
-ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
-                                        int output_rate, int input_rate,
-                                        enum AVSampleFormat sample_fmt_out,
-                                        enum AVSampleFormat sample_fmt_in,
-                                        int filter_length, int log2_phase_count,
-                                        int linear, double cutoff);
-
-attribute_deprecated
-int audio_resample(ReSampleContext *s, short *output, short *input, int nb_samples);
-
-/**
- * Free resample context.
- *
- * @param s a non-NULL pointer to a resample context previously
- *          created with av_audio_resample_init()
- */
-attribute_deprecated
-void audio_resample_close(ReSampleContext *s);
-
-
-/**
- * Initialize an audio resampler.
- * Note, if either rate is not an integer then simply scale both rates up so they are.
- * @param filter_length length of each FIR filter in the filterbank relative to the cutoff freq
- * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
- * @param linear If 1 then the used FIR filter will be linearly interpolated
-                 between the 2 closest, if 0 the closest will be used
- * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate
- */
-attribute_deprecated
-struct AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_length, int log2_phase_count, int linear, double cutoff);
-
-/**
- * Resample an array of samples using a previously configured context.
- * @param src an array of unconsumed samples
- * @param consumed the number of samples of src which have been consumed are returned here
- * @param src_size the number of unconsumed samples available
- * @param dst_size the amount of space in samples available in dst
- * @param update_ctx If this is 0 then the context will not be modified, that way several channels can be resampled with the same context.
- * @return the number of samples written in dst or -1 if an error occurred
- */
-attribute_deprecated
-int av_resample(struct AVResampleContext *c, short *dst, short *src, int *consumed, int src_size, int dst_size, int update_ctx);
-
-
-/**
- * Compensate samplerate/timestamp drift. The compensation is done by changing
- * the resampler parameters, so no audible clicks or similar distortions occur
- * @param compensation_distance distance in output samples over which the compensation should be performed
- * @param sample_delta number of output samples which should be output less
- *
- * example: av_resample_compensate(c, 10, 500)
- * here instead of 510 samples only 500 samples would be output
- *
- * note, due to rounding the actual compensation might be slightly different,
- * especially if the compensation_distance is large and the in_rate used during init is small
- */
-attribute_deprecated
-void av_resample_compensate(struct AVResampleContext *c, int sample_delta, int compensation_distance);
-attribute_deprecated
-void av_resample_close(struct AVResampleContext *c);
-
-/**
- * @}
- */
-#endif
-
-/**
- * @addtogroup lavc_picture
- * @{
- */
-
-/**
- * Allocate memory for a picture.  Call avpicture_free() to free it.
- *
- * @see avpicture_fill()
- *
- * @param picture the picture to be filled in
- * @param pix_fmt the format of the picture
- * @param width the width of the picture
- * @param height the height of the picture
- * @return zero if successful, a negative value if not
- */
-int avpicture_alloc(AVPicture *picture, enum AVPixelFormat pix_fmt, int width, int height);
-
-/**
- * Free a picture previously allocated by avpicture_alloc().
- * The data buffer used by the AVPicture is freed, but the AVPicture structure
- * itself is not.
- *
- * @param picture the AVPicture to be freed
- */
-void avpicture_free(AVPicture *picture);
-
-/**
- * Fill in the AVPicture fields.
- * The fields of the given AVPicture are filled in by using the 'ptr' address
- * which points to the image data buffer. Depending on the specified picture
- * format, one or multiple image data pointers and line sizes will be set.
- * If a planar format is specified, several pointers will be set pointing to
- * the different picture planes and the line sizes of the different planes
- * will be stored in the lines_sizes array.
- * Call with ptr == NULL to get the required size for the ptr buffer.
- *
- * To allocate the buffer and fill in the AVPicture fields in one call,
- * use avpicture_alloc().
- *
- * @param picture AVPicture whose fields are to be filled in
- * @param ptr Buffer which will contain or contains the actual image data
- * @param pix_fmt The format in which the picture data is stored.
- * @param width the width of the image in pixels
- * @param height the height of the image in pixels
- * @return size of the image data in bytes
- */
-int avpicture_fill(AVPicture *picture, uint8_t *ptr,
-                   enum AVPixelFormat pix_fmt, int width, int height);
-
-/**
- * Copy pixel data from an AVPicture into a buffer.
- * The data is stored compactly, without any gaps for alignment or padding
- * which may be applied by avpicture_fill().
- *
- * @see avpicture_get_size()
- *
- * @param[in] src AVPicture containing image data
- * @param[in] pix_fmt The format in which the picture data is stored.
- * @param[in] width the width of the image in pixels.
- * @param[in] height the height of the image in pixels.
- * @param[out] dest A buffer into which picture data will be copied.
- * @param[in] dest_size The size of 'dest'.
- * @return The number of bytes written to dest, or a negative value (error code) on error.
- */
-int avpicture_layout(const AVPicture* src, enum AVPixelFormat pix_fmt,
-                     int width, int height,
-                     unsigned char *dest, int dest_size);
-
-/**
- * Calculate the size in bytes that a picture of the given width and height
- * would occupy if stored in the given picture format.
- * Note that this returns the size of a compact representation as generated
- * by avpicture_layout(), which can be smaller than the size required for e.g.
- * avpicture_fill().
- *
- * @param pix_fmt the given picture format
- * @param width the width of the image
- * @param height the height of the image
- * @return Image data size in bytes or -1 on error (e.g. too large dimensions).
- */
-int avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height);
-
-/**
- *  deinterlace - if not supported return -1
- */
-int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
-                          enum AVPixelFormat pix_fmt, int width, int height);
-/**
- * Copy image src to dst. Wraps av_picture_data_copy() above.
- */
-void av_picture_copy(AVPicture *dst, const AVPicture *src,
-                     enum AVPixelFormat pix_fmt, int width, int height);
-
-/**
- * Crop image top and left side.
- */
-int av_picture_crop(AVPicture *dst, const AVPicture *src,
-                    enum AVPixelFormat pix_fmt, int top_band, int left_band);
-
-/**
- * Pad image.
- */
-int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, enum AVPixelFormat pix_fmt,
-            int padtop, int padbottom, int padleft, int padright, int *color);
-
-/**
- * @}
- */
-
-/**
- * @defgroup lavc_misc Utility functions
- * @ingroup libavc
- *
- * Miscellaneous utility functions related to both encoding and decoding
- * (or neither).
- * @{
- */
-
-/**
- * @defgroup lavc_misc_pixfmt Pixel formats
- *
- * Functions for working with pixel formats.
- * @{
- */
-
-/**
- * @deprecated Use av_pix_fmt_get_chroma_sub_sample
- */
-
-void attribute_deprecated avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift);
-
-/**
- * Return a value representing the fourCC code associated to the
- * pixel format pix_fmt, or 0 if no associated fourCC code can be
- * found.
- */
-unsigned int avcodec_pix_fmt_to_codec_tag(enum AVPixelFormat pix_fmt);
-
-#define FF_LOSS_RESOLUTION  0x0001 /**< loss due to resolution change */
-#define FF_LOSS_DEPTH       0x0002 /**< loss due to color depth change */
-#define FF_LOSS_COLORSPACE  0x0004 /**< loss due to color space conversion */
-#define FF_LOSS_ALPHA       0x0008 /**< loss of alpha bits */
-#define FF_LOSS_COLORQUANT  0x0010 /**< loss due to color quantization */
-#define FF_LOSS_CHROMA      0x0020 /**< loss of chroma (e.g. RGB to gray conversion) */
-
-/**
- * Compute what kind of losses will occur when converting from one specific
- * pixel format to another.
- * When converting from one pixel format to another, information loss may occur.
- * For example, when converting from RGB24 to GRAY, the color information will
- * be lost. Similarly, other losses occur when converting from some formats to
- * other formats. These losses can involve loss of chroma, but also loss of
- * resolution, loss of color depth, loss due to the color space conversion, loss
- * of the alpha bits or loss due to color quantization.
- * avcodec_get_fix_fmt_loss() informs you about the various types of losses
- * which will occur when converting from one pixel format to another.
- *
- * @param[in] dst_pix_fmt destination pixel format
- * @param[in] src_pix_fmt source pixel format
- * @param[in] has_alpha Whether the source pixel format alpha channel is used.
- * @return Combination of flags informing you what kind of losses will occur.
- */
-int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, enum AVPixelFormat src_pix_fmt,
-                             int has_alpha);
-
-#if FF_API_FIND_BEST_PIX_FMT
-/**
- * @deprecated use avcodec_find_best_pix_fmt2() instead.
- *
- * Find the best pixel format to convert to given a certain source pixel
- * format.  When converting from one pixel format to another, information loss
- * may occur.  For example, when converting from RGB24 to GRAY, the color
- * information will be lost. Similarly, other losses occur when converting from
- * some formats to other formats. avcodec_find_best_pix_fmt() searches which of
- * the given pixel formats should be used to suffer the least amount of loss.
- * The pixel formats from which it chooses one, are determined by the
- * pix_fmt_mask parameter.
- *
- * @code
- * src_pix_fmt = AV_PIX_FMT_YUV420P;
- * pix_fmt_mask = (1 << AV_PIX_FMT_YUV422P) || (1 << AV_PIX_FMT_RGB24);
- * dst_pix_fmt = avcodec_find_best_pix_fmt(pix_fmt_mask, src_pix_fmt, alpha, &loss);
- * @endcode
- *
- * @param[in] pix_fmt_mask bitmask determining which pixel format to choose from
- * @param[in] src_pix_fmt source pixel format
- * @param[in] has_alpha Whether the source pixel format alpha channel is used.
- * @param[out] loss_ptr Combination of flags informing you what kind of losses will occur.
- * @return The best pixel format to convert to or -1 if none was found.
- */
-attribute_deprecated
-enum AVPixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum AVPixelFormat src_pix_fmt,
-                              int has_alpha, int *loss_ptr);
-#endif /* FF_API_FIND_BEST_PIX_FMT */
-
-/**
- * Find the best pixel format to convert to given a certain source pixel
- * format.  When converting from one pixel format to another, information loss
- * may occur.  For example, when converting from RGB24 to GRAY, the color
- * information will be lost. Similarly, other losses occur when converting from
- * some formats to other formats. avcodec_find_best_pix_fmt2() searches which of
- * the given pixel formats should be used to suffer the least amount of loss.
- * The pixel formats from which it chooses one, are determined by the
- * pix_fmt_list parameter.
- *
- *
- * @param[in] pix_fmt_list AV_PIX_FMT_NONE terminated array of pixel formats to choose from
- * @param[in] src_pix_fmt source pixel format
- * @param[in] has_alpha Whether the source pixel format alpha channel is used.
- * @param[out] loss_ptr Combination of flags informing you what kind of losses will occur.
- * @return The best pixel format to convert to or -1 if none was found.
- */
-enum AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat *pix_fmt_list,
-                                              enum AVPixelFormat src_pix_fmt,
-                                              int has_alpha, int *loss_ptr);
-
-enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum AVPixelFormat * fmt);
-
-/**
- * @}
- */
-
-void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
-
-/**
- * Put a string representing the codec tag codec_tag in buf.
- *
- * @param buf_size size in bytes of buf
- * @return the length of the string that would have been generated if
- * enough space had been available, excluding the trailing null
- */
-size_t av_get_codec_tag_string(char *buf, size_t buf_size, unsigned int codec_tag);
-
-void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode);
-
-/**
- * Return a name for the specified profile, if available.
- *
- * @param codec the codec that is searched for the given profile
- * @param profile the profile value for which a name is requested
- * @return A name for the profile if found, NULL otherwise.
- */
-const char *av_get_profile_name(const AVCodec *codec, int profile);
-
-int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size);
-int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count);
-//FIXME func typedef
-
-/**
- * Fill audio frame data and linesize.
- * AVFrame extended_data channel pointers are allocated if necessary for
- * planar audio.
- *
- * @param frame       the AVFrame
- *                    frame->nb_samples must be set prior to calling the
- *                    function. This function fills in frame->data,
- *                    frame->extended_data, frame->linesize[0].
- * @param nb_channels channel count
- * @param sample_fmt  sample format
- * @param buf         buffer to use for frame data
- * @param buf_size    size of buffer
- * @param align       plane size sample alignment (0 = default)
- * @return            0 on success, negative error code on failure
- */
-int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels,
-                             enum AVSampleFormat sample_fmt, const uint8_t *buf,
-                             int buf_size, int align);
-
-/**
- * Flush buffers, should be called when seeking or when switching to a different stream.
- */
-void avcodec_flush_buffers(AVCodecContext *avctx);
-
-void avcodec_default_free_buffers(AVCodecContext *s);
-
-/**
- * Return codec bits per sample.
- *
- * @param[in] codec_id the codec
- * @return Number of bits per sample or zero if unknown for the given codec.
- */
-int av_get_bits_per_sample(enum AVCodecID codec_id);
-
-/**
- * Return codec bits per sample.
- * Only return non-zero if the bits per sample is exactly correct, not an
- * approximation.
- *
- * @param[in] codec_id the codec
- * @return Number of bits per sample or zero if unknown for the given codec.
- */
-int av_get_exact_bits_per_sample(enum AVCodecID codec_id);
-
-/**
- * Return audio frame duration.
- *
- * @param avctx        codec context
- * @param frame_bytes  size of the frame, or 0 if unknown
- * @return             frame duration, in samples, if known. 0 if not able to
- *                     determine.
- */
-int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes);
-
-
-typedef struct AVBitStreamFilterContext {
-    void *priv_data;
-    struct AVBitStreamFilter *filter;
-    AVCodecParserContext *parser;
-    struct AVBitStreamFilterContext *next;
-} AVBitStreamFilterContext;
-
-
-typedef struct AVBitStreamFilter {
-    const char *name;
-    int priv_data_size;
-    int (*filter)(AVBitStreamFilterContext *bsfc,
-                  AVCodecContext *avctx, const char *args,
-                  uint8_t **poutbuf, int *poutbuf_size,
-                  const uint8_t *buf, int buf_size, int keyframe);
-    void (*close)(AVBitStreamFilterContext *bsfc);
-    struct AVBitStreamFilter *next;
-} AVBitStreamFilter;
-
-void av_register_bitstream_filter(AVBitStreamFilter *bsf);
-AVBitStreamFilterContext *av_bitstream_filter_init(const char *name);
-int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc,
-                               AVCodecContext *avctx, const char *args,
-                               uint8_t **poutbuf, int *poutbuf_size,
-                               const uint8_t *buf, int buf_size, int keyframe);
-void av_bitstream_filter_close(AVBitStreamFilterContext *bsf);
-
-AVBitStreamFilter *av_bitstream_filter_next(AVBitStreamFilter *f);
-
-/* memory */
-
-/**
- * Reallocate the given block if it is not large enough, otherwise do nothing.
- *
- * @see av_realloc
- */
-void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size);
-
-/**
- * Allocate a buffer, reusing the given one if large enough.
- *
- * Contrary to av_fast_realloc the current buffer contents might not be
- * preserved and on error the old buffer is freed, thus no special
- * handling to avoid memleaks is necessary.
- *
- * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer
- * @param size size of the buffer *ptr points to
- * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and
- *                 *size 0 if an error occurred.
- */
-void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size);
-
-/**
- * Allocate a buffer with padding, reusing the given one if large enough.
- *
- * Same behaviour av_fast_malloc but the buffer has additional
- * FF_INPUT_PADDING_SIZE at the end which will always memset to 0.
- *
- */
-void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size);
-
-/**
- * Encode extradata length to a buffer. Used by xiph codecs.
- *
- * @param s buffer to write to; must be at least (v/255+1) bytes long
- * @param v size of extradata in bytes
- * @return number of bytes written to the buffer.
- */
-unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
-
-/**
- * Log a generic warning message about a missing feature. This function is
- * intended to be used internally by Libav (libavcodec, libavformat, etc.)
- * only, and would normally not be used by applications.
- * @param[in] avc a pointer to an arbitrary struct of which the first field is
- * a pointer to an AVClass struct
- * @param[in] feature string containing the name of the missing feature
- * @param[in] want_sample indicates if samples are wanted which exhibit this feature.
- * If want_sample is non-zero, additional verbage will be added to the log
- * message which tells the user how to report samples to the development
- * mailing list.
- */
-void av_log_missing_feature(void *avc, const char *feature, int want_sample);
-
-/**
- * Log a generic warning message asking for a sample. This function is
- * intended to be used internally by Libav (libavcodec, libavformat, etc.)
- * only, and would normally not be used by applications.
- * @param[in] avc a pointer to an arbitrary struct of which the first field is
- * a pointer to an AVClass struct
- * @param[in] msg string containing an optional message, or NULL if no message
- */
-void av_log_ask_for_sample(void *avc, const char *msg, ...) av_printf_format(2, 3);
-
-/**
- * Register the hardware accelerator hwaccel.
- */
-void av_register_hwaccel(AVHWAccel *hwaccel);
-
-/**
- * If hwaccel is NULL, returns the first registered hardware accelerator,
- * if hwaccel is non-NULL, returns the next registered hardware accelerator
- * after hwaccel, or NULL if hwaccel is the last one.
- */
-AVHWAccel *av_hwaccel_next(AVHWAccel *hwaccel);
-
-
-/**
- * Lock operation used by lockmgr
- */
-enum AVLockOp {
-  AV_LOCK_CREATE,  ///< Create a mutex
-  AV_LOCK_OBTAIN,  ///< Lock the mutex
-  AV_LOCK_RELEASE, ///< Unlock the mutex
-  AV_LOCK_DESTROY, ///< Free mutex resources
-};
-
-/**
- * Register a user provided lock manager supporting the operations
- * specified by AVLockOp. mutex points to a (void *) where the
- * lockmgr should store/get a pointer to a user allocated mutex. It's
- * NULL upon AV_LOCK_CREATE and != NULL for all other ops.
- *
- * @param cb User defined callback. Note: Libav may invoke calls to this
- *           callback during the call to av_lockmgr_register().
- *           Thus, the application must be prepared to handle that.
- *           If cb is set to NULL the lockmgr will be unregistered.
- *           Also note that during unregistration the previously registered
- *           lockmgr callback may also be invoked.
- */
-int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op));
-
-/**
- * Get the type of the given codec.
- */
-enum AVMediaType avcodec_get_type(enum AVCodecID codec_id);
-
-/**
- * @return a positive value if s is open (i.e. avcodec_open2() was called on it
- * with no corresponding avcodec_close()), 0 otherwise.
- */
-int avcodec_is_open(AVCodecContext *s);
-
-/**
- * @return a non-zero number if codec is an encoder, zero otherwise
- */
-int av_codec_is_encoder(const AVCodec *codec);
-
-/**
- * @return a non-zero number if codec is a decoder, zero otherwise
- */
-int av_codec_is_decoder(const AVCodec *codec);
-
-/**
- * @return descriptor for given codec ID or NULL if no descriptor exists.
- */
-const AVCodecDescriptor *avcodec_descriptor_get(enum AVCodecID id);
-
-/**
- * Iterate over all codec descriptors known to libavcodec.
- *
- * @param prev previous descriptor. NULL to get the first descriptor.
- *
- * @return next descriptor or NULL after the last descriptor
- */
-const AVCodecDescriptor *avcodec_descriptor_next(const AVCodecDescriptor *prev);
-
-/**
- * @return codec descriptor with the given name or NULL if no such descriptor
- *         exists.
- */
-const AVCodecDescriptor *avcodec_descriptor_get_by_name(const char *name);
-
-/**
- * @}
- */
-
-#endif /* AVCODEC_AVCODEC_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/avfft.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/avfft.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/avfft.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/avfft.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_AVFFT_H
-#define AVCODEC_AVFFT_H
-
-/**
- * @file
- * @ingroup lavc_fft
- * FFT functions
- */
-
-/**
- * @defgroup lavc_fft FFT functions
- * @ingroup lavc_misc
- *
- * @{
- */
-
-typedef float FFTSample;
-
-typedef struct FFTComplex {
-    FFTSample re, im;
-} FFTComplex;
-
-typedef struct FFTContext FFTContext;
-
-/**
- * Set up a complex FFT.
- * @param nbits           log2 of the length of the input array
- * @param inverse         if 0 perform the forward transform, if 1 perform the inverse
- */
-FFTContext *av_fft_init(int nbits, int inverse);
-
-/**
- * Do the permutation needed BEFORE calling ff_fft_calc().
- */
-void av_fft_permute(FFTContext *s, FFTComplex *z);
-
-/**
- * Do a complex FFT with the parameters defined in av_fft_init(). The
- * input data must be permuted before. No 1.0/sqrt(n) normalization is done.
- */
-void av_fft_calc(FFTContext *s, FFTComplex *z);
-
-void av_fft_end(FFTContext *s);
-
-FFTContext *av_mdct_init(int nbits, int inverse, double scale);
-void av_imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input);
-void av_imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input);
-void av_mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input);
-void av_mdct_end(FFTContext *s);
-
-/* Real Discrete Fourier Transform */
-
-enum RDFTransformType {
-    DFT_R2C,
-    IDFT_C2R,
-    IDFT_R2C,
-    DFT_C2R,
-};
-
-typedef struct RDFTContext RDFTContext;
-
-/**
- * Set up a real FFT.
- * @param nbits           log2 of the length of the input array
- * @param trans           the type of transform
- */
-RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans);
-void av_rdft_calc(RDFTContext *s, FFTSample *data);
-void av_rdft_end(RDFTContext *s);
-
-/* Discrete Cosine Transform */
-
-typedef struct DCTContext DCTContext;
-
-enum DCTTransformType {
-    DCT_II = 0,
-    DCT_III,
-    DCT_I,
-    DST_I,
-};
-
-/**
- * Set up DCT.
- * @param nbits           size of the input array:
- *                        (1 << nbits)     for DCT-II, DCT-III and DST-I
- *                        (1 << nbits) + 1 for DCT-I
- *
- * @note the first element of the input of DST-I is ignored
- */
-DCTContext *av_dct_init(int nbits, enum DCTTransformType type);
-void av_dct_calc(DCTContext *s, FFTSample *data);
-void av_dct_end (DCTContext *s);
-
-/**
- * @}
- */
-
-#endif /* AVCODEC_AVFFT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/dxva2.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/dxva2.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/dxva2.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/dxva2.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-/*
- * DXVA2 HW acceleration
- *
- * copyright (c) 2009 Laurent Aimar
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_DXVA_H
-#define AVCODEC_DXVA_H
-
-/**
- * @file
- * @ingroup lavc_codec_hwaccel_dxva2
- * Public libavcodec DXVA2 header.
- */
-
-#include <stdint.h>
-
-#include <d3d9.h>
-#include <dxva2api.h>
-
-/**
- * @defgroup lavc_codec_hwaccel_dxva2 DXVA2
- * @ingroup lavc_codec_hwaccel
- *
- * @{
- */
-
-#define FF_DXVA2_WORKAROUND_SCALING_LIST_ZIGZAG 1 ///< Work around for DXVA2 and old UVD/UVD+ ATI video cards
-
-/**
- * This structure is used to provides the necessary configurations and data
- * to the DXVA2 Libav HWAccel implementation.
- *
- * The application must make it available as AVCodecContext.hwaccel_context.
- */
-struct dxva_context {
-    /**
-     * DXVA2 decoder object
-     */
-    IDirectXVideoDecoder *decoder;
-
-    /**
-     * DXVA2 configuration used to create the decoder
-     */
-    const DXVA2_ConfigPictureDecode *cfg;
-
-    /**
-     * The number of surface in the surface array
-     */
-    unsigned surface_count;
-
-    /**
-     * The array of Direct3D surfaces used to create the decoder
-     */
-    LPDIRECT3DSURFACE9 *surface;
-
-    /**
-     * A bit field configuring the workarounds needed for using the decoder
-     */
-    uint64_t workaround;
-
-    /**
-     * Private to the Libav AVHWAccel implementation
-     */
-    unsigned report_id;
-};
-
-/**
- * @}
- */
-
-#endif /* AVCODEC_DXVA_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/old_codec_ids.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/old_codec_ids.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/old_codec_ids.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/old_codec_ids.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,366 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_OLD_CODEC_IDS_H
-#define AVCODEC_OLD_CODEC_IDS_H
-
-/*
- * This header exists to prevent new codec IDs from being accidentally added to
- * the deprecated list.
- * Do not include it directly. It will be removed on next major bump
- *
- * Do not add new items to this list. Use the AVCodecID enum instead.
- */
-
-    CODEC_ID_NONE = AV_CODEC_ID_NONE,
-
-    /* video codecs */
-    CODEC_ID_MPEG1VIDEO,
-    CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
-    CODEC_ID_MPEG2VIDEO_XVMC,
-    CODEC_ID_H261,
-    CODEC_ID_H263,
-    CODEC_ID_RV10,
-    CODEC_ID_RV20,
-    CODEC_ID_MJPEG,
-    CODEC_ID_MJPEGB,
-    CODEC_ID_LJPEG,
-    CODEC_ID_SP5X,
-    CODEC_ID_JPEGLS,
-    CODEC_ID_MPEG4,
-    CODEC_ID_RAWVIDEO,
-    CODEC_ID_MSMPEG4V1,
-    CODEC_ID_MSMPEG4V2,
-    CODEC_ID_MSMPEG4V3,
-    CODEC_ID_WMV1,
-    CODEC_ID_WMV2,
-    CODEC_ID_H263P,
-    CODEC_ID_H263I,
-    CODEC_ID_FLV1,
-    CODEC_ID_SVQ1,
-    CODEC_ID_SVQ3,
-    CODEC_ID_DVVIDEO,
-    CODEC_ID_HUFFYUV,
-    CODEC_ID_CYUV,
-    CODEC_ID_H264,
-    CODEC_ID_INDEO3,
-    CODEC_ID_VP3,
-    CODEC_ID_THEORA,
-    CODEC_ID_ASV1,
-    CODEC_ID_ASV2,
-    CODEC_ID_FFV1,
-    CODEC_ID_4XM,
-    CODEC_ID_VCR1,
-    CODEC_ID_CLJR,
-    CODEC_ID_MDEC,
-    CODEC_ID_ROQ,
-    CODEC_ID_INTERPLAY_VIDEO,
-    CODEC_ID_XAN_WC3,
-    CODEC_ID_XAN_WC4,
-    CODEC_ID_RPZA,
-    CODEC_ID_CINEPAK,
-    CODEC_ID_WS_VQA,
-    CODEC_ID_MSRLE,
-    CODEC_ID_MSVIDEO1,
-    CODEC_ID_IDCIN,
-    CODEC_ID_8BPS,
-    CODEC_ID_SMC,
-    CODEC_ID_FLIC,
-    CODEC_ID_TRUEMOTION1,
-    CODEC_ID_VMDVIDEO,
-    CODEC_ID_MSZH,
-    CODEC_ID_ZLIB,
-    CODEC_ID_QTRLE,
-    CODEC_ID_SNOW,
-    CODEC_ID_TSCC,
-    CODEC_ID_ULTI,
-    CODEC_ID_QDRAW,
-    CODEC_ID_VIXL,
-    CODEC_ID_QPEG,
-    CODEC_ID_PNG,
-    CODEC_ID_PPM,
-    CODEC_ID_PBM,
-    CODEC_ID_PGM,
-    CODEC_ID_PGMYUV,
-    CODEC_ID_PAM,
-    CODEC_ID_FFVHUFF,
-    CODEC_ID_RV30,
-    CODEC_ID_RV40,
-    CODEC_ID_VC1,
-    CODEC_ID_WMV3,
-    CODEC_ID_LOCO,
-    CODEC_ID_WNV1,
-    CODEC_ID_AASC,
-    CODEC_ID_INDEO2,
-    CODEC_ID_FRAPS,
-    CODEC_ID_TRUEMOTION2,
-    CODEC_ID_BMP,
-    CODEC_ID_CSCD,
-    CODEC_ID_MMVIDEO,
-    CODEC_ID_ZMBV,
-    CODEC_ID_AVS,
-    CODEC_ID_SMACKVIDEO,
-    CODEC_ID_NUV,
-    CODEC_ID_KMVC,
-    CODEC_ID_FLASHSV,
-    CODEC_ID_CAVS,
-    CODEC_ID_JPEG2000,
-    CODEC_ID_VMNC,
-    CODEC_ID_VP5,
-    CODEC_ID_VP6,
-    CODEC_ID_VP6F,
-    CODEC_ID_TARGA,
-    CODEC_ID_DSICINVIDEO,
-    CODEC_ID_TIERTEXSEQVIDEO,
-    CODEC_ID_TIFF,
-    CODEC_ID_GIF,
-    CODEC_ID_DXA,
-    CODEC_ID_DNXHD,
-    CODEC_ID_THP,
-    CODEC_ID_SGI,
-    CODEC_ID_C93,
-    CODEC_ID_BETHSOFTVID,
-    CODEC_ID_PTX,
-    CODEC_ID_TXD,
-    CODEC_ID_VP6A,
-    CODEC_ID_AMV,
-    CODEC_ID_VB,
-    CODEC_ID_PCX,
-    CODEC_ID_SUNRAST,
-    CODEC_ID_INDEO4,
-    CODEC_ID_INDEO5,
-    CODEC_ID_MIMIC,
-    CODEC_ID_RL2,
-    CODEC_ID_ESCAPE124,
-    CODEC_ID_DIRAC,
-    CODEC_ID_BFI,
-    CODEC_ID_CMV,
-    CODEC_ID_MOTIONPIXELS,
-    CODEC_ID_TGV,
-    CODEC_ID_TGQ,
-    CODEC_ID_TQI,
-    CODEC_ID_AURA,
-    CODEC_ID_AURA2,
-    CODEC_ID_V210X,
-    CODEC_ID_TMV,
-    CODEC_ID_V210,
-    CODEC_ID_DPX,
-    CODEC_ID_MAD,
-    CODEC_ID_FRWU,
-    CODEC_ID_FLASHSV2,
-    CODEC_ID_CDGRAPHICS,
-    CODEC_ID_R210,
-    CODEC_ID_ANM,
-    CODEC_ID_BINKVIDEO,
-    CODEC_ID_IFF_ILBM,
-    CODEC_ID_IFF_BYTERUN1,
-    CODEC_ID_KGV1,
-    CODEC_ID_YOP,
-    CODEC_ID_VP8,
-    CODEC_ID_PICTOR,
-    CODEC_ID_ANSI,
-    CODEC_ID_A64_MULTI,
-    CODEC_ID_A64_MULTI5,
-    CODEC_ID_R10K,
-    CODEC_ID_MXPEG,
-    CODEC_ID_LAGARITH,
-    CODEC_ID_PRORES,
-    CODEC_ID_JV,
-    CODEC_ID_DFA,
-    CODEC_ID_WMV3IMAGE,
-    CODEC_ID_VC1IMAGE,
-    CODEC_ID_UTVIDEO,
-    CODEC_ID_BMV_VIDEO,
-    CODEC_ID_VBLE,
-    CODEC_ID_DXTORY,
-    CODEC_ID_V410,
-    CODEC_ID_XWD,
-    CODEC_ID_CDXL,
-    CODEC_ID_XBM,
-    CODEC_ID_ZEROCODEC,
-    CODEC_ID_MSS1,
-    CODEC_ID_MSA1,
-    CODEC_ID_TSCC2,
-    CODEC_ID_MTS2,
-    CODEC_ID_CLLC,
-
-    /* various PCM "codecs" */
-    CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs
-    CODEC_ID_PCM_S16LE = 0x10000,
-    CODEC_ID_PCM_S16BE,
-    CODEC_ID_PCM_U16LE,
-    CODEC_ID_PCM_U16BE,
-    CODEC_ID_PCM_S8,
-    CODEC_ID_PCM_U8,
-    CODEC_ID_PCM_MULAW,
-    CODEC_ID_PCM_ALAW,
-    CODEC_ID_PCM_S32LE,
-    CODEC_ID_PCM_S32BE,
-    CODEC_ID_PCM_U32LE,
-    CODEC_ID_PCM_U32BE,
-    CODEC_ID_PCM_S24LE,
-    CODEC_ID_PCM_S24BE,
-    CODEC_ID_PCM_U24LE,
-    CODEC_ID_PCM_U24BE,
-    CODEC_ID_PCM_S24DAUD,
-    CODEC_ID_PCM_ZORK,
-    CODEC_ID_PCM_S16LE_PLANAR,
-    CODEC_ID_PCM_DVD,
-    CODEC_ID_PCM_F32BE,
-    CODEC_ID_PCM_F32LE,
-    CODEC_ID_PCM_F64BE,
-    CODEC_ID_PCM_F64LE,
-    CODEC_ID_PCM_BLURAY,
-    CODEC_ID_PCM_LXF,
-    CODEC_ID_S302M,
-    CODEC_ID_PCM_S8_PLANAR,
-
-    /* various ADPCM codecs */
-    CODEC_ID_ADPCM_IMA_QT = 0x11000,
-    CODEC_ID_ADPCM_IMA_WAV,
-    CODEC_ID_ADPCM_IMA_DK3,
-    CODEC_ID_ADPCM_IMA_DK4,
-    CODEC_ID_ADPCM_IMA_WS,
-    CODEC_ID_ADPCM_IMA_SMJPEG,
-    CODEC_ID_ADPCM_MS,
-    CODEC_ID_ADPCM_4XM,
-    CODEC_ID_ADPCM_XA,
-    CODEC_ID_ADPCM_ADX,
-    CODEC_ID_ADPCM_EA,
-    CODEC_ID_ADPCM_G726,
-    CODEC_ID_ADPCM_CT,
-    CODEC_ID_ADPCM_SWF,
-    CODEC_ID_ADPCM_YAMAHA,
-    CODEC_ID_ADPCM_SBPRO_4,
-    CODEC_ID_ADPCM_SBPRO_3,
-    CODEC_ID_ADPCM_SBPRO_2,
-    CODEC_ID_ADPCM_THP,
-    CODEC_ID_ADPCM_IMA_AMV,
-    CODEC_ID_ADPCM_EA_R1,
-    CODEC_ID_ADPCM_EA_R3,
-    CODEC_ID_ADPCM_EA_R2,
-    CODEC_ID_ADPCM_IMA_EA_SEAD,
-    CODEC_ID_ADPCM_IMA_EA_EACS,
-    CODEC_ID_ADPCM_EA_XAS,
-    CODEC_ID_ADPCM_EA_MAXIS_XA,
-    CODEC_ID_ADPCM_IMA_ISS,
-    CODEC_ID_ADPCM_G722,
-    CODEC_ID_ADPCM_IMA_APC,
-
-    /* AMR */
-    CODEC_ID_AMR_NB = 0x12000,
-    CODEC_ID_AMR_WB,
-
-    /* RealAudio codecs*/
-    CODEC_ID_RA_144 = 0x13000,
-    CODEC_ID_RA_288,
-
-    /* various DPCM codecs */
-    CODEC_ID_ROQ_DPCM = 0x14000,
-    CODEC_ID_INTERPLAY_DPCM,
-    CODEC_ID_XAN_DPCM,
-    CODEC_ID_SOL_DPCM,
-
-    /* audio codecs */
-    CODEC_ID_MP2 = 0x15000,
-    CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
-    CODEC_ID_AAC,
-    CODEC_ID_AC3,
-    CODEC_ID_DTS,
-    CODEC_ID_VORBIS,
-    CODEC_ID_DVAUDIO,
-    CODEC_ID_WMAV1,
-    CODEC_ID_WMAV2,
-    CODEC_ID_MACE3,
-    CODEC_ID_MACE6,
-    CODEC_ID_VMDAUDIO,
-    CODEC_ID_FLAC,
-    CODEC_ID_MP3ADU,
-    CODEC_ID_MP3ON4,
-    CODEC_ID_SHORTEN,
-    CODEC_ID_ALAC,
-    CODEC_ID_WESTWOOD_SND1,
-    CODEC_ID_GSM, ///< as in Berlin toast format
-    CODEC_ID_QDM2,
-    CODEC_ID_COOK,
-    CODEC_ID_TRUESPEECH,
-    CODEC_ID_TTA,
-    CODEC_ID_SMACKAUDIO,
-    CODEC_ID_QCELP,
-    CODEC_ID_WAVPACK,
-    CODEC_ID_DSICINAUDIO,
-    CODEC_ID_IMC,
-    CODEC_ID_MUSEPACK7,
-    CODEC_ID_MLP,
-    CODEC_ID_GSM_MS, /* as found in WAV */
-    CODEC_ID_ATRAC3,
-    CODEC_ID_VOXWARE,
-    CODEC_ID_APE,
-    CODEC_ID_NELLYMOSER,
-    CODEC_ID_MUSEPACK8,
-    CODEC_ID_SPEEX,
-    CODEC_ID_WMAVOICE,
-    CODEC_ID_WMAPRO,
-    CODEC_ID_WMALOSSLESS,
-    CODEC_ID_ATRAC3P,
-    CODEC_ID_EAC3,
-    CODEC_ID_SIPR,
-    CODEC_ID_MP1,
-    CODEC_ID_TWINVQ,
-    CODEC_ID_TRUEHD,
-    CODEC_ID_MP4ALS,
-    CODEC_ID_ATRAC1,
-    CODEC_ID_BINKAUDIO_RDFT,
-    CODEC_ID_BINKAUDIO_DCT,
-    CODEC_ID_AAC_LATM,
-    CODEC_ID_QDMC,
-    CODEC_ID_CELT,
-    CODEC_ID_G723_1,
-    CODEC_ID_G729,
-    CODEC_ID_8SVX_EXP,
-    CODEC_ID_8SVX_FIB,
-    CODEC_ID_BMV_AUDIO,
-    CODEC_ID_RALF,
-    CODEC_ID_IAC,
-    CODEC_ID_ILBC,
-
-    /* subtitle codecs */
-    CODEC_ID_FIRST_SUBTITLE = 0x17000,          ///< A dummy ID pointing at the start of subtitle codecs.
-    CODEC_ID_DVD_SUBTITLE = 0x17000,
-    CODEC_ID_DVB_SUBTITLE,
-    CODEC_ID_TEXT,  ///< raw UTF-8 text
-    CODEC_ID_XSUB,
-    CODEC_ID_SSA,
-    CODEC_ID_MOV_TEXT,
-    CODEC_ID_HDMV_PGS_SUBTITLE,
-    CODEC_ID_DVB_TELETEXT,
-    CODEC_ID_SRT,
-
-    /* other specific kind of codecs (generally used for attachments) */
-    CODEC_ID_FIRST_UNKNOWN = 0x18000,           ///< A dummy ID pointing at the start of various fake codecs.
-    CODEC_ID_TTF = 0x18000,
-
-    CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it
-
-    CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
-                                * stream (only used by libavformat) */
-    CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
-                                * stream (only used by libavformat) */
-    CODEC_ID_FFMETADATA = 0x21000,   ///< Dummy codec for streams containing only metadata information.
-
-#endif /* AVCODEC_OLD_CODEC_IDS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/vaapi.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/vaapi.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/vaapi.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/vaapi.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,173 +0,0 @@
-/*
- * Video Acceleration API (shared data between Libav and the video player)
- * HW decode acceleration for MPEG-2, MPEG-4, H.264 and VC-1
- *
- * Copyright (C) 2008-2009 Splitted-Desktop Systems
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VAAPI_H
-#define AVCODEC_VAAPI_H
-
-/**
- * @file
- * @ingroup lavc_codec_hwaccel_vaapi
- * Public libavcodec VA API header.
- */
-
-#include <stdint.h>
-
-/**
- * @defgroup lavc_codec_hwaccel_vaapi VA API Decoding
- * @ingroup lavc_codec_hwaccel
- * @{
- */
-
-/**
- * This structure is used to share data between the Libav library and
- * the client video application.
- * This shall be zero-allocated and available as
- * AVCodecContext.hwaccel_context. All user members can be set once
- * during initialization or through each AVCodecContext.get_buffer()
- * function call. In any case, they must be valid prior to calling
- * decoding functions.
- */
-struct vaapi_context {
-    /**
-     * Window system dependent data
-     *
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    void *display;
-
-    /**
-     * Configuration ID
-     *
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    uint32_t config_id;
-
-    /**
-     * Context ID (video decode pipeline)
-     *
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    uint32_t context_id;
-
-    /**
-     * VAPictureParameterBuffer ID
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t pic_param_buf_id;
-
-    /**
-     * VAIQMatrixBuffer ID
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t iq_matrix_buf_id;
-
-    /**
-     * VABitPlaneBuffer ID (for VC-1 decoding)
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t bitplane_buf_id;
-
-    /**
-     * Slice parameter/data buffer IDs
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t *slice_buf_ids;
-
-    /**
-     * Number of effective slice buffer IDs to send to the HW
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int n_slice_buf_ids;
-
-    /**
-     * Size of pre-allocated slice_buf_ids
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int slice_buf_ids_alloc;
-
-    /**
-     * Pointer to VASliceParameterBuffers
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    void *slice_params;
-
-    /**
-     * Size of a VASliceParameterBuffer element
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int slice_param_size;
-
-    /**
-     * Size of pre-allocated slice_params
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int slice_params_alloc;
-
-    /**
-     * Number of slices currently filled in
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int slice_count;
-
-    /**
-     * Pointer to slice data buffer base
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    const uint8_t *slice_data;
-
-    /**
-     * Current size of slice data
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t slice_data_size;
-};
-
-/* @} */
-
-#endif /* AVCODEC_VAAPI_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/vda.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/vda.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/vda.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/vda.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,217 +0,0 @@
-/*
- * VDA HW acceleration
- *
- * copyright (c) 2011 Sebastien Zwickert
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VDA_H
-#define AVCODEC_VDA_H
-
-/**
- * @file
- * @ingroup lavc_codec_hwaccel_vda
- * Public libavcodec VDA header.
- */
-
-#include "libavcodec/version.h"
-
-#if FF_API_VDA_ASYNC
-#include <pthread.h>
-#endif
-
-#include <stdint.h>
-
-// emmintrin.h is unable to compile with -std=c99 -Werror=missing-prototypes
-// http://openradar.appspot.com/8026390
-#undef __GNUC_STDC_INLINE__
-
-#define Picture QuickdrawPicture
-#include <VideoDecodeAcceleration/VDADecoder.h>
-#undef Picture
-
-/**
- * @defgroup lavc_codec_hwaccel_vda VDA
- * @ingroup lavc_codec_hwaccel
- *
- * @{
- */
-
-#if FF_API_VDA_ASYNC
-/**
- * This structure is used to store decoded frame information and data.
- *
- * @deprecated Use synchronous decoding mode.
- */
-typedef struct vda_frame {
-    /**
-     * The PTS of the frame.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by libavcodec.
-     */
-    int64_t             pts;
-
-    /**
-     * The CoreVideo buffer that contains the decoded data.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by libavcodec.
-     */
-    CVPixelBufferRef    cv_buffer;
-
-    /**
-     * A pointer to the next frame.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by libavcodec.
-     */
-    struct vda_frame    *next_frame;
-} vda_frame;
-#endif
-
-/**
- * This structure is used to provide the necessary configurations and data
- * to the VDA Libav HWAccel implementation.
- *
- * The application must make it available as AVCodecContext.hwaccel_context.
- */
-struct vda_context {
-    /**
-     * VDA decoder object.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by libavcodec.
-     */
-    VDADecoder          decoder;
-
-    /**
-     * The Core Video pixel buffer that contains the current image data.
-     *
-     * encoding: unused
-     * decoding: Set by libavcodec. Unset by user.
-     */
-    CVPixelBufferRef    cv_buffer;
-
-    /**
-     * Use the hardware decoder in synchronous mode.
-     *
-     * encoding: unused
-     * decoding: Set by user.
-     */
-    int                 use_sync_decoding;
-
-#if FF_API_VDA_ASYNC
-    /**
-     * VDA frames queue ordered by presentation timestamp.
-     *
-     * @deprecated Use synchronous decoding mode.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by libavcodec.
-     */
-    vda_frame           *queue;
-
-    /**
-     * Mutex for locking queue operations.
-     *
-     * @deprecated Use synchronous decoding mode.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by libavcodec.
-     */
-    pthread_mutex_t     queue_mutex;
-#endif
-
-    /**
-     * The frame width.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by user.
-     */
-    int                 width;
-
-    /**
-     * The frame height.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by user.
-     */
-    int                 height;
-
-    /**
-     * The frame format.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by user.
-     */
-    int                 format;
-
-    /**
-     * The pixel format for output image buffers.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by user.
-     */
-    OSType              cv_pix_fmt_type;
-
-    /**
-     * The current bitstream buffer.
-     */
-    uint8_t             *priv_bitstream;
-
-    /**
-     * The current size of the bitstream.
-     */
-    int                 priv_bitstream_size;
-
-    /**
-     * The reference size used for fast reallocation.
-     */
-    int                 priv_allocated_size;
-};
-
-/** Create the video decoder. */
-int ff_vda_create_decoder(struct vda_context *vda_ctx,
-                          uint8_t *extradata,
-                          int extradata_size);
-
-/** Destroy the video decoder. */
-int ff_vda_destroy_decoder(struct vda_context *vda_ctx);
-
-#if FF_API_VDA_ASYNC
-/**
- * Return the top frame of the queue.
- *
- * @deprecated Use synchronous decoding mode.
- */
-vda_frame *ff_vda_queue_pop(struct vda_context *vda_ctx);
-
-/**
- * Release the given frame.
- *
- * @deprecated Use synchronous decoding mode.
- */
-void ff_vda_release_vda_frame(vda_frame *frame);
-#endif
-
-/**
- * @}
- */
-
-#endif /* AVCODEC_VDA_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/vdpau.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/vdpau.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/vdpau.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/vdpau.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-/*
- * The Video Decode and Presentation API for UNIX (VDPAU) is used for
- * hardware-accelerated decoding of MPEG-1/2, H.264 and VC-1.
- *
- * Copyright (C) 2008 NVIDIA
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VDPAU_H
-#define AVCODEC_VDPAU_H
-
-/**
- * @file
- * @ingroup lavc_codec_hwaccel_vdpau
- * Public libavcodec VDPAU header.
- */
-
-
-/**
- * @defgroup lavc_codec_hwaccel_vdpau VDPAU Decoder and Renderer
- * @ingroup lavc_codec_hwaccel
- *
- * VDPAU hardware acceleration has two modules
- * - VDPAU decoding
- * - VDPAU presentation
- *
- * The VDPAU decoding module parses all headers using Libav
- * parsing mechanisms and uses VDPAU for the actual decoding.
- *
- * As per the current implementation, the actual decoding
- * and rendering (API calls) are done as part of the VDPAU
- * presentation (vo_vdpau.c) module.
- *
- * @{
- */
-
-#include <vdpau/vdpau.h>
-#include <vdpau/vdpau_x11.h>
-
-/** @brief The videoSurface is used for rendering. */
-#define FF_VDPAU_STATE_USED_FOR_RENDER 1
-
-/**
- * @brief The videoSurface is needed for reference/prediction.
- * The codec manipulates this.
- */
-#define FF_VDPAU_STATE_USED_FOR_REFERENCE 2
-
-/**
- * @brief This structure is used as a callback between the Libav
- * decoder (vd_) and presentation (vo_) module.
- * This is used for defining a video frame containing surface,
- * picture parameter, bitstream information etc which are passed
- * between the Libav decoder and its clients.
- */
-struct vdpau_render_state {
-    VdpVideoSurface surface; ///< Used as rendered surface, never changed.
-
-    int state; ///< Holds FF_VDPAU_STATE_* values.
-
-    /** picture parameter information for all supported codecs */
-    union VdpPictureInfo {
-        VdpPictureInfoH264        h264;
-        VdpPictureInfoMPEG1Or2    mpeg;
-        VdpPictureInfoVC1          vc1;
-        VdpPictureInfoMPEG4Part2 mpeg4;
-    } info;
-
-    /** Describe size/location of the compressed video data.
-        Set to 0 when freeing bitstream_buffers. */
-    int bitstream_buffers_allocated;
-    int bitstream_buffers_used;
-    /** The user is responsible for freeing this buffer using av_freep(). */
-    VdpBitstreamBuffer *bitstream_buffers;
-};
-
-/* @}*/
-
-#endif /* AVCODEC_VDPAU_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/version.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/version.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/version.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/version.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-/*
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VERSION_H
-#define AVCODEC_VERSION_H
-
-/**
- * @file
- * @ingroup libavc
- * Libavcodec version macros.
- */
-
-#define LIBAVCODEC_VERSION_MAJOR 54
-#define LIBAVCODEC_VERSION_MINOR 35
-#define LIBAVCODEC_VERSION_MICRO  0
-
-#define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
-                                               LIBAVCODEC_VERSION_MINOR, \
-                                               LIBAVCODEC_VERSION_MICRO)
-#define LIBAVCODEC_VERSION      AV_VERSION(LIBAVCODEC_VERSION_MAJOR,    \
-                                           LIBAVCODEC_VERSION_MINOR,    \
-                                           LIBAVCODEC_VERSION_MICRO)
-#define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
-
-#define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
-
-/**
- * FF_API_* defines may be placed below to indicate public API that will be
- * dropped at a future version bump. The defines themselves are not part of
- * the public API and may change, break or disappear at any time.
- */
-
-#ifndef FF_API_REQUEST_CHANNELS
-#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_OLD_DECODE_AUDIO
-#define FF_API_OLD_DECODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_OLD_ENCODE_AUDIO
-#define FF_API_OLD_ENCODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_OLD_ENCODE_VIDEO
-#define FF_API_OLD_ENCODE_VIDEO (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_MPV_GLOBAL_OPTS
-#define FF_API_MPV_GLOBAL_OPTS  (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_COLOR_TABLE_ID
-#define FF_API_COLOR_TABLE_ID   (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_INTER_THRESHOLD
-#define FF_API_INTER_THRESHOLD  (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_SUB_ID
-#define FF_API_SUB_ID           (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_DSP_MASK
-#define FF_API_DSP_MASK         (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_FIND_BEST_PIX_FMT
-#define FF_API_FIND_BEST_PIX_FMT (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_CODEC_ID
-#define FF_API_CODEC_ID          (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_VDA_ASYNC
-#define FF_API_VDA_ASYNC         (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_AVCODEC_RESAMPLE
-#define FF_API_AVCODEC_RESAMPLE  (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_LIBMPEG2
-#define FF_API_LIBMPEG2          (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_MMI
-#define FF_API_MMI               (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
-
-#endif /* AVCODEC_VERSION_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/xvmc.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/xvmc.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/xvmc.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/xvmc.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,168 +0,0 @@
-/*
- * Copyright (C) 2003 Ivan Kalvachev
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_XVMC_H
-#define AVCODEC_XVMC_H
-
-/**
- * @file
- * @ingroup lavc_codec_hwaccel_xvmc
- * Public libavcodec XvMC header.
- */
-
-#include <X11/extensions/XvMC.h>
-
-#include "avcodec.h"
-
-/**
- * @defgroup lavc_codec_hwaccel_xvmc XvMC
- * @ingroup lavc_codec_hwaccel
- *
- * @{
- */
-
-#define AV_XVMC_ID                    0x1DC711C0  /**< special value to ensure that regular pixel routines haven't corrupted the struct
-                                                       the number is 1337 speak for the letters IDCT MCo (motion compensation) */
-
-struct xvmc_pix_fmt {
-    /** The field contains the special constant value AV_XVMC_ID.
-        It is used as a test that the application correctly uses the API,
-        and that there is no corruption caused by pixel routines.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             xvmc_id;
-
-    /** Pointer to the block array allocated by XvMCCreateBlocks().
-        The array has to be freed by XvMCDestroyBlocks().
-        Each group of 64 values represents one data block of differential
-        pixel information (in MoCo mode) or coefficients for IDCT.
-        - application - set the pointer during initialization
-        - libavcodec  - fills coefficients/pixel data into the array
-    */
-    short*          data_blocks;
-
-    /** Pointer to the macroblock description array allocated by
-        XvMCCreateMacroBlocks() and freed by XvMCDestroyMacroBlocks().
-        - application - set the pointer during initialization
-        - libavcodec  - fills description data into the array
-    */
-    XvMCMacroBlock* mv_blocks;
-
-    /** Number of macroblock descriptions that can be stored in the mv_blocks
-        array.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             allocated_mv_blocks;
-
-    /** Number of blocks that can be stored at once in the data_blocks array.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             allocated_data_blocks;
-
-    /** Indicate that the hardware would interpret data_blocks as IDCT
-        coefficients and perform IDCT on them.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             idct;
-
-    /** In MoCo mode it indicates that intra macroblocks are assumed to be in
-        unsigned format; same as the XVMC_INTRA_UNSIGNED flag.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             unsigned_intra;
-
-    /** Pointer to the surface allocated by XvMCCreateSurface().
-        It has to be freed by XvMCDestroySurface() on application exit.
-        It identifies the frame and its state on the video hardware.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    XvMCSurface*    p_surface;
-
-/** Set by the decoder before calling ff_draw_horiz_band(),
-    needed by the XvMCRenderSurface function. */
-//@{
-    /** Pointer to the surface used as past reference
-        - application - unchanged
-        - libavcodec  - set
-    */
-    XvMCSurface*    p_past_surface;
-
-    /** Pointer to the surface used as future reference
-        - application - unchanged
-        - libavcodec  - set
-    */
-    XvMCSurface*    p_future_surface;
-
-    /** top/bottom field or frame
-        - application - unchanged
-        - libavcodec  - set
-    */
-    unsigned int    picture_structure;
-
-    /** XVMC_SECOND_FIELD - 1st or 2nd field in the sequence
-        - application - unchanged
-        - libavcodec  - set
-    */
-    unsigned int    flags;
-//}@
-
-    /** Number of macroblock descriptions in the mv_blocks array
-        that have already been passed to the hardware.
-        - application - zeroes it on get_buffer().
-                        A successful ff_draw_horiz_band() may increment it
-                        with filled_mb_block_num or zero both.
-        - libavcodec  - unchanged
-    */
-    int             start_mv_blocks_num;
-
-    /** Number of new macroblock descriptions in the mv_blocks array (after
-        start_mv_blocks_num) that are filled by libavcodec and have to be
-        passed to the hardware.
-        - application - zeroes it on get_buffer() or after successful
-                        ff_draw_horiz_band().
-        - libavcodec  - increment with one of each stored MB
-    */
-    int             filled_mv_blocks_num;
-
-    /** Number of the next free data block; one data block consists of
-        64 short values in the data_blocks array.
-        All blocks before this one have already been claimed by placing their
-        position into the corresponding block description structure field,
-        that are part of the mv_blocks array.
-        - application - zeroes it on get_buffer().
-                        A successful ff_draw_horiz_band() may zero it together
-                        with start_mb_blocks_num.
-        - libavcodec  - each decoded macroblock increases it by the number
-                        of coded blocks it contains.
-    */
-    int             next_free_data_block_num;
-};
-
-/**
- * @}
- */
-
-#endif /* AVCODEC_XVMC_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavformat/avformat.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavformat/avformat.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavformat/avformat.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavformat/avformat.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,1749 +0,0 @@
-/*
- * copyright (c) 2001 Fabrice Bellard
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVFORMAT_AVFORMAT_H
-#define AVFORMAT_AVFORMAT_H
-
-/**
- * @file
- * @ingroup libavf
- * Main libavformat public API header
- */
-
-/**
- * @defgroup libavf I/O and Muxing/Demuxing Library
- * @{
- *
- * Libavformat (lavf) is a library for dealing with various media container
- * formats. Its main two purposes are demuxing - i.e. splitting a media file
- * into component streams, and the reverse process of muxing - writing supplied
- * data in a specified container format. It also has an @ref lavf_io
- * "I/O module" which supports a number of protocols for accessing the data (e.g.
- * file, tcp, http and others). Before using lavf, you need to call
- * av_register_all() to register all compiled muxers, demuxers and protocols.
- * Unless you are absolutely sure you won't use libavformat's network
- * capabilities, you should also call avformat_network_init().
- *
- * A supported input format is described by an AVInputFormat struct, conversely
- * an output format is described by AVOutputFormat. You can iterate over all
- * registered input/output formats using the av_iformat_next() /
- * av_oformat_next() functions. The protocols layer is not part of the public
- * API, so you can only get the names of supported protocols with the
- * avio_enum_protocols() function.
- *
- * Main lavf structure used for both muxing and demuxing is AVFormatContext,
- * which exports all information about the file being read or written. As with
- * most Libav structures, its size is not part of public ABI, so it cannot be
- * allocated on stack or directly with av_malloc(). To create an
- * AVFormatContext, use avformat_alloc_context() (some functions, like
- * avformat_open_input() might do that for you).
- *
- * Most importantly an AVFormatContext contains:
- * @li the @ref AVFormatContext.iformat "input" or @ref AVFormatContext.oformat
- * "output" format. It is either autodetected or set by user for input;
- * always set by user for output.
- * @li an @ref AVFormatContext.streams "array" of AVStreams, which describe all
- * elementary streams stored in the file. AVStreams are typically referred to
- * using their index in this array.
- * @li an @ref AVFormatContext.pb "I/O context". It is either opened by lavf or
- * set by user for input, always set by user for output (unless you are dealing
- * with an AVFMT_NOFILE format).
- *
- * @section lavf_options Passing options to (de)muxers
- * Lavf allows to configure muxers and demuxers using the @ref avoptions
- * mechanism. Generic (format-independent) libavformat options are provided by
- * AVFormatContext, they can be examined from a user program by calling
- * av_opt_next() / av_opt_find() on an allocated AVFormatContext (or its AVClass
- * from avformat_get_class()). Private (format-specific) options are provided by
- * AVFormatContext.priv_data if and only if AVInputFormat.priv_class /
- * AVOutputFormat.priv_class of the corresponding format struct is non-NULL.
- * Further options may be provided by the @ref AVFormatContext.pb "I/O context",
- * if its AVClass is non-NULL, and the protocols layer. See the discussion on
- * nesting in @ref avoptions documentation to learn how to access those.
- *
- * @defgroup lavf_decoding Demuxing
- * @{
- * Demuxers read a media file and split it into chunks of data (@em packets). A
- * @ref AVPacket "packet" contains one or more encoded frames which belongs to a
- * single elementary stream. In the lavf API this process is represented by the
- * avformat_open_input() function for opening a file, av_read_frame() for
- * reading a single packet and finally avformat_close_input(), which does the
- * cleanup.
- *
- * @section lavf_decoding_open Opening a media file
- * The minimum information required to open a file is its URL or filename, which
- * is passed to avformat_open_input(), as in the following code:
- * @code
- * const char    *url = "in.mp3";
- * AVFormatContext *s = NULL;
- * int ret = avformat_open_input(&s, url, NULL, NULL);
- * if (ret < 0)
- *     abort();
- * @endcode
- * The above code attempts to allocate an AVFormatContext, open the
- * specified file (autodetecting the format) and read the header, exporting the
- * information stored there into s. Some formats do not have a header or do not
- * store enough information there, so it is recommended that you call the
- * avformat_find_stream_info() function which tries to read and decode a few
- * frames to find missing information.
- *
- * In some cases you might want to preallocate an AVFormatContext yourself with
- * avformat_alloc_context() and do some tweaking on it before passing it to
- * avformat_open_input(). One such case is when you want to use custom functions
- * for reading input data instead of lavf internal I/O layer.
- * To do that, create your own AVIOContext with avio_alloc_context(), passing
- * your reading callbacks to it. Then set the @em pb field of your
- * AVFormatContext to newly created AVIOContext.
- *
- * Since the format of the opened file is in general not known until after
- * avformat_open_input() has returned, it is not possible to set demuxer private
- * options on a preallocated context. Instead, the options should be passed to
- * avformat_open_input() wrapped in an AVDictionary:
- * @code
- * AVDictionary *options = NULL;
- * av_dict_set(&options, "video_size", "640x480", 0);
- * av_dict_set(&options, "pixel_format", "rgb24", 0);
- *
- * if (avformat_open_input(&s, url, NULL, &options) < 0)
- *     abort();
- * av_dict_free(&options);
- * @endcode
- * This code passes the private options 'video_size' and 'pixel_format' to the
- * demuxer. They would be necessary for e.g. the rawvideo demuxer, since it
- * cannot know how to interpret raw video data otherwise. If the format turns
- * out to be something different than raw video, those options will not be
- * recognized by the demuxer and therefore will not be applied. Such unrecognized
- * options are then returned in the options dictionary (recognized options are
- * consumed). The calling program can handle such unrecognized options as it
- * wishes, e.g.
- * @code
- * AVDictionaryEntry *e;
- * if (e = av_dict_get(options, "", NULL, AV_DICT_IGNORE_SUFFIX)) {
- *     fprintf(stderr, "Option %s not recognized by the demuxer.\n", e->key);
- *     abort();
- * }
- * @endcode
- *
- * After you have finished reading the file, you must close it with
- * avformat_close_input(). It will free everything associated with the file.
- *
- * @section lavf_decoding_read Reading from an opened file
- * Reading data from an opened AVFormatContext is done by repeatedly calling
- * av_read_frame() on it. Each call, if successful, will return an AVPacket
- * containing encoded data for one AVStream, identified by
- * AVPacket.stream_index. This packet may be passed straight into the libavcodec
- * decoding functions avcodec_decode_video2(), avcodec_decode_audio4() or
- * avcodec_decode_subtitle2() if the caller wishes to decode the data.
- *
- * AVPacket.pts, AVPacket.dts and AVPacket.duration timing information will be
- * set if known. They may also be unset (i.e. AV_NOPTS_VALUE for
- * pts/dts, 0 for duration) if the stream does not provide them. The timing
- * information will be in AVStream.time_base units, i.e. it has to be
- * multiplied by the timebase to convert them to seconds.
- *
- * If AVPacket.destruct is set on the returned packet, then the packet is
- * allocated dynamically and the user may keep it indefinitely.
- * Otherwise, if AVPacket.destruct is NULL, the packet data is backed by a
- * static storage somewhere inside the demuxer and the packet is only valid
- * until the next av_read_frame() call or closing the file. If the caller
- * requires a longer lifetime, av_dup_packet() will make an av_malloc()ed copy
- * of it.
- * In both cases, the packet must be freed with av_free_packet() when it is no
- * longer needed.
- *
- * @section lavf_decoding_seek Seeking
- * @}
- *
- * @defgroup lavf_encoding Muxing
- * @{
- * @}
- *
- * @defgroup lavf_io I/O Read/Write
- * @{
- * @}
- *
- * @defgroup lavf_codec Demuxers
- * @{
- * @defgroup lavf_codec_native Native Demuxers
- * @{
- * @}
- * @defgroup lavf_codec_wrappers External library wrappers
- * @{
- * @}
- * @}
- * @defgroup lavf_protos I/O Protocols
- * @{
- * @}
- * @defgroup lavf_internal Internal
- * @{
- * @}
- * @}
- *
- */
-
-#include <time.h>
-#include <stdio.h>  /* FILE */
-#include "libavcodec/avcodec.h"
-#include "libavutil/dict.h"
-#include "libavutil/log.h"
-
-#include "avio.h"
-#include "libavformat/version.h"
-
-#if FF_API_AV_GETTIME
-#include "libavutil/time.h"
-#endif
-
-struct AVFormatContext;
-
-
-/**
- * @defgroup metadata_api Public Metadata API
- * @{
- * @ingroup libavf
- * The metadata API allows libavformat to export metadata tags to a client
- * application when demuxing. Conversely it allows a client application to
- * set metadata when muxing.
- *
- * Metadata is exported or set as pairs of key/value strings in the 'metadata'
- * fields of the AVFormatContext, AVStream, AVChapter and AVProgram structs
- * using the @ref lavu_dict "AVDictionary" API. Like all strings in Libav,
- * metadata is assumed to be UTF-8 encoded Unicode. Note that metadata
- * exported by demuxers isn't checked to be valid UTF-8 in most cases.
- *
- * Important concepts to keep in mind:
- * -  Keys are unique; there can never be 2 tags with the same key. This is
- *    also meant semantically, i.e., a demuxer should not knowingly produce
- *    several keys that are literally different but semantically identical.
- *    E.g., key=Author5, key=Author6. In this example, all authors must be
- *    placed in the same tag.
- * -  Metadata is flat, not hierarchical; there are no subtags. If you
- *    want to store, e.g., the email address of the child of producer Alice
- *    and actor Bob, that could have key=alice_and_bobs_childs_email_address.
- * -  Several modifiers can be applied to the tag name. This is done by
- *    appending a dash character ('-') and the modifier name in the order
- *    they appear in the list below -- e.g. foo-eng-sort, not foo-sort-eng.
- *    -  language -- a tag whose value is localized for a particular language
- *       is appended with the ISO 639-2/B 3-letter language code.
- *       For example: Author-ger=Michael, Author-eng=Mike
- *       The original/default language is in the unqualified "Author" tag.
- *       A demuxer should set a default if it sets any translated tag.
- *    -  sorting  -- a modified version of a tag that should be used for
- *       sorting will have '-sort' appended. E.g. artist="The Beatles",
- *       artist-sort="Beatles, The".
- *
- * -  Demuxers attempt to export metadata in a generic format, however tags
- *    with no generic equivalents are left as they are stored in the container.
- *    Follows a list of generic tag names:
- *
- @verbatim
- album        -- name of the set this work belongs to
- album_artist -- main creator of the set/album, if different from artist.
-                 e.g. "Various Artists" for compilation albums.
- artist       -- main creator of the work
- comment      -- any additional description of the file.
- composer     -- who composed the work, if different from artist.
- copyright    -- name of copyright holder.
- creation_time-- date when the file was created, preferably in ISO 8601.
- date         -- date when the work was created, preferably in ISO 8601.
- disc         -- number of a subset, e.g. disc in a multi-disc collection.
- encoder      -- name/settings of the software/hardware that produced the file.
- encoded_by   -- person/group who created the file.
- filename     -- original name of the file.
- genre        -- <self-evident>.
- language     -- main language in which the work is performed, preferably
-                 in ISO 639-2 format. Multiple languages can be specified by
-                 separating them with commas.
- performer    -- artist who performed the work, if different from artist.
-                 E.g for "Also sprach Zarathustra", artist would be "Richard
-                 Strauss" and performer "London Philharmonic Orchestra".
- publisher    -- name of the label/publisher.
- service_name     -- name of the service in broadcasting (channel name).
- service_provider -- name of the service provider in broadcasting.
- title        -- name of the work.
- track        -- number of this work in the set, can be in form current/total.
- variant_bitrate -- the total bitrate of the bitrate variant that the current stream is part of
- @endverbatim
- *
- * Look in the examples section for an application example how to use the Metadata API.
- *
- * @}
- */
-
-/* packet functions */
-
-
-/**
- * Allocate and read the payload of a packet and initialize its
- * fields with default values.
- *
- * @param pkt packet
- * @param size desired payload size
- * @return >0 (read size) if OK, AVERROR_xxx otherwise
- */
-int av_get_packet(AVIOContext *s, AVPacket *pkt, int size);
-
-
-/**
- * Read data and append it to the current content of the AVPacket.
- * If pkt->size is 0 this is identical to av_get_packet.
- * Note that this uses av_grow_packet and thus involves a realloc
- * which is inefficient. Thus this function should only be used
- * when there is no reasonable way to know (an upper bound of)
- * the final size.
- *
- * @param pkt packet
- * @param size amount of data to read
- * @return >0 (read size) if OK, AVERROR_xxx otherwise, previous data
- *         will not be lost even if an error occurs.
- */
-int av_append_packet(AVIOContext *s, AVPacket *pkt, int size);
-
-/*************************************************/
-/* fractional numbers for exact pts handling */
-
-/**
- * The exact value of the fractional number is: 'val + num / den'.
- * num is assumed to be 0 <= num < den.
- */
-typedef struct AVFrac {
-    int64_t val, num, den;
-} AVFrac;
-
-/*************************************************/
-/* input/output formats */
-
-struct AVCodecTag;
-
-/**
- * This structure contains the data a format has to probe a file.
- */
-typedef struct AVProbeData {
-    const char *filename;
-    unsigned char *buf; /**< Buffer must have AVPROBE_PADDING_SIZE of extra allocated bytes filled with zero. */
-    int buf_size;       /**< Size of buf except extra allocated bytes */
-} AVProbeData;
-
-#define AVPROBE_SCORE_MAX 100               ///< maximum score, half of that is used for file-extension-based detection
-#define AVPROBE_PADDING_SIZE 32             ///< extra allocated bytes at the end of the probe buffer
-
-/// Demuxer will use avio_open, no opened file should be provided by the caller.
-#define AVFMT_NOFILE        0x0001
-#define AVFMT_NEEDNUMBER    0x0002 /**< Needs '%d' in filename. */
-#define AVFMT_SHOW_IDS      0x0008 /**< Show format stream IDs numbers. */
-#define AVFMT_RAWPICTURE    0x0020 /**< Format wants AVPicture structure for
-                                      raw picture data. */
-#define AVFMT_GLOBALHEADER  0x0040 /**< Format wants global header. */
-#define AVFMT_NOTIMESTAMPS  0x0080 /**< Format does not need / have any timestamps. */
-#define AVFMT_GENERIC_INDEX 0x0100 /**< Use generic index building code. */
-#define AVFMT_TS_DISCONT    0x0200 /**< Format allows timestamp discontinuities. Note, muxers always require valid (monotone) timestamps */
-#define AVFMT_VARIABLE_FPS  0x0400 /**< Format allows variable fps. */
-#define AVFMT_NODIMENSIONS  0x0800 /**< Format does not need width/height */
-#define AVFMT_NOSTREAMS     0x1000 /**< Format does not require any streams */
-#define AVFMT_NOBINSEARCH   0x2000 /**< Format does not allow to fallback to binary search via read_timestamp */
-#define AVFMT_NOGENSEARCH   0x4000 /**< Format does not allow to fallback to generic search */
-#define AVFMT_NO_BYTE_SEEK  0x8000 /**< Format does not allow seeking by bytes */
-#define AVFMT_ALLOW_FLUSH  0x10000 /**< Format allows flushing. If not set, the muxer will not receive a NULL packet in the write_packet function. */
-#define AVFMT_TS_NONSTRICT 0x20000 /**< Format does not require strictly
-                                        increasing timestamps, but they must
-                                        still be monotonic */
-
-/**
- * @addtogroup lavf_encoding
- * @{
- */
-typedef struct AVOutputFormat {
-    const char *name;
-    /**
-     * Descriptive name for the format, meant to be more human-readable
-     * than name. You should use the NULL_IF_CONFIG_SMALL() macro
-     * to define it.
-     */
-    const char *long_name;
-    const char *mime_type;
-    const char *extensions; /**< comma-separated filename extensions */
-    /* output support */
-    enum AVCodecID audio_codec;    /**< default audio codec */
-    enum AVCodecID video_codec;    /**< default video codec */
-    enum AVCodecID subtitle_codec; /**< default subtitle codec */
-    /**
-     * can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_RAWPICTURE,
-     * AVFMT_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS,
-     * AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS, AVFMT_ALLOW_FLUSH,
-     * AVFMT_TS_NONSTRICT
-     */
-    int flags;
-
-    /**
-     * List of supported codec_id-codec_tag pairs, ordered by "better
-     * choice first". The arrays are all terminated by AV_CODEC_ID_NONE.
-     */
-    const struct AVCodecTag * const *codec_tag;
-
-
-    const AVClass *priv_class; ///< AVClass for the private context
-
-    /*****************************************************************
-     * No fields below this line are part of the public API. They
-     * may not be used outside of libavformat and can be changed and
-     * removed at will.
-     * New public fields should be added right above.
-     *****************************************************************
-     */
-    struct AVOutputFormat *next;
-    /**
-     * size of private data so that it can be allocated in the wrapper
-     */
-    int priv_data_size;
-
-    int (*write_header)(struct AVFormatContext *);
-    /**
-     * Write a packet. If AVFMT_ALLOW_FLUSH is set in flags,
-     * pkt can be NULL in order to flush data buffered in the muxer.
-     * When flushing, return 0 if there still is more data to flush,
-     * or 1 if everything was flushed and there is no more buffered
-     * data.
-     */
-    int (*write_packet)(struct AVFormatContext *, AVPacket *pkt);
-    int (*write_trailer)(struct AVFormatContext *);
-    /**
-     * Currently only used to set pixel format if not YUV420P.
-     */
-    int (*interleave_packet)(struct AVFormatContext *, AVPacket *out,
-                             AVPacket *in, int flush);
-    /**
-     * Test if the given codec can be stored in this container.
-     *
-     * @return 1 if the codec is supported, 0 if it is not.
-     *         A negative number if unknown.
-     */
-    int (*query_codec)(enum AVCodecID id, int std_compliance);
-} AVOutputFormat;
-/**
- * @}
- */
-
-/**
- * @addtogroup lavf_decoding
- * @{
- */
-typedef struct AVInputFormat {
-    /**
-     * A comma separated list of short names for the format. New names
-     * may be appended with a minor bump.
-     */
-    const char *name;
-
-    /**
-     * Descriptive name for the format, meant to be more human-readable
-     * than name. You should use the NULL_IF_CONFIG_SMALL() macro
-     * to define it.
-     */
-    const char *long_name;
-
-    /**
-     * Can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_SHOW_IDS,
-     * AVFMT_GENERIC_INDEX, AVFMT_TS_DISCONT, AVFMT_NOBINSEARCH,
-     * AVFMT_NOGENSEARCH, AVFMT_NO_BYTE_SEEK.
-     */
-    int flags;
-
-    /**
-     * If extensions are defined, then no probe is done. You should
-     * usually not use extension format guessing because it is not
-     * reliable enough
-     */
-    const char *extensions;
-
-    const struct AVCodecTag * const *codec_tag;
-
-    const AVClass *priv_class; ///< AVClass for the private context
-
-    /*****************************************************************
-     * No fields below this line are part of the public API. They
-     * may not be used outside of libavformat and can be changed and
-     * removed at will.
-     * New public fields should be added right above.
-     *****************************************************************
-     */
-    struct AVInputFormat *next;
-
-    /**
-     * Raw demuxers store their codec ID here.
-     */
-    int raw_codec_id;
-
-    /**
-     * Size of private data so that it can be allocated in the wrapper.
-     */
-    int priv_data_size;
-
-    /**
-     * Tell if a given file has a chance of being parsed as this format.
-     * The buffer provided is guaranteed to be AVPROBE_PADDING_SIZE bytes
-     * big so you do not have to check for that unless you need more.
-     */
-    int (*read_probe)(AVProbeData *);
-
-    /**
-     * Read the format header and initialize the AVFormatContext
-     * structure. Return 0 if OK. Only used in raw format right
-     * now. 'avformat_new_stream' should be called to create new streams.
-     */
-    int (*read_header)(struct AVFormatContext *);
-
-    /**
-     * Read one packet and put it in 'pkt'. pts and flags are also
-     * set. 'avformat_new_stream' can be called only if the flag
-     * AVFMTCTX_NOHEADER is used and only in the calling thread (not in a
-     * background thread).
-     * @return 0 on success, < 0 on error.
-     *         When returning an error, pkt must not have been allocated
-     *         or must be freed before returning
-     */
-    int (*read_packet)(struct AVFormatContext *, AVPacket *pkt);
-
-    /**
-     * Close the stream. The AVFormatContext and AVStreams are not
-     * freed by this function
-     */
-    int (*read_close)(struct AVFormatContext *);
-
-    /**
-     * Seek to a given timestamp relative to the frames in
-     * stream component stream_index.
-     * @param stream_index Must not be -1.
-     * @param flags Selects which direction should be preferred if no exact
-     *              match is available.
-     * @return >= 0 on success (but not necessarily the new offset)
-     */
-    int (*read_seek)(struct AVFormatContext *,
-                     int stream_index, int64_t timestamp, int flags);
-
-    /**
-     * Get the next timestamp in stream[stream_index].time_base units.
-     * @return the timestamp or AV_NOPTS_VALUE if an error occurred
-     */
-    int64_t (*read_timestamp)(struct AVFormatContext *s, int stream_index,
-                              int64_t *pos, int64_t pos_limit);
-
-    /**
-     * Start/resume playing - only meaningful if using a network-based format
-     * (RTSP).
-     */
-    int (*read_play)(struct AVFormatContext *);
-
-    /**
-     * Pause playing - only meaningful if using a network-based format
-     * (RTSP).
-     */
-    int (*read_pause)(struct AVFormatContext *);
-
-    /**
-     * Seek to timestamp ts.
-     * Seeking will be done so that the point from which all active streams
-     * can be presented successfully will be closest to ts and within min/max_ts.
-     * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
-     */
-    int (*read_seek2)(struct AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
-} AVInputFormat;
-/**
- * @}
- */
-
-enum AVStreamParseType {
-    AVSTREAM_PARSE_NONE,
-    AVSTREAM_PARSE_FULL,       /**< full parsing and repack */
-    AVSTREAM_PARSE_HEADERS,    /**< Only parse headers, do not repack. */
-    AVSTREAM_PARSE_TIMESTAMPS, /**< full parsing and interpolation of timestamps for frames not starting on a packet boundary */
-    AVSTREAM_PARSE_FULL_ONCE,  /**< full parsing and repack of the first frame only, only implemented for H.264 currently */
-};
-
-typedef struct AVIndexEntry {
-    int64_t pos;
-    int64_t timestamp;
-#define AVINDEX_KEYFRAME 0x0001
-    int flags:2;
-    int size:30; //Yeah, trying to keep the size of this small to reduce memory requirements (it is 24 vs. 32 bytes due to possible 8-byte alignment).
-    int min_distance;         /**< Minimum distance between this and the previous keyframe, used to avoid unneeded searching. */
-} AVIndexEntry;
-
-#define AV_DISPOSITION_DEFAULT   0x0001
-#define AV_DISPOSITION_DUB       0x0002
-#define AV_DISPOSITION_ORIGINAL  0x0004
-#define AV_DISPOSITION_COMMENT   0x0008
-#define AV_DISPOSITION_LYRICS    0x0010
-#define AV_DISPOSITION_KARAOKE   0x0020
-
-/**
- * Track should be used during playback by default.
- * Useful for subtitle track that should be displayed
- * even when user did not explicitly ask for subtitles.
- */
-#define AV_DISPOSITION_FORCED    0x0040
-#define AV_DISPOSITION_HEARING_IMPAIRED  0x0080  /**< stream for hearing impaired audiences */
-#define AV_DISPOSITION_VISUAL_IMPAIRED   0x0100  /**< stream for visual impaired audiences */
-#define AV_DISPOSITION_CLEAN_EFFECTS     0x0200  /**< stream without voice */
-/**
- * The stream is stored in the file as an attached picture/"cover art" (e.g.
- * APIC frame in ID3v2). The single packet associated with it will be returned
- * among the first few packets read from the file unless seeking takes place.
- * It can also be accessed at any time in AVStream.attached_pic.
- */
-#define AV_DISPOSITION_ATTACHED_PIC      0x0400
-
-/**
- * Stream structure.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVStream) must not be used outside libav*.
- */
-typedef struct AVStream {
-    int index;    /**< stream index in AVFormatContext */
-    /**
-     * Format-specific stream ID.
-     * decoding: set by libavformat
-     * encoding: set by the user, replaced by libavformat if left unset
-     */
-    int id;
-    /**
-     * Codec context associated with this stream. Allocated and freed by
-     * libavformat.
-     *
-     * - decoding: The demuxer exports codec information stored in the headers
-     *             here.
-     * - encoding: The user sets codec information, the muxer writes it to the
-     *             output. Mandatory fields as specified in AVCodecContext
-     *             documentation must be set even if this AVCodecContext is
-     *             not actually used for encoding.
-     */
-    AVCodecContext *codec;
-#if FF_API_R_FRAME_RATE
-    /**
-     * Real base framerate of the stream.
-     * This is the lowest framerate with which all timestamps can be
-     * represented accurately (it is the least common multiple of all
-     * framerates in the stream). Note, this value is just a guess!
-     * For example, if the time base is 1/90000 and all frames have either
-     * approximately 3600 or 1800 timer ticks, then r_frame_rate will be 50/1.
-     */
-    AVRational r_frame_rate;
-#endif
-    void *priv_data;
-
-    /**
-     * encoding: pts generation when outputting stream
-     */
-    struct AVFrac pts;
-
-    /**
-     * This is the fundamental unit of time (in seconds) in terms
-     * of which frame timestamps are represented.
-     *
-     * decoding: set by libavformat
-     * encoding: set by libavformat in avformat_write_header. The muxer may use the
-     * user-provided value of @ref AVCodecContext.time_base "codec->time_base"
-     * as a hint.
-     */
-    AVRational time_base;
-
-    /**
-     * Decoding: pts of the first frame of the stream, in stream time base.
-     * Only set this if you are absolutely 100% sure that the value you set
-     * it to really is the pts of the first frame.
-     * This may be undefined (AV_NOPTS_VALUE).
-     */
-    int64_t start_time;
-
-    /**
-     * Decoding: duration of the stream, in stream time base.
-     * If a source file does not specify a duration, but does specify
-     * a bitrate, this value will be estimated from bitrate and file size.
-     */
-    int64_t duration;
-
-    int64_t nb_frames;                 ///< number of frames in this stream if known or 0
-
-    int disposition; /**< AV_DISPOSITION_* bit field */
-
-    enum AVDiscard discard; ///< Selects which packets can be discarded at will and do not need to be demuxed.
-
-    /**
-     * sample aspect ratio (0 if unknown)
-     * - encoding: Set by user.
-     * - decoding: Set by libavformat.
-     */
-    AVRational sample_aspect_ratio;
-
-    AVDictionary *metadata;
-
-    /**
-     * Average framerate
-     */
-    AVRational avg_frame_rate;
-
-    /**
-     * For streams with AV_DISPOSITION_ATTACHED_PIC disposition, this packet
-     * will contain the attached picture.
-     *
-     * decoding: set by libavformat, must not be modified by the caller.
-     * encoding: unused
-     */
-    AVPacket attached_pic;
-
-    /*****************************************************************
-     * All fields below this line are not part of the public API. They
-     * may not be used outside of libavformat and can be changed and
-     * removed at will.
-     * New public fields should be added right above.
-     *****************************************************************
-     */
-
-    /**
-     * Stream information used internally by av_find_stream_info()
-     */
-#define MAX_STD_TIMEBASES (60*12+5)
-    struct {
-#if FF_API_R_FRAME_RATE
-        int64_t last_dts;
-        int64_t duration_gcd;
-        int duration_count;
-        double duration_error[MAX_STD_TIMEBASES];
-#endif
-        int nb_decoded_frames;
-        int found_decoder;
-
-        /**
-         * Those are used for average framerate estimation.
-         */
-        int64_t fps_first_dts;
-        int     fps_first_dts_idx;
-        int64_t fps_last_dts;
-        int     fps_last_dts_idx;
-
-    } *info;
-
-    int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
-
-    // Timestamp generation support:
-    /**
-     * Timestamp corresponding to the last dts sync point.
-     *
-     * Initialized when AVCodecParserContext.dts_sync_point >= 0 and
-     * a DTS is received from the underlying container. Otherwise set to
-     * AV_NOPTS_VALUE by default.
-     */
-    int64_t reference_dts;
-    int64_t first_dts;
-    int64_t cur_dts;
-    int64_t last_IP_pts;
-    int last_IP_duration;
-
-    /**
-     * Number of packets to buffer for codec probing
-     */
-#define MAX_PROBE_PACKETS 2500
-    int probe_packets;
-
-    /**
-     * Number of frames that have been demuxed during av_find_stream_info()
-     */
-    int codec_info_nb_frames;
-
-    /* av_read_frame() support */
-    enum AVStreamParseType need_parsing;
-    struct AVCodecParserContext *parser;
-
-    /**
-     * last packet in packet_buffer for this stream when muxing.
-     */
-    struct AVPacketList *last_in_packet_buffer;
-    AVProbeData probe_data;
-#define MAX_REORDER_DELAY 16
-    int64_t pts_buffer[MAX_REORDER_DELAY+1];
-
-    AVIndexEntry *index_entries; /**< Only used if the format does not
-                                    support seeking natively. */
-    int nb_index_entries;
-    unsigned int index_entries_allocated_size;
-} AVStream;
-
-#define AV_PROGRAM_RUNNING 1
-
-/**
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVProgram) must not be used outside libav*.
- */
-typedef struct AVProgram {
-    int            id;
-    int            flags;
-    enum AVDiscard discard;        ///< selects which program to discard and which to feed to the caller
-    unsigned int   *stream_index;
-    unsigned int   nb_stream_indexes;
-    AVDictionary *metadata;
-} AVProgram;
-
-#define AVFMTCTX_NOHEADER      0x0001 /**< signal that no header is present
-                                         (streams are added dynamically) */
-
-typedef struct AVChapter {
-    int id;                 ///< unique ID to identify the chapter
-    AVRational time_base;   ///< time base in which the start/end timestamps are specified
-    int64_t start, end;     ///< chapter start/end time in time_base units
-    AVDictionary *metadata;
-} AVChapter;
-
-/**
- * Format I/O context.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVFormatContext) must not be used outside libav*, use
- * avformat_alloc_context() to create an AVFormatContext.
- */
-typedef struct AVFormatContext {
-    /**
-     * A class for logging and AVOptions. Set by avformat_alloc_context().
-     * Exports (de)muxer private options if they exist.
-     */
-    const AVClass *av_class;
-
-    /**
-     * Can only be iformat or oformat, not both at the same time.
-     *
-     * decoding: set by avformat_open_input().
-     * encoding: set by the user.
-     */
-    struct AVInputFormat *iformat;
-    struct AVOutputFormat *oformat;
-
-    /**
-     * Format private data. This is an AVOptions-enabled struct
-     * if and only if iformat/oformat.priv_class is not NULL.
-     */
-    void *priv_data;
-
-    /**
-     * I/O context.
-     *
-     * decoding: either set by the user before avformat_open_input() (then
-     * the user must close it manually) or set by avformat_open_input().
-     * encoding: set by the user.
-     *
-     * Do NOT set this field if AVFMT_NOFILE flag is set in
-     * iformat/oformat.flags. In such a case, the (de)muxer will handle
-     * I/O in some other way and this field will be NULL.
-     */
-    AVIOContext *pb;
-
-    /* stream info */
-    int ctx_flags; /**< Format-specific flags, see AVFMTCTX_xx */
-
-    /**
-     * A list of all streams in the file. New streams are created with
-     * avformat_new_stream().
-     *
-     * decoding: streams are created by libavformat in avformat_open_input().
-     * If AVFMTCTX_NOHEADER is set in ctx_flags, then new streams may also
-     * appear in av_read_frame().
-     * encoding: streams are created by the user before avformat_write_header().
-     */
-    unsigned int nb_streams;
-    AVStream **streams;
-
-    char filename[1024]; /**< input or output filename */
-
-    /**
-     * Decoding: position of the first frame of the component, in
-     * AV_TIME_BASE fractional seconds. NEVER set this value directly:
-     * It is deduced from the AVStream values.
-     */
-    int64_t start_time;
-
-    /**
-     * Decoding: duration of the stream, in AV_TIME_BASE fractional
-     * seconds. Only set this value if you know none of the individual stream
-     * durations and also do not set any of them. This is deduced from the
-     * AVStream values if not set.
-     */
-    int64_t duration;
-
-    /**
-     * Decoding: total stream bitrate in bit/s, 0 if not
-     * available. Never set it directly if the file_size and the
-     * duration are known as Libav can compute it automatically.
-     */
-    int bit_rate;
-
-    unsigned int packet_size;
-    int max_delay;
-
-    int flags;
-#define AVFMT_FLAG_GENPTS       0x0001 ///< Generate missing pts even if it requires parsing future frames.
-#define AVFMT_FLAG_IGNIDX       0x0002 ///< Ignore index.
-#define AVFMT_FLAG_NONBLOCK     0x0004 ///< Do not block when reading packets from input.
-#define AVFMT_FLAG_IGNDTS       0x0008 ///< Ignore DTS on frames that contain both DTS & PTS
-#define AVFMT_FLAG_NOFILLIN     0x0010 ///< Do not infer any values from other values, just return what is stored in the container
-#define AVFMT_FLAG_NOPARSE      0x0020 ///< Do not use AVParsers, you also must set AVFMT_FLAG_NOFILLIN as the fillin code works on frames and no parsing -> no frames. Also seeking to frames can not work if parsing to find frame boundaries has been disabled
-#define AVFMT_FLAG_NOBUFFER     0x0040 ///< Do not buffer frames when possible
-#define AVFMT_FLAG_CUSTOM_IO    0x0080 ///< The caller has supplied a custom AVIOContext, don't avio_close() it.
-#define AVFMT_FLAG_DISCARD_CORRUPT  0x0100 ///< Discard frames marked corrupted
-
-    /**
-     * decoding: size of data to probe; encoding: unused.
-     */
-    unsigned int probesize;
-
-    /**
-     * decoding: maximum time (in AV_TIME_BASE units) during which the input should
-     * be analyzed in avformat_find_stream_info().
-     */
-    int max_analyze_duration;
-
-    const uint8_t *key;
-    int keylen;
-
-    unsigned int nb_programs;
-    AVProgram **programs;
-
-    /**
-     * Forced video codec_id.
-     * Demuxing: Set by user.
-     */
-    enum AVCodecID video_codec_id;
-
-    /**
-     * Forced audio codec_id.
-     * Demuxing: Set by user.
-     */
-    enum AVCodecID audio_codec_id;
-
-    /**
-     * Forced subtitle codec_id.
-     * Demuxing: Set by user.
-     */
-    enum AVCodecID subtitle_codec_id;
-
-    /**
-     * Maximum amount of memory in bytes to use for the index of each stream.
-     * If the index exceeds this size, entries will be discarded as
-     * needed to maintain a smaller size. This can lead to slower or less
-     * accurate seeking (depends on demuxer).
-     * Demuxers for which a full in-memory index is mandatory will ignore
-     * this.
-     * muxing  : unused
-     * demuxing: set by user
-     */
-    unsigned int max_index_size;
-
-    /**
-     * Maximum amount of memory in bytes to use for buffering frames
-     * obtained from realtime capture devices.
-     */
-    unsigned int max_picture_buffer;
-
-    unsigned int nb_chapters;
-    AVChapter **chapters;
-
-    AVDictionary *metadata;
-
-    /**
-     * Start time of the stream in real world time, in microseconds
-     * since the unix epoch (00:00 1st January 1970). That is, pts=0
-     * in the stream was captured at this real world time.
-     * - encoding: Set by user.
-     * - decoding: Unused.
-     */
-    int64_t start_time_realtime;
-
-    /**
-     * decoding: number of frames used to probe fps
-     */
-    int fps_probe_size;
-
-    /**
-     * Error recognition; higher values will detect more errors but may
-     * misdetect some more or less valid parts as errors.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int error_recognition;
-
-    /**
-     * Custom interrupt callbacks for the I/O layer.
-     *
-     * decoding: set by the user before avformat_open_input().
-     * encoding: set by the user before avformat_write_header()
-     * (mainly useful for AVFMT_NOFILE formats). The callback
-     * should also be passed to avio_open2() if it's used to
-     * open the file.
-     */
-    AVIOInterruptCB interrupt_callback;
-
-    /**
-     * Flags to enable debugging.
-     */
-    int debug;
-#define FF_FDEBUG_TS        0x0001
-    /*****************************************************************
-     * All fields below this line are not part of the public API. They
-     * may not be used outside of libavformat and can be changed and
-     * removed at will.
-     * New public fields should be added right above.
-     *****************************************************************
-     */
-
-    /**
-     * This buffer is only needed when packets were already buffered but
-     * not decoded, for example to get the codec parameters in MPEG
-     * streams.
-     */
-    struct AVPacketList *packet_buffer;
-    struct AVPacketList *packet_buffer_end;
-
-    /* av_seek_frame() support */
-    int64_t data_offset; /**< offset of the first packet */
-
-    /**
-     * Raw packets from the demuxer, prior to parsing and decoding.
-     * This buffer is used for buffering packets until the codec can
-     * be identified, as parsing cannot be done without knowing the
-     * codec.
-     */
-    struct AVPacketList *raw_packet_buffer;
-    struct AVPacketList *raw_packet_buffer_end;
-    /**
-     * Packets split by the parser get queued here.
-     */
-    struct AVPacketList *parse_queue;
-    struct AVPacketList *parse_queue_end;
-    /**
-     * Remaining size available for raw_packet_buffer, in bytes.
-     */
-#define RAW_PACKET_BUFFER_SIZE 2500000
-    int raw_packet_buffer_remaining_size;
-} AVFormatContext;
-
-typedef struct AVPacketList {
-    AVPacket pkt;
-    struct AVPacketList *next;
-} AVPacketList;
-
-
-/**
- * @defgroup lavf_core Core functions
- * @ingroup libavf
- *
- * Functions for querying libavformat capabilities, allocating core structures,
- * etc.
- * @{
- */
-
-/**
- * Return the LIBAVFORMAT_VERSION_INT constant.
- */
-unsigned avformat_version(void);
-
-/**
- * Return the libavformat build-time configuration.
- */
-const char *avformat_configuration(void);
-
-/**
- * Return the libavformat license.
- */
-const char *avformat_license(void);
-
-/**
- * Initialize libavformat and register all the muxers, demuxers and
- * protocols. If you do not call this function, then you can select
- * exactly which formats you want to support.
- *
- * @see av_register_input_format()
- * @see av_register_output_format()
- * @see av_register_protocol()
- */
-void av_register_all(void);
-
-void av_register_input_format(AVInputFormat *format);
-void av_register_output_format(AVOutputFormat *format);
-
-/**
- * Do global initialization of network components. This is optional,
- * but recommended, since it avoids the overhead of implicitly
- * doing the setup for each session.
- *
- * Calling this function will become mandatory if using network
- * protocols at some major version bump.
- */
-int avformat_network_init(void);
-
-/**
- * Undo the initialization done by avformat_network_init.
- */
-int avformat_network_deinit(void);
-
-/**
- * If f is NULL, returns the first registered input format,
- * if f is non-NULL, returns the next registered input format after f
- * or NULL if f is the last one.
- */
-AVInputFormat  *av_iformat_next(AVInputFormat  *f);
-
-/**
- * If f is NULL, returns the first registered output format,
- * if f is non-NULL, returns the next registered output format after f
- * or NULL if f is the last one.
- */
-AVOutputFormat *av_oformat_next(AVOutputFormat *f);
-
-/**
- * Allocate an AVFormatContext.
- * avformat_free_context() can be used to free the context and everything
- * allocated by the framework within it.
- */
-AVFormatContext *avformat_alloc_context(void);
-
-/**
- * Free an AVFormatContext and all its streams.
- * @param s context to free
- */
-void avformat_free_context(AVFormatContext *s);
-
-/**
- * Get the AVClass for AVFormatContext. It can be used in combination with
- * AV_OPT_SEARCH_FAKE_OBJ for examining options.
- *
- * @see av_opt_find().
- */
-const AVClass *avformat_get_class(void);
-
-/**
- * Add a new stream to a media file.
- *
- * When demuxing, it is called by the demuxer in read_header(). If the
- * flag AVFMTCTX_NOHEADER is set in s.ctx_flags, then it may also
- * be called in read_packet().
- *
- * When muxing, should be called by the user before avformat_write_header().
- *
- * @param c If non-NULL, the AVCodecContext corresponding to the new stream
- * will be initialized to use this codec. This is needed for e.g. codec-specific
- * defaults to be set, so codec should be provided if it is known.
- *
- * @return newly created stream or NULL on error.
- */
-AVStream *avformat_new_stream(AVFormatContext *s, AVCodec *c);
-
-AVProgram *av_new_program(AVFormatContext *s, int id);
-
-/**
- * @}
- */
-
-
-/**
- * @addtogroup lavf_decoding
- * @{
- */
-
-/**
- * Find AVInputFormat based on the short name of the input format.
- */
-AVInputFormat *av_find_input_format(const char *short_name);
-
-/**
- * Guess the file format.
- *
- * @param is_opened Whether the file is already opened; determines whether
- *                  demuxers with or without AVFMT_NOFILE are probed.
- */
-AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened);
-
-/**
- * Guess the file format.
- *
- * @param is_opened Whether the file is already opened; determines whether
- *                  demuxers with or without AVFMT_NOFILE are probed.
- * @param score_max A probe score larger that this is required to accept a
- *                  detection, the variable is set to the actual detection
- *                  score afterwards.
- *                  If the score is <= AVPROBE_SCORE_MAX / 4 it is recommended
- *                  to retry with a larger probe buffer.
- */
-AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max);
-
-/**
- * Probe a bytestream to determine the input format. Each time a probe returns
- * with a score that is too low, the probe buffer size is increased and another
- * attempt is made. When the maximum probe size is reached, the input format
- * with the highest score is returned.
- *
- * @param pb the bytestream to probe
- * @param fmt the input format is put here
- * @param filename the filename of the stream
- * @param logctx the log context
- * @param offset the offset within the bytestream to probe from
- * @param max_probe_size the maximum probe buffer size (zero for default)
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code otherwise
- */
-int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
-                          const char *filename, void *logctx,
-                          unsigned int offset, unsigned int max_probe_size);
-
-/**
- * Open an input stream and read the header. The codecs are not opened.
- * The stream must be closed with av_close_input_file().
- *
- * @param ps Pointer to user-supplied AVFormatContext (allocated by avformat_alloc_context).
- *           May be a pointer to NULL, in which case an AVFormatContext is allocated by this
- *           function and written into ps.
- *           Note that a user-supplied AVFormatContext will be freed on failure.
- * @param filename Name of the stream to open.
- * @param fmt If non-NULL, this parameter forces a specific input format.
- *            Otherwise the format is autodetected.
- * @param options  A dictionary filled with AVFormatContext and demuxer-private options.
- *                 On return this parameter will be destroyed and replaced with a dict containing
- *                 options that were not found. May be NULL.
- *
- * @return 0 on success, a negative AVERROR on failure.
- *
- * @note If you want to use custom IO, preallocate the format context and set its pb field.
- */
-int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputFormat *fmt, AVDictionary **options);
-
-/**
- * Read packets of a media file to get stream information. This
- * is useful for file formats with no headers such as MPEG. This
- * function also computes the real framerate in case of MPEG-2 repeat
- * frame mode.
- * The logical file position is not changed by this function;
- * examined packets may be buffered for later processing.
- *
- * @param ic media file handle
- * @param options  If non-NULL, an ic.nb_streams long array of pointers to
- *                 dictionaries, where i-th member contains options for
- *                 codec corresponding to i-th stream.
- *                 On return each dictionary will be filled with options that were not found.
- * @return >=0 if OK, AVERROR_xxx on error
- *
- * @note this function isn't guaranteed to open all the codecs, so
- *       options being non-empty at return is a perfectly normal behavior.
- *
- * @todo Let the user decide somehow what information is needed so that
- *       we do not waste time getting stuff the user does not need.
- */
-int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options);
-
-/**
- * Find the "best" stream in the file.
- * The best stream is determined according to various heuristics as the most
- * likely to be what the user expects.
- * If the decoder parameter is non-NULL, av_find_best_stream will find the
- * default decoder for the stream's codec; streams for which no decoder can
- * be found are ignored.
- *
- * @param ic                media file handle
- * @param type              stream type: video, audio, subtitles, etc.
- * @param wanted_stream_nb  user-requested stream number,
- *                          or -1 for automatic selection
- * @param related_stream    try to find a stream related (eg. in the same
- *                          program) to this one, or -1 if none
- * @param decoder_ret       if non-NULL, returns the decoder for the
- *                          selected stream
- * @param flags             flags; none are currently defined
- * @return  the non-negative stream number in case of success,
- *          AVERROR_STREAM_NOT_FOUND if no stream with the requested type
- *          could be found,
- *          AVERROR_DECODER_NOT_FOUND if streams were found but no decoder
- * @note  If av_find_best_stream returns successfully and decoder_ret is not
- *        NULL, then *decoder_ret is guaranteed to be set to a valid AVCodec.
- */
-int av_find_best_stream(AVFormatContext *ic,
-                        enum AVMediaType type,
-                        int wanted_stream_nb,
-                        int related_stream,
-                        AVCodec **decoder_ret,
-                        int flags);
-
-#if FF_API_READ_PACKET
-/**
- * @deprecated use AVFMT_FLAG_NOFILLIN | AVFMT_FLAG_NOPARSE to read raw
- * unprocessed packets
- *
- * Read a transport packet from a media file.
- *
- * This function is obsolete and should never be used.
- * Use av_read_frame() instead.
- *
- * @param s media file handle
- * @param pkt is filled
- * @return 0 if OK, AVERROR_xxx on error
- */
-attribute_deprecated
-int av_read_packet(AVFormatContext *s, AVPacket *pkt);
-#endif
-
-/**
- * Return the next frame of a stream.
- * This function returns what is stored in the file, and does not validate
- * that what is there are valid frames for the decoder. It will split what is
- * stored in the file into frames and return one for each call. It will not
- * omit invalid data between valid frames so as to give the decoder the maximum
- * information possible for decoding.
- *
- * If pkt->destruct is NULL, then the packet is valid until the next
- * av_read_frame() or until av_close_input_file(). Otherwise the packet is valid
- * indefinitely. In both cases the packet must be freed with
- * av_free_packet when it is no longer needed. For video, the packet contains
- * exactly one frame. For audio, it contains an integer number of frames if each
- * frame has a known fixed size (e.g. PCM or ADPCM data). If the audio frames
- * have a variable size (e.g. MPEG audio), then it contains one frame.
- *
- * pkt->pts, pkt->dts and pkt->duration are always set to correct
- * values in AVStream.time_base units (and guessed if the format cannot
- * provide them). pkt->pts can be AV_NOPTS_VALUE if the video format
- * has B-frames, so it is better to rely on pkt->dts if you do not
- * decompress the payload.
- *
- * @return 0 if OK, < 0 on error or end of file
- */
-int av_read_frame(AVFormatContext *s, AVPacket *pkt);
-
-/**
- * Seek to the keyframe at timestamp.
- * 'timestamp' in 'stream_index'.
- * @param stream_index If stream_index is (-1), a default
- * stream is selected, and timestamp is automatically converted
- * from AV_TIME_BASE units to the stream specific time_base.
- * @param timestamp Timestamp in AVStream.time_base units
- *        or, if no stream is specified, in AV_TIME_BASE units.
- * @param flags flags which select direction and seeking mode
- * @return >= 0 on success
- */
-int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp,
-                  int flags);
-
-/**
- * Seek to timestamp ts.
- * Seeking will be done so that the point from which all active streams
- * can be presented successfully will be closest to ts and within min/max_ts.
- * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
- *
- * If flags contain AVSEEK_FLAG_BYTE, then all timestamps are in bytes and
- * are the file position (this may not be supported by all demuxers).
- * If flags contain AVSEEK_FLAG_FRAME, then all timestamps are in frames
- * in the stream with stream_index (this may not be supported by all demuxers).
- * Otherwise all timestamps are in units of the stream selected by stream_index
- * or if stream_index is -1, in AV_TIME_BASE units.
- * If flags contain AVSEEK_FLAG_ANY, then non-keyframes are treated as
- * keyframes (this may not be supported by all demuxers).
- *
- * @param stream_index index of the stream which is used as time base reference
- * @param min_ts smallest acceptable timestamp
- * @param ts target timestamp
- * @param max_ts largest acceptable timestamp
- * @param flags flags
- * @return >=0 on success, error code otherwise
- *
- * @note This is part of the new seek API which is still under construction.
- *       Thus do not use this yet. It may change at any time, do not expect
- *       ABI compatibility yet!
- */
-int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
-
-/**
- * Start playing a network-based stream (e.g. RTSP stream) at the
- * current position.
- */
-int av_read_play(AVFormatContext *s);
-
-/**
- * Pause a network-based stream (e.g. RTSP stream).
- *
- * Use av_read_play() to resume it.
- */
-int av_read_pause(AVFormatContext *s);
-
-#if FF_API_CLOSE_INPUT_FILE
-/**
- * @deprecated use avformat_close_input()
- * Close a media file (but not its codecs).
- *
- * @param s media file handle
- */
-attribute_deprecated
-void av_close_input_file(AVFormatContext *s);
-#endif
-
-/**
- * Close an opened input AVFormatContext. Free it and all its contents
- * and set *s to NULL.
- */
-void avformat_close_input(AVFormatContext **s);
-/**
- * @}
- */
-
-#define AVSEEK_FLAG_BACKWARD 1 ///< seek backward
-#define AVSEEK_FLAG_BYTE     2 ///< seeking based on position in bytes
-#define AVSEEK_FLAG_ANY      4 ///< seek to any frame, even non-keyframes
-#define AVSEEK_FLAG_FRAME    8 ///< seeking based on frame number
-
-/**
- * @addtogroup lavf_encoding
- * @{
- */
-/**
- * Allocate the stream private data and write the stream header to
- * an output media file.
- *
- * @param s Media file handle, must be allocated with avformat_alloc_context().
- *          Its oformat field must be set to the desired output format;
- *          Its pb field must be set to an already openened AVIOContext.
- * @param options  An AVDictionary filled with AVFormatContext and muxer-private options.
- *                 On return this parameter will be destroyed and replaced with a dict containing
- *                 options that were not found. May be NULL.
- *
- * @return 0 on success, negative AVERROR on failure.
- *
- * @see av_opt_find, av_dict_set, avio_open, av_oformat_next.
- */
-int avformat_write_header(AVFormatContext *s, AVDictionary **options);
-
-/**
- * Write a packet to an output media file.
- *
- * The packet shall contain one audio or video frame.
- * The packet must be correctly interleaved according to the container
- * specification, if not then av_interleaved_write_frame must be used.
- *
- * @param s media file handle
- * @param pkt The packet, which contains the stream_index, buf/buf_size,
- *            dts/pts, ...
- *            This can be NULL (at any time, not just at the end), in
- *            order to immediately flush data buffered within the muxer,
- *            for muxers that buffer up data internally before writing it
- *            to the output.
- * @return < 0 on error, = 0 if OK, 1 if flushed and there is no more data to flush
- */
-int av_write_frame(AVFormatContext *s, AVPacket *pkt);
-
-/**
- * Write a packet to an output media file ensuring correct interleaving.
- *
- * The packet must contain one audio or video frame.
- * If the packets are already correctly interleaved, the application should
- * call av_write_frame() instead as it is slightly faster. It is also important
- * to keep in mind that completely non-interleaved input will need huge amounts
- * of memory to interleave with this, so it is preferable to interleave at the
- * demuxer level.
- *
- * @param s media file handle
- * @param pkt The packet containing the data to be written. Libavformat takes
- * ownership of the data and will free it when it sees fit using the packet's
- * @ref AVPacket.destruct "destruct" field. The caller must not access the data
- * after this function returns, as it may already be freed.
- * This can be NULL (at any time, not just at the end), to flush the
- * interleaving queues.
- * Packet's @ref AVPacket.stream_index "stream_index" field must be set to the
- * index of the corresponding stream in @ref AVFormatContext.streams
- * "s.streams".
- * It is very strongly recommended that timing information (@ref AVPacket.pts
- * "pts", @ref AVPacket.dts "dts" @ref AVPacket.duration "duration") is set to
- * correct values.
- *
- * @return 0 on success, a negative AVERROR on error.
- */
-int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt);
-
-#if FF_API_INTERLEAVE_PACKET
-/**
- * @deprecated this function was never meant to be called by the user
- * programs.
- */
-attribute_deprecated
-int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
-                                 AVPacket *pkt, int flush);
-#endif
-
-/**
- * Write the stream trailer to an output media file and free the
- * file private data.
- *
- * May only be called after a successful call to avformat_write_header.
- *
- * @param s media file handle
- * @return 0 if OK, AVERROR_xxx on error
- */
-int av_write_trailer(AVFormatContext *s);
-
-/**
- * Return the output format in the list of registered output formats
- * which best matches the provided parameters, or return NULL if
- * there is no match.
- *
- * @param short_name if non-NULL checks if short_name matches with the
- * names of the registered formats
- * @param filename if non-NULL checks if filename terminates with the
- * extensions of the registered formats
- * @param mime_type if non-NULL checks if mime_type matches with the
- * MIME type of the registered formats
- */
-AVOutputFormat *av_guess_format(const char *short_name,
-                                const char *filename,
-                                const char *mime_type);
-
-/**
- * Guess the codec ID based upon muxer and filename.
- */
-enum AVCodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
-                            const char *filename, const char *mime_type,
-                            enum AVMediaType type);
-
-/**
- * @}
- */
-
-
-/**
- * @defgroup lavf_misc Utility functions
- * @ingroup libavf
- * @{
- *
- * Miscellaneous utility functions related to both muxing and demuxing
- * (or neither).
- */
-
-/**
- * Send a nice hexadecimal dump of a buffer to the specified file stream.
- *
- * @param f The file stream pointer where the dump should be sent to.
- * @param buf buffer
- * @param size buffer size
- *
- * @see av_hex_dump_log, av_pkt_dump2, av_pkt_dump_log2
- */
-void av_hex_dump(FILE *f, const uint8_t *buf, int size);
-
-/**
- * Send a nice hexadecimal dump of a buffer to the log.
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- * pointer to an AVClass struct.
- * @param level The importance level of the message, lower values signifying
- * higher importance.
- * @param buf buffer
- * @param size buffer size
- *
- * @see av_hex_dump, av_pkt_dump2, av_pkt_dump_log2
- */
-void av_hex_dump_log(void *avcl, int level, const uint8_t *buf, int size);
-
-/**
- * Send a nice dump of a packet to the specified file stream.
- *
- * @param f The file stream pointer where the dump should be sent to.
- * @param pkt packet to dump
- * @param dump_payload True if the payload must be displayed, too.
- * @param st AVStream that the packet belongs to
- */
-void av_pkt_dump2(FILE *f, AVPacket *pkt, int dump_payload, AVStream *st);
-
-
-/**
- * Send a nice dump of a packet to the log.
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- * pointer to an AVClass struct.
- * @param level The importance level of the message, lower values signifying
- * higher importance.
- * @param pkt packet to dump
- * @param dump_payload True if the payload must be displayed, too.
- * @param st AVStream that the packet belongs to
- */
-void av_pkt_dump_log2(void *avcl, int level, AVPacket *pkt, int dump_payload,
-                      AVStream *st);
-
-/**
- * Get the AVCodecID for the given codec tag tag.
- * If no codec id is found returns AV_CODEC_ID_NONE.
- *
- * @param tags list of supported codec_id-codec_tag pairs, as stored
- * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
- */
-enum AVCodecID av_codec_get_id(const struct AVCodecTag * const *tags, unsigned int tag);
-
-/**
- * Get the codec tag for the given codec id id.
- * If no codec tag is found returns 0.
- *
- * @param tags list of supported codec_id-codec_tag pairs, as stored
- * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
- */
-unsigned int av_codec_get_tag(const struct AVCodecTag * const *tags, enum AVCodecID id);
-
-int av_find_default_stream_index(AVFormatContext *s);
-
-/**
- * Get the index for a specific timestamp.
- * @param flags if AVSEEK_FLAG_BACKWARD then the returned index will correspond
- *                 to the timestamp which is <= the requested one, if backward
- *                 is 0, then it will be >=
- *              if AVSEEK_FLAG_ANY seek to any frame, only keyframes otherwise
- * @return < 0 if no such timestamp could be found
- */
-int av_index_search_timestamp(AVStream *st, int64_t timestamp, int flags);
-
-/**
- * Add an index entry into a sorted list. Update the entry if the list
- * already contains it.
- *
- * @param timestamp timestamp in the time base of the given stream
- */
-int av_add_index_entry(AVStream *st, int64_t pos, int64_t timestamp,
-                       int size, int distance, int flags);
-
-
-/**
- * Split a URL string into components.
- *
- * The pointers to buffers for storing individual components may be null,
- * in order to ignore that component. Buffers for components not found are
- * set to empty strings. If the port is not found, it is set to a negative
- * value.
- *
- * @param proto the buffer for the protocol
- * @param proto_size the size of the proto buffer
- * @param authorization the buffer for the authorization
- * @param authorization_size the size of the authorization buffer
- * @param hostname the buffer for the host name
- * @param hostname_size the size of the hostname buffer
- * @param port_ptr a pointer to store the port number in
- * @param path the buffer for the path
- * @param path_size the size of the path buffer
- * @param url the URL to split
- */
-void av_url_split(char *proto,         int proto_size,
-                  char *authorization, int authorization_size,
-                  char *hostname,      int hostname_size,
-                  int *port_ptr,
-                  char *path,          int path_size,
-                  const char *url);
-
-
-void av_dump_format(AVFormatContext *ic,
-                    int index,
-                    const char *url,
-                    int is_output);
-
-/**
- * Return in 'buf' the path with '%d' replaced by a number.
- *
- * Also handles the '%0nd' format where 'n' is the total number
- * of digits and '%%'.
- *
- * @param buf destination buffer
- * @param buf_size destination buffer size
- * @param path numbered sequence string
- * @param number frame number
- * @return 0 if OK, -1 on format error
- */
-int av_get_frame_filename(char *buf, int buf_size,
-                          const char *path, int number);
-
-/**
- * Check whether filename actually is a numbered sequence generator.
- *
- * @param filename possible numbered sequence string
- * @return 1 if a valid numbered sequence string, 0 otherwise
- */
-int av_filename_number_test(const char *filename);
-
-/**
- * Generate an SDP for an RTP session.
- *
- * Note, this overwrites the id values of AVStreams in the muxer contexts
- * for getting unique dynamic payload types.
- *
- * @param ac array of AVFormatContexts describing the RTP streams. If the
- *           array is composed by only one context, such context can contain
- *           multiple AVStreams (one AVStream per RTP stream). Otherwise,
- *           all the contexts in the array (an AVCodecContext per RTP stream)
- *           must contain only one AVStream.
- * @param n_files number of AVCodecContexts contained in ac
- * @param buf buffer where the SDP will be stored (must be allocated by
- *            the caller)
- * @param size the size of the buffer
- * @return 0 if OK, AVERROR_xxx on error
- */
-int av_sdp_create(AVFormatContext *ac[], int n_files, char *buf, int size);
-
-/**
- * Return a positive value if the given filename has one of the given
- * extensions, 0 otherwise.
- *
- * @param extensions a comma-separated list of filename extensions
- */
-int av_match_ext(const char *filename, const char *extensions);
-
-/**
- * Test if the given container can store a codec.
- *
- * @param std_compliance standards compliance level, one of FF_COMPLIANCE_*
- *
- * @return 1 if codec with ID codec_id can be stored in ofmt, 0 if it cannot.
- *         A negative number if this information is not available.
- */
-int avformat_query_codec(AVOutputFormat *ofmt, enum AVCodecID codec_id, int std_compliance);
-
-/**
- * @defgroup riff_fourcc RIFF FourCCs
- * @{
- * Get the tables mapping RIFF FourCCs to libavcodec AVCodecIDs. The tables are
- * meant to be passed to av_codec_get_id()/av_codec_get_tag() as in the
- * following code:
- * @code
- * uint32_t tag = MKTAG('H', '2', '6', '4');
- * const struct AVCodecTag *table[] = { avformat_get_riff_video_tags(), 0 };
- * enum AVCodecID id = av_codec_get_id(table, tag);
- * @endcode
- */
-/**
- * @return the table mapping RIFF FourCCs for video to libavcodec AVCodecID.
- */
-const struct AVCodecTag *avformat_get_riff_video_tags(void);
-/**
- * @return the table mapping RIFF FourCCs for audio to AVCodecID.
- */
-const struct AVCodecTag *avformat_get_riff_audio_tags(void);
-/**
- * @}
- */
-
-/**
- * @}
- */
-
-#endif /* AVFORMAT_AVFORMAT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavformat/avio.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavformat/avio.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavformat/avio.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavformat/avio.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,433 +0,0 @@
-/*
- * copyright (c) 2001 Fabrice Bellard
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-#ifndef AVFORMAT_AVIO_H
-#define AVFORMAT_AVIO_H
-
-/**
- * @file
- * @ingroup lavf_io
- * Buffered I/O operations
- */
-
-#include <stdint.h>
-
-#include "libavutil/common.h"
-#include "libavutil/dict.h"
-#include "libavutil/log.h"
-
-#include "libavformat/version.h"
-
-
-#define AVIO_SEEKABLE_NORMAL 0x0001 /**< Seeking works like for a local file */
-
-/**
- * Callback for checking whether to abort blocking functions.
- * AVERROR_EXIT is returned in this case by the interrupted
- * function. During blocking operations, callback is called with
- * opaque as parameter. If the callback returns 1, the
- * blocking operation will be aborted.
- *
- * No members can be added to this struct without a major bump, if
- * new elements have been added after this struct in AVFormatContext
- * or AVIOContext.
- */
-typedef struct AVIOInterruptCB {
-    int (*callback)(void*);
-    void *opaque;
-} AVIOInterruptCB;
-
-/**
- * Bytestream IO Context.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVIOContext) must not be used outside libav*.
- *
- * @note None of the function pointers in AVIOContext should be called
- *       directly, they should only be set by the client application
- *       when implementing custom I/O. Normally these are set to the
- *       function pointers specified in avio_alloc_context()
- */
-typedef struct AVIOContext {
-    /**
-     * A class for private options.
-     *
-     * If this AVIOContext is created by avio_open2(), av_class is set and
-     * passes the options down to protocols.
-     *
-     * If this AVIOContext is manually allocated, then av_class may be set by
-     * the caller.
-     *
-     * warning -- this field can be NULL, be sure to not pass this AVIOContext
-     * to any av_opt_* functions in that case.
-     */
-    const AVClass *av_class;
-    unsigned char *buffer;  /**< Start of the buffer. */
-    int buffer_size;        /**< Maximum buffer size */
-    unsigned char *buf_ptr; /**< Current position in the buffer */
-    unsigned char *buf_end; /**< End of the data, may be less than
-                                 buffer+buffer_size if the read function returned
-                                 less data than requested, e.g. for streams where
-                                 no more data has been received yet. */
-    void *opaque;           /**< A private pointer, passed to the read/write/seek/...
-                                 functions. */
-    int (*read_packet)(void *opaque, uint8_t *buf, int buf_size);
-    int (*write_packet)(void *opaque, uint8_t *buf, int buf_size);
-    int64_t (*seek)(void *opaque, int64_t offset, int whence);
-    int64_t pos;            /**< position in the file of the current buffer */
-    int must_flush;         /**< true if the next seek should flush */
-    int eof_reached;        /**< true if eof reached */
-    int write_flag;         /**< true if open for writing */
-    int max_packet_size;
-    unsigned long checksum;
-    unsigned char *checksum_ptr;
-    unsigned long (*update_checksum)(unsigned long checksum, const uint8_t *buf, unsigned int size);
-    int error;              /**< contains the error code or 0 if no error happened */
-    /**
-     * Pause or resume playback for network streaming protocols - e.g. MMS.
-     */
-    int (*read_pause)(void *opaque, int pause);
-    /**
-     * Seek to a given timestamp in stream with the specified stream_index.
-     * Needed for some network streaming protocols which don't support seeking
-     * to byte position.
-     */
-    int64_t (*read_seek)(void *opaque, int stream_index,
-                         int64_t timestamp, int flags);
-    /**
-     * A combination of AVIO_SEEKABLE_ flags or 0 when the stream is not seekable.
-     */
-    int seekable;
-} AVIOContext;
-
-/* unbuffered I/O */
-
-/**
- * Return AVIO_FLAG_* access flags corresponding to the access permissions
- * of the resource in url, or a negative value corresponding to an
- * AVERROR code in case of failure. The returned access flags are
- * masked by the value in flags.
- *
- * @note This function is intrinsically unsafe, in the sense that the
- * checked resource may change its existence or permission status from
- * one call to another. Thus you should not trust the returned value,
- * unless you are sure that no other processes are accessing the
- * checked resource.
- */
-int avio_check(const char *url, int flags);
-
-/**
- * Allocate and initialize an AVIOContext for buffered I/O. It must be later
- * freed with av_free().
- *
- * @param buffer Memory block for input/output operations via AVIOContext.
- *        The buffer must be allocated with av_malloc() and friends.
- * @param buffer_size The buffer size is very important for performance.
- *        For protocols with fixed blocksize it should be set to this blocksize.
- *        For others a typical size is a cache page, e.g. 4kb.
- * @param write_flag Set to 1 if the buffer should be writable, 0 otherwise.
- * @param opaque An opaque pointer to user-specific data.
- * @param read_packet  A function for refilling the buffer, may be NULL.
- * @param write_packet A function for writing the buffer contents, may be NULL.
- * @param seek A function for seeking to specified byte position, may be NULL.
- *
- * @return Allocated AVIOContext or NULL on failure.
- */
-AVIOContext *avio_alloc_context(
-                  unsigned char *buffer,
-                  int buffer_size,
-                  int write_flag,
-                  void *opaque,
-                  int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
-                  int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
-                  int64_t (*seek)(void *opaque, int64_t offset, int whence));
-
-void avio_w8(AVIOContext *s, int b);
-void avio_write(AVIOContext *s, const unsigned char *buf, int size);
-void avio_wl64(AVIOContext *s, uint64_t val);
-void avio_wb64(AVIOContext *s, uint64_t val);
-void avio_wl32(AVIOContext *s, unsigned int val);
-void avio_wb32(AVIOContext *s, unsigned int val);
-void avio_wl24(AVIOContext *s, unsigned int val);
-void avio_wb24(AVIOContext *s, unsigned int val);
-void avio_wl16(AVIOContext *s, unsigned int val);
-void avio_wb16(AVIOContext *s, unsigned int val);
-
-/**
- * Write a NULL-terminated string.
- * @return number of bytes written.
- */
-int avio_put_str(AVIOContext *s, const char *str);
-
-/**
- * Convert an UTF-8 string to UTF-16LE and write it.
- * @return number of bytes written.
- */
-int avio_put_str16le(AVIOContext *s, const char *str);
-
-/**
- * Passing this as the "whence" parameter to a seek function causes it to
- * return the filesize without seeking anywhere. Supporting this is optional.
- * If it is not supported then the seek function will return <0.
- */
-#define AVSEEK_SIZE 0x10000
-
-/**
- * Oring this flag as into the "whence" parameter to a seek function causes it to
- * seek by any means (like reopening and linear reading) or other normally unreasonble
- * means that can be extreemly slow.
- * This may be ignored by the seek code.
- */
-#define AVSEEK_FORCE 0x20000
-
-/**
- * fseek() equivalent for AVIOContext.
- * @return new position or AVERROR.
- */
-int64_t avio_seek(AVIOContext *s, int64_t offset, int whence);
-
-/**
- * Skip given number of bytes forward
- * @return new position or AVERROR.
- */
-static av_always_inline int64_t avio_skip(AVIOContext *s, int64_t offset)
-{
-    return avio_seek(s, offset, SEEK_CUR);
-}
-
-/**
- * ftell() equivalent for AVIOContext.
- * @return position or AVERROR.
- */
-static av_always_inline int64_t avio_tell(AVIOContext *s)
-{
-    return avio_seek(s, 0, SEEK_CUR);
-}
-
-/**
- * Get the filesize.
- * @return filesize or AVERROR
- */
-int64_t avio_size(AVIOContext *s);
-
-/** @warning currently size is limited */
-int avio_printf(AVIOContext *s, const char *fmt, ...) av_printf_format(2, 3);
-
-void avio_flush(AVIOContext *s);
-
-
-/**
- * Read size bytes from AVIOContext into buf.
- * @return number of bytes read or AVERROR
- */
-int avio_read(AVIOContext *s, unsigned char *buf, int size);
-
-/**
- * @name Functions for reading from AVIOContext
- * @{
- *
- * @note return 0 if EOF, so you cannot use it if EOF handling is
- *       necessary
- */
-int          avio_r8  (AVIOContext *s);
-unsigned int avio_rl16(AVIOContext *s);
-unsigned int avio_rl24(AVIOContext *s);
-unsigned int avio_rl32(AVIOContext *s);
-uint64_t     avio_rl64(AVIOContext *s);
-unsigned int avio_rb16(AVIOContext *s);
-unsigned int avio_rb24(AVIOContext *s);
-unsigned int avio_rb32(AVIOContext *s);
-uint64_t     avio_rb64(AVIOContext *s);
-/**
- * @}
- */
-
-/**
- * Read a string from pb into buf. The reading will terminate when either
- * a NULL character was encountered, maxlen bytes have been read, or nothing
- * more can be read from pb. The result is guaranteed to be NULL-terminated, it
- * will be truncated if buf is too small.
- * Note that the string is not interpreted or validated in any way, it
- * might get truncated in the middle of a sequence for multi-byte encodings.
- *
- * @return number of bytes read (is always <= maxlen).
- * If reading ends on EOF or error, the return value will be one more than
- * bytes actually read.
- */
-int avio_get_str(AVIOContext *pb, int maxlen, char *buf, int buflen);
-
-/**
- * Read a UTF-16 string from pb and convert it to UTF-8.
- * The reading will terminate when either a null or invalid character was
- * encountered or maxlen bytes have been read.
- * @return number of bytes read (is always <= maxlen)
- */
-int avio_get_str16le(AVIOContext *pb, int maxlen, char *buf, int buflen);
-int avio_get_str16be(AVIOContext *pb, int maxlen, char *buf, int buflen);
-
-
-/**
- * @name URL open modes
- * The flags argument to avio_open must be one of the following
- * constants, optionally ORed with other flags.
- * @{
- */
-#define AVIO_FLAG_READ  1                                      /**< read-only */
-#define AVIO_FLAG_WRITE 2                                      /**< write-only */
-#define AVIO_FLAG_READ_WRITE (AVIO_FLAG_READ|AVIO_FLAG_WRITE)  /**< read-write pseudo flag */
-/**
- * @}
- */
-
-/**
- * Use non-blocking mode.
- * If this flag is set, operations on the context will return
- * AVERROR(EAGAIN) if they can not be performed immediately.
- * If this flag is not set, operations on the context will never return
- * AVERROR(EAGAIN).
- * Note that this flag does not affect the opening/connecting of the
- * context. Connecting a protocol will always block if necessary (e.g. on
- * network protocols) but never hang (e.g. on busy devices).
- * Warning: non-blocking protocols is work-in-progress; this flag may be
- * silently ignored.
- */
-#define AVIO_FLAG_NONBLOCK 8
-
-/**
- * Create and initialize a AVIOContext for accessing the
- * resource indicated by url.
- * @note When the resource indicated by url has been opened in
- * read+write mode, the AVIOContext can be used only for writing.
- *
- * @param s Used to return the pointer to the created AVIOContext.
- * In case of failure the pointed to value is set to NULL.
- * @param flags flags which control how the resource indicated by url
- * is to be opened
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure
- */
-int avio_open(AVIOContext **s, const char *url, int flags);
-
-/**
- * Create and initialize a AVIOContext for accessing the
- * resource indicated by url.
- * @note When the resource indicated by url has been opened in
- * read+write mode, the AVIOContext can be used only for writing.
- *
- * @param s Used to return the pointer to the created AVIOContext.
- * In case of failure the pointed to value is set to NULL.
- * @param flags flags which control how the resource indicated by url
- * is to be opened
- * @param int_cb an interrupt callback to be used at the protocols level
- * @param options  A dictionary filled with protocol-private options. On return
- * this parameter will be destroyed and replaced with a dict containing options
- * that were not found. May be NULL.
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure
- */
-int avio_open2(AVIOContext **s, const char *url, int flags,
-               const AVIOInterruptCB *int_cb, AVDictionary **options);
-
-/**
- * Close the resource accessed by the AVIOContext s and free it.
- * This function can only be used if s was opened by avio_open().
- *
- * The internal buffer is automatically flushed before closing the
- * resource.
- *
- * @return 0 on success, an AVERROR < 0 on error.
- * @see avio_closep
- */
-int avio_close(AVIOContext *s);
-
-/**
- * Close the resource accessed by the AVIOContext *s, free it
- * and set the pointer pointing to it to NULL.
- * This function can only be used if s was opened by avio_open().
- *
- * The internal buffer is automatically flushed before closing the
- * resource.
- *
- * @return 0 on success, an AVERROR < 0 on error.
- * @see avio_close
- */
-int avio_closep(AVIOContext **s);
-
-
-/**
- * Open a write only memory stream.
- *
- * @param s new IO context
- * @return zero if no error.
- */
-int avio_open_dyn_buf(AVIOContext **s);
-
-/**
- * Return the written size and a pointer to the buffer. The buffer
- * must be freed with av_free().
- * Padding of FF_INPUT_BUFFER_PADDING_SIZE is added to the buffer.
- *
- * @param s IO context
- * @param pbuffer pointer to a byte buffer
- * @return the length of the byte buffer
- */
-int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer);
-
-/**
- * Iterate through names of available protocols.
- *
- * @param opaque A private pointer representing current protocol.
- *        It must be a pointer to NULL on first iteration and will
- *        be updated by successive calls to avio_enum_protocols.
- * @param output If set to 1, iterate over output protocols,
- *               otherwise over input protocols.
- *
- * @return A static string containing the name of current protocol or NULL
- */
-const char *avio_enum_protocols(void **opaque, int output);
-
-/**
- * Pause and resume playing - only meaningful if using a network streaming
- * protocol (e.g. MMS).
- * @param pause 1 for pause, 0 for resume
- */
-int     avio_pause(AVIOContext *h, int pause);
-
-/**
- * Seek to a given timestamp relative to some component stream.
- * Only meaningful if using a network streaming protocol (e.g. MMS.).
- * @param stream_index The stream index that the timestamp is relative to.
- *        If stream_index is (-1) the timestamp should be in AV_TIME_BASE
- *        units from the beginning of the presentation.
- *        If a stream_index >= 0 is used and the protocol does not support
- *        seeking based on component streams, the call will fail with ENOTSUP.
- * @param timestamp timestamp in AVStream.time_base units
- *        or if there is no stream specified then in AV_TIME_BASE units.
- * @param flags Optional combination of AVSEEK_FLAG_BACKWARD, AVSEEK_FLAG_BYTE
- *        and AVSEEK_FLAG_ANY. The protocol may silently ignore
- *        AVSEEK_FLAG_BACKWARD and AVSEEK_FLAG_ANY, but AVSEEK_FLAG_BYTE will
- *        fail with ENOTSUP if used and not supported.
- * @return >= 0 on success
- * @see AVInputFormat::read_seek
- */
-int64_t avio_seek_time(AVIOContext *h, int stream_index,
-                       int64_t timestamp, int flags);
-
-#endif /* AVFORMAT_AVIO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavformat/version.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavformat/version.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavformat/version.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavformat/version.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-/*
- * Version macros.
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVFORMAT_VERSION_H
-#define AVFORMAT_VERSION_H
-
-/**
- * @file
- * @ingroup libavf
- * Libavformat version macros
- */
-
-#include "libavutil/avutil.h"
-
-#define LIBAVFORMAT_VERSION_MAJOR 54
-#define LIBAVFORMAT_VERSION_MINOR 20
-#define LIBAVFORMAT_VERSION_MICRO  4
-
-#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
-                                               LIBAVFORMAT_VERSION_MINOR, \
-                                               LIBAVFORMAT_VERSION_MICRO)
-#define LIBAVFORMAT_VERSION     AV_VERSION(LIBAVFORMAT_VERSION_MAJOR,   \
-                                           LIBAVFORMAT_VERSION_MINOR,   \
-                                           LIBAVFORMAT_VERSION_MICRO)
-#define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
-
-#define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
-
-/**
- * FF_API_* defines may be placed below to indicate public API that will be
- * dropped at a future version bump. The defines themselves are not part of
- * the public API and may change, break or disappear at any time.
- */
-
-#ifndef FF_API_CLOSE_INPUT_FILE
-#define FF_API_CLOSE_INPUT_FILE        (LIBAVFORMAT_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_APPLEHTTP_PROTO
-#define FF_API_APPLEHTTP_PROTO         (LIBAVFORMAT_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_READ_PACKET
-#define FF_API_READ_PACKET             (LIBAVFORMAT_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_INTERLEAVE_PACKET
-#define FF_API_INTERLEAVE_PACKET       (LIBAVFORMAT_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_AV_GETTIME
-#define FF_API_AV_GETTIME              (LIBAVFORMAT_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_R_FRAME_RATE
-#define FF_API_R_FRAME_RATE            (LIBAVFORMAT_VERSION_MAJOR < 55)
-#endif
-
-#endif /* AVFORMAT_VERSION_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/adler32.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/adler32.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/adler32.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/adler32.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/*
- * copyright (c) 2006 Mans Rullgard
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_ADLER32_H
-#define AVUTIL_ADLER32_H
-
-#include <stdint.h>
-#include "attributes.h"
-
-/**
- * @ingroup lavu_crypto
- * Calculate the Adler32 checksum of a buffer.
- *
- * Passing the return value to a subsequent av_adler32_update() call
- * allows the checksum of multiple buffers to be calculated as though
- * they were concatenated.
- *
- * @param adler initial checksum value
- * @param buf   pointer to input buffer
- * @param len   size of input buffer
- * @return      updated checksum
- */
-unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf,
-                                unsigned int len) av_pure;
-
-#endif /* AVUTIL_ADLER32_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/aes.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/aes.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/aes.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/aes.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-/*
- * copyright (c) 2007 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_AES_H
-#define AVUTIL_AES_H
-
-#include <stdint.h>
-
-#include "attributes.h"
-#include "version.h"
-
-/**
- * @defgroup lavu_aes AES
- * @ingroup lavu_crypto
- * @{
- */
-
-#if FF_API_CONTEXT_SIZE
-extern attribute_deprecated const int av_aes_size;
-#endif
-
-struct AVAES;
-
-/**
- * Allocate an AVAES context.
- */
-struct AVAES *av_aes_alloc(void);
-
-/**
- * Initialize an AVAES context.
- * @param key_bits 128, 192 or 256
- * @param decrypt 0 for encryption, 1 for decryption
- */
-int av_aes_init(struct AVAES *a, const uint8_t *key, int key_bits, int decrypt);
-
-/**
- * Encrypt or decrypt a buffer using a previously initialized context.
- * @param count number of 16 byte blocks
- * @param dst destination array, can be equal to src
- * @param src source array, can be equal to dst
- * @param iv initialization vector for CBC mode, if NULL then ECB will be used
- * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_aes_crypt(struct AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_AES_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/attributes.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/attributes.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/attributes.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/attributes.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,122 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Macro definitions for various function/variable attributes
- */
-
-#ifndef AVUTIL_ATTRIBUTES_H
-#define AVUTIL_ATTRIBUTES_H
-
-#ifdef __GNUC__
-#    define AV_GCC_VERSION_AT_LEAST(x,y) (__GNUC__ > x || __GNUC__ == x && __GNUC_MINOR__ >= y)
-#else
-#    define AV_GCC_VERSION_AT_LEAST(x,y) 0
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_always_inline __attribute__((always_inline)) inline
-#elif defined(_MSC_VER)
-#    define av_always_inline __forceinline
-#else
-#    define av_always_inline inline
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_noinline __attribute__((noinline))
-#else
-#    define av_noinline
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_pure __attribute__((pure))
-#else
-#    define av_pure
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(2,6)
-#    define av_const __attribute__((const))
-#else
-#    define av_const
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(4,3)
-#    define av_cold __attribute__((cold))
-#else
-#    define av_cold
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(4,1)
-#    define av_flatten __attribute__((flatten))
-#else
-#    define av_flatten
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define attribute_deprecated __attribute__((deprecated))
-#else
-#    define attribute_deprecated
-#endif
-
-#if defined(__GNUC__)
-#    define av_unused __attribute__((unused))
-#else
-#    define av_unused
-#endif
-
-/**
- * Mark a variable as used and prevent the compiler from optimizing it
- * away.  This is useful for variables accessed only from inline
- * assembler without the compiler being aware.
- */
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_used __attribute__((used))
-#else
-#    define av_used
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,3)
-#   define av_alias __attribute__((may_alias))
-#else
-#   define av_alias
-#endif
-
-#if defined(__GNUC__) && !defined(__ICC)
-#    define av_uninit(x) x=x
-#else
-#    define av_uninit(x) x
-#endif
-
-#ifdef __GNUC__
-#    define av_builtin_constant_p __builtin_constant_p
-#    define av_printf_format(fmtpos, attrpos) __attribute__((__format__(__printf__, fmtpos, attrpos)))
-#else
-#    define av_builtin_constant_p(x) 0
-#    define av_printf_format(fmtpos, attrpos)
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(2,5)
-#    define av_noreturn __attribute__((noreturn))
-#else
-#    define av_noreturn
-#endif
-
-#endif /* AVUTIL_ATTRIBUTES_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/audioconvert.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/audioconvert.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/audioconvert.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/audioconvert.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-
-#include "version.h"
-
-#if FF_API_AUDIOCONVERT
-#include "channel_layout.h"
-#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/audio_fifo.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/audio_fifo.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/audio_fifo.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/audio_fifo.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,146 +0,0 @@
-/*
- * Audio FIFO
- * Copyright (c) 2012 Justin Ruggles <justin.ruggles@gmail.com>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Audio FIFO Buffer
- */
-
-#ifndef AVUTIL_AUDIO_FIFO_H
-#define AVUTIL_AUDIO_FIFO_H
-
-#include "avutil.h"
-#include "fifo.h"
-#include "samplefmt.h"
-
-/**
- * @addtogroup lavu_audio
- * @{
- */
-
-/**
- * Context for an Audio FIFO Buffer.
- *
- * - Operates at the sample level rather than the byte level.
- * - Supports multiple channels with either planar or packed sample format.
- * - Automatic reallocation when writing to a full buffer.
- */
-typedef struct AVAudioFifo AVAudioFifo;
-
-/**
- * Free an AVAudioFifo.
- *
- * @param af  AVAudioFifo to free
- */
-void av_audio_fifo_free(AVAudioFifo *af);
-
-/**
- * Allocate an AVAudioFifo.
- *
- * @param sample_fmt  sample format
- * @param channels    number of channels
- * @param nb_samples  initial allocation size, in samples
- * @return            newly allocated AVAudioFifo, or NULL on error
- */
-AVAudioFifo *av_audio_fifo_alloc(enum AVSampleFormat sample_fmt, int channels,
-                                 int nb_samples);
-
-/**
- * Reallocate an AVAudioFifo.
- *
- * @param af          AVAudioFifo to reallocate
- * @param nb_samples  new allocation size, in samples
- * @return            0 if OK, or negative AVERROR code on failure
- */
-int av_audio_fifo_realloc(AVAudioFifo *af, int nb_samples);
-
-/**
- * Write data to an AVAudioFifo.
- *
- * The AVAudioFifo will be reallocated automatically if the available space
- * is less than nb_samples.
- *
- * @see enum AVSampleFormat
- * The documentation for AVSampleFormat describes the data layout.
- *
- * @param af          AVAudioFifo to write to
- * @param data        audio data plane pointers
- * @param nb_samples  number of samples to write
- * @return            number of samples actually written, or negative AVERROR
- *                    code on failure.
- */
-int av_audio_fifo_write(AVAudioFifo *af, void **data, int nb_samples);
-
-/**
- * Read data from an AVAudioFifo.
- *
- * @see enum AVSampleFormat
- * The documentation for AVSampleFormat describes the data layout.
- *
- * @param af          AVAudioFifo to read from
- * @param data        audio data plane pointers
- * @param nb_samples  number of samples to read
- * @return            number of samples actually read, or negative AVERROR code
- *                    on failure.
- */
-int av_audio_fifo_read(AVAudioFifo *af, void **data, int nb_samples);
-
-/**
- * Drain data from an AVAudioFifo.
- *
- * Removes the data without reading it.
- *
- * @param af          AVAudioFifo to drain
- * @param nb_samples  number of samples to drain
- * @return            0 if OK, or negative AVERROR code on failure
- */
-int av_audio_fifo_drain(AVAudioFifo *af, int nb_samples);
-
-/**
- * Reset the AVAudioFifo buffer.
- *
- * This empties all data in the buffer.
- *
- * @param af  AVAudioFifo to reset
- */
-void av_audio_fifo_reset(AVAudioFifo *af);
-
-/**
- * Get the current number of samples in the AVAudioFifo available for reading.
- *
- * @param af  the AVAudioFifo to query
- * @return    number of samples available for reading
- */
-int av_audio_fifo_size(AVAudioFifo *af);
-
-/**
- * Get the current number of samples in the AVAudioFifo available for writing.
- *
- * @param af  the AVAudioFifo to query
- * @return    number of samples available for writing
- */
-int av_audio_fifo_space(AVAudioFifo *af);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_AUDIO_FIFO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/avassert.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/avassert.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/avassert.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/avassert.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-/*
- * copyright (c) 2010 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * simple assert() macros that are a bit more flexible than ISO C assert().
- * @author Michael Niedermayer <michaelni@gmx.at>
- */
-
-#ifndef AVUTIL_AVASSERT_H
-#define AVUTIL_AVASSERT_H
-
-#include <stdlib.h>
-#include "avutil.h"
-#include "log.h"
-
-/**
- * assert() equivalent, that is always enabled.
- */
-#define av_assert0(cond) do {                                           \
-    if (!(cond)) {                                                      \
-        av_log(NULL, AV_LOG_FATAL, "Assertion %s failed at %s:%d\n",    \
-               AV_STRINGIFY(cond), __FILE__, __LINE__);                 \
-        abort();                                                        \
-    }                                                                   \
-} while (0)
-
-
-/**
- * assert() equivalent, that does not lie in speed critical code.
- * These asserts() thus can be enabled without fearing speedloss.
- */
-#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 0
-#define av_assert1(cond) av_assert0(cond)
-#else
-#define av_assert1(cond) ((void)0)
-#endif
-
-
-/**
- * assert() equivalent, that does lie in speed critical code.
- */
-#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 1
-#define av_assert2(cond) av_assert0(cond)
-#else
-#define av_assert2(cond) ((void)0)
-#endif
-
-#endif /* AVUTIL_AVASSERT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/avconfig.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/avconfig.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/avconfig.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/avconfig.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-/* Generated by ffconf */
-#ifndef AVUTIL_AVCONFIG_H
-#define AVUTIL_AVCONFIG_H
-#define AV_HAVE_BIGENDIAN 0
-#define AV_HAVE_FAST_UNALIGNED 1
-#endif /* AVUTIL_AVCONFIG_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/avstring.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/avstring.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/avstring.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/avstring.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,191 +0,0 @@
-/*
- * Copyright (c) 2007 Mans Rullgard
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_AVSTRING_H
-#define AVUTIL_AVSTRING_H
-
-#include <stddef.h>
-#include "attributes.h"
-
-/**
- * @addtogroup lavu_string
- * @{
- */
-
-/**
- * Return non-zero if pfx is a prefix of str. If it is, *ptr is set to
- * the address of the first character in str after the prefix.
- *
- * @param str input string
- * @param pfx prefix to test
- * @param ptr updated if the prefix is matched inside str
- * @return non-zero if the prefix matches, zero otherwise
- */
-int av_strstart(const char *str, const char *pfx, const char **ptr);
-
-/**
- * Return non-zero if pfx is a prefix of str independent of case. If
- * it is, *ptr is set to the address of the first character in str
- * after the prefix.
- *
- * @param str input string
- * @param pfx prefix to test
- * @param ptr updated if the prefix is matched inside str
- * @return non-zero if the prefix matches, zero otherwise
- */
-int av_stristart(const char *str, const char *pfx, const char **ptr);
-
-/**
- * Locate the first case-independent occurrence in the string haystack
- * of the string needle.  A zero-length string needle is considered to
- * match at the start of haystack.
- *
- * This function is a case-insensitive version of the standard strstr().
- *
- * @param haystack string to search in
- * @param needle   string to search for
- * @return         pointer to the located match within haystack
- *                 or a null pointer if no match
- */
-char *av_stristr(const char *haystack, const char *needle);
-
-/**
- * Copy the string src to dst, but no more than size - 1 bytes, and
- * null-terminate dst.
- *
- * This function is the same as BSD strlcpy().
- *
- * @param dst destination buffer
- * @param src source string
- * @param size size of destination buffer
- * @return the length of src
- *
- * @warning since the return value is the length of src, src absolutely
- * _must_ be a properly 0-terminated string, otherwise this will read beyond
- * the end of the buffer and possibly crash.
- */
-size_t av_strlcpy(char *dst, const char *src, size_t size);
-
-/**
- * Append the string src to the string dst, but to a total length of
- * no more than size - 1 bytes, and null-terminate dst.
- *
- * This function is similar to BSD strlcat(), but differs when
- * size <= strlen(dst).
- *
- * @param dst destination buffer
- * @param src source string
- * @param size size of destination buffer
- * @return the total length of src and dst
- *
- * @warning since the return value use the length of src and dst, these
- * absolutely _must_ be a properly 0-terminated strings, otherwise this
- * will read beyond the end of the buffer and possibly crash.
- */
-size_t av_strlcat(char *dst, const char *src, size_t size);
-
-/**
- * Append output to a string, according to a format. Never write out of
- * the destination buffer, and always put a terminating 0 within
- * the buffer.
- * @param dst destination buffer (string to which the output is
- *  appended)
- * @param size total size of the destination buffer
- * @param fmt printf-compatible format string, specifying how the
- *  following parameters are used
- * @return the length of the string that would have been generated
- *  if enough space had been available
- */
-size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...) av_printf_format(3, 4);
-
-/**
- * Convert a number to a av_malloced string.
- */
-char *av_d2str(double d);
-
-/**
- * Unescape the given string until a non escaped terminating char,
- * and return the token corresponding to the unescaped string.
- *
- * The normal \ and ' escaping is supported. Leading and trailing
- * whitespaces are removed, unless they are escaped with '\' or are
- * enclosed between ''.
- *
- * @param buf the buffer to parse, buf will be updated to point to the
- * terminating char
- * @param term a 0-terminated list of terminating chars
- * @return the malloced unescaped string, which must be av_freed by
- * the user, NULL in case of allocation failure
- */
-char *av_get_token(const char **buf, const char *term);
-
-/**
- * Locale-independent conversion of ASCII characters to uppercase.
- */
-static inline int av_toupper(int c)
-{
-    if (c >= 'a' && c <= 'z')
-        c ^= 0x20;
-    return c;
-}
-
-/**
- * Locale-independent conversion of ASCII characters to lowercase.
- */
-static inline int av_tolower(int c)
-{
-    if (c >= 'A' && c <= 'Z')
-        c ^= 0x20;
-    return c;
-}
-
-/*
- * Locale-independent case-insensitive compare.
- * @note This means only ASCII-range characters are case-insensitive
- */
-int av_strcasecmp(const char *a, const char *b);
-
-/**
- * Locale-independent case-insensitive compare.
- * @note This means only ASCII-range characters are case-insensitive
- */
-int av_strncasecmp(const char *a, const char *b, size_t n);
-
-
-/**
- * Thread safe basename.
- * @param path the path, on DOS both \ and / are considered separators.
- * @return pointer to the basename substring.
- */
-const char *av_basename(const char *path);
-
-/**
- * Thread safe dirname.
- * @param path the path, on DOS both \ and / are considered separators.
- * @return the path with the separator replaced by the string terminator or ".".
- * @note the function may change the input string.
- */
-const char *av_dirname(char *path);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_AVSTRING_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/avutil.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/avutil.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/avutil.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/avutil.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,275 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_AVUTIL_H
-#define AVUTIL_AVUTIL_H
-
-/**
- * @file
- * external API header
- */
-
-/**
- * @mainpage
- *
- * @section libav_intro Introduction
- *
- * This document describes the usage of the different libraries
- * provided by Libav.
- *
- * @li @ref libavc "libavcodec" encoding/decoding library
- * @li @subpage libavfilter graph based frame editing library
- * @li @ref libavf "libavformat" I/O and muxing/demuxing library
- * @li @ref lavd "libavdevice" special devices muxing/demuxing library
- * @li @ref lavu "libavutil" common utility library
- * @li @ref lavr "libavresample" audio resampling, format conversion and mixing
- * @li @subpage libswscale  color conversion and scaling library
- */
-
-/**
- * @defgroup lavu Common utility functions
- *
- * @brief
- * libavutil contains the code shared across all the other Libav
- * libraries
- *
- * @note In order to use the functions provided by avutil you must include
- * the specific header.
- *
- * @{
- *
- * @defgroup lavu_crypto Crypto and Hashing
- *
- * @{
- * @}
- *
- * @defgroup lavu_math Maths
- * @{
- *
- * @}
- *
- * @defgroup lavu_string String Manipulation
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_mem Memory Management
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_data Data Structures
- * @{
- *
- * @}
- *
- * @defgroup lavu_audio Audio related
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_error Error Codes
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_misc Other
- *
- * @{
- *
- * @defgroup lavu_internal Internal
- *
- * Not exported functions, for internal usage only
- *
- * @{
- *
- * @}
- */
-
-
-/**
- * @defgroup preproc_misc Preprocessor String Macros
- *
- * String manipulation macros
- *
- * @{
- */
-
-#define AV_STRINGIFY(s)         AV_TOSTRING(s)
-#define AV_TOSTRING(s) #s
-
-#define AV_GLUE(a, b) a ## b
-#define AV_JOIN(a, b) AV_GLUE(a, b)
-
-#define AV_PRAGMA(s) _Pragma(#s)
-
-/**
- * @}
- */
-
-/**
- * @defgroup version_utils Library Version Macros
- *
- * Useful to check and match library version in order to maintain
- * backward compatibility.
- *
- * @{
- */
-
-#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
-#define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c
-#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
-
-/**
- * @}
- */
-
-/**
- * @addtogroup lavu_ver
- * @{
- */
-
-/**
- * Return the LIBAVUTIL_VERSION_INT constant.
- */
-unsigned avutil_version(void);
-
-/**
- * Return the libavutil build-time configuration.
- */
-const char *avutil_configuration(void);
-
-/**
- * Return the libavutil license.
- */
-const char *avutil_license(void);
-
-/**
- * @}
- */
-
-/**
- * @addtogroup lavu_media Media Type
- * @brief Media Type
- */
-
-enum AVMediaType {
-    AVMEDIA_TYPE_UNKNOWN = -1,  ///< Usually treated as AVMEDIA_TYPE_DATA
-    AVMEDIA_TYPE_VIDEO,
-    AVMEDIA_TYPE_AUDIO,
-    AVMEDIA_TYPE_DATA,          ///< Opaque data information usually continuous
-    AVMEDIA_TYPE_SUBTITLE,
-    AVMEDIA_TYPE_ATTACHMENT,    ///< Opaque data information usually sparse
-    AVMEDIA_TYPE_NB
-};
-
-/**
- * @defgroup lavu_const Constants
- * @{
- *
- * @defgroup lavu_enc Encoding specific
- *
- * @note those definition should move to avcodec
- * @{
- */
-
-#define FF_LAMBDA_SHIFT 7
-#define FF_LAMBDA_SCALE (1<<FF_LAMBDA_SHIFT)
-#define FF_QP2LAMBDA 118 ///< factor to convert from H.263 QP to lambda
-#define FF_LAMBDA_MAX (256*128-1)
-
-#define FF_QUALITY_SCALE FF_LAMBDA_SCALE //FIXME maybe remove
-
-/**
- * @}
- * @defgroup lavu_time Timestamp specific
- *
- * Libav internal timebase and timestamp definitions
- *
- * @{
- */
-
-/**
- * @brief Undefined timestamp value
- *
- * Usually reported by demuxer that work on containers that do not provide
- * either pts or dts.
- */
-
-#define AV_NOPTS_VALUE          INT64_C(0x8000000000000000)
-
-/**
- * Internal time base represented as integer
- */
-
-#define AV_TIME_BASE            1000000
-
-/**
- * Internal time base represented as fractional value
- */
-
-#define AV_TIME_BASE_Q          (AVRational){1, AV_TIME_BASE}
-
-/**
- * @}
- * @}
- * @defgroup lavu_picture Image related
- *
- * AVPicture types, pixel formats and basic image planes manipulation.
- *
- * @{
- */
-
-enum AVPictureType {
-    AV_PICTURE_TYPE_I = 1, ///< Intra
-    AV_PICTURE_TYPE_P,     ///< Predicted
-    AV_PICTURE_TYPE_B,     ///< Bi-dir predicted
-    AV_PICTURE_TYPE_S,     ///< S(GMC)-VOP MPEG4
-    AV_PICTURE_TYPE_SI,    ///< Switching Intra
-    AV_PICTURE_TYPE_SP,    ///< Switching Predicted
-    AV_PICTURE_TYPE_BI,    ///< BI type
-};
-
-/**
- * Return a single letter to describe the given picture type
- * pict_type.
- *
- * @param[in] pict_type the picture type @return a single character
- * representing the picture type, '?' if pict_type is unknown
- */
-char av_get_picture_type_char(enum AVPictureType pict_type);
-
-/**
- * @}
- */
-
-#include "error.h"
-#include "version.h"
-
-/**
- * @}
- * @}
- */
-
-#endif /* AVUTIL_AVUTIL_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/base64.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/base64.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/base64.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/base64.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2006 Ryan Martell. (rdm4@martellventures.com)
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_BASE64_H
-#define AVUTIL_BASE64_H
-
-#include <stdint.h>
-
-/**
- * @defgroup lavu_base64 Base64
- * @ingroup lavu_crypto
- * @{
- */
-
-
-/**
- * Decode a base64-encoded string.
- *
- * @param out      buffer for decoded data
- * @param in       null-terminated input string
- * @param out_size size in bytes of the out buffer, must be at
- *                 least 3/4 of the length of in
- * @return         number of bytes written, or a negative value in case of
- *                 invalid input
- */
-int av_base64_decode(uint8_t *out, const char *in, int out_size);
-
-/**
- * Encode data to base64 and null-terminate.
- *
- * @param out      buffer for encoded data
- * @param out_size size in bytes of the output buffer, must be at
- *                 least AV_BASE64_SIZE(in_size)
- * @param in_size  size in bytes of the 'in' buffer
- * @return         'out' or NULL in case of error
- */
-char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size);
-
-/**
- * Calculate the output size needed to base64-encode x bytes.
- */
-#define AV_BASE64_SIZE(x)  (((x)+2) / 3 * 4 + 1)
-
- /**
-  * @}
-  */
-
-#endif /* AVUTIL_BASE64_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/blowfish.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/blowfish.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/blowfish.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/blowfish.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +0,0 @@
-/*
- * Blowfish algorithm
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_BLOWFISH_H
-#define AVUTIL_BLOWFISH_H
-
-#include <stdint.h>
-
-/**
- * @defgroup lavu_blowfish Blowfish
- * @ingroup lavu_crypto
- * @{
- */
-
-#define AV_BF_ROUNDS 16
-
-typedef struct AVBlowfish {
-    uint32_t p[AV_BF_ROUNDS + 2];
-    uint32_t s[4][256];
-} AVBlowfish;
-
-/**
- * Initialize an AVBlowfish context.
- *
- * @param ctx an AVBlowfish context
- * @param key a key
- * @param key_len length of the key
- */
-void av_blowfish_init(struct AVBlowfish *ctx, const uint8_t *key, int key_len);
-
-/**
- * Encrypt or decrypt a buffer using a previously initialized context.
- *
- * @param ctx an AVBlowfish context
- * @param xl left four bytes halves of input to be encrypted
- * @param xr right four bytes halves of input to be encrypted
- * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_blowfish_crypt_ecb(struct AVBlowfish *ctx, uint32_t *xl, uint32_t *xr,
-                           int decrypt);
-
-/**
- * Encrypt or decrypt a buffer using a previously initialized context.
- *
- * @param ctx an AVBlowfish context
- * @param dst destination array, can be equal to src
- * @param src source array, can be equal to dst
- * @param count number of 8 byte blocks
- * @param iv initialization vector for CBC mode, if NULL ECB will be used
- * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_blowfish_crypt(struct AVBlowfish *ctx, uint8_t *dst, const uint8_t *src,
-                       int count, uint8_t *iv, int decrypt);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_BLOWFISH_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/bswap.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/bswap.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/bswap.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/bswap.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * byte swapping routines
- */
-
-#ifndef AVUTIL_BSWAP_H
-#define AVUTIL_BSWAP_H
-
-#include <stdint.h>
-#include "libavutil/avconfig.h"
-#include "attributes.h"
-
-#ifdef HAVE_AV_CONFIG_H
-
-#include "config.h"
-
-#if   ARCH_ARM
-#   include "arm/bswap.h"
-#elif ARCH_AVR32
-#   include "avr32/bswap.h"
-#elif ARCH_BFIN
-#   include "bfin/bswap.h"
-#elif ARCH_SH4
-#   include "sh4/bswap.h"
-#elif ARCH_X86
-#   include "x86/bswap.h"
-#endif
-
-#endif /* HAVE_AV_CONFIG_H */
-
-#define AV_BSWAP16C(x) (((x) << 8 & 0xff00)  | ((x) >> 8 & 0x00ff))
-#define AV_BSWAP32C(x) (AV_BSWAP16C(x) << 16 | AV_BSWAP16C((x) >> 16))
-#define AV_BSWAP64C(x) (AV_BSWAP32C(x) << 32 | AV_BSWAP32C((x) >> 32))
-
-#define AV_BSWAPC(s, x) AV_BSWAP##s##C(x)
-
-#ifndef av_bswap16
-static av_always_inline av_const uint16_t av_bswap16(uint16_t x)
-{
-    x= (x>>8) | (x<<8);
-    return x;
-}
-#endif
-
-#ifndef av_bswap32
-static av_always_inline av_const uint32_t av_bswap32(uint32_t x)
-{
-    return AV_BSWAP32C(x);
-}
-#endif
-
-#ifndef av_bswap64
-static inline uint64_t av_const av_bswap64(uint64_t x)
-{
-    return (uint64_t)av_bswap32(x) << 32 | av_bswap32(x >> 32);
-}
-#endif
-
-// be2ne ... big-endian to native-endian
-// le2ne ... little-endian to native-endian
-
-#if AV_HAVE_BIGENDIAN
-#define av_be2ne16(x) (x)
-#define av_be2ne32(x) (x)
-#define av_be2ne64(x) (x)
-#define av_le2ne16(x) av_bswap16(x)
-#define av_le2ne32(x) av_bswap32(x)
-#define av_le2ne64(x) av_bswap64(x)
-#define AV_BE2NEC(s, x) (x)
-#define AV_LE2NEC(s, x) AV_BSWAPC(s, x)
-#else
-#define av_be2ne16(x) av_bswap16(x)
-#define av_be2ne32(x) av_bswap32(x)
-#define av_be2ne64(x) av_bswap64(x)
-#define av_le2ne16(x) (x)
-#define av_le2ne32(x) (x)
-#define av_le2ne64(x) (x)
-#define AV_BE2NEC(s, x) AV_BSWAPC(s, x)
-#define AV_LE2NEC(s, x) (x)
-#endif
-
-#define AV_BE2NE16C(x) AV_BE2NEC(16, x)
-#define AV_BE2NE32C(x) AV_BE2NEC(32, x)
-#define AV_BE2NE64C(x) AV_BE2NEC(64, x)
-#define AV_LE2NE16C(x) AV_LE2NEC(16, x)
-#define AV_LE2NE32C(x) AV_LE2NEC(32, x)
-#define AV_LE2NE64C(x) AV_LE2NEC(64, x)
-
-#endif /* AVUTIL_BSWAP_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/channel_layout.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/channel_layout.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/channel_layout.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/channel_layout.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,182 +0,0 @@
-/*
- * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- * Copyright (c) 2008 Peter Ross
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_CHANNEL_LAYOUT_H
-#define AVUTIL_CHANNEL_LAYOUT_H
-
-#include <stdint.h>
-
-/**
- * @file
- * audio channel layout utility functions
- */
-
-/**
- * @addtogroup lavu_audio
- * @{
- */
-
-/**
- * @defgroup channel_masks Audio channel masks
- * @{
- */
-#define AV_CH_FRONT_LEFT             0x00000001
-#define AV_CH_FRONT_RIGHT            0x00000002
-#define AV_CH_FRONT_CENTER           0x00000004
-#define AV_CH_LOW_FREQUENCY          0x00000008
-#define AV_CH_BACK_LEFT              0x00000010
-#define AV_CH_BACK_RIGHT             0x00000020
-#define AV_CH_FRONT_LEFT_OF_CENTER   0x00000040
-#define AV_CH_FRONT_RIGHT_OF_CENTER  0x00000080
-#define AV_CH_BACK_CENTER            0x00000100
-#define AV_CH_SIDE_LEFT              0x00000200
-#define AV_CH_SIDE_RIGHT             0x00000400
-#define AV_CH_TOP_CENTER             0x00000800
-#define AV_CH_TOP_FRONT_LEFT         0x00001000
-#define AV_CH_TOP_FRONT_CENTER       0x00002000
-#define AV_CH_TOP_FRONT_RIGHT        0x00004000
-#define AV_CH_TOP_BACK_LEFT          0x00008000
-#define AV_CH_TOP_BACK_CENTER        0x00010000
-#define AV_CH_TOP_BACK_RIGHT         0x00020000
-#define AV_CH_STEREO_LEFT            0x20000000  ///< Stereo downmix.
-#define AV_CH_STEREO_RIGHT           0x40000000  ///< See AV_CH_STEREO_LEFT.
-#define AV_CH_WIDE_LEFT              0x0000000080000000ULL
-#define AV_CH_WIDE_RIGHT             0x0000000100000000ULL
-#define AV_CH_SURROUND_DIRECT_LEFT   0x0000000200000000ULL
-#define AV_CH_SURROUND_DIRECT_RIGHT  0x0000000400000000ULL
-#define AV_CH_LOW_FREQUENCY_2        0x0000000800000000ULL
-
-/** Channel mask value used for AVCodecContext.request_channel_layout
-    to indicate that the user requests the channel order of the decoder output
-    to be the native codec channel order. */
-#define AV_CH_LAYOUT_NATIVE          0x8000000000000000ULL
-
-/**
- * @}
- * @defgroup channel_mask_c Audio channel convenience macros
- * @{
- * */
-#define AV_CH_LAYOUT_MONO              (AV_CH_FRONT_CENTER)
-#define AV_CH_LAYOUT_STEREO            (AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT)
-#define AV_CH_LAYOUT_2POINT1           (AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_2_1               (AV_CH_LAYOUT_STEREO|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_SURROUND          (AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER)
-#define AV_CH_LAYOUT_3POINT1           (AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_4POINT0           (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_4POINT1           (AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_2_2               (AV_CH_LAYOUT_STEREO|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
-#define AV_CH_LAYOUT_QUAD              (AV_CH_LAYOUT_STEREO|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_5POINT0           (AV_CH_LAYOUT_SURROUND|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
-#define AV_CH_LAYOUT_5POINT1           (AV_CH_LAYOUT_5POINT0|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_5POINT0_BACK      (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_5POINT1_BACK      (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_6POINT0           (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_6POINT0_FRONT     (AV_CH_LAYOUT_2_2|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
-#define AV_CH_LAYOUT_HEXAGONAL         (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_6POINT1           (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_6POINT1_BACK      (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_6POINT1_FRONT     (AV_CH_LAYOUT_6POINT0_FRONT|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_7POINT0           (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_7POINT0_FRONT     (AV_CH_LAYOUT_5POINT0|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
-#define AV_CH_LAYOUT_7POINT1           (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_7POINT1_WIDE      (AV_CH_LAYOUT_5POINT1|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
-#define AV_CH_LAYOUT_7POINT1_WIDE_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
-#define AV_CH_LAYOUT_OCTAGONAL         (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_STEREO_DOWNMIX    (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT)
-
-enum AVMatrixEncoding {
-    AV_MATRIX_ENCODING_NONE,
-    AV_MATRIX_ENCODING_DOLBY,
-    AV_MATRIX_ENCODING_DPLII,
-    AV_MATRIX_ENCODING_NB
-};
-
-/**
- * @}
- */
-
-/**
- * Return a channel layout id that matches name, or 0 if no match is found.
- *
- * name can be one or several of the following notations,
- * separated by '+' or '|':
- * - the name of an usual channel layout (mono, stereo, 4.0, quad, 5.0,
- *   5.0(side), 5.1, 5.1(side), 7.1, 7.1(wide), downmix);
- * - the name of a single channel (FL, FR, FC, LFE, BL, BR, FLC, FRC, BC,
- *   SL, SR, TC, TFL, TFC, TFR, TBL, TBC, TBR, DL, DR);
- * - a number of channels, in decimal, optionally followed by 'c', yielding
- *   the default channel layout for that number of channels (@see
- *   av_get_default_channel_layout);
- * - a channel layout mask, in hexadecimal starting with "0x" (see the
- *   AV_CH_* macros).
- *
- * Example: "stereo+FC" = "2+FC" = "2c+1c" = "0x7"
- */
-uint64_t av_get_channel_layout(const char *name);
-
-/**
- * Return a description of a channel layout.
- * If nb_channels is <= 0, it is guessed from the channel_layout.
- *
- * @param buf put here the string containing the channel layout
- * @param buf_size size in bytes of the buffer
- */
-void av_get_channel_layout_string(char *buf, int buf_size, int nb_channels, uint64_t channel_layout);
-
-/**
- * Return the number of channels in the channel layout.
- */
-int av_get_channel_layout_nb_channels(uint64_t channel_layout);
-
-/**
- * Return default channel layout for a given number of channels.
- */
-uint64_t av_get_default_channel_layout(int nb_channels);
-
-/**
- * Get the index of a channel in channel_layout.
- *
- * @param channel a channel layout describing exactly one channel which must be
- *                present in channel_layout.
- *
- * @return index of channel in channel_layout on success, a negative AVERROR
- *         on error.
- */
-int av_get_channel_layout_channel_index(uint64_t channel_layout,
-                                        uint64_t channel);
-
-/**
- * Get the channel with the given index in channel_layout.
- */
-uint64_t av_channel_layout_extract_channel(uint64_t channel_layout, int index);
-
-/**
- * Get the name of a given channel.
- *
- * @return channel name on success, NULL on error.
- */
-const char *av_get_channel_name(uint64_t channel);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_CHANNEL_LAYOUT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/common.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/common.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/common.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/common.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,406 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * common internal and external API header
- */
-
-#ifndef AVUTIL_COMMON_H
-#define AVUTIL_COMMON_H
-
-#include <ctype.h>
-#include <errno.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "attributes.h"
-#include "version.h"
-#include "libavutil/avconfig.h"
-
-#if AV_HAVE_BIGENDIAN
-#   define AV_NE(be, le) (be)
-#else
-#   define AV_NE(be, le) (le)
-#endif
-
-//rounded division & shift
-#define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
-/* assume b>0 */
-#define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b))
-#define FFABS(a) ((a) >= 0 ? (a) : (-(a)))
-#define FFSIGN(a) ((a) > 0 ? 1 : -1)
-
-#define FFMAX(a,b) ((a) > (b) ? (a) : (b))
-#define FFMAX3(a,b,c) FFMAX(FFMAX(a,b),c)
-#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
-#define FFMIN3(a,b,c) FFMIN(FFMIN(a,b),c)
-
-#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
-#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
-#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))
-
-/* misc math functions */
-
-#if FF_API_AV_REVERSE
-extern attribute_deprecated const uint8_t av_reverse[256];
-#endif
-
-#ifdef HAVE_AV_CONFIG_H
-#   include "config.h"
-#   include "intmath.h"
-#endif
-
-/* Pull in unguarded fallback defines at the end of this file. */
-#include "common.h"
-
-#ifndef av_log2
-av_const int av_log2(unsigned v);
-#endif
-
-#ifndef av_log2_16bit
-av_const int av_log2_16bit(unsigned v);
-#endif
-
-/**
- * Clip a signed integer value into the amin-amax range.
- * @param a value to clip
- * @param amin minimum value of the clip range
- * @param amax maximum value of the clip range
- * @return clipped value
- */
-static av_always_inline av_const int av_clip_c(int a, int amin, int amax)
-{
-    if      (a < amin) return amin;
-    else if (a > amax) return amax;
-    else               return a;
-}
-
-/**
- * Clip a signed integer value into the 0-255 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const uint8_t av_clip_uint8_c(int a)
-{
-    if (a&(~0xFF)) return (-a)>>31;
-    else           return a;
-}
-
-/**
- * Clip a signed integer value into the -128,127 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const int8_t av_clip_int8_c(int a)
-{
-    if ((a+0x80) & ~0xFF) return (a>>31) ^ 0x7F;
-    else                  return a;
-}
-
-/**
- * Clip a signed integer value into the 0-65535 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const uint16_t av_clip_uint16_c(int a)
-{
-    if (a&(~0xFFFF)) return (-a)>>31;
-    else             return a;
-}
-
-/**
- * Clip a signed integer value into the -32768,32767 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const int16_t av_clip_int16_c(int a)
-{
-    if ((a+0x8000) & ~0xFFFF) return (a>>31) ^ 0x7FFF;
-    else                      return a;
-}
-
-/**
- * Clip a signed 64-bit integer value into the -2147483648,2147483647 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const int32_t av_clipl_int32_c(int64_t a)
-{
-    if ((a+0x80000000u) & ~UINT64_C(0xFFFFFFFF)) return (a>>63) ^ 0x7FFFFFFF;
-    else                                         return a;
-}
-
-/**
- * Clip a signed integer to an unsigned power of two range.
- * @param  a value to clip
- * @param  p bit position to clip at
- * @return clipped value
- */
-static av_always_inline av_const unsigned av_clip_uintp2_c(int a, int p)
-{
-    if (a & ~((1<<p) - 1)) return -a >> 31 & ((1<<p) - 1);
-    else                   return  a;
-}
-
-/**
- * Add two signed 32-bit values with saturation.
- *
- * @param  a one value
- * @param  b another value
- * @return sum with signed saturation
- */
-static av_always_inline int av_sat_add32_c(int a, int b)
-{
-    return av_clipl_int32((int64_t)a + b);
-}
-
-/**
- * Add a doubled value to another value with saturation at both stages.
- *
- * @param  a first value
- * @param  b value doubled and added to a
- * @return sum with signed saturation
- */
-static av_always_inline int av_sat_dadd32_c(int a, int b)
-{
-    return av_sat_add32(a, av_sat_add32(b, b));
-}
-
-/**
- * Clip a float value into the amin-amax range.
- * @param a value to clip
- * @param amin minimum value of the clip range
- * @param amax maximum value of the clip range
- * @return clipped value
- */
-static av_always_inline av_const float av_clipf_c(float a, float amin, float amax)
-{
-    if      (a < amin) return amin;
-    else if (a > amax) return amax;
-    else               return a;
-}
-
-/** Compute ceil(log2(x)).
- * @param x value used to compute ceil(log2(x))
- * @return computed ceiling of log2(x)
- */
-static av_always_inline av_const int av_ceil_log2_c(int x)
-{
-    return av_log2((x - 1) << 1);
-}
-
-/**
- * Count number of bits set to one in x
- * @param x value to count bits of
- * @return the number of bits set to one in x
- */
-static av_always_inline av_const int av_popcount_c(uint32_t x)
-{
-    x -= (x >> 1) & 0x55555555;
-    x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
-    x = (x + (x >> 4)) & 0x0F0F0F0F;
-    x += x >> 8;
-    return (x + (x >> 16)) & 0x3F;
-}
-
-/**
- * Count number of bits set to one in x
- * @param x value to count bits of
- * @return the number of bits set to one in x
- */
-static av_always_inline av_const int av_popcount64_c(uint64_t x)
-{
-    return av_popcount(x) + av_popcount(x >> 32);
-}
-
-#define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24))
-#define MKBETAG(a,b,c,d) ((d) | ((c) << 8) | ((b) << 16) | ((unsigned)(a) << 24))
-
-/**
- * Convert a UTF-8 character (up to 4 bytes) to its 32-bit UCS-4 encoded form.
- *
- * @param val      Output value, must be an lvalue of type uint32_t.
- * @param GET_BYTE Expression reading one byte from the input.
- *                 Evaluated up to 7 times (4 for the currently
- *                 assigned Unicode range).  With a memory buffer
- *                 input, this could be *ptr++.
- * @param ERROR    Expression to be evaluated on invalid input,
- *                 typically a goto statement.
- */
-#define GET_UTF8(val, GET_BYTE, ERROR)\
-    val= GET_BYTE;\
-    {\
-        uint32_t top = (val & 128) >> 1;\
-        if ((val & 0xc0) == 0x80)\
-            ERROR\
-        while (val & top) {\
-            int tmp= GET_BYTE - 128;\
-            if(tmp>>6)\
-                ERROR\
-            val= (val<<6) + tmp;\
-            top <<= 5;\
-        }\
-        val &= (top << 1) - 1;\
-    }
-
-/**
- * Convert a UTF-16 character (2 or 4 bytes) to its 32-bit UCS-4 encoded form.
- *
- * @param val       Output value, must be an lvalue of type uint32_t.
- * @param GET_16BIT Expression returning two bytes of UTF-16 data converted
- *                  to native byte order.  Evaluated one or two times.
- * @param ERROR     Expression to be evaluated on invalid input,
- *                  typically a goto statement.
- */
-#define GET_UTF16(val, GET_16BIT, ERROR)\
-    val = GET_16BIT;\
-    {\
-        unsigned int hi = val - 0xD800;\
-        if (hi < 0x800) {\
-            val = GET_16BIT - 0xDC00;\
-            if (val > 0x3FFU || hi > 0x3FFU)\
-                ERROR\
-            val += (hi<<10) + 0x10000;\
-        }\
-    }\
-
-/**
- * @def PUT_UTF8(val, tmp, PUT_BYTE)
- * Convert a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes long).
- * @param val is an input-only argument and should be of type uint32_t. It holds
- * a UCS-4 encoded Unicode character that is to be converted to UTF-8. If
- * val is given as a function it is executed only once.
- * @param tmp is a temporary variable and should be of type uint8_t. It
- * represents an intermediate value during conversion that is to be
- * output by PUT_BYTE.
- * @param PUT_BYTE writes the converted UTF-8 bytes to any proper destination.
- * It could be a function or a statement, and uses tmp as the input byte.
- * For example, PUT_BYTE could be "*output++ = tmp;" PUT_BYTE will be
- * executed up to 4 times for values in the valid UTF-8 range and up to
- * 7 times in the general case, depending on the length of the converted
- * Unicode character.
- */
-#define PUT_UTF8(val, tmp, PUT_BYTE)\
-    {\
-        int bytes, shift;\
-        uint32_t in = val;\
-        if (in < 0x80) {\
-            tmp = in;\
-            PUT_BYTE\
-        } else {\
-            bytes = (av_log2(in) + 4) / 5;\
-            shift = (bytes - 1) * 6;\
-            tmp = (256 - (256 >> bytes)) | (in >> shift);\
-            PUT_BYTE\
-            while (shift >= 6) {\
-                shift -= 6;\
-                tmp = 0x80 | ((in >> shift) & 0x3f);\
-                PUT_BYTE\
-            }\
-        }\
-    }
-
-/**
- * @def PUT_UTF16(val, tmp, PUT_16BIT)
- * Convert a 32-bit Unicode character to its UTF-16 encoded form (2 or 4 bytes).
- * @param val is an input-only argument and should be of type uint32_t. It holds
- * a UCS-4 encoded Unicode character that is to be converted to UTF-16. If
- * val is given as a function it is executed only once.
- * @param tmp is a temporary variable and should be of type uint16_t. It
- * represents an intermediate value during conversion that is to be
- * output by PUT_16BIT.
- * @param PUT_16BIT writes the converted UTF-16 data to any proper destination
- * in desired endianness. It could be a function or a statement, and uses tmp
- * as the input byte.  For example, PUT_BYTE could be "*output++ = tmp;"
- * PUT_BYTE will be executed 1 or 2 times depending on input character.
- */
-#define PUT_UTF16(val, tmp, PUT_16BIT)\
-    {\
-        uint32_t in = val;\
-        if (in < 0x10000) {\
-            tmp = in;\
-            PUT_16BIT\
-        } else {\
-            tmp = 0xD800 | ((in - 0x10000) >> 10);\
-            PUT_16BIT\
-            tmp = 0xDC00 | ((in - 0x10000) & 0x3FF);\
-            PUT_16BIT\
-        }\
-    }\
-
-
-
-#include "mem.h"
-
-#ifdef HAVE_AV_CONFIG_H
-#    include "internal.h"
-#endif /* HAVE_AV_CONFIG_H */
-
-#endif /* AVUTIL_COMMON_H */
-
-/*
- * The following definitions are outside the multiple inclusion guard
- * to ensure they are immediately available in intmath.h.
- */
-
-#ifndef av_ceil_log2
-#   define av_ceil_log2     av_ceil_log2_c
-#endif
-#ifndef av_clip
-#   define av_clip          av_clip_c
-#endif
-#ifndef av_clip_uint8
-#   define av_clip_uint8    av_clip_uint8_c
-#endif
-#ifndef av_clip_int8
-#   define av_clip_int8     av_clip_int8_c
-#endif
-#ifndef av_clip_uint16
-#   define av_clip_uint16   av_clip_uint16_c
-#endif
-#ifndef av_clip_int16
-#   define av_clip_int16    av_clip_int16_c
-#endif
-#ifndef av_clipl_int32
-#   define av_clipl_int32   av_clipl_int32_c
-#endif
-#ifndef av_clip_uintp2
-#   define av_clip_uintp2   av_clip_uintp2_c
-#endif
-#ifndef av_sat_add32
-#   define av_sat_add32     av_sat_add32_c
-#endif
-#ifndef av_sat_dadd32
-#   define av_sat_dadd32    av_sat_dadd32_c
-#endif
-#ifndef av_clipf
-#   define av_clipf         av_clipf_c
-#endif
-#ifndef av_popcount
-#   define av_popcount      av_popcount_c
-#endif
-#ifndef av_popcount64
-#   define av_popcount64    av_popcount64_c
-#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/cpu.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/cpu.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/cpu.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/cpu.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_CPU_H
-#define AVUTIL_CPU_H
-
-#include "version.h"
-
-#define AV_CPU_FLAG_FORCE    0x80000000 /* force usage of selected flags (OR) */
-
-    /* lower 16 bits - CPU features */
-#define AV_CPU_FLAG_MMX          0x0001 ///< standard MMX
-#define AV_CPU_FLAG_MMXEXT       0x0002 ///< SSE integer functions or AMD MMX ext
-#if FF_API_CPU_FLAG_MMX2
-#define AV_CPU_FLAG_MMX2         0x0002 ///< SSE integer functions or AMD MMX ext
-#endif
-#define AV_CPU_FLAG_3DNOW        0x0004 ///< AMD 3DNOW
-#define AV_CPU_FLAG_SSE          0x0008 ///< SSE functions
-#define AV_CPU_FLAG_SSE2         0x0010 ///< PIV SSE2 functions
-#define AV_CPU_FLAG_SSE2SLOW 0x40000000 ///< SSE2 supported, but usually not faster
-#define AV_CPU_FLAG_3DNOWEXT     0x0020 ///< AMD 3DNowExt
-#define AV_CPU_FLAG_SSE3         0x0040 ///< Prescott SSE3 functions
-#define AV_CPU_FLAG_SSE3SLOW 0x20000000 ///< SSE3 supported, but usually not faster
-#define AV_CPU_FLAG_SSSE3        0x0080 ///< Conroe SSSE3 functions
-#define AV_CPU_FLAG_ATOM     0x10000000 ///< Atom processor, some SSSE3 instructions are slower
-#define AV_CPU_FLAG_SSE4         0x0100 ///< Penryn SSE4.1 functions
-#define AV_CPU_FLAG_SSE42        0x0200 ///< Nehalem SSE4.2 functions
-#define AV_CPU_FLAG_AVX          0x4000 ///< AVX functions: requires OS support even if YMM registers aren't used
-#define AV_CPU_FLAG_XOP          0x0400 ///< Bulldozer XOP functions
-#define AV_CPU_FLAG_FMA4         0x0800 ///< Bulldozer FMA4 functions
-#define AV_CPU_FLAG_CMOV         0x1000 ///< i686 cmov
-
-#define AV_CPU_FLAG_ALTIVEC      0x0001 ///< standard
-
-#define AV_CPU_FLAG_ARMV5TE      (1 << 0)
-#define AV_CPU_FLAG_ARMV6        (1 << 1)
-#define AV_CPU_FLAG_ARMV6T2      (1 << 2)
-#define AV_CPU_FLAG_VFP          (1 << 3)
-#define AV_CPU_FLAG_VFPV3        (1 << 4)
-#define AV_CPU_FLAG_NEON         (1 << 5)
-
-/**
- * Return the flags which specify extensions supported by the CPU.
- */
-int av_get_cpu_flags(void);
-
-/**
- * Set a mask on flags returned by av_get_cpu_flags().
- * This function is mainly useful for testing.
- *
- * @warning this function is not thread safe.
- */
-void av_set_cpu_flags_mask(int mask);
-
-/**
- * Parse CPU flags from a string.
- *
- * @return a combination of AV_CPU_* flags, negative on error.
- */
-int av_parse_cpu_flags(const char *s);
-
-/* The following CPU-specific functions shall not be called directly. */
-int ff_get_cpu_flags_arm(void);
-int ff_get_cpu_flags_ppc(void);
-int ff_get_cpu_flags_x86(void);
-
-#endif /* AVUTIL_CPU_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/crc.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/crc.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/crc.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/crc.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_CRC_H
-#define AVUTIL_CRC_H
-
-#include <stdint.h>
-#include <stddef.h>
-#include "attributes.h"
-
-typedef uint32_t AVCRC;
-
-typedef enum {
-    AV_CRC_8_ATM,
-    AV_CRC_16_ANSI,
-    AV_CRC_16_CCITT,
-    AV_CRC_32_IEEE,
-    AV_CRC_32_IEEE_LE,  /*< reversed bitorder version of AV_CRC_32_IEEE */
-    AV_CRC_MAX,         /*< Not part of public API! Do not use outside libavutil. */
-}AVCRCId;
-
-/**
- * Initialize a CRC table.
- * @param ctx must be an array of size sizeof(AVCRC)*257 or sizeof(AVCRC)*1024
- * @param le If 1, the lowest bit represents the coefficient for the highest
- *           exponent of the corresponding polynomial (both for poly and
- *           actual CRC).
- *           If 0, you must swap the CRC parameter and the result of av_crc
- *           if you need the standard representation (can be simplified in
- *           most cases to e.g. bswap16):
- *           av_bswap32(crc << (32-bits))
- * @param bits number of bits for the CRC
- * @param poly generator polynomial without the x**bits coefficient, in the
- *             representation as specified by le
- * @param ctx_size size of ctx in bytes
- * @return <0 on failure
- */
-int av_crc_init(AVCRC *ctx, int le, int bits, uint32_t poly, int ctx_size);
-
-/**
- * Get an initialized standard CRC table.
- * @param crc_id ID of a standard CRC
- * @return a pointer to the CRC table or NULL on failure
- */
-const AVCRC *av_crc_get_table(AVCRCId crc_id);
-
-/**
- * Calculate the CRC of a block.
- * @param crc CRC of previous blocks if any or initial value for CRC
- * @return CRC updated with the data from the given block
- *
- * @see av_crc_init() "le" parameter
- */
-uint32_t av_crc(const AVCRC *ctx, uint32_t crc,
-                const uint8_t *buffer, size_t length) av_pure;
-
-#endif /* AVUTIL_CRC_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/dict.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/dict.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/dict.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/dict.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,129 +0,0 @@
-/*
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Public dictionary API.
- */
-
-#ifndef AVUTIL_DICT_H
-#define AVUTIL_DICT_H
-
-/**
- * @addtogroup lavu_dict AVDictionary
- * @ingroup lavu_data
- *
- * @brief Simple key:value store
- *
- * @{
- * Dictionaries are used for storing key:value pairs. To create
- * an AVDictionary, simply pass an address of a NULL pointer to
- * av_dict_set(). NULL can be used as an empty dictionary wherever
- * a pointer to an AVDictionary is required.
- * Use av_dict_get() to retrieve an entry or iterate over all
- * entries and finally av_dict_free() to free the dictionary
- * and all its contents.
- *
- * @code
- * AVDictionary *d = NULL;                // "create" an empty dictionary
- * av_dict_set(&d, "foo", "bar", 0);      // add an entry
- *
- * char *k = av_strdup("key");            // if your strings are already allocated,
- * char *v = av_strdup("value");          // you can avoid copying them like this
- * av_dict_set(&d, k, v, AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
- *
- * AVDictionaryEntry *t = NULL;
- * while (t = av_dict_get(d, "", t, AV_DICT_IGNORE_SUFFIX)) {
- *     <....>                             // iterate over all entries in d
- * }
- *
- * av_dict_free(&d);
- * @endcode
- *
- */
-
-#define AV_DICT_MATCH_CASE      1
-#define AV_DICT_IGNORE_SUFFIX   2
-#define AV_DICT_DONT_STRDUP_KEY 4   /**< Take ownership of a key that's been
-                                         allocated with av_malloc() and children. */
-#define AV_DICT_DONT_STRDUP_VAL 8   /**< Take ownership of a value that's been
-                                         allocated with av_malloc() and chilren. */
-#define AV_DICT_DONT_OVERWRITE 16   ///< Don't overwrite existing entries.
-#define AV_DICT_APPEND         32   /**< If the entry already exists, append to it.  Note that no
-                                      delimiter is added, the strings are simply concatenated. */
-
-typedef struct AVDictionaryEntry {
-    char *key;
-    char *value;
-} AVDictionaryEntry;
-
-typedef struct AVDictionary AVDictionary;
-
-/**
- * Get a dictionary entry with matching key.
- *
- * @param prev Set to the previous matching element to find the next.
- *             If set to NULL the first matching element is returned.
- * @param flags Allows case as well as suffix-insensitive comparisons.
- * @return Found entry or NULL, changing key or value leads to undefined behavior.
- */
-AVDictionaryEntry *
-av_dict_get(AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags);
-
-/**
- * Get number of entries in dictionary.
- *
- * @param m dictionary
- * @return  number of entries in dictionary
- */
-int av_dict_count(const AVDictionary *m);
-
-/**
- * Set the given entry in *pm, overwriting an existing entry.
- *
- * @param pm pointer to a pointer to a dictionary struct. If *pm is NULL
- * a dictionary struct is allocated and put in *pm.
- * @param key entry key to add to *pm (will be av_strduped depending on flags)
- * @param value entry value to add to *pm (will be av_strduped depending on flags).
- *        Passing a NULL value will cause an existing entry to be deleted.
- * @return >= 0 on success otherwise an error code <0
- */
-int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags);
-
-/**
- * Copy entries from one AVDictionary struct into another.
- * @param dst pointer to a pointer to a AVDictionary struct. If *dst is NULL,
- *            this function will allocate a struct for you and put it in *dst
- * @param src pointer to source AVDictionary struct
- * @param flags flags to use when setting entries in *dst
- * @note metadata is read using the AV_DICT_IGNORE_SUFFIX flag
- */
-void av_dict_copy(AVDictionary **dst, AVDictionary *src, int flags);
-
-/**
- * Free all the memory allocated for an AVDictionary struct
- * and all keys and values.
- */
-void av_dict_free(AVDictionary **m);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_DICT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/error.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/error.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/error.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/error.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * error code definitions
- */
-
-#ifndef AVUTIL_ERROR_H
-#define AVUTIL_ERROR_H
-
-#include <errno.h>
-#include <stddef.h>
-#include "avutil.h"
-
-/**
- * @addtogroup lavu_error
- *
- * @{
- */
-
-
-/* error handling */
-#if EDOM > 0
-#define AVERROR(e) (-(e))   ///< Returns a negative error code from a POSIX error code, to return from library functions.
-#define AVUNERROR(e) (-(e)) ///< Returns a POSIX error code from a library function error return value.
-#else
-/* Some platforms have E* and errno already negated. */
-#define AVERROR(e) (e)
-#define AVUNERROR(e) (e)
-#endif
-
-#define AVERROR_BSF_NOT_FOUND      (-0x39acbd08) ///< Bitstream filter not found
-#define AVERROR_DECODER_NOT_FOUND  (-0x3cbabb08) ///< Decoder not found
-#define AVERROR_DEMUXER_NOT_FOUND  (-0x32babb08) ///< Demuxer not found
-#define AVERROR_ENCODER_NOT_FOUND  (-0x3cb1ba08) ///< Encoder not found
-#define AVERROR_EOF                (-0x5fb9b0bb) ///< End of file
-#define AVERROR_EXIT               (-0x2bb6a7bb) ///< Immediate exit was requested; the called function should not be restarted
-#define AVERROR_FILTER_NOT_FOUND   (-0x33b6b908) ///< Filter not found
-#define AVERROR_INVALIDDATA        (-0x3ebbb1b7) ///< Invalid data found when processing input
-#define AVERROR_MUXER_NOT_FOUND    (-0x27aab208) ///< Muxer not found
-#define AVERROR_OPTION_NOT_FOUND   (-0x2bafb008) ///< Option not found
-#define AVERROR_PATCHWELCOME       (-0x3aa8beb0) ///< Not yet implemented in Libav, patches welcome
-#define AVERROR_PROTOCOL_NOT_FOUND (-0x30adaf08) ///< Protocol not found
-#define AVERROR_STREAM_NOT_FOUND   (-0x2dabac08) ///< Stream not found
-#define AVERROR_BUG                (-0x5fb8aabe) ///< Bug detected, please report the issue
-#define AVERROR_UNKNOWN            (-0x31b4b1ab) ///< Unknown error, typically from an external library
-#define AVERROR_EXPERIMENTAL       (-0x2bb2afa8) ///< Requested feature is flagged experimental. Set strict_std_compliance if you really want to use it.
-
-/**
- * Put a description of the AVERROR code errnum in errbuf.
- * In case of failure the global variable errno is set to indicate the
- * error. Even in case of failure av_strerror() will print a generic
- * error message indicating the errnum provided to errbuf.
- *
- * @param errnum      error code to describe
- * @param errbuf      buffer to which description is written
- * @param errbuf_size the size in bytes of errbuf
- * @return 0 on success, a negative value if a description for errnum
- * cannot be found
- */
-int av_strerror(int errnum, char *errbuf, size_t errbuf_size);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_ERROR_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/eval.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/eval.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/eval.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/eval.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2002 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * simple arithmetic expression evaluator
- */
-
-#ifndef AVUTIL_EVAL_H
-#define AVUTIL_EVAL_H
-
-#include "avutil.h"
-
-typedef struct AVExpr AVExpr;
-
-/**
- * Parse and evaluate an expression.
- * Note, this is significantly slower than av_expr_eval().
- *
- * @param res a pointer to a double where is put the result value of
- * the expression, or NAN in case of error
- * @param s expression as a zero terminated string, for example "1+2^3+5*5+sin(2/3)"
- * @param const_names NULL terminated array of zero terminated strings of constant identifiers, for example {"PI", "E", 0}
- * @param const_values a zero terminated array of values for the identifiers from const_names
- * @param func1_names NULL terminated array of zero terminated strings of funcs1 identifiers
- * @param funcs1 NULL terminated array of function pointers for functions which take 1 argument
- * @param func2_names NULL terminated array of zero terminated strings of funcs2 identifiers
- * @param funcs2 NULL terminated array of function pointers for functions which take 2 arguments
- * @param opaque a pointer which will be passed to all functions from funcs1 and funcs2
- * @param log_ctx parent logging context
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code otherwise
- */
-int av_expr_parse_and_eval(double *res, const char *s,
-                           const char * const *const_names, const double *const_values,
-                           const char * const *func1_names, double (* const *funcs1)(void *, double),
-                           const char * const *func2_names, double (* const *funcs2)(void *, double, double),
-                           void *opaque, int log_offset, void *log_ctx);
-
-/**
- * Parse an expression.
- *
- * @param expr a pointer where is put an AVExpr containing the parsed
- * value in case of successful parsing, or NULL otherwise.
- * The pointed to AVExpr must be freed with av_expr_free() by the user
- * when it is not needed anymore.
- * @param s expression as a zero terminated string, for example "1+2^3+5*5+sin(2/3)"
- * @param const_names NULL terminated array of zero terminated strings of constant identifiers, for example {"PI", "E", 0}
- * @param func1_names NULL terminated array of zero terminated strings of funcs1 identifiers
- * @param funcs1 NULL terminated array of function pointers for functions which take 1 argument
- * @param func2_names NULL terminated array of zero terminated strings of funcs2 identifiers
- * @param funcs2 NULL terminated array of function pointers for functions which take 2 arguments
- * @param log_ctx parent logging context
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code otherwise
- */
-int av_expr_parse(AVExpr **expr, const char *s,
-                  const char * const *const_names,
-                  const char * const *func1_names, double (* const *funcs1)(void *, double),
-                  const char * const *func2_names, double (* const *funcs2)(void *, double, double),
-                  int log_offset, void *log_ctx);
-
-/**
- * Evaluate a previously parsed expression.
- *
- * @param const_values a zero terminated array of values for the identifiers from av_expr_parse() const_names
- * @param opaque a pointer which will be passed to all functions from funcs1 and funcs2
- * @return the value of the expression
- */
-double av_expr_eval(AVExpr *e, const double *const_values, void *opaque);
-
-/**
- * Free a parsed expression previously created with av_expr_parse().
- */
-void av_expr_free(AVExpr *e);
-
-/**
- * Parse the string in numstr and return its value as a double. If
- * the string is empty, contains only whitespaces, or does not contain
- * an initial substring that has the expected syntax for a
- * floating-point number, no conversion is performed. In this case,
- * returns a value of zero and the value returned in tail is the value
- * of numstr.
- *
- * @param numstr a string representing a number, may contain one of
- * the International System number postfixes, for example 'K', 'M',
- * 'G'. If 'i' is appended after the postfix, powers of 2 are used
- * instead of powers of 10. The 'B' postfix multiplies the value for
- * 8, and can be appended after another postfix or used alone. This
- * allows using for example 'KB', 'MiB', 'G' and 'B' as postfix.
- * @param tail if non-NULL puts here the pointer to the char next
- * after the last parsed character
- */
-double av_strtod(const char *numstr, char **tail);
-
-#endif /* AVUTIL_EVAL_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/fifo.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/fifo.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/fifo.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/fifo.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,131 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * a very simple circular buffer FIFO implementation
- */
-
-#ifndef AVUTIL_FIFO_H
-#define AVUTIL_FIFO_H
-
-#include <stdint.h>
-#include "avutil.h"
-#include "attributes.h"
-
-typedef struct AVFifoBuffer {
-    uint8_t *buffer;
-    uint8_t *rptr, *wptr, *end;
-    uint32_t rndx, wndx;
-} AVFifoBuffer;
-
-/**
- * Initialize an AVFifoBuffer.
- * @param size of FIFO
- * @return AVFifoBuffer or NULL in case of memory allocation failure
- */
-AVFifoBuffer *av_fifo_alloc(unsigned int size);
-
-/**
- * Free an AVFifoBuffer.
- * @param f AVFifoBuffer to free
- */
-void av_fifo_free(AVFifoBuffer *f);
-
-/**
- * Reset the AVFifoBuffer to the state right after av_fifo_alloc, in particular it is emptied.
- * @param f AVFifoBuffer to reset
- */
-void av_fifo_reset(AVFifoBuffer *f);
-
-/**
- * Return the amount of data in bytes in the AVFifoBuffer, that is the
- * amount of data you can read from it.
- * @param f AVFifoBuffer to read from
- * @return size
- */
-int av_fifo_size(AVFifoBuffer *f);
-
-/**
- * Return the amount of space in bytes in the AVFifoBuffer, that is the
- * amount of data you can write into it.
- * @param f AVFifoBuffer to write into
- * @return size
- */
-int av_fifo_space(AVFifoBuffer *f);
-
-/**
- * Feed data from an AVFifoBuffer to a user-supplied callback.
- * @param f AVFifoBuffer to read from
- * @param buf_size number of bytes to read
- * @param func generic read function
- * @param dest data destination
- */
-int av_fifo_generic_read(AVFifoBuffer *f, void *dest, int buf_size, void (*func)(void*, void*, int));
-
-/**
- * Feed data from a user-supplied callback to an AVFifoBuffer.
- * @param f AVFifoBuffer to write to
- * @param src data source; non-const since it may be used as a
- * modifiable context by the function defined in func
- * @param size number of bytes to write
- * @param func generic write function; the first parameter is src,
- * the second is dest_buf, the third is dest_buf_size.
- * func must return the number of bytes written to dest_buf, or <= 0 to
- * indicate no more data available to write.
- * If func is NULL, src is interpreted as a simple byte array for source data.
- * @return the number of bytes written to the FIFO
- */
-int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int));
-
-/**
- * Resize an AVFifoBuffer.
- * @param f AVFifoBuffer to resize
- * @param size new AVFifoBuffer size in bytes
- * @return <0 for failure, >=0 otherwise
- */
-int av_fifo_realloc2(AVFifoBuffer *f, unsigned int size);
-
-/**
- * Read and discard the specified amount of data from an AVFifoBuffer.
- * @param f AVFifoBuffer to read from
- * @param size amount of data to read in bytes
- */
-void av_fifo_drain(AVFifoBuffer *f, int size);
-
-/**
- * Return a pointer to the data stored in a FIFO buffer at a certain offset.
- * The FIFO buffer is not modified.
- *
- * @param f    AVFifoBuffer to peek at, f must be non-NULL
- * @param offs an offset in bytes, its absolute value must be less
- *             than the used buffer size or the returned pointer will
- *             point outside to the buffer data.
- *             The used buffer size can be checked with av_fifo_size().
- */
-static inline uint8_t *av_fifo_peek2(const AVFifoBuffer *f, int offs)
-{
-    uint8_t *ptr = f->rptr + offs;
-    if (ptr >= f->end)
-        ptr = f->buffer + (ptr - f->end);
-    else if (ptr < f->buffer)
-        ptr = f->end - (f->buffer - ptr);
-    return ptr;
-}
-
-#endif /* AVUTIL_FIFO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/file.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/file.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/file.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/file.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_FILE_H
-#define AVUTIL_FILE_H
-
-#include <stdint.h>
-
-#include "avutil.h"
-
-/**
- * @file
- * Misc file utilities.
- */
-
-/**
- * Read the file with name filename, and put its content in a newly
- * allocated buffer or map it with mmap() when available.
- * In case of success set *bufptr to the read or mmapped buffer, and
- * *size to the size in bytes of the buffer in *bufptr.
- * The returned buffer must be released with av_file_unmap().
- *
- * @param log_offset loglevel offset used for logging
- * @param log_ctx context used for logging
- * @return a non negative number in case of success, a negative value
- * corresponding to an AVERROR error code in case of failure
- */
-int av_file_map(const char *filename, uint8_t **bufptr, size_t *size,
-                int log_offset, void *log_ctx);
-
-/**
- * Unmap or free the buffer bufptr created by av_file_map().
- *
- * @param size size in bytes of bufptr, must be the same as returned
- * by av_file_map()
- */
-void av_file_unmap(uint8_t *bufptr, size_t size);
-
-#endif /* AVUTIL_FILE_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/imgutils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/imgutils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/imgutils.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/imgutils.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,138 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_IMGUTILS_H
-#define AVUTIL_IMGUTILS_H
-
-/**
- * @file
- * misc image utilities
- *
- * @addtogroup lavu_picture
- * @{
- */
-
-#include "avutil.h"
-#include "pixdesc.h"
-
-/**
- * Compute the max pixel step for each plane of an image with a
- * format described by pixdesc.
- *
- * The pixel step is the distance in bytes between the first byte of
- * the group of bytes which describe a pixel component and the first
- * byte of the successive group in the same plane for the same
- * component.
- *
- * @param max_pixsteps an array which is filled with the max pixel step
- * for each plane. Since a plane may contain different pixel
- * components, the computed max_pixsteps[plane] is relative to the
- * component in the plane with the max pixel step.
- * @param max_pixstep_comps an array which is filled with the component
- * for each plane which has the max pixel step. May be NULL.
- */
-void av_image_fill_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4],
-                                const AVPixFmtDescriptor *pixdesc);
-
-/**
- * Compute the size of an image line with format pix_fmt and width
- * width for the plane plane.
- *
- * @return the computed size in bytes
- */
-int av_image_get_linesize(enum AVPixelFormat pix_fmt, int width, int plane);
-
-/**
- * Fill plane linesizes for an image with pixel format pix_fmt and
- * width width.
- *
- * @param linesizes array to be filled with the linesize for each plane
- * @return >= 0 in case of success, a negative error code otherwise
- */
-int av_image_fill_linesizes(int linesizes[4], enum AVPixelFormat pix_fmt, int width);
-
-/**
- * Fill plane data pointers for an image with pixel format pix_fmt and
- * height height.
- *
- * @param data pointers array to be filled with the pointer for each image plane
- * @param ptr the pointer to a buffer which will contain the image
- * @param linesizes the array containing the linesize for each
- * plane, should be filled by av_image_fill_linesizes()
- * @return the size in bytes required for the image buffer, a negative
- * error code in case of failure
- */
-int av_image_fill_pointers(uint8_t *data[4], enum AVPixelFormat pix_fmt, int height,
-                           uint8_t *ptr, const int linesizes[4]);
-
-/**
- * Allocate an image with size w and h and pixel format pix_fmt, and
- * fill pointers and linesizes accordingly.
- * The allocated image buffer has to be freed by using
- * av_freep(&pointers[0]).
- *
- * @param align the value to use for buffer size alignment
- * @return the size in bytes required for the image buffer, a negative
- * error code in case of failure
- */
-int av_image_alloc(uint8_t *pointers[4], int linesizes[4],
-                   int w, int h, enum AVPixelFormat pix_fmt, int align);
-
-/**
- * Copy image plane from src to dst.
- * That is, copy "height" number of lines of "bytewidth" bytes each.
- * The first byte of each successive line is separated by *_linesize
- * bytes.
- *
- * @param dst_linesize linesize for the image plane in dst
- * @param src_linesize linesize for the image plane in src
- */
-void av_image_copy_plane(uint8_t       *dst, int dst_linesize,
-                         const uint8_t *src, int src_linesize,
-                         int bytewidth, int height);
-
-/**
- * Copy image in src_data to dst_data.
- *
- * @param dst_linesizes linesizes for the image in dst_data
- * @param src_linesizes linesizes for the image in src_data
- */
-void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4],
-                   const uint8_t *src_data[4], const int src_linesizes[4],
-                   enum AVPixelFormat pix_fmt, int width, int height);
-
-/**
- * Check if the given dimension of an image is valid, meaning that all
- * bytes of the image can be addressed with a signed int.
- *
- * @param w the width of the picture
- * @param h the height of the picture
- * @param log_offset the offset to sum to the log level for logging with log_ctx
- * @param log_ctx the parent logging context, it may be NULL
- * @return >= 0 if valid, a negative error code otherwise
- */
-int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx);
-
-int avpriv_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt);
-
-/**
- * @}
- */
-
-
-#endif /* AVUTIL_IMGUTILS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/intfloat.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/intfloat.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/intfloat.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/intfloat.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2011 Mans Rullgard
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_INTFLOAT_H
-#define AVUTIL_INTFLOAT_H
-
-#include <stdint.h>
-#include "attributes.h"
-
-union av_intfloat32 {
-    uint32_t i;
-    float    f;
-};
-
-union av_intfloat64 {
-    uint64_t i;
-    double   f;
-};
-
-/**
- * Reinterpret a 32-bit integer as a float.
- */
-static av_always_inline float av_int2float(uint32_t i)
-{
-    union av_intfloat32 v;
-    v.i = i;
-    return v.f;
-}
-
-/**
- * Reinterpret a float as a 32-bit integer.
- */
-static av_always_inline uint32_t av_float2int(float f)
-{
-    union av_intfloat32 v;
-    v.f = f;
-    return v.i;
-}
-
-/**
- * Reinterpret a 64-bit integer as a double.
- */
-static av_always_inline double av_int2double(uint64_t i)
-{
-    union av_intfloat64 v;
-    v.i = i;
-    return v.f;
-}
-
-/**
- * Reinterpret a double as a 64-bit integer.
- */
-static av_always_inline uint64_t av_double2int(double f)
-{
-    union av_intfloat64 v;
-    v.f = f;
-    return v.i;
-}
-
-#endif /* AVUTIL_INTFLOAT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/intfloat_readwrite.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/intfloat_readwrite.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/intfloat_readwrite.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/intfloat_readwrite.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-/*
- * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_INTFLOAT_READWRITE_H
-#define AVUTIL_INTFLOAT_READWRITE_H
-
-#include <stdint.h>
-#include "attributes.h"
-
-/* IEEE 80 bits extended float */
-typedef struct AVExtFloat  {
-    uint8_t exponent[2];
-    uint8_t mantissa[8];
-} AVExtFloat;
-
-attribute_deprecated double av_int2dbl(int64_t v) av_const;
-attribute_deprecated float av_int2flt(int32_t v) av_const;
-attribute_deprecated double av_ext2dbl(const AVExtFloat ext) av_const;
-attribute_deprecated int64_t av_dbl2int(double d) av_const;
-attribute_deprecated int32_t av_flt2int(float d) av_const;
-attribute_deprecated AVExtFloat av_dbl2ext(double d) av_const;
-
-#endif /* AVUTIL_INTFLOAT_READWRITE_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/intreadwrite.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/intreadwrite.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/intreadwrite.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/intreadwrite.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,549 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_INTREADWRITE_H
-#define AVUTIL_INTREADWRITE_H
-
-#include <stdint.h>
-#include "libavutil/avconfig.h"
-#include "attributes.h"
-#include "bswap.h"
-
-typedef union {
-    uint64_t u64;
-    uint32_t u32[2];
-    uint16_t u16[4];
-    uint8_t  u8 [8];
-    double   f64;
-    float    f32[2];
-} av_alias av_alias64;
-
-typedef union {
-    uint32_t u32;
-    uint16_t u16[2];
-    uint8_t  u8 [4];
-    float    f32;
-} av_alias av_alias32;
-
-typedef union {
-    uint16_t u16;
-    uint8_t  u8 [2];
-} av_alias av_alias16;
-
-/*
- * Arch-specific headers can provide any combination of
- * AV_[RW][BLN](16|24|32|64) and AV_(COPY|SWAP|ZERO)(64|128) macros.
- * Preprocessor symbols must be defined, even if these are implemented
- * as inline functions.
- */
-
-#ifdef HAVE_AV_CONFIG_H
-
-#include "config.h"
-
-#if   ARCH_ARM
-#   include "arm/intreadwrite.h"
-#elif ARCH_AVR32
-#   include "avr32/intreadwrite.h"
-#elif ARCH_MIPS
-#   include "mips/intreadwrite.h"
-#elif ARCH_PPC
-#   include "ppc/intreadwrite.h"
-#elif ARCH_TOMI
-#   include "tomi/intreadwrite.h"
-#elif ARCH_X86
-#   include "x86/intreadwrite.h"
-#endif
-
-#endif /* HAVE_AV_CONFIG_H */
-
-/*
- * Map AV_RNXX <-> AV_R[BL]XX for all variants provided by per-arch headers.
- */
-
-#if AV_HAVE_BIGENDIAN
-
-#   if    defined(AV_RN16) && !defined(AV_RB16)
-#       define AV_RB16(p) AV_RN16(p)
-#   elif !defined(AV_RN16) &&  defined(AV_RB16)
-#       define AV_RN16(p) AV_RB16(p)
-#   endif
-
-#   if    defined(AV_WN16) && !defined(AV_WB16)
-#       define AV_WB16(p, v) AV_WN16(p, v)
-#   elif !defined(AV_WN16) &&  defined(AV_WB16)
-#       define AV_WN16(p, v) AV_WB16(p, v)
-#   endif
-
-#   if    defined(AV_RN24) && !defined(AV_RB24)
-#       define AV_RB24(p) AV_RN24(p)
-#   elif !defined(AV_RN24) &&  defined(AV_RB24)
-#       define AV_RN24(p) AV_RB24(p)
-#   endif
-
-#   if    defined(AV_WN24) && !defined(AV_WB24)
-#       define AV_WB24(p, v) AV_WN24(p, v)
-#   elif !defined(AV_WN24) &&  defined(AV_WB24)
-#       define AV_WN24(p, v) AV_WB24(p, v)
-#   endif
-
-#   if    defined(AV_RN32) && !defined(AV_RB32)
-#       define AV_RB32(p) AV_RN32(p)
-#   elif !defined(AV_RN32) &&  defined(AV_RB32)
-#       define AV_RN32(p) AV_RB32(p)
-#   endif
-
-#   if    defined(AV_WN32) && !defined(AV_WB32)
-#       define AV_WB32(p, v) AV_WN32(p, v)
-#   elif !defined(AV_WN32) &&  defined(AV_WB32)
-#       define AV_WN32(p, v) AV_WB32(p, v)
-#   endif
-
-#   if    defined(AV_RN64) && !defined(AV_RB64)
-#       define AV_RB64(p) AV_RN64(p)
-#   elif !defined(AV_RN64) &&  defined(AV_RB64)
-#       define AV_RN64(p) AV_RB64(p)
-#   endif
-
-#   if    defined(AV_WN64) && !defined(AV_WB64)
-#       define AV_WB64(p, v) AV_WN64(p, v)
-#   elif !defined(AV_WN64) &&  defined(AV_WB64)
-#       define AV_WN64(p, v) AV_WB64(p, v)
-#   endif
-
-#else /* AV_HAVE_BIGENDIAN */
-
-#   if    defined(AV_RN16) && !defined(AV_RL16)
-#       define AV_RL16(p) AV_RN16(p)
-#   elif !defined(AV_RN16) &&  defined(AV_RL16)
-#       define AV_RN16(p) AV_RL16(p)
-#   endif
-
-#   if    defined(AV_WN16) && !defined(AV_WL16)
-#       define AV_WL16(p, v) AV_WN16(p, v)
-#   elif !defined(AV_WN16) &&  defined(AV_WL16)
-#       define AV_WN16(p, v) AV_WL16(p, v)
-#   endif
-
-#   if    defined(AV_RN24) && !defined(AV_RL24)
-#       define AV_RL24(p) AV_RN24(p)
-#   elif !defined(AV_RN24) &&  defined(AV_RL24)
-#       define AV_RN24(p) AV_RL24(p)
-#   endif
-
-#   if    defined(AV_WN24) && !defined(AV_WL24)
-#       define AV_WL24(p, v) AV_WN24(p, v)
-#   elif !defined(AV_WN24) &&  defined(AV_WL24)
-#       define AV_WN24(p, v) AV_WL24(p, v)
-#   endif
-
-#   if    defined(AV_RN32) && !defined(AV_RL32)
-#       define AV_RL32(p) AV_RN32(p)
-#   elif !defined(AV_RN32) &&  defined(AV_RL32)
-#       define AV_RN32(p) AV_RL32(p)
-#   endif
-
-#   if    defined(AV_WN32) && !defined(AV_WL32)
-#       define AV_WL32(p, v) AV_WN32(p, v)
-#   elif !defined(AV_WN32) &&  defined(AV_WL32)
-#       define AV_WN32(p, v) AV_WL32(p, v)
-#   endif
-
-#   if    defined(AV_RN64) && !defined(AV_RL64)
-#       define AV_RL64(p) AV_RN64(p)
-#   elif !defined(AV_RN64) &&  defined(AV_RL64)
-#       define AV_RN64(p) AV_RL64(p)
-#   endif
-
-#   if    defined(AV_WN64) && !defined(AV_WL64)
-#       define AV_WL64(p, v) AV_WN64(p, v)
-#   elif !defined(AV_WN64) &&  defined(AV_WL64)
-#       define AV_WN64(p, v) AV_WL64(p, v)
-#   endif
-
-#endif /* !AV_HAVE_BIGENDIAN */
-
-/*
- * Define AV_[RW]N helper macros to simplify definitions not provided
- * by per-arch headers.
- */
-
-#if defined(__GNUC__) && !defined(__TI_COMPILER_VERSION__)
-
-union unaligned_64 { uint64_t l; } __attribute__((packed)) av_alias;
-union unaligned_32 { uint32_t l; } __attribute__((packed)) av_alias;
-union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias;
-
-#   define AV_RN(s, p) (((const union unaligned_##s *) (p))->l)
-#   define AV_WN(s, p, v) ((((union unaligned_##s *) (p))->l) = (v))
-
-#elif defined(__DECC)
-
-#   define AV_RN(s, p) (*((const __unaligned uint##s##_t*)(p)))
-#   define AV_WN(s, p, v) (*((__unaligned uint##s##_t*)(p)) = (v))
-
-#elif AV_HAVE_FAST_UNALIGNED
-
-#   define AV_RN(s, p) (((const av_alias##s*)(p))->u##s)
-#   define AV_WN(s, p, v) (((av_alias##s*)(p))->u##s = (v))
-
-#else
-
-#ifndef AV_RB16
-#   define AV_RB16(x)                           \
-    ((((const uint8_t*)(x))[0] << 8) |          \
-      ((const uint8_t*)(x))[1])
-#endif
-#ifndef AV_WB16
-#   define AV_WB16(p, d) do {                   \
-        ((uint8_t*)(p))[1] = (d);               \
-        ((uint8_t*)(p))[0] = (d)>>8;            \
-    } while(0)
-#endif
-
-#ifndef AV_RL16
-#   define AV_RL16(x)                           \
-    ((((const uint8_t*)(x))[1] << 8) |          \
-      ((const uint8_t*)(x))[0])
-#endif
-#ifndef AV_WL16
-#   define AV_WL16(p, d) do {                   \
-        ((uint8_t*)(p))[0] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-    } while(0)
-#endif
-
-#ifndef AV_RB32
-#   define AV_RB32(x)                                \
-    (((uint32_t)((const uint8_t*)(x))[0] << 24) |    \
-               (((const uint8_t*)(x))[1] << 16) |    \
-               (((const uint8_t*)(x))[2] <<  8) |    \
-                ((const uint8_t*)(x))[3])
-#endif
-#ifndef AV_WB32
-#   define AV_WB32(p, d) do {                   \
-        ((uint8_t*)(p))[3] = (d);               \
-        ((uint8_t*)(p))[2] = (d)>>8;            \
-        ((uint8_t*)(p))[1] = (d)>>16;           \
-        ((uint8_t*)(p))[0] = (d)>>24;           \
-    } while(0)
-#endif
-
-#ifndef AV_RL32
-#   define AV_RL32(x)                                \
-    (((uint32_t)((const uint8_t*)(x))[3] << 24) |    \
-               (((const uint8_t*)(x))[2] << 16) |    \
-               (((const uint8_t*)(x))[1] <<  8) |    \
-                ((const uint8_t*)(x))[0])
-#endif
-#ifndef AV_WL32
-#   define AV_WL32(p, d) do {                   \
-        ((uint8_t*)(p))[0] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-        ((uint8_t*)(p))[2] = (d)>>16;           \
-        ((uint8_t*)(p))[3] = (d)>>24;           \
-    } while(0)
-#endif
-
-#ifndef AV_RB64
-#   define AV_RB64(x)                                   \
-    (((uint64_t)((const uint8_t*)(x))[0] << 56) |       \
-     ((uint64_t)((const uint8_t*)(x))[1] << 48) |       \
-     ((uint64_t)((const uint8_t*)(x))[2] << 40) |       \
-     ((uint64_t)((const uint8_t*)(x))[3] << 32) |       \
-     ((uint64_t)((const uint8_t*)(x))[4] << 24) |       \
-     ((uint64_t)((const uint8_t*)(x))[5] << 16) |       \
-     ((uint64_t)((const uint8_t*)(x))[6] <<  8) |       \
-      (uint64_t)((const uint8_t*)(x))[7])
-#endif
-#ifndef AV_WB64
-#   define AV_WB64(p, d) do {                   \
-        ((uint8_t*)(p))[7] = (d);               \
-        ((uint8_t*)(p))[6] = (d)>>8;            \
-        ((uint8_t*)(p))[5] = (d)>>16;           \
-        ((uint8_t*)(p))[4] = (d)>>24;           \
-        ((uint8_t*)(p))[3] = (d)>>32;           \
-        ((uint8_t*)(p))[2] = (d)>>40;           \
-        ((uint8_t*)(p))[1] = (d)>>48;           \
-        ((uint8_t*)(p))[0] = (d)>>56;           \
-    } while(0)
-#endif
-
-#ifndef AV_RL64
-#   define AV_RL64(x)                                   \
-    (((uint64_t)((const uint8_t*)(x))[7] << 56) |       \
-     ((uint64_t)((const uint8_t*)(x))[6] << 48) |       \
-     ((uint64_t)((const uint8_t*)(x))[5] << 40) |       \
-     ((uint64_t)((const uint8_t*)(x))[4] << 32) |       \
-     ((uint64_t)((const uint8_t*)(x))[3] << 24) |       \
-     ((uint64_t)((const uint8_t*)(x))[2] << 16) |       \
-     ((uint64_t)((const uint8_t*)(x))[1] <<  8) |       \
-      (uint64_t)((const uint8_t*)(x))[0])
-#endif
-#ifndef AV_WL64
-#   define AV_WL64(p, d) do {                   \
-        ((uint8_t*)(p))[0] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-        ((uint8_t*)(p))[2] = (d)>>16;           \
-        ((uint8_t*)(p))[3] = (d)>>24;           \
-        ((uint8_t*)(p))[4] = (d)>>32;           \
-        ((uint8_t*)(p))[5] = (d)>>40;           \
-        ((uint8_t*)(p))[6] = (d)>>48;           \
-        ((uint8_t*)(p))[7] = (d)>>56;           \
-    } while(0)
-#endif
-
-#if AV_HAVE_BIGENDIAN
-#   define AV_RN(s, p)    AV_RB##s(p)
-#   define AV_WN(s, p, v) AV_WB##s(p, v)
-#else
-#   define AV_RN(s, p)    AV_RL##s(p)
-#   define AV_WN(s, p, v) AV_WL##s(p, v)
-#endif
-
-#endif /* HAVE_FAST_UNALIGNED */
-
-#ifndef AV_RN16
-#   define AV_RN16(p) AV_RN(16, p)
-#endif
-
-#ifndef AV_RN32
-#   define AV_RN32(p) AV_RN(32, p)
-#endif
-
-#ifndef AV_RN64
-#   define AV_RN64(p) AV_RN(64, p)
-#endif
-
-#ifndef AV_WN16
-#   define AV_WN16(p, v) AV_WN(16, p, v)
-#endif
-
-#ifndef AV_WN32
-#   define AV_WN32(p, v) AV_WN(32, p, v)
-#endif
-
-#ifndef AV_WN64
-#   define AV_WN64(p, v) AV_WN(64, p, v)
-#endif
-
-#if AV_HAVE_BIGENDIAN
-#   define AV_RB(s, p)    AV_RN##s(p)
-#   define AV_WB(s, p, v) AV_WN##s(p, v)
-#   define AV_RL(s, p)    av_bswap##s(AV_RN##s(p))
-#   define AV_WL(s, p, v) AV_WN##s(p, av_bswap##s(v))
-#else
-#   define AV_RB(s, p)    av_bswap##s(AV_RN##s(p))
-#   define AV_WB(s, p, v) AV_WN##s(p, av_bswap##s(v))
-#   define AV_RL(s, p)    AV_RN##s(p)
-#   define AV_WL(s, p, v) AV_WN##s(p, v)
-#endif
-
-#define AV_RB8(x)     (((const uint8_t*)(x))[0])
-#define AV_WB8(p, d)  do { ((uint8_t*)(p))[0] = (d); } while(0)
-
-#define AV_RL8(x)     AV_RB8(x)
-#define AV_WL8(p, d)  AV_WB8(p, d)
-
-#ifndef AV_RB16
-#   define AV_RB16(p)    AV_RB(16, p)
-#endif
-#ifndef AV_WB16
-#   define AV_WB16(p, v) AV_WB(16, p, v)
-#endif
-
-#ifndef AV_RL16
-#   define AV_RL16(p)    AV_RL(16, p)
-#endif
-#ifndef AV_WL16
-#   define AV_WL16(p, v) AV_WL(16, p, v)
-#endif
-
-#ifndef AV_RB32
-#   define AV_RB32(p)    AV_RB(32, p)
-#endif
-#ifndef AV_WB32
-#   define AV_WB32(p, v) AV_WB(32, p, v)
-#endif
-
-#ifndef AV_RL32
-#   define AV_RL32(p)    AV_RL(32, p)
-#endif
-#ifndef AV_WL32
-#   define AV_WL32(p, v) AV_WL(32, p, v)
-#endif
-
-#ifndef AV_RB64
-#   define AV_RB64(p)    AV_RB(64, p)
-#endif
-#ifndef AV_WB64
-#   define AV_WB64(p, v) AV_WB(64, p, v)
-#endif
-
-#ifndef AV_RL64
-#   define AV_RL64(p)    AV_RL(64, p)
-#endif
-#ifndef AV_WL64
-#   define AV_WL64(p, v) AV_WL(64, p, v)
-#endif
-
-#ifndef AV_RB24
-#   define AV_RB24(x)                           \
-    ((((const uint8_t*)(x))[0] << 16) |         \
-     (((const uint8_t*)(x))[1] <<  8) |         \
-      ((const uint8_t*)(x))[2])
-#endif
-#ifndef AV_WB24
-#   define AV_WB24(p, d) do {                   \
-        ((uint8_t*)(p))[2] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-        ((uint8_t*)(p))[0] = (d)>>16;           \
-    } while(0)
-#endif
-
-#ifndef AV_RL24
-#   define AV_RL24(x)                           \
-    ((((const uint8_t*)(x))[2] << 16) |         \
-     (((const uint8_t*)(x))[1] <<  8) |         \
-      ((const uint8_t*)(x))[0])
-#endif
-#ifndef AV_WL24
-#   define AV_WL24(p, d) do {                   \
-        ((uint8_t*)(p))[0] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-        ((uint8_t*)(p))[2] = (d)>>16;           \
-    } while(0)
-#endif
-
-/*
- * The AV_[RW]NA macros access naturally aligned data
- * in a type-safe way.
- */
-
-#define AV_RNA(s, p)    (((const av_alias##s*)(p))->u##s)
-#define AV_WNA(s, p, v) (((av_alias##s*)(p))->u##s = (v))
-
-#ifndef AV_RN16A
-#   define AV_RN16A(p) AV_RNA(16, p)
-#endif
-
-#ifndef AV_RN32A
-#   define AV_RN32A(p) AV_RNA(32, p)
-#endif
-
-#ifndef AV_RN64A
-#   define AV_RN64A(p) AV_RNA(64, p)
-#endif
-
-#ifndef AV_WN16A
-#   define AV_WN16A(p, v) AV_WNA(16, p, v)
-#endif
-
-#ifndef AV_WN32A
-#   define AV_WN32A(p, v) AV_WNA(32, p, v)
-#endif
-
-#ifndef AV_WN64A
-#   define AV_WN64A(p, v) AV_WNA(64, p, v)
-#endif
-
-/*
- * The AV_COPYxxU macros are suitable for copying data to/from unaligned
- * memory locations.
- */
-
-#define AV_COPYU(n, d, s) AV_WN##n(d, AV_RN##n(s));
-
-#ifndef AV_COPY16U
-#   define AV_COPY16U(d, s) AV_COPYU(16, d, s)
-#endif
-
-#ifndef AV_COPY32U
-#   define AV_COPY32U(d, s) AV_COPYU(32, d, s)
-#endif
-
-#ifndef AV_COPY64U
-#   define AV_COPY64U(d, s) AV_COPYU(64, d, s)
-#endif
-
-#ifndef AV_COPY128U
-#   define AV_COPY128U(d, s)                                    \
-    do {                                                        \
-        AV_COPY64U(d, s);                                       \
-        AV_COPY64U((char *)(d) + 8, (const char *)(s) + 8);     \
-    } while(0)
-#endif
-
-/* Parameters for AV_COPY*, AV_SWAP*, AV_ZERO* must be
- * naturally aligned. They may be implemented using MMX,
- * so emms_c() must be called before using any float code
- * afterwards.
- */
-
-#define AV_COPY(n, d, s) \
-    (((av_alias##n*)(d))->u##n = ((const av_alias##n*)(s))->u##n)
-
-#ifndef AV_COPY16
-#   define AV_COPY16(d, s) AV_COPY(16, d, s)
-#endif
-
-#ifndef AV_COPY32
-#   define AV_COPY32(d, s) AV_COPY(32, d, s)
-#endif
-
-#ifndef AV_COPY64
-#   define AV_COPY64(d, s) AV_COPY(64, d, s)
-#endif
-
-#ifndef AV_COPY128
-#   define AV_COPY128(d, s)                    \
-    do {                                       \
-        AV_COPY64(d, s);                       \
-        AV_COPY64((char*)(d)+8, (char*)(s)+8); \
-    } while(0)
-#endif
-
-#define AV_SWAP(n, a, b) FFSWAP(av_alias##n, *(av_alias##n*)(a), *(av_alias##n*)(b))
-
-#ifndef AV_SWAP64
-#   define AV_SWAP64(a, b) AV_SWAP(64, a, b)
-#endif
-
-#define AV_ZERO(n, d) (((av_alias##n*)(d))->u##n = 0)
-
-#ifndef AV_ZERO16
-#   define AV_ZERO16(d) AV_ZERO(16, d)
-#endif
-
-#ifndef AV_ZERO32
-#   define AV_ZERO32(d) AV_ZERO(32, d)
-#endif
-
-#ifndef AV_ZERO64
-#   define AV_ZERO64(d) AV_ZERO(64, d)
-#endif
-
-#ifndef AV_ZERO128
-#   define AV_ZERO128(d)         \
-    do {                         \
-        AV_ZERO64(d);            \
-        AV_ZERO64((char*)(d)+8); \
-    } while(0)
-#endif
-
-#endif /* AVUTIL_INTREADWRITE_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/lfg.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/lfg.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/lfg.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/lfg.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-/*
- * Lagged Fibonacci PRNG
- * Copyright (c) 2008 Michael Niedermayer
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_LFG_H
-#define AVUTIL_LFG_H
-
-typedef struct AVLFG {
-    unsigned int state[64];
-    int index;
-} AVLFG;
-
-void av_lfg_init(AVLFG *c, unsigned int seed);
-
-/**
- * Get the next random unsigned 32-bit number using an ALFG.
- *
- * Please also consider a simple LCG like state= state*1664525+1013904223,
- * it may be good enough and faster for your specific use case.
- */
-static inline unsigned int av_lfg_get(AVLFG *c){
-    c->state[c->index & 63] = c->state[(c->index-24) & 63] + c->state[(c->index-55) & 63];
-    return c->state[c->index++ & 63];
-}
-
-/**
- * Get the next random unsigned 32-bit number using a MLFG.
- *
- * Please also consider av_lfg_get() above, it is faster.
- */
-static inline unsigned int av_mlfg_get(AVLFG *c){
-    unsigned int a= c->state[(c->index-55) & 63];
-    unsigned int b= c->state[(c->index-24) & 63];
-    return c->state[c->index++ & 63] = 2*a*b+a+b;
-}
-
-/**
- * Get the next two numbers generated by a Box-Muller Gaussian
- * generator using the random numbers issued by lfg.
- *
- * @param out array where the two generated numbers are placed
- */
-void av_bmg_get(AVLFG *lfg, double out[2]);
-
-#endif /* AVUTIL_LFG_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/log.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/log.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/log.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/log.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,173 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_LOG_H
-#define AVUTIL_LOG_H
-
-#include <stdarg.h>
-#include "avutil.h"
-#include "attributes.h"
-
-/**
- * Describe the class of an AVClass context structure. That is an
- * arbitrary struct of which the first field is a pointer to an
- * AVClass struct (e.g. AVCodecContext, AVFormatContext etc.).
- */
-typedef struct AVClass {
-    /**
-     * The name of the class; usually it is the same name as the
-     * context structure type to which the AVClass is associated.
-     */
-    const char* class_name;
-
-    /**
-     * A pointer to a function which returns the name of a context
-     * instance ctx associated with the class.
-     */
-    const char* (*item_name)(void* ctx);
-
-    /**
-     * a pointer to the first option specified in the class if any or NULL
-     *
-     * @see av_set_default_options()
-     */
-    const struct AVOption *option;
-
-    /**
-     * LIBAVUTIL_VERSION with which this structure was created.
-     * This is used to allow fields to be added without requiring major
-     * version bumps everywhere.
-     */
-
-    int version;
-
-    /**
-     * Offset in the structure where log_level_offset is stored.
-     * 0 means there is no such variable
-     */
-    int log_level_offset_offset;
-
-    /**
-     * Offset in the structure where a pointer to the parent context for
-     * logging is stored. For example a decoder could pass its AVCodecContext
-     * to eval as such a parent context, which an av_log() implementation
-     * could then leverage to display the parent context.
-     * The offset can be NULL.
-     */
-    int parent_log_context_offset;
-
-    /**
-     * Return next AVOptions-enabled child or NULL
-     */
-    void* (*child_next)(void *obj, void *prev);
-
-    /**
-     * Return an AVClass corresponding to the next potential
-     * AVOptions-enabled child.
-     *
-     * The difference between child_next and this is that
-     * child_next iterates over _already existing_ objects, while
-     * child_class_next iterates over _all possible_ children.
-     */
-    const struct AVClass* (*child_class_next)(const struct AVClass *prev);
-} AVClass;
-
-/* av_log API */
-
-#define AV_LOG_QUIET    -8
-
-/**
- * Something went really wrong and we will crash now.
- */
-#define AV_LOG_PANIC     0
-
-/**
- * Something went wrong and recovery is not possible.
- * For example, no header was found for a format which depends
- * on headers or an illegal combination of parameters is used.
- */
-#define AV_LOG_FATAL     8
-
-/**
- * Something went wrong and cannot losslessly be recovered.
- * However, not all future data is affected.
- */
-#define AV_LOG_ERROR    16
-
-/**
- * Something somehow does not look correct. This may or may not
- * lead to problems. An example would be the use of '-vstrict -2'.
- */
-#define AV_LOG_WARNING  24
-
-#define AV_LOG_INFO     32
-#define AV_LOG_VERBOSE  40
-
-/**
- * Stuff which is only useful for libav* developers.
- */
-#define AV_LOG_DEBUG    48
-
-/**
- * Send the specified message to the log if the level is less than or equal
- * to the current av_log_level. By default, all logging messages are sent to
- * stderr. This behavior can be altered by setting a different av_vlog callback
- * function.
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- * pointer to an AVClass struct.
- * @param level The importance level of the message, lower values signifying
- * higher importance.
- * @param fmt The format string (printf-compatible) that specifies how
- * subsequent arguments are converted to output.
- * @see av_vlog
- */
-void av_log(void *avcl, int level, const char *fmt, ...) av_printf_format(3, 4);
-
-void av_vlog(void *avcl, int level, const char *fmt, va_list);
-int av_log_get_level(void);
-void av_log_set_level(int);
-void av_log_set_callback(void (*)(void*, int, const char*, va_list));
-void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl);
-const char* av_default_item_name(void* ctx);
-
-/**
- * av_dlog macros
- * Useful to print debug messages that shouldn't get compiled in normally.
- */
-
-#ifdef DEBUG
-#    define av_dlog(pctx, ...) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__)
-#else
-#    define av_dlog(pctx, ...)
-#endif
-
-/**
- * Skip repeated messages, this requires the user app to use av_log() instead of
- * (f)printf as the 2 would otherwise interfere and lead to
- * "Last message repeated x times" messages below (f)printf messages with some
- * bad luck.
- * Also to receive the last, "last repeated" line if any, the user app must
- * call av_log(NULL, AV_LOG_QUIET, ""); at the end
- */
-#define AV_LOG_SKIP_REPEATED 1
-void av_log_set_flags(int arg);
-
-#endif /* AVUTIL_LOG_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/lzo.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/lzo.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/lzo.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/lzo.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-/*
- * LZO 1x decompression
- * copyright (c) 2006 Reimar Doeffinger
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_LZO_H
-#define AVUTIL_LZO_H
-
-/**
- * @defgroup lavu_lzo LZO
- * @ingroup lavu_crypto
- *
- * @{
- */
-
-#include <stdint.h>
-
-/** @name Error flags returned by av_lzo1x_decode
- * @{ */
-/// end of the input buffer reached before decoding finished
-#define AV_LZO_INPUT_DEPLETED  1
-/// decoded data did not fit into output buffer
-#define AV_LZO_OUTPUT_FULL     2
-/// a reference to previously decoded data was wrong
-#define AV_LZO_INVALID_BACKPTR 4
-/// a non-specific error in the compressed bitstream
-#define AV_LZO_ERROR           8
-/** @} */
-
-#define AV_LZO_INPUT_PADDING   8
-#define AV_LZO_OUTPUT_PADDING 12
-
-/**
- * @brief Decodes LZO 1x compressed data.
- * @param out output buffer
- * @param outlen size of output buffer, number of bytes left are returned here
- * @param in input buffer
- * @param inlen size of input buffer, number of bytes left are returned here
- * @return 0 on success, otherwise a combination of the error flags above
- *
- * Make sure all buffers are appropriately padded, in must provide
- * AV_LZO_INPUT_PADDING, out must provide AV_LZO_OUTPUT_PADDING additional bytes.
- */
-int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_LZO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/mathematics.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/mathematics.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/mathematics.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/mathematics.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-/*
- * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_MATHEMATICS_H
-#define AVUTIL_MATHEMATICS_H
-
-#include <stdint.h>
-#include <math.h>
-#include "attributes.h"
-#include "rational.h"
-#include "intfloat.h"
-
-#ifndef M_LOG2_10
-#define M_LOG2_10      3.32192809488736234787  /* log_2 10 */
-#endif
-#ifndef M_PHI
-#define M_PHI          1.61803398874989484820   /* phi / golden ratio */
-#endif
-#ifndef NAN
-#define NAN            av_int2float(0x7fc00000)
-#endif
-#ifndef INFINITY
-#define INFINITY       av_int2float(0x7f800000)
-#endif
-
-/**
- * @addtogroup lavu_math
- * @{
- */
-
-
-enum AVRounding {
-    AV_ROUND_ZERO     = 0, ///< Round toward zero.
-    AV_ROUND_INF      = 1, ///< Round away from zero.
-    AV_ROUND_DOWN     = 2, ///< Round toward -infinity.
-    AV_ROUND_UP       = 3, ///< Round toward +infinity.
-    AV_ROUND_NEAR_INF = 5, ///< Round to nearest and halfway cases away from zero.
-};
-
-/**
- * Return the greatest common divisor of a and b.
- * If both a and b are 0 or either or both are <0 then behavior is
- * undefined.
- */
-int64_t av_const av_gcd(int64_t a, int64_t b);
-
-/**
- * Rescale a 64-bit integer with rounding to nearest.
- * A simple a*b/c isn't possible as it can overflow.
- */
-int64_t av_rescale(int64_t a, int64_t b, int64_t c) av_const;
-
-/**
- * Rescale a 64-bit integer with specified rounding.
- * A simple a*b/c isn't possible as it can overflow.
- */
-int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding) av_const;
-
-/**
- * Rescale a 64-bit integer by 2 rational numbers.
- */
-int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const;
-
-/**
- * Rescale a 64-bit integer by 2 rational numbers with specified rounding.
- */
-int64_t av_rescale_q_rnd(int64_t a, AVRational bq, AVRational cq,
-                         enum AVRounding) av_const;
-
-/**
- * Compare 2 timestamps each in its own timebases.
- * The result of the function is undefined if one of the timestamps
- * is outside the int64_t range when represented in the others timebase.
- * @return -1 if ts_a is before ts_b, 1 if ts_a is after ts_b or 0 if they represent the same position
- */
-int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b);
-
-/**
- * Compare 2 integers modulo mod.
- * That is we compare integers a and b for which only the least
- * significant log2(mod) bits are known.
- *
- * @param mod must be a power of 2
- * @return a negative value if a is smaller than b
- *         a positive value if a is greater than b
- *         0                if a equals          b
- */
-int64_t av_compare_mod(uint64_t a, uint64_t b, uint64_t mod);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_MATHEMATICS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/md5.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/md5.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/md5.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/md5.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_MD5_H
-#define AVUTIL_MD5_H
-
-#include <stdint.h>
-
-#include "attributes.h"
-#include "version.h"
-
-/**
- * @defgroup lavu_md5 MD5
- * @ingroup lavu_crypto
- * @{
- */
-
-#if FF_API_CONTEXT_SIZE
-extern attribute_deprecated const int av_md5_size;
-#endif
-
-struct AVMD5;
-
-struct AVMD5 *av_md5_alloc(void);
-void av_md5_init(struct AVMD5 *ctx);
-void av_md5_update(struct AVMD5 *ctx, const uint8_t *src, const int len);
-void av_md5_final(struct AVMD5 *ctx, uint8_t *dst);
-void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_MD5_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/mem.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/mem.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/mem.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/mem.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,183 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * memory handling functions
- */
-
-#ifndef AVUTIL_MEM_H
-#define AVUTIL_MEM_H
-
-#include <limits.h>
-#include <stdint.h>
-
-#include "attributes.h"
-#include "avutil.h"
-
-/**
- * @addtogroup lavu_mem
- * @{
- */
-
-
-#if defined(__ICC) && __ICC < 1200 || defined(__SUNPRO_C)
-    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
-    #define DECLARE_ASM_CONST(n,t,v)    const t __attribute__ ((aligned (n))) v
-#elif defined(__TI_COMPILER_VERSION__)
-    #define DECLARE_ALIGNED(n,t,v)                      \
-        AV_PRAGMA(DATA_ALIGN(v,n))                      \
-        t __attribute__((aligned(n))) v
-    #define DECLARE_ASM_CONST(n,t,v)                    \
-        AV_PRAGMA(DATA_ALIGN(v,n))                      \
-        static const t __attribute__((aligned(n))) v
-#elif defined(__GNUC__)
-    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
-    #define DECLARE_ASM_CONST(n,t,v)    static const t av_used __attribute__ ((aligned (n))) v
-#elif defined(_MSC_VER)
-    #define DECLARE_ALIGNED(n,t,v)      __declspec(align(n)) t v
-    #define DECLARE_ASM_CONST(n,t,v)    __declspec(align(n)) static const t v
-#else
-    #define DECLARE_ALIGNED(n,t,v)      t v
-    #define DECLARE_ASM_CONST(n,t,v)    static const t v
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-    #define av_malloc_attrib __attribute__((__malloc__))
-#else
-    #define av_malloc_attrib
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(4,3)
-    #define av_alloc_size(...) __attribute__((alloc_size(__VA_ARGS__)))
-#else
-    #define av_alloc_size(...)
-#endif
-
-/**
- * Allocate a block of size bytes with alignment suitable for all
- * memory accesses (including vectors if available on the CPU).
- * @param size Size in bytes for the memory block to be allocated.
- * @return Pointer to the allocated block, NULL if the block cannot
- * be allocated.
- * @see av_mallocz()
- */
-void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1);
-
-/**
- * Helper function to allocate a block of size * nmemb bytes with
- * using av_malloc()
- * @param nmemb Number of elements
- * @param size Size of the single element
- * @return Pointer to the allocated block, NULL if the block cannot
- * be allocated.
- * @see av_malloc()
- */
-av_alloc_size(1, 2) static inline void *av_malloc_array(size_t nmemb, size_t size)
-{
-    if (size <= 0 || nmemb >= INT_MAX / size)
-        return NULL;
-    return av_malloc(nmemb * size);
-}
-
-/**
- * Allocate or reallocate a block of memory.
- * If ptr is NULL and size > 0, allocate a new block. If
- * size is zero, free the memory block pointed to by ptr.
- * @param ptr Pointer to a memory block already allocated with
- * av_malloc(z)() or av_realloc() or NULL.
- * @param size Size in bytes for the memory block to be allocated or
- * reallocated.
- * @return Pointer to a newly reallocated block or NULL if the block
- * cannot be reallocated or the function is used to free the memory block.
- * @see av_fast_realloc()
- */
-void *av_realloc(void *ptr, size_t size) av_alloc_size(2);
-
-/**
- * Free a memory block which has been allocated with av_malloc(z)() or
- * av_realloc().
- * @param ptr Pointer to the memory block which should be freed.
- * @note ptr = NULL is explicitly allowed.
- * @note It is recommended that you use av_freep() instead.
- * @see av_freep()
- */
-void av_free(void *ptr);
-
-/**
- * Allocate a block of size bytes with alignment suitable for all
- * memory accesses (including vectors if available on the CPU) and
- * zero all the bytes of the block.
- * @param size Size in bytes for the memory block to be allocated.
- * @return Pointer to the allocated block, NULL if it cannot be allocated.
- * @see av_malloc()
- */
-void *av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1);
-
-/**
- * Helper function to allocate a block of size * nmemb bytes with
- * using av_mallocz()
- * @param nmemb Number of elements
- * @param size Size of the single element
- * @return Pointer to the allocated block, NULL if the block cannot
- * be allocated.
- * @see av_mallocz()
- * @see av_malloc_array()
- */
-av_alloc_size(1, 2) static inline void *av_mallocz_array(size_t nmemb, size_t size)
-{
-    if (size <= 0 || nmemb >= INT_MAX / size)
-        return NULL;
-    return av_mallocz(nmemb * size);
-}
-
-/**
- * Duplicate the string s.
- * @param s string to be duplicated
- * @return Pointer to a newly allocated string containing a
- * copy of s or NULL if the string cannot be allocated.
- */
-char *av_strdup(const char *s) av_malloc_attrib;
-
-/**
- * Free a memory block which has been allocated with av_malloc(z)() or
- * av_realloc() and set the pointer pointing to it to NULL.
- * @param ptr Pointer to the pointer to the memory block which should
- * be freed.
- * @see av_free()
- */
-void av_freep(void *ptr);
-
-/**
- * @brief deliberately overlapping memcpy implementation
- * @param dst destination buffer
- * @param back how many bytes back we start (the initial size of the overlapping window)
- * @param cnt number of bytes to copy, must be >= 0
- *
- * cnt > back is valid, this will copy the bytes we just copied,
- * thus creating a repeating pattern with a period length of back.
- */
-void av_memcpy_backptr(uint8_t *dst, int back, int cnt);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_MEM_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/old_pix_fmts.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/old_pix_fmts.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/old_pix_fmts.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/old_pix_fmts.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,128 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_OLD_PIX_FMTS_H
-#define AVUTIL_OLD_PIX_FMTS_H
-
-/*
- * This header exists to prevent new pixel formats from being accidentally added
- * to the deprecated list.
- * Do not include it directly. It will be removed on next major bump
- *
- * Do not add new items to this list. Use the AVPixelFormat enum instead.
- */
-    PIX_FMT_NONE = AV_PIX_FMT_NONE,
-    PIX_FMT_YUV420P,   ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
-    PIX_FMT_YUYV422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
-    PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
-    PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
-    PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
-    PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
-    PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
-    PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
-    PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
-    PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
-    PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
-    PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
-    PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
-    PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
-    PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
-    PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
-    PIX_FMT_XVMC_MPEG2_IDCT,
-    PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
-    PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
-    PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
-    PIX_FMT_BGR4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
-    PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
-    PIX_FMT_RGB8,      ///< packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
-    PIX_FMT_RGB4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
-    PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
-    PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
-    PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
-
-    PIX_FMT_ARGB,      ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
-    PIX_FMT_RGBA,      ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
-    PIX_FMT_ABGR,      ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
-    PIX_FMT_BGRA,      ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
-
-    PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
-    PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
-    PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
-    PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
-    PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
-    PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
-    PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
-
-    PIX_FMT_RGB565BE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian
-    PIX_FMT_RGB565LE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), little-endian
-    PIX_FMT_RGB555BE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
-    PIX_FMT_RGB555LE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
-
-    PIX_FMT_BGR565BE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), big-endian
-    PIX_FMT_BGR565LE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), little-endian
-    PIX_FMT_BGR555BE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
-    PIX_FMT_BGR555LE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
-
-    PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
-    PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
-    PIX_FMT_VAAPI_VLD,  ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-
-    PIX_FMT_YUV420P16LE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV420P16BE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV422P16LE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_VDPAU_MPEG4,  ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
-
-    PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
-    PIX_FMT_RGB444BE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
-    PIX_FMT_BGR444LE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
-    PIX_FMT_BGR444BE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
-    PIX_FMT_Y400A,     ///< 8bit gray, 8bit alpha
-    PIX_FMT_BGR48BE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
-    PIX_FMT_BGR48LE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
-    PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_VDA_VLD,    ///< hardware decoding through VDA
-    PIX_FMT_GBRP,      ///< planar GBR 4:4:4 24bpp
-    PIX_FMT_GBRP9BE,   ///< planar GBR 4:4:4 27bpp, big endian
-    PIX_FMT_GBRP9LE,   ///< planar GBR 4:4:4 27bpp, little endian
-    PIX_FMT_GBRP10BE,  ///< planar GBR 4:4:4 30bpp, big endian
-    PIX_FMT_GBRP10LE,  ///< planar GBR 4:4:4 30bpp, little endian
-    PIX_FMT_GBRP16BE,  ///< planar GBR 4:4:4 48bpp, big endian
-    PIX_FMT_GBRP16LE,  ///< planar GBR 4:4:4 48bpp, little endian
-    PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
-
-#endif /* AVUTIL_OLD_PIX_FMTS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/opt.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/opt.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/opt.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/opt.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,516 +0,0 @@
-/*
- * AVOptions
- * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_OPT_H
-#define AVUTIL_OPT_H
-
-/**
- * @file
- * AVOptions
- */
-
-#include "rational.h"
-#include "avutil.h"
-#include "dict.h"
-#include "log.h"
-
-/**
- * @defgroup avoptions AVOptions
- * @ingroup lavu_data
- * @{
- * AVOptions provide a generic system to declare options on arbitrary structs
- * ("objects"). An option can have a help text, a type and a range of possible
- * values. Options may then be enumerated, read and written to.
- *
- * @section avoptions_implement Implementing AVOptions
- * This section describes how to add AVOptions capabilities to a struct.
- *
- * All AVOptions-related information is stored in an AVClass. Therefore
- * the first member of the struct must be a pointer to an AVClass describing it.
- * The option field of the AVClass must be set to a NULL-terminated static array
- * of AVOptions. Each AVOption must have a non-empty name, a type, a default
- * value and for number-type AVOptions also a range of allowed values. It must
- * also declare an offset in bytes from the start of the struct, where the field
- * associated with this AVOption is located. Other fields in the AVOption struct
- * should also be set when applicable, but are not required.
- *
- * The following example illustrates an AVOptions-enabled struct:
- * @code
- * typedef struct test_struct {
- *     AVClass *class;
- *     int      int_opt;
- *     char    *str_opt;
- *     uint8_t *bin_opt;
- *     int      bin_len;
- * } test_struct;
- *
- * static const AVOption options[] = {
- *   { "test_int", "This is a test option of int type.", offsetof(test_struct, int_opt),
- *     AV_OPT_TYPE_INT, { .i64 = -1 }, INT_MIN, INT_MAX },
- *   { "test_str", "This is a test option of string type.", offsetof(test_struct, str_opt),
- *     AV_OPT_TYPE_STRING },
- *   { "test_bin", "This is a test option of binary type.", offsetof(test_struct, bin_opt),
- *     AV_OPT_TYPE_BINARY },
- *   { NULL },
- * };
- *
- * static const AVClass test_class = {
- *     .class_name = "test class",
- *     .item_name  = av_default_item_name,
- *     .option     = options,
- *     .version    = LIBAVUTIL_VERSION_INT,
- * };
- * @endcode
- *
- * Next, when allocating your struct, you must ensure that the AVClass pointer
- * is set to the correct value. Then, av_opt_set_defaults() must be called to
- * initialize defaults. After that the struct is ready to be used with the
- * AVOptions API.
- *
- * When cleaning up, you may use the av_opt_free() function to automatically
- * free all the allocated string and binary options.
- *
- * Continuing with the above example:
- *
- * @code
- * test_struct *alloc_test_struct(void)
- * {
- *     test_struct *ret = av_malloc(sizeof(*ret));
- *     ret->class = &test_class;
- *     av_opt_set_defaults(ret);
- *     return ret;
- * }
- * void free_test_struct(test_struct **foo)
- * {
- *     av_opt_free(*foo);
- *     av_freep(foo);
- * }
- * @endcode
- *
- * @subsection avoptions_implement_nesting Nesting
- *      It may happen that an AVOptions-enabled struct contains another
- *      AVOptions-enabled struct as a member (e.g. AVCodecContext in
- *      libavcodec exports generic options, while its priv_data field exports
- *      codec-specific options). In such a case, it is possible to set up the
- *      parent struct to export a child's options. To do that, simply
- *      implement AVClass.child_next() and AVClass.child_class_next() in the
- *      parent struct's AVClass.
- *      Assuming that the test_struct from above now also contains a
- *      child_struct field:
- *
- *      @code
- *      typedef struct child_struct {
- *          AVClass *class;
- *          int flags_opt;
- *      } child_struct;
- *      static const AVOption child_opts[] = {
- *          { "test_flags", "This is a test option of flags type.",
- *            offsetof(child_struct, flags_opt), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX },
- *          { NULL },
- *      };
- *      static const AVClass child_class = {
- *          .class_name = "child class",
- *          .item_name  = av_default_item_name,
- *          .option     = child_opts,
- *          .version    = LIBAVUTIL_VERSION_INT,
- *      };
- *
- *      void *child_next(void *obj, void *prev)
- *      {
- *          test_struct *t = obj;
- *          if (!prev && t->child_struct)
- *              return t->child_struct;
- *          return NULL
- *      }
- *      const AVClass child_class_next(const AVClass *prev)
- *      {
- *          return prev ? NULL : &child_class;
- *      }
- *      @endcode
- *      Putting child_next() and child_class_next() as defined above into
- *      test_class will now make child_struct's options accessible through
- *      test_struct (again, proper setup as described above needs to be done on
- *      child_struct right after it is created).
- *
- *      From the above example it might not be clear why both child_next()
- *      and child_class_next() are needed. The distinction is that child_next()
- *      iterates over actually existing objects, while child_class_next()
- *      iterates over all possible child classes. E.g. if an AVCodecContext
- *      was initialized to use a codec which has private options, then its
- *      child_next() will return AVCodecContext.priv_data and finish
- *      iterating. OTOH child_class_next() on AVCodecContext.av_class will
- *      iterate over all available codecs with private options.
- *
- * @subsection avoptions_implement_named_constants Named constants
- *      It is possible to create named constants for options. Simply set the unit
- *      field of the option the constants should apply to to a string and
- *      create the constants themselves as options of type AV_OPT_TYPE_CONST
- *      with their unit field set to the same string.
- *      Their default_val field should contain the value of the named
- *      constant.
- *      For example, to add some named constants for the test_flags option
- *      above, put the following into the child_opts array:
- *      @code
- *      { "test_flags", "This is a test option of flags type.",
- *        offsetof(child_struct, flags_opt), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX, "test_unit" },
- *      { "flag1", "This is a flag with value 16", 0, AV_OPT_TYPE_CONST, { .i64 = 16 }, 0, 0, "test_unit" },
- *      @endcode
- *
- * @section avoptions_use Using AVOptions
- * This section deals with accessing options in an AVOptions-enabled struct.
- * Such structs in Libav are e.g. AVCodecContext in libavcodec or
- * AVFormatContext in libavformat.
- *
- * @subsection avoptions_use_examine Examining AVOptions
- * The basic functions for examining options are av_opt_next(), which iterates
- * over all options defined for one object, and av_opt_find(), which searches
- * for an option with the given name.
- *
- * The situation is more complicated with nesting. An AVOptions-enabled struct
- * may have AVOptions-enabled children. Passing the AV_OPT_SEARCH_CHILDREN flag
- * to av_opt_find() will make the function search children recursively.
- *
- * For enumerating there are basically two cases. The first is when you want to
- * get all options that may potentially exist on the struct and its children
- * (e.g.  when constructing documentation). In that case you should call
- * av_opt_child_class_next() recursively on the parent struct's AVClass.  The
- * second case is when you have an already initialized struct with all its
- * children and you want to get all options that can be actually written or read
- * from it. In that case you should call av_opt_child_next() recursively (and
- * av_opt_next() on each result).
- *
- * @subsection avoptions_use_get_set Reading and writing AVOptions
- * When setting options, you often have a string read directly from the
- * user. In such a case, simply passing it to av_opt_set() is enough. For
- * non-string type options, av_opt_set() will parse the string according to the
- * option type.
- *
- * Similarly av_opt_get() will read any option type and convert it to a string
- * which will be returned. Do not forget that the string is allocated, so you
- * have to free it with av_free().
- *
- * In some cases it may be more convenient to put all options into an
- * AVDictionary and call av_opt_set_dict() on it. A specific case of this
- * are the format/codec open functions in lavf/lavc which take a dictionary
- * filled with option as a parameter. This allows to set some options
- * that cannot be set otherwise, since e.g. the input file format is not known
- * before the file is actually opened.
- */
-
-enum AVOptionType{
-    AV_OPT_TYPE_FLAGS,
-    AV_OPT_TYPE_INT,
-    AV_OPT_TYPE_INT64,
-    AV_OPT_TYPE_DOUBLE,
-    AV_OPT_TYPE_FLOAT,
-    AV_OPT_TYPE_STRING,
-    AV_OPT_TYPE_RATIONAL,
-    AV_OPT_TYPE_BINARY,  ///< offset must point to a pointer immediately followed by an int for the length
-    AV_OPT_TYPE_CONST = 128,
-};
-
-/**
- * AVOption
- */
-typedef struct AVOption {
-    const char *name;
-
-    /**
-     * short English help text
-     * @todo What about other languages?
-     */
-    const char *help;
-
-    /**
-     * The offset relative to the context structure where the option
-     * value is stored. It should be 0 for named constants.
-     */
-    int offset;
-    enum AVOptionType type;
-
-    /**
-     * the default value for scalar options
-     */
-    union {
-        int64_t i64;
-        double dbl;
-        const char *str;
-        /* TODO those are unused now */
-        AVRational q;
-    } default_val;
-    double min;                 ///< minimum valid value for the option
-    double max;                 ///< maximum valid value for the option
-
-    int flags;
-#define AV_OPT_FLAG_ENCODING_PARAM  1   ///< a generic parameter which can be set by the user for muxing or encoding
-#define AV_OPT_FLAG_DECODING_PARAM  2   ///< a generic parameter which can be set by the user for demuxing or decoding
-#define AV_OPT_FLAG_METADATA        4   ///< some data extracted or inserted into the file like title, comment, ...
-#define AV_OPT_FLAG_AUDIO_PARAM     8
-#define AV_OPT_FLAG_VIDEO_PARAM     16
-#define AV_OPT_FLAG_SUBTITLE_PARAM  32
-//FIXME think about enc-audio, ... style flags
-
-    /**
-     * The logical unit to which the option belongs. Non-constant
-     * options and corresponding named constants share the same
-     * unit. May be NULL.
-     */
-    const char *unit;
-} AVOption;
-
-/**
- * Show the obj options.
- *
- * @param req_flags requested flags for the options to show. Show only the
- * options for which it is opt->flags & req_flags.
- * @param rej_flags rejected flags for the options to show. Show only the
- * options for which it is !(opt->flags & req_flags).
- * @param av_log_obj log context to use for showing the options
- */
-int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags);
-
-/**
- * Set the values of all AVOption fields to their default values.
- *
- * @param s an AVOption-enabled struct (its first member must be a pointer to AVClass)
- */
-void av_opt_set_defaults(void *s);
-
-/**
- * Parse the key/value pairs list in opts. For each key/value pair
- * found, stores the value in the field in ctx that is named like the
- * key. ctx must be an AVClass context, storing is done using
- * AVOptions.
- *
- * @param key_val_sep a 0-terminated list of characters used to
- * separate key from value
- * @param pairs_sep a 0-terminated list of characters used to separate
- * two pairs from each other
- * @return the number of successfully set key/value pairs, or a negative
- * value corresponding to an AVERROR code in case of error:
- * AVERROR(EINVAL) if opts cannot be parsed,
- * the error code issued by av_set_string3() if a key/value pair
- * cannot be set
- */
-int av_set_options_string(void *ctx, const char *opts,
-                          const char *key_val_sep, const char *pairs_sep);
-
-/**
- * Free all string and binary options in obj.
- */
-void av_opt_free(void *obj);
-
-/**
- * Check whether a particular flag is set in a flags field.
- *
- * @param field_name the name of the flag field option
- * @param flag_name the name of the flag to check
- * @return non-zero if the flag is set, zero if the flag isn't set,
- *         isn't of the right type, or the flags field doesn't exist.
- */
-int av_opt_flag_is_set(void *obj, const char *field_name, const char *flag_name);
-
-/*
- * Set all the options from a given dictionary on an object.
- *
- * @param obj a struct whose first element is a pointer to AVClass
- * @param options options to process. This dictionary will be freed and replaced
- *                by a new one containing all options not found in obj.
- *                Of course this new dictionary needs to be freed by caller
- *                with av_dict_free().
- *
- * @return 0 on success, a negative AVERROR if some option was found in obj,
- *         but could not be set.
- *
- * @see av_dict_copy()
- */
-int av_opt_set_dict(void *obj, struct AVDictionary **options);
-
-/**
- * @defgroup opt_eval_funcs Evaluating option strings
- * @{
- * This group of functions can be used to evaluate option strings
- * and get numbers out of them. They do the same thing as av_opt_set(),
- * except the result is written into the caller-supplied pointer.
- *
- * @param obj a struct whose first element is a pointer to AVClass.
- * @param o an option for which the string is to be evaluated.
- * @param val string to be evaluated.
- * @param *_out value of the string will be written here.
- *
- * @return 0 on success, a negative number on failure.
- */
-int av_opt_eval_flags (void *obj, const AVOption *o, const char *val, int        *flags_out);
-int av_opt_eval_int   (void *obj, const AVOption *o, const char *val, int        *int_out);
-int av_opt_eval_int64 (void *obj, const AVOption *o, const char *val, int64_t    *int64_out);
-int av_opt_eval_float (void *obj, const AVOption *o, const char *val, float      *float_out);
-int av_opt_eval_double(void *obj, const AVOption *o, const char *val, double     *double_out);
-int av_opt_eval_q     (void *obj, const AVOption *o, const char *val, AVRational *q_out);
-/**
- * @}
- */
-
-#define AV_OPT_SEARCH_CHILDREN   0x0001 /**< Search in possible children of the
-                                             given object first. */
-/**
- *  The obj passed to av_opt_find() is fake -- only a double pointer to AVClass
- *  instead of a required pointer to a struct containing AVClass. This is
- *  useful for searching for options without needing to allocate the corresponding
- *  object.
- */
-#define AV_OPT_SEARCH_FAKE_OBJ   0x0002
-
-/**
- * Look for an option in an object. Consider only options which
- * have all the specified flags set.
- *
- * @param[in] obj A pointer to a struct whose first element is a
- *                pointer to an AVClass.
- *                Alternatively a double pointer to an AVClass, if
- *                AV_OPT_SEARCH_FAKE_OBJ search flag is set.
- * @param[in] name The name of the option to look for.
- * @param[in] unit When searching for named constants, name of the unit
- *                 it belongs to.
- * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG).
- * @param search_flags A combination of AV_OPT_SEARCH_*.
- *
- * @return A pointer to the option found, or NULL if no option
- *         was found.
- *
- * @note Options found with AV_OPT_SEARCH_CHILDREN flag may not be settable
- * directly with av_set_string3(). Use special calls which take an options
- * AVDictionary (e.g. avformat_open_input()) to set options found with this
- * flag.
- */
-const AVOption *av_opt_find(void *obj, const char *name, const char *unit,
-                            int opt_flags, int search_flags);
-
-/**
- * Look for an option in an object. Consider only options which
- * have all the specified flags set.
- *
- * @param[in] obj A pointer to a struct whose first element is a
- *                pointer to an AVClass.
- *                Alternatively a double pointer to an AVClass, if
- *                AV_OPT_SEARCH_FAKE_OBJ search flag is set.
- * @param[in] name The name of the option to look for.
- * @param[in] unit When searching for named constants, name of the unit
- *                 it belongs to.
- * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG).
- * @param search_flags A combination of AV_OPT_SEARCH_*.
- * @param[out] target_obj if non-NULL, an object to which the option belongs will be
- * written here. It may be different from obj if AV_OPT_SEARCH_CHILDREN is present
- * in search_flags. This parameter is ignored if search_flags contain
- * AV_OPT_SEARCH_FAKE_OBJ.
- *
- * @return A pointer to the option found, or NULL if no option
- *         was found.
- */
-const AVOption *av_opt_find2(void *obj, const char *name, const char *unit,
-                             int opt_flags, int search_flags, void **target_obj);
-
-/**
- * Iterate over all AVOptions belonging to obj.
- *
- * @param obj an AVOptions-enabled struct or a double pointer to an
- *            AVClass describing it.
- * @param prev result of the previous call to av_opt_next() on this object
- *             or NULL
- * @return next AVOption or NULL
- */
-const AVOption *av_opt_next(void *obj, const AVOption *prev);
-
-/**
- * Iterate over AVOptions-enabled children of obj.
- *
- * @param prev result of a previous call to this function or NULL
- * @return next AVOptions-enabled child or NULL
- */
-void *av_opt_child_next(void *obj, void *prev);
-
-/**
- * Iterate over potential AVOptions-enabled children of parent.
- *
- * @param prev result of a previous call to this function or NULL
- * @return AVClass corresponding to next potential child or NULL
- */
-const AVClass *av_opt_child_class_next(const AVClass *parent, const AVClass *prev);
-
-/**
- * @defgroup opt_set_funcs Option setting functions
- * @{
- * Those functions set the field of obj with the given name to value.
- *
- * @param[in] obj A struct whose first element is a pointer to an AVClass.
- * @param[in] name the name of the field to set
- * @param[in] val The value to set. In case of av_opt_set() if the field is not
- * of a string type, then the given string is parsed.
- * SI postfixes and some named scalars are supported.
- * If the field is of a numeric type, it has to be a numeric or named
- * scalar. Behavior with more than one scalar and +- infix operators
- * is undefined.
- * If the field is of a flags type, it has to be a sequence of numeric
- * scalars or named flags separated by '+' or '-'. Prefixing a flag
- * with '+' causes it to be set without affecting the other flags;
- * similarly, '-' unsets a flag.
- * @param search_flags flags passed to av_opt_find2. I.e. if AV_OPT_SEARCH_CHILDREN
- * is passed here, then the option may be set on a child of obj.
- *
- * @return 0 if the value has been set, or an AVERROR code in case of
- * error:
- * AVERROR_OPTION_NOT_FOUND if no matching option exists
- * AVERROR(ERANGE) if the value is out of range
- * AVERROR(EINVAL) if the value is not valid
- */
-int av_opt_set       (void *obj, const char *name, const char *val, int search_flags);
-int av_opt_set_int   (void *obj, const char *name, int64_t     val, int search_flags);
-int av_opt_set_double(void *obj, const char *name, double      val, int search_flags);
-int av_opt_set_q     (void *obj, const char *name, AVRational  val, int search_flags);
-int av_opt_set_bin   (void *obj, const char *name, const uint8_t *val, int size, int search_flags);
-/**
- * @}
- */
-
-/**
- * @defgroup opt_get_funcs Option getting functions
- * @{
- * Those functions get a value of the option with the given name from an object.
- *
- * @param[in] obj a struct whose first element is a pointer to an AVClass.
- * @param[in] name name of the option to get.
- * @param[in] search_flags flags passed to av_opt_find2. I.e. if AV_OPT_SEARCH_CHILDREN
- * is passed here, then the option may be found in a child of obj.
- * @param[out] out_val value of the option will be written here
- * @return 0 on success, a negative error code otherwise
- */
-/**
- * @note the returned string will av_malloc()ed and must be av_free()ed by the caller
- */
-int av_opt_get       (void *obj, const char *name, int search_flags, uint8_t   **out_val);
-int av_opt_get_int   (void *obj, const char *name, int search_flags, int64_t    *out_val);
-int av_opt_get_double(void *obj, const char *name, int search_flags, double     *out_val);
-int av_opt_get_q     (void *obj, const char *name, int search_flags, AVRational *out_val);
-/**
- * @}
- * @}
- */
-
-#endif /* AVUTIL_OPT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/parseutils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/parseutils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/parseutils.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/parseutils.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,124 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_PARSEUTILS_H
-#define AVUTIL_PARSEUTILS_H
-
-#include <time.h>
-
-#include "rational.h"
-
-/**
- * @file
- * misc parsing utilities
- */
-
-/**
- * Parse str and put in width_ptr and height_ptr the detected values.
- *
- * @param[in,out] width_ptr pointer to the variable which will contain the detected
- * width value
- * @param[in,out] height_ptr pointer to the variable which will contain the detected
- * height value
- * @param[in] str the string to parse: it has to be a string in the format
- * width x height or a valid video size abbreviation.
- * @return >= 0 on success, a negative error code otherwise
- */
-int av_parse_video_size(int *width_ptr, int *height_ptr, const char *str);
-
-/**
- * Parse str and store the detected values in *rate.
- *
- * @param[in,out] rate pointer to the AVRational which will contain the detected
- * frame rate
- * @param[in] str the string to parse: it has to be a string in the format
- * rate_num / rate_den, a float number or a valid video rate abbreviation
- * @return >= 0 on success, a negative error code otherwise
- */
-int av_parse_video_rate(AVRational *rate, const char *str);
-
-/**
- * Put the RGBA values that correspond to color_string in rgba_color.
- *
- * @param color_string a string specifying a color. It can be the name of
- * a color (case insensitive match) or a [0x|#]RRGGBB[AA] sequence,
- * possibly followed by "@" and a string representing the alpha
- * component.
- * The alpha component may be a string composed by "0x" followed by an
- * hexadecimal number or a decimal number between 0.0 and 1.0, which
- * represents the opacity value (0x00/0.0 means completely transparent,
- * 0xff/1.0 completely opaque).
- * If the alpha component is not specified then 0xff is assumed.
- * The string "random" will result in a random color.
- * @param slen length of the initial part of color_string containing the
- * color. It can be set to -1 if color_string is a null terminated string
- * containing nothing else than the color.
- * @return >= 0 in case of success, a negative value in case of
- * failure (for example if color_string cannot be parsed).
- */
-int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen,
-                   void *log_ctx);
-
-/**
- * Parse timestr and return in *time a corresponding number of
- * microseconds.
- *
- * @param timeval puts here the number of microseconds corresponding
- * to the string in timestr. If the string represents a duration, it
- * is the number of microseconds contained in the time interval.  If
- * the string is a date, is the number of microseconds since 1st of
- * January, 1970 up to the time of the parsed date.  If timestr cannot
- * be successfully parsed, set *time to INT64_MIN.
-
- * @param timestr a string representing a date or a duration.
- * - If a date the syntax is:
- * @code
- * [{YYYY-MM-DD|YYYYMMDD}[T|t| ]]{{HH[:MM[:SS[.m...]]]}|{HH[MM[SS[.m...]]]}}[Z]
- * now
- * @endcode
- * If the value is "now" it takes the current time.
- * Time is local time unless Z is appended, in which case it is
- * interpreted as UTC.
- * If the year-month-day part is not specified it takes the current
- * year-month-day.
- * - If a duration the syntax is:
- * @code
- * [-]HH[:MM[:SS[.m...]]]
- * [-]S+[.m...]
- * @endcode
- * @param duration flag which tells how to interpret timestr, if not
- * zero timestr is interpreted as a duration, otherwise as a date
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code otherwise
- */
-int av_parse_time(int64_t *timeval, const char *timestr, int duration);
-
-/**
- * Attempt to find a specific tag in a URL.
- *
- * syntax: '?tag1=val1&tag2=val2...'. Little URL decoding is done.
- * Return 1 if found.
- */
-int av_find_info_tag(char *arg, int arg_size, const char *tag1, const char *info);
-
-/**
- * Convert the decomposed UTC time in tm to a time_t value.
- */
-time_t av_timegm(struct tm *tm);
-
-#endif /* AVUTIL_PARSEUTILS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/pixdesc.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/pixdesc.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/pixdesc.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/pixdesc.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,223 +0,0 @@
-/*
- * pixel format descriptor
- * Copyright (c) 2009 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_PIXDESC_H
-#define AVUTIL_PIXDESC_H
-
-#include <inttypes.h>
-#include "pixfmt.h"
-
-typedef struct AVComponentDescriptor{
-    uint16_t plane        :2;            ///< which of the 4 planes contains the component
-
-    /**
-     * Number of elements between 2 horizontally consecutive pixels minus 1.
-     * Elements are bits for bitstream formats, bytes otherwise.
-     */
-    uint16_t step_minus1  :3;
-
-    /**
-     * Number of elements before the component of the first pixel plus 1.
-     * Elements are bits for bitstream formats, bytes otherwise.
-     */
-    uint16_t offset_plus1 :3;
-    uint16_t shift        :3;            ///< number of least significant bits that must be shifted away to get the value
-    uint16_t depth_minus1 :4;            ///< number of bits in the component minus 1
-}AVComponentDescriptor;
-
-/**
- * Descriptor that unambiguously describes how the bits of a pixel are
- * stored in the up to 4 data planes of an image. It also stores the
- * subsampling factors and number of components.
- *
- * @note This is separate of the colorspace (RGB, YCbCr, YPbPr, JPEG-style YUV
- *       and all the YUV variants) AVPixFmtDescriptor just stores how values
- *       are stored not what these values represent.
- */
-typedef struct AVPixFmtDescriptor{
-    const char *name;
-    uint8_t nb_components;      ///< The number of components each pixel has, (1-4)
-
-    /**
-     * Amount to shift the luma width right to find the chroma width.
-     * For YV12 this is 1 for example.
-     * chroma_width = -((-luma_width) >> log2_chroma_w)
-     * The note above is needed to ensure rounding up.
-     * This value only refers to the chroma components.
-     */
-    uint8_t log2_chroma_w;      ///< chroma_width = -((-luma_width )>>log2_chroma_w)
-
-    /**
-     * Amount to shift the luma height right to find the chroma height.
-     * For YV12 this is 1 for example.
-     * chroma_height= -((-luma_height) >> log2_chroma_h)
-     * The note above is needed to ensure rounding up.
-     * This value only refers to the chroma components.
-     */
-    uint8_t log2_chroma_h;
-    uint8_t flags;
-
-    /**
-     * Parameters that describe how pixels are packed. If the format
-     * has chroma components, they must be stored in comp[1] and
-     * comp[2].
-     */
-    AVComponentDescriptor comp[4];
-}AVPixFmtDescriptor;
-
-#define PIX_FMT_BE        1 ///< Pixel format is big-endian.
-#define PIX_FMT_PAL       2 ///< Pixel format has a palette in data[1], values are indexes in this palette.
-#define PIX_FMT_BITSTREAM 4 ///< All values of a component are bit-wise packed end to end.
-#define PIX_FMT_HWACCEL   8 ///< Pixel format is an HW accelerated format.
-#define PIX_FMT_PLANAR   16 ///< At least one pixel component is not in the first data plane
-#define PIX_FMT_RGB      32 ///< The pixel format contains RGB-like data (as opposed to YUV/grayscale)
-/**
- * The pixel format is "pseudo-paletted". This means that Libav treats it as
- * paletted internally, but the palette is generated by the decoder and is not
- * stored in the file.
- */
-#define PIX_FMT_PSEUDOPAL 64
-
-#define PIX_FMT_ALPHA   128 ///< The pixel format has an alpha channel
-
-
-#if FF_API_PIX_FMT_DESC
-/**
- * The array of all the pixel format descriptors.
- */
-extern const AVPixFmtDescriptor av_pix_fmt_descriptors[];
-#endif
-
-/**
- * Read a line from an image, and write the values of the
- * pixel format component c to dst.
- *
- * @param data the array containing the pointers to the planes of the image
- * @param linesize the array containing the linesizes of the image
- * @param desc the pixel format descriptor for the image
- * @param x the horizontal coordinate of the first pixel to read
- * @param y the vertical coordinate of the first pixel to read
- * @param w the width of the line to read, that is the number of
- * values to write to dst
- * @param read_pal_component if not zero and the format is a paletted
- * format writes the values corresponding to the palette
- * component c in data[1] to dst, rather than the palette indexes in
- * data[0]. The behavior is undefined if the format is not paletted.
- */
-void av_read_image_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4],
-                        const AVPixFmtDescriptor *desc, int x, int y, int c, int w, int read_pal_component);
-
-/**
- * Write the values from src to the pixel format component c of an
- * image line.
- *
- * @param src array containing the values to write
- * @param data the array containing the pointers to the planes of the
- * image to write into. It is supposed to be zeroed.
- * @param linesize the array containing the linesizes of the image
- * @param desc the pixel format descriptor for the image
- * @param x the horizontal coordinate of the first pixel to write
- * @param y the vertical coordinate of the first pixel to write
- * @param w the width of the line to write, that is the number of
- * values to write to the image line
- */
-void av_write_image_line(const uint16_t *src, uint8_t *data[4], const int linesize[4],
-                         const AVPixFmtDescriptor *desc, int x, int y, int c, int w);
-
-/**
- * Return the pixel format corresponding to name.
- *
- * If there is no pixel format with name name, then looks for a
- * pixel format with the name corresponding to the native endian
- * format of name.
- * For example in a little-endian system, first looks for "gray16",
- * then for "gray16le".
- *
- * Finally if no pixel format has been found, returns PIX_FMT_NONE.
- */
-enum AVPixelFormat av_get_pix_fmt(const char *name);
-
-/**
- * Return the short name for a pixel format, NULL in case pix_fmt is
- * unknown.
- *
- * @see av_get_pix_fmt(), av_get_pix_fmt_string()
- */
-const char *av_get_pix_fmt_name(enum AVPixelFormat pix_fmt);
-
-/**
- * Print in buf the string corresponding to the pixel format with
- * number pix_fmt, or an header if pix_fmt is negative.
- *
- * @param buf the buffer where to write the string
- * @param buf_size the size of buf
- * @param pix_fmt the number of the pixel format to print the
- * corresponding info string, or a negative value to print the
- * corresponding header.
- */
-char *av_get_pix_fmt_string (char *buf, int buf_size, enum AVPixelFormat pix_fmt);
-
-/**
- * Return the number of bits per pixel used by the pixel format
- * described by pixdesc.
- *
- * The returned number of bits refers to the number of bits actually
- * used for storing the pixel information, that is padding bits are
- * not counted.
- */
-int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc);
-
-/**
- * @return a pixel format descriptor for provided pixel format or NULL if
- * this pixel format is unknown.
- */
-const AVPixFmtDescriptor *av_pix_fmt_desc_get(enum AVPixelFormat pix_fmt);
-
-/**
- * Iterate over all pixel format descriptors known to libavutil.
- *
- * @param prev previous descriptor. NULL to get the first descriptor.
- *
- * @return next descriptor or NULL after the last descriptor
- */
-const AVPixFmtDescriptor *av_pix_fmt_desc_next(const AVPixFmtDescriptor *prev);
-
-/**
- * @return an AVPixelFormat id described by desc, or AV_PIX_FMT_NONE if desc
- * is not a valid pointer to a pixel format descriptor.
- */
-enum AVPixelFormat av_pix_fmt_desc_get_id(const AVPixFmtDescriptor *desc);
-
-/**
- * Utility function to access log2_chroma_w log2_chroma_h from
- * the pixel format AVPixFmtDescriptor.
- *
- * @param[in]  pix_fmt the pixel format
- * @param[out] h_shift store log2_chroma_h
- * @param[out] v_shift store log2_chroma_w
- *
- * @return 0 on success, AVERROR(ENOSYS) on invalid or unknown pixel format
- */
-int av_pix_fmt_get_chroma_sub_sample(enum AVPixelFormat pix_fmt,
-                                     int *h_shift, int *v_shift);
-
-
-#endif /* AVUTIL_PIXDESC_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/pixfmt.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/pixfmt.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/pixfmt.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/pixfmt.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,268 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_PIXFMT_H
-#define AVUTIL_PIXFMT_H
-
-/**
- * @file
- * pixel format definitions
- *
- */
-
-#include "libavutil/avconfig.h"
-#include "libavutil/version.h"
-
-/**
- * Pixel format.
- *
- * @note
- * PIX_FMT_RGB32 is handled in an endian-specific manner. An RGBA
- * color is put together as:
- *  (A << 24) | (R << 16) | (G << 8) | B
- * This is stored as BGRA on little-endian CPU architectures and ARGB on
- * big-endian CPUs.
- *
- * @par
- * When the pixel format is palettized RGB (PIX_FMT_PAL8), the palettized
- * image data is stored in AVFrame.data[0]. The palette is transported in
- * AVFrame.data[1], is 1024 bytes long (256 4-byte entries) and is
- * formatted the same as in PIX_FMT_RGB32 described above (i.e., it is
- * also endian-specific). Note also that the individual RGB palette
- * components stored in AVFrame.data[1] should be in the range 0..255.
- * This is important as many custom PAL8 video codecs that were designed
- * to run on the IBM VGA graphics adapter use 6-bit palette components.
- *
- * @par
- * For all the 8bit per pixel formats, an RGB32 palette is in data[1] like
- * for pal8. This palette is filled in automatically by the function
- * allocating the picture.
- *
- * @note
- * Make sure that all newly added big-endian formats have pix_fmt & 1 == 1
- * and that all newly added little-endian formats have pix_fmt & 1 == 0.
- * This allows simpler detection of big vs little-endian.
- */
-enum AVPixelFormat {
-    AV_PIX_FMT_NONE = -1,
-    AV_PIX_FMT_YUV420P,   ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
-    AV_PIX_FMT_YUYV422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
-    AV_PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
-    AV_PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
-    AV_PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
-    AV_PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
-    AV_PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
-    AV_PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
-    AV_PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
-    AV_PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
-    AV_PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
-    AV_PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
-    AV_PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
-    AV_PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
-    AV_PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
-    AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
-    AV_PIX_FMT_XVMC_MPEG2_IDCT,
-    AV_PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
-    AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
-    AV_PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
-    AV_PIX_FMT_BGR4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
-    AV_PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
-    AV_PIX_FMT_RGB8,      ///< packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
-    AV_PIX_FMT_RGB4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
-    AV_PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
-    AV_PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
-    AV_PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
-
-    AV_PIX_FMT_ARGB,      ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
-    AV_PIX_FMT_RGBA,      ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
-    AV_PIX_FMT_ABGR,      ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
-    AV_PIX_FMT_BGRA,      ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
-
-    AV_PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
-    AV_PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
-    AV_PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
-    AV_PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
-    AV_PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
-    AV_PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    AV_PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    AV_PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    AV_PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    AV_PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    AV_PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
-    AV_PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
-
-    AV_PIX_FMT_RGB565BE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian
-    AV_PIX_FMT_RGB565LE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), little-endian
-    AV_PIX_FMT_RGB555BE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
-    AV_PIX_FMT_RGB555LE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
-
-    AV_PIX_FMT_BGR565BE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), big-endian
-    AV_PIX_FMT_BGR565LE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), little-endian
-    AV_PIX_FMT_BGR555BE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
-    AV_PIX_FMT_BGR555LE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
-
-    AV_PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
-    AV_PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
-    AV_PIX_FMT_VAAPI_VLD,  ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-
-    AV_PIX_FMT_YUV420P16LE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    AV_PIX_FMT_YUV420P16BE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    AV_PIX_FMT_YUV422P16LE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    AV_PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    AV_PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    AV_PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    AV_PIX_FMT_VDPAU_MPEG4,  ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    AV_PIX_FMT_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
-
-    AV_PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
-    AV_PIX_FMT_RGB444BE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
-    AV_PIX_FMT_BGR444LE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
-    AV_PIX_FMT_BGR444BE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
-    AV_PIX_FMT_Y400A,     ///< 8bit gray, 8bit alpha
-    AV_PIX_FMT_BGR48BE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
-    AV_PIX_FMT_BGR48LE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
-    AV_PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    AV_PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    AV_PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    AV_PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    AV_PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    AV_PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    AV_PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    AV_PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    AV_PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    AV_PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    AV_PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    AV_PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    AV_PIX_FMT_VDA_VLD,    ///< hardware decoding through VDA
-    AV_PIX_FMT_GBRP,      ///< planar GBR 4:4:4 24bpp
-    AV_PIX_FMT_GBRP9BE,   ///< planar GBR 4:4:4 27bpp, big-endian
-    AV_PIX_FMT_GBRP9LE,   ///< planar GBR 4:4:4 27bpp, little-endian
-    AV_PIX_FMT_GBRP10BE,  ///< planar GBR 4:4:4 30bpp, big-endian
-    AV_PIX_FMT_GBRP10LE,  ///< planar GBR 4:4:4 30bpp, little-endian
-    AV_PIX_FMT_GBRP16BE,  ///< planar GBR 4:4:4 48bpp, big-endian
-    AV_PIX_FMT_GBRP16LE,  ///< planar GBR 4:4:4 48bpp, little-endian
-    AV_PIX_FMT_YUVA422P,  ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
-    AV_PIX_FMT_YUVA444P,  ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples)
-    AV_PIX_FMT_YUVA420P9BE,  ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per 2x2 Y & A samples), big-endian
-    AV_PIX_FMT_YUVA420P9LE,  ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per 2x2 Y & A samples), little-endian
-    AV_PIX_FMT_YUVA422P9BE,  ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per 2x1 Y & A samples), big-endian
-    AV_PIX_FMT_YUVA422P9LE,  ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per 2x1 Y & A samples), little-endian
-    AV_PIX_FMT_YUVA444P9BE,  ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per 1x1 Y & A samples), big-endian
-    AV_PIX_FMT_YUVA444P9LE,  ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per 1x1 Y & A samples), little-endian
-    AV_PIX_FMT_YUVA420P10BE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per 2x2 Y & A samples, big-endian)
-    AV_PIX_FMT_YUVA420P10LE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per 2x2 Y & A samples, little-endian)
-    AV_PIX_FMT_YUVA422P10BE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per 2x1 Y & A samples, big-endian)
-    AV_PIX_FMT_YUVA422P10LE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per 2x1 Y & A samples, little-endian)
-    AV_PIX_FMT_YUVA444P10BE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per 1x1 Y & A samples, big-endian)
-    AV_PIX_FMT_YUVA444P10LE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per 1x1 Y & A samples, little-endian)
-    AV_PIX_FMT_YUVA420P16BE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per 2x2 Y & A samples, big-endian)
-    AV_PIX_FMT_YUVA420P16LE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per 2x2 Y & A samples, little-endian)
-    AV_PIX_FMT_YUVA422P16BE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per 2x1 Y & A samples, big-endian)
-    AV_PIX_FMT_YUVA422P16LE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per 2x1 Y & A samples, little-endian)
-    AV_PIX_FMT_YUVA444P16BE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, big-endian)
-    AV_PIX_FMT_YUVA444P16LE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, little-endian)
-    AV_PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
-
-#if FF_API_PIX_FMT
-#include "old_pix_fmts.h"
-#endif
-};
-
-#if AV_HAVE_BIGENDIAN
-#   define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##be
-#else
-#   define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##le
-#endif
-
-#define AV_PIX_FMT_RGB32   AV_PIX_FMT_NE(ARGB, BGRA)
-#define AV_PIX_FMT_RGB32_1 AV_PIX_FMT_NE(RGBA, ABGR)
-#define AV_PIX_FMT_BGR32   AV_PIX_FMT_NE(ABGR, RGBA)
-#define AV_PIX_FMT_BGR32_1 AV_PIX_FMT_NE(BGRA, ARGB)
-
-#define AV_PIX_FMT_GRAY16 AV_PIX_FMT_NE(GRAY16BE, GRAY16LE)
-#define AV_PIX_FMT_RGB48  AV_PIX_FMT_NE(RGB48BE,  RGB48LE)
-#define AV_PIX_FMT_RGB565 AV_PIX_FMT_NE(RGB565BE, RGB565LE)
-#define AV_PIX_FMT_RGB555 AV_PIX_FMT_NE(RGB555BE, RGB555LE)
-#define AV_PIX_FMT_RGB444 AV_PIX_FMT_NE(RGB444BE, RGB444LE)
-#define AV_PIX_FMT_BGR48  AV_PIX_FMT_NE(BGR48BE,  BGR48LE)
-#define AV_PIX_FMT_BGR565 AV_PIX_FMT_NE(BGR565BE, BGR565LE)
-#define AV_PIX_FMT_BGR555 AV_PIX_FMT_NE(BGR555BE, BGR555LE)
-#define AV_PIX_FMT_BGR444 AV_PIX_FMT_NE(BGR444BE, BGR444LE)
-
-#define AV_PIX_FMT_YUV420P9  AV_PIX_FMT_NE(YUV420P9BE , YUV420P9LE)
-#define AV_PIX_FMT_YUV422P9  AV_PIX_FMT_NE(YUV422P9BE , YUV422P9LE)
-#define AV_PIX_FMT_YUV444P9  AV_PIX_FMT_NE(YUV444P9BE , YUV444P9LE)
-#define AV_PIX_FMT_YUV420P10 AV_PIX_FMT_NE(YUV420P10BE, YUV420P10LE)
-#define AV_PIX_FMT_YUV422P10 AV_PIX_FMT_NE(YUV422P10BE, YUV422P10LE)
-#define AV_PIX_FMT_YUV444P10 AV_PIX_FMT_NE(YUV444P10BE, YUV444P10LE)
-#define AV_PIX_FMT_YUV420P16 AV_PIX_FMT_NE(YUV420P16BE, YUV420P16LE)
-#define AV_PIX_FMT_YUV422P16 AV_PIX_FMT_NE(YUV422P16BE, YUV422P16LE)
-#define AV_PIX_FMT_YUV444P16 AV_PIX_FMT_NE(YUV444P16BE, YUV444P16LE)
-
-#define AV_PIX_FMT_GBRP9     AV_PIX_FMT_NE(GBRP9BE ,    GBRP9LE)
-#define AV_PIX_FMT_GBRP10    AV_PIX_FMT_NE(GBRP10BE,    GBRP10LE)
-#define AV_PIX_FMT_GBRP16    AV_PIX_FMT_NE(GBRP16BE,    GBRP16LE)
-
-#define AV_PIX_FMT_YUVA420P9  AV_PIX_FMT_NE(YUVA420P9BE , YUVA420P9LE)
-#define AV_PIX_FMT_YUVA422P9  AV_PIX_FMT_NE(YUVA422P9BE , YUVA422P9LE)
-#define AV_PIX_FMT_YUVA444P9  AV_PIX_FMT_NE(YUVA444P9BE , YUVA444P9LE)
-#define AV_PIX_FMT_YUVA420P10 AV_PIX_FMT_NE(YUVA420P10BE, YUVA420P10LE)
-#define AV_PIX_FMT_YUVA422P10 AV_PIX_FMT_NE(YUVA422P10BE, YUVA422P10LE)
-#define AV_PIX_FMT_YUVA444P10 AV_PIX_FMT_NE(YUVA444P10BE, YUVA444P10LE)
-#define AV_PIX_FMT_YUVA420P16 AV_PIX_FMT_NE(YUVA420P16BE, YUVA420P16LE)
-#define AV_PIX_FMT_YUVA422P16 AV_PIX_FMT_NE(YUVA422P16BE, YUVA422P16LE)
-#define AV_PIX_FMT_YUVA444P16 AV_PIX_FMT_NE(YUVA444P16BE, YUVA444P16LE)
-
-#if FF_API_PIX_FMT
-#define PixelFormat AVPixelFormat
-
-#define PIX_FMT_NE(be, le) AV_PIX_FMT_NE(be, le)
-
-#define PIX_FMT_RGB32   AV_PIX_FMT_RGB32
-#define PIX_FMT_RGB32_1 AV_PIX_FMT_RGB32_1
-#define PIX_FMT_BGR32   AV_PIX_FMT_BGR32
-#define PIX_FMT_BGR32_1 AV_PIX_FMT_BGR32_1
-
-#define PIX_FMT_GRAY16 AV_PIX_FMT_GRAY16
-#define PIX_FMT_RGB48  AV_PIX_FMT_RGB48
-#define PIX_FMT_RGB565 AV_PIX_FMT_RGB565
-#define PIX_FMT_RGB555 AV_PIX_FMT_RGB555
-#define PIX_FMT_RGB444 AV_PIX_FMT_RGB444
-#define PIX_FMT_BGR48  AV_PIX_FMT_BGR48
-#define PIX_FMT_BGR565 AV_PIX_FMT_BGR565
-#define PIX_FMT_BGR555 AV_PIX_FMT_BGR555
-#define PIX_FMT_BGR444 AV_PIX_FMT_BGR444
-
-#define PIX_FMT_YUV420P9  AV_PIX_FMT_YUV420P9
-#define PIX_FMT_YUV422P9  AV_PIX_FMT_YUV422P9
-#define PIX_FMT_YUV444P9  AV_PIX_FMT_YUV444P9
-#define PIX_FMT_YUV420P10 AV_PIX_FMT_YUV420P10
-#define PIX_FMT_YUV422P10 AV_PIX_FMT_YUV422P10
-#define PIX_FMT_YUV444P10 AV_PIX_FMT_YUV444P10
-#define PIX_FMT_YUV420P16 AV_PIX_FMT_YUV420P16
-#define PIX_FMT_YUV422P16 AV_PIX_FMT_YUV422P16
-#define PIX_FMT_YUV444P16 AV_PIX_FMT_YUV444P16
-
-#define PIX_FMT_GBRP9  AV_PIX_FMT_GBRP9
-#define PIX_FMT_GBRP10 AV_PIX_FMT_GBRP10
-#define PIX_FMT_GBRP16 AV_PIX_FMT_GBRP16
-#endif
-
-#endif /* AVUTIL_PIXFMT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/random_seed.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/random_seed.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/random_seed.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/random_seed.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2009 Baptiste Coudurier <baptiste.coudurier@gmail.com>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_RANDOM_SEED_H
-#define AVUTIL_RANDOM_SEED_H
-
-#include <stdint.h>
-/**
- * @addtogroup lavu_crypto
- * @{
- */
-
-/**
- * Get random data.
- *
- * This function can be called repeatedly to generate more random bits
- * as needed. It is generally quite slow, and usually used to seed a
- * PRNG.  As it uses /dev/urandom and /dev/random, the quality of the
- * returned random data depends on the platform.
- */
-uint32_t av_get_random_seed(void);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_RANDOM_SEED_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/rational.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/rational.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/rational.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/rational.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,155 +0,0 @@
-/*
- * rational numbers
- * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * rational numbers
- * @author Michael Niedermayer <michaelni@gmx.at>
- */
-
-#ifndef AVUTIL_RATIONAL_H
-#define AVUTIL_RATIONAL_H
-
-#include <stdint.h>
-#include <limits.h>
-#include "attributes.h"
-
-/**
- * @addtogroup lavu_math
- * @{
- */
-
-/**
- * rational number numerator/denominator
- */
-typedef struct AVRational{
-    int num; ///< numerator
-    int den; ///< denominator
-} AVRational;
-
-/**
- * Compare two rationals.
- * @param a first rational
- * @param b second rational
- * @return 0 if a==b, 1 if a>b, -1 if a<b, and INT_MIN if one of the
- * values is of the form 0/0
- */
-static inline int av_cmp_q(AVRational a, AVRational b){
-    const int64_t tmp= a.num * (int64_t)b.den - b.num * (int64_t)a.den;
-
-    if(tmp) return ((tmp ^ a.den ^ b.den)>>63)|1;
-    else if(b.den && a.den) return 0;
-    else if(a.num && b.num) return (a.num>>31) - (b.num>>31);
-    else                    return INT_MIN;
-}
-
-/**
- * Convert rational to double.
- * @param a rational to convert
- * @return (double) a
- */
-static inline double av_q2d(AVRational a){
-    return a.num / (double) a.den;
-}
-
-/**
- * Reduce a fraction.
- * This is useful for framerate calculations.
- * @param dst_num destination numerator
- * @param dst_den destination denominator
- * @param num source numerator
- * @param den source denominator
- * @param max the maximum allowed for dst_num & dst_den
- * @return 1 if exact, 0 otherwise
- */
-int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max);
-
-/**
- * Multiply two rationals.
- * @param b first rational
- * @param c second rational
- * @return b*c
- */
-AVRational av_mul_q(AVRational b, AVRational c) av_const;
-
-/**
- * Divide one rational by another.
- * @param b first rational
- * @param c second rational
- * @return b/c
- */
-AVRational av_div_q(AVRational b, AVRational c) av_const;
-
-/**
- * Add two rationals.
- * @param b first rational
- * @param c second rational
- * @return b+c
- */
-AVRational av_add_q(AVRational b, AVRational c) av_const;
-
-/**
- * Subtract one rational from another.
- * @param b first rational
- * @param c second rational
- * @return b-c
- */
-AVRational av_sub_q(AVRational b, AVRational c) av_const;
-
-/**
- * Invert a rational.
- * @param q value
- * @return 1 / q
- */
-static av_always_inline AVRational av_inv_q(AVRational q)
-{
-    AVRational r = { q.den, q.num };
-    return r;
-}
-
-/**
- * Convert a double precision floating point number to a rational.
- * inf is expressed as {1,0} or {-1,0} depending on the sign.
- *
- * @param d double to convert
- * @param max the maximum allowed numerator and denominator
- * @return (AVRational) d
- */
-AVRational av_d2q(double d, int max) av_const;
-
-/**
- * @return 1 if q1 is nearer to q than q2, -1 if q2 is nearer
- * than q1, 0 if they have the same distance.
- */
-int av_nearer_q(AVRational q, AVRational q1, AVRational q2);
-
-/**
- * Find the nearest value in q_list to q.
- * @param q_list an array of rationals terminated by {0, 0}
- * @return the index of the nearest value found in the array
- */
-int av_find_nearest_q_idx(AVRational q, const AVRational* q_list);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_RATIONAL_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/samplefmt.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/samplefmt.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/samplefmt.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/samplefmt.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,220 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_SAMPLEFMT_H
-#define AVUTIL_SAMPLEFMT_H
-
-#include <stdint.h>
-
-#include "avutil.h"
-#include "attributes.h"
-
-/**
- * Audio Sample Formats
- *
- * @par
- * The data described by the sample format is always in native-endian order.
- * Sample values can be expressed by native C types, hence the lack of a signed
- * 24-bit sample format even though it is a common raw audio data format.
- *
- * @par
- * The floating-point formats are based on full volume being in the range
- * [-1.0, 1.0]. Any values outside this range are beyond full volume level.
- *
- * @par
- * The data layout as used in av_samples_fill_arrays() and elsewhere in Libav
- * (such as AVFrame in libavcodec) is as follows:
- *
- * For planar sample formats, each audio channel is in a separate data plane,
- * and linesize is the buffer size, in bytes, for a single plane. All data
- * planes must be the same size. For packed sample formats, only the first data
- * plane is used, and samples for each channel are interleaved. In this case,
- * linesize is the buffer size, in bytes, for the 1 plane.
- */
-enum AVSampleFormat {
-    AV_SAMPLE_FMT_NONE = -1,
-    AV_SAMPLE_FMT_U8,          ///< unsigned 8 bits
-    AV_SAMPLE_FMT_S16,         ///< signed 16 bits
-    AV_SAMPLE_FMT_S32,         ///< signed 32 bits
-    AV_SAMPLE_FMT_FLT,         ///< float
-    AV_SAMPLE_FMT_DBL,         ///< double
-
-    AV_SAMPLE_FMT_U8P,         ///< unsigned 8 bits, planar
-    AV_SAMPLE_FMT_S16P,        ///< signed 16 bits, planar
-    AV_SAMPLE_FMT_S32P,        ///< signed 32 bits, planar
-    AV_SAMPLE_FMT_FLTP,        ///< float, planar
-    AV_SAMPLE_FMT_DBLP,        ///< double, planar
-
-    AV_SAMPLE_FMT_NB           ///< Number of sample formats. DO NOT USE if linking dynamically
-};
-
-/**
- * Return the name of sample_fmt, or NULL if sample_fmt is not
- * recognized.
- */
-const char *av_get_sample_fmt_name(enum AVSampleFormat sample_fmt);
-
-/**
- * Return a sample format corresponding to name, or AV_SAMPLE_FMT_NONE
- * on error.
- */
-enum AVSampleFormat av_get_sample_fmt(const char *name);
-
-/**
- * Get the packed alternative form of the given sample format.
- *
- * If the passed sample_fmt is already in packed format, the format returned is
- * the same as the input.
- *
- * @return  the packed alternative form of the given sample format or
-            AV_SAMPLE_FMT_NONE on error.
- */
-enum AVSampleFormat av_get_packed_sample_fmt(enum AVSampleFormat sample_fmt);
-
-/**
- * Get the planar alternative form of the given sample format.
- *
- * If the passed sample_fmt is already in planar format, the format returned is
- * the same as the input.
- *
- * @return  the planar alternative form of the given sample format or
-            AV_SAMPLE_FMT_NONE on error.
- */
-enum AVSampleFormat av_get_planar_sample_fmt(enum AVSampleFormat sample_fmt);
-
-/**
- * Generate a string corresponding to the sample format with
- * sample_fmt, or a header if sample_fmt is negative.
- *
- * @param buf the buffer where to write the string
- * @param buf_size the size of buf
- * @param sample_fmt the number of the sample format to print the
- * corresponding info string, or a negative value to print the
- * corresponding header.
- * @return the pointer to the filled buffer or NULL if sample_fmt is
- * unknown or in case of other errors
- */
-char *av_get_sample_fmt_string(char *buf, int buf_size, enum AVSampleFormat sample_fmt);
-
-/**
- * Return number of bytes per sample.
- *
- * @param sample_fmt the sample format
- * @return number of bytes per sample or zero if unknown for the given
- * sample format
- */
-int av_get_bytes_per_sample(enum AVSampleFormat sample_fmt);
-
-/**
- * Check if the sample format is planar.
- *
- * @param sample_fmt the sample format to inspect
- * @return 1 if the sample format is planar, 0 if it is interleaved
- */
-int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt);
-
-/**
- * Get the required buffer size for the given audio parameters.
- *
- * @param[out] linesize calculated linesize, may be NULL
- * @param nb_channels   the number of channels
- * @param nb_samples    the number of samples in a single channel
- * @param sample_fmt    the sample format
- * @param align         buffer size alignment (0 = default, 1 = no alignment)
- * @return              required buffer size, or negative error code on failure
- */
-int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples,
-                               enum AVSampleFormat sample_fmt, int align);
-
-/**
- * Fill channel data pointers and linesize for samples with sample
- * format sample_fmt.
- *
- * The pointers array is filled with the pointers to the samples data:
- * for planar, set the start point of each channel's data within the buffer,
- * for packed, set the start point of the entire buffer only.
- *
- * The linesize array is filled with the aligned size of each channel's data
- * buffer for planar layout, or the aligned size of the buffer for all channels
- * for packed layout.
- *
- * @see enum AVSampleFormat
- * The documentation for AVSampleFormat describes the data layout.
- *
- * @param[out] audio_data  array to be filled with the pointer for each channel
- * @param[out] linesize    calculated linesize, may be NULL
- * @param buf              the pointer to a buffer containing the samples
- * @param nb_channels      the number of channels
- * @param nb_samples       the number of samples in a single channel
- * @param sample_fmt       the sample format
- * @param align            buffer size alignment (0 = default, 1 = no alignment)
- * @return                 0 on success or a negative error code on failure
- */
-int av_samples_fill_arrays(uint8_t **audio_data, int *linesize,
-                           const uint8_t *buf,
-                           int nb_channels, int nb_samples,
-                           enum AVSampleFormat sample_fmt, int align);
-
-/**
- * Allocate a samples buffer for nb_samples samples, and fill data pointers and
- * linesize accordingly.
- * The allocated samples buffer can be freed by using av_freep(&audio_data[0])
- * Allocated data will be initialized to silence.
- *
- * @see enum AVSampleFormat
- * The documentation for AVSampleFormat describes the data layout.
- *
- * @param[out] audio_data  array to be filled with the pointer for each channel
- * @param[out] linesize    aligned size for audio buffer(s), may be NULL
- * @param nb_channels      number of audio channels
- * @param nb_samples       number of samples per channel
- * @param align            buffer size alignment (0 = default, 1 = no alignment)
- * @return                 0 on success or a negative error code on failure
- * @see av_samples_fill_arrays()
- */
-int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels,
-                     int nb_samples, enum AVSampleFormat sample_fmt, int align);
-
-/**
- * Copy samples from src to dst.
- *
- * @param dst destination array of pointers to data planes
- * @param src source array of pointers to data planes
- * @param dst_offset offset in samples at which the data will be written to dst
- * @param src_offset offset in samples at which the data will be read from src
- * @param nb_samples number of samples to be copied
- * @param nb_channels number of audio channels
- * @param sample_fmt audio sample format
- */
-int av_samples_copy(uint8_t **dst, uint8_t * const *src, int dst_offset,
-                    int src_offset, int nb_samples, int nb_channels,
-                    enum AVSampleFormat sample_fmt);
-
-/**
- * Fill an audio buffer with silence.
- *
- * @param audio_data  array of pointers to data planes
- * @param offset      offset in samples at which to start filling
- * @param nb_samples  number of samples to fill
- * @param nb_channels number of audio channels
- * @param sample_fmt  audio sample format
- */
-int av_samples_set_silence(uint8_t **audio_data, int offset, int nb_samples,
-                           int nb_channels, enum AVSampleFormat sample_fmt);
-
-#endif /* AVUTIL_SAMPLEFMT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/sha.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/sha.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/sha.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/sha.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_SHA_H
-#define AVUTIL_SHA_H
-
-#include <stdint.h>
-
-#include "attributes.h"
-#include "version.h"
-
-/**
- * @defgroup lavu_sha SHA
- * @ingroup lavu_crypto
- * @{
- */
-
-#if FF_API_CONTEXT_SIZE
-extern attribute_deprecated const int av_sha_size;
-#endif
-
-struct AVSHA;
-
-/**
- * Allocate an AVSHA context.
- */
-struct AVSHA *av_sha_alloc(void);
-
-/**
- * Initialize SHA-1 or SHA-2 hashing.
- *
- * @param context pointer to the function context (of size av_sha_size)
- * @param bits    number of bits in digest (SHA-1 - 160 bits, SHA-2 224 or 256 bits)
- * @return        zero if initialization succeeded, -1 otherwise
- */
-int av_sha_init(struct AVSHA* context, int bits);
-
-/**
- * Update hash value.
- *
- * @param context hash function context
- * @param data    input data to update hash with
- * @param len     input data length
- */
-void av_sha_update(struct AVSHA* context, const uint8_t* data, unsigned int len);
-
-/**
- * Finish hashing and output digest value.
- *
- * @param context hash function context
- * @param digest  buffer where output digest value is stored
- */
-void av_sha_final(struct AVSHA* context, uint8_t *digest);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_SHA_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/time.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/time.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/time.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/time.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_TIME_H
-#define AVUTIL_TIME_H
-
-#include <stdint.h>
-
-/**
- * Get the current time in microseconds.
- */
-int64_t av_gettime(void);
-
-/**
- * Sleep for a period of time.  Although the duration is expressed in
- * microseconds, the actual delay may be rounded to the precision of the
- * system timer.
- *
- * @param  usec Number of microseconds to sleep.
- * @return zero on success or (negative) error code.
- */
-int av_usleep(unsigned usec);
-
-#endif /* AVUTIL_TIME_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/version.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/version.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/version.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/version.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,87 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_VERSION_H
-#define AVUTIL_VERSION_H
-
-#include "avutil.h"
-
-/**
- * @file
- * @ingroup lavu
- * Libavutil version macros
- */
-
-/**
- * @defgroup lavu_ver Version and Build diagnostics
- *
- * Macros and function useful to check at compiletime and at runtime
- * which version of libavutil is in use.
- *
- * @{
- */
-
-#define LIBAVUTIL_VERSION_MAJOR 52
-#define LIBAVUTIL_VERSION_MINOR  3
-#define LIBAVUTIL_VERSION_MICRO  0
-
-#define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
-                                               LIBAVUTIL_VERSION_MINOR, \
-                                               LIBAVUTIL_VERSION_MICRO)
-#define LIBAVUTIL_VERSION       AV_VERSION(LIBAVUTIL_VERSION_MAJOR,     \
-                                           LIBAVUTIL_VERSION_MINOR,     \
-                                           LIBAVUTIL_VERSION_MICRO)
-#define LIBAVUTIL_BUILD         LIBAVUTIL_VERSION_INT
-
-#define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
-
-/**
- * @}
- *
- * @defgroup depr_guards Deprecation guards
- * FF_API_* defines may be placed below to indicate public API that will be
- * dropped at a future version bump. The defines themselves are not part of
- * the public API and may change, break or disappear at any time.
- *
- * @{
- */
-
-#ifndef FF_API_PIX_FMT
-#define FF_API_PIX_FMT                  (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_CONTEXT_SIZE
-#define FF_API_CONTEXT_SIZE             (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_PIX_FMT_DESC
-#define FF_API_PIX_FMT_DESC             (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_AV_REVERSE
-#define FF_API_AV_REVERSE               (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_AUDIOCONVERT
-#define FF_API_AUDIOCONVERT             (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_CPU_FLAG_MMX2
-#define FF_API_CPU_FLAG_MMX2            (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_VERSION_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/xtea.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/xtea.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/include/libavutil/xtea.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/include/libavutil/xtea.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-/*
- * A 32-bit implementation of the XTEA algorithm
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_XTEA_H
-#define AVUTIL_XTEA_H
-
-#include <stdint.h>
-
-/**
- * @defgroup lavu_xtea XTEA
- * @ingroup lavu_crypto
- * @{
- */
-
-typedef struct AVXTEA {
-    uint32_t key[16];
-} AVXTEA;
-
-/**
- * Initialize an AVXTEA context.
- *
- * @param ctx an AVXTEA context
- * @param key a key of 16 bytes used for encryption/decryption
- */
-void av_xtea_init(struct AVXTEA *ctx, const uint8_t key[16]);
-
-/**
- * Encrypt or decrypt a buffer using a previously initialized context.
- *
- * @param ctx an AVXTEA context
- * @param dst destination array, can be equal to src
- * @param src source array, can be equal to dst
- * @param count number of 8 byte blocks
- * @param iv initialization vector for CBC mode, if NULL then ECB will be used
- * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_xtea_crypt(struct AVXTEA *ctx, uint8_t *dst, const uint8_t *src,
-                   int count, uint8_t *iv, int decrypt);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_XTEA_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav54/moz.build	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav54/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +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 += [
-    '../FFmpegAudioDecoder.cpp',
-    '../FFmpegDataDecoder.cpp',
-    '../FFmpegDecoderModule.cpp',
-    '../FFmpegH264Decoder.cpp',
-]
-LOCAL_INCLUDES += [
-    '..',
-    'include',
-]
-
-FINAL_LIBRARY = 'xul'
-
-FAIL_ON_WARNINGS = True
-
-if CONFIG['CLANG_CXX']:
-  CXXFLAGS += [
-    '-Wno-unknown-attributes',
-  ]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/COPYING.LGPLv2.1 firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/COPYING.LGPLv2.1
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/COPYING.LGPLv2.1	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/COPYING.LGPLv2.1	1970-01-01 00:00:00.000000000 +0000
@@ -1,504 +0,0 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/avcodec.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/avcodec.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/avcodec.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/avcodec.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,4356 +0,0 @@
-/*
- * copyright (c) 2001 Fabrice Bellard
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_AVCODEC_H
-#define AVCODEC_AVCODEC_H
-
-/**
- * @file
- * @ingroup libavc
- * Libavcodec external API header
- */
-
-#include <errno.h>
-#include "libavutil/samplefmt.h"
-#include "libavutil/attributes.h"
-#include "libavutil/avutil.h"
-#include "libavutil/buffer.h"
-#include "libavutil/cpu.h"
-#include "libavutil/dict.h"
-#include "libavutil/frame.h"
-#include "libavutil/log.h"
-#include "libavutil/pixfmt.h"
-#include "libavutil/rational.h"
-
-#include "version.h"
-
-#if FF_API_FAST_MALLOC
-// to provide fast_*alloc
-#include "libavutil/mem.h"
-#endif
-
-/**
- * @defgroup libavc Encoding/Decoding Library
- * @{
- *
- * @defgroup lavc_decoding Decoding
- * @{
- * @}
- *
- * @defgroup lavc_encoding Encoding
- * @{
- * @}
- *
- * @defgroup lavc_codec Codecs
- * @{
- * @defgroup lavc_codec_native Native Codecs
- * @{
- * @}
- * @defgroup lavc_codec_wrappers External library wrappers
- * @{
- * @}
- * @defgroup lavc_codec_hwaccel Hardware Accelerators bridge
- * @{
- * @}
- * @}
- * @defgroup lavc_internal Internal
- * @{
- * @}
- * @}
- *
- */
-
-/**
- * @defgroup lavc_core Core functions/structures.
- * @ingroup libavc
- *
- * Basic definitions, functions for querying libavcodec capabilities,
- * allocating core structures, etc.
- * @{
- */
-
-
-/**
- * Identify the syntax and semantics of the bitstream.
- * The principle is roughly:
- * Two decoders with the same ID can decode the same streams.
- * Two encoders with the same ID can encode compatible streams.
- * There may be slight deviations from the principle due to implementation
- * details.
- *
- * If you add a codec ID to this list, add it so that
- * 1. no value of a existing codec ID changes (that would break ABI),
- * 2. it is as close as possible to similar codecs.
- *
- * After adding new codec IDs, do not forget to add an entry to the codec
- * descriptor list and bump libavcodec minor version.
- */
-enum AVCodecID {
-    AV_CODEC_ID_NONE,
-
-    /* video codecs */
-    AV_CODEC_ID_MPEG1VIDEO,
-    AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
-#if FF_API_XVMC
-    AV_CODEC_ID_MPEG2VIDEO_XVMC,
-#endif /* FF_API_XVMC */
-    AV_CODEC_ID_H261,
-    AV_CODEC_ID_H263,
-    AV_CODEC_ID_RV10,
-    AV_CODEC_ID_RV20,
-    AV_CODEC_ID_MJPEG,
-    AV_CODEC_ID_MJPEGB,
-    AV_CODEC_ID_LJPEG,
-    AV_CODEC_ID_SP5X,
-    AV_CODEC_ID_JPEGLS,
-    AV_CODEC_ID_MPEG4,
-    AV_CODEC_ID_RAWVIDEO,
-    AV_CODEC_ID_MSMPEG4V1,
-    AV_CODEC_ID_MSMPEG4V2,
-    AV_CODEC_ID_MSMPEG4V3,
-    AV_CODEC_ID_WMV1,
-    AV_CODEC_ID_WMV2,
-    AV_CODEC_ID_H263P,
-    AV_CODEC_ID_H263I,
-    AV_CODEC_ID_FLV1,
-    AV_CODEC_ID_SVQ1,
-    AV_CODEC_ID_SVQ3,
-    AV_CODEC_ID_DVVIDEO,
-    AV_CODEC_ID_HUFFYUV,
-    AV_CODEC_ID_CYUV,
-    AV_CODEC_ID_H264,
-    AV_CODEC_ID_INDEO3,
-    AV_CODEC_ID_VP3,
-    AV_CODEC_ID_THEORA,
-    AV_CODEC_ID_ASV1,
-    AV_CODEC_ID_ASV2,
-    AV_CODEC_ID_FFV1,
-    AV_CODEC_ID_4XM,
-    AV_CODEC_ID_VCR1,
-    AV_CODEC_ID_CLJR,
-    AV_CODEC_ID_MDEC,
-    AV_CODEC_ID_ROQ,
-    AV_CODEC_ID_INTERPLAY_VIDEO,
-    AV_CODEC_ID_XAN_WC3,
-    AV_CODEC_ID_XAN_WC4,
-    AV_CODEC_ID_RPZA,
-    AV_CODEC_ID_CINEPAK,
-    AV_CODEC_ID_WS_VQA,
-    AV_CODEC_ID_MSRLE,
-    AV_CODEC_ID_MSVIDEO1,
-    AV_CODEC_ID_IDCIN,
-    AV_CODEC_ID_8BPS,
-    AV_CODEC_ID_SMC,
-    AV_CODEC_ID_FLIC,
-    AV_CODEC_ID_TRUEMOTION1,
-    AV_CODEC_ID_VMDVIDEO,
-    AV_CODEC_ID_MSZH,
-    AV_CODEC_ID_ZLIB,
-    AV_CODEC_ID_QTRLE,
-    AV_CODEC_ID_TSCC,
-    AV_CODEC_ID_ULTI,
-    AV_CODEC_ID_QDRAW,
-    AV_CODEC_ID_VIXL,
-    AV_CODEC_ID_QPEG,
-    AV_CODEC_ID_PNG,
-    AV_CODEC_ID_PPM,
-    AV_CODEC_ID_PBM,
-    AV_CODEC_ID_PGM,
-    AV_CODEC_ID_PGMYUV,
-    AV_CODEC_ID_PAM,
-    AV_CODEC_ID_FFVHUFF,
-    AV_CODEC_ID_RV30,
-    AV_CODEC_ID_RV40,
-    AV_CODEC_ID_VC1,
-    AV_CODEC_ID_WMV3,
-    AV_CODEC_ID_LOCO,
-    AV_CODEC_ID_WNV1,
-    AV_CODEC_ID_AASC,
-    AV_CODEC_ID_INDEO2,
-    AV_CODEC_ID_FRAPS,
-    AV_CODEC_ID_TRUEMOTION2,
-    AV_CODEC_ID_BMP,
-    AV_CODEC_ID_CSCD,
-    AV_CODEC_ID_MMVIDEO,
-    AV_CODEC_ID_ZMBV,
-    AV_CODEC_ID_AVS,
-    AV_CODEC_ID_SMACKVIDEO,
-    AV_CODEC_ID_NUV,
-    AV_CODEC_ID_KMVC,
-    AV_CODEC_ID_FLASHSV,
-    AV_CODEC_ID_CAVS,
-    AV_CODEC_ID_JPEG2000,
-    AV_CODEC_ID_VMNC,
-    AV_CODEC_ID_VP5,
-    AV_CODEC_ID_VP6,
-    AV_CODEC_ID_VP6F,
-    AV_CODEC_ID_TARGA,
-    AV_CODEC_ID_DSICINVIDEO,
-    AV_CODEC_ID_TIERTEXSEQVIDEO,
-    AV_CODEC_ID_TIFF,
-    AV_CODEC_ID_GIF,
-    AV_CODEC_ID_DXA,
-    AV_CODEC_ID_DNXHD,
-    AV_CODEC_ID_THP,
-    AV_CODEC_ID_SGI,
-    AV_CODEC_ID_C93,
-    AV_CODEC_ID_BETHSOFTVID,
-    AV_CODEC_ID_PTX,
-    AV_CODEC_ID_TXD,
-    AV_CODEC_ID_VP6A,
-    AV_CODEC_ID_AMV,
-    AV_CODEC_ID_VB,
-    AV_CODEC_ID_PCX,
-    AV_CODEC_ID_SUNRAST,
-    AV_CODEC_ID_INDEO4,
-    AV_CODEC_ID_INDEO5,
-    AV_CODEC_ID_MIMIC,
-    AV_CODEC_ID_RL2,
-    AV_CODEC_ID_ESCAPE124,
-    AV_CODEC_ID_DIRAC,
-    AV_CODEC_ID_BFI,
-    AV_CODEC_ID_CMV,
-    AV_CODEC_ID_MOTIONPIXELS,
-    AV_CODEC_ID_TGV,
-    AV_CODEC_ID_TGQ,
-    AV_CODEC_ID_TQI,
-    AV_CODEC_ID_AURA,
-    AV_CODEC_ID_AURA2,
-    AV_CODEC_ID_V210X,
-    AV_CODEC_ID_TMV,
-    AV_CODEC_ID_V210,
-    AV_CODEC_ID_DPX,
-    AV_CODEC_ID_MAD,
-    AV_CODEC_ID_FRWU,
-    AV_CODEC_ID_FLASHSV2,
-    AV_CODEC_ID_CDGRAPHICS,
-    AV_CODEC_ID_R210,
-    AV_CODEC_ID_ANM,
-    AV_CODEC_ID_BINKVIDEO,
-    AV_CODEC_ID_IFF_ILBM,
-    AV_CODEC_ID_IFF_BYTERUN1,
-    AV_CODEC_ID_KGV1,
-    AV_CODEC_ID_YOP,
-    AV_CODEC_ID_VP8,
-    AV_CODEC_ID_PICTOR,
-    AV_CODEC_ID_ANSI,
-    AV_CODEC_ID_A64_MULTI,
-    AV_CODEC_ID_A64_MULTI5,
-    AV_CODEC_ID_R10K,
-    AV_CODEC_ID_MXPEG,
-    AV_CODEC_ID_LAGARITH,
-    AV_CODEC_ID_PRORES,
-    AV_CODEC_ID_JV,
-    AV_CODEC_ID_DFA,
-    AV_CODEC_ID_WMV3IMAGE,
-    AV_CODEC_ID_VC1IMAGE,
-    AV_CODEC_ID_UTVIDEO,
-    AV_CODEC_ID_BMV_VIDEO,
-    AV_CODEC_ID_VBLE,
-    AV_CODEC_ID_DXTORY,
-    AV_CODEC_ID_V410,
-    AV_CODEC_ID_XWD,
-    AV_CODEC_ID_CDXL,
-    AV_CODEC_ID_XBM,
-    AV_CODEC_ID_ZEROCODEC,
-    AV_CODEC_ID_MSS1,
-    AV_CODEC_ID_MSA1,
-    AV_CODEC_ID_TSCC2,
-    AV_CODEC_ID_MTS2,
-    AV_CODEC_ID_CLLC,
-    AV_CODEC_ID_MSS2,
-    AV_CODEC_ID_VP9,
-    AV_CODEC_ID_AIC,
-    AV_CODEC_ID_ESCAPE130,
-    AV_CODEC_ID_G2M,
-    AV_CODEC_ID_WEBP,
-    AV_CODEC_ID_HNM4_VIDEO,
-    AV_CODEC_ID_HEVC,
-    AV_CODEC_ID_FIC,
-
-    /* various PCM "codecs" */
-    AV_CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs
-    AV_CODEC_ID_PCM_S16LE = 0x10000,
-    AV_CODEC_ID_PCM_S16BE,
-    AV_CODEC_ID_PCM_U16LE,
-    AV_CODEC_ID_PCM_U16BE,
-    AV_CODEC_ID_PCM_S8,
-    AV_CODEC_ID_PCM_U8,
-    AV_CODEC_ID_PCM_MULAW,
-    AV_CODEC_ID_PCM_ALAW,
-    AV_CODEC_ID_PCM_S32LE,
-    AV_CODEC_ID_PCM_S32BE,
-    AV_CODEC_ID_PCM_U32LE,
-    AV_CODEC_ID_PCM_U32BE,
-    AV_CODEC_ID_PCM_S24LE,
-    AV_CODEC_ID_PCM_S24BE,
-    AV_CODEC_ID_PCM_U24LE,
-    AV_CODEC_ID_PCM_U24BE,
-    AV_CODEC_ID_PCM_S24DAUD,
-    AV_CODEC_ID_PCM_ZORK,
-    AV_CODEC_ID_PCM_S16LE_PLANAR,
-    AV_CODEC_ID_PCM_DVD,
-    AV_CODEC_ID_PCM_F32BE,
-    AV_CODEC_ID_PCM_F32LE,
-    AV_CODEC_ID_PCM_F64BE,
-    AV_CODEC_ID_PCM_F64LE,
-    AV_CODEC_ID_PCM_BLURAY,
-    AV_CODEC_ID_PCM_LXF,
-    AV_CODEC_ID_S302M,
-    AV_CODEC_ID_PCM_S8_PLANAR,
-    AV_CODEC_ID_PCM_S24LE_PLANAR,
-    AV_CODEC_ID_PCM_S32LE_PLANAR,
-
-    /* various ADPCM codecs */
-    AV_CODEC_ID_ADPCM_IMA_QT = 0x11000,
-    AV_CODEC_ID_ADPCM_IMA_WAV,
-    AV_CODEC_ID_ADPCM_IMA_DK3,
-    AV_CODEC_ID_ADPCM_IMA_DK4,
-    AV_CODEC_ID_ADPCM_IMA_WS,
-    AV_CODEC_ID_ADPCM_IMA_SMJPEG,
-    AV_CODEC_ID_ADPCM_MS,
-    AV_CODEC_ID_ADPCM_4XM,
-    AV_CODEC_ID_ADPCM_XA,
-    AV_CODEC_ID_ADPCM_ADX,
-    AV_CODEC_ID_ADPCM_EA,
-    AV_CODEC_ID_ADPCM_G726,
-    AV_CODEC_ID_ADPCM_CT,
-    AV_CODEC_ID_ADPCM_SWF,
-    AV_CODEC_ID_ADPCM_YAMAHA,
-    AV_CODEC_ID_ADPCM_SBPRO_4,
-    AV_CODEC_ID_ADPCM_SBPRO_3,
-    AV_CODEC_ID_ADPCM_SBPRO_2,
-    AV_CODEC_ID_ADPCM_THP,
-    AV_CODEC_ID_ADPCM_IMA_AMV,
-    AV_CODEC_ID_ADPCM_EA_R1,
-    AV_CODEC_ID_ADPCM_EA_R3,
-    AV_CODEC_ID_ADPCM_EA_R2,
-    AV_CODEC_ID_ADPCM_IMA_EA_SEAD,
-    AV_CODEC_ID_ADPCM_IMA_EA_EACS,
-    AV_CODEC_ID_ADPCM_EA_XAS,
-    AV_CODEC_ID_ADPCM_EA_MAXIS_XA,
-    AV_CODEC_ID_ADPCM_IMA_ISS,
-    AV_CODEC_ID_ADPCM_G722,
-    AV_CODEC_ID_ADPCM_IMA_APC,
-
-    /* AMR */
-    AV_CODEC_ID_AMR_NB = 0x12000,
-    AV_CODEC_ID_AMR_WB,
-
-    /* RealAudio codecs*/
-    AV_CODEC_ID_RA_144 = 0x13000,
-    AV_CODEC_ID_RA_288,
-
-    /* various DPCM codecs */
-    AV_CODEC_ID_ROQ_DPCM = 0x14000,
-    AV_CODEC_ID_INTERPLAY_DPCM,
-    AV_CODEC_ID_XAN_DPCM,
-    AV_CODEC_ID_SOL_DPCM,
-
-    /* audio codecs */
-    AV_CODEC_ID_MP2 = 0x15000,
-    AV_CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
-    AV_CODEC_ID_AAC,
-    AV_CODEC_ID_AC3,
-    AV_CODEC_ID_DTS,
-    AV_CODEC_ID_VORBIS,
-    AV_CODEC_ID_DVAUDIO,
-    AV_CODEC_ID_WMAV1,
-    AV_CODEC_ID_WMAV2,
-    AV_CODEC_ID_MACE3,
-    AV_CODEC_ID_MACE6,
-    AV_CODEC_ID_VMDAUDIO,
-    AV_CODEC_ID_FLAC,
-    AV_CODEC_ID_MP3ADU,
-    AV_CODEC_ID_MP3ON4,
-    AV_CODEC_ID_SHORTEN,
-    AV_CODEC_ID_ALAC,
-    AV_CODEC_ID_WESTWOOD_SND1,
-    AV_CODEC_ID_GSM, ///< as in Berlin toast format
-    AV_CODEC_ID_QDM2,
-    AV_CODEC_ID_COOK,
-    AV_CODEC_ID_TRUESPEECH,
-    AV_CODEC_ID_TTA,
-    AV_CODEC_ID_SMACKAUDIO,
-    AV_CODEC_ID_QCELP,
-    AV_CODEC_ID_WAVPACK,
-    AV_CODEC_ID_DSICINAUDIO,
-    AV_CODEC_ID_IMC,
-    AV_CODEC_ID_MUSEPACK7,
-    AV_CODEC_ID_MLP,
-    AV_CODEC_ID_GSM_MS, /* as found in WAV */
-    AV_CODEC_ID_ATRAC3,
-#if FF_API_VOXWARE
-    AV_CODEC_ID_VOXWARE,
-#endif
-    AV_CODEC_ID_APE,
-    AV_CODEC_ID_NELLYMOSER,
-    AV_CODEC_ID_MUSEPACK8,
-    AV_CODEC_ID_SPEEX,
-    AV_CODEC_ID_WMAVOICE,
-    AV_CODEC_ID_WMAPRO,
-    AV_CODEC_ID_WMALOSSLESS,
-    AV_CODEC_ID_ATRAC3P,
-    AV_CODEC_ID_EAC3,
-    AV_CODEC_ID_SIPR,
-    AV_CODEC_ID_MP1,
-    AV_CODEC_ID_TWINVQ,
-    AV_CODEC_ID_TRUEHD,
-    AV_CODEC_ID_MP4ALS,
-    AV_CODEC_ID_ATRAC1,
-    AV_CODEC_ID_BINKAUDIO_RDFT,
-    AV_CODEC_ID_BINKAUDIO_DCT,
-    AV_CODEC_ID_AAC_LATM,
-    AV_CODEC_ID_QDMC,
-    AV_CODEC_ID_CELT,
-    AV_CODEC_ID_G723_1,
-    AV_CODEC_ID_G729,
-    AV_CODEC_ID_8SVX_EXP,
-    AV_CODEC_ID_8SVX_FIB,
-    AV_CODEC_ID_BMV_AUDIO,
-    AV_CODEC_ID_RALF,
-    AV_CODEC_ID_IAC,
-    AV_CODEC_ID_ILBC,
-    AV_CODEC_ID_OPUS,
-    AV_CODEC_ID_COMFORT_NOISE,
-    AV_CODEC_ID_TAK,
-    AV_CODEC_ID_METASOUND,
-
-    /* subtitle codecs */
-    AV_CODEC_ID_FIRST_SUBTITLE = 0x17000,          ///< A dummy ID pointing at the start of subtitle codecs.
-    AV_CODEC_ID_DVD_SUBTITLE = 0x17000,
-    AV_CODEC_ID_DVB_SUBTITLE,
-    AV_CODEC_ID_TEXT,  ///< raw UTF-8 text
-    AV_CODEC_ID_XSUB,
-    AV_CODEC_ID_SSA,
-    AV_CODEC_ID_MOV_TEXT,
-    AV_CODEC_ID_HDMV_PGS_SUBTITLE,
-    AV_CODEC_ID_DVB_TELETEXT,
-    AV_CODEC_ID_SRT,
-
-    /* other specific kind of codecs (generally used for attachments) */
-    AV_CODEC_ID_FIRST_UNKNOWN = 0x18000,           ///< A dummy ID pointing at the start of various fake codecs.
-    AV_CODEC_ID_TTF = 0x18000,
-
-    AV_CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf should attempt to identify it
-
-    AV_CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
-                                * stream (only used by libavformat) */
-    AV_CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
-                                * stream (only used by libavformat) */
-    AV_CODEC_ID_FFMETADATA = 0x21000,   ///< Dummy codec for streams containing only metadata information.
-};
-
-/**
- * This struct describes the properties of a single codec described by an
- * AVCodecID.
- * @see avcodec_get_descriptor()
- */
-typedef struct AVCodecDescriptor {
-    enum AVCodecID     id;
-    enum AVMediaType type;
-    /**
-     * Name of the codec described by this descriptor. It is non-empty and
-     * unique for each codec descriptor. It should contain alphanumeric
-     * characters and '_' only.
-     */
-    const char      *name;
-    /**
-     * A more descriptive name for this codec. May be NULL.
-     */
-    const char *long_name;
-    /**
-     * Codec properties, a combination of AV_CODEC_PROP_* flags.
-     */
-    int             props;
-} AVCodecDescriptor;
-
-/**
- * Codec uses only intra compression.
- * Video codecs only.
- */
-#define AV_CODEC_PROP_INTRA_ONLY    (1 << 0)
-/**
- * Codec supports lossy compression. Audio and video codecs only.
- * @note a codec may support both lossy and lossless
- * compression modes
- */
-#define AV_CODEC_PROP_LOSSY         (1 << 1)
-/**
- * Codec supports lossless compression. Audio and video codecs only.
- */
-#define AV_CODEC_PROP_LOSSLESS      (1 << 2)
-
-/**
- * @ingroup lavc_decoding
- * Required number of additionally allocated bytes at the end of the input bitstream for decoding.
- * This is mainly needed because some optimized bitstream readers read
- * 32 or 64 bit at once and could read over the end.<br>
- * Note: If the first 23 bits of the additional bytes are not 0, then damaged
- * MPEG bitstreams could cause overread and segfault.
- */
-#define FF_INPUT_BUFFER_PADDING_SIZE 8
-
-/**
- * @ingroup lavc_encoding
- * minimum encoding buffer size
- * Used to avoid some checks during header writing.
- */
-#define FF_MIN_BUFFER_SIZE 16384
-
-
-/**
- * @ingroup lavc_encoding
- * motion estimation type.
- */
-enum Motion_Est_ID {
-    ME_ZERO = 1,    ///< no search, that is use 0,0 vector whenever one is needed
-    ME_FULL,
-    ME_LOG,
-    ME_PHODS,
-    ME_EPZS,        ///< enhanced predictive zonal search
-    ME_X1,          ///< reserved for experiments
-    ME_HEX,         ///< hexagon based search
-    ME_UMH,         ///< uneven multi-hexagon search
-    ME_TESA,        ///< transformed exhaustive search algorithm
-};
-
-/**
- * @ingroup lavc_decoding
- */
-enum AVDiscard{
-    /* We leave some space between them for extensions (drop some
-     * keyframes for intra-only or drop just some bidir frames). */
-    AVDISCARD_NONE    =-16, ///< discard nothing
-    AVDISCARD_DEFAULT =  0, ///< discard useless packets like 0 size packets in avi
-    AVDISCARD_NONREF  =  8, ///< discard all non reference
-    AVDISCARD_BIDIR   = 16, ///< discard all bidirectional frames
-    AVDISCARD_NONKEY  = 32, ///< discard all frames except keyframes
-    AVDISCARD_ALL     = 48, ///< discard all
-};
-
-enum AVColorPrimaries{
-    AVCOL_PRI_BT709       = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B
-    AVCOL_PRI_UNSPECIFIED = 2,
-    AVCOL_PRI_BT470M      = 4,
-    AVCOL_PRI_BT470BG     = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM
-    AVCOL_PRI_SMPTE170M   = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
-    AVCOL_PRI_SMPTE240M   = 7, ///< functionally identical to above
-    AVCOL_PRI_FILM        = 8,
-    AVCOL_PRI_BT2020      = 9, ///< ITU-R BT2020
-    AVCOL_PRI_NB             , ///< Not part of ABI
-};
-
-enum AVColorTransferCharacteristic{
-    AVCOL_TRC_BT709        =  1, ///< also ITU-R BT1361
-    AVCOL_TRC_UNSPECIFIED  =  2,
-    AVCOL_TRC_GAMMA22      =  4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
-    AVCOL_TRC_GAMMA28      =  5, ///< also ITU-R BT470BG
-    AVCOL_TRC_SMPTE170M    =  6, ///< also ITU-R BT601-6 525 or 625 / ITU-R BT1358 525 or 625 / ITU-R BT1700 NTSC
-    AVCOL_TRC_SMPTE240M    =  7,
-    AVCOL_TRC_LINEAR       =  8, ///< "Linear transfer characteristics"
-    AVCOL_TRC_LOG          =  9, ///< "Logarithmic transfer characteristic (100:1 range)"
-    AVCOL_TRC_LOG_SQRT     = 10, ///< "Logarithmic transfer characteristic (100 * Sqrt( 10 ) : 1 range)"
-    AVCOL_TRC_IEC61966_2_4 = 11, ///< IEC 61966-2-4
-    AVCOL_TRC_BT1361_ECG   = 12, ///< ITU-R BT1361 Extended Colour Gamut
-    AVCOL_TRC_IEC61966_2_1 = 13, ///< IEC 61966-2-1 (sRGB or sYCC)
-    AVCOL_TRC_BT2020_10    = 14, ///< ITU-R BT2020 for 10 bit system
-    AVCOL_TRC_BT2020_12    = 15, ///< ITU-R BT2020 for 12 bit system
-    AVCOL_TRC_NB               , ///< Not part of ABI
-};
-
-enum AVColorSpace{
-    AVCOL_SPC_RGB         =  0,
-    AVCOL_SPC_BT709       =  1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
-    AVCOL_SPC_UNSPECIFIED =  2,
-    AVCOL_SPC_FCC         =  4,
-    AVCOL_SPC_BT470BG     =  5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
-    AVCOL_SPC_SMPTE170M   =  6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
-    AVCOL_SPC_SMPTE240M   =  7,
-    AVCOL_SPC_YCOCG       =  8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
-    AVCOL_SPC_BT2020_NCL  =  9, ///< ITU-R BT2020 non-constant luminance system
-    AVCOL_SPC_BT2020_CL   = 10, ///< ITU-R BT2020 constant luminance system
-    AVCOL_SPC_NB              , ///< Not part of ABI
-};
-
-enum AVColorRange{
-    AVCOL_RANGE_UNSPECIFIED = 0,
-    AVCOL_RANGE_MPEG        = 1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges
-    AVCOL_RANGE_JPEG        = 2, ///< the normal     2^n-1   "JPEG" YUV ranges
-    AVCOL_RANGE_NB             , ///< Not part of ABI
-};
-
-/**
- *  X   X      3 4 X      X are luma samples,
- *             1 2        1-6 are possible chroma positions
- *  X   X      5 6 X      0 is undefined/unknown position
- */
-enum AVChromaLocation{
-    AVCHROMA_LOC_UNSPECIFIED = 0,
-    AVCHROMA_LOC_LEFT        = 1, ///< mpeg2/4, h264 default
-    AVCHROMA_LOC_CENTER      = 2, ///< mpeg1, jpeg, h263
-    AVCHROMA_LOC_TOPLEFT     = 3, ///< DV
-    AVCHROMA_LOC_TOP         = 4,
-    AVCHROMA_LOC_BOTTOMLEFT  = 5,
-    AVCHROMA_LOC_BOTTOM      = 6,
-    AVCHROMA_LOC_NB             , ///< Not part of ABI
-};
-
-enum AVAudioServiceType {
-    AV_AUDIO_SERVICE_TYPE_MAIN              = 0,
-    AV_AUDIO_SERVICE_TYPE_EFFECTS           = 1,
-    AV_AUDIO_SERVICE_TYPE_VISUALLY_IMPAIRED = 2,
-    AV_AUDIO_SERVICE_TYPE_HEARING_IMPAIRED  = 3,
-    AV_AUDIO_SERVICE_TYPE_DIALOGUE          = 4,
-    AV_AUDIO_SERVICE_TYPE_COMMENTARY        = 5,
-    AV_AUDIO_SERVICE_TYPE_EMERGENCY         = 6,
-    AV_AUDIO_SERVICE_TYPE_VOICE_OVER        = 7,
-    AV_AUDIO_SERVICE_TYPE_KARAOKE           = 8,
-    AV_AUDIO_SERVICE_TYPE_NB                   , ///< Not part of ABI
-};
-
-/**
- * @ingroup lavc_encoding
- */
-typedef struct RcOverride{
-    int start_frame;
-    int end_frame;
-    int qscale; // If this is 0 then quality_factor will be used instead.
-    float quality_factor;
-} RcOverride;
-
-#if FF_API_MAX_BFRAMES
-/**
- * @deprecated there is no libavcodec-wide limit on the number of B-frames
- */
-#define FF_MAX_B_FRAMES 16
-#endif
-
-/* encoding support
-   These flags can be passed in AVCodecContext.flags before initialization.
-   Note: Not everything is supported yet.
-*/
-
-/**
- * Allow decoders to produce frames with data planes that are not aligned
- * to CPU requirements (e.g. due to cropping).
- */
-#define CODEC_FLAG_UNALIGNED 0x0001
-#define CODEC_FLAG_QSCALE 0x0002  ///< Use fixed qscale.
-#define CODEC_FLAG_4MV    0x0004  ///< 4 MV per MB allowed / advanced prediction for H.263.
-#define CODEC_FLAG_OUTPUT_CORRUPT 0x0008 ///< Output even those frames that might be corrupted
-#define CODEC_FLAG_QPEL   0x0010  ///< Use qpel MC.
-#define CODEC_FLAG_GMC    0x0020  ///< Use GMC.
-#define CODEC_FLAG_MV0    0x0040  ///< Always try a MB with MV=<0,0>.
-/**
- * The parent program guarantees that the input for B-frames containing
- * streams is not written to for at least s->max_b_frames+1 frames, if
- * this is not set the input will be copied.
- */
-#define CODEC_FLAG_INPUT_PRESERVED 0x0100
-#define CODEC_FLAG_PASS1           0x0200   ///< Use internal 2pass ratecontrol in first pass mode.
-#define CODEC_FLAG_PASS2           0x0400   ///< Use internal 2pass ratecontrol in second pass mode.
-#define CODEC_FLAG_GRAY            0x2000   ///< Only decode/encode grayscale.
-#if FF_API_EMU_EDGE
-/**
- * @deprecated edges are not used/required anymore. I.e. this flag is now always
- * set.
- */
-#define CODEC_FLAG_EMU_EDGE        0x4000
-#endif
-#define CODEC_FLAG_PSNR            0x8000   ///< error[?] variables will be set during encoding.
-#define CODEC_FLAG_TRUNCATED       0x00010000 /** Input bitstream might be truncated at a random
-                                                  location instead of only at frame boundaries. */
-#define CODEC_FLAG_NORMALIZE_AQP  0x00020000 ///< Normalize adaptive quantization.
-#define CODEC_FLAG_INTERLACED_DCT 0x00040000 ///< Use interlaced DCT.
-#define CODEC_FLAG_LOW_DELAY      0x00080000 ///< Force low delay.
-#define CODEC_FLAG_GLOBAL_HEADER  0x00400000 ///< Place global headers in extradata instead of every keyframe.
-#define CODEC_FLAG_BITEXACT       0x00800000 ///< Use only bitexact stuff (except (I)DCT).
-/* Fx : Flag for h263+ extra options */
-#define CODEC_FLAG_AC_PRED        0x01000000 ///< H.263 advanced intra coding / MPEG-4 AC prediction
-#define CODEC_FLAG_LOOP_FILTER    0x00000800 ///< loop filter
-#define CODEC_FLAG_INTERLACED_ME  0x20000000 ///< interlaced motion estimation
-#define CODEC_FLAG_CLOSED_GOP     0x80000000
-#define CODEC_FLAG2_FAST          0x00000001 ///< Allow non spec compliant speedup tricks.
-#define CODEC_FLAG2_NO_OUTPUT     0x00000004 ///< Skip bitstream encoding.
-#define CODEC_FLAG2_LOCAL_HEADER  0x00000008 ///< Place global headers at every keyframe instead of in extradata.
-#define CODEC_FLAG2_IGNORE_CROP   0x00010000 ///< Discard cropping information from SPS.
-
-#define CODEC_FLAG2_CHUNKS        0x00008000 ///< Input bitstream might be truncated at a packet boundaries instead of only at frame boundaries.
-
-/* Unsupported options :
- *              Syntax Arithmetic coding (SAC)
- *              Reference Picture Selection
- *              Independent Segment Decoding */
-/* /Fx */
-/* codec capabilities */
-
-#define CODEC_CAP_DRAW_HORIZ_BAND 0x0001 ///< Decoder can use draw_horiz_band callback.
-/**
- * Codec uses get_buffer() for allocating buffers and supports custom allocators.
- * If not set, it might not use get_buffer() at all or use operations that
- * assume the buffer was allocated by avcodec_default_get_buffer.
- */
-#define CODEC_CAP_DR1             0x0002
-#define CODEC_CAP_TRUNCATED       0x0008
-#if FF_API_XVMC
-/* Codec can export data for HW decoding (XvMC). */
-#define CODEC_CAP_HWACCEL         0x0010
-#endif /* FF_API_XVMC */
-/**
- * Encoder or decoder requires flushing with NULL input at the end in order to
- * give the complete and correct output.
- *
- * NOTE: If this flag is not set, the codec is guaranteed to never be fed with
- *       with NULL data. The user can still send NULL data to the public encode
- *       or decode function, but libavcodec will not pass it along to the codec
- *       unless this flag is set.
- *
- * Decoders:
- * The decoder has a non-zero delay and needs to be fed with avpkt->data=NULL,
- * avpkt->size=0 at the end to get the delayed data until the decoder no longer
- * returns frames.
- *
- * Encoders:
- * The encoder needs to be fed with NULL data at the end of encoding until the
- * encoder no longer returns data.
- *
- * NOTE: For encoders implementing the AVCodec.encode2() function, setting this
- *       flag also means that the encoder must set the pts and duration for
- *       each output packet. If this flag is not set, the pts and duration will
- *       be determined by libavcodec from the input frame.
- */
-#define CODEC_CAP_DELAY           0x0020
-/**
- * Codec can be fed a final frame with a smaller size.
- * This can be used to prevent truncation of the last audio samples.
- */
-#define CODEC_CAP_SMALL_LAST_FRAME 0x0040
-#if FF_API_CAP_VDPAU
-/**
- * Codec can export data for HW decoding (VDPAU).
- */
-#define CODEC_CAP_HWACCEL_VDPAU    0x0080
-#endif
-/**
- * Codec can output multiple frames per AVPacket
- * Normally demuxers return one frame at a time, demuxers which do not do
- * are connected to a parser to split what they return into proper frames.
- * This flag is reserved to the very rare category of codecs which have a
- * bitstream that cannot be split into frames without timeconsuming
- * operations like full decoding. Demuxers carring such bitstreams thus
- * may return multiple frames in a packet. This has many disadvantages like
- * prohibiting stream copy in many cases thus it should only be considered
- * as a last resort.
- */
-#define CODEC_CAP_SUBFRAMES        0x0100
-/**
- * Codec is experimental and is thus avoided in favor of non experimental
- * encoders
- */
-#define CODEC_CAP_EXPERIMENTAL     0x0200
-/**
- * Codec should fill in channel configuration and samplerate instead of container
- */
-#define CODEC_CAP_CHANNEL_CONF     0x0400
-#if FF_API_NEG_LINESIZES
-/**
- * @deprecated no codecs use this capability
- */
-#define CODEC_CAP_NEG_LINESIZES    0x0800
-#endif
-/**
- * Codec supports frame-level multithreading.
- */
-#define CODEC_CAP_FRAME_THREADS    0x1000
-/**
- * Codec supports slice-based (or partition-based) multithreading.
- */
-#define CODEC_CAP_SLICE_THREADS    0x2000
-/**
- * Codec supports changed parameters at any point.
- */
-#define CODEC_CAP_PARAM_CHANGE     0x4000
-/**
- * Codec supports avctx->thread_count == 0 (auto).
- */
-#define CODEC_CAP_AUTO_THREADS     0x8000
-/**
- * Audio encoder supports receiving a different number of samples in each call.
- */
-#define CODEC_CAP_VARIABLE_FRAME_SIZE 0x10000
-
-#if FF_API_MB_TYPE
-//The following defines may change, don't expect compatibility if you use them.
-#define MB_TYPE_INTRA4x4   0x0001
-#define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific
-#define MB_TYPE_INTRA_PCM  0x0004 //FIXME H.264-specific
-#define MB_TYPE_16x16      0x0008
-#define MB_TYPE_16x8       0x0010
-#define MB_TYPE_8x16       0x0020
-#define MB_TYPE_8x8        0x0040
-#define MB_TYPE_INTERLACED 0x0080
-#define MB_TYPE_DIRECT2    0x0100 //FIXME
-#define MB_TYPE_ACPRED     0x0200
-#define MB_TYPE_GMC        0x0400
-#define MB_TYPE_SKIP       0x0800
-#define MB_TYPE_P0L0       0x1000
-#define MB_TYPE_P1L0       0x2000
-#define MB_TYPE_P0L1       0x4000
-#define MB_TYPE_P1L1       0x8000
-#define MB_TYPE_L0         (MB_TYPE_P0L0 | MB_TYPE_P1L0)
-#define MB_TYPE_L1         (MB_TYPE_P0L1 | MB_TYPE_P1L1)
-#define MB_TYPE_L0L1       (MB_TYPE_L0   | MB_TYPE_L1)
-#define MB_TYPE_QUANT      0x00010000
-#define MB_TYPE_CBP        0x00020000
-//Note bits 24-31 are reserved for codec specific use (h264 ref0, mpeg1 0mv, ...)
-#endif
-
-/**
- * Pan Scan area.
- * This specifies the area which should be displayed.
- * Note there may be multiple such areas for one frame.
- */
-typedef struct AVPanScan{
-    /**
-     * id
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int id;
-
-    /**
-     * width and height in 1/16 pel
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int width;
-    int height;
-
-    /**
-     * position of the top left corner in 1/16 pel for up to 3 fields/frames
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int16_t position[3][2];
-}AVPanScan;
-
-#if FF_API_QSCALE_TYPE
-#define FF_QSCALE_TYPE_MPEG1 0
-#define FF_QSCALE_TYPE_MPEG2 1
-#define FF_QSCALE_TYPE_H264  2
-#define FF_QSCALE_TYPE_VP56  3
-#endif
-
-#if FF_API_GET_BUFFER
-#define FF_BUFFER_TYPE_INTERNAL 1
-#define FF_BUFFER_TYPE_USER     2 ///< direct rendering buffers (image is (de)allocated by user)
-#define FF_BUFFER_TYPE_SHARED   4 ///< Buffer from somewhere else; don't deallocate image (data/base), all other tables are not shared.
-#define FF_BUFFER_TYPE_COPY     8 ///< Just a (modified) copy of some other buffer, don't deallocate anything.
-
-#define FF_BUFFER_HINTS_VALID    0x01 // Buffer hints value is meaningful (if 0 ignore).
-#define FF_BUFFER_HINTS_READABLE 0x02 // Codec will read from buffer.
-#define FF_BUFFER_HINTS_PRESERVE 0x04 // User must not alter buffer content.
-#define FF_BUFFER_HINTS_REUSABLE 0x08 // Codec will reuse the buffer (update).
-#endif
-
-/**
- * The decoder will keep a reference to the frame and may reuse it later.
- */
-#define AV_GET_BUFFER_FLAG_REF (1 << 0)
-
-/**
- * @defgroup lavc_packet AVPacket
- *
- * Types and functions for working with AVPacket.
- * @{
- */
-enum AVPacketSideDataType {
-    AV_PKT_DATA_PALETTE,
-    AV_PKT_DATA_NEW_EXTRADATA,
-
-    /**
-     * An AV_PKT_DATA_PARAM_CHANGE side data packet is laid out as follows:
-     * @code
-     * u32le param_flags
-     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT)
-     *     s32le channel_count
-     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT)
-     *     u64le channel_layout
-     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE)
-     *     s32le sample_rate
-     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS)
-     *     s32le width
-     *     s32le height
-     * @endcode
-     */
-    AV_PKT_DATA_PARAM_CHANGE,
-
-    /**
-     * An AV_PKT_DATA_H263_MB_INFO side data packet contains a number of
-     * structures with info about macroblocks relevant to splitting the
-     * packet into smaller packets on macroblock edges (e.g. as for RFC 2190).
-     * That is, it does not necessarily contain info about all macroblocks,
-     * as long as the distance between macroblocks in the info is smaller
-     * than the target payload size.
-     * Each MB info structure is 12 bytes, and is laid out as follows:
-     * @code
-     * u32le bit offset from the start of the packet
-     * u8    current quantizer at the start of the macroblock
-     * u8    GOB number
-     * u16le macroblock address within the GOB
-     * u8    horizontal MV predictor
-     * u8    vertical MV predictor
-     * u8    horizontal MV predictor for block number 3
-     * u8    vertical MV predictor for block number 3
-     * @endcode
-     */
-    AV_PKT_DATA_H263_MB_INFO,
-};
-
-/**
- * This structure stores compressed data. It is typically exported by demuxers
- * and then passed as input to decoders, or received as output from encoders and
- * then passed to muxers.
- *
- * For video, it should typically contain one compressed frame. For audio it may
- * contain several compressed frames.
- *
- * AVPacket is one of the few structs in Libav, whose size is a part of public
- * ABI. Thus it may be allocated on stack and no new fields can be added to it
- * without libavcodec and libavformat major bump.
- *
- * The semantics of data ownership depends on the buf or destruct (deprecated)
- * fields. If either is set, the packet data is dynamically allocated and is
- * valid indefinitely until av_free_packet() is called (which in turn calls
- * av_buffer_unref()/the destruct callback to free the data). If neither is set,
- * the packet data is typically backed by some static buffer somewhere and is
- * only valid for a limited time (e.g. until the next read call when demuxing).
- *
- * The side data is always allocated with av_malloc() and is freed in
- * av_free_packet().
- */
-typedef struct AVPacket {
-    /**
-     * A reference to the reference-counted buffer where the packet data is
-     * stored.
-     * May be NULL, then the packet data is not reference-counted.
-     */
-    AVBufferRef *buf;
-    /**
-     * Presentation timestamp in AVStream->time_base units; the time at which
-     * the decompressed packet will be presented to the user.
-     * Can be AV_NOPTS_VALUE if it is not stored in the file.
-     * pts MUST be larger or equal to dts as presentation cannot happen before
-     * decompression, unless one wants to view hex dumps. Some formats misuse
-     * the terms dts and pts/cts to mean something different. Such timestamps
-     * must be converted to true pts/dts before they are stored in AVPacket.
-     */
-    int64_t pts;
-    /**
-     * Decompression timestamp in AVStream->time_base units; the time at which
-     * the packet is decompressed.
-     * Can be AV_NOPTS_VALUE if it is not stored in the file.
-     */
-    int64_t dts;
-    uint8_t *data;
-    int   size;
-    int   stream_index;
-    /**
-     * A combination of AV_PKT_FLAG values
-     */
-    int   flags;
-    /**
-     * Additional packet data that can be provided by the container.
-     * Packet can contain several types of side information.
-     */
-    struct {
-        uint8_t *data;
-        int      size;
-        enum AVPacketSideDataType type;
-    } *side_data;
-    int side_data_elems;
-
-    /**
-     * Duration of this packet in AVStream->time_base units, 0 if unknown.
-     * Equals next_pts - this_pts in presentation order.
-     */
-    int   duration;
-#if FF_API_DESTRUCT_PACKET
-    attribute_deprecated
-    void  (*destruct)(struct AVPacket *);
-    attribute_deprecated
-    void  *priv;
-#endif
-    int64_t pos;                            ///< byte position in stream, -1 if unknown
-
-    /**
-     * Time difference in AVStream->time_base units from the pts of this
-     * packet to the point at which the output from the decoder has converged
-     * independent from the availability of previous frames. That is, the
-     * frames are virtually identical no matter if decoding started from
-     * the very first frame or from this keyframe.
-     * Is AV_NOPTS_VALUE if unknown.
-     * This field is not the display duration of the current packet.
-     * This field has no meaning if the packet does not have AV_PKT_FLAG_KEY
-     * set.
-     *
-     * The purpose of this field is to allow seeking in streams that have no
-     * keyframes in the conventional sense. It corresponds to the
-     * recovery point SEI in H.264 and match_time_delta in NUT. It is also
-     * essential for some types of subtitle streams to ensure that all
-     * subtitles are correctly displayed after seeking.
-     */
-    int64_t convergence_duration;
-} AVPacket;
-#define AV_PKT_FLAG_KEY     0x0001 ///< The packet contains a keyframe
-#define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted
-
-enum AVSideDataParamChangeFlags {
-    AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT  = 0x0001,
-    AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT = 0x0002,
-    AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE    = 0x0004,
-    AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS     = 0x0008,
-};
-/**
- * @}
- */
-
-struct AVCodecInternal;
-
-enum AVFieldOrder {
-    AV_FIELD_UNKNOWN,
-    AV_FIELD_PROGRESSIVE,
-    AV_FIELD_TT,          //< Top coded_first, top displayed first
-    AV_FIELD_BB,          //< Bottom coded first, bottom displayed first
-    AV_FIELD_TB,          //< Top coded first, bottom displayed first
-    AV_FIELD_BT,          //< Bottom coded first, top displayed first
-};
-
-/**
- * main external API structure.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVCodecContext) must not be used outside libav*.
- */
-typedef struct AVCodecContext {
-    /**
-     * information on struct for av_log
-     * - set by avcodec_alloc_context3
-     */
-    const AVClass *av_class;
-    int log_level_offset;
-
-    enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
-    const struct AVCodec  *codec;
-    char             codec_name[32];
-    enum AVCodecID     codec_id; /* see AV_CODEC_ID_xxx */
-
-    /**
-     * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
-     * This is used to work around some encoder bugs.
-     * A demuxer should set this to what is stored in the field used to identify the codec.
-     * If there are multiple such fields in a container then the demuxer should choose the one
-     * which maximizes the information about the used codec.
-     * If the codec tag field in a container is larger than 32 bits then the demuxer should
-     * remap the longer ID to 32 bits with a table or other structure. Alternatively a new
-     * extra_codec_tag + size could be added but for this a clear advantage must be demonstrated
-     * first.
-     * - encoding: Set by user, if not then the default based on codec_id will be used.
-     * - decoding: Set by user, will be converted to uppercase by libavcodec during init.
-     */
-    unsigned int codec_tag;
-
-    /**
-     * fourcc from the AVI stream header (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
-     * This is used to work around some encoder bugs.
-     * - encoding: unused
-     * - decoding: Set by user, will be converted to uppercase by libavcodec during init.
-     */
-    unsigned int stream_codec_tag;
-
-    void *priv_data;
-
-    /**
-     * Private context used for internal data.
-     *
-     * Unlike priv_data, this is not codec-specific. It is used in general
-     * libavcodec functions.
-     */
-    struct AVCodecInternal *internal;
-
-    /**
-     * Private data of the user, can be used to carry app specific stuff.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    void *opaque;
-
-    /**
-     * the average bitrate
-     * - encoding: Set by user; unused for constant quantizer encoding.
-     * - decoding: Set by libavcodec. 0 or some bitrate if this info is available in the stream.
-     */
-    int bit_rate;
-
-    /**
-     * number of bits the bitstream is allowed to diverge from the reference.
-     *           the reference can be CBR (for CBR pass1) or VBR (for pass2)
-     * - encoding: Set by user; unused for constant quantizer encoding.
-     * - decoding: unused
-     */
-    int bit_rate_tolerance;
-
-    /**
-     * Global quality for codecs which cannot change it per frame.
-     * This should be proportional to MPEG-1/2/4 qscale.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int global_quality;
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int compression_level;
-#define FF_COMPRESSION_DEFAULT -1
-
-    /**
-     * CODEC_FLAG_*.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int flags;
-
-    /**
-     * CODEC_FLAG2_*
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int flags2;
-
-    /**
-     * some codecs need / can use extradata like Huffman tables.
-     * mjpeg: Huffman tables
-     * rv10: additional flags
-     * mpeg4: global headers (they can be in the bitstream or here)
-     * The allocated memory should be FF_INPUT_BUFFER_PADDING_SIZE bytes larger
-     * than extradata_size to avoid prolems if it is read with the bitstream reader.
-     * The bytewise contents of extradata must not depend on the architecture or CPU endianness.
-     * - encoding: Set/allocated/freed by libavcodec.
-     * - decoding: Set/allocated/freed by user.
-     */
-    uint8_t *extradata;
-    int extradata_size;
-
-    /**
-     * This is the fundamental unit of time (in seconds) in terms
-     * of which frame timestamps are represented. For fixed-fps content,
-     * timebase should be 1/framerate and timestamp increments should be
-     * identically 1.
-     * - encoding: MUST be set by user.
-     * - decoding: Set by libavcodec.
-     */
-    AVRational time_base;
-
-    /**
-     * For some codecs, the time base is closer to the field rate than the frame rate.
-     * Most notably, H.264 and MPEG-2 specify time_base as half of frame duration
-     * if no telecine is used ...
-     *
-     * Set to time_base ticks per frame. Default 1, e.g., H.264/MPEG-2 set it to 2.
-     */
-    int ticks_per_frame;
-
-    /**
-     * Codec delay.
-     *
-     * Video:
-     *   Number of frames the decoded output will be delayed relative to the
-     *   encoded input.
-     *
-     * Audio:
-     *   For encoding, this is the number of "priming" samples added to the
-     *   beginning of the stream. The decoded output will be delayed by this
-     *   many samples relative to the input to the encoder. Note that this
-     *   field is purely informational and does not directly affect the pts
-     *   output by the encoder, which should always be based on the actual
-     *   presentation time, including any delay.
-     *   For decoding, this is the number of samples the decoder needs to
-     *   output before the decoder's output is valid. When seeking, you should
-     *   start decoding this many samples prior to your desired seek point.
-     *
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    int delay;
-
-
-    /* video only */
-    /**
-     * picture width / height.
-     * - encoding: MUST be set by user.
-     * - decoding: May be set by the user before opening the decoder if known e.g.
-     *             from the container. Some decoders will require the dimensions
-     *             to be set by the caller. During decoding, the decoder may
-     *             overwrite those values as required.
-     */
-    int width, height;
-
-    /**
-     * Bitstream width / height, may be different from width/height e.g. when
-     * the decoded frame is cropped before being output.
-     * - encoding: unused
-     * - decoding: May be set by the user before opening the decoder if known
-     *             e.g. from the container. During decoding, the decoder may
-     *             overwrite those values as required.
-     */
-    int coded_width, coded_height;
-
-#if FF_API_ASPECT_EXTENDED
-#define FF_ASPECT_EXTENDED 15
-#endif
-
-    /**
-     * the number of pictures in a group of pictures, or 0 for intra_only
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int gop_size;
-
-    /**
-     * Pixel format, see AV_PIX_FMT_xxx.
-     * May be set by the demuxer if known from headers.
-     * May be overriden by the decoder if it knows better.
-     * - encoding: Set by user.
-     * - decoding: Set by user if known, overridden by libavcodec if known
-     */
-    enum AVPixelFormat pix_fmt;
-
-    /**
-     * Motion estimation algorithm used for video coding.
-     * 1 (zero), 2 (full), 3 (log), 4 (phods), 5 (epzs), 6 (x1), 7 (hex),
-     * 8 (umh), 10 (tesa) [7, 8, 10 are x264 specific]
-     * - encoding: MUST be set by user.
-     * - decoding: unused
-     */
-    int me_method;
-
-    /**
-     * If non NULL, 'draw_horiz_band' is called by the libavcodec
-     * decoder to draw a horizontal band. It improves cache usage. Not
-     * all codecs can do that. You must check the codec capabilities
-     * beforehand.
-     * When multithreading is used, it may be called from multiple threads
-     * at the same time; threads might draw different parts of the same AVFrame,
-     * or multiple AVFrames, and there is no guarantee that slices will be drawn
-     * in order.
-     * The function is also used by hardware acceleration APIs.
-     * It is called at least once during frame decoding to pass
-     * the data needed for hardware render.
-     * In that mode instead of pixel data, AVFrame points to
-     * a structure specific to the acceleration API. The application
-     * reads the structure and can change some fields to indicate progress
-     * or mark state.
-     * - encoding: unused
-     * - decoding: Set by user.
-     * @param height the height of the slice
-     * @param y the y position of the slice
-     * @param type 1->top field, 2->bottom field, 3->frame
-     * @param offset offset into the AVFrame.data from which the slice should be read
-     */
-    void (*draw_horiz_band)(struct AVCodecContext *s,
-                            const AVFrame *src, int offset[AV_NUM_DATA_POINTERS],
-                            int y, int type, int height);
-
-    /**
-     * callback to negotiate the pixelFormat
-     * @param fmt is the list of formats which are supported by the codec,
-     * it is terminated by -1 as 0 is a valid format, the formats are ordered by quality.
-     * The first is always the native one.
-     * @return the chosen format
-     * - encoding: unused
-     * - decoding: Set by user, if not set the native format will be chosen.
-     */
-    enum AVPixelFormat (*get_format)(struct AVCodecContext *s, const enum AVPixelFormat * fmt);
-
-    /**
-     * maximum number of B-frames between non-B-frames
-     * Note: The output will be delayed by max_b_frames+1 relative to the input.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int max_b_frames;
-
-    /**
-     * qscale factor between IP and B-frames
-     * If > 0 then the last P-frame quantizer will be used (q= lastp_q*factor+offset).
-     * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float b_quant_factor;
-
-    /** obsolete FIXME remove */
-    int rc_strategy;
-#define FF_RC_STRATEGY_XVID 1
-
-    int b_frame_strategy;
-
-    /**
-     * qscale offset between IP and B-frames
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float b_quant_offset;
-
-    /**
-     * Size of the frame reordering buffer in the decoder.
-     * For MPEG-2 it is 1 IPB or 0 low delay IP.
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    int has_b_frames;
-
-    /**
-     * 0-> h263 quant 1-> mpeg quant
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mpeg_quant;
-
-    /**
-     * qscale factor between P and I-frames
-     * If > 0 then the last p frame quantizer will be used (q= lastp_q*factor+offset).
-     * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float i_quant_factor;
-
-    /**
-     * qscale offset between P and I-frames
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float i_quant_offset;
-
-    /**
-     * luminance masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float lumi_masking;
-
-    /**
-     * temporary complexity masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float temporal_cplx_masking;
-
-    /**
-     * spatial complexity masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float spatial_cplx_masking;
-
-    /**
-     * p block masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float p_masking;
-
-    /**
-     * darkness masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float dark_masking;
-
-    /**
-     * slice count
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by user (or 0).
-     */
-    int slice_count;
-    /**
-     * prediction method (needed for huffyuv)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-     int prediction_method;
-#define FF_PRED_LEFT   0
-#define FF_PRED_PLANE  1
-#define FF_PRED_MEDIAN 2
-
-    /**
-     * slice offsets in the frame in bytes
-     * - encoding: Set/allocated by libavcodec.
-     * - decoding: Set/allocated by user (or NULL).
-     */
-    int *slice_offset;
-
-    /**
-     * sample aspect ratio (0 if unknown)
-     * That is the width of a pixel divided by the height of the pixel.
-     * Numerator and denominator must be relatively prime and smaller than 256 for some video standards.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    AVRational sample_aspect_ratio;
-
-    /**
-     * motion estimation comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_cmp;
-    /**
-     * subpixel motion estimation comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_sub_cmp;
-    /**
-     * macroblock comparison function (not supported yet)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_cmp;
-    /**
-     * interlaced DCT comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int ildct_cmp;
-#define FF_CMP_SAD    0
-#define FF_CMP_SSE    1
-#define FF_CMP_SATD   2
-#define FF_CMP_DCT    3
-#define FF_CMP_PSNR   4
-#define FF_CMP_BIT    5
-#define FF_CMP_RD     6
-#define FF_CMP_ZERO   7
-#define FF_CMP_VSAD   8
-#define FF_CMP_VSSE   9
-#define FF_CMP_NSSE   10
-#define FF_CMP_DCTMAX 13
-#define FF_CMP_DCT264 14
-#define FF_CMP_CHROMA 256
-
-    /**
-     * ME diamond size & shape
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int dia_size;
-
-    /**
-     * amount of previous MV predictors (2a+1 x 2a+1 square)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int last_predictor_count;
-
-    /**
-     * prepass for motion estimation
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int pre_me;
-
-    /**
-     * motion estimation prepass comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_pre_cmp;
-
-    /**
-     * ME prepass diamond size & shape
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int pre_dia_size;
-
-    /**
-     * subpel ME quality
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_subpel_quality;
-
-    /**
-     * DTG active format information (additional aspect ratio
-     * information only used in DVB MPEG-2 transport streams)
-     * 0 if not set.
-     *
-     * - encoding: unused
-     * - decoding: Set by decoder.
-     */
-    int dtg_active_format;
-#define FF_DTG_AFD_SAME         8
-#define FF_DTG_AFD_4_3          9
-#define FF_DTG_AFD_16_9         10
-#define FF_DTG_AFD_14_9         11
-#define FF_DTG_AFD_4_3_SP_14_9  13
-#define FF_DTG_AFD_16_9_SP_14_9 14
-#define FF_DTG_AFD_SP_4_3       15
-
-    /**
-     * maximum motion estimation search range in subpel units
-     * If 0 then no limit.
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_range;
-
-    /**
-     * intra quantizer bias
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int intra_quant_bias;
-#define FF_DEFAULT_QUANT_BIAS 999999
-
-    /**
-     * inter quantizer bias
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int inter_quant_bias;
-
-    /**
-     * slice flags
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int slice_flags;
-#define SLICE_FLAG_CODED_ORDER    0x0001 ///< draw_horiz_band() is called in coded order instead of display
-#define SLICE_FLAG_ALLOW_FIELD    0x0002 ///< allow draw_horiz_band() with field slices (MPEG2 field pics)
-#define SLICE_FLAG_ALLOW_PLANE    0x0004 ///< allow draw_horiz_band() with 1 component at a time (SVQ1)
-
-#if FF_API_XVMC
-    /**
-     * XVideo Motion Acceleration
-     * - encoding: forbidden
-     * - decoding: set by decoder
-     * @deprecated XvMC support is slated for removal.
-     */
-    attribute_deprecated int xvmc_acceleration;
-#endif /* FF_API_XVMC */
-
-    /**
-     * macroblock decision mode
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_decision;
-#define FF_MB_DECISION_SIMPLE 0        ///< uses mb_cmp
-#define FF_MB_DECISION_BITS   1        ///< chooses the one which needs the fewest bits
-#define FF_MB_DECISION_RD     2        ///< rate distortion
-
-    /**
-     * custom intra quantization matrix
-     * - encoding: Set by user, can be NULL.
-     * - decoding: Set by libavcodec.
-     */
-    uint16_t *intra_matrix;
-
-    /**
-     * custom inter quantization matrix
-     * - encoding: Set by user, can be NULL.
-     * - decoding: Set by libavcodec.
-     */
-    uint16_t *inter_matrix;
-
-    /**
-     * scene change detection threshold
-     * 0 is default, larger means fewer detected scene changes.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int scenechange_threshold;
-
-    /**
-     * noise reduction strength
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int noise_reduction;
-
-    /**
-     * Motion estimation threshold below which no motion estimation is
-     * performed, but instead the user specified motion vectors are used.
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_threshold;
-
-    /**
-     * Macroblock threshold below which the user specified macroblock types will be used.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_threshold;
-
-    /**
-     * precision of the intra DC coefficient - 8
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int intra_dc_precision;
-
-    /**
-     * Number of macroblock rows at the top which are skipped.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int skip_top;
-
-    /**
-     * Number of macroblock rows at the bottom which are skipped.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int skip_bottom;
-
-    /**
-     * Border processing masking, raises the quantizer for mbs on the borders
-     * of the picture.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float border_masking;
-
-    /**
-     * minimum MB lagrange multipler
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_lmin;
-
-    /**
-     * maximum MB lagrange multipler
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_lmax;
-
-    /**
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_penalty_compensation;
-
-    /**
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int bidir_refine;
-
-    /**
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int brd_scale;
-
-    /**
-     * minimum GOP size
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int keyint_min;
-
-    /**
-     * number of reference frames
-     * - encoding: Set by user.
-     * - decoding: Set by lavc.
-     */
-    int refs;
-
-    /**
-     * chroma qp offset from luma
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int chromaoffset;
-
-    /**
-     * Multiplied by qscale for each frame and added to scene_change_score.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int scenechange_factor;
-
-    /**
-     *
-     * Note: Value depends upon the compare function used for fullpel ME.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mv0_threshold;
-
-    /**
-     * Adjust sensitivity of b_frame_strategy 1.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int b_sensitivity;
-
-    /**
-     * Chromaticity coordinates of the source primaries.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorPrimaries color_primaries;
-
-    /**
-     * Color Transfer Characteristic.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorTransferCharacteristic color_trc;
-
-    /**
-     * YUV colorspace type.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorSpace colorspace;
-
-    /**
-     * MPEG vs JPEG YUV range.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorRange color_range;
-
-    /**
-     * This defines the location of chroma samples.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVChromaLocation chroma_sample_location;
-
-    /**
-     * Number of slices.
-     * Indicates number of picture subdivisions. Used for parallelized
-     * decoding.
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    int slices;
-
-    /** Field order
-     * - encoding: set by libavcodec
-     * - decoding: Set by libavcodec
-     */
-    enum AVFieldOrder field_order;
-
-    /* audio only */
-    int sample_rate; ///< samples per second
-    int channels;    ///< number of audio channels
-
-    /**
-     * audio sample format
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    enum AVSampleFormat sample_fmt;  ///< sample format
-
-    /* The following data should not be initialized. */
-    /**
-     * Number of samples per channel in an audio frame.
-     *
-     * - encoding: set by libavcodec in avcodec_open2(). Each submitted frame
-     *   except the last must contain exactly frame_size samples per channel.
-     *   May be 0 when the codec has CODEC_CAP_VARIABLE_FRAME_SIZE set, then the
-     *   frame size is not restricted.
-     * - decoding: may be set by some decoders to indicate constant frame size
-     */
-    int frame_size;
-
-    /**
-     * Frame counter, set by libavcodec.
-     *
-     * - decoding: total number of frames returned from the decoder so far.
-     * - encoding: total number of frames passed to the encoder so far.
-     *
-     *   @note the counter is not incremented if encoding/decoding resulted in
-     *   an error.
-     */
-    int frame_number;
-
-    /**
-     * number of bytes per packet if constant and known or 0
-     * Used by some WAV based audio codecs.
-     */
-    int block_align;
-
-    /**
-     * Audio cutoff bandwidth (0 means "automatic")
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int cutoff;
-
-#if FF_API_REQUEST_CHANNELS
-    /**
-     * Decoder should decode to this many channels if it can (0 for default)
-     * - encoding: unused
-     * - decoding: Set by user.
-     * @deprecated Deprecated in favor of request_channel_layout.
-     */
-    attribute_deprecated int request_channels;
-#endif
-
-    /**
-     * Audio channel layout.
-     * - encoding: set by user.
-     * - decoding: set by libavcodec.
-     */
-    uint64_t channel_layout;
-
-    /**
-     * Request decoder to use this channel layout if it can (0 for default)
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    uint64_t request_channel_layout;
-
-    /**
-     * Type of service that the audio stream conveys.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    enum AVAudioServiceType audio_service_type;
-
-    /**
-     * Used to request a sample format from the decoder.
-     * - encoding: unused.
-     * - decoding: Set by user.
-     */
-    enum AVSampleFormat request_sample_fmt;
-
-#if FF_API_GET_BUFFER
-    /**
-     * Called at the beginning of each frame to get a buffer for it.
-     *
-     * The function will set AVFrame.data[], AVFrame.linesize[].
-     * AVFrame.extended_data[] must also be set, but it should be the same as
-     * AVFrame.data[] except for planar audio with more channels than can fit
-     * in AVFrame.data[]. In that case, AVFrame.data[] shall still contain as
-     * many data pointers as it can hold.
-     *
-     * if CODEC_CAP_DR1 is not set then get_buffer() must call
-     * avcodec_default_get_buffer() instead of providing buffers allocated by
-     * some other means.
-     *
-     * AVFrame.data[] should be 32- or 16-byte-aligned unless the CPU doesn't
-     * need it. avcodec_default_get_buffer() aligns the output buffer properly,
-     * but if get_buffer() is overridden then alignment considerations should
-     * be taken into account.
-     *
-     * @see avcodec_default_get_buffer()
-     *
-     * Video:
-     *
-     * If pic.reference is set then the frame will be read later by libavcodec.
-     * avcodec_align_dimensions2() should be used to find the required width and
-     * height, as they normally need to be rounded up to the next multiple of 16.
-     *
-     * If frame multithreading is used and thread_safe_callbacks is set,
-     * it may be called from a different thread, but not from more than one at
-     * once. Does not need to be reentrant.
-     *
-     * @see release_buffer(), reget_buffer()
-     * @see avcodec_align_dimensions2()
-     *
-     * Audio:
-     *
-     * Decoders request a buffer of a particular size by setting
-     * AVFrame.nb_samples prior to calling get_buffer(). The decoder may,
-     * however, utilize only part of the buffer by setting AVFrame.nb_samples
-     * to a smaller value in the output frame.
-     *
-     * Decoders cannot use the buffer after returning from
-     * avcodec_decode_audio4(), so they will not call release_buffer(), as it
-     * is assumed to be released immediately upon return. In some rare cases,
-     * a decoder may need to call get_buffer() more than once in a single
-     * call to avcodec_decode_audio4(). In that case, when get_buffer() is
-     * called again after it has already been called once, the previously
-     * acquired buffer is assumed to be released at that time and may not be
-     * reused by the decoder.
-     *
-     * As a convenience, av_samples_get_buffer_size() and
-     * av_samples_fill_arrays() in libavutil may be used by custom get_buffer()
-     * functions to find the required data size and to fill data pointers and
-     * linesize. In AVFrame.linesize, only linesize[0] may be set for audio
-     * since all planes must be the same size.
-     *
-     * @see av_samples_get_buffer_size(), av_samples_fill_arrays()
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec, user can override.
-     *
-     * @deprecated use get_buffer2()
-     */
-    attribute_deprecated
-    int (*get_buffer)(struct AVCodecContext *c, AVFrame *pic);
-
-    /**
-     * Called to release buffers which were allocated with get_buffer.
-     * A released buffer can be reused in get_buffer().
-     * pic.data[*] must be set to NULL.
-     * May be called from a different thread if frame multithreading is used,
-     * but not by more than one thread at once, so does not need to be reentrant.
-     * - encoding: unused
-     * - decoding: Set by libavcodec, user can override.
-     *
-     * @deprecated custom freeing callbacks should be set from get_buffer2()
-     */
-    attribute_deprecated
-    void (*release_buffer)(struct AVCodecContext *c, AVFrame *pic);
-
-    /**
-     * Called at the beginning of a frame to get cr buffer for it.
-     * Buffer type (size, hints) must be the same. libavcodec won't check it.
-     * libavcodec will pass previous buffer in pic, function should return
-     * same buffer or new buffer with old frame "painted" into it.
-     * If pic.data[0] == NULL must behave like get_buffer().
-     * if CODEC_CAP_DR1 is not set then reget_buffer() must call
-     * avcodec_default_reget_buffer() instead of providing buffers allocated by
-     * some other means.
-     * - encoding: unused
-     * - decoding: Set by libavcodec, user can override.
-     */
-    attribute_deprecated
-    int (*reget_buffer)(struct AVCodecContext *c, AVFrame *pic);
-#endif
-
-    /**
-     * This callback is called at the beginning of each frame to get data
-     * buffer(s) for it. There may be one contiguous buffer for all the data or
-     * there may be a buffer per each data plane or anything in between. What
-     * this means is, you may set however many entries in buf[] you feel necessary.
-     * Each buffer must be reference-counted using the AVBuffer API (see description
-     * of buf[] below).
-     *
-     * The following fields will be set in the frame before this callback is
-     * called:
-     * - format
-     * - width, height (video only)
-     * - sample_rate, channel_layout, nb_samples (audio only)
-     * Their values may differ from the corresponding values in
-     * AVCodecContext. This callback must use the frame values, not the codec
-     * context values, to calculate the required buffer size.
-     *
-     * This callback must fill the following fields in the frame:
-     * - data[]
-     * - linesize[]
-     * - extended_data:
-     *   * if the data is planar audio with more than 8 channels, then this
-     *     callback must allocate and fill extended_data to contain all pointers
-     *     to all data planes. data[] must hold as many pointers as it can.
-     *     extended_data must be allocated with av_malloc() and will be freed in
-     *     av_frame_unref().
-     *   * otherwise exended_data must point to data
-     * - buf[] must contain one or more pointers to AVBufferRef structures. Each of
-     *   the frame's data and extended_data pointers must be contained in these. That
-     *   is, one AVBufferRef for each allocated chunk of memory, not necessarily one
-     *   AVBufferRef per data[] entry. See: av_buffer_create(), av_buffer_alloc(),
-     *   and av_buffer_ref().
-     * - extended_buf and nb_extended_buf must be allocated with av_malloc() by
-     *   this callback and filled with the extra buffers if there are more
-     *   buffers than buf[] can hold. extended_buf will be freed in
-     *   av_frame_unref().
-     *
-     * If CODEC_CAP_DR1 is not set then get_buffer2() must call
-     * avcodec_default_get_buffer2() instead of providing buffers allocated by
-     * some other means.
-     *
-     * Each data plane must be aligned to the maximum required by the target
-     * CPU.
-     *
-     * @see avcodec_default_get_buffer2()
-     *
-     * Video:
-     *
-     * If AV_GET_BUFFER_FLAG_REF is set in flags then the frame may be reused
-     * (read and/or written to if it is writable) later by libavcodec.
-     *
-     * avcodec_align_dimensions2() should be used to find the required width and
-     * height, as they normally need to be rounded up to the next multiple of 16.
-     *
-     * If frame multithreading is used and thread_safe_callbacks is set,
-     * this callback may be called from a different thread, but not from more
-     * than one at once. Does not need to be reentrant.
-     *
-     * @see avcodec_align_dimensions2()
-     *
-     * Audio:
-     *
-     * Decoders request a buffer of a particular size by setting
-     * AVFrame.nb_samples prior to calling get_buffer2(). The decoder may,
-     * however, utilize only part of the buffer by setting AVFrame.nb_samples
-     * to a smaller value in the output frame.
-     *
-     * As a convenience, av_samples_get_buffer_size() and
-     * av_samples_fill_arrays() in libavutil may be used by custom get_buffer2()
-     * functions to find the required data size and to fill data pointers and
-     * linesize. In AVFrame.linesize, only linesize[0] may be set for audio
-     * since all planes must be the same size.
-     *
-     * @see av_samples_get_buffer_size(), av_samples_fill_arrays()
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec, user can override.
-     */
-    int (*get_buffer2)(struct AVCodecContext *s, AVFrame *frame, int flags);
-
-    /**
-     * If non-zero, the decoded audio and video frames returned from
-     * avcodec_decode_video2() and avcodec_decode_audio4() are reference-counted
-     * and are valid indefinitely. The caller must free them with
-     * av_frame_unref() when they are not needed anymore.
-     * Otherwise, the decoded frames must not be freed by the caller and are
-     * only valid until the next decode call.
-     *
-     * - encoding: unused
-     * - decoding: set by the caller before avcodec_open2().
-     */
-    int refcounted_frames;
-
-    /* - encoding parameters */
-    float qcompress;  ///< amount of qscale change between easy & hard scenes (0.0-1.0)
-    float qblur;      ///< amount of qscale smoothing over time (0.0-1.0)
-
-    /**
-     * minimum quantizer
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int qmin;
-
-    /**
-     * maximum quantizer
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int qmax;
-
-    /**
-     * maximum quantizer difference between frames
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int max_qdiff;
-
-    /**
-     * ratecontrol qmin qmax limiting method
-     * 0-> clipping, 1-> use a nice continuous function to limit qscale wthin qmin/qmax.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float rc_qsquish;
-
-    float rc_qmod_amp;
-    int rc_qmod_freq;
-
-    /**
-     * decoder bitstream buffer size
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rc_buffer_size;
-
-    /**
-     * ratecontrol override, see RcOverride
-     * - encoding: Allocated/set/freed by user.
-     * - decoding: unused
-     */
-    int rc_override_count;
-    RcOverride *rc_override;
-
-    /**
-     * rate control equation
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    const char *rc_eq;
-
-    /**
-     * maximum bitrate
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rc_max_rate;
-
-    /**
-     * minimum bitrate
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rc_min_rate;
-
-    float rc_buffer_aggressivity;
-
-    /**
-     * initial complexity for pass1 ratecontrol
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float rc_initial_cplx;
-
-    /**
-     * Ratecontrol attempt to use, at maximum, <value> of what can be used without an underflow.
-     * - encoding: Set by user.
-     * - decoding: unused.
-     */
-    float rc_max_available_vbv_use;
-
-    /**
-     * Ratecontrol attempt to use, at least, <value> times the amount needed to prevent a vbv overflow.
-     * - encoding: Set by user.
-     * - decoding: unused.
-     */
-    float rc_min_vbv_overflow_use;
-
-    /**
-     * Number of bits which should be loaded into the rc buffer before decoding starts.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rc_initial_buffer_occupancy;
-
-#define FF_CODER_TYPE_VLC       0
-#define FF_CODER_TYPE_AC        1
-#define FF_CODER_TYPE_RAW       2
-#define FF_CODER_TYPE_RLE       3
-#define FF_CODER_TYPE_DEFLATE   4
-    /**
-     * coder type
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int coder_type;
-
-    /**
-     * context model
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int context_model;
-
-    /**
-     * minimum Lagrange multipler
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int lmin;
-
-    /**
-     * maximum Lagrange multipler
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int lmax;
-
-    /**
-     * frame skip threshold
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int frame_skip_threshold;
-
-    /**
-     * frame skip factor
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int frame_skip_factor;
-
-    /**
-     * frame skip exponent
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int frame_skip_exp;
-
-    /**
-     * frame skip comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int frame_skip_cmp;
-
-    /**
-     * trellis RD quantization
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int trellis;
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int min_prediction_order;
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int max_prediction_order;
-
-    /**
-     * GOP timecode frame start number, in non drop frame format
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int64_t timecode_frame_start;
-
-    /* The RTP callback: This function is called    */
-    /* every time the encoder has a packet to send. */
-    /* It depends on the encoder if the data starts */
-    /* with a Start Code (it should). H.263 does.   */
-    /* mb_nb contains the number of macroblocks     */
-    /* encoded in the RTP payload.                  */
-    void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb);
-
-    int rtp_payload_size;   /* The size of the RTP payload: the coder will  */
-                            /* do its best to deliver a chunk with size     */
-                            /* below rtp_payload_size, the chunk will start */
-                            /* with a start code on some codecs like H.263. */
-                            /* This doesn't take account of any particular  */
-                            /* headers inside the transmitted RTP payload.  */
-
-    /* statistics, used for 2-pass encoding */
-    int mv_bits;
-    int header_bits;
-    int i_tex_bits;
-    int p_tex_bits;
-    int i_count;
-    int p_count;
-    int skip_count;
-    int misc_bits;
-
-    /**
-     * number of bits used for the previously encoded frame
-     * - encoding: Set by libavcodec.
-     * - decoding: unused
-     */
-    int frame_bits;
-
-    /**
-     * pass1 encoding statistics output buffer
-     * - encoding: Set by libavcodec.
-     * - decoding: unused
-     */
-    char *stats_out;
-
-    /**
-     * pass2 encoding statistics input buffer
-     * Concatenated stuff from stats_out of pass1 should be placed here.
-     * - encoding: Allocated/set/freed by user.
-     * - decoding: unused
-     */
-    char *stats_in;
-
-    /**
-     * Work around bugs in encoders which sometimes cannot be detected automatically.
-     * - encoding: Set by user
-     * - decoding: Set by user
-     */
-    int workaround_bugs;
-#define FF_BUG_AUTODETECT       1  ///< autodetection
-#if FF_API_OLD_MSMPEG4
-#define FF_BUG_OLD_MSMPEG4      2
-#endif
-#define FF_BUG_XVID_ILACE       4
-#define FF_BUG_UMP4             8
-#define FF_BUG_NO_PADDING       16
-#define FF_BUG_AMV              32
-#if FF_API_AC_VLC
-#define FF_BUG_AC_VLC           0  ///< Will be removed, libavcodec can now handle these non-compliant files by default.
-#endif
-#define FF_BUG_QPEL_CHROMA      64
-#define FF_BUG_STD_QPEL         128
-#define FF_BUG_QPEL_CHROMA2     256
-#define FF_BUG_DIRECT_BLOCKSIZE 512
-#define FF_BUG_EDGE             1024
-#define FF_BUG_HPEL_CHROMA      2048
-#define FF_BUG_DC_CLIP          4096
-#define FF_BUG_MS               8192 ///< Work around various bugs in Microsoft's broken decoders.
-#define FF_BUG_TRUNCATED       16384
-
-    /**
-     * strictly follow the standard (MPEG4, ...).
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     * Setting this to STRICT or higher means the encoder and decoder will
-     * generally do stupid things, whereas setting it to unofficial or lower
-     * will mean the encoder might produce output that is not supported by all
-     * spec-compliant decoders. Decoders don't differentiate between normal,
-     * unofficial and experimental (that is, they always try to decode things
-     * when they can) unless they are explicitly asked to behave stupidly
-     * (=strictly conform to the specs)
-     */
-    int strict_std_compliance;
-#define FF_COMPLIANCE_VERY_STRICT   2 ///< Strictly conform to an older more strict version of the spec or reference software.
-#define FF_COMPLIANCE_STRICT        1 ///< Strictly conform to all the things in the spec no matter what consequences.
-#define FF_COMPLIANCE_NORMAL        0
-#define FF_COMPLIANCE_UNOFFICIAL   -1 ///< Allow unofficial extensions
-#define FF_COMPLIANCE_EXPERIMENTAL -2 ///< Allow nonstandardized experimental things.
-
-    /**
-     * error concealment flags
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int error_concealment;
-#define FF_EC_GUESS_MVS   1
-#define FF_EC_DEBLOCK     2
-
-    /**
-     * debug
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int debug;
-#define FF_DEBUG_PICT_INFO   1
-#define FF_DEBUG_RC          2
-#define FF_DEBUG_BITSTREAM   4
-#define FF_DEBUG_MB_TYPE     8
-#define FF_DEBUG_QP          16
-#if FF_API_DEBUG_MV
-/**
- * @deprecated this option does nothing
- */
-#define FF_DEBUG_MV          32
-#endif
-#define FF_DEBUG_DCT_COEFF   0x00000040
-#define FF_DEBUG_SKIP        0x00000080
-#define FF_DEBUG_STARTCODE   0x00000100
-#define FF_DEBUG_PTS         0x00000200
-#define FF_DEBUG_ER          0x00000400
-#define FF_DEBUG_MMCO        0x00000800
-#define FF_DEBUG_BUGS        0x00001000
-#if FF_API_DEBUG_MV
-#define FF_DEBUG_VIS_QP      0x00002000
-#define FF_DEBUG_VIS_MB_TYPE 0x00004000
-#endif
-#define FF_DEBUG_BUFFERS     0x00008000
-#define FF_DEBUG_THREADS     0x00010000
-
-#if FF_API_DEBUG_MV
-    /**
-     * @deprecated this option does not have any effect
-     */
-    attribute_deprecated
-    int debug_mv;
-#define FF_DEBUG_VIS_MV_P_FOR  0x00000001 //visualize forward predicted MVs of P frames
-#define FF_DEBUG_VIS_MV_B_FOR  0x00000002 //visualize forward predicted MVs of B frames
-#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
-#endif
-
-    /**
-     * Error recognition; may misdetect some more or less valid parts as errors.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int err_recognition;
-
-/**
- * Verify checksums embedded in the bitstream (could be of either encoded or
- * decoded data, depending on the codec) and print an error message on mismatch.
- * If AV_EF_EXPLODE is also set, a mismatching checksum will result in the
- * decoder returning an error.
- */
-#define AV_EF_CRCCHECK  (1<<0)
-#define AV_EF_BITSTREAM (1<<1)
-#define AV_EF_BUFFER    (1<<2)
-#define AV_EF_EXPLODE   (1<<3)
-
-    /**
-     * opaque 64bit number (generally a PTS) that will be reordered and
-     * output in AVFrame.reordered_opaque
-     * @deprecated in favor of pkt_pts
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int64_t reordered_opaque;
-
-    /**
-     * Hardware accelerator in use
-     * - encoding: unused.
-     * - decoding: Set by libavcodec
-     */
-    struct AVHWAccel *hwaccel;
-
-    /**
-     * Hardware accelerator context.
-     * For some hardware accelerators, a global context needs to be
-     * provided by the user. In that case, this holds display-dependent
-     * data Libav cannot instantiate itself. Please refer to the
-     * Libav HW accelerator documentation to know how to fill this
-     * is. e.g. for VA API, this is a struct vaapi_context.
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    void *hwaccel_context;
-
-    /**
-     * error
-     * - encoding: Set by libavcodec if flags&CODEC_FLAG_PSNR.
-     * - decoding: unused
-     */
-    uint64_t error[AV_NUM_DATA_POINTERS];
-
-    /**
-     * DCT algorithm, see FF_DCT_* below
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int dct_algo;
-#define FF_DCT_AUTO    0
-#define FF_DCT_FASTINT 1
-#define FF_DCT_INT     2
-#define FF_DCT_MMX     3
-#define FF_DCT_ALTIVEC 5
-#define FF_DCT_FAAN    6
-
-    /**
-     * IDCT algorithm, see FF_IDCT_* below.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int idct_algo;
-#define FF_IDCT_AUTO          0
-#define FF_IDCT_INT           1
-#define FF_IDCT_SIMPLE        2
-#define FF_IDCT_SIMPLEMMX     3
-#define FF_IDCT_ARM           7
-#define FF_IDCT_ALTIVEC       8
-#define FF_IDCT_SH4           9
-#define FF_IDCT_SIMPLEARM     10
-#define FF_IDCT_IPP           13
-#define FF_IDCT_XVIDMMX       14
-#define FF_IDCT_SIMPLEARMV5TE 16
-#define FF_IDCT_SIMPLEARMV6   17
-#define FF_IDCT_SIMPLEVIS     18
-#define FF_IDCT_FAAN          20
-#define FF_IDCT_SIMPLENEON    22
-#if FF_API_ARCH_ALPHA
-#define FF_IDCT_SIMPLEALPHA   23
-#endif
-
-    /**
-     * bits per sample/pixel from the demuxer (needed for huffyuv).
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by user.
-     */
-     int bits_per_coded_sample;
-
-    /**
-     * Bits per sample/pixel of internal libavcodec pixel/sample format.
-     * - encoding: set by user.
-     * - decoding: set by libavcodec.
-     */
-    int bits_per_raw_sample;
-
-#if FF_API_LOWRES
-    /**
-     * low resolution decoding, 1-> 1/2 size, 2->1/4 size
-     * - encoding: unused
-     * - decoding: Set by user.
-     *
-     * @deprecated use decoder private options instead
-     */
-    attribute_deprecated int lowres;
-#endif
-
-    /**
-     * the picture in the bitstream
-     * - encoding: Set by libavcodec.
-     * - decoding: unused
-     */
-    AVFrame *coded_frame;
-
-    /**
-     * thread count
-     * is used to decide how many independent tasks should be passed to execute()
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int thread_count;
-
-    /**
-     * Which multithreading methods to use.
-     * Use of FF_THREAD_FRAME will increase decoding delay by one frame per thread,
-     * so clients which cannot provide future frames should not use it.
-     *
-     * - encoding: Set by user, otherwise the default is used.
-     * - decoding: Set by user, otherwise the default is used.
-     */
-    int thread_type;
-#define FF_THREAD_FRAME   1 ///< Decode more than one frame at once
-#define FF_THREAD_SLICE   2 ///< Decode more than one part of a single frame at once
-
-    /**
-     * Which multithreading methods are in use by the codec.
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    int active_thread_type;
-
-    /**
-     * Set by the client if its custom get_buffer() callback can be called
-     * synchronously from another thread, which allows faster multithreaded decoding.
-     * draw_horiz_band() will be called from other threads regardless of this setting.
-     * Ignored if the default get_buffer() is used.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int thread_safe_callbacks;
-
-    /**
-     * The codec may call this to execute several independent things.
-     * It will return only after finishing all tasks.
-     * The user may replace this with some multithreaded implementation,
-     * the default implementation will execute the parts serially.
-     * @param count the number of things to execute
-     * - encoding: Set by libavcodec, user can override.
-     * - decoding: Set by libavcodec, user can override.
-     */
-    int (*execute)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg), void *arg2, int *ret, int count, int size);
-
-    /**
-     * The codec may call this to execute several independent things.
-     * It will return only after finishing all tasks.
-     * The user may replace this with some multithreaded implementation,
-     * the default implementation will execute the parts serially.
-     * Also see avcodec_thread_init and e.g. the --enable-pthread configure option.
-     * @param c context passed also to func
-     * @param count the number of things to execute
-     * @param arg2 argument passed unchanged to func
-     * @param ret return values of executed functions, must have space for "count" values. May be NULL.
-     * @param func function that will be called count times, with jobnr from 0 to count-1.
-     *             threadnr will be in the range 0 to c->thread_count-1 < MAX_THREADS and so that no
-     *             two instances of func executing at the same time will have the same threadnr.
-     * @return always 0 currently, but code should handle a future improvement where when any call to func
-     *         returns < 0 no further calls to func may be done and < 0 is returned.
-     * - encoding: Set by libavcodec, user can override.
-     * - decoding: Set by libavcodec, user can override.
-     */
-    int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count);
-
-#if FF_API_THREAD_OPAQUE
-    /**
-     * @deprecated this field should not be used from outside of lavc
-     */
-    attribute_deprecated
-    void *thread_opaque;
-#endif
-
-    /**
-     * noise vs. sse weight for the nsse comparsion function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-     int nsse_weight;
-
-    /**
-     * profile
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-     int profile;
-#define FF_PROFILE_UNKNOWN -99
-#define FF_PROFILE_RESERVED -100
-
-#define FF_PROFILE_AAC_MAIN 0
-#define FF_PROFILE_AAC_LOW  1
-#define FF_PROFILE_AAC_SSR  2
-#define FF_PROFILE_AAC_LTP  3
-#define FF_PROFILE_AAC_HE   4
-#define FF_PROFILE_AAC_HE_V2 28
-#define FF_PROFILE_AAC_LD   22
-#define FF_PROFILE_AAC_ELD  38
-#define FF_PROFILE_MPEG2_AAC_LOW 128
-#define FF_PROFILE_MPEG2_AAC_HE  131
-
-#define FF_PROFILE_DTS         20
-#define FF_PROFILE_DTS_ES      30
-#define FF_PROFILE_DTS_96_24   40
-#define FF_PROFILE_DTS_HD_HRA  50
-#define FF_PROFILE_DTS_HD_MA   60
-
-#define FF_PROFILE_MPEG2_422    0
-#define FF_PROFILE_MPEG2_HIGH   1
-#define FF_PROFILE_MPEG2_SS     2
-#define FF_PROFILE_MPEG2_SNR_SCALABLE  3
-#define FF_PROFILE_MPEG2_MAIN   4
-#define FF_PROFILE_MPEG2_SIMPLE 5
-
-#define FF_PROFILE_H264_CONSTRAINED  (1<<9)  // 8+1; constraint_set1_flag
-#define FF_PROFILE_H264_INTRA        (1<<11) // 8+3; constraint_set3_flag
-
-#define FF_PROFILE_H264_BASELINE             66
-#define FF_PROFILE_H264_CONSTRAINED_BASELINE (66|FF_PROFILE_H264_CONSTRAINED)
-#define FF_PROFILE_H264_MAIN                 77
-#define FF_PROFILE_H264_EXTENDED             88
-#define FF_PROFILE_H264_HIGH                 100
-#define FF_PROFILE_H264_HIGH_10              110
-#define FF_PROFILE_H264_HIGH_10_INTRA        (110|FF_PROFILE_H264_INTRA)
-#define FF_PROFILE_H264_HIGH_422             122
-#define FF_PROFILE_H264_HIGH_422_INTRA       (122|FF_PROFILE_H264_INTRA)
-#define FF_PROFILE_H264_HIGH_444             144
-#define FF_PROFILE_H264_HIGH_444_PREDICTIVE  244
-#define FF_PROFILE_H264_HIGH_444_INTRA       (244|FF_PROFILE_H264_INTRA)
-#define FF_PROFILE_H264_CAVLC_444            44
-
-#define FF_PROFILE_VC1_SIMPLE   0
-#define FF_PROFILE_VC1_MAIN     1
-#define FF_PROFILE_VC1_COMPLEX  2
-#define FF_PROFILE_VC1_ADVANCED 3
-
-#define FF_PROFILE_MPEG4_SIMPLE                     0
-#define FF_PROFILE_MPEG4_SIMPLE_SCALABLE            1
-#define FF_PROFILE_MPEG4_CORE                       2
-#define FF_PROFILE_MPEG4_MAIN                       3
-#define FF_PROFILE_MPEG4_N_BIT                      4
-#define FF_PROFILE_MPEG4_SCALABLE_TEXTURE           5
-#define FF_PROFILE_MPEG4_SIMPLE_FACE_ANIMATION      6
-#define FF_PROFILE_MPEG4_BASIC_ANIMATED_TEXTURE     7
-#define FF_PROFILE_MPEG4_HYBRID                     8
-#define FF_PROFILE_MPEG4_ADVANCED_REAL_TIME         9
-#define FF_PROFILE_MPEG4_CORE_SCALABLE             10
-#define FF_PROFILE_MPEG4_ADVANCED_CODING           11
-#define FF_PROFILE_MPEG4_ADVANCED_CORE             12
-#define FF_PROFILE_MPEG4_ADVANCED_SCALABLE_TEXTURE 13
-#define FF_PROFILE_MPEG4_SIMPLE_STUDIO             14
-#define FF_PROFILE_MPEG4_ADVANCED_SIMPLE           15
-
-#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_0   0
-#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_1   1
-#define FF_PROFILE_JPEG2000_CSTREAM_NO_RESTRICTION  2
-#define FF_PROFILE_JPEG2000_DCINEMA_2K              3
-#define FF_PROFILE_JPEG2000_DCINEMA_4K              4
-
-
-#define FF_PROFILE_HEVC_MAIN                        1
-#define FF_PROFILE_HEVC_MAIN_10                     2
-#define FF_PROFILE_HEVC_MAIN_STILL_PICTURE          3
-
-    /**
-     * level
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-     int level;
-#define FF_LEVEL_UNKNOWN -99
-
-    /**
-     *
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    enum AVDiscard skip_loop_filter;
-
-    /**
-     *
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    enum AVDiscard skip_idct;
-
-    /**
-     *
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    enum AVDiscard skip_frame;
-
-    /**
-     * Header containing style information for text subtitles.
-     * For SUBTITLE_ASS subtitle type, it should contain the whole ASS
-     * [Script Info] and [V4+ Styles] section, plus the [Events] line and
-     * the Format line following. It shouldn't include any Dialogue line.
-     * - encoding: Set/allocated/freed by user (before avcodec_open2())
-     * - decoding: Set/allocated/freed by libavcodec (by avcodec_open2())
-     */
-    uint8_t *subtitle_header;
-    int subtitle_header_size;
-
-#if FF_API_ERROR_RATE
-    /**
-     * @deprecated use the 'error_rate' private AVOption of the mpegvideo
-     * encoders
-     */
-    attribute_deprecated
-    int error_rate;
-#endif
-
-#if FF_API_CODEC_PKT
-    /**
-     * @deprecated this field is not supposed to be accessed from outside lavc
-     */
-    attribute_deprecated
-    AVPacket *pkt;
-#endif
-
-    /**
-     * VBV delay coded in the last frame (in periods of a 27 MHz clock).
-     * Used for compliant TS muxing.
-     * - encoding: Set by libavcodec.
-     * - decoding: unused.
-     */
-    uint64_t vbv_delay;
-} AVCodecContext;
-
-/**
- * AVProfile.
- */
-typedef struct AVProfile {
-    int profile;
-    const char *name; ///< short name for the profile
-} AVProfile;
-
-typedef struct AVCodecDefault AVCodecDefault;
-
-struct AVSubtitle;
-
-/**
- * AVCodec.
- */
-typedef struct AVCodec {
-    /**
-     * Name of the codec implementation.
-     * The name is globally unique among encoders and among decoders (but an
-     * encoder and a decoder can share the same name).
-     * This is the primary way to find a codec from the user perspective.
-     */
-    const char *name;
-    /**
-     * Descriptive name for the codec, meant to be more human readable than name.
-     * You should use the NULL_IF_CONFIG_SMALL() macro to define it.
-     */
-    const char *long_name;
-    enum AVMediaType type;
-    enum AVCodecID id;
-    /**
-     * Codec capabilities.
-     * see CODEC_CAP_*
-     */
-    int capabilities;
-    const AVRational *supported_framerates; ///< array of supported framerates, or NULL if any, array is terminated by {0,0}
-    const enum AVPixelFormat *pix_fmts;     ///< array of supported pixel formats, or NULL if unknown, array is terminated by -1
-    const int *supported_samplerates;       ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
-    const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1
-    const uint64_t *channel_layouts;         ///< array of support channel layouts, or NULL if unknown. array is terminated by 0
-#if FF_API_LOWRES
-    attribute_deprecated uint8_t max_lowres; ///< maximum value for lowres supported by the decoder
-#endif
-    const AVClass *priv_class;              ///< AVClass for the private context
-    const AVProfile *profiles;              ///< array of recognized profiles, or NULL if unknown, array is terminated by {FF_PROFILE_UNKNOWN}
-
-    /*****************************************************************
-     * No fields below this line are part of the public API. They
-     * may not be used outside of libavcodec and can be changed and
-     * removed at will.
-     * New public fields should be added right above.
-     *****************************************************************
-     */
-    int priv_data_size;
-    struct AVCodec *next;
-    /**
-     * @name Frame-level threading support functions
-     * @{
-     */
-    /**
-     * If defined, called on thread contexts when they are created.
-     * If the codec allocates writable tables in init(), re-allocate them here.
-     * priv_data will be set to a copy of the original.
-     */
-    int (*init_thread_copy)(AVCodecContext *);
-    /**
-     * Copy necessary context variables from a previous thread context to the current one.
-     * If not defined, the next thread will start automatically; otherwise, the codec
-     * must call ff_thread_finish_setup().
-     *
-     * dst and src will (rarely) point to the same context, in which case memcpy should be skipped.
-     */
-    int (*update_thread_context)(AVCodecContext *dst, const AVCodecContext *src);
-    /** @} */
-
-    /**
-     * Private codec-specific defaults.
-     */
-    const AVCodecDefault *defaults;
-
-    /**
-     * Initialize codec static data, called from avcodec_register().
-     */
-    void (*init_static_data)(struct AVCodec *codec);
-
-    int (*init)(AVCodecContext *);
-    int (*encode_sub)(AVCodecContext *, uint8_t *buf, int buf_size,
-                      const struct AVSubtitle *sub);
-    /**
-     * Encode data to an AVPacket.
-     *
-     * @param      avctx          codec context
-     * @param      avpkt          output AVPacket (may contain a user-provided buffer)
-     * @param[in]  frame          AVFrame containing the raw data to be encoded
-     * @param[out] got_packet_ptr encoder sets to 0 or 1 to indicate that a
-     *                            non-empty packet was returned in avpkt.
-     * @return 0 on success, negative error code on failure
-     */
-    int (*encode2)(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame,
-                   int *got_packet_ptr);
-    int (*decode)(AVCodecContext *, void *outdata, int *outdata_size, AVPacket *avpkt);
-    int (*close)(AVCodecContext *);
-    /**
-     * Flush buffers.
-     * Will be called when seeking
-     */
-    void (*flush)(AVCodecContext *);
-} AVCodec;
-
-/**
- * AVHWAccel.
- */
-typedef struct AVHWAccel {
-    /**
-     * Name of the hardware accelerated codec.
-     * The name is globally unique among encoders and among decoders (but an
-     * encoder and a decoder can share the same name).
-     */
-    const char *name;
-
-    /**
-     * Type of codec implemented by the hardware accelerator.
-     *
-     * See AVMEDIA_TYPE_xxx
-     */
-    enum AVMediaType type;
-
-    /**
-     * Codec implemented by the hardware accelerator.
-     *
-     * See AV_CODEC_ID_xxx
-     */
-    enum AVCodecID id;
-
-    /**
-     * Supported pixel format.
-     *
-     * Only hardware accelerated formats are supported here.
-     */
-    enum AVPixelFormat pix_fmt;
-
-    /**
-     * Hardware accelerated codec capabilities.
-     * see FF_HWACCEL_CODEC_CAP_*
-     */
-    int capabilities;
-
-    struct AVHWAccel *next;
-
-    /**
-     * Called at the beginning of each frame or field picture.
-     *
-     * Meaningful frame information (codec specific) is guaranteed to
-     * be parsed at this point. This function is mandatory.
-     *
-     * Note that buf can be NULL along with buf_size set to 0.
-     * Otherwise, this means the whole frame is available at this point.
-     *
-     * @param avctx the codec context
-     * @param buf the frame data buffer base
-     * @param buf_size the size of the frame in bytes
-     * @return zero if successful, a negative value otherwise
-     */
-    int (*start_frame)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size);
-
-    /**
-     * Callback for each slice.
-     *
-     * Meaningful slice information (codec specific) is guaranteed to
-     * be parsed at this point. This function is mandatory.
-     *
-     * @param avctx the codec context
-     * @param buf the slice data buffer base
-     * @param buf_size the size of the slice in bytes
-     * @return zero if successful, a negative value otherwise
-     */
-    int (*decode_slice)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size);
-
-    /**
-     * Called at the end of each frame or field picture.
-     *
-     * The whole picture is parsed at this point and can now be sent
-     * to the hardware accelerator. This function is mandatory.
-     *
-     * @param avctx the codec context
-     * @return zero if successful, a negative value otherwise
-     */
-    int (*end_frame)(AVCodecContext *avctx);
-
-    /**
-     * Size of HW accelerator private data.
-     *
-     * Private data is allocated with av_mallocz() before
-     * AVCodecContext.get_buffer() and deallocated after
-     * AVCodecContext.release_buffer().
-     */
-    int priv_data_size;
-} AVHWAccel;
-
-/**
- * @defgroup lavc_picture AVPicture
- *
- * Functions for working with AVPicture
- * @{
- */
-
-/**
- * four components are given, that's all.
- * the last component is alpha
- */
-typedef struct AVPicture {
-    uint8_t *data[AV_NUM_DATA_POINTERS];
-    int linesize[AV_NUM_DATA_POINTERS];     ///< number of bytes per line
-} AVPicture;
-
-/**
- * @}
- */
-
-#define AVPALETTE_SIZE 1024
-#define AVPALETTE_COUNT 256
-
-enum AVSubtitleType {
-    SUBTITLE_NONE,
-
-    SUBTITLE_BITMAP,                ///< A bitmap, pict will be set
-
-    /**
-     * Plain text, the text field must be set by the decoder and is
-     * authoritative. ass and pict fields may contain approximations.
-     */
-    SUBTITLE_TEXT,
-
-    /**
-     * Formatted text, the ass field must be set by the decoder and is
-     * authoritative. pict and text fields may contain approximations.
-     */
-    SUBTITLE_ASS,
-};
-
-#define AV_SUBTITLE_FLAG_FORCED 0x00000001
-
-typedef struct AVSubtitleRect {
-    int x;         ///< top left corner  of pict, undefined when pict is not set
-    int y;         ///< top left corner  of pict, undefined when pict is not set
-    int w;         ///< width            of pict, undefined when pict is not set
-    int h;         ///< height           of pict, undefined when pict is not set
-    int nb_colors; ///< number of colors in pict, undefined when pict is not set
-
-    /**
-     * data+linesize for the bitmap of this subtitle.
-     * can be set for text/ass as well once they where rendered
-     */
-    AVPicture pict;
-    enum AVSubtitleType type;
-
-    char *text;                     ///< 0 terminated plain UTF-8 text
-
-    /**
-     * 0 terminated ASS/SSA compatible event line.
-     * The pressentation of this is unaffected by the other values in this
-     * struct.
-     */
-    char *ass;
-    int flags;
-} AVSubtitleRect;
-
-typedef struct AVSubtitle {
-    uint16_t format; /* 0 = graphics */
-    uint32_t start_display_time; /* relative to packet pts, in ms */
-    uint32_t end_display_time; /* relative to packet pts, in ms */
-    unsigned num_rects;
-    AVSubtitleRect **rects;
-    int64_t pts;    ///< Same as packet pts, in AV_TIME_BASE
-} AVSubtitle;
-
-/**
- * If c is NULL, returns the first registered codec,
- * if c is non-NULL, returns the next registered codec after c,
- * or NULL if c is the last one.
- */
-AVCodec *av_codec_next(const AVCodec *c);
-
-/**
- * Return the LIBAVCODEC_VERSION_INT constant.
- */
-unsigned avcodec_version(void);
-
-/**
- * Return the libavcodec build-time configuration.
- */
-const char *avcodec_configuration(void);
-
-/**
- * Return the libavcodec license.
- */
-const char *avcodec_license(void);
-
-/**
- * Register the codec codec and initialize libavcodec.
- *
- * @warning either this function or avcodec_register_all() must be called
- * before any other libavcodec functions.
- *
- * @see avcodec_register_all()
- */
-void avcodec_register(AVCodec *codec);
-
-/**
- * Register all the codecs, parsers and bitstream filters which were enabled at
- * configuration time. If you do not call this function you can select exactly
- * which formats you want to support, by using the individual registration
- * functions.
- *
- * @see avcodec_register
- * @see av_register_codec_parser
- * @see av_register_bitstream_filter
- */
-void avcodec_register_all(void);
-
-/**
- * Allocate an AVCodecContext and set its fields to default values.  The
- * resulting struct can be deallocated by calling avcodec_close() on it followed
- * by av_free().
- *
- * @param codec if non-NULL, allocate private data and initialize defaults
- *              for the given codec. It is illegal to then call avcodec_open2()
- *              with a different codec.
- *              If NULL, then the codec-specific defaults won't be initialized,
- *              which may result in suboptimal default settings (this is
- *              important mainly for encoders, e.g. libx264).
- *
- * @return An AVCodecContext filled with default values or NULL on failure.
- * @see avcodec_get_context_defaults
- */
-AVCodecContext *avcodec_alloc_context3(const AVCodec *codec);
-
-/**
- * Set the fields of the given AVCodecContext to default values corresponding
- * to the given codec (defaults may be codec-dependent).
- *
- * Do not call this function if a non-NULL codec has been passed
- * to avcodec_alloc_context3() that allocated this AVCodecContext.
- * If codec is non-NULL, it is illegal to call avcodec_open2() with a
- * different codec on this AVCodecContext.
- */
-int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec);
-
-/**
- * Get the AVClass for AVCodecContext. It can be used in combination with
- * AV_OPT_SEARCH_FAKE_OBJ for examining options.
- *
- * @see av_opt_find().
- */
-const AVClass *avcodec_get_class(void);
-
-/**
- * Copy the settings of the source AVCodecContext into the destination
- * AVCodecContext. The resulting destination codec context will be
- * unopened, i.e. you are required to call avcodec_open2() before you
- * can use this AVCodecContext to decode/encode video/audio data.
- *
- * @param dest target codec context, should be initialized with
- *             avcodec_alloc_context3(), but otherwise uninitialized
- * @param src source codec context
- * @return AVERROR() on error (e.g. memory allocation error), 0 on success
- */
-int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src);
-
-#if FF_API_AVFRAME_LAVC
-/**
- * @deprecated use av_frame_alloc()
- */
-attribute_deprecated
-AVFrame *avcodec_alloc_frame(void);
-
-/**
- * Set the fields of the given AVFrame to default values.
- *
- * @param frame The AVFrame of which the fields should be set to default values.
- *
- * @deprecated use av_frame_unref()
- */
-attribute_deprecated
-void avcodec_get_frame_defaults(AVFrame *frame);
-
-/**
- * Free the frame and any dynamically allocated objects in it,
- * e.g. extended_data.
- *
- * @param frame frame to be freed. The pointer will be set to NULL.
- *
- * @warning this function does NOT free the data buffers themselves
- * (it does not know how, since they might have been allocated with
- *  a custom get_buffer()).
- *
- * @deprecated use av_frame_free()
- */
-attribute_deprecated
-void avcodec_free_frame(AVFrame **frame);
-#endif
-
-/**
- * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
- * function the context has to be allocated with avcodec_alloc_context3().
- *
- * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(),
- * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for
- * retrieving a codec.
- *
- * @warning This function is not thread safe!
- *
- * @code
- * avcodec_register_all();
- * av_dict_set(&opts, "b", "2.5M", 0);
- * codec = avcodec_find_decoder(AV_CODEC_ID_H264);
- * if (!codec)
- *     exit(1);
- *
- * context = avcodec_alloc_context3(codec);
- *
- * if (avcodec_open2(context, codec, opts) < 0)
- *     exit(1);
- * @endcode
- *
- * @param avctx The context to initialize.
- * @param codec The codec to open this context for. If a non-NULL codec has been
- *              previously passed to avcodec_alloc_context3() or
- *              avcodec_get_context_defaults3() for this context, then this
- *              parameter MUST be either NULL or equal to the previously passed
- *              codec.
- * @param options A dictionary filled with AVCodecContext and codec-private options.
- *                On return this object will be filled with options that were not found.
- *
- * @return zero on success, a negative value on error
- * @see avcodec_alloc_context3(), avcodec_find_decoder(), avcodec_find_encoder(),
- *      av_dict_set(), av_opt_find().
- */
-int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options);
-
-/**
- * Close a given AVCodecContext and free all the data associated with it
- * (but not the AVCodecContext itself).
- *
- * Calling this function on an AVCodecContext that hasn't been opened will free
- * the codec-specific data allocated in avcodec_alloc_context3() /
- * avcodec_get_context_defaults3() with a non-NULL codec. Subsequent calls will
- * do nothing.
- */
-int avcodec_close(AVCodecContext *avctx);
-
-/**
- * Free all allocated data in the given subtitle struct.
- *
- * @param sub AVSubtitle to free.
- */
-void avsubtitle_free(AVSubtitle *sub);
-
-/**
- * @}
- */
-
-/**
- * @addtogroup lavc_packet
- * @{
- */
-
-#if FF_API_DESTRUCT_PACKET
-/**
- * Default packet destructor.
- * @deprecated use the AVBuffer API instead
- */
-attribute_deprecated
-void av_destruct_packet(AVPacket *pkt);
-#endif
-
-/**
- * Initialize optional fields of a packet with default values.
- *
- * Note, this does not touch the data and size members, which have to be
- * initialized separately.
- *
- * @param pkt packet
- */
-void av_init_packet(AVPacket *pkt);
-
-/**
- * Allocate the payload of a packet and initialize its fields with
- * default values.
- *
- * @param pkt packet
- * @param size wanted payload size
- * @return 0 if OK, AVERROR_xxx otherwise
- */
-int av_new_packet(AVPacket *pkt, int size);
-
-/**
- * Reduce packet size, correctly zeroing padding
- *
- * @param pkt packet
- * @param size new size
- */
-void av_shrink_packet(AVPacket *pkt, int size);
-
-/**
- * Increase packet size, correctly zeroing padding
- *
- * @param pkt packet
- * @param grow_by number of bytes by which to increase the size of the packet
- */
-int av_grow_packet(AVPacket *pkt, int grow_by);
-
-/**
- * Initialize a reference-counted packet from av_malloc()ed data.
- *
- * @param pkt packet to be initialized. This function will set the data, size,
- *        buf and destruct fields, all others are left untouched.
- * @param data Data allocated by av_malloc() to be used as packet data. If this
- *        function returns successfully, the data is owned by the underlying AVBuffer.
- *        The caller may not access the data through other means.
- * @param size size of data in bytes, without the padding. I.e. the full buffer
- *        size is assumed to be size + FF_INPUT_BUFFER_PADDING_SIZE.
- *
- * @return 0 on success, a negative AVERROR on error
- */
-int av_packet_from_data(AVPacket *pkt, uint8_t *data, int size);
-
-/**
- * @warning This is a hack - the packet memory allocation stuff is broken. The
- * packet is allocated if it was not really allocated.
- */
-int av_dup_packet(AVPacket *pkt);
-
-/**
- * Free a packet.
- *
- * @param pkt packet to free
- */
-void av_free_packet(AVPacket *pkt);
-
-/**
- * Allocate new information of a packet.
- *
- * @param pkt packet
- * @param type side information type
- * @param size side information size
- * @return pointer to fresh allocated data or NULL otherwise
- */
-uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
-                                 int size);
-
-/**
- * Shrink the already allocated side data buffer
- *
- * @param pkt packet
- * @param type side information type
- * @param size new side information size
- * @return 0 on success, < 0 on failure
- */
-int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
-                               int size);
-
-/**
- * Get side information from packet.
- *
- * @param pkt packet
- * @param type desired side information type
- * @param size pointer for side information size to store (optional)
- * @return pointer to data if present or NULL otherwise
- */
-uint8_t* av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
-                                 int *size);
-
-/**
- * Convenience function to free all the side data stored.
- * All the other fields stay untouched.
- *
- * @param pkt packet
- */
-void av_packet_free_side_data(AVPacket *pkt);
-
-/**
- * Setup a new reference to the data described by a given packet
- *
- * If src is reference-counted, setup dst as a new reference to the
- * buffer in src. Otherwise allocate a new buffer in dst and copy the
- * data from src into it.
- *
- * All the other fields are copied from src.
- *
- * @see av_packet_unref
- *
- * @param dst Destination packet
- * @param src Source packet
- *
- * @return 0 on success, a negative AVERROR on error.
- */
-int av_packet_ref(AVPacket *dst, AVPacket *src);
-
-/**
- * Wipe the packet.
- *
- * Unreference the buffer referenced by the packet and reset the
- * remaining packet fields to their default values.
- *
- * @param pkt The packet to be unreferenced.
- */
-void av_packet_unref(AVPacket *pkt);
-
-/**
- * Move every field in src to dst and reset src.
- *
- * @see av_packet_unref
- *
- * @param src Source packet, will be reset
- * @param dst Destination packet
- */
-void av_packet_move_ref(AVPacket *dst, AVPacket *src);
-
-/**
- * Copy only "properties" fields from src to dst.
- *
- * Properties for the purpose of this function are all the fields
- * beside those related to the packet data (buf, data, size)
- *
- * @param dst Destination packet
- * @param src Source packet
- *
- * @return 0 on success AVERROR on failure.
- *
- */
-int av_packet_copy_props(AVPacket *dst, const AVPacket *src);
-
-/**
- * @}
- */
-
-/**
- * @addtogroup lavc_decoding
- * @{
- */
-
-/**
- * Find a registered decoder with a matching codec ID.
- *
- * @param id AVCodecID of the requested decoder
- * @return A decoder if one was found, NULL otherwise.
- */
-AVCodec *avcodec_find_decoder(enum AVCodecID id);
-
-/**
- * Find a registered decoder with the specified name.
- *
- * @param name name of the requested decoder
- * @return A decoder if one was found, NULL otherwise.
- */
-AVCodec *avcodec_find_decoder_by_name(const char *name);
-
-#if FF_API_GET_BUFFER
-attribute_deprecated int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic);
-attribute_deprecated void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic);
-attribute_deprecated int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic);
-#endif
-
-/**
- * The default callback for AVCodecContext.get_buffer2(). It is made public so
- * it can be called by custom get_buffer2() implementations for decoders without
- * CODEC_CAP_DR1 set.
- */
-int avcodec_default_get_buffer2(AVCodecContext *s, AVFrame *frame, int flags);
-
-#if FF_API_EMU_EDGE
-/**
- * Return the amount of padding in pixels which the get_buffer callback must
- * provide around the edge of the image for codecs which do not have the
- * CODEC_FLAG_EMU_EDGE flag.
- *
- * @return Required padding in pixels.
- *
- * @deprecated CODEC_FLAG_EMU_EDGE is deprecated, so this function is no longer
- * needed
- */
-attribute_deprecated
-unsigned avcodec_get_edge_width(void);
-#endif
-
-/**
- * Modify width and height values so that they will result in a memory
- * buffer that is acceptable for the codec if you do not use any horizontal
- * padding.
- *
- * May only be used if a codec with CODEC_CAP_DR1 has been opened.
- */
-void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height);
-
-/**
- * Modify width and height values so that they will result in a memory
- * buffer that is acceptable for the codec if you also ensure that all
- * line sizes are a multiple of the respective linesize_align[i].
- *
- * May only be used if a codec with CODEC_CAP_DR1 has been opened.
- */
-void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
-                               int linesize_align[AV_NUM_DATA_POINTERS]);
-
-/**
- * Decode the audio frame of size avpkt->size from avpkt->data into frame.
- *
- * Some decoders may support multiple frames in a single AVPacket. Such
- * decoders would then just decode the first frame and the return value would be
- * less than the packet size. In this case, avcodec_decode_audio4 has to be
- * called again with an AVPacket containing the remaining data in order to
- * decode the second frame, etc...  Even if no frames are returned, the packet
- * needs to be fed to the decoder with remaining data until it is completely
- * consumed or an error occurs.
- *
- * Some decoders (those marked with CODEC_CAP_DELAY) have a delay between input
- * and output. This means that for some packets they will not immediately
- * produce decoded output and need to be flushed at the end of decoding to get
- * all the decoded data. Flushing is done by calling this function with packets
- * with avpkt->data set to NULL and avpkt->size set to 0 until it stops
- * returning samples. It is safe to flush even those decoders that are not
- * marked with CODEC_CAP_DELAY, then no samples will be returned.
- *
- * @warning The input buffer, avpkt->data must be FF_INPUT_BUFFER_PADDING_SIZE
- *          larger than the actual read bytes because some optimized bitstream
- *          readers read 32 or 64 bits at once and could read over the end.
- *
- * @param      avctx the codec context
- * @param[out] frame The AVFrame in which to store decoded audio samples.
- *                   The decoder will allocate a buffer for the decoded frame by
- *                   calling the AVCodecContext.get_buffer2() callback.
- *                   When AVCodecContext.refcounted_frames is set to 1, the frame is
- *                   reference counted and the returned reference belongs to the
- *                   caller. The caller must release the frame using av_frame_unref()
- *                   when the frame is no longer needed. The caller may safely write
- *                   to the frame if av_frame_is_writable() returns 1.
- *                   When AVCodecContext.refcounted_frames is set to 0, the returned
- *                   reference belongs to the decoder and is valid only until the
- *                   next call to this function or until closing or flushing the
- *                   decoder. The caller may not write to it.
- * @param[out] got_frame_ptr Zero if no frame could be decoded, otherwise it is
- *                           non-zero. Note that this field being set to zero
- *                           does not mean that an error has occurred. For
- *                           decoders with CODEC_CAP_DELAY set, no given decode
- *                           call is guaranteed to produce a frame.
- * @param[in]  avpkt The input AVPacket containing the input buffer.
- *                   At least avpkt->data and avpkt->size should be set. Some
- *                   decoders might also require additional fields to be set.
- * @return A negative error code is returned if an error occurred during
- *         decoding, otherwise the number of bytes consumed from the input
- *         AVPacket is returned.
- */
-int avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame,
-                          int *got_frame_ptr, AVPacket *avpkt);
-
-/**
- * Decode the video frame of size avpkt->size from avpkt->data into picture.
- * Some decoders may support multiple frames in a single AVPacket, such
- * decoders would then just decode the first frame.
- *
- * @warning The input buffer must be FF_INPUT_BUFFER_PADDING_SIZE larger than
- * the actual read bytes because some optimized bitstream readers read 32 or 64
- * bits at once and could read over the end.
- *
- * @warning The end of the input buffer buf should be set to 0 to ensure that
- * no overreading happens for damaged MPEG streams.
- *
- * @note Codecs which have the CODEC_CAP_DELAY capability set have a delay
- * between input and output, these need to be fed with avpkt->data=NULL,
- * avpkt->size=0 at the end to return the remaining frames.
- *
- * @param avctx the codec context
- * @param[out] picture The AVFrame in which the decoded video frame will be stored.
- *             Use av_frame_alloc() to get an AVFrame. The codec will
- *             allocate memory for the actual bitmap by calling the
- *             AVCodecContext.get_buffer2() callback.
- *             When AVCodecContext.refcounted_frames is set to 1, the frame is
- *             reference counted and the returned reference belongs to the
- *             caller. The caller must release the frame using av_frame_unref()
- *             when the frame is no longer needed. The caller may safely write
- *             to the frame if av_frame_is_writable() returns 1.
- *             When AVCodecContext.refcounted_frames is set to 0, the returned
- *             reference belongs to the decoder and is valid only until the
- *             next call to this function or until closing or flushing the
- *             decoder. The caller may not write to it.
- *
- * @param[in] avpkt The input AVpacket containing the input buffer.
- *            You can create such packet with av_init_packet() and by then setting
- *            data and size, some decoders might in addition need other fields like
- *            flags&AV_PKT_FLAG_KEY. All decoders are designed to use the least
- *            fields possible.
- * @param[in,out] got_picture_ptr Zero if no frame could be decompressed, otherwise, it is nonzero.
- * @return On error a negative value is returned, otherwise the number of bytes
- * used or zero if no frame could be decompressed.
- */
-int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
-                         int *got_picture_ptr,
-                         AVPacket *avpkt);
-
-/**
- * Decode a subtitle message.
- * Return a negative value on error, otherwise return the number of bytes used.
- * If no subtitle could be decompressed, got_sub_ptr is zero.
- * Otherwise, the subtitle is stored in *sub.
- * Note that CODEC_CAP_DR1 is not available for subtitle codecs. This is for
- * simplicity, because the performance difference is expect to be negligible
- * and reusing a get_buffer written for video codecs would probably perform badly
- * due to a potentially very different allocation pattern.
- *
- * @param avctx the codec context
- * @param[out] sub The AVSubtitle in which the decoded subtitle will be stored, must be
-                   freed with avsubtitle_free if *got_sub_ptr is set.
- * @param[in,out] got_sub_ptr Zero if no subtitle could be decompressed, otherwise, it is nonzero.
- * @param[in] avpkt The input AVPacket containing the input buffer.
- */
-int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
-                            int *got_sub_ptr,
-                            AVPacket *avpkt);
-
-/**
- * @defgroup lavc_parsing Frame parsing
- * @{
- */
-
-enum AVPictureStructure {
-    AV_PICTURE_STRUCTURE_UNKNOWN,      //< unknown
-    AV_PICTURE_STRUCTURE_TOP_FIELD,    //< coded as top field
-    AV_PICTURE_STRUCTURE_BOTTOM_FIELD, //< coded as bottom field
-    AV_PICTURE_STRUCTURE_FRAME,        //< coded as frame
-};
-
-typedef struct AVCodecParserContext {
-    void *priv_data;
-    struct AVCodecParser *parser;
-    int64_t frame_offset; /* offset of the current frame */
-    int64_t cur_offset; /* current offset
-                           (incremented by each av_parser_parse()) */
-    int64_t next_frame_offset; /* offset of the next frame */
-    /* video info */
-    int pict_type; /* XXX: Put it back in AVCodecContext. */
-    /**
-     * This field is used for proper frame duration computation in lavf.
-     * It signals, how much longer the frame duration of the current frame
-     * is compared to normal frame duration.
-     *
-     * frame_duration = (1 + repeat_pict) * time_base
-     *
-     * It is used by codecs like H.264 to display telecined material.
-     */
-    int repeat_pict; /* XXX: Put it back in AVCodecContext. */
-    int64_t pts;     /* pts of the current frame */
-    int64_t dts;     /* dts of the current frame */
-
-    /* private data */
-    int64_t last_pts;
-    int64_t last_dts;
-    int fetch_timestamp;
-
-#define AV_PARSER_PTS_NB 4
-    int cur_frame_start_index;
-    int64_t cur_frame_offset[AV_PARSER_PTS_NB];
-    int64_t cur_frame_pts[AV_PARSER_PTS_NB];
-    int64_t cur_frame_dts[AV_PARSER_PTS_NB];
-
-    int flags;
-#define PARSER_FLAG_COMPLETE_FRAMES           0x0001
-#define PARSER_FLAG_ONCE                      0x0002
-/// Set if the parser has a valid file offset
-#define PARSER_FLAG_FETCHED_OFFSET            0x0004
-
-    int64_t offset;      ///< byte offset from starting packet start
-    int64_t cur_frame_end[AV_PARSER_PTS_NB];
-
-    /**
-     * Set by parser to 1 for key frames and 0 for non-key frames.
-     * It is initialized to -1, so if the parser doesn't set this flag,
-     * old-style fallback using AV_PICTURE_TYPE_I picture type as key frames
-     * will be used.
-     */
-    int key_frame;
-
-    /**
-     * Time difference in stream time base units from the pts of this
-     * packet to the point at which the output from the decoder has converged
-     * independent from the availability of previous frames. That is, the
-     * frames are virtually identical no matter if decoding started from
-     * the very first frame or from this keyframe.
-     * Is AV_NOPTS_VALUE if unknown.
-     * This field is not the display duration of the current frame.
-     * This field has no meaning if the packet does not have AV_PKT_FLAG_KEY
-     * set.
-     *
-     * The purpose of this field is to allow seeking in streams that have no
-     * keyframes in the conventional sense. It corresponds to the
-     * recovery point SEI in H.264 and match_time_delta in NUT. It is also
-     * essential for some types of subtitle streams to ensure that all
-     * subtitles are correctly displayed after seeking.
-     */
-    int64_t convergence_duration;
-
-    // Timestamp generation support:
-    /**
-     * Synchronization point for start of timestamp generation.
-     *
-     * Set to >0 for sync point, 0 for no sync point and <0 for undefined
-     * (default).
-     *
-     * For example, this corresponds to presence of H.264 buffering period
-     * SEI message.
-     */
-    int dts_sync_point;
-
-    /**
-     * Offset of the current timestamp against last timestamp sync point in
-     * units of AVCodecContext.time_base.
-     *
-     * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
-     * contain a valid timestamp offset.
-     *
-     * Note that the timestamp of sync point has usually a nonzero
-     * dts_ref_dts_delta, which refers to the previous sync point. Offset of
-     * the next frame after timestamp sync point will be usually 1.
-     *
-     * For example, this corresponds to H.264 cpb_removal_delay.
-     */
-    int dts_ref_dts_delta;
-
-    /**
-     * Presentation delay of current frame in units of AVCodecContext.time_base.
-     *
-     * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
-     * contain valid non-negative timestamp delta (presentation time of a frame
-     * must not lie in the past).
-     *
-     * This delay represents the difference between decoding and presentation
-     * time of the frame.
-     *
-     * For example, this corresponds to H.264 dpb_output_delay.
-     */
-    int pts_dts_delta;
-
-    /**
-     * Position of the packet in file.
-     *
-     * Analogous to cur_frame_pts/dts
-     */
-    int64_t cur_frame_pos[AV_PARSER_PTS_NB];
-
-    /**
-     * Byte position of currently parsed frame in stream.
-     */
-    int64_t pos;
-
-    /**
-     * Previous frame byte position.
-     */
-    int64_t last_pos;
-
-    /**
-     * Duration of the current frame.
-     * For audio, this is in units of 1 / AVCodecContext.sample_rate.
-     * For all other types, this is in units of AVCodecContext.time_base.
-     */
-    int duration;
-
-    enum AVFieldOrder field_order;
-
-    /**
-     * Indicate whether a picture is coded as a frame, top field or bottom field.
-     *
-     * For example, H.264 field_pic_flag equal to 0 corresponds to
-     * AV_PICTURE_STRUCTURE_FRAME. An H.264 picture with field_pic_flag
-     * equal to 1 and bottom_field_flag equal to 0 corresponds to
-     * AV_PICTURE_STRUCTURE_TOP_FIELD.
-     */
-    enum AVPictureStructure picture_structure;
-
-    /**
-     * Picture number incremented in presentation or output order.
-     * This field may be reinitialized at the first picture of a new sequence.
-     *
-     * For example, this corresponds to H.264 PicOrderCnt.
-     */
-    int output_picture_number;
-} AVCodecParserContext;
-
-typedef struct AVCodecParser {
-    int codec_ids[5]; /* several codec IDs are permitted */
-    int priv_data_size;
-    int (*parser_init)(AVCodecParserContext *s);
-    int (*parser_parse)(AVCodecParserContext *s,
-                        AVCodecContext *avctx,
-                        const uint8_t **poutbuf, int *poutbuf_size,
-                        const uint8_t *buf, int buf_size);
-    void (*parser_close)(AVCodecParserContext *s);
-    int (*split)(AVCodecContext *avctx, const uint8_t *buf, int buf_size);
-    struct AVCodecParser *next;
-} AVCodecParser;
-
-AVCodecParser *av_parser_next(AVCodecParser *c);
-
-void av_register_codec_parser(AVCodecParser *parser);
-AVCodecParserContext *av_parser_init(int codec_id);
-
-/**
- * Parse a packet.
- *
- * @param s             parser context.
- * @param avctx         codec context.
- * @param poutbuf       set to pointer to parsed buffer or NULL if not yet finished.
- * @param poutbuf_size  set to size of parsed buffer or zero if not yet finished.
- * @param buf           input buffer.
- * @param buf_size      input length, to signal EOF, this should be 0 (so that the last frame can be output).
- * @param pts           input presentation timestamp.
- * @param dts           input decoding timestamp.
- * @param pos           input byte position in stream.
- * @return the number of bytes of the input bitstream used.
- *
- * Example:
- * @code
- *   while(in_len){
- *       len = av_parser_parse2(myparser, AVCodecContext, &data, &size,
- *                                        in_data, in_len,
- *                                        pts, dts, pos);
- *       in_data += len;
- *       in_len  -= len;
- *
- *       if(size)
- *          decode_frame(data, size);
- *   }
- * @endcode
- */
-int av_parser_parse2(AVCodecParserContext *s,
-                     AVCodecContext *avctx,
-                     uint8_t **poutbuf, int *poutbuf_size,
-                     const uint8_t *buf, int buf_size,
-                     int64_t pts, int64_t dts,
-                     int64_t pos);
-
-/**
- * @return 0 if the output buffer is a subset of the input, 1 if it is allocated and must be freed
- * @deprecated use AVBitstreamFilter
- */
-int av_parser_change(AVCodecParserContext *s,
-                     AVCodecContext *avctx,
-                     uint8_t **poutbuf, int *poutbuf_size,
-                     const uint8_t *buf, int buf_size, int keyframe);
-void av_parser_close(AVCodecParserContext *s);
-
-/**
- * @}
- * @}
- */
-
-/**
- * @addtogroup lavc_encoding
- * @{
- */
-
-/**
- * Find a registered encoder with a matching codec ID.
- *
- * @param id AVCodecID of the requested encoder
- * @return An encoder if one was found, NULL otherwise.
- */
-AVCodec *avcodec_find_encoder(enum AVCodecID id);
-
-/**
- * Find a registered encoder with the specified name.
- *
- * @param name name of the requested encoder
- * @return An encoder if one was found, NULL otherwise.
- */
-AVCodec *avcodec_find_encoder_by_name(const char *name);
-
-/**
- * Encode a frame of audio.
- *
- * Takes input samples from frame and writes the next output packet, if
- * available, to avpkt. The output packet does not necessarily contain data for
- * the most recent frame, as encoders can delay, split, and combine input frames
- * internally as needed.
- *
- * @param avctx     codec context
- * @param avpkt     output AVPacket.
- *                  The user can supply an output buffer by setting
- *                  avpkt->data and avpkt->size prior to calling the
- *                  function, but if the size of the user-provided data is not
- *                  large enough, encoding will fail. All other AVPacket fields
- *                  will be reset by the encoder using av_init_packet(). If
- *                  avpkt->data is NULL, the encoder will allocate it.
- *                  The encoder will set avpkt->size to the size of the
- *                  output packet.
- *
- *                  If this function fails or produces no output, avpkt will be
- *                  freed using av_free_packet() (i.e. avpkt->destruct will be
- *                  called to free the user supplied buffer).
- * @param[in] frame AVFrame containing the raw audio data to be encoded.
- *                  May be NULL when flushing an encoder that has the
- *                  CODEC_CAP_DELAY capability set.
- *                  If CODEC_CAP_VARIABLE_FRAME_SIZE is set, then each frame
- *                  can have any number of samples.
- *                  If it is not set, frame->nb_samples must be equal to
- *                  avctx->frame_size for all frames except the last.
- *                  The final frame may be smaller than avctx->frame_size.
- * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the
- *                            output packet is non-empty, and to 0 if it is
- *                            empty. If the function returns an error, the
- *                            packet can be assumed to be invalid, and the
- *                            value of got_packet_ptr is undefined and should
- *                            not be used.
- * @return          0 on success, negative error code on failure
- */
-int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt,
-                          const AVFrame *frame, int *got_packet_ptr);
-
-/**
- * Encode a frame of video.
- *
- * Takes input raw video data from frame and writes the next output packet, if
- * available, to avpkt. The output packet does not necessarily contain data for
- * the most recent frame, as encoders can delay and reorder input frames
- * internally as needed.
- *
- * @param avctx     codec context
- * @param avpkt     output AVPacket.
- *                  The user can supply an output buffer by setting
- *                  avpkt->data and avpkt->size prior to calling the
- *                  function, but if the size of the user-provided data is not
- *                  large enough, encoding will fail. All other AVPacket fields
- *                  will be reset by the encoder using av_init_packet(). If
- *                  avpkt->data is NULL, the encoder will allocate it.
- *                  The encoder will set avpkt->size to the size of the
- *                  output packet. The returned data (if any) belongs to the
- *                  caller, he is responsible for freeing it.
- *
- *                  If this function fails or produces no output, avpkt will be
- *                  freed using av_free_packet() (i.e. avpkt->destruct will be
- *                  called to free the user supplied buffer).
- * @param[in] frame AVFrame containing the raw video data to be encoded.
- *                  May be NULL when flushing an encoder that has the
- *                  CODEC_CAP_DELAY capability set.
- * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the
- *                            output packet is non-empty, and to 0 if it is
- *                            empty. If the function returns an error, the
- *                            packet can be assumed to be invalid, and the
- *                            value of got_packet_ptr is undefined and should
- *                            not be used.
- * @return          0 on success, negative error code on failure
- */
-int avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt,
-                          const AVFrame *frame, int *got_packet_ptr);
-
-int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size,
-                            const AVSubtitle *sub);
-
-
-/**
- * @}
- */
-
-/**
- * @addtogroup lavc_picture
- * @{
- */
-
-/**
- * Allocate memory for a picture.  Call avpicture_free() to free it.
- *
- * @see avpicture_fill()
- *
- * @param picture the picture to be filled in
- * @param pix_fmt the format of the picture
- * @param width the width of the picture
- * @param height the height of the picture
- * @return zero if successful, a negative value if not
- */
-int avpicture_alloc(AVPicture *picture, enum AVPixelFormat pix_fmt, int width, int height);
-
-/**
- * Free a picture previously allocated by avpicture_alloc().
- * The data buffer used by the AVPicture is freed, but the AVPicture structure
- * itself is not.
- *
- * @param picture the AVPicture to be freed
- */
-void avpicture_free(AVPicture *picture);
-
-/**
- * Fill in the AVPicture fields.
- * The fields of the given AVPicture are filled in by using the 'ptr' address
- * which points to the image data buffer. Depending on the specified picture
- * format, one or multiple image data pointers and line sizes will be set.
- * If a planar format is specified, several pointers will be set pointing to
- * the different picture planes and the line sizes of the different planes
- * will be stored in the lines_sizes array.
- * Call with ptr == NULL to get the required size for the ptr buffer.
- *
- * To allocate the buffer and fill in the AVPicture fields in one call,
- * use avpicture_alloc().
- *
- * @param picture AVPicture whose fields are to be filled in
- * @param ptr Buffer which will contain or contains the actual image data
- * @param pix_fmt The format in which the picture data is stored.
- * @param width the width of the image in pixels
- * @param height the height of the image in pixels
- * @return size of the image data in bytes
- */
-int avpicture_fill(AVPicture *picture, uint8_t *ptr,
-                   enum AVPixelFormat pix_fmt, int width, int height);
-
-/**
- * Copy pixel data from an AVPicture into a buffer.
- * The data is stored compactly, without any gaps for alignment or padding
- * which may be applied by avpicture_fill().
- *
- * @see avpicture_get_size()
- *
- * @param[in] src AVPicture containing image data
- * @param[in] pix_fmt The format in which the picture data is stored.
- * @param[in] width the width of the image in pixels.
- * @param[in] height the height of the image in pixels.
- * @param[out] dest A buffer into which picture data will be copied.
- * @param[in] dest_size The size of 'dest'.
- * @return The number of bytes written to dest, or a negative value (error code) on error.
- */
-int avpicture_layout(const AVPicture* src, enum AVPixelFormat pix_fmt,
-                     int width, int height,
-                     unsigned char *dest, int dest_size);
-
-/**
- * Calculate the size in bytes that a picture of the given width and height
- * would occupy if stored in the given picture format.
- * Note that this returns the size of a compact representation as generated
- * by avpicture_layout(), which can be smaller than the size required for e.g.
- * avpicture_fill().
- *
- * @param pix_fmt the given picture format
- * @param width the width of the image
- * @param height the height of the image
- * @return Image data size in bytes or -1 on error (e.g. too large dimensions).
- */
-int avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height);
-
-#if FF_API_DEINTERLACE
-/**
- *  deinterlace - if not supported return -1
- *
- * @deprecated - use yadif (in libavfilter) instead
- */
-attribute_deprecated
-int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
-                          enum AVPixelFormat pix_fmt, int width, int height);
-#endif
-/**
- * Copy image src to dst. Wraps av_picture_data_copy() above.
- */
-void av_picture_copy(AVPicture *dst, const AVPicture *src,
-                     enum AVPixelFormat pix_fmt, int width, int height);
-
-/**
- * Crop image top and left side.
- */
-int av_picture_crop(AVPicture *dst, const AVPicture *src,
-                    enum AVPixelFormat pix_fmt, int top_band, int left_band);
-
-/**
- * Pad image.
- */
-int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, enum AVPixelFormat pix_fmt,
-            int padtop, int padbottom, int padleft, int padright, int *color);
-
-/**
- * @}
- */
-
-/**
- * @defgroup lavc_misc Utility functions
- * @ingroup libavc
- *
- * Miscellaneous utility functions related to both encoding and decoding
- * (or neither).
- * @{
- */
-
-/**
- * @defgroup lavc_misc_pixfmt Pixel formats
- *
- * Functions for working with pixel formats.
- * @{
- */
-
-/**
- * @deprecated Use av_pix_fmt_get_chroma_sub_sample
- */
-
-void attribute_deprecated avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift);
-
-/**
- * Return a value representing the fourCC code associated to the
- * pixel format pix_fmt, or 0 if no associated fourCC code can be
- * found.
- */
-unsigned int avcodec_pix_fmt_to_codec_tag(enum AVPixelFormat pix_fmt);
-
-#define FF_LOSS_RESOLUTION  0x0001 /**< loss due to resolution change */
-#define FF_LOSS_DEPTH       0x0002 /**< loss due to color depth change */
-#define FF_LOSS_COLORSPACE  0x0004 /**< loss due to color space conversion */
-#define FF_LOSS_ALPHA       0x0008 /**< loss of alpha bits */
-#define FF_LOSS_COLORQUANT  0x0010 /**< loss due to color quantization */
-#define FF_LOSS_CHROMA      0x0020 /**< loss of chroma (e.g. RGB to gray conversion) */
-
-/**
- * Compute what kind of losses will occur when converting from one specific
- * pixel format to another.
- * When converting from one pixel format to another, information loss may occur.
- * For example, when converting from RGB24 to GRAY, the color information will
- * be lost. Similarly, other losses occur when converting from some formats to
- * other formats. These losses can involve loss of chroma, but also loss of
- * resolution, loss of color depth, loss due to the color space conversion, loss
- * of the alpha bits or loss due to color quantization.
- * avcodec_get_fix_fmt_loss() informs you about the various types of losses
- * which will occur when converting from one pixel format to another.
- *
- * @param[in] dst_pix_fmt destination pixel format
- * @param[in] src_pix_fmt source pixel format
- * @param[in] has_alpha Whether the source pixel format alpha channel is used.
- * @return Combination of flags informing you what kind of losses will occur.
- */
-int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, enum AVPixelFormat src_pix_fmt,
-                             int has_alpha);
-
-/**
- * Find the best pixel format to convert to given a certain source pixel
- * format.  When converting from one pixel format to another, information loss
- * may occur.  For example, when converting from RGB24 to GRAY, the color
- * information will be lost. Similarly, other losses occur when converting from
- * some formats to other formats. avcodec_find_best_pix_fmt2() searches which of
- * the given pixel formats should be used to suffer the least amount of loss.
- * The pixel formats from which it chooses one, are determined by the
- * pix_fmt_list parameter.
- *
- *
- * @param[in] pix_fmt_list AV_PIX_FMT_NONE terminated array of pixel formats to choose from
- * @param[in] src_pix_fmt source pixel format
- * @param[in] has_alpha Whether the source pixel format alpha channel is used.
- * @param[out] loss_ptr Combination of flags informing you what kind of losses will occur.
- * @return The best pixel format to convert to or -1 if none was found.
- */
-enum AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat *pix_fmt_list,
-                                              enum AVPixelFormat src_pix_fmt,
-                                              int has_alpha, int *loss_ptr);
-
-enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum AVPixelFormat * fmt);
-
-/**
- * @}
- */
-
-#if FF_API_SET_DIMENSIONS
-/**
- * @deprecated this function is not supposed to be used from outside of lavc
- */
-attribute_deprecated
-void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
-#endif
-
-/**
- * Put a string representing the codec tag codec_tag in buf.
- *
- * @param buf       buffer to place codec tag in
- * @param buf_size size in bytes of buf
- * @param codec_tag codec tag to assign
- * @return the length of the string that would have been generated if
- * enough space had been available, excluding the trailing null
- */
-size_t av_get_codec_tag_string(char *buf, size_t buf_size, unsigned int codec_tag);
-
-void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode);
-
-/**
- * Return a name for the specified profile, if available.
- *
- * @param codec the codec that is searched for the given profile
- * @param profile the profile value for which a name is requested
- * @return A name for the profile if found, NULL otherwise.
- */
-const char *av_get_profile_name(const AVCodec *codec, int profile);
-
-int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size);
-int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count);
-//FIXME func typedef
-
-/**
- * Fill audio frame data and linesize.
- * AVFrame extended_data channel pointers are allocated if necessary for
- * planar audio.
- *
- * @param frame       the AVFrame
- *                    frame->nb_samples must be set prior to calling the
- *                    function. This function fills in frame->data,
- *                    frame->extended_data, frame->linesize[0].
- * @param nb_channels channel count
- * @param sample_fmt  sample format
- * @param buf         buffer to use for frame data
- * @param buf_size    size of buffer
- * @param align       plane size sample alignment (0 = default)
- * @return            0 on success, negative error code on failure
- */
-int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels,
-                             enum AVSampleFormat sample_fmt, const uint8_t *buf,
-                             int buf_size, int align);
-
-/**
- * Reset the internal decoder state / flush internal buffers. Should be called
- * e.g. when seeking or when switching to a different stream.
- *
- * @note when refcounted frames are not used (i.e. avctx->refcounted_frames is 0),
- * this invalidates the frames previously returned from the decoder. When
- * refcounted frames are used, the decoder just releases any references it might
- * keep internally, but the caller's reference remains valid.
- */
-void avcodec_flush_buffers(AVCodecContext *avctx);
-
-/**
- * Return codec bits per sample.
- *
- * @param[in] codec_id the codec
- * @return Number of bits per sample or zero if unknown for the given codec.
- */
-int av_get_bits_per_sample(enum AVCodecID codec_id);
-
-/**
- * Return codec bits per sample.
- * Only return non-zero if the bits per sample is exactly correct, not an
- * approximation.
- *
- * @param[in] codec_id the codec
- * @return Number of bits per sample or zero if unknown for the given codec.
- */
-int av_get_exact_bits_per_sample(enum AVCodecID codec_id);
-
-/**
- * Return audio frame duration.
- *
- * @param avctx        codec context
- * @param frame_bytes  size of the frame, or 0 if unknown
- * @return             frame duration, in samples, if known. 0 if not able to
- *                     determine.
- */
-int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes);
-
-
-typedef struct AVBitStreamFilterContext {
-    void *priv_data;
-    struct AVBitStreamFilter *filter;
-    AVCodecParserContext *parser;
-    struct AVBitStreamFilterContext *next;
-} AVBitStreamFilterContext;
-
-
-typedef struct AVBitStreamFilter {
-    const char *name;
-    int priv_data_size;
-    int (*filter)(AVBitStreamFilterContext *bsfc,
-                  AVCodecContext *avctx, const char *args,
-                  uint8_t **poutbuf, int *poutbuf_size,
-                  const uint8_t *buf, int buf_size, int keyframe);
-    void (*close)(AVBitStreamFilterContext *bsfc);
-    struct AVBitStreamFilter *next;
-} AVBitStreamFilter;
-
-void av_register_bitstream_filter(AVBitStreamFilter *bsf);
-AVBitStreamFilterContext *av_bitstream_filter_init(const char *name);
-int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc,
-                               AVCodecContext *avctx, const char *args,
-                               uint8_t **poutbuf, int *poutbuf_size,
-                               const uint8_t *buf, int buf_size, int keyframe);
-void av_bitstream_filter_close(AVBitStreamFilterContext *bsf);
-
-AVBitStreamFilter *av_bitstream_filter_next(AVBitStreamFilter *f);
-
-/* memory */
-
-/**
- * Allocate a buffer with padding, reusing the given one if large enough.
- *
- * Same behaviour av_fast_malloc but the buffer has additional
- * FF_INPUT_PADDING_SIZE at the end which will always memset to 0.
- *
- */
-void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size);
-
-/**
- * Encode extradata length to a buffer. Used by xiph codecs.
- *
- * @param s buffer to write to; must be at least (v/255+1) bytes long
- * @param v size of extradata in bytes
- * @return number of bytes written to the buffer.
- */
-unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
-
-#if FF_API_MISSING_SAMPLE
-/**
- * Log a generic warning message about a missing feature. This function is
- * intended to be used internally by Libav (libavcodec, libavformat, etc.)
- * only, and would normally not be used by applications.
- * @param[in] avc a pointer to an arbitrary struct of which the first field is
- * a pointer to an AVClass struct
- * @param[in] feature string containing the name of the missing feature
- * @param[in] want_sample indicates if samples are wanted which exhibit this feature.
- * If want_sample is non-zero, additional verbage will be added to the log
- * message which tells the user how to report samples to the development
- * mailing list.
- * @deprecated Use avpriv_report_missing_feature() instead.
- */
-attribute_deprecated
-void av_log_missing_feature(void *avc, const char *feature, int want_sample);
-
-/**
- * Log a generic warning message asking for a sample. This function is
- * intended to be used internally by Libav (libavcodec, libavformat, etc.)
- * only, and would normally not be used by applications.
- * @param[in] avc a pointer to an arbitrary struct of which the first field is
- * a pointer to an AVClass struct
- * @param[in] msg string containing an optional message, or NULL if no message
- * @deprecated Use avpriv_request_sample() instead.
- */
-attribute_deprecated
-void av_log_ask_for_sample(void *avc, const char *msg, ...) av_printf_format(2, 3);
-#endif /* FF_API_MISSING_SAMPLE */
-
-/**
- * Register the hardware accelerator hwaccel.
- */
-void av_register_hwaccel(AVHWAccel *hwaccel);
-
-/**
- * If hwaccel is NULL, returns the first registered hardware accelerator,
- * if hwaccel is non-NULL, returns the next registered hardware accelerator
- * after hwaccel, or NULL if hwaccel is the last one.
- */
-AVHWAccel *av_hwaccel_next(AVHWAccel *hwaccel);
-
-
-/**
- * Lock operation used by lockmgr
- */
-enum AVLockOp {
-  AV_LOCK_CREATE,  ///< Create a mutex
-  AV_LOCK_OBTAIN,  ///< Lock the mutex
-  AV_LOCK_RELEASE, ///< Unlock the mutex
-  AV_LOCK_DESTROY, ///< Free mutex resources
-};
-
-/**
- * Register a user provided lock manager supporting the operations
- * specified by AVLockOp. mutex points to a (void *) where the
- * lockmgr should store/get a pointer to a user allocated mutex. It's
- * NULL upon AV_LOCK_CREATE and != NULL for all other ops.
- *
- * @param cb User defined callback. Note: Libav may invoke calls to this
- *           callback during the call to av_lockmgr_register().
- *           Thus, the application must be prepared to handle that.
- *           If cb is set to NULL the lockmgr will be unregistered.
- *           Also note that during unregistration the previously registered
- *           lockmgr callback may also be invoked.
- */
-int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op));
-
-/**
- * Get the type of the given codec.
- */
-enum AVMediaType avcodec_get_type(enum AVCodecID codec_id);
-
-/**
- * @return a positive value if s is open (i.e. avcodec_open2() was called on it
- * with no corresponding avcodec_close()), 0 otherwise.
- */
-int avcodec_is_open(AVCodecContext *s);
-
-/**
- * @return a non-zero number if codec is an encoder, zero otherwise
- */
-int av_codec_is_encoder(const AVCodec *codec);
-
-/**
- * @return a non-zero number if codec is a decoder, zero otherwise
- */
-int av_codec_is_decoder(const AVCodec *codec);
-
-/**
- * @return descriptor for given codec ID or NULL if no descriptor exists.
- */
-const AVCodecDescriptor *avcodec_descriptor_get(enum AVCodecID id);
-
-/**
- * Iterate over all codec descriptors known to libavcodec.
- *
- * @param prev previous descriptor. NULL to get the first descriptor.
- *
- * @return next descriptor or NULL after the last descriptor
- */
-const AVCodecDescriptor *avcodec_descriptor_next(const AVCodecDescriptor *prev);
-
-/**
- * @return codec descriptor with the given name or NULL if no such descriptor
- *         exists.
- */
-const AVCodecDescriptor *avcodec_descriptor_get_by_name(const char *name);
-
-/**
- * @}
- */
-
-#endif /* AVCODEC_AVCODEC_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/avfft.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/avfft.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/avfft.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/avfft.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,118 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_AVFFT_H
-#define AVCODEC_AVFFT_H
-
-/**
- * @file
- * @ingroup lavc_fft
- * FFT functions
- */
-
-/**
- * @defgroup lavc_fft FFT functions
- * @ingroup lavc_misc
- *
- * @{
- */
-
-typedef float FFTSample;
-
-typedef struct FFTComplex {
-    FFTSample re, im;
-} FFTComplex;
-
-typedef struct FFTContext FFTContext;
-
-/**
- * Set up a complex FFT.
- * @param nbits           log2 of the length of the input array
- * @param inverse         if 0 perform the forward transform, if 1 perform the inverse
- */
-FFTContext *av_fft_init(int nbits, int inverse);
-
-/**
- * Do the permutation needed BEFORE calling ff_fft_calc().
- */
-void av_fft_permute(FFTContext *s, FFTComplex *z);
-
-/**
- * Do a complex FFT with the parameters defined in av_fft_init(). The
- * input data must be permuted before. No 1.0/sqrt(n) normalization is done.
- */
-void av_fft_calc(FFTContext *s, FFTComplex *z);
-
-void av_fft_end(FFTContext *s);
-
-FFTContext *av_mdct_init(int nbits, int inverse, double scale);
-void av_imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input);
-void av_imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input);
-void av_mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input);
-void av_mdct_end(FFTContext *s);
-
-/* Real Discrete Fourier Transform */
-
-enum RDFTransformType {
-    DFT_R2C,
-    IDFT_C2R,
-    IDFT_R2C,
-    DFT_C2R,
-};
-
-typedef struct RDFTContext RDFTContext;
-
-/**
- * Set up a real FFT.
- * @param nbits           log2 of the length of the input array
- * @param trans           the type of transform
- */
-RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans);
-void av_rdft_calc(RDFTContext *s, FFTSample *data);
-void av_rdft_end(RDFTContext *s);
-
-/* Discrete Cosine Transform */
-
-typedef struct DCTContext DCTContext;
-
-enum DCTTransformType {
-    DCT_II = 0,
-    DCT_III,
-    DCT_I,
-    DST_I,
-};
-
-/**
- * Set up DCT.
- *
- * @param nbits           size of the input array:
- *                        (1 << nbits)     for DCT-II, DCT-III and DST-I
- *                        (1 << nbits) + 1 for DCT-I
- * @param type            the type of transform
- *
- * @note the first element of the input of DST-I is ignored
- */
-DCTContext *av_dct_init(int nbits, enum DCTTransformType type);
-void av_dct_calc(DCTContext *s, FFTSample *data);
-void av_dct_end (DCTContext *s);
-
-/**
- * @}
- */
-
-#endif /* AVCODEC_AVFFT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/dxva2.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/dxva2.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/dxva2.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/dxva2.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-/*
- * DXVA2 HW acceleration
- *
- * copyright (c) 2009 Laurent Aimar
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_DXVA_H
-#define AVCODEC_DXVA_H
-
-/**
- * @file
- * @ingroup lavc_codec_hwaccel_dxva2
- * Public libavcodec DXVA2 header.
- */
-
-#define _WIN32_WINNT 0x0600
-#include <stdint.h>
-#include <d3d9.h>
-#include <dxva2api.h>
-
-/**
- * @defgroup lavc_codec_hwaccel_dxva2 DXVA2
- * @ingroup lavc_codec_hwaccel
- *
- * @{
- */
-
-#define FF_DXVA2_WORKAROUND_SCALING_LIST_ZIGZAG 1 ///< Work around for DXVA2 and old UVD/UVD+ ATI video cards
-
-/**
- * This structure is used to provides the necessary configurations and data
- * to the DXVA2 Libav HWAccel implementation.
- *
- * The application must make it available as AVCodecContext.hwaccel_context.
- */
-struct dxva_context {
-    /**
-     * DXVA2 decoder object
-     */
-    IDirectXVideoDecoder *decoder;
-
-    /**
-     * DXVA2 configuration used to create the decoder
-     */
-    const DXVA2_ConfigPictureDecode *cfg;
-
-    /**
-     * The number of surface in the surface array
-     */
-    unsigned surface_count;
-
-    /**
-     * The array of Direct3D surfaces used to create the decoder
-     */
-    LPDIRECT3DSURFACE9 *surface;
-
-    /**
-     * A bit field configuring the workarounds needed for using the decoder
-     */
-    uint64_t workaround;
-
-    /**
-     * Private to the Libav AVHWAccel implementation
-     */
-    unsigned report_id;
-};
-
-/**
- * @}
- */
-
-#endif /* AVCODEC_DXVA_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/vaapi.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/vaapi.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/vaapi.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/vaapi.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,173 +0,0 @@
-/*
- * Video Acceleration API (shared data between Libav and the video player)
- * HW decode acceleration for MPEG-2, MPEG-4, H.264 and VC-1
- *
- * Copyright (C) 2008-2009 Splitted-Desktop Systems
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VAAPI_H
-#define AVCODEC_VAAPI_H
-
-/**
- * @file
- * @ingroup lavc_codec_hwaccel_vaapi
- * Public libavcodec VA API header.
- */
-
-#include <stdint.h>
-
-/**
- * @defgroup lavc_codec_hwaccel_vaapi VA API Decoding
- * @ingroup lavc_codec_hwaccel
- * @{
- */
-
-/**
- * This structure is used to share data between the Libav library and
- * the client video application.
- * This shall be zero-allocated and available as
- * AVCodecContext.hwaccel_context. All user members can be set once
- * during initialization or through each AVCodecContext.get_buffer()
- * function call. In any case, they must be valid prior to calling
- * decoding functions.
- */
-struct vaapi_context {
-    /**
-     * Window system dependent data
-     *
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    void *display;
-
-    /**
-     * Configuration ID
-     *
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    uint32_t config_id;
-
-    /**
-     * Context ID (video decode pipeline)
-     *
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    uint32_t context_id;
-
-    /**
-     * VAPictureParameterBuffer ID
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t pic_param_buf_id;
-
-    /**
-     * VAIQMatrixBuffer ID
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t iq_matrix_buf_id;
-
-    /**
-     * VABitPlaneBuffer ID (for VC-1 decoding)
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t bitplane_buf_id;
-
-    /**
-     * Slice parameter/data buffer IDs
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t *slice_buf_ids;
-
-    /**
-     * Number of effective slice buffer IDs to send to the HW
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int n_slice_buf_ids;
-
-    /**
-     * Size of pre-allocated slice_buf_ids
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int slice_buf_ids_alloc;
-
-    /**
-     * Pointer to VASliceParameterBuffers
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    void *slice_params;
-
-    /**
-     * Size of a VASliceParameterBuffer element
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int slice_param_size;
-
-    /**
-     * Size of pre-allocated slice_params
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int slice_params_alloc;
-
-    /**
-     * Number of slices currently filled in
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int slice_count;
-
-    /**
-     * Pointer to slice data buffer base
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    const uint8_t *slice_data;
-
-    /**
-     * Current size of slice data
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t slice_data_size;
-};
-
-/* @} */
-
-#endif /* AVCODEC_VAAPI_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/vda.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/vda.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/vda.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/vda.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,142 +0,0 @@
-/*
- * VDA HW acceleration
- *
- * copyright (c) 2011 Sebastien Zwickert
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VDA_H
-#define AVCODEC_VDA_H
-
-/**
- * @file
- * @ingroup lavc_codec_hwaccel_vda
- * Public libavcodec VDA header.
- */
-
-#include "libavcodec/version.h"
-
-#include <stdint.h>
-
-// emmintrin.h is unable to compile with -std=c99 -Werror=missing-prototypes
-// http://openradar.appspot.com/8026390
-#undef __GNUC_STDC_INLINE__
-
-#define Picture QuickdrawPicture
-#include <VideoDecodeAcceleration/VDADecoder.h>
-#undef Picture
-
-/**
- * @defgroup lavc_codec_hwaccel_vda VDA
- * @ingroup lavc_codec_hwaccel
- *
- * @{
- */
-
-/**
- * This structure is used to provide the necessary configurations and data
- * to the VDA Libav HWAccel implementation.
- *
- * The application must make it available as AVCodecContext.hwaccel_context.
- */
-struct vda_context {
-    /**
-     * VDA decoder object.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by libavcodec.
-     */
-    VDADecoder          decoder;
-
-    /**
-     * The Core Video pixel buffer that contains the current image data.
-     *
-     * encoding: unused
-     * decoding: Set by libavcodec. Unset by user.
-     */
-    CVPixelBufferRef    cv_buffer;
-
-    /**
-     * Use the hardware decoder in synchronous mode.
-     *
-     * encoding: unused
-     * decoding: Set by user.
-     */
-    int                 use_sync_decoding;
-
-    /**
-     * The frame width.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by user.
-     */
-    int                 width;
-
-    /**
-     * The frame height.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by user.
-     */
-    int                 height;
-
-    /**
-     * The frame format.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by user.
-     */
-    int                 format;
-
-    /**
-     * The pixel format for output image buffers.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by user.
-     */
-    OSType              cv_pix_fmt_type;
-
-    /**
-     * The current bitstream buffer.
-     */
-    uint8_t             *priv_bitstream;
-
-    /**
-     * The current size of the bitstream.
-     */
-    int                 priv_bitstream_size;
-
-    /**
-     * The reference size used for fast reallocation.
-     */
-    int                 priv_allocated_size;
-};
-
-/** Create the video decoder. */
-int ff_vda_create_decoder(struct vda_context *vda_ctx,
-                          uint8_t *extradata,
-                          int extradata_size);
-
-/** Destroy the video decoder. */
-int ff_vda_destroy_decoder(struct vda_context *vda_ctx);
-
-/**
- * @}
- */
-
-#endif /* AVCODEC_VDA_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/vdpau.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/vdpau.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/vdpau.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/vdpau.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,189 +0,0 @@
-/*
- * The Video Decode and Presentation API for UNIX (VDPAU) is used for
- * hardware-accelerated decoding of MPEG-1/2, H.264 and VC-1.
- *
- * Copyright (C) 2008 NVIDIA
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VDPAU_H
-#define AVCODEC_VDPAU_H
-
-/**
- * @file
- * @ingroup lavc_codec_hwaccel_vdpau
- * Public libavcodec VDPAU header.
- */
-
-
-/**
- * @defgroup lavc_codec_hwaccel_vdpau VDPAU Decoder and Renderer
- * @ingroup lavc_codec_hwaccel
- *
- * VDPAU hardware acceleration has two modules
- * - VDPAU decoding
- * - VDPAU presentation
- *
- * The VDPAU decoding module parses all headers using Libav
- * parsing mechanisms and uses VDPAU for the actual decoding.
- *
- * As per the current implementation, the actual decoding
- * and rendering (API calls) are done as part of the VDPAU
- * presentation (vo_vdpau.c) module.
- *
- * @{
- */
-
-#include <vdpau/vdpau.h>
-#include <vdpau/vdpau_x11.h>
-
-#include "libavutil/attributes.h"
-
-#include "avcodec.h"
-#include "version.h"
-
-#if FF_API_BUFS_VDPAU
-union AVVDPAUPictureInfo {
-    VdpPictureInfoH264        h264;
-    VdpPictureInfoMPEG1Or2    mpeg;
-    VdpPictureInfoVC1          vc1;
-    VdpPictureInfoMPEG4Part2 mpeg4;
-};
-#endif
-
-/**
- * This structure is used to share data between the libavcodec library and
- * the client video application.
- * The user shall zero-allocate the structure and make it available as
- * AVCodecContext.hwaccel_context. Members can be set by the user once
- * during initialization or through each AVCodecContext.get_buffer()
- * function call. In any case, they must be valid prior to calling
- * decoding functions.
- *
- * The size of this structure is not a part of the public ABI and must not
- * be used outside of libavcodec. Use av_vdpau_alloc_context() to allocate an
- * AVVDPAUContext.
- */
-typedef struct AVVDPAUContext {
-    /**
-     * VDPAU decoder handle
-     *
-     * Set by user.
-     */
-    VdpDecoder decoder;
-
-    /**
-     * VDPAU decoder render callback
-     *
-     * Set by the user.
-     */
-    VdpDecoderRender *render;
-
-#if FF_API_BUFS_VDPAU
-    /**
-     * VDPAU picture information
-     *
-     * Set by libavcodec.
-     */
-    attribute_deprecated
-    union AVVDPAUPictureInfo info;
-
-    /**
-     * Allocated size of the bitstream_buffers table.
-     *
-     * Set by libavcodec.
-     */
-    attribute_deprecated
-    int bitstream_buffers_allocated;
-
-    /**
-     * Useful bitstream buffers in the bitstream buffers table.
-     *
-     * Set by libavcodec.
-     */
-    attribute_deprecated
-    int bitstream_buffers_used;
-
-   /**
-     * Table of bitstream buffers.
-     * The user is responsible for freeing this buffer using av_freep().
-     *
-     * Set by libavcodec.
-     */
-    attribute_deprecated
-    VdpBitstreamBuffer *bitstream_buffers;
-#endif
-} AVVDPAUContext;
-
-/**
- * Allocate an AVVDPAUContext.
- *
- * @return Newly-allocated AVVDPAUContext or NULL on failure.
- */
-AVVDPAUContext *av_vdpau_alloc_context(void);
-
-/**
- * Get a decoder profile that should be used for initializing a VDPAU decoder.
- * Should be called from the AVCodecContext.get_format() callback.
- *
- * @param avctx the codec context being used for decoding the stream
- * @param profile a pointer into which the result will be written on success.
- *                The contents of profile are undefined if this function returns
- *                an error.
- *
- * @return 0 on success (non-negative), a negative AVERROR on failure.
- */
-int av_vdpau_get_profile(AVCodecContext *avctx, VdpDecoderProfile *profile);
-
-#if FF_API_CAP_VDPAU
-/** @brief The videoSurface is used for rendering. */
-#define FF_VDPAU_STATE_USED_FOR_RENDER 1
-
-/**
- * @brief The videoSurface is needed for reference/prediction.
- * The codec manipulates this.
- */
-#define FF_VDPAU_STATE_USED_FOR_REFERENCE 2
-
-/**
- * @brief This structure is used as a callback between the Libav
- * decoder (vd_) and presentation (vo_) module.
- * This is used for defining a video frame containing surface,
- * picture parameter, bitstream information etc which are passed
- * between the Libav decoder and its clients.
- */
-struct vdpau_render_state {
-    VdpVideoSurface surface; ///< Used as rendered surface, never changed.
-
-    int state; ///< Holds FF_VDPAU_STATE_* values.
-
-    /** picture parameter information for all supported codecs */
-    union AVVDPAUPictureInfo info;
-
-    /** Describe size/location of the compressed video data.
-        Set to 0 when freeing bitstream_buffers. */
-    int bitstream_buffers_allocated;
-    int bitstream_buffers_used;
-    /** The user is responsible for freeing this buffer using av_freep(). */
-    VdpBitstreamBuffer *bitstream_buffers;
-};
-#endif
-
-/* @}*/
-
-#endif /* AVCODEC_VDPAU_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/version.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/version.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/version.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/version.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,127 +0,0 @@
-/*
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VERSION_H
-#define AVCODEC_VERSION_H
-
-/**
- * @file
- * @ingroup libavc
- * Libavcodec version macros.
- */
-
-#include "libavutil/version.h"
-
-#define LIBAVCODEC_VERSION_MAJOR 55
-#define LIBAVCODEC_VERSION_MINOR 34
-#define LIBAVCODEC_VERSION_MICRO  1
-
-#define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
-                                               LIBAVCODEC_VERSION_MINOR, \
-                                               LIBAVCODEC_VERSION_MICRO)
-#define LIBAVCODEC_VERSION      AV_VERSION(LIBAVCODEC_VERSION_MAJOR,    \
-                                           LIBAVCODEC_VERSION_MINOR,    \
-                                           LIBAVCODEC_VERSION_MICRO)
-#define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
-
-#define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
-
-/**
- * FF_API_* defines may be placed below to indicate public API that will be
- * dropped at a future version bump. The defines themselves are not part of
- * the public API and may change, break or disappear at any time.
- */
-
-#ifndef FF_API_REQUEST_CHANNELS
-#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_DEINTERLACE
-#define FF_API_DEINTERLACE       (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_DESTRUCT_PACKET
-#define FF_API_DESTRUCT_PACKET   (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_GET_BUFFER
-#define FF_API_GET_BUFFER        (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_MISSING_SAMPLE
-#define FF_API_MISSING_SAMPLE    (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_LOWRES
-#define FF_API_LOWRES            (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_CAP_VDPAU
-#define FF_API_CAP_VDPAU         (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_BUFS_VDPAU
-#define FF_API_BUFS_VDPAU        (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_VOXWARE
-#define FF_API_VOXWARE           (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_SET_DIMENSIONS
-#define FF_API_SET_DIMENSIONS    (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_DEBUG_MV
-#define FF_API_DEBUG_MV          (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_AC_VLC
-#define FF_API_AC_VLC            (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_OLD_MSMPEG4
-#define FF_API_OLD_MSMPEG4       (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_ASPECT_EXTENDED
-#define FF_API_ASPECT_EXTENDED   (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_THREAD_OPAQUE
-#define FF_API_THREAD_OPAQUE     (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_CODEC_PKT
-#define FF_API_CODEC_PKT         (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_ARCH_ALPHA
-#define FF_API_ARCH_ALPHA        (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_XVMC
-#define FF_API_XVMC              (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_ERROR_RATE
-#define FF_API_ERROR_RATE        (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_QSCALE_TYPE
-#define FF_API_QSCALE_TYPE       (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_MB_TYPE
-#define FF_API_MB_TYPE           (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_MAX_BFRAMES
-#define FF_API_MAX_BFRAMES       (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_FAST_MALLOC
-#define FF_API_FAST_MALLOC       (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_NEG_LINESIZES
-#define FF_API_NEG_LINESIZES     (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_EMU_EDGE
-#define FF_API_EMU_EDGE          (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-
-#endif /* AVCODEC_VERSION_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/xvmc.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/xvmc.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/xvmc.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/xvmc.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,174 +0,0 @@
-/*
- * Copyright (C) 2003 Ivan Kalvachev
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_XVMC_H
-#define AVCODEC_XVMC_H
-
-/**
- * @file
- * @ingroup lavc_codec_hwaccel_xvmc
- * Public libavcodec XvMC header.
- */
-
-#include <X11/extensions/XvMC.h>
-
-#include "libavutil/attributes.h"
-#include "version.h"
-#include "avcodec.h"
-
-#if FF_API_XVMC
-
-/**
- * @defgroup lavc_codec_hwaccel_xvmc XvMC
- * @ingroup lavc_codec_hwaccel
- *
- * @{
- */
-
-#define AV_XVMC_ID                    0x1DC711C0  /**< special value to ensure that regular pixel routines haven't corrupted the struct
-                                                       the number is 1337 speak for the letters IDCT MCo (motion compensation) */
-
-attribute_deprecated struct xvmc_pix_fmt {
-    /** The field contains the special constant value AV_XVMC_ID.
-        It is used as a test that the application correctly uses the API,
-        and that there is no corruption caused by pixel routines.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             xvmc_id;
-
-    /** Pointer to the block array allocated by XvMCCreateBlocks().
-        The array has to be freed by XvMCDestroyBlocks().
-        Each group of 64 values represents one data block of differential
-        pixel information (in MoCo mode) or coefficients for IDCT.
-        - application - set the pointer during initialization
-        - libavcodec  - fills coefficients/pixel data into the array
-    */
-    short*          data_blocks;
-
-    /** Pointer to the macroblock description array allocated by
-        XvMCCreateMacroBlocks() and freed by XvMCDestroyMacroBlocks().
-        - application - set the pointer during initialization
-        - libavcodec  - fills description data into the array
-    */
-    XvMCMacroBlock* mv_blocks;
-
-    /** Number of macroblock descriptions that can be stored in the mv_blocks
-        array.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             allocated_mv_blocks;
-
-    /** Number of blocks that can be stored at once in the data_blocks array.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             allocated_data_blocks;
-
-    /** Indicate that the hardware would interpret data_blocks as IDCT
-        coefficients and perform IDCT on them.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             idct;
-
-    /** In MoCo mode it indicates that intra macroblocks are assumed to be in
-        unsigned format; same as the XVMC_INTRA_UNSIGNED flag.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             unsigned_intra;
-
-    /** Pointer to the surface allocated by XvMCCreateSurface().
-        It has to be freed by XvMCDestroySurface() on application exit.
-        It identifies the frame and its state on the video hardware.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    XvMCSurface*    p_surface;
-
-/** Set by the decoder before calling ff_draw_horiz_band(),
-    needed by the XvMCRenderSurface function. */
-//@{
-    /** Pointer to the surface used as past reference
-        - application - unchanged
-        - libavcodec  - set
-    */
-    XvMCSurface*    p_past_surface;
-
-    /** Pointer to the surface used as future reference
-        - application - unchanged
-        - libavcodec  - set
-    */
-    XvMCSurface*    p_future_surface;
-
-    /** top/bottom field or frame
-        - application - unchanged
-        - libavcodec  - set
-    */
-    unsigned int    picture_structure;
-
-    /** XVMC_SECOND_FIELD - 1st or 2nd field in the sequence
-        - application - unchanged
-        - libavcodec  - set
-    */
-    unsigned int    flags;
-//}@
-
-    /** Number of macroblock descriptions in the mv_blocks array
-        that have already been passed to the hardware.
-        - application - zeroes it on get_buffer().
-                        A successful ff_draw_horiz_band() may increment it
-                        with filled_mb_block_num or zero both.
-        - libavcodec  - unchanged
-    */
-    int             start_mv_blocks_num;
-
-    /** Number of new macroblock descriptions in the mv_blocks array (after
-        start_mv_blocks_num) that are filled by libavcodec and have to be
-        passed to the hardware.
-        - application - zeroes it on get_buffer() or after successful
-                        ff_draw_horiz_band().
-        - libavcodec  - increment with one of each stored MB
-    */
-    int             filled_mv_blocks_num;
-
-    /** Number of the next free data block; one data block consists of
-        64 short values in the data_blocks array.
-        All blocks before this one have already been claimed by placing their
-        position into the corresponding block description structure field,
-        that are part of the mv_blocks array.
-        - application - zeroes it on get_buffer().
-                        A successful ff_draw_horiz_band() may zero it together
-                        with start_mb_blocks_num.
-        - libavcodec  - each decoded macroblock increases it by the number
-                        of coded blocks it contains.
-    */
-    int             next_free_data_block_num;
-};
-
-/**
- * @}
- */
-
-#endif /* FF_API_XVMC */
-
-#endif /* AVCODEC_XVMC_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavformat/avformat.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavformat/avformat.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavformat/avformat.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavformat/avformat.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,1869 +0,0 @@
-/*
- * copyright (c) 2001 Fabrice Bellard
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVFORMAT_AVFORMAT_H
-#define AVFORMAT_AVFORMAT_H
-
-/**
- * @file
- * @ingroup libavf
- * Main libavformat public API header
- */
-
-/**
- * @defgroup libavf I/O and Muxing/Demuxing Library
- * @{
- *
- * Libavformat (lavf) is a library for dealing with various media container
- * formats. Its main two purposes are demuxing - i.e. splitting a media file
- * into component streams, and the reverse process of muxing - writing supplied
- * data in a specified container format. It also has an @ref lavf_io
- * "I/O module" which supports a number of protocols for accessing the data (e.g.
- * file, tcp, http and others). Before using lavf, you need to call
- * av_register_all() to register all compiled muxers, demuxers and protocols.
- * Unless you are absolutely sure you won't use libavformat's network
- * capabilities, you should also call avformat_network_init().
- *
- * A supported input format is described by an AVInputFormat struct, conversely
- * an output format is described by AVOutputFormat. You can iterate over all
- * registered input/output formats using the av_iformat_next() /
- * av_oformat_next() functions. The protocols layer is not part of the public
- * API, so you can only get the names of supported protocols with the
- * avio_enum_protocols() function.
- *
- * Main lavf structure used for both muxing and demuxing is AVFormatContext,
- * which exports all information about the file being read or written. As with
- * most Libav structures, its size is not part of public ABI, so it cannot be
- * allocated on stack or directly with av_malloc(). To create an
- * AVFormatContext, use avformat_alloc_context() (some functions, like
- * avformat_open_input() might do that for you).
- *
- * Most importantly an AVFormatContext contains:
- * @li the @ref AVFormatContext.iformat "input" or @ref AVFormatContext.oformat
- * "output" format. It is either autodetected or set by user for input;
- * always set by user for output.
- * @li an @ref AVFormatContext.streams "array" of AVStreams, which describe all
- * elementary streams stored in the file. AVStreams are typically referred to
- * using their index in this array.
- * @li an @ref AVFormatContext.pb "I/O context". It is either opened by lavf or
- * set by user for input, always set by user for output (unless you are dealing
- * with an AVFMT_NOFILE format).
- *
- * @section lavf_options Passing options to (de)muxers
- * Lavf allows to configure muxers and demuxers using the @ref avoptions
- * mechanism. Generic (format-independent) libavformat options are provided by
- * AVFormatContext, they can be examined from a user program by calling
- * av_opt_next() / av_opt_find() on an allocated AVFormatContext (or its AVClass
- * from avformat_get_class()). Private (format-specific) options are provided by
- * AVFormatContext.priv_data if and only if AVInputFormat.priv_class /
- * AVOutputFormat.priv_class of the corresponding format struct is non-NULL.
- * Further options may be provided by the @ref AVFormatContext.pb "I/O context",
- * if its AVClass is non-NULL, and the protocols layer. See the discussion on
- * nesting in @ref avoptions documentation to learn how to access those.
- *
- * @defgroup lavf_decoding Demuxing
- * @{
- * Demuxers read a media file and split it into chunks of data (@em packets). A
- * @ref AVPacket "packet" contains one or more encoded frames which belongs to a
- * single elementary stream. In the lavf API this process is represented by the
- * avformat_open_input() function for opening a file, av_read_frame() for
- * reading a single packet and finally avformat_close_input(), which does the
- * cleanup.
- *
- * @section lavf_decoding_open Opening a media file
- * The minimum information required to open a file is its URL or filename, which
- * is passed to avformat_open_input(), as in the following code:
- * @code
- * const char    *url = "in.mp3";
- * AVFormatContext *s = NULL;
- * int ret = avformat_open_input(&s, url, NULL, NULL);
- * if (ret < 0)
- *     abort();
- * @endcode
- * The above code attempts to allocate an AVFormatContext, open the
- * specified file (autodetecting the format) and read the header, exporting the
- * information stored there into s. Some formats do not have a header or do not
- * store enough information there, so it is recommended that you call the
- * avformat_find_stream_info() function which tries to read and decode a few
- * frames to find missing information.
- *
- * In some cases you might want to preallocate an AVFormatContext yourself with
- * avformat_alloc_context() and do some tweaking on it before passing it to
- * avformat_open_input(). One such case is when you want to use custom functions
- * for reading input data instead of lavf internal I/O layer.
- * To do that, create your own AVIOContext with avio_alloc_context(), passing
- * your reading callbacks to it. Then set the @em pb field of your
- * AVFormatContext to newly created AVIOContext.
- *
- * Since the format of the opened file is in general not known until after
- * avformat_open_input() has returned, it is not possible to set demuxer private
- * options on a preallocated context. Instead, the options should be passed to
- * avformat_open_input() wrapped in an AVDictionary:
- * @code
- * AVDictionary *options = NULL;
- * av_dict_set(&options, "video_size", "640x480", 0);
- * av_dict_set(&options, "pixel_format", "rgb24", 0);
- *
- * if (avformat_open_input(&s, url, NULL, &options) < 0)
- *     abort();
- * av_dict_free(&options);
- * @endcode
- * This code passes the private options 'video_size' and 'pixel_format' to the
- * demuxer. They would be necessary for e.g. the rawvideo demuxer, since it
- * cannot know how to interpret raw video data otherwise. If the format turns
- * out to be something different than raw video, those options will not be
- * recognized by the demuxer and therefore will not be applied. Such unrecognized
- * options are then returned in the options dictionary (recognized options are
- * consumed). The calling program can handle such unrecognized options as it
- * wishes, e.g.
- * @code
- * AVDictionaryEntry *e;
- * if (e = av_dict_get(options, "", NULL, AV_DICT_IGNORE_SUFFIX)) {
- *     fprintf(stderr, "Option %s not recognized by the demuxer.\n", e->key);
- *     abort();
- * }
- * @endcode
- *
- * After you have finished reading the file, you must close it with
- * avformat_close_input(). It will free everything associated with the file.
- *
- * @section lavf_decoding_read Reading from an opened file
- * Reading data from an opened AVFormatContext is done by repeatedly calling
- * av_read_frame() on it. Each call, if successful, will return an AVPacket
- * containing encoded data for one AVStream, identified by
- * AVPacket.stream_index. This packet may be passed straight into the libavcodec
- * decoding functions avcodec_decode_video2(), avcodec_decode_audio4() or
- * avcodec_decode_subtitle2() if the caller wishes to decode the data.
- *
- * AVPacket.pts, AVPacket.dts and AVPacket.duration timing information will be
- * set if known. They may also be unset (i.e. AV_NOPTS_VALUE for
- * pts/dts, 0 for duration) if the stream does not provide them. The timing
- * information will be in AVStream.time_base units, i.e. it has to be
- * multiplied by the timebase to convert them to seconds.
- *
- * If AVPacket.buf is set on the returned packet, then the packet is
- * allocated dynamically and the user may keep it indefinitely.
- * Otherwise, if AVPacket.buf is NULL, the packet data is backed by a
- * static storage somewhere inside the demuxer and the packet is only valid
- * until the next av_read_frame() call or closing the file. If the caller
- * requires a longer lifetime, av_dup_packet() will make an av_malloc()ed copy
- * of it.
- * In both cases, the packet must be freed with av_free_packet() when it is no
- * longer needed.
- *
- * @section lavf_decoding_seek Seeking
- * @}
- *
- * @defgroup lavf_encoding Muxing
- * @{
- * Muxers take encoded data in the form of @ref AVPacket "AVPackets" and write
- * it into files or other output bytestreams in the specified container format.
- *
- * The main API functions for muxing are avformat_write_header() for writing the
- * file header, av_write_frame() / av_interleaved_write_frame() for writing the
- * packets and av_write_trailer() for finalizing the file.
- *
- * At the beginning of the muxing process, the caller must first call
- * avformat_alloc_context() to create a muxing context. The caller then sets up
- * the muxer by filling the various fields in this context:
- *
- * - The @ref AVFormatContext.oformat "oformat" field must be set to select the
- *   muxer that will be used.
- * - Unless the format is of the AVFMT_NOFILE type, the @ref AVFormatContext.pb
- *   "pb" field must be set to an opened IO context, either returned from
- *   avio_open2() or a custom one.
- * - Unless the format is of the AVFMT_NOSTREAMS type, at least one stream must
- *   be created with the avformat_new_stream() function. The caller should fill
- *   the @ref AVStream.codec "stream codec context" information, such as the
- *   codec @ref AVCodecContext.codec_type "type", @ref AVCodecContext.codec_id
- *   "id" and other parameters (e.g. width / height, the pixel or sample format,
- *   etc.) as known. The @ref AVCodecContext.time_base "codec timebase" should
- *   be set to the timebase that the caller desires to use for this stream (note
- *   that the timebase actually used by the muxer can be different, as will be
- *   described later).
- * - The caller may fill in additional information, such as @ref
- *   AVFormatContext.metadata "global" or @ref AVStream.metadata "per-stream"
- *   metadata, @ref AVFormatContext.chapters "chapters", @ref
- *   AVFormatContext.programs "programs", etc. as described in the
- *   AVFormatContext documentation. Whether such information will actually be
- *   stored in the output depends on what the container format and the muxer
- *   support.
- *
- * When the muxing context is fully set up, the caller must call
- * avformat_write_header() to initialize the muxer internals and write the file
- * header. Whether anything actually is written to the IO context at this step
- * depends on the muxer, but this function must always be called. Any muxer
- * private options must be passed in the options parameter to this function.
- *
- * The data is then sent to the muxer by repeatedly calling av_write_frame() or
- * av_interleaved_write_frame() (consult those functions' documentation for
- * discussion on the difference between them; only one of them may be used with
- * a single muxing context, they should not be mixed). Do note that the timing
- * information on the packets sent to the muxer must be in the corresponding
- * AVStream's timebase. That timebase is set by the muxer (in the
- * avformat_write_header() step) and may be different from the timebase the
- * caller set on the codec context.
- *
- * Once all the data has been written, the caller must call av_write_trailer()
- * to flush any buffered packets and finalize the output file, then close the IO
- * context (if any) and finally free the muxing context with
- * avformat_free_context().
- * @}
- *
- * @defgroup lavf_io I/O Read/Write
- * @{
- * @}
- *
- * @defgroup lavf_codec Demuxers
- * @{
- * @defgroup lavf_codec_native Native Demuxers
- * @{
- * @}
- * @defgroup lavf_codec_wrappers External library wrappers
- * @{
- * @}
- * @}
- * @defgroup lavf_protos I/O Protocols
- * @{
- * @}
- * @defgroup lavf_internal Internal
- * @{
- * @}
- * @}
- *
- */
-
-#include <time.h>
-#include <stdio.h>  /* FILE */
-#include "libavcodec/avcodec.h"
-#include "libavutil/dict.h"
-#include "libavutil/log.h"
-
-#include "avio.h"
-#include "libavformat/version.h"
-
-struct AVFormatContext;
-
-
-/**
- * @defgroup metadata_api Public Metadata API
- * @{
- * @ingroup libavf
- * The metadata API allows libavformat to export metadata tags to a client
- * application when demuxing. Conversely it allows a client application to
- * set metadata when muxing.
- *
- * Metadata is exported or set as pairs of key/value strings in the 'metadata'
- * fields of the AVFormatContext, AVStream, AVChapter and AVProgram structs
- * using the @ref lavu_dict "AVDictionary" API. Like all strings in Libav,
- * metadata is assumed to be UTF-8 encoded Unicode. Note that metadata
- * exported by demuxers isn't checked to be valid UTF-8 in most cases.
- *
- * Important concepts to keep in mind:
- * -  Keys are unique; there can never be 2 tags with the same key. This is
- *    also meant semantically, i.e., a demuxer should not knowingly produce
- *    several keys that are literally different but semantically identical.
- *    E.g., key=Author5, key=Author6. In this example, all authors must be
- *    placed in the same tag.
- * -  Metadata is flat, not hierarchical; there are no subtags. If you
- *    want to store, e.g., the email address of the child of producer Alice
- *    and actor Bob, that could have key=alice_and_bobs_childs_email_address.
- * -  Several modifiers can be applied to the tag name. This is done by
- *    appending a dash character ('-') and the modifier name in the order
- *    they appear in the list below -- e.g. foo-eng-sort, not foo-sort-eng.
- *    -  language -- a tag whose value is localized for a particular language
- *       is appended with the ISO 639-2/B 3-letter language code.
- *       For example: Author-ger=Michael, Author-eng=Mike
- *       The original/default language is in the unqualified "Author" tag.
- *       A demuxer should set a default if it sets any translated tag.
- *    -  sorting  -- a modified version of a tag that should be used for
- *       sorting will have '-sort' appended. E.g. artist="The Beatles",
- *       artist-sort="Beatles, The".
- *
- * -  Demuxers attempt to export metadata in a generic format, however tags
- *    with no generic equivalents are left as they are stored in the container.
- *    Follows a list of generic tag names:
- *
- @verbatim
- album        -- name of the set this work belongs to
- album_artist -- main creator of the set/album, if different from artist.
-                 e.g. "Various Artists" for compilation albums.
- artist       -- main creator of the work
- comment      -- any additional description of the file.
- composer     -- who composed the work, if different from artist.
- copyright    -- name of copyright holder.
- creation_time-- date when the file was created, preferably in ISO 8601.
- date         -- date when the work was created, preferably in ISO 8601.
- disc         -- number of a subset, e.g. disc in a multi-disc collection.
- encoder      -- name/settings of the software/hardware that produced the file.
- encoded_by   -- person/group who created the file.
- filename     -- original name of the file.
- genre        -- <self-evident>.
- language     -- main language in which the work is performed, preferably
-                 in ISO 639-2 format. Multiple languages can be specified by
-                 separating them with commas.
- performer    -- artist who performed the work, if different from artist.
-                 E.g for "Also sprach Zarathustra", artist would be "Richard
-                 Strauss" and performer "London Philharmonic Orchestra".
- publisher    -- name of the label/publisher.
- service_name     -- name of the service in broadcasting (channel name).
- service_provider -- name of the service provider in broadcasting.
- title        -- name of the work.
- track        -- number of this work in the set, can be in form current/total.
- variant_bitrate -- the total bitrate of the bitrate variant that the current stream is part of
- @endverbatim
- *
- * Look in the examples section for an application example how to use the Metadata API.
- *
- * @}
- */
-
-/* packet functions */
-
-
-/**
- * Allocate and read the payload of a packet and initialize its
- * fields with default values.
- *
- * @param s    associated IO context
- * @param pkt packet
- * @param size desired payload size
- * @return >0 (read size) if OK, AVERROR_xxx otherwise
- */
-int av_get_packet(AVIOContext *s, AVPacket *pkt, int size);
-
-
-/**
- * Read data and append it to the current content of the AVPacket.
- * If pkt->size is 0 this is identical to av_get_packet.
- * Note that this uses av_grow_packet and thus involves a realloc
- * which is inefficient. Thus this function should only be used
- * when there is no reasonable way to know (an upper bound of)
- * the final size.
- *
- * @param s    associated IO context
- * @param pkt packet
- * @param size amount of data to read
- * @return >0 (read size) if OK, AVERROR_xxx otherwise, previous data
- *         will not be lost even if an error occurs.
- */
-int av_append_packet(AVIOContext *s, AVPacket *pkt, int size);
-
-/*************************************************/
-/* fractional numbers for exact pts handling */
-
-/**
- * The exact value of the fractional number is: 'val + num / den'.
- * num is assumed to be 0 <= num < den.
- */
-typedef struct AVFrac {
-    int64_t val, num, den;
-} AVFrac;
-
-/*************************************************/
-/* input/output formats */
-
-struct AVCodecTag;
-
-/**
- * This structure contains the data a format has to probe a file.
- */
-typedef struct AVProbeData {
-    const char *filename;
-    unsigned char *buf; /**< Buffer must have AVPROBE_PADDING_SIZE of extra allocated bytes filled with zero. */
-    int buf_size;       /**< Size of buf except extra allocated bytes */
-} AVProbeData;
-
-#define AVPROBE_SCORE_EXTENSION  50 ///< score for file extension
-#define AVPROBE_SCORE_MAX       100 ///< maximum score
-
-#define AVPROBE_PADDING_SIZE 32             ///< extra allocated bytes at the end of the probe buffer
-
-/// Demuxer will use avio_open, no opened file should be provided by the caller.
-#define AVFMT_NOFILE        0x0001
-#define AVFMT_NEEDNUMBER    0x0002 /**< Needs '%d' in filename. */
-#define AVFMT_SHOW_IDS      0x0008 /**< Show format stream IDs numbers. */
-#define AVFMT_RAWPICTURE    0x0020 /**< Format wants AVPicture structure for
-                                      raw picture data. */
-#define AVFMT_GLOBALHEADER  0x0040 /**< Format wants global header. */
-#define AVFMT_NOTIMESTAMPS  0x0080 /**< Format does not need / have any timestamps. */
-#define AVFMT_GENERIC_INDEX 0x0100 /**< Use generic index building code. */
-#define AVFMT_TS_DISCONT    0x0200 /**< Format allows timestamp discontinuities. Note, muxers always require valid (monotone) timestamps */
-#define AVFMT_VARIABLE_FPS  0x0400 /**< Format allows variable fps. */
-#define AVFMT_NODIMENSIONS  0x0800 /**< Format does not need width/height */
-#define AVFMT_NOSTREAMS     0x1000 /**< Format does not require any streams */
-#define AVFMT_NOBINSEARCH   0x2000 /**< Format does not allow to fall back on binary search via read_timestamp */
-#define AVFMT_NOGENSEARCH   0x4000 /**< Format does not allow to fall back on generic search */
-#define AVFMT_NO_BYTE_SEEK  0x8000 /**< Format does not allow seeking by bytes */
-#define AVFMT_ALLOW_FLUSH  0x10000 /**< Format allows flushing. If not set, the muxer will not receive a NULL packet in the write_packet function. */
-#define AVFMT_TS_NONSTRICT 0x20000 /**< Format does not require strictly
-                                        increasing timestamps, but they must
-                                        still be monotonic */
-#define AVFMT_TS_NEGATIVE  0x40000 /**< Format allows muxing negative
-                                        timestamps. If not set the timestamp
-                                        will be shifted in av_write_frame and
-                                        av_interleaved_write_frame so they
-                                        start from 0. */
-
-/**
- * @addtogroup lavf_encoding
- * @{
- */
-typedef struct AVOutputFormat {
-    const char *name;
-    /**
-     * Descriptive name for the format, meant to be more human-readable
-     * than name. You should use the NULL_IF_CONFIG_SMALL() macro
-     * to define it.
-     */
-    const char *long_name;
-    const char *mime_type;
-    const char *extensions; /**< comma-separated filename extensions */
-    /* output support */
-    enum AVCodecID audio_codec;    /**< default audio codec */
-    enum AVCodecID video_codec;    /**< default video codec */
-    enum AVCodecID subtitle_codec; /**< default subtitle codec */
-    /**
-     * can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_RAWPICTURE,
-     * AVFMT_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS,
-     * AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS, AVFMT_ALLOW_FLUSH,
-     * AVFMT_TS_NONSTRICT
-     */
-    int flags;
-
-    /**
-     * List of supported codec_id-codec_tag pairs, ordered by "better
-     * choice first". The arrays are all terminated by AV_CODEC_ID_NONE.
-     */
-    const struct AVCodecTag * const *codec_tag;
-
-
-    const AVClass *priv_class; ///< AVClass for the private context
-
-    /*****************************************************************
-     * No fields below this line are part of the public API. They
-     * may not be used outside of libavformat and can be changed and
-     * removed at will.
-     * New public fields should be added right above.
-     *****************************************************************
-     */
-    struct AVOutputFormat *next;
-    /**
-     * size of private data so that it can be allocated in the wrapper
-     */
-    int priv_data_size;
-
-    int (*write_header)(struct AVFormatContext *);
-    /**
-     * Write a packet. If AVFMT_ALLOW_FLUSH is set in flags,
-     * pkt can be NULL in order to flush data buffered in the muxer.
-     * When flushing, return 0 if there still is more data to flush,
-     * or 1 if everything was flushed and there is no more buffered
-     * data.
-     */
-    int (*write_packet)(struct AVFormatContext *, AVPacket *pkt);
-    int (*write_trailer)(struct AVFormatContext *);
-    /**
-     * Currently only used to set pixel format if not YUV420P.
-     */
-    int (*interleave_packet)(struct AVFormatContext *, AVPacket *out,
-                             AVPacket *in, int flush);
-    /**
-     * Test if the given codec can be stored in this container.
-     *
-     * @return 1 if the codec is supported, 0 if it is not.
-     *         A negative number if unknown.
-     */
-    int (*query_codec)(enum AVCodecID id, int std_compliance);
-} AVOutputFormat;
-/**
- * @}
- */
-
-/**
- * @addtogroup lavf_decoding
- * @{
- */
-typedef struct AVInputFormat {
-    /**
-     * A comma separated list of short names for the format. New names
-     * may be appended with a minor bump.
-     */
-    const char *name;
-
-    /**
-     * Descriptive name for the format, meant to be more human-readable
-     * than name. You should use the NULL_IF_CONFIG_SMALL() macro
-     * to define it.
-     */
-    const char *long_name;
-
-    /**
-     * Can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_SHOW_IDS,
-     * AVFMT_GENERIC_INDEX, AVFMT_TS_DISCONT, AVFMT_NOBINSEARCH,
-     * AVFMT_NOGENSEARCH, AVFMT_NO_BYTE_SEEK.
-     */
-    int flags;
-
-    /**
-     * If extensions are defined, then no probe is done. You should
-     * usually not use extension format guessing because it is not
-     * reliable enough
-     */
-    const char *extensions;
-
-    const struct AVCodecTag * const *codec_tag;
-
-    const AVClass *priv_class; ///< AVClass for the private context
-
-    /*****************************************************************
-     * No fields below this line are part of the public API. They
-     * may not be used outside of libavformat and can be changed and
-     * removed at will.
-     * New public fields should be added right above.
-     *****************************************************************
-     */
-    struct AVInputFormat *next;
-
-    /**
-     * Raw demuxers store their codec ID here.
-     */
-    int raw_codec_id;
-
-    /**
-     * Size of private data so that it can be allocated in the wrapper.
-     */
-    int priv_data_size;
-
-    /**
-     * Tell if a given file has a chance of being parsed as this format.
-     * The buffer provided is guaranteed to be AVPROBE_PADDING_SIZE bytes
-     * big so you do not have to check for that unless you need more.
-     */
-    int (*read_probe)(AVProbeData *);
-
-    /**
-     * Read the format header and initialize the AVFormatContext
-     * structure. Return 0 if OK. Only used in raw format right
-     * now. 'avformat_new_stream' should be called to create new streams.
-     */
-    int (*read_header)(struct AVFormatContext *);
-
-    /**
-     * Read one packet and put it in 'pkt'. pts and flags are also
-     * set. 'avformat_new_stream' can be called only if the flag
-     * AVFMTCTX_NOHEADER is used and only in the calling thread (not in a
-     * background thread).
-     * @return 0 on success, < 0 on error.
-     *         When returning an error, pkt must not have been allocated
-     *         or must be freed before returning
-     */
-    int (*read_packet)(struct AVFormatContext *, AVPacket *pkt);
-
-    /**
-     * Close the stream. The AVFormatContext and AVStreams are not
-     * freed by this function
-     */
-    int (*read_close)(struct AVFormatContext *);
-
-    /**
-     * Seek to a given timestamp relative to the frames in
-     * stream component stream_index.
-     * @param stream_index Must not be -1.
-     * @param flags Selects which direction should be preferred if no exact
-     *              match is available.
-     * @return >= 0 on success (but not necessarily the new offset)
-     */
-    int (*read_seek)(struct AVFormatContext *,
-                     int stream_index, int64_t timestamp, int flags);
-
-    /**
-     * Get the next timestamp in stream[stream_index].time_base units.
-     * @return the timestamp or AV_NOPTS_VALUE if an error occurred
-     */
-    int64_t (*read_timestamp)(struct AVFormatContext *s, int stream_index,
-                              int64_t *pos, int64_t pos_limit);
-
-    /**
-     * Start/resume playing - only meaningful if using a network-based format
-     * (RTSP).
-     */
-    int (*read_play)(struct AVFormatContext *);
-
-    /**
-     * Pause playing - only meaningful if using a network-based format
-     * (RTSP).
-     */
-    int (*read_pause)(struct AVFormatContext *);
-
-    /**
-     * Seek to timestamp ts.
-     * Seeking will be done so that the point from which all active streams
-     * can be presented successfully will be closest to ts and within min/max_ts.
-     * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
-     */
-    int (*read_seek2)(struct AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
-} AVInputFormat;
-/**
- * @}
- */
-
-enum AVStreamParseType {
-    AVSTREAM_PARSE_NONE,
-    AVSTREAM_PARSE_FULL,       /**< full parsing and repack */
-    AVSTREAM_PARSE_HEADERS,    /**< Only parse headers, do not repack. */
-    AVSTREAM_PARSE_TIMESTAMPS, /**< full parsing and interpolation of timestamps for frames not starting on a packet boundary */
-    AVSTREAM_PARSE_FULL_ONCE,  /**< full parsing and repack of the first frame only, only implemented for H.264 currently */
-};
-
-typedef struct AVIndexEntry {
-    int64_t pos;
-    int64_t timestamp;
-#define AVINDEX_KEYFRAME 0x0001
-    int flags:2;
-    int size:30; //Yeah, trying to keep the size of this small to reduce memory requirements (it is 24 vs. 32 bytes due to possible 8-byte alignment).
-    int min_distance;         /**< Minimum distance between this and the previous keyframe, used to avoid unneeded searching. */
-} AVIndexEntry;
-
-#define AV_DISPOSITION_DEFAULT   0x0001
-#define AV_DISPOSITION_DUB       0x0002
-#define AV_DISPOSITION_ORIGINAL  0x0004
-#define AV_DISPOSITION_COMMENT   0x0008
-#define AV_DISPOSITION_LYRICS    0x0010
-#define AV_DISPOSITION_KARAOKE   0x0020
-
-/**
- * Track should be used during playback by default.
- * Useful for subtitle track that should be displayed
- * even when user did not explicitly ask for subtitles.
- */
-#define AV_DISPOSITION_FORCED    0x0040
-#define AV_DISPOSITION_HEARING_IMPAIRED  0x0080  /**< stream for hearing impaired audiences */
-#define AV_DISPOSITION_VISUAL_IMPAIRED   0x0100  /**< stream for visual impaired audiences */
-#define AV_DISPOSITION_CLEAN_EFFECTS     0x0200  /**< stream without voice */
-/**
- * The stream is stored in the file as an attached picture/"cover art" (e.g.
- * APIC frame in ID3v2). The single packet associated with it will be returned
- * among the first few packets read from the file unless seeking takes place.
- * It can also be accessed at any time in AVStream.attached_pic.
- */
-#define AV_DISPOSITION_ATTACHED_PIC      0x0400
-
-/**
- * Stream structure.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVStream) must not be used outside libav*.
- */
-typedef struct AVStream {
-    int index;    /**< stream index in AVFormatContext */
-    /**
-     * Format-specific stream ID.
-     * decoding: set by libavformat
-     * encoding: set by the user, replaced by libavformat if left unset
-     */
-    int id;
-    /**
-     * Codec context associated with this stream. Allocated and freed by
-     * libavformat.
-     *
-     * - decoding: The demuxer exports codec information stored in the headers
-     *             here.
-     * - encoding: The user sets codec information, the muxer writes it to the
-     *             output. Mandatory fields as specified in AVCodecContext
-     *             documentation must be set even if this AVCodecContext is
-     *             not actually used for encoding.
-     */
-    AVCodecContext *codec;
-    void *priv_data;
-
-    /**
-     * encoding: pts generation when outputting stream
-     */
-    struct AVFrac pts;
-
-    /**
-     * This is the fundamental unit of time (in seconds) in terms
-     * of which frame timestamps are represented.
-     *
-     * decoding: set by libavformat
-     * encoding: set by libavformat in avformat_write_header. The muxer may use the
-     * user-provided value of @ref AVCodecContext.time_base "codec->time_base"
-     * as a hint.
-     */
-    AVRational time_base;
-
-    /**
-     * Decoding: pts of the first frame of the stream, in stream time base.
-     * Only set this if you are absolutely 100% sure that the value you set
-     * it to really is the pts of the first frame.
-     * This may be undefined (AV_NOPTS_VALUE).
-     */
-    int64_t start_time;
-
-    /**
-     * Decoding: duration of the stream, in stream time base.
-     * If a source file does not specify a duration, but does specify
-     * a bitrate, this value will be estimated from bitrate and file size.
-     */
-    int64_t duration;
-
-    int64_t nb_frames;                 ///< number of frames in this stream if known or 0
-
-    int disposition; /**< AV_DISPOSITION_* bit field */
-
-    enum AVDiscard discard; ///< Selects which packets can be discarded at will and do not need to be demuxed.
-
-    /**
-     * sample aspect ratio (0 if unknown)
-     * - encoding: Set by user.
-     * - decoding: Set by libavformat.
-     */
-    AVRational sample_aspect_ratio;
-
-    AVDictionary *metadata;
-
-    /**
-     * Average framerate
-     */
-    AVRational avg_frame_rate;
-
-    /**
-     * For streams with AV_DISPOSITION_ATTACHED_PIC disposition, this packet
-     * will contain the attached picture.
-     *
-     * decoding: set by libavformat, must not be modified by the caller.
-     * encoding: unused
-     */
-    AVPacket attached_pic;
-
-    /*****************************************************************
-     * All fields below this line are not part of the public API. They
-     * may not be used outside of libavformat and can be changed and
-     * removed at will.
-     * New public fields should be added right above.
-     *****************************************************************
-     */
-
-    /**
-     * Stream information used internally by av_find_stream_info()
-     */
-#define MAX_STD_TIMEBASES (60*12+5)
-    struct {
-        int nb_decoded_frames;
-        int found_decoder;
-
-        /**
-         * Those are used for average framerate estimation.
-         */
-        int64_t fps_first_dts;
-        int     fps_first_dts_idx;
-        int64_t fps_last_dts;
-        int     fps_last_dts_idx;
-
-    } *info;
-
-    int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
-
-#if FF_API_REFERENCE_DTS
-    /* a hack to keep ABI compatibility for avconv, which accesses parser even
-     * though it should not */
-    int64_t do_not_use;
-#endif
-    // Timestamp generation support:
-    int64_t first_dts;
-    int64_t cur_dts;
-    int64_t last_IP_pts;
-    int last_IP_duration;
-
-    /**
-     * Number of packets to buffer for codec probing
-     */
-#define MAX_PROBE_PACKETS 2500
-    int probe_packets;
-
-    /**
-     * Number of frames that have been demuxed during av_find_stream_info()
-     */
-    int codec_info_nb_frames;
-
-    /* av_read_frame() support */
-    enum AVStreamParseType need_parsing;
-    struct AVCodecParserContext *parser;
-
-    /**
-     * last packet in packet_buffer for this stream when muxing.
-     */
-    struct AVPacketList *last_in_packet_buffer;
-    AVProbeData probe_data;
-#define MAX_REORDER_DELAY 16
-    int64_t pts_buffer[MAX_REORDER_DELAY+1];
-
-    AVIndexEntry *index_entries; /**< Only used if the format does not
-                                    support seeking natively. */
-    int nb_index_entries;
-    unsigned int index_entries_allocated_size;
-} AVStream;
-
-#define AV_PROGRAM_RUNNING 1
-
-/**
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVProgram) must not be used outside libav*.
- */
-typedef struct AVProgram {
-    int            id;
-    int            flags;
-    enum AVDiscard discard;        ///< selects which program to discard and which to feed to the caller
-    unsigned int   *stream_index;
-    unsigned int   nb_stream_indexes;
-    AVDictionary *metadata;
-} AVProgram;
-
-#define AVFMTCTX_NOHEADER      0x0001 /**< signal that no header is present
-                                         (streams are added dynamically) */
-
-typedef struct AVChapter {
-    int id;                 ///< unique ID to identify the chapter
-    AVRational time_base;   ///< time base in which the start/end timestamps are specified
-    int64_t start, end;     ///< chapter start/end time in time_base units
-    AVDictionary *metadata;
-} AVChapter;
-
-typedef struct AVFormatInternal AVFormatInternal;
-
-/**
- * Format I/O context.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVFormatContext) must not be used outside libav*, use
- * avformat_alloc_context() to create an AVFormatContext.
- */
-typedef struct AVFormatContext {
-    /**
-     * A class for logging and @ref avoptions. Set by avformat_alloc_context().
-     * Exports (de)muxer private options if they exist.
-     */
-    const AVClass *av_class;
-
-    /**
-     * The input container format.
-     *
-     * Demuxing only, set by avformat_open_input().
-     */
-    struct AVInputFormat *iformat;
-
-    /**
-     * The output container format.
-     *
-     * Muxing only, must be set by the caller before avformat_write_header().
-     */
-    struct AVOutputFormat *oformat;
-
-    /**
-     * Format private data. This is an AVOptions-enabled struct
-     * if and only if iformat/oformat.priv_class is not NULL.
-     *
-     * - muxing: set by avformat_write_header()
-     * - demuxing: set by avformat_open_input()
-     */
-    void *priv_data;
-
-    /**
-     * I/O context.
-     *
-     * - demuxing: either set by the user before avformat_open_input() (then
-     *             the user must close it manually) or set by avformat_open_input().
-     * - muxing: set by the user before avformat_write_header(). The caller must
-     *           take care of closing / freeing the IO context.
-     *
-     * Do NOT set this field if AVFMT_NOFILE flag is set in
-     * iformat/oformat.flags. In such a case, the (de)muxer will handle
-     * I/O in some other way and this field will be NULL.
-     */
-    AVIOContext *pb;
-
-    /* stream info */
-    int ctx_flags; /**< Format-specific flags, see AVFMTCTX_xx */
-
-    /**
-     * Number of elements in AVFormatContext.streams.
-     *
-     * Set by avformat_new_stream(), must not be modified by any other code.
-     */
-    unsigned int nb_streams;
-    /**
-     * A list of all streams in the file. New streams are created with
-     * avformat_new_stream().
-     *
-     * - demuxing: streams are created by libavformat in avformat_open_input().
-     *             If AVFMTCTX_NOHEADER is set in ctx_flags, then new streams may also
-     *             appear in av_read_frame().
-     * - muxing: streams are created by the user before avformat_write_header().
-     *
-     * Freed by libavformat in avformat_free_context().
-     */
-    AVStream **streams;
-
-    /**
-     * input or output filename
-     *
-     * - demuxing: set by avformat_open_input()
-     * - muxing: may be set by the caller before avformat_write_header()
-     */
-    char filename[1024];
-
-    /**
-     * Position of the first frame of the component, in
-     * AV_TIME_BASE fractional seconds. NEVER set this value directly:
-     * It is deduced from the AVStream values.
-     *
-     * Demuxing only, set by libavformat.
-     */
-    int64_t start_time;
-
-    /**
-     * Duration of the stream, in AV_TIME_BASE fractional
-     * seconds. Only set this value if you know none of the individual stream
-     * durations and also do not set any of them. This is deduced from the
-     * AVStream values if not set.
-     *
-     * Demuxing only, set by libavformat.
-     */
-    int64_t duration;
-
-    /**
-     * Total stream bitrate in bit/s, 0 if not
-     * available. Never set it directly if the file_size and the
-     * duration are known as Libav can compute it automatically.
-     */
-    int bit_rate;
-
-    unsigned int packet_size;
-    int max_delay;
-
-    int flags;
-#define AVFMT_FLAG_GENPTS       0x0001 ///< Generate missing pts even if it requires parsing future frames.
-#define AVFMT_FLAG_IGNIDX       0x0002 ///< Ignore index.
-#define AVFMT_FLAG_NONBLOCK     0x0004 ///< Do not block when reading packets from input.
-#define AVFMT_FLAG_IGNDTS       0x0008 ///< Ignore DTS on frames that contain both DTS & PTS
-#define AVFMT_FLAG_NOFILLIN     0x0010 ///< Do not infer any values from other values, just return what is stored in the container
-#define AVFMT_FLAG_NOPARSE      0x0020 ///< Do not use AVParsers, you also must set AVFMT_FLAG_NOFILLIN as the fillin code works on frames and no parsing -> no frames. Also seeking to frames can not work if parsing to find frame boundaries has been disabled
-#define AVFMT_FLAG_NOBUFFER     0x0040 ///< Do not buffer frames when possible
-#define AVFMT_FLAG_CUSTOM_IO    0x0080 ///< The caller has supplied a custom AVIOContext, don't avio_close() it.
-#define AVFMT_FLAG_DISCARD_CORRUPT  0x0100 ///< Discard frames marked corrupted
-#define AVFMT_FLAG_FLUSH_PACKETS    0x0200 ///< Flush the AVIOContext every packet.
-
-    /**
-     * Maximum size of the data read from input for determining
-     * the input container format.
-     * Demuxing only, set by the caller before avformat_open_input().
-     */
-    unsigned int probesize;
-
-    /**
-     * Maximum duration (in AV_TIME_BASE units) of the data read
-     * from input in avformat_find_stream_info().
-     * Demuxing only, set by the caller before avformat_find_stream_info().
-     */
-    int max_analyze_duration;
-
-    const uint8_t *key;
-    int keylen;
-
-    unsigned int nb_programs;
-    AVProgram **programs;
-
-    /**
-     * Forced video codec_id.
-     * Demuxing: Set by user.
-     */
-    enum AVCodecID video_codec_id;
-
-    /**
-     * Forced audio codec_id.
-     * Demuxing: Set by user.
-     */
-    enum AVCodecID audio_codec_id;
-
-    /**
-     * Forced subtitle codec_id.
-     * Demuxing: Set by user.
-     */
-    enum AVCodecID subtitle_codec_id;
-
-    /**
-     * Maximum amount of memory in bytes to use for the index of each stream.
-     * If the index exceeds this size, entries will be discarded as
-     * needed to maintain a smaller size. This can lead to slower or less
-     * accurate seeking (depends on demuxer).
-     * Demuxers for which a full in-memory index is mandatory will ignore
-     * this.
-     * - muxing: unused
-     * - demuxing: set by user
-     */
-    unsigned int max_index_size;
-
-    /**
-     * Maximum amount of memory in bytes to use for buffering frames
-     * obtained from realtime capture devices.
-     */
-    unsigned int max_picture_buffer;
-
-    /**
-     * Number of chapters in AVChapter array.
-     * When muxing, chapters are normally written in the file header,
-     * so nb_chapters should normally be initialized before write_header
-     * is called. Some muxers (e.g. mov and mkv) can also write chapters
-     * in the trailer.  To write chapters in the trailer, nb_chapters
-     * must be zero when write_header is called and non-zero when
-     * write_trailer is called.
-     * - muxing: set by user
-     * - demuxing: set by libavformat
-     */
-    unsigned int nb_chapters;
-    AVChapter **chapters;
-
-    /**
-     * Metadata that applies to the whole file.
-     *
-     * - demuxing: set by libavformat in avformat_open_input()
-     * - muxing: may be set by the caller before avformat_write_header()
-     *
-     * Freed by libavformat in avformat_free_context().
-     */
-    AVDictionary *metadata;
-
-    /**
-     * Start time of the stream in real world time, in microseconds
-     * since the Unix epoch (00:00 1st January 1970). That is, pts=0 in the
-     * stream was captured at this real world time.
-     * Muxing only, set by the caller before avformat_write_header().
-     */
-    int64_t start_time_realtime;
-
-    /**
-     * The number of frames used for determining the framerate in
-     * avformat_find_stream_info().
-     * Demuxing only, set by the caller before avformat_find_stream_info().
-     */
-    int fps_probe_size;
-
-    /**
-     * Error recognition; higher values will detect more errors but may
-     * misdetect some more or less valid parts as errors.
-     * Demuxing only, set by the caller before avformat_open_input().
-     */
-    int error_recognition;
-
-    /**
-     * Custom interrupt callbacks for the I/O layer.
-     *
-     * demuxing: set by the user before avformat_open_input().
-     * muxing: set by the user before avformat_write_header()
-     * (mainly useful for AVFMT_NOFILE formats). The callback
-     * should also be passed to avio_open2() if it's used to
-     * open the file.
-     */
-    AVIOInterruptCB interrupt_callback;
-
-    /**
-     * Flags to enable debugging.
-     */
-    int debug;
-#define FF_FDEBUG_TS        0x0001
-
-    /**
-     * Maximum buffering duration for interleaving.
-     *
-     * To ensure all the streams are interleaved correctly,
-     * av_interleaved_write_frame() will wait until it has at least one packet
-     * for each stream before actually writing any packets to the output file.
-     * When some streams are "sparse" (i.e. there are large gaps between
-     * successive packets), this can result in excessive buffering.
-     *
-     * This field specifies the maximum difference between the timestamps of the
-     * first and the last packet in the muxing queue, above which libavformat
-     * will output a packet regardless of whether it has queued a packet for all
-     * the streams.
-     *
-     * Muxing only, set by the caller before avformat_write_header().
-     */
-    int64_t max_interleave_delta;
-
-    /*****************************************************************
-     * All fields below this line are not part of the public API. They
-     * may not be used outside of libavformat and can be changed and
-     * removed at will.
-     * New public fields should be added right above.
-     *****************************************************************
-     */
-
-    /**
-     * This buffer is only needed when packets were already buffered but
-     * not decoded, for example to get the codec parameters in MPEG
-     * streams.
-     */
-    struct AVPacketList *packet_buffer;
-    struct AVPacketList *packet_buffer_end;
-
-    /* av_seek_frame() support */
-    int64_t data_offset; /**< offset of the first packet */
-
-    /**
-     * Raw packets from the demuxer, prior to parsing and decoding.
-     * This buffer is used for buffering packets until the codec can
-     * be identified, as parsing cannot be done without knowing the
-     * codec.
-     */
-    struct AVPacketList *raw_packet_buffer;
-    struct AVPacketList *raw_packet_buffer_end;
-    /**
-     * Packets split by the parser get queued here.
-     */
-    struct AVPacketList *parse_queue;
-    struct AVPacketList *parse_queue_end;
-    /**
-     * Remaining size available for raw_packet_buffer, in bytes.
-     */
-#define RAW_PACKET_BUFFER_SIZE 2500000
-    int raw_packet_buffer_remaining_size;
-
-    /**
-     * Offset to remap timestamps to be non-negative.
-     * Expressed in timebase units.
-     */
-    int64_t offset;
-
-    /**
-     * Timebase for the timestamp offset.
-     */
-    AVRational offset_timebase;
-
-    /**
-     * An opaque field for libavformat internal usage.
-     * Must not be accessed in any way by callers.
-     */
-    AVFormatInternal *internal;
-} AVFormatContext;
-
-typedef struct AVPacketList {
-    AVPacket pkt;
-    struct AVPacketList *next;
-} AVPacketList;
-
-
-/**
- * @defgroup lavf_core Core functions
- * @ingroup libavf
- *
- * Functions for querying libavformat capabilities, allocating core structures,
- * etc.
- * @{
- */
-
-/**
- * Return the LIBAVFORMAT_VERSION_INT constant.
- */
-unsigned avformat_version(void);
-
-/**
- * Return the libavformat build-time configuration.
- */
-const char *avformat_configuration(void);
-
-/**
- * Return the libavformat license.
- */
-const char *avformat_license(void);
-
-/**
- * Initialize libavformat and register all the muxers, demuxers and
- * protocols. If you do not call this function, then you can select
- * exactly which formats you want to support.
- *
- * @see av_register_input_format()
- * @see av_register_output_format()
- * @see av_register_protocol()
- */
-void av_register_all(void);
-
-void av_register_input_format(AVInputFormat *format);
-void av_register_output_format(AVOutputFormat *format);
-
-/**
- * Do global initialization of network components. This is optional,
- * but recommended, since it avoids the overhead of implicitly
- * doing the setup for each session.
- *
- * Calling this function will become mandatory if using network
- * protocols at some major version bump.
- */
-int avformat_network_init(void);
-
-/**
- * Undo the initialization done by avformat_network_init.
- */
-int avformat_network_deinit(void);
-
-/**
- * If f is NULL, returns the first registered input format,
- * if f is non-NULL, returns the next registered input format after f
- * or NULL if f is the last one.
- */
-AVInputFormat  *av_iformat_next(AVInputFormat  *f);
-
-/**
- * If f is NULL, returns the first registered output format,
- * if f is non-NULL, returns the next registered output format after f
- * or NULL if f is the last one.
- */
-AVOutputFormat *av_oformat_next(AVOutputFormat *f);
-
-/**
- * Allocate an AVFormatContext.
- * avformat_free_context() can be used to free the context and everything
- * allocated by the framework within it.
- */
-AVFormatContext *avformat_alloc_context(void);
-
-/**
- * Free an AVFormatContext and all its streams.
- * @param s context to free
- */
-void avformat_free_context(AVFormatContext *s);
-
-/**
- * Get the AVClass for AVFormatContext. It can be used in combination with
- * AV_OPT_SEARCH_FAKE_OBJ for examining options.
- *
- * @see av_opt_find().
- */
-const AVClass *avformat_get_class(void);
-
-/**
- * Add a new stream to a media file.
- *
- * When demuxing, it is called by the demuxer in read_header(). If the
- * flag AVFMTCTX_NOHEADER is set in s.ctx_flags, then it may also
- * be called in read_packet().
- *
- * When muxing, should be called by the user before avformat_write_header().
- *
- * @param s media file handle
- * @param c If non-NULL, the AVCodecContext corresponding to the new stream
- * will be initialized to use this codec. This is needed for e.g. codec-specific
- * defaults to be set, so codec should be provided if it is known.
- *
- * @return newly created stream or NULL on error.
- */
-AVStream *avformat_new_stream(AVFormatContext *s, AVCodec *c);
-
-AVProgram *av_new_program(AVFormatContext *s, int id);
-
-/**
- * @}
- */
-
-
-/**
- * @addtogroup lavf_decoding
- * @{
- */
-
-/**
- * Find AVInputFormat based on the short name of the input format.
- */
-AVInputFormat *av_find_input_format(const char *short_name);
-
-/**
- * Guess the file format.
- *
- * @param pd        data to be probed
- * @param is_opened Whether the file is already opened; determines whether
- *                  demuxers with or without AVFMT_NOFILE are probed.
- */
-AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened);
-
-/**
- * Guess the file format.
- *
- * @param pd        data to be probed
- * @param is_opened Whether the file is already opened; determines whether
- *                  demuxers with or without AVFMT_NOFILE are probed.
- * @param score_max A probe score larger that this is required to accept a
- *                  detection, the variable is set to the actual detection
- *                  score afterwards.
- *                  If the score is <= AVPROBE_SCORE_MAX / 4 it is recommended
- *                  to retry with a larger probe buffer.
- */
-AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max);
-
-/**
- * Probe a bytestream to determine the input format. Each time a probe returns
- * with a score that is too low, the probe buffer size is increased and another
- * attempt is made. When the maximum probe size is reached, the input format
- * with the highest score is returned.
- *
- * @param pb the bytestream to probe
- * @param fmt the input format is put here
- * @param filename the filename of the stream
- * @param logctx the log context
- * @param offset the offset within the bytestream to probe from
- * @param max_probe_size the maximum probe buffer size (zero for default)
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code otherwise
- */
-int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
-                          const char *filename, void *logctx,
-                          unsigned int offset, unsigned int max_probe_size);
-
-/**
- * Open an input stream and read the header. The codecs are not opened.
- * The stream must be closed with avformat_close_input().
- *
- * @param ps Pointer to user-supplied AVFormatContext (allocated by avformat_alloc_context).
- *           May be a pointer to NULL, in which case an AVFormatContext is allocated by this
- *           function and written into ps.
- *           Note that a user-supplied AVFormatContext will be freed on failure.
- * @param filename Name of the stream to open.
- * @param fmt If non-NULL, this parameter forces a specific input format.
- *            Otherwise the format is autodetected.
- * @param options  A dictionary filled with AVFormatContext and demuxer-private options.
- *                 On return this parameter will be destroyed and replaced with a dict containing
- *                 options that were not found. May be NULL.
- *
- * @return 0 on success, a negative AVERROR on failure.
- *
- * @note If you want to use custom IO, preallocate the format context and set its pb field.
- */
-int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputFormat *fmt, AVDictionary **options);
-
-/**
- * Read packets of a media file to get stream information. This
- * is useful for file formats with no headers such as MPEG. This
- * function also computes the real framerate in case of MPEG-2 repeat
- * frame mode.
- * The logical file position is not changed by this function;
- * examined packets may be buffered for later processing.
- *
- * @param ic media file handle
- * @param options  If non-NULL, an ic.nb_streams long array of pointers to
- *                 dictionaries, where i-th member contains options for
- *                 codec corresponding to i-th stream.
- *                 On return each dictionary will be filled with options that were not found.
- * @return >=0 if OK, AVERROR_xxx on error
- *
- * @note this function isn't guaranteed to open all the codecs, so
- *       options being non-empty at return is a perfectly normal behavior.
- *
- * @todo Let the user decide somehow what information is needed so that
- *       we do not waste time getting stuff the user does not need.
- */
-int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options);
-
-/**
- * Find the "best" stream in the file.
- * The best stream is determined according to various heuristics as the most
- * likely to be what the user expects.
- * If the decoder parameter is non-NULL, av_find_best_stream will find the
- * default decoder for the stream's codec; streams for which no decoder can
- * be found are ignored.
- *
- * @param ic                media file handle
- * @param type              stream type: video, audio, subtitles, etc.
- * @param wanted_stream_nb  user-requested stream number,
- *                          or -1 for automatic selection
- * @param related_stream    try to find a stream related (eg. in the same
- *                          program) to this one, or -1 if none
- * @param decoder_ret       if non-NULL, returns the decoder for the
- *                          selected stream
- * @param flags             flags; none are currently defined
- * @return  the non-negative stream number in case of success,
- *          AVERROR_STREAM_NOT_FOUND if no stream with the requested type
- *          could be found,
- *          AVERROR_DECODER_NOT_FOUND if streams were found but no decoder
- * @note  If av_find_best_stream returns successfully and decoder_ret is not
- *        NULL, then *decoder_ret is guaranteed to be set to a valid AVCodec.
- */
-int av_find_best_stream(AVFormatContext *ic,
-                        enum AVMediaType type,
-                        int wanted_stream_nb,
-                        int related_stream,
-                        AVCodec **decoder_ret,
-                        int flags);
-
-/**
- * Return the next frame of a stream.
- * This function returns what is stored in the file, and does not validate
- * that what is there are valid frames for the decoder. It will split what is
- * stored in the file into frames and return one for each call. It will not
- * omit invalid data between valid frames so as to give the decoder the maximum
- * information possible for decoding.
- *
- * If pkt->buf is NULL, then the packet is valid until the next
- * av_read_frame() or until avformat_close_input(). Otherwise the packet
- * is valid indefinitely. In both cases the packet must be freed with
- * av_free_packet when it is no longer needed. For video, the packet contains
- * exactly one frame. For audio, it contains an integer number of frames if each
- * frame has a known fixed size (e.g. PCM or ADPCM data). If the audio frames
- * have a variable size (e.g. MPEG audio), then it contains one frame.
- *
- * pkt->pts, pkt->dts and pkt->duration are always set to correct
- * values in AVStream.time_base units (and guessed if the format cannot
- * provide them). pkt->pts can be AV_NOPTS_VALUE if the video format
- * has B-frames, so it is better to rely on pkt->dts if you do not
- * decompress the payload.
- *
- * @return 0 if OK, < 0 on error or end of file
- */
-int av_read_frame(AVFormatContext *s, AVPacket *pkt);
-
-/**
- * Seek to the keyframe at timestamp.
- * 'timestamp' in 'stream_index'.
- *
- * @param s media file handle
- * @param stream_index If stream_index is (-1), a default
- * stream is selected, and timestamp is automatically converted
- * from AV_TIME_BASE units to the stream specific time_base.
- * @param timestamp Timestamp in AVStream.time_base units
- *        or, if no stream is specified, in AV_TIME_BASE units.
- * @param flags flags which select direction and seeking mode
- * @return >= 0 on success
- */
-int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp,
-                  int flags);
-
-/**
- * Seek to timestamp ts.
- * Seeking will be done so that the point from which all active streams
- * can be presented successfully will be closest to ts and within min/max_ts.
- * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
- *
- * If flags contain AVSEEK_FLAG_BYTE, then all timestamps are in bytes and
- * are the file position (this may not be supported by all demuxers).
- * If flags contain AVSEEK_FLAG_FRAME, then all timestamps are in frames
- * in the stream with stream_index (this may not be supported by all demuxers).
- * Otherwise all timestamps are in units of the stream selected by stream_index
- * or if stream_index is -1, in AV_TIME_BASE units.
- * If flags contain AVSEEK_FLAG_ANY, then non-keyframes are treated as
- * keyframes (this may not be supported by all demuxers).
- *
- * @param s media file handle
- * @param stream_index index of the stream which is used as time base reference
- * @param min_ts smallest acceptable timestamp
- * @param ts target timestamp
- * @param max_ts largest acceptable timestamp
- * @param flags flags
- * @return >=0 on success, error code otherwise
- *
- * @note This is part of the new seek API which is still under construction.
- *       Thus do not use this yet. It may change at any time, do not expect
- *       ABI compatibility yet!
- */
-int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
-
-/**
- * Start playing a network-based stream (e.g. RTSP stream) at the
- * current position.
- */
-int av_read_play(AVFormatContext *s);
-
-/**
- * Pause a network-based stream (e.g. RTSP stream).
- *
- * Use av_read_play() to resume it.
- */
-int av_read_pause(AVFormatContext *s);
-
-/**
- * Close an opened input AVFormatContext. Free it and all its contents
- * and set *s to NULL.
- */
-void avformat_close_input(AVFormatContext **s);
-/**
- * @}
- */
-
-#define AVSEEK_FLAG_BACKWARD 1 ///< seek backward
-#define AVSEEK_FLAG_BYTE     2 ///< seeking based on position in bytes
-#define AVSEEK_FLAG_ANY      4 ///< seek to any frame, even non-keyframes
-#define AVSEEK_FLAG_FRAME    8 ///< seeking based on frame number
-
-/**
- * @addtogroup lavf_encoding
- * @{
- */
-/**
- * Allocate the stream private data and write the stream header to
- * an output media file.
- *
- * @param s Media file handle, must be allocated with avformat_alloc_context().
- *          Its oformat field must be set to the desired output format;
- *          Its pb field must be set to an already opened AVIOContext.
- * @param options  An AVDictionary filled with AVFormatContext and muxer-private options.
- *                 On return this parameter will be destroyed and replaced with a dict containing
- *                 options that were not found. May be NULL.
- *
- * @return 0 on success, negative AVERROR on failure.
- *
- * @see av_opt_find, av_dict_set, avio_open, av_oformat_next.
- */
-int avformat_write_header(AVFormatContext *s, AVDictionary **options);
-
-/**
- * Write a packet to an output media file.
- *
- * This function passes the packet directly to the muxer, without any buffering
- * or reordering. The caller is responsible for correctly interleaving the
- * packets if the format requires it. Callers that want libavformat to handle
- * the interleaving should call av_interleaved_write_frame() instead of this
- * function.
- *
- * @param s media file handle
- * @param pkt The packet containing the data to be written. Note that unlike
- *            av_interleaved_write_frame(), this function does not take
- *            ownership of the packet passed to it (though some muxers may make
- *            an internal reference to the input packet).
- *            <br>
- *            This parameter can be NULL (at any time, not just at the end), in
- *            order to immediately flush data buffered within the muxer, for
- *            muxers that buffer up data internally before writing it to the
- *            output.
- *            <br>
- *            Packet's @ref AVPacket.stream_index "stream_index" field must be
- *            set to the index of the corresponding stream in @ref
- *            AVFormatContext.streams "s->streams". It is very strongly
- *            recommended that timing information (@ref AVPacket.pts "pts", @ref
- *            AVPacket.dts "dts", @ref AVPacket.duration "duration") is set to
- *            correct values.
- * @return < 0 on error, = 0 if OK, 1 if flushed and there is no more data to flush
- *
- * @see av_interleaved_write_frame()
- */
-int av_write_frame(AVFormatContext *s, AVPacket *pkt);
-
-/**
- * Write a packet to an output media file ensuring correct interleaving.
- *
- * This function will buffer the packets internally as needed to make sure the
- * packets in the output file are properly interleaved in the order of
- * increasing dts. Callers doing their own interleaving should call
- * av_write_frame() instead of this function.
- *
- * @param s media file handle
- * @param pkt The packet containing the data to be written.
- *            <br>
- *            If the packet is reference-counted, this function will take
- *            ownership of this reference and unreference it later when it sees
- *            fit.
- *            The caller must not access the data through this reference after
- *            this function returns. If the packet is not reference-counted,
- *            libavformat will make a copy.
- *            <br>
- *            This parameter can be NULL (at any time, not just at the end), to
- *            flush the interleaving queues.
- *            <br>
- *            Packet's @ref AVPacket.stream_index "stream_index" field must be
- *            set to the index of the corresponding stream in @ref
- *            AVFormatContext.streams "s->streams". It is very strongly
- *            recommended that timing information (@ref AVPacket.pts "pts", @ref
- *            AVPacket.dts "dts", @ref AVPacket.duration "duration") is set to
- *            correct values.
- *
- * @return 0 on success, a negative AVERROR on error. Libavformat will always
- *         take care of freeing the packet, even if this function fails.
- *
- * @see av_write_frame(), AVFormatContext.max_interleave_delta
- */
-int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt);
-
-/**
- * Write the stream trailer to an output media file and free the
- * file private data.
- *
- * May only be called after a successful call to avformat_write_header.
- *
- * @param s media file handle
- * @return 0 if OK, AVERROR_xxx on error
- */
-int av_write_trailer(AVFormatContext *s);
-
-/**
- * Return the output format in the list of registered output formats
- * which best matches the provided parameters, or return NULL if
- * there is no match.
- *
- * @param short_name if non-NULL checks if short_name matches with the
- * names of the registered formats
- * @param filename if non-NULL checks if filename terminates with the
- * extensions of the registered formats
- * @param mime_type if non-NULL checks if mime_type matches with the
- * MIME type of the registered formats
- */
-AVOutputFormat *av_guess_format(const char *short_name,
-                                const char *filename,
-                                const char *mime_type);
-
-/**
- * Guess the codec ID based upon muxer and filename.
- */
-enum AVCodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
-                            const char *filename, const char *mime_type,
-                            enum AVMediaType type);
-
-/**
- * @}
- */
-
-
-/**
- * @defgroup lavf_misc Utility functions
- * @ingroup libavf
- * @{
- *
- * Miscellaneous utility functions related to both muxing and demuxing
- * (or neither).
- */
-
-/**
- * Send a nice hexadecimal dump of a buffer to the specified file stream.
- *
- * @param f The file stream pointer where the dump should be sent to.
- * @param buf buffer
- * @param size buffer size
- *
- * @see av_hex_dump_log, av_pkt_dump2, av_pkt_dump_log2
- */
-void av_hex_dump(FILE *f, const uint8_t *buf, int size);
-
-/**
- * Send a nice hexadecimal dump of a buffer to the log.
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- * pointer to an AVClass struct.
- * @param level The importance level of the message, lower values signifying
- * higher importance.
- * @param buf buffer
- * @param size buffer size
- *
- * @see av_hex_dump, av_pkt_dump2, av_pkt_dump_log2
- */
-void av_hex_dump_log(void *avcl, int level, const uint8_t *buf, int size);
-
-/**
- * Send a nice dump of a packet to the specified file stream.
- *
- * @param f The file stream pointer where the dump should be sent to.
- * @param pkt packet to dump
- * @param dump_payload True if the payload must be displayed, too.
- * @param st AVStream that the packet belongs to
- */
-void av_pkt_dump2(FILE *f, AVPacket *pkt, int dump_payload, AVStream *st);
-
-
-/**
- * Send a nice dump of a packet to the log.
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- * pointer to an AVClass struct.
- * @param level The importance level of the message, lower values signifying
- * higher importance.
- * @param pkt packet to dump
- * @param dump_payload True if the payload must be displayed, too.
- * @param st AVStream that the packet belongs to
- */
-void av_pkt_dump_log2(void *avcl, int level, AVPacket *pkt, int dump_payload,
-                      AVStream *st);
-
-/**
- * Get the AVCodecID for the given codec tag tag.
- * If no codec id is found returns AV_CODEC_ID_NONE.
- *
- * @param tags list of supported codec_id-codec_tag pairs, as stored
- * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
- * @param tag  codec tag to match to a codec ID
- */
-enum AVCodecID av_codec_get_id(const struct AVCodecTag * const *tags, unsigned int tag);
-
-/**
- * Get the codec tag for the given codec id id.
- * If no codec tag is found returns 0.
- *
- * @param tags list of supported codec_id-codec_tag pairs, as stored
- * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
- * @param id   codec ID to match to a codec tag
- */
-unsigned int av_codec_get_tag(const struct AVCodecTag * const *tags, enum AVCodecID id);
-
-int av_find_default_stream_index(AVFormatContext *s);
-
-/**
- * Get the index for a specific timestamp.
- *
- * @param st        stream that the timestamp belongs to
- * @param timestamp timestamp to retrieve the index for
- * @param flags if AVSEEK_FLAG_BACKWARD then the returned index will correspond
- *                 to the timestamp which is <= the requested one, if backward
- *                 is 0, then it will be >=
- *              if AVSEEK_FLAG_ANY seek to any frame, only keyframes otherwise
- * @return < 0 if no such timestamp could be found
- */
-int av_index_search_timestamp(AVStream *st, int64_t timestamp, int flags);
-
-/**
- * Add an index entry into a sorted list. Update the entry if the list
- * already contains it.
- *
- * @param timestamp timestamp in the time base of the given stream
- */
-int av_add_index_entry(AVStream *st, int64_t pos, int64_t timestamp,
-                       int size, int distance, int flags);
-
-
-/**
- * Split a URL string into components.
- *
- * The pointers to buffers for storing individual components may be null,
- * in order to ignore that component. Buffers for components not found are
- * set to empty strings. If the port is not found, it is set to a negative
- * value.
- *
- * @param proto the buffer for the protocol
- * @param proto_size the size of the proto buffer
- * @param authorization the buffer for the authorization
- * @param authorization_size the size of the authorization buffer
- * @param hostname the buffer for the host name
- * @param hostname_size the size of the hostname buffer
- * @param port_ptr a pointer to store the port number in
- * @param path the buffer for the path
- * @param path_size the size of the path buffer
- * @param url the URL to split
- */
-void av_url_split(char *proto,         int proto_size,
-                  char *authorization, int authorization_size,
-                  char *hostname,      int hostname_size,
-                  int *port_ptr,
-                  char *path,          int path_size,
-                  const char *url);
-
-
-void av_dump_format(AVFormatContext *ic,
-                    int index,
-                    const char *url,
-                    int is_output);
-
-/**
- * Return in 'buf' the path with '%d' replaced by a number.
- *
- * Also handles the '%0nd' format where 'n' is the total number
- * of digits and '%%'.
- *
- * @param buf destination buffer
- * @param buf_size destination buffer size
- * @param path numbered sequence string
- * @param number frame number
- * @return 0 if OK, -1 on format error
- */
-int av_get_frame_filename(char *buf, int buf_size,
-                          const char *path, int number);
-
-/**
- * Check whether filename actually is a numbered sequence generator.
- *
- * @param filename possible numbered sequence string
- * @return 1 if a valid numbered sequence string, 0 otherwise
- */
-int av_filename_number_test(const char *filename);
-
-/**
- * Generate an SDP for an RTP session.
- *
- * Note, this overwrites the id values of AVStreams in the muxer contexts
- * for getting unique dynamic payload types.
- *
- * @param ac array of AVFormatContexts describing the RTP streams. If the
- *           array is composed by only one context, such context can contain
- *           multiple AVStreams (one AVStream per RTP stream). Otherwise,
- *           all the contexts in the array (an AVCodecContext per RTP stream)
- *           must contain only one AVStream.
- * @param n_files number of AVCodecContexts contained in ac
- * @param buf buffer where the SDP will be stored (must be allocated by
- *            the caller)
- * @param size the size of the buffer
- * @return 0 if OK, AVERROR_xxx on error
- */
-int av_sdp_create(AVFormatContext *ac[], int n_files, char *buf, int size);
-
-/**
- * Return a positive value if the given filename has one of the given
- * extensions, 0 otherwise.
- *
- * @param filename   file name to check against the given extensions
- * @param extensions a comma-separated list of filename extensions
- */
-int av_match_ext(const char *filename, const char *extensions);
-
-/**
- * Test if the given container can store a codec.
- *
- * @param ofmt           container to check for compatibility
- * @param codec_id       codec to potentially store in container
- * @param std_compliance standards compliance level, one of FF_COMPLIANCE_*
- *
- * @return 1 if codec with ID codec_id can be stored in ofmt, 0 if it cannot.
- *         A negative number if this information is not available.
- */
-int avformat_query_codec(AVOutputFormat *ofmt, enum AVCodecID codec_id, int std_compliance);
-
-/**
- * @defgroup riff_fourcc RIFF FourCCs
- * @{
- * Get the tables mapping RIFF FourCCs to libavcodec AVCodecIDs. The tables are
- * meant to be passed to av_codec_get_id()/av_codec_get_tag() as in the
- * following code:
- * @code
- * uint32_t tag = MKTAG('H', '2', '6', '4');
- * const struct AVCodecTag *table[] = { avformat_get_riff_video_tags(), 0 };
- * enum AVCodecID id = av_codec_get_id(table, tag);
- * @endcode
- */
-/**
- * @return the table mapping RIFF FourCCs for video to libavcodec AVCodecID.
- */
-const struct AVCodecTag *avformat_get_riff_video_tags(void);
-/**
- * @return the table mapping RIFF FourCCs for audio to AVCodecID.
- */
-const struct AVCodecTag *avformat_get_riff_audio_tags(void);
-/**
- * @}
- */
-
-/**
- * @}
- */
-
-#endif /* AVFORMAT_AVFORMAT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavformat/avio.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavformat/avio.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavformat/avio.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavformat/avio.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,439 +0,0 @@
-/*
- * copyright (c) 2001 Fabrice Bellard
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-#ifndef AVFORMAT_AVIO_H
-#define AVFORMAT_AVIO_H
-
-/**
- * @file
- * @ingroup lavf_io
- * Buffered I/O operations
- */
-
-#include <stdint.h>
-
-#include "libavutil/common.h"
-#include "libavutil/dict.h"
-#include "libavutil/log.h"
-
-#include "libavformat/version.h"
-
-
-#define AVIO_SEEKABLE_NORMAL 0x0001 /**< Seeking works like for a local file */
-
-/**
- * Callback for checking whether to abort blocking functions.
- * AVERROR_EXIT is returned in this case by the interrupted
- * function. During blocking operations, callback is called with
- * opaque as parameter. If the callback returns 1, the
- * blocking operation will be aborted.
- *
- * No members can be added to this struct without a major bump, if
- * new elements have been added after this struct in AVFormatContext
- * or AVIOContext.
- */
-typedef struct AVIOInterruptCB {
-    int (*callback)(void*);
-    void *opaque;
-} AVIOInterruptCB;
-
-/**
- * Bytestream IO Context.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVIOContext) must not be used outside libav*.
- *
- * @note None of the function pointers in AVIOContext should be called
- *       directly, they should only be set by the client application
- *       when implementing custom I/O. Normally these are set to the
- *       function pointers specified in avio_alloc_context()
- */
-typedef struct AVIOContext {
-    /**
-     * A class for private options.
-     *
-     * If this AVIOContext is created by avio_open2(), av_class is set and
-     * passes the options down to protocols.
-     *
-     * If this AVIOContext is manually allocated, then av_class may be set by
-     * the caller.
-     *
-     * warning -- this field can be NULL, be sure to not pass this AVIOContext
-     * to any av_opt_* functions in that case.
-     */
-    const AVClass *av_class;
-    unsigned char *buffer;  /**< Start of the buffer. */
-    int buffer_size;        /**< Maximum buffer size */
-    unsigned char *buf_ptr; /**< Current position in the buffer */
-    unsigned char *buf_end; /**< End of the data, may be less than
-                                 buffer+buffer_size if the read function returned
-                                 less data than requested, e.g. for streams where
-                                 no more data has been received yet. */
-    void *opaque;           /**< A private pointer, passed to the read/write/seek/...
-                                 functions. */
-    int (*read_packet)(void *opaque, uint8_t *buf, int buf_size);
-    int (*write_packet)(void *opaque, uint8_t *buf, int buf_size);
-    int64_t (*seek)(void *opaque, int64_t offset, int whence);
-    int64_t pos;            /**< position in the file of the current buffer */
-    int must_flush;         /**< true if the next seek should flush */
-    int eof_reached;        /**< true if eof reached */
-    int write_flag;         /**< true if open for writing */
-    int max_packet_size;
-    unsigned long checksum;
-    unsigned char *checksum_ptr;
-    unsigned long (*update_checksum)(unsigned long checksum, const uint8_t *buf, unsigned int size);
-    int error;              /**< contains the error code or 0 if no error happened */
-    /**
-     * Pause or resume playback for network streaming protocols - e.g. MMS.
-     */
-    int (*read_pause)(void *opaque, int pause);
-    /**
-     * Seek to a given timestamp in stream with the specified stream_index.
-     * Needed for some network streaming protocols which don't support seeking
-     * to byte position.
-     */
-    int64_t (*read_seek)(void *opaque, int stream_index,
-                         int64_t timestamp, int flags);
-    /**
-     * A combination of AVIO_SEEKABLE_ flags or 0 when the stream is not seekable.
-     */
-    int seekable;
-} AVIOContext;
-
-/* unbuffered I/O */
-
-/**
- * Return AVIO_FLAG_* access flags corresponding to the access permissions
- * of the resource in url, or a negative value corresponding to an
- * AVERROR code in case of failure. The returned access flags are
- * masked by the value in flags.
- *
- * @note This function is intrinsically unsafe, in the sense that the
- * checked resource may change its existence or permission status from
- * one call to another. Thus you should not trust the returned value,
- * unless you are sure that no other processes are accessing the
- * checked resource.
- */
-int avio_check(const char *url, int flags);
-
-/**
- * Allocate and initialize an AVIOContext for buffered I/O. It must be later
- * freed with av_free().
- *
- * @param buffer Memory block for input/output operations via AVIOContext.
- *        The buffer must be allocated with av_malloc() and friends.
- * @param buffer_size The buffer size is very important for performance.
- *        For protocols with fixed blocksize it should be set to this blocksize.
- *        For others a typical size is a cache page, e.g. 4kb.
- * @param write_flag Set to 1 if the buffer should be writable, 0 otherwise.
- * @param opaque An opaque pointer to user-specific data.
- * @param read_packet  A function for refilling the buffer, may be NULL.
- * @param write_packet A function for writing the buffer contents, may be NULL.
- * @param seek A function for seeking to specified byte position, may be NULL.
- *
- * @return Allocated AVIOContext or NULL on failure.
- */
-AVIOContext *avio_alloc_context(
-                  unsigned char *buffer,
-                  int buffer_size,
-                  int write_flag,
-                  void *opaque,
-                  int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
-                  int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
-                  int64_t (*seek)(void *opaque, int64_t offset, int whence));
-
-void avio_w8(AVIOContext *s, int b);
-void avio_write(AVIOContext *s, const unsigned char *buf, int size);
-void avio_wl64(AVIOContext *s, uint64_t val);
-void avio_wb64(AVIOContext *s, uint64_t val);
-void avio_wl32(AVIOContext *s, unsigned int val);
-void avio_wb32(AVIOContext *s, unsigned int val);
-void avio_wl24(AVIOContext *s, unsigned int val);
-void avio_wb24(AVIOContext *s, unsigned int val);
-void avio_wl16(AVIOContext *s, unsigned int val);
-void avio_wb16(AVIOContext *s, unsigned int val);
-
-/**
- * Write a NULL-terminated string.
- * @return number of bytes written.
- */
-int avio_put_str(AVIOContext *s, const char *str);
-
-/**
- * Convert an UTF-8 string to UTF-16LE and write it.
- * @return number of bytes written.
- */
-int avio_put_str16le(AVIOContext *s, const char *str);
-
-/**
- * Passing this as the "whence" parameter to a seek function causes it to
- * return the filesize without seeking anywhere. Supporting this is optional.
- * If it is not supported then the seek function will return <0.
- */
-#define AVSEEK_SIZE 0x10000
-
-/**
- * Oring this flag as into the "whence" parameter to a seek function causes it to
- * seek by any means (like reopening and linear reading) or other normally unreasonble
- * means that can be extreemly slow.
- * This may be ignored by the seek code.
- */
-#define AVSEEK_FORCE 0x20000
-
-/**
- * fseek() equivalent for AVIOContext.
- * @return new position or AVERROR.
- */
-int64_t avio_seek(AVIOContext *s, int64_t offset, int whence);
-
-/**
- * Skip given number of bytes forward
- * @return new position or AVERROR.
- */
-static av_always_inline int64_t avio_skip(AVIOContext *s, int64_t offset)
-{
-    return avio_seek(s, offset, SEEK_CUR);
-}
-
-/**
- * ftell() equivalent for AVIOContext.
- * @return position or AVERROR.
- */
-static av_always_inline int64_t avio_tell(AVIOContext *s)
-{
-    return avio_seek(s, 0, SEEK_CUR);
-}
-
-/**
- * Get the filesize.
- * @return filesize or AVERROR
- */
-int64_t avio_size(AVIOContext *s);
-
-/** @warning currently size is limited */
-int avio_printf(AVIOContext *s, const char *fmt, ...) av_printf_format(2, 3);
-
-void avio_flush(AVIOContext *s);
-
-
-/**
- * Read size bytes from AVIOContext into buf.
- * @return number of bytes read or AVERROR
- */
-int avio_read(AVIOContext *s, unsigned char *buf, int size);
-
-/**
- * @name Functions for reading from AVIOContext
- * @{
- *
- * @note return 0 if EOF, so you cannot use it if EOF handling is
- *       necessary
- */
-int          avio_r8  (AVIOContext *s);
-unsigned int avio_rl16(AVIOContext *s);
-unsigned int avio_rl24(AVIOContext *s);
-unsigned int avio_rl32(AVIOContext *s);
-uint64_t     avio_rl64(AVIOContext *s);
-unsigned int avio_rb16(AVIOContext *s);
-unsigned int avio_rb24(AVIOContext *s);
-unsigned int avio_rb32(AVIOContext *s);
-uint64_t     avio_rb64(AVIOContext *s);
-/**
- * @}
- */
-
-/**
- * Read a string from pb into buf. The reading will terminate when either
- * a NULL character was encountered, maxlen bytes have been read, or nothing
- * more can be read from pb. The result is guaranteed to be NULL-terminated, it
- * will be truncated if buf is too small.
- * Note that the string is not interpreted or validated in any way, it
- * might get truncated in the middle of a sequence for multi-byte encodings.
- *
- * @return number of bytes read (is always <= maxlen).
- * If reading ends on EOF or error, the return value will be one more than
- * bytes actually read.
- */
-int avio_get_str(AVIOContext *pb, int maxlen, char *buf, int buflen);
-
-/**
- * Read a UTF-16 string from pb and convert it to UTF-8.
- * The reading will terminate when either a null or invalid character was
- * encountered or maxlen bytes have been read.
- * @return number of bytes read (is always <= maxlen)
- */
-int avio_get_str16le(AVIOContext *pb, int maxlen, char *buf, int buflen);
-int avio_get_str16be(AVIOContext *pb, int maxlen, char *buf, int buflen);
-
-
-/**
- * @name URL open modes
- * The flags argument to avio_open must be one of the following
- * constants, optionally ORed with other flags.
- * @{
- */
-#define AVIO_FLAG_READ  1                                      /**< read-only */
-#define AVIO_FLAG_WRITE 2                                      /**< write-only */
-#define AVIO_FLAG_READ_WRITE (AVIO_FLAG_READ|AVIO_FLAG_WRITE)  /**< read-write pseudo flag */
-/**
- * @}
- */
-
-/**
- * Use non-blocking mode.
- * If this flag is set, operations on the context will return
- * AVERROR(EAGAIN) if they can not be performed immediately.
- * If this flag is not set, operations on the context will never return
- * AVERROR(EAGAIN).
- * Note that this flag does not affect the opening/connecting of the
- * context. Connecting a protocol will always block if necessary (e.g. on
- * network protocols) but never hang (e.g. on busy devices).
- * Warning: non-blocking protocols is work-in-progress; this flag may be
- * silently ignored.
- */
-#define AVIO_FLAG_NONBLOCK 8
-
-/**
- * Create and initialize a AVIOContext for accessing the
- * resource indicated by url.
- * @note When the resource indicated by url has been opened in
- * read+write mode, the AVIOContext can be used only for writing.
- *
- * @param s Used to return the pointer to the created AVIOContext.
- * In case of failure the pointed to value is set to NULL.
- * @param url resource to access
- * @param flags flags which control how the resource indicated by url
- * is to be opened
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure
- */
-int avio_open(AVIOContext **s, const char *url, int flags);
-
-/**
- * Create and initialize a AVIOContext for accessing the
- * resource indicated by url.
- * @note When the resource indicated by url has been opened in
- * read+write mode, the AVIOContext can be used only for writing.
- *
- * @param s Used to return the pointer to the created AVIOContext.
- * In case of failure the pointed to value is set to NULL.
- * @param url resource to access
- * @param flags flags which control how the resource indicated by url
- * is to be opened
- * @param int_cb an interrupt callback to be used at the protocols level
- * @param options  A dictionary filled with protocol-private options. On return
- * this parameter will be destroyed and replaced with a dict containing options
- * that were not found. May be NULL.
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure
- */
-int avio_open2(AVIOContext **s, const char *url, int flags,
-               const AVIOInterruptCB *int_cb, AVDictionary **options);
-
-/**
- * Close the resource accessed by the AVIOContext s and free it.
- * This function can only be used if s was opened by avio_open().
- *
- * The internal buffer is automatically flushed before closing the
- * resource.
- *
- * @return 0 on success, an AVERROR < 0 on error.
- * @see avio_closep
- */
-int avio_close(AVIOContext *s);
-
-/**
- * Close the resource accessed by the AVIOContext *s, free it
- * and set the pointer pointing to it to NULL.
- * This function can only be used if s was opened by avio_open().
- *
- * The internal buffer is automatically flushed before closing the
- * resource.
- *
- * @return 0 on success, an AVERROR < 0 on error.
- * @see avio_close
- */
-int avio_closep(AVIOContext **s);
-
-
-/**
- * Open a write only memory stream.
- *
- * @param s new IO context
- * @return zero if no error.
- */
-int avio_open_dyn_buf(AVIOContext **s);
-
-/**
- * Return the written size and a pointer to the buffer. The buffer
- * must be freed with av_free().
- * Padding of FF_INPUT_BUFFER_PADDING_SIZE is added to the buffer.
- *
- * @param s IO context
- * @param pbuffer pointer to a byte buffer
- * @return the length of the byte buffer
- */
-int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer);
-
-/**
- * Iterate through names of available protocols.
- *
- * @param opaque A private pointer representing current protocol.
- *        It must be a pointer to NULL on first iteration and will
- *        be updated by successive calls to avio_enum_protocols.
- * @param output If set to 1, iterate over output protocols,
- *               otherwise over input protocols.
- *
- * @return A static string containing the name of current protocol or NULL
- */
-const char *avio_enum_protocols(void **opaque, int output);
-
-/**
- * Pause and resume playing - only meaningful if using a network streaming
- * protocol (e.g. MMS).
- *
- * @param h     IO context from which to call the read_pause function pointer
- * @param pause 1 for pause, 0 for resume
- */
-int     avio_pause(AVIOContext *h, int pause);
-
-/**
- * Seek to a given timestamp relative to some component stream.
- * Only meaningful if using a network streaming protocol (e.g. MMS.).
- *
- * @param h IO context from which to call the seek function pointers
- * @param stream_index The stream index that the timestamp is relative to.
- *        If stream_index is (-1) the timestamp should be in AV_TIME_BASE
- *        units from the beginning of the presentation.
- *        If a stream_index >= 0 is used and the protocol does not support
- *        seeking based on component streams, the call will fail with ENOTSUP.
- * @param timestamp timestamp in AVStream.time_base units
- *        or if there is no stream specified then in AV_TIME_BASE units.
- * @param flags Optional combination of AVSEEK_FLAG_BACKWARD, AVSEEK_FLAG_BYTE
- *        and AVSEEK_FLAG_ANY. The protocol may silently ignore
- *        AVSEEK_FLAG_BACKWARD and AVSEEK_FLAG_ANY, but AVSEEK_FLAG_BYTE will
- *        fail with ENOTSUP if used and not supported.
- * @return >= 0 on success
- * @see AVInputFormat::read_seek
- */
-int64_t avio_seek_time(AVIOContext *h, int stream_index,
-                       int64_t timestamp, int flags);
-
-#endif /* AVFORMAT_AVIO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavformat/version.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavformat/version.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavformat/version.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavformat/version.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-/*
- * Version macros.
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVFORMAT_VERSION_H
-#define AVFORMAT_VERSION_H
-
-/**
- * @file
- * @ingroup libavf
- * Libavformat version macros
- */
-
-#include "libavutil/version.h"
-
-#define LIBAVFORMAT_VERSION_MAJOR 55
-#define LIBAVFORMAT_VERSION_MINOR 12
-#define LIBAVFORMAT_VERSION_MICRO  0
-
-#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
-                                               LIBAVFORMAT_VERSION_MINOR, \
-                                               LIBAVFORMAT_VERSION_MICRO)
-#define LIBAVFORMAT_VERSION     AV_VERSION(LIBAVFORMAT_VERSION_MAJOR,   \
-                                           LIBAVFORMAT_VERSION_MINOR,   \
-                                           LIBAVFORMAT_VERSION_MICRO)
-#define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
-
-#define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
-
-/**
- * FF_API_* defines may be placed below to indicate public API that will be
- * dropped at a future version bump. The defines themselves are not part of
- * the public API and may change, break or disappear at any time.
- */
-#ifndef FF_API_REFERENCE_DTS
-#define FF_API_REFERENCE_DTS            (LIBAVFORMAT_VERSION_MAJOR < 56)
-#endif
-
-#endif /* AVFORMAT_VERSION_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/adler32.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/adler32.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/adler32.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/adler32.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/*
- * copyright (c) 2006 Mans Rullgard
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_ADLER32_H
-#define AVUTIL_ADLER32_H
-
-#include <stdint.h>
-#include "attributes.h"
-
-/**
- * @ingroup lavu_crypto
- * Calculate the Adler32 checksum of a buffer.
- *
- * Passing the return value to a subsequent av_adler32_update() call
- * allows the checksum of multiple buffers to be calculated as though
- * they were concatenated.
- *
- * @param adler initial checksum value
- * @param buf   pointer to input buffer
- * @param len   size of input buffer
- * @return      updated checksum
- */
-unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf,
-                                unsigned int len) av_pure;
-
-#endif /* AVUTIL_ADLER32_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/aes.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/aes.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/aes.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/aes.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-/*
- * copyright (c) 2007 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_AES_H
-#define AVUTIL_AES_H
-
-#include <stdint.h>
-
-#include "attributes.h"
-#include "version.h"
-
-/**
- * @defgroup lavu_aes AES
- * @ingroup lavu_crypto
- * @{
- */
-
-#if FF_API_CONTEXT_SIZE
-extern attribute_deprecated const int av_aes_size;
-#endif
-
-struct AVAES;
-
-/**
- * Allocate an AVAES context.
- */
-struct AVAES *av_aes_alloc(void);
-
-/**
- * Initialize an AVAES context.
- * @param key_bits 128, 192 or 256
- * @param decrypt 0 for encryption, 1 for decryption
- */
-int av_aes_init(struct AVAES *a, const uint8_t *key, int key_bits, int decrypt);
-
-/**
- * Encrypt or decrypt a buffer using a previously initialized context.
- * @param count number of 16 byte blocks
- * @param dst destination array, can be equal to src
- * @param src source array, can be equal to dst
- * @param iv initialization vector for CBC mode, if NULL then ECB will be used
- * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_aes_crypt(struct AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_AES_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/attributes.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/attributes.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/attributes.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/attributes.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,126 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Macro definitions for various function/variable attributes
- */
-
-#ifndef AVUTIL_ATTRIBUTES_H
-#define AVUTIL_ATTRIBUTES_H
-
-#ifdef __GNUC__
-#    define AV_GCC_VERSION_AT_LEAST(x,y) (__GNUC__ > x || __GNUC__ == x && __GNUC_MINOR__ >= y)
-#else
-#    define AV_GCC_VERSION_AT_LEAST(x,y) 0
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_always_inline __attribute__((always_inline)) inline
-#elif defined(_MSC_VER)
-#    define av_always_inline __forceinline
-#else
-#    define av_always_inline inline
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_noinline __attribute__((noinline))
-#elif defined(_MSC_VER)
-#    define av_noinline __declspec(noinline)
-#else
-#    define av_noinline
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_pure __attribute__((pure))
-#else
-#    define av_pure
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(2,6)
-#    define av_const __attribute__((const))
-#else
-#    define av_const
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(4,3)
-#    define av_cold __attribute__((cold))
-#else
-#    define av_cold
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(4,1) && !defined(__llvm__)
-#    define av_flatten __attribute__((flatten))
-#else
-#    define av_flatten
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define attribute_deprecated __attribute__((deprecated))
-#elif defined(_MSC_VER)
-#    define attribute_deprecated __declspec(deprecated)
-#else
-#    define attribute_deprecated
-#endif
-
-#if defined(__GNUC__)
-#    define av_unused __attribute__((unused))
-#else
-#    define av_unused
-#endif
-
-/**
- * Mark a variable as used and prevent the compiler from optimizing it
- * away.  This is useful for variables accessed only from inline
- * assembler without the compiler being aware.
- */
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_used __attribute__((used))
-#else
-#    define av_used
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,3)
-#   define av_alias __attribute__((may_alias))
-#else
-#   define av_alias
-#endif
-
-#if defined(__GNUC__) && !defined(__ICC)
-#    define av_uninit(x) x=x
-#else
-#    define av_uninit(x) x
-#endif
-
-#ifdef __GNUC__
-#    define av_builtin_constant_p __builtin_constant_p
-#    define av_printf_format(fmtpos, attrpos) __attribute__((__format__(__printf__, fmtpos, attrpos)))
-#else
-#    define av_builtin_constant_p(x) 0
-#    define av_printf_format(fmtpos, attrpos)
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(2,5)
-#    define av_noreturn __attribute__((noreturn))
-#else
-#    define av_noreturn
-#endif
-
-#endif /* AVUTIL_ATTRIBUTES_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/audioconvert.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/audioconvert.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/audioconvert.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/audioconvert.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-
-#include "version.h"
-
-#if FF_API_AUDIOCONVERT
-#include "channel_layout.h"
-#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/audio_fifo.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/audio_fifo.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/audio_fifo.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/audio_fifo.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,146 +0,0 @@
-/*
- * Audio FIFO
- * Copyright (c) 2012 Justin Ruggles <justin.ruggles@gmail.com>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Audio FIFO Buffer
- */
-
-#ifndef AVUTIL_AUDIO_FIFO_H
-#define AVUTIL_AUDIO_FIFO_H
-
-#include "avutil.h"
-#include "fifo.h"
-#include "samplefmt.h"
-
-/**
- * @addtogroup lavu_audio
- * @{
- */
-
-/**
- * Context for an Audio FIFO Buffer.
- *
- * - Operates at the sample level rather than the byte level.
- * - Supports multiple channels with either planar or packed sample format.
- * - Automatic reallocation when writing to a full buffer.
- */
-typedef struct AVAudioFifo AVAudioFifo;
-
-/**
- * Free an AVAudioFifo.
- *
- * @param af  AVAudioFifo to free
- */
-void av_audio_fifo_free(AVAudioFifo *af);
-
-/**
- * Allocate an AVAudioFifo.
- *
- * @param sample_fmt  sample format
- * @param channels    number of channels
- * @param nb_samples  initial allocation size, in samples
- * @return            newly allocated AVAudioFifo, or NULL on error
- */
-AVAudioFifo *av_audio_fifo_alloc(enum AVSampleFormat sample_fmt, int channels,
-                                 int nb_samples);
-
-/**
- * Reallocate an AVAudioFifo.
- *
- * @param af          AVAudioFifo to reallocate
- * @param nb_samples  new allocation size, in samples
- * @return            0 if OK, or negative AVERROR code on failure
- */
-int av_audio_fifo_realloc(AVAudioFifo *af, int nb_samples);
-
-/**
- * Write data to an AVAudioFifo.
- *
- * The AVAudioFifo will be reallocated automatically if the available space
- * is less than nb_samples.
- *
- * @see enum AVSampleFormat
- * The documentation for AVSampleFormat describes the data layout.
- *
- * @param af          AVAudioFifo to write to
- * @param data        audio data plane pointers
- * @param nb_samples  number of samples to write
- * @return            number of samples actually written, or negative AVERROR
- *                    code on failure.
- */
-int av_audio_fifo_write(AVAudioFifo *af, void **data, int nb_samples);
-
-/**
- * Read data from an AVAudioFifo.
- *
- * @see enum AVSampleFormat
- * The documentation for AVSampleFormat describes the data layout.
- *
- * @param af          AVAudioFifo to read from
- * @param data        audio data plane pointers
- * @param nb_samples  number of samples to read
- * @return            number of samples actually read, or negative AVERROR code
- *                    on failure.
- */
-int av_audio_fifo_read(AVAudioFifo *af, void **data, int nb_samples);
-
-/**
- * Drain data from an AVAudioFifo.
- *
- * Removes the data without reading it.
- *
- * @param af          AVAudioFifo to drain
- * @param nb_samples  number of samples to drain
- * @return            0 if OK, or negative AVERROR code on failure
- */
-int av_audio_fifo_drain(AVAudioFifo *af, int nb_samples);
-
-/**
- * Reset the AVAudioFifo buffer.
- *
- * This empties all data in the buffer.
- *
- * @param af  AVAudioFifo to reset
- */
-void av_audio_fifo_reset(AVAudioFifo *af);
-
-/**
- * Get the current number of samples in the AVAudioFifo available for reading.
- *
- * @param af  the AVAudioFifo to query
- * @return    number of samples available for reading
- */
-int av_audio_fifo_size(AVAudioFifo *af);
-
-/**
- * Get the current number of samples in the AVAudioFifo available for writing.
- *
- * @param af  the AVAudioFifo to query
- * @return    number of samples available for writing
- */
-int av_audio_fifo_space(AVAudioFifo *af);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_AUDIO_FIFO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/avassert.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/avassert.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/avassert.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/avassert.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-/*
- * copyright (c) 2010 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * simple assert() macros that are a bit more flexible than ISO C assert().
- * @author Michael Niedermayer <michaelni@gmx.at>
- */
-
-#ifndef AVUTIL_AVASSERT_H
-#define AVUTIL_AVASSERT_H
-
-#include <stdlib.h>
-#include "avutil.h"
-#include "log.h"
-
-/**
- * assert() equivalent, that is always enabled.
- */
-#define av_assert0(cond) do {                                           \
-    if (!(cond)) {                                                      \
-        av_log(NULL, AV_LOG_FATAL, "Assertion %s failed at %s:%d\n",    \
-               AV_STRINGIFY(cond), __FILE__, __LINE__);                 \
-        abort();                                                        \
-    }                                                                   \
-} while (0)
-
-
-/**
- * assert() equivalent, that does not lie in speed critical code.
- * These asserts() thus can be enabled without fearing speedloss.
- */
-#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 0
-#define av_assert1(cond) av_assert0(cond)
-#else
-#define av_assert1(cond) ((void)0)
-#endif
-
-
-/**
- * assert() equivalent, that does lie in speed critical code.
- */
-#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 1
-#define av_assert2(cond) av_assert0(cond)
-#else
-#define av_assert2(cond) ((void)0)
-#endif
-
-#endif /* AVUTIL_AVASSERT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/avconfig.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/avconfig.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/avconfig.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/avconfig.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-/* Generated by ffconf */
-#ifndef AVUTIL_AVCONFIG_H
-#define AVUTIL_AVCONFIG_H
-#define AV_HAVE_BIGENDIAN 0
-#define AV_HAVE_FAST_UNALIGNED 1
-#endif /* AVUTIL_AVCONFIG_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/avstring.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/avstring.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/avstring.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/avstring.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 2007 Mans Rullgard
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_AVSTRING_H
-#define AVUTIL_AVSTRING_H
-
-#include <stddef.h>
-#include "attributes.h"
-
-/**
- * @addtogroup lavu_string
- * @{
- */
-
-/**
- * Return non-zero if pfx is a prefix of str. If it is, *ptr is set to
- * the address of the first character in str after the prefix.
- *
- * @param str input string
- * @param pfx prefix to test
- * @param ptr updated if the prefix is matched inside str
- * @return non-zero if the prefix matches, zero otherwise
- */
-int av_strstart(const char *str, const char *pfx, const char **ptr);
-
-/**
- * Return non-zero if pfx is a prefix of str independent of case. If
- * it is, *ptr is set to the address of the first character in str
- * after the prefix.
- *
- * @param str input string
- * @param pfx prefix to test
- * @param ptr updated if the prefix is matched inside str
- * @return non-zero if the prefix matches, zero otherwise
- */
-int av_stristart(const char *str, const char *pfx, const char **ptr);
-
-/**
- * Locate the first case-independent occurrence in the string haystack
- * of the string needle.  A zero-length string needle is considered to
- * match at the start of haystack.
- *
- * This function is a case-insensitive version of the standard strstr().
- *
- * @param haystack string to search in
- * @param needle   string to search for
- * @return         pointer to the located match within haystack
- *                 or a null pointer if no match
- */
-char *av_stristr(const char *haystack, const char *needle);
-
-/**
- * Locate the first occurrence of the string needle in the string haystack
- * where not more than hay_length characters are searched. A zero-length
- * string needle is considered to match at the start of haystack.
- *
- * This function is a length-limited version of the standard strstr().
- *
- * @param haystack   string to search in
- * @param needle     string to search for
- * @param hay_length length of string to search in
- * @return           pointer to the located match within haystack
- *                   or a null pointer if no match
- */
-char *av_strnstr(const char *haystack, const char *needle, size_t hay_length);
-
-/**
- * Copy the string src to dst, but no more than size - 1 bytes, and
- * null-terminate dst.
- *
- * This function is the same as BSD strlcpy().
- *
- * @param dst destination buffer
- * @param src source string
- * @param size size of destination buffer
- * @return the length of src
- *
- * @warning since the return value is the length of src, src absolutely
- * _must_ be a properly 0-terminated string, otherwise this will read beyond
- * the end of the buffer and possibly crash.
- */
-size_t av_strlcpy(char *dst, const char *src, size_t size);
-
-/**
- * Append the string src to the string dst, but to a total length of
- * no more than size - 1 bytes, and null-terminate dst.
- *
- * This function is similar to BSD strlcat(), but differs when
- * size <= strlen(dst).
- *
- * @param dst destination buffer
- * @param src source string
- * @param size size of destination buffer
- * @return the total length of src and dst
- *
- * @warning since the return value use the length of src and dst, these
- * absolutely _must_ be a properly 0-terminated strings, otherwise this
- * will read beyond the end of the buffer and possibly crash.
- */
-size_t av_strlcat(char *dst, const char *src, size_t size);
-
-/**
- * Append output to a string, according to a format. Never write out of
- * the destination buffer, and always put a terminating 0 within
- * the buffer.
- * @param dst destination buffer (string to which the output is
- *  appended)
- * @param size total size of the destination buffer
- * @param fmt printf-compatible format string, specifying how the
- *  following parameters are used
- * @return the length of the string that would have been generated
- *  if enough space had been available
- */
-size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...) av_printf_format(3, 4);
-
-/**
- * Convert a number to a av_malloced string.
- */
-char *av_d2str(double d);
-
-/**
- * Unescape the given string until a non escaped terminating char,
- * and return the token corresponding to the unescaped string.
- *
- * The normal \ and ' escaping is supported. Leading and trailing
- * whitespaces are removed, unless they are escaped with '\' or are
- * enclosed between ''.
- *
- * @param buf the buffer to parse, buf will be updated to point to the
- * terminating char
- * @param term a 0-terminated list of terminating chars
- * @return the malloced unescaped string, which must be av_freed by
- * the user, NULL in case of allocation failure
- */
-char *av_get_token(const char **buf, const char *term);
-
-/**
- * Locale-independent conversion of ASCII isdigit.
- */
-int av_isdigit(int c);
-
-/**
- * Locale-independent conversion of ASCII isgraph.
- */
-int av_isgraph(int c);
-
-/**
- * Locale-independent conversion of ASCII isspace.
- */
-int av_isspace(int c);
-
-/**
- * Locale-independent conversion of ASCII characters to uppercase.
- */
-static inline int av_toupper(int c)
-{
-    if (c >= 'a' && c <= 'z')
-        c ^= 0x20;
-    return c;
-}
-
-/**
- * Locale-independent conversion of ASCII characters to lowercase.
- */
-static inline int av_tolower(int c)
-{
-    if (c >= 'A' && c <= 'Z')
-        c ^= 0x20;
-    return c;
-}
-
-/**
- * Locale-independent conversion of ASCII isxdigit.
- */
-int av_isxdigit(int c);
-
-/*
- * Locale-independent case-insensitive compare.
- * @note This means only ASCII-range characters are case-insensitive
- */
-int av_strcasecmp(const char *a, const char *b);
-
-/**
- * Locale-independent case-insensitive compare.
- * @note This means only ASCII-range characters are case-insensitive
- */
-int av_strncasecmp(const char *a, const char *b, size_t n);
-
-
-/**
- * Thread safe basename.
- * @param path the path, on DOS both \ and / are considered separators.
- * @return pointer to the basename substring.
- */
-const char *av_basename(const char *path);
-
-/**
- * Thread safe dirname.
- * @param path the path, on DOS both \ and / are considered separators.
- * @return the path with the separator replaced by the string terminator or ".".
- * @note the function may change the input string.
- */
-const char *av_dirname(char *path);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_AVSTRING_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/avutil.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/avutil.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/avutil.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/avutil.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,284 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_AVUTIL_H
-#define AVUTIL_AVUTIL_H
-
-/**
- * @file
- * external API header
- */
-
-/**
- * @mainpage
- *
- * @section libav_intro Introduction
- *
- * This document describes the usage of the different libraries
- * provided by Libav.
- *
- * @li @ref libavc "libavcodec" encoding/decoding library
- * @li @ref lavfi "libavfilter" graph-based frame editing library
- * @li @ref libavf "libavformat" I/O and muxing/demuxing library
- * @li @ref lavd "libavdevice" special devices muxing/demuxing library
- * @li @ref lavu "libavutil" common utility library
- * @li @ref lavr "libavresample" audio resampling, format conversion and mixing
- * @li @ref libsws "libswscale"  color conversion and scaling library
- *
- * @section libav_versioning Versioning and compatibility
- *
- * Each of the Libav libraries contains a version.h header, which defines a
- * major, minor and micro version number with the
- * <em>LIBRARYNAME_VERSION_{MAJOR,MINOR,MICRO}</em> macros. The major version
- * number is incremented with backward incompatible changes - e.g. removing
- * parts of the public API, reordering public struct members, etc. The minor
- * version number is incremented for backward compatible API changes or major
- * new features - e.g. adding a new public function or a new decoder. The micro
- * version number is incremented for smaller changes that a calling program
- * might still want to check for - e.g. changing behavior in a previously
- * unspecified situation.
- *
- * Libav guarantees backward API and ABI compatibility for each library as long
- * as its major version number is unchanged. This means that no public symbols
- * will be removed or renamed. Types and names of the public struct members and
- * values of public macros and enums will remain the same (unless they were
- * explicitly declared as not part of the public API). Documented behavior will
- * not change.
- *
- * In other words, any correct program that works with a given Libav snapshot
- * should work just as well without any changes with any later snapshot with the
- * same major versions. This applies to both rebuilding the program against new
- * Libav versions or to replacing the dynamic Libav libraries that a program
- * links against.
- *
- * However, new public symbols may be added and new members may be appended to
- * public structs whose size is not part of public ABI (most public structs in
- * Libav). New macros and enum values may be added. Behavior in undocumented
- * situations may change slightly (and be documented). All those are accompanied
- * by an entry in doc/APIchanges and incrementing either the minor or micro
- * version number.
- */
-
-/**
- * @defgroup lavu Common utility functions
- *
- * @brief
- * libavutil contains the code shared across all the other Libav
- * libraries
- *
- * @note In order to use the functions provided by avutil you must include
- * the specific header.
- *
- * @{
- *
- * @defgroup lavu_crypto Crypto and Hashing
- *
- * @{
- * @}
- *
- * @defgroup lavu_math Maths
- * @{
- *
- * @}
- *
- * @defgroup lavu_string String Manipulation
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_mem Memory Management
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_data Data Structures
- * @{
- *
- * @}
- *
- * @defgroup lavu_audio Audio related
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_error Error Codes
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_log Logging Facility
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_misc Other
- *
- * @{
- *
- * @defgroup lavu_internal Internal
- *
- * Not exported functions, for internal usage only
- *
- * @{
- *
- * @}
- *
- * @defgroup preproc_misc Preprocessor String Macros
- *
- * @{
- *
- * @}
- */
-
-
-/**
- * @addtogroup lavu_ver
- * @{
- */
-
-/**
- * Return the LIBAVUTIL_VERSION_INT constant.
- */
-unsigned avutil_version(void);
-
-/**
- * Return the libavutil build-time configuration.
- */
-const char *avutil_configuration(void);
-
-/**
- * Return the libavutil license.
- */
-const char *avutil_license(void);
-
-/**
- * @}
- */
-
-/**
- * @addtogroup lavu_media Media Type
- * @brief Media Type
- */
-
-enum AVMediaType {
-    AVMEDIA_TYPE_UNKNOWN = -1,  ///< Usually treated as AVMEDIA_TYPE_DATA
-    AVMEDIA_TYPE_VIDEO,
-    AVMEDIA_TYPE_AUDIO,
-    AVMEDIA_TYPE_DATA,          ///< Opaque data information usually continuous
-    AVMEDIA_TYPE_SUBTITLE,
-    AVMEDIA_TYPE_ATTACHMENT,    ///< Opaque data information usually sparse
-    AVMEDIA_TYPE_NB
-};
-
-/**
- * @defgroup lavu_const Constants
- * @{
- *
- * @defgroup lavu_enc Encoding specific
- *
- * @note those definition should move to avcodec
- * @{
- */
-
-#define FF_LAMBDA_SHIFT 7
-#define FF_LAMBDA_SCALE (1<<FF_LAMBDA_SHIFT)
-#define FF_QP2LAMBDA 118 ///< factor to convert from H.263 QP to lambda
-#define FF_LAMBDA_MAX (256*128-1)
-
-#define FF_QUALITY_SCALE FF_LAMBDA_SCALE //FIXME maybe remove
-
-/**
- * @}
- * @defgroup lavu_time Timestamp specific
- *
- * Libav internal timebase and timestamp definitions
- *
- * @{
- */
-
-/**
- * @brief Undefined timestamp value
- *
- * Usually reported by demuxer that work on containers that do not provide
- * either pts or dts.
- */
-
-#define AV_NOPTS_VALUE          INT64_C(0x8000000000000000)
-
-/**
- * Internal time base represented as integer
- */
-
-#define AV_TIME_BASE            1000000
-
-/**
- * Internal time base represented as fractional value
- */
-
-#define AV_TIME_BASE_Q          (AVRational){1, AV_TIME_BASE}
-
-/**
- * @}
- * @}
- * @defgroup lavu_picture Image related
- *
- * AVPicture types, pixel formats and basic image planes manipulation.
- *
- * @{
- */
-
-enum AVPictureType {
-    AV_PICTURE_TYPE_I = 1, ///< Intra
-    AV_PICTURE_TYPE_P,     ///< Predicted
-    AV_PICTURE_TYPE_B,     ///< Bi-dir predicted
-    AV_PICTURE_TYPE_S,     ///< S(GMC)-VOP MPEG4
-    AV_PICTURE_TYPE_SI,    ///< Switching Intra
-    AV_PICTURE_TYPE_SP,    ///< Switching Predicted
-    AV_PICTURE_TYPE_BI,    ///< BI type
-};
-
-/**
- * Return a single letter to describe the given picture type
- * pict_type.
- *
- * @param[in] pict_type the picture type @return a single character
- * representing the picture type, '?' if pict_type is unknown
- */
-char av_get_picture_type_char(enum AVPictureType pict_type);
-
-/**
- * @}
- */
-
-#include "error.h"
-#include "version.h"
-#include "macros.h"
-
-/**
- * @}
- * @}
- */
-
-#endif /* AVUTIL_AVUTIL_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/base64.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/base64.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/base64.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/base64.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2006 Ryan Martell. (rdm4@martellventures.com)
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_BASE64_H
-#define AVUTIL_BASE64_H
-
-#include <stdint.h>
-
-/**
- * @defgroup lavu_base64 Base64
- * @ingroup lavu_crypto
- * @{
- */
-
-
-/**
- * Decode a base64-encoded string.
- *
- * @param out      buffer for decoded data
- * @param in       null-terminated input string
- * @param out_size size in bytes of the out buffer, must be at
- *                 least 3/4 of the length of in
- * @return         number of bytes written, or a negative value in case of
- *                 invalid input
- */
-int av_base64_decode(uint8_t *out, const char *in, int out_size);
-
-/**
- * Encode data to base64 and null-terminate.
- *
- * @param out      buffer for encoded data
- * @param out_size size in bytes of the output buffer, must be at
- *                 least AV_BASE64_SIZE(in_size)
- * @param in_size  size in bytes of the 'in' buffer
- * @return         'out' or NULL in case of error
- */
-char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size);
-
-/**
- * Calculate the output size needed to base64-encode x bytes.
- */
-#define AV_BASE64_SIZE(x)  (((x)+2) / 3 * 4 + 1)
-
- /**
-  * @}
-  */
-
-#endif /* AVUTIL_BASE64_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/blowfish.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/blowfish.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/blowfish.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/blowfish.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +0,0 @@
-/*
- * Blowfish algorithm
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_BLOWFISH_H
-#define AVUTIL_BLOWFISH_H
-
-#include <stdint.h>
-
-/**
- * @defgroup lavu_blowfish Blowfish
- * @ingroup lavu_crypto
- * @{
- */
-
-#define AV_BF_ROUNDS 16
-
-typedef struct AVBlowfish {
-    uint32_t p[AV_BF_ROUNDS + 2];
-    uint32_t s[4][256];
-} AVBlowfish;
-
-/**
- * Initialize an AVBlowfish context.
- *
- * @param ctx an AVBlowfish context
- * @param key a key
- * @param key_len length of the key
- */
-void av_blowfish_init(struct AVBlowfish *ctx, const uint8_t *key, int key_len);
-
-/**
- * Encrypt or decrypt a buffer using a previously initialized context.
- *
- * @param ctx an AVBlowfish context
- * @param xl left four bytes halves of input to be encrypted
- * @param xr right four bytes halves of input to be encrypted
- * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_blowfish_crypt_ecb(struct AVBlowfish *ctx, uint32_t *xl, uint32_t *xr,
-                           int decrypt);
-
-/**
- * Encrypt or decrypt a buffer using a previously initialized context.
- *
- * @param ctx an AVBlowfish context
- * @param dst destination array, can be equal to src
- * @param src source array, can be equal to dst
- * @param count number of 8 byte blocks
- * @param iv initialization vector for CBC mode, if NULL ECB will be used
- * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_blowfish_crypt(struct AVBlowfish *ctx, uint8_t *dst, const uint8_t *src,
-                       int count, uint8_t *iv, int decrypt);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_BLOWFISH_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/bswap.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/bswap.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/bswap.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/bswap.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * byte swapping routines
- */
-
-#ifndef AVUTIL_BSWAP_H
-#define AVUTIL_BSWAP_H
-
-#include <stdint.h>
-#include "libavutil/avconfig.h"
-#include "attributes.h"
-
-#ifdef HAVE_AV_CONFIG_H
-
-#include "config.h"
-
-#if   ARCH_AARCH64
-#   include "aarch64/bswap.h"
-#elif ARCH_ARM
-#   include "arm/bswap.h"
-#elif ARCH_AVR32
-#   include "avr32/bswap.h"
-#elif ARCH_BFIN
-#   include "bfin/bswap.h"
-#elif ARCH_SH4
-#   include "sh4/bswap.h"
-#elif ARCH_X86
-#   include "x86/bswap.h"
-#endif
-
-#endif /* HAVE_AV_CONFIG_H */
-
-#define AV_BSWAP16C(x) (((x) << 8 & 0xff00)  | ((x) >> 8 & 0x00ff))
-#define AV_BSWAP32C(x) (AV_BSWAP16C(x) << 16 | AV_BSWAP16C((x) >> 16))
-#define AV_BSWAP64C(x) (AV_BSWAP32C(x) << 32 | AV_BSWAP32C((x) >> 32))
-
-#define AV_BSWAPC(s, x) AV_BSWAP##s##C(x)
-
-#ifndef av_bswap16
-static av_always_inline av_const uint16_t av_bswap16(uint16_t x)
-{
-    x= (x>>8) | (x<<8);
-    return x;
-}
-#endif
-
-#ifndef av_bswap32
-static av_always_inline av_const uint32_t av_bswap32(uint32_t x)
-{
-    return AV_BSWAP32C(x);
-}
-#endif
-
-#ifndef av_bswap64
-static inline uint64_t av_const av_bswap64(uint64_t x)
-{
-    return (uint64_t)av_bswap32(x) << 32 | av_bswap32(x >> 32);
-}
-#endif
-
-// be2ne ... big-endian to native-endian
-// le2ne ... little-endian to native-endian
-
-#if AV_HAVE_BIGENDIAN
-#define av_be2ne16(x) (x)
-#define av_be2ne32(x) (x)
-#define av_be2ne64(x) (x)
-#define av_le2ne16(x) av_bswap16(x)
-#define av_le2ne32(x) av_bswap32(x)
-#define av_le2ne64(x) av_bswap64(x)
-#define AV_BE2NEC(s, x) (x)
-#define AV_LE2NEC(s, x) AV_BSWAPC(s, x)
-#else
-#define av_be2ne16(x) av_bswap16(x)
-#define av_be2ne32(x) av_bswap32(x)
-#define av_be2ne64(x) av_bswap64(x)
-#define av_le2ne16(x) (x)
-#define av_le2ne32(x) (x)
-#define av_le2ne64(x) (x)
-#define AV_BE2NEC(s, x) AV_BSWAPC(s, x)
-#define AV_LE2NEC(s, x) (x)
-#endif
-
-#define AV_BE2NE16C(x) AV_BE2NEC(16, x)
-#define AV_BE2NE32C(x) AV_BE2NEC(32, x)
-#define AV_BE2NE64C(x) AV_BE2NEC(64, x)
-#define AV_LE2NE16C(x) AV_LE2NEC(16, x)
-#define AV_LE2NE32C(x) AV_LE2NEC(32, x)
-#define AV_LE2NE64C(x) AV_LE2NEC(64, x)
-
-#endif /* AVUTIL_BSWAP_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/buffer.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/buffer.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/buffer.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/buffer.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,267 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * @ingroup lavu_buffer
- * refcounted data buffer API
- */
-
-#ifndef AVUTIL_BUFFER_H
-#define AVUTIL_BUFFER_H
-
-#include <stdint.h>
-
-/**
- * @defgroup lavu_buffer AVBuffer
- * @ingroup lavu_data
- *
- * @{
- * AVBuffer is an API for reference-counted data buffers.
- *
- * There are two core objects in this API -- AVBuffer and AVBufferRef. AVBuffer
- * represents the data buffer itself; it is opaque and not meant to be accessed
- * by the caller directly, but only through AVBufferRef. However, the caller may
- * e.g. compare two AVBuffer pointers to check whether two different references
- * are describing the same data buffer. AVBufferRef represents a single
- * reference to an AVBuffer and it is the object that may be manipulated by the
- * caller directly.
- *
- * There are two functions provided for creating a new AVBuffer with a single
- * reference -- av_buffer_alloc() to just allocate a new buffer, and
- * av_buffer_create() to wrap an existing array in an AVBuffer. From an existing
- * reference, additional references may be created with av_buffer_ref().
- * Use av_buffer_unref() to free a reference (this will automatically free the
- * data once all the references are freed).
- *
- * The convention throughout this API and the rest of Libav is such that the
- * buffer is considered writable if there exists only one reference to it (and
- * it has not been marked as read-only). The av_buffer_is_writable() function is
- * provided to check whether this is true and av_buffer_make_writable() will
- * automatically create a new writable buffer when necessary.
- * Of course nothing prevents the calling code from violating this convention,
- * however that is safe only when all the existing references are under its
- * control.
- *
- * @note Referencing and unreferencing the buffers is thread-safe and thus
- * may be done from multiple threads simultaneously without any need for
- * additional locking.
- *
- * @note Two different references to the same buffer can point to different
- * parts of the buffer (i.e. their AVBufferRef.data will not be equal).
- */
-
-/**
- * A reference counted buffer type. It is opaque and is meant to be used through
- * references (AVBufferRef).
- */
-typedef struct AVBuffer AVBuffer;
-
-/**
- * A reference to a data buffer.
- *
- * The size of this struct is not a part of the public ABI and it is not meant
- * to be allocated directly.
- */
-typedef struct AVBufferRef {
-    AVBuffer *buffer;
-
-    /**
-     * The data buffer. It is considered writable if and only if
-     * this is the only reference to the buffer, in which case
-     * av_buffer_is_writable() returns 1.
-     */
-    uint8_t *data;
-    /**
-     * Size of data in bytes.
-     */
-    int      size;
-} AVBufferRef;
-
-/**
- * Allocate an AVBuffer of the given size using av_malloc().
- *
- * @return an AVBufferRef of given size or NULL when out of memory
- */
-AVBufferRef *av_buffer_alloc(int size);
-
-/**
- * Same as av_buffer_alloc(), except the returned buffer will be initialized
- * to zero.
- */
-AVBufferRef *av_buffer_allocz(int size);
-
-/**
- * Always treat the buffer as read-only, even when it has only one
- * reference.
- */
-#define AV_BUFFER_FLAG_READONLY (1 << 0)
-
-/**
- * Create an AVBuffer from an existing array.
- *
- * If this function is successful, data is owned by the AVBuffer. The caller may
- * only access data through the returned AVBufferRef and references derived from
- * it.
- * If this function fails, data is left untouched.
- * @param data   data array
- * @param size   size of data in bytes
- * @param free   a callback for freeing this buffer's data
- * @param opaque parameter to be passed to free
- * @param flags  a combination of AV_BUFFER_FLAG_*
- *
- * @return an AVBufferRef referring to data on success, NULL on failure.
- */
-AVBufferRef *av_buffer_create(uint8_t *data, int size,
-                              void (*free)(void *opaque, uint8_t *data),
-                              void *opaque, int flags);
-
-/**
- * Default free callback, which calls av_free() on the buffer data.
- * This function is meant to be passed to av_buffer_create(), not called
- * directly.
- */
-void av_buffer_default_free(void *opaque, uint8_t *data);
-
-/**
- * Create a new reference to an AVBuffer.
- *
- * @return a new AVBufferRef referring to the same AVBuffer as buf or NULL on
- * failure.
- */
-AVBufferRef *av_buffer_ref(AVBufferRef *buf);
-
-/**
- * Free a given reference and automatically free the buffer if there are no more
- * references to it.
- *
- * @param buf the reference to be freed. The pointer is set to NULL on return.
- */
-void av_buffer_unref(AVBufferRef **buf);
-
-/**
- * @return 1 if the caller may write to the data referred to by buf (which is
- * true if and only if buf is the only reference to the underlying AVBuffer).
- * Return 0 otherwise.
- * A positive answer is valid until av_buffer_ref() is called on buf.
- */
-int av_buffer_is_writable(const AVBufferRef *buf);
-
-/**
- * Create a writable reference from a given buffer reference, avoiding data copy
- * if possible.
- *
- * @param buf buffer reference to make writable. On success, buf is either left
- *            untouched, or it is unreferenced and a new writable AVBufferRef is
- *            written in its place. On failure, buf is left untouched.
- * @return 0 on success, a negative AVERROR on failure.
- */
-int av_buffer_make_writable(AVBufferRef **buf);
-
-/**
- * Reallocate a given buffer.
- *
- * @param buf  a buffer reference to reallocate. On success, buf will be
- *             unreferenced and a new reference with the required size will be
- *             written in its place. On failure buf will be left untouched. *buf
- *             may be NULL, then a new buffer is allocated.
- * @param size required new buffer size.
- * @return 0 on success, a negative AVERROR on failure.
- *
- * @note the buffer is actually reallocated with av_realloc() only if it was
- * initially allocated through av_buffer_realloc(NULL) and there is only one
- * reference to it (i.e. the one passed to this function). In all other cases
- * a new buffer is allocated and the data is copied.
- */
-int av_buffer_realloc(AVBufferRef **buf, int size);
-
-/**
- * @}
- */
-
-/**
- * @defgroup lavu_bufferpool AVBufferPool
- * @ingroup lavu_data
- *
- * @{
- * AVBufferPool is an API for a lock-free thread-safe pool of AVBuffers.
- *
- * Frequently allocating and freeing large buffers may be slow. AVBufferPool is
- * meant to solve this in cases when the caller needs a set of buffers of the
- * same size (the most obvious use case being buffers for raw video or audio
- * frames).
- *
- * At the beginning, the user must call av_buffer_pool_init() to create the
- * buffer pool. Then whenever a buffer is needed, call av_buffer_pool_get() to
- * get a reference to a new buffer, similar to av_buffer_alloc(). This new
- * reference works in all aspects the same way as the one created by
- * av_buffer_alloc(). However, when the last reference to this buffer is
- * unreferenced, it is returned to the pool instead of being freed and will be
- * reused for subsequent av_buffer_pool_get() calls.
- *
- * When the caller is done with the pool and no longer needs to allocate any new
- * buffers, av_buffer_pool_uninit() must be called to mark the pool as freeable.
- * Once all the buffers are released, it will automatically be freed.
- *
- * Allocating and releasing buffers with this API is thread-safe as long as
- * either the default alloc callback is used, or the user-supplied one is
- * thread-safe.
- */
-
-/**
- * The buffer pool. This structure is opaque and not meant to be accessed
- * directly. It is allocated with av_buffer_pool_init() and freed with
- * av_buffer_pool_uninit().
- */
-typedef struct AVBufferPool AVBufferPool;
-
-/**
- * Allocate and initialize a buffer pool.
- *
- * @param size size of each buffer in this pool
- * @param alloc a function that will be used to allocate new buffers when the
- * pool is empty. May be NULL, then the default allocator will be used
- * (av_buffer_alloc()).
- * @return newly created buffer pool on success, NULL on error.
- */
-AVBufferPool *av_buffer_pool_init(int size, AVBufferRef* (*alloc)(int size));
-
-/**
- * Mark the pool as being available for freeing. It will actually be freed only
- * once all the allocated buffers associated with the pool are released. Thus it
- * is safe to call this function while some of the allocated buffers are still
- * in use.
- *
- * @param pool pointer to the pool to be freed. It will be set to NULL.
- * @see av_buffer_pool_can_uninit()
- */
-void av_buffer_pool_uninit(AVBufferPool **pool);
-
-/**
- * Allocate a new AVBuffer, reusing an old buffer from the pool when available.
- * This function may be called simultaneously from multiple threads.
- *
- * @return a reference to the new buffer on success, NULL on error.
- */
-AVBufferRef *av_buffer_pool_get(AVBufferPool *pool);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_BUFFER_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/channel_layout.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/channel_layout.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/channel_layout.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/channel_layout.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- * Copyright (c) 2008 Peter Ross
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_CHANNEL_LAYOUT_H
-#define AVUTIL_CHANNEL_LAYOUT_H
-
-#include <stdint.h>
-
-/**
- * @file
- * audio channel layout utility functions
- */
-
-/**
- * @addtogroup lavu_audio
- * @{
- */
-
-/**
- * @defgroup channel_masks Audio channel masks
- * @{
- */
-#define AV_CH_FRONT_LEFT             0x00000001
-#define AV_CH_FRONT_RIGHT            0x00000002
-#define AV_CH_FRONT_CENTER           0x00000004
-#define AV_CH_LOW_FREQUENCY          0x00000008
-#define AV_CH_BACK_LEFT              0x00000010
-#define AV_CH_BACK_RIGHT             0x00000020
-#define AV_CH_FRONT_LEFT_OF_CENTER   0x00000040
-#define AV_CH_FRONT_RIGHT_OF_CENTER  0x00000080
-#define AV_CH_BACK_CENTER            0x00000100
-#define AV_CH_SIDE_LEFT              0x00000200
-#define AV_CH_SIDE_RIGHT             0x00000400
-#define AV_CH_TOP_CENTER             0x00000800
-#define AV_CH_TOP_FRONT_LEFT         0x00001000
-#define AV_CH_TOP_FRONT_CENTER       0x00002000
-#define AV_CH_TOP_FRONT_RIGHT        0x00004000
-#define AV_CH_TOP_BACK_LEFT          0x00008000
-#define AV_CH_TOP_BACK_CENTER        0x00010000
-#define AV_CH_TOP_BACK_RIGHT         0x00020000
-#define AV_CH_STEREO_LEFT            0x20000000  ///< Stereo downmix.
-#define AV_CH_STEREO_RIGHT           0x40000000  ///< See AV_CH_STEREO_LEFT.
-#define AV_CH_WIDE_LEFT              0x0000000080000000ULL
-#define AV_CH_WIDE_RIGHT             0x0000000100000000ULL
-#define AV_CH_SURROUND_DIRECT_LEFT   0x0000000200000000ULL
-#define AV_CH_SURROUND_DIRECT_RIGHT  0x0000000400000000ULL
-#define AV_CH_LOW_FREQUENCY_2        0x0000000800000000ULL
-
-/** Channel mask value used for AVCodecContext.request_channel_layout
-    to indicate that the user requests the channel order of the decoder output
-    to be the native codec channel order. */
-#define AV_CH_LAYOUT_NATIVE          0x8000000000000000ULL
-
-/**
- * @}
- * @defgroup channel_mask_c Audio channel convenience macros
- * @{
- * */
-#define AV_CH_LAYOUT_MONO              (AV_CH_FRONT_CENTER)
-#define AV_CH_LAYOUT_STEREO            (AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT)
-#define AV_CH_LAYOUT_2POINT1           (AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_2_1               (AV_CH_LAYOUT_STEREO|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_SURROUND          (AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER)
-#define AV_CH_LAYOUT_3POINT1           (AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_4POINT0           (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_4POINT1           (AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_2_2               (AV_CH_LAYOUT_STEREO|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
-#define AV_CH_LAYOUT_QUAD              (AV_CH_LAYOUT_STEREO|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_5POINT0           (AV_CH_LAYOUT_SURROUND|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
-#define AV_CH_LAYOUT_5POINT1           (AV_CH_LAYOUT_5POINT0|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_5POINT0_BACK      (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_5POINT1_BACK      (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_6POINT0           (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_6POINT0_FRONT     (AV_CH_LAYOUT_2_2|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
-#define AV_CH_LAYOUT_HEXAGONAL         (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_6POINT1           (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_6POINT1_BACK      (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_6POINT1_FRONT     (AV_CH_LAYOUT_6POINT0_FRONT|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_7POINT0           (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_7POINT0_FRONT     (AV_CH_LAYOUT_5POINT0|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
-#define AV_CH_LAYOUT_7POINT1           (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_7POINT1_WIDE      (AV_CH_LAYOUT_5POINT1|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
-#define AV_CH_LAYOUT_7POINT1_WIDE_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
-#define AV_CH_LAYOUT_OCTAGONAL         (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_STEREO_DOWNMIX    (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT)
-
-enum AVMatrixEncoding {
-    AV_MATRIX_ENCODING_NONE,
-    AV_MATRIX_ENCODING_DOLBY,
-    AV_MATRIX_ENCODING_DPLII,
-    AV_MATRIX_ENCODING_DPLIIX,
-    AV_MATRIX_ENCODING_DPLIIZ,
-    AV_MATRIX_ENCODING_DOLBYEX,
-    AV_MATRIX_ENCODING_DOLBYHEADPHONE,
-    AV_MATRIX_ENCODING_NB
-};
-
-/**
- * @}
- */
-
-/**
- * Return a channel layout id that matches name, or 0 if no match is found.
- *
- * name can be one or several of the following notations,
- * separated by '+' or '|':
- * - the name of an usual channel layout (mono, stereo, 4.0, quad, 5.0,
- *   5.0(side), 5.1, 5.1(side), 7.1, 7.1(wide), downmix);
- * - the name of a single channel (FL, FR, FC, LFE, BL, BR, FLC, FRC, BC,
- *   SL, SR, TC, TFL, TFC, TFR, TBL, TBC, TBR, DL, DR);
- * - a number of channels, in decimal, optionally followed by 'c', yielding
- *   the default channel layout for that number of channels (@see
- *   av_get_default_channel_layout);
- * - a channel layout mask, in hexadecimal starting with "0x" (see the
- *   AV_CH_* macros).
- *
- * Example: "stereo+FC" = "2+FC" = "2c+1c" = "0x7"
- */
-uint64_t av_get_channel_layout(const char *name);
-
-/**
- * Return a description of a channel layout.
- * If nb_channels is <= 0, it is guessed from the channel_layout.
- *
- * @param buf put here the string containing the channel layout
- * @param buf_size size in bytes of the buffer
- */
-void av_get_channel_layout_string(char *buf, int buf_size, int nb_channels, uint64_t channel_layout);
-
-/**
- * Return the number of channels in the channel layout.
- */
-int av_get_channel_layout_nb_channels(uint64_t channel_layout);
-
-/**
- * Return default channel layout for a given number of channels.
- */
-uint64_t av_get_default_channel_layout(int nb_channels);
-
-/**
- * Get the index of a channel in channel_layout.
- *
- * @param channel a channel layout describing exactly one channel which must be
- *                present in channel_layout.
- *
- * @return index of channel in channel_layout on success, a negative AVERROR
- *         on error.
- */
-int av_get_channel_layout_channel_index(uint64_t channel_layout,
-                                        uint64_t channel);
-
-/**
- * Get the channel with the given index in channel_layout.
- */
-uint64_t av_channel_layout_extract_channel(uint64_t channel_layout, int index);
-
-/**
- * Get the name of a given channel.
- *
- * @return channel name on success, NULL on error.
- */
-const char *av_get_channel_name(uint64_t channel);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_CHANNEL_LAYOUT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/common.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/common.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/common.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/common.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,406 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * common internal and external API header
- */
-
-#ifndef AVUTIL_COMMON_H
-#define AVUTIL_COMMON_H
-
-#include <errno.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <math.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "attributes.h"
-#include "version.h"
-#include "libavutil/avconfig.h"
-
-#if AV_HAVE_BIGENDIAN
-#   define AV_NE(be, le) (be)
-#else
-#   define AV_NE(be, le) (le)
-#endif
-
-//rounded division & shift
-#define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
-/* assume b>0 */
-#define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b))
-#define FFABS(a) ((a) >= 0 ? (a) : (-(a)))
-#define FFSIGN(a) ((a) > 0 ? 1 : -1)
-
-#define FFMAX(a,b) ((a) > (b) ? (a) : (b))
-#define FFMAX3(a,b,c) FFMAX(FFMAX(a,b),c)
-#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
-#define FFMIN3(a,b,c) FFMIN(FFMIN(a,b),c)
-
-#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
-#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
-#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))
-
-/* misc math functions */
-
-#if FF_API_AV_REVERSE
-extern attribute_deprecated const uint8_t av_reverse[256];
-#endif
-
-#ifdef HAVE_AV_CONFIG_H
-#   include "config.h"
-#   include "intmath.h"
-#endif
-
-/* Pull in unguarded fallback defines at the end of this file. */
-#include "common.h"
-
-#ifndef av_log2
-av_const int av_log2(unsigned v);
-#endif
-
-#ifndef av_log2_16bit
-av_const int av_log2_16bit(unsigned v);
-#endif
-
-/**
- * Clip a signed integer value into the amin-amax range.
- * @param a value to clip
- * @param amin minimum value of the clip range
- * @param amax maximum value of the clip range
- * @return clipped value
- */
-static av_always_inline av_const int av_clip_c(int a, int amin, int amax)
-{
-    if      (a < amin) return amin;
-    else if (a > amax) return amax;
-    else               return a;
-}
-
-/**
- * Clip a signed integer value into the 0-255 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const uint8_t av_clip_uint8_c(int a)
-{
-    if (a&(~0xFF)) return (-a)>>31;
-    else           return a;
-}
-
-/**
- * Clip a signed integer value into the -128,127 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const int8_t av_clip_int8_c(int a)
-{
-    if ((a+0x80) & ~0xFF) return (a>>31) ^ 0x7F;
-    else                  return a;
-}
-
-/**
- * Clip a signed integer value into the 0-65535 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const uint16_t av_clip_uint16_c(int a)
-{
-    if (a&(~0xFFFF)) return (-a)>>31;
-    else             return a;
-}
-
-/**
- * Clip a signed integer value into the -32768,32767 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const int16_t av_clip_int16_c(int a)
-{
-    if ((a+0x8000) & ~0xFFFF) return (a>>31) ^ 0x7FFF;
-    else                      return a;
-}
-
-/**
- * Clip a signed 64-bit integer value into the -2147483648,2147483647 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const int32_t av_clipl_int32_c(int64_t a)
-{
-    if ((a+0x80000000u) & ~UINT64_C(0xFFFFFFFF)) return (a>>63) ^ 0x7FFFFFFF;
-    else                                         return a;
-}
-
-/**
- * Clip a signed integer to an unsigned power of two range.
- * @param  a value to clip
- * @param  p bit position to clip at
- * @return clipped value
- */
-static av_always_inline av_const unsigned av_clip_uintp2_c(int a, int p)
-{
-    if (a & ~((1<<p) - 1)) return -a >> 31 & ((1<<p) - 1);
-    else                   return  a;
-}
-
-/**
- * Add two signed 32-bit values with saturation.
- *
- * @param  a one value
- * @param  b another value
- * @return sum with signed saturation
- */
-static av_always_inline int av_sat_add32_c(int a, int b)
-{
-    return av_clipl_int32((int64_t)a + b);
-}
-
-/**
- * Add a doubled value to another value with saturation at both stages.
- *
- * @param  a first value
- * @param  b value doubled and added to a
- * @return sum with signed saturation
- */
-static av_always_inline int av_sat_dadd32_c(int a, int b)
-{
-    return av_sat_add32(a, av_sat_add32(b, b));
-}
-
-/**
- * Clip a float value into the amin-amax range.
- * @param a value to clip
- * @param amin minimum value of the clip range
- * @param amax maximum value of the clip range
- * @return clipped value
- */
-static av_always_inline av_const float av_clipf_c(float a, float amin, float amax)
-{
-    if      (a < amin) return amin;
-    else if (a > amax) return amax;
-    else               return a;
-}
-
-/** Compute ceil(log2(x)).
- * @param x value used to compute ceil(log2(x))
- * @return computed ceiling of log2(x)
- */
-static av_always_inline av_const int av_ceil_log2_c(int x)
-{
-    return av_log2((x - 1) << 1);
-}
-
-/**
- * Count number of bits set to one in x
- * @param x value to count bits of
- * @return the number of bits set to one in x
- */
-static av_always_inline av_const int av_popcount_c(uint32_t x)
-{
-    x -= (x >> 1) & 0x55555555;
-    x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
-    x = (x + (x >> 4)) & 0x0F0F0F0F;
-    x += x >> 8;
-    return (x + (x >> 16)) & 0x3F;
-}
-
-/**
- * Count number of bits set to one in x
- * @param x value to count bits of
- * @return the number of bits set to one in x
- */
-static av_always_inline av_const int av_popcount64_c(uint64_t x)
-{
-    return av_popcount(x) + av_popcount(x >> 32);
-}
-
-#define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24))
-#define MKBETAG(a,b,c,d) ((d) | ((c) << 8) | ((b) << 16) | ((unsigned)(a) << 24))
-
-/**
- * Convert a UTF-8 character (up to 4 bytes) to its 32-bit UCS-4 encoded form.
- *
- * @param val      Output value, must be an lvalue of type uint32_t.
- * @param GET_BYTE Expression reading one byte from the input.
- *                 Evaluated up to 7 times (4 for the currently
- *                 assigned Unicode range).  With a memory buffer
- *                 input, this could be *ptr++.
- * @param ERROR    Expression to be evaluated on invalid input,
- *                 typically a goto statement.
- */
-#define GET_UTF8(val, GET_BYTE, ERROR)\
-    val= GET_BYTE;\
-    {\
-        uint32_t top = (val & 128) >> 1;\
-        if ((val & 0xc0) == 0x80)\
-            ERROR\
-        while (val & top) {\
-            int tmp= GET_BYTE - 128;\
-            if(tmp>>6)\
-                ERROR\
-            val= (val<<6) + tmp;\
-            top <<= 5;\
-        }\
-        val &= (top << 1) - 1;\
-    }
-
-/**
- * Convert a UTF-16 character (2 or 4 bytes) to its 32-bit UCS-4 encoded form.
- *
- * @param val       Output value, must be an lvalue of type uint32_t.
- * @param GET_16BIT Expression returning two bytes of UTF-16 data converted
- *                  to native byte order.  Evaluated one or two times.
- * @param ERROR     Expression to be evaluated on invalid input,
- *                  typically a goto statement.
- */
-#define GET_UTF16(val, GET_16BIT, ERROR)\
-    val = GET_16BIT;\
-    {\
-        unsigned int hi = val - 0xD800;\
-        if (hi < 0x800) {\
-            val = GET_16BIT - 0xDC00;\
-            if (val > 0x3FFU || hi > 0x3FFU)\
-                ERROR\
-            val += (hi<<10) + 0x10000;\
-        }\
-    }\
-
-/**
- * @def PUT_UTF8(val, tmp, PUT_BYTE)
- * Convert a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes long).
- * @param val is an input-only argument and should be of type uint32_t. It holds
- * a UCS-4 encoded Unicode character that is to be converted to UTF-8. If
- * val is given as a function it is executed only once.
- * @param tmp is a temporary variable and should be of type uint8_t. It
- * represents an intermediate value during conversion that is to be
- * output by PUT_BYTE.
- * @param PUT_BYTE writes the converted UTF-8 bytes to any proper destination.
- * It could be a function or a statement, and uses tmp as the input byte.
- * For example, PUT_BYTE could be "*output++ = tmp;" PUT_BYTE will be
- * executed up to 4 times for values in the valid UTF-8 range and up to
- * 7 times in the general case, depending on the length of the converted
- * Unicode character.
- */
-#define PUT_UTF8(val, tmp, PUT_BYTE)\
-    {\
-        int bytes, shift;\
-        uint32_t in = val;\
-        if (in < 0x80) {\
-            tmp = in;\
-            PUT_BYTE\
-        } else {\
-            bytes = (av_log2(in) + 4) / 5;\
-            shift = (bytes - 1) * 6;\
-            tmp = (256 - (256 >> bytes)) | (in >> shift);\
-            PUT_BYTE\
-            while (shift >= 6) {\
-                shift -= 6;\
-                tmp = 0x80 | ((in >> shift) & 0x3f);\
-                PUT_BYTE\
-            }\
-        }\
-    }
-
-/**
- * @def PUT_UTF16(val, tmp, PUT_16BIT)
- * Convert a 32-bit Unicode character to its UTF-16 encoded form (2 or 4 bytes).
- * @param val is an input-only argument and should be of type uint32_t. It holds
- * a UCS-4 encoded Unicode character that is to be converted to UTF-16. If
- * val is given as a function it is executed only once.
- * @param tmp is a temporary variable and should be of type uint16_t. It
- * represents an intermediate value during conversion that is to be
- * output by PUT_16BIT.
- * @param PUT_16BIT writes the converted UTF-16 data to any proper destination
- * in desired endianness. It could be a function or a statement, and uses tmp
- * as the input byte.  For example, PUT_BYTE could be "*output++ = tmp;"
- * PUT_BYTE will be executed 1 or 2 times depending on input character.
- */
-#define PUT_UTF16(val, tmp, PUT_16BIT)\
-    {\
-        uint32_t in = val;\
-        if (in < 0x10000) {\
-            tmp = in;\
-            PUT_16BIT\
-        } else {\
-            tmp = 0xD800 | ((in - 0x10000) >> 10);\
-            PUT_16BIT\
-            tmp = 0xDC00 | ((in - 0x10000) & 0x3FF);\
-            PUT_16BIT\
-        }\
-    }\
-
-
-
-#include "mem.h"
-
-#ifdef HAVE_AV_CONFIG_H
-#    include "internal.h"
-#endif /* HAVE_AV_CONFIG_H */
-
-#endif /* AVUTIL_COMMON_H */
-
-/*
- * The following definitions are outside the multiple inclusion guard
- * to ensure they are immediately available in intmath.h.
- */
-
-#ifndef av_ceil_log2
-#   define av_ceil_log2     av_ceil_log2_c
-#endif
-#ifndef av_clip
-#   define av_clip          av_clip_c
-#endif
-#ifndef av_clip_uint8
-#   define av_clip_uint8    av_clip_uint8_c
-#endif
-#ifndef av_clip_int8
-#   define av_clip_int8     av_clip_int8_c
-#endif
-#ifndef av_clip_uint16
-#   define av_clip_uint16   av_clip_uint16_c
-#endif
-#ifndef av_clip_int16
-#   define av_clip_int16    av_clip_int16_c
-#endif
-#ifndef av_clipl_int32
-#   define av_clipl_int32   av_clipl_int32_c
-#endif
-#ifndef av_clip_uintp2
-#   define av_clip_uintp2   av_clip_uintp2_c
-#endif
-#ifndef av_sat_add32
-#   define av_sat_add32     av_sat_add32_c
-#endif
-#ifndef av_sat_dadd32
-#   define av_sat_dadd32    av_sat_dadd32_c
-#endif
-#ifndef av_clipf
-#   define av_clipf         av_clipf_c
-#endif
-#ifndef av_popcount
-#   define av_popcount      av_popcount_c
-#endif
-#ifndef av_popcount64
-#   define av_popcount64    av_popcount64_c
-#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/cpu.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/cpu.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/cpu.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/cpu.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_CPU_H
-#define AVUTIL_CPU_H
-
-#include "version.h"
-
-#define AV_CPU_FLAG_FORCE    0x80000000 /* force usage of selected flags (OR) */
-
-    /* lower 16 bits - CPU features */
-#define AV_CPU_FLAG_MMX          0x0001 ///< standard MMX
-#define AV_CPU_FLAG_MMXEXT       0x0002 ///< SSE integer functions or AMD MMX ext
-#if FF_API_CPU_FLAG_MMX2
-#define AV_CPU_FLAG_MMX2         0x0002 ///< SSE integer functions or AMD MMX ext
-#endif
-#define AV_CPU_FLAG_3DNOW        0x0004 ///< AMD 3DNOW
-#define AV_CPU_FLAG_SSE          0x0008 ///< SSE functions
-#define AV_CPU_FLAG_SSE2         0x0010 ///< PIV SSE2 functions
-#define AV_CPU_FLAG_SSE2SLOW 0x40000000 ///< SSE2 supported, but usually not faster
-                                        ///< than regular MMX/SSE (e.g. Core1)
-#define AV_CPU_FLAG_3DNOWEXT     0x0020 ///< AMD 3DNowExt
-#define AV_CPU_FLAG_SSE3         0x0040 ///< Prescott SSE3 functions
-#define AV_CPU_FLAG_SSE3SLOW 0x20000000 ///< SSE3 supported, but usually not faster
-                                        ///< than regular MMX/SSE (e.g. Core1)
-#define AV_CPU_FLAG_SSSE3        0x0080 ///< Conroe SSSE3 functions
-#define AV_CPU_FLAG_ATOM     0x10000000 ///< Atom processor, some SSSE3 instructions are slower
-#define AV_CPU_FLAG_SSE4         0x0100 ///< Penryn SSE4.1 functions
-#define AV_CPU_FLAG_SSE42        0x0200 ///< Nehalem SSE4.2 functions
-#define AV_CPU_FLAG_AVX          0x4000 ///< AVX functions: requires OS support even if YMM registers aren't used
-#define AV_CPU_FLAG_XOP          0x0400 ///< Bulldozer XOP functions
-#define AV_CPU_FLAG_FMA4         0x0800 ///< Bulldozer FMA4 functions
-#define AV_CPU_FLAG_CMOV         0x1000 ///< i686 cmov
-#define AV_CPU_FLAG_AVX2         0x8000 ///< AVX2 functions: requires OS support even if YMM registers aren't used
-
-#define AV_CPU_FLAG_ALTIVEC      0x0001 ///< standard
-
-#define AV_CPU_FLAG_ARMV5TE      (1 << 0)
-#define AV_CPU_FLAG_ARMV6        (1 << 1)
-#define AV_CPU_FLAG_ARMV6T2      (1 << 2)
-#define AV_CPU_FLAG_VFP          (1 << 3)
-#define AV_CPU_FLAG_VFPV3        (1 << 4)
-#define AV_CPU_FLAG_NEON         (1 << 5)
-
-/**
- * Return the flags which specify extensions supported by the CPU.
- */
-int av_get_cpu_flags(void);
-
-/**
- * Set a mask on flags returned by av_get_cpu_flags().
- * This function is mainly useful for testing.
- *
- * @warning this function is not thread safe.
- */
-void av_set_cpu_flags_mask(int mask);
-
-/**
- * Parse CPU flags from a string.
- *
- * @return a combination of AV_CPU_* flags, negative on error.
- */
-int av_parse_cpu_flags(const char *s);
-
-/**
- * @return the number of logical CPU cores present.
- */
-int av_cpu_count(void);
-
-#endif /* AVUTIL_CPU_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/crc.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/crc.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/crc.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/crc.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_CRC_H
-#define AVUTIL_CRC_H
-
-#include <stdint.h>
-#include <stddef.h>
-#include "attributes.h"
-
-typedef uint32_t AVCRC;
-
-typedef enum {
-    AV_CRC_8_ATM,
-    AV_CRC_16_ANSI,
-    AV_CRC_16_CCITT,
-    AV_CRC_32_IEEE,
-    AV_CRC_32_IEEE_LE,  /*< reversed bitorder version of AV_CRC_32_IEEE */
-    AV_CRC_MAX,         /*< Not part of public API! Do not use outside libavutil. */
-}AVCRCId;
-
-/**
- * Initialize a CRC table.
- * @param ctx must be an array of size sizeof(AVCRC)*257 or sizeof(AVCRC)*1024
- * @param le If 1, the lowest bit represents the coefficient for the highest
- *           exponent of the corresponding polynomial (both for poly and
- *           actual CRC).
- *           If 0, you must swap the CRC parameter and the result of av_crc
- *           if you need the standard representation (can be simplified in
- *           most cases to e.g. bswap16):
- *           av_bswap32(crc << (32-bits))
- * @param bits number of bits for the CRC
- * @param poly generator polynomial without the x**bits coefficient, in the
- *             representation as specified by le
- * @param ctx_size size of ctx in bytes
- * @return <0 on failure
- */
-int av_crc_init(AVCRC *ctx, int le, int bits, uint32_t poly, int ctx_size);
-
-/**
- * Get an initialized standard CRC table.
- * @param crc_id ID of a standard CRC
- * @return a pointer to the CRC table or NULL on failure
- */
-const AVCRC *av_crc_get_table(AVCRCId crc_id);
-
-/**
- * Calculate the CRC of a block.
- * @param crc CRC of previous blocks if any or initial value for CRC
- * @return CRC updated with the data from the given block
- *
- * @see av_crc_init() "le" parameter
- */
-uint32_t av_crc(const AVCRC *ctx, uint32_t crc,
-                const uint8_t *buffer, size_t length) av_pure;
-
-#endif /* AVUTIL_CRC_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/dict.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/dict.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/dict.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/dict.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,146 +0,0 @@
-/*
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Public dictionary API.
- */
-
-#ifndef AVUTIL_DICT_H
-#define AVUTIL_DICT_H
-
-/**
- * @addtogroup lavu_dict AVDictionary
- * @ingroup lavu_data
- *
- * @brief Simple key:value store
- *
- * @{
- * Dictionaries are used for storing key:value pairs. To create
- * an AVDictionary, simply pass an address of a NULL pointer to
- * av_dict_set(). NULL can be used as an empty dictionary wherever
- * a pointer to an AVDictionary is required.
- * Use av_dict_get() to retrieve an entry or iterate over all
- * entries and finally av_dict_free() to free the dictionary
- * and all its contents.
- *
- @code
-   AVDictionary *d = NULL;           // "create" an empty dictionary
-   AVDictionaryEntry *t = NULL;
-
-   av_dict_set(&d, "foo", "bar", 0); // add an entry
-
-   char *k = av_strdup("key");       // if your strings are already allocated,
-   char *v = av_strdup("value");     // you can avoid copying them like this
-   av_dict_set(&d, k, v, AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
-
-   while (t = av_dict_get(d, "", t, AV_DICT_IGNORE_SUFFIX)) {
-       <....>                             // iterate over all entries in d
-   }
-   av_dict_free(&d);
- @endcode
- *
- */
-
-#define AV_DICT_MATCH_CASE      1
-#define AV_DICT_IGNORE_SUFFIX   2
-#define AV_DICT_DONT_STRDUP_KEY 4   /**< Take ownership of a key that's been
-                                         allocated with av_malloc() and children. */
-#define AV_DICT_DONT_STRDUP_VAL 8   /**< Take ownership of a value that's been
-                                         allocated with av_malloc() and chilren. */
-#define AV_DICT_DONT_OVERWRITE 16   ///< Don't overwrite existing entries.
-#define AV_DICT_APPEND         32   /**< If the entry already exists, append to it.  Note that no
-                                      delimiter is added, the strings are simply concatenated. */
-
-typedef struct AVDictionaryEntry {
-    char *key;
-    char *value;
-} AVDictionaryEntry;
-
-typedef struct AVDictionary AVDictionary;
-
-/**
- * Get a dictionary entry with matching key.
- *
- * @param prev Set to the previous matching element to find the next.
- *             If set to NULL the first matching element is returned.
- * @param flags Allows case as well as suffix-insensitive comparisons.
- * @return Found entry or NULL, changing key or value leads to undefined behavior.
- */
-AVDictionaryEntry *
-av_dict_get(AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags);
-
-/**
- * Get number of entries in dictionary.
- *
- * @param m dictionary
- * @return  number of entries in dictionary
- */
-int av_dict_count(const AVDictionary *m);
-
-/**
- * Set the given entry in *pm, overwriting an existing entry.
- *
- * @param pm pointer to a pointer to a dictionary struct. If *pm is NULL
- * a dictionary struct is allocated and put in *pm.
- * @param key entry key to add to *pm (will be av_strduped depending on flags)
- * @param value entry value to add to *pm (will be av_strduped depending on flags).
- *        Passing a NULL value will cause an existing entry to be deleted.
- * @return >= 0 on success otherwise an error code <0
- */
-int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags);
-
-/**
- * Parse the key/value pairs list and add to a dictionary.
- *
- * @param key_val_sep  a 0-terminated list of characters used to separate
- *                     key from value
- * @param pairs_sep    a 0-terminated list of characters used to separate
- *                     two pairs from each other
- * @param flags        flags to use when adding to dictionary.
- *                     AV_DICT_DONT_STRDUP_KEY and AV_DICT_DONT_STRDUP_VAL
- *                     are ignored since the key/value tokens will always
- *                     be duplicated.
- * @return             0 on success, negative AVERROR code on failure
- */
-int av_dict_parse_string(AVDictionary **pm, const char *str,
-                         const char *key_val_sep, const char *pairs_sep,
-                         int flags);
-
-/**
- * Copy entries from one AVDictionary struct into another.
- * @param dst pointer to a pointer to a AVDictionary struct. If *dst is NULL,
- *            this function will allocate a struct for you and put it in *dst
- * @param src pointer to source AVDictionary struct
- * @param flags flags to use when setting entries in *dst
- * @note metadata is read using the AV_DICT_IGNORE_SUFFIX flag
- */
-void av_dict_copy(AVDictionary **dst, AVDictionary *src, int flags);
-
-/**
- * Free all the memory allocated for an AVDictionary struct
- * and all keys and values.
- */
-void av_dict_free(AVDictionary **m);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_DICT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/downmix_info.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/downmix_info.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/downmix_info.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/downmix_info.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2014 Tim Walker <tdskywalker@gmail.com>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_DOWNMIX_INFO_H
-#define AVUTIL_DOWNMIX_INFO_H
-
-#include "frame.h"
-
-/**
- * @file
- * audio downmix medatata
- */
-
-/**
- * @addtogroup lavu_audio
- * @{
- */
-
-/**
- * @defgroup downmix_info Audio downmix metadata
- * @{
- */
-
-/**
- * Possible downmix types.
- */
-enum AVDownmixType {
-    AV_DOWNMIX_TYPE_UNKNOWN, /**< Not indicated. */
-    AV_DOWNMIX_TYPE_LORO,    /**< Lo/Ro 2-channel downmix (Stereo). */
-    AV_DOWNMIX_TYPE_LTRT,    /**< Lt/Rt 2-channel downmix, Dolby Surround compatible. */
-    AV_DOWNMIX_TYPE_DPLII,   /**< Lt/Rt 2-channel downmix, Dolby Pro Logic II compatible. */
-    AV_DOWNMIX_TYPE_NB       /**< Number of downmix types. Not part of ABI. */
-};
-
-/**
- * This structure describes optional metadata relevant to a downmix procedure.
- *
- * All fields are set by the decoder to the value indicated in the audio
- * bitstream (if present), or to a "sane" default otherwise.
- */
-typedef struct AVDownmixInfo {
-    /**
-     * Type of downmix preferred by the mastering engineer.
-     */
-    enum AVDownmixType preferred_downmix_type;
-
-    /**
-     * Absolute scale factor representing the nominal level of the center
-     * channel during a regular downmix.
-     */
-    double center_mix_level;
-
-    /**
-     * Absolute scale factor representing the nominal level of the center
-     * channel during an Lt/Rt compatible downmix.
-     */
-    double center_mix_level_ltrt;
-
-    /**
-     * Absolute scale factor representing the nominal level of the surround
-     * channels during a regular downmix.
-     */
-    double surround_mix_level;
-
-    /**
-     * Absolute scale factor representing the nominal level of the surround
-     * channels during an Lt/Rt compatible downmix.
-     */
-    double surround_mix_level_ltrt;
-
-    /**
-     * Absolute scale factor representing the level at which the LFE data is
-     * mixed into L/R channels during downmixing.
-     */
-    double lfe_mix_level;
-} AVDownmixInfo;
-
-/**
- * Get a frame's AV_FRAME_DATA_DOWNMIX_INFO side data for editing.
- *
- * The side data is created and added to the frame if it's absent.
- *
- * @param frame the frame for which the side data is to be obtained.
- *
- * @return the AVDownmixInfo structure to be edited by the caller.
- */
-AVDownmixInfo *av_downmix_info_update_side_data(AVFrame *frame);
-
-/**
- * @}
- */
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_DOWNMIX_INFO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/error.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/error.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/error.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/error.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * error code definitions
- */
-
-#ifndef AVUTIL_ERROR_H
-#define AVUTIL_ERROR_H
-
-#include <errno.h>
-#include <stddef.h>
-
-/**
- * @addtogroup lavu_error
- *
- * @{
- */
-
-
-/* error handling */
-#if EDOM > 0
-#define AVERROR(e) (-(e))   ///< Returns a negative error code from a POSIX error code, to return from library functions.
-#define AVUNERROR(e) (-(e)) ///< Returns a POSIX error code from a library function error return value.
-#else
-/* Some platforms have E* and errno already negated. */
-#define AVERROR(e) (e)
-#define AVUNERROR(e) (e)
-#endif
-
-#define AVERROR_BSF_NOT_FOUND      (-0x39acbd08) ///< Bitstream filter not found
-#define AVERROR_DECODER_NOT_FOUND  (-0x3cbabb08) ///< Decoder not found
-#define AVERROR_DEMUXER_NOT_FOUND  (-0x32babb08) ///< Demuxer not found
-#define AVERROR_ENCODER_NOT_FOUND  (-0x3cb1ba08) ///< Encoder not found
-#define AVERROR_EOF                (-0x5fb9b0bb) ///< End of file
-#define AVERROR_EXIT               (-0x2bb6a7bb) ///< Immediate exit was requested; the called function should not be restarted
-#define AVERROR_FILTER_NOT_FOUND   (-0x33b6b908) ///< Filter not found
-#define AVERROR_INVALIDDATA        (-0x3ebbb1b7) ///< Invalid data found when processing input
-#define AVERROR_MUXER_NOT_FOUND    (-0x27aab208) ///< Muxer not found
-#define AVERROR_OPTION_NOT_FOUND   (-0x2bafb008) ///< Option not found
-#define AVERROR_PATCHWELCOME       (-0x3aa8beb0) ///< Not yet implemented in Libav, patches welcome
-#define AVERROR_PROTOCOL_NOT_FOUND (-0x30adaf08) ///< Protocol not found
-#define AVERROR_STREAM_NOT_FOUND   (-0x2dabac08) ///< Stream not found
-#define AVERROR_BUG                (-0x5fb8aabe) ///< Bug detected, please report the issue
-#define AVERROR_UNKNOWN            (-0x31b4b1ab) ///< Unknown error, typically from an external library
-#define AVERROR_EXPERIMENTAL       (-0x2bb2afa8) ///< Requested feature is flagged experimental. Set strict_std_compliance if you really want to use it.
-
-/**
- * Put a description of the AVERROR code errnum in errbuf.
- * In case of failure the global variable errno is set to indicate the
- * error. Even in case of failure av_strerror() will print a generic
- * error message indicating the errnum provided to errbuf.
- *
- * @param errnum      error code to describe
- * @param errbuf      buffer to which description is written
- * @param errbuf_size the size in bytes of errbuf
- * @return 0 on success, a negative value if a description for errnum
- * cannot be found
- */
-int av_strerror(int errnum, char *errbuf, size_t errbuf_size);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_ERROR_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/eval.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/eval.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/eval.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/eval.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2002 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * simple arithmetic expression evaluator
- */
-
-#ifndef AVUTIL_EVAL_H
-#define AVUTIL_EVAL_H
-
-#include "avutil.h"
-
-typedef struct AVExpr AVExpr;
-
-/**
- * Parse and evaluate an expression.
- * Note, this is significantly slower than av_expr_eval().
- *
- * @param res a pointer to a double where is put the result value of
- * the expression, or NAN in case of error
- * @param s expression as a zero terminated string, for example "1+2^3+5*5+sin(2/3)"
- * @param const_names NULL terminated array of zero terminated strings of constant identifiers, for example {"PI", "E", 0}
- * @param const_values a zero terminated array of values for the identifiers from const_names
- * @param func1_names NULL terminated array of zero terminated strings of funcs1 identifiers
- * @param funcs1 NULL terminated array of function pointers for functions which take 1 argument
- * @param func2_names NULL terminated array of zero terminated strings of funcs2 identifiers
- * @param funcs2 NULL terminated array of function pointers for functions which take 2 arguments
- * @param opaque a pointer which will be passed to all functions from funcs1 and funcs2
- * @param log_ctx parent logging context
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code otherwise
- */
-int av_expr_parse_and_eval(double *res, const char *s,
-                           const char * const *const_names, const double *const_values,
-                           const char * const *func1_names, double (* const *funcs1)(void *, double),
-                           const char * const *func2_names, double (* const *funcs2)(void *, double, double),
-                           void *opaque, int log_offset, void *log_ctx);
-
-/**
- * Parse an expression.
- *
- * @param expr a pointer where is put an AVExpr containing the parsed
- * value in case of successful parsing, or NULL otherwise.
- * The pointed to AVExpr must be freed with av_expr_free() by the user
- * when it is not needed anymore.
- * @param s expression as a zero terminated string, for example "1+2^3+5*5+sin(2/3)"
- * @param const_names NULL terminated array of zero terminated strings of constant identifiers, for example {"PI", "E", 0}
- * @param func1_names NULL terminated array of zero terminated strings of funcs1 identifiers
- * @param funcs1 NULL terminated array of function pointers for functions which take 1 argument
- * @param func2_names NULL terminated array of zero terminated strings of funcs2 identifiers
- * @param funcs2 NULL terminated array of function pointers for functions which take 2 arguments
- * @param log_ctx parent logging context
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code otherwise
- */
-int av_expr_parse(AVExpr **expr, const char *s,
-                  const char * const *const_names,
-                  const char * const *func1_names, double (* const *funcs1)(void *, double),
-                  const char * const *func2_names, double (* const *funcs2)(void *, double, double),
-                  int log_offset, void *log_ctx);
-
-/**
- * Evaluate a previously parsed expression.
- *
- * @param const_values a zero terminated array of values for the identifiers from av_expr_parse() const_names
- * @param opaque a pointer which will be passed to all functions from funcs1 and funcs2
- * @return the value of the expression
- */
-double av_expr_eval(AVExpr *e, const double *const_values, void *opaque);
-
-/**
- * Free a parsed expression previously created with av_expr_parse().
- */
-void av_expr_free(AVExpr *e);
-
-/**
- * Parse the string in numstr and return its value as a double. If
- * the string is empty, contains only whitespaces, or does not contain
- * an initial substring that has the expected syntax for a
- * floating-point number, no conversion is performed. In this case,
- * returns a value of zero and the value returned in tail is the value
- * of numstr.
- *
- * @param numstr a string representing a number, may contain one of
- * the International System number postfixes, for example 'K', 'M',
- * 'G'. If 'i' is appended after the postfix, powers of 2 are used
- * instead of powers of 10. The 'B' postfix multiplies the value for
- * 8, and can be appended after another postfix or used alone. This
- * allows using for example 'KB', 'MiB', 'G' and 'B' as postfix.
- * @param tail if non-NULL puts here the pointer to the char next
- * after the last parsed character
- */
-double av_strtod(const char *numstr, char **tail);
-
-#endif /* AVUTIL_EVAL_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/fifo.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/fifo.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/fifo.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/fifo.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,131 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * a very simple circular buffer FIFO implementation
- */
-
-#ifndef AVUTIL_FIFO_H
-#define AVUTIL_FIFO_H
-
-#include <stdint.h>
-#include "avutil.h"
-#include "attributes.h"
-
-typedef struct AVFifoBuffer {
-    uint8_t *buffer;
-    uint8_t *rptr, *wptr, *end;
-    uint32_t rndx, wndx;
-} AVFifoBuffer;
-
-/**
- * Initialize an AVFifoBuffer.
- * @param size of FIFO
- * @return AVFifoBuffer or NULL in case of memory allocation failure
- */
-AVFifoBuffer *av_fifo_alloc(unsigned int size);
-
-/**
- * Free an AVFifoBuffer.
- * @param f AVFifoBuffer to free
- */
-void av_fifo_free(AVFifoBuffer *f);
-
-/**
- * Reset the AVFifoBuffer to the state right after av_fifo_alloc, in particular it is emptied.
- * @param f AVFifoBuffer to reset
- */
-void av_fifo_reset(AVFifoBuffer *f);
-
-/**
- * Return the amount of data in bytes in the AVFifoBuffer, that is the
- * amount of data you can read from it.
- * @param f AVFifoBuffer to read from
- * @return size
- */
-int av_fifo_size(AVFifoBuffer *f);
-
-/**
- * Return the amount of space in bytes in the AVFifoBuffer, that is the
- * amount of data you can write into it.
- * @param f AVFifoBuffer to write into
- * @return size
- */
-int av_fifo_space(AVFifoBuffer *f);
-
-/**
- * Feed data from an AVFifoBuffer to a user-supplied callback.
- * @param f AVFifoBuffer to read from
- * @param buf_size number of bytes to read
- * @param func generic read function
- * @param dest data destination
- */
-int av_fifo_generic_read(AVFifoBuffer *f, void *dest, int buf_size, void (*func)(void*, void*, int));
-
-/**
- * Feed data from a user-supplied callback to an AVFifoBuffer.
- * @param f AVFifoBuffer to write to
- * @param src data source; non-const since it may be used as a
- * modifiable context by the function defined in func
- * @param size number of bytes to write
- * @param func generic write function; the first parameter is src,
- * the second is dest_buf, the third is dest_buf_size.
- * func must return the number of bytes written to dest_buf, or <= 0 to
- * indicate no more data available to write.
- * If func is NULL, src is interpreted as a simple byte array for source data.
- * @return the number of bytes written to the FIFO
- */
-int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int));
-
-/**
- * Resize an AVFifoBuffer.
- * @param f AVFifoBuffer to resize
- * @param size new AVFifoBuffer size in bytes
- * @return <0 for failure, >=0 otherwise
- */
-int av_fifo_realloc2(AVFifoBuffer *f, unsigned int size);
-
-/**
- * Read and discard the specified amount of data from an AVFifoBuffer.
- * @param f AVFifoBuffer to read from
- * @param size amount of data to read in bytes
- */
-void av_fifo_drain(AVFifoBuffer *f, int size);
-
-/**
- * Return a pointer to the data stored in a FIFO buffer at a certain offset.
- * The FIFO buffer is not modified.
- *
- * @param f    AVFifoBuffer to peek at, f must be non-NULL
- * @param offs an offset in bytes, its absolute value must be less
- *             than the used buffer size or the returned pointer will
- *             point outside to the buffer data.
- *             The used buffer size can be checked with av_fifo_size().
- */
-static inline uint8_t *av_fifo_peek2(const AVFifoBuffer *f, int offs)
-{
-    uint8_t *ptr = f->rptr + offs;
-    if (ptr >= f->end)
-        ptr = f->buffer + (ptr - f->end);
-    else if (ptr < f->buffer)
-        ptr = f->end - (f->buffer - ptr);
-    return ptr;
-}
-
-#endif /* AVUTIL_FIFO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/file.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/file.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/file.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/file.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_FILE_H
-#define AVUTIL_FILE_H
-
-#include <stdint.h>
-
-#include "avutil.h"
-
-/**
- * @file
- * Misc file utilities.
- */
-
-/**
- * Read the file with name filename, and put its content in a newly
- * allocated buffer or map it with mmap() when available.
- * In case of success set *bufptr to the read or mmapped buffer, and
- * *size to the size in bytes of the buffer in *bufptr.
- * The returned buffer must be released with av_file_unmap().
- *
- * @param log_offset loglevel offset used for logging
- * @param log_ctx context used for logging
- * @return a non negative number in case of success, a negative value
- * corresponding to an AVERROR error code in case of failure
- */
-int av_file_map(const char *filename, uint8_t **bufptr, size_t *size,
-                int log_offset, void *log_ctx);
-
-/**
- * Unmap or free the buffer bufptr created by av_file_map().
- *
- * @param size size in bytes of bufptr, must be the same as returned
- * by av_file_map()
- */
-void av_file_unmap(uint8_t *bufptr, size_t size);
-
-#endif /* AVUTIL_FILE_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/frame.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/frame.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/frame.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/frame.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,552 +0,0 @@
-/*
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * @ingroup lavu_frame
- * reference-counted frame API
- */
-
-#ifndef AVUTIL_FRAME_H
-#define AVUTIL_FRAME_H
-
-#include <stdint.h>
-
-#include "avutil.h"
-#include "buffer.h"
-#include "dict.h"
-#include "rational.h"
-#include "samplefmt.h"
-#include "version.h"
-
-
-/**
- * @defgroup lavu_frame AVFrame
- * @ingroup lavu_data
- *
- * @{
- * AVFrame is an abstraction for reference-counted raw multimedia data.
- */
-
-enum AVFrameSideDataType {
-    /**
-     * The data is the AVPanScan struct defined in libavcodec.
-     */
-    AV_FRAME_DATA_PANSCAN,
-    /**
-     * ATSC A53 Part 4 Closed Captions.
-     * A53 CC bitstream is stored as uint8_t in AVFrameSideData.data.
-     * The number of bytes of CC data is AVFrameSideData.size.
-     */
-    AV_FRAME_DATA_A53_CC,
-    /**
-     * Stereoscopic 3d metadata.
-     * The data is the AVStereo3D struct defined in libavutil/stereo3d.h.
-     */
-    AV_FRAME_DATA_STEREO3D,
-    /**
-     * The data is the AVMatrixEncoding enum defined in libavutil/channel_layout.h.
-     */
-    AV_FRAME_DATA_MATRIXENCODING,
-    /**
-     * Metadata relevant to a downmix procedure.
-     * The data is the AVDownmixInfo struct defined in libavutil/downmix_info.h.
-     */
-    AV_FRAME_DATA_DOWNMIX_INFO,
-};
-
-typedef struct AVFrameSideData {
-    enum AVFrameSideDataType type;
-    uint8_t *data;
-    int      size;
-    AVDictionary *metadata;
-} AVFrameSideData;
-
-/**
- * This structure describes decoded (raw) audio or video data.
- *
- * AVFrame must be allocated using av_frame_alloc(). Note that this only
- * allocates the AVFrame itself, the buffers for the data must be managed
- * through other means (see below).
- * AVFrame must be freed with av_frame_free().
- *
- * AVFrame is typically allocated once and then reused multiple times to hold
- * different data (e.g. a single AVFrame to hold frames received from a
- * decoder). In such a case, av_frame_unref() will free any references held by
- * the frame and reset it to its original clean state before it
- * is reused again.
- *
- * The data described by an AVFrame is usually reference counted through the
- * AVBuffer API. The underlying buffer references are stored in AVFrame.buf /
- * AVFrame.extended_buf. An AVFrame is considered to be reference counted if at
- * least one reference is set, i.e. if AVFrame.buf[0] != NULL. In such a case,
- * every single data plane must be contained in one of the buffers in
- * AVFrame.buf or AVFrame.extended_buf.
- * There may be a single buffer for all the data, or one separate buffer for
- * each plane, or anything in between.
- *
- * sizeof(AVFrame) is not a part of the public ABI, so new fields may be added
- * to the end with a minor bump.
- */
-typedef struct AVFrame {
-#define AV_NUM_DATA_POINTERS 8
-    /**
-     * pointer to the picture/channel planes.
-     * This might be different from the first allocated byte
-     */
-    uint8_t *data[AV_NUM_DATA_POINTERS];
-
-    /**
-     * For video, size in bytes of each picture line.
-     * For audio, size in bytes of each plane.
-     *
-     * For audio, only linesize[0] may be set. For planar audio, each channel
-     * plane must be the same size.
-     *
-     * @note The linesize may be larger than the size of usable data -- there
-     * may be extra padding present for performance reasons.
-     */
-    int linesize[AV_NUM_DATA_POINTERS];
-
-    /**
-     * pointers to the data planes/channels.
-     *
-     * For video, this should simply point to data[].
-     *
-     * For planar audio, each channel has a separate data pointer, and
-     * linesize[0] contains the size of each channel buffer.
-     * For packed audio, there is just one data pointer, and linesize[0]
-     * contains the total size of the buffer for all channels.
-     *
-     * Note: Both data and extended_data should always be set in a valid frame,
-     * but for planar audio with more channels that can fit in data,
-     * extended_data must be used in order to access all channels.
-     */
-    uint8_t **extended_data;
-
-    /**
-     * width and height of the video frame
-     */
-    int width, height;
-
-    /**
-     * number of audio samples (per channel) described by this frame
-     */
-    int nb_samples;
-
-    /**
-     * format of the frame, -1 if unknown or unset
-     * Values correspond to enum AVPixelFormat for video frames,
-     * enum AVSampleFormat for audio)
-     */
-    int format;
-
-    /**
-     * 1 -> keyframe, 0-> not
-     */
-    int key_frame;
-
-    /**
-     * Picture type of the frame.
-     */
-    enum AVPictureType pict_type;
-
-#if FF_API_AVFRAME_LAVC
-    attribute_deprecated
-    uint8_t *base[AV_NUM_DATA_POINTERS];
-#endif
-
-    /**
-     * Sample aspect ratio for the video frame, 0/1 if unknown/unspecified.
-     */
-    AVRational sample_aspect_ratio;
-
-    /**
-     * Presentation timestamp in time_base units (time when frame should be shown to user).
-     */
-    int64_t pts;
-
-    /**
-     * PTS copied from the AVPacket that was decoded to produce this frame.
-     */
-    int64_t pkt_pts;
-
-    /**
-     * DTS copied from the AVPacket that triggered returning this frame.
-     */
-    int64_t pkt_dts;
-
-    /**
-     * picture number in bitstream order
-     */
-    int coded_picture_number;
-    /**
-     * picture number in display order
-     */
-    int display_picture_number;
-
-    /**
-     * quality (between 1 (good) and FF_LAMBDA_MAX (bad))
-     */
-    int quality;
-
-#if FF_API_AVFRAME_LAVC
-    attribute_deprecated
-    int reference;
-
-    /**
-     * QP table
-     */
-    attribute_deprecated
-    int8_t *qscale_table;
-    /**
-     * QP store stride
-     */
-    attribute_deprecated
-    int qstride;
-
-    attribute_deprecated
-    int qscale_type;
-
-    /**
-     * mbskip_table[mb]>=1 if MB didn't change
-     * stride= mb_width = (width+15)>>4
-     */
-    attribute_deprecated
-    uint8_t *mbskip_table;
-
-    /**
-     * motion vector table
-     * @code
-     * example:
-     * int mv_sample_log2= 4 - motion_subsample_log2;
-     * int mb_width= (width+15)>>4;
-     * int mv_stride= (mb_width << mv_sample_log2) + 1;
-     * motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y];
-     * @endcode
-     */
-    attribute_deprecated
-    int16_t (*motion_val[2])[2];
-
-    /**
-     * macroblock type table
-     * mb_type_base + mb_width + 2
-     */
-    attribute_deprecated
-    uint32_t *mb_type;
-
-    /**
-     * DCT coefficients
-     */
-    attribute_deprecated
-    short *dct_coeff;
-
-    /**
-     * motion reference frame index
-     * the order in which these are stored can depend on the codec.
-     */
-    attribute_deprecated
-    int8_t *ref_index[2];
-#endif
-
-    /**
-     * for some private data of the user
-     */
-    void *opaque;
-
-    /**
-     * error
-     */
-    uint64_t error[AV_NUM_DATA_POINTERS];
-
-#if FF_API_AVFRAME_LAVC
-    attribute_deprecated
-    int type;
-#endif
-
-    /**
-     * When decoding, this signals how much the picture must be delayed.
-     * extra_delay = repeat_pict / (2*fps)
-     */
-    int repeat_pict;
-
-    /**
-     * The content of the picture is interlaced.
-     */
-    int interlaced_frame;
-
-    /**
-     * If the content is interlaced, is top field displayed first.
-     */
-    int top_field_first;
-
-    /**
-     * Tell user application that palette has changed from previous frame.
-     */
-    int palette_has_changed;
-
-#if FF_API_AVFRAME_LAVC
-    attribute_deprecated
-    int buffer_hints;
-
-    /**
-     * Pan scan.
-     */
-    attribute_deprecated
-    struct AVPanScan *pan_scan;
-#endif
-
-    /**
-     * reordered opaque 64bit (generally an integer or a double precision float
-     * PTS but can be anything).
-     * The user sets AVCodecContext.reordered_opaque to represent the input at
-     * that time,
-     * the decoder reorders values as needed and sets AVFrame.reordered_opaque
-     * to exactly one of the values provided by the user through AVCodecContext.reordered_opaque
-     * @deprecated in favor of pkt_pts
-     */
-    int64_t reordered_opaque;
-
-#if FF_API_AVFRAME_LAVC
-    /**
-     * @deprecated this field is unused
-     */
-    attribute_deprecated void *hwaccel_picture_private;
-
-    attribute_deprecated
-    struct AVCodecContext *owner;
-    attribute_deprecated
-    void *thread_opaque;
-
-    /**
-     * log2 of the size of the block which a single vector in motion_val represents:
-     * (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2)
-     */
-    attribute_deprecated
-    uint8_t motion_subsample_log2;
-#endif
-
-    /**
-     * Sample rate of the audio data.
-     */
-    int sample_rate;
-
-    /**
-     * Channel layout of the audio data.
-     */
-    uint64_t channel_layout;
-
-    /**
-     * AVBuffer references backing the data for this frame. If all elements of
-     * this array are NULL, then this frame is not reference counted.
-     *
-     * There may be at most one AVBuffer per data plane, so for video this array
-     * always contains all the references. For planar audio with more than
-     * AV_NUM_DATA_POINTERS channels, there may be more buffers than can fit in
-     * this array. Then the extra AVBufferRef pointers are stored in the
-     * extended_buf array.
-     */
-    AVBufferRef *buf[AV_NUM_DATA_POINTERS];
-
-    /**
-     * For planar audio which requires more than AV_NUM_DATA_POINTERS
-     * AVBufferRef pointers, this array will hold all the references which
-     * cannot fit into AVFrame.buf.
-     *
-     * Note that this is different from AVFrame.extended_data, which always
-     * contains all the pointers. This array only contains the extra pointers,
-     * which cannot fit into AVFrame.buf.
-     *
-     * This array is always allocated using av_malloc() by whoever constructs
-     * the frame. It is freed in av_frame_unref().
-     */
-    AVBufferRef **extended_buf;
-    /**
-     * Number of elements in extended_buf.
-     */
-    int        nb_extended_buf;
-
-    AVFrameSideData **side_data;
-    int            nb_side_data;
-
-/**
- * @defgroup lavu_frame_flags AV_FRAME_FLAGS
- * Flags describing additional frame properties.
- *
- * @{
- */
-
-/**
- * The frame data may be corrupted, e.g. due to decoding errors.
- */
-#define AV_FRAME_FLAG_CORRUPT       (1 << 0)
-/**
- * @}
- */
-
-    /**
-     * Frame flags, a combination of @ref lavu_frame_flags
-     */
-    int flags;
-} AVFrame;
-
-/**
- * Allocate an AVFrame and set its fields to default values.  The resulting
- * struct must be freed using av_frame_free().
- *
- * @return An AVFrame filled with default values or NULL on failure.
- *
- * @note this only allocates the AVFrame itself, not the data buffers. Those
- * must be allocated through other means, e.g. with av_frame_get_buffer() or
- * manually.
- */
-AVFrame *av_frame_alloc(void);
-
-/**
- * Free the frame and any dynamically allocated objects in it,
- * e.g. extended_data. If the frame is reference counted, it will be
- * unreferenced first.
- *
- * @param frame frame to be freed. The pointer will be set to NULL.
- */
-void av_frame_free(AVFrame **frame);
-
-/**
- * Set up a new reference to the data described by the source frame.
- *
- * Copy frame properties from src to dst and create a new reference for each
- * AVBufferRef from src.
- *
- * If src is not reference counted, new buffers are allocated and the data is
- * copied.
- *
- * @return 0 on success, a negative AVERROR on error
- */
-int av_frame_ref(AVFrame *dst, const AVFrame *src);
-
-/**
- * Create a new frame that references the same data as src.
- *
- * This is a shortcut for av_frame_alloc()+av_frame_ref().
- *
- * @return newly created AVFrame on success, NULL on error.
- */
-AVFrame *av_frame_clone(const AVFrame *src);
-
-/**
- * Unreference all the buffers referenced by frame and reset the frame fields.
- */
-void av_frame_unref(AVFrame *frame);
-
-/**
- * Move everythnig contained in src to dst and reset src.
- */
-void av_frame_move_ref(AVFrame *dst, AVFrame *src);
-
-/**
- * Allocate new buffer(s) for audio or video data.
- *
- * The following fields must be set on frame before calling this function:
- * - format (pixel format for video, sample format for audio)
- * - width and height for video
- * - nb_samples and channel_layout for audio
- *
- * This function will fill AVFrame.data and AVFrame.buf arrays and, if
- * necessary, allocate and fill AVFrame.extended_data and AVFrame.extended_buf.
- * For planar formats, one buffer will be allocated for each plane.
- *
- * @param frame frame in which to store the new buffers.
- * @param align required buffer size alignment
- *
- * @return 0 on success, a negative AVERROR on error.
- */
-int av_frame_get_buffer(AVFrame *frame, int align);
-
-/**
- * Check if the frame data is writable.
- *
- * @return A positive value if the frame data is writable (which is true if and
- * only if each of the underlying buffers has only one reference, namely the one
- * stored in this frame). Return 0 otherwise.
- *
- * If 1 is returned the answer is valid until av_buffer_ref() is called on any
- * of the underlying AVBufferRefs (e.g. through av_frame_ref() or directly).
- *
- * @see av_frame_make_writable(), av_buffer_is_writable()
- */
-int av_frame_is_writable(AVFrame *frame);
-
-/**
- * Ensure that the frame data is writable, avoiding data copy if possible.
- *
- * Do nothing if the frame is writable, allocate new buffers and copy the data
- * if it is not.
- *
- * @return 0 on success, a negative AVERROR on error.
- *
- * @see av_frame_is_writable(), av_buffer_is_writable(),
- * av_buffer_make_writable()
- */
-int av_frame_make_writable(AVFrame *frame);
-
-/**
- * Copy only "metadata" fields from src to dst.
- *
- * Metadata for the purpose of this function are those fields that do not affect
- * the data layout in the buffers.  E.g. pts, sample rate (for audio) or sample
- * aspect ratio (for video), but not width/height or channel layout.
- * Side data is also copied.
- */
-int av_frame_copy_props(AVFrame *dst, const AVFrame *src);
-
-/**
- * Get the buffer reference a given data plane is stored in.
- *
- * @param plane index of the data plane of interest in frame->extended_data.
- *
- * @return the buffer reference that contains the plane or NULL if the input
- * frame is not valid.
- */
-AVBufferRef *av_frame_get_plane_buffer(AVFrame *frame, int plane);
-
-/**
- * Add a new side data to a frame.
- *
- * @param frame a frame to which the side data should be added
- * @param type type of the added side data
- * @param size size of the side data
- *
- * @return newly added side data on success, NULL on error
- */
-AVFrameSideData *av_frame_new_side_data(AVFrame *frame,
-                                        enum AVFrameSideDataType type,
-                                        int size);
-
-/**
- * @return a pointer to the side data of a given type on success, NULL if there
- * is no side data with such type in this frame.
- */
-AVFrameSideData *av_frame_get_side_data(const AVFrame *frame,
-                                        enum AVFrameSideDataType type);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_FRAME_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/hmac.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/hmac.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/hmac.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/hmac.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2012 Martin Storsjo
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_HMAC_H
-#define AVUTIL_HMAC_H
-
-#include <stdint.h>
-
-/**
- * @defgroup lavu_hmac HMAC
- * @ingroup lavu_crypto
- * @{
- */
-
-enum AVHMACType {
-    AV_HMAC_MD5,
-    AV_HMAC_SHA1,
-};
-
-typedef struct AVHMAC AVHMAC;
-
-/**
- * Allocate an AVHMAC context.
- * @param type The hash function used for the HMAC.
- */
-AVHMAC *av_hmac_alloc(enum AVHMACType type);
-
-/**
- * Free an AVHMAC context.
- * @param ctx The context to free, may be NULL
- */
-void av_hmac_free(AVHMAC *ctx);
-
-/**
- * Initialize an AVHMAC context with an authentication key.
- * @param ctx    The HMAC context
- * @param key    The authentication key
- * @param keylen The length of the key, in bytes
- */
-void av_hmac_init(AVHMAC *ctx, const uint8_t *key, unsigned int keylen);
-
-/**
- * Hash data with the HMAC.
- * @param ctx  The HMAC context
- * @param data The data to hash
- * @param len  The length of the data, in bytes
- */
-void av_hmac_update(AVHMAC *ctx, const uint8_t *data, unsigned int len);
-
-/**
- * Finish hashing and output the HMAC digest.
- * @param ctx    The HMAC context
- * @param out    The output buffer to write the digest into
- * @param outlen The length of the out buffer, in bytes
- * @return       The number of bytes written to out, or a negative error code.
- */
-int av_hmac_final(AVHMAC *ctx, uint8_t *out, unsigned int outlen);
-
-/**
- * Hash an array of data with a key.
- * @param ctx    The HMAC context
- * @param data   The data to hash
- * @param len    The length of the data, in bytes
- * @param key    The authentication key
- * @param keylen The length of the key, in bytes
- * @param out    The output buffer to write the digest into
- * @param outlen The length of the out buffer, in bytes
- * @return       The number of bytes written to out, or a negative error code.
- */
-int av_hmac_calc(AVHMAC *ctx, const uint8_t *data, unsigned int len,
-                 const uint8_t *key, unsigned int keylen,
-                 uint8_t *out, unsigned int outlen);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_HMAC_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/imgutils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/imgutils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/imgutils.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/imgutils.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,138 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_IMGUTILS_H
-#define AVUTIL_IMGUTILS_H
-
-/**
- * @file
- * misc image utilities
- *
- * @addtogroup lavu_picture
- * @{
- */
-
-#include "avutil.h"
-#include "pixdesc.h"
-
-/**
- * Compute the max pixel step for each plane of an image with a
- * format described by pixdesc.
- *
- * The pixel step is the distance in bytes between the first byte of
- * the group of bytes which describe a pixel component and the first
- * byte of the successive group in the same plane for the same
- * component.
- *
- * @param max_pixsteps an array which is filled with the max pixel step
- * for each plane. Since a plane may contain different pixel
- * components, the computed max_pixsteps[plane] is relative to the
- * component in the plane with the max pixel step.
- * @param max_pixstep_comps an array which is filled with the component
- * for each plane which has the max pixel step. May be NULL.
- */
-void av_image_fill_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4],
-                                const AVPixFmtDescriptor *pixdesc);
-
-/**
- * Compute the size of an image line with format pix_fmt and width
- * width for the plane plane.
- *
- * @return the computed size in bytes
- */
-int av_image_get_linesize(enum AVPixelFormat pix_fmt, int width, int plane);
-
-/**
- * Fill plane linesizes for an image with pixel format pix_fmt and
- * width width.
- *
- * @param linesizes array to be filled with the linesize for each plane
- * @return >= 0 in case of success, a negative error code otherwise
- */
-int av_image_fill_linesizes(int linesizes[4], enum AVPixelFormat pix_fmt, int width);
-
-/**
- * Fill plane data pointers for an image with pixel format pix_fmt and
- * height height.
- *
- * @param data pointers array to be filled with the pointer for each image plane
- * @param ptr the pointer to a buffer which will contain the image
- * @param linesizes the array containing the linesize for each
- * plane, should be filled by av_image_fill_linesizes()
- * @return the size in bytes required for the image buffer, a negative
- * error code in case of failure
- */
-int av_image_fill_pointers(uint8_t *data[4], enum AVPixelFormat pix_fmt, int height,
-                           uint8_t *ptr, const int linesizes[4]);
-
-/**
- * Allocate an image with size w and h and pixel format pix_fmt, and
- * fill pointers and linesizes accordingly.
- * The allocated image buffer has to be freed by using
- * av_freep(&pointers[0]).
- *
- * @param align the value to use for buffer size alignment
- * @return the size in bytes required for the image buffer, a negative
- * error code in case of failure
- */
-int av_image_alloc(uint8_t *pointers[4], int linesizes[4],
-                   int w, int h, enum AVPixelFormat pix_fmt, int align);
-
-/**
- * Copy image plane from src to dst.
- * That is, copy "height" number of lines of "bytewidth" bytes each.
- * The first byte of each successive line is separated by *_linesize
- * bytes.
- *
- * @param dst_linesize linesize for the image plane in dst
- * @param src_linesize linesize for the image plane in src
- */
-void av_image_copy_plane(uint8_t       *dst, int dst_linesize,
-                         const uint8_t *src, int src_linesize,
-                         int bytewidth, int height);
-
-/**
- * Copy image in src_data to dst_data.
- *
- * @param dst_linesizes linesizes for the image in dst_data
- * @param src_linesizes linesizes for the image in src_data
- */
-void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4],
-                   const uint8_t *src_data[4], const int src_linesizes[4],
-                   enum AVPixelFormat pix_fmt, int width, int height);
-
-/**
- * Check if the given dimension of an image is valid, meaning that all
- * bytes of the image can be addressed with a signed int.
- *
- * @param w the width of the picture
- * @param h the height of the picture
- * @param log_offset the offset to sum to the log level for logging with log_ctx
- * @param log_ctx the parent logging context, it may be NULL
- * @return >= 0 if valid, a negative error code otherwise
- */
-int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx);
-
-int avpriv_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt);
-
-/**
- * @}
- */
-
-
-#endif /* AVUTIL_IMGUTILS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/intfloat.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/intfloat.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/intfloat.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/intfloat.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2011 Mans Rullgard
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_INTFLOAT_H
-#define AVUTIL_INTFLOAT_H
-
-#include <stdint.h>
-#include "attributes.h"
-
-union av_intfloat32 {
-    uint32_t i;
-    float    f;
-};
-
-union av_intfloat64 {
-    uint64_t i;
-    double   f;
-};
-
-/**
- * Reinterpret a 32-bit integer as a float.
- */
-static av_always_inline float av_int2float(uint32_t i)
-{
-    union av_intfloat32 v;
-    v.i = i;
-    return v.f;
-}
-
-/**
- * Reinterpret a float as a 32-bit integer.
- */
-static av_always_inline uint32_t av_float2int(float f)
-{
-    union av_intfloat32 v;
-    v.f = f;
-    return v.i;
-}
-
-/**
- * Reinterpret a 64-bit integer as a double.
- */
-static av_always_inline double av_int2double(uint64_t i)
-{
-    union av_intfloat64 v;
-    v.i = i;
-    return v.f;
-}
-
-/**
- * Reinterpret a double as a 64-bit integer.
- */
-static av_always_inline uint64_t av_double2int(double f)
-{
-    union av_intfloat64 v;
-    v.f = f;
-    return v.i;
-}
-
-#endif /* AVUTIL_INTFLOAT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/intreadwrite.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/intreadwrite.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/intreadwrite.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/intreadwrite.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,549 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_INTREADWRITE_H
-#define AVUTIL_INTREADWRITE_H
-
-#include <stdint.h>
-#include "libavutil/avconfig.h"
-#include "attributes.h"
-#include "bswap.h"
-
-typedef union {
-    uint64_t u64;
-    uint32_t u32[2];
-    uint16_t u16[4];
-    uint8_t  u8 [8];
-    double   f64;
-    float    f32[2];
-} av_alias av_alias64;
-
-typedef union {
-    uint32_t u32;
-    uint16_t u16[2];
-    uint8_t  u8 [4];
-    float    f32;
-} av_alias av_alias32;
-
-typedef union {
-    uint16_t u16;
-    uint8_t  u8 [2];
-} av_alias av_alias16;
-
-/*
- * Arch-specific headers can provide any combination of
- * AV_[RW][BLN](16|24|32|64) and AV_(COPY|SWAP|ZERO)(64|128) macros.
- * Preprocessor symbols must be defined, even if these are implemented
- * as inline functions.
- */
-
-#ifdef HAVE_AV_CONFIG_H
-
-#include "config.h"
-
-#if   ARCH_ARM
-#   include "arm/intreadwrite.h"
-#elif ARCH_AVR32
-#   include "avr32/intreadwrite.h"
-#elif ARCH_MIPS
-#   include "mips/intreadwrite.h"
-#elif ARCH_PPC
-#   include "ppc/intreadwrite.h"
-#elif ARCH_TOMI
-#   include "tomi/intreadwrite.h"
-#elif ARCH_X86
-#   include "x86/intreadwrite.h"
-#endif
-
-#endif /* HAVE_AV_CONFIG_H */
-
-/*
- * Map AV_RNXX <-> AV_R[BL]XX for all variants provided by per-arch headers.
- */
-
-#if AV_HAVE_BIGENDIAN
-
-#   if    defined(AV_RN16) && !defined(AV_RB16)
-#       define AV_RB16(p) AV_RN16(p)
-#   elif !defined(AV_RN16) &&  defined(AV_RB16)
-#       define AV_RN16(p) AV_RB16(p)
-#   endif
-
-#   if    defined(AV_WN16) && !defined(AV_WB16)
-#       define AV_WB16(p, v) AV_WN16(p, v)
-#   elif !defined(AV_WN16) &&  defined(AV_WB16)
-#       define AV_WN16(p, v) AV_WB16(p, v)
-#   endif
-
-#   if    defined(AV_RN24) && !defined(AV_RB24)
-#       define AV_RB24(p) AV_RN24(p)
-#   elif !defined(AV_RN24) &&  defined(AV_RB24)
-#       define AV_RN24(p) AV_RB24(p)
-#   endif
-
-#   if    defined(AV_WN24) && !defined(AV_WB24)
-#       define AV_WB24(p, v) AV_WN24(p, v)
-#   elif !defined(AV_WN24) &&  defined(AV_WB24)
-#       define AV_WN24(p, v) AV_WB24(p, v)
-#   endif
-
-#   if    defined(AV_RN32) && !defined(AV_RB32)
-#       define AV_RB32(p) AV_RN32(p)
-#   elif !defined(AV_RN32) &&  defined(AV_RB32)
-#       define AV_RN32(p) AV_RB32(p)
-#   endif
-
-#   if    defined(AV_WN32) && !defined(AV_WB32)
-#       define AV_WB32(p, v) AV_WN32(p, v)
-#   elif !defined(AV_WN32) &&  defined(AV_WB32)
-#       define AV_WN32(p, v) AV_WB32(p, v)
-#   endif
-
-#   if    defined(AV_RN64) && !defined(AV_RB64)
-#       define AV_RB64(p) AV_RN64(p)
-#   elif !defined(AV_RN64) &&  defined(AV_RB64)
-#       define AV_RN64(p) AV_RB64(p)
-#   endif
-
-#   if    defined(AV_WN64) && !defined(AV_WB64)
-#       define AV_WB64(p, v) AV_WN64(p, v)
-#   elif !defined(AV_WN64) &&  defined(AV_WB64)
-#       define AV_WN64(p, v) AV_WB64(p, v)
-#   endif
-
-#else /* AV_HAVE_BIGENDIAN */
-
-#   if    defined(AV_RN16) && !defined(AV_RL16)
-#       define AV_RL16(p) AV_RN16(p)
-#   elif !defined(AV_RN16) &&  defined(AV_RL16)
-#       define AV_RN16(p) AV_RL16(p)
-#   endif
-
-#   if    defined(AV_WN16) && !defined(AV_WL16)
-#       define AV_WL16(p, v) AV_WN16(p, v)
-#   elif !defined(AV_WN16) &&  defined(AV_WL16)
-#       define AV_WN16(p, v) AV_WL16(p, v)
-#   endif
-
-#   if    defined(AV_RN24) && !defined(AV_RL24)
-#       define AV_RL24(p) AV_RN24(p)
-#   elif !defined(AV_RN24) &&  defined(AV_RL24)
-#       define AV_RN24(p) AV_RL24(p)
-#   endif
-
-#   if    defined(AV_WN24) && !defined(AV_WL24)
-#       define AV_WL24(p, v) AV_WN24(p, v)
-#   elif !defined(AV_WN24) &&  defined(AV_WL24)
-#       define AV_WN24(p, v) AV_WL24(p, v)
-#   endif
-
-#   if    defined(AV_RN32) && !defined(AV_RL32)
-#       define AV_RL32(p) AV_RN32(p)
-#   elif !defined(AV_RN32) &&  defined(AV_RL32)
-#       define AV_RN32(p) AV_RL32(p)
-#   endif
-
-#   if    defined(AV_WN32) && !defined(AV_WL32)
-#       define AV_WL32(p, v) AV_WN32(p, v)
-#   elif !defined(AV_WN32) &&  defined(AV_WL32)
-#       define AV_WN32(p, v) AV_WL32(p, v)
-#   endif
-
-#   if    defined(AV_RN64) && !defined(AV_RL64)
-#       define AV_RL64(p) AV_RN64(p)
-#   elif !defined(AV_RN64) &&  defined(AV_RL64)
-#       define AV_RN64(p) AV_RL64(p)
-#   endif
-
-#   if    defined(AV_WN64) && !defined(AV_WL64)
-#       define AV_WL64(p, v) AV_WN64(p, v)
-#   elif !defined(AV_WN64) &&  defined(AV_WL64)
-#       define AV_WN64(p, v) AV_WL64(p, v)
-#   endif
-
-#endif /* !AV_HAVE_BIGENDIAN */
-
-/*
- * Define AV_[RW]N helper macros to simplify definitions not provided
- * by per-arch headers.
- */
-
-#if defined(__GNUC__) && !defined(__TI_COMPILER_VERSION__)
-
-union unaligned_64 { uint64_t l; } __attribute__((packed)) av_alias;
-union unaligned_32 { uint32_t l; } __attribute__((packed)) av_alias;
-union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias;
-
-#   define AV_RN(s, p) (((const union unaligned_##s *) (p))->l)
-#   define AV_WN(s, p, v) ((((union unaligned_##s *) (p))->l) = (v))
-
-#elif defined(__DECC)
-
-#   define AV_RN(s, p) (*((const __unaligned uint##s##_t*)(p)))
-#   define AV_WN(s, p, v) (*((__unaligned uint##s##_t*)(p)) = (v))
-
-#elif AV_HAVE_FAST_UNALIGNED
-
-#   define AV_RN(s, p) (((const av_alias##s*)(p))->u##s)
-#   define AV_WN(s, p, v) (((av_alias##s*)(p))->u##s = (v))
-
-#else
-
-#ifndef AV_RB16
-#   define AV_RB16(x)                           \
-    ((((const uint8_t*)(x))[0] << 8) |          \
-      ((const uint8_t*)(x))[1])
-#endif
-#ifndef AV_WB16
-#   define AV_WB16(p, d) do {                   \
-        ((uint8_t*)(p))[1] = (d);               \
-        ((uint8_t*)(p))[0] = (d)>>8;            \
-    } while(0)
-#endif
-
-#ifndef AV_RL16
-#   define AV_RL16(x)                           \
-    ((((const uint8_t*)(x))[1] << 8) |          \
-      ((const uint8_t*)(x))[0])
-#endif
-#ifndef AV_WL16
-#   define AV_WL16(p, d) do {                   \
-        ((uint8_t*)(p))[0] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-    } while(0)
-#endif
-
-#ifndef AV_RB32
-#   define AV_RB32(x)                                \
-    (((uint32_t)((const uint8_t*)(x))[0] << 24) |    \
-               (((const uint8_t*)(x))[1] << 16) |    \
-               (((const uint8_t*)(x))[2] <<  8) |    \
-                ((const uint8_t*)(x))[3])
-#endif
-#ifndef AV_WB32
-#   define AV_WB32(p, d) do {                   \
-        ((uint8_t*)(p))[3] = (d);               \
-        ((uint8_t*)(p))[2] = (d)>>8;            \
-        ((uint8_t*)(p))[1] = (d)>>16;           \
-        ((uint8_t*)(p))[0] = (d)>>24;           \
-    } while(0)
-#endif
-
-#ifndef AV_RL32
-#   define AV_RL32(x)                                \
-    (((uint32_t)((const uint8_t*)(x))[3] << 24) |    \
-               (((const uint8_t*)(x))[2] << 16) |    \
-               (((const uint8_t*)(x))[1] <<  8) |    \
-                ((const uint8_t*)(x))[0])
-#endif
-#ifndef AV_WL32
-#   define AV_WL32(p, d) do {                   \
-        ((uint8_t*)(p))[0] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-        ((uint8_t*)(p))[2] = (d)>>16;           \
-        ((uint8_t*)(p))[3] = (d)>>24;           \
-    } while(0)
-#endif
-
-#ifndef AV_RB64
-#   define AV_RB64(x)                                   \
-    (((uint64_t)((const uint8_t*)(x))[0] << 56) |       \
-     ((uint64_t)((const uint8_t*)(x))[1] << 48) |       \
-     ((uint64_t)((const uint8_t*)(x))[2] << 40) |       \
-     ((uint64_t)((const uint8_t*)(x))[3] << 32) |       \
-     ((uint64_t)((const uint8_t*)(x))[4] << 24) |       \
-     ((uint64_t)((const uint8_t*)(x))[5] << 16) |       \
-     ((uint64_t)((const uint8_t*)(x))[6] <<  8) |       \
-      (uint64_t)((const uint8_t*)(x))[7])
-#endif
-#ifndef AV_WB64
-#   define AV_WB64(p, d) do {                   \
-        ((uint8_t*)(p))[7] = (d);               \
-        ((uint8_t*)(p))[6] = (d)>>8;            \
-        ((uint8_t*)(p))[5] = (d)>>16;           \
-        ((uint8_t*)(p))[4] = (d)>>24;           \
-        ((uint8_t*)(p))[3] = (d)>>32;           \
-        ((uint8_t*)(p))[2] = (d)>>40;           \
-        ((uint8_t*)(p))[1] = (d)>>48;           \
-        ((uint8_t*)(p))[0] = (d)>>56;           \
-    } while(0)
-#endif
-
-#ifndef AV_RL64
-#   define AV_RL64(x)                                   \
-    (((uint64_t)((const uint8_t*)(x))[7] << 56) |       \
-     ((uint64_t)((const uint8_t*)(x))[6] << 48) |       \
-     ((uint64_t)((const uint8_t*)(x))[5] << 40) |       \
-     ((uint64_t)((const uint8_t*)(x))[4] << 32) |       \
-     ((uint64_t)((const uint8_t*)(x))[3] << 24) |       \
-     ((uint64_t)((const uint8_t*)(x))[2] << 16) |       \
-     ((uint64_t)((const uint8_t*)(x))[1] <<  8) |       \
-      (uint64_t)((const uint8_t*)(x))[0])
-#endif
-#ifndef AV_WL64
-#   define AV_WL64(p, d) do {                   \
-        ((uint8_t*)(p))[0] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-        ((uint8_t*)(p))[2] = (d)>>16;           \
-        ((uint8_t*)(p))[3] = (d)>>24;           \
-        ((uint8_t*)(p))[4] = (d)>>32;           \
-        ((uint8_t*)(p))[5] = (d)>>40;           \
-        ((uint8_t*)(p))[6] = (d)>>48;           \
-        ((uint8_t*)(p))[7] = (d)>>56;           \
-    } while(0)
-#endif
-
-#if AV_HAVE_BIGENDIAN
-#   define AV_RN(s, p)    AV_RB##s(p)
-#   define AV_WN(s, p, v) AV_WB##s(p, v)
-#else
-#   define AV_RN(s, p)    AV_RL##s(p)
-#   define AV_WN(s, p, v) AV_WL##s(p, v)
-#endif
-
-#endif /* HAVE_FAST_UNALIGNED */
-
-#ifndef AV_RN16
-#   define AV_RN16(p) AV_RN(16, p)
-#endif
-
-#ifndef AV_RN32
-#   define AV_RN32(p) AV_RN(32, p)
-#endif
-
-#ifndef AV_RN64
-#   define AV_RN64(p) AV_RN(64, p)
-#endif
-
-#ifndef AV_WN16
-#   define AV_WN16(p, v) AV_WN(16, p, v)
-#endif
-
-#ifndef AV_WN32
-#   define AV_WN32(p, v) AV_WN(32, p, v)
-#endif
-
-#ifndef AV_WN64
-#   define AV_WN64(p, v) AV_WN(64, p, v)
-#endif
-
-#if AV_HAVE_BIGENDIAN
-#   define AV_RB(s, p)    AV_RN##s(p)
-#   define AV_WB(s, p, v) AV_WN##s(p, v)
-#   define AV_RL(s, p)    av_bswap##s(AV_RN##s(p))
-#   define AV_WL(s, p, v) AV_WN##s(p, av_bswap##s(v))
-#else
-#   define AV_RB(s, p)    av_bswap##s(AV_RN##s(p))
-#   define AV_WB(s, p, v) AV_WN##s(p, av_bswap##s(v))
-#   define AV_RL(s, p)    AV_RN##s(p)
-#   define AV_WL(s, p, v) AV_WN##s(p, v)
-#endif
-
-#define AV_RB8(x)     (((const uint8_t*)(x))[0])
-#define AV_WB8(p, d)  do { ((uint8_t*)(p))[0] = (d); } while(0)
-
-#define AV_RL8(x)     AV_RB8(x)
-#define AV_WL8(p, d)  AV_WB8(p, d)
-
-#ifndef AV_RB16
-#   define AV_RB16(p)    AV_RB(16, p)
-#endif
-#ifndef AV_WB16
-#   define AV_WB16(p, v) AV_WB(16, p, v)
-#endif
-
-#ifndef AV_RL16
-#   define AV_RL16(p)    AV_RL(16, p)
-#endif
-#ifndef AV_WL16
-#   define AV_WL16(p, v) AV_WL(16, p, v)
-#endif
-
-#ifndef AV_RB32
-#   define AV_RB32(p)    AV_RB(32, p)
-#endif
-#ifndef AV_WB32
-#   define AV_WB32(p, v) AV_WB(32, p, v)
-#endif
-
-#ifndef AV_RL32
-#   define AV_RL32(p)    AV_RL(32, p)
-#endif
-#ifndef AV_WL32
-#   define AV_WL32(p, v) AV_WL(32, p, v)
-#endif
-
-#ifndef AV_RB64
-#   define AV_RB64(p)    AV_RB(64, p)
-#endif
-#ifndef AV_WB64
-#   define AV_WB64(p, v) AV_WB(64, p, v)
-#endif
-
-#ifndef AV_RL64
-#   define AV_RL64(p)    AV_RL(64, p)
-#endif
-#ifndef AV_WL64
-#   define AV_WL64(p, v) AV_WL(64, p, v)
-#endif
-
-#ifndef AV_RB24
-#   define AV_RB24(x)                           \
-    ((((const uint8_t*)(x))[0] << 16) |         \
-     (((const uint8_t*)(x))[1] <<  8) |         \
-      ((const uint8_t*)(x))[2])
-#endif
-#ifndef AV_WB24
-#   define AV_WB24(p, d) do {                   \
-        ((uint8_t*)(p))[2] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-        ((uint8_t*)(p))[0] = (d)>>16;           \
-    } while(0)
-#endif
-
-#ifndef AV_RL24
-#   define AV_RL24(x)                           \
-    ((((const uint8_t*)(x))[2] << 16) |         \
-     (((const uint8_t*)(x))[1] <<  8) |         \
-      ((const uint8_t*)(x))[0])
-#endif
-#ifndef AV_WL24
-#   define AV_WL24(p, d) do {                   \
-        ((uint8_t*)(p))[0] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-        ((uint8_t*)(p))[2] = (d)>>16;           \
-    } while(0)
-#endif
-
-/*
- * The AV_[RW]NA macros access naturally aligned data
- * in a type-safe way.
- */
-
-#define AV_RNA(s, p)    (((const av_alias##s*)(p))->u##s)
-#define AV_WNA(s, p, v) (((av_alias##s*)(p))->u##s = (v))
-
-#ifndef AV_RN16A
-#   define AV_RN16A(p) AV_RNA(16, p)
-#endif
-
-#ifndef AV_RN32A
-#   define AV_RN32A(p) AV_RNA(32, p)
-#endif
-
-#ifndef AV_RN64A
-#   define AV_RN64A(p) AV_RNA(64, p)
-#endif
-
-#ifndef AV_WN16A
-#   define AV_WN16A(p, v) AV_WNA(16, p, v)
-#endif
-
-#ifndef AV_WN32A
-#   define AV_WN32A(p, v) AV_WNA(32, p, v)
-#endif
-
-#ifndef AV_WN64A
-#   define AV_WN64A(p, v) AV_WNA(64, p, v)
-#endif
-
-/*
- * The AV_COPYxxU macros are suitable for copying data to/from unaligned
- * memory locations.
- */
-
-#define AV_COPYU(n, d, s) AV_WN##n(d, AV_RN##n(s));
-
-#ifndef AV_COPY16U
-#   define AV_COPY16U(d, s) AV_COPYU(16, d, s)
-#endif
-
-#ifndef AV_COPY32U
-#   define AV_COPY32U(d, s) AV_COPYU(32, d, s)
-#endif
-
-#ifndef AV_COPY64U
-#   define AV_COPY64U(d, s) AV_COPYU(64, d, s)
-#endif
-
-#ifndef AV_COPY128U
-#   define AV_COPY128U(d, s)                                    \
-    do {                                                        \
-        AV_COPY64U(d, s);                                       \
-        AV_COPY64U((char *)(d) + 8, (const char *)(s) + 8);     \
-    } while(0)
-#endif
-
-/* Parameters for AV_COPY*, AV_SWAP*, AV_ZERO* must be
- * naturally aligned. They may be implemented using MMX,
- * so emms_c() must be called before using any float code
- * afterwards.
- */
-
-#define AV_COPY(n, d, s) \
-    (((av_alias##n*)(d))->u##n = ((const av_alias##n*)(s))->u##n)
-
-#ifndef AV_COPY16
-#   define AV_COPY16(d, s) AV_COPY(16, d, s)
-#endif
-
-#ifndef AV_COPY32
-#   define AV_COPY32(d, s) AV_COPY(32, d, s)
-#endif
-
-#ifndef AV_COPY64
-#   define AV_COPY64(d, s) AV_COPY(64, d, s)
-#endif
-
-#ifndef AV_COPY128
-#   define AV_COPY128(d, s)                    \
-    do {                                       \
-        AV_COPY64(d, s);                       \
-        AV_COPY64((char*)(d)+8, (char*)(s)+8); \
-    } while(0)
-#endif
-
-#define AV_SWAP(n, a, b) FFSWAP(av_alias##n, *(av_alias##n*)(a), *(av_alias##n*)(b))
-
-#ifndef AV_SWAP64
-#   define AV_SWAP64(a, b) AV_SWAP(64, a, b)
-#endif
-
-#define AV_ZERO(n, d) (((av_alias##n*)(d))->u##n = 0)
-
-#ifndef AV_ZERO16
-#   define AV_ZERO16(d) AV_ZERO(16, d)
-#endif
-
-#ifndef AV_ZERO32
-#   define AV_ZERO32(d) AV_ZERO(32, d)
-#endif
-
-#ifndef AV_ZERO64
-#   define AV_ZERO64(d) AV_ZERO(64, d)
-#endif
-
-#ifndef AV_ZERO128
-#   define AV_ZERO128(d)         \
-    do {                         \
-        AV_ZERO64(d);            \
-        AV_ZERO64((char*)(d)+8); \
-    } while(0)
-#endif
-
-#endif /* AVUTIL_INTREADWRITE_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/lfg.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/lfg.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/lfg.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/lfg.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-/*
- * Lagged Fibonacci PRNG
- * Copyright (c) 2008 Michael Niedermayer
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_LFG_H
-#define AVUTIL_LFG_H
-
-typedef struct AVLFG {
-    unsigned int state[64];
-    int index;
-} AVLFG;
-
-void av_lfg_init(AVLFG *c, unsigned int seed);
-
-/**
- * Get the next random unsigned 32-bit number using an ALFG.
- *
- * Please also consider a simple LCG like state= state*1664525+1013904223,
- * it may be good enough and faster for your specific use case.
- */
-static inline unsigned int av_lfg_get(AVLFG *c){
-    c->state[c->index & 63] = c->state[(c->index-24) & 63] + c->state[(c->index-55) & 63];
-    return c->state[c->index++ & 63];
-}
-
-/**
- * Get the next random unsigned 32-bit number using a MLFG.
- *
- * Please also consider av_lfg_get() above, it is faster.
- */
-static inline unsigned int av_mlfg_get(AVLFG *c){
-    unsigned int a= c->state[(c->index-55) & 63];
-    unsigned int b= c->state[(c->index-24) & 63];
-    return c->state[c->index++ & 63] = 2*a*b+a+b;
-}
-
-/**
- * Get the next two numbers generated by a Box-Muller Gaussian
- * generator using the random numbers issued by lfg.
- *
- * @param out array where the two generated numbers are placed
- */
-void av_bmg_get(AVLFG *lfg, double out[2]);
-
-#endif /* AVUTIL_LFG_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/log.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/log.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/log.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/log.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,262 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_LOG_H
-#define AVUTIL_LOG_H
-
-#include <stdarg.h>
-#include "avutil.h"
-#include "attributes.h"
-
-/**
- * Describe the class of an AVClass context structure. That is an
- * arbitrary struct of which the first field is a pointer to an
- * AVClass struct (e.g. AVCodecContext, AVFormatContext etc.).
- */
-typedef struct AVClass {
-    /**
-     * The name of the class; usually it is the same name as the
-     * context structure type to which the AVClass is associated.
-     */
-    const char* class_name;
-
-    /**
-     * A pointer to a function which returns the name of a context
-     * instance ctx associated with the class.
-     */
-    const char* (*item_name)(void* ctx);
-
-    /**
-     * a pointer to the first option specified in the class if any or NULL
-     *
-     * @see av_set_default_options()
-     */
-    const struct AVOption *option;
-
-    /**
-     * LIBAVUTIL_VERSION with which this structure was created.
-     * This is used to allow fields to be added without requiring major
-     * version bumps everywhere.
-     */
-
-    int version;
-
-    /**
-     * Offset in the structure where log_level_offset is stored.
-     * 0 means there is no such variable
-     */
-    int log_level_offset_offset;
-
-    /**
-     * Offset in the structure where a pointer to the parent context for
-     * logging is stored. For example a decoder could pass its AVCodecContext
-     * to eval as such a parent context, which an av_log() implementation
-     * could then leverage to display the parent context.
-     * The offset can be NULL.
-     */
-    int parent_log_context_offset;
-
-    /**
-     * Return next AVOptions-enabled child or NULL
-     */
-    void* (*child_next)(void *obj, void *prev);
-
-    /**
-     * Return an AVClass corresponding to the next potential
-     * AVOptions-enabled child.
-     *
-     * The difference between child_next and this is that
-     * child_next iterates over _already existing_ objects, while
-     * child_class_next iterates over _all possible_ children.
-     */
-    const struct AVClass* (*child_class_next)(const struct AVClass *prev);
-} AVClass;
-
-/**
- * @addtogroup lavu_log
- *
- * @{
- *
- * @defgroup lavu_log_constants Logging Constants
- *
- * @{
- */
-
-/**
- * Print no output.
- */
-#define AV_LOG_QUIET    -8
-
-/**
- * Something went really wrong and we will crash now.
- */
-#define AV_LOG_PANIC     0
-
-/**
- * Something went wrong and recovery is not possible.
- * For example, no header was found for a format which depends
- * on headers or an illegal combination of parameters is used.
- */
-#define AV_LOG_FATAL     8
-
-/**
- * Something went wrong and cannot losslessly be recovered.
- * However, not all future data is affected.
- */
-#define AV_LOG_ERROR    16
-
-/**
- * Something somehow does not look correct. This may or may not
- * lead to problems. An example would be the use of '-vstrict -2'.
- */
-#define AV_LOG_WARNING  24
-
-/**
- * Standard information.
- */
-#define AV_LOG_INFO     32
-
-/**
- * Detailed information.
- */
-#define AV_LOG_VERBOSE  40
-
-/**
- * Stuff which is only useful for libav* developers.
- */
-#define AV_LOG_DEBUG    48
-
-/**
- * @}
- */
-
-/**
- * Send the specified message to the log if the level is less than or equal
- * to the current av_log_level. By default, all logging messages are sent to
- * stderr. This behavior can be altered by setting a different logging callback
- * function.
- * @see av_log_set_callback
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- *        pointer to an AVClass struct.
- * @param level The importance level of the message expressed using a @ref
- *        lavu_log_constants "Logging Constant".
- * @param fmt The format string (printf-compatible) that specifies how
- *        subsequent arguments are converted to output.
- */
-void av_log(void *avcl, int level, const char *fmt, ...) av_printf_format(3, 4);
-
-
-/**
- * Send the specified message to the log if the level is less than or equal
- * to the current av_log_level. By default, all logging messages are sent to
- * stderr. This behavior can be altered by setting a different logging callback
- * function.
- * @see av_log_set_callback
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- *        pointer to an AVClass struct.
- * @param level The importance level of the message expressed using a @ref
- *        lavu_log_constants "Logging Constant".
- * @param fmt The format string (printf-compatible) that specifies how
- *        subsequent arguments are converted to output.
- * @param vl The arguments referenced by the format string.
- */
-void av_vlog(void *avcl, int level, const char *fmt, va_list vl);
-
-/**
- * Get the current log level
- *
- * @see lavu_log_constants
- *
- * @return Current log level
- */
-int av_log_get_level(void);
-
-/**
- * Set the log level
- *
- * @see lavu_log_constants
- *
- * @param level Logging level
- */
-void av_log_set_level(int level);
-
-/**
- * Set the logging callback
- *
- * @see av_log_default_callback
- *
- * @param callback A logging function with a compatible signature.
- */
-void av_log_set_callback(void (*callback)(void*, int, const char*, va_list));
-
-/**
- * Default logging callback
- *
- * It prints the message to stderr, optionally colorizing it.
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- *        pointer to an AVClass struct.
- * @param level The importance level of the message expressed using a @ref
- *        lavu_log_constants "Logging Constant".
- * @param fmt The format string (printf-compatible) that specifies how
- *        subsequent arguments are converted to output.
- * @param vl The arguments referenced by the format string.
- */
-void av_log_default_callback(void *avcl, int level, const char *fmt,
-                             va_list vl);
-
-/**
- * Return the context name
- *
- * @param  ctx The AVClass context
- *
- * @return The AVClass class_name
- */
-const char* av_default_item_name(void* ctx);
-
-/**
- * av_dlog macros
- * Useful to print debug messages that shouldn't get compiled in normally.
- */
-
-#ifdef DEBUG
-#    define av_dlog(pctx, ...) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__)
-#else
-#    define av_dlog(pctx, ...)
-#endif
-
-/**
- * Skip repeated messages, this requires the user app to use av_log() instead of
- * (f)printf as the 2 would otherwise interfere and lead to
- * "Last message repeated x times" messages below (f)printf messages with some
- * bad luck.
- * Also to receive the last, "last repeated" line if any, the user app must
- * call av_log(NULL, AV_LOG_QUIET, ""); at the end
- */
-#define AV_LOG_SKIP_REPEATED 1
-void av_log_set_flags(int arg);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_LOG_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/lzo.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/lzo.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/lzo.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/lzo.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-/*
- * LZO 1x decompression
- * copyright (c) 2006 Reimar Doeffinger
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_LZO_H
-#define AVUTIL_LZO_H
-
-/**
- * @defgroup lavu_lzo LZO
- * @ingroup lavu_crypto
- *
- * @{
- */
-
-#include <stdint.h>
-
-/** @name Error flags returned by av_lzo1x_decode
- * @{ */
-/// end of the input buffer reached before decoding finished
-#define AV_LZO_INPUT_DEPLETED  1
-/// decoded data did not fit into output buffer
-#define AV_LZO_OUTPUT_FULL     2
-/// a reference to previously decoded data was wrong
-#define AV_LZO_INVALID_BACKPTR 4
-/// a non-specific error in the compressed bitstream
-#define AV_LZO_ERROR           8
-/** @} */
-
-#define AV_LZO_INPUT_PADDING   8
-#define AV_LZO_OUTPUT_PADDING 12
-
-/**
- * @brief Decodes LZO 1x compressed data.
- * @param out output buffer
- * @param outlen size of output buffer, number of bytes left are returned here
- * @param in input buffer
- * @param inlen size of input buffer, number of bytes left are returned here
- * @return 0 on success, otherwise a combination of the error flags above
- *
- * Make sure all buffers are appropriately padded, in must provide
- * AV_LZO_INPUT_PADDING, out must provide AV_LZO_OUTPUT_PADDING additional bytes.
- */
-int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_LZO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/macros.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/macros.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/macros.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/macros.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * @ingroup lavu
- * Utility Preprocessor macros
- */
-
-#ifndef AVUTIL_MACROS_H
-#define AVUTIL_MACROS_H
-
-/**
- * @addtogroup preproc_misc Preprocessor String Macros
- *
- * String manipulation macros
- *
- * @{
- */
-
-#define AV_STRINGIFY(s)         AV_TOSTRING(s)
-#define AV_TOSTRING(s) #s
-
-#define AV_GLUE(a, b) a ## b
-#define AV_JOIN(a, b) AV_GLUE(a, b)
-
-/**
- * @}
- */
-
-#define AV_PRAGMA(s) _Pragma(#s)
-
-#endif /* AVUTIL_MACROS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/mathematics.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/mathematics.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/mathematics.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/mathematics.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-/*
- * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_MATHEMATICS_H
-#define AVUTIL_MATHEMATICS_H
-
-#include <stdint.h>
-#include <math.h>
-#include "attributes.h"
-#include "rational.h"
-#include "intfloat.h"
-
-#ifndef M_LOG2_10
-#define M_LOG2_10      3.32192809488736234787  /* log_2 10 */
-#endif
-#ifndef M_PHI
-#define M_PHI          1.61803398874989484820   /* phi / golden ratio */
-#endif
-#ifndef NAN
-#define NAN            av_int2float(0x7fc00000)
-#endif
-#ifndef INFINITY
-#define INFINITY       av_int2float(0x7f800000)
-#endif
-
-/**
- * @addtogroup lavu_math
- * @{
- */
-
-
-enum AVRounding {
-    AV_ROUND_ZERO     = 0, ///< Round toward zero.
-    AV_ROUND_INF      = 1, ///< Round away from zero.
-    AV_ROUND_DOWN     = 2, ///< Round toward -infinity.
-    AV_ROUND_UP       = 3, ///< Round toward +infinity.
-    AV_ROUND_NEAR_INF = 5, ///< Round to nearest and halfway cases away from zero.
-};
-
-/**
- * Return the greatest common divisor of a and b.
- * If both a and b are 0 or either or both are <0 then behavior is
- * undefined.
- */
-int64_t av_const av_gcd(int64_t a, int64_t b);
-
-/**
- * Rescale a 64-bit integer with rounding to nearest.
- * A simple a*b/c isn't possible as it can overflow.
- */
-int64_t av_rescale(int64_t a, int64_t b, int64_t c) av_const;
-
-/**
- * Rescale a 64-bit integer with specified rounding.
- * A simple a*b/c isn't possible as it can overflow.
- */
-int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding) av_const;
-
-/**
- * Rescale a 64-bit integer by 2 rational numbers.
- */
-int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const;
-
-/**
- * Rescale a 64-bit integer by 2 rational numbers with specified rounding.
- */
-int64_t av_rescale_q_rnd(int64_t a, AVRational bq, AVRational cq,
-                         enum AVRounding) av_const;
-
-/**
- * Compare 2 timestamps each in its own timebases.
- * The result of the function is undefined if one of the timestamps
- * is outside the int64_t range when represented in the others timebase.
- * @return -1 if ts_a is before ts_b, 1 if ts_a is after ts_b or 0 if they represent the same position
- */
-int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b);
-
-/**
- * Compare 2 integers modulo mod.
- * That is we compare integers a and b for which only the least
- * significant log2(mod) bits are known.
- *
- * @param mod must be a power of 2
- * @return a negative value if a is smaller than b
- *         a positive value if a is greater than b
- *         0                if a equals          b
- */
-int64_t av_compare_mod(uint64_t a, uint64_t b, uint64_t mod);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_MATHEMATICS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/md5.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/md5.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/md5.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/md5.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_MD5_H
-#define AVUTIL_MD5_H
-
-#include <stdint.h>
-
-#include "attributes.h"
-#include "version.h"
-
-/**
- * @defgroup lavu_md5 MD5
- * @ingroup lavu_crypto
- * @{
- */
-
-#if FF_API_CONTEXT_SIZE
-extern attribute_deprecated const int av_md5_size;
-#endif
-
-struct AVMD5;
-
-struct AVMD5 *av_md5_alloc(void);
-void av_md5_init(struct AVMD5 *ctx);
-void av_md5_update(struct AVMD5 *ctx, const uint8_t *src, const int len);
-void av_md5_final(struct AVMD5 *ctx, uint8_t *dst);
-void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_MD5_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/mem.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/mem.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/mem.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/mem.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,265 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * memory handling functions
- */
-
-#ifndef AVUTIL_MEM_H
-#define AVUTIL_MEM_H
-
-#include <limits.h>
-#include <stdint.h>
-
-#include "attributes.h"
-#include "avutil.h"
-
-/**
- * @addtogroup lavu_mem
- * @{
- */
-
-
-#if defined(__ICC) && __ICC < 1200 || defined(__SUNPRO_C)
-    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
-    #define DECLARE_ASM_CONST(n,t,v)    const t __attribute__ ((aligned (n))) v
-#elif defined(__TI_COMPILER_VERSION__)
-    #define DECLARE_ALIGNED(n,t,v)                      \
-        AV_PRAGMA(DATA_ALIGN(v,n))                      \
-        t __attribute__((aligned(n))) v
-    #define DECLARE_ASM_CONST(n,t,v)                    \
-        AV_PRAGMA(DATA_ALIGN(v,n))                      \
-        static const t __attribute__((aligned(n))) v
-#elif defined(__GNUC__)
-    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
-    #define DECLARE_ASM_CONST(n,t,v)    static const t av_used __attribute__ ((aligned (n))) v
-#elif defined(_MSC_VER)
-    #define DECLARE_ALIGNED(n,t,v)      __declspec(align(n)) t v
-    #define DECLARE_ASM_CONST(n,t,v)    __declspec(align(n)) static const t v
-#else
-    #define DECLARE_ALIGNED(n,t,v)      t v
-    #define DECLARE_ASM_CONST(n,t,v)    static const t v
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-    #define av_malloc_attrib __attribute__((__malloc__))
-#else
-    #define av_malloc_attrib
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(4,3)
-    #define av_alloc_size(...) __attribute__((alloc_size(__VA_ARGS__)))
-#else
-    #define av_alloc_size(...)
-#endif
-
-/**
- * Allocate a block of size bytes with alignment suitable for all
- * memory accesses (including vectors if available on the CPU).
- * @param size Size in bytes for the memory block to be allocated.
- * @return Pointer to the allocated block, NULL if the block cannot
- * be allocated.
- * @see av_mallocz()
- */
-void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1);
-
-/**
- * Allocate a block of size * nmemb bytes with av_malloc().
- * @param nmemb Number of elements
- * @param size Size of the single element
- * @return Pointer to the allocated block, NULL if the block cannot
- * be allocated.
- * @see av_malloc()
- */
-av_alloc_size(1, 2) static inline void *av_malloc_array(size_t nmemb, size_t size)
-{
-    if (!size || nmemb >= INT_MAX / size)
-        return NULL;
-    return av_malloc(nmemb * size);
-}
-
-/**
- * Allocate or reallocate a block of memory.
- * If ptr is NULL and size > 0, allocate a new block. If
- * size is zero, free the memory block pointed to by ptr.
- * @param ptr Pointer to a memory block already allocated with
- * av_realloc() or NULL.
- * @param size Size in bytes of the memory block to be allocated or
- * reallocated.
- * @return Pointer to a newly-reallocated block or NULL if the block
- * cannot be reallocated or the function is used to free the memory block.
- * @warning Pointers originating from the av_malloc() family of functions must
- *          not be passed to av_realloc(). The former can be implemented using
- *          memalign() (or other functions), and there is no guarantee that
- *          pointers from such functions can be passed to realloc() at all.
- *          The situation is undefined according to POSIX and may crash with
- *          some libc implementations.
- * @see av_fast_realloc()
- */
-void *av_realloc(void *ptr, size_t size) av_alloc_size(2);
-
-/**
- * Allocate or reallocate a block of memory.
- * If *ptr is NULL and size > 0, allocate a new block. If
- * size is zero, free the memory block pointed to by ptr.
- * @param   ptr Pointer to a pointer to a memory block already allocated
- *          with av_realloc(), or pointer to a pointer to NULL.
- *          The pointer is updated on success, or freed on failure.
- * @param   size Size in bytes for the memory block to be allocated or
- *          reallocated
- * @return  Zero on success, an AVERROR error code on failure.
- * @warning Pointers originating from the av_malloc() family of functions must
- *          not be passed to av_reallocp(). The former can be implemented using
- *          memalign() (or other functions), and there is no guarantee that
- *          pointers from such functions can be passed to realloc() at all.
- *          The situation is undefined according to POSIX and may crash with
- *          some libc implementations.
- */
-int av_reallocp(void *ptr, size_t size);
-
-/**
- * Allocate or reallocate an array.
- * If ptr is NULL and nmemb > 0, allocate a new block. If
- * nmemb is zero, free the memory block pointed to by ptr.
- * @param ptr Pointer to a memory block already allocated with
- * av_realloc() or NULL.
- * @param nmemb Number of elements
- * @param size Size of the single element
- * @return Pointer to a newly-reallocated block or NULL if the block
- * cannot be reallocated or the function is used to free the memory block.
- * @warning Pointers originating from the av_malloc() family of functions must
- *          not be passed to av_realloc(). The former can be implemented using
- *          memalign() (or other functions), and there is no guarantee that
- *          pointers from such functions can be passed to realloc() at all.
- *          The situation is undefined according to POSIX and may crash with
- *          some libc implementations.
- */
-av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size);
-
-/**
- * Allocate or reallocate an array through a pointer to a pointer.
- * If *ptr is NULL and nmemb > 0, allocate a new block. If
- * nmemb is zero, free the memory block pointed to by ptr.
- * @param ptr Pointer to a pointer to a memory block already allocated
- * with av_realloc(), or pointer to a pointer to NULL.
- * The pointer is updated on success, or freed on failure.
- * @param nmemb Number of elements
- * @param size Size of the single element
- * @return Zero on success, an AVERROR error code on failure.
- * @warning Pointers originating from the av_malloc() family of functions must
- *          not be passed to av_realloc(). The former can be implemented using
- *          memalign() (or other functions), and there is no guarantee that
- *          pointers from such functions can be passed to realloc() at all.
- *          The situation is undefined according to POSIX and may crash with
- *          some libc implementations.
- */
-av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
-
-/**
- * Free a memory block which has been allocated with av_malloc(z)() or
- * av_realloc().
- * @param ptr Pointer to the memory block which should be freed.
- * @note ptr = NULL is explicitly allowed.
- * @note It is recommended that you use av_freep() instead.
- * @see av_freep()
- */
-void av_free(void *ptr);
-
-/**
- * Allocate a block of size bytes with alignment suitable for all
- * memory accesses (including vectors if available on the CPU) and
- * zero all the bytes of the block.
- * @param size Size in bytes for the memory block to be allocated.
- * @return Pointer to the allocated block, NULL if it cannot be allocated.
- * @see av_malloc()
- */
-void *av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1);
-
-/**
- * Allocate a block of size * nmemb bytes with av_mallocz().
- * @param nmemb Number of elements
- * @param size Size of the single element
- * @return Pointer to the allocated block, NULL if the block cannot
- * be allocated.
- * @see av_mallocz()
- * @see av_malloc_array()
- */
-av_alloc_size(1, 2) static inline void *av_mallocz_array(size_t nmemb, size_t size)
-{
-    if (!size || nmemb >= INT_MAX / size)
-        return NULL;
-    return av_mallocz(nmemb * size);
-}
-
-/**
- * Duplicate the string s.
- * @param s string to be duplicated
- * @return Pointer to a newly-allocated string containing a
- * copy of s or NULL if the string cannot be allocated.
- */
-char *av_strdup(const char *s) av_malloc_attrib;
-
-/**
- * Free a memory block which has been allocated with av_malloc(z)() or
- * av_realloc() and set the pointer pointing to it to NULL.
- * @param ptr Pointer to the pointer to the memory block which should
- * be freed.
- * @see av_free()
- */
-void av_freep(void *ptr);
-
-/**
- * deliberately overlapping memcpy implementation
- * @param dst destination buffer
- * @param back how many bytes back we start (the initial size of the overlapping window)
- * @param cnt number of bytes to copy, must be >= 0
- *
- * cnt > back is valid, this will copy the bytes we just copied,
- * thus creating a repeating pattern with a period length of back.
- */
-void av_memcpy_backptr(uint8_t *dst, int back, int cnt);
-
-/**
- * Reallocate the given block if it is not large enough, otherwise do nothing.
- *
- * @see av_realloc
- */
-void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size);
-
-/**
- * Allocate a buffer, reusing the given one if large enough.
- *
- * Contrary to av_fast_realloc the current buffer contents might not be
- * preserved and on error the old buffer is freed, thus no special
- * handling to avoid memleaks is necessary.
- *
- * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer
- * @param size size of the buffer *ptr points to
- * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and
- *                 *size 0 if an error occurred.
- */
-void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_MEM_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/old_pix_fmts.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/old_pix_fmts.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/old_pix_fmts.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/old_pix_fmts.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,134 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_OLD_PIX_FMTS_H
-#define AVUTIL_OLD_PIX_FMTS_H
-
-/*
- * This header exists to prevent new pixel formats from being accidentally added
- * to the deprecated list.
- * Do not include it directly. It will be removed on next major bump
- *
- * Do not add new items to this list. Use the AVPixelFormat enum instead.
- */
-    PIX_FMT_NONE = AV_PIX_FMT_NONE,
-    PIX_FMT_YUV420P,   ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
-    PIX_FMT_YUYV422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
-    PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
-    PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
-    PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
-    PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
-    PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
-    PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
-    PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
-    PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
-    PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
-    PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
-    PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
-    PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
-    PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
-#if FF_API_XVMC
-    PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
-    PIX_FMT_XVMC_MPEG2_IDCT,
-#endif /* FF_API_XVMC */
-    PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
-    PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
-    PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
-    PIX_FMT_BGR4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
-    PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
-    PIX_FMT_RGB8,      ///< packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
-    PIX_FMT_RGB4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
-    PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
-    PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
-    PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
-
-    PIX_FMT_ARGB,      ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
-    PIX_FMT_RGBA,      ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
-    PIX_FMT_ABGR,      ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
-    PIX_FMT_BGRA,      ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
-
-    PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
-    PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
-    PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
-    PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
-    PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
-#if FF_API_VDPAU
-    PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-#endif
-    PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
-    PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
-
-    PIX_FMT_RGB565BE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian
-    PIX_FMT_RGB565LE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), little-endian
-    PIX_FMT_RGB555BE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
-    PIX_FMT_RGB555LE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
-
-    PIX_FMT_BGR565BE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), big-endian
-    PIX_FMT_BGR565LE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), little-endian
-    PIX_FMT_BGR555BE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
-    PIX_FMT_BGR555LE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
-
-    PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
-    PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
-    PIX_FMT_VAAPI_VLD,  ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-
-    PIX_FMT_YUV420P16LE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV420P16BE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV422P16LE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-#if FF_API_VDPAU
-    PIX_FMT_VDPAU_MPEG4,  ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-#endif
-    PIX_FMT_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
-
-    PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
-    PIX_FMT_RGB444BE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
-    PIX_FMT_BGR444LE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
-    PIX_FMT_BGR444BE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
-    PIX_FMT_Y400A,     ///< 8bit gray, 8bit alpha
-    PIX_FMT_BGR48BE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
-    PIX_FMT_BGR48LE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
-    PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_VDA_VLD,    ///< hardware decoding through VDA
-    PIX_FMT_GBRP,      ///< planar GBR 4:4:4 24bpp
-    PIX_FMT_GBRP9BE,   ///< planar GBR 4:4:4 27bpp, big endian
-    PIX_FMT_GBRP9LE,   ///< planar GBR 4:4:4 27bpp, little endian
-    PIX_FMT_GBRP10BE,  ///< planar GBR 4:4:4 30bpp, big endian
-    PIX_FMT_GBRP10LE,  ///< planar GBR 4:4:4 30bpp, little endian
-    PIX_FMT_GBRP16BE,  ///< planar GBR 4:4:4 48bpp, big endian
-    PIX_FMT_GBRP16LE,  ///< planar GBR 4:4:4 48bpp, little endian
-    PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
-
-#endif /* AVUTIL_OLD_PIX_FMTS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/opt.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/opt.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/opt.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/opt.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,516 +0,0 @@
-/*
- * AVOptions
- * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_OPT_H
-#define AVUTIL_OPT_H
-
-/**
- * @file
- * AVOptions
- */
-
-#include "rational.h"
-#include "avutil.h"
-#include "dict.h"
-#include "log.h"
-
-/**
- * @defgroup avoptions AVOptions
- * @ingroup lavu_data
- * @{
- * AVOptions provide a generic system to declare options on arbitrary structs
- * ("objects"). An option can have a help text, a type and a range of possible
- * values. Options may then be enumerated, read and written to.
- *
- * @section avoptions_implement Implementing AVOptions
- * This section describes how to add AVOptions capabilities to a struct.
- *
- * All AVOptions-related information is stored in an AVClass. Therefore
- * the first member of the struct must be a pointer to an AVClass describing it.
- * The option field of the AVClass must be set to a NULL-terminated static array
- * of AVOptions. Each AVOption must have a non-empty name, a type, a default
- * value and for number-type AVOptions also a range of allowed values. It must
- * also declare an offset in bytes from the start of the struct, where the field
- * associated with this AVOption is located. Other fields in the AVOption struct
- * should also be set when applicable, but are not required.
- *
- * The following example illustrates an AVOptions-enabled struct:
- * @code
- * typedef struct test_struct {
- *     AVClass *class;
- *     int      int_opt;
- *     char    *str_opt;
- *     uint8_t *bin_opt;
- *     int      bin_len;
- * } test_struct;
- *
- * static const AVOption test_options[] = {
- *   { "test_int", "This is a test option of int type.", offsetof(test_struct, int_opt),
- *     AV_OPT_TYPE_INT, { .i64 = -1 }, INT_MIN, INT_MAX },
- *   { "test_str", "This is a test option of string type.", offsetof(test_struct, str_opt),
- *     AV_OPT_TYPE_STRING },
- *   { "test_bin", "This is a test option of binary type.", offsetof(test_struct, bin_opt),
- *     AV_OPT_TYPE_BINARY },
- *   { NULL },
- * };
- *
- * static const AVClass test_class = {
- *     .class_name = "test class",
- *     .item_name  = av_default_item_name,
- *     .option     = test_options,
- *     .version    = LIBAVUTIL_VERSION_INT,
- * };
- * @endcode
- *
- * Next, when allocating your struct, you must ensure that the AVClass pointer
- * is set to the correct value. Then, av_opt_set_defaults() must be called to
- * initialize defaults. After that the struct is ready to be used with the
- * AVOptions API.
- *
- * When cleaning up, you may use the av_opt_free() function to automatically
- * free all the allocated string and binary options.
- *
- * Continuing with the above example:
- *
- * @code
- * test_struct *alloc_test_struct(void)
- * {
- *     test_struct *ret = av_malloc(sizeof(*ret));
- *     ret->class = &test_class;
- *     av_opt_set_defaults(ret);
- *     return ret;
- * }
- * void free_test_struct(test_struct **foo)
- * {
- *     av_opt_free(*foo);
- *     av_freep(foo);
- * }
- * @endcode
- *
- * @subsection avoptions_implement_nesting Nesting
- *      It may happen that an AVOptions-enabled struct contains another
- *      AVOptions-enabled struct as a member (e.g. AVCodecContext in
- *      libavcodec exports generic options, while its priv_data field exports
- *      codec-specific options). In such a case, it is possible to set up the
- *      parent struct to export a child's options. To do that, simply
- *      implement AVClass.child_next() and AVClass.child_class_next() in the
- *      parent struct's AVClass.
- *      Assuming that the test_struct from above now also contains a
- *      child_struct field:
- *
- *      @code
- *      typedef struct child_struct {
- *          AVClass *class;
- *          int flags_opt;
- *      } child_struct;
- *      static const AVOption child_opts[] = {
- *          { "test_flags", "This is a test option of flags type.",
- *            offsetof(child_struct, flags_opt), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX },
- *          { NULL },
- *      };
- *      static const AVClass child_class = {
- *          .class_name = "child class",
- *          .item_name  = av_default_item_name,
- *          .option     = child_opts,
- *          .version    = LIBAVUTIL_VERSION_INT,
- *      };
- *
- *      void *child_next(void *obj, void *prev)
- *      {
- *          test_struct *t = obj;
- *          if (!prev && t->child_struct)
- *              return t->child_struct;
- *          return NULL
- *      }
- *      const AVClass child_class_next(const AVClass *prev)
- *      {
- *          return prev ? NULL : &child_class;
- *      }
- *      @endcode
- *      Putting child_next() and child_class_next() as defined above into
- *      test_class will now make child_struct's options accessible through
- *      test_struct (again, proper setup as described above needs to be done on
- *      child_struct right after it is created).
- *
- *      From the above example it might not be clear why both child_next()
- *      and child_class_next() are needed. The distinction is that child_next()
- *      iterates over actually existing objects, while child_class_next()
- *      iterates over all possible child classes. E.g. if an AVCodecContext
- *      was initialized to use a codec which has private options, then its
- *      child_next() will return AVCodecContext.priv_data and finish
- *      iterating. OTOH child_class_next() on AVCodecContext.av_class will
- *      iterate over all available codecs with private options.
- *
- * @subsection avoptions_implement_named_constants Named constants
- *      It is possible to create named constants for options. Simply set the unit
- *      field of the option the constants should apply to to a string and
- *      create the constants themselves as options of type AV_OPT_TYPE_CONST
- *      with their unit field set to the same string.
- *      Their default_val field should contain the value of the named
- *      constant.
- *      For example, to add some named constants for the test_flags option
- *      above, put the following into the child_opts array:
- *      @code
- *      { "test_flags", "This is a test option of flags type.",
- *        offsetof(child_struct, flags_opt), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX, "test_unit" },
- *      { "flag1", "This is a flag with value 16", 0, AV_OPT_TYPE_CONST, { .i64 = 16 }, 0, 0, "test_unit" },
- *      @endcode
- *
- * @section avoptions_use Using AVOptions
- * This section deals with accessing options in an AVOptions-enabled struct.
- * Such structs in Libav are e.g. AVCodecContext in libavcodec or
- * AVFormatContext in libavformat.
- *
- * @subsection avoptions_use_examine Examining AVOptions
- * The basic functions for examining options are av_opt_next(), which iterates
- * over all options defined for one object, and av_opt_find(), which searches
- * for an option with the given name.
- *
- * The situation is more complicated with nesting. An AVOptions-enabled struct
- * may have AVOptions-enabled children. Passing the AV_OPT_SEARCH_CHILDREN flag
- * to av_opt_find() will make the function search children recursively.
- *
- * For enumerating there are basically two cases. The first is when you want to
- * get all options that may potentially exist on the struct and its children
- * (e.g.  when constructing documentation). In that case you should call
- * av_opt_child_class_next() recursively on the parent struct's AVClass.  The
- * second case is when you have an already initialized struct with all its
- * children and you want to get all options that can be actually written or read
- * from it. In that case you should call av_opt_child_next() recursively (and
- * av_opt_next() on each result).
- *
- * @subsection avoptions_use_get_set Reading and writing AVOptions
- * When setting options, you often have a string read directly from the
- * user. In such a case, simply passing it to av_opt_set() is enough. For
- * non-string type options, av_opt_set() will parse the string according to the
- * option type.
- *
- * Similarly av_opt_get() will read any option type and convert it to a string
- * which will be returned. Do not forget that the string is allocated, so you
- * have to free it with av_free().
- *
- * In some cases it may be more convenient to put all options into an
- * AVDictionary and call av_opt_set_dict() on it. A specific case of this
- * are the format/codec open functions in lavf/lavc which take a dictionary
- * filled with option as a parameter. This allows to set some options
- * that cannot be set otherwise, since e.g. the input file format is not known
- * before the file is actually opened.
- */
-
-enum AVOptionType{
-    AV_OPT_TYPE_FLAGS,
-    AV_OPT_TYPE_INT,
-    AV_OPT_TYPE_INT64,
-    AV_OPT_TYPE_DOUBLE,
-    AV_OPT_TYPE_FLOAT,
-    AV_OPT_TYPE_STRING,
-    AV_OPT_TYPE_RATIONAL,
-    AV_OPT_TYPE_BINARY,  ///< offset must point to a pointer immediately followed by an int for the length
-    AV_OPT_TYPE_CONST = 128,
-};
-
-/**
- * AVOption
- */
-typedef struct AVOption {
-    const char *name;
-
-    /**
-     * short English help text
-     * @todo What about other languages?
-     */
-    const char *help;
-
-    /**
-     * The offset relative to the context structure where the option
-     * value is stored. It should be 0 for named constants.
-     */
-    int offset;
-    enum AVOptionType type;
-
-    /**
-     * the default value for scalar options
-     */
-    union {
-        int64_t i64;
-        double dbl;
-        const char *str;
-        /* TODO those are unused now */
-        AVRational q;
-    } default_val;
-    double min;                 ///< minimum valid value for the option
-    double max;                 ///< maximum valid value for the option
-
-    int flags;
-#define AV_OPT_FLAG_ENCODING_PARAM  1   ///< a generic parameter which can be set by the user for muxing or encoding
-#define AV_OPT_FLAG_DECODING_PARAM  2   ///< a generic parameter which can be set by the user for demuxing or decoding
-#define AV_OPT_FLAG_METADATA        4   ///< some data extracted or inserted into the file like title, comment, ...
-#define AV_OPT_FLAG_AUDIO_PARAM     8
-#define AV_OPT_FLAG_VIDEO_PARAM     16
-#define AV_OPT_FLAG_SUBTITLE_PARAM  32
-//FIXME think about enc-audio, ... style flags
-
-    /**
-     * The logical unit to which the option belongs. Non-constant
-     * options and corresponding named constants share the same
-     * unit. May be NULL.
-     */
-    const char *unit;
-} AVOption;
-
-/**
- * Show the obj options.
- *
- * @param req_flags requested flags for the options to show. Show only the
- * options for which it is opt->flags & req_flags.
- * @param rej_flags rejected flags for the options to show. Show only the
- * options for which it is !(opt->flags & req_flags).
- * @param av_log_obj log context to use for showing the options
- */
-int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags);
-
-/**
- * Set the values of all AVOption fields to their default values.
- *
- * @param s an AVOption-enabled struct (its first member must be a pointer to AVClass)
- */
-void av_opt_set_defaults(void *s);
-
-/**
- * Parse the key/value pairs list in opts. For each key/value pair
- * found, stores the value in the field in ctx that is named like the
- * key. ctx must be an AVClass context, storing is done using
- * AVOptions.
- *
- * @param key_val_sep a 0-terminated list of characters used to
- * separate key from value
- * @param pairs_sep a 0-terminated list of characters used to separate
- * two pairs from each other
- * @return the number of successfully set key/value pairs, or a negative
- * value corresponding to an AVERROR code in case of error:
- * AVERROR(EINVAL) if opts cannot be parsed,
- * the error code issued by av_set_string3() if a key/value pair
- * cannot be set
- */
-int av_set_options_string(void *ctx, const char *opts,
-                          const char *key_val_sep, const char *pairs_sep);
-
-/**
- * Free all string and binary options in obj.
- */
-void av_opt_free(void *obj);
-
-/**
- * Check whether a particular flag is set in a flags field.
- *
- * @param field_name the name of the flag field option
- * @param flag_name the name of the flag to check
- * @return non-zero if the flag is set, zero if the flag isn't set,
- *         isn't of the right type, or the flags field doesn't exist.
- */
-int av_opt_flag_is_set(void *obj, const char *field_name, const char *flag_name);
-
-/*
- * Set all the options from a given dictionary on an object.
- *
- * @param obj a struct whose first element is a pointer to AVClass
- * @param options options to process. This dictionary will be freed and replaced
- *                by a new one containing all options not found in obj.
- *                Of course this new dictionary needs to be freed by caller
- *                with av_dict_free().
- *
- * @return 0 on success, a negative AVERROR if some option was found in obj,
- *         but could not be set.
- *
- * @see av_dict_copy()
- */
-int av_opt_set_dict(void *obj, struct AVDictionary **options);
-
-/**
- * @defgroup opt_eval_funcs Evaluating option strings
- * @{
- * This group of functions can be used to evaluate option strings
- * and get numbers out of them. They do the same thing as av_opt_set(),
- * except the result is written into the caller-supplied pointer.
- *
- * @param obj a struct whose first element is a pointer to AVClass.
- * @param o an option for which the string is to be evaluated.
- * @param val string to be evaluated.
- * @param *_out value of the string will be written here.
- *
- * @return 0 on success, a negative number on failure.
- */
-int av_opt_eval_flags (void *obj, const AVOption *o, const char *val, int        *flags_out);
-int av_opt_eval_int   (void *obj, const AVOption *o, const char *val, int        *int_out);
-int av_opt_eval_int64 (void *obj, const AVOption *o, const char *val, int64_t    *int64_out);
-int av_opt_eval_float (void *obj, const AVOption *o, const char *val, float      *float_out);
-int av_opt_eval_double(void *obj, const AVOption *o, const char *val, double     *double_out);
-int av_opt_eval_q     (void *obj, const AVOption *o, const char *val, AVRational *q_out);
-/**
- * @}
- */
-
-#define AV_OPT_SEARCH_CHILDREN   0x0001 /**< Search in possible children of the
-                                             given object first. */
-/**
- *  The obj passed to av_opt_find() is fake -- only a double pointer to AVClass
- *  instead of a required pointer to a struct containing AVClass. This is
- *  useful for searching for options without needing to allocate the corresponding
- *  object.
- */
-#define AV_OPT_SEARCH_FAKE_OBJ   0x0002
-
-/**
- * Look for an option in an object. Consider only options which
- * have all the specified flags set.
- *
- * @param[in] obj A pointer to a struct whose first element is a
- *                pointer to an AVClass.
- *                Alternatively a double pointer to an AVClass, if
- *                AV_OPT_SEARCH_FAKE_OBJ search flag is set.
- * @param[in] name The name of the option to look for.
- * @param[in] unit When searching for named constants, name of the unit
- *                 it belongs to.
- * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG).
- * @param search_flags A combination of AV_OPT_SEARCH_*.
- *
- * @return A pointer to the option found, or NULL if no option
- *         was found.
- *
- * @note Options found with AV_OPT_SEARCH_CHILDREN flag may not be settable
- * directly with av_set_string3(). Use special calls which take an options
- * AVDictionary (e.g. avformat_open_input()) to set options found with this
- * flag.
- */
-const AVOption *av_opt_find(void *obj, const char *name, const char *unit,
-                            int opt_flags, int search_flags);
-
-/**
- * Look for an option in an object. Consider only options which
- * have all the specified flags set.
- *
- * @param[in] obj A pointer to a struct whose first element is a
- *                pointer to an AVClass.
- *                Alternatively a double pointer to an AVClass, if
- *                AV_OPT_SEARCH_FAKE_OBJ search flag is set.
- * @param[in] name The name of the option to look for.
- * @param[in] unit When searching for named constants, name of the unit
- *                 it belongs to.
- * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG).
- * @param search_flags A combination of AV_OPT_SEARCH_*.
- * @param[out] target_obj if non-NULL, an object to which the option belongs will be
- * written here. It may be different from obj if AV_OPT_SEARCH_CHILDREN is present
- * in search_flags. This parameter is ignored if search_flags contain
- * AV_OPT_SEARCH_FAKE_OBJ.
- *
- * @return A pointer to the option found, or NULL if no option
- *         was found.
- */
-const AVOption *av_opt_find2(void *obj, const char *name, const char *unit,
-                             int opt_flags, int search_flags, void **target_obj);
-
-/**
- * Iterate over all AVOptions belonging to obj.
- *
- * @param obj an AVOptions-enabled struct or a double pointer to an
- *            AVClass describing it.
- * @param prev result of the previous call to av_opt_next() on this object
- *             or NULL
- * @return next AVOption or NULL
- */
-const AVOption *av_opt_next(void *obj, const AVOption *prev);
-
-/**
- * Iterate over AVOptions-enabled children of obj.
- *
- * @param prev result of a previous call to this function or NULL
- * @return next AVOptions-enabled child or NULL
- */
-void *av_opt_child_next(void *obj, void *prev);
-
-/**
- * Iterate over potential AVOptions-enabled children of parent.
- *
- * @param prev result of a previous call to this function or NULL
- * @return AVClass corresponding to next potential child or NULL
- */
-const AVClass *av_opt_child_class_next(const AVClass *parent, const AVClass *prev);
-
-/**
- * @defgroup opt_set_funcs Option setting functions
- * @{
- * Those functions set the field of obj with the given name to value.
- *
- * @param[in] obj A struct whose first element is a pointer to an AVClass.
- * @param[in] name the name of the field to set
- * @param[in] val The value to set. In case of av_opt_set() if the field is not
- * of a string type, then the given string is parsed.
- * SI postfixes and some named scalars are supported.
- * If the field is of a numeric type, it has to be a numeric or named
- * scalar. Behavior with more than one scalar and +- infix operators
- * is undefined.
- * If the field is of a flags type, it has to be a sequence of numeric
- * scalars or named flags separated by '+' or '-'. Prefixing a flag
- * with '+' causes it to be set without affecting the other flags;
- * similarly, '-' unsets a flag.
- * @param search_flags flags passed to av_opt_find2. I.e. if AV_OPT_SEARCH_CHILDREN
- * is passed here, then the option may be set on a child of obj.
- *
- * @return 0 if the value has been set, or an AVERROR code in case of
- * error:
- * AVERROR_OPTION_NOT_FOUND if no matching option exists
- * AVERROR(ERANGE) if the value is out of range
- * AVERROR(EINVAL) if the value is not valid
- */
-int av_opt_set       (void *obj, const char *name, const char *val, int search_flags);
-int av_opt_set_int   (void *obj, const char *name, int64_t     val, int search_flags);
-int av_opt_set_double(void *obj, const char *name, double      val, int search_flags);
-int av_opt_set_q     (void *obj, const char *name, AVRational  val, int search_flags);
-int av_opt_set_bin   (void *obj, const char *name, const uint8_t *val, int size, int search_flags);
-/**
- * @}
- */
-
-/**
- * @defgroup opt_get_funcs Option getting functions
- * @{
- * Those functions get a value of the option with the given name from an object.
- *
- * @param[in] obj a struct whose first element is a pointer to an AVClass.
- * @param[in] name name of the option to get.
- * @param[in] search_flags flags passed to av_opt_find2. I.e. if AV_OPT_SEARCH_CHILDREN
- * is passed here, then the option may be found in a child of obj.
- * @param[out] out_val value of the option will be written here
- * @return 0 on success, a negative error code otherwise
- */
-/**
- * @note the returned string will av_malloc()ed and must be av_free()ed by the caller
- */
-int av_opt_get       (void *obj, const char *name, int search_flags, uint8_t   **out_val);
-int av_opt_get_int   (void *obj, const char *name, int search_flags, int64_t    *out_val);
-int av_opt_get_double(void *obj, const char *name, int search_flags, double     *out_val);
-int av_opt_get_q     (void *obj, const char *name, int search_flags, AVRational *out_val);
-/**
- * @}
- * @}
- */
-
-#endif /* AVUTIL_OPT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/parseutils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/parseutils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/parseutils.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/parseutils.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,124 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_PARSEUTILS_H
-#define AVUTIL_PARSEUTILS_H
-
-#include <time.h>
-
-#include "rational.h"
-
-/**
- * @file
- * misc parsing utilities
- */
-
-/**
- * Parse str and put in width_ptr and height_ptr the detected values.
- *
- * @param[in,out] width_ptr pointer to the variable which will contain the detected
- * width value
- * @param[in,out] height_ptr pointer to the variable which will contain the detected
- * height value
- * @param[in] str the string to parse: it has to be a string in the format
- * width x height or a valid video size abbreviation.
- * @return >= 0 on success, a negative error code otherwise
- */
-int av_parse_video_size(int *width_ptr, int *height_ptr, const char *str);
-
-/**
- * Parse str and store the detected values in *rate.
- *
- * @param[in,out] rate pointer to the AVRational which will contain the detected
- * frame rate
- * @param[in] str the string to parse: it has to be a string in the format
- * rate_num / rate_den, a float number or a valid video rate abbreviation
- * @return >= 0 on success, a negative error code otherwise
- */
-int av_parse_video_rate(AVRational *rate, const char *str);
-
-/**
- * Put the RGBA values that correspond to color_string in rgba_color.
- *
- * @param color_string a string specifying a color. It can be the name of
- * a color (case insensitive match) or a [0x|#]RRGGBB[AA] sequence,
- * possibly followed by "@" and a string representing the alpha
- * component.
- * The alpha component may be a string composed by "0x" followed by an
- * hexadecimal number or a decimal number between 0.0 and 1.0, which
- * represents the opacity value (0x00/0.0 means completely transparent,
- * 0xff/1.0 completely opaque).
- * If the alpha component is not specified then 0xff is assumed.
- * The string "random" will result in a random color.
- * @param slen length of the initial part of color_string containing the
- * color. It can be set to -1 if color_string is a null terminated string
- * containing nothing else than the color.
- * @return >= 0 in case of success, a negative value in case of
- * failure (for example if color_string cannot be parsed).
- */
-int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen,
-                   void *log_ctx);
-
-/**
- * Parse timestr and return in *time a corresponding number of
- * microseconds.
- *
- * @param timeval puts here the number of microseconds corresponding
- * to the string in timestr. If the string represents a duration, it
- * is the number of microseconds contained in the time interval.  If
- * the string is a date, is the number of microseconds since 1st of
- * January, 1970 up to the time of the parsed date.  If timestr cannot
- * be successfully parsed, set *time to INT64_MIN.
-
- * @param timestr a string representing a date or a duration.
- * - If a date the syntax is:
- * @code
- * [{YYYY-MM-DD|YYYYMMDD}[T|t| ]]{{HH[:MM[:SS[.m...]]]}|{HH[MM[SS[.m...]]]}}[Z]
- * now
- * @endcode
- * If the value is "now" it takes the current time.
- * Time is local time unless Z is appended, in which case it is
- * interpreted as UTC.
- * If the year-month-day part is not specified it takes the current
- * year-month-day.
- * - If a duration the syntax is:
- * @code
- * [-]HH[:MM[:SS[.m...]]]
- * [-]S+[.m...]
- * @endcode
- * @param duration flag which tells how to interpret timestr, if not
- * zero timestr is interpreted as a duration, otherwise as a date
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code otherwise
- */
-int av_parse_time(int64_t *timeval, const char *timestr, int duration);
-
-/**
- * Attempt to find a specific tag in a URL.
- *
- * syntax: '?tag1=val1&tag2=val2...'. Little URL decoding is done.
- * Return 1 if found.
- */
-int av_find_info_tag(char *arg, int arg_size, const char *tag1, const char *info);
-
-/**
- * Convert the decomposed UTC time in tm to a time_t value.
- */
-time_t av_timegm(struct tm *tm);
-
-#endif /* AVUTIL_PARSEUTILS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/pixdesc.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/pixdesc.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/pixdesc.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/pixdesc.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,276 +0,0 @@
-/*
- * pixel format descriptor
- * Copyright (c) 2009 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_PIXDESC_H
-#define AVUTIL_PIXDESC_H
-
-#include <inttypes.h>
-
-#include "attributes.h"
-#include "pixfmt.h"
-
-typedef struct AVComponentDescriptor{
-    uint16_t plane        :2;            ///< which of the 4 planes contains the component
-
-    /**
-     * Number of elements between 2 horizontally consecutive pixels minus 1.
-     * Elements are bits for bitstream formats, bytes otherwise.
-     */
-    uint16_t step_minus1  :3;
-
-    /**
-     * Number of elements before the component of the first pixel plus 1.
-     * Elements are bits for bitstream formats, bytes otherwise.
-     */
-    uint16_t offset_plus1 :3;
-    uint16_t shift        :3;            ///< number of least significant bits that must be shifted away to get the value
-    uint16_t depth_minus1 :4;            ///< number of bits in the component minus 1
-}AVComponentDescriptor;
-
-/**
- * Descriptor that unambiguously describes how the bits of a pixel are
- * stored in the up to 4 data planes of an image. It also stores the
- * subsampling factors and number of components.
- *
- * @note This is separate of the colorspace (RGB, YCbCr, YPbPr, JPEG-style YUV
- *       and all the YUV variants) AVPixFmtDescriptor just stores how values
- *       are stored not what these values represent.
- */
-typedef struct AVPixFmtDescriptor{
-    const char *name;
-    uint8_t nb_components;      ///< The number of components each pixel has, (1-4)
-
-    /**
-     * Amount to shift the luma width right to find the chroma width.
-     * For YV12 this is 1 for example.
-     * chroma_width = -((-luma_width) >> log2_chroma_w)
-     * The note above is needed to ensure rounding up.
-     * This value only refers to the chroma components.
-     */
-    uint8_t log2_chroma_w;      ///< chroma_width = -((-luma_width )>>log2_chroma_w)
-
-    /**
-     * Amount to shift the luma height right to find the chroma height.
-     * For YV12 this is 1 for example.
-     * chroma_height= -((-luma_height) >> log2_chroma_h)
-     * The note above is needed to ensure rounding up.
-     * This value only refers to the chroma components.
-     */
-    uint8_t log2_chroma_h;
-    uint8_t flags;
-
-    /**
-     * Parameters that describe how pixels are packed. If the format
-     * has chroma components, they must be stored in comp[1] and
-     * comp[2].
-     */
-    AVComponentDescriptor comp[4];
-}AVPixFmtDescriptor;
-
-/**
- * Pixel format is big-endian.
- */
-#define AV_PIX_FMT_FLAG_BE           (1 << 0)
-/**
- * Pixel format has a palette in data[1], values are indexes in this palette.
- */
-#define AV_PIX_FMT_FLAG_PAL          (1 << 1)
-/**
- * All values of a component are bit-wise packed end to end.
- */
-#define AV_PIX_FMT_FLAG_BITSTREAM    (1 << 2)
-/**
- * Pixel format is an HW accelerated format.
- */
-#define AV_PIX_FMT_FLAG_HWACCEL      (1 << 3)
-/**
- * At least one pixel component is not in the first data plane.
- */
-#define AV_PIX_FMT_FLAG_PLANAR       (1 << 4)
-/**
- * The pixel format contains RGB-like data (as opposed to YUV/grayscale).
- */
-#define AV_PIX_FMT_FLAG_RGB          (1 << 5)
-/**
- * The pixel format is "pseudo-paletted". This means that Libav treats it as
- * paletted internally, but the palette is generated by the decoder and is not
- * stored in the file.
- */
-#define AV_PIX_FMT_FLAG_PSEUDOPAL    (1 << 6)
-/**
- * The pixel format has an alpha channel.
- */
-#define AV_PIX_FMT_FLAG_ALPHA        (1 << 7)
-
-#if FF_API_PIX_FMT
-/**
- * @deprecated use the AV_PIX_FMT_FLAG_* flags
- */
-#define PIX_FMT_BE        AV_PIX_FMT_FLAG_BE
-#define PIX_FMT_PAL       AV_PIX_FMT_FLAG_PAL
-#define PIX_FMT_BITSTREAM AV_PIX_FMT_FLAG_BITSTREAM
-#define PIX_FMT_HWACCEL   AV_PIX_FMT_FLAG_HWACCEL
-#define PIX_FMT_PLANAR    AV_PIX_FMT_FLAG_PLANAR
-#define PIX_FMT_RGB       AV_PIX_FMT_FLAG_RGB
-#define PIX_FMT_PSEUDOPAL AV_PIX_FMT_FLAG_PSEUDOPAL
-#define PIX_FMT_ALPHA     AV_PIX_FMT_FLAG_ALPHA
-#endif
-
-#if FF_API_PIX_FMT_DESC
-/**
- * The array of all the pixel format descriptors.
- */
-extern attribute_deprecated const AVPixFmtDescriptor av_pix_fmt_descriptors[];
-#endif
-
-/**
- * Read a line from an image, and write the values of the
- * pixel format component c to dst.
- *
- * @param data the array containing the pointers to the planes of the image
- * @param linesize the array containing the linesizes of the image
- * @param desc the pixel format descriptor for the image
- * @param x the horizontal coordinate of the first pixel to read
- * @param y the vertical coordinate of the first pixel to read
- * @param w the width of the line to read, that is the number of
- * values to write to dst
- * @param read_pal_component if not zero and the format is a paletted
- * format writes the values corresponding to the palette
- * component c in data[1] to dst, rather than the palette indexes in
- * data[0]. The behavior is undefined if the format is not paletted.
- */
-void av_read_image_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4],
-                        const AVPixFmtDescriptor *desc, int x, int y, int c, int w, int read_pal_component);
-
-/**
- * Write the values from src to the pixel format component c of an
- * image line.
- *
- * @param src array containing the values to write
- * @param data the array containing the pointers to the planes of the
- * image to write into. It is supposed to be zeroed.
- * @param linesize the array containing the linesizes of the image
- * @param desc the pixel format descriptor for the image
- * @param x the horizontal coordinate of the first pixel to write
- * @param y the vertical coordinate of the first pixel to write
- * @param w the width of the line to write, that is the number of
- * values to write to the image line
- */
-void av_write_image_line(const uint16_t *src, uint8_t *data[4], const int linesize[4],
-                         const AVPixFmtDescriptor *desc, int x, int y, int c, int w);
-
-/**
- * Return the pixel format corresponding to name.
- *
- * If there is no pixel format with name name, then looks for a
- * pixel format with the name corresponding to the native endian
- * format of name.
- * For example in a little-endian system, first looks for "gray16",
- * then for "gray16le".
- *
- * Finally if no pixel format has been found, returns PIX_FMT_NONE.
- */
-enum AVPixelFormat av_get_pix_fmt(const char *name);
-
-/**
- * Return the short name for a pixel format, NULL in case pix_fmt is
- * unknown.
- *
- * @see av_get_pix_fmt(), av_get_pix_fmt_string()
- */
-const char *av_get_pix_fmt_name(enum AVPixelFormat pix_fmt);
-
-/**
- * Print in buf the string corresponding to the pixel format with
- * number pix_fmt, or an header if pix_fmt is negative.
- *
- * @param buf the buffer where to write the string
- * @param buf_size the size of buf
- * @param pix_fmt the number of the pixel format to print the
- * corresponding info string, or a negative value to print the
- * corresponding header.
- */
-char *av_get_pix_fmt_string (char *buf, int buf_size, enum AVPixelFormat pix_fmt);
-
-/**
- * Return the number of bits per pixel used by the pixel format
- * described by pixdesc. Note that this is not the same as the number
- * of bits per sample.
- *
- * The returned number of bits refers to the number of bits actually
- * used for storing the pixel information, that is padding bits are
- * not counted.
- */
-int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc);
-
-/**
- * @return a pixel format descriptor for provided pixel format or NULL if
- * this pixel format is unknown.
- */
-const AVPixFmtDescriptor *av_pix_fmt_desc_get(enum AVPixelFormat pix_fmt);
-
-/**
- * Iterate over all pixel format descriptors known to libavutil.
- *
- * @param prev previous descriptor. NULL to get the first descriptor.
- *
- * @return next descriptor or NULL after the last descriptor
- */
-const AVPixFmtDescriptor *av_pix_fmt_desc_next(const AVPixFmtDescriptor *prev);
-
-/**
- * @return an AVPixelFormat id described by desc, or AV_PIX_FMT_NONE if desc
- * is not a valid pointer to a pixel format descriptor.
- */
-enum AVPixelFormat av_pix_fmt_desc_get_id(const AVPixFmtDescriptor *desc);
-
-/**
- * Utility function to access log2_chroma_w log2_chroma_h from
- * the pixel format AVPixFmtDescriptor.
- *
- * @param[in]  pix_fmt the pixel format
- * @param[out] h_shift store log2_chroma_h
- * @param[out] v_shift store log2_chroma_w
- *
- * @return 0 on success, AVERROR(ENOSYS) on invalid or unknown pixel format
- */
-int av_pix_fmt_get_chroma_sub_sample(enum AVPixelFormat pix_fmt,
-                                     int *h_shift, int *v_shift);
-
-/**
- * @return number of planes in pix_fmt, a negative AVERROR if pix_fmt is not a
- * valid pixel format.
- */
-int av_pix_fmt_count_planes(enum AVPixelFormat pix_fmt);
-
-
-/**
- * Utility function to swap the endianness of a pixel format.
- *
- * @param[in]  pix_fmt the pixel format
- *
- * @return pixel format with swapped endianness if it exists,
- * otherwise AV_PIX_FMT_NONE
- */
-enum AVPixelFormat av_pix_fmt_swap_endianness(enum AVPixelFormat pix_fmt);
-
-
-#endif /* AVUTIL_PIXDESC_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/pixfmt.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/pixfmt.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/pixfmt.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/pixfmt.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,283 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_PIXFMT_H
-#define AVUTIL_PIXFMT_H
-
-/**
- * @file
- * pixel format definitions
- *
- */
-
-#include "libavutil/avconfig.h"
-#include "version.h"
-
-/**
- * Pixel format.
- *
- * @note
- * PIX_FMT_RGB32 is handled in an endian-specific manner. An RGBA
- * color is put together as:
- *  (A << 24) | (R << 16) | (G << 8) | B
- * This is stored as BGRA on little-endian CPU architectures and ARGB on
- * big-endian CPUs.
- *
- * @par
- * When the pixel format is palettized RGB (PIX_FMT_PAL8), the palettized
- * image data is stored in AVFrame.data[0]. The palette is transported in
- * AVFrame.data[1], is 1024 bytes long (256 4-byte entries) and is
- * formatted the same as in PIX_FMT_RGB32 described above (i.e., it is
- * also endian-specific). Note also that the individual RGB palette
- * components stored in AVFrame.data[1] should be in the range 0..255.
- * This is important as many custom PAL8 video codecs that were designed
- * to run on the IBM VGA graphics adapter use 6-bit palette components.
- *
- * @par
- * For all the 8bit per pixel formats, an RGB32 palette is in data[1] like
- * for pal8. This palette is filled in automatically by the function
- * allocating the picture.
- *
- * @note
- * Make sure that all newly added big-endian formats have pix_fmt & 1 == 1
- * and that all newly added little-endian formats have pix_fmt & 1 == 0.
- * This allows simpler detection of big vs little-endian.
- */
-enum AVPixelFormat {
-    AV_PIX_FMT_NONE = -1,
-    AV_PIX_FMT_YUV420P,   ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
-    AV_PIX_FMT_YUYV422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
-    AV_PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
-    AV_PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
-    AV_PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
-    AV_PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
-    AV_PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
-    AV_PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
-    AV_PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
-    AV_PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
-    AV_PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
-    AV_PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
-    AV_PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
-    AV_PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
-    AV_PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
-#if FF_API_XVMC
-    AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
-    AV_PIX_FMT_XVMC_MPEG2_IDCT,
-#endif /* FF_API_XVMC */
-    AV_PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
-    AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
-    AV_PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
-    AV_PIX_FMT_BGR4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
-    AV_PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
-    AV_PIX_FMT_RGB8,      ///< packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
-    AV_PIX_FMT_RGB4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
-    AV_PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
-    AV_PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
-    AV_PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
-
-    AV_PIX_FMT_ARGB,      ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
-    AV_PIX_FMT_RGBA,      ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
-    AV_PIX_FMT_ABGR,      ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
-    AV_PIX_FMT_BGRA,      ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
-
-    AV_PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
-    AV_PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
-    AV_PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
-    AV_PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
-    AV_PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
-#if FF_API_VDPAU
-    AV_PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    AV_PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    AV_PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    AV_PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    AV_PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-#endif
-    AV_PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
-    AV_PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
-
-    AV_PIX_FMT_RGB565BE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian
-    AV_PIX_FMT_RGB565LE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), little-endian
-    AV_PIX_FMT_RGB555BE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
-    AV_PIX_FMT_RGB555LE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
-
-    AV_PIX_FMT_BGR565BE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), big-endian
-    AV_PIX_FMT_BGR565LE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), little-endian
-    AV_PIX_FMT_BGR555BE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
-    AV_PIX_FMT_BGR555LE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
-
-    AV_PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
-    AV_PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
-    AV_PIX_FMT_VAAPI_VLD,  ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-
-    AV_PIX_FMT_YUV420P16LE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    AV_PIX_FMT_YUV420P16BE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    AV_PIX_FMT_YUV422P16LE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    AV_PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    AV_PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    AV_PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-#if FF_API_VDPAU
-    AV_PIX_FMT_VDPAU_MPEG4,  ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-#endif
-    AV_PIX_FMT_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
-
-    AV_PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
-    AV_PIX_FMT_RGB444BE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
-    AV_PIX_FMT_BGR444LE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
-    AV_PIX_FMT_BGR444BE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
-    AV_PIX_FMT_Y400A,     ///< 8bit gray, 8bit alpha
-    AV_PIX_FMT_BGR48BE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
-    AV_PIX_FMT_BGR48LE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
-    AV_PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    AV_PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    AV_PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    AV_PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    AV_PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    AV_PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    AV_PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    AV_PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    AV_PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    AV_PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    AV_PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    AV_PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    AV_PIX_FMT_VDA_VLD,    ///< hardware decoding through VDA
-    AV_PIX_FMT_GBRP,      ///< planar GBR 4:4:4 24bpp
-    AV_PIX_FMT_GBRP9BE,   ///< planar GBR 4:4:4 27bpp, big-endian
-    AV_PIX_FMT_GBRP9LE,   ///< planar GBR 4:4:4 27bpp, little-endian
-    AV_PIX_FMT_GBRP10BE,  ///< planar GBR 4:4:4 30bpp, big-endian
-    AV_PIX_FMT_GBRP10LE,  ///< planar GBR 4:4:4 30bpp, little-endian
-    AV_PIX_FMT_GBRP16BE,  ///< planar GBR 4:4:4 48bpp, big-endian
-    AV_PIX_FMT_GBRP16LE,  ///< planar GBR 4:4:4 48bpp, little-endian
-    AV_PIX_FMT_YUVA422P,  ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
-    AV_PIX_FMT_YUVA444P,  ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples)
-    AV_PIX_FMT_YUVA420P9BE,  ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per 2x2 Y & A samples), big-endian
-    AV_PIX_FMT_YUVA420P9LE,  ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per 2x2 Y & A samples), little-endian
-    AV_PIX_FMT_YUVA422P9BE,  ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per 2x1 Y & A samples), big-endian
-    AV_PIX_FMT_YUVA422P9LE,  ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per 2x1 Y & A samples), little-endian
-    AV_PIX_FMT_YUVA444P9BE,  ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per 1x1 Y & A samples), big-endian
-    AV_PIX_FMT_YUVA444P9LE,  ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per 1x1 Y & A samples), little-endian
-    AV_PIX_FMT_YUVA420P10BE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per 2x2 Y & A samples, big-endian)
-    AV_PIX_FMT_YUVA420P10LE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per 2x2 Y & A samples, little-endian)
-    AV_PIX_FMT_YUVA422P10BE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per 2x1 Y & A samples, big-endian)
-    AV_PIX_FMT_YUVA422P10LE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per 2x1 Y & A samples, little-endian)
-    AV_PIX_FMT_YUVA444P10BE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per 1x1 Y & A samples, big-endian)
-    AV_PIX_FMT_YUVA444P10LE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per 1x1 Y & A samples, little-endian)
-    AV_PIX_FMT_YUVA420P16BE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per 2x2 Y & A samples, big-endian)
-    AV_PIX_FMT_YUVA420P16LE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per 2x2 Y & A samples, little-endian)
-    AV_PIX_FMT_YUVA422P16BE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per 2x1 Y & A samples, big-endian)
-    AV_PIX_FMT_YUVA422P16LE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per 2x1 Y & A samples, little-endian)
-    AV_PIX_FMT_YUVA444P16BE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, big-endian)
-    AV_PIX_FMT_YUVA444P16LE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, little-endian)
-    AV_PIX_FMT_VDPAU,     ///< HW acceleration through VDPAU, Picture.data[3] contains a VdpVideoSurface
-    AV_PIX_FMT_XYZ12LE,      ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y, 12Z (lsb), the 2-byte value for each X/Y/Z is stored as little-endian, the 4 lower bits are set to 0
-    AV_PIX_FMT_XYZ12BE,      ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y, 12Z (lsb), the 2-byte value for each X/Y/Z is stored as big-endian, the 4 lower bits are set to 0
-    AV_PIX_FMT_NV16,         ///< interleaved chroma YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
-    AV_PIX_FMT_NV20LE,       ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    AV_PIX_FMT_NV20BE,       ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    AV_PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
-
-#if FF_API_PIX_FMT
-#include "old_pix_fmts.h"
-#endif
-};
-
-#if AV_HAVE_BIGENDIAN
-#   define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##be
-#else
-#   define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##le
-#endif
-
-#define AV_PIX_FMT_RGB32   AV_PIX_FMT_NE(ARGB, BGRA)
-#define AV_PIX_FMT_RGB32_1 AV_PIX_FMT_NE(RGBA, ABGR)
-#define AV_PIX_FMT_BGR32   AV_PIX_FMT_NE(ABGR, RGBA)
-#define AV_PIX_FMT_BGR32_1 AV_PIX_FMT_NE(BGRA, ARGB)
-
-#define AV_PIX_FMT_GRAY16 AV_PIX_FMT_NE(GRAY16BE, GRAY16LE)
-#define AV_PIX_FMT_RGB48  AV_PIX_FMT_NE(RGB48BE,  RGB48LE)
-#define AV_PIX_FMT_RGB565 AV_PIX_FMT_NE(RGB565BE, RGB565LE)
-#define AV_PIX_FMT_RGB555 AV_PIX_FMT_NE(RGB555BE, RGB555LE)
-#define AV_PIX_FMT_RGB444 AV_PIX_FMT_NE(RGB444BE, RGB444LE)
-#define AV_PIX_FMT_BGR48  AV_PIX_FMT_NE(BGR48BE,  BGR48LE)
-#define AV_PIX_FMT_BGR565 AV_PIX_FMT_NE(BGR565BE, BGR565LE)
-#define AV_PIX_FMT_BGR555 AV_PIX_FMT_NE(BGR555BE, BGR555LE)
-#define AV_PIX_FMT_BGR444 AV_PIX_FMT_NE(BGR444BE, BGR444LE)
-
-#define AV_PIX_FMT_YUV420P9  AV_PIX_FMT_NE(YUV420P9BE , YUV420P9LE)
-#define AV_PIX_FMT_YUV422P9  AV_PIX_FMT_NE(YUV422P9BE , YUV422P9LE)
-#define AV_PIX_FMT_YUV444P9  AV_PIX_FMT_NE(YUV444P9BE , YUV444P9LE)
-#define AV_PIX_FMT_YUV420P10 AV_PIX_FMT_NE(YUV420P10BE, YUV420P10LE)
-#define AV_PIX_FMT_YUV422P10 AV_PIX_FMT_NE(YUV422P10BE, YUV422P10LE)
-#define AV_PIX_FMT_YUV444P10 AV_PIX_FMT_NE(YUV444P10BE, YUV444P10LE)
-#define AV_PIX_FMT_YUV420P16 AV_PIX_FMT_NE(YUV420P16BE, YUV420P16LE)
-#define AV_PIX_FMT_YUV422P16 AV_PIX_FMT_NE(YUV422P16BE, YUV422P16LE)
-#define AV_PIX_FMT_YUV444P16 AV_PIX_FMT_NE(YUV444P16BE, YUV444P16LE)
-
-#define AV_PIX_FMT_GBRP9     AV_PIX_FMT_NE(GBRP9BE ,    GBRP9LE)
-#define AV_PIX_FMT_GBRP10    AV_PIX_FMT_NE(GBRP10BE,    GBRP10LE)
-#define AV_PIX_FMT_GBRP16    AV_PIX_FMT_NE(GBRP16BE,    GBRP16LE)
-
-#define AV_PIX_FMT_YUVA420P9  AV_PIX_FMT_NE(YUVA420P9BE , YUVA420P9LE)
-#define AV_PIX_FMT_YUVA422P9  AV_PIX_FMT_NE(YUVA422P9BE , YUVA422P9LE)
-#define AV_PIX_FMT_YUVA444P9  AV_PIX_FMT_NE(YUVA444P9BE , YUVA444P9LE)
-#define AV_PIX_FMT_YUVA420P10 AV_PIX_FMT_NE(YUVA420P10BE, YUVA420P10LE)
-#define AV_PIX_FMT_YUVA422P10 AV_PIX_FMT_NE(YUVA422P10BE, YUVA422P10LE)
-#define AV_PIX_FMT_YUVA444P10 AV_PIX_FMT_NE(YUVA444P10BE, YUVA444P10LE)
-#define AV_PIX_FMT_YUVA420P16 AV_PIX_FMT_NE(YUVA420P16BE, YUVA420P16LE)
-#define AV_PIX_FMT_YUVA422P16 AV_PIX_FMT_NE(YUVA422P16BE, YUVA422P16LE)
-#define AV_PIX_FMT_YUVA444P16 AV_PIX_FMT_NE(YUVA444P16BE, YUVA444P16LE)
-
-#define AV_PIX_FMT_XYZ12      AV_PIX_FMT_NE(XYZ12BE, XYZ12LE)
-#define AV_PIX_FMT_NV20       AV_PIX_FMT_NE(NV20BE,  NV20LE)
-
-#if FF_API_PIX_FMT
-#define PixelFormat AVPixelFormat
-
-#define PIX_FMT_NE(be, le) AV_PIX_FMT_NE(be, le)
-
-#define PIX_FMT_RGB32   AV_PIX_FMT_RGB32
-#define PIX_FMT_RGB32_1 AV_PIX_FMT_RGB32_1
-#define PIX_FMT_BGR32   AV_PIX_FMT_BGR32
-#define PIX_FMT_BGR32_1 AV_PIX_FMT_BGR32_1
-
-#define PIX_FMT_GRAY16 AV_PIX_FMT_GRAY16
-#define PIX_FMT_RGB48  AV_PIX_FMT_RGB48
-#define PIX_FMT_RGB565 AV_PIX_FMT_RGB565
-#define PIX_FMT_RGB555 AV_PIX_FMT_RGB555
-#define PIX_FMT_RGB444 AV_PIX_FMT_RGB444
-#define PIX_FMT_BGR48  AV_PIX_FMT_BGR48
-#define PIX_FMT_BGR565 AV_PIX_FMT_BGR565
-#define PIX_FMT_BGR555 AV_PIX_FMT_BGR555
-#define PIX_FMT_BGR444 AV_PIX_FMT_BGR444
-
-#define PIX_FMT_YUV420P9  AV_PIX_FMT_YUV420P9
-#define PIX_FMT_YUV422P9  AV_PIX_FMT_YUV422P9
-#define PIX_FMT_YUV444P9  AV_PIX_FMT_YUV444P9
-#define PIX_FMT_YUV420P10 AV_PIX_FMT_YUV420P10
-#define PIX_FMT_YUV422P10 AV_PIX_FMT_YUV422P10
-#define PIX_FMT_YUV444P10 AV_PIX_FMT_YUV444P10
-#define PIX_FMT_YUV420P16 AV_PIX_FMT_YUV420P16
-#define PIX_FMT_YUV422P16 AV_PIX_FMT_YUV422P16
-#define PIX_FMT_YUV444P16 AV_PIX_FMT_YUV444P16
-
-#define PIX_FMT_GBRP9  AV_PIX_FMT_GBRP9
-#define PIX_FMT_GBRP10 AV_PIX_FMT_GBRP10
-#define PIX_FMT_GBRP16 AV_PIX_FMT_GBRP16
-#endif
-
-#endif /* AVUTIL_PIXFMT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/random_seed.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/random_seed.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/random_seed.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/random_seed.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2009 Baptiste Coudurier <baptiste.coudurier@gmail.com>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_RANDOM_SEED_H
-#define AVUTIL_RANDOM_SEED_H
-
-#include <stdint.h>
-/**
- * @addtogroup lavu_crypto
- * @{
- */
-
-/**
- * Get random data.
- *
- * This function can be called repeatedly to generate more random bits
- * as needed. It is generally quite slow, and usually used to seed a
- * PRNG.  As it uses /dev/urandom and /dev/random, the quality of the
- * returned random data depends on the platform.
- */
-uint32_t av_get_random_seed(void);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_RANDOM_SEED_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/rational.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/rational.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/rational.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/rational.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,155 +0,0 @@
-/*
- * rational numbers
- * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * rational numbers
- * @author Michael Niedermayer <michaelni@gmx.at>
- */
-
-#ifndef AVUTIL_RATIONAL_H
-#define AVUTIL_RATIONAL_H
-
-#include <stdint.h>
-#include <limits.h>
-#include "attributes.h"
-
-/**
- * @addtogroup lavu_math
- * @{
- */
-
-/**
- * rational number numerator/denominator
- */
-typedef struct AVRational{
-    int num; ///< numerator
-    int den; ///< denominator
-} AVRational;
-
-/**
- * Compare two rationals.
- * @param a first rational
- * @param b second rational
- * @return 0 if a==b, 1 if a>b, -1 if a<b, and INT_MIN if one of the
- * values is of the form 0/0
- */
-static inline int av_cmp_q(AVRational a, AVRational b){
-    const int64_t tmp= a.num * (int64_t)b.den - b.num * (int64_t)a.den;
-
-    if(tmp) return ((tmp ^ a.den ^ b.den)>>63)|1;
-    else if(b.den && a.den) return 0;
-    else if(a.num && b.num) return (a.num>>31) - (b.num>>31);
-    else                    return INT_MIN;
-}
-
-/**
- * Convert rational to double.
- * @param a rational to convert
- * @return (double) a
- */
-static inline double av_q2d(AVRational a){
-    return a.num / (double) a.den;
-}
-
-/**
- * Reduce a fraction.
- * This is useful for framerate calculations.
- * @param dst_num destination numerator
- * @param dst_den destination denominator
- * @param num source numerator
- * @param den source denominator
- * @param max the maximum allowed for dst_num & dst_den
- * @return 1 if exact, 0 otherwise
- */
-int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max);
-
-/**
- * Multiply two rationals.
- * @param b first rational
- * @param c second rational
- * @return b*c
- */
-AVRational av_mul_q(AVRational b, AVRational c) av_const;
-
-/**
- * Divide one rational by another.
- * @param b first rational
- * @param c second rational
- * @return b/c
- */
-AVRational av_div_q(AVRational b, AVRational c) av_const;
-
-/**
- * Add two rationals.
- * @param b first rational
- * @param c second rational
- * @return b+c
- */
-AVRational av_add_q(AVRational b, AVRational c) av_const;
-
-/**
- * Subtract one rational from another.
- * @param b first rational
- * @param c second rational
- * @return b-c
- */
-AVRational av_sub_q(AVRational b, AVRational c) av_const;
-
-/**
- * Invert a rational.
- * @param q value
- * @return 1 / q
- */
-static av_always_inline AVRational av_inv_q(AVRational q)
-{
-    AVRational r = { q.den, q.num };
-    return r;
-}
-
-/**
- * Convert a double precision floating point number to a rational.
- * inf is expressed as {1,0} or {-1,0} depending on the sign.
- *
- * @param d double to convert
- * @param max the maximum allowed numerator and denominator
- * @return (AVRational) d
- */
-AVRational av_d2q(double d, int max) av_const;
-
-/**
- * @return 1 if q1 is nearer to q than q2, -1 if q2 is nearer
- * than q1, 0 if they have the same distance.
- */
-int av_nearer_q(AVRational q, AVRational q1, AVRational q2);
-
-/**
- * Find the nearest value in q_list to q.
- * @param q_list an array of rationals terminated by {0, 0}
- * @return the index of the nearest value found in the array
- */
-int av_find_nearest_q_idx(AVRational q, const AVRational* q_list);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_RATIONAL_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/samplefmt.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/samplefmt.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/samplefmt.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/samplefmt.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,220 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_SAMPLEFMT_H
-#define AVUTIL_SAMPLEFMT_H
-
-#include <stdint.h>
-
-#include "avutil.h"
-#include "attributes.h"
-
-/**
- * Audio Sample Formats
- *
- * @par
- * The data described by the sample format is always in native-endian order.
- * Sample values can be expressed by native C types, hence the lack of a signed
- * 24-bit sample format even though it is a common raw audio data format.
- *
- * @par
- * The floating-point formats are based on full volume being in the range
- * [-1.0, 1.0]. Any values outside this range are beyond full volume level.
- *
- * @par
- * The data layout as used in av_samples_fill_arrays() and elsewhere in Libav
- * (such as AVFrame in libavcodec) is as follows:
- *
- * For planar sample formats, each audio channel is in a separate data plane,
- * and linesize is the buffer size, in bytes, for a single plane. All data
- * planes must be the same size. For packed sample formats, only the first data
- * plane is used, and samples for each channel are interleaved. In this case,
- * linesize is the buffer size, in bytes, for the 1 plane.
- */
-enum AVSampleFormat {
-    AV_SAMPLE_FMT_NONE = -1,
-    AV_SAMPLE_FMT_U8,          ///< unsigned 8 bits
-    AV_SAMPLE_FMT_S16,         ///< signed 16 bits
-    AV_SAMPLE_FMT_S32,         ///< signed 32 bits
-    AV_SAMPLE_FMT_FLT,         ///< float
-    AV_SAMPLE_FMT_DBL,         ///< double
-
-    AV_SAMPLE_FMT_U8P,         ///< unsigned 8 bits, planar
-    AV_SAMPLE_FMT_S16P,        ///< signed 16 bits, planar
-    AV_SAMPLE_FMT_S32P,        ///< signed 32 bits, planar
-    AV_SAMPLE_FMT_FLTP,        ///< float, planar
-    AV_SAMPLE_FMT_DBLP,        ///< double, planar
-
-    AV_SAMPLE_FMT_NB           ///< Number of sample formats. DO NOT USE if linking dynamically
-};
-
-/**
- * Return the name of sample_fmt, or NULL if sample_fmt is not
- * recognized.
- */
-const char *av_get_sample_fmt_name(enum AVSampleFormat sample_fmt);
-
-/**
- * Return a sample format corresponding to name, or AV_SAMPLE_FMT_NONE
- * on error.
- */
-enum AVSampleFormat av_get_sample_fmt(const char *name);
-
-/**
- * Get the packed alternative form of the given sample format.
- *
- * If the passed sample_fmt is already in packed format, the format returned is
- * the same as the input.
- *
- * @return  the packed alternative form of the given sample format or
-            AV_SAMPLE_FMT_NONE on error.
- */
-enum AVSampleFormat av_get_packed_sample_fmt(enum AVSampleFormat sample_fmt);
-
-/**
- * Get the planar alternative form of the given sample format.
- *
- * If the passed sample_fmt is already in planar format, the format returned is
- * the same as the input.
- *
- * @return  the planar alternative form of the given sample format or
-            AV_SAMPLE_FMT_NONE on error.
- */
-enum AVSampleFormat av_get_planar_sample_fmt(enum AVSampleFormat sample_fmt);
-
-/**
- * Generate a string corresponding to the sample format with
- * sample_fmt, or a header if sample_fmt is negative.
- *
- * @param buf the buffer where to write the string
- * @param buf_size the size of buf
- * @param sample_fmt the number of the sample format to print the
- * corresponding info string, or a negative value to print the
- * corresponding header.
- * @return the pointer to the filled buffer or NULL if sample_fmt is
- * unknown or in case of other errors
- */
-char *av_get_sample_fmt_string(char *buf, int buf_size, enum AVSampleFormat sample_fmt);
-
-/**
- * Return number of bytes per sample.
- *
- * @param sample_fmt the sample format
- * @return number of bytes per sample or zero if unknown for the given
- * sample format
- */
-int av_get_bytes_per_sample(enum AVSampleFormat sample_fmt);
-
-/**
- * Check if the sample format is planar.
- *
- * @param sample_fmt the sample format to inspect
- * @return 1 if the sample format is planar, 0 if it is interleaved
- */
-int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt);
-
-/**
- * Get the required buffer size for the given audio parameters.
- *
- * @param[out] linesize calculated linesize, may be NULL
- * @param nb_channels   the number of channels
- * @param nb_samples    the number of samples in a single channel
- * @param sample_fmt    the sample format
- * @param align         buffer size alignment (0 = default, 1 = no alignment)
- * @return              required buffer size, or negative error code on failure
- */
-int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples,
-                               enum AVSampleFormat sample_fmt, int align);
-
-/**
- * Fill channel data pointers and linesize for samples with sample
- * format sample_fmt.
- *
- * The pointers array is filled with the pointers to the samples data:
- * for planar, set the start point of each channel's data within the buffer,
- * for packed, set the start point of the entire buffer only.
- *
- * The linesize array is filled with the aligned size of each channel's data
- * buffer for planar layout, or the aligned size of the buffer for all channels
- * for packed layout.
- *
- * @see enum AVSampleFormat
- * The documentation for AVSampleFormat describes the data layout.
- *
- * @param[out] audio_data  array to be filled with the pointer for each channel
- * @param[out] linesize    calculated linesize, may be NULL
- * @param buf              the pointer to a buffer containing the samples
- * @param nb_channels      the number of channels
- * @param nb_samples       the number of samples in a single channel
- * @param sample_fmt       the sample format
- * @param align            buffer size alignment (0 = default, 1 = no alignment)
- * @return                 0 on success or a negative error code on failure
- */
-int av_samples_fill_arrays(uint8_t **audio_data, int *linesize,
-                           const uint8_t *buf,
-                           int nb_channels, int nb_samples,
-                           enum AVSampleFormat sample_fmt, int align);
-
-/**
- * Allocate a samples buffer for nb_samples samples, and fill data pointers and
- * linesize accordingly.
- * The allocated samples buffer can be freed by using av_freep(&audio_data[0])
- * Allocated data will be initialized to silence.
- *
- * @see enum AVSampleFormat
- * The documentation for AVSampleFormat describes the data layout.
- *
- * @param[out] audio_data  array to be filled with the pointer for each channel
- * @param[out] linesize    aligned size for audio buffer(s), may be NULL
- * @param nb_channels      number of audio channels
- * @param nb_samples       number of samples per channel
- * @param align            buffer size alignment (0 = default, 1 = no alignment)
- * @return                 0 on success or a negative error code on failure
- * @see av_samples_fill_arrays()
- */
-int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels,
-                     int nb_samples, enum AVSampleFormat sample_fmt, int align);
-
-/**
- * Copy samples from src to dst.
- *
- * @param dst destination array of pointers to data planes
- * @param src source array of pointers to data planes
- * @param dst_offset offset in samples at which the data will be written to dst
- * @param src_offset offset in samples at which the data will be read from src
- * @param nb_samples number of samples to be copied
- * @param nb_channels number of audio channels
- * @param sample_fmt audio sample format
- */
-int av_samples_copy(uint8_t **dst, uint8_t * const *src, int dst_offset,
-                    int src_offset, int nb_samples, int nb_channels,
-                    enum AVSampleFormat sample_fmt);
-
-/**
- * Fill an audio buffer with silence.
- *
- * @param audio_data  array of pointers to data planes
- * @param offset      offset in samples at which to start filling
- * @param nb_samples  number of samples to fill
- * @param nb_channels number of audio channels
- * @param sample_fmt  audio sample format
- */
-int av_samples_set_silence(uint8_t **audio_data, int offset, int nb_samples,
-                           int nb_channels, enum AVSampleFormat sample_fmt);
-
-#endif /* AVUTIL_SAMPLEFMT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/sha.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/sha.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/sha.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/sha.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_SHA_H
-#define AVUTIL_SHA_H
-
-#include <stdint.h>
-
-#include "attributes.h"
-#include "version.h"
-
-/**
- * @defgroup lavu_sha SHA
- * @ingroup lavu_crypto
- * @{
- */
-
-#if FF_API_CONTEXT_SIZE
-extern attribute_deprecated const int av_sha_size;
-#endif
-
-struct AVSHA;
-
-/**
- * Allocate an AVSHA context.
- */
-struct AVSHA *av_sha_alloc(void);
-
-/**
- * Initialize SHA-1 or SHA-2 hashing.
- *
- * @param context pointer to the function context (of size av_sha_size)
- * @param bits    number of bits in digest (SHA-1 - 160 bits, SHA-2 224 or 256 bits)
- * @return        zero if initialization succeeded, -1 otherwise
- */
-int av_sha_init(struct AVSHA* context, int bits);
-
-/**
- * Update hash value.
- *
- * @param context hash function context
- * @param data    input data to update hash with
- * @param len     input data length
- */
-void av_sha_update(struct AVSHA* context, const uint8_t* data, unsigned int len);
-
-/**
- * Finish hashing and output digest value.
- *
- * @param context hash function context
- * @param digest  buffer where output digest value is stored
- */
-void av_sha_final(struct AVSHA* context, uint8_t *digest);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_SHA_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/stereo3d.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/stereo3d.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/stereo3d.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/stereo3d.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2013 Vittorio Giovara <vittorio.giovara@gmail.com>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <stdint.h>
-
-#include "frame.h"
-
-/**
- * List of possible 3D Types
- */
-enum AVStereo3DType {
-    /**
-     * Video is not stereoscopic (and metadata has to be there).
-     */
-    AV_STEREO3D_2D,
-
-    /**
-     * Views are next to each other.
-     *
-     *    LLLLRRRR
-     *    LLLLRRRR
-     *    LLLLRRRR
-     *    ...
-     */
-    AV_STEREO3D_SIDEBYSIDE,
-
-    /**
-     * Views are on top of each other.
-     *
-     *    LLLLLLLL
-     *    LLLLLLLL
-     *    RRRRRRRR
-     *    RRRRRRRR
-     */
-    AV_STEREO3D_TOPBOTTOM,
-
-    /**
-     * Views are alternated temporally.
-     *
-     *     frame0   frame1   frame2   ...
-     *    LLLLLLLL RRRRRRRR LLLLLLLL
-     *    LLLLLLLL RRRRRRRR LLLLLLLL
-     *    LLLLLLLL RRRRRRRR LLLLLLLL
-     *    ...      ...      ...
-     */
-    AV_STEREO3D_FRAMESEQUENCE,
-
-    /**
-     * Views are packed in a checkerboard-like structure per pixel.
-     *
-     *    LRLRLRLR
-     *    RLRLRLRL
-     *    LRLRLRLR
-     *    ...
-     */
-    AV_STEREO3D_CHECKERBOARD,
-
-    /**
-     * Views are next to each other, but when upscaling
-     * apply a checkerboard pattern.
-     *
-     *     LLLLRRRR          L L L L    R R R R
-     *     LLLLRRRR    =>     L L L L  R R R R
-     *     LLLLRRRR          L L L L    R R R R
-     *     LLLLRRRR           L L L L  R R R R
-     */
-    AV_STEREO3D_SIDEBYSIDE_QUINCUNX,
-
-    /**
-     * Views are packed per line, as if interlaced.
-     *
-     *    LLLLLLLL
-     *    RRRRRRRR
-     *    LLLLLLLL
-     *    ...
-     */
-    AV_STEREO3D_LINES,
-
-    /**
-     * Views are packed per column.
-     *
-     *    LRLRLRLR
-     *    LRLRLRLR
-     *    LRLRLRLR
-     *    ...
-     */
-    AV_STEREO3D_COLUMNS,
-};
-
-
-/**
- * Inverted views, Right/Bottom represents the left view.
- */
-#define AV_STEREO3D_FLAG_INVERT     (1 << 0)
-
-/**
- * Stereo 3D type: this structure describes how two videos are packed
- * within a single video surface, with additional information as needed.
- *
- * @note The struct must be allocated with av_stereo3d_alloc() and
- *       its size is not a part of the public ABI.
- */
-typedef struct AVStereo3D {
-    /**
-     * How views are packed within the video.
-     */
-    enum AVStereo3DType type;
-
-    /**
-     * Additional information about the frame packing.
-     */
-    int flags;
-} AVStereo3D;
-
-/**
- * Allocate an AVStereo3D structure and set its fields to default values.
- * The resulting struct can be freed using av_freep().
- *
- * @return An AVStereo3D filled with default values or NULL on failure.
- */
-AVStereo3D *av_stereo3d_alloc(void);
-
-/**
- * Allocate a complete AVFrameSideData and add it to the frame.
- *
- * @param frame The frame which side data is added to.
- *
- * @return The AVStereo3D structure to be filled by caller.
- */
-AVStereo3D *av_stereo3d_create_side_data(AVFrame *frame);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/time.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/time.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/time.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/time.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_TIME_H
-#define AVUTIL_TIME_H
-
-#include <stdint.h>
-
-/**
- * Get the current time in microseconds.
- */
-int64_t av_gettime(void);
-
-/**
- * Sleep for a period of time.  Although the duration is expressed in
- * microseconds, the actual delay may be rounded to the precision of the
- * system timer.
- *
- * @param  usec Number of microseconds to sleep.
- * @return zero on success or (negative) error code.
- */
-int av_usleep(unsigned usec);
-
-#endif /* AVUTIL_TIME_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/version.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/version.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/version.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/version.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_VERSION_H
-#define AVUTIL_VERSION_H
-
-#include "macros.h"
-
-/**
- * @defgroup version_utils Library Version Macros
- *
- * Useful to check and match library version in order to maintain
- * backward compatibility.
- *
- * @{
- */
-
-#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
-#define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c
-#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
-
-/**
- * @}
- */
-
-/**
- * @file
- * @ingroup lavu
- * Libavutil version macros
- */
-
-/**
- * @defgroup lavu_ver Version and Build diagnostics
- *
- * Macros and function useful to check at compiletime and at runtime
- * which version of libavutil is in use.
- *
- * @{
- */
-
-#define LIBAVUTIL_VERSION_MAJOR 53
-#define LIBAVUTIL_VERSION_MINOR  3
-#define LIBAVUTIL_VERSION_MICRO  0
-
-#define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
-                                               LIBAVUTIL_VERSION_MINOR, \
-                                               LIBAVUTIL_VERSION_MICRO)
-#define LIBAVUTIL_VERSION       AV_VERSION(LIBAVUTIL_VERSION_MAJOR,     \
-                                           LIBAVUTIL_VERSION_MINOR,     \
-                                           LIBAVUTIL_VERSION_MICRO)
-#define LIBAVUTIL_BUILD         LIBAVUTIL_VERSION_INT
-
-#define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
-
-/**
- * @}
- *
- * @defgroup depr_guards Deprecation guards
- * FF_API_* defines may be placed below to indicate public API that will be
- * dropped at a future version bump. The defines themselves are not part of
- * the public API and may change, break or disappear at any time.
- *
- * @{
- */
-
-#ifndef FF_API_PIX_FMT
-#define FF_API_PIX_FMT                  (LIBAVUTIL_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_CONTEXT_SIZE
-#define FF_API_CONTEXT_SIZE             (LIBAVUTIL_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_PIX_FMT_DESC
-#define FF_API_PIX_FMT_DESC             (LIBAVUTIL_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_AV_REVERSE
-#define FF_API_AV_REVERSE               (LIBAVUTIL_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_AUDIOCONVERT
-#define FF_API_AUDIOCONVERT             (LIBAVUTIL_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_CPU_FLAG_MMX2
-#define FF_API_CPU_FLAG_MMX2            (LIBAVUTIL_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_LLS_PRIVATE
-#define FF_API_LLS_PRIVATE              (LIBAVUTIL_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_AVFRAME_LAVC
-#define FF_API_AVFRAME_LAVC             (LIBAVUTIL_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_VDPAU
-#define FF_API_VDPAU                    (LIBAVUTIL_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_XVMC
-#define FF_API_XVMC                     (LIBAVUTIL_VERSION_MAJOR < 54)
-#endif
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_VERSION_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/xtea.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/xtea.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/include/libavutil/xtea.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/include/libavutil/xtea.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-/*
- * A 32-bit implementation of the XTEA algorithm
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_XTEA_H
-#define AVUTIL_XTEA_H
-
-#include <stdint.h>
-
-/**
- * @defgroup lavu_xtea XTEA
- * @ingroup lavu_crypto
- * @{
- */
-
-typedef struct AVXTEA {
-    uint32_t key[16];
-} AVXTEA;
-
-/**
- * Initialize an AVXTEA context.
- *
- * @param ctx an AVXTEA context
- * @param key a key of 16 bytes used for encryption/decryption
- */
-void av_xtea_init(struct AVXTEA *ctx, const uint8_t key[16]);
-
-/**
- * Encrypt or decrypt a buffer using a previously initialized context.
- *
- * @param ctx an AVXTEA context
- * @param dst destination array, can be equal to src
- * @param src source array, can be equal to dst
- * @param count number of 8 byte blocks
- * @param iv initialization vector for CBC mode, if NULL then ECB will be used
- * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_xtea_crypt(struct AVXTEA *ctx, uint8_t *dst, const uint8_t *src,
-                   int count, uint8_t *iv, int decrypt);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_XTEA_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/libav55/moz.build	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/libav55/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +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 += [
-    '../FFmpegAudioDecoder.cpp',
-    '../FFmpegDataDecoder.cpp',
-    '../FFmpegDecoderModule.cpp',
-    '../FFmpegH264Decoder.cpp',
-]
-LOCAL_INCLUDES += [
-    '..',
-    'include',
-]
-CXXFLAGS += [ '-Wno-deprecated-declarations' ]
-
-FINAL_LIBRARY = 'xul'
-
-FAIL_ON_WARNINGS = True
-
-if CONFIG['CLANG_CXX']:
-  CXXFLAGS += [
-    '-Wno-unknown-attributes',
-  ]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/README_mozilla firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/README_mozilla
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/ffmpeg/README_mozilla	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/ffmpeg/README_mozilla	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-These headers are taken from Libav versions 0.8.9, 0.9 and 1.0.
-
-These headers are licensed under the GNU Lesser General Public License version
-2.1. For more information see the file COPYING.LGPLv2.1
-
-While the function ABIs of FFmpeg/Libav tend to be stable between even major
-versions, the class layouts can change considerably. This can lead to major
-crashes if we build against the wrong headers. We include these headers to make
-sure we have the same version every time we build, and to ease the pain of
-acquiring the correct libraries for a build, especially for those distributions
-who oppose distributing such packages.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gmp/GMPAudioDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gmp/GMPAudioDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gmp/GMPAudioDecoder.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gmp/GMPAudioDecoder.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,254 +0,0 @@
-/* -*- 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 "GMPAudioDecoder.h"
-#include "nsServiceManagerUtils.h"
-#include "MediaInfo.h"
-
-namespace mozilla {
-
-#if defined(DEBUG)
-bool IsOnGMPThread()
-{
-  nsCOMPtr<mozIGeckoMediaPluginService> mps = do_GetService("@mozilla.org/gecko-media-plugin-service;1");
-  MOZ_ASSERT(mps);
-
-  nsCOMPtr<nsIThread> gmpThread;
-  nsresult rv = mps->GetThread(getter_AddRefs(gmpThread));
-  MOZ_ASSERT(NS_SUCCEEDED(rv) && gmpThread);
-  return NS_GetCurrentThread() == gmpThread;
-}
-#endif
-
-void
-AudioCallbackAdapter::Decoded(const nsTArray<int16_t>& aPCM, uint64_t aTimeStamp, uint32_t aChannels, uint32_t aRate)
-{
-  MOZ_ASSERT(IsOnGMPThread());
-
-  if (aRate == 0 || aChannels == 0) {
-    NS_WARNING("Invalid rate or num channels returned on GMP audio samples");
-    mCallback->Error();
-    return;
-  }
-
-  size_t numFrames = aPCM.Length() / aChannels;
-  MOZ_ASSERT((aPCM.Length() % aChannels) == 0);
-  nsAutoArrayPtr<AudioDataValue> audioData(new AudioDataValue[aPCM.Length()]);
-
-  for (size_t i = 0; i < aPCM.Length(); ++i) {
-    audioData[i] = AudioSampleToFloat(aPCM[i]);
-  }
-
-  if (mMustRecaptureAudioPosition) {
-    mAudioFrameSum = 0;
-    auto timestamp = UsecsToFrames(aTimeStamp, aRate);
-    if (!timestamp.isValid()) {
-      NS_WARNING("Invalid timestamp");
-      mCallback->Error();
-      return;
-    }
-    mAudioFrameOffset = timestamp.value();
-    MOZ_ASSERT(mAudioFrameOffset >= 0);
-    mMustRecaptureAudioPosition = false;
-  }
-
-  auto timestamp = FramesToUsecs(mAudioFrameOffset + mAudioFrameSum, aRate);
-  if (!timestamp.isValid()) {
-    NS_WARNING("Invalid timestamp on audio samples");
-    mCallback->Error();
-    return;
-  }
-  mAudioFrameSum += numFrames;
-
-  auto duration = FramesToUsecs(numFrames, aRate);
-  if (!duration.isValid()) {
-    NS_WARNING("Invalid duration on audio samples");
-    mCallback->Error();
-    return;
-  }
-
-  nsRefPtr<AudioData> audio(new AudioData(mLastStreamOffset,
-                                          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);
-}
-
-void
-AudioCallbackAdapter::InputDataExhausted()
-{
-  MOZ_ASSERT(IsOnGMPThread());
-  mCallback->InputExhausted();
-}
-
-void
-AudioCallbackAdapter::DrainComplete()
-{
-  MOZ_ASSERT(IsOnGMPThread());
-  mCallback->DrainComplete();
-}
-
-void
-AudioCallbackAdapter::ResetComplete()
-{
-  MOZ_ASSERT(IsOnGMPThread());
-  mMustRecaptureAudioPosition = true;
-  mCallback->FlushComplete();
-}
-
-void
-AudioCallbackAdapter::Error(GMPErr aErr)
-{
-  MOZ_ASSERT(IsOnGMPThread());
-  mCallback->Error();
-}
-
-void
-AudioCallbackAdapter::Terminated()
-{
-  NS_WARNING("AAC GMP decoder terminated.");
-  mCallback->Error();
-}
-
-void
-GMPAudioDecoder::InitTags(nsTArray<nsCString>& aTags)
-{
-  aTags.AppendElement(NS_LITERAL_CSTRING("aac"));
-}
-
-nsCString
-GMPAudioDecoder::GetNodeId()
-{
-  return NS_LITERAL_CSTRING("");
-}
-
-void
-GMPAudioDecoder::GetGMPAPI(GMPInitDoneRunnable* aInitDone)
-{
-  MOZ_ASSERT(IsOnGMPThread());
-
-  nsTArray<nsCString> tags;
-  InitTags(tags);
-  UniquePtr<GetGMPAudioDecoderCallback> callback(
-    new GMPInitDoneCallback(this, aInitDone));
-  if (NS_FAILED(mMPS->GetGMPAudioDecoder(&tags, GetNodeId(), Move(callback)))) {
-    aInitDone->Dispatch();
-  }
-}
-
-void
-GMPAudioDecoder::GMPInitDone(GMPAudioDecoderProxy* aGMP)
-{
-  MOZ_ASSERT(aGMP);
-  nsTArray<uint8_t> codecSpecific;
-  codecSpecific.AppendElements(mConfig.mCodecSpecificConfig->Elements(),
-                               mConfig.mCodecSpecificConfig->Length());
-
-  nsresult rv = aGMP->InitDecode(kGMPAudioCodecAAC,
-                                 mConfig.mChannels,
-                                 mConfig.mBitDepth,
-                                 mConfig.mRate,
-                                 codecSpecific,
-                                 mAdapter);
-  if (NS_SUCCEEDED(rv)) {
-    mGMP = aGMP;
-  }
-}
-
-nsresult
-GMPAudioDecoder::Init()
-{
-  MOZ_ASSERT(IsOnGMPThread());
-
-  mMPS = do_GetService("@mozilla.org/gecko-media-plugin-service;1");
-  MOZ_ASSERT(mMPS);
-
-  nsCOMPtr<nsIThread> gmpThread = NS_GetCurrentThread();
-
-  nsRefPtr<GMPInitDoneRunnable> initDone(new GMPInitDoneRunnable());
-  gmpThread->Dispatch(
-    NS_NewRunnableMethodWithArg<GMPInitDoneRunnable*>(this,
-                                                      &GMPAudioDecoder::GetGMPAPI,
-                                                      initDone),
-    NS_DISPATCH_NORMAL);
-
-  while (!initDone->IsDone()) {
-    NS_ProcessNextEvent(gmpThread, true);
-  }
-
-  return mGMP ? NS_OK : NS_ERROR_FAILURE;
-}
-
-nsresult
-GMPAudioDecoder::Input(MediaRawData* aSample)
-{
-  MOZ_ASSERT(IsOnGMPThread());
-
-  nsRefPtr<MediaRawData> sample(aSample);
-  if (!mGMP) {
-    mCallback->Error();
-    return NS_ERROR_FAILURE;
-  }
-
-  mAdapter->SetLastStreamOffset(sample->mOffset);
-
-  gmp::GMPAudioSamplesImpl samples(sample, mConfig.mChannels, mConfig.mRate);
-  nsresult rv = mGMP->Decode(samples);
-  if (NS_FAILED(rv)) {
-    mCallback->Error();
-    return rv;
-  }
-
-  return NS_OK;
-}
-
-nsresult
-GMPAudioDecoder::Flush()
-{
-  MOZ_ASSERT(IsOnGMPThread());
-
-  if (!mGMP || NS_FAILED(mGMP->Reset())) {
-    // Abort the flush.
-    mCallback->FlushComplete();
-  }
-
-  return NS_OK;
-}
-
-nsresult
-GMPAudioDecoder::Drain()
-{
-  MOZ_ASSERT(IsOnGMPThread());
-
-  if (!mGMP || NS_FAILED(mGMP->Drain())) {
-    mCallback->DrainComplete();
-  }
-
-  return NS_OK;
-}
-
-nsresult
-GMPAudioDecoder::Shutdown()
-{
-  if (!mGMP) {
-    return NS_ERROR_FAILURE;
-  }
-  mGMP->Close();
-  mGMP = nullptr;
-
-  return NS_OK;
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gmp/GMPAudioDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gmp/GMPAudioDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gmp/GMPAudioDecoder.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gmp/GMPAudioDecoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,149 +0,0 @@
-/* -*- 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(GMPAudioDecoder_h_)
-#define GMPAudioDecoder_h_
-
-#include "GMPAudioDecoderProxy.h"
-#include "MediaDataDecoderProxy.h"
-#include "PlatformDecoderModule.h"
-#include "mozIGeckoMediaPluginService.h"
-
-namespace mozilla {
-
-class AudioCallbackAdapter : public GMPAudioDecoderCallbackProxy {
-public:
-  explicit AudioCallbackAdapter(MediaDataDecoderCallbackProxy* aCallback)
-   : mCallback(aCallback)
-   , mLastStreamOffset(0)
-   , mAudioFrameSum(0)
-   , mAudioFrameOffset(0)
-   , mMustRecaptureAudioPosition(true)
-  {}
-
-  // GMPAudioDecoderCallbackProxy
-  virtual void Decoded(const nsTArray<int16_t>& aPCM, uint64_t aTimeStamp, uint32_t aChannels, uint32_t aRate) override;
-  virtual void InputDataExhausted() override;
-  virtual void DrainComplete() override;
-  virtual void ResetComplete() override;
-  virtual void Error(GMPErr aErr) override;
-  virtual void Terminated() override;
-
-  void SetLastStreamOffset(int64_t aStreamOffset) {
-    mLastStreamOffset = aStreamOffset;
-  }
-
-private:
-  MediaDataDecoderCallbackProxy* mCallback;
-  int64_t mLastStreamOffset;
-
-  int64_t mAudioFrameSum;
-  int64_t mAudioFrameOffset;
-  bool mMustRecaptureAudioPosition;
-};
-
-class GMPAudioDecoder : public MediaDataDecoder {
-protected:
-  GMPAudioDecoder(const AudioInfo& aConfig,
-                  MediaTaskQueue* aTaskQueue,
-                  MediaDataDecoderCallbackProxy* aCallback,
-                  AudioCallbackAdapter* aAdapter)
-   : mConfig(aConfig)
-   , mCallback(aCallback)
-   , mGMP(nullptr)
-   , mAdapter(aAdapter)
-  {
-  }
-
-public:
-  GMPAudioDecoder(const AudioInfo& aConfig,
-                  MediaTaskQueue* aTaskQueue,
-                  MediaDataDecoderCallbackProxy* aCallback)
-   : mConfig(aConfig)
-   , mCallback(aCallback)
-   , mGMP(nullptr)
-   , mAdapter(new AudioCallbackAdapter(aCallback))
-  {
-  }
-
-  virtual nsresult Init() override;
-  virtual nsresult Input(MediaRawData* aSample) override;
-  virtual nsresult Flush() override;
-  virtual nsresult Drain() override;
-  virtual nsresult Shutdown() override;
-
-protected:
-  virtual void InitTags(nsTArray<nsCString>& aTags);
-  virtual nsCString GetNodeId();
-
-private:
-  class GMPInitDoneRunnable : public nsRunnable
-  {
-  public:
-    GMPInitDoneRunnable()
-      : mInitDone(false),
-        mThread(do_GetCurrentThread())
-    {
-    }
-
-    NS_IMETHOD Run()
-    {
-      mInitDone = true;
-      return NS_OK;
-    }
-
-    void Dispatch()
-    {
-      mThread->Dispatch(this, NS_DISPATCH_NORMAL);
-    }
-
-    bool IsDone()
-    {
-      MOZ_ASSERT(nsCOMPtr<nsIThread>(do_GetCurrentThread()) == mThread);
-      return mInitDone;
-    }
-
-  private:
-    bool mInitDone;
-    nsCOMPtr<nsIThread> mThread;
-  };
-
-  void GetGMPAPI(GMPInitDoneRunnable* aInitDone);
-
-  class GMPInitDoneCallback : public GetGMPAudioDecoderCallback
-  {
-  public:
-    GMPInitDoneCallback(GMPAudioDecoder* aDecoder,
-                        GMPInitDoneRunnable* aGMPInitDone)
-      : mDecoder(aDecoder)
-      , mGMPInitDone(aGMPInitDone)
-    {
-    }
-
-    virtual void Done(GMPAudioDecoderProxy* aGMP)
-    {
-      if (aGMP) {
-        mDecoder->GMPInitDone(aGMP);
-      }
-      mGMPInitDone->Dispatch();
-    }
-
-  private:
-    nsRefPtr<GMPAudioDecoder> mDecoder;
-    nsRefPtr<GMPInitDoneRunnable> mGMPInitDone;
-  };
-  void GMPInitDone(GMPAudioDecoderProxy* aGMP);
-
-  const AudioInfo& mConfig;
-  MediaDataDecoderCallbackProxy* mCallback;
-  nsCOMPtr<mozIGeckoMediaPluginService> mMPS;
-  GMPAudioDecoderProxy* mGMP;
-  nsAutoPtr<AudioCallbackAdapter> mAdapter;
-};
-
-} // namespace mozilla
-
-#endif // GMPAudioDecoder_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gmp/GMPDecoderModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gmp/GMPDecoderModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gmp/GMPDecoderModule.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gmp/GMPDecoderModule.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,89 +0,0 @@
-/* -*- 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 "GMPDecoderModule.h"
-#include "GMPAudioDecoder.h"
-#include "GMPVideoDecoder.h"
-#include "MediaDataDecoderProxy.h"
-#include "mozIGeckoMediaPluginService.h"
-#include "nsServiceManagerUtils.h"
-
-namespace mozilla {
-
-GMPDecoderModule::GMPDecoderModule()
-{
-}
-
-GMPDecoderModule::~GMPDecoderModule()
-{
-}
-
-static already_AddRefed<MediaDataDecoderProxy>
-CreateDecoderWrapper(MediaDataDecoderCallback* aCallback)
-{
-  nsCOMPtr<mozIGeckoMediaPluginService> gmpService = do_GetService("@mozilla.org/gecko-media-plugin-service;1");
-  if (!gmpService) {
-    return nullptr;
-  }
-
-  nsCOMPtr<nsIThread> thread;
-  nsresult rv = gmpService->GetThread(getter_AddRefs(thread));
-  if (NS_FAILED(rv)) {
-    return nullptr;
-  }
-
-  nsRefPtr<MediaDataDecoderProxy> decoder(new MediaDataDecoderProxy(thread, aCallback));
-  return decoder.forget();
-}
-
-already_AddRefed<MediaDataDecoder>
-GMPDecoderModule::CreateVideoDecoder(const VideoInfo& aConfig,
-                                     layers::LayersBackend aLayersBackend,
-                                     layers::ImageContainer* aImageContainer,
-                                     FlushableMediaTaskQueue* aVideoTaskQueue,
-                                     MediaDataDecoderCallback* aCallback)
-{
-  if (!aConfig.mMimeType.EqualsLiteral("video/avc")) {
-    return nullptr;
-  }
-
-  nsRefPtr<MediaDataDecoderProxy> wrapper = CreateDecoderWrapper(aCallback);
-  wrapper->SetProxyTarget(new GMPVideoDecoder(aConfig,
-                                              aLayersBackend,
-                                              aImageContainer,
-                                              aVideoTaskQueue,
-                                              wrapper->Callback()));
-  return wrapper.forget();
-}
-
-already_AddRefed<MediaDataDecoder>
-GMPDecoderModule::CreateAudioDecoder(const AudioInfo& aConfig,
-                                     FlushableMediaTaskQueue* aAudioTaskQueue,
-                                     MediaDataDecoderCallback* aCallback)
-{
-  if (!aConfig.mMimeType.EqualsLiteral("audio/mp4a-latm")) {
-    return nullptr;
-  }
-
-  nsRefPtr<MediaDataDecoderProxy> wrapper = CreateDecoderWrapper(aCallback);
-  wrapper->SetProxyTarget(new GMPAudioDecoder(aConfig,
-                                              aAudioTaskQueue,
-                                              wrapper->Callback()));
-  return wrapper.forget();
-}
-
-PlatformDecoderModule::ConversionRequired
-GMPDecoderModule::DecoderNeedsConversion(const TrackInfo& aConfig) const
-{
-  // GMPVideoCodecType::kGMPVideoCodecH264 specifies that encoded frames must be in AVCC format.
-  if (aConfig.IsVideo()) {
-    return kNeedAVCC;
-  } else {
-    return kNeedNone;
-  }
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gmp/GMPDecoderModule.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gmp/GMPDecoderModule.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gmp/GMPDecoderModule.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gmp/GMPDecoderModule.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-/* -*- 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(GMPDecoderModule_h_)
-#define GMPDecoderModule_h_
-
-#include "PlatformDecoderModule.h"
-
-namespace mozilla {
-
-class GMPDecoderModule : public PlatformDecoderModule {
-public:
-  GMPDecoderModule();
-
-  virtual ~GMPDecoderModule();
-
-  // Decode thread.
-  virtual already_AddRefed<MediaDataDecoder>
-  CreateVideoDecoder(const VideoInfo& aConfig,
-                     layers::LayersBackend aLayersBackend,
-                     layers::ImageContainer* aImageContainer,
-                     FlushableMediaTaskQueue* aVideoTaskQueue,
-                     MediaDataDecoderCallback* aCallback) override;
-
-  // Decode thread.
-  virtual already_AddRefed<MediaDataDecoder>
-  CreateAudioDecoder(const AudioInfo& aConfig,
-                     FlushableMediaTaskQueue* aAudioTaskQueue,
-                     MediaDataDecoderCallback* aCallback) override;
-
-  virtual ConversionRequired
-  DecoderNeedsConversion(const TrackInfo& aConfig) const override;
-};
-
-} // namespace mozilla
-
-#endif // GMPDecoderModule_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gmp/GMPVideoDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gmp/GMPVideoDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gmp/GMPVideoDecoder.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gmp/GMPVideoDecoder.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,300 +0,0 @@
-/* -*- 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 "GMPVideoDecoder.h"
-#include "GMPVideoHost.h"
-#include "mozilla/Endian.h"
-#include "prsystem.h"
-#include "MediaData.h"
-
-namespace mozilla {
-
-#if defined(DEBUG)
-extern bool IsOnGMPThread();
-#endif
-
-void
-VideoCallbackAdapter::Decoded(GMPVideoi420Frame* aDecodedFrame)
-{
-  GMPUniquePtr<GMPVideoi420Frame> decodedFrame(aDecodedFrame);
-
-  MOZ_ASSERT(IsOnGMPThread());
-
-  VideoData::YCbCrBuffer b;
-  for (int i = 0; i < kGMPNumOfPlanes; ++i) {
-    b.mPlanes[i].mData = decodedFrame->Buffer(GMPPlaneType(i));
-    b.mPlanes[i].mStride = decodedFrame->Stride(GMPPlaneType(i));
-    if (i == kGMPYPlane) {
-      b.mPlanes[i].mWidth = decodedFrame->Width();
-      b.mPlanes[i].mHeight = decodedFrame->Height();
-    } else {
-      b.mPlanes[i].mWidth = (decodedFrame->Width() + 1) / 2;
-      b.mPlanes[i].mHeight = (decodedFrame->Height() + 1) / 2;
-    }
-    b.mPlanes[i].mOffset = 0;
-    b.mPlanes[i].mSkip = 0;
-  }
-
-  gfx::IntRect pictureRegion(0, 0, decodedFrame->Width(), decodedFrame->Height());
-  nsRefPtr<VideoData> v = VideoData::Create(mVideoInfo,
-                                            mImageContainer,
-                                            mLastStreamOffset,
-                                            decodedFrame->Timestamp(),
-                                            decodedFrame->Duration(),
-                                            b,
-                                            false,
-                                            -1,
-                                            pictureRegion);
-  if (v) {
-    mCallback->Output(v);
-  } else {
-    mCallback->Error();
-  }
-}
-
-void
-VideoCallbackAdapter::ReceivedDecodedReferenceFrame(const uint64_t aPictureId)
-{
-  MOZ_ASSERT(IsOnGMPThread());
-}
-
-void
-VideoCallbackAdapter::ReceivedDecodedFrame(const uint64_t aPictureId)
-{
-  MOZ_ASSERT(IsOnGMPThread());
-}
-
-void
-VideoCallbackAdapter::InputDataExhausted()
-{
-  MOZ_ASSERT(IsOnGMPThread());
-  mCallback->InputExhausted();
-}
-
-void
-VideoCallbackAdapter::DrainComplete()
-{
-  MOZ_ASSERT(IsOnGMPThread());
-  mCallback->DrainComplete();
-}
-
-void
-VideoCallbackAdapter::ResetComplete()
-{
-  MOZ_ASSERT(IsOnGMPThread());
-  mCallback->FlushComplete();
-}
-
-void
-VideoCallbackAdapter::Error(GMPErr aErr)
-{
-  MOZ_ASSERT(IsOnGMPThread());
-  mCallback->Error();
-}
-
-void
-VideoCallbackAdapter::Terminated()
-{
-  // Note that this *may* be called from the proxy thread also.
-  NS_WARNING("H.264 GMP decoder terminated.");
-  mCallback->Error();
-}
-
-void
-GMPVideoDecoder::InitTags(nsTArray<nsCString>& aTags)
-{
-  aTags.AppendElement(NS_LITERAL_CSTRING("h264"));
-}
-
-nsCString
-GMPVideoDecoder::GetNodeId()
-{
-  return NS_LITERAL_CSTRING("");
-}
-
-GMPUniquePtr<GMPVideoEncodedFrame>
-GMPVideoDecoder::CreateFrame(MediaRawData* aSample)
-{
-  GMPVideoFrame* ftmp = nullptr;
-  GMPErr err = mHost->CreateFrame(kGMPEncodedVideoFrame, &ftmp);
-  if (GMP_FAILED(err)) {
-    mCallback->Error();
-    return nullptr;
-  }
-
-  GMPUniquePtr<GMPVideoEncodedFrame> frame(static_cast<GMPVideoEncodedFrame*>(ftmp));
-  err = frame->CreateEmptyFrame(aSample->mSize);
-  if (GMP_FAILED(err)) {
-    mCallback->Error();
-    return nullptr;
-  }
-
-  memcpy(frame->Buffer(), aSample->mData, frame->Size());
-
-  // Convert 4-byte NAL unit lengths to host-endian 4-byte buffer lengths to
-  // suit the GMP API.
-  if (mConvertNALUnitLengths) {
-    const int kNALLengthSize = 4;
-    uint8_t* buf = frame->Buffer();
-    while (buf < frame->Buffer() + frame->Size() - kNALLengthSize) {
-      uint32_t length = BigEndian::readUint32(buf) + kNALLengthSize;
-      *reinterpret_cast<uint32_t *>(buf) = length;
-      buf += length;
-    }
-  }
-
-  frame->SetBufferType(GMP_BufferLength32);
-
-  frame->SetEncodedWidth(mConfig.mDisplay.width);
-  frame->SetEncodedHeight(mConfig.mDisplay.height);
-  frame->SetTimeStamp(aSample->mTime);
-  frame->SetCompleteFrame(true);
-  frame->SetDuration(aSample->mDuration);
-  frame->SetFrameType(aSample->mKeyframe ? kGMPKeyFrame : kGMPDeltaFrame);
-
-  return frame;
-}
-
-void
-GMPVideoDecoder::GetGMPAPI(GMPInitDoneRunnable* aInitDone)
-{
-  MOZ_ASSERT(IsOnGMPThread());
-
-  nsTArray<nsCString> tags;
-  InitTags(tags);
-  UniquePtr<GetGMPVideoDecoderCallback> callback(
-    new GMPInitDoneCallback(this, aInitDone));
-  if (NS_FAILED(mMPS->GetGMPVideoDecoder(&tags, GetNodeId(), Move(callback)))) {
-    aInitDone->Dispatch();
-  }
-}
-
-void
-GMPVideoDecoder::GMPInitDone(GMPVideoDecoderProxy* aGMP, GMPVideoHost* aHost)
-{
-  MOZ_ASSERT(aHost && aGMP);
-
-  GMPVideoCodec codec;
-  memset(&codec, 0, sizeof(codec));
-
-  codec.mGMPApiVersion = kGMPVersion33;
-
-  codec.mCodecType = kGMPVideoCodecH264;
-  codec.mWidth = mConfig.mDisplay.width;
-  codec.mHeight = mConfig.mDisplay.height;
-
-  nsTArray<uint8_t> codecSpecific;
-  codecSpecific.AppendElement(0); // mPacketizationMode.
-  codecSpecific.AppendElements(mConfig.mExtraData->Elements(),
-                               mConfig.mExtraData->Length());
-
-  nsresult rv = aGMP->InitDecode(codec,
-                                 codecSpecific,
-                                 mAdapter,
-                                 PR_GetNumberOfProcessors());
-  if (NS_SUCCEEDED(rv)) {
-    mGMP = aGMP;
-    mHost = aHost;
-
-    // GMP implementations have interpreted the meaning of GMP_BufferLength32
-    // differently.  The OpenH264 GMP expects GMP_BufferLength32 to behave as
-    // specified in the GMP API, where each buffer is prefixed by a 32-bit
-    // host-endian buffer length that includes the size of the buffer length
-    // field.  Other existing GMPs currently expect GMP_BufferLength32 (when
-    // combined with kGMPVideoCodecH264) to mean "like AVCC but restricted to
-    // 4-byte NAL lengths" (i.e. buffer lengths are specified in big-endian
-    // and do not include the length of the buffer length field.
-    mConvertNALUnitLengths = mGMP->GetDisplayName().EqualsLiteral("gmpopenh264");
-  }
-}
-
-nsresult
-GMPVideoDecoder::Init()
-{
-  MOZ_ASSERT(IsOnGMPThread());
-
-  mMPS = do_GetService("@mozilla.org/gecko-media-plugin-service;1");
-  MOZ_ASSERT(mMPS);
-
-  nsCOMPtr<nsIThread> gmpThread = NS_GetCurrentThread();
-
-  nsRefPtr<GMPInitDoneRunnable> initDone(new GMPInitDoneRunnable());
-  gmpThread->Dispatch(
-    NS_NewRunnableMethodWithArg<GMPInitDoneRunnable*>(this,
-                                                      &GMPVideoDecoder::GetGMPAPI,
-                                                      initDone),
-    NS_DISPATCH_NORMAL);
-
-  while (!initDone->IsDone()) {
-    NS_ProcessNextEvent(gmpThread, true);
-  }
-
-  return mGMP ? NS_OK : NS_ERROR_FAILURE;
-}
-
-nsresult
-GMPVideoDecoder::Input(MediaRawData* aSample)
-{
-  MOZ_ASSERT(IsOnGMPThread());
-
-  nsRefPtr<MediaRawData> sample(aSample);
-  if (!mGMP) {
-    mCallback->Error();
-    return NS_ERROR_FAILURE;
-  }
-
-  mAdapter->SetLastStreamOffset(sample->mOffset);
-
-  GMPUniquePtr<GMPVideoEncodedFrame> frame = CreateFrame(sample);
-  nsTArray<uint8_t> info; // No codec specific per-frame info to pass.
-  nsresult rv = mGMP->Decode(Move(frame), false, info, 0);
-  if (NS_FAILED(rv)) {
-    mCallback->Error();
-    return rv;
-  }
-
-  return NS_OK;
-}
-
-nsresult
-GMPVideoDecoder::Flush()
-{
-  MOZ_ASSERT(IsOnGMPThread());
-
-  if (!mGMP || NS_FAILED(mGMP->Reset())) {
-    // Abort the flush.
-    mCallback->FlushComplete();
-  }
-
-  return NS_OK;
-}
-
-nsresult
-GMPVideoDecoder::Drain()
-{
-  MOZ_ASSERT(IsOnGMPThread());
-
-  if (!mGMP || NS_FAILED(mGMP->Drain())) {
-    mCallback->DrainComplete();
-  }
-
-  return NS_OK;
-}
-
-nsresult
-GMPVideoDecoder::Shutdown()
-{
-  // Note that this *may* be called from the proxy thread also.
-  if (!mGMP) {
-    return NS_ERROR_FAILURE;
-  }
-  mGMP->Close();
-  mGMP = nullptr;
-
-  return NS_OK;
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gmp/GMPVideoDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gmp/GMPVideoDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gmp/GMPVideoDecoder.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gmp/GMPVideoDecoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,167 +0,0 @@
-/* -*- 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(GMPVideoDecoder_h_)
-#define GMPVideoDecoder_h_
-
-#include "GMPVideoDecoderProxy.h"
-#include "ImageContainer.h"
-#include "MediaDataDecoderProxy.h"
-#include "PlatformDecoderModule.h"
-#include "mozIGeckoMediaPluginService.h"
-#include "MediaInfo.h"
-
-namespace mozilla {
-
-class VideoCallbackAdapter : public GMPVideoDecoderCallbackProxy {
-public:
-  VideoCallbackAdapter(MediaDataDecoderCallbackProxy* aCallback,
-                       VideoInfo aVideoInfo,
-                       layers::ImageContainer* aImageContainer)
-   : mCallback(aCallback)
-   , mLastStreamOffset(0)
-   , mVideoInfo(aVideoInfo)
-   , mImageContainer(aImageContainer)
-  {}
-
-  // GMPVideoDecoderCallbackProxy
-  virtual void Decoded(GMPVideoi420Frame* aDecodedFrame) override;
-  virtual void ReceivedDecodedReferenceFrame(const uint64_t aPictureId) override;
-  virtual void ReceivedDecodedFrame(const uint64_t aPictureId) override;
-  virtual void InputDataExhausted() override;
-  virtual void DrainComplete() override;
-  virtual void ResetComplete() override;
-  virtual void Error(GMPErr aErr) override;
-  virtual void Terminated() override;
-
-  void SetLastStreamOffset(int64_t aStreamOffset) {
-    mLastStreamOffset = aStreamOffset;
-  }
-
-private:
-  MediaDataDecoderCallbackProxy* mCallback;
-  int64_t mLastStreamOffset;
-
-  VideoInfo mVideoInfo;
-  nsRefPtr<layers::ImageContainer> mImageContainer;
-};
-
-class GMPVideoDecoder : public MediaDataDecoder {
-protected:
-  GMPVideoDecoder(const VideoInfo& aConfig,
-                  layers::LayersBackend aLayersBackend,
-                  layers::ImageContainer* aImageContainer,
-                  MediaTaskQueue* aTaskQueue,
-                  MediaDataDecoderCallbackProxy* aCallback,
-                  VideoCallbackAdapter* aAdapter)
-   : mConfig(aConfig)
-   , mCallback(aCallback)
-   , mGMP(nullptr)
-   , mHost(nullptr)
-   , mAdapter(aAdapter)
-   , mConvertNALUnitLengths(false)
-  {
-  }
-
-public:
-  GMPVideoDecoder(const VideoInfo& aConfig,
-                  layers::LayersBackend aLayersBackend,
-                  layers::ImageContainer* aImageContainer,
-                  MediaTaskQueue* aTaskQueue,
-                  MediaDataDecoderCallbackProxy* aCallback)
-   : mConfig(aConfig)
-   , mCallback(aCallback)
-   , mGMP(nullptr)
-   , mHost(nullptr)
-   , mAdapter(new VideoCallbackAdapter(aCallback,
-                                       VideoInfo(aConfig.mDisplay.width,
-                                                 aConfig.mDisplay.height),
-                                       aImageContainer))
-   , mConvertNALUnitLengths(false)
-  {
-  }
-
-  virtual nsresult Init() override;
-  virtual nsresult Input(MediaRawData* aSample) override;
-  virtual nsresult Flush() override;
-  virtual nsresult Drain() override;
-  virtual nsresult Shutdown() override;
-
-protected:
-  virtual void InitTags(nsTArray<nsCString>& aTags);
-  virtual nsCString GetNodeId();
-  virtual GMPUniquePtr<GMPVideoEncodedFrame> CreateFrame(MediaRawData* aSample);
-
-private:
-  class GMPInitDoneRunnable : public nsRunnable
-  {
-  public:
-    GMPInitDoneRunnable()
-      : mInitDone(false),
-        mThread(do_GetCurrentThread())
-    {
-    }
-
-    NS_IMETHOD Run()
-    {
-      mInitDone = true;
-      return NS_OK;
-    }
-
-    void Dispatch()
-    {
-      mThread->Dispatch(this, NS_DISPATCH_NORMAL);
-    }
-
-    bool IsDone()
-    {
-      MOZ_ASSERT(nsCOMPtr<nsIThread>(do_GetCurrentThread()) == mThread);
-      return mInitDone;
-    }
-
-  private:
-    bool mInitDone;
-    nsCOMPtr<nsIThread> mThread;
-  };
-
-  void GetGMPAPI(GMPInitDoneRunnable* aInitDone);
-
-  class GMPInitDoneCallback : public GetGMPVideoDecoderCallback
-  {
-  public:
-    GMPInitDoneCallback(GMPVideoDecoder* aDecoder,
-                        GMPInitDoneRunnable* aGMPInitDone)
-      : mDecoder(aDecoder)
-      , mGMPInitDone(aGMPInitDone)
-    {
-    }
-
-    virtual void Done(GMPVideoDecoderProxy* aGMP, GMPVideoHost* aHost)
-    {
-      if (aGMP) {
-        mDecoder->GMPInitDone(aGMP, aHost);
-      }
-      mGMPInitDone->Dispatch();
-    }
-
-  private:
-    nsRefPtr<GMPVideoDecoder> mDecoder;
-    nsRefPtr<GMPInitDoneRunnable> mGMPInitDone;
-  };
-  void GMPInitDone(GMPVideoDecoderProxy* aGMP, GMPVideoHost* aHost);
-
-  const VideoInfo& mConfig;
-  MediaDataDecoderCallbackProxy* mCallback;
-  nsCOMPtr<mozIGeckoMediaPluginService> mMPS;
-  GMPVideoDecoderProxy* mGMP;
-  GMPVideoHost* mHost;
-  nsAutoPtr<VideoCallbackAdapter> mAdapter;
-  bool mConvertNALUnitLengths;
-};
-
-} // namespace mozilla
-
-#endif // GMPVideoDecoder_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gmp/MediaDataDecoderProxy.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gmp/MediaDataDecoderProxy.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gmp/MediaDataDecoderProxy.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gmp/MediaDataDecoderProxy.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-/* -*- 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 "MediaDataDecoderProxy.h"
-#include "MediaData.h"
-
-namespace mozilla {
-
-void
-MediaDataDecoderCallbackProxy::Error()
-{
-  mProxyCallback->Error();
-}
-
-void
-MediaDataDecoderCallbackProxy::FlushComplete()
-{
-  mProxyDecoder->FlushComplete();
-}
-
-nsresult
-MediaDataDecoderProxy::Init()
-{
-  MOZ_ASSERT(!mIsShutdown);
-  nsRefPtr<InitTask> task(new InitTask(mProxyDecoder));
-  nsresult rv = mProxyThread->Dispatch(task, NS_DISPATCH_SYNC);
-  NS_ENSURE_SUCCESS(rv, rv);
-  NS_ENSURE_SUCCESS(task->Result(), task->Result());
-
-  return NS_OK;
-}
-
-nsresult
-MediaDataDecoderProxy::Input(MediaRawData* aSample)
-{
-  MOZ_ASSERT(!IsOnProxyThread());
-  MOZ_ASSERT(!mIsShutdown);
-
-  nsCOMPtr<nsIRunnable> task(new InputTask(mProxyDecoder, aSample));
-  nsresult rv = mProxyThread->Dispatch(task, NS_DISPATCH_NORMAL);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-nsresult
-MediaDataDecoderProxy::Flush()
-{
-  MOZ_ASSERT(!IsOnProxyThread());
-  MOZ_ASSERT(!mIsShutdown);
-
-  mFlushComplete.Set(false);
-
-  nsCOMPtr<nsIRunnable> task;
-  task = NS_NewRunnableMethod(mProxyDecoder, &MediaDataDecoder::Flush);
-  nsresult rv = mProxyThread->Dispatch(task, NS_DISPATCH_NORMAL);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  mFlushComplete.WaitUntil(true);
-
-  return NS_OK;
-}
-
-nsresult
-MediaDataDecoderProxy::Drain()
-{
-  MOZ_ASSERT(!IsOnProxyThread());
-  MOZ_ASSERT(!mIsShutdown);
-
-  nsCOMPtr<nsIRunnable> task;
-  task = NS_NewRunnableMethod(mProxyDecoder, &MediaDataDecoder::Drain);
-  nsresult rv = mProxyThread->Dispatch(task, NS_DISPATCH_NORMAL);
-  NS_ENSURE_SUCCESS(rv, rv);
-  return NS_OK;
-}
-
-nsresult
-MediaDataDecoderProxy::Shutdown()
-{
-  // Note that this *may* be called from the proxy thread also.
-  MOZ_ASSERT(!mIsShutdown);
-#if defined(DEBUG)
-  mIsShutdown = true;
-#endif
-  nsCOMPtr<nsIRunnable> task;
-  task = NS_NewRunnableMethod(mProxyDecoder, &MediaDataDecoder::Shutdown);
-  nsresult rv = mProxyThread->Dispatch(task, NS_DISPATCH_SYNC);
-  NS_ENSURE_SUCCESS(rv, rv);
-  return NS_OK;
-}
-
-void
-MediaDataDecoderProxy::FlushComplete()
-{
-  mFlushComplete.Set(true);
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gmp/MediaDataDecoderProxy.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gmp/MediaDataDecoderProxy.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gmp/MediaDataDecoderProxy.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gmp/MediaDataDecoderProxy.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,194 +0,0 @@
-/* -*- 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(MediaDataDecoderProxy_h_)
-#define MediaDataDecoderProxy_h_
-
-#include "PlatformDecoderModule.h"
-#include "nsRefPtr.h"
-#include "nsThreadUtils.h"
-#include "nscore.h"
-
-namespace mozilla {
-
-class InputTask : public nsRunnable {
-public:
-  InputTask(MediaDataDecoder* aDecoder,
-            MediaRawData* aSample)
-   : mDecoder(aDecoder)
-   , mSample(aSample)
-  {}
-
-  NS_IMETHOD Run() {
-    mDecoder->Input(mSample);
-    return NS_OK;
-  }
-
-private:
-  nsRefPtr<MediaDataDecoder> mDecoder;
-  nsRefPtr<MediaRawData> mSample;
-};
-
-class InitTask : public nsRunnable {
-public:
-  explicit InitTask(MediaDataDecoder* aDecoder)
-   : mDecoder(aDecoder)
-   , mResultValid(false)
-  {}
-
-  NS_IMETHOD Run() {
-    mResult = mDecoder->Init();
-    mResultValid = true;
-    return NS_OK;
-  }
-
-  nsresult Result() {
-    MOZ_ASSERT(mResultValid);
-    return mResult;
-  }
-
-private:
-  MediaDataDecoder* mDecoder;
-  nsresult mResult;
-  bool mResultValid;
-};
-
-template<typename T>
-class Condition {
-public:
-  explicit Condition(T aValue)
-   : mMonitor("Condition")
-   , mCondition(aValue)
-  {}
-
-  void Set(T aValue) {
-    MonitorAutoLock mon(mMonitor);
-    mCondition = aValue;
-    mon.NotifyAll();
-  }
-
-  void WaitUntil(T aValue) {
-    MonitorAutoLock mon(mMonitor);
-    while (mCondition != aValue) {
-      mon.Wait();
-    }
-  }
-
-private:
-  Monitor mMonitor;
-  T mCondition;
-};
-
-class MediaDataDecoderProxy;
-
-class MediaDataDecoderCallbackProxy : public MediaDataDecoderCallback {
-public:
-  MediaDataDecoderCallbackProxy(MediaDataDecoderProxy* aProxyDecoder, MediaDataDecoderCallback* aCallback)
-   : mProxyDecoder(aProxyDecoder)
-   , mProxyCallback(aCallback)
-  {
-  }
-
-  virtual void Output(MediaData* aData) override {
-    mProxyCallback->Output(aData);
-  }
-
-  virtual void Error() override;
-
-  virtual void InputExhausted() override {
-    mProxyCallback->InputExhausted();
-  }
-
-  virtual void DrainComplete() override {
-    mProxyCallback->DrainComplete();
-  }
-
-  virtual void NotifyResourcesStatusChanged() override {
-    mProxyCallback->NotifyResourcesStatusChanged();
-  }
-
-  virtual void ReleaseMediaResources() override {
-    mProxyCallback->ReleaseMediaResources();
-  }
-
-  virtual void FlushComplete();
-
-  virtual bool OnReaderTaskQueue() override
-  {
-    return mProxyCallback->OnReaderTaskQueue();
-  }
-
-private:
-  MediaDataDecoderProxy* mProxyDecoder;
-  MediaDataDecoderCallback* mProxyCallback;
-};
-
-class MediaDataDecoderProxy : public MediaDataDecoder {
-public:
-  MediaDataDecoderProxy(nsIThread* aProxyThread, MediaDataDecoderCallback* aCallback)
-   : mProxyThread(aProxyThread)
-   , mProxyCallback(this, aCallback)
-   , mFlushComplete(false)
-#if defined(DEBUG)
-   , mIsShutdown(false)
-#endif
-  {
-  }
-
-  // Ideally, this would return a regular MediaDataDecoderCallback pointer
-  // to retain the clean abstraction, but until MediaDataDecoderCallback
-  // supports the FlushComplete interface, this will have to do.  When MDDC
-  // supports FlushComplete, this, the GMP*Decoders, and the
-  // *CallbackAdapters can be reverted to accepting a regular
-  // MediaDataDecoderCallback pointer.
-  MediaDataDecoderCallbackProxy* Callback()
-  {
-    return &mProxyCallback;
-  }
-
-  void SetProxyTarget(MediaDataDecoder* aProxyDecoder)
-  {
-    MOZ_ASSERT(aProxyDecoder);
-    mProxyDecoder = aProxyDecoder;
-  }
-
-  // These are called from the decoder thread pool.
-  // Init and Shutdown run synchronously on the proxy thread, all others are
-  // asynchronously and responded to via the MediaDataDecoderCallback.
-  // Note: the nsresults returned by the proxied decoder are lost.
-  virtual nsresult Init() override;
-  virtual nsresult Input(MediaRawData* aSample) override;
-  virtual nsresult Flush() override;
-  virtual nsresult Drain() override;
-  virtual nsresult Shutdown() override;
-
-  // Called by MediaDataDecoderCallbackProxy.
-  void FlushComplete();
-
-private:
-#ifdef DEBUG
-  bool IsOnProxyThread() {
-    return NS_GetCurrentThread() == mProxyThread;
-  }
-#endif
-
-  friend class InputTask;
-  friend class InitTask;
-
-  nsRefPtr<MediaDataDecoder> mProxyDecoder;
-  nsCOMPtr<nsIThread> mProxyThread;
-
-  MediaDataDecoderCallbackProxy mProxyCallback;
-
-  Condition<bool> mFlushComplete;
-#if defined(DEBUG)
-  bool mIsShutdown;
-#endif
-};
-
-} // namespace mozilla
-
-#endif // MediaDataDecoderProxy_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gmp/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gmp/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gmp/moz.build	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gmp/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +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 += [
-    'GMPAudioDecoder.h',
-    'GMPDecoderModule.h',
-    'GMPVideoDecoder.h',
-    'MediaDataDecoderProxy.h',
-]
-
-UNIFIED_SOURCES += [
-    'GMPAudioDecoder.cpp',
-    'GMPDecoderModule.cpp',
-    'GMPVideoDecoder.cpp',
-    'MediaDataDecoderProxy.cpp',
-]
-
-# GMPVideoEncodedFrameImpl.h needs IPC
-include('/ipc/chromium/chromium-config.mozbuild')
-
-FINAL_LIBRARY = 'xul'
-
-FAIL_ON_WARNINGS = True
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gonk/GonkAudioDecoderManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gonk/GonkAudioDecoderManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gonk/GonkAudioDecoderManager.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gonk/GonkAudioDecoderManager.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,314 +0,0 @@
-/* -*- 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 "MediaCodecProxy.h"
-#include <OMX_IVCommon.h>
-#include <gui/Surface.h>
-#include <ICrypto.h>
-#include "GonkAudioDecoderManager.h"
-#include "MediaDecoderReader.h"
-#include "mp4_demuxer/Adts.h"
-#include "VideoUtils.h"
-#include "nsTArray.h"
-#include "prlog.h"
-#include "stagefright/MediaBuffer.h"
-#include "stagefright/MetaData.h"
-#include "stagefright/MediaErrors.h"
-#include <stagefright/foundation/AMessage.h>
-#include <stagefright/foundation/ALooper.h>
-#include "media/openmax/OMX_Audio.h"
-#include "MediaData.h"
-#include "MediaInfo.h"
-
-#include <android/log.h>
-#define GADM_LOG(...) __android_log_print(ANDROID_LOG_DEBUG, "GonkAudioDecoderManager", __VA_ARGS__)
-
-#ifdef PR_LOGGING
-PRLogModuleInfo* GetDemuxerLog();
-#define LOG(...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__))
-#else
-#define LOG(...)
-#endif
-#define READ_OUTPUT_BUFFER_TIMEOUT_US  3000
-
-using namespace android;
-typedef android::MediaCodecProxy MediaCodecProxy;
-
-namespace mozilla {
-
-GonkAudioDecoderManager::GonkAudioDecoderManager(const AudioInfo& aConfig)
-  : mAudioChannels(aConfig.mChannels)
-  , mAudioRate(aConfig.mRate)
-  , mAudioProfile(aConfig.mProfile)
-  , mUseAdts(true)
-  , mAudioBuffer(nullptr)
-  , mMonitor("GonkAudioDecoderManager")
-{
-  MOZ_COUNT_CTOR(GonkAudioDecoderManager);
-  MOZ_ASSERT(mAudioChannels);
-  mCodecSpecificData = aConfig.mCodecSpecificConfig;
-  mMimeType = aConfig.mMimeType;
-
-  // Pass through mp3 without applying an ADTS header.
-  if (!aConfig.mMimeType.EqualsLiteral("audio/mp4a-latm")) {
-      mUseAdts = false;
-  }
-}
-
-GonkAudioDecoderManager::~GonkAudioDecoderManager()
-{
-  MOZ_COUNT_DTOR(GonkAudioDecoderManager);
-}
-
-android::sp<MediaCodecProxy>
-GonkAudioDecoderManager::Init(MediaDataDecoderCallback* aCallback)
-{
-  status_t rv = OK;
-  if (mLooper != nullptr) {
-    return nullptr;
-  }
-  // Create ALooper
-  mLooper = new ALooper;
-  mLooper->setName("GonkAudioDecoderManager");
-  mLooper->start();
-
-  mDecoder = MediaCodecProxy::CreateByType(mLooper, mMimeType.get(), false, nullptr);
-  if (!mDecoder.get()) {
-    return nullptr;
-  }
-  if (!mDecoder->AskMediaCodecAndWait())
-  {
-    mDecoder = nullptr;
-    return nullptr;
-  }
-  sp<AMessage> format = new AMessage;
-  // Fixed values
-  GADM_LOG("Configure audio mime type:%s, chan no:%d, sample-rate:%d", mMimeType.get(), mAudioChannels, mAudioRate);
-  format->setString("mime", mMimeType.get());
-  format->setInt32("channel-count", mAudioChannels);
-  format->setInt32("sample-rate", mAudioRate);
-  format->setInt32("aac-profile", mAudioProfile);
-  format->setInt32("is-adts", true);
-  status_t err = mDecoder->configure(format, nullptr, nullptr, 0);
-  if (err != OK || !mDecoder->Prepare()) {
-    return nullptr;
-  }
-
-  if (mMimeType.EqualsLiteral("audio/mp4a-latm")) {
-    rv = mDecoder->Input(mCodecSpecificData->Elements(), mCodecSpecificData->Length(), 0,
-                         android::MediaCodec::BUFFER_FLAG_CODECCONFIG);
-  }
-
-  if (rv == OK) {
-    return mDecoder;
-  } else {
-    GADM_LOG("Failed to input codec specific data!");
-    return nullptr;
-  }
-}
-
-bool
-GonkAudioDecoderManager::HasQueuedSample()
-{
-    MonitorAutoLock mon(mMonitor);
-    return mQueueSample.Length();
-}
-
-nsresult
-GonkAudioDecoderManager::Input(MediaRawData* aSample)
-{
-  MonitorAutoLock mon(mMonitor);
-  nsRefPtr<MediaRawData> sample;
-
-  if (aSample) {
-    sample = aSample;
-    if (!PerformFormatSpecificProcess(sample)) {
-      return NS_ERROR_FAILURE;
-    }
-  } else {
-    // It means EOS with empty sample.
-    sample = new MediaRawData();
-  }
-
-  mQueueSample.AppendElement(sample);
-
-  status_t rv;
-  while (mQueueSample.Length()) {
-    nsRefPtr<MediaRawData> data = mQueueSample.ElementAt(0);
-    {
-      MonitorAutoUnlock mon_exit(mMonitor);
-      rv = mDecoder->Input(reinterpret_cast<const uint8_t*>(data->mData),
-                           data->mSize,
-                           data->mTime,
-                           0);
-    }
-    if (rv == OK) {
-      mQueueSample.RemoveElementAt(0);
-    } else if (rv == -EAGAIN || rv == -ETIMEDOUT) {
-      // In most cases, EAGAIN or ETIMEOUT are safe because OMX can't fill
-      // buffer on time.
-      return NS_OK;
-    } else {
-      return NS_ERROR_UNEXPECTED;
-    }
-  }
-
-  return NS_OK;
-}
-
-bool
-GonkAudioDecoderManager::PerformFormatSpecificProcess(MediaRawData* aSample)
-{
-  if (aSample && mUseAdts) {
-    int8_t frequency_index =
-        mp4_demuxer::Adts::GetFrequencyIndex(mAudioRate);
-    bool rv = mp4_demuxer::Adts::ConvertSample(mAudioChannels,
-                                               frequency_index,
-                                               mAudioProfile,
-                                               aSample);
-    if (!rv) {
-      GADM_LOG("Failed to apply ADTS header");
-      return false;
-    }
-  }
-
-  return true;
-}
-
-nsresult
-GonkAudioDecoderManager::CreateAudioData(int64_t aStreamOffset, AudioData **v) {
-  if (!(mAudioBuffer != nullptr && mAudioBuffer->data() != nullptr)) {
-    GADM_LOG("Audio Buffer is not valid!");
-    return NS_ERROR_UNEXPECTED;
-  }
-
-  int64_t timeUs;
-  if (!mAudioBuffer->meta_data()->findInt64(kKeyTime, &timeUs)) {
-    return NS_ERROR_UNEXPECTED;
-  }
-
-  if (mAudioBuffer->range_length() == 0) {
-    // Some decoders may return spurious empty buffers that we just want to ignore
-    // quoted from Android's AwesomePlayer.cpp
-    ReleaseAudioBuffer();
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-
-  const uint8_t *data = static_cast<const uint8_t*>(mAudioBuffer->data());
-  size_t dataOffset = mAudioBuffer->range_offset();
-  size_t size = mAudioBuffer->range_length();
-
-  nsAutoArrayPtr<AudioDataValue> buffer(new AudioDataValue[size/2]);
-  memcpy(buffer.get(), data+dataOffset, size);
-  uint32_t frames = size / (2 * mAudioChannels);
-
-  CheckedInt64 duration = FramesToUsecs(frames, mAudioRate);
-  if (!duration.isValid()) {
-    return NS_ERROR_UNEXPECTED;
-  }
-  nsRefPtr<AudioData> audioData = new AudioData(aStreamOffset,
-                                                timeUs,
-                                                duration.value(),
-                                                frames,
-                                                buffer.forget(),
-                                                mAudioChannels,
-                                                mAudioRate);
-  ReleaseAudioBuffer();
-  audioData.forget(v);
-  return NS_OK;
-}
-
-nsresult
-GonkAudioDecoderManager::Flush()
-{
-  {
-    MonitorAutoLock mon(mMonitor);
-    mQueueSample.Clear();
-  }
-
-  if (mDecoder->flush() != OK) {
-    return NS_ERROR_FAILURE;
-  }
-
-  return NS_OK;
-}
-
-nsresult
-GonkAudioDecoderManager::Output(int64_t aStreamOffset,
-                                nsRefPtr<MediaData>& aOutData)
-{
-  aOutData = nullptr;
-  status_t err;
-  err = mDecoder->Output(&mAudioBuffer, READ_OUTPUT_BUFFER_TIMEOUT_US);
-
-  switch (err) {
-    case OK:
-    {
-      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;
-      } else if (rv != NS_OK || data == nullptr) {
-        return NS_ERROR_UNEXPECTED;
-      }
-      aOutData = data;
-      return NS_OK;
-    }
-    case android::INFO_FORMAT_CHANGED:
-    {
-      // If the format changed, update our cached info.
-      GADM_LOG("Decoder format changed");
-      return Output(aStreamOffset, aOutData);
-    }
-    case android::INFO_OUTPUT_BUFFERS_CHANGED:
-    {
-      GADM_LOG("Info Output Buffers Changed");
-      if (mDecoder->UpdateOutputBuffers()) {
-        return Output(aStreamOffset, aOutData);
-      }
-      return NS_ERROR_FAILURE;
-    }
-    case -EAGAIN:
-    {
-      return NS_ERROR_NOT_AVAILABLE;
-    }
-    case android::ERROR_END_OF_STREAM:
-    {
-      GADM_LOG("Got EOS frame!");
-      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;
-      } else if (rv != NS_OK || data == nullptr) {
-        GADM_LOG("Failed to create audio data!");
-        return NS_ERROR_UNEXPECTED;
-      }
-      aOutData = data;
-      return NS_ERROR_ABORT;
-    }
-    case -ETIMEDOUT:
-    {
-      GADM_LOG("Timeout. can try again next time");
-      return NS_ERROR_UNEXPECTED;
-    }
-    default:
-    {
-      GADM_LOG("Decoder failed, err=%d", err);
-      return NS_ERROR_UNEXPECTED;
-    }
-  }
-
-  return NS_OK;
-}
-
-void GonkAudioDecoderManager::ReleaseAudioBuffer() {
-  if (mAudioBuffer) {
-    mDecoder->ReleaseMediaBuffer(mAudioBuffer);
-    mAudioBuffer = nullptr;
-  }
-}
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gonk/GonkAudioDecoderManager.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gonk/GonkAudioDecoderManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gonk/GonkAudioDecoderManager.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gonk/GonkAudioDecoderManager.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-/* -*- 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(GonkAudioDecoderManager_h_)
-#define GonkAudioDecoderManager_h_
-
-#include "mozilla/RefPtr.h"
-#include "MP4Reader.h"
-#include "GonkMediaDataDecoder.h"
-
-using namespace android;
-
-namespace android {
-struct MOZ_EXPORT ALooper;
-class MOZ_EXPORT MediaBuffer;
-} // namespace android
-
-namespace mozilla {
-
-class GonkAudioDecoderManager : public GonkDecoderManager {
-typedef android::MediaCodecProxy MediaCodecProxy;
-public:
-  GonkAudioDecoderManager(const AudioInfo& aConfig);
-
-  virtual ~GonkAudioDecoderManager() override;
-
-  virtual android::sp<MediaCodecProxy> Init(MediaDataDecoderCallback* aCallback) override;
-
-  virtual nsresult Input(MediaRawData* aSample) override;
-
-  virtual nsresult Output(int64_t aStreamOffset,
-                          nsRefPtr<MediaData>& aOutput) override;
-
-  virtual nsresult Flush() override;
-
-  virtual bool HasQueuedSample() override;
-
-private:
-  bool PerformFormatSpecificProcess(MediaRawData* aSample);
-
-  nsresult CreateAudioData(int64_t aStreamOffset,
-                              AudioData** aOutData);
-
-  void ReleaseAudioBuffer();
-
-  const uint32_t mAudioChannels;
-  const uint32_t mAudioRate;
-  const uint32_t mAudioProfile;
-  bool mUseAdts;
-
-  MediaDataDecoderCallback*  mReaderCallback;
-  android::MediaBuffer* mAudioBuffer;
-  android::sp<ALooper> mLooper;
-
-  // MediaCodedc's wrapper that performs the decoding.
-  android::sp<android::MediaCodecProxy> mDecoder;
-
-  // This monitor protects mQueueSample.
-  Monitor mMonitor;
-
-  // An queue with the MP4 samples which are waiting to be sent into OMX.
-  // If an element is an empty MP4Sample, that menas EOS. There should not
-  // any sample be queued after EOS.
-  nsTArray<nsRefPtr<MediaRawData>> mQueueSample;
-};
-
-} // namespace mozilla
-
-#endif // GonkAudioDecoderManager_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gonk/GonkDecoderModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gonk/GonkDecoderModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gonk/GonkDecoderModule.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gonk/GonkDecoderModule.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-/* -*- 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 "GonkDecoderModule.h"
-#include "GonkVideoDecoderManager.h"
-#include "GonkAudioDecoderManager.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/DebugOnly.h"
-#include "GonkMediaDataDecoder.h"
-
-namespace mozilla {
-GonkDecoderModule::GonkDecoderModule()
-{
-}
-
-GonkDecoderModule::~GonkDecoderModule()
-{
-}
-
-/* static */
-void
-GonkDecoderModule::Init()
-{
-  MOZ_ASSERT(NS_IsMainThread(), "Must be on main thread.");
-}
-
-already_AddRefed<MediaDataDecoder>
-GonkDecoderModule::CreateVideoDecoder(const VideoInfo& aConfig,
-                                     mozilla::layers::LayersBackend aLayersBackend,
-                                     mozilla::layers::ImageContainer* aImageContainer,
-                                     FlushableMediaTaskQueue* aVideoTaskQueue,
-                                     MediaDataDecoderCallback* aCallback)
-{
-  nsRefPtr<MediaDataDecoder> decoder =
-  new GonkMediaDataDecoder(new GonkVideoDecoderManager(aImageContainer, aConfig),
-                           aVideoTaskQueue, aCallback);
-  return decoder.forget();
-}
-
-already_AddRefed<MediaDataDecoder>
-GonkDecoderModule::CreateAudioDecoder(const AudioInfo& aConfig,
-                                      FlushableMediaTaskQueue* aAudioTaskQueue,
-                                      MediaDataDecoderCallback* aCallback)
-{
-  nsRefPtr<MediaDataDecoder> decoder =
-  new GonkMediaDataDecoder(new GonkAudioDecoderManager(aConfig),
-                           aAudioTaskQueue, aCallback);
-  return decoder.forget();
-}
-
-PlatformDecoderModule::ConversionRequired
-GonkDecoderModule::DecoderNeedsConversion(const TrackInfo& aConfig) const
-{
-  if (aConfig.IsVideo()) {
-    return kNeedAnnexB;
-  } else {
-    return kNeedNone;
-  }
-}
-
-bool
-GonkDecoderModule::SupportsMimeType(const nsACString& aMimeType)
-{
-  return aMimeType.EqualsLiteral("audio/mp4a-latm") ||
-    aMimeType.EqualsLiteral("audio/3gpp") ||
-    aMimeType.EqualsLiteral("audio/amr-wb") ||
-    aMimeType.EqualsLiteral("video/mp4") ||
-    aMimeType.EqualsLiteral("video/mp4v-es") ||
-    aMimeType.EqualsLiteral("video/avc");
-}
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gonk/GonkDecoderModule.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gonk/GonkDecoderModule.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gonk/GonkDecoderModule.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gonk/GonkDecoderModule.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/* -*- 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(GonkPlatformDecoderModule_h_)
-#define GonkPlatformDecoderModule_h_
-
-#include "PlatformDecoderModule.h"
-
-namespace mozilla {
-
-class GonkDecoderModule : public PlatformDecoderModule {
-public:
-  GonkDecoderModule();
-  virtual ~GonkDecoderModule();
-
-  // Decode thread.
-  virtual already_AddRefed<MediaDataDecoder>
-  CreateVideoDecoder(const VideoInfo& aConfig,
-                     mozilla::layers::LayersBackend aLayersBackend,
-                     mozilla::layers::ImageContainer* aImageContainer,
-                     FlushableMediaTaskQueue* aVideoTaskQueue,
-                     MediaDataDecoderCallback* aCallback) override;
-
-  // Decode thread.
-  virtual already_AddRefed<MediaDataDecoder>
-  CreateAudioDecoder(const AudioInfo& aConfig,
-                     FlushableMediaTaskQueue* aAudioTaskQueue,
-                     MediaDataDecoderCallback* aCallback) override;
-
-  static void Init();
-
-  virtual ConversionRequired
-  DecoderNeedsConversion(const TrackInfo& aConfig) const override;
-
-  virtual bool SupportsMimeType(const nsACString& aMimeType) override;
-
-};
-
-} // namespace mozilla
-
-#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gonk/GonkMediaDataDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gonk/GonkMediaDataDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gonk/GonkMediaDataDecoder.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gonk/GonkMediaDataDecoder.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,173 +0,0 @@
-/* -*- 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 "mp4_demuxer/mp4_demuxer.h"
-#include "GonkMediaDataDecoder.h"
-#include "VideoUtils.h"
-#include "nsTArray.h"
-#include "MediaCodecProxy.h"
-#include "MediaData.h"
-
-#include "prlog.h"
-#include <android/log.h>
-#define GMDD_LOG(...) __android_log_print(ANDROID_LOG_DEBUG, "GonkMediaDataDecoder", __VA_ARGS__)
-
-#ifdef PR_LOGGING
-PRLogModuleInfo* GetDemuxerLog();
-#define LOG(...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__))
-#else
-#define LOG(...)
-#endif
-
-using namespace android;
-
-namespace mozilla {
-
-GonkMediaDataDecoder::GonkMediaDataDecoder(GonkDecoderManager* aManager,
-                                           FlushableMediaTaskQueue* aTaskQueue,
-                                           MediaDataDecoderCallback* aCallback)
-  : mTaskQueue(aTaskQueue)
-  , mCallback(aCallback)
-  , mManager(aManager)
-  , mSignaledEOS(false)
-  , mDrainComplete(false)
-{
-  MOZ_COUNT_CTOR(GonkMediaDataDecoder);
-}
-
-GonkMediaDataDecoder::~GonkMediaDataDecoder()
-{
-  MOZ_COUNT_DTOR(GonkMediaDataDecoder);
-}
-
-nsresult
-GonkMediaDataDecoder::Init()
-{
-  sp<MediaCodecProxy> decoder;
-  decoder = mManager->Init(mCallback);
-  mDecoder = decoder;
-  mDrainComplete = false;
-
-  return NS_OK;
-}
-
-nsresult
-GonkMediaDataDecoder::Shutdown()
-{
-  if (!mDecoder.get()) {
-    return NS_OK;
-  }
-
-  mDecoder->stop();
-  mDecoder->ReleaseMediaResources();
-  mDecoder = nullptr;
-  return NS_OK;
-}
-
-// Inserts data into the decoder's pipeline.
-nsresult
-GonkMediaDataDecoder::Input(MediaRawData* aSample)
-{
-  mTaskQueue->Dispatch(
-    NS_NewRunnableMethodWithArg<nsRefPtr<MediaRawData>>(
-      this,
-      &GonkMediaDataDecoder::ProcessDecode,
-      nsRefPtr<MediaRawData>(aSample)));
-  return NS_OK;
-}
-
-void
-GonkMediaDataDecoder::ProcessDecode(MediaRawData* aSample)
-{
-  nsresult rv = mManager->Input(aSample);
-  if (rv != NS_OK) {
-    NS_WARNING("GonkMediaDataDecoder failed to input data");
-    GMDD_LOG("Failed to input data err: %d",int(rv));
-    mCallback->Error();
-    return;
-  }
-  if (aSample) {
-    mLastStreamOffset = aSample->mOffset;
-  }
-  ProcessOutput();
-}
-
-void
-GonkMediaDataDecoder::ProcessOutput()
-{
-  nsRefPtr<MediaData> output;
-  nsresult rv = NS_ERROR_ABORT;
-
-  while (!mDrainComplete) {
-    // There are samples in queue, try to send them into decoder when EOS.
-    if (mSignaledEOS && mManager->HasQueuedSample()) {
-      GMDD_LOG("ProcessOutput: drain all input samples");
-      rv = mManager->Input(nullptr);
-    }
-    rv = mManager->Output(mLastStreamOffset, output);
-    if (rv == NS_OK) {
-      mCallback->Output(output);
-      continue;
-    } else if (rv == NS_ERROR_NOT_AVAILABLE && mSignaledEOS) {
-      // Try to get more frames before getting EOS frame
-      continue;
-    }
-    else {
-      break;
-    }
-  }
-
-  if (rv == NS_ERROR_NOT_AVAILABLE && !mSignaledEOS) {
-    mCallback->InputExhausted();
-    return;
-  }
-  if (rv != NS_OK) {
-    NS_WARNING("GonkMediaDataDecoder failed to output data");
-    GMDD_LOG("Failed to output data");
-    // GonkDecoderManangers report NS_ERROR_ABORT when EOS is reached.
-    if (rv == NS_ERROR_ABORT) {
-      if (output) {
-        mCallback->Output(output);
-      }
-      mCallback->DrainComplete();
-      MOZ_ASSERT_IF(mSignaledEOS, !mManager->HasQueuedSample());
-      mSignaledEOS = false;
-      mDrainComplete = true;
-      return;
-    }
-    GMDD_LOG("Callback error!");
-    mCallback->Error();
-  }
-}
-
-nsresult
-GonkMediaDataDecoder::Flush()
-{
-  // Flush the input task queue. This cancels all pending Decode() calls.
-  // Note this blocks until the task queue finishes its current job, if
-  // it's executing at all. Note the MP4Reader ignores all output while
-  // flushing.
-  mTaskQueue->Flush();
-  mDrainComplete = false;
-  return mManager->Flush();
-}
-
-void
-GonkMediaDataDecoder::ProcessDrain()
-{
-  // Notify decoder input EOS by sending a null data.
-  ProcessDecode(nullptr);
-  mSignaledEOS = true;
-  ProcessOutput();
-}
-
-nsresult
-GonkMediaDataDecoder::Drain()
-{
-  mTaskQueue->Dispatch(NS_NewRunnableMethod(this, &GonkMediaDataDecoder::ProcessDrain));
-  return NS_OK;
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gonk/GonkMediaDataDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gonk/GonkMediaDataDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gonk/GonkMediaDataDecoder.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gonk/GonkMediaDataDecoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,108 +0,0 @@
-/* -*- 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(GonkMediaDataDecoder_h_)
-#define GonkMediaDataDecoder_h_
-#include "mozilla/RefPtr.h"
-#include "MP4Reader.h"
-
-namespace android {
-class MediaCodecProxy;
-} // namespace android
-
-namespace mozilla {
-class MediaRawData;
-
-// Manage the data flow from inputting encoded data and outputting decode data.
-class GonkDecoderManager {
-public:
-  virtual ~GonkDecoderManager() {}
-
-  // Creates and initializs the GonkDecoder.
-  // Returns nullptr on failure.
-  virtual android::sp<android::MediaCodecProxy> Init(MediaDataDecoderCallback* aCallback) = 0;
-
-  // Add samples into OMX decoder or queue them if decoder is out of input buffer.
-  virtual nsresult Input(MediaRawData* aSample) = 0;
-
-  // Produces decoded output, it blocks until output can be produced or a timeout
-  // is expired or until EOS. Returns NS_OK on success, or NS_ERROR_NOT_AVAILABLE
-  // if there's not enough data to produce more output. If this returns a failure
-  // code other than NS_ERROR_NOT_AVAILABLE, an error will be reported to the
-  // MP4Reader.
-  // The overrided class should follow the same behaviour.
-  virtual nsresult Output(int64_t aStreamOffset,
-                          nsRefPtr<MediaData>& aOutput) = 0;
-
-  // Flush the queued sample.
-  virtual nsresult Flush() = 0;
-
-  // True if sample is queued.
-  virtual bool HasQueuedSample() = 0;
-
-protected:
-  nsRefPtr<MediaByteBuffer> mCodecSpecificData;
-
-  nsAutoCString mMimeType;
-};
-
-// Samples are decoded using the GonkDecoder (MediaCodec)
-// created by the GonkDecoderManager. This class implements
-// the higher-level logic that drives mapping the Gonk to the async
-// MediaDataDecoder interface. The specifics of decoding the exact stream
-// type are handled by GonkDecoderManager and the GonkDecoder it creates.
-class GonkMediaDataDecoder : public MediaDataDecoder {
-public:
-  GonkMediaDataDecoder(GonkDecoderManager* aDecoderManager,
-                       FlushableMediaTaskQueue* aTaskQueue,
-                       MediaDataDecoderCallback* aCallback);
-
-  ~GonkMediaDataDecoder();
-
-  virtual nsresult Init() override;
-
-  virtual nsresult Input(MediaRawData* aSample);
-
-  virtual nsresult Flush() override;
-
-  virtual nsresult Drain() override;
-
-  virtual nsresult Shutdown() override;
-
-private:
-
-  // Called on the task queue. Inserts the sample into the decoder, and
-  // extracts output if available, if aSample is null, it means there is
-  // no data from source, it will notify the decoder EOS and flush all the
-  // decoded frames.
-  void ProcessDecode(MediaRawData* aSample);
-
-  // Called on the task queue. Extracts output if available, and delivers
-  // it to the reader. Called after ProcessDecode() and ProcessDrain().
-  void ProcessOutput();
-
-  // Called on the task queue. Orders the Gonk to drain, and then extracts
-  // all available output.
-  void ProcessDrain();
-
-  RefPtr<FlushableMediaTaskQueue> mTaskQueue;
-  MediaDataDecoderCallback* mCallback;
-
-  android::sp<android::MediaCodecProxy> mDecoder;
-  nsAutoPtr<GonkDecoderManager> mManager;
-
-  // The last offset into the media resource that was passed into Input().
-  // This is used to approximate the decoder's position in the media resource.
-  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
-
-#endif // GonkMediaDataDecoder_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gonk/GonkVideoDecoderManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gonk/GonkVideoDecoderManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gonk/GonkVideoDecoderManager.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gonk/GonkVideoDecoderManager.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,618 +0,0 @@
-/* -*- 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 "MediaCodecProxy.h"
-#include <OMX_IVCommon.h>
-#include <gui/Surface.h>
-#include <ICrypto.h>
-#include "GonkVideoDecoderManager.h"
-#include "MediaDecoderReader.h"
-#include "ImageContainer.h"
-#include "VideoUtils.h"
-#include "nsThreadUtils.h"
-#include "Layers.h"
-#include "prlog.h"
-#include "stagefright/MediaBuffer.h"
-#include "stagefright/MetaData.h"
-#include "stagefright/MediaErrors.h"
-#include <stagefright/foundation/ADebug.h>
-#include <stagefright/foundation/AMessage.h>
-#include <stagefright/foundation/AString.h>
-#include <stagefright/foundation/ALooper.h>
-#include "GonkNativeWindow.h"
-#include "GonkNativeWindowClient.h"
-#include "mozilla/layers/GrallocTextureClient.h"
-#include "mozilla/layers/TextureClient.h"
-
-#define READ_OUTPUT_BUFFER_TIMEOUT_US  3000
-
-#include <android/log.h>
-#define GVDM_LOG(...) __android_log_print(ANDROID_LOG_DEBUG, "GonkVideoDecoderManager", __VA_ARGS__)
-
-#ifdef PR_LOGGING
-PRLogModuleInfo* GetDemuxerLog();
-#define LOG(...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__))
-#else
-#define LOG(...)
-#endif
-using namespace mozilla::layers;
-using namespace android;
-typedef android::MediaCodecProxy MediaCodecProxy;
-
-namespace mozilla {
-
-GonkVideoDecoderManager::GonkVideoDecoderManager(
-  mozilla::layers::ImageContainer* aImageContainer,
-  const VideoInfo& aConfig)
-  : mImageContainer(aImageContainer)
-  , mReaderCallback(nullptr)
-  , mLastDecodedTime(0)
-  , mColorConverterBufferSize(0)
-  , mNativeWindow(nullptr)
-  , mPendingVideoBuffersLock("GonkVideoDecoderManager::mPendingVideoBuffersLock")
-  , mMonitor("GonkVideoDecoderManager")
-{
-  MOZ_COUNT_CTOR(GonkVideoDecoderManager);
-  mMimeType = aConfig.mMimeType;
-  mVideoWidth  = aConfig.mDisplay.width;
-  mVideoHeight = aConfig.mDisplay.height;
-  mDisplayWidth = aConfig.mDisplay.width;
-  mDisplayHeight = aConfig.mDisplay.height;
-  mInfo.mVideo = aConfig;
-
-  mCodecSpecificData = aConfig.mCodecSpecificConfig;
-  nsIntRect pictureRect(0, 0, mVideoWidth, mVideoHeight);
-  nsIntSize frameSize(mVideoWidth, mVideoHeight);
-  mPicture = pictureRect;
-  mInitialFrame = frameSize;
-  mHandler = new MessageHandler(this);
-  mVideoListener = new VideoResourceListener(this);
-
-}
-
-GonkVideoDecoderManager::~GonkVideoDecoderManager()
-{
-  MOZ_COUNT_DTOR(GonkVideoDecoderManager);
-}
-
-android::sp<MediaCodecProxy>
-GonkVideoDecoderManager::Init(MediaDataDecoderCallback* aCallback)
-{
-  nsIntSize displaySize(mDisplayWidth, mDisplayHeight);
-  nsIntRect pictureRect(0, 0, mVideoWidth, mVideoHeight);
-  // Validate the container-reported frame and pictureRect sizes. This ensures
-  // that our video frame creation code doesn't overflow.
-  nsIntSize frameSize(mVideoWidth, mVideoHeight);
-  if (!IsValidVideoRegion(frameSize, pictureRect, displaySize)) {
-    GVDM_LOG("It is not a valid region");
-    return nullptr;
-  }
-
-  mReaderCallback = aCallback;
-
-  if (mLooper.get() != nullptr) {
-    return nullptr;
-  }
-  // Create ALooper
-  mLooper = new ALooper;
-  mManagerLooper = new ALooper;
-  mManagerLooper->setName("GonkVideoDecoderManager");
-  // Register AMessage handler to ALooper.
-  mManagerLooper->registerHandler(mHandler);
-  // Start ALooper thread.
-  if (mLooper->start() != OK || mManagerLooper->start() != OK ) {
-    return nullptr;
-  }
-  mDecoder = MediaCodecProxy::CreateByType(mLooper, mMimeType.get(), false, mVideoListener);
-  mDecoder->AskMediaCodecAndWait();
-  uint32_t capability = MediaCodecProxy::kEmptyCapability;
-  if (mDecoder->getCapability(&capability) == OK && (capability &
-      MediaCodecProxy::kCanExposeGraphicBuffer)) {
-    mNativeWindow = new GonkNativeWindow();
-  }
-
-  return mDecoder;
-}
-
-nsresult
-GonkVideoDecoderManager::Input(MediaRawData* aSample)
-{
-  MonitorAutoLock mon(mMonitor);
-  nsRefPtr<MediaRawData> sample;
-
-  if (!aSample) {
-    // It means EOS with empty sample.
-    sample = new MediaRawData();
-  } else {
-    sample = aSample;
-  }
-
-  mQueueSample.AppendElement(sample);
-
-  status_t rv;
-  while (mQueueSample.Length()) {
-    nsRefPtr<MediaRawData> data = mQueueSample.ElementAt(0);
-    {
-      MonitorAutoUnlock mon_unlock(mMonitor);
-      rv = mDecoder->Input(reinterpret_cast<const uint8_t*>(data->mData),
-                           data->mSize,
-                           data->mTime,
-                           0);
-    }
-    if (rv == OK) {
-      mQueueSample.RemoveElementAt(0);
-    } else if (rv == -EAGAIN || rv == -ETIMEDOUT) {
-      // In most cases, EAGAIN or ETIMEOUT are safe because OMX can't fill
-      // buffer on time.
-      return NS_OK;
-    } else {
-      return NS_ERROR_UNEXPECTED;
-    }
-  }
-
-  return NS_OK;
-}
-
-bool
-GonkVideoDecoderManager::HasQueuedSample()
-{
-    MonitorAutoLock mon(mMonitor);
-    return mQueueSample.Length();
-}
-
-nsresult
-GonkVideoDecoderManager::CreateVideoData(int64_t aStreamOffset, VideoData **v)
-{
-  *v = nullptr;
-  nsRefPtr<VideoData> data;
-  int64_t timeUs;
-  int32_t keyFrame;
-
-  if (mVideoBuffer == nullptr) {
-    GVDM_LOG("Video Buffer is not valid!");
-    return NS_ERROR_UNEXPECTED;
-  }
-
-  if (!mVideoBuffer->meta_data()->findInt64(kKeyTime, &timeUs)) {
-    GVDM_LOG("Decoder did not return frame time");
-    return NS_ERROR_UNEXPECTED;
-  }
-
-  if (mLastDecodedTime > timeUs) {
-    ReleaseVideoBuffer();
-    GVDM_LOG("Output decoded sample time is revert. time=%lld", timeUs);
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-  mLastDecodedTime = timeUs;
-
-  if (mVideoBuffer->range_length() == 0) {
-    // Some decoders may return spurious empty buffers that we just want to ignore
-    // quoted from Android's AwesomePlayer.cpp
-    ReleaseVideoBuffer();
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-
-  if (!mVideoBuffer->meta_data()->findInt32(kKeyIsSyncFrame, &keyFrame)) {
-    keyFrame = 0;
-  }
-
-  gfx::IntRect picture = mPicture;
-  if (mFrameInfo.mWidth != mInitialFrame.width ||
-      mFrameInfo.mHeight != mInitialFrame.height) {
-
-    // Frame size is different from what the container reports. This is legal,
-    // 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 * mFrameInfo.mWidth) / mInitialFrame.width;
-    picture.y = (mPicture.y * mFrameInfo.mHeight) / mInitialFrame.height;
-    picture.width = (mFrameInfo.mWidth * mPicture.width) / mInitialFrame.width;
-    picture.height = (mFrameInfo.mHeight * mPicture.height) / mInitialFrame.height;
-  }
-
-  RefPtr<mozilla::layers::TextureClient> textureClient;
-
-  if ((mVideoBuffer->graphicBuffer().get())) {
-    textureClient = mNativeWindow->getTextureClientFromBuffer(mVideoBuffer->graphicBuffer().get());
-  }
-
-  if (textureClient) {
-    GrallocTextureClientOGL* grallocClient = static_cast<GrallocTextureClientOGL*>(textureClient.get());
-    grallocClient->SetMediaBuffer(mVideoBuffer);
-    textureClient->SetRecycleCallback(GonkVideoDecoderManager::RecycleCallback, this);
-
-    data = VideoData::Create(mInfo.mVideo,
-                             mImageContainer,
-                             aStreamOffset,
-                             timeUs,
-                             1, // No way to pass sample duration from muxer to
-                                // OMX codec, so we hardcode the duration here.
-                             textureClient,
-                             keyFrame,
-                             -1,
-                             picture);
-  } else {
-    if (!mVideoBuffer->data()) {
-      GVDM_LOG("No data in Video Buffer!");
-      return NS_ERROR_UNEXPECTED;
-    }
-    uint8_t *yuv420p_buffer = (uint8_t *)mVideoBuffer->data();
-    int32_t stride = mFrameInfo.mStride;
-    int32_t slice_height = mFrameInfo.mSliceHeight;
-
-    // Converts to OMX_COLOR_FormatYUV420Planar
-    if (mFrameInfo.mColorFormat != OMX_COLOR_FormatYUV420Planar) {
-      ARect crop;
-      crop.top = 0;
-      crop.bottom = mFrameInfo.mHeight;
-      crop.left = 0;
-      crop.right = mFrameInfo.mWidth;
-      yuv420p_buffer = GetColorConverterBuffer(mFrameInfo.mWidth, mFrameInfo.mHeight);
-      if (mColorConverter.convertDecoderOutputToI420(mVideoBuffer->data(),
-          mFrameInfo.mWidth, mFrameInfo.mHeight, crop, yuv420p_buffer) != OK) {
-          ReleaseVideoBuffer();
-          GVDM_LOG("Color conversion failed!");
-          return NS_ERROR_UNEXPECTED;
-      }
-        stride = mFrameInfo.mWidth;
-        slice_height = mFrameInfo.mHeight;
-    }
-
-    size_t yuv420p_y_size = stride * slice_height;
-    size_t yuv420p_u_size = ((stride + 1) / 2) * ((slice_height + 1) / 2);
-    uint8_t *yuv420p_y = yuv420p_buffer;
-    uint8_t *yuv420p_u = yuv420p_y + yuv420p_y_size;
-    uint8_t *yuv420p_v = yuv420p_u + yuv420p_u_size;
-
-    // This is the approximate byte position in the stream.
-    int64_t pos = aStreamOffset;
-
-    VideoData::YCbCrBuffer b;
-    b.mPlanes[0].mData = yuv420p_y;
-    b.mPlanes[0].mWidth = mFrameInfo.mWidth;
-    b.mPlanes[0].mHeight = mFrameInfo.mHeight;
-    b.mPlanes[0].mStride = stride;
-    b.mPlanes[0].mOffset = 0;
-    b.mPlanes[0].mSkip = 0;
-
-    b.mPlanes[1].mData = yuv420p_u;
-    b.mPlanes[1].mWidth = (mFrameInfo.mWidth + 1) / 2;
-    b.mPlanes[1].mHeight = (mFrameInfo.mHeight + 1) / 2;
-    b.mPlanes[1].mStride = (stride + 1) / 2;
-    b.mPlanes[1].mOffset = 0;
-    b.mPlanes[1].mSkip = 0;
-
-    b.mPlanes[2].mData = yuv420p_v;
-    b.mPlanes[2].mWidth =(mFrameInfo.mWidth + 1) / 2;
-    b.mPlanes[2].mHeight = (mFrameInfo.mHeight + 1) / 2;
-    b.mPlanes[2].mStride = (stride + 1) / 2;
-    b.mPlanes[2].mOffset = 0;
-    b.mPlanes[2].mSkip = 0;
-
-    data = VideoData::Create(
-        mInfo.mVideo,
-        mImageContainer,
-        pos,
-        timeUs,
-        1, // We don't know the duration.
-        b,
-        keyFrame,
-        -1,
-        picture);
-    ReleaseVideoBuffer();
-  }
-
-  data.forget(v);
-  return NS_OK;
-}
-
-bool
-GonkVideoDecoderManager::SetVideoFormat()
-{
-  // read video metadata from MediaCodec
-  sp<AMessage> codecFormat;
-  if (mDecoder->getOutputFormat(&codecFormat) == OK) {
-    AString mime;
-    int32_t width = 0;
-    int32_t height = 0;
-    int32_t stride = 0;
-    int32_t slice_height = 0;
-    int32_t color_format = 0;
-    int32_t crop_left = 0;
-    int32_t crop_top = 0;
-    int32_t crop_right = 0;
-    int32_t crop_bottom = 0;
-    if (!codecFormat->findString("mime", &mime) ||
-        !codecFormat->findInt32("width", &width) ||
-        !codecFormat->findInt32("height", &height) ||
-        !codecFormat->findInt32("stride", &stride) ||
-        !codecFormat->findInt32("slice-height", &slice_height) ||
-        !codecFormat->findInt32("color-format", &color_format) ||
-        !codecFormat->findRect("crop", &crop_left, &crop_top, &crop_right, &crop_bottom)) {
-      GVDM_LOG("Failed to find values");
-      return false;
-    }
-    mFrameInfo.mWidth = width;
-    mFrameInfo.mHeight = height;
-    mFrameInfo.mStride = stride;
-    mFrameInfo.mSliceHeight = slice_height;
-    mFrameInfo.mColorFormat = color_format;
-
-    nsIntSize displaySize(width, height);
-    if (!IsValidVideoRegion(mInitialFrame, mPicture, displaySize)) {
-      GVDM_LOG("It is not a valid region");
-      return false;
-    }
-    return true;
-  }
-  GVDM_LOG("Fail to get output format");
-  return false;
-}
-
-nsresult
-GonkVideoDecoderManager::Flush()
-{
-  {
-    MonitorAutoLock mon(mMonitor);
-    mQueueSample.Clear();
-  }
-
- mLastDecodedTime = 0;
-
-  if (mDecoder->flush() != OK) {
-    return NS_ERROR_FAILURE;
-  }
-
-  return NS_OK;
-}
-
-// Blocks until decoded sample is produced by the deoder.
-nsresult
-GonkVideoDecoderManager::Output(int64_t aStreamOffset,
-                                nsRefPtr<MediaData>& aOutData)
-{
-  aOutData = nullptr;
-  status_t err;
-  if (mDecoder == nullptr) {
-    GVDM_LOG("Decoder is not inited");
-    return NS_ERROR_UNEXPECTED;
-  }
-  err = mDecoder->Output(&mVideoBuffer, READ_OUTPUT_BUFFER_TIMEOUT_US);
-
-  switch (err) {
-    case OK:
-    {
-      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;
-      } else if (rv != NS_OK || data == nullptr) {
-        GVDM_LOG("Failed to create VideoData");
-        return NS_ERROR_UNEXPECTED;
-      }
-      aOutData = data;
-      return NS_OK;
-    }
-    case android::INFO_FORMAT_CHANGED:
-    {
-      // If the format changed, update our cached info.
-      GVDM_LOG("Decoder format changed");
-      if (!SetVideoFormat()) {
-        return NS_ERROR_UNEXPECTED;
-      }
-      return Output(aStreamOffset, aOutData);
-    }
-    case android::INFO_OUTPUT_BUFFERS_CHANGED:
-    {
-      if (mDecoder->UpdateOutputBuffers()) {
-        return Output(aStreamOffset, aOutData);
-      }
-      GVDM_LOG("Fails to update output buffers!");
-      return NS_ERROR_FAILURE;
-    }
-    case -EAGAIN:
-    {
-//      GVDM_LOG("Need to try again!");
-      return NS_ERROR_NOT_AVAILABLE;
-    }
-    case android::ERROR_END_OF_STREAM:
-    {
-      GVDM_LOG("Got the EOS frame!");
-      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;
-      }
-      if (rv != NS_OK || data == nullptr) {
-        GVDM_LOG("Failed to create video data");
-        return NS_ERROR_UNEXPECTED;
-      }
-      aOutData = data;
-      return NS_ERROR_ABORT;
-    }
-    case -ETIMEDOUT:
-    {
-      GVDM_LOG("Timeout. can try again next time");
-      return NS_ERROR_UNEXPECTED;
-    }
-    default:
-    {
-      GVDM_LOG("Decoder failed, err=%d", err);
-      return NS_ERROR_UNEXPECTED;
-    }
-  }
-
-  return NS_OK;
-}
-
-void GonkVideoDecoderManager::ReleaseVideoBuffer() {
-  if (mVideoBuffer) {
-    mDecoder->ReleaseMediaBuffer(mVideoBuffer);
-    mVideoBuffer = nullptr;
-  }
-}
-
-void
-GonkVideoDecoderManager::codecReserved()
-{
-  GVDM_LOG("codecReserved");
-  sp<AMessage> format = new AMessage;
-  sp<Surface> surface;
-  status_t rv = OK;
-  // Fixed values
-  GVDM_LOG("Configure video mime type: %s, widht:%d, height:%d", mMimeType.get(), mVideoWidth, mVideoHeight);
-  format->setString("mime", mMimeType.get());
-  format->setInt32("width", mVideoWidth);
-  format->setInt32("height", mVideoHeight);
-  if (mNativeWindow != nullptr) {
-    surface = new Surface(mNativeWindow->getBufferQueue());
-  }
-  mDecoder->configure(format, surface, nullptr, 0);
-  mDecoder->Prepare();
-
-  if (mMimeType.EqualsLiteral("video/mp4v-es")) {
-    rv = mDecoder->Input(mCodecSpecificData->Elements(),
-                         mCodecSpecificData->Length(), 0,
-                         android::MediaCodec::BUFFER_FLAG_CODECCONFIG);
-  }
-
-  if (rv != OK) {
-    GVDM_LOG("Failed to configure codec!!!!");
-    mReaderCallback->Error();
-  }
-}
-
-void
-GonkVideoDecoderManager::codecCanceled()
-{
-  mDecoder = nullptr;
-}
-
-// Called on GonkVideoDecoderManager::mManagerLooper thread.
-void
-GonkVideoDecoderManager::onMessageReceived(const sp<AMessage> &aMessage)
-{
-  switch (aMessage->what()) {
-    case kNotifyPostReleaseBuffer:
-    {
-      ReleaseAllPendingVideoBuffers();
-      break;
-    }
-
-    default:
-      TRESPASS();
-      break;
-  }
-}
-
-GonkVideoDecoderManager::MessageHandler::MessageHandler(GonkVideoDecoderManager *aManager)
-  : mManager(aManager)
-{
-}
-
-GonkVideoDecoderManager::MessageHandler::~MessageHandler()
-{
-  mManager = nullptr;
-}
-
-void
-GonkVideoDecoderManager::MessageHandler::onMessageReceived(const android::sp<android::AMessage> &aMessage)
-{
-  if (mManager != nullptr) {
-    mManager->onMessageReceived(aMessage);
-  }
-}
-
-GonkVideoDecoderManager::VideoResourceListener::VideoResourceListener(GonkVideoDecoderManager *aManager)
-  : mManager(aManager)
-{
-}
-
-GonkVideoDecoderManager::VideoResourceListener::~VideoResourceListener()
-{
-  mManager = nullptr;
-}
-
-void
-GonkVideoDecoderManager::VideoResourceListener::codecReserved()
-{
-  if (mManager != nullptr) {
-    mManager->codecReserved();
-  }
-}
-
-void
-GonkVideoDecoderManager::VideoResourceListener::codecCanceled()
-{
-  if (mManager != nullptr) {
-    mManager->codecCanceled();
-  }
-}
-
-uint8_t *
-GonkVideoDecoderManager::GetColorConverterBuffer(int32_t aWidth, int32_t aHeight)
-{
-  // Allocate a temporary YUV420Planer buffer.
-  size_t yuv420p_y_size = aWidth * aHeight;
-  size_t yuv420p_u_size = ((aWidth + 1) / 2) * ((aHeight + 1) / 2);
-  size_t yuv420p_v_size = yuv420p_u_size;
-  size_t yuv420p_size = yuv420p_y_size + yuv420p_u_size + yuv420p_v_size;
-  if (mColorConverterBufferSize != yuv420p_size) {
-    mColorConverterBuffer = nullptr; // release the previous buffer first
-    mColorConverterBuffer = new uint8_t[yuv420p_size];
-    mColorConverterBufferSize = yuv420p_size;
-  }
-  return mColorConverterBuffer.get();
-}
-
-/* static */
-void
-GonkVideoDecoderManager::RecycleCallback(TextureClient* aClient, void* aClosure)
-{
-  GonkVideoDecoderManager* videoManager = static_cast<GonkVideoDecoderManager*>(aClosure);
-  GrallocTextureClientOGL* client = static_cast<GrallocTextureClientOGL*>(aClient);
-  aClient->ClearRecycleCallback();
-  videoManager->PostReleaseVideoBuffer(client->GetMediaBuffer());
-}
-
-void GonkVideoDecoderManager::PostReleaseVideoBuffer(
-                                android::MediaBuffer *aBuffer)
-{
-  {
-    MutexAutoLock autoLock(mPendingVideoBuffersLock);
-    if (aBuffer) {
-      mPendingVideoBuffers.append(aBuffer);
-    }
-  }
-  sp<AMessage> notify =
-            new AMessage(kNotifyPostReleaseBuffer, mHandler->id());
-  notify->post();
-
-}
-
-void GonkVideoDecoderManager::ReleaseAllPendingVideoBuffers()
-{
-  Vector<android::MediaBuffer*> releasingVideoBuffers;
-  {
-    MutexAutoLock autoLock(mPendingVideoBuffersLock);
-    int size = mPendingVideoBuffers.length();
-    for (int i = 0; i < size; i++) {
-      releasingVideoBuffers.append(mPendingVideoBuffers[i]);
-    }
-    mPendingVideoBuffers.clear();
-  }
-  // Free all pending video buffers without holding mPendingVideoBuffersLock.
-  int size = releasingVideoBuffers.length();
-  for (int i = 0; i < size; i++) {
-    android::MediaBuffer *buffer;
-    buffer = releasingVideoBuffers[i];
-    mDecoder->ReleaseMediaBuffer(buffer);
-    buffer = nullptr;
-  }
-  releasingVideoBuffers.clear();
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gonk/GonkVideoDecoderManager.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gonk/GonkVideoDecoderManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gonk/GonkVideoDecoderManager.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gonk/GonkVideoDecoderManager.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,174 +0,0 @@
-/* -*- 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(GonkVideoDecoderManager_h_)
-#define GonkVideoDecoderManager_h_
-
-#include <set>
-#include "MP4Reader.h"
-#include "nsRect.h"
-#include "GonkMediaDataDecoder.h"
-#include "mozilla/RefPtr.h"
-#include "I420ColorConverterHelper.h"
-#include "MediaCodecProxy.h"
-#include <stagefright/foundation/AHandler.h>
-#include "GonkNativeWindow.h"
-#include "GonkNativeWindowClient.h"
-
-using namespace android;
-
-namespace android {
-struct ALooper;
-class MediaBuffer;
-struct MOZ_EXPORT AString;
-class GonkNativeWindow;
-} // namespace android
-
-namespace mozilla {
-
-namespace layers {
-class TextureClient;
-} // namespace mozilla::layers
-
-class GonkVideoDecoderManager : public GonkDecoderManager {
-typedef android::MediaCodecProxy MediaCodecProxy;
-typedef mozilla::layers::TextureClient TextureClient;
-
-public:
-  GonkVideoDecoderManager(mozilla::layers::ImageContainer* aImageContainer,
-                          const VideoInfo& aConfig);
-
-  virtual ~GonkVideoDecoderManager() override;
-
-  virtual android::sp<MediaCodecProxy> Init(MediaDataDecoderCallback* aCallback) override;
-
-  virtual nsresult Input(MediaRawData* aSample) override;
-
-  virtual nsresult Output(int64_t aStreamOffset,
-                          nsRefPtr<MediaData>& aOutput) override;
-
-  virtual nsresult Flush() override;
-
-  virtual bool HasQueuedSample() override;
-
-  static void RecycleCallback(TextureClient* aClient, void* aClosure);
-
-private:
-  struct FrameInfo
-  {
-    int32_t mWidth = 0;
-    int32_t mHeight = 0;
-    int32_t mStride = 0;
-    int32_t mSliceHeight = 0;
-    int32_t mColorFormat = 0;
-    int32_t mCropLeft = 0;
-    int32_t mCropTop = 0;
-    int32_t mCropRight = 0;
-    int32_t mCropBottom = 0;
-  };
-  class MessageHandler : public android::AHandler
-  {
-  public:
-    MessageHandler(GonkVideoDecoderManager *aManager);
-    ~MessageHandler();
-
-    virtual void onMessageReceived(const android::sp<android::AMessage> &aMessage);
-
-  private:
-    // Forbidden
-    MessageHandler() = delete;
-    MessageHandler(const MessageHandler &rhs) = delete;
-    const MessageHandler &operator=(const MessageHandler &rhs) = delete;
-
-    GonkVideoDecoderManager *mManager;
-  };
-  friend class MessageHandler;
-
-  class VideoResourceListener : public android::MediaCodecProxy::CodecResourceListener
-  {
-  public:
-    VideoResourceListener(GonkVideoDecoderManager *aManager);
-    ~VideoResourceListener();
-
-    virtual void codecReserved() override;
-    virtual void codecCanceled() override;
-
-  private:
-    // Forbidden
-    VideoResourceListener() = delete;
-    VideoResourceListener(const VideoResourceListener &rhs) = delete;
-    const VideoResourceListener &operator=(const VideoResourceListener &rhs) = delete;
-
-    GonkVideoDecoderManager *mManager;
-  };
-  friend class VideoResourceListener;
-
-  bool SetVideoFormat();
-
-  nsresult CreateVideoData(int64_t aStreamOffset, VideoData** aOutData);
-  void ReleaseVideoBuffer();
-  uint8_t* GetColorConverterBuffer(int32_t aWidth, int32_t aHeight);
-
-  // For codec resource management
-  void codecReserved();
-  void codecCanceled();
-  void onMessageReceived(const sp<AMessage> &aMessage);
-
-  void ReleaseAllPendingVideoBuffers();
-  void PostReleaseVideoBuffer(android::MediaBuffer *aBuffer);
-
-  uint32_t mVideoWidth;
-  uint32_t mVideoHeight;
-  uint32_t mDisplayWidth;
-  uint32_t mDisplayHeight;
-  nsIntRect mPicture;
-  nsIntSize mInitialFrame;
-
-  nsRefPtr<layers::ImageContainer> mImageContainer;
-
-  android::MediaBuffer* mVideoBuffer;
-
-  MediaDataDecoderCallback*  mReaderCallback;
-  MediaInfo mInfo;
-  android::sp<VideoResourceListener> mVideoListener;
-  android::sp<MessageHandler> mHandler;
-  android::sp<ALooper> mLooper;
-  android::sp<ALooper> mManagerLooper;
-  FrameInfo mFrameInfo;
-
-  int64_t mLastDecodedTime;  // The last decoded frame presentation time.
-
-  // color converter
-  android::I420ColorConverterHelper mColorConverter;
-  nsAutoArrayPtr<uint8_t> mColorConverterBuffer;
-  size_t mColorConverterBufferSize;
-
-  android::sp<android::GonkNativeWindow> mNativeWindow;
-  enum {
-    kNotifyPostReleaseBuffer = 'nprb',
-  };
-
-  // Hold video's MediaBuffers that are released.
-  // The holded MediaBuffers are released soon after flush.
-  Vector<android::MediaBuffer*> mPendingVideoBuffers;
-  // The lock protects mPendingVideoBuffers.
-  Mutex mPendingVideoBuffersLock;
-
-  // MediaCodedc's wrapper that performs the decoding.
-  android::sp<android::MediaCodecProxy> mDecoder;
-
-  // This monitor protects mQueueSample.
-  Monitor mMonitor;
-
-  // An queue with the MP4 samples which are waiting to be sent into OMX.
-  // If an element is an empty MP4Sample, that menas EOS. There should not
-  // any sample be queued after EOS.
-  nsTArray<nsRefPtr<MediaRawData>> mQueueSample;
-};
-
-} // namespace mozilla
-
-#endif // GonkVideoDecoderManager_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gonk/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gonk/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/gonk/moz.build	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/gonk/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +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 += [
-    'GonkAudioDecoderManager.h',
-    'GonkDecoderModule.h',
-    'GonkMediaDataDecoder.h',
-    'GonkVideoDecoderManager.h',
-]
-UNIFIED_SOURCES += [
-    'GonkAudioDecoderManager.cpp',
-    'GonkDecoderModule.cpp',
-    'GonkMediaDataDecoder.cpp',
-    'GonkVideoDecoderManager.cpp',
-]
-LOCAL_INCLUDES += [
-    '/dom/media/omx/',
-    '/dom/media/omx/mediaresourcemanager',
-]
-include('/ipc/chromium/chromium-config.mozbuild')
-
-# Suppress some GCC/clang warnings being treated as errors:
-#  - about attributes on forward declarations for types that are already
-#    defined, which complains about an important MOZ_EXPORT for android::AString
-#  - about multi-character constants which are used in codec-related code
-if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']:
-  CXXFLAGS += [
-    '-Wno-error=attributes',
-    '-Wno-error=multichar'
-  ]
-
-FINAL_LIBRARY = 'xul'
-
-FAIL_ON_WARNINGS = True
-
-CXXFLAGS += [
-    '-I%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [
-        'frameworks/native/opengl/include',]
-]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/moz.build	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/moz.build	2015-05-25 20:43:40.000000000 +0000
@@ -9,18 +9,11 @@
     'MP4Demuxer.h',
     'MP4Reader.h',
     'MP4Stream.h',
-    'PlatformDecoderModule.h',
-    'SharedDecoderManager.h',
-    'wrappers/H264Converter.h'
 ]
 
 UNIFIED_SOURCES += [
-    'BlankDecoderModule.cpp',
     'MP4Decoder.cpp',
     'MP4Stream.cpp',
-    'PlatformDecoderModule.cpp',
-    'SharedDecoderManager.cpp',
-    'wrappers/H264Converter.cpp'
 ]
 
 SOURCES += [
@@ -28,65 +21,12 @@
     'MP4Reader.cpp',
 ]
 
-DIRS += ['gmp']
-
-if CONFIG['MOZ_WMF']:
-    DIRS += [ 'wmf' ];
-
-if CONFIG['MOZ_EME']:
-    DIRS += ['eme']
-
-if CONFIG['MOZ_FFMPEG']:
-    EXPORTS += [
-        'ffmpeg/FFmpegRuntimeLinker.h',
-    ]
-    UNIFIED_SOURCES += [
-        'ffmpeg/FFmpegLog.cpp',
-        'ffmpeg/FFmpegRuntimeLinker.cpp',
-    ]
-    DIRS += [
-        'ffmpeg/libav53',
-        'ffmpeg/libav54',
-        'ffmpeg/libav55',
-    ]
-    LOCAL_INCLUDES += [
-        'ffmpeg',
-    ]
-
-if CONFIG['MOZ_APPLEMEDIA']:
-  EXPORTS += [
-      'apple/AppleDecoderModule.h',
-  ]
-  UNIFIED_SOURCES += [
-      'apple/AppleATDecoder.cpp',
-      'apple/AppleCMLinker.cpp',
-      'apple/AppleDecoderModule.cpp',
-      'apple/AppleVDADecoder.cpp',
-      'apple/AppleVDALinker.cpp',
-      'apple/AppleVTDecoder.cpp',
-      'apple/AppleVTLinker.cpp',
-  ]
-  OS_LIBS += [
-      '-framework AudioToolbox',
-  ]
-
-if CONFIG['ANDROID_VERSION'] >= '18'and CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-    DEFINES['MOZ_GONK_MEDIACODEC'] = True
-    DIRS += ['gonk']
-
-include('/ipc/chromium/chromium-config.mozbuild')
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
-    EXPORTS += [
-        'android/AndroidDecoderModule.h',
-    ]
-    UNIFIED_SOURCES += [
-        'android/AndroidDecoderModule.cpp',
-    ]
-
 FINAL_LIBRARY = 'xul'
 
 FAIL_ON_WARNINGS = True
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     DEFINES['NOMINMAX'] = True
+
+if CONFIG['MOZ_GONK_MEDIACODEC']:
+    DEFINES['MOZ_GONK_MEDIACODEC'] = True
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/MP4Decoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/MP4Decoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/MP4Decoder.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/MP4Decoder.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -7,22 +7,17 @@
 #include "MP4Decoder.h"
 #include "MP4Reader.h"
 #include "MediaDecoderStateMachine.h"
+#include "MediaFormatReader.h"
+#include "MP4Demuxer.h"
 #include "mozilla/Preferences.h"
 #include "nsCharSeparatedTokenizer.h"
 #ifdef MOZ_EME
 #include "mozilla/CDMProxy.h"
 #endif
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #ifdef XP_WIN
 #include "mozilla/WindowsVersion.h"
-#include "WMFDecoderModule.h"
-#endif
-#ifdef MOZ_FFMPEG
-#include "FFmpegRuntimeLinker.h"
-#endif
-#ifdef MOZ_APPLEMEDIA
-#include "apple/AppleDecoderModule.h"
 #endif
 #ifdef MOZ_WIDGET_ANDROID
 #include "nsIGfxInfo.h"
@@ -34,7 +29,13 @@
 
 MediaDecoderStateMachine* MP4Decoder::CreateStateMachine()
 {
-  return new MediaDecoderStateMachine(this, new MP4Reader(this));
+  bool useFormatDecoder =
+    Preferences::GetBool("media.format-reader.mp4", true);
+  nsRefPtr<MediaDecoderReader> reader = useFormatDecoder ?
+    static_cast<MediaDecoderReader*>(new MediaFormatReader(this, new MP4Demuxer(GetResource()))) :
+    static_cast<MediaDecoderReader*>(new MP4Reader(this));
+
+  return new MediaDecoderStateMachine(this, reader);
 }
 
 #ifdef MOZ_EME
@@ -168,13 +169,7 @@
 #ifndef MOZ_FFMPEG
   return false;
 #else
-  if (!Preferences::GetBool("media.fragmented-mp4.ffmpeg.enabled", false)) {
-    return false;
-  }
-
-  // If we can link to FFmpeg, then we can almost certainly play H264 and AAC
-  // with it.
-  return FFmpegRuntimeLinker::Link();
+  return Preferences::GetBool("media.fragmented-mp4.ffmpeg.enabled", false);
 #endif
 }
 
@@ -185,11 +180,7 @@
   // Not the right platform.
   return false;
 #else
-  if (!Preferences::GetBool("media.apple.mp4.enabled", false)) {
-    // Disabled by preference.
-    return false;
-  }
-  return NS_SUCCEEDED(AppleDecoderModule::CanDecode());
+  return Preferences::GetBool("media.apple.mp4.enabled", false);
 #endif
 }
 
@@ -299,6 +290,7 @@
 /* static */ bool
 MP4Decoder::CanCreateH264Decoder()
 {
+#ifdef XP_WIN
   static bool haveCachedResult = false;
   static bool result = false;
   if (haveCachedResult) {
@@ -313,8 +305,12 @@
   }
   haveCachedResult = true;
   return result;
+#else
+  return IsEnabled();
+#endif
 }
 
+#ifdef XP_WIN
 static already_AddRefed<MediaDataDecoder>
 CreateTestAACDecoder(AudioInfo& aConfig)
 {
@@ -346,9 +342,12 @@
 
 static const uint8_t sTestAACConfig[] = { 0x13, 0x90 };
 
+#endif // XP_WIN
+
 /* static */ bool
 MP4Decoder::CanCreateAACDecoder()
 {
+#ifdef XP_WIN
   static bool haveCachedResult = false;
   static bool result = false;
   if (haveCachedResult) {
@@ -372,6 +371,9 @@
   }
   haveCachedResult = true;
   return result;
+#else
+  return IsEnabled();
+#endif
 }
 
 } // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/MP4Decoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/MP4Decoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/MP4Decoder.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/MP4Decoder.h	2015-05-25 20:43:40.000000000 +0000
@@ -38,8 +38,7 @@
                                  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.
+  // Returns true if the MP4 backend is preffed on.
   static bool IsEnabled();
 
   static bool IsVideoAccelerated(layers::LayersBackend aBackend);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/MP4Demuxer.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/MP4Demuxer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/MP4Demuxer.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/MP4Demuxer.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -35,7 +35,7 @@
     return InitPromise::CreateAndReject(DemuxerFailureReason::WAITING_FOR_DATA, __func__);
   }
 
-  if (!mInitData->SetLength(br.Length())) {
+  if (!mInitData->SetLength(br.Length(), fallible)) {
     // OOM
     return InitPromise::CreateAndReject(DemuxerFailureReason::DEMUXER_ERROR, __func__);
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/MP4Reader.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/MP4Reader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/MP4Reader.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/MP4Reader.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -18,7 +18,6 @@
 #include "SharedThreadPool.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Telemetry.h"
-#include "mozilla/dom/TimeRanges.h"
 #include "mp4_demuxer/AnnexB.h"
 #include "mp4_demuxer/H264.h"
 #include "SharedDecoderManager.h"
@@ -34,7 +33,6 @@
 using mozilla::layers::ImageContainer;
 using mozilla::layers::LayersBackend;
 
-#ifdef PR_LOGGING
 PRLogModuleInfo* GetDemuxerLog() {
   static PRLogModuleInfo* log = nullptr;
   if (!log) {
@@ -42,12 +40,8 @@
   }
   return log;
 }
-#define LOG(arg, ...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG, ("MP4Reader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
-#define VLOG(arg, ...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG, ("MP4Reader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
-#else
-#define LOG(...)
-#define VLOG(...)
-#endif
+#define LOG(arg, ...) MOZ_LOG(GetDemuxerLog(), PR_LOG_DEBUG, ("MP4Reader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
+#define VLOG(arg, ...) MOZ_LOG(GetDemuxerLog(), PR_LOG_DEBUG, ("MP4Reader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
 
 using namespace mp4_demuxer;
 
@@ -56,7 +50,6 @@
 // Uncomment to enable verbose per-sample logging.
 //#define LOG_SAMPLE_DECODE 1
 
-#ifdef PR_LOGGING
 static const char*
 TrackTypeToStr(TrackInfo::TrackType aTrack)
 {
@@ -71,7 +64,6 @@
     return "Unknown";
   }
 }
-#endif
 
 bool
 AccumulateSPSTelemetry(const MediaByteBuffer* aExtradata)
@@ -393,7 +385,7 @@
     // an encrypted stream and we need to wait for a CDM to be set, we don't
     // need to reinit the demuxer.
     mDemuxerInitialized = true;
-  } else if (mPlatform && !IsWaitingMediaResources()) {
+  } else if (mPlatform) {
     *aInfo = mInfo;
     *aTags = nullptr;
     NS_ENSURE_TRUE(EnsureDecodersSetup(), NS_ERROR_FAILURE);
@@ -471,11 +463,6 @@
       // a CDM, we can detect that and notify chrome and show some UI
       // explaining that we failed due to EME being disabled.
       nsRefPtr<CDMProxy> proxy;
-      if (IsWaitingMediaResources()) {
-        return true;
-      }
-      MOZ_ASSERT(!IsWaitingMediaResources());
-
       {
         ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
         proxy = mDecoder->GetCDMProxy();
@@ -537,8 +524,6 @@
     NS_ENSURE_SUCCESS(rv, false);
   }
 
-  NotifyResourcesStatusChanged();
-
   return true;
 }
 
@@ -1087,12 +1072,13 @@
   return mDemuxer->GetEvictionOffset(aTime * 1000000.0);
 }
 
-nsresult
-MP4Reader::GetBuffered(dom::TimeRanges* aBuffered)
+media::TimeIntervals
+MP4Reader::GetBuffered()
 {
   MonitorAutoLock mon(mDemuxerMonitor);
+  media::TimeIntervals buffered;
   if (!mIndexReady) {
-    return NS_OK;
+    return buffered;
   }
   UpdateIndex();
   MOZ_ASSERT(mStartTime != -1, "Need to finish metadata decode first");
@@ -1105,12 +1091,13 @@
     nsTArray<Interval<Microseconds>> timeRanges;
     mDemuxer->ConvertByteRangesToTime(ranges, &timeRanges);
     for (size_t i = 0; i < timeRanges.Length(); i++) {
-      aBuffered->Add((timeRanges[i].start - mStartTime) / 1000000.0,
-                     (timeRanges[i].end - mStartTime) / 1000000.0);
+      buffered += media::TimeInterval(
+        media::TimeUnit::FromMicroseconds(timeRanges[i].start - mStartTime),
+        media::TimeUnit::FromMicroseconds(timeRanges[i].end - mStartTime));
     }
   }
 
-  return NS_OK;
+  return buffered;
 }
 
 bool MP4Reader::IsDormantNeeded()
@@ -1136,19 +1123,11 @@
   }
 }
 
-void MP4Reader::NotifyResourcesStatusChanged()
-{
-  if (mDecoder) {
-    mDecoder->NotifyWaitingForResourcesStatusChanged();
-  }
-}
-
 void
 MP4Reader::SetIdle()
 {
   if (mSharedDecoderManager && mVideo.mDecoder) {
     mSharedDecoderManager->SetIdle(mVideo.mDecoder);
-    NotifyResourcesStatusChanged();
   }
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/MP4Reader.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/MP4Reader.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/MP4Reader.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/MP4Reader.h	2015-05-25 20:43:40.000000000 +0000
@@ -19,10 +19,6 @@
 
 namespace mozilla {
 
-namespace dom {
-class TimeRanges;
-}
-
 typedef std::deque<nsRefPtr<MediaRawData>> MediaSampleQueue;
 
 class MP4Stream;
@@ -68,7 +64,7 @@
   virtual int64_t GetEvictionOffset(double aTime) override;
   virtual void NotifyDataArrived(const char* aBuffer, uint32_t aLength, int64_t aOffset) override;
 
-  virtual nsresult GetBuffered(dom::TimeRanges* aBuffered) override;
+  virtual media::TimeIntervals GetBuffered() override;
 
   // For Media Resource Management
   virtual void SetIdle() override;
@@ -124,7 +120,6 @@
   void UpdateIndex();
   bool IsSupportedAudioMimeType(const nsACString& aMimeType);
   bool IsSupportedVideoMimeType(const nsACString& aMimeType);
-  void NotifyResourcesStatusChanged();
   virtual bool IsWaitingOnCDMResource() override;
 
   Microseconds GetNextKeyframeTime();
@@ -156,9 +151,6 @@
     virtual void DrainComplete() override {
       mReader->DrainComplete(mType);
     }
-    virtual void NotifyResourcesStatusChanged() override {
-      mReader->NotifyResourcesStatusChanged();
-    }
     virtual void ReleaseMediaResources() override {
       mReader->ReleaseMediaResources();
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/PlatformDecoderModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/PlatformDecoderModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/PlatformDecoderModule.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/PlatformDecoderModule.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,224 +0,0 @@
-/* -*- 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 "PlatformDecoderModule.h"
-
-#ifdef XP_WIN
-#include "WMFDecoderModule.h"
-#endif
-#ifdef MOZ_FFMPEG
-#include "FFmpegRuntimeLinker.h"
-#endif
-#ifdef MOZ_APPLEMEDIA
-#include "AppleDecoderModule.h"
-#endif
-#ifdef MOZ_GONK_MEDIACODEC
-#include "GonkDecoderModule.h"
-#endif
-#ifdef MOZ_WIDGET_ANDROID
-#include "AndroidDecoderModule.h"
-#endif
-#include "GMPDecoderModule.h"
-
-#include "mozilla/Preferences.h"
-#ifdef MOZ_EME
-#include "EMEDecoderModule.h"
-#include "mozilla/CDMProxy.h"
-#endif
-#include "SharedThreadPool.h"
-#include "MediaTaskQueue.h"
-
-#include "MediaInfo.h"
-#include "H264Converter.h"
-
-namespace mozilla {
-
-extern already_AddRefed<PlatformDecoderModule> CreateBlankDecoderModule();
-
-bool PlatformDecoderModule::sUseBlankDecoder = false;
-bool PlatformDecoderModule::sFFmpegDecoderEnabled = false;
-bool PlatformDecoderModule::sGonkDecoderEnabled = false;
-bool PlatformDecoderModule::sAndroidMCDecoderEnabled = false;
-bool PlatformDecoderModule::sAndroidMCDecoderPreferred = false;
-bool PlatformDecoderModule::sGMPDecoderEnabled = false;
-
-/* static */
-void
-PlatformDecoderModule::Init()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  static bool alreadyInitialized = false;
-  if (alreadyInitialized) {
-    return;
-  }
-  alreadyInitialized = true;
-
-  Preferences::AddBoolVarCache(&sUseBlankDecoder,
-                               "media.fragmented-mp4.use-blank-decoder");
-  Preferences::AddBoolVarCache(&sFFmpegDecoderEnabled,
-                               "media.fragmented-mp4.ffmpeg.enabled", false);
-
-#ifdef MOZ_GONK_MEDIACODEC
-  Preferences::AddBoolVarCache(&sGonkDecoderEnabled,
-                               "media.fragmented-mp4.gonk.enabled", false);
-#endif
-#ifdef MOZ_WIDGET_ANDROID
-  Preferences::AddBoolVarCache(&sAndroidMCDecoderEnabled,
-                               "media.fragmented-mp4.android-media-codec.enabled", false);
-  Preferences::AddBoolVarCache(&sAndroidMCDecoderPreferred,
-                               "media.fragmented-mp4.android-media-codec.preferred", false);
-#endif
-
-  Preferences::AddBoolVarCache(&sGMPDecoderEnabled,
-                               "media.fragmented-mp4.gmp.enabled", false);
-
-#ifdef XP_WIN
-  WMFDecoderModule::Init();
-#endif
-#ifdef MOZ_APPLEMEDIA
-  AppleDecoderModule::Init();
-#endif
-}
-
-#ifdef MOZ_EME
-/* static */
-already_AddRefed<PlatformDecoderModule>
-PlatformDecoderModule::CreateCDMWrapper(CDMProxy* aProxy,
-                                        bool aHasAudio,
-                                        bool aHasVideo)
-{
-  bool cdmDecodesAudio;
-  bool cdmDecodesVideo;
-  {
-    CDMCaps::AutoLock caps(aProxy->Capabilites());
-    cdmDecodesAudio = caps.CanDecryptAndDecodeAudio();
-    cdmDecodesVideo = caps.CanDecryptAndDecodeVideo();
-  }
-
-  nsRefPtr<PlatformDecoderModule> pdm;
-  if ((!cdmDecodesAudio && aHasAudio) || (!cdmDecodesVideo && aHasVideo)) {
-    // The CDM itself can't decode. We need to wrap a PDM to decode the
-    // decrypted output of the CDM.
-    pdm = Create();
-    if (!pdm) {
-      return nullptr;
-    }
-  }
-
-  nsRefPtr<PlatformDecoderModule> emepdm(
-    new EMEDecoderModule(aProxy, pdm, cdmDecodesAudio, cdmDecodesVideo));
-  return emepdm.forget();
-}
-#endif
-
-/* static */
-already_AddRefed<PlatformDecoderModule>
-PlatformDecoderModule::Create()
-{
-  // Note: This (usually) runs on the decode thread.
-
-  nsRefPtr<PlatformDecoderModule> m(CreatePDM());
-
-  if (m && NS_SUCCEEDED(m->Startup())) {
-    return m.forget();
-  }
-  return nullptr;
-}
-
-/* static */
-already_AddRefed<PlatformDecoderModule>
-PlatformDecoderModule::CreatePDM()
-{
-#ifdef MOZ_WIDGET_ANDROID
-  if(sAndroidMCDecoderPreferred && sAndroidMCDecoderEnabled){
-    nsRefPtr<PlatformDecoderModule> m(new AndroidDecoderModule());
-    return m.forget();
-  }
-#endif
-  if (sUseBlankDecoder) {
-    return CreateBlankDecoderModule();
-  }
-#ifdef XP_WIN
-  nsRefPtr<PlatformDecoderModule> m(new WMFDecoderModule());
-  return m.forget();
-#endif
-#ifdef MOZ_FFMPEG
-  if (sFFmpegDecoderEnabled) {
-    nsRefPtr<PlatformDecoderModule> m = FFmpegRuntimeLinker::CreateDecoderModule();
-    if (m) {
-      return m.forget();
-    }
-  }
-#endif
-#ifdef MOZ_APPLEMEDIA
-  nsRefPtr<PlatformDecoderModule> m(new AppleDecoderModule());
-  return m.forget();
-#endif
-#ifdef MOZ_GONK_MEDIACODEC
-  if (sGonkDecoderEnabled) {
-    nsRefPtr<PlatformDecoderModule> m(new GonkDecoderModule());
-    return m.forget();
-  }
-#endif
-#ifdef MOZ_WIDGET_ANDROID
-  if(sAndroidMCDecoderEnabled){
-    nsRefPtr<PlatformDecoderModule> m(new AndroidDecoderModule());
-    return m.forget();
-  }
-#endif
-  if (sGMPDecoderEnabled) {
-    nsRefPtr<PlatformDecoderModule> m(new GMPDecoderModule());
-    return m.forget();
-  }
-  return nullptr;
-}
-
-already_AddRefed<MediaDataDecoder>
-PlatformDecoderModule::CreateDecoder(const TrackInfo& aConfig,
-                                     FlushableMediaTaskQueue* aTaskQueue,
-                                     MediaDataDecoderCallback* aCallback,
-                                     layers::LayersBackend aLayersBackend,
-                                     layers::ImageContainer* aImageContainer)
-{
-  nsRefPtr<MediaDataDecoder> m;
-
-  if (aConfig.GetAsAudioInfo()) {
-    m = CreateAudioDecoder(*aConfig.GetAsAudioInfo(),
-                           aTaskQueue,
-                           aCallback);
-    return m.forget();
-  }
-
-  if (!aConfig.GetAsVideoInfo()) {
-    return nullptr;
-  }
-
-  if (H264Converter::IsH264(aConfig)) {
-    m = new H264Converter(this,
-                          *aConfig.GetAsVideoInfo(),
-                          aLayersBackend,
-                          aImageContainer,
-                          aTaskQueue,
-                          aCallback);
-  } else {
-    m = CreateVideoDecoder(*aConfig.GetAsVideoInfo(),
-                           aLayersBackend,
-                           aImageContainer,
-                           aTaskQueue,
-                           aCallback);
-  }
-  return m.forget();
-}
-
-bool
-PlatformDecoderModule::SupportsMimeType(const nsACString& aMimeType)
-{
-  return aMimeType.EqualsLiteral("audio/mp4a-latm") ||
-    aMimeType.EqualsLiteral("video/mp4") ||
-    aMimeType.EqualsLiteral("video/avc");
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/PlatformDecoderModule.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/PlatformDecoderModule.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/PlatformDecoderModule.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/PlatformDecoderModule.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,269 +0,0 @@
-/* -*- 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(PlatformDecoderModule_h_)
-#define PlatformDecoderModule_h_
-
-#include "MediaDecoderReader.h"
-#include "mozilla/layers/LayersTypes.h"
-#include "nsTArray.h"
-#include "mozilla/RefPtr.h"
-#include <queue>
-
-namespace mozilla {
-class TrackInfo;
-class AudioInfo;
-class VideoInfo;
-class MediaRawData;
-
-namespace layers {
-class ImageContainer;
-}
-
-class MediaDataDecoder;
-class MediaDataDecoderCallback;
-class FlushableMediaTaskQueue;
-class CDMProxy;
-typedef int64_t Microseconds;
-
-// The PlatformDecoderModule interface is used by the MP4Reader to abstract
-// access to the H264 and Audio (AAC/MP3) decoders provided by various platforms.
-// It may be extended to support other codecs in future. Each platform (Windows,
-// MacOSX, Linux, B2G etc) must implement a PlatformDecoderModule to provide
-// access to its decoders in order to get decompressed H.264/AAC from the
-// MP4Reader.
-//
-// Video decoding is asynchronous, and should be performed on the task queue
-// provided if the underlying platform isn't already exposing an async API.
-//
-// Platforms that don't have a corresponding PlatformDecoderModule won't be
-// able to play the H.264/AAC data output by the MP4Reader. In practice this
-// means that we won't have fragmented MP4 supported in Media Source
-// Extensions.
-//
-// A cross-platform decoder module that discards input and produces "blank"
-// output samples exists for testing, and is created when the pref
-// "media.fragmented-mp4.use-blank-decoder" is true.
-class PlatformDecoderModule {
-public:
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(PlatformDecoderModule)
-
-  // Call on the main thread to initialize the static state
-  // needed by Create().
-  static void Init();
-
-  // Factory method that creates the appropriate PlatformDecoderModule for
-  // the platform we're running on. Caller is responsible for deleting this
-  // instance. It's expected that there will be multiple
-  // PlatformDecoderModules alive at the same time. There is one
-  // PlatformDecoderModule created per MP4Reader.
-  // This is called on the decode task queue.
-  static already_AddRefed<PlatformDecoderModule> Create();
-  // As Create() but do not initialize the created PlatformDecoderModule.
-  static already_AddRefed<PlatformDecoderModule> CreatePDM();
-
-  // Perform any per-instance initialization.
-  // This is called on the decode task queue.
-  virtual nsresult Startup() { return NS_OK; };
-
-#ifdef MOZ_EME
-  // Creates a PlatformDecoderModule that uses a CDMProxy to decrypt or
-  // decrypt-and-decode EME encrypted content. If the CDM only decrypts and
-  // does not decode, we create a PDM and use that to create MediaDataDecoders
-  // that we use on on aTaskQueue to decode the decrypted stream.
-  // This is called on the decode task queue.
-  static already_AddRefed<PlatformDecoderModule>
-  CreateCDMWrapper(CDMProxy* aProxy,
-                   bool aHasAudio,
-                   bool aHasVideo);
-#endif
-
-  // Creates a decoder.
-  // See CreateVideoDecoder and CreateAudioDecoder for implementation details.
-  virtual already_AddRefed<MediaDataDecoder>
-  CreateDecoder(const TrackInfo& aConfig,
-                FlushableMediaTaskQueue* aTaskQueue,
-                MediaDataDecoderCallback* aCallback,
-                layers::LayersBackend aLayersBackend = layers::LayersBackend::LAYERS_NONE,
-                layers::ImageContainer* aImageContainer = nullptr);
-
-  // An audio decoder module must support AAC by default.
-  // A video decoder must support H264 by default.
-  // If more codecs are to be supported, SupportsMimeType will have
-  // to be extended
-  virtual bool SupportsMimeType(const nsACString& aMimeType);
-
-  enum ConversionRequired {
-    kNeedNone,
-    kNeedAVCC,
-    kNeedAnnexB,
-  };
-
-  // Indicates that the decoder requires a specific format.
-  // The PlatformDecoderModule will convert the demuxed data accordingly before
-  // feeding it to MediaDataDecoder::Input.
-  virtual ConversionRequired DecoderNeedsConversion(const TrackInfo& aConfig) const = 0;
-
-  virtual void DisableHardwareAcceleration() {}
-
-  virtual bool SupportsSharedDecoders(const VideoInfo& aConfig) const {
-    return true;
-  }
-
-protected:
-  PlatformDecoderModule() {}
-  virtual ~PlatformDecoderModule() {}
-
-  friend class H264Converter;
-  // Creates a Video decoder. The layers backend is passed in so that
-  // decoders can determine whether hardware accelerated decoding can be used.
-  // Asynchronous decoding of video should be done in runnables dispatched
-  // to aVideoTaskQueue. If the task queue isn't needed, the decoder should
-  // not hold a reference to it.
-  // Output and errors should be returned to the reader via aCallback.
-  // On Windows the task queue's threads in have MSCOM initialized with
-  // COINIT_MULTITHREADED.
-  // Returns nullptr if the decoder can't be created.
-  // It is safe to store a reference to aConfig.
-  // This is called on the decode task queue.
-  virtual already_AddRefed<MediaDataDecoder>
-  CreateVideoDecoder(const VideoInfo& aConfig,
-                     layers::LayersBackend aLayersBackend,
-                     layers::ImageContainer* aImageContainer,
-                     FlushableMediaTaskQueue* aVideoTaskQueue,
-                     MediaDataDecoderCallback* aCallback) = 0;
-
-  // Creates an Audio decoder with the specified properties.
-  // Asynchronous decoding of audio should be done in runnables dispatched to
-  // aAudioTaskQueue. If the task queue isn't needed, the decoder should
-  // not hold a reference to it.
-  // Output and errors should be returned to the reader via aCallback.
-  // Returns nullptr if the decoder can't be created.
-  // On Windows the task queue's threads in have MSCOM initialized with
-  // COINIT_MULTITHREADED.
-  // It is safe to store a reference to aConfig.
-  // This is called on the decode task queue.
-  virtual already_AddRefed<MediaDataDecoder>
-  CreateAudioDecoder(const AudioInfo& aConfig,
-                     FlushableMediaTaskQueue* aAudioTaskQueue,
-                     MediaDataDecoderCallback* aCallback) = 0;
-
-  // Caches pref media.fragmented-mp4.use-blank-decoder
-  static bool sUseBlankDecoder;
-  static bool sFFmpegDecoderEnabled;
-  static bool sGonkDecoderEnabled;
-  static bool sAndroidMCDecoderPreferred;
-  static bool sAndroidMCDecoderEnabled;
-  static bool sGMPDecoderEnabled;
-};
-
-// A callback used by MediaDataDecoder to return output/errors to the
-// MP4Reader. Implementation is threadsafe, and can be called on any thread.
-class MediaDataDecoderCallback {
-public:
-  virtual ~MediaDataDecoderCallback() {}
-
-  // 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
-  // the decoder.
-  virtual void Error() = 0;
-
-  // Denotes that the last input sample has been inserted into the decoder,
-  // and no more output can be produced unless more input is sent.
-  virtual void InputExhausted() = 0;
-
-  virtual void DrainComplete() = 0;
-
-  virtual void NotifyResourcesStatusChanged() {};
-
-  virtual void ReleaseMediaResources() {};
-
-  virtual bool OnReaderTaskQueue() = 0;
-};
-
-// MediaDataDecoder is the interface exposed by decoders created by the
-// PlatformDecoderModule's Create*Decoder() functions. The type of
-// media data that the decoder accepts as valid input and produces as
-// output is determined when the MediaDataDecoder is created.
-//
-// Unless otherwise noted, all functions are only called on the decode task
-// queue.  An exception is the MediaDataDecoder in
-// MP4Reader::IsVideoAccelerated() for which all calls (Init(),
-// IsHardwareAccelerated(), and Shutdown()) are from the main thread.
-//
-// Don't block inside these functions, unless it's explicitly noted that you
-// should (like in Flush()).
-//
-// Decoding is done asynchronously. Any async work can be done on the
-// MediaTaskQueue passed into the PlatformDecoderModules's Create*Decoder()
-// function. This may not be necessary for platforms with async APIs
-// for decoding.
-class MediaDataDecoder {
-protected:
-  virtual ~MediaDataDecoder() {};
-
-public:
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MediaDataDecoder)
-
-  // Initialize the decoder. The decoder should be ready to decode after
-  // this returns. The decoder should do any initialization here, rather
-  // than in its constructor or PlatformDecoderModule::Create*Decoder(),
-  // so that if the MP4Reader needs to shutdown during initialization,
-  // it can call Shutdown() to cancel this operation. Any initialization
-  // that requires blocking the calling thread in this function *must*
-  // be done here so that it can be canceled by calling Shutdown()!
-  virtual nsresult Init() = 0;
-
-  // Inserts a sample into the decoder's decode pipeline.
-  virtual nsresult Input(MediaRawData* aSample) = 0;
-
-  // Causes all samples in the decoding pipeline to be discarded. When
-  // this function returns, the decoder must be ready to accept new input
-  // for decoding. This function is called when the demuxer seeks, before
-  // decoding resumes after the seek.
-  // While the reader calls Flush(), it ignores all output sent to it;
-  // it is safe (but pointless) to send output while Flush is called.
-  // The MP4Reader will not call Input() while it's calling Flush().
-  virtual nsresult Flush() = 0;
-
-  // Causes all complete samples in the pipeline that can be decoded to be
-  // output. If the decoder can't produce samples from the current output,
-  // it drops the input samples. The decoder may be holding onto samples
-  // that are required to decode samples that it expects to get in future.
-  // This is called when the demuxer reaches end of stream.
-  // The MP4Reader will not call Input() while it's calling Drain().
-  // This function is asynchronous. The MediaDataDecoder must call
-  // MediaDataDecoderCallback::DrainComplete() once all remaining
-  // samples have been output.
-  virtual nsresult Drain() = 0;
-
-  // Cancels all init/input/drain operations, and shuts down the
-  // decoder. The platform decoder should clean up any resources it's using
-  // and release memory etc. Shutdown() must block until the decoder has
-  // completed shutdown. The reader calls Flush() before calling Shutdown().
-  // The reader will delete the decoder once Shutdown() returns.
-  // The MediaDataDecoderCallback *must* not be called after Shutdown() has
-  // returned.
-  virtual nsresult Shutdown() = 0;
-
-  // Called from the state machine task queue or main thread.
-  virtual bool IsHardwareAccelerated() const { return false; }
-
-  // ConfigurationChanged will be called to inform the video or audio decoder
-  // that the format of the next input sample is about to change.
-  // If video decoder, aConfig will be a VideoInfo object.
-  // If audio decoder, aConfig will be a AudioInfo object.
-  virtual nsresult ConfigurationChanged(const TrackInfo& aConfig)
-  {
-    return NS_OK;
-  }
-};
-
-} // namespace mozilla
-
-#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/SharedDecoderManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/SharedDecoderManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/SharedDecoderManager.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/SharedDecoderManager.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,284 +0,0 @@
-/* -*- 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"
-
-namespace mozilla {
-
-class SharedDecoderCallback : public MediaDataDecoderCallback
-{
-public:
-  explicit SharedDecoderCallback(SharedDecoderManager* aManager)
-    : mManager(aManager)
-  {
-  }
-
-  virtual void Output(MediaData* aData) override
-  {
-    if (mManager->mActiveCallback) {
-      AssertHaveActiveProxy();
-      mManager->mActiveCallback->Output(aData);
-    }
-  }
-  virtual void Error() override
-  {
-    if (mManager->mActiveCallback) {
-      AssertHaveActiveProxy();
-      mManager->mActiveCallback->Error();
-    }
-  }
-  virtual void InputExhausted() override
-  {
-    if (mManager->mActiveCallback) {
-      AssertHaveActiveProxy();
-      mManager->mActiveCallback->InputExhausted();
-    }
-  }
-  virtual void DrainComplete() override
-  {
-    if (mManager->mActiveCallback) {
-      AssertHaveActiveProxy();
-      mManager->DrainComplete();
-    }
-  }
-  virtual void NotifyResourcesStatusChanged() override
-  {
-    if (mManager->mActiveCallback) {
-      AssertHaveActiveProxy();
-      mManager->mActiveCallback->NotifyResourcesStatusChanged();
-    }
-  }
-  virtual void ReleaseMediaResources() override
-  {
-    if (mManager->mActiveCallback) {
-      AssertHaveActiveProxy();
-      mManager->mActiveCallback->ReleaseMediaResources();
-    }
-  }
-  virtual bool OnReaderTaskQueue() override
-  {
-    MOZ_ASSERT(mManager->mActiveCallback);
-    return mManager->mActiveCallback->OnReaderTaskQueue();
-  }
-
-private:
-  void AssertHaveActiveProxy() {
-#ifdef MOZ_FFMPEG // bug 1161895
-    NS_WARN_IF_FALSE(mManager->mActiveProxy, "callback not active proxy");
-#else
-    MOZ_DIAGNOSTIC_ASSERT(mManager->mActiveProxy);
-#endif
-  }
-
-  SharedDecoderManager* mManager;
-};
-
-SharedDecoderManager::SharedDecoderManager()
-  : mTaskQueue(new FlushableMediaTaskQueue(GetMediaThreadPool(MediaThreadType::PLATFORM_DECODER)))
-  , mActiveProxy(nullptr)
-  , mActiveCallback(nullptr)
-  , mWaitForInternalDrain(false)
-  , mMonitor("SharedDecoderProxy")
-  , mDecoderReleasedResources(false)
-{
-  MOZ_ASSERT(NS_IsMainThread()); // taskqueue must be created on main thread.
-  mCallback = new SharedDecoderCallback(this);
-}
-
-SharedDecoderManager::~SharedDecoderManager()
-{
-}
-
-already_AddRefed<MediaDataDecoder>
-SharedDecoderManager::CreateVideoDecoder(
-  PlatformDecoderModule* aPDM,
-  const VideoInfo& aConfig,
-  layers::LayersBackend aLayersBackend,
-  layers::ImageContainer* aImageContainer,
-  FlushableMediaTaskQueue* aVideoTaskQueue,
-  MediaDataDecoderCallback* aCallback)
-{
-  if (!mDecoder) {
-    mLayersBackend = aLayersBackend;
-    mImageContainer = aImageContainer;
-    // We use the manager's task queue for the decoder, rather than the one
-    // passed in, so that none of the objects sharing the decoder can shutdown
-    // the task queue while we're potentially still using it for a *different*
-    // object also sharing the decoder.
-    mDecoder =
-      aPDM->CreateDecoder(aConfig,
-                          mTaskQueue,
-                          mCallback,
-                          mLayersBackend,
-                          mImageContainer);
-    if (!mDecoder) {
-      mPDM = nullptr;
-      return nullptr;
-    }
-    nsresult rv = mDecoder->Init();
-    if (NS_FAILED(rv)) {
-      mDecoder = nullptr;
-      return nullptr;
-    }
-    mPDM = aPDM;
-  }
-
-  nsRefPtr<SharedDecoderProxy> proxy(new SharedDecoderProxy(this, aCallback));
-  return proxy.forget();
-}
-
-void
-SharedDecoderManager::DisableHardwareAcceleration()
-{
-  MOZ_ASSERT(mPDM);
-  mPDM->DisableHardwareAcceleration();
-}
-
-bool
-SharedDecoderManager::Recreate(const VideoInfo& aConfig)
-{
-  mDecoder->Flush();
-  mDecoder->Shutdown();
-  mDecoder = mPDM->CreateDecoder(aConfig,
-                                 mTaskQueue,
-                                 mCallback,
-                                 mLayersBackend,
-                                 mImageContainer);
-  if (!mDecoder) {
-    return false;
-  }
-  nsresult rv = mDecoder->Init();
-  return rv == NS_OK;
-}
-
-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) {
-    MonitorAutoLock mon(mMonitor);
-    mWaitForInternalDrain = true;
-    nsresult rv;
-    {
-      // We don't want to hold the lock while calling Drain() has some
-      // platform implementations call DrainComplete() immediately.
-      MonitorAutoUnlock mon(mMonitor);
-      rv = mActiveProxy->Drain();
-    }
-    if (NS_SUCCEEDED(rv)) {
-      while (mWaitForInternalDrain) {
-        mon.Wait();
-      }
-    }
-    mActiveProxy->Flush();
-    mActiveProxy = nullptr;
-  }
-}
-
-void
-SharedDecoderManager::DrainComplete()
-{
-  {
-    MonitorAutoLock mon(mMonitor);
-    if (mWaitForInternalDrain) {
-      mWaitForInternalDrain = false;
-      mon.NotifyAll();
-      return;
-    }
-  }
-  mActiveCallback->DrainComplete();
-}
-
-void
-SharedDecoderManager::Shutdown()
-{
-  // Shutdown() should have been called on any proxies.
-  MOZ_ASSERT(!mActiveProxy);
-
-  if (mDecoder) {
-    mDecoder->Shutdown();
-    mDecoder = nullptr;
-  }
-  mPDM = nullptr;
-  if (mTaskQueue) {
-    mTaskQueue->BeginShutdown();
-    mTaskQueue->AwaitShutdownAndIdle();
-    mTaskQueue = nullptr;
-  }
-}
-
-SharedDecoderProxy::SharedDecoderProxy(SharedDecoderManager* aManager,
-                                       MediaDataDecoderCallback* aCallback)
-  : mManager(aManager)
-  , mCallback(aCallback)
-{
-}
-
-SharedDecoderProxy::~SharedDecoderProxy()
-{
-  Shutdown();
-}
-
-nsresult
-SharedDecoderProxy::Init()
-{
-  return NS_OK;
-}
-
-nsresult
-SharedDecoderProxy::Input(MediaRawData* aSample)
-{
-  if (mManager->mActiveProxy != this) {
-    mManager->Select(this);
-  }
-  return mManager->mDecoder->Input(aSample);
-}
-
-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();
-  } else {
-    mCallback->DrainComplete();
-    return NS_OK;
-  }
-}
-
-nsresult
-SharedDecoderProxy::Shutdown()
-{
-  mManager->SetIdle(this);
-  return NS_OK;
-}
-
-bool
-SharedDecoderProxy::IsHardwareAccelerated() const
-{
-  return mManager->mDecoder->IsHardwareAccelerated();
-}
-
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/SharedDecoderManager.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/SharedDecoderManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/SharedDecoderManager.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/SharedDecoderManager.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-/* -*- 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(
-    PlatformDecoderModule* aPDM,
-    const VideoInfo& aConfig,
-    layers::LayersBackend aLayersBackend,
-    layers::ImageContainer* aImageContainer,
-    FlushableMediaTaskQueue* aVideoTaskQueue,
-    MediaDataDecoderCallback* aCallback);
-
-  void SetReader(MediaDecoderReader* aReader);
-  void Select(SharedDecoderProxy* aProxy);
-  void SetIdle(MediaDataDecoder* aProxy);
-  void ReleaseMediaResources();
-  void Shutdown();
-
-  friend class SharedDecoderProxy;
-  friend class SharedDecoderCallback;
-
-  void DisableHardwareAcceleration();
-  bool Recreate(const VideoInfo& aConfig);
-
-private:
-  virtual ~SharedDecoderManager();
-  void DrainComplete();
-
-  nsRefPtr<PlatformDecoderModule> mPDM;
-  nsRefPtr<MediaDataDecoder> mDecoder;
-  layers::LayersBackend mLayersBackend;
-  nsRefPtr<layers::ImageContainer> mImageContainer;
-  nsRefPtr<FlushableMediaTaskQueue> mTaskQueue;
-  SharedDecoderProxy* mActiveProxy;
-  MediaDataDecoderCallback* mActiveCallback;
-  nsAutoPtr<MediaDataDecoderCallback> mCallback;
-  bool mWaitForInternalDrain;
-  Monitor mMonitor;
-  bool mDecoderReleasedResources;
-};
-
-class SharedDecoderProxy : public MediaDataDecoder
-{
-public:
-  SharedDecoderProxy(SharedDecoderManager* aManager,
-                     MediaDataDecoderCallback* aCallback);
-  virtual ~SharedDecoderProxy();
-
-  virtual nsresult Init() override;
-  virtual nsresult Input(MediaRawData* aSample) override;
-  virtual nsresult Flush() override;
-  virtual nsresult Drain() override;
-  virtual nsresult Shutdown() override;
-  virtual bool IsHardwareAccelerated() const override;
-
-  friend class SharedDecoderManager;
-
-private:
-  nsRefPtr<SharedDecoderManager> mManager;
-  MediaDataDecoderCallback* mCallback;
-};
-}
-
-#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wmf/MFTDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wmf/MFTDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wmf/MFTDecoder.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wmf/MFTDecoder.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,313 +0,0 @@
-/* -*- 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 "MFTDecoder.h"
-#include "nsThreadUtils.h"
-#include "WMFUtils.h"
-#include "prlog.h"
-
-#ifdef PR_LOGGING
-PRLogModuleInfo* GetDemuxerLog();
-#define LOG(...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__))
-#else
-#define LOG(...)
-#endif
-
-
-namespace mozilla {
-
-MFTDecoder::MFTDecoder()
-  : mMFTProvidesOutputSamples(false)
-  , mDiscontinuity(true)
-{
-  memset(&mInputStreamInfo, 0, sizeof(MFT_INPUT_STREAM_INFO));
-  memset(&mOutputStreamInfo, 0, sizeof(MFT_OUTPUT_STREAM_INFO));
-}
-
-MFTDecoder::~MFTDecoder()
-{
-}
-
-HRESULT
-MFTDecoder::Create(const GUID& aMFTClsID)
-{
-  // Create the IMFTransform to do the decoding.
-  HRESULT hr;
-  hr = CoCreateInstance(aMFTClsID,
-                        nullptr,
-                        CLSCTX_INPROC_SERVER,
-                        IID_IMFTransform,
-                        reinterpret_cast<void**>(static_cast<IMFTransform**>(byRef(mDecoder))));
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  return S_OK;
-}
-
-HRESULT
-MFTDecoder::SetMediaTypes(IMFMediaType* aInputType,
-                          IMFMediaType* aOutputType,
-                          ConfigureOutputCallback aCallback,
-                          void* aData)
-{
-  mOutputType = aOutputType;
-
-  // Set the input type to the one the caller gave us...
-  HRESULT hr = mDecoder->SetInputType(0, aInputType, 0);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  hr = SetDecoderOutputType(aCallback, aData);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  hr = mDecoder->GetInputStreamInfo(0, &mInputStreamInfo);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  hr = SendMFTMessage(MFT_MESSAGE_NOTIFY_BEGIN_STREAMING, 0);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  hr = SendMFTMessage(MFT_MESSAGE_NOTIFY_START_OF_STREAM, 0);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  return S_OK;
-}
-
-TemporaryRef<IMFAttributes>
-MFTDecoder::GetAttributes()
-{
-  RefPtr<IMFAttributes> attr;
-  HRESULT hr = mDecoder->GetAttributes(byRef(attr));
-  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
-  return attr;
-}
-
-HRESULT
-MFTDecoder::SetDecoderOutputType(ConfigureOutputCallback aCallback, void* aData)
-{
-  NS_ENSURE_TRUE(mDecoder != nullptr, E_POINTER);
-
-  // Iterate the enumerate the output types, until we find one compatible
-  // with what we need.
-  HRESULT hr;
-  RefPtr<IMFMediaType> outputType;
-  UINT32 typeIndex = 0;
-  while (SUCCEEDED(mDecoder->GetOutputAvailableType(0, typeIndex++, byRef(outputType)))) {
-    BOOL resultMatch;
-    hr = mOutputType->Compare(outputType, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &resultMatch);
-    if (SUCCEEDED(hr) && resultMatch == TRUE) {
-      if (aCallback) {
-        hr = aCallback(outputType, aData);
-        NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-      }
-      hr = mDecoder->SetOutputType(0, outputType, 0);
-      NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-      hr = mDecoder->GetOutputStreamInfo(0, &mOutputStreamInfo);
-      NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-      mMFTProvidesOutputSamples = IsFlagSet(mOutputStreamInfo.dwFlags, MFT_OUTPUT_STREAM_PROVIDES_SAMPLES);
-
-      return S_OK;
-    }
-    outputType = nullptr;
-  }
-  return E_FAIL;
-}
-
-HRESULT
-MFTDecoder::SendMFTMessage(MFT_MESSAGE_TYPE aMsg, ULONG_PTR aData)
-{
-  NS_ENSURE_TRUE(mDecoder != nullptr, E_POINTER);
-  HRESULT hr = mDecoder->ProcessMessage(aMsg, aData);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-  return S_OK;
-}
-
-HRESULT
-MFTDecoder::CreateInputSample(const uint8_t* aData,
-                              uint32_t aDataSize,
-                              int64_t aTimestamp,
-                              RefPtr<IMFSample>* aOutSample)
-{
-  NS_ENSURE_TRUE(mDecoder != nullptr, E_POINTER);
-
-  HRESULT hr;
-  RefPtr<IMFSample> sample;
-  hr = wmf::MFCreateSample(byRef(sample));
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  RefPtr<IMFMediaBuffer> buffer;
-  int32_t bufferSize = std::max<uint32_t>(uint32_t(mInputStreamInfo.cbSize), aDataSize);
-  UINT32 alignment = (mInputStreamInfo.cbAlignment > 1) ? mInputStreamInfo.cbAlignment - 1 : 0;
-  hr = wmf::MFCreateAlignedMemoryBuffer(bufferSize, alignment, byRef(buffer));
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  DWORD maxLength = 0;
-  DWORD currentLength = 0;
-  BYTE* dst = nullptr;
-  hr = buffer->Lock(&dst, &maxLength, &currentLength);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  // Copy data into sample's buffer.
-  memcpy(dst, aData, aDataSize);
-
-  hr = buffer->Unlock();
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  hr = buffer->SetCurrentLength(aDataSize);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  hr = sample->AddBuffer(buffer);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  hr = sample->SetSampleTime(UsecsToHNs(aTimestamp));
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  *aOutSample = sample.forget();
-
-  return S_OK;
-}
-
-HRESULT
-MFTDecoder::CreateOutputSample(RefPtr<IMFSample>* aOutSample)
-{
-  NS_ENSURE_TRUE(mDecoder != nullptr, E_POINTER);
-
-  HRESULT hr;
-  RefPtr<IMFSample> sample;
-  hr = wmf::MFCreateSample(byRef(sample));
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  RefPtr<IMFMediaBuffer> buffer;
-  int32_t bufferSize = mOutputStreamInfo.cbSize;
-  UINT32 alignment = (mOutputStreamInfo.cbAlignment > 1) ? mOutputStreamInfo.cbAlignment - 1 : 0;
-  hr = wmf::MFCreateAlignedMemoryBuffer(bufferSize, alignment, byRef(buffer));
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  DWORD maxLength = 0;
-  DWORD currentLength = 0;
-  BYTE* dst = nullptr;
-
-  hr = sample->AddBuffer(buffer);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  *aOutSample = sample.forget();
-
-  return S_OK;
-}
-
-HRESULT
-MFTDecoder::Output(RefPtr<IMFSample>* aOutput)
-{
-  NS_ENSURE_TRUE(mDecoder != nullptr, E_POINTER);
-
-  HRESULT hr;
-
-  MFT_OUTPUT_DATA_BUFFER output = {0};
-
-  bool providedSample = false;
-  RefPtr<IMFSample> sample;
-  if (*aOutput) {
-    output.pSample = *aOutput;
-    providedSample = true;
-  } else if (!mMFTProvidesOutputSamples) {
-    hr = CreateOutputSample(&sample);
-    NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-    output.pSample = sample;
-  }
-
-  DWORD status = 0;
-  hr = mDecoder->ProcessOutput(0, 1, &output, &status);
-  if (output.pEvents) {
-    // We must release this, as per the IMFTransform::ProcessOutput()
-    // MSDN documentation.
-    output.pEvents->Release();
-    output.pEvents = nullptr;
-  }
-
-  if (hr == MF_E_TRANSFORM_STREAM_CHANGE) {
-    // Type change, probably geometric aperature change.
-    // Reconfigure decoder output type, so that GetOutputMediaType()
-    // returns the new type, and return the error code to caller.
-    // This is an expected failure, so don't warn on encountering it.
-    hr = SetDecoderOutputType(nullptr, nullptr);
-    NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-    // Return the error, so that the caller knows to retry.
-    return MF_E_TRANSFORM_STREAM_CHANGE;
-  }
-
-  if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) {
-    // Not enough input to produce output. This is an expected failure,
-    // so don't warn on encountering it.
-    return hr;
-  }
-  // Treat other errors as unexpected, and warn.
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  MOZ_ASSERT(output.pSample);
-
-  if (mDiscontinuity) {
-    output.pSample->SetUINT32(MFSampleExtension_Discontinuity, TRUE);
-    mDiscontinuity = false;
-  }
-
-  *aOutput = output.pSample; // AddRefs
-  if (mMFTProvidesOutputSamples && !providedSample) {
-    // If the MFT is providing samples, we must release the sample here.
-    // Typically only the H.264 MFT provides samples when using DXVA,
-    // and it always re-uses the same sample, so if we don't release it
-    // MFT::ProcessOutput() deadlocks waiting for the sample to be released.
-    output.pSample->Release();
-    output.pSample = nullptr;
-  }
-
-  return S_OK;
-}
-
-HRESULT
-MFTDecoder::Input(const uint8_t* aData,
-                  uint32_t aDataSize,
-                  int64_t aTimestamp)
-{
-  NS_ENSURE_TRUE(mDecoder != nullptr, E_POINTER);
-
-  RefPtr<IMFSample> input;
-  HRESULT hr = CreateInputSample(aData, aDataSize, aTimestamp, &input);
-  NS_ENSURE_TRUE(SUCCEEDED(hr) && input != nullptr, hr);
-
-  return Input(input);
-}
-
-HRESULT
-MFTDecoder::Input(IMFSample* aSample)
-{
-  HRESULT hr = mDecoder->ProcessInput(0, aSample, 0);
-  if (hr == MF_E_NOTACCEPTING) {
-    // MFT *already* has enough data to produce a sample. Retrieve it.
-    return MF_E_NOTACCEPTING;
-  }
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  return S_OK;
-}
-
-HRESULT
-MFTDecoder::Flush()
-{
-  HRESULT hr = SendMFTMessage(MFT_MESSAGE_COMMAND_FLUSH, 0);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  mDiscontinuity = true;
-
-  return S_OK;
-}
-
-HRESULT
-MFTDecoder::GetOutputMediaType(RefPtr<IMFMediaType>& aMediaType)
-{
-  NS_ENSURE_TRUE(mDecoder, E_POINTER);
-  return mDecoder->GetOutputCurrentType(0, byRef(aMediaType));
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wmf/MFTDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wmf/MFTDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wmf/MFTDecoder.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wmf/MFTDecoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,110 +0,0 @@
-/* -*- 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(MFTDecoder_h_)
-#define MFTDecoder_h_
-
-#include "WMF.h"
-#include "mozilla/RefPtr.h"
-#include "mozilla/ReentrantMonitor.h"
-#include "nsIThread.h"
-
-namespace mozilla {
-
-class MFTDecoder final {
-  ~MFTDecoder();
-
-public:
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MFTDecoder)
-
-  MFTDecoder();
-
-  // Creates the MFT. First thing to do as part of setup.
-  //
-  // Params:
-  //  - aMFTClsID the clsid used by CoCreateInstance to instantiate the
-  //    decoder MFT.
-  HRESULT Create(const GUID& aMFTClsID);
-
-  // Sets the input and output media types. Call after Init().
-  //
-  // Params:
-  //  - aInputType needs at least major and minor types set.
-  //  - aOutputType needs at least major and minor types set.
-  //    This is used to select the matching output type out
-  //    of all the available output types of the MFT.
-  typedef HRESULT (*ConfigureOutputCallback)(IMFMediaType* aOutputType, void* aData);
-  HRESULT SetMediaTypes(IMFMediaType* aInputType,
-                        IMFMediaType* aOutputType,
-                        ConfigureOutputCallback aCallback = nullptr,
-                        void* aData = nullptr);
-
-  // Returns the MFT's IMFAttributes object.
-  TemporaryRef<IMFAttributes> GetAttributes();
-
-  // Retrieves the media type being output. This may not be valid until
-  //  the first sample is decoded.
-  HRESULT GetOutputMediaType(RefPtr<IMFMediaType>& aMediaType);
-
-  // Submits data into the MFT for processing.
-  //
-  // Returns:
-  //  - MF_E_NOTACCEPTING if the decoder can't accept input. The data
-  //    must be resubmitted after Output() stops producing output.
-  HRESULT Input(const uint8_t* aData,
-                uint32_t aDataSize,
-                int64_t aTimestampUsecs);
-  HRESULT Input(IMFSample* aSample);
-
-  // Retrieves output from the MFT. Call this once Input() returns
-  // MF_E_NOTACCEPTING. Some MFTs with hardware acceleration (the H.264
-  // decoder MFT in particular) can't handle it if clients hold onto
-  // references to the output IMFSample, so don't do that.
-  //
-  // Returns:
-  //  - MF_E_TRANSFORM_STREAM_CHANGE if the underlying stream output
-  //    type changed. Retrieve the output media type and reconfig client,
-  //    else you may misinterpret the MFT's output.
-  //  - MF_E_TRANSFORM_NEED_MORE_INPUT if no output can be produced
-  //    due to lack of input.
-  //  - S_OK if an output frame is produced.
-  HRESULT Output(RefPtr<IMFSample>* aOutput);
-
-  // Sends a flush message to the MFT. This causes it to discard all
-  // input data. Use before seeking.
-  HRESULT Flush();
-
-  // Sends a message to the MFT.
-  HRESULT SendMFTMessage(MFT_MESSAGE_TYPE aMsg, ULONG_PTR aData);
-
-private:
-
-  HRESULT SetDecoderOutputType(ConfigureOutputCallback aCallback, void* aData);
-
-  HRESULT CreateInputSample(const uint8_t* aData,
-                            uint32_t aDataSize,
-                            int64_t aTimestampUsecs,
-                            RefPtr<IMFSample>* aOutSample);
-
-  HRESULT CreateOutputSample(RefPtr<IMFSample>* aOutSample);
-
-  MFT_INPUT_STREAM_INFO mInputStreamInfo;
-  MFT_OUTPUT_STREAM_INFO mOutputStreamInfo;
-
-  RefPtr<IMFTransform> mDecoder;
-
-  RefPtr<IMFMediaType> mOutputType;
-
-  // True if the IMFTransform allocates the samples that it returns.
-  bool mMFTProvidesOutputSamples;
-
-  // True if we need to mark the next sample as a discontinuity.
-  bool mDiscontinuity;
-};
-
-} // namespace mozilla
-
-#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wmf/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wmf/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wmf/moz.build	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wmf/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +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 += [
-    'MFTDecoder.h',
-    'WMFAudioMFTManager.h',
-    'WMFDecoderModule.h',
-    'WMFMediaDataDecoder.h',
-    'WMFVideoMFTManager.h',
-]
-UNIFIED_SOURCES += [
-    'MFTDecoder.cpp',
-    'WMFAudioMFTManager.cpp',
-    'WMFDecoderModule.cpp',
-    'WMFMediaDataDecoder.cpp',
-    'WMFVideoMFTManager.cpp',
-]
-
-FINAL_LIBRARY = 'xul'
-
-FAIL_ON_WARNINGS = True
-
-CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wmf/WMFAudioMFTManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wmf/WMFAudioMFTManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wmf/WMFAudioMFTManager.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wmf/WMFAudioMFTManager.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,322 +0,0 @@
-/* -*- 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 "WMFAudioMFTManager.h"
-#include "MediaInfo.h"
-#include "VideoUtils.h"
-#include "WMFUtils.h"
-#include "nsTArray.h"
-
-#include "prlog.h"
-
-#ifdef PR_LOGGING
-PRLogModuleInfo* GetDemuxerLog();
-#define LOG(...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__))
-#else
-#define LOG(...)
-#endif
-
-namespace mozilla {
-
-static void
-AACAudioSpecificConfigToUserData(uint8_t aAACProfileLevelIndication,
-                                 const uint8_t* aAudioSpecConfig,
-                                 uint32_t aConfigLength,
-                                 nsTArray<BYTE>& aOutUserData)
-{
-  MOZ_ASSERT(aOutUserData.IsEmpty());
-
-  // The MF_MT_USER_DATA for AAC is defined here:
-  // http://msdn.microsoft.com/en-us/library/windows/desktop/dd742784%28v=vs.85%29.aspx
-  //
-  // For MFAudioFormat_AAC, MF_MT_USER_DATA contains the portion of
-  // the HEAACWAVEINFO structure that appears after the WAVEFORMATEX
-  // structure (that is, after the wfx member). This is followed by
-  // the AudioSpecificConfig() data, as defined by ISO/IEC 14496-3.
-  // [...]
-  // The length of the AudioSpecificConfig() data is 2 bytes for AAC-LC
-  // or HE-AAC with implicit signaling of SBR/PS. It is more than 2 bytes
-  // for HE-AAC with explicit signaling of SBR/PS.
-  //
-  // The value of audioObjectType as defined in AudioSpecificConfig()
-  // must be 2, indicating AAC-LC. The value of extensionAudioObjectType
-  // must be 5 for SBR or 29 for PS.
-  //
-  // HEAACWAVEINFO structure:
-  //    typedef struct heaacwaveinfo_tag {
-  //      WAVEFORMATEX wfx;
-  //      WORD         wPayloadType;
-  //      WORD         wAudioProfileLevelIndication;
-  //      WORD         wStructType;
-  //      WORD         wReserved1;
-  //      DWORD        dwReserved2;
-  //    }
-  const UINT32 heeInfoLen = 4 * sizeof(WORD) + sizeof(DWORD);
-
-  // The HEAACWAVEINFO must have payload and profile set,
-  // the rest can be all 0x00.
-  BYTE heeInfo[heeInfoLen] = {0};
-  WORD* w = (WORD*)heeInfo;
-  w[0] = 0x0; // Payload type raw AAC packet
-  w[1] = aAACProfileLevelIndication;
-
-  aOutUserData.AppendElements(heeInfo, heeInfoLen);
-  aOutUserData.AppendElements(aAudioSpecConfig, aConfigLength);
-}
-
-WMFAudioMFTManager::WMFAudioMFTManager(
-  const AudioInfo& aConfig)
-  : mAudioChannels(aConfig.mChannels)
-  , mAudioRate(aConfig.mRate)
-  , mAudioFrameOffset(0)
-  , mAudioFrameSum(0)
-  , mMustRecaptureAudioPosition(true)
-{
-  MOZ_COUNT_CTOR(WMFAudioMFTManager);
-
-  if (aConfig.mMimeType.EqualsLiteral("audio/mpeg")) {
-    mStreamType = MP3;
-  } else if (aConfig.mMimeType.EqualsLiteral("audio/mp4a-latm")) {
-    mStreamType = AAC;
-    AACAudioSpecificConfigToUserData(aConfig.mProfile,
-                                     aConfig.mCodecSpecificConfig->Elements(),
-                                     aConfig.mCodecSpecificConfig->Length(),
-                                     mUserData);
-  } else {
-    mStreamType = Unknown;
-  }
-}
-
-WMFAudioMFTManager::~WMFAudioMFTManager()
-{
-  MOZ_COUNT_DTOR(WMFAudioMFTManager);
-}
-
-const GUID&
-WMFAudioMFTManager::GetMFTGUID()
-{
-  MOZ_ASSERT(mStreamType != Unknown);
-  switch (mStreamType) {
-    case AAC: return CLSID_CMSAACDecMFT;
-    case MP3: return CLSID_CMP3DecMediaObject;
-    default: return GUID_NULL;
-  };
-}
-
-const GUID&
-WMFAudioMFTManager::GetMediaSubtypeGUID()
-{
-  MOZ_ASSERT(mStreamType != Unknown);
-  switch (mStreamType) {
-    case AAC: return MFAudioFormat_AAC;
-    case MP3: return MFAudioFormat_MP3;
-    default: return GUID_NULL;
-  };
-}
-
-TemporaryRef<MFTDecoder>
-WMFAudioMFTManager::Init()
-{
-  NS_ENSURE_TRUE(mStreamType != Unknown, nullptr);
-
-  RefPtr<MFTDecoder> decoder(new MFTDecoder());
-
-  HRESULT hr = decoder->Create(GetMFTGUID());
-  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
-
-  // Setup input/output media types
-  RefPtr<IMFMediaType> inputType;
-
-  hr = wmf::MFCreateMediaType(byRef(inputType));
-  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
-
-  hr = inputType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
-
-  hr = inputType->SetGUID(MF_MT_SUBTYPE, GetMediaSubtypeGUID());
-  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
-
-  hr = inputType->SetUINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, mAudioRate);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
-
-  hr = inputType->SetUINT32(MF_MT_AUDIO_NUM_CHANNELS, mAudioChannels);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
-
-  if (mStreamType == AAC) {
-    hr = inputType->SetUINT32(MF_MT_AAC_PAYLOAD_TYPE, 0x0); // Raw AAC packet
-    NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
-
-    hr = inputType->SetBlob(MF_MT_USER_DATA,
-                            mUserData.Elements(),
-                            mUserData.Length());
-    NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
-  }
-
-  RefPtr<IMFMediaType> outputType;
-  hr = wmf::MFCreateMediaType(byRef(outputType));
-  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
-
-  hr = outputType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
-
-  hr = outputType->SetGUID(MF_MT_SUBTYPE, MFAudioFormat_PCM);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
-
-  hr = outputType->SetUINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 16);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
-
-  hr = decoder->SetMediaTypes(inputType, outputType);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
-
-  mDecoder = decoder;
-
-  return decoder.forget();
-}
-
-HRESULT
-WMFAudioMFTManager::Input(MediaRawData* aSample)
-{
-  return mDecoder->Input(aSample->mData,
-                         uint32_t(aSample->mSize),
-                         aSample->mTime);
-}
-
-HRESULT
-WMFAudioMFTManager::UpdateOutputType()
-{
-  HRESULT hr;
-
-  RefPtr<IMFMediaType> type;
-  hr = mDecoder->GetOutputMediaType(type);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  hr = type->GetUINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, &mAudioRate);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  hr = type->GetUINT32(MF_MT_AUDIO_NUM_CHANNELS, &mAudioChannels);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  return S_OK;
-}
-
-HRESULT
-WMFAudioMFTManager::Output(int64_t aStreamOffset,
-                           nsRefPtr<MediaData>& aOutData)
-{
-  aOutData = nullptr;
-  RefPtr<IMFSample> sample;
-  HRESULT hr;
-  while (true) {
-    hr = mDecoder->Output(&sample);
-    if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) {
-      return hr;
-    }
-    if (hr == MF_E_TRANSFORM_STREAM_CHANGE) {
-      hr = UpdateOutputType();
-      NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-      continue;
-    }
-    break;
-  }
-
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  RefPtr<IMFMediaBuffer> buffer;
-  hr = sample->ConvertToContiguousBuffer(byRef(buffer));
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  BYTE* data = nullptr; // Note: *data will be owned by the IMFMediaBuffer, we don't need to free it.
-  DWORD maxLength = 0, currentLength = 0;
-  hr = buffer->Lock(&data, &maxLength, &currentLength);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  // Sometimes when starting decoding, the AAC decoder gives us samples
-  // with a negative timestamp. AAC does usually have preroll (or encoder
-  // delay) encoded into its bitstream, but the amount encoded to the stream
-  // is variable, and it not signalled in-bitstream. There is sometimes
-  // signalling in the MP4 container what the preroll amount, but it's
-  // inconsistent. It looks like WMF's AAC encoder may take this into
-  // account, so strip off samples with a negative timestamp to get us
-  // to a 0-timestamp start. This seems to maintain A/V sync, so we can run
-  // with this until someone complains...
-
-  // We calculate the timestamp and the duration based on the number of audio
-  // frames we've already played. We don't trust the timestamp stored on the
-  // IMFSample, as sometimes it's wrong, possibly due to buggy encoders?
-
-  // If this sample block comes after a discontinuity (i.e. a gap or seek)
-  // reset the frame counters, and capture the timestamp. Future timestamps
-  // will be offset from this block's timestamp.
-  UINT32 discontinuity = false;
-  sample->GetUINT32(MFSampleExtension_Discontinuity, &discontinuity);
-  if (mMustRecaptureAudioPosition || discontinuity) {
-    // Update the output type, in case this segment has a different
-    // rate. This also triggers on the first sample, which can have a
-    // different rate than is advertised in the container, and sometimes we
-    // don't get a MF_E_TRANSFORM_STREAM_CHANGE when the rate changes.
-    hr = UpdateOutputType();
-    NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-    mAudioFrameSum = 0;
-    LONGLONG timestampHns = 0;
-    hr = sample->GetSampleTime(&timestampHns);
-    NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-    hr = HNsToFrames(timestampHns, mAudioRate, &mAudioFrameOffset);
-    NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-    mMustRecaptureAudioPosition = false;
-  }
-  // We can assume PCM 16 output.
-  int32_t numSamples = currentLength / 2;
-  int32_t numFrames = numSamples / mAudioChannels;
-  MOZ_ASSERT(numFrames >= 0);
-  MOZ_ASSERT(numSamples >= 0);
-  if (numFrames == 0) {
-    // All data from this chunk stripped, loop back and try to output the next
-    // frame, if possible.
-    return S_OK;
-  }
-
-  nsAutoArrayPtr<AudioDataValue> audioData(new AudioDataValue[numSamples]);
-
-  int16_t* pcm = (int16_t*)data;
-  for (int32_t i = 0; i < numSamples; ++i) {
-    audioData[i] = AudioSampleToFloat(pcm[i]);
-  }
-
-  buffer->Unlock();
-  int64_t timestamp;
-  hr = FramesToUsecs(mAudioFrameOffset + mAudioFrameSum, mAudioRate, &timestamp);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  mAudioFrameSum += numFrames;
-
-  int64_t duration;
-  hr = FramesToUsecs(numFrames, mAudioRate, &duration);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  aOutData = new AudioData(aStreamOffset,
-                           timestamp,
-                           duration,
-                           numFrames,
-                           audioData.forget(),
-                           mAudioChannels,
-                           mAudioRate);
-
-  #ifdef LOG_SAMPLE_DECODE
-  LOG("Decoded audio sample! timestamp=%lld duration=%lld currentLength=%u",
-      timestamp, duration, currentLength);
-  #endif
-
-  return S_OK;
-}
-
-void
-WMFAudioMFTManager::Shutdown()
-{
-  mDecoder = nullptr;
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wmf/WMFAudioMFTManager.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wmf/WMFAudioMFTManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wmf/WMFAudioMFTManager.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wmf/WMFAudioMFTManager.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-/* -*- 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(WMFAudioOutputSource_h_)
-#define WMFAudioOutputSource_h_
-
-#include "WMF.h"
-#include "MP4Reader.h"
-#include "MFTDecoder.h"
-#include "mozilla/RefPtr.h"
-#include "WMFMediaDataDecoder.h"
-
-namespace mozilla {
-
-class WMFAudioMFTManager : public MFTManager {
-public:
-  WMFAudioMFTManager(const AudioInfo& aConfig);
-  ~WMFAudioMFTManager();
-
-  virtual TemporaryRef<MFTDecoder> Init() override;
-
-  virtual HRESULT Input(MediaRawData* aSample) override;
-
-  // Note WMF's AAC decoder sometimes output negatively timestamped samples,
-  // 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,
-                         nsRefPtr<MediaData>& aOutput) override;
-
-  virtual void Shutdown() override;
-
-private:
-
-  HRESULT UpdateOutputType();
-
-  // IMFTransform wrapper that performs the decoding.
-  RefPtr<MFTDecoder> mDecoder;
-
-  uint32_t mAudioChannels;
-  uint32_t mAudioRate;
-  nsTArray<BYTE> mUserData;
-
-  // The offset, in audio frames, at which playback started since the
-  // last discontinuity.
-  int64_t mAudioFrameOffset;
-  // The number of audio frames that we've played since the last
-  // discontinuity.
-  int64_t mAudioFrameSum;
-
-  enum StreamType {
-    Unknown,
-    AAC,
-    MP3
-  };
-  StreamType mStreamType;
-
-  const GUID& GetMFTGUID();
-  const GUID& GetMediaSubtypeGUID();
-
-  // True if we need to re-initialize mAudioFrameOffset and mAudioFrameSum
-  // from the next audio packet we decode. This happens after a seek, since
-  // WMF doesn't mark a stream as having a discontinuity after a seek(0).
-  bool mMustRecaptureAudioPosition;
-};
-
-} // namespace mozilla
-
-#endif // WMFAudioOutputSource_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wmf/WMFDecoderModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wmf/WMFDecoderModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wmf/WMFDecoderModule.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wmf/WMFDecoderModule.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,186 +0,0 @@
-/* -*- 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 "WMF.h"
-#include "WMFDecoderModule.h"
-#include "WMFDecoder.h"
-#include "WMFVideoMFTManager.h"
-#include "WMFAudioMFTManager.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/DebugOnly.h"
-#include "WMFMediaDataDecoder.h"
-#include "nsIWindowsRegKey.h"
-#include "nsComponentManagerUtils.h"
-#include "nsServiceManagerUtils.h"
-#include "nsIGfxInfo.h"
-#include "GfxDriverInfo.h"
-#include "gfxWindowsPlatform.h"
-#include "MediaInfo.h"
-
-namespace mozilla {
-
-bool WMFDecoderModule::sIsWMFEnabled = false;
-bool WMFDecoderModule::sDXVAEnabled = false;
-
-WMFDecoderModule::WMFDecoderModule()
-{
-}
-
-WMFDecoderModule::~WMFDecoderModule()
-{
-  DebugOnly<HRESULT> hr = wmf::MFShutdown();
-  NS_ASSERTION(SUCCEEDED(hr), "MFShutdown failed");
-}
-
-/* static */
-void
-WMFDecoderModule::Init()
-{
-  MOZ_ASSERT(NS_IsMainThread(), "Must be on main thread.");
-  sIsWMFEnabled = Preferences::GetBool("media.windows-media-foundation.enabled", false);
-  if (!sIsWMFEnabled) {
-    return;
-  }
-  if (NS_FAILED(WMFDecoder::LoadDLLs())) {
-    sIsWMFEnabled = false;
-  }
-  sDXVAEnabled = !gfxWindowsPlatform::GetPlatform()->IsWARP() &&
-                 gfxPlatform::CanUseHardwareVideoDecoding();
-}
-
-nsresult
-WMFDecoderModule::Startup()
-{
-  if (!sIsWMFEnabled) {
-    return NS_ERROR_FAILURE;
-  }
-  if (FAILED(wmf::MFStartup())) {
-    NS_WARNING("Failed to initialize Windows Media Foundation");
-    return NS_ERROR_FAILURE;
-  }
-  return NS_OK;
-}
-
-already_AddRefed<MediaDataDecoder>
-WMFDecoderModule::CreateVideoDecoder(const VideoInfo& aConfig,
-                                     layers::LayersBackend aLayersBackend,
-                                     layers::ImageContainer* aImageContainer,
-                                     FlushableMediaTaskQueue* aVideoTaskQueue,
-                                     MediaDataDecoderCallback* aCallback)
-{
-  nsRefPtr<MediaDataDecoder> decoder =
-    new WMFMediaDataDecoder(new WMFVideoMFTManager(aConfig,
-                                                   aLayersBackend,
-                                                   aImageContainer,
-                                                   sDXVAEnabled && ShouldUseDXVA(aConfig)),
-                            aVideoTaskQueue,
-                            aCallback);
-  return decoder.forget();
-}
-
-already_AddRefed<MediaDataDecoder>
-WMFDecoderModule::CreateAudioDecoder(const AudioInfo& aConfig,
-                                     FlushableMediaTaskQueue* aAudioTaskQueue,
-                                     MediaDataDecoderCallback* aCallback)
-{
-  nsRefPtr<MediaDataDecoder> decoder =
-    new WMFMediaDataDecoder(new WMFAudioMFTManager(aConfig),
-                            aAudioTaskQueue,
-                            aCallback);
-  return decoder.forget();
-}
-
-bool
-WMFDecoderModule::ShouldUseDXVA(const VideoInfo& aConfig) const
-{
-  static bool isAMD = false;
-  static bool initialized = false;
-  if (!initialized) {
-    nsCOMPtr<nsIGfxInfo> gfxInfo = do_GetService("@mozilla.org/gfx/info;1");
-    nsAutoString vendor;
-    gfxInfo->GetAdapterVendorID(vendor);
-    isAMD = vendor.Equals(widget::GfxDriverInfo::GetDeviceVendor(widget::VendorAMD), nsCaseInsensitiveStringComparator()) ||
-            vendor.Equals(widget::GfxDriverInfo::GetDeviceVendor(widget::VendorATI), nsCaseInsensitiveStringComparator());
-    initialized = true;
-  }
-  if (!isAMD) {
-    return true;
-  }
-  // Don't use DXVA for 4k videos or above, since it seems to perform poorly.
-  return aConfig.mDisplay.width <= 1920 && aConfig.mDisplay.height <= 1200;
-}
-
-bool
-WMFDecoderModule::SupportsSharedDecoders(const VideoInfo& aConfig) const
-{
-  // If DXVA is enabled, but we're not going to use it for this specific config, then
-  // we can't use the shared decoder.
-  return !sDXVAEnabled || ShouldUseDXVA(aConfig);
-}
-
-bool
-WMFDecoderModule::SupportsMimeType(const nsACString& aMimeType)
-{
-  return aMimeType.EqualsLiteral("video/mp4") ||
-         aMimeType.EqualsLiteral("video/avc") ||
-         aMimeType.EqualsLiteral("video/webm; codecs=vp8") ||
-         aMimeType.EqualsLiteral("video/webm; codecs=vp9") ||
-         aMimeType.EqualsLiteral("audio/mp4a-latm") ||
-         aMimeType.EqualsLiteral("audio/mpeg");
-}
-
-PlatformDecoderModule::ConversionRequired
-WMFDecoderModule::DecoderNeedsConversion(const TrackInfo& aConfig) const
-{
-  if (aConfig.IsVideo() &&
-      (aConfig.mMimeType.EqualsLiteral("video/avc") ||
-       aConfig.mMimeType.EqualsLiteral("video/mp4"))) {
-    return kNeedAnnexB;
-  } else {
-    return kNeedNone;
-  }
-}
-
-static bool
-ClassesRootRegKeyExists(const nsAString& aRegKeyPath)
-{
-  nsresult rv;
-
-  nsCOMPtr<nsIWindowsRegKey> regKey =
-    do_CreateInstance("@mozilla.org/windows-registry-key;1", &rv);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return false;
-  }
-
-  rv = regKey->Open(nsIWindowsRegKey::ROOT_KEY_CLASSES_ROOT,
-                    aRegKeyPath,
-                    nsIWindowsRegKey::ACCESS_READ);
-  if (NS_FAILED(rv)) {
-    return false;
-  }
-
-  regKey->Close();
-
-  return true;
-}
-
-/* static */ bool
-WMFDecoderModule::HasH264()
-{
-  // CLSID_CMSH264DecoderMFT
-  return ClassesRootRegKeyExists(
-    NS_LITERAL_STRING("CLSID\\{32D186A7-218F-4C75-8876-DD77273A8999}"));
-}
-
-/* static */ bool
-WMFDecoderModule::HasAAC()
-{
-  // CLSID_CMSAACDecMFT
-  return ClassesRootRegKeyExists(
-    NS_LITERAL_STRING("CLSID\\{62CE7E72-4C71-4D20-B15D-452831A87D9D}"));
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wmf/WMFDecoderModule.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wmf/WMFDecoderModule.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wmf/WMFDecoderModule.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wmf/WMFDecoderModule.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-/* -*- 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(WMFPlatformDecoderModule_h_)
-#define WMFPlatformDecoderModule_h_
-
-#include "PlatformDecoderModule.h"
-
-namespace mozilla {
-
-class WMFDecoderModule : public PlatformDecoderModule {
-public:
-  WMFDecoderModule();
-  virtual ~WMFDecoderModule();
-
-  // Initializes the module, loads required dynamic libraries, etc.
-  virtual nsresult Startup() override;
-
-  virtual already_AddRefed<MediaDataDecoder>
-  CreateVideoDecoder(const VideoInfo& aConfig,
-                     layers::LayersBackend aLayersBackend,
-                     layers::ImageContainer* aImageContainer,
-                     FlushableMediaTaskQueue* aVideoTaskQueue,
-                     MediaDataDecoderCallback* aCallback) override;
-
-  virtual already_AddRefed<MediaDataDecoder>
-  CreateAudioDecoder(const AudioInfo& aConfig,
-                     FlushableMediaTaskQueue* aAudioTaskQueue,
-                     MediaDataDecoderCallback* aCallback) override;
-
-  bool SupportsMimeType(const nsACString& aMimeType) override;
-
-  virtual void DisableHardwareAcceleration() override
-  {
-    sDXVAEnabled = false;
-  }
-
-  virtual bool SupportsSharedDecoders(const VideoInfo& aConfig) const override;
-
-  virtual ConversionRequired
-  DecoderNeedsConversion(const TrackInfo& aConfig) const override;
-
-  // Accessors that report whether we have the required MFTs available
-  // on the system to play various codecs. Windows Vista doesn't have the
-  // H.264/AAC decoders if the "Platform Update Supplement for Windows Vista"
-  // is not installed.
-  static bool HasAAC();
-  static bool HasH264();
-
-  // Called on main thread.
-  static void Init();
-private:
-  bool ShouldUseDXVA(const VideoInfo& aConfig) const;
-
-  static bool sIsWMFEnabled;
-  static bool sDXVAEnabled;
-};
-
-} // namespace mozilla
-
-#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wmf/WMFMediaDataDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wmf/WMFMediaDataDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wmf/WMFMediaDataDecoder.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wmf/WMFMediaDataDecoder.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,199 +0,0 @@
-/* -*- 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 "WMFMediaDataDecoder.h"
-#include "VideoUtils.h"
-#include "WMFUtils.h"
-#include "nsTArray.h"
-
-#include "prlog.h"
-
-#ifdef PR_LOGGING
-PRLogModuleInfo* GetDemuxerLog();
-#define LOG(...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__))
-#else
-#define LOG(...)
-#endif
-
-
-namespace mozilla {
-
-WMFMediaDataDecoder::WMFMediaDataDecoder(MFTManager* aMFTManager,
-                                         FlushableMediaTaskQueue* aTaskQueue,
-                                         MediaDataDecoderCallback* aCallback)
-  : mTaskQueue(aTaskQueue)
-  , mCallback(aCallback)
-  , mMFTManager(aMFTManager)
-  , mMonitor("WMFMediaDataDecoder")
-  , mIsFlushing(false)
-  , mIsShutDown(false)
-{
-}
-
-WMFMediaDataDecoder::~WMFMediaDataDecoder()
-{
-}
-
-nsresult
-WMFMediaDataDecoder::Init()
-{
-  MOZ_ASSERT(!mDecoder);
-  MOZ_ASSERT(!mIsShutDown);
-
-  mDecoder = mMFTManager->Init();
-  NS_ENSURE_TRUE(mDecoder, NS_ERROR_FAILURE);
-
-  return NS_OK;
-}
-
-nsresult
-WMFMediaDataDecoder::Shutdown()
-{
-  MOZ_DIAGNOSTIC_ASSERT(!mIsShutDown);
-
-  if (mTaskQueue) {
-    mTaskQueue->Dispatch(
-      NS_NewRunnableMethod(this, &WMFMediaDataDecoder::ProcessShutdown));
-  } else {
-    ProcessShutdown();
-  }
-  mIsShutDown = true;
-  return NS_OK;
-}
-
-void
-WMFMediaDataDecoder::ProcessShutdown()
-{
-  if (mMFTManager) {
-    mMFTManager->Shutdown();
-    mMFTManager = nullptr;
-  }
-  mDecoder = nullptr;
-}
-
-// Inserts data into the decoder's pipeline.
-nsresult
-WMFMediaDataDecoder::Input(MediaRawData* aSample)
-{
-  MOZ_ASSERT(mCallback->OnReaderTaskQueue());
-  MOZ_DIAGNOSTIC_ASSERT(!mIsShutDown);
-
-  nsCOMPtr<nsIRunnable> runnable =
-    NS_NewRunnableMethodWithArg<nsRefPtr<MediaRawData>>(
-      this,
-      &WMFMediaDataDecoder::ProcessDecode,
-      nsRefPtr<MediaRawData>(aSample));
-  mTaskQueue->Dispatch(runnable.forget());
-  return NS_OK;
-}
-
-void
-WMFMediaDataDecoder::ProcessDecode(MediaRawData* aSample)
-{
-  {
-    MonitorAutoLock mon(mMonitor);
-    if (mIsFlushing) {
-      // Skip sample, to be released by runnable.
-      return;
-    }
-  }
-
-  HRESULT hr = mMFTManager->Input(aSample);
-  if (FAILED(hr)) {
-    NS_WARNING("MFTManager rejected sample");
-    mCallback->Error();
-    return;
-  }
-
-  mLastStreamOffset = aSample->mOffset;
-
-  ProcessOutput();
-}
-
-void
-WMFMediaDataDecoder::ProcessOutput()
-{
-  nsRefPtr<MediaData> output;
-  HRESULT hr = S_OK;
-  while (SUCCEEDED(hr = mMFTManager->Output(mLastStreamOffset, output)) &&
-         output) {
-    mCallback->Output(output);
-  }
-  if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) {
-    if (mTaskQueue->IsEmpty()) {
-      mCallback->InputExhausted();
-    }
-  } else if (FAILED(hr)) {
-    NS_WARNING("WMFMediaDataDecoder failed to output data");
-    mCallback->Error();
-  }
-}
-
-void
-WMFMediaDataDecoder::ProcessFlush()
-{
-  if (mDecoder) {
-    mDecoder->Flush();
-  }
-  MonitorAutoLock mon(mMonitor);
-  mIsFlushing = false;
-  mon.NotifyAll();
-}
-
-nsresult
-WMFMediaDataDecoder::Flush()
-{
-  MOZ_ASSERT(mCallback->OnReaderTaskQueue());
-  MOZ_DIAGNOSTIC_ASSERT(!mIsShutDown);
-
-  nsCOMPtr<nsIRunnable> runnable =
-    NS_NewRunnableMethod(this, &WMFMediaDataDecoder::ProcessFlush);
-  MonitorAutoLock mon(mMonitor);
-  mIsFlushing = true;
-  mTaskQueue->Dispatch(runnable.forget());
-  while (mIsFlushing) {
-    mon.Wait();
-  }
-  return NS_OK;
-}
-
-void
-WMFMediaDataDecoder::ProcessDrain()
-{
-  bool isFlushing;
-  {
-    MonitorAutoLock mon(mMonitor);
-    isFlushing = mIsFlushing;
-  }
-  if (!isFlushing && mDecoder) {
-    // Order the decoder to drain...
-    if (FAILED(mDecoder->SendMFTMessage(MFT_MESSAGE_COMMAND_DRAIN, 0))) {
-      NS_WARNING("Failed to send DRAIN command to MFT");
-    }
-    // Then extract all available output.
-    ProcessOutput();
-  }
-  mCallback->DrainComplete();
-}
-
-nsresult
-WMFMediaDataDecoder::Drain()
-{
-  MOZ_ASSERT(mCallback->OnReaderTaskQueue());
-  MOZ_DIAGNOSTIC_ASSERT(!mIsShutDown);
-
-  mTaskQueue->Dispatch(NS_NewRunnableMethod(this, &WMFMediaDataDecoder::ProcessDrain));
-  return NS_OK;
-}
-
-bool
-WMFMediaDataDecoder::IsHardwareAccelerated() const {
-  MOZ_ASSERT(!mIsShutDown);
-
-  return mMFTManager && mMFTManager->IsHardwareAccelerated();
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wmf/WMFMediaDataDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wmf/WMFMediaDataDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wmf/WMFMediaDataDecoder.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wmf/WMFMediaDataDecoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-/* -*- 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(WMFMediaDataDecoder_h_)
-#define WMFMediaDataDecoder_h_
-
-
-#include "WMF.h"
-#include "MP4Reader.h"
-#include "MFTDecoder.h"
-#include "mozilla/RefPtr.h"
-
-namespace mozilla {
-
-// Encapsulates the initialization of the MFTDecoder appropriate for decoding
-// a given stream, and the process of converting the IMFSample produced
-// by the MFT into a MediaData object.
-class MFTManager {
-public:
-  virtual ~MFTManager() {}
-
-  // Creates an initializs the MFTDecoder.
-  // Returns nullptr on failure.
-  virtual TemporaryRef<MFTDecoder> Init() = 0;
-
-  // Submit a compressed sample for decoding.
-  // This should forward to the MFTDecoder after performing
-  // any required sample formatting.
-  virtual HRESULT Input(MediaRawData* aSample) = 0;
-
-  // Produces decoded output, if possible. Blocks until output can be produced,
-  // or until no more is able to be produced.
-  // Returns S_OK on success, or MF_E_TRANSFORM_NEED_MORE_INPUT if there's not
-  // enough data to produce more output. If this returns a failure code other
-  // than MF_E_TRANSFORM_NEED_MORE_INPUT, an error will be reported to the
-  // MP4Reader.
-  virtual HRESULT Output(int64_t aStreamOffset,
-                         nsRefPtr<MediaData>& aOutput) = 0;
-
-  // Destroys all resources.
-  virtual void Shutdown() = 0;
-
-  virtual bool IsHardwareAccelerated() const { return false; }
-
-};
-
-// Decodes audio and video using Windows Media Foundation. Samples are decoded
-// using the MFTDecoder created by the MFTManager. This class implements
-// the higher-level logic that drives mapping the MFT to the async
-// MediaDataDecoder interface. The specifics of decoding the exact stream
-// type are handled by MFTManager and the MFTDecoder it creates.
-class WMFMediaDataDecoder : public MediaDataDecoder {
-public:
-  WMFMediaDataDecoder(MFTManager* aOutputSource,
-                      FlushableMediaTaskQueue* aAudioTaskQueue,
-                      MediaDataDecoderCallback* aCallback);
-  ~WMFMediaDataDecoder();
-
-  virtual nsresult Init() override;
-
-  virtual nsresult Input(MediaRawData* aSample);
-
-  virtual nsresult Flush() override;
-
-  virtual nsresult Drain() override;
-
-  virtual nsresult Shutdown() override;
-
-  virtual bool IsHardwareAccelerated() const override;
-
-private:
-
-  // Called on the task queue. Inserts the sample into the decoder, and
-  // extracts output if available.
-  void ProcessDecode(MediaRawData* aSample);
-
-  // Called on the task queue. Extracts output if available, and delivers
-  // it to the reader. Called after ProcessDecode() and ProcessDrain().
-  void ProcessOutput();
-
-  // Called on the task queue. Orders the MFT to flush.  There is no output to
-  // extract.
-  void ProcessFlush();
-
-  // Called on the task queue. Orders the MFT to drain, and then extracts
-  // all available output.
-  void ProcessDrain();
-
-  void ProcessShutdown();
-
-  RefPtr<FlushableMediaTaskQueue> mTaskQueue;
-  MediaDataDecoderCallback* mCallback;
-
-  RefPtr<MFTDecoder> mDecoder;
-  nsAutoPtr<MFTManager> mMFTManager;
-
-  // The last offset into the media resource that was passed into Input().
-  // This is used to approximate the decoder's position in the media resource.
-  int64_t mLastStreamOffset;
-
-  // For access to and waiting on mIsFlushing
-  Monitor mMonitor;
-  // Set on reader/decode thread calling Flush() to indicate that output is
-  // not required and so input samples on mTaskQueue need not be processed.
-  // Cleared on mTaskQueue.
-  bool mIsFlushing;
-
-  bool mIsShutDown;
-};
-
-} // namespace mozilla
-
-#endif // WMFMediaDataDecoder_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wmf/WMFVideoMFTManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wmf/WMFVideoMFTManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wmf/WMFVideoMFTManager.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wmf/WMFVideoMFTManager.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,544 +0,0 @@
-/* -*- 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 <algorithm>
-#include "WMFVideoMFTManager.h"
-#include "MediaDecoderReader.h"
-#include "WMFUtils.h"
-#include "ImageContainer.h"
-#include "VideoUtils.h"
-#include "DXVA2Manager.h"
-#include "nsThreadUtils.h"
-#include "Layers.h"
-#include "mozilla/layers/LayersTypes.h"
-#include "MediaInfo.h"
-#include "prlog.h"
-#include "gfx2DGlue.h"
-#include "gfxWindowsPlatform.h"
-#include "IMFYCbCrImage.h"
-#include "mozilla/WindowsVersion.h"
-
-#ifdef PR_LOGGING
-PRLogModuleInfo* GetDemuxerLog();
-#define LOG(...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__))
-#else
-#define LOG(...)
-#endif
-
-using mozilla::layers::Image;
-using mozilla::layers::IMFYCbCrImage;
-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(
-                            const VideoInfo& aConfig,
-                            mozilla::layers::LayersBackend aLayersBackend,
-                            mozilla::layers::ImageContainer* aImageContainer,
-                            bool aDXVAEnabled)
-  : mImageContainer(aImageContainer)
-  , mDXVAEnabled(aDXVAEnabled)
-  , mLayersBackend(aLayersBackend)
-  // mVideoStride, mVideoWidth, mVideoHeight, mUseHwAccel are initialized in
-  // Init().
-{
-  MOZ_COUNT_CTOR(WMFVideoMFTManager);
-
-  // Need additional checks/params to check vp8/vp9
-  if (aConfig.mMimeType.EqualsLiteral("video/mp4") ||
-      aConfig.mMimeType.EqualsLiteral("video/avc")) {
-    mStreamType = H264;
-  } else if (aConfig.mMimeType.EqualsLiteral("video/webm; codecs=vp8")) {
-    mStreamType = VP8;
-  } else if (aConfig.mMimeType.EqualsLiteral("video/webm; codecs=vp9")) {
-    mStreamType = VP9;
-  } else {
-    mStreamType = Unknown;
-  }
-}
-
-WMFVideoMFTManager::~WMFVideoMFTManager()
-{
-  MOZ_COUNT_DTOR(WMFVideoMFTManager);
-  // Ensure DXVA/D3D9 related objects are released on the main thread.
-  if (mDXVA2Manager) {
-    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:
-  CreateDXVAManagerEvent(LayersBackend aBackend)
-    : mBackend(aBackend)
-  {}
-
-  NS_IMETHOD Run() {
-    NS_ASSERTION(NS_IsMainThread(), "Must be on main thread.");
-    if (mBackend == LayersBackend::LAYERS_D3D11 &&
-        IsWin8OrLater()) {
-      mDXVA2Manager = DXVA2Manager::CreateD3D11DXVA();
-    } else {
-      mDXVA2Manager = DXVA2Manager::CreateD3D9DXVA();
-    }
-    return NS_OK;
-  }
-  nsAutoPtr<DXVA2Manager> mDXVA2Manager;
-  LayersBackend mBackend;
-};
-
-bool
-WMFVideoMFTManager::InitializeDXVA(bool aForceD3D9)
-{
-  MOZ_ASSERT(!mDXVA2Manager);
-
-  // If we use DXVA but aren't running with a D3D layer manager then the
-  // readback of decoded video frames from GPU to CPU memory grinds painting
-  // to a halt, and makes playback performance *worse*.
-  if (!mDXVAEnabled ||
-      (mLayersBackend != LayersBackend::LAYERS_D3D9 &&
-       mLayersBackend != LayersBackend::LAYERS_D3D11)) {
-    return false;
-  }
-
-  // The DXVA manager must be created on the main thread.
-  nsRefPtr<CreateDXVAManagerEvent> event = 
-    new CreateDXVAManagerEvent(aForceD3D9 ? LayersBackend::LAYERS_D3D9 : mLayersBackend);
-
-  if (NS_IsMainThread()) {
-    event->Run();
-  } else {
-    NS_DispatchToMainThread(event, NS_DISPATCH_SYNC);
-  }
-  mDXVA2Manager = event->mDXVA2Manager;
-
-  return mDXVA2Manager != nullptr;
-}
-
-TemporaryRef<MFTDecoder>
-WMFVideoMFTManager::Init()
-{
-  RefPtr<MFTDecoder> decoder = InitInternal(/* aForceD3D9 = */ false);
-
-  // If initialization failed with d3d11 DXVA then try falling back
-  // to d3d9.
-  if (!decoder && mDXVA2Manager && mDXVA2Manager->IsD3D11()) {
-    mDXVA2Manager = nullptr;
-    decoder = InitInternal(true);
-  }
-
-  return decoder.forget();
-}
-
-TemporaryRef<MFTDecoder>
-WMFVideoMFTManager::InitInternal(bool aForceD3D9)
-{
-  mUseHwAccel = false; // default value; changed if D3D setup succeeds.
-  bool useDxva = InitializeDXVA(aForceD3D9);
-
-  RefPtr<MFTDecoder> decoder(new MFTDecoder());
-
-  HRESULT hr = decoder->Create(GetMFTGUID());
-  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
-
-  if (useDxva) {
-    RefPtr<IMFAttributes> attr(decoder->GetAttributes());
-
-    UINT32 aware = 0;
-    if (attr) {
-      attr->GetUINT32(MF_SA_D3D_AWARE, &aware);
-    }
-    if (aware) {
-      // TODO: Test if I need this anywhere... Maybe on Vista?
-      //hr = attr->SetUINT32(CODECAPI_AVDecVideoAcceleration_H264, TRUE);
-      //NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-      MOZ_ASSERT(mDXVA2Manager);
-      ULONG_PTR manager = ULONG_PTR(mDXVA2Manager->GetDXVADeviceManager());
-      hr = decoder->SendMFTMessage(MFT_MESSAGE_SET_D3D_MANAGER, manager);
-      if (SUCCEEDED(hr)) {
-        mUseHwAccel = true;
-      }
-    }
-  }
-
-  // Setup the input/output media types.
-  RefPtr<IMFMediaType> inputType;
-  hr = wmf::MFCreateMediaType(byRef(inputType));
-  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
-
-  hr = inputType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Video);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
-
-  hr = inputType->SetGUID(MF_MT_SUBTYPE, GetMediaSubtypeGUID());
-  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
-
-  hr = inputType->SetUINT32(MF_MT_INTERLACE_MODE, MFVideoInterlace_MixedInterlaceOrProgressive);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
-
-  RefPtr<IMFMediaType> outputType;
-  hr = wmf::MFCreateMediaType(byRef(outputType));
-  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
-
-  hr = outputType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Video);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
-
-  GUID outputSubType = mUseHwAccel ? MFVideoFormat_NV12 : MFVideoFormat_YV12;
-  hr = outputType->SetGUID(MF_MT_SUBTYPE, outputSubType);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
-
-  hr = decoder->SetMediaTypes(inputType, outputType);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
-
-  mDecoder = decoder;
-  LOG("Video Decoder initialized, Using DXVA: %s", (mUseHwAccel ? "Yes" : "No"));
-
-  // Just in case ConfigureVideoFrameGeometry() does not set these
-  mVideoInfo = VideoInfo();
-  mVideoStride = 0;
-  mVideoWidth = 0;
-  mVideoHeight = 0;
-  mPictureRegion.SetEmpty();
-
-  return decoder.forget();
-}
-
-HRESULT
-WMFVideoMFTManager::Input(MediaRawData* aSample)
-{
-  if (!mDecoder) {
-    // This can happen during shutdown.
-    return E_FAIL;
-  }
-  // Forward sample data to the decoder.
-  return mDecoder->Input(aSample->mData,
-                         uint32_t(aSample->mSize),
-                         aSample->mTime);
-}
-
-HRESULT
-WMFVideoMFTManager::ConfigureVideoFrameGeometry()
-{
-  RefPtr<IMFMediaType> mediaType;
-  HRESULT hr = mDecoder->GetOutputMediaType(mediaType);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  // Verify that the video subtype is what we expect it to be.
-  // When using hardware acceleration/DXVA2 the video format should
-  // be NV12, which is DXVA2's preferred format. For software decoding
-  // we use YV12, as that's easier for us to stick into our rendering
-  // pipeline than NV12. NV12 has interleaved UV samples, whereas YV12
-  // is a planar format.
-  GUID videoFormat;
-  hr = mediaType->GetGUID(MF_MT_SUBTYPE, &videoFormat);
-  NS_ENSURE_TRUE(videoFormat == MFVideoFormat_NV12 || !mUseHwAccel, E_FAIL);
-  NS_ENSURE_TRUE(videoFormat == MFVideoFormat_YV12 || mUseHwAccel, E_FAIL);
-
-  nsIntRect pictureRegion;
-  hr = GetPictureRegion(mediaType, pictureRegion);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  UINT32 width = 0, height = 0;
-  hr = MFGetAttributeSize(mediaType, MF_MT_FRAME_SIZE, &width, &height);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  uint32_t aspectNum = 0, aspectDenom = 0;
-  hr = MFGetAttributeRatio(mediaType,
-                           MF_MT_PIXEL_ASPECT_RATIO,
-                           &aspectNum,
-                           &aspectDenom);
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  // Calculate and validate the picture region and frame dimensions after
-  // scaling by the pixel aspect ratio.
-  nsIntSize frameSize = nsIntSize(width, height);
-  nsIntSize displaySize = nsIntSize(pictureRegion.width, pictureRegion.height);
-  ScaleDisplayByAspectRatio(displaySize, float(aspectNum) / float(aspectDenom));
-  if (!IsValidVideoRegion(frameSize, pictureRegion, displaySize)) {
-    // Video track's frame sizes will overflow. Ignore the video track.
-    return E_FAIL;
-  }
-
-  if (mDXVA2Manager) {
-    hr = mDXVA2Manager->ConfigureForSize(width, height);
-    NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-  }
-
-  // Success! Save state.
-  mVideoInfo.mDisplay = displaySize;
-  GetDefaultStride(mediaType, &mVideoStride);
-  mVideoWidth = width;
-  mVideoHeight = height;
-  mPictureRegion = pictureRegion;
-
-  LOG("WMFVideoMFTManager frame geometry frame=(%u,%u) stride=%u picture=(%d, %d, %d, %d) display=(%d,%d) PAR=%d:%d",
-      width, height,
-      mVideoStride,
-      mPictureRegion.x, mPictureRegion.y, mPictureRegion.width, mPictureRegion.height,
-      displaySize.width, displaySize.height,
-      aspectNum, aspectDenom);
-
-  return S_OK;
-}
-
-HRESULT
-WMFVideoMFTManager::CreateBasicVideoFrame(IMFSample* aSample,
-                                          int64_t aStreamOffset,
-                                          VideoData** aOutVideoData)
-{
-  NS_ENSURE_TRUE(aSample, E_POINTER);
-  NS_ENSURE_TRUE(aOutVideoData, E_POINTER);
-
-  *aOutVideoData = nullptr;
-
-  HRESULT hr;
-  RefPtr<IMFMediaBuffer> buffer;
-
-  // Must convert to contiguous buffer to use IMD2DBuffer interface.
-  hr = aSample->ConvertToContiguousBuffer(byRef(buffer));
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-
-  // Try and use the IMF2DBuffer interface if available, otherwise fallback
-  // to the IMFMediaBuffer interface. Apparently IMF2DBuffer is more efficient,
-  // but only some systems (Windows 8?) support it.
-  BYTE* data = nullptr;
-  LONG stride = 0;
-  RefPtr<IMF2DBuffer> twoDBuffer;
-  hr = buffer->QueryInterface(static_cast<IMF2DBuffer**>(byRef(twoDBuffer)));
-  if (SUCCEEDED(hr)) {
-    hr = twoDBuffer->Lock2D(&data, &stride);
-    NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-  } else {
-    hr = buffer->Lock(&data, nullptr, nullptr);
-    NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-    stride = mVideoStride;
-  }
-
-  // YV12, planar format: [YYYY....][VVVV....][UUUU....]
-  // i.e., Y, then V, then U.
-  VideoData::YCbCrBuffer b;
-
-  // Y (Y') plane
-  b.mPlanes[0].mData = data;
-  b.mPlanes[0].mStride = stride;
-  b.mPlanes[0].mHeight = mVideoHeight;
-  b.mPlanes[0].mWidth = mVideoWidth;
-  b.mPlanes[0].mOffset = 0;
-  b.mPlanes[0].mSkip = 0;
-
-  // The V and U planes are stored 16-row-aligned, so we need to add padding
-  // to the row heights to ensure the Y'CbCr planes are referenced properly.
-  uint32_t padding = 0;
-  if (mVideoHeight % 16 != 0) {
-    padding = 16 - (mVideoHeight % 16);
-  }
-  uint32_t y_size = stride * (mVideoHeight + padding);
-  uint32_t v_size = stride * (mVideoHeight + padding) / 4;
-  uint32_t halfStride = (stride + 1) / 2;
-  uint32_t halfHeight = (mVideoHeight + 1) / 2;
-  uint32_t halfWidth = (mVideoWidth + 1) / 2;
-
-  // U plane (Cb)
-  b.mPlanes[1].mData = data + y_size + v_size;
-  b.mPlanes[1].mStride = halfStride;
-  b.mPlanes[1].mHeight = halfHeight;
-  b.mPlanes[1].mWidth = halfWidth;
-  b.mPlanes[1].mOffset = 0;
-  b.mPlanes[1].mSkip = 0;
-
-  // V plane (Cr)
-  b.mPlanes[2].mData = data + y_size;
-  b.mPlanes[2].mStride = halfStride;
-  b.mPlanes[2].mHeight = halfHeight;
-  b.mPlanes[2].mWidth = halfWidth;
-  b.mPlanes[2].mOffset = 0;
-  b.mPlanes[2].mSkip = 0;
-
-  Microseconds pts = GetSampleTime(aSample);
-  Microseconds duration = GetSampleDuration(aSample);
-
-  nsRefPtr<layers::PlanarYCbCrImage> image =
-    new IMFYCbCrImage(buffer, twoDBuffer);
-
-  VideoData::SetVideoDataToImage(image,
-                                 mVideoInfo,
-                                 b,
-                                 mPictureRegion,
-                                 false);
-
-  nsRefPtr<VideoData> v =
-    VideoData::CreateFromImage(mVideoInfo,
-                               mImageContainer,
-                               aStreamOffset,
-                               std::max(0LL, pts),
-                               duration,
-                               image.forget(),
-                               false,
-                               -1,
-                               mPictureRegion);
-
-  v.forget(aOutVideoData);
-  return S_OK;
-}
-
-HRESULT
-WMFVideoMFTManager::CreateD3DVideoFrame(IMFSample* aSample,
-                                        int64_t aStreamOffset,
-                                        VideoData** aOutVideoData)
-{
-  NS_ENSURE_TRUE(aSample, E_POINTER);
-  NS_ENSURE_TRUE(aOutVideoData, E_POINTER);
-  NS_ENSURE_TRUE(mDXVA2Manager, E_ABORT);
-  NS_ENSURE_TRUE(mUseHwAccel, E_ABORT);
-
-  *aOutVideoData = nullptr;
-  HRESULT hr;
-
-  nsRefPtr<Image> image;
-  hr = mDXVA2Manager->CopyToImage(aSample,
-                                  mPictureRegion,
-                                  mImageContainer,
-                                  getter_AddRefs(image));
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-  NS_ENSURE_TRUE(image, E_FAIL);
-
-  Microseconds pts = GetSampleTime(aSample);
-  Microseconds duration = GetSampleDuration(aSample);
-  nsRefPtr<VideoData> v = VideoData::CreateFromImage(mVideoInfo,
-                                                     mImageContainer,
-                                                     aStreamOffset,
-                                                     pts,
-                                                     duration,
-                                                     image.forget(),
-                                                     false,
-                                                     -1,
-                                                     mPictureRegion);
-
-  NS_ENSURE_TRUE(v, E_FAIL);
-  v.forget(aOutVideoData);
-
-  return S_OK;
-}
-
-// Blocks until decoded sample is produced by the deoder.
-HRESULT
-WMFVideoMFTManager::Output(int64_t aStreamOffset,
-                           nsRefPtr<MediaData>& aOutData)
-{
-  RefPtr<IMFSample> sample;
-  HRESULT hr;
-  aOutData = nullptr;
-
-  // Loop until we decode a sample, or an unexpected error that we can't
-  // handle occurs.
-  while (true) {
-    hr = mDecoder->Output(&sample);
-    if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) {
-      return MF_E_TRANSFORM_NEED_MORE_INPUT;
-    }
-    if (hr == MF_E_TRANSFORM_STREAM_CHANGE) {
-      // Video stream output type change. Probably a geometric apperature
-      // change. Reconfigure the video geometry, so that we output the
-      // correct size frames.
-      MOZ_ASSERT(!sample);
-      hr = ConfigureVideoFrameGeometry();
-      NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-      // Loop back and try decoding again...
-      continue;
-    }
-    if (SUCCEEDED(hr)) {
-      break;
-    }
-    // Else unexpected error, assert, and bail.
-    NS_WARNING("WMFVideoMFTManager::Output() unexpected error");
-    return E_FAIL;
-  }
-
-  nsRefPtr<VideoData> frame;
-  if (mUseHwAccel) {
-    hr = CreateD3DVideoFrame(sample, aStreamOffset, getter_AddRefs(frame));
-  } else {
-    hr = CreateBasicVideoFrame(sample, aStreamOffset, getter_AddRefs(frame));
-  }
-  // Frame should be non null only when we succeeded.
-  MOZ_ASSERT((frame != nullptr) == SUCCEEDED(hr));
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
-  NS_ENSURE_TRUE(frame, E_FAIL);
-
-  aOutData = frame;
-
-  return S_OK;
-}
-
-void
-WMFVideoMFTManager::Shutdown()
-{
-  mDecoder = nullptr;
-  DeleteOnMainThread(mDXVA2Manager);
-}
-
-bool
-WMFVideoMFTManager::IsHardwareAccelerated() const
-{
-  return mDecoder && mUseHwAccel;
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wmf/WMFVideoMFTManager.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wmf/WMFVideoMFTManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wmf/WMFVideoMFTManager.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wmf/WMFVideoMFTManager.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-/* -*- 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(WMFVideoMFTManager_h_)
-#define WMFVideoMFTManager_h_
-
-#include "WMF.h"
-#include "MP4Reader.h"
-#include "MFTDecoder.h"
-#include "nsRect.h"
-#include "WMFMediaDataDecoder.h"
-#include "mozilla/RefPtr.h"
-
-namespace mozilla {
-
-class DXVA2Manager;
-
-class WMFVideoMFTManager : public MFTManager {
-public:
-  WMFVideoMFTManager(const VideoInfo& aConfig,
-                     mozilla::layers::LayersBackend aLayersBackend,
-                     mozilla::layers::ImageContainer* aImageContainer,
-                     bool aDXVAEnabled);
-  ~WMFVideoMFTManager();
-
-  virtual TemporaryRef<MFTDecoder> Init() override;
-
-  virtual HRESULT Input(MediaRawData* aSample) override;
-
-  virtual HRESULT Output(int64_t aStreamOffset,
-                         nsRefPtr<MediaData>& aOutput) override;
-
-  virtual void Shutdown() override;
-
-  virtual bool IsHardwareAccelerated() const override;
-
-private:
-
-  bool InitializeDXVA(bool aForceD3D9);
-
-  TemporaryRef<MFTDecoder> InitInternal(bool aForceD3D9);
-
-  HRESULT ConfigureVideoFrameGeometry();
-
-  HRESULT CreateBasicVideoFrame(IMFSample* aSample,
-                                int64_t aStreamOffset,
-                                VideoData** aOutVideoData);
-
-  HRESULT CreateD3DVideoFrame(IMFSample* aSample,
-                              int64_t aStreamOffset,
-                              VideoData** aOutVideoData);
-
-  // Video frame geometry.
-  VideoInfo mVideoInfo;
-  uint32_t mVideoStride;
-  uint32_t mVideoWidth;
-  uint32_t mVideoHeight;
-  nsIntRect mPictureRegion;
-
-  RefPtr<MFTDecoder> mDecoder;
-  RefPtr<layers::ImageContainer> mImageContainer;
-  nsAutoPtr<DXVA2Manager> mDXVA2Manager;
-
-  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
-
-#endif // WMFVideoMFTManager_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wrappers/H264Converter.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wrappers/H264Converter.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wrappers/H264Converter.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wrappers/H264Converter.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-/* -*- 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 "H264Converter.h"
-#include "ImageContainer.h"
-#include "MediaTaskQueue.h"
-#include "MediaInfo.h"
-#include "mp4_demuxer/AnnexB.h"
-#include "mp4_demuxer/H264.h"
-
-namespace mozilla
-{
-
-H264Converter::H264Converter(PlatformDecoderModule* aPDM,
-                             const VideoInfo& aConfig,
-                             layers::LayersBackend aLayersBackend,
-                             layers::ImageContainer* aImageContainer,
-                             FlushableMediaTaskQueue* aVideoTaskQueue,
-                             MediaDataDecoderCallback* aCallback)
-  : mPDM(aPDM)
-  , mCurrentConfig(aConfig)
-  , mLayersBackend(aLayersBackend)
-  , mImageContainer(aImageContainer)
-  , mVideoTaskQueue(aVideoTaskQueue)
-  , mCallback(aCallback)
-  , mDecoder(nullptr)
-  , mNeedAVCC(aPDM->DecoderNeedsConversion(aConfig) == PlatformDecoderModule::kNeedAVCC)
-  , mLastError(NS_OK)
-{
-  CreateDecoder();
-}
-
-H264Converter::~H264Converter()
-{
-}
-
-nsresult
-H264Converter::Init()
-{
-  if (mDecoder) {
-    return mDecoder->Init();
-  }
-  return mLastError;
-}
-
-nsresult
-H264Converter::Input(MediaRawData* aSample)
-{
-  if (!mNeedAVCC) {
-    if (!mp4_demuxer::AnnexB::ConvertSampleToAnnexB(aSample)) {
-      return NS_ERROR_FAILURE;
-    }
-  } else {
-    if (!mp4_demuxer::AnnexB::ConvertSampleToAVCC(aSample)) {
-      return NS_ERROR_FAILURE;
-    }
-  }
-  nsresult rv;
-  if (!mDecoder) {
-    // It is not possible to create an AVCC H264 decoder without SPS.
-    // As such, creation will fail if the extra_data just extracted doesn't
-    // contain a SPS.
-    rv = CreateDecoderAndInit(aSample);
-    if (rv == NS_ERROR_NOT_INITIALIZED) {
-      // We are missing the required SPS to create the decoder.
-      // Ignore for the time being, the MediaRawData will be dropped.
-      return NS_OK;
-    }
-  } else {
-    rv = CheckForSPSChange(aSample);
-  }
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  aSample->mExtraData = mCurrentConfig.mExtraData;
-
-  return mDecoder->Input(aSample);
-}
-
-nsresult
-H264Converter::Flush()
-{
-  if (mDecoder) {
-    return mDecoder->Flush();
-  }
-  return mLastError;
-}
-
-nsresult
-H264Converter::Drain()
-{
-  if (mDecoder) {
-    return mDecoder->Drain();
-  }
-  return mLastError;
-}
-
-nsresult
-H264Converter::Shutdown()
-{
-  if (mDecoder) {
-    nsresult rv = mDecoder->Shutdown();
-    mDecoder = nullptr;
-    return rv;
-  }
-  return NS_OK;
-}
-
-bool
-H264Converter::IsHardwareAccelerated() const
-{
-  if (mDecoder) {
-    return mDecoder->IsHardwareAccelerated();
-  }
-  return MediaDataDecoder::IsHardwareAccelerated();
-}
-
-nsresult
-H264Converter::CreateDecoder()
-{
-  if (mNeedAVCC && !mp4_demuxer::AnnexB::HasSPS(mCurrentConfig.mExtraData)) {
-    // nothing found yet, will try again later
-    return NS_ERROR_NOT_INITIALIZED;
-  }
-  UpdateConfigFromExtraData(mCurrentConfig.mExtraData);
-
-  mDecoder = mPDM->CreateVideoDecoder(mCurrentConfig,
-                                      mLayersBackend,
-                                      mImageContainer,
-                                      mVideoTaskQueue,
-                                      mCallback);
-  if (!mDecoder) {
-    mLastError = NS_ERROR_FAILURE;
-    return NS_ERROR_FAILURE;
-  }
-  return NS_OK;
-}
-
-nsresult
-H264Converter::CreateDecoderAndInit(MediaRawData* aSample)
-{
-  nsRefPtr<MediaByteBuffer> extra_data =
-    mp4_demuxer::AnnexB::ExtractExtraData(aSample);
-  if (!mp4_demuxer::AnnexB::HasSPS(extra_data)) {
-    return NS_ERROR_NOT_INITIALIZED;
-  }
-  UpdateConfigFromExtraData(extra_data);
-
-  nsresult rv = CreateDecoder();
-  NS_ENSURE_SUCCESS(rv, rv);
-  return Init();
-}
-
-nsresult
-H264Converter::CheckForSPSChange(MediaRawData* aSample)
-{
-  nsRefPtr<MediaByteBuffer> extra_data =
-    mp4_demuxer::AnnexB::ExtractExtraData(aSample);
-  if (!mp4_demuxer::AnnexB::HasSPS(extra_data) ||
-      mp4_demuxer::AnnexB::CompareExtraData(extra_data,
-                                            mCurrentConfig.mExtraData)) {
-        return NS_OK;
-      }
-  if (!mNeedAVCC) {
-    UpdateConfigFromExtraData(extra_data);
-    mDecoder->ConfigurationChanged(mCurrentConfig);
-    return NS_OK;
-  }
-  // The SPS has changed, signal to flush the current decoder and create a
-  // new one.
-  mDecoder->Flush();
-  Shutdown();
-  return CreateDecoderAndInit(aSample);
-}
-
-void
-H264Converter::UpdateConfigFromExtraData(MediaByteBuffer* aExtraData)
-{
-  mp4_demuxer::SPSData spsdata;
-  if (mp4_demuxer::H264::DecodeSPSFromExtraData(aExtraData, spsdata) &&
-      spsdata.pic_width > 0 && spsdata.pic_height > 0) {
-    mp4_demuxer::H264::EnsureSPSIsSane(spsdata);
-    mCurrentConfig.mImage.width = spsdata.pic_width;
-    mCurrentConfig.mImage.height = spsdata.pic_height;
-    mCurrentConfig.mDisplay.width = spsdata.display_width;
-    mCurrentConfig.mDisplay.height = spsdata.display_height;
-  }
-  mCurrentConfig.mExtraData = aExtraData;
-}
-
-/* static */
-bool
-H264Converter::IsH264(const TrackInfo& aConfig)
-{
-  return aConfig.mMimeType.EqualsLiteral("video/avc") ||
-    aConfig.mMimeType.EqualsLiteral("video/mp4");
-}
-
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wrappers/H264Converter.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wrappers/H264Converter.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/fmp4/wrappers/H264Converter.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/fmp4/wrappers/H264Converter.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-/* -*- 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_H264Converter_h
-#define mozilla_H264Converter_h
-
-#include "PlatformDecoderModule.h"
-
-namespace mozilla {
-
-// H264Converter is a MediaDataDecoder wrapper used to ensure that
-// only AVCC or AnnexB is fed to the underlying MediaDataDecoder.
-// The H264Converter allows playback of content where the SPS NAL may not be
-// provided in the init segment (e.g. AVC3 or Annex B)
-// H264Converter will monitor the input data, and will delay creation of the
-// MediaDataDecoder until a SPS and PPS NALs have been extracted.
-
-class H264Converter : public MediaDataDecoder {
-public:
-
-  H264Converter(PlatformDecoderModule* aPDM,
-                const VideoInfo& aConfig,
-                layers::LayersBackend aLayersBackend,
-                layers::ImageContainer* aImageContainer,
-                FlushableMediaTaskQueue* aVideoTaskQueue,
-                MediaDataDecoderCallback* aCallback);
-  virtual ~H264Converter();
-
-  virtual nsresult Init() override;
-  virtual nsresult Input(MediaRawData* aSample) override;
-  virtual nsresult Flush() override;
-  virtual nsresult Drain() override;
-  virtual nsresult Shutdown() override;
-  virtual bool IsHardwareAccelerated() const override;
-
-  // Return true if mimetype is H.264.
-  static bool IsH264(const TrackInfo& aConfig);
-
-private:
-  // Will create the required MediaDataDecoder if need AVCC and we have a SPS NAL.
-  // Returns NS_ERROR_FAILURE if error is permanent and can't be recovered and
-  // will set mError accordingly.
-  nsresult CreateDecoder();
-  nsresult CreateDecoderAndInit(MediaRawData* aSample);
-  nsresult CheckForSPSChange(MediaRawData* aSample);
-  void UpdateConfigFromExtraData(MediaByteBuffer* aExtraData);
-
-  nsRefPtr<PlatformDecoderModule> mPDM;
-  VideoInfo mCurrentConfig;
-  layers::LayersBackend mLayersBackend;
-  nsRefPtr<layers::ImageContainer> mImageContainer;
-  nsRefPtr<FlushableMediaTaskQueue> mVideoTaskQueue;
-  MediaDataDecoderCallback* mCallback;
-  nsRefPtr<MediaDataDecoder> mDecoder;
-  bool mNeedAVCC;
-  nsresult mLastError;
-};
-
-} // namespace mozilla
-
-#endif // mozilla_H264Converter_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gmp/GMPAudioDecoderParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gmp/GMPAudioDecoderParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gmp/GMPAudioDecoderParent.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gmp/GMPAudioDecoderParent.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -9,7 +9,7 @@
 #include "mozilla/unused.h"
 #include "GMPMessageUtils.h"
 #include "nsThreadUtils.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 namespace mozilla {
 
@@ -17,15 +17,10 @@
 #undef LOG
 #endif
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetGMPLog();
 
-#define LOGD(msg) PR_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
-#define LOG(level, msg) PR_LOG(GetGMPLog(), (level), msg)
-#else
-#define LOGD(msg)
-#define LOG(level, msg)
-#endif
+#define LOGD(msg) MOZ_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
+#define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)
 
 namespace gmp {
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gmp/GMPChild.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gmp/GMPChild.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gmp/GMPChild.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gmp/GMPChild.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -45,14 +45,9 @@
 #undef LOG
 #undef LOGD
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetGMPLog();
-#define LOG(level, x, ...) PR_LOG(GetGMPLog(), (level), (x, ##__VA_ARGS__))
+#define LOG(level, x, ...) MOZ_LOG(GetGMPLog(), (level), (x, ##__VA_ARGS__))
 #define LOGD(x, ...) LOG(PR_LOG_DEBUG, "GMPChild[pid=%d] " x, (int)base::GetCurrentProcId(), ##__VA_ARGS__)
-#else
-#define LOG(level, x, ...)
-#define LOGD(x, ...)
-#endif
 
 namespace gmp {
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gmp/GMPContentParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gmp/GMPContentParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gmp/GMPContentParent.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gmp/GMPContentParent.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -11,7 +11,7 @@
 #include "GMPVideoDecoderParent.h"
 #include "GMPVideoEncoderParent.h"
 #include "mozIGeckoMediaPluginService.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 namespace mozilla {
 
@@ -19,15 +19,10 @@
 #undef LOG
 #endif
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetGMPLog();
 
-#define LOGD(msg) PR_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
-#define LOG(level, msg) PR_LOG(GetGMPLog(), (level), msg)
-#else
-#define LOGD(msg)
-#define LOG(level, msg)
-#endif
+#define LOGD(msg) MOZ_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
+#define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)
 
 #ifdef __CLASS__
 #undef __CLASS__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gmp/GMPParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gmp/GMPParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gmp/GMPParent.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gmp/GMPParent.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "GMPParent.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsComponentManagerUtils.h"
 #include "nsComponentManagerUtils.h"
 #include "nsIInputStream.h"
@@ -41,14 +41,9 @@
 #undef LOG
 #undef LOGD
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetGMPLog();
-#define LOG(level, x, ...) PR_LOG(GetGMPLog(), (level), (x, ##__VA_ARGS__))
+#define LOG(level, x, ...) MOZ_LOG(GetGMPLog(), (level), (x, ##__VA_ARGS__))
 #define LOGD(x, ...) LOG(PR_LOG_DEBUG, "GMPParent[%p|childPid=%d] " x, this, mChildPid, ##__VA_ARGS__)
-#else
-#define LOG(level, x, ...)
-#define LOGD(x, ...)
-#endif
 
 namespace gmp {
 
@@ -62,9 +57,7 @@
   , mGMPContentChildCount(0)
   , mAsyncShutdownRequired(false)
   , mAsyncShutdownInProgress(false)
-#ifdef PR_LOGGING
   , mChildPid(0)
-#endif
 {
   LOGD("GMPParent ctor");
   mPluginId = GeckoChildProcessHost::GetUniqueID();
@@ -145,9 +138,7 @@
       return NS_ERROR_FAILURE;
     }
 
-#ifdef PR_LOGGING
     mChildPid = base::GetProcId(mProcess->GetChildProcessHandle());
-#endif
     LOGD("%s: Launched new child process", __FUNCTION__);
 
     bool opened = Open(mProcess->GetChannel(),
@@ -374,11 +365,21 @@
 GMPParent::ChildTerminated()
 {
   nsRefPtr<GMPParent> self(this);
-  GMPThread()->Dispatch(NS_NewRunnableMethodWithArg<nsRefPtr<GMPParent>>(
-                          mService,
-                          &GeckoMediaPluginServiceParent::PluginTerminated,
-                          self),
-                        NS_DISPATCH_NORMAL);
+  nsIThread* gmpThread = GMPThread();
+
+  if (!gmpThread) {
+    // Bug 1163239 - this can happen on shutdown.
+    // PluginTerminated removes the GMP from the GMPService.
+    // On shutdown we can have this case where it is already been
+    // removed so there is no harm in not trying to remove it again.
+    LOGD("%s::%s: GMPThread() returned nullptr.", __CLASS__, __FUNCTION__);
+  } else {
+    gmpThread->Dispatch(NS_NewRunnableMethodWithArg<nsRefPtr<GMPParent>>(
+                         mService,
+                         &GeckoMediaPluginServiceParent::PluginTerminated,
+                         self),
+                         NS_DISPATCH_NORMAL);
+  }
 }
 
 void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gmp/GMPParent.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gmp/GMPParent.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gmp/GMPParent.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gmp/GMPParent.h	2015-05-25 20:43:41.000000000 +0000
@@ -217,9 +217,7 @@
   bool mAsyncShutdownRequired;
   bool mAsyncShutdownInProgress;
 
-#ifdef PR_LOGGING
   int mChildPid;
-#endif
 };
 
 } // namespace gmp
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gmp/GMPServiceChild.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gmp/GMPServiceChild.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gmp/GMPServiceChild.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gmp/GMPServiceChild.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -12,13 +12,8 @@
 #undef LOG
 #endif
 
-#ifdef PR_LOGGING
-#define LOGD(msg) PR_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
-#define LOG(level, msg) PR_LOG(GetGMPLog(), (level), msg)
-#else
-#define LOGD(msg)
-#define LOG(leve1, msg)
-#endif
+#define LOGD(msg) MOZ_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
+#define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)
 
 #ifdef __CLASS__
 #undef __CLASS__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gmp/GMPService.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gmp/GMPService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gmp/GMPService.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gmp/GMPService.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -6,7 +6,7 @@
 #include "GMPServiceParent.h"
 #include "GMPServiceChild.h"
 #include "prio.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "GMPParent.h"
 #include "GMPVideoDecoderParent.h"
 #include "nsIObserverService.h"
@@ -41,7 +41,6 @@
 #undef LOG
 #endif
 
-#ifdef PR_LOGGING
 PRLogModuleInfo*
 GetGMPLog()
 {
@@ -51,12 +50,8 @@
   return sLog;
 }
 
-#define LOGD(msg) PR_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
-#define LOG(level, msg) PR_LOG(GetGMPLog(), (level), msg)
-#else
-#define LOGD(msg)
-#define LOG(leve1, msg)
-#endif
+#define LOGD(msg) MOZ_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
+#define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)
 
 #ifdef __CLASS__
 #undef __CLASS__
@@ -280,8 +275,8 @@
     InitializePlugins();
   }
 
-  NS_ADDREF(mGMPThread);
-  *aThread = mGMPThread;
+  nsCOMPtr<nsIThread> copy = mGMPThread;
+  copy.forget(aThread);
 
   return NS_OK;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gmp/GMPServiceParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gmp/GMPServiceParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gmp/GMPServiceParent.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gmp/GMPServiceParent.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -5,7 +5,7 @@
 
 #include "GMPService.h"
 #include "prio.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "GMPParent.h"
 #include "GMPVideoDecoderParent.h"
 #include "nsIObserverService.h"
@@ -40,13 +40,8 @@
 #undef LOG
 #endif
 
-#ifdef PR_LOGGING
-#define LOGD(msg) PR_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
-#define LOG(level, msg) PR_LOG(GetGMPLog(), (level), msg)
-#else
-#define LOGD(msg)
-#define LOG(leve1, msg)
-#endif
+#define LOGD(msg) MOZ_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
+#define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)
 
 #ifdef __CLASS__
 #undef __CLASS__
@@ -259,6 +254,7 @@
         NS_DISPATCH_NORMAL);
     } else {
       MOZ_ASSERT(mPlugins.IsEmpty());
+      mWaitingForPluginsAsyncShutdown = false;
     }
 
     // Wait for plugins to do async shutdown...
@@ -305,10 +301,8 @@
 {
   nsRefPtr<GMPParent> gmp = SelectPluginForAPI(aNodeId, aAPI, aTags);
 
-#ifdef PR_LOGGING
   nsCString api = aTags[0];
   LOGD(("%s: %p returning %p for api %s", __FUNCTION__, (void *)this, (void *)gmp, api.get()));
-#endif
 
   if (!gmp) {
     return false;
@@ -1439,10 +1433,8 @@
 {
   nsRefPtr<GMPParent> gmp = mService->SelectPluginForAPI(aNodeId, aAPI, aTags);
 
-#ifdef PR_LOGGING
   nsCString api = aTags[0];
   LOGD(("%s: %p returning %p for api %s", __FUNCTION__, (void *)this, (void *)gmp, api.get()));
-#endif
 
   if (!gmp || !gmp->EnsureProcessLoaded(aId)) {
     return false;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gmp/GMPStorageParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gmp/GMPStorageParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gmp/GMPStorageParent.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gmp/GMPStorageParent.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -26,15 +26,10 @@
 #undef LOG
 #endif
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetGMPLog();
 
-#define LOGD(msg) PR_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
-#define LOG(level, msg) PR_LOG(GetGMPLog(), (level), msg)
-#else
-#define LOGD(msg)
-#define LOG(level, msg)
-#endif
+#define LOGD(msg) MOZ_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
+#define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)
 
 #ifdef __CLASS__
 #undef __CLASS__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gmp/GMPTimerParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gmp/GMPTimerParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gmp/GMPTimerParent.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gmp/GMPTimerParent.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -13,15 +13,10 @@
 #undef LOG
 #endif
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetGMPLog();
 
-#define LOGD(msg) PR_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
-#define LOG(level, msg) PR_LOG(GetGMPLog(), (level), msg)
-#else
-#define LOGD(msg)
-#define LOG(level, msg)
-#endif
+#define LOGD(msg) MOZ_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
+#define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)
 
 #ifdef __CLASS__
 #undef __CLASS__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gmp/GMPVideoDecoderParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gmp/GMPVideoDecoderParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gmp/GMPVideoDecoderParent.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gmp/GMPVideoDecoderParent.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "GMPVideoDecoderParent.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "mozilla/unused.h"
 #include "nsAutoRef.h"
 #include "nsThreadUtils.h"
@@ -21,15 +21,10 @@
 #undef LOG
 #endif
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetGMPLog();
 
-#define LOGD(msg) PR_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
-#define LOG(level, msg) PR_LOG(GetGMPLog(), (level), msg)
-#else
-#define LOGD(msg)
-#define LOG(level, msg)
-#endif
+#define LOGD(msg) MOZ_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
+#define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)
 
 namespace gmp {
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gmp/GMPVideoEncoderParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gmp/GMPVideoEncoderParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gmp/GMPVideoEncoderParent.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gmp/GMPVideoEncoderParent.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "GMPVideoEncoderParent.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "GMPVideoi420FrameImpl.h"
 #include "GMPVideoEncodedFrameImpl.h"
 #include "mozilla/unused.h"
@@ -23,15 +23,10 @@
 #undef LOG
 #endif
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetGMPLog();
 
-#define LOGD(msg) PR_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
-#define LOG(level, msg) PR_LOG(GetGMPLog(), (level), msg)
-#else
-#define LOGD(msg)
-#define LOG(level, msg)
-#endif
+#define LOGD(msg) MOZ_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
+#define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)
 
 #ifdef __CLASS__
 #undef __CLASS__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/GraphDriver.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/GraphDriver.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/GraphDriver.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/GraphDriver.cpp	2015-05-25 20:43:39.000000000 +0000
@@ -10,12 +10,8 @@
 #include <sys/sysctl.h>
 #endif
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* gMediaStreamGraphLog;
-#define STREAM_LOG(type, msg) PR_LOG(gMediaStreamGraphLog, type, msg)
-#else
-#define STREAM_LOG(type, msg)
-#endif
+#define STREAM_LOG(type, msg) MOZ_LOG(gMediaStreamGraphLog, type, msg)
 
 // We don't use NSPR log here because we want this interleaved with adb logcat
 // on Android/B2G
@@ -323,7 +319,7 @@
 
   mCurrentTimeStamp = now;
 
-  PR_LOG(gMediaStreamGraphLog, PR_LOG_DEBUG+1, ("Updating current time to %f (real %f, mStateComputedTime %f)",
+  MOZ_LOG(gMediaStreamGraphLog, PR_LOG_DEBUG+1, ("Updating current time to %f (real %f, mStateComputedTime %f)",
          mGraphImpl->MediaTimeToSeconds(aTo),
          (now - mInitialTimeStamp).ToSeconds(),
          mGraphImpl->MediaTimeToSeconds(StateComputedTime())));
@@ -1085,9 +1081,9 @@
   for (uint32_t i = 0; i < array.Length(); i++) {
     StreamAndPromiseForOperation& s = array[i];
     if ((aOperation == AsyncCubebOperation::INIT &&
-         s.mOperation == AudioContextOperation::Resume) ||
+         s.mOperation == dom::AudioContextOperation::Resume) ||
         (aOperation == AsyncCubebOperation::SHUTDOWN &&
-         s.mOperation != AudioContextOperation::Resume)) {
+         s.mOperation != dom::AudioContextOperation::Resume)) {
 
       GraphImpl()->AudioContextOperationCompleted(s.mStream,
                                                   s.mPromise,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gstreamer/GStreamerReader-0.10.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gstreamer/GStreamerReader-0.10.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gstreamer/GStreamerReader-0.10.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gstreamer/GStreamerReader-0.10.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -6,7 +6,6 @@
 #include "GStreamerMozVideoBuffer.h"
 #include "GStreamerFormatHelper.h"
 #include "VideoUtils.h"
-#include "mozilla/dom/TimeRanges.h"
 #include "mozilla/Endian.h"
 #include "mozilla/Preferences.h"
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gstreamer/GStreamerReader.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gstreamer/GStreamerReader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gstreamer/GStreamerReader.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gstreamer/GStreamerReader.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -15,7 +15,6 @@
 #endif
 #include "GStreamerFormatHelper.h"
 #include "VideoUtils.h"
-#include "mozilla/dom/TimeRanges.h"
 #include "mozilla/Endian.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/unused.h"
@@ -30,13 +29,9 @@
 // Un-comment to enable logging of seek bisections.
 //#define SEEK_LOGGING
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* gMediaDecoderLog;
 #define LOG(type, msg, ...) \
-  PR_LOG(gMediaDecoderLog, type, ("GStreamerReader(%p) " msg, this, ##__VA_ARGS__))
-#else
-#define LOG(type, msg, ...)
-#endif
+  MOZ_LOG(gMediaDecoderLog, type, ("GStreamerReader(%p) " msg, this, ##__VA_ARGS__))
 
 #if DEBUG
 static const unsigned int MAX_CHANNELS = 4;
@@ -872,10 +867,11 @@
   return SeekPromise::CreateAndResolve(aTarget, __func__);
 }
 
-nsresult GStreamerReader::GetBuffered(dom::TimeRanges* aBuffered)
+media::TimeIntervals GStreamerReader::GetBuffered()
 {
+  media::TimeIntervals buffered;
   if (!mInfo.HasValidMedia()) {
-    return NS_OK;
+    return buffered;
   }
 
 #if GST_VERSION_MAJOR == 0
@@ -894,11 +890,12 @@
       duration = mDecoder->GetMediaDuration();
     }
 
-    double end = (double) duration / GST_MSECOND;
     LOG(PR_LOG_DEBUG, "complete range [0, %f] for [0, %li]",
-          end, GetDataLength());
-    aBuffered->Add(0, end);
-    return NS_OK;
+        (double) duration / GST_MSECOND, GetDataLength());
+    buffered +=
+      media::TimeInterval(media::TimeUnit::FromMicroseconds(0),
+                          media::TimeUnit::FromMicroseconds(duration));
+    return buffered;
   }
 
   for(uint32_t index = 0; index < ranges.Length(); index++) {
@@ -922,14 +919,16 @@
       continue;
 #endif
 
-    double start = (double) GST_TIME_AS_USECONDS (startTime) / GST_MSECOND;
-    double end = (double) GST_TIME_AS_USECONDS (endTime) / GST_MSECOND;
     LOG(PR_LOG_DEBUG, "adding range [%f, %f] for [%li %li] size %li",
-          start, end, startOffset, endOffset, GetDataLength());
-    aBuffered->Add(start, end);
+        (double) GST_TIME_AS_USECONDS (startTime) / GST_MSECOND,
+        (double) GST_TIME_AS_USECONDS (endTime) / GST_MSECOND,
+        startOffset, endOffset, GetDataLength());
+    buffered +=
+      media::TimeInterval(media::TimeUnit::FromMicroseconds(GST_TIME_AS_USECONDS(startTime)),
+                          media::TimeUnit::FromMicroseconds(GST_TIME_AS_USECONDS(endTime)));
   }
 
-  return NS_OK;
+  return buffered;
 }
 
 void GStreamerReader::ReadAndPushData(guint aLength)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gstreamer/GStreamerReader.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gstreamer/GStreamerReader.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gstreamer/GStreamerReader.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gstreamer/GStreamerReader.h	2015-05-25 20:43:41.000000000 +0000
@@ -29,10 +29,6 @@
 
 namespace mozilla {
 
-namespace dom {
-class TimeRanges;
-}
-
 class AbstractMediaDecoder;
 
 class GStreamerReader : public MediaDecoderReader
@@ -53,7 +49,7 @@
                                 MetadataTags** aTags) override;
   virtual nsRefPtr<SeekPromise>
   Seek(int64_t aTime, int64_t aEndTime) override;
-  virtual nsresult GetBuffered(dom::TimeRanges* aBuffered) override;
+  virtual media::TimeIntervals GetBuffered() override;
 
   virtual void NotifyDataArrived(const char *aBuffer,
                                  uint32_t aLength,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gtest/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gtest/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gtest/moz.build	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gtest/moz.build	2015-05-25 20:43:41.000000000 +0000
@@ -10,6 +10,7 @@
     'TestGMPCrossOrigin.cpp',
     'TestGMPRemoveAndDelete.cpp',
     'TestIntervalSet.cpp',
+    'TestMP3Demuxer.cpp',
     'TestMP4Demuxer.cpp',
     'TestMP4Reader.cpp',
     'TestTrackEncoder.cpp',
@@ -39,6 +40,8 @@
     '../test/gizmo.mp4',
     'dash_dashinit.mp4',
     'mediasource_test.mp4',
+    'noise.mp3',
+    'noise_vbr.mp3',
     'test.webm',
 ]
 
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gtest/noise.mp3 and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gtest/noise.mp3 differ
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gtest/noise_vbr.mp3 and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gtest/noise_vbr.mp3 differ
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gtest/TestIntervalSet.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gtest/TestIntervalSet.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gtest/TestIntervalSet.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gtest/TestIntervalSet.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -89,6 +89,10 @@
   media::TimeIntervals blah5 = CreateTimeIntervals(start.mValue, end.mValue);
   (void)test1; (void)test2; (void)test3; (void)test4; (void)test5;
   (void)blah1; (void)blah2; (void)blah3; (void)blah4; (void)blah5;
+
+  media::TimeIntervals i0{media::TimeInterval(media::TimeUnit::FromSeconds(0),
+                                              media::TimeUnit::FromSeconds(0))};
+  EXPECT_EQ(0u, i0.Length()); // Constructing with an empty time interval.
 }
 
 TEST(IntervalSet, Length)
@@ -97,6 +101,23 @@
   EXPECT_EQ(10, i.Length());
 }
 
+TEST(IntervalSet, Intersects)
+{
+  EXPECT_TRUE(IntInterval(1,5).Intersects(IntInterval(3,4)));
+  EXPECT_TRUE(IntInterval(1,5).Intersects(IntInterval(3,7)));
+  EXPECT_TRUE(IntInterval(1,5).Intersects(IntInterval(-1,3)));
+  EXPECT_TRUE(IntInterval(1,5).Intersects(IntInterval(-1,7)));
+  EXPECT_FALSE(IntInterval(1,5).Intersects(IntInterval(6,7)));
+  EXPECT_FALSE(IntInterval(1,5).Intersects(IntInterval(-1,0)));
+  // End boundary is exclusive of the interval.
+  EXPECT_FALSE(IntInterval(1,5).Intersects(IntInterval(5,7)));
+  EXPECT_FALSE(IntInterval(1,5).Intersects(IntInterval(0,1)));
+  // Empty identical interval do not intersect.
+  EXPECT_FALSE(IntInterval(1,1).Intersects(IntInterval(1,1)));
+  // Empty interval do not intersect.
+  EXPECT_FALSE(IntInterval(1,1).Intersects(IntInterval(2,2)));
+}
+
 TEST(IntervalSet, Intersection)
 {
   IntInterval i0(10, 20);
@@ -104,6 +125,14 @@
   IntInterval i = i0.Intersection(i1);
   EXPECT_EQ(15, i.mStart);
   EXPECT_EQ(20, i.mEnd);
+  IntInterval j0(10, 20);
+  IntInterval j1(20, 25);
+  IntInterval j = j0.Intersection(j1);
+  EXPECT_TRUE(j.IsEmpty());
+  IntInterval k0(2, 2);
+  IntInterval k1(2, 2);
+  IntInterval k = k0.Intersection(k1);
+  EXPECT_TRUE(k.IsEmpty());
 }
 
 TEST(IntervalSet, Equals)
@@ -150,46 +179,19 @@
 }
 
 template<typename T>
-static void Compare(media::IntervalSet<T> aI1, media::IntervalSet<T> aI2)
+static void Compare(const media::IntervalSet<T>& aI1,
+                    const media::IntervalSet<T>& aI2)
 {
-  media::IntervalSet<T> i1(aI1);
-  media::IntervalSet<T> i2(aI1);
-  EXPECT_EQ(i1.Length(), i2.Length());
-  if (i1.Length() != i2.Length()) {
+  EXPECT_EQ(aI1.Length(), aI2.Length());
+  if (aI1.Length() != aI2.Length()) {
     return;
   }
-  for (uint32_t i = 0; i < i1.Length(); i++) {
-    EXPECT_EQ(i1[i].mStart, i2[i].mStart);
-    EXPECT_EQ(i1[i].mEnd, i2[i].mEnd);
+  for (uint32_t i = 0; i < aI1.Length(); i++) {
+    EXPECT_EQ(aI1[i].mStart, aI2[i].mStart);
+    EXPECT_EQ(aI1[i].mEnd, aI2[i].mEnd);
   }
 }
 
-TEST(IntervalSet, IntersectionNormalizedIntervalSet)
-{
-  media::IntervalSet<int> i0;
-  i0 += IntInterval(5, 10);
-  i0 += IntInterval(8, 25);
-  i0 += IntInterval(24, 60);
-
-  media::IntervalSet<int> i1;
-  i1.Add(IntInterval(7, 15));
-  i1.Add(IntInterval(10, 27));
-  i1.Add(IntInterval(45, 50));
-  i1.Add(IntInterval(53, 57));
-
-  // Compare intersections to ensure an intersection of normalized intervalsets
-  // is equal to the intersection of non-normalized intervalsets.
-  media::IntervalSet<int> intersection = media::Intersection(i0, i1);
-
-  media::IntervalSet<int> i0_normalize(i0);
-  i0_normalize.Normalize();
-  media::IntervalSet<int> i1_normalize(i1);
-  i1_normalize.Normalize();
-  media::IntervalSet<int> intersection_normalize =
-  media::Intersection(i0_normalize, i1_normalize);
-  Compare(intersection, intersection_normalize);
-}
-
 static void GeneratePermutations(media::IntervalSet<int> aI1,
                                  media::IntervalSet<int> aI2)
 {
@@ -211,17 +213,20 @@
       for (uint32_t i = 0; i < comb1.size(); i++) {
         i_0 += aI1[comb1[i]];
       }
+      // Test that intervals are always normalized.
+      Compare(aI1, i_0);
       media::IntervalSet<int> i_1;
       for (uint32_t i = 0; i < comb2.size(); i++) {
         i_1 += aI2[comb2[i]];
       }
+      Compare(aI2, i_1);
       // Check intersections yield the same result.
       Compare(i_0.Intersection(i_1), i_ref);
     } while (std::next_permutation(comb2.begin(), comb2.end()));
   } while (std::next_permutation(comb1.begin(), comb1.end()));
 }
 
-TEST(IntervalSet, IntersectionUnorderedIntervalSet)
+TEST(IntervalSet, IntersectionNormalizedIntervalSet)
 {
   media::IntervalSet<int> i0;
   i0 += IntInterval(5, 10);
@@ -253,6 +258,39 @@
   GeneratePermutations(i0, i1);
 }
 
+TEST(IntervalSet, IntersectionNonNormalizedInterval)
+{
+  media::IntervalSet<int> i0;
+  i0 += IntInterval(5, 10);
+  i0 += IntInterval(8, 25);
+  i0 += IntInterval(30, 60);
+
+  media::Interval<int> i1(9, 15);
+  i0.Intersection(i1);
+  EXPECT_EQ(1u, i0.Length());
+  EXPECT_EQ(i0[0].mStart, i1.mStart);
+  EXPECT_EQ(i0[0].mEnd, i1.mEnd);
+}
+
+TEST(IntervalSet, IntersectionUnorderedNonNormalizedInterval)
+{
+  media::IntervalSet<int> i0;
+  i0 += IntInterval(1, 3);
+  i0 += IntInterval(1, 10);
+  i0 += IntInterval(9, 12);
+  i0 += IntInterval(12, 15);
+  i0 += IntInterval(8, 25);
+  i0 += IntInterval(30, 60);
+  i0 += IntInterval(5, 10);
+  i0 += IntInterval(30, 60);
+
+  media::Interval<int> i1(9, 15);
+  i0.Intersection(i1);
+  EXPECT_EQ(1u, i0.Length());
+  EXPECT_EQ(i0[0].mStart, i1.mStart);
+  EXPECT_EQ(i0[0].mEnd, i1.mEnd);
+}
+
 static media::IntervalSet<int> Duplicate(const media::IntervalSet<int>& aValue)
 {
   media::IntervalSet<int> value(aValue);
@@ -270,21 +308,102 @@
   i = IntInterval(1, 8) + i;
   media::IntervalSet<int> interval;
   interval += IntInterval(5, 10);
-  // Test += with move.
+  // Test += with rval move.
   i += Duplicate(interval);
   // Test = with move and add with move.
   i = Duplicate(interval) + i;
 
-  media::IntervalSet<int> o(i);
-  o.Normalize();
+  EXPECT_EQ(2u, i.Length());
+
+  EXPECT_EQ(1, i[0].mStart);
+  EXPECT_EQ(10, i[0].mEnd);
+
+  EXPECT_EQ(20, i[1].mStart);
+  EXPECT_EQ(30, i[1].mEnd);
+
+  media::TimeIntervals ti;
+  ti += media::TimeInterval(media::TimeUnit::FromSeconds(0.0),
+                            media::TimeUnit::FromSeconds(3.203333));
+  ti += media::TimeInterval(media::TimeUnit::FromSeconds(3.203366),
+                            media::TimeUnit::FromSeconds(10.010065));
+  EXPECT_EQ(2u, ti.Length());
+  ti += media::TimeInterval(ti.Start(0), ti.End(0), media::TimeUnit::FromMicroseconds(35000));
+  EXPECT_EQ(1u, ti.Length());
+}
+
+TEST(IntervalSet, ContainValue)
+{
+  media::IntervalSet<int> i0;
+  i0 += IntInterval(0, 10);
+  i0 += IntInterval(15, 20);
+  i0 += IntInterval(30, 50);
+  EXPECT_TRUE(i0.Contains(0)); // start is inclusive.
+  EXPECT_TRUE(i0.Contains(17));
+  EXPECT_FALSE(i0.Contains(20)); // end boundary is exclusive.
+  EXPECT_FALSE(i0.Contains(25));
+}
+
+TEST(IntervalSet, ContainValueWithFuzz)
+{
+  media::IntervalSet<int> i0;
+  i0 += IntInterval(0, 10);
+  i0 += IntInterval(15, 20, 1);
+  i0 += IntInterval(30, 50);
+  EXPECT_TRUE(i0.Contains(0)); // start is inclusive.
+  EXPECT_TRUE(i0.Contains(17));
+  EXPECT_TRUE(i0.Contains(20)); // end boundary is exclusive but we have a fuzz of 1.
+  EXPECT_FALSE(i0.Contains(25));
+}
+
+TEST(IntervalSet, ContainInterval)
+{
+  media::IntervalSet<int> i0;
+  i0 += IntInterval(0, 10);
+  i0 += IntInterval(15, 20);
+  i0 += IntInterval(30, 50);
+  EXPECT_TRUE(i0.Contains(IntInterval(2, 8)));
+  EXPECT_TRUE(i0.Contains(IntInterval(31, 50)));
+  EXPECT_TRUE(i0.Contains(IntInterval(0, 10)));
+  EXPECT_FALSE(i0.Contains(IntInterval(0, 11)));
+  EXPECT_TRUE(i0.Contains(IntInterval(0, 5)));
+  EXPECT_FALSE(i0.Contains(IntInterval(8, 15)));
+  EXPECT_FALSE(i0.Contains(IntInterval(15, 30)));
+  EXPECT_FALSE(i0.Contains(IntInterval(30, 55)));
+}
 
-  EXPECT_EQ(2u, o.Length());
+TEST(IntervalSet, ContainIntervalWithFuzz)
+{
+  media::IntervalSet<int> i0;
+  i0 += IntInterval(0, 10);
+  i0 += IntInterval(15, 20);
+  i0 += IntInterval(30, 50);
+  EXPECT_TRUE(i0.Contains(IntInterval(2, 8)));
+  EXPECT_TRUE(i0.Contains(IntInterval(31, 50)));
+  EXPECT_TRUE(i0.Contains(IntInterval(0, 11, 1)));
+  EXPECT_TRUE(i0.Contains(IntInterval(0, 5)));
+  EXPECT_FALSE(i0.Contains(IntInterval(8, 15)));
+  EXPECT_FALSE(i0.Contains(IntInterval(15, 21)));
+  EXPECT_FALSE(i0.Contains(IntInterval(15, 30)));
+  EXPECT_FALSE(i0.Contains(IntInterval(30, 55)));
 
-  EXPECT_EQ(1, o[0].mStart);
-  EXPECT_EQ(10, o[0].mEnd);
+  media::IntervalSet<int> i1;
+  i1 += IntInterval(0, 10, 1);
+  i1 += IntInterval(15, 20, 1);
+  i1 += IntInterval(30, 50, 1);
+  EXPECT_TRUE(i1.Contains(IntInterval(2, 8)));
+  EXPECT_TRUE(i1.Contains(IntInterval(29, 51)));
+  EXPECT_TRUE(i1.Contains(IntInterval(0, 11, 1)));
+  EXPECT_TRUE(i1.Contains(IntInterval(15, 21)));
+}
+
+TEST(IntervalSet, Span)
+{
+  IntInterval i0(0,10);
+  IntInterval i1(20,30);
+  IntInterval i{i0.Span(i1)};
 
-  EXPECT_EQ(20, o[1].mStart);
-  EXPECT_EQ(30, o[1].mEnd);
+  EXPECT_EQ(i.mStart, 0);
+  EXPECT_EQ(i.mEnd, 30);
 }
 
 TEST(IntervalSet, Union)
@@ -347,7 +466,6 @@
   i0 += IntInterval(11, 25, 0);
   i0 += IntInterval(5, 10, 1);
   i0 += IntInterval(40, 60, 1);
-  i0.Normalize();
 
   EXPECT_EQ(2u, i0.Length());
 
@@ -364,12 +482,24 @@
   i0 += IntInterval(5, 10, 1);
   i0 += IntInterval(11, 25, 0);
   i0 += IntInterval(40, 60, 1);
+  EXPECT_EQ(2u, i0.Length());
+  EXPECT_EQ(5, i0[0].mStart);
+  EXPECT_EQ(25, i0[0].mEnd);
+  EXPECT_EQ(40, i0[1].mStart);
+  EXPECT_EQ(60, i0[1].mEnd);
 
   media::IntervalSet<int> i1;
   i1.Add(IntInterval(7, 15, 1));
   i1.Add(IntInterval(16, 27, 1));
   i1.Add(IntInterval(45, 50, 1));
   i1.Add(IntInterval(53, 57, 1));
+  EXPECT_EQ(3u, i1.Length());
+  EXPECT_EQ(7, i1[0].mStart);
+  EXPECT_EQ(27, i1[0].mEnd);
+  EXPECT_EQ(45, i1[1].mStart);
+  EXPECT_EQ(50, i1[1].mEnd);
+  EXPECT_EQ(53, i1[2].mStart);
+  EXPECT_EQ(57, i1[2].mEnd);
 
   media::IntervalSet<int> i = media::Union(i0, i1);
 
@@ -380,13 +510,6 @@
 
   EXPECT_EQ(40, i[1].mStart);
   EXPECT_EQ(60, i[1].mEnd);
-
-  i0.Normalize();
-  EXPECT_EQ(2u, i0.Length());
-  EXPECT_EQ(5, i0[0].mStart);
-  EXPECT_EQ(25, i0[0].mEnd);
-  EXPECT_EQ(40, i0[1].mStart);
-  EXPECT_EQ(60, i0[1].mEnd);
 }
 
 TEST(IntervalSet, Contiguous)
@@ -421,28 +544,19 @@
     EXPECT_EQ(tr->End(index, rv), i[index].mEnd.ToSeconds());
     EXPECT_EQ(tr->End(index, rv), i.End(index).ToSeconds());
   }
-
-  i.Normalize();
-  tr->Normalize();
-  EXPECT_EQ(tr->Length(), i.Length());
-  for (dom::TimeRanges::index_type index = 0; index < tr->Length(); index++) {
-    ErrorResult rv;
-    EXPECT_EQ(tr->Start(index, rv), i[index].mStart.ToSeconds());
-    EXPECT_EQ(tr->Start(index, rv), i.Start(index).ToSeconds());
-    EXPECT_EQ(tr->End(index, rv), i[index].mEnd.ToSeconds());
-    EXPECT_EQ(tr->End(index, rv), i.End(index).ToSeconds());
-  }
 }
 
 static void CheckTimeRanges(dom::TimeRanges* aTr, const media::TimeIntervals& aTi)
 {
-  EXPECT_EQ(aTr->Length(), aTi.Length());
-  for (dom::TimeRanges::index_type i = 0; i < aTr->Length(); i++) {
+  nsRefPtr<dom::TimeRanges> tr = new dom::TimeRanges;
+  tr->Union(aTr, 0); // This will normalize the time range.
+  EXPECT_EQ(tr->Length(), aTi.Length());
+  for (dom::TimeRanges::index_type i = 0; i < tr->Length(); i++) {
     ErrorResult rv;
-    EXPECT_EQ(aTr->Start(i, rv), aTi[i].mStart.ToSeconds());
-    EXPECT_EQ(aTr->Start(i, rv), aTi.Start(i).ToSeconds());
-    EXPECT_EQ(aTr->End(i, rv), aTi[i].mEnd.ToSeconds());
-    EXPECT_EQ(aTr->End(i, rv), aTi.End(i).ToSeconds());
+    EXPECT_EQ(tr->Start(i, rv), aTi[i].mStart.ToSeconds());
+    EXPECT_EQ(tr->Start(i, rv), aTi.Start(i).ToSeconds());
+    EXPECT_EQ(tr->End(i, rv), aTi[i].mEnd.ToSeconds());
+    EXPECT_EQ(tr->End(i, rv), aTi.End(i).ToSeconds());
   }
 }
 
@@ -469,11 +583,6 @@
   i3 = tr;
   CheckTimeRanges(tr, i3);
 
-  i1.Normalize();
-  tr->Normalize();
-
-  CheckTimeRanges(tr, i1);
-
   // operator= test
   i1 = tr.get();
   CheckTimeRanges(tr, i1);
@@ -511,7 +620,6 @@
     EXPECT_EQ(tr->End(index, rv), i.End(index).ToSeconds());
   }
 
-  i.Normalize();
   tr->Normalize();
   EXPECT_EQ(tr->Length(), i.Length());
   for (dom::TimeRanges::index_type index = 0; index < tr->Length(); index++) {
@@ -521,6 +629,20 @@
     EXPECT_EQ(tr->End(index, rv), i[index].mEnd.ToSeconds());
     EXPECT_EQ(tr->End(index, rv), i.End(index).ToSeconds());
   }
+
+  // Check infinity values aren't lost in the conversion.
+  tr = new dom::TimeRanges();
+  tr->Add(0, 30);
+  tr->Add(50, std::numeric_limits<double>::infinity());
+  media::TimeIntervals i_oo{media::TimeIntervals::FromTimeRanges(tr)};
+  nsRefPtr<dom::TimeRanges> tr2 = new dom::TimeRanges();
+  i_oo.ToTimeRanges(tr2);
+  EXPECT_EQ(tr->Length(), tr2->Length());
+  for (dom::TimeRanges::index_type index = 0; index < tr->Length(); index++) {
+    ErrorResult rv;
+    EXPECT_EQ(tr->Start(index, rv), tr2->Start(index, rv));
+    EXPECT_EQ(tr->End(index, rv), tr2->End(index, rv));
+  }
 }
 
 template<typename T>
@@ -583,8 +705,6 @@
   is.Add(i);
   is = is + i;
   is = i + is;
-  EXPECT_EQ(5u, is.Length());
-  is.Normalize();
   EXPECT_EQ(1u, is.Length());
   EXPECT_EQ(Foo<int>(), is[0].mStart);
   EXPECT_EQ(Foo<int>(4,5,6), is[0].mEnd);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gtest/TestMP3Demuxer.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gtest/TestMP3Demuxer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gtest/TestMP3Demuxer.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gtest/TestMP3Demuxer.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -0,0 +1,217 @@
+/* -*- 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 <gtest/gtest.h>
+#include <vector>
+
+#include "mp4_demuxer/mp4_demuxer.h"
+#include "mp4_demuxer/MP3TrackDemuxer.h"
+#include "MP4Stream.h"
+#include "mozilla/ArrayUtils.h"
+#include "MockMediaResource.h"
+
+using namespace mp4_demuxer;
+
+struct MP3Resource {
+  const char* mFilePath;
+  bool mIsVBR;
+  uint64_t mFileSize;
+  int32_t mMPEGLayer;
+  int32_t mMPEGVersion;
+  uint8_t mID3MajorVersion;
+  uint8_t mID3MinorVersion;
+  uint8_t mID3Flags;
+  uint32_t mID3Size;
+
+  int64_t mDuration;
+  float mDurationError;
+  int32_t mSampleRate;
+  int32_t mSamplesPerFrame;
+  uint32_t mNumSamples;
+  // TODO: temp solution, we could parse them instead or account for them
+  // otherwise.
+  int32_t mNumTrailingFrames;
+  int32_t mBitrate;
+  int32_t mSlotSize;
+  int32_t mPrivate;
+
+  // The first n frame offsets.
+  std::vector<int32_t> mSyncOffsets;
+  nsRefPtr<MockMediaResource> mResource;
+  nsRefPtr<MP3Demuxer> mDemuxer;
+};
+
+class MP3DemuxerTest : public ::testing::Test {
+protected:
+  void SetUp() override {
+    {
+      MP3Resource res;
+      res.mFilePath = "noise.mp3";
+      res.mIsVBR = false;
+      res.mFileSize = 965257;
+      res.mMPEGLayer = 3;
+      res.mMPEGVersion = 1;
+      res.mID3MajorVersion = 3;
+      res.mID3MinorVersion = 0;
+      res.mID3Flags = 0;
+      res.mID3Size = 2141;
+      res.mDuration = 30067000;
+      res.mDurationError = 0.001f;
+      res.mSampleRate = 44100;
+      res.mSamplesPerFrame = 1152;
+      res.mNumSamples = 1325952;
+      res.mNumTrailingFrames = 2;
+      res.mBitrate = 256000;
+      res.mSlotSize = 1;
+      res.mPrivate = 0;
+      const int syncs[] = { 2151, 2987, 3823, 4659, 5495, 6331 };
+      res.mSyncOffsets.insert(res.mSyncOffsets.begin(), syncs, syncs + 6);
+      mTargets.push_back(res);
+    }
+
+    {
+      MP3Resource res;
+      res.mFilePath = "noise_vbr.mp3";
+      res.mIsVBR = true;
+      res.mFileSize = 583679;
+      res.mMPEGLayer = 3;
+      res.mMPEGVersion = 1;
+      res.mID3MajorVersion = 3;
+      res.mID3MinorVersion = 0;
+      res.mID3Flags = 0;
+      res.mID3Size = 2221;
+      res.mDuration = 30081000;
+      res.mDurationError = 0.005f;
+      res.mSampleRate = 44100;
+      res.mSamplesPerFrame = 1152;
+      res.mNumSamples = 1326575;
+      res.mNumTrailingFrames = 3;
+      res.mBitrate = 154000;
+      res.mSlotSize = 1;
+      res.mPrivate = 0;
+      const int syncs[] = { 2231, 2648, 2752, 3796, 4318, 4735 };
+      res.mSyncOffsets.insert(res.mSyncOffsets.begin(), syncs, syncs + 6);
+      mTargets.push_back(res);
+    }
+
+    for (auto& target: mTargets) {
+      target.mResource = new MockMediaResource(target.mFilePath),
+      target.mDemuxer = new MP3Demuxer(new MP4Stream(target.mResource));
+
+      ASSERT_EQ(NS_OK, target.mResource->Open(nullptr));
+      ASSERT_TRUE(target.mDemuxer->Init());
+    }
+  }
+
+  std::vector<MP3Resource> mTargets;
+};
+
+TEST_F(MP3DemuxerTest, ID3Tags) {
+  for (const auto& target: mTargets) {
+    nsRefPtr<MediaRawData> frame(target.mDemuxer->DemuxSample());
+    ASSERT_TRUE(frame);
+
+    const auto& id3 = target.mDemuxer->ID3Header();
+    ASSERT_TRUE(id3.IsValid());
+
+    EXPECT_EQ(target.mID3MajorVersion, id3.MajorVersion());
+    EXPECT_EQ(target.mID3MinorVersion, id3.MinorVersion());
+    EXPECT_EQ(target.mID3Flags, id3.Flags());
+    EXPECT_EQ(target.mID3Size, id3.Size());
+  }
+}
+
+TEST_F(MP3DemuxerTest, VBRHeader) {
+  for (const auto& target: mTargets) {
+    nsRefPtr<MediaRawData> frame(target.mDemuxer->DemuxSample());
+    ASSERT_TRUE(frame);
+
+    const auto& vbr = target.mDemuxer->VBRInfo();
+
+    if (target.mIsVBR) {
+      EXPECT_EQ(FrameParser::VBRHeader::XING, vbr.Type());
+      // TODO: find reference number which accounts for trailing headers.
+      // EXPECT_EQ(target.mNumSamples / target.mSamplesPerFrame, vbr.NumFrames());
+    } else {
+      EXPECT_EQ(FrameParser::VBRHeader::NONE, vbr.Type());
+      EXPECT_EQ(-1, vbr.NumFrames());
+    }
+  }
+}
+
+TEST_F(MP3DemuxerTest, FrameParsing) {
+  for (const auto& target: mTargets) {
+    nsRefPtr<MediaRawData> frameData(target.mDemuxer->DemuxSample());
+    ASSERT_TRUE(frameData);
+    EXPECT_EQ(static_cast<int64_t>(target.mFileSize), target.mDemuxer->StreamLength());
+
+    const auto& id3 = target.mDemuxer->ID3Header();
+    ASSERT_TRUE(id3.IsValid());
+
+    uint64_t parsedLength = id3.Size();
+    uint64_t bitrateSum = 0;
+    uint32_t numFrames = 0;
+    uint32_t numSamples = 0;
+
+    while (frameData) {
+      if (target.mSyncOffsets.size() > numFrames) {
+        // Test sync offsets.
+        EXPECT_EQ(target.mSyncOffsets[numFrames], frameData->mOffset);
+      }
+
+      ++numFrames;
+      parsedLength += frameData->mSize;
+
+      const auto& frame = target.mDemuxer->LastFrame();
+      const auto& header = frame.Header();
+      ASSERT_TRUE(header.IsValid());
+
+      numSamples += header.SamplesPerFrame();
+
+      EXPECT_EQ(target.mMPEGLayer, header.Layer());
+      EXPECT_EQ(target.mSampleRate, header.SampleRate());
+      EXPECT_EQ(target.mSamplesPerFrame, header.SamplesPerFrame());
+      EXPECT_EQ(target.mSlotSize, header.SlotSize());
+      EXPECT_EQ(target.mPrivate, header.Private());
+
+      if (target.mIsVBR) {
+        // Used to compute the average bitrate for VBR streams.
+        bitrateSum += target.mBitrate;
+      } else {
+        EXPECT_EQ(target.mBitrate, header.Bitrate());
+      }
+
+      frameData = target.mDemuxer->DemuxSample();
+    }
+
+    // TODO: find reference number which accounts for trailing headers.
+    // EXPECT_EQ(target.mNumSamples / target.mSamplesPerFrame, numFrames);
+    // EXPECT_EQ(target.mNumSamples, numSamples);
+
+    // There may be trailing headers which we don't parse, so the stream length
+    // is the upper bound.
+    EXPECT_GE(target.mFileSize, parsedLength);
+
+    if (target.mIsVBR) {
+      ASSERT_TRUE(numFrames);
+      EXPECT_EQ(target.mBitrate, static_cast<int32_t>(bitrateSum / numFrames));
+    }
+  }
+}
+
+TEST_F(MP3DemuxerTest, Duration) {
+  for (const auto& target: mTargets) {
+    nsRefPtr<MediaRawData> frameData(target.mDemuxer->DemuxSample());
+    ASSERT_TRUE(frameData);
+    EXPECT_EQ(static_cast<int64_t>(target.mFileSize), target.mDemuxer->StreamLength());
+
+    while (frameData) {
+      EXPECT_NEAR(target.mDuration, target.mDemuxer->Duration(),
+                  target.mDurationError * target.mDuration);
+
+      frameData = target.mDemuxer->DemuxSample();
+    }
+  }
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gtest/TestMP4Reader.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gtest/TestMP4Reader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/gtest/TestMP4Reader.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/gtest/TestMP4Reader.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -10,7 +10,7 @@
 #include "MockMediaResource.h"
 #include "MockMediaDecoderOwner.h"
 #include "mozilla/Preferences.h"
-#include "mozilla/dom/TimeRanges.h"
+#include "TimeUnits.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -87,15 +87,10 @@
   // Video 3-4 sec, audio 2.986666-4.010666 sec
   b->resource->MockAddBufferedRange(248400, 327455);
 
-  nsRefPtr<TimeRanges> ranges = new TimeRanges();
-  EXPECT_EQ(NS_OK, b->reader->GetBuffered(ranges));
-  EXPECT_EQ(1U, ranges->Length());
-  double start = 0;
-  EXPECT_EQ(NS_OK, ranges->Start(0, &start));
-  EXPECT_NEAR(270000 / 90000.0, start, 0.000001);
-  double end = 0;
-  EXPECT_EQ(NS_OK, ranges->End(0, &end));
-  EXPECT_NEAR(360000 / 90000.0, end, 0.000001);
+  media::TimeIntervals ranges = b->reader->GetBuffered();
+  EXPECT_EQ(1U, ranges.Length());
+  EXPECT_NEAR(270000 / 90000.0, ranges.Start(0).ToSeconds(), 0.000001);
+  EXPECT_NEAR(360000 / 90000.0, ranges.End(0).ToSeconds(), 0.000001);
 }
 
 TEST(MP4Reader, BufferedRangeMissingLastByte)
@@ -108,15 +103,10 @@
   b->resource->MockAddBufferedRange(248400, 324912);
   b->resource->MockAddBufferedRange(324913, 327455);
 
-  nsRefPtr<TimeRanges> ranges = new TimeRanges();
-  EXPECT_EQ(NS_OK, b->reader->GetBuffered(ranges));
-  EXPECT_EQ(1U, ranges->Length());
-  double start = 0;
-  EXPECT_EQ(NS_OK, ranges->Start(0, &start));
-  EXPECT_NEAR(270000.0 / 90000.0, start, 0.000001);
-  double end = 0;
-  EXPECT_EQ(NS_OK, ranges->End(0, &end));
-  EXPECT_NEAR(357000 / 90000.0, end, 0.000001);
+  media::TimeIntervals ranges = b->reader->GetBuffered();
+  EXPECT_EQ(1U, ranges.Length());
+  EXPECT_NEAR(270000.0 / 90000.0, ranges.Start(0).ToSeconds(), 0.000001);
+  EXPECT_NEAR(357000 / 90000.0, ranges.End(0).ToSeconds(), 0.000001);
 }
 
 TEST(MP4Reader, BufferedRangeSyncFrame)
@@ -129,15 +119,10 @@
   b->resource->MockClearBufferedRanges();
   b->resource->MockAddBufferedRange(146336, 327455);
 
-  nsRefPtr<TimeRanges> ranges = new TimeRanges();
-  EXPECT_EQ(NS_OK, b->reader->GetBuffered(ranges));
-  EXPECT_EQ(1U, ranges->Length());
-  double start = 0;
-  EXPECT_EQ(NS_OK, ranges->Start(0, &start));
-  EXPECT_NEAR(270000.0 / 90000.0, start, 0.000001);
-  double end = 0;
-  EXPECT_EQ(NS_OK, ranges->End(0, &end));
-  EXPECT_NEAR(360000 / 90000.0, end, 0.000001);
+  media::TimeIntervals ranges = b->reader->GetBuffered();
+  EXPECT_EQ(1U, ranges.Length());
+  EXPECT_NEAR(270000.0 / 90000.0, ranges.Start(0).ToSeconds(), 0.000001);
+  EXPECT_NEAR(360000 / 90000.0, ranges.End(0).ToSeconds(), 0.000001);
 }
 
 TEST(MP4Reader, CompositionOrder)
@@ -187,23 +172,14 @@
   b->resource->MockAddBufferedRange(12616, 13196);
   b->resource->MockAddBufferedRange(13220, 13901);
 
-  nsRefPtr<TimeRanges> ranges = new TimeRanges();
-  EXPECT_EQ(NS_OK, b->reader->GetBuffered(ranges));
-  EXPECT_EQ(2U, ranges->Length());
-
-  double start = 0;
-  EXPECT_EQ(NS_OK, ranges->Start(0, &start));
-  EXPECT_NEAR(166.0 / 2500.0, start, 0.000001);
-  double end = 0;
-  EXPECT_EQ(NS_OK, ranges->End(0, &end));
-  EXPECT_NEAR(332.0 / 2500.0, end, 0.000001);
-
-  start = 0;
-  EXPECT_EQ(NS_OK, ranges->Start(1, &start));
-  EXPECT_NEAR(581.0 / 2500.0, start, 0.000001);
-  end = 0;
-  EXPECT_EQ(NS_OK, ranges->End(1, &end));
-  EXPECT_NEAR(11255.0 / 44100.0, end, 0.000001);
+  media::TimeIntervals ranges = b->reader->GetBuffered();
+  EXPECT_EQ(2U, ranges.Length());
+
+  EXPECT_NEAR(166.0 / 2500.0, ranges.Start(0).ToSeconds(), 0.000001);
+  EXPECT_NEAR(332.0 / 2500.0, ranges.End(0).ToSeconds(), 0.000001);
+
+  EXPECT_NEAR(581.0 / 2500.0, ranges.Start(1).ToSeconds(), 0.000001);
+  EXPECT_NEAR(11255.0 / 44100.0, ranges.End(1).ToSeconds(), 0.000001);
 }
 
 TEST(MP4Reader, Normalised)
@@ -237,14 +213,9 @@
   b->resource->MockClearBufferedRanges();
   b->resource->MockAddBufferedRange(48, 13901);
 
-  nsRefPtr<TimeRanges> ranges = new TimeRanges();
-  EXPECT_EQ(NS_OK, b->reader->GetBuffered(ranges));
-  EXPECT_EQ(1U, ranges->Length());
-
-  double start = 0;
-  EXPECT_EQ(NS_OK, ranges->Start(0, &start));
-  EXPECT_NEAR(166.0 / 2500.0, start, 0.000001);
-  double end = 0;
-  EXPECT_EQ(NS_OK, ranges->End(0, &end));
-  EXPECT_NEAR(11255.0 / 44100.0, end, 0.000001);
+  media::TimeIntervals ranges = b->reader->GetBuffered();
+  EXPECT_EQ(1U, ranges.Length());
+
+  EXPECT_NEAR(166.0 / 2500.0, ranges.Start(0).ToSeconds(), 0.000001);
+  EXPECT_NEAR(11255.0 / 44100.0, ranges.End(0).ToSeconds(), 0.000001);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/imagecapture/ImageCapture.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/imagecapture/ImageCapture.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/imagecapture/ImageCapture.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/imagecapture/ImageCapture.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -18,8 +18,6 @@
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
-
 PRLogModuleInfo* GetICLog()
 {
   static PRLogModuleInfo* log = nullptr;
@@ -29,8 +27,6 @@
   return log;
 }
 
-#endif
-
 namespace dom {
 
 NS_IMPL_CYCLE_COLLECTION_INHERITED(ImageCapture, DOMEventTargetHelper,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/imagecapture/ImageCapture.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/imagecapture/ImageCapture.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/imagecapture/ImageCapture.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/imagecapture/ImageCapture.h	2015-05-25 20:43:41.000000000 +0000
@@ -9,25 +9,15 @@
 
 #include "mozilla/DOMEventTargetHelper.h"
 #include "mozilla/dom/ImageCaptureBinding.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
-
 #ifndef IC_LOG
 PRLogModuleInfo* GetICLog();
-#define IC_LOG(...) PR_LOG(GetICLog(), PR_LOG_DEBUG, (__VA_ARGS__))
-#endif
-
-#else
-
-#ifndef IC_LOG
-#define IC_LOG(...)
+#define IC_LOG(...) MOZ_LOG(GetICLog(), PR_LOG_DEBUG, (__VA_ARGS__))
 #endif
 
-#endif // PR_LOGGING
-
 namespace dom {
 
 class Blob;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/Intervals.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/Intervals.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/Intervals.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/Intervals.h	2015-05-25 20:43:39.000000000 +0000
@@ -118,7 +118,7 @@
   bool Contains(const SelfType& aOther) const
   {
     return (mStart - mFuzz <= aOther.mStart + aOther.mFuzz) &&
-      (aOther.mEnd + aOther.mFuzz <= mEnd - mFuzz);
+      (aOther.mEnd - aOther.mFuzz <= mEnd + mFuzz);
   }
 
   bool ContainsStrict(const SelfType& aOther) const
@@ -128,6 +128,13 @@
 
   bool Intersects(const SelfType& aOther) const
   {
+    return (mStart - mFuzz < aOther.mEnd + aOther.mFuzz) &&
+      (aOther.mStart - aOther.mFuzz < mEnd + mFuzz);
+  }
+
+  // Same as Intersects, but including the boundaries.
+  bool Touches(const SelfType& aOther) const
+  {
     return (mStart - mFuzz <= aOther.mEnd + aOther.mFuzz) &&
       (aOther.mStart - aOther.mFuzz <= mEnd + mFuzz);
   }
@@ -139,7 +146,17 @@
     return mEnd <= aOther.mStart && aOther.mStart - mEnd <= mFuzz + aOther.mFuzz;
   }
 
-  SelfType Union(const SelfType& aOther) const
+  bool RightOf(const SelfType& aOther) const
+  {
+    return aOther.mEnd - aOther.mFuzz <= mStart + mFuzz;
+  }
+
+  bool LeftOf(const SelfType& aOther) const
+  {
+    return mEnd - mFuzz <= aOther.mStart + aOther.mFuzz;
+  }
+
+  SelfType Span(const SelfType& aOther) const
   {
     SelfType result(*this);
     if (aOther.mStart < mStart) {
@@ -176,6 +193,11 @@
     return mStart == mEnd;
   }
 
+  void SetFuzz(const T& aFuzz)
+  {
+    mFuzz = aFuzz;
+  }
+
   T mStart;
   T mEnd;
   T mFuzz;
@@ -183,6 +205,8 @@
 private:
 };
 
+// An IntervalSet in a collection of Intervals. The IntervalSet is always
+// normalized.
 template<typename T>
 class IntervalSet
 {
@@ -205,18 +229,22 @@
   }
 
   IntervalSet(SelfType&& aOther)
-    : mIntervals(Move(aOther.mIntervals))
   {
+    mIntervals.MoveElementsFrom(Move(aOther.mIntervals));
   }
 
   explicit IntervalSet(const ElemType& aOther)
   {
-    mIntervals.AppendElement(aOther);
+    if (!aOther.IsEmpty()) {
+      mIntervals.AppendElement(aOther);
+    }
   }
 
   explicit IntervalSet(ElemType&& aOther)
   {
-    mIntervals.AppendElement(Move(aOther));
+    if (!aOther.IsEmpty()) {
+      mIntervals.AppendElement(Move(aOther));
+    }
   }
 
   SelfType& operator= (const SelfType& aOther)
@@ -247,19 +275,55 @@
     return *this;
   }
 
-  // + and += operator will append the provided interval or intervalset.
-  // Note that the result is not normalized. Call Normalize() as required.
-  // Alternatively, use Union()
-
   SelfType& Add(const SelfType& aIntervals)
   {
     mIntervals.AppendElements(aIntervals.mIntervals);
+    Normalize();
     return *this;
   }
 
   SelfType& Add(const ElemType& aInterval)
   {
-    mIntervals.AppendElement(aInterval);
+    if (aInterval.IsEmpty()) {
+      return *this;
+    }
+    if (mIntervals.IsEmpty()) {
+      mIntervals.AppendElement(aInterval);
+      return *this;
+    }
+    // Most of our actual usage is adding an interval that will be outside the
+    // range. We can speed up normalization here.
+    if (aInterval.RightOf(mIntervals.LastElement()) &&
+        !aInterval.Touches(mIntervals.LastElement())) {
+      mIntervals.AppendElement(aInterval);
+      return *this;
+    }
+
+    ContainerType normalized;
+    ElemType current(aInterval);
+    bool inserted = false;
+    IndexType i = 0;
+    for (; i < mIntervals.Length(); i++) {
+      ElemType& interval = mIntervals[i];
+      if (current.Touches(interval)) {
+        current = current.Span(interval);
+      } else if (current.LeftOf(interval)) {
+        normalized.AppendElement(Move(current));
+        inserted = true;
+        break;
+      } else {
+        normalized.AppendElement(Move(interval));
+      }
+    }
+    if (!inserted) {
+      normalized.AppendElement(Move(current));
+    }
+    for (; i < mIntervals.Length(); i++) {
+      normalized.AppendElement(Move(mIntervals[i]));
+    }
+    mIntervals.Clear();
+    mIntervals.MoveElementsFrom(Move(normalized));
+
     return *this;
   }
 
@@ -299,18 +363,15 @@
   }
 
   // Mutate this IntervalSet to be the union of this and aOther.
-  // Resulting IntervalSet is normalized.
   SelfType& Union(const SelfType& aOther)
   {
     Add(aOther);
-    Normalize();
     return *this;
   }
 
   SelfType& Union(const ElemType& aInterval)
   {
     Add(aInterval);
-    Normalize();
     return *this;
   }
 
@@ -331,8 +392,8 @@
         j++;
       }
     }
-
-    mIntervals = intersection;
+    mIntervals.Clear();
+    mIntervals.MoveElementsFrom(Move(intersection));
     return *this;
   }
 
@@ -417,63 +478,56 @@
     }
   }
 
-  bool Contains(const T& aX) {
+  bool Contains(const ElemType& aInterval) const {
     for (const auto& interval : mIntervals) {
-      if (interval.Contains(aX)) {
+      if (aInterval.LeftOf(interval)) {
+        // Will never succeed.
+        return false;
+      }
+      if (interval.Contains(aInterval)) {
         return true;
       }
     }
     return false;
   }
 
-  bool ContainsStrict(const T& aX) {
+  bool Contains(const T& aX) const {
     for (const auto& interval : mIntervals) {
-      if (interval.ContainsStrict(aX)) {
+      if (interval.Contains(aX)) {
         return true;
       }
     }
     return false;
   }
 
-  void Normalize()
-  {
-    if (mIntervals.Length() >= 2) {
-      ContainerType normalized;
-
-      mIntervals.Sort(CompareIntervals());
-
-      // This merges the intervals.
-      ElemType current(mIntervals[0]);
-      for (IndexType i = 1; i < mIntervals.Length(); i++) {
-        if (current.Contains(mIntervals[i])) {
-          continue;
-        }
-        if (current.Intersects(mIntervals[i])) {
-          current = current.Union(mIntervals[i]);
-        } else {
-          normalized.AppendElement(current);
-          current = mIntervals[i];
-        }
+  bool ContainsStrict(const T& aX) const {
+    for (const auto& interval : mIntervals) {
+      if (interval.ContainsStrict(aX)) {
+        return true;
       }
-
-      normalized.AppendElement(current);
-
-      mIntervals = normalized;
     }
+    return false;
   }
 
   // Shift all values by aOffset.
-  void Shift(T aOffset)
+  void Shift(const T& aOffset)
   {
     for (auto& interval : mIntervals) {
-      interval.mStart += aOffset;
-      interval.mEnd += aOffset;
+      interval.mStart = interval.mStart + aOffset;
+      interval.mEnd = interval.mEnd + aOffset;
     }
   }
 
+  void SetFuzz(const T& aFuzz) {
+    for (auto& interval : mIntervals) {
+      interval.SetFuzz(aFuzz);
+    }
+    Normalize();
+  }
+
   static const IndexType NoIndex = IndexType(-1);
 
-  IndexType Find(T aValue) const
+  IndexType Find(const T& aValue) const
   {
     for (IndexType i = 0; i < mIntervals.Length(); i++) {
       if (mIntervals[i].Contains(aValue)) {
@@ -487,6 +541,31 @@
   ContainerType mIntervals;
 
 private:
+  void Normalize()
+  {
+    if (mIntervals.Length() >= 2) {
+      ContainerType normalized;
+
+      mIntervals.Sort(CompareIntervals());
+
+      // This merges the intervals.
+      ElemType current(mIntervals[0]);
+      for (IndexType i = 1; i < mIntervals.Length(); i++) {
+        ElemType& interval = mIntervals[i];
+        if (current.Touches(interval)) {
+          current = current.Span(interval);
+        } else {
+          normalized.AppendElement(Move(current));
+          current = Move(interval);
+        }
+      }
+      normalized.AppendElement(Move(current));
+
+      mIntervals.Clear();
+      mIntervals.MoveElementsFrom(Move(normalized));
+    }
+  }
+
   struct CompareIntervals
   {
     bool Equals(const ElemType& aT1, const ElemType& aT2) const
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/Latency.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/Latency.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/Latency.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/Latency.cpp	2015-05-25 20:43:39.000000000 +0000
@@ -6,7 +6,7 @@
 
 #include "Latency.h"
 #include "nsThreadUtils.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include <cmath>
 #include <algorithm>
 
@@ -191,11 +191,11 @@
                                   TimeStamp aTimeStamp)
 {
   if (aTimeStamp.IsNull()) {
-    PR_LOG(GetLatencyLog(), PR_LOG_DEBUG,
+    MOZ_LOG(GetLatencyLog(), PR_LOG_DEBUG,
       ("Latency: %s,%llu,%lld,%lld",
        LatencyLogIndex2Strings[aIndex], aID, GetTimeStamp(), aValue));
   } else {
-    PR_LOG(GetLatencyLog(), PR_LOG_DEBUG,
+    MOZ_LOG(GetLatencyLog(), PR_LOG_DEBUG,
       ("Latency: %s,%llu,%lld,%lld,%lld",
        LatencyLogIndex2Strings[aIndex], aID, GetTimeStamp(), aValue,
        static_cast<int64_t>((aTimeStamp - gAsyncLogger->mStart).ToMilliseconds())));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/Latency.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/Latency.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/Latency.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/Latency.h	2015-05-25 20:43:39.000000000 +0000
@@ -8,7 +8,7 @@
 #define MOZILLA_LATENCY_H
 
 #include "mozilla/TimeStamp.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsCOMPtr.h"
 #include "nsIThread.h"
 #include "mozilla/Monitor.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaCache.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaCache.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaCache.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaCache.cpp	2015-05-25 20:43:39.000000000 +0000
@@ -11,7 +11,7 @@
 #include "nsContentUtils.h"
 #include "nsThreadUtils.h"
 #include "MediaResource.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "mozilla/Preferences.h"
 #include "FileBlockCache.h"
 #include "nsAnonymousTemporaryFile.h"
@@ -24,12 +24,8 @@
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
 PRLogModuleInfo* gMediaCacheLog;
-#define CACHE_LOG(type, msg) PR_LOG(gMediaCacheLog, type, msg)
-#else
-#define CACHE_LOG(type, msg)
-#endif
+#define CACHE_LOG(type, msg) MOZ_LOG(gMediaCacheLog, type, msg)
 
 // Readahead blocks for non-seekable streams will be limited to this
 // fraction of the cache space. We don't normally evict such blocks
@@ -587,11 +583,9 @@
   rv = mFileCache->Open(fileDesc);
   NS_ENSURE_SUCCESS(rv,rv);
 
-#ifdef PR_LOGGING
   if (!gMediaCacheLog) {
     gMediaCacheLog = PR_NewLogModule("MediaCache");
   }
-#endif
 
   MediaCacheFlusher::Init();
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaData.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaData.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaData.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaData.cpp	2015-05-25 20:43:39.000000000 +0000
@@ -3,6 +3,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 #include "MediaData.h"
 #include "MediaInfo.h"
 #ifdef MOZ_OMX_DECODER
@@ -505,8 +506,10 @@
   if (!EnsureCapacity(aSize)) {
     return;
   }
-  mBuffer->AppendElements(aData, aSize);
-  mBuffer->AppendElements(RAW_DATA_ALIGNMENT);
+
+  // We ensure sufficient capacity above so this shouldn't fail.
+  MOZ_ALWAYS_TRUE(mBuffer->AppendElements(aData, aSize));
+  MOZ_ALWAYS_TRUE(mBuffer->AppendElements(RAW_DATA_ALIGNMENT));
   mSize = aSize;
 }
 
@@ -525,8 +528,10 @@
     if (!s->EnsureCapacity(mSize)) {
       return nullptr;
     }
-    s->mBuffer->AppendElements(mData, mSize);
-    s->mBuffer->AppendElements(RAW_DATA_ALIGNMENT);
+
+    // We ensure sufficient capacity above so this shouldn't fail.
+    MOZ_ALWAYS_TRUE(s->mBuffer->AppendElements(mData, mSize));
+    MOZ_ALWAYS_TRUE(s->mBuffer->AppendElements(RAW_DATA_ALIGNMENT));
     s->mSize = mSize;
   }
   return s.forget();
@@ -538,7 +543,7 @@
   if (mData && mBuffer->Capacity() >= aSize + RAW_DATA_ALIGNMENT * 2) {
     return true;
   }
-  if (!mBuffer->SetCapacity(aSize + RAW_DATA_ALIGNMENT * 2)) {
+  if (!mBuffer->SetCapacity(aSize + RAW_DATA_ALIGNMENT * 2, fallible)) {
     return false;
   }
   // Find alignment address.
@@ -555,7 +560,8 @@
   if (shift == 0) {
     // Nothing to do.
   } else if (shift > 0) {
-    mBuffer->InsertElementsAt(oldpadding, shift);
+    // We ensure sufficient capacity above so this shouldn't fail.
+    MOZ_ALWAYS_TRUE(mBuffer->InsertElementsAt(oldpadding, shift, fallible));
   } else {
     mBuffer->RemoveElementsAt(mPadding, -shift);
   }
@@ -616,8 +622,11 @@
   if (aSize > mTarget->mSize && !EnsureSize(aSize)) {
     return false;
   }
-  // Pad our buffer.
-  mBuffer->SetLength(aSize + mTarget->mPadding + RAW_DATA_ALIGNMENT);
+
+  // Pad our buffer. We ensure sufficient capacity above so this shouldn't fail.
+  MOZ_ALWAYS_TRUE(
+    mBuffer->SetLength(aSize + mTarget->mPadding + RAW_DATA_ALIGNMENT,
+                       fallible));
   mTarget->mSize = mSize = aSize;
   return true;
 }
@@ -628,7 +637,9 @@
   if (!EnsureSize(aSize + mTarget->mSize)) {
     return false;
   }
-  mBuffer->InsertElementsAt(mTarget->mPadding, aData, aSize);
+
+  // We ensure sufficient capacity above so this shouldn't fail.
+  MOZ_ALWAYS_TRUE(mBuffer->InsertElementsAt(mTarget->mPadding, aData, aSize));
   mTarget->mSize += aSize;
   mSize = mTarget->mSize;
   return true;
@@ -640,7 +651,10 @@
   if (!EnsureSize(aSize)) {
     return false;
   }
-  mBuffer->ReplaceElementsAt(mTarget->mPadding, mTarget->mSize, aData, aSize);
+
+  // We ensure sufficient capacity above so this shouldn't fail.
+  MOZ_ALWAYS_TRUE(mBuffer->ReplaceElementsAt(mTarget->mPadding, mTarget->mSize,
+                                             aData, aSize, fallible));
   mTarget->mSize = mSize = aSize;
   return true;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaDecoder.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaDecoder.cpp	2015-05-25 20:43:39.000000000 +0000
@@ -12,7 +12,6 @@
 #include "nsTArray.h"
 #include "VideoUtils.h"
 #include "MediaDecoderStateMachine.h"
-#include "mozilla/dom/TimeRanges.h"
 #include "ImageContainer.h"
 #include "MediaResource.h"
 #include "nsError.h"
@@ -52,13 +51,9 @@
 // avoid redefined macro in unified build
 #undef DECODER_LOG
 
-#ifdef PR_LOGGING
 PRLogModuleInfo* gMediaDecoderLog;
 #define DECODER_LOG(x, ...) \
-  PR_LOG(gMediaDecoderLog, PR_LOG_DEBUG, ("Decoder=%p " x, this, ##__VA_ARGS__))
-#else
-#define DECODER_LOG(x, ...)
-#endif
+  MOZ_LOG(gMediaDecoderLog, PR_LOG_DEBUG, ("Decoder=%p " x, this, ##__VA_ARGS__))
 
 static const char* const gPlayStateStr[] = {
   "START",
@@ -120,6 +115,7 @@
 PRLogModuleInfo* gStateWatchingLog;
 PRLogModuleInfo* gMediaPromiseLog;
 PRLogModuleInfo* gMediaTimerLog;
+PRLogModuleInfo* gMediaSampleLog;
 
 void
 MediaDecoder::InitStatics()
@@ -131,6 +127,7 @@
   gMediaPromiseLog = PR_NewLogModule("MediaPromise");
   gStateWatchingLog = PR_NewLogModule("StateWatching");
   gMediaTimerLog = PR_NewLogModule("MediaTimer");
+  gMediaSampleLog = PR_NewLogModule("MediaSample");
 }
 
 NS_IMPL_ISUPPORTS(MediaMemoryTracker, nsIMemoryReporter)
@@ -212,7 +209,7 @@
         mDecoderStateMachine,
         &MediaDecoderStateMachine::SetDormant,
         true);
-    mDecoderStateMachine->TaskQueue()->Dispatch(event);
+    mDecoderStateMachine->TaskQueue()->Dispatch(event.forget());
 
     if (IsEnded()) {
       mWasEndedWhenEnteredDormant = true;
@@ -228,7 +225,7 @@
         mDecoderStateMachine,
         &MediaDecoderStateMachine::SetDormant,
         false);
-    mDecoderStateMachine->TaskQueue()->Dispatch(event);
+    mDecoderStateMachine->TaskQueue()->Dispatch(event.forget());
   }
 }
 
@@ -298,154 +295,23 @@
 
   // The output stream must stay in sync with the decoded stream, so if
   // either stream is blocked, we block the other.
-  aStream->mPort = aStream->mStream->AllocateInputPort(mDecodedStream->mStream,
+  aStream->mPort = aStream->mStream->AllocateInputPort(GetDecodedStream()->mStream,
       MediaInputPort::FLAG_BLOCK_INPUT | MediaInputPort::FLAG_BLOCK_OUTPUT);
   // Unblock the output stream now. While it's connected to mDecodedStream,
   // mDecodedStream is responsible for controlling blocking.
   aStream->mStream->ChangeExplicitBlockerCount(-1);
 }
 
-MediaDecoder::DecodedStreamData::DecodedStreamData(MediaDecoder* aDecoder,
-                                                   int64_t aInitialTime,
-                                                   SourceMediaStream* aStream)
-  : mAudioFramesWritten(0),
-    mInitialTime(aInitialTime),
-    mNextVideoTime(-1),
-    mNextAudioTime(-1),
-    mDecoder(aDecoder),
-    mStreamInitialized(false),
-    mHaveSentFinish(false),
-    mHaveSentFinishAudio(false),
-    mHaveSentFinishVideo(false),
-    mStream(aStream),
-    mHaveBlockedForPlayState(false),
-    mHaveBlockedForStateMachineNotPlaying(false)
-{
-  mListener = new DecodedStreamGraphListener(mStream, this);
-  mStream->AddListener(mListener);
-}
-
-MediaDecoder::DecodedStreamData::~DecodedStreamData()
-{
-  mListener->Forget();
-  mStream->Destroy();
-}
-
-MediaDecoder::DecodedStreamGraphListener::DecodedStreamGraphListener(MediaStream* aStream,
-                                                                     DecodedStreamData* aData)
-  : mData(aData),
-    mMutex("MediaDecoder::DecodedStreamData::mMutex"),
-    mStream(aStream),
-    mLastOutputTime(aStream->
-                    StreamTimeToMicroseconds(aStream->GetCurrentTime())),
-    mStreamFinishedOnMainThread(false)
-{
-}
-
-void
-MediaDecoder::DecodedStreamGraphListener::NotifyOutput(MediaStreamGraph* aGraph,
-                                                       GraphTime aCurrentTime)
-{
-  MutexAutoLock lock(mMutex);
-  if (mStream) {
-    mLastOutputTime = mStream->
-      StreamTimeToMicroseconds(mStream->GraphTimeToStreamTime(aCurrentTime));
-  }
-}
-
-void
-MediaDecoder::DecodedStreamGraphListener::DoNotifyFinished()
-{
-  MutexAutoLock lock(mMutex);
-  mStreamFinishedOnMainThread = true;
-}
-
-void
-MediaDecoder::DecodedStreamGraphListener::NotifyEvent(MediaStreamGraph* aGraph,
-  MediaStreamListener::MediaStreamGraphEvent event)
-{
-  if (event == EVENT_FINISHED) {
-    nsCOMPtr<nsIRunnable> event =
-      NS_NewRunnableMethod(this, &DecodedStreamGraphListener::DoNotifyFinished);
-    aGraph->DispatchToMainThreadAfterStreamStateUpdate(event.forget());
-  }
-}
-
-class MediaDecoder::OutputStreamListener : public MediaStreamListener {
-public:
-  OutputStreamListener(MediaDecoder* aDecoder, MediaStream* aStream)
-    : mDecoder(aDecoder), mStream(aStream) {}
-
-  virtual void NotifyEvent(
-      MediaStreamGraph* aGraph,
-      MediaStreamListener::MediaStreamGraphEvent event) override {
-    if (event == EVENT_FINISHED) {
-      nsCOMPtr<nsIRunnable> r = NS_NewRunnableMethod(
-          this, &OutputStreamListener::DoNotifyFinished);
-      aGraph->DispatchToMainThreadAfterStreamStateUpdate(r.forget());
-    }
-  }
-
-  void Forget() {
-    MOZ_ASSERT(NS_IsMainThread());
-    mDecoder = nullptr;
-  }
-
-private:
-  void DoNotifyFinished() {
-    MOZ_ASSERT(NS_IsMainThread());
-    if (!mDecoder) {
-      return;
-    }
-
-    // Remove the finished stream so it won't block the decoded stream.
-    ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
-    auto& streams = mDecoder->OutputStreams();
-    // Don't read |mDecoder| in the loop since removing the element will lead
-    // to ~OutputStreamData() which will call Forget() to reset |mDecoder|.
-    for (int32_t i = streams.Length() - 1; i >= 0; --i) {
-      auto& os = streams[i];
-      MediaStream* p = os.mStream.get();
-      if (p == mStream.get()) {
-        if (os.mPort) {
-          os.mPort->Destroy();
-          os.mPort = nullptr;
-        }
-        streams.RemoveElementAt(i);
-        break;
-      }
-    }
-  }
-
-  // Main thread only
-  MediaDecoder* mDecoder;
-  nsRefPtr<MediaStream> mStream;
-};
-
-void
-MediaDecoder::OutputStreamData::Init(MediaDecoder* aDecoder,
-                                     ProcessedMediaStream* aStream)
-{
-  mStream = aStream;
-  mListener = new OutputStreamListener(aDecoder, aStream);
-  aStream->AddListener(mListener);
-}
-
-MediaDecoder::OutputStreamData::~OutputStreamData()
-{
-  mListener->Forget();
-}
-
 void MediaDecoder::UpdateDecodedStream()
 {
   MOZ_ASSERT(NS_IsMainThread());
   GetReentrantMonitor().AssertCurrentThreadIn();
 
-  if (mDecodedStream) {
+  if (GetDecodedStream()) {
     bool blockForPlayState = mPlayState != PLAY_STATE_PLAYING || mLogicallySeeking;
-    if (mDecodedStream->mHaveBlockedForPlayState != blockForPlayState) {
-      mDecodedStream->mStream->ChangeExplicitBlockerCount(blockForPlayState ? 1 : -1);
-      mDecodedStream->mHaveBlockedForPlayState = blockForPlayState;
+    if (GetDecodedStream()->mHaveBlockedForPlayState != blockForPlayState) {
+      GetDecodedStream()->mStream->ChangeExplicitBlockerCount(blockForPlayState ? 1 : -1);
+      GetDecodedStream()->mHaveBlockedForPlayState = blockForPlayState;
     }
   }
 }
@@ -462,8 +328,9 @@
 
   // All streams are having their SourceMediaStream disconnected, so they
   // need to be explicitly blocked again.
-  for (int32_t i = mOutputStreams.Length() - 1; i >= 0; --i) {
-    OutputStreamData& os = mOutputStreams[i];
+  auto& outputStreams = OutputStreams();
+  for (int32_t i = outputStreams.Length() - 1; i >= 0; --i) {
+    OutputStreamData& os = outputStreams[i];
     // Explicitly remove all existing ports.
     // This is not strictly necessary but it's good form.
     MOZ_ASSERT(os.mPort, "Double-delete of the ports!");
@@ -474,32 +341,31 @@
     // be careful not to send any messages after the Destroy().
     if (os.mStream->IsDestroyed()) {
       // Probably the DOM MediaStream was GCed. Clean up.
-      mOutputStreams.RemoveElementAt(i);
+      outputStreams.RemoveElementAt(i);
     } else {
       os.mStream->ChangeExplicitBlockerCount(1);
     }
   }
 
-  mDecodedStream = nullptr;
+  mDecodedStream.DestroyData();
 }
 
 void MediaDecoder::UpdateStreamBlockingForStateMachinePlaying()
 {
   GetReentrantMonitor().AssertCurrentThreadIn();
-  if (!mDecodedStream) {
+  if (!GetDecodedStream()) {
     return;
   }
   bool blockForStateMachineNotPlaying =
-    mDecoderStateMachine && !mDecoderStateMachine->IsPlaying() &&
-    mDecoderStateMachine->GetState() != MediaDecoderStateMachine::DECODER_STATE_COMPLETED;
-  if (blockForStateMachineNotPlaying != mDecodedStream->mHaveBlockedForStateMachineNotPlaying) {
-    mDecodedStream->mHaveBlockedForStateMachineNotPlaying = blockForStateMachineNotPlaying;
+    mDecoderStateMachine && !mDecoderStateMachine->IsPlaying();
+  if (blockForStateMachineNotPlaying != GetDecodedStream()->mHaveBlockedForStateMachineNotPlaying) {
+    GetDecodedStream()->mHaveBlockedForStateMachineNotPlaying = blockForStateMachineNotPlaying;
     int32_t delta = blockForStateMachineNotPlaying ? 1 : -1;
     if (NS_IsMainThread()) {
-      mDecodedStream->mStream->ChangeExplicitBlockerCount(delta);
+      GetDecodedStream()->mStream->ChangeExplicitBlockerCount(delta);
     } else {
       nsCOMPtr<nsIRunnable> runnable =
-          NS_NewRunnableMethodWithArg<int32_t>(mDecodedStream->mStream.get(),
+          NS_NewRunnableMethodWithArg<int32_t>(GetDecodedStream()->mStream.get(),
               &MediaStream::ChangeExplicitBlockerCount, delta);
       NS_DispatchToMainThread(runnable);
     }
@@ -514,28 +380,27 @@
   DECODER_LOG("RecreateDecodedStream aStartTimeUSecs=%lld!", aStartTimeUSecs);
 
   if (!aGraph) {
-    aGraph = mDecodedStream->mStream->Graph();
+    aGraph = GetDecodedStream()->mStream->Graph();
   }
   DestroyDecodedStream();
 
-  mDecodedStream = new DecodedStreamData(this,
-                                         aStartTimeUSecs,
-                                         aGraph->CreateSourceStream(nullptr));
+  mDecodedStream.RecreateData(this, aStartTimeUSecs, aGraph->CreateSourceStream(nullptr));
 
   // Note that the delay between removing ports in DestroyDecodedStream
   // and adding new ones won't cause a glitch since all graph operations
   // between main-thread stable states take effect atomically.
-  for (int32_t i = mOutputStreams.Length() - 1; i >= 0; --i) {
-    OutputStreamData& os = mOutputStreams[i];
+  auto& outputStreams = OutputStreams();
+  for (int32_t i = outputStreams.Length() - 1; i >= 0; --i) {
+    OutputStreamData& os = outputStreams[i];
     MOZ_ASSERT(!os.mStream->IsDestroyed(),
         "Should've been removed in DestroyDecodedStream()");
     ConnectDecodedStreamToOutputStream(&os);
   }
   UpdateStreamBlockingForStateMachinePlaying();
 
-  mDecodedStream->mHaveBlockedForPlayState = mPlayState != PLAY_STATE_PLAYING;
-  if (mDecodedStream->mHaveBlockedForPlayState) {
-    mDecodedStream->mStream->ChangeExplicitBlockerCount(1);
+  GetDecodedStream()->mHaveBlockedForPlayState = mPlayState != PLAY_STATE_PLAYING;
+  if (GetDecodedStream()->mHaveBlockedForPlayState) {
+    GetDecodedStream()->mStream->ChangeExplicitBlockerCount(1);
   }
 }
 
@@ -553,7 +418,7 @@
     if (!GetDecodedStream()) {
       RecreateDecodedStream(mLogicalPosition, aStream->Graph());
     }
-    OutputStreamData* os = mOutputStreams.AppendElement();
+    OutputStreamData* os = OutputStreams().AppendElement();
     os->Init(this, aStream);
     ConnectDecodedStreamToOutputStream(os);
     if (aFinishWhenEnded) {
@@ -1425,22 +1290,21 @@
   return mMediaSeekable;
 }
 
-nsresult MediaDecoder::GetSeekable(dom::TimeRanges* aSeekable)
+media::TimeIntervals MediaDecoder::GetSeekable()
 {
-  double initialTime = 0.0;
-
   // We can seek in buffered range if the media is seekable. Also, we can seek
   // in unbuffered ranges if the transport level is seekable (local file or the
   // server supports range requests, etc.)
   if (!IsMediaSeekable()) {
-    return NS_OK;
+    return media::TimeIntervals();
   } else if (!IsTransportSeekable()) {
-    return GetBuffered(aSeekable);
+    return GetBuffered();
   } else {
-    double end = IsInfinite() ? std::numeric_limits<double>::infinity()
-                              : initialTime + GetDuration();
-    aSeekable->Add(initialTime, end);
-    return NS_OK;
+    return media::TimeIntervals(
+      media::TimeInterval(media::TimeUnit::FromMicroseconds(0),
+                          IsInfinite() ?
+                            media::TimeUnit::FromInfinity() :
+                            media::TimeUnit::FromSeconds(GetDuration())));
   }
 }
 
@@ -1586,9 +1450,9 @@
 
 // Constructs the time ranges representing what segments of the media
 // are buffered and playable.
-nsresult MediaDecoder::GetBuffered(dom::TimeRanges* aBuffered) {
-  NS_ENSURE_TRUE(mDecoderStateMachine && !mShuttingDown, NS_ERROR_FAILURE);
-  return mDecoderStateMachine->GetBuffered(aBuffered);
+media::TimeIntervals MediaDecoder::GetBuffered() {
+  NS_ENSURE_TRUE(mDecoderStateMachine && !mShuttingDown, media::TimeIntervals::Invalid());
+  return mDecoderStateMachine->GetBuffered();
 }
 
 size_t MediaDecoder::SizeOfVideoQueue() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaDecoder.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaDecoder.h	2015-05-25 20:43:39.000000000 +0000
@@ -192,31 +192,23 @@
 #include "MediaPromise.h"
 #include "MediaResource.h"
 #include "mozilla/dom/AudioChannelBinding.h"
-#include "mozilla/gfx/Rect.h"
 #include "mozilla/ReentrantMonitor.h"
 #include "MediaDecoderOwner.h"
 #include "MediaStreamGraph.h"
 #include "AbstractMediaDecoder.h"
+#include "DecodedStream.h"
 #include "StateMirroring.h"
 #include "StateWatching.h"
 #include "necko-config.h"
 #ifdef MOZ_EME
 #include "mozilla/CDMProxy.h"
 #endif
+#include "TimeUnits.h"
 
 class nsIStreamListener;
 class nsIPrincipal;
 
 namespace mozilla {
-namespace dom {
-class TimeRanges;
-}
-}
-
-namespace mozilla {
-namespace layers {
-class Image;
-} //namespace layers
 
 class VideoFrameContainer;
 class MediaDecoderStateMachine;
@@ -284,7 +276,6 @@
   };
 
   typedef MediaPromise<SeekResolveValue, bool /* aIgnored */, /* IsExclusive = */ true> SeekPromise;
-  class DecodedStreamGraphListener;
 
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIOBSERVER
@@ -404,110 +395,6 @@
   // replaying after the input as ended. In the latter case, the new source is
   // not connected to streams created by captureStreamUntilEnded.
 
-  struct DecodedStreamData {
-    typedef gfx::IntSize IntSize;
-
-    DecodedStreamData(MediaDecoder* aDecoder,
-                      int64_t aInitialTime, SourceMediaStream* aStream);
-    ~DecodedStreamData();
-
-    // microseconds
-    bool IsFinished() const {
-      return mListener->IsFinishedOnMainThread();
-    }
-
-    int64_t GetClock() const {
-      return mInitialTime + mListener->GetLastOutputTime();
-    }
-
-    // The following group of fields are protected by the decoder's monitor
-    // and can be read or written on any thread.
-    // Count of audio frames written to the stream
-    int64_t mAudioFramesWritten;
-    // Saved value of aInitialTime. Timestamp of the first audio and/or
-    // video packet written.
-    const int64_t mInitialTime; // microseconds
-    // mNextVideoTime is the end timestamp for the last packet sent to the stream.
-    // Therefore video packets starting at or after this time need to be copied
-    // to the output stream.
-    int64_t mNextVideoTime; // microseconds
-    int64_t mNextAudioTime; // microseconds
-    MediaDecoder* mDecoder;
-    // The last video image sent to the stream. Useful if we need to replicate
-    // the image.
-    nsRefPtr<layers::Image> mLastVideoImage;
-    IntSize mLastVideoImageDisplaySize;
-    // This is set to true when the stream is initialized (audio and
-    // video tracks added).
-    bool mStreamInitialized;
-    bool mHaveSentFinish;
-    bool mHaveSentFinishAudio;
-    bool mHaveSentFinishVideo;
-
-    // The decoder is responsible for calling Destroy() on this stream.
-    // Can be read from any thread.
-    const nsRefPtr<SourceMediaStream> mStream;
-    // Can be read from any thread.
-    nsRefPtr<DecodedStreamGraphListener> mListener;
-    // True when we've explicitly blocked this stream because we're
-    // not in PLAY_STATE_PLAYING. Used on the main thread only.
-    bool mHaveBlockedForPlayState;
-    // We also have an explicit blocker on the stream when
-    // mDecoderStateMachine is non-null and MediaDecoderStateMachine is false.
-    bool mHaveBlockedForStateMachineNotPlaying;
-  };
-
-  class DecodedStreamGraphListener : public MediaStreamListener {
-  public:
-    DecodedStreamGraphListener(MediaStream* aStream, DecodedStreamData* aData);
-    virtual void NotifyOutput(MediaStreamGraph* aGraph, GraphTime aCurrentTime) override;
-    virtual void NotifyEvent(MediaStreamGraph* aGraph,
-                             MediaStreamListener::MediaStreamGraphEvent event) override;
-
-    void DoNotifyFinished();
-
-    int64_t GetLastOutputTime() // microseconds
-    {
-      MutexAutoLock lock(mMutex);
-      return mLastOutputTime;
-    }
-    void Forget()
-    {
-      NS_ASSERTION(NS_IsMainThread(), "Main thread only");
-      mData = nullptr;
-
-      MutexAutoLock lock(mMutex);
-      mStream = nullptr;
-    }
-    bool IsFinishedOnMainThread()
-    {
-      MutexAutoLock lock(mMutex);
-      return mStreamFinishedOnMainThread;
-    }
-  private:
-    // Main thread only
-    DecodedStreamData* mData;
-
-    Mutex mMutex;
-    // Protected by mMutex
-    nsRefPtr<MediaStream> mStream;
-    // Protected by mMutex
-    int64_t mLastOutputTime; // microseconds
-    // Protected by mMutex
-    bool mStreamFinishedOnMainThread;
-  };
-
-  class OutputStreamListener;
-
-  struct OutputStreamData {
-    void Init(MediaDecoder* aDecoder, ProcessedMediaStream* aStream);
-    ~OutputStreamData();
-    nsRefPtr<ProcessedMediaStream> mStream;
-    // mPort connects mDecodedStream->mStream to our mStream.
-    nsRefPtr<MediaInputPort> mPort;
-    nsRefPtr<OutputStreamListener> mListener;
-  };
-
   /**
    * Connects mDecodedStream->mStream to aStream->mStream.
    */
@@ -533,15 +420,17 @@
    * Decoder monitor must be held.
    */
   void UpdateStreamBlockingForStateMachinePlaying();
+
   nsTArray<OutputStreamData>& OutputStreams()
   {
     GetReentrantMonitor().AssertCurrentThreadIn();
-    return mOutputStreams;
+    return mDecodedStream.OutputStreams();
   }
+
   DecodedStreamData* GetDecodedStream()
   {
     GetReentrantMonitor().AssertCurrentThreadIn();
-    return mDecodedStream;
+    return mDecodedStream.GetData();
   }
 
   // Add an output stream. All decoder output will be sent to the stream.
@@ -634,7 +523,7 @@
   virtual bool IsTransportSeekable() override;
 
   // Return the time ranges that can be seeked into.
-  virtual nsresult GetSeekable(dom::TimeRanges* aSeekable);
+  virtual media::TimeIntervals GetSeekable();
 
   // Set the end time of the media resource. When playback reaches
   // this point the media pauses. aTime is in seconds.
@@ -692,7 +581,7 @@
 
   // Constructs the time ranges representing what segments of the media
   // are buffered and playable.
-  virtual nsresult GetBuffered(dom::TimeRanges* aBuffered);
+  virtual media::TimeIntervals GetBuffered();
 
   // Returns the size, in bytes, of the heap memory used by the currently
   // queued decoded video and audio data.
@@ -1143,14 +1032,12 @@
 #endif
 
 protected:
-  // Data about MediaStreams that are being fed by this decoder.
-  nsTArray<OutputStreamData> mOutputStreams;
   // The SourceMediaStream we are using to feed the mOutputStreams. This stream
   // is never exposed outside the decoder.
   // Only written on the main thread while holding the monitor. Therefore it
   // can be read on any thread while holding the monitor, or on the main thread
   // without holding the monitor.
-  nsAutoPtr<DecodedStreamData> mDecodedStream;
+  DecodedStream mDecodedStream;
 
   // Set to one of the valid play states.
   // This can only be changed on the main thread while holding the decoder
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaDecoderReader.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaDecoderReader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaDecoderReader.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaDecoderReader.cpp	2015-05-25 20:43:39.000000000 +0000
@@ -20,13 +20,9 @@
 // Un-comment to enable logging of seek bisections.
 //#define SEEK_LOGGING
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* gMediaDecoderLog;
 #define DECODER_LOG(x, ...) \
-  PR_LOG(gMediaDecoderLog, PR_LOG_DEBUG, ("Decoder=%p " x, mDecoder, ##__VA_ARGS__))
-#else
-#define DECODER_LOG(x, ...)
-#endif
+  MOZ_LOG(gMediaDecoderLog, PR_LOG_DEBUG, ("Decoder=%p " x, mDecoder, ##__VA_ARGS__))
 
 // Same workaround as MediaDecoderStateMachine.cpp.
 #define DECODER_WARN_HELPER(a, b) NS_WARNING b
@@ -151,8 +147,8 @@
   mStartTime = aStartTime;
 }
 
-nsresult
-MediaDecoderReader::GetBuffered(mozilla::dom::TimeRanges* aBuffered)
+media::TimeIntervals
+MediaDecoderReader::GetBuffered()
 {
   AutoPinned<MediaResource> stream(mDecoder->GetResource());
   int64_t durationUs = 0;
@@ -160,8 +156,7 @@
     ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
     durationUs = mDecoder->GetMediaDuration();
   }
-  GetEstimatedBufferedTimeRanges(stream, durationUs, aBuffered);
-  return NS_OK;
+  return GetEstimatedBufferedTimeRanges(stream, durationUs);
 }
 
 int64_t
@@ -282,7 +277,7 @@
       // again. We don't just decode straight in a loop here, as that
       // would hog the decode task queue.
       RefPtr<nsIRunnable> task(new ReRequestVideoWithSkipTask(this, aTimeThreshold));
-      mTaskQueue->Dispatch(task);
+      mTaskQueue->Dispatch(task.forget());
       return p;
     }
   }
@@ -318,7 +313,7 @@
     // consumed. (|mVideoSinkBufferCount| > 0)
     if (AudioQueue().GetSize() == 0 && mTaskQueue) {
       RefPtr<nsIRunnable> task(new ReRequestAudioTask(this));
-      mTaskQueue->Dispatch(task);
+      mTaskQueue->Dispatch(task.forget());
       return p;
     }
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaDecoderReader.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaDecoderReader.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaDecoderReader.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaDecoderReader.h	2015-05-25 20:43:39.000000000 +0000
@@ -12,13 +12,10 @@
 #include "MediaPromise.h"
 #include "MediaQueue.h"
 #include "AudioCompactor.h"
+#include "TimeUnits.h"
 
 namespace mozilla {
 
-namespace dom {
-class TimeRanges;
-}
-
 class MediaDecoderReader;
 class SharedDecoderManager;
 
@@ -226,7 +223,7 @@
   // The OggReader relies on this base implementation not performing I/O,
   // since in FirefoxOS we can't do I/O on the main thread, where this is
   // called.
-  virtual nsresult GetBuffered(dom::TimeRanges* aBuffered);
+  virtual media::TimeIntervals GetBuffered();
 
   virtual int64_t ComputeStartTime(const VideoData* aVideo, const AudioData* aAudio);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaDecoderStateMachine.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaDecoderStateMachine.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaDecoderStateMachine.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaDecoderStateMachine.cpp	2015-05-25 20:43:39.000000000 +0000
@@ -21,7 +21,7 @@
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/mozalloc.h"
 #include "VideoUtils.h"
-#include "mozilla/dom/TimeRanges.h"
+#include "TimeUnits.h"
 #include "nsDeque.h"
 #include "AudioSegment.h"
 #include "VideoSegment.h"
@@ -38,6 +38,7 @@
 #include "gfx2DGlue.h"
 #include "nsPrintfCString.h"
 #include "DOMMediaStream.h"
+#include "DecodedStream.h"
 
 #include <algorithm>
 
@@ -50,30 +51,20 @@
 #define NS_DispatchToMainThread(...) CompileError_UseAbstractThreadDispatchInstead
 
 // avoid redefined macro in unified build
+#undef LOG
 #undef DECODER_LOG
 #undef VERBOSE_LOG
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* gMediaDecoderLog;
+extern PRLogModuleInfo* gMediaSampleLog;
+#define LOG(m, l, x, ...) \
+  MOZ_LOG(m, l, ("Decoder=%p " x, mDecoder.get(), ##__VA_ARGS__))
 #define DECODER_LOG(x, ...) \
-  PR_LOG(gMediaDecoderLog, PR_LOG_DEBUG, ("Decoder=%p " x, mDecoder.get(), ##__VA_ARGS__))
-#define VERBOSE_LOG(x, ...)                            \
-    PR_BEGIN_MACRO                                     \
-      if (!PR_GetEnv("MOZ_QUIET")) {                   \
-        DECODER_LOG(x, ##__VA_ARGS__);                 \
-      }                                                \
-    PR_END_MACRO
-#define SAMPLE_LOG(x, ...)                             \
-    PR_BEGIN_MACRO                                     \
-      if (PR_GetEnv("MEDIA_LOG_SAMPLES")) {            \
-        DECODER_LOG(x, ##__VA_ARGS__);                 \
-      }                                                \
-    PR_END_MACRO
-#else
-#define DECODER_LOG(x, ...)
-#define VERBOSE_LOG(x, ...)
-#define SAMPLE_LOG(x, ...)
-#endif
+  LOG(gMediaDecoderLog, PR_LOG_DEBUG, x, ##__VA_ARGS__)
+#define VERBOSE_LOG(x, ...) \
+  LOG(gMediaDecoderLog, PR_LOG_DEBUG+1, x, ##__VA_ARGS__)
+#define SAMPLE_LOG(x, ...) \
+  LOG(gMediaSampleLog, PR_LOG_DEBUG, x, ##__VA_ARGS__)
 
 // Somehow MSVC doesn't correctly delete the comma before ##__VA_ARGS__
 // when __VA_ARGS__ expands to nothing. This is a workaround for it.
@@ -421,6 +412,16 @@
   aOutput->AppendFrame(image.forget(), duration, aIntrinsicSize);
 }
 
+static bool ZeroDurationAtLastChunk(VideoSegment& aInput)
+{
+  // Get the last video frame's start time in VideoSegment aInput.
+  // If the start time is equal to the duration of aInput, means the last video
+  // frame's duration is zero.
+  StreamTime lastVideoStratTime;
+  aInput.GetLastFrame(&lastVideoStratTime);
+  return lastVideoStratTime == aInput.GetDuration();
+}
+
 void MediaDecoderStateMachine::SendStreamData()
 {
   MOZ_ASSERT(OnTaskQueue());
@@ -531,10 +532,25 @@
                       v->mTime, v->GetEndTime());
         }
       }
+      // Check the output is not empty.
+      if (output.GetLastFrame()) {
+        stream->mEOSVideoCompensation = ZeroDurationAtLastChunk(output);
+      }
       if (output.GetDuration() > 0) {
         mediaStream->AppendToTrack(videoTrackId, &output);
       }
       if (VideoQueue().IsFinished() && !stream->mHaveSentFinishVideo) {
+        if (stream->mEOSVideoCompensation) {
+          VideoSegment endSegment;
+          // Calculate the deviation clock time from DecodedStream.
+          int64_t deviation_usec = mediaStream->StreamTimeToMicroseconds(1);
+          WriteVideoToMediaStream(mediaStream, stream->mLastVideoImage,
+            stream->mNextVideoTime + deviation_usec, stream->mNextVideoTime,
+            stream->mLastVideoImageDisplaySize, &endSegment);
+          stream->mNextVideoTime += deviation_usec;
+          MOZ_ASSERT(endSegment.GetDuration() > 0);
+          mediaStream->AppendToTrack(videoTrackId, &endSegment);
+        }
         mediaStream->EndTrack(videoTrackId);
         stream->mHaveSentFinishVideo = true;
       }
@@ -1697,17 +1713,16 @@
   //
   // Make sure to only do this if we have a start time, otherwise the reader
   // doesn't know how to compute GetBuffered.
-  nsRefPtr<dom::TimeRanges> buffered = new dom::TimeRanges();
-  if (mDecoder->IsInfinite() && (mStartTime != -1) &&
-      NS_SUCCEEDED(mDecoder->GetBuffered(buffered)))
-  {
-    uint32_t length = 0;
-    buffered->GetLength(&length);
-    if (length) {
-      double end = 0;
-      buffered->End(length - 1, &end);
+  if (!mDecoder->IsInfinite() || mStartTime == -1) {
+    return;
+  }
+  media::TimeIntervals buffered{mDecoder->GetBuffered()};
+  if (!buffered.IsInvalid()) {
+    bool exists;
+    media::TimeUnit end{buffered.GetEnd(&exists)};
+    if (exists) {
       ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
-      mEndTime = std::max<int64_t>(mEndTime, end * USECS_PER_S);
+      mEndTime = std::max<int64_t>(mEndTime, end.ToMicroseconds());
     }
   }
 }
@@ -2133,9 +2148,10 @@
     return false;
   }
 
-  nsRefPtr<dom::TimeRanges> buffered = new dom::TimeRanges();
-  nsresult rv = mReader->GetBuffered(buffered.get());
-  NS_ENSURE_SUCCESS(rv, false);
+  media::TimeIntervals buffered{mReader->GetBuffered()};
+  if (buffered.IsInvalid()) {
+    return false;
+  }
 
   int64_t endOfDecodedVideoData = INT64_MAX;
   if (HasVideo() && !VideoQueue().AtEndOfStream()) {
@@ -2149,10 +2165,13 @@
     endOfDecodedAudioData = mDecodedAudioEndTime;
   }
   int64_t endOfDecodedData = std::min(endOfDecodedVideoData, endOfDecodedAudioData);
-
-  return endOfDecodedData != INT64_MAX &&
-         !buffered->Contains(static_cast<double>(endOfDecodedData) / USECS_PER_S,
-                             static_cast<double>(std::min(endOfDecodedData + aUsecs, GetDuration())) / USECS_PER_S);
+  if (GetDuration() < endOfDecodedData) {
+    // Our duration is not up to date. No point buffering.
+    return false;
+  }
+  media::TimeInterval interval(media::TimeUnit::FromMicroseconds(endOfDecodedData),
+                               media::TimeUnit::FromMicroseconds(std::min(endOfDecodedData + aUsecs, GetDuration())));
+  return endOfDecodedData != INT64_MAX && !buffered.Contains(interval);
 }
 
 void
@@ -2919,17 +2938,13 @@
   nsRefPtr<VideoData> currentFrame;
   if (VideoQueue().GetSize() > 0) {
     VideoData* frame = VideoQueue().PeekFront();
-#ifdef PR_LOGGING
     int32_t droppedFrames = 0;
-#endif
     while (IsRealTime() || clock_time >= frame->mTime) {
       mVideoFrameEndTime = frame->GetEndTime();
       if (currentFrame) {
         mDecoder->NotifyDecodedFrames(0, 0, 1);
-#ifdef PR_LOGGING
         VERBOSE_LOG("discarding video frame mTime=%lld clock_time=%lld (%d so far)",
                     currentFrame->mTime, clock_time, ++droppedFrames);
-#endif
       }
       currentFrame = frame;
       nsRefPtr<VideoData> releaseMe = PopVideo();
@@ -3253,12 +3268,10 @@
   SetState(DECODER_STATE_BUFFERING);
   DECODER_LOG("Changed state from DECODING to BUFFERING, decoded for %.3lfs",
               decodeDuration.ToSeconds());
-#ifdef PR_LOGGING
   MediaDecoder::Statistics stats = mDecoder->GetStatistics();
   DECODER_LOG("Playback rate: %.1lfKB/s%s download rate: %.1lfKB/s%s",
               stats.mPlaybackRate/1024, stats.mPlaybackRateReliable ? "" : " (unreliable)",
               stats.mDownloadRate/1024, stats.mDownloadRateReliable ? "" : " (unreliable)");
-#endif
 }
 
 void MediaDecoderStateMachine::SetPlayStartTime(const TimeStamp& aTimeStamp)
@@ -3457,6 +3470,7 @@
 } // namespace mozilla
 
 // avoid redefined macro in unified build
+#undef LOG
 #undef DECODER_LOG
 #undef VERBOSE_LOG
 #undef DECODER_WARN
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaDecoderStateMachine.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaDecoderStateMachine.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaDecoderStateMachine.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaDecoderStateMachine.h	2015-05-25 20:43:39.000000000 +0000
@@ -98,6 +98,7 @@
 class AudioSegment;
 class MediaTaskQueue;
 class AudioSink;
+class DecodedStreamData;
 
 /*
   The state machine class. This manages the decoding and seeking in the
@@ -117,10 +118,9 @@
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MediaDecoderStateMachine)
 public:
   typedef MediaDecoderOwner::NextFrameStatus NextFrameStatus;
-  typedef MediaDecoder::DecodedStreamData DecodedStreamData;
   MediaDecoderStateMachine(MediaDecoder* aDecoder,
-                               MediaDecoderReader* aReader,
-                               bool aRealTime = false);
+                           MediaDecoderReader* aReader,
+                           bool aRealTime = false);
 
   nsresult Init(MediaDecoderStateMachine* aCloneDonor);
 
@@ -176,7 +176,9 @@
 
   void DispatchShutdown()
   {
-    TaskQueue()->Dispatch(NS_NewRunnableMethod(this, &MediaDecoderStateMachine::Shutdown));
+    nsCOMPtr<nsIRunnable> runnable =
+      NS_NewRunnableMethod(this, &MediaDecoderStateMachine::Shutdown);
+    TaskQueue()->Dispatch(runnable.forget());
   }
 
   void FinishShutdown();
@@ -243,7 +245,9 @@
 
   void DispatchStartBuffering()
   {
-    TaskQueue()->Dispatch(NS_NewRunnableMethod(this, &MediaDecoderStateMachine::StartBuffering));
+    nsCOMPtr<nsIRunnable> runnable =
+      NS_NewRunnableMethod(this, &MediaDecoderStateMachine::StartBuffering);
+    TaskQueue()->Dispatch(runnable.forget());
   }
 
   // This is called on the state machine thread and audio thread.
@@ -277,16 +281,16 @@
     return mState == DECODER_STATE_SEEKING;
   }
 
-  nsresult GetBuffered(dom::TimeRanges* aBuffered) {
+  media::TimeIntervals GetBuffered() {
     // It's possible for JS to query .buffered before we've determined the start
     // time from metadata, in which case the reader isn't ready to be asked this
     // question.
     ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
     if (mStartTime < 0) {
-      return NS_OK;
+      return media::TimeIntervals();
     }
 
-    return mReader->GetBuffered(aBuffered);
+    return mReader->GetBuffered();
   }
 
   size_t SizeOfVideoQueue() {
@@ -745,7 +749,9 @@
 public:
   void DispatchOnAudioSinkComplete()
   {
-    TaskQueue()->Dispatch(NS_NewRunnableMethod(this, &MediaDecoderStateMachine::OnAudioSinkComplete));
+    nsCOMPtr<nsIRunnable> runnable =
+      NS_NewRunnableMethod(this, &MediaDecoderStateMachine::OnAudioSinkComplete);
+    TaskQueue()->Dispatch(runnable.forget());
   }
 
   // Called by the AudioSink to signal errors.
@@ -753,7 +759,9 @@
 
   void DispatchOnAudioSinkError()
   {
-    TaskQueue()->Dispatch(NS_NewRunnableMethod(this, &MediaDecoderStateMachine::OnAudioSinkError));
+    nsCOMPtr<nsIRunnable> runnable =
+      NS_NewRunnableMethod(this, &MediaDecoderStateMachine::OnAudioSinkError);
+    TaskQueue()->Dispatch(runnable.forget());
   }
 
   // Return true if the video decoder's decode speed can not catch up the
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaFormatReader.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaFormatReader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaFormatReader.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaFormatReader.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -0,0 +1,1368 @@
+/* -*- 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/HTMLMediaElement.h"
+#include "mozilla/Preferences.h"
+#include "nsPrintfCString.h"
+#include "nsSize.h"
+#include "ImageContainer.h"
+#include "Layers.h"
+#include "MediaData.h"
+#include "MediaInfo.h"
+#include "MediaFormatReader.h"
+#include "MediaResource.h"
+#include "SharedDecoderManager.h"
+#include "SharedThreadPool.h"
+#include "VideoUtils.h"
+
+#include <algorithm>
+
+#ifdef MOZ_EME
+#include "mozilla/CDMProxy.h"
+#endif
+
+using mozilla::layers::Image;
+using mozilla::layers::LayerManager;
+using mozilla::layers::LayersBackend;
+
+PRLogModuleInfo* GetFormatDecoderLog() {
+  static PRLogModuleInfo* log = nullptr;
+  if (!log) {
+    log = PR_NewLogModule("MediaFormatReader");
+  }
+  return log;
+}
+#define LOG(arg, ...) MOZ_LOG(GetFormatDecoderLog(), PR_LOG_DEBUG, ("MediaFormatReader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
+#define LOGV(arg, ...) MOZ_LOG(GetFormatDecoderLog(), PR_LOG_DEBUG+1, ("MediaFormatReader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
+
+namespace mozilla {
+
+static const char*
+TrackTypeToStr(TrackInfo::TrackType aTrack)
+{
+  MOZ_ASSERT(aTrack == TrackInfo::kAudioTrack ||
+             aTrack == TrackInfo::kVideoTrack ||
+             aTrack == TrackInfo::kTextTrack);
+  switch (aTrack) {
+  case TrackInfo::kAudioTrack:
+    return "Audio";
+  case TrackInfo::kVideoTrack:
+    return "Video";
+  case TrackInfo::kTextTrack:
+    return "Text";
+  default:
+    return "Unknown";
+  }
+}
+
+MediaFormatReader::MediaFormatReader(AbstractMediaDecoder* aDecoder,
+                                       MediaDataDemuxer* aDemuxer)
+  : MediaDecoderReader(aDecoder)
+  , mDemuxer(aDemuxer)
+  , mAudio(this, MediaData::AUDIO_DATA, Preferences::GetUint("media.audio-decode-ahead", 2))
+  , mVideo(this, MediaData::VIDEO_DATA, Preferences::GetUint("media.video-decode-ahead", 2))
+  , mLastReportedNumDecodedFrames(0)
+  , mLayersBackendType(layers::LayersBackend::LAYERS_NONE)
+  , mInitDone(false)
+  , mSeekable(false)
+  , mIsEncrypted(false)
+#if defined(READER_DORMANT_HEURISTIC)
+  , mDormantEnabled(Preferences::GetBool("media.decoder.heuristic.dormant.enabled", false))
+#endif
+{
+  MOZ_ASSERT(aDemuxer);
+  MOZ_COUNT_CTOR(MediaFormatReader);
+}
+
+MediaFormatReader::~MediaFormatReader()
+{
+  MOZ_COUNT_DTOR(MediaFormatReader);
+  // shutdown main thread demuxer and track demuxers.
+  if (mAudioTrackDemuxer) {
+    mAudioTrackDemuxer->BreakCycles();
+    mAudioTrackDemuxer = nullptr;
+  }
+  if (mVideoTrackDemuxer) {
+    mVideoTrackDemuxer->BreakCycles();
+    mVideoTrackDemuxer = nullptr;
+  }
+  mMainThreadDemuxer = nullptr;
+}
+
+nsRefPtr<ShutdownPromise>
+MediaFormatReader::Shutdown()
+{
+  MOZ_ASSERT(OnTaskQueue());
+
+  mDemuxerInitRequest.DisconnectIfExists();
+  mSeekPromise.RejectIfExists(NS_ERROR_FAILURE, __func__);
+  mSkipRequest.DisconnectIfExists();
+
+  if (mAudio.mDecoder) {
+    Flush(TrackInfo::kAudioTrack);
+    mAudio.mDecoder->Shutdown();
+    mAudio.mDecoder = nullptr;
+  }
+  if (mAudio.mTrackDemuxer) {
+    mAudio.mTrackDemuxer->BreakCycles();
+    mAudio.mTrackDemuxer = nullptr;
+  }
+  if (mAudio.mTaskQueue) {
+    mAudio.mTaskQueue->BeginShutdown();
+    mAudio.mTaskQueue->AwaitShutdownAndIdle();
+    mAudio.mTaskQueue = nullptr;
+  }
+  MOZ_ASSERT(mAudio.mPromise.IsEmpty());
+
+  if (mVideo.mDecoder) {
+    Flush(TrackInfo::kVideoTrack);
+    mVideo.mDecoder->Shutdown();
+    mVideo.mDecoder = nullptr;
+  }
+  if (mVideo.mTrackDemuxer) {
+    mVideo.mTrackDemuxer->BreakCycles();
+    mVideo.mTrackDemuxer = nullptr;
+  }
+  if (mVideo.mTaskQueue) {
+    mVideo.mTaskQueue->BeginShutdown();
+    mVideo.mTaskQueue->AwaitShutdownAndIdle();
+    mVideo.mTaskQueue = nullptr;
+  }
+  MOZ_ASSERT(mVideo.mPromise.IsEmpty());
+
+  mDemuxer = nullptr;
+
+  mPlatform = nullptr;
+
+  return MediaDecoderReader::Shutdown();
+}
+
+void
+MediaFormatReader::InitLayersBackendType()
+{
+  if (!IsVideoContentType(mDecoder->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("MediaFormatReader 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();
+}
+
+static bool sIsEMEEnabled = false;
+
+nsresult
+MediaFormatReader::Init(MediaDecoderReader* aCloneDonor)
+{
+  MOZ_ASSERT(NS_IsMainThread(), "Must be on main thread.");
+  PlatformDecoderModule::Init();
+
+  InitLayersBackendType();
+
+  mAudio.mTaskQueue =
+    new FlushableMediaTaskQueue(GetMediaThreadPool(MediaThreadType::PLATFORM_DECODER));
+  mVideo.mTaskQueue =
+    new FlushableMediaTaskQueue(GetMediaThreadPool(MediaThreadType::PLATFORM_DECODER));
+
+  static bool sSetupPrefCache = false;
+  if (!sSetupPrefCache) {
+    sSetupPrefCache = true;
+    Preferences::AddBoolVarCache(&sIsEMEEnabled, "media.eme.enabled", false);
+  }
+
+  return NS_OK;
+}
+
+#ifdef MOZ_EME
+class DispatchKeyNeededEvent : public nsRunnable {
+public:
+  DispatchKeyNeededEvent(AbstractMediaDecoder* aDecoder,
+                         nsTArray<uint8_t>& aInitData,
+                         const nsString& aInitDataType)
+    : mDecoder(aDecoder)
+    , mInitData(aInitData)
+    , mInitDataType(aInitDataType)
+  {
+  }
+  NS_IMETHOD Run() {
+    // Note: Null check the owner, as the decoder could have been shutdown
+    // since this event was dispatched.
+    MediaDecoderOwner* owner = mDecoder->GetOwner();
+    if (owner) {
+      owner->DispatchEncrypted(mInitData, mInitDataType);
+    }
+    mDecoder = nullptr;
+    return NS_OK;
+  }
+private:
+  nsRefPtr<AbstractMediaDecoder> mDecoder;
+  nsTArray<uint8_t> mInitData;
+  nsString mInitDataType;
+};
+#endif // MOZ_EME
+
+bool MediaFormatReader::IsWaitingOnCDMResource() {
+#ifdef MOZ_EME
+  nsRefPtr<CDMProxy> proxy;
+  {
+    if (!IsEncrypted()) {
+      // Not encrypted, no need to wait for CDMProxy.
+      return false;
+    }
+    ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
+    proxy = mDecoder->GetCDMProxy();
+    if (!proxy) {
+      // We're encrypted, we need a CDMProxy to decrypt file.
+      return true;
+    }
+  }
+  // We'll keep waiting if the CDM hasn't informed Gecko of its capabilities.
+  {
+    CDMCaps::AutoLock caps(proxy->Capabilites());
+    LOG("capsKnown=%d", caps.AreCapsKnown());
+    return !caps.AreCapsKnown();
+  }
+#else
+  return false;
+#endif
+}
+
+bool
+MediaFormatReader::IsSupportedAudioMimeType(const nsACString& aMimeType)
+{
+  return mPlatform && mPlatform->SupportsMimeType(aMimeType);
+}
+
+bool
+MediaFormatReader::IsSupportedVideoMimeType(const nsACString& aMimeType)
+{
+  return mPlatform && mPlatform->SupportsMimeType(aMimeType);
+}
+
+nsRefPtr<MediaDecoderReader::MetadataPromise>
+MediaFormatReader::AsyncReadMetadata()
+{
+  MOZ_ASSERT(OnTaskQueue());
+
+  if (mInitDone) {
+    // We are returning from dormant.
+    if (!EnsureDecodersSetup()) {
+      return MetadataPromise::CreateAndReject(ReadMetadataFailureReason::METADATA_ERROR, __func__);
+    }
+    nsRefPtr<MetadataHolder> metadata = new MetadataHolder();
+    metadata->mInfo = mInfo;
+    metadata->mTags = nullptr;
+    return MetadataPromise::CreateAndResolve(metadata, __func__);
+  }
+
+  nsRefPtr<MetadataPromise> p = mMetadataPromise.Ensure(__func__);
+
+  mDemuxerInitRequest.Begin(mDemuxer->Init()
+                       ->RefableThen(GetTaskQueue(), __func__,
+                                     this,
+                                     &MediaFormatReader::OnDemuxerInitDone,
+                                     &MediaFormatReader::OnDemuxerInitFailed));
+  return p;
+}
+
+void
+MediaFormatReader::OnDemuxerInitDone(nsresult)
+{
+  MOZ_ASSERT(OnTaskQueue());
+  mDemuxerInitRequest.Complete();
+
+  // To decode, we need valid video and a place to put it.
+  bool videoActive = !!mDemuxer->GetNumberTracks(TrackInfo::kVideoTrack) &&
+    mDecoder->GetImageContainer();
+
+  if (videoActive) {
+    // We currently only handle the first video track.
+    mVideo.mTrackDemuxer = mDemuxer->GetTrackDemuxer(TrackInfo::kVideoTrack, 0);
+    MOZ_ASSERT(mVideo.mTrackDemuxer);
+    mInfo.mVideo = *mVideo.mTrackDemuxer->GetInfo()->GetAsVideoInfo();
+    mVideo.mCallback = new DecoderCallback(this, TrackInfo::kVideoTrack);
+    mVideo.mTimeRanges = mVideo.mTrackDemuxer->GetBuffered();
+  }
+
+  bool audioActive = !!mDemuxer->GetNumberTracks(TrackInfo::kAudioTrack);
+  if (audioActive) {
+    mAudio.mTrackDemuxer = mDemuxer->GetTrackDemuxer(TrackInfo::kAudioTrack, 0);
+    MOZ_ASSERT(mAudio.mTrackDemuxer);
+    mInfo.mAudio = *mAudio.mTrackDemuxer->GetInfo()->GetAsAudioInfo();
+    mAudio.mCallback = new DecoderCallback(this, TrackInfo::kAudioTrack);
+    mAudio.mTimeRanges = mAudio.mTrackDemuxer->GetBuffered();
+  }
+
+  UniquePtr<EncryptionInfo> crypto = mDemuxer->GetCrypto();
+
+  mIsEncrypted = crypto && crypto->IsEncrypted();
+
+  if (crypto && crypto->IsEncrypted()) {
+#ifdef MOZ_EME
+    // Try and dispatch 'encrypted'. Won't go if ready state still HAVE_NOTHING.
+    for (uint32_t i = 0; i < crypto->mInitDatas.Length(); i++) {
+      NS_DispatchToMainThread(
+        new DispatchKeyNeededEvent(mDecoder, crypto->mInitDatas[i].mInitData, NS_LITERAL_STRING("cenc")));
+    }
+#endif // MOZ_EME
+    mInfo.mCrypto = *crypto;
+  }
+
+  int64_t videoDuration = HasVideo() ? mInfo.mVideo.mDuration : 0;
+  int64_t audioDuration = HasAudio() ? mInfo.mAudio.mDuration : 0;
+
+  int64_t duration = std::max(videoDuration, audioDuration);
+  if (duration != -1) {
+    ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
+    mDecoder->SetMediaDuration(duration);
+  }
+
+  mSeekable = mDemuxer->IsSeekable();
+
+  // Create demuxer object for main thread.
+  mMainThreadDemuxer = mDemuxer->Clone();
+  if (!mMainThreadDemuxer) {
+    mMetadataPromise.Reject(ReadMetadataFailureReason::METADATA_ERROR, __func__);
+    NS_WARNING("Unable to clone current MediaDataDemuxer");
+    return;
+  }
+  if (videoActive) {
+    mVideoTrackDemuxer =
+      mMainThreadDemuxer->GetTrackDemuxer(TrackInfo::kVideoTrack, 0);
+    MOZ_ASSERT(mVideoTrackDemuxer);
+  }
+  if (audioActive) {
+    mAudioTrackDemuxer =
+      mMainThreadDemuxer->GetTrackDemuxer(TrackInfo::kAudioTrack, 0);
+    MOZ_ASSERT(mAudioTrackDemuxer);
+  }
+
+  mInitDone = true;
+
+  if (!IsWaitingOnCDMResource() && !EnsureDecodersSetup()) {
+    mMetadataPromise.Reject(ReadMetadataFailureReason::METADATA_ERROR, __func__);
+  } else {
+    nsRefPtr<MetadataHolder> metadata = new MetadataHolder();
+    metadata->mInfo = mInfo;
+    metadata->mTags = nullptr;
+    mMetadataPromise.Resolve(metadata, __func__);
+  }
+}
+
+void
+MediaFormatReader::OnDemuxerInitFailed(DemuxerFailureReason aFailure)
+{
+  mDemuxerInitRequest.Complete();
+  if (aFailure == DemuxerFailureReason::WAITING_FOR_DATA) {
+    mMetadataPromise.Reject(ReadMetadataFailureReason::WAITING_FOR_RESOURCES, __func__);
+  } else {
+    mMetadataPromise.Reject(ReadMetadataFailureReason::METADATA_ERROR, __func__);
+  }
+}
+
+bool
+MediaFormatReader::EnsureDecodersSetup()
+{
+  MOZ_ASSERT(OnTaskQueue());
+  MOZ_ASSERT(mInitDone);
+
+  if (!mPlatform) {
+    if (IsEncrypted()) {
+#ifdef MOZ_EME
+      // We have encrypted audio or video. We'll need a CDM to decrypt and
+      // possibly decode this. Wait until we've received a CDM from the
+      // JavaScript player app. Note: we still go through the motions here
+      // even if EME is disabled, so that if script tries and fails to create
+      // a CDM, we can detect that and notify chrome and show some UI
+      // explaining that we failed due to EME being disabled.
+      nsRefPtr<CDMProxy> proxy;
+      {
+        ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
+        proxy = mDecoder->GetCDMProxy();
+      }
+      MOZ_ASSERT(proxy);
+
+      mPlatform = PlatformDecoderModule::CreateCDMWrapper(proxy,
+                                                          HasAudio(),
+                                                          HasVideo());
+      NS_ENSURE_TRUE(mPlatform, false);
+#else
+      // EME not supported.
+      return false;
+#endif
+    } else {
+      mPlatform = PlatformDecoderModule::Create();
+      NS_ENSURE_TRUE(mPlatform, false);
+    }
+  }
+
+  MOZ_ASSERT(mPlatform);
+
+  if (HasAudio() && !mAudio.mDecoder) {
+    NS_ENSURE_TRUE(IsSupportedAudioMimeType(mInfo.mAudio.mMimeType),
+                   false);
+
+    mAudio.mDecoder =
+      mPlatform->CreateDecoder(mInfo.mAudio,
+                               mAudio.mTaskQueue,
+                               mAudio.mCallback);
+    NS_ENSURE_TRUE(mAudio.mDecoder != nullptr, false);
+    nsresult rv = mAudio.mDecoder->Init();
+    NS_ENSURE_SUCCESS(rv, false);
+  }
+
+  if (HasVideo() && !mVideo.mDecoder) {
+    NS_ENSURE_TRUE(IsSupportedVideoMimeType(mInfo.mVideo.mMimeType),
+                   false);
+
+    if (mSharedDecoderManager &&
+        mPlatform->SupportsSharedDecoders(mInfo.mVideo)) {
+      mVideo.mDecoder =
+        mSharedDecoderManager->CreateVideoDecoder(mPlatform,
+                                                  mInfo.mVideo,
+                                                  mLayersBackendType,
+                                                  mDecoder->GetImageContainer(),
+                                                  mVideo.mTaskQueue,
+                                                  mVideo.mCallback);
+    } else {
+      mVideo.mDecoder =
+        mPlatform->CreateDecoder(mInfo.mVideo,
+                                 mVideo.mTaskQueue,
+                                 mVideo.mCallback,
+                                 mLayersBackendType,
+                                 mDecoder->GetImageContainer());
+    }
+    NS_ENSURE_TRUE(mVideo.mDecoder != nullptr, false);
+    nsresult rv = mVideo.mDecoder->Init();
+    NS_ENSURE_SUCCESS(rv, false);
+  }
+
+  return true;
+}
+
+void
+MediaFormatReader::ReadUpdatedMetadata(MediaInfo* aInfo)
+{
+  *aInfo = mInfo;
+}
+
+MediaFormatReader::DecoderData&
+MediaFormatReader::GetDecoderData(TrackType aTrack)
+{
+  MOZ_ASSERT(aTrack == TrackInfo::kAudioTrack ||
+             aTrack == TrackInfo::kVideoTrack);
+  if (aTrack == TrackInfo::kAudioTrack) {
+    return mAudio;
+  }
+  return mVideo;
+}
+
+void
+MediaFormatReader::DisableHardwareAcceleration()
+{
+  MOZ_ASSERT(OnTaskQueue());
+  if (HasVideo() && mSharedDecoderManager) {
+    mSharedDecoderManager->DisableHardwareAcceleration();
+
+    if (!mSharedDecoderManager->Recreate(mInfo.mVideo)) {
+      mVideo.mError = true;
+    }
+    ScheduleUpdate(TrackInfo::kVideoTrack);
+  }
+}
+
+bool
+MediaFormatReader::ShouldSkip(bool aSkipToNextKeyframe, media::TimeUnit aTimeThreshold)
+{
+  MOZ_ASSERT(HasVideo());
+  media::TimeUnit nextKeyframe;
+  nsresult rv = mVideo.mTrackDemuxer->GetNextRandomAccessPoint(&nextKeyframe);
+  if (NS_FAILED(rv)) {
+    return aSkipToNextKeyframe;
+  }
+  return nextKeyframe < aTimeThreshold;
+}
+
+nsRefPtr<MediaDecoderReader::VideoDataPromise>
+MediaFormatReader::RequestVideoData(bool aSkipToNextKeyframe,
+                                     int64_t aTimeThreshold)
+{
+  MOZ_ASSERT(OnTaskQueue());
+  MOZ_DIAGNOSTIC_ASSERT(mSeekPromise.IsEmpty(), "No sample requests allowed while seeking");
+  MOZ_DIAGNOSTIC_ASSERT(!mVideo.HasPromise(), "No duplicate sample requests");
+  MOZ_DIAGNOSTIC_ASSERT(!mVideoSeekRequest.Exists());
+  MOZ_DIAGNOSTIC_ASSERT(!mAudioSeekRequest.Exists());
+  MOZ_DIAGNOSTIC_ASSERT(!IsSeeking(), "called mid-seek");
+  LOGV("RequestVideoData(%d, %lld)", aSkipToNextKeyframe, aTimeThreshold);
+
+  if (!HasVideo()) {
+    LOG("called with no video track");
+    return VideoDataPromise::CreateAndReject(DECODE_ERROR, __func__);
+  }
+
+  if (IsSeeking()) {
+    LOG("called mid-seek. Rejecting.");
+    return VideoDataPromise::CreateAndReject(CANCELED, __func__);
+  }
+
+  if (mShutdown) {
+    NS_WARNING("RequestVideoData on shutdown MediaFormatReader!");
+    return VideoDataPromise::CreateAndReject(CANCELED, __func__);
+  }
+
+  if (!EnsureDecodersSetup()) {
+    NS_WARNING("Error constructing decoders");
+    return VideoDataPromise::CreateAndReject(DECODE_ERROR, __func__);
+  }
+
+  MOZ_ASSERT(HasVideo() && mPlatform && mVideo.mDecoder);
+
+  media::TimeUnit timeThreshold{media::TimeUnit::FromMicroseconds(aTimeThreshold)};
+  if (ShouldSkip(aSkipToNextKeyframe, timeThreshold)) {
+    Flush(TrackInfo::kVideoTrack);
+    nsRefPtr<VideoDataPromise> p = mVideo.mPromise.Ensure(__func__);
+    SkipVideoDemuxToNextKeyFrame(timeThreshold);
+    return p;
+  }
+
+  nsRefPtr<VideoDataPromise> p = mVideo.mPromise.Ensure(__func__);
+  ScheduleUpdate(TrackInfo::kVideoTrack);
+  return p;
+}
+
+void
+MediaFormatReader::OnDemuxFailed(TrackType aTrack, DemuxerFailureReason aFailure)
+{
+  MOZ_ASSERT(OnTaskQueue());
+  LOG("Failed to demux %s, failure = %d",
+      aTrack == TrackType::kVideoTrack ? "video" : "audio", aFailure);
+  auto& decoder = GetDecoderData(aTrack);
+  decoder.mDemuxRequest.Complete();
+  switch (aFailure) {
+    case DemuxerFailureReason::END_OF_STREAM:
+      decoder.mDemuxEOS = true;
+      ScheduleUpdate(aTrack);
+      break;
+    case DemuxerFailureReason::DEMUXER_ERROR:
+      NotifyError(aTrack);
+      break;
+    case DemuxerFailureReason::WAITING_FOR_DATA:
+      NotifyWaitingForData(aTrack);
+      break;
+    case DemuxerFailureReason::CANCELED:
+    case DemuxerFailureReason::SHUTDOWN:
+      if (decoder.HasPromise()) {
+        decoder.RejectPromise(CANCELED, __func__);
+      }
+      break;
+    default:
+      MOZ_ASSERT(false);
+      break;
+  }
+}
+
+void
+MediaFormatReader::DoDemuxVideo()
+{
+  // TODO Use DecodeAhead value rather than 1.
+  mVideo.mDemuxRequest.Begin(mVideo.mTrackDemuxer->GetSamples(1)
+                      ->RefableThen(GetTaskQueue(), __func__, this,
+                                    &MediaFormatReader::OnVideoDemuxCompleted,
+                                    &MediaFormatReader::OnVideoDemuxFailed));
+}
+
+void
+MediaFormatReader::OnVideoDemuxCompleted(nsRefPtr<MediaTrackDemuxer::SamplesHolder> aSamples)
+{
+  LOGV("%d video samples demuxed", aSamples->mSamples.Length());
+  mVideo.mDemuxRequest.Complete();
+  mVideo.mQueuedSamples.AppendElements(aSamples->mSamples);
+  ScheduleUpdate(TrackInfo::kVideoTrack);
+}
+
+nsRefPtr<MediaDecoderReader::AudioDataPromise>
+MediaFormatReader::RequestAudioData()
+{
+  MOZ_ASSERT(OnTaskQueue());
+  MOZ_DIAGNOSTIC_ASSERT(mSeekPromise.IsEmpty(), "No sample requests allowed while seeking");
+  MOZ_DIAGNOSTIC_ASSERT(!mVideoSeekRequest.Exists());
+  MOZ_DIAGNOSTIC_ASSERT(!mAudioSeekRequest.Exists());
+  MOZ_DIAGNOSTIC_ASSERT(!mAudio.HasPromise(), "No duplicate sample requests");
+  MOZ_DIAGNOSTIC_ASSERT(!IsSeeking(), "called mid-seek");
+  LOGV("");
+
+  if (!HasAudio()) {
+    LOG("called with no audio track");
+    return AudioDataPromise::CreateAndReject(DECODE_ERROR, __func__);
+  }
+
+  if (IsSeeking()) {
+    LOG("called mid-seek. Rejecting.");
+    return AudioDataPromise::CreateAndReject(CANCELED, __func__);
+  }
+
+  if (mShutdown) {
+    NS_WARNING("RequestAudioData on shutdown MediaFormatReader!");
+    return AudioDataPromise::CreateAndReject(CANCELED, __func__);
+  }
+
+  if (!EnsureDecodersSetup()) {
+    NS_WARNING("Error constructing decoders");
+    return AudioDataPromise::CreateAndReject(DECODE_ERROR, __func__);
+  }
+
+  nsRefPtr<AudioDataPromise> p = mAudio.mPromise.Ensure(__func__);
+  ScheduleUpdate(TrackInfo::kAudioTrack);
+  return p;
+}
+
+void
+MediaFormatReader::DoDemuxAudio()
+{
+  // TODO Use DecodeAhead value rather than 1.
+  mAudio.mDemuxRequest.Begin(mAudio.mTrackDemuxer->GetSamples(1)
+                      ->RefableThen(GetTaskQueue(), __func__, this,
+                                    &MediaFormatReader::OnAudioDemuxCompleted,
+                                    &MediaFormatReader::OnAudioDemuxFailed));
+}
+
+void
+MediaFormatReader::OnAudioDemuxCompleted(nsRefPtr<MediaTrackDemuxer::SamplesHolder> aSamples)
+{
+  LOGV("%d audio samples demuxed", aSamples->mSamples.Length());
+  mAudio.mDemuxRequest.Complete();
+  mAudio.mQueuedSamples.AppendElements(aSamples->mSamples);
+  ScheduleUpdate(TrackInfo::kAudioTrack);
+}
+
+void
+MediaFormatReader::NotifyNewOutput(TrackType aTrack, MediaData* aSample)
+{
+  MOZ_ASSERT(OnTaskQueue());
+  auto& decoder = GetDecoderData(aTrack);
+  if (!decoder.mOutputRequested) {
+    LOG("MediaFormatReader produced output while flushing, discarding.");
+    return;
+  }
+  decoder.mOutput.AppendElement(aSample);
+  decoder.mNumSamplesOutput++;
+  ScheduleUpdate(aTrack);
+}
+
+void
+MediaFormatReader::NotifyInputExhausted(TrackType aTrack)
+{
+  MOZ_ASSERT(OnTaskQueue());
+  auto& decoder = GetDecoderData(aTrack);
+  decoder.mInputExhausted = true;
+  ScheduleUpdate(aTrack);
+}
+
+void
+MediaFormatReader::NotifyDrainComplete(TrackType aTrack)
+{
+  MOZ_ASSERT(OnTaskQueue());
+  auto& decoder = GetDecoderData(aTrack);
+  if (!decoder.mOutputRequested) {
+    LOG("MediaFormatReader called DrainComplete() before flushing, ignoring.");
+    return;
+  }
+  decoder.mDrainComplete = true;
+  ScheduleUpdate(aTrack);
+}
+
+void
+MediaFormatReader::NotifyError(TrackType aTrack)
+{
+  MOZ_ASSERT(OnTaskQueue());
+  auto& decoder = GetDecoderData(aTrack);
+  decoder.mError = true;
+  ScheduleUpdate(aTrack);
+}
+
+void
+MediaFormatReader::NotifyWaitingForData(TrackType aTrack)
+{
+  MOZ_ASSERT(OnTaskQueue());
+  auto& decoder = GetDecoderData(aTrack);
+  decoder.mWaitingForData = true;
+  ScheduleUpdate(aTrack);
+}
+
+bool
+MediaFormatReader::NeedInput(DecoderData& aDecoder)
+{
+  MOZ_ASSERT(OnTaskQueue());
+  // 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.HasPromise() &&
+    aDecoder.mOutput.IsEmpty() &&
+    (aDecoder.mInputExhausted || !aDecoder.mQueuedSamples.IsEmpty() ||
+     aDecoder.mNumSamplesInput - aDecoder.mNumSamplesOutput < aDecoder.mDecodeAhead);
+}
+
+void
+MediaFormatReader::ScheduleUpdate(TrackType aTrack)
+{
+  MOZ_ASSERT(OnTaskQueue());
+  if (mShutdown) {
+    return;
+  }
+  auto& decoder = GetDecoderData(aTrack);
+  if (decoder.mUpdateScheduled) {
+    return;
+  }
+  LOGV("SchedulingUpdate(%s)", TrackTypeToStr(aTrack));
+  decoder.mUpdateScheduled = true;
+  RefPtr<nsIRunnable> task(
+    NS_NewRunnableMethodWithArg<TrackType>(this, &MediaFormatReader::Update, aTrack));
+  GetTaskQueue()->Dispatch(task.forget());
+}
+
+bool
+MediaFormatReader::UpdateReceivedNewData(TrackType aTrack)
+{
+  MOZ_ASSERT(OnTaskQueue());
+  auto& decoder = GetDecoderData(aTrack);
+
+  if (!decoder.mReceivedNewData) {
+    return false;
+  }
+  decoder.mReceivedNewData = false;
+  decoder.mWaitingForData = false;
+  bool hasLastEnd;
+  media::TimeUnit lastEnd = decoder.mTimeRanges.GetEnd(&hasLastEnd);
+  {
+    MonitorAutoLock lock(decoder.mMonitor);
+    // Update our cached TimeRange.
+    decoder.mTimeRanges = decoder.mTrackDemuxer->GetBuffered();
+  }
+  if (decoder.mTimeRanges.Length() &&
+      (!hasLastEnd || decoder.mTimeRanges.GetEnd() > lastEnd)) {
+    // New data was added after our previous end, we can clear the EOS flag.
+    decoder.mDemuxEOS = false;
+    decoder.mDemuxEOSServiced = false;
+  }
+
+  if (!decoder.mError && decoder.HasWaitingPromise()) {
+    MOZ_ASSERT(!decoder.HasPromise());
+    LOG("We have new data. Resolving WaitingPromise");
+    decoder.mWaitingPromise.Resolve(decoder.mType, __func__);
+    return true;
+  }
+  if (!decoder.mError && !mSeekPromise.IsEmpty()) {
+    MOZ_ASSERT(!decoder.HasPromise());
+    if (mVideoSeekRequest.Exists() || mAudioSeekRequest.Exists()) {
+      // Already waiting for a seek to complete. Nothing more to do.
+      return true;
+    }
+    LOG("Attempting Seek");
+    AttemptSeek();
+    return true;
+  }
+  return false;
+}
+
+void
+MediaFormatReader::RequestDemuxSamples(TrackType aTrack)
+{
+  MOZ_ASSERT(OnTaskQueue());
+  auto& decoder = GetDecoderData(aTrack);
+
+  if (!decoder.mQueuedSamples.IsEmpty()) {
+    // No need to demux new samples.
+    return;
+  }
+
+  if (decoder.mDemuxRequest.Exists()) {
+    // We are already in the process of demuxing.
+    return;
+  }
+  if (decoder.mDemuxEOS) {
+    // Nothing left to demux.
+    return;
+  }
+  if (aTrack == TrackInfo::kVideoTrack) {
+    DoDemuxVideo();
+  } else {
+    DoDemuxAudio();
+  }
+}
+
+void
+MediaFormatReader::DecodeDemuxedSamples(TrackType aTrack,
+                                        AbstractMediaDecoder::AutoNotifyDecoded& aA)
+{
+  MOZ_ASSERT(OnTaskQueue());
+  auto& decoder = GetDecoderData(aTrack);
+
+  if (decoder.mQueuedSamples.IsEmpty()) {
+    return;
+  }
+
+  decoder.mOutputRequested = true;
+
+  // Decode all our demuxed frames.
+  for (auto& samples : decoder.mQueuedSamples) {
+    decoder.mDecoder->Input(samples);
+  }
+  decoder.mNumSamplesInput += decoder.mQueuedSamples.Length();
+  decoder.mSizeOfQueue += decoder.mQueuedSamples.Length();
+  if (aTrack == TrackInfo::kVideoTrack) {
+    aA.mParsed += decoder.mQueuedSamples.Length();
+  }
+  decoder.mQueuedSamples.Clear();
+}
+
+void
+MediaFormatReader::Update(TrackType aTrack)
+{
+  MOZ_ASSERT(OnTaskQueue());
+
+  if (mShutdown) {
+    return;
+  }
+
+  // Record number of frames decoded and parsed. Automatically update the
+  // stats counters using the AutoNotifyDecoded stack-based class.
+  AbstractMediaDecoder::AutoNotifyDecoded a(mDecoder);
+
+  bool needInput = false;
+  bool needOutput = false;
+  auto& decoder = GetDecoderData(aTrack);
+  decoder.mUpdateScheduled = false;
+
+  if (UpdateReceivedNewData(aTrack)) {
+    return;
+  }
+
+  if (decoder.HasPromise()) {
+    // Handle pending requests from the MediaDecoderStateMachine.
+    if (decoder.mError) {
+      LOG("Decoding Error");
+      decoder.RejectPromise(DECODE_ERROR, __func__);
+      return;
+    }
+    if (decoder.mWaitingForData) {
+      LOG("Waiting For Data");
+      decoder.RejectPromise(WAITING_FOR_DATA, __func__);
+    }
+  } else if (decoder.mWaitingForData) {
+    // Nothing more we can do at present.
+    return;
+  }
+
+  if (NeedInput(decoder)) {
+    needInput = true;
+    decoder.mInputExhausted = false;
+  }
+  if (aTrack == TrackInfo::kVideoTrack) {
+    uint64_t delta =
+      decoder.mNumSamplesOutput - mLastReportedNumDecodedFrames;
+    a.mDecoded = static_cast<uint32_t>(delta);
+    mLastReportedNumDecodedFrames = decoder.mNumSamplesOutput;
+  }
+  if (decoder.HasPromise()) {
+    needOutput = true;
+    if (!decoder.mOutput.IsEmpty()) {
+      // We have a decoded sample ready to be returned.
+      nsRefPtr<MediaData> output = decoder.mOutput[0];
+      decoder.mOutput.RemoveElementAt(0);
+      decoder.mSizeOfQueue -= 1;
+      ReturnOutput(output, aTrack);
+    } else if (decoder.mDrainComplete) {
+      decoder.RejectPromise(END_OF_STREAM, __func__);
+      decoder.mDrainComplete = false;
+    }
+  }
+
+  LOGV("Update(%s) ni=%d no=%d", TrackTypeToStr(aTrack), needInput, needOutput);
+
+  if (decoder.mDemuxEOS && !decoder.mDemuxEOSServiced) {
+    decoder.mOutputRequested = true;
+    decoder.mDecoder->Drain();
+    decoder.mDemuxEOSServiced = true;
+  }
+
+  if (!needInput) {
+    return;
+  }
+
+  // Demux samples if we don't have some.
+  RequestDemuxSamples(aTrack);
+  // Decode all pending demuxed samples.
+  DecodeDemuxedSamples(aTrack, a);
+}
+
+void
+MediaFormatReader::ReturnOutput(MediaData* aData, TrackType aTrack)
+{
+  auto& decoder = GetDecoderData(aTrack);
+  MOZ_ASSERT(decoder.HasPromise());
+  if (decoder.mDiscontinuity) {
+    decoder.mDiscontinuity = false;
+    aData->mDiscontinuity = true;
+  }
+
+  if (aTrack == TrackInfo::kAudioTrack) {
+    AudioData* audioData = static_cast<AudioData*>(aData);
+
+    if (audioData->mChannels != mInfo.mAudio.mChannels ||
+        audioData->mRate != mInfo.mAudio.mRate) {
+      LOG("change of audio format (rate:%d->%d). "
+          "This is an unsupported configuration",
+          mInfo.mAudio.mRate, audioData->mRate);
+      mInfo.mAudio.mRate = audioData->mRate;
+      mInfo.mAudio.mChannels = audioData->mChannels;
+    }
+    mAudio.mPromise.Resolve(audioData, __func__);
+  } else if (aTrack == TrackInfo::kVideoTrack) {
+    mVideo.mPromise.Resolve(static_cast<VideoData*>(aData), __func__);
+  }
+}
+
+size_t
+MediaFormatReader::SizeOfVideoQueueInFrames()
+{
+  return SizeOfQueue(TrackInfo::kVideoTrack);
+}
+
+size_t
+MediaFormatReader::SizeOfAudioQueueInFrames()
+{
+  return SizeOfQueue(TrackInfo::kAudioTrack);
+}
+
+size_t
+MediaFormatReader::SizeOfQueue(TrackType aTrack)
+{
+  auto& decoder = GetDecoderData(aTrack);
+  return decoder.mSizeOfQueue;
+}
+
+nsRefPtr<MediaDecoderReader::WaitForDataPromise>
+MediaFormatReader::WaitForData(MediaData::Type aType)
+{
+  MOZ_ASSERT(OnTaskQueue());
+  TrackType trackType = aType == MediaData::VIDEO_DATA ?
+    TrackType::kVideoTrack : TrackType::kAudioTrack;
+  auto& decoder = GetDecoderData(trackType);
+  nsRefPtr<WaitForDataPromise> p = decoder.mWaitingPromise.Ensure(__func__);
+  ScheduleUpdate(trackType);
+  return p;
+}
+
+nsresult
+MediaFormatReader::ResetDecode()
+{
+  MOZ_ASSERT(OnTaskQueue());
+
+  ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
+
+  mAudioSeekRequest.DisconnectIfExists();
+  mVideoSeekRequest.DisconnectIfExists();
+  mSeekPromise.RejectIfExists(NS_OK, __func__);
+  mSkipRequest.DisconnectIfExists();
+
+  // Do the same for any data wait promises.
+  mAudio.mWaitingPromise.RejectIfExists(WaitForDataRejectValue(MediaData::AUDIO_DATA, WaitForDataRejectValue::CANCELED), __func__);
+  mVideo.mWaitingPromise.RejectIfExists(WaitForDataRejectValue(MediaData::VIDEO_DATA, WaitForDataRejectValue::CANCELED), __func__);
+
+  // Reset miscellaneous seeking state.
+  mPendingSeekTime.reset();
+
+  if (HasVideo()) {
+    Flush(TrackInfo::kVideoTrack);
+  }
+  if (HasAudio()) {
+    Flush(TrackInfo::kAudioTrack);
+  }
+  return MediaDecoderReader::ResetDecode();
+}
+
+void
+MediaFormatReader::Output(TrackType aTrack, MediaData* aSample)
+{
+  LOGV("Decoded %s sample time=%lld dur=%lld",
+       TrackTypeToStr(aTrack), aSample->mTime, aSample->mDuration);
+
+  if (!aSample) {
+    NS_WARNING("MediaFormatReader::Output() passed a null sample");
+    Error(aTrack);
+    return;
+  }
+
+  RefPtr<nsIRunnable> task =
+    NS_NewRunnableMethodWithArgs<TrackType, StorensRefPtrPassByPtr<MediaData>>(
+      this, &MediaFormatReader::NotifyNewOutput, aTrack, aSample);
+  GetTaskQueue()->Dispatch(task.forget());
+}
+
+void
+MediaFormatReader::DrainComplete(TrackType aTrack)
+{
+  RefPtr<nsIRunnable> task =
+    NS_NewRunnableMethodWithArg<TrackType>(
+      this, &MediaFormatReader::NotifyDrainComplete, aTrack);
+  GetTaskQueue()->Dispatch(task.forget());
+}
+
+void
+MediaFormatReader::InputExhausted(TrackType aTrack)
+{
+  RefPtr<nsIRunnable> task =
+    NS_NewRunnableMethodWithArg<TrackType>(
+      this, &MediaFormatReader::NotifyInputExhausted, aTrack);
+  GetTaskQueue()->Dispatch(task.forget());
+}
+
+void
+MediaFormatReader::Error(TrackType aTrack)
+{
+  RefPtr<nsIRunnable> task =
+    NS_NewRunnableMethodWithArg<TrackType>(
+      this, &MediaFormatReader::NotifyError, aTrack);
+  GetTaskQueue()->Dispatch(task.forget());
+}
+
+void
+MediaFormatReader::Flush(TrackType aTrack)
+{
+  MOZ_ASSERT(OnTaskQueue());
+  LOG("Flush(%s) BEGIN", TrackTypeToStr(aTrack));
+
+  auto& decoder = GetDecoderData(aTrack);
+  if (!decoder.mDecoder) {
+    return;
+  }
+
+  // Clear demuxer related data.
+  decoder.mDemuxRequest.DisconnectIfExists();
+  decoder.mTrackDemuxer->Reset();
+  decoder.mDecoder->Flush();
+  // Purge the current decoder's state.
+  // ResetState clears mOutputRequested flag so that we ignore all output until
+  // the next request for more data.
+  decoder.ResetState();
+  if (decoder.HasPromise()) {
+    decoder.RejectPromise(CANCELED, __func__);
+  }
+  LOG("Flush(%s) END", TrackTypeToStr(aTrack));
+}
+
+void
+MediaFormatReader::SkipVideoDemuxToNextKeyFrame(media::TimeUnit aTimeThreshold)
+{
+  MOZ_ASSERT(OnTaskQueue());
+
+  MOZ_ASSERT(mVideo.mDecoder);
+  MOZ_ASSERT(mVideo.HasPromise());
+  LOG("Skipping up to %lld", aTimeThreshold.ToMicroseconds());
+
+  if (mVideo.mError) {
+    mVideo.RejectPromise(DECODE_ERROR, __func__);
+    return;
+  }
+
+  mSkipRequest.Begin(mVideo.mTrackDemuxer->SkipToNextRandomAccessPoint(aTimeThreshold)
+                          ->RefableThen(GetTaskQueue(), __func__, this,
+                                        &MediaFormatReader::OnVideoSkipCompleted,
+                                        &MediaFormatReader::OnVideoSkipFailed));
+  return;
+}
+
+void
+MediaFormatReader::OnVideoSkipCompleted(uint32_t aSkipped)
+{
+  MOZ_ASSERT(OnTaskQueue());
+  LOG("Skipping succeeded, skipped %u frames", aSkipped);
+  mSkipRequest.Complete();
+  mDecoder->NotifyDecodedFrames(aSkipped, 0, aSkipped);
+  MOZ_ASSERT(!mVideo.mError); // We have flushed the decoder, no frame could
+                              // have been decoded (and as such errored)
+  ScheduleUpdate(TrackInfo::kVideoTrack);
+}
+
+void
+MediaFormatReader::OnVideoSkipFailed(MediaTrackDemuxer::SkipFailureHolder aFailure)
+{
+  MOZ_ASSERT(OnTaskQueue());
+  LOG("Skipping failed, skipped %u frames", aFailure.mSkipped);
+  mSkipRequest.Complete();
+  mDecoder->NotifyDecodedFrames(aFailure.mSkipped, 0, aFailure.mSkipped);
+  MOZ_ASSERT(mVideo.HasPromise());
+  if (aFailure.mFailure == DemuxerFailureReason::END_OF_STREAM) {
+    mVideo.RejectPromise(END_OF_STREAM, __func__);
+  } else {
+    mVideo.RejectPromise(DECODE_ERROR, __func__);
+  }
+}
+
+nsRefPtr<MediaDecoderReader::SeekPromise>
+MediaFormatReader::Seek(int64_t aTime, int64_t aUnused)
+{
+  MOZ_ASSERT(OnTaskQueue());
+
+  LOG("aTime=(%lld)", aTime);
+
+  MOZ_DIAGNOSTIC_ASSERT(mSeekPromise.IsEmpty());
+  MOZ_DIAGNOSTIC_ASSERT(!mVideo.HasPromise());
+  MOZ_DIAGNOSTIC_ASSERT(!mAudio.HasPromise());
+  MOZ_DIAGNOSTIC_ASSERT(mPendingSeekTime.isNothing());
+
+  if (!mSeekable) {
+    LOG("Seek() END (Unseekable)");
+    return SeekPromise::CreateAndReject(NS_ERROR_FAILURE, __func__);
+  }
+
+  if (mShutdown) {
+    return SeekPromise::CreateAndReject(NS_ERROR_FAILURE, __func__);
+  }
+
+  mPendingSeekTime.emplace(media::TimeUnit::FromMicroseconds(aTime));
+
+  nsRefPtr<SeekPromise> p = mSeekPromise.Ensure(__func__);
+
+  AttemptSeek();
+
+  return p;
+}
+
+void
+MediaFormatReader::AttemptSeek()
+{
+  MOZ_ASSERT(OnTaskQueue());
+  if (HasVideo()) {
+    DoVideoSeek();
+  } else if (HasAudio()) {
+    DoAudioSeek();
+  } else {
+    MOZ_CRASH();
+  }
+}
+
+void
+MediaFormatReader::OnSeekFailed(TrackType aTrack, DemuxerFailureReason aResult)
+{
+  MOZ_ASSERT(OnTaskQueue());
+  if (aTrack == TrackType::kVideoTrack) {
+    mVideoSeekRequest.Complete();
+  } else {
+    mAudioSeekRequest.Complete();
+  }
+
+  if (aResult == DemuxerFailureReason::WAITING_FOR_DATA) {
+    NotifyWaitingForData(aTrack);
+    return;
+  }
+  MOZ_ASSERT(!mVideoSeekRequest.Exists() && !mAudioSeekRequest.Exists());
+  mPendingSeekTime.reset();
+  mSeekPromise.Reject(NS_ERROR_FAILURE, __func__);
+}
+
+void
+MediaFormatReader::DoVideoSeek()
+{
+  MOZ_ASSERT(mPendingSeekTime.isSome());
+  media::TimeUnit seekTime = mPendingSeekTime.ref();
+  mVideoSeekRequest.Begin(mVideo.mTrackDemuxer->Seek(seekTime)
+                          ->RefableThen(GetTaskQueue(), __func__, this,
+                                        &MediaFormatReader::OnVideoSeekCompleted,
+                                        &MediaFormatReader::OnVideoSeekFailed));
+}
+
+void
+MediaFormatReader::OnVideoSeekCompleted(media::TimeUnit aTime)
+{
+  MOZ_ASSERT(OnTaskQueue());
+  mVideoSeekRequest.Complete();
+
+  if (HasAudio()) {
+    MOZ_ASSERT(mPendingSeekTime.isSome());
+    mPendingSeekTime.ref() = aTime;
+    DoAudioSeek();
+  } else {
+    mPendingSeekTime.reset();
+    mSeekPromise.Resolve(aTime.ToMicroseconds(), __func__);
+  }
+}
+
+void
+MediaFormatReader::DoAudioSeek()
+{
+  MOZ_ASSERT(mPendingSeekTime.isSome());
+  media::TimeUnit seekTime = mPendingSeekTime.ref();
+  mAudioSeekRequest.Begin(mAudio.mTrackDemuxer->Seek(seekTime)
+                         ->RefableThen(GetTaskQueue(), __func__, this,
+                                       &MediaFormatReader::OnAudioSeekCompleted,
+                                       &MediaFormatReader::OnAudioSeekFailed));
+}
+
+void
+MediaFormatReader::OnAudioSeekCompleted(media::TimeUnit aTime)
+{
+  MOZ_ASSERT(OnTaskQueue());
+  mAudioSeekRequest.Complete();
+  mPendingSeekTime.reset();
+  mSeekPromise.Resolve(aTime.ToMicroseconds(), __func__);
+}
+
+int64_t
+MediaFormatReader::GetEvictionOffset(double aTime)
+{
+  int64_t audioOffset;
+  int64_t videoOffset;
+  if (NS_IsMainThread()) {
+    audioOffset = HasAudio() ? mAudioTrackDemuxer->GetEvictionOffset(media::TimeUnit::FromSeconds(aTime)) : INT64_MAX;
+    videoOffset = HasVideo() ? mVideoTrackDemuxer->GetEvictionOffset(media::TimeUnit::FromSeconds(aTime)) : INT64_MAX;
+  } else {
+    MOZ_ASSERT(OnTaskQueue());
+    audioOffset = HasAudio() ? mAudio.mTrackDemuxer->GetEvictionOffset(media::TimeUnit::FromSeconds(aTime)) : INT64_MAX;
+    videoOffset = HasVideo() ? mVideo.mTrackDemuxer->GetEvictionOffset(media::TimeUnit::FromSeconds(aTime)) : INT64_MAX;
+  }
+  return std::min(audioOffset, videoOffset);
+}
+
+media::TimeIntervals
+MediaFormatReader::GetBuffered()
+{
+  media::TimeIntervals videoti;
+  media::TimeIntervals audioti;
+
+  if (NS_IsMainThread()) {
+    if (mVideoTrackDemuxer) {
+      videoti = mVideoTrackDemuxer->GetBuffered();
+    }
+    if (mAudioTrackDemuxer) {
+      audioti = mAudioTrackDemuxer->GetBuffered();
+    }
+  } else {
+    if (HasVideo()) {
+      MonitorAutoLock lock(mVideo.mMonitor);
+      videoti = mVideo.mTimeRanges;
+    }
+    if (HasAudio()) {
+      MonitorAutoLock lock(mAudio.mMonitor);
+      audioti = mAudio.mTimeRanges;
+    }
+  }
+  if (HasAudio() && HasVideo()) {
+    videoti.Intersection(audioti);
+    return videoti;
+  } else if (HasAudio()) {
+    return audioti;
+  } else if (HasVideo()) {
+    return videoti;
+  }
+
+  return media::TimeIntervals();
+}
+
+bool MediaFormatReader::IsDormantNeeded()
+{
+#if defined(READER_DORMANT_HEURISTIC)
+  return mDormantEnabled;
+#else
+  return false;
+#endif
+}
+
+void MediaFormatReader::ReleaseMediaResources()
+{
+  // Before freeing a video codec, all video buffers needed to be released
+  // even from graphics pipeline.
+  VideoFrameContainer* container = mDecoder->GetVideoFrameContainer();
+  if (container) {
+    container->ClearCurrentFrame();
+  }
+  if (mVideo.mDecoder) {
+    mVideo.mDecoder->Shutdown();
+    mVideo.mDecoder = nullptr;
+  }
+}
+
+void
+MediaFormatReader::SetIdle()
+{
+  if (mSharedDecoderManager && mVideo.mDecoder) {
+    mSharedDecoderManager->SetIdle(mVideo.mDecoder);
+  }
+}
+
+void
+MediaFormatReader::SetSharedDecoderManager(SharedDecoderManager* aManager)
+{
+#if !defined(MOZ_WIDGET_ANDROID)
+  mSharedDecoderManager = aManager;
+#endif
+}
+
+bool
+MediaFormatReader::VideoIsHardwareAccelerated() const
+{
+  return mVideo.mDecoder && mVideo.mDecoder->IsHardwareAccelerated();
+}
+
+void
+MediaFormatReader::NotifyDemuxer(uint32_t aLength, int64_t aOffset)
+{
+  MOZ_ASSERT(OnTaskQueue());
+
+  if (mShutdown) {
+    return;
+  }
+
+  mDemuxer->NotifyDataArrived(aLength, aOffset);
+  if (HasVideo()) {
+    mVideo.mReceivedNewData = true;
+    ScheduleUpdate(TrackType::kVideoTrack);
+  }
+  if (HasAudio()) {
+    mAudio.mReceivedNewData = true;
+    ScheduleUpdate(TrackType::kAudioTrack);
+  }
+}
+
+void
+MediaFormatReader::NotifyDataArrived(const char* aBuffer, uint32_t aLength, int64_t aOffset)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  if (!mInitDone) {
+    return;
+  }
+
+  MOZ_ASSERT(mMainThreadDemuxer);
+  mMainThreadDemuxer->NotifyDataArrived(aLength, aOffset);
+
+  // Queue a task to notify our main demuxer.
+  RefPtr<nsIRunnable> task =
+    NS_NewRunnableMethodWithArgs<int32_t, uint64_t>(
+      this, &MediaFormatReader::NotifyDemuxer,
+      aLength, aOffset);
+  GetTaskQueue()->Dispatch(task.forget());
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaFormatReader.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaFormatReader.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaFormatReader.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaFormatReader.h	2015-05-25 20:43:40.000000000 +0000
@@ -0,0 +1,403 @@
+/* -*- 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(MediaFormatReader_h_)
+#define MediaFormatReader_h_
+
+#include "mozilla/Atomics.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/Monitor.h"
+#include "MediaDataDemuxer.h"
+#include "MediaDecoderReader.h"
+#include "MediaTaskQueue.h"
+#include "PlatformDecoderModule.h"
+
+namespace mozilla {
+
+#if defined(MOZ_GONK_MEDIACODEC) || defined(XP_WIN) || defined(MOZ_APPLEMEDIA) || defined(MOZ_FFMPEG)
+#define READER_DORMANT_HEURISTIC
+#else
+#undef READER_DORMANT_HEURISTIC
+#endif
+
+class MediaFormatReader final : public MediaDecoderReader
+{
+  typedef TrackInfo::TrackType TrackType;
+
+public:
+  explicit MediaFormatReader(AbstractMediaDecoder* aDecoder,
+                              MediaDataDemuxer* aDemuxer);
+
+  virtual ~MediaFormatReader();
+
+  virtual nsresult Init(MediaDecoderReader* aCloneDonor) override;
+
+  virtual size_t SizeOfVideoQueueInFrames() override;
+  virtual size_t SizeOfAudioQueueInFrames() override;
+
+  virtual nsRefPtr<VideoDataPromise>
+  RequestVideoData(bool aSkipToNextKeyframe, int64_t aTimeThreshold) override;
+
+  virtual nsRefPtr<AudioDataPromise> RequestAudioData() override;
+
+  bool HasVideo() override
+  {
+    return mInfo.HasVideo();
+  }
+
+  bool HasAudio() override
+  {
+    return mInfo.HasAudio();
+  }
+
+  virtual nsRefPtr<MetadataPromise> AsyncReadMetadata() override;
+  virtual nsresult ReadMetadata(MediaInfo* aInfo,
+                                MetadataTags** aTags) override
+  {
+    // Unused as we provide AsyncReadMetadataAPI.
+    // However we must implement it as it's pure virtual.
+    return NS_OK;
+  }
+
+  virtual void ReadUpdatedMetadata(MediaInfo* aInfo) override;
+
+  virtual nsRefPtr<SeekPromise>
+  Seek(int64_t aTime, int64_t aUnused) override;
+
+  virtual bool IsMediaSeekable() override
+  {
+    return mSeekable;
+  }
+
+  virtual int64_t GetEvictionOffset(double aTime) override;
+  virtual void NotifyDataArrived(const char* aBuffer,
+                                 uint32_t aLength,
+                                 int64_t aOffset) override;
+
+  virtual media::TimeIntervals GetBuffered() override;
+
+  // For Media Resource Management
+  virtual void SetIdle() override;
+  virtual bool IsDormantNeeded() override;
+  virtual void ReleaseMediaResources() override;
+  virtual void SetSharedDecoderManager(SharedDecoderManager* aManager)
+    override;
+
+  virtual nsresult ResetDecode() override;
+
+  virtual nsRefPtr<ShutdownPromise> Shutdown() override;
+
+  virtual bool IsAsync() const override { return true; }
+
+  virtual bool VideoIsHardwareAccelerated() const override;
+
+  virtual void DisableHardwareAcceleration() override;
+
+  virtual bool IsWaitForDataSupported() override { return true; }
+  virtual nsRefPtr<WaitForDataPromise> WaitForData(MediaData::Type aType) override;
+
+  virtual bool IsWaitingOnCDMResource() override;
+
+private:
+  bool InitDemuxer();
+  void NotifyDemuxer(uint32_t aLength, int64_t aOffset);
+  void ReturnOutput(MediaData* aData, TrackType aTrack);
+
+  bool EnsureDecodersSetup();
+
+  // Enqueues a task to call Update(aTrack) on the decoder task queue.
+  // Lock for corresponding track must be held.
+  void ScheduleUpdate(TrackType aTrack);
+  void Update(TrackType aTrack);
+  // Handle actions should more data be received.
+  // Returns true if no more action is required.
+  bool UpdateReceivedNewData(TrackType aTrack);
+  // Called when new samples need to be demuxed.
+  void RequestDemuxSamples(TrackType aTrack);
+  // Decode any pending already demuxed samples.
+  void DecodeDemuxedSamples(TrackType aTrack,
+                            AbstractMediaDecoder::AutoNotifyDecoded& aA);
+  void NotifyNewOutput(TrackType aTrack, MediaData* aSample);
+  void NotifyInputExhausted(TrackType aTrack);
+  void NotifyDrainComplete(TrackType aTrack);
+  void NotifyError(TrackType aTrack);
+  void NotifyWaitingForData(TrackType aTrack);
+
+  void ExtractCryptoInitData(nsTArray<uint8_t>& aInitData);
+
+  // Initializes mLayersBackendType if possible.
+  void InitLayersBackendType();
+
+  // DecoderCallback proxies the MediaDataDecoderCallback calls to these
+  // functions.
+  void Output(TrackType aType, MediaData* aSample);
+  void InputExhausted(TrackType aTrack);
+  void Error(TrackType aTrack);
+  void Flush(TrackType aTrack);
+  void DrainComplete(TrackType aTrack);
+  bool IsSupportedAudioMimeType(const nsACString& aMimeType);
+  bool IsSupportedVideoMimeType(const nsACString& aMimeType);
+
+  bool ShouldSkip(bool aSkipToNextKeyframe, media::TimeUnit aTimeThreshold);
+
+  size_t SizeOfQueue(TrackType aTrack);
+
+  nsRefPtr<MediaDataDemuxer> mDemuxer;
+  nsRefPtr<PlatformDecoderModule> mPlatform;
+
+  class DecoderCallback : public MediaDataDecoderCallback {
+  public:
+    DecoderCallback(MediaFormatReader* aReader, TrackType aType)
+      : mReader(aReader)
+      , mType(aType)
+    {
+    }
+    virtual void Output(MediaData* aSample) override {
+      mReader->Output(mType, aSample);
+    }
+    virtual void InputExhausted() override {
+      mReader->InputExhausted(mType);
+    }
+    virtual void Error() override {
+      mReader->Error(mType);
+    }
+    virtual void DrainComplete() override {
+      mReader->DrainComplete(mType);
+    }
+    virtual void ReleaseMediaResources() override {
+      mReader->ReleaseMediaResources();
+    }
+    virtual bool OnReaderTaskQueue() override {
+      return mReader->OnTaskQueue();
+    }
+
+  private:
+    MediaFormatReader* mReader;
+    TrackType mType;
+  };
+
+  struct DecoderData {
+    DecoderData(MediaFormatReader* aOwner,
+                MediaData::Type aType,
+                uint32_t aDecodeAhead)
+      : mOwner(aOwner)
+      , mType(aType)
+      , mDecodeAhead(aDecodeAhead)
+      , mUpdateScheduled(false)
+      , mDemuxEOS(false)
+      , mDemuxEOSServiced(false)
+      , mWaitingForData(false)
+      , mReceivedNewData(false)
+      , mDiscontinuity(true)
+      , mOutputRequested(false)
+      , mInputExhausted(false)
+      , mError(false)
+      , mDrainComplete(false)
+      , mNumSamplesInput(0)
+      , mNumSamplesOutput(0)
+      , mSizeOfQueue(0)
+      , mMonitor(aType == MediaData::AUDIO_DATA ? "audio decoder data"
+                                                : "video decoder data")
+    {}
+
+    MediaFormatReader* mOwner;
+    // Disambiguate Audio vs Video.
+    MediaData::Type mType;
+    nsRefPtr<MediaTrackDemuxer> mTrackDemuxer;
+    // The platform decoder.
+    nsRefPtr<MediaDataDecoder> mDecoder;
+    // TaskQueue on which decoder can choose to decode.
+    // Only non-null up until the decoder is created.
+    nsRefPtr<FlushableMediaTaskQueue> mTaskQueue;
+    // Callback that receives output and error notifications from the decoder.
+    nsAutoPtr<DecoderCallback> mCallback;
+
+    // Only accessed from reader's task queue.
+    uint32_t mDecodeAhead;
+    bool mUpdateScheduled;
+    bool mDemuxEOS;
+    bool mDemuxEOSServiced;
+    bool mWaitingForData;
+    bool mReceivedNewData;
+    bool mDiscontinuity;
+
+    // Queued demux samples waiting to be decoded.
+    nsTArray<nsRefPtr<MediaRawData>> mQueuedSamples;
+    MediaPromiseConsumerHolder<MediaTrackDemuxer::SamplesPromise> mDemuxRequest;
+    MediaPromiseHolder<WaitForDataPromise> mWaitingPromise;
+    bool HasWaitingPromise()
+    {
+      MOZ_ASSERT(mOwner->OnTaskQueue());
+      return !mWaitingPromise.IsEmpty();
+    }
+
+    // MediaDataDecoder handler's variables.
+    bool mOutputRequested;
+    bool mInputExhausted;
+    bool mError;
+    bool mDrainComplete;
+    // Decoded samples returned my mDecoder awaiting being returned to
+    // state machine upon request.
+    nsTArray<nsRefPtr<MediaData>> mOutput;
+    uint64_t mNumSamplesInput;
+    uint64_t mNumSamplesOutput;
+
+    // These get overriden in the templated concrete class.
+    // Indicate if we have a pending promise for decoded frame.
+    virtual bool HasPromise() = 0;
+    virtual void RejectPromise(MediaDecoderReader::NotDecodedReason aReason,
+                               const char* aMethodName) = 0;
+
+    void ResetState()
+    {
+      MOZ_ASSERT(mOwner->OnTaskQueue());
+      mDemuxEOS = false;
+      mDemuxEOSServiced = false;
+      mWaitingForData = false;
+      mReceivedNewData = false;
+      mDiscontinuity = true;
+      mQueuedSamples.Clear();
+      mOutputRequested = false;
+      mInputExhausted = false;
+      mDrainComplete = false;
+      mOutput.Clear();
+      mNumSamplesInput = 0;
+      mNumSamplesOutput = 0;
+    }
+
+    // Used by the MDSM for logging purposes.
+    Atomic<size_t> mSizeOfQueue;
+    // Monitor that protects all non-threadsafe state; the primitives
+    // that follow.
+    Monitor mMonitor;
+    media::TimeIntervals mTimeRanges;
+  };
+
+  template<typename PromiseType>
+  struct DecoderDataWithPromise : public DecoderData {
+    DecoderDataWithPromise(MediaFormatReader* aOwner,
+                           MediaData::Type aType,
+                           uint32_t aDecodeAhead) :
+      DecoderData(aOwner, aType, aDecodeAhead)
+    {}
+
+    MediaPromiseHolder<PromiseType> mPromise;
+
+    bool HasPromise() override
+    {
+      MOZ_ASSERT(mOwner->OnTaskQueue());
+      return !mPromise.IsEmpty();
+    }
+
+    void RejectPromise(MediaDecoderReader::NotDecodedReason aReason,
+                       const char* aMethodName) override
+    {
+      MOZ_ASSERT(mOwner->OnTaskQueue());
+      mPromise.Reject(aReason, aMethodName);
+    }
+  };
+
+  DecoderDataWithPromise<AudioDataPromise> mAudio;
+  DecoderDataWithPromise<VideoDataPromise> mVideo;
+
+  // Returns true when the decoder for this track needs input.
+  // aDecoder.mMonitor must be locked.
+  bool NeedInput(DecoderData& aDecoder);
+
+  DecoderData& GetDecoderData(TrackType aTrack);
+
+  // Demuxer objects.
+  void OnDemuxerInitDone(nsresult);
+  void OnDemuxerInitFailed(DemuxerFailureReason aFailure);
+  MediaPromiseConsumerHolder<MediaDataDemuxer::InitPromise> mDemuxerInitRequest;
+  void OnDemuxFailed(TrackType aTrack, DemuxerFailureReason aFailure);
+
+  void DoDemuxVideo();
+  void OnVideoDemuxCompleted(nsRefPtr<MediaTrackDemuxer::SamplesHolder> aSamples);
+  void OnVideoDemuxFailed(DemuxerFailureReason aFailure)
+  {
+    OnDemuxFailed(TrackType::kVideoTrack, aFailure);
+  }
+
+  void DoDemuxAudio();
+  void OnAudioDemuxCompleted(nsRefPtr<MediaTrackDemuxer::SamplesHolder> aSamples);
+  void OnAudioDemuxFailed(DemuxerFailureReason aFailure)
+  {
+    OnDemuxFailed(TrackType::kAudioTrack, aFailure);
+  }
+
+  void SkipVideoDemuxToNextKeyFrame(media::TimeUnit aTimeThreshold);
+  MediaPromiseConsumerHolder<MediaTrackDemuxer::SkipAccessPointPromise> mSkipRequest;
+  void OnVideoSkipCompleted(uint32_t aSkipped);
+  void OnVideoSkipFailed(MediaTrackDemuxer::SkipFailureHolder aFailure);
+
+  // 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
+  // delta there.
+  uint64_t mLastReportedNumDecodedFrames;
+
+  layers::LayersBackend mLayersBackendType;
+
+  // Metadata objects
+  // True if we've read the streams' metadata.
+  bool mInitDone;
+  MediaPromiseHolder<MetadataPromise> mMetadataPromise;
+  // Accessed from multiple thread, in particular the MediaDecoderStateMachine,
+  // however the value doesn't change after reading the metadata.
+  bool mSeekable;
+  bool IsEncrypted()
+  {
+    return mIsEncrypted;
+  }
+  // Accessed from multiple thread, in particular the MediaDecoderStateMachine,
+  // however the value doesn't currently change after reading the metadata.
+  // TODO handle change of encryption half-way. The above assumption will then
+  // become incorrect.
+  bool mIsEncrypted;
+
+  // Seeking objects.
+  bool IsSeeking() const { return mPendingSeekTime.isSome(); }
+  void AttemptSeek();
+  void OnSeekFailed(TrackType aTrack, DemuxerFailureReason aFailure);
+  void DoVideoSeek();
+  void OnVideoSeekCompleted(media::TimeUnit aTime);
+  void OnVideoSeekFailed(DemuxerFailureReason aFailure)
+  {
+    OnSeekFailed(TrackType::kVideoTrack, aFailure);
+  }
+
+  void DoAudioSeek();
+  void OnAudioSeekCompleted(media::TimeUnit aTime);
+  void OnAudioSeekFailed(DemuxerFailureReason aFailure)
+  {
+    OnSeekFailed(TrackType::kAudioTrack, aFailure);
+  }
+  // Temporary seek information while we wait for the data
+  Maybe<media::TimeUnit> mPendingSeekTime;
+  MediaPromiseConsumerHolder<MediaTrackDemuxer::SeekPromise> mVideoSeekRequest;
+  MediaPromiseConsumerHolder<MediaTrackDemuxer::SeekPromise> mAudioSeekRequest;
+  MediaPromiseHolder<SeekPromise> mSeekPromise;
+
+#ifdef MOZ_EME
+  nsRefPtr<CDMProxy> mCDMProxy;
+#endif
+
+  nsRefPtr<SharedDecoderManager> mSharedDecoderManager;
+
+  // Main thread objects
+  nsRefPtr<MediaDataDemuxer> mMainThreadDemuxer;
+  nsRefPtr<MediaTrackDemuxer> mAudioTrackDemuxer;
+  nsRefPtr<MediaTrackDemuxer> mVideoTrackDemuxer;
+
+#if defined(READER_DORMANT_HEURISTIC)
+  const bool mDormantEnabled;
+#endif
+};
+
+} // namespace mozilla
+
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaManager.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaManager.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -103,7 +103,6 @@
 #undef LOG
 #endif
 
-#ifdef PR_LOGGING
 PRLogModuleInfo*
 GetMediaManagerLog()
 {
@@ -112,11 +111,9 @@
     sLog = PR_NewLogModule("MediaManager");
   return sLog;
 }
-#define LOG(msg) PR_LOG(GetMediaManagerLog(), PR_LOG_DEBUG, msg)
-#else
-#define LOG(msg)
-#endif
+#define LOG(msg) MOZ_LOG(GetMediaManagerLog(), PR_LOG_DEBUG, msg)
 
+using dom::File;
 using dom::MediaStreamConstraints;
 using dom::MediaTrackConstraintSet;
 using dom::MediaTrackConstraints;
@@ -269,53 +266,6 @@
 };
 
 /**
- * Invoke the "onSuccess" callback in content. The callback will take a
- * DOMBlob in the case of {picture:true}, and a MediaStream in the case of
- * {audio:true} or {video:true}. There is a constructor available for each
- * form. Do this only on the main thread.
- */
-class SuccessCallbackRunnable : public nsRunnable
-{
-public:
-  SuccessCallbackRunnable(
-    nsCOMPtr<nsIDOMGetUserMediaSuccessCallback>& aOnSuccess,
-    nsCOMPtr<nsIDOMGetUserMediaErrorCallback>& aOnFailure,
-    nsIDOMFile* aFile, uint64_t aWindowID)
-    : mFile(aFile)
-    , mWindowID(aWindowID)
-    , mManager(MediaManager::GetInstance())
-  {
-    mOnSuccess.swap(aOnSuccess);
-    mOnFailure.swap(aOnFailure);
-  }
-
-  NS_IMETHOD
-  Run()
-  {
-    // Only run if the window is still active.
-    NS_ASSERTION(NS_IsMainThread(), "Only call on main thread");
-
-    nsCOMPtr<nsIDOMGetUserMediaSuccessCallback> onSuccess = mOnSuccess.forget();
-    nsCOMPtr<nsIDOMGetUserMediaErrorCallback> onFailure = mOnFailure.forget();
-
-    if (!(mManager->IsWindowStillActive(mWindowID))) {
-      return NS_OK;
-    }
-    // This is safe since we're on main-thread, and the windowlist can only
-    // be invalidated from the main-thread (see OnNavigation)
-    onSuccess->OnSuccess(mFile);
-    return NS_OK;
-  }
-
-private:
-  nsCOMPtr<nsIDOMGetUserMediaSuccessCallback> mOnSuccess;
-  nsCOMPtr<nsIDOMGetUserMediaErrorCallback> mOnFailure;
-  nsCOMPtr<nsIDOMFile> mFile;
-  uint64_t mWindowID;
-  nsRefPtr<MediaManager> mManager; // get ref to this when creating the runnable
-};
-
-/**
  * Invoke the GetUserMediaDevices success callback. Wrapped in a runnable
  * so that it may be called on the main thread. The error callback is also
  * passed so it can be released correctly.
@@ -2037,8 +1987,7 @@
     Preferences::GetBool("media.navigator.streams.fake", false);
 
   nsCString origin;
-  nsPrincipal::GetOriginForURI(aWindow->GetDocumentURI(),
-                               getter_Copies(origin));
+  nsPrincipal::GetOriginForURI(aWindow->GetDocumentURI(), origin);
   bool inPrivateBrowsing;
   {
     nsCOMPtr<nsIDocument> doc = aWindow->GetDoc();
@@ -2293,7 +2242,7 @@
     // cleared until the lambda function clears it.
 
     MediaManager::GetMessageLoop()->PostTask(FROM_HERE, new ShutdownTask(
-        media::CallbackRunnable::New([this]() mutable {
+        media::NewRunnableFrom([this]() mutable {
       // Close off any remaining active windows.
       MutexAutoLock lock(mMutex);
       GetActiveWindows()->Clear();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaManager.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaManager.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaManager.h	2015-05-25 20:43:40.000000000 +0000
@@ -27,7 +27,7 @@
 #include "mozilla/dom/MediaStreamBinding.h"
 #include "mozilla/dom/MediaStreamTrackBinding.h"
 #include "mozilla/dom/MediaStreamError.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "DOMMediaStream.h"
 
 #ifdef MOZ_WEBRTC
@@ -48,12 +48,8 @@
 struct MediaTrackConstraintSet;
 }
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetMediaManagerLog();
-#define MM_LOG(msg) PR_LOG(GetMediaManagerLog(), PR_LOG_DEBUG, msg)
-#else
-#define MM_LOG(msg)
-#endif
+#define MM_LOG(msg) MOZ_LOG(GetMediaManagerLog(), PR_LOG_DEBUG, msg)
 
 /**
  * This class is an implementation of MediaStreamListener. This is used
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaPromise.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaPromise.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaPromise.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaPromise.h	2015-05-25 20:43:40.000000000 +0000
@@ -7,7 +7,7 @@
 #if !defined(MediaPromise_h_)
 #define MediaPromise_h_
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "AbstractThread.h"
 
@@ -31,7 +31,7 @@
 
 #define PROMISE_LOG(x, ...) \
   MOZ_ASSERT(gMediaPromiseLog); \
-  PR_LOG(gMediaPromiseLog, PR_LOG_DEBUG, (x, ##__VA_ARGS__))
+  MOZ_LOG(gMediaPromiseLog, PR_LOG_DEBUG, (x, ##__VA_ARGS__))
 
 /*
  * A promise manages an asynchronous request that may or may not be able to be
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaRecorder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaRecorder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaRecorder.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaRecorder.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -31,12 +31,8 @@
 #undef LOG
 #endif
 
-#ifdef PR_LOGGING
 PRLogModuleInfo* gMediaRecorderLog;
-#define LOG(type, msg) PR_LOG(gMediaRecorderLog, type, msg)
-#else
-#define LOG(type, msg)
-#endif
+#define LOG(type, msg) MOZ_LOG(gMediaRecorderLog, type, msg)
 
 namespace mozilla {
 
@@ -759,11 +755,9 @@
   MOZ_ASSERT(aOwnerWindow);
   MOZ_ASSERT(aOwnerWindow->IsInnerWindow());
   mDOMStream = &aSourceMediaStream;
-#ifdef PR_LOGGING
   if (!gMediaRecorderLog) {
     gMediaRecorderLog = PR_NewLogModule("MediaRecorder");
   }
-#endif
   RegisterActivityObserver();
 }
 
@@ -792,11 +786,9 @@
                                                 aSrcOutput);
   }
   mAudioNode = &aSrcAudioNode;
-  #ifdef PR_LOGGING
   if (!gMediaRecorderLog) {
     gMediaRecorderLog = PR_NewLogModule("MediaRecorder");
   }
-  #endif
   RegisterActivityObserver();
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaResource.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaResource.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaResource.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaResource.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -33,17 +33,12 @@
 #include "nsProxyRelease.h"
 #include "nsIContentPolicy.h"
 
-#ifdef PR_LOGGING
 PRLogModuleInfo* gMediaResourceLog;
-#define RESOURCE_LOG(msg, ...) PR_LOG(gMediaResourceLog, PR_LOG_DEBUG, \
+#define RESOURCE_LOG(msg, ...) MOZ_LOG(gMediaResourceLog, PR_LOG_DEBUG, \
                                       (msg, ##__VA_ARGS__))
 // Debug logging macro with object pointer and class name.
 #define CMLOG(msg, ...) \
         RESOURCE_LOG("%p [ChannelMediaResource]: " msg, this, ##__VA_ARGS__)
-#else
-#define RESOURCE_LOG(msg, ...)
-#define CMLOG(msg, ...)
-#endif
 
 static const uint32_t HTTP_OK_CODE = 200;
 static const uint32_t HTTP_PARTIAL_RESPONSE_CODE = 206;
@@ -85,11 +80,9 @@
     mIgnoreResume(false),
     mIsTransportSeekable(true)
 {
-#ifdef PR_LOGGING
   if (!gMediaResourceLog) {
     gMediaResourceLog = PR_NewLogModule("MediaResource");
   }
-#endif
 }
 
 ChannelMediaResource::~ChannelMediaResource()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaShutdownManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaShutdownManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaShutdownManager.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaShutdownManager.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -9,16 +9,12 @@
 #include "mozilla/StaticPtr.h"
 #include "MediaDecoder.h"
 #include "SharedThreadPool.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* gMediaDecoderLog;
-#define DECODER_LOG(type, msg) PR_LOG(gMediaDecoderLog, type, msg)
-#else
-#define DECODER_LOG(type, msg)
-#endif
+#define DECODER_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 
 NS_IMPL_ISUPPORTS(MediaShutdownManager, nsIObserver)
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/ContainerParser.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/ContainerParser.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/ContainerParser.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/ContainerParser.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -9,14 +9,13 @@
 #include "WebMBufferedParser.h"
 #include "mozilla/Endian.h"
 #include "mp4_demuxer/MoofParser.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "MediaData.h"
 #ifdef MOZ_FMP4
 #include "MP4Stream.h"
 #endif
 #include "SourceBufferResource.h"
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetMediaSourceLog();
 
 /* Polyfill __func__ on MSVC to pass to the log. */
@@ -26,10 +25,7 @@
 
 #define STRINGIFY(x) #x
 #define TOSTRING(x) STRINGIFY(x)
-#define MSE_DEBUG(name, arg, ...) PR_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, (TOSTRING(name) "(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
-#else
-#define MSE_DEBUG(...)
-#endif
+#define MSE_DEBUG(name, arg, ...) MOZ_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, (TOSTRING(name) "(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
 
 namespace mozilla {
 
@@ -179,7 +175,7 @@
     if (initSegment || !HasCompleteInitData()) {
       if (mParser.mInitEndOffset > 0) {
         MOZ_ASSERT(mParser.mInitEndOffset <= mResource->GetLength());
-        if (!mInitData->SetLength(mParser.mInitEndOffset)) {
+        if (!mInitData->SetLength(mParser.mInitEndOffset, fallible)) {
           // Super unlikely OOM
           return false;
         }
@@ -277,7 +273,9 @@
     return ((*aData)[4] == 'm' && (*aData)[5] == 'o' && (*aData)[6] == 'o' &&
             (*aData)[7] == 'f') ||
            ((*aData)[4] == 's' && (*aData)[5] == 't' && (*aData)[6] == 'y' &&
-            (*aData)[7] == 'p');
+            (*aData)[7] == 'p') ||
+           ((*aData)[4] == 's' && (*aData)[5] == 'i' && (*aData)[6] == 'd' &&
+            (*aData)[7] == 'x');
   }
 
   bool ParseStartAndEndTimestamps(MediaLargeByteBuffer* aData,
@@ -310,7 +308,7 @@
       const MediaByteRange& range = mParser->mInitRange;
       uint32_t length = range.mEnd - range.mStart;
       if (length) {
-        if (!mInitData->SetLength(length)) {
+        if (!mInitData->SetLength(length, fallible)) {
           // Super unlikely OOM
           return false;
         }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/MediaSource.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/MediaSource.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/MediaSource.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/MediaSource.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -16,7 +16,6 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/HTMLMediaElement.h"
-#include "mozilla/dom/TimeRanges.h"
 #include "mozilla/mozalloc.h"
 #include "nsContentTypeParser.h"
 #include "nsContentUtils.h"
@@ -30,13 +29,16 @@
 #include "nsPIDOMWindow.h"
 #include "nsString.h"
 #include "nsThreadUtils.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsServiceManagerUtils.h"
 
+#ifdef MOZ_WIDGET_ANDROID
+#include "AndroidBridge.h"
+#endif
+
 struct JSContext;
 class JSObject;
 
-#ifdef PR_LOGGING
 PRLogModuleInfo* GetMediaSourceLog()
 {
   static PRLogModuleInfo* sLogModule;
@@ -55,12 +57,8 @@
   return sLogModule;
 }
 
-#define MSE_DEBUG(arg, ...) PR_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("MediaSource(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
-#define MSE_API(arg, ...) PR_LOG(GetMediaSourceAPILog(), PR_LOG_DEBUG, ("MediaSource(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
-#else
-#define MSE_DEBUG(...)
-#define MSE_API(...)
-#endif
+#define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("MediaSource(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
+#define MSE_API(arg, ...) MOZ_LOG(GetMediaSourceAPILog(), PR_LOG_DEBUG, ("MediaSource(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
 
 // Arbitrary limit.
 static const unsigned int MAX_SOURCE_BUFFERS = 16;
@@ -92,7 +90,12 @@
     if (mimeType.EqualsASCII(gMediaSourceTypes[i])) {
       if ((mimeType.EqualsASCII("video/mp4") ||
            mimeType.EqualsASCII("audio/mp4")) &&
-          !Preferences::GetBool("media.mediasource.mp4.enabled", false)) {
+          (!Preferences::GetBool("media.mediasource.mp4.enabled", false)
+#ifdef MOZ_WIDGET_ANDROID
+          // MP4 won't work unless we have JellyBean+
+          || AndroidBridge::Bridge()->GetAPIVersion() < 16
+#endif
+          )) {
         break;
       }
       if ((mimeType.EqualsASCII("video/webm") ||
@@ -375,7 +378,9 @@
 
    return eTLDplusOne.EqualsLiteral("youtube.com") ||
           eTLDplusOne.EqualsLiteral("youtube-nocookie.com") ||
-          eTLDplusOne.EqualsLiteral("netflix.com");
+          eTLDplusOne.EqualsLiteral("netflix.com") ||
+          eTLDplusOne.EqualsLiteral("dailymotion.com") ||
+          eTLDplusOne.EqualsLiteral("dmcdn.net");
 }
 
 bool
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/MediaSourceDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/MediaSourceDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/MediaSourceDecoder.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/MediaSourceDecoder.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -5,9 +5,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "MediaSourceDecoder.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "mozilla/dom/HTMLMediaElement.h"
-#include "mozilla/dom/TimeRanges.h"
 #include "MediaDecoderStateMachine.h"
 #include "MediaSource.h"
 #include "MediaSourceReader.h"
@@ -16,15 +15,10 @@
 #include "SourceBufferDecoder.h"
 #include "VideoUtils.h"
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetMediaSourceLog();
 
-#define MSE_DEBUG(arg, ...) PR_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("MediaSourceDecoder(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
-#define MSE_DEBUGV(arg, ...) PR_LOG(GetMediaSourceLog(), PR_LOG_DEBUG + 1, ("MediaSourceDecoder(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
-#else
-#define MSE_DEBUG(...)
-#define MSE_DEBUGV(...)
-#endif
+#define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("MediaSourceDecoder(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
+#define MSE_DEBUGV(arg, ...) MOZ_LOG(GetMediaSourceLog(), PR_LOG_DEBUG + 1, ("MediaSourceDecoder(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
 
 namespace mozilla {
 
@@ -68,26 +62,30 @@
   return ScheduleStateMachine();
 }
 
-nsresult
-MediaSourceDecoder::GetSeekable(dom::TimeRanges* aSeekable)
+media::TimeIntervals
+MediaSourceDecoder::GetSeekable()
 {
   MOZ_ASSERT(NS_IsMainThread());
   if (!mMediaSource) {
-    return NS_ERROR_FAILURE;
+    NS_WARNING("MediaSource element isn't attached");
+    return media::TimeIntervals::Invalid();
   }
 
+  media::TimeIntervals seekable;
   double duration = mMediaSource->Duration();
   if (IsNaN(duration)) {
     // Return empty range.
   } else if (duration > 0 && mozilla::IsInfinite(duration)) {
-    nsRefPtr<dom::TimeRanges> bufferedRanges = new dom::TimeRanges();
-    mReader->GetBuffered(bufferedRanges);
-    aSeekable->Add(bufferedRanges->GetStartTime(), bufferedRanges->GetEndTime());
+    media::TimeIntervals buffered = mReader->GetBuffered();
+    if (buffered.Length()) {
+      seekable += media::TimeInterval(buffered.GetStart(), buffered.GetEnd());
+    }
   } else {
-    aSeekable->Add(0, duration);
+    seekable += media::TimeInterval(media::TimeUnit::FromSeconds(0),
+                                    media::TimeUnit::FromSeconds(duration));
   }
-  MSE_DEBUG("ranges=%s", DumpTimeRanges(aSeekable).get());
-  return NS_OK;
+  MSE_DEBUG("ranges=%s", DumpTimeRanges(seekable).get());
+  return seekable;
 }
 
 void
@@ -341,22 +339,24 @@
 {
   ReentrantMonitorAutoEnter mon(GetReentrantMonitor());
 
+  media::TimeUnit target{media::TimeUnit::FromMicroseconds(aTarget)};
+  media::TimeUnit tolerance{media::TimeUnit::FromMicroseconds(aTolerance + aTarget)};
+
+  // aTolerance gives a slight bias toward the start of a range only.
   // Consider decoders in order of newest to oldest, as a newer decoder
   // providing a given buffered range is expected to replace an older one.
   for (int32_t i = aTrackDecoders.Length() - 1; i >= 0; --i) {
     nsRefPtr<SourceBufferDecoder> newDecoder = aTrackDecoders[i];
 
-    nsRefPtr<dom::TimeRanges> ranges = new dom::TimeRanges();
-    newDecoder->GetBuffered(ranges);
-    if (ranges->Find(double(aTarget) / USECS_PER_S,
-                     double(aTolerance) / USECS_PER_S) == dom::TimeRanges::NoIndex) {
-      MSE_DEBUGV("SelectDecoder(%lld fuzz:%lld) newDecoder=%p (%d/%d) target not in ranges=%s",
-                 aTarget, aTolerance, newDecoder.get(), i+1,
-                 aTrackDecoders.Length(), DumpTimeRanges(ranges).get());
-      continue;
+    media::TimeIntervals ranges = newDecoder->GetBuffered();
+    for (uint32_t j = 0; j < ranges.Length(); j++) {
+      if (target < ranges.End(j) && tolerance >= ranges.Start(j)) {
+        return newDecoder.forget();
+      }
     }
-
-    return newDecoder.forget();
+    MSE_DEBUGV("SelectDecoder(%lld fuzz:%lld) newDecoder=%p (%d/%d) target not in ranges=%s",
+               aTarget, aTolerance, newDecoder.get(), i+1,
+               aTrackDecoders.Length(), DumpTimeRanges(ranges).get());
   }
 
   return nullptr;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/MediaSourceDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/MediaSourceDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/MediaSourceDecoder.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/MediaSourceDecoder.h	2015-05-25 20:43:41.000000000 +0000
@@ -38,7 +38,7 @@
   virtual MediaDecoder* Clone() override;
   virtual MediaDecoderStateMachine* CreateStateMachine() override;
   virtual nsresult Load(nsIStreamListener**, MediaDecoder*) override;
-  virtual nsresult GetSeekable(dom::TimeRanges* aSeekable) override;
+  virtual media::TimeIntervals GetSeekable() override;
 
   virtual void Shutdown() override;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/MediaSourceReader.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/MediaSourceReader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/MediaSourceReader.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/MediaSourceReader.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -6,10 +6,10 @@
 #include "MediaSourceReader.h"
 
 #include <cmath>
-#include "prlog.h"
-#include "mozilla/dom/TimeRanges.h"
+#include "mozilla/Logging.h"
 #include "DecoderTraits.h"
 #include "MediaDecoderOwner.h"
+#include "MediaFormatReader.h"
 #include "MediaSourceDecoder.h"
 #include "MediaSourceUtils.h"
 #include "SourceBufferDecoder.h"
@@ -19,18 +19,14 @@
 #ifdef MOZ_FMP4
 #include "SharedDecoderManager.h"
 #include "MP4Decoder.h"
+#include "MP4Demuxer.h"
 #include "MP4Reader.h"
 #endif
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetMediaSourceLog();
 
-#define MSE_DEBUG(arg, ...) PR_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("MediaSourceReader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
-#define MSE_DEBUGV(arg, ...) PR_LOG(GetMediaSourceLog(), PR_LOG_DEBUG + 1, ("MediaSourceReader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
-#else
-#define MSE_DEBUG(...)
-#define MSE_DEBUGV(...)
-#endif
+#define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("MediaSourceReader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
+#define MSE_DEBUGV(arg, ...) MOZ_LOG(GetMediaSourceLog(), PR_LOG_DEBUG + 1, ("MediaSourceReader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
 
 // When a stream hits EOS it needs to decide what other stream to switch to. Due
 // to inaccuracies is determining buffer end frames (Bug 1065207) and rounding
@@ -39,8 +35,6 @@
 // default value used in Blink, kDefaultBufferDurationInMs.
 #define EOS_FUZZ_US 125000
 
-using mozilla::dom::TimeRanges;
-
 namespace mozilla {
 
 MediaSourceReader::MediaSourceReader(MediaSourceDecoder* aDecoder)
@@ -249,10 +243,9 @@
 AdjustEndTime(int64_t* aEndTime, SourceBufferDecoder* aDecoder)
 {
   if (aDecoder) {
-    nsRefPtr<dom::TimeRanges> ranges = new dom::TimeRanges();
-    aDecoder->GetBuffered(ranges);
-    if (ranges->Length() > 0) {
-      int64_t end = std::ceil(ranges->GetEndTime() * USECS_PER_S);
+    media::TimeIntervals ranges = aDecoder->GetBuffered();
+    if (ranges.Length()) {
+      int64_t end = ranges.GetEnd().ToMicroseconds();
       *aEndTime = std::max(*aEndTime, end);
     }
   }
@@ -604,9 +597,8 @@
     // A decoder buffered range is continuous. We would have failed the exact
     // search but succeeded the fuzzy one if our target was shortly before
     // start time.
-    nsRefPtr<dom::TimeRanges> ranges = new dom::TimeRanges();
-    newDecoder->GetBuffered(ranges);
-    int64_t startTime = ranges->GetStartTime() * USECS_PER_S;
+    media::TimeIntervals ranges = newDecoder->GetBuffered();
+    int64_t startTime = ranges.GetStart().ToMicroseconds();
     if (*aTarget < startTime) {
       *aTarget = startTime;
     }
@@ -650,9 +642,8 @@
     // A decoder buffered range is continuous. We would have failed the exact
     // search but succeeded the fuzzy one if our target was shortly before
     // start time.
-    nsRefPtr<dom::TimeRanges> ranges = new dom::TimeRanges();
-    newDecoder->GetBuffered(ranges);
-    int64_t startTime = ranges->GetStartTime() * USECS_PER_S;
+    media::TimeIntervals ranges = newDecoder->GetBuffered();
+    int64_t startTime = ranges.GetStart().ToMicroseconds();
     if (*aTarget < startTime) {
       *aTarget = startTime;
     }
@@ -693,7 +684,12 @@
   if ((aType.LowerCaseEqualsLiteral("video/mp4") ||
        aType.LowerCaseEqualsLiteral("audio/mp4")) &&
       MP4Decoder::IsEnabled() && aDecoder) {
-    return new MP4Reader(aDecoder);
+    bool useFormatDecoder =
+      Preferences::GetBool("media.mediasource.format-reader.mp4", true);
+    MediaDecoderReader* reader = useFormatDecoder ?
+      static_cast<MediaDecoderReader*>(new MediaFormatReader(aDecoder, new MP4Demuxer(aDecoder->GetResource()))) :
+      static_cast<MediaDecoderReader*>(new MP4Reader(aDecoder));
+    return reader;
   }
 #endif
   return DecoderTraits::CreateReader(aType, aDecoder);
@@ -1001,44 +997,38 @@
   MSE_DEBUG("reader=%p", GetVideoReader());
 }
 
-nsresult
-MediaSourceReader::GetBuffered(dom::TimeRanges* aBuffered)
+media::TimeIntervals
+MediaSourceReader::GetBuffered()
 {
   ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
-  MOZ_ASSERT(aBuffered->Length() == 0);
-  if (mTrackBuffers.IsEmpty()) {
-    return NS_OK;
-  }
+  media::TimeIntervals buffered;
 
-  double highestEndTime = 0;
+  media::TimeUnit highestEndTime;
+  nsTArray<media::TimeIntervals> activeRanges;
+  // Must set the capacity of the nsTArray first: bug #1164444
+  activeRanges.SetCapacity(mTrackBuffers.Length());
 
-  nsTArray<nsRefPtr<TimeRanges>> activeRanges;
-  for (uint32_t i = 0; i < mTrackBuffers.Length(); ++i) {
-    nsRefPtr<TimeRanges> r = new TimeRanges();
-    mTrackBuffers[i]->Buffered(r);
-    activeRanges.AppendElement(r);
-    highestEndTime = std::max(highestEndTime, activeRanges.LastElement()->GetEndTime());
+  for (const auto& trackBuffer : mTrackBuffers) {
+    activeRanges.AppendElement(trackBuffer->Buffered());
+    highestEndTime = std::max(highestEndTime, activeRanges.LastElement().GetEnd());
   }
 
-  TimeRanges* intersectionRanges = aBuffered;
-  intersectionRanges->Add(0, highestEndTime);
-
-  for (uint32_t i = 0; i < activeRanges.Length(); ++i) {
-    TimeRanges* sourceRanges = activeRanges[i];
+  buffered +=
+    media::TimeInterval(media::TimeUnit::FromMicroseconds(0), highestEndTime);
 
-    if (IsEnded()) {
+  for (auto& range : activeRanges) {
+    if (IsEnded() && range.Length()) {
       // Set the end time on the last range to highestEndTime by adding a
       // new range spanning the current end time to highestEndTime, which
       // Normalize() will then merge with the old last range.
-      sourceRanges->Add(sourceRanges->GetEndTime(), highestEndTime);
-      sourceRanges->Normalize();
+      range +=
+        media::TimeInterval(range.GetEnd(), highestEndTime);
     }
-
-    intersectionRanges->Intersection(sourceRanges);
+    buffered.Intersection(range);
   }
 
-  MSE_DEBUG("ranges=%s", DumpTimeRanges(intersectionRanges).get());
-  return NS_OK;
+  MSE_DEBUG("ranges=%s", DumpTimeRanges(buffered).get());
+  return buffered;
 }
 
 already_AddRefed<SourceBufferDecoder>
@@ -1054,15 +1044,15 @@
   }
 
   nsRefPtr<SourceBufferDecoder> firstDecoder;
-  double lowestStartTime = PositiveInfinity<double>();
+  media::TimeUnit lowestStartTime{media::TimeUnit::FromInfinity()};
+
 
   for (uint32_t i = 0; i < decoders.Length(); ++i) {
-    nsRefPtr<TimeRanges> r = new TimeRanges();
-    decoders[i]->GetBuffered(r);
-    double start = r->GetStartTime();
-    if (start < 0) {
+    media::TimeIntervals r = decoders[i]->GetBuffered();
+    if (!r.Length()) {
       continue;
     }
+    media::TimeUnit start = r.GetStart();
     if (start < lowestStartTime) {
       firstDecoder = decoders[i];
       lowestStartTime = start;
@@ -1132,6 +1122,11 @@
     return NS_ERROR_FAILURE;
   }
 
+  if (mAudioTrack == mVideoTrack) {
+    NS_WARNING("Combined audio/video sourcebuffer, this is an unsupported "
+               "configuration, only using video track");
+    mAudioTrack = nullptr;
+  }
   if (mAudioTrack) {
     MOZ_ASSERT(mAudioTrack->IsReady());
     mAudioSourceDecoder = mAudioTrack->Decoders()[0];
@@ -1217,9 +1212,8 @@
   }
   TrackBuffer* trackBuffer =
     aType == MediaData::AUDIO_DATA ? mAudioTrack : mVideoTrack;
-  nsRefPtr<dom::TimeRanges> buffered = new dom::TimeRanges();
-  trackBuffer->Buffered(buffered);
-  return aTime >= (buffered->GetEndTime() * USECS_PER_S - EOS_FUZZ_US);
+  media::TimeIntervals buffered = trackBuffer->Buffered();
+  return aTime >= buffered.GetEnd().ToMicroseconds() - EOS_FUZZ_US;
 }
 
 int64_t
@@ -1228,10 +1222,9 @@
   ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
 
   TrackBuffer* trackBuffer =
-  aType == MediaData::AUDIO_DATA ? mAudioTrack : mVideoTrack;
-  nsRefPtr<dom::TimeRanges> buffered = new dom::TimeRanges();
-  trackBuffer->Buffered(buffered);
-  return buffered->GetEndTime() * USECS_PER_S - 1;
+    aType == MediaData::AUDIO_DATA ? mAudioTrack : mVideoTrack;
+  media::TimeIntervals buffered = trackBuffer->Buffered();
+  return buffered.GetEnd().ToMicroseconds() - 1;
 }
 
 void
@@ -1252,8 +1245,7 @@
     for (int32_t i = mAudioTrack->Decoders().Length() - 1; i >= 0; --i) {
       nsRefPtr<MediaDecoderReader> newReader = mAudioTrack->Decoders()[i]->GetReader();
 
-      nsRefPtr<dom::TimeRanges> ranges = new dom::TimeRanges();
-      mAudioTrack->Decoders()[i]->GetBuffered(ranges);
+      media::TimeIntervals ranges = mAudioTrack->Decoders()[i]->GetBuffered();
       result += nsPrintfCString("\t\tReader %d: %p ranges=%s active=%s size=%lld\n",
                                 i, newReader.get(), DumpTimeRanges(ranges).get(),
                                 newReader.get() == GetAudioReader() ? "true" : "false",
@@ -1266,8 +1258,7 @@
     for (int32_t i = mVideoTrack->Decoders().Length() - 1; i >= 0; --i) {
       nsRefPtr<MediaDecoderReader> newReader = mVideoTrack->Decoders()[i]->GetReader();
 
-      nsRefPtr<dom::TimeRanges> ranges = new dom::TimeRanges();
-      mVideoTrack->Decoders()[i]->GetBuffered(ranges);
+      media::TimeIntervals ranges = mVideoTrack->Decoders()[i]->GetBuffered();
       result += nsPrintfCString("\t\tReader %d: %p ranges=%s active=%s size=%lld\n",
                                 i, newReader.get(), DumpTimeRanges(ranges).get(),
                                 newReader.get() == GetVideoReader() ? "true" : "false",
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/MediaSourceReader.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/MediaSourceReader.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/MediaSourceReader.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/MediaSourceReader.h	2015-05-25 20:43:41.000000000 +0000
@@ -112,7 +112,7 @@
   nsresult ResetDecode() override;
 
   // Acquires the decoder monitor, and is thus callable on any thread.
-  nsresult GetBuffered(dom::TimeRanges* aBuffered) override;
+  media::TimeIntervals GetBuffered() override;
 
   already_AddRefed<SourceBufferDecoder> CreateSubDecoder(const nsACString& aType,
                                                          int64_t aTimestampOffset /* microseconds */);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/MediaSourceResource.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/MediaSourceResource.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/MediaSourceResource.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/MediaSourceResource.h	2015-05-25 20:43:41.000000000 +0000
@@ -9,15 +9,11 @@
 
 #include "MediaResource.h"
 #include "mozilla/Monitor.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetMediaSourceLog();
 
-#define MSE_DEBUG(arg, ...) PR_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("MediaSourceResource(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
-#else
-#define MSE_DEBUG(...)
-#endif
+#define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("MediaSourceResource(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
 
 #define UNIMPLEMENTED() MSE_DEBUG("UNIMPLEMENTED FUNCTION at %s:%d", __FILE__, __LINE__)
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/MediaSourceUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/MediaSourceUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/MediaSourceUtils.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/MediaSourceUtils.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -5,25 +5,25 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "MediaSourceUtils.h"
 
-#include "prlog.h"
-#include "mozilla/dom/TimeRanges.h"
+#include "mozilla/Logging.h"
 #include "nsPrintfCString.h"
 
 namespace mozilla {
 
 nsCString
-DumpTimeRanges(dom::TimeRanges* aRanges)
+DumpTimeRanges(const media::TimeIntervals& aRanges)
 {
   nsCString dump;
 
   dump = "[";
 
-  for (uint32_t i = 0; i < aRanges->Length(); ++i) {
+  for (uint32_t i = 0; i < aRanges.Length(); ++i) {
     if (i > 0) {
       dump += ", ";
     }
-    ErrorResult dummy;
-    dump += nsPrintfCString("(%f, %f)", aRanges->Start(i, dummy), aRanges->End(i, dummy));
+    dump += nsPrintfCString("(%f, %f)",
+                            aRanges.Start(i).ToSeconds(),
+                            aRanges.End(i).ToSeconds());
   }
 
   dump += "]";
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/MediaSourceUtils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/MediaSourceUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/MediaSourceUtils.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/MediaSourceUtils.h	2015-05-25 20:43:41.000000000 +0000
@@ -8,14 +8,11 @@
 #define MOZILLA_MEDIASOURCEUTILS_H_
 
 #include "nsString.h"
+#include "TimeUnits.h"
 
 namespace mozilla {
 
-namespace dom {
-  class TimeRanges;
-} // namespace dom
-
-nsCString DumpTimeRanges(dom::TimeRanges* aRanges);
+nsCString DumpTimeRanges(const media::TimeIntervals& aRanges);
 
 } // namespace mozilla
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/ResourceQueue.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/ResourceQueue.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/ResourceQueue.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/ResourceQueue.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -6,9 +6,8 @@
 
 #include "nsDeque.h"
 #include "MediaData.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetSourceBufferResourceLog();
 
 /* Polyfill __func__ on MSVC to pass to the log. */
@@ -16,12 +15,8 @@
 #define __func__ __FUNCTION__
 #endif
 
-#define SBR_DEBUG(arg, ...) PR_LOG(GetSourceBufferResourceLog(), PR_LOG_DEBUG, ("ResourceQueue(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
-#define SBR_DEBUGV(arg, ...) PR_LOG(GetSourceBufferResourceLog(), PR_LOG_DEBUG+1, ("ResourceQueue(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
-#else
-#define SBR_DEBUG(...)
-#define SBR_DEBUGV(...)
-#endif
+#define SBR_DEBUG(arg, ...) MOZ_LOG(GetSourceBufferResourceLog(), PR_LOG_DEBUG, ("ResourceQueue(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
+#define SBR_DEBUGV(arg, ...) MOZ_LOG(GetSourceBufferResourceLog(), PR_LOG_DEBUG+1, ("ResourceQueue(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
 
 namespace mozilla {
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/SourceBuffer.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/SourceBuffer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/SourceBuffer.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/SourceBuffer.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -19,25 +19,19 @@
 #include "nsIEventTarget.h"
 #include "nsIRunnable.h"
 #include "nsThreadUtils.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include <time.h>
 #include "TimeUnits.h"
 
 struct JSContext;
 class JSObject;
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetMediaSourceLog();
 extern PRLogModuleInfo* GetMediaSourceAPILog();
 
-#define MSE_DEBUG(arg, ...) PR_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("SourceBuffer(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
-#define MSE_DEBUGV(arg, ...) PR_LOG(GetMediaSourceLog(), PR_LOG_DEBUG + 1, ("SourceBuffer(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
-#define MSE_API(arg, ...) PR_LOG(GetMediaSourceAPILog(), PR_LOG_DEBUG, ("SourceBuffer(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
-#else
-#define MSE_DEBUG(...)
-#define MSE_DEBUGV(...)
-#define MSE_API(...)
-#endif
+#define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("SourceBuffer(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
+#define MSE_DEBUGV(arg, ...) MOZ_LOG(GetMediaSourceLog(), PR_LOG_DEBUG + 1, ("SourceBuffer(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
+#define MSE_API(arg, ...) MOZ_LOG(GetMediaSourceAPILog(), PR_LOG_DEBUG, ("SourceBuffer(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
 
 namespace mozilla {
 
@@ -146,17 +140,14 @@
     aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
     return nullptr;
   }
-  nsRefPtr<TimeRanges> ranges = new TimeRanges();
-  double highestEndTime = mTrackBuffer->Buffered(ranges);
-  if (mMediaSource->ReadyState() == MediaSourceReadyState::Ended) {
-    // Set the end time on the last range to highestEndTime by adding a
-    // new range spanning the current end time to highestEndTime, which
-    // Normalize() will then merge with the old last range.
-    ranges->Add(ranges->GetEndTime(), highestEndTime);
-    ranges->Normalize();
-  }
+  // We only manage a single trackbuffer in our source buffer.
+  // As such, there's no need to adjust the end of the trackbuffers as per
+  // Step 4: http://w3c.github.io/media-source/index.html#widl-SourceBuffer-buffered
+  media::TimeIntervals ranges = mTrackBuffer->Buffered();
   MSE_DEBUGV("ranges=%s", DumpTimeRanges(ranges).get());
-  return ranges.forget();
+  nsRefPtr<dom::TimeRanges> tr = new dom::TimeRanges();
+  ranges.ToTimeRanges(tr);
+  return tr.forget();
 }
 
 void
@@ -287,8 +278,8 @@
 {
   MSE_DEBUG("DoRangeRemoval(%f, %f)", aStart, aEnd);
   if (mTrackBuffer && !IsInfinite(aStart)) {
-    mTrackBuffer->RangeRemoval(media::Microseconds::FromSeconds(aStart),
-                               media::Microseconds::FromSeconds(aEnd));
+    mTrackBuffer->RangeRemoval(media::TimeUnit::FromSeconds(aStart),
+                               media::TimeUnit::FromSeconds(aEnd));
   }
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/SourceBufferDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/SourceBufferDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/SourceBufferDecoder.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/SourceBufferDecoder.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -6,22 +6,17 @@
 
 #include "MediaSourceUtils.h"
 #include "SourceBufferDecoder.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "AbstractMediaDecoder.h"
 #include "MediaDecoderReader.h"
-#include "mozilla/dom/TimeRanges.h"
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetMediaSourceLog();
 /* Polyfill __func__ on MSVC to pass to the log. */
 #ifdef _MSC_VER
 #define __func__ __FUNCTION__
 #endif
 
-#define MSE_DEBUG(arg, ...) PR_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("SourceBufferDecoder(%p:%s)::%s: " arg, this, mResource->GetContentType().get(), __func__, ##__VA_ARGS__))
-#else
-#define MSE_DEBUG(...)
-#endif
+#define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("SourceBufferDecoder(%p:%s)::%s: " arg, this, mResource->GetContentType().get(), __func__, ##__VA_ARGS__))
 
 namespace mozilla {
 
@@ -238,24 +233,23 @@
   mParentDecoder->NotifyDataArrived(nullptr, 0, 0);
 }
 
-nsresult
-SourceBufferDecoder::GetBuffered(dom::TimeRanges* aBuffered)
+media::TimeIntervals
+SourceBufferDecoder::GetBuffered()
 {
-  nsresult rv = mReader->GetBuffered(aBuffered);
-  if (NS_FAILED(rv)) {
-    return rv;
+  media::TimeIntervals buffered = mReader->GetBuffered();
+  if (buffered.IsInvalid()) {
+    return buffered;
   }
 
   // Adjust buffered range according to timestamp offset.
-  aBuffered->Shift((double)mTimestampOffset / USECS_PER_S);
+  buffered.Shift(media::TimeUnit::FromMicroseconds(mTimestampOffset));
 
   if (!WasTrimmed()) {
-    return NS_OK;
+    return buffered;
   }
-  nsRefPtr<dom::TimeRanges> tr = new dom::TimeRanges();
-  tr->Add(0, mTrimmedOffset);
-  aBuffered->Intersection(tr);
-  return NS_OK;
+  media::TimeInterval filter(media::TimeUnit::FromSeconds(0),
+                             media::TimeUnit::FromSeconds(mTrimmedOffset));
+  return buffered.Intersection(filter);
 }
 
 int64_t
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/SourceBufferDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/SourceBufferDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/SourceBufferDecoder.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/SourceBufferDecoder.h	2015-05-25 20:43:41.000000000 +0000
@@ -21,12 +21,6 @@
 class MediaResource;
 class MediaDecoderReader;
 
-namespace dom {
-
-class TimeRanges;
-
-} // namespace dom
-
 class SourceBufferDecoder final : public AbstractMediaDecoder
 {
 public:
@@ -72,7 +66,7 @@
 
   // Warning: this mirrors GetBuffered in MediaDecoder, but this class's base is
   // AbstractMediaDecoder, which does not supply this interface.
-  nsresult GetBuffered(dom::TimeRanges* aBuffered);
+  media::TimeIntervals GetBuffered();
 
   void SetReader(MediaDecoderReader* aReader)
   {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/SourceBufferList.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/SourceBufferList.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/SourceBufferList.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/SourceBufferList.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -14,18 +14,13 @@
 #include "nsIRunnable.h"
 #include "nsString.h"
 #include "nsThreadUtils.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetMediaSourceLog();
 extern PRLogModuleInfo* GetMediaSourceAPILog();
 
-#define MSE_API(arg, ...) PR_LOG(GetMediaSourceAPILog(), PR_LOG_DEBUG, ("SourceBufferList(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
-#define MSE_DEBUG(arg, ...) PR_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("SourceBufferList(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
-#else
-#define MSE_API(...)
-#define MSE_DEBUG(...)
-#endif
+#define MSE_API(arg, ...) MOZ_LOG(GetMediaSourceAPILog(), PR_LOG_DEBUG, ("SourceBufferList(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
+#define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("SourceBufferList(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
 
 struct JSContext;
 class JSObject;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/SourceBufferResource.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/SourceBufferResource.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/SourceBufferResource.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/SourceBufferResource.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -10,10 +10,9 @@
 
 #include "nsISeekableStream.h"
 #include "nsISupports.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "MediaData.h"
 
-#ifdef PR_LOGGING
 PRLogModuleInfo* GetSourceBufferResourceLog()
 {
   static PRLogModuleInfo* sLogModule;
@@ -23,12 +22,8 @@
   return sLogModule;
 }
 
-#define SBR_DEBUG(arg, ...) PR_LOG(GetSourceBufferResourceLog(), PR_LOG_DEBUG, ("SourceBufferResource(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
-#define SBR_DEBUGV(arg, ...) PR_LOG(GetSourceBufferResourceLog(), PR_LOG_DEBUG+1, ("SourceBufferResource(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
-#else
-#define SBR_DEBUG(...)
-#define SBR_DEBUGV(...)
-#endif
+#define SBR_DEBUG(arg, ...) MOZ_LOG(GetSourceBufferResourceLog(), PR_LOG_DEBUG, ("SourceBufferResource(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
+#define SBR_DEBUGV(arg, ...) MOZ_LOG(GetSourceBufferResourceLog(), PR_LOG_DEBUG+1, ("SourceBufferResource(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
 
 namespace mozilla {
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/SourceBufferResource.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/SourceBufferResource.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/SourceBufferResource.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/SourceBufferResource.h	2015-05-25 20:43:41.000000000 +0000
@@ -18,7 +18,7 @@
 #include "nsString.h"
 #include "nsTArray.h"
 #include "nscore.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #define UNIMPLEMENTED() { /* Logging this is too spammy to do by default */ }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/TrackBuffer.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/TrackBuffer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/TrackBuffer.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/TrackBuffer.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -20,15 +20,11 @@
 #include "nsError.h"
 #include "nsIRunnable.h"
 #include "nsThreadUtils.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetMediaSourceLog();
 
-#define MSE_DEBUG(arg, ...) PR_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("TrackBuffer(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
-#else
-#define MSE_DEBUG(...)
-#endif
+#define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("TrackBuffer(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
 
 // Time in seconds to substract from the current time when deciding the
 // time point to evict data before in a decoder. This is used to help
@@ -277,24 +273,18 @@
 public:
   bool LessThan(SourceBufferDecoder* aFirst, SourceBufferDecoder* aSecond) const
   {
-    nsRefPtr<dom::TimeRanges> first = new dom::TimeRanges();
-    aFirst->GetBuffered(first);
-
-    nsRefPtr<dom::TimeRanges> second = new dom::TimeRanges();
-    aSecond->GetBuffered(second);
+    media::TimeIntervals first = aFirst->GetBuffered();
+    media::TimeIntervals second = aSecond->GetBuffered();
 
-    return first->GetStartTime() < second->GetStartTime();
+    return first.GetStart() < second.GetStart();
   }
 
   bool Equals(SourceBufferDecoder* aFirst, SourceBufferDecoder* aSecond) const
   {
-    nsRefPtr<dom::TimeRanges> first = new dom::TimeRanges();
-    aFirst->GetBuffered(first);
+    media::TimeIntervals first = aFirst->GetBuffered();
+    media::TimeIntervals second = aSecond->GetBuffered();
 
-    nsRefPtr<dom::TimeRanges> second = new dom::TimeRanges();
-    aSecond->GetBuffered(second);
-
-    return first->GetStartTime() == second->GetStartTime();
+    return first.GetStart() == second.GetStart();
   }
 };
 
@@ -324,8 +314,7 @@
   // First try to evict data before the current play position, starting
   // with the oldest decoder.
   for (uint32_t i = 0; i < decoders.Length() && toEvict > 0; ++i) {
-    nsRefPtr<dom::TimeRanges> buffered = new dom::TimeRanges();
-    decoders[i]->GetBuffered(buffered);
+    media::TimeIntervals buffered = decoders[i]->GetBuffered();
 
     MSE_DEBUG("Step1. decoder=%u/%u threshold=%u toEvict=%lld",
               i, decoders.Length(), aThreshold, toEvict);
@@ -334,22 +323,24 @@
     // we apply a threshold of a few seconds back and evict data up to
     // that point.
     if (aPlaybackTime > MSE_EVICT_THRESHOLD_TIME) {
-      double time = aPlaybackTime - MSE_EVICT_THRESHOLD_TIME;
+      media::TimeUnit time = media::TimeUnit::FromSeconds(aPlaybackTime) -
+        media::TimeUnit::FromSeconds(MSE_EVICT_THRESHOLD_TIME);
       bool isActive = decoders[i] == mCurrentDecoder ||
         mParentDecoder->IsActiveReader(decoders[i]->GetReader());
-      if (!isActive && buffered->GetEndTime() < time) {
+      if (!isActive && buffered.GetEnd() < time) {
         // The entire decoder is contained before our current playback time.
         // It can be fully evicted.
         MSE_DEBUG("evicting all bufferedEnd=%f "
                   "aPlaybackTime=%f time=%f, size=%lld",
-                  buffered->GetEndTime(), aPlaybackTime, time,
+                  buffered.GetEnd().ToSeconds(), aPlaybackTime, time,
                   decoders[i]->GetResource()->GetSize());
         toEvict -= decoders[i]->GetResource()->EvictAll();
       } else {
-        int64_t playbackOffset = decoders[i]->ConvertToByteOffset(time);
+        int64_t playbackOffset =
+          decoders[i]->ConvertToByteOffset(time.ToMicroseconds());
         MSE_DEBUG("evicting some bufferedEnd=%f "
                   "aPlaybackTime=%f time=%f, playbackOffset=%lld size=%lld",
-                  buffered->GetEndTime(), aPlaybackTime, time,
+                  buffered.GetEnd().ToSeconds(), aPlaybackTime, time,
                   playbackOffset, decoders[i]->GetResource()->GetSize());
         if (playbackOffset > 0) {
           toEvict -= decoders[i]->GetResource()->EvictData(playbackOffset,
@@ -369,13 +360,12 @@
     if (decoders[i] == mCurrentDecoder) {
       continue;
     }
-    nsRefPtr<dom::TimeRanges> buffered = new dom::TimeRanges();
-    decoders[i]->GetBuffered(buffered);
+    media::TimeIntervals buffered = decoders[i]->GetBuffered();
 
     // Remove data from older decoders than the current one.
     MSE_DEBUG("evicting all "
               "bufferedStart=%f bufferedEnd=%f aPlaybackTime=%f size=%lld",
-              buffered->GetStartTime(), buffered->GetEndTime(),
+              buffered.GetStart().ToSeconds(), buffered.GetEnd().ToSeconds(),
               aPlaybackTime, decoders[i]->GetResource()->GetSize());
     toEvict -= decoders[i]->GetResource()->EvictAll();
   }
@@ -399,10 +389,9 @@
   // Find the next decoder we're likely going to play with.
   nsRefPtr<SourceBufferDecoder> nextPlayingDecoder = nullptr;
   if (playingDecoder) {
-    nsRefPtr<dom::TimeRanges> buffered = new dom::TimeRanges();
-    playingDecoder->GetBuffered(buffered);
+    media::TimeIntervals buffered = playingDecoder->GetBuffered();
     nextPlayingDecoder =
-      mParentDecoder->SelectDecoder(buffered->GetEndTime() * USECS_PER_S + 1,
+      mParentDecoder->SelectDecoder(buffered.GetEnd().ToMicroseconds() + 1,
                                     EOS_FUZZ_US,
                                     mInitializedDecoders);
   }
@@ -417,12 +406,11 @@
         decoders[i] == mCurrentDecoder) {
       continue;
     }
-    nsRefPtr<dom::TimeRanges> buffered = new dom::TimeRanges();
-    decoders[i]->GetBuffered(buffered);
+    media::TimeIntervals buffered = decoders[i]->GetBuffered();
 
     MSE_DEBUG("evicting all "
               "bufferedStart=%f bufferedEnd=%f aPlaybackTime=%f size=%lld",
-              buffered->GetStartTime(), buffered->GetEndTime(),
+              buffered.GetStart().ToSeconds(), buffered.GetEnd().ToSeconds(),
               aPlaybackTime, decoders[i]->GetResource()->GetSize());
     toEvict -= decoders[i]->GetResource()->EvictAll();
   }
@@ -432,9 +420,8 @@
   bool evicted = toEvict < (totalSize - aThreshold);
   if (evicted) {
     if (playingDecoder) {
-      nsRefPtr<dom::TimeRanges> ranges = new dom::TimeRanges();
-      playingDecoder->GetBuffered(ranges);
-      *aBufferStartTime = std::max(0.0, ranges->GetStartTime());
+      media::TimeIntervals ranges = playingDecoder->GetBuffered();
+      *aBufferStartTime = std::max(0.0, ranges.GetStart().ToSeconds());
     } else {
       // We do not currently have data to play yet.
       // Avoid evicting anymore data to minimize rebuffering time.
@@ -452,20 +439,18 @@
 
   // Remove decoders that have no data in them
   for (uint32_t i = 0; i < aDecoders.Length(); ++i) {
-    nsRefPtr<dom::TimeRanges> buffered = new dom::TimeRanges();
-    aDecoders[i]->GetBuffered(buffered);
+    media::TimeIntervals buffered = aDecoders[i]->GetBuffered();
     MSE_DEBUG("maybe remove empty decoders=%d "
               "size=%lld start=%f end=%f",
               i, aDecoders[i]->GetResource()->GetSize(),
-              buffered->GetStartTime(), buffered->GetEndTime());
+              buffered.GetStart().ToSeconds(), buffered.GetEnd().ToSeconds());
     if (aDecoders[i] == mCurrentDecoder ||
         mParentDecoder->IsActiveReader(aDecoders[i]->GetReader())) {
       continue;
     }
 
-    if (aDecoders[i]->GetResource()->GetSize() == 0 ||
-        buffered->GetStartTime() < 0.0 ||
-        buffered->GetEndTime() < 0.0) {
+    if (aDecoders[i]->GetResource()->GetSize() == 0 || !buffered.Length() ||
+        buffered[0].IsEmpty()) {
       MSE_DEBUG("remove empty decoders=%d", i);
       RemoveDecoder(aDecoders[i]);
     }
@@ -488,12 +473,11 @@
   if (!mCurrentDecoder) {
     return false;
   }
-  nsRefPtr<dom::TimeRanges> buffered = new dom::TimeRanges();
-  mCurrentDecoder->GetBuffered(buffered);
+  media::TimeIntervals buffered = mCurrentDecoder->GetBuffered();
   MSE_DEBUG("mCurrentDecoder.size=%lld, start=%f end=%f",
             mCurrentDecoder->GetResource()->GetSize(),
-            buffered->GetStartTime(), buffered->GetEndTime());
-  return mCurrentDecoder->GetResource()->GetSize() && !buffered->Length();
+            buffered.GetStart(), buffered.GetEnd());
+  return mCurrentDecoder->GetResource()->GetSize() && !buffered.Length();
 }
 
 void
@@ -511,23 +495,23 @@
   }
 }
 
-double
-TrackBuffer::Buffered(dom::TimeRanges* aRanges)
+media::TimeIntervals
+TrackBuffer::Buffered()
 {
   ReentrantMonitorAutoEnter mon(mParentDecoder->GetReentrantMonitor());
 
-  double highestEndTime = 0;
+  media::TimeIntervals buffered;
 
-  for (uint32_t i = 0; i < mInitializedDecoders.Length(); ++i) {
-    nsRefPtr<dom::TimeRanges> r = new dom::TimeRanges();
-    mInitializedDecoders[i]->GetBuffered(r);
-    if (r->Length() > 0) {
-      highestEndTime = std::max(highestEndTime, r->GetEndTime());
-      aRanges->Union(r, double(mParser->GetRoundingError()) / USECS_PER_S);
-    }
+  for (auto& decoder : mInitializedDecoders) {
+    buffered += decoder->GetBuffered();
+  }
+  // mParser may not be initialized yet, and will only be so if we have a
+  // buffered range.
+  if (buffered.Length()) {
+    buffered.SetFuzz(media::TimeUnit::FromMicroseconds(mParser->GetRoundingError()));
   }
 
-  return highestEndTime;
+  return buffered;
 }
 
 already_AddRefed<SourceBufferDecoder>
@@ -567,7 +551,7 @@
                                                       &TrackBuffer::InitializeDecoder,
                                                       aDecoder);
   // We need to initialize the reader on its own task queue
-  aDecoder->GetReader()->GetTaskQueue()->Dispatch(task);
+  aDecoder->GetReader()->GetTaskQueue()->Dispatch(task.forget());
   return true;
 }
 
@@ -902,11 +886,11 @@
 TrackBuffer::ContainsTime(int64_t aTime, int64_t aTolerance)
 {
   ReentrantMonitorAutoEnter mon(mParentDecoder->GetReentrantMonitor());
-  for (uint32_t i = 0; i < mInitializedDecoders.Length(); ++i) {
-    nsRefPtr<dom::TimeRanges> r = new dom::TimeRanges();
-    mInitializedDecoders[i]->GetBuffered(r);
-    if (r->Find(double(aTime) / USECS_PER_S,
-                double(aTolerance) / USECS_PER_S) != dom::TimeRanges::NoIndex) {
+  media::TimeUnit time{media::TimeUnit::FromMicroseconds(aTime)};
+  for (auto& decoder : mInitializedDecoders) {
+    media::TimeIntervals r = decoder->GetBuffered();
+    r.SetFuzz(media::TimeUnit::FromMicroseconds(aTolerance));
+    if (r.Contains(time)) {
       return true;
     }
   }
@@ -1057,21 +1041,21 @@
     mInitializedDecoders.RemoveElement(aDecoder);
     mDecoders.RemoveElement(aDecoder);
   }
-  aDecoder->GetReader()->GetTaskQueue()->Dispatch(task);
+  aDecoder->GetReader()->GetTaskQueue()->Dispatch(task.forget());
 }
 
 bool
-TrackBuffer::RangeRemoval(media::Microseconds aStart,
-                          media::Microseconds aEnd)
+TrackBuffer::RangeRemoval(media::TimeUnit aStart,
+                          media::TimeUnit aEnd)
 {
   MOZ_ASSERT(NS_IsMainThread());
   ReentrantMonitorAutoEnter mon(mParentDecoder->GetReentrantMonitor());
 
-  nsRefPtr<dom::TimeRanges> buffered = new dom::TimeRanges();
-  media::Microseconds bufferedEnd = media::Microseconds::FromSeconds(Buffered(buffered));
-  media::Microseconds bufferedStart = media::Microseconds::FromSeconds(buffered->GetStartTime());
+  media::TimeIntervals buffered = Buffered();
+  media::TimeUnit bufferedStart = buffered.GetStart();
+  media::TimeUnit bufferedEnd = buffered.GetEnd();
 
-  if (bufferedStart < media::Microseconds(0) || aStart > bufferedEnd || aEnd < bufferedStart) {
+  if (!buffered.Length() || aStart > bufferedEnd || aEnd < bufferedStart) {
     // Nothing to remove.
     return false;
   }
@@ -1089,18 +1073,17 @@
   if (aStart <= bufferedStart && aEnd < bufferedEnd) {
     // Evict data from beginning.
     for (size_t i = 0; i < decoders.Length(); ++i) {
-      nsRefPtr<dom::TimeRanges> buffered = new dom::TimeRanges();
-      decoders[i]->GetBuffered(buffered);
-      if (media::Microseconds::FromSeconds(buffered->GetEndTime()) < aEnd) {
+      media::TimeIntervals buffered = decoders[i]->GetBuffered();
+      if (buffered.GetEnd() < aEnd) {
         // Can be fully removed.
         MSE_DEBUG("remove all bufferedEnd=%f size=%lld",
-                  buffered->GetEndTime(),
+                  buffered.GetEnd().ToSeconds(),
                   decoders[i]->GetResource()->GetSize());
         decoders[i]->GetResource()->EvictAll();
       } else {
         int64_t offset = decoders[i]->ConvertToByteOffset(aEnd.ToSeconds());
         MSE_DEBUG("removing some bufferedEnd=%f offset=%lld size=%lld",
-                  buffered->GetEndTime(), offset,
+                  buffered.GetEnd().ToSeconds(), offset,
                   decoders[i]->GetResource()->GetSize());
         if (offset > 0) {
           decoders[i]->GetResource()->EvictData(offset, offset);
@@ -1110,11 +1093,11 @@
   } else {
     // Only trimming existing buffers.
     for (size_t i = 0; i < decoders.Length(); ++i) {
-      if (aStart <= media::Microseconds::FromSeconds(buffered->GetStartTime())) {
+      if (aStart <= buffered.GetStart()) {
         // It will be entirely emptied, can clear all data.
         decoders[i]->GetResource()->EvictAll();
       } else {
-        decoders[i]->Trim(aStart.mValue);
+        decoders[i]->Trim(aStart.ToMicroseconds());
       }
     }
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/TrackBuffer.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/TrackBuffer.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/mediasource/TrackBuffer.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/mediasource/TrackBuffer.h	2015-05-25 20:43:41.000000000 +0000
@@ -24,12 +24,6 @@
 class MediaSourceDecoder;
 class MediaLargeByteBuffer;
 
-namespace dom {
-
-class TimeRanges;
-
-} // namespace dom
-
 class TrackBuffer final {
 public:
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(TrackBuffer);
@@ -56,10 +50,9 @@
   // of the buffer through to aTime.
   void EvictBefore(double aTime);
 
-  // Returns the highest end time of all of the buffered ranges in the
-  // decoders managed by this TrackBuffer, and returns the union of the
-  // decoders buffered ranges in aRanges. This may be called on any thread.
-  double Buffered(dom::TimeRanges* aRanges);
+  // Returns the union of the decoders buffered ranges in aRanges.
+  // This may be called on any thread.
+  media::TimeIntervals Buffered();
 
   // Mark the current decoder's resource as ended, clear mCurrentDecoder and
   // reset mLast{Start,End}Timestamp.  Main thread only.
@@ -99,8 +92,8 @@
   // Implementation is only partial, we can only trim a buffer.
   // Returns true if data was evicted.
   // Times are in microseconds.
-  bool RangeRemoval(mozilla::media::Microseconds aStart,
-                    mozilla::media::Microseconds aEnd);
+  bool RangeRemoval(mozilla::media::TimeUnit aStart,
+                    mozilla::media::TimeUnit aEnd);
 
   // Abort any pending appendBuffer by rejecting any pending promises.
   void AbortAppendData();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaStreamGraph.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaStreamGraph.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaStreamGraph.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaStreamGraph.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -16,7 +16,7 @@
 #include "nsServiceManagerUtils.h"
 #include "nsWidgetsCID.h"
 #include "prerror.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "mozilla/Attributes.h"
 #include "TrackUnionStream.h"
 #include "ImageContainer.h"
@@ -41,12 +41,8 @@
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
 PRLogModuleInfo* gMediaStreamGraphLog;
-#define STREAM_LOG(type, msg) PR_LOG(gMediaStreamGraphLog, type, msg)
-#else
-#define STREAM_LOG(type, msg)
-#endif
+#define STREAM_LOG(type, msg) MOZ_LOG(gMediaStreamGraphLog, type, msg)
 
 // #define ENABLE_LIFECYCLE_LOG
 
@@ -392,17 +388,46 @@
 }
 
 GraphTime
-MediaStreamGraphImpl::IterationEnd()
+MediaStreamGraphImpl::IterationEnd() const
 {
   return CurrentDriver()->IterationEnd();
 }
 
 void
-MediaStreamGraphImpl::UpdateCurrentTimeForStreams(GraphTime aPrevCurrentTime, GraphTime aNextCurrentTime)
+MediaStreamGraphImpl::StreamNotifyOutput(MediaStream* aStream)
+{
+  for (uint32_t j = 0; j < aStream->mListeners.Length(); ++j) {
+    MediaStreamListener* l = aStream->mListeners[j];
+    l->NotifyOutput(this, IterationEnd());
+  }
+}
+
+void
+MediaStreamGraphImpl::StreamReadyToFinish(MediaStream* aStream)
 {
-  nsAutoTArray<MediaStream*, 800> streamsReadyToFinish;
-  nsAutoTArray<MediaStream*, 800> streamsWithOutput;
+  MOZ_ASSERT(aStream->mFinished);
+  MOZ_ASSERT(!aStream->mNotifiedFinished);
+
+  // The stream is fully finished when all of its track data has been played
+  // out.
+  if (IterationEnd() >=
+      aStream->StreamTimeToGraphTime(aStream->GetStreamBuffer().GetAllTracksEnd()))  {
+    NS_WARN_IF_FALSE(aStream->mNotifiedBlocked,
+      "Should've notified blocked=true for a fully finished stream");
+    aStream->mNotifiedFinished = true;
+    aStream->mLastPlayedVideoFrame.SetNull();
+    SetStreamOrderDirty();
+    for (uint32_t j = 0; j < aStream->mListeners.Length(); ++j) {
+      MediaStreamListener* l = aStream->mListeners[j];
+      l->NotifyEvent(this, MediaStreamListener::EVENT_FINISHED);
+    }
+  }
+}
 
+void
+MediaStreamGraphImpl::UpdateCurrentTimeForStreams(GraphTime aPrevCurrentTime,
+                                                  GraphTime aNextCurrentTime)
+{
   nsTArray<MediaStream*>* runningAndSuspendedPair[2];
   runningAndSuspendedPair[0] = &mStreams;
   runningAndSuspendedPair[1] = &mSuspendedStreams;
@@ -450,11 +475,11 @@
           "Shouldn't have already notified of finish *and* have output!");
 
         if (streamHasOutput) {
-          streamsWithOutput.AppendElement(stream);
+          StreamNotifyOutput(stream);
         }
 
         if (stream->mFinished && !stream->mNotifiedFinished) {
-          streamsReadyToFinish.AppendElement(stream);
+          StreamReadyToFinish(stream);
         }
       }
       STREAM_LOG(PR_LOG_DEBUG + 1,
@@ -463,32 +488,6 @@
                   MediaTimeToSeconds(blockedTime)));
     }
   }
-
-  for (uint32_t i = 0; i < streamsWithOutput.Length(); ++i) {
-    MediaStream* stream = streamsWithOutput[i];
-    for (uint32_t j = 0; j < stream->mListeners.Length(); ++j) {
-      MediaStreamListener* l = stream->mListeners[j];
-      l->NotifyOutput(this, IterationEnd());
-    }
-  }
-
-  for (uint32_t i = 0; i < streamsReadyToFinish.Length(); ++i) {
-    MediaStream* stream = streamsReadyToFinish[i];
-    // The stream is fully finished when all of its track data has been played
-    // out.
-    if (IterationEnd() >=
-        stream->StreamTimeToGraphTime(stream->GetStreamBuffer().GetAllTracksEnd()))  {
-      NS_WARN_IF_FALSE(stream->mNotifiedBlocked,
-        "Should've notified blocked=true for a fully finished stream");
-      stream->mNotifiedFinished = true;
-      stream->mLastPlayedVideoFrame.SetNull();
-      SetStreamOrderDirty();
-      for (uint32_t j = 0; j < stream->mListeners.Length(); ++j) {
-        MediaStreamListener* l = stream->mListeners[j];
-        l->NotifyEvent(this, MediaStreamListener::EVENT_FINISHED);
-      }
-    }
-  }
 }
 
 bool
@@ -914,24 +913,6 @@
                                           GraphTime aEndBlockingDecisions,
                                           GraphTime* aEnd)
 {
-  class MOZ_STACK_CLASS AfterLoop
-  {
-  public:
-    AfterLoop(MediaStream* aStream, GraphTime& aTime)
-      : mStream(aStream)
-      , mTime(aTime)
-    {}
-
-    ~AfterLoop()
-    {
-      mStream->mBlocked.SetAtAndAfter(mTime, mStream->mBlockInThisPhase);
-    }
-
-  private:
-    MediaStream* mStream;
-    GraphTime& mTime;
-  };
-
   for (uint32_t i = 0; i < aStreams.Length(); ++i) {
     MediaStream* stream = aStreams[i];
     stream->mBlockInThisPhase = false;
@@ -939,7 +920,6 @@
 
   for (uint32_t i = 0; i < aStreams.Length(); ++i) {
     MediaStream* stream = aStreams[i];
-    AfterLoop al(stream, aTime);
 
     if (stream->mFinished) {
       GraphTime endTime = StreamTimeToGraphTime(stream,
@@ -975,8 +955,12 @@
       continue;
     }
   }
-
   NS_ASSERTION(*aEnd > aTime, "Failed to advance!");
+
+  for (uint32_t i = 0; i < aStreams.Length(); ++i) {
+    MediaStream* stream = aStreams[i];
+    stream->mBlocked.SetAtAndAfter(aTime, stream->mBlockInThisPhase);
+  }
 }
 
 void
@@ -997,38 +981,45 @@
 {
   MOZ_ASSERT(mRealtime, "Should only attempt to create audio streams in real-time mode");
 
+  if (aStream->mAudioOutputs.IsEmpty()) {
+    aStream->mAudioOutputStreams.Clear();
+    return;
+  }
+
+  if (!aStream->GetStreamBuffer().GetAndResetTracksDirty()) {
+    return;
+  }
+
   nsAutoTArray<bool,2> audioOutputStreamsFound;
   for (uint32_t i = 0; i < aStream->mAudioOutputStreams.Length(); ++i) {
     audioOutputStreamsFound.AppendElement(false);
   }
 
-  if (!aStream->mAudioOutputs.IsEmpty()) {
-    for (StreamBuffer::TrackIter tracks(aStream->GetStreamBuffer(), MediaSegment::AUDIO);
-         !tracks.IsEnded(); tracks.Next()) {
-      uint32_t i;
-      for (i = 0; i < audioOutputStreamsFound.Length(); ++i) {
-        if (aStream->mAudioOutputStreams[i].mTrackID == tracks->GetID()) {
-          break;
-        }
+  for (StreamBuffer::TrackIter tracks(aStream->GetStreamBuffer(), MediaSegment::AUDIO);
+       !tracks.IsEnded(); tracks.Next()) {
+    uint32_t i;
+    for (i = 0; i < audioOutputStreamsFound.Length(); ++i) {
+      if (aStream->mAudioOutputStreams[i].mTrackID == tracks->GetID()) {
+        break;
       }
-      if (i < audioOutputStreamsFound.Length()) {
-        audioOutputStreamsFound[i] = true;
-      } else {
-        MediaStream::AudioOutputStream* audioOutputStream =
-          aStream->mAudioOutputStreams.AppendElement();
-        audioOutputStream->mAudioPlaybackStartTime = aAudioOutputStartTime;
-        audioOutputStream->mBlockedAudioTime = 0;
-        audioOutputStream->mLastTickWritten = 0;
-        audioOutputStream->mTrackID = tracks->GetID();
-
-        if (!CurrentDriver()->AsAudioCallbackDriver() &&
-            !CurrentDriver()->Switching()) {
-          MonitorAutoLock mon(mMonitor);
-          if (mLifecycleState == LIFECYCLE_RUNNING) {
-            AudioCallbackDriver* driver = new AudioCallbackDriver(this);
-            mMixer.AddCallback(driver);
-            CurrentDriver()->SwitchAtNextIteration(driver);
-          }
+    }
+    if (i < audioOutputStreamsFound.Length()) {
+      audioOutputStreamsFound[i] = true;
+    } else {
+      MediaStream::AudioOutputStream* audioOutputStream =
+        aStream->mAudioOutputStreams.AppendElement();
+      audioOutputStream->mAudioPlaybackStartTime = aAudioOutputStartTime;
+      audioOutputStream->mBlockedAudioTime = 0;
+      audioOutputStream->mLastTickWritten = 0;
+      audioOutputStream->mTrackID = tracks->GetID();
+
+      if (!CurrentDriver()->AsAudioCallbackDriver() &&
+          !CurrentDriver()->Switching()) {
+        MonitorAutoLock mon(mMonitor);
+        if (mLifecycleState == LIFECYCLE_RUNNING) {
+          AudioCallbackDriver* driver = new AudioCallbackDriver(this);
+          mMixer.AddCallback(driver);
+          CurrentDriver()->SwitchAtNextIteration(driver);
         }
       }
     }
@@ -2532,7 +2523,7 @@
       SpeexResamplerState* state = speex_resampler_init(channels,
                                                         aTrackData->mInputRate,
                                                         GraphImpl()->GraphRate(),
-                                                        SPEEX_RESAMPLER_QUALITY_DEFAULT,
+                                                        SPEEX_RESAMPLER_QUALITY_MIN,
                                                         nullptr);
       if (!state) {
         return;
@@ -2973,11 +2964,9 @@
 #endif
   , mAudioChannel(static_cast<uint32_t>(aChannel))
 {
-#ifdef PR_LOGGING
   if (!gMediaStreamGraphLog) {
     gMediaStreamGraphLog = PR_NewLogModule("MediaStreamGraph");
   }
-#endif
 
   if (mRealtime) {
     if (aStartWithAudioDriver) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaStreamGraph.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaStreamGraph.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaStreamGraph.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaStreamGraph.h	2015-05-25 20:43:40.000000000 +0000
@@ -35,9 +35,7 @@
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* gMediaStreamGraphLog;
-#endif
 
 /*
  * MediaStreamGraph is a framework for synchronized audio/video processing
@@ -313,7 +311,8 @@
  * for those objects in arbitrary order and the MediaStreamGraph has to be able
  * to handle this.
  */
-class MediaStream : public mozilla::LinkedListElement<MediaStream> {
+class MediaStream : public mozilla::LinkedListElement<MediaStream>
+{
 public:
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MediaStream)
 
@@ -511,7 +510,7 @@
   {
     return mConsumers.Length();
   }
-  const StreamBuffer& GetStreamBuffer() { return mBuffer; }
+  StreamBuffer& GetStreamBuffer() { return mBuffer; }
   GraphTime GetStreamBufferStartTime() { return mBufferStartTime; }
 
   double StreamTimeToSeconds(StreamTime aTime)
@@ -663,7 +662,8 @@
 
   // Where audio output is going. There is one AudioOutputStream per
   // audio track.
-  struct AudioOutputStream {
+  struct AudioOutputStream
+  {
     // When we started audio playback for this track.
     // Add mStream->GetPosition() to find the current audio playback position.
     GraphTime mAudioPlaybackStartTime;
@@ -733,7 +733,8 @@
  * Audio and video can be written on any thread, but you probably want to
  * always write from the same thread to avoid unexpected interleavings.
  */
-class SourceMediaStream : public MediaStream {
+class SourceMediaStream : public MediaStream
+{
 public:
   explicit SourceMediaStream(DOMMediaStream* aWrapper) :
     MediaStream(aWrapper),
@@ -990,7 +991,8 @@
  * the Destroy message is processed on the graph manager thread we disconnect
  * the port and drop the graph's reference, destroying the object.
  */
-class MediaInputPort final {
+class MediaInputPort final
+{
 private:
   // Do not call this constructor directly. Instead call aDest->AllocateInputPort.
   MediaInputPort(MediaStream* aSource, ProcessedMediaStream* aDest,
@@ -1107,7 +1109,8 @@
  * its output. The details of how the output is produced are handled by
  * subclasses overriding the ProcessInput method.
  */
-class ProcessedMediaStream : public MediaStream {
+class ProcessedMediaStream : public MediaStream
+{
 public:
   explicit ProcessedMediaStream(DOMMediaStream* aWrapper)
     : MediaStream(aWrapper), mAutofinish(false)
@@ -1215,7 +1218,8 @@
  * process.  Each OfflineAudioContext object creates its own MediaStreamGraph
  * object too.
  */
-class MediaStreamGraph {
+class MediaStreamGraph
+{
 public:
   // We ensure that the graph current time advances in multiples of
   // IdealAudioBlockSize()/AudioStream::PreferredSampleRate(). A stream that
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaStreamGraphImpl.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaStreamGraphImpl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaStreamGraphImpl.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaStreamGraphImpl.h	2015-05-25 20:43:40.000000000 +0000
@@ -30,7 +30,8 @@
  * A per-stream update message passed from the media graph thread to the
  * main thread.
  */
-struct StreamUpdate {
+struct StreamUpdate
+{
   int64_t mGraphUpdateIndex;
   nsRefPtr<MediaStream> mStream;
   StreamTime mNextMainThreadCurrentTime;
@@ -41,7 +42,8 @@
  * This represents a message passed from the main thread to the graph thread.
  * A ControlMessage always has a weak reference a particular affected stream.
  */
-class ControlMessage {
+class ControlMessage
+{
 public:
   explicit ControlMessage(MediaStream* aStream) : mStream(aStream)
   {
@@ -70,7 +72,8 @@
   MediaStream* mStream;
 };
 
-class MessageBlock {
+class MessageBlock
+{
 public:
   int64_t mGraphUpdateIndex;
   nsTArray<nsAutoPtr<ControlMessage> > mMessages;
@@ -85,7 +88,8 @@
  * OfflineAudioContext object.
  */
 class MediaStreamGraphImpl : public MediaStreamGraph,
-                             public nsIMemoryReporter {
+                             public nsIMemoryReporter
+{
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIMEMORYREPORTER
@@ -150,7 +154,8 @@
   void Init();
   // The following methods run on the graph thread (or possibly the main thread if
   // mLifecycleState > LIFECYCLE_RUNNING)
-  void AssertOnGraphThreadOrNotRunning() {
+  void AssertOnGraphThreadOrNotRunning() const
+  {
     // either we're on the right thread (and calling CurrentDriver() is safe),
     // or we're going to assert anyways, so don't cross-check CurrentDriver
 #ifdef DEBUG
@@ -173,20 +178,23 @@
   bool OneIteration(GraphTime aFrom, GraphTime aTo,
                     GraphTime aStateFrom, GraphTime aStateEnd);
 
-  bool Running() {
+  bool Running() const
+  {
     mMonitor.AssertCurrentThreadOwns();
     return mLifecycleState == LIFECYCLE_RUNNING;
   }
 
   // Get the message queue, from the current GraphDriver thread.
-  nsTArray<MessageBlock>& MessageQueue() {
+  nsTArray<MessageBlock>& MessageQueue()
+  {
     mMonitor.AssertCurrentThreadOwns();
     return mFrontMessageQueue;
   }
 
   /* This is the end of the current iteration, that is, the current time of the
    * graph. */
-  GraphTime IterationEnd();
+  GraphTime IterationEnd() const;
+
   /**
    * Ensure there is an event posted to the main thread to run RunInStableState.
    * mMonitor must be held.
@@ -221,7 +229,8 @@
    */
   void UpdateGraph(GraphTime aEndBlockingDecisions);
 
-  void SwapMessageQueues() {
+  void SwapMessageQueues()
+  {
     mMonitor.AssertCurrentThreadOwns();
     mFrontMessageQueue.SwapElements(mBackMessageQueue);
   }
@@ -304,6 +313,7 @@
    * for all streams.
    */
   void RecomputeBlocking(GraphTime aEndBlockingDecisions);
+
   // The following methods are used to help RecomputeBlocking.
   /**
    * If aStream isn't already in aStreams, add it and recursively call
@@ -362,9 +372,11 @@
    * when we don't know whether it's blocked or not, we assume it's not blocked.
    */
   StreamTime GraphTimeToStreamTimeOptimistic(MediaStream* aStream, GraphTime aTime);
-  enum {
+  enum
+  {
     INCLUDE_TRAILING_BLOCKED_INTERVAL = 0x01
   };
+
   /**
    * Given a stream time aTime, convert it to a graph time taking into
    * account the time during which aStream is scheduled to be blocked.
@@ -411,7 +423,7 @@
   /**
    * Returns true when there are no active streams.
    */
-  bool IsEmpty()
+  bool IsEmpty() const
   {
     return mStreams.IsEmpty() && mSuspendedStreams.IsEmpty() && mPortCount == 0;
   }
@@ -420,7 +432,7 @@
   /**
    * Identify which graph update index we are currently processing.
    */
-  int64_t GetProcessingGraphUpdateIndex() { return mProcessingGraphUpdateIndex; }
+  int64_t GetProcessingGraphUpdateIndex() const { return mProcessingGraphUpdateIndex; }
   /**
    * Add aStream to the graph and initializes its graph-specific state.
    */
@@ -443,20 +455,22 @@
   }
 
   // Always stereo for now.
-  uint32_t AudioChannelCount() { return 2; }
+  uint32_t AudioChannelCount() const { return 2; }
 
-  double MediaTimeToSeconds(GraphTime aTime)
+  double MediaTimeToSeconds(GraphTime aTime) const
   {
     NS_ASSERTION(0 <= aTime && aTime <= STREAM_TIME_MAX, "Bad time");
     return static_cast<double>(aTime)/GraphRate();
   }
-  GraphTime SecondsToMediaTime(double aS)
+
+  GraphTime SecondsToMediaTime(double aS) const
   {
     NS_ASSERTION(0 <= aS && aS <= TRACK_TICKS_MAX/TRACK_RATE_MAX,
                  "Bad seconds");
     return GraphRate() * aS;
   }
-  GraphTime MillisecondsToMediaTime(int32_t aMS)
+
+  GraphTime MillisecondsToMediaTime(int32_t aMS) const
   {
     return RateConvertTicksRoundDown(GraphRate(), 1000, aMS);
   }
@@ -471,7 +485,8 @@
   /**
    * Not safe to call off the MediaStreamGraph thread unless monitor is held!
    */
-  GraphDriver* CurrentDriver() {
+  GraphDriver* CurrentDriver() const
+  {
     AssertOnGraphThreadOrNotRunning();
     return mDriver;
   }
@@ -489,16 +504,19 @@
    * We can also switch from Revive() (on MainThread), in which case the
    * monitor is held
    */
-  void SetCurrentDriver(GraphDriver* aDriver) {
+  void SetCurrentDriver(GraphDriver* aDriver)
+  {
     AssertOnGraphThreadOrNotRunning();
     mDriver = aDriver;
   }
 
-  Monitor& GetMonitor() {
+  Monitor& GetMonitor()
+  {
     return mMonitor;
   }
 
-  void EnsureNextIteration() {
+  void EnsureNextIteration()
+  {
     mNeedAnotherIteration = true; // atomic
     if (mGraphDriverAsleep) { // atomic
       MonitorAutoLock mon(mMonitor);
@@ -506,7 +524,8 @@
     }
   }
 
-  void EnsureNextIterationLocked() {
+  void EnsureNextIterationLocked()
+  {
     mNeedAnotherIteration = true; // atomic
     if (mGraphDriverAsleep) { // atomic
       CurrentDriver()->WakeUp(); // Might not be the same driver; might have woken already
@@ -592,7 +611,8 @@
   nsTArray<MessageBlock> mBackMessageQueue;
 
   /* True if there will messages to process if we swap the message queues. */
-  bool MessagesQueued() {
+  bool MessagesQueued() const
+  {
     mMonitor.AssertCurrentThreadOwns();
     return !mBackMessageQueue.IsEmpty();
   }
@@ -619,7 +639,8 @@
    * This should be kept in sync with the LifecycleState_str array in
    * MediaStreamGraph.cpp
    */
-  enum LifecycleState {
+  enum LifecycleState
+  {
     // The graph thread hasn't started yet.
     LIFECYCLE_THREAD_NOT_STARTED,
     // RunThread() is running normally.
@@ -712,6 +733,10 @@
 private:
   virtual ~MediaStreamGraphImpl();
 
+  void StreamNotifyOutput(MediaStream* aStream);
+
+  void StreamReadyToFinish(MediaStream* aStream);
+
   MOZ_DEFINE_MALLOC_SIZE_OF(MallocSizeOf)
 
   /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaTaskQueue.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaTaskQueue.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaTaskQueue.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaTaskQueue.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -45,7 +45,7 @@
 {
   nsCOMPtr<nsIRunnable> r = aRunnable;
   AbstractThread* currentThread;
-  if (aReason != TailDispatch && (currentThread = GetCurrent()) && currentThread->RequiresTailDispatch()) {
+  if (aReason != TailDispatch && (currentThread = GetCurrent()) && RequiresTailDispatch(currentThread)) {
     currentThread->TailDispatcher().AddTask(this, r.forget(), aFailureHandling);
     return NS_OK;
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaTimer.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaTimer.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/MediaTimer.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/MediaTimer.h	2015-05-25 20:43:40.000000000 +0000
@@ -23,7 +23,7 @@
 
 #define TIMER_LOG(x, ...) \
   MOZ_ASSERT(gMediaTimerLog); \
-  PR_LOG(gMediaTimerLog, PR_LOG_DEBUG, ("[MediaTimer=%p relative_t=%lld]" x, this, \
+  MOZ_LOG(gMediaTimerLog, PR_LOG_DEBUG, ("[MediaTimer=%p relative_t=%lld]" x, this, \
                                         RelativeMicroseconds(TimeStamp::Now()), ##__VA_ARGS__))
 
 // This promise type is only exclusive because so far there isn't a reason for
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/media/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/moz.build	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/moz.build	2015-05-25 20:43:42.000000000 +0000
@@ -27,6 +27,7 @@
     'imagecapture',
     'mediasource',
     'ogg',
+    'platforms',
     'systemservices',
     'webaudio',
     'webrtc',
@@ -108,6 +109,7 @@
     'AudioStream.h',
     'BufferMediaResource.h',
     'CubebUtils.h',
+    'DecodedStream.h',
     'DecoderTraits.h',
     'DOMMediaStream.h',
     'EncodedBufferCache.h',
@@ -122,6 +124,7 @@
     'MediaDecoderOwner.h',
     'MediaDecoderReader.h',
     'MediaDecoderStateMachine.h',
+    'MediaFormatReader.h',
     'MediaInfo.h',
     'MediaMetadataManager.h',
     'MediaPromise.h',
@@ -175,6 +178,7 @@
     'AudioStreamTrack.h',
     'AudioTrack.h',
     'AudioTrackList.h',
+    'CanvasCaptureMediaStream.h',
     'GetUserMediaRequest.h',
     'MediaDeviceInfo.h',
     'MediaDevices.h',
@@ -202,7 +206,9 @@
     'AudioStreamTrack.cpp',
     'AudioTrack.cpp',
     'AudioTrackList.cpp',
+    'CanvasCaptureMediaStream.cpp',
     'CubebUtils.cpp',
+    'DecodedStream.cpp',
     'DOMMediaStream.cpp',
     'EncodedBufferCache.cpp',
     'FileBlockCache.cpp',
@@ -216,6 +222,7 @@
     'MediaDecoderStateMachine.cpp',
     'MediaDeviceInfo.cpp',
     'MediaDevices.cpp',
+    'MediaFormatReader.cpp',
     'MediaManager.cpp',
     'MediaRecorder.cpp',
     'MediaResource.cpp',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/ogg/OggCodecState.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/ogg/OggCodecState.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/ogg/OggCodecState.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/ogg/OggCodecState.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -32,12 +32,8 @@
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* gMediaDecoderLog;
-#define LOG(type, msg) PR_LOG(gMediaDecoderLog, type, msg)
-#else
-#define LOG(type, msg)
-#endif
+#define LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 
 /** Decoder base class for Ogg-encapsulated streams. */
 OggCodecState*
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/ogg/OggReader.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/ogg/OggReader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/ogg/OggReader.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/ogg/OggReader.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -17,7 +17,6 @@
 extern "C" {
 #include "opus/opus_multistream.h"
 }
-#include "mozilla/dom/TimeRanges.h"
 #include "mozilla/TimeStamp.h"
 #include "VorbisUtils.h"
 #include "MediaMetadataManager.h"
@@ -37,18 +36,13 @@
 // Un-comment to enable logging of seek bisections.
 //#define SEEK_LOGGING
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* gMediaDecoderLog;
-#define LOG(type, msg) PR_LOG(gMediaDecoderLog, type, msg)
+#define LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 #ifdef SEEK_LOGGING
-#define SEEK_LOG(type, msg) PR_LOG(gMediaDecoderLog, type, msg)
+#define SEEK_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 #else
 #define SEEK_LOG(type, msg)
 #endif
-#else
-#define LOG(type, msg)
-#define SEEK_LOG(type, msg)
-#endif
 
 // The number of microseconds of "fuzz" we use in a bisection search over
 // HTTP. When we're seeking with fuzz, we'll stop the search if a bisection
@@ -1858,29 +1852,31 @@
   return NS_OK;
 }
 
-nsresult OggReader::GetBuffered(dom::TimeRanges* aBuffered)
+media::TimeIntervals OggReader::GetBuffered()
 {
   MOZ_ASSERT(mStartTime != -1, "Need to finish metadata decode first");
   {
     mozilla::ReentrantMonitorAutoEnter mon(mMonitor);
-    if (mIsChained)
-      return NS_ERROR_FAILURE;
+    if (mIsChained) {
+      return media::TimeIntervals::Invalid();
+    }
   }
 #ifdef OGG_ESTIMATE_BUFFERED
-  return MediaDecoderReader::GetBuffered(aBuffered);
+  return MediaDecoderReader::GetBuffered();
 #else
+  media::TimeIntervals buffered;
   // HasAudio and HasVideo are not used here as they take a lock and cause
   // a deadlock. Accessing mInfo doesn't require a lock - it doesn't change
   // after metadata is read.
   if (!mInfo.HasValidMedia()) {
     // No need to search through the file if there are no audio or video tracks
-    return NS_OK;
+    return buffered;
   }
 
   AutoPinned<MediaResource> resource(mDecoder->GetResource());
   nsTArray<MediaByteRange> ranges;
   nsresult res = resource->GetCachedRanges(ranges);
-  NS_ENSURE_SUCCESS(res, res);
+  NS_ENSURE_SUCCESS(res, media::TimeIntervals::Invalid());
 
   // Traverse across the buffered byte ranges, determining the time ranges
   // they contain. MediaResource::GetNextCachedData(offset) returns -1 when
@@ -1914,7 +1910,7 @@
                                     &page,
                                     discard);
       if (res == PAGE_SYNC_ERROR) {
-        return NS_ERROR_FAILURE;
+        return media::TimeIntervals::Invalid();
       } else if (res == PAGE_SYNC_END_OF_RANGE) {
         // Hit the end of range without reading a page, give up trying to
         // find a start time for this buffered range, skip onto the next one.
@@ -1954,7 +1950,7 @@
         // prevents us searching through the rest of the media when we
         // may not be able to extract timestamps from it.
         SetChained(true);
-        return NS_OK;
+        return buffered;
       }
     }
 
@@ -1962,14 +1958,15 @@
       // We were able to find a start time for that range, see if we can
       // find an end time.
       int64_t endTime = RangeEndTime(startOffset, endOffset, true);
-      if (endTime != -1) {
-        aBuffered->Add((startTime - mStartTime) / static_cast<double>(USECS_PER_S),
-                       (endTime - mStartTime) / static_cast<double>(USECS_PER_S));
+      if (endTime > startTime) {
+        buffered += media::TimeInterval(
+           media::TimeUnit::FromMicroseconds(startTime - mStartTime),
+           media::TimeUnit::FromMicroseconds(endTime - mStartTime));
       }
     }
   }
 
-  return NS_OK;
+  return buffered;
 #endif
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/ogg/OggReader.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/ogg/OggReader.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/ogg/OggReader.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/ogg/OggReader.h	2015-05-25 20:43:42.000000000 +0000
@@ -19,12 +19,6 @@
 #include "mozilla/Monitor.h"
 
 namespace mozilla {
-namespace dom {
-class TimeRanges;
-}
-}
-
-namespace mozilla {
 
 // Thread safe container to store the codec information and the serial for each
 // streams.
@@ -77,7 +71,7 @@
                                 MetadataTags** aTags) override;
   virtual nsRefPtr<SeekPromise>
   Seek(int64_t aTime, int64_t aEndTime) override;
-  virtual nsresult GetBuffered(dom::TimeRanges* aBuffered) override;
+  virtual media::TimeIntervals GetBuffered() override;
 
   virtual bool IsMediaSeekable() override;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/ogg/OpusParser.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/ogg/OpusParser.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/ogg/OpusParser.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/ogg/OpusParser.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -24,12 +24,8 @@
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* gMediaDecoderLog;
-#define OPUS_LOG(type, msg) PR_LOG(gMediaDecoderLog, type, msg)
-#else
-#define OPUS_LOG(type, msg)
-#endif
+#define OPUS_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 
 OpusParser::OpusParser():
   mRate(0),
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/AudioOffloadPlayerBase.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/AudioOffloadPlayerBase.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/AudioOffloadPlayerBase.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/AudioOffloadPlayerBase.h	2015-05-25 20:43:42.000000000 +0000
@@ -54,7 +54,7 @@
 
   virtual void SetVolume(double aVolume) {}
 
-  virtual double GetMediaTimeSecs() { return 0; }
+  virtual int64_t GetMediaTimeUs() { return 0; }
 
   // To update progress bar when the element is visible
   virtual void SetElementVisibility(bool aIsVisible) {}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/AudioOffloadPlayer.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/AudioOffloadPlayer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/AudioOffloadPlayer.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/AudioOffloadPlayer.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -42,13 +42,9 @@
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
 PRLogModuleInfo* gAudioOffloadPlayerLog;
 #define AUDIO_OFFLOAD_LOG(type, msg) \
-  PR_LOG(gAudioOffloadPlayerLog, type, msg)
-#else
-#define AUDIO_OFFLOAD_LOG(type, msg)
-#endif
+  MOZ_LOG(gAudioOffloadPlayerLog, type, msg)
 
 // maximum time in paused state when offloading audio decompression.
 // When elapsed, the GonkAudioSink is destroyed to allow the audio DSP to power down.
@@ -67,11 +63,9 @@
 {
   MOZ_ASSERT(NS_IsMainThread());
 
-#ifdef PR_LOGGING
   if (!gAudioOffloadPlayerLog) {
     gAudioOffloadPlayerLog = PR_NewLogModule("AudioOffloadPlayer");
   }
-#endif
 
   CHECK(aObserver);
 #if ANDROID_VERSION >= 21
@@ -391,13 +385,6 @@
   return OK;
 }
 
-double AudioOffloadPlayer::GetMediaTimeSecs()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  return (static_cast<double>(GetMediaTimeUs()) /
-      static_cast<double>(USECS_PER_S));
-}
-
 int64_t AudioOffloadPlayer::GetMediaTimeUs()
 {
   android::Mutex::Autolock autoLock(mLock);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/AudioOffloadPlayer.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/AudioOffloadPlayer.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/AudioOffloadPlayer.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/AudioOffloadPlayer.h	2015-05-25 20:43:42.000000000 +0000
@@ -88,7 +88,7 @@
 
   virtual void SetVolume(double aVolume) override;
 
-  virtual double GetMediaTimeSecs() override;
+  virtual int64_t GetMediaTimeUs() override;
 
   // To update progress bar when the element is visible
   virtual void SetElementVisibility(bool aIsVisible) override;;
@@ -192,8 +192,6 @@
   // Used only from main thread so no lock is needed.
   nsRefPtr<mozilla::dom::WakeLock> mWakeLock;
 
-  int64_t GetMediaTimeUs();
-
   // Provide the playback position in microseconds from total number of
   // frames played by audio track
   int64_t GetOutputPlayPositionUs_l() const;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/AudioOutput.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/AudioOutput.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/AudioOutput.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/AudioOutput.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -20,15 +20,13 @@
 #include <stagefright/foundation/ADebug.h>
 #include "AudioOutput.h"
 
+#include "mozilla/Logging.h"
+
 namespace mozilla {
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* gAudioOffloadPlayerLog;
 #define AUDIO_OFFLOAD_LOG(type, msg) \
-  PR_LOG(gAudioOffloadPlayerLog, type, msg)
-#else
-#define AUDIO_OFFLOAD_LOG(type, msg)
-#endif
+  MOZ_LOG(gAudioOffloadPlayerLog, type, msg)
 
 using namespace android;
 
@@ -39,11 +37,9 @@
   mUid(aUid),
   mSessionId(aSessionId)
 {
-#ifdef PR_LOGGING
   if (!gAudioOffloadPlayerLog) {
     gAudioOffloadPlayerLog = PR_NewLogModule("AudioOffloadPlayer");
   }
-#endif
 }
 
 AudioOutput::~AudioOutput()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/I420ColorConverterHelper.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/I420ColorConverterHelper.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/I420ColorConverterHelper.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/I420ColorConverterHelper.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -8,14 +8,10 @@
 
 #include <dlfcn.h>
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
-#ifdef PR_LOGGING
 PRLogModuleInfo *gI420ColorConverterHelperLog;
-#define LOG(msg...) PR_LOG(gI420ColorConverterHelperLog, PR_LOG_WARNING, (msg))
-#else
-#define LOG(x...)
-#endif
+#define LOG(msg...) MOZ_LOG(gI420ColorConverterHelperLog, PR_LOG_WARNING, (msg))
 
 namespace android {
 
@@ -23,11 +19,9 @@
   : mHandle(nullptr)
   , mConverter({nullptr, nullptr, nullptr, nullptr, nullptr})
 {
-#ifdef PR_LOGGING
   if (!gI420ColorConverterHelperLog) {
     gI420ColorConverterHelperLog = PR_NewLogModule("I420ColorConverterHelper");
   }
-#endif
 }
 
 I420ColorConverterHelper::~I420ColorConverterHelper()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/MediaCodecReader.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/MediaCodecReader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/MediaCodecReader.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/MediaCodecReader.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -334,7 +334,7 @@
     RefPtr<nsIRunnable> task =
       NS_NewRunnableMethod(this,
                            &MediaCodecReader::DecodeAudioDataTask);
-    mAudioTrack.mTaskQueue->Dispatch(task);
+    mAudioTrack.mTaskQueue->Dispatch(task.forget());
   }
 }
 
@@ -346,7 +346,7 @@
       NS_NewRunnableMethodWithArg<int64_t>(this,
                                            &MediaCodecReader::DecodeVideoFrameTask,
                                            aTimeThreshold);
-    mVideoTrack.mTaskQueue->Dispatch(task);
+    mVideoTrack.mTaskQueue->Dispatch(task.forget());
   }
 }
 
@@ -426,8 +426,11 @@
     }
   }
 
-  if (bufferInfo.mBuffer != nullptr && bufferInfo.mSize > 0 &&
-      bufferInfo.mBuffer->data() != nullptr) {
+  if ((bufferInfo.mFlags & MediaCodec::BUFFER_FLAG_EOS) ||
+      (status == ERROR_END_OF_STREAM)) {
+    AudioQueue().Finish();
+  } else if (bufferInfo.mBuffer != nullptr && bufferInfo.mSize > 0 &&
+             bufferInfo.mBuffer->data() != nullptr) {
     // This is the approximate byte position in the stream.
     int64_t pos = mDecoder->GetResource()->Tell();
 
@@ -445,13 +448,7 @@
         bufferInfo.mSize,
         mInfo.mAudio.mChannels));
   }
-
-  if ((bufferInfo.mFlags & MediaCodec::BUFFER_FLAG_EOS) ||
-      (status == ERROR_END_OF_STREAM)) {
-    AudioQueue().Finish();
-  }
   mAudioTrack.mCodec->releaseOutputBuffer(bufferInfo.mIndex);
-
 }
 
 void
@@ -790,16 +787,9 @@
       return;
     }
 
-#if MOZ_WIDGET_GONK && ANDROID_VERSION >= 17
-    sp<Fence> fence = aClient->GetReleaseFenceHandle().mFence;
-    if (fence.get() && fence->isValid()) {
-      mPendingReleaseItems.AppendElement(ReleaseItem(index, fence));
-    } else {
-      mPendingReleaseItems.AppendElement(ReleaseItem(index, nullptr));
-    }
-#else
-    mPendingReleaseItems.AppendElement(ReleaseItem(index));
-#endif
+    FenceHandle handle = aClient->GetAndResetReleaseFenceHandle();
+    mPendingReleaseItems.AppendElement(ReleaseItem(index, handle));
+
     mTextureClientIndexes.Remove(aClient);
   }
 
@@ -807,7 +797,7 @@
     RefPtr<nsIRunnable> task =
       NS_NewRunnableMethod(this,
                            &MediaCodecReader::WaitFenceAndReleaseOutputBuffer);
-    mVideoTrack.mReleaseBufferTaskQueue->Dispatch(task);
+    mVideoTrack.mReleaseBufferTaskQueue->Dispatch(task.forget());
   }
 }
 
@@ -822,13 +812,13 @@
   }
 
   for (size_t i = 0; i < releasingItems.Length(); i++) {
+    if (releasingItems[i].mReleaseFence.IsValid()) {
 #if MOZ_WIDGET_GONK && ANDROID_VERSION >= 17
-    sp<Fence> fence;
-    fence = releasingItems[i].mReleaseFence;
-    if (fence.get() && fence->isValid()) {
+      nsRefPtr<FenceHandle::FdObj> fdObj = releasingItems[i].mReleaseFence.GetAndResetFdObj();
+      sp<Fence> fence = new Fence(fdObj->GetAndResetFd());
       fence->waitForever("MediaCodecReader");
-    }
 #endif
+    }
     if (mVideoTrack.mCodec != nullptr) {
       mVideoTrack.mCodec->releaseOutputBuffer(releasingItems[i].mReleaseIndex);
     }
@@ -918,6 +908,13 @@
     }
   }
 
+  if ((bufferInfo.mFlags & MediaCodec::BUFFER_FLAG_EOS) ||
+      (status == ERROR_END_OF_STREAM)) {
+    VideoQueue().Finish();
+    mVideoTrack.mCodec->releaseOutputBuffer(bufferInfo.mIndex);
+    return;
+  }
+
   nsRefPtr<VideoData> v;
   RefPtr<TextureClient> textureClient;
   sp<GraphicBuffer> graphicBuffer;
@@ -1014,11 +1011,6 @@
     }
   }
 
-  if ((bufferInfo.mFlags & MediaCodec::BUFFER_FLAG_EOS) ||
-      (status == ERROR_END_OF_STREAM)) {
-    VideoQueue().Finish();
-  }
-
   if (v != nullptr && textureClient != nullptr && graphicBuffer != nullptr) {
     MutexAutoLock al(mTextureClientIndexesLock);
     mTextureClientIndexes.Put(textureClient.get(), bufferInfo.mIndex);
@@ -1939,7 +1931,7 @@
   if (mVideoTrack.mTaskQueue) {
     RefPtr<nsIRunnable> task =
       NS_NewRunnableMethod(this, &MediaCodecReader::ReleaseCriticalResources);
-    mVideoTrack.mTaskQueue->Dispatch(task);
+    mVideoTrack.mTaskQueue->Dispatch(task.forget());
   }
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/MediaCodecReader.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/MediaCodecReader.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/MediaCodecReader.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/MediaCodecReader.h	2015-05-25 20:43:42.000000000 +0000
@@ -439,25 +439,17 @@
   int64_t mNextParserPosition;
   int64_t mParsedDataLength;
   nsAutoPtr<MP3FrameParser> mMP3FrameParser;
-#if MOZ_WIDGET_GONK && ANDROID_VERSION >= 17
   // mReleaseIndex corresponding to a graphic buffer, and the mReleaseFence is
   // the graohic buffer's fence. We must wait for the fence signaled by
   // compositor, otherwise we will see the flicker because the HW decoder and
   // compositor use the buffer concurrently.
   struct ReleaseItem {
-    ReleaseItem(size_t aIndex, const android::sp<android::Fence>& aFence)
+    ReleaseItem(size_t aIndex, const FenceHandle& aFence)
     : mReleaseIndex(aIndex)
     , mReleaseFence(aFence) {}
     size_t mReleaseIndex;
-    android::sp<android::Fence> mReleaseFence;
+    FenceHandle mReleaseFence;
   };
-#else
-  struct ReleaseItem {
-    ReleaseItem(size_t aIndex)
-    : mReleaseIndex(aIndex) {}
-    size_t mReleaseIndex;
-  };
-#endif
   nsTArray<ReleaseItem> mPendingReleaseItems;
 };
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/MediaOmxCommonDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/MediaOmxCommonDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/MediaOmxCommonDecoder.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/MediaOmxCommonDecoder.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -20,12 +20,8 @@
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* gMediaDecoderLog;
-#define DECODER_LOG(type, msg) PR_LOG(gMediaDecoderLog, type, msg)
-#else
-#define DECODER_LOG(type, msg)
-#endif
+#define DECODER_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 
 MediaOmxCommonDecoder::MediaOmxCommonDecoder()
   : MediaDecoder()
@@ -33,11 +29,9 @@
   , mCanOffloadAudio(false)
   , mFallbackToStateMachine(false)
 {
-#ifdef PR_LOGGING
   if (!gMediaDecoderLog) {
     gMediaDecoderLog = PR_NewLogModule("MediaDecoder");
   }
-#endif
 }
 
 MediaOmxCommonDecoder::~MediaOmxCommonDecoder() {}
@@ -53,7 +47,7 @@
 MediaOmxCommonDecoder::CheckDecoderCanOffloadAudio()
 {
   return (mCanOffloadAudio && !mFallbackToStateMachine &&
-          !mOutputStreams.Length() && mPlaybackRate == 1.0);
+          !OutputStreams().Length() && mPlaybackRate == 1.0);
 }
 
 void
@@ -125,7 +119,7 @@
       GetStateMachine(),
       &MediaDecoderStateMachine::SetDormant,
       true);
-  GetStateMachine()->TaskQueue()->Dispatch(event);
+  GetStateMachine()->TaskQueue()->Dispatch(event.forget());
 }
 
 void
@@ -154,7 +148,7 @@
       GetStateMachine(),
       &MediaDecoderStateMachine::Seek,
       target);
-  GetStateMachine()->TaskQueue()->Dispatch(event);
+  GetStateMachine()->TaskQueue()->Dispatch(event.forget());
 
   mNextState = mPlayState;
   ChangeState(PLAY_STATE_LOADING);
@@ -164,7 +158,7 @@
       GetStateMachine(),
       &MediaDecoderStateMachine::SetDormant,
       false);
-  GetStateMachine()->TaskQueue()->Dispatch(event);
+  GetStateMachine()->TaskQueue()->Dispatch(event.forget());
   UpdateLogicalPosition();
 }
 
@@ -250,7 +244,7 @@
   }
 
   ReentrantMonitorAutoEnter mon(GetReentrantMonitor());
-  return mAudioOffloadPlayer->GetMediaTimeSecs();
+  return mAudioOffloadPlayer->GetMediaTimeUs();
 }
 
 void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/MediaOmxCommonReader.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/MediaOmxCommonReader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/MediaOmxCommonReader.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/MediaOmxCommonReader.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -22,21 +22,15 @@
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* gMediaDecoderLog;
-#define DECODER_LOG(type, msg) PR_LOG(gMediaDecoderLog, type, msg)
-#else
-#define DECODER_LOG(type, msg)
-#endif
+#define DECODER_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 
 MediaOmxCommonReader::MediaOmxCommonReader(AbstractMediaDecoder *aDecoder)
   : MediaDecoderReader(aDecoder)
 {
-#ifdef PR_LOGGING
   if (!gMediaDecoderLog) {
     gMediaDecoderLog = PR_NewLogModule("MediaDecoder");
   }
-#endif
 
   mAudioChannel = dom::AudioChannelService::GetDefaultAudioChannel();
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/MediaOmxReader.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/MediaOmxReader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/MediaOmxReader.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/MediaOmxReader.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -8,7 +8,6 @@
 
 #include "MediaDecoderStateMachine.h"
 #include "mozilla/TimeStamp.h"
-#include "mozilla/dom/TimeRanges.h"
 #include "MediaResource.h"
 #include "VideoUtils.h"
 #include "MediaOmxDecoder.h"
@@ -28,12 +27,8 @@
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* gMediaDecoderLog;
-#define DECODER_LOG(type, msg) PR_LOG(gMediaDecoderLog, type, msg)
-#else
-#define DECODER_LOG(type, msg)
-#endif
+#define DECODER_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 
 class MediaOmxReader::ProcessCachedDataTask : public Task
 {
@@ -141,11 +136,9 @@
   , mMP3FrameParser(-1)
   , mIsWaitingResources(false)
 {
-#ifdef PR_LOGGING
   if (!gMediaDecoderLog) {
     gMediaDecoderLog = PR_NewLogModule("MediaDecoder");
   }
-#endif
 
   mAudioChannel = dom::AudioChannelService::GetDefaultAudioChannel();
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/OmxDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/OmxDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/OmxDecoder.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/OmxDecoder.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -26,7 +26,7 @@
 #include "mozilla/Monitor.h"
 #include "nsMimeTypes.h"
 #include "MPAPI.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "GonkNativeWindow.h"
 #include "GonkNativeWindowClient.h"
@@ -37,12 +37,8 @@
 #define OD_LOG(...) __android_log_print(ANDROID_LOG_DEBUG, "OmxDecoder", __VA_ARGS__)
 
 #undef LOG
-#ifdef PR_LOGGING
 PRLogModuleInfo *gOmxDecoderLog;
-#define LOG(type, msg...) PR_LOG(gOmxDecoderLog, type, (msg))
-#else
-#define LOG(x...)
-#endif
+#define LOG(type, msg...) MOZ_LOG(gOmxDecoderLog, type, (msg))
 
 using namespace MPAPI;
 using namespace mozilla;
@@ -113,11 +109,9 @@
 }
 
 bool OmxDecoder::Init(sp<MediaExtractor>& extractor) {
-#ifdef PR_LOGGING
   if (!gOmxDecoderLog) {
     gOmxDecoderLog = PR_NewLogModule("OmxDecoder");
   }
-#endif
 
   sp<MetaData> meta = extractor->getMetaData();
 
@@ -361,7 +355,7 @@
         GrallocTextureClientOGL* client = static_cast<GrallocTextureClientOGL*>(*it);
         client->ClearRecycleCallback();
         if (client->GetMediaBuffer()) {
-          mPendingVideoBuffers.push(BufferItem(client->GetMediaBuffer(), client->GetReleaseFenceHandle()));
+          mPendingVideoBuffers.push(BufferItem(client->GetMediaBuffer(), client->GetAndResetReleaseFenceHandle()));
         }
       }
       mPendingRecycleTexutreClients.clear();
@@ -879,12 +873,9 @@
     MediaBuffer *buffer;
     buffer = releasingVideoBuffers[i].mMediaBuffer;
 #if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
-    android::sp<Fence> fence;
-    int fenceFd = -1;
-    fence = releasingVideoBuffers[i].mReleaseFenceHandle.mFence;
-    if (fence.get() && fence->isValid()) {
-      fenceFd = fence->dup();
-    }
+    nsRefPtr<FenceHandle::FdObj> fdObj = releasingVideoBuffers.editItemAt(i).mReleaseFenceHandle.GetAndResetFdObj();
+    int fenceFd = fdObj->GetAndResetFd();
+
     MOZ_ASSERT(buffer->refcount() == 1);
     // This code expect MediaBuffer's ref count is 1.
     // Return gralloc buffer to ANativeWindow
@@ -916,7 +907,7 @@
     mPendingRecycleTexutreClients.erase(aClient);
     GrallocTextureClientOGL* client = static_cast<GrallocTextureClientOGL*>(aClient);
     if (client->GetMediaBuffer()) {
-      mPendingVideoBuffers.push(BufferItem(client->GetMediaBuffer(), client->GetReleaseFenceHandle()));
+      mPendingVideoBuffers.push(BufferItem(client->GetMediaBuffer(), client->GetAndResetReleaseFenceHandle()));
     }
   }
   sp<AMessage> notify =
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/RtspMediaCodecReader.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/RtspMediaCodecReader.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/RtspMediaCodecReader.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/RtspMediaCodecReader.h	2015-05-25 20:43:42.000000000 +0000
@@ -11,10 +11,6 @@
 
 namespace mozilla {
 
-namespace dom {
-  class TimeRanges;
-}
-
 class AbstractMediaDecoder;
 class RtspMediaResource;
 
@@ -48,8 +44,8 @@
   // we returned are not useful for the MediaDecodeStateMachine. Unlike the
   // ChannelMediaResource, it has a "cache" that can store the whole streaming
   // data so the |GetBuffered| function can retrieve useful time ranges.
-  virtual nsresult GetBuffered(dom::TimeRanges* aBuffered) override {
-    return NS_ERROR_NOT_IMPLEMENTED;
+  virtual media::TimeIntervals GetBuffered() override {
+    return media::TimeIntervals::Invalid();
   }
 
   virtual void SetIdle() override;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/RtspOmxReader.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/RtspOmxReader.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/omx/RtspOmxReader.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/omx/RtspOmxReader.h	2015-05-25 20:43:42.000000000 +0000
@@ -60,8 +60,8 @@
   // we returned are not useful for the MediaDecodeStateMachine. Unlike the
   // ChannelMediaResource, it has a "cache" that can store the whole streaming
   // data so the |GetBuffered| function can retrieve useful time ranges.
-  virtual nsresult GetBuffered(mozilla::dom::TimeRanges* aBuffered) final override {
-    return NS_ERROR_NOT_IMPLEMENTED;
+  virtual media::TimeIntervals GetBuffered() final override {
+    return media::TimeIntervals::Invalid();
   }
 
   virtual void SetIdle() override;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/PeerConnection.js firefox-trunk-41.0~a1~hg20150524r245419/dom/media/PeerConnection.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/PeerConnection.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/PeerConnection.js	2015-05-25 20:43:40.000000000 +0000
@@ -695,6 +695,9 @@
         case "pranswer":
           throw new this._win.DOMException("pranswer not yet implemented",
                                            "NotSupportedError");
+        case "rollback":
+          type = Ci.IPeerConnection.kActionRollback;
+          break;
         default:
           throw new this._win.DOMException(
               "Invalid type " + desc.type + " provided to setLocalDescription",
@@ -768,6 +771,9 @@
         case "pranswer":
           throw new this._win.DOMException("pranswer not yet implemented",
                                            "NotSupportedError");
+        case "rollback":
+          type = Ci.IPeerConnection.kActionRollback;
+          break;
         default:
           throw new this._win.DOMException(
               "Invalid type " + desc.type + " provided to setRemoteDescription",
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/BlankDecoderModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/BlankDecoderModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/BlankDecoderModule.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/BlankDecoderModule.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,260 @@
+/* -*- 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 "MediaDecoderReader.h"
+#include "PlatformDecoderModule.h"
+#include "nsRect.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/CheckedInt.h"
+#include "VideoUtils.h"
+#include "ImageContainer.h"
+#include "MediaInfo.h"
+#include "MediaTaskQueue.h"
+
+namespace mozilla {
+
+// Decoder that uses a passed in object's Create function to create blank
+// MediaData objects.
+template<class BlankMediaDataCreator>
+class BlankMediaDataDecoder : public MediaDataDecoder {
+public:
+
+  BlankMediaDataDecoder(BlankMediaDataCreator* aCreator,
+                        FlushableMediaTaskQueue* aTaskQueue,
+                        MediaDataDecoderCallback* aCallback)
+    : mCreator(aCreator)
+    , mTaskQueue(aTaskQueue)
+    , mCallback(aCallback)
+  {
+  }
+
+  virtual nsresult Init() override {
+    return NS_OK;
+  }
+
+  virtual nsresult Shutdown() override {
+    return NS_OK;
+  }
+
+  class OutputEvent : public nsRunnable {
+  public:
+    OutputEvent(MediaRawData* aSample,
+                MediaDataDecoderCallback* aCallback,
+                BlankMediaDataCreator* aCreator)
+      : mSample(aSample)
+      , mCreator(aCreator)
+      , mCallback(aCallback)
+    {
+    }
+    NS_IMETHOD Run() override
+    {
+      nsRefPtr<MediaData> data = mCreator->Create(mSample->mTime,
+                                                  mSample->mDuration,
+                                                  mSample->mOffset);
+      mCallback->Output(data);
+      return NS_OK;
+    }
+  private:
+    nsRefPtr<MediaRawData> mSample;
+    BlankMediaDataCreator* mCreator;
+    MediaDataDecoderCallback* mCallback;
+  };
+
+  virtual nsresult Input(MediaRawData* aSample) override
+  {
+    // The MediaDataDecoder must delete the sample when we're finished
+    // with it, so the OutputEvent stores it in an nsAutoPtr and deletes
+    // it once it's run.
+    RefPtr<nsIRunnable> r(new OutputEvent(aSample, mCallback, mCreator));
+    mTaskQueue->Dispatch(r.forget());
+    return NS_OK;
+  }
+
+  virtual nsresult Flush() override {
+    mTaskQueue->Flush();
+    return NS_OK;
+  }
+
+  virtual nsresult Drain() override {
+    mCallback->DrainComplete();
+    return NS_OK;
+  }
+
+private:
+  nsAutoPtr<BlankMediaDataCreator> mCreator;
+  RefPtr<FlushableMediaTaskQueue> mTaskQueue;
+  MediaDataDecoderCallback* mCallback;
+};
+
+class BlankVideoDataCreator {
+public:
+  BlankVideoDataCreator(uint32_t aFrameWidth,
+                        uint32_t aFrameHeight,
+                        layers::ImageContainer* aImageContainer)
+    : mFrameWidth(aFrameWidth)
+    , mFrameHeight(aFrameHeight)
+    , mImageContainer(aImageContainer)
+  {
+    mInfo.mDisplay = nsIntSize(mFrameWidth, mFrameHeight);
+    mPicture = gfx::IntRect(0, 0, mFrameWidth, mFrameHeight);
+  }
+
+  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,
+    // 2x2 subsampled. Have the data pointers of each frame point to the
+    // first plane, they'll always be zero'd memory anyway.
+    nsAutoArrayPtr<uint8_t> frame(new uint8_t[mFrameWidth * mFrameHeight]);
+    memset(frame, 0, mFrameWidth * mFrameHeight);
+    VideoData::YCbCrBuffer buffer;
+
+    // Y plane.
+    buffer.mPlanes[0].mData = frame;
+    buffer.mPlanes[0].mStride = mFrameWidth;
+    buffer.mPlanes[0].mHeight = mFrameHeight;
+    buffer.mPlanes[0].mWidth = mFrameWidth;
+    buffer.mPlanes[0].mOffset = 0;
+    buffer.mPlanes[0].mSkip = 0;
+
+    // Cb plane.
+    buffer.mPlanes[1].mData = frame;
+    buffer.mPlanes[1].mStride = mFrameWidth / 2;
+    buffer.mPlanes[1].mHeight = mFrameHeight / 2;
+    buffer.mPlanes[1].mWidth = mFrameWidth / 2;
+    buffer.mPlanes[1].mOffset = 0;
+    buffer.mPlanes[1].mSkip = 0;
+
+    // Cr plane.
+    buffer.mPlanes[2].mData = frame;
+    buffer.mPlanes[2].mStride = mFrameWidth / 2;
+    buffer.mPlanes[2].mHeight = mFrameHeight / 2;
+    buffer.mPlanes[2].mWidth = mFrameWidth / 2;
+    buffer.mPlanes[2].mOffset = 0;
+    buffer.mPlanes[2].mSkip = 0;
+
+    return VideoData::Create(mInfo,
+                             mImageContainer,
+                             nullptr,
+                             aOffsetInStream,
+                             aDTS,
+                             aDuration,
+                             buffer,
+                             true,
+                             aDTS,
+                             mPicture);
+  }
+private:
+  VideoInfo mInfo;
+  gfx::IntRect mPicture;
+  uint32_t mFrameWidth;
+  uint32_t mFrameHeight;
+  RefPtr<layers::ImageContainer> mImageContainer;
+};
+
+
+class BlankAudioDataCreator {
+public:
+  BlankAudioDataCreator(uint32_t aChannelCount, uint32_t aSampleRate)
+    : mFrameSum(0), mChannelCount(aChannelCount), mSampleRate(aSampleRate)
+  {
+  }
+
+  MediaData* Create(Microseconds aDTS,
+                    Microseconds aDuration,
+                    int64_t aOffsetInStream)
+  {
+    // Convert duration to frames. We add 1 to duration to account for
+    // rounding errors, so we get a consistent tone.
+    CheckedInt64 frames = UsecsToFrames(aDuration+1, mSampleRate);
+    if (!frames.isValid() ||
+        !mChannelCount ||
+        !mSampleRate ||
+        frames.value() > (UINT32_MAX / mChannelCount)) {
+      return nullptr;
+    }
+    AudioDataValue* samples = new AudioDataValue[frames.value() * mChannelCount];
+    // Fill the sound buffer with an A4 tone.
+    static const float pi = 3.14159265f;
+    static const float noteHz = 440.0f;
+    for (int i = 0; i < frames.value(); i++) {
+      float f = sin(2 * pi * noteHz * mFrameSum / mSampleRate);
+      for (unsigned c = 0; c < mChannelCount; c++) {
+        samples[i * mChannelCount + c] = AudioDataValue(f);
+      }
+      mFrameSum++;
+    }
+    return new AudioData(aOffsetInStream,
+                         aDTS,
+                         aDuration,
+                         uint32_t(frames.value()),
+                         samples,
+                         mChannelCount,
+                         mSampleRate);
+  }
+
+private:
+  int64_t mFrameSum;
+  uint32_t mChannelCount;
+  uint32_t mSampleRate;
+};
+
+class BlankDecoderModule : public PlatformDecoderModule {
+public:
+
+  // Decode thread.
+  virtual already_AddRefed<MediaDataDecoder>
+  CreateVideoDecoder(const VideoInfo& aConfig,
+                     layers::LayersBackend aLayersBackend,
+                     layers::ImageContainer* aImageContainer,
+                     FlushableMediaTaskQueue* aVideoTaskQueue,
+                     MediaDataDecoderCallback* aCallback) override {
+    BlankVideoDataCreator* creator = new BlankVideoDataCreator(
+      aConfig.mDisplay.width, aConfig.mDisplay.height, aImageContainer);
+    nsRefPtr<MediaDataDecoder> decoder =
+      new BlankMediaDataDecoder<BlankVideoDataCreator>(creator,
+                                                       aVideoTaskQueue,
+                                                       aCallback);
+    return decoder.forget();
+  }
+
+  // Decode thread.
+  virtual already_AddRefed<MediaDataDecoder>
+  CreateAudioDecoder(const AudioInfo& aConfig,
+                     FlushableMediaTaskQueue* aAudioTaskQueue,
+                     MediaDataDecoderCallback* aCallback) override {
+    BlankAudioDataCreator* creator = new BlankAudioDataCreator(
+      aConfig.mChannels, aConfig.mRate);
+
+    nsRefPtr<MediaDataDecoder> decoder =
+      new BlankMediaDataDecoder<BlankAudioDataCreator>(creator,
+                                                       aAudioTaskQueue,
+                                                       aCallback);
+    return decoder.forget();
+  }
+
+  virtual bool
+  SupportsMimeType(const nsACString& aMimeType) override
+  {
+    return true;
+  }
+
+  virtual ConversionRequired
+  DecoderNeedsConversion(const TrackInfo& aConfig) const override
+  {
+    return kNeedNone;
+  }
+
+};
+
+already_AddRefed<PlatformDecoderModule> CreateBlankDecoderModule()
+{
+  nsRefPtr<PlatformDecoderModule> pdm = new BlankDecoderModule();
+  return pdm.forget();
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/eme/EMEAudioDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/eme/EMEAudioDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/eme/EMEAudioDecoder.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/eme/EMEAudioDecoder.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,37 @@
+/* -*- 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 "EMEAudioDecoder.h"
+#include "mozilla/CDMProxy.h"
+
+namespace mozilla {
+
+void
+EMEAudioCallbackAdapter::Error(GMPErr aErr)
+{
+  if (aErr == GMPNoKeyErr) {
+    // The GMP failed to decrypt a frame due to not having a key. This can
+    // happen if a key expires or a session is closed during playback.
+    NS_WARNING("GMP failed to decrypt due to lack of key");
+    return;
+  }
+  AudioCallbackAdapter::Error(aErr);
+}
+
+void
+EMEAudioDecoder::InitTags(nsTArray<nsCString>& aTags)
+{
+  GMPAudioDecoder::InitTags(aTags);
+  aTags.AppendElement(NS_ConvertUTF16toUTF8(mProxy->KeySystem()));
+}
+
+nsCString
+EMEAudioDecoder::GetNodeId()
+{
+  return mProxy->GetNodeId();
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/eme/EMEAudioDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/eme/EMEAudioDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/eme/EMEAudioDecoder.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/eme/EMEAudioDecoder.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,44 @@
+/* -*- 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 EMEAudioDecoder_h_
+#define EMEAudioDecoder_h_
+
+#include "GMPAudioDecoder.h"
+#include "PlatformDecoderModule.h"
+
+namespace mozilla {
+
+class EMEAudioCallbackAdapter : public AudioCallbackAdapter {
+public:
+  explicit EMEAudioCallbackAdapter(MediaDataDecoderCallbackProxy* aCallback)
+   : AudioCallbackAdapter(aCallback)
+  {}
+
+  virtual void Error(GMPErr aErr) override;
+};
+
+class EMEAudioDecoder : public GMPAudioDecoder {
+public:
+  EMEAudioDecoder(CDMProxy* aProxy,
+                  const AudioInfo& aConfig,
+                  MediaTaskQueue* aTaskQueue,
+                  MediaDataDecoderCallbackProxy* aCallback)
+   : GMPAudioDecoder(aConfig, aTaskQueue, aCallback, new EMEAudioCallbackAdapter(aCallback))
+   , mProxy(aProxy)
+  {
+  }
+
+private:
+  virtual void InitTags(nsTArray<nsCString>& aTags) override;
+  virtual nsCString GetNodeId() override;
+
+  nsRefPtr<CDMProxy> mProxy;
+};
+
+} // namespace mozilla
+
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/eme/EMEDecoderModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/eme/EMEDecoderModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/eme/EMEDecoderModule.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/eme/EMEDecoderModule.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,289 @@
+/* -*- 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 "EMEDecoderModule.h"
+#include "EMEAudioDecoder.h"
+#include "EMEVideoDecoder.h"
+#include "MediaDataDecoderProxy.h"
+#include "mozIGeckoMediaPluginService.h"
+#include "mozilla/CDMProxy.h"
+#include "mozilla/unused.h"
+#include "nsServiceManagerUtils.h"
+#include "MediaInfo.h"
+
+namespace mozilla {
+
+class EMEDecryptor : public MediaDataDecoder {
+
+public:
+
+  EMEDecryptor(MediaDataDecoder* aDecoder,
+               MediaDataDecoderCallback* aCallback,
+               CDMProxy* aProxy,
+               MediaTaskQueue* aDecodeTaskQueue)
+    : mDecoder(aDecoder)
+    , mCallback(aCallback)
+    , mTaskQueue(aDecodeTaskQueue)
+    , mProxy(aProxy)
+    , mSamplesWaitingForKey(new SamplesWaitingForKey(this, mTaskQueue, mProxy))
+    , mIsShutdown(false)
+  {
+  }
+
+  virtual nsresult Init() override {
+    MOZ_ASSERT(!mIsShutdown);
+    return mDecoder->Init();
+  }
+
+  class DeliverDecrypted : public DecryptionClient {
+  public:
+    explicit DeliverDecrypted(EMEDecryptor* aDecryptor)
+      : mDecryptor(aDecryptor)
+    { }
+    virtual void Decrypted(GMPErr aResult, MediaRawData* aSample) override {
+      mDecryptor->Decrypted(aResult, aSample);
+      mDecryptor = nullptr;
+    }
+  private:
+    nsRefPtr<EMEDecryptor> mDecryptor;
+  };
+
+  virtual nsresult Input(MediaRawData* aSample) override {
+    MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
+    MOZ_ASSERT(!mIsShutdown);
+    if (mSamplesWaitingForKey->WaitIfKeyNotUsable(aSample)) {
+      return NS_OK;
+    }
+
+    nsAutoPtr<MediaRawDataWriter> writer(aSample->CreateWriter());
+    mProxy->GetSessionIdsForKeyId(aSample->mCrypto.mKeyId,
+                                  writer->mCrypto.mSessionIds);
+
+    mProxy->Decrypt(aSample, new DeliverDecrypted(this), mTaskQueue);
+    return NS_OK;
+  }
+
+  void Decrypted(GMPErr aResult, MediaRawData* aSample) {
+    MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
+    if (mIsShutdown) {
+      NS_WARNING("EME decrypted sample arrived after shutdown");
+      return;
+    }
+    if (aResult == GMPNoKeyErr) {
+      // Key became unusable after we sent the sample to CDM to decrypt.
+      // Call Input() again, so that the sample is enqueued for decryption
+      // if the key becomes usable again.
+      Input(aSample);
+    } else if (GMP_FAILED(aResult)) {
+      if (mCallback) {
+        mCallback->Error();
+      }
+      MOZ_ASSERT(!aSample);
+    } else {
+      MOZ_ASSERT(!mIsShutdown);
+      nsresult rv = mDecoder->Input(aSample);
+      unused << NS_WARN_IF(NS_FAILED(rv));
+    }
+  }
+
+  virtual nsresult Flush() override {
+    MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
+    MOZ_ASSERT(!mIsShutdown);
+    nsresult rv = mDecoder->Flush();
+    unused << NS_WARN_IF(NS_FAILED(rv));
+    mSamplesWaitingForKey->Flush();
+    return rv;
+  }
+
+  virtual nsresult Drain() override {
+    MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
+    MOZ_ASSERT(!mIsShutdown);
+    nsresult rv = mDecoder->Drain();
+    unused << NS_WARN_IF(NS_FAILED(rv));
+    return rv;
+  }
+
+  virtual nsresult Shutdown() override {
+    MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
+    MOZ_ASSERT(!mIsShutdown);
+    mIsShutdown = true;
+    nsresult rv = mDecoder->Shutdown();
+    unused << NS_WARN_IF(NS_FAILED(rv));
+    mSamplesWaitingForKey->BreakCycles();
+    mSamplesWaitingForKey = nullptr;
+    mDecoder = nullptr;
+    mProxy = nullptr;
+    mCallback = nullptr;
+    return rv;
+  }
+
+private:
+
+  nsRefPtr<MediaDataDecoder> mDecoder;
+  MediaDataDecoderCallback* mCallback;
+  nsRefPtr<MediaTaskQueue> mTaskQueue;
+  nsRefPtr<CDMProxy> mProxy;
+  nsRefPtr<SamplesWaitingForKey> mSamplesWaitingForKey;
+  bool mIsShutdown;
+};
+
+class EMEMediaDataDecoderProxy : public MediaDataDecoderProxy {
+public:
+  EMEMediaDataDecoderProxy(nsIThread* aProxyThread, MediaDataDecoderCallback* aCallback, CDMProxy* aProxy, FlushableMediaTaskQueue* aTaskQueue)
+   : MediaDataDecoderProxy(aProxyThread, aCallback)
+   , mSamplesWaitingForKey(new SamplesWaitingForKey(this, aTaskQueue, aProxy))
+   , mProxy(aProxy)
+  {
+  }
+
+  virtual nsresult Input(MediaRawData* aSample) override;
+  virtual nsresult Shutdown() override;
+
+private:
+  nsRefPtr<SamplesWaitingForKey> mSamplesWaitingForKey;
+  nsRefPtr<CDMProxy> mProxy;
+};
+
+nsresult
+EMEMediaDataDecoderProxy::Input(MediaRawData* aSample)
+{
+  if (mSamplesWaitingForKey->WaitIfKeyNotUsable(aSample)) {
+    return NS_OK;
+  }
+
+  nsAutoPtr<MediaRawDataWriter> writer(aSample->CreateWriter());
+  mProxy->GetSessionIdsForKeyId(aSample->mCrypto.mKeyId,
+                                writer->mCrypto.mSessionIds);
+
+  return MediaDataDecoderProxy::Input(aSample);
+}
+
+nsresult
+EMEMediaDataDecoderProxy::Shutdown()
+{
+  nsresult rv = MediaDataDecoderProxy::Shutdown();
+
+  mSamplesWaitingForKey->BreakCycles();
+  mSamplesWaitingForKey = nullptr;
+  mProxy = nullptr;
+
+  return rv;
+}
+
+EMEDecoderModule::EMEDecoderModule(CDMProxy* aProxy,
+                                   PlatformDecoderModule* aPDM,
+                                   bool aCDMDecodesAudio,
+                                   bool aCDMDecodesVideo)
+  : mProxy(aProxy)
+  , mPDM(aPDM)
+  , mCDMDecodesAudio(aCDMDecodesAudio)
+  , mCDMDecodesVideo(aCDMDecodesVideo)
+{
+}
+
+EMEDecoderModule::~EMEDecoderModule()
+{
+}
+
+static already_AddRefed<MediaDataDecoderProxy>
+CreateDecoderWrapper(MediaDataDecoderCallback* aCallback, CDMProxy* aProxy, FlushableMediaTaskQueue* aTaskQueue)
+{
+  nsCOMPtr<mozIGeckoMediaPluginService> gmpService = do_GetService("@mozilla.org/gecko-media-plugin-service;1");
+  if (!gmpService) {
+    return nullptr;
+  }
+
+  nsCOMPtr<nsIThread> thread;
+  nsresult rv = gmpService->GetThread(getter_AddRefs(thread));
+  if (NS_FAILED(rv)) {
+    return nullptr;
+  }
+
+  nsRefPtr<MediaDataDecoderProxy> decoder(new EMEMediaDataDecoderProxy(thread, aCallback, aProxy, aTaskQueue));
+  return decoder.forget();
+}
+
+already_AddRefed<MediaDataDecoder>
+EMEDecoderModule::CreateVideoDecoder(const VideoInfo& aConfig,
+                                     layers::LayersBackend aLayersBackend,
+                                     layers::ImageContainer* aImageContainer,
+                                     FlushableMediaTaskQueue* aVideoTaskQueue,
+                                     MediaDataDecoderCallback* aCallback)
+{
+  if (mCDMDecodesVideo && aConfig.mCrypto.mValid) {
+    nsRefPtr<MediaDataDecoderProxy> wrapper = CreateDecoderWrapper(aCallback, mProxy, aVideoTaskQueue);
+    wrapper->SetProxyTarget(new EMEVideoDecoder(mProxy,
+                                                aConfig,
+                                                aLayersBackend,
+                                                aImageContainer,
+                                                aVideoTaskQueue,
+                                                wrapper->Callback()));
+    return wrapper.forget();
+  }
+
+  nsRefPtr<MediaDataDecoder> decoder(
+    mPDM->CreateDecoder(aConfig,
+                        aVideoTaskQueue,
+                        aCallback,
+                        aLayersBackend,
+                        aImageContainer));
+  if (!decoder) {
+    return nullptr;
+  }
+
+  if (!aConfig.mCrypto.mValid) {
+    return decoder.forget();
+  }
+
+  nsRefPtr<MediaDataDecoder> emeDecoder(new EMEDecryptor(decoder,
+                                                         aCallback,
+                                                         mProxy,
+                                                         AbstractThread::GetCurrent()->AsTaskQueue()));
+  return emeDecoder.forget();
+}
+
+already_AddRefed<MediaDataDecoder>
+EMEDecoderModule::CreateAudioDecoder(const AudioInfo& aConfig,
+                                     FlushableMediaTaskQueue* aAudioTaskQueue,
+                                     MediaDataDecoderCallback* aCallback)
+{
+  if (mCDMDecodesAudio && aConfig.mCrypto.mValid) {
+    nsRefPtr<MediaDataDecoderProxy> wrapper = CreateDecoderWrapper(aCallback, mProxy, aAudioTaskQueue);
+    wrapper->SetProxyTarget(new EMEAudioDecoder(mProxy,
+                                                aConfig,
+                                                aAudioTaskQueue,
+                                                wrapper->Callback()));
+    return wrapper.forget();
+  }
+
+  nsRefPtr<MediaDataDecoder> decoder(
+    mPDM->CreateDecoder(aConfig, aAudioTaskQueue, aCallback));
+  if (!decoder) {
+    return nullptr;
+  }
+
+  if (!aConfig.mCrypto.mValid) {
+    return decoder.forget();
+  }
+
+  nsRefPtr<MediaDataDecoder> emeDecoder(new EMEDecryptor(decoder,
+                                                         aCallback,
+                                                         mProxy,
+                                                         AbstractThread::GetCurrent()->AsTaskQueue()));
+  return emeDecoder.forget();
+}
+
+PlatformDecoderModule::ConversionRequired
+EMEDecoderModule::DecoderNeedsConversion(const TrackInfo& aConfig) const
+{
+  if (aConfig.IsVideo()) {
+    return kNeedAVCC;
+  } else {
+    return kNeedNone;
+  }
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/eme/EMEDecoderModule.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/eme/EMEDecoderModule.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/eme/EMEDecoderModule.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/eme/EMEDecoderModule.h	2015-05-25 20:43:42.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/. */
+
+#if !defined(EMEDecoderModule_h_)
+#define EMEDecoderModule_h_
+
+#include "PlatformDecoderModule.h"
+#include "gmp-decryption.h"
+
+namespace mozilla {
+
+class CDMProxy;
+
+class EMEDecoderModule : public PlatformDecoderModule {
+private:
+
+public:
+  EMEDecoderModule(CDMProxy* aProxy,
+                   PlatformDecoderModule* aPDM,
+                   bool aCDMDecodesAudio,
+                   bool aCDMDecodesVideo);
+
+  virtual ~EMEDecoderModule();
+
+  // Decode thread.
+  virtual already_AddRefed<MediaDataDecoder>
+  CreateVideoDecoder(const VideoInfo& aConfig,
+                    layers::LayersBackend aLayersBackend,
+                    layers::ImageContainer* aImageContainer,
+                    FlushableMediaTaskQueue* aVideoTaskQueue,
+                    MediaDataDecoderCallback* aCallback) override;
+
+  // Decode thread.
+  virtual already_AddRefed<MediaDataDecoder>
+  CreateAudioDecoder(const AudioInfo& aConfig,
+                     FlushableMediaTaskQueue* aAudioTaskQueue,
+                     MediaDataDecoderCallback* aCallback) override;
+
+  virtual ConversionRequired
+  DecoderNeedsConversion(const TrackInfo& aConfig) const override;
+
+private:
+  nsRefPtr<CDMProxy> mProxy;
+  // Will be null if CDM has decoding capability.
+  nsRefPtr<PlatformDecoderModule> mPDM;
+  // We run the PDM on its own task queue.
+  nsRefPtr<MediaTaskQueue> mTaskQueue;
+  bool mCDMDecodesAudio;
+  bool mCDMDecodesVideo;
+
+};
+
+} // namespace mozilla
+
+#endif // EMEDecoderModule_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/eme/EMEVideoDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/eme/EMEVideoDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/eme/EMEVideoDecoder.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/eme/EMEVideoDecoder.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,49 @@
+/* -*- 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 "EMEVideoDecoder.h"
+#include "GMPVideoEncodedFrameImpl.h"
+#include "mozilla/CDMProxy.h"
+#include "MediaData.h"
+
+namespace mozilla {
+
+void
+EMEVideoCallbackAdapter::Error(GMPErr aErr)
+{
+  if (aErr == GMPNoKeyErr) {
+    // The GMP failed to decrypt a frame due to not having a key. This can
+    // happen if a key expires or a session is closed during playback.
+    NS_WARNING("GMP failed to decrypt due to lack of key");
+    return;
+  }
+  VideoCallbackAdapter::Error(aErr);
+}
+
+void
+EMEVideoDecoder::InitTags(nsTArray<nsCString>& aTags)
+{
+  GMPVideoDecoder::InitTags(aTags);
+  aTags.AppendElement(NS_ConvertUTF16toUTF8(mProxy->KeySystem()));
+}
+
+nsCString
+EMEVideoDecoder::GetNodeId()
+{
+  return mProxy->GetNodeId();
+}
+
+GMPUniquePtr<GMPVideoEncodedFrame>
+EMEVideoDecoder::CreateFrame(MediaRawData* aSample)
+{
+  GMPUniquePtr<GMPVideoEncodedFrame> frame = GMPVideoDecoder::CreateFrame(aSample);
+  if (frame && aSample->mCrypto.mValid) {
+    static_cast<gmp::GMPVideoEncodedFrameImpl*>(frame.get())->InitCrypto(aSample->mCrypto);
+  }
+  return frame;
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/eme/EMEVideoDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/eme/EMEVideoDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/eme/EMEVideoDecoder.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/eme/EMEVideoDecoder.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,60 @@
+/* -*- 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 EMEVideoDecoder_h_
+#define EMEVideoDecoder_h_
+
+#include "GMPVideoDecoder.h"
+#include "PlatformDecoderModule.h"
+
+namespace mozilla {
+
+class CDMProxy;
+class MediaTaskQueue;
+
+class EMEVideoCallbackAdapter : public VideoCallbackAdapter {
+public:
+  EMEVideoCallbackAdapter(MediaDataDecoderCallbackProxy* aCallback,
+                          VideoInfo aVideoInfo,
+                          layers::ImageContainer* aImageContainer)
+   : VideoCallbackAdapter(aCallback, aVideoInfo, aImageContainer)
+  {}
+
+  virtual void Error(GMPErr aErr) override;
+};
+
+class EMEVideoDecoder : public GMPVideoDecoder {
+public:
+  EMEVideoDecoder(CDMProxy* aProxy,
+                  const VideoInfo& aConfig,
+                  layers::LayersBackend aLayersBackend,
+                  layers::ImageContainer* aImageContainer,
+                  MediaTaskQueue* aTaskQueue,
+                  MediaDataDecoderCallbackProxy* aCallback)
+   : GMPVideoDecoder(aConfig,
+                     aLayersBackend,
+                     aImageContainer,
+                     aTaskQueue,
+                     aCallback,
+                     new EMEVideoCallbackAdapter(aCallback,
+                                                 VideoInfo(aConfig.mDisplay.width,
+                                                           aConfig.mDisplay.height),
+                                                 aImageContainer))
+   , mProxy(aProxy)
+  {
+  }
+
+private:
+  virtual void InitTags(nsTArray<nsCString>& aTags) override;
+  virtual nsCString GetNodeId() override;
+  virtual GMPUniquePtr<GMPVideoEncodedFrame> CreateFrame(MediaRawData* aSample) override;
+
+  nsRefPtr<CDMProxy> mProxy;
+};
+
+}
+
+#endif // EMEVideoDecoder_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/eme/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/eme/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/eme/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/eme/moz.build	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,28 @@
+# -*- 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 += [
+    'EMEAudioDecoder.h',
+    'EMEDecoderModule.h',
+    'EMEVideoDecoder.h',
+    'SamplesWaitingForKey.h',
+]
+
+UNIFIED_SOURCES += [
+    'EMEAudioDecoder.cpp',
+    'EMEDecoderModule.cpp',
+    'EMEVideoDecoder.cpp',
+    'SamplesWaitingForKey.cpp',
+]
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'xul'
+
+FAIL_ON_WARNINGS = True
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    DEFINES['NOMINMAX'] = True
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/eme/SamplesWaitingForKey.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/eme/SamplesWaitingForKey.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/eme/SamplesWaitingForKey.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/eme/SamplesWaitingForKey.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,83 @@
+/* -*- 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 "SamplesWaitingForKey.h"
+#include "mozilla/CDMProxy.h"
+#include "mozilla/CDMCaps.h"
+#include "MediaData.h"
+
+namespace mozilla {
+
+SamplesWaitingForKey::SamplesWaitingForKey(MediaDataDecoder* aDecoder,
+                                           MediaTaskQueue* aTaskQueue,
+                                           CDMProxy* aProxy)
+  : mMutex("SamplesWaitingForKey")
+  , mDecoder(aDecoder)
+  , mTaskQueue(aTaskQueue)
+  , mProxy(aProxy)
+{
+}
+
+SamplesWaitingForKey::~SamplesWaitingForKey()
+{
+}
+
+bool
+SamplesWaitingForKey::WaitIfKeyNotUsable(MediaRawData* aSample)
+{
+  if (!aSample || !aSample->mCrypto.mValid || !mProxy) {
+    return false;
+  }
+  CDMCaps::AutoLock caps(mProxy->Capabilites());
+  const auto& keyid = aSample->mCrypto.mKeyId;
+  if (!caps.IsKeyUsable(keyid)) {
+    {
+      MutexAutoLock lock(mMutex);
+      mSamples.AppendElement(aSample);
+    }
+    caps.NotifyWhenKeyIdUsable(aSample->mCrypto.mKeyId, this);
+    return true;
+  }
+  return false;
+}
+
+void
+SamplesWaitingForKey::NotifyUsable(const CencKeyId& aKeyId)
+{
+  MutexAutoLock lock(mMutex);
+  size_t i = 0;
+  while (i < mSamples.Length()) {
+    if (aKeyId == mSamples[i]->mCrypto.mKeyId) {
+      RefPtr<nsIRunnable> task;
+      task = NS_NewRunnableMethodWithArg<nsRefPtr<MediaRawData>>(mDecoder,
+                                                     &MediaDataDecoder::Input,
+                                                     nsRefPtr<MediaRawData>(mSamples[i]));
+      mSamples.RemoveElementAt(i);
+      mTaskQueue->Dispatch(task.forget());
+    } else {
+      i++;
+    }
+  }
+}
+
+void
+SamplesWaitingForKey::Flush()
+{
+  MutexAutoLock lock(mMutex);
+  mSamples.Clear();
+}
+
+void
+SamplesWaitingForKey::BreakCycles()
+{
+  MutexAutoLock lock(mMutex);
+  mDecoder = nullptr;
+  mTaskQueue = nullptr;
+  mProxy = nullptr;
+  mSamples.Clear();
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/eme/SamplesWaitingForKey.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/eme/SamplesWaitingForKey.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/eme/SamplesWaitingForKey.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/eme/SamplesWaitingForKey.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,55 @@
+/* -*- 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 SamplesWaitingForKey_h_
+#define SamplesWaitingForKey_h_
+
+#include "MediaTaskQueue.h"
+#include "PlatformDecoderModule.h"
+
+namespace mozilla {
+
+typedef nsTArray<uint8_t> CencKeyId;
+
+class CDMProxy;
+
+// Encapsulates the task of waiting for the CDMProxy to have the necessary
+// keys to decypt a given sample.
+class SamplesWaitingForKey {
+public:
+
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(SamplesWaitingForKey)
+
+  explicit SamplesWaitingForKey(MediaDataDecoder* aDecoder,
+                                MediaTaskQueue* aTaskQueue,
+                                CDMProxy* aProxy);
+
+  // Returns true if we need to wait for a key to become usable.
+  // Will callback MediaDataDecoder::Input(aSample) on mDecoder once the
+  // sample is ready to be decrypted. The order of input samples is
+  // preserved.
+  bool WaitIfKeyNotUsable(MediaRawData* aSample);
+
+  void NotifyUsable(const CencKeyId& aKeyId);
+
+  void Flush();
+
+  void BreakCycles();
+
+protected:
+  ~SamplesWaitingForKey();
+
+private:
+  Mutex mMutex;
+  nsRefPtr<MediaDataDecoder> mDecoder;
+  nsRefPtr<MediaTaskQueue> mTaskQueue;
+  nsRefPtr<CDMProxy> mProxy;
+  nsTArray<nsRefPtr<MediaRawData>> mSamples;
+};
+
+} // namespace mozilla
+
+#endif //  SamplesWaitingForKey_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/gmp/GMPAudioDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/gmp/GMPAudioDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/gmp/GMPAudioDecoder.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/gmp/GMPAudioDecoder.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,254 @@
+/* -*- 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 "GMPAudioDecoder.h"
+#include "nsServiceManagerUtils.h"
+#include "MediaInfo.h"
+
+namespace mozilla {
+
+#if defined(DEBUG)
+bool IsOnGMPThread()
+{
+  nsCOMPtr<mozIGeckoMediaPluginService> mps = do_GetService("@mozilla.org/gecko-media-plugin-service;1");
+  MOZ_ASSERT(mps);
+
+  nsCOMPtr<nsIThread> gmpThread;
+  nsresult rv = mps->GetThread(getter_AddRefs(gmpThread));
+  MOZ_ASSERT(NS_SUCCEEDED(rv) && gmpThread);
+  return NS_GetCurrentThread() == gmpThread;
+}
+#endif
+
+void
+AudioCallbackAdapter::Decoded(const nsTArray<int16_t>& aPCM, uint64_t aTimeStamp, uint32_t aChannels, uint32_t aRate)
+{
+  MOZ_ASSERT(IsOnGMPThread());
+
+  if (aRate == 0 || aChannels == 0) {
+    NS_WARNING("Invalid rate or num channels returned on GMP audio samples");
+    mCallback->Error();
+    return;
+  }
+
+  size_t numFrames = aPCM.Length() / aChannels;
+  MOZ_ASSERT((aPCM.Length() % aChannels) == 0);
+  nsAutoArrayPtr<AudioDataValue> audioData(new AudioDataValue[aPCM.Length()]);
+
+  for (size_t i = 0; i < aPCM.Length(); ++i) {
+    audioData[i] = AudioSampleToFloat(aPCM[i]);
+  }
+
+  if (mMustRecaptureAudioPosition) {
+    mAudioFrameSum = 0;
+    auto timestamp = UsecsToFrames(aTimeStamp, aRate);
+    if (!timestamp.isValid()) {
+      NS_WARNING("Invalid timestamp");
+      mCallback->Error();
+      return;
+    }
+    mAudioFrameOffset = timestamp.value();
+    MOZ_ASSERT(mAudioFrameOffset >= 0);
+    mMustRecaptureAudioPosition = false;
+  }
+
+  auto timestamp = FramesToUsecs(mAudioFrameOffset + mAudioFrameSum, aRate);
+  if (!timestamp.isValid()) {
+    NS_WARNING("Invalid timestamp on audio samples");
+    mCallback->Error();
+    return;
+  }
+  mAudioFrameSum += numFrames;
+
+  auto duration = FramesToUsecs(numFrames, aRate);
+  if (!duration.isValid()) {
+    NS_WARNING("Invalid duration on audio samples");
+    mCallback->Error();
+    return;
+  }
+
+  nsRefPtr<AudioData> audio(new AudioData(mLastStreamOffset,
+                                          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);
+}
+
+void
+AudioCallbackAdapter::InputDataExhausted()
+{
+  MOZ_ASSERT(IsOnGMPThread());
+  mCallback->InputExhausted();
+}
+
+void
+AudioCallbackAdapter::DrainComplete()
+{
+  MOZ_ASSERT(IsOnGMPThread());
+  mCallback->DrainComplete();
+}
+
+void
+AudioCallbackAdapter::ResetComplete()
+{
+  MOZ_ASSERT(IsOnGMPThread());
+  mMustRecaptureAudioPosition = true;
+  mCallback->FlushComplete();
+}
+
+void
+AudioCallbackAdapter::Error(GMPErr aErr)
+{
+  MOZ_ASSERT(IsOnGMPThread());
+  mCallback->Error();
+}
+
+void
+AudioCallbackAdapter::Terminated()
+{
+  NS_WARNING("AAC GMP decoder terminated.");
+  mCallback->Error();
+}
+
+void
+GMPAudioDecoder::InitTags(nsTArray<nsCString>& aTags)
+{
+  aTags.AppendElement(NS_LITERAL_CSTRING("aac"));
+}
+
+nsCString
+GMPAudioDecoder::GetNodeId()
+{
+  return NS_LITERAL_CSTRING("");
+}
+
+void
+GMPAudioDecoder::GetGMPAPI(GMPInitDoneRunnable* aInitDone)
+{
+  MOZ_ASSERT(IsOnGMPThread());
+
+  nsTArray<nsCString> tags;
+  InitTags(tags);
+  UniquePtr<GetGMPAudioDecoderCallback> callback(
+    new GMPInitDoneCallback(this, aInitDone));
+  if (NS_FAILED(mMPS->GetGMPAudioDecoder(&tags, GetNodeId(), Move(callback)))) {
+    aInitDone->Dispatch();
+  }
+}
+
+void
+GMPAudioDecoder::GMPInitDone(GMPAudioDecoderProxy* aGMP)
+{
+  MOZ_ASSERT(aGMP);
+  nsTArray<uint8_t> codecSpecific;
+  codecSpecific.AppendElements(mConfig.mCodecSpecificConfig->Elements(),
+                               mConfig.mCodecSpecificConfig->Length());
+
+  nsresult rv = aGMP->InitDecode(kGMPAudioCodecAAC,
+                                 mConfig.mChannels,
+                                 mConfig.mBitDepth,
+                                 mConfig.mRate,
+                                 codecSpecific,
+                                 mAdapter);
+  if (NS_SUCCEEDED(rv)) {
+    mGMP = aGMP;
+  }
+}
+
+nsresult
+GMPAudioDecoder::Init()
+{
+  MOZ_ASSERT(IsOnGMPThread());
+
+  mMPS = do_GetService("@mozilla.org/gecko-media-plugin-service;1");
+  MOZ_ASSERT(mMPS);
+
+  nsCOMPtr<nsIThread> gmpThread = NS_GetCurrentThread();
+
+  nsRefPtr<GMPInitDoneRunnable> initDone(new GMPInitDoneRunnable());
+  gmpThread->Dispatch(
+    NS_NewRunnableMethodWithArg<GMPInitDoneRunnable*>(this,
+                                                      &GMPAudioDecoder::GetGMPAPI,
+                                                      initDone),
+    NS_DISPATCH_NORMAL);
+
+  while (!initDone->IsDone()) {
+    NS_ProcessNextEvent(gmpThread, true);
+  }
+
+  return mGMP ? NS_OK : NS_ERROR_FAILURE;
+}
+
+nsresult
+GMPAudioDecoder::Input(MediaRawData* aSample)
+{
+  MOZ_ASSERT(IsOnGMPThread());
+
+  nsRefPtr<MediaRawData> sample(aSample);
+  if (!mGMP) {
+    mCallback->Error();
+    return NS_ERROR_FAILURE;
+  }
+
+  mAdapter->SetLastStreamOffset(sample->mOffset);
+
+  gmp::GMPAudioSamplesImpl samples(sample, mConfig.mChannels, mConfig.mRate);
+  nsresult rv = mGMP->Decode(samples);
+  if (NS_FAILED(rv)) {
+    mCallback->Error();
+    return rv;
+  }
+
+  return NS_OK;
+}
+
+nsresult
+GMPAudioDecoder::Flush()
+{
+  MOZ_ASSERT(IsOnGMPThread());
+
+  if (!mGMP || NS_FAILED(mGMP->Reset())) {
+    // Abort the flush.
+    mCallback->FlushComplete();
+  }
+
+  return NS_OK;
+}
+
+nsresult
+GMPAudioDecoder::Drain()
+{
+  MOZ_ASSERT(IsOnGMPThread());
+
+  if (!mGMP || NS_FAILED(mGMP->Drain())) {
+    mCallback->DrainComplete();
+  }
+
+  return NS_OK;
+}
+
+nsresult
+GMPAudioDecoder::Shutdown()
+{
+  if (!mGMP) {
+    return NS_ERROR_FAILURE;
+  }
+  mGMP->Close();
+  mGMP = nullptr;
+
+  return NS_OK;
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/gmp/GMPAudioDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/gmp/GMPAudioDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/gmp/GMPAudioDecoder.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/gmp/GMPAudioDecoder.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,149 @@
+/* -*- 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(GMPAudioDecoder_h_)
+#define GMPAudioDecoder_h_
+
+#include "GMPAudioDecoderProxy.h"
+#include "MediaDataDecoderProxy.h"
+#include "PlatformDecoderModule.h"
+#include "mozIGeckoMediaPluginService.h"
+
+namespace mozilla {
+
+class AudioCallbackAdapter : public GMPAudioDecoderCallbackProxy {
+public:
+  explicit AudioCallbackAdapter(MediaDataDecoderCallbackProxy* aCallback)
+   : mCallback(aCallback)
+   , mLastStreamOffset(0)
+   , mAudioFrameSum(0)
+   , mAudioFrameOffset(0)
+   , mMustRecaptureAudioPosition(true)
+  {}
+
+  // GMPAudioDecoderCallbackProxy
+  virtual void Decoded(const nsTArray<int16_t>& aPCM, uint64_t aTimeStamp, uint32_t aChannels, uint32_t aRate) override;
+  virtual void InputDataExhausted() override;
+  virtual void DrainComplete() override;
+  virtual void ResetComplete() override;
+  virtual void Error(GMPErr aErr) override;
+  virtual void Terminated() override;
+
+  void SetLastStreamOffset(int64_t aStreamOffset) {
+    mLastStreamOffset = aStreamOffset;
+  }
+
+private:
+  MediaDataDecoderCallbackProxy* mCallback;
+  int64_t mLastStreamOffset;
+
+  int64_t mAudioFrameSum;
+  int64_t mAudioFrameOffset;
+  bool mMustRecaptureAudioPosition;
+};
+
+class GMPAudioDecoder : public MediaDataDecoder {
+protected:
+  GMPAudioDecoder(const AudioInfo& aConfig,
+                  MediaTaskQueue* aTaskQueue,
+                  MediaDataDecoderCallbackProxy* aCallback,
+                  AudioCallbackAdapter* aAdapter)
+   : mConfig(aConfig)
+   , mCallback(aCallback)
+   , mGMP(nullptr)
+   , mAdapter(aAdapter)
+  {
+  }
+
+public:
+  GMPAudioDecoder(const AudioInfo& aConfig,
+                  MediaTaskQueue* aTaskQueue,
+                  MediaDataDecoderCallbackProxy* aCallback)
+   : mConfig(aConfig)
+   , mCallback(aCallback)
+   , mGMP(nullptr)
+   , mAdapter(new AudioCallbackAdapter(aCallback))
+  {
+  }
+
+  virtual nsresult Init() override;
+  virtual nsresult Input(MediaRawData* aSample) override;
+  virtual nsresult Flush() override;
+  virtual nsresult Drain() override;
+  virtual nsresult Shutdown() override;
+
+protected:
+  virtual void InitTags(nsTArray<nsCString>& aTags);
+  virtual nsCString GetNodeId();
+
+private:
+  class GMPInitDoneRunnable : public nsRunnable
+  {
+  public:
+    GMPInitDoneRunnable()
+      : mInitDone(false),
+        mThread(do_GetCurrentThread())
+    {
+    }
+
+    NS_IMETHOD Run()
+    {
+      mInitDone = true;
+      return NS_OK;
+    }
+
+    void Dispatch()
+    {
+      mThread->Dispatch(this, NS_DISPATCH_NORMAL);
+    }
+
+    bool IsDone()
+    {
+      MOZ_ASSERT(nsCOMPtr<nsIThread>(do_GetCurrentThread()) == mThread);
+      return mInitDone;
+    }
+
+  private:
+    bool mInitDone;
+    nsCOMPtr<nsIThread> mThread;
+  };
+
+  void GetGMPAPI(GMPInitDoneRunnable* aInitDone);
+
+  class GMPInitDoneCallback : public GetGMPAudioDecoderCallback
+  {
+  public:
+    GMPInitDoneCallback(GMPAudioDecoder* aDecoder,
+                        GMPInitDoneRunnable* aGMPInitDone)
+      : mDecoder(aDecoder)
+      , mGMPInitDone(aGMPInitDone)
+    {
+    }
+
+    virtual void Done(GMPAudioDecoderProxy* aGMP)
+    {
+      if (aGMP) {
+        mDecoder->GMPInitDone(aGMP);
+      }
+      mGMPInitDone->Dispatch();
+    }
+
+  private:
+    nsRefPtr<GMPAudioDecoder> mDecoder;
+    nsRefPtr<GMPInitDoneRunnable> mGMPInitDone;
+  };
+  void GMPInitDone(GMPAudioDecoderProxy* aGMP);
+
+  const AudioInfo& mConfig;
+  MediaDataDecoderCallbackProxy* mCallback;
+  nsCOMPtr<mozIGeckoMediaPluginService> mMPS;
+  GMPAudioDecoderProxy* mGMP;
+  nsAutoPtr<AudioCallbackAdapter> mAdapter;
+};
+
+} // namespace mozilla
+
+#endif // GMPAudioDecoder_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,89 @@
+/* -*- 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 "GMPDecoderModule.h"
+#include "GMPAudioDecoder.h"
+#include "GMPVideoDecoder.h"
+#include "MediaDataDecoderProxy.h"
+#include "mozIGeckoMediaPluginService.h"
+#include "nsServiceManagerUtils.h"
+
+namespace mozilla {
+
+GMPDecoderModule::GMPDecoderModule()
+{
+}
+
+GMPDecoderModule::~GMPDecoderModule()
+{
+}
+
+static already_AddRefed<MediaDataDecoderProxy>
+CreateDecoderWrapper(MediaDataDecoderCallback* aCallback)
+{
+  nsCOMPtr<mozIGeckoMediaPluginService> gmpService = do_GetService("@mozilla.org/gecko-media-plugin-service;1");
+  if (!gmpService) {
+    return nullptr;
+  }
+
+  nsCOMPtr<nsIThread> thread;
+  nsresult rv = gmpService->GetThread(getter_AddRefs(thread));
+  if (NS_FAILED(rv)) {
+    return nullptr;
+  }
+
+  nsRefPtr<MediaDataDecoderProxy> decoder(new MediaDataDecoderProxy(thread, aCallback));
+  return decoder.forget();
+}
+
+already_AddRefed<MediaDataDecoder>
+GMPDecoderModule::CreateVideoDecoder(const VideoInfo& aConfig,
+                                     layers::LayersBackend aLayersBackend,
+                                     layers::ImageContainer* aImageContainer,
+                                     FlushableMediaTaskQueue* aVideoTaskQueue,
+                                     MediaDataDecoderCallback* aCallback)
+{
+  if (!aConfig.mMimeType.EqualsLiteral("video/avc")) {
+    return nullptr;
+  }
+
+  nsRefPtr<MediaDataDecoderProxy> wrapper = CreateDecoderWrapper(aCallback);
+  wrapper->SetProxyTarget(new GMPVideoDecoder(aConfig,
+                                              aLayersBackend,
+                                              aImageContainer,
+                                              aVideoTaskQueue,
+                                              wrapper->Callback()));
+  return wrapper.forget();
+}
+
+already_AddRefed<MediaDataDecoder>
+GMPDecoderModule::CreateAudioDecoder(const AudioInfo& aConfig,
+                                     FlushableMediaTaskQueue* aAudioTaskQueue,
+                                     MediaDataDecoderCallback* aCallback)
+{
+  if (!aConfig.mMimeType.EqualsLiteral("audio/mp4a-latm")) {
+    return nullptr;
+  }
+
+  nsRefPtr<MediaDataDecoderProxy> wrapper = CreateDecoderWrapper(aCallback);
+  wrapper->SetProxyTarget(new GMPAudioDecoder(aConfig,
+                                              aAudioTaskQueue,
+                                              wrapper->Callback()));
+  return wrapper.forget();
+}
+
+PlatformDecoderModule::ConversionRequired
+GMPDecoderModule::DecoderNeedsConversion(const TrackInfo& aConfig) const
+{
+  // GMPVideoCodecType::kGMPVideoCodecH264 specifies that encoded frames must be in AVCC format.
+  if (aConfig.IsVideo()) {
+    return kNeedAVCC;
+  } else {
+    return kNeedNone;
+  }
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/gmp/GMPDecoderModule.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/gmp/GMPDecoderModule.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/gmp/GMPDecoderModule.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/gmp/GMPDecoderModule.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,40 @@
+/* -*- 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(GMPDecoderModule_h_)
+#define GMPDecoderModule_h_
+
+#include "PlatformDecoderModule.h"
+
+namespace mozilla {
+
+class GMPDecoderModule : public PlatformDecoderModule {
+public:
+  GMPDecoderModule();
+
+  virtual ~GMPDecoderModule();
+
+  // Decode thread.
+  virtual already_AddRefed<MediaDataDecoder>
+  CreateVideoDecoder(const VideoInfo& aConfig,
+                     layers::LayersBackend aLayersBackend,
+                     layers::ImageContainer* aImageContainer,
+                     FlushableMediaTaskQueue* aVideoTaskQueue,
+                     MediaDataDecoderCallback* aCallback) override;
+
+  // Decode thread.
+  virtual already_AddRefed<MediaDataDecoder>
+  CreateAudioDecoder(const AudioInfo& aConfig,
+                     FlushableMediaTaskQueue* aAudioTaskQueue,
+                     MediaDataDecoderCallback* aCallback) override;
+
+  virtual ConversionRequired
+  DecoderNeedsConversion(const TrackInfo& aConfig) const override;
+};
+
+} // namespace mozilla
+
+#endif // GMPDecoderModule_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,300 @@
+/* -*- 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 "GMPVideoDecoder.h"
+#include "GMPVideoHost.h"
+#include "mozilla/Endian.h"
+#include "prsystem.h"
+#include "MediaData.h"
+
+namespace mozilla {
+
+#if defined(DEBUG)
+extern bool IsOnGMPThread();
+#endif
+
+void
+VideoCallbackAdapter::Decoded(GMPVideoi420Frame* aDecodedFrame)
+{
+  GMPUniquePtr<GMPVideoi420Frame> decodedFrame(aDecodedFrame);
+
+  MOZ_ASSERT(IsOnGMPThread());
+
+  VideoData::YCbCrBuffer b;
+  for (int i = 0; i < kGMPNumOfPlanes; ++i) {
+    b.mPlanes[i].mData = decodedFrame->Buffer(GMPPlaneType(i));
+    b.mPlanes[i].mStride = decodedFrame->Stride(GMPPlaneType(i));
+    if (i == kGMPYPlane) {
+      b.mPlanes[i].mWidth = decodedFrame->Width();
+      b.mPlanes[i].mHeight = decodedFrame->Height();
+    } else {
+      b.mPlanes[i].mWidth = (decodedFrame->Width() + 1) / 2;
+      b.mPlanes[i].mHeight = (decodedFrame->Height() + 1) / 2;
+    }
+    b.mPlanes[i].mOffset = 0;
+    b.mPlanes[i].mSkip = 0;
+  }
+
+  gfx::IntRect pictureRegion(0, 0, decodedFrame->Width(), decodedFrame->Height());
+  nsRefPtr<VideoData> v = VideoData::Create(mVideoInfo,
+                                            mImageContainer,
+                                            mLastStreamOffset,
+                                            decodedFrame->Timestamp(),
+                                            decodedFrame->Duration(),
+                                            b,
+                                            false,
+                                            -1,
+                                            pictureRegion);
+  if (v) {
+    mCallback->Output(v);
+  } else {
+    mCallback->Error();
+  }
+}
+
+void
+VideoCallbackAdapter::ReceivedDecodedReferenceFrame(const uint64_t aPictureId)
+{
+  MOZ_ASSERT(IsOnGMPThread());
+}
+
+void
+VideoCallbackAdapter::ReceivedDecodedFrame(const uint64_t aPictureId)
+{
+  MOZ_ASSERT(IsOnGMPThread());
+}
+
+void
+VideoCallbackAdapter::InputDataExhausted()
+{
+  MOZ_ASSERT(IsOnGMPThread());
+  mCallback->InputExhausted();
+}
+
+void
+VideoCallbackAdapter::DrainComplete()
+{
+  MOZ_ASSERT(IsOnGMPThread());
+  mCallback->DrainComplete();
+}
+
+void
+VideoCallbackAdapter::ResetComplete()
+{
+  MOZ_ASSERT(IsOnGMPThread());
+  mCallback->FlushComplete();
+}
+
+void
+VideoCallbackAdapter::Error(GMPErr aErr)
+{
+  MOZ_ASSERT(IsOnGMPThread());
+  mCallback->Error();
+}
+
+void
+VideoCallbackAdapter::Terminated()
+{
+  // Note that this *may* be called from the proxy thread also.
+  NS_WARNING("H.264 GMP decoder terminated.");
+  mCallback->Error();
+}
+
+void
+GMPVideoDecoder::InitTags(nsTArray<nsCString>& aTags)
+{
+  aTags.AppendElement(NS_LITERAL_CSTRING("h264"));
+}
+
+nsCString
+GMPVideoDecoder::GetNodeId()
+{
+  return NS_LITERAL_CSTRING("");
+}
+
+GMPUniquePtr<GMPVideoEncodedFrame>
+GMPVideoDecoder::CreateFrame(MediaRawData* aSample)
+{
+  GMPVideoFrame* ftmp = nullptr;
+  GMPErr err = mHost->CreateFrame(kGMPEncodedVideoFrame, &ftmp);
+  if (GMP_FAILED(err)) {
+    mCallback->Error();
+    return nullptr;
+  }
+
+  GMPUniquePtr<GMPVideoEncodedFrame> frame(static_cast<GMPVideoEncodedFrame*>(ftmp));
+  err = frame->CreateEmptyFrame(aSample->mSize);
+  if (GMP_FAILED(err)) {
+    mCallback->Error();
+    return nullptr;
+  }
+
+  memcpy(frame->Buffer(), aSample->mData, frame->Size());
+
+  // Convert 4-byte NAL unit lengths to host-endian 4-byte buffer lengths to
+  // suit the GMP API.
+  if (mConvertNALUnitLengths) {
+    const int kNALLengthSize = 4;
+    uint8_t* buf = frame->Buffer();
+    while (buf < frame->Buffer() + frame->Size() - kNALLengthSize) {
+      uint32_t length = BigEndian::readUint32(buf) + kNALLengthSize;
+      *reinterpret_cast<uint32_t *>(buf) = length;
+      buf += length;
+    }
+  }
+
+  frame->SetBufferType(GMP_BufferLength32);
+
+  frame->SetEncodedWidth(mConfig.mDisplay.width);
+  frame->SetEncodedHeight(mConfig.mDisplay.height);
+  frame->SetTimeStamp(aSample->mTime);
+  frame->SetCompleteFrame(true);
+  frame->SetDuration(aSample->mDuration);
+  frame->SetFrameType(aSample->mKeyframe ? kGMPKeyFrame : kGMPDeltaFrame);
+
+  return frame;
+}
+
+void
+GMPVideoDecoder::GetGMPAPI(GMPInitDoneRunnable* aInitDone)
+{
+  MOZ_ASSERT(IsOnGMPThread());
+
+  nsTArray<nsCString> tags;
+  InitTags(tags);
+  UniquePtr<GetGMPVideoDecoderCallback> callback(
+    new GMPInitDoneCallback(this, aInitDone));
+  if (NS_FAILED(mMPS->GetGMPVideoDecoder(&tags, GetNodeId(), Move(callback)))) {
+    aInitDone->Dispatch();
+  }
+}
+
+void
+GMPVideoDecoder::GMPInitDone(GMPVideoDecoderProxy* aGMP, GMPVideoHost* aHost)
+{
+  MOZ_ASSERT(aHost && aGMP);
+
+  GMPVideoCodec codec;
+  memset(&codec, 0, sizeof(codec));
+
+  codec.mGMPApiVersion = kGMPVersion33;
+
+  codec.mCodecType = kGMPVideoCodecH264;
+  codec.mWidth = mConfig.mDisplay.width;
+  codec.mHeight = mConfig.mDisplay.height;
+
+  nsTArray<uint8_t> codecSpecific;
+  codecSpecific.AppendElement(0); // mPacketizationMode.
+  codecSpecific.AppendElements(mConfig.mExtraData->Elements(),
+                               mConfig.mExtraData->Length());
+
+  nsresult rv = aGMP->InitDecode(codec,
+                                 codecSpecific,
+                                 mAdapter,
+                                 PR_GetNumberOfProcessors());
+  if (NS_SUCCEEDED(rv)) {
+    mGMP = aGMP;
+    mHost = aHost;
+
+    // GMP implementations have interpreted the meaning of GMP_BufferLength32
+    // differently.  The OpenH264 GMP expects GMP_BufferLength32 to behave as
+    // specified in the GMP API, where each buffer is prefixed by a 32-bit
+    // host-endian buffer length that includes the size of the buffer length
+    // field.  Other existing GMPs currently expect GMP_BufferLength32 (when
+    // combined with kGMPVideoCodecH264) to mean "like AVCC but restricted to
+    // 4-byte NAL lengths" (i.e. buffer lengths are specified in big-endian
+    // and do not include the length of the buffer length field.
+    mConvertNALUnitLengths = mGMP->GetDisplayName().EqualsLiteral("gmpopenh264");
+  }
+}
+
+nsresult
+GMPVideoDecoder::Init()
+{
+  MOZ_ASSERT(IsOnGMPThread());
+
+  mMPS = do_GetService("@mozilla.org/gecko-media-plugin-service;1");
+  MOZ_ASSERT(mMPS);
+
+  nsCOMPtr<nsIThread> gmpThread = NS_GetCurrentThread();
+
+  nsRefPtr<GMPInitDoneRunnable> initDone(new GMPInitDoneRunnable());
+  gmpThread->Dispatch(
+    NS_NewRunnableMethodWithArg<GMPInitDoneRunnable*>(this,
+                                                      &GMPVideoDecoder::GetGMPAPI,
+                                                      initDone),
+    NS_DISPATCH_NORMAL);
+
+  while (!initDone->IsDone()) {
+    NS_ProcessNextEvent(gmpThread, true);
+  }
+
+  return mGMP ? NS_OK : NS_ERROR_FAILURE;
+}
+
+nsresult
+GMPVideoDecoder::Input(MediaRawData* aSample)
+{
+  MOZ_ASSERT(IsOnGMPThread());
+
+  nsRefPtr<MediaRawData> sample(aSample);
+  if (!mGMP) {
+    mCallback->Error();
+    return NS_ERROR_FAILURE;
+  }
+
+  mAdapter->SetLastStreamOffset(sample->mOffset);
+
+  GMPUniquePtr<GMPVideoEncodedFrame> frame = CreateFrame(sample);
+  nsTArray<uint8_t> info; // No codec specific per-frame info to pass.
+  nsresult rv = mGMP->Decode(Move(frame), false, info, 0);
+  if (NS_FAILED(rv)) {
+    mCallback->Error();
+    return rv;
+  }
+
+  return NS_OK;
+}
+
+nsresult
+GMPVideoDecoder::Flush()
+{
+  MOZ_ASSERT(IsOnGMPThread());
+
+  if (!mGMP || NS_FAILED(mGMP->Reset())) {
+    // Abort the flush.
+    mCallback->FlushComplete();
+  }
+
+  return NS_OK;
+}
+
+nsresult
+GMPVideoDecoder::Drain()
+{
+  MOZ_ASSERT(IsOnGMPThread());
+
+  if (!mGMP || NS_FAILED(mGMP->Drain())) {
+    mCallback->DrainComplete();
+  }
+
+  return NS_OK;
+}
+
+nsresult
+GMPVideoDecoder::Shutdown()
+{
+  // Note that this *may* be called from the proxy thread also.
+  if (!mGMP) {
+    return NS_ERROR_FAILURE;
+  }
+  mGMP->Close();
+  mGMP = nullptr;
+
+  return NS_OK;
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,167 @@
+/* -*- 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(GMPVideoDecoder_h_)
+#define GMPVideoDecoder_h_
+
+#include "GMPVideoDecoderProxy.h"
+#include "ImageContainer.h"
+#include "MediaDataDecoderProxy.h"
+#include "PlatformDecoderModule.h"
+#include "mozIGeckoMediaPluginService.h"
+#include "MediaInfo.h"
+
+namespace mozilla {
+
+class VideoCallbackAdapter : public GMPVideoDecoderCallbackProxy {
+public:
+  VideoCallbackAdapter(MediaDataDecoderCallbackProxy* aCallback,
+                       VideoInfo aVideoInfo,
+                       layers::ImageContainer* aImageContainer)
+   : mCallback(aCallback)
+   , mLastStreamOffset(0)
+   , mVideoInfo(aVideoInfo)
+   , mImageContainer(aImageContainer)
+  {}
+
+  // GMPVideoDecoderCallbackProxy
+  virtual void Decoded(GMPVideoi420Frame* aDecodedFrame) override;
+  virtual void ReceivedDecodedReferenceFrame(const uint64_t aPictureId) override;
+  virtual void ReceivedDecodedFrame(const uint64_t aPictureId) override;
+  virtual void InputDataExhausted() override;
+  virtual void DrainComplete() override;
+  virtual void ResetComplete() override;
+  virtual void Error(GMPErr aErr) override;
+  virtual void Terminated() override;
+
+  void SetLastStreamOffset(int64_t aStreamOffset) {
+    mLastStreamOffset = aStreamOffset;
+  }
+
+private:
+  MediaDataDecoderCallbackProxy* mCallback;
+  int64_t mLastStreamOffset;
+
+  VideoInfo mVideoInfo;
+  nsRefPtr<layers::ImageContainer> mImageContainer;
+};
+
+class GMPVideoDecoder : public MediaDataDecoder {
+protected:
+  GMPVideoDecoder(const VideoInfo& aConfig,
+                  layers::LayersBackend aLayersBackend,
+                  layers::ImageContainer* aImageContainer,
+                  MediaTaskQueue* aTaskQueue,
+                  MediaDataDecoderCallbackProxy* aCallback,
+                  VideoCallbackAdapter* aAdapter)
+   : mConfig(aConfig)
+   , mCallback(aCallback)
+   , mGMP(nullptr)
+   , mHost(nullptr)
+   , mAdapter(aAdapter)
+   , mConvertNALUnitLengths(false)
+  {
+  }
+
+public:
+  GMPVideoDecoder(const VideoInfo& aConfig,
+                  layers::LayersBackend aLayersBackend,
+                  layers::ImageContainer* aImageContainer,
+                  MediaTaskQueue* aTaskQueue,
+                  MediaDataDecoderCallbackProxy* aCallback)
+   : mConfig(aConfig)
+   , mCallback(aCallback)
+   , mGMP(nullptr)
+   , mHost(nullptr)
+   , mAdapter(new VideoCallbackAdapter(aCallback,
+                                       VideoInfo(aConfig.mDisplay.width,
+                                                 aConfig.mDisplay.height),
+                                       aImageContainer))
+   , mConvertNALUnitLengths(false)
+  {
+  }
+
+  virtual nsresult Init() override;
+  virtual nsresult Input(MediaRawData* aSample) override;
+  virtual nsresult Flush() override;
+  virtual nsresult Drain() override;
+  virtual nsresult Shutdown() override;
+
+protected:
+  virtual void InitTags(nsTArray<nsCString>& aTags);
+  virtual nsCString GetNodeId();
+  virtual GMPUniquePtr<GMPVideoEncodedFrame> CreateFrame(MediaRawData* aSample);
+
+private:
+  class GMPInitDoneRunnable : public nsRunnable
+  {
+  public:
+    GMPInitDoneRunnable()
+      : mInitDone(false),
+        mThread(do_GetCurrentThread())
+    {
+    }
+
+    NS_IMETHOD Run()
+    {
+      mInitDone = true;
+      return NS_OK;
+    }
+
+    void Dispatch()
+    {
+      mThread->Dispatch(this, NS_DISPATCH_NORMAL);
+    }
+
+    bool IsDone()
+    {
+      MOZ_ASSERT(nsCOMPtr<nsIThread>(do_GetCurrentThread()) == mThread);
+      return mInitDone;
+    }
+
+  private:
+    bool mInitDone;
+    nsCOMPtr<nsIThread> mThread;
+  };
+
+  void GetGMPAPI(GMPInitDoneRunnable* aInitDone);
+
+  class GMPInitDoneCallback : public GetGMPVideoDecoderCallback
+  {
+  public:
+    GMPInitDoneCallback(GMPVideoDecoder* aDecoder,
+                        GMPInitDoneRunnable* aGMPInitDone)
+      : mDecoder(aDecoder)
+      , mGMPInitDone(aGMPInitDone)
+    {
+    }
+
+    virtual void Done(GMPVideoDecoderProxy* aGMP, GMPVideoHost* aHost)
+    {
+      if (aGMP) {
+        mDecoder->GMPInitDone(aGMP, aHost);
+      }
+      mGMPInitDone->Dispatch();
+    }
+
+  private:
+    nsRefPtr<GMPVideoDecoder> mDecoder;
+    nsRefPtr<GMPInitDoneRunnable> mGMPInitDone;
+  };
+  void GMPInitDone(GMPVideoDecoderProxy* aGMP, GMPVideoHost* aHost);
+
+  const VideoInfo& mConfig;
+  MediaDataDecoderCallbackProxy* mCallback;
+  nsCOMPtr<mozIGeckoMediaPluginService> mMPS;
+  GMPVideoDecoderProxy* mGMP;
+  GMPVideoHost* mHost;
+  nsAutoPtr<VideoCallbackAdapter> mAdapter;
+  bool mConvertNALUnitLengths;
+};
+
+} // namespace mozilla
+
+#endif // GMPVideoDecoder_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/gmp/MediaDataDecoderProxy.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/gmp/MediaDataDecoderProxy.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/gmp/MediaDataDecoderProxy.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/gmp/MediaDataDecoderProxy.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,101 @@
+/* -*- 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 "MediaDataDecoderProxy.h"
+#include "MediaData.h"
+
+namespace mozilla {
+
+void
+MediaDataDecoderCallbackProxy::Error()
+{
+  mProxyCallback->Error();
+}
+
+void
+MediaDataDecoderCallbackProxy::FlushComplete()
+{
+  mProxyDecoder->FlushComplete();
+}
+
+nsresult
+MediaDataDecoderProxy::Init()
+{
+  MOZ_ASSERT(!mIsShutdown);
+  nsRefPtr<InitTask> task(new InitTask(mProxyDecoder));
+  nsresult rv = mProxyThread->Dispatch(task, NS_DISPATCH_SYNC);
+  NS_ENSURE_SUCCESS(rv, rv);
+  NS_ENSURE_SUCCESS(task->Result(), task->Result());
+
+  return NS_OK;
+}
+
+nsresult
+MediaDataDecoderProxy::Input(MediaRawData* aSample)
+{
+  MOZ_ASSERT(!IsOnProxyThread());
+  MOZ_ASSERT(!mIsShutdown);
+
+  nsCOMPtr<nsIRunnable> task(new InputTask(mProxyDecoder, aSample));
+  nsresult rv = mProxyThread->Dispatch(task, NS_DISPATCH_NORMAL);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
+nsresult
+MediaDataDecoderProxy::Flush()
+{
+  MOZ_ASSERT(!IsOnProxyThread());
+  MOZ_ASSERT(!mIsShutdown);
+
+  mFlushComplete.Set(false);
+
+  nsCOMPtr<nsIRunnable> task;
+  task = NS_NewRunnableMethod(mProxyDecoder, &MediaDataDecoder::Flush);
+  nsresult rv = mProxyThread->Dispatch(task, NS_DISPATCH_NORMAL);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  mFlushComplete.WaitUntil(true);
+
+  return NS_OK;
+}
+
+nsresult
+MediaDataDecoderProxy::Drain()
+{
+  MOZ_ASSERT(!IsOnProxyThread());
+  MOZ_ASSERT(!mIsShutdown);
+
+  nsCOMPtr<nsIRunnable> task;
+  task = NS_NewRunnableMethod(mProxyDecoder, &MediaDataDecoder::Drain);
+  nsresult rv = mProxyThread->Dispatch(task, NS_DISPATCH_NORMAL);
+  NS_ENSURE_SUCCESS(rv, rv);
+  return NS_OK;
+}
+
+nsresult
+MediaDataDecoderProxy::Shutdown()
+{
+  // Note that this *may* be called from the proxy thread also.
+  MOZ_ASSERT(!mIsShutdown);
+#if defined(DEBUG)
+  mIsShutdown = true;
+#endif
+  nsCOMPtr<nsIRunnable> task;
+  task = NS_NewRunnableMethod(mProxyDecoder, &MediaDataDecoder::Shutdown);
+  nsresult rv = mProxyThread->Dispatch(task, NS_DISPATCH_SYNC);
+  NS_ENSURE_SUCCESS(rv, rv);
+  return NS_OK;
+}
+
+void
+MediaDataDecoderProxy::FlushComplete()
+{
+  mFlushComplete.Set(true);
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/gmp/MediaDataDecoderProxy.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/gmp/MediaDataDecoderProxy.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/gmp/MediaDataDecoderProxy.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/gmp/MediaDataDecoderProxy.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,190 @@
+/* -*- 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(MediaDataDecoderProxy_h_)
+#define MediaDataDecoderProxy_h_
+
+#include "PlatformDecoderModule.h"
+#include "nsRefPtr.h"
+#include "nsThreadUtils.h"
+#include "nscore.h"
+
+namespace mozilla {
+
+class InputTask : public nsRunnable {
+public:
+  InputTask(MediaDataDecoder* aDecoder,
+            MediaRawData* aSample)
+   : mDecoder(aDecoder)
+   , mSample(aSample)
+  {}
+
+  NS_IMETHOD Run() {
+    mDecoder->Input(mSample);
+    return NS_OK;
+  }
+
+private:
+  nsRefPtr<MediaDataDecoder> mDecoder;
+  nsRefPtr<MediaRawData> mSample;
+};
+
+class InitTask : public nsRunnable {
+public:
+  explicit InitTask(MediaDataDecoder* aDecoder)
+   : mDecoder(aDecoder)
+   , mResultValid(false)
+  {}
+
+  NS_IMETHOD Run() {
+    mResult = mDecoder->Init();
+    mResultValid = true;
+    return NS_OK;
+  }
+
+  nsresult Result() {
+    MOZ_ASSERT(mResultValid);
+    return mResult;
+  }
+
+private:
+  MediaDataDecoder* mDecoder;
+  nsresult mResult;
+  bool mResultValid;
+};
+
+template<typename T>
+class Condition {
+public:
+  explicit Condition(T aValue)
+   : mMonitor("Condition")
+   , mCondition(aValue)
+  {}
+
+  void Set(T aValue) {
+    MonitorAutoLock mon(mMonitor);
+    mCondition = aValue;
+    mon.NotifyAll();
+  }
+
+  void WaitUntil(T aValue) {
+    MonitorAutoLock mon(mMonitor);
+    while (mCondition != aValue) {
+      mon.Wait();
+    }
+  }
+
+private:
+  Monitor mMonitor;
+  T mCondition;
+};
+
+class MediaDataDecoderProxy;
+
+class MediaDataDecoderCallbackProxy : public MediaDataDecoderCallback {
+public:
+  MediaDataDecoderCallbackProxy(MediaDataDecoderProxy* aProxyDecoder, MediaDataDecoderCallback* aCallback)
+   : mProxyDecoder(aProxyDecoder)
+   , mProxyCallback(aCallback)
+  {
+  }
+
+  virtual void Output(MediaData* aData) override {
+    mProxyCallback->Output(aData);
+  }
+
+  virtual void Error() override;
+
+  virtual void InputExhausted() override {
+    mProxyCallback->InputExhausted();
+  }
+
+  virtual void DrainComplete() override {
+    mProxyCallback->DrainComplete();
+  }
+
+  virtual void ReleaseMediaResources() override {
+    mProxyCallback->ReleaseMediaResources();
+  }
+
+  virtual void FlushComplete();
+
+  virtual bool OnReaderTaskQueue() override
+  {
+    return mProxyCallback->OnReaderTaskQueue();
+  }
+
+private:
+  MediaDataDecoderProxy* mProxyDecoder;
+  MediaDataDecoderCallback* mProxyCallback;
+};
+
+class MediaDataDecoderProxy : public MediaDataDecoder {
+public:
+  MediaDataDecoderProxy(nsIThread* aProxyThread, MediaDataDecoderCallback* aCallback)
+   : mProxyThread(aProxyThread)
+   , mProxyCallback(this, aCallback)
+   , mFlushComplete(false)
+#if defined(DEBUG)
+   , mIsShutdown(false)
+#endif
+  {
+  }
+
+  // Ideally, this would return a regular MediaDataDecoderCallback pointer
+  // to retain the clean abstraction, but until MediaDataDecoderCallback
+  // supports the FlushComplete interface, this will have to do.  When MDDC
+  // supports FlushComplete, this, the GMP*Decoders, and the
+  // *CallbackAdapters can be reverted to accepting a regular
+  // MediaDataDecoderCallback pointer.
+  MediaDataDecoderCallbackProxy* Callback()
+  {
+    return &mProxyCallback;
+  }
+
+  void SetProxyTarget(MediaDataDecoder* aProxyDecoder)
+  {
+    MOZ_ASSERT(aProxyDecoder);
+    mProxyDecoder = aProxyDecoder;
+  }
+
+  // These are called from the decoder thread pool.
+  // Init and Shutdown run synchronously on the proxy thread, all others are
+  // asynchronously and responded to via the MediaDataDecoderCallback.
+  // Note: the nsresults returned by the proxied decoder are lost.
+  virtual nsresult Init() override;
+  virtual nsresult Input(MediaRawData* aSample) override;
+  virtual nsresult Flush() override;
+  virtual nsresult Drain() override;
+  virtual nsresult Shutdown() override;
+
+  // Called by MediaDataDecoderCallbackProxy.
+  void FlushComplete();
+
+private:
+#ifdef DEBUG
+  bool IsOnProxyThread() {
+    return NS_GetCurrentThread() == mProxyThread;
+  }
+#endif
+
+  friend class InputTask;
+  friend class InitTask;
+
+  nsRefPtr<MediaDataDecoder> mProxyDecoder;
+  nsCOMPtr<nsIThread> mProxyThread;
+
+  MediaDataDecoderCallbackProxy mProxyCallback;
+
+  Condition<bool> mFlushComplete;
+#if defined(DEBUG)
+  bool mIsShutdown;
+#endif
+};
+
+} // namespace mozilla
+
+#endif // MediaDataDecoderProxy_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/gmp/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/gmp/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/agnostic/gmp/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/agnostic/gmp/moz.build	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,26 @@
+# -*- 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 += [
+    'GMPAudioDecoder.h',
+    'GMPDecoderModule.h',
+    'GMPVideoDecoder.h',
+    'MediaDataDecoderProxy.h',
+]
+
+UNIFIED_SOURCES += [
+    'GMPAudioDecoder.cpp',
+    'GMPDecoderModule.cpp',
+    'GMPVideoDecoder.cpp',
+    'MediaDataDecoderProxy.cpp',
+]
+
+# GMPVideoEncodedFrameImpl.h needs IPC
+include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'xul'
+
+FAIL_ON_WARNINGS = True
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/android/AndroidDecoderModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/android/AndroidDecoderModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/android/AndroidDecoderModule.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/android/AndroidDecoderModule.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,658 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 "AndroidDecoderModule.h"
+#include "AndroidBridge.h"
+#include "GLBlitHelper.h"
+#include "GLContext.h"
+#include "GLContextEGL.h"
+#include "GLContextProvider.h"
+#include "GLImages.h"
+#include "GLLibraryEGL.h"
+
+#include "MediaData.h"
+#include "MediaInfo.h"
+
+#include "nsThreadUtils.h"
+#include "nsAutoPtr.h"
+#include "nsPromiseFlatString.h"
+
+#include <jni.h>
+#include <string.h>
+
+using namespace mozilla;
+using namespace mozilla::gl;
+using namespace mozilla::widget::sdk;
+
+namespace mozilla {
+
+#define ENVOKE_CALLBACK(Func, ...) \
+  if (mCallback) { \
+    mCallback->Func(__VA_ARGS__); \
+  } else { \
+    NS_WARNING("callback not set"); \
+  }
+
+static MediaCodec::LocalRef CreateDecoder(const nsACString& aMimeType)
+{
+  MediaCodec::LocalRef codec;
+  NS_ENSURE_SUCCESS(MediaCodec::CreateDecoderByType(PromiseFlatCString(aMimeType).get(), &codec), nullptr);
+  return codec;
+}
+
+class VideoDataDecoder : public MediaCodecDataDecoder {
+public:
+  VideoDataDecoder(const VideoInfo& aConfig,
+                   MediaFormat::Param aFormat, MediaDataDecoderCallback* aCallback,
+                   layers::ImageContainer* aImageContainer)
+    : MediaCodecDataDecoder(MediaData::Type::VIDEO_DATA, aConfig.mMimeType, aFormat, aCallback)
+    , mImageContainer(aImageContainer)
+    , mConfig(aConfig)
+  {
+
+  }
+
+  nsresult Init() override {
+    mSurfaceTexture = AndroidSurfaceTexture::Create();
+    if (!mSurfaceTexture) {
+      NS_WARNING("Failed to create SurfaceTexture for video decode\n");
+      return NS_ERROR_FAILURE;
+    }
+
+    return InitDecoder(mSurfaceTexture->JavaSurface());
+  }
+
+  void Cleanup() override {
+    mGLContext = nullptr;
+  }
+
+  virtual nsresult Input(MediaRawData* aSample) override {
+    return MediaCodecDataDecoder::Input(aSample);
+  }
+
+  bool WantCopy() {
+    // Allocating a texture is incredibly slow on PowerVR
+    return mGLContext->Vendor() != GLVendor::Imagination;
+  }
+
+  EGLImage CopySurface(layers::Image* img) {
+    mGLContext->MakeCurrent();
+
+    GLuint tex = CreateTextureForOffscreen(mGLContext, mGLContext->GetGLFormats(),
+                                           img->GetSize());
+
+    auto helper = mGLContext->BlitHelper();
+    const gl::OriginPos destOrigin = gl::OriginPos::TopLeft;
+    if (!helper->BlitImageToTexture(img, img->GetSize(), tex, LOCAL_GL_TEXTURE_2D,
+                                    destOrigin))
+    {
+      mGLContext->fDeleteTextures(1, &tex);
+      return nullptr;
+    }
+
+    EGLint attribs[] = {
+      LOCAL_EGL_IMAGE_PRESERVED_KHR, LOCAL_EGL_TRUE,
+      LOCAL_EGL_NONE, LOCAL_EGL_NONE
+    };
+
+    EGLContext eglContext = static_cast<GLContextEGL*>(mGLContext.get())->GetEGLContext();
+    EGLImage eglImage = sEGLLibrary.fCreateImage(EGL_DISPLAY(), eglContext,
+                                                 LOCAL_EGL_GL_TEXTURE_2D_KHR,
+                                                 (EGLClientBuffer)tex, attribs);
+    mGLContext->fDeleteTextures(1, &tex);
+
+    return eglImage;
+  }
+
+  virtual nsresult PostOutput(BufferInfo::Param aInfo, MediaFormat::Param aFormat, Microseconds aDuration) override {
+    if (!EnsureGLContext()) {
+      return NS_ERROR_FAILURE;
+    }
+
+    nsRefPtr<layers::Image> img = mImageContainer->CreateImage(ImageFormat::SURFACE_TEXTURE);
+    layers::SurfaceTextureImage::Data data;
+    data.mSurfTex = mSurfaceTexture.get();
+    data.mSize = mConfig.mDisplay;
+    data.mOriginPos = gl::OriginPos::BottomLeft;
+
+    layers::SurfaceTextureImage* stImg = static_cast<layers::SurfaceTextureImage*>(img.get());
+    stImg->SetData(data);
+
+    if (WantCopy()) {
+      EGLImage eglImage = CopySurface(img);
+      if (!eglImage) {
+        return NS_ERROR_FAILURE;
+      }
+
+      EGLSync eglSync = nullptr;
+      if (sEGLLibrary.IsExtensionSupported(GLLibraryEGL::KHR_fence_sync) &&
+          mGLContext->IsExtensionSupported(GLContext::OES_EGL_sync))
+      {
+        MOZ_ASSERT(mGLContext->IsCurrent());
+        eglSync = sEGLLibrary.fCreateSync(EGL_DISPLAY(),
+                                          LOCAL_EGL_SYNC_FENCE,
+                                          nullptr);
+        MOZ_ASSERT(eglSync);
+        mGLContext->fFlush();
+      } else {
+        NS_WARNING("No EGL fence support detected, rendering artifacts may occur!");
+      }
+
+      img = mImageContainer->CreateImage(ImageFormat::EGLIMAGE);
+      layers::EGLImageImage::Data data;
+      data.mImage = eglImage;
+      data.mSync = eglSync;
+      data.mOwns = true;
+      data.mSize = mConfig.mDisplay;
+      data.mOriginPos = gl::OriginPos::TopLeft;
+
+      layers::EGLImageImage* typedImg = static_cast<layers::EGLImageImage*>(img.get());
+      typedImg->SetData(data);
+    }
+
+    nsresult rv;
+    int32_t flags;
+    NS_ENSURE_SUCCESS(rv = aInfo->Flags(&flags), rv);
+
+    bool isSync = !!(flags & MediaCodec::BUFFER_FLAG_SYNC_FRAME);
+
+    int32_t offset;
+    NS_ENSURE_SUCCESS(rv = aInfo->Offset(&offset), rv);
+
+    int64_t presentationTimeUs;
+    NS_ENSURE_SUCCESS(rv = aInfo->PresentationTimeUs(&presentationTimeUs), rv);
+
+    nsRefPtr<VideoData> v =
+      VideoData::CreateFromImage(mConfig,
+                                 mImageContainer,
+                                 offset,
+                                 presentationTimeUs,
+                                 aDuration,
+                                 img,
+                                 isSync,
+                                 presentationTimeUs,
+                                 gfx::IntRect(0, 0,
+                                              mConfig.mDisplay.width,
+                                              mConfig.mDisplay.height));
+    ENVOKE_CALLBACK(Output, v);
+    return NS_OK;
+  }
+
+protected:
+  bool EnsureGLContext() {
+    if (mGLContext) {
+      return true;
+    }
+
+    mGLContext = GLContextProvider::CreateHeadless(false);
+    return mGLContext;
+  }
+
+  layers::ImageContainer* mImageContainer;
+  const VideoInfo& mConfig;
+  RefPtr<AndroidSurfaceTexture> mSurfaceTexture;
+  nsRefPtr<GLContext> mGLContext;
+};
+
+class AudioDataDecoder : public MediaCodecDataDecoder {
+private:
+  uint8_t csd0[2];
+
+public:
+  AudioDataDecoder(const AudioInfo& aConfig, MediaFormat::Param aFormat, MediaDataDecoderCallback* aCallback)
+    : MediaCodecDataDecoder(MediaData::Type::AUDIO_DATA, aConfig.mMimeType, aFormat, aCallback)
+  {
+    JNIEnv* env = GetJNIForThread();
+
+    jni::Object::LocalRef buffer(env);
+    NS_ENSURE_SUCCESS_VOID(aFormat->GetByteBuffer(NS_LITERAL_STRING("csd-0"), &buffer));
+
+    if (!buffer && aConfig.mCodecSpecificConfig->Length() >= 2) {
+      csd0[0] = (*aConfig.mCodecSpecificConfig)[0];
+      csd0[1] = (*aConfig.mCodecSpecificConfig)[1];
+
+      buffer = jni::Object::LocalRef::Adopt(env, env->NewDirectByteBuffer(csd0, 2));
+      NS_ENSURE_SUCCESS_VOID(aFormat->SetByteBuffer(NS_LITERAL_STRING("csd-0"), buffer));
+    }
+  }
+
+  nsresult Output(BufferInfo::Param aInfo, void* aBuffer, MediaFormat::Param aFormat, Microseconds aDuration) {
+    // The output on Android is always 16-bit signed
+
+    nsresult rv;
+    int32_t numChannels;
+    NS_ENSURE_SUCCESS(rv =
+        aFormat->GetInteger(NS_LITERAL_STRING("channel-count"), &numChannels), rv);
+
+    int32_t sampleRate;
+    NS_ENSURE_SUCCESS(rv =
+        aFormat->GetInteger(NS_LITERAL_STRING("sample-rate"), &sampleRate), rv);
+
+    int32_t size;
+    NS_ENSURE_SUCCESS(rv = aInfo->Size(&size), rv);
+
+    const int32_t numFrames = (size / numChannels) / 2;
+    AudioDataValue* audio = new AudioDataValue[size];
+    PodCopy(audio, static_cast<AudioDataValue*>(aBuffer), size);
+
+    int32_t offset;
+    NS_ENSURE_SUCCESS(rv = aInfo->Offset(&offset), rv);
+
+    int64_t presentationTimeUs;
+    NS_ENSURE_SUCCESS(rv = aInfo->PresentationTimeUs(&presentationTimeUs), rv);
+
+    nsRefPtr<AudioData> data = new AudioData(offset, presentationTimeUs,
+                                             aDuration,
+                                             numFrames,
+                                             audio,
+                                             numChannels,
+                                             sampleRate);
+    ENVOKE_CALLBACK(Output, data);
+    return NS_OK;
+  }
+};
+
+
+bool AndroidDecoderModule::SupportsMimeType(const nsACString& aMimeType)
+{
+  if (aMimeType.EqualsLiteral("video/mp4") ||
+      aMimeType.EqualsLiteral("video/avc")) {
+    return true;
+  }
+  return static_cast<bool>(mozilla::CreateDecoder(aMimeType));
+}
+
+already_AddRefed<MediaDataDecoder>
+AndroidDecoderModule::CreateVideoDecoder(
+                                const VideoInfo& aConfig,
+                                layers::LayersBackend aLayersBackend,
+                                layers::ImageContainer* aImageContainer,
+                                FlushableMediaTaskQueue* aVideoTaskQueue,
+                                MediaDataDecoderCallback* aCallback)
+{
+  MediaFormat::LocalRef format;
+
+  NS_ENSURE_SUCCESS(MediaFormat::CreateVideoFormat(
+      aConfig.mMimeType,
+      aConfig.mDisplay.width,
+      aConfig.mDisplay.height,
+      &format), nullptr);
+
+  nsRefPtr<MediaDataDecoder> decoder =
+    new VideoDataDecoder(aConfig, format, aCallback, aImageContainer);
+
+  return decoder.forget();
+}
+
+already_AddRefed<MediaDataDecoder>
+AndroidDecoderModule::CreateAudioDecoder(const AudioInfo& aConfig,
+                                         FlushableMediaTaskQueue* aAudioTaskQueue,
+                                         MediaDataDecoderCallback* aCallback)
+{
+  MOZ_ASSERT(aConfig.mBitDepth == 16, "We only handle 16-bit audio!");
+
+  MediaFormat::LocalRef format;
+
+  NS_ENSURE_SUCCESS(MediaFormat::CreateAudioFormat(
+      aConfig.mMimeType,
+      aConfig.mBitDepth,
+      aConfig.mChannels,
+      &format), nullptr);
+
+  nsRefPtr<MediaDataDecoder> decoder =
+    new AudioDataDecoder(aConfig, format, aCallback);
+
+  return decoder.forget();
+
+}
+
+PlatformDecoderModule::ConversionRequired
+AndroidDecoderModule::DecoderNeedsConversion(const TrackInfo& aConfig) const
+{
+  if (aConfig.IsVideo()) {
+    return kNeedAnnexB;
+  } else {
+    return kNeedNone;
+  }
+}
+
+MediaCodecDataDecoder::MediaCodecDataDecoder(MediaData::Type aType,
+                                             const nsACString& aMimeType,
+                                             MediaFormat::Param aFormat,
+                                             MediaDataDecoderCallback* aCallback)
+  : mType(aType)
+  , mMimeType(aMimeType)
+  , mFormat(aFormat)
+  , mCallback(aCallback)
+  , mInputBuffers(nullptr)
+  , mOutputBuffers(nullptr)
+  , mMonitor("MediaCodecDataDecoder::mMonitor")
+  , mFlushing(false)
+  , mDraining(false)
+  , mStopping(false)
+{
+
+}
+
+MediaCodecDataDecoder::~MediaCodecDataDecoder()
+{
+  Shutdown();
+}
+
+nsresult MediaCodecDataDecoder::Init()
+{
+  return InitDecoder(nullptr);
+}
+
+nsresult MediaCodecDataDecoder::InitDecoder(Surface::Param aSurface)
+{
+  mDecoder = CreateDecoder(mMimeType);
+  if (!mDecoder) {
+    ENVOKE_CALLBACK(Error);
+    return NS_ERROR_FAILURE;
+  }
+
+  nsresult rv;
+  NS_ENSURE_SUCCESS(rv = mDecoder->Configure(mFormat, aSurface, nullptr, 0), rv);
+  NS_ENSURE_SUCCESS(rv = mDecoder->Start(), rv);
+
+  NS_ENSURE_SUCCESS(rv = ResetInputBuffers(), rv);
+  NS_ENSURE_SUCCESS(rv = ResetOutputBuffers(), rv);
+
+  NS_NewNamedThread("MC Decoder", getter_AddRefs(mThread),
+                    NS_NewRunnableMethod(this, &MediaCodecDataDecoder::DecoderLoop));
+
+  return NS_OK;
+}
+
+// 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"); \
+    ENVOKE_CALLBACK(Error); \
+    break; \
+  }
+
+nsresult MediaCodecDataDecoder::GetInputBuffer(JNIEnv* env, int index, jni::Object::LocalRef* buffer)
+{
+  bool retried = false;
+  while (!*buffer) {
+    *buffer = jni::Object::LocalRef::Adopt(env->GetObjectArrayElement(mInputBuffers.Get(), index));
+    if (!*buffer) {
+      if (!retried) {
+        // Reset the input buffers and then try again
+        nsresult res = ResetInputBuffers();
+        if (NS_FAILED(res)) {
+          return res;
+        }
+        retried = true;
+      } else {
+        // We already tried resetting the input buffers, return an error
+        return NS_ERROR_FAILURE;
+      }
+    }
+  }
+
+  return NS_OK;
+}
+
+void MediaCodecDataDecoder::DecoderLoop()
+{
+  bool outputDone = false;
+
+  bool draining = false;
+  bool waitingEOF = false;
+
+  AutoLocalJNIFrame frame(GetJNIForThread(), 1);
+  nsRefPtr<MediaRawData> sample;
+
+  MediaFormat::LocalRef outputFormat(frame.GetEnv());
+  nsresult res;
+
+  for (;;) {
+    {
+      MonitorAutoLock lock(mMonitor);
+      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
+          ENVOKE_CALLBACK(InputExhausted);
+        }
+        lock.Wait();
+      }
+
+      if (mStopping) {
+        // Get out of the loop. This is the only exit point.
+        break;
+      }
+
+      if (mFlushing) {
+        mDecoder->Flush();
+        ClearQueue();
+        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");
+
+      int32_t inputIndex;
+      res = mDecoder->DequeueInputBuffer(DECODER_TIMEOUT, &inputIndex);
+      HANDLE_DECODER_ERROR();
+
+      if (inputIndex >= 0) {
+        res = mDecoder->QueueInputBuffer(inputIndex, 0, 0, 0, MediaCodec::BUFFER_FLAG_END_OF_STREAM);
+        HANDLE_DECODER_ERROR();
+
+        waitingEOF = true;
+      }
+    }
+
+    if (sample) {
+      // We have a sample, try to feed it to the decoder
+      int inputIndex;
+      res = mDecoder->DequeueInputBuffer(DECODER_TIMEOUT, &inputIndex);
+      HANDLE_DECODER_ERROR();
+
+      if (inputIndex >= 0) {
+        jni::Object::LocalRef buffer(frame.GetEnv());
+        res = GetInputBuffer(frame.GetEnv(), inputIndex, &buffer);
+        HANDLE_DECODER_ERROR();
+
+        void* directBuffer = frame.GetEnv()->GetDirectBufferAddress(buffer.Get());
+
+        MOZ_ASSERT(frame.GetEnv()->GetDirectBufferCapacity(buffer.Get()) >= sample->mSize,
+          "Decoder buffer is not large enough for sample");
+
+        {
+          // We're feeding this to the decoder, so remove it from the queue
+          MonitorAutoLock lock(mMonitor);
+          mQueue.pop();
+        }
+
+        PodCopy((uint8_t*)directBuffer, sample->mData, sample->mSize);
+
+        res = mDecoder->QueueInputBuffer(inputIndex, 0, sample->mSize,
+                                         sample->mTime, 0);
+        HANDLE_DECODER_ERROR();
+
+        mDurations.push(sample->mDuration);
+        sample = nullptr;
+        outputDone = false;
+      }
+    }
+
+    if (!outputDone) {
+      BufferInfo::LocalRef bufferInfo;
+      res = BufferInfo::New(&bufferInfo);
+      HANDLE_DECODER_ERROR();
+
+      int32_t outputStatus;
+      res = mDecoder->DequeueOutputBuffer(bufferInfo, DECODER_TIMEOUT, &outputStatus);
+      HANDLE_DECODER_ERROR();
+
+      if (outputStatus == MediaCodec::INFO_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::INFO_OUTPUT_BUFFERS_CHANGED) {
+        res = ResetOutputBuffers();
+        HANDLE_DECODER_ERROR();
+      } else if (outputStatus == MediaCodec::INFO_OUTPUT_FORMAT_CHANGED) {
+        res = mDecoder->GetOutputFormat(ReturnTo(&outputFormat));
+        HANDLE_DECODER_ERROR();
+      } else if (outputStatus < 0) {
+        NS_WARNING("unknown error from decoder!");
+        ENVOKE_CALLBACK(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 {
+        int32_t flags;
+        res = bufferInfo->Flags(&flags);
+        HANDLE_DECODER_ERROR();
+
+        // We have a valid buffer index >= 0 here
+        if (flags & MediaCodec::BUFFER_FLAG_END_OF_STREAM) {
+          if (draining) {
+            draining = false;
+            waitingEOF = false;
+
+            mMonitor.Lock();
+            mDraining = false;
+            mMonitor.Notify();
+            mMonitor.Unlock();
+
+            ENVOKE_CALLBACK(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");
+
+        Microseconds duration = 0;
+        if (!mDurations.empty()) {
+          duration = mDurations.front();
+          mDurations.pop();
+        }
+
+        auto buffer = jni::Object::LocalRef::Adopt(
+            frame.GetEnv()->GetObjectArrayElement(mOutputBuffers.Get(), outputStatus));
+        if (buffer) {
+          // The buffer will be null on Android L if we are decoding to a Surface
+          void* directBuffer = frame.GetEnv()->GetDirectBufferAddress(buffer.Get());
+          Output(bufferInfo, directBuffer, outputFormat, duration);
+        }
+
+        // The Surface will be updated at this point (for video)
+        mDecoder->ReleaseOutputBuffer(outputStatus, true);
+
+        PostOutput(bufferInfo, outputFormat, duration);
+      }
+    }
+  }
+
+  Cleanup();
+
+  // We're done
+  MonitorAutoLock lock(mMonitor);
+  mStopping = false;
+  mMonitor.Notify();
+}
+
+void MediaCodecDataDecoder::ClearQueue()
+{
+  mMonitor.AssertCurrentThreadOwns();
+  while (!mQueue.empty()) {
+    mQueue.pop();
+  }
+  while (!mDurations.empty()) {
+    mDurations.pop();
+  }
+}
+
+nsresult MediaCodecDataDecoder::Input(MediaRawData* aSample) {
+  MonitorAutoLock lock(mMonitor);
+  mQueue.push(aSample);
+  lock.NotifyAll();
+
+  return NS_OK;
+}
+
+nsresult MediaCodecDataDecoder::ResetInputBuffers()
+{
+  return mDecoder->GetInputBuffers(ReturnTo(&mInputBuffers));
+}
+
+nsresult MediaCodecDataDecoder::ResetOutputBuffers()
+{
+  return mDecoder->GetOutputBuffers(ReturnTo(&mOutputBuffers));
+}
+
+nsresult MediaCodecDataDecoder::Flush() {
+  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();
+
+  return NS_OK;
+}
+
+
+nsresult MediaCodecDataDecoder::Shutdown() {
+  MonitorAutoLock lock(mMonitor);
+
+  if (!mThread || mStopping) {
+    // Already shutdown or in the process of doing so
+    return NS_OK;
+  }
+
+  mStopping = true;
+  lock.Notify();
+
+  while (mStopping) {
+    lock.Wait();
+  }
+
+  mThread->Shutdown();
+  mThread = nullptr;
+
+  mDecoder->Stop();
+  mDecoder->Release();
+
+  return NS_OK;
+}
+
+} // mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/android/AndroidDecoderModule.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/android/AndroidDecoderModule.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/android/AndroidDecoderModule.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/android/AndroidDecoderModule.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,102 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 AndroidDecoderModule_h_
+#define AndroidDecoderModule_h_
+
+#include "PlatformDecoderModule.h"
+#include "AndroidSurfaceTexture.h"
+
+#include "MediaCodec.h"
+#include "mozilla/Monitor.h"
+
+#include <queue>
+
+namespace mozilla {
+
+typedef std::queue<nsRefPtr<MediaRawData>> SampleQueue;
+
+class AndroidDecoderModule : public PlatformDecoderModule {
+public:
+  virtual already_AddRefed<MediaDataDecoder>
+  CreateVideoDecoder(const VideoInfo& aConfig,
+                     layers::LayersBackend aLayersBackend,
+                     layers::ImageContainer* aImageContainer,
+                     FlushableMediaTaskQueue* aVideoTaskQueue,
+                     MediaDataDecoderCallback* aCallback) override;
+
+  virtual already_AddRefed<MediaDataDecoder>
+  CreateAudioDecoder(const AudioInfo& aConfig,
+                     FlushableMediaTaskQueue* aAudioTaskQueue,
+                     MediaDataDecoderCallback* aCallback) override;
+
+
+  AndroidDecoderModule() {}
+  virtual ~AndroidDecoderModule() {}
+
+  virtual bool SupportsMimeType(const nsACString& aMimeType) override;
+
+  virtual ConversionRequired
+  DecoderNeedsConversion(const TrackInfo& aConfig) const override;
+};
+
+class MediaCodecDataDecoder : public MediaDataDecoder {
+public:
+
+  MediaCodecDataDecoder(MediaData::Type aType,
+                        const nsACString& aMimeType,
+                        widget::sdk::MediaFormat::Param aFormat,
+                        MediaDataDecoderCallback* aCallback);
+
+  virtual ~MediaCodecDataDecoder();
+
+  virtual nsresult Init() override;
+  virtual nsresult Flush() override;
+  virtual nsresult Drain() override;
+  virtual nsresult Shutdown() override;
+  virtual nsresult Input(MediaRawData* aSample);
+
+protected:
+  friend class AndroidDecoderModule;
+
+  MediaData::Type mType;
+
+  nsAutoCString mMimeType;
+  widget::sdk::MediaFormat::GlobalRef mFormat;
+
+  MediaDataDecoderCallback* mCallback;
+
+  widget::sdk::MediaCodec::GlobalRef mDecoder;
+
+  jni::ObjectArray::GlobalRef mInputBuffers;
+  jni::ObjectArray::GlobalRef mOutputBuffers;
+
+  nsCOMPtr<nsIThread> mThread;
+
+  // Only these members are protected by mMonitor.
+  Monitor mMonitor;
+  bool mFlushing;
+  bool mDraining;
+  bool mStopping;
+
+  SampleQueue mQueue;
+  std::queue<Microseconds> mDurations;
+
+  virtual nsresult InitDecoder(widget::sdk::Surface::Param aSurface);
+
+  virtual nsresult Output(widget::sdk::BufferInfo::Param aInfo, void* aBuffer, widget::sdk::MediaFormat::Param aFormat, Microseconds aDuration) { return NS_OK; }
+  virtual nsresult PostOutput(widget::sdk::BufferInfo::Param aInfo, widget::sdk::MediaFormat::Param aFormat, Microseconds aDuration) { return NS_OK; }
+  virtual void Cleanup() {};
+
+  nsresult ResetInputBuffers();
+  nsresult ResetOutputBuffers();
+
+  void DecoderLoop();
+  nsresult GetInputBuffer(JNIEnv* env, int index, jni::Object::LocalRef* buffer);
+  virtual void ClearQueue();
+};
+
+} // namwspace mozilla
+
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleATDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleATDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleATDecoder.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleATDecoder.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,508 @@
+/* -*- 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 "AppleUtils.h"
+#include "MP4Reader.h"
+#include "MP4Decoder.h"
+#include "mp4_demuxer/Adts.h"
+#include "MediaInfo.h"
+#include "AppleATDecoder.h"
+#include "mozilla/Logging.h"
+
+PRLogModuleInfo* GetAppleMediaLog();
+#define LOG(...) MOZ_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__))
+#define FourCC2Str(n) ((char[5]){(char)(n >> 24), (char)(n >> 16), (char)(n >> 8), (char)(n), 0})
+
+namespace mozilla {
+
+AppleATDecoder::AppleATDecoder(const AudioInfo& aConfig,
+                               FlushableMediaTaskQueue* aAudioTaskQueue,
+                               MediaDataDecoderCallback* aCallback)
+  : mConfig(aConfig)
+  , mFileStreamError(false)
+  , mTaskQueue(aAudioTaskQueue)
+  , mCallback(aCallback)
+  , mConverter(nullptr)
+  , mStream(nullptr)
+{
+  MOZ_COUNT_CTOR(AppleATDecoder);
+  LOG("Creating Apple AudioToolbox decoder");
+  LOG("Audio Decoder configuration: %s %d Hz %d channels %d bits per channel",
+      mConfig.mMimeType.get(),
+      mConfig.mRate,
+      mConfig.mChannels,
+      mConfig.mBitDepth);
+
+  if (mConfig.mMimeType.EqualsLiteral("audio/mpeg")) {
+    mFormatID = kAudioFormatMPEGLayer3;
+  } else if (mConfig.mMimeType.EqualsLiteral("audio/mp4a-latm")) {
+    mFormatID = kAudioFormatMPEG4AAC;
+  } else {
+    mFormatID = 0;
+  }
+}
+
+AppleATDecoder::~AppleATDecoder()
+{
+  MOZ_COUNT_DTOR(AppleATDecoder);
+  MOZ_ASSERT(!mConverter);
+}
+
+nsresult
+AppleATDecoder::Init()
+{
+  if (!mFormatID) {
+    NS_ERROR("Non recognised format");
+    return NS_ERROR_FAILURE;
+  }
+  return NS_OK;
+}
+
+nsresult
+AppleATDecoder::Input(MediaRawData* aSample)
+{
+  LOG("mp4 input sample %p %lld us %lld pts%s %llu bytes audio",
+      aSample,
+      aSample->mDuration,
+      aSample->mTime,
+      aSample->mKeyframe ? " keyframe" : "",
+      (unsigned long long)aSample->mSize);
+
+  // Queue a task to perform the actual decoding on a separate thread.
+  nsCOMPtr<nsIRunnable> runnable =
+      NS_NewRunnableMethodWithArg<nsRefPtr<MediaRawData>>(
+        this,
+        &AppleATDecoder::SubmitSample,
+        nsRefPtr<MediaRawData>(aSample));
+  mTaskQueue->Dispatch(runnable.forget());
+
+  return NS_OK;
+}
+
+nsresult
+AppleATDecoder::Flush()
+{
+  LOG("Flushing AudioToolbox AAC decoder");
+  mTaskQueue->Flush();
+  mQueuedSamples.Clear();
+  OSStatus rv = AudioConverterReset(mConverter);
+  if (rv) {
+    LOG("Error %d resetting AudioConverter", rv);
+    return NS_ERROR_FAILURE;
+  }
+  return NS_OK;
+}
+
+nsresult
+AppleATDecoder::Drain()
+{
+  LOG("Draining AudioToolbox AAC decoder");
+  mTaskQueue->AwaitIdle();
+  mCallback->DrainComplete();
+  return Flush();
+}
+
+nsresult
+AppleATDecoder::Shutdown()
+{
+  LOG("Shutdown: Apple AudioToolbox AAC decoder");
+  mQueuedSamples.Clear();
+  OSStatus rv = AudioConverterDispose(mConverter);
+  if (rv) {
+    LOG("error %d disposing of AudioConverter", rv);
+    return NS_ERROR_FAILURE;
+  }
+  mConverter = nullptr;
+
+  if (mStream) {
+    rv = AudioFileStreamClose(mStream);
+    if (rv) {
+      LOG("error %d disposing of AudioFileStream", rv);
+      return NS_ERROR_FAILURE;
+    }
+    mStream = nullptr;
+  }
+  return NS_OK;
+}
+
+struct PassthroughUserData {
+  UInt32 mChannels;
+  UInt32 mDataSize;
+  const void* mData;
+  AudioStreamPacketDescription mPacket;
+};
+
+// Error value we pass through the decoder to signal that nothing
+// has gone wrong during decoding and we're done processing the packet.
+const uint32_t kNoMoreDataErr = 'MOAR';
+
+static OSStatus
+_PassthroughInputDataCallback(AudioConverterRef aAudioConverter,
+                              UInt32* aNumDataPackets /* in/out */,
+                              AudioBufferList* aData /* in/out */,
+                              AudioStreamPacketDescription** aPacketDesc,
+                              void* aUserData)
+{
+  PassthroughUserData* userData = (PassthroughUserData*)aUserData;
+  if (!userData->mDataSize) {
+    *aNumDataPackets = 0;
+    return kNoMoreDataErr;
+  }
+
+  if (aPacketDesc) {
+    userData->mPacket.mStartOffset = 0;
+    userData->mPacket.mVariableFramesInPacket = 0;
+    userData->mPacket.mDataByteSize = userData->mDataSize;
+    *aPacketDesc = &userData->mPacket;
+  }
+
+  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::SubmitSample(MediaRawData* aSample)
+{
+  nsresult rv = NS_OK;
+  if (!mConverter) {
+    rv = SetupDecoder(aSample);
+    if (rv != NS_OK && rv != NS_ERROR_NOT_INITIALIZED) {
+      mCallback->Error();
+      return;
+    }
+  }
+
+  mQueuedSamples.AppendElement(aSample);
+
+  if (rv == NS_OK) {
+    for (size_t i = 0; i < mQueuedSamples.Length(); i++) {
+      if (NS_FAILED(DecodeSample(mQueuedSamples[i]))) {
+        mQueuedSamples.Clear();
+        mCallback->Error();
+        return;
+      }
+    }
+    mQueuedSamples.Clear();
+  }
+
+  if (mTaskQueue->IsEmpty()) {
+    mCallback->InputExhausted();
+  }
+}
+
+nsresult
+AppleATDecoder::DecodeSample(MediaRawData* 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 * channels;
+
+  // Descriptions for _decompressed_ audio packets. ignored.
+  nsAutoArrayPtr<AudioStreamPacketDescription>
+    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.
+  PassthroughUserData userData =
+    { channels, (UInt32)aSample->mSize, aSample->mData };
+
+  // Decompressed audio buffer
+  nsAutoArrayPtr<AudioDataValue> decoded(new AudioDataValue[maxDecodedSamples]);
+
+  do {
+    AudioBufferList decBuffer;
+    decBuffer.mNumberBuffers = 1;
+    decBuffer.mBuffers[0].mNumberChannels = channels;
+    decBuffer.mBuffers[0].mDataByteSize =
+      maxDecodedSamples * sizeof(AudioDataValue);
+    decBuffer.mBuffers[0].mData = decoded.get();
+
+    // in: the max number of packets we can handle from the decoder.
+    // out: the number of packets the decoder is actually returning.
+    UInt32 numFrames = MAX_AUDIO_FRAMES;
+
+    OSStatus rv = AudioConverterFillComplexBuffer(mConverter,
+                                                  _PassthroughInputDataCallback,
+                                                  &userData,
+                                                  &numFrames /* in/out */,
+                                                  &decBuffer,
+                                                  packets.get());
+
+    if (rv && rv != kNoMoreDataErr) {
+      LOG("Error decoding audio stream: %d\n", rv);
+      return NS_ERROR_FAILURE;
+    }
+
+    if (numFrames) {
+      outputData.AppendElements(decoded.get(), numFrames * channels);
+    }
+
+    if (rv == kNoMoreDataErr) {
+      break;
+    }
+  } while (true);
+
+  if (outputData.IsEmpty()) {
+    return NS_OK;
+  }
+
+  size_t numFrames = outputData.Length() / channels;
+  int rate = mOutputFormat.mSampleRate;
+  CheckedInt<Microseconds> duration = FramesToUsecs(numFrames, rate);
+  if (!duration.isValid()) {
+    NS_WARNING("Invalid count of accumulated audio samples");
+    return NS_ERROR_FAILURE;
+  }
+
+#ifdef LOG_SAMPLE_DECODE
+  LOG("pushed audio at time %lfs; duration %lfs\n",
+      (double)aSample->mTime / USECS_PER_S,
+      (double)duration.value() / USECS_PER_S);
+#endif
+
+  nsAutoArrayPtr<AudioDataValue> data(new AudioDataValue[outputData.Length()]);
+  PodCopy(data.get(), &outputData[0], outputData.Length());
+  nsRefPtr<AudioData> audio = new AudioData(aSample->mOffset,
+                                            aSample->mTime,
+                                            duration.value(),
+                                            numFrames,
+                                            data.forget(),
+                                            channels,
+                                            rate);
+  mCallback->Output(audio);
+  return NS_OK;
+}
+
+nsresult
+AppleATDecoder::GetInputAudioDescription(AudioStreamBasicDescription& aDesc,
+                                         const nsTArray<uint8_t>& aExtraData)
+{
+  // 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.mExtendedProfile;
+  }
+  formatInfo.mMagicCookieSize = aExtraData.Length();
+  formatInfo.mMagicCookie = aExtraData.Elements();
+
+  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.mChannels;
+  aDesc.mSampleRate = mConfig.mRate;
+  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;
+}
+
+nsresult
+AppleATDecoder::SetupDecoder(MediaRawData* aSample)
+{
+  if (mFormatID == kAudioFormatMPEG4AAC &&
+      mConfig.mExtendedProfile == 2) {
+    // Check for implicit SBR signalling if stream is AAC-LC
+    // This will provide us with an updated magic cookie for use with
+    // GetInputAudioDescription.
+    if (NS_SUCCEEDED(GetImplicitAACMagicCookie(aSample)) &&
+        !mMagicCookie.Length()) {
+      // nothing found yet, will try again later
+      return NS_ERROR_NOT_INITIALIZED;
+    }
+    // An error occurred, fallback to using default stream description
+  }
+
+  LOG("Initializing Apple AudioToolbox decoder");
+
+  AudioStreamBasicDescription inputFormat;
+  PodZero(&inputFormat);
+  nsresult rv =
+    GetInputAudioDescription(inputFormat,
+                             mMagicCookie.Length() ?
+                                 mMagicCookie : *mConfig.mExtraData);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  // 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", status);
+    mConverter = nullptr;
+    return NS_ERROR_FAILURE;
+  }
+  return NS_OK;
+}
+
+static void
+_MetadataCallback(void* aAppleATDecoder,
+                  AudioFileStreamID aStream,
+                  AudioFileStreamPropertyID aProperty,
+                  UInt32* aFlags)
+{
+  AppleATDecoder* decoder = static_cast<AppleATDecoder*>(aAppleATDecoder);
+  LOG("MetadataCallback receiving: '%s'", FourCC2Str(aProperty));
+  if (aProperty == kAudioFileStreamProperty_MagicCookieData) {
+    UInt32 size;
+    Boolean writeable;
+    OSStatus rv = AudioFileStreamGetPropertyInfo(aStream,
+                                                 aProperty,
+                                                 &size,
+                                                 &writeable);
+    if (rv) {
+      LOG("Couldn't get property info for '%s' (%s)",
+          FourCC2Str(aProperty), FourCC2Str(rv));
+      decoder->mFileStreamError = true;
+      return;
+    }
+    nsAutoArrayPtr<uint8_t> data(new uint8_t[size]);
+    rv = AudioFileStreamGetProperty(aStream, aProperty,
+                                    &size, data);
+    if (rv) {
+      LOG("Couldn't get property '%s' (%s)",
+          FourCC2Str(aProperty), FourCC2Str(rv));
+      decoder->mFileStreamError = true;
+      return;
+    }
+    decoder->mMagicCookie.AppendElements(data.get(), size);
+  }
+}
+
+static void
+_SampleCallback(void* aSBR,
+                UInt32 aNumBytes,
+                UInt32 aNumPackets,
+                const void* aData,
+                AudioStreamPacketDescription* aPackets)
+{
+}
+
+nsresult
+AppleATDecoder::GetImplicitAACMagicCookie(const MediaRawData* aSample)
+{
+  // Prepend ADTS header to AAC audio.
+  nsRefPtr<MediaRawData> adtssample(aSample->Clone());
+  if (!adtssample) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+  int8_t frequency_index =
+    mp4_demuxer::Adts::GetFrequencyIndex(mConfig.mRate);
+
+  bool rv = mp4_demuxer::Adts::ConvertSample(mConfig.mChannels,
+                                             frequency_index,
+                                             mConfig.mProfile,
+                                             adtssample);
+  if (!rv) {
+    NS_WARNING("Failed to apply ADTS header");
+    return NS_ERROR_FAILURE;
+  }
+  if (!mStream) {
+    OSStatus rv = AudioFileStreamOpen(this,
+                                      _MetadataCallback,
+                                      _SampleCallback,
+                                      kAudioFileAAC_ADTSType,
+                                      &mStream);
+    if (rv) {
+      NS_WARNING("Couldn't open AudioFileStream");
+      return NS_ERROR_FAILURE;
+    }
+  }
+
+  OSStatus status = AudioFileStreamParseBytes(mStream,
+                                              adtssample->mSize,
+                                              adtssample->mData,
+                                              0 /* discontinuity */);
+  if (status) {
+    NS_WARNING("Couldn't parse sample");
+  }
+
+  if (status || mFileStreamError || mMagicCookie.Length()) {
+    // We have decoded a magic cookie or an error occurred as such
+    // we won't need the stream any longer.
+    AudioFileStreamClose(mStream);
+    mStream = nullptr;
+  }
+
+  return (mFileStreamError || status) ? NS_ERROR_FAILURE : NS_OK;
+}
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleATDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleATDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleATDecoder.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleATDecoder.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,64 @@
+/* -*- 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_AppleATDecoder_h
+#define mozilla_AppleATDecoder_h
+
+#include <AudioToolbox/AudioToolbox.h>
+#include "PlatformDecoderModule.h"
+#include "mozilla/ReentrantMonitor.h"
+#include "mozilla/Vector.h"
+#include "nsIThread.h"
+
+namespace mozilla {
+
+class FlushableMediaTaskQueue;
+class MediaDataDecoderCallback;
+
+class AppleATDecoder : public MediaDataDecoder {
+public:
+  AppleATDecoder(const AudioInfo& aConfig,
+                 FlushableMediaTaskQueue* aVideoTaskQueue,
+                 MediaDataDecoderCallback* aCallback);
+  virtual ~AppleATDecoder();
+
+  virtual nsresult Init() override;
+  virtual nsresult Input(MediaRawData* aSample) override;
+  virtual nsresult Flush() override;
+  virtual nsresult Drain() override;
+  virtual nsresult Shutdown() override;
+
+  // Callbacks also need access to the config.
+  const AudioInfo& mConfig;
+
+  // Use to extract magic cookie for HE-AAC detection.
+  nsTArray<uint8_t> mMagicCookie;
+  // Will be set to true should an error occurred while attempting to retrieve
+  // the magic cookie property.
+  bool mFileStreamError;
+
+private:
+  nsRefPtr<FlushableMediaTaskQueue> mTaskQueue;
+  MediaDataDecoderCallback* mCallback;
+  AudioConverterRef mConverter;
+  AudioStreamBasicDescription mOutputFormat;
+  UInt32 mFormatID;
+  AudioFileStreamID mStream;
+  nsTArray<nsRefPtr<MediaRawData>> mQueuedSamples;
+
+  void SubmitSample(MediaRawData* aSample);
+  nsresult DecodeSample(MediaRawData* aSample);
+  nsresult GetInputAudioDescription(AudioStreamBasicDescription& aDesc,
+                                    const nsTArray<uint8_t>& aExtraData);
+  // Setup AudioConverter once all information required has been gathered.
+  // Will return NS_ERROR_NOT_INITIALIZED if more data is required.
+  nsresult SetupDecoder(MediaRawData* aSample);
+  nsresult GetImplicitAACMagicCookie(const MediaRawData* aSample);
+};
+
+} // namespace mozilla
+
+#endif // mozilla_AppleATDecoder_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleCMFunctions.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleCMFunctions.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleCMFunctions.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleCMFunctions.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,12 @@
+/* -*- 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/. */
+
+// Construct references to each of the CoreMedia symbols we use.
+
+LINK_FUNC(VideoFormatDescriptionCreate)
+LINK_FUNC(BlockBufferCreateWithMemoryBlock)
+LINK_FUNC(SampleBufferCreate)
+LINK_FUNC(TimeMake)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleCMLinker.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleCMLinker.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleCMLinker.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleCMLinker.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,134 @@
+/* -*- 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 <dlfcn.h>
+
+#include "AppleCMLinker.h"
+#include "MainThreadUtils.h"
+#include "mozilla/ArrayUtils.h"
+#include "nsCocoaFeatures.h"
+#include "nsDebug.h"
+
+PRLogModuleInfo* GetAppleMediaLog();
+#define LOG(...) MOZ_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__))
+
+namespace mozilla {
+
+AppleCMLinker::LinkStatus
+AppleCMLinker::sLinkStatus = LinkStatus_INIT;
+
+void* AppleCMLinker::sLink = nullptr;
+nsrefcnt AppleCMLinker::sRefCount = 0;
+CFStringRef AppleCMLinker::skPropExtensionAtoms = nullptr;
+CFStringRef AppleCMLinker::skPropFullRangeVideo = nullptr;
+
+#define LINK_FUNC(func) typeof(CM ## func) CM ## func;
+#include "AppleCMFunctions.h"
+#undef LINK_FUNC
+
+/* static */ bool
+AppleCMLinker::Link()
+{
+  // Bump our reference count every time we're called.
+  // Add a lock or change the thread assertion if
+  // you need to call this off the main thread.
+  MOZ_ASSERT(NS_IsMainThread());
+  ++sRefCount;
+
+  if (sLinkStatus) {
+    return sLinkStatus == LinkStatus_SUCCEEDED;
+  }
+
+  const char* dlnames[] =
+    { "/System/Library/Frameworks/CoreMedia.framework/CoreMedia",
+      "/System/Library/PrivateFrameworks/CoreMedia.framework/CoreMedia" };
+  bool dlfound = false;
+  for (size_t i = 0; i < ArrayLength(dlnames); i++) {
+    if ((sLink = dlopen(dlnames[i], RTLD_NOW | RTLD_LOCAL))) {
+      dlfound = true;
+      break;
+    }
+  }
+  if (!dlfound) {
+    NS_WARNING("Couldn't load CoreMedia framework");
+    goto fail;
+  }
+
+  if (nsCocoaFeatures::OnLionOrLater()) {
+#define LINK_FUNC2(func)                                       \
+  func = (typeof(func))dlsym(sLink, #func);                    \
+  if (!func) {                                                 \
+    NS_WARNING("Couldn't load CoreMedia function " #func );    \
+    goto fail;                                                 \
+  }
+#define LINK_FUNC(func) LINK_FUNC2(CM ## func)
+#include "AppleCMFunctions.h"
+#undef LINK_FUNC
+#undef LINK_FUNC2
+
+    skPropExtensionAtoms =
+      GetIOConst("kCMFormatDescriptionExtension_SampleDescriptionExtensionAtoms");
+
+    skPropFullRangeVideo =
+      GetIOConst("kCMFormatDescriptionExtension_FullRangeVideo");
+
+  } else {
+#define LINK_FUNC2(cm, fig)                                    \
+  cm = (typeof(cm))dlsym(sLink, #fig);                         \
+  if (!cm) {                                                   \
+    NS_WARNING("Couldn't load CoreMedia function " #fig );     \
+    goto fail;                                                 \
+  }
+#define LINK_FUNC(func) LINK_FUNC2(CM ## func, Fig ## func)
+#include "AppleCMFunctions.h"
+#undef LINK_FUNC
+#undef LINK_FUNC2
+
+    skPropExtensionAtoms =
+      GetIOConst("kFigFormatDescriptionExtension_SampleDescriptionExtensionAtoms");
+  }
+
+  if (!skPropExtensionAtoms) {
+    goto fail;
+  }
+
+  LOG("Loaded CoreMedia framework.");
+  sLinkStatus = LinkStatus_SUCCEEDED;
+  return true;
+
+fail:
+  Unlink();
+
+  sLinkStatus = LinkStatus_FAILED;
+  return false;
+}
+
+/* static */ void
+AppleCMLinker::Unlink()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(sRefCount > 0, "Unbalanced Unlink()");
+  --sRefCount;
+  if (sLink && sRefCount < 1) {
+    LOG("Unlinking CoreMedia framework.");
+    dlclose(sLink);
+    sLink = nullptr;
+    sLinkStatus = LinkStatus_INIT;
+  }
+}
+
+/* static */ CFStringRef
+AppleCMLinker::GetIOConst(const char* symbol)
+{
+  CFStringRef* address = (CFStringRef*)dlsym(sLink, symbol);
+  if (!address) {
+    return nullptr;
+  }
+
+  return *address;
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleCMLinker.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleCMLinker.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleCMLinker.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleCMLinker.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,47 @@
+/* -*- 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 AppleCMLinker_h
+#define AppleCMLinker_h
+
+extern "C" {
+#pragma GCC visibility push(default)
+#include <CoreMedia/CoreMedia.h>
+#pragma GCC visibility pop
+}
+
+#include "nscore.h"
+
+namespace mozilla {
+
+class AppleCMLinker
+{
+public:
+  static bool Link();
+  static void Unlink();
+  static CFStringRef skPropExtensionAtoms;
+  static CFStringRef skPropFullRangeVideo;
+
+private:
+  static void* sLink;
+  static nsrefcnt sRefCount;
+
+  static enum LinkStatus {
+    LinkStatus_INIT = 0,
+    LinkStatus_FAILED,
+    LinkStatus_SUCCEEDED
+  } sLinkStatus;
+
+  static CFStringRef GetIOConst(const char* symbol);
+};
+
+#define LINK_FUNC(func) extern typeof(CM ## func)* CM ## func;
+#include "AppleCMFunctions.h"
+#undef LINK_FUNC
+
+} // namespace mozilla
+
+#endif // AppleCMLinker_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleDecoderModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleDecoderModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleDecoderModule.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleDecoderModule.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,134 @@
+/* -*- 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 "AppleATDecoder.h"
+#include "AppleCMLinker.h"
+#include "AppleDecoderModule.h"
+#include "AppleVDADecoder.h"
+#include "AppleVDALinker.h"
+#include "AppleVTDecoder.h"
+#include "AppleVTLinker.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/DebugOnly.h"
+#include "mozilla/Logging.h"
+
+PRLogModuleInfo* GetAppleMediaLog() {
+  static PRLogModuleInfo* log = nullptr;
+  if (!log) {
+    log = PR_NewLogModule("AppleMedia");
+  }
+  return log;
+}
+
+namespace mozilla {
+
+bool AppleDecoderModule::sInitialized = false;
+bool AppleDecoderModule::sIsVTAvailable = false;
+bool AppleDecoderModule::sIsVTHWAvailable = false;
+bool AppleDecoderModule::sIsVDAAvailable = false;
+bool AppleDecoderModule::sForceVDA = false;
+
+AppleDecoderModule::AppleDecoderModule()
+{
+}
+
+AppleDecoderModule::~AppleDecoderModule()
+{
+}
+
+/* static */
+void
+AppleDecoderModule::Init()
+{
+  MOZ_ASSERT(NS_IsMainThread(), "Must be on main thread.");
+
+  if (sInitialized) {
+    return;
+  }
+
+  Preferences::AddBoolVarCache(&sForceVDA, "media.apple.forcevda", false);
+
+  // dlopen VideoDecodeAcceleration.framework if it's available.
+  sIsVDAAvailable = AppleVDALinker::Link();
+
+  // dlopen CoreMedia.framework if it's available.
+  bool haveCoreMedia = AppleCMLinker::Link();
+  // dlopen VideoToolbox.framework if it's available.
+  // We must link both CM and VideoToolbox framework to allow for proper
+  // paired Link/Unlink calls
+  bool haveVideoToolbox = AppleVTLinker::Link();
+  sIsVTAvailable = haveCoreMedia && haveVideoToolbox;
+
+  sIsVTHWAvailable = AppleVTLinker::skPropEnableHWAccel != nullptr;
+
+  sInitialized = true;
+}
+
+nsresult
+AppleDecoderModule::Startup()
+{
+  if (!sInitialized || (!sIsVDAAvailable && !sIsVTAvailable)) {
+    return NS_ERROR_FAILURE;
+  }
+  return NS_OK;
+}
+
+already_AddRefed<MediaDataDecoder>
+AppleDecoderModule::CreateVideoDecoder(const VideoInfo& aConfig,
+                                       layers::LayersBackend aLayersBackend,
+                                       layers::ImageContainer* aImageContainer,
+                                       FlushableMediaTaskQueue* aVideoTaskQueue,
+                                       MediaDataDecoderCallback* aCallback)
+{
+  nsRefPtr<MediaDataDecoder> decoder;
+
+  if (sIsVDAAvailable && (!sIsVTHWAvailable || sForceVDA)) {
+    decoder =
+      AppleVDADecoder::CreateVDADecoder(aConfig,
+                                        aVideoTaskQueue,
+                                        aCallback,
+                                        aImageContainer);
+    if (decoder) {
+      return decoder.forget();
+    }
+  }
+  // We fallback here if VDA isn't available, or is available but isn't
+  // supported by the current platform.
+  if (sIsVTAvailable) {
+    decoder =
+      new AppleVTDecoder(aConfig, aVideoTaskQueue, aCallback, aImageContainer);
+  }
+  return decoder.forget();
+}
+
+already_AddRefed<MediaDataDecoder>
+AppleDecoderModule::CreateAudioDecoder(const AudioInfo& aConfig,
+                                       FlushableMediaTaskQueue* aAudioTaskQueue,
+                                       MediaDataDecoderCallback* aCallback)
+{
+  nsRefPtr<MediaDataDecoder> decoder =
+    new AppleATDecoder(aConfig, aAudioTaskQueue, aCallback);
+  return decoder.forget();
+}
+
+bool
+AppleDecoderModule::SupportsMimeType(const nsACString& aMimeType)
+{
+  return aMimeType.EqualsLiteral("audio/mpeg") ||
+    PlatformDecoderModule::SupportsMimeType(aMimeType);
+}
+
+PlatformDecoderModule::ConversionRequired
+AppleDecoderModule::DecoderNeedsConversion(const TrackInfo& aConfig) const
+{
+  if (aConfig.IsVideo()) {
+    return kNeedAVCC;
+  } else {
+    return kNeedNone;
+  }
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleDecoderModule.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleDecoderModule.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleDecoderModule.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleDecoderModule.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,52 @@
+/* -*- 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_AppleDecoderModule_h
+#define mozilla_AppleDecoderModule_h
+
+#include "PlatformDecoderModule.h"
+
+namespace mozilla {
+
+class AppleDecoderModule : public PlatformDecoderModule {
+public:
+  AppleDecoderModule();
+  virtual ~AppleDecoderModule();
+
+  virtual nsresult Startup() override;
+
+  // Decode thread.
+  virtual already_AddRefed<MediaDataDecoder>
+  CreateVideoDecoder(const VideoInfo& aConfig,
+                     layers::LayersBackend aLayersBackend,
+                     layers::ImageContainer* aImageContainer,
+                     FlushableMediaTaskQueue* aVideoTaskQueue,
+                     MediaDataDecoderCallback* aCallback) override;
+
+  // Decode thread.
+  virtual already_AddRefed<MediaDataDecoder>
+  CreateAudioDecoder(const AudioInfo& aConfig,
+                     FlushableMediaTaskQueue* aAudioTaskQueue,
+                     MediaDataDecoderCallback* aCallback) override;
+
+  virtual bool SupportsMimeType(const nsACString& aMimeType) override;
+
+  virtual ConversionRequired
+  DecoderNeedsConversion(const TrackInfo& aConfig) const override;
+
+  static void Init();
+
+private:
+  static bool sInitialized;
+  static bool sIsVTAvailable;
+  static bool sIsVTHWAvailable;
+  static bool sIsVDAAvailable;
+  static bool sForceVDA;
+};
+
+} // namespace mozilla
+
+#endif // mozilla_AppleDecoderModule_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleUtils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleUtils.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleUtils.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,48 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// Utility functions to help with Apple API calls.
+
+#ifndef mozilla_AppleUtils_h
+#define mozilla_AppleUtils_h
+
+#include "mozilla/Attributes.h"
+
+namespace mozilla {
+
+// Wrapper class to call CFRelease on reference types
+// when they go out of scope.
+template <class T>
+class AutoCFRelease {
+public:
+  MOZ_IMPLICIT AutoCFRelease(T aRef)
+    : mRef(aRef)
+  {
+  }
+  ~AutoCFRelease()
+  {
+    if (mRef) {
+      CFRelease(mRef);
+    }
+  }
+  // Return the wrapped ref so it can be used as an in parameter.
+  operator T()
+  {
+    return mRef;
+  }
+  // Return a pointer to the wrapped ref for use as an out parameter.
+  T* receive()
+  {
+    return &mRef;
+  }
+
+private:
+  // Copy operator isn't supported and is not implemented.
+  AutoCFRelease<T>& operator=(const AutoCFRelease<T>&);
+  T mRef;
+};
+
+} // namespace mozilla
+
+#endif // mozilla_AppleUtils_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleVDADecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleVDADecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleVDADecoder.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleVDADecoder.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,514 @@
+/* -*- 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 <CoreFoundation/CFString.h>
+
+#include "AppleUtils.h"
+#include "AppleVDADecoder.h"
+#include "AppleVDALinker.h"
+#include "MediaInfo.h"
+#include "mp4_demuxer/H264.h"
+#include "MP4Decoder.h"
+#include "MediaData.h"
+#include "MacIOSurfaceImage.h"
+#include "mozilla/ArrayUtils.h"
+#include "nsAutoPtr.h"
+#include "nsCocoaFeatures.h"
+#include "nsThreadUtils.h"
+#include "mozilla/Logging.h"
+#include "VideoUtils.h"
+#include <algorithm>
+#include "gfxPlatform.h"
+
+PRLogModuleInfo* GetAppleMediaLog();
+#define LOG(...) MOZ_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__))
+//#define LOG_MEDIA_SHA1
+
+namespace mozilla {
+
+AppleVDADecoder::AppleVDADecoder(const VideoInfo& aConfig,
+                               FlushableMediaTaskQueue* aVideoTaskQueue,
+                               MediaDataDecoderCallback* aCallback,
+                               layers::ImageContainer* aImageContainer)
+  : mTaskQueue(aVideoTaskQueue)
+  , mCallback(aCallback)
+  , mImageContainer(aImageContainer)
+  , mPictureWidth(aConfig.mImage.width)
+  , mPictureHeight(aConfig.mImage.height)
+  , mDisplayWidth(aConfig.mDisplay.width)
+  , mDisplayHeight(aConfig.mDisplay.height)
+  , mDecoder(nullptr)
+  , mIs106(!nsCocoaFeatures::OnLionOrLater())
+{
+  MOZ_COUNT_CTOR(AppleVDADecoder);
+  // TODO: Verify aConfig.mime_type.
+
+  mExtraData = aConfig.mExtraData;
+  mMaxRefFrames = 4;
+  // Retrieve video dimensions from H264 SPS NAL.
+  mp4_demuxer::SPSData spsdata;
+  if (mp4_demuxer::H264::DecodeSPSFromExtraData(mExtraData, spsdata)) {
+    // max_num_ref_frames determines the size of the sliding window
+    // we need to queue that many frames in order to guarantee proper
+    // pts frames ordering. Use a minimum of 4 to ensure proper playback of
+    // non compliant videos.
+    mMaxRefFrames =
+      std::min(std::max(mMaxRefFrames, spsdata.max_num_ref_frames + 1), 16u);
+  }
+
+  LOG("Creating AppleVDADecoder for %dx%d (%dx%d) h.264 video",
+      mPictureWidth,
+      mPictureHeight,
+      mDisplayWidth,
+      mDisplayHeight
+     );
+}
+
+AppleVDADecoder::~AppleVDADecoder()
+{
+  MOZ_COUNT_DTOR(AppleVDADecoder);
+}
+
+nsresult
+AppleVDADecoder::Init()
+{
+  if (!gfxPlatform::CanUseHardwareVideoDecoding()) {
+    // This GPU is blacklisted for hardware decoding.
+    return NS_ERROR_FAILURE;
+  }
+
+  if (mDecoder) {
+    return NS_OK;
+  }
+  nsresult rv = InitializeSession();
+  return rv;
+}
+
+nsresult
+AppleVDADecoder::Shutdown()
+{
+  if (mDecoder) {
+    LOG("%s: cleaning up decoder %p", __func__, mDecoder);
+    VDADecoderDestroy(mDecoder);
+    mDecoder = nullptr;
+  }
+  return NS_OK;
+}
+
+nsresult
+AppleVDADecoder::Input(MediaRawData* aSample)
+{
+  LOG("mp4 input sample %p pts %lld duration %lld us%s %d bytes",
+      aSample,
+      aSample->mTime,
+      aSample->mDuration,
+      aSample->mKeyframe ? " keyframe" : "",
+      aSample->mSize);
+
+  nsCOMPtr<nsIRunnable> runnable =
+      NS_NewRunnableMethodWithArg<nsRefPtr<MediaRawData>>(
+          this,
+          &AppleVDADecoder::SubmitFrame,
+          nsRefPtr<MediaRawData>(aSample));
+  mTaskQueue->Dispatch(runnable.forget());
+  return NS_OK;
+}
+
+nsresult
+AppleVDADecoder::Flush()
+{
+  mTaskQueue->Flush();
+  OSStatus rv = VDADecoderFlush(mDecoder, 0 /*dont emit*/);
+  if (rv != noErr) {
+    LOG("AppleVDADecoder::Flush failed waiting for platform decoder "
+        "with error:%d.", rv);
+  }
+  ClearReorderedFrames();
+
+  return NS_OK;
+}
+
+nsresult
+AppleVDADecoder::Drain()
+{
+  mTaskQueue->AwaitIdle();
+  OSStatus rv = VDADecoderFlush(mDecoder, kVDADecoderFlush_EmitFrames);
+  if (rv != noErr) {
+    LOG("AppleVDADecoder::Drain failed waiting for platform decoder "
+        "with error:%d.", rv);
+  }
+  DrainReorderedFrames();
+  mCallback->DrainComplete();
+  return NS_OK;
+}
+
+//
+// Implementation details.
+//
+
+// Callback passed to the VideoToolbox decoder for returning data.
+// This needs to be static because the API takes a C-style pair of
+// function and userdata pointers. This validates parameters and
+// forwards the decoded image back to an object method.
+static void
+PlatformCallback(void* decompressionOutputRefCon,
+                 CFDictionaryRef frameInfo,
+                 OSStatus status,
+                 VDADecodeInfoFlags infoFlags,
+                 CVImageBufferRef image)
+{
+  LOG("AppleVDADecoder[%s] status %d flags %d retainCount %ld",
+      __func__, status, infoFlags, CFGetRetainCount(frameInfo));
+
+  // Validate our arguments.
+  // According to Apple's TN2267
+  // The output callback is still called for all flushed frames,
+  // but no image buffers will be returned.
+  // FIXME: Distinguish between errors and empty flushed frames.
+  if (status != noErr || !image) {
+    NS_WARNING("AppleVDADecoder decoder returned no data");
+    return;
+  }
+  MOZ_ASSERT(CFGetTypeID(image) == CVPixelBufferGetTypeID(),
+             "AppleVDADecoder returned an unexpected image type");
+
+  if (infoFlags & kVDADecodeInfo_FrameDropped)
+  {
+    NS_WARNING("  ...frame dropped...");
+    return;
+  }
+
+  AppleVDADecoder* decoder =
+    static_cast<AppleVDADecoder*>(decompressionOutputRefCon);
+
+  AutoCFRelease<CFNumberRef> ptsref =
+    (CFNumberRef)CFDictionaryGetValue(frameInfo, CFSTR("FRAME_PTS"));
+  AutoCFRelease<CFNumberRef> dtsref =
+    (CFNumberRef)CFDictionaryGetValue(frameInfo, CFSTR("FRAME_DTS"));
+  AutoCFRelease<CFNumberRef> durref =
+    (CFNumberRef)CFDictionaryGetValue(frameInfo, CFSTR("FRAME_DURATION"));
+  AutoCFRelease<CFNumberRef> boref =
+    (CFNumberRef)CFDictionaryGetValue(frameInfo, CFSTR("FRAME_OFFSET"));
+  AutoCFRelease<CFNumberRef> kfref =
+    (CFNumberRef)CFDictionaryGetValue(frameInfo, CFSTR("FRAME_KEYFRAME"));
+
+  Microseconds dts;
+  Microseconds pts;
+  Microseconds duration;
+  int64_t byte_offset;
+  char is_sync_point;
+
+  CFNumberGetValue(ptsref, kCFNumberSInt64Type, &pts);
+  CFNumberGetValue(dtsref, kCFNumberSInt64Type, &dts);
+  CFNumberGetValue(durref, kCFNumberSInt64Type, &duration);
+  CFNumberGetValue(boref, kCFNumberSInt64Type, &byte_offset);
+  CFNumberGetValue(kfref, kCFNumberSInt8Type, &is_sync_point);
+
+  nsAutoPtr<AppleVDADecoder::AppleFrameRef> frameRef(
+    new AppleVDADecoder::AppleFrameRef(dts,
+    pts,
+    duration,
+    byte_offset,
+    is_sync_point == 1));
+
+  // Forward the data back to an object method which can access
+  // the correct MP4Reader callback.
+  decoder->OutputFrame(image, frameRef);
+}
+
+AppleVDADecoder::AppleFrameRef*
+AppleVDADecoder::CreateAppleFrameRef(const MediaRawData* aSample)
+{
+  MOZ_ASSERT(aSample);
+  return new AppleFrameRef(*aSample);
+}
+
+void
+AppleVDADecoder::DrainReorderedFrames()
+{
+  while (!mReorderQueue.IsEmpty()) {
+    mCallback->Output(mReorderQueue.Pop());
+  }
+}
+
+void
+AppleVDADecoder::ClearReorderedFrames()
+{
+  while (!mReorderQueue.IsEmpty()) {
+    mReorderQueue.Pop();
+  }
+}
+
+// Copy and return a decoded frame.
+nsresult
+AppleVDADecoder::OutputFrame(CVPixelBufferRef aImage,
+                             nsAutoPtr<AppleVDADecoder::AppleFrameRef> aFrameRef)
+{
+  IOSurfacePtr surface = MacIOSurfaceLib::CVPixelBufferGetIOSurface(aImage);
+  MOZ_ASSERT(surface, "Decoder didn't return an IOSurface backed buffer");
+
+  LOG("mp4 output frame %lld dts %lld pts %lld duration %lld us%s",
+    aFrameRef->byte_offset,
+    aFrameRef->decode_timestamp,
+    aFrameRef->composition_timestamp,
+    aFrameRef->duration,
+    aFrameRef->is_sync_point ? " keyframe" : ""
+  );
+
+  nsRefPtr<MacIOSurface> macSurface = new MacIOSurface(surface);
+  // Bounds.
+  VideoInfo info;
+  info.mDisplay = nsIntSize(mDisplayWidth, mDisplayHeight);
+  gfx::IntRect visible = gfx::IntRect(0,
+                                      0,
+                                      mPictureWidth,
+                                      mPictureHeight);
+
+  nsRefPtr<layers::Image> image =
+    mImageContainer->CreateImage(ImageFormat::MAC_IOSURFACE);
+  layers::MacIOSurfaceImage* videoImage =
+    static_cast<layers::MacIOSurfaceImage*>(image.get());
+  videoImage->SetSurface(macSurface);
+
+  nsRefPtr<VideoData> data;
+  data = VideoData::CreateFromImage(info,
+                                    mImageContainer,
+                                    aFrameRef->byte_offset,
+                                    aFrameRef->composition_timestamp,
+                                    aFrameRef->duration, image.forget(),
+                                    aFrameRef->is_sync_point,
+                                    aFrameRef->decode_timestamp,
+                                    visible);
+
+  if (!data) {
+    NS_ERROR("Couldn't create VideoData for frame");
+    mCallback->Error();
+    return NS_ERROR_FAILURE;
+  }
+
+  // Frames come out in DTS order but we need to output them
+  // in composition order.
+  mReorderQueue.Push(data);
+  while (mReorderQueue.Length() > mMaxRefFrames) {
+    mCallback->Output(mReorderQueue.Pop());
+  }
+  LOG("%llu decoded frames queued",
+      static_cast<unsigned long long>(mReorderQueue.Length()));
+
+  return NS_OK;
+}
+
+nsresult
+AppleVDADecoder::SubmitFrame(MediaRawData* aSample)
+{
+  AutoCFRelease<CFDataRef> block =
+    CFDataCreate(kCFAllocatorDefault, aSample->mData, aSample->mSize);
+  if (!block) {
+    NS_ERROR("Couldn't create CFData");
+    return NS_ERROR_FAILURE;
+  }
+
+  AutoCFRelease<CFNumberRef> pts =
+    CFNumberCreate(kCFAllocatorDefault,
+                   kCFNumberSInt64Type,
+                   &aSample->mTime);
+  AutoCFRelease<CFNumberRef> dts =
+    CFNumberCreate(kCFAllocatorDefault,
+                   kCFNumberSInt64Type,
+                   &aSample->mTimecode);
+  AutoCFRelease<CFNumberRef> duration =
+    CFNumberCreate(kCFAllocatorDefault,
+                   kCFNumberSInt64Type,
+                   &aSample->mDuration);
+  AutoCFRelease<CFNumberRef> byte_offset =
+    CFNumberCreate(kCFAllocatorDefault,
+                   kCFNumberSInt64Type,
+                   &aSample->mOffset);
+  char keyframe = aSample->mKeyframe ? 1 : 0;
+  AutoCFRelease<CFNumberRef> cfkeyframe =
+    CFNumberCreate(kCFAllocatorDefault,
+                   kCFNumberSInt8Type,
+                   &keyframe);
+
+  const void* keys[] = { CFSTR("FRAME_PTS"),
+                         CFSTR("FRAME_DTS"),
+                         CFSTR("FRAME_DURATION"),
+                         CFSTR("FRAME_OFFSET"),
+                         CFSTR("FRAME_KEYFRAME") };
+  const void* values[] = { pts,
+                           dts,
+                           duration,
+                           byte_offset,
+                           cfkeyframe };
+  static_assert(ArrayLength(keys) == ArrayLength(values),
+                "Non matching keys/values array size");
+
+  AutoCFRelease<CFDictionaryRef> frameInfo =
+    CFDictionaryCreate(kCFAllocatorDefault,
+                       keys,
+                       values,
+                       ArrayLength(keys),
+                       &kCFTypeDictionaryKeyCallBacks,
+                       &kCFTypeDictionaryValueCallBacks);
+
+  OSStatus rv = VDADecoderDecode(mDecoder,
+                                 0,
+                                 block,
+                                 frameInfo);
+
+  if (rv != noErr) {
+    NS_WARNING("AppleVDADecoder: Couldn't pass frame to decoder");
+    mCallback->Error();
+    return NS_ERROR_FAILURE;
+  }
+
+  if (mIs106) {
+    // TN2267:
+    // frameInfo: A CFDictionaryRef containing information to be returned in
+    // the output callback for this frame.
+    // This dictionary can contain client provided information associated with
+    // the frame being decoded, for example presentation time.
+    // The CFDictionaryRef will be retained by the framework.
+    // In 10.6, it is released one too many. So retain it.
+    CFRetain(frameInfo);
+  }
+
+  // Ask for more data.
+  if (mTaskQueue->IsEmpty()) {
+    LOG("AppleVDADecoder task queue empty; requesting more data");
+    mCallback->InputExhausted();
+  }
+
+  return NS_OK;
+}
+
+nsresult
+AppleVDADecoder::InitializeSession()
+{
+  OSStatus rv;
+
+  AutoCFRelease<CFDictionaryRef> decoderConfig =
+    CreateDecoderSpecification();
+
+  AutoCFRelease<CFDictionaryRef> outputConfiguration =
+    CreateOutputConfiguration();
+
+  rv =
+    VDADecoderCreate(decoderConfig,
+                     outputConfiguration,
+                     (VDADecoderOutputCallback*)PlatformCallback,
+                     this,
+                     &mDecoder);
+
+  if (rv != noErr) {
+    NS_WARNING("AppleVDADecoder: Couldn't create hardware VDA decoder");
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+CFDictionaryRef
+AppleVDADecoder::CreateDecoderSpecification()
+{
+  const uint8_t* extradata = mExtraData->Elements();
+  int extrasize = mExtraData->Length();
+
+  OSType format = 'avc1';
+  AutoCFRelease<CFNumberRef> avc_width  =
+    CFNumberCreate(kCFAllocatorDefault,
+                   kCFNumberSInt32Type,
+                   &mPictureWidth);
+  AutoCFRelease<CFNumberRef> avc_height =
+    CFNumberCreate(kCFAllocatorDefault,
+                   kCFNumberSInt32Type,
+                   &mPictureHeight);
+  AutoCFRelease<CFNumberRef> avc_format =
+    CFNumberCreate(kCFAllocatorDefault,
+                   kCFNumberSInt32Type,
+                   &format);
+  AutoCFRelease<CFDataRef> avc_data =
+    CFDataCreate(kCFAllocatorDefault,
+                 extradata,
+                 extrasize);
+
+  const void* decoderKeys[] = { AppleVDALinker::skPropWidth,
+                                AppleVDALinker::skPropHeight,
+                                AppleVDALinker::skPropSourceFormat,
+                                AppleVDALinker::skPropAVCCData };
+  const void* decoderValue[] = { avc_width,
+                                 avc_height,
+                                 avc_format,
+                                 avc_data };
+  static_assert(ArrayLength(decoderKeys) == ArrayLength(decoderValue),
+                "Non matching keys/values array size");
+
+  return CFDictionaryCreate(kCFAllocatorDefault,
+                            decoderKeys,
+                            decoderValue,
+                            ArrayLength(decoderKeys),
+                            &kCFTypeDictionaryKeyCallBacks,
+                            &kCFTypeDictionaryValueCallBacks);
+}
+
+CFDictionaryRef
+AppleVDADecoder::CreateOutputConfiguration()
+{
+  // Construct IOSurface Properties
+  const void* IOSurfaceKeys[] = { MacIOSurfaceLib::kPropIsGlobal };
+  const void* IOSurfaceValues[] = { kCFBooleanTrue };
+  static_assert(ArrayLength(IOSurfaceKeys) == ArrayLength(IOSurfaceValues),
+                "Non matching keys/values array size");
+
+  // Contruct output configuration.
+  AutoCFRelease<CFDictionaryRef> IOSurfaceProperties =
+    CFDictionaryCreate(kCFAllocatorDefault,
+                       IOSurfaceKeys,
+                       IOSurfaceValues,
+                       ArrayLength(IOSurfaceKeys),
+                       &kCFTypeDictionaryKeyCallBacks,
+                       &kCFTypeDictionaryValueCallBacks);
+
+  SInt32 PixelFormatTypeValue = kCVPixelFormatType_32BGRA;
+  AutoCFRelease<CFNumberRef> PixelFormatTypeNumber =
+    CFNumberCreate(kCFAllocatorDefault,
+                   kCFNumberSInt32Type,
+                   &PixelFormatTypeValue);
+
+  const void* outputKeys[] = { kCVPixelBufferIOSurfacePropertiesKey,
+                               kCVPixelBufferPixelFormatTypeKey,
+                               kCVPixelBufferOpenGLCompatibilityKey };
+  const void* outputValues[] = { IOSurfaceProperties,
+                                 PixelFormatTypeNumber,
+                                 kCFBooleanTrue };
+  static_assert(ArrayLength(outputKeys) == ArrayLength(outputValues),
+                "Non matching keys/values array size");
+
+  return CFDictionaryCreate(kCFAllocatorDefault,
+                            outputKeys,
+                            outputValues,
+                            ArrayLength(outputKeys),
+                            &kCFTypeDictionaryKeyCallBacks,
+                            &kCFTypeDictionaryValueCallBacks);
+}
+
+/* static */
+already_AddRefed<AppleVDADecoder>
+AppleVDADecoder::CreateVDADecoder(
+  const VideoInfo& aConfig,
+  FlushableMediaTaskQueue* aVideoTaskQueue,
+  MediaDataDecoderCallback* aCallback,
+  layers::ImageContainer* aImageContainer)
+{
+  nsRefPtr<AppleVDADecoder> decoder =
+    new AppleVDADecoder(aConfig, aVideoTaskQueue, aCallback, aImageContainer);
+  if (NS_FAILED(decoder->Init())) {
+    return nullptr;
+  }
+  return decoder.forget();
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleVDADecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleVDADecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleVDADecoder.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleVDADecoder.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,116 @@
+/* -*- 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_AppleVDADecoder_h
+#define mozilla_AppleVDADecoder_h
+
+#include "PlatformDecoderModule.h"
+#include "mozilla/ReentrantMonitor.h"
+#include "MP4Reader.h"
+#include "MP4Decoder.h"
+#include "nsIThread.h"
+#include "ReorderQueue.h"
+
+#include "VideoDecodeAcceleration/VDADecoder.h"
+
+namespace mozilla {
+
+class FlushableMediaTaskQueue;
+class MediaDataDecoderCallback;
+namespace layers {
+  class ImageContainer;
+}
+
+class AppleVDADecoder : public MediaDataDecoder {
+public:
+  class AppleFrameRef {
+  public:
+    Microseconds decode_timestamp;
+    Microseconds composition_timestamp;
+    Microseconds duration;
+    int64_t byte_offset;
+    bool is_sync_point;
+
+    explicit AppleFrameRef(const MediaRawData& aSample)
+      : decode_timestamp(aSample.mTimecode)
+      , composition_timestamp(aSample.mTime)
+      , duration(aSample.mDuration)
+      , byte_offset(aSample.mOffset)
+      , is_sync_point(aSample.mKeyframe)
+    {
+    }
+
+    AppleFrameRef(Microseconds aDts,
+                  Microseconds aPts,
+                  Microseconds aDuration,
+                  int64_t aByte_offset,
+                  bool aIs_sync_point)
+      : decode_timestamp(aDts)
+      , composition_timestamp(aPts)
+      , duration(aDuration)
+      , byte_offset(aByte_offset)
+      , is_sync_point(aIs_sync_point)
+    {
+    }
+  };
+
+  // Return a new created AppleVDADecoder or nullptr if media or hardware is
+  // not supported by current configuration.
+  static already_AddRefed<AppleVDADecoder> CreateVDADecoder(
+    const VideoInfo& aConfig,
+    FlushableMediaTaskQueue* aVideoTaskQueue,
+    MediaDataDecoderCallback* aCallback,
+    layers::ImageContainer* aImageContainer);
+
+  AppleVDADecoder(const VideoInfo& aConfig,
+                  FlushableMediaTaskQueue* aVideoTaskQueue,
+                  MediaDataDecoderCallback* aCallback,
+                  layers::ImageContainer* aImageContainer);
+  virtual ~AppleVDADecoder();
+  virtual nsresult Init() override;
+  virtual nsresult Input(MediaRawData* aSample) override;
+  virtual nsresult Flush() override;
+  virtual nsresult Drain() override;
+  virtual nsresult Shutdown() override;
+  virtual bool IsHardwareAccelerated() const override
+  {
+    return true;
+  }
+
+  nsresult OutputFrame(CVPixelBufferRef aImage,
+                       nsAutoPtr<AppleFrameRef> aFrameRef);
+
+ protected:
+  AppleFrameRef* CreateAppleFrameRef(const MediaRawData* aSample);
+  void DrainReorderedFrames();
+  void ClearReorderedFrames();
+  CFDictionaryRef CreateOutputConfiguration();
+
+  nsRefPtr<MediaByteBuffer> mExtraData;
+  nsRefPtr<FlushableMediaTaskQueue> mTaskQueue;
+  MediaDataDecoderCallback* mCallback;
+  nsRefPtr<layers::ImageContainer> mImageContainer;
+  ReorderQueue mReorderQueue;
+  uint32_t mPictureWidth;
+  uint32_t mPictureHeight;
+  uint32_t mDisplayWidth;
+  uint32_t mDisplayHeight;
+  uint32_t mMaxRefFrames;
+
+private:
+  VDADecoder mDecoder;
+  bool mIs106;
+
+  // Method to pass a frame to VideoToolbox for decoding.
+  nsresult SubmitFrame(MediaRawData* aSample);
+  // Method to set up the decompression session.
+  nsresult InitializeSession();
+  CFDictionaryRef CreateDecoderSpecification();
+};
+
+} // namespace mozilla
+
+#endif // mozilla_AppleVDADecoder_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleVDAFunctions.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleVDAFunctions.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleVDAFunctions.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleVDAFunctions.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,12 @@
+/* -*- 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/. */
+
+// Construct references to each of the VDA symbols we use.
+
+LINK_FUNC(VDADecoderCreate)
+LINK_FUNC(VDADecoderDecode)
+LINK_FUNC(VDADecoderFlush)
+LINK_FUNC(VDADecoderDestroy)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleVDALinker.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleVDALinker.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleVDALinker.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleVDALinker.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,119 @@
+/* -*- 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 <dlfcn.h>
+
+#include "AppleVDALinker.h"
+#include "MainThreadUtils.h"
+#include "nsDebug.h"
+
+PRLogModuleInfo* GetAppleMediaLog();
+#define LOG(...) MOZ_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__))
+
+namespace mozilla {
+
+AppleVDALinker::LinkStatus
+AppleVDALinker::sLinkStatus = LinkStatus_INIT;
+
+void* AppleVDALinker::sLink = nullptr;
+nsrefcnt AppleVDALinker::sRefCount = 0;
+CFStringRef AppleVDALinker::skPropWidth = nullptr;
+CFStringRef AppleVDALinker::skPropHeight = nullptr;
+CFStringRef AppleVDALinker::skPropSourceFormat = nullptr;
+CFStringRef AppleVDALinker::skPropAVCCData = nullptr;
+
+#define LINK_FUNC(func) typeof(func) func;
+#include "AppleVDAFunctions.h"
+#undef LINK_FUNC
+
+/* static */ bool
+AppleVDALinker::Link()
+{
+  // Bump our reference count every time we're called.
+  // Add a lock or change the thread assertion if
+  // you need to call this off the main thread.
+  MOZ_ASSERT(NS_IsMainThread());
+  ++sRefCount;
+
+  if (sLinkStatus) {
+    return sLinkStatus == LinkStatus_SUCCEEDED;
+  }
+
+  const char* dlname =
+    "/System/Library/Frameworks/VideoDecodeAcceleration.framework/VideoDecodeAcceleration";
+
+  if (!(sLink = dlopen(dlname, RTLD_NOW | RTLD_LOCAL))) {
+    NS_WARNING("Couldn't load VideoDecodeAcceleration framework");
+    goto fail;
+  }
+
+#define LINK_FUNC(func)                                                   \
+  func = (typeof(func))dlsym(sLink, #func);                               \
+  if (!func) {                                                            \
+    NS_WARNING("Couldn't load VideoDecodeAcceleration function " #func ); \
+    goto fail;                                                            \
+  }
+#include "AppleVDAFunctions.h"
+#undef LINK_FUNC
+
+  skPropWidth = GetIOConst("kVDADecoderConfiguration_Width");
+  skPropHeight = GetIOConst("kVDADecoderConfiguration_Height");
+  skPropSourceFormat = GetIOConst("kVDADecoderConfiguration_SourceFormat");
+  skPropAVCCData = GetIOConst("kVDADecoderConfiguration_avcCData");
+
+  if (!skPropWidth || !skPropHeight || !skPropSourceFormat || !skPropAVCCData) {
+    goto fail;
+  }
+
+  LOG("Loaded VideoDecodeAcceleration framework.");
+  sLinkStatus = LinkStatus_SUCCEEDED;
+  return true;
+
+fail:
+  Unlink();
+
+  sLinkStatus = LinkStatus_FAILED;
+  return false;
+}
+
+/* static */ void
+AppleVDALinker::Unlink()
+{
+  // We'll be called by multiple Decoders, one intantiated for
+  // each media element. Therefore we receive must maintain a
+  // reference count to avoidunloading our symbols when other
+  // instances still need them.
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(sRefCount > 0, "Unbalanced Unlink()");
+  --sRefCount;
+  if (sLink && sRefCount < 1) {
+    LOG("Unlinking VideoDecodeAcceleration framework.");
+#define LINK_FUNC(func)                                                   \
+    func = nullptr;
+#include "AppleVDAFunctions.h"
+#undef LINK_FUNC
+    dlclose(sLink);
+    sLink = nullptr;
+    skPropWidth = nullptr;
+    skPropHeight = nullptr;
+    skPropSourceFormat = nullptr;
+    skPropAVCCData = nullptr;
+    sLinkStatus = LinkStatus_INIT;
+  }
+}
+
+/* static */ CFStringRef
+AppleVDALinker::GetIOConst(const char* symbol)
+{
+  CFStringRef* address = (CFStringRef*)dlsym(sLink, symbol);
+  if (!address) {
+    return nullptr;
+  }
+
+  return *address;
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleVDALinker.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleVDALinker.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleVDALinker.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleVDALinker.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,49 @@
+/* -*- 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 AppleVDALinker_h
+#define AppleVDALinker_h
+
+extern "C" {
+#pragma GCC visibility push(default)
+#include "VideoDecodeAcceleration/VDADecoder.h"
+#pragma GCC visibility pop
+}
+
+#include "nscore.h"
+
+namespace mozilla {
+
+class AppleVDALinker
+{
+public:
+  static bool Link();
+  static void Unlink();
+  static CFStringRef skPropWidth;
+  static CFStringRef skPropHeight;
+  static CFStringRef skPropSourceFormat;
+  static CFStringRef skPropAVCCData;
+
+private:
+  static void* sLink;
+  static nsrefcnt sRefCount;
+
+  static enum LinkStatus {
+    LinkStatus_INIT = 0,
+    LinkStatus_FAILED,
+    LinkStatus_SUCCEEDED
+  } sLinkStatus;
+
+  static CFStringRef GetIOConst(const char* symbol);
+};
+
+#define LINK_FUNC(func) extern typeof(func)* func;
+#include "AppleVDAFunctions.h"
+#undef LINK_FUNC
+
+} // namespace mozilla
+
+#endif // AppleVDALinker_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleVTDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleVTDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleVTDecoder.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleVTDecoder.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,400 @@
+/* -*- 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 <CoreFoundation/CFString.h>
+
+#include "AppleCMLinker.h"
+#include "AppleUtils.h"
+#include "AppleVTDecoder.h"
+#include "AppleVTLinker.h"
+#include "mp4_demuxer/H264.h"
+#include "MediaData.h"
+#include "MacIOSurfaceImage.h"
+#include "mozilla/ArrayUtils.h"
+#include "nsAutoPtr.h"
+#include "nsThreadUtils.h"
+#include "mozilla/Logging.h"
+#include "VideoUtils.h"
+#include "gfxPlatform.h"
+
+PRLogModuleInfo* GetAppleMediaLog();
+#define LOG(...) MOZ_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__))
+//#define LOG_MEDIA_SHA1
+
+#ifdef LOG_MEDIA_SHA1
+#include "mozilla/SHA1.h"
+#endif
+
+namespace mozilla {
+
+AppleVTDecoder::AppleVTDecoder(const VideoInfo& aConfig,
+                               FlushableMediaTaskQueue* aVideoTaskQueue,
+                               MediaDataDecoderCallback* aCallback,
+                               layers::ImageContainer* aImageContainer)
+  : AppleVDADecoder(aConfig, aVideoTaskQueue, aCallback, aImageContainer)
+  , mFormat(nullptr)
+  , mSession(nullptr)
+  , mIsHardwareAccelerated(false)
+{
+  MOZ_COUNT_CTOR(AppleVTDecoder);
+  // TODO: Verify aConfig.mime_type.
+  LOG("Creating AppleVTDecoder for %dx%d h.264 video",
+      mDisplayWidth,
+      mDisplayHeight
+     );
+}
+
+AppleVTDecoder::~AppleVTDecoder()
+{
+  MOZ_COUNT_DTOR(AppleVTDecoder);
+}
+
+nsresult
+AppleVTDecoder::Init()
+{
+  nsresult rv = InitializeSession();
+  return rv;
+}
+
+nsresult
+AppleVTDecoder::Shutdown()
+{
+  if (mSession) {
+    LOG("%s: cleaning up session %p", __func__, mSession);
+    VTDecompressionSessionInvalidate(mSession);
+    CFRelease(mSession);
+    mSession = nullptr;
+  }
+  if (mFormat) {
+    LOG("%s: releasing format %p", __func__, mFormat);
+    CFRelease(mFormat);
+    mFormat = nullptr;
+  }
+  return NS_OK;
+}
+
+nsresult
+AppleVTDecoder::Input(MediaRawData* aSample)
+{
+  LOG("mp4 input sample %p pts %lld duration %lld us%s %d bytes",
+      aSample,
+      aSample->mTime,
+      aSample->mDuration,
+      aSample->mKeyframe ? " keyframe" : "",
+      aSample->mSize);
+
+#ifdef LOG_MEDIA_SHA1
+  SHA1Sum hash;
+  hash.update(aSample->data, aSample->size);
+  uint8_t digest_buf[SHA1Sum::kHashSize];
+  hash.finish(digest_buf);
+  nsAutoCString digest;
+  for (size_t i = 0; i < sizeof(digest_buf); i++) {
+    digest.AppendPrintf("%02x", digest_buf[i]);
+  }
+  LOG("    sha1 %s", digest.get());
+#endif // LOG_MEDIA_SHA1
+
+  nsCOMPtr<nsIRunnable> runnable =
+      NS_NewRunnableMethodWithArg<nsRefPtr<MediaRawData>>(
+          this,
+          &AppleVTDecoder::SubmitFrame,
+          nsRefPtr<MediaRawData>(aSample));
+  mTaskQueue->Dispatch(runnable.forget());
+  return NS_OK;
+}
+
+nsresult
+AppleVTDecoder::Flush()
+{
+  mTaskQueue->Flush();
+  nsresult rv = WaitForAsynchronousFrames();
+  if (NS_FAILED(rv)) {
+    LOG("AppleVTDecoder::Flush failed waiting for platform decoder "
+        "with error:%d.", rv);
+  }
+  ClearReorderedFrames();
+
+  return rv;
+}
+
+nsresult
+AppleVTDecoder::Drain()
+{
+  mTaskQueue->AwaitIdle();
+  nsresult rv = WaitForAsynchronousFrames();
+  if (NS_FAILED(rv)) {
+    LOG("AppleVTDecoder::Drain failed waiting for platform decoder "
+        "with error:%d.", rv);
+  }
+  DrainReorderedFrames();
+  mCallback->DrainComplete();
+  return NS_OK;
+}
+
+//
+// Implementation details.
+//
+
+// Callback passed to the VideoToolbox decoder for returning data.
+// This needs to be static because the API takes a C-style pair of
+// function and userdata pointers. This validates parameters and
+// forwards the decoded image back to an object method.
+static void
+PlatformCallback(void* decompressionOutputRefCon,
+                 void* sourceFrameRefCon,
+                 OSStatus status,
+                 VTDecodeInfoFlags flags,
+                 CVImageBufferRef image,
+                 CMTime presentationTimeStamp,
+                 CMTime presentationDuration)
+{
+  LOG("AppleVideoDecoder %s status %d flags %d", __func__, status, flags);
+
+  AppleVTDecoder* decoder =
+    static_cast<AppleVTDecoder*>(decompressionOutputRefCon);
+  nsAutoPtr<AppleVTDecoder::AppleFrameRef> frameRef(
+    static_cast<AppleVTDecoder::AppleFrameRef*>(sourceFrameRefCon));
+
+  // Validate our arguments.
+  if (status != noErr || !image) {
+    NS_WARNING("VideoToolbox decoder returned no data");
+    return;
+  }
+  if (flags & kVTDecodeInfo_FrameDropped) {
+    NS_WARNING("  ...frame tagged as dropped...");
+  }
+  MOZ_ASSERT(CFGetTypeID(image) == CVPixelBufferGetTypeID(),
+    "VideoToolbox returned an unexpected image type");
+
+  // Forward the data back to an object method which can access
+  // the correct MP4Reader callback.
+  decoder->OutputFrame(image, frameRef);
+}
+
+nsresult
+AppleVTDecoder::WaitForAsynchronousFrames()
+{
+  OSStatus rv = VTDecompressionSessionWaitForAsynchronousFrames(mSession);
+  if (rv != noErr) {
+    LOG("AppleVTDecoder: Error %d waiting for asynchronous frames", rv);
+    return NS_ERROR_FAILURE;
+  }
+  return NS_OK;
+}
+
+// Helper to fill in a timestamp structure.
+static CMSampleTimingInfo
+TimingInfoFromSample(MediaRawData* aSample)
+{
+  CMSampleTimingInfo timestamp;
+
+  timestamp.duration = CMTimeMake(aSample->mDuration, USECS_PER_S);
+  timestamp.presentationTimeStamp =
+    CMTimeMake(aSample->mTime, USECS_PER_S);
+  timestamp.decodeTimeStamp =
+    CMTimeMake(aSample->mTimecode, USECS_PER_S);
+
+  return timestamp;
+}
+
+nsresult
+AppleVTDecoder::SubmitFrame(MediaRawData* aSample)
+{
+  // For some reason this gives me a double-free error with stagefright.
+  AutoCFRelease<CMBlockBufferRef> block = nullptr;
+  AutoCFRelease<CMSampleBufferRef> sample = nullptr;
+  VTDecodeInfoFlags infoFlags;
+  OSStatus rv;
+
+  // FIXME: This copies the sample data. I think we can provide
+  // a custom block source which reuses the aSample buffer.
+  // But note that there may be a problem keeping the samples
+  // alive over multiple frames.
+  rv = CMBlockBufferCreateWithMemoryBlock(kCFAllocatorDefault, // Struct allocator.
+                                          const_cast<uint8_t*>(aSample->mData),
+                                          aSample->mSize,
+                                          kCFAllocatorNull, // Block allocator.
+                                          NULL, // Block source.
+                                          0,    // Data offset.
+                                          aSample->mSize,
+                                          false,
+                                          block.receive());
+  if (rv != noErr) {
+    NS_ERROR("Couldn't create CMBlockBuffer");
+    return NS_ERROR_FAILURE;
+  }
+  CMSampleTimingInfo timestamp = TimingInfoFromSample(aSample);
+  rv = CMSampleBufferCreate(kCFAllocatorDefault, block, true, 0, 0, mFormat, 1, 1, &timestamp, 0, NULL, sample.receive());
+  if (rv != noErr) {
+    NS_ERROR("Couldn't create CMSampleBuffer");
+    return NS_ERROR_FAILURE;
+  }
+
+  VTDecodeFrameFlags decodeFlags =
+    kVTDecodeFrame_EnableAsynchronousDecompression;
+  rv = VTDecompressionSessionDecodeFrame(mSession,
+                                         sample,
+                                         decodeFlags,
+                                         CreateAppleFrameRef(aSample),
+                                         &infoFlags);
+  if (rv != noErr && !(infoFlags & kVTDecodeInfo_FrameDropped)) {
+    LOG("AppleVTDecoder: Error %d VTDecompressionSessionDecodeFrame", rv);
+    NS_WARNING("Couldn't pass frame to decoder");
+    mCallback->Error();
+    return NS_ERROR_FAILURE;
+  }
+
+  // Ask for more data.
+  if (mTaskQueue->IsEmpty()) {
+    LOG("AppleVTDecoder task queue empty; requesting more data");
+    mCallback->InputExhausted();
+  }
+
+  return NS_OK;
+}
+
+nsresult
+AppleVTDecoder::InitializeSession()
+{
+  OSStatus rv;
+
+#ifdef LOG_MEDIA_SHA1
+  SHA1Sum avc_hash;
+  avc_hash.update(mExtraData->Elements(),mExtraData->Length());
+  uint8_t digest_buf[SHA1Sum::kHashSize];
+  avc_hash.finish(digest_buf);
+  nsAutoCString avc_digest;
+  for (size_t i = 0; i < sizeof(digest_buf); i++) {
+    avc_digest.AppendPrintf("%02x", digest_buf[i]);
+  }
+  LOG("AVCDecoderConfig %ld bytes sha1 %s",
+      mExtraData->Length(), avc_digest.get());
+#endif // LOG_MEDIA_SHA1
+
+  AutoCFRelease<CFDictionaryRef> extensions = CreateDecoderExtensions();
+
+  rv = CMVideoFormatDescriptionCreate(kCFAllocatorDefault,
+                                      kCMVideoCodecType_H264,
+                                      mPictureWidth,
+                                      mPictureHeight,
+                                      extensions,
+                                      &mFormat);
+  if (rv != noErr) {
+    NS_ERROR("Couldn't create format description!");
+    return NS_ERROR_FAILURE;
+  }
+
+  // Contruct video decoder selection spec.
+  AutoCFRelease<CFDictionaryRef> spec = CreateDecoderSpecification();
+
+  // Contruct output configuration.
+  AutoCFRelease<CFDictionaryRef> outputConfiguration =
+    CreateOutputConfiguration();
+
+  VTDecompressionOutputCallbackRecord cb = { PlatformCallback, this };
+  rv = VTDecompressionSessionCreate(kCFAllocatorDefault,
+                                    mFormat,
+                                    spec, // Video decoder selection.
+                                    outputConfiguration, // Output video format.
+                                    &cb,
+                                    &mSession);
+
+  if (rv != noErr) {
+    NS_ERROR("Couldn't create decompression session!");
+    return NS_ERROR_FAILURE;
+  }
+
+  if (AppleVTLinker::skPropUsingHWAccel) {
+    CFBooleanRef isUsingHW = nullptr;
+    rv = VTSessionCopyProperty(mSession,
+                               AppleVTLinker::skPropUsingHWAccel,
+                               kCFAllocatorDefault,
+                               &isUsingHW);
+    if (rv != noErr) {
+      LOG("AppleVTDecoder: system doesn't support hardware acceleration");
+    }
+    mIsHardwareAccelerated = rv == noErr && isUsingHW == kCFBooleanTrue;
+    LOG("AppleVTDecoder: %s hardware accelerated decoding",
+        mIsHardwareAccelerated ? "using" : "not using");
+  } else {
+    LOG("AppleVTDecoder: couldn't determine hardware acceleration status.");
+  }
+  return NS_OK;
+}
+
+CFDictionaryRef
+AppleVTDecoder::CreateDecoderExtensions()
+{
+  AutoCFRelease<CFDataRef> avc_data =
+    CFDataCreate(kCFAllocatorDefault,
+                 mExtraData->Elements(),
+                 mExtraData->Length());
+
+  const void* atomsKey[] = { CFSTR("avcC") };
+  const void* atomsValue[] = { avc_data };
+  static_assert(ArrayLength(atomsKey) == ArrayLength(atomsValue),
+                "Non matching keys/values array size");
+
+  AutoCFRelease<CFDictionaryRef> atoms =
+    CFDictionaryCreate(kCFAllocatorDefault,
+                       atomsKey,
+                       atomsValue,
+                       ArrayLength(atomsKey),
+                       &kCFTypeDictionaryKeyCallBacks,
+                       &kCFTypeDictionaryValueCallBacks);
+
+  const void* extensionKeys[] =
+    { kCVImageBufferChromaLocationBottomFieldKey,
+      kCVImageBufferChromaLocationTopFieldKey,
+      AppleCMLinker::skPropExtensionAtoms,
+      AppleCMLinker::skPropFullRangeVideo /* Not defined in 10.6 */ };
+
+  const void* extensionValues[] =
+    { kCVImageBufferChromaLocation_Left,
+      kCVImageBufferChromaLocation_Left,
+      atoms,
+      kCFBooleanTrue };
+  static_assert(ArrayLength(extensionKeys) == ArrayLength(extensionValues),
+                "Non matching keys/values array size");
+
+  return CFDictionaryCreate(kCFAllocatorDefault,
+                            extensionKeys,
+                            extensionValues,
+                            AppleCMLinker::skPropFullRangeVideo ?
+                              ArrayLength(extensionKeys) :
+                              ArrayLength(extensionKeys) - 1,
+                            &kCFTypeDictionaryKeyCallBacks,
+                            &kCFTypeDictionaryValueCallBacks);
+}
+
+CFDictionaryRef
+AppleVTDecoder::CreateDecoderSpecification()
+{
+  if (!AppleVTLinker::skPropEnableHWAccel) {
+    return nullptr;
+  }
+
+  const void* specKeys[] = { AppleVTLinker::skPropEnableHWAccel };
+  const void* specValues[1];
+  if (gfxPlatform::CanUseHardwareVideoDecoding()) {
+    specValues[0] = kCFBooleanTrue;
+  } else {
+    // This GPU is blacklisted for hardware decoding.
+    specValues[0] = kCFBooleanFalse;
+  }
+  static_assert(ArrayLength(specKeys) == ArrayLength(specValues),
+                "Non matching keys/values array size");
+
+  return CFDictionaryCreate(kCFAllocatorDefault,
+                            specKeys,
+                            specValues,
+                            ArrayLength(specKeys),
+                            &kCFTypeDictionaryKeyCallBacks,
+                            &kCFTypeDictionaryValueCallBacks);
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleVTDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleVTDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleVTDecoder.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleVTDecoder.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,49 @@
+/* -*- 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_AppleVTDecoder_h
+#define mozilla_AppleVTDecoder_h
+
+#include "AppleVDADecoder.h"
+
+#include "VideoToolbox/VideoToolbox.h"
+
+namespace mozilla {
+
+class AppleVTDecoder : public AppleVDADecoder {
+public:
+  AppleVTDecoder(const VideoInfo& aConfig,
+                 FlushableMediaTaskQueue* aVideoTaskQueue,
+                 MediaDataDecoderCallback* aCallback,
+                 layers::ImageContainer* aImageContainer);
+  virtual ~AppleVTDecoder();
+  virtual nsresult Init() override;
+  virtual nsresult Input(MediaRawData* aSample) override;
+  virtual nsresult Flush() override;
+  virtual nsresult Drain() override;
+  virtual nsresult Shutdown() override;
+  virtual bool IsHardwareAccelerated() const override
+  {
+    return mIsHardwareAccelerated;
+  }
+
+private:
+  CMVideoFormatDescriptionRef mFormat;
+  VTDecompressionSessionRef mSession;
+
+  // Method to pass a frame to VideoToolbox for decoding.
+  nsresult SubmitFrame(MediaRawData* aSample);
+  // Method to set up the decompression session.
+  nsresult InitializeSession();
+  nsresult WaitForAsynchronousFrames();
+  CFDictionaryRef CreateDecoderSpecification();
+  CFDictionaryRef CreateDecoderExtensions();
+  bool mIsHardwareAccelerated;
+};
+
+} // namespace mozilla
+
+#endif // mozilla_AppleVTDecoder_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleVTFunctions.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleVTFunctions.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleVTFunctions.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleVTFunctions.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,14 @@
+/* -*- 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/. */
+
+// Construct references to each of the VideoToolbox symbols we use.
+
+LINK_FUNC(VTDecompressionSessionCreate)
+LINK_FUNC(VTDecompressionSessionDecodeFrame)
+LINK_FUNC(VTDecompressionSessionInvalidate)
+LINK_FUNC(VTDecompressionSessionWaitForAsynchronousFrames)
+LINK_FUNC(VTSessionCopyProperty)
+LINK_FUNC(VTSessionCopySupportedPropertyDictionary)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleVTLinker.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleVTLinker.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleVTLinker.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleVTLinker.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,120 @@
+/* -*- 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 <dlfcn.h>
+
+#include "AppleVTLinker.h"
+#include "MainThreadUtils.h"
+#include "mozilla/ArrayUtils.h"
+#include "nsDebug.h"
+
+PRLogModuleInfo* GetAppleMediaLog();
+#define LOG(...) MOZ_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__))
+
+namespace mozilla {
+
+AppleVTLinker::LinkStatus
+AppleVTLinker::sLinkStatus = LinkStatus_INIT;
+
+void* AppleVTLinker::sLink = nullptr;
+nsrefcnt AppleVTLinker::sRefCount = 0;
+CFStringRef AppleVTLinker::skPropEnableHWAccel = nullptr;
+CFStringRef AppleVTLinker::skPropUsingHWAccel = nullptr;
+
+#define LINK_FUNC(func) typeof(func) func;
+#include "AppleVTFunctions.h"
+#undef LINK_FUNC
+
+/* static */ bool
+AppleVTLinker::Link()
+{
+  // Bump our reference count every time we're called.
+  // Add a lock or change the thread assertion if
+  // you need to call this off the main thread.
+  MOZ_ASSERT(NS_IsMainThread());
+  ++sRefCount;
+
+  if (sLinkStatus) {
+    return sLinkStatus == LinkStatus_SUCCEEDED;
+  }
+
+  const char* dlnames[] =
+    { "/System/Library/Frameworks/VideoToolbox.framework/VideoToolbox",
+      "/System/Library/PrivateFrameworks/VideoToolbox.framework/VideoToolbox" };
+  bool dlfound = false;
+  for (size_t i = 0; i < ArrayLength(dlnames); i++) {
+    if ((sLink = dlopen(dlnames[i], RTLD_NOW | RTLD_LOCAL))) {
+      dlfound = true;
+      break;
+    }
+  }
+  if (!dlfound) {
+    NS_WARNING("Couldn't load VideoToolbox framework");
+    goto fail;
+  }
+
+#define LINK_FUNC(func)                                        \
+  func = (typeof(func))dlsym(sLink, #func);                    \
+  if (!func) {                                                 \
+    NS_WARNING("Couldn't load VideoToolbox function " #func ); \
+    goto fail;                                                 \
+  }
+#include "AppleVTFunctions.h"
+#undef LINK_FUNC
+
+  // Will only resolve in 10.9 and later.
+  skPropEnableHWAccel =
+    GetIOConst("kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder");
+  skPropUsingHWAccel =
+    GetIOConst("kVTDecompressionPropertyKey_UsingHardwareAcceleratedVideoDecoder");
+
+  LOG("Loaded VideoToolbox framework.");
+  sLinkStatus = LinkStatus_SUCCEEDED;
+  return true;
+
+fail:
+  Unlink();
+
+  sLinkStatus = LinkStatus_FAILED;
+  return false;
+}
+
+/* static */ void
+AppleVTLinker::Unlink()
+{
+  // We'll be called by multiple Decoders, one intantiated for
+  // each media element. Therefore we receive must maintain a
+  // reference count to avoidunloading our symbols when other
+  // instances still need them.
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(sRefCount > 0, "Unbalanced Unlink()");
+  --sRefCount;
+  if (sLink && sRefCount < 1) {
+    LOG("Unlinking VideoToolbox framework.");
+#define LINK_FUNC(func)                                                   \
+    func = nullptr;
+#include "AppleVTFunctions.h"
+#undef LINK_FUNC
+    dlclose(sLink);
+    sLink = nullptr;
+    skPropEnableHWAccel = nullptr;
+    skPropUsingHWAccel = nullptr;
+    sLinkStatus = LinkStatus_INIT;
+  }
+}
+
+/* static */ CFStringRef
+AppleVTLinker::GetIOConst(const char* symbol)
+{
+  CFStringRef* address = (CFStringRef*)dlsym(sLink, symbol);
+  if (!address) {
+    return nullptr;
+  }
+
+  return *address;
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleVTLinker.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleVTLinker.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/AppleVTLinker.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/AppleVTLinker.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,47 @@
+/* -*- 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 AppleVTLinker_h
+#define AppleVTLinker_h
+
+extern "C" {
+#pragma GCC visibility push(default)
+#include "VideoToolbox/VideoToolbox.h"
+#pragma GCC visibility pop
+}
+
+#include "nscore.h"
+
+namespace mozilla {
+
+class AppleVTLinker
+{
+public:
+  static bool Link();
+  static void Unlink();
+  static CFStringRef skPropEnableHWAccel;
+  static CFStringRef skPropUsingHWAccel;
+
+private:
+  static void* sLink;
+  static nsrefcnt sRefCount;
+
+  static enum LinkStatus {
+    LinkStatus_INIT = 0,
+    LinkStatus_FAILED,
+    LinkStatus_SUCCEEDED
+  } sLinkStatus;
+
+  static CFStringRef GetIOConst(const char* symbol);
+};
+
+#define LINK_FUNC(func) extern typeof(func)* func;
+#include "AppleVTFunctions.h"
+#undef LINK_FUNC
+
+} // namespace mozilla
+
+#endif // AppleVTLinker_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/ReorderQueue.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/ReorderQueue.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/ReorderQueue.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/ReorderQueue.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,29 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// Queue for ordering decoded video frames by presentation time.
+// Decoders often return frames out of order, which we need to
+// buffer so we can forward them in correct presentation order.
+
+#ifndef mozilla_ReorderQueue_h
+#define mozilla_ReorderQueue_h
+
+#include <MediaData.h>
+#include <nsTPriorityQueue.h>
+
+namespace mozilla {
+
+struct ReorderQueueComparator
+{
+  bool LessThan(VideoData* const& a, VideoData* const& b) const
+  {
+    return a->mTime < b->mTime;
+  }
+};
+
+typedef nsTPriorityQueue<nsRefPtr<VideoData>, ReorderQueueComparator> ReorderQueue;
+
+} // namespace mozilla
+
+#endif // mozilla_ReorderQueue_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/VideoDecodeAcceleration/VDADecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/VideoDecodeAcceleration/VDADecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/VideoDecodeAcceleration/VDADecoder.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/VideoDecodeAcceleration/VDADecoder.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,63 @@
+/* -*- 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/. */
+
+// Stub header for VideoDecodeAcceleration framework API.
+// This is a private Framework on 10.6 see:
+// https://developer.apple.com/library/mac/technotes/tn2267/_index.html
+// We include our own copy so we can build on MacOS versions
+// where it's not available.
+
+#ifndef mozilla_VideoDecodeAcceleration_VDADecoder_h
+#define mozilla_VideoDecodeAcceleration_VDADecoder_h
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreVideo/CoreVideo.h>
+
+typedef uint32_t VDADecodeFrameFlags;
+typedef uint32_t VDADecodeInfoFlags;
+
+enum {
+  kVDADecodeInfo_Asynchronous = 1UL << 0,
+  kVDADecodeInfo_FrameDropped = 1UL << 1
+};
+
+enum {
+  kVDADecoderFlush_EmitFrames = 1 << 0
+};
+
+typedef struct OpaqueVDADecoder* VDADecoder;
+
+typedef void (*VDADecoderOutputCallback)
+  (void* decompressionOutputRefCon,
+   CFDictionaryRef frameInfo,
+   OSStatus status,
+   uint32_t infoFlags,
+   CVImageBufferRef imageBuffer);
+
+OSStatus
+VDADecoderCreate(
+  CFDictionaryRef decoderConfiguration,
+  CFDictionaryRef destinationImageBufferAttributes, /* can be NULL */
+  VDADecoderOutputCallback* outputCallback,
+  void* decoderOutputCallbackRefcon,
+  VDADecoder* decoderOut);
+
+OSStatus
+VDADecoderDecode(
+  VDADecoder decoder,
+  uint32_t decodeFlags,
+  CFTypeRef compressedBuffer,
+  CFDictionaryRef frameInfo); /* can be NULL */
+
+OSStatus
+VDADecoderFlush(
+  VDADecoder decoder,
+  uint32_t flushFlags);
+
+OSStatus
+VDADecoderDestroy(VDADecoder decoder);
+
+#endif // mozilla_VideoDecodeAcceleration_VDADecoder_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/VideoToolbox/VideoToolbox.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/VideoToolbox/VideoToolbox.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/apple/VideoToolbox/VideoToolbox.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/apple/VideoToolbox/VideoToolbox.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,94 @@
+/* -*- 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/. */
+
+// Stub header for VideoToolbox framework API.
+// We include our own copy so we can build on MacOS versions
+// where it's not available.
+
+#ifndef mozilla_VideoToolbox_VideoToolbox_h
+#define mozilla_VideoToolbox_VideoToolbox_h
+
+// CoreMedia is available starting in OS X 10.7,
+// so we need to dlopen it as well to run on 10.6,
+// but we can depend on the real framework headers at build time.
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreMedia/CoreMedia.h>
+#include <CoreVideo/CVPixelBuffer.h>
+
+typedef uint32_t VTDecodeFrameFlags;
+typedef uint32_t VTDecodeInfoFlags;
+enum {
+  kVTDecodeInfo_Asynchronous = 1UL << 0,
+  kVTDecodeInfo_FrameDropped = 1UL << 1,
+};
+enum {
+  kVTDecodeFrame_EnableAsynchronousDecompression = 1<<0,
+  kVTDecodeFrame_DoNotOutputFrame = 1<<1,
+  kVTDecodeFrame_1xRealTimePlayback = 1<<2,
+  kVTDecodeFrame_EnableTemporalProcessing = 1<<3,
+};
+
+typedef CFTypeRef VTSessionRef;
+typedef struct OpaqueVTDecompressionSession* VTDecompressionSessionRef;
+typedef void (*VTDecompressionOutputCallback)(
+    void*,
+    void*,
+    OSStatus,
+    VTDecodeInfoFlags,
+    CVImageBufferRef,
+    CMTime,
+    CMTime
+);
+typedef struct VTDecompressionOutputCallbackRecord {
+    VTDecompressionOutputCallback decompressionOutputCallback;
+    void*                         decompressionOutputRefCon;
+} VTDecompressionOutputCallbackRecord;
+
+OSStatus
+VTDecompressionSessionCreate(
+    CFAllocatorRef,
+    CMVideoFormatDescriptionRef,
+    CFDictionaryRef,
+    CFDictionaryRef,
+    const VTDecompressionOutputCallbackRecord*,
+    VTDecompressionSessionRef*
+);
+
+OSStatus
+VTDecompressionSessionDecodeFrame(
+    VTDecompressionSessionRef,
+    CMSampleBufferRef,
+    VTDecodeFrameFlags,
+    void*,
+    VTDecodeInfoFlags*
+);
+
+OSStatus
+VTDecompressionSessionWaitForAsynchronousFrames(
+    VTDecompressionSessionRef
+);
+
+void
+VTDecompressionSessionInvalidate(
+    VTDecompressionSessionRef
+);
+
+OSStatus
+VTSessionCopyProperty(
+    VTSessionRef,
+    CFStringRef,
+    CFAllocatorRef,
+    void*
+);
+
+OSStatus
+VTSessionCopySupportedPropertyDictionary(
+    VTSessionRef,
+    CFDictionaryRef*
+);
+
+#endif // mozilla_VideoToolbox_VideoToolbox_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,184 @@
+/* -*- 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 "MediaTaskQueue.h"
+#include "FFmpegRuntimeLinker.h"
+
+#include "FFmpegAudioDecoder.h"
+
+#define MAX_CHANNELS 16
+
+namespace mozilla
+{
+
+FFmpegAudioDecoder<LIBAV_VER>::FFmpegAudioDecoder(
+  FlushableMediaTaskQueue* aTaskQueue, MediaDataDecoderCallback* aCallback,
+  const AudioInfo& aConfig)
+  : FFmpegDataDecoder(aTaskQueue, GetCodecId(aConfig.mMimeType))
+  , mCallback(aCallback)
+{
+  MOZ_COUNT_CTOR(FFmpegAudioDecoder);
+  // Use a new MediaByteBuffer as the object will be modified during initialization.
+  mExtraData = new MediaByteBuffer;
+  mExtraData->AppendElements(*aConfig.mCodecSpecificConfig);
+}
+
+nsresult
+FFmpegAudioDecoder<LIBAV_VER>::Init()
+{
+  nsresult rv = FFmpegDataDecoder::Init();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
+static AudioDataValue*
+CopyAndPackAudio(AVFrame* aFrame, uint32_t aNumChannels, uint32_t aNumAFrames)
+{
+  MOZ_ASSERT(aNumChannels <= MAX_CHANNELS);
+
+  nsAutoArrayPtr<AudioDataValue> audio(
+    new AudioDataValue[aNumChannels * aNumAFrames]);
+
+  if (aFrame->format == AV_SAMPLE_FMT_FLT) {
+    // Audio data already packed. No need to do anything other than copy it
+    // into a buffer we own.
+    memcpy(audio, aFrame->data[0],
+           aNumChannels * aNumAFrames * sizeof(AudioDataValue));
+  } else if (aFrame->format == AV_SAMPLE_FMT_FLTP) {
+    // Planar audio data. Pack it into something we can understand.
+    AudioDataValue* tmp = audio;
+    AudioDataValue** data = reinterpret_cast<AudioDataValue**>(aFrame->data);
+    for (uint32_t frame = 0; frame < aNumAFrames; frame++) {
+      for (uint32_t channel = 0; channel < aNumChannels; channel++) {
+        *tmp++ = data[channel][frame];
+      }
+    }
+  } else if (aFrame->format == AV_SAMPLE_FMT_S16) {
+    // Audio data already packed. Need to convert from S16 to 32 bits Float
+    AudioDataValue* tmp = audio;
+    int16_t* data = reinterpret_cast<int16_t**>(aFrame->data)[0];
+    for (uint32_t frame = 0; frame < aNumAFrames; frame++) {
+      for (uint32_t channel = 0; channel < aNumChannels; channel++) {
+        *tmp++ = AudioSampleToFloat(*data++);
+      }
+    }
+  } else if (aFrame->format == AV_SAMPLE_FMT_S16P) {
+    // Planar audio data. Convert it from S16 to 32 bits float
+    // and pack it into something we can understand.
+    AudioDataValue* tmp = audio;
+    int16_t** data = reinterpret_cast<int16_t**>(aFrame->data);
+    for (uint32_t frame = 0; frame < aNumAFrames; frame++) {
+      for (uint32_t channel = 0; channel < aNumChannels; channel++) {
+        *tmp++ = AudioSampleToFloat(data[channel][frame]);
+      }
+    }
+  }
+
+  return audio.forget();
+}
+
+void
+FFmpegAudioDecoder<LIBAV_VER>::DecodePacket(MediaRawData* aSample)
+{
+  AVPacket packet;
+  av_init_packet(&packet);
+
+  packet.data = const_cast<uint8_t*>(aSample->mData);
+  packet.size = aSample->mSize;
+
+  if (!PrepareFrame()) {
+    NS_WARNING("FFmpeg audio decoder failed to allocate frame.");
+    mCallback->Error();
+    return;
+  }
+
+  int64_t samplePosition = aSample->mOffset;
+  Microseconds pts = aSample->mTime;
+
+  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;
+    }
+
+    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;
+      }
+
+      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();
+  }
+}
+
+nsresult
+FFmpegAudioDecoder<LIBAV_VER>::Input(MediaRawData* aSample)
+{
+  nsCOMPtr<nsIRunnable> runnable(NS_NewRunnableMethodWithArg<nsRefPtr<MediaRawData>>(
+    this, &FFmpegAudioDecoder::DecodePacket, nsRefPtr<MediaRawData>(aSample)));
+  mTaskQueue->Dispatch(runnable.forget());
+  return NS_OK;
+}
+
+nsresult
+FFmpegAudioDecoder<LIBAV_VER>::Drain()
+{
+  mTaskQueue->AwaitIdle();
+  mCallback->DrainComplete();
+  return Flush();
+}
+
+AVCodecID
+FFmpegAudioDecoder<LIBAV_VER>::GetCodecId(const nsACString& aMimeType)
+{
+  if (aMimeType.EqualsLiteral("audio/mpeg")) {
+    return AV_CODEC_ID_MP3;
+  }
+
+  if (aMimeType.EqualsLiteral("audio/mp4a-latm")) {
+    return AV_CODEC_ID_AAC;
+  }
+
+  return AV_CODEC_ID_NONE;
+}
+
+FFmpegAudioDecoder<LIBAV_VER>::~FFmpegAudioDecoder()
+{
+  MOZ_COUNT_DTOR(FFmpegAudioDecoder);
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,41 @@
+/* -*- 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 __FFmpegAACDecoder_h__
+#define __FFmpegAACDecoder_h__
+
+#include "FFmpegDataDecoder.h"
+
+namespace mozilla
+{
+
+template <int V> class FFmpegAudioDecoder
+{
+};
+
+template <>
+class FFmpegAudioDecoder<LIBAV_VER> : public FFmpegDataDecoder<LIBAV_VER>
+{
+public:
+  FFmpegAudioDecoder(FlushableMediaTaskQueue* aTaskQueue,
+                     MediaDataDecoderCallback* aCallback,
+                     const AudioInfo& aConfig);
+  virtual ~FFmpegAudioDecoder();
+
+  virtual nsresult Init() override;
+  virtual nsresult Input(MediaRawData* aSample) override;
+  virtual nsresult Drain() override;
+  static AVCodecID GetCodecId(const nsACString& aMimeType);
+
+private:
+  void DecodePacket(MediaRawData* aSample);
+
+  MediaDataDecoderCallback* mCallback;
+};
+
+} // namespace mozilla
+
+#endif // __FFmpegAACDecoder_h__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,180 @@
+/* -*- 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 <string.h>
+#include <unistd.h>
+
+#include "MediaTaskQueue.h"
+#include "FFmpegLibs.h"
+#include "FFmpegLog.h"
+#include "FFmpegDataDecoder.h"
+#include "prsystem.h"
+
+namespace mozilla
+{
+
+bool FFmpegDataDecoder<LIBAV_VER>::sFFmpegInitDone = false;
+StaticMutex FFmpegDataDecoder<LIBAV_VER>::sMonitor;
+
+FFmpegDataDecoder<LIBAV_VER>::FFmpegDataDecoder(FlushableMediaTaskQueue* aTaskQueue,
+                                                AVCodecID aCodecID)
+  : mTaskQueue(aTaskQueue)
+  , mCodecContext(nullptr)
+  , mFrame(NULL)
+  , mExtraData(nullptr)
+  , mCodecID(aCodecID)
+{
+  MOZ_COUNT_CTOR(FFmpegDataDecoder);
+}
+
+FFmpegDataDecoder<LIBAV_VER>::~FFmpegDataDecoder()
+{
+  MOZ_COUNT_DTOR(FFmpegDataDecoder);
+}
+
+/**
+ * FFmpeg calls back to this function with a list of pixel formats it supports.
+ * We choose a pixel format that we support and return it.
+ * For now, we just look for YUV420P as it is the only non-HW accelerated format
+ * supported by FFmpeg's H264 decoder.
+ */
+static PixelFormat
+ChoosePixelFormat(AVCodecContext* aCodecContext, const PixelFormat* aFormats)
+{
+  FFMPEG_LOG("Choosing FFmpeg pixel format for video decoding.");
+  for (; *aFormats > -1; aFormats++) {
+    if (*aFormats == PIX_FMT_YUV420P) {
+      FFMPEG_LOG("Requesting pixel format YUV420P.");
+      return PIX_FMT_YUV420P;
+    }
+  }
+
+  NS_WARNING("FFmpeg does not share any supported pixel formats.");
+  return PIX_FMT_NONE;
+}
+
+nsresult
+FFmpegDataDecoder<LIBAV_VER>::Init()
+{
+  StaticMutexAutoLock mon(sMonitor);
+
+  FFMPEG_LOG("Initialising FFmpeg decoder.");
+
+  if (!sFFmpegInitDone) {
+    av_register_all();
+#ifdef DEBUG
+    av_log_set_level(AV_LOG_DEBUG);
+#endif
+    sFFmpegInitDone = true;
+  }
+
+  AVCodec* codec = avcodec_find_decoder(mCodecID);
+  if (!codec) {
+    NS_WARNING("Couldn't find ffmpeg decoder");
+    return NS_ERROR_FAILURE;
+  }
+
+  if (!(mCodecContext = avcodec_alloc_context3(codec))) {
+    NS_WARNING("Couldn't init ffmpeg context");
+    return NS_ERROR_FAILURE;
+  }
+
+  mCodecContext->opaque = this;
+
+  // FFmpeg takes this as a suggestion for what format to use for audio samples.
+  mCodecContext->request_sample_fmt = AV_SAMPLE_FMT_FLT;
+
+  // FFmpeg will call back to this to negotiate a video pixel format.
+  mCodecContext->get_format = ChoosePixelFormat;
+
+  mCodecContext->thread_count = PR_GetNumberOfProcessors();
+  mCodecContext->thread_type = FF_THREAD_SLICE | FF_THREAD_FRAME;
+  mCodecContext->thread_safe_callbacks = false;
+
+  if (mExtraData) {
+    mCodecContext->extradata_size = mExtraData->Length();
+    // FFmpeg may use SIMD instructions to access the data which reads the
+    // data in 32 bytes block. Must ensure we have enough data to read.
+    mExtraData->AppendElements(FF_INPUT_BUFFER_PADDING_SIZE);
+    mCodecContext->extradata = mExtraData->Elements();
+  } else {
+    mCodecContext->extradata_size = 0;
+  }
+
+  if (codec->capabilities & CODEC_CAP_DR1) {
+    mCodecContext->flags |= CODEC_FLAG_EMU_EDGE;
+  }
+
+  if (avcodec_open2(mCodecContext, codec, nullptr) < 0) {
+    NS_WARNING("Couldn't initialise ffmpeg decoder");
+    return NS_ERROR_FAILURE;
+  }
+
+  if (mCodecContext->codec_type == AVMEDIA_TYPE_AUDIO &&
+      mCodecContext->sample_fmt != AV_SAMPLE_FMT_FLT &&
+      mCodecContext->sample_fmt != AV_SAMPLE_FMT_FLTP &&
+      mCodecContext->sample_fmt != AV_SAMPLE_FMT_S16 &&
+      mCodecContext->sample_fmt != AV_SAMPLE_FMT_S16P) {
+    NS_WARNING("FFmpeg audio decoder outputs unsupported audio format.");
+    return NS_ERROR_FAILURE;
+  }
+
+  FFMPEG_LOG("FFmpeg init successful.");
+  return NS_OK;
+}
+
+nsresult
+FFmpegDataDecoder<LIBAV_VER>::Flush()
+{
+  mTaskQueue->Flush();
+  avcodec_flush_buffers(mCodecContext);
+  return NS_OK;
+}
+
+nsresult
+FFmpegDataDecoder<LIBAV_VER>::Shutdown()
+{
+  StaticMutexAutoLock mon(sMonitor);
+
+  if (sFFmpegInitDone) {
+    avcodec_close(mCodecContext);
+    av_freep(&mCodecContext);
+#if LIBAVCODEC_VERSION_MAJOR >= 55
+    av_frame_free(&mFrame);
+#elif LIBAVCODEC_VERSION_MAJOR == 54
+    avcodec_free_frame(&mFrame);
+#else
+    delete mFrame;
+    mFrame = nullptr;
+#endif
+  }
+  return NS_OK;
+}
+
+AVFrame*
+FFmpegDataDecoder<LIBAV_VER>::PrepareFrame()
+{
+#if LIBAVCODEC_VERSION_MAJOR >= 55
+  if (mFrame) {
+    av_frame_unref(mFrame);
+  } else {
+    mFrame = av_frame_alloc();
+  }
+#elif LIBAVCODEC_VERSION_MAJOR == 54
+  if (mFrame) {
+    avcodec_get_frame_defaults(mFrame);
+  } else {
+    mFrame = avcodec_alloc_frame();
+  }
+#else
+  delete mFrame;
+  mFrame = new AVFrame;
+  avcodec_get_frame_defaults(mFrame);
+#endif
+  return mFrame;
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegDataDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegDataDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegDataDecoder.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegDataDecoder.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,55 @@
+/* -*- 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 __FFmpegDataDecoder_h__
+#define __FFmpegDataDecoder_h__
+
+#include "PlatformDecoderModule.h"
+#include "FFmpegLibs.h"
+#include "mozilla/StaticMutex.h"
+#include "mp4_demuxer/mp4_demuxer.h"
+
+namespace mozilla
+{
+
+template <int V>
+class FFmpegDataDecoder : public MediaDataDecoder
+{
+};
+
+template <>
+class FFmpegDataDecoder<LIBAV_VER> : public MediaDataDecoder
+{
+public:
+  FFmpegDataDecoder(FlushableMediaTaskQueue* aTaskQueue, AVCodecID aCodecID);
+  virtual ~FFmpegDataDecoder();
+
+  static bool Link();
+
+  virtual nsresult Init() override;
+  virtual nsresult Input(MediaRawData* aSample) override = 0;
+  virtual nsresult Flush() override;
+  virtual nsresult Drain() override = 0;
+  virtual nsresult Shutdown() override;
+
+protected:
+  AVFrame*        PrepareFrame();
+
+  FlushableMediaTaskQueue* mTaskQueue;
+  AVCodecContext* mCodecContext;
+  AVFrame*        mFrame;
+  nsRefPtr<MediaByteBuffer> mExtraData;
+
+private:
+  static bool sFFmpegInitDone;
+  static StaticMutex sMonitor;
+
+  AVCodecID mCodecID;
+};
+
+} // namespace mozilla
+
+#endif // __FFmpegDataDecoder_h__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegDecoderModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegDecoderModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegDecoderModule.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegDecoderModule.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,13 @@
+/* -*- 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 "FFmpegDecoderModule.h"
+
+namespace mozilla {
+
+template class FFmpegDecoderModule<LIBAV_VER>;
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegDecoderModule.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegDecoderModule.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegDecoderModule.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegDecoderModule.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,76 @@
+/* -*- 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 __FFmpegDecoderModule_h__
+#define __FFmpegDecoderModule_h__
+
+#include "PlatformDecoderModule.h"
+#include "FFmpegAudioDecoder.h"
+#include "FFmpegH264Decoder.h"
+
+namespace mozilla
+{
+
+template <int V>
+class FFmpegDecoderModule : public PlatformDecoderModule
+{
+public:
+  static already_AddRefed<PlatformDecoderModule>
+  Create()
+  {
+    nsRefPtr<PlatformDecoderModule> pdm = new FFmpegDecoderModule();
+    return pdm.forget();
+  }
+
+  FFmpegDecoderModule() {}
+  virtual ~FFmpegDecoderModule() {}
+
+  virtual already_AddRefed<MediaDataDecoder>
+  CreateVideoDecoder(const VideoInfo& aConfig,
+                     layers::LayersBackend aLayersBackend,
+                     layers::ImageContainer* aImageContainer,
+                     FlushableMediaTaskQueue* aVideoTaskQueue,
+                     MediaDataDecoderCallback* aCallback) override
+  {
+    nsRefPtr<MediaDataDecoder> decoder =
+      new FFmpegH264Decoder<V>(aVideoTaskQueue, aCallback, aConfig,
+                               aImageContainer);
+    return decoder.forget();
+  }
+
+  virtual already_AddRefed<MediaDataDecoder>
+  CreateAudioDecoder(const AudioInfo& aConfig,
+                     FlushableMediaTaskQueue* aAudioTaskQueue,
+                     MediaDataDecoderCallback* aCallback) override
+  {
+    nsRefPtr<MediaDataDecoder> decoder =
+      new FFmpegAudioDecoder<V>(aAudioTaskQueue, aCallback, aConfig);
+    return decoder.forget();
+  }
+
+  virtual bool SupportsMimeType(const nsACString& aMimeType) override
+  {
+    return FFmpegAudioDecoder<V>::GetCodecId(aMimeType) != AV_CODEC_ID_NONE ||
+      FFmpegH264Decoder<V>::GetCodecId(aMimeType) != AV_CODEC_ID_NONE;
+  }
+
+  virtual ConversionRequired
+  DecoderNeedsConversion(const TrackInfo& aConfig) const override
+  {
+    if (aConfig.IsVideo() &&
+        (aConfig.mMimeType.EqualsLiteral("video/avc") ||
+         aConfig.mMimeType.EqualsLiteral("video/mp4"))) {
+      return PlatformDecoderModule::kNeedAVCC;
+    } else {
+      return kNeedNone;
+    }
+  }
+
+};
+
+} // namespace mozilla
+
+#endif // __FFmpegDecoderModule_h__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegFunctionList.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegFunctionList.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegFunctionList.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegFunctionList.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,43 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* libavformat */
+AV_FUNC(av_register_all, 0)
+
+/* libavcodec */
+AV_FUNC(avcodec_align_dimensions2, 0)
+AV_FUNC(avcodec_get_frame_defaults, 0)
+AV_FUNC(avcodec_close, 0)
+AV_FUNC(avcodec_decode_audio4, 0)
+AV_FUNC(avcodec_decode_video2, 0)
+AV_FUNC(avcodec_default_get_buffer, 0)
+AV_FUNC(avcodec_default_release_buffer, 0)
+AV_FUNC(avcodec_find_decoder, 0)
+AV_FUNC(avcodec_flush_buffers, 0)
+AV_FUNC(avcodec_alloc_context3, 0)
+AV_FUNC(avcodec_get_edge_width, 0)
+AV_FUNC(avcodec_open2, 0)
+AV_FUNC(av_init_packet, 0)
+AV_FUNC(av_dict_get, 0)
+
+/* libavutil */
+AV_FUNC(av_image_fill_linesizes, 0)
+AV_FUNC(av_image_fill_pointers, 0)
+AV_FUNC(av_log_set_level, 0)
+AV_FUNC(av_malloc, 0)
+AV_FUNC(av_freep, 0)
+
+#if defined(LIBAVCODEC_VERSION_MAJOR) || defined(LIBAVCODEC_ALLVERSION)
+#if LIBAVCODEC_VERSION_MAJOR == 54 || defined(LIBAVCODEC_ALLVERSION)
+/* libavutil v54 only */
+AV_FUNC(avcodec_alloc_frame, 54)
+AV_FUNC(avcodec_free_frame, 54)
+#endif
+#if LIBAVCODEC_VERSION_MAJOR >= 55 || defined(LIBAVCODEC_ALLVERSION)
+/* libavutil v55 only */
+AV_FUNC(av_frame_alloc, 55)
+AV_FUNC(av_frame_free, 55)
+AV_FUNC(av_frame_unref, 55)
+#endif
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegH264Decoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegH264Decoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegH264Decoder.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegH264Decoder.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,300 @@
+/* -*- 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 "MediaTaskQueue.h"
+#include "nsThreadUtils.h"
+#include "nsAutoPtr.h"
+#include "ImageContainer.h"
+
+#include "MediaInfo.h"
+
+#include "FFmpegH264Decoder.h"
+
+#define GECKO_FRAME_TYPE 0x00093CC0
+
+typedef mozilla::layers::Image Image;
+typedef mozilla::layers::PlanarYCbCrImage PlanarYCbCrImage;
+
+namespace mozilla
+{
+
+FFmpegH264Decoder<LIBAV_VER>::FFmpegH264Decoder(
+  FlushableMediaTaskQueue* aTaskQueue, MediaDataDecoderCallback* aCallback,
+  const VideoInfo& aConfig,
+  ImageContainer* aImageContainer)
+  : FFmpegDataDecoder(aTaskQueue, GetCodecId(aConfig.mMimeType))
+  , mCallback(aCallback)
+  , mImageContainer(aImageContainer)
+  , mDisplayWidth(aConfig.mDisplay.width)
+  , mDisplayHeight(aConfig.mDisplay.height)
+{
+  MOZ_COUNT_CTOR(FFmpegH264Decoder);
+  // Use a new MediaByteBuffer as the object will be modified during initialization.
+  mExtraData = new MediaByteBuffer;
+  mExtraData->AppendElements(*aConfig.mExtraData);
+}
+
+nsresult
+FFmpegH264Decoder<LIBAV_VER>::Init()
+{
+  nsresult rv = FFmpegDataDecoder::Init();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  mCodecContext->get_buffer = AllocateBufferCb;
+  mCodecContext->release_buffer = ReleaseBufferCb;
+
+  return NS_OK;
+}
+
+FFmpegH264Decoder<LIBAV_VER>::DecodeResult
+FFmpegH264Decoder<LIBAV_VER>::DoDecodeFrame(MediaRawData* aSample)
+{
+  AVPacket packet;
+  av_init_packet(&packet);
+
+  packet.data = const_cast<uint8_t*>(aSample->mData);
+  packet.size = aSample->mSize;
+  packet.dts = aSample->mTimecode;
+  packet.pts = aSample->mTime;
+  packet.flags = aSample->mKeyframe ? AV_PKT_FLAG_KEY : 0;
+  packet.pos = aSample->mOffset;
+
+  if (!PrepareFrame()) {
+    NS_WARNING("FFmpeg h264 decoder failed to allocate frame.");
+    mCallback->Error();
+    return DecodeResult::DECODE_ERROR;
+  }
+
+  int decoded;
+  int bytesConsumed =
+    avcodec_decode_video2(mCodecContext, mFrame, &decoded, &packet);
+
+  if (bytesConsumed < 0) {
+    NS_WARNING("FFmpeg video decoder error.");
+    mCallback->Error();
+    return DecodeResult::DECODE_ERROR;
+  }
+
+  // If we've decoded a frame then we need to output it
+  if (decoded) {
+    VideoInfo info;
+    info.mDisplay = nsIntSize(mDisplayWidth, mDisplayHeight);
+
+    VideoData::YCbCrBuffer b;
+    b.mPlanes[0].mData = mFrame->data[0];
+    b.mPlanes[0].mStride = mFrame->linesize[0];
+    b.mPlanes[0].mHeight = mFrame->height;
+    b.mPlanes[0].mWidth = mFrame->width;
+    b.mPlanes[0].mOffset = b.mPlanes[0].mSkip = 0;
+
+    b.mPlanes[1].mData = mFrame->data[1];
+    b.mPlanes[1].mStride = mFrame->linesize[1];
+    b.mPlanes[1].mHeight = (mFrame->height + 1) >> 1;
+    b.mPlanes[1].mWidth = (mFrame->width + 1) >> 1;
+    b.mPlanes[1].mOffset = b.mPlanes[1].mSkip = 0;
+
+    b.mPlanes[2].mData = mFrame->data[2];
+    b.mPlanes[2].mStride = mFrame->linesize[2];
+    b.mPlanes[2].mHeight = (mFrame->height + 1) >> 1;
+    b.mPlanes[2].mWidth = (mFrame->width + 1) >> 1;
+    b.mPlanes[2].mOffset = b.mPlanes[2].mSkip = 0;
+
+    nsRefPtr<VideoData> v = VideoData::Create(info,
+                                              mImageContainer,
+                                              aSample->mOffset,
+                                              mFrame->pkt_pts,
+                                              aSample->mDuration,
+                                              b,
+                                              aSample->mKeyframe,
+                                              -1,
+                                              gfx::IntRect(0, 0, mCodecContext->width, mCodecContext->height));
+    if (!v) {
+      NS_WARNING("image allocation error.");
+      mCallback->Error();
+      return DecodeResult::DECODE_ERROR;
+    }
+    mCallback->Output(v);
+    return DecodeResult::DECODE_FRAME;
+  }
+  return DecodeResult::DECODE_NO_FRAME;
+}
+
+void
+FFmpegH264Decoder<LIBAV_VER>::DecodeFrame(MediaRawData* aSample)
+{
+  if (DoDecodeFrame(aSample) != DecodeResult::DECODE_ERROR &&
+      mTaskQueue->IsEmpty()) {
+    mCallback->InputExhausted();
+  }
+}
+
+/* static */ int
+FFmpegH264Decoder<LIBAV_VER>::AllocateBufferCb(AVCodecContext* aCodecContext,
+                                               AVFrame* aFrame)
+{
+  MOZ_ASSERT(aCodecContext->codec_type == AVMEDIA_TYPE_VIDEO);
+
+  FFmpegH264Decoder* self =
+    static_cast<FFmpegH264Decoder*>(aCodecContext->opaque);
+
+  switch (aCodecContext->pix_fmt) {
+  case PIX_FMT_YUV420P:
+    return self->AllocateYUV420PVideoBuffer(aCodecContext, aFrame);
+  default:
+    return avcodec_default_get_buffer(aCodecContext, aFrame);
+  }
+}
+
+/* static */ void
+FFmpegH264Decoder<LIBAV_VER>::ReleaseBufferCb(AVCodecContext* aCodecContext,
+                                              AVFrame* aFrame)
+{
+  switch (aCodecContext->pix_fmt) {
+    case PIX_FMT_YUV420P: {
+      Image* image = static_cast<Image*>(aFrame->opaque);
+      if (image) {
+        image->Release();
+      }
+      for (uint32_t i = 0; i < AV_NUM_DATA_POINTERS; i++) {
+        aFrame->data[i] = nullptr;
+      }
+      break;
+    }
+    default:
+      avcodec_default_release_buffer(aCodecContext, aFrame);
+      break;
+  }
+}
+
+int
+FFmpegH264Decoder<LIBAV_VER>::AllocateYUV420PVideoBuffer(
+  AVCodecContext* aCodecContext, AVFrame* aFrame)
+{
+  bool needAlign = aCodecContext->codec->capabilities & CODEC_CAP_DR1;
+  int edgeWidth =  needAlign ? avcodec_get_edge_width() : 0;
+  int decodeWidth = aCodecContext->width + edgeWidth * 2;
+  // Make sure the decodeWidth is a multiple of 32, so a UV plane stride will be
+  // a multiple of 16. FFmpeg uses SSE2 accelerated code to copy a frame line by
+  // line.
+  decodeWidth = (decodeWidth + 31) & ~31;
+  int decodeHeight = aCodecContext->height + edgeWidth * 2;
+
+  if (needAlign) {
+    // Align width and height to account for CODEC_FLAG_EMU_EDGE.
+    int stride_align[AV_NUM_DATA_POINTERS];
+    avcodec_align_dimensions2(aCodecContext, &decodeWidth, &decodeHeight,
+                              stride_align);
+  }
+
+  // Get strides for each plane.
+  av_image_fill_linesizes(aFrame->linesize, aCodecContext->pix_fmt,
+                          decodeWidth);
+
+  // Let FFmpeg set up its YUV plane pointers and tell us how much memory we
+  // need.
+  // Note that we're passing |nullptr| here as the base address as we haven't
+  // allocated our image yet. We will adjust |aFrame->data| below.
+  size_t allocSize =
+    av_image_fill_pointers(aFrame->data, aCodecContext->pix_fmt, decodeHeight,
+                           nullptr /* base address */, aFrame->linesize);
+
+  nsRefPtr<Image> image =
+    mImageContainer->CreateImage(ImageFormat::PLANAR_YCBCR);
+  PlanarYCbCrImage* ycbcr = static_cast<PlanarYCbCrImage*>(image.get());
+  uint8_t* buffer = ycbcr->AllocateAndGetNewBuffer(allocSize + 64);
+  // FFmpeg requires a 16/32 bytes-aligned buffer, align it on 64 to be safe
+  buffer = reinterpret_cast<uint8_t*>((reinterpret_cast<uintptr_t>(buffer) + 63) & ~63);
+
+  if (!buffer) {
+    NS_WARNING("Failed to allocate buffer for FFmpeg video decoding");
+    return -1;
+  }
+
+  // Now that we've allocated our image, we can add its address to the offsets
+  // set by |av_image_fill_pointers| above. We also have to add |edgeWidth|
+  // pixels of padding here.
+  for (uint32_t i = 0; i < AV_NUM_DATA_POINTERS; i++) {
+    // The C planes are half the resolution of the Y plane, so we need to halve
+    // the edge width here.
+    uint32_t planeEdgeWidth = edgeWidth / (i ? 2 : 1);
+
+    // Add buffer offset, plus a horizontal bar |edgeWidth| pixels high at the
+    // top of the frame, plus |edgeWidth| pixels from the left of the frame.
+    aFrame->data[i] += reinterpret_cast<ptrdiff_t>(
+      buffer + planeEdgeWidth * aFrame->linesize[i] + planeEdgeWidth);
+  }
+
+  // Unused, but needs to be non-zero to keep ffmpeg happy.
+  aFrame->type = GECKO_FRAME_TYPE;
+
+  aFrame->extended_data = aFrame->data;
+  aFrame->width = aCodecContext->width;
+  aFrame->height = aCodecContext->height;
+
+  aFrame->opaque = static_cast<void*>(image.forget().take());
+
+  return 0;
+}
+
+nsresult
+FFmpegH264Decoder<LIBAV_VER>::Input(MediaRawData* aSample)
+{
+  nsCOMPtr<nsIRunnable> runnable(
+    NS_NewRunnableMethodWithArg<nsRefPtr<MediaRawData>>(
+      this, &FFmpegH264Decoder<LIBAV_VER>::DecodeFrame,
+      nsRefPtr<MediaRawData>(aSample)));
+  mTaskQueue->Dispatch(runnable.forget());
+
+  return NS_OK;
+}
+
+void
+FFmpegH264Decoder<LIBAV_VER>::DoDrain()
+{
+  nsRefPtr<MediaRawData> empty(new MediaRawData());
+  while (DoDecodeFrame(empty) == DecodeResult::DECODE_FRAME) {
+  }
+  mCallback->DrainComplete();
+}
+
+nsresult
+FFmpegH264Decoder<LIBAV_VER>::Drain()
+{
+  nsCOMPtr<nsIRunnable> runnable(
+    NS_NewRunnableMethod(this, &FFmpegH264Decoder<LIBAV_VER>::DoDrain));
+  mTaskQueue->Dispatch(runnable.forget());
+
+  return NS_OK;
+}
+
+nsresult
+FFmpegH264Decoder<LIBAV_VER>::Flush()
+{
+  nsresult rv = FFmpegDataDecoder::Flush();
+  // Even if the above fails we may as well clear our frame queue.
+  return rv;
+}
+
+FFmpegH264Decoder<LIBAV_VER>::~FFmpegH264Decoder()
+{
+  MOZ_COUNT_DTOR(FFmpegH264Decoder);
+}
+
+AVCodecID
+FFmpegH264Decoder<LIBAV_VER>::GetCodecId(const nsACString& aMimeType)
+{
+  if (aMimeType.EqualsLiteral("video/avc") || aMimeType.EqualsLiteral("video/mp4")) {
+    return AV_CODEC_ID_H264;
+  }
+
+  if (aMimeType.EqualsLiteral("video/x-vnd.on2.vp6")) {
+    return AV_CODEC_ID_VP6F;
+  }
+
+  return AV_CODEC_ID_NONE;
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegH264Decoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegH264Decoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegH264Decoder.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegH264Decoder.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,71 @@
+/* -*- 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 __FFmpegH264Decoder_h__
+#define __FFmpegH264Decoder_h__
+
+#include "FFmpegDataDecoder.h"
+
+namespace mozilla
+{
+
+template <int V>
+class FFmpegH264Decoder : public FFmpegDataDecoder<V>
+{
+};
+
+template <>
+class FFmpegH264Decoder<LIBAV_VER> : public FFmpegDataDecoder<LIBAV_VER>
+{
+  typedef mozilla::layers::Image Image;
+  typedef mozilla::layers::ImageContainer ImageContainer;
+
+  enum DecodeResult {
+    DECODE_FRAME,
+    DECODE_NO_FRAME,
+    DECODE_ERROR
+  };
+
+public:
+  FFmpegH264Decoder(FlushableMediaTaskQueue* aTaskQueue,
+                    MediaDataDecoderCallback* aCallback,
+                    const VideoInfo& aConfig,
+                    ImageContainer* aImageContainer);
+  virtual ~FFmpegH264Decoder();
+
+  virtual nsresult Init() override;
+  virtual nsresult Input(MediaRawData* aSample) override;
+  virtual nsresult Drain() override;
+  virtual nsresult Flush() override;
+  static AVCodecID GetCodecId(const nsACString& aMimeType);
+
+private:
+  void DecodeFrame(MediaRawData* aSample);
+  DecodeResult DoDecodeFrame(MediaRawData* aSample);
+  void DoDrain();
+  void OutputDelayedFrames();
+
+  /**
+   * This method allocates a buffer for FFmpeg's decoder, wrapped in an Image.
+   * Currently it only supports Planar YUV420, which appears to be the only
+   * non-hardware accelerated image format that FFmpeg's H264 decoder is
+   * capable of outputting.
+   */
+  int AllocateYUV420PVideoBuffer(AVCodecContext* aCodecContext,
+                                 AVFrame* aFrame);
+
+  static int AllocateBufferCb(AVCodecContext* aCodecContext, AVFrame* aFrame);
+  static void ReleaseBufferCb(AVCodecContext* aCodecContext, AVFrame* aFrame);
+
+  MediaDataDecoderCallback* mCallback;
+  nsRefPtr<ImageContainer> mImageContainer;
+  uint32_t mDisplayWidth;
+  uint32_t mDisplayHeight;
+};
+
+} // namespace mozilla
+
+#endif // __FFmpegH264Decoder_h__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegLibs.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegLibs.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegLibs.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegLibs.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,37 @@
+/* -*- 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 __FFmpegLibs_h__
+#define __FFmpegLibs_h__
+
+extern "C" {
+#pragma GCC visibility push(default)
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libavutil/imgutils.h>
+#pragma GCC visibility pop
+}
+
+#if LIBAVCODEC_VERSION_MAJOR < 55
+#define AV_CODEC_ID_VP6F CODEC_ID_VP6F
+#define AV_CODEC_ID_H264 CODEC_ID_H264
+#define AV_CODEC_ID_AAC CODEC_ID_AAC
+#define AV_CODEC_ID_MP3 CODEC_ID_MP3
+#define AV_CODEC_ID_NONE CODEC_ID_NONE
+typedef CodecID AVCodecID;
+#endif
+
+enum { LIBAV_VER = LIBAVFORMAT_VERSION_MAJOR };
+
+namespace mozilla {
+
+#define AV_FUNC(func, ver) extern typeof(func)* func;
+#include "FFmpegFunctionList.h"
+#undef AV_FUNC
+
+}
+
+#endif // __FFmpegLibs_h__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegLog.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegLog.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegLog.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegLog.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,17 @@
+/* -*- 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/Logging.h"
+
+PRLogModuleInfo* GetFFmpegDecoderLog()
+{
+  static PRLogModuleInfo* sFFmpegDecoderLog = nullptr;
+  if (!sFFmpegDecoderLog) {
+    sFFmpegDecoderLog = PR_NewLogModule("FFmpegDecoderModule");
+  }
+  return sFFmpegDecoderLog;
+}
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegLog.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegLog.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegLog.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegLog.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,13 @@
+/* -*- 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 __FFmpegLog_h__
+#define __FFmpegLog_h__
+
+extern PRLogModuleInfo* GetFFmpegDecoderLog();
+#define FFMPEG_LOG(...) MOZ_LOG(GetFFmpegDecoderLog(), PR_LOG_DEBUG, (__VA_ARGS__))
+
+#endif // __FFmpegLog_h__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,127 @@
+/* -*- 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 <dlfcn.h>
+
+#include "FFmpegRuntimeLinker.h"
+#include "mozilla/ArrayUtils.h"
+#include "FFmpegLog.h"
+
+#define NUM_ELEMENTS(X) (sizeof(X) / sizeof((X)[0]))
+
+namespace mozilla
+{
+
+FFmpegRuntimeLinker::LinkStatus FFmpegRuntimeLinker::sLinkStatus =
+  LinkStatus_INIT;
+
+struct AvFormatLib
+{
+  const char* Name;
+  already_AddRefed<PlatformDecoderModule> (*Factory)();
+  uint32_t Version;
+};
+
+template <int V> class FFmpegDecoderModule
+{
+public:
+  static already_AddRefed<PlatformDecoderModule> Create();
+};
+
+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 },
+  { "libavformat.56.dylib", FFmpegDecoderModule<55>::Create, 55 },
+  { "libavformat.55.dylib", FFmpegDecoderModule<55>::Create, 55 },
+  { "libavformat.54.dylib", FFmpegDecoderModule<54>::Create, 54 },
+  { "libavformat.53.dylib", FFmpegDecoderModule<53>::Create, 53 },
+};
+
+void* FFmpegRuntimeLinker::sLinkedLib = nullptr;
+const AvFormatLib* FFmpegRuntimeLinker::sLib = nullptr;
+
+#define AV_FUNC(func, ver) void (*func)();
+#define LIBAVCODEC_ALLVERSION
+#include "FFmpegFunctionList.h"
+#undef LIBAVCODEC_ALLVERSION
+#undef AV_FUNC
+
+/* static */ bool
+FFmpegRuntimeLinker::Link()
+{
+  if (sLinkStatus) {
+    return sLinkStatus == LinkStatus_SUCCEEDED;
+  }
+
+  MOZ_ASSERT(NS_IsMainThread());
+
+  for (size_t i = 0; i < ArrayLength(sLibs); i++) {
+    const AvFormatLib* lib = &sLibs[i];
+    sLinkedLib = dlopen(lib->Name, RTLD_NOW | RTLD_LOCAL);
+    if (sLinkedLib) {
+      if (Bind(lib->Name, lib->Version)) {
+        sLib = lib;
+        sLinkStatus = LinkStatus_SUCCEEDED;
+        return true;
+      }
+      // Shouldn't happen but if it does then we try the next lib..
+      Unlink();
+    }
+  }
+
+  FFMPEG_LOG("H264/AAC codecs unsupported without [");
+  for (size_t i = 0; i < ArrayLength(sLibs); i++) {
+    FFMPEG_LOG("%s %s", i ? "," : "", sLibs[i].Name);
+  }
+  FFMPEG_LOG(" ]\n");
+
+  Unlink();
+
+  sLinkStatus = LinkStatus_FAILED;
+  return false;
+}
+
+/* static */ bool
+FFmpegRuntimeLinker::Bind(const char* aLibName, uint32_t Version)
+{
+#define LIBAVCODEC_ALLVERSION
+#define AV_FUNC(func, ver)                                                     \
+  if (ver == 0 || ver == Version) {                                            \
+    if (!(func = (typeof(func))dlsym(sLinkedLib, #func))) {                    \
+      FFMPEG_LOG("Couldn't load function " #func " from %s.", aLibName);       \
+      return false;                                                            \
+    }                                                                          \
+  }
+#include "FFmpegFunctionList.h"
+#undef AV_FUNC
+#undef LIBAVCODEC_ALLVERSION
+  return true;
+}
+
+/* static */ already_AddRefed<PlatformDecoderModule>
+FFmpegRuntimeLinker::CreateDecoderModule()
+{
+  if (!Link()) {
+    return nullptr;
+  }
+  nsRefPtr<PlatformDecoderModule> module = sLib->Factory();
+  return module.forget();
+}
+
+/* static */ void
+FFmpegRuntimeLinker::Unlink()
+{
+  if (sLinkedLib) {
+    dlclose(sLinkedLib);
+    sLinkedLib = nullptr;
+    sLib = nullptr;
+    sLinkStatus = LinkStatus_INIT;
+  }
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,40 @@
+/* -*- 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 __FFmpegRuntimeLinker_h__
+#define __FFmpegRuntimeLinker_h__
+
+#include "PlatformDecoderModule.h"
+#include <stdint.h>
+
+namespace mozilla
+{
+
+struct AvFormatLib;
+
+class FFmpegRuntimeLinker
+{
+public:
+  static bool Link();
+  static void Unlink();
+  static already_AddRefed<PlatformDecoderModule> CreateDecoderModule();
+
+private:
+  static void* sLinkedLib;
+  static const AvFormatLib* sLib;
+
+  static bool Bind(const char* aLibName, uint32_t Version);
+
+  static enum LinkStatus {
+    LinkStatus_INIT = 0,
+    LinkStatus_FAILED,
+    LinkStatus_SUCCEEDED
+  } sLinkStatus;
+};
+
+}
+
+#endif // __FFmpegRuntimeLinker_h__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/COPYING.LGPLv2.1 firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/COPYING.LGPLv2.1
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/COPYING.LGPLv2.1	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/COPYING.LGPLv2.1	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,504 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavcodec/avcodec.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavcodec/avcodec.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavcodec/avcodec.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavcodec/avcodec.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,4761 @@
+/*
+ * copyright (c) 2001 Fabrice Bellard
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_AVCODEC_H
+#define AVCODEC_AVCODEC_H
+
+/**
+ * @file
+ * external API header
+ */
+
+#include <errno.h>
+#include "libavutil/samplefmt.h"
+#include "libavutil/avutil.h"
+#include "libavutil/cpu.h"
+#include "libavutil/dict.h"
+#include "libavutil/log.h"
+#include "libavutil/pixfmt.h"
+#include "libavutil/rational.h"
+
+#include "libavcodec/version.h"
+/**
+ * @defgroup libavc Encoding/Decoding Library
+ * @{
+ *
+ * @defgroup lavc_decoding Decoding
+ * @{
+ * @}
+ *
+ * @defgroup lavc_encoding Encoding
+ * @{
+ * @}
+ *
+ * @defgroup lavc_codec Codecs
+ * @{
+ * @defgroup lavc_codec_native Native Codecs
+ * @{
+ * @}
+ * @defgroup lavc_codec_wrappers External library wrappers
+ * @{
+ * @}
+ * @defgroup lavc_codec_hwaccel Hardware Accelerators bridge
+ * @{
+ * @}
+ * @}
+ * @defgroup lavc_internal Internal
+ * @{
+ * @}
+ * @}
+ *
+ */
+
+
+/**
+ * Identify the syntax and semantics of the bitstream.
+ * The principle is roughly:
+ * Two decoders with the same ID can decode the same streams.
+ * Two encoders with the same ID can encode compatible streams.
+ * There may be slight deviations from the principle due to implementation
+ * details.
+ *
+ * If you add a codec ID to this list, add it so that
+ * 1. no value of a existing codec ID changes (that would break ABI),
+ * 2. it is as close as possible to similar codecs.
+ */
+enum CodecID {
+    CODEC_ID_NONE,
+
+    /* video codecs */
+    CODEC_ID_MPEG1VIDEO,
+    CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
+    CODEC_ID_MPEG2VIDEO_XVMC,
+    CODEC_ID_H261,
+    CODEC_ID_H263,
+    CODEC_ID_RV10,
+    CODEC_ID_RV20,
+    CODEC_ID_MJPEG,
+    CODEC_ID_MJPEGB,
+    CODEC_ID_LJPEG,
+    CODEC_ID_SP5X,
+    CODEC_ID_JPEGLS,
+    CODEC_ID_MPEG4,
+    CODEC_ID_RAWVIDEO,
+    CODEC_ID_MSMPEG4V1,
+    CODEC_ID_MSMPEG4V2,
+    CODEC_ID_MSMPEG4V3,
+    CODEC_ID_WMV1,
+    CODEC_ID_WMV2,
+    CODEC_ID_H263P,
+    CODEC_ID_H263I,
+    CODEC_ID_FLV1,
+    CODEC_ID_SVQ1,
+    CODEC_ID_SVQ3,
+    CODEC_ID_DVVIDEO,
+    CODEC_ID_HUFFYUV,
+    CODEC_ID_CYUV,
+    CODEC_ID_H264,
+    CODEC_ID_INDEO3,
+    CODEC_ID_VP3,
+    CODEC_ID_THEORA,
+    CODEC_ID_ASV1,
+    CODEC_ID_ASV2,
+    CODEC_ID_FFV1,
+    CODEC_ID_4XM,
+    CODEC_ID_VCR1,
+    CODEC_ID_CLJR,
+    CODEC_ID_MDEC,
+    CODEC_ID_ROQ,
+    CODEC_ID_INTERPLAY_VIDEO,
+    CODEC_ID_XAN_WC3,
+    CODEC_ID_XAN_WC4,
+    CODEC_ID_RPZA,
+    CODEC_ID_CINEPAK,
+    CODEC_ID_WS_VQA,
+    CODEC_ID_MSRLE,
+    CODEC_ID_MSVIDEO1,
+    CODEC_ID_IDCIN,
+    CODEC_ID_8BPS,
+    CODEC_ID_SMC,
+    CODEC_ID_FLIC,
+    CODEC_ID_TRUEMOTION1,
+    CODEC_ID_VMDVIDEO,
+    CODEC_ID_MSZH,
+    CODEC_ID_ZLIB,
+    CODEC_ID_QTRLE,
+    CODEC_ID_SNOW,
+    CODEC_ID_TSCC,
+    CODEC_ID_ULTI,
+    CODEC_ID_QDRAW,
+    CODEC_ID_VIXL,
+    CODEC_ID_QPEG,
+    CODEC_ID_PNG,
+    CODEC_ID_PPM,
+    CODEC_ID_PBM,
+    CODEC_ID_PGM,
+    CODEC_ID_PGMYUV,
+    CODEC_ID_PAM,
+    CODEC_ID_FFVHUFF,
+    CODEC_ID_RV30,
+    CODEC_ID_RV40,
+    CODEC_ID_VC1,
+    CODEC_ID_WMV3,
+    CODEC_ID_LOCO,
+    CODEC_ID_WNV1,
+    CODEC_ID_AASC,
+    CODEC_ID_INDEO2,
+    CODEC_ID_FRAPS,
+    CODEC_ID_TRUEMOTION2,
+    CODEC_ID_BMP,
+    CODEC_ID_CSCD,
+    CODEC_ID_MMVIDEO,
+    CODEC_ID_ZMBV,
+    CODEC_ID_AVS,
+    CODEC_ID_SMACKVIDEO,
+    CODEC_ID_NUV,
+    CODEC_ID_KMVC,
+    CODEC_ID_FLASHSV,
+    CODEC_ID_CAVS,
+    CODEC_ID_JPEG2000,
+    CODEC_ID_VMNC,
+    CODEC_ID_VP5,
+    CODEC_ID_VP6,
+    CODEC_ID_VP6F,
+    CODEC_ID_TARGA,
+    CODEC_ID_DSICINVIDEO,
+    CODEC_ID_TIERTEXSEQVIDEO,
+    CODEC_ID_TIFF,
+    CODEC_ID_GIF,
+#if LIBAVCODEC_VERSION_MAJOR == 53
+    CODEC_ID_FFH264,
+#endif
+    CODEC_ID_DXA,
+    CODEC_ID_DNXHD,
+    CODEC_ID_THP,
+    CODEC_ID_SGI,
+    CODEC_ID_C93,
+    CODEC_ID_BETHSOFTVID,
+    CODEC_ID_PTX,
+    CODEC_ID_TXD,
+    CODEC_ID_VP6A,
+    CODEC_ID_AMV,
+    CODEC_ID_VB,
+    CODEC_ID_PCX,
+    CODEC_ID_SUNRAST,
+    CODEC_ID_INDEO4,
+    CODEC_ID_INDEO5,
+    CODEC_ID_MIMIC,
+    CODEC_ID_RL2,
+#if LIBAVCODEC_VERSION_MAJOR == 53
+    CODEC_ID_8SVX_EXP,
+    CODEC_ID_8SVX_FIB,
+#endif
+    CODEC_ID_ESCAPE124,
+    CODEC_ID_DIRAC,
+    CODEC_ID_BFI,
+    CODEC_ID_CMV,
+    CODEC_ID_MOTIONPIXELS,
+    CODEC_ID_TGV,
+    CODEC_ID_TGQ,
+    CODEC_ID_TQI,
+    CODEC_ID_AURA,
+    CODEC_ID_AURA2,
+    CODEC_ID_V210X,
+    CODEC_ID_TMV,
+    CODEC_ID_V210,
+    CODEC_ID_DPX,
+    CODEC_ID_MAD,
+    CODEC_ID_FRWU,
+    CODEC_ID_FLASHSV2,
+    CODEC_ID_CDGRAPHICS,
+    CODEC_ID_R210,
+    CODEC_ID_ANM,
+    CODEC_ID_BINKVIDEO,
+    CODEC_ID_IFF_ILBM,
+    CODEC_ID_IFF_BYTERUN1,
+    CODEC_ID_KGV1,
+    CODEC_ID_YOP,
+    CODEC_ID_VP8,
+    CODEC_ID_PICTOR,
+    CODEC_ID_ANSI,
+    CODEC_ID_A64_MULTI,
+    CODEC_ID_A64_MULTI5,
+    CODEC_ID_R10K,
+    CODEC_ID_MXPEG,
+    CODEC_ID_LAGARITH,
+    CODEC_ID_PRORES,
+    CODEC_ID_JV,
+    CODEC_ID_DFA,
+    CODEC_ID_WMV3IMAGE,
+    CODEC_ID_VC1IMAGE,
+#if LIBAVCODEC_VERSION_MAJOR == 53
+    CODEC_ID_G723_1,
+    CODEC_ID_G729,
+#endif
+    CODEC_ID_UTVIDEO,
+    CODEC_ID_BMV_VIDEO,
+    CODEC_ID_VBLE,
+    CODEC_ID_DXTORY,
+    CODEC_ID_V410,
+
+    /* various PCM "codecs" */
+    CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs
+    CODEC_ID_PCM_S16LE = 0x10000,
+    CODEC_ID_PCM_S16BE,
+    CODEC_ID_PCM_U16LE,
+    CODEC_ID_PCM_U16BE,
+    CODEC_ID_PCM_S8,
+    CODEC_ID_PCM_U8,
+    CODEC_ID_PCM_MULAW,
+    CODEC_ID_PCM_ALAW,
+    CODEC_ID_PCM_S32LE,
+    CODEC_ID_PCM_S32BE,
+    CODEC_ID_PCM_U32LE,
+    CODEC_ID_PCM_U32BE,
+    CODEC_ID_PCM_S24LE,
+    CODEC_ID_PCM_S24BE,
+    CODEC_ID_PCM_U24LE,
+    CODEC_ID_PCM_U24BE,
+    CODEC_ID_PCM_S24DAUD,
+    CODEC_ID_PCM_ZORK,
+    CODEC_ID_PCM_S16LE_PLANAR,
+    CODEC_ID_PCM_DVD,
+    CODEC_ID_PCM_F32BE,
+    CODEC_ID_PCM_F32LE,
+    CODEC_ID_PCM_F64BE,
+    CODEC_ID_PCM_F64LE,
+    CODEC_ID_PCM_BLURAY,
+    CODEC_ID_PCM_LXF,
+    CODEC_ID_S302M,
+    CODEC_ID_PCM_S8_PLANAR,
+
+    /* various ADPCM codecs */
+    CODEC_ID_ADPCM_IMA_QT = 0x11000,
+    CODEC_ID_ADPCM_IMA_WAV,
+    CODEC_ID_ADPCM_IMA_DK3,
+    CODEC_ID_ADPCM_IMA_DK4,
+    CODEC_ID_ADPCM_IMA_WS,
+    CODEC_ID_ADPCM_IMA_SMJPEG,
+    CODEC_ID_ADPCM_MS,
+    CODEC_ID_ADPCM_4XM,
+    CODEC_ID_ADPCM_XA,
+    CODEC_ID_ADPCM_ADX,
+    CODEC_ID_ADPCM_EA,
+    CODEC_ID_ADPCM_G726,
+    CODEC_ID_ADPCM_CT,
+    CODEC_ID_ADPCM_SWF,
+    CODEC_ID_ADPCM_YAMAHA,
+    CODEC_ID_ADPCM_SBPRO_4,
+    CODEC_ID_ADPCM_SBPRO_3,
+    CODEC_ID_ADPCM_SBPRO_2,
+    CODEC_ID_ADPCM_THP,
+    CODEC_ID_ADPCM_IMA_AMV,
+    CODEC_ID_ADPCM_EA_R1,
+    CODEC_ID_ADPCM_EA_R3,
+    CODEC_ID_ADPCM_EA_R2,
+    CODEC_ID_ADPCM_IMA_EA_SEAD,
+    CODEC_ID_ADPCM_IMA_EA_EACS,
+    CODEC_ID_ADPCM_EA_XAS,
+    CODEC_ID_ADPCM_EA_MAXIS_XA,
+    CODEC_ID_ADPCM_IMA_ISS,
+    CODEC_ID_ADPCM_G722,
+
+    /* AMR */
+    CODEC_ID_AMR_NB = 0x12000,
+    CODEC_ID_AMR_WB,
+
+    /* RealAudio codecs*/
+    CODEC_ID_RA_144 = 0x13000,
+    CODEC_ID_RA_288,
+
+    /* various DPCM codecs */
+    CODEC_ID_ROQ_DPCM = 0x14000,
+    CODEC_ID_INTERPLAY_DPCM,
+    CODEC_ID_XAN_DPCM,
+    CODEC_ID_SOL_DPCM,
+
+    /* audio codecs */
+    CODEC_ID_MP2 = 0x15000,
+    CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
+    CODEC_ID_AAC,
+    CODEC_ID_AC3,
+    CODEC_ID_DTS,
+    CODEC_ID_VORBIS,
+    CODEC_ID_DVAUDIO,
+    CODEC_ID_WMAV1,
+    CODEC_ID_WMAV2,
+    CODEC_ID_MACE3,
+    CODEC_ID_MACE6,
+    CODEC_ID_VMDAUDIO,
+#if LIBAVCODEC_VERSION_MAJOR == 53
+    CODEC_ID_SONIC,
+    CODEC_ID_SONIC_LS,
+#endif
+    CODEC_ID_FLAC,
+    CODEC_ID_MP3ADU,
+    CODEC_ID_MP3ON4,
+    CODEC_ID_SHORTEN,
+    CODEC_ID_ALAC,
+    CODEC_ID_WESTWOOD_SND1,
+    CODEC_ID_GSM, ///< as in Berlin toast format
+    CODEC_ID_QDM2,
+    CODEC_ID_COOK,
+    CODEC_ID_TRUESPEECH,
+    CODEC_ID_TTA,
+    CODEC_ID_SMACKAUDIO,
+    CODEC_ID_QCELP,
+    CODEC_ID_WAVPACK,
+    CODEC_ID_DSICINAUDIO,
+    CODEC_ID_IMC,
+    CODEC_ID_MUSEPACK7,
+    CODEC_ID_MLP,
+    CODEC_ID_GSM_MS, /* as found in WAV */
+    CODEC_ID_ATRAC3,
+    CODEC_ID_VOXWARE,
+    CODEC_ID_APE,
+    CODEC_ID_NELLYMOSER,
+    CODEC_ID_MUSEPACK8,
+    CODEC_ID_SPEEX,
+    CODEC_ID_WMAVOICE,
+    CODEC_ID_WMAPRO,
+    CODEC_ID_WMALOSSLESS,
+    CODEC_ID_ATRAC3P,
+    CODEC_ID_EAC3,
+    CODEC_ID_SIPR,
+    CODEC_ID_MP1,
+    CODEC_ID_TWINVQ,
+    CODEC_ID_TRUEHD,
+    CODEC_ID_MP4ALS,
+    CODEC_ID_ATRAC1,
+    CODEC_ID_BINKAUDIO_RDFT,
+    CODEC_ID_BINKAUDIO_DCT,
+    CODEC_ID_AAC_LATM,
+    CODEC_ID_QDMC,
+    CODEC_ID_CELT,
+#if LIBAVCODEC_VERSION_MAJOR > 53
+    CODEC_ID_G723_1,
+    CODEC_ID_G729,
+    CODEC_ID_8SVX_EXP,
+    CODEC_ID_8SVX_FIB,
+#endif
+    CODEC_ID_BMV_AUDIO,
+
+    /* subtitle codecs */
+    CODEC_ID_FIRST_SUBTITLE = 0x17000,          ///< A dummy ID pointing at the start of subtitle codecs.
+    CODEC_ID_DVD_SUBTITLE = 0x17000,
+    CODEC_ID_DVB_SUBTITLE,
+    CODEC_ID_TEXT,  ///< raw UTF-8 text
+    CODEC_ID_XSUB,
+    CODEC_ID_SSA,
+    CODEC_ID_MOV_TEXT,
+    CODEC_ID_HDMV_PGS_SUBTITLE,
+    CODEC_ID_DVB_TELETEXT,
+    CODEC_ID_SRT,
+
+    /* other specific kind of codecs (generally used for attachments) */
+    CODEC_ID_FIRST_UNKNOWN = 0x18000,           ///< A dummy ID pointing at the start of various fake codecs.
+    CODEC_ID_TTF = 0x18000,
+
+    CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it
+
+    CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
+                                * stream (only used by libavformat) */
+    CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
+                                * stream (only used by libavformat) */
+    CODEC_ID_FFMETADATA = 0x21000,   ///< Dummy codec for streams containing only metadata information.
+};
+
+#if FF_API_OLD_SAMPLE_FMT
+#define SampleFormat AVSampleFormat
+
+#define SAMPLE_FMT_NONE AV_SAMPLE_FMT_NONE
+#define SAMPLE_FMT_U8   AV_SAMPLE_FMT_U8
+#define SAMPLE_FMT_S16  AV_SAMPLE_FMT_S16
+#define SAMPLE_FMT_S32  AV_SAMPLE_FMT_S32
+#define SAMPLE_FMT_FLT  AV_SAMPLE_FMT_FLT
+#define SAMPLE_FMT_DBL  AV_SAMPLE_FMT_DBL
+#define SAMPLE_FMT_NB   AV_SAMPLE_FMT_NB
+#endif
+
+#if FF_API_OLD_AUDIOCONVERT
+#include "libavutil/audioconvert.h"
+
+/* Audio channel masks */
+#define CH_FRONT_LEFT            AV_CH_FRONT_LEFT
+#define CH_FRONT_RIGHT           AV_CH_FRONT_RIGHT
+#define CH_FRONT_CENTER          AV_CH_FRONT_CENTER
+#define CH_LOW_FREQUENCY         AV_CH_LOW_FREQUENCY
+#define CH_BACK_LEFT             AV_CH_BACK_LEFT
+#define CH_BACK_RIGHT            AV_CH_BACK_RIGHT
+#define CH_FRONT_LEFT_OF_CENTER  AV_CH_FRONT_LEFT_OF_CENTER
+#define CH_FRONT_RIGHT_OF_CENTER AV_CH_FRONT_RIGHT_OF_CENTER
+#define CH_BACK_CENTER           AV_CH_BACK_CENTER
+#define CH_SIDE_LEFT             AV_CH_SIDE_LEFT
+#define CH_SIDE_RIGHT            AV_CH_SIDE_RIGHT
+#define CH_TOP_CENTER            AV_CH_TOP_CENTER
+#define CH_TOP_FRONT_LEFT        AV_CH_TOP_FRONT_LEFT
+#define CH_TOP_FRONT_CENTER      AV_CH_TOP_FRONT_CENTER
+#define CH_TOP_FRONT_RIGHT       AV_CH_TOP_FRONT_RIGHT
+#define CH_TOP_BACK_LEFT         AV_CH_TOP_BACK_LEFT
+#define CH_TOP_BACK_CENTER       AV_CH_TOP_BACK_CENTER
+#define CH_TOP_BACK_RIGHT        AV_CH_TOP_BACK_RIGHT
+#define CH_STEREO_LEFT           AV_CH_STEREO_LEFT
+#define CH_STEREO_RIGHT          AV_CH_STEREO_RIGHT
+
+/** Channel mask value used for AVCodecContext.request_channel_layout
+    to indicate that the user requests the channel order of the decoder output
+    to be the native codec channel order. */
+#define CH_LAYOUT_NATIVE         AV_CH_LAYOUT_NATIVE
+
+/* Audio channel convenience macros */
+#define CH_LAYOUT_MONO           AV_CH_LAYOUT_MONO
+#define CH_LAYOUT_STEREO         AV_CH_LAYOUT_STEREO
+#define CH_LAYOUT_2_1            AV_CH_LAYOUT_2_1
+#define CH_LAYOUT_SURROUND       AV_CH_LAYOUT_SURROUND
+#define CH_LAYOUT_4POINT0        AV_CH_LAYOUT_4POINT0
+#define CH_LAYOUT_2_2            AV_CH_LAYOUT_2_2
+#define CH_LAYOUT_QUAD           AV_CH_LAYOUT_QUAD
+#define CH_LAYOUT_5POINT0        AV_CH_LAYOUT_5POINT0
+#define CH_LAYOUT_5POINT1        AV_CH_LAYOUT_5POINT1
+#define CH_LAYOUT_5POINT0_BACK   AV_CH_LAYOUT_5POINT0_BACK
+#define CH_LAYOUT_5POINT1_BACK   AV_CH_LAYOUT_5POINT1_BACK
+#define CH_LAYOUT_7POINT0        AV_CH_LAYOUT_7POINT0
+#define CH_LAYOUT_7POINT1        AV_CH_LAYOUT_7POINT1
+#define CH_LAYOUT_7POINT1_WIDE   AV_CH_LAYOUT_7POINT1_WIDE
+#define CH_LAYOUT_STEREO_DOWNMIX AV_CH_LAYOUT_STEREO_DOWNMIX
+#endif
+
+#if FF_API_OLD_DECODE_AUDIO
+/* in bytes */
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
+#endif
+
+/**
+ * Required number of additionally allocated bytes at the end of the input bitstream for decoding.
+ * This is mainly needed because some optimized bitstream readers read
+ * 32 or 64 bit at once and could read over the end.<br>
+ * Note: If the first 23 bits of the additional bytes are not 0, then damaged
+ * MPEG bitstreams could cause overread and segfault.
+ */
+#define FF_INPUT_BUFFER_PADDING_SIZE 8
+
+/**
+ * minimum encoding buffer size
+ * Used to avoid some checks during header writing.
+ */
+#define FF_MIN_BUFFER_SIZE 16384
+
+
+/**
+ * motion estimation type.
+ */
+enum Motion_Est_ID {
+    ME_ZERO = 1,    ///< no search, that is use 0,0 vector whenever one is needed
+    ME_FULL,
+    ME_LOG,
+    ME_PHODS,
+    ME_EPZS,        ///< enhanced predictive zonal search
+    ME_X1,          ///< reserved for experiments
+    ME_HEX,         ///< hexagon based search
+    ME_UMH,         ///< uneven multi-hexagon search
+    ME_ITER,        ///< iterative search
+    ME_TESA,        ///< transformed exhaustive search algorithm
+};
+
+enum AVDiscard{
+    /* We leave some space between them for extensions (drop some
+     * keyframes for intra-only or drop just some bidir frames). */
+    AVDISCARD_NONE   =-16, ///< discard nothing
+    AVDISCARD_DEFAULT=  0, ///< discard useless packets like 0 size packets in avi
+    AVDISCARD_NONREF =  8, ///< discard all non reference
+    AVDISCARD_BIDIR  = 16, ///< discard all bidirectional frames
+    AVDISCARD_NONKEY = 32, ///< discard all frames except keyframes
+    AVDISCARD_ALL    = 48, ///< discard all
+};
+
+enum AVColorPrimaries{
+    AVCOL_PRI_BT709      =1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B
+    AVCOL_PRI_UNSPECIFIED=2,
+    AVCOL_PRI_BT470M     =4,
+    AVCOL_PRI_BT470BG    =5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM
+    AVCOL_PRI_SMPTE170M  =6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
+    AVCOL_PRI_SMPTE240M  =7, ///< functionally identical to above
+    AVCOL_PRI_FILM       =8,
+    AVCOL_PRI_NB           , ///< Not part of ABI
+};
+
+enum AVColorTransferCharacteristic{
+    AVCOL_TRC_BT709      =1, ///< also ITU-R BT1361
+    AVCOL_TRC_UNSPECIFIED=2,
+    AVCOL_TRC_GAMMA22    =4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
+    AVCOL_TRC_GAMMA28    =5, ///< also ITU-R BT470BG
+    AVCOL_TRC_NB           , ///< Not part of ABI
+};
+
+enum AVColorSpace{
+    AVCOL_SPC_RGB        =0,
+    AVCOL_SPC_BT709      =1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
+    AVCOL_SPC_UNSPECIFIED=2,
+    AVCOL_SPC_FCC        =4,
+    AVCOL_SPC_BT470BG    =5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
+    AVCOL_SPC_SMPTE170M  =6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
+    AVCOL_SPC_SMPTE240M  =7,
+    AVCOL_SPC_NB           , ///< Not part of ABI
+};
+
+enum AVColorRange{
+    AVCOL_RANGE_UNSPECIFIED=0,
+    AVCOL_RANGE_MPEG       =1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges
+    AVCOL_RANGE_JPEG       =2, ///< the normal     2^n-1   "JPEG" YUV ranges
+    AVCOL_RANGE_NB           , ///< Not part of ABI
+};
+
+/**
+ *  X   X      3 4 X      X are luma samples,
+ *             1 2        1-6 are possible chroma positions
+ *  X   X      5 6 X      0 is undefined/unknown position
+ */
+enum AVChromaLocation{
+    AVCHROMA_LOC_UNSPECIFIED=0,
+    AVCHROMA_LOC_LEFT       =1, ///< mpeg2/4, h264 default
+    AVCHROMA_LOC_CENTER     =2, ///< mpeg1, jpeg, h263
+    AVCHROMA_LOC_TOPLEFT    =3, ///< DV
+    AVCHROMA_LOC_TOP        =4,
+    AVCHROMA_LOC_BOTTOMLEFT =5,
+    AVCHROMA_LOC_BOTTOM     =6,
+    AVCHROMA_LOC_NB           , ///< Not part of ABI
+};
+
+#if FF_API_FLAC_GLOBAL_OPTS
+/**
+ * LPC analysis type
+ */
+enum AVLPCType {
+    AV_LPC_TYPE_DEFAULT     = -1, ///< use the codec default LPC type
+    AV_LPC_TYPE_NONE        =  0, ///< do not use LPC prediction or use all zero coefficients
+    AV_LPC_TYPE_FIXED       =  1, ///< fixed LPC coefficients
+    AV_LPC_TYPE_LEVINSON    =  2, ///< Levinson-Durbin recursion
+    AV_LPC_TYPE_CHOLESKY    =  3, ///< Cholesky factorization
+    AV_LPC_TYPE_NB              , ///< Not part of ABI
+};
+#endif
+
+enum AVAudioServiceType {
+    AV_AUDIO_SERVICE_TYPE_MAIN              = 0,
+    AV_AUDIO_SERVICE_TYPE_EFFECTS           = 1,
+    AV_AUDIO_SERVICE_TYPE_VISUALLY_IMPAIRED = 2,
+    AV_AUDIO_SERVICE_TYPE_HEARING_IMPAIRED  = 3,
+    AV_AUDIO_SERVICE_TYPE_DIALOGUE          = 4,
+    AV_AUDIO_SERVICE_TYPE_COMMENTARY        = 5,
+    AV_AUDIO_SERVICE_TYPE_EMERGENCY         = 6,
+    AV_AUDIO_SERVICE_TYPE_VOICE_OVER        = 7,
+    AV_AUDIO_SERVICE_TYPE_KARAOKE           = 8,
+    AV_AUDIO_SERVICE_TYPE_NB                   , ///< Not part of ABI
+};
+
+typedef struct RcOverride{
+    int start_frame;
+    int end_frame;
+    int qscale; // If this is 0 then quality_factor will be used instead.
+    float quality_factor;
+} RcOverride;
+
+#define FF_MAX_B_FRAMES 16
+
+/* encoding support
+   These flags can be passed in AVCodecContext.flags before initialization.
+   Note: Not everything is supported yet.
+*/
+
+#define CODEC_FLAG_QSCALE 0x0002  ///< Use fixed qscale.
+#define CODEC_FLAG_4MV    0x0004  ///< 4 MV per MB allowed / advanced prediction for H.263.
+#define CODEC_FLAG_QPEL   0x0010  ///< Use qpel MC.
+#define CODEC_FLAG_GMC    0x0020  ///< Use GMC.
+#define CODEC_FLAG_MV0    0x0040  ///< Always try a MB with MV=<0,0>.
+/**
+ * The parent program guarantees that the input for B-frames containing
+ * streams is not written to for at least s->max_b_frames+1 frames, if
+ * this is not set the input will be copied.
+ */
+#define CODEC_FLAG_INPUT_PRESERVED 0x0100
+#define CODEC_FLAG_PASS1           0x0200   ///< Use internal 2pass ratecontrol in first pass mode.
+#define CODEC_FLAG_PASS2           0x0400   ///< Use internal 2pass ratecontrol in second pass mode.
+#define CODEC_FLAG_GRAY            0x2000   ///< Only decode/encode grayscale.
+#define CODEC_FLAG_EMU_EDGE        0x4000   ///< Don't draw edges.
+#define CODEC_FLAG_PSNR            0x8000   ///< error[?] variables will be set during encoding.
+#define CODEC_FLAG_TRUNCATED       0x00010000 /** Input bitstream might be truncated at a random
+                                                  location instead of only at frame boundaries. */
+#define CODEC_FLAG_NORMALIZE_AQP  0x00020000 ///< Normalize adaptive quantization.
+#define CODEC_FLAG_INTERLACED_DCT 0x00040000 ///< Use interlaced DCT.
+#define CODEC_FLAG_LOW_DELAY      0x00080000 ///< Force low delay.
+#define CODEC_FLAG_GLOBAL_HEADER  0x00400000 ///< Place global headers in extradata instead of every keyframe.
+#define CODEC_FLAG_BITEXACT       0x00800000 ///< Use only bitexact stuff (except (I)DCT).
+/* Fx : Flag for h263+ extra options */
+#define CODEC_FLAG_AC_PRED        0x01000000 ///< H.263 advanced intra coding / MPEG-4 AC prediction
+#define CODEC_FLAG_CBP_RD         0x04000000 ///< Use rate distortion optimization for cbp.
+#define CODEC_FLAG_QP_RD          0x08000000 ///< Use rate distortion optimization for qp selectioon.
+#define CODEC_FLAG_LOOP_FILTER    0x00000800 ///< loop filter
+#define CODEC_FLAG_INTERLACED_ME  0x20000000 ///< interlaced motion estimation
+#define CODEC_FLAG_CLOSED_GOP     0x80000000
+#define CODEC_FLAG2_FAST          0x00000001 ///< Allow non spec compliant speedup tricks.
+#define CODEC_FLAG2_STRICT_GOP    0x00000002 ///< Strictly enforce GOP size.
+#define CODEC_FLAG2_NO_OUTPUT     0x00000004 ///< Skip bitstream encoding.
+#define CODEC_FLAG2_LOCAL_HEADER  0x00000008 ///< Place global headers at every keyframe instead of in extradata.
+#define CODEC_FLAG2_SKIP_RD       0x00004000 ///< RD optimal MB level residual skipping
+#define CODEC_FLAG2_CHUNKS        0x00008000 ///< Input bitstream might be truncated at a packet boundaries instead of only at frame boundaries.
+/**
+ * @defgroup deprecated_flags Deprecated codec flags
+ * Use corresponding private codec options instead.
+ * @{
+ */
+#if FF_API_MPEGVIDEO_GLOBAL_OPTS
+#define CODEC_FLAG_OBMC           0x00000001 ///< OBMC
+#define CODEC_FLAG_H263P_AIV      0x00000008 ///< H.263 alternative inter VLC
+#define CODEC_FLAG_PART   0x0080  ///< Use data partitioning.
+#define CODEC_FLAG_ALT_SCAN       0x00100000 ///< Use alternate scan.
+#define CODEC_FLAG_H263P_UMV      0x02000000 ///< unlimited motion vector
+#define CODEC_FLAG_H263P_SLICE_STRUCT 0x10000000
+#define CODEC_FLAG_SVCD_SCAN_OFFSET 0x40000000 ///< Will reserve space for SVCD scan offset user data.
+#define CODEC_FLAG2_INTRA_VLC     0x00000800 ///< Use MPEG-2 intra VLC table.
+#define CODEC_FLAG2_DROP_FRAME_TIMECODE 0x00002000 ///< timecode is in drop frame format.
+#define CODEC_FLAG2_NON_LINEAR_QUANT 0x00010000 ///< Use MPEG-2 nonlinear quantizer.
+#endif
+#if FF_API_MJPEG_GLOBAL_OPTS
+#define CODEC_FLAG_EXTERN_HUFF     0x1000   ///< Use external Huffman table (for MJPEG).
+#endif
+#if FF_API_X264_GLOBAL_OPTS
+#define CODEC_FLAG2_BPYRAMID      0x00000010 ///< H.264 allow B-frames to be used as references.
+#define CODEC_FLAG2_WPRED         0x00000020 ///< H.264 weighted biprediction for B-frames
+#define CODEC_FLAG2_MIXED_REFS    0x00000040 ///< H.264 one reference per partition, as opposed to one reference per macroblock
+#define CODEC_FLAG2_8X8DCT        0x00000080 ///< H.264 high profile 8x8 transform
+#define CODEC_FLAG2_FASTPSKIP     0x00000100 ///< H.264 fast pskip
+#define CODEC_FLAG2_AUD           0x00000200 ///< H.264 access unit delimiters
+#define CODEC_FLAG2_BRDO          0x00000400 ///< B-frame rate-distortion optimization
+#define CODEC_FLAG2_MBTREE        0x00040000 ///< Use macroblock tree ratecontrol (x264 only)
+#define CODEC_FLAG2_PSY           0x00080000 ///< Use psycho visual optimizations.
+#define CODEC_FLAG2_SSIM          0x00100000 ///< Compute SSIM during encoding, error[] values are undefined.
+#define CODEC_FLAG2_INTRA_REFRESH 0x00200000 ///< Use periodic insertion of intra blocks instead of keyframes.
+#endif
+#if FF_API_SNOW_GLOBAL_OPTS
+#define CODEC_FLAG2_MEMC_ONLY     0x00001000 ///< Only do ME/MC (I frames -> ref, P frame -> ME+MC).
+#endif
+#if FF_API_LAME_GLOBAL_OPTS
+#define CODEC_FLAG2_BIT_RESERVOIR 0x00020000 ///< Use a bit reservoir when encoding if possible
+#endif
+/**
+ * @}
+ */
+
+/* Unsupported options :
+ *              Syntax Arithmetic coding (SAC)
+ *              Reference Picture Selection
+ *              Independent Segment Decoding */
+/* /Fx */
+/* codec capabilities */
+
+#define CODEC_CAP_DRAW_HORIZ_BAND 0x0001 ///< Decoder can use draw_horiz_band callback.
+/**
+ * Codec uses get_buffer() for allocating buffers and supports custom allocators.
+ * If not set, it might not use get_buffer() at all or use operations that
+ * assume the buffer was allocated by avcodec_default_get_buffer.
+ */
+#define CODEC_CAP_DR1             0x0002
+#if FF_API_PARSE_FRAME
+/* If 'parse_only' field is true, then avcodec_parse_frame() can be used. */
+#define CODEC_CAP_PARSE_ONLY      0x0004
+#endif
+#define CODEC_CAP_TRUNCATED       0x0008
+/* Codec can export data for HW decoding (XvMC). */
+#define CODEC_CAP_HWACCEL         0x0010
+/**
+ * Encoder or decoder requires flushing with NULL input at the end in order to
+ * give the complete and correct output.
+ *
+ * NOTE: If this flag is not set, the codec is guaranteed to never be fed with
+ *       with NULL data. The user can still send NULL data to the public encode
+ *       or decode function, but libavcodec will not pass it along to the codec
+ *       unless this flag is set.
+ *
+ * Decoders:
+ * The decoder has a non-zero delay and needs to be fed with avpkt->data=NULL,
+ * avpkt->size=0 at the end to get the delayed data until the decoder no longer
+ * returns frames.
+ *
+ * Encoders:
+ * The encoder needs to be fed with NULL data at the end of encoding until the
+ * encoder no longer returns data.
+ *
+ * NOTE: For encoders implementing the AVCodec.encode2() function, setting this
+ *       flag also means that the encoder must set the pts and duration for
+ *       each output packet. If this flag is not set, the pts and duration will
+ *       be determined by libavcodec from the input frame.
+ */
+#define CODEC_CAP_DELAY           0x0020
+/**
+ * Codec can be fed a final frame with a smaller size.
+ * This can be used to prevent truncation of the last audio samples.
+ */
+#define CODEC_CAP_SMALL_LAST_FRAME 0x0040
+/**
+ * Codec can export data for HW decoding (VDPAU).
+ */
+#define CODEC_CAP_HWACCEL_VDPAU    0x0080
+/**
+ * Codec can output multiple frames per AVPacket
+ * Normally demuxers return one frame at a time, demuxers which do not do
+ * are connected to a parser to split what they return into proper frames.
+ * This flag is reserved to the very rare category of codecs which have a
+ * bitstream that cannot be split into frames without timeconsuming
+ * operations like full decoding. Demuxers carring such bitstreams thus
+ * may return multiple frames in a packet. This has many disadvantages like
+ * prohibiting stream copy in many cases thus it should only be considered
+ * as a last resort.
+ */
+#define CODEC_CAP_SUBFRAMES        0x0100
+/**
+ * Codec is experimental and is thus avoided in favor of non experimental
+ * encoders
+ */
+#define CODEC_CAP_EXPERIMENTAL     0x0200
+/**
+ * Codec should fill in channel configuration and samplerate instead of container
+ */
+#define CODEC_CAP_CHANNEL_CONF     0x0400
+/**
+ * Codec is able to deal with negative linesizes
+ */
+#define CODEC_CAP_NEG_LINESIZES    0x0800
+/**
+ * Codec supports frame-level multithreading.
+ */
+#define CODEC_CAP_FRAME_THREADS    0x1000
+/**
+ * Codec supports slice-based (or partition-based) multithreading.
+ */
+#define CODEC_CAP_SLICE_THREADS    0x2000
+/**
+ * Codec supports changed parameters at any point.
+ */
+#define CODEC_CAP_PARAM_CHANGE     0x4000
+/**
+ * Codec supports avctx->thread_count == 0 (auto).
+ */
+#define CODEC_CAP_AUTO_THREADS     0x8000
+/**
+ * Audio encoder supports receiving a different number of samples in each call.
+ */
+#define CODEC_CAP_VARIABLE_FRAME_SIZE 0x10000
+
+//The following defines may change, don't expect compatibility if you use them.
+#define MB_TYPE_INTRA4x4   0x0001
+#define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific
+#define MB_TYPE_INTRA_PCM  0x0004 //FIXME H.264-specific
+#define MB_TYPE_16x16      0x0008
+#define MB_TYPE_16x8       0x0010
+#define MB_TYPE_8x16       0x0020
+#define MB_TYPE_8x8        0x0040
+#define MB_TYPE_INTERLACED 0x0080
+#define MB_TYPE_DIRECT2    0x0100 //FIXME
+#define MB_TYPE_ACPRED     0x0200
+#define MB_TYPE_GMC        0x0400
+#define MB_TYPE_SKIP       0x0800
+#define MB_TYPE_P0L0       0x1000
+#define MB_TYPE_P1L0       0x2000
+#define MB_TYPE_P0L1       0x4000
+#define MB_TYPE_P1L1       0x8000
+#define MB_TYPE_L0         (MB_TYPE_P0L0 | MB_TYPE_P1L0)
+#define MB_TYPE_L1         (MB_TYPE_P0L1 | MB_TYPE_P1L1)
+#define MB_TYPE_L0L1       (MB_TYPE_L0   | MB_TYPE_L1)
+#define MB_TYPE_QUANT      0x00010000
+#define MB_TYPE_CBP        0x00020000
+//Note bits 24-31 are reserved for codec specific use (h264 ref0, mpeg1 0mv, ...)
+
+/**
+ * Pan Scan area.
+ * This specifies the area which should be displayed.
+ * Note there may be multiple such areas for one frame.
+ */
+typedef struct AVPanScan{
+    /**
+     * id
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    int id;
+
+    /**
+     * width and height in 1/16 pel
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    int width;
+    int height;
+
+    /**
+     * position of the top left corner in 1/16 pel for up to 3 fields/frames
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    int16_t position[3][2];
+}AVPanScan;
+
+#define FF_QSCALE_TYPE_MPEG1 0
+#define FF_QSCALE_TYPE_MPEG2 1
+#define FF_QSCALE_TYPE_H264  2
+#define FF_QSCALE_TYPE_VP56  3
+
+#define FF_BUFFER_TYPE_INTERNAL 1
+#define FF_BUFFER_TYPE_USER     2 ///< direct rendering buffers (image is (de)allocated by user)
+#define FF_BUFFER_TYPE_SHARED   4 ///< Buffer from somewhere else; don't deallocate image (data/base), all other tables are not shared.
+#define FF_BUFFER_TYPE_COPY     8 ///< Just a (modified) copy of some other buffer, don't deallocate anything.
+
+#if FF_API_OLD_FF_PICT_TYPES
+/* DEPRECATED, directly use the AV_PICTURE_TYPE_* enum values */
+#define FF_I_TYPE  AV_PICTURE_TYPE_I  ///< Intra
+#define FF_P_TYPE  AV_PICTURE_TYPE_P  ///< Predicted
+#define FF_B_TYPE  AV_PICTURE_TYPE_B  ///< Bi-dir predicted
+#define FF_S_TYPE  AV_PICTURE_TYPE_S  ///< S(GMC)-VOP MPEG4
+#define FF_SI_TYPE AV_PICTURE_TYPE_SI ///< Switching Intra
+#define FF_SP_TYPE AV_PICTURE_TYPE_SP ///< Switching Predicted
+#define FF_BI_TYPE AV_PICTURE_TYPE_BI
+#endif
+
+#define FF_BUFFER_HINTS_VALID    0x01 // Buffer hints value is meaningful (if 0 ignore).
+#define FF_BUFFER_HINTS_READABLE 0x02 // Codec will read from buffer.
+#define FF_BUFFER_HINTS_PRESERVE 0x04 // User must not alter buffer content.
+#define FF_BUFFER_HINTS_REUSABLE 0x08 // Codec will reuse the buffer (update).
+
+enum AVPacketSideDataType {
+    AV_PKT_DATA_PALETTE,
+    AV_PKT_DATA_NEW_EXTRADATA,
+    AV_PKT_DATA_PARAM_CHANGE,
+};
+
+typedef struct AVPacket {
+    /**
+     * Presentation timestamp in AVStream->time_base units; the time at which
+     * the decompressed packet will be presented to the user.
+     * Can be AV_NOPTS_VALUE if it is not stored in the file.
+     * pts MUST be larger or equal to dts as presentation cannot happen before
+     * decompression, unless one wants to view hex dumps. Some formats misuse
+     * the terms dts and pts/cts to mean something different. Such timestamps
+     * must be converted to true pts/dts before they are stored in AVPacket.
+     */
+    int64_t pts;
+    /**
+     * Decompression timestamp in AVStream->time_base units; the time at which
+     * the packet is decompressed.
+     * Can be AV_NOPTS_VALUE if it is not stored in the file.
+     */
+    int64_t dts;
+    uint8_t *data;
+    int   size;
+    int   stream_index;
+    /**
+     * A combination of AV_PKT_FLAG values
+     */
+    int   flags;
+    /**
+     * Additional packet data that can be provided by the container.
+     * Packet can contain several types of side information.
+     */
+    struct {
+        uint8_t *data;
+        int      size;
+        enum AVPacketSideDataType type;
+    } *side_data;
+    int side_data_elems;
+
+    /**
+     * Duration of this packet in AVStream->time_base units, 0 if unknown.
+     * Equals next_pts - this_pts in presentation order.
+     */
+    int   duration;
+    void  (*destruct)(struct AVPacket *);
+    void  *priv;
+    int64_t pos;                            ///< byte position in stream, -1 if unknown
+
+    /**
+     * Time difference in AVStream->time_base units from the pts of this
+     * packet to the point at which the output from the decoder has converged
+     * independent from the availability of previous frames. That is, the
+     * frames are virtually identical no matter if decoding started from
+     * the very first frame or from this keyframe.
+     * Is AV_NOPTS_VALUE if unknown.
+     * This field is not the display duration of the current packet.
+     * This field has no meaning if the packet does not have AV_PKT_FLAG_KEY
+     * set.
+     *
+     * The purpose of this field is to allow seeking in streams that have no
+     * keyframes in the conventional sense. It corresponds to the
+     * recovery point SEI in H.264 and match_time_delta in NUT. It is also
+     * essential for some types of subtitle streams to ensure that all
+     * subtitles are correctly displayed after seeking.
+     */
+    int64_t convergence_duration;
+} AVPacket;
+#define AV_PKT_FLAG_KEY     0x0001 ///< The packet contains a keyframe
+#define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted
+
+/**
+ * An AV_PKT_DATA_PARAM_CHANGE side data packet is laid out as follows:
+ * u32le param_flags
+ * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT)
+ *     s32le channel_count
+ * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT)
+ *     u64le channel_layout
+ * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE)
+ *     s32le sample_rate
+ * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS)
+ *     s32le width
+ *     s32le height
+ */
+
+enum AVSideDataParamChangeFlags {
+    AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT  = 0x0001,
+    AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT = 0x0002,
+    AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE    = 0x0004,
+    AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS     = 0x0008,
+};
+
+/**
+ * Audio Video Frame.
+ * New fields can be added to the end of AVFRAME with minor version
+ * bumps. Removal, reordering and changes to existing fields require
+ * a major version bump.
+ * sizeof(AVFrame) must not be used outside libav*.
+ */
+typedef struct AVFrame {
+#if FF_API_DATA_POINTERS
+#define AV_NUM_DATA_POINTERS 4
+#else
+#define AV_NUM_DATA_POINTERS 8
+#endif
+    /**
+     * pointer to the picture/channel planes.
+     * This might be different from the first allocated byte
+     * - encoding: Set by user
+     * - decoding: set by AVCodecContext.get_buffer()
+     */
+    uint8_t *data[AV_NUM_DATA_POINTERS];
+
+    /**
+     * Size, in bytes, of the data for each picture/channel plane.
+     *
+     * For audio, only linesize[0] may be set. For planar audio, each channel
+     * plane must be the same size.
+     *
+     * - encoding: Set by user (video only)
+     * - decoding: set by AVCodecContext.get_buffer()
+     */
+    int linesize[AV_NUM_DATA_POINTERS];
+
+    /**
+     * pointer to the first allocated byte of the picture. Can be used in get_buffer/release_buffer.
+     * This isn't used by libavcodec unless the default get/release_buffer() is used.
+     * - encoding:
+     * - decoding:
+     */
+    uint8_t *base[AV_NUM_DATA_POINTERS];
+    /**
+     * 1 -> keyframe, 0-> not
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by libavcodec.
+     */
+    int key_frame;
+
+    /**
+     * Picture type of the frame, see ?_TYPE below.
+     * - encoding: Set by libavcodec. for coded_picture (and set by user for input).
+     * - decoding: Set by libavcodec.
+     */
+    enum AVPictureType pict_type;
+
+    /**
+     * presentation timestamp in time_base units (time when frame should be shown to user)
+     * If AV_NOPTS_VALUE then frame_rate = 1/time_base will be assumed.
+     * - encoding: MUST be set by user.
+     * - decoding: Set by libavcodec.
+     */
+    int64_t pts;
+
+    /**
+     * picture number in bitstream order
+     * - encoding: set by
+     * - decoding: Set by libavcodec.
+     */
+    int coded_picture_number;
+    /**
+     * picture number in display order
+     * - encoding: set by
+     * - decoding: Set by libavcodec.
+     */
+    int display_picture_number;
+
+    /**
+     * quality (between 1 (good) and FF_LAMBDA_MAX (bad))
+     * - encoding: Set by libavcodec. for coded_picture (and set by user for input).
+     * - decoding: Set by libavcodec.
+     */
+    int quality;
+
+#if FF_API_AVFRAME_AGE
+    /**
+     * @deprecated unused
+     */
+    attribute_deprecated int age;
+#endif
+
+    /**
+     * is this picture used as reference
+     * The values for this are the same as the MpegEncContext.picture_structure
+     * variable, that is 1->top field, 2->bottom field, 3->frame/both fields.
+     * Set to 4 for delayed, non-reference frames.
+     * - encoding: unused
+     * - decoding: Set by libavcodec. (before get_buffer() call)).
+     */
+    int reference;
+
+    /**
+     * QP table
+     * - encoding: unused
+     * - decoding: Set by libavcodec.
+     */
+    int8_t *qscale_table;
+    /**
+     * QP store stride
+     * - encoding: unused
+     * - decoding: Set by libavcodec.
+     */
+    int qstride;
+
+    /**
+     * mbskip_table[mb]>=1 if MB didn't change
+     * stride= mb_width = (width+15)>>4
+     * - encoding: unused
+     * - decoding: Set by libavcodec.
+     */
+    uint8_t *mbskip_table;
+
+    /**
+     * motion vector table
+     * @code
+     * example:
+     * int mv_sample_log2= 4 - motion_subsample_log2;
+     * int mb_width= (width+15)>>4;
+     * int mv_stride= (mb_width << mv_sample_log2) + 1;
+     * motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y];
+     * @endcode
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    int16_t (*motion_val[2])[2];
+
+    /**
+     * macroblock type table
+     * mb_type_base + mb_width + 2
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    uint32_t *mb_type;
+
+    /**
+     * log2 of the size of the block which a single vector in motion_val represents:
+     * (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2)
+     * - encoding: unused
+     * - decoding: Set by libavcodec.
+     */
+    uint8_t motion_subsample_log2;
+
+    /**
+     * for some private data of the user
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    void *opaque;
+
+    /**
+     * error
+     * - encoding: Set by libavcodec. if flags&CODEC_FLAG_PSNR.
+     * - decoding: unused
+     */
+    uint64_t error[AV_NUM_DATA_POINTERS];
+
+    /**
+     * type of the buffer (to keep track of who has to deallocate data[*])
+     * - encoding: Set by the one who allocates it.
+     * - decoding: Set by the one who allocates it.
+     * Note: User allocated (direct rendering) & internal buffers cannot coexist currently.
+     */
+    int type;
+
+    /**
+     * When decoding, this signals how much the picture must be delayed.
+     * extra_delay = repeat_pict / (2*fps)
+     * - encoding: unused
+     * - decoding: Set by libavcodec.
+     */
+    int repeat_pict;
+
+    /**
+     *
+     */
+    int qscale_type;
+
+    /**
+     * The content of the picture is interlaced.
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec. (default 0)
+     */
+    int interlaced_frame;
+
+    /**
+     * If the content is interlaced, is top field displayed first.
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    int top_field_first;
+
+    /**
+     * Pan scan.
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    AVPanScan *pan_scan;
+
+    /**
+     * Tell user application that palette has changed from previous frame.
+     * - encoding: ??? (no palette-enabled encoder yet)
+     * - decoding: Set by libavcodec. (default 0).
+     */
+    int palette_has_changed;
+
+    /**
+     * codec suggestion on buffer type if != 0
+     * - encoding: unused
+     * - decoding: Set by libavcodec. (before get_buffer() call)).
+     */
+    int buffer_hints;
+
+    /**
+     * DCT coefficients
+     * - encoding: unused
+     * - decoding: Set by libavcodec.
+     */
+    short *dct_coeff;
+
+    /**
+     * motion reference frame index
+     * the order in which these are stored can depend on the codec.
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    int8_t *ref_index[2];
+
+    /**
+     * reordered opaque 64bit (generally an integer or a double precision float
+     * PTS but can be anything).
+     * The user sets AVCodecContext.reordered_opaque to represent the input at
+     * that time,
+     * the decoder reorders values as needed and sets AVFrame.reordered_opaque
+     * to exactly one of the values provided by the user through AVCodecContext.reordered_opaque
+     * @deprecated in favor of pkt_pts
+     * - encoding: unused
+     * - decoding: Read by user.
+     */
+    int64_t reordered_opaque;
+
+    /**
+     * hardware accelerator private data (Libav-allocated)
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    void *hwaccel_picture_private;
+
+    /**
+     * reordered pts from the last AVPacket that has been input into the decoder
+     * - encoding: unused
+     * - decoding: Read by user.
+     */
+    int64_t pkt_pts;
+
+    /**
+     * dts from the last AVPacket that has been input into the decoder
+     * - encoding: unused
+     * - decoding: Read by user.
+     */
+    int64_t pkt_dts;
+
+    /**
+     * the AVCodecContext which ff_thread_get_buffer() was last called on
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by libavcodec.
+     */
+    struct AVCodecContext *owner;
+
+    /**
+     * used by multithreading to store frame-specific info
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by libavcodec.
+     */
+    void *thread_opaque;
+
+    /**
+     * number of audio samples (per channel) described by this frame
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    int nb_samples;
+
+    /**
+     * pointers to the data planes/channels.
+     *
+     * For video, this should simply point to data[].
+     *
+     * For planar audio, each channel has a separate data pointer, and
+     * linesize[0] contains the size of each channel buffer.
+     * For packed audio, there is just one data pointer, and linesize[0]
+     * contains the total size of the buffer for all channels.
+     *
+     * Note: Both data and extended_data will always be set by get_buffer(),
+     * but for planar audio with more channels that can fit in data,
+     * extended_data must be used by the decoder in order to access all
+     * channels.
+     *
+     * encoding: unused
+     * decoding: set by AVCodecContext.get_buffer()
+     */
+    uint8_t **extended_data;
+
+    /**
+     * sample aspect ratio for the video frame, 0/1 if unknown\unspecified
+     * - encoding: unused
+     * - decoding: Read by user.
+     */
+    AVRational sample_aspect_ratio;
+
+    /**
+     * width and height of the video frame
+     * - encoding: unused
+     * - decoding: Read by user.
+     */
+    int width, height;
+
+    /**
+     * format of the frame, -1 if unknown or unset
+     * Values correspond to enum PixelFormat for video frames,
+     * enum AVSampleFormat for audio)
+     * - encoding: unused
+     * - decoding: Read by user.
+     */
+    int format;
+} AVFrame;
+
+struct AVCodecInternal;
+
+enum AVFieldOrder {
+    AV_FIELD_UNKNOWN,
+    AV_FIELD_PROGRESSIVE,
+    AV_FIELD_TT,          //< Top coded_first, top displayed first
+    AV_FIELD_BB,          //< Bottom coded first, bottom displayed first
+    AV_FIELD_TB,          //< Top coded first, bottom displayed first
+    AV_FIELD_BT,          //< Bottom coded first, top displayed first
+};
+
+/**
+ * main external API structure.
+ * New fields can be added to the end with minor version bumps.
+ * Removal, reordering and changes to existing fields require a major
+ * version bump.
+ * sizeof(AVCodecContext) must not be used outside libav*.
+ */
+typedef struct AVCodecContext {
+    /**
+     * information on struct for av_log
+     * - set by avcodec_alloc_context3
+     */
+    const AVClass *av_class;
+    /**
+     * the average bitrate
+     * - encoding: Set by user; unused for constant quantizer encoding.
+     * - decoding: Set by libavcodec. 0 or some bitrate if this info is available in the stream.
+     */
+    int bit_rate;
+
+    /**
+     * number of bits the bitstream is allowed to diverge from the reference.
+     *           the reference can be CBR (for CBR pass1) or VBR (for pass2)
+     * - encoding: Set by user; unused for constant quantizer encoding.
+     * - decoding: unused
+     */
+    int bit_rate_tolerance;
+
+    /**
+     * CODEC_FLAG_*.
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int flags;
+
+    /**
+     * Some codecs need additional format info. It is stored here.
+     * If any muxer uses this then ALL demuxers/parsers AND encoders for the
+     * specific codec MUST set it correctly otherwise stream copy breaks.
+     * In general use of this field by muxers is not recommended.
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by libavcodec. (FIXME: Is this OK?)
+     */
+    int sub_id;
+
+    /**
+     * Motion estimation algorithm used for video coding.
+     * 1 (zero), 2 (full), 3 (log), 4 (phods), 5 (epzs), 6 (x1), 7 (hex),
+     * 8 (umh), 9 (iter), 10 (tesa) [7, 8, 10 are x264 specific, 9 is snow specific]
+     * - encoding: MUST be set by user.
+     * - decoding: unused
+     */
+    int me_method;
+
+    /**
+     * some codecs need / can use extradata like Huffman tables.
+     * mjpeg: Huffman tables
+     * rv10: additional flags
+     * mpeg4: global headers (they can be in the bitstream or here)
+     * The allocated memory should be FF_INPUT_BUFFER_PADDING_SIZE bytes larger
+     * than extradata_size to avoid prolems if it is read with the bitstream reader.
+     * The bytewise contents of extradata must not depend on the architecture or CPU endianness.
+     * - encoding: Set/allocated/freed by libavcodec.
+     * - decoding: Set/allocated/freed by user.
+     */
+    uint8_t *extradata;
+    int extradata_size;
+
+    /**
+     * This is the fundamental unit of time (in seconds) in terms
+     * of which frame timestamps are represented. For fixed-fps content,
+     * timebase should be 1/framerate and timestamp increments should be
+     * identically 1.
+     * - encoding: MUST be set by user.
+     * - decoding: Set by libavcodec.
+     */
+    AVRational time_base;
+
+    /* video only */
+    /**
+     * picture width / height.
+     * - encoding: MUST be set by user.
+     * - decoding: Set by libavcodec.
+     * Note: For compatibility it is possible to set this instead of
+     * coded_width/height before decoding.
+     */
+    int width, height;
+
+#define FF_ASPECT_EXTENDED 15
+
+    /**
+     * the number of pictures in a group of pictures, or 0 for intra_only
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int gop_size;
+
+    /**
+     * Pixel format, see PIX_FMT_xxx.
+     * May be set by the demuxer if known from headers.
+     * May be overriden by the decoder if it knows better.
+     * - encoding: Set by user.
+     * - decoding: Set by user if known, overridden by libavcodec if known
+     */
+    enum PixelFormat pix_fmt;
+
+    /**
+     * If non NULL, 'draw_horiz_band' is called by the libavcodec
+     * decoder to draw a horizontal band. It improves cache usage. Not
+     * all codecs can do that. You must check the codec capabilities
+     * beforehand.
+     * When multithreading is used, it may be called from multiple threads
+     * at the same time; threads might draw different parts of the same AVFrame,
+     * or multiple AVFrames, and there is no guarantee that slices will be drawn
+     * in order.
+     * The function is also used by hardware acceleration APIs.
+     * It is called at least once during frame decoding to pass
+     * the data needed for hardware render.
+     * In that mode instead of pixel data, AVFrame points to
+     * a structure specific to the acceleration API. The application
+     * reads the structure and can change some fields to indicate progress
+     * or mark state.
+     * - encoding: unused
+     * - decoding: Set by user.
+     * @param height the height of the slice
+     * @param y the y position of the slice
+     * @param type 1->top field, 2->bottom field, 3->frame
+     * @param offset offset into the AVFrame.data from which the slice should be read
+     */
+    void (*draw_horiz_band)(struct AVCodecContext *s,
+                            const AVFrame *src, int offset[AV_NUM_DATA_POINTERS],
+                            int y, int type, int height);
+
+    /* audio only */
+    int sample_rate; ///< samples per second
+    int channels;    ///< number of audio channels
+
+    /**
+     * audio sample format
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    enum AVSampleFormat sample_fmt;  ///< sample format
+
+    /* The following data should not be initialized. */
+    /**
+     * Samples per packet, initialized when calling 'init'.
+     */
+    int frame_size;
+    int frame_number;   ///< audio or video frame number
+
+    /**
+     * Number of frames the decoded output will be delayed relative to
+     * the encoded input.
+     * - encoding: Set by libavcodec.
+     * - decoding: unused
+     */
+    int delay;
+
+    /* - encoding parameters */
+    float qcompress;  ///< amount of qscale change between easy & hard scenes (0.0-1.0)
+    float qblur;      ///< amount of qscale smoothing over time (0.0-1.0)
+
+    /**
+     * minimum quantizer
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int qmin;
+
+    /**
+     * maximum quantizer
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int qmax;
+
+    /**
+     * maximum quantizer difference between frames
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int max_qdiff;
+
+    /**
+     * maximum number of B-frames between non-B-frames
+     * Note: The output will be delayed by max_b_frames+1 relative to the input.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int max_b_frames;
+
+    /**
+     * qscale factor between IP and B-frames
+     * If > 0 then the last P-frame quantizer will be used (q= lastp_q*factor+offset).
+     * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float b_quant_factor;
+
+    /** obsolete FIXME remove */
+    int rc_strategy;
+#define FF_RC_STRATEGY_XVID 1
+
+    int b_frame_strategy;
+
+    struct AVCodec *codec;
+
+    void *priv_data;
+
+    int rtp_payload_size;   /* The size of the RTP payload: the coder will  */
+                            /* do its best to deliver a chunk with size     */
+                            /* below rtp_payload_size, the chunk will start */
+                            /* with a start code on some codecs like H.263. */
+                            /* This doesn't take account of any particular  */
+                            /* headers inside the transmitted RTP payload.  */
+
+
+    /* The RTP callback: This function is called    */
+    /* every time the encoder has a packet to send. */
+    /* It depends on the encoder if the data starts */
+    /* with a Start Code (it should). H.263 does.   */
+    /* mb_nb contains the number of macroblocks     */
+    /* encoded in the RTP payload.                  */
+    void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb);
+
+    /* statistics, used for 2-pass encoding */
+    int mv_bits;
+    int header_bits;
+    int i_tex_bits;
+    int p_tex_bits;
+    int i_count;
+    int p_count;
+    int skip_count;
+    int misc_bits;
+
+    /**
+     * number of bits used for the previously encoded frame
+     * - encoding: Set by libavcodec.
+     * - decoding: unused
+     */
+    int frame_bits;
+
+    /**
+     * Private data of the user, can be used to carry app specific stuff.
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    void *opaque;
+
+    char codec_name[32];
+    enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
+    enum CodecID codec_id; /* see CODEC_ID_xxx */
+
+    /**
+     * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
+     * This is used to work around some encoder bugs.
+     * A demuxer should set this to what is stored in the field used to identify the codec.
+     * If there are multiple such fields in a container then the demuxer should choose the one
+     * which maximizes the information about the used codec.
+     * If the codec tag field in a container is larger than 32 bits then the demuxer should
+     * remap the longer ID to 32 bits with a table or other structure. Alternatively a new
+     * extra_codec_tag + size could be added but for this a clear advantage must be demonstrated
+     * first.
+     * - encoding: Set by user, if not then the default based on codec_id will be used.
+     * - decoding: Set by user, will be converted to uppercase by libavcodec during init.
+     */
+    unsigned int codec_tag;
+
+    /**
+     * Work around bugs in encoders which sometimes cannot be detected automatically.
+     * - encoding: Set by user
+     * - decoding: Set by user
+     */
+    int workaround_bugs;
+#define FF_BUG_AUTODETECT       1  ///< autodetection
+#define FF_BUG_OLD_MSMPEG4      2
+#define FF_BUG_XVID_ILACE       4
+#define FF_BUG_UMP4             8
+#define FF_BUG_NO_PADDING       16
+#define FF_BUG_AMV              32
+#define FF_BUG_AC_VLC           0  ///< Will be removed, libavcodec can now handle these non-compliant files by default.
+#define FF_BUG_QPEL_CHROMA      64
+#define FF_BUG_STD_QPEL         128
+#define FF_BUG_QPEL_CHROMA2     256
+#define FF_BUG_DIRECT_BLOCKSIZE 512
+#define FF_BUG_EDGE             1024
+#define FF_BUG_HPEL_CHROMA      2048
+#define FF_BUG_DC_CLIP          4096
+#define FF_BUG_MS               8192 ///< Work around various bugs in Microsoft's broken decoders.
+#define FF_BUG_TRUNCATED       16384
+//#define FF_BUG_FAKE_SCALABILITY 16 //Autodetection should work 100%.
+
+    /**
+     * luma single coefficient elimination threshold
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int luma_elim_threshold;
+
+    /**
+     * chroma single coeff elimination threshold
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int chroma_elim_threshold;
+
+    /**
+     * strictly follow the standard (MPEG4, ...).
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     * Setting this to STRICT or higher means the encoder and decoder will
+     * generally do stupid things, whereas setting it to unofficial or lower
+     * will mean the encoder might produce output that is not supported by all
+     * spec-compliant decoders. Decoders don't differentiate between normal,
+     * unofficial and experimental (that is, they always try to decode things
+     * when they can) unless they are explicitly asked to behave stupidly
+     * (=strictly conform to the specs)
+     */
+    int strict_std_compliance;
+#define FF_COMPLIANCE_VERY_STRICT   2 ///< Strictly conform to an older more strict version of the spec or reference software.
+#define FF_COMPLIANCE_STRICT        1 ///< Strictly conform to all the things in the spec no matter what consequences.
+#define FF_COMPLIANCE_NORMAL        0
+#define FF_COMPLIANCE_UNOFFICIAL   -1 ///< Allow unofficial extensions
+#define FF_COMPLIANCE_EXPERIMENTAL -2 ///< Allow nonstandardized experimental things.
+
+    /**
+     * qscale offset between IP and B-frames
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float b_quant_offset;
+
+#if FF_API_ER
+    /**
+     * Error recognition; higher values will detect more errors but may
+     * misdetect some more or less valid parts as errors.
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    attribute_deprecated int error_recognition;
+#define FF_ER_CAREFUL         1
+#define FF_ER_COMPLIANT       2
+#define FF_ER_AGGRESSIVE      3
+#define FF_ER_VERY_AGGRESSIVE 4
+#define FF_ER_EXPLODE         5
+#endif /* FF_API_ER */
+
+    /**
+     * Called at the beginning of each frame to get a buffer for it.
+     *
+     * The function will set AVFrame.data[], AVFrame.linesize[].
+     * AVFrame.extended_data[] must also be set, but it should be the same as
+     * AVFrame.data[] except for planar audio with more channels than can fit
+     * in AVFrame.data[]. In that case, AVFrame.data[] shall still contain as
+     * many data pointers as it can hold.
+     *
+     * if CODEC_CAP_DR1 is not set then get_buffer() must call
+     * avcodec_default_get_buffer() instead of providing buffers allocated by
+     * some other means.
+     *
+     * AVFrame.data[] should be 32- or 16-byte-aligned unless the CPU doesn't
+     * need it. avcodec_default_get_buffer() aligns the output buffer properly,
+     * but if get_buffer() is overridden then alignment considerations should
+     * be taken into account.
+     *
+     * @see avcodec_default_get_buffer()
+     *
+     * Video:
+     *
+     * If pic.reference is set then the frame will be read later by libavcodec.
+     * avcodec_align_dimensions2() should be used to find the required width and
+     * height, as they normally need to be rounded up to the next multiple of 16.
+     *
+     * If frame multithreading is used and thread_safe_callbacks is set,
+     * it may be called from a different thread, but not from more than one at
+     * once. Does not need to be reentrant.
+     *
+     * @see release_buffer(), reget_buffer()
+     * @see avcodec_align_dimensions2()
+     *
+     * Audio:
+     *
+     * Decoders request a buffer of a particular size by setting
+     * AVFrame.nb_samples prior to calling get_buffer(). The decoder may,
+     * however, utilize only part of the buffer by setting AVFrame.nb_samples
+     * to a smaller value in the output frame.
+     *
+     * Decoders cannot use the buffer after returning from
+     * avcodec_decode_audio4(), so they will not call release_buffer(), as it
+     * is assumed to be released immediately upon return.
+     *
+     * As a convenience, av_samples_get_buffer_size() and
+     * av_samples_fill_arrays() in libavutil may be used by custom get_buffer()
+     * functions to find the required data size and to fill data pointers and
+     * linesize. In AVFrame.linesize, only linesize[0] may be set for audio
+     * since all planes must be the same size.
+     *
+     * @see av_samples_get_buffer_size(), av_samples_fill_arrays()
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec, user can override.
+     */
+    int (*get_buffer)(struct AVCodecContext *c, AVFrame *pic);
+
+    /**
+     * Called to release buffers which were allocated with get_buffer.
+     * A released buffer can be reused in get_buffer().
+     * pic.data[*] must be set to NULL.
+     * May be called from a different thread if frame multithreading is used,
+     * but not by more than one thread at once, so does not need to be reentrant.
+     * - encoding: unused
+     * - decoding: Set by libavcodec, user can override.
+     */
+    void (*release_buffer)(struct AVCodecContext *c, AVFrame *pic);
+
+    /**
+     * Size of the frame reordering buffer in the decoder.
+     * For MPEG-2 it is 1 IPB or 0 low delay IP.
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by libavcodec.
+     */
+    int has_b_frames;
+
+    /**
+     * number of bytes per packet if constant and known or 0
+     * Used by some WAV based audio codecs.
+     */
+    int block_align;
+
+#if FF_API_PARSE_FRAME
+    /**
+     * If true, only parsing is done. The frame data is returned.
+     * Only MPEG audio decoders support this now.
+     * - encoding: unused
+     * - decoding: Set by user
+     */
+    attribute_deprecated int parse_only;
+#endif
+
+    /**
+     * 0-> h263 quant 1-> mpeg quant
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int mpeg_quant;
+
+    /**
+     * pass1 encoding statistics output buffer
+     * - encoding: Set by libavcodec.
+     * - decoding: unused
+     */
+    char *stats_out;
+
+    /**
+     * pass2 encoding statistics input buffer
+     * Concatenated stuff from stats_out of pass1 should be placed here.
+     * - encoding: Allocated/set/freed by user.
+     * - decoding: unused
+     */
+    char *stats_in;
+
+    /**
+     * ratecontrol qmin qmax limiting method
+     * 0-> clipping, 1-> use a nice continous function to limit qscale wthin qmin/qmax.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float rc_qsquish;
+
+    float rc_qmod_amp;
+    int rc_qmod_freq;
+
+    /**
+     * ratecontrol override, see RcOverride
+     * - encoding: Allocated/set/freed by user.
+     * - decoding: unused
+     */
+    RcOverride *rc_override;
+    int rc_override_count;
+
+    /**
+     * rate control equation
+     * - encoding: Set by user
+     * - decoding: unused
+     */
+    const char *rc_eq;
+
+    /**
+     * maximum bitrate
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int rc_max_rate;
+
+    /**
+     * minimum bitrate
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int rc_min_rate;
+
+    /**
+     * decoder bitstream buffer size
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int rc_buffer_size;
+    float rc_buffer_aggressivity;
+
+    /**
+     * qscale factor between P and I-frames
+     * If > 0 then the last p frame quantizer will be used (q= lastp_q*factor+offset).
+     * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float i_quant_factor;
+
+    /**
+     * qscale offset between P and I-frames
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float i_quant_offset;
+
+    /**
+     * initial complexity for pass1 ratecontrol
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float rc_initial_cplx;
+
+    /**
+     * DCT algorithm, see FF_DCT_* below
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int dct_algo;
+#define FF_DCT_AUTO    0
+#define FF_DCT_FASTINT 1
+#define FF_DCT_INT     2
+#define FF_DCT_MMX     3
+#define FF_DCT_MLIB    4
+#define FF_DCT_ALTIVEC 5
+#define FF_DCT_FAAN    6
+
+    /**
+     * luminance masking (0-> disabled)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float lumi_masking;
+
+    /**
+     * temporary complexity masking (0-> disabled)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float temporal_cplx_masking;
+
+    /**
+     * spatial complexity masking (0-> disabled)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float spatial_cplx_masking;
+
+    /**
+     * p block masking (0-> disabled)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float p_masking;
+
+    /**
+     * darkness masking (0-> disabled)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float dark_masking;
+
+    /**
+     * IDCT algorithm, see FF_IDCT_* below.
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int idct_algo;
+#define FF_IDCT_AUTO          0
+#define FF_IDCT_INT           1
+#define FF_IDCT_SIMPLE        2
+#define FF_IDCT_SIMPLEMMX     3
+#define FF_IDCT_LIBMPEG2MMX   4
+#define FF_IDCT_PS2           5
+#define FF_IDCT_MLIB          6
+#define FF_IDCT_ARM           7
+#define FF_IDCT_ALTIVEC       8
+#define FF_IDCT_SH4           9
+#define FF_IDCT_SIMPLEARM     10
+#define FF_IDCT_H264          11
+#define FF_IDCT_VP3           12
+#define FF_IDCT_IPP           13
+#define FF_IDCT_XVIDMMX       14
+#define FF_IDCT_CAVS          15
+#define FF_IDCT_SIMPLEARMV5TE 16
+#define FF_IDCT_SIMPLEARMV6   17
+#define FF_IDCT_SIMPLEVIS     18
+#define FF_IDCT_WMV2          19
+#define FF_IDCT_FAAN          20
+#define FF_IDCT_EA            21
+#define FF_IDCT_SIMPLENEON    22
+#define FF_IDCT_SIMPLEALPHA   23
+#define FF_IDCT_BINK          24
+
+    /**
+     * slice count
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by user (or 0).
+     */
+    int slice_count;
+    /**
+     * slice offsets in the frame in bytes
+     * - encoding: Set/allocated by libavcodec.
+     * - decoding: Set/allocated by user (or NULL).
+     */
+    int *slice_offset;
+
+    /**
+     * error concealment flags
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    int error_concealment;
+#define FF_EC_GUESS_MVS   1
+#define FF_EC_DEBLOCK     2
+
+    /**
+     * dsp_mask could be add used to disable unwanted CPU features
+     * CPU features (i.e. MMX, SSE. ...)
+     *
+     * With the FORCE flag you may instead enable given CPU features.
+     * (Dangerous: Usable in case of misdetection, improper usage however will
+     * result into program crash.)
+     */
+    unsigned dsp_mask;
+
+    /**
+     * bits per sample/pixel from the demuxer (needed for huffyuv).
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by user.
+     */
+     int bits_per_coded_sample;
+
+    /**
+     * prediction method (needed for huffyuv)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+     int prediction_method;
+#define FF_PRED_LEFT   0
+#define FF_PRED_PLANE  1
+#define FF_PRED_MEDIAN 2
+
+    /**
+     * sample aspect ratio (0 if unknown)
+     * That is the width of a pixel divided by the height of the pixel.
+     * Numerator and denominator must be relatively prime and smaller than 256 for some video standards.
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    AVRational sample_aspect_ratio;
+
+    /**
+     * the picture in the bitstream
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by libavcodec.
+     */
+    AVFrame *coded_frame;
+
+    /**
+     * debug
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int debug;
+#define FF_DEBUG_PICT_INFO   1
+#define FF_DEBUG_RC          2
+#define FF_DEBUG_BITSTREAM   4
+#define FF_DEBUG_MB_TYPE     8
+#define FF_DEBUG_QP          16
+#define FF_DEBUG_MV          32
+#define FF_DEBUG_DCT_COEFF   0x00000040
+#define FF_DEBUG_SKIP        0x00000080
+#define FF_DEBUG_STARTCODE   0x00000100
+#define FF_DEBUG_PTS         0x00000200
+#define FF_DEBUG_ER          0x00000400
+#define FF_DEBUG_MMCO        0x00000800
+#define FF_DEBUG_BUGS        0x00001000
+#define FF_DEBUG_VIS_QP      0x00002000
+#define FF_DEBUG_VIS_MB_TYPE 0x00004000
+#define FF_DEBUG_BUFFERS     0x00008000
+#define FF_DEBUG_THREADS     0x00010000
+
+    /**
+     * debug
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int debug_mv;
+#define FF_DEBUG_VIS_MV_P_FOR  0x00000001 //visualize forward predicted MVs of P frames
+#define FF_DEBUG_VIS_MV_B_FOR  0x00000002 //visualize forward predicted MVs of B frames
+#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
+
+    /**
+     * error
+     * - encoding: Set by libavcodec if flags&CODEC_FLAG_PSNR.
+     * - decoding: unused
+     */
+    uint64_t error[AV_NUM_DATA_POINTERS];
+
+    /**
+     * motion estimation comparison function
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int me_cmp;
+    /**
+     * subpixel motion estimation comparison function
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int me_sub_cmp;
+    /**
+     * macroblock comparison function (not supported yet)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int mb_cmp;
+    /**
+     * interlaced DCT comparison function
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int ildct_cmp;
+#define FF_CMP_SAD    0
+#define FF_CMP_SSE    1
+#define FF_CMP_SATD   2
+#define FF_CMP_DCT    3
+#define FF_CMP_PSNR   4
+#define FF_CMP_BIT    5
+#define FF_CMP_RD     6
+#define FF_CMP_ZERO   7
+#define FF_CMP_VSAD   8
+#define FF_CMP_VSSE   9
+#define FF_CMP_NSSE   10
+#define FF_CMP_W53    11
+#define FF_CMP_W97    12
+#define FF_CMP_DCTMAX 13
+#define FF_CMP_DCT264 14
+#define FF_CMP_CHROMA 256
+
+    /**
+     * ME diamond size & shape
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int dia_size;
+
+    /**
+     * amount of previous MV predictors (2a+1 x 2a+1 square)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int last_predictor_count;
+
+    /**
+     * prepass for motion estimation
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int pre_me;
+
+    /**
+     * motion estimation prepass comparison function
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int me_pre_cmp;
+
+    /**
+     * ME prepass diamond size & shape
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int pre_dia_size;
+
+    /**
+     * subpel ME quality
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int me_subpel_quality;
+
+    /**
+     * callback to negotiate the pixelFormat
+     * @param fmt is the list of formats which are supported by the codec,
+     * it is terminated by -1 as 0 is a valid format, the formats are ordered by quality.
+     * The first is always the native one.
+     * @return the chosen format
+     * - encoding: unused
+     * - decoding: Set by user, if not set the native format will be chosen.
+     */
+    enum PixelFormat (*get_format)(struct AVCodecContext *s, const enum PixelFormat * fmt);
+
+    /**
+     * DTG active format information (additional aspect ratio
+     * information only used in DVB MPEG-2 transport streams)
+     * 0 if not set.
+     *
+     * - encoding: unused
+     * - decoding: Set by decoder.
+     */
+    int dtg_active_format;
+#define FF_DTG_AFD_SAME         8
+#define FF_DTG_AFD_4_3          9
+#define FF_DTG_AFD_16_9         10
+#define FF_DTG_AFD_14_9         11
+#define FF_DTG_AFD_4_3_SP_14_9  13
+#define FF_DTG_AFD_16_9_SP_14_9 14
+#define FF_DTG_AFD_SP_4_3       15
+
+    /**
+     * maximum motion estimation search range in subpel units
+     * If 0 then no limit.
+     *
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int me_range;
+
+    /**
+     * intra quantizer bias
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int intra_quant_bias;
+#define FF_DEFAULT_QUANT_BIAS 999999
+
+    /**
+     * inter quantizer bias
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int inter_quant_bias;
+
+    /**
+     * color table ID
+     * - encoding: unused
+     * - decoding: Which clrtable should be used for 8bit RGB images.
+     *             Tables have to be stored somewhere. FIXME
+     */
+    int color_table_id;
+
+#if FF_API_INTERNAL_CONTEXT
+    /**
+     * internal_buffer count
+     * Don't touch, used by libavcodec default_get_buffer().
+     * @deprecated this field was moved to an internal context
+     */
+    attribute_deprecated int internal_buffer_count;
+
+    /**
+     * internal_buffers
+     * Don't touch, used by libavcodec default_get_buffer().
+     * @deprecated this field was moved to an internal context
+     */
+    attribute_deprecated void *internal_buffer;
+#endif
+
+    /**
+     * Global quality for codecs which cannot change it per frame.
+     * This should be proportional to MPEG-1/2/4 qscale.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int global_quality;
+
+#define FF_CODER_TYPE_VLC       0
+#define FF_CODER_TYPE_AC        1
+#define FF_CODER_TYPE_RAW       2
+#define FF_CODER_TYPE_RLE       3
+#define FF_CODER_TYPE_DEFLATE   4
+    /**
+     * coder type
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int coder_type;
+
+    /**
+     * context model
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int context_model;
+#if 0
+    /**
+     *
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    uint8_t * (*realloc)(struct AVCodecContext *s, uint8_t *buf, int buf_size);
+#endif
+
+    /**
+     * slice flags
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    int slice_flags;
+#define SLICE_FLAG_CODED_ORDER    0x0001 ///< draw_horiz_band() is called in coded order instead of display
+#define SLICE_FLAG_ALLOW_FIELD    0x0002 ///< allow draw_horiz_band() with field slices (MPEG2 field pics)
+#define SLICE_FLAG_ALLOW_PLANE    0x0004 ///< allow draw_horiz_band() with 1 component at a time (SVQ1)
+
+    /**
+     * XVideo Motion Acceleration
+     * - encoding: forbidden
+     * - decoding: set by decoder
+     */
+    int xvmc_acceleration;
+
+    /**
+     * macroblock decision mode
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int mb_decision;
+#define FF_MB_DECISION_SIMPLE 0        ///< uses mb_cmp
+#define FF_MB_DECISION_BITS   1        ///< chooses the one which needs the fewest bits
+#define FF_MB_DECISION_RD     2        ///< rate distortion
+
+    /**
+     * custom intra quantization matrix
+     * - encoding: Set by user, can be NULL.
+     * - decoding: Set by libavcodec.
+     */
+    uint16_t *intra_matrix;
+
+    /**
+     * custom inter quantization matrix
+     * - encoding: Set by user, can be NULL.
+     * - decoding: Set by libavcodec.
+     */
+    uint16_t *inter_matrix;
+
+    /**
+     * fourcc from the AVI stream header (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
+     * This is used to work around some encoder bugs.
+     * - encoding: unused
+     * - decoding: Set by user, will be converted to uppercase by libavcodec during init.
+     */
+    unsigned int stream_codec_tag;
+
+    /**
+     * scene change detection threshold
+     * 0 is default, larger means fewer detected scene changes.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int scenechange_threshold;
+
+    /**
+     * minimum Lagrange multipler
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int lmin;
+
+    /**
+     * maximum Lagrange multipler
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int lmax;
+
+#if FF_API_PALETTE_CONTROL
+    /**
+     * palette control structure
+     * - encoding: ??? (no palette-enabled encoder yet)
+     * - decoding: Set by user.
+     */
+    struct AVPaletteControl *palctrl;
+#endif
+
+    /**
+     * noise reduction strength
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int noise_reduction;
+
+    /**
+     * Called at the beginning of a frame to get cr buffer for it.
+     * Buffer type (size, hints) must be the same. libavcodec won't check it.
+     * libavcodec will pass previous buffer in pic, function should return
+     * same buffer or new buffer with old frame "painted" into it.
+     * If pic.data[0] == NULL must behave like get_buffer().
+     * if CODEC_CAP_DR1 is not set then reget_buffer() must call
+     * avcodec_default_reget_buffer() instead of providing buffers allocated by
+     * some other means.
+     * - encoding: unused
+     * - decoding: Set by libavcodec, user can override.
+     */
+    int (*reget_buffer)(struct AVCodecContext *c, AVFrame *pic);
+
+    /**
+     * Number of bits which should be loaded into the rc buffer before decoding starts.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int rc_initial_buffer_occupancy;
+
+    /**
+     *
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int inter_threshold;
+
+    /**
+     * CODEC_FLAG2_*
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int flags2;
+
+    /**
+     * Simulates errors in the bitstream to test error concealment.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int error_rate;
+
+#if FF_API_ANTIALIAS_ALGO
+    /**
+     * MP3 antialias algorithm, see FF_AA_* below.
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    attribute_deprecated int antialias_algo;
+#define FF_AA_AUTO    0
+#define FF_AA_FASTINT 1 //not implemented yet
+#define FF_AA_INT     2
+#define FF_AA_FLOAT   3
+#endif
+
+    /**
+     * quantizer noise shaping
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int quantizer_noise_shaping;
+
+    /**
+     * thread count
+     * is used to decide how many independent tasks should be passed to execute()
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int thread_count;
+
+    /**
+     * The codec may call this to execute several independent things.
+     * It will return only after finishing all tasks.
+     * The user may replace this with some multithreaded implementation,
+     * the default implementation will execute the parts serially.
+     * @param count the number of things to execute
+     * - encoding: Set by libavcodec, user can override.
+     * - decoding: Set by libavcodec, user can override.
+     */
+    int (*execute)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg), void *arg2, int *ret, int count, int size);
+
+    /**
+     * thread opaque
+     * Can be used by execute() to store some per AVCodecContext stuff.
+     * - encoding: set by execute()
+     * - decoding: set by execute()
+     */
+    void *thread_opaque;
+
+    /**
+     * Motion estimation threshold below which no motion estimation is
+     * performed, but instead the user specified motion vectors are used.
+     *
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+     int me_threshold;
+
+    /**
+     * Macroblock threshold below which the user specified macroblock types will be used.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+     int mb_threshold;
+
+    /**
+     * precision of the intra DC coefficient - 8
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+     int intra_dc_precision;
+
+    /**
+     * noise vs. sse weight for the nsse comparsion function
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+     int nsse_weight;
+
+    /**
+     * Number of macroblock rows at the top which are skipped.
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+     int skip_top;
+
+    /**
+     * Number of macroblock rows at the bottom which are skipped.
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+     int skip_bottom;
+
+    /**
+     * profile
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+     int profile;
+#define FF_PROFILE_UNKNOWN -99
+#define FF_PROFILE_RESERVED -100
+
+#define FF_PROFILE_AAC_MAIN 0
+#define FF_PROFILE_AAC_LOW  1
+#define FF_PROFILE_AAC_SSR  2
+#define FF_PROFILE_AAC_LTP  3
+
+#define FF_PROFILE_DTS         20
+#define FF_PROFILE_DTS_ES      30
+#define FF_PROFILE_DTS_96_24   40
+#define FF_PROFILE_DTS_HD_HRA  50
+#define FF_PROFILE_DTS_HD_MA   60
+
+#define FF_PROFILE_MPEG2_422    0
+#define FF_PROFILE_MPEG2_HIGH   1
+#define FF_PROFILE_MPEG2_SS     2
+#define FF_PROFILE_MPEG2_SNR_SCALABLE  3
+#define FF_PROFILE_MPEG2_MAIN   4
+#define FF_PROFILE_MPEG2_SIMPLE 5
+
+#define FF_PROFILE_H264_CONSTRAINED  (1<<9)  // 8+1; constraint_set1_flag
+#define FF_PROFILE_H264_INTRA        (1<<11) // 8+3; constraint_set3_flag
+
+#define FF_PROFILE_H264_BASELINE             66
+#define FF_PROFILE_H264_CONSTRAINED_BASELINE (66|FF_PROFILE_H264_CONSTRAINED)
+#define FF_PROFILE_H264_MAIN                 77
+#define FF_PROFILE_H264_EXTENDED             88
+#define FF_PROFILE_H264_HIGH                 100
+#define FF_PROFILE_H264_HIGH_10              110
+#define FF_PROFILE_H264_HIGH_10_INTRA        (110|FF_PROFILE_H264_INTRA)
+#define FF_PROFILE_H264_HIGH_422             122
+#define FF_PROFILE_H264_HIGH_422_INTRA       (122|FF_PROFILE_H264_INTRA)
+#define FF_PROFILE_H264_HIGH_444             144
+#define FF_PROFILE_H264_HIGH_444_PREDICTIVE  244
+#define FF_PROFILE_H264_HIGH_444_INTRA       (244|FF_PROFILE_H264_INTRA)
+#define FF_PROFILE_H264_CAVLC_444            44
+
+#define FF_PROFILE_VC1_SIMPLE   0
+#define FF_PROFILE_VC1_MAIN     1
+#define FF_PROFILE_VC1_COMPLEX  2
+#define FF_PROFILE_VC1_ADVANCED 3
+
+#define FF_PROFILE_MPEG4_SIMPLE                     0
+#define FF_PROFILE_MPEG4_SIMPLE_SCALABLE            1
+#define FF_PROFILE_MPEG4_CORE                       2
+#define FF_PROFILE_MPEG4_MAIN                       3
+#define FF_PROFILE_MPEG4_N_BIT                      4
+#define FF_PROFILE_MPEG4_SCALABLE_TEXTURE           5
+#define FF_PROFILE_MPEG4_SIMPLE_FACE_ANIMATION      6
+#define FF_PROFILE_MPEG4_BASIC_ANIMATED_TEXTURE     7
+#define FF_PROFILE_MPEG4_HYBRID                     8
+#define FF_PROFILE_MPEG4_ADVANCED_REAL_TIME         9
+#define FF_PROFILE_MPEG4_CORE_SCALABLE             10
+#define FF_PROFILE_MPEG4_ADVANCED_CODING           11
+#define FF_PROFILE_MPEG4_ADVANCED_CORE             12
+#define FF_PROFILE_MPEG4_ADVANCED_SCALABLE_TEXTURE 13
+#define FF_PROFILE_MPEG4_SIMPLE_STUDIO             14
+#define FF_PROFILE_MPEG4_ADVANCED_SIMPLE           15
+
+    /**
+     * level
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+     int level;
+#define FF_LEVEL_UNKNOWN -99
+
+    /**
+     * low resolution decoding, 1-> 1/2 size, 2->1/4 size
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+     int lowres;
+
+    /**
+     * Bitstream width / height, may be different from width/height if lowres enabled.
+     * - encoding: unused
+     * - decoding: Set by user before init if known. Codec should override / dynamically change if needed.
+     */
+    int coded_width, coded_height;
+
+    /**
+     * frame skip threshold
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int frame_skip_threshold;
+
+    /**
+     * frame skip factor
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int frame_skip_factor;
+
+    /**
+     * frame skip exponent
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int frame_skip_exp;
+
+    /**
+     * frame skip comparison function
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int frame_skip_cmp;
+
+    /**
+     * Border processing masking, raises the quantizer for mbs on the borders
+     * of the picture.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float border_masking;
+
+    /**
+     * minimum MB lagrange multipler
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int mb_lmin;
+
+    /**
+     * maximum MB lagrange multipler
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int mb_lmax;
+
+    /**
+     *
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int me_penalty_compensation;
+
+    /**
+     *
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    enum AVDiscard skip_loop_filter;
+
+    /**
+     *
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    enum AVDiscard skip_idct;
+
+    /**
+     *
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    enum AVDiscard skip_frame;
+
+    /**
+     *
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int bidir_refine;
+
+    /**
+     *
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int brd_scale;
+
+#if FF_API_X264_GLOBAL_OPTS
+    /**
+     * constant rate factor - quality-based VBR - values ~correspond to qps
+     * - encoding: Set by user.
+     * - decoding: unused
+     *   @deprecated use 'crf' libx264 private option
+     */
+    attribute_deprecated float crf;
+
+    /**
+     * constant quantization parameter rate control method
+     * - encoding: Set by user.
+     * - decoding: unused
+     *   @deprecated use 'cqp' libx264 private option
+     */
+    attribute_deprecated int cqp;
+#endif
+
+    /**
+     * minimum GOP size
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int keyint_min;
+
+    /**
+     * number of reference frames
+     * - encoding: Set by user.
+     * - decoding: Set by lavc.
+     */
+    int refs;
+
+    /**
+     * chroma qp offset from luma
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int chromaoffset;
+
+#if FF_API_X264_GLOBAL_OPTS
+    /**
+     * Influence how often B-frames are used.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    attribute_deprecated int bframebias;
+#endif
+
+    /**
+     * trellis RD quantization
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int trellis;
+
+#if FF_API_X264_GLOBAL_OPTS
+    /**
+     * Reduce fluctuations in qp (before curve compression).
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    attribute_deprecated float complexityblur;
+
+    /**
+     * in-loop deblocking filter alphac0 parameter
+     * alpha is in the range -6...6
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    attribute_deprecated int deblockalpha;
+
+    /**
+     * in-loop deblocking filter beta parameter
+     * beta is in the range -6...6
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    attribute_deprecated int deblockbeta;
+
+    /**
+     * macroblock subpartition sizes to consider - p8x8, p4x4, b8x8, i8x8, i4x4
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    attribute_deprecated int partitions;
+#define X264_PART_I4X4 0x001  /* Analyze i4x4 */
+#define X264_PART_I8X8 0x002  /* Analyze i8x8 (requires 8x8 transform) */
+#define X264_PART_P8X8 0x010  /* Analyze p16x8, p8x16 and p8x8 */
+#define X264_PART_P4X4 0x020  /* Analyze p8x4, p4x8, p4x4 */
+#define X264_PART_B8X8 0x100  /* Analyze b16x8, b8x16 and b8x8 */
+
+    /**
+     * direct MV prediction mode - 0 (none), 1 (spatial), 2 (temporal), 3 (auto)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    attribute_deprecated int directpred;
+#endif
+
+    /**
+     * Audio cutoff bandwidth (0 means "automatic")
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int cutoff;
+
+    /**
+     * Multiplied by qscale for each frame and added to scene_change_score.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int scenechange_factor;
+
+    /**
+     *
+     * Note: Value depends upon the compare function used for fullpel ME.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int mv0_threshold;
+
+    /**
+     * Adjust sensitivity of b_frame_strategy 1.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int b_sensitivity;
+
+    /**
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int compression_level;
+#define FF_COMPRESSION_DEFAULT -1
+
+    /**
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int min_prediction_order;
+
+    /**
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int max_prediction_order;
+
+#if FF_API_FLAC_GLOBAL_OPTS
+    /**
+     * @name FLAC options
+     * @deprecated Use FLAC encoder private options instead.
+     * @{
+     */
+
+    /**
+     * LPC coefficient precision - used by FLAC encoder
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    attribute_deprecated int lpc_coeff_precision;
+
+    /**
+     * search method for selecting prediction order
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    attribute_deprecated int prediction_order_method;
+
+    /**
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    attribute_deprecated int min_partition_order;
+
+    /**
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    attribute_deprecated int max_partition_order;
+    /**
+     * @}
+     */
+#endif
+
+    /**
+     * GOP timecode frame start number, in non drop frame format
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int64_t timecode_frame_start;
+
+#if FF_API_REQUEST_CHANNELS
+    /**
+     * Decoder should decode to this many channels if it can (0 for default)
+     * - encoding: unused
+     * - decoding: Set by user.
+     * @deprecated Deprecated in favor of request_channel_layout.
+     */
+    int request_channels;
+#endif
+
+#if FF_API_DRC_SCALE
+    /**
+     * Percentage of dynamic range compression to be applied by the decoder.
+     * The default value is 1.0, corresponding to full compression.
+     * - encoding: unused
+     * - decoding: Set by user.
+     * @deprecated use AC3 decoder private option instead.
+     */
+    attribute_deprecated float drc_scale;
+#endif
+
+    /**
+     * opaque 64bit number (generally a PTS) that will be reordered and
+     * output in AVFrame.reordered_opaque
+     * @deprecated in favor of pkt_pts
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    int64_t reordered_opaque;
+
+    /**
+     * Bits per sample/pixel of internal libavcodec pixel/sample format.
+     * - encoding: set by user.
+     * - decoding: set by libavcodec.
+     */
+    int bits_per_raw_sample;
+
+    /**
+     * Audio channel layout.
+     * - encoding: set by user.
+     * - decoding: set by libavcodec.
+     */
+    uint64_t channel_layout;
+
+    /**
+     * Request decoder to use this channel layout if it can (0 for default)
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    uint64_t request_channel_layout;
+
+    /**
+     * Ratecontrol attempt to use, at maximum, <value> of what can be used without an underflow.
+     * - encoding: Set by user.
+     * - decoding: unused.
+     */
+    float rc_max_available_vbv_use;
+
+    /**
+     * Ratecontrol attempt to use, at least, <value> times the amount needed to prevent a vbv overflow.
+     * - encoding: Set by user.
+     * - decoding: unused.
+     */
+    float rc_min_vbv_overflow_use;
+
+    /**
+     * Hardware accelerator in use
+     * - encoding: unused.
+     * - decoding: Set by libavcodec
+     */
+    struct AVHWAccel *hwaccel;
+
+    /**
+     * For some codecs, the time base is closer to the field rate than the frame rate.
+     * Most notably, H.264 and MPEG-2 specify time_base as half of frame duration
+     * if no telecine is used ...
+     *
+     * Set to time_base ticks per frame. Default 1, e.g., H.264/MPEG-2 set it to 2.
+     */
+    int ticks_per_frame;
+
+    /**
+     * Hardware accelerator context.
+     * For some hardware accelerators, a global context needs to be
+     * provided by the user. In that case, this holds display-dependent
+     * data Libav cannot instantiate itself. Please refer to the
+     * Libav HW accelerator documentation to know how to fill this
+     * is. e.g. for VA API, this is a struct vaapi_context.
+     * - encoding: unused
+     * - decoding: Set by user
+     */
+    void *hwaccel_context;
+
+    /**
+     * Chromaticity coordinates of the source primaries.
+     * - encoding: Set by user
+     * - decoding: Set by libavcodec
+     */
+    enum AVColorPrimaries color_primaries;
+
+    /**
+     * Color Transfer Characteristic.
+     * - encoding: Set by user
+     * - decoding: Set by libavcodec
+     */
+    enum AVColorTransferCharacteristic color_trc;
+
+    /**
+     * YUV colorspace type.
+     * - encoding: Set by user
+     * - decoding: Set by libavcodec
+     */
+    enum AVColorSpace colorspace;
+
+    /**
+     * MPEG vs JPEG YUV range.
+     * - encoding: Set by user
+     * - decoding: Set by libavcodec
+     */
+    enum AVColorRange color_range;
+
+    /**
+     * This defines the location of chroma samples.
+     * - encoding: Set by user
+     * - decoding: Set by libavcodec
+     */
+    enum AVChromaLocation chroma_sample_location;
+
+    /**
+     * The codec may call this to execute several independent things.
+     * It will return only after finishing all tasks.
+     * The user may replace this with some multithreaded implementation,
+     * the default implementation will execute the parts serially.
+     * Also see avcodec_thread_init and e.g. the --enable-pthread configure option.
+     * @param c context passed also to func
+     * @param count the number of things to execute
+     * @param arg2 argument passed unchanged to func
+     * @param ret return values of executed functions, must have space for "count" values. May be NULL.
+     * @param func function that will be called count times, with jobnr from 0 to count-1.
+     *             threadnr will be in the range 0 to c->thread_count-1 < MAX_THREADS and so that no
+     *             two instances of func executing at the same time will have the same threadnr.
+     * @return always 0 currently, but code should handle a future improvement where when any call to func
+     *         returns < 0 no further calls to func may be done and < 0 is returned.
+     * - encoding: Set by libavcodec, user can override.
+     * - decoding: Set by libavcodec, user can override.
+     */
+    int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count);
+
+#if FF_API_X264_GLOBAL_OPTS
+    /**
+     * explicit P-frame weighted prediction analysis method
+     * 0: off
+     * 1: fast blind weighting (one reference duplicate with -1 offset)
+     * 2: smart weighting (full fade detection analysis)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    attribute_deprecated int weighted_p_pred;
+
+    /**
+     * AQ mode
+     * 0: Disabled
+     * 1: Variance AQ (complexity mask)
+     * 2: Auto-variance AQ (experimental)
+     * - encoding: Set by user
+     * - decoding: unused
+     */
+    attribute_deprecated int aq_mode;
+
+    /**
+     * AQ strength
+     * Reduces blocking and blurring in flat and textured areas.
+     * - encoding: Set by user
+     * - decoding: unused
+     */
+    attribute_deprecated float aq_strength;
+
+    /**
+     * PSY RD
+     * Strength of psychovisual optimization
+     * - encoding: Set by user
+     * - decoding: unused
+     */
+    attribute_deprecated float psy_rd;
+
+    /**
+     * PSY trellis
+     * Strength of psychovisual optimization
+     * - encoding: Set by user
+     * - decoding: unused
+     */
+    attribute_deprecated float psy_trellis;
+
+    /**
+     * RC lookahead
+     * Number of frames for frametype and ratecontrol lookahead
+     * - encoding: Set by user
+     * - decoding: unused
+     */
+    attribute_deprecated int rc_lookahead;
+
+    /**
+     * Constant rate factor maximum
+     * With CRF encoding mode and VBV restrictions enabled, prevents quality from being worse
+     * than crf_max, even if doing so would violate VBV restrictions.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    attribute_deprecated float crf_max;
+#endif
+
+    int log_level_offset;
+
+#if FF_API_FLAC_GLOBAL_OPTS
+    /**
+     * Determine which LPC analysis algorithm to use.
+     * - encoding: Set by user
+     * - decoding: unused
+     */
+    attribute_deprecated enum AVLPCType lpc_type;
+
+    /**
+     * Number of passes to use for Cholesky factorization during LPC analysis
+     * - encoding: Set by user
+     * - decoding: unused
+     */
+    attribute_deprecated int lpc_passes;
+#endif
+
+    /**
+     * Number of slices.
+     * Indicates number of picture subdivisions. Used for parallelized
+     * decoding.
+     * - encoding: Set by user
+     * - decoding: unused
+     */
+    int slices;
+
+    /**
+     * Header containing style information for text subtitles.
+     * For SUBTITLE_ASS subtitle type, it should contain the whole ASS
+     * [Script Info] and [V4+ Styles] section, plus the [Events] line and
+     * the Format line following. It shouldn't include any Dialogue line.
+     * - encoding: Set/allocated/freed by user (before avcodec_open2())
+     * - decoding: Set/allocated/freed by libavcodec (by avcodec_open2())
+     */
+    uint8_t *subtitle_header;
+    int subtitle_header_size;
+
+    /**
+     * Current packet as passed into the decoder, to avoid having
+     * to pass the packet into every function. Currently only valid
+     * inside lavc and get/release_buffer callbacks.
+     * - decoding: set by avcodec_decode_*, read by get_buffer() for setting pkt_pts
+     * - encoding: unused
+     */
+    AVPacket *pkt;
+
+#if FF_API_INTERNAL_CONTEXT
+    /**
+     * Whether this is a copy of the context which had init() called on it.
+     * This is used by multithreading - shared tables and picture pointers
+     * should be freed from the original context only.
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by libavcodec.
+     *
+     * @deprecated this field has been moved to an internal context
+     */
+    attribute_deprecated int is_copy;
+#endif
+
+    /**
+     * Which multithreading methods to use.
+     * Use of FF_THREAD_FRAME will increase decoding delay by one frame per thread,
+     * so clients which cannot provide future frames should not use it.
+     *
+     * - encoding: Set by user, otherwise the default is used.
+     * - decoding: Set by user, otherwise the default is used.
+     */
+    int thread_type;
+#define FF_THREAD_FRAME   1 ///< Decode more than one frame at once
+#define FF_THREAD_SLICE   2 ///< Decode more than one part of a single frame at once
+
+    /**
+     * Which multithreading methods are in use by the codec.
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by libavcodec.
+     */
+    int active_thread_type;
+
+    /**
+     * Set by the client if its custom get_buffer() callback can be called
+     * from another thread, which allows faster multithreaded decoding.
+     * draw_horiz_band() will be called from other threads regardless of this setting.
+     * Ignored if the default get_buffer() is used.
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int thread_safe_callbacks;
+
+    /**
+     * VBV delay coded in the last frame (in periods of a 27 MHz clock).
+     * Used for compliant TS muxing.
+     * - encoding: Set by libavcodec.
+     * - decoding: unused.
+     */
+    uint64_t vbv_delay;
+
+    /**
+     * Type of service that the audio stream conveys.
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    enum AVAudioServiceType audio_service_type;
+
+    /**
+     * Used to request a sample format from the decoder.
+     * - encoding: unused.
+     * - decoding: Set by user.
+     */
+    enum AVSampleFormat request_sample_fmt;
+
+    /**
+     * Error recognition; may misdetect some more or less valid parts as errors.
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    int err_recognition;
+#define AV_EF_CRCCHECK  (1<<0)
+#define AV_EF_BITSTREAM (1<<1)
+#define AV_EF_BUFFER    (1<<2)
+#define AV_EF_EXPLODE   (1<<3)
+
+    /**
+     * Private context used for internal data.
+     *
+     * Unlike priv_data, this is not codec-specific. It is used in general
+     * libavcodec functions.
+     */
+    struct AVCodecInternal *internal;
+
+    /** Field order
+     * - encoding: set by libavcodec
+     * - decoding: Set by libavcodec
+     */
+    enum AVFieldOrder field_order;
+} AVCodecContext;
+
+/**
+ * AVProfile.
+ */
+typedef struct AVProfile {
+    int profile;
+    const char *name; ///< short name for the profile
+} AVProfile;
+
+typedef struct AVCodecDefault AVCodecDefault;
+
+/**
+ * AVCodec.
+ */
+typedef struct AVCodec {
+    /**
+     * Name of the codec implementation.
+     * The name is globally unique among encoders and among decoders (but an
+     * encoder and a decoder can share the same name).
+     * This is the primary way to find a codec from the user perspective.
+     */
+    const char *name;
+    enum AVMediaType type;
+    enum CodecID id;
+    int priv_data_size;
+    int (*init)(AVCodecContext *);
+    int (*encode)(AVCodecContext *, uint8_t *buf, int buf_size, void *data);
+    int (*close)(AVCodecContext *);
+    int (*decode)(AVCodecContext *, void *outdata, int *outdata_size, AVPacket *avpkt);
+    /**
+     * Codec capabilities.
+     * see CODEC_CAP_*
+     */
+    int capabilities;
+    struct AVCodec *next;
+    /**
+     * Flush buffers.
+     * Will be called when seeking
+     */
+    void (*flush)(AVCodecContext *);
+    const AVRational *supported_framerates; ///< array of supported framerates, or NULL if any, array is terminated by {0,0}
+    const enum PixelFormat *pix_fmts;       ///< array of supported pixel formats, or NULL if unknown, array is terminated by -1
+    /**
+     * Descriptive name for the codec, meant to be more human readable than name.
+     * You should use the NULL_IF_CONFIG_SMALL() macro to define it.
+     */
+    const char *long_name;
+    const int *supported_samplerates;       ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
+    const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1
+    const uint64_t *channel_layouts;         ///< array of support channel layouts, or NULL if unknown. array is terminated by 0
+    uint8_t max_lowres;                     ///< maximum value for lowres supported by the decoder
+    const AVClass *priv_class;              ///< AVClass for the private context
+    const AVProfile *profiles;              ///< array of recognized profiles, or NULL if unknown, array is terminated by {FF_PROFILE_UNKNOWN}
+
+    /**
+     * @name Frame-level threading support functions
+     * @{
+     */
+    /**
+     * If defined, called on thread contexts when they are created.
+     * If the codec allocates writable tables in init(), re-allocate them here.
+     * priv_data will be set to a copy of the original.
+     */
+    int (*init_thread_copy)(AVCodecContext *);
+    /**
+     * Copy necessary context variables from a previous thread context to the current one.
+     * If not defined, the next thread will start automatically; otherwise, the codec
+     * must call ff_thread_finish_setup().
+     *
+     * dst and src will (rarely) point to the same context, in which case memcpy should be skipped.
+     */
+    int (*update_thread_context)(AVCodecContext *dst, const AVCodecContext *src);
+    /** @} */
+
+    /**
+     * Private codec-specific defaults.
+     */
+    const AVCodecDefault *defaults;
+
+    /**
+     * Initialize codec static data, called from avcodec_register().
+     */
+    void (*init_static_data)(struct AVCodec *codec);
+
+    /**
+     * Encode data to an AVPacket.
+     *
+     * @param      avctx          codec context
+     * @param      avpkt          output AVPacket (may contain a user-provided buffer)
+     * @param[in]  frame          AVFrame containing the raw data to be encoded
+     * @param[out] got_packet_ptr encoder sets to 0 or 1 to indicate that a
+     *                            non-empty packet was returned in avpkt.
+     * @return 0 on success, negative error code on failure
+     */
+    int (*encode2)(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame,
+                   int *got_packet_ptr);
+} AVCodec;
+
+/**
+ * AVHWAccel.
+ */
+typedef struct AVHWAccel {
+    /**
+     * Name of the hardware accelerated codec.
+     * The name is globally unique among encoders and among decoders (but an
+     * encoder and a decoder can share the same name).
+     */
+    const char *name;
+
+    /**
+     * Type of codec implemented by the hardware accelerator.
+     *
+     * See AVMEDIA_TYPE_xxx
+     */
+    enum AVMediaType type;
+
+    /**
+     * Codec implemented by the hardware accelerator.
+     *
+     * See CODEC_ID_xxx
+     */
+    enum CodecID id;
+
+    /**
+     * Supported pixel format.
+     *
+     * Only hardware accelerated formats are supported here.
+     */
+    enum PixelFormat pix_fmt;
+
+    /**
+     * Hardware accelerated codec capabilities.
+     * see FF_HWACCEL_CODEC_CAP_*
+     */
+    int capabilities;
+
+    struct AVHWAccel *next;
+
+    /**
+     * Called at the beginning of each frame or field picture.
+     *
+     * Meaningful frame information (codec specific) is guaranteed to
+     * be parsed at this point. This function is mandatory.
+     *
+     * Note that buf can be NULL along with buf_size set to 0.
+     * Otherwise, this means the whole frame is available at this point.
+     *
+     * @param avctx the codec context
+     * @param buf the frame data buffer base
+     * @param buf_size the size of the frame in bytes
+     * @return zero if successful, a negative value otherwise
+     */
+    int (*start_frame)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size);
+
+    /**
+     * Callback for each slice.
+     *
+     * Meaningful slice information (codec specific) is guaranteed to
+     * be parsed at this point. This function is mandatory.
+     *
+     * @param avctx the codec context
+     * @param buf the slice data buffer base
+     * @param buf_size the size of the slice in bytes
+     * @return zero if successful, a negative value otherwise
+     */
+    int (*decode_slice)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size);
+
+    /**
+     * Called at the end of each frame or field picture.
+     *
+     * The whole picture is parsed at this point and can now be sent
+     * to the hardware accelerator. This function is mandatory.
+     *
+     * @param avctx the codec context
+     * @return zero if successful, a negative value otherwise
+     */
+    int (*end_frame)(AVCodecContext *avctx);
+
+    /**
+     * Size of HW accelerator private data.
+     *
+     * Private data is allocated with av_mallocz() before
+     * AVCodecContext.get_buffer() and deallocated after
+     * AVCodecContext.release_buffer().
+     */
+    int priv_data_size;
+} AVHWAccel;
+
+/**
+ * four components are given, that's all.
+ * the last component is alpha
+ */
+typedef struct AVPicture {
+    uint8_t *data[AV_NUM_DATA_POINTERS];
+    int linesize[AV_NUM_DATA_POINTERS];     ///< number of bytes per line
+} AVPicture;
+
+#define AVPALETTE_SIZE 1024
+#define AVPALETTE_COUNT 256
+#if FF_API_PALETTE_CONTROL
+/**
+ * AVPaletteControl
+ * This structure defines a method for communicating palette changes
+ * between and demuxer and a decoder.
+ *
+ * @deprecated Use AVPacket to send palette changes instead.
+ * This is totally broken.
+ */
+typedef struct AVPaletteControl {
+
+    /* Demuxer sets this to 1 to indicate the palette has changed;
+     * decoder resets to 0. */
+    int palette_changed;
+
+    /* 4-byte ARGB palette entries, stored in native byte order; note that
+     * the individual palette components should be on a 8-bit scale; if
+     * the palette data comes from an IBM VGA native format, the component
+     * data is probably 6 bits in size and needs to be scaled. */
+    unsigned int palette[AVPALETTE_COUNT];
+
+} AVPaletteControl attribute_deprecated;
+#endif
+
+enum AVSubtitleType {
+    SUBTITLE_NONE,
+
+    SUBTITLE_BITMAP,                ///< A bitmap, pict will be set
+
+    /**
+     * Plain text, the text field must be set by the decoder and is
+     * authoritative. ass and pict fields may contain approximations.
+     */
+    SUBTITLE_TEXT,
+
+    /**
+     * Formatted text, the ass field must be set by the decoder and is
+     * authoritative. pict and text fields may contain approximations.
+     */
+    SUBTITLE_ASS,
+};
+
+typedef struct AVSubtitleRect {
+    int x;         ///< top left corner  of pict, undefined when pict is not set
+    int y;         ///< top left corner  of pict, undefined when pict is not set
+    int w;         ///< width            of pict, undefined when pict is not set
+    int h;         ///< height           of pict, undefined when pict is not set
+    int nb_colors; ///< number of colors in pict, undefined when pict is not set
+
+    /**
+     * data+linesize for the bitmap of this subtitle.
+     * can be set for text/ass as well once they where rendered
+     */
+    AVPicture pict;
+    enum AVSubtitleType type;
+
+    char *text;                     ///< 0 terminated plain UTF-8 text
+
+    /**
+     * 0 terminated ASS/SSA compatible event line.
+     * The pressentation of this is unaffected by the other values in this
+     * struct.
+     */
+    char *ass;
+} AVSubtitleRect;
+
+typedef struct AVSubtitle {
+    uint16_t format; /* 0 = graphics */
+    uint32_t start_display_time; /* relative to packet pts, in ms */
+    uint32_t end_display_time; /* relative to packet pts, in ms */
+    unsigned num_rects;
+    AVSubtitleRect **rects;
+    int64_t pts;    ///< Same as packet pts, in AV_TIME_BASE
+} AVSubtitle;
+
+/* packet functions */
+
+/**
+ * @deprecated use NULL instead
+ */
+attribute_deprecated void av_destruct_packet_nofree(AVPacket *pkt);
+
+/**
+ * Default packet destructor.
+ */
+void av_destruct_packet(AVPacket *pkt);
+
+/**
+ * Initialize optional fields of a packet with default values.
+ *
+ * @param pkt packet
+ */
+void av_init_packet(AVPacket *pkt);
+
+/**
+ * Allocate the payload of a packet and initialize its fields with
+ * default values.
+ *
+ * @param pkt packet
+ * @param size wanted payload size
+ * @return 0 if OK, AVERROR_xxx otherwise
+ */
+int av_new_packet(AVPacket *pkt, int size);
+
+/**
+ * Reduce packet size, correctly zeroing padding
+ *
+ * @param pkt packet
+ * @param size new size
+ */
+void av_shrink_packet(AVPacket *pkt, int size);
+
+/**
+ * Increase packet size, correctly zeroing padding
+ *
+ * @param pkt packet
+ * @param grow_by number of bytes by which to increase the size of the packet
+ */
+int av_grow_packet(AVPacket *pkt, int grow_by);
+
+/**
+ * @warning This is a hack - the packet memory allocation stuff is broken. The
+ * packet is allocated if it was not really allocated.
+ */
+int av_dup_packet(AVPacket *pkt);
+
+/**
+ * Free a packet.
+ *
+ * @param pkt packet to free
+ */
+void av_free_packet(AVPacket *pkt);
+
+/**
+ * Allocate new information of a packet.
+ *
+ * @param pkt packet
+ * @param type side information type
+ * @param size side information size
+ * @return pointer to fresh allocated data or NULL otherwise
+ */
+uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+                                 int size);
+
+/**
+ * Get side information from packet.
+ *
+ * @param pkt packet
+ * @param type desired side information type
+ * @param size pointer for side information size to store (optional)
+ * @return pointer to data if present or NULL otherwise
+ */
+uint8_t* av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+                                 int *size);
+
+/* resample.c */
+
+struct ReSampleContext;
+struct AVResampleContext;
+
+typedef struct ReSampleContext ReSampleContext;
+
+/**
+ *  Initialize audio resampling context.
+ *
+ * @param output_channels  number of output channels
+ * @param input_channels   number of input channels
+ * @param output_rate      output sample rate
+ * @param input_rate       input sample rate
+ * @param sample_fmt_out   requested output sample format
+ * @param sample_fmt_in    input sample format
+ * @param filter_length    length of each FIR filter in the filterbank relative to the cutoff frequency
+ * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
+ * @param linear           if 1 then the used FIR filter will be linearly interpolated
+                           between the 2 closest, if 0 the closest will be used
+ * @param cutoff           cutoff frequency, 1.0 corresponds to half the output sampling rate
+ * @return allocated ReSampleContext, NULL if error occurred
+ */
+ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
+                                        int output_rate, int input_rate,
+                                        enum AVSampleFormat sample_fmt_out,
+                                        enum AVSampleFormat sample_fmt_in,
+                                        int filter_length, int log2_phase_count,
+                                        int linear, double cutoff);
+
+int audio_resample(ReSampleContext *s, short *output, short *input, int nb_samples);
+
+/**
+ * Free resample context.
+ *
+ * @param s a non-NULL pointer to a resample context previously
+ *          created with av_audio_resample_init()
+ */
+void audio_resample_close(ReSampleContext *s);
+
+
+/**
+ * Initialize an audio resampler.
+ * Note, if either rate is not an integer then simply scale both rates up so they are.
+ * @param filter_length length of each FIR filter in the filterbank relative to the cutoff freq
+ * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
+ * @param linear If 1 then the used FIR filter will be linearly interpolated
+                 between the 2 closest, if 0 the closest will be used
+ * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate
+ */
+struct AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_length, int log2_phase_count, int linear, double cutoff);
+
+/**
+ * Resample an array of samples using a previously configured context.
+ * @param src an array of unconsumed samples
+ * @param consumed the number of samples of src which have been consumed are returned here
+ * @param src_size the number of unconsumed samples available
+ * @param dst_size the amount of space in samples available in dst
+ * @param update_ctx If this is 0 then the context will not be modified, that way several channels can be resampled with the same context.
+ * @return the number of samples written in dst or -1 if an error occurred
+ */
+int av_resample(struct AVResampleContext *c, short *dst, short *src, int *consumed, int src_size, int dst_size, int update_ctx);
+
+
+/**
+ * Compensate samplerate/timestamp drift. The compensation is done by changing
+ * the resampler parameters, so no audible clicks or similar distortions occur
+ * @param compensation_distance distance in output samples over which the compensation should be performed
+ * @param sample_delta number of output samples which should be output less
+ *
+ * example: av_resample_compensate(c, 10, 500)
+ * here instead of 510 samples only 500 samples would be output
+ *
+ * note, due to rounding the actual compensation might be slightly different,
+ * especially if the compensation_distance is large and the in_rate used during init is small
+ */
+void av_resample_compensate(struct AVResampleContext *c, int sample_delta, int compensation_distance);
+void av_resample_close(struct AVResampleContext *c);
+
+/**
+ * Allocate memory for a picture.  Call avpicture_free() to free it.
+ *
+ * @see avpicture_fill()
+ *
+ * @param picture the picture to be filled in
+ * @param pix_fmt the format of the picture
+ * @param width the width of the picture
+ * @param height the height of the picture
+ * @return zero if successful, a negative value if not
+ */
+int avpicture_alloc(AVPicture *picture, enum PixelFormat pix_fmt, int width, int height);
+
+/**
+ * Free a picture previously allocated by avpicture_alloc().
+ * The data buffer used by the AVPicture is freed, but the AVPicture structure
+ * itself is not.
+ *
+ * @param picture the AVPicture to be freed
+ */
+void avpicture_free(AVPicture *picture);
+
+/**
+ * Fill in the AVPicture fields.
+ * The fields of the given AVPicture are filled in by using the 'ptr' address
+ * which points to the image data buffer. Depending on the specified picture
+ * format, one or multiple image data pointers and line sizes will be set.
+ * If a planar format is specified, several pointers will be set pointing to
+ * the different picture planes and the line sizes of the different planes
+ * will be stored in the lines_sizes array.
+ * Call with ptr == NULL to get the required size for the ptr buffer.
+ *
+ * To allocate the buffer and fill in the AVPicture fields in one call,
+ * use avpicture_alloc().
+ *
+ * @param picture AVPicture whose fields are to be filled in
+ * @param ptr Buffer which will contain or contains the actual image data
+ * @param pix_fmt The format in which the picture data is stored.
+ * @param width the width of the image in pixels
+ * @param height the height of the image in pixels
+ * @return size of the image data in bytes
+ */
+int avpicture_fill(AVPicture *picture, uint8_t *ptr,
+                   enum PixelFormat pix_fmt, int width, int height);
+
+/**
+ * Copy pixel data from an AVPicture into a buffer.
+ * The data is stored compactly, without any gaps for alignment or padding
+ * which may be applied by avpicture_fill().
+ *
+ * @see avpicture_get_size()
+ *
+ * @param[in] src AVPicture containing image data
+ * @param[in] pix_fmt The format in which the picture data is stored.
+ * @param[in] width the width of the image in pixels.
+ * @param[in] height the height of the image in pixels.
+ * @param[out] dest A buffer into which picture data will be copied.
+ * @param[in] dest_size The size of 'dest'.
+ * @return The number of bytes written to dest, or a negative value (error code) on error.
+ */
+int avpicture_layout(const AVPicture* src, enum PixelFormat pix_fmt, int width, int height,
+                     unsigned char *dest, int dest_size);
+
+/**
+ * Calculate the size in bytes that a picture of the given width and height
+ * would occupy if stored in the given picture format.
+ * Note that this returns the size of a compact representation as generated
+ * by avpicture_layout(), which can be smaller than the size required for e.g.
+ * avpicture_fill().
+ *
+ * @param pix_fmt the given picture format
+ * @param width the width of the image
+ * @param height the height of the image
+ * @return Image data size in bytes or -1 on error (e.g. too large dimensions).
+ */
+int avpicture_get_size(enum PixelFormat pix_fmt, int width, int height);
+void avcodec_get_chroma_sub_sample(enum PixelFormat pix_fmt, int *h_shift, int *v_shift);
+
+#if FF_API_GET_PIX_FMT_NAME
+/**
+ * @deprecated Deprecated in favor of av_get_pix_fmt_name().
+ */
+attribute_deprecated
+const char *avcodec_get_pix_fmt_name(enum PixelFormat pix_fmt);
+#endif
+
+void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
+
+/**
+ * Return a value representing the fourCC code associated to the
+ * pixel format pix_fmt, or 0 if no associated fourCC code can be
+ * found.
+ */
+unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat pix_fmt);
+
+/**
+ * Put a string representing the codec tag codec_tag in buf.
+ *
+ * @param buf_size size in bytes of buf
+ * @return the length of the string that would have been generated if
+ * enough space had been available, excluding the trailing null
+ */
+size_t av_get_codec_tag_string(char *buf, size_t buf_size, unsigned int codec_tag);
+
+#define FF_LOSS_RESOLUTION  0x0001 /**< loss due to resolution change */
+#define FF_LOSS_DEPTH       0x0002 /**< loss due to color depth change */
+#define FF_LOSS_COLORSPACE  0x0004 /**< loss due to color space conversion */
+#define FF_LOSS_ALPHA       0x0008 /**< loss of alpha bits */
+#define FF_LOSS_COLORQUANT  0x0010 /**< loss due to color quantization */
+#define FF_LOSS_CHROMA      0x0020 /**< loss of chroma (e.g. RGB to gray conversion) */
+
+/**
+ * Compute what kind of losses will occur when converting from one specific
+ * pixel format to another.
+ * When converting from one pixel format to another, information loss may occur.
+ * For example, when converting from RGB24 to GRAY, the color information will
+ * be lost. Similarly, other losses occur when converting from some formats to
+ * other formats. These losses can involve loss of chroma, but also loss of
+ * resolution, loss of color depth, loss due to the color space conversion, loss
+ * of the alpha bits or loss due to color quantization.
+ * avcodec_get_fix_fmt_loss() informs you about the various types of losses
+ * which will occur when converting from one pixel format to another.
+ *
+ * @param[in] dst_pix_fmt destination pixel format
+ * @param[in] src_pix_fmt source pixel format
+ * @param[in] has_alpha Whether the source pixel format alpha channel is used.
+ * @return Combination of flags informing you what kind of losses will occur.
+ */
+int avcodec_get_pix_fmt_loss(enum PixelFormat dst_pix_fmt, enum PixelFormat src_pix_fmt,
+                             int has_alpha);
+
+/**
+ * Find the best pixel format to convert to given a certain source pixel
+ * format.  When converting from one pixel format to another, information loss
+ * may occur.  For example, when converting from RGB24 to GRAY, the color
+ * information will be lost. Similarly, other losses occur when converting from
+ * some formats to other formats. avcodec_find_best_pix_fmt() searches which of
+ * the given pixel formats should be used to suffer the least amount of loss.
+ * The pixel formats from which it chooses one, are determined by the
+ * pix_fmt_mask parameter.
+ *
+ * @code
+ * src_pix_fmt = PIX_FMT_YUV420P;
+ * pix_fmt_mask = (1 << PIX_FMT_YUV422P) || (1 << PIX_FMT_RGB24);
+ * dst_pix_fmt = avcodec_find_best_pix_fmt(pix_fmt_mask, src_pix_fmt, alpha, &loss);
+ * @endcode
+ *
+ * @param[in] pix_fmt_mask bitmask determining which pixel format to choose from
+ * @param[in] src_pix_fmt source pixel format
+ * @param[in] has_alpha Whether the source pixel format alpha channel is used.
+ * @param[out] loss_ptr Combination of flags informing you what kind of losses will occur.
+ * @return The best pixel format to convert to or -1 if none was found.
+ */
+enum PixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum PixelFormat src_pix_fmt,
+                              int has_alpha, int *loss_ptr);
+
+#if FF_API_GET_ALPHA_INFO
+#define FF_ALPHA_TRANSP       0x0001 /* image has some totally transparent pixels */
+#define FF_ALPHA_SEMI_TRANSP  0x0002 /* image has some transparent pixels */
+
+/**
+ * Tell if an image really has transparent alpha values.
+ * @return ored mask of FF_ALPHA_xxx constants
+ */
+attribute_deprecated
+int img_get_alpha_info(const AVPicture *src,
+                       enum PixelFormat pix_fmt, int width, int height);
+#endif
+
+/* deinterlace a picture */
+/* deinterlace - if not supported return -1 */
+int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
+                          enum PixelFormat pix_fmt, int width, int height);
+
+/* external high level API */
+
+/**
+ * If c is NULL, returns the first registered codec,
+ * if c is non-NULL, returns the next registered codec after c,
+ * or NULL if c is the last one.
+ */
+AVCodec *av_codec_next(AVCodec *c);
+
+/**
+ * Return the LIBAVCODEC_VERSION_INT constant.
+ */
+unsigned avcodec_version(void);
+
+/**
+ * Return the libavcodec build-time configuration.
+ */
+const char *avcodec_configuration(void);
+
+/**
+ * Return the libavcodec license.
+ */
+const char *avcodec_license(void);
+
+#if FF_API_AVCODEC_INIT
+/**
+ * @deprecated this function is called automatically from avcodec_register()
+ * and avcodec_register_all(), there is no need to call it manually
+ */
+attribute_deprecated
+void avcodec_init(void);
+#endif
+
+/**
+ * Register the codec codec and initialize libavcodec.
+ *
+ * @warning either this function or avcodec_register_all() must be called
+ * before any other libavcodec functions.
+ *
+ * @see avcodec_register_all()
+ */
+void avcodec_register(AVCodec *codec);
+
+/**
+ * Find a registered encoder with a matching codec ID.
+ *
+ * @param id CodecID of the requested encoder
+ * @return An encoder if one was found, NULL otherwise.
+ */
+AVCodec *avcodec_find_encoder(enum CodecID id);
+
+/**
+ * Find a registered encoder with the specified name.
+ *
+ * @param name name of the requested encoder
+ * @return An encoder if one was found, NULL otherwise.
+ */
+AVCodec *avcodec_find_encoder_by_name(const char *name);
+
+/**
+ * Find a registered decoder with a matching codec ID.
+ *
+ * @param id CodecID of the requested decoder
+ * @return A decoder if one was found, NULL otherwise.
+ */
+AVCodec *avcodec_find_decoder(enum CodecID id);
+
+/**
+ * Find a registered decoder with the specified name.
+ *
+ * @param name name of the requested decoder
+ * @return A decoder if one was found, NULL otherwise.
+ */
+AVCodec *avcodec_find_decoder_by_name(const char *name);
+void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode);
+
+/**
+ * Return a name for the specified profile, if available.
+ *
+ * @param codec the codec that is searched for the given profile
+ * @param profile the profile value for which a name is requested
+ * @return A name for the profile if found, NULL otherwise.
+ */
+const char *av_get_profile_name(const AVCodec *codec, int profile);
+
+#if FF_API_ALLOC_CONTEXT
+/**
+ * Set the fields of the given AVCodecContext to default values.
+ *
+ * @param s The AVCodecContext of which the fields should be set to default values.
+ * @deprecated use avcodec_get_context_defaults3
+ */
+attribute_deprecated
+void avcodec_get_context_defaults(AVCodecContext *s);
+
+/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
+ *  we WILL change its arguments and name a few times! */
+attribute_deprecated
+void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType);
+#endif
+
+/**
+ * Set the fields of the given AVCodecContext to default values corresponding
+ * to the given codec (defaults may be codec-dependent).
+ *
+ * Do not call this function if a non-NULL codec has been passed
+ * to avcodec_alloc_context3() that allocated this AVCodecContext.
+ * If codec is non-NULL, it is illegal to call avcodec_open2() with a
+ * different codec on this AVCodecContext.
+ */
+int avcodec_get_context_defaults3(AVCodecContext *s, AVCodec *codec);
+
+#if FF_API_ALLOC_CONTEXT
+/**
+ * Allocate an AVCodecContext and set its fields to default values.  The
+ * resulting struct can be deallocated by simply calling av_free().
+ *
+ * @return An AVCodecContext filled with default values or NULL on failure.
+ * @see avcodec_get_context_defaults
+ *
+ * @deprecated use avcodec_alloc_context3()
+ */
+attribute_deprecated
+AVCodecContext *avcodec_alloc_context(void);
+
+/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
+ *  we WILL change its arguments and name a few times! */
+attribute_deprecated
+AVCodecContext *avcodec_alloc_context2(enum AVMediaType);
+#endif
+
+/**
+ * Allocate an AVCodecContext and set its fields to default values.  The
+ * resulting struct can be deallocated by calling avcodec_close() on it followed
+ * by av_free().
+ *
+ * @param codec if non-NULL, allocate private data and initialize defaults
+ *              for the given codec. It is illegal to then call avcodec_open2()
+ *              with a different codec.
+ *
+ * @return An AVCodecContext filled with default values or NULL on failure.
+ * @see avcodec_get_context_defaults
+ */
+AVCodecContext *avcodec_alloc_context3(AVCodec *codec);
+
+/**
+ * Copy the settings of the source AVCodecContext into the destination
+ * AVCodecContext. The resulting destination codec context will be
+ * unopened, i.e. you are required to call avcodec_open2() before you
+ * can use this AVCodecContext to decode/encode video/audio data.
+ *
+ * @param dest target codec context, should be initialized with
+ *             avcodec_alloc_context3(), but otherwise uninitialized
+ * @param src source codec context
+ * @return AVERROR() on error (e.g. memory allocation error), 0 on success
+ */
+int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src);
+
+/**
+ * Set the fields of the given AVFrame to default values.
+ *
+ * @param pic The AVFrame of which the fields should be set to default values.
+ */
+void avcodec_get_frame_defaults(AVFrame *pic);
+
+/**
+ * Allocate an AVFrame and set its fields to default values.  The resulting
+ * struct can be deallocated by simply calling av_free().
+ *
+ * @return An AVFrame filled with default values or NULL on failure.
+ * @see avcodec_get_frame_defaults
+ */
+AVFrame *avcodec_alloc_frame(void);
+
+int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic);
+void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic);
+int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic);
+
+/**
+ * Return the amount of padding in pixels which the get_buffer callback must
+ * provide around the edge of the image for codecs which do not have the
+ * CODEC_FLAG_EMU_EDGE flag.
+ *
+ * @return Required padding in pixels.
+ */
+unsigned avcodec_get_edge_width(void);
+/**
+ * Modify width and height values so that they will result in a memory
+ * buffer that is acceptable for the codec if you do not use any horizontal
+ * padding.
+ *
+ * May only be used if a codec with CODEC_CAP_DR1 has been opened.
+ * If CODEC_FLAG_EMU_EDGE is not set, the dimensions must have been increased
+ * according to avcodec_get_edge_width() before.
+ */
+void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height);
+/**
+ * Modify width and height values so that they will result in a memory
+ * buffer that is acceptable for the codec if you also ensure that all
+ * line sizes are a multiple of the respective linesize_align[i].
+ *
+ * May only be used if a codec with CODEC_CAP_DR1 has been opened.
+ * If CODEC_FLAG_EMU_EDGE is not set, the dimensions must have been increased
+ * according to avcodec_get_edge_width() before.
+ */
+void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
+                               int linesize_align[AV_NUM_DATA_POINTERS]);
+
+enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat * fmt);
+
+#if FF_API_THREAD_INIT
+/**
+ * @deprecated Set s->thread_count before calling avcodec_open2() instead of calling this.
+ */
+attribute_deprecated
+int avcodec_thread_init(AVCodecContext *s, int thread_count);
+#endif
+
+int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size);
+int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count);
+//FIXME func typedef
+
+#if FF_API_AVCODEC_OPEN
+/**
+ * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
+ * function the context has to be allocated.
+ *
+ * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(),
+ * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for
+ * retrieving a codec.
+ *
+ * @warning This function is not thread safe!
+ *
+ * @code
+ * avcodec_register_all();
+ * codec = avcodec_find_decoder(CODEC_ID_H264);
+ * if (!codec)
+ *     exit(1);
+ *
+ * context = avcodec_alloc_context3(codec);
+ *
+ * if (avcodec_open(context, codec) < 0)
+ *     exit(1);
+ * @endcode
+ *
+ * @param avctx The context which will be set up to use the given codec.
+ * @param codec The codec to use within the context.
+ * @return zero on success, a negative value on error
+ * @see avcodec_alloc_context3, avcodec_find_decoder, avcodec_find_encoder, avcodec_close
+ *
+ * @deprecated use avcodec_open2
+ */
+attribute_deprecated
+int avcodec_open(AVCodecContext *avctx, AVCodec *codec);
+#endif
+
+/**
+ * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
+ * function the context has to be allocated with avcodec_alloc_context3().
+ *
+ * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(),
+ * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for
+ * retrieving a codec.
+ *
+ * @warning This function is not thread safe!
+ *
+ * @code
+ * avcodec_register_all();
+ * av_dict_set(&opts, "b", "2.5M", 0);
+ * codec = avcodec_find_decoder(CODEC_ID_H264);
+ * if (!codec)
+ *     exit(1);
+ *
+ * context = avcodec_alloc_context3(codec);
+ *
+ * if (avcodec_open2(context, codec, opts) < 0)
+ *     exit(1);
+ * @endcode
+ *
+ * @param avctx The context to initialize.
+ * @param codec The codec to open this context for. If a non-NULL codec has been
+ *              previously passed to avcodec_alloc_context3() or
+ *              avcodec_get_context_defaults3() for this context, then this
+ *              parameter MUST be either NULL or equal to the previously passed
+ *              codec.
+ * @param options A dictionary filled with AVCodecContext and codec-private options.
+ *                On return this object will be filled with options that were not found.
+ *
+ * @return zero on success, a negative value on error
+ * @see avcodec_alloc_context3(), avcodec_find_decoder(), avcodec_find_encoder(),
+ *      av_dict_set(), av_opt_find().
+ */
+int avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options);
+
+#if FF_API_OLD_DECODE_AUDIO
+/**
+ * Wrapper function which calls avcodec_decode_audio4.
+ *
+ * @deprecated Use avcodec_decode_audio4 instead.
+ *
+ * Decode the audio frame of size avpkt->size from avpkt->data into samples.
+ * Some decoders may support multiple frames in a single AVPacket, such
+ * decoders would then just decode the first frame. In this case,
+ * avcodec_decode_audio3 has to be called again with an AVPacket that contains
+ * the remaining data in order to decode the second frame etc.
+ * If no frame
+ * could be outputted, frame_size_ptr is zero. Otherwise, it is the
+ * decompressed frame size in bytes.
+ *
+ * @warning You must set frame_size_ptr to the allocated size of the
+ * output buffer before calling avcodec_decode_audio3().
+ *
+ * @warning The input buffer must be FF_INPUT_BUFFER_PADDING_SIZE larger than
+ * the actual read bytes because some optimized bitstream readers read 32 or 64
+ * bits at once and could read over the end.
+ *
+ * @warning The end of the input buffer avpkt->data should be set to 0 to ensure that
+ * no overreading happens for damaged MPEG streams.
+ *
+ * @warning You must not provide a custom get_buffer() when using
+ * avcodec_decode_audio3().  Doing so will override it with
+ * avcodec_default_get_buffer.  Use avcodec_decode_audio4() instead,
+ * which does allow the application to provide a custom get_buffer().
+ *
+ * @note You might have to align the input buffer avpkt->data and output buffer
+ * samples. The alignment requirements depend on the CPU: On some CPUs it isn't
+ * necessary at all, on others it won't work at all if not aligned and on others
+ * it will work but it will have an impact on performance.
+ *
+ * In practice, avpkt->data should have 4 byte alignment at minimum and
+ * samples should be 16 byte aligned unless the CPU doesn't need it
+ * (AltiVec and SSE do).
+ *
+ * @note Codecs which have the CODEC_CAP_DELAY capability set have a delay
+ * between input and output, these need to be fed with avpkt->data=NULL,
+ * avpkt->size=0 at the end to return the remaining frames.
+ *
+ * @param avctx the codec context
+ * @param[out] samples the output buffer, sample type in avctx->sample_fmt
+ *                     If the sample format is planar, each channel plane will
+ *                     be the same size, with no padding between channels.
+ * @param[in,out] frame_size_ptr the output buffer size in bytes
+ * @param[in] avpkt The input AVPacket containing the input buffer.
+ *            You can create such packet with av_init_packet() and by then setting
+ *            data and size, some decoders might in addition need other fields.
+ *            All decoders are designed to use the least fields possible though.
+ * @return On error a negative value is returned, otherwise the number of bytes
+ * used or zero if no frame data was decompressed (used) from the input AVPacket.
+ */
+attribute_deprecated int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples,
+                         int *frame_size_ptr,
+                         AVPacket *avpkt);
+#endif
+
+/**
+ * Decode the audio frame of size avpkt->size from avpkt->data into frame.
+ *
+ * Some decoders may support multiple frames in a single AVPacket. Such
+ * decoders would then just decode the first frame. In this case,
+ * avcodec_decode_audio4 has to be called again with an AVPacket containing
+ * the remaining data in order to decode the second frame, etc...
+ * Even if no frames are returned, the packet needs to be fed to the decoder
+ * with remaining data until it is completely consumed or an error occurs.
+ *
+ * @warning The input buffer, avpkt->data must be FF_INPUT_BUFFER_PADDING_SIZE
+ *          larger than the actual read bytes because some optimized bitstream
+ *          readers read 32 or 64 bits at once and could read over the end.
+ *
+ * @note You might have to align the input buffer. The alignment requirements
+ *       depend on the CPU and the decoder.
+ *
+ * @param      avctx the codec context
+ * @param[out] frame The AVFrame in which to store decoded audio samples.
+ *                   Decoders request a buffer of a particular size by setting
+ *                   AVFrame.nb_samples prior to calling get_buffer(). The
+ *                   decoder may, however, only utilize part of the buffer by
+ *                   setting AVFrame.nb_samples to a smaller value in the
+ *                   output frame.
+ * @param[out] got_frame_ptr Zero if no frame could be decoded, otherwise it is
+ *                           non-zero.
+ * @param[in]  avpkt The input AVPacket containing the input buffer.
+ *                   At least avpkt->data and avpkt->size should be set. Some
+ *                   decoders might also require additional fields to be set.
+ * @return A negative error code is returned if an error occurred during
+ *         decoding, otherwise the number of bytes consumed from the input
+ *         AVPacket is returned.
+ */
+int avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame,
+                          int *got_frame_ptr, AVPacket *avpkt);
+
+/**
+ * Decode the video frame of size avpkt->size from avpkt->data into picture.
+ * Some decoders may support multiple frames in a single AVPacket, such
+ * decoders would then just decode the first frame.
+ *
+ * @warning The input buffer must be FF_INPUT_BUFFER_PADDING_SIZE larger than
+ * the actual read bytes because some optimized bitstream readers read 32 or 64
+ * bits at once and could read over the end.
+ *
+ * @warning The end of the input buffer buf should be set to 0 to ensure that
+ * no overreading happens for damaged MPEG streams.
+ *
+ * @note You might have to align the input buffer avpkt->data.
+ * The alignment requirements depend on the CPU: on some CPUs it isn't
+ * necessary at all, on others it won't work at all if not aligned and on others
+ * it will work but it will have an impact on performance.
+ *
+ * In practice, avpkt->data should have 4 byte alignment at minimum.
+ *
+ * @note Codecs which have the CODEC_CAP_DELAY capability set have a delay
+ * between input and output, these need to be fed with avpkt->data=NULL,
+ * avpkt->size=0 at the end to return the remaining frames.
+ *
+ * @param avctx the codec context
+ * @param[out] picture The AVFrame in which the decoded video frame will be stored.
+ *             Use avcodec_alloc_frame to get an AVFrame, the codec will
+ *             allocate memory for the actual bitmap.
+ *             with default get/release_buffer(), the decoder frees/reuses the bitmap as it sees fit.
+ *             with overridden get/release_buffer() (needs CODEC_CAP_DR1) the user decides into what buffer the decoder
+ *                   decodes and the decoder tells the user once it does not need the data anymore,
+ *                   the user app can at this point free/reuse/keep the memory as it sees fit.
+ *
+ * @param[in] avpkt The input AVpacket containing the input buffer.
+ *            You can create such packet with av_init_packet() and by then setting
+ *            data and size, some decoders might in addition need other fields like
+ *            flags&AV_PKT_FLAG_KEY. All decoders are designed to use the least
+ *            fields possible.
+ * @param[in,out] got_picture_ptr Zero if no frame could be decompressed, otherwise, it is nonzero.
+ * @return On error a negative value is returned, otherwise the number of bytes
+ * used or zero if no frame could be decompressed.
+ */
+int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
+                         int *got_picture_ptr,
+                         AVPacket *avpkt);
+
+/**
+ * Decode a subtitle message.
+ * Return a negative value on error, otherwise return the number of bytes used.
+ * If no subtitle could be decompressed, got_sub_ptr is zero.
+ * Otherwise, the subtitle is stored in *sub.
+ * Note that CODEC_CAP_DR1 is not available for subtitle codecs. This is for
+ * simplicity, because the performance difference is expect to be negligible
+ * and reusing a get_buffer written for video codecs would probably perform badly
+ * due to a potentially very different allocation pattern.
+ *
+ * @param avctx the codec context
+ * @param[out] sub The AVSubtitle in which the decoded subtitle will be stored, must be
+                   freed with avsubtitle_free if *got_sub_ptr is set.
+ * @param[in,out] got_sub_ptr Zero if no subtitle could be decompressed, otherwise, it is nonzero.
+ * @param[in] avpkt The input AVPacket containing the input buffer.
+ */
+int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
+                            int *got_sub_ptr,
+                            AVPacket *avpkt);
+
+/**
+ * Free all allocated data in the given subtitle struct.
+ *
+ * @param sub AVSubtitle to free.
+ */
+void avsubtitle_free(AVSubtitle *sub);
+
+#if FF_API_OLD_ENCODE_AUDIO
+/**
+ * Encode an audio frame from samples into buf.
+ *
+ * @deprecated Use avcodec_encode_audio2 instead.
+ *
+ * @note The output buffer should be at least FF_MIN_BUFFER_SIZE bytes large.
+ * However, for codecs with avctx->frame_size equal to 0 (e.g. PCM) the user
+ * will know how much space is needed because it depends on the value passed
+ * in buf_size as described below. In that case a lower value can be used.
+ *
+ * @param avctx the codec context
+ * @param[out] buf the output buffer
+ * @param[in] buf_size the output buffer size
+ * @param[in] samples the input buffer containing the samples
+ * The number of samples read from this buffer is frame_size*channels,
+ * both of which are defined in avctx.
+ * For codecs which have avctx->frame_size equal to 0 (e.g. PCM) the number of
+ * samples read from samples is equal to:
+ * buf_size * 8 / (avctx->channels * av_get_bits_per_sample(avctx->codec_id))
+ * This also implies that av_get_bits_per_sample() must not return 0 for these
+ * codecs.
+ * @return On error a negative value is returned, on success zero or the number
+ * of bytes used to encode the data read from the input buffer.
+ */
+int attribute_deprecated avcodec_encode_audio(AVCodecContext *avctx,
+                                              uint8_t *buf, int buf_size,
+                                              const short *samples);
+#endif
+
+/**
+ * Encode a frame of audio.
+ *
+ * Takes input samples from frame and writes the next output packet, if
+ * available, to avpkt. The output packet does not necessarily contain data for
+ * the most recent frame, as encoders can delay, split, and combine input frames
+ * internally as needed.
+ *
+ * @param avctx     codec context
+ * @param avpkt     output AVPacket.
+ *                  The user can supply an output buffer by setting
+ *                  avpkt->data and avpkt->size prior to calling the
+ *                  function, but if the size of the user-provided data is not
+ *                  large enough, encoding will fail. All other AVPacket fields
+ *                  will be reset by the encoder using av_init_packet(). If
+ *                  avpkt->data is NULL, the encoder will allocate it.
+ *                  The encoder will set avpkt->size to the size of the
+ *                  output packet.
+ * @param[in] frame AVFrame containing the raw audio data to be encoded.
+ *                  May be NULL when flushing an encoder that has the
+ *                  CODEC_CAP_DELAY capability set.
+ *                  There are 2 codec capabilities that affect the allowed
+ *                  values of frame->nb_samples.
+ *                  If CODEC_CAP_SMALL_LAST_FRAME is set, then only the final
+ *                  frame may be smaller than avctx->frame_size, and all other
+ *                  frames must be equal to avctx->frame_size.
+ *                  If CODEC_CAP_VARIABLE_FRAME_SIZE is set, then each frame
+ *                  can have any number of samples.
+ *                  If neither is set, frame->nb_samples must be equal to
+ *                  avctx->frame_size for all frames.
+ * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the
+ *                            output packet is non-empty, and to 0 if it is
+ *                            empty. If the function returns an error, the
+ *                            packet can be assumed to be invalid, and the
+ *                            value of got_packet_ptr is undefined and should
+ *                            not be used.
+ * @return          0 on success, negative error code on failure
+ */
+int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt,
+                          const AVFrame *frame, int *got_packet_ptr);
+
+/**
+ * Fill audio frame data and linesize.
+ * AVFrame extended_data channel pointers are allocated if necessary for
+ * planar audio.
+ *
+ * @param frame       the AVFrame
+ *                    frame->nb_samples must be set prior to calling the
+ *                    function. This function fills in frame->data,
+ *                    frame->extended_data, frame->linesize[0].
+ * @param nb_channels channel count
+ * @param sample_fmt  sample format
+ * @param buf         buffer to use for frame data
+ * @param buf_size    size of buffer
+ * @param align       plane size sample alignment
+ * @return            0 on success, negative error code on failure
+ */
+int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels,
+                             enum AVSampleFormat sample_fmt, const uint8_t *buf,
+                             int buf_size, int align);
+
+/**
+ * Encode a video frame from pict into buf.
+ * The input picture should be
+ * stored using a specific format, namely avctx.pix_fmt.
+ *
+ * @param avctx the codec context
+ * @param[out] buf the output buffer for the bitstream of encoded frame
+ * @param[in] buf_size the size of the output buffer in bytes
+ * @param[in] pict the input picture to encode
+ * @return On error a negative value is returned, on success zero or the number
+ * of bytes used from the output buffer.
+ */
+int avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size,
+                         const AVFrame *pict);
+int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size,
+                            const AVSubtitle *sub);
+
+/**
+ * Close a given AVCodecContext and free all the data associated with it
+ * (but not the AVCodecContext itself).
+ *
+ * Calling this function on an AVCodecContext that hasn't been opened will free
+ * the codec-specific data allocated in avcodec_alloc_context3() /
+ * avcodec_get_context_defaults3() with a non-NULL codec. Subsequent calls will
+ * do nothing.
+ */
+int avcodec_close(AVCodecContext *avctx);
+
+/**
+ * Register all the codecs, parsers and bitstream filters which were enabled at
+ * configuration time. If you do not call this function you can select exactly
+ * which formats you want to support, by using the individual registration
+ * functions.
+ *
+ * @see avcodec_register
+ * @see av_register_codec_parser
+ * @see av_register_bitstream_filter
+ */
+void avcodec_register_all(void);
+
+/**
+ * Flush buffers, should be called when seeking or when switching to a different stream.
+ */
+void avcodec_flush_buffers(AVCodecContext *avctx);
+
+void avcodec_default_free_buffers(AVCodecContext *s);
+
+/* misc useful functions */
+
+#if FF_API_OLD_FF_PICT_TYPES
+/**
+ * Return a single letter to describe the given picture type pict_type.
+ *
+ * @param[in] pict_type the picture type
+ * @return A single character representing the picture type.
+ * @deprecated Use av_get_picture_type_char() instead.
+ */
+attribute_deprecated
+char av_get_pict_type_char(int pict_type);
+#endif
+
+/**
+ * Return codec bits per sample.
+ *
+ * @param[in] codec_id the codec
+ * @return Number of bits per sample or zero if unknown for the given codec.
+ */
+int av_get_bits_per_sample(enum CodecID codec_id);
+
+#if FF_API_OLD_SAMPLE_FMT
+/**
+ * @deprecated Use av_get_bytes_per_sample() instead.
+ */
+attribute_deprecated
+int av_get_bits_per_sample_format(enum AVSampleFormat sample_fmt);
+#endif
+
+/* frame parsing */
+typedef struct AVCodecParserContext {
+    void *priv_data;
+    struct AVCodecParser *parser;
+    int64_t frame_offset; /* offset of the current frame */
+    int64_t cur_offset; /* current offset
+                           (incremented by each av_parser_parse()) */
+    int64_t next_frame_offset; /* offset of the next frame */
+    /* video info */
+    int pict_type; /* XXX: Put it back in AVCodecContext. */
+    /**
+     * This field is used for proper frame duration computation in lavf.
+     * It signals, how much longer the frame duration of the current frame
+     * is compared to normal frame duration.
+     *
+     * frame_duration = (1 + repeat_pict) * time_base
+     *
+     * It is used by codecs like H.264 to display telecined material.
+     */
+    int repeat_pict; /* XXX: Put it back in AVCodecContext. */
+    int64_t pts;     /* pts of the current frame */
+    int64_t dts;     /* dts of the current frame */
+
+    /* private data */
+    int64_t last_pts;
+    int64_t last_dts;
+    int fetch_timestamp;
+
+#define AV_PARSER_PTS_NB 4
+    int cur_frame_start_index;
+    int64_t cur_frame_offset[AV_PARSER_PTS_NB];
+    int64_t cur_frame_pts[AV_PARSER_PTS_NB];
+    int64_t cur_frame_dts[AV_PARSER_PTS_NB];
+
+    int flags;
+#define PARSER_FLAG_COMPLETE_FRAMES           0x0001
+#define PARSER_FLAG_ONCE                      0x0002
+/// Set if the parser has a valid file offset
+#define PARSER_FLAG_FETCHED_OFFSET            0x0004
+
+    int64_t offset;      ///< byte offset from starting packet start
+    int64_t cur_frame_end[AV_PARSER_PTS_NB];
+
+    /**
+     * Set by parser to 1 for key frames and 0 for non-key frames.
+     * It is initialized to -1, so if the parser doesn't set this flag,
+     * old-style fallback using AV_PICTURE_TYPE_I picture type as key frames
+     * will be used.
+     */
+    int key_frame;
+
+    /**
+     * Time difference in stream time base units from the pts of this
+     * packet to the point at which the output from the decoder has converged
+     * independent from the availability of previous frames. That is, the
+     * frames are virtually identical no matter if decoding started from
+     * the very first frame or from this keyframe.
+     * Is AV_NOPTS_VALUE if unknown.
+     * This field is not the display duration of the current frame.
+     * This field has no meaning if the packet does not have AV_PKT_FLAG_KEY
+     * set.
+     *
+     * The purpose of this field is to allow seeking in streams that have no
+     * keyframes in the conventional sense. It corresponds to the
+     * recovery point SEI in H.264 and match_time_delta in NUT. It is also
+     * essential for some types of subtitle streams to ensure that all
+     * subtitles are correctly displayed after seeking.
+     */
+    int64_t convergence_duration;
+
+    // Timestamp generation support:
+    /**
+     * Synchronization point for start of timestamp generation.
+     *
+     * Set to >0 for sync point, 0 for no sync point and <0 for undefined
+     * (default).
+     *
+     * For example, this corresponds to presence of H.264 buffering period
+     * SEI message.
+     */
+    int dts_sync_point;
+
+    /**
+     * Offset of the current timestamp against last timestamp sync point in
+     * units of AVCodecContext.time_base.
+     *
+     * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
+     * contain a valid timestamp offset.
+     *
+     * Note that the timestamp of sync point has usually a nonzero
+     * dts_ref_dts_delta, which refers to the previous sync point. Offset of
+     * the next frame after timestamp sync point will be usually 1.
+     *
+     * For example, this corresponds to H.264 cpb_removal_delay.
+     */
+    int dts_ref_dts_delta;
+
+    /**
+     * Presentation delay of current frame in units of AVCodecContext.time_base.
+     *
+     * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
+     * contain valid non-negative timestamp delta (presentation time of a frame
+     * must not lie in the past).
+     *
+     * This delay represents the difference between decoding and presentation
+     * time of the frame.
+     *
+     * For example, this corresponds to H.264 dpb_output_delay.
+     */
+    int pts_dts_delta;
+
+    /**
+     * Position of the packet in file.
+     *
+     * Analogous to cur_frame_pts/dts
+     */
+    int64_t cur_frame_pos[AV_PARSER_PTS_NB];
+
+    /**
+     * Byte position of currently parsed frame in stream.
+     */
+    int64_t pos;
+
+    /**
+     * Previous frame byte position.
+     */
+    int64_t last_pos;
+} AVCodecParserContext;
+
+typedef struct AVCodecParser {
+    int codec_ids[5]; /* several codec IDs are permitted */
+    int priv_data_size;
+    int (*parser_init)(AVCodecParserContext *s);
+    int (*parser_parse)(AVCodecParserContext *s,
+                        AVCodecContext *avctx,
+                        const uint8_t **poutbuf, int *poutbuf_size,
+                        const uint8_t *buf, int buf_size);
+    void (*parser_close)(AVCodecParserContext *s);
+    int (*split)(AVCodecContext *avctx, const uint8_t *buf, int buf_size);
+    struct AVCodecParser *next;
+} AVCodecParser;
+
+AVCodecParser *av_parser_next(AVCodecParser *c);
+
+void av_register_codec_parser(AVCodecParser *parser);
+AVCodecParserContext *av_parser_init(int codec_id);
+
+/**
+ * Parse a packet.
+ *
+ * @param s             parser context.
+ * @param avctx         codec context.
+ * @param poutbuf       set to pointer to parsed buffer or NULL if not yet finished.
+ * @param poutbuf_size  set to size of parsed buffer or zero if not yet finished.
+ * @param buf           input buffer.
+ * @param buf_size      input length, to signal EOF, this should be 0 (so that the last frame can be output).
+ * @param pts           input presentation timestamp.
+ * @param dts           input decoding timestamp.
+ * @param pos           input byte position in stream.
+ * @return the number of bytes of the input bitstream used.
+ *
+ * Example:
+ * @code
+ *   while(in_len){
+ *       len = av_parser_parse2(myparser, AVCodecContext, &data, &size,
+ *                                        in_data, in_len,
+ *                                        pts, dts, pos);
+ *       in_data += len;
+ *       in_len  -= len;
+ *
+ *       if(size)
+ *          decode_frame(data, size);
+ *   }
+ * @endcode
+ */
+int av_parser_parse2(AVCodecParserContext *s,
+                     AVCodecContext *avctx,
+                     uint8_t **poutbuf, int *poutbuf_size,
+                     const uint8_t *buf, int buf_size,
+                     int64_t pts, int64_t dts,
+                     int64_t pos);
+
+int av_parser_change(AVCodecParserContext *s,
+                     AVCodecContext *avctx,
+                     uint8_t **poutbuf, int *poutbuf_size,
+                     const uint8_t *buf, int buf_size, int keyframe);
+void av_parser_close(AVCodecParserContext *s);
+
+
+typedef struct AVBitStreamFilterContext {
+    void *priv_data;
+    struct AVBitStreamFilter *filter;
+    AVCodecParserContext *parser;
+    struct AVBitStreamFilterContext *next;
+} AVBitStreamFilterContext;
+
+
+typedef struct AVBitStreamFilter {
+    const char *name;
+    int priv_data_size;
+    int (*filter)(AVBitStreamFilterContext *bsfc,
+                  AVCodecContext *avctx, const char *args,
+                  uint8_t **poutbuf, int *poutbuf_size,
+                  const uint8_t *buf, int buf_size, int keyframe);
+    void (*close)(AVBitStreamFilterContext *bsfc);
+    struct AVBitStreamFilter *next;
+} AVBitStreamFilter;
+
+void av_register_bitstream_filter(AVBitStreamFilter *bsf);
+AVBitStreamFilterContext *av_bitstream_filter_init(const char *name);
+int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc,
+                               AVCodecContext *avctx, const char *args,
+                               uint8_t **poutbuf, int *poutbuf_size,
+                               const uint8_t *buf, int buf_size, int keyframe);
+void av_bitstream_filter_close(AVBitStreamFilterContext *bsf);
+
+AVBitStreamFilter *av_bitstream_filter_next(AVBitStreamFilter *f);
+
+/* memory */
+
+/**
+ * Reallocate the given block if it is not large enough, otherwise do nothing.
+ *
+ * @see av_realloc
+ */
+void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size);
+
+/**
+ * Allocate a buffer, reusing the given one if large enough.
+ *
+ * Contrary to av_fast_realloc the current buffer contents might not be
+ * preserved and on error the old buffer is freed, thus no special
+ * handling to avoid memleaks is necessary.
+ *
+ * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer
+ * @param size size of the buffer *ptr points to
+ * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and
+ *                 *size 0 if an error occurred.
+ */
+void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size);
+
+/**
+ * Copy image src to dst. Wraps av_picture_data_copy() above.
+ */
+void av_picture_copy(AVPicture *dst, const AVPicture *src,
+                     enum PixelFormat pix_fmt, int width, int height);
+
+/**
+ * Crop image top and left side.
+ */
+int av_picture_crop(AVPicture *dst, const AVPicture *src,
+                    enum PixelFormat pix_fmt, int top_band, int left_band);
+
+/**
+ * Pad image.
+ */
+int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, enum PixelFormat pix_fmt,
+            int padtop, int padbottom, int padleft, int padright, int *color);
+
+/**
+ * Encode extradata length to a buffer. Used by xiph codecs.
+ *
+ * @param s buffer to write to; must be at least (v/255+1) bytes long
+ * @param v size of extradata in bytes
+ * @return number of bytes written to the buffer.
+ */
+unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
+
+/**
+ * Log a generic warning message about a missing feature. This function is
+ * intended to be used internally by Libav (libavcodec, libavformat, etc.)
+ * only, and would normally not be used by applications.
+ * @param[in] avc a pointer to an arbitrary struct of which the first field is
+ * a pointer to an AVClass struct
+ * @param[in] feature string containing the name of the missing feature
+ * @param[in] want_sample indicates if samples are wanted which exhibit this feature.
+ * If want_sample is non-zero, additional verbage will be added to the log
+ * message which tells the user how to report samples to the development
+ * mailing list.
+ */
+void av_log_missing_feature(void *avc, const char *feature, int want_sample);
+
+/**
+ * Log a generic warning message asking for a sample. This function is
+ * intended to be used internally by Libav (libavcodec, libavformat, etc.)
+ * only, and would normally not be used by applications.
+ * @param[in] avc a pointer to an arbitrary struct of which the first field is
+ * a pointer to an AVClass struct
+ * @param[in] msg string containing an optional message, or NULL if no message
+ */
+void av_log_ask_for_sample(void *avc, const char *msg, ...) av_printf_format(2, 3);
+
+/**
+ * Register the hardware accelerator hwaccel.
+ */
+void av_register_hwaccel(AVHWAccel *hwaccel);
+
+/**
+ * If hwaccel is NULL, returns the first registered hardware accelerator,
+ * if hwaccel is non-NULL, returns the next registered hardware accelerator
+ * after hwaccel, or NULL if hwaccel is the last one.
+ */
+AVHWAccel *av_hwaccel_next(AVHWAccel *hwaccel);
+
+
+/**
+ * Lock operation used by lockmgr
+ */
+enum AVLockOp {
+  AV_LOCK_CREATE,  ///< Create a mutex
+  AV_LOCK_OBTAIN,  ///< Lock the mutex
+  AV_LOCK_RELEASE, ///< Unlock the mutex
+  AV_LOCK_DESTROY, ///< Free mutex resources
+};
+
+/**
+ * Register a user provided lock manager supporting the operations
+ * specified by AVLockOp. mutex points to a (void *) where the
+ * lockmgr should store/get a pointer to a user allocated mutex. It's
+ * NULL upon AV_LOCK_CREATE and != NULL for all other ops.
+ *
+ * @param cb User defined callback. Note: Libav may invoke calls to this
+ *           callback during the call to av_lockmgr_register().
+ *           Thus, the application must be prepared to handle that.
+ *           If cb is set to NULL the lockmgr will be unregistered.
+ *           Also note that during unregistration the previously registered
+ *           lockmgr callback may also be invoked.
+ */
+int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op));
+
+/**
+ * Get the type of the given codec.
+ */
+enum AVMediaType avcodec_get_type(enum CodecID codec_id);
+
+/**
+ * Get the AVClass for AVCodecContext. It can be used in combination with
+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
+ *
+ * @see av_opt_find().
+ */
+const AVClass *avcodec_get_class(void);
+
+/**
+ * @return a positive value if s is open (i.e. avcodec_open2() was called on it
+ * with no corresponding avcodec_close()), 0 otherwise.
+ */
+int avcodec_is_open(AVCodecContext *s);
+
+#endif /* AVCODEC_AVCODEC_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavcodec/avfft.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavcodec/avfft.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavcodec/avfft.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavcodec/avfft.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,99 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_AVFFT_H
+#define AVCODEC_AVFFT_H
+
+typedef float FFTSample;
+
+typedef struct FFTComplex {
+    FFTSample re, im;
+} FFTComplex;
+
+typedef struct FFTContext FFTContext;
+
+/**
+ * Set up a complex FFT.
+ * @param nbits           log2 of the length of the input array
+ * @param inverse         if 0 perform the forward transform, if 1 perform the inverse
+ */
+FFTContext *av_fft_init(int nbits, int inverse);
+
+/**
+ * Do the permutation needed BEFORE calling ff_fft_calc().
+ */
+void av_fft_permute(FFTContext *s, FFTComplex *z);
+
+/**
+ * Do a complex FFT with the parameters defined in av_fft_init(). The
+ * input data must be permuted before. No 1.0/sqrt(n) normalization is done.
+ */
+void av_fft_calc(FFTContext *s, FFTComplex *z);
+
+void av_fft_end(FFTContext *s);
+
+FFTContext *av_mdct_init(int nbits, int inverse, double scale);
+void av_imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input);
+void av_imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input);
+void av_mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input);
+void av_mdct_end(FFTContext *s);
+
+/* Real Discrete Fourier Transform */
+
+enum RDFTransformType {
+    DFT_R2C,
+    IDFT_C2R,
+    IDFT_R2C,
+    DFT_C2R,
+};
+
+typedef struct RDFTContext RDFTContext;
+
+/**
+ * Set up a real FFT.
+ * @param nbits           log2 of the length of the input array
+ * @param trans           the type of transform
+ */
+RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans);
+void av_rdft_calc(RDFTContext *s, FFTSample *data);
+void av_rdft_end(RDFTContext *s);
+
+/* Discrete Cosine Transform */
+
+typedef struct DCTContext DCTContext;
+
+enum DCTTransformType {
+    DCT_II = 0,
+    DCT_III,
+    DCT_I,
+    DST_I,
+};
+
+/**
+ * Set up DCT.
+ * @param nbits           size of the input array:
+ *                        (1 << nbits)     for DCT-II, DCT-III and DST-I
+ *                        (1 << nbits) + 1 for DCT-I
+ *
+ * @note the first element of the input of DST-I is ignored
+ */
+DCTContext *av_dct_init(int nbits, enum DCTTransformType type);
+void av_dct_calc(DCTContext *s, FFTSample *data);
+void av_dct_end (DCTContext *s);
+
+#endif /* AVCODEC_AVFFT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavcodec/dxva2.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavcodec/dxva2.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavcodec/dxva2.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavcodec/dxva2.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,71 @@
+/*
+ * DXVA2 HW acceleration
+ *
+ * copyright (c) 2009 Laurent Aimar
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_DXVA_H
+#define AVCODEC_DXVA_H
+
+#include <stdint.h>
+
+#include <d3d9.h>
+#include <dxva2api.h>
+
+#define FF_DXVA2_WORKAROUND_SCALING_LIST_ZIGZAG 1 ///< Work around for DXVA2 and old UVD/UVD+ ATI video cards
+
+/**
+ * This structure is used to provides the necessary configurations and data
+ * to the DXVA2 Libav HWAccel implementation.
+ *
+ * The application must make it available as AVCodecContext.hwaccel_context.
+ */
+struct dxva_context {
+    /**
+     * DXVA2 decoder object
+     */
+    IDirectXVideoDecoder *decoder;
+
+    /**
+     * DXVA2 configuration used to create the decoder
+     */
+    const DXVA2_ConfigPictureDecode *cfg;
+
+    /**
+     * The number of surface in the surface array
+     */
+    unsigned surface_count;
+
+    /**
+     * The array of Direct3D surfaces used to create the decoder
+     */
+    LPDIRECT3DSURFACE9 *surface;
+
+    /**
+     * A bit field configuring the workarounds needed for using the decoder
+     */
+    uint64_t workaround;
+
+    /**
+     * Private to the Libav AVHWAccel implementation
+     */
+    unsigned report_id;
+};
+
+#endif /* AVCODEC_DXVA_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavcodec/old_codec_ids.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavcodec/old_codec_ids.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavcodec/old_codec_ids.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavcodec/old_codec_ids.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,398 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_OLD_CODEC_IDS_H
+#define AVCODEC_OLD_CODEC_IDS_H
+
+#include "libavutil/common.h"
+
+/*
+ * This header exists to prevent new codec IDs from being accidentally added to
+ * the deprecated list.
+ * Do not include it directly. It will be removed on next major bump
+ *
+ * Do not add new items to this list. Use the AVCodecID enum instead.
+ */
+
+    CODEC_ID_NONE = AV_CODEC_ID_NONE,
+
+    /* video codecs */
+    CODEC_ID_MPEG1VIDEO,
+    CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
+    CODEC_ID_MPEG2VIDEO_XVMC,
+    CODEC_ID_H261,
+    CODEC_ID_H263,
+    CODEC_ID_RV10,
+    CODEC_ID_RV20,
+    CODEC_ID_MJPEG,
+    CODEC_ID_MJPEGB,
+    CODEC_ID_LJPEG,
+    CODEC_ID_SP5X,
+    CODEC_ID_JPEGLS,
+    CODEC_ID_MPEG4,
+    CODEC_ID_RAWVIDEO,
+    CODEC_ID_MSMPEG4V1,
+    CODEC_ID_MSMPEG4V2,
+    CODEC_ID_MSMPEG4V3,
+    CODEC_ID_WMV1,
+    CODEC_ID_WMV2,
+    CODEC_ID_H263P,
+    CODEC_ID_H263I,
+    CODEC_ID_FLV1,
+    CODEC_ID_SVQ1,
+    CODEC_ID_SVQ3,
+    CODEC_ID_DVVIDEO,
+    CODEC_ID_HUFFYUV,
+    CODEC_ID_CYUV,
+    CODEC_ID_H264,
+    CODEC_ID_INDEO3,
+    CODEC_ID_VP3,
+    CODEC_ID_THEORA,
+    CODEC_ID_ASV1,
+    CODEC_ID_ASV2,
+    CODEC_ID_FFV1,
+    CODEC_ID_4XM,
+    CODEC_ID_VCR1,
+    CODEC_ID_CLJR,
+    CODEC_ID_MDEC,
+    CODEC_ID_ROQ,
+    CODEC_ID_INTERPLAY_VIDEO,
+    CODEC_ID_XAN_WC3,
+    CODEC_ID_XAN_WC4,
+    CODEC_ID_RPZA,
+    CODEC_ID_CINEPAK,
+    CODEC_ID_WS_VQA,
+    CODEC_ID_MSRLE,
+    CODEC_ID_MSVIDEO1,
+    CODEC_ID_IDCIN,
+    CODEC_ID_8BPS,
+    CODEC_ID_SMC,
+    CODEC_ID_FLIC,
+    CODEC_ID_TRUEMOTION1,
+    CODEC_ID_VMDVIDEO,
+    CODEC_ID_MSZH,
+    CODEC_ID_ZLIB,
+    CODEC_ID_QTRLE,
+    CODEC_ID_SNOW,
+    CODEC_ID_TSCC,
+    CODEC_ID_ULTI,
+    CODEC_ID_QDRAW,
+    CODEC_ID_VIXL,
+    CODEC_ID_QPEG,
+    CODEC_ID_PNG,
+    CODEC_ID_PPM,
+    CODEC_ID_PBM,
+    CODEC_ID_PGM,
+    CODEC_ID_PGMYUV,
+    CODEC_ID_PAM,
+    CODEC_ID_FFVHUFF,
+    CODEC_ID_RV30,
+    CODEC_ID_RV40,
+    CODEC_ID_VC1,
+    CODEC_ID_WMV3,
+    CODEC_ID_LOCO,
+    CODEC_ID_WNV1,
+    CODEC_ID_AASC,
+    CODEC_ID_INDEO2,
+    CODEC_ID_FRAPS,
+    CODEC_ID_TRUEMOTION2,
+    CODEC_ID_BMP,
+    CODEC_ID_CSCD,
+    CODEC_ID_MMVIDEO,
+    CODEC_ID_ZMBV,
+    CODEC_ID_AVS,
+    CODEC_ID_SMACKVIDEO,
+    CODEC_ID_NUV,
+    CODEC_ID_KMVC,
+    CODEC_ID_FLASHSV,
+    CODEC_ID_CAVS,
+    CODEC_ID_JPEG2000,
+    CODEC_ID_VMNC,
+    CODEC_ID_VP5,
+    CODEC_ID_VP6,
+    CODEC_ID_VP6F,
+    CODEC_ID_TARGA,
+    CODEC_ID_DSICINVIDEO,
+    CODEC_ID_TIERTEXSEQVIDEO,
+    CODEC_ID_TIFF,
+    CODEC_ID_GIF,
+    CODEC_ID_DXA,
+    CODEC_ID_DNXHD,
+    CODEC_ID_THP,
+    CODEC_ID_SGI,
+    CODEC_ID_C93,
+    CODEC_ID_BETHSOFTVID,
+    CODEC_ID_PTX,
+    CODEC_ID_TXD,
+    CODEC_ID_VP6A,
+    CODEC_ID_AMV,
+    CODEC_ID_VB,
+    CODEC_ID_PCX,
+    CODEC_ID_SUNRAST,
+    CODEC_ID_INDEO4,
+    CODEC_ID_INDEO5,
+    CODEC_ID_MIMIC,
+    CODEC_ID_RL2,
+    CODEC_ID_ESCAPE124,
+    CODEC_ID_DIRAC,
+    CODEC_ID_BFI,
+    CODEC_ID_CMV,
+    CODEC_ID_MOTIONPIXELS,
+    CODEC_ID_TGV,
+    CODEC_ID_TGQ,
+    CODEC_ID_TQI,
+    CODEC_ID_AURA,
+    CODEC_ID_AURA2,
+    CODEC_ID_V210X,
+    CODEC_ID_TMV,
+    CODEC_ID_V210,
+    CODEC_ID_DPX,
+    CODEC_ID_MAD,
+    CODEC_ID_FRWU,
+    CODEC_ID_FLASHSV2,
+    CODEC_ID_CDGRAPHICS,
+    CODEC_ID_R210,
+    CODEC_ID_ANM,
+    CODEC_ID_BINKVIDEO,
+    CODEC_ID_IFF_ILBM,
+    CODEC_ID_IFF_BYTERUN1,
+    CODEC_ID_KGV1,
+    CODEC_ID_YOP,
+    CODEC_ID_VP8,
+    CODEC_ID_PICTOR,
+    CODEC_ID_ANSI,
+    CODEC_ID_A64_MULTI,
+    CODEC_ID_A64_MULTI5,
+    CODEC_ID_R10K,
+    CODEC_ID_MXPEG,
+    CODEC_ID_LAGARITH,
+    CODEC_ID_PRORES,
+    CODEC_ID_JV,
+    CODEC_ID_DFA,
+    CODEC_ID_WMV3IMAGE,
+    CODEC_ID_VC1IMAGE,
+    CODEC_ID_UTVIDEO,
+    CODEC_ID_BMV_VIDEO,
+    CODEC_ID_VBLE,
+    CODEC_ID_DXTORY,
+    CODEC_ID_V410,
+    CODEC_ID_XWD,
+    CODEC_ID_CDXL,
+    CODEC_ID_XBM,
+    CODEC_ID_ZEROCODEC,
+    CODEC_ID_MSS1,
+    CODEC_ID_MSA1,
+    CODEC_ID_TSCC2,
+    CODEC_ID_MTS2,
+    CODEC_ID_CLLC,
+    CODEC_ID_Y41P       = MKBETAG('Y','4','1','P'),
+    CODEC_ID_ESCAPE130  = MKBETAG('E','1','3','0'),
+    CODEC_ID_EXR        = MKBETAG('0','E','X','R'),
+    CODEC_ID_AVRP       = MKBETAG('A','V','R','P'),
+
+    CODEC_ID_G2M        = MKBETAG( 0 ,'G','2','M'),
+    CODEC_ID_AVUI       = MKBETAG('A','V','U','I'),
+    CODEC_ID_AYUV       = MKBETAG('A','Y','U','V'),
+    CODEC_ID_V308       = MKBETAG('V','3','0','8'),
+    CODEC_ID_V408       = MKBETAG('V','4','0','8'),
+    CODEC_ID_YUV4       = MKBETAG('Y','U','V','4'),
+    CODEC_ID_SANM       = MKBETAG('S','A','N','M'),
+    CODEC_ID_PAF_VIDEO  = MKBETAG('P','A','F','V'),
+
+    /* various PCM "codecs" */
+    CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs
+    CODEC_ID_PCM_S16LE = 0x10000,
+    CODEC_ID_PCM_S16BE,
+    CODEC_ID_PCM_U16LE,
+    CODEC_ID_PCM_U16BE,
+    CODEC_ID_PCM_S8,
+    CODEC_ID_PCM_U8,
+    CODEC_ID_PCM_MULAW,
+    CODEC_ID_PCM_ALAW,
+    CODEC_ID_PCM_S32LE,
+    CODEC_ID_PCM_S32BE,
+    CODEC_ID_PCM_U32LE,
+    CODEC_ID_PCM_U32BE,
+    CODEC_ID_PCM_S24LE,
+    CODEC_ID_PCM_S24BE,
+    CODEC_ID_PCM_U24LE,
+    CODEC_ID_PCM_U24BE,
+    CODEC_ID_PCM_S24DAUD,
+    CODEC_ID_PCM_ZORK,
+    CODEC_ID_PCM_S16LE_PLANAR,
+    CODEC_ID_PCM_DVD,
+    CODEC_ID_PCM_F32BE,
+    CODEC_ID_PCM_F32LE,
+    CODEC_ID_PCM_F64BE,
+    CODEC_ID_PCM_F64LE,
+    CODEC_ID_PCM_BLURAY,
+    CODEC_ID_PCM_LXF,
+    CODEC_ID_S302M,
+    CODEC_ID_PCM_S8_PLANAR,
+
+    /* various ADPCM codecs */
+    CODEC_ID_ADPCM_IMA_QT = 0x11000,
+    CODEC_ID_ADPCM_IMA_WAV,
+    CODEC_ID_ADPCM_IMA_DK3,
+    CODEC_ID_ADPCM_IMA_DK4,
+    CODEC_ID_ADPCM_IMA_WS,
+    CODEC_ID_ADPCM_IMA_SMJPEG,
+    CODEC_ID_ADPCM_MS,
+    CODEC_ID_ADPCM_4XM,
+    CODEC_ID_ADPCM_XA,
+    CODEC_ID_ADPCM_ADX,
+    CODEC_ID_ADPCM_EA,
+    CODEC_ID_ADPCM_G726,
+    CODEC_ID_ADPCM_CT,
+    CODEC_ID_ADPCM_SWF,
+    CODEC_ID_ADPCM_YAMAHA,
+    CODEC_ID_ADPCM_SBPRO_4,
+    CODEC_ID_ADPCM_SBPRO_3,
+    CODEC_ID_ADPCM_SBPRO_2,
+    CODEC_ID_ADPCM_THP,
+    CODEC_ID_ADPCM_IMA_AMV,
+    CODEC_ID_ADPCM_EA_R1,
+    CODEC_ID_ADPCM_EA_R3,
+    CODEC_ID_ADPCM_EA_R2,
+    CODEC_ID_ADPCM_IMA_EA_SEAD,
+    CODEC_ID_ADPCM_IMA_EA_EACS,
+    CODEC_ID_ADPCM_EA_XAS,
+    CODEC_ID_ADPCM_EA_MAXIS_XA,
+    CODEC_ID_ADPCM_IMA_ISS,
+    CODEC_ID_ADPCM_G722,
+    CODEC_ID_ADPCM_IMA_APC,
+    CODEC_ID_VIMA       = MKBETAG('V','I','M','A'),
+
+    /* AMR */
+    CODEC_ID_AMR_NB = 0x12000,
+    CODEC_ID_AMR_WB,
+
+    /* RealAudio codecs*/
+    CODEC_ID_RA_144 = 0x13000,
+    CODEC_ID_RA_288,
+
+    /* various DPCM codecs */
+    CODEC_ID_ROQ_DPCM = 0x14000,
+    CODEC_ID_INTERPLAY_DPCM,
+    CODEC_ID_XAN_DPCM,
+    CODEC_ID_SOL_DPCM,
+
+    /* audio codecs */
+    CODEC_ID_MP2 = 0x15000,
+    CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
+    CODEC_ID_AAC,
+    CODEC_ID_AC3,
+    CODEC_ID_DTS,
+    CODEC_ID_VORBIS,
+    CODEC_ID_DVAUDIO,
+    CODEC_ID_WMAV1,
+    CODEC_ID_WMAV2,
+    CODEC_ID_MACE3,
+    CODEC_ID_MACE6,
+    CODEC_ID_VMDAUDIO,
+    CODEC_ID_FLAC,
+    CODEC_ID_MP3ADU,
+    CODEC_ID_MP3ON4,
+    CODEC_ID_SHORTEN,
+    CODEC_ID_ALAC,
+    CODEC_ID_WESTWOOD_SND1,
+    CODEC_ID_GSM, ///< as in Berlin toast format
+    CODEC_ID_QDM2,
+    CODEC_ID_COOK,
+    CODEC_ID_TRUESPEECH,
+    CODEC_ID_TTA,
+    CODEC_ID_SMACKAUDIO,
+    CODEC_ID_QCELP,
+    CODEC_ID_WAVPACK,
+    CODEC_ID_DSICINAUDIO,
+    CODEC_ID_IMC,
+    CODEC_ID_MUSEPACK7,
+    CODEC_ID_MLP,
+    CODEC_ID_GSM_MS, /* as found in WAV */
+    CODEC_ID_ATRAC3,
+    CODEC_ID_VOXWARE,
+    CODEC_ID_APE,
+    CODEC_ID_NELLYMOSER,
+    CODEC_ID_MUSEPACK8,
+    CODEC_ID_SPEEX,
+    CODEC_ID_WMAVOICE,
+    CODEC_ID_WMAPRO,
+    CODEC_ID_WMALOSSLESS,
+    CODEC_ID_ATRAC3P,
+    CODEC_ID_EAC3,
+    CODEC_ID_SIPR,
+    CODEC_ID_MP1,
+    CODEC_ID_TWINVQ,
+    CODEC_ID_TRUEHD,
+    CODEC_ID_MP4ALS,
+    CODEC_ID_ATRAC1,
+    CODEC_ID_BINKAUDIO_RDFT,
+    CODEC_ID_BINKAUDIO_DCT,
+    CODEC_ID_AAC_LATM,
+    CODEC_ID_QDMC,
+    CODEC_ID_CELT,
+    CODEC_ID_G723_1,
+    CODEC_ID_G729,
+    CODEC_ID_8SVX_EXP,
+    CODEC_ID_8SVX_FIB,
+    CODEC_ID_BMV_AUDIO,
+    CODEC_ID_RALF,
+    CODEC_ID_IAC,
+    CODEC_ID_ILBC,
+    CODEC_ID_FFWAVESYNTH = MKBETAG('F','F','W','S'),
+    CODEC_ID_8SVX_RAW    = MKBETAG('8','S','V','X'),
+    CODEC_ID_SONIC       = MKBETAG('S','O','N','C'),
+    CODEC_ID_SONIC_LS    = MKBETAG('S','O','N','L'),
+    CODEC_ID_PAF_AUDIO   = MKBETAG('P','A','F','A'),
+    CODEC_ID_OPUS        = MKBETAG('O','P','U','S'),
+
+    /* subtitle codecs */
+    CODEC_ID_FIRST_SUBTITLE = 0x17000,          ///< A dummy ID pointing at the start of subtitle codecs.
+    CODEC_ID_DVD_SUBTITLE = 0x17000,
+    CODEC_ID_DVB_SUBTITLE,
+    CODEC_ID_TEXT,  ///< raw UTF-8 text
+    CODEC_ID_XSUB,
+    CODEC_ID_SSA,
+    CODEC_ID_MOV_TEXT,
+    CODEC_ID_HDMV_PGS_SUBTITLE,
+    CODEC_ID_DVB_TELETEXT,
+    CODEC_ID_SRT,
+    CODEC_ID_MICRODVD   = MKBETAG('m','D','V','D'),
+    CODEC_ID_EIA_608    = MKBETAG('c','6','0','8'),
+    CODEC_ID_JACOSUB    = MKBETAG('J','S','U','B'),
+    CODEC_ID_SAMI       = MKBETAG('S','A','M','I'),
+    CODEC_ID_REALTEXT   = MKBETAG('R','T','X','T'),
+    CODEC_ID_SUBVIEWER  = MKBETAG('S','u','b','V'),
+
+    /* other specific kind of codecs (generally used for attachments) */
+    CODEC_ID_FIRST_UNKNOWN = 0x18000,           ///< A dummy ID pointing at the start of various fake codecs.
+    CODEC_ID_TTF = 0x18000,
+    CODEC_ID_BINTEXT    = MKBETAG('B','T','X','T'),
+    CODEC_ID_XBIN       = MKBETAG('X','B','I','N'),
+    CODEC_ID_IDF        = MKBETAG( 0 ,'I','D','F'),
+    CODEC_ID_OTF        = MKBETAG( 0 ,'O','T','F'),
+
+    CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it
+
+    CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
+                                * stream (only used by libavformat) */
+    CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
+                                * stream (only used by libavformat) */
+    CODEC_ID_FFMETADATA = 0x21000,   ///< Dummy codec for streams containing only metadata information.
+
+#endif /* AVCODEC_OLD_CODEC_IDS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavcodec/opt.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavcodec/opt.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavcodec/opt.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavcodec/opt.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * This header is provided for compatibility only and will be removed
+ * on next major bump
+ */
+
+#ifndef AVCODEC_OPT_H
+#define AVCODEC_OPT_H
+
+#include "libavcodec/version.h"
+
+#if FF_API_OPT_H
+#include "libavutil/opt.h"
+#endif
+
+#endif /* AVCODEC_OPT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavcodec/vaapi.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavcodec/vaapi.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavcodec/vaapi.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavcodec/vaapi.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,167 @@
+/*
+ * Video Acceleration API (shared data between Libav and the video player)
+ * HW decode acceleration for MPEG-2, MPEG-4, H.264 and VC-1
+ *
+ * Copyright (C) 2008-2009 Splitted-Desktop Systems
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VAAPI_H
+#define AVCODEC_VAAPI_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup VAAPI_Decoding VA API Decoding
+ * @ingroup Decoder
+ * @{
+ */
+
+/**
+ * This structure is used to share data between the Libav library and
+ * the client video application.
+ * This shall be zero-allocated and available as
+ * AVCodecContext.hwaccel_context. All user members can be set once
+ * during initialization or through each AVCodecContext.get_buffer()
+ * function call. In any case, they must be valid prior to calling
+ * decoding functions.
+ */
+struct vaapi_context {
+    /**
+     * Window system dependent data
+     *
+     * - encoding: unused
+     * - decoding: Set by user
+     */
+    void *display;
+
+    /**
+     * Configuration ID
+     *
+     * - encoding: unused
+     * - decoding: Set by user
+     */
+    uint32_t config_id;
+
+    /**
+     * Context ID (video decode pipeline)
+     *
+     * - encoding: unused
+     * - decoding: Set by user
+     */
+    uint32_t context_id;
+
+    /**
+     * VAPictureParameterBuffer ID
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    uint32_t pic_param_buf_id;
+
+    /**
+     * VAIQMatrixBuffer ID
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    uint32_t iq_matrix_buf_id;
+
+    /**
+     * VABitPlaneBuffer ID (for VC-1 decoding)
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    uint32_t bitplane_buf_id;
+
+    /**
+     * Slice parameter/data buffer IDs
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    uint32_t *slice_buf_ids;
+
+    /**
+     * Number of effective slice buffer IDs to send to the HW
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    unsigned int n_slice_buf_ids;
+
+    /**
+     * Size of pre-allocated slice_buf_ids
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    unsigned int slice_buf_ids_alloc;
+
+    /**
+     * Pointer to VASliceParameterBuffers
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    void *slice_params;
+
+    /**
+     * Size of a VASliceParameterBuffer element
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    unsigned int slice_param_size;
+
+    /**
+     * Size of pre-allocated slice_params
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    unsigned int slice_params_alloc;
+
+    /**
+     * Number of slices currently filled in
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    unsigned int slice_count;
+
+    /**
+     * Pointer to slice data buffer base
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    const uint8_t *slice_data;
+
+    /**
+     * Current size of slice data
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    uint32_t slice_data_size;
+};
+
+/* @} */
+
+#endif /* AVCODEC_VAAPI_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavcodec/vda.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavcodec/vda.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavcodec/vda.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavcodec/vda.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,144 @@
+/*
+ * VDA HW acceleration
+ *
+ * copyright (c) 2011 Sebastien Zwickert
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VDA_H
+#define AVCODEC_VDA_H
+
+#include <pthread.h>
+#include <stdint.h>
+
+// emmintrin.h is unable to compile with -std=c99 -Werror=missing-prototypes
+// http://openradar.appspot.com/8026390
+#undef __GNUC_STDC_INLINE__
+
+#define Picture QuickdrawPicture
+#include <VideoDecodeAcceleration/VDADecoder.h>
+#undef Picture
+
+/**
+ *  This structure is used to store a decoded frame information and data.
+ */
+typedef struct vda_frame {
+    /**
+    * The PTS of the frame.
+    *
+    * - encoding: unused
+    * - decoding: Set/Unset by libavcodec.
+    */
+    int64_t             pts;
+
+    /**
+    * The CoreVideo buffer that contains the decoded data.
+    *
+    * - encoding: unused
+    * - decoding: Set/Unset by libavcodec.
+    */
+    CVPixelBufferRef    cv_buffer;
+
+    /**
+    * A pointer to the next frame.
+    *
+    * - encoding: unused
+    * - decoding: Set/Unset by libavcodec.
+    */
+    struct vda_frame    *next_frame;
+} vda_frame;
+
+/**
+ * This structure is used to provide the necessary configurations and data
+ * to the VDA Libav HWAccel implementation.
+ *
+ * The application must make it available as AVCodecContext.hwaccel_context.
+ */
+struct vda_context {
+    /**
+    * VDA decoder object.
+    *
+    * - encoding: unused
+    * - decoding: Set/Unset by libavcodec.
+    */
+    VDADecoder          decoder;
+
+    /**
+    * VDA frames queue ordered by presentation timestamp.
+    *
+    * - encoding: unused
+    * - decoding: Set/Unset by libavcodec.
+    */
+    vda_frame           *queue;
+
+    /**
+    * Mutex for locking queue operations.
+    *
+    * - encoding: unused
+    * - decoding: Set/Unset by libavcodec.
+    */
+    pthread_mutex_t     queue_mutex;
+
+    /**
+    * The frame width.
+    *
+    * - encoding: unused
+    * - decoding: Set/Unset by user.
+    */
+    int                 width;
+
+    /**
+    * The frame height.
+    *
+    * - encoding: unused
+    * - decoding: Set/Unset by user.
+    */
+    int                 height;
+
+    /**
+    * The frame format.
+    *
+    * - encoding: unused
+    * - decoding: Set/Unset by user.
+    */
+    int                 format;
+
+    /**
+    * The pixel format for output image buffers.
+    *
+    * - encoding: unused
+    * - decoding: Set/Unset by user.
+    */
+    OSType              cv_pix_fmt_type;
+};
+
+/** Create the video decoder. */
+int ff_vda_create_decoder(struct vda_context *vda_ctx,
+                          uint8_t *extradata,
+                          int extradata_size);
+
+/** Destroy the video decoder. */
+int ff_vda_destroy_decoder(struct vda_context *vda_ctx);
+
+/** Return the top frame of the queue. */
+vda_frame *ff_vda_queue_pop(struct vda_context *vda_ctx);
+
+/** Release the given frame. */
+void ff_vda_release_vda_frame(vda_frame *frame);
+
+#endif /* AVCODEC_VDA_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavcodec/vdpau.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavcodec/vdpau.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavcodec/vdpau.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavcodec/vdpau.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,88 @@
+/*
+ * The Video Decode and Presentation API for UNIX (VDPAU) is used for
+ * hardware-accelerated decoding of MPEG-1/2, H.264 and VC-1.
+ *
+ * Copyright (C) 2008 NVIDIA
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VDPAU_H
+#define AVCODEC_VDPAU_H
+
+/**
+ * @defgroup Decoder VDPAU Decoder and Renderer
+ *
+ * VDPAU hardware acceleration has two modules
+ * - VDPAU decoding
+ * - VDPAU presentation
+ *
+ * The VDPAU decoding module parses all headers using Libav
+ * parsing mechanisms and uses VDPAU for the actual decoding.
+ *
+ * As per the current implementation, the actual decoding
+ * and rendering (API calls) are done as part of the VDPAU
+ * presentation (vo_vdpau.c) module.
+ *
+ * @defgroup  VDPAU_Decoding VDPAU Decoding
+ * @ingroup Decoder
+ * @{
+ */
+
+#include <vdpau/vdpau.h>
+#include <vdpau/vdpau_x11.h>
+
+/** @brief The videoSurface is used for rendering. */
+#define FF_VDPAU_STATE_USED_FOR_RENDER 1
+
+/**
+ * @brief The videoSurface is needed for reference/prediction.
+ * The codec manipulates this.
+ */
+#define FF_VDPAU_STATE_USED_FOR_REFERENCE 2
+
+/**
+ * @brief This structure is used as a callback between the Libav
+ * decoder (vd_) and presentation (vo_) module.
+ * This is used for defining a video frame containing surface,
+ * picture parameter, bitstream information etc which are passed
+ * between the Libav decoder and its clients.
+ */
+struct vdpau_render_state {
+    VdpVideoSurface surface; ///< Used as rendered surface, never changed.
+
+    int state; ///< Holds FF_VDPAU_STATE_* values.
+
+    /** picture parameter information for all supported codecs */
+    union VdpPictureInfo {
+        VdpPictureInfoH264        h264;
+        VdpPictureInfoMPEG1Or2    mpeg;
+        VdpPictureInfoVC1          vc1;
+        VdpPictureInfoMPEG4Part2 mpeg4;
+    } info;
+
+    /** Describe size/location of the compressed video data.
+        Set to 0 when freeing bitstream_buffers. */
+    int bitstream_buffers_allocated;
+    int bitstream_buffers_used;
+    /** The user is responsible for freeing this buffer using av_freep(). */
+    VdpBitstreamBuffer *bitstream_buffers;
+};
+
+/* @}*/
+
+#endif /* AVCODEC_VDPAU_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavcodec/version.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavcodec/version.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavcodec/version.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavcodec/version.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,126 @@
+/*
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VERSION_H
+#define AVCODEC_VERSION_H
+
+#define LIBAVCODEC_VERSION_MAJOR 53
+#define LIBAVCODEC_VERSION_MINOR 35
+#define LIBAVCODEC_VERSION_MICRO  0
+
+#define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
+                                               LIBAVCODEC_VERSION_MINOR, \
+                                               LIBAVCODEC_VERSION_MICRO)
+#define LIBAVCODEC_VERSION      AV_VERSION(LIBAVCODEC_VERSION_MAJOR,    \
+                                           LIBAVCODEC_VERSION_MINOR,    \
+                                           LIBAVCODEC_VERSION_MICRO)
+#define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
+
+#define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
+
+/**
+ * Those FF_API_* defines are not part of public API.
+ * They may change, break or disappear at any time.
+ */
+#ifndef FF_API_PALETTE_CONTROL
+#define FF_API_PALETTE_CONTROL  (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_OLD_SAMPLE_FMT
+#define FF_API_OLD_SAMPLE_FMT   (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_OLD_AUDIOCONVERT
+#define FF_API_OLD_AUDIOCONVERT (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_ANTIALIAS_ALGO
+#define FF_API_ANTIALIAS_ALGO   (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_REQUEST_CHANNELS
+#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_OPT_H
+#define FF_API_OPT_H            (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_THREAD_INIT
+#define FF_API_THREAD_INIT      (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_OLD_FF_PICT_TYPES
+#define FF_API_OLD_FF_PICT_TYPES (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_FLAC_GLOBAL_OPTS
+#define FF_API_FLAC_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_GET_PIX_FMT_NAME
+#define FF_API_GET_PIX_FMT_NAME (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_ALLOC_CONTEXT
+#define FF_API_ALLOC_CONTEXT    (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_AVCODEC_OPEN
+#define FF_API_AVCODEC_OPEN     (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_DRC_SCALE
+#define FF_API_DRC_SCALE        (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_ER
+#define FF_API_ER               (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_AVCODEC_INIT
+#define FF_API_AVCODEC_INIT     (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_X264_GLOBAL_OPTS
+#define FF_API_X264_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_MPEGVIDEO_GLOBAL_OPTS
+#define FF_API_MPEGVIDEO_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_LAME_GLOBAL_OPTS
+#define FF_API_LAME_GLOBAL_OPTS  (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_SNOW_GLOBAL_OPTS
+#define FF_API_SNOW_GLOBAL_OPTS  (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_MJPEG_GLOBAL_OPTS
+#define FF_API_MJPEG_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_GET_ALPHA_INFO
+#define FF_API_GET_ALPHA_INFO    (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_PARSE_FRAME
+#define FF_API_PARSE_FRAME (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_INTERNAL_CONTEXT
+#define FF_API_INTERNAL_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_TIFFENC_COMPLEVEL
+#define FF_API_TIFFENC_COMPLEVEL (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_DATA_POINTERS
+#define FF_API_DATA_POINTERS (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_OLD_DECODE_AUDIO
+#define FF_API_OLD_DECODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_AVFRAME_AGE
+#define FF_API_AVFRAME_AGE (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_OLD_ENCODE_AUDIO
+#define FF_API_OLD_ENCODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+
+#endif /* AVCODEC_VERSION_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavcodec/xvmc.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavcodec/xvmc.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavcodec/xvmc.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavcodec/xvmc.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,151 @@
+/*
+ * Copyright (C) 2003 Ivan Kalvachev
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_XVMC_H
+#define AVCODEC_XVMC_H
+
+#include <X11/extensions/XvMC.h>
+
+#include "avcodec.h"
+
+#define AV_XVMC_ID                    0x1DC711C0  /**< special value to ensure that regular pixel routines haven't corrupted the struct
+                                                       the number is 1337 speak for the letters IDCT MCo (motion compensation) */
+
+struct xvmc_pix_fmt {
+    /** The field contains the special constant value AV_XVMC_ID.
+        It is used as a test that the application correctly uses the API,
+        and that there is no corruption caused by pixel routines.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             xvmc_id;
+
+    /** Pointer to the block array allocated by XvMCCreateBlocks().
+        The array has to be freed by XvMCDestroyBlocks().
+        Each group of 64 values represents one data block of differential
+        pixel information (in MoCo mode) or coefficients for IDCT.
+        - application - set the pointer during initialization
+        - libavcodec  - fills coefficients/pixel data into the array
+    */
+    short*          data_blocks;
+
+    /** Pointer to the macroblock description array allocated by
+        XvMCCreateMacroBlocks() and freed by XvMCDestroyMacroBlocks().
+        - application - set the pointer during initialization
+        - libavcodec  - fills description data into the array
+    */
+    XvMCMacroBlock* mv_blocks;
+
+    /** Number of macroblock descriptions that can be stored in the mv_blocks
+        array.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             allocated_mv_blocks;
+
+    /** Number of blocks that can be stored at once in the data_blocks array.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             allocated_data_blocks;
+
+    /** Indicate that the hardware would interpret data_blocks as IDCT
+        coefficients and perform IDCT on them.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             idct;
+
+    /** In MoCo mode it indicates that intra macroblocks are assumed to be in
+        unsigned format; same as the XVMC_INTRA_UNSIGNED flag.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             unsigned_intra;
+
+    /** Pointer to the surface allocated by XvMCCreateSurface().
+        It has to be freed by XvMCDestroySurface() on application exit.
+        It identifies the frame and its state on the video hardware.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    XvMCSurface*    p_surface;
+
+/** Set by the decoder before calling ff_draw_horiz_band(),
+    needed by the XvMCRenderSurface function. */
+//@{
+    /** Pointer to the surface used as past reference
+        - application - unchanged
+        - libavcodec  - set
+    */
+    XvMCSurface*    p_past_surface;
+
+    /** Pointer to the surface used as future reference
+        - application - unchanged
+        - libavcodec  - set
+    */
+    XvMCSurface*    p_future_surface;
+
+    /** top/bottom field or frame
+        - application - unchanged
+        - libavcodec  - set
+    */
+    unsigned int    picture_structure;
+
+    /** XVMC_SECOND_FIELD - 1st or 2nd field in the sequence
+        - application - unchanged
+        - libavcodec  - set
+    */
+    unsigned int    flags;
+//}@
+
+    /** Number of macroblock descriptions in the mv_blocks array
+        that have already been passed to the hardware.
+        - application - zeroes it on get_buffer().
+                        A successful ff_draw_horiz_band() may increment it
+                        with filled_mb_block_num or zero both.
+        - libavcodec  - unchanged
+    */
+    int             start_mv_blocks_num;
+
+    /** Number of new macroblock descriptions in the mv_blocks array (after
+        start_mv_blocks_num) that are filled by libavcodec and have to be
+        passed to the hardware.
+        - application - zeroes it on get_buffer() or after successful
+                        ff_draw_horiz_band().
+        - libavcodec  - increment with one of each stored MB
+    */
+    int             filled_mv_blocks_num;
+
+    /** Number of the the next free data block; one data block consists of
+        64 short values in the data_blocks array.
+        All blocks before this one have already been claimed by placing their
+        position into the corresponding block description structure field,
+        that are part of the mv_blocks array.
+        - application - zeroes it on get_buffer().
+                        A successful ff_draw_horiz_band() may zero it together
+                        with start_mb_blocks_num.
+        - libavcodec  - each decoded macroblock increases it by the number
+                        of coded blocks it contains.
+    */
+    int             next_free_data_block_num;
+};
+
+#endif /* AVCODEC_XVMC_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavformat/avformat.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavformat/avformat.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavformat/avformat.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavformat/avformat.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,2026 @@
+/*
+ * copyright (c) 2001 Fabrice Bellard
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFORMAT_AVFORMAT_H
+#define AVFORMAT_AVFORMAT_H
+
+/**
+ * @file
+ * @ingroup libavf
+ * Main libavformat public API header
+ */
+
+/**
+ * @defgroup libavf I/O and Muxing/Demuxing Library
+ * @{
+ *
+ * Libavformat (lavf) is a library for dealing with various media container
+ * formats. Its main two purposes are demuxing - i.e. splitting a media file
+ * into component streams, and the reverse process of muxing - writing supplied
+ * data in a specified container format. It also has an @ref lavf_io
+ * "I/O module" which supports a number of protocols for accessing the data (e.g.
+ * file, tcp, http and others). Before using lavf, you need to call
+ * av_register_all() to register all compiled muxers, demuxers and protocols.
+ * Unless you are absolutely sure you won't use libavformat's network
+ * capabilities, you should also call avformat_network_init().
+ *
+ * A supported input format is described by an AVInputFormat struct, conversely
+ * an output format is described by AVOutputFormat. You can iterate over all
+ * registered input/output formats using the av_iformat_next() /
+ * av_oformat_next() functions. The protocols layer is not part of the public
+ * API, so you can only get the names of supported protocols with the
+ * avio_enum_protocols() function.
+ *
+ * Main lavf structure used for both muxing and demuxing is AVFormatContext,
+ * which exports all information about the file being read or written. As with
+ * most Libav structures, its size is not part of public ABI, so it cannot be
+ * allocated on stack or directly with av_malloc(). To create an
+ * AVFormatContext, use avformat_alloc_context() (some functions, like
+ * avformat_open_input() might do that for you).
+ *
+ * Most importantly an AVFormatContext contains:
+ * @li the @ref AVFormatContext.iformat "input" or @ref AVFormatContext.oformat
+ * "output" format. It is either autodetected or set by user for input;
+ * always set by user for output.
+ * @li an @ref AVFormatContext.streams "array" of AVStreams, which describe all
+ * elementary streams stored in the file. AVStreams are typically referred to
+ * using their index in this array.
+ * @li an @ref AVFormatContext.pb "I/O context". It is either opened by lavf or
+ * set by user for input, always set by user for output (unless you are dealing
+ * with an AVFMT_NOFILE format).
+ *
+ * @defgroup lavf_decoding Demuxing
+ * @{
+ * Demuxers read a media file and split it into chunks of data (@em packets). A
+ * @ref AVPacket "packet" contains one or more frames which belong a single
+ * elementary stream. In lavf API this process is represented by the
+ * avformat_open_input() function for opening a file, av_read_frame() for
+ * reading a single packet and finally avformat_close_input(), which does the
+ * cleanup.
+ *
+ * @section lavf_decoding_open Opening a media file
+ * The minimum information required to open a file is its URL or filename, which
+ * is passed to avformat_open_input(), as in the following code:
+ * @code
+ * const char    *url = "in.mp3";
+ * AVFormatContext *s = NULL;
+ * int ret = avformat_open_input(&s, url, NULL, NULL);
+ * if (ret < 0)
+ *     abort();
+ * @endcode
+ * The above code attempts to allocate an AVFormatContext, open the
+ * specified file (autodetecting the format) and read the header, exporting the
+ * information stored there into s. Some formats do not have a header or do not
+ * store enough information there, so it is recommended that you call the
+ * avformat_find_stream_info() function which tries to read and decode a few
+ * frames to find missing information.
+ *
+ * In some cases you might want to preallocate an AVFormatContext yourself with
+ * avformat_alloc_context() and do some tweaking on it before passing it to
+ * avformat_open_input(). One such case is when you want to use custom functions
+ * for reading input data instead of lavf internal I/O layer.
+ * To do that, create your own AVIOContext with avio_alloc_context(), passing
+ * your reading callbacks to it. Then set the @em pb field of your
+ * AVFormatContext to newly created AVIOContext.
+ *
+ * After you have finished reading the file, you must close it with
+ * avformat_close_input(). It will free everything associated with the file.
+ *
+ * @section lavf_decoding_read Reading from an opened file
+ *
+ * @section lavf_decoding_seek Seeking
+ * @}
+ *
+ * @defgroup lavf_encoding Muxing
+ * @{
+ * @}
+ *
+ * @defgroup lavf_io I/O Read/Write
+ * @{
+ * @}
+ *
+ * @defgroup lavf_codec Demuxers
+ * @{
+ * @defgroup lavf_codec_native Native Demuxers
+ * @{
+ * @}
+ * @defgroup lavf_codec_wrappers External library wrappers
+ * @{
+ * @}
+ * @}
+ * @defgroup lavf_protos I/O Protocols
+ * @{
+ * @}
+ * @defgroup lavf_internal Internal
+ * @{
+ * @}
+ * @}
+ *
+ */
+
+#include <time.h>
+#include <stdio.h>  /* FILE */
+#include "libavcodec/avcodec.h"
+#include "libavutil/dict.h"
+#include "libavutil/log.h"
+
+#include "avio.h"
+#include "libavformat/version.h"
+
+struct AVFormatContext;
+
+
+/**
+ * @defgroup metadata_api Public Metadata API
+ * @{
+ * @ingroup libavf
+ * The metadata API allows libavformat to export metadata tags to a client
+ * application when demuxing. Conversely it allows a client application to
+ * set metadata when muxing.
+ *
+ * Metadata is exported or set as pairs of key/value strings in the 'metadata'
+ * fields of the AVFormatContext, AVStream, AVChapter and AVProgram structs
+ * using the @ref lavu_dict "AVDictionary" API. Like all strings in Libav,
+ * metadata is assumed to be UTF-8 encoded Unicode. Note that metadata
+ * exported by demuxers isn't checked to be valid UTF-8 in most cases.
+ *
+ * Important concepts to keep in mind:
+ * -  Keys are unique; there can never be 2 tags with the same key. This is
+ *    also meant semantically, i.e., a demuxer should not knowingly produce
+ *    several keys that are literally different but semantically identical.
+ *    E.g., key=Author5, key=Author6. In this example, all authors must be
+ *    placed in the same tag.
+ * -  Metadata is flat, not hierarchical; there are no subtags. If you
+ *    want to store, e.g., the email address of the child of producer Alice
+ *    and actor Bob, that could have key=alice_and_bobs_childs_email_address.
+ * -  Several modifiers can be applied to the tag name. This is done by
+ *    appending a dash character ('-') and the modifier name in the order
+ *    they appear in the list below -- e.g. foo-eng-sort, not foo-sort-eng.
+ *    -  language -- a tag whose value is localized for a particular language
+ *       is appended with the ISO 639-2/B 3-letter language code.
+ *       For example: Author-ger=Michael, Author-eng=Mike
+ *       The original/default language is in the unqualified "Author" tag.
+ *       A demuxer should set a default if it sets any translated tag.
+ *    -  sorting  -- a modified version of a tag that should be used for
+ *       sorting will have '-sort' appended. E.g. artist="The Beatles",
+ *       artist-sort="Beatles, The".
+ *
+ * -  Demuxers attempt to export metadata in a generic format, however tags
+ *    with no generic equivalents are left as they are stored in the container.
+ *    Follows a list of generic tag names:
+ *
+ @verbatim
+ album        -- name of the set this work belongs to
+ album_artist -- main creator of the set/album, if different from artist.
+                 e.g. "Various Artists" for compilation albums.
+ artist       -- main creator of the work
+ comment      -- any additional description of the file.
+ composer     -- who composed the work, if different from artist.
+ copyright    -- name of copyright holder.
+ creation_time-- date when the file was created, preferably in ISO 8601.
+ date         -- date when the work was created, preferably in ISO 8601.
+ disc         -- number of a subset, e.g. disc in a multi-disc collection.
+ encoder      -- name/settings of the software/hardware that produced the file.
+ encoded_by   -- person/group who created the file.
+ filename     -- original name of the file.
+ genre        -- <self-evident>.
+ language     -- main language in which the work is performed, preferably
+                 in ISO 639-2 format. Multiple languages can be specified by
+                 separating them with commas.
+ performer    -- artist who performed the work, if different from artist.
+                 E.g for "Also sprach Zarathustra", artist would be "Richard
+                 Strauss" and performer "London Philharmonic Orchestra".
+ publisher    -- name of the label/publisher.
+ service_name     -- name of the service in broadcasting (channel name).
+ service_provider -- name of the service provider in broadcasting.
+ title        -- name of the work.
+ track        -- number of this work in the set, can be in form current/total.
+ variant_bitrate -- the total bitrate of the bitrate variant that the current stream is part of
+ @endverbatim
+ *
+ * Look in the examples section for an application example how to use the Metadata API.
+ *
+ * @}
+ */
+
+#if FF_API_OLD_METADATA2
+/**
+ * @defgroup old_metadata Old metadata API
+ * The following functions are deprecated, use
+ * their equivalents from libavutil/dict.h instead.
+ * @{
+ */
+
+#define AV_METADATA_MATCH_CASE      AV_DICT_MATCH_CASE
+#define AV_METADATA_IGNORE_SUFFIX   AV_DICT_IGNORE_SUFFIX
+#define AV_METADATA_DONT_STRDUP_KEY AV_DICT_DONT_STRDUP_KEY
+#define AV_METADATA_DONT_STRDUP_VAL AV_DICT_DONT_STRDUP_VAL
+#define AV_METADATA_DONT_OVERWRITE  AV_DICT_DONT_OVERWRITE
+
+typedef attribute_deprecated AVDictionary AVMetadata;
+typedef attribute_deprecated AVDictionaryEntry  AVMetadataTag;
+
+typedef struct AVMetadataConv AVMetadataConv;
+
+/**
+ * Get a metadata element with matching key.
+ *
+ * @param prev Set to the previous matching element to find the next.
+ *             If set to NULL the first matching element is returned.
+ * @param flags Allows case as well as suffix-insensitive comparisons.
+ * @return Found tag or NULL, changing key or value leads to undefined behavior.
+ */
+attribute_deprecated AVDictionaryEntry *
+av_metadata_get(AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags);
+
+/**
+ * Set the given tag in *pm, overwriting an existing tag.
+ *
+ * @param pm pointer to a pointer to a metadata struct. If *pm is NULL
+ * a metadata struct is allocated and put in *pm.
+ * @param key tag key to add to *pm (will be av_strduped depending on flags)
+ * @param value tag value to add to *pm (will be av_strduped depending on flags).
+ *        Passing a NULL value will cause an existing tag to be deleted.
+ * @return >= 0 on success otherwise an error code <0
+ */
+attribute_deprecated int av_metadata_set2(AVDictionary **pm, const char *key, const char *value, int flags);
+
+/**
+ * This function is provided for compatibility reason and currently does nothing.
+ */
+attribute_deprecated void av_metadata_conv(struct AVFormatContext *ctx, const AVMetadataConv *d_conv,
+                                                                        const AVMetadataConv *s_conv);
+
+/**
+ * Copy metadata from one AVDictionary struct into another.
+ * @param dst pointer to a pointer to a AVDictionary struct. If *dst is NULL,
+ *            this function will allocate a struct for you and put it in *dst
+ * @param src pointer to source AVDictionary struct
+ * @param flags flags to use when setting metadata in *dst
+ * @note metadata is read using the AV_DICT_IGNORE_SUFFIX flag
+ */
+attribute_deprecated void av_metadata_copy(AVDictionary **dst, AVDictionary *src, int flags);
+
+/**
+ * Free all the memory allocated for an AVDictionary struct.
+ */
+attribute_deprecated void av_metadata_free(AVDictionary **m);
+/**
+ * @}
+ */
+#endif
+
+
+/* packet functions */
+
+
+/**
+ * Allocate and read the payload of a packet and initialize its
+ * fields with default values.
+ *
+ * @param pkt packet
+ * @param size desired payload size
+ * @return >0 (read size) if OK, AVERROR_xxx otherwise
+ */
+int av_get_packet(AVIOContext *s, AVPacket *pkt, int size);
+
+
+/**
+ * Read data and append it to the current content of the AVPacket.
+ * If pkt->size is 0 this is identical to av_get_packet.
+ * Note that this uses av_grow_packet and thus involves a realloc
+ * which is inefficient. Thus this function should only be used
+ * when there is no reasonable way to know (an upper bound of)
+ * the final size.
+ *
+ * @param pkt packet
+ * @param size amount of data to read
+ * @return >0 (read size) if OK, AVERROR_xxx otherwise, previous data
+ *         will not be lost even if an error occurs.
+ */
+int av_append_packet(AVIOContext *s, AVPacket *pkt, int size);
+
+/*************************************************/
+/* fractional numbers for exact pts handling */
+
+/**
+ * The exact value of the fractional number is: 'val + num / den'.
+ * num is assumed to be 0 <= num < den.
+ */
+typedef struct AVFrac {
+    int64_t val, num, den;
+} AVFrac;
+
+/*************************************************/
+/* input/output formats */
+
+struct AVCodecTag;
+
+/**
+ * This structure contains the data a format has to probe a file.
+ */
+typedef struct AVProbeData {
+    const char *filename;
+    unsigned char *buf; /**< Buffer must have AVPROBE_PADDING_SIZE of extra allocated bytes filled with zero. */
+    int buf_size;       /**< Size of buf except extra allocated bytes */
+} AVProbeData;
+
+#define AVPROBE_SCORE_MAX 100               ///< maximum score, half of that is used for file-extension-based detection
+#define AVPROBE_PADDING_SIZE 32             ///< extra allocated bytes at the end of the probe buffer
+
+typedef struct AVFormatParameters {
+#if FF_API_FORMAT_PARAMETERS
+    attribute_deprecated AVRational time_base;
+    attribute_deprecated int sample_rate;
+    attribute_deprecated int channels;
+    attribute_deprecated int width;
+    attribute_deprecated int height;
+    attribute_deprecated enum PixelFormat pix_fmt;
+    attribute_deprecated int channel; /**< Used to select DV channel. */
+    attribute_deprecated const char *standard; /**< deprecated, use demuxer-specific options instead. */
+    attribute_deprecated unsigned int mpeg2ts_raw:1;  /**< deprecated, use mpegtsraw demuxer */
+    /**< deprecated, use mpegtsraw demuxer-specific options instead */
+    attribute_deprecated unsigned int mpeg2ts_compute_pcr:1;
+    attribute_deprecated unsigned int initial_pause:1;       /**< Do not begin to play the stream
+                                                                  immediately (RTSP only). */
+    attribute_deprecated unsigned int prealloced_context:1;
+#endif
+} AVFormatParameters;
+
+/// Demuxer will use avio_open, no opened file should be provided by the caller.
+#define AVFMT_NOFILE        0x0001
+#define AVFMT_NEEDNUMBER    0x0002 /**< Needs '%d' in filename. */
+#define AVFMT_SHOW_IDS      0x0008 /**< Show format stream IDs numbers. */
+#define AVFMT_RAWPICTURE    0x0020 /**< Format wants AVPicture structure for
+                                      raw picture data. */
+#define AVFMT_GLOBALHEADER  0x0040 /**< Format wants global header. */
+#define AVFMT_NOTIMESTAMPS  0x0080 /**< Format does not need / have any timestamps. */
+#define AVFMT_GENERIC_INDEX 0x0100 /**< Use generic index building code. */
+#define AVFMT_TS_DISCONT    0x0200 /**< Format allows timestamp discontinuities. Note, muxers always require valid (monotone) timestamps */
+#define AVFMT_VARIABLE_FPS  0x0400 /**< Format allows variable fps. */
+#define AVFMT_NODIMENSIONS  0x0800 /**< Format does not need width/height */
+#define AVFMT_NOSTREAMS     0x1000 /**< Format does not require any streams */
+#define AVFMT_NOBINSEARCH   0x2000 /**< Format does not allow to fallback to binary search via read_timestamp */
+#define AVFMT_NOGENSEARCH   0x4000 /**< Format does not allow to fallback to generic search */
+#define AVFMT_NO_BYTE_SEEK  0x8000 /**< Format does not allow seeking by bytes */
+
+/**
+ * @addtogroup lavf_encoding
+ * @{
+ */
+typedef struct AVOutputFormat {
+    const char *name;
+    /**
+     * Descriptive name for the format, meant to be more human-readable
+     * than name. You should use the NULL_IF_CONFIG_SMALL() macro
+     * to define it.
+     */
+    const char *long_name;
+    const char *mime_type;
+    const char *extensions; /**< comma-separated filename extensions */
+    /**
+     * size of private data so that it can be allocated in the wrapper
+     */
+    int priv_data_size;
+    /* output support */
+    enum CodecID audio_codec; /**< default audio codec */
+    enum CodecID video_codec; /**< default video codec */
+    int (*write_header)(struct AVFormatContext *);
+    int (*write_packet)(struct AVFormatContext *, AVPacket *pkt);
+    int (*write_trailer)(struct AVFormatContext *);
+    /**
+     * can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_RAWPICTURE,
+     * AVFMT_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS,
+     * AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS
+     */
+    int flags;
+    /**
+     * Currently only used to set pixel format if not YUV420P.
+     */
+    int (*set_parameters)(struct AVFormatContext *, AVFormatParameters *);
+    int (*interleave_packet)(struct AVFormatContext *, AVPacket *out,
+                             AVPacket *in, int flush);
+
+    /**
+     * List of supported codec_id-codec_tag pairs, ordered by "better
+     * choice first". The arrays are all terminated by CODEC_ID_NONE.
+     */
+    const struct AVCodecTag * const *codec_tag;
+
+    enum CodecID subtitle_codec; /**< default subtitle codec */
+
+#if FF_API_OLD_METADATA2
+    const AVMetadataConv *metadata_conv;
+#endif
+
+    const AVClass *priv_class; ///< AVClass for the private context
+
+    /**
+     * Test if the given codec can be stored in this container.
+     *
+     * @return 1 if the codec is supported, 0 if it is not.
+     *         A negative number if unknown.
+     */
+    int (*query_codec)(enum CodecID id, int std_compliance);
+
+    /* private fields */
+    struct AVOutputFormat *next;
+} AVOutputFormat;
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup lavf_decoding
+ * @{
+ */
+typedef struct AVInputFormat {
+    /**
+     * A comma separated list of short names for the format. New names
+     * may be appended with a minor bump.
+     */
+    const char *name;
+
+    /**
+     * Descriptive name for the format, meant to be more human-readable
+     * than name. You should use the NULL_IF_CONFIG_SMALL() macro
+     * to define it.
+     */
+    const char *long_name;
+
+    /**
+     * Size of private data so that it can be allocated in the wrapper.
+     */
+    int priv_data_size;
+
+    /**
+     * Tell if a given file has a chance of being parsed as this format.
+     * The buffer provided is guaranteed to be AVPROBE_PADDING_SIZE bytes
+     * big so you do not have to check for that unless you need more.
+     */
+    int (*read_probe)(AVProbeData *);
+
+    /**
+     * Read the format header and initialize the AVFormatContext
+     * structure. Return 0 if OK. 'ap' if non-NULL contains
+     * additional parameters. Only used in raw format right
+     * now. 'av_new_stream' should be called to create new streams.
+     */
+    int (*read_header)(struct AVFormatContext *,
+                       AVFormatParameters *ap);
+
+    /**
+     * Read one packet and put it in 'pkt'. pts and flags are also
+     * set. 'av_new_stream' can be called only if the flag
+     * AVFMTCTX_NOHEADER is used and only in the calling thread (not in a
+     * background thread).
+     * @return 0 on success, < 0 on error.
+     *         When returning an error, pkt must not have been allocated
+     *         or must be freed before returning
+     */
+    int (*read_packet)(struct AVFormatContext *, AVPacket *pkt);
+
+    /**
+     * Close the stream. The AVFormatContext and AVStreams are not
+     * freed by this function
+     */
+    int (*read_close)(struct AVFormatContext *);
+
+    /**
+     * Seek to a given timestamp relative to the frames in
+     * stream component stream_index.
+     * @param stream_index Must not be -1.
+     * @param flags Selects which direction should be preferred if no exact
+     *              match is available.
+     * @return >= 0 on success (but not necessarily the new offset)
+     */
+    int (*read_seek)(struct AVFormatContext *,
+                     int stream_index, int64_t timestamp, int flags);
+
+    /**
+     * Get the next timestamp in stream[stream_index].time_base units.
+     * @return the timestamp or AV_NOPTS_VALUE if an error occurred
+     */
+    int64_t (*read_timestamp)(struct AVFormatContext *s, int stream_index,
+                              int64_t *pos, int64_t pos_limit);
+
+    /**
+     * Can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_SHOW_IDS,
+     * AVFMT_GENERIC_INDEX, AVFMT_TS_DISCONT, AVFMT_NOBINSEARCH,
+     * AVFMT_NOGENSEARCH, AVFMT_NO_BYTE_SEEK.
+     */
+    int flags;
+
+    /**
+     * If extensions are defined, then no probe is done. You should
+     * usually not use extension format guessing because it is not
+     * reliable enough
+     */
+    const char *extensions;
+
+    /**
+     * General purpose read-only value that the format can use.
+     */
+    int value;
+
+    /**
+     * Start/resume playing - only meaningful if using a network-based format
+     * (RTSP).
+     */
+    int (*read_play)(struct AVFormatContext *);
+
+    /**
+     * Pause playing - only meaningful if using a network-based format
+     * (RTSP).
+     */
+    int (*read_pause)(struct AVFormatContext *);
+
+    const struct AVCodecTag * const *codec_tag;
+
+    /**
+     * Seek to timestamp ts.
+     * Seeking will be done so that the point from which all active streams
+     * can be presented successfully will be closest to ts and within min/max_ts.
+     * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
+     */
+    int (*read_seek2)(struct AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
+
+#if FF_API_OLD_METADATA2
+    const AVMetadataConv *metadata_conv;
+#endif
+
+    const AVClass *priv_class; ///< AVClass for the private context
+
+    /* private fields */
+    struct AVInputFormat *next;
+} AVInputFormat;
+/**
+ * @}
+ */
+
+enum AVStreamParseType {
+    AVSTREAM_PARSE_NONE,
+    AVSTREAM_PARSE_FULL,       /**< full parsing and repack */
+    AVSTREAM_PARSE_HEADERS,    /**< Only parse headers, do not repack. */
+    AVSTREAM_PARSE_TIMESTAMPS, /**< full parsing and interpolation of timestamps for frames not starting on a packet boundary */
+    AVSTREAM_PARSE_FULL_ONCE,  /**< full parsing and repack of the first frame only, only implemented for H.264 currently */
+};
+
+typedef struct AVIndexEntry {
+    int64_t pos;
+    int64_t timestamp;
+#define AVINDEX_KEYFRAME 0x0001
+    int flags:2;
+    int size:30; //Yeah, trying to keep the size of this small to reduce memory requirements (it is 24 vs. 32 bytes due to possible 8-byte alignment).
+    int min_distance;         /**< Minimum distance between this and the previous keyframe, used to avoid unneeded searching. */
+} AVIndexEntry;
+
+#define AV_DISPOSITION_DEFAULT   0x0001
+#define AV_DISPOSITION_DUB       0x0002
+#define AV_DISPOSITION_ORIGINAL  0x0004
+#define AV_DISPOSITION_COMMENT   0x0008
+#define AV_DISPOSITION_LYRICS    0x0010
+#define AV_DISPOSITION_KARAOKE   0x0020
+
+/**
+ * Track should be used during playback by default.
+ * Useful for subtitle track that should be displayed
+ * even when user did not explicitly ask for subtitles.
+ */
+#define AV_DISPOSITION_FORCED    0x0040
+#define AV_DISPOSITION_HEARING_IMPAIRED  0x0080  /**< stream for hearing impaired audiences */
+#define AV_DISPOSITION_VISUAL_IMPAIRED   0x0100  /**< stream for visual impaired audiences */
+#define AV_DISPOSITION_CLEAN_EFFECTS     0x0200  /**< stream without voice */
+
+/**
+ * Stream structure.
+ * New fields can be added to the end with minor version bumps.
+ * Removal, reordering and changes to existing fields require a major
+ * version bump.
+ * sizeof(AVStream) must not be used outside libav*.
+ */
+typedef struct AVStream {
+    int index;    /**< stream index in AVFormatContext */
+    int id;       /**< format-specific stream ID */
+    AVCodecContext *codec; /**< codec context */
+    /**
+     * Real base framerate of the stream.
+     * This is the lowest framerate with which all timestamps can be
+     * represented accurately (it is the least common multiple of all
+     * framerates in the stream). Note, this value is just a guess!
+     * For example, if the time base is 1/90000 and all frames have either
+     * approximately 3600 or 1800 timer ticks, then r_frame_rate will be 50/1.
+     */
+    AVRational r_frame_rate;
+    void *priv_data;
+
+#if FF_API_REORDER_PRIVATE
+    /* internal data used in av_find_stream_info() */
+    int64_t first_dts;
+#endif
+
+    /**
+     * encoding: pts generation when outputting stream
+     */
+    struct AVFrac pts;
+
+    /**
+     * This is the fundamental unit of time (in seconds) in terms
+     * of which frame timestamps are represented. For fixed-fps content,
+     * time base should be 1/framerate and timestamp increments should be 1.
+     * decoding: set by libavformat
+     * encoding: set by libavformat in av_write_header
+     */
+    AVRational time_base;
+#if FF_API_REORDER_PRIVATE
+    int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
+#endif
+#if FF_API_STREAM_COPY
+    /* ffmpeg.c private use */
+    attribute_deprecated int stream_copy; /**< If set, just copy stream. */
+#endif
+    enum AVDiscard discard; ///< Selects which packets can be discarded at will and do not need to be demuxed.
+
+#if FF_API_AVSTREAM_QUALITY
+    //FIXME move stuff to a flags field?
+    /**
+     * Quality, as it has been removed from AVCodecContext and put in AVVideoFrame.
+     * MN: dunno if that is the right place for it
+     */
+    attribute_deprecated float quality;
+#endif
+
+    /**
+     * Decoding: pts of the first frame of the stream, in stream time base.
+     * Only set this if you are absolutely 100% sure that the value you set
+     * it to really is the pts of the first frame.
+     * This may be undefined (AV_NOPTS_VALUE).
+     */
+    int64_t start_time;
+
+    /**
+     * Decoding: duration of the stream, in stream time base.
+     * If a source file does not specify a duration, but does specify
+     * a bitrate, this value will be estimated from bitrate and file size.
+     */
+    int64_t duration;
+
+#if FF_API_REORDER_PRIVATE
+    /* av_read_frame() support */
+    enum AVStreamParseType need_parsing;
+    struct AVCodecParserContext *parser;
+
+    int64_t cur_dts;
+    int last_IP_duration;
+    int64_t last_IP_pts;
+    /* av_seek_frame() support */
+    AVIndexEntry *index_entries; /**< Only used if the format does not
+                                    support seeking natively. */
+    int nb_index_entries;
+    unsigned int index_entries_allocated_size;
+#endif
+
+    int64_t nb_frames;                 ///< number of frames in this stream if known or 0
+
+    int disposition; /**< AV_DISPOSITION_* bit field */
+
+#if FF_API_REORDER_PRIVATE
+    AVProbeData probe_data;
+#define MAX_REORDER_DELAY 16
+    int64_t pts_buffer[MAX_REORDER_DELAY+1];
+#endif
+
+    /**
+     * sample aspect ratio (0 if unknown)
+     * - encoding: Set by user.
+     * - decoding: Set by libavformat.
+     */
+    AVRational sample_aspect_ratio;
+
+    AVDictionary *metadata;
+
+#if FF_API_REORDER_PRIVATE
+    /* Intended mostly for av_read_frame() support. Not supposed to be used by */
+    /* external applications; try to use something else if at all possible.    */
+    const uint8_t *cur_ptr;
+    int cur_len;
+    AVPacket cur_pkt;
+
+    // Timestamp generation support:
+    /**
+     * Timestamp corresponding to the last dts sync point.
+     *
+     * Initialized when AVCodecParserContext.dts_sync_point >= 0 and
+     * a DTS is received from the underlying container. Otherwise set to
+     * AV_NOPTS_VALUE by default.
+     */
+    int64_t reference_dts;
+
+    /**
+     * Number of packets to buffer for codec probing
+     * NOT PART OF PUBLIC API
+     */
+#define MAX_PROBE_PACKETS 2500
+    int probe_packets;
+
+    /**
+     * last packet in packet_buffer for this stream when muxing.
+     * Used internally, NOT PART OF PUBLIC API, do not read or
+     * write from outside of libav*
+     */
+    struct AVPacketList *last_in_packet_buffer;
+#endif
+
+    /**
+     * Average framerate
+     */
+    AVRational avg_frame_rate;
+
+    /*****************************************************************
+     * All fields below this line are not part of the public API. They
+     * may not be used outside of libavformat and can be changed and
+     * removed at will.
+     * New public fields should be added right above.
+     *****************************************************************
+     */
+
+    /**
+     * Number of frames that have been demuxed during av_find_stream_info()
+     */
+    int codec_info_nb_frames;
+
+    /**
+     * Stream information used internally by av_find_stream_info()
+     */
+#define MAX_STD_TIMEBASES (60*12+5)
+    struct {
+        int64_t last_dts;
+        int64_t duration_gcd;
+        int duration_count;
+        double duration_error[MAX_STD_TIMEBASES];
+        int64_t codec_info_duration;
+        int nb_decoded_frames;
+    } *info;
+#if !FF_API_REORDER_PRIVATE
+    const uint8_t *cur_ptr;
+    int cur_len;
+    AVPacket cur_pkt;
+
+    // Timestamp generation support:
+    /**
+     * Timestamp corresponding to the last dts sync point.
+     *
+     * Initialized when AVCodecParserContext.dts_sync_point >= 0 and
+     * a DTS is received from the underlying container. Otherwise set to
+     * AV_NOPTS_VALUE by default.
+     */
+    int64_t reference_dts;
+    int64_t first_dts;
+    int64_t cur_dts;
+    int last_IP_duration;
+    int64_t last_IP_pts;
+
+    /**
+     * Number of packets to buffer for codec probing
+     */
+#define MAX_PROBE_PACKETS 2500
+    int probe_packets;
+
+    /**
+     * last packet in packet_buffer for this stream when muxing.
+     */
+    struct AVPacketList *last_in_packet_buffer;
+    AVProbeData probe_data;
+#define MAX_REORDER_DELAY 16
+    int64_t pts_buffer[MAX_REORDER_DELAY+1];
+    /* av_read_frame() support */
+    enum AVStreamParseType need_parsing;
+    struct AVCodecParserContext *parser;
+
+    AVIndexEntry *index_entries; /**< Only used if the format does not
+                                    support seeking natively. */
+    int nb_index_entries;
+    unsigned int index_entries_allocated_size;
+
+    int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
+#endif
+} AVStream;
+
+#define AV_PROGRAM_RUNNING 1
+
+/**
+ * New fields can be added to the end with minor version bumps.
+ * Removal, reordering and changes to existing fields require a major
+ * version bump.
+ * sizeof(AVProgram) must not be used outside libav*.
+ */
+typedef struct AVProgram {
+    int            id;
+    int            flags;
+    enum AVDiscard discard;        ///< selects which program to discard and which to feed to the caller
+    unsigned int   *stream_index;
+    unsigned int   nb_stream_indexes;
+    AVDictionary *metadata;
+} AVProgram;
+
+#define AVFMTCTX_NOHEADER      0x0001 /**< signal that no header is present
+                                         (streams are added dynamically) */
+
+typedef struct AVChapter {
+    int id;                 ///< unique ID to identify the chapter
+    AVRational time_base;   ///< time base in which the start/end timestamps are specified
+    int64_t start, end;     ///< chapter start/end time in time_base units
+    AVDictionary *metadata;
+} AVChapter;
+
+/**
+ * Format I/O context.
+ * New fields can be added to the end with minor version bumps.
+ * Removal, reordering and changes to existing fields require a major
+ * version bump.
+ * sizeof(AVFormatContext) must not be used outside libav*, use
+ * avformat_alloc_context() to create an AVFormatContext.
+ */
+typedef struct AVFormatContext {
+    /**
+     * A class for logging and AVOptions. Set by avformat_alloc_context().
+     * Exports (de)muxer private options if they exist.
+     */
+    const AVClass *av_class;
+
+    /**
+     * Can only be iformat or oformat, not both at the same time.
+     *
+     * decoding: set by avformat_open_input().
+     * encoding: set by the user.
+     */
+    struct AVInputFormat *iformat;
+    struct AVOutputFormat *oformat;
+
+    /**
+     * Format private data. This is an AVOptions-enabled struct
+     * if and only if iformat/oformat.priv_class is not NULL.
+     */
+    void *priv_data;
+
+    /*
+     * I/O context.
+     *
+     * decoding: either set by the user before avformat_open_input() (then
+     * the user must close it manually) or set by avformat_open_input().
+     * encoding: set by the user.
+     *
+     * Do NOT set this field if AVFMT_NOFILE flag is set in
+     * iformat/oformat.flags. In such a case, the (de)muxer will handle
+     * I/O in some other way and this field will be NULL.
+     */
+    AVIOContext *pb;
+
+    /**
+     * A list of all streams in the file. New streams are created with
+     * avformat_new_stream().
+     *
+     * decoding: streams are created by libavformat in avformat_open_input().
+     * If AVFMTCTX_NOHEADER is set in ctx_flags, then new streams may also
+     * appear in av_read_frame().
+     * encoding: streams are created by the user before avformat_write_header().
+     */
+    unsigned int nb_streams;
+    AVStream **streams;
+
+    char filename[1024]; /**< input or output filename */
+    /* stream info */
+#if FF_API_TIMESTAMP
+    /**
+     * @deprecated use 'creation_time' metadata tag instead
+     */
+    attribute_deprecated int64_t timestamp;
+#endif
+
+    int ctx_flags; /**< Format-specific flags, see AVFMTCTX_xx */
+#if FF_API_REORDER_PRIVATE
+    /* private data for pts handling (do not modify directly). */
+    /**
+     * This buffer is only needed when packets were already buffered but
+     * not decoded, for example to get the codec parameters in MPEG
+     * streams.
+     */
+    struct AVPacketList *packet_buffer;
+#endif
+
+    /**
+     * Decoding: position of the first frame of the component, in
+     * AV_TIME_BASE fractional seconds. NEVER set this value directly:
+     * It is deduced from the AVStream values.
+     */
+    int64_t start_time;
+
+    /**
+     * Decoding: duration of the stream, in AV_TIME_BASE fractional
+     * seconds. Only set this value if you know none of the individual stream
+     * durations and also do not set any of them. This is deduced from the
+     * AVStream values if not set.
+     */
+    int64_t duration;
+
+#if FF_API_FILESIZE
+    /**
+     * decoding: total file size, 0 if unknown
+     */
+    attribute_deprecated int64_t file_size;
+#endif
+
+    /**
+     * Decoding: total stream bitrate in bit/s, 0 if not
+     * available. Never set it directly if the file_size and the
+     * duration are known as Libav can compute it automatically.
+     */
+    int bit_rate;
+
+#if FF_API_REORDER_PRIVATE
+    /* av_read_frame() support */
+    AVStream *cur_st;
+
+    /* av_seek_frame() support */
+    int64_t data_offset; /**< offset of the first packet */
+#endif
+
+#if FF_API_MUXRATE
+    /**
+     * use mpeg muxer private options instead
+     */
+    attribute_deprecated int mux_rate;
+#endif
+    unsigned int packet_size;
+#if FF_API_PRELOAD
+    attribute_deprecated int preload;
+#endif
+    int max_delay;
+
+#if FF_API_LOOP_OUTPUT
+#define AVFMT_NOOUTPUTLOOP -1
+#define AVFMT_INFINITEOUTPUTLOOP 0
+    /**
+     * number of times to loop output in formats that support it
+     *
+     * @deprecated use the 'loop' private option in the gif muxer.
+     */
+    attribute_deprecated int loop_output;
+#endif
+
+    int flags;
+#define AVFMT_FLAG_GENPTS       0x0001 ///< Generate missing pts even if it requires parsing future frames.
+#define AVFMT_FLAG_IGNIDX       0x0002 ///< Ignore index.
+#define AVFMT_FLAG_NONBLOCK     0x0004 ///< Do not block when reading packets from input.
+#define AVFMT_FLAG_IGNDTS       0x0008 ///< Ignore DTS on frames that contain both DTS & PTS
+#define AVFMT_FLAG_NOFILLIN     0x0010 ///< Do not infer any values from other values, just return what is stored in the container
+#define AVFMT_FLAG_NOPARSE      0x0020 ///< Do not use AVParsers, you also must set AVFMT_FLAG_NOFILLIN as the fillin code works on frames and no parsing -> no frames. Also seeking to frames can not work if parsing to find frame boundaries has been disabled
+#if FF_API_FLAG_RTP_HINT
+#define AVFMT_FLAG_RTP_HINT     0x0040 ///< Deprecated, use the -movflags rtphint muxer specific AVOption instead
+#endif
+#define AVFMT_FLAG_CUSTOM_IO    0x0080 ///< The caller has supplied a custom AVIOContext, don't avio_close() it.
+#define AVFMT_FLAG_DISCARD_CORRUPT  0x0100 ///< Discard frames marked corrupted
+
+#if FF_API_LOOP_INPUT
+    /**
+     * @deprecated, use the 'loop' img2 demuxer private option.
+     */
+    attribute_deprecated int loop_input;
+#endif
+
+    /**
+     * decoding: size of data to probe; encoding: unused.
+     */
+    unsigned int probesize;
+
+    /**
+     * decoding: maximum time (in AV_TIME_BASE units) during which the input should
+     * be analyzed in avformat_find_stream_info().
+     */
+    int max_analyze_duration;
+
+    const uint8_t *key;
+    int keylen;
+
+    unsigned int nb_programs;
+    AVProgram **programs;
+
+    /**
+     * Forced video codec_id.
+     * Demuxing: Set by user.
+     */
+    enum CodecID video_codec_id;
+
+    /**
+     * Forced audio codec_id.
+     * Demuxing: Set by user.
+     */
+    enum CodecID audio_codec_id;
+
+    /**
+     * Forced subtitle codec_id.
+     * Demuxing: Set by user.
+     */
+    enum CodecID subtitle_codec_id;
+
+    /**
+     * Maximum amount of memory in bytes to use for the index of each stream.
+     * If the index exceeds this size, entries will be discarded as
+     * needed to maintain a smaller size. This can lead to slower or less
+     * accurate seeking (depends on demuxer).
+     * Demuxers for which a full in-memory index is mandatory will ignore
+     * this.
+     * muxing  : unused
+     * demuxing: set by user
+     */
+    unsigned int max_index_size;
+
+    /**
+     * Maximum amount of memory in bytes to use for buffering frames
+     * obtained from realtime capture devices.
+     */
+    unsigned int max_picture_buffer;
+
+    unsigned int nb_chapters;
+    AVChapter **chapters;
+
+    /**
+     * Flags to enable debugging.
+     */
+    int debug;
+#define FF_FDEBUG_TS        0x0001
+
+#if FF_API_REORDER_PRIVATE
+    /**
+     * Raw packets from the demuxer, prior to parsing and decoding.
+     * This buffer is used for buffering packets until the codec can
+     * be identified, as parsing cannot be done without knowing the
+     * codec.
+     */
+    struct AVPacketList *raw_packet_buffer;
+    struct AVPacketList *raw_packet_buffer_end;
+
+    struct AVPacketList *packet_buffer_end;
+#endif
+
+    AVDictionary *metadata;
+
+#if FF_API_REORDER_PRIVATE
+    /**
+     * Remaining size available for raw_packet_buffer, in bytes.
+     * NOT PART OF PUBLIC API
+     */
+#define RAW_PACKET_BUFFER_SIZE 2500000
+    int raw_packet_buffer_remaining_size;
+#endif
+
+    /**
+     * Start time of the stream in real world time, in microseconds
+     * since the unix epoch (00:00 1st January 1970). That is, pts=0
+     * in the stream was captured at this real world time.
+     * - encoding: Set by user.
+     * - decoding: Unused.
+     */
+    int64_t start_time_realtime;
+
+    /**
+     * decoding: number of frames used to probe fps
+     */
+    int fps_probe_size;
+
+    /**
+     * Error recognition; higher values will detect more errors but may
+     * misdetect some more or less valid parts as errors.
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    int error_recognition;
+
+    /**
+     * Custom interrupt callbacks for the I/O layer.
+     *
+     * decoding: set by the user before avformat_open_input().
+     * encoding: set by the user before avformat_write_header()
+     * (mainly useful for AVFMT_NOFILE formats). The callback
+     * should also be passed to avio_open2() if it's used to
+     * open the file.
+     */
+    AVIOInterruptCB interrupt_callback;
+
+    /*****************************************************************
+     * All fields below this line are not part of the public API. They
+     * may not be used outside of libavformat and can be changed and
+     * removed at will.
+     * New public fields should be added right above.
+     *****************************************************************
+     */
+#if !FF_API_REORDER_PRIVATE
+    /**
+     * Raw packets from the demuxer, prior to parsing and decoding.
+     * This buffer is used for buffering packets until the codec can
+     * be identified, as parsing cannot be done without knowing the
+     * codec.
+     */
+    struct AVPacketList *raw_packet_buffer;
+    struct AVPacketList *raw_packet_buffer_end;
+    /**
+     * Remaining size available for raw_packet_buffer, in bytes.
+     */
+#define RAW_PACKET_BUFFER_SIZE 2500000
+    int raw_packet_buffer_remaining_size;
+
+    /**
+     * This buffer is only needed when packets were already buffered but
+     * not decoded, for example to get the codec parameters in MPEG
+     * streams.
+     */
+    struct AVPacketList *packet_buffer;
+    struct AVPacketList *packet_buffer_end;
+
+    /* av_read_frame() support */
+    AVStream *cur_st;
+
+    /* av_seek_frame() support */
+    int64_t data_offset; /**< offset of the first packet */
+#endif
+} AVFormatContext;
+
+typedef struct AVPacketList {
+    AVPacket pkt;
+    struct AVPacketList *next;
+} AVPacketList;
+
+
+/**
+ * @defgroup lavf_core Core functions
+ * @ingroup libavf
+ *
+ * Functions for querying libavformat capabilities, allocating core structures,
+ * etc.
+ * @{
+ */
+
+/**
+ * Return the LIBAVFORMAT_VERSION_INT constant.
+ */
+unsigned avformat_version(void);
+
+/**
+ * Return the libavformat build-time configuration.
+ */
+const char *avformat_configuration(void);
+
+/**
+ * Return the libavformat license.
+ */
+const char *avformat_license(void);
+
+/**
+ * Initialize libavformat and register all the muxers, demuxers and
+ * protocols. If you do not call this function, then you can select
+ * exactly which formats you want to support.
+ *
+ * @see av_register_input_format()
+ * @see av_register_output_format()
+ * @see av_register_protocol()
+ */
+void av_register_all(void);
+
+void av_register_input_format(AVInputFormat *format);
+void av_register_output_format(AVOutputFormat *format);
+
+/**
+ * Do global initialization of network components. This is optional,
+ * but recommended, since it avoids the overhead of implicitly
+ * doing the setup for each session.
+ *
+ * Calling this function will become mandatory if using network
+ * protocols at some major version bump.
+ */
+int avformat_network_init(void);
+
+/**
+ * Undo the initialization done by avformat_network_init.
+ */
+int avformat_network_deinit(void);
+
+/**
+ * If f is NULL, returns the first registered input format,
+ * if f is non-NULL, returns the next registered input format after f
+ * or NULL if f is the last one.
+ */
+AVInputFormat  *av_iformat_next(AVInputFormat  *f);
+
+/**
+ * If f is NULL, returns the first registered output format,
+ * if f is non-NULL, returns the next registered output format after f
+ * or NULL if f is the last one.
+ */
+AVOutputFormat *av_oformat_next(AVOutputFormat *f);
+
+/**
+ * Allocate an AVFormatContext.
+ * avformat_free_context() can be used to free the context and everything
+ * allocated by the framework within it.
+ */
+AVFormatContext *avformat_alloc_context(void);
+
+/**
+ * Free an AVFormatContext and all its streams.
+ * @param s context to free
+ */
+void avformat_free_context(AVFormatContext *s);
+
+/**
+ * Get the AVClass for AVFormatContext. It can be used in combination with
+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
+ *
+ * @see av_opt_find().
+ */
+const AVClass *avformat_get_class(void);
+
+/**
+ * Add a new stream to a media file.
+ *
+ * When demuxing, it is called by the demuxer in read_header(). If the
+ * flag AVFMTCTX_NOHEADER is set in s.ctx_flags, then it may also
+ * be called in read_packet().
+ *
+ * When muxing, should be called by the user before avformat_write_header().
+ *
+ * @param c If non-NULL, the AVCodecContext corresponding to the new stream
+ * will be initialized to use this codec. This is needed for e.g. codec-specific
+ * defaults to be set, so codec should be provided if it is known.
+ *
+ * @return newly created stream or NULL on error.
+ */
+AVStream *avformat_new_stream(AVFormatContext *s, AVCodec *c);
+
+AVProgram *av_new_program(AVFormatContext *s, int id);
+
+/**
+ * @}
+ */
+
+
+#if FF_API_GUESS_IMG2_CODEC
+attribute_deprecated enum CodecID av_guess_image2_codec(const char *filename);
+#endif
+
+#if FF_API_PKT_DUMP
+attribute_deprecated void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload);
+attribute_deprecated void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt,
+                                          int dump_payload);
+#endif
+
+
+/**
+ * @addtogroup lavf_decoding
+ * @{
+ */
+
+/**
+ * Find AVInputFormat based on the short name of the input format.
+ */
+AVInputFormat *av_find_input_format(const char *short_name);
+
+/**
+ * Guess the file format.
+ *
+ * @param is_opened Whether the file is already opened; determines whether
+ *                  demuxers with or without AVFMT_NOFILE are probed.
+ */
+AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened);
+
+/**
+ * Guess the file format.
+ *
+ * @param is_opened Whether the file is already opened; determines whether
+ *                  demuxers with or without AVFMT_NOFILE are probed.
+ * @param score_max A probe score larger that this is required to accept a
+ *                  detection, the variable is set to the actual detection
+ *                  score afterwards.
+ *                  If the score is <= AVPROBE_SCORE_MAX / 4 it is recommended
+ *                  to retry with a larger probe buffer.
+ */
+AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max);
+
+/**
+ * Probe a bytestream to determine the input format. Each time a probe returns
+ * with a score that is too low, the probe buffer size is increased and another
+ * attempt is made. When the maximum probe size is reached, the input format
+ * with the highest score is returned.
+ *
+ * @param pb the bytestream to probe
+ * @param fmt the input format is put here
+ * @param filename the filename of the stream
+ * @param logctx the log context
+ * @param offset the offset within the bytestream to probe from
+ * @param max_probe_size the maximum probe buffer size (zero for default)
+ * @return 0 in case of success, a negative value corresponding to an
+ * AVERROR code otherwise
+ */
+int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
+                          const char *filename, void *logctx,
+                          unsigned int offset, unsigned int max_probe_size);
+
+#if FF_API_FORMAT_PARAMETERS
+/**
+ * Allocate all the structures needed to read an input stream.
+ *        This does not open the needed codecs for decoding the stream[s].
+ * @deprecated use avformat_open_input instead.
+ */
+attribute_deprecated int av_open_input_stream(AVFormatContext **ic_ptr,
+                         AVIOContext *pb, const char *filename,
+                         AVInputFormat *fmt, AVFormatParameters *ap);
+
+/**
+ * Open a media file as input. The codecs are not opened. Only the file
+ * header (if present) is read.
+ *
+ * @param ic_ptr The opened media file handle is put here.
+ * @param filename filename to open
+ * @param fmt If non-NULL, force the file format to use.
+ * @param buf_size optional buffer size (zero if default is OK)
+ * @param ap Additional parameters needed when opening the file
+ *           (NULL if default).
+ * @return 0 if OK, AVERROR_xxx otherwise
+ *
+ * @deprecated use avformat_open_input instead.
+ */
+attribute_deprecated int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
+                       AVInputFormat *fmt,
+                       int buf_size,
+                       AVFormatParameters *ap);
+#endif
+
+/**
+ * Open an input stream and read the header. The codecs are not opened.
+ * The stream must be closed with av_close_input_file().
+ *
+ * @param ps Pointer to user-supplied AVFormatContext (allocated by avformat_alloc_context).
+ *           May be a pointer to NULL, in which case an AVFormatContext is allocated by this
+ *           function and written into ps.
+ *           Note that a user-supplied AVFormatContext will be freed on failure.
+ * @param filename Name of the stream to open.
+ * @param fmt If non-NULL, this parameter forces a specific input format.
+ *            Otherwise the format is autodetected.
+ * @param options  A dictionary filled with AVFormatContext and demuxer-private options.
+ *                 On return this parameter will be destroyed and replaced with a dict containing
+ *                 options that were not found. May be NULL.
+ *
+ * @return 0 on success, a negative AVERROR on failure.
+ *
+ * @note If you want to use custom IO, preallocate the format context and set its pb field.
+ */
+int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputFormat *fmt, AVDictionary **options);
+
+#if FF_API_FORMAT_PARAMETERS
+/**
+ * Read packets of a media file to get stream information. This
+ * is useful for file formats with no headers such as MPEG. This
+ * function also computes the real framerate in case of MPEG-2 repeat
+ * frame mode.
+ * The logical file position is not changed by this function;
+ * examined packets may be buffered for later processing.
+ *
+ * @param ic media file handle
+ * @return >=0 if OK, AVERROR_xxx on error
+ * @todo Let the user decide somehow what information is needed so that
+ *       we do not waste time getting stuff the user does not need.
+ *
+ * @deprecated use avformat_find_stream_info.
+ */
+attribute_deprecated
+int av_find_stream_info(AVFormatContext *ic);
+#endif
+
+/**
+ * Read packets of a media file to get stream information. This
+ * is useful for file formats with no headers such as MPEG. This
+ * function also computes the real framerate in case of MPEG-2 repeat
+ * frame mode.
+ * The logical file position is not changed by this function;
+ * examined packets may be buffered for later processing.
+ *
+ * @param ic media file handle
+ * @param options  If non-NULL, an ic.nb_streams long array of pointers to
+ *                 dictionaries, where i-th member contains options for
+ *                 codec corresponding to i-th stream.
+ *                 On return each dictionary will be filled with options that were not found.
+ * @return >=0 if OK, AVERROR_xxx on error
+ *
+ * @note this function isn't guaranteed to open all the codecs, so
+ *       options being non-empty at return is a perfectly normal behavior.
+ *
+ * @todo Let the user decide somehow what information is needed so that
+ *       we do not waste time getting stuff the user does not need.
+ */
+int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options);
+
+/**
+ * Find the "best" stream in the file.
+ * The best stream is determined according to various heuristics as the most
+ * likely to be what the user expects.
+ * If the decoder parameter is non-NULL, av_find_best_stream will find the
+ * default decoder for the stream's codec; streams for which no decoder can
+ * be found are ignored.
+ *
+ * @param ic                media file handle
+ * @param type              stream type: video, audio, subtitles, etc.
+ * @param wanted_stream_nb  user-requested stream number,
+ *                          or -1 for automatic selection
+ * @param related_stream    try to find a stream related (eg. in the same
+ *                          program) to this one, or -1 if none
+ * @param decoder_ret       if non-NULL, returns the decoder for the
+ *                          selected stream
+ * @param flags             flags; none are currently defined
+ * @return  the non-negative stream number in case of success,
+ *          AVERROR_STREAM_NOT_FOUND if no stream with the requested type
+ *          could be found,
+ *          AVERROR_DECODER_NOT_FOUND if streams were found but no decoder
+ * @note  If av_find_best_stream returns successfully and decoder_ret is not
+ *        NULL, then *decoder_ret is guaranteed to be set to a valid AVCodec.
+ */
+int av_find_best_stream(AVFormatContext *ic,
+                        enum AVMediaType type,
+                        int wanted_stream_nb,
+                        int related_stream,
+                        AVCodec **decoder_ret,
+                        int flags);
+
+/**
+ * Read a transport packet from a media file.
+ *
+ * This function is obsolete and should never be used.
+ * Use av_read_frame() instead.
+ *
+ * @param s media file handle
+ * @param pkt is filled
+ * @return 0 if OK, AVERROR_xxx on error
+ */
+int av_read_packet(AVFormatContext *s, AVPacket *pkt);
+
+/**
+ * Return the next frame of a stream.
+ * This function returns what is stored in the file, and does not validate
+ * that what is there are valid frames for the decoder. It will split what is
+ * stored in the file into frames and return one for each call. It will not
+ * omit invalid data between valid frames so as to give the decoder the maximum
+ * information possible for decoding.
+ *
+ * The returned packet is valid
+ * until the next av_read_frame() or until av_close_input_file() and
+ * must be freed with av_free_packet. For video, the packet contains
+ * exactly one frame. For audio, it contains an integer number of
+ * frames if each frame has a known fixed size (e.g. PCM or ADPCM
+ * data). If the audio frames have a variable size (e.g. MPEG audio),
+ * then it contains one frame.
+ *
+ * pkt->pts, pkt->dts and pkt->duration are always set to correct
+ * values in AVStream.time_base units (and guessed if the format cannot
+ * provide them). pkt->pts can be AV_NOPTS_VALUE if the video format
+ * has B-frames, so it is better to rely on pkt->dts if you do not
+ * decompress the payload.
+ *
+ * @return 0 if OK, < 0 on error or end of file
+ */
+int av_read_frame(AVFormatContext *s, AVPacket *pkt);
+
+/**
+ * Seek to the keyframe at timestamp.
+ * 'timestamp' in 'stream_index'.
+ * @param stream_index If stream_index is (-1), a default
+ * stream is selected, and timestamp is automatically converted
+ * from AV_TIME_BASE units to the stream specific time_base.
+ * @param timestamp Timestamp in AVStream.time_base units
+ *        or, if no stream is specified, in AV_TIME_BASE units.
+ * @param flags flags which select direction and seeking mode
+ * @return >= 0 on success
+ */
+int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp,
+                  int flags);
+
+/**
+ * Seek to timestamp ts.
+ * Seeking will be done so that the point from which all active streams
+ * can be presented successfully will be closest to ts and within min/max_ts.
+ * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
+ *
+ * If flags contain AVSEEK_FLAG_BYTE, then all timestamps are in bytes and
+ * are the file position (this may not be supported by all demuxers).
+ * If flags contain AVSEEK_FLAG_FRAME, then all timestamps are in frames
+ * in the stream with stream_index (this may not be supported by all demuxers).
+ * Otherwise all timestamps are in units of the stream selected by stream_index
+ * or if stream_index is -1, in AV_TIME_BASE units.
+ * If flags contain AVSEEK_FLAG_ANY, then non-keyframes are treated as
+ * keyframes (this may not be supported by all demuxers).
+ *
+ * @param stream_index index of the stream which is used as time base reference
+ * @param min_ts smallest acceptable timestamp
+ * @param ts target timestamp
+ * @param max_ts largest acceptable timestamp
+ * @param flags flags
+ * @return >=0 on success, error code otherwise
+ *
+ * @note This is part of the new seek API which is still under construction.
+ *       Thus do not use this yet. It may change at any time, do not expect
+ *       ABI compatibility yet!
+ */
+int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
+
+/**
+ * Start playing a network-based stream (e.g. RTSP stream) at the
+ * current position.
+ */
+int av_read_play(AVFormatContext *s);
+
+/**
+ * Pause a network-based stream (e.g. RTSP stream).
+ *
+ * Use av_read_play() to resume it.
+ */
+int av_read_pause(AVFormatContext *s);
+
+#if FF_API_FORMAT_PARAMETERS
+/**
+ * Free a AVFormatContext allocated by av_open_input_stream.
+ * @param s context to free
+ * @deprecated use av_close_input_file()
+ */
+attribute_deprecated
+void av_close_input_stream(AVFormatContext *s);
+#endif
+
+#if FF_API_CLOSE_INPUT_FILE
+/**
+ * @deprecated use avformat_close_input()
+ * Close a media file (but not its codecs).
+ *
+ * @param s media file handle
+ */
+attribute_deprecated
+void av_close_input_file(AVFormatContext *s);
+#endif
+
+/**
+ * Close an opened input AVFormatContext. Free it and all its contents
+ * and set *s to NULL.
+ */
+void avformat_close_input(AVFormatContext **s);
+/**
+ * @}
+ */
+
+#if FF_API_NEW_STREAM
+/**
+ * Add a new stream to a media file.
+ *
+ * Can only be called in the read_header() function. If the flag
+ * AVFMTCTX_NOHEADER is in the format context, then new streams
+ * can be added in read_packet too.
+ *
+ * @param s media file handle
+ * @param id file-format-dependent stream ID
+ */
+attribute_deprecated
+AVStream *av_new_stream(AVFormatContext *s, int id);
+#endif
+
+#if FF_API_SET_PTS_INFO
+/**
+ * @deprecated this function is not supposed to be called outside of lavf
+ */
+attribute_deprecated
+void av_set_pts_info(AVStream *s, int pts_wrap_bits,
+                     unsigned int pts_num, unsigned int pts_den);
+#endif
+
+#define AVSEEK_FLAG_BACKWARD 1 ///< seek backward
+#define AVSEEK_FLAG_BYTE     2 ///< seeking based on position in bytes
+#define AVSEEK_FLAG_ANY      4 ///< seek to any frame, even non-keyframes
+#define AVSEEK_FLAG_FRAME    8 ///< seeking based on frame number
+
+#if FF_API_SEEK_PUBLIC
+attribute_deprecated
+int av_seek_frame_binary(AVFormatContext *s, int stream_index,
+                         int64_t target_ts, int flags);
+attribute_deprecated
+void av_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp);
+attribute_deprecated
+int64_t av_gen_search(AVFormatContext *s, int stream_index,
+                      int64_t target_ts, int64_t pos_min,
+                      int64_t pos_max, int64_t pos_limit,
+                      int64_t ts_min, int64_t ts_max,
+                      int flags, int64_t *ts_ret,
+                      int64_t (*read_timestamp)(struct AVFormatContext *, int , int64_t *, int64_t ));
+#endif
+
+#if FF_API_FORMAT_PARAMETERS
+/**
+ * @deprecated pass the options to avformat_write_header directly.
+ */
+attribute_deprecated int av_set_parameters(AVFormatContext *s, AVFormatParameters *ap);
+#endif
+
+/**
+ * @addtogroup lavf_encoding
+ * @{
+ */
+/**
+ * Allocate the stream private data and write the stream header to
+ * an output media file.
+ *
+ * @param s Media file handle, must be allocated with avformat_alloc_context().
+ *          Its oformat field must be set to the desired output format;
+ *          Its pb field must be set to an already openened AVIOContext.
+ * @param options  An AVDictionary filled with AVFormatContext and muxer-private options.
+ *                 On return this parameter will be destroyed and replaced with a dict containing
+ *                 options that were not found. May be NULL.
+ *
+ * @return 0 on success, negative AVERROR on failure.
+ *
+ * @see av_opt_find, av_dict_set, avio_open, av_oformat_next.
+ */
+int avformat_write_header(AVFormatContext *s, AVDictionary **options);
+
+#if FF_API_FORMAT_PARAMETERS
+/**
+ * Allocate the stream private data and write the stream header to an
+ * output media file.
+ * @note: this sets stream time-bases, if possible to stream->codec->time_base
+ * but for some formats it might also be some other time base
+ *
+ * @param s media file handle
+ * @return 0 if OK, AVERROR_xxx on error
+ *
+ * @deprecated use avformat_write_header.
+ */
+attribute_deprecated int av_write_header(AVFormatContext *s);
+#endif
+
+/**
+ * Write a packet to an output media file.
+ *
+ * The packet shall contain one audio or video frame.
+ * The packet must be correctly interleaved according to the container
+ * specification, if not then av_interleaved_write_frame must be used.
+ *
+ * @param s media file handle
+ * @param pkt The packet, which contains the stream_index, buf/buf_size,
+              dts/pts, ...
+ * @return < 0 on error, = 0 if OK, 1 if end of stream wanted
+ */
+int av_write_frame(AVFormatContext *s, AVPacket *pkt);
+
+/**
+ * Write a packet to an output media file ensuring correct interleaving.
+ *
+ * The packet must contain one audio or video frame.
+ * If the packets are already correctly interleaved, the application should
+ * call av_write_frame() instead as it is slightly faster. It is also important
+ * to keep in mind that completely non-interleaved input will need huge amounts
+ * of memory to interleave with this, so it is preferable to interleave at the
+ * demuxer level.
+ *
+ * @param s media file handle
+ * @param pkt The packet containing the data to be written. Libavformat takes
+ * ownership of the data and will free it when it sees fit using the packet's
+ * @ref AVPacket.destruct "destruct" field. The caller must not access the data
+ * after this function returns, as it may already be freed.
+ * Packet's @ref AVPacket.stream_index "stream_index" field must be set to the
+ * index of the corresponding stream in @ref AVFormatContext.streams
+ * "s.streams".
+ * It is very strongly recommended that timing information (@ref AVPacket.pts
+ * "pts", @ref AVPacket.dts "dts" @ref AVPacket.duration "duration") is set to
+ * correct values.
+ *
+ * @return 0 on success, a negative AVERROR on error.
+ */
+int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt);
+
+/**
+ * Interleave a packet per dts in an output media file.
+ *
+ * Packets with pkt->destruct == av_destruct_packet will be freed inside this
+ * function, so they cannot be used after it. Note that calling av_free_packet()
+ * on them is still safe.
+ *
+ * @param s media file handle
+ * @param out the interleaved packet will be output here
+ * @param pkt the input packet
+ * @param flush 1 if no further packets are available as input and all
+ *              remaining packets should be output
+ * @return 1 if a packet was output, 0 if no packet could be output,
+ *         < 0 if an error occurred
+ */
+int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
+                                 AVPacket *pkt, int flush);
+
+/**
+ * Write the stream trailer to an output media file and free the
+ * file private data.
+ *
+ * May only be called after a successful call to av_write_header.
+ *
+ * @param s media file handle
+ * @return 0 if OK, AVERROR_xxx on error
+ */
+int av_write_trailer(AVFormatContext *s);
+
+/**
+ * Return the output format in the list of registered output formats
+ * which best matches the provided parameters, or return NULL if
+ * there is no match.
+ *
+ * @param short_name if non-NULL checks if short_name matches with the
+ * names of the registered formats
+ * @param filename if non-NULL checks if filename terminates with the
+ * extensions of the registered formats
+ * @param mime_type if non-NULL checks if mime_type matches with the
+ * MIME type of the registered formats
+ */
+AVOutputFormat *av_guess_format(const char *short_name,
+                                const char *filename,
+                                const char *mime_type);
+
+/**
+ * Guess the codec ID based upon muxer and filename.
+ */
+enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
+                            const char *filename, const char *mime_type,
+                            enum AVMediaType type);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @defgroup lavf_misc Utility functions
+ * @ingroup libavf
+ * @{
+ *
+ * Miscelaneous utility functions related to both muxing and demuxing
+ * (or neither).
+ */
+
+/**
+ * Send a nice hexadecimal dump of a buffer to the specified file stream.
+ *
+ * @param f The file stream pointer where the dump should be sent to.
+ * @param buf buffer
+ * @param size buffer size
+ *
+ * @see av_hex_dump_log, av_pkt_dump2, av_pkt_dump_log2
+ */
+void av_hex_dump(FILE *f, uint8_t *buf, int size);
+
+/**
+ * Send a nice hexadecimal dump of a buffer to the log.
+ *
+ * @param avcl A pointer to an arbitrary struct of which the first field is a
+ * pointer to an AVClass struct.
+ * @param level The importance level of the message, lower values signifying
+ * higher importance.
+ * @param buf buffer
+ * @param size buffer size
+ *
+ * @see av_hex_dump, av_pkt_dump2, av_pkt_dump_log2
+ */
+void av_hex_dump_log(void *avcl, int level, uint8_t *buf, int size);
+
+/**
+ * Send a nice dump of a packet to the specified file stream.
+ *
+ * @param f The file stream pointer where the dump should be sent to.
+ * @param pkt packet to dump
+ * @param dump_payload True if the payload must be displayed, too.
+ * @param st AVStream that the packet belongs to
+ */
+void av_pkt_dump2(FILE *f, AVPacket *pkt, int dump_payload, AVStream *st);
+
+
+/**
+ * Send a nice dump of a packet to the log.
+ *
+ * @param avcl A pointer to an arbitrary struct of which the first field is a
+ * pointer to an AVClass struct.
+ * @param level The importance level of the message, lower values signifying
+ * higher importance.
+ * @param pkt packet to dump
+ * @param dump_payload True if the payload must be displayed, too.
+ * @param st AVStream that the packet belongs to
+ */
+void av_pkt_dump_log2(void *avcl, int level, AVPacket *pkt, int dump_payload,
+                      AVStream *st);
+
+/**
+ * Get the CodecID for the given codec tag tag.
+ * If no codec id is found returns CODEC_ID_NONE.
+ *
+ * @param tags list of supported codec_id-codec_tag pairs, as stored
+ * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
+ */
+enum CodecID av_codec_get_id(const struct AVCodecTag * const *tags, unsigned int tag);
+
+/**
+ * Get the codec tag for the given codec id id.
+ * If no codec tag is found returns 0.
+ *
+ * @param tags list of supported codec_id-codec_tag pairs, as stored
+ * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
+ */
+unsigned int av_codec_get_tag(const struct AVCodecTag * const *tags, enum CodecID id);
+
+int av_find_default_stream_index(AVFormatContext *s);
+
+/**
+ * Get the index for a specific timestamp.
+ * @param flags if AVSEEK_FLAG_BACKWARD then the returned index will correspond
+ *                 to the timestamp which is <= the requested one, if backward
+ *                 is 0, then it will be >=
+ *              if AVSEEK_FLAG_ANY seek to any frame, only keyframes otherwise
+ * @return < 0 if no such timestamp could be found
+ */
+int av_index_search_timestamp(AVStream *st, int64_t timestamp, int flags);
+
+/**
+ * Add an index entry into a sorted list. Update the entry if the list
+ * already contains it.
+ *
+ * @param timestamp timestamp in the time base of the given stream
+ */
+int av_add_index_entry(AVStream *st, int64_t pos, int64_t timestamp,
+                       int size, int distance, int flags);
+
+
+/**
+ * Split a URL string into components.
+ *
+ * The pointers to buffers for storing individual components may be null,
+ * in order to ignore that component. Buffers for components not found are
+ * set to empty strings. If the port is not found, it is set to a negative
+ * value.
+ *
+ * @param proto the buffer for the protocol
+ * @param proto_size the size of the proto buffer
+ * @param authorization the buffer for the authorization
+ * @param authorization_size the size of the authorization buffer
+ * @param hostname the buffer for the host name
+ * @param hostname_size the size of the hostname buffer
+ * @param port_ptr a pointer to store the port number in
+ * @param path the buffer for the path
+ * @param path_size the size of the path buffer
+ * @param url the URL to split
+ */
+void av_url_split(char *proto,         int proto_size,
+                  char *authorization, int authorization_size,
+                  char *hostname,      int hostname_size,
+                  int *port_ptr,
+                  char *path,          int path_size,
+                  const char *url);
+
+#if FF_API_DUMP_FORMAT
+attribute_deprecated void dump_format(AVFormatContext *ic,
+                                      int index,
+                                      const char *url,
+                                      int is_output);
+#endif
+
+void av_dump_format(AVFormatContext *ic,
+                    int index,
+                    const char *url,
+                    int is_output);
+
+#if FF_API_PARSE_DATE
+/**
+ * Parse datestr and return a corresponding number of microseconds.
+ *
+ * @param datestr String representing a date or a duration.
+ * See av_parse_time() for the syntax of the provided string.
+ * @deprecated in favor of av_parse_time()
+ */
+attribute_deprecated
+int64_t parse_date(const char *datestr, int duration);
+#endif
+
+/**
+ * Get the current time in microseconds.
+ */
+int64_t av_gettime(void);
+
+#if FF_API_FIND_INFO_TAG
+/**
+ * @deprecated use av_find_info_tag in libavutil instead.
+ */
+attribute_deprecated int find_info_tag(char *arg, int arg_size, const char *tag1, const char *info);
+#endif
+
+/**
+ * Return in 'buf' the path with '%d' replaced by a number.
+ *
+ * Also handles the '%0nd' format where 'n' is the total number
+ * of digits and '%%'.
+ *
+ * @param buf destination buffer
+ * @param buf_size destination buffer size
+ * @param path numbered sequence string
+ * @param number frame number
+ * @return 0 if OK, -1 on format error
+ */
+int av_get_frame_filename(char *buf, int buf_size,
+                          const char *path, int number);
+
+/**
+ * Check whether filename actually is a numbered sequence generator.
+ *
+ * @param filename possible numbered sequence string
+ * @return 1 if a valid numbered sequence string, 0 otherwise
+ */
+int av_filename_number_test(const char *filename);
+
+/**
+ * Generate an SDP for an RTP session.
+ *
+ * @param ac array of AVFormatContexts describing the RTP streams. If the
+ *           array is composed by only one context, such context can contain
+ *           multiple AVStreams (one AVStream per RTP stream). Otherwise,
+ *           all the contexts in the array (an AVCodecContext per RTP stream)
+ *           must contain only one AVStream.
+ * @param n_files number of AVCodecContexts contained in ac
+ * @param buf buffer where the SDP will be stored (must be allocated by
+ *            the caller)
+ * @param size the size of the buffer
+ * @return 0 if OK, AVERROR_xxx on error
+ */
+int av_sdp_create(AVFormatContext *ac[], int n_files, char *buf, int size);
+
+#if FF_API_SDP_CREATE
+attribute_deprecated int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size);
+#endif
+
+/**
+ * Return a positive value if the given filename has one of the given
+ * extensions, 0 otherwise.
+ *
+ * @param extensions a comma-separated list of filename extensions
+ */
+int av_match_ext(const char *filename, const char *extensions);
+
+/**
+ * Test if the given container can store a codec.
+ *
+ * @param std_compliance standards compliance level, one of FF_COMPLIANCE_*
+ *
+ * @return 1 if codec with ID codec_id can be stored in ofmt, 0 if it cannot.
+ *         A negative number if this information is not available.
+ */
+int avformat_query_codec(AVOutputFormat *ofmt, enum CodecID codec_id, int std_compliance);
+
+/**
+ * @defgroup riff_fourcc RIFF FourCCs
+ * @{
+ * Get the tables mapping RIFF FourCCs to libavcodec CodecIDs. The tables are
+ * meant to be passed to av_codec_get_id()/av_codec_get_tag() as in the
+ * following code:
+ * @code
+ * uint32_t tag = MKTAG('H', '2', '6', '4');
+ * const struct AVCodecTag *table[] = { avformat_get_riff_video_tags(), 0 };
+ * enum CodecID id = av_codec_get_id(table, tag);
+ * @endcode
+ */
+/**
+ * @return the table mapping RIFF FourCCs for video to libavcodec CodecID.
+ */
+const struct AVCodecTag *avformat_get_riff_video_tags(void);
+/**
+ * @return the table mapping RIFF FourCCs for audio to CodecID.
+ */
+const struct AVCodecTag *avformat_get_riff_audio_tags(void);
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#endif /* AVFORMAT_AVFORMAT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavformat/avio.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavformat/avio.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavformat/avio.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavformat/avio.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,688 @@
+/*
+ * copyright (c) 2001 Fabrice Bellard
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#ifndef AVFORMAT_AVIO_H
+#define AVFORMAT_AVIO_H
+
+/**
+ * @file
+ * @ingroup lavf_io
+ * Buffered I/O operations
+ */
+
+#include <stdint.h>
+
+#include "libavutil/common.h"
+#include "libavutil/dict.h"
+#include "libavutil/log.h"
+
+#include "libavformat/version.h"
+
+
+#define AVIO_SEEKABLE_NORMAL 0x0001 /**< Seeking works like for a local file */
+
+/**
+ * Callback for checking whether to abort blocking functions.
+ * AVERROR_EXIT is returned in this case by the interrupted
+ * function. During blocking operations, callback is called with
+ * opaque as parameter. If the callback returns 1, the
+ * blocking operation will be aborted.
+ *
+ * No members can be added to this struct without a major bump, if
+ * new elements have been added after this struct in AVFormatContext
+ * or AVIOContext.
+ */
+typedef struct {
+    int (*callback)(void*);
+    void *opaque;
+} AVIOInterruptCB;
+
+/**
+ * Bytestream IO Context.
+ * New fields can be added to the end with minor version bumps.
+ * Removal, reordering and changes to existing fields require a major
+ * version bump.
+ * sizeof(AVIOContext) must not be used outside libav*.
+ *
+ * @note None of the function pointers in AVIOContext should be called
+ *       directly, they should only be set by the client application
+ *       when implementing custom I/O. Normally these are set to the
+ *       function pointers specified in avio_alloc_context()
+ */
+typedef struct {
+#if !FF_API_OLD_AVIO
+    /**
+     * A class for private options.
+     *
+     * If this AVIOContext is created by avio_open2(), av_class is set and
+     * passes the options down to protocols.
+     *
+     * If this AVIOContext is manually allocated, then av_class may be set by
+     * the caller.
+     *
+     * warning -- this field can be NULL, be sure to not pass this AVIOContext
+     * to any av_opt_* functions in that case.
+     */
+    AVClass *av_class;
+#endif
+    unsigned char *buffer;  /**< Start of the buffer. */
+    int buffer_size;        /**< Maximum buffer size */
+    unsigned char *buf_ptr; /**< Current position in the buffer */
+    unsigned char *buf_end; /**< End of the data, may be less than
+                                 buffer+buffer_size if the read function returned
+                                 less data than requested, e.g. for streams where
+                                 no more data has been received yet. */
+    void *opaque;           /**< A private pointer, passed to the read/write/seek/...
+                                 functions. */
+    int (*read_packet)(void *opaque, uint8_t *buf, int buf_size);
+    int (*write_packet)(void *opaque, uint8_t *buf, int buf_size);
+    int64_t (*seek)(void *opaque, int64_t offset, int whence);
+    int64_t pos;            /**< position in the file of the current buffer */
+    int must_flush;         /**< true if the next seek should flush */
+    int eof_reached;        /**< true if eof reached */
+    int write_flag;         /**< true if open for writing */
+#if FF_API_OLD_AVIO
+    attribute_deprecated int is_streamed;
+#endif
+    int max_packet_size;
+    unsigned long checksum;
+    unsigned char *checksum_ptr;
+    unsigned long (*update_checksum)(unsigned long checksum, const uint8_t *buf, unsigned int size);
+    int error;              /**< contains the error code or 0 if no error happened */
+    /**
+     * Pause or resume playback for network streaming protocols - e.g. MMS.
+     */
+    int (*read_pause)(void *opaque, int pause);
+    /**
+     * Seek to a given timestamp in stream with the specified stream_index.
+     * Needed for some network streaming protocols which don't support seeking
+     * to byte position.
+     */
+    int64_t (*read_seek)(void *opaque, int stream_index,
+                         int64_t timestamp, int flags);
+    /**
+     * A combination of AVIO_SEEKABLE_ flags or 0 when the stream is not seekable.
+     */
+    int seekable;
+} AVIOContext;
+
+/* unbuffered I/O */
+
+#if FF_API_OLD_AVIO
+/**
+ * URL Context.
+ * New fields can be added to the end with minor version bumps.
+ * Removal, reordering and changes to existing fields require a major
+ * version bump.
+ * sizeof(URLContext) must not be used outside libav*.
+ * @deprecated This struct will be made private
+ */
+typedef struct URLContext {
+    const AVClass *av_class; ///< information for av_log(). Set by url_open().
+    struct URLProtocol *prot;
+    int flags;
+    int is_streamed;  /**< true if streamed (no seek possible), default = false */
+    int max_packet_size;  /**< if non zero, the stream is packetized with this max packet size */
+    void *priv_data;
+    char *filename; /**< specified URL */
+    int is_connected;
+    AVIOInterruptCB interrupt_callback;
+} URLContext;
+
+#define URL_PROTOCOL_FLAG_NESTED_SCHEME 1 /*< The protocol name can be the first part of a nested protocol scheme */
+#define URL_PROTOCOL_FLAG_NETWORK       2 /*< The protocol uses network */
+
+/**
+ * @deprecated This struct is to be made private. Use the higher-level
+ *             AVIOContext-based API instead.
+ */
+typedef struct URLProtocol {
+    const char *name;
+    int (*url_open)(URLContext *h, const char *url, int flags);
+    int (*url_read)(URLContext *h, unsigned char *buf, int size);
+    int (*url_write)(URLContext *h, const unsigned char *buf, int size);
+    int64_t (*url_seek)(URLContext *h, int64_t pos, int whence);
+    int (*url_close)(URLContext *h);
+    struct URLProtocol *next;
+    int (*url_read_pause)(URLContext *h, int pause);
+    int64_t (*url_read_seek)(URLContext *h, int stream_index,
+                             int64_t timestamp, int flags);
+    int (*url_get_file_handle)(URLContext *h);
+    int priv_data_size;
+    const AVClass *priv_data_class;
+    int flags;
+    int (*url_check)(URLContext *h, int mask);
+} URLProtocol;
+
+typedef struct URLPollEntry {
+    URLContext *handle;
+    int events;
+    int revents;
+} URLPollEntry;
+
+/* not implemented */
+attribute_deprecated int url_poll(URLPollEntry *poll_table, int n, int timeout);
+
+/**
+ * @name URL open modes
+ * The flags argument to url_open and cosins must be one of the following
+ * constants, optionally ORed with other flags.
+ * @{
+ */
+#define URL_RDONLY 1  /**< read-only */
+#define URL_WRONLY 2  /**< write-only */
+#define URL_RDWR   (URL_RDONLY|URL_WRONLY)  /**< read-write */
+/**
+ * @}
+ */
+
+/**
+ * Use non-blocking mode.
+ * If this flag is set, operations on the context will return
+ * AVERROR(EAGAIN) if they can not be performed immediately.
+ * If this flag is not set, operations on the context will never return
+ * AVERROR(EAGAIN).
+ * Note that this flag does not affect the opening/connecting of the
+ * context. Connecting a protocol will always block if necessary (e.g. on
+ * network protocols) but never hang (e.g. on busy devices).
+ * Warning: non-blocking protocols is work-in-progress; this flag may be
+ * silently ignored.
+ */
+#define URL_FLAG_NONBLOCK 8
+
+typedef int URLInterruptCB(void);
+extern URLInterruptCB *url_interrupt_cb;
+
+/**
+ * @defgroup old_url_funcs Old url_* functions
+ * The following functions are deprecated. Use the buffered API based on #AVIOContext instead.
+ * @{
+ * @ingroup lavf_io
+ */
+attribute_deprecated int url_open_protocol (URLContext **puc, struct URLProtocol *up,
+                                            const char *url, int flags);
+attribute_deprecated int url_alloc(URLContext **h, const char *url, int flags);
+attribute_deprecated int url_connect(URLContext *h);
+attribute_deprecated int url_open(URLContext **h, const char *url, int flags);
+attribute_deprecated int url_read(URLContext *h, unsigned char *buf, int size);
+attribute_deprecated int url_read_complete(URLContext *h, unsigned char *buf, int size);
+attribute_deprecated int url_write(URLContext *h, const unsigned char *buf, int size);
+attribute_deprecated int64_t url_seek(URLContext *h, int64_t pos, int whence);
+attribute_deprecated int url_close(URLContext *h);
+attribute_deprecated int64_t url_filesize(URLContext *h);
+attribute_deprecated int url_get_file_handle(URLContext *h);
+attribute_deprecated int url_get_max_packet_size(URLContext *h);
+attribute_deprecated void url_get_filename(URLContext *h, char *buf, int buf_size);
+attribute_deprecated int av_url_read_pause(URLContext *h, int pause);
+attribute_deprecated int64_t av_url_read_seek(URLContext *h, int stream_index,
+                                              int64_t timestamp, int flags);
+attribute_deprecated void url_set_interrupt_cb(int (*interrupt_cb)(void));
+/**
+ * If protocol is NULL, returns the first registered protocol,
+ * if protocol is non-NULL, returns the next registered protocol after protocol,
+ * or NULL if protocol is the last one.
+ */
+attribute_deprecated URLProtocol *av_protocol_next(URLProtocol *p);
+/**
+ * Register the URLProtocol protocol.
+ *
+ * @param size the size of the URLProtocol struct referenced
+ */
+attribute_deprecated int av_register_protocol2(URLProtocol *protocol, int size);
+/**
+ * @}
+ */
+
+
+typedef attribute_deprecated AVIOContext ByteIOContext;
+
+attribute_deprecated int init_put_byte(AVIOContext *s,
+                  unsigned char *buffer,
+                  int buffer_size,
+                  int write_flag,
+                  void *opaque,
+                  int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
+                  int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
+                  int64_t (*seek)(void *opaque, int64_t offset, int whence));
+attribute_deprecated AVIOContext *av_alloc_put_byte(
+                  unsigned char *buffer,
+                  int buffer_size,
+                  int write_flag,
+                  void *opaque,
+                  int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
+                  int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
+                  int64_t (*seek)(void *opaque, int64_t offset, int whence));
+
+/**
+ * @defgroup old_avio_funcs Old put_/get_*() functions
+ * The following functions are deprecated. Use the "avio_"-prefixed functions instead.
+ * @{
+ * @ingroup lavf_io
+ */
+attribute_deprecated int          get_buffer(AVIOContext *s, unsigned char *buf, int size);
+attribute_deprecated int          get_partial_buffer(AVIOContext *s, unsigned char *buf, int size);
+attribute_deprecated int          get_byte(AVIOContext *s);
+attribute_deprecated unsigned int get_le16(AVIOContext *s);
+attribute_deprecated unsigned int get_le24(AVIOContext *s);
+attribute_deprecated unsigned int get_le32(AVIOContext *s);
+attribute_deprecated uint64_t     get_le64(AVIOContext *s);
+attribute_deprecated unsigned int get_be16(AVIOContext *s);
+attribute_deprecated unsigned int get_be24(AVIOContext *s);
+attribute_deprecated unsigned int get_be32(AVIOContext *s);
+attribute_deprecated uint64_t     get_be64(AVIOContext *s);
+
+attribute_deprecated void         put_byte(AVIOContext *s, int b);
+attribute_deprecated void         put_nbyte(AVIOContext *s, int b, int count);
+attribute_deprecated void         put_buffer(AVIOContext *s, const unsigned char *buf, int size);
+attribute_deprecated void         put_le64(AVIOContext *s, uint64_t val);
+attribute_deprecated void         put_be64(AVIOContext *s, uint64_t val);
+attribute_deprecated void         put_le32(AVIOContext *s, unsigned int val);
+attribute_deprecated void         put_be32(AVIOContext *s, unsigned int val);
+attribute_deprecated void         put_le24(AVIOContext *s, unsigned int val);
+attribute_deprecated void         put_be24(AVIOContext *s, unsigned int val);
+attribute_deprecated void         put_le16(AVIOContext *s, unsigned int val);
+attribute_deprecated void         put_be16(AVIOContext *s, unsigned int val);
+attribute_deprecated void         put_tag(AVIOContext *s, const char *tag);
+/**
+ * @}
+ */
+
+attribute_deprecated int     av_url_read_fpause(AVIOContext *h,    int pause);
+attribute_deprecated int64_t av_url_read_fseek (AVIOContext *h,    int stream_index,
+                                                int64_t timestamp, int flags);
+
+/**
+ * @defgroup old_url_f_funcs Old url_f* functions
+ * The following functions are deprecated, use the "avio_"-prefixed functions instead.
+ * @{
+ * @ingroup lavf_io
+ */
+attribute_deprecated int url_fopen( AVIOContext **s, const char *url, int flags);
+attribute_deprecated int url_fclose(AVIOContext *s);
+attribute_deprecated int64_t url_fseek(AVIOContext *s, int64_t offset, int whence);
+attribute_deprecated int url_fskip(AVIOContext *s, int64_t offset);
+attribute_deprecated int64_t url_ftell(AVIOContext *s);
+attribute_deprecated int64_t url_fsize(AVIOContext *s);
+#define URL_EOF (-1)
+attribute_deprecated int url_fgetc(AVIOContext *s);
+attribute_deprecated int url_setbufsize(AVIOContext *s, int buf_size);
+attribute_deprecated int url_fprintf(AVIOContext *s, const char *fmt, ...) av_printf_format(2, 3);
+attribute_deprecated void put_flush_packet(AVIOContext *s);
+attribute_deprecated int url_open_dyn_buf(AVIOContext **s);
+attribute_deprecated int url_open_dyn_packet_buf(AVIOContext **s, int max_packet_size);
+attribute_deprecated int url_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer);
+attribute_deprecated int url_fdopen(AVIOContext **s, URLContext *h);
+/**
+ * @}
+ */
+
+/**
+ * @deprecated use AVIOContext.eof_reached
+ */
+attribute_deprecated int url_feof(AVIOContext *s);
+attribute_deprecated int url_ferror(AVIOContext *s);
+
+attribute_deprecated int udp_set_remote_url(URLContext *h, const char *uri);
+attribute_deprecated int udp_get_local_port(URLContext *h);
+
+attribute_deprecated void init_checksum(AVIOContext *s,
+                   unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len),
+                   unsigned long checksum);
+attribute_deprecated unsigned long get_checksum(AVIOContext *s);
+attribute_deprecated void put_strz(AVIOContext *s, const char *buf);
+/** @note unlike fgets, the EOL character is not returned and a whole
+    line is parsed. return NULL if first char read was EOF */
+attribute_deprecated char *url_fgets(AVIOContext *s, char *buf, int buf_size);
+/**
+ * @deprecated use avio_get_str instead
+ */
+attribute_deprecated char *get_strz(AVIOContext *s, char *buf, int maxlen);
+/**
+ * @deprecated Use AVIOContext.seekable field directly.
+ */
+attribute_deprecated static inline int url_is_streamed(AVIOContext *s)
+{
+    return !s->seekable;
+}
+attribute_deprecated URLContext *url_fileno(AVIOContext *s);
+
+/**
+ * @deprecated use AVIOContext.max_packet_size directly.
+ */
+attribute_deprecated int url_fget_max_packet_size(AVIOContext *s);
+
+attribute_deprecated int url_open_buf(AVIOContext **s, uint8_t *buf, int buf_size, int flags);
+
+/** return the written or read size */
+attribute_deprecated int url_close_buf(AVIOContext *s);
+
+/**
+ * Return a non-zero value if the resource indicated by url
+ * exists, 0 otherwise.
+ * @deprecated Use avio_check instead.
+ */
+attribute_deprecated int url_exist(const char *url);
+#endif // FF_API_OLD_AVIO
+
+/**
+ * Return AVIO_FLAG_* access flags corresponding to the access permissions
+ * of the resource in url, or a negative value corresponding to an
+ * AVERROR code in case of failure. The returned access flags are
+ * masked by the value in flags.
+ *
+ * @note This function is intrinsically unsafe, in the sense that the
+ * checked resource may change its existence or permission status from
+ * one call to another. Thus you should not trust the returned value,
+ * unless you are sure that no other processes are accessing the
+ * checked resource.
+ */
+int avio_check(const char *url, int flags);
+
+#if FF_API_OLD_INTERRUPT_CB
+/**
+ * The callback is called in blocking functions to test regulary if
+ * asynchronous interruption is needed. AVERROR_EXIT is returned
+ * in this case by the interrupted function. 'NULL' means no interrupt
+ * callback is given.
+ * @deprecated Use interrupt_callback in AVFormatContext/avio_open2
+ *             instead.
+ */
+attribute_deprecated void avio_set_interrupt_cb(int (*interrupt_cb)(void));
+#endif
+
+/**
+ * Allocate and initialize an AVIOContext for buffered I/O. It must be later
+ * freed with av_free().
+ *
+ * @param buffer Memory block for input/output operations via AVIOContext.
+ *        The buffer must be allocated with av_malloc() and friends.
+ * @param buffer_size The buffer size is very important for performance.
+ *        For protocols with fixed blocksize it should be set to this blocksize.
+ *        For others a typical size is a cache page, e.g. 4kb.
+ * @param write_flag Set to 1 if the buffer should be writable, 0 otherwise.
+ * @param opaque An opaque pointer to user-specific data.
+ * @param read_packet  A function for refilling the buffer, may be NULL.
+ * @param write_packet A function for writing the buffer contents, may be NULL.
+ * @param seek A function for seeking to specified byte position, may be NULL.
+ *
+ * @return Allocated AVIOContext or NULL on failure.
+ */
+AVIOContext *avio_alloc_context(
+                  unsigned char *buffer,
+                  int buffer_size,
+                  int write_flag,
+                  void *opaque,
+                  int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
+                  int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
+                  int64_t (*seek)(void *opaque, int64_t offset, int whence));
+
+void avio_w8(AVIOContext *s, int b);
+void avio_write(AVIOContext *s, const unsigned char *buf, int size);
+void avio_wl64(AVIOContext *s, uint64_t val);
+void avio_wb64(AVIOContext *s, uint64_t val);
+void avio_wl32(AVIOContext *s, unsigned int val);
+void avio_wb32(AVIOContext *s, unsigned int val);
+void avio_wl24(AVIOContext *s, unsigned int val);
+void avio_wb24(AVIOContext *s, unsigned int val);
+void avio_wl16(AVIOContext *s, unsigned int val);
+void avio_wb16(AVIOContext *s, unsigned int val);
+
+/**
+ * Write a NULL-terminated string.
+ * @return number of bytes written.
+ */
+int avio_put_str(AVIOContext *s, const char *str);
+
+/**
+ * Convert an UTF-8 string to UTF-16LE and write it.
+ * @return number of bytes written.
+ */
+int avio_put_str16le(AVIOContext *s, const char *str);
+
+/**
+ * Passing this as the "whence" parameter to a seek function causes it to
+ * return the filesize without seeking anywhere. Supporting this is optional.
+ * If it is not supported then the seek function will return <0.
+ */
+#define AVSEEK_SIZE 0x10000
+
+/**
+ * Oring this flag as into the "whence" parameter to a seek function causes it to
+ * seek by any means (like reopening and linear reading) or other normally unreasonble
+ * means that can be extreemly slow.
+ * This may be ignored by the seek code.
+ */
+#define AVSEEK_FORCE 0x20000
+
+/**
+ * fseek() equivalent for AVIOContext.
+ * @return new position or AVERROR.
+ */
+int64_t avio_seek(AVIOContext *s, int64_t offset, int whence);
+
+/**
+ * Skip given number of bytes forward
+ * @return new position or AVERROR.
+ */
+static av_always_inline int64_t avio_skip(AVIOContext *s, int64_t offset)
+{
+    return avio_seek(s, offset, SEEK_CUR);
+}
+
+/**
+ * ftell() equivalent for AVIOContext.
+ * @return position or AVERROR.
+ */
+static av_always_inline int64_t avio_tell(AVIOContext *s)
+{
+    return avio_seek(s, 0, SEEK_CUR);
+}
+
+/**
+ * Get the filesize.
+ * @return filesize or AVERROR
+ */
+int64_t avio_size(AVIOContext *s);
+
+/** @warning currently size is limited */
+int avio_printf(AVIOContext *s, const char *fmt, ...) av_printf_format(2, 3);
+
+void avio_flush(AVIOContext *s);
+
+
+/**
+ * Read size bytes from AVIOContext into buf.
+ * @return number of bytes read or AVERROR
+ */
+int avio_read(AVIOContext *s, unsigned char *buf, int size);
+
+/**
+ * @name Functions for reading from AVIOContext
+ * @{
+ *
+ * @note return 0 if EOF, so you cannot use it if EOF handling is
+ *       necessary
+ */
+int          avio_r8  (AVIOContext *s);
+unsigned int avio_rl16(AVIOContext *s);
+unsigned int avio_rl24(AVIOContext *s);
+unsigned int avio_rl32(AVIOContext *s);
+uint64_t     avio_rl64(AVIOContext *s);
+unsigned int avio_rb16(AVIOContext *s);
+unsigned int avio_rb24(AVIOContext *s);
+unsigned int avio_rb32(AVIOContext *s);
+uint64_t     avio_rb64(AVIOContext *s);
+/**
+ * @}
+ */
+
+/**
+ * Read a string from pb into buf. The reading will terminate when either
+ * a NULL character was encountered, maxlen bytes have been read, or nothing
+ * more can be read from pb. The result is guaranteed to be NULL-terminated, it
+ * will be truncated if buf is too small.
+ * Note that the string is not interpreted or validated in any way, it
+ * might get truncated in the middle of a sequence for multi-byte encodings.
+ *
+ * @return number of bytes read (is always <= maxlen).
+ * If reading ends on EOF or error, the return value will be one more than
+ * bytes actually read.
+ */
+int avio_get_str(AVIOContext *pb, int maxlen, char *buf, int buflen);
+
+/**
+ * Read a UTF-16 string from pb and convert it to UTF-8.
+ * The reading will terminate when either a null or invalid character was
+ * encountered or maxlen bytes have been read.
+ * @return number of bytes read (is always <= maxlen)
+ */
+int avio_get_str16le(AVIOContext *pb, int maxlen, char *buf, int buflen);
+int avio_get_str16be(AVIOContext *pb, int maxlen, char *buf, int buflen);
+
+
+/**
+ * @name URL open modes
+ * The flags argument to avio_open must be one of the following
+ * constants, optionally ORed with other flags.
+ * @{
+ */
+#define AVIO_FLAG_READ  1                                      /**< read-only */
+#define AVIO_FLAG_WRITE 2                                      /**< write-only */
+#define AVIO_FLAG_READ_WRITE (AVIO_FLAG_READ|AVIO_FLAG_WRITE)  /**< read-write pseudo flag */
+/**
+ * @}
+ */
+
+/**
+ * Use non-blocking mode.
+ * If this flag is set, operations on the context will return
+ * AVERROR(EAGAIN) if they can not be performed immediately.
+ * If this flag is not set, operations on the context will never return
+ * AVERROR(EAGAIN).
+ * Note that this flag does not affect the opening/connecting of the
+ * context. Connecting a protocol will always block if necessary (e.g. on
+ * network protocols) but never hang (e.g. on busy devices).
+ * Warning: non-blocking protocols is work-in-progress; this flag may be
+ * silently ignored.
+ */
+#define AVIO_FLAG_NONBLOCK 8
+
+/**
+ * Create and initialize a AVIOContext for accessing the
+ * resource indicated by url.
+ * @note When the resource indicated by url has been opened in
+ * read+write mode, the AVIOContext can be used only for writing.
+ *
+ * @param s Used to return the pointer to the created AVIOContext.
+ * In case of failure the pointed to value is set to NULL.
+ * @param flags flags which control how the resource indicated by url
+ * is to be opened
+ * @return 0 in case of success, a negative value corresponding to an
+ * AVERROR code in case of failure
+ */
+int avio_open(AVIOContext **s, const char *url, int flags);
+
+/**
+ * Create and initialize a AVIOContext for accessing the
+ * resource indicated by url.
+ * @note When the resource indicated by url has been opened in
+ * read+write mode, the AVIOContext can be used only for writing.
+ *
+ * @param s Used to return the pointer to the created AVIOContext.
+ * In case of failure the pointed to value is set to NULL.
+ * @param flags flags which control how the resource indicated by url
+ * is to be opened
+ * @param int_cb an interrupt callback to be used at the protocols level
+ * @param options  A dictionary filled with protocol-private options. On return
+ * this parameter will be destroyed and replaced with a dict containing options
+ * that were not found. May be NULL.
+ * @return 0 in case of success, a negative value corresponding to an
+ * AVERROR code in case of failure
+ */
+int avio_open2(AVIOContext **s, const char *url, int flags,
+               const AVIOInterruptCB *int_cb, AVDictionary **options);
+
+/**
+ * Close the resource accessed by the AVIOContext s and free it.
+ * This function can only be used if s was opened by avio_open().
+ *
+ * @return 0 on success, an AVERROR < 0 on error.
+ */
+int avio_close(AVIOContext *s);
+
+/**
+ * Open a write only memory stream.
+ *
+ * @param s new IO context
+ * @return zero if no error.
+ */
+int avio_open_dyn_buf(AVIOContext **s);
+
+/**
+ * Return the written size and a pointer to the buffer. The buffer
+ * must be freed with av_free().
+ * Padding of FF_INPUT_BUFFER_PADDING_SIZE is added to the buffer.
+ *
+ * @param s IO context
+ * @param pbuffer pointer to a byte buffer
+ * @return the length of the byte buffer
+ */
+int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer);
+
+/**
+ * Iterate through names of available protocols.
+ *
+ * @param opaque A private pointer representing current protocol.
+ *        It must be a pointer to NULL on first iteration and will
+ *        be updated by successive calls to avio_enum_protocols.
+ * @param output If set to 1, iterate over output protocols,
+ *               otherwise over input protocols.
+ *
+ * @return A static string containing the name of current protocol or NULL
+ */
+const char *avio_enum_protocols(void **opaque, int output);
+
+/**
+ * Pause and resume playing - only meaningful if using a network streaming
+ * protocol (e.g. MMS).
+ * @param pause 1 for pause, 0 for resume
+ */
+int     avio_pause(AVIOContext *h, int pause);
+
+/**
+ * Seek to a given timestamp relative to some component stream.
+ * Only meaningful if using a network streaming protocol (e.g. MMS.).
+ * @param stream_index The stream index that the timestamp is relative to.
+ *        If stream_index is (-1) the timestamp should be in AV_TIME_BASE
+ *        units from the beginning of the presentation.
+ *        If a stream_index >= 0 is used and the protocol does not support
+ *        seeking based on component streams, the call will fail with ENOTSUP.
+ * @param timestamp timestamp in AVStream.time_base units
+ *        or if there is no stream specified then in AV_TIME_BASE units.
+ * @param flags Optional combination of AVSEEK_FLAG_BACKWARD, AVSEEK_FLAG_BYTE
+ *        and AVSEEK_FLAG_ANY. The protocol may silently ignore
+ *        AVSEEK_FLAG_BACKWARD and AVSEEK_FLAG_ANY, but AVSEEK_FLAG_BYTE will
+ *        fail with ENOTSUP if used and not supported.
+ * @return >= 0 on success
+ * @see AVInputFormat::read_seek
+ */
+int64_t avio_seek_time(AVIOContext *h, int stream_index,
+                       int64_t timestamp, int flags);
+
+#endif /* AVFORMAT_AVIO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavformat/version.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavformat/version.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavformat/version.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavformat/version.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,126 @@
+/*
+ * Version macros.
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFORMAT_VERSION_H
+#define AVFORMAT_VERSION_H
+
+/**
+ * @file
+ * @ingroup libavf
+ * Libavformat version macros
+ */
+
+#include "libavutil/avutil.h"
+
+#define LIBAVFORMAT_VERSION_MAJOR 53
+#define LIBAVFORMAT_VERSION_MINOR 21
+#define LIBAVFORMAT_VERSION_MICRO  1
+
+#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
+                                               LIBAVFORMAT_VERSION_MINOR, \
+                                               LIBAVFORMAT_VERSION_MICRO)
+#define LIBAVFORMAT_VERSION     AV_VERSION(LIBAVFORMAT_VERSION_MAJOR,   \
+                                           LIBAVFORMAT_VERSION_MINOR,   \
+                                           LIBAVFORMAT_VERSION_MICRO)
+#define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
+
+#define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
+
+/**
+ * Those FF_API_* defines are not part of public API.
+ * They may change, break or disappear at any time.
+ */
+#ifndef FF_API_OLD_METADATA2
+#define FF_API_OLD_METADATA2           (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_OLD_AVIO
+#define FF_API_OLD_AVIO                (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_DUMP_FORMAT
+#define FF_API_DUMP_FORMAT             (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_PARSE_DATE
+#define FF_API_PARSE_DATE              (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_FIND_INFO_TAG
+#define FF_API_FIND_INFO_TAG           (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_PKT_DUMP
+#define FF_API_PKT_DUMP                (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_GUESS_IMG2_CODEC
+#define FF_API_GUESS_IMG2_CODEC        (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_SDP_CREATE
+#define FF_API_SDP_CREATE              (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_FORMAT_PARAMETERS
+#define FF_API_FORMAT_PARAMETERS       (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_FLAG_RTP_HINT
+#define FF_API_FLAG_RTP_HINT           (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_AVSTREAM_QUALITY
+#define FF_API_AVSTREAM_QUALITY        (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_LOOP_INPUT
+#define FF_API_LOOP_INPUT              (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_LOOP_OUTPUT
+#define FF_API_LOOP_OUTPUT             (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_TIMESTAMP
+#define FF_API_TIMESTAMP               (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_FILESIZE
+#define FF_API_FILESIZE                (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_MUXRATE
+#define FF_API_MUXRATE                 (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_RTSP_URL_OPTIONS
+#define FF_API_RTSP_URL_OPTIONS        (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_NEW_STREAM
+#define FF_API_NEW_STREAM              (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_PRELOAD
+#define FF_API_PRELOAD                 (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_STREAM_COPY
+#define FF_API_STREAM_COPY             (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_SEEK_PUBLIC
+#define FF_API_SEEK_PUBLIC             (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_REORDER_PRIVATE
+#define FF_API_REORDER_PRIVATE         (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_OLD_INTERRUPT_CB
+#define FF_API_OLD_INTERRUPT_CB        (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_SET_PTS_INFO
+#define FF_API_SET_PTS_INFO            (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_CLOSE_INPUT_FILE
+#define FF_API_CLOSE_INPUT_FILE        (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+
+#endif /* AVFORMAT_VERSION_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/adler32.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/adler32.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/adler32.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/adler32.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,43 @@
+/*
+ * copyright (c) 2006 Mans Rullgard
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_ADLER32_H
+#define AVUTIL_ADLER32_H
+
+#include <stdint.h>
+#include "attributes.h"
+
+/**
+ * @ingroup lavu_crypto
+ * Calculate the Adler32 checksum of a buffer.
+ *
+ * Passing the return value to a subsequent av_adler32_update() call
+ * allows the checksum of multiple buffers to be calculated as though
+ * they were concatenated.
+ *
+ * @param adler initial checksum value
+ * @param buf   pointer to input buffer
+ * @param len   size of input buffer
+ * @return      updated checksum
+ */
+unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf,
+                                unsigned int len) av_pure;
+
+#endif /* AVUTIL_ADLER32_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/aes.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/aes.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/aes.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/aes.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,57 @@
+/*
+ * copyright (c) 2007 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_AES_H
+#define AVUTIL_AES_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_aes AES
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+extern const int av_aes_size;
+
+struct AVAES;
+
+/**
+ * Initialize an AVAES context.
+ * @param key_bits 128, 192 or 256
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+int av_aes_init(struct AVAES *a, const uint8_t *key, int key_bits, int decrypt);
+
+/**
+ * Encrypt or decrypt a buffer using a previously initialized context.
+ * @param count number of 16 byte blocks
+ * @param dst destination array, can be equal to src
+ * @param src source array, can be equal to dst
+ * @param iv initialization vector for CBC mode, if NULL then ECB will be used
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+void av_aes_crypt(struct AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_AES_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/attributes.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/attributes.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/attributes.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/attributes.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,136 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Macro definitions for various function/variable attributes
+ */
+
+#ifndef AVUTIL_ATTRIBUTES_H
+#define AVUTIL_ATTRIBUTES_H
+
+#ifdef __GNUC__
+#    define AV_GCC_VERSION_AT_LEAST(x,y) (__GNUC__ > x || __GNUC__ == x && __GNUC_MINOR__ >= y)
+#else
+#    define AV_GCC_VERSION_AT_LEAST(x,y) 0
+#endif
+
+#ifndef av_always_inline
+#if AV_GCC_VERSION_AT_LEAST(3,1)
+#    define av_always_inline __attribute__((always_inline)) inline
+#else
+#    define av_always_inline inline
+#endif
+#endif
+
+#ifndef av_noinline
+#if AV_GCC_VERSION_AT_LEAST(3,1)
+#    define av_noinline __attribute__((noinline))
+#else
+#    define av_noinline
+#endif
+#endif
+
+#ifndef av_pure
+#if AV_GCC_VERSION_AT_LEAST(3,1)
+#    define av_pure __attribute__((pure))
+#else
+#    define av_pure
+#endif
+#endif
+
+#ifndef av_const
+#if AV_GCC_VERSION_AT_LEAST(2,6)
+#    define av_const __attribute__((const))
+#else
+#    define av_const
+#endif
+#endif
+
+#ifndef av_cold
+#if AV_GCC_VERSION_AT_LEAST(4,3)
+#    define av_cold __attribute__((cold))
+#else
+#    define av_cold
+#endif
+#endif
+
+#ifndef av_flatten
+#if AV_GCC_VERSION_AT_LEAST(4,1)
+#    define av_flatten __attribute__((flatten))
+#else
+#    define av_flatten
+#endif
+#endif
+
+#ifndef attribute_deprecated
+#if AV_GCC_VERSION_AT_LEAST(3,1)
+#    define attribute_deprecated __attribute__((deprecated))
+#else
+#    define attribute_deprecated
+#endif
+#endif
+
+#ifndef av_unused
+#if defined(__GNUC__)
+#    define av_unused __attribute__((unused))
+#else
+#    define av_unused
+#endif
+#endif
+
+/**
+ * Mark a variable as used and prevent the compiler from optimizing it
+ * away.  This is useful for variables accessed only from inline
+ * assembler without the compiler being aware.
+ */
+#ifndef av_used
+#if AV_GCC_VERSION_AT_LEAST(3,1)
+#    define av_used __attribute__((used))
+#else
+#    define av_used
+#endif
+#endif
+
+#ifndef av_alias
+#if AV_GCC_VERSION_AT_LEAST(3,3)
+#   define av_alias __attribute__((may_alias))
+#else
+#   define av_alias
+#endif
+#endif
+
+#ifndef av_uninit
+#if defined(__GNUC__) && !defined(__ICC)
+#    define av_uninit(x) x=x
+#else
+#    define av_uninit(x) x
+#endif
+#endif
+
+#ifdef __GNUC__
+#    define av_builtin_constant_p __builtin_constant_p
+#    define av_printf_format(fmtpos, attrpos) __attribute__((__format__(__printf__, fmtpos, attrpos)))
+#else
+#    define av_builtin_constant_p(x) 0
+#    define av_printf_format(fmtpos, attrpos)
+#endif
+
+#endif /* AVUTIL_ATTRIBUTES_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/audioconvert.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/audioconvert.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/audioconvert.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/audioconvert.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ * Copyright (c) 2008 Peter Ross
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_AUDIOCONVERT_H
+#define AVUTIL_AUDIOCONVERT_H
+
+#include <stdint.h>
+
+/**
+ * @file
+ * audio conversion routines
+ */
+
+/**
+ * @addtogroup lavu_audio
+ * @{
+ */
+
+/**
+ * @defgroup channel_masks Audio channel masks
+ * @{
+ */
+#define AV_CH_FRONT_LEFT             0x00000001
+#define AV_CH_FRONT_RIGHT            0x00000002
+#define AV_CH_FRONT_CENTER           0x00000004
+#define AV_CH_LOW_FREQUENCY          0x00000008
+#define AV_CH_BACK_LEFT              0x00000010
+#define AV_CH_BACK_RIGHT             0x00000020
+#define AV_CH_FRONT_LEFT_OF_CENTER   0x00000040
+#define AV_CH_FRONT_RIGHT_OF_CENTER  0x00000080
+#define AV_CH_BACK_CENTER            0x00000100
+#define AV_CH_SIDE_LEFT              0x00000200
+#define AV_CH_SIDE_RIGHT             0x00000400
+#define AV_CH_TOP_CENTER             0x00000800
+#define AV_CH_TOP_FRONT_LEFT         0x00001000
+#define AV_CH_TOP_FRONT_CENTER       0x00002000
+#define AV_CH_TOP_FRONT_RIGHT        0x00004000
+#define AV_CH_TOP_BACK_LEFT          0x00008000
+#define AV_CH_TOP_BACK_CENTER        0x00010000
+#define AV_CH_TOP_BACK_RIGHT         0x00020000
+#define AV_CH_STEREO_LEFT            0x20000000  ///< Stereo downmix.
+#define AV_CH_STEREO_RIGHT           0x40000000  ///< See AV_CH_STEREO_LEFT.
+#define AV_CH_WIDE_LEFT              0x0000000080000000ULL
+#define AV_CH_WIDE_RIGHT             0x0000000100000000ULL
+#define AV_CH_SURROUND_DIRECT_LEFT   0x0000000200000000ULL
+#define AV_CH_SURROUND_DIRECT_RIGHT  0x0000000400000000ULL
+
+/** Channel mask value used for AVCodecContext.request_channel_layout
+    to indicate that the user requests the channel order of the decoder output
+    to be the native codec channel order. */
+#define AV_CH_LAYOUT_NATIVE          0x8000000000000000ULL
+
+/**
+ * @}
+ * @defgroup channel_mask_c Audio channel convenience macros
+ * @{
+ * */
+#define AV_CH_LAYOUT_MONO              (AV_CH_FRONT_CENTER)
+#define AV_CH_LAYOUT_STEREO            (AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT)
+#define AV_CH_LAYOUT_2POINT1           (AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_2_1               (AV_CH_LAYOUT_STEREO|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_SURROUND          (AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER)
+#define AV_CH_LAYOUT_3POINT1           (AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_4POINT0           (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_4POINT1           (AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_2_2               (AV_CH_LAYOUT_STEREO|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
+#define AV_CH_LAYOUT_QUAD              (AV_CH_LAYOUT_STEREO|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_5POINT0           (AV_CH_LAYOUT_SURROUND|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
+#define AV_CH_LAYOUT_5POINT1           (AV_CH_LAYOUT_5POINT0|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_5POINT0_BACK      (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_5POINT1_BACK      (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_6POINT0           (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_6POINT0_FRONT     (AV_CH_LAYOUT_2_2|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_HEXAGONAL         (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_6POINT1           (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_6POINT1_BACK      (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_6POINT1_FRONT     (AV_CH_LAYOUT_6POINT0_FRONT|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_7POINT0           (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_7POINT0_FRONT     (AV_CH_LAYOUT_5POINT0|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_7POINT1           (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_7POINT1_WIDE      (AV_CH_LAYOUT_5POINT1|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_OCTAGONAL         (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_STEREO_DOWNMIX    (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT)
+
+/**
+ * @}
+ */
+
+/**
+ * Return a channel layout id that matches name, 0 if no match.
+ */
+uint64_t av_get_channel_layout(const char *name);
+
+/**
+ * Return a description of a channel layout.
+ * If nb_channels is <= 0, it is guessed from the channel_layout.
+ *
+ * @param buf put here the string containing the channel layout
+ * @param buf_size size in bytes of the buffer
+ */
+void av_get_channel_layout_string(char *buf, int buf_size, int nb_channels, uint64_t channel_layout);
+
+/**
+ * Return the number of channels in the channel layout.
+ */
+int av_get_channel_layout_nb_channels(uint64_t channel_layout);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_AUDIOCONVERT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/audio_fifo.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/audio_fifo.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/audio_fifo.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/audio_fifo.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,146 @@
+/*
+ * Audio FIFO
+ * Copyright (c) 2012 Justin Ruggles <justin.ruggles@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Audio FIFO Buffer
+ */
+
+#ifndef AVUTIL_AUDIO_FIFO_H
+#define AVUTIL_AUDIO_FIFO_H
+
+#include "avutil.h"
+#include "fifo.h"
+#include "samplefmt.h"
+
+/**
+ * @addtogroup lavu_audio
+ * @{
+ */
+
+/**
+ * Context for an Audio FIFO Buffer.
+ *
+ * - Operates at the sample level rather than the byte level.
+ * - Supports multiple channels with either planar or packed sample format.
+ * - Automatic reallocation when writing to a full buffer.
+ */
+typedef struct AVAudioFifo AVAudioFifo;
+
+/**
+ * Free an AVAudioFifo.
+ *
+ * @param af  AVAudioFifo to free
+ */
+void av_audio_fifo_free(AVAudioFifo *af);
+
+/**
+ * Allocate an AVAudioFifo.
+ *
+ * @param sample_fmt  sample format
+ * @param channels    number of channels
+ * @param nb_samples  initial allocation size, in samples
+ * @return            newly allocated AVAudioFifo, or NULL on error
+ */
+AVAudioFifo *av_audio_fifo_alloc(enum AVSampleFormat sample_fmt, int channels,
+                                 int nb_samples);
+
+/**
+ * Reallocate an AVAudioFifo.
+ *
+ * @param af          AVAudioFifo to reallocate
+ * @param nb_samples  new allocation size, in samples
+ * @return            0 if OK, or negative AVERROR code on failure
+ */
+int av_audio_fifo_realloc(AVAudioFifo *af, int nb_samples);
+
+/**
+ * Write data to an AVAudioFifo.
+ *
+ * The AVAudioFifo will be reallocated automatically if the available space
+ * is less than nb_samples.
+ *
+ * @see enum AVSampleFormat
+ * The documentation for AVSampleFormat describes the data layout.
+ *
+ * @param af          AVAudioFifo to write to
+ * @param data        audio data plane pointers
+ * @param nb_samples  number of samples to write
+ * @return            number of samples actually written, or negative AVERROR
+ *                    code on failure.
+ */
+int av_audio_fifo_write(AVAudioFifo *af, void **data, int nb_samples);
+
+/**
+ * Read data from an AVAudioFifo.
+ *
+ * @see enum AVSampleFormat
+ * The documentation for AVSampleFormat describes the data layout.
+ *
+ * @param af          AVAudioFifo to read from
+ * @param data        audio data plane pointers
+ * @param nb_samples  number of samples to read
+ * @return            number of samples actually read, or negative AVERROR code
+ *                    on failure.
+ */
+int av_audio_fifo_read(AVAudioFifo *af, void **data, int nb_samples);
+
+/**
+ * Drain data from an AVAudioFifo.
+ *
+ * Removes the data without reading it.
+ *
+ * @param af          AVAudioFifo to drain
+ * @param nb_samples  number of samples to drain
+ * @return            0 if OK, or negative AVERROR code on failure
+ */
+int av_audio_fifo_drain(AVAudioFifo *af, int nb_samples);
+
+/**
+ * Reset the AVAudioFifo buffer.
+ *
+ * This empties all data in the buffer.
+ *
+ * @param af  AVAudioFifo to reset
+ */
+void av_audio_fifo_reset(AVAudioFifo *af);
+
+/**
+ * Get the current number of samples in the AVAudioFifo available for reading.
+ *
+ * @param af  the AVAudioFifo to query
+ * @return    number of samples available for reading
+ */
+int av_audio_fifo_size(AVAudioFifo *af);
+
+/**
+ * Get the current number of samples in the AVAudioFifo available for writing.
+ *
+ * @param af  the AVAudioFifo to query
+ * @return    number of samples available for writing
+ */
+int av_audio_fifo_space(AVAudioFifo *af);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_AUDIO_FIFO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/avassert.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/avassert.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/avassert.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/avassert.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,66 @@
+/*
+ * copyright (c) 2010 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * simple assert() macros that are a bit more flexible than ISO C assert().
+ * @author Michael Niedermayer <michaelni@gmx.at>
+ */
+
+#ifndef AVUTIL_AVASSERT_H
+#define AVUTIL_AVASSERT_H
+
+#include <stdlib.h>
+#include "avutil.h"
+#include "log.h"
+
+/**
+ * assert() equivalent, that is always enabled.
+ */
+#define av_assert0(cond) do {                                           \
+    if (!(cond)) {                                                      \
+        av_log(NULL, AV_LOG_FATAL, "Assertion %s failed at %s:%d\n",    \
+               AV_STRINGIFY(cond), __FILE__, __LINE__);                 \
+        abort();                                                        \
+    }                                                                   \
+} while (0)
+
+
+/**
+ * assert() equivalent, that does not lie in speed critical code.
+ * These asserts() thus can be enabled without fearing speedloss.
+ */
+#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 0
+#define av_assert1(cond) av_assert0(cond)
+#else
+#define av_assert1(cond) ((void)0)
+#endif
+
+
+/**
+ * assert() equivalent, that does lie in speed critical code.
+ */
+#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 1
+#define av_assert2(cond) av_assert0(cond)
+#else
+#define av_assert2(cond) ((void)0)
+#endif
+
+#endif /* AVUTIL_AVASSERT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/avconfig.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/avconfig.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/avconfig.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/avconfig.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,6 @@
+/* Generated by ffconf */
+#ifndef AVUTIL_AVCONFIG_H
+#define AVUTIL_AVCONFIG_H
+#define AV_HAVE_BIGENDIAN 0
+#define AV_HAVE_FAST_UNALIGNED 1
+#endif /* AVUTIL_AVCONFIG_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/avstring.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/avstring.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/avstring.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/avstring.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2007 Mans Rullgard
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_AVSTRING_H
+#define AVUTIL_AVSTRING_H
+
+#include <stddef.h>
+#include "attributes.h"
+
+/**
+ * @addtogroup lavu_string
+ * @{
+ */
+
+/**
+ * Return non-zero if pfx is a prefix of str. If it is, *ptr is set to
+ * the address of the first character in str after the prefix.
+ *
+ * @param str input string
+ * @param pfx prefix to test
+ * @param ptr updated if the prefix is matched inside str
+ * @return non-zero if the prefix matches, zero otherwise
+ */
+int av_strstart(const char *str, const char *pfx, const char **ptr);
+
+/**
+ * Return non-zero if pfx is a prefix of str independent of case. If
+ * it is, *ptr is set to the address of the first character in str
+ * after the prefix.
+ *
+ * @param str input string
+ * @param pfx prefix to test
+ * @param ptr updated if the prefix is matched inside str
+ * @return non-zero if the prefix matches, zero otherwise
+ */
+int av_stristart(const char *str, const char *pfx, const char **ptr);
+
+/**
+ * Locate the first case-independent occurrence in the string haystack
+ * of the string needle.  A zero-length string needle is considered to
+ * match at the start of haystack.
+ *
+ * This function is a case-insensitive version of the standard strstr().
+ *
+ * @param haystack string to search in
+ * @param needle   string to search for
+ * @return         pointer to the located match within haystack
+ *                 or a null pointer if no match
+ */
+char *av_stristr(const char *haystack, const char *needle);
+
+/**
+ * Copy the string src to dst, but no more than size - 1 bytes, and
+ * null-terminate dst.
+ *
+ * This function is the same as BSD strlcpy().
+ *
+ * @param dst destination buffer
+ * @param src source string
+ * @param size size of destination buffer
+ * @return the length of src
+ *
+ * @warning since the return value is the length of src, src absolutely
+ * _must_ be a properly 0-terminated string, otherwise this will read beyond
+ * the end of the buffer and possibly crash.
+ */
+size_t av_strlcpy(char *dst, const char *src, size_t size);
+
+/**
+ * Append the string src to the string dst, but to a total length of
+ * no more than size - 1 bytes, and null-terminate dst.
+ *
+ * This function is similar to BSD strlcat(), but differs when
+ * size <= strlen(dst).
+ *
+ * @param dst destination buffer
+ * @param src source string
+ * @param size size of destination buffer
+ * @return the total length of src and dst
+ *
+ * @warning since the return value use the length of src and dst, these
+ * absolutely _must_ be a properly 0-terminated strings, otherwise this
+ * will read beyond the end of the buffer and possibly crash.
+ */
+size_t av_strlcat(char *dst, const char *src, size_t size);
+
+/**
+ * Append output to a string, according to a format. Never write out of
+ * the destination buffer, and always put a terminating 0 within
+ * the buffer.
+ * @param dst destination buffer (string to which the output is
+ *  appended)
+ * @param size total size of the destination buffer
+ * @param fmt printf-compatible format string, specifying how the
+ *  following parameters are used
+ * @return the length of the string that would have been generated
+ *  if enough space had been available
+ */
+size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...) av_printf_format(3, 4);
+
+/**
+ * Convert a number to a av_malloced string.
+ */
+char *av_d2str(double d);
+
+/**
+ * Unescape the given string until a non escaped terminating char,
+ * and return the token corresponding to the unescaped string.
+ *
+ * The normal \ and ' escaping is supported. Leading and trailing
+ * whitespaces are removed, unless they are escaped with '\' or are
+ * enclosed between ''.
+ *
+ * @param buf the buffer to parse, buf will be updated to point to the
+ * terminating char
+ * @param term a 0-terminated list of terminating chars
+ * @return the malloced unescaped string, which must be av_freed by
+ * the user, NULL in case of allocation failure
+ */
+char *av_get_token(const char **buf, const char *term);
+
+/**
+ * Locale-independent conversion of ASCII characters to uppercase.
+ */
+static inline int av_toupper(int c)
+{
+    if (c >= 'a' && c <= 'z')
+        c ^= 0x20;
+    return c;
+}
+
+/**
+ * Locale-independent conversion of ASCII characters to lowercase.
+ */
+static inline int av_tolower(int c)
+{
+    if (c >= 'A' && c <= 'Z')
+        c ^= 0x20;
+    return c;
+}
+
+/*
+ * Locale-independent case-insensitive compare.
+ * @note This means only ASCII-range characters are case-insensitive
+ */
+int av_strcasecmp(const char *a, const char *b);
+
+/**
+ * Locale-independent case-insensitive compare.
+ * @note This means only ASCII-range characters are case-insensitive
+ */
+int av_strncasecmp(const char *a, const char *b, size_t n);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_AVSTRING_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/avutil.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/avutil.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/avutil.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/avutil.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,326 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_AVUTIL_H
+#define AVUTIL_AVUTIL_H
+
+/**
+ * @file
+ * external API header
+ */
+
+/**
+ * @mainpage
+ *
+ * @section libav_intro Introduction
+ *
+ * This document describe the usage of the different libraries
+ * provided by Libav.
+ *
+ * @li @ref libavc "libavcodec" encoding/decoding library
+ * @li @subpage libavfilter graph based frame editing library
+ * @li @ref libavf "libavformat" I/O and muxing/demuxing library
+ * @li @ref lavd "libavdevice" special devices muxing/demuxing library
+ * @li @ref lavu "libavutil" common utility library
+ * @li @subpage libpostproc post processing library
+ * @li @subpage libswscale  color conversion and scaling library
+ *
+ */
+
+/**
+ * @defgroup lavu Common utility functions
+ *
+ * @brief
+ * libavutil contains the code shared across all the other Libav
+ * libraries
+ *
+ * @note In order to use the functions provided by avutil you must include
+ * the specific header.
+ *
+ * @{
+ *
+ * @defgroup lavu_crypto Crypto and Hashing
+ *
+ * @{
+ * @}
+ *
+ * @defgroup lavu_math Maths
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_string String Manipulation
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_mem Memory Management
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_data Data Structures
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_audio Audio related
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_error Error Codes
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_misc Other
+ *
+ * @{
+ *
+ * @defgroup lavu_internal Internal
+ *
+ * Not exported functions, for internal usage only
+ *
+ * @{
+ *
+ * @}
+ */
+
+
+/**
+ * @defgroup preproc_misc Preprocessor String Macros
+ *
+ * String manipulation macros
+ *
+ * @{
+ */
+
+#define AV_STRINGIFY(s)         AV_TOSTRING(s)
+#define AV_TOSTRING(s) #s
+
+#define AV_GLUE(a, b) a ## b
+#define AV_JOIN(a, b) AV_GLUE(a, b)
+
+#define AV_PRAGMA(s) _Pragma(#s)
+
+/**
+ * @}
+ */
+
+/**
+ * @defgroup version_utils Library Version Macros
+ *
+ * Useful to check and match library version in order to maintain
+ * backward compatibility.
+ *
+ * @{
+ */
+
+#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
+#define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c
+#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
+
+/**
+ * @}
+ *
+ * @defgroup lavu_ver Version and Build diagnostics
+ *
+ * Macros and function useful to check at compiletime and at runtime
+ * which version of libavutil is in use.
+ *
+ * @{
+ */
+
+#define LIBAVUTIL_VERSION_MAJOR 51
+#define LIBAVUTIL_VERSION_MINOR 22
+#define LIBAVUTIL_VERSION_MICRO  1
+
+#define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
+                                               LIBAVUTIL_VERSION_MINOR, \
+                                               LIBAVUTIL_VERSION_MICRO)
+#define LIBAVUTIL_VERSION       AV_VERSION(LIBAVUTIL_VERSION_MAJOR,     \
+                                           LIBAVUTIL_VERSION_MINOR,     \
+                                           LIBAVUTIL_VERSION_MICRO)
+#define LIBAVUTIL_BUILD         LIBAVUTIL_VERSION_INT
+
+#define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
+
+/**
+ * @}
+ *
+ * @defgroup depr_guards Deprecation guards
+ * Those FF_API_* defines are not part of public API.
+ * They may change, break or disappear at any time.
+ *
+ * They are used mostly internally to mark code that will be removed
+ * on the next major version.
+ *
+ * @{
+ */
+#ifndef FF_API_GET_BITS_PER_SAMPLE_FMT
+#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 52)
+#endif
+#ifndef FF_API_FIND_OPT
+#define FF_API_FIND_OPT                 (LIBAVUTIL_VERSION_MAJOR < 52)
+#endif
+#ifndef FF_API_AV_FIFO_PEEK
+#define FF_API_AV_FIFO_PEEK             (LIBAVUTIL_VERSION_MAJOR < 52)
+#endif
+#ifndef FF_API_OLD_AVOPTIONS
+#define FF_API_OLD_AVOPTIONS            (LIBAVUTIL_VERSION_MAJOR < 52)
+#endif
+
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup lavu_ver
+ * @{
+ */
+
+/**
+ * Return the LIBAVUTIL_VERSION_INT constant.
+ */
+unsigned avutil_version(void);
+
+/**
+ * Return the libavutil build-time configuration.
+ */
+const char *avutil_configuration(void);
+
+/**
+ * Return the libavutil license.
+ */
+const char *avutil_license(void);
+
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup lavu_media Media Type
+ * @brief Media Type
+ */
+
+enum AVMediaType {
+    AVMEDIA_TYPE_UNKNOWN = -1,  ///< Usually treated as AVMEDIA_TYPE_DATA
+    AVMEDIA_TYPE_VIDEO,
+    AVMEDIA_TYPE_AUDIO,
+    AVMEDIA_TYPE_DATA,          ///< Opaque data information usually continuous
+    AVMEDIA_TYPE_SUBTITLE,
+    AVMEDIA_TYPE_ATTACHMENT,    ///< Opaque data information usually sparse
+    AVMEDIA_TYPE_NB
+};
+
+/**
+ * @defgroup lavu_const Constants
+ * @{
+ *
+ * @defgroup lavu_enc Encoding specific
+ *
+ * @note those definition should move to avcodec
+ * @{
+ */
+
+#define FF_LAMBDA_SHIFT 7
+#define FF_LAMBDA_SCALE (1<<FF_LAMBDA_SHIFT)
+#define FF_QP2LAMBDA 118 ///< factor to convert from H.263 QP to lambda
+#define FF_LAMBDA_MAX (256*128-1)
+
+#define FF_QUALITY_SCALE FF_LAMBDA_SCALE //FIXME maybe remove
+
+/**
+ * @}
+ * @defgroup lavu_time Timestamp specific
+ *
+ * Libav internal timebase and timestamp definitions
+ *
+ * @{
+ */
+
+/**
+ * @brief Undefined timestamp value
+ *
+ * Usually reported by demuxer that work on containers that do not provide
+ * either pts or dts.
+ */
+
+#define AV_NOPTS_VALUE          INT64_C(0x8000000000000000)
+
+/**
+ * Internal time base represented as integer
+ */
+
+#define AV_TIME_BASE            1000000
+
+/**
+ * Internal time base represented as fractional value
+ */
+
+#define AV_TIME_BASE_Q          (AVRational){1, AV_TIME_BASE}
+
+/**
+ * @}
+ * @}
+ * @defgroup lavu_picture Image related
+ *
+ * AVPicture types, pixel formats and basic image planes manipulation.
+ *
+ * @{
+ */
+
+enum AVPictureType {
+    AV_PICTURE_TYPE_I = 1, ///< Intra
+    AV_PICTURE_TYPE_P,     ///< Predicted
+    AV_PICTURE_TYPE_B,     ///< Bi-dir predicted
+    AV_PICTURE_TYPE_S,     ///< S(GMC)-VOP MPEG4
+    AV_PICTURE_TYPE_SI,    ///< Switching Intra
+    AV_PICTURE_TYPE_SP,    ///< Switching Predicted
+    AV_PICTURE_TYPE_BI,    ///< BI type
+};
+
+/**
+ * Return a single letter to describe the given picture type
+ * pict_type.
+ *
+ * @param[in] pict_type the picture type @return a single character
+ * representing the picture type, '?' if pict_type is unknown
+ */
+char av_get_picture_type_char(enum AVPictureType pict_type);
+
+/**
+ * @}
+ */
+
+#include "common.h"
+#include "error.h"
+
+/**
+ * @}
+ * @}
+ */
+
+#endif /* AVUTIL_AVUTIL_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/base64.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/base64.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/base64.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/base64.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2006 Ryan Martell. (rdm4@martellventures.com)
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_BASE64_H
+#define AVUTIL_BASE64_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_base64 Base64
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+
+/**
+ * Decode a base64-encoded string.
+ *
+ * @param out      buffer for decoded data
+ * @param in       null-terminated input string
+ * @param out_size size in bytes of the out buffer, must be at
+ *                 least 3/4 of the length of in
+ * @return         number of bytes written, or a negative value in case of
+ *                 invalid input
+ */
+int av_base64_decode(uint8_t *out, const char *in, int out_size);
+
+/**
+ * Encode data to base64 and null-terminate.
+ *
+ * @param out      buffer for encoded data
+ * @param out_size size in bytes of the output buffer, must be at
+ *                 least AV_BASE64_SIZE(in_size)
+ * @param in_size  size in bytes of the 'in' buffer
+ * @return         'out' or NULL in case of error
+ */
+char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size);
+
+/**
+ * Calculate the output size needed to base64-encode x bytes.
+ */
+#define AV_BASE64_SIZE(x)  (((x)+2) / 3 * 4 + 1)
+
+ /**
+  * @}
+  */
+
+#endif /* AVUTIL_BASE64_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/blowfish.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/blowfish.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/blowfish.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/blowfish.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,77 @@
+/*
+ * Blowfish algorithm
+ * Copyright (c) 2012 Samuel Pitoiset
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_BLOWFISH_H
+#define AVUTIL_BLOWFISH_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_blowfish Blowfish
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+#define AV_BF_ROUNDS 16
+
+typedef struct AVBlowfish {
+    uint32_t p[AV_BF_ROUNDS + 2];
+    uint32_t s[4][256];
+} AVBlowfish;
+
+/**
+ * Initialize an AVBlowfish context.
+ *
+ * @param ctx an AVBlowfish context
+ * @param key a key
+ * @param key_len length of the key
+ */
+void av_blowfish_init(struct AVBlowfish *ctx, const uint8_t *key, int key_len);
+
+/**
+ * Encrypt or decrypt a buffer using a previously initialized context.
+ *
+ * @param ctx an AVBlowfish context
+ * @param xl left four bytes halves of input to be encrypted
+ * @param xr right four bytes halves of input to be encrypted
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+void av_blowfish_crypt_ecb(struct AVBlowfish *ctx, uint32_t *xl, uint32_t *xr,
+                           int decrypt);
+
+/**
+ * Encrypt or decrypt a buffer using a previously initialized context.
+ *
+ * @param ctx an AVBlowfish context
+ * @param dst destination array, can be equal to src
+ * @param src source array, can be equal to dst
+ * @param count number of 8 byte blocks
+ * @param iv initialization vector for CBC mode, if NULL ECB will be used
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+void av_blowfish_crypt(struct AVBlowfish *ctx, uint8_t *dst, const uint8_t *src,
+                       int count, uint8_t *iv, int decrypt);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_BLOWFISH_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/bprint.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/bprint.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/bprint.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/bprint.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2012 Nicolas George
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_BPRINT_H
+#define AVUTIL_BPRINT_H
+
+#include "attributes.h"
+
+/**
+ * Define a structure with extra padding to a fixed size
+ * This helps ensuring binary compatibility with future versions.
+ */
+#define FF_PAD_STRUCTURE(size, ...) \
+    __VA_ARGS__ \
+    char reserved_padding[size - sizeof(struct { __VA_ARGS__ })];
+
+/**
+ * Buffer to print data progressively
+ *
+ * The string buffer grows as necessary and is always 0-terminated.
+ * The content of the string is never accessed, and thus is
+ * encoding-agnostic and can even hold binary data.
+ *
+ * Small buffers are kept in the structure itself, and thus require no
+ * memory allocation at all (unless the contents of the buffer is needed
+ * after the structure goes out of scope). This is almost as lightweight as
+ * declaring a local "char buf[512]".
+ *
+ * The length of the string can go beyond the allocated size: the buffer is
+ * then truncated, but the functions still keep account of the actual total
+ * length.
+ *
+ * In other words, buf->len can be greater than buf->size and records the
+ * total length of what would have been to the buffer if there had been
+ * enough memory.
+ *
+ * Append operations do not need to be tested for failure: if a memory
+ * allocation fails, data stop being appended to the buffer, but the length
+ * is still updated. This situation can be tested with
+ * av_bprint_is_complete().
+ *
+ * The size_max field determines several possible behaviours:
+ *
+ * size_max = -1 (= UINT_MAX) or any large value will let the buffer be
+ * reallocated as necessary, with an amortized linear cost.
+ *
+ * size_max = 0 prevents writing anything to the buffer: only the total
+ * length is computed. The write operations can then possibly be repeated in
+ * a buffer with exactly the necessary size
+ * (using size_init = size_max = len + 1).
+ *
+ * size_max = 1 is automatically replaced by the exact size available in the
+ * structure itself, thus ensuring no dynamic memory allocation. The
+ * internal buffer is large enough to hold a reasonable paragraph of text,
+ * such as the current paragraph.
+ */
+typedef struct AVBPrint {
+    FF_PAD_STRUCTURE(1024,
+    char *str;         /** string so far */
+    unsigned len;      /** length so far */
+    unsigned size;     /** allocated memory */
+    unsigned size_max; /** maximum allocated memory */
+    char reserved_internal_buffer[1];
+    )
+} AVBPrint;
+
+/**
+ * Convenience macros for special values for av_bprint_init() size_max
+ * parameter.
+ */
+#define AV_BPRINT_SIZE_UNLIMITED  ((unsigned)-1)
+#define AV_BPRINT_SIZE_AUTOMATIC  1
+#define AV_BPRINT_SIZE_COUNT_ONLY 0
+
+/**
+ * Init a print buffer.
+ *
+ * @param buf        buffer to init
+ * @param size_init  initial size (including the final 0)
+ * @param size_max   maximum size;
+ *                   0 means do not write anything, just count the length;
+ *                   1 is replaced by the maximum value for automatic storage;
+ *                   any large value means that the internal buffer will be
+ *                   reallocated as needed up to that limit; -1 is converted to
+ *                   UINT_MAX, the largest limit possible.
+ *                   Check also AV_BPRINT_SIZE_* macros.
+ */
+void av_bprint_init(AVBPrint *buf, unsigned size_init, unsigned size_max);
+
+/**
+ * Init a print buffer using a pre-existing buffer.
+ *
+ * The buffer will not be reallocated.
+ *
+ * @param buf     buffer structure to init
+ * @param buffer  byte buffer to use for the string data
+ * @param size    size of buffer
+ */
+void av_bprint_init_for_buffer(AVBPrint *buf, char *buffer, unsigned size);
+
+/**
+ * Append a formated string to a print buffer.
+ */
+void av_bprintf(AVBPrint *buf, const char *fmt, ...) av_printf_format(2, 3);
+
+/**
+ * Append char c n times to a print buffer.
+ */
+void av_bprint_chars(AVBPrint *buf, char c, unsigned n);
+
+/**
+ * Allocate bytes in the buffer for external use.
+ *
+ * @param[in]  buf          buffer structure
+ * @param[in]  size         required size
+ * @param[out] mem          pointer to the memory area
+ * @param[out] actual_size  size of the memory area after allocation;
+ *                          can be larger or smaller than size
+ */
+void av_bprint_get_buffer(AVBPrint *buf, unsigned size,
+                          unsigned char **mem, unsigned *actual_size);
+
+/**
+ * Reset the string to "" but keep internal allocated data.
+ */
+void av_bprint_clear(AVBPrint *buf);
+
+/**
+ * Test if the print buffer is complete (not truncated).
+ *
+ * It may have been truncated due to a memory allocation failure
+ * or the size_max limit (compare size and size_max if necessary).
+ */
+static inline int av_bprint_is_complete(AVBPrint *buf)
+{
+    return buf->len < buf->size;
+}
+
+/**
+ * Finalize a print buffer.
+ *
+ * The print buffer can no longer be used afterwards,
+ * but the len and size fields are still valid.
+ *
+ * @arg[out] ret_str  if not NULL, used to return a permanent copy of the
+ *                    buffer contents, or NULL if memory allocation fails;
+ *                    if NULL, the buffer is discarded and freed
+ * @return  0 for success or error code (probably AVERROR(ENOMEM))
+ */
+int av_bprint_finalize(AVBPrint *buf, char **ret_str);
+
+#endif /* AVUTIL_BPRINT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/bswap.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/bswap.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/bswap.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/bswap.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,109 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * byte swapping routines
+ */
+
+#ifndef AVUTIL_BSWAP_H
+#define AVUTIL_BSWAP_H
+
+#include <stdint.h>
+#include "libavutil/avconfig.h"
+#include "attributes.h"
+
+#ifdef HAVE_AV_CONFIG_H
+
+#include "config.h"
+
+#if   ARCH_ARM
+#   include "arm/bswap.h"
+#elif ARCH_AVR32
+#   include "avr32/bswap.h"
+#elif ARCH_BFIN
+#   include "bfin/bswap.h"
+#elif ARCH_SH4
+#   include "sh4/bswap.h"
+#elif ARCH_X86
+#   include "x86/bswap.h"
+#endif
+
+#endif /* HAVE_AV_CONFIG_H */
+
+#define AV_BSWAP16C(x) (((x) << 8 & 0xff00)  | ((x) >> 8 & 0x00ff))
+#define AV_BSWAP32C(x) (AV_BSWAP16C(x) << 16 | AV_BSWAP16C((x) >> 16))
+#define AV_BSWAP64C(x) (AV_BSWAP32C(x) << 32 | AV_BSWAP32C((x) >> 32))
+
+#define AV_BSWAPC(s, x) AV_BSWAP##s##C(x)
+
+#ifndef av_bswap16
+static av_always_inline av_const uint16_t av_bswap16(uint16_t x)
+{
+    x= (x>>8) | (x<<8);
+    return x;
+}
+#endif
+
+#ifndef av_bswap32
+static av_always_inline av_const uint32_t av_bswap32(uint32_t x)
+{
+    return AV_BSWAP32C(x);
+}
+#endif
+
+#ifndef av_bswap64
+static inline uint64_t av_const av_bswap64(uint64_t x)
+{
+    return (uint64_t)av_bswap32(x) << 32 | av_bswap32(x >> 32);
+}
+#endif
+
+// be2ne ... big-endian to native-endian
+// le2ne ... little-endian to native-endian
+
+#if AV_HAVE_BIGENDIAN
+#define av_be2ne16(x) (x)
+#define av_be2ne32(x) (x)
+#define av_be2ne64(x) (x)
+#define av_le2ne16(x) av_bswap16(x)
+#define av_le2ne32(x) av_bswap32(x)
+#define av_le2ne64(x) av_bswap64(x)
+#define AV_BE2NEC(s, x) (x)
+#define AV_LE2NEC(s, x) AV_BSWAPC(s, x)
+#else
+#define av_be2ne16(x) av_bswap16(x)
+#define av_be2ne32(x) av_bswap32(x)
+#define av_be2ne64(x) av_bswap64(x)
+#define av_le2ne16(x) (x)
+#define av_le2ne32(x) (x)
+#define av_le2ne64(x) (x)
+#define AV_BE2NEC(s, x) AV_BSWAPC(s, x)
+#define AV_LE2NEC(s, x) (x)
+#endif
+
+#define AV_BE2NE16C(x) AV_BE2NEC(16, x)
+#define AV_BE2NE32C(x) AV_BE2NEC(32, x)
+#define AV_BE2NE64C(x) AV_BE2NEC(64, x)
+#define AV_LE2NE16C(x) AV_LE2NEC(16, x)
+#define AV_LE2NE32C(x) AV_LE2NEC(32, x)
+#define AV_LE2NE64C(x) AV_LE2NEC(64, x)
+
+#endif /* AVUTIL_BSWAP_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/common.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/common.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/common.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/common.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,398 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * common internal and external API header
+ */
+
+#ifndef AVUTIL_COMMON_H
+#define AVUTIL_COMMON_H
+
+#include <ctype.h>
+#include <errno.h>
+#include <inttypes.h>
+#include <limits.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "attributes.h"
+#include "libavutil/avconfig.h"
+
+#if AV_HAVE_BIGENDIAN
+#   define AV_NE(be, le) (be)
+#else
+#   define AV_NE(be, le) (le)
+#endif
+
+//rounded division & shift
+#define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
+/* assume b>0 */
+#define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b))
+#define FFABS(a) ((a) >= 0 ? (a) : (-(a)))
+#define FFSIGN(a) ((a) > 0 ? 1 : -1)
+
+#define FFMAX(a,b) ((a) > (b) ? (a) : (b))
+#define FFMAX3(a,b,c) FFMAX(FFMAX(a,b),c)
+#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
+#define FFMIN3(a,b,c) FFMIN(FFMIN(a,b),c)
+
+#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
+#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
+#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))
+
+/* misc math functions */
+extern const uint8_t ff_log2_tab[256];
+
+extern const uint8_t av_reverse[256];
+
+static av_always_inline av_const int av_log2_c(unsigned int v)
+{
+    int n = 0;
+    if (v & 0xffff0000) {
+        v >>= 16;
+        n += 16;
+    }
+    if (v & 0xff00) {
+        v >>= 8;
+        n += 8;
+    }
+    n += ff_log2_tab[v];
+
+    return n;
+}
+
+static av_always_inline av_const int av_log2_16bit_c(unsigned int v)
+{
+    int n = 0;
+    if (v & 0xff00) {
+        v >>= 8;
+        n += 8;
+    }
+    n += ff_log2_tab[v];
+
+    return n;
+}
+
+#ifdef HAVE_AV_CONFIG_H
+#   include "config.h"
+#   include "intmath.h"
+#endif
+
+/* Pull in unguarded fallback defines at the end of this file. */
+#include "common.h"
+
+/**
+ * Clip a signed integer value into the amin-amax range.
+ * @param a value to clip
+ * @param amin minimum value of the clip range
+ * @param amax maximum value of the clip range
+ * @return clipped value
+ */
+static av_always_inline av_const int av_clip_c(int a, int amin, int amax)
+{
+    if      (a < amin) return amin;
+    else if (a > amax) return amax;
+    else               return a;
+}
+
+/**
+ * Clip a signed integer value into the 0-255 range.
+ * @param a value to clip
+ * @return clipped value
+ */
+static av_always_inline av_const uint8_t av_clip_uint8_c(int a)
+{
+    if (a&(~0xFF)) return (-a)>>31;
+    else           return a;
+}
+
+/**
+ * Clip a signed integer value into the -128,127 range.
+ * @param a value to clip
+ * @return clipped value
+ */
+static av_always_inline av_const int8_t av_clip_int8_c(int a)
+{
+    if ((a+0x80) & ~0xFF) return (a>>31) ^ 0x7F;
+    else                  return a;
+}
+
+/**
+ * Clip a signed integer value into the 0-65535 range.
+ * @param a value to clip
+ * @return clipped value
+ */
+static av_always_inline av_const uint16_t av_clip_uint16_c(int a)
+{
+    if (a&(~0xFFFF)) return (-a)>>31;
+    else             return a;
+}
+
+/**
+ * Clip a signed integer value into the -32768,32767 range.
+ * @param a value to clip
+ * @return clipped value
+ */
+static av_always_inline av_const int16_t av_clip_int16_c(int a)
+{
+    if ((a+0x8000) & ~0xFFFF) return (a>>31) ^ 0x7FFF;
+    else                      return a;
+}
+
+/**
+ * Clip a signed 64-bit integer value into the -2147483648,2147483647 range.
+ * @param a value to clip
+ * @return clipped value
+ */
+static av_always_inline av_const int32_t av_clipl_int32_c(int64_t a)
+{
+    if ((a+0x80000000u) & ~UINT64_C(0xFFFFFFFF)) return (a>>63) ^ 0x7FFFFFFF;
+    else                                         return a;
+}
+
+/**
+ * Clip a signed integer to an unsigned power of two range.
+ * @param  a value to clip
+ * @param  p bit position to clip at
+ * @return clipped value
+ */
+static av_always_inline av_const unsigned av_clip_uintp2_c(int a, int p)
+{
+    if (a & ~((1<<p) - 1)) return -a >> 31 & ((1<<p) - 1);
+    else                   return  a;
+}
+
+/**
+ * Clip a float value into the amin-amax range.
+ * @param a value to clip
+ * @param amin minimum value of the clip range
+ * @param amax maximum value of the clip range
+ * @return clipped value
+ */
+static av_always_inline av_const float av_clipf_c(float a, float amin, float amax)
+{
+    if      (a < amin) return amin;
+    else if (a > amax) return amax;
+    else               return a;
+}
+
+/** Compute ceil(log2(x)).
+ * @param x value used to compute ceil(log2(x))
+ * @return computed ceiling of log2(x)
+ */
+static av_always_inline av_const int av_ceil_log2_c(int x)
+{
+    return av_log2((x - 1) << 1);
+}
+
+/**
+ * Count number of bits set to one in x
+ * @param x value to count bits of
+ * @return the number of bits set to one in x
+ */
+static av_always_inline av_const int av_popcount_c(uint32_t x)
+{
+    x -= (x >> 1) & 0x55555555;
+    x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
+    x = (x + (x >> 4)) & 0x0F0F0F0F;
+    x += x >> 8;
+    return (x + (x >> 16)) & 0x3F;
+}
+
+/**
+ * Count number of bits set to one in x
+ * @param x value to count bits of
+ * @return the number of bits set to one in x
+ */
+static av_always_inline av_const int av_popcount64_c(uint64_t x)
+{
+    return av_popcount(x) + av_popcount(x >> 32);
+}
+
+#define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24))
+#define MKBETAG(a,b,c,d) ((d) | ((c) << 8) | ((b) << 16) | ((unsigned)(a) << 24))
+
+/**
+ * Convert a UTF-8 character (up to 4 bytes) to its 32-bit UCS-4 encoded form.
+ *
+ * @param val      Output value, must be an lvalue of type uint32_t.
+ * @param GET_BYTE Expression reading one byte from the input.
+ *                 Evaluated up to 7 times (4 for the currently
+ *                 assigned Unicode range).  With a memory buffer
+ *                 input, this could be *ptr++.
+ * @param ERROR    Expression to be evaluated on invalid input,
+ *                 typically a goto statement.
+ */
+#define GET_UTF8(val, GET_BYTE, ERROR)\
+    val= GET_BYTE;\
+    {\
+        int ones= 7 - av_log2(val ^ 255);\
+        if(ones==1)\
+            ERROR\
+        val&= 127>>ones;\
+        while(--ones > 0){\
+            int tmp= GET_BYTE - 128;\
+            if(tmp>>6)\
+                ERROR\
+            val= (val<<6) + tmp;\
+        }\
+    }
+
+/**
+ * Convert a UTF-16 character (2 or 4 bytes) to its 32-bit UCS-4 encoded form.
+ *
+ * @param val       Output value, must be an lvalue of type uint32_t.
+ * @param GET_16BIT Expression returning two bytes of UTF-16 data converted
+ *                  to native byte order.  Evaluated one or two times.
+ * @param ERROR     Expression to be evaluated on invalid input,
+ *                  typically a goto statement.
+ */
+#define GET_UTF16(val, GET_16BIT, ERROR)\
+    val = GET_16BIT;\
+    {\
+        unsigned int hi = val - 0xD800;\
+        if (hi < 0x800) {\
+            val = GET_16BIT - 0xDC00;\
+            if (val > 0x3FFU || hi > 0x3FFU)\
+                ERROR\
+            val += (hi<<10) + 0x10000;\
+        }\
+    }\
+
+/**
+ * @def PUT_UTF8(val, tmp, PUT_BYTE)
+ * Convert a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes long).
+ * @param val is an input-only argument and should be of type uint32_t. It holds
+ * a UCS-4 encoded Unicode character that is to be converted to UTF-8. If
+ * val is given as a function it is executed only once.
+ * @param tmp is a temporary variable and should be of type uint8_t. It
+ * represents an intermediate value during conversion that is to be
+ * output by PUT_BYTE.
+ * @param PUT_BYTE writes the converted UTF-8 bytes to any proper destination.
+ * It could be a function or a statement, and uses tmp as the input byte.
+ * For example, PUT_BYTE could be "*output++ = tmp;" PUT_BYTE will be
+ * executed up to 4 times for values in the valid UTF-8 range and up to
+ * 7 times in the general case, depending on the length of the converted
+ * Unicode character.
+ */
+#define PUT_UTF8(val, tmp, PUT_BYTE)\
+    {\
+        int bytes, shift;\
+        uint32_t in = val;\
+        if (in < 0x80) {\
+            tmp = in;\
+            PUT_BYTE\
+        } else {\
+            bytes = (av_log2(in) + 4) / 5;\
+            shift = (bytes - 1) * 6;\
+            tmp = (256 - (256 >> bytes)) | (in >> shift);\
+            PUT_BYTE\
+            while (shift >= 6) {\
+                shift -= 6;\
+                tmp = 0x80 | ((in >> shift) & 0x3f);\
+                PUT_BYTE\
+            }\
+        }\
+    }
+
+/**
+ * @def PUT_UTF16(val, tmp, PUT_16BIT)
+ * Convert a 32-bit Unicode character to its UTF-16 encoded form (2 or 4 bytes).
+ * @param val is an input-only argument and should be of type uint32_t. It holds
+ * a UCS-4 encoded Unicode character that is to be converted to UTF-16. If
+ * val is given as a function it is executed only once.
+ * @param tmp is a temporary variable and should be of type uint16_t. It
+ * represents an intermediate value during conversion that is to be
+ * output by PUT_16BIT.
+ * @param PUT_16BIT writes the converted UTF-16 data to any proper destination
+ * in desired endianness. It could be a function or a statement, and uses tmp
+ * as the input byte.  For example, PUT_BYTE could be "*output++ = tmp;"
+ * PUT_BYTE will be executed 1 or 2 times depending on input character.
+ */
+#define PUT_UTF16(val, tmp, PUT_16BIT)\
+    {\
+        uint32_t in = val;\
+        if (in < 0x10000) {\
+            tmp = in;\
+            PUT_16BIT\
+        } else {\
+            tmp = 0xD800 | ((in - 0x10000) >> 10);\
+            PUT_16BIT\
+            tmp = 0xDC00 | ((in - 0x10000) & 0x3FF);\
+            PUT_16BIT\
+        }\
+    }\
+
+
+
+#include "mem.h"
+
+#ifdef HAVE_AV_CONFIG_H
+#    include "internal.h"
+#endif /* HAVE_AV_CONFIG_H */
+
+#endif /* AVUTIL_COMMON_H */
+
+/*
+ * The following definitions are outside the multiple inclusion guard
+ * to ensure they are immediately available in intmath.h.
+ */
+
+#ifndef av_log2
+#   define av_log2       av_log2_c
+#endif
+#ifndef av_log2_16bit
+#   define av_log2_16bit av_log2_16bit_c
+#endif
+#ifndef av_ceil_log2
+#   define av_ceil_log2     av_ceil_log2_c
+#endif
+#ifndef av_clip
+#   define av_clip          av_clip_c
+#endif
+#ifndef av_clip_uint8
+#   define av_clip_uint8    av_clip_uint8_c
+#endif
+#ifndef av_clip_int8
+#   define av_clip_int8     av_clip_int8_c
+#endif
+#ifndef av_clip_uint16
+#   define av_clip_uint16   av_clip_uint16_c
+#endif
+#ifndef av_clip_int16
+#   define av_clip_int16    av_clip_int16_c
+#endif
+#ifndef av_clipl_int32
+#   define av_clipl_int32   av_clipl_int32_c
+#endif
+#ifndef av_clip_uintp2
+#   define av_clip_uintp2   av_clip_uintp2_c
+#endif
+#ifndef av_clipf
+#   define av_clipf         av_clipf_c
+#endif
+#ifndef av_popcount
+#   define av_popcount      av_popcount_c
+#endif
+#ifndef av_popcount64
+#   define av_popcount64    av_popcount64_c
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/cpu.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/cpu.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/cpu.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/cpu.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_CPU_H
+#define AVUTIL_CPU_H
+
+#define AV_CPU_FLAG_FORCE    0x80000000 /* force usage of selected flags (OR) */
+
+    /* lower 16 bits - CPU features */
+#define AV_CPU_FLAG_MMX          0x0001 ///< standard MMX
+#define AV_CPU_FLAG_MMX2         0x0002 ///< SSE integer functions or AMD MMX ext
+#define AV_CPU_FLAG_3DNOW        0x0004 ///< AMD 3DNOW
+#define AV_CPU_FLAG_SSE          0x0008 ///< SSE functions
+#define AV_CPU_FLAG_SSE2         0x0010 ///< PIV SSE2 functions
+#define AV_CPU_FLAG_SSE2SLOW 0x40000000 ///< SSE2 supported, but usually not faster
+#define AV_CPU_FLAG_3DNOWEXT     0x0020 ///< AMD 3DNowExt
+#define AV_CPU_FLAG_SSE3         0x0040 ///< Prescott SSE3 functions
+#define AV_CPU_FLAG_SSE3SLOW 0x20000000 ///< SSE3 supported, but usually not faster
+#define AV_CPU_FLAG_SSSE3        0x0080 ///< Conroe SSSE3 functions
+#define AV_CPU_FLAG_ATOM     0x10000000 ///< Atom processor, some SSSE3 instructions are slower
+#define AV_CPU_FLAG_SSE4         0x0100 ///< Penryn SSE4.1 functions
+#define AV_CPU_FLAG_SSE42        0x0200 ///< Nehalem SSE4.2 functions
+#define AV_CPU_FLAG_AVX          0x4000 ///< AVX functions: requires OS support even if YMM registers aren't used
+#define AV_CPU_FLAG_XOP          0x0400 ///< Bulldozer XOP functions
+#define AV_CPU_FLAG_FMA4         0x0800 ///< Bulldozer FMA4 functions
+#define AV_CPU_FLAG_IWMMXT       0x0100 ///< XScale IWMMXT
+#define AV_CPU_FLAG_ALTIVEC      0x0001 ///< standard
+
+/**
+ * Return the flags which specify extensions supported by the CPU.
+ */
+int av_get_cpu_flags(void);
+
+/* The following CPU-specific functions shall not be called directly. */
+int ff_get_cpu_flags_arm(void);
+int ff_get_cpu_flags_ppc(void);
+int ff_get_cpu_flags_x86(void);
+
+#endif /* AVUTIL_CPU_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/crc.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/crc.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/crc.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/crc.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_CRC_H
+#define AVUTIL_CRC_H
+
+#include <stdint.h>
+#include <stddef.h>
+#include "attributes.h"
+
+typedef uint32_t AVCRC;
+
+typedef enum {
+    AV_CRC_8_ATM,
+    AV_CRC_16_ANSI,
+    AV_CRC_16_CCITT,
+    AV_CRC_32_IEEE,
+    AV_CRC_32_IEEE_LE,  /*< reversed bitorder version of AV_CRC_32_IEEE */
+    AV_CRC_MAX,         /*< Not part of public API! Do not use outside libavutil. */
+}AVCRCId;
+
+int av_crc_init(AVCRC *ctx, int le, int bits, uint32_t poly, int ctx_size);
+const AVCRC *av_crc_get_table(AVCRCId crc_id);
+uint32_t av_crc(const AVCRC *ctx, uint32_t start_crc, const uint8_t *buffer, size_t length) av_pure;
+
+#endif /* AVUTIL_CRC_H */
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/dict.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/dict.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/dict.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/dict.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,121 @@
+/*
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Public dictionary API.
+ */
+
+#ifndef AVUTIL_DICT_H
+#define AVUTIL_DICT_H
+
+/**
+ * @addtogroup lavu_dict AVDictionary
+ * @ingroup lavu_data
+ *
+ * @brief Simple key:value store
+ *
+ * @{
+ * Dictionaries are used for storing key:value pairs. To create
+ * an AVDictionary, simply pass an address of a NULL pointer to
+ * av_dict_set(). NULL can be used as an empty dictionary wherever
+ * a pointer to an AVDictionary is required.
+ * Use av_dict_get() to retrieve an entry or iterate over all
+ * entries and finally av_dict_free() to free the dictionary
+ * and all its contents.
+ *
+ * @code
+ * AVDictionary *d = NULL;                // "create" an empty dictionary
+ * av_dict_set(&d, "foo", "bar", 0);      // add an entry
+ *
+ * char *k = av_strdup("key");            // if your strings are already allocated,
+ * char *v = av_strdup("value");          // you can avoid copying them like this
+ * av_dict_set(&d, k, v, AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
+ *
+ * AVDictionaryEntry *t = NULL;
+ * while (t = av_dict_get(d, "", t, AV_DICT_IGNORE_SUFFIX)) {
+ *     <....>                             // iterate over all entries in d
+ * }
+ *
+ * av_dict_free(&d);
+ * @endcode
+ *
+ */
+
+#define AV_DICT_MATCH_CASE      1
+#define AV_DICT_IGNORE_SUFFIX   2
+#define AV_DICT_DONT_STRDUP_KEY 4   /**< Take ownership of a key that's been
+                                         allocated with av_malloc() and children. */
+#define AV_DICT_DONT_STRDUP_VAL 8   /**< Take ownership of a value that's been
+                                         allocated with av_malloc() and chilren. */
+#define AV_DICT_DONT_OVERWRITE 16   ///< Don't overwrite existing entries.
+#define AV_DICT_APPEND         32   /**< If the entry already exists, append to it.  Note that no
+                                      delimiter is added, the strings are simply concatenated. */
+
+typedef struct {
+    char *key;
+    char *value;
+} AVDictionaryEntry;
+
+typedef struct AVDictionary AVDictionary;
+
+/**
+ * Get a dictionary entry with matching key.
+ *
+ * @param prev Set to the previous matching element to find the next.
+ *             If set to NULL the first matching element is returned.
+ * @param flags Allows case as well as suffix-insensitive comparisons.
+ * @return Found entry or NULL, changing key or value leads to undefined behavior.
+ */
+AVDictionaryEntry *
+av_dict_get(AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags);
+
+/**
+ * Set the given entry in *pm, overwriting an existing entry.
+ *
+ * @param pm pointer to a pointer to a dictionary struct. If *pm is NULL
+ * a dictionary struct is allocated and put in *pm.
+ * @param key entry key to add to *pm (will be av_strduped depending on flags)
+ * @param value entry value to add to *pm (will be av_strduped depending on flags).
+ *        Passing a NULL value will cause an existing tag to be deleted.
+ * @return >= 0 on success otherwise an error code <0
+ */
+int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags);
+
+/**
+ * Copy entries from one AVDictionary struct into another.
+ * @param dst pointer to a pointer to a AVDictionary struct. If *dst is NULL,
+ *            this function will allocate a struct for you and put it in *dst
+ * @param src pointer to source AVDictionary struct
+ * @param flags flags to use when setting entries in *dst
+ * @note metadata is read using the AV_DICT_IGNORE_SUFFIX flag
+ */
+void av_dict_copy(AVDictionary **dst, AVDictionary *src, int flags);
+
+/**
+ * Free all the memory allocated for an AVDictionary struct
+ * and all keys and values.
+ */
+void av_dict_free(AVDictionary **m);
+
+/**
+ * @}
+ */
+
+#endif // AVUTIL_DICT_H
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/error.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/error.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/error.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/error.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,81 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * error code definitions
+ */
+
+#ifndef AVUTIL_ERROR_H
+#define AVUTIL_ERROR_H
+
+#include <errno.h>
+#include "avutil.h"
+
+/**
+ * @addtogroup lavu_error
+ *
+ * @{
+ */
+
+
+/* error handling */
+#if EDOM > 0
+#define AVERROR(e) (-(e))   ///< Returns a negative error code from a POSIX error code, to return from library functions.
+#define AVUNERROR(e) (-(e)) ///< Returns a POSIX error code from a library function error return value.
+#else
+/* Some platforms have E* and errno already negated. */
+#define AVERROR(e) (e)
+#define AVUNERROR(e) (e)
+#endif
+
+#define AVERROR_BSF_NOT_FOUND      (-MKTAG(0xF8,'B','S','F')) ///< Bitstream filter not found
+#define AVERROR_DECODER_NOT_FOUND  (-MKTAG(0xF8,'D','E','C')) ///< Decoder not found
+#define AVERROR_DEMUXER_NOT_FOUND  (-MKTAG(0xF8,'D','E','M')) ///< Demuxer not found
+#define AVERROR_ENCODER_NOT_FOUND  (-MKTAG(0xF8,'E','N','C')) ///< Encoder not found
+#define AVERROR_EOF                (-MKTAG( 'E','O','F',' ')) ///< End of file
+#define AVERROR_EXIT               (-MKTAG( 'E','X','I','T')) ///< Immediate exit was requested; the called function should not be restarted
+#define AVERROR_FILTER_NOT_FOUND   (-MKTAG(0xF8,'F','I','L')) ///< Filter not found
+#define AVERROR_INVALIDDATA        (-MKTAG( 'I','N','D','A')) ///< Invalid data found when processing input
+#define AVERROR_MUXER_NOT_FOUND    (-MKTAG(0xF8,'M','U','X')) ///< Muxer not found
+#define AVERROR_OPTION_NOT_FOUND   (-MKTAG(0xF8,'O','P','T')) ///< Option not found
+#define AVERROR_PATCHWELCOME       (-MKTAG( 'P','A','W','E')) ///< Not yet implemented in Libav, patches welcome
+#define AVERROR_PROTOCOL_NOT_FOUND (-MKTAG(0xF8,'P','R','O')) ///< Protocol not found
+#define AVERROR_STREAM_NOT_FOUND   (-MKTAG(0xF8,'S','T','R')) ///< Stream not found
+#define AVERROR_BUG                (-MKTAG( 'B','U','G',' ')) ///< Bug detected, please report the issue
+#define AVERROR_UNKNOWN            (-MKTAG( 'U','N','K','N')) ///< Unknown error, typically from an external library
+
+/**
+ * Put a description of the AVERROR code errnum in errbuf.
+ * In case of failure the global variable errno is set to indicate the
+ * error. Even in case of failure av_strerror() will print a generic
+ * error message indicating the errnum provided to errbuf.
+ *
+ * @param errnum      error code to describe
+ * @param errbuf      buffer to which description is written
+ * @param errbuf_size the size in bytes of errbuf
+ * @return 0 on success, a negative value if a description for errnum
+ * cannot be found
+ */
+int av_strerror(int errnum, char *errbuf, size_t errbuf_size);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_ERROR_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/eval.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/eval.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/eval.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/eval.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2002 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * simple arithmetic expression evaluator
+ */
+
+#ifndef AVUTIL_EVAL_H
+#define AVUTIL_EVAL_H
+
+#include "avutil.h"
+
+typedef struct AVExpr AVExpr;
+
+/**
+ * Parse and evaluate an expression.
+ * Note, this is significantly slower than av_expr_eval().
+ *
+ * @param res a pointer to a double where is put the result value of
+ * the expression, or NAN in case of error
+ * @param s expression as a zero terminated string, for example "1+2^3+5*5+sin(2/3)"
+ * @param const_names NULL terminated array of zero terminated strings of constant identifiers, for example {"PI", "E", 0}
+ * @param const_values a zero terminated array of values for the identifiers from const_names
+ * @param func1_names NULL terminated array of zero terminated strings of funcs1 identifiers
+ * @param funcs1 NULL terminated array of function pointers for functions which take 1 argument
+ * @param func2_names NULL terminated array of zero terminated strings of funcs2 identifiers
+ * @param funcs2 NULL terminated array of function pointers for functions which take 2 arguments
+ * @param opaque a pointer which will be passed to all functions from funcs1 and funcs2
+ * @param log_ctx parent logging context
+ * @return 0 in case of success, a negative value corresponding to an
+ * AVERROR code otherwise
+ */
+int av_expr_parse_and_eval(double *res, const char *s,
+                           const char * const *const_names, const double *const_values,
+                           const char * const *func1_names, double (* const *funcs1)(void *, double),
+                           const char * const *func2_names, double (* const *funcs2)(void *, double, double),
+                           void *opaque, int log_offset, void *log_ctx);
+
+/**
+ * Parse an expression.
+ *
+ * @param expr a pointer where is put an AVExpr containing the parsed
+ * value in case of successful parsing, or NULL otherwise.
+ * The pointed to AVExpr must be freed with av_expr_free() by the user
+ * when it is not needed anymore.
+ * @param s expression as a zero terminated string, for example "1+2^3+5*5+sin(2/3)"
+ * @param const_names NULL terminated array of zero terminated strings of constant identifiers, for example {"PI", "E", 0}
+ * @param func1_names NULL terminated array of zero terminated strings of funcs1 identifiers
+ * @param funcs1 NULL terminated array of function pointers for functions which take 1 argument
+ * @param func2_names NULL terminated array of zero terminated strings of funcs2 identifiers
+ * @param funcs2 NULL terminated array of function pointers for functions which take 2 arguments
+ * @param log_ctx parent logging context
+ * @return 0 in case of success, a negative value corresponding to an
+ * AVERROR code otherwise
+ */
+int av_expr_parse(AVExpr **expr, const char *s,
+                  const char * const *const_names,
+                  const char * const *func1_names, double (* const *funcs1)(void *, double),
+                  const char * const *func2_names, double (* const *funcs2)(void *, double, double),
+                  int log_offset, void *log_ctx);
+
+/**
+ * Evaluate a previously parsed expression.
+ *
+ * @param const_values a zero terminated array of values for the identifiers from av_expr_parse() const_names
+ * @param opaque a pointer which will be passed to all functions from funcs1 and funcs2
+ * @return the value of the expression
+ */
+double av_expr_eval(AVExpr *e, const double *const_values, void *opaque);
+
+/**
+ * Free a parsed expression previously created with av_expr_parse().
+ */
+void av_expr_free(AVExpr *e);
+
+/**
+ * Parse the string in numstr and return its value as a double. If
+ * the string is empty, contains only whitespaces, or does not contain
+ * an initial substring that has the expected syntax for a
+ * floating-point number, no conversion is performed. In this case,
+ * returns a value of zero and the value returned in tail is the value
+ * of numstr.
+ *
+ * @param numstr a string representing a number, may contain one of
+ * the International System number postfixes, for example 'K', 'M',
+ * 'G'. If 'i' is appended after the postfix, powers of 2 are used
+ * instead of powers of 10. The 'B' postfix multiplies the value for
+ * 8, and can be appended after another postfix or used alone. This
+ * allows using for example 'KB', 'MiB', 'G' and 'B' as postfix.
+ * @param tail if non-NULL puts here the pointer to the char next
+ * after the last parsed character
+ */
+double av_strtod(const char *numstr, char **tail);
+
+#endif /* AVUTIL_EVAL_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/fifo.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/fifo.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/fifo.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/fifo.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,141 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * a very simple circular buffer FIFO implementation
+ */
+
+#ifndef AVUTIL_FIFO_H
+#define AVUTIL_FIFO_H
+
+#include <stdint.h>
+#include "avutil.h"
+
+typedef struct AVFifoBuffer {
+    uint8_t *buffer;
+    uint8_t *rptr, *wptr, *end;
+    uint32_t rndx, wndx;
+} AVFifoBuffer;
+
+/**
+ * Initialize an AVFifoBuffer.
+ * @param size of FIFO
+ * @return AVFifoBuffer or NULL in case of memory allocation failure
+ */
+AVFifoBuffer *av_fifo_alloc(unsigned int size);
+
+/**
+ * Free an AVFifoBuffer.
+ * @param f AVFifoBuffer to free
+ */
+void av_fifo_free(AVFifoBuffer *f);
+
+/**
+ * Reset the AVFifoBuffer to the state right after av_fifo_alloc, in particular it is emptied.
+ * @param f AVFifoBuffer to reset
+ */
+void av_fifo_reset(AVFifoBuffer *f);
+
+/**
+ * Return the amount of data in bytes in the AVFifoBuffer, that is the
+ * amount of data you can read from it.
+ * @param f AVFifoBuffer to read from
+ * @return size
+ */
+int av_fifo_size(AVFifoBuffer *f);
+
+/**
+ * Return the amount of space in bytes in the AVFifoBuffer, that is the
+ * amount of data you can write into it.
+ * @param f AVFifoBuffer to write into
+ * @return size
+ */
+int av_fifo_space(AVFifoBuffer *f);
+
+/**
+ * Feed data from an AVFifoBuffer to a user-supplied callback.
+ * @param f AVFifoBuffer to read from
+ * @param buf_size number of bytes to read
+ * @param func generic read function
+ * @param dest data destination
+ */
+int av_fifo_generic_read(AVFifoBuffer *f, void *dest, int buf_size, void (*func)(void*, void*, int));
+
+/**
+ * Feed data from a user-supplied callback to an AVFifoBuffer.
+ * @param f AVFifoBuffer to write to
+ * @param src data source; non-const since it may be used as a
+ * modifiable context by the function defined in func
+ * @param size number of bytes to write
+ * @param func generic write function; the first parameter is src,
+ * the second is dest_buf, the third is dest_buf_size.
+ * func must return the number of bytes written to dest_buf, or <= 0 to
+ * indicate no more data available to write.
+ * If func is NULL, src is interpreted as a simple byte array for source data.
+ * @return the number of bytes written to the FIFO
+ */
+int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int));
+
+/**
+ * Resize an AVFifoBuffer.
+ * @param f AVFifoBuffer to resize
+ * @param size new AVFifoBuffer size in bytes
+ * @return <0 for failure, >=0 otherwise
+ */
+int av_fifo_realloc2(AVFifoBuffer *f, unsigned int size);
+
+/**
+ * Read and discard the specified amount of data from an AVFifoBuffer.
+ * @param f AVFifoBuffer to read from
+ * @param size amount of data to read in bytes
+ */
+void av_fifo_drain(AVFifoBuffer *f, int size);
+
+/**
+ * Return a pointer to the data stored in a FIFO buffer at a certain offset.
+ * The FIFO buffer is not modified.
+ *
+ * @param f    AVFifoBuffer to peek at, f must be non-NULL
+ * @param offs an offset in bytes, its absolute value must be less
+ *             than the used buffer size or the returned pointer will
+ *             point outside to the buffer data.
+ *             The used buffer size can be checked with av_fifo_size().
+ */
+static inline uint8_t *av_fifo_peek2(const AVFifoBuffer *f, int offs)
+{
+    uint8_t *ptr = f->rptr + offs;
+    if (ptr >= f->end)
+        ptr = f->buffer + (ptr - f->end);
+    else if (ptr < f->buffer)
+        ptr = f->end - (f->buffer - ptr);
+    return ptr;
+}
+
+#if FF_API_AV_FIFO_PEEK
+/**
+ * @deprecated Use av_fifo_peek2() instead.
+ */
+attribute_deprecated
+static inline uint8_t av_fifo_peek(AVFifoBuffer *f, int offs)
+{
+    return *av_fifo_peek2(f, offs);
+}
+#endif
+
+#endif /* AVUTIL_FIFO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/file.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/file.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/file.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/file.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,52 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_FILE_H
+#define AVUTIL_FILE_H
+
+#include "avutil.h"
+
+/**
+ * @file
+ * Misc file utilities.
+ */
+
+/**
+ * Read the file with name filename, and put its content in a newly
+ * allocated buffer or map it with mmap() when available.
+ * In case of success set *bufptr to the read or mmapped buffer, and
+ * *size to the size in bytes of the buffer in *bufptr.
+ * The returned buffer must be released with av_file_unmap().
+ *
+ * @param log_offset loglevel offset used for logging
+ * @param log_ctx context used for logging
+ * @return a non negative number in case of success, a negative value
+ * corresponding to an AVERROR error code in case of failure
+ */
+int av_file_map(const char *filename, uint8_t **bufptr, size_t *size,
+                int log_offset, void *log_ctx);
+
+/**
+ * Unmap or free the buffer bufptr created by av_file_map().
+ *
+ * @param size size in bytes of bufptr, must be the same as returned
+ * by av_file_map()
+ */
+void av_file_unmap(uint8_t *bufptr, size_t size);
+
+#endif /* AVUTIL_FILE_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/imgutils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/imgutils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/imgutils.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/imgutils.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,138 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_IMGUTILS_H
+#define AVUTIL_IMGUTILS_H
+
+/**
+ * @file
+ * misc image utilities
+ *
+ * @addtogroup lavu_picture
+ * @{
+ */
+
+#include "avutil.h"
+#include "pixdesc.h"
+
+/**
+ * Compute the max pixel step for each plane of an image with a
+ * format described by pixdesc.
+ *
+ * The pixel step is the distance in bytes between the first byte of
+ * the group of bytes which describe a pixel component and the first
+ * byte of the successive group in the same plane for the same
+ * component.
+ *
+ * @param max_pixsteps an array which is filled with the max pixel step
+ * for each plane. Since a plane may contain different pixel
+ * components, the computed max_pixsteps[plane] is relative to the
+ * component in the plane with the max pixel step.
+ * @param max_pixstep_comps an array which is filled with the component
+ * for each plane which has the max pixel step. May be NULL.
+ */
+void av_image_fill_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4],
+                                const AVPixFmtDescriptor *pixdesc);
+
+/**
+ * Compute the size of an image line with format pix_fmt and width
+ * width for the plane plane.
+ *
+ * @return the computed size in bytes
+ */
+int av_image_get_linesize(enum PixelFormat pix_fmt, int width, int plane);
+
+/**
+ * Fill plane linesizes for an image with pixel format pix_fmt and
+ * width width.
+ *
+ * @param linesizes array to be filled with the linesize for each plane
+ * @return >= 0 in case of success, a negative error code otherwise
+ */
+int av_image_fill_linesizes(int linesizes[4], enum PixelFormat pix_fmt, int width);
+
+/**
+ * Fill plane data pointers for an image with pixel format pix_fmt and
+ * height height.
+ *
+ * @param data pointers array to be filled with the pointer for each image plane
+ * @param ptr the pointer to a buffer which will contain the image
+ * @param linesizes the array containing the linesize for each
+ * plane, should be filled by av_image_fill_linesizes()
+ * @return the size in bytes required for the image buffer, a negative
+ * error code in case of failure
+ */
+int av_image_fill_pointers(uint8_t *data[4], enum PixelFormat pix_fmt, int height,
+                           uint8_t *ptr, const int linesizes[4]);
+
+/**
+ * Allocate an image with size w and h and pixel format pix_fmt, and
+ * fill pointers and linesizes accordingly.
+ * The allocated image buffer has to be freed by using
+ * av_freep(&pointers[0]).
+ *
+ * @param align the value to use for buffer size alignment
+ * @return the size in bytes required for the image buffer, a negative
+ * error code in case of failure
+ */
+int av_image_alloc(uint8_t *pointers[4], int linesizes[4],
+                   int w, int h, enum PixelFormat pix_fmt, int align);
+
+/**
+ * Copy image plane from src to dst.
+ * That is, copy "height" number of lines of "bytewidth" bytes each.
+ * The first byte of each successive line is separated by *_linesize
+ * bytes.
+ *
+ * @param dst_linesize linesize for the image plane in dst
+ * @param src_linesize linesize for the image plane in src
+ */
+void av_image_copy_plane(uint8_t       *dst, int dst_linesize,
+                         const uint8_t *src, int src_linesize,
+                         int bytewidth, int height);
+
+/**
+ * Copy image in src_data to dst_data.
+ *
+ * @param dst_linesizes linesizes for the image in dst_data
+ * @param src_linesizes linesizes for the image in src_data
+ */
+void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4],
+                   const uint8_t *src_data[4], const int src_linesizes[4],
+                   enum PixelFormat pix_fmt, int width, int height);
+
+/**
+ * Check if the given dimension of an image is valid, meaning that all
+ * bytes of the image can be addressed with a signed int.
+ *
+ * @param w the width of the picture
+ * @param h the height of the picture
+ * @param log_offset the offset to sum to the log level for logging with log_ctx
+ * @param log_ctx the parent logging context, it may be NULL
+ * @return >= 0 if valid, a negative error code otherwise
+ */
+int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx);
+
+int ff_set_systematic_pal2(uint32_t pal[256], enum PixelFormat pix_fmt);
+
+/**
+ * @}
+ */
+
+
+#endif /* AVUTIL_IMGUTILS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/intfloat.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/intfloat.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/intfloat.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/intfloat.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2011 Mans Rullgard
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_INTFLOAT_H
+#define AVUTIL_INTFLOAT_H
+
+#include <stdint.h>
+#include "attributes.h"
+
+union av_intfloat32 {
+    uint32_t i;
+    float    f;
+};
+
+union av_intfloat64 {
+    uint64_t i;
+    double   f;
+};
+
+/**
+ * Reinterpret a 32-bit integer as a float.
+ */
+static av_always_inline float av_int2float(uint32_t i)
+{
+    union av_intfloat32 v = { .i = i };
+    return v.f;
+}
+
+/**
+ * Reinterpret a float as a 32-bit integer.
+ */
+static av_always_inline uint32_t av_float2int(float f)
+{
+    union av_intfloat32 v = { .f = f };
+    return v.i;
+}
+
+/**
+ * Reinterpret a 64-bit integer as a double.
+ */
+static av_always_inline double av_int2double(uint64_t i)
+{
+    union av_intfloat64 v = { .i = i };
+    return v.f;
+}
+
+/**
+ * Reinterpret a double as a 64-bit integer.
+ */
+static av_always_inline uint64_t av_double2int(double f)
+{
+    union av_intfloat64 v = { .f = f };
+    return v.i;
+}
+
+#endif /* AVUTIL_INTFLOAT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/intfloat_readwrite.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/intfloat_readwrite.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/intfloat_readwrite.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/intfloat_readwrite.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+ * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_INTFLOAT_READWRITE_H
+#define AVUTIL_INTFLOAT_READWRITE_H
+
+#include <stdint.h>
+#include "attributes.h"
+
+/* IEEE 80 bits extended float */
+typedef struct AVExtFloat  {
+    uint8_t exponent[2];
+    uint8_t mantissa[8];
+} AVExtFloat;
+
+attribute_deprecated double av_int2dbl(int64_t v) av_const;
+attribute_deprecated float av_int2flt(int32_t v) av_const;
+attribute_deprecated double av_ext2dbl(const AVExtFloat ext) av_const;
+attribute_deprecated int64_t av_dbl2int(double d) av_const;
+attribute_deprecated int32_t av_flt2int(float d) av_const;
+attribute_deprecated AVExtFloat av_dbl2ext(double d) av_const;
+
+#endif /* AVUTIL_INTFLOAT_READWRITE_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/intreadwrite.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/intreadwrite.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/intreadwrite.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/intreadwrite.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,522 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_INTREADWRITE_H
+#define AVUTIL_INTREADWRITE_H
+
+#include <stdint.h>
+#include "libavutil/avconfig.h"
+#include "attributes.h"
+#include "bswap.h"
+
+typedef union {
+    uint64_t u64;
+    uint32_t u32[2];
+    uint16_t u16[4];
+    uint8_t  u8 [8];
+    double   f64;
+    float    f32[2];
+} av_alias av_alias64;
+
+typedef union {
+    uint32_t u32;
+    uint16_t u16[2];
+    uint8_t  u8 [4];
+    float    f32;
+} av_alias av_alias32;
+
+typedef union {
+    uint16_t u16;
+    uint8_t  u8 [2];
+} av_alias av_alias16;
+
+/*
+ * Arch-specific headers can provide any combination of
+ * AV_[RW][BLN](16|24|32|64) and AV_(COPY|SWAP|ZERO)(64|128) macros.
+ * Preprocessor symbols must be defined, even if these are implemented
+ * as inline functions.
+ */
+
+#ifdef HAVE_AV_CONFIG_H
+
+#include "config.h"
+
+#if   ARCH_ARM
+#   include "arm/intreadwrite.h"
+#elif ARCH_AVR32
+#   include "avr32/intreadwrite.h"
+#elif ARCH_MIPS
+#   include "mips/intreadwrite.h"
+#elif ARCH_PPC
+#   include "ppc/intreadwrite.h"
+#elif ARCH_TOMI
+#   include "tomi/intreadwrite.h"
+#elif ARCH_X86
+#   include "x86/intreadwrite.h"
+#endif
+
+#endif /* HAVE_AV_CONFIG_H */
+
+/*
+ * Map AV_RNXX <-> AV_R[BL]XX for all variants provided by per-arch headers.
+ */
+
+#if AV_HAVE_BIGENDIAN
+
+#   if    defined(AV_RN16) && !defined(AV_RB16)
+#       define AV_RB16(p) AV_RN16(p)
+#   elif !defined(AV_RN16) &&  defined(AV_RB16)
+#       define AV_RN16(p) AV_RB16(p)
+#   endif
+
+#   if    defined(AV_WN16) && !defined(AV_WB16)
+#       define AV_WB16(p, v) AV_WN16(p, v)
+#   elif !defined(AV_WN16) &&  defined(AV_WB16)
+#       define AV_WN16(p, v) AV_WB16(p, v)
+#   endif
+
+#   if    defined(AV_RN24) && !defined(AV_RB24)
+#       define AV_RB24(p) AV_RN24(p)
+#   elif !defined(AV_RN24) &&  defined(AV_RB24)
+#       define AV_RN24(p) AV_RB24(p)
+#   endif
+
+#   if    defined(AV_WN24) && !defined(AV_WB24)
+#       define AV_WB24(p, v) AV_WN24(p, v)
+#   elif !defined(AV_WN24) &&  defined(AV_WB24)
+#       define AV_WN24(p, v) AV_WB24(p, v)
+#   endif
+
+#   if    defined(AV_RN32) && !defined(AV_RB32)
+#       define AV_RB32(p) AV_RN32(p)
+#   elif !defined(AV_RN32) &&  defined(AV_RB32)
+#       define AV_RN32(p) AV_RB32(p)
+#   endif
+
+#   if    defined(AV_WN32) && !defined(AV_WB32)
+#       define AV_WB32(p, v) AV_WN32(p, v)
+#   elif !defined(AV_WN32) &&  defined(AV_WB32)
+#       define AV_WN32(p, v) AV_WB32(p, v)
+#   endif
+
+#   if    defined(AV_RN64) && !defined(AV_RB64)
+#       define AV_RB64(p) AV_RN64(p)
+#   elif !defined(AV_RN64) &&  defined(AV_RB64)
+#       define AV_RN64(p) AV_RB64(p)
+#   endif
+
+#   if    defined(AV_WN64) && !defined(AV_WB64)
+#       define AV_WB64(p, v) AV_WN64(p, v)
+#   elif !defined(AV_WN64) &&  defined(AV_WB64)
+#       define AV_WN64(p, v) AV_WB64(p, v)
+#   endif
+
+#else /* AV_HAVE_BIGENDIAN */
+
+#   if    defined(AV_RN16) && !defined(AV_RL16)
+#       define AV_RL16(p) AV_RN16(p)
+#   elif !defined(AV_RN16) &&  defined(AV_RL16)
+#       define AV_RN16(p) AV_RL16(p)
+#   endif
+
+#   if    defined(AV_WN16) && !defined(AV_WL16)
+#       define AV_WL16(p, v) AV_WN16(p, v)
+#   elif !defined(AV_WN16) &&  defined(AV_WL16)
+#       define AV_WN16(p, v) AV_WL16(p, v)
+#   endif
+
+#   if    defined(AV_RN24) && !defined(AV_RL24)
+#       define AV_RL24(p) AV_RN24(p)
+#   elif !defined(AV_RN24) &&  defined(AV_RL24)
+#       define AV_RN24(p) AV_RL24(p)
+#   endif
+
+#   if    defined(AV_WN24) && !defined(AV_WL24)
+#       define AV_WL24(p, v) AV_WN24(p, v)
+#   elif !defined(AV_WN24) &&  defined(AV_WL24)
+#       define AV_WN24(p, v) AV_WL24(p, v)
+#   endif
+
+#   if    defined(AV_RN32) && !defined(AV_RL32)
+#       define AV_RL32(p) AV_RN32(p)
+#   elif !defined(AV_RN32) &&  defined(AV_RL32)
+#       define AV_RN32(p) AV_RL32(p)
+#   endif
+
+#   if    defined(AV_WN32) && !defined(AV_WL32)
+#       define AV_WL32(p, v) AV_WN32(p, v)
+#   elif !defined(AV_WN32) &&  defined(AV_WL32)
+#       define AV_WN32(p, v) AV_WL32(p, v)
+#   endif
+
+#   if    defined(AV_RN64) && !defined(AV_RL64)
+#       define AV_RL64(p) AV_RN64(p)
+#   elif !defined(AV_RN64) &&  defined(AV_RL64)
+#       define AV_RN64(p) AV_RL64(p)
+#   endif
+
+#   if    defined(AV_WN64) && !defined(AV_WL64)
+#       define AV_WL64(p, v) AV_WN64(p, v)
+#   elif !defined(AV_WN64) &&  defined(AV_WL64)
+#       define AV_WN64(p, v) AV_WL64(p, v)
+#   endif
+
+#endif /* !AV_HAVE_BIGENDIAN */
+
+/*
+ * Define AV_[RW]N helper macros to simplify definitions not provided
+ * by per-arch headers.
+ */
+
+#if defined(__GNUC__) && !defined(__TI_COMPILER_VERSION__)
+
+union unaligned_64 { uint64_t l; } __attribute__((packed)) av_alias;
+union unaligned_32 { uint32_t l; } __attribute__((packed)) av_alias;
+union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias;
+
+#   define AV_RN(s, p) (((const union unaligned_##s *) (p))->l)
+#   define AV_WN(s, p, v) ((((union unaligned_##s *) (p))->l) = (v))
+
+#elif defined(__DECC)
+
+#   define AV_RN(s, p) (*((const __unaligned uint##s##_t*)(p)))
+#   define AV_WN(s, p, v) (*((__unaligned uint##s##_t*)(p)) = (v))
+
+#elif AV_HAVE_FAST_UNALIGNED
+
+#   define AV_RN(s, p) (((const av_alias##s*)(p))->u##s)
+#   define AV_WN(s, p, v) (((av_alias##s*)(p))->u##s = (v))
+
+#else
+
+#ifndef AV_RB16
+#   define AV_RB16(x)                           \
+    ((((const uint8_t*)(x))[0] << 8) |          \
+      ((const uint8_t*)(x))[1])
+#endif
+#ifndef AV_WB16
+#   define AV_WB16(p, d) do {                   \
+        ((uint8_t*)(p))[1] = (d);               \
+        ((uint8_t*)(p))[0] = (d)>>8;            \
+    } while(0)
+#endif
+
+#ifndef AV_RL16
+#   define AV_RL16(x)                           \
+    ((((const uint8_t*)(x))[1] << 8) |          \
+      ((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL16
+#   define AV_WL16(p, d) do {                   \
+        ((uint8_t*)(p))[0] = (d);               \
+        ((uint8_t*)(p))[1] = (d)>>8;            \
+    } while(0)
+#endif
+
+#ifndef AV_RB32
+#   define AV_RB32(x)                                \
+    (((uint32_t)((const uint8_t*)(x))[0] << 24) |    \
+               (((const uint8_t*)(x))[1] << 16) |    \
+               (((const uint8_t*)(x))[2] <<  8) |    \
+                ((const uint8_t*)(x))[3])
+#endif
+#ifndef AV_WB32
+#   define AV_WB32(p, d) do {                   \
+        ((uint8_t*)(p))[3] = (d);               \
+        ((uint8_t*)(p))[2] = (d)>>8;            \
+        ((uint8_t*)(p))[1] = (d)>>16;           \
+        ((uint8_t*)(p))[0] = (d)>>24;           \
+    } while(0)
+#endif
+
+#ifndef AV_RL32
+#   define AV_RL32(x)                                \
+    (((uint32_t)((const uint8_t*)(x))[3] << 24) |    \
+               (((const uint8_t*)(x))[2] << 16) |    \
+               (((const uint8_t*)(x))[1] <<  8) |    \
+                ((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL32
+#   define AV_WL32(p, d) do {                   \
+        ((uint8_t*)(p))[0] = (d);               \
+        ((uint8_t*)(p))[1] = (d)>>8;            \
+        ((uint8_t*)(p))[2] = (d)>>16;           \
+        ((uint8_t*)(p))[3] = (d)>>24;           \
+    } while(0)
+#endif
+
+#ifndef AV_RB64
+#   define AV_RB64(x)                                   \
+    (((uint64_t)((const uint8_t*)(x))[0] << 56) |       \
+     ((uint64_t)((const uint8_t*)(x))[1] << 48) |       \
+     ((uint64_t)((const uint8_t*)(x))[2] << 40) |       \
+     ((uint64_t)((const uint8_t*)(x))[3] << 32) |       \
+     ((uint64_t)((const uint8_t*)(x))[4] << 24) |       \
+     ((uint64_t)((const uint8_t*)(x))[5] << 16) |       \
+     ((uint64_t)((const uint8_t*)(x))[6] <<  8) |       \
+      (uint64_t)((const uint8_t*)(x))[7])
+#endif
+#ifndef AV_WB64
+#   define AV_WB64(p, d) do {                   \
+        ((uint8_t*)(p))[7] = (d);               \
+        ((uint8_t*)(p))[6] = (d)>>8;            \
+        ((uint8_t*)(p))[5] = (d)>>16;           \
+        ((uint8_t*)(p))[4] = (d)>>24;           \
+        ((uint8_t*)(p))[3] = (d)>>32;           \
+        ((uint8_t*)(p))[2] = (d)>>40;           \
+        ((uint8_t*)(p))[1] = (d)>>48;           \
+        ((uint8_t*)(p))[0] = (d)>>56;           \
+    } while(0)
+#endif
+
+#ifndef AV_RL64
+#   define AV_RL64(x)                                   \
+    (((uint64_t)((const uint8_t*)(x))[7] << 56) |       \
+     ((uint64_t)((const uint8_t*)(x))[6] << 48) |       \
+     ((uint64_t)((const uint8_t*)(x))[5] << 40) |       \
+     ((uint64_t)((const uint8_t*)(x))[4] << 32) |       \
+     ((uint64_t)((const uint8_t*)(x))[3] << 24) |       \
+     ((uint64_t)((const uint8_t*)(x))[2] << 16) |       \
+     ((uint64_t)((const uint8_t*)(x))[1] <<  8) |       \
+      (uint64_t)((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL64
+#   define AV_WL64(p, d) do {                   \
+        ((uint8_t*)(p))[0] = (d);               \
+        ((uint8_t*)(p))[1] = (d)>>8;            \
+        ((uint8_t*)(p))[2] = (d)>>16;           \
+        ((uint8_t*)(p))[3] = (d)>>24;           \
+        ((uint8_t*)(p))[4] = (d)>>32;           \
+        ((uint8_t*)(p))[5] = (d)>>40;           \
+        ((uint8_t*)(p))[6] = (d)>>48;           \
+        ((uint8_t*)(p))[7] = (d)>>56;           \
+    } while(0)
+#endif
+
+#if AV_HAVE_BIGENDIAN
+#   define AV_RN(s, p)    AV_RB##s(p)
+#   define AV_WN(s, p, v) AV_WB##s(p, v)
+#else
+#   define AV_RN(s, p)    AV_RL##s(p)
+#   define AV_WN(s, p, v) AV_WL##s(p, v)
+#endif
+
+#endif /* HAVE_FAST_UNALIGNED */
+
+#ifndef AV_RN16
+#   define AV_RN16(p) AV_RN(16, p)
+#endif
+
+#ifndef AV_RN32
+#   define AV_RN32(p) AV_RN(32, p)
+#endif
+
+#ifndef AV_RN64
+#   define AV_RN64(p) AV_RN(64, p)
+#endif
+
+#ifndef AV_WN16
+#   define AV_WN16(p, v) AV_WN(16, p, v)
+#endif
+
+#ifndef AV_WN32
+#   define AV_WN32(p, v) AV_WN(32, p, v)
+#endif
+
+#ifndef AV_WN64
+#   define AV_WN64(p, v) AV_WN(64, p, v)
+#endif
+
+#if AV_HAVE_BIGENDIAN
+#   define AV_RB(s, p)    AV_RN##s(p)
+#   define AV_WB(s, p, v) AV_WN##s(p, v)
+#   define AV_RL(s, p)    av_bswap##s(AV_RN##s(p))
+#   define AV_WL(s, p, v) AV_WN##s(p, av_bswap##s(v))
+#else
+#   define AV_RB(s, p)    av_bswap##s(AV_RN##s(p))
+#   define AV_WB(s, p, v) AV_WN##s(p, av_bswap##s(v))
+#   define AV_RL(s, p)    AV_RN##s(p)
+#   define AV_WL(s, p, v) AV_WN##s(p, v)
+#endif
+
+#define AV_RB8(x)     (((const uint8_t*)(x))[0])
+#define AV_WB8(p, d)  do { ((uint8_t*)(p))[0] = (d); } while(0)
+
+#define AV_RL8(x)     AV_RB8(x)
+#define AV_WL8(p, d)  AV_WB8(p, d)
+
+#ifndef AV_RB16
+#   define AV_RB16(p)    AV_RB(16, p)
+#endif
+#ifndef AV_WB16
+#   define AV_WB16(p, v) AV_WB(16, p, v)
+#endif
+
+#ifndef AV_RL16
+#   define AV_RL16(p)    AV_RL(16, p)
+#endif
+#ifndef AV_WL16
+#   define AV_WL16(p, v) AV_WL(16, p, v)
+#endif
+
+#ifndef AV_RB32
+#   define AV_RB32(p)    AV_RB(32, p)
+#endif
+#ifndef AV_WB32
+#   define AV_WB32(p, v) AV_WB(32, p, v)
+#endif
+
+#ifndef AV_RL32
+#   define AV_RL32(p)    AV_RL(32, p)
+#endif
+#ifndef AV_WL32
+#   define AV_WL32(p, v) AV_WL(32, p, v)
+#endif
+
+#ifndef AV_RB64
+#   define AV_RB64(p)    AV_RB(64, p)
+#endif
+#ifndef AV_WB64
+#   define AV_WB64(p, v) AV_WB(64, p, v)
+#endif
+
+#ifndef AV_RL64
+#   define AV_RL64(p)    AV_RL(64, p)
+#endif
+#ifndef AV_WL64
+#   define AV_WL64(p, v) AV_WL(64, p, v)
+#endif
+
+#ifndef AV_RB24
+#   define AV_RB24(x)                           \
+    ((((const uint8_t*)(x))[0] << 16) |         \
+     (((const uint8_t*)(x))[1] <<  8) |         \
+      ((const uint8_t*)(x))[2])
+#endif
+#ifndef AV_WB24
+#   define AV_WB24(p, d) do {                   \
+        ((uint8_t*)(p))[2] = (d);               \
+        ((uint8_t*)(p))[1] = (d)>>8;            \
+        ((uint8_t*)(p))[0] = (d)>>16;           \
+    } while(0)
+#endif
+
+#ifndef AV_RL24
+#   define AV_RL24(x)                           \
+    ((((const uint8_t*)(x))[2] << 16) |         \
+     (((const uint8_t*)(x))[1] <<  8) |         \
+      ((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL24
+#   define AV_WL24(p, d) do {                   \
+        ((uint8_t*)(p))[0] = (d);               \
+        ((uint8_t*)(p))[1] = (d)>>8;            \
+        ((uint8_t*)(p))[2] = (d)>>16;           \
+    } while(0)
+#endif
+
+/*
+ * The AV_[RW]NA macros access naturally aligned data
+ * in a type-safe way.
+ */
+
+#define AV_RNA(s, p)    (((const av_alias##s*)(p))->u##s)
+#define AV_WNA(s, p, v) (((av_alias##s*)(p))->u##s = (v))
+
+#ifndef AV_RN16A
+#   define AV_RN16A(p) AV_RNA(16, p)
+#endif
+
+#ifndef AV_RN32A
+#   define AV_RN32A(p) AV_RNA(32, p)
+#endif
+
+#ifndef AV_RN64A
+#   define AV_RN64A(p) AV_RNA(64, p)
+#endif
+
+#ifndef AV_WN16A
+#   define AV_WN16A(p, v) AV_WNA(16, p, v)
+#endif
+
+#ifndef AV_WN32A
+#   define AV_WN32A(p, v) AV_WNA(32, p, v)
+#endif
+
+#ifndef AV_WN64A
+#   define AV_WN64A(p, v) AV_WNA(64, p, v)
+#endif
+
+/* Parameters for AV_COPY*, AV_SWAP*, AV_ZERO* must be
+ * naturally aligned. They may be implemented using MMX,
+ * so emms_c() must be called before using any float code
+ * afterwards.
+ */
+
+#define AV_COPY(n, d, s) \
+    (((av_alias##n*)(d))->u##n = ((const av_alias##n*)(s))->u##n)
+
+#ifndef AV_COPY16
+#   define AV_COPY16(d, s) AV_COPY(16, d, s)
+#endif
+
+#ifndef AV_COPY32
+#   define AV_COPY32(d, s) AV_COPY(32, d, s)
+#endif
+
+#ifndef AV_COPY64
+#   define AV_COPY64(d, s) AV_COPY(64, d, s)
+#endif
+
+#ifndef AV_COPY128
+#   define AV_COPY128(d, s)                    \
+    do {                                       \
+        AV_COPY64(d, s);                       \
+        AV_COPY64((char*)(d)+8, (char*)(s)+8); \
+    } while(0)
+#endif
+
+#define AV_SWAP(n, a, b) FFSWAP(av_alias##n, *(av_alias##n*)(a), *(av_alias##n*)(b))
+
+#ifndef AV_SWAP64
+#   define AV_SWAP64(a, b) AV_SWAP(64, a, b)
+#endif
+
+#define AV_ZERO(n, d) (((av_alias##n*)(d))->u##n = 0)
+
+#ifndef AV_ZERO16
+#   define AV_ZERO16(d) AV_ZERO(16, d)
+#endif
+
+#ifndef AV_ZERO32
+#   define AV_ZERO32(d) AV_ZERO(32, d)
+#endif
+
+#ifndef AV_ZERO64
+#   define AV_ZERO64(d) AV_ZERO(64, d)
+#endif
+
+#ifndef AV_ZERO128
+#   define AV_ZERO128(d)         \
+    do {                         \
+        AV_ZERO64(d);            \
+        AV_ZERO64((char*)(d)+8); \
+    } while(0)
+#endif
+
+#endif /* AVUTIL_INTREADWRITE_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/lfg.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/lfg.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/lfg.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/lfg.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,62 @@
+/*
+ * Lagged Fibonacci PRNG
+ * Copyright (c) 2008 Michael Niedermayer
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_LFG_H
+#define AVUTIL_LFG_H
+
+typedef struct {
+    unsigned int state[64];
+    int index;
+} AVLFG;
+
+void av_lfg_init(AVLFG *c, unsigned int seed);
+
+/**
+ * Get the next random unsigned 32-bit number using an ALFG.
+ *
+ * Please also consider a simple LCG like state= state*1664525+1013904223,
+ * it may be good enough and faster for your specific use case.
+ */
+static inline unsigned int av_lfg_get(AVLFG *c){
+    c->state[c->index & 63] = c->state[(c->index-24) & 63] + c->state[(c->index-55) & 63];
+    return c->state[c->index++ & 63];
+}
+
+/**
+ * Get the next random unsigned 32-bit number using a MLFG.
+ *
+ * Please also consider av_lfg_get() above, it is faster.
+ */
+static inline unsigned int av_mlfg_get(AVLFG *c){
+    unsigned int a= c->state[(c->index-55) & 63];
+    unsigned int b= c->state[(c->index-24) & 63];
+    return c->state[c->index++ & 63] = 2*a*b+a+b;
+}
+
+/**
+ * Get the next two numbers generated by a Box-Muller Gaussian
+ * generator using the random numbers issued by lfg.
+ *
+ * @param out array where the two generated numbers are placed
+ */
+void av_bmg_get(AVLFG *lfg, double out[2]);
+
+#endif /* AVUTIL_LFG_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/log.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/log.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/log.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/log.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,172 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_LOG_H
+#define AVUTIL_LOG_H
+
+#include <stdarg.h>
+#include "avutil.h"
+#include "attributes.h"
+
+/**
+ * Describe the class of an AVClass context structure. That is an
+ * arbitrary struct of which the first field is a pointer to an
+ * AVClass struct (e.g. AVCodecContext, AVFormatContext etc.).
+ */
+typedef struct AVClass {
+    /**
+     * The name of the class; usually it is the same name as the
+     * context structure type to which the AVClass is associated.
+     */
+    const char* class_name;
+
+    /**
+     * A pointer to a function which returns the name of a context
+     * instance ctx associated with the class.
+     */
+    const char* (*item_name)(void* ctx);
+
+    /**
+     * a pointer to the first option specified in the class if any or NULL
+     *
+     * @see av_set_default_options()
+     */
+    const struct AVOption *option;
+
+    /**
+     * LIBAVUTIL_VERSION with which this structure was created.
+     * This is used to allow fields to be added without requiring major
+     * version bumps everywhere.
+     */
+
+    int version;
+
+    /**
+     * Offset in the structure where log_level_offset is stored.
+     * 0 means there is no such variable
+     */
+    int log_level_offset_offset;
+
+    /**
+     * Offset in the structure where a pointer to the parent context for loging is stored.
+     * for example a decoder that uses eval.c could pass its AVCodecContext to eval as such
+     * parent context. And a av_log() implementation could then display the parent context
+     * can be NULL of course
+     */
+    int parent_log_context_offset;
+
+    /**
+     * Return next AVOptions-enabled child or NULL
+     */
+    void* (*child_next)(void *obj, void *prev);
+
+    /**
+     * Return an AVClass corresponding to next potential
+     * AVOptions-enabled child.
+     *
+     * The difference between child_next and this is that
+     * child_next iterates over _already existing_ objects, while
+     * child_class_next iterates over _all possible_ children.
+     */
+    const struct AVClass* (*child_class_next)(const struct AVClass *prev);
+} AVClass;
+
+/* av_log API */
+
+#define AV_LOG_QUIET    -8
+
+/**
+ * Something went really wrong and we will crash now.
+ */
+#define AV_LOG_PANIC     0
+
+/**
+ * Something went wrong and recovery is not possible.
+ * For example, no header was found for a format which depends
+ * on headers or an illegal combination of parameters is used.
+ */
+#define AV_LOG_FATAL     8
+
+/**
+ * Something went wrong and cannot losslessly be recovered.
+ * However, not all future data is affected.
+ */
+#define AV_LOG_ERROR    16
+
+/**
+ * Something somehow does not look correct. This may or may not
+ * lead to problems. An example would be the use of '-vstrict -2'.
+ */
+#define AV_LOG_WARNING  24
+
+#define AV_LOG_INFO     32
+#define AV_LOG_VERBOSE  40
+
+/**
+ * Stuff which is only useful for libav* developers.
+ */
+#define AV_LOG_DEBUG    48
+
+/**
+ * Send the specified message to the log if the level is less than or equal
+ * to the current av_log_level. By default, all logging messages are sent to
+ * stderr. This behavior can be altered by setting a different av_vlog callback
+ * function.
+ *
+ * @param avcl A pointer to an arbitrary struct of which the first field is a
+ * pointer to an AVClass struct.
+ * @param level The importance level of the message, lower values signifying
+ * higher importance.
+ * @param fmt The format string (printf-compatible) that specifies how
+ * subsequent arguments are converted to output.
+ * @see av_vlog
+ */
+void av_log(void *avcl, int level, const char *fmt, ...) av_printf_format(3, 4);
+
+void av_vlog(void *avcl, int level, const char *fmt, va_list);
+int av_log_get_level(void);
+void av_log_set_level(int);
+void av_log_set_callback(void (*)(void*, int, const char*, va_list));
+void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl);
+const char* av_default_item_name(void* ctx);
+
+/**
+ * av_dlog macros
+ * Useful to print debug messages that shouldn't get compiled in normally.
+ */
+
+#ifdef DEBUG
+#    define av_dlog(pctx, ...) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__)
+#else
+#    define av_dlog(pctx, ...)
+#endif
+
+/**
+ * Skip repeated messages, this requires the user app to use av_log() instead of
+ * (f)printf as the 2 would otherwise interfere and lead to
+ * "Last message repeated x times" messages below (f)printf messages with some
+ * bad luck.
+ * Also to receive the last, "last repeated" line if any, the user app must
+ * call av_log(NULL, AV_LOG_QUIET, ""); at the end
+ */
+#define AV_LOG_SKIP_REPEATED 1
+void av_log_set_flags(int arg);
+
+#endif /* AVUTIL_LOG_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/lzo.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/lzo.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/lzo.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/lzo.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,77 @@
+/*
+ * LZO 1x decompression
+ * copyright (c) 2006 Reimar Doeffinger
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_LZO_H
+#define AVUTIL_LZO_H
+
+/**
+ * @defgroup lavu_lzo LZO
+ * @ingroup lavu_crypto
+ *
+ * @{
+ */
+
+#include <stdint.h>
+
+/** @name Error flags returned by av_lzo1x_decode
+  * @{ */
+/// end of the input buffer reached before decoding finished
+#define AV_LZO_INPUT_DEPLETED 1
+/// decoded data did not fit into output buffer
+#define AV_LZO_OUTPUT_FULL 2
+/// a reference to previously decoded data was wrong
+#define AV_LZO_INVALID_BACKPTR 4
+/// a non-specific error in the compressed bitstream
+#define AV_LZO_ERROR 8
+/** @} */
+
+#define AV_LZO_INPUT_PADDING 8
+#define AV_LZO_OUTPUT_PADDING 12
+
+/**
+ * @brief Decodes LZO 1x compressed data.
+ * @param out output buffer
+ * @param outlen size of output buffer, number of bytes left are returned here
+ * @param in input buffer
+ * @param inlen size of input buffer, number of bytes left are returned here
+ * @return 0 on success, otherwise a combination of the error flags above
+ *
+ * Make sure all buffers are appropriately padded, in must provide
+ * AV_LZO_INPUT_PADDING, out must provide AV_LZO_OUTPUT_PADDING additional bytes.
+ */
+int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen);
+
+/**
+ * @brief deliberately overlapping memcpy implementation
+ * @param dst destination buffer; must be padded with 12 additional bytes
+ * @param back how many bytes back we start (the initial size of the overlapping window)
+ * @param cnt number of bytes to copy, must be >= 0
+ *
+ * cnt > back is valid, this will copy the bytes we just copied,
+ * thus creating a repeating pattern with a period length of back.
+ */
+void av_memcpy_backptr(uint8_t *dst, int back, int cnt);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_LZO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/mathematics.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/mathematics.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/mathematics.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/mathematics.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,122 @@
+/*
+ * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_MATHEMATICS_H
+#define AVUTIL_MATHEMATICS_H
+
+#include <stdint.h>
+#include <math.h>
+#include "attributes.h"
+#include "rational.h"
+
+#ifndef M_E
+#define M_E            2.7182818284590452354   /* e */
+#endif
+#ifndef M_LN2
+#define M_LN2          0.69314718055994530942  /* log_e 2 */
+#endif
+#ifndef M_LN10
+#define M_LN10         2.30258509299404568402  /* log_e 10 */
+#endif
+#ifndef M_LOG2_10
+#define M_LOG2_10      3.32192809488736234787  /* log_2 10 */
+#endif
+#ifndef M_PHI
+#define M_PHI          1.61803398874989484820   /* phi / golden ratio */
+#endif
+#ifndef M_PI
+#define M_PI           3.14159265358979323846  /* pi */
+#endif
+#ifndef M_SQRT1_2
+#define M_SQRT1_2      0.70710678118654752440  /* 1/sqrt(2) */
+#endif
+#ifndef M_SQRT2
+#define M_SQRT2        1.41421356237309504880  /* sqrt(2) */
+#endif
+#ifndef NAN
+#define NAN            (0.0/0.0)
+#endif
+#ifndef INFINITY
+#define INFINITY       (1.0/0.0)
+#endif
+
+/**
+ * @addtogroup lavu_math
+ * @{
+ */
+
+
+enum AVRounding {
+    AV_ROUND_ZERO     = 0, ///< Round toward zero.
+    AV_ROUND_INF      = 1, ///< Round away from zero.
+    AV_ROUND_DOWN     = 2, ///< Round toward -infinity.
+    AV_ROUND_UP       = 3, ///< Round toward +infinity.
+    AV_ROUND_NEAR_INF = 5, ///< Round to nearest and halfway cases away from zero.
+};
+
+/**
+ * Return the greatest common divisor of a and b.
+ * If both a and b are 0 or either or both are <0 then behavior is
+ * undefined.
+ */
+int64_t av_const av_gcd(int64_t a, int64_t b);
+
+/**
+ * Rescale a 64-bit integer with rounding to nearest.
+ * A simple a*b/c isn't possible as it can overflow.
+ */
+int64_t av_rescale(int64_t a, int64_t b, int64_t c) av_const;
+
+/**
+ * Rescale a 64-bit integer with specified rounding.
+ * A simple a*b/c isn't possible as it can overflow.
+ */
+int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding) av_const;
+
+/**
+ * Rescale a 64-bit integer by 2 rational numbers.
+ */
+int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const;
+
+/**
+ * Compare 2 timestamps each in its own timebases.
+ * The result of the function is undefined if one of the timestamps
+ * is outside the int64_t range when represented in the others timebase.
+ * @return -1 if ts_a is before ts_b, 1 if ts_a is after ts_b or 0 if they represent the same position
+ */
+int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b);
+
+/**
+ * Compare 2 integers modulo mod.
+ * That is we compare integers a and b for which only the least
+ * significant log2(mod) bits are known.
+ *
+ * @param mod must be a power of 2
+ * @return a negative value if a is smaller than b
+ *         a positive value if a is greater than b
+ *         0                if a equals          b
+ */
+int64_t av_compare_mod(uint64_t a, uint64_t b, uint64_t mod);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_MATHEMATICS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/md5.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/md5.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/md5.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/md5.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,46 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_MD5_H
+#define AVUTIL_MD5_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_md5 MD5
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+extern const int av_md5_size;
+
+struct AVMD5;
+
+void av_md5_init(struct AVMD5 *ctx);
+void av_md5_update(struct AVMD5 *ctx, const uint8_t *src, const int len);
+void av_md5_final(struct AVMD5 *ctx, uint8_t *dst);
+void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_MD5_H */
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/mem.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/mem.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/mem.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/mem.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,136 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * memory handling functions
+ */
+
+#ifndef AVUTIL_MEM_H
+#define AVUTIL_MEM_H
+
+#include "attributes.h"
+#include "avutil.h"
+
+/**
+ * @addtogroup lavu_mem
+ * @{
+ */
+
+
+#if defined(__ICC) && _ICC < 1200 || defined(__SUNPRO_C)
+    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
+    #define DECLARE_ASM_CONST(n,t,v)    const t __attribute__ ((aligned (n))) v
+#elif defined(__TI_COMPILER_VERSION__)
+    #define DECLARE_ALIGNED(n,t,v)                      \
+        AV_PRAGMA(DATA_ALIGN(v,n))                      \
+        t __attribute__((aligned(n))) v
+    #define DECLARE_ASM_CONST(n,t,v)                    \
+        AV_PRAGMA(DATA_ALIGN(v,n))                      \
+        static const t __attribute__((aligned(n))) v
+#elif defined(__GNUC__)
+    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
+    #define DECLARE_ASM_CONST(n,t,v)    static const t av_used __attribute__ ((aligned (n))) v
+#elif defined(_MSC_VER)
+    #define DECLARE_ALIGNED(n,t,v)      __declspec(align(n)) t v
+    #define DECLARE_ASM_CONST(n,t,v)    __declspec(align(n)) static const t v
+#else
+    #define DECLARE_ALIGNED(n,t,v)      t v
+    #define DECLARE_ASM_CONST(n,t,v)    static const t v
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(3,1)
+    #define av_malloc_attrib __attribute__((__malloc__))
+#else
+    #define av_malloc_attrib
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(4,3)
+    #define av_alloc_size(n) __attribute__((alloc_size(n)))
+#else
+    #define av_alloc_size(n)
+#endif
+
+/**
+ * Allocate a block of size bytes with alignment suitable for all
+ * memory accesses (including vectors if available on the CPU).
+ * @param size Size in bytes for the memory block to be allocated.
+ * @return Pointer to the allocated block, NULL if the block cannot
+ * be allocated.
+ * @see av_mallocz()
+ */
+void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1);
+
+/**
+ * Allocate or reallocate a block of memory.
+ * If ptr is NULL and size > 0, allocate a new block. If
+ * size is zero, free the memory block pointed to by ptr.
+ * @param ptr Pointer to a memory block already allocated with
+ * av_malloc(z)() or av_realloc() or NULL.
+ * @param size Size in bytes for the memory block to be allocated or
+ * reallocated.
+ * @return Pointer to a newly reallocated block or NULL if the block
+ * cannot be reallocated or the function is used to free the memory block.
+ * @see av_fast_realloc()
+ */
+void *av_realloc(void *ptr, size_t size) av_alloc_size(2);
+
+/**
+ * Free a memory block which has been allocated with av_malloc(z)() or
+ * av_realloc().
+ * @param ptr Pointer to the memory block which should be freed.
+ * @note ptr = NULL is explicitly allowed.
+ * @note It is recommended that you use av_freep() instead.
+ * @see av_freep()
+ */
+void av_free(void *ptr);
+
+/**
+ * Allocate a block of size bytes with alignment suitable for all
+ * memory accesses (including vectors if available on the CPU) and
+ * zero all the bytes of the block.
+ * @param size Size in bytes for the memory block to be allocated.
+ * @return Pointer to the allocated block, NULL if it cannot be allocated.
+ * @see av_malloc()
+ */
+void *av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1);
+
+/**
+ * Duplicate the string s.
+ * @param s string to be duplicated
+ * @return Pointer to a newly allocated string containing a
+ * copy of s or NULL if the string cannot be allocated.
+ */
+char *av_strdup(const char *s) av_malloc_attrib;
+
+/**
+ * Free a memory block which has been allocated with av_malloc(z)() or
+ * av_realloc() and set the pointer pointing to it to NULL.
+ * @param ptr Pointer to the pointer to the memory block which should
+ * be freed.
+ * @see av_free()
+ */
+void av_freep(void *ptr);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_MEM_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/old_pix_fmts.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/old_pix_fmts.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/old_pix_fmts.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/old_pix_fmts.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,171 @@
+/*
+ * copyright (c) 2006-2012 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_OLD_PIX_FMTS_H
+#define AVUTIL_OLD_PIX_FMTS_H
+
+/*
+ * This header exists to prevent new pixel formats from being accidentally added
+ * to the deprecated list.
+ * Do not include it directly. It will be removed on next major bump
+ *
+ * Do not add new items to this list. Use the AVPixelFormat enum instead.
+ */
+    PIX_FMT_NONE = AV_PIX_FMT_NONE,
+    PIX_FMT_YUV420P,   ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
+    PIX_FMT_YUYV422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
+    PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
+    PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
+    PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
+    PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
+    PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
+    PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
+    PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
+    PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
+    PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
+    PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
+    PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
+    PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
+    PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
+    PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
+    PIX_FMT_XVMC_MPEG2_IDCT,
+    PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
+    PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
+    PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
+    PIX_FMT_BGR4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
+    PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
+    PIX_FMT_RGB8,      ///< packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
+    PIX_FMT_RGB4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
+    PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
+    PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
+    PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
+
+    PIX_FMT_ARGB,      ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
+    PIX_FMT_RGBA,      ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
+    PIX_FMT_ABGR,      ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
+    PIX_FMT_BGRA,      ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
+
+    PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
+    PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
+    PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
+    PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
+    PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
+    PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
+    PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
+
+    PIX_FMT_RGB565BE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian
+    PIX_FMT_RGB565LE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), little-endian
+    PIX_FMT_RGB555BE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
+    PIX_FMT_RGB555LE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
+
+    PIX_FMT_BGR565BE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), big-endian
+    PIX_FMT_BGR565LE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), little-endian
+    PIX_FMT_BGR555BE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
+    PIX_FMT_BGR555LE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
+
+    PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
+    PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
+    PIX_FMT_VAAPI_VLD,  ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+
+    PIX_FMT_YUV420P16LE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    PIX_FMT_YUV420P16BE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    PIX_FMT_YUV422P16LE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    PIX_FMT_VDPAU_MPEG4,  ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
+
+    PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
+    PIX_FMT_RGB444BE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
+    PIX_FMT_BGR444LE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
+    PIX_FMT_BGR444BE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
+    PIX_FMT_GRAY8A,    ///< 8bit gray, 8bit alpha
+    PIX_FMT_BGR48BE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
+    PIX_FMT_BGR48LE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
+
+    //the following 10 formats have the disadvantage of needing 1 format for each bit depth, thus
+    //If you want to support multiple bit depths, then using PIX_FMT_YUV420P16* with the bpp stored separately
+    //is better
+    PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    PIX_FMT_VDA_VLD,    ///< hardware decoding through VDA
+
+#ifdef AV_PIX_FMT_ABI_GIT_MASTER
+    PIX_FMT_RGBA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+    PIX_FMT_RGBA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+    PIX_FMT_BGRA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+    PIX_FMT_BGRA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+#endif
+    PIX_FMT_GBRP,      ///< planar GBR 4:4:4 24bpp
+    PIX_FMT_GBRP9BE,   ///< planar GBR 4:4:4 27bpp, big endian
+    PIX_FMT_GBRP9LE,   ///< planar GBR 4:4:4 27bpp, little endian
+    PIX_FMT_GBRP10BE,  ///< planar GBR 4:4:4 30bpp, big endian
+    PIX_FMT_GBRP10LE,  ///< planar GBR 4:4:4 30bpp, little endian
+    PIX_FMT_GBRP16BE,  ///< planar GBR 4:4:4 48bpp, big endian
+    PIX_FMT_GBRP16LE,  ///< planar GBR 4:4:4 48bpp, little endian
+
+#ifndef AV_PIX_FMT_ABI_GIT_MASTER
+    PIX_FMT_RGBA64BE=0x123,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+    PIX_FMT_RGBA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+    PIX_FMT_BGRA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+    PIX_FMT_BGRA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+#endif
+    PIX_FMT_0RGB=0x123+4,      ///< packed RGB 8:8:8, 32bpp, 0RGB0RGB...
+    PIX_FMT_RGB0,      ///< packed RGB 8:8:8, 32bpp, RGB0RGB0...
+    PIX_FMT_0BGR,      ///< packed BGR 8:8:8, 32bpp, 0BGR0BGR...
+    PIX_FMT_BGR0,      ///< packed BGR 8:8:8, 32bpp, BGR0BGR0...
+    PIX_FMT_YUVA444P,  ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples)
+    PIX_FMT_YUVA422P,  ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
+
+    PIX_FMT_YUV420P12BE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    PIX_FMT_YUV420P12LE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    PIX_FMT_YUV420P14BE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    PIX_FMT_YUV420P14LE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    PIX_FMT_YUV422P12BE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    PIX_FMT_YUV422P12LE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    PIX_FMT_YUV422P14BE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    PIX_FMT_YUV422P14LE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    PIX_FMT_YUV444P12BE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    PIX_FMT_YUV444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    PIX_FMT_YUV444P14BE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    PIX_FMT_YUV444P14LE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    PIX_FMT_GBRP12BE,    ///< planar GBR 4:4:4 36bpp, big endian
+    PIX_FMT_GBRP12LE,    ///< planar GBR 4:4:4 36bpp, little endian
+    PIX_FMT_GBRP14BE,    ///< planar GBR 4:4:4 42bpp, big endian
+    PIX_FMT_GBRP14LE,    ///< planar GBR 4:4:4 42bpp, little endian
+
+    PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
+#endif /* AVUTIL_OLD_PIX_FMTS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/opt.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/opt.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/opt.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/opt.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,591 @@
+/*
+ * AVOptions
+ * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_OPT_H
+#define AVUTIL_OPT_H
+
+/**
+ * @file
+ * AVOptions
+ */
+
+#include "rational.h"
+#include "avutil.h"
+#include "dict.h"
+#include "log.h"
+
+/**
+ * @defgroup avoptions AVOptions
+ * @ingroup lavu_data
+ * @{
+ * AVOptions provide a generic system to declare options on arbitrary structs
+ * ("objects"). An option can have a help text, a type and a range of possible
+ * values. Options may then be enumerated, read and written to.
+ *
+ * @section avoptions_implement Implementing AVOptions
+ * This section describes how to add AVOptions capabilities to a struct.
+ *
+ * All AVOptions-related information is stored in an AVClass. Therefore
+ * the first member of the struct must be a pointer to an AVClass describing it.
+ * The option field of the AVClass must be set to a NULL-terminated static array
+ * of AVOptions. Each AVOption must have a non-empty name, a type, a default
+ * value and for number-type AVOptions also a range of allowed values. It must
+ * also declare an offset in bytes from the start of the struct, where the field
+ * associated with this AVOption is located. Other fields in the AVOption struct
+ * should also be set when applicable, but are not required.
+ *
+ * The following example illustrates an AVOptions-enabled struct:
+ * @code
+ * typedef struct test_struct {
+ *     AVClass *class;
+ *     int      int_opt;
+ *     char    *str_opt;
+ *     uint8_t *bin_opt;
+ *     int      bin_len;
+ * } test_struct;
+ *
+ * static const AVOption options[] = {
+ *   { "test_int", "This is a test option of int type.", offsetof(test_struct, int_opt),
+ *     AV_OPT_TYPE_INT, { -1 }, INT_MIN, INT_MAX },
+ *   { "test_str", "This is a test option of string type.", offsetof(test_struct, str_opt),
+ *     AV_OPT_TYPE_STRING },
+ *   { "test_bin", "This is a test option of binary type.", offsetof(test_struct, bin_opt),
+ *     AV_OPT_TYPE_BINARY },
+ *   { NULL },
+ * };
+ *
+ * static const AVClass test_class = {
+ *     .class_name = "test class",
+ *     .item_name  = av_default_item_name,
+ *     .option     = options,
+ *     .version    = LIBAVUTIL_VERSION_INT,
+ * };
+ * @endcode
+ *
+ * Next, when allocating your struct, you must ensure that the AVClass pointer
+ * is set to the correct value. Then, av_opt_set_defaults() must be called to
+ * initialize defaults. After that the struct is ready to be used with the
+ * AVOptions API.
+ *
+ * When cleaning up, you may use the av_opt_free() function to automatically
+ * free all the allocated string and binary options.
+ *
+ * Continuing with the above example:
+ *
+ * @code
+ * test_struct *alloc_test_struct(void)
+ * {
+ *     test_struct *ret = av_malloc(sizeof(*ret));
+ *     ret->class = &test_class;
+ *     av_opt_set_defaults(ret);
+ *     return ret;
+ * }
+ * void free_test_struct(test_struct **foo)
+ * {
+ *     av_opt_free(*foo);
+ *     av_freep(foo);
+ * }
+ * @endcode
+ *
+ * @subsection avoptions_implement_nesting Nesting
+ *      It may happen that an AVOptions-enabled struct contains another
+ *      AVOptions-enabled struct as a member (e.g. AVCodecContext in
+ *      libavcodec exports generic options, while its priv_data field exports
+ *      codec-specific options). In such a case, it is possible to set up the
+ *      parent struct to export a child's options. To do that, simply
+ *      implement AVClass.child_next() and AVClass.child_class_next() in the
+ *      parent struct's AVClass.
+ *      Assuming that the test_struct from above now also contains a
+ *      child_struct field:
+ *
+ *      @code
+ *      typedef struct child_struct {
+ *          AVClass *class;
+ *          int flags_opt;
+ *      } child_struct;
+ *      static const AVOption child_opts[] = {
+ *          { "test_flags", "This is a test option of flags type.",
+ *            offsetof(child_struct, flags_opt), AV_OPT_TYPE_FLAGS, { 0 }, INT_MIN, INT_MAX },
+ *          { NULL },
+ *      };
+ *      static const AVClass child_class = {
+ *          .class_name = "child class",
+ *          .item_name  = av_default_item_name,
+ *          .option     = child_opts,
+ *          .version    = LIBAVUTIL_VERSION_INT,
+ *      };
+ *
+ *      void *child_next(void *obj, void *prev)
+ *      {
+ *          test_struct *t = obj;
+ *          if (!prev && t->child_struct)
+ *              return t->child_struct;
+ *          return NULL
+ *      }
+ *      const AVClass child_class_next(const AVClass *prev)
+ *      {
+ *          return prev ? NULL : &child_class;
+ *      }
+ *      @endcode
+ *      Putting child_next() and child_class_next() as defined above into
+ *      test_class will now make child_struct's options accessible through
+ *      test_struct (again, proper setup as described above needs to be done on
+ *      child_struct right after it is created).
+ *
+ *      From the above example it might not be clear why both child_next()
+ *      and child_class_next() are needed. The distinction is that child_next()
+ *      iterates over actually existing objects, while child_class_next()
+ *      iterates over all possible child classes. E.g. if an AVCodecContext
+ *      was initialized to use a codec which has private options, then its
+ *      child_next() will return AVCodecContext.priv_data and finish
+ *      iterating. OTOH child_class_next() on AVCodecContext.av_class will
+ *      iterate over all available codecs with private options.
+ *
+ * @subsection avoptions_implement_named_constants Named constants
+ *      It is possible to create named constants for options. Simply set the unit
+ *      field of the option the constants should apply to to a string and
+ *      create the constants themselves as options of type AV_OPT_TYPE_CONST
+ *      with their unit field set to the same string.
+ *      Their default_val field should contain the value of the named
+ *      constant.
+ *      For example, to add some named constants for the test_flags option
+ *      above, put the following into the child_opts array:
+ *      @code
+ *      { "test_flags", "This is a test option of flags type.",
+ *        offsetof(child_struct, flags_opt), AV_OPT_TYPE_FLAGS, { 0 }, INT_MIN, INT_MAX, "test_unit" },
+ *      { "flag1", "This is a flag with value 16", 0, AV_OPT_TYPE_CONST, { 16 }, 0, 0, "test_unit" },
+ *      @endcode
+ *
+ * @section avoptions_use Using AVOptions
+ * This section deals with accessing options in an AVOptions-enabled struct.
+ * Such structs in Libav are e.g. AVCodecContext in libavcodec or
+ * AVFormatContext in libavformat.
+ *
+ * @subsection avoptions_use_examine Examining AVOptions
+ * The basic functions for examining options are av_opt_next(), which iterates
+ * over all options defined for one object, and av_opt_find(), which searches
+ * for an option with the given name.
+ *
+ * The situation is more complicated with nesting. An AVOptions-enabled struct
+ * may have AVOptions-enabled children. Passing the AV_OPT_SEARCH_CHILDREN flag
+ * to av_opt_find() will make the function search children recursively.
+ *
+ * For enumerating there are basically two cases. The first is when you want to
+ * get all options that may potentially exist on the struct and its children
+ * (e.g.  when constructing documentation). In that case you should call
+ * av_opt_child_class_next() recursively on the parent struct's AVClass.  The
+ * second case is when you have an already initialized struct with all its
+ * children and you want to get all options that can be actually written or read
+ * from it. In that case you should call av_opt_child_next() recursively (and
+ * av_opt_next() on each result).
+ *
+ * @subsection avoptions_use_get_set Reading and writing AVOptions
+ * When setting options, you often have a string read directly from the
+ * user. In such a case, simply passing it to av_opt_set() is enough. For
+ * non-string type options, av_opt_set() will parse the string according to the
+ * option type.
+ *
+ * Similarly av_opt_get() will read any option type and convert it to a string
+ * which will be returned. Do not forget that the string is allocated, so you
+ * have to free it with av_free().
+ *
+ * In some cases it may be more convenient to put all options into an
+ * AVDictionary and call av_opt_set_dict() on it. A specific case of this
+ * are the format/codec open functions in lavf/lavc which take a dictionary
+ * filled with option as a parameter. This allows to set some options
+ * that cannot be set otherwise, since e.g. the input file format is not known
+ * before the file is actually opened.
+ */
+
+enum AVOptionType{
+    AV_OPT_TYPE_FLAGS,
+    AV_OPT_TYPE_INT,
+    AV_OPT_TYPE_INT64,
+    AV_OPT_TYPE_DOUBLE,
+    AV_OPT_TYPE_FLOAT,
+    AV_OPT_TYPE_STRING,
+    AV_OPT_TYPE_RATIONAL,
+    AV_OPT_TYPE_BINARY,  ///< offset must point to a pointer immediately followed by an int for the length
+    AV_OPT_TYPE_CONST = 128,
+#if FF_API_OLD_AVOPTIONS
+    FF_OPT_TYPE_FLAGS = 0,
+    FF_OPT_TYPE_INT,
+    FF_OPT_TYPE_INT64,
+    FF_OPT_TYPE_DOUBLE,
+    FF_OPT_TYPE_FLOAT,
+    FF_OPT_TYPE_STRING,
+    FF_OPT_TYPE_RATIONAL,
+    FF_OPT_TYPE_BINARY,  ///< offset must point to a pointer immediately followed by an int for the length
+    FF_OPT_TYPE_CONST=128,
+#endif
+};
+
+/**
+ * AVOption
+ */
+typedef struct AVOption {
+    const char *name;
+
+    /**
+     * short English help text
+     * @todo What about other languages?
+     */
+    const char *help;
+
+    /**
+     * The offset relative to the context structure where the option
+     * value is stored. It should be 0 for named constants.
+     */
+    int offset;
+    enum AVOptionType type;
+
+    /**
+     * the default value for scalar options
+     */
+    union {
+        double dbl;
+        const char *str;
+        /* TODO those are unused now */
+        int64_t i64;
+        AVRational q;
+    } default_val;
+    double min;                 ///< minimum valid value for the option
+    double max;                 ///< maximum valid value for the option
+
+    int flags;
+#define AV_OPT_FLAG_ENCODING_PARAM  1   ///< a generic parameter which can be set by the user for muxing or encoding
+#define AV_OPT_FLAG_DECODING_PARAM  2   ///< a generic parameter which can be set by the user for demuxing or decoding
+#define AV_OPT_FLAG_METADATA        4   ///< some data extracted or inserted into the file like title, comment, ...
+#define AV_OPT_FLAG_AUDIO_PARAM     8
+#define AV_OPT_FLAG_VIDEO_PARAM     16
+#define AV_OPT_FLAG_SUBTITLE_PARAM  32
+//FIXME think about enc-audio, ... style flags
+
+    /**
+     * The logical unit to which the option belongs. Non-constant
+     * options and corresponding named constants share the same
+     * unit. May be NULL.
+     */
+    const char *unit;
+} AVOption;
+
+#if FF_API_FIND_OPT
+/**
+ * Look for an option in obj. Look only for the options which
+ * have the flags set as specified in mask and flags (that is,
+ * for which it is the case that opt->flags & mask == flags).
+ *
+ * @param[in] obj a pointer to a struct whose first element is a
+ * pointer to an AVClass
+ * @param[in] name the name of the option to look for
+ * @param[in] unit the unit of the option to look for, or any if NULL
+ * @return a pointer to the option found, or NULL if no option
+ * has been found
+ *
+ * @deprecated use av_opt_find.
+ */
+attribute_deprecated
+const AVOption *av_find_opt(void *obj, const char *name, const char *unit, int mask, int flags);
+#endif
+
+#if FF_API_OLD_AVOPTIONS
+/**
+ * Set the field of obj with the given name to value.
+ *
+ * @param[in] obj A struct whose first element is a pointer to an
+ * AVClass.
+ * @param[in] name the name of the field to set
+ * @param[in] val The value to set. If the field is not of a string
+ * type, then the given string is parsed.
+ * SI postfixes and some named scalars are supported.
+ * If the field is of a numeric type, it has to be a numeric or named
+ * scalar. Behavior with more than one scalar and +- infix operators
+ * is undefined.
+ * If the field is of a flags type, it has to be a sequence of numeric
+ * scalars or named flags separated by '+' or '-'. Prefixing a flag
+ * with '+' causes it to be set without affecting the other flags;
+ * similarly, '-' unsets a flag.
+ * @param[out] o_out if non-NULL put here a pointer to the AVOption
+ * found
+ * @param alloc this parameter is currently ignored
+ * @return 0 if the value has been set, or an AVERROR code in case of
+ * error:
+ * AVERROR_OPTION_NOT_FOUND if no matching option exists
+ * AVERROR(ERANGE) if the value is out of range
+ * AVERROR(EINVAL) if the value is not valid
+ * @deprecated use av_opt_set()
+ */
+attribute_deprecated
+int av_set_string3(void *obj, const char *name, const char *val, int alloc, const AVOption **o_out);
+
+attribute_deprecated const AVOption *av_set_double(void *obj, const char *name, double n);
+attribute_deprecated const AVOption *av_set_q(void *obj, const char *name, AVRational n);
+attribute_deprecated const AVOption *av_set_int(void *obj, const char *name, int64_t n);
+
+attribute_deprecated double av_get_double(void *obj, const char *name, const AVOption **o_out);
+attribute_deprecated AVRational av_get_q(void *obj, const char *name, const AVOption **o_out);
+attribute_deprecated int64_t av_get_int(void *obj, const char *name, const AVOption **o_out);
+attribute_deprecated const char *av_get_string(void *obj, const char *name, const AVOption **o_out, char *buf, int buf_len);
+attribute_deprecated const AVOption *av_next_option(void *obj, const AVOption *last);
+#endif
+
+/**
+ * Show the obj options.
+ *
+ * @param req_flags requested flags for the options to show. Show only the
+ * options for which it is opt->flags & req_flags.
+ * @param rej_flags rejected flags for the options to show. Show only the
+ * options for which it is !(opt->flags & req_flags).
+ * @param av_log_obj log context to use for showing the options
+ */
+int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags);
+
+/**
+ * Set the values of all AVOption fields to their default values.
+ *
+ * @param s an AVOption-enabled struct (its first member must be a pointer to AVClass)
+ */
+void av_opt_set_defaults(void *s);
+
+#if FF_API_OLD_AVOPTIONS
+attribute_deprecated
+void av_opt_set_defaults2(void *s, int mask, int flags);
+#endif
+
+/**
+ * Parse the key/value pairs list in opts. For each key/value pair
+ * found, stores the value in the field in ctx that is named like the
+ * key. ctx must be an AVClass context, storing is done using
+ * AVOptions.
+ *
+ * @param key_val_sep a 0-terminated list of characters used to
+ * separate key from value
+ * @param pairs_sep a 0-terminated list of characters used to separate
+ * two pairs from each other
+ * @return the number of successfully set key/value pairs, or a negative
+ * value corresponding to an AVERROR code in case of error:
+ * AVERROR(EINVAL) if opts cannot be parsed,
+ * the error code issued by av_set_string3() if a key/value pair
+ * cannot be set
+ */
+int av_set_options_string(void *ctx, const char *opts,
+                          const char *key_val_sep, const char *pairs_sep);
+
+/**
+ * Free all string and binary options in obj.
+ */
+void av_opt_free(void *obj);
+
+/**
+ * Check whether a particular flag is set in a flags field.
+ *
+ * @param field_name the name of the flag field option
+ * @param flag_name the name of the flag to check
+ * @return non-zero if the flag is set, zero if the flag isn't set,
+ *         isn't of the right type, or the flags field doesn't exist.
+ */
+int av_opt_flag_is_set(void *obj, const char *field_name, const char *flag_name);
+
+/*
+ * Set all the options from a given dictionary on an object.
+ *
+ * @param obj a struct whose first element is a pointer to AVClass
+ * @param options options to process. This dictionary will be freed and replaced
+ *                by a new one containing all options not found in obj.
+ *                Of course this new dictionary needs to be freed by caller
+ *                with av_dict_free().
+ *
+ * @return 0 on success, a negative AVERROR if some option was found in obj,
+ *         but could not be set.
+ *
+ * @see av_dict_copy()
+ */
+int av_opt_set_dict(void *obj, struct AVDictionary **options);
+
+/**
+ * @defgroup opt_eval_funcs Evaluating option strings
+ * @{
+ * This group of functions can be used to evaluate option strings
+ * and get numbers out of them. They do the same thing as av_opt_set(),
+ * except the result is written into the caller-supplied pointer.
+ *
+ * @param obj a struct whose first element is a pointer to AVClass.
+ * @param o an option for which the string is to be evaluated.
+ * @param val string to be evaluated.
+ * @param *_out value of the string will be written here.
+ *
+ * @return 0 on success, a negative number on failure.
+ */
+int av_opt_eval_flags (void *obj, const AVOption *o, const char *val, int        *flags_out);
+int av_opt_eval_int   (void *obj, const AVOption *o, const char *val, int        *int_out);
+int av_opt_eval_int64 (void *obj, const AVOption *o, const char *val, int64_t    *int64_out);
+int av_opt_eval_float (void *obj, const AVOption *o, const char *val, float      *float_out);
+int av_opt_eval_double(void *obj, const AVOption *o, const char *val, double     *double_out);
+int av_opt_eval_q     (void *obj, const AVOption *o, const char *val, AVRational *q_out);
+/**
+ * @}
+ */
+
+#define AV_OPT_SEARCH_CHILDREN   0x0001 /**< Search in possible children of the
+                                             given object first. */
+/**
+ *  The obj passed to av_opt_find() is fake -- only a double pointer to AVClass
+ *  instead of a required pointer to a struct containing AVClass. This is
+ *  useful for searching for options without needing to allocate the corresponding
+ *  object.
+ */
+#define AV_OPT_SEARCH_FAKE_OBJ   0x0002
+
+/**
+ * Look for an option in an object. Consider only options which
+ * have all the specified flags set.
+ *
+ * @param[in] obj A pointer to a struct whose first element is a
+ *                pointer to an AVClass.
+ *                Alternatively a double pointer to an AVClass, if
+ *                AV_OPT_SEARCH_FAKE_OBJ search flag is set.
+ * @param[in] name The name of the option to look for.
+ * @param[in] unit When searching for named constants, name of the unit
+ *                 it belongs to.
+ * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG).
+ * @param search_flags A combination of AV_OPT_SEARCH_*.
+ *
+ * @return A pointer to the option found, or NULL if no option
+ *         was found.
+ *
+ * @note Options found with AV_OPT_SEARCH_CHILDREN flag may not be settable
+ * directly with av_set_string3(). Use special calls which take an options
+ * AVDictionary (e.g. avformat_open_input()) to set options found with this
+ * flag.
+ */
+const AVOption *av_opt_find(void *obj, const char *name, const char *unit,
+                            int opt_flags, int search_flags);
+
+/**
+ * Look for an option in an object. Consider only options which
+ * have all the specified flags set.
+ *
+ * @param[in] obj A pointer to a struct whose first element is a
+ *                pointer to an AVClass.
+ *                Alternatively a double pointer to an AVClass, if
+ *                AV_OPT_SEARCH_FAKE_OBJ search flag is set.
+ * @param[in] name The name of the option to look for.
+ * @param[in] unit When searching for named constants, name of the unit
+ *                 it belongs to.
+ * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG).
+ * @param search_flags A combination of AV_OPT_SEARCH_*.
+ * @param[out] target_obj if non-NULL, an object to which the option belongs will be
+ * written here. It may be different from obj if AV_OPT_SEARCH_CHILDREN is present
+ * in search_flags. This parameter is ignored if search_flags contain
+ * AV_OPT_SEARCH_FAKE_OBJ.
+ *
+ * @return A pointer to the option found, or NULL if no option
+ *         was found.
+ */
+const AVOption *av_opt_find2(void *obj, const char *name, const char *unit,
+                             int opt_flags, int search_flags, void **target_obj);
+
+/**
+ * Iterate over all AVOptions belonging to obj.
+ *
+ * @param obj an AVOptions-enabled struct or a double pointer to an
+ *            AVClass describing it.
+ * @param prev result of the previous call to av_opt_next() on this object
+ *             or NULL
+ * @return next AVOption or NULL
+ */
+const AVOption *av_opt_next(void *obj, const AVOption *prev);
+
+/**
+ * Iterate over AVOptions-enabled children of obj.
+ *
+ * @param prev result of a previous call to this function or NULL
+ * @return next AVOptions-enabled child or NULL
+ */
+void *av_opt_child_next(void *obj, void *prev);
+
+/**
+ * Iterate over potential AVOptions-enabled children of parent.
+ *
+ * @param prev result of a previous call to this function or NULL
+ * @return AVClass corresponding to next potential child or NULL
+ */
+const AVClass *av_opt_child_class_next(const AVClass *parent, const AVClass *prev);
+
+/**
+ * @defgroup opt_set_funcs Option setting functions
+ * @{
+ * Those functions set the field of obj with the given name to value.
+ *
+ * @param[in] obj A struct whose first element is a pointer to an AVClass.
+ * @param[in] name the name of the field to set
+ * @param[in] val The value to set. In case of av_opt_set() if the field is not
+ * of a string type, then the given string is parsed.
+ * SI postfixes and some named scalars are supported.
+ * If the field is of a numeric type, it has to be a numeric or named
+ * scalar. Behavior with more than one scalar and +- infix operators
+ * is undefined.
+ * If the field is of a flags type, it has to be a sequence of numeric
+ * scalars or named flags separated by '+' or '-'. Prefixing a flag
+ * with '+' causes it to be set without affecting the other flags;
+ * similarly, '-' unsets a flag.
+ * @param search_flags flags passed to av_opt_find2. I.e. if AV_OPT_SEARCH_CHILDREN
+ * is passed here, then the option may be set on a child of obj.
+ *
+ * @return 0 if the value has been set, or an AVERROR code in case of
+ * error:
+ * AVERROR_OPTION_NOT_FOUND if no matching option exists
+ * AVERROR(ERANGE) if the value is out of range
+ * AVERROR(EINVAL) if the value is not valid
+ */
+int av_opt_set       (void *obj, const char *name, const char *val, int search_flags);
+int av_opt_set_int   (void *obj, const char *name, int64_t     val, int search_flags);
+int av_opt_set_double(void *obj, const char *name, double      val, int search_flags);
+int av_opt_set_q     (void *obj, const char *name, AVRational  val, int search_flags);
+/**
+ * @}
+ */
+
+/**
+ * @defgroup opt_get_funcs Option getting functions
+ * @{
+ * Those functions get a value of the option with the given name from an object.
+ *
+ * @param[in] obj a struct whose first element is a pointer to an AVClass.
+ * @param[in] name name of the option to get.
+ * @param[in] search_flags flags passed to av_opt_find2. I.e. if AV_OPT_SEARCH_CHILDREN
+ * is passed here, then the option may be found in a child of obj.
+ * @param[out] out_val value of the option will be written here
+ * @return 0 on success, a negative error code otherwise
+ */
+/**
+ * @note the returned string will av_malloc()ed and must be av_free()ed by the caller
+ */
+int av_opt_get       (void *obj, const char *name, int search_flags, uint8_t   **out_val);
+int av_opt_get_int   (void *obj, const char *name, int search_flags, int64_t    *out_val);
+int av_opt_get_double(void *obj, const char *name, int search_flags, double     *out_val);
+int av_opt_get_q     (void *obj, const char *name, int search_flags, AVRational *out_val);
+/**
+ * @}
+ * @}
+ */
+
+#endif /* AVUTIL_OPT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/parseutils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/parseutils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/parseutils.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/parseutils.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,124 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_PARSEUTILS_H
+#define AVUTIL_PARSEUTILS_H
+
+#include <time.h>
+
+#include "rational.h"
+
+/**
+ * @file
+ * misc parsing utilities
+ */
+
+/**
+ * Parse str and put in width_ptr and height_ptr the detected values.
+ *
+ * @param[in,out] width_ptr pointer to the variable which will contain the detected
+ * width value
+ * @param[in,out] height_ptr pointer to the variable which will contain the detected
+ * height value
+ * @param[in] str the string to parse: it has to be a string in the format
+ * width x height or a valid video size abbreviation.
+ * @return >= 0 on success, a negative error code otherwise
+ */
+int av_parse_video_size(int *width_ptr, int *height_ptr, const char *str);
+
+/**
+ * Parse str and store the detected values in *rate.
+ *
+ * @param[in,out] rate pointer to the AVRational which will contain the detected
+ * frame rate
+ * @param[in] str the string to parse: it has to be a string in the format
+ * rate_num / rate_den, a float number or a valid video rate abbreviation
+ * @return >= 0 on success, a negative error code otherwise
+ */
+int av_parse_video_rate(AVRational *rate, const char *str);
+
+/**
+ * Put the RGBA values that correspond to color_string in rgba_color.
+ *
+ * @param color_string a string specifying a color. It can be the name of
+ * a color (case insensitive match) or a [0x|#]RRGGBB[AA] sequence,
+ * possibly followed by "@" and a string representing the alpha
+ * component.
+ * The alpha component may be a string composed by "0x" followed by an
+ * hexadecimal number or a decimal number between 0.0 and 1.0, which
+ * represents the opacity value (0x00/0.0 means completely transparent,
+ * 0xff/1.0 completely opaque).
+ * If the alpha component is not specified then 0xff is assumed.
+ * The string "random" will result in a random color.
+ * @param slen length of the initial part of color_string containing the
+ * color. It can be set to -1 if color_string is a null terminated string
+ * containing nothing else than the color.
+ * @return >= 0 in case of success, a negative value in case of
+ * failure (for example if color_string cannot be parsed).
+ */
+int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen,
+                   void *log_ctx);
+
+/**
+ * Parse timestr and return in *time a corresponding number of
+ * microseconds.
+ *
+ * @param timeval puts here the number of microseconds corresponding
+ * to the string in timestr. If the string represents a duration, it
+ * is the number of microseconds contained in the time interval.  If
+ * the string is a date, is the number of microseconds since 1st of
+ * January, 1970 up to the time of the parsed date.  If timestr cannot
+ * be successfully parsed, set *time to INT64_MIN.
+
+ * @param timestr a string representing a date or a duration.
+ * - If a date the syntax is:
+ * @code
+ * [{YYYY-MM-DD|YYYYMMDD}[T|t| ]]{{HH[:MM[:SS[.m...]]]}|{HH[MM[SS[.m...]]]}}[Z]
+ * now
+ * @endcode
+ * If the value is "now" it takes the current time.
+ * Time is local time unless Z is appended, in which case it is
+ * interpreted as UTC.
+ * If the year-month-day part is not specified it takes the current
+ * year-month-day.
+ * - If a duration the syntax is:
+ * @code
+ * [-]HH[:MM[:SS[.m...]]]
+ * [-]S+[.m...]
+ * @endcode
+ * @param duration flag which tells how to interpret timestr, if not
+ * zero timestr is interpreted as a duration, otherwise as a date
+ * @return 0 in case of success, a negative value corresponding to an
+ * AVERROR code otherwise
+ */
+int av_parse_time(int64_t *timeval, const char *timestr, int duration);
+
+/**
+ * Attempt to find a specific tag in a URL.
+ *
+ * syntax: '?tag1=val1&tag2=val2...'. Little URL decoding is done.
+ * Return 1 if found.
+ */
+int av_find_info_tag(char *arg, int arg_size, const char *tag1, const char *info);
+
+/**
+ * Convert the decomposed UTC time in tm to a time_t value.
+ */
+time_t av_timegm(struct tm *tm);
+
+#endif /* AVUTIL_PARSEUTILS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/pixdesc.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/pixdesc.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/pixdesc.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/pixdesc.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,177 @@
+/*
+ * pixel format descriptor
+ * Copyright (c) 2009 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_PIXDESC_H
+#define AVUTIL_PIXDESC_H
+
+#include <inttypes.h>
+#include "pixfmt.h"
+
+typedef struct AVComponentDescriptor{
+    uint16_t plane        :2;            ///< which of the 4 planes contains the component
+
+    /**
+     * Number of elements between 2 horizontally consecutive pixels minus 1.
+     * Elements are bits for bitstream formats, bytes otherwise.
+     */
+    uint16_t step_minus1  :3;
+
+    /**
+     * Number of elements before the component of the first pixel plus 1.
+     * Elements are bits for bitstream formats, bytes otherwise.
+     */
+    uint16_t offset_plus1 :3;
+    uint16_t shift        :3;            ///< number of least significant bits that must be shifted away to get the value
+    uint16_t depth_minus1 :4;            ///< number of bits in the component minus 1
+}AVComponentDescriptor;
+
+/**
+ * Descriptor that unambiguously describes how the bits of a pixel are
+ * stored in the up to 4 data planes of an image. It also stores the
+ * subsampling factors and number of components.
+ *
+ * @note This is separate of the colorspace (RGB, YCbCr, YPbPr, JPEG-style YUV
+ *       and all the YUV variants) AVPixFmtDescriptor just stores how values
+ *       are stored not what these values represent.
+ */
+typedef struct AVPixFmtDescriptor{
+    const char *name;
+    uint8_t nb_components;      ///< The number of components each pixel has, (1-4)
+
+    /**
+     * Amount to shift the luma width right to find the chroma width.
+     * For YV12 this is 1 for example.
+     * chroma_width = -((-luma_width) >> log2_chroma_w)
+     * The note above is needed to ensure rounding up.
+     * This value only refers to the chroma components.
+     */
+    uint8_t log2_chroma_w;      ///< chroma_width = -((-luma_width )>>log2_chroma_w)
+
+    /**
+     * Amount to shift the luma height right to find the chroma height.
+     * For YV12 this is 1 for example.
+     * chroma_height= -((-luma_height) >> log2_chroma_h)
+     * The note above is needed to ensure rounding up.
+     * This value only refers to the chroma components.
+     */
+    uint8_t log2_chroma_h;
+    uint8_t flags;
+
+    /**
+     * Parameters that describe how pixels are packed. If the format
+     * has chroma components, they must be stored in comp[1] and
+     * comp[2].
+     */
+    AVComponentDescriptor comp[4];
+}AVPixFmtDescriptor;
+
+#define PIX_FMT_BE        1 ///< Pixel format is big-endian.
+#define PIX_FMT_PAL       2 ///< Pixel format has a palette in data[1], values are indexes in this palette.
+#define PIX_FMT_BITSTREAM 4 ///< All values of a component are bit-wise packed end to end.
+#define PIX_FMT_HWACCEL   8 ///< Pixel format is an HW accelerated format.
+#define PIX_FMT_PLANAR   16 ///< At least one pixel component is not in the first data plane
+#define PIX_FMT_RGB      32 ///< The pixel format contains RGB-like data (as opposed to YUV/grayscale)
+
+/**
+ * The array of all the pixel format descriptors.
+ */
+extern const AVPixFmtDescriptor av_pix_fmt_descriptors[];
+
+/**
+ * Read a line from an image, and write the values of the
+ * pixel format component c to dst.
+ *
+ * @param data the array containing the pointers to the planes of the image
+ * @param linesize the array containing the linesizes of the image
+ * @param desc the pixel format descriptor for the image
+ * @param x the horizontal coordinate of the first pixel to read
+ * @param y the vertical coordinate of the first pixel to read
+ * @param w the width of the line to read, that is the number of
+ * values to write to dst
+ * @param read_pal_component if not zero and the format is a paletted
+ * format writes the values corresponding to the palette
+ * component c in data[1] to dst, rather than the palette indexes in
+ * data[0]. The behavior is undefined if the format is not paletted.
+ */
+void av_read_image_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4],
+                        const AVPixFmtDescriptor *desc, int x, int y, int c, int w, int read_pal_component);
+
+/**
+ * Write the values from src to the pixel format component c of an
+ * image line.
+ *
+ * @param src array containing the values to write
+ * @param data the array containing the pointers to the planes of the
+ * image to write into. It is supposed to be zeroed.
+ * @param linesize the array containing the linesizes of the image
+ * @param desc the pixel format descriptor for the image
+ * @param x the horizontal coordinate of the first pixel to write
+ * @param y the vertical coordinate of the first pixel to write
+ * @param w the width of the line to write, that is the number of
+ * values to write to the image line
+ */
+void av_write_image_line(const uint16_t *src, uint8_t *data[4], const int linesize[4],
+                         const AVPixFmtDescriptor *desc, int x, int y, int c, int w);
+
+/**
+ * Return the pixel format corresponding to name.
+ *
+ * If there is no pixel format with name name, then looks for a
+ * pixel format with the name corresponding to the native endian
+ * format of name.
+ * For example in a little-endian system, first looks for "gray16",
+ * then for "gray16le".
+ *
+ * Finally if no pixel format has been found, returns PIX_FMT_NONE.
+ */
+enum PixelFormat av_get_pix_fmt(const char *name);
+
+/**
+ * Return the short name for a pixel format, NULL in case pix_fmt is
+ * unknown.
+ *
+ * @see av_get_pix_fmt(), av_get_pix_fmt_string()
+ */
+const char *av_get_pix_fmt_name(enum PixelFormat pix_fmt);
+
+/**
+ * Print in buf the string corresponding to the pixel format with
+ * number pix_fmt, or an header if pix_fmt is negative.
+ *
+ * @param buf the buffer where to write the string
+ * @param buf_size the size of buf
+ * @param pix_fmt the number of the pixel format to print the
+ * corresponding info string, or a negative value to print the
+ * corresponding header.
+ */
+char *av_get_pix_fmt_string (char *buf, int buf_size, enum PixelFormat pix_fmt);
+
+/**
+ * Return the number of bits per pixel used by the pixel format
+ * described by pixdesc.
+ *
+ * The returned number of bits refers to the number of bits actually
+ * used for storing the pixel information, that is padding bits are
+ * not counted.
+ */
+int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc);
+
+#endif /* AVUTIL_PIXDESC_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/pixfmt.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/pixfmt.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/pixfmt.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/pixfmt.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,198 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_PIXFMT_H
+#define AVUTIL_PIXFMT_H
+
+/**
+ * @file
+ * pixel format definitions
+ *
+ */
+
+#include "libavutil/avconfig.h"
+
+/**
+ * Pixel format.
+ *
+ * @note
+ * PIX_FMT_RGB32 is handled in an endian-specific manner. An RGBA
+ * color is put together as:
+ *  (A << 24) | (R << 16) | (G << 8) | B
+ * This is stored as BGRA on little-endian CPU architectures and ARGB on
+ * big-endian CPUs.
+ *
+ * @par
+ * When the pixel format is palettized RGB (PIX_FMT_PAL8), the palettized
+ * image data is stored in AVFrame.data[0]. The palette is transported in
+ * AVFrame.data[1], is 1024 bytes long (256 4-byte entries) and is
+ * formatted the same as in PIX_FMT_RGB32 described above (i.e., it is
+ * also endian-specific). Note also that the individual RGB palette
+ * components stored in AVFrame.data[1] should be in the range 0..255.
+ * This is important as many custom PAL8 video codecs that were designed
+ * to run on the IBM VGA graphics adapter use 6-bit palette components.
+ *
+ * @par
+ * For all the 8bit per pixel formats, an RGB32 palette is in data[1] like
+ * for pal8. This palette is filled in automatically by the function
+ * allocating the picture.
+ *
+ * @note
+ * make sure that all newly added big endian formats have pix_fmt&1==1
+ * and that all newly added little endian formats have pix_fmt&1==0
+ * this allows simpler detection of big vs little endian.
+ */
+enum PixelFormat {
+    PIX_FMT_NONE= -1,
+    PIX_FMT_YUV420P,   ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
+    PIX_FMT_YUYV422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
+    PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
+    PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
+    PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
+    PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
+    PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
+    PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
+    PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
+    PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
+    PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
+    PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
+    PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
+    PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
+    PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
+    PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
+    PIX_FMT_XVMC_MPEG2_IDCT,
+    PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
+    PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
+    PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
+    PIX_FMT_BGR4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
+    PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
+    PIX_FMT_RGB8,      ///< packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
+    PIX_FMT_RGB4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
+    PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
+    PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
+    PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
+
+    PIX_FMT_ARGB,      ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
+    PIX_FMT_RGBA,      ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
+    PIX_FMT_ABGR,      ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
+    PIX_FMT_BGRA,      ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
+
+    PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
+    PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
+    PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
+    PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
+    PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
+    PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
+    PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
+
+    PIX_FMT_RGB565BE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian
+    PIX_FMT_RGB565LE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), little-endian
+    PIX_FMT_RGB555BE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
+    PIX_FMT_RGB555LE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
+
+    PIX_FMT_BGR565BE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), big-endian
+    PIX_FMT_BGR565LE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), little-endian
+    PIX_FMT_BGR555BE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
+    PIX_FMT_BGR555LE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
+
+    PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
+    PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
+    PIX_FMT_VAAPI_VLD,  ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+
+    PIX_FMT_YUV420P16LE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    PIX_FMT_YUV420P16BE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    PIX_FMT_YUV422P16LE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    PIX_FMT_VDPAU_MPEG4,  ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
+
+    PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
+    PIX_FMT_RGB444BE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
+    PIX_FMT_BGR444LE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
+    PIX_FMT_BGR444BE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
+    PIX_FMT_Y400A,     ///< 8bit gray, 8bit alpha
+    PIX_FMT_BGR48BE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
+    PIX_FMT_BGR48LE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
+    PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    PIX_FMT_VDA_VLD,    ///< hardware decoding through VDA
+    PIX_FMT_GBRP,      ///< planar GBR 4:4:4 24bpp
+    PIX_FMT_GBRP9BE,   ///< planar GBR 4:4:4 27bpp, big endian
+    PIX_FMT_GBRP9LE,   ///< planar GBR 4:4:4 27bpp, little endian
+    PIX_FMT_GBRP10BE,  ///< planar GBR 4:4:4 30bpp, big endian
+    PIX_FMT_GBRP10LE,  ///< planar GBR 4:4:4 30bpp, little endian
+    PIX_FMT_GBRP16BE,  ///< planar GBR 4:4:4 48bpp, big endian
+    PIX_FMT_GBRP16LE,  ///< planar GBR 4:4:4 48bpp, little endian
+    PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
+};
+
+#if AV_HAVE_BIGENDIAN
+#   define PIX_FMT_NE(be, le) PIX_FMT_##be
+#else
+#   define PIX_FMT_NE(be, le) PIX_FMT_##le
+#endif
+
+#define PIX_FMT_RGB32   PIX_FMT_NE(ARGB, BGRA)
+#define PIX_FMT_RGB32_1 PIX_FMT_NE(RGBA, ABGR)
+#define PIX_FMT_BGR32   PIX_FMT_NE(ABGR, RGBA)
+#define PIX_FMT_BGR32_1 PIX_FMT_NE(BGRA, ARGB)
+
+#define PIX_FMT_GRAY16 PIX_FMT_NE(GRAY16BE, GRAY16LE)
+#define PIX_FMT_RGB48  PIX_FMT_NE(RGB48BE,  RGB48LE)
+#define PIX_FMT_RGB565 PIX_FMT_NE(RGB565BE, RGB565LE)
+#define PIX_FMT_RGB555 PIX_FMT_NE(RGB555BE, RGB555LE)
+#define PIX_FMT_RGB444 PIX_FMT_NE(RGB444BE, RGB444LE)
+#define PIX_FMT_BGR48  PIX_FMT_NE(BGR48BE,  BGR48LE)
+#define PIX_FMT_BGR565 PIX_FMT_NE(BGR565BE, BGR565LE)
+#define PIX_FMT_BGR555 PIX_FMT_NE(BGR555BE, BGR555LE)
+#define PIX_FMT_BGR444 PIX_FMT_NE(BGR444BE, BGR444LE)
+
+#define PIX_FMT_YUV420P9  PIX_FMT_NE(YUV420P9BE , YUV420P9LE)
+#define PIX_FMT_YUV422P9  PIX_FMT_NE(YUV422P9BE , YUV422P9LE)
+#define PIX_FMT_YUV444P9  PIX_FMT_NE(YUV444P9BE , YUV444P9LE)
+#define PIX_FMT_YUV420P10 PIX_FMT_NE(YUV420P10BE, YUV420P10LE)
+#define PIX_FMT_YUV422P10 PIX_FMT_NE(YUV422P10BE, YUV422P10LE)
+#define PIX_FMT_YUV444P10 PIX_FMT_NE(YUV444P10BE, YUV444P10LE)
+#define PIX_FMT_YUV420P16 PIX_FMT_NE(YUV420P16BE, YUV420P16LE)
+#define PIX_FMT_YUV422P16 PIX_FMT_NE(YUV422P16BE, YUV422P16LE)
+#define PIX_FMT_YUV444P16 PIX_FMT_NE(YUV444P16BE, YUV444P16LE)
+
+#define PIX_FMT_GBRP9     PIX_FMT_NE(GBRP9BE ,    GBRP9LE)
+#define PIX_FMT_GBRP10    PIX_FMT_NE(GBRP10BE,    GBRP10LE)
+#define PIX_FMT_GBRP16    PIX_FMT_NE(GBRP16BE,    GBRP16LE)
+
+#endif /* AVUTIL_PIXFMT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/random_seed.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/random_seed.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/random_seed.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/random_seed.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2009 Baptiste Coudurier <baptiste.coudurier@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_RANDOM_SEED_H
+#define AVUTIL_RANDOM_SEED_H
+
+#include <stdint.h>
+/**
+ * @addtogroup lavu_crypto
+ * @{
+ */
+
+/**
+ * Get random data.
+ *
+ * This function can be called repeatedly to generate more random bits
+ * as needed. It is generally quite slow, and usually used to seed a
+ * PRNG.  As it uses /dev/urandom and /dev/random, the quality of the
+ * returned random data depends on the platform.
+ */
+uint32_t av_get_random_seed(void);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_RANDOM_SEED_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/rational.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/rational.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/rational.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/rational.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,144 @@
+/*
+ * rational numbers
+ * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * rational numbers
+ * @author Michael Niedermayer <michaelni@gmx.at>
+ */
+
+#ifndef AVUTIL_RATIONAL_H
+#define AVUTIL_RATIONAL_H
+
+#include <stdint.h>
+#include <limits.h>
+#include "attributes.h"
+
+/**
+ * @addtogroup lavu_math
+ * @{
+ */
+
+/**
+ * rational number numerator/denominator
+ */
+typedef struct AVRational{
+    int num; ///< numerator
+    int den; ///< denominator
+} AVRational;
+
+/**
+ * Compare two rationals.
+ * @param a first rational
+ * @param b second rational
+ * @return 0 if a==b, 1 if a>b, -1 if a<b, and INT_MIN if one of the
+ * values is of the form 0/0
+ */
+static inline int av_cmp_q(AVRational a, AVRational b){
+    const int64_t tmp= a.num * (int64_t)b.den - b.num * (int64_t)a.den;
+
+    if(tmp) return ((tmp ^ a.den ^ b.den)>>63)|1;
+    else if(b.den && a.den) return 0;
+    else if(a.num && b.num) return (a.num>>31) - (b.num>>31);
+    else                    return INT_MIN;
+}
+
+/**
+ * Convert rational to double.
+ * @param a rational to convert
+ * @return (double) a
+ */
+static inline double av_q2d(AVRational a){
+    return a.num / (double) a.den;
+}
+
+/**
+ * Reduce a fraction.
+ * This is useful for framerate calculations.
+ * @param dst_num destination numerator
+ * @param dst_den destination denominator
+ * @param num source numerator
+ * @param den source denominator
+ * @param max the maximum allowed for dst_num & dst_den
+ * @return 1 if exact, 0 otherwise
+ */
+int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max);
+
+/**
+ * Multiply two rationals.
+ * @param b first rational
+ * @param c second rational
+ * @return b*c
+ */
+AVRational av_mul_q(AVRational b, AVRational c) av_const;
+
+/**
+ * Divide one rational by another.
+ * @param b first rational
+ * @param c second rational
+ * @return b/c
+ */
+AVRational av_div_q(AVRational b, AVRational c) av_const;
+
+/**
+ * Add two rationals.
+ * @param b first rational
+ * @param c second rational
+ * @return b+c
+ */
+AVRational av_add_q(AVRational b, AVRational c) av_const;
+
+/**
+ * Subtract one rational from another.
+ * @param b first rational
+ * @param c second rational
+ * @return b-c
+ */
+AVRational av_sub_q(AVRational b, AVRational c) av_const;
+
+/**
+ * Convert a double precision floating point number to a rational.
+ * inf is expressed as {1,0} or {-1,0} depending on the sign.
+ *
+ * @param d double to convert
+ * @param max the maximum allowed numerator and denominator
+ * @return (AVRational) d
+ */
+AVRational av_d2q(double d, int max) av_const;
+
+/**
+ * @return 1 if q1 is nearer to q than q2, -1 if q2 is nearer
+ * than q1, 0 if they have the same distance.
+ */
+int av_nearer_q(AVRational q, AVRational q1, AVRational q2);
+
+/**
+ * Find the nearest value in q_list to q.
+ * @param q_list an array of rationals terminated by {0, 0}
+ * @return the index of the nearest value found in the array
+ */
+int av_find_nearest_q_idx(AVRational q, const AVRational* q_list);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_RATIONAL_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/samplefmt.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/samplefmt.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/samplefmt.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/samplefmt.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,148 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_SAMPLEFMT_H
+#define AVUTIL_SAMPLEFMT_H
+
+#include "avutil.h"
+
+/**
+ * all in native-endian format
+ */
+enum AVSampleFormat {
+    AV_SAMPLE_FMT_NONE = -1,
+    AV_SAMPLE_FMT_U8,          ///< unsigned 8 bits
+    AV_SAMPLE_FMT_S16,         ///< signed 16 bits
+    AV_SAMPLE_FMT_S32,         ///< signed 32 bits
+    AV_SAMPLE_FMT_FLT,         ///< float
+    AV_SAMPLE_FMT_DBL,         ///< double
+
+    AV_SAMPLE_FMT_U8P,         ///< unsigned 8 bits, planar
+    AV_SAMPLE_FMT_S16P,        ///< signed 16 bits, planar
+    AV_SAMPLE_FMT_S32P,        ///< signed 32 bits, planar
+    AV_SAMPLE_FMT_FLTP,        ///< float, planar
+    AV_SAMPLE_FMT_DBLP,        ///< double, planar
+
+    AV_SAMPLE_FMT_NB           ///< Number of sample formats. DO NOT USE if linking dynamically
+};
+
+/**
+ * Return the name of sample_fmt, or NULL if sample_fmt is not
+ * recognized.
+ */
+const char *av_get_sample_fmt_name(enum AVSampleFormat sample_fmt);
+
+/**
+ * Return a sample format corresponding to name, or AV_SAMPLE_FMT_NONE
+ * on error.
+ */
+enum AVSampleFormat av_get_sample_fmt(const char *name);
+
+/**
+ * Generate a string corresponding to the sample format with
+ * sample_fmt, or a header if sample_fmt is negative.
+ *
+ * @param buf the buffer where to write the string
+ * @param buf_size the size of buf
+ * @param sample_fmt the number of the sample format to print the
+ * corresponding info string, or a negative value to print the
+ * corresponding header.
+ * @return the pointer to the filled buffer or NULL if sample_fmt is
+ * unknown or in case of other errors
+ */
+char *av_get_sample_fmt_string(char *buf, int buf_size, enum AVSampleFormat sample_fmt);
+
+#if FF_API_GET_BITS_PER_SAMPLE_FMT
+/**
+ * @deprecated Use av_get_bytes_per_sample() instead.
+ */
+attribute_deprecated
+int av_get_bits_per_sample_fmt(enum AVSampleFormat sample_fmt);
+#endif
+
+/**
+ * Return number of bytes per sample.
+ *
+ * @param sample_fmt the sample format
+ * @return number of bytes per sample or zero if unknown for the given
+ * sample format
+ */
+int av_get_bytes_per_sample(enum AVSampleFormat sample_fmt);
+
+/**
+ * Check if the sample format is planar.
+ *
+ * @param sample_fmt the sample format to inspect
+ * @return 1 if the sample format is planar, 0 if it is interleaved
+ */
+int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt);
+
+/**
+ * Get the required buffer size for the given audio parameters.
+ *
+ * @param[out] linesize calculated linesize, may be NULL
+ * @param nb_channels   the number of channels
+ * @param nb_samples    the number of samples in a single channel
+ * @param sample_fmt    the sample format
+ * @return              required buffer size, or negative error code on failure
+ */
+int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples,
+                               enum AVSampleFormat sample_fmt, int align);
+
+/**
+ * Fill channel data pointers and linesize for samples with sample
+ * format sample_fmt.
+ *
+ * The pointers array is filled with the pointers to the samples data:
+ * for planar, set the start point of each channel's data within the buffer,
+ * for packed, set the start point of the entire buffer only.
+ *
+ * The linesize array is filled with the aligned size of each channel's data
+ * buffer for planar layout, or the aligned size of the buffer for all channels
+ * for packed layout.
+ *
+ * @param[out] audio_data  array to be filled with the pointer for each channel
+ * @param[out] linesize    calculated linesize
+ * @param buf              the pointer to a buffer containing the samples
+ * @param nb_channels      the number of channels
+ * @param nb_samples       the number of samples in a single channel
+ * @param sample_fmt       the sample format
+ * @param align            buffer size alignment (1 = no alignment required)
+ * @return                 0 on success or a negative error code on failure
+ */
+int av_samples_fill_arrays(uint8_t **audio_data, int *linesize, uint8_t *buf,
+                           int nb_channels, int nb_samples,
+                           enum AVSampleFormat sample_fmt, int align);
+
+/**
+ * Allocate a samples buffer for nb_samples samples, and fill data pointers and
+ * linesize accordingly.
+ * The allocated samples buffer can be freed by using av_freep(&audio_data[0])
+ *
+ * @param[out] audio_data  array to be filled with the pointer for each channel
+ * @param[out] linesize    aligned size for audio buffer(s)
+ * @param nb_channels      number of audio channels
+ * @param nb_samples       number of samples per channel
+ * @param align            buffer size alignment (1 = no alignment required)
+ * @return                 0 on success or a negative error code on failure
+ * @see av_samples_fill_arrays()
+ */
+int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels,
+                     int nb_samples, enum AVSampleFormat sample_fmt, int align);
+
+#endif /* AVUTIL_SAMPLEFMT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/sha.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/sha.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/sha.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/sha.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_SHA_H
+#define AVUTIL_SHA_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_sha SHA
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+extern const int av_sha_size;
+
+struct AVSHA;
+
+/**
+ * Initialize SHA-1 or SHA-2 hashing.
+ *
+ * @param context pointer to the function context (of size av_sha_size)
+ * @param bits    number of bits in digest (SHA-1 - 160 bits, SHA-2 224 or 256 bits)
+ * @return        zero if initialization succeeded, -1 otherwise
+ */
+int av_sha_init(struct AVSHA* context, int bits);
+
+/**
+ * Update hash value.
+ *
+ * @param context hash function context
+ * @param data    input data to update hash with
+ * @param len     input data length
+ */
+void av_sha_update(struct AVSHA* context, const uint8_t* data, unsigned int len);
+
+/**
+ * Finish hashing and output digest value.
+ *
+ * @param context hash function context
+ * @param digest  buffer where output digest value is stored
+ */
+void av_sha_final(struct AVSHA* context, uint8_t *digest);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_SHA_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/timecode.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/timecode.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/timecode.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/timecode.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2006 Smartjog S.A.S, Baptiste Coudurier <baptiste.coudurier@gmail.com>
+ * Copyright (c) 2011-2012 Smartjog S.A.S, Clément Bœsch <clement.boesch@smartjog.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Timecode helpers header
+ */
+
+#ifndef AVUTIL_TIMECODE_H
+#define AVUTIL_TIMECODE_H
+
+#include <stdint.h>
+#include "rational.h"
+
+#define AV_TIMECODE_STR_SIZE 16
+
+enum AVTimecodeFlag {
+    AV_TIMECODE_FLAG_DROPFRAME      = 1<<0, ///< timecode is drop frame
+    AV_TIMECODE_FLAG_24HOURSMAX     = 1<<1, ///< timecode wraps after 24 hours
+    AV_TIMECODE_FLAG_ALLOWNEGATIVE  = 1<<2, ///< negative time values are allowed
+};
+
+typedef struct {
+    int start;          ///< timecode frame start (first base frame number)
+    uint32_t flags;     ///< flags such as drop frame, +24 hours support, ...
+    AVRational rate;    ///< frame rate in rational form
+    unsigned fps;       ///< frame per second; must be consistent with the rate field
+} AVTimecode;
+
+/**
+ * Adjust frame number for NTSC drop frame time code.
+ *
+ * @param framenum frame number to adjust
+ * @param fps      frame per second, 30 or 60
+ * @return         adjusted frame number
+ * @warning        adjustment is only valid in NTSC 29.97 and 59.94
+ */
+int av_timecode_adjust_ntsc_framenum2(int framenum, int fps);
+
+/**
+ * Convert frame number to SMPTE 12M binary representation.
+ *
+ * @param tc       timecode data correctly initialized
+ * @param framenum frame number
+ * @return         the SMPTE binary representation
+ *
+ * @note Frame number adjustment is automatically done in case of drop timecode,
+ *       you do NOT have to call av_timecode_adjust_ntsc_framenum2().
+ * @note The frame number is relative to tc->start.
+ * @note Color frame (CF), binary group flags (BGF) and biphase mark polarity
+ *       correction (PC) bits are set to zero.
+ */
+uint32_t av_timecode_get_smpte_from_framenum(const AVTimecode *tc, int framenum);
+
+/**
+ * Load timecode string in buf.
+ *
+ * @param buf      destination buffer, must be at least AV_TIMECODE_STR_SIZE long
+ * @param tc       timecode data correctly initialized
+ * @param framenum frame number
+ * @return         the buf parameter
+ *
+ * @note Timecode representation can be a negative timecode and have more than
+ *       24 hours, but will only be honored if the flags are correctly set.
+ * @note The frame number is relative to tc->start.
+ */
+char *av_timecode_make_string(const AVTimecode *tc, char *buf, int framenum);
+
+/**
+ * Get the timecode string from the SMPTE timecode format.
+ *
+ * @param buf        destination buffer, must be at least AV_TIMECODE_STR_SIZE long
+ * @param tcsmpte    the 32-bit SMPTE timecode
+ * @param prevent_df prevent the use of a drop flag when it is known the DF bit
+ *                   is arbitrary
+ * @return           the buf parameter
+ */
+char *av_timecode_make_smpte_tc_string(char *buf, uint32_t tcsmpte, int prevent_df);
+
+/**
+ * Get the timecode string from the 25-bit timecode format (MPEG GOP format).
+ *
+ * @param buf     destination buffer, must be at least AV_TIMECODE_STR_SIZE long
+ * @param tc25bit the 25-bits timecode
+ * @return        the buf parameter
+ */
+char *av_timecode_make_mpeg_tc_string(char *buf, uint32_t tc25bit);
+
+/**
+ * Init a timecode struct with the passed parameters.
+ *
+ * @param log_ctx     a pointer to an arbitrary struct of which the first field
+ *                    is a pointer to an AVClass struct (used for av_log)
+ * @param tc          pointer to an allocated AVTimecode
+ * @param rate        frame rate in rational form
+ * @param flags       miscellaneous flags such as drop frame, +24 hours, ...
+ *                    (see AVTimecodeFlag)
+ * @param frame_start the first frame number
+ * @return            0 on success, AVERROR otherwise
+ */
+int av_timecode_init(AVTimecode *tc, AVRational rate, int flags, int frame_start, void *log_ctx);
+
+/**
+ * Parse timecode representation (hh:mm:ss[:;.]ff).
+ *
+ * @param log_ctx a pointer to an arbitrary struct of which the first field is a
+ *                pointer to an AVClass struct (used for av_log).
+ * @param tc      pointer to an allocated AVTimecode
+ * @param rate    frame rate in rational form
+ * @param str     timecode string which will determine the frame start
+ * @return        0 on success, AVERROR otherwise
+ */
+int av_timecode_init_from_string(AVTimecode *tc, AVRational rate, const char *str, void *log_ctx);
+
+/**
+ * Check if the timecode feature is available for the given frame rate
+ *
+ * @return 0 if supported, <0 otherwise
+ */
+int av_timecode_check_frame_rate(AVRational rate);
+
+#endif /* AVUTIL_TIMECODE_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/time.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/time.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/time.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/time.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2000-2003 Fabrice Bellard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_TIME_H
+#define AVUTIL_TIME_H
+
+#include <stdint.h>
+
+/**
+ * Get the current time in microseconds.
+ */
+int64_t av_gettime(void);
+
+/**
+ * Sleep for a period of time.  Although the duration is expressed in
+ * microseconds, the actual delay may be rounded to the precision of the
+ * system timer.
+ *
+ * @param  usec Number of microseconds to sleep.
+ * @return zero on success or (negative) error code.
+ */
+int av_usleep(unsigned usec);
+
+#endif /* AVUTIL_TIME_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/timestamp.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/timestamp.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/timestamp.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/timestamp.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,74 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * timestamp utils, mostly useful for debugging/logging purposes
+ */
+
+#ifndef AVUTIL_TIMESTAMP_H
+#define AVUTIL_TIMESTAMP_H
+
+#include "common.h"
+
+#define AV_TS_MAX_STRING_SIZE 32
+
+/**
+ * Fill the provided buffer with a string containing a timestamp
+ * representation.
+ *
+ * @param buf a buffer with size in bytes of at least AV_TS_MAX_STRING_SIZE
+ * @param ts the timestamp to represent
+ * @return the buffer in input
+ */
+static inline char *av_ts_make_string(char *buf, int64_t ts)
+{
+    if (ts == AV_NOPTS_VALUE) snprintf(buf, AV_TS_MAX_STRING_SIZE, "NOPTS");
+    else                      snprintf(buf, AV_TS_MAX_STRING_SIZE, "%"PRId64"", ts);
+    return buf;
+}
+
+/**
+ * Convenience macro, the return value should be used only directly in
+ * function arguments but never stand-alone.
+ */
+#define av_ts2str(ts) av_ts_make_string((char[AV_TS_MAX_STRING_SIZE]){0}, ts)
+
+/**
+ * Fill the provided buffer with a string containing a timestamp time
+ * representation.
+ *
+ * @param buf a buffer with size in bytes of at least AV_TS_MAX_STRING_SIZE
+ * @param ts the timestamp to represent
+ * @param tb the timebase of the timestamp
+ * @return the buffer in input
+ */
+static inline char *av_ts_make_time_string(char *buf, int64_t ts, AVRational *tb)
+{
+    if (ts == AV_NOPTS_VALUE) snprintf(buf, AV_TS_MAX_STRING_SIZE, "NOPTS");
+    else                      snprintf(buf, AV_TS_MAX_STRING_SIZE, "%.6g", av_q2d(*tb) * ts);
+    return buf;
+}
+
+/**
+ * Convenience macro, the return value should be used only directly in
+ * function arguments but never stand-alone.
+ */
+#define av_ts2timestr(ts, tb) av_ts_make_time_string((char[AV_TS_MAX_STRING_SIZE]){0}, ts, tb)
+
+#endif /* AVUTIL_TIMESTAMP_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/version.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/version.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/version.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/version.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,132 @@
+/*
+ * copyright (c) 2003 Fabrice Bellard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_VERSION_H
+#define AVUTIL_VERSION_H
+
+/**
+ * @defgroup preproc_misc Preprocessor String Macros
+ *
+ * String manipulation macros
+ *
+ * @{
+ */
+
+#define AV_STRINGIFY(s)         AV_TOSTRING(s)
+#define AV_TOSTRING(s) #s
+
+#define AV_GLUE(a, b) a ## b
+#define AV_JOIN(a, b) AV_GLUE(a, b)
+
+#define AV_PRAGMA(s) _Pragma(#s)
+
+/**
+ * @}
+ */
+
+/**
+ * @defgroup version_utils Library Version Macros
+ *
+ * Useful to check and match library version in order to maintain
+ * backward compatibility.
+ *
+ * @{
+ */
+
+#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
+#define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c
+#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
+
+/**
+ * @}
+ */
+
+
+/**
+ * @file
+ * @ingroup lavu
+ * Libavutil version macros
+ */
+
+/**
+ * @defgroup lavu_ver Version and Build diagnostics
+ *
+ * Macros and function useful to check at compiletime and at runtime
+ * which version of libavutil is in use.
+ *
+ * @{
+ */
+
+#define LIBAVUTIL_VERSION_MAJOR  52
+#define LIBAVUTIL_VERSION_MINOR   5
+#define LIBAVUTIL_VERSION_MICRO 100
+
+#define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
+                                               LIBAVUTIL_VERSION_MINOR, \
+                                               LIBAVUTIL_VERSION_MICRO)
+#define LIBAVUTIL_VERSION       AV_VERSION(LIBAVUTIL_VERSION_MAJOR,     \
+                                           LIBAVUTIL_VERSION_MINOR,     \
+                                           LIBAVUTIL_VERSION_MICRO)
+#define LIBAVUTIL_BUILD         LIBAVUTIL_VERSION_INT
+
+#define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
+
+/**
+ * @}
+ *
+ * @defgroup depr_guards Deprecation guards
+ * FF_API_* defines may be placed below to indicate public API that will be
+ * dropped at a future version bump. The defines themselves are not part of
+ * the public API and may change, break or disappear at any time.
+ *
+ * @{
+ */
+
+#ifndef FF_API_OLD_EVAL_NAMES
+#define FF_API_OLD_EVAL_NAMES           (LIBAVUTIL_VERSION_MAJOR < 52)
+#endif
+#ifndef FF_API_GET_BITS_PER_SAMPLE_FMT
+#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_FIND_OPT
+#define FF_API_FIND_OPT                 (LIBAVUTIL_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_OLD_AVOPTIONS
+#define FF_API_OLD_AVOPTIONS            (LIBAVUTIL_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_PIX_FMT
+#define FF_API_PIX_FMT                  (LIBAVUTIL_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_CONTEXT_SIZE
+#define FF_API_CONTEXT_SIZE             (LIBAVUTIL_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_PIX_FMT_DESC
+#define FF_API_PIX_FMT_DESC             (LIBAVUTIL_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_AV_REVERSE
+#define FF_API_AV_REVERSE               (LIBAVUTIL_VERSION_MAJOR < 53)
+#endif
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_VERSION_H */
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/xtea.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/xtea.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/include/libavutil/xtea.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/include/libavutil/xtea.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,62 @@
+/*
+ * A 32-bit implementation of the XTEA algorithm
+ * Copyright (c) 2012 Samuel Pitoiset
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_XTEA_H
+#define AVUTIL_XTEA_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_xtea XTEA
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+typedef struct AVXTEA {
+    uint32_t key[16];
+} AVXTEA;
+
+/**
+ * Initialize an AVXTEA context.
+ *
+ * @param ctx an AVXTEA context
+ * @param key a key of 16 bytes used for encryption/decryption
+ */
+void av_xtea_init(struct AVXTEA *ctx, const uint8_t key[16]);
+
+/**
+ * Encrypt or decrypt a buffer using a previously initialized context.
+ *
+ * @param ctx an AVXTEA context
+ * @param dst destination array, can be equal to src
+ * @param src source array, can be equal to dst
+ * @param count number of 8 byte blocks
+ * @param iv initialization vector for CBC mode, if NULL then ECB will be used
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+void av_xtea_crypt(struct AVXTEA *ctx, uint8_t *dst, const uint8_t *src,
+                   int count, uint8_t *iv, int decrypt);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_XTEA_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav53/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav53/moz.build	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,25 @@
+# -*- 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 += [
+    '../FFmpegAudioDecoder.cpp',
+    '../FFmpegDataDecoder.cpp',
+    '../FFmpegDecoderModule.cpp',
+    '../FFmpegH264Decoder.cpp',
+]
+LOCAL_INCLUDES += [
+    '..',
+    'include',
+]
+
+FINAL_LIBRARY = 'xul'
+
+FAIL_ON_WARNINGS = True
+
+if CONFIG['CLANG_CXX']:
+  CXXFLAGS += [
+    '-Wno-unknown-attributes',
+  ]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/COPYING.LGPLv2.1 firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/COPYING.LGPLv2.1
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/COPYING.LGPLv2.1	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/COPYING.LGPLv2.1	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,504 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavcodec/avcodec.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavcodec/avcodec.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavcodec/avcodec.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavcodec/avcodec.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,4658 @@
+/*
+ * copyright (c) 2001 Fabrice Bellard
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_AVCODEC_H
+#define AVCODEC_AVCODEC_H
+
+/**
+ * @file
+ * external API header
+ */
+
+#include <errno.h>
+#include "libavutil/samplefmt.h"
+#include "libavutil/avutil.h"
+#include "libavutil/cpu.h"
+#include "libavutil/dict.h"
+#include "libavutil/log.h"
+#include "libavutil/pixfmt.h"
+#include "libavutil/rational.h"
+
+#include "libavcodec/version.h"
+/**
+ * @defgroup libavc Encoding/Decoding Library
+ * @{
+ *
+ * @defgroup lavc_decoding Decoding
+ * @{
+ * @}
+ *
+ * @defgroup lavc_encoding Encoding
+ * @{
+ * @}
+ *
+ * @defgroup lavc_codec Codecs
+ * @{
+ * @defgroup lavc_codec_native Native Codecs
+ * @{
+ * @}
+ * @defgroup lavc_codec_wrappers External library wrappers
+ * @{
+ * @}
+ * @defgroup lavc_codec_hwaccel Hardware Accelerators bridge
+ * @{
+ * @}
+ * @}
+ * @defgroup lavc_internal Internal
+ * @{
+ * @}
+ * @}
+ *
+ */
+
+/**
+ * @defgroup lavc_core Core functions/structures.
+ * @ingroup libavc
+ *
+ * Basic definitions, functions for querying libavcodec capabilities,
+ * allocating core structures, etc.
+ * @{
+ */
+
+
+/**
+ * Identify the syntax and semantics of the bitstream.
+ * The principle is roughly:
+ * Two decoders with the same ID can decode the same streams.
+ * Two encoders with the same ID can encode compatible streams.
+ * There may be slight deviations from the principle due to implementation
+ * details.
+ *
+ * If you add a codec ID to this list, add it so that
+ * 1. no value of a existing codec ID changes (that would break ABI),
+ * 2. it is as close as possible to similar codecs.
+ *
+ * After adding new codec IDs, do not forget to add an entry to the codec
+ * descriptor list and bump libavcodec minor version.
+ */
+enum AVCodecID {
+    AV_CODEC_ID_NONE,
+
+    /* video codecs */
+    AV_CODEC_ID_MPEG1VIDEO,
+    AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
+    AV_CODEC_ID_MPEG2VIDEO_XVMC,
+    AV_CODEC_ID_H261,
+    AV_CODEC_ID_H263,
+    AV_CODEC_ID_RV10,
+    AV_CODEC_ID_RV20,
+    AV_CODEC_ID_MJPEG,
+    AV_CODEC_ID_MJPEGB,
+    AV_CODEC_ID_LJPEG,
+    AV_CODEC_ID_SP5X,
+    AV_CODEC_ID_JPEGLS,
+    AV_CODEC_ID_MPEG4,
+    AV_CODEC_ID_RAWVIDEO,
+    AV_CODEC_ID_MSMPEG4V1,
+    AV_CODEC_ID_MSMPEG4V2,
+    AV_CODEC_ID_MSMPEG4V3,
+    AV_CODEC_ID_WMV1,
+    AV_CODEC_ID_WMV2,
+    AV_CODEC_ID_H263P,
+    AV_CODEC_ID_H263I,
+    AV_CODEC_ID_FLV1,
+    AV_CODEC_ID_SVQ1,
+    AV_CODEC_ID_SVQ3,
+    AV_CODEC_ID_DVVIDEO,
+    AV_CODEC_ID_HUFFYUV,
+    AV_CODEC_ID_CYUV,
+    AV_CODEC_ID_H264,
+    AV_CODEC_ID_INDEO3,
+    AV_CODEC_ID_VP3,
+    AV_CODEC_ID_THEORA,
+    AV_CODEC_ID_ASV1,
+    AV_CODEC_ID_ASV2,
+    AV_CODEC_ID_FFV1,
+    AV_CODEC_ID_4XM,
+    AV_CODEC_ID_VCR1,
+    AV_CODEC_ID_CLJR,
+    AV_CODEC_ID_MDEC,
+    AV_CODEC_ID_ROQ,
+    AV_CODEC_ID_INTERPLAY_VIDEO,
+    AV_CODEC_ID_XAN_WC3,
+    AV_CODEC_ID_XAN_WC4,
+    AV_CODEC_ID_RPZA,
+    AV_CODEC_ID_CINEPAK,
+    AV_CODEC_ID_WS_VQA,
+    AV_CODEC_ID_MSRLE,
+    AV_CODEC_ID_MSVIDEO1,
+    AV_CODEC_ID_IDCIN,
+    AV_CODEC_ID_8BPS,
+    AV_CODEC_ID_SMC,
+    AV_CODEC_ID_FLIC,
+    AV_CODEC_ID_TRUEMOTION1,
+    AV_CODEC_ID_VMDVIDEO,
+    AV_CODEC_ID_MSZH,
+    AV_CODEC_ID_ZLIB,
+    AV_CODEC_ID_QTRLE,
+    AV_CODEC_ID_SNOW,
+    AV_CODEC_ID_TSCC,
+    AV_CODEC_ID_ULTI,
+    AV_CODEC_ID_QDRAW,
+    AV_CODEC_ID_VIXL,
+    AV_CODEC_ID_QPEG,
+    AV_CODEC_ID_PNG,
+    AV_CODEC_ID_PPM,
+    AV_CODEC_ID_PBM,
+    AV_CODEC_ID_PGM,
+    AV_CODEC_ID_PGMYUV,
+    AV_CODEC_ID_PAM,
+    AV_CODEC_ID_FFVHUFF,
+    AV_CODEC_ID_RV30,
+    AV_CODEC_ID_RV40,
+    AV_CODEC_ID_VC1,
+    AV_CODEC_ID_WMV3,
+    AV_CODEC_ID_LOCO,
+    AV_CODEC_ID_WNV1,
+    AV_CODEC_ID_AASC,
+    AV_CODEC_ID_INDEO2,
+    AV_CODEC_ID_FRAPS,
+    AV_CODEC_ID_TRUEMOTION2,
+    AV_CODEC_ID_BMP,
+    AV_CODEC_ID_CSCD,
+    AV_CODEC_ID_MMVIDEO,
+    AV_CODEC_ID_ZMBV,
+    AV_CODEC_ID_AVS,
+    AV_CODEC_ID_SMACKVIDEO,
+    AV_CODEC_ID_NUV,
+    AV_CODEC_ID_KMVC,
+    AV_CODEC_ID_FLASHSV,
+    AV_CODEC_ID_CAVS,
+    AV_CODEC_ID_JPEG2000,
+    AV_CODEC_ID_VMNC,
+    AV_CODEC_ID_VP5,
+    AV_CODEC_ID_VP6,
+    AV_CODEC_ID_VP6F,
+    AV_CODEC_ID_TARGA,
+    AV_CODEC_ID_DSICINVIDEO,
+    AV_CODEC_ID_TIERTEXSEQVIDEO,
+    AV_CODEC_ID_TIFF,
+    AV_CODEC_ID_GIF,
+    AV_CODEC_ID_DXA,
+    AV_CODEC_ID_DNXHD,
+    AV_CODEC_ID_THP,
+    AV_CODEC_ID_SGI,
+    AV_CODEC_ID_C93,
+    AV_CODEC_ID_BETHSOFTVID,
+    AV_CODEC_ID_PTX,
+    AV_CODEC_ID_TXD,
+    AV_CODEC_ID_VP6A,
+    AV_CODEC_ID_AMV,
+    AV_CODEC_ID_VB,
+    AV_CODEC_ID_PCX,
+    AV_CODEC_ID_SUNRAST,
+    AV_CODEC_ID_INDEO4,
+    AV_CODEC_ID_INDEO5,
+    AV_CODEC_ID_MIMIC,
+    AV_CODEC_ID_RL2,
+    AV_CODEC_ID_ESCAPE124,
+    AV_CODEC_ID_DIRAC,
+    AV_CODEC_ID_BFI,
+    AV_CODEC_ID_CMV,
+    AV_CODEC_ID_MOTIONPIXELS,
+    AV_CODEC_ID_TGV,
+    AV_CODEC_ID_TGQ,
+    AV_CODEC_ID_TQI,
+    AV_CODEC_ID_AURA,
+    AV_CODEC_ID_AURA2,
+    AV_CODEC_ID_V210X,
+    AV_CODEC_ID_TMV,
+    AV_CODEC_ID_V210,
+    AV_CODEC_ID_DPX,
+    AV_CODEC_ID_MAD,
+    AV_CODEC_ID_FRWU,
+    AV_CODEC_ID_FLASHSV2,
+    AV_CODEC_ID_CDGRAPHICS,
+    AV_CODEC_ID_R210,
+    AV_CODEC_ID_ANM,
+    AV_CODEC_ID_BINKVIDEO,
+    AV_CODEC_ID_IFF_ILBM,
+    AV_CODEC_ID_IFF_BYTERUN1,
+    AV_CODEC_ID_KGV1,
+    AV_CODEC_ID_YOP,
+    AV_CODEC_ID_VP8,
+    AV_CODEC_ID_PICTOR,
+    AV_CODEC_ID_ANSI,
+    AV_CODEC_ID_A64_MULTI,
+    AV_CODEC_ID_A64_MULTI5,
+    AV_CODEC_ID_R10K,
+    AV_CODEC_ID_MXPEG,
+    AV_CODEC_ID_LAGARITH,
+    AV_CODEC_ID_PRORES,
+    AV_CODEC_ID_JV,
+    AV_CODEC_ID_DFA,
+    AV_CODEC_ID_WMV3IMAGE,
+    AV_CODEC_ID_VC1IMAGE,
+    AV_CODEC_ID_UTVIDEO,
+    AV_CODEC_ID_BMV_VIDEO,
+    AV_CODEC_ID_VBLE,
+    AV_CODEC_ID_DXTORY,
+    AV_CODEC_ID_V410,
+    AV_CODEC_ID_XWD,
+    AV_CODEC_ID_CDXL,
+    AV_CODEC_ID_XBM,
+    AV_CODEC_ID_ZEROCODEC,
+    AV_CODEC_ID_MSS1,
+    AV_CODEC_ID_MSA1,
+    AV_CODEC_ID_TSCC2,
+    AV_CODEC_ID_MTS2,
+    AV_CODEC_ID_CLLC,
+    AV_CODEC_ID_MSS2,
+
+    /* various PCM "codecs" */
+    AV_CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs
+    AV_CODEC_ID_PCM_S16LE = 0x10000,
+    AV_CODEC_ID_PCM_S16BE,
+    AV_CODEC_ID_PCM_U16LE,
+    AV_CODEC_ID_PCM_U16BE,
+    AV_CODEC_ID_PCM_S8,
+    AV_CODEC_ID_PCM_U8,
+    AV_CODEC_ID_PCM_MULAW,
+    AV_CODEC_ID_PCM_ALAW,
+    AV_CODEC_ID_PCM_S32LE,
+    AV_CODEC_ID_PCM_S32BE,
+    AV_CODEC_ID_PCM_U32LE,
+    AV_CODEC_ID_PCM_U32BE,
+    AV_CODEC_ID_PCM_S24LE,
+    AV_CODEC_ID_PCM_S24BE,
+    AV_CODEC_ID_PCM_U24LE,
+    AV_CODEC_ID_PCM_U24BE,
+    AV_CODEC_ID_PCM_S24DAUD,
+    AV_CODEC_ID_PCM_ZORK,
+    AV_CODEC_ID_PCM_S16LE_PLANAR,
+    AV_CODEC_ID_PCM_DVD,
+    AV_CODEC_ID_PCM_F32BE,
+    AV_CODEC_ID_PCM_F32LE,
+    AV_CODEC_ID_PCM_F64BE,
+    AV_CODEC_ID_PCM_F64LE,
+    AV_CODEC_ID_PCM_BLURAY,
+    AV_CODEC_ID_PCM_LXF,
+    AV_CODEC_ID_S302M,
+    AV_CODEC_ID_PCM_S8_PLANAR,
+
+    /* various ADPCM codecs */
+    AV_CODEC_ID_ADPCM_IMA_QT = 0x11000,
+    AV_CODEC_ID_ADPCM_IMA_WAV,
+    AV_CODEC_ID_ADPCM_IMA_DK3,
+    AV_CODEC_ID_ADPCM_IMA_DK4,
+    AV_CODEC_ID_ADPCM_IMA_WS,
+    AV_CODEC_ID_ADPCM_IMA_SMJPEG,
+    AV_CODEC_ID_ADPCM_MS,
+    AV_CODEC_ID_ADPCM_4XM,
+    AV_CODEC_ID_ADPCM_XA,
+    AV_CODEC_ID_ADPCM_ADX,
+    AV_CODEC_ID_ADPCM_EA,
+    AV_CODEC_ID_ADPCM_G726,
+    AV_CODEC_ID_ADPCM_CT,
+    AV_CODEC_ID_ADPCM_SWF,
+    AV_CODEC_ID_ADPCM_YAMAHA,
+    AV_CODEC_ID_ADPCM_SBPRO_4,
+    AV_CODEC_ID_ADPCM_SBPRO_3,
+    AV_CODEC_ID_ADPCM_SBPRO_2,
+    AV_CODEC_ID_ADPCM_THP,
+    AV_CODEC_ID_ADPCM_IMA_AMV,
+    AV_CODEC_ID_ADPCM_EA_R1,
+    AV_CODEC_ID_ADPCM_EA_R3,
+    AV_CODEC_ID_ADPCM_EA_R2,
+    AV_CODEC_ID_ADPCM_IMA_EA_SEAD,
+    AV_CODEC_ID_ADPCM_IMA_EA_EACS,
+    AV_CODEC_ID_ADPCM_EA_XAS,
+    AV_CODEC_ID_ADPCM_EA_MAXIS_XA,
+    AV_CODEC_ID_ADPCM_IMA_ISS,
+    AV_CODEC_ID_ADPCM_G722,
+    AV_CODEC_ID_ADPCM_IMA_APC,
+
+    /* AMR */
+    AV_CODEC_ID_AMR_NB = 0x12000,
+    AV_CODEC_ID_AMR_WB,
+
+    /* RealAudio codecs*/
+    AV_CODEC_ID_RA_144 = 0x13000,
+    AV_CODEC_ID_RA_288,
+
+    /* various DPCM codecs */
+    AV_CODEC_ID_ROQ_DPCM = 0x14000,
+    AV_CODEC_ID_INTERPLAY_DPCM,
+    AV_CODEC_ID_XAN_DPCM,
+    AV_CODEC_ID_SOL_DPCM,
+
+    /* audio codecs */
+    AV_CODEC_ID_MP2 = 0x15000,
+    AV_CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
+    AV_CODEC_ID_AAC,
+    AV_CODEC_ID_AC3,
+    AV_CODEC_ID_DTS,
+    AV_CODEC_ID_VORBIS,
+    AV_CODEC_ID_DVAUDIO,
+    AV_CODEC_ID_WMAV1,
+    AV_CODEC_ID_WMAV2,
+    AV_CODEC_ID_MACE3,
+    AV_CODEC_ID_MACE6,
+    AV_CODEC_ID_VMDAUDIO,
+    AV_CODEC_ID_FLAC,
+    AV_CODEC_ID_MP3ADU,
+    AV_CODEC_ID_MP3ON4,
+    AV_CODEC_ID_SHORTEN,
+    AV_CODEC_ID_ALAC,
+    AV_CODEC_ID_WESTWOOD_SND1,
+    AV_CODEC_ID_GSM, ///< as in Berlin toast format
+    AV_CODEC_ID_QDM2,
+    AV_CODEC_ID_COOK,
+    AV_CODEC_ID_TRUESPEECH,
+    AV_CODEC_ID_TTA,
+    AV_CODEC_ID_SMACKAUDIO,
+    AV_CODEC_ID_QCELP,
+    AV_CODEC_ID_WAVPACK,
+    AV_CODEC_ID_DSICINAUDIO,
+    AV_CODEC_ID_IMC,
+    AV_CODEC_ID_MUSEPACK7,
+    AV_CODEC_ID_MLP,
+    AV_CODEC_ID_GSM_MS, /* as found in WAV */
+    AV_CODEC_ID_ATRAC3,
+    AV_CODEC_ID_VOXWARE,
+    AV_CODEC_ID_APE,
+    AV_CODEC_ID_NELLYMOSER,
+    AV_CODEC_ID_MUSEPACK8,
+    AV_CODEC_ID_SPEEX,
+    AV_CODEC_ID_WMAVOICE,
+    AV_CODEC_ID_WMAPRO,
+    AV_CODEC_ID_WMALOSSLESS,
+    AV_CODEC_ID_ATRAC3P,
+    AV_CODEC_ID_EAC3,
+    AV_CODEC_ID_SIPR,
+    AV_CODEC_ID_MP1,
+    AV_CODEC_ID_TWINVQ,
+    AV_CODEC_ID_TRUEHD,
+    AV_CODEC_ID_MP4ALS,
+    AV_CODEC_ID_ATRAC1,
+    AV_CODEC_ID_BINKAUDIO_RDFT,
+    AV_CODEC_ID_BINKAUDIO_DCT,
+    AV_CODEC_ID_AAC_LATM,
+    AV_CODEC_ID_QDMC,
+    AV_CODEC_ID_CELT,
+    AV_CODEC_ID_G723_1,
+    AV_CODEC_ID_G729,
+    AV_CODEC_ID_8SVX_EXP,
+    AV_CODEC_ID_8SVX_FIB,
+    AV_CODEC_ID_BMV_AUDIO,
+    AV_CODEC_ID_RALF,
+    AV_CODEC_ID_IAC,
+    AV_CODEC_ID_ILBC,
+    AV_CODEC_ID_OPUS,
+    AV_CODEC_ID_COMFORT_NOISE,
+    AV_CODEC_ID_TAK,
+
+    /* subtitle codecs */
+    AV_CODEC_ID_FIRST_SUBTITLE = 0x17000,          ///< A dummy ID pointing at the start of subtitle codecs.
+    AV_CODEC_ID_DVD_SUBTITLE = 0x17000,
+    AV_CODEC_ID_DVB_SUBTITLE,
+    AV_CODEC_ID_TEXT,  ///< raw UTF-8 text
+    AV_CODEC_ID_XSUB,
+    AV_CODEC_ID_SSA,
+    AV_CODEC_ID_MOV_TEXT,
+    AV_CODEC_ID_HDMV_PGS_SUBTITLE,
+    AV_CODEC_ID_DVB_TELETEXT,
+    AV_CODEC_ID_SRT,
+
+    /* other specific kind of codecs (generally used for attachments) */
+    AV_CODEC_ID_FIRST_UNKNOWN = 0x18000,           ///< A dummy ID pointing at the start of various fake codecs.
+    AV_CODEC_ID_TTF = 0x18000,
+
+    AV_CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf should attempt to identify it
+
+    AV_CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
+                                * stream (only used by libavformat) */
+    AV_CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
+                                * stream (only used by libavformat) */
+    AV_CODEC_ID_FFMETADATA = 0x21000,   ///< Dummy codec for streams containing only metadata information.
+
+#if FF_API_CODEC_ID
+#include "old_codec_ids.h"
+#endif
+};
+
+#if FF_API_CODEC_ID
+#define CodecID AVCodecID
+#endif
+
+/**
+ * This struct describes the properties of a single codec described by an
+ * AVCodecID.
+ * @see avcodec_get_descriptor()
+ */
+typedef struct AVCodecDescriptor {
+    enum AVCodecID     id;
+    enum AVMediaType type;
+    /**
+     * Name of the codec described by this descriptor. It is non-empty and
+     * unique for each codec descriptor. It should contain alphanumeric
+     * characters and '_' only.
+     */
+    const char      *name;
+    /**
+     * A more descriptive name for this codec. May be NULL.
+     */
+    const char *long_name;
+    /**
+     * Codec properties, a combination of AV_CODEC_PROP_* flags.
+     */
+    int             props;
+} AVCodecDescriptor;
+
+/**
+ * Codec uses only intra compression.
+ * Video codecs only.
+ */
+#define AV_CODEC_PROP_INTRA_ONLY    (1 << 0)
+/**
+ * Codec supports lossy compression. Audio and video codecs only.
+ * @note a codec may support both lossy and lossless
+ * compression modes
+ */
+#define AV_CODEC_PROP_LOSSY         (1 << 1)
+/**
+ * Codec supports lossless compression. Audio and video codecs only.
+ */
+#define AV_CODEC_PROP_LOSSLESS      (1 << 2)
+
+#if FF_API_OLD_DECODE_AUDIO
+/* in bytes */
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
+#endif
+
+/**
+ * @ingroup lavc_decoding
+ * Required number of additionally allocated bytes at the end of the input bitstream for decoding.
+ * This is mainly needed because some optimized bitstream readers read
+ * 32 or 64 bit at once and could read over the end.<br>
+ * Note: If the first 23 bits of the additional bytes are not 0, then damaged
+ * MPEG bitstreams could cause overread and segfault.
+ */
+#define FF_INPUT_BUFFER_PADDING_SIZE 8
+
+/**
+ * @ingroup lavc_encoding
+ * minimum encoding buffer size
+ * Used to avoid some checks during header writing.
+ */
+#define FF_MIN_BUFFER_SIZE 16384
+
+
+/**
+ * @ingroup lavc_encoding
+ * motion estimation type.
+ */
+enum Motion_Est_ID {
+    ME_ZERO = 1,    ///< no search, that is use 0,0 vector whenever one is needed
+    ME_FULL,
+    ME_LOG,
+    ME_PHODS,
+    ME_EPZS,        ///< enhanced predictive zonal search
+    ME_X1,          ///< reserved for experiments
+    ME_HEX,         ///< hexagon based search
+    ME_UMH,         ///< uneven multi-hexagon search
+    ME_ITER,        ///< iterative search
+    ME_TESA,        ///< transformed exhaustive search algorithm
+};
+
+/**
+ * @ingroup lavc_decoding
+ */
+enum AVDiscard{
+    /* We leave some space between them for extensions (drop some
+     * keyframes for intra-only or drop just some bidir frames). */
+    AVDISCARD_NONE    =-16, ///< discard nothing
+    AVDISCARD_DEFAULT =  0, ///< discard useless packets like 0 size packets in avi
+    AVDISCARD_NONREF  =  8, ///< discard all non reference
+    AVDISCARD_BIDIR   = 16, ///< discard all bidirectional frames
+    AVDISCARD_NONKEY  = 32, ///< discard all frames except keyframes
+    AVDISCARD_ALL     = 48, ///< discard all
+};
+
+enum AVColorPrimaries{
+    AVCOL_PRI_BT709       = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B
+    AVCOL_PRI_UNSPECIFIED = 2,
+    AVCOL_PRI_BT470M      = 4,
+    AVCOL_PRI_BT470BG     = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM
+    AVCOL_PRI_SMPTE170M   = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
+    AVCOL_PRI_SMPTE240M   = 7, ///< functionally identical to above
+    AVCOL_PRI_FILM        = 8,
+    AVCOL_PRI_NB             , ///< Not part of ABI
+};
+
+enum AVColorTransferCharacteristic{
+    AVCOL_TRC_BT709       = 1, ///< also ITU-R BT1361
+    AVCOL_TRC_UNSPECIFIED = 2,
+    AVCOL_TRC_GAMMA22     = 4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
+    AVCOL_TRC_GAMMA28     = 5, ///< also ITU-R BT470BG
+    AVCOL_TRC_SMPTE240M   = 7,
+    AVCOL_TRC_NB             , ///< Not part of ABI
+};
+
+enum AVColorSpace{
+    AVCOL_SPC_RGB         = 0,
+    AVCOL_SPC_BT709       = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
+    AVCOL_SPC_UNSPECIFIED = 2,
+    AVCOL_SPC_FCC         = 4,
+    AVCOL_SPC_BT470BG     = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
+    AVCOL_SPC_SMPTE170M   = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
+    AVCOL_SPC_SMPTE240M   = 7,
+    AVCOL_SPC_YCOCG       = 8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
+    AVCOL_SPC_NB             , ///< Not part of ABI
+};
+
+enum AVColorRange{
+    AVCOL_RANGE_UNSPECIFIED = 0,
+    AVCOL_RANGE_MPEG        = 1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges
+    AVCOL_RANGE_JPEG        = 2, ///< the normal     2^n-1   "JPEG" YUV ranges
+    AVCOL_RANGE_NB             , ///< Not part of ABI
+};
+
+/**
+ *  X   X      3 4 X      X are luma samples,
+ *             1 2        1-6 are possible chroma positions
+ *  X   X      5 6 X      0 is undefined/unknown position
+ */
+enum AVChromaLocation{
+    AVCHROMA_LOC_UNSPECIFIED = 0,
+    AVCHROMA_LOC_LEFT        = 1, ///< mpeg2/4, h264 default
+    AVCHROMA_LOC_CENTER      = 2, ///< mpeg1, jpeg, h263
+    AVCHROMA_LOC_TOPLEFT     = 3, ///< DV
+    AVCHROMA_LOC_TOP         = 4,
+    AVCHROMA_LOC_BOTTOMLEFT  = 5,
+    AVCHROMA_LOC_BOTTOM      = 6,
+    AVCHROMA_LOC_NB             , ///< Not part of ABI
+};
+
+enum AVAudioServiceType {
+    AV_AUDIO_SERVICE_TYPE_MAIN              = 0,
+    AV_AUDIO_SERVICE_TYPE_EFFECTS           = 1,
+    AV_AUDIO_SERVICE_TYPE_VISUALLY_IMPAIRED = 2,
+    AV_AUDIO_SERVICE_TYPE_HEARING_IMPAIRED  = 3,
+    AV_AUDIO_SERVICE_TYPE_DIALOGUE          = 4,
+    AV_AUDIO_SERVICE_TYPE_COMMENTARY        = 5,
+    AV_AUDIO_SERVICE_TYPE_EMERGENCY         = 6,
+    AV_AUDIO_SERVICE_TYPE_VOICE_OVER        = 7,
+    AV_AUDIO_SERVICE_TYPE_KARAOKE           = 8,
+    AV_AUDIO_SERVICE_TYPE_NB                   , ///< Not part of ABI
+};
+
+/**
+ * @ingroup lavc_encoding
+ */
+typedef struct RcOverride{
+    int start_frame;
+    int end_frame;
+    int qscale; // If this is 0 then quality_factor will be used instead.
+    float quality_factor;
+} RcOverride;
+
+#define FF_MAX_B_FRAMES 16
+
+/* encoding support
+   These flags can be passed in AVCodecContext.flags before initialization.
+   Note: Not everything is supported yet.
+*/
+
+#define CODEC_FLAG_QSCALE 0x0002  ///< Use fixed qscale.
+#define CODEC_FLAG_4MV    0x0004  ///< 4 MV per MB allowed / advanced prediction for H.263.
+#define CODEC_FLAG_QPEL   0x0010  ///< Use qpel MC.
+#define CODEC_FLAG_GMC    0x0020  ///< Use GMC.
+#define CODEC_FLAG_MV0    0x0040  ///< Always try a MB with MV=<0,0>.
+/**
+ * The parent program guarantees that the input for B-frames containing
+ * streams is not written to for at least s->max_b_frames+1 frames, if
+ * this is not set the input will be copied.
+ */
+#define CODEC_FLAG_INPUT_PRESERVED 0x0100
+#define CODEC_FLAG_PASS1           0x0200   ///< Use internal 2pass ratecontrol in first pass mode.
+#define CODEC_FLAG_PASS2           0x0400   ///< Use internal 2pass ratecontrol in second pass mode.
+#define CODEC_FLAG_GRAY            0x2000   ///< Only decode/encode grayscale.
+#define CODEC_FLAG_EMU_EDGE        0x4000   ///< Don't draw edges.
+#define CODEC_FLAG_PSNR            0x8000   ///< error[?] variables will be set during encoding.
+#define CODEC_FLAG_TRUNCATED       0x00010000 /** Input bitstream might be truncated at a random
+                                                  location instead of only at frame boundaries. */
+#define CODEC_FLAG_NORMALIZE_AQP  0x00020000 ///< Normalize adaptive quantization.
+#define CODEC_FLAG_INTERLACED_DCT 0x00040000 ///< Use interlaced DCT.
+#define CODEC_FLAG_LOW_DELAY      0x00080000 ///< Force low delay.
+#define CODEC_FLAG_GLOBAL_HEADER  0x00400000 ///< Place global headers in extradata instead of every keyframe.
+#define CODEC_FLAG_BITEXACT       0x00800000 ///< Use only bitexact stuff (except (I)DCT).
+/* Fx : Flag for h263+ extra options */
+#define CODEC_FLAG_AC_PRED        0x01000000 ///< H.263 advanced intra coding / MPEG-4 AC prediction
+#define CODEC_FLAG_LOOP_FILTER    0x00000800 ///< loop filter
+#define CODEC_FLAG_INTERLACED_ME  0x20000000 ///< interlaced motion estimation
+#define CODEC_FLAG_CLOSED_GOP     0x80000000
+#define CODEC_FLAG2_FAST          0x00000001 ///< Allow non spec compliant speedup tricks.
+#define CODEC_FLAG2_NO_OUTPUT     0x00000004 ///< Skip bitstream encoding.
+#define CODEC_FLAG2_LOCAL_HEADER  0x00000008 ///< Place global headers at every keyframe instead of in extradata.
+#if FF_API_MPV_GLOBAL_OPTS
+#define CODEC_FLAG_CBP_RD         0x04000000 ///< Use rate distortion optimization for cbp.
+#define CODEC_FLAG_QP_RD          0x08000000 ///< Use rate distortion optimization for qp selectioon.
+#define CODEC_FLAG2_STRICT_GOP    0x00000002 ///< Strictly enforce GOP size.
+#define CODEC_FLAG2_SKIP_RD       0x00004000 ///< RD optimal MB level residual skipping
+#endif
+#define CODEC_FLAG2_CHUNKS        0x00008000 ///< Input bitstream might be truncated at a packet boundaries instead of only at frame boundaries.
+
+/* Unsupported options :
+ *              Syntax Arithmetic coding (SAC)
+ *              Reference Picture Selection
+ *              Independent Segment Decoding */
+/* /Fx */
+/* codec capabilities */
+
+#define CODEC_CAP_DRAW_HORIZ_BAND 0x0001 ///< Decoder can use draw_horiz_band callback.
+/**
+ * Codec uses get_buffer() for allocating buffers and supports custom allocators.
+ * If not set, it might not use get_buffer() at all or use operations that
+ * assume the buffer was allocated by avcodec_default_get_buffer.
+ */
+#define CODEC_CAP_DR1             0x0002
+#define CODEC_CAP_TRUNCATED       0x0008
+/* Codec can export data for HW decoding (XvMC). */
+#define CODEC_CAP_HWACCEL         0x0010
+/**
+ * Encoder or decoder requires flushing with NULL input at the end in order to
+ * give the complete and correct output.
+ *
+ * NOTE: If this flag is not set, the codec is guaranteed to never be fed with
+ *       with NULL data. The user can still send NULL data to the public encode
+ *       or decode function, but libavcodec will not pass it along to the codec
+ *       unless this flag is set.
+ *
+ * Decoders:
+ * The decoder has a non-zero delay and needs to be fed with avpkt->data=NULL,
+ * avpkt->size=0 at the end to get the delayed data until the decoder no longer
+ * returns frames.
+ *
+ * Encoders:
+ * The encoder needs to be fed with NULL data at the end of encoding until the
+ * encoder no longer returns data.
+ *
+ * NOTE: For encoders implementing the AVCodec.encode2() function, setting this
+ *       flag also means that the encoder must set the pts and duration for
+ *       each output packet. If this flag is not set, the pts and duration will
+ *       be determined by libavcodec from the input frame.
+ */
+#define CODEC_CAP_DELAY           0x0020
+/**
+ * Codec can be fed a final frame with a smaller size.
+ * This can be used to prevent truncation of the last audio samples.
+ */
+#define CODEC_CAP_SMALL_LAST_FRAME 0x0040
+/**
+ * Codec can export data for HW decoding (VDPAU).
+ */
+#define CODEC_CAP_HWACCEL_VDPAU    0x0080
+/**
+ * Codec can output multiple frames per AVPacket
+ * Normally demuxers return one frame at a time, demuxers which do not do
+ * are connected to a parser to split what they return into proper frames.
+ * This flag is reserved to the very rare category of codecs which have a
+ * bitstream that cannot be split into frames without timeconsuming
+ * operations like full decoding. Demuxers carring such bitstreams thus
+ * may return multiple frames in a packet. This has many disadvantages like
+ * prohibiting stream copy in many cases thus it should only be considered
+ * as a last resort.
+ */
+#define CODEC_CAP_SUBFRAMES        0x0100
+/**
+ * Codec is experimental and is thus avoided in favor of non experimental
+ * encoders
+ */
+#define CODEC_CAP_EXPERIMENTAL     0x0200
+/**
+ * Codec should fill in channel configuration and samplerate instead of container
+ */
+#define CODEC_CAP_CHANNEL_CONF     0x0400
+/**
+ * Codec is able to deal with negative linesizes
+ */
+#define CODEC_CAP_NEG_LINESIZES    0x0800
+/**
+ * Codec supports frame-level multithreading.
+ */
+#define CODEC_CAP_FRAME_THREADS    0x1000
+/**
+ * Codec supports slice-based (or partition-based) multithreading.
+ */
+#define CODEC_CAP_SLICE_THREADS    0x2000
+/**
+ * Codec supports changed parameters at any point.
+ */
+#define CODEC_CAP_PARAM_CHANGE     0x4000
+/**
+ * Codec supports avctx->thread_count == 0 (auto).
+ */
+#define CODEC_CAP_AUTO_THREADS     0x8000
+/**
+ * Audio encoder supports receiving a different number of samples in each call.
+ */
+#define CODEC_CAP_VARIABLE_FRAME_SIZE 0x10000
+
+//The following defines may change, don't expect compatibility if you use them.
+#define MB_TYPE_INTRA4x4   0x0001
+#define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific
+#define MB_TYPE_INTRA_PCM  0x0004 //FIXME H.264-specific
+#define MB_TYPE_16x16      0x0008
+#define MB_TYPE_16x8       0x0010
+#define MB_TYPE_8x16       0x0020
+#define MB_TYPE_8x8        0x0040
+#define MB_TYPE_INTERLACED 0x0080
+#define MB_TYPE_DIRECT2    0x0100 //FIXME
+#define MB_TYPE_ACPRED     0x0200
+#define MB_TYPE_GMC        0x0400
+#define MB_TYPE_SKIP       0x0800
+#define MB_TYPE_P0L0       0x1000
+#define MB_TYPE_P1L0       0x2000
+#define MB_TYPE_P0L1       0x4000
+#define MB_TYPE_P1L1       0x8000
+#define MB_TYPE_L0         (MB_TYPE_P0L0 | MB_TYPE_P1L0)
+#define MB_TYPE_L1         (MB_TYPE_P0L1 | MB_TYPE_P1L1)
+#define MB_TYPE_L0L1       (MB_TYPE_L0   | MB_TYPE_L1)
+#define MB_TYPE_QUANT      0x00010000
+#define MB_TYPE_CBP        0x00020000
+//Note bits 24-31 are reserved for codec specific use (h264 ref0, mpeg1 0mv, ...)
+
+/**
+ * Pan Scan area.
+ * This specifies the area which should be displayed.
+ * Note there may be multiple such areas for one frame.
+ */
+typedef struct AVPanScan{
+    /**
+     * id
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    int id;
+
+    /**
+     * width and height in 1/16 pel
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    int width;
+    int height;
+
+    /**
+     * position of the top left corner in 1/16 pel for up to 3 fields/frames
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    int16_t position[3][2];
+}AVPanScan;
+
+#define FF_QSCALE_TYPE_MPEG1 0
+#define FF_QSCALE_TYPE_MPEG2 1
+#define FF_QSCALE_TYPE_H264  2
+#define FF_QSCALE_TYPE_VP56  3
+
+#define FF_BUFFER_TYPE_INTERNAL 1
+#define FF_BUFFER_TYPE_USER     2 ///< direct rendering buffers (image is (de)allocated by user)
+#define FF_BUFFER_TYPE_SHARED   4 ///< Buffer from somewhere else; don't deallocate image (data/base), all other tables are not shared.
+#define FF_BUFFER_TYPE_COPY     8 ///< Just a (modified) copy of some other buffer, don't deallocate anything.
+
+#define FF_BUFFER_HINTS_VALID    0x01 // Buffer hints value is meaningful (if 0 ignore).
+#define FF_BUFFER_HINTS_READABLE 0x02 // Codec will read from buffer.
+#define FF_BUFFER_HINTS_PRESERVE 0x04 // User must not alter buffer content.
+#define FF_BUFFER_HINTS_REUSABLE 0x08 // Codec will reuse the buffer (update).
+
+/**
+ * @defgroup lavc_packet AVPacket
+ *
+ * Types and functions for working with AVPacket.
+ * @{
+ */
+enum AVPacketSideDataType {
+    AV_PKT_DATA_PALETTE,
+    AV_PKT_DATA_NEW_EXTRADATA,
+
+    /**
+     * An AV_PKT_DATA_PARAM_CHANGE side data packet is laid out as follows:
+     * @code
+     * u32le param_flags
+     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT)
+     *     s32le channel_count
+     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT)
+     *     u64le channel_layout
+     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE)
+     *     s32le sample_rate
+     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS)
+     *     s32le width
+     *     s32le height
+     * @endcode
+     */
+    AV_PKT_DATA_PARAM_CHANGE,
+
+    /**
+     * An AV_PKT_DATA_H263_MB_INFO side data packet contains a number of
+     * structures with info about macroblocks relevant to splitting the
+     * packet into smaller packets on macroblock edges (e.g. as for RFC 2190).
+     * That is, it does not necessarily contain info about all macroblocks,
+     * as long as the distance between macroblocks in the info is smaller
+     * than the target payload size.
+     * Each MB info structure is 12 bytes, and is laid out as follows:
+     * @code
+     * u32le bit offset from the start of the packet
+     * u8    current quantizer at the start of the macroblock
+     * u8    GOB number
+     * u16le macroblock address within the GOB
+     * u8    horizontal MV predictor
+     * u8    vertical MV predictor
+     * u8    horizontal MV predictor for block number 3
+     * u8    vertical MV predictor for block number 3
+     * @endcode
+     */
+    AV_PKT_DATA_H263_MB_INFO,
+};
+
+/**
+ * This structure stores compressed data. It is typically exported by demuxers
+ * and then passed as input to decoders, or received as output from encoders and
+ * then passed to muxers.
+ *
+ * For video, it should typically contain one compressed frame. For audio it may
+ * contain several compressed frames.
+ *
+ * AVPacket is one of the few structs in Libav, whose size is a part of public
+ * ABI. Thus it may be allocated on stack and no new fields can be added to it
+ * without libavcodec and libavformat major bump.
+ *
+ * The semantics of data ownership depends on the destruct field.
+ * If it is set, the packet data is dynamically allocated and is valid
+ * indefinitely until av_free_packet() is called (which in turn calls the
+ * destruct callback to free the data). If destruct is not set, the packet data
+ * is typically backed by some static buffer somewhere and is only valid for a
+ * limited time (e.g. until the next read call when demuxing).
+ *
+ * The side data is always allocated with av_malloc() and is freed in
+ * av_free_packet().
+ */
+typedef struct AVPacket {
+    /**
+     * Presentation timestamp in AVStream->time_base units; the time at which
+     * the decompressed packet will be presented to the user.
+     * Can be AV_NOPTS_VALUE if it is not stored in the file.
+     * pts MUST be larger or equal to dts as presentation cannot happen before
+     * decompression, unless one wants to view hex dumps. Some formats misuse
+     * the terms dts and pts/cts to mean something different. Such timestamps
+     * must be converted to true pts/dts before they are stored in AVPacket.
+     */
+    int64_t pts;
+    /**
+     * Decompression timestamp in AVStream->time_base units; the time at which
+     * the packet is decompressed.
+     * Can be AV_NOPTS_VALUE if it is not stored in the file.
+     */
+    int64_t dts;
+    uint8_t *data;
+    int   size;
+    int   stream_index;
+    /**
+     * A combination of AV_PKT_FLAG values
+     */
+    int   flags;
+    /**
+     * Additional packet data that can be provided by the container.
+     * Packet can contain several types of side information.
+     */
+    struct {
+        uint8_t *data;
+        int      size;
+        enum AVPacketSideDataType type;
+    } *side_data;
+    int side_data_elems;
+
+    /**
+     * Duration of this packet in AVStream->time_base units, 0 if unknown.
+     * Equals next_pts - this_pts in presentation order.
+     */
+    int   duration;
+    void  (*destruct)(struct AVPacket *);
+    void  *priv;
+    int64_t pos;                            ///< byte position in stream, -1 if unknown
+
+    /**
+     * Time difference in AVStream->time_base units from the pts of this
+     * packet to the point at which the output from the decoder has converged
+     * independent from the availability of previous frames. That is, the
+     * frames are virtually identical no matter if decoding started from
+     * the very first frame or from this keyframe.
+     * Is AV_NOPTS_VALUE if unknown.
+     * This field is not the display duration of the current packet.
+     * This field has no meaning if the packet does not have AV_PKT_FLAG_KEY
+     * set.
+     *
+     * The purpose of this field is to allow seeking in streams that have no
+     * keyframes in the conventional sense. It corresponds to the
+     * recovery point SEI in H.264 and match_time_delta in NUT. It is also
+     * essential for some types of subtitle streams to ensure that all
+     * subtitles are correctly displayed after seeking.
+     */
+    int64_t convergence_duration;
+} AVPacket;
+#define AV_PKT_FLAG_KEY     0x0001 ///< The packet contains a keyframe
+#define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted
+
+enum AVSideDataParamChangeFlags {
+    AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT  = 0x0001,
+    AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT = 0x0002,
+    AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE    = 0x0004,
+    AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS     = 0x0008,
+};
+/**
+ * @}
+ */
+
+/**
+ * This structure describes decoded (raw) audio or video data.
+ *
+ * AVFrame must be allocated using avcodec_alloc_frame() and freed with
+ * avcodec_free_frame(). Note that this allocates only the AVFrame itself. The
+ * buffers for the data must be managed through other means.
+ *
+ * AVFrame is typically allocated once and then reused multiple times to hold
+ * different data (e.g. a single AVFrame to hold frames received from a
+ * decoder). In such a case, avcodec_get_frame_defaults() should be used to
+ * reset the frame to its original clean state before it is reused again.
+ *
+ * sizeof(AVFrame) is not a part of the public ABI, so new fields may be added
+ * to the end with a minor bump.
+ */
+typedef struct AVFrame {
+#define AV_NUM_DATA_POINTERS 8
+    /**
+     * pointer to the picture/channel planes.
+     * This might be different from the first allocated byte
+     * - encoding: Set by user
+     * - decoding: set by AVCodecContext.get_buffer()
+     */
+    uint8_t *data[AV_NUM_DATA_POINTERS];
+
+    /**
+     * Size, in bytes, of the data for each picture/channel plane.
+     *
+     * For audio, only linesize[0] may be set. For planar audio, each channel
+     * plane must be the same size.
+     *
+     * - encoding: Set by user
+     * - decoding: set by AVCodecContext.get_buffer()
+     */
+    int linesize[AV_NUM_DATA_POINTERS];
+
+    /**
+     * pointers to the data planes/channels.
+     *
+     * For video, this should simply point to data[].
+     *
+     * For planar audio, each channel has a separate data pointer, and
+     * linesize[0] contains the size of each channel buffer.
+     * For packed audio, there is just one data pointer, and linesize[0]
+     * contains the total size of the buffer for all channels.
+     *
+     * Note: Both data and extended_data will always be set by get_buffer(),
+     * but for planar audio with more channels that can fit in data,
+     * extended_data must be used by the decoder in order to access all
+     * channels.
+     *
+     * encoding: set by user
+     * decoding: set by AVCodecContext.get_buffer()
+     */
+    uint8_t **extended_data;
+
+    /**
+     * width and height of the video frame
+     * - encoding: unused
+     * - decoding: Read by user.
+     */
+    int width, height;
+
+    /**
+     * number of audio samples (per channel) described by this frame
+     * - encoding: Set by user
+     * - decoding: Set by libavcodec
+     */
+    int nb_samples;
+
+    /**
+     * format of the frame, -1 if unknown or unset
+     * Values correspond to enum AVPixelFormat for video frames,
+     * enum AVSampleFormat for audio)
+     * - encoding: unused
+     * - decoding: Read by user.
+     */
+    int format;
+
+    /**
+     * 1 -> keyframe, 0-> not
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by libavcodec.
+     */
+    int key_frame;
+
+    /**
+     * Picture type of the frame, see ?_TYPE below.
+     * - encoding: Set by libavcodec. for coded_picture (and set by user for input).
+     * - decoding: Set by libavcodec.
+     */
+    enum AVPictureType pict_type;
+
+    /**
+     * pointer to the first allocated byte of the picture. Can be used in get_buffer/release_buffer.
+     * This isn't used by libavcodec unless the default get/release_buffer() is used.
+     * - encoding:
+     * - decoding:
+     */
+    uint8_t *base[AV_NUM_DATA_POINTERS];
+
+    /**
+     * sample aspect ratio for the video frame, 0/1 if unknown/unspecified
+     * - encoding: unused
+     * - decoding: Read by user.
+     */
+    AVRational sample_aspect_ratio;
+
+    /**
+     * presentation timestamp in time_base units (time when frame should be shown to user)
+     * If AV_NOPTS_VALUE then frame_rate = 1/time_base will be assumed.
+     * - encoding: MUST be set by user.
+     * - decoding: Set by libavcodec.
+     */
+    int64_t pts;
+
+    /**
+     * pts copied from the AVPacket that was decoded to produce this frame
+     * - encoding: unused
+     * - decoding: Read by user.
+     */
+    int64_t pkt_pts;
+
+    /**
+     * dts copied from the AVPacket that triggered returning this frame
+     * - encoding: unused
+     * - decoding: Read by user.
+     */
+    int64_t pkt_dts;
+
+    /**
+     * picture number in bitstream order
+     * - encoding: set by
+     * - decoding: Set by libavcodec.
+     */
+    int coded_picture_number;
+    /**
+     * picture number in display order
+     * - encoding: set by
+     * - decoding: Set by libavcodec.
+     */
+    int display_picture_number;
+
+    /**
+     * quality (between 1 (good) and FF_LAMBDA_MAX (bad))
+     * - encoding: Set by libavcodec. for coded_picture (and set by user for input).
+     * - decoding: Set by libavcodec.
+     */
+    int quality;
+
+    /**
+     * is this picture used as reference
+     * The values for this are the same as the MpegEncContext.picture_structure
+     * variable, that is 1->top field, 2->bottom field, 3->frame/both fields.
+     * Set to 4 for delayed, non-reference frames.
+     * - encoding: unused
+     * - decoding: Set by libavcodec. (before get_buffer() call)).
+     */
+    int reference;
+
+    /**
+     * QP table
+     * - encoding: unused
+     * - decoding: Set by libavcodec.
+     */
+    int8_t *qscale_table;
+    /**
+     * QP store stride
+     * - encoding: unused
+     * - decoding: Set by libavcodec.
+     */
+    int qstride;
+
+    /**
+     *
+     */
+    int qscale_type;
+
+    /**
+     * mbskip_table[mb]>=1 if MB didn't change
+     * stride= mb_width = (width+15)>>4
+     * - encoding: unused
+     * - decoding: Set by libavcodec.
+     */
+    uint8_t *mbskip_table;
+
+    /**
+     * motion vector table
+     * @code
+     * example:
+     * int mv_sample_log2= 4 - motion_subsample_log2;
+     * int mb_width= (width+15)>>4;
+     * int mv_stride= (mb_width << mv_sample_log2) + 1;
+     * motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y];
+     * @endcode
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    int16_t (*motion_val[2])[2];
+
+    /**
+     * macroblock type table
+     * mb_type_base + mb_width + 2
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    uint32_t *mb_type;
+
+    /**
+     * DCT coefficients
+     * - encoding: unused
+     * - decoding: Set by libavcodec.
+     */
+    short *dct_coeff;
+
+    /**
+     * motion reference frame index
+     * the order in which these are stored can depend on the codec.
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    int8_t *ref_index[2];
+
+    /**
+     * for some private data of the user
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    void *opaque;
+
+    /**
+     * error
+     * - encoding: Set by libavcodec. if flags&CODEC_FLAG_PSNR.
+     * - decoding: unused
+     */
+    uint64_t error[AV_NUM_DATA_POINTERS];
+
+    /**
+     * type of the buffer (to keep track of who has to deallocate data[*])
+     * - encoding: Set by the one who allocates it.
+     * - decoding: Set by the one who allocates it.
+     * Note: User allocated (direct rendering) & internal buffers cannot coexist currently.
+     */
+    int type;
+
+    /**
+     * When decoding, this signals how much the picture must be delayed.
+     * extra_delay = repeat_pict / (2*fps)
+     * - encoding: unused
+     * - decoding: Set by libavcodec.
+     */
+    int repeat_pict;
+
+    /**
+     * The content of the picture is interlaced.
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec. (default 0)
+     */
+    int interlaced_frame;
+
+    /**
+     * If the content is interlaced, is top field displayed first.
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    int top_field_first;
+
+    /**
+     * Tell user application that palette has changed from previous frame.
+     * - encoding: ??? (no palette-enabled encoder yet)
+     * - decoding: Set by libavcodec. (default 0).
+     */
+    int palette_has_changed;
+
+    /**
+     * codec suggestion on buffer type if != 0
+     * - encoding: unused
+     * - decoding: Set by libavcodec. (before get_buffer() call)).
+     */
+    int buffer_hints;
+
+    /**
+     * Pan scan.
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    AVPanScan *pan_scan;
+
+    /**
+     * reordered opaque 64bit (generally an integer or a double precision float
+     * PTS but can be anything).
+     * The user sets AVCodecContext.reordered_opaque to represent the input at
+     * that time,
+     * the decoder reorders values as needed and sets AVFrame.reordered_opaque
+     * to exactly one of the values provided by the user through AVCodecContext.reordered_opaque
+     * @deprecated in favor of pkt_pts
+     * - encoding: unused
+     * - decoding: Read by user.
+     */
+    int64_t reordered_opaque;
+
+    /**
+     * hardware accelerator private data (Libav-allocated)
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    void *hwaccel_picture_private;
+
+    /**
+     * the AVCodecContext which ff_thread_get_buffer() was last called on
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by libavcodec.
+     */
+    struct AVCodecContext *owner;
+
+    /**
+     * used by multithreading to store frame-specific info
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by libavcodec.
+     */
+    void *thread_opaque;
+
+    /**
+     * log2 of the size of the block which a single vector in motion_val represents:
+     * (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2)
+     * - encoding: unused
+     * - decoding: Set by libavcodec.
+     */
+    uint8_t motion_subsample_log2;
+
+    /**
+     * Sample rate of the audio data.
+     *
+     * - encoding: unused
+     * - decoding: set by get_buffer()
+     */
+    int sample_rate;
+
+    /**
+     * Channel layout of the audio data.
+     *
+     * - encoding: unused
+     * - decoding: set by get_buffer()
+     */
+    uint64_t channel_layout;
+} AVFrame;
+
+struct AVCodecInternal;
+
+enum AVFieldOrder {
+    AV_FIELD_UNKNOWN,
+    AV_FIELD_PROGRESSIVE,
+    AV_FIELD_TT,          //< Top coded_first, top displayed first
+    AV_FIELD_BB,          //< Bottom coded first, bottom displayed first
+    AV_FIELD_TB,          //< Top coded first, bottom displayed first
+    AV_FIELD_BT,          //< Bottom coded first, top displayed first
+};
+
+/**
+ * main external API structure.
+ * New fields can be added to the end with minor version bumps.
+ * Removal, reordering and changes to existing fields require a major
+ * version bump.
+ * sizeof(AVCodecContext) must not be used outside libav*.
+ */
+typedef struct AVCodecContext {
+    /**
+     * information on struct for av_log
+     * - set by avcodec_alloc_context3
+     */
+    const AVClass *av_class;
+    int log_level_offset;
+
+    enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
+    const struct AVCodec  *codec;
+    char             codec_name[32];
+    enum AVCodecID     codec_id; /* see AV_CODEC_ID_xxx */
+
+    /**
+     * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
+     * This is used to work around some encoder bugs.
+     * A demuxer should set this to what is stored in the field used to identify the codec.
+     * If there are multiple such fields in a container then the demuxer should choose the one
+     * which maximizes the information about the used codec.
+     * If the codec tag field in a container is larger than 32 bits then the demuxer should
+     * remap the longer ID to 32 bits with a table or other structure. Alternatively a new
+     * extra_codec_tag + size could be added but for this a clear advantage must be demonstrated
+     * first.
+     * - encoding: Set by user, if not then the default based on codec_id will be used.
+     * - decoding: Set by user, will be converted to uppercase by libavcodec during init.
+     */
+    unsigned int codec_tag;
+
+    /**
+     * fourcc from the AVI stream header (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
+     * This is used to work around some encoder bugs.
+     * - encoding: unused
+     * - decoding: Set by user, will be converted to uppercase by libavcodec during init.
+     */
+    unsigned int stream_codec_tag;
+
+#if FF_API_SUB_ID
+    /**
+     * @deprecated this field is unused
+     */
+    attribute_deprecated int sub_id;
+#endif
+
+    void *priv_data;
+
+    /**
+     * Private context used for internal data.
+     *
+     * Unlike priv_data, this is not codec-specific. It is used in general
+     * libavcodec functions.
+     */
+    struct AVCodecInternal *internal;
+
+    /**
+     * Private data of the user, can be used to carry app specific stuff.
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    void *opaque;
+
+    /**
+     * the average bitrate
+     * - encoding: Set by user; unused for constant quantizer encoding.
+     * - decoding: Set by libavcodec. 0 or some bitrate if this info is available in the stream.
+     */
+    int bit_rate;
+
+    /**
+     * number of bits the bitstream is allowed to diverge from the reference.
+     *           the reference can be CBR (for CBR pass1) or VBR (for pass2)
+     * - encoding: Set by user; unused for constant quantizer encoding.
+     * - decoding: unused
+     */
+    int bit_rate_tolerance;
+
+    /**
+     * Global quality for codecs which cannot change it per frame.
+     * This should be proportional to MPEG-1/2/4 qscale.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int global_quality;
+
+    /**
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int compression_level;
+#define FF_COMPRESSION_DEFAULT -1
+
+    /**
+     * CODEC_FLAG_*.
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int flags;
+
+    /**
+     * CODEC_FLAG2_*
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int flags2;
+
+    /**
+     * some codecs need / can use extradata like Huffman tables.
+     * mjpeg: Huffman tables
+     * rv10: additional flags
+     * mpeg4: global headers (they can be in the bitstream or here)
+     * The allocated memory should be FF_INPUT_BUFFER_PADDING_SIZE bytes larger
+     * than extradata_size to avoid prolems if it is read with the bitstream reader.
+     * The bytewise contents of extradata must not depend on the architecture or CPU endianness.
+     * - encoding: Set/allocated/freed by libavcodec.
+     * - decoding: Set/allocated/freed by user.
+     */
+    uint8_t *extradata;
+    int extradata_size;
+
+    /**
+     * This is the fundamental unit of time (in seconds) in terms
+     * of which frame timestamps are represented. For fixed-fps content,
+     * timebase should be 1/framerate and timestamp increments should be
+     * identically 1.
+     * - encoding: MUST be set by user.
+     * - decoding: Set by libavcodec.
+     */
+    AVRational time_base;
+
+    /**
+     * For some codecs, the time base is closer to the field rate than the frame rate.
+     * Most notably, H.264 and MPEG-2 specify time_base as half of frame duration
+     * if no telecine is used ...
+     *
+     * Set to time_base ticks per frame. Default 1, e.g., H.264/MPEG-2 set it to 2.
+     */
+    int ticks_per_frame;
+
+    /**
+     * Codec delay.
+     *
+     * Video:
+     *   Number of frames the decoded output will be delayed relative to the
+     *   encoded input.
+     *
+     * Audio:
+     *   For encoding, this is the number of "priming" samples added to the
+     *   beginning of the stream. The decoded output will be delayed by this
+     *   many samples relative to the input to the encoder. Note that this
+     *   field is purely informational and does not directly affect the pts
+     *   output by the encoder, which should always be based on the actual
+     *   presentation time, including any delay.
+     *   For decoding, this is the number of samples the decoder needs to
+     *   output before the decoder's output is valid. When seeking, you should
+     *   start decoding this many samples prior to your desired seek point.
+     *
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by libavcodec.
+     */
+    int delay;
+
+
+    /* video only */
+    /**
+     * picture width / height.
+     * - encoding: MUST be set by user.
+     * - decoding: Set by libavcodec.
+     * Note: For compatibility it is possible to set this instead of
+     * coded_width/height before decoding.
+     */
+    int width, height;
+
+    /**
+     * Bitstream width / height, may be different from width/height.
+     * - encoding: unused
+     * - decoding: Set by user before init if known. Codec should override / dynamically change if needed.
+     */
+    int coded_width, coded_height;
+
+#define FF_ASPECT_EXTENDED 15
+
+    /**
+     * the number of pictures in a group of pictures, or 0 for intra_only
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int gop_size;
+
+    /**
+     * Pixel format, see AV_PIX_FMT_xxx.
+     * May be set by the demuxer if known from headers.
+     * May be overriden by the decoder if it knows better.
+     * - encoding: Set by user.
+     * - decoding: Set by user if known, overridden by libavcodec if known
+     */
+    enum AVPixelFormat pix_fmt;
+
+    /**
+     * Motion estimation algorithm used for video coding.
+     * 1 (zero), 2 (full), 3 (log), 4 (phods), 5 (epzs), 6 (x1), 7 (hex),
+     * 8 (umh), 9 (iter), 10 (tesa) [7, 8, 10 are x264 specific, 9 is snow specific]
+     * - encoding: MUST be set by user.
+     * - decoding: unused
+     */
+    int me_method;
+
+    /**
+     * If non NULL, 'draw_horiz_band' is called by the libavcodec
+     * decoder to draw a horizontal band. It improves cache usage. Not
+     * all codecs can do that. You must check the codec capabilities
+     * beforehand.
+     * When multithreading is used, it may be called from multiple threads
+     * at the same time; threads might draw different parts of the same AVFrame,
+     * or multiple AVFrames, and there is no guarantee that slices will be drawn
+     * in order.
+     * The function is also used by hardware acceleration APIs.
+     * It is called at least once during frame decoding to pass
+     * the data needed for hardware render.
+     * In that mode instead of pixel data, AVFrame points to
+     * a structure specific to the acceleration API. The application
+     * reads the structure and can change some fields to indicate progress
+     * or mark state.
+     * - encoding: unused
+     * - decoding: Set by user.
+     * @param height the height of the slice
+     * @param y the y position of the slice
+     * @param type 1->top field, 2->bottom field, 3->frame
+     * @param offset offset into the AVFrame.data from which the slice should be read
+     */
+    void (*draw_horiz_band)(struct AVCodecContext *s,
+                            const AVFrame *src, int offset[AV_NUM_DATA_POINTERS],
+                            int y, int type, int height);
+
+    /**
+     * callback to negotiate the pixelFormat
+     * @param fmt is the list of formats which are supported by the codec,
+     * it is terminated by -1 as 0 is a valid format, the formats are ordered by quality.
+     * The first is always the native one.
+     * @return the chosen format
+     * - encoding: unused
+     * - decoding: Set by user, if not set the native format will be chosen.
+     */
+    enum AVPixelFormat (*get_format)(struct AVCodecContext *s, const enum AVPixelFormat * fmt);
+
+    /**
+     * maximum number of B-frames between non-B-frames
+     * Note: The output will be delayed by max_b_frames+1 relative to the input.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int max_b_frames;
+
+    /**
+     * qscale factor between IP and B-frames
+     * If > 0 then the last P-frame quantizer will be used (q= lastp_q*factor+offset).
+     * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float b_quant_factor;
+
+    /** obsolete FIXME remove */
+    int rc_strategy;
+#define FF_RC_STRATEGY_XVID 1
+
+    int b_frame_strategy;
+
+#if FF_API_MPV_GLOBAL_OPTS
+    /**
+     * luma single coefficient elimination threshold
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    attribute_deprecated int luma_elim_threshold;
+
+    /**
+     * chroma single coeff elimination threshold
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    attribute_deprecated int chroma_elim_threshold;
+#endif
+
+    /**
+     * qscale offset between IP and B-frames
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float b_quant_offset;
+
+    /**
+     * Size of the frame reordering buffer in the decoder.
+     * For MPEG-2 it is 1 IPB or 0 low delay IP.
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by libavcodec.
+     */
+    int has_b_frames;
+
+    /**
+     * 0-> h263 quant 1-> mpeg quant
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int mpeg_quant;
+
+    /**
+     * qscale factor between P and I-frames
+     * If > 0 then the last p frame quantizer will be used (q= lastp_q*factor+offset).
+     * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float i_quant_factor;
+
+    /**
+     * qscale offset between P and I-frames
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float i_quant_offset;
+
+    /**
+     * luminance masking (0-> disabled)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float lumi_masking;
+
+    /**
+     * temporary complexity masking (0-> disabled)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float temporal_cplx_masking;
+
+    /**
+     * spatial complexity masking (0-> disabled)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float spatial_cplx_masking;
+
+    /**
+     * p block masking (0-> disabled)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float p_masking;
+
+    /**
+     * darkness masking (0-> disabled)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float dark_masking;
+
+    /**
+     * slice count
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by user (or 0).
+     */
+    int slice_count;
+    /**
+     * prediction method (needed for huffyuv)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+     int prediction_method;
+#define FF_PRED_LEFT   0
+#define FF_PRED_PLANE  1
+#define FF_PRED_MEDIAN 2
+
+    /**
+     * slice offsets in the frame in bytes
+     * - encoding: Set/allocated by libavcodec.
+     * - decoding: Set/allocated by user (or NULL).
+     */
+    int *slice_offset;
+
+    /**
+     * sample aspect ratio (0 if unknown)
+     * That is the width of a pixel divided by the height of the pixel.
+     * Numerator and denominator must be relatively prime and smaller than 256 for some video standards.
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    AVRational sample_aspect_ratio;
+
+    /**
+     * motion estimation comparison function
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int me_cmp;
+    /**
+     * subpixel motion estimation comparison function
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int me_sub_cmp;
+    /**
+     * macroblock comparison function (not supported yet)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int mb_cmp;
+    /**
+     * interlaced DCT comparison function
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int ildct_cmp;
+#define FF_CMP_SAD    0
+#define FF_CMP_SSE    1
+#define FF_CMP_SATD   2
+#define FF_CMP_DCT    3
+#define FF_CMP_PSNR   4
+#define FF_CMP_BIT    5
+#define FF_CMP_RD     6
+#define FF_CMP_ZERO   7
+#define FF_CMP_VSAD   8
+#define FF_CMP_VSSE   9
+#define FF_CMP_NSSE   10
+#define FF_CMP_W53    11
+#define FF_CMP_W97    12
+#define FF_CMP_DCTMAX 13
+#define FF_CMP_DCT264 14
+#define FF_CMP_CHROMA 256
+
+    /**
+     * ME diamond size & shape
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int dia_size;
+
+    /**
+     * amount of previous MV predictors (2a+1 x 2a+1 square)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int last_predictor_count;
+
+    /**
+     * prepass for motion estimation
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int pre_me;
+
+    /**
+     * motion estimation prepass comparison function
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int me_pre_cmp;
+
+    /**
+     * ME prepass diamond size & shape
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int pre_dia_size;
+
+    /**
+     * subpel ME quality
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int me_subpel_quality;
+
+    /**
+     * DTG active format information (additional aspect ratio
+     * information only used in DVB MPEG-2 transport streams)
+     * 0 if not set.
+     *
+     * - encoding: unused
+     * - decoding: Set by decoder.
+     */
+    int dtg_active_format;
+#define FF_DTG_AFD_SAME         8
+#define FF_DTG_AFD_4_3          9
+#define FF_DTG_AFD_16_9         10
+#define FF_DTG_AFD_14_9         11
+#define FF_DTG_AFD_4_3_SP_14_9  13
+#define FF_DTG_AFD_16_9_SP_14_9 14
+#define FF_DTG_AFD_SP_4_3       15
+
+    /**
+     * maximum motion estimation search range in subpel units
+     * If 0 then no limit.
+     *
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int me_range;
+
+    /**
+     * intra quantizer bias
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int intra_quant_bias;
+#define FF_DEFAULT_QUANT_BIAS 999999
+
+    /**
+     * inter quantizer bias
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int inter_quant_bias;
+
+#if FF_API_COLOR_TABLE_ID
+    /**
+     * color table ID
+     * - encoding: unused
+     * - decoding: Which clrtable should be used for 8bit RGB images.
+     *             Tables have to be stored somewhere. FIXME
+     */
+    attribute_deprecated int color_table_id;
+#endif
+
+    /**
+     * slice flags
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    int slice_flags;
+#define SLICE_FLAG_CODED_ORDER    0x0001 ///< draw_horiz_band() is called in coded order instead of display
+#define SLICE_FLAG_ALLOW_FIELD    0x0002 ///< allow draw_horiz_band() with field slices (MPEG2 field pics)
+#define SLICE_FLAG_ALLOW_PLANE    0x0004 ///< allow draw_horiz_band() with 1 component at a time (SVQ1)
+
+    /**
+     * XVideo Motion Acceleration
+     * - encoding: forbidden
+     * - decoding: set by decoder
+     */
+    int xvmc_acceleration;
+
+    /**
+     * macroblock decision mode
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int mb_decision;
+#define FF_MB_DECISION_SIMPLE 0        ///< uses mb_cmp
+#define FF_MB_DECISION_BITS   1        ///< chooses the one which needs the fewest bits
+#define FF_MB_DECISION_RD     2        ///< rate distortion
+
+    /**
+     * custom intra quantization matrix
+     * - encoding: Set by user, can be NULL.
+     * - decoding: Set by libavcodec.
+     */
+    uint16_t *intra_matrix;
+
+    /**
+     * custom inter quantization matrix
+     * - encoding: Set by user, can be NULL.
+     * - decoding: Set by libavcodec.
+     */
+    uint16_t *inter_matrix;
+
+    /**
+     * scene change detection threshold
+     * 0 is default, larger means fewer detected scene changes.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int scenechange_threshold;
+
+    /**
+     * noise reduction strength
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int noise_reduction;
+
+#if FF_API_INTER_THRESHOLD
+    /**
+     * @deprecated this field is unused
+     */
+    attribute_deprecated int inter_threshold;
+#endif
+
+#if FF_API_MPV_GLOBAL_OPTS
+    /**
+     * @deprecated use mpegvideo private options instead
+     */
+    attribute_deprecated int quantizer_noise_shaping;
+#endif
+
+    /**
+     * Motion estimation threshold below which no motion estimation is
+     * performed, but instead the user specified motion vectors are used.
+     *
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int me_threshold;
+
+    /**
+     * Macroblock threshold below which the user specified macroblock types will be used.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int mb_threshold;
+
+    /**
+     * precision of the intra DC coefficient - 8
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int intra_dc_precision;
+
+    /**
+     * Number of macroblock rows at the top which are skipped.
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    int skip_top;
+
+    /**
+     * Number of macroblock rows at the bottom which are skipped.
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    int skip_bottom;
+
+    /**
+     * Border processing masking, raises the quantizer for mbs on the borders
+     * of the picture.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float border_masking;
+
+    /**
+     * minimum MB lagrange multipler
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int mb_lmin;
+
+    /**
+     * maximum MB lagrange multipler
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int mb_lmax;
+
+    /**
+     *
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int me_penalty_compensation;
+
+    /**
+     *
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int bidir_refine;
+
+    /**
+     *
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int brd_scale;
+
+    /**
+     * minimum GOP size
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int keyint_min;
+
+    /**
+     * number of reference frames
+     * - encoding: Set by user.
+     * - decoding: Set by lavc.
+     */
+    int refs;
+
+    /**
+     * chroma qp offset from luma
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int chromaoffset;
+
+    /**
+     * Multiplied by qscale for each frame and added to scene_change_score.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int scenechange_factor;
+
+    /**
+     *
+     * Note: Value depends upon the compare function used for fullpel ME.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int mv0_threshold;
+
+    /**
+     * Adjust sensitivity of b_frame_strategy 1.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int b_sensitivity;
+
+    /**
+     * Chromaticity coordinates of the source primaries.
+     * - encoding: Set by user
+     * - decoding: Set by libavcodec
+     */
+    enum AVColorPrimaries color_primaries;
+
+    /**
+     * Color Transfer Characteristic.
+     * - encoding: Set by user
+     * - decoding: Set by libavcodec
+     */
+    enum AVColorTransferCharacteristic color_trc;
+
+    /**
+     * YUV colorspace type.
+     * - encoding: Set by user
+     * - decoding: Set by libavcodec
+     */
+    enum AVColorSpace colorspace;
+
+    /**
+     * MPEG vs JPEG YUV range.
+     * - encoding: Set by user
+     * - decoding: Set by libavcodec
+     */
+    enum AVColorRange color_range;
+
+    /**
+     * This defines the location of chroma samples.
+     * - encoding: Set by user
+     * - decoding: Set by libavcodec
+     */
+    enum AVChromaLocation chroma_sample_location;
+
+    /**
+     * Number of slices.
+     * Indicates number of picture subdivisions. Used for parallelized
+     * decoding.
+     * - encoding: Set by user
+     * - decoding: unused
+     */
+    int slices;
+
+    /** Field order
+     * - encoding: set by libavcodec
+     * - decoding: Set by libavcodec
+     */
+    enum AVFieldOrder field_order;
+
+    /* audio only */
+    int sample_rate; ///< samples per second
+    int channels;    ///< number of audio channels
+
+    /**
+     * audio sample format
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    enum AVSampleFormat sample_fmt;  ///< sample format
+
+    /* The following data should not be initialized. */
+    /**
+     * Number of samples per channel in an audio frame.
+     *
+     * - encoding: set by libavcodec in avcodec_open2(). Each submitted frame
+     *   except the last must contain exactly frame_size samples per channel.
+     *   May be 0 when the codec has CODEC_CAP_VARIABLE_FRAME_SIZE set, then the
+     *   frame size is not restricted.
+     * - decoding: may be set by some decoders to indicate constant frame size
+     */
+    int frame_size;
+
+    /**
+     * Frame counter, set by libavcodec.
+     *
+     * - decoding: total number of frames returned from the decoder so far.
+     * - encoding: total number of frames passed to the encoder so far.
+     *
+     *   @note the counter is not incremented if encoding/decoding resulted in
+     *   an error.
+     */
+    int frame_number;
+
+    /**
+     * number of bytes per packet if constant and known or 0
+     * Used by some WAV based audio codecs.
+     */
+    int block_align;
+
+    /**
+     * Audio cutoff bandwidth (0 means "automatic")
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int cutoff;
+
+#if FF_API_REQUEST_CHANNELS
+    /**
+     * Decoder should decode to this many channels if it can (0 for default)
+     * - encoding: unused
+     * - decoding: Set by user.
+     * @deprecated Deprecated in favor of request_channel_layout.
+     */
+    int request_channels;
+#endif
+
+    /**
+     * Audio channel layout.
+     * - encoding: set by user.
+     * - decoding: set by libavcodec.
+     */
+    uint64_t channel_layout;
+
+    /**
+     * Request decoder to use this channel layout if it can (0 for default)
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    uint64_t request_channel_layout;
+
+    /**
+     * Type of service that the audio stream conveys.
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    enum AVAudioServiceType audio_service_type;
+
+    /**
+     * Used to request a sample format from the decoder.
+     * - encoding: unused.
+     * - decoding: Set by user.
+     */
+    enum AVSampleFormat request_sample_fmt;
+
+    /**
+     * Called at the beginning of each frame to get a buffer for it.
+     *
+     * The function will set AVFrame.data[], AVFrame.linesize[].
+     * AVFrame.extended_data[] must also be set, but it should be the same as
+     * AVFrame.data[] except for planar audio with more channels than can fit
+     * in AVFrame.data[]. In that case, AVFrame.data[] shall still contain as
+     * many data pointers as it can hold.
+     *
+     * if CODEC_CAP_DR1 is not set then get_buffer() must call
+     * avcodec_default_get_buffer() instead of providing buffers allocated by
+     * some other means.
+     *
+     * AVFrame.data[] should be 32- or 16-byte-aligned unless the CPU doesn't
+     * need it. avcodec_default_get_buffer() aligns the output buffer properly,
+     * but if get_buffer() is overridden then alignment considerations should
+     * be taken into account.
+     *
+     * @see avcodec_default_get_buffer()
+     *
+     * Video:
+     *
+     * If pic.reference is set then the frame will be read later by libavcodec.
+     * avcodec_align_dimensions2() should be used to find the required width and
+     * height, as they normally need to be rounded up to the next multiple of 16.
+     *
+     * If frame multithreading is used and thread_safe_callbacks is set,
+     * it may be called from a different thread, but not from more than one at
+     * once. Does not need to be reentrant.
+     *
+     * @see release_buffer(), reget_buffer()
+     * @see avcodec_align_dimensions2()
+     *
+     * Audio:
+     *
+     * Decoders request a buffer of a particular size by setting
+     * AVFrame.nb_samples prior to calling get_buffer(). The decoder may,
+     * however, utilize only part of the buffer by setting AVFrame.nb_samples
+     * to a smaller value in the output frame.
+     *
+     * Decoders cannot use the buffer after returning from
+     * avcodec_decode_audio4(), so they will not call release_buffer(), as it
+     * is assumed to be released immediately upon return. In some rare cases,
+     * a decoder may need to call get_buffer() more than once in a single
+     * call to avcodec_decode_audio4(). In that case, when get_buffer() is
+     * called again after it has already been called once, the previously
+     * acquired buffer is assumed to be released at that time and may not be
+     * reused by the decoder.
+     *
+     * As a convenience, av_samples_get_buffer_size() and
+     * av_samples_fill_arrays() in libavutil may be used by custom get_buffer()
+     * functions to find the required data size and to fill data pointers and
+     * linesize. In AVFrame.linesize, only linesize[0] may be set for audio
+     * since all planes must be the same size.
+     *
+     * @see av_samples_get_buffer_size(), av_samples_fill_arrays()
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec, user can override.
+     */
+    int (*get_buffer)(struct AVCodecContext *c, AVFrame *pic);
+
+    /**
+     * Called to release buffers which were allocated with get_buffer.
+     * A released buffer can be reused in get_buffer().
+     * pic.data[*] must be set to NULL.
+     * May be called from a different thread if frame multithreading is used,
+     * but not by more than one thread at once, so does not need to be reentrant.
+     * - encoding: unused
+     * - decoding: Set by libavcodec, user can override.
+     */
+    void (*release_buffer)(struct AVCodecContext *c, AVFrame *pic);
+
+    /**
+     * Called at the beginning of a frame to get cr buffer for it.
+     * Buffer type (size, hints) must be the same. libavcodec won't check it.
+     * libavcodec will pass previous buffer in pic, function should return
+     * same buffer or new buffer with old frame "painted" into it.
+     * If pic.data[0] == NULL must behave like get_buffer().
+     * if CODEC_CAP_DR1 is not set then reget_buffer() must call
+     * avcodec_default_reget_buffer() instead of providing buffers allocated by
+     * some other means.
+     * - encoding: unused
+     * - decoding: Set by libavcodec, user can override.
+     */
+    int (*reget_buffer)(struct AVCodecContext *c, AVFrame *pic);
+
+
+    /* - encoding parameters */
+    float qcompress;  ///< amount of qscale change between easy & hard scenes (0.0-1.0)
+    float qblur;      ///< amount of qscale smoothing over time (0.0-1.0)
+
+    /**
+     * minimum quantizer
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int qmin;
+
+    /**
+     * maximum quantizer
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int qmax;
+
+    /**
+     * maximum quantizer difference between frames
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int max_qdiff;
+
+    /**
+     * ratecontrol qmin qmax limiting method
+     * 0-> clipping, 1-> use a nice continuous function to limit qscale wthin qmin/qmax.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float rc_qsquish;
+
+    float rc_qmod_amp;
+    int rc_qmod_freq;
+
+    /**
+     * decoder bitstream buffer size
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int rc_buffer_size;
+
+    /**
+     * ratecontrol override, see RcOverride
+     * - encoding: Allocated/set/freed by user.
+     * - decoding: unused
+     */
+    int rc_override_count;
+    RcOverride *rc_override;
+
+    /**
+     * rate control equation
+     * - encoding: Set by user
+     * - decoding: unused
+     */
+    const char *rc_eq;
+
+    /**
+     * maximum bitrate
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int rc_max_rate;
+
+    /**
+     * minimum bitrate
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int rc_min_rate;
+
+    float rc_buffer_aggressivity;
+
+    /**
+     * initial complexity for pass1 ratecontrol
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float rc_initial_cplx;
+
+    /**
+     * Ratecontrol attempt to use, at maximum, <value> of what can be used without an underflow.
+     * - encoding: Set by user.
+     * - decoding: unused.
+     */
+    float rc_max_available_vbv_use;
+
+    /**
+     * Ratecontrol attempt to use, at least, <value> times the amount needed to prevent a vbv overflow.
+     * - encoding: Set by user.
+     * - decoding: unused.
+     */
+    float rc_min_vbv_overflow_use;
+
+    /**
+     * Number of bits which should be loaded into the rc buffer before decoding starts.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int rc_initial_buffer_occupancy;
+
+#define FF_CODER_TYPE_VLC       0
+#define FF_CODER_TYPE_AC        1
+#define FF_CODER_TYPE_RAW       2
+#define FF_CODER_TYPE_RLE       3
+#define FF_CODER_TYPE_DEFLATE   4
+    /**
+     * coder type
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int coder_type;
+
+    /**
+     * context model
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int context_model;
+
+    /**
+     * minimum Lagrange multipler
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int lmin;
+
+    /**
+     * maximum Lagrange multipler
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int lmax;
+
+    /**
+     * frame skip threshold
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int frame_skip_threshold;
+
+    /**
+     * frame skip factor
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int frame_skip_factor;
+
+    /**
+     * frame skip exponent
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int frame_skip_exp;
+
+    /**
+     * frame skip comparison function
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int frame_skip_cmp;
+
+    /**
+     * trellis RD quantization
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int trellis;
+
+    /**
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int min_prediction_order;
+
+    /**
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int max_prediction_order;
+
+    /**
+     * GOP timecode frame start number, in non drop frame format
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int64_t timecode_frame_start;
+
+    /* The RTP callback: This function is called    */
+    /* every time the encoder has a packet to send. */
+    /* It depends on the encoder if the data starts */
+    /* with a Start Code (it should). H.263 does.   */
+    /* mb_nb contains the number of macroblocks     */
+    /* encoded in the RTP payload.                  */
+    void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb);
+
+    int rtp_payload_size;   /* The size of the RTP payload: the coder will  */
+                            /* do its best to deliver a chunk with size     */
+                            /* below rtp_payload_size, the chunk will start */
+                            /* with a start code on some codecs like H.263. */
+                            /* This doesn't take account of any particular  */
+                            /* headers inside the transmitted RTP payload.  */
+
+    /* statistics, used for 2-pass encoding */
+    int mv_bits;
+    int header_bits;
+    int i_tex_bits;
+    int p_tex_bits;
+    int i_count;
+    int p_count;
+    int skip_count;
+    int misc_bits;
+
+    /**
+     * number of bits used for the previously encoded frame
+     * - encoding: Set by libavcodec.
+     * - decoding: unused
+     */
+    int frame_bits;
+
+    /**
+     * pass1 encoding statistics output buffer
+     * - encoding: Set by libavcodec.
+     * - decoding: unused
+     */
+    char *stats_out;
+
+    /**
+     * pass2 encoding statistics input buffer
+     * Concatenated stuff from stats_out of pass1 should be placed here.
+     * - encoding: Allocated/set/freed by user.
+     * - decoding: unused
+     */
+    char *stats_in;
+
+    /**
+     * Work around bugs in encoders which sometimes cannot be detected automatically.
+     * - encoding: Set by user
+     * - decoding: Set by user
+     */
+    int workaround_bugs;
+#define FF_BUG_AUTODETECT       1  ///< autodetection
+#define FF_BUG_OLD_MSMPEG4      2
+#define FF_BUG_XVID_ILACE       4
+#define FF_BUG_UMP4             8
+#define FF_BUG_NO_PADDING       16
+#define FF_BUG_AMV              32
+#define FF_BUG_AC_VLC           0  ///< Will be removed, libavcodec can now handle these non-compliant files by default.
+#define FF_BUG_QPEL_CHROMA      64
+#define FF_BUG_STD_QPEL         128
+#define FF_BUG_QPEL_CHROMA2     256
+#define FF_BUG_DIRECT_BLOCKSIZE 512
+#define FF_BUG_EDGE             1024
+#define FF_BUG_HPEL_CHROMA      2048
+#define FF_BUG_DC_CLIP          4096
+#define FF_BUG_MS               8192 ///< Work around various bugs in Microsoft's broken decoders.
+#define FF_BUG_TRUNCATED       16384
+
+    /**
+     * strictly follow the standard (MPEG4, ...).
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     * Setting this to STRICT or higher means the encoder and decoder will
+     * generally do stupid things, whereas setting it to unofficial or lower
+     * will mean the encoder might produce output that is not supported by all
+     * spec-compliant decoders. Decoders don't differentiate between normal,
+     * unofficial and experimental (that is, they always try to decode things
+     * when they can) unless they are explicitly asked to behave stupidly
+     * (=strictly conform to the specs)
+     */
+    int strict_std_compliance;
+#define FF_COMPLIANCE_VERY_STRICT   2 ///< Strictly conform to an older more strict version of the spec or reference software.
+#define FF_COMPLIANCE_STRICT        1 ///< Strictly conform to all the things in the spec no matter what consequences.
+#define FF_COMPLIANCE_NORMAL        0
+#define FF_COMPLIANCE_UNOFFICIAL   -1 ///< Allow unofficial extensions
+#define FF_COMPLIANCE_EXPERIMENTAL -2 ///< Allow nonstandardized experimental things.
+
+    /**
+     * error concealment flags
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    int error_concealment;
+#define FF_EC_GUESS_MVS   1
+#define FF_EC_DEBLOCK     2
+
+    /**
+     * debug
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int debug;
+#define FF_DEBUG_PICT_INFO   1
+#define FF_DEBUG_RC          2
+#define FF_DEBUG_BITSTREAM   4
+#define FF_DEBUG_MB_TYPE     8
+#define FF_DEBUG_QP          16
+#define FF_DEBUG_MV          32
+#define FF_DEBUG_DCT_COEFF   0x00000040
+#define FF_DEBUG_SKIP        0x00000080
+#define FF_DEBUG_STARTCODE   0x00000100
+#define FF_DEBUG_PTS         0x00000200
+#define FF_DEBUG_ER          0x00000400
+#define FF_DEBUG_MMCO        0x00000800
+#define FF_DEBUG_BUGS        0x00001000
+#define FF_DEBUG_VIS_QP      0x00002000
+#define FF_DEBUG_VIS_MB_TYPE 0x00004000
+#define FF_DEBUG_BUFFERS     0x00008000
+#define FF_DEBUG_THREADS     0x00010000
+
+    /**
+     * debug
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int debug_mv;
+#define FF_DEBUG_VIS_MV_P_FOR  0x00000001 //visualize forward predicted MVs of P frames
+#define FF_DEBUG_VIS_MV_B_FOR  0x00000002 //visualize forward predicted MVs of B frames
+#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
+
+    /**
+     * Error recognition; may misdetect some more or less valid parts as errors.
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    int err_recognition;
+#define AV_EF_CRCCHECK  (1<<0)
+#define AV_EF_BITSTREAM (1<<1)
+#define AV_EF_BUFFER    (1<<2)
+#define AV_EF_EXPLODE   (1<<3)
+
+    /**
+     * opaque 64bit number (generally a PTS) that will be reordered and
+     * output in AVFrame.reordered_opaque
+     * @deprecated in favor of pkt_pts
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    int64_t reordered_opaque;
+
+    /**
+     * Hardware accelerator in use
+     * - encoding: unused.
+     * - decoding: Set by libavcodec
+     */
+    struct AVHWAccel *hwaccel;
+
+    /**
+     * Hardware accelerator context.
+     * For some hardware accelerators, a global context needs to be
+     * provided by the user. In that case, this holds display-dependent
+     * data Libav cannot instantiate itself. Please refer to the
+     * Libav HW accelerator documentation to know how to fill this
+     * is. e.g. for VA API, this is a struct vaapi_context.
+     * - encoding: unused
+     * - decoding: Set by user
+     */
+    void *hwaccel_context;
+
+    /**
+     * error
+     * - encoding: Set by libavcodec if flags&CODEC_FLAG_PSNR.
+     * - decoding: unused
+     */
+    uint64_t error[AV_NUM_DATA_POINTERS];
+
+    /**
+     * DCT algorithm, see FF_DCT_* below
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int dct_algo;
+#define FF_DCT_AUTO    0
+#define FF_DCT_FASTINT 1
+#define FF_DCT_INT     2
+#define FF_DCT_MMX     3
+#define FF_DCT_ALTIVEC 5
+#define FF_DCT_FAAN    6
+
+    /**
+     * IDCT algorithm, see FF_IDCT_* below.
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int idct_algo;
+#define FF_IDCT_AUTO          0
+#define FF_IDCT_INT           1
+#define FF_IDCT_SIMPLE        2
+#define FF_IDCT_SIMPLEMMX     3
+#if FF_API_LIBMPEG2
+#define FF_IDCT_LIBMPEG2MMX   4
+#endif
+#if FF_API_MMI
+#define FF_IDCT_MMI           5
+#endif
+#define FF_IDCT_ARM           7
+#define FF_IDCT_ALTIVEC       8
+#define FF_IDCT_SH4           9
+#define FF_IDCT_SIMPLEARM     10
+#define FF_IDCT_H264          11
+#define FF_IDCT_VP3           12
+#define FF_IDCT_IPP           13
+#define FF_IDCT_XVIDMMX       14
+#define FF_IDCT_CAVS          15
+#define FF_IDCT_SIMPLEARMV5TE 16
+#define FF_IDCT_SIMPLEARMV6   17
+#define FF_IDCT_SIMPLEVIS     18
+#define FF_IDCT_WMV2          19
+#define FF_IDCT_FAAN          20
+#define FF_IDCT_EA            21
+#define FF_IDCT_SIMPLENEON    22
+#define FF_IDCT_SIMPLEALPHA   23
+#define FF_IDCT_BINK          24
+
+#if FF_API_DSP_MASK
+    /**
+     * Unused.
+     * @deprecated use av_set_cpu_flags_mask() instead.
+     */
+    attribute_deprecated unsigned dsp_mask;
+#endif
+
+    /**
+     * bits per sample/pixel from the demuxer (needed for huffyuv).
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by user.
+     */
+     int bits_per_coded_sample;
+
+    /**
+     * Bits per sample/pixel of internal libavcodec pixel/sample format.
+     * - encoding: set by user.
+     * - decoding: set by libavcodec.
+     */
+    int bits_per_raw_sample;
+
+    /**
+     * low resolution decoding, 1-> 1/2 size, 2->1/4 size
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    attribute_deprecated int lowres;
+
+    /**
+     * the picture in the bitstream
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by libavcodec.
+     */
+    AVFrame *coded_frame;
+
+    /**
+     * thread count
+     * is used to decide how many independent tasks should be passed to execute()
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int thread_count;
+
+    /**
+     * Which multithreading methods to use.
+     * Use of FF_THREAD_FRAME will increase decoding delay by one frame per thread,
+     * so clients which cannot provide future frames should not use it.
+     *
+     * - encoding: Set by user, otherwise the default is used.
+     * - decoding: Set by user, otherwise the default is used.
+     */
+    int thread_type;
+#define FF_THREAD_FRAME   1 ///< Decode more than one frame at once
+#define FF_THREAD_SLICE   2 ///< Decode more than one part of a single frame at once
+
+    /**
+     * Which multithreading methods are in use by the codec.
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by libavcodec.
+     */
+    int active_thread_type;
+
+    /**
+     * Set by the client if its custom get_buffer() callback can be called
+     * synchronously from another thread, which allows faster multithreaded decoding.
+     * draw_horiz_band() will be called from other threads regardless of this setting.
+     * Ignored if the default get_buffer() is used.
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int thread_safe_callbacks;
+
+    /**
+     * The codec may call this to execute several independent things.
+     * It will return only after finishing all tasks.
+     * The user may replace this with some multithreaded implementation,
+     * the default implementation will execute the parts serially.
+     * @param count the number of things to execute
+     * - encoding: Set by libavcodec, user can override.
+     * - decoding: Set by libavcodec, user can override.
+     */
+    int (*execute)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg), void *arg2, int *ret, int count, int size);
+
+    /**
+     * The codec may call this to execute several independent things.
+     * It will return only after finishing all tasks.
+     * The user may replace this with some multithreaded implementation,
+     * the default implementation will execute the parts serially.
+     * Also see avcodec_thread_init and e.g. the --enable-pthread configure option.
+     * @param c context passed also to func
+     * @param count the number of things to execute
+     * @param arg2 argument passed unchanged to func
+     * @param ret return values of executed functions, must have space for "count" values. May be NULL.
+     * @param func function that will be called count times, with jobnr from 0 to count-1.
+     *             threadnr will be in the range 0 to c->thread_count-1 < MAX_THREADS and so that no
+     *             two instances of func executing at the same time will have the same threadnr.
+     * @return always 0 currently, but code should handle a future improvement where when any call to func
+     *         returns < 0 no further calls to func may be done and < 0 is returned.
+     * - encoding: Set by libavcodec, user can override.
+     * - decoding: Set by libavcodec, user can override.
+     */
+    int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count);
+
+    /**
+     * thread opaque
+     * Can be used by execute() to store some per AVCodecContext stuff.
+     * - encoding: set by execute()
+     * - decoding: set by execute()
+     */
+    void *thread_opaque;
+
+    /**
+     * noise vs. sse weight for the nsse comparsion function
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+     int nsse_weight;
+
+    /**
+     * profile
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+     int profile;
+#define FF_PROFILE_UNKNOWN -99
+#define FF_PROFILE_RESERVED -100
+
+#define FF_PROFILE_AAC_MAIN 0
+#define FF_PROFILE_AAC_LOW  1
+#define FF_PROFILE_AAC_SSR  2
+#define FF_PROFILE_AAC_LTP  3
+#define FF_PROFILE_AAC_HE   4
+#define FF_PROFILE_AAC_HE_V2 28
+#define FF_PROFILE_AAC_LD   22
+#define FF_PROFILE_AAC_ELD  38
+
+#define FF_PROFILE_DTS         20
+#define FF_PROFILE_DTS_ES      30
+#define FF_PROFILE_DTS_96_24   40
+#define FF_PROFILE_DTS_HD_HRA  50
+#define FF_PROFILE_DTS_HD_MA   60
+
+#define FF_PROFILE_MPEG2_422    0
+#define FF_PROFILE_MPEG2_HIGH   1
+#define FF_PROFILE_MPEG2_SS     2
+#define FF_PROFILE_MPEG2_SNR_SCALABLE  3
+#define FF_PROFILE_MPEG2_MAIN   4
+#define FF_PROFILE_MPEG2_SIMPLE 5
+
+#define FF_PROFILE_H264_CONSTRAINED  (1<<9)  // 8+1; constraint_set1_flag
+#define FF_PROFILE_H264_INTRA        (1<<11) // 8+3; constraint_set3_flag
+
+#define FF_PROFILE_H264_BASELINE             66
+#define FF_PROFILE_H264_CONSTRAINED_BASELINE (66|FF_PROFILE_H264_CONSTRAINED)
+#define FF_PROFILE_H264_MAIN                 77
+#define FF_PROFILE_H264_EXTENDED             88
+#define FF_PROFILE_H264_HIGH                 100
+#define FF_PROFILE_H264_HIGH_10              110
+#define FF_PROFILE_H264_HIGH_10_INTRA        (110|FF_PROFILE_H264_INTRA)
+#define FF_PROFILE_H264_HIGH_422             122
+#define FF_PROFILE_H264_HIGH_422_INTRA       (122|FF_PROFILE_H264_INTRA)
+#define FF_PROFILE_H264_HIGH_444             144
+#define FF_PROFILE_H264_HIGH_444_PREDICTIVE  244
+#define FF_PROFILE_H264_HIGH_444_INTRA       (244|FF_PROFILE_H264_INTRA)
+#define FF_PROFILE_H264_CAVLC_444            44
+
+#define FF_PROFILE_VC1_SIMPLE   0
+#define FF_PROFILE_VC1_MAIN     1
+#define FF_PROFILE_VC1_COMPLEX  2
+#define FF_PROFILE_VC1_ADVANCED 3
+
+#define FF_PROFILE_MPEG4_SIMPLE                     0
+#define FF_PROFILE_MPEG4_SIMPLE_SCALABLE            1
+#define FF_PROFILE_MPEG4_CORE                       2
+#define FF_PROFILE_MPEG4_MAIN                       3
+#define FF_PROFILE_MPEG4_N_BIT                      4
+#define FF_PROFILE_MPEG4_SCALABLE_TEXTURE           5
+#define FF_PROFILE_MPEG4_SIMPLE_FACE_ANIMATION      6
+#define FF_PROFILE_MPEG4_BASIC_ANIMATED_TEXTURE     7
+#define FF_PROFILE_MPEG4_HYBRID                     8
+#define FF_PROFILE_MPEG4_ADVANCED_REAL_TIME         9
+#define FF_PROFILE_MPEG4_CORE_SCALABLE             10
+#define FF_PROFILE_MPEG4_ADVANCED_CODING           11
+#define FF_PROFILE_MPEG4_ADVANCED_CORE             12
+#define FF_PROFILE_MPEG4_ADVANCED_SCALABLE_TEXTURE 13
+#define FF_PROFILE_MPEG4_SIMPLE_STUDIO             14
+#define FF_PROFILE_MPEG4_ADVANCED_SIMPLE           15
+
+    /**
+     * level
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+     int level;
+#define FF_LEVEL_UNKNOWN -99
+
+    /**
+     *
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    enum AVDiscard skip_loop_filter;
+
+    /**
+     *
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    enum AVDiscard skip_idct;
+
+    /**
+     *
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    enum AVDiscard skip_frame;
+
+    /**
+     * Header containing style information for text subtitles.
+     * For SUBTITLE_ASS subtitle type, it should contain the whole ASS
+     * [Script Info] and [V4+ Styles] section, plus the [Events] line and
+     * the Format line following. It shouldn't include any Dialogue line.
+     * - encoding: Set/allocated/freed by user (before avcodec_open2())
+     * - decoding: Set/allocated/freed by libavcodec (by avcodec_open2())
+     */
+    uint8_t *subtitle_header;
+    int subtitle_header_size;
+
+    /**
+     * Simulates errors in the bitstream to test error concealment.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int error_rate;
+
+    /**
+     * Current packet as passed into the decoder, to avoid having
+     * to pass the packet into every function. Currently only valid
+     * inside lavc and get/release_buffer callbacks.
+     * - decoding: set by avcodec_decode_*, read by get_buffer() for setting pkt_pts
+     * - encoding: unused
+     */
+    AVPacket *pkt;
+
+    /**
+     * VBV delay coded in the last frame (in periods of a 27 MHz clock).
+     * Used for compliant TS muxing.
+     * - encoding: Set by libavcodec.
+     * - decoding: unused.
+     */
+    uint64_t vbv_delay;
+} AVCodecContext;
+
+/**
+ * AVProfile.
+ */
+typedef struct AVProfile {
+    int profile;
+    const char *name; ///< short name for the profile
+} AVProfile;
+
+typedef struct AVCodecDefault AVCodecDefault;
+
+struct AVSubtitle;
+
+/**
+ * AVCodec.
+ */
+typedef struct AVCodec {
+    /**
+     * Name of the codec implementation.
+     * The name is globally unique among encoders and among decoders (but an
+     * encoder and a decoder can share the same name).
+     * This is the primary way to find a codec from the user perspective.
+     */
+    const char *name;
+    /**
+     * Descriptive name for the codec, meant to be more human readable than name.
+     * You should use the NULL_IF_CONFIG_SMALL() macro to define it.
+     */
+    const char *long_name;
+    enum AVMediaType type;
+    enum AVCodecID id;
+    /**
+     * Codec capabilities.
+     * see CODEC_CAP_*
+     */
+    int capabilities;
+    const AVRational *supported_framerates; ///< array of supported framerates, or NULL if any, array is terminated by {0,0}
+    const enum AVPixelFormat *pix_fmts;     ///< array of supported pixel formats, or NULL if unknown, array is terminated by -1
+    const int *supported_samplerates;       ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
+    const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1
+    const uint64_t *channel_layouts;         ///< array of support channel layouts, or NULL if unknown. array is terminated by 0
+    attribute_deprecated uint8_t max_lowres; ///< maximum value for lowres supported by the decoder
+    const AVClass *priv_class;              ///< AVClass for the private context
+    const AVProfile *profiles;              ///< array of recognized profiles, or NULL if unknown, array is terminated by {FF_PROFILE_UNKNOWN}
+
+    /*****************************************************************
+     * No fields below this line are part of the public API. They
+     * may not be used outside of libavcodec and can be changed and
+     * removed at will.
+     * New public fields should be added right above.
+     *****************************************************************
+     */
+    int priv_data_size;
+    struct AVCodec *next;
+    /**
+     * @name Frame-level threading support functions
+     * @{
+     */
+    /**
+     * If defined, called on thread contexts when they are created.
+     * If the codec allocates writable tables in init(), re-allocate them here.
+     * priv_data will be set to a copy of the original.
+     */
+    int (*init_thread_copy)(AVCodecContext *);
+    /**
+     * Copy necessary context variables from a previous thread context to the current one.
+     * If not defined, the next thread will start automatically; otherwise, the codec
+     * must call ff_thread_finish_setup().
+     *
+     * dst and src will (rarely) point to the same context, in which case memcpy should be skipped.
+     */
+    int (*update_thread_context)(AVCodecContext *dst, const AVCodecContext *src);
+    /** @} */
+
+    /**
+     * Private codec-specific defaults.
+     */
+    const AVCodecDefault *defaults;
+
+    /**
+     * Initialize codec static data, called from avcodec_register().
+     */
+    void (*init_static_data)(struct AVCodec *codec);
+
+    int (*init)(AVCodecContext *);
+    int (*encode_sub)(AVCodecContext *, uint8_t *buf, int buf_size,
+                      const struct AVSubtitle *sub);
+    /**
+     * Encode data to an AVPacket.
+     *
+     * @param      avctx          codec context
+     * @param      avpkt          output AVPacket (may contain a user-provided buffer)
+     * @param[in]  frame          AVFrame containing the raw data to be encoded
+     * @param[out] got_packet_ptr encoder sets to 0 or 1 to indicate that a
+     *                            non-empty packet was returned in avpkt.
+     * @return 0 on success, negative error code on failure
+     */
+    int (*encode2)(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame,
+                   int *got_packet_ptr);
+    int (*decode)(AVCodecContext *, void *outdata, int *outdata_size, AVPacket *avpkt);
+    int (*close)(AVCodecContext *);
+    /**
+     * Flush buffers.
+     * Will be called when seeking
+     */
+    void (*flush)(AVCodecContext *);
+} AVCodec;
+
+/**
+ * AVHWAccel.
+ */
+typedef struct AVHWAccel {
+    /**
+     * Name of the hardware accelerated codec.
+     * The name is globally unique among encoders and among decoders (but an
+     * encoder and a decoder can share the same name).
+     */
+    const char *name;
+
+    /**
+     * Type of codec implemented by the hardware accelerator.
+     *
+     * See AVMEDIA_TYPE_xxx
+     */
+    enum AVMediaType type;
+
+    /**
+     * Codec implemented by the hardware accelerator.
+     *
+     * See AV_CODEC_ID_xxx
+     */
+    enum AVCodecID id;
+
+    /**
+     * Supported pixel format.
+     *
+     * Only hardware accelerated formats are supported here.
+     */
+    enum AVPixelFormat pix_fmt;
+
+    /**
+     * Hardware accelerated codec capabilities.
+     * see FF_HWACCEL_CODEC_CAP_*
+     */
+    int capabilities;
+
+    struct AVHWAccel *next;
+
+    /**
+     * Called at the beginning of each frame or field picture.
+     *
+     * Meaningful frame information (codec specific) is guaranteed to
+     * be parsed at this point. This function is mandatory.
+     *
+     * Note that buf can be NULL along with buf_size set to 0.
+     * Otherwise, this means the whole frame is available at this point.
+     *
+     * @param avctx the codec context
+     * @param buf the frame data buffer base
+     * @param buf_size the size of the frame in bytes
+     * @return zero if successful, a negative value otherwise
+     */
+    int (*start_frame)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size);
+
+    /**
+     * Callback for each slice.
+     *
+     * Meaningful slice information (codec specific) is guaranteed to
+     * be parsed at this point. This function is mandatory.
+     *
+     * @param avctx the codec context
+     * @param buf the slice data buffer base
+     * @param buf_size the size of the slice in bytes
+     * @return zero if successful, a negative value otherwise
+     */
+    int (*decode_slice)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size);
+
+    /**
+     * Called at the end of each frame or field picture.
+     *
+     * The whole picture is parsed at this point and can now be sent
+     * to the hardware accelerator. This function is mandatory.
+     *
+     * @param avctx the codec context
+     * @return zero if successful, a negative value otherwise
+     */
+    int (*end_frame)(AVCodecContext *avctx);
+
+    /**
+     * Size of HW accelerator private data.
+     *
+     * Private data is allocated with av_mallocz() before
+     * AVCodecContext.get_buffer() and deallocated after
+     * AVCodecContext.release_buffer().
+     */
+    int priv_data_size;
+} AVHWAccel;
+
+/**
+ * @defgroup lavc_picture AVPicture
+ *
+ * Functions for working with AVPicture
+ * @{
+ */
+
+/**
+ * four components are given, that's all.
+ * the last component is alpha
+ */
+typedef struct AVPicture {
+    uint8_t *data[AV_NUM_DATA_POINTERS];
+    int linesize[AV_NUM_DATA_POINTERS];     ///< number of bytes per line
+} AVPicture;
+
+/**
+ * @}
+ */
+
+#define AVPALETTE_SIZE 1024
+#define AVPALETTE_COUNT 256
+
+enum AVSubtitleType {
+    SUBTITLE_NONE,
+
+    SUBTITLE_BITMAP,                ///< A bitmap, pict will be set
+
+    /**
+     * Plain text, the text field must be set by the decoder and is
+     * authoritative. ass and pict fields may contain approximations.
+     */
+    SUBTITLE_TEXT,
+
+    /**
+     * Formatted text, the ass field must be set by the decoder and is
+     * authoritative. pict and text fields may contain approximations.
+     */
+    SUBTITLE_ASS,
+};
+
+#define AV_SUBTITLE_FLAG_FORCED 0x00000001
+
+typedef struct AVSubtitleRect {
+    int x;         ///< top left corner  of pict, undefined when pict is not set
+    int y;         ///< top left corner  of pict, undefined when pict is not set
+    int w;         ///< width            of pict, undefined when pict is not set
+    int h;         ///< height           of pict, undefined when pict is not set
+    int nb_colors; ///< number of colors in pict, undefined when pict is not set
+
+    /**
+     * data+linesize for the bitmap of this subtitle.
+     * can be set for text/ass as well once they where rendered
+     */
+    AVPicture pict;
+    enum AVSubtitleType type;
+
+    char *text;                     ///< 0 terminated plain UTF-8 text
+
+    /**
+     * 0 terminated ASS/SSA compatible event line.
+     * The pressentation of this is unaffected by the other values in this
+     * struct.
+     */
+    char *ass;
+    int flags;
+} AVSubtitleRect;
+
+typedef struct AVSubtitle {
+    uint16_t format; /* 0 = graphics */
+    uint32_t start_display_time; /* relative to packet pts, in ms */
+    uint32_t end_display_time; /* relative to packet pts, in ms */
+    unsigned num_rects;
+    AVSubtitleRect **rects;
+    int64_t pts;    ///< Same as packet pts, in AV_TIME_BASE
+} AVSubtitle;
+
+/**
+ * If c is NULL, returns the first registered codec,
+ * if c is non-NULL, returns the next registered codec after c,
+ * or NULL if c is the last one.
+ */
+AVCodec *av_codec_next(const AVCodec *c);
+
+/**
+ * Return the LIBAVCODEC_VERSION_INT constant.
+ */
+unsigned avcodec_version(void);
+
+/**
+ * Return the libavcodec build-time configuration.
+ */
+const char *avcodec_configuration(void);
+
+/**
+ * Return the libavcodec license.
+ */
+const char *avcodec_license(void);
+
+/**
+ * Register the codec codec and initialize libavcodec.
+ *
+ * @warning either this function or avcodec_register_all() must be called
+ * before any other libavcodec functions.
+ *
+ * @see avcodec_register_all()
+ */
+void avcodec_register(AVCodec *codec);
+
+/**
+ * Register all the codecs, parsers and bitstream filters which were enabled at
+ * configuration time. If you do not call this function you can select exactly
+ * which formats you want to support, by using the individual registration
+ * functions.
+ *
+ * @see avcodec_register
+ * @see av_register_codec_parser
+ * @see av_register_bitstream_filter
+ */
+void avcodec_register_all(void);
+
+/**
+ * Allocate an AVCodecContext and set its fields to default values.  The
+ * resulting struct can be deallocated by calling avcodec_close() on it followed
+ * by av_free().
+ *
+ * @param codec if non-NULL, allocate private data and initialize defaults
+ *              for the given codec. It is illegal to then call avcodec_open2()
+ *              with a different codec.
+ *              If NULL, then the codec-specific defaults won't be initialized,
+ *              which may result in suboptimal default settings (this is
+ *              important mainly for encoders, e.g. libx264).
+ *
+ * @return An AVCodecContext filled with default values or NULL on failure.
+ * @see avcodec_get_context_defaults
+ */
+AVCodecContext *avcodec_alloc_context3(const AVCodec *codec);
+
+/**
+ * Set the fields of the given AVCodecContext to default values corresponding
+ * to the given codec (defaults may be codec-dependent).
+ *
+ * Do not call this function if a non-NULL codec has been passed
+ * to avcodec_alloc_context3() that allocated this AVCodecContext.
+ * If codec is non-NULL, it is illegal to call avcodec_open2() with a
+ * different codec on this AVCodecContext.
+ */
+int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec);
+
+/**
+ * Get the AVClass for AVCodecContext. It can be used in combination with
+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
+ *
+ * @see av_opt_find().
+ */
+const AVClass *avcodec_get_class(void);
+
+/**
+ * Copy the settings of the source AVCodecContext into the destination
+ * AVCodecContext. The resulting destination codec context will be
+ * unopened, i.e. you are required to call avcodec_open2() before you
+ * can use this AVCodecContext to decode/encode video/audio data.
+ *
+ * @param dest target codec context, should be initialized with
+ *             avcodec_alloc_context3(), but otherwise uninitialized
+ * @param src source codec context
+ * @return AVERROR() on error (e.g. memory allocation error), 0 on success
+ */
+int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src);
+
+/**
+ * Allocate an AVFrame and set its fields to default values.  The resulting
+ * struct must be freed using avcodec_free_frame().
+ *
+ * @return An AVFrame filled with default values or NULL on failure.
+ * @see avcodec_get_frame_defaults
+ */
+AVFrame *avcodec_alloc_frame(void);
+
+/**
+ * Set the fields of the given AVFrame to default values.
+ *
+ * @param frame The AVFrame of which the fields should be set to default values.
+ */
+void avcodec_get_frame_defaults(AVFrame *frame);
+
+/**
+ * Free the frame and any dynamically allocated objects in it,
+ * e.g. extended_data.
+ *
+ * @param frame frame to be freed. The pointer will be set to NULL.
+ *
+ * @warning this function does NOT free the data buffers themselves
+ * (it does not know how, since they might have been allocated with
+ *  a custom get_buffer()).
+ */
+void avcodec_free_frame(AVFrame **frame);
+
+/**
+ * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
+ * function the context has to be allocated with avcodec_alloc_context3().
+ *
+ * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(),
+ * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for
+ * retrieving a codec.
+ *
+ * @warning This function is not thread safe!
+ *
+ * @code
+ * avcodec_register_all();
+ * av_dict_set(&opts, "b", "2.5M", 0);
+ * codec = avcodec_find_decoder(AV_CODEC_ID_H264);
+ * if (!codec)
+ *     exit(1);
+ *
+ * context = avcodec_alloc_context3(codec);
+ *
+ * if (avcodec_open2(context, codec, opts) < 0)
+ *     exit(1);
+ * @endcode
+ *
+ * @param avctx The context to initialize.
+ * @param codec The codec to open this context for. If a non-NULL codec has been
+ *              previously passed to avcodec_alloc_context3() or
+ *              avcodec_get_context_defaults3() for this context, then this
+ *              parameter MUST be either NULL or equal to the previously passed
+ *              codec.
+ * @param options A dictionary filled with AVCodecContext and codec-private options.
+ *                On return this object will be filled with options that were not found.
+ *
+ * @return zero on success, a negative value on error
+ * @see avcodec_alloc_context3(), avcodec_find_decoder(), avcodec_find_encoder(),
+ *      av_dict_set(), av_opt_find().
+ */
+int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options);
+
+/**
+ * Close a given AVCodecContext and free all the data associated with it
+ * (but not the AVCodecContext itself).
+ *
+ * Calling this function on an AVCodecContext that hasn't been opened will free
+ * the codec-specific data allocated in avcodec_alloc_context3() /
+ * avcodec_get_context_defaults3() with a non-NULL codec. Subsequent calls will
+ * do nothing.
+ */
+int avcodec_close(AVCodecContext *avctx);
+
+/**
+ * Free all allocated data in the given subtitle struct.
+ *
+ * @param sub AVSubtitle to free.
+ */
+void avsubtitle_free(AVSubtitle *sub);
+
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup lavc_packet
+ * @{
+ */
+
+/**
+ * Default packet destructor.
+ */
+void av_destruct_packet(AVPacket *pkt);
+
+/**
+ * Initialize optional fields of a packet with default values.
+ *
+ * Note, this does not touch the data and size members, which have to be
+ * initialized separately.
+ *
+ * @param pkt packet
+ */
+void av_init_packet(AVPacket *pkt);
+
+/**
+ * Allocate the payload of a packet and initialize its fields with
+ * default values.
+ *
+ * @param pkt packet
+ * @param size wanted payload size
+ * @return 0 if OK, AVERROR_xxx otherwise
+ */
+int av_new_packet(AVPacket *pkt, int size);
+
+/**
+ * Reduce packet size, correctly zeroing padding
+ *
+ * @param pkt packet
+ * @param size new size
+ */
+void av_shrink_packet(AVPacket *pkt, int size);
+
+/**
+ * Increase packet size, correctly zeroing padding
+ *
+ * @param pkt packet
+ * @param grow_by number of bytes by which to increase the size of the packet
+ */
+int av_grow_packet(AVPacket *pkt, int grow_by);
+
+/**
+ * @warning This is a hack - the packet memory allocation stuff is broken. The
+ * packet is allocated if it was not really allocated.
+ */
+int av_dup_packet(AVPacket *pkt);
+
+/**
+ * Free a packet.
+ *
+ * @param pkt packet to free
+ */
+void av_free_packet(AVPacket *pkt);
+
+/**
+ * Allocate new information of a packet.
+ *
+ * @param pkt packet
+ * @param type side information type
+ * @param size side information size
+ * @return pointer to fresh allocated data or NULL otherwise
+ */
+uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+                                 int size);
+
+/**
+ * Shrink the already allocated side data buffer
+ *
+ * @param pkt packet
+ * @param type side information type
+ * @param size new side information size
+ * @return 0 on success, < 0 on failure
+ */
+int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+                               int size);
+
+/**
+ * Get side information from packet.
+ *
+ * @param pkt packet
+ * @param type desired side information type
+ * @param size pointer for side information size to store (optional)
+ * @return pointer to data if present or NULL otherwise
+ */
+uint8_t* av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+                                 int *size);
+
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup lavc_decoding
+ * @{
+ */
+
+/**
+ * Find a registered decoder with a matching codec ID.
+ *
+ * @param id AVCodecID of the requested decoder
+ * @return A decoder if one was found, NULL otherwise.
+ */
+AVCodec *avcodec_find_decoder(enum AVCodecID id);
+
+/**
+ * Find a registered decoder with the specified name.
+ *
+ * @param name name of the requested decoder
+ * @return A decoder if one was found, NULL otherwise.
+ */
+AVCodec *avcodec_find_decoder_by_name(const char *name);
+
+int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic);
+void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic);
+int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic);
+
+/**
+ * Return the amount of padding in pixels which the get_buffer callback must
+ * provide around the edge of the image for codecs which do not have the
+ * CODEC_FLAG_EMU_EDGE flag.
+ *
+ * @return Required padding in pixels.
+ */
+unsigned avcodec_get_edge_width(void);
+
+/**
+ * Modify width and height values so that they will result in a memory
+ * buffer that is acceptable for the codec if you do not use any horizontal
+ * padding.
+ *
+ * May only be used if a codec with CODEC_CAP_DR1 has been opened.
+ * If CODEC_FLAG_EMU_EDGE is not set, the dimensions must have been increased
+ * according to avcodec_get_edge_width() before.
+ */
+void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height);
+
+/**
+ * Modify width and height values so that they will result in a memory
+ * buffer that is acceptable for the codec if you also ensure that all
+ * line sizes are a multiple of the respective linesize_align[i].
+ *
+ * May only be used if a codec with CODEC_CAP_DR1 has been opened.
+ * If CODEC_FLAG_EMU_EDGE is not set, the dimensions must have been increased
+ * according to avcodec_get_edge_width() before.
+ */
+void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
+                               int linesize_align[AV_NUM_DATA_POINTERS]);
+
+#if FF_API_OLD_DECODE_AUDIO
+/**
+ * Wrapper function which calls avcodec_decode_audio4.
+ *
+ * @deprecated Use avcodec_decode_audio4 instead.
+ *
+ * Decode the audio frame of size avpkt->size from avpkt->data into samples.
+ * Some decoders may support multiple frames in a single AVPacket, such
+ * decoders would then just decode the first frame. In this case,
+ * avcodec_decode_audio3 has to be called again with an AVPacket that contains
+ * the remaining data in order to decode the second frame etc.
+ * If no frame
+ * could be outputted, frame_size_ptr is zero. Otherwise, it is the
+ * decompressed frame size in bytes.
+ *
+ * @warning You must set frame_size_ptr to the allocated size of the
+ * output buffer before calling avcodec_decode_audio3().
+ *
+ * @warning The input buffer must be FF_INPUT_BUFFER_PADDING_SIZE larger than
+ * the actual read bytes because some optimized bitstream readers read 32 or 64
+ * bits at once and could read over the end.
+ *
+ * @warning The end of the input buffer avpkt->data should be set to 0 to ensure that
+ * no overreading happens for damaged MPEG streams.
+ *
+ * @warning You must not provide a custom get_buffer() when using
+ * avcodec_decode_audio3().  Doing so will override it with
+ * avcodec_default_get_buffer.  Use avcodec_decode_audio4() instead,
+ * which does allow the application to provide a custom get_buffer().
+ *
+ * @note You might have to align the input buffer avpkt->data and output buffer
+ * samples. The alignment requirements depend on the CPU: On some CPUs it isn't
+ * necessary at all, on others it won't work at all if not aligned and on others
+ * it will work but it will have an impact on performance.
+ *
+ * In practice, avpkt->data should have 4 byte alignment at minimum and
+ * samples should be 16 byte aligned unless the CPU doesn't need it
+ * (AltiVec and SSE do).
+ *
+ * @note Codecs which have the CODEC_CAP_DELAY capability set have a delay
+ * between input and output, these need to be fed with avpkt->data=NULL,
+ * avpkt->size=0 at the end to return the remaining frames.
+ *
+ * @param avctx the codec context
+ * @param[out] samples the output buffer, sample type in avctx->sample_fmt
+ *                     If the sample format is planar, each channel plane will
+ *                     be the same size, with no padding between channels.
+ * @param[in,out] frame_size_ptr the output buffer size in bytes
+ * @param[in] avpkt The input AVPacket containing the input buffer.
+ *            You can create such packet with av_init_packet() and by then setting
+ *            data and size, some decoders might in addition need other fields.
+ *            All decoders are designed to use the least fields possible though.
+ * @return On error a negative value is returned, otherwise the number of bytes
+ * used or zero if no frame data was decompressed (used) from the input AVPacket.
+ */
+attribute_deprecated int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples,
+                         int *frame_size_ptr,
+                         AVPacket *avpkt);
+#endif
+
+/**
+ * Decode the audio frame of size avpkt->size from avpkt->data into frame.
+ *
+ * Some decoders may support multiple frames in a single AVPacket. Such
+ * decoders would then just decode the first frame. In this case,
+ * avcodec_decode_audio4 has to be called again with an AVPacket containing
+ * the remaining data in order to decode the second frame, etc...
+ * Even if no frames are returned, the packet needs to be fed to the decoder
+ * with remaining data until it is completely consumed or an error occurs.
+ *
+ * @warning The input buffer, avpkt->data must be FF_INPUT_BUFFER_PADDING_SIZE
+ *          larger than the actual read bytes because some optimized bitstream
+ *          readers read 32 or 64 bits at once and could read over the end.
+ *
+ * @note You might have to align the input buffer. The alignment requirements
+ *       depend on the CPU and the decoder.
+ *
+ * @param      avctx the codec context
+ * @param[out] frame The AVFrame in which to store decoded audio samples.
+ *                   Decoders request a buffer of a particular size by setting
+ *                   AVFrame.nb_samples prior to calling get_buffer(). The
+ *                   decoder may, however, only utilize part of the buffer by
+ *                   setting AVFrame.nb_samples to a smaller value in the
+ *                   output frame.
+ * @param[out] got_frame_ptr Zero if no frame could be decoded, otherwise it is
+ *                           non-zero.
+ * @param[in]  avpkt The input AVPacket containing the input buffer.
+ *                   At least avpkt->data and avpkt->size should be set. Some
+ *                   decoders might also require additional fields to be set.
+ * @return A negative error code is returned if an error occurred during
+ *         decoding, otherwise the number of bytes consumed from the input
+ *         AVPacket is returned.
+ */
+int avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame,
+                          int *got_frame_ptr, AVPacket *avpkt);
+
+/**
+ * Decode the video frame of size avpkt->size from avpkt->data into picture.
+ * Some decoders may support multiple frames in a single AVPacket, such
+ * decoders would then just decode the first frame.
+ *
+ * @warning The input buffer must be FF_INPUT_BUFFER_PADDING_SIZE larger than
+ * the actual read bytes because some optimized bitstream readers read 32 or 64
+ * bits at once and could read over the end.
+ *
+ * @warning The end of the input buffer buf should be set to 0 to ensure that
+ * no overreading happens for damaged MPEG streams.
+ *
+ * @note You might have to align the input buffer avpkt->data.
+ * The alignment requirements depend on the CPU: on some CPUs it isn't
+ * necessary at all, on others it won't work at all if not aligned and on others
+ * it will work but it will have an impact on performance.
+ *
+ * In practice, avpkt->data should have 4 byte alignment at minimum.
+ *
+ * @note Codecs which have the CODEC_CAP_DELAY capability set have a delay
+ * between input and output, these need to be fed with avpkt->data=NULL,
+ * avpkt->size=0 at the end to return the remaining frames.
+ *
+ * @param avctx the codec context
+ * @param[out] picture The AVFrame in which the decoded video frame will be stored.
+ *             Use avcodec_alloc_frame to get an AVFrame, the codec will
+ *             allocate memory for the actual bitmap.
+ *             with default get/release_buffer(), the decoder frees/reuses the bitmap as it sees fit.
+ *             with overridden get/release_buffer() (needs CODEC_CAP_DR1) the user decides into what buffer the decoder
+ *                   decodes and the decoder tells the user once it does not need the data anymore,
+ *                   the user app can at this point free/reuse/keep the memory as it sees fit.
+ *
+ * @param[in] avpkt The input AVpacket containing the input buffer.
+ *            You can create such packet with av_init_packet() and by then setting
+ *            data and size, some decoders might in addition need other fields like
+ *            flags&AV_PKT_FLAG_KEY. All decoders are designed to use the least
+ *            fields possible.
+ * @param[in,out] got_picture_ptr Zero if no frame could be decompressed, otherwise, it is nonzero.
+ * @return On error a negative value is returned, otherwise the number of bytes
+ * used or zero if no frame could be decompressed.
+ */
+int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
+                         int *got_picture_ptr,
+                         AVPacket *avpkt);
+
+/**
+ * Decode a subtitle message.
+ * Return a negative value on error, otherwise return the number of bytes used.
+ * If no subtitle could be decompressed, got_sub_ptr is zero.
+ * Otherwise, the subtitle is stored in *sub.
+ * Note that CODEC_CAP_DR1 is not available for subtitle codecs. This is for
+ * simplicity, because the performance difference is expect to be negligible
+ * and reusing a get_buffer written for video codecs would probably perform badly
+ * due to a potentially very different allocation pattern.
+ *
+ * @param avctx the codec context
+ * @param[out] sub The AVSubtitle in which the decoded subtitle will be stored, must be
+                   freed with avsubtitle_free if *got_sub_ptr is set.
+ * @param[in,out] got_sub_ptr Zero if no subtitle could be decompressed, otherwise, it is nonzero.
+ * @param[in] avpkt The input AVPacket containing the input buffer.
+ */
+int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
+                            int *got_sub_ptr,
+                            AVPacket *avpkt);
+
+/**
+ * @defgroup lavc_parsing Frame parsing
+ * @{
+ */
+
+typedef struct AVCodecParserContext {
+    void *priv_data;
+    struct AVCodecParser *parser;
+    int64_t frame_offset; /* offset of the current frame */
+    int64_t cur_offset; /* current offset
+                           (incremented by each av_parser_parse()) */
+    int64_t next_frame_offset; /* offset of the next frame */
+    /* video info */
+    int pict_type; /* XXX: Put it back in AVCodecContext. */
+    /**
+     * This field is used for proper frame duration computation in lavf.
+     * It signals, how much longer the frame duration of the current frame
+     * is compared to normal frame duration.
+     *
+     * frame_duration = (1 + repeat_pict) * time_base
+     *
+     * It is used by codecs like H.264 to display telecined material.
+     */
+    int repeat_pict; /* XXX: Put it back in AVCodecContext. */
+    int64_t pts;     /* pts of the current frame */
+    int64_t dts;     /* dts of the current frame */
+
+    /* private data */
+    int64_t last_pts;
+    int64_t last_dts;
+    int fetch_timestamp;
+
+#define AV_PARSER_PTS_NB 4
+    int cur_frame_start_index;
+    int64_t cur_frame_offset[AV_PARSER_PTS_NB];
+    int64_t cur_frame_pts[AV_PARSER_PTS_NB];
+    int64_t cur_frame_dts[AV_PARSER_PTS_NB];
+
+    int flags;
+#define PARSER_FLAG_COMPLETE_FRAMES           0x0001
+#define PARSER_FLAG_ONCE                      0x0002
+/// Set if the parser has a valid file offset
+#define PARSER_FLAG_FETCHED_OFFSET            0x0004
+
+    int64_t offset;      ///< byte offset from starting packet start
+    int64_t cur_frame_end[AV_PARSER_PTS_NB];
+
+    /**
+     * Set by parser to 1 for key frames and 0 for non-key frames.
+     * It is initialized to -1, so if the parser doesn't set this flag,
+     * old-style fallback using AV_PICTURE_TYPE_I picture type as key frames
+     * will be used.
+     */
+    int key_frame;
+
+    /**
+     * Time difference in stream time base units from the pts of this
+     * packet to the point at which the output from the decoder has converged
+     * independent from the availability of previous frames. That is, the
+     * frames are virtually identical no matter if decoding started from
+     * the very first frame or from this keyframe.
+     * Is AV_NOPTS_VALUE if unknown.
+     * This field is not the display duration of the current frame.
+     * This field has no meaning if the packet does not have AV_PKT_FLAG_KEY
+     * set.
+     *
+     * The purpose of this field is to allow seeking in streams that have no
+     * keyframes in the conventional sense. It corresponds to the
+     * recovery point SEI in H.264 and match_time_delta in NUT. It is also
+     * essential for some types of subtitle streams to ensure that all
+     * subtitles are correctly displayed after seeking.
+     */
+    int64_t convergence_duration;
+
+    // Timestamp generation support:
+    /**
+     * Synchronization point for start of timestamp generation.
+     *
+     * Set to >0 for sync point, 0 for no sync point and <0 for undefined
+     * (default).
+     *
+     * For example, this corresponds to presence of H.264 buffering period
+     * SEI message.
+     */
+    int dts_sync_point;
+
+    /**
+     * Offset of the current timestamp against last timestamp sync point in
+     * units of AVCodecContext.time_base.
+     *
+     * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
+     * contain a valid timestamp offset.
+     *
+     * Note that the timestamp of sync point has usually a nonzero
+     * dts_ref_dts_delta, which refers to the previous sync point. Offset of
+     * the next frame after timestamp sync point will be usually 1.
+     *
+     * For example, this corresponds to H.264 cpb_removal_delay.
+     */
+    int dts_ref_dts_delta;
+
+    /**
+     * Presentation delay of current frame in units of AVCodecContext.time_base.
+     *
+     * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
+     * contain valid non-negative timestamp delta (presentation time of a frame
+     * must not lie in the past).
+     *
+     * This delay represents the difference between decoding and presentation
+     * time of the frame.
+     *
+     * For example, this corresponds to H.264 dpb_output_delay.
+     */
+    int pts_dts_delta;
+
+    /**
+     * Position of the packet in file.
+     *
+     * Analogous to cur_frame_pts/dts
+     */
+    int64_t cur_frame_pos[AV_PARSER_PTS_NB];
+
+    /**
+     * Byte position of currently parsed frame in stream.
+     */
+    int64_t pos;
+
+    /**
+     * Previous frame byte position.
+     */
+    int64_t last_pos;
+
+    /**
+     * Duration of the current frame.
+     * For audio, this is in units of 1 / AVCodecContext.sample_rate.
+     * For all other types, this is in units of AVCodecContext.time_base.
+     */
+    int duration;
+} AVCodecParserContext;
+
+typedef struct AVCodecParser {
+    int codec_ids[5]; /* several codec IDs are permitted */
+    int priv_data_size;
+    int (*parser_init)(AVCodecParserContext *s);
+    int (*parser_parse)(AVCodecParserContext *s,
+                        AVCodecContext *avctx,
+                        const uint8_t **poutbuf, int *poutbuf_size,
+                        const uint8_t *buf, int buf_size);
+    void (*parser_close)(AVCodecParserContext *s);
+    int (*split)(AVCodecContext *avctx, const uint8_t *buf, int buf_size);
+    struct AVCodecParser *next;
+} AVCodecParser;
+
+AVCodecParser *av_parser_next(AVCodecParser *c);
+
+void av_register_codec_parser(AVCodecParser *parser);
+AVCodecParserContext *av_parser_init(int codec_id);
+
+/**
+ * Parse a packet.
+ *
+ * @param s             parser context.
+ * @param avctx         codec context.
+ * @param poutbuf       set to pointer to parsed buffer or NULL if not yet finished.
+ * @param poutbuf_size  set to size of parsed buffer or zero if not yet finished.
+ * @param buf           input buffer.
+ * @param buf_size      input length, to signal EOF, this should be 0 (so that the last frame can be output).
+ * @param pts           input presentation timestamp.
+ * @param dts           input decoding timestamp.
+ * @param pos           input byte position in stream.
+ * @return the number of bytes of the input bitstream used.
+ *
+ * Example:
+ * @code
+ *   while(in_len){
+ *       len = av_parser_parse2(myparser, AVCodecContext, &data, &size,
+ *                                        in_data, in_len,
+ *                                        pts, dts, pos);
+ *       in_data += len;
+ *       in_len  -= len;
+ *
+ *       if(size)
+ *          decode_frame(data, size);
+ *   }
+ * @endcode
+ */
+int av_parser_parse2(AVCodecParserContext *s,
+                     AVCodecContext *avctx,
+                     uint8_t **poutbuf, int *poutbuf_size,
+                     const uint8_t *buf, int buf_size,
+                     int64_t pts, int64_t dts,
+                     int64_t pos);
+
+/**
+ * @return 0 if the output buffer is a subset of the input, 1 if it is allocated and must be freed
+ * @deprecated use AVBitstreamFilter
+ */
+int av_parser_change(AVCodecParserContext *s,
+                     AVCodecContext *avctx,
+                     uint8_t **poutbuf, int *poutbuf_size,
+                     const uint8_t *buf, int buf_size, int keyframe);
+void av_parser_close(AVCodecParserContext *s);
+
+/**
+ * @}
+ * @}
+ */
+
+/**
+ * @addtogroup lavc_encoding
+ * @{
+ */
+
+/**
+ * Find a registered encoder with a matching codec ID.
+ *
+ * @param id AVCodecID of the requested encoder
+ * @return An encoder if one was found, NULL otherwise.
+ */
+AVCodec *avcodec_find_encoder(enum AVCodecID id);
+
+/**
+ * Find a registered encoder with the specified name.
+ *
+ * @param name name of the requested encoder
+ * @return An encoder if one was found, NULL otherwise.
+ */
+AVCodec *avcodec_find_encoder_by_name(const char *name);
+
+#if FF_API_OLD_ENCODE_AUDIO
+/**
+ * Encode an audio frame from samples into buf.
+ *
+ * @deprecated Use avcodec_encode_audio2 instead.
+ *
+ * @note The output buffer should be at least FF_MIN_BUFFER_SIZE bytes large.
+ * However, for codecs with avctx->frame_size equal to 0 (e.g. PCM) the user
+ * will know how much space is needed because it depends on the value passed
+ * in buf_size as described below. In that case a lower value can be used.
+ *
+ * @param avctx the codec context
+ * @param[out] buf the output buffer
+ * @param[in] buf_size the output buffer size
+ * @param[in] samples the input buffer containing the samples
+ * The number of samples read from this buffer is frame_size*channels,
+ * both of which are defined in avctx.
+ * For codecs which have avctx->frame_size equal to 0 (e.g. PCM) the number of
+ * samples read from samples is equal to:
+ * buf_size * 8 / (avctx->channels * av_get_bits_per_sample(avctx->codec_id))
+ * This also implies that av_get_bits_per_sample() must not return 0 for these
+ * codecs.
+ * @return On error a negative value is returned, on success zero or the number
+ * of bytes used to encode the data read from the input buffer.
+ */
+int attribute_deprecated avcodec_encode_audio(AVCodecContext *avctx,
+                                              uint8_t *buf, int buf_size,
+                                              const short *samples);
+#endif
+
+/**
+ * Encode a frame of audio.
+ *
+ * Takes input samples from frame and writes the next output packet, if
+ * available, to avpkt. The output packet does not necessarily contain data for
+ * the most recent frame, as encoders can delay, split, and combine input frames
+ * internally as needed.
+ *
+ * @param avctx     codec context
+ * @param avpkt     output AVPacket.
+ *                  The user can supply an output buffer by setting
+ *                  avpkt->data and avpkt->size prior to calling the
+ *                  function, but if the size of the user-provided data is not
+ *                  large enough, encoding will fail. All other AVPacket fields
+ *                  will be reset by the encoder using av_init_packet(). If
+ *                  avpkt->data is NULL, the encoder will allocate it.
+ *                  The encoder will set avpkt->size to the size of the
+ *                  output packet.
+ *
+ *                  If this function fails or produces no output, avpkt will be
+ *                  freed using av_free_packet() (i.e. avpkt->destruct will be
+ *                  called to free the user supplied buffer).
+ * @param[in] frame AVFrame containing the raw audio data to be encoded.
+ *                  May be NULL when flushing an encoder that has the
+ *                  CODEC_CAP_DELAY capability set.
+ *                  If CODEC_CAP_VARIABLE_FRAME_SIZE is set, then each frame
+ *                  can have any number of samples.
+ *                  If it is not set, frame->nb_samples must be equal to
+ *                  avctx->frame_size for all frames except the last.
+ *                  The final frame may be smaller than avctx->frame_size.
+ * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the
+ *                            output packet is non-empty, and to 0 if it is
+ *                            empty. If the function returns an error, the
+ *                            packet can be assumed to be invalid, and the
+ *                            value of got_packet_ptr is undefined and should
+ *                            not be used.
+ * @return          0 on success, negative error code on failure
+ */
+int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt,
+                          const AVFrame *frame, int *got_packet_ptr);
+
+#if FF_API_OLD_ENCODE_VIDEO
+/**
+ * @deprecated use avcodec_encode_video2() instead.
+ *
+ * Encode a video frame from pict into buf.
+ * The input picture should be
+ * stored using a specific format, namely avctx.pix_fmt.
+ *
+ * @param avctx the codec context
+ * @param[out] buf the output buffer for the bitstream of encoded frame
+ * @param[in] buf_size the size of the output buffer in bytes
+ * @param[in] pict the input picture to encode
+ * @return On error a negative value is returned, on success zero or the number
+ * of bytes used from the output buffer.
+ */
+attribute_deprecated
+int avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size,
+                         const AVFrame *pict);
+#endif
+
+/**
+ * Encode a frame of video.
+ *
+ * Takes input raw video data from frame and writes the next output packet, if
+ * available, to avpkt. The output packet does not necessarily contain data for
+ * the most recent frame, as encoders can delay and reorder input frames
+ * internally as needed.
+ *
+ * @param avctx     codec context
+ * @param avpkt     output AVPacket.
+ *                  The user can supply an output buffer by setting
+ *                  avpkt->data and avpkt->size prior to calling the
+ *                  function, but if the size of the user-provided data is not
+ *                  large enough, encoding will fail. All other AVPacket fields
+ *                  will be reset by the encoder using av_init_packet(). If
+ *                  avpkt->data is NULL, the encoder will allocate it.
+ *                  The encoder will set avpkt->size to the size of the
+ *                  output packet. The returned data (if any) belongs to the
+ *                  caller, he is responsible for freeing it.
+ *
+ *                  If this function fails or produces no output, avpkt will be
+ *                  freed using av_free_packet() (i.e. avpkt->destruct will be
+ *                  called to free the user supplied buffer).
+ * @param[in] frame AVFrame containing the raw video data to be encoded.
+ *                  May be NULL when flushing an encoder that has the
+ *                  CODEC_CAP_DELAY capability set.
+ * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the
+ *                            output packet is non-empty, and to 0 if it is
+ *                            empty. If the function returns an error, the
+ *                            packet can be assumed to be invalid, and the
+ *                            value of got_packet_ptr is undefined and should
+ *                            not be used.
+ * @return          0 on success, negative error code on failure
+ */
+int avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt,
+                          const AVFrame *frame, int *got_packet_ptr);
+
+int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size,
+                            const AVSubtitle *sub);
+
+
+/**
+ * @}
+ */
+
+#if FF_API_AVCODEC_RESAMPLE
+/**
+ * @defgroup lavc_resample Audio resampling
+ * @ingroup libavc
+ * @deprecated use libavresample instead
+ *
+ * @{
+ */
+struct ReSampleContext;
+struct AVResampleContext;
+
+typedef struct ReSampleContext ReSampleContext;
+
+/**
+ *  Initialize audio resampling context.
+ *
+ * @param output_channels  number of output channels
+ * @param input_channels   number of input channels
+ * @param output_rate      output sample rate
+ * @param input_rate       input sample rate
+ * @param sample_fmt_out   requested output sample format
+ * @param sample_fmt_in    input sample format
+ * @param filter_length    length of each FIR filter in the filterbank relative to the cutoff frequency
+ * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
+ * @param linear           if 1 then the used FIR filter will be linearly interpolated
+                           between the 2 closest, if 0 the closest will be used
+ * @param cutoff           cutoff frequency, 1.0 corresponds to half the output sampling rate
+ * @return allocated ReSampleContext, NULL if error occurred
+ */
+attribute_deprecated
+ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
+                                        int output_rate, int input_rate,
+                                        enum AVSampleFormat sample_fmt_out,
+                                        enum AVSampleFormat sample_fmt_in,
+                                        int filter_length, int log2_phase_count,
+                                        int linear, double cutoff);
+
+attribute_deprecated
+int audio_resample(ReSampleContext *s, short *output, short *input, int nb_samples);
+
+/**
+ * Free resample context.
+ *
+ * @param s a non-NULL pointer to a resample context previously
+ *          created with av_audio_resample_init()
+ */
+attribute_deprecated
+void audio_resample_close(ReSampleContext *s);
+
+
+/**
+ * Initialize an audio resampler.
+ * Note, if either rate is not an integer then simply scale both rates up so they are.
+ * @param filter_length length of each FIR filter in the filterbank relative to the cutoff freq
+ * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
+ * @param linear If 1 then the used FIR filter will be linearly interpolated
+                 between the 2 closest, if 0 the closest will be used
+ * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate
+ */
+attribute_deprecated
+struct AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_length, int log2_phase_count, int linear, double cutoff);
+
+/**
+ * Resample an array of samples using a previously configured context.
+ * @param src an array of unconsumed samples
+ * @param consumed the number of samples of src which have been consumed are returned here
+ * @param src_size the number of unconsumed samples available
+ * @param dst_size the amount of space in samples available in dst
+ * @param update_ctx If this is 0 then the context will not be modified, that way several channels can be resampled with the same context.
+ * @return the number of samples written in dst or -1 if an error occurred
+ */
+attribute_deprecated
+int av_resample(struct AVResampleContext *c, short *dst, short *src, int *consumed, int src_size, int dst_size, int update_ctx);
+
+
+/**
+ * Compensate samplerate/timestamp drift. The compensation is done by changing
+ * the resampler parameters, so no audible clicks or similar distortions occur
+ * @param compensation_distance distance in output samples over which the compensation should be performed
+ * @param sample_delta number of output samples which should be output less
+ *
+ * example: av_resample_compensate(c, 10, 500)
+ * here instead of 510 samples only 500 samples would be output
+ *
+ * note, due to rounding the actual compensation might be slightly different,
+ * especially if the compensation_distance is large and the in_rate used during init is small
+ */
+attribute_deprecated
+void av_resample_compensate(struct AVResampleContext *c, int sample_delta, int compensation_distance);
+attribute_deprecated
+void av_resample_close(struct AVResampleContext *c);
+
+/**
+ * @}
+ */
+#endif
+
+/**
+ * @addtogroup lavc_picture
+ * @{
+ */
+
+/**
+ * Allocate memory for a picture.  Call avpicture_free() to free it.
+ *
+ * @see avpicture_fill()
+ *
+ * @param picture the picture to be filled in
+ * @param pix_fmt the format of the picture
+ * @param width the width of the picture
+ * @param height the height of the picture
+ * @return zero if successful, a negative value if not
+ */
+int avpicture_alloc(AVPicture *picture, enum AVPixelFormat pix_fmt, int width, int height);
+
+/**
+ * Free a picture previously allocated by avpicture_alloc().
+ * The data buffer used by the AVPicture is freed, but the AVPicture structure
+ * itself is not.
+ *
+ * @param picture the AVPicture to be freed
+ */
+void avpicture_free(AVPicture *picture);
+
+/**
+ * Fill in the AVPicture fields.
+ * The fields of the given AVPicture are filled in by using the 'ptr' address
+ * which points to the image data buffer. Depending on the specified picture
+ * format, one or multiple image data pointers and line sizes will be set.
+ * If a planar format is specified, several pointers will be set pointing to
+ * the different picture planes and the line sizes of the different planes
+ * will be stored in the lines_sizes array.
+ * Call with ptr == NULL to get the required size for the ptr buffer.
+ *
+ * To allocate the buffer and fill in the AVPicture fields in one call,
+ * use avpicture_alloc().
+ *
+ * @param picture AVPicture whose fields are to be filled in
+ * @param ptr Buffer which will contain or contains the actual image data
+ * @param pix_fmt The format in which the picture data is stored.
+ * @param width the width of the image in pixels
+ * @param height the height of the image in pixels
+ * @return size of the image data in bytes
+ */
+int avpicture_fill(AVPicture *picture, uint8_t *ptr,
+                   enum AVPixelFormat pix_fmt, int width, int height);
+
+/**
+ * Copy pixel data from an AVPicture into a buffer.
+ * The data is stored compactly, without any gaps for alignment or padding
+ * which may be applied by avpicture_fill().
+ *
+ * @see avpicture_get_size()
+ *
+ * @param[in] src AVPicture containing image data
+ * @param[in] pix_fmt The format in which the picture data is stored.
+ * @param[in] width the width of the image in pixels.
+ * @param[in] height the height of the image in pixels.
+ * @param[out] dest A buffer into which picture data will be copied.
+ * @param[in] dest_size The size of 'dest'.
+ * @return The number of bytes written to dest, or a negative value (error code) on error.
+ */
+int avpicture_layout(const AVPicture* src, enum AVPixelFormat pix_fmt,
+                     int width, int height,
+                     unsigned char *dest, int dest_size);
+
+/**
+ * Calculate the size in bytes that a picture of the given width and height
+ * would occupy if stored in the given picture format.
+ * Note that this returns the size of a compact representation as generated
+ * by avpicture_layout(), which can be smaller than the size required for e.g.
+ * avpicture_fill().
+ *
+ * @param pix_fmt the given picture format
+ * @param width the width of the image
+ * @param height the height of the image
+ * @return Image data size in bytes or -1 on error (e.g. too large dimensions).
+ */
+int avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height);
+
+/**
+ *  deinterlace - if not supported return -1
+ */
+int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
+                          enum AVPixelFormat pix_fmt, int width, int height);
+/**
+ * Copy image src to dst. Wraps av_picture_data_copy() above.
+ */
+void av_picture_copy(AVPicture *dst, const AVPicture *src,
+                     enum AVPixelFormat pix_fmt, int width, int height);
+
+/**
+ * Crop image top and left side.
+ */
+int av_picture_crop(AVPicture *dst, const AVPicture *src,
+                    enum AVPixelFormat pix_fmt, int top_band, int left_band);
+
+/**
+ * Pad image.
+ */
+int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, enum AVPixelFormat pix_fmt,
+            int padtop, int padbottom, int padleft, int padright, int *color);
+
+/**
+ * @}
+ */
+
+/**
+ * @defgroup lavc_misc Utility functions
+ * @ingroup libavc
+ *
+ * Miscellaneous utility functions related to both encoding and decoding
+ * (or neither).
+ * @{
+ */
+
+/**
+ * @defgroup lavc_misc_pixfmt Pixel formats
+ *
+ * Functions for working with pixel formats.
+ * @{
+ */
+
+/**
+ * @deprecated Use av_pix_fmt_get_chroma_sub_sample
+ */
+
+void attribute_deprecated avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift);
+
+/**
+ * Return a value representing the fourCC code associated to the
+ * pixel format pix_fmt, or 0 if no associated fourCC code can be
+ * found.
+ */
+unsigned int avcodec_pix_fmt_to_codec_tag(enum AVPixelFormat pix_fmt);
+
+#define FF_LOSS_RESOLUTION  0x0001 /**< loss due to resolution change */
+#define FF_LOSS_DEPTH       0x0002 /**< loss due to color depth change */
+#define FF_LOSS_COLORSPACE  0x0004 /**< loss due to color space conversion */
+#define FF_LOSS_ALPHA       0x0008 /**< loss of alpha bits */
+#define FF_LOSS_COLORQUANT  0x0010 /**< loss due to color quantization */
+#define FF_LOSS_CHROMA      0x0020 /**< loss of chroma (e.g. RGB to gray conversion) */
+
+/**
+ * Compute what kind of losses will occur when converting from one specific
+ * pixel format to another.
+ * When converting from one pixel format to another, information loss may occur.
+ * For example, when converting from RGB24 to GRAY, the color information will
+ * be lost. Similarly, other losses occur when converting from some formats to
+ * other formats. These losses can involve loss of chroma, but also loss of
+ * resolution, loss of color depth, loss due to the color space conversion, loss
+ * of the alpha bits or loss due to color quantization.
+ * avcodec_get_fix_fmt_loss() informs you about the various types of losses
+ * which will occur when converting from one pixel format to another.
+ *
+ * @param[in] dst_pix_fmt destination pixel format
+ * @param[in] src_pix_fmt source pixel format
+ * @param[in] has_alpha Whether the source pixel format alpha channel is used.
+ * @return Combination of flags informing you what kind of losses will occur.
+ */
+int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, enum AVPixelFormat src_pix_fmt,
+                             int has_alpha);
+
+#if FF_API_FIND_BEST_PIX_FMT
+/**
+ * @deprecated use avcodec_find_best_pix_fmt2() instead.
+ *
+ * Find the best pixel format to convert to given a certain source pixel
+ * format.  When converting from one pixel format to another, information loss
+ * may occur.  For example, when converting from RGB24 to GRAY, the color
+ * information will be lost. Similarly, other losses occur when converting from
+ * some formats to other formats. avcodec_find_best_pix_fmt() searches which of
+ * the given pixel formats should be used to suffer the least amount of loss.
+ * The pixel formats from which it chooses one, are determined by the
+ * pix_fmt_mask parameter.
+ *
+ * @code
+ * src_pix_fmt = AV_PIX_FMT_YUV420P;
+ * pix_fmt_mask = (1 << AV_PIX_FMT_YUV422P) || (1 << AV_PIX_FMT_RGB24);
+ * dst_pix_fmt = avcodec_find_best_pix_fmt(pix_fmt_mask, src_pix_fmt, alpha, &loss);
+ * @endcode
+ *
+ * @param[in] pix_fmt_mask bitmask determining which pixel format to choose from
+ * @param[in] src_pix_fmt source pixel format
+ * @param[in] has_alpha Whether the source pixel format alpha channel is used.
+ * @param[out] loss_ptr Combination of flags informing you what kind of losses will occur.
+ * @return The best pixel format to convert to or -1 if none was found.
+ */
+attribute_deprecated
+enum AVPixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum AVPixelFormat src_pix_fmt,
+                              int has_alpha, int *loss_ptr);
+#endif /* FF_API_FIND_BEST_PIX_FMT */
+
+/**
+ * Find the best pixel format to convert to given a certain source pixel
+ * format.  When converting from one pixel format to another, information loss
+ * may occur.  For example, when converting from RGB24 to GRAY, the color
+ * information will be lost. Similarly, other losses occur when converting from
+ * some formats to other formats. avcodec_find_best_pix_fmt2() searches which of
+ * the given pixel formats should be used to suffer the least amount of loss.
+ * The pixel formats from which it chooses one, are determined by the
+ * pix_fmt_list parameter.
+ *
+ *
+ * @param[in] pix_fmt_list AV_PIX_FMT_NONE terminated array of pixel formats to choose from
+ * @param[in] src_pix_fmt source pixel format
+ * @param[in] has_alpha Whether the source pixel format alpha channel is used.
+ * @param[out] loss_ptr Combination of flags informing you what kind of losses will occur.
+ * @return The best pixel format to convert to or -1 if none was found.
+ */
+enum AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat *pix_fmt_list,
+                                              enum AVPixelFormat src_pix_fmt,
+                                              int has_alpha, int *loss_ptr);
+
+enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum AVPixelFormat * fmt);
+
+/**
+ * @}
+ */
+
+void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
+
+/**
+ * Put a string representing the codec tag codec_tag in buf.
+ *
+ * @param buf_size size in bytes of buf
+ * @return the length of the string that would have been generated if
+ * enough space had been available, excluding the trailing null
+ */
+size_t av_get_codec_tag_string(char *buf, size_t buf_size, unsigned int codec_tag);
+
+void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode);
+
+/**
+ * Return a name for the specified profile, if available.
+ *
+ * @param codec the codec that is searched for the given profile
+ * @param profile the profile value for which a name is requested
+ * @return A name for the profile if found, NULL otherwise.
+ */
+const char *av_get_profile_name(const AVCodec *codec, int profile);
+
+int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size);
+int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count);
+//FIXME func typedef
+
+/**
+ * Fill audio frame data and linesize.
+ * AVFrame extended_data channel pointers are allocated if necessary for
+ * planar audio.
+ *
+ * @param frame       the AVFrame
+ *                    frame->nb_samples must be set prior to calling the
+ *                    function. This function fills in frame->data,
+ *                    frame->extended_data, frame->linesize[0].
+ * @param nb_channels channel count
+ * @param sample_fmt  sample format
+ * @param buf         buffer to use for frame data
+ * @param buf_size    size of buffer
+ * @param align       plane size sample alignment (0 = default)
+ * @return            0 on success, negative error code on failure
+ */
+int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels,
+                             enum AVSampleFormat sample_fmt, const uint8_t *buf,
+                             int buf_size, int align);
+
+/**
+ * Flush buffers, should be called when seeking or when switching to a different stream.
+ */
+void avcodec_flush_buffers(AVCodecContext *avctx);
+
+void avcodec_default_free_buffers(AVCodecContext *s);
+
+/**
+ * Return codec bits per sample.
+ *
+ * @param[in] codec_id the codec
+ * @return Number of bits per sample or zero if unknown for the given codec.
+ */
+int av_get_bits_per_sample(enum AVCodecID codec_id);
+
+/**
+ * Return codec bits per sample.
+ * Only return non-zero if the bits per sample is exactly correct, not an
+ * approximation.
+ *
+ * @param[in] codec_id the codec
+ * @return Number of bits per sample or zero if unknown for the given codec.
+ */
+int av_get_exact_bits_per_sample(enum AVCodecID codec_id);
+
+/**
+ * Return audio frame duration.
+ *
+ * @param avctx        codec context
+ * @param frame_bytes  size of the frame, or 0 if unknown
+ * @return             frame duration, in samples, if known. 0 if not able to
+ *                     determine.
+ */
+int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes);
+
+
+typedef struct AVBitStreamFilterContext {
+    void *priv_data;
+    struct AVBitStreamFilter *filter;
+    AVCodecParserContext *parser;
+    struct AVBitStreamFilterContext *next;
+} AVBitStreamFilterContext;
+
+
+typedef struct AVBitStreamFilter {
+    const char *name;
+    int priv_data_size;
+    int (*filter)(AVBitStreamFilterContext *bsfc,
+                  AVCodecContext *avctx, const char *args,
+                  uint8_t **poutbuf, int *poutbuf_size,
+                  const uint8_t *buf, int buf_size, int keyframe);
+    void (*close)(AVBitStreamFilterContext *bsfc);
+    struct AVBitStreamFilter *next;
+} AVBitStreamFilter;
+
+void av_register_bitstream_filter(AVBitStreamFilter *bsf);
+AVBitStreamFilterContext *av_bitstream_filter_init(const char *name);
+int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc,
+                               AVCodecContext *avctx, const char *args,
+                               uint8_t **poutbuf, int *poutbuf_size,
+                               const uint8_t *buf, int buf_size, int keyframe);
+void av_bitstream_filter_close(AVBitStreamFilterContext *bsf);
+
+AVBitStreamFilter *av_bitstream_filter_next(AVBitStreamFilter *f);
+
+/* memory */
+
+/**
+ * Reallocate the given block if it is not large enough, otherwise do nothing.
+ *
+ * @see av_realloc
+ */
+void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size);
+
+/**
+ * Allocate a buffer, reusing the given one if large enough.
+ *
+ * Contrary to av_fast_realloc the current buffer contents might not be
+ * preserved and on error the old buffer is freed, thus no special
+ * handling to avoid memleaks is necessary.
+ *
+ * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer
+ * @param size size of the buffer *ptr points to
+ * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and
+ *                 *size 0 if an error occurred.
+ */
+void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size);
+
+/**
+ * Allocate a buffer with padding, reusing the given one if large enough.
+ *
+ * Same behaviour av_fast_malloc but the buffer has additional
+ * FF_INPUT_PADDING_SIZE at the end which will always memset to 0.
+ *
+ */
+void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size);
+
+/**
+ * Encode extradata length to a buffer. Used by xiph codecs.
+ *
+ * @param s buffer to write to; must be at least (v/255+1) bytes long
+ * @param v size of extradata in bytes
+ * @return number of bytes written to the buffer.
+ */
+unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
+
+/**
+ * Log a generic warning message about a missing feature. This function is
+ * intended to be used internally by Libav (libavcodec, libavformat, etc.)
+ * only, and would normally not be used by applications.
+ * @param[in] avc a pointer to an arbitrary struct of which the first field is
+ * a pointer to an AVClass struct
+ * @param[in] feature string containing the name of the missing feature
+ * @param[in] want_sample indicates if samples are wanted which exhibit this feature.
+ * If want_sample is non-zero, additional verbage will be added to the log
+ * message which tells the user how to report samples to the development
+ * mailing list.
+ */
+void av_log_missing_feature(void *avc, const char *feature, int want_sample);
+
+/**
+ * Log a generic warning message asking for a sample. This function is
+ * intended to be used internally by Libav (libavcodec, libavformat, etc.)
+ * only, and would normally not be used by applications.
+ * @param[in] avc a pointer to an arbitrary struct of which the first field is
+ * a pointer to an AVClass struct
+ * @param[in] msg string containing an optional message, or NULL if no message
+ */
+void av_log_ask_for_sample(void *avc, const char *msg, ...) av_printf_format(2, 3);
+
+/**
+ * Register the hardware accelerator hwaccel.
+ */
+void av_register_hwaccel(AVHWAccel *hwaccel);
+
+/**
+ * If hwaccel is NULL, returns the first registered hardware accelerator,
+ * if hwaccel is non-NULL, returns the next registered hardware accelerator
+ * after hwaccel, or NULL if hwaccel is the last one.
+ */
+AVHWAccel *av_hwaccel_next(AVHWAccel *hwaccel);
+
+
+/**
+ * Lock operation used by lockmgr
+ */
+enum AVLockOp {
+  AV_LOCK_CREATE,  ///< Create a mutex
+  AV_LOCK_OBTAIN,  ///< Lock the mutex
+  AV_LOCK_RELEASE, ///< Unlock the mutex
+  AV_LOCK_DESTROY, ///< Free mutex resources
+};
+
+/**
+ * Register a user provided lock manager supporting the operations
+ * specified by AVLockOp. mutex points to a (void *) where the
+ * lockmgr should store/get a pointer to a user allocated mutex. It's
+ * NULL upon AV_LOCK_CREATE and != NULL for all other ops.
+ *
+ * @param cb User defined callback. Note: Libav may invoke calls to this
+ *           callback during the call to av_lockmgr_register().
+ *           Thus, the application must be prepared to handle that.
+ *           If cb is set to NULL the lockmgr will be unregistered.
+ *           Also note that during unregistration the previously registered
+ *           lockmgr callback may also be invoked.
+ */
+int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op));
+
+/**
+ * Get the type of the given codec.
+ */
+enum AVMediaType avcodec_get_type(enum AVCodecID codec_id);
+
+/**
+ * @return a positive value if s is open (i.e. avcodec_open2() was called on it
+ * with no corresponding avcodec_close()), 0 otherwise.
+ */
+int avcodec_is_open(AVCodecContext *s);
+
+/**
+ * @return a non-zero number if codec is an encoder, zero otherwise
+ */
+int av_codec_is_encoder(const AVCodec *codec);
+
+/**
+ * @return a non-zero number if codec is a decoder, zero otherwise
+ */
+int av_codec_is_decoder(const AVCodec *codec);
+
+/**
+ * @return descriptor for given codec ID or NULL if no descriptor exists.
+ */
+const AVCodecDescriptor *avcodec_descriptor_get(enum AVCodecID id);
+
+/**
+ * Iterate over all codec descriptors known to libavcodec.
+ *
+ * @param prev previous descriptor. NULL to get the first descriptor.
+ *
+ * @return next descriptor or NULL after the last descriptor
+ */
+const AVCodecDescriptor *avcodec_descriptor_next(const AVCodecDescriptor *prev);
+
+/**
+ * @return codec descriptor with the given name or NULL if no such descriptor
+ *         exists.
+ */
+const AVCodecDescriptor *avcodec_descriptor_get_by_name(const char *name);
+
+/**
+ * @}
+ */
+
+#endif /* AVCODEC_AVCODEC_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavcodec/avfft.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavcodec/avfft.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavcodec/avfft.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavcodec/avfft.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,116 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_AVFFT_H
+#define AVCODEC_AVFFT_H
+
+/**
+ * @file
+ * @ingroup lavc_fft
+ * FFT functions
+ */
+
+/**
+ * @defgroup lavc_fft FFT functions
+ * @ingroup lavc_misc
+ *
+ * @{
+ */
+
+typedef float FFTSample;
+
+typedef struct FFTComplex {
+    FFTSample re, im;
+} FFTComplex;
+
+typedef struct FFTContext FFTContext;
+
+/**
+ * Set up a complex FFT.
+ * @param nbits           log2 of the length of the input array
+ * @param inverse         if 0 perform the forward transform, if 1 perform the inverse
+ */
+FFTContext *av_fft_init(int nbits, int inverse);
+
+/**
+ * Do the permutation needed BEFORE calling ff_fft_calc().
+ */
+void av_fft_permute(FFTContext *s, FFTComplex *z);
+
+/**
+ * Do a complex FFT with the parameters defined in av_fft_init(). The
+ * input data must be permuted before. No 1.0/sqrt(n) normalization is done.
+ */
+void av_fft_calc(FFTContext *s, FFTComplex *z);
+
+void av_fft_end(FFTContext *s);
+
+FFTContext *av_mdct_init(int nbits, int inverse, double scale);
+void av_imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input);
+void av_imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input);
+void av_mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input);
+void av_mdct_end(FFTContext *s);
+
+/* Real Discrete Fourier Transform */
+
+enum RDFTransformType {
+    DFT_R2C,
+    IDFT_C2R,
+    IDFT_R2C,
+    DFT_C2R,
+};
+
+typedef struct RDFTContext RDFTContext;
+
+/**
+ * Set up a real FFT.
+ * @param nbits           log2 of the length of the input array
+ * @param trans           the type of transform
+ */
+RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans);
+void av_rdft_calc(RDFTContext *s, FFTSample *data);
+void av_rdft_end(RDFTContext *s);
+
+/* Discrete Cosine Transform */
+
+typedef struct DCTContext DCTContext;
+
+enum DCTTransformType {
+    DCT_II = 0,
+    DCT_III,
+    DCT_I,
+    DST_I,
+};
+
+/**
+ * Set up DCT.
+ * @param nbits           size of the input array:
+ *                        (1 << nbits)     for DCT-II, DCT-III and DST-I
+ *                        (1 << nbits) + 1 for DCT-I
+ *
+ * @note the first element of the input of DST-I is ignored
+ */
+DCTContext *av_dct_init(int nbits, enum DCTTransformType type);
+void av_dct_calc(DCTContext *s, FFTSample *data);
+void av_dct_end (DCTContext *s);
+
+/**
+ * @}
+ */
+
+#endif /* AVCODEC_AVFFT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavcodec/dxva2.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavcodec/dxva2.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavcodec/dxva2.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavcodec/dxva2.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,88 @@
+/*
+ * DXVA2 HW acceleration
+ *
+ * copyright (c) 2009 Laurent Aimar
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_DXVA_H
+#define AVCODEC_DXVA_H
+
+/**
+ * @file
+ * @ingroup lavc_codec_hwaccel_dxva2
+ * Public libavcodec DXVA2 header.
+ */
+
+#include <stdint.h>
+
+#include <d3d9.h>
+#include <dxva2api.h>
+
+/**
+ * @defgroup lavc_codec_hwaccel_dxva2 DXVA2
+ * @ingroup lavc_codec_hwaccel
+ *
+ * @{
+ */
+
+#define FF_DXVA2_WORKAROUND_SCALING_LIST_ZIGZAG 1 ///< Work around for DXVA2 and old UVD/UVD+ ATI video cards
+
+/**
+ * This structure is used to provides the necessary configurations and data
+ * to the DXVA2 Libav HWAccel implementation.
+ *
+ * The application must make it available as AVCodecContext.hwaccel_context.
+ */
+struct dxva_context {
+    /**
+     * DXVA2 decoder object
+     */
+    IDirectXVideoDecoder *decoder;
+
+    /**
+     * DXVA2 configuration used to create the decoder
+     */
+    const DXVA2_ConfigPictureDecode *cfg;
+
+    /**
+     * The number of surface in the surface array
+     */
+    unsigned surface_count;
+
+    /**
+     * The array of Direct3D surfaces used to create the decoder
+     */
+    LPDIRECT3DSURFACE9 *surface;
+
+    /**
+     * A bit field configuring the workarounds needed for using the decoder
+     */
+    uint64_t workaround;
+
+    /**
+     * Private to the Libav AVHWAccel implementation
+     */
+    unsigned report_id;
+};
+
+/**
+ * @}
+ */
+
+#endif /* AVCODEC_DXVA_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavcodec/old_codec_ids.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavcodec/old_codec_ids.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavcodec/old_codec_ids.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavcodec/old_codec_ids.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,366 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_OLD_CODEC_IDS_H
+#define AVCODEC_OLD_CODEC_IDS_H
+
+/*
+ * This header exists to prevent new codec IDs from being accidentally added to
+ * the deprecated list.
+ * Do not include it directly. It will be removed on next major bump
+ *
+ * Do not add new items to this list. Use the AVCodecID enum instead.
+ */
+
+    CODEC_ID_NONE = AV_CODEC_ID_NONE,
+
+    /* video codecs */
+    CODEC_ID_MPEG1VIDEO,
+    CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
+    CODEC_ID_MPEG2VIDEO_XVMC,
+    CODEC_ID_H261,
+    CODEC_ID_H263,
+    CODEC_ID_RV10,
+    CODEC_ID_RV20,
+    CODEC_ID_MJPEG,
+    CODEC_ID_MJPEGB,
+    CODEC_ID_LJPEG,
+    CODEC_ID_SP5X,
+    CODEC_ID_JPEGLS,
+    CODEC_ID_MPEG4,
+    CODEC_ID_RAWVIDEO,
+    CODEC_ID_MSMPEG4V1,
+    CODEC_ID_MSMPEG4V2,
+    CODEC_ID_MSMPEG4V3,
+    CODEC_ID_WMV1,
+    CODEC_ID_WMV2,
+    CODEC_ID_H263P,
+    CODEC_ID_H263I,
+    CODEC_ID_FLV1,
+    CODEC_ID_SVQ1,
+    CODEC_ID_SVQ3,
+    CODEC_ID_DVVIDEO,
+    CODEC_ID_HUFFYUV,
+    CODEC_ID_CYUV,
+    CODEC_ID_H264,
+    CODEC_ID_INDEO3,
+    CODEC_ID_VP3,
+    CODEC_ID_THEORA,
+    CODEC_ID_ASV1,
+    CODEC_ID_ASV2,
+    CODEC_ID_FFV1,
+    CODEC_ID_4XM,
+    CODEC_ID_VCR1,
+    CODEC_ID_CLJR,
+    CODEC_ID_MDEC,
+    CODEC_ID_ROQ,
+    CODEC_ID_INTERPLAY_VIDEO,
+    CODEC_ID_XAN_WC3,
+    CODEC_ID_XAN_WC4,
+    CODEC_ID_RPZA,
+    CODEC_ID_CINEPAK,
+    CODEC_ID_WS_VQA,
+    CODEC_ID_MSRLE,
+    CODEC_ID_MSVIDEO1,
+    CODEC_ID_IDCIN,
+    CODEC_ID_8BPS,
+    CODEC_ID_SMC,
+    CODEC_ID_FLIC,
+    CODEC_ID_TRUEMOTION1,
+    CODEC_ID_VMDVIDEO,
+    CODEC_ID_MSZH,
+    CODEC_ID_ZLIB,
+    CODEC_ID_QTRLE,
+    CODEC_ID_SNOW,
+    CODEC_ID_TSCC,
+    CODEC_ID_ULTI,
+    CODEC_ID_QDRAW,
+    CODEC_ID_VIXL,
+    CODEC_ID_QPEG,
+    CODEC_ID_PNG,
+    CODEC_ID_PPM,
+    CODEC_ID_PBM,
+    CODEC_ID_PGM,
+    CODEC_ID_PGMYUV,
+    CODEC_ID_PAM,
+    CODEC_ID_FFVHUFF,
+    CODEC_ID_RV30,
+    CODEC_ID_RV40,
+    CODEC_ID_VC1,
+    CODEC_ID_WMV3,
+    CODEC_ID_LOCO,
+    CODEC_ID_WNV1,
+    CODEC_ID_AASC,
+    CODEC_ID_INDEO2,
+    CODEC_ID_FRAPS,
+    CODEC_ID_TRUEMOTION2,
+    CODEC_ID_BMP,
+    CODEC_ID_CSCD,
+    CODEC_ID_MMVIDEO,
+    CODEC_ID_ZMBV,
+    CODEC_ID_AVS,
+    CODEC_ID_SMACKVIDEO,
+    CODEC_ID_NUV,
+    CODEC_ID_KMVC,
+    CODEC_ID_FLASHSV,
+    CODEC_ID_CAVS,
+    CODEC_ID_JPEG2000,
+    CODEC_ID_VMNC,
+    CODEC_ID_VP5,
+    CODEC_ID_VP6,
+    CODEC_ID_VP6F,
+    CODEC_ID_TARGA,
+    CODEC_ID_DSICINVIDEO,
+    CODEC_ID_TIERTEXSEQVIDEO,
+    CODEC_ID_TIFF,
+    CODEC_ID_GIF,
+    CODEC_ID_DXA,
+    CODEC_ID_DNXHD,
+    CODEC_ID_THP,
+    CODEC_ID_SGI,
+    CODEC_ID_C93,
+    CODEC_ID_BETHSOFTVID,
+    CODEC_ID_PTX,
+    CODEC_ID_TXD,
+    CODEC_ID_VP6A,
+    CODEC_ID_AMV,
+    CODEC_ID_VB,
+    CODEC_ID_PCX,
+    CODEC_ID_SUNRAST,
+    CODEC_ID_INDEO4,
+    CODEC_ID_INDEO5,
+    CODEC_ID_MIMIC,
+    CODEC_ID_RL2,
+    CODEC_ID_ESCAPE124,
+    CODEC_ID_DIRAC,
+    CODEC_ID_BFI,
+    CODEC_ID_CMV,
+    CODEC_ID_MOTIONPIXELS,
+    CODEC_ID_TGV,
+    CODEC_ID_TGQ,
+    CODEC_ID_TQI,
+    CODEC_ID_AURA,
+    CODEC_ID_AURA2,
+    CODEC_ID_V210X,
+    CODEC_ID_TMV,
+    CODEC_ID_V210,
+    CODEC_ID_DPX,
+    CODEC_ID_MAD,
+    CODEC_ID_FRWU,
+    CODEC_ID_FLASHSV2,
+    CODEC_ID_CDGRAPHICS,
+    CODEC_ID_R210,
+    CODEC_ID_ANM,
+    CODEC_ID_BINKVIDEO,
+    CODEC_ID_IFF_ILBM,
+    CODEC_ID_IFF_BYTERUN1,
+    CODEC_ID_KGV1,
+    CODEC_ID_YOP,
+    CODEC_ID_VP8,
+    CODEC_ID_PICTOR,
+    CODEC_ID_ANSI,
+    CODEC_ID_A64_MULTI,
+    CODEC_ID_A64_MULTI5,
+    CODEC_ID_R10K,
+    CODEC_ID_MXPEG,
+    CODEC_ID_LAGARITH,
+    CODEC_ID_PRORES,
+    CODEC_ID_JV,
+    CODEC_ID_DFA,
+    CODEC_ID_WMV3IMAGE,
+    CODEC_ID_VC1IMAGE,
+    CODEC_ID_UTVIDEO,
+    CODEC_ID_BMV_VIDEO,
+    CODEC_ID_VBLE,
+    CODEC_ID_DXTORY,
+    CODEC_ID_V410,
+    CODEC_ID_XWD,
+    CODEC_ID_CDXL,
+    CODEC_ID_XBM,
+    CODEC_ID_ZEROCODEC,
+    CODEC_ID_MSS1,
+    CODEC_ID_MSA1,
+    CODEC_ID_TSCC2,
+    CODEC_ID_MTS2,
+    CODEC_ID_CLLC,
+
+    /* various PCM "codecs" */
+    CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs
+    CODEC_ID_PCM_S16LE = 0x10000,
+    CODEC_ID_PCM_S16BE,
+    CODEC_ID_PCM_U16LE,
+    CODEC_ID_PCM_U16BE,
+    CODEC_ID_PCM_S8,
+    CODEC_ID_PCM_U8,
+    CODEC_ID_PCM_MULAW,
+    CODEC_ID_PCM_ALAW,
+    CODEC_ID_PCM_S32LE,
+    CODEC_ID_PCM_S32BE,
+    CODEC_ID_PCM_U32LE,
+    CODEC_ID_PCM_U32BE,
+    CODEC_ID_PCM_S24LE,
+    CODEC_ID_PCM_S24BE,
+    CODEC_ID_PCM_U24LE,
+    CODEC_ID_PCM_U24BE,
+    CODEC_ID_PCM_S24DAUD,
+    CODEC_ID_PCM_ZORK,
+    CODEC_ID_PCM_S16LE_PLANAR,
+    CODEC_ID_PCM_DVD,
+    CODEC_ID_PCM_F32BE,
+    CODEC_ID_PCM_F32LE,
+    CODEC_ID_PCM_F64BE,
+    CODEC_ID_PCM_F64LE,
+    CODEC_ID_PCM_BLURAY,
+    CODEC_ID_PCM_LXF,
+    CODEC_ID_S302M,
+    CODEC_ID_PCM_S8_PLANAR,
+
+    /* various ADPCM codecs */
+    CODEC_ID_ADPCM_IMA_QT = 0x11000,
+    CODEC_ID_ADPCM_IMA_WAV,
+    CODEC_ID_ADPCM_IMA_DK3,
+    CODEC_ID_ADPCM_IMA_DK4,
+    CODEC_ID_ADPCM_IMA_WS,
+    CODEC_ID_ADPCM_IMA_SMJPEG,
+    CODEC_ID_ADPCM_MS,
+    CODEC_ID_ADPCM_4XM,
+    CODEC_ID_ADPCM_XA,
+    CODEC_ID_ADPCM_ADX,
+    CODEC_ID_ADPCM_EA,
+    CODEC_ID_ADPCM_G726,
+    CODEC_ID_ADPCM_CT,
+    CODEC_ID_ADPCM_SWF,
+    CODEC_ID_ADPCM_YAMAHA,
+    CODEC_ID_ADPCM_SBPRO_4,
+    CODEC_ID_ADPCM_SBPRO_3,
+    CODEC_ID_ADPCM_SBPRO_2,
+    CODEC_ID_ADPCM_THP,
+    CODEC_ID_ADPCM_IMA_AMV,
+    CODEC_ID_ADPCM_EA_R1,
+    CODEC_ID_ADPCM_EA_R3,
+    CODEC_ID_ADPCM_EA_R2,
+    CODEC_ID_ADPCM_IMA_EA_SEAD,
+    CODEC_ID_ADPCM_IMA_EA_EACS,
+    CODEC_ID_ADPCM_EA_XAS,
+    CODEC_ID_ADPCM_EA_MAXIS_XA,
+    CODEC_ID_ADPCM_IMA_ISS,
+    CODEC_ID_ADPCM_G722,
+    CODEC_ID_ADPCM_IMA_APC,
+
+    /* AMR */
+    CODEC_ID_AMR_NB = 0x12000,
+    CODEC_ID_AMR_WB,
+
+    /* RealAudio codecs*/
+    CODEC_ID_RA_144 = 0x13000,
+    CODEC_ID_RA_288,
+
+    /* various DPCM codecs */
+    CODEC_ID_ROQ_DPCM = 0x14000,
+    CODEC_ID_INTERPLAY_DPCM,
+    CODEC_ID_XAN_DPCM,
+    CODEC_ID_SOL_DPCM,
+
+    /* audio codecs */
+    CODEC_ID_MP2 = 0x15000,
+    CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
+    CODEC_ID_AAC,
+    CODEC_ID_AC3,
+    CODEC_ID_DTS,
+    CODEC_ID_VORBIS,
+    CODEC_ID_DVAUDIO,
+    CODEC_ID_WMAV1,
+    CODEC_ID_WMAV2,
+    CODEC_ID_MACE3,
+    CODEC_ID_MACE6,
+    CODEC_ID_VMDAUDIO,
+    CODEC_ID_FLAC,
+    CODEC_ID_MP3ADU,
+    CODEC_ID_MP3ON4,
+    CODEC_ID_SHORTEN,
+    CODEC_ID_ALAC,
+    CODEC_ID_WESTWOOD_SND1,
+    CODEC_ID_GSM, ///< as in Berlin toast format
+    CODEC_ID_QDM2,
+    CODEC_ID_COOK,
+    CODEC_ID_TRUESPEECH,
+    CODEC_ID_TTA,
+    CODEC_ID_SMACKAUDIO,
+    CODEC_ID_QCELP,
+    CODEC_ID_WAVPACK,
+    CODEC_ID_DSICINAUDIO,
+    CODEC_ID_IMC,
+    CODEC_ID_MUSEPACK7,
+    CODEC_ID_MLP,
+    CODEC_ID_GSM_MS, /* as found in WAV */
+    CODEC_ID_ATRAC3,
+    CODEC_ID_VOXWARE,
+    CODEC_ID_APE,
+    CODEC_ID_NELLYMOSER,
+    CODEC_ID_MUSEPACK8,
+    CODEC_ID_SPEEX,
+    CODEC_ID_WMAVOICE,
+    CODEC_ID_WMAPRO,
+    CODEC_ID_WMALOSSLESS,
+    CODEC_ID_ATRAC3P,
+    CODEC_ID_EAC3,
+    CODEC_ID_SIPR,
+    CODEC_ID_MP1,
+    CODEC_ID_TWINVQ,
+    CODEC_ID_TRUEHD,
+    CODEC_ID_MP4ALS,
+    CODEC_ID_ATRAC1,
+    CODEC_ID_BINKAUDIO_RDFT,
+    CODEC_ID_BINKAUDIO_DCT,
+    CODEC_ID_AAC_LATM,
+    CODEC_ID_QDMC,
+    CODEC_ID_CELT,
+    CODEC_ID_G723_1,
+    CODEC_ID_G729,
+    CODEC_ID_8SVX_EXP,
+    CODEC_ID_8SVX_FIB,
+    CODEC_ID_BMV_AUDIO,
+    CODEC_ID_RALF,
+    CODEC_ID_IAC,
+    CODEC_ID_ILBC,
+
+    /* subtitle codecs */
+    CODEC_ID_FIRST_SUBTITLE = 0x17000,          ///< A dummy ID pointing at the start of subtitle codecs.
+    CODEC_ID_DVD_SUBTITLE = 0x17000,
+    CODEC_ID_DVB_SUBTITLE,
+    CODEC_ID_TEXT,  ///< raw UTF-8 text
+    CODEC_ID_XSUB,
+    CODEC_ID_SSA,
+    CODEC_ID_MOV_TEXT,
+    CODEC_ID_HDMV_PGS_SUBTITLE,
+    CODEC_ID_DVB_TELETEXT,
+    CODEC_ID_SRT,
+
+    /* other specific kind of codecs (generally used for attachments) */
+    CODEC_ID_FIRST_UNKNOWN = 0x18000,           ///< A dummy ID pointing at the start of various fake codecs.
+    CODEC_ID_TTF = 0x18000,
+
+    CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it
+
+    CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
+                                * stream (only used by libavformat) */
+    CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
+                                * stream (only used by libavformat) */
+    CODEC_ID_FFMETADATA = 0x21000,   ///< Dummy codec for streams containing only metadata information.
+
+#endif /* AVCODEC_OLD_CODEC_IDS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavcodec/vaapi.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavcodec/vaapi.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavcodec/vaapi.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavcodec/vaapi.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,173 @@
+/*
+ * Video Acceleration API (shared data between Libav and the video player)
+ * HW decode acceleration for MPEG-2, MPEG-4, H.264 and VC-1
+ *
+ * Copyright (C) 2008-2009 Splitted-Desktop Systems
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VAAPI_H
+#define AVCODEC_VAAPI_H
+
+/**
+ * @file
+ * @ingroup lavc_codec_hwaccel_vaapi
+ * Public libavcodec VA API header.
+ */
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavc_codec_hwaccel_vaapi VA API Decoding
+ * @ingroup lavc_codec_hwaccel
+ * @{
+ */
+
+/**
+ * This structure is used to share data between the Libav library and
+ * the client video application.
+ * This shall be zero-allocated and available as
+ * AVCodecContext.hwaccel_context. All user members can be set once
+ * during initialization or through each AVCodecContext.get_buffer()
+ * function call. In any case, they must be valid prior to calling
+ * decoding functions.
+ */
+struct vaapi_context {
+    /**
+     * Window system dependent data
+     *
+     * - encoding: unused
+     * - decoding: Set by user
+     */
+    void *display;
+
+    /**
+     * Configuration ID
+     *
+     * - encoding: unused
+     * - decoding: Set by user
+     */
+    uint32_t config_id;
+
+    /**
+     * Context ID (video decode pipeline)
+     *
+     * - encoding: unused
+     * - decoding: Set by user
+     */
+    uint32_t context_id;
+
+    /**
+     * VAPictureParameterBuffer ID
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    uint32_t pic_param_buf_id;
+
+    /**
+     * VAIQMatrixBuffer ID
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    uint32_t iq_matrix_buf_id;
+
+    /**
+     * VABitPlaneBuffer ID (for VC-1 decoding)
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    uint32_t bitplane_buf_id;
+
+    /**
+     * Slice parameter/data buffer IDs
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    uint32_t *slice_buf_ids;
+
+    /**
+     * Number of effective slice buffer IDs to send to the HW
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    unsigned int n_slice_buf_ids;
+
+    /**
+     * Size of pre-allocated slice_buf_ids
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    unsigned int slice_buf_ids_alloc;
+
+    /**
+     * Pointer to VASliceParameterBuffers
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    void *slice_params;
+
+    /**
+     * Size of a VASliceParameterBuffer element
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    unsigned int slice_param_size;
+
+    /**
+     * Size of pre-allocated slice_params
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    unsigned int slice_params_alloc;
+
+    /**
+     * Number of slices currently filled in
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    unsigned int slice_count;
+
+    /**
+     * Pointer to slice data buffer base
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    const uint8_t *slice_data;
+
+    /**
+     * Current size of slice data
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    uint32_t slice_data_size;
+};
+
+/* @} */
+
+#endif /* AVCODEC_VAAPI_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavcodec/vda.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavcodec/vda.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavcodec/vda.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavcodec/vda.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,217 @@
+/*
+ * VDA HW acceleration
+ *
+ * copyright (c) 2011 Sebastien Zwickert
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VDA_H
+#define AVCODEC_VDA_H
+
+/**
+ * @file
+ * @ingroup lavc_codec_hwaccel_vda
+ * Public libavcodec VDA header.
+ */
+
+#include "libavcodec/version.h"
+
+#if FF_API_VDA_ASYNC
+#include <pthread.h>
+#endif
+
+#include <stdint.h>
+
+// emmintrin.h is unable to compile with -std=c99 -Werror=missing-prototypes
+// http://openradar.appspot.com/8026390
+#undef __GNUC_STDC_INLINE__
+
+#define Picture QuickdrawPicture
+#include <VideoDecodeAcceleration/VDADecoder.h>
+#undef Picture
+
+/**
+ * @defgroup lavc_codec_hwaccel_vda VDA
+ * @ingroup lavc_codec_hwaccel
+ *
+ * @{
+ */
+
+#if FF_API_VDA_ASYNC
+/**
+ * This structure is used to store decoded frame information and data.
+ *
+ * @deprecated Use synchronous decoding mode.
+ */
+typedef struct vda_frame {
+    /**
+     * The PTS of the frame.
+     *
+     * - encoding: unused
+     * - decoding: Set/Unset by libavcodec.
+     */
+    int64_t             pts;
+
+    /**
+     * The CoreVideo buffer that contains the decoded data.
+     *
+     * - encoding: unused
+     * - decoding: Set/Unset by libavcodec.
+     */
+    CVPixelBufferRef    cv_buffer;
+
+    /**
+     * A pointer to the next frame.
+     *
+     * - encoding: unused
+     * - decoding: Set/Unset by libavcodec.
+     */
+    struct vda_frame    *next_frame;
+} vda_frame;
+#endif
+
+/**
+ * This structure is used to provide the necessary configurations and data
+ * to the VDA Libav HWAccel implementation.
+ *
+ * The application must make it available as AVCodecContext.hwaccel_context.
+ */
+struct vda_context {
+    /**
+     * VDA decoder object.
+     *
+     * - encoding: unused
+     * - decoding: Set/Unset by libavcodec.
+     */
+    VDADecoder          decoder;
+
+    /**
+     * The Core Video pixel buffer that contains the current image data.
+     *
+     * encoding: unused
+     * decoding: Set by libavcodec. Unset by user.
+     */
+    CVPixelBufferRef    cv_buffer;
+
+    /**
+     * Use the hardware decoder in synchronous mode.
+     *
+     * encoding: unused
+     * decoding: Set by user.
+     */
+    int                 use_sync_decoding;
+
+#if FF_API_VDA_ASYNC
+    /**
+     * VDA frames queue ordered by presentation timestamp.
+     *
+     * @deprecated Use synchronous decoding mode.
+     *
+     * - encoding: unused
+     * - decoding: Set/Unset by libavcodec.
+     */
+    vda_frame           *queue;
+
+    /**
+     * Mutex for locking queue operations.
+     *
+     * @deprecated Use synchronous decoding mode.
+     *
+     * - encoding: unused
+     * - decoding: Set/Unset by libavcodec.
+     */
+    pthread_mutex_t     queue_mutex;
+#endif
+
+    /**
+     * The frame width.
+     *
+     * - encoding: unused
+     * - decoding: Set/Unset by user.
+     */
+    int                 width;
+
+    /**
+     * The frame height.
+     *
+     * - encoding: unused
+     * - decoding: Set/Unset by user.
+     */
+    int                 height;
+
+    /**
+     * The frame format.
+     *
+     * - encoding: unused
+     * - decoding: Set/Unset by user.
+     */
+    int                 format;
+
+    /**
+     * The pixel format for output image buffers.
+     *
+     * - encoding: unused
+     * - decoding: Set/Unset by user.
+     */
+    OSType              cv_pix_fmt_type;
+
+    /**
+     * The current bitstream buffer.
+     */
+    uint8_t             *priv_bitstream;
+
+    /**
+     * The current size of the bitstream.
+     */
+    int                 priv_bitstream_size;
+
+    /**
+     * The reference size used for fast reallocation.
+     */
+    int                 priv_allocated_size;
+};
+
+/** Create the video decoder. */
+int ff_vda_create_decoder(struct vda_context *vda_ctx,
+                          uint8_t *extradata,
+                          int extradata_size);
+
+/** Destroy the video decoder. */
+int ff_vda_destroy_decoder(struct vda_context *vda_ctx);
+
+#if FF_API_VDA_ASYNC
+/**
+ * Return the top frame of the queue.
+ *
+ * @deprecated Use synchronous decoding mode.
+ */
+vda_frame *ff_vda_queue_pop(struct vda_context *vda_ctx);
+
+/**
+ * Release the given frame.
+ *
+ * @deprecated Use synchronous decoding mode.
+ */
+void ff_vda_release_vda_frame(vda_frame *frame);
+#endif
+
+/**
+ * @}
+ */
+
+#endif /* AVCODEC_VDA_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavcodec/vdpau.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavcodec/vdpau.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavcodec/vdpau.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavcodec/vdpau.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,94 @@
+/*
+ * The Video Decode and Presentation API for UNIX (VDPAU) is used for
+ * hardware-accelerated decoding of MPEG-1/2, H.264 and VC-1.
+ *
+ * Copyright (C) 2008 NVIDIA
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VDPAU_H
+#define AVCODEC_VDPAU_H
+
+/**
+ * @file
+ * @ingroup lavc_codec_hwaccel_vdpau
+ * Public libavcodec VDPAU header.
+ */
+
+
+/**
+ * @defgroup lavc_codec_hwaccel_vdpau VDPAU Decoder and Renderer
+ * @ingroup lavc_codec_hwaccel
+ *
+ * VDPAU hardware acceleration has two modules
+ * - VDPAU decoding
+ * - VDPAU presentation
+ *
+ * The VDPAU decoding module parses all headers using Libav
+ * parsing mechanisms and uses VDPAU for the actual decoding.
+ *
+ * As per the current implementation, the actual decoding
+ * and rendering (API calls) are done as part of the VDPAU
+ * presentation (vo_vdpau.c) module.
+ *
+ * @{
+ */
+
+#include <vdpau/vdpau.h>
+#include <vdpau/vdpau_x11.h>
+
+/** @brief The videoSurface is used for rendering. */
+#define FF_VDPAU_STATE_USED_FOR_RENDER 1
+
+/**
+ * @brief The videoSurface is needed for reference/prediction.
+ * The codec manipulates this.
+ */
+#define FF_VDPAU_STATE_USED_FOR_REFERENCE 2
+
+/**
+ * @brief This structure is used as a callback between the Libav
+ * decoder (vd_) and presentation (vo_) module.
+ * This is used for defining a video frame containing surface,
+ * picture parameter, bitstream information etc which are passed
+ * between the Libav decoder and its clients.
+ */
+struct vdpau_render_state {
+    VdpVideoSurface surface; ///< Used as rendered surface, never changed.
+
+    int state; ///< Holds FF_VDPAU_STATE_* values.
+
+    /** picture parameter information for all supported codecs */
+    union VdpPictureInfo {
+        VdpPictureInfoH264        h264;
+        VdpPictureInfoMPEG1Or2    mpeg;
+        VdpPictureInfoVC1          vc1;
+        VdpPictureInfoMPEG4Part2 mpeg4;
+    } info;
+
+    /** Describe size/location of the compressed video data.
+        Set to 0 when freeing bitstream_buffers. */
+    int bitstream_buffers_allocated;
+    int bitstream_buffers_used;
+    /** The user is responsible for freeing this buffer using av_freep(). */
+    VdpBitstreamBuffer *bitstream_buffers;
+};
+
+/* @}*/
+
+#endif /* AVCODEC_VDPAU_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavcodec/version.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavcodec/version.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavcodec/version.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavcodec/version.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,95 @@
+/*
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VERSION_H
+#define AVCODEC_VERSION_H
+
+/**
+ * @file
+ * @ingroup libavc
+ * Libavcodec version macros.
+ */
+
+#define LIBAVCODEC_VERSION_MAJOR 54
+#define LIBAVCODEC_VERSION_MINOR 35
+#define LIBAVCODEC_VERSION_MICRO  0
+
+#define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
+                                               LIBAVCODEC_VERSION_MINOR, \
+                                               LIBAVCODEC_VERSION_MICRO)
+#define LIBAVCODEC_VERSION      AV_VERSION(LIBAVCODEC_VERSION_MAJOR,    \
+                                           LIBAVCODEC_VERSION_MINOR,    \
+                                           LIBAVCODEC_VERSION_MICRO)
+#define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
+
+#define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
+
+/**
+ * FF_API_* defines may be placed below to indicate public API that will be
+ * dropped at a future version bump. The defines themselves are not part of
+ * the public API and may change, break or disappear at any time.
+ */
+
+#ifndef FF_API_REQUEST_CHANNELS
+#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_OLD_DECODE_AUDIO
+#define FF_API_OLD_DECODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_OLD_ENCODE_AUDIO
+#define FF_API_OLD_ENCODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_OLD_ENCODE_VIDEO
+#define FF_API_OLD_ENCODE_VIDEO (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_MPV_GLOBAL_OPTS
+#define FF_API_MPV_GLOBAL_OPTS  (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_COLOR_TABLE_ID
+#define FF_API_COLOR_TABLE_ID   (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_INTER_THRESHOLD
+#define FF_API_INTER_THRESHOLD  (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_SUB_ID
+#define FF_API_SUB_ID           (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_DSP_MASK
+#define FF_API_DSP_MASK         (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_FIND_BEST_PIX_FMT
+#define FF_API_FIND_BEST_PIX_FMT (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_CODEC_ID
+#define FF_API_CODEC_ID          (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_VDA_ASYNC
+#define FF_API_VDA_ASYNC         (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_AVCODEC_RESAMPLE
+#define FF_API_AVCODEC_RESAMPLE  (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_LIBMPEG2
+#define FF_API_LIBMPEG2          (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_MMI
+#define FF_API_MMI               (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+
+#endif /* AVCODEC_VERSION_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavcodec/xvmc.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavcodec/xvmc.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavcodec/xvmc.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavcodec/xvmc.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2003 Ivan Kalvachev
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_XVMC_H
+#define AVCODEC_XVMC_H
+
+/**
+ * @file
+ * @ingroup lavc_codec_hwaccel_xvmc
+ * Public libavcodec XvMC header.
+ */
+
+#include <X11/extensions/XvMC.h>
+
+#include "avcodec.h"
+
+/**
+ * @defgroup lavc_codec_hwaccel_xvmc XvMC
+ * @ingroup lavc_codec_hwaccel
+ *
+ * @{
+ */
+
+#define AV_XVMC_ID                    0x1DC711C0  /**< special value to ensure that regular pixel routines haven't corrupted the struct
+                                                       the number is 1337 speak for the letters IDCT MCo (motion compensation) */
+
+struct xvmc_pix_fmt {
+    /** The field contains the special constant value AV_XVMC_ID.
+        It is used as a test that the application correctly uses the API,
+        and that there is no corruption caused by pixel routines.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             xvmc_id;
+
+    /** Pointer to the block array allocated by XvMCCreateBlocks().
+        The array has to be freed by XvMCDestroyBlocks().
+        Each group of 64 values represents one data block of differential
+        pixel information (in MoCo mode) or coefficients for IDCT.
+        - application - set the pointer during initialization
+        - libavcodec  - fills coefficients/pixel data into the array
+    */
+    short*          data_blocks;
+
+    /** Pointer to the macroblock description array allocated by
+        XvMCCreateMacroBlocks() and freed by XvMCDestroyMacroBlocks().
+        - application - set the pointer during initialization
+        - libavcodec  - fills description data into the array
+    */
+    XvMCMacroBlock* mv_blocks;
+
+    /** Number of macroblock descriptions that can be stored in the mv_blocks
+        array.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             allocated_mv_blocks;
+
+    /** Number of blocks that can be stored at once in the data_blocks array.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             allocated_data_blocks;
+
+    /** Indicate that the hardware would interpret data_blocks as IDCT
+        coefficients and perform IDCT on them.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             idct;
+
+    /** In MoCo mode it indicates that intra macroblocks are assumed to be in
+        unsigned format; same as the XVMC_INTRA_UNSIGNED flag.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             unsigned_intra;
+
+    /** Pointer to the surface allocated by XvMCCreateSurface().
+        It has to be freed by XvMCDestroySurface() on application exit.
+        It identifies the frame and its state on the video hardware.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    XvMCSurface*    p_surface;
+
+/** Set by the decoder before calling ff_draw_horiz_band(),
+    needed by the XvMCRenderSurface function. */
+//@{
+    /** Pointer to the surface used as past reference
+        - application - unchanged
+        - libavcodec  - set
+    */
+    XvMCSurface*    p_past_surface;
+
+    /** Pointer to the surface used as future reference
+        - application - unchanged
+        - libavcodec  - set
+    */
+    XvMCSurface*    p_future_surface;
+
+    /** top/bottom field or frame
+        - application - unchanged
+        - libavcodec  - set
+    */
+    unsigned int    picture_structure;
+
+    /** XVMC_SECOND_FIELD - 1st or 2nd field in the sequence
+        - application - unchanged
+        - libavcodec  - set
+    */
+    unsigned int    flags;
+//}@
+
+    /** Number of macroblock descriptions in the mv_blocks array
+        that have already been passed to the hardware.
+        - application - zeroes it on get_buffer().
+                        A successful ff_draw_horiz_band() may increment it
+                        with filled_mb_block_num or zero both.
+        - libavcodec  - unchanged
+    */
+    int             start_mv_blocks_num;
+
+    /** Number of new macroblock descriptions in the mv_blocks array (after
+        start_mv_blocks_num) that are filled by libavcodec and have to be
+        passed to the hardware.
+        - application - zeroes it on get_buffer() or after successful
+                        ff_draw_horiz_band().
+        - libavcodec  - increment with one of each stored MB
+    */
+    int             filled_mv_blocks_num;
+
+    /** Number of the next free data block; one data block consists of
+        64 short values in the data_blocks array.
+        All blocks before this one have already been claimed by placing their
+        position into the corresponding block description structure field,
+        that are part of the mv_blocks array.
+        - application - zeroes it on get_buffer().
+                        A successful ff_draw_horiz_band() may zero it together
+                        with start_mb_blocks_num.
+        - libavcodec  - each decoded macroblock increases it by the number
+                        of coded blocks it contains.
+    */
+    int             next_free_data_block_num;
+};
+
+/**
+ * @}
+ */
+
+#endif /* AVCODEC_XVMC_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavformat/avformat.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavformat/avformat.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavformat/avformat.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavformat/avformat.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,1749 @@
+/*
+ * copyright (c) 2001 Fabrice Bellard
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFORMAT_AVFORMAT_H
+#define AVFORMAT_AVFORMAT_H
+
+/**
+ * @file
+ * @ingroup libavf
+ * Main libavformat public API header
+ */
+
+/**
+ * @defgroup libavf I/O and Muxing/Demuxing Library
+ * @{
+ *
+ * Libavformat (lavf) is a library for dealing with various media container
+ * formats. Its main two purposes are demuxing - i.e. splitting a media file
+ * into component streams, and the reverse process of muxing - writing supplied
+ * data in a specified container format. It also has an @ref lavf_io
+ * "I/O module" which supports a number of protocols for accessing the data (e.g.
+ * file, tcp, http and others). Before using lavf, you need to call
+ * av_register_all() to register all compiled muxers, demuxers and protocols.
+ * Unless you are absolutely sure you won't use libavformat's network
+ * capabilities, you should also call avformat_network_init().
+ *
+ * A supported input format is described by an AVInputFormat struct, conversely
+ * an output format is described by AVOutputFormat. You can iterate over all
+ * registered input/output formats using the av_iformat_next() /
+ * av_oformat_next() functions. The protocols layer is not part of the public
+ * API, so you can only get the names of supported protocols with the
+ * avio_enum_protocols() function.
+ *
+ * Main lavf structure used for both muxing and demuxing is AVFormatContext,
+ * which exports all information about the file being read or written. As with
+ * most Libav structures, its size is not part of public ABI, so it cannot be
+ * allocated on stack or directly with av_malloc(). To create an
+ * AVFormatContext, use avformat_alloc_context() (some functions, like
+ * avformat_open_input() might do that for you).
+ *
+ * Most importantly an AVFormatContext contains:
+ * @li the @ref AVFormatContext.iformat "input" or @ref AVFormatContext.oformat
+ * "output" format. It is either autodetected or set by user for input;
+ * always set by user for output.
+ * @li an @ref AVFormatContext.streams "array" of AVStreams, which describe all
+ * elementary streams stored in the file. AVStreams are typically referred to
+ * using their index in this array.
+ * @li an @ref AVFormatContext.pb "I/O context". It is either opened by lavf or
+ * set by user for input, always set by user for output (unless you are dealing
+ * with an AVFMT_NOFILE format).
+ *
+ * @section lavf_options Passing options to (de)muxers
+ * Lavf allows to configure muxers and demuxers using the @ref avoptions
+ * mechanism. Generic (format-independent) libavformat options are provided by
+ * AVFormatContext, they can be examined from a user program by calling
+ * av_opt_next() / av_opt_find() on an allocated AVFormatContext (or its AVClass
+ * from avformat_get_class()). Private (format-specific) options are provided by
+ * AVFormatContext.priv_data if and only if AVInputFormat.priv_class /
+ * AVOutputFormat.priv_class of the corresponding format struct is non-NULL.
+ * Further options may be provided by the @ref AVFormatContext.pb "I/O context",
+ * if its AVClass is non-NULL, and the protocols layer. See the discussion on
+ * nesting in @ref avoptions documentation to learn how to access those.
+ *
+ * @defgroup lavf_decoding Demuxing
+ * @{
+ * Demuxers read a media file and split it into chunks of data (@em packets). A
+ * @ref AVPacket "packet" contains one or more encoded frames which belongs to a
+ * single elementary stream. In the lavf API this process is represented by the
+ * avformat_open_input() function for opening a file, av_read_frame() for
+ * reading a single packet and finally avformat_close_input(), which does the
+ * cleanup.
+ *
+ * @section lavf_decoding_open Opening a media file
+ * The minimum information required to open a file is its URL or filename, which
+ * is passed to avformat_open_input(), as in the following code:
+ * @code
+ * const char    *url = "in.mp3";
+ * AVFormatContext *s = NULL;
+ * int ret = avformat_open_input(&s, url, NULL, NULL);
+ * if (ret < 0)
+ *     abort();
+ * @endcode
+ * The above code attempts to allocate an AVFormatContext, open the
+ * specified file (autodetecting the format) and read the header, exporting the
+ * information stored there into s. Some formats do not have a header or do not
+ * store enough information there, so it is recommended that you call the
+ * avformat_find_stream_info() function which tries to read and decode a few
+ * frames to find missing information.
+ *
+ * In some cases you might want to preallocate an AVFormatContext yourself with
+ * avformat_alloc_context() and do some tweaking on it before passing it to
+ * avformat_open_input(). One such case is when you want to use custom functions
+ * for reading input data instead of lavf internal I/O layer.
+ * To do that, create your own AVIOContext with avio_alloc_context(), passing
+ * your reading callbacks to it. Then set the @em pb field of your
+ * AVFormatContext to newly created AVIOContext.
+ *
+ * Since the format of the opened file is in general not known until after
+ * avformat_open_input() has returned, it is not possible to set demuxer private
+ * options on a preallocated context. Instead, the options should be passed to
+ * avformat_open_input() wrapped in an AVDictionary:
+ * @code
+ * AVDictionary *options = NULL;
+ * av_dict_set(&options, "video_size", "640x480", 0);
+ * av_dict_set(&options, "pixel_format", "rgb24", 0);
+ *
+ * if (avformat_open_input(&s, url, NULL, &options) < 0)
+ *     abort();
+ * av_dict_free(&options);
+ * @endcode
+ * This code passes the private options 'video_size' and 'pixel_format' to the
+ * demuxer. They would be necessary for e.g. the rawvideo demuxer, since it
+ * cannot know how to interpret raw video data otherwise. If the format turns
+ * out to be something different than raw video, those options will not be
+ * recognized by the demuxer and therefore will not be applied. Such unrecognized
+ * options are then returned in the options dictionary (recognized options are
+ * consumed). The calling program can handle such unrecognized options as it
+ * wishes, e.g.
+ * @code
+ * AVDictionaryEntry *e;
+ * if (e = av_dict_get(options, "", NULL, AV_DICT_IGNORE_SUFFIX)) {
+ *     fprintf(stderr, "Option %s not recognized by the demuxer.\n", e->key);
+ *     abort();
+ * }
+ * @endcode
+ *
+ * After you have finished reading the file, you must close it with
+ * avformat_close_input(). It will free everything associated with the file.
+ *
+ * @section lavf_decoding_read Reading from an opened file
+ * Reading data from an opened AVFormatContext is done by repeatedly calling
+ * av_read_frame() on it. Each call, if successful, will return an AVPacket
+ * containing encoded data for one AVStream, identified by
+ * AVPacket.stream_index. This packet may be passed straight into the libavcodec
+ * decoding functions avcodec_decode_video2(), avcodec_decode_audio4() or
+ * avcodec_decode_subtitle2() if the caller wishes to decode the data.
+ *
+ * AVPacket.pts, AVPacket.dts and AVPacket.duration timing information will be
+ * set if known. They may also be unset (i.e. AV_NOPTS_VALUE for
+ * pts/dts, 0 for duration) if the stream does not provide them. The timing
+ * information will be in AVStream.time_base units, i.e. it has to be
+ * multiplied by the timebase to convert them to seconds.
+ *
+ * If AVPacket.destruct is set on the returned packet, then the packet is
+ * allocated dynamically and the user may keep it indefinitely.
+ * Otherwise, if AVPacket.destruct is NULL, the packet data is backed by a
+ * static storage somewhere inside the demuxer and the packet is only valid
+ * until the next av_read_frame() call or closing the file. If the caller
+ * requires a longer lifetime, av_dup_packet() will make an av_malloc()ed copy
+ * of it.
+ * In both cases, the packet must be freed with av_free_packet() when it is no
+ * longer needed.
+ *
+ * @section lavf_decoding_seek Seeking
+ * @}
+ *
+ * @defgroup lavf_encoding Muxing
+ * @{
+ * @}
+ *
+ * @defgroup lavf_io I/O Read/Write
+ * @{
+ * @}
+ *
+ * @defgroup lavf_codec Demuxers
+ * @{
+ * @defgroup lavf_codec_native Native Demuxers
+ * @{
+ * @}
+ * @defgroup lavf_codec_wrappers External library wrappers
+ * @{
+ * @}
+ * @}
+ * @defgroup lavf_protos I/O Protocols
+ * @{
+ * @}
+ * @defgroup lavf_internal Internal
+ * @{
+ * @}
+ * @}
+ *
+ */
+
+#include <time.h>
+#include <stdio.h>  /* FILE */
+#include "libavcodec/avcodec.h"
+#include "libavutil/dict.h"
+#include "libavutil/log.h"
+
+#include "avio.h"
+#include "libavformat/version.h"
+
+#if FF_API_AV_GETTIME
+#include "libavutil/time.h"
+#endif
+
+struct AVFormatContext;
+
+
+/**
+ * @defgroup metadata_api Public Metadata API
+ * @{
+ * @ingroup libavf
+ * The metadata API allows libavformat to export metadata tags to a client
+ * application when demuxing. Conversely it allows a client application to
+ * set metadata when muxing.
+ *
+ * Metadata is exported or set as pairs of key/value strings in the 'metadata'
+ * fields of the AVFormatContext, AVStream, AVChapter and AVProgram structs
+ * using the @ref lavu_dict "AVDictionary" API. Like all strings in Libav,
+ * metadata is assumed to be UTF-8 encoded Unicode. Note that metadata
+ * exported by demuxers isn't checked to be valid UTF-8 in most cases.
+ *
+ * Important concepts to keep in mind:
+ * -  Keys are unique; there can never be 2 tags with the same key. This is
+ *    also meant semantically, i.e., a demuxer should not knowingly produce
+ *    several keys that are literally different but semantically identical.
+ *    E.g., key=Author5, key=Author6. In this example, all authors must be
+ *    placed in the same tag.
+ * -  Metadata is flat, not hierarchical; there are no subtags. If you
+ *    want to store, e.g., the email address of the child of producer Alice
+ *    and actor Bob, that could have key=alice_and_bobs_childs_email_address.
+ * -  Several modifiers can be applied to the tag name. This is done by
+ *    appending a dash character ('-') and the modifier name in the order
+ *    they appear in the list below -- e.g. foo-eng-sort, not foo-sort-eng.
+ *    -  language -- a tag whose value is localized for a particular language
+ *       is appended with the ISO 639-2/B 3-letter language code.
+ *       For example: Author-ger=Michael, Author-eng=Mike
+ *       The original/default language is in the unqualified "Author" tag.
+ *       A demuxer should set a default if it sets any translated tag.
+ *    -  sorting  -- a modified version of a tag that should be used for
+ *       sorting will have '-sort' appended. E.g. artist="The Beatles",
+ *       artist-sort="Beatles, The".
+ *
+ * -  Demuxers attempt to export metadata in a generic format, however tags
+ *    with no generic equivalents are left as they are stored in the container.
+ *    Follows a list of generic tag names:
+ *
+ @verbatim
+ album        -- name of the set this work belongs to
+ album_artist -- main creator of the set/album, if different from artist.
+                 e.g. "Various Artists" for compilation albums.
+ artist       -- main creator of the work
+ comment      -- any additional description of the file.
+ composer     -- who composed the work, if different from artist.
+ copyright    -- name of copyright holder.
+ creation_time-- date when the file was created, preferably in ISO 8601.
+ date         -- date when the work was created, preferably in ISO 8601.
+ disc         -- number of a subset, e.g. disc in a multi-disc collection.
+ encoder      -- name/settings of the software/hardware that produced the file.
+ encoded_by   -- person/group who created the file.
+ filename     -- original name of the file.
+ genre        -- <self-evident>.
+ language     -- main language in which the work is performed, preferably
+                 in ISO 639-2 format. Multiple languages can be specified by
+                 separating them with commas.
+ performer    -- artist who performed the work, if different from artist.
+                 E.g for "Also sprach Zarathustra", artist would be "Richard
+                 Strauss" and performer "London Philharmonic Orchestra".
+ publisher    -- name of the label/publisher.
+ service_name     -- name of the service in broadcasting (channel name).
+ service_provider -- name of the service provider in broadcasting.
+ title        -- name of the work.
+ track        -- number of this work in the set, can be in form current/total.
+ variant_bitrate -- the total bitrate of the bitrate variant that the current stream is part of
+ @endverbatim
+ *
+ * Look in the examples section for an application example how to use the Metadata API.
+ *
+ * @}
+ */
+
+/* packet functions */
+
+
+/**
+ * Allocate and read the payload of a packet and initialize its
+ * fields with default values.
+ *
+ * @param pkt packet
+ * @param size desired payload size
+ * @return >0 (read size) if OK, AVERROR_xxx otherwise
+ */
+int av_get_packet(AVIOContext *s, AVPacket *pkt, int size);
+
+
+/**
+ * Read data and append it to the current content of the AVPacket.
+ * If pkt->size is 0 this is identical to av_get_packet.
+ * Note that this uses av_grow_packet and thus involves a realloc
+ * which is inefficient. Thus this function should only be used
+ * when there is no reasonable way to know (an upper bound of)
+ * the final size.
+ *
+ * @param pkt packet
+ * @param size amount of data to read
+ * @return >0 (read size) if OK, AVERROR_xxx otherwise, previous data
+ *         will not be lost even if an error occurs.
+ */
+int av_append_packet(AVIOContext *s, AVPacket *pkt, int size);
+
+/*************************************************/
+/* fractional numbers for exact pts handling */
+
+/**
+ * The exact value of the fractional number is: 'val + num / den'.
+ * num is assumed to be 0 <= num < den.
+ */
+typedef struct AVFrac {
+    int64_t val, num, den;
+} AVFrac;
+
+/*************************************************/
+/* input/output formats */
+
+struct AVCodecTag;
+
+/**
+ * This structure contains the data a format has to probe a file.
+ */
+typedef struct AVProbeData {
+    const char *filename;
+    unsigned char *buf; /**< Buffer must have AVPROBE_PADDING_SIZE of extra allocated bytes filled with zero. */
+    int buf_size;       /**< Size of buf except extra allocated bytes */
+} AVProbeData;
+
+#define AVPROBE_SCORE_MAX 100               ///< maximum score, half of that is used for file-extension-based detection
+#define AVPROBE_PADDING_SIZE 32             ///< extra allocated bytes at the end of the probe buffer
+
+/// Demuxer will use avio_open, no opened file should be provided by the caller.
+#define AVFMT_NOFILE        0x0001
+#define AVFMT_NEEDNUMBER    0x0002 /**< Needs '%d' in filename. */
+#define AVFMT_SHOW_IDS      0x0008 /**< Show format stream IDs numbers. */
+#define AVFMT_RAWPICTURE    0x0020 /**< Format wants AVPicture structure for
+                                      raw picture data. */
+#define AVFMT_GLOBALHEADER  0x0040 /**< Format wants global header. */
+#define AVFMT_NOTIMESTAMPS  0x0080 /**< Format does not need / have any timestamps. */
+#define AVFMT_GENERIC_INDEX 0x0100 /**< Use generic index building code. */
+#define AVFMT_TS_DISCONT    0x0200 /**< Format allows timestamp discontinuities. Note, muxers always require valid (monotone) timestamps */
+#define AVFMT_VARIABLE_FPS  0x0400 /**< Format allows variable fps. */
+#define AVFMT_NODIMENSIONS  0x0800 /**< Format does not need width/height */
+#define AVFMT_NOSTREAMS     0x1000 /**< Format does not require any streams */
+#define AVFMT_NOBINSEARCH   0x2000 /**< Format does not allow to fallback to binary search via read_timestamp */
+#define AVFMT_NOGENSEARCH   0x4000 /**< Format does not allow to fallback to generic search */
+#define AVFMT_NO_BYTE_SEEK  0x8000 /**< Format does not allow seeking by bytes */
+#define AVFMT_ALLOW_FLUSH  0x10000 /**< Format allows flushing. If not set, the muxer will not receive a NULL packet in the write_packet function. */
+#define AVFMT_TS_NONSTRICT 0x20000 /**< Format does not require strictly
+                                        increasing timestamps, but they must
+                                        still be monotonic */
+
+/**
+ * @addtogroup lavf_encoding
+ * @{
+ */
+typedef struct AVOutputFormat {
+    const char *name;
+    /**
+     * Descriptive name for the format, meant to be more human-readable
+     * than name. You should use the NULL_IF_CONFIG_SMALL() macro
+     * to define it.
+     */
+    const char *long_name;
+    const char *mime_type;
+    const char *extensions; /**< comma-separated filename extensions */
+    /* output support */
+    enum AVCodecID audio_codec;    /**< default audio codec */
+    enum AVCodecID video_codec;    /**< default video codec */
+    enum AVCodecID subtitle_codec; /**< default subtitle codec */
+    /**
+     * can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_RAWPICTURE,
+     * AVFMT_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS,
+     * AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS, AVFMT_ALLOW_FLUSH,
+     * AVFMT_TS_NONSTRICT
+     */
+    int flags;
+
+    /**
+     * List of supported codec_id-codec_tag pairs, ordered by "better
+     * choice first". The arrays are all terminated by AV_CODEC_ID_NONE.
+     */
+    const struct AVCodecTag * const *codec_tag;
+
+
+    const AVClass *priv_class; ///< AVClass for the private context
+
+    /*****************************************************************
+     * No fields below this line are part of the public API. They
+     * may not be used outside of libavformat and can be changed and
+     * removed at will.
+     * New public fields should be added right above.
+     *****************************************************************
+     */
+    struct AVOutputFormat *next;
+    /**
+     * size of private data so that it can be allocated in the wrapper
+     */
+    int priv_data_size;
+
+    int (*write_header)(struct AVFormatContext *);
+    /**
+     * Write a packet. If AVFMT_ALLOW_FLUSH is set in flags,
+     * pkt can be NULL in order to flush data buffered in the muxer.
+     * When flushing, return 0 if there still is more data to flush,
+     * or 1 if everything was flushed and there is no more buffered
+     * data.
+     */
+    int (*write_packet)(struct AVFormatContext *, AVPacket *pkt);
+    int (*write_trailer)(struct AVFormatContext *);
+    /**
+     * Currently only used to set pixel format if not YUV420P.
+     */
+    int (*interleave_packet)(struct AVFormatContext *, AVPacket *out,
+                             AVPacket *in, int flush);
+    /**
+     * Test if the given codec can be stored in this container.
+     *
+     * @return 1 if the codec is supported, 0 if it is not.
+     *         A negative number if unknown.
+     */
+    int (*query_codec)(enum AVCodecID id, int std_compliance);
+} AVOutputFormat;
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup lavf_decoding
+ * @{
+ */
+typedef struct AVInputFormat {
+    /**
+     * A comma separated list of short names for the format. New names
+     * may be appended with a minor bump.
+     */
+    const char *name;
+
+    /**
+     * Descriptive name for the format, meant to be more human-readable
+     * than name. You should use the NULL_IF_CONFIG_SMALL() macro
+     * to define it.
+     */
+    const char *long_name;
+
+    /**
+     * Can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_SHOW_IDS,
+     * AVFMT_GENERIC_INDEX, AVFMT_TS_DISCONT, AVFMT_NOBINSEARCH,
+     * AVFMT_NOGENSEARCH, AVFMT_NO_BYTE_SEEK.
+     */
+    int flags;
+
+    /**
+     * If extensions are defined, then no probe is done. You should
+     * usually not use extension format guessing because it is not
+     * reliable enough
+     */
+    const char *extensions;
+
+    const struct AVCodecTag * const *codec_tag;
+
+    const AVClass *priv_class; ///< AVClass for the private context
+
+    /*****************************************************************
+     * No fields below this line are part of the public API. They
+     * may not be used outside of libavformat and can be changed and
+     * removed at will.
+     * New public fields should be added right above.
+     *****************************************************************
+     */
+    struct AVInputFormat *next;
+
+    /**
+     * Raw demuxers store their codec ID here.
+     */
+    int raw_codec_id;
+
+    /**
+     * Size of private data so that it can be allocated in the wrapper.
+     */
+    int priv_data_size;
+
+    /**
+     * Tell if a given file has a chance of being parsed as this format.
+     * The buffer provided is guaranteed to be AVPROBE_PADDING_SIZE bytes
+     * big so you do not have to check for that unless you need more.
+     */
+    int (*read_probe)(AVProbeData *);
+
+    /**
+     * Read the format header and initialize the AVFormatContext
+     * structure. Return 0 if OK. Only used in raw format right
+     * now. 'avformat_new_stream' should be called to create new streams.
+     */
+    int (*read_header)(struct AVFormatContext *);
+
+    /**
+     * Read one packet and put it in 'pkt'. pts and flags are also
+     * set. 'avformat_new_stream' can be called only if the flag
+     * AVFMTCTX_NOHEADER is used and only in the calling thread (not in a
+     * background thread).
+     * @return 0 on success, < 0 on error.
+     *         When returning an error, pkt must not have been allocated
+     *         or must be freed before returning
+     */
+    int (*read_packet)(struct AVFormatContext *, AVPacket *pkt);
+
+    /**
+     * Close the stream. The AVFormatContext and AVStreams are not
+     * freed by this function
+     */
+    int (*read_close)(struct AVFormatContext *);
+
+    /**
+     * Seek to a given timestamp relative to the frames in
+     * stream component stream_index.
+     * @param stream_index Must not be -1.
+     * @param flags Selects which direction should be preferred if no exact
+     *              match is available.
+     * @return >= 0 on success (but not necessarily the new offset)
+     */
+    int (*read_seek)(struct AVFormatContext *,
+                     int stream_index, int64_t timestamp, int flags);
+
+    /**
+     * Get the next timestamp in stream[stream_index].time_base units.
+     * @return the timestamp or AV_NOPTS_VALUE if an error occurred
+     */
+    int64_t (*read_timestamp)(struct AVFormatContext *s, int stream_index,
+                              int64_t *pos, int64_t pos_limit);
+
+    /**
+     * Start/resume playing - only meaningful if using a network-based format
+     * (RTSP).
+     */
+    int (*read_play)(struct AVFormatContext *);
+
+    /**
+     * Pause playing - only meaningful if using a network-based format
+     * (RTSP).
+     */
+    int (*read_pause)(struct AVFormatContext *);
+
+    /**
+     * Seek to timestamp ts.
+     * Seeking will be done so that the point from which all active streams
+     * can be presented successfully will be closest to ts and within min/max_ts.
+     * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
+     */
+    int (*read_seek2)(struct AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
+} AVInputFormat;
+/**
+ * @}
+ */
+
+enum AVStreamParseType {
+    AVSTREAM_PARSE_NONE,
+    AVSTREAM_PARSE_FULL,       /**< full parsing and repack */
+    AVSTREAM_PARSE_HEADERS,    /**< Only parse headers, do not repack. */
+    AVSTREAM_PARSE_TIMESTAMPS, /**< full parsing and interpolation of timestamps for frames not starting on a packet boundary */
+    AVSTREAM_PARSE_FULL_ONCE,  /**< full parsing and repack of the first frame only, only implemented for H.264 currently */
+};
+
+typedef struct AVIndexEntry {
+    int64_t pos;
+    int64_t timestamp;
+#define AVINDEX_KEYFRAME 0x0001
+    int flags:2;
+    int size:30; //Yeah, trying to keep the size of this small to reduce memory requirements (it is 24 vs. 32 bytes due to possible 8-byte alignment).
+    int min_distance;         /**< Minimum distance between this and the previous keyframe, used to avoid unneeded searching. */
+} AVIndexEntry;
+
+#define AV_DISPOSITION_DEFAULT   0x0001
+#define AV_DISPOSITION_DUB       0x0002
+#define AV_DISPOSITION_ORIGINAL  0x0004
+#define AV_DISPOSITION_COMMENT   0x0008
+#define AV_DISPOSITION_LYRICS    0x0010
+#define AV_DISPOSITION_KARAOKE   0x0020
+
+/**
+ * Track should be used during playback by default.
+ * Useful for subtitle track that should be displayed
+ * even when user did not explicitly ask for subtitles.
+ */
+#define AV_DISPOSITION_FORCED    0x0040
+#define AV_DISPOSITION_HEARING_IMPAIRED  0x0080  /**< stream for hearing impaired audiences */
+#define AV_DISPOSITION_VISUAL_IMPAIRED   0x0100  /**< stream for visual impaired audiences */
+#define AV_DISPOSITION_CLEAN_EFFECTS     0x0200  /**< stream without voice */
+/**
+ * The stream is stored in the file as an attached picture/"cover art" (e.g.
+ * APIC frame in ID3v2). The single packet associated with it will be returned
+ * among the first few packets read from the file unless seeking takes place.
+ * It can also be accessed at any time in AVStream.attached_pic.
+ */
+#define AV_DISPOSITION_ATTACHED_PIC      0x0400
+
+/**
+ * Stream structure.
+ * New fields can be added to the end with minor version bumps.
+ * Removal, reordering and changes to existing fields require a major
+ * version bump.
+ * sizeof(AVStream) must not be used outside libav*.
+ */
+typedef struct AVStream {
+    int index;    /**< stream index in AVFormatContext */
+    /**
+     * Format-specific stream ID.
+     * decoding: set by libavformat
+     * encoding: set by the user, replaced by libavformat if left unset
+     */
+    int id;
+    /**
+     * Codec context associated with this stream. Allocated and freed by
+     * libavformat.
+     *
+     * - decoding: The demuxer exports codec information stored in the headers
+     *             here.
+     * - encoding: The user sets codec information, the muxer writes it to the
+     *             output. Mandatory fields as specified in AVCodecContext
+     *             documentation must be set even if this AVCodecContext is
+     *             not actually used for encoding.
+     */
+    AVCodecContext *codec;
+#if FF_API_R_FRAME_RATE
+    /**
+     * Real base framerate of the stream.
+     * This is the lowest framerate with which all timestamps can be
+     * represented accurately (it is the least common multiple of all
+     * framerates in the stream). Note, this value is just a guess!
+     * For example, if the time base is 1/90000 and all frames have either
+     * approximately 3600 or 1800 timer ticks, then r_frame_rate will be 50/1.
+     */
+    AVRational r_frame_rate;
+#endif
+    void *priv_data;
+
+    /**
+     * encoding: pts generation when outputting stream
+     */
+    struct AVFrac pts;
+
+    /**
+     * This is the fundamental unit of time (in seconds) in terms
+     * of which frame timestamps are represented.
+     *
+     * decoding: set by libavformat
+     * encoding: set by libavformat in avformat_write_header. The muxer may use the
+     * user-provided value of @ref AVCodecContext.time_base "codec->time_base"
+     * as a hint.
+     */
+    AVRational time_base;
+
+    /**
+     * Decoding: pts of the first frame of the stream, in stream time base.
+     * Only set this if you are absolutely 100% sure that the value you set
+     * it to really is the pts of the first frame.
+     * This may be undefined (AV_NOPTS_VALUE).
+     */
+    int64_t start_time;
+
+    /**
+     * Decoding: duration of the stream, in stream time base.
+     * If a source file does not specify a duration, but does specify
+     * a bitrate, this value will be estimated from bitrate and file size.
+     */
+    int64_t duration;
+
+    int64_t nb_frames;                 ///< number of frames in this stream if known or 0
+
+    int disposition; /**< AV_DISPOSITION_* bit field */
+
+    enum AVDiscard discard; ///< Selects which packets can be discarded at will and do not need to be demuxed.
+
+    /**
+     * sample aspect ratio (0 if unknown)
+     * - encoding: Set by user.
+     * - decoding: Set by libavformat.
+     */
+    AVRational sample_aspect_ratio;
+
+    AVDictionary *metadata;
+
+    /**
+     * Average framerate
+     */
+    AVRational avg_frame_rate;
+
+    /**
+     * For streams with AV_DISPOSITION_ATTACHED_PIC disposition, this packet
+     * will contain the attached picture.
+     *
+     * decoding: set by libavformat, must not be modified by the caller.
+     * encoding: unused
+     */
+    AVPacket attached_pic;
+
+    /*****************************************************************
+     * All fields below this line are not part of the public API. They
+     * may not be used outside of libavformat and can be changed and
+     * removed at will.
+     * New public fields should be added right above.
+     *****************************************************************
+     */
+
+    /**
+     * Stream information used internally by av_find_stream_info()
+     */
+#define MAX_STD_TIMEBASES (60*12+5)
+    struct {
+#if FF_API_R_FRAME_RATE
+        int64_t last_dts;
+        int64_t duration_gcd;
+        int duration_count;
+        double duration_error[MAX_STD_TIMEBASES];
+#endif
+        int nb_decoded_frames;
+        int found_decoder;
+
+        /**
+         * Those are used for average framerate estimation.
+         */
+        int64_t fps_first_dts;
+        int     fps_first_dts_idx;
+        int64_t fps_last_dts;
+        int     fps_last_dts_idx;
+
+    } *info;
+
+    int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
+
+    // Timestamp generation support:
+    /**
+     * Timestamp corresponding to the last dts sync point.
+     *
+     * Initialized when AVCodecParserContext.dts_sync_point >= 0 and
+     * a DTS is received from the underlying container. Otherwise set to
+     * AV_NOPTS_VALUE by default.
+     */
+    int64_t reference_dts;
+    int64_t first_dts;
+    int64_t cur_dts;
+    int64_t last_IP_pts;
+    int last_IP_duration;
+
+    /**
+     * Number of packets to buffer for codec probing
+     */
+#define MAX_PROBE_PACKETS 2500
+    int probe_packets;
+
+    /**
+     * Number of frames that have been demuxed during av_find_stream_info()
+     */
+    int codec_info_nb_frames;
+
+    /* av_read_frame() support */
+    enum AVStreamParseType need_parsing;
+    struct AVCodecParserContext *parser;
+
+    /**
+     * last packet in packet_buffer for this stream when muxing.
+     */
+    struct AVPacketList *last_in_packet_buffer;
+    AVProbeData probe_data;
+#define MAX_REORDER_DELAY 16
+    int64_t pts_buffer[MAX_REORDER_DELAY+1];
+
+    AVIndexEntry *index_entries; /**< Only used if the format does not
+                                    support seeking natively. */
+    int nb_index_entries;
+    unsigned int index_entries_allocated_size;
+} AVStream;
+
+#define AV_PROGRAM_RUNNING 1
+
+/**
+ * New fields can be added to the end with minor version bumps.
+ * Removal, reordering and changes to existing fields require a major
+ * version bump.
+ * sizeof(AVProgram) must not be used outside libav*.
+ */
+typedef struct AVProgram {
+    int            id;
+    int            flags;
+    enum AVDiscard discard;        ///< selects which program to discard and which to feed to the caller
+    unsigned int   *stream_index;
+    unsigned int   nb_stream_indexes;
+    AVDictionary *metadata;
+} AVProgram;
+
+#define AVFMTCTX_NOHEADER      0x0001 /**< signal that no header is present
+                                         (streams are added dynamically) */
+
+typedef struct AVChapter {
+    int id;                 ///< unique ID to identify the chapter
+    AVRational time_base;   ///< time base in which the start/end timestamps are specified
+    int64_t start, end;     ///< chapter start/end time in time_base units
+    AVDictionary *metadata;
+} AVChapter;
+
+/**
+ * Format I/O context.
+ * New fields can be added to the end with minor version bumps.
+ * Removal, reordering and changes to existing fields require a major
+ * version bump.
+ * sizeof(AVFormatContext) must not be used outside libav*, use
+ * avformat_alloc_context() to create an AVFormatContext.
+ */
+typedef struct AVFormatContext {
+    /**
+     * A class for logging and AVOptions. Set by avformat_alloc_context().
+     * Exports (de)muxer private options if they exist.
+     */
+    const AVClass *av_class;
+
+    /**
+     * Can only be iformat or oformat, not both at the same time.
+     *
+     * decoding: set by avformat_open_input().
+     * encoding: set by the user.
+     */
+    struct AVInputFormat *iformat;
+    struct AVOutputFormat *oformat;
+
+    /**
+     * Format private data. This is an AVOptions-enabled struct
+     * if and only if iformat/oformat.priv_class is not NULL.
+     */
+    void *priv_data;
+
+    /**
+     * I/O context.
+     *
+     * decoding: either set by the user before avformat_open_input() (then
+     * the user must close it manually) or set by avformat_open_input().
+     * encoding: set by the user.
+     *
+     * Do NOT set this field if AVFMT_NOFILE flag is set in
+     * iformat/oformat.flags. In such a case, the (de)muxer will handle
+     * I/O in some other way and this field will be NULL.
+     */
+    AVIOContext *pb;
+
+    /* stream info */
+    int ctx_flags; /**< Format-specific flags, see AVFMTCTX_xx */
+
+    /**
+     * A list of all streams in the file. New streams are created with
+     * avformat_new_stream().
+     *
+     * decoding: streams are created by libavformat in avformat_open_input().
+     * If AVFMTCTX_NOHEADER is set in ctx_flags, then new streams may also
+     * appear in av_read_frame().
+     * encoding: streams are created by the user before avformat_write_header().
+     */
+    unsigned int nb_streams;
+    AVStream **streams;
+
+    char filename[1024]; /**< input or output filename */
+
+    /**
+     * Decoding: position of the first frame of the component, in
+     * AV_TIME_BASE fractional seconds. NEVER set this value directly:
+     * It is deduced from the AVStream values.
+     */
+    int64_t start_time;
+
+    /**
+     * Decoding: duration of the stream, in AV_TIME_BASE fractional
+     * seconds. Only set this value if you know none of the individual stream
+     * durations and also do not set any of them. This is deduced from the
+     * AVStream values if not set.
+     */
+    int64_t duration;
+
+    /**
+     * Decoding: total stream bitrate in bit/s, 0 if not
+     * available. Never set it directly if the file_size and the
+     * duration are known as Libav can compute it automatically.
+     */
+    int bit_rate;
+
+    unsigned int packet_size;
+    int max_delay;
+
+    int flags;
+#define AVFMT_FLAG_GENPTS       0x0001 ///< Generate missing pts even if it requires parsing future frames.
+#define AVFMT_FLAG_IGNIDX       0x0002 ///< Ignore index.
+#define AVFMT_FLAG_NONBLOCK     0x0004 ///< Do not block when reading packets from input.
+#define AVFMT_FLAG_IGNDTS       0x0008 ///< Ignore DTS on frames that contain both DTS & PTS
+#define AVFMT_FLAG_NOFILLIN     0x0010 ///< Do not infer any values from other values, just return what is stored in the container
+#define AVFMT_FLAG_NOPARSE      0x0020 ///< Do not use AVParsers, you also must set AVFMT_FLAG_NOFILLIN as the fillin code works on frames and no parsing -> no frames. Also seeking to frames can not work if parsing to find frame boundaries has been disabled
+#define AVFMT_FLAG_NOBUFFER     0x0040 ///< Do not buffer frames when possible
+#define AVFMT_FLAG_CUSTOM_IO    0x0080 ///< The caller has supplied a custom AVIOContext, don't avio_close() it.
+#define AVFMT_FLAG_DISCARD_CORRUPT  0x0100 ///< Discard frames marked corrupted
+
+    /**
+     * decoding: size of data to probe; encoding: unused.
+     */
+    unsigned int probesize;
+
+    /**
+     * decoding: maximum time (in AV_TIME_BASE units) during which the input should
+     * be analyzed in avformat_find_stream_info().
+     */
+    int max_analyze_duration;
+
+    const uint8_t *key;
+    int keylen;
+
+    unsigned int nb_programs;
+    AVProgram **programs;
+
+    /**
+     * Forced video codec_id.
+     * Demuxing: Set by user.
+     */
+    enum AVCodecID video_codec_id;
+
+    /**
+     * Forced audio codec_id.
+     * Demuxing: Set by user.
+     */
+    enum AVCodecID audio_codec_id;
+
+    /**
+     * Forced subtitle codec_id.
+     * Demuxing: Set by user.
+     */
+    enum AVCodecID subtitle_codec_id;
+
+    /**
+     * Maximum amount of memory in bytes to use for the index of each stream.
+     * If the index exceeds this size, entries will be discarded as
+     * needed to maintain a smaller size. This can lead to slower or less
+     * accurate seeking (depends on demuxer).
+     * Demuxers for which a full in-memory index is mandatory will ignore
+     * this.
+     * muxing  : unused
+     * demuxing: set by user
+     */
+    unsigned int max_index_size;
+
+    /**
+     * Maximum amount of memory in bytes to use for buffering frames
+     * obtained from realtime capture devices.
+     */
+    unsigned int max_picture_buffer;
+
+    unsigned int nb_chapters;
+    AVChapter **chapters;
+
+    AVDictionary *metadata;
+
+    /**
+     * Start time of the stream in real world time, in microseconds
+     * since the unix epoch (00:00 1st January 1970). That is, pts=0
+     * in the stream was captured at this real world time.
+     * - encoding: Set by user.
+     * - decoding: Unused.
+     */
+    int64_t start_time_realtime;
+
+    /**
+     * decoding: number of frames used to probe fps
+     */
+    int fps_probe_size;
+
+    /**
+     * Error recognition; higher values will detect more errors but may
+     * misdetect some more or less valid parts as errors.
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    int error_recognition;
+
+    /**
+     * Custom interrupt callbacks for the I/O layer.
+     *
+     * decoding: set by the user before avformat_open_input().
+     * encoding: set by the user before avformat_write_header()
+     * (mainly useful for AVFMT_NOFILE formats). The callback
+     * should also be passed to avio_open2() if it's used to
+     * open the file.
+     */
+    AVIOInterruptCB interrupt_callback;
+
+    /**
+     * Flags to enable debugging.
+     */
+    int debug;
+#define FF_FDEBUG_TS        0x0001
+    /*****************************************************************
+     * All fields below this line are not part of the public API. They
+     * may not be used outside of libavformat and can be changed and
+     * removed at will.
+     * New public fields should be added right above.
+     *****************************************************************
+     */
+
+    /**
+     * This buffer is only needed when packets were already buffered but
+     * not decoded, for example to get the codec parameters in MPEG
+     * streams.
+     */
+    struct AVPacketList *packet_buffer;
+    struct AVPacketList *packet_buffer_end;
+
+    /* av_seek_frame() support */
+    int64_t data_offset; /**< offset of the first packet */
+
+    /**
+     * Raw packets from the demuxer, prior to parsing and decoding.
+     * This buffer is used for buffering packets until the codec can
+     * be identified, as parsing cannot be done without knowing the
+     * codec.
+     */
+    struct AVPacketList *raw_packet_buffer;
+    struct AVPacketList *raw_packet_buffer_end;
+    /**
+     * Packets split by the parser get queued here.
+     */
+    struct AVPacketList *parse_queue;
+    struct AVPacketList *parse_queue_end;
+    /**
+     * Remaining size available for raw_packet_buffer, in bytes.
+     */
+#define RAW_PACKET_BUFFER_SIZE 2500000
+    int raw_packet_buffer_remaining_size;
+} AVFormatContext;
+
+typedef struct AVPacketList {
+    AVPacket pkt;
+    struct AVPacketList *next;
+} AVPacketList;
+
+
+/**
+ * @defgroup lavf_core Core functions
+ * @ingroup libavf
+ *
+ * Functions for querying libavformat capabilities, allocating core structures,
+ * etc.
+ * @{
+ */
+
+/**
+ * Return the LIBAVFORMAT_VERSION_INT constant.
+ */
+unsigned avformat_version(void);
+
+/**
+ * Return the libavformat build-time configuration.
+ */
+const char *avformat_configuration(void);
+
+/**
+ * Return the libavformat license.
+ */
+const char *avformat_license(void);
+
+/**
+ * Initialize libavformat and register all the muxers, demuxers and
+ * protocols. If you do not call this function, then you can select
+ * exactly which formats you want to support.
+ *
+ * @see av_register_input_format()
+ * @see av_register_output_format()
+ * @see av_register_protocol()
+ */
+void av_register_all(void);
+
+void av_register_input_format(AVInputFormat *format);
+void av_register_output_format(AVOutputFormat *format);
+
+/**
+ * Do global initialization of network components. This is optional,
+ * but recommended, since it avoids the overhead of implicitly
+ * doing the setup for each session.
+ *
+ * Calling this function will become mandatory if using network
+ * protocols at some major version bump.
+ */
+int avformat_network_init(void);
+
+/**
+ * Undo the initialization done by avformat_network_init.
+ */
+int avformat_network_deinit(void);
+
+/**
+ * If f is NULL, returns the first registered input format,
+ * if f is non-NULL, returns the next registered input format after f
+ * or NULL if f is the last one.
+ */
+AVInputFormat  *av_iformat_next(AVInputFormat  *f);
+
+/**
+ * If f is NULL, returns the first registered output format,
+ * if f is non-NULL, returns the next registered output format after f
+ * or NULL if f is the last one.
+ */
+AVOutputFormat *av_oformat_next(AVOutputFormat *f);
+
+/**
+ * Allocate an AVFormatContext.
+ * avformat_free_context() can be used to free the context and everything
+ * allocated by the framework within it.
+ */
+AVFormatContext *avformat_alloc_context(void);
+
+/**
+ * Free an AVFormatContext and all its streams.
+ * @param s context to free
+ */
+void avformat_free_context(AVFormatContext *s);
+
+/**
+ * Get the AVClass for AVFormatContext. It can be used in combination with
+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
+ *
+ * @see av_opt_find().
+ */
+const AVClass *avformat_get_class(void);
+
+/**
+ * Add a new stream to a media file.
+ *
+ * When demuxing, it is called by the demuxer in read_header(). If the
+ * flag AVFMTCTX_NOHEADER is set in s.ctx_flags, then it may also
+ * be called in read_packet().
+ *
+ * When muxing, should be called by the user before avformat_write_header().
+ *
+ * @param c If non-NULL, the AVCodecContext corresponding to the new stream
+ * will be initialized to use this codec. This is needed for e.g. codec-specific
+ * defaults to be set, so codec should be provided if it is known.
+ *
+ * @return newly created stream or NULL on error.
+ */
+AVStream *avformat_new_stream(AVFormatContext *s, AVCodec *c);
+
+AVProgram *av_new_program(AVFormatContext *s, int id);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @addtogroup lavf_decoding
+ * @{
+ */
+
+/**
+ * Find AVInputFormat based on the short name of the input format.
+ */
+AVInputFormat *av_find_input_format(const char *short_name);
+
+/**
+ * Guess the file format.
+ *
+ * @param is_opened Whether the file is already opened; determines whether
+ *                  demuxers with or without AVFMT_NOFILE are probed.
+ */
+AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened);
+
+/**
+ * Guess the file format.
+ *
+ * @param is_opened Whether the file is already opened; determines whether
+ *                  demuxers with or without AVFMT_NOFILE are probed.
+ * @param score_max A probe score larger that this is required to accept a
+ *                  detection, the variable is set to the actual detection
+ *                  score afterwards.
+ *                  If the score is <= AVPROBE_SCORE_MAX / 4 it is recommended
+ *                  to retry with a larger probe buffer.
+ */
+AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max);
+
+/**
+ * Probe a bytestream to determine the input format. Each time a probe returns
+ * with a score that is too low, the probe buffer size is increased and another
+ * attempt is made. When the maximum probe size is reached, the input format
+ * with the highest score is returned.
+ *
+ * @param pb the bytestream to probe
+ * @param fmt the input format is put here
+ * @param filename the filename of the stream
+ * @param logctx the log context
+ * @param offset the offset within the bytestream to probe from
+ * @param max_probe_size the maximum probe buffer size (zero for default)
+ * @return 0 in case of success, a negative value corresponding to an
+ * AVERROR code otherwise
+ */
+int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
+                          const char *filename, void *logctx,
+                          unsigned int offset, unsigned int max_probe_size);
+
+/**
+ * Open an input stream and read the header. The codecs are not opened.
+ * The stream must be closed with av_close_input_file().
+ *
+ * @param ps Pointer to user-supplied AVFormatContext (allocated by avformat_alloc_context).
+ *           May be a pointer to NULL, in which case an AVFormatContext is allocated by this
+ *           function and written into ps.
+ *           Note that a user-supplied AVFormatContext will be freed on failure.
+ * @param filename Name of the stream to open.
+ * @param fmt If non-NULL, this parameter forces a specific input format.
+ *            Otherwise the format is autodetected.
+ * @param options  A dictionary filled with AVFormatContext and demuxer-private options.
+ *                 On return this parameter will be destroyed and replaced with a dict containing
+ *                 options that were not found. May be NULL.
+ *
+ * @return 0 on success, a negative AVERROR on failure.
+ *
+ * @note If you want to use custom IO, preallocate the format context and set its pb field.
+ */
+int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputFormat *fmt, AVDictionary **options);
+
+/**
+ * Read packets of a media file to get stream information. This
+ * is useful for file formats with no headers such as MPEG. This
+ * function also computes the real framerate in case of MPEG-2 repeat
+ * frame mode.
+ * The logical file position is not changed by this function;
+ * examined packets may be buffered for later processing.
+ *
+ * @param ic media file handle
+ * @param options  If non-NULL, an ic.nb_streams long array of pointers to
+ *                 dictionaries, where i-th member contains options for
+ *                 codec corresponding to i-th stream.
+ *                 On return each dictionary will be filled with options that were not found.
+ * @return >=0 if OK, AVERROR_xxx on error
+ *
+ * @note this function isn't guaranteed to open all the codecs, so
+ *       options being non-empty at return is a perfectly normal behavior.
+ *
+ * @todo Let the user decide somehow what information is needed so that
+ *       we do not waste time getting stuff the user does not need.
+ */
+int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options);
+
+/**
+ * Find the "best" stream in the file.
+ * The best stream is determined according to various heuristics as the most
+ * likely to be what the user expects.
+ * If the decoder parameter is non-NULL, av_find_best_stream will find the
+ * default decoder for the stream's codec; streams for which no decoder can
+ * be found are ignored.
+ *
+ * @param ic                media file handle
+ * @param type              stream type: video, audio, subtitles, etc.
+ * @param wanted_stream_nb  user-requested stream number,
+ *                          or -1 for automatic selection
+ * @param related_stream    try to find a stream related (eg. in the same
+ *                          program) to this one, or -1 if none
+ * @param decoder_ret       if non-NULL, returns the decoder for the
+ *                          selected stream
+ * @param flags             flags; none are currently defined
+ * @return  the non-negative stream number in case of success,
+ *          AVERROR_STREAM_NOT_FOUND if no stream with the requested type
+ *          could be found,
+ *          AVERROR_DECODER_NOT_FOUND if streams were found but no decoder
+ * @note  If av_find_best_stream returns successfully and decoder_ret is not
+ *        NULL, then *decoder_ret is guaranteed to be set to a valid AVCodec.
+ */
+int av_find_best_stream(AVFormatContext *ic,
+                        enum AVMediaType type,
+                        int wanted_stream_nb,
+                        int related_stream,
+                        AVCodec **decoder_ret,
+                        int flags);
+
+#if FF_API_READ_PACKET
+/**
+ * @deprecated use AVFMT_FLAG_NOFILLIN | AVFMT_FLAG_NOPARSE to read raw
+ * unprocessed packets
+ *
+ * Read a transport packet from a media file.
+ *
+ * This function is obsolete and should never be used.
+ * Use av_read_frame() instead.
+ *
+ * @param s media file handle
+ * @param pkt is filled
+ * @return 0 if OK, AVERROR_xxx on error
+ */
+attribute_deprecated
+int av_read_packet(AVFormatContext *s, AVPacket *pkt);
+#endif
+
+/**
+ * Return the next frame of a stream.
+ * This function returns what is stored in the file, and does not validate
+ * that what is there are valid frames for the decoder. It will split what is
+ * stored in the file into frames and return one for each call. It will not
+ * omit invalid data between valid frames so as to give the decoder the maximum
+ * information possible for decoding.
+ *
+ * If pkt->destruct is NULL, then the packet is valid until the next
+ * av_read_frame() or until av_close_input_file(). Otherwise the packet is valid
+ * indefinitely. In both cases the packet must be freed with
+ * av_free_packet when it is no longer needed. For video, the packet contains
+ * exactly one frame. For audio, it contains an integer number of frames if each
+ * frame has a known fixed size (e.g. PCM or ADPCM data). If the audio frames
+ * have a variable size (e.g. MPEG audio), then it contains one frame.
+ *
+ * pkt->pts, pkt->dts and pkt->duration are always set to correct
+ * values in AVStream.time_base units (and guessed if the format cannot
+ * provide them). pkt->pts can be AV_NOPTS_VALUE if the video format
+ * has B-frames, so it is better to rely on pkt->dts if you do not
+ * decompress the payload.
+ *
+ * @return 0 if OK, < 0 on error or end of file
+ */
+int av_read_frame(AVFormatContext *s, AVPacket *pkt);
+
+/**
+ * Seek to the keyframe at timestamp.
+ * 'timestamp' in 'stream_index'.
+ * @param stream_index If stream_index is (-1), a default
+ * stream is selected, and timestamp is automatically converted
+ * from AV_TIME_BASE units to the stream specific time_base.
+ * @param timestamp Timestamp in AVStream.time_base units
+ *        or, if no stream is specified, in AV_TIME_BASE units.
+ * @param flags flags which select direction and seeking mode
+ * @return >= 0 on success
+ */
+int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp,
+                  int flags);
+
+/**
+ * Seek to timestamp ts.
+ * Seeking will be done so that the point from which all active streams
+ * can be presented successfully will be closest to ts and within min/max_ts.
+ * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
+ *
+ * If flags contain AVSEEK_FLAG_BYTE, then all timestamps are in bytes and
+ * are the file position (this may not be supported by all demuxers).
+ * If flags contain AVSEEK_FLAG_FRAME, then all timestamps are in frames
+ * in the stream with stream_index (this may not be supported by all demuxers).
+ * Otherwise all timestamps are in units of the stream selected by stream_index
+ * or if stream_index is -1, in AV_TIME_BASE units.
+ * If flags contain AVSEEK_FLAG_ANY, then non-keyframes are treated as
+ * keyframes (this may not be supported by all demuxers).
+ *
+ * @param stream_index index of the stream which is used as time base reference
+ * @param min_ts smallest acceptable timestamp
+ * @param ts target timestamp
+ * @param max_ts largest acceptable timestamp
+ * @param flags flags
+ * @return >=0 on success, error code otherwise
+ *
+ * @note This is part of the new seek API which is still under construction.
+ *       Thus do not use this yet. It may change at any time, do not expect
+ *       ABI compatibility yet!
+ */
+int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
+
+/**
+ * Start playing a network-based stream (e.g. RTSP stream) at the
+ * current position.
+ */
+int av_read_play(AVFormatContext *s);
+
+/**
+ * Pause a network-based stream (e.g. RTSP stream).
+ *
+ * Use av_read_play() to resume it.
+ */
+int av_read_pause(AVFormatContext *s);
+
+#if FF_API_CLOSE_INPUT_FILE
+/**
+ * @deprecated use avformat_close_input()
+ * Close a media file (but not its codecs).
+ *
+ * @param s media file handle
+ */
+attribute_deprecated
+void av_close_input_file(AVFormatContext *s);
+#endif
+
+/**
+ * Close an opened input AVFormatContext. Free it and all its contents
+ * and set *s to NULL.
+ */
+void avformat_close_input(AVFormatContext **s);
+/**
+ * @}
+ */
+
+#define AVSEEK_FLAG_BACKWARD 1 ///< seek backward
+#define AVSEEK_FLAG_BYTE     2 ///< seeking based on position in bytes
+#define AVSEEK_FLAG_ANY      4 ///< seek to any frame, even non-keyframes
+#define AVSEEK_FLAG_FRAME    8 ///< seeking based on frame number
+
+/**
+ * @addtogroup lavf_encoding
+ * @{
+ */
+/**
+ * Allocate the stream private data and write the stream header to
+ * an output media file.
+ *
+ * @param s Media file handle, must be allocated with avformat_alloc_context().
+ *          Its oformat field must be set to the desired output format;
+ *          Its pb field must be set to an already openened AVIOContext.
+ * @param options  An AVDictionary filled with AVFormatContext and muxer-private options.
+ *                 On return this parameter will be destroyed and replaced with a dict containing
+ *                 options that were not found. May be NULL.
+ *
+ * @return 0 on success, negative AVERROR on failure.
+ *
+ * @see av_opt_find, av_dict_set, avio_open, av_oformat_next.
+ */
+int avformat_write_header(AVFormatContext *s, AVDictionary **options);
+
+/**
+ * Write a packet to an output media file.
+ *
+ * The packet shall contain one audio or video frame.
+ * The packet must be correctly interleaved according to the container
+ * specification, if not then av_interleaved_write_frame must be used.
+ *
+ * @param s media file handle
+ * @param pkt The packet, which contains the stream_index, buf/buf_size,
+ *            dts/pts, ...
+ *            This can be NULL (at any time, not just at the end), in
+ *            order to immediately flush data buffered within the muxer,
+ *            for muxers that buffer up data internally before writing it
+ *            to the output.
+ * @return < 0 on error, = 0 if OK, 1 if flushed and there is no more data to flush
+ */
+int av_write_frame(AVFormatContext *s, AVPacket *pkt);
+
+/**
+ * Write a packet to an output media file ensuring correct interleaving.
+ *
+ * The packet must contain one audio or video frame.
+ * If the packets are already correctly interleaved, the application should
+ * call av_write_frame() instead as it is slightly faster. It is also important
+ * to keep in mind that completely non-interleaved input will need huge amounts
+ * of memory to interleave with this, so it is preferable to interleave at the
+ * demuxer level.
+ *
+ * @param s media file handle
+ * @param pkt The packet containing the data to be written. Libavformat takes
+ * ownership of the data and will free it when it sees fit using the packet's
+ * @ref AVPacket.destruct "destruct" field. The caller must not access the data
+ * after this function returns, as it may already be freed.
+ * This can be NULL (at any time, not just at the end), to flush the
+ * interleaving queues.
+ * Packet's @ref AVPacket.stream_index "stream_index" field must be set to the
+ * index of the corresponding stream in @ref AVFormatContext.streams
+ * "s.streams".
+ * It is very strongly recommended that timing information (@ref AVPacket.pts
+ * "pts", @ref AVPacket.dts "dts" @ref AVPacket.duration "duration") is set to
+ * correct values.
+ *
+ * @return 0 on success, a negative AVERROR on error.
+ */
+int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt);
+
+#if FF_API_INTERLEAVE_PACKET
+/**
+ * @deprecated this function was never meant to be called by the user
+ * programs.
+ */
+attribute_deprecated
+int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
+                                 AVPacket *pkt, int flush);
+#endif
+
+/**
+ * Write the stream trailer to an output media file and free the
+ * file private data.
+ *
+ * May only be called after a successful call to avformat_write_header.
+ *
+ * @param s media file handle
+ * @return 0 if OK, AVERROR_xxx on error
+ */
+int av_write_trailer(AVFormatContext *s);
+
+/**
+ * Return the output format in the list of registered output formats
+ * which best matches the provided parameters, or return NULL if
+ * there is no match.
+ *
+ * @param short_name if non-NULL checks if short_name matches with the
+ * names of the registered formats
+ * @param filename if non-NULL checks if filename terminates with the
+ * extensions of the registered formats
+ * @param mime_type if non-NULL checks if mime_type matches with the
+ * MIME type of the registered formats
+ */
+AVOutputFormat *av_guess_format(const char *short_name,
+                                const char *filename,
+                                const char *mime_type);
+
+/**
+ * Guess the codec ID based upon muxer and filename.
+ */
+enum AVCodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
+                            const char *filename, const char *mime_type,
+                            enum AVMediaType type);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @defgroup lavf_misc Utility functions
+ * @ingroup libavf
+ * @{
+ *
+ * Miscellaneous utility functions related to both muxing and demuxing
+ * (or neither).
+ */
+
+/**
+ * Send a nice hexadecimal dump of a buffer to the specified file stream.
+ *
+ * @param f The file stream pointer where the dump should be sent to.
+ * @param buf buffer
+ * @param size buffer size
+ *
+ * @see av_hex_dump_log, av_pkt_dump2, av_pkt_dump_log2
+ */
+void av_hex_dump(FILE *f, const uint8_t *buf, int size);
+
+/**
+ * Send a nice hexadecimal dump of a buffer to the log.
+ *
+ * @param avcl A pointer to an arbitrary struct of which the first field is a
+ * pointer to an AVClass struct.
+ * @param level The importance level of the message, lower values signifying
+ * higher importance.
+ * @param buf buffer
+ * @param size buffer size
+ *
+ * @see av_hex_dump, av_pkt_dump2, av_pkt_dump_log2
+ */
+void av_hex_dump_log(void *avcl, int level, const uint8_t *buf, int size);
+
+/**
+ * Send a nice dump of a packet to the specified file stream.
+ *
+ * @param f The file stream pointer where the dump should be sent to.
+ * @param pkt packet to dump
+ * @param dump_payload True if the payload must be displayed, too.
+ * @param st AVStream that the packet belongs to
+ */
+void av_pkt_dump2(FILE *f, AVPacket *pkt, int dump_payload, AVStream *st);
+
+
+/**
+ * Send a nice dump of a packet to the log.
+ *
+ * @param avcl A pointer to an arbitrary struct of which the first field is a
+ * pointer to an AVClass struct.
+ * @param level The importance level of the message, lower values signifying
+ * higher importance.
+ * @param pkt packet to dump
+ * @param dump_payload True if the payload must be displayed, too.
+ * @param st AVStream that the packet belongs to
+ */
+void av_pkt_dump_log2(void *avcl, int level, AVPacket *pkt, int dump_payload,
+                      AVStream *st);
+
+/**
+ * Get the AVCodecID for the given codec tag tag.
+ * If no codec id is found returns AV_CODEC_ID_NONE.
+ *
+ * @param tags list of supported codec_id-codec_tag pairs, as stored
+ * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
+ */
+enum AVCodecID av_codec_get_id(const struct AVCodecTag * const *tags, unsigned int tag);
+
+/**
+ * Get the codec tag for the given codec id id.
+ * If no codec tag is found returns 0.
+ *
+ * @param tags list of supported codec_id-codec_tag pairs, as stored
+ * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
+ */
+unsigned int av_codec_get_tag(const struct AVCodecTag * const *tags, enum AVCodecID id);
+
+int av_find_default_stream_index(AVFormatContext *s);
+
+/**
+ * Get the index for a specific timestamp.
+ * @param flags if AVSEEK_FLAG_BACKWARD then the returned index will correspond
+ *                 to the timestamp which is <= the requested one, if backward
+ *                 is 0, then it will be >=
+ *              if AVSEEK_FLAG_ANY seek to any frame, only keyframes otherwise
+ * @return < 0 if no such timestamp could be found
+ */
+int av_index_search_timestamp(AVStream *st, int64_t timestamp, int flags);
+
+/**
+ * Add an index entry into a sorted list. Update the entry if the list
+ * already contains it.
+ *
+ * @param timestamp timestamp in the time base of the given stream
+ */
+int av_add_index_entry(AVStream *st, int64_t pos, int64_t timestamp,
+                       int size, int distance, int flags);
+
+
+/**
+ * Split a URL string into components.
+ *
+ * The pointers to buffers for storing individual components may be null,
+ * in order to ignore that component. Buffers for components not found are
+ * set to empty strings. If the port is not found, it is set to a negative
+ * value.
+ *
+ * @param proto the buffer for the protocol
+ * @param proto_size the size of the proto buffer
+ * @param authorization the buffer for the authorization
+ * @param authorization_size the size of the authorization buffer
+ * @param hostname the buffer for the host name
+ * @param hostname_size the size of the hostname buffer
+ * @param port_ptr a pointer to store the port number in
+ * @param path the buffer for the path
+ * @param path_size the size of the path buffer
+ * @param url the URL to split
+ */
+void av_url_split(char *proto,         int proto_size,
+                  char *authorization, int authorization_size,
+                  char *hostname,      int hostname_size,
+                  int *port_ptr,
+                  char *path,          int path_size,
+                  const char *url);
+
+
+void av_dump_format(AVFormatContext *ic,
+                    int index,
+                    const char *url,
+                    int is_output);
+
+/**
+ * Return in 'buf' the path with '%d' replaced by a number.
+ *
+ * Also handles the '%0nd' format where 'n' is the total number
+ * of digits and '%%'.
+ *
+ * @param buf destination buffer
+ * @param buf_size destination buffer size
+ * @param path numbered sequence string
+ * @param number frame number
+ * @return 0 if OK, -1 on format error
+ */
+int av_get_frame_filename(char *buf, int buf_size,
+                          const char *path, int number);
+
+/**
+ * Check whether filename actually is a numbered sequence generator.
+ *
+ * @param filename possible numbered sequence string
+ * @return 1 if a valid numbered sequence string, 0 otherwise
+ */
+int av_filename_number_test(const char *filename);
+
+/**
+ * Generate an SDP for an RTP session.
+ *
+ * Note, this overwrites the id values of AVStreams in the muxer contexts
+ * for getting unique dynamic payload types.
+ *
+ * @param ac array of AVFormatContexts describing the RTP streams. If the
+ *           array is composed by only one context, such context can contain
+ *           multiple AVStreams (one AVStream per RTP stream). Otherwise,
+ *           all the contexts in the array (an AVCodecContext per RTP stream)
+ *           must contain only one AVStream.
+ * @param n_files number of AVCodecContexts contained in ac
+ * @param buf buffer where the SDP will be stored (must be allocated by
+ *            the caller)
+ * @param size the size of the buffer
+ * @return 0 if OK, AVERROR_xxx on error
+ */
+int av_sdp_create(AVFormatContext *ac[], int n_files, char *buf, int size);
+
+/**
+ * Return a positive value if the given filename has one of the given
+ * extensions, 0 otherwise.
+ *
+ * @param extensions a comma-separated list of filename extensions
+ */
+int av_match_ext(const char *filename, const char *extensions);
+
+/**
+ * Test if the given container can store a codec.
+ *
+ * @param std_compliance standards compliance level, one of FF_COMPLIANCE_*
+ *
+ * @return 1 if codec with ID codec_id can be stored in ofmt, 0 if it cannot.
+ *         A negative number if this information is not available.
+ */
+int avformat_query_codec(AVOutputFormat *ofmt, enum AVCodecID codec_id, int std_compliance);
+
+/**
+ * @defgroup riff_fourcc RIFF FourCCs
+ * @{
+ * Get the tables mapping RIFF FourCCs to libavcodec AVCodecIDs. The tables are
+ * meant to be passed to av_codec_get_id()/av_codec_get_tag() as in the
+ * following code:
+ * @code
+ * uint32_t tag = MKTAG('H', '2', '6', '4');
+ * const struct AVCodecTag *table[] = { avformat_get_riff_video_tags(), 0 };
+ * enum AVCodecID id = av_codec_get_id(table, tag);
+ * @endcode
+ */
+/**
+ * @return the table mapping RIFF FourCCs for video to libavcodec AVCodecID.
+ */
+const struct AVCodecTag *avformat_get_riff_video_tags(void);
+/**
+ * @return the table mapping RIFF FourCCs for audio to AVCodecID.
+ */
+const struct AVCodecTag *avformat_get_riff_audio_tags(void);
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#endif /* AVFORMAT_AVFORMAT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavformat/avio.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavformat/avio.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavformat/avio.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavformat/avio.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,433 @@
+/*
+ * copyright (c) 2001 Fabrice Bellard
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#ifndef AVFORMAT_AVIO_H
+#define AVFORMAT_AVIO_H
+
+/**
+ * @file
+ * @ingroup lavf_io
+ * Buffered I/O operations
+ */
+
+#include <stdint.h>
+
+#include "libavutil/common.h"
+#include "libavutil/dict.h"
+#include "libavutil/log.h"
+
+#include "libavformat/version.h"
+
+
+#define AVIO_SEEKABLE_NORMAL 0x0001 /**< Seeking works like for a local file */
+
+/**
+ * Callback for checking whether to abort blocking functions.
+ * AVERROR_EXIT is returned in this case by the interrupted
+ * function. During blocking operations, callback is called with
+ * opaque as parameter. If the callback returns 1, the
+ * blocking operation will be aborted.
+ *
+ * No members can be added to this struct without a major bump, if
+ * new elements have been added after this struct in AVFormatContext
+ * or AVIOContext.
+ */
+typedef struct AVIOInterruptCB {
+    int (*callback)(void*);
+    void *opaque;
+} AVIOInterruptCB;
+
+/**
+ * Bytestream IO Context.
+ * New fields can be added to the end with minor version bumps.
+ * Removal, reordering and changes to existing fields require a major
+ * version bump.
+ * sizeof(AVIOContext) must not be used outside libav*.
+ *
+ * @note None of the function pointers in AVIOContext should be called
+ *       directly, they should only be set by the client application
+ *       when implementing custom I/O. Normally these are set to the
+ *       function pointers specified in avio_alloc_context()
+ */
+typedef struct AVIOContext {
+    /**
+     * A class for private options.
+     *
+     * If this AVIOContext is created by avio_open2(), av_class is set and
+     * passes the options down to protocols.
+     *
+     * If this AVIOContext is manually allocated, then av_class may be set by
+     * the caller.
+     *
+     * warning -- this field can be NULL, be sure to not pass this AVIOContext
+     * to any av_opt_* functions in that case.
+     */
+    const AVClass *av_class;
+    unsigned char *buffer;  /**< Start of the buffer. */
+    int buffer_size;        /**< Maximum buffer size */
+    unsigned char *buf_ptr; /**< Current position in the buffer */
+    unsigned char *buf_end; /**< End of the data, may be less than
+                                 buffer+buffer_size if the read function returned
+                                 less data than requested, e.g. for streams where
+                                 no more data has been received yet. */
+    void *opaque;           /**< A private pointer, passed to the read/write/seek/...
+                                 functions. */
+    int (*read_packet)(void *opaque, uint8_t *buf, int buf_size);
+    int (*write_packet)(void *opaque, uint8_t *buf, int buf_size);
+    int64_t (*seek)(void *opaque, int64_t offset, int whence);
+    int64_t pos;            /**< position in the file of the current buffer */
+    int must_flush;         /**< true if the next seek should flush */
+    int eof_reached;        /**< true if eof reached */
+    int write_flag;         /**< true if open for writing */
+    int max_packet_size;
+    unsigned long checksum;
+    unsigned char *checksum_ptr;
+    unsigned long (*update_checksum)(unsigned long checksum, const uint8_t *buf, unsigned int size);
+    int error;              /**< contains the error code or 0 if no error happened */
+    /**
+     * Pause or resume playback for network streaming protocols - e.g. MMS.
+     */
+    int (*read_pause)(void *opaque, int pause);
+    /**
+     * Seek to a given timestamp in stream with the specified stream_index.
+     * Needed for some network streaming protocols which don't support seeking
+     * to byte position.
+     */
+    int64_t (*read_seek)(void *opaque, int stream_index,
+                         int64_t timestamp, int flags);
+    /**
+     * A combination of AVIO_SEEKABLE_ flags or 0 when the stream is not seekable.
+     */
+    int seekable;
+} AVIOContext;
+
+/* unbuffered I/O */
+
+/**
+ * Return AVIO_FLAG_* access flags corresponding to the access permissions
+ * of the resource in url, or a negative value corresponding to an
+ * AVERROR code in case of failure. The returned access flags are
+ * masked by the value in flags.
+ *
+ * @note This function is intrinsically unsafe, in the sense that the
+ * checked resource may change its existence or permission status from
+ * one call to another. Thus you should not trust the returned value,
+ * unless you are sure that no other processes are accessing the
+ * checked resource.
+ */
+int avio_check(const char *url, int flags);
+
+/**
+ * Allocate and initialize an AVIOContext for buffered I/O. It must be later
+ * freed with av_free().
+ *
+ * @param buffer Memory block for input/output operations via AVIOContext.
+ *        The buffer must be allocated with av_malloc() and friends.
+ * @param buffer_size The buffer size is very important for performance.
+ *        For protocols with fixed blocksize it should be set to this blocksize.
+ *        For others a typical size is a cache page, e.g. 4kb.
+ * @param write_flag Set to 1 if the buffer should be writable, 0 otherwise.
+ * @param opaque An opaque pointer to user-specific data.
+ * @param read_packet  A function for refilling the buffer, may be NULL.
+ * @param write_packet A function for writing the buffer contents, may be NULL.
+ * @param seek A function for seeking to specified byte position, may be NULL.
+ *
+ * @return Allocated AVIOContext or NULL on failure.
+ */
+AVIOContext *avio_alloc_context(
+                  unsigned char *buffer,
+                  int buffer_size,
+                  int write_flag,
+                  void *opaque,
+                  int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
+                  int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
+                  int64_t (*seek)(void *opaque, int64_t offset, int whence));
+
+void avio_w8(AVIOContext *s, int b);
+void avio_write(AVIOContext *s, const unsigned char *buf, int size);
+void avio_wl64(AVIOContext *s, uint64_t val);
+void avio_wb64(AVIOContext *s, uint64_t val);
+void avio_wl32(AVIOContext *s, unsigned int val);
+void avio_wb32(AVIOContext *s, unsigned int val);
+void avio_wl24(AVIOContext *s, unsigned int val);
+void avio_wb24(AVIOContext *s, unsigned int val);
+void avio_wl16(AVIOContext *s, unsigned int val);
+void avio_wb16(AVIOContext *s, unsigned int val);
+
+/**
+ * Write a NULL-terminated string.
+ * @return number of bytes written.
+ */
+int avio_put_str(AVIOContext *s, const char *str);
+
+/**
+ * Convert an UTF-8 string to UTF-16LE and write it.
+ * @return number of bytes written.
+ */
+int avio_put_str16le(AVIOContext *s, const char *str);
+
+/**
+ * Passing this as the "whence" parameter to a seek function causes it to
+ * return the filesize without seeking anywhere. Supporting this is optional.
+ * If it is not supported then the seek function will return <0.
+ */
+#define AVSEEK_SIZE 0x10000
+
+/**
+ * Oring this flag as into the "whence" parameter to a seek function causes it to
+ * seek by any means (like reopening and linear reading) or other normally unreasonble
+ * means that can be extreemly slow.
+ * This may be ignored by the seek code.
+ */
+#define AVSEEK_FORCE 0x20000
+
+/**
+ * fseek() equivalent for AVIOContext.
+ * @return new position or AVERROR.
+ */
+int64_t avio_seek(AVIOContext *s, int64_t offset, int whence);
+
+/**
+ * Skip given number of bytes forward
+ * @return new position or AVERROR.
+ */
+static av_always_inline int64_t avio_skip(AVIOContext *s, int64_t offset)
+{
+    return avio_seek(s, offset, SEEK_CUR);
+}
+
+/**
+ * ftell() equivalent for AVIOContext.
+ * @return position or AVERROR.
+ */
+static av_always_inline int64_t avio_tell(AVIOContext *s)
+{
+    return avio_seek(s, 0, SEEK_CUR);
+}
+
+/**
+ * Get the filesize.
+ * @return filesize or AVERROR
+ */
+int64_t avio_size(AVIOContext *s);
+
+/** @warning currently size is limited */
+int avio_printf(AVIOContext *s, const char *fmt, ...) av_printf_format(2, 3);
+
+void avio_flush(AVIOContext *s);
+
+
+/**
+ * Read size bytes from AVIOContext into buf.
+ * @return number of bytes read or AVERROR
+ */
+int avio_read(AVIOContext *s, unsigned char *buf, int size);
+
+/**
+ * @name Functions for reading from AVIOContext
+ * @{
+ *
+ * @note return 0 if EOF, so you cannot use it if EOF handling is
+ *       necessary
+ */
+int          avio_r8  (AVIOContext *s);
+unsigned int avio_rl16(AVIOContext *s);
+unsigned int avio_rl24(AVIOContext *s);
+unsigned int avio_rl32(AVIOContext *s);
+uint64_t     avio_rl64(AVIOContext *s);
+unsigned int avio_rb16(AVIOContext *s);
+unsigned int avio_rb24(AVIOContext *s);
+unsigned int avio_rb32(AVIOContext *s);
+uint64_t     avio_rb64(AVIOContext *s);
+/**
+ * @}
+ */
+
+/**
+ * Read a string from pb into buf. The reading will terminate when either
+ * a NULL character was encountered, maxlen bytes have been read, or nothing
+ * more can be read from pb. The result is guaranteed to be NULL-terminated, it
+ * will be truncated if buf is too small.
+ * Note that the string is not interpreted or validated in any way, it
+ * might get truncated in the middle of a sequence for multi-byte encodings.
+ *
+ * @return number of bytes read (is always <= maxlen).
+ * If reading ends on EOF or error, the return value will be one more than
+ * bytes actually read.
+ */
+int avio_get_str(AVIOContext *pb, int maxlen, char *buf, int buflen);
+
+/**
+ * Read a UTF-16 string from pb and convert it to UTF-8.
+ * The reading will terminate when either a null or invalid character was
+ * encountered or maxlen bytes have been read.
+ * @return number of bytes read (is always <= maxlen)
+ */
+int avio_get_str16le(AVIOContext *pb, int maxlen, char *buf, int buflen);
+int avio_get_str16be(AVIOContext *pb, int maxlen, char *buf, int buflen);
+
+
+/**
+ * @name URL open modes
+ * The flags argument to avio_open must be one of the following
+ * constants, optionally ORed with other flags.
+ * @{
+ */
+#define AVIO_FLAG_READ  1                                      /**< read-only */
+#define AVIO_FLAG_WRITE 2                                      /**< write-only */
+#define AVIO_FLAG_READ_WRITE (AVIO_FLAG_READ|AVIO_FLAG_WRITE)  /**< read-write pseudo flag */
+/**
+ * @}
+ */
+
+/**
+ * Use non-blocking mode.
+ * If this flag is set, operations on the context will return
+ * AVERROR(EAGAIN) if they can not be performed immediately.
+ * If this flag is not set, operations on the context will never return
+ * AVERROR(EAGAIN).
+ * Note that this flag does not affect the opening/connecting of the
+ * context. Connecting a protocol will always block if necessary (e.g. on
+ * network protocols) but never hang (e.g. on busy devices).
+ * Warning: non-blocking protocols is work-in-progress; this flag may be
+ * silently ignored.
+ */
+#define AVIO_FLAG_NONBLOCK 8
+
+/**
+ * Create and initialize a AVIOContext for accessing the
+ * resource indicated by url.
+ * @note When the resource indicated by url has been opened in
+ * read+write mode, the AVIOContext can be used only for writing.
+ *
+ * @param s Used to return the pointer to the created AVIOContext.
+ * In case of failure the pointed to value is set to NULL.
+ * @param flags flags which control how the resource indicated by url
+ * is to be opened
+ * @return 0 in case of success, a negative value corresponding to an
+ * AVERROR code in case of failure
+ */
+int avio_open(AVIOContext **s, const char *url, int flags);
+
+/**
+ * Create and initialize a AVIOContext for accessing the
+ * resource indicated by url.
+ * @note When the resource indicated by url has been opened in
+ * read+write mode, the AVIOContext can be used only for writing.
+ *
+ * @param s Used to return the pointer to the created AVIOContext.
+ * In case of failure the pointed to value is set to NULL.
+ * @param flags flags which control how the resource indicated by url
+ * is to be opened
+ * @param int_cb an interrupt callback to be used at the protocols level
+ * @param options  A dictionary filled with protocol-private options. On return
+ * this parameter will be destroyed and replaced with a dict containing options
+ * that were not found. May be NULL.
+ * @return 0 in case of success, a negative value corresponding to an
+ * AVERROR code in case of failure
+ */
+int avio_open2(AVIOContext **s, const char *url, int flags,
+               const AVIOInterruptCB *int_cb, AVDictionary **options);
+
+/**
+ * Close the resource accessed by the AVIOContext s and free it.
+ * This function can only be used if s was opened by avio_open().
+ *
+ * The internal buffer is automatically flushed before closing the
+ * resource.
+ *
+ * @return 0 on success, an AVERROR < 0 on error.
+ * @see avio_closep
+ */
+int avio_close(AVIOContext *s);
+
+/**
+ * Close the resource accessed by the AVIOContext *s, free it
+ * and set the pointer pointing to it to NULL.
+ * This function can only be used if s was opened by avio_open().
+ *
+ * The internal buffer is automatically flushed before closing the
+ * resource.
+ *
+ * @return 0 on success, an AVERROR < 0 on error.
+ * @see avio_close
+ */
+int avio_closep(AVIOContext **s);
+
+
+/**
+ * Open a write only memory stream.
+ *
+ * @param s new IO context
+ * @return zero if no error.
+ */
+int avio_open_dyn_buf(AVIOContext **s);
+
+/**
+ * Return the written size and a pointer to the buffer. The buffer
+ * must be freed with av_free().
+ * Padding of FF_INPUT_BUFFER_PADDING_SIZE is added to the buffer.
+ *
+ * @param s IO context
+ * @param pbuffer pointer to a byte buffer
+ * @return the length of the byte buffer
+ */
+int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer);
+
+/**
+ * Iterate through names of available protocols.
+ *
+ * @param opaque A private pointer representing current protocol.
+ *        It must be a pointer to NULL on first iteration and will
+ *        be updated by successive calls to avio_enum_protocols.
+ * @param output If set to 1, iterate over output protocols,
+ *               otherwise over input protocols.
+ *
+ * @return A static string containing the name of current protocol or NULL
+ */
+const char *avio_enum_protocols(void **opaque, int output);
+
+/**
+ * Pause and resume playing - only meaningful if using a network streaming
+ * protocol (e.g. MMS).
+ * @param pause 1 for pause, 0 for resume
+ */
+int     avio_pause(AVIOContext *h, int pause);
+
+/**
+ * Seek to a given timestamp relative to some component stream.
+ * Only meaningful if using a network streaming protocol (e.g. MMS.).
+ * @param stream_index The stream index that the timestamp is relative to.
+ *        If stream_index is (-1) the timestamp should be in AV_TIME_BASE
+ *        units from the beginning of the presentation.
+ *        If a stream_index >= 0 is used and the protocol does not support
+ *        seeking based on component streams, the call will fail with ENOTSUP.
+ * @param timestamp timestamp in AVStream.time_base units
+ *        or if there is no stream specified then in AV_TIME_BASE units.
+ * @param flags Optional combination of AVSEEK_FLAG_BACKWARD, AVSEEK_FLAG_BYTE
+ *        and AVSEEK_FLAG_ANY. The protocol may silently ignore
+ *        AVSEEK_FLAG_BACKWARD and AVSEEK_FLAG_ANY, but AVSEEK_FLAG_BYTE will
+ *        fail with ENOTSUP if used and not supported.
+ * @return >= 0 on success
+ * @see AVInputFormat::read_seek
+ */
+int64_t avio_seek_time(AVIOContext *h, int stream_index,
+                       int64_t timestamp, int flags);
+
+#endif /* AVFORMAT_AVIO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavformat/version.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavformat/version.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavformat/version.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavformat/version.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,71 @@
+/*
+ * Version macros.
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFORMAT_VERSION_H
+#define AVFORMAT_VERSION_H
+
+/**
+ * @file
+ * @ingroup libavf
+ * Libavformat version macros
+ */
+
+#include "libavutil/avutil.h"
+
+#define LIBAVFORMAT_VERSION_MAJOR 54
+#define LIBAVFORMAT_VERSION_MINOR 20
+#define LIBAVFORMAT_VERSION_MICRO  4
+
+#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
+                                               LIBAVFORMAT_VERSION_MINOR, \
+                                               LIBAVFORMAT_VERSION_MICRO)
+#define LIBAVFORMAT_VERSION     AV_VERSION(LIBAVFORMAT_VERSION_MAJOR,   \
+                                           LIBAVFORMAT_VERSION_MINOR,   \
+                                           LIBAVFORMAT_VERSION_MICRO)
+#define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
+
+#define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
+
+/**
+ * FF_API_* defines may be placed below to indicate public API that will be
+ * dropped at a future version bump. The defines themselves are not part of
+ * the public API and may change, break or disappear at any time.
+ */
+
+#ifndef FF_API_CLOSE_INPUT_FILE
+#define FF_API_CLOSE_INPUT_FILE        (LIBAVFORMAT_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_APPLEHTTP_PROTO
+#define FF_API_APPLEHTTP_PROTO         (LIBAVFORMAT_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_READ_PACKET
+#define FF_API_READ_PACKET             (LIBAVFORMAT_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_INTERLEAVE_PACKET
+#define FF_API_INTERLEAVE_PACKET       (LIBAVFORMAT_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_AV_GETTIME
+#define FF_API_AV_GETTIME              (LIBAVFORMAT_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_R_FRAME_RATE
+#define FF_API_R_FRAME_RATE            (LIBAVFORMAT_VERSION_MAJOR < 55)
+#endif
+
+#endif /* AVFORMAT_VERSION_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/adler32.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/adler32.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/adler32.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/adler32.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,43 @@
+/*
+ * copyright (c) 2006 Mans Rullgard
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_ADLER32_H
+#define AVUTIL_ADLER32_H
+
+#include <stdint.h>
+#include "attributes.h"
+
+/**
+ * @ingroup lavu_crypto
+ * Calculate the Adler32 checksum of a buffer.
+ *
+ * Passing the return value to a subsequent av_adler32_update() call
+ * allows the checksum of multiple buffers to be calculated as though
+ * they were concatenated.
+ *
+ * @param adler initial checksum value
+ * @param buf   pointer to input buffer
+ * @param len   size of input buffer
+ * @return      updated checksum
+ */
+unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf,
+                                unsigned int len) av_pure;
+
+#endif /* AVUTIL_ADLER32_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/aes.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/aes.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/aes.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/aes.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,67 @@
+/*
+ * copyright (c) 2007 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_AES_H
+#define AVUTIL_AES_H
+
+#include <stdint.h>
+
+#include "attributes.h"
+#include "version.h"
+
+/**
+ * @defgroup lavu_aes AES
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+#if FF_API_CONTEXT_SIZE
+extern attribute_deprecated const int av_aes_size;
+#endif
+
+struct AVAES;
+
+/**
+ * Allocate an AVAES context.
+ */
+struct AVAES *av_aes_alloc(void);
+
+/**
+ * Initialize an AVAES context.
+ * @param key_bits 128, 192 or 256
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+int av_aes_init(struct AVAES *a, const uint8_t *key, int key_bits, int decrypt);
+
+/**
+ * Encrypt or decrypt a buffer using a previously initialized context.
+ * @param count number of 16 byte blocks
+ * @param dst destination array, can be equal to src
+ * @param src source array, can be equal to dst
+ * @param iv initialization vector for CBC mode, if NULL then ECB will be used
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+void av_aes_crypt(struct AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_AES_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/attributes.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/attributes.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/attributes.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/attributes.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,122 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Macro definitions for various function/variable attributes
+ */
+
+#ifndef AVUTIL_ATTRIBUTES_H
+#define AVUTIL_ATTRIBUTES_H
+
+#ifdef __GNUC__
+#    define AV_GCC_VERSION_AT_LEAST(x,y) (__GNUC__ > x || __GNUC__ == x && __GNUC_MINOR__ >= y)
+#else
+#    define AV_GCC_VERSION_AT_LEAST(x,y) 0
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(3,1)
+#    define av_always_inline __attribute__((always_inline)) inline
+#elif defined(_MSC_VER)
+#    define av_always_inline __forceinline
+#else
+#    define av_always_inline inline
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(3,1)
+#    define av_noinline __attribute__((noinline))
+#else
+#    define av_noinline
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(3,1)
+#    define av_pure __attribute__((pure))
+#else
+#    define av_pure
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(2,6)
+#    define av_const __attribute__((const))
+#else
+#    define av_const
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(4,3)
+#    define av_cold __attribute__((cold))
+#else
+#    define av_cold
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(4,1)
+#    define av_flatten __attribute__((flatten))
+#else
+#    define av_flatten
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(3,1)
+#    define attribute_deprecated __attribute__((deprecated))
+#else
+#    define attribute_deprecated
+#endif
+
+#if defined(__GNUC__)
+#    define av_unused __attribute__((unused))
+#else
+#    define av_unused
+#endif
+
+/**
+ * Mark a variable as used and prevent the compiler from optimizing it
+ * away.  This is useful for variables accessed only from inline
+ * assembler without the compiler being aware.
+ */
+#if AV_GCC_VERSION_AT_LEAST(3,1)
+#    define av_used __attribute__((used))
+#else
+#    define av_used
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(3,3)
+#   define av_alias __attribute__((may_alias))
+#else
+#   define av_alias
+#endif
+
+#if defined(__GNUC__) && !defined(__ICC)
+#    define av_uninit(x) x=x
+#else
+#    define av_uninit(x) x
+#endif
+
+#ifdef __GNUC__
+#    define av_builtin_constant_p __builtin_constant_p
+#    define av_printf_format(fmtpos, attrpos) __attribute__((__format__(__printf__, fmtpos, attrpos)))
+#else
+#    define av_builtin_constant_p(x) 0
+#    define av_printf_format(fmtpos, attrpos)
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(2,5)
+#    define av_noreturn __attribute__((noreturn))
+#else
+#    define av_noreturn
+#endif
+
+#endif /* AVUTIL_ATTRIBUTES_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/audioconvert.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/audioconvert.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/audioconvert.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/audioconvert.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,6 @@
+
+#include "version.h"
+
+#if FF_API_AUDIOCONVERT
+#include "channel_layout.h"
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/audio_fifo.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/audio_fifo.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/audio_fifo.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/audio_fifo.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,146 @@
+/*
+ * Audio FIFO
+ * Copyright (c) 2012 Justin Ruggles <justin.ruggles@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Audio FIFO Buffer
+ */
+
+#ifndef AVUTIL_AUDIO_FIFO_H
+#define AVUTIL_AUDIO_FIFO_H
+
+#include "avutil.h"
+#include "fifo.h"
+#include "samplefmt.h"
+
+/**
+ * @addtogroup lavu_audio
+ * @{
+ */
+
+/**
+ * Context for an Audio FIFO Buffer.
+ *
+ * - Operates at the sample level rather than the byte level.
+ * - Supports multiple channels with either planar or packed sample format.
+ * - Automatic reallocation when writing to a full buffer.
+ */
+typedef struct AVAudioFifo AVAudioFifo;
+
+/**
+ * Free an AVAudioFifo.
+ *
+ * @param af  AVAudioFifo to free
+ */
+void av_audio_fifo_free(AVAudioFifo *af);
+
+/**
+ * Allocate an AVAudioFifo.
+ *
+ * @param sample_fmt  sample format
+ * @param channels    number of channels
+ * @param nb_samples  initial allocation size, in samples
+ * @return            newly allocated AVAudioFifo, or NULL on error
+ */
+AVAudioFifo *av_audio_fifo_alloc(enum AVSampleFormat sample_fmt, int channels,
+                                 int nb_samples);
+
+/**
+ * Reallocate an AVAudioFifo.
+ *
+ * @param af          AVAudioFifo to reallocate
+ * @param nb_samples  new allocation size, in samples
+ * @return            0 if OK, or negative AVERROR code on failure
+ */
+int av_audio_fifo_realloc(AVAudioFifo *af, int nb_samples);
+
+/**
+ * Write data to an AVAudioFifo.
+ *
+ * The AVAudioFifo will be reallocated automatically if the available space
+ * is less than nb_samples.
+ *
+ * @see enum AVSampleFormat
+ * The documentation for AVSampleFormat describes the data layout.
+ *
+ * @param af          AVAudioFifo to write to
+ * @param data        audio data plane pointers
+ * @param nb_samples  number of samples to write
+ * @return            number of samples actually written, or negative AVERROR
+ *                    code on failure.
+ */
+int av_audio_fifo_write(AVAudioFifo *af, void **data, int nb_samples);
+
+/**
+ * Read data from an AVAudioFifo.
+ *
+ * @see enum AVSampleFormat
+ * The documentation for AVSampleFormat describes the data layout.
+ *
+ * @param af          AVAudioFifo to read from
+ * @param data        audio data plane pointers
+ * @param nb_samples  number of samples to read
+ * @return            number of samples actually read, or negative AVERROR code
+ *                    on failure.
+ */
+int av_audio_fifo_read(AVAudioFifo *af, void **data, int nb_samples);
+
+/**
+ * Drain data from an AVAudioFifo.
+ *
+ * Removes the data without reading it.
+ *
+ * @param af          AVAudioFifo to drain
+ * @param nb_samples  number of samples to drain
+ * @return            0 if OK, or negative AVERROR code on failure
+ */
+int av_audio_fifo_drain(AVAudioFifo *af, int nb_samples);
+
+/**
+ * Reset the AVAudioFifo buffer.
+ *
+ * This empties all data in the buffer.
+ *
+ * @param af  AVAudioFifo to reset
+ */
+void av_audio_fifo_reset(AVAudioFifo *af);
+
+/**
+ * Get the current number of samples in the AVAudioFifo available for reading.
+ *
+ * @param af  the AVAudioFifo to query
+ * @return    number of samples available for reading
+ */
+int av_audio_fifo_size(AVAudioFifo *af);
+
+/**
+ * Get the current number of samples in the AVAudioFifo available for writing.
+ *
+ * @param af  the AVAudioFifo to query
+ * @return    number of samples available for writing
+ */
+int av_audio_fifo_space(AVAudioFifo *af);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_AUDIO_FIFO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/avassert.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/avassert.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/avassert.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/avassert.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,66 @@
+/*
+ * copyright (c) 2010 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * simple assert() macros that are a bit more flexible than ISO C assert().
+ * @author Michael Niedermayer <michaelni@gmx.at>
+ */
+
+#ifndef AVUTIL_AVASSERT_H
+#define AVUTIL_AVASSERT_H
+
+#include <stdlib.h>
+#include "avutil.h"
+#include "log.h"
+
+/**
+ * assert() equivalent, that is always enabled.
+ */
+#define av_assert0(cond) do {                                           \
+    if (!(cond)) {                                                      \
+        av_log(NULL, AV_LOG_FATAL, "Assertion %s failed at %s:%d\n",    \
+               AV_STRINGIFY(cond), __FILE__, __LINE__);                 \
+        abort();                                                        \
+    }                                                                   \
+} while (0)
+
+
+/**
+ * assert() equivalent, that does not lie in speed critical code.
+ * These asserts() thus can be enabled without fearing speedloss.
+ */
+#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 0
+#define av_assert1(cond) av_assert0(cond)
+#else
+#define av_assert1(cond) ((void)0)
+#endif
+
+
+/**
+ * assert() equivalent, that does lie in speed critical code.
+ */
+#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 1
+#define av_assert2(cond) av_assert0(cond)
+#else
+#define av_assert2(cond) ((void)0)
+#endif
+
+#endif /* AVUTIL_AVASSERT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/avconfig.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/avconfig.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/avconfig.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/avconfig.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,6 @@
+/* Generated by ffconf */
+#ifndef AVUTIL_AVCONFIG_H
+#define AVUTIL_AVCONFIG_H
+#define AV_HAVE_BIGENDIAN 0
+#define AV_HAVE_FAST_UNALIGNED 1
+#endif /* AVUTIL_AVCONFIG_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/avstring.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/avstring.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/avstring.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/avstring.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 2007 Mans Rullgard
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_AVSTRING_H
+#define AVUTIL_AVSTRING_H
+
+#include <stddef.h>
+#include "attributes.h"
+
+/**
+ * @addtogroup lavu_string
+ * @{
+ */
+
+/**
+ * Return non-zero if pfx is a prefix of str. If it is, *ptr is set to
+ * the address of the first character in str after the prefix.
+ *
+ * @param str input string
+ * @param pfx prefix to test
+ * @param ptr updated if the prefix is matched inside str
+ * @return non-zero if the prefix matches, zero otherwise
+ */
+int av_strstart(const char *str, const char *pfx, const char **ptr);
+
+/**
+ * Return non-zero if pfx is a prefix of str independent of case. If
+ * it is, *ptr is set to the address of the first character in str
+ * after the prefix.
+ *
+ * @param str input string
+ * @param pfx prefix to test
+ * @param ptr updated if the prefix is matched inside str
+ * @return non-zero if the prefix matches, zero otherwise
+ */
+int av_stristart(const char *str, const char *pfx, const char **ptr);
+
+/**
+ * Locate the first case-independent occurrence in the string haystack
+ * of the string needle.  A zero-length string needle is considered to
+ * match at the start of haystack.
+ *
+ * This function is a case-insensitive version of the standard strstr().
+ *
+ * @param haystack string to search in
+ * @param needle   string to search for
+ * @return         pointer to the located match within haystack
+ *                 or a null pointer if no match
+ */
+char *av_stristr(const char *haystack, const char *needle);
+
+/**
+ * Copy the string src to dst, but no more than size - 1 bytes, and
+ * null-terminate dst.
+ *
+ * This function is the same as BSD strlcpy().
+ *
+ * @param dst destination buffer
+ * @param src source string
+ * @param size size of destination buffer
+ * @return the length of src
+ *
+ * @warning since the return value is the length of src, src absolutely
+ * _must_ be a properly 0-terminated string, otherwise this will read beyond
+ * the end of the buffer and possibly crash.
+ */
+size_t av_strlcpy(char *dst, const char *src, size_t size);
+
+/**
+ * Append the string src to the string dst, but to a total length of
+ * no more than size - 1 bytes, and null-terminate dst.
+ *
+ * This function is similar to BSD strlcat(), but differs when
+ * size <= strlen(dst).
+ *
+ * @param dst destination buffer
+ * @param src source string
+ * @param size size of destination buffer
+ * @return the total length of src and dst
+ *
+ * @warning since the return value use the length of src and dst, these
+ * absolutely _must_ be a properly 0-terminated strings, otherwise this
+ * will read beyond the end of the buffer and possibly crash.
+ */
+size_t av_strlcat(char *dst, const char *src, size_t size);
+
+/**
+ * Append output to a string, according to a format. Never write out of
+ * the destination buffer, and always put a terminating 0 within
+ * the buffer.
+ * @param dst destination buffer (string to which the output is
+ *  appended)
+ * @param size total size of the destination buffer
+ * @param fmt printf-compatible format string, specifying how the
+ *  following parameters are used
+ * @return the length of the string that would have been generated
+ *  if enough space had been available
+ */
+size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...) av_printf_format(3, 4);
+
+/**
+ * Convert a number to a av_malloced string.
+ */
+char *av_d2str(double d);
+
+/**
+ * Unescape the given string until a non escaped terminating char,
+ * and return the token corresponding to the unescaped string.
+ *
+ * The normal \ and ' escaping is supported. Leading and trailing
+ * whitespaces are removed, unless they are escaped with '\' or are
+ * enclosed between ''.
+ *
+ * @param buf the buffer to parse, buf will be updated to point to the
+ * terminating char
+ * @param term a 0-terminated list of terminating chars
+ * @return the malloced unescaped string, which must be av_freed by
+ * the user, NULL in case of allocation failure
+ */
+char *av_get_token(const char **buf, const char *term);
+
+/**
+ * Locale-independent conversion of ASCII characters to uppercase.
+ */
+static inline int av_toupper(int c)
+{
+    if (c >= 'a' && c <= 'z')
+        c ^= 0x20;
+    return c;
+}
+
+/**
+ * Locale-independent conversion of ASCII characters to lowercase.
+ */
+static inline int av_tolower(int c)
+{
+    if (c >= 'A' && c <= 'Z')
+        c ^= 0x20;
+    return c;
+}
+
+/*
+ * Locale-independent case-insensitive compare.
+ * @note This means only ASCII-range characters are case-insensitive
+ */
+int av_strcasecmp(const char *a, const char *b);
+
+/**
+ * Locale-independent case-insensitive compare.
+ * @note This means only ASCII-range characters are case-insensitive
+ */
+int av_strncasecmp(const char *a, const char *b, size_t n);
+
+
+/**
+ * Thread safe basename.
+ * @param path the path, on DOS both \ and / are considered separators.
+ * @return pointer to the basename substring.
+ */
+const char *av_basename(const char *path);
+
+/**
+ * Thread safe dirname.
+ * @param path the path, on DOS both \ and / are considered separators.
+ * @return the path with the separator replaced by the string terminator or ".".
+ * @note the function may change the input string.
+ */
+const char *av_dirname(char *path);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_AVSTRING_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/avutil.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/avutil.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/avutil.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/avutil.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,275 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_AVUTIL_H
+#define AVUTIL_AVUTIL_H
+
+/**
+ * @file
+ * external API header
+ */
+
+/**
+ * @mainpage
+ *
+ * @section libav_intro Introduction
+ *
+ * This document describes the usage of the different libraries
+ * provided by Libav.
+ *
+ * @li @ref libavc "libavcodec" encoding/decoding library
+ * @li @subpage libavfilter graph based frame editing library
+ * @li @ref libavf "libavformat" I/O and muxing/demuxing library
+ * @li @ref lavd "libavdevice" special devices muxing/demuxing library
+ * @li @ref lavu "libavutil" common utility library
+ * @li @ref lavr "libavresample" audio resampling, format conversion and mixing
+ * @li @subpage libswscale  color conversion and scaling library
+ */
+
+/**
+ * @defgroup lavu Common utility functions
+ *
+ * @brief
+ * libavutil contains the code shared across all the other Libav
+ * libraries
+ *
+ * @note In order to use the functions provided by avutil you must include
+ * the specific header.
+ *
+ * @{
+ *
+ * @defgroup lavu_crypto Crypto and Hashing
+ *
+ * @{
+ * @}
+ *
+ * @defgroup lavu_math Maths
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_string String Manipulation
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_mem Memory Management
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_data Data Structures
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_audio Audio related
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_error Error Codes
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_misc Other
+ *
+ * @{
+ *
+ * @defgroup lavu_internal Internal
+ *
+ * Not exported functions, for internal usage only
+ *
+ * @{
+ *
+ * @}
+ */
+
+
+/**
+ * @defgroup preproc_misc Preprocessor String Macros
+ *
+ * String manipulation macros
+ *
+ * @{
+ */
+
+#define AV_STRINGIFY(s)         AV_TOSTRING(s)
+#define AV_TOSTRING(s) #s
+
+#define AV_GLUE(a, b) a ## b
+#define AV_JOIN(a, b) AV_GLUE(a, b)
+
+#define AV_PRAGMA(s) _Pragma(#s)
+
+/**
+ * @}
+ */
+
+/**
+ * @defgroup version_utils Library Version Macros
+ *
+ * Useful to check and match library version in order to maintain
+ * backward compatibility.
+ *
+ * @{
+ */
+
+#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
+#define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c
+#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
+
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup lavu_ver
+ * @{
+ */
+
+/**
+ * Return the LIBAVUTIL_VERSION_INT constant.
+ */
+unsigned avutil_version(void);
+
+/**
+ * Return the libavutil build-time configuration.
+ */
+const char *avutil_configuration(void);
+
+/**
+ * Return the libavutil license.
+ */
+const char *avutil_license(void);
+
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup lavu_media Media Type
+ * @brief Media Type
+ */
+
+enum AVMediaType {
+    AVMEDIA_TYPE_UNKNOWN = -1,  ///< Usually treated as AVMEDIA_TYPE_DATA
+    AVMEDIA_TYPE_VIDEO,
+    AVMEDIA_TYPE_AUDIO,
+    AVMEDIA_TYPE_DATA,          ///< Opaque data information usually continuous
+    AVMEDIA_TYPE_SUBTITLE,
+    AVMEDIA_TYPE_ATTACHMENT,    ///< Opaque data information usually sparse
+    AVMEDIA_TYPE_NB
+};
+
+/**
+ * @defgroup lavu_const Constants
+ * @{
+ *
+ * @defgroup lavu_enc Encoding specific
+ *
+ * @note those definition should move to avcodec
+ * @{
+ */
+
+#define FF_LAMBDA_SHIFT 7
+#define FF_LAMBDA_SCALE (1<<FF_LAMBDA_SHIFT)
+#define FF_QP2LAMBDA 118 ///< factor to convert from H.263 QP to lambda
+#define FF_LAMBDA_MAX (256*128-1)
+
+#define FF_QUALITY_SCALE FF_LAMBDA_SCALE //FIXME maybe remove
+
+/**
+ * @}
+ * @defgroup lavu_time Timestamp specific
+ *
+ * Libav internal timebase and timestamp definitions
+ *
+ * @{
+ */
+
+/**
+ * @brief Undefined timestamp value
+ *
+ * Usually reported by demuxer that work on containers that do not provide
+ * either pts or dts.
+ */
+
+#define AV_NOPTS_VALUE          INT64_C(0x8000000000000000)
+
+/**
+ * Internal time base represented as integer
+ */
+
+#define AV_TIME_BASE            1000000
+
+/**
+ * Internal time base represented as fractional value
+ */
+
+#define AV_TIME_BASE_Q          (AVRational){1, AV_TIME_BASE}
+
+/**
+ * @}
+ * @}
+ * @defgroup lavu_picture Image related
+ *
+ * AVPicture types, pixel formats and basic image planes manipulation.
+ *
+ * @{
+ */
+
+enum AVPictureType {
+    AV_PICTURE_TYPE_I = 1, ///< Intra
+    AV_PICTURE_TYPE_P,     ///< Predicted
+    AV_PICTURE_TYPE_B,     ///< Bi-dir predicted
+    AV_PICTURE_TYPE_S,     ///< S(GMC)-VOP MPEG4
+    AV_PICTURE_TYPE_SI,    ///< Switching Intra
+    AV_PICTURE_TYPE_SP,    ///< Switching Predicted
+    AV_PICTURE_TYPE_BI,    ///< BI type
+};
+
+/**
+ * Return a single letter to describe the given picture type
+ * pict_type.
+ *
+ * @param[in] pict_type the picture type @return a single character
+ * representing the picture type, '?' if pict_type is unknown
+ */
+char av_get_picture_type_char(enum AVPictureType pict_type);
+
+/**
+ * @}
+ */
+
+#include "error.h"
+#include "version.h"
+
+/**
+ * @}
+ * @}
+ */
+
+#endif /* AVUTIL_AVUTIL_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/base64.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/base64.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/base64.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/base64.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2006 Ryan Martell. (rdm4@martellventures.com)
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_BASE64_H
+#define AVUTIL_BASE64_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_base64 Base64
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+
+/**
+ * Decode a base64-encoded string.
+ *
+ * @param out      buffer for decoded data
+ * @param in       null-terminated input string
+ * @param out_size size in bytes of the out buffer, must be at
+ *                 least 3/4 of the length of in
+ * @return         number of bytes written, or a negative value in case of
+ *                 invalid input
+ */
+int av_base64_decode(uint8_t *out, const char *in, int out_size);
+
+/**
+ * Encode data to base64 and null-terminate.
+ *
+ * @param out      buffer for encoded data
+ * @param out_size size in bytes of the output buffer, must be at
+ *                 least AV_BASE64_SIZE(in_size)
+ * @param in_size  size in bytes of the 'in' buffer
+ * @return         'out' or NULL in case of error
+ */
+char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size);
+
+/**
+ * Calculate the output size needed to base64-encode x bytes.
+ */
+#define AV_BASE64_SIZE(x)  (((x)+2) / 3 * 4 + 1)
+
+ /**
+  * @}
+  */
+
+#endif /* AVUTIL_BASE64_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/blowfish.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/blowfish.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/blowfish.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/blowfish.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,76 @@
+/*
+ * Blowfish algorithm
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_BLOWFISH_H
+#define AVUTIL_BLOWFISH_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_blowfish Blowfish
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+#define AV_BF_ROUNDS 16
+
+typedef struct AVBlowfish {
+    uint32_t p[AV_BF_ROUNDS + 2];
+    uint32_t s[4][256];
+} AVBlowfish;
+
+/**
+ * Initialize an AVBlowfish context.
+ *
+ * @param ctx an AVBlowfish context
+ * @param key a key
+ * @param key_len length of the key
+ */
+void av_blowfish_init(struct AVBlowfish *ctx, const uint8_t *key, int key_len);
+
+/**
+ * Encrypt or decrypt a buffer using a previously initialized context.
+ *
+ * @param ctx an AVBlowfish context
+ * @param xl left four bytes halves of input to be encrypted
+ * @param xr right four bytes halves of input to be encrypted
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+void av_blowfish_crypt_ecb(struct AVBlowfish *ctx, uint32_t *xl, uint32_t *xr,
+                           int decrypt);
+
+/**
+ * Encrypt or decrypt a buffer using a previously initialized context.
+ *
+ * @param ctx an AVBlowfish context
+ * @param dst destination array, can be equal to src
+ * @param src source array, can be equal to dst
+ * @param count number of 8 byte blocks
+ * @param iv initialization vector for CBC mode, if NULL ECB will be used
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+void av_blowfish_crypt(struct AVBlowfish *ctx, uint8_t *dst, const uint8_t *src,
+                       int count, uint8_t *iv, int decrypt);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_BLOWFISH_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/bswap.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/bswap.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/bswap.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/bswap.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,109 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * byte swapping routines
+ */
+
+#ifndef AVUTIL_BSWAP_H
+#define AVUTIL_BSWAP_H
+
+#include <stdint.h>
+#include "libavutil/avconfig.h"
+#include "attributes.h"
+
+#ifdef HAVE_AV_CONFIG_H
+
+#include "config.h"
+
+#if   ARCH_ARM
+#   include "arm/bswap.h"
+#elif ARCH_AVR32
+#   include "avr32/bswap.h"
+#elif ARCH_BFIN
+#   include "bfin/bswap.h"
+#elif ARCH_SH4
+#   include "sh4/bswap.h"
+#elif ARCH_X86
+#   include "x86/bswap.h"
+#endif
+
+#endif /* HAVE_AV_CONFIG_H */
+
+#define AV_BSWAP16C(x) (((x) << 8 & 0xff00)  | ((x) >> 8 & 0x00ff))
+#define AV_BSWAP32C(x) (AV_BSWAP16C(x) << 16 | AV_BSWAP16C((x) >> 16))
+#define AV_BSWAP64C(x) (AV_BSWAP32C(x) << 32 | AV_BSWAP32C((x) >> 32))
+
+#define AV_BSWAPC(s, x) AV_BSWAP##s##C(x)
+
+#ifndef av_bswap16
+static av_always_inline av_const uint16_t av_bswap16(uint16_t x)
+{
+    x= (x>>8) | (x<<8);
+    return x;
+}
+#endif
+
+#ifndef av_bswap32
+static av_always_inline av_const uint32_t av_bswap32(uint32_t x)
+{
+    return AV_BSWAP32C(x);
+}
+#endif
+
+#ifndef av_bswap64
+static inline uint64_t av_const av_bswap64(uint64_t x)
+{
+    return (uint64_t)av_bswap32(x) << 32 | av_bswap32(x >> 32);
+}
+#endif
+
+// be2ne ... big-endian to native-endian
+// le2ne ... little-endian to native-endian
+
+#if AV_HAVE_BIGENDIAN
+#define av_be2ne16(x) (x)
+#define av_be2ne32(x) (x)
+#define av_be2ne64(x) (x)
+#define av_le2ne16(x) av_bswap16(x)
+#define av_le2ne32(x) av_bswap32(x)
+#define av_le2ne64(x) av_bswap64(x)
+#define AV_BE2NEC(s, x) (x)
+#define AV_LE2NEC(s, x) AV_BSWAPC(s, x)
+#else
+#define av_be2ne16(x) av_bswap16(x)
+#define av_be2ne32(x) av_bswap32(x)
+#define av_be2ne64(x) av_bswap64(x)
+#define av_le2ne16(x) (x)
+#define av_le2ne32(x) (x)
+#define av_le2ne64(x) (x)
+#define AV_BE2NEC(s, x) AV_BSWAPC(s, x)
+#define AV_LE2NEC(s, x) (x)
+#endif
+
+#define AV_BE2NE16C(x) AV_BE2NEC(16, x)
+#define AV_BE2NE32C(x) AV_BE2NEC(32, x)
+#define AV_BE2NE64C(x) AV_BE2NEC(64, x)
+#define AV_LE2NE16C(x) AV_LE2NEC(16, x)
+#define AV_LE2NE32C(x) AV_LE2NEC(32, x)
+#define AV_LE2NE64C(x) AV_LE2NEC(64, x)
+
+#endif /* AVUTIL_BSWAP_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/channel_layout.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/channel_layout.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/channel_layout.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/channel_layout.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ * Copyright (c) 2008 Peter Ross
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_CHANNEL_LAYOUT_H
+#define AVUTIL_CHANNEL_LAYOUT_H
+
+#include <stdint.h>
+
+/**
+ * @file
+ * audio channel layout utility functions
+ */
+
+/**
+ * @addtogroup lavu_audio
+ * @{
+ */
+
+/**
+ * @defgroup channel_masks Audio channel masks
+ * @{
+ */
+#define AV_CH_FRONT_LEFT             0x00000001
+#define AV_CH_FRONT_RIGHT            0x00000002
+#define AV_CH_FRONT_CENTER           0x00000004
+#define AV_CH_LOW_FREQUENCY          0x00000008
+#define AV_CH_BACK_LEFT              0x00000010
+#define AV_CH_BACK_RIGHT             0x00000020
+#define AV_CH_FRONT_LEFT_OF_CENTER   0x00000040
+#define AV_CH_FRONT_RIGHT_OF_CENTER  0x00000080
+#define AV_CH_BACK_CENTER            0x00000100
+#define AV_CH_SIDE_LEFT              0x00000200
+#define AV_CH_SIDE_RIGHT             0x00000400
+#define AV_CH_TOP_CENTER             0x00000800
+#define AV_CH_TOP_FRONT_LEFT         0x00001000
+#define AV_CH_TOP_FRONT_CENTER       0x00002000
+#define AV_CH_TOP_FRONT_RIGHT        0x00004000
+#define AV_CH_TOP_BACK_LEFT          0x00008000
+#define AV_CH_TOP_BACK_CENTER        0x00010000
+#define AV_CH_TOP_BACK_RIGHT         0x00020000
+#define AV_CH_STEREO_LEFT            0x20000000  ///< Stereo downmix.
+#define AV_CH_STEREO_RIGHT           0x40000000  ///< See AV_CH_STEREO_LEFT.
+#define AV_CH_WIDE_LEFT              0x0000000080000000ULL
+#define AV_CH_WIDE_RIGHT             0x0000000100000000ULL
+#define AV_CH_SURROUND_DIRECT_LEFT   0x0000000200000000ULL
+#define AV_CH_SURROUND_DIRECT_RIGHT  0x0000000400000000ULL
+#define AV_CH_LOW_FREQUENCY_2        0x0000000800000000ULL
+
+/** Channel mask value used for AVCodecContext.request_channel_layout
+    to indicate that the user requests the channel order of the decoder output
+    to be the native codec channel order. */
+#define AV_CH_LAYOUT_NATIVE          0x8000000000000000ULL
+
+/**
+ * @}
+ * @defgroup channel_mask_c Audio channel convenience macros
+ * @{
+ * */
+#define AV_CH_LAYOUT_MONO              (AV_CH_FRONT_CENTER)
+#define AV_CH_LAYOUT_STEREO            (AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT)
+#define AV_CH_LAYOUT_2POINT1           (AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_2_1               (AV_CH_LAYOUT_STEREO|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_SURROUND          (AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER)
+#define AV_CH_LAYOUT_3POINT1           (AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_4POINT0           (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_4POINT1           (AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_2_2               (AV_CH_LAYOUT_STEREO|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
+#define AV_CH_LAYOUT_QUAD              (AV_CH_LAYOUT_STEREO|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_5POINT0           (AV_CH_LAYOUT_SURROUND|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
+#define AV_CH_LAYOUT_5POINT1           (AV_CH_LAYOUT_5POINT0|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_5POINT0_BACK      (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_5POINT1_BACK      (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_6POINT0           (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_6POINT0_FRONT     (AV_CH_LAYOUT_2_2|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_HEXAGONAL         (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_6POINT1           (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_6POINT1_BACK      (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_6POINT1_FRONT     (AV_CH_LAYOUT_6POINT0_FRONT|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_7POINT0           (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_7POINT0_FRONT     (AV_CH_LAYOUT_5POINT0|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_7POINT1           (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_7POINT1_WIDE      (AV_CH_LAYOUT_5POINT1|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_7POINT1_WIDE_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_OCTAGONAL         (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_STEREO_DOWNMIX    (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT)
+
+enum AVMatrixEncoding {
+    AV_MATRIX_ENCODING_NONE,
+    AV_MATRIX_ENCODING_DOLBY,
+    AV_MATRIX_ENCODING_DPLII,
+    AV_MATRIX_ENCODING_NB
+};
+
+/**
+ * @}
+ */
+
+/**
+ * Return a channel layout id that matches name, or 0 if no match is found.
+ *
+ * name can be one or several of the following notations,
+ * separated by '+' or '|':
+ * - the name of an usual channel layout (mono, stereo, 4.0, quad, 5.0,
+ *   5.0(side), 5.1, 5.1(side), 7.1, 7.1(wide), downmix);
+ * - the name of a single channel (FL, FR, FC, LFE, BL, BR, FLC, FRC, BC,
+ *   SL, SR, TC, TFL, TFC, TFR, TBL, TBC, TBR, DL, DR);
+ * - a number of channels, in decimal, optionally followed by 'c', yielding
+ *   the default channel layout for that number of channels (@see
+ *   av_get_default_channel_layout);
+ * - a channel layout mask, in hexadecimal starting with "0x" (see the
+ *   AV_CH_* macros).
+ *
+ * Example: "stereo+FC" = "2+FC" = "2c+1c" = "0x7"
+ */
+uint64_t av_get_channel_layout(const char *name);
+
+/**
+ * Return a description of a channel layout.
+ * If nb_channels is <= 0, it is guessed from the channel_layout.
+ *
+ * @param buf put here the string containing the channel layout
+ * @param buf_size size in bytes of the buffer
+ */
+void av_get_channel_layout_string(char *buf, int buf_size, int nb_channels, uint64_t channel_layout);
+
+/**
+ * Return the number of channels in the channel layout.
+ */
+int av_get_channel_layout_nb_channels(uint64_t channel_layout);
+
+/**
+ * Return default channel layout for a given number of channels.
+ */
+uint64_t av_get_default_channel_layout(int nb_channels);
+
+/**
+ * Get the index of a channel in channel_layout.
+ *
+ * @param channel a channel layout describing exactly one channel which must be
+ *                present in channel_layout.
+ *
+ * @return index of channel in channel_layout on success, a negative AVERROR
+ *         on error.
+ */
+int av_get_channel_layout_channel_index(uint64_t channel_layout,
+                                        uint64_t channel);
+
+/**
+ * Get the channel with the given index in channel_layout.
+ */
+uint64_t av_channel_layout_extract_channel(uint64_t channel_layout, int index);
+
+/**
+ * Get the name of a given channel.
+ *
+ * @return channel name on success, NULL on error.
+ */
+const char *av_get_channel_name(uint64_t channel);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_CHANNEL_LAYOUT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/common.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/common.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/common.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/common.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,406 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * common internal and external API header
+ */
+
+#ifndef AVUTIL_COMMON_H
+#define AVUTIL_COMMON_H
+
+#include <ctype.h>
+#include <errno.h>
+#include <inttypes.h>
+#include <limits.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "attributes.h"
+#include "version.h"
+#include "libavutil/avconfig.h"
+
+#if AV_HAVE_BIGENDIAN
+#   define AV_NE(be, le) (be)
+#else
+#   define AV_NE(be, le) (le)
+#endif
+
+//rounded division & shift
+#define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
+/* assume b>0 */
+#define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b))
+#define FFABS(a) ((a) >= 0 ? (a) : (-(a)))
+#define FFSIGN(a) ((a) > 0 ? 1 : -1)
+
+#define FFMAX(a,b) ((a) > (b) ? (a) : (b))
+#define FFMAX3(a,b,c) FFMAX(FFMAX(a,b),c)
+#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
+#define FFMIN3(a,b,c) FFMIN(FFMIN(a,b),c)
+
+#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
+#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
+#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))
+
+/* misc math functions */
+
+#if FF_API_AV_REVERSE
+extern attribute_deprecated const uint8_t av_reverse[256];
+#endif
+
+#ifdef HAVE_AV_CONFIG_H
+#   include "config.h"
+#   include "intmath.h"
+#endif
+
+/* Pull in unguarded fallback defines at the end of this file. */
+#include "common.h"
+
+#ifndef av_log2
+av_const int av_log2(unsigned v);
+#endif
+
+#ifndef av_log2_16bit
+av_const int av_log2_16bit(unsigned v);
+#endif
+
+/**
+ * Clip a signed integer value into the amin-amax range.
+ * @param a value to clip
+ * @param amin minimum value of the clip range
+ * @param amax maximum value of the clip range
+ * @return clipped value
+ */
+static av_always_inline av_const int av_clip_c(int a, int amin, int amax)
+{
+    if      (a < amin) return amin;
+    else if (a > amax) return amax;
+    else               return a;
+}
+
+/**
+ * Clip a signed integer value into the 0-255 range.
+ * @param a value to clip
+ * @return clipped value
+ */
+static av_always_inline av_const uint8_t av_clip_uint8_c(int a)
+{
+    if (a&(~0xFF)) return (-a)>>31;
+    else           return a;
+}
+
+/**
+ * Clip a signed integer value into the -128,127 range.
+ * @param a value to clip
+ * @return clipped value
+ */
+static av_always_inline av_const int8_t av_clip_int8_c(int a)
+{
+    if ((a+0x80) & ~0xFF) return (a>>31) ^ 0x7F;
+    else                  return a;
+}
+
+/**
+ * Clip a signed integer value into the 0-65535 range.
+ * @param a value to clip
+ * @return clipped value
+ */
+static av_always_inline av_const uint16_t av_clip_uint16_c(int a)
+{
+    if (a&(~0xFFFF)) return (-a)>>31;
+    else             return a;
+}
+
+/**
+ * Clip a signed integer value into the -32768,32767 range.
+ * @param a value to clip
+ * @return clipped value
+ */
+static av_always_inline av_const int16_t av_clip_int16_c(int a)
+{
+    if ((a+0x8000) & ~0xFFFF) return (a>>31) ^ 0x7FFF;
+    else                      return a;
+}
+
+/**
+ * Clip a signed 64-bit integer value into the -2147483648,2147483647 range.
+ * @param a value to clip
+ * @return clipped value
+ */
+static av_always_inline av_const int32_t av_clipl_int32_c(int64_t a)
+{
+    if ((a+0x80000000u) & ~UINT64_C(0xFFFFFFFF)) return (a>>63) ^ 0x7FFFFFFF;
+    else                                         return a;
+}
+
+/**
+ * Clip a signed integer to an unsigned power of two range.
+ * @param  a value to clip
+ * @param  p bit position to clip at
+ * @return clipped value
+ */
+static av_always_inline av_const unsigned av_clip_uintp2_c(int a, int p)
+{
+    if (a & ~((1<<p) - 1)) return -a >> 31 & ((1<<p) - 1);
+    else                   return  a;
+}
+
+/**
+ * Add two signed 32-bit values with saturation.
+ *
+ * @param  a one value
+ * @param  b another value
+ * @return sum with signed saturation
+ */
+static av_always_inline int av_sat_add32_c(int a, int b)
+{
+    return av_clipl_int32((int64_t)a + b);
+}
+
+/**
+ * Add a doubled value to another value with saturation at both stages.
+ *
+ * @param  a first value
+ * @param  b value doubled and added to a
+ * @return sum with signed saturation
+ */
+static av_always_inline int av_sat_dadd32_c(int a, int b)
+{
+    return av_sat_add32(a, av_sat_add32(b, b));
+}
+
+/**
+ * Clip a float value into the amin-amax range.
+ * @param a value to clip
+ * @param amin minimum value of the clip range
+ * @param amax maximum value of the clip range
+ * @return clipped value
+ */
+static av_always_inline av_const float av_clipf_c(float a, float amin, float amax)
+{
+    if      (a < amin) return amin;
+    else if (a > amax) return amax;
+    else               return a;
+}
+
+/** Compute ceil(log2(x)).
+ * @param x value used to compute ceil(log2(x))
+ * @return computed ceiling of log2(x)
+ */
+static av_always_inline av_const int av_ceil_log2_c(int x)
+{
+    return av_log2((x - 1) << 1);
+}
+
+/**
+ * Count number of bits set to one in x
+ * @param x value to count bits of
+ * @return the number of bits set to one in x
+ */
+static av_always_inline av_const int av_popcount_c(uint32_t x)
+{
+    x -= (x >> 1) & 0x55555555;
+    x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
+    x = (x + (x >> 4)) & 0x0F0F0F0F;
+    x += x >> 8;
+    return (x + (x >> 16)) & 0x3F;
+}
+
+/**
+ * Count number of bits set to one in x
+ * @param x value to count bits of
+ * @return the number of bits set to one in x
+ */
+static av_always_inline av_const int av_popcount64_c(uint64_t x)
+{
+    return av_popcount(x) + av_popcount(x >> 32);
+}
+
+#define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24))
+#define MKBETAG(a,b,c,d) ((d) | ((c) << 8) | ((b) << 16) | ((unsigned)(a) << 24))
+
+/**
+ * Convert a UTF-8 character (up to 4 bytes) to its 32-bit UCS-4 encoded form.
+ *
+ * @param val      Output value, must be an lvalue of type uint32_t.
+ * @param GET_BYTE Expression reading one byte from the input.
+ *                 Evaluated up to 7 times (4 for the currently
+ *                 assigned Unicode range).  With a memory buffer
+ *                 input, this could be *ptr++.
+ * @param ERROR    Expression to be evaluated on invalid input,
+ *                 typically a goto statement.
+ */
+#define GET_UTF8(val, GET_BYTE, ERROR)\
+    val= GET_BYTE;\
+    {\
+        uint32_t top = (val & 128) >> 1;\
+        if ((val & 0xc0) == 0x80)\
+            ERROR\
+        while (val & top) {\
+            int tmp= GET_BYTE - 128;\
+            if(tmp>>6)\
+                ERROR\
+            val= (val<<6) + tmp;\
+            top <<= 5;\
+        }\
+        val &= (top << 1) - 1;\
+    }
+
+/**
+ * Convert a UTF-16 character (2 or 4 bytes) to its 32-bit UCS-4 encoded form.
+ *
+ * @param val       Output value, must be an lvalue of type uint32_t.
+ * @param GET_16BIT Expression returning two bytes of UTF-16 data converted
+ *                  to native byte order.  Evaluated one or two times.
+ * @param ERROR     Expression to be evaluated on invalid input,
+ *                  typically a goto statement.
+ */
+#define GET_UTF16(val, GET_16BIT, ERROR)\
+    val = GET_16BIT;\
+    {\
+        unsigned int hi = val - 0xD800;\
+        if (hi < 0x800) {\
+            val = GET_16BIT - 0xDC00;\
+            if (val > 0x3FFU || hi > 0x3FFU)\
+                ERROR\
+            val += (hi<<10) + 0x10000;\
+        }\
+    }\
+
+/**
+ * @def PUT_UTF8(val, tmp, PUT_BYTE)
+ * Convert a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes long).
+ * @param val is an input-only argument and should be of type uint32_t. It holds
+ * a UCS-4 encoded Unicode character that is to be converted to UTF-8. If
+ * val is given as a function it is executed only once.
+ * @param tmp is a temporary variable and should be of type uint8_t. It
+ * represents an intermediate value during conversion that is to be
+ * output by PUT_BYTE.
+ * @param PUT_BYTE writes the converted UTF-8 bytes to any proper destination.
+ * It could be a function or a statement, and uses tmp as the input byte.
+ * For example, PUT_BYTE could be "*output++ = tmp;" PUT_BYTE will be
+ * executed up to 4 times for values in the valid UTF-8 range and up to
+ * 7 times in the general case, depending on the length of the converted
+ * Unicode character.
+ */
+#define PUT_UTF8(val, tmp, PUT_BYTE)\
+    {\
+        int bytes, shift;\
+        uint32_t in = val;\
+        if (in < 0x80) {\
+            tmp = in;\
+            PUT_BYTE\
+        } else {\
+            bytes = (av_log2(in) + 4) / 5;\
+            shift = (bytes - 1) * 6;\
+            tmp = (256 - (256 >> bytes)) | (in >> shift);\
+            PUT_BYTE\
+            while (shift >= 6) {\
+                shift -= 6;\
+                tmp = 0x80 | ((in >> shift) & 0x3f);\
+                PUT_BYTE\
+            }\
+        }\
+    }
+
+/**
+ * @def PUT_UTF16(val, tmp, PUT_16BIT)
+ * Convert a 32-bit Unicode character to its UTF-16 encoded form (2 or 4 bytes).
+ * @param val is an input-only argument and should be of type uint32_t. It holds
+ * a UCS-4 encoded Unicode character that is to be converted to UTF-16. If
+ * val is given as a function it is executed only once.
+ * @param tmp is a temporary variable and should be of type uint16_t. It
+ * represents an intermediate value during conversion that is to be
+ * output by PUT_16BIT.
+ * @param PUT_16BIT writes the converted UTF-16 data to any proper destination
+ * in desired endianness. It could be a function or a statement, and uses tmp
+ * as the input byte.  For example, PUT_BYTE could be "*output++ = tmp;"
+ * PUT_BYTE will be executed 1 or 2 times depending on input character.
+ */
+#define PUT_UTF16(val, tmp, PUT_16BIT)\
+    {\
+        uint32_t in = val;\
+        if (in < 0x10000) {\
+            tmp = in;\
+            PUT_16BIT\
+        } else {\
+            tmp = 0xD800 | ((in - 0x10000) >> 10);\
+            PUT_16BIT\
+            tmp = 0xDC00 | ((in - 0x10000) & 0x3FF);\
+            PUT_16BIT\
+        }\
+    }\
+
+
+
+#include "mem.h"
+
+#ifdef HAVE_AV_CONFIG_H
+#    include "internal.h"
+#endif /* HAVE_AV_CONFIG_H */
+
+#endif /* AVUTIL_COMMON_H */
+
+/*
+ * The following definitions are outside the multiple inclusion guard
+ * to ensure they are immediately available in intmath.h.
+ */
+
+#ifndef av_ceil_log2
+#   define av_ceil_log2     av_ceil_log2_c
+#endif
+#ifndef av_clip
+#   define av_clip          av_clip_c
+#endif
+#ifndef av_clip_uint8
+#   define av_clip_uint8    av_clip_uint8_c
+#endif
+#ifndef av_clip_int8
+#   define av_clip_int8     av_clip_int8_c
+#endif
+#ifndef av_clip_uint16
+#   define av_clip_uint16   av_clip_uint16_c
+#endif
+#ifndef av_clip_int16
+#   define av_clip_int16    av_clip_int16_c
+#endif
+#ifndef av_clipl_int32
+#   define av_clipl_int32   av_clipl_int32_c
+#endif
+#ifndef av_clip_uintp2
+#   define av_clip_uintp2   av_clip_uintp2_c
+#endif
+#ifndef av_sat_add32
+#   define av_sat_add32     av_sat_add32_c
+#endif
+#ifndef av_sat_dadd32
+#   define av_sat_dadd32    av_sat_dadd32_c
+#endif
+#ifndef av_clipf
+#   define av_clipf         av_clipf_c
+#endif
+#ifndef av_popcount
+#   define av_popcount      av_popcount_c
+#endif
+#ifndef av_popcount64
+#   define av_popcount64    av_popcount64_c
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/cpu.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/cpu.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/cpu.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/cpu.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_CPU_H
+#define AVUTIL_CPU_H
+
+#include "version.h"
+
+#define AV_CPU_FLAG_FORCE    0x80000000 /* force usage of selected flags (OR) */
+
+    /* lower 16 bits - CPU features */
+#define AV_CPU_FLAG_MMX          0x0001 ///< standard MMX
+#define AV_CPU_FLAG_MMXEXT       0x0002 ///< SSE integer functions or AMD MMX ext
+#if FF_API_CPU_FLAG_MMX2
+#define AV_CPU_FLAG_MMX2         0x0002 ///< SSE integer functions or AMD MMX ext
+#endif
+#define AV_CPU_FLAG_3DNOW        0x0004 ///< AMD 3DNOW
+#define AV_CPU_FLAG_SSE          0x0008 ///< SSE functions
+#define AV_CPU_FLAG_SSE2         0x0010 ///< PIV SSE2 functions
+#define AV_CPU_FLAG_SSE2SLOW 0x40000000 ///< SSE2 supported, but usually not faster
+#define AV_CPU_FLAG_3DNOWEXT     0x0020 ///< AMD 3DNowExt
+#define AV_CPU_FLAG_SSE3         0x0040 ///< Prescott SSE3 functions
+#define AV_CPU_FLAG_SSE3SLOW 0x20000000 ///< SSE3 supported, but usually not faster
+#define AV_CPU_FLAG_SSSE3        0x0080 ///< Conroe SSSE3 functions
+#define AV_CPU_FLAG_ATOM     0x10000000 ///< Atom processor, some SSSE3 instructions are slower
+#define AV_CPU_FLAG_SSE4         0x0100 ///< Penryn SSE4.1 functions
+#define AV_CPU_FLAG_SSE42        0x0200 ///< Nehalem SSE4.2 functions
+#define AV_CPU_FLAG_AVX          0x4000 ///< AVX functions: requires OS support even if YMM registers aren't used
+#define AV_CPU_FLAG_XOP          0x0400 ///< Bulldozer XOP functions
+#define AV_CPU_FLAG_FMA4         0x0800 ///< Bulldozer FMA4 functions
+#define AV_CPU_FLAG_CMOV         0x1000 ///< i686 cmov
+
+#define AV_CPU_FLAG_ALTIVEC      0x0001 ///< standard
+
+#define AV_CPU_FLAG_ARMV5TE      (1 << 0)
+#define AV_CPU_FLAG_ARMV6        (1 << 1)
+#define AV_CPU_FLAG_ARMV6T2      (1 << 2)
+#define AV_CPU_FLAG_VFP          (1 << 3)
+#define AV_CPU_FLAG_VFPV3        (1 << 4)
+#define AV_CPU_FLAG_NEON         (1 << 5)
+
+/**
+ * Return the flags which specify extensions supported by the CPU.
+ */
+int av_get_cpu_flags(void);
+
+/**
+ * Set a mask on flags returned by av_get_cpu_flags().
+ * This function is mainly useful for testing.
+ *
+ * @warning this function is not thread safe.
+ */
+void av_set_cpu_flags_mask(int mask);
+
+/**
+ * Parse CPU flags from a string.
+ *
+ * @return a combination of AV_CPU_* flags, negative on error.
+ */
+int av_parse_cpu_flags(const char *s);
+
+/* The following CPU-specific functions shall not be called directly. */
+int ff_get_cpu_flags_arm(void);
+int ff_get_cpu_flags_ppc(void);
+int ff_get_cpu_flags_x86(void);
+
+#endif /* AVUTIL_CPU_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/crc.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/crc.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/crc.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/crc.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,74 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_CRC_H
+#define AVUTIL_CRC_H
+
+#include <stdint.h>
+#include <stddef.h>
+#include "attributes.h"
+
+typedef uint32_t AVCRC;
+
+typedef enum {
+    AV_CRC_8_ATM,
+    AV_CRC_16_ANSI,
+    AV_CRC_16_CCITT,
+    AV_CRC_32_IEEE,
+    AV_CRC_32_IEEE_LE,  /*< reversed bitorder version of AV_CRC_32_IEEE */
+    AV_CRC_MAX,         /*< Not part of public API! Do not use outside libavutil. */
+}AVCRCId;
+
+/**
+ * Initialize a CRC table.
+ * @param ctx must be an array of size sizeof(AVCRC)*257 or sizeof(AVCRC)*1024
+ * @param le If 1, the lowest bit represents the coefficient for the highest
+ *           exponent of the corresponding polynomial (both for poly and
+ *           actual CRC).
+ *           If 0, you must swap the CRC parameter and the result of av_crc
+ *           if you need the standard representation (can be simplified in
+ *           most cases to e.g. bswap16):
+ *           av_bswap32(crc << (32-bits))
+ * @param bits number of bits for the CRC
+ * @param poly generator polynomial without the x**bits coefficient, in the
+ *             representation as specified by le
+ * @param ctx_size size of ctx in bytes
+ * @return <0 on failure
+ */
+int av_crc_init(AVCRC *ctx, int le, int bits, uint32_t poly, int ctx_size);
+
+/**
+ * Get an initialized standard CRC table.
+ * @param crc_id ID of a standard CRC
+ * @return a pointer to the CRC table or NULL on failure
+ */
+const AVCRC *av_crc_get_table(AVCRCId crc_id);
+
+/**
+ * Calculate the CRC of a block.
+ * @param crc CRC of previous blocks if any or initial value for CRC
+ * @return CRC updated with the data from the given block
+ *
+ * @see av_crc_init() "le" parameter
+ */
+uint32_t av_crc(const AVCRC *ctx, uint32_t crc,
+                const uint8_t *buffer, size_t length) av_pure;
+
+#endif /* AVUTIL_CRC_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/dict.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/dict.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/dict.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/dict.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,129 @@
+/*
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Public dictionary API.
+ */
+
+#ifndef AVUTIL_DICT_H
+#define AVUTIL_DICT_H
+
+/**
+ * @addtogroup lavu_dict AVDictionary
+ * @ingroup lavu_data
+ *
+ * @brief Simple key:value store
+ *
+ * @{
+ * Dictionaries are used for storing key:value pairs. To create
+ * an AVDictionary, simply pass an address of a NULL pointer to
+ * av_dict_set(). NULL can be used as an empty dictionary wherever
+ * a pointer to an AVDictionary is required.
+ * Use av_dict_get() to retrieve an entry or iterate over all
+ * entries and finally av_dict_free() to free the dictionary
+ * and all its contents.
+ *
+ * @code
+ * AVDictionary *d = NULL;                // "create" an empty dictionary
+ * av_dict_set(&d, "foo", "bar", 0);      // add an entry
+ *
+ * char *k = av_strdup("key");            // if your strings are already allocated,
+ * char *v = av_strdup("value");          // you can avoid copying them like this
+ * av_dict_set(&d, k, v, AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
+ *
+ * AVDictionaryEntry *t = NULL;
+ * while (t = av_dict_get(d, "", t, AV_DICT_IGNORE_SUFFIX)) {
+ *     <....>                             // iterate over all entries in d
+ * }
+ *
+ * av_dict_free(&d);
+ * @endcode
+ *
+ */
+
+#define AV_DICT_MATCH_CASE      1
+#define AV_DICT_IGNORE_SUFFIX   2
+#define AV_DICT_DONT_STRDUP_KEY 4   /**< Take ownership of a key that's been
+                                         allocated with av_malloc() and children. */
+#define AV_DICT_DONT_STRDUP_VAL 8   /**< Take ownership of a value that's been
+                                         allocated with av_malloc() and chilren. */
+#define AV_DICT_DONT_OVERWRITE 16   ///< Don't overwrite existing entries.
+#define AV_DICT_APPEND         32   /**< If the entry already exists, append to it.  Note that no
+                                      delimiter is added, the strings are simply concatenated. */
+
+typedef struct AVDictionaryEntry {
+    char *key;
+    char *value;
+} AVDictionaryEntry;
+
+typedef struct AVDictionary AVDictionary;
+
+/**
+ * Get a dictionary entry with matching key.
+ *
+ * @param prev Set to the previous matching element to find the next.
+ *             If set to NULL the first matching element is returned.
+ * @param flags Allows case as well as suffix-insensitive comparisons.
+ * @return Found entry or NULL, changing key or value leads to undefined behavior.
+ */
+AVDictionaryEntry *
+av_dict_get(AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags);
+
+/**
+ * Get number of entries in dictionary.
+ *
+ * @param m dictionary
+ * @return  number of entries in dictionary
+ */
+int av_dict_count(const AVDictionary *m);
+
+/**
+ * Set the given entry in *pm, overwriting an existing entry.
+ *
+ * @param pm pointer to a pointer to a dictionary struct. If *pm is NULL
+ * a dictionary struct is allocated and put in *pm.
+ * @param key entry key to add to *pm (will be av_strduped depending on flags)
+ * @param value entry value to add to *pm (will be av_strduped depending on flags).
+ *        Passing a NULL value will cause an existing entry to be deleted.
+ * @return >= 0 on success otherwise an error code <0
+ */
+int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags);
+
+/**
+ * Copy entries from one AVDictionary struct into another.
+ * @param dst pointer to a pointer to a AVDictionary struct. If *dst is NULL,
+ *            this function will allocate a struct for you and put it in *dst
+ * @param src pointer to source AVDictionary struct
+ * @param flags flags to use when setting entries in *dst
+ * @note metadata is read using the AV_DICT_IGNORE_SUFFIX flag
+ */
+void av_dict_copy(AVDictionary **dst, AVDictionary *src, int flags);
+
+/**
+ * Free all the memory allocated for an AVDictionary struct
+ * and all keys and values.
+ */
+void av_dict_free(AVDictionary **m);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_DICT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/error.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/error.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/error.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/error.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,83 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * error code definitions
+ */
+
+#ifndef AVUTIL_ERROR_H
+#define AVUTIL_ERROR_H
+
+#include <errno.h>
+#include <stddef.h>
+#include "avutil.h"
+
+/**
+ * @addtogroup lavu_error
+ *
+ * @{
+ */
+
+
+/* error handling */
+#if EDOM > 0
+#define AVERROR(e) (-(e))   ///< Returns a negative error code from a POSIX error code, to return from library functions.
+#define AVUNERROR(e) (-(e)) ///< Returns a POSIX error code from a library function error return value.
+#else
+/* Some platforms have E* and errno already negated. */
+#define AVERROR(e) (e)
+#define AVUNERROR(e) (e)
+#endif
+
+#define AVERROR_BSF_NOT_FOUND      (-0x39acbd08) ///< Bitstream filter not found
+#define AVERROR_DECODER_NOT_FOUND  (-0x3cbabb08) ///< Decoder not found
+#define AVERROR_DEMUXER_NOT_FOUND  (-0x32babb08) ///< Demuxer not found
+#define AVERROR_ENCODER_NOT_FOUND  (-0x3cb1ba08) ///< Encoder not found
+#define AVERROR_EOF                (-0x5fb9b0bb) ///< End of file
+#define AVERROR_EXIT               (-0x2bb6a7bb) ///< Immediate exit was requested; the called function should not be restarted
+#define AVERROR_FILTER_NOT_FOUND   (-0x33b6b908) ///< Filter not found
+#define AVERROR_INVALIDDATA        (-0x3ebbb1b7) ///< Invalid data found when processing input
+#define AVERROR_MUXER_NOT_FOUND    (-0x27aab208) ///< Muxer not found
+#define AVERROR_OPTION_NOT_FOUND   (-0x2bafb008) ///< Option not found
+#define AVERROR_PATCHWELCOME       (-0x3aa8beb0) ///< Not yet implemented in Libav, patches welcome
+#define AVERROR_PROTOCOL_NOT_FOUND (-0x30adaf08) ///< Protocol not found
+#define AVERROR_STREAM_NOT_FOUND   (-0x2dabac08) ///< Stream not found
+#define AVERROR_BUG                (-0x5fb8aabe) ///< Bug detected, please report the issue
+#define AVERROR_UNKNOWN            (-0x31b4b1ab) ///< Unknown error, typically from an external library
+#define AVERROR_EXPERIMENTAL       (-0x2bb2afa8) ///< Requested feature is flagged experimental. Set strict_std_compliance if you really want to use it.
+
+/**
+ * Put a description of the AVERROR code errnum in errbuf.
+ * In case of failure the global variable errno is set to indicate the
+ * error. Even in case of failure av_strerror() will print a generic
+ * error message indicating the errnum provided to errbuf.
+ *
+ * @param errnum      error code to describe
+ * @param errbuf      buffer to which description is written
+ * @param errbuf_size the size in bytes of errbuf
+ * @return 0 on success, a negative value if a description for errnum
+ * cannot be found
+ */
+int av_strerror(int errnum, char *errbuf, size_t errbuf_size);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_ERROR_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/eval.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/eval.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/eval.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/eval.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2002 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * simple arithmetic expression evaluator
+ */
+
+#ifndef AVUTIL_EVAL_H
+#define AVUTIL_EVAL_H
+
+#include "avutil.h"
+
+typedef struct AVExpr AVExpr;
+
+/**
+ * Parse and evaluate an expression.
+ * Note, this is significantly slower than av_expr_eval().
+ *
+ * @param res a pointer to a double where is put the result value of
+ * the expression, or NAN in case of error
+ * @param s expression as a zero terminated string, for example "1+2^3+5*5+sin(2/3)"
+ * @param const_names NULL terminated array of zero terminated strings of constant identifiers, for example {"PI", "E", 0}
+ * @param const_values a zero terminated array of values for the identifiers from const_names
+ * @param func1_names NULL terminated array of zero terminated strings of funcs1 identifiers
+ * @param funcs1 NULL terminated array of function pointers for functions which take 1 argument
+ * @param func2_names NULL terminated array of zero terminated strings of funcs2 identifiers
+ * @param funcs2 NULL terminated array of function pointers for functions which take 2 arguments
+ * @param opaque a pointer which will be passed to all functions from funcs1 and funcs2
+ * @param log_ctx parent logging context
+ * @return 0 in case of success, a negative value corresponding to an
+ * AVERROR code otherwise
+ */
+int av_expr_parse_and_eval(double *res, const char *s,
+                           const char * const *const_names, const double *const_values,
+                           const char * const *func1_names, double (* const *funcs1)(void *, double),
+                           const char * const *func2_names, double (* const *funcs2)(void *, double, double),
+                           void *opaque, int log_offset, void *log_ctx);
+
+/**
+ * Parse an expression.
+ *
+ * @param expr a pointer where is put an AVExpr containing the parsed
+ * value in case of successful parsing, or NULL otherwise.
+ * The pointed to AVExpr must be freed with av_expr_free() by the user
+ * when it is not needed anymore.
+ * @param s expression as a zero terminated string, for example "1+2^3+5*5+sin(2/3)"
+ * @param const_names NULL terminated array of zero terminated strings of constant identifiers, for example {"PI", "E", 0}
+ * @param func1_names NULL terminated array of zero terminated strings of funcs1 identifiers
+ * @param funcs1 NULL terminated array of function pointers for functions which take 1 argument
+ * @param func2_names NULL terminated array of zero terminated strings of funcs2 identifiers
+ * @param funcs2 NULL terminated array of function pointers for functions which take 2 arguments
+ * @param log_ctx parent logging context
+ * @return 0 in case of success, a negative value corresponding to an
+ * AVERROR code otherwise
+ */
+int av_expr_parse(AVExpr **expr, const char *s,
+                  const char * const *const_names,
+                  const char * const *func1_names, double (* const *funcs1)(void *, double),
+                  const char * const *func2_names, double (* const *funcs2)(void *, double, double),
+                  int log_offset, void *log_ctx);
+
+/**
+ * Evaluate a previously parsed expression.
+ *
+ * @param const_values a zero terminated array of values for the identifiers from av_expr_parse() const_names
+ * @param opaque a pointer which will be passed to all functions from funcs1 and funcs2
+ * @return the value of the expression
+ */
+double av_expr_eval(AVExpr *e, const double *const_values, void *opaque);
+
+/**
+ * Free a parsed expression previously created with av_expr_parse().
+ */
+void av_expr_free(AVExpr *e);
+
+/**
+ * Parse the string in numstr and return its value as a double. If
+ * the string is empty, contains only whitespaces, or does not contain
+ * an initial substring that has the expected syntax for a
+ * floating-point number, no conversion is performed. In this case,
+ * returns a value of zero and the value returned in tail is the value
+ * of numstr.
+ *
+ * @param numstr a string representing a number, may contain one of
+ * the International System number postfixes, for example 'K', 'M',
+ * 'G'. If 'i' is appended after the postfix, powers of 2 are used
+ * instead of powers of 10. The 'B' postfix multiplies the value for
+ * 8, and can be appended after another postfix or used alone. This
+ * allows using for example 'KB', 'MiB', 'G' and 'B' as postfix.
+ * @param tail if non-NULL puts here the pointer to the char next
+ * after the last parsed character
+ */
+double av_strtod(const char *numstr, char **tail);
+
+#endif /* AVUTIL_EVAL_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/fifo.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/fifo.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/fifo.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/fifo.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,131 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * a very simple circular buffer FIFO implementation
+ */
+
+#ifndef AVUTIL_FIFO_H
+#define AVUTIL_FIFO_H
+
+#include <stdint.h>
+#include "avutil.h"
+#include "attributes.h"
+
+typedef struct AVFifoBuffer {
+    uint8_t *buffer;
+    uint8_t *rptr, *wptr, *end;
+    uint32_t rndx, wndx;
+} AVFifoBuffer;
+
+/**
+ * Initialize an AVFifoBuffer.
+ * @param size of FIFO
+ * @return AVFifoBuffer or NULL in case of memory allocation failure
+ */
+AVFifoBuffer *av_fifo_alloc(unsigned int size);
+
+/**
+ * Free an AVFifoBuffer.
+ * @param f AVFifoBuffer to free
+ */
+void av_fifo_free(AVFifoBuffer *f);
+
+/**
+ * Reset the AVFifoBuffer to the state right after av_fifo_alloc, in particular it is emptied.
+ * @param f AVFifoBuffer to reset
+ */
+void av_fifo_reset(AVFifoBuffer *f);
+
+/**
+ * Return the amount of data in bytes in the AVFifoBuffer, that is the
+ * amount of data you can read from it.
+ * @param f AVFifoBuffer to read from
+ * @return size
+ */
+int av_fifo_size(AVFifoBuffer *f);
+
+/**
+ * Return the amount of space in bytes in the AVFifoBuffer, that is the
+ * amount of data you can write into it.
+ * @param f AVFifoBuffer to write into
+ * @return size
+ */
+int av_fifo_space(AVFifoBuffer *f);
+
+/**
+ * Feed data from an AVFifoBuffer to a user-supplied callback.
+ * @param f AVFifoBuffer to read from
+ * @param buf_size number of bytes to read
+ * @param func generic read function
+ * @param dest data destination
+ */
+int av_fifo_generic_read(AVFifoBuffer *f, void *dest, int buf_size, void (*func)(void*, void*, int));
+
+/**
+ * Feed data from a user-supplied callback to an AVFifoBuffer.
+ * @param f AVFifoBuffer to write to
+ * @param src data source; non-const since it may be used as a
+ * modifiable context by the function defined in func
+ * @param size number of bytes to write
+ * @param func generic write function; the first parameter is src,
+ * the second is dest_buf, the third is dest_buf_size.
+ * func must return the number of bytes written to dest_buf, or <= 0 to
+ * indicate no more data available to write.
+ * If func is NULL, src is interpreted as a simple byte array for source data.
+ * @return the number of bytes written to the FIFO
+ */
+int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int));
+
+/**
+ * Resize an AVFifoBuffer.
+ * @param f AVFifoBuffer to resize
+ * @param size new AVFifoBuffer size in bytes
+ * @return <0 for failure, >=0 otherwise
+ */
+int av_fifo_realloc2(AVFifoBuffer *f, unsigned int size);
+
+/**
+ * Read and discard the specified amount of data from an AVFifoBuffer.
+ * @param f AVFifoBuffer to read from
+ * @param size amount of data to read in bytes
+ */
+void av_fifo_drain(AVFifoBuffer *f, int size);
+
+/**
+ * Return a pointer to the data stored in a FIFO buffer at a certain offset.
+ * The FIFO buffer is not modified.
+ *
+ * @param f    AVFifoBuffer to peek at, f must be non-NULL
+ * @param offs an offset in bytes, its absolute value must be less
+ *             than the used buffer size or the returned pointer will
+ *             point outside to the buffer data.
+ *             The used buffer size can be checked with av_fifo_size().
+ */
+static inline uint8_t *av_fifo_peek2(const AVFifoBuffer *f, int offs)
+{
+    uint8_t *ptr = f->rptr + offs;
+    if (ptr >= f->end)
+        ptr = f->buffer + (ptr - f->end);
+    else if (ptr < f->buffer)
+        ptr = f->end - (f->buffer - ptr);
+    return ptr;
+}
+
+#endif /* AVUTIL_FIFO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/file.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/file.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/file.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/file.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,54 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_FILE_H
+#define AVUTIL_FILE_H
+
+#include <stdint.h>
+
+#include "avutil.h"
+
+/**
+ * @file
+ * Misc file utilities.
+ */
+
+/**
+ * Read the file with name filename, and put its content in a newly
+ * allocated buffer or map it with mmap() when available.
+ * In case of success set *bufptr to the read or mmapped buffer, and
+ * *size to the size in bytes of the buffer in *bufptr.
+ * The returned buffer must be released with av_file_unmap().
+ *
+ * @param log_offset loglevel offset used for logging
+ * @param log_ctx context used for logging
+ * @return a non negative number in case of success, a negative value
+ * corresponding to an AVERROR error code in case of failure
+ */
+int av_file_map(const char *filename, uint8_t **bufptr, size_t *size,
+                int log_offset, void *log_ctx);
+
+/**
+ * Unmap or free the buffer bufptr created by av_file_map().
+ *
+ * @param size size in bytes of bufptr, must be the same as returned
+ * by av_file_map()
+ */
+void av_file_unmap(uint8_t *bufptr, size_t size);
+
+#endif /* AVUTIL_FILE_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/imgutils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/imgutils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/imgutils.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/imgutils.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,138 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_IMGUTILS_H
+#define AVUTIL_IMGUTILS_H
+
+/**
+ * @file
+ * misc image utilities
+ *
+ * @addtogroup lavu_picture
+ * @{
+ */
+
+#include "avutil.h"
+#include "pixdesc.h"
+
+/**
+ * Compute the max pixel step for each plane of an image with a
+ * format described by pixdesc.
+ *
+ * The pixel step is the distance in bytes between the first byte of
+ * the group of bytes which describe a pixel component and the first
+ * byte of the successive group in the same plane for the same
+ * component.
+ *
+ * @param max_pixsteps an array which is filled with the max pixel step
+ * for each plane. Since a plane may contain different pixel
+ * components, the computed max_pixsteps[plane] is relative to the
+ * component in the plane with the max pixel step.
+ * @param max_pixstep_comps an array which is filled with the component
+ * for each plane which has the max pixel step. May be NULL.
+ */
+void av_image_fill_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4],
+                                const AVPixFmtDescriptor *pixdesc);
+
+/**
+ * Compute the size of an image line with format pix_fmt and width
+ * width for the plane plane.
+ *
+ * @return the computed size in bytes
+ */
+int av_image_get_linesize(enum AVPixelFormat pix_fmt, int width, int plane);
+
+/**
+ * Fill plane linesizes for an image with pixel format pix_fmt and
+ * width width.
+ *
+ * @param linesizes array to be filled with the linesize for each plane
+ * @return >= 0 in case of success, a negative error code otherwise
+ */
+int av_image_fill_linesizes(int linesizes[4], enum AVPixelFormat pix_fmt, int width);
+
+/**
+ * Fill plane data pointers for an image with pixel format pix_fmt and
+ * height height.
+ *
+ * @param data pointers array to be filled with the pointer for each image plane
+ * @param ptr the pointer to a buffer which will contain the image
+ * @param linesizes the array containing the linesize for each
+ * plane, should be filled by av_image_fill_linesizes()
+ * @return the size in bytes required for the image buffer, a negative
+ * error code in case of failure
+ */
+int av_image_fill_pointers(uint8_t *data[4], enum AVPixelFormat pix_fmt, int height,
+                           uint8_t *ptr, const int linesizes[4]);
+
+/**
+ * Allocate an image with size w and h and pixel format pix_fmt, and
+ * fill pointers and linesizes accordingly.
+ * The allocated image buffer has to be freed by using
+ * av_freep(&pointers[0]).
+ *
+ * @param align the value to use for buffer size alignment
+ * @return the size in bytes required for the image buffer, a negative
+ * error code in case of failure
+ */
+int av_image_alloc(uint8_t *pointers[4], int linesizes[4],
+                   int w, int h, enum AVPixelFormat pix_fmt, int align);
+
+/**
+ * Copy image plane from src to dst.
+ * That is, copy "height" number of lines of "bytewidth" bytes each.
+ * The first byte of each successive line is separated by *_linesize
+ * bytes.
+ *
+ * @param dst_linesize linesize for the image plane in dst
+ * @param src_linesize linesize for the image plane in src
+ */
+void av_image_copy_plane(uint8_t       *dst, int dst_linesize,
+                         const uint8_t *src, int src_linesize,
+                         int bytewidth, int height);
+
+/**
+ * Copy image in src_data to dst_data.
+ *
+ * @param dst_linesizes linesizes for the image in dst_data
+ * @param src_linesizes linesizes for the image in src_data
+ */
+void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4],
+                   const uint8_t *src_data[4], const int src_linesizes[4],
+                   enum AVPixelFormat pix_fmt, int width, int height);
+
+/**
+ * Check if the given dimension of an image is valid, meaning that all
+ * bytes of the image can be addressed with a signed int.
+ *
+ * @param w the width of the picture
+ * @param h the height of the picture
+ * @param log_offset the offset to sum to the log level for logging with log_ctx
+ * @param log_ctx the parent logging context, it may be NULL
+ * @return >= 0 if valid, a negative error code otherwise
+ */
+int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx);
+
+int avpriv_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt);
+
+/**
+ * @}
+ */
+
+
+#endif /* AVUTIL_IMGUTILS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/intfloat.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/intfloat.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/intfloat.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/intfloat.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2011 Mans Rullgard
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_INTFLOAT_H
+#define AVUTIL_INTFLOAT_H
+
+#include <stdint.h>
+#include "attributes.h"
+
+union av_intfloat32 {
+    uint32_t i;
+    float    f;
+};
+
+union av_intfloat64 {
+    uint64_t i;
+    double   f;
+};
+
+/**
+ * Reinterpret a 32-bit integer as a float.
+ */
+static av_always_inline float av_int2float(uint32_t i)
+{
+    union av_intfloat32 v;
+    v.i = i;
+    return v.f;
+}
+
+/**
+ * Reinterpret a float as a 32-bit integer.
+ */
+static av_always_inline uint32_t av_float2int(float f)
+{
+    union av_intfloat32 v;
+    v.f = f;
+    return v.i;
+}
+
+/**
+ * Reinterpret a 64-bit integer as a double.
+ */
+static av_always_inline double av_int2double(uint64_t i)
+{
+    union av_intfloat64 v;
+    v.i = i;
+    return v.f;
+}
+
+/**
+ * Reinterpret a double as a 64-bit integer.
+ */
+static av_always_inline uint64_t av_double2int(double f)
+{
+    union av_intfloat64 v;
+    v.f = f;
+    return v.i;
+}
+
+#endif /* AVUTIL_INTFLOAT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/intfloat_readwrite.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/intfloat_readwrite.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/intfloat_readwrite.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/intfloat_readwrite.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+ * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_INTFLOAT_READWRITE_H
+#define AVUTIL_INTFLOAT_READWRITE_H
+
+#include <stdint.h>
+#include "attributes.h"
+
+/* IEEE 80 bits extended float */
+typedef struct AVExtFloat  {
+    uint8_t exponent[2];
+    uint8_t mantissa[8];
+} AVExtFloat;
+
+attribute_deprecated double av_int2dbl(int64_t v) av_const;
+attribute_deprecated float av_int2flt(int32_t v) av_const;
+attribute_deprecated double av_ext2dbl(const AVExtFloat ext) av_const;
+attribute_deprecated int64_t av_dbl2int(double d) av_const;
+attribute_deprecated int32_t av_flt2int(float d) av_const;
+attribute_deprecated AVExtFloat av_dbl2ext(double d) av_const;
+
+#endif /* AVUTIL_INTFLOAT_READWRITE_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/intreadwrite.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/intreadwrite.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/intreadwrite.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/intreadwrite.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,549 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_INTREADWRITE_H
+#define AVUTIL_INTREADWRITE_H
+
+#include <stdint.h>
+#include "libavutil/avconfig.h"
+#include "attributes.h"
+#include "bswap.h"
+
+typedef union {
+    uint64_t u64;
+    uint32_t u32[2];
+    uint16_t u16[4];
+    uint8_t  u8 [8];
+    double   f64;
+    float    f32[2];
+} av_alias av_alias64;
+
+typedef union {
+    uint32_t u32;
+    uint16_t u16[2];
+    uint8_t  u8 [4];
+    float    f32;
+} av_alias av_alias32;
+
+typedef union {
+    uint16_t u16;
+    uint8_t  u8 [2];
+} av_alias av_alias16;
+
+/*
+ * Arch-specific headers can provide any combination of
+ * AV_[RW][BLN](16|24|32|64) and AV_(COPY|SWAP|ZERO)(64|128) macros.
+ * Preprocessor symbols must be defined, even if these are implemented
+ * as inline functions.
+ */
+
+#ifdef HAVE_AV_CONFIG_H
+
+#include "config.h"
+
+#if   ARCH_ARM
+#   include "arm/intreadwrite.h"
+#elif ARCH_AVR32
+#   include "avr32/intreadwrite.h"
+#elif ARCH_MIPS
+#   include "mips/intreadwrite.h"
+#elif ARCH_PPC
+#   include "ppc/intreadwrite.h"
+#elif ARCH_TOMI
+#   include "tomi/intreadwrite.h"
+#elif ARCH_X86
+#   include "x86/intreadwrite.h"
+#endif
+
+#endif /* HAVE_AV_CONFIG_H */
+
+/*
+ * Map AV_RNXX <-> AV_R[BL]XX for all variants provided by per-arch headers.
+ */
+
+#if AV_HAVE_BIGENDIAN
+
+#   if    defined(AV_RN16) && !defined(AV_RB16)
+#       define AV_RB16(p) AV_RN16(p)
+#   elif !defined(AV_RN16) &&  defined(AV_RB16)
+#       define AV_RN16(p) AV_RB16(p)
+#   endif
+
+#   if    defined(AV_WN16) && !defined(AV_WB16)
+#       define AV_WB16(p, v) AV_WN16(p, v)
+#   elif !defined(AV_WN16) &&  defined(AV_WB16)
+#       define AV_WN16(p, v) AV_WB16(p, v)
+#   endif
+
+#   if    defined(AV_RN24) && !defined(AV_RB24)
+#       define AV_RB24(p) AV_RN24(p)
+#   elif !defined(AV_RN24) &&  defined(AV_RB24)
+#       define AV_RN24(p) AV_RB24(p)
+#   endif
+
+#   if    defined(AV_WN24) && !defined(AV_WB24)
+#       define AV_WB24(p, v) AV_WN24(p, v)
+#   elif !defined(AV_WN24) &&  defined(AV_WB24)
+#       define AV_WN24(p, v) AV_WB24(p, v)
+#   endif
+
+#   if    defined(AV_RN32) && !defined(AV_RB32)
+#       define AV_RB32(p) AV_RN32(p)
+#   elif !defined(AV_RN32) &&  defined(AV_RB32)
+#       define AV_RN32(p) AV_RB32(p)
+#   endif
+
+#   if    defined(AV_WN32) && !defined(AV_WB32)
+#       define AV_WB32(p, v) AV_WN32(p, v)
+#   elif !defined(AV_WN32) &&  defined(AV_WB32)
+#       define AV_WN32(p, v) AV_WB32(p, v)
+#   endif
+
+#   if    defined(AV_RN64) && !defined(AV_RB64)
+#       define AV_RB64(p) AV_RN64(p)
+#   elif !defined(AV_RN64) &&  defined(AV_RB64)
+#       define AV_RN64(p) AV_RB64(p)
+#   endif
+
+#   if    defined(AV_WN64) && !defined(AV_WB64)
+#       define AV_WB64(p, v) AV_WN64(p, v)
+#   elif !defined(AV_WN64) &&  defined(AV_WB64)
+#       define AV_WN64(p, v) AV_WB64(p, v)
+#   endif
+
+#else /* AV_HAVE_BIGENDIAN */
+
+#   if    defined(AV_RN16) && !defined(AV_RL16)
+#       define AV_RL16(p) AV_RN16(p)
+#   elif !defined(AV_RN16) &&  defined(AV_RL16)
+#       define AV_RN16(p) AV_RL16(p)
+#   endif
+
+#   if    defined(AV_WN16) && !defined(AV_WL16)
+#       define AV_WL16(p, v) AV_WN16(p, v)
+#   elif !defined(AV_WN16) &&  defined(AV_WL16)
+#       define AV_WN16(p, v) AV_WL16(p, v)
+#   endif
+
+#   if    defined(AV_RN24) && !defined(AV_RL24)
+#       define AV_RL24(p) AV_RN24(p)
+#   elif !defined(AV_RN24) &&  defined(AV_RL24)
+#       define AV_RN24(p) AV_RL24(p)
+#   endif
+
+#   if    defined(AV_WN24) && !defined(AV_WL24)
+#       define AV_WL24(p, v) AV_WN24(p, v)
+#   elif !defined(AV_WN24) &&  defined(AV_WL24)
+#       define AV_WN24(p, v) AV_WL24(p, v)
+#   endif
+
+#   if    defined(AV_RN32) && !defined(AV_RL32)
+#       define AV_RL32(p) AV_RN32(p)
+#   elif !defined(AV_RN32) &&  defined(AV_RL32)
+#       define AV_RN32(p) AV_RL32(p)
+#   endif
+
+#   if    defined(AV_WN32) && !defined(AV_WL32)
+#       define AV_WL32(p, v) AV_WN32(p, v)
+#   elif !defined(AV_WN32) &&  defined(AV_WL32)
+#       define AV_WN32(p, v) AV_WL32(p, v)
+#   endif
+
+#   if    defined(AV_RN64) && !defined(AV_RL64)
+#       define AV_RL64(p) AV_RN64(p)
+#   elif !defined(AV_RN64) &&  defined(AV_RL64)
+#       define AV_RN64(p) AV_RL64(p)
+#   endif
+
+#   if    defined(AV_WN64) && !defined(AV_WL64)
+#       define AV_WL64(p, v) AV_WN64(p, v)
+#   elif !defined(AV_WN64) &&  defined(AV_WL64)
+#       define AV_WN64(p, v) AV_WL64(p, v)
+#   endif
+
+#endif /* !AV_HAVE_BIGENDIAN */
+
+/*
+ * Define AV_[RW]N helper macros to simplify definitions not provided
+ * by per-arch headers.
+ */
+
+#if defined(__GNUC__) && !defined(__TI_COMPILER_VERSION__)
+
+union unaligned_64 { uint64_t l; } __attribute__((packed)) av_alias;
+union unaligned_32 { uint32_t l; } __attribute__((packed)) av_alias;
+union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias;
+
+#   define AV_RN(s, p) (((const union unaligned_##s *) (p))->l)
+#   define AV_WN(s, p, v) ((((union unaligned_##s *) (p))->l) = (v))
+
+#elif defined(__DECC)
+
+#   define AV_RN(s, p) (*((const __unaligned uint##s##_t*)(p)))
+#   define AV_WN(s, p, v) (*((__unaligned uint##s##_t*)(p)) = (v))
+
+#elif AV_HAVE_FAST_UNALIGNED
+
+#   define AV_RN(s, p) (((const av_alias##s*)(p))->u##s)
+#   define AV_WN(s, p, v) (((av_alias##s*)(p))->u##s = (v))
+
+#else
+
+#ifndef AV_RB16
+#   define AV_RB16(x)                           \
+    ((((const uint8_t*)(x))[0] << 8) |          \
+      ((const uint8_t*)(x))[1])
+#endif
+#ifndef AV_WB16
+#   define AV_WB16(p, d) do {                   \
+        ((uint8_t*)(p))[1] = (d);               \
+        ((uint8_t*)(p))[0] = (d)>>8;            \
+    } while(0)
+#endif
+
+#ifndef AV_RL16
+#   define AV_RL16(x)                           \
+    ((((const uint8_t*)(x))[1] << 8) |          \
+      ((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL16
+#   define AV_WL16(p, d) do {                   \
+        ((uint8_t*)(p))[0] = (d);               \
+        ((uint8_t*)(p))[1] = (d)>>8;            \
+    } while(0)
+#endif
+
+#ifndef AV_RB32
+#   define AV_RB32(x)                                \
+    (((uint32_t)((const uint8_t*)(x))[0] << 24) |    \
+               (((const uint8_t*)(x))[1] << 16) |    \
+               (((const uint8_t*)(x))[2] <<  8) |    \
+                ((const uint8_t*)(x))[3])
+#endif
+#ifndef AV_WB32
+#   define AV_WB32(p, d) do {                   \
+        ((uint8_t*)(p))[3] = (d);               \
+        ((uint8_t*)(p))[2] = (d)>>8;            \
+        ((uint8_t*)(p))[1] = (d)>>16;           \
+        ((uint8_t*)(p))[0] = (d)>>24;           \
+    } while(0)
+#endif
+
+#ifndef AV_RL32
+#   define AV_RL32(x)                                \
+    (((uint32_t)((const uint8_t*)(x))[3] << 24) |    \
+               (((const uint8_t*)(x))[2] << 16) |    \
+               (((const uint8_t*)(x))[1] <<  8) |    \
+                ((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL32
+#   define AV_WL32(p, d) do {                   \
+        ((uint8_t*)(p))[0] = (d);               \
+        ((uint8_t*)(p))[1] = (d)>>8;            \
+        ((uint8_t*)(p))[2] = (d)>>16;           \
+        ((uint8_t*)(p))[3] = (d)>>24;           \
+    } while(0)
+#endif
+
+#ifndef AV_RB64
+#   define AV_RB64(x)                                   \
+    (((uint64_t)((const uint8_t*)(x))[0] << 56) |       \
+     ((uint64_t)((const uint8_t*)(x))[1] << 48) |       \
+     ((uint64_t)((const uint8_t*)(x))[2] << 40) |       \
+     ((uint64_t)((const uint8_t*)(x))[3] << 32) |       \
+     ((uint64_t)((const uint8_t*)(x))[4] << 24) |       \
+     ((uint64_t)((const uint8_t*)(x))[5] << 16) |       \
+     ((uint64_t)((const uint8_t*)(x))[6] <<  8) |       \
+      (uint64_t)((const uint8_t*)(x))[7])
+#endif
+#ifndef AV_WB64
+#   define AV_WB64(p, d) do {                   \
+        ((uint8_t*)(p))[7] = (d);               \
+        ((uint8_t*)(p))[6] = (d)>>8;            \
+        ((uint8_t*)(p))[5] = (d)>>16;           \
+        ((uint8_t*)(p))[4] = (d)>>24;           \
+        ((uint8_t*)(p))[3] = (d)>>32;           \
+        ((uint8_t*)(p))[2] = (d)>>40;           \
+        ((uint8_t*)(p))[1] = (d)>>48;           \
+        ((uint8_t*)(p))[0] = (d)>>56;           \
+    } while(0)
+#endif
+
+#ifndef AV_RL64
+#   define AV_RL64(x)                                   \
+    (((uint64_t)((const uint8_t*)(x))[7] << 56) |       \
+     ((uint64_t)((const uint8_t*)(x))[6] << 48) |       \
+     ((uint64_t)((const uint8_t*)(x))[5] << 40) |       \
+     ((uint64_t)((const uint8_t*)(x))[4] << 32) |       \
+     ((uint64_t)((const uint8_t*)(x))[3] << 24) |       \
+     ((uint64_t)((const uint8_t*)(x))[2] << 16) |       \
+     ((uint64_t)((const uint8_t*)(x))[1] <<  8) |       \
+      (uint64_t)((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL64
+#   define AV_WL64(p, d) do {                   \
+        ((uint8_t*)(p))[0] = (d);               \
+        ((uint8_t*)(p))[1] = (d)>>8;            \
+        ((uint8_t*)(p))[2] = (d)>>16;           \
+        ((uint8_t*)(p))[3] = (d)>>24;           \
+        ((uint8_t*)(p))[4] = (d)>>32;           \
+        ((uint8_t*)(p))[5] = (d)>>40;           \
+        ((uint8_t*)(p))[6] = (d)>>48;           \
+        ((uint8_t*)(p))[7] = (d)>>56;           \
+    } while(0)
+#endif
+
+#if AV_HAVE_BIGENDIAN
+#   define AV_RN(s, p)    AV_RB##s(p)
+#   define AV_WN(s, p, v) AV_WB##s(p, v)
+#else
+#   define AV_RN(s, p)    AV_RL##s(p)
+#   define AV_WN(s, p, v) AV_WL##s(p, v)
+#endif
+
+#endif /* HAVE_FAST_UNALIGNED */
+
+#ifndef AV_RN16
+#   define AV_RN16(p) AV_RN(16, p)
+#endif
+
+#ifndef AV_RN32
+#   define AV_RN32(p) AV_RN(32, p)
+#endif
+
+#ifndef AV_RN64
+#   define AV_RN64(p) AV_RN(64, p)
+#endif
+
+#ifndef AV_WN16
+#   define AV_WN16(p, v) AV_WN(16, p, v)
+#endif
+
+#ifndef AV_WN32
+#   define AV_WN32(p, v) AV_WN(32, p, v)
+#endif
+
+#ifndef AV_WN64
+#   define AV_WN64(p, v) AV_WN(64, p, v)
+#endif
+
+#if AV_HAVE_BIGENDIAN
+#   define AV_RB(s, p)    AV_RN##s(p)
+#   define AV_WB(s, p, v) AV_WN##s(p, v)
+#   define AV_RL(s, p)    av_bswap##s(AV_RN##s(p))
+#   define AV_WL(s, p, v) AV_WN##s(p, av_bswap##s(v))
+#else
+#   define AV_RB(s, p)    av_bswap##s(AV_RN##s(p))
+#   define AV_WB(s, p, v) AV_WN##s(p, av_bswap##s(v))
+#   define AV_RL(s, p)    AV_RN##s(p)
+#   define AV_WL(s, p, v) AV_WN##s(p, v)
+#endif
+
+#define AV_RB8(x)     (((const uint8_t*)(x))[0])
+#define AV_WB8(p, d)  do { ((uint8_t*)(p))[0] = (d); } while(0)
+
+#define AV_RL8(x)     AV_RB8(x)
+#define AV_WL8(p, d)  AV_WB8(p, d)
+
+#ifndef AV_RB16
+#   define AV_RB16(p)    AV_RB(16, p)
+#endif
+#ifndef AV_WB16
+#   define AV_WB16(p, v) AV_WB(16, p, v)
+#endif
+
+#ifndef AV_RL16
+#   define AV_RL16(p)    AV_RL(16, p)
+#endif
+#ifndef AV_WL16
+#   define AV_WL16(p, v) AV_WL(16, p, v)
+#endif
+
+#ifndef AV_RB32
+#   define AV_RB32(p)    AV_RB(32, p)
+#endif
+#ifndef AV_WB32
+#   define AV_WB32(p, v) AV_WB(32, p, v)
+#endif
+
+#ifndef AV_RL32
+#   define AV_RL32(p)    AV_RL(32, p)
+#endif
+#ifndef AV_WL32
+#   define AV_WL32(p, v) AV_WL(32, p, v)
+#endif
+
+#ifndef AV_RB64
+#   define AV_RB64(p)    AV_RB(64, p)
+#endif
+#ifndef AV_WB64
+#   define AV_WB64(p, v) AV_WB(64, p, v)
+#endif
+
+#ifndef AV_RL64
+#   define AV_RL64(p)    AV_RL(64, p)
+#endif
+#ifndef AV_WL64
+#   define AV_WL64(p, v) AV_WL(64, p, v)
+#endif
+
+#ifndef AV_RB24
+#   define AV_RB24(x)                           \
+    ((((const uint8_t*)(x))[0] << 16) |         \
+     (((const uint8_t*)(x))[1] <<  8) |         \
+      ((const uint8_t*)(x))[2])
+#endif
+#ifndef AV_WB24
+#   define AV_WB24(p, d) do {                   \
+        ((uint8_t*)(p))[2] = (d);               \
+        ((uint8_t*)(p))[1] = (d)>>8;            \
+        ((uint8_t*)(p))[0] = (d)>>16;           \
+    } while(0)
+#endif
+
+#ifndef AV_RL24
+#   define AV_RL24(x)                           \
+    ((((const uint8_t*)(x))[2] << 16) |         \
+     (((const uint8_t*)(x))[1] <<  8) |         \
+      ((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL24
+#   define AV_WL24(p, d) do {                   \
+        ((uint8_t*)(p))[0] = (d);               \
+        ((uint8_t*)(p))[1] = (d)>>8;            \
+        ((uint8_t*)(p))[2] = (d)>>16;           \
+    } while(0)
+#endif
+
+/*
+ * The AV_[RW]NA macros access naturally aligned data
+ * in a type-safe way.
+ */
+
+#define AV_RNA(s, p)    (((const av_alias##s*)(p))->u##s)
+#define AV_WNA(s, p, v) (((av_alias##s*)(p))->u##s = (v))
+
+#ifndef AV_RN16A
+#   define AV_RN16A(p) AV_RNA(16, p)
+#endif
+
+#ifndef AV_RN32A
+#   define AV_RN32A(p) AV_RNA(32, p)
+#endif
+
+#ifndef AV_RN64A
+#   define AV_RN64A(p) AV_RNA(64, p)
+#endif
+
+#ifndef AV_WN16A
+#   define AV_WN16A(p, v) AV_WNA(16, p, v)
+#endif
+
+#ifndef AV_WN32A
+#   define AV_WN32A(p, v) AV_WNA(32, p, v)
+#endif
+
+#ifndef AV_WN64A
+#   define AV_WN64A(p, v) AV_WNA(64, p, v)
+#endif
+
+/*
+ * The AV_COPYxxU macros are suitable for copying data to/from unaligned
+ * memory locations.
+ */
+
+#define AV_COPYU(n, d, s) AV_WN##n(d, AV_RN##n(s));
+
+#ifndef AV_COPY16U
+#   define AV_COPY16U(d, s) AV_COPYU(16, d, s)
+#endif
+
+#ifndef AV_COPY32U
+#   define AV_COPY32U(d, s) AV_COPYU(32, d, s)
+#endif
+
+#ifndef AV_COPY64U
+#   define AV_COPY64U(d, s) AV_COPYU(64, d, s)
+#endif
+
+#ifndef AV_COPY128U
+#   define AV_COPY128U(d, s)                                    \
+    do {                                                        \
+        AV_COPY64U(d, s);                                       \
+        AV_COPY64U((char *)(d) + 8, (const char *)(s) + 8);     \
+    } while(0)
+#endif
+
+/* Parameters for AV_COPY*, AV_SWAP*, AV_ZERO* must be
+ * naturally aligned. They may be implemented using MMX,
+ * so emms_c() must be called before using any float code
+ * afterwards.
+ */
+
+#define AV_COPY(n, d, s) \
+    (((av_alias##n*)(d))->u##n = ((const av_alias##n*)(s))->u##n)
+
+#ifndef AV_COPY16
+#   define AV_COPY16(d, s) AV_COPY(16, d, s)
+#endif
+
+#ifndef AV_COPY32
+#   define AV_COPY32(d, s) AV_COPY(32, d, s)
+#endif
+
+#ifndef AV_COPY64
+#   define AV_COPY64(d, s) AV_COPY(64, d, s)
+#endif
+
+#ifndef AV_COPY128
+#   define AV_COPY128(d, s)                    \
+    do {                                       \
+        AV_COPY64(d, s);                       \
+        AV_COPY64((char*)(d)+8, (char*)(s)+8); \
+    } while(0)
+#endif
+
+#define AV_SWAP(n, a, b) FFSWAP(av_alias##n, *(av_alias##n*)(a), *(av_alias##n*)(b))
+
+#ifndef AV_SWAP64
+#   define AV_SWAP64(a, b) AV_SWAP(64, a, b)
+#endif
+
+#define AV_ZERO(n, d) (((av_alias##n*)(d))->u##n = 0)
+
+#ifndef AV_ZERO16
+#   define AV_ZERO16(d) AV_ZERO(16, d)
+#endif
+
+#ifndef AV_ZERO32
+#   define AV_ZERO32(d) AV_ZERO(32, d)
+#endif
+
+#ifndef AV_ZERO64
+#   define AV_ZERO64(d) AV_ZERO(64, d)
+#endif
+
+#ifndef AV_ZERO128
+#   define AV_ZERO128(d)         \
+    do {                         \
+        AV_ZERO64(d);            \
+        AV_ZERO64((char*)(d)+8); \
+    } while(0)
+#endif
+
+#endif /* AVUTIL_INTREADWRITE_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/lfg.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/lfg.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/lfg.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/lfg.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,62 @@
+/*
+ * Lagged Fibonacci PRNG
+ * Copyright (c) 2008 Michael Niedermayer
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_LFG_H
+#define AVUTIL_LFG_H
+
+typedef struct AVLFG {
+    unsigned int state[64];
+    int index;
+} AVLFG;
+
+void av_lfg_init(AVLFG *c, unsigned int seed);
+
+/**
+ * Get the next random unsigned 32-bit number using an ALFG.
+ *
+ * Please also consider a simple LCG like state= state*1664525+1013904223,
+ * it may be good enough and faster for your specific use case.
+ */
+static inline unsigned int av_lfg_get(AVLFG *c){
+    c->state[c->index & 63] = c->state[(c->index-24) & 63] + c->state[(c->index-55) & 63];
+    return c->state[c->index++ & 63];
+}
+
+/**
+ * Get the next random unsigned 32-bit number using a MLFG.
+ *
+ * Please also consider av_lfg_get() above, it is faster.
+ */
+static inline unsigned int av_mlfg_get(AVLFG *c){
+    unsigned int a= c->state[(c->index-55) & 63];
+    unsigned int b= c->state[(c->index-24) & 63];
+    return c->state[c->index++ & 63] = 2*a*b+a+b;
+}
+
+/**
+ * Get the next two numbers generated by a Box-Muller Gaussian
+ * generator using the random numbers issued by lfg.
+ *
+ * @param out array where the two generated numbers are placed
+ */
+void av_bmg_get(AVLFG *lfg, double out[2]);
+
+#endif /* AVUTIL_LFG_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/log.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/log.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/log.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/log.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,173 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_LOG_H
+#define AVUTIL_LOG_H
+
+#include <stdarg.h>
+#include "avutil.h"
+#include "attributes.h"
+
+/**
+ * Describe the class of an AVClass context structure. That is an
+ * arbitrary struct of which the first field is a pointer to an
+ * AVClass struct (e.g. AVCodecContext, AVFormatContext etc.).
+ */
+typedef struct AVClass {
+    /**
+     * The name of the class; usually it is the same name as the
+     * context structure type to which the AVClass is associated.
+     */
+    const char* class_name;
+
+    /**
+     * A pointer to a function which returns the name of a context
+     * instance ctx associated with the class.
+     */
+    const char* (*item_name)(void* ctx);
+
+    /**
+     * a pointer to the first option specified in the class if any or NULL
+     *
+     * @see av_set_default_options()
+     */
+    const struct AVOption *option;
+
+    /**
+     * LIBAVUTIL_VERSION with which this structure was created.
+     * This is used to allow fields to be added without requiring major
+     * version bumps everywhere.
+     */
+
+    int version;
+
+    /**
+     * Offset in the structure where log_level_offset is stored.
+     * 0 means there is no such variable
+     */
+    int log_level_offset_offset;
+
+    /**
+     * Offset in the structure where a pointer to the parent context for
+     * logging is stored. For example a decoder could pass its AVCodecContext
+     * to eval as such a parent context, which an av_log() implementation
+     * could then leverage to display the parent context.
+     * The offset can be NULL.
+     */
+    int parent_log_context_offset;
+
+    /**
+     * Return next AVOptions-enabled child or NULL
+     */
+    void* (*child_next)(void *obj, void *prev);
+
+    /**
+     * Return an AVClass corresponding to the next potential
+     * AVOptions-enabled child.
+     *
+     * The difference between child_next and this is that
+     * child_next iterates over _already existing_ objects, while
+     * child_class_next iterates over _all possible_ children.
+     */
+    const struct AVClass* (*child_class_next)(const struct AVClass *prev);
+} AVClass;
+
+/* av_log API */
+
+#define AV_LOG_QUIET    -8
+
+/**
+ * Something went really wrong and we will crash now.
+ */
+#define AV_LOG_PANIC     0
+
+/**
+ * Something went wrong and recovery is not possible.
+ * For example, no header was found for a format which depends
+ * on headers or an illegal combination of parameters is used.
+ */
+#define AV_LOG_FATAL     8
+
+/**
+ * Something went wrong and cannot losslessly be recovered.
+ * However, not all future data is affected.
+ */
+#define AV_LOG_ERROR    16
+
+/**
+ * Something somehow does not look correct. This may or may not
+ * lead to problems. An example would be the use of '-vstrict -2'.
+ */
+#define AV_LOG_WARNING  24
+
+#define AV_LOG_INFO     32
+#define AV_LOG_VERBOSE  40
+
+/**
+ * Stuff which is only useful for libav* developers.
+ */
+#define AV_LOG_DEBUG    48
+
+/**
+ * Send the specified message to the log if the level is less than or equal
+ * to the current av_log_level. By default, all logging messages are sent to
+ * stderr. This behavior can be altered by setting a different av_vlog callback
+ * function.
+ *
+ * @param avcl A pointer to an arbitrary struct of which the first field is a
+ * pointer to an AVClass struct.
+ * @param level The importance level of the message, lower values signifying
+ * higher importance.
+ * @param fmt The format string (printf-compatible) that specifies how
+ * subsequent arguments are converted to output.
+ * @see av_vlog
+ */
+void av_log(void *avcl, int level, const char *fmt, ...) av_printf_format(3, 4);
+
+void av_vlog(void *avcl, int level, const char *fmt, va_list);
+int av_log_get_level(void);
+void av_log_set_level(int);
+void av_log_set_callback(void (*)(void*, int, const char*, va_list));
+void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl);
+const char* av_default_item_name(void* ctx);
+
+/**
+ * av_dlog macros
+ * Useful to print debug messages that shouldn't get compiled in normally.
+ */
+
+#ifdef DEBUG
+#    define av_dlog(pctx, ...) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__)
+#else
+#    define av_dlog(pctx, ...)
+#endif
+
+/**
+ * Skip repeated messages, this requires the user app to use av_log() instead of
+ * (f)printf as the 2 would otherwise interfere and lead to
+ * "Last message repeated x times" messages below (f)printf messages with some
+ * bad luck.
+ * Also to receive the last, "last repeated" line if any, the user app must
+ * call av_log(NULL, AV_LOG_QUIET, ""); at the end
+ */
+#define AV_LOG_SKIP_REPEATED 1
+void av_log_set_flags(int arg);
+
+#endif /* AVUTIL_LOG_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/lzo.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/lzo.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/lzo.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/lzo.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,66 @@
+/*
+ * LZO 1x decompression
+ * copyright (c) 2006 Reimar Doeffinger
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_LZO_H
+#define AVUTIL_LZO_H
+
+/**
+ * @defgroup lavu_lzo LZO
+ * @ingroup lavu_crypto
+ *
+ * @{
+ */
+
+#include <stdint.h>
+
+/** @name Error flags returned by av_lzo1x_decode
+ * @{ */
+/// end of the input buffer reached before decoding finished
+#define AV_LZO_INPUT_DEPLETED  1
+/// decoded data did not fit into output buffer
+#define AV_LZO_OUTPUT_FULL     2
+/// a reference to previously decoded data was wrong
+#define AV_LZO_INVALID_BACKPTR 4
+/// a non-specific error in the compressed bitstream
+#define AV_LZO_ERROR           8
+/** @} */
+
+#define AV_LZO_INPUT_PADDING   8
+#define AV_LZO_OUTPUT_PADDING 12
+
+/**
+ * @brief Decodes LZO 1x compressed data.
+ * @param out output buffer
+ * @param outlen size of output buffer, number of bytes left are returned here
+ * @param in input buffer
+ * @param inlen size of input buffer, number of bytes left are returned here
+ * @return 0 on success, otherwise a combination of the error flags above
+ *
+ * Make sure all buffers are appropriately padded, in must provide
+ * AV_LZO_INPUT_PADDING, out must provide AV_LZO_OUTPUT_PADDING additional bytes.
+ */
+int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_LZO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/mathematics.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/mathematics.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/mathematics.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/mathematics.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,111 @@
+/*
+ * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_MATHEMATICS_H
+#define AVUTIL_MATHEMATICS_H
+
+#include <stdint.h>
+#include <math.h>
+#include "attributes.h"
+#include "rational.h"
+#include "intfloat.h"
+
+#ifndef M_LOG2_10
+#define M_LOG2_10      3.32192809488736234787  /* log_2 10 */
+#endif
+#ifndef M_PHI
+#define M_PHI          1.61803398874989484820   /* phi / golden ratio */
+#endif
+#ifndef NAN
+#define NAN            av_int2float(0x7fc00000)
+#endif
+#ifndef INFINITY
+#define INFINITY       av_int2float(0x7f800000)
+#endif
+
+/**
+ * @addtogroup lavu_math
+ * @{
+ */
+
+
+enum AVRounding {
+    AV_ROUND_ZERO     = 0, ///< Round toward zero.
+    AV_ROUND_INF      = 1, ///< Round away from zero.
+    AV_ROUND_DOWN     = 2, ///< Round toward -infinity.
+    AV_ROUND_UP       = 3, ///< Round toward +infinity.
+    AV_ROUND_NEAR_INF = 5, ///< Round to nearest and halfway cases away from zero.
+};
+
+/**
+ * Return the greatest common divisor of a and b.
+ * If both a and b are 0 or either or both are <0 then behavior is
+ * undefined.
+ */
+int64_t av_const av_gcd(int64_t a, int64_t b);
+
+/**
+ * Rescale a 64-bit integer with rounding to nearest.
+ * A simple a*b/c isn't possible as it can overflow.
+ */
+int64_t av_rescale(int64_t a, int64_t b, int64_t c) av_const;
+
+/**
+ * Rescale a 64-bit integer with specified rounding.
+ * A simple a*b/c isn't possible as it can overflow.
+ */
+int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding) av_const;
+
+/**
+ * Rescale a 64-bit integer by 2 rational numbers.
+ */
+int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const;
+
+/**
+ * Rescale a 64-bit integer by 2 rational numbers with specified rounding.
+ */
+int64_t av_rescale_q_rnd(int64_t a, AVRational bq, AVRational cq,
+                         enum AVRounding) av_const;
+
+/**
+ * Compare 2 timestamps each in its own timebases.
+ * The result of the function is undefined if one of the timestamps
+ * is outside the int64_t range when represented in the others timebase.
+ * @return -1 if ts_a is before ts_b, 1 if ts_a is after ts_b or 0 if they represent the same position
+ */
+int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b);
+
+/**
+ * Compare 2 integers modulo mod.
+ * That is we compare integers a and b for which only the least
+ * significant log2(mod) bits are known.
+ *
+ * @param mod must be a power of 2
+ * @return a negative value if a is smaller than b
+ *         a positive value if a is greater than b
+ *         0                if a equals          b
+ */
+int64_t av_compare_mod(uint64_t a, uint64_t b, uint64_t mod);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_MATHEMATICS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/md5.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/md5.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/md5.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/md5.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,51 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_MD5_H
+#define AVUTIL_MD5_H
+
+#include <stdint.h>
+
+#include "attributes.h"
+#include "version.h"
+
+/**
+ * @defgroup lavu_md5 MD5
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+#if FF_API_CONTEXT_SIZE
+extern attribute_deprecated const int av_md5_size;
+#endif
+
+struct AVMD5;
+
+struct AVMD5 *av_md5_alloc(void);
+void av_md5_init(struct AVMD5 *ctx);
+void av_md5_update(struct AVMD5 *ctx, const uint8_t *src, const int len);
+void av_md5_final(struct AVMD5 *ctx, uint8_t *dst);
+void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_MD5_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/mem.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/mem.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/mem.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/mem.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,183 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * memory handling functions
+ */
+
+#ifndef AVUTIL_MEM_H
+#define AVUTIL_MEM_H
+
+#include <limits.h>
+#include <stdint.h>
+
+#include "attributes.h"
+#include "avutil.h"
+
+/**
+ * @addtogroup lavu_mem
+ * @{
+ */
+
+
+#if defined(__ICC) && __ICC < 1200 || defined(__SUNPRO_C)
+    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
+    #define DECLARE_ASM_CONST(n,t,v)    const t __attribute__ ((aligned (n))) v
+#elif defined(__TI_COMPILER_VERSION__)
+    #define DECLARE_ALIGNED(n,t,v)                      \
+        AV_PRAGMA(DATA_ALIGN(v,n))                      \
+        t __attribute__((aligned(n))) v
+    #define DECLARE_ASM_CONST(n,t,v)                    \
+        AV_PRAGMA(DATA_ALIGN(v,n))                      \
+        static const t __attribute__((aligned(n))) v
+#elif defined(__GNUC__)
+    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
+    #define DECLARE_ASM_CONST(n,t,v)    static const t av_used __attribute__ ((aligned (n))) v
+#elif defined(_MSC_VER)
+    #define DECLARE_ALIGNED(n,t,v)      __declspec(align(n)) t v
+    #define DECLARE_ASM_CONST(n,t,v)    __declspec(align(n)) static const t v
+#else
+    #define DECLARE_ALIGNED(n,t,v)      t v
+    #define DECLARE_ASM_CONST(n,t,v)    static const t v
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(3,1)
+    #define av_malloc_attrib __attribute__((__malloc__))
+#else
+    #define av_malloc_attrib
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(4,3)
+    #define av_alloc_size(...) __attribute__((alloc_size(__VA_ARGS__)))
+#else
+    #define av_alloc_size(...)
+#endif
+
+/**
+ * Allocate a block of size bytes with alignment suitable for all
+ * memory accesses (including vectors if available on the CPU).
+ * @param size Size in bytes for the memory block to be allocated.
+ * @return Pointer to the allocated block, NULL if the block cannot
+ * be allocated.
+ * @see av_mallocz()
+ */
+void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1);
+
+/**
+ * Helper function to allocate a block of size * nmemb bytes with
+ * using av_malloc()
+ * @param nmemb Number of elements
+ * @param size Size of the single element
+ * @return Pointer to the allocated block, NULL if the block cannot
+ * be allocated.
+ * @see av_malloc()
+ */
+av_alloc_size(1, 2) static inline void *av_malloc_array(size_t nmemb, size_t size)
+{
+    if (size <= 0 || nmemb >= INT_MAX / size)
+        return NULL;
+    return av_malloc(nmemb * size);
+}
+
+/**
+ * Allocate or reallocate a block of memory.
+ * If ptr is NULL and size > 0, allocate a new block. If
+ * size is zero, free the memory block pointed to by ptr.
+ * @param ptr Pointer to a memory block already allocated with
+ * av_malloc(z)() or av_realloc() or NULL.
+ * @param size Size in bytes for the memory block to be allocated or
+ * reallocated.
+ * @return Pointer to a newly reallocated block or NULL if the block
+ * cannot be reallocated or the function is used to free the memory block.
+ * @see av_fast_realloc()
+ */
+void *av_realloc(void *ptr, size_t size) av_alloc_size(2);
+
+/**
+ * Free a memory block which has been allocated with av_malloc(z)() or
+ * av_realloc().
+ * @param ptr Pointer to the memory block which should be freed.
+ * @note ptr = NULL is explicitly allowed.
+ * @note It is recommended that you use av_freep() instead.
+ * @see av_freep()
+ */
+void av_free(void *ptr);
+
+/**
+ * Allocate a block of size bytes with alignment suitable for all
+ * memory accesses (including vectors if available on the CPU) and
+ * zero all the bytes of the block.
+ * @param size Size in bytes for the memory block to be allocated.
+ * @return Pointer to the allocated block, NULL if it cannot be allocated.
+ * @see av_malloc()
+ */
+void *av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1);
+
+/**
+ * Helper function to allocate a block of size * nmemb bytes with
+ * using av_mallocz()
+ * @param nmemb Number of elements
+ * @param size Size of the single element
+ * @return Pointer to the allocated block, NULL if the block cannot
+ * be allocated.
+ * @see av_mallocz()
+ * @see av_malloc_array()
+ */
+av_alloc_size(1, 2) static inline void *av_mallocz_array(size_t nmemb, size_t size)
+{
+    if (size <= 0 || nmemb >= INT_MAX / size)
+        return NULL;
+    return av_mallocz(nmemb * size);
+}
+
+/**
+ * Duplicate the string s.
+ * @param s string to be duplicated
+ * @return Pointer to a newly allocated string containing a
+ * copy of s or NULL if the string cannot be allocated.
+ */
+char *av_strdup(const char *s) av_malloc_attrib;
+
+/**
+ * Free a memory block which has been allocated with av_malloc(z)() or
+ * av_realloc() and set the pointer pointing to it to NULL.
+ * @param ptr Pointer to the pointer to the memory block which should
+ * be freed.
+ * @see av_free()
+ */
+void av_freep(void *ptr);
+
+/**
+ * @brief deliberately overlapping memcpy implementation
+ * @param dst destination buffer
+ * @param back how many bytes back we start (the initial size of the overlapping window)
+ * @param cnt number of bytes to copy, must be >= 0
+ *
+ * cnt > back is valid, this will copy the bytes we just copied,
+ * thus creating a repeating pattern with a period length of back.
+ */
+void av_memcpy_backptr(uint8_t *dst, int back, int cnt);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_MEM_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/old_pix_fmts.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/old_pix_fmts.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/old_pix_fmts.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/old_pix_fmts.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,128 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_OLD_PIX_FMTS_H
+#define AVUTIL_OLD_PIX_FMTS_H
+
+/*
+ * This header exists to prevent new pixel formats from being accidentally added
+ * to the deprecated list.
+ * Do not include it directly. It will be removed on next major bump
+ *
+ * Do not add new items to this list. Use the AVPixelFormat enum instead.
+ */
+    PIX_FMT_NONE = AV_PIX_FMT_NONE,
+    PIX_FMT_YUV420P,   ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
+    PIX_FMT_YUYV422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
+    PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
+    PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
+    PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
+    PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
+    PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
+    PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
+    PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
+    PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
+    PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
+    PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
+    PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
+    PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
+    PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
+    PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
+    PIX_FMT_XVMC_MPEG2_IDCT,
+    PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
+    PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
+    PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
+    PIX_FMT_BGR4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
+    PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
+    PIX_FMT_RGB8,      ///< packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
+    PIX_FMT_RGB4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
+    PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
+    PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
+    PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
+
+    PIX_FMT_ARGB,      ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
+    PIX_FMT_RGBA,      ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
+    PIX_FMT_ABGR,      ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
+    PIX_FMT_BGRA,      ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
+
+    PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
+    PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
+    PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
+    PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
+    PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
+    PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
+    PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
+
+    PIX_FMT_RGB565BE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian
+    PIX_FMT_RGB565LE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), little-endian
+    PIX_FMT_RGB555BE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
+    PIX_FMT_RGB555LE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
+
+    PIX_FMT_BGR565BE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), big-endian
+    PIX_FMT_BGR565LE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), little-endian
+    PIX_FMT_BGR555BE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
+    PIX_FMT_BGR555LE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
+
+    PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
+    PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
+    PIX_FMT_VAAPI_VLD,  ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+
+    PIX_FMT_YUV420P16LE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    PIX_FMT_YUV420P16BE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    PIX_FMT_YUV422P16LE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    PIX_FMT_VDPAU_MPEG4,  ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
+
+    PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
+    PIX_FMT_RGB444BE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
+    PIX_FMT_BGR444LE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
+    PIX_FMT_BGR444BE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
+    PIX_FMT_Y400A,     ///< 8bit gray, 8bit alpha
+    PIX_FMT_BGR48BE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
+    PIX_FMT_BGR48LE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
+    PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    PIX_FMT_VDA_VLD,    ///< hardware decoding through VDA
+    PIX_FMT_GBRP,      ///< planar GBR 4:4:4 24bpp
+    PIX_FMT_GBRP9BE,   ///< planar GBR 4:4:4 27bpp, big endian
+    PIX_FMT_GBRP9LE,   ///< planar GBR 4:4:4 27bpp, little endian
+    PIX_FMT_GBRP10BE,  ///< planar GBR 4:4:4 30bpp, big endian
+    PIX_FMT_GBRP10LE,  ///< planar GBR 4:4:4 30bpp, little endian
+    PIX_FMT_GBRP16BE,  ///< planar GBR 4:4:4 48bpp, big endian
+    PIX_FMT_GBRP16LE,  ///< planar GBR 4:4:4 48bpp, little endian
+    PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
+
+#endif /* AVUTIL_OLD_PIX_FMTS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/opt.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/opt.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/opt.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/opt.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,516 @@
+/*
+ * AVOptions
+ * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_OPT_H
+#define AVUTIL_OPT_H
+
+/**
+ * @file
+ * AVOptions
+ */
+
+#include "rational.h"
+#include "avutil.h"
+#include "dict.h"
+#include "log.h"
+
+/**
+ * @defgroup avoptions AVOptions
+ * @ingroup lavu_data
+ * @{
+ * AVOptions provide a generic system to declare options on arbitrary structs
+ * ("objects"). An option can have a help text, a type and a range of possible
+ * values. Options may then be enumerated, read and written to.
+ *
+ * @section avoptions_implement Implementing AVOptions
+ * This section describes how to add AVOptions capabilities to a struct.
+ *
+ * All AVOptions-related information is stored in an AVClass. Therefore
+ * the first member of the struct must be a pointer to an AVClass describing it.
+ * The option field of the AVClass must be set to a NULL-terminated static array
+ * of AVOptions. Each AVOption must have a non-empty name, a type, a default
+ * value and for number-type AVOptions also a range of allowed values. It must
+ * also declare an offset in bytes from the start of the struct, where the field
+ * associated with this AVOption is located. Other fields in the AVOption struct
+ * should also be set when applicable, but are not required.
+ *
+ * The following example illustrates an AVOptions-enabled struct:
+ * @code
+ * typedef struct test_struct {
+ *     AVClass *class;
+ *     int      int_opt;
+ *     char    *str_opt;
+ *     uint8_t *bin_opt;
+ *     int      bin_len;
+ * } test_struct;
+ *
+ * static const AVOption options[] = {
+ *   { "test_int", "This is a test option of int type.", offsetof(test_struct, int_opt),
+ *     AV_OPT_TYPE_INT, { .i64 = -1 }, INT_MIN, INT_MAX },
+ *   { "test_str", "This is a test option of string type.", offsetof(test_struct, str_opt),
+ *     AV_OPT_TYPE_STRING },
+ *   { "test_bin", "This is a test option of binary type.", offsetof(test_struct, bin_opt),
+ *     AV_OPT_TYPE_BINARY },
+ *   { NULL },
+ * };
+ *
+ * static const AVClass test_class = {
+ *     .class_name = "test class",
+ *     .item_name  = av_default_item_name,
+ *     .option     = options,
+ *     .version    = LIBAVUTIL_VERSION_INT,
+ * };
+ * @endcode
+ *
+ * Next, when allocating your struct, you must ensure that the AVClass pointer
+ * is set to the correct value. Then, av_opt_set_defaults() must be called to
+ * initialize defaults. After that the struct is ready to be used with the
+ * AVOptions API.
+ *
+ * When cleaning up, you may use the av_opt_free() function to automatically
+ * free all the allocated string and binary options.
+ *
+ * Continuing with the above example:
+ *
+ * @code
+ * test_struct *alloc_test_struct(void)
+ * {
+ *     test_struct *ret = av_malloc(sizeof(*ret));
+ *     ret->class = &test_class;
+ *     av_opt_set_defaults(ret);
+ *     return ret;
+ * }
+ * void free_test_struct(test_struct **foo)
+ * {
+ *     av_opt_free(*foo);
+ *     av_freep(foo);
+ * }
+ * @endcode
+ *
+ * @subsection avoptions_implement_nesting Nesting
+ *      It may happen that an AVOptions-enabled struct contains another
+ *      AVOptions-enabled struct as a member (e.g. AVCodecContext in
+ *      libavcodec exports generic options, while its priv_data field exports
+ *      codec-specific options). In such a case, it is possible to set up the
+ *      parent struct to export a child's options. To do that, simply
+ *      implement AVClass.child_next() and AVClass.child_class_next() in the
+ *      parent struct's AVClass.
+ *      Assuming that the test_struct from above now also contains a
+ *      child_struct field:
+ *
+ *      @code
+ *      typedef struct child_struct {
+ *          AVClass *class;
+ *          int flags_opt;
+ *      } child_struct;
+ *      static const AVOption child_opts[] = {
+ *          { "test_flags", "This is a test option of flags type.",
+ *            offsetof(child_struct, flags_opt), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX },
+ *          { NULL },
+ *      };
+ *      static const AVClass child_class = {
+ *          .class_name = "child class",
+ *          .item_name  = av_default_item_name,
+ *          .option     = child_opts,
+ *          .version    = LIBAVUTIL_VERSION_INT,
+ *      };
+ *
+ *      void *child_next(void *obj, void *prev)
+ *      {
+ *          test_struct *t = obj;
+ *          if (!prev && t->child_struct)
+ *              return t->child_struct;
+ *          return NULL
+ *      }
+ *      const AVClass child_class_next(const AVClass *prev)
+ *      {
+ *          return prev ? NULL : &child_class;
+ *      }
+ *      @endcode
+ *      Putting child_next() and child_class_next() as defined above into
+ *      test_class will now make child_struct's options accessible through
+ *      test_struct (again, proper setup as described above needs to be done on
+ *      child_struct right after it is created).
+ *
+ *      From the above example it might not be clear why both child_next()
+ *      and child_class_next() are needed. The distinction is that child_next()
+ *      iterates over actually existing objects, while child_class_next()
+ *      iterates over all possible child classes. E.g. if an AVCodecContext
+ *      was initialized to use a codec which has private options, then its
+ *      child_next() will return AVCodecContext.priv_data and finish
+ *      iterating. OTOH child_class_next() on AVCodecContext.av_class will
+ *      iterate over all available codecs with private options.
+ *
+ * @subsection avoptions_implement_named_constants Named constants
+ *      It is possible to create named constants for options. Simply set the unit
+ *      field of the option the constants should apply to to a string and
+ *      create the constants themselves as options of type AV_OPT_TYPE_CONST
+ *      with their unit field set to the same string.
+ *      Their default_val field should contain the value of the named
+ *      constant.
+ *      For example, to add some named constants for the test_flags option
+ *      above, put the following into the child_opts array:
+ *      @code
+ *      { "test_flags", "This is a test option of flags type.",
+ *        offsetof(child_struct, flags_opt), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX, "test_unit" },
+ *      { "flag1", "This is a flag with value 16", 0, AV_OPT_TYPE_CONST, { .i64 = 16 }, 0, 0, "test_unit" },
+ *      @endcode
+ *
+ * @section avoptions_use Using AVOptions
+ * This section deals with accessing options in an AVOptions-enabled struct.
+ * Such structs in Libav are e.g. AVCodecContext in libavcodec or
+ * AVFormatContext in libavformat.
+ *
+ * @subsection avoptions_use_examine Examining AVOptions
+ * The basic functions for examining options are av_opt_next(), which iterates
+ * over all options defined for one object, and av_opt_find(), which searches
+ * for an option with the given name.
+ *
+ * The situation is more complicated with nesting. An AVOptions-enabled struct
+ * may have AVOptions-enabled children. Passing the AV_OPT_SEARCH_CHILDREN flag
+ * to av_opt_find() will make the function search children recursively.
+ *
+ * For enumerating there are basically two cases. The first is when you want to
+ * get all options that may potentially exist on the struct and its children
+ * (e.g.  when constructing documentation). In that case you should call
+ * av_opt_child_class_next() recursively on the parent struct's AVClass.  The
+ * second case is when you have an already initialized struct with all its
+ * children and you want to get all options that can be actually written or read
+ * from it. In that case you should call av_opt_child_next() recursively (and
+ * av_opt_next() on each result).
+ *
+ * @subsection avoptions_use_get_set Reading and writing AVOptions
+ * When setting options, you often have a string read directly from the
+ * user. In such a case, simply passing it to av_opt_set() is enough. For
+ * non-string type options, av_opt_set() will parse the string according to the
+ * option type.
+ *
+ * Similarly av_opt_get() will read any option type and convert it to a string
+ * which will be returned. Do not forget that the string is allocated, so you
+ * have to free it with av_free().
+ *
+ * In some cases it may be more convenient to put all options into an
+ * AVDictionary and call av_opt_set_dict() on it. A specific case of this
+ * are the format/codec open functions in lavf/lavc which take a dictionary
+ * filled with option as a parameter. This allows to set some options
+ * that cannot be set otherwise, since e.g. the input file format is not known
+ * before the file is actually opened.
+ */
+
+enum AVOptionType{
+    AV_OPT_TYPE_FLAGS,
+    AV_OPT_TYPE_INT,
+    AV_OPT_TYPE_INT64,
+    AV_OPT_TYPE_DOUBLE,
+    AV_OPT_TYPE_FLOAT,
+    AV_OPT_TYPE_STRING,
+    AV_OPT_TYPE_RATIONAL,
+    AV_OPT_TYPE_BINARY,  ///< offset must point to a pointer immediately followed by an int for the length
+    AV_OPT_TYPE_CONST = 128,
+};
+
+/**
+ * AVOption
+ */
+typedef struct AVOption {
+    const char *name;
+
+    /**
+     * short English help text
+     * @todo What about other languages?
+     */
+    const char *help;
+
+    /**
+     * The offset relative to the context structure where the option
+     * value is stored. It should be 0 for named constants.
+     */
+    int offset;
+    enum AVOptionType type;
+
+    /**
+     * the default value for scalar options
+     */
+    union {
+        int64_t i64;
+        double dbl;
+        const char *str;
+        /* TODO those are unused now */
+        AVRational q;
+    } default_val;
+    double min;                 ///< minimum valid value for the option
+    double max;                 ///< maximum valid value for the option
+
+    int flags;
+#define AV_OPT_FLAG_ENCODING_PARAM  1   ///< a generic parameter which can be set by the user for muxing or encoding
+#define AV_OPT_FLAG_DECODING_PARAM  2   ///< a generic parameter which can be set by the user for demuxing or decoding
+#define AV_OPT_FLAG_METADATA        4   ///< some data extracted or inserted into the file like title, comment, ...
+#define AV_OPT_FLAG_AUDIO_PARAM     8
+#define AV_OPT_FLAG_VIDEO_PARAM     16
+#define AV_OPT_FLAG_SUBTITLE_PARAM  32
+//FIXME think about enc-audio, ... style flags
+
+    /**
+     * The logical unit to which the option belongs. Non-constant
+     * options and corresponding named constants share the same
+     * unit. May be NULL.
+     */
+    const char *unit;
+} AVOption;
+
+/**
+ * Show the obj options.
+ *
+ * @param req_flags requested flags for the options to show. Show only the
+ * options for which it is opt->flags & req_flags.
+ * @param rej_flags rejected flags for the options to show. Show only the
+ * options for which it is !(opt->flags & req_flags).
+ * @param av_log_obj log context to use for showing the options
+ */
+int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags);
+
+/**
+ * Set the values of all AVOption fields to their default values.
+ *
+ * @param s an AVOption-enabled struct (its first member must be a pointer to AVClass)
+ */
+void av_opt_set_defaults(void *s);
+
+/**
+ * Parse the key/value pairs list in opts. For each key/value pair
+ * found, stores the value in the field in ctx that is named like the
+ * key. ctx must be an AVClass context, storing is done using
+ * AVOptions.
+ *
+ * @param key_val_sep a 0-terminated list of characters used to
+ * separate key from value
+ * @param pairs_sep a 0-terminated list of characters used to separate
+ * two pairs from each other
+ * @return the number of successfully set key/value pairs, or a negative
+ * value corresponding to an AVERROR code in case of error:
+ * AVERROR(EINVAL) if opts cannot be parsed,
+ * the error code issued by av_set_string3() if a key/value pair
+ * cannot be set
+ */
+int av_set_options_string(void *ctx, const char *opts,
+                          const char *key_val_sep, const char *pairs_sep);
+
+/**
+ * Free all string and binary options in obj.
+ */
+void av_opt_free(void *obj);
+
+/**
+ * Check whether a particular flag is set in a flags field.
+ *
+ * @param field_name the name of the flag field option
+ * @param flag_name the name of the flag to check
+ * @return non-zero if the flag is set, zero if the flag isn't set,
+ *         isn't of the right type, or the flags field doesn't exist.
+ */
+int av_opt_flag_is_set(void *obj, const char *field_name, const char *flag_name);
+
+/*
+ * Set all the options from a given dictionary on an object.
+ *
+ * @param obj a struct whose first element is a pointer to AVClass
+ * @param options options to process. This dictionary will be freed and replaced
+ *                by a new one containing all options not found in obj.
+ *                Of course this new dictionary needs to be freed by caller
+ *                with av_dict_free().
+ *
+ * @return 0 on success, a negative AVERROR if some option was found in obj,
+ *         but could not be set.
+ *
+ * @see av_dict_copy()
+ */
+int av_opt_set_dict(void *obj, struct AVDictionary **options);
+
+/**
+ * @defgroup opt_eval_funcs Evaluating option strings
+ * @{
+ * This group of functions can be used to evaluate option strings
+ * and get numbers out of them. They do the same thing as av_opt_set(),
+ * except the result is written into the caller-supplied pointer.
+ *
+ * @param obj a struct whose first element is a pointer to AVClass.
+ * @param o an option for which the string is to be evaluated.
+ * @param val string to be evaluated.
+ * @param *_out value of the string will be written here.
+ *
+ * @return 0 on success, a negative number on failure.
+ */
+int av_opt_eval_flags (void *obj, const AVOption *o, const char *val, int        *flags_out);
+int av_opt_eval_int   (void *obj, const AVOption *o, const char *val, int        *int_out);
+int av_opt_eval_int64 (void *obj, const AVOption *o, const char *val, int64_t    *int64_out);
+int av_opt_eval_float (void *obj, const AVOption *o, const char *val, float      *float_out);
+int av_opt_eval_double(void *obj, const AVOption *o, const char *val, double     *double_out);
+int av_opt_eval_q     (void *obj, const AVOption *o, const char *val, AVRational *q_out);
+/**
+ * @}
+ */
+
+#define AV_OPT_SEARCH_CHILDREN   0x0001 /**< Search in possible children of the
+                                             given object first. */
+/**
+ *  The obj passed to av_opt_find() is fake -- only a double pointer to AVClass
+ *  instead of a required pointer to a struct containing AVClass. This is
+ *  useful for searching for options without needing to allocate the corresponding
+ *  object.
+ */
+#define AV_OPT_SEARCH_FAKE_OBJ   0x0002
+
+/**
+ * Look for an option in an object. Consider only options which
+ * have all the specified flags set.
+ *
+ * @param[in] obj A pointer to a struct whose first element is a
+ *                pointer to an AVClass.
+ *                Alternatively a double pointer to an AVClass, if
+ *                AV_OPT_SEARCH_FAKE_OBJ search flag is set.
+ * @param[in] name The name of the option to look for.
+ * @param[in] unit When searching for named constants, name of the unit
+ *                 it belongs to.
+ * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG).
+ * @param search_flags A combination of AV_OPT_SEARCH_*.
+ *
+ * @return A pointer to the option found, or NULL if no option
+ *         was found.
+ *
+ * @note Options found with AV_OPT_SEARCH_CHILDREN flag may not be settable
+ * directly with av_set_string3(). Use special calls which take an options
+ * AVDictionary (e.g. avformat_open_input()) to set options found with this
+ * flag.
+ */
+const AVOption *av_opt_find(void *obj, const char *name, const char *unit,
+                            int opt_flags, int search_flags);
+
+/**
+ * Look for an option in an object. Consider only options which
+ * have all the specified flags set.
+ *
+ * @param[in] obj A pointer to a struct whose first element is a
+ *                pointer to an AVClass.
+ *                Alternatively a double pointer to an AVClass, if
+ *                AV_OPT_SEARCH_FAKE_OBJ search flag is set.
+ * @param[in] name The name of the option to look for.
+ * @param[in] unit When searching for named constants, name of the unit
+ *                 it belongs to.
+ * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG).
+ * @param search_flags A combination of AV_OPT_SEARCH_*.
+ * @param[out] target_obj if non-NULL, an object to which the option belongs will be
+ * written here. It may be different from obj if AV_OPT_SEARCH_CHILDREN is present
+ * in search_flags. This parameter is ignored if search_flags contain
+ * AV_OPT_SEARCH_FAKE_OBJ.
+ *
+ * @return A pointer to the option found, or NULL if no option
+ *         was found.
+ */
+const AVOption *av_opt_find2(void *obj, const char *name, const char *unit,
+                             int opt_flags, int search_flags, void **target_obj);
+
+/**
+ * Iterate over all AVOptions belonging to obj.
+ *
+ * @param obj an AVOptions-enabled struct or a double pointer to an
+ *            AVClass describing it.
+ * @param prev result of the previous call to av_opt_next() on this object
+ *             or NULL
+ * @return next AVOption or NULL
+ */
+const AVOption *av_opt_next(void *obj, const AVOption *prev);
+
+/**
+ * Iterate over AVOptions-enabled children of obj.
+ *
+ * @param prev result of a previous call to this function or NULL
+ * @return next AVOptions-enabled child or NULL
+ */
+void *av_opt_child_next(void *obj, void *prev);
+
+/**
+ * Iterate over potential AVOptions-enabled children of parent.
+ *
+ * @param prev result of a previous call to this function or NULL
+ * @return AVClass corresponding to next potential child or NULL
+ */
+const AVClass *av_opt_child_class_next(const AVClass *parent, const AVClass *prev);
+
+/**
+ * @defgroup opt_set_funcs Option setting functions
+ * @{
+ * Those functions set the field of obj with the given name to value.
+ *
+ * @param[in] obj A struct whose first element is a pointer to an AVClass.
+ * @param[in] name the name of the field to set
+ * @param[in] val The value to set. In case of av_opt_set() if the field is not
+ * of a string type, then the given string is parsed.
+ * SI postfixes and some named scalars are supported.
+ * If the field is of a numeric type, it has to be a numeric or named
+ * scalar. Behavior with more than one scalar and +- infix operators
+ * is undefined.
+ * If the field is of a flags type, it has to be a sequence of numeric
+ * scalars or named flags separated by '+' or '-'. Prefixing a flag
+ * with '+' causes it to be set without affecting the other flags;
+ * similarly, '-' unsets a flag.
+ * @param search_flags flags passed to av_opt_find2. I.e. if AV_OPT_SEARCH_CHILDREN
+ * is passed here, then the option may be set on a child of obj.
+ *
+ * @return 0 if the value has been set, or an AVERROR code in case of
+ * error:
+ * AVERROR_OPTION_NOT_FOUND if no matching option exists
+ * AVERROR(ERANGE) if the value is out of range
+ * AVERROR(EINVAL) if the value is not valid
+ */
+int av_opt_set       (void *obj, const char *name, const char *val, int search_flags);
+int av_opt_set_int   (void *obj, const char *name, int64_t     val, int search_flags);
+int av_opt_set_double(void *obj, const char *name, double      val, int search_flags);
+int av_opt_set_q     (void *obj, const char *name, AVRational  val, int search_flags);
+int av_opt_set_bin   (void *obj, const char *name, const uint8_t *val, int size, int search_flags);
+/**
+ * @}
+ */
+
+/**
+ * @defgroup opt_get_funcs Option getting functions
+ * @{
+ * Those functions get a value of the option with the given name from an object.
+ *
+ * @param[in] obj a struct whose first element is a pointer to an AVClass.
+ * @param[in] name name of the option to get.
+ * @param[in] search_flags flags passed to av_opt_find2. I.e. if AV_OPT_SEARCH_CHILDREN
+ * is passed here, then the option may be found in a child of obj.
+ * @param[out] out_val value of the option will be written here
+ * @return 0 on success, a negative error code otherwise
+ */
+/**
+ * @note the returned string will av_malloc()ed and must be av_free()ed by the caller
+ */
+int av_opt_get       (void *obj, const char *name, int search_flags, uint8_t   **out_val);
+int av_opt_get_int   (void *obj, const char *name, int search_flags, int64_t    *out_val);
+int av_opt_get_double(void *obj, const char *name, int search_flags, double     *out_val);
+int av_opt_get_q     (void *obj, const char *name, int search_flags, AVRational *out_val);
+/**
+ * @}
+ * @}
+ */
+
+#endif /* AVUTIL_OPT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/parseutils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/parseutils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/parseutils.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/parseutils.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,124 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_PARSEUTILS_H
+#define AVUTIL_PARSEUTILS_H
+
+#include <time.h>
+
+#include "rational.h"
+
+/**
+ * @file
+ * misc parsing utilities
+ */
+
+/**
+ * Parse str and put in width_ptr and height_ptr the detected values.
+ *
+ * @param[in,out] width_ptr pointer to the variable which will contain the detected
+ * width value
+ * @param[in,out] height_ptr pointer to the variable which will contain the detected
+ * height value
+ * @param[in] str the string to parse: it has to be a string in the format
+ * width x height or a valid video size abbreviation.
+ * @return >= 0 on success, a negative error code otherwise
+ */
+int av_parse_video_size(int *width_ptr, int *height_ptr, const char *str);
+
+/**
+ * Parse str and store the detected values in *rate.
+ *
+ * @param[in,out] rate pointer to the AVRational which will contain the detected
+ * frame rate
+ * @param[in] str the string to parse: it has to be a string in the format
+ * rate_num / rate_den, a float number or a valid video rate abbreviation
+ * @return >= 0 on success, a negative error code otherwise
+ */
+int av_parse_video_rate(AVRational *rate, const char *str);
+
+/**
+ * Put the RGBA values that correspond to color_string in rgba_color.
+ *
+ * @param color_string a string specifying a color. It can be the name of
+ * a color (case insensitive match) or a [0x|#]RRGGBB[AA] sequence,
+ * possibly followed by "@" and a string representing the alpha
+ * component.
+ * The alpha component may be a string composed by "0x" followed by an
+ * hexadecimal number or a decimal number between 0.0 and 1.0, which
+ * represents the opacity value (0x00/0.0 means completely transparent,
+ * 0xff/1.0 completely opaque).
+ * If the alpha component is not specified then 0xff is assumed.
+ * The string "random" will result in a random color.
+ * @param slen length of the initial part of color_string containing the
+ * color. It can be set to -1 if color_string is a null terminated string
+ * containing nothing else than the color.
+ * @return >= 0 in case of success, a negative value in case of
+ * failure (for example if color_string cannot be parsed).
+ */
+int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen,
+                   void *log_ctx);
+
+/**
+ * Parse timestr and return in *time a corresponding number of
+ * microseconds.
+ *
+ * @param timeval puts here the number of microseconds corresponding
+ * to the string in timestr. If the string represents a duration, it
+ * is the number of microseconds contained in the time interval.  If
+ * the string is a date, is the number of microseconds since 1st of
+ * January, 1970 up to the time of the parsed date.  If timestr cannot
+ * be successfully parsed, set *time to INT64_MIN.
+
+ * @param timestr a string representing a date or a duration.
+ * - If a date the syntax is:
+ * @code
+ * [{YYYY-MM-DD|YYYYMMDD}[T|t| ]]{{HH[:MM[:SS[.m...]]]}|{HH[MM[SS[.m...]]]}}[Z]
+ * now
+ * @endcode
+ * If the value is "now" it takes the current time.
+ * Time is local time unless Z is appended, in which case it is
+ * interpreted as UTC.
+ * If the year-month-day part is not specified it takes the current
+ * year-month-day.
+ * - If a duration the syntax is:
+ * @code
+ * [-]HH[:MM[:SS[.m...]]]
+ * [-]S+[.m...]
+ * @endcode
+ * @param duration flag which tells how to interpret timestr, if not
+ * zero timestr is interpreted as a duration, otherwise as a date
+ * @return 0 in case of success, a negative value corresponding to an
+ * AVERROR code otherwise
+ */
+int av_parse_time(int64_t *timeval, const char *timestr, int duration);
+
+/**
+ * Attempt to find a specific tag in a URL.
+ *
+ * syntax: '?tag1=val1&tag2=val2...'. Little URL decoding is done.
+ * Return 1 if found.
+ */
+int av_find_info_tag(char *arg, int arg_size, const char *tag1, const char *info);
+
+/**
+ * Convert the decomposed UTC time in tm to a time_t value.
+ */
+time_t av_timegm(struct tm *tm);
+
+#endif /* AVUTIL_PARSEUTILS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/pixdesc.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/pixdesc.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/pixdesc.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/pixdesc.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,223 @@
+/*
+ * pixel format descriptor
+ * Copyright (c) 2009 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_PIXDESC_H
+#define AVUTIL_PIXDESC_H
+
+#include <inttypes.h>
+#include "pixfmt.h"
+
+typedef struct AVComponentDescriptor{
+    uint16_t plane        :2;            ///< which of the 4 planes contains the component
+
+    /**
+     * Number of elements between 2 horizontally consecutive pixels minus 1.
+     * Elements are bits for bitstream formats, bytes otherwise.
+     */
+    uint16_t step_minus1  :3;
+
+    /**
+     * Number of elements before the component of the first pixel plus 1.
+     * Elements are bits for bitstream formats, bytes otherwise.
+     */
+    uint16_t offset_plus1 :3;
+    uint16_t shift        :3;            ///< number of least significant bits that must be shifted away to get the value
+    uint16_t depth_minus1 :4;            ///< number of bits in the component minus 1
+}AVComponentDescriptor;
+
+/**
+ * Descriptor that unambiguously describes how the bits of a pixel are
+ * stored in the up to 4 data planes of an image. It also stores the
+ * subsampling factors and number of components.
+ *
+ * @note This is separate of the colorspace (RGB, YCbCr, YPbPr, JPEG-style YUV
+ *       and all the YUV variants) AVPixFmtDescriptor just stores how values
+ *       are stored not what these values represent.
+ */
+typedef struct AVPixFmtDescriptor{
+    const char *name;
+    uint8_t nb_components;      ///< The number of components each pixel has, (1-4)
+
+    /**
+     * Amount to shift the luma width right to find the chroma width.
+     * For YV12 this is 1 for example.
+     * chroma_width = -((-luma_width) >> log2_chroma_w)
+     * The note above is needed to ensure rounding up.
+     * This value only refers to the chroma components.
+     */
+    uint8_t log2_chroma_w;      ///< chroma_width = -((-luma_width )>>log2_chroma_w)
+
+    /**
+     * Amount to shift the luma height right to find the chroma height.
+     * For YV12 this is 1 for example.
+     * chroma_height= -((-luma_height) >> log2_chroma_h)
+     * The note above is needed to ensure rounding up.
+     * This value only refers to the chroma components.
+     */
+    uint8_t log2_chroma_h;
+    uint8_t flags;
+
+    /**
+     * Parameters that describe how pixels are packed. If the format
+     * has chroma components, they must be stored in comp[1] and
+     * comp[2].
+     */
+    AVComponentDescriptor comp[4];
+}AVPixFmtDescriptor;
+
+#define PIX_FMT_BE        1 ///< Pixel format is big-endian.
+#define PIX_FMT_PAL       2 ///< Pixel format has a palette in data[1], values are indexes in this palette.
+#define PIX_FMT_BITSTREAM 4 ///< All values of a component are bit-wise packed end to end.
+#define PIX_FMT_HWACCEL   8 ///< Pixel format is an HW accelerated format.
+#define PIX_FMT_PLANAR   16 ///< At least one pixel component is not in the first data plane
+#define PIX_FMT_RGB      32 ///< The pixel format contains RGB-like data (as opposed to YUV/grayscale)
+/**
+ * The pixel format is "pseudo-paletted". This means that Libav treats it as
+ * paletted internally, but the palette is generated by the decoder and is not
+ * stored in the file.
+ */
+#define PIX_FMT_PSEUDOPAL 64
+
+#define PIX_FMT_ALPHA   128 ///< The pixel format has an alpha channel
+
+
+#if FF_API_PIX_FMT_DESC
+/**
+ * The array of all the pixel format descriptors.
+ */
+extern const AVPixFmtDescriptor av_pix_fmt_descriptors[];
+#endif
+
+/**
+ * Read a line from an image, and write the values of the
+ * pixel format component c to dst.
+ *
+ * @param data the array containing the pointers to the planes of the image
+ * @param linesize the array containing the linesizes of the image
+ * @param desc the pixel format descriptor for the image
+ * @param x the horizontal coordinate of the first pixel to read
+ * @param y the vertical coordinate of the first pixel to read
+ * @param w the width of the line to read, that is the number of
+ * values to write to dst
+ * @param read_pal_component if not zero and the format is a paletted
+ * format writes the values corresponding to the palette
+ * component c in data[1] to dst, rather than the palette indexes in
+ * data[0]. The behavior is undefined if the format is not paletted.
+ */
+void av_read_image_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4],
+                        const AVPixFmtDescriptor *desc, int x, int y, int c, int w, int read_pal_component);
+
+/**
+ * Write the values from src to the pixel format component c of an
+ * image line.
+ *
+ * @param src array containing the values to write
+ * @param data the array containing the pointers to the planes of the
+ * image to write into. It is supposed to be zeroed.
+ * @param linesize the array containing the linesizes of the image
+ * @param desc the pixel format descriptor for the image
+ * @param x the horizontal coordinate of the first pixel to write
+ * @param y the vertical coordinate of the first pixel to write
+ * @param w the width of the line to write, that is the number of
+ * values to write to the image line
+ */
+void av_write_image_line(const uint16_t *src, uint8_t *data[4], const int linesize[4],
+                         const AVPixFmtDescriptor *desc, int x, int y, int c, int w);
+
+/**
+ * Return the pixel format corresponding to name.
+ *
+ * If there is no pixel format with name name, then looks for a
+ * pixel format with the name corresponding to the native endian
+ * format of name.
+ * For example in a little-endian system, first looks for "gray16",
+ * then for "gray16le".
+ *
+ * Finally if no pixel format has been found, returns PIX_FMT_NONE.
+ */
+enum AVPixelFormat av_get_pix_fmt(const char *name);
+
+/**
+ * Return the short name for a pixel format, NULL in case pix_fmt is
+ * unknown.
+ *
+ * @see av_get_pix_fmt(), av_get_pix_fmt_string()
+ */
+const char *av_get_pix_fmt_name(enum AVPixelFormat pix_fmt);
+
+/**
+ * Print in buf the string corresponding to the pixel format with
+ * number pix_fmt, or an header if pix_fmt is negative.
+ *
+ * @param buf the buffer where to write the string
+ * @param buf_size the size of buf
+ * @param pix_fmt the number of the pixel format to print the
+ * corresponding info string, or a negative value to print the
+ * corresponding header.
+ */
+char *av_get_pix_fmt_string (char *buf, int buf_size, enum AVPixelFormat pix_fmt);
+
+/**
+ * Return the number of bits per pixel used by the pixel format
+ * described by pixdesc.
+ *
+ * The returned number of bits refers to the number of bits actually
+ * used for storing the pixel information, that is padding bits are
+ * not counted.
+ */
+int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc);
+
+/**
+ * @return a pixel format descriptor for provided pixel format or NULL if
+ * this pixel format is unknown.
+ */
+const AVPixFmtDescriptor *av_pix_fmt_desc_get(enum AVPixelFormat pix_fmt);
+
+/**
+ * Iterate over all pixel format descriptors known to libavutil.
+ *
+ * @param prev previous descriptor. NULL to get the first descriptor.
+ *
+ * @return next descriptor or NULL after the last descriptor
+ */
+const AVPixFmtDescriptor *av_pix_fmt_desc_next(const AVPixFmtDescriptor *prev);
+
+/**
+ * @return an AVPixelFormat id described by desc, or AV_PIX_FMT_NONE if desc
+ * is not a valid pointer to a pixel format descriptor.
+ */
+enum AVPixelFormat av_pix_fmt_desc_get_id(const AVPixFmtDescriptor *desc);
+
+/**
+ * Utility function to access log2_chroma_w log2_chroma_h from
+ * the pixel format AVPixFmtDescriptor.
+ *
+ * @param[in]  pix_fmt the pixel format
+ * @param[out] h_shift store log2_chroma_h
+ * @param[out] v_shift store log2_chroma_w
+ *
+ * @return 0 on success, AVERROR(ENOSYS) on invalid or unknown pixel format
+ */
+int av_pix_fmt_get_chroma_sub_sample(enum AVPixelFormat pix_fmt,
+                                     int *h_shift, int *v_shift);
+
+
+#endif /* AVUTIL_PIXDESC_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/pixfmt.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/pixfmt.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/pixfmt.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/pixfmt.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,268 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_PIXFMT_H
+#define AVUTIL_PIXFMT_H
+
+/**
+ * @file
+ * pixel format definitions
+ *
+ */
+
+#include "libavutil/avconfig.h"
+#include "libavutil/version.h"
+
+/**
+ * Pixel format.
+ *
+ * @note
+ * PIX_FMT_RGB32 is handled in an endian-specific manner. An RGBA
+ * color is put together as:
+ *  (A << 24) | (R << 16) | (G << 8) | B
+ * This is stored as BGRA on little-endian CPU architectures and ARGB on
+ * big-endian CPUs.
+ *
+ * @par
+ * When the pixel format is palettized RGB (PIX_FMT_PAL8), the palettized
+ * image data is stored in AVFrame.data[0]. The palette is transported in
+ * AVFrame.data[1], is 1024 bytes long (256 4-byte entries) and is
+ * formatted the same as in PIX_FMT_RGB32 described above (i.e., it is
+ * also endian-specific). Note also that the individual RGB palette
+ * components stored in AVFrame.data[1] should be in the range 0..255.
+ * This is important as many custom PAL8 video codecs that were designed
+ * to run on the IBM VGA graphics adapter use 6-bit palette components.
+ *
+ * @par
+ * For all the 8bit per pixel formats, an RGB32 palette is in data[1] like
+ * for pal8. This palette is filled in automatically by the function
+ * allocating the picture.
+ *
+ * @note
+ * Make sure that all newly added big-endian formats have pix_fmt & 1 == 1
+ * and that all newly added little-endian formats have pix_fmt & 1 == 0.
+ * This allows simpler detection of big vs little-endian.
+ */
+enum AVPixelFormat {
+    AV_PIX_FMT_NONE = -1,
+    AV_PIX_FMT_YUV420P,   ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
+    AV_PIX_FMT_YUYV422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
+    AV_PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
+    AV_PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
+    AV_PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
+    AV_PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
+    AV_PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
+    AV_PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
+    AV_PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
+    AV_PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
+    AV_PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
+    AV_PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
+    AV_PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
+    AV_PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
+    AV_PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
+    AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
+    AV_PIX_FMT_XVMC_MPEG2_IDCT,
+    AV_PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
+    AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
+    AV_PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
+    AV_PIX_FMT_BGR4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
+    AV_PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
+    AV_PIX_FMT_RGB8,      ///< packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
+    AV_PIX_FMT_RGB4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
+    AV_PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
+    AV_PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
+    AV_PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
+
+    AV_PIX_FMT_ARGB,      ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
+    AV_PIX_FMT_RGBA,      ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
+    AV_PIX_FMT_ABGR,      ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
+    AV_PIX_FMT_BGRA,      ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
+
+    AV_PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
+    AV_PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
+    AV_PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
+    AV_PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
+    AV_PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
+    AV_PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    AV_PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    AV_PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    AV_PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    AV_PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    AV_PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
+    AV_PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
+
+    AV_PIX_FMT_RGB565BE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian
+    AV_PIX_FMT_RGB565LE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), little-endian
+    AV_PIX_FMT_RGB555BE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
+    AV_PIX_FMT_RGB555LE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
+
+    AV_PIX_FMT_BGR565BE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), big-endian
+    AV_PIX_FMT_BGR565LE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), little-endian
+    AV_PIX_FMT_BGR555BE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
+    AV_PIX_FMT_BGR555LE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
+
+    AV_PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
+    AV_PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
+    AV_PIX_FMT_VAAPI_VLD,  ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+
+    AV_PIX_FMT_YUV420P16LE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    AV_PIX_FMT_YUV420P16BE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    AV_PIX_FMT_YUV422P16LE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    AV_PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    AV_PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    AV_PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    AV_PIX_FMT_VDPAU_MPEG4,  ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    AV_PIX_FMT_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
+
+    AV_PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
+    AV_PIX_FMT_RGB444BE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
+    AV_PIX_FMT_BGR444LE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
+    AV_PIX_FMT_BGR444BE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
+    AV_PIX_FMT_Y400A,     ///< 8bit gray, 8bit alpha
+    AV_PIX_FMT_BGR48BE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
+    AV_PIX_FMT_BGR48LE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
+    AV_PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    AV_PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    AV_PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    AV_PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    AV_PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    AV_PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    AV_PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    AV_PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    AV_PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    AV_PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    AV_PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    AV_PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    AV_PIX_FMT_VDA_VLD,    ///< hardware decoding through VDA
+    AV_PIX_FMT_GBRP,      ///< planar GBR 4:4:4 24bpp
+    AV_PIX_FMT_GBRP9BE,   ///< planar GBR 4:4:4 27bpp, big-endian
+    AV_PIX_FMT_GBRP9LE,   ///< planar GBR 4:4:4 27bpp, little-endian
+    AV_PIX_FMT_GBRP10BE,  ///< planar GBR 4:4:4 30bpp, big-endian
+    AV_PIX_FMT_GBRP10LE,  ///< planar GBR 4:4:4 30bpp, little-endian
+    AV_PIX_FMT_GBRP16BE,  ///< planar GBR 4:4:4 48bpp, big-endian
+    AV_PIX_FMT_GBRP16LE,  ///< planar GBR 4:4:4 48bpp, little-endian
+    AV_PIX_FMT_YUVA422P,  ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
+    AV_PIX_FMT_YUVA444P,  ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples)
+    AV_PIX_FMT_YUVA420P9BE,  ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per 2x2 Y & A samples), big-endian
+    AV_PIX_FMT_YUVA420P9LE,  ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per 2x2 Y & A samples), little-endian
+    AV_PIX_FMT_YUVA422P9BE,  ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per 2x1 Y & A samples), big-endian
+    AV_PIX_FMT_YUVA422P9LE,  ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per 2x1 Y & A samples), little-endian
+    AV_PIX_FMT_YUVA444P9BE,  ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per 1x1 Y & A samples), big-endian
+    AV_PIX_FMT_YUVA444P9LE,  ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per 1x1 Y & A samples), little-endian
+    AV_PIX_FMT_YUVA420P10BE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per 2x2 Y & A samples, big-endian)
+    AV_PIX_FMT_YUVA420P10LE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per 2x2 Y & A samples, little-endian)
+    AV_PIX_FMT_YUVA422P10BE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per 2x1 Y & A samples, big-endian)
+    AV_PIX_FMT_YUVA422P10LE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per 2x1 Y & A samples, little-endian)
+    AV_PIX_FMT_YUVA444P10BE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per 1x1 Y & A samples, big-endian)
+    AV_PIX_FMT_YUVA444P10LE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per 1x1 Y & A samples, little-endian)
+    AV_PIX_FMT_YUVA420P16BE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per 2x2 Y & A samples, big-endian)
+    AV_PIX_FMT_YUVA420P16LE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per 2x2 Y & A samples, little-endian)
+    AV_PIX_FMT_YUVA422P16BE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per 2x1 Y & A samples, big-endian)
+    AV_PIX_FMT_YUVA422P16LE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per 2x1 Y & A samples, little-endian)
+    AV_PIX_FMT_YUVA444P16BE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, big-endian)
+    AV_PIX_FMT_YUVA444P16LE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, little-endian)
+    AV_PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
+
+#if FF_API_PIX_FMT
+#include "old_pix_fmts.h"
+#endif
+};
+
+#if AV_HAVE_BIGENDIAN
+#   define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##be
+#else
+#   define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##le
+#endif
+
+#define AV_PIX_FMT_RGB32   AV_PIX_FMT_NE(ARGB, BGRA)
+#define AV_PIX_FMT_RGB32_1 AV_PIX_FMT_NE(RGBA, ABGR)
+#define AV_PIX_FMT_BGR32   AV_PIX_FMT_NE(ABGR, RGBA)
+#define AV_PIX_FMT_BGR32_1 AV_PIX_FMT_NE(BGRA, ARGB)
+
+#define AV_PIX_FMT_GRAY16 AV_PIX_FMT_NE(GRAY16BE, GRAY16LE)
+#define AV_PIX_FMT_RGB48  AV_PIX_FMT_NE(RGB48BE,  RGB48LE)
+#define AV_PIX_FMT_RGB565 AV_PIX_FMT_NE(RGB565BE, RGB565LE)
+#define AV_PIX_FMT_RGB555 AV_PIX_FMT_NE(RGB555BE, RGB555LE)
+#define AV_PIX_FMT_RGB444 AV_PIX_FMT_NE(RGB444BE, RGB444LE)
+#define AV_PIX_FMT_BGR48  AV_PIX_FMT_NE(BGR48BE,  BGR48LE)
+#define AV_PIX_FMT_BGR565 AV_PIX_FMT_NE(BGR565BE, BGR565LE)
+#define AV_PIX_FMT_BGR555 AV_PIX_FMT_NE(BGR555BE, BGR555LE)
+#define AV_PIX_FMT_BGR444 AV_PIX_FMT_NE(BGR444BE, BGR444LE)
+
+#define AV_PIX_FMT_YUV420P9  AV_PIX_FMT_NE(YUV420P9BE , YUV420P9LE)
+#define AV_PIX_FMT_YUV422P9  AV_PIX_FMT_NE(YUV422P9BE , YUV422P9LE)
+#define AV_PIX_FMT_YUV444P9  AV_PIX_FMT_NE(YUV444P9BE , YUV444P9LE)
+#define AV_PIX_FMT_YUV420P10 AV_PIX_FMT_NE(YUV420P10BE, YUV420P10LE)
+#define AV_PIX_FMT_YUV422P10 AV_PIX_FMT_NE(YUV422P10BE, YUV422P10LE)
+#define AV_PIX_FMT_YUV444P10 AV_PIX_FMT_NE(YUV444P10BE, YUV444P10LE)
+#define AV_PIX_FMT_YUV420P16 AV_PIX_FMT_NE(YUV420P16BE, YUV420P16LE)
+#define AV_PIX_FMT_YUV422P16 AV_PIX_FMT_NE(YUV422P16BE, YUV422P16LE)
+#define AV_PIX_FMT_YUV444P16 AV_PIX_FMT_NE(YUV444P16BE, YUV444P16LE)
+
+#define AV_PIX_FMT_GBRP9     AV_PIX_FMT_NE(GBRP9BE ,    GBRP9LE)
+#define AV_PIX_FMT_GBRP10    AV_PIX_FMT_NE(GBRP10BE,    GBRP10LE)
+#define AV_PIX_FMT_GBRP16    AV_PIX_FMT_NE(GBRP16BE,    GBRP16LE)
+
+#define AV_PIX_FMT_YUVA420P9  AV_PIX_FMT_NE(YUVA420P9BE , YUVA420P9LE)
+#define AV_PIX_FMT_YUVA422P9  AV_PIX_FMT_NE(YUVA422P9BE , YUVA422P9LE)
+#define AV_PIX_FMT_YUVA444P9  AV_PIX_FMT_NE(YUVA444P9BE , YUVA444P9LE)
+#define AV_PIX_FMT_YUVA420P10 AV_PIX_FMT_NE(YUVA420P10BE, YUVA420P10LE)
+#define AV_PIX_FMT_YUVA422P10 AV_PIX_FMT_NE(YUVA422P10BE, YUVA422P10LE)
+#define AV_PIX_FMT_YUVA444P10 AV_PIX_FMT_NE(YUVA444P10BE, YUVA444P10LE)
+#define AV_PIX_FMT_YUVA420P16 AV_PIX_FMT_NE(YUVA420P16BE, YUVA420P16LE)
+#define AV_PIX_FMT_YUVA422P16 AV_PIX_FMT_NE(YUVA422P16BE, YUVA422P16LE)
+#define AV_PIX_FMT_YUVA444P16 AV_PIX_FMT_NE(YUVA444P16BE, YUVA444P16LE)
+
+#if FF_API_PIX_FMT
+#define PixelFormat AVPixelFormat
+
+#define PIX_FMT_NE(be, le) AV_PIX_FMT_NE(be, le)
+
+#define PIX_FMT_RGB32   AV_PIX_FMT_RGB32
+#define PIX_FMT_RGB32_1 AV_PIX_FMT_RGB32_1
+#define PIX_FMT_BGR32   AV_PIX_FMT_BGR32
+#define PIX_FMT_BGR32_1 AV_PIX_FMT_BGR32_1
+
+#define PIX_FMT_GRAY16 AV_PIX_FMT_GRAY16
+#define PIX_FMT_RGB48  AV_PIX_FMT_RGB48
+#define PIX_FMT_RGB565 AV_PIX_FMT_RGB565
+#define PIX_FMT_RGB555 AV_PIX_FMT_RGB555
+#define PIX_FMT_RGB444 AV_PIX_FMT_RGB444
+#define PIX_FMT_BGR48  AV_PIX_FMT_BGR48
+#define PIX_FMT_BGR565 AV_PIX_FMT_BGR565
+#define PIX_FMT_BGR555 AV_PIX_FMT_BGR555
+#define PIX_FMT_BGR444 AV_PIX_FMT_BGR444
+
+#define PIX_FMT_YUV420P9  AV_PIX_FMT_YUV420P9
+#define PIX_FMT_YUV422P9  AV_PIX_FMT_YUV422P9
+#define PIX_FMT_YUV444P9  AV_PIX_FMT_YUV444P9
+#define PIX_FMT_YUV420P10 AV_PIX_FMT_YUV420P10
+#define PIX_FMT_YUV422P10 AV_PIX_FMT_YUV422P10
+#define PIX_FMT_YUV444P10 AV_PIX_FMT_YUV444P10
+#define PIX_FMT_YUV420P16 AV_PIX_FMT_YUV420P16
+#define PIX_FMT_YUV422P16 AV_PIX_FMT_YUV422P16
+#define PIX_FMT_YUV444P16 AV_PIX_FMT_YUV444P16
+
+#define PIX_FMT_GBRP9  AV_PIX_FMT_GBRP9
+#define PIX_FMT_GBRP10 AV_PIX_FMT_GBRP10
+#define PIX_FMT_GBRP16 AV_PIX_FMT_GBRP16
+#endif
+
+#endif /* AVUTIL_PIXFMT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/random_seed.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/random_seed.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/random_seed.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/random_seed.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2009 Baptiste Coudurier <baptiste.coudurier@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_RANDOM_SEED_H
+#define AVUTIL_RANDOM_SEED_H
+
+#include <stdint.h>
+/**
+ * @addtogroup lavu_crypto
+ * @{
+ */
+
+/**
+ * Get random data.
+ *
+ * This function can be called repeatedly to generate more random bits
+ * as needed. It is generally quite slow, and usually used to seed a
+ * PRNG.  As it uses /dev/urandom and /dev/random, the quality of the
+ * returned random data depends on the platform.
+ */
+uint32_t av_get_random_seed(void);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_RANDOM_SEED_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/rational.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/rational.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/rational.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/rational.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,155 @@
+/*
+ * rational numbers
+ * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * rational numbers
+ * @author Michael Niedermayer <michaelni@gmx.at>
+ */
+
+#ifndef AVUTIL_RATIONAL_H
+#define AVUTIL_RATIONAL_H
+
+#include <stdint.h>
+#include <limits.h>
+#include "attributes.h"
+
+/**
+ * @addtogroup lavu_math
+ * @{
+ */
+
+/**
+ * rational number numerator/denominator
+ */
+typedef struct AVRational{
+    int num; ///< numerator
+    int den; ///< denominator
+} AVRational;
+
+/**
+ * Compare two rationals.
+ * @param a first rational
+ * @param b second rational
+ * @return 0 if a==b, 1 if a>b, -1 if a<b, and INT_MIN if one of the
+ * values is of the form 0/0
+ */
+static inline int av_cmp_q(AVRational a, AVRational b){
+    const int64_t tmp= a.num * (int64_t)b.den - b.num * (int64_t)a.den;
+
+    if(tmp) return ((tmp ^ a.den ^ b.den)>>63)|1;
+    else if(b.den && a.den) return 0;
+    else if(a.num && b.num) return (a.num>>31) - (b.num>>31);
+    else                    return INT_MIN;
+}
+
+/**
+ * Convert rational to double.
+ * @param a rational to convert
+ * @return (double) a
+ */
+static inline double av_q2d(AVRational a){
+    return a.num / (double) a.den;
+}
+
+/**
+ * Reduce a fraction.
+ * This is useful for framerate calculations.
+ * @param dst_num destination numerator
+ * @param dst_den destination denominator
+ * @param num source numerator
+ * @param den source denominator
+ * @param max the maximum allowed for dst_num & dst_den
+ * @return 1 if exact, 0 otherwise
+ */
+int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max);
+
+/**
+ * Multiply two rationals.
+ * @param b first rational
+ * @param c second rational
+ * @return b*c
+ */
+AVRational av_mul_q(AVRational b, AVRational c) av_const;
+
+/**
+ * Divide one rational by another.
+ * @param b first rational
+ * @param c second rational
+ * @return b/c
+ */
+AVRational av_div_q(AVRational b, AVRational c) av_const;
+
+/**
+ * Add two rationals.
+ * @param b first rational
+ * @param c second rational
+ * @return b+c
+ */
+AVRational av_add_q(AVRational b, AVRational c) av_const;
+
+/**
+ * Subtract one rational from another.
+ * @param b first rational
+ * @param c second rational
+ * @return b-c
+ */
+AVRational av_sub_q(AVRational b, AVRational c) av_const;
+
+/**
+ * Invert a rational.
+ * @param q value
+ * @return 1 / q
+ */
+static av_always_inline AVRational av_inv_q(AVRational q)
+{
+    AVRational r = { q.den, q.num };
+    return r;
+}
+
+/**
+ * Convert a double precision floating point number to a rational.
+ * inf is expressed as {1,0} or {-1,0} depending on the sign.
+ *
+ * @param d double to convert
+ * @param max the maximum allowed numerator and denominator
+ * @return (AVRational) d
+ */
+AVRational av_d2q(double d, int max) av_const;
+
+/**
+ * @return 1 if q1 is nearer to q than q2, -1 if q2 is nearer
+ * than q1, 0 if they have the same distance.
+ */
+int av_nearer_q(AVRational q, AVRational q1, AVRational q2);
+
+/**
+ * Find the nearest value in q_list to q.
+ * @param q_list an array of rationals terminated by {0, 0}
+ * @return the index of the nearest value found in the array
+ */
+int av_find_nearest_q_idx(AVRational q, const AVRational* q_list);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_RATIONAL_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/samplefmt.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/samplefmt.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/samplefmt.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/samplefmt.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,220 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_SAMPLEFMT_H
+#define AVUTIL_SAMPLEFMT_H
+
+#include <stdint.h>
+
+#include "avutil.h"
+#include "attributes.h"
+
+/**
+ * Audio Sample Formats
+ *
+ * @par
+ * The data described by the sample format is always in native-endian order.
+ * Sample values can be expressed by native C types, hence the lack of a signed
+ * 24-bit sample format even though it is a common raw audio data format.
+ *
+ * @par
+ * The floating-point formats are based on full volume being in the range
+ * [-1.0, 1.0]. Any values outside this range are beyond full volume level.
+ *
+ * @par
+ * The data layout as used in av_samples_fill_arrays() and elsewhere in Libav
+ * (such as AVFrame in libavcodec) is as follows:
+ *
+ * For planar sample formats, each audio channel is in a separate data plane,
+ * and linesize is the buffer size, in bytes, for a single plane. All data
+ * planes must be the same size. For packed sample formats, only the first data
+ * plane is used, and samples for each channel are interleaved. In this case,
+ * linesize is the buffer size, in bytes, for the 1 plane.
+ */
+enum AVSampleFormat {
+    AV_SAMPLE_FMT_NONE = -1,
+    AV_SAMPLE_FMT_U8,          ///< unsigned 8 bits
+    AV_SAMPLE_FMT_S16,         ///< signed 16 bits
+    AV_SAMPLE_FMT_S32,         ///< signed 32 bits
+    AV_SAMPLE_FMT_FLT,         ///< float
+    AV_SAMPLE_FMT_DBL,         ///< double
+
+    AV_SAMPLE_FMT_U8P,         ///< unsigned 8 bits, planar
+    AV_SAMPLE_FMT_S16P,        ///< signed 16 bits, planar
+    AV_SAMPLE_FMT_S32P,        ///< signed 32 bits, planar
+    AV_SAMPLE_FMT_FLTP,        ///< float, planar
+    AV_SAMPLE_FMT_DBLP,        ///< double, planar
+
+    AV_SAMPLE_FMT_NB           ///< Number of sample formats. DO NOT USE if linking dynamically
+};
+
+/**
+ * Return the name of sample_fmt, or NULL if sample_fmt is not
+ * recognized.
+ */
+const char *av_get_sample_fmt_name(enum AVSampleFormat sample_fmt);
+
+/**
+ * Return a sample format corresponding to name, or AV_SAMPLE_FMT_NONE
+ * on error.
+ */
+enum AVSampleFormat av_get_sample_fmt(const char *name);
+
+/**
+ * Get the packed alternative form of the given sample format.
+ *
+ * If the passed sample_fmt is already in packed format, the format returned is
+ * the same as the input.
+ *
+ * @return  the packed alternative form of the given sample format or
+            AV_SAMPLE_FMT_NONE on error.
+ */
+enum AVSampleFormat av_get_packed_sample_fmt(enum AVSampleFormat sample_fmt);
+
+/**
+ * Get the planar alternative form of the given sample format.
+ *
+ * If the passed sample_fmt is already in planar format, the format returned is
+ * the same as the input.
+ *
+ * @return  the planar alternative form of the given sample format or
+            AV_SAMPLE_FMT_NONE on error.
+ */
+enum AVSampleFormat av_get_planar_sample_fmt(enum AVSampleFormat sample_fmt);
+
+/**
+ * Generate a string corresponding to the sample format with
+ * sample_fmt, or a header if sample_fmt is negative.
+ *
+ * @param buf the buffer where to write the string
+ * @param buf_size the size of buf
+ * @param sample_fmt the number of the sample format to print the
+ * corresponding info string, or a negative value to print the
+ * corresponding header.
+ * @return the pointer to the filled buffer or NULL if sample_fmt is
+ * unknown or in case of other errors
+ */
+char *av_get_sample_fmt_string(char *buf, int buf_size, enum AVSampleFormat sample_fmt);
+
+/**
+ * Return number of bytes per sample.
+ *
+ * @param sample_fmt the sample format
+ * @return number of bytes per sample or zero if unknown for the given
+ * sample format
+ */
+int av_get_bytes_per_sample(enum AVSampleFormat sample_fmt);
+
+/**
+ * Check if the sample format is planar.
+ *
+ * @param sample_fmt the sample format to inspect
+ * @return 1 if the sample format is planar, 0 if it is interleaved
+ */
+int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt);
+
+/**
+ * Get the required buffer size for the given audio parameters.
+ *
+ * @param[out] linesize calculated linesize, may be NULL
+ * @param nb_channels   the number of channels
+ * @param nb_samples    the number of samples in a single channel
+ * @param sample_fmt    the sample format
+ * @param align         buffer size alignment (0 = default, 1 = no alignment)
+ * @return              required buffer size, or negative error code on failure
+ */
+int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples,
+                               enum AVSampleFormat sample_fmt, int align);
+
+/**
+ * Fill channel data pointers and linesize for samples with sample
+ * format sample_fmt.
+ *
+ * The pointers array is filled with the pointers to the samples data:
+ * for planar, set the start point of each channel's data within the buffer,
+ * for packed, set the start point of the entire buffer only.
+ *
+ * The linesize array is filled with the aligned size of each channel's data
+ * buffer for planar layout, or the aligned size of the buffer for all channels
+ * for packed layout.
+ *
+ * @see enum AVSampleFormat
+ * The documentation for AVSampleFormat describes the data layout.
+ *
+ * @param[out] audio_data  array to be filled with the pointer for each channel
+ * @param[out] linesize    calculated linesize, may be NULL
+ * @param buf              the pointer to a buffer containing the samples
+ * @param nb_channels      the number of channels
+ * @param nb_samples       the number of samples in a single channel
+ * @param sample_fmt       the sample format
+ * @param align            buffer size alignment (0 = default, 1 = no alignment)
+ * @return                 0 on success or a negative error code on failure
+ */
+int av_samples_fill_arrays(uint8_t **audio_data, int *linesize,
+                           const uint8_t *buf,
+                           int nb_channels, int nb_samples,
+                           enum AVSampleFormat sample_fmt, int align);
+
+/**
+ * Allocate a samples buffer for nb_samples samples, and fill data pointers and
+ * linesize accordingly.
+ * The allocated samples buffer can be freed by using av_freep(&audio_data[0])
+ * Allocated data will be initialized to silence.
+ *
+ * @see enum AVSampleFormat
+ * The documentation for AVSampleFormat describes the data layout.
+ *
+ * @param[out] audio_data  array to be filled with the pointer for each channel
+ * @param[out] linesize    aligned size for audio buffer(s), may be NULL
+ * @param nb_channels      number of audio channels
+ * @param nb_samples       number of samples per channel
+ * @param align            buffer size alignment (0 = default, 1 = no alignment)
+ * @return                 0 on success or a negative error code on failure
+ * @see av_samples_fill_arrays()
+ */
+int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels,
+                     int nb_samples, enum AVSampleFormat sample_fmt, int align);
+
+/**
+ * Copy samples from src to dst.
+ *
+ * @param dst destination array of pointers to data planes
+ * @param src source array of pointers to data planes
+ * @param dst_offset offset in samples at which the data will be written to dst
+ * @param src_offset offset in samples at which the data will be read from src
+ * @param nb_samples number of samples to be copied
+ * @param nb_channels number of audio channels
+ * @param sample_fmt audio sample format
+ */
+int av_samples_copy(uint8_t **dst, uint8_t * const *src, int dst_offset,
+                    int src_offset, int nb_samples, int nb_channels,
+                    enum AVSampleFormat sample_fmt);
+
+/**
+ * Fill an audio buffer with silence.
+ *
+ * @param audio_data  array of pointers to data planes
+ * @param offset      offset in samples at which to start filling
+ * @param nb_samples  number of samples to fill
+ * @param nb_channels number of audio channels
+ * @param sample_fmt  audio sample format
+ */
+int av_samples_set_silence(uint8_t **audio_data, int offset, int nb_samples,
+                           int nb_channels, enum AVSampleFormat sample_fmt);
+
+#endif /* AVUTIL_SAMPLEFMT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/sha.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/sha.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/sha.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/sha.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_SHA_H
+#define AVUTIL_SHA_H
+
+#include <stdint.h>
+
+#include "attributes.h"
+#include "version.h"
+
+/**
+ * @defgroup lavu_sha SHA
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+#if FF_API_CONTEXT_SIZE
+extern attribute_deprecated const int av_sha_size;
+#endif
+
+struct AVSHA;
+
+/**
+ * Allocate an AVSHA context.
+ */
+struct AVSHA *av_sha_alloc(void);
+
+/**
+ * Initialize SHA-1 or SHA-2 hashing.
+ *
+ * @param context pointer to the function context (of size av_sha_size)
+ * @param bits    number of bits in digest (SHA-1 - 160 bits, SHA-2 224 or 256 bits)
+ * @return        zero if initialization succeeded, -1 otherwise
+ */
+int av_sha_init(struct AVSHA* context, int bits);
+
+/**
+ * Update hash value.
+ *
+ * @param context hash function context
+ * @param data    input data to update hash with
+ * @param len     input data length
+ */
+void av_sha_update(struct AVSHA* context, const uint8_t* data, unsigned int len);
+
+/**
+ * Finish hashing and output digest value.
+ *
+ * @param context hash function context
+ * @param digest  buffer where output digest value is stored
+ */
+void av_sha_final(struct AVSHA* context, uint8_t *digest);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_SHA_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/time.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/time.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/time.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/time.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_TIME_H
+#define AVUTIL_TIME_H
+
+#include <stdint.h>
+
+/**
+ * Get the current time in microseconds.
+ */
+int64_t av_gettime(void);
+
+/**
+ * Sleep for a period of time.  Although the duration is expressed in
+ * microseconds, the actual delay may be rounded to the precision of the
+ * system timer.
+ *
+ * @param  usec Number of microseconds to sleep.
+ * @return zero on success or (negative) error code.
+ */
+int av_usleep(unsigned usec);
+
+#endif /* AVUTIL_TIME_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/version.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/version.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/version.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/version.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,87 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_VERSION_H
+#define AVUTIL_VERSION_H
+
+#include "avutil.h"
+
+/**
+ * @file
+ * @ingroup lavu
+ * Libavutil version macros
+ */
+
+/**
+ * @defgroup lavu_ver Version and Build diagnostics
+ *
+ * Macros and function useful to check at compiletime and at runtime
+ * which version of libavutil is in use.
+ *
+ * @{
+ */
+
+#define LIBAVUTIL_VERSION_MAJOR 52
+#define LIBAVUTIL_VERSION_MINOR  3
+#define LIBAVUTIL_VERSION_MICRO  0
+
+#define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
+                                               LIBAVUTIL_VERSION_MINOR, \
+                                               LIBAVUTIL_VERSION_MICRO)
+#define LIBAVUTIL_VERSION       AV_VERSION(LIBAVUTIL_VERSION_MAJOR,     \
+                                           LIBAVUTIL_VERSION_MINOR,     \
+                                           LIBAVUTIL_VERSION_MICRO)
+#define LIBAVUTIL_BUILD         LIBAVUTIL_VERSION_INT
+
+#define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
+
+/**
+ * @}
+ *
+ * @defgroup depr_guards Deprecation guards
+ * FF_API_* defines may be placed below to indicate public API that will be
+ * dropped at a future version bump. The defines themselves are not part of
+ * the public API and may change, break or disappear at any time.
+ *
+ * @{
+ */
+
+#ifndef FF_API_PIX_FMT
+#define FF_API_PIX_FMT                  (LIBAVUTIL_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_CONTEXT_SIZE
+#define FF_API_CONTEXT_SIZE             (LIBAVUTIL_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_PIX_FMT_DESC
+#define FF_API_PIX_FMT_DESC             (LIBAVUTIL_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_AV_REVERSE
+#define FF_API_AV_REVERSE               (LIBAVUTIL_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_AUDIOCONVERT
+#define FF_API_AUDIOCONVERT             (LIBAVUTIL_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_CPU_FLAG_MMX2
+#define FF_API_CPU_FLAG_MMX2            (LIBAVUTIL_VERSION_MAJOR < 53)
+#endif
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_VERSION_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/xtea.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/xtea.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/include/libavutil/xtea.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/include/libavutil/xtea.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,61 @@
+/*
+ * A 32-bit implementation of the XTEA algorithm
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_XTEA_H
+#define AVUTIL_XTEA_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_xtea XTEA
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+typedef struct AVXTEA {
+    uint32_t key[16];
+} AVXTEA;
+
+/**
+ * Initialize an AVXTEA context.
+ *
+ * @param ctx an AVXTEA context
+ * @param key a key of 16 bytes used for encryption/decryption
+ */
+void av_xtea_init(struct AVXTEA *ctx, const uint8_t key[16]);
+
+/**
+ * Encrypt or decrypt a buffer using a previously initialized context.
+ *
+ * @param ctx an AVXTEA context
+ * @param dst destination array, can be equal to src
+ * @param src source array, can be equal to dst
+ * @param count number of 8 byte blocks
+ * @param iv initialization vector for CBC mode, if NULL then ECB will be used
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+void av_xtea_crypt(struct AVXTEA *ctx, uint8_t *dst, const uint8_t *src,
+                   int count, uint8_t *iv, int decrypt);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_XTEA_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav54/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav54/moz.build	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,25 @@
+# -*- 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 += [
+    '../FFmpegAudioDecoder.cpp',
+    '../FFmpegDataDecoder.cpp',
+    '../FFmpegDecoderModule.cpp',
+    '../FFmpegH264Decoder.cpp',
+]
+LOCAL_INCLUDES += [
+    '..',
+    'include',
+]
+
+FINAL_LIBRARY = 'xul'
+
+FAIL_ON_WARNINGS = True
+
+if CONFIG['CLANG_CXX']:
+  CXXFLAGS += [
+    '-Wno-unknown-attributes',
+  ]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/COPYING.LGPLv2.1 firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/COPYING.LGPLv2.1
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/COPYING.LGPLv2.1	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/COPYING.LGPLv2.1	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,504 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavcodec/avcodec.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavcodec/avcodec.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavcodec/avcodec.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavcodec/avcodec.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,4356 @@
+/*
+ * copyright (c) 2001 Fabrice Bellard
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_AVCODEC_H
+#define AVCODEC_AVCODEC_H
+
+/**
+ * @file
+ * @ingroup libavc
+ * Libavcodec external API header
+ */
+
+#include <errno.h>
+#include "libavutil/samplefmt.h"
+#include "libavutil/attributes.h"
+#include "libavutil/avutil.h"
+#include "libavutil/buffer.h"
+#include "libavutil/cpu.h"
+#include "libavutil/dict.h"
+#include "libavutil/frame.h"
+#include "libavutil/log.h"
+#include "libavutil/pixfmt.h"
+#include "libavutil/rational.h"
+
+#include "version.h"
+
+#if FF_API_FAST_MALLOC
+// to provide fast_*alloc
+#include "libavutil/mem.h"
+#endif
+
+/**
+ * @defgroup libavc Encoding/Decoding Library
+ * @{
+ *
+ * @defgroup lavc_decoding Decoding
+ * @{
+ * @}
+ *
+ * @defgroup lavc_encoding Encoding
+ * @{
+ * @}
+ *
+ * @defgroup lavc_codec Codecs
+ * @{
+ * @defgroup lavc_codec_native Native Codecs
+ * @{
+ * @}
+ * @defgroup lavc_codec_wrappers External library wrappers
+ * @{
+ * @}
+ * @defgroup lavc_codec_hwaccel Hardware Accelerators bridge
+ * @{
+ * @}
+ * @}
+ * @defgroup lavc_internal Internal
+ * @{
+ * @}
+ * @}
+ *
+ */
+
+/**
+ * @defgroup lavc_core Core functions/structures.
+ * @ingroup libavc
+ *
+ * Basic definitions, functions for querying libavcodec capabilities,
+ * allocating core structures, etc.
+ * @{
+ */
+
+
+/**
+ * Identify the syntax and semantics of the bitstream.
+ * The principle is roughly:
+ * Two decoders with the same ID can decode the same streams.
+ * Two encoders with the same ID can encode compatible streams.
+ * There may be slight deviations from the principle due to implementation
+ * details.
+ *
+ * If you add a codec ID to this list, add it so that
+ * 1. no value of a existing codec ID changes (that would break ABI),
+ * 2. it is as close as possible to similar codecs.
+ *
+ * After adding new codec IDs, do not forget to add an entry to the codec
+ * descriptor list and bump libavcodec minor version.
+ */
+enum AVCodecID {
+    AV_CODEC_ID_NONE,
+
+    /* video codecs */
+    AV_CODEC_ID_MPEG1VIDEO,
+    AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
+#if FF_API_XVMC
+    AV_CODEC_ID_MPEG2VIDEO_XVMC,
+#endif /* FF_API_XVMC */
+    AV_CODEC_ID_H261,
+    AV_CODEC_ID_H263,
+    AV_CODEC_ID_RV10,
+    AV_CODEC_ID_RV20,
+    AV_CODEC_ID_MJPEG,
+    AV_CODEC_ID_MJPEGB,
+    AV_CODEC_ID_LJPEG,
+    AV_CODEC_ID_SP5X,
+    AV_CODEC_ID_JPEGLS,
+    AV_CODEC_ID_MPEG4,
+    AV_CODEC_ID_RAWVIDEO,
+    AV_CODEC_ID_MSMPEG4V1,
+    AV_CODEC_ID_MSMPEG4V2,
+    AV_CODEC_ID_MSMPEG4V3,
+    AV_CODEC_ID_WMV1,
+    AV_CODEC_ID_WMV2,
+    AV_CODEC_ID_H263P,
+    AV_CODEC_ID_H263I,
+    AV_CODEC_ID_FLV1,
+    AV_CODEC_ID_SVQ1,
+    AV_CODEC_ID_SVQ3,
+    AV_CODEC_ID_DVVIDEO,
+    AV_CODEC_ID_HUFFYUV,
+    AV_CODEC_ID_CYUV,
+    AV_CODEC_ID_H264,
+    AV_CODEC_ID_INDEO3,
+    AV_CODEC_ID_VP3,
+    AV_CODEC_ID_THEORA,
+    AV_CODEC_ID_ASV1,
+    AV_CODEC_ID_ASV2,
+    AV_CODEC_ID_FFV1,
+    AV_CODEC_ID_4XM,
+    AV_CODEC_ID_VCR1,
+    AV_CODEC_ID_CLJR,
+    AV_CODEC_ID_MDEC,
+    AV_CODEC_ID_ROQ,
+    AV_CODEC_ID_INTERPLAY_VIDEO,
+    AV_CODEC_ID_XAN_WC3,
+    AV_CODEC_ID_XAN_WC4,
+    AV_CODEC_ID_RPZA,
+    AV_CODEC_ID_CINEPAK,
+    AV_CODEC_ID_WS_VQA,
+    AV_CODEC_ID_MSRLE,
+    AV_CODEC_ID_MSVIDEO1,
+    AV_CODEC_ID_IDCIN,
+    AV_CODEC_ID_8BPS,
+    AV_CODEC_ID_SMC,
+    AV_CODEC_ID_FLIC,
+    AV_CODEC_ID_TRUEMOTION1,
+    AV_CODEC_ID_VMDVIDEO,
+    AV_CODEC_ID_MSZH,
+    AV_CODEC_ID_ZLIB,
+    AV_CODEC_ID_QTRLE,
+    AV_CODEC_ID_TSCC,
+    AV_CODEC_ID_ULTI,
+    AV_CODEC_ID_QDRAW,
+    AV_CODEC_ID_VIXL,
+    AV_CODEC_ID_QPEG,
+    AV_CODEC_ID_PNG,
+    AV_CODEC_ID_PPM,
+    AV_CODEC_ID_PBM,
+    AV_CODEC_ID_PGM,
+    AV_CODEC_ID_PGMYUV,
+    AV_CODEC_ID_PAM,
+    AV_CODEC_ID_FFVHUFF,
+    AV_CODEC_ID_RV30,
+    AV_CODEC_ID_RV40,
+    AV_CODEC_ID_VC1,
+    AV_CODEC_ID_WMV3,
+    AV_CODEC_ID_LOCO,
+    AV_CODEC_ID_WNV1,
+    AV_CODEC_ID_AASC,
+    AV_CODEC_ID_INDEO2,
+    AV_CODEC_ID_FRAPS,
+    AV_CODEC_ID_TRUEMOTION2,
+    AV_CODEC_ID_BMP,
+    AV_CODEC_ID_CSCD,
+    AV_CODEC_ID_MMVIDEO,
+    AV_CODEC_ID_ZMBV,
+    AV_CODEC_ID_AVS,
+    AV_CODEC_ID_SMACKVIDEO,
+    AV_CODEC_ID_NUV,
+    AV_CODEC_ID_KMVC,
+    AV_CODEC_ID_FLASHSV,
+    AV_CODEC_ID_CAVS,
+    AV_CODEC_ID_JPEG2000,
+    AV_CODEC_ID_VMNC,
+    AV_CODEC_ID_VP5,
+    AV_CODEC_ID_VP6,
+    AV_CODEC_ID_VP6F,
+    AV_CODEC_ID_TARGA,
+    AV_CODEC_ID_DSICINVIDEO,
+    AV_CODEC_ID_TIERTEXSEQVIDEO,
+    AV_CODEC_ID_TIFF,
+    AV_CODEC_ID_GIF,
+    AV_CODEC_ID_DXA,
+    AV_CODEC_ID_DNXHD,
+    AV_CODEC_ID_THP,
+    AV_CODEC_ID_SGI,
+    AV_CODEC_ID_C93,
+    AV_CODEC_ID_BETHSOFTVID,
+    AV_CODEC_ID_PTX,
+    AV_CODEC_ID_TXD,
+    AV_CODEC_ID_VP6A,
+    AV_CODEC_ID_AMV,
+    AV_CODEC_ID_VB,
+    AV_CODEC_ID_PCX,
+    AV_CODEC_ID_SUNRAST,
+    AV_CODEC_ID_INDEO4,
+    AV_CODEC_ID_INDEO5,
+    AV_CODEC_ID_MIMIC,
+    AV_CODEC_ID_RL2,
+    AV_CODEC_ID_ESCAPE124,
+    AV_CODEC_ID_DIRAC,
+    AV_CODEC_ID_BFI,
+    AV_CODEC_ID_CMV,
+    AV_CODEC_ID_MOTIONPIXELS,
+    AV_CODEC_ID_TGV,
+    AV_CODEC_ID_TGQ,
+    AV_CODEC_ID_TQI,
+    AV_CODEC_ID_AURA,
+    AV_CODEC_ID_AURA2,
+    AV_CODEC_ID_V210X,
+    AV_CODEC_ID_TMV,
+    AV_CODEC_ID_V210,
+    AV_CODEC_ID_DPX,
+    AV_CODEC_ID_MAD,
+    AV_CODEC_ID_FRWU,
+    AV_CODEC_ID_FLASHSV2,
+    AV_CODEC_ID_CDGRAPHICS,
+    AV_CODEC_ID_R210,
+    AV_CODEC_ID_ANM,
+    AV_CODEC_ID_BINKVIDEO,
+    AV_CODEC_ID_IFF_ILBM,
+    AV_CODEC_ID_IFF_BYTERUN1,
+    AV_CODEC_ID_KGV1,
+    AV_CODEC_ID_YOP,
+    AV_CODEC_ID_VP8,
+    AV_CODEC_ID_PICTOR,
+    AV_CODEC_ID_ANSI,
+    AV_CODEC_ID_A64_MULTI,
+    AV_CODEC_ID_A64_MULTI5,
+    AV_CODEC_ID_R10K,
+    AV_CODEC_ID_MXPEG,
+    AV_CODEC_ID_LAGARITH,
+    AV_CODEC_ID_PRORES,
+    AV_CODEC_ID_JV,
+    AV_CODEC_ID_DFA,
+    AV_CODEC_ID_WMV3IMAGE,
+    AV_CODEC_ID_VC1IMAGE,
+    AV_CODEC_ID_UTVIDEO,
+    AV_CODEC_ID_BMV_VIDEO,
+    AV_CODEC_ID_VBLE,
+    AV_CODEC_ID_DXTORY,
+    AV_CODEC_ID_V410,
+    AV_CODEC_ID_XWD,
+    AV_CODEC_ID_CDXL,
+    AV_CODEC_ID_XBM,
+    AV_CODEC_ID_ZEROCODEC,
+    AV_CODEC_ID_MSS1,
+    AV_CODEC_ID_MSA1,
+    AV_CODEC_ID_TSCC2,
+    AV_CODEC_ID_MTS2,
+    AV_CODEC_ID_CLLC,
+    AV_CODEC_ID_MSS2,
+    AV_CODEC_ID_VP9,
+    AV_CODEC_ID_AIC,
+    AV_CODEC_ID_ESCAPE130,
+    AV_CODEC_ID_G2M,
+    AV_CODEC_ID_WEBP,
+    AV_CODEC_ID_HNM4_VIDEO,
+    AV_CODEC_ID_HEVC,
+    AV_CODEC_ID_FIC,
+
+    /* various PCM "codecs" */
+    AV_CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs
+    AV_CODEC_ID_PCM_S16LE = 0x10000,
+    AV_CODEC_ID_PCM_S16BE,
+    AV_CODEC_ID_PCM_U16LE,
+    AV_CODEC_ID_PCM_U16BE,
+    AV_CODEC_ID_PCM_S8,
+    AV_CODEC_ID_PCM_U8,
+    AV_CODEC_ID_PCM_MULAW,
+    AV_CODEC_ID_PCM_ALAW,
+    AV_CODEC_ID_PCM_S32LE,
+    AV_CODEC_ID_PCM_S32BE,
+    AV_CODEC_ID_PCM_U32LE,
+    AV_CODEC_ID_PCM_U32BE,
+    AV_CODEC_ID_PCM_S24LE,
+    AV_CODEC_ID_PCM_S24BE,
+    AV_CODEC_ID_PCM_U24LE,
+    AV_CODEC_ID_PCM_U24BE,
+    AV_CODEC_ID_PCM_S24DAUD,
+    AV_CODEC_ID_PCM_ZORK,
+    AV_CODEC_ID_PCM_S16LE_PLANAR,
+    AV_CODEC_ID_PCM_DVD,
+    AV_CODEC_ID_PCM_F32BE,
+    AV_CODEC_ID_PCM_F32LE,
+    AV_CODEC_ID_PCM_F64BE,
+    AV_CODEC_ID_PCM_F64LE,
+    AV_CODEC_ID_PCM_BLURAY,
+    AV_CODEC_ID_PCM_LXF,
+    AV_CODEC_ID_S302M,
+    AV_CODEC_ID_PCM_S8_PLANAR,
+    AV_CODEC_ID_PCM_S24LE_PLANAR,
+    AV_CODEC_ID_PCM_S32LE_PLANAR,
+
+    /* various ADPCM codecs */
+    AV_CODEC_ID_ADPCM_IMA_QT = 0x11000,
+    AV_CODEC_ID_ADPCM_IMA_WAV,
+    AV_CODEC_ID_ADPCM_IMA_DK3,
+    AV_CODEC_ID_ADPCM_IMA_DK4,
+    AV_CODEC_ID_ADPCM_IMA_WS,
+    AV_CODEC_ID_ADPCM_IMA_SMJPEG,
+    AV_CODEC_ID_ADPCM_MS,
+    AV_CODEC_ID_ADPCM_4XM,
+    AV_CODEC_ID_ADPCM_XA,
+    AV_CODEC_ID_ADPCM_ADX,
+    AV_CODEC_ID_ADPCM_EA,
+    AV_CODEC_ID_ADPCM_G726,
+    AV_CODEC_ID_ADPCM_CT,
+    AV_CODEC_ID_ADPCM_SWF,
+    AV_CODEC_ID_ADPCM_YAMAHA,
+    AV_CODEC_ID_ADPCM_SBPRO_4,
+    AV_CODEC_ID_ADPCM_SBPRO_3,
+    AV_CODEC_ID_ADPCM_SBPRO_2,
+    AV_CODEC_ID_ADPCM_THP,
+    AV_CODEC_ID_ADPCM_IMA_AMV,
+    AV_CODEC_ID_ADPCM_EA_R1,
+    AV_CODEC_ID_ADPCM_EA_R3,
+    AV_CODEC_ID_ADPCM_EA_R2,
+    AV_CODEC_ID_ADPCM_IMA_EA_SEAD,
+    AV_CODEC_ID_ADPCM_IMA_EA_EACS,
+    AV_CODEC_ID_ADPCM_EA_XAS,
+    AV_CODEC_ID_ADPCM_EA_MAXIS_XA,
+    AV_CODEC_ID_ADPCM_IMA_ISS,
+    AV_CODEC_ID_ADPCM_G722,
+    AV_CODEC_ID_ADPCM_IMA_APC,
+
+    /* AMR */
+    AV_CODEC_ID_AMR_NB = 0x12000,
+    AV_CODEC_ID_AMR_WB,
+
+    /* RealAudio codecs*/
+    AV_CODEC_ID_RA_144 = 0x13000,
+    AV_CODEC_ID_RA_288,
+
+    /* various DPCM codecs */
+    AV_CODEC_ID_ROQ_DPCM = 0x14000,
+    AV_CODEC_ID_INTERPLAY_DPCM,
+    AV_CODEC_ID_XAN_DPCM,
+    AV_CODEC_ID_SOL_DPCM,
+
+    /* audio codecs */
+    AV_CODEC_ID_MP2 = 0x15000,
+    AV_CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
+    AV_CODEC_ID_AAC,
+    AV_CODEC_ID_AC3,
+    AV_CODEC_ID_DTS,
+    AV_CODEC_ID_VORBIS,
+    AV_CODEC_ID_DVAUDIO,
+    AV_CODEC_ID_WMAV1,
+    AV_CODEC_ID_WMAV2,
+    AV_CODEC_ID_MACE3,
+    AV_CODEC_ID_MACE6,
+    AV_CODEC_ID_VMDAUDIO,
+    AV_CODEC_ID_FLAC,
+    AV_CODEC_ID_MP3ADU,
+    AV_CODEC_ID_MP3ON4,
+    AV_CODEC_ID_SHORTEN,
+    AV_CODEC_ID_ALAC,
+    AV_CODEC_ID_WESTWOOD_SND1,
+    AV_CODEC_ID_GSM, ///< as in Berlin toast format
+    AV_CODEC_ID_QDM2,
+    AV_CODEC_ID_COOK,
+    AV_CODEC_ID_TRUESPEECH,
+    AV_CODEC_ID_TTA,
+    AV_CODEC_ID_SMACKAUDIO,
+    AV_CODEC_ID_QCELP,
+    AV_CODEC_ID_WAVPACK,
+    AV_CODEC_ID_DSICINAUDIO,
+    AV_CODEC_ID_IMC,
+    AV_CODEC_ID_MUSEPACK7,
+    AV_CODEC_ID_MLP,
+    AV_CODEC_ID_GSM_MS, /* as found in WAV */
+    AV_CODEC_ID_ATRAC3,
+#if FF_API_VOXWARE
+    AV_CODEC_ID_VOXWARE,
+#endif
+    AV_CODEC_ID_APE,
+    AV_CODEC_ID_NELLYMOSER,
+    AV_CODEC_ID_MUSEPACK8,
+    AV_CODEC_ID_SPEEX,
+    AV_CODEC_ID_WMAVOICE,
+    AV_CODEC_ID_WMAPRO,
+    AV_CODEC_ID_WMALOSSLESS,
+    AV_CODEC_ID_ATRAC3P,
+    AV_CODEC_ID_EAC3,
+    AV_CODEC_ID_SIPR,
+    AV_CODEC_ID_MP1,
+    AV_CODEC_ID_TWINVQ,
+    AV_CODEC_ID_TRUEHD,
+    AV_CODEC_ID_MP4ALS,
+    AV_CODEC_ID_ATRAC1,
+    AV_CODEC_ID_BINKAUDIO_RDFT,
+    AV_CODEC_ID_BINKAUDIO_DCT,
+    AV_CODEC_ID_AAC_LATM,
+    AV_CODEC_ID_QDMC,
+    AV_CODEC_ID_CELT,
+    AV_CODEC_ID_G723_1,
+    AV_CODEC_ID_G729,
+    AV_CODEC_ID_8SVX_EXP,
+    AV_CODEC_ID_8SVX_FIB,
+    AV_CODEC_ID_BMV_AUDIO,
+    AV_CODEC_ID_RALF,
+    AV_CODEC_ID_IAC,
+    AV_CODEC_ID_ILBC,
+    AV_CODEC_ID_OPUS,
+    AV_CODEC_ID_COMFORT_NOISE,
+    AV_CODEC_ID_TAK,
+    AV_CODEC_ID_METASOUND,
+
+    /* subtitle codecs */
+    AV_CODEC_ID_FIRST_SUBTITLE = 0x17000,          ///< A dummy ID pointing at the start of subtitle codecs.
+    AV_CODEC_ID_DVD_SUBTITLE = 0x17000,
+    AV_CODEC_ID_DVB_SUBTITLE,
+    AV_CODEC_ID_TEXT,  ///< raw UTF-8 text
+    AV_CODEC_ID_XSUB,
+    AV_CODEC_ID_SSA,
+    AV_CODEC_ID_MOV_TEXT,
+    AV_CODEC_ID_HDMV_PGS_SUBTITLE,
+    AV_CODEC_ID_DVB_TELETEXT,
+    AV_CODEC_ID_SRT,
+
+    /* other specific kind of codecs (generally used for attachments) */
+    AV_CODEC_ID_FIRST_UNKNOWN = 0x18000,           ///< A dummy ID pointing at the start of various fake codecs.
+    AV_CODEC_ID_TTF = 0x18000,
+
+    AV_CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf should attempt to identify it
+
+    AV_CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
+                                * stream (only used by libavformat) */
+    AV_CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
+                                * stream (only used by libavformat) */
+    AV_CODEC_ID_FFMETADATA = 0x21000,   ///< Dummy codec for streams containing only metadata information.
+};
+
+/**
+ * This struct describes the properties of a single codec described by an
+ * AVCodecID.
+ * @see avcodec_get_descriptor()
+ */
+typedef struct AVCodecDescriptor {
+    enum AVCodecID     id;
+    enum AVMediaType type;
+    /**
+     * Name of the codec described by this descriptor. It is non-empty and
+     * unique for each codec descriptor. It should contain alphanumeric
+     * characters and '_' only.
+     */
+    const char      *name;
+    /**
+     * A more descriptive name for this codec. May be NULL.
+     */
+    const char *long_name;
+    /**
+     * Codec properties, a combination of AV_CODEC_PROP_* flags.
+     */
+    int             props;
+} AVCodecDescriptor;
+
+/**
+ * Codec uses only intra compression.
+ * Video codecs only.
+ */
+#define AV_CODEC_PROP_INTRA_ONLY    (1 << 0)
+/**
+ * Codec supports lossy compression. Audio and video codecs only.
+ * @note a codec may support both lossy and lossless
+ * compression modes
+ */
+#define AV_CODEC_PROP_LOSSY         (1 << 1)
+/**
+ * Codec supports lossless compression. Audio and video codecs only.
+ */
+#define AV_CODEC_PROP_LOSSLESS      (1 << 2)
+
+/**
+ * @ingroup lavc_decoding
+ * Required number of additionally allocated bytes at the end of the input bitstream for decoding.
+ * This is mainly needed because some optimized bitstream readers read
+ * 32 or 64 bit at once and could read over the end.<br>
+ * Note: If the first 23 bits of the additional bytes are not 0, then damaged
+ * MPEG bitstreams could cause overread and segfault.
+ */
+#define FF_INPUT_BUFFER_PADDING_SIZE 8
+
+/**
+ * @ingroup lavc_encoding
+ * minimum encoding buffer size
+ * Used to avoid some checks during header writing.
+ */
+#define FF_MIN_BUFFER_SIZE 16384
+
+
+/**
+ * @ingroup lavc_encoding
+ * motion estimation type.
+ */
+enum Motion_Est_ID {
+    ME_ZERO = 1,    ///< no search, that is use 0,0 vector whenever one is needed
+    ME_FULL,
+    ME_LOG,
+    ME_PHODS,
+    ME_EPZS,        ///< enhanced predictive zonal search
+    ME_X1,          ///< reserved for experiments
+    ME_HEX,         ///< hexagon based search
+    ME_UMH,         ///< uneven multi-hexagon search
+    ME_TESA,        ///< transformed exhaustive search algorithm
+};
+
+/**
+ * @ingroup lavc_decoding
+ */
+enum AVDiscard{
+    /* We leave some space between them for extensions (drop some
+     * keyframes for intra-only or drop just some bidir frames). */
+    AVDISCARD_NONE    =-16, ///< discard nothing
+    AVDISCARD_DEFAULT =  0, ///< discard useless packets like 0 size packets in avi
+    AVDISCARD_NONREF  =  8, ///< discard all non reference
+    AVDISCARD_BIDIR   = 16, ///< discard all bidirectional frames
+    AVDISCARD_NONKEY  = 32, ///< discard all frames except keyframes
+    AVDISCARD_ALL     = 48, ///< discard all
+};
+
+enum AVColorPrimaries{
+    AVCOL_PRI_BT709       = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B
+    AVCOL_PRI_UNSPECIFIED = 2,
+    AVCOL_PRI_BT470M      = 4,
+    AVCOL_PRI_BT470BG     = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM
+    AVCOL_PRI_SMPTE170M   = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
+    AVCOL_PRI_SMPTE240M   = 7, ///< functionally identical to above
+    AVCOL_PRI_FILM        = 8,
+    AVCOL_PRI_BT2020      = 9, ///< ITU-R BT2020
+    AVCOL_PRI_NB             , ///< Not part of ABI
+};
+
+enum AVColorTransferCharacteristic{
+    AVCOL_TRC_BT709        =  1, ///< also ITU-R BT1361
+    AVCOL_TRC_UNSPECIFIED  =  2,
+    AVCOL_TRC_GAMMA22      =  4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
+    AVCOL_TRC_GAMMA28      =  5, ///< also ITU-R BT470BG
+    AVCOL_TRC_SMPTE170M    =  6, ///< also ITU-R BT601-6 525 or 625 / ITU-R BT1358 525 or 625 / ITU-R BT1700 NTSC
+    AVCOL_TRC_SMPTE240M    =  7,
+    AVCOL_TRC_LINEAR       =  8, ///< "Linear transfer characteristics"
+    AVCOL_TRC_LOG          =  9, ///< "Logarithmic transfer characteristic (100:1 range)"
+    AVCOL_TRC_LOG_SQRT     = 10, ///< "Logarithmic transfer characteristic (100 * Sqrt( 10 ) : 1 range)"
+    AVCOL_TRC_IEC61966_2_4 = 11, ///< IEC 61966-2-4
+    AVCOL_TRC_BT1361_ECG   = 12, ///< ITU-R BT1361 Extended Colour Gamut
+    AVCOL_TRC_IEC61966_2_1 = 13, ///< IEC 61966-2-1 (sRGB or sYCC)
+    AVCOL_TRC_BT2020_10    = 14, ///< ITU-R BT2020 for 10 bit system
+    AVCOL_TRC_BT2020_12    = 15, ///< ITU-R BT2020 for 12 bit system
+    AVCOL_TRC_NB               , ///< Not part of ABI
+};
+
+enum AVColorSpace{
+    AVCOL_SPC_RGB         =  0,
+    AVCOL_SPC_BT709       =  1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
+    AVCOL_SPC_UNSPECIFIED =  2,
+    AVCOL_SPC_FCC         =  4,
+    AVCOL_SPC_BT470BG     =  5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
+    AVCOL_SPC_SMPTE170M   =  6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
+    AVCOL_SPC_SMPTE240M   =  7,
+    AVCOL_SPC_YCOCG       =  8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
+    AVCOL_SPC_BT2020_NCL  =  9, ///< ITU-R BT2020 non-constant luminance system
+    AVCOL_SPC_BT2020_CL   = 10, ///< ITU-R BT2020 constant luminance system
+    AVCOL_SPC_NB              , ///< Not part of ABI
+};
+
+enum AVColorRange{
+    AVCOL_RANGE_UNSPECIFIED = 0,
+    AVCOL_RANGE_MPEG        = 1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges
+    AVCOL_RANGE_JPEG        = 2, ///< the normal     2^n-1   "JPEG" YUV ranges
+    AVCOL_RANGE_NB             , ///< Not part of ABI
+};
+
+/**
+ *  X   X      3 4 X      X are luma samples,
+ *             1 2        1-6 are possible chroma positions
+ *  X   X      5 6 X      0 is undefined/unknown position
+ */
+enum AVChromaLocation{
+    AVCHROMA_LOC_UNSPECIFIED = 0,
+    AVCHROMA_LOC_LEFT        = 1, ///< mpeg2/4, h264 default
+    AVCHROMA_LOC_CENTER      = 2, ///< mpeg1, jpeg, h263
+    AVCHROMA_LOC_TOPLEFT     = 3, ///< DV
+    AVCHROMA_LOC_TOP         = 4,
+    AVCHROMA_LOC_BOTTOMLEFT  = 5,
+    AVCHROMA_LOC_BOTTOM      = 6,
+    AVCHROMA_LOC_NB             , ///< Not part of ABI
+};
+
+enum AVAudioServiceType {
+    AV_AUDIO_SERVICE_TYPE_MAIN              = 0,
+    AV_AUDIO_SERVICE_TYPE_EFFECTS           = 1,
+    AV_AUDIO_SERVICE_TYPE_VISUALLY_IMPAIRED = 2,
+    AV_AUDIO_SERVICE_TYPE_HEARING_IMPAIRED  = 3,
+    AV_AUDIO_SERVICE_TYPE_DIALOGUE          = 4,
+    AV_AUDIO_SERVICE_TYPE_COMMENTARY        = 5,
+    AV_AUDIO_SERVICE_TYPE_EMERGENCY         = 6,
+    AV_AUDIO_SERVICE_TYPE_VOICE_OVER        = 7,
+    AV_AUDIO_SERVICE_TYPE_KARAOKE           = 8,
+    AV_AUDIO_SERVICE_TYPE_NB                   , ///< Not part of ABI
+};
+
+/**
+ * @ingroup lavc_encoding
+ */
+typedef struct RcOverride{
+    int start_frame;
+    int end_frame;
+    int qscale; // If this is 0 then quality_factor will be used instead.
+    float quality_factor;
+} RcOverride;
+
+#if FF_API_MAX_BFRAMES
+/**
+ * @deprecated there is no libavcodec-wide limit on the number of B-frames
+ */
+#define FF_MAX_B_FRAMES 16
+#endif
+
+/* encoding support
+   These flags can be passed in AVCodecContext.flags before initialization.
+   Note: Not everything is supported yet.
+*/
+
+/**
+ * Allow decoders to produce frames with data planes that are not aligned
+ * to CPU requirements (e.g. due to cropping).
+ */
+#define CODEC_FLAG_UNALIGNED 0x0001
+#define CODEC_FLAG_QSCALE 0x0002  ///< Use fixed qscale.
+#define CODEC_FLAG_4MV    0x0004  ///< 4 MV per MB allowed / advanced prediction for H.263.
+#define CODEC_FLAG_OUTPUT_CORRUPT 0x0008 ///< Output even those frames that might be corrupted
+#define CODEC_FLAG_QPEL   0x0010  ///< Use qpel MC.
+#define CODEC_FLAG_GMC    0x0020  ///< Use GMC.
+#define CODEC_FLAG_MV0    0x0040  ///< Always try a MB with MV=<0,0>.
+/**
+ * The parent program guarantees that the input for B-frames containing
+ * streams is not written to for at least s->max_b_frames+1 frames, if
+ * this is not set the input will be copied.
+ */
+#define CODEC_FLAG_INPUT_PRESERVED 0x0100
+#define CODEC_FLAG_PASS1           0x0200   ///< Use internal 2pass ratecontrol in first pass mode.
+#define CODEC_FLAG_PASS2           0x0400   ///< Use internal 2pass ratecontrol in second pass mode.
+#define CODEC_FLAG_GRAY            0x2000   ///< Only decode/encode grayscale.
+#if FF_API_EMU_EDGE
+/**
+ * @deprecated edges are not used/required anymore. I.e. this flag is now always
+ * set.
+ */
+#define CODEC_FLAG_EMU_EDGE        0x4000
+#endif
+#define CODEC_FLAG_PSNR            0x8000   ///< error[?] variables will be set during encoding.
+#define CODEC_FLAG_TRUNCATED       0x00010000 /** Input bitstream might be truncated at a random
+                                                  location instead of only at frame boundaries. */
+#define CODEC_FLAG_NORMALIZE_AQP  0x00020000 ///< Normalize adaptive quantization.
+#define CODEC_FLAG_INTERLACED_DCT 0x00040000 ///< Use interlaced DCT.
+#define CODEC_FLAG_LOW_DELAY      0x00080000 ///< Force low delay.
+#define CODEC_FLAG_GLOBAL_HEADER  0x00400000 ///< Place global headers in extradata instead of every keyframe.
+#define CODEC_FLAG_BITEXACT       0x00800000 ///< Use only bitexact stuff (except (I)DCT).
+/* Fx : Flag for h263+ extra options */
+#define CODEC_FLAG_AC_PRED        0x01000000 ///< H.263 advanced intra coding / MPEG-4 AC prediction
+#define CODEC_FLAG_LOOP_FILTER    0x00000800 ///< loop filter
+#define CODEC_FLAG_INTERLACED_ME  0x20000000 ///< interlaced motion estimation
+#define CODEC_FLAG_CLOSED_GOP     0x80000000
+#define CODEC_FLAG2_FAST          0x00000001 ///< Allow non spec compliant speedup tricks.
+#define CODEC_FLAG2_NO_OUTPUT     0x00000004 ///< Skip bitstream encoding.
+#define CODEC_FLAG2_LOCAL_HEADER  0x00000008 ///< Place global headers at every keyframe instead of in extradata.
+#define CODEC_FLAG2_IGNORE_CROP   0x00010000 ///< Discard cropping information from SPS.
+
+#define CODEC_FLAG2_CHUNKS        0x00008000 ///< Input bitstream might be truncated at a packet boundaries instead of only at frame boundaries.
+
+/* Unsupported options :
+ *              Syntax Arithmetic coding (SAC)
+ *              Reference Picture Selection
+ *              Independent Segment Decoding */
+/* /Fx */
+/* codec capabilities */
+
+#define CODEC_CAP_DRAW_HORIZ_BAND 0x0001 ///< Decoder can use draw_horiz_band callback.
+/**
+ * Codec uses get_buffer() for allocating buffers and supports custom allocators.
+ * If not set, it might not use get_buffer() at all or use operations that
+ * assume the buffer was allocated by avcodec_default_get_buffer.
+ */
+#define CODEC_CAP_DR1             0x0002
+#define CODEC_CAP_TRUNCATED       0x0008
+#if FF_API_XVMC
+/* Codec can export data for HW decoding (XvMC). */
+#define CODEC_CAP_HWACCEL         0x0010
+#endif /* FF_API_XVMC */
+/**
+ * Encoder or decoder requires flushing with NULL input at the end in order to
+ * give the complete and correct output.
+ *
+ * NOTE: If this flag is not set, the codec is guaranteed to never be fed with
+ *       with NULL data. The user can still send NULL data to the public encode
+ *       or decode function, but libavcodec will not pass it along to the codec
+ *       unless this flag is set.
+ *
+ * Decoders:
+ * The decoder has a non-zero delay and needs to be fed with avpkt->data=NULL,
+ * avpkt->size=0 at the end to get the delayed data until the decoder no longer
+ * returns frames.
+ *
+ * Encoders:
+ * The encoder needs to be fed with NULL data at the end of encoding until the
+ * encoder no longer returns data.
+ *
+ * NOTE: For encoders implementing the AVCodec.encode2() function, setting this
+ *       flag also means that the encoder must set the pts and duration for
+ *       each output packet. If this flag is not set, the pts and duration will
+ *       be determined by libavcodec from the input frame.
+ */
+#define CODEC_CAP_DELAY           0x0020
+/**
+ * Codec can be fed a final frame with a smaller size.
+ * This can be used to prevent truncation of the last audio samples.
+ */
+#define CODEC_CAP_SMALL_LAST_FRAME 0x0040
+#if FF_API_CAP_VDPAU
+/**
+ * Codec can export data for HW decoding (VDPAU).
+ */
+#define CODEC_CAP_HWACCEL_VDPAU    0x0080
+#endif
+/**
+ * Codec can output multiple frames per AVPacket
+ * Normally demuxers return one frame at a time, demuxers which do not do
+ * are connected to a parser to split what they return into proper frames.
+ * This flag is reserved to the very rare category of codecs which have a
+ * bitstream that cannot be split into frames without timeconsuming
+ * operations like full decoding. Demuxers carring such bitstreams thus
+ * may return multiple frames in a packet. This has many disadvantages like
+ * prohibiting stream copy in many cases thus it should only be considered
+ * as a last resort.
+ */
+#define CODEC_CAP_SUBFRAMES        0x0100
+/**
+ * Codec is experimental and is thus avoided in favor of non experimental
+ * encoders
+ */
+#define CODEC_CAP_EXPERIMENTAL     0x0200
+/**
+ * Codec should fill in channel configuration and samplerate instead of container
+ */
+#define CODEC_CAP_CHANNEL_CONF     0x0400
+#if FF_API_NEG_LINESIZES
+/**
+ * @deprecated no codecs use this capability
+ */
+#define CODEC_CAP_NEG_LINESIZES    0x0800
+#endif
+/**
+ * Codec supports frame-level multithreading.
+ */
+#define CODEC_CAP_FRAME_THREADS    0x1000
+/**
+ * Codec supports slice-based (or partition-based) multithreading.
+ */
+#define CODEC_CAP_SLICE_THREADS    0x2000
+/**
+ * Codec supports changed parameters at any point.
+ */
+#define CODEC_CAP_PARAM_CHANGE     0x4000
+/**
+ * Codec supports avctx->thread_count == 0 (auto).
+ */
+#define CODEC_CAP_AUTO_THREADS     0x8000
+/**
+ * Audio encoder supports receiving a different number of samples in each call.
+ */
+#define CODEC_CAP_VARIABLE_FRAME_SIZE 0x10000
+
+#if FF_API_MB_TYPE
+//The following defines may change, don't expect compatibility if you use them.
+#define MB_TYPE_INTRA4x4   0x0001
+#define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific
+#define MB_TYPE_INTRA_PCM  0x0004 //FIXME H.264-specific
+#define MB_TYPE_16x16      0x0008
+#define MB_TYPE_16x8       0x0010
+#define MB_TYPE_8x16       0x0020
+#define MB_TYPE_8x8        0x0040
+#define MB_TYPE_INTERLACED 0x0080
+#define MB_TYPE_DIRECT2    0x0100 //FIXME
+#define MB_TYPE_ACPRED     0x0200
+#define MB_TYPE_GMC        0x0400
+#define MB_TYPE_SKIP       0x0800
+#define MB_TYPE_P0L0       0x1000
+#define MB_TYPE_P1L0       0x2000
+#define MB_TYPE_P0L1       0x4000
+#define MB_TYPE_P1L1       0x8000
+#define MB_TYPE_L0         (MB_TYPE_P0L0 | MB_TYPE_P1L0)
+#define MB_TYPE_L1         (MB_TYPE_P0L1 | MB_TYPE_P1L1)
+#define MB_TYPE_L0L1       (MB_TYPE_L0   | MB_TYPE_L1)
+#define MB_TYPE_QUANT      0x00010000
+#define MB_TYPE_CBP        0x00020000
+//Note bits 24-31 are reserved for codec specific use (h264 ref0, mpeg1 0mv, ...)
+#endif
+
+/**
+ * Pan Scan area.
+ * This specifies the area which should be displayed.
+ * Note there may be multiple such areas for one frame.
+ */
+typedef struct AVPanScan{
+    /**
+     * id
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    int id;
+
+    /**
+     * width and height in 1/16 pel
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    int width;
+    int height;
+
+    /**
+     * position of the top left corner in 1/16 pel for up to 3 fields/frames
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    int16_t position[3][2];
+}AVPanScan;
+
+#if FF_API_QSCALE_TYPE
+#define FF_QSCALE_TYPE_MPEG1 0
+#define FF_QSCALE_TYPE_MPEG2 1
+#define FF_QSCALE_TYPE_H264  2
+#define FF_QSCALE_TYPE_VP56  3
+#endif
+
+#if FF_API_GET_BUFFER
+#define FF_BUFFER_TYPE_INTERNAL 1
+#define FF_BUFFER_TYPE_USER     2 ///< direct rendering buffers (image is (de)allocated by user)
+#define FF_BUFFER_TYPE_SHARED   4 ///< Buffer from somewhere else; don't deallocate image (data/base), all other tables are not shared.
+#define FF_BUFFER_TYPE_COPY     8 ///< Just a (modified) copy of some other buffer, don't deallocate anything.
+
+#define FF_BUFFER_HINTS_VALID    0x01 // Buffer hints value is meaningful (if 0 ignore).
+#define FF_BUFFER_HINTS_READABLE 0x02 // Codec will read from buffer.
+#define FF_BUFFER_HINTS_PRESERVE 0x04 // User must not alter buffer content.
+#define FF_BUFFER_HINTS_REUSABLE 0x08 // Codec will reuse the buffer (update).
+#endif
+
+/**
+ * The decoder will keep a reference to the frame and may reuse it later.
+ */
+#define AV_GET_BUFFER_FLAG_REF (1 << 0)
+
+/**
+ * @defgroup lavc_packet AVPacket
+ *
+ * Types and functions for working with AVPacket.
+ * @{
+ */
+enum AVPacketSideDataType {
+    AV_PKT_DATA_PALETTE,
+    AV_PKT_DATA_NEW_EXTRADATA,
+
+    /**
+     * An AV_PKT_DATA_PARAM_CHANGE side data packet is laid out as follows:
+     * @code
+     * u32le param_flags
+     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT)
+     *     s32le channel_count
+     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT)
+     *     u64le channel_layout
+     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE)
+     *     s32le sample_rate
+     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS)
+     *     s32le width
+     *     s32le height
+     * @endcode
+     */
+    AV_PKT_DATA_PARAM_CHANGE,
+
+    /**
+     * An AV_PKT_DATA_H263_MB_INFO side data packet contains a number of
+     * structures with info about macroblocks relevant to splitting the
+     * packet into smaller packets on macroblock edges (e.g. as for RFC 2190).
+     * That is, it does not necessarily contain info about all macroblocks,
+     * as long as the distance between macroblocks in the info is smaller
+     * than the target payload size.
+     * Each MB info structure is 12 bytes, and is laid out as follows:
+     * @code
+     * u32le bit offset from the start of the packet
+     * u8    current quantizer at the start of the macroblock
+     * u8    GOB number
+     * u16le macroblock address within the GOB
+     * u8    horizontal MV predictor
+     * u8    vertical MV predictor
+     * u8    horizontal MV predictor for block number 3
+     * u8    vertical MV predictor for block number 3
+     * @endcode
+     */
+    AV_PKT_DATA_H263_MB_INFO,
+};
+
+/**
+ * This structure stores compressed data. It is typically exported by demuxers
+ * and then passed as input to decoders, or received as output from encoders and
+ * then passed to muxers.
+ *
+ * For video, it should typically contain one compressed frame. For audio it may
+ * contain several compressed frames.
+ *
+ * AVPacket is one of the few structs in Libav, whose size is a part of public
+ * ABI. Thus it may be allocated on stack and no new fields can be added to it
+ * without libavcodec and libavformat major bump.
+ *
+ * The semantics of data ownership depends on the buf or destruct (deprecated)
+ * fields. If either is set, the packet data is dynamically allocated and is
+ * valid indefinitely until av_free_packet() is called (which in turn calls
+ * av_buffer_unref()/the destruct callback to free the data). If neither is set,
+ * the packet data is typically backed by some static buffer somewhere and is
+ * only valid for a limited time (e.g. until the next read call when demuxing).
+ *
+ * The side data is always allocated with av_malloc() and is freed in
+ * av_free_packet().
+ */
+typedef struct AVPacket {
+    /**
+     * A reference to the reference-counted buffer where the packet data is
+     * stored.
+     * May be NULL, then the packet data is not reference-counted.
+     */
+    AVBufferRef *buf;
+    /**
+     * Presentation timestamp in AVStream->time_base units; the time at which
+     * the decompressed packet will be presented to the user.
+     * Can be AV_NOPTS_VALUE if it is not stored in the file.
+     * pts MUST be larger or equal to dts as presentation cannot happen before
+     * decompression, unless one wants to view hex dumps. Some formats misuse
+     * the terms dts and pts/cts to mean something different. Such timestamps
+     * must be converted to true pts/dts before they are stored in AVPacket.
+     */
+    int64_t pts;
+    /**
+     * Decompression timestamp in AVStream->time_base units; the time at which
+     * the packet is decompressed.
+     * Can be AV_NOPTS_VALUE if it is not stored in the file.
+     */
+    int64_t dts;
+    uint8_t *data;
+    int   size;
+    int   stream_index;
+    /**
+     * A combination of AV_PKT_FLAG values
+     */
+    int   flags;
+    /**
+     * Additional packet data that can be provided by the container.
+     * Packet can contain several types of side information.
+     */
+    struct {
+        uint8_t *data;
+        int      size;
+        enum AVPacketSideDataType type;
+    } *side_data;
+    int side_data_elems;
+
+    /**
+     * Duration of this packet in AVStream->time_base units, 0 if unknown.
+     * Equals next_pts - this_pts in presentation order.
+     */
+    int   duration;
+#if FF_API_DESTRUCT_PACKET
+    attribute_deprecated
+    void  (*destruct)(struct AVPacket *);
+    attribute_deprecated
+    void  *priv;
+#endif
+    int64_t pos;                            ///< byte position in stream, -1 if unknown
+
+    /**
+     * Time difference in AVStream->time_base units from the pts of this
+     * packet to the point at which the output from the decoder has converged
+     * independent from the availability of previous frames. That is, the
+     * frames are virtually identical no matter if decoding started from
+     * the very first frame or from this keyframe.
+     * Is AV_NOPTS_VALUE if unknown.
+     * This field is not the display duration of the current packet.
+     * This field has no meaning if the packet does not have AV_PKT_FLAG_KEY
+     * set.
+     *
+     * The purpose of this field is to allow seeking in streams that have no
+     * keyframes in the conventional sense. It corresponds to the
+     * recovery point SEI in H.264 and match_time_delta in NUT. It is also
+     * essential for some types of subtitle streams to ensure that all
+     * subtitles are correctly displayed after seeking.
+     */
+    int64_t convergence_duration;
+} AVPacket;
+#define AV_PKT_FLAG_KEY     0x0001 ///< The packet contains a keyframe
+#define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted
+
+enum AVSideDataParamChangeFlags {
+    AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT  = 0x0001,
+    AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT = 0x0002,
+    AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE    = 0x0004,
+    AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS     = 0x0008,
+};
+/**
+ * @}
+ */
+
+struct AVCodecInternal;
+
+enum AVFieldOrder {
+    AV_FIELD_UNKNOWN,
+    AV_FIELD_PROGRESSIVE,
+    AV_FIELD_TT,          //< Top coded_first, top displayed first
+    AV_FIELD_BB,          //< Bottom coded first, bottom displayed first
+    AV_FIELD_TB,          //< Top coded first, bottom displayed first
+    AV_FIELD_BT,          //< Bottom coded first, top displayed first
+};
+
+/**
+ * main external API structure.
+ * New fields can be added to the end with minor version bumps.
+ * Removal, reordering and changes to existing fields require a major
+ * version bump.
+ * sizeof(AVCodecContext) must not be used outside libav*.
+ */
+typedef struct AVCodecContext {
+    /**
+     * information on struct for av_log
+     * - set by avcodec_alloc_context3
+     */
+    const AVClass *av_class;
+    int log_level_offset;
+
+    enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
+    const struct AVCodec  *codec;
+    char             codec_name[32];
+    enum AVCodecID     codec_id; /* see AV_CODEC_ID_xxx */
+
+    /**
+     * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
+     * This is used to work around some encoder bugs.
+     * A demuxer should set this to what is stored in the field used to identify the codec.
+     * If there are multiple such fields in a container then the demuxer should choose the one
+     * which maximizes the information about the used codec.
+     * If the codec tag field in a container is larger than 32 bits then the demuxer should
+     * remap the longer ID to 32 bits with a table or other structure. Alternatively a new
+     * extra_codec_tag + size could be added but for this a clear advantage must be demonstrated
+     * first.
+     * - encoding: Set by user, if not then the default based on codec_id will be used.
+     * - decoding: Set by user, will be converted to uppercase by libavcodec during init.
+     */
+    unsigned int codec_tag;
+
+    /**
+     * fourcc from the AVI stream header (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
+     * This is used to work around some encoder bugs.
+     * - encoding: unused
+     * - decoding: Set by user, will be converted to uppercase by libavcodec during init.
+     */
+    unsigned int stream_codec_tag;
+
+    void *priv_data;
+
+    /**
+     * Private context used for internal data.
+     *
+     * Unlike priv_data, this is not codec-specific. It is used in general
+     * libavcodec functions.
+     */
+    struct AVCodecInternal *internal;
+
+    /**
+     * Private data of the user, can be used to carry app specific stuff.
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    void *opaque;
+
+    /**
+     * the average bitrate
+     * - encoding: Set by user; unused for constant quantizer encoding.
+     * - decoding: Set by libavcodec. 0 or some bitrate if this info is available in the stream.
+     */
+    int bit_rate;
+
+    /**
+     * number of bits the bitstream is allowed to diverge from the reference.
+     *           the reference can be CBR (for CBR pass1) or VBR (for pass2)
+     * - encoding: Set by user; unused for constant quantizer encoding.
+     * - decoding: unused
+     */
+    int bit_rate_tolerance;
+
+    /**
+     * Global quality for codecs which cannot change it per frame.
+     * This should be proportional to MPEG-1/2/4 qscale.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int global_quality;
+
+    /**
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int compression_level;
+#define FF_COMPRESSION_DEFAULT -1
+
+    /**
+     * CODEC_FLAG_*.
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int flags;
+
+    /**
+     * CODEC_FLAG2_*
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int flags2;
+
+    /**
+     * some codecs need / can use extradata like Huffman tables.
+     * mjpeg: Huffman tables
+     * rv10: additional flags
+     * mpeg4: global headers (they can be in the bitstream or here)
+     * The allocated memory should be FF_INPUT_BUFFER_PADDING_SIZE bytes larger
+     * than extradata_size to avoid prolems if it is read with the bitstream reader.
+     * The bytewise contents of extradata must not depend on the architecture or CPU endianness.
+     * - encoding: Set/allocated/freed by libavcodec.
+     * - decoding: Set/allocated/freed by user.
+     */
+    uint8_t *extradata;
+    int extradata_size;
+
+    /**
+     * This is the fundamental unit of time (in seconds) in terms
+     * of which frame timestamps are represented. For fixed-fps content,
+     * timebase should be 1/framerate and timestamp increments should be
+     * identically 1.
+     * - encoding: MUST be set by user.
+     * - decoding: Set by libavcodec.
+     */
+    AVRational time_base;
+
+    /**
+     * For some codecs, the time base is closer to the field rate than the frame rate.
+     * Most notably, H.264 and MPEG-2 specify time_base as half of frame duration
+     * if no telecine is used ...
+     *
+     * Set to time_base ticks per frame. Default 1, e.g., H.264/MPEG-2 set it to 2.
+     */
+    int ticks_per_frame;
+
+    /**
+     * Codec delay.
+     *
+     * Video:
+     *   Number of frames the decoded output will be delayed relative to the
+     *   encoded input.
+     *
+     * Audio:
+     *   For encoding, this is the number of "priming" samples added to the
+     *   beginning of the stream. The decoded output will be delayed by this
+     *   many samples relative to the input to the encoder. Note that this
+     *   field is purely informational and does not directly affect the pts
+     *   output by the encoder, which should always be based on the actual
+     *   presentation time, including any delay.
+     *   For decoding, this is the number of samples the decoder needs to
+     *   output before the decoder's output is valid. When seeking, you should
+     *   start decoding this many samples prior to your desired seek point.
+     *
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by libavcodec.
+     */
+    int delay;
+
+
+    /* video only */
+    /**
+     * picture width / height.
+     * - encoding: MUST be set by user.
+     * - decoding: May be set by the user before opening the decoder if known e.g.
+     *             from the container. Some decoders will require the dimensions
+     *             to be set by the caller. During decoding, the decoder may
+     *             overwrite those values as required.
+     */
+    int width, height;
+
+    /**
+     * Bitstream width / height, may be different from width/height e.g. when
+     * the decoded frame is cropped before being output.
+     * - encoding: unused
+     * - decoding: May be set by the user before opening the decoder if known
+     *             e.g. from the container. During decoding, the decoder may
+     *             overwrite those values as required.
+     */
+    int coded_width, coded_height;
+
+#if FF_API_ASPECT_EXTENDED
+#define FF_ASPECT_EXTENDED 15
+#endif
+
+    /**
+     * the number of pictures in a group of pictures, or 0 for intra_only
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int gop_size;
+
+    /**
+     * Pixel format, see AV_PIX_FMT_xxx.
+     * May be set by the demuxer if known from headers.
+     * May be overriden by the decoder if it knows better.
+     * - encoding: Set by user.
+     * - decoding: Set by user if known, overridden by libavcodec if known
+     */
+    enum AVPixelFormat pix_fmt;
+
+    /**
+     * Motion estimation algorithm used for video coding.
+     * 1 (zero), 2 (full), 3 (log), 4 (phods), 5 (epzs), 6 (x1), 7 (hex),
+     * 8 (umh), 10 (tesa) [7, 8, 10 are x264 specific]
+     * - encoding: MUST be set by user.
+     * - decoding: unused
+     */
+    int me_method;
+
+    /**
+     * If non NULL, 'draw_horiz_band' is called by the libavcodec
+     * decoder to draw a horizontal band. It improves cache usage. Not
+     * all codecs can do that. You must check the codec capabilities
+     * beforehand.
+     * When multithreading is used, it may be called from multiple threads
+     * at the same time; threads might draw different parts of the same AVFrame,
+     * or multiple AVFrames, and there is no guarantee that slices will be drawn
+     * in order.
+     * The function is also used by hardware acceleration APIs.
+     * It is called at least once during frame decoding to pass
+     * the data needed for hardware render.
+     * In that mode instead of pixel data, AVFrame points to
+     * a structure specific to the acceleration API. The application
+     * reads the structure and can change some fields to indicate progress
+     * or mark state.
+     * - encoding: unused
+     * - decoding: Set by user.
+     * @param height the height of the slice
+     * @param y the y position of the slice
+     * @param type 1->top field, 2->bottom field, 3->frame
+     * @param offset offset into the AVFrame.data from which the slice should be read
+     */
+    void (*draw_horiz_band)(struct AVCodecContext *s,
+                            const AVFrame *src, int offset[AV_NUM_DATA_POINTERS],
+                            int y, int type, int height);
+
+    /**
+     * callback to negotiate the pixelFormat
+     * @param fmt is the list of formats which are supported by the codec,
+     * it is terminated by -1 as 0 is a valid format, the formats are ordered by quality.
+     * The first is always the native one.
+     * @return the chosen format
+     * - encoding: unused
+     * - decoding: Set by user, if not set the native format will be chosen.
+     */
+    enum AVPixelFormat (*get_format)(struct AVCodecContext *s, const enum AVPixelFormat * fmt);
+
+    /**
+     * maximum number of B-frames between non-B-frames
+     * Note: The output will be delayed by max_b_frames+1 relative to the input.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int max_b_frames;
+
+    /**
+     * qscale factor between IP and B-frames
+     * If > 0 then the last P-frame quantizer will be used (q= lastp_q*factor+offset).
+     * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float b_quant_factor;
+
+    /** obsolete FIXME remove */
+    int rc_strategy;
+#define FF_RC_STRATEGY_XVID 1
+
+    int b_frame_strategy;
+
+    /**
+     * qscale offset between IP and B-frames
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float b_quant_offset;
+
+    /**
+     * Size of the frame reordering buffer in the decoder.
+     * For MPEG-2 it is 1 IPB or 0 low delay IP.
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by libavcodec.
+     */
+    int has_b_frames;
+
+    /**
+     * 0-> h263 quant 1-> mpeg quant
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int mpeg_quant;
+
+    /**
+     * qscale factor between P and I-frames
+     * If > 0 then the last p frame quantizer will be used (q= lastp_q*factor+offset).
+     * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float i_quant_factor;
+
+    /**
+     * qscale offset between P and I-frames
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float i_quant_offset;
+
+    /**
+     * luminance masking (0-> disabled)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float lumi_masking;
+
+    /**
+     * temporary complexity masking (0-> disabled)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float temporal_cplx_masking;
+
+    /**
+     * spatial complexity masking (0-> disabled)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float spatial_cplx_masking;
+
+    /**
+     * p block masking (0-> disabled)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float p_masking;
+
+    /**
+     * darkness masking (0-> disabled)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float dark_masking;
+
+    /**
+     * slice count
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by user (or 0).
+     */
+    int slice_count;
+    /**
+     * prediction method (needed for huffyuv)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+     int prediction_method;
+#define FF_PRED_LEFT   0
+#define FF_PRED_PLANE  1
+#define FF_PRED_MEDIAN 2
+
+    /**
+     * slice offsets in the frame in bytes
+     * - encoding: Set/allocated by libavcodec.
+     * - decoding: Set/allocated by user (or NULL).
+     */
+    int *slice_offset;
+
+    /**
+     * sample aspect ratio (0 if unknown)
+     * That is the width of a pixel divided by the height of the pixel.
+     * Numerator and denominator must be relatively prime and smaller than 256 for some video standards.
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    AVRational sample_aspect_ratio;
+
+    /**
+     * motion estimation comparison function
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int me_cmp;
+    /**
+     * subpixel motion estimation comparison function
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int me_sub_cmp;
+    /**
+     * macroblock comparison function (not supported yet)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int mb_cmp;
+    /**
+     * interlaced DCT comparison function
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int ildct_cmp;
+#define FF_CMP_SAD    0
+#define FF_CMP_SSE    1
+#define FF_CMP_SATD   2
+#define FF_CMP_DCT    3
+#define FF_CMP_PSNR   4
+#define FF_CMP_BIT    5
+#define FF_CMP_RD     6
+#define FF_CMP_ZERO   7
+#define FF_CMP_VSAD   8
+#define FF_CMP_VSSE   9
+#define FF_CMP_NSSE   10
+#define FF_CMP_DCTMAX 13
+#define FF_CMP_DCT264 14
+#define FF_CMP_CHROMA 256
+
+    /**
+     * ME diamond size & shape
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int dia_size;
+
+    /**
+     * amount of previous MV predictors (2a+1 x 2a+1 square)
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int last_predictor_count;
+
+    /**
+     * prepass for motion estimation
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int pre_me;
+
+    /**
+     * motion estimation prepass comparison function
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int me_pre_cmp;
+
+    /**
+     * ME prepass diamond size & shape
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int pre_dia_size;
+
+    /**
+     * subpel ME quality
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int me_subpel_quality;
+
+    /**
+     * DTG active format information (additional aspect ratio
+     * information only used in DVB MPEG-2 transport streams)
+     * 0 if not set.
+     *
+     * - encoding: unused
+     * - decoding: Set by decoder.
+     */
+    int dtg_active_format;
+#define FF_DTG_AFD_SAME         8
+#define FF_DTG_AFD_4_3          9
+#define FF_DTG_AFD_16_9         10
+#define FF_DTG_AFD_14_9         11
+#define FF_DTG_AFD_4_3_SP_14_9  13
+#define FF_DTG_AFD_16_9_SP_14_9 14
+#define FF_DTG_AFD_SP_4_3       15
+
+    /**
+     * maximum motion estimation search range in subpel units
+     * If 0 then no limit.
+     *
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int me_range;
+
+    /**
+     * intra quantizer bias
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int intra_quant_bias;
+#define FF_DEFAULT_QUANT_BIAS 999999
+
+    /**
+     * inter quantizer bias
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int inter_quant_bias;
+
+    /**
+     * slice flags
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    int slice_flags;
+#define SLICE_FLAG_CODED_ORDER    0x0001 ///< draw_horiz_band() is called in coded order instead of display
+#define SLICE_FLAG_ALLOW_FIELD    0x0002 ///< allow draw_horiz_band() with field slices (MPEG2 field pics)
+#define SLICE_FLAG_ALLOW_PLANE    0x0004 ///< allow draw_horiz_band() with 1 component at a time (SVQ1)
+
+#if FF_API_XVMC
+    /**
+     * XVideo Motion Acceleration
+     * - encoding: forbidden
+     * - decoding: set by decoder
+     * @deprecated XvMC support is slated for removal.
+     */
+    attribute_deprecated int xvmc_acceleration;
+#endif /* FF_API_XVMC */
+
+    /**
+     * macroblock decision mode
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int mb_decision;
+#define FF_MB_DECISION_SIMPLE 0        ///< uses mb_cmp
+#define FF_MB_DECISION_BITS   1        ///< chooses the one which needs the fewest bits
+#define FF_MB_DECISION_RD     2        ///< rate distortion
+
+    /**
+     * custom intra quantization matrix
+     * - encoding: Set by user, can be NULL.
+     * - decoding: Set by libavcodec.
+     */
+    uint16_t *intra_matrix;
+
+    /**
+     * custom inter quantization matrix
+     * - encoding: Set by user, can be NULL.
+     * - decoding: Set by libavcodec.
+     */
+    uint16_t *inter_matrix;
+
+    /**
+     * scene change detection threshold
+     * 0 is default, larger means fewer detected scene changes.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int scenechange_threshold;
+
+    /**
+     * noise reduction strength
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int noise_reduction;
+
+    /**
+     * Motion estimation threshold below which no motion estimation is
+     * performed, but instead the user specified motion vectors are used.
+     *
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int me_threshold;
+
+    /**
+     * Macroblock threshold below which the user specified macroblock types will be used.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int mb_threshold;
+
+    /**
+     * precision of the intra DC coefficient - 8
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int intra_dc_precision;
+
+    /**
+     * Number of macroblock rows at the top which are skipped.
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    int skip_top;
+
+    /**
+     * Number of macroblock rows at the bottom which are skipped.
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    int skip_bottom;
+
+    /**
+     * Border processing masking, raises the quantizer for mbs on the borders
+     * of the picture.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float border_masking;
+
+    /**
+     * minimum MB lagrange multipler
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int mb_lmin;
+
+    /**
+     * maximum MB lagrange multipler
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int mb_lmax;
+
+    /**
+     *
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int me_penalty_compensation;
+
+    /**
+     *
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int bidir_refine;
+
+    /**
+     *
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int brd_scale;
+
+    /**
+     * minimum GOP size
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int keyint_min;
+
+    /**
+     * number of reference frames
+     * - encoding: Set by user.
+     * - decoding: Set by lavc.
+     */
+    int refs;
+
+    /**
+     * chroma qp offset from luma
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int chromaoffset;
+
+    /**
+     * Multiplied by qscale for each frame and added to scene_change_score.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int scenechange_factor;
+
+    /**
+     *
+     * Note: Value depends upon the compare function used for fullpel ME.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int mv0_threshold;
+
+    /**
+     * Adjust sensitivity of b_frame_strategy 1.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int b_sensitivity;
+
+    /**
+     * Chromaticity coordinates of the source primaries.
+     * - encoding: Set by user
+     * - decoding: Set by libavcodec
+     */
+    enum AVColorPrimaries color_primaries;
+
+    /**
+     * Color Transfer Characteristic.
+     * - encoding: Set by user
+     * - decoding: Set by libavcodec
+     */
+    enum AVColorTransferCharacteristic color_trc;
+
+    /**
+     * YUV colorspace type.
+     * - encoding: Set by user
+     * - decoding: Set by libavcodec
+     */
+    enum AVColorSpace colorspace;
+
+    /**
+     * MPEG vs JPEG YUV range.
+     * - encoding: Set by user
+     * - decoding: Set by libavcodec
+     */
+    enum AVColorRange color_range;
+
+    /**
+     * This defines the location of chroma samples.
+     * - encoding: Set by user
+     * - decoding: Set by libavcodec
+     */
+    enum AVChromaLocation chroma_sample_location;
+
+    /**
+     * Number of slices.
+     * Indicates number of picture subdivisions. Used for parallelized
+     * decoding.
+     * - encoding: Set by user
+     * - decoding: unused
+     */
+    int slices;
+
+    /** Field order
+     * - encoding: set by libavcodec
+     * - decoding: Set by libavcodec
+     */
+    enum AVFieldOrder field_order;
+
+    /* audio only */
+    int sample_rate; ///< samples per second
+    int channels;    ///< number of audio channels
+
+    /**
+     * audio sample format
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    enum AVSampleFormat sample_fmt;  ///< sample format
+
+    /* The following data should not be initialized. */
+    /**
+     * Number of samples per channel in an audio frame.
+     *
+     * - encoding: set by libavcodec in avcodec_open2(). Each submitted frame
+     *   except the last must contain exactly frame_size samples per channel.
+     *   May be 0 when the codec has CODEC_CAP_VARIABLE_FRAME_SIZE set, then the
+     *   frame size is not restricted.
+     * - decoding: may be set by some decoders to indicate constant frame size
+     */
+    int frame_size;
+
+    /**
+     * Frame counter, set by libavcodec.
+     *
+     * - decoding: total number of frames returned from the decoder so far.
+     * - encoding: total number of frames passed to the encoder so far.
+     *
+     *   @note the counter is not incremented if encoding/decoding resulted in
+     *   an error.
+     */
+    int frame_number;
+
+    /**
+     * number of bytes per packet if constant and known or 0
+     * Used by some WAV based audio codecs.
+     */
+    int block_align;
+
+    /**
+     * Audio cutoff bandwidth (0 means "automatic")
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int cutoff;
+
+#if FF_API_REQUEST_CHANNELS
+    /**
+     * Decoder should decode to this many channels if it can (0 for default)
+     * - encoding: unused
+     * - decoding: Set by user.
+     * @deprecated Deprecated in favor of request_channel_layout.
+     */
+    attribute_deprecated int request_channels;
+#endif
+
+    /**
+     * Audio channel layout.
+     * - encoding: set by user.
+     * - decoding: set by libavcodec.
+     */
+    uint64_t channel_layout;
+
+    /**
+     * Request decoder to use this channel layout if it can (0 for default)
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    uint64_t request_channel_layout;
+
+    /**
+     * Type of service that the audio stream conveys.
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    enum AVAudioServiceType audio_service_type;
+
+    /**
+     * Used to request a sample format from the decoder.
+     * - encoding: unused.
+     * - decoding: Set by user.
+     */
+    enum AVSampleFormat request_sample_fmt;
+
+#if FF_API_GET_BUFFER
+    /**
+     * Called at the beginning of each frame to get a buffer for it.
+     *
+     * The function will set AVFrame.data[], AVFrame.linesize[].
+     * AVFrame.extended_data[] must also be set, but it should be the same as
+     * AVFrame.data[] except for planar audio with more channels than can fit
+     * in AVFrame.data[]. In that case, AVFrame.data[] shall still contain as
+     * many data pointers as it can hold.
+     *
+     * if CODEC_CAP_DR1 is not set then get_buffer() must call
+     * avcodec_default_get_buffer() instead of providing buffers allocated by
+     * some other means.
+     *
+     * AVFrame.data[] should be 32- or 16-byte-aligned unless the CPU doesn't
+     * need it. avcodec_default_get_buffer() aligns the output buffer properly,
+     * but if get_buffer() is overridden then alignment considerations should
+     * be taken into account.
+     *
+     * @see avcodec_default_get_buffer()
+     *
+     * Video:
+     *
+     * If pic.reference is set then the frame will be read later by libavcodec.
+     * avcodec_align_dimensions2() should be used to find the required width and
+     * height, as they normally need to be rounded up to the next multiple of 16.
+     *
+     * If frame multithreading is used and thread_safe_callbacks is set,
+     * it may be called from a different thread, but not from more than one at
+     * once. Does not need to be reentrant.
+     *
+     * @see release_buffer(), reget_buffer()
+     * @see avcodec_align_dimensions2()
+     *
+     * Audio:
+     *
+     * Decoders request a buffer of a particular size by setting
+     * AVFrame.nb_samples prior to calling get_buffer(). The decoder may,
+     * however, utilize only part of the buffer by setting AVFrame.nb_samples
+     * to a smaller value in the output frame.
+     *
+     * Decoders cannot use the buffer after returning from
+     * avcodec_decode_audio4(), so they will not call release_buffer(), as it
+     * is assumed to be released immediately upon return. In some rare cases,
+     * a decoder may need to call get_buffer() more than once in a single
+     * call to avcodec_decode_audio4(). In that case, when get_buffer() is
+     * called again after it has already been called once, the previously
+     * acquired buffer is assumed to be released at that time and may not be
+     * reused by the decoder.
+     *
+     * As a convenience, av_samples_get_buffer_size() and
+     * av_samples_fill_arrays() in libavutil may be used by custom get_buffer()
+     * functions to find the required data size and to fill data pointers and
+     * linesize. In AVFrame.linesize, only linesize[0] may be set for audio
+     * since all planes must be the same size.
+     *
+     * @see av_samples_get_buffer_size(), av_samples_fill_arrays()
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec, user can override.
+     *
+     * @deprecated use get_buffer2()
+     */
+    attribute_deprecated
+    int (*get_buffer)(struct AVCodecContext *c, AVFrame *pic);
+
+    /**
+     * Called to release buffers which were allocated with get_buffer.
+     * A released buffer can be reused in get_buffer().
+     * pic.data[*] must be set to NULL.
+     * May be called from a different thread if frame multithreading is used,
+     * but not by more than one thread at once, so does not need to be reentrant.
+     * - encoding: unused
+     * - decoding: Set by libavcodec, user can override.
+     *
+     * @deprecated custom freeing callbacks should be set from get_buffer2()
+     */
+    attribute_deprecated
+    void (*release_buffer)(struct AVCodecContext *c, AVFrame *pic);
+
+    /**
+     * Called at the beginning of a frame to get cr buffer for it.
+     * Buffer type (size, hints) must be the same. libavcodec won't check it.
+     * libavcodec will pass previous buffer in pic, function should return
+     * same buffer or new buffer with old frame "painted" into it.
+     * If pic.data[0] == NULL must behave like get_buffer().
+     * if CODEC_CAP_DR1 is not set then reget_buffer() must call
+     * avcodec_default_reget_buffer() instead of providing buffers allocated by
+     * some other means.
+     * - encoding: unused
+     * - decoding: Set by libavcodec, user can override.
+     */
+    attribute_deprecated
+    int (*reget_buffer)(struct AVCodecContext *c, AVFrame *pic);
+#endif
+
+    /**
+     * This callback is called at the beginning of each frame to get data
+     * buffer(s) for it. There may be one contiguous buffer for all the data or
+     * there may be a buffer per each data plane or anything in between. What
+     * this means is, you may set however many entries in buf[] you feel necessary.
+     * Each buffer must be reference-counted using the AVBuffer API (see description
+     * of buf[] below).
+     *
+     * The following fields will be set in the frame before this callback is
+     * called:
+     * - format
+     * - width, height (video only)
+     * - sample_rate, channel_layout, nb_samples (audio only)
+     * Their values may differ from the corresponding values in
+     * AVCodecContext. This callback must use the frame values, not the codec
+     * context values, to calculate the required buffer size.
+     *
+     * This callback must fill the following fields in the frame:
+     * - data[]
+     * - linesize[]
+     * - extended_data:
+     *   * if the data is planar audio with more than 8 channels, then this
+     *     callback must allocate and fill extended_data to contain all pointers
+     *     to all data planes. data[] must hold as many pointers as it can.
+     *     extended_data must be allocated with av_malloc() and will be freed in
+     *     av_frame_unref().
+     *   * otherwise exended_data must point to data
+     * - buf[] must contain one or more pointers to AVBufferRef structures. Each of
+     *   the frame's data and extended_data pointers must be contained in these. That
+     *   is, one AVBufferRef for each allocated chunk of memory, not necessarily one
+     *   AVBufferRef per data[] entry. See: av_buffer_create(), av_buffer_alloc(),
+     *   and av_buffer_ref().
+     * - extended_buf and nb_extended_buf must be allocated with av_malloc() by
+     *   this callback and filled with the extra buffers if there are more
+     *   buffers than buf[] can hold. extended_buf will be freed in
+     *   av_frame_unref().
+     *
+     * If CODEC_CAP_DR1 is not set then get_buffer2() must call
+     * avcodec_default_get_buffer2() instead of providing buffers allocated by
+     * some other means.
+     *
+     * Each data plane must be aligned to the maximum required by the target
+     * CPU.
+     *
+     * @see avcodec_default_get_buffer2()
+     *
+     * Video:
+     *
+     * If AV_GET_BUFFER_FLAG_REF is set in flags then the frame may be reused
+     * (read and/or written to if it is writable) later by libavcodec.
+     *
+     * avcodec_align_dimensions2() should be used to find the required width and
+     * height, as they normally need to be rounded up to the next multiple of 16.
+     *
+     * If frame multithreading is used and thread_safe_callbacks is set,
+     * this callback may be called from a different thread, but not from more
+     * than one at once. Does not need to be reentrant.
+     *
+     * @see avcodec_align_dimensions2()
+     *
+     * Audio:
+     *
+     * Decoders request a buffer of a particular size by setting
+     * AVFrame.nb_samples prior to calling get_buffer2(). The decoder may,
+     * however, utilize only part of the buffer by setting AVFrame.nb_samples
+     * to a smaller value in the output frame.
+     *
+     * As a convenience, av_samples_get_buffer_size() and
+     * av_samples_fill_arrays() in libavutil may be used by custom get_buffer2()
+     * functions to find the required data size and to fill data pointers and
+     * linesize. In AVFrame.linesize, only linesize[0] may be set for audio
+     * since all planes must be the same size.
+     *
+     * @see av_samples_get_buffer_size(), av_samples_fill_arrays()
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec, user can override.
+     */
+    int (*get_buffer2)(struct AVCodecContext *s, AVFrame *frame, int flags);
+
+    /**
+     * If non-zero, the decoded audio and video frames returned from
+     * avcodec_decode_video2() and avcodec_decode_audio4() are reference-counted
+     * and are valid indefinitely. The caller must free them with
+     * av_frame_unref() when they are not needed anymore.
+     * Otherwise, the decoded frames must not be freed by the caller and are
+     * only valid until the next decode call.
+     *
+     * - encoding: unused
+     * - decoding: set by the caller before avcodec_open2().
+     */
+    int refcounted_frames;
+
+    /* - encoding parameters */
+    float qcompress;  ///< amount of qscale change between easy & hard scenes (0.0-1.0)
+    float qblur;      ///< amount of qscale smoothing over time (0.0-1.0)
+
+    /**
+     * minimum quantizer
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int qmin;
+
+    /**
+     * maximum quantizer
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int qmax;
+
+    /**
+     * maximum quantizer difference between frames
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int max_qdiff;
+
+    /**
+     * ratecontrol qmin qmax limiting method
+     * 0-> clipping, 1-> use a nice continuous function to limit qscale wthin qmin/qmax.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float rc_qsquish;
+
+    float rc_qmod_amp;
+    int rc_qmod_freq;
+
+    /**
+     * decoder bitstream buffer size
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int rc_buffer_size;
+
+    /**
+     * ratecontrol override, see RcOverride
+     * - encoding: Allocated/set/freed by user.
+     * - decoding: unused
+     */
+    int rc_override_count;
+    RcOverride *rc_override;
+
+    /**
+     * rate control equation
+     * - encoding: Set by user
+     * - decoding: unused
+     */
+    const char *rc_eq;
+
+    /**
+     * maximum bitrate
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int rc_max_rate;
+
+    /**
+     * minimum bitrate
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int rc_min_rate;
+
+    float rc_buffer_aggressivity;
+
+    /**
+     * initial complexity for pass1 ratecontrol
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    float rc_initial_cplx;
+
+    /**
+     * Ratecontrol attempt to use, at maximum, <value> of what can be used without an underflow.
+     * - encoding: Set by user.
+     * - decoding: unused.
+     */
+    float rc_max_available_vbv_use;
+
+    /**
+     * Ratecontrol attempt to use, at least, <value> times the amount needed to prevent a vbv overflow.
+     * - encoding: Set by user.
+     * - decoding: unused.
+     */
+    float rc_min_vbv_overflow_use;
+
+    /**
+     * Number of bits which should be loaded into the rc buffer before decoding starts.
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int rc_initial_buffer_occupancy;
+
+#define FF_CODER_TYPE_VLC       0
+#define FF_CODER_TYPE_AC        1
+#define FF_CODER_TYPE_RAW       2
+#define FF_CODER_TYPE_RLE       3
+#define FF_CODER_TYPE_DEFLATE   4
+    /**
+     * coder type
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int coder_type;
+
+    /**
+     * context model
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int context_model;
+
+    /**
+     * minimum Lagrange multipler
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int lmin;
+
+    /**
+     * maximum Lagrange multipler
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int lmax;
+
+    /**
+     * frame skip threshold
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int frame_skip_threshold;
+
+    /**
+     * frame skip factor
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int frame_skip_factor;
+
+    /**
+     * frame skip exponent
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int frame_skip_exp;
+
+    /**
+     * frame skip comparison function
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int frame_skip_cmp;
+
+    /**
+     * trellis RD quantization
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int trellis;
+
+    /**
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int min_prediction_order;
+
+    /**
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int max_prediction_order;
+
+    /**
+     * GOP timecode frame start number, in non drop frame format
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int64_t timecode_frame_start;
+
+    /* The RTP callback: This function is called    */
+    /* every time the encoder has a packet to send. */
+    /* It depends on the encoder if the data starts */
+    /* with a Start Code (it should). H.263 does.   */
+    /* mb_nb contains the number of macroblocks     */
+    /* encoded in the RTP payload.                  */
+    void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb);
+
+    int rtp_payload_size;   /* The size of the RTP payload: the coder will  */
+                            /* do its best to deliver a chunk with size     */
+                            /* below rtp_payload_size, the chunk will start */
+                            /* with a start code on some codecs like H.263. */
+                            /* This doesn't take account of any particular  */
+                            /* headers inside the transmitted RTP payload.  */
+
+    /* statistics, used for 2-pass encoding */
+    int mv_bits;
+    int header_bits;
+    int i_tex_bits;
+    int p_tex_bits;
+    int i_count;
+    int p_count;
+    int skip_count;
+    int misc_bits;
+
+    /**
+     * number of bits used for the previously encoded frame
+     * - encoding: Set by libavcodec.
+     * - decoding: unused
+     */
+    int frame_bits;
+
+    /**
+     * pass1 encoding statistics output buffer
+     * - encoding: Set by libavcodec.
+     * - decoding: unused
+     */
+    char *stats_out;
+
+    /**
+     * pass2 encoding statistics input buffer
+     * Concatenated stuff from stats_out of pass1 should be placed here.
+     * - encoding: Allocated/set/freed by user.
+     * - decoding: unused
+     */
+    char *stats_in;
+
+    /**
+     * Work around bugs in encoders which sometimes cannot be detected automatically.
+     * - encoding: Set by user
+     * - decoding: Set by user
+     */
+    int workaround_bugs;
+#define FF_BUG_AUTODETECT       1  ///< autodetection
+#if FF_API_OLD_MSMPEG4
+#define FF_BUG_OLD_MSMPEG4      2
+#endif
+#define FF_BUG_XVID_ILACE       4
+#define FF_BUG_UMP4             8
+#define FF_BUG_NO_PADDING       16
+#define FF_BUG_AMV              32
+#if FF_API_AC_VLC
+#define FF_BUG_AC_VLC           0  ///< Will be removed, libavcodec can now handle these non-compliant files by default.
+#endif
+#define FF_BUG_QPEL_CHROMA      64
+#define FF_BUG_STD_QPEL         128
+#define FF_BUG_QPEL_CHROMA2     256
+#define FF_BUG_DIRECT_BLOCKSIZE 512
+#define FF_BUG_EDGE             1024
+#define FF_BUG_HPEL_CHROMA      2048
+#define FF_BUG_DC_CLIP          4096
+#define FF_BUG_MS               8192 ///< Work around various bugs in Microsoft's broken decoders.
+#define FF_BUG_TRUNCATED       16384
+
+    /**
+     * strictly follow the standard (MPEG4, ...).
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     * Setting this to STRICT or higher means the encoder and decoder will
+     * generally do stupid things, whereas setting it to unofficial or lower
+     * will mean the encoder might produce output that is not supported by all
+     * spec-compliant decoders. Decoders don't differentiate between normal,
+     * unofficial and experimental (that is, they always try to decode things
+     * when they can) unless they are explicitly asked to behave stupidly
+     * (=strictly conform to the specs)
+     */
+    int strict_std_compliance;
+#define FF_COMPLIANCE_VERY_STRICT   2 ///< Strictly conform to an older more strict version of the spec or reference software.
+#define FF_COMPLIANCE_STRICT        1 ///< Strictly conform to all the things in the spec no matter what consequences.
+#define FF_COMPLIANCE_NORMAL        0
+#define FF_COMPLIANCE_UNOFFICIAL   -1 ///< Allow unofficial extensions
+#define FF_COMPLIANCE_EXPERIMENTAL -2 ///< Allow nonstandardized experimental things.
+
+    /**
+     * error concealment flags
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    int error_concealment;
+#define FF_EC_GUESS_MVS   1
+#define FF_EC_DEBLOCK     2
+
+    /**
+     * debug
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int debug;
+#define FF_DEBUG_PICT_INFO   1
+#define FF_DEBUG_RC          2
+#define FF_DEBUG_BITSTREAM   4
+#define FF_DEBUG_MB_TYPE     8
+#define FF_DEBUG_QP          16
+#if FF_API_DEBUG_MV
+/**
+ * @deprecated this option does nothing
+ */
+#define FF_DEBUG_MV          32
+#endif
+#define FF_DEBUG_DCT_COEFF   0x00000040
+#define FF_DEBUG_SKIP        0x00000080
+#define FF_DEBUG_STARTCODE   0x00000100
+#define FF_DEBUG_PTS         0x00000200
+#define FF_DEBUG_ER          0x00000400
+#define FF_DEBUG_MMCO        0x00000800
+#define FF_DEBUG_BUGS        0x00001000
+#if FF_API_DEBUG_MV
+#define FF_DEBUG_VIS_QP      0x00002000
+#define FF_DEBUG_VIS_MB_TYPE 0x00004000
+#endif
+#define FF_DEBUG_BUFFERS     0x00008000
+#define FF_DEBUG_THREADS     0x00010000
+
+#if FF_API_DEBUG_MV
+    /**
+     * @deprecated this option does not have any effect
+     */
+    attribute_deprecated
+    int debug_mv;
+#define FF_DEBUG_VIS_MV_P_FOR  0x00000001 //visualize forward predicted MVs of P frames
+#define FF_DEBUG_VIS_MV_B_FOR  0x00000002 //visualize forward predicted MVs of B frames
+#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
+#endif
+
+    /**
+     * Error recognition; may misdetect some more or less valid parts as errors.
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    int err_recognition;
+
+/**
+ * Verify checksums embedded in the bitstream (could be of either encoded or
+ * decoded data, depending on the codec) and print an error message on mismatch.
+ * If AV_EF_EXPLODE is also set, a mismatching checksum will result in the
+ * decoder returning an error.
+ */
+#define AV_EF_CRCCHECK  (1<<0)
+#define AV_EF_BITSTREAM (1<<1)
+#define AV_EF_BUFFER    (1<<2)
+#define AV_EF_EXPLODE   (1<<3)
+
+    /**
+     * opaque 64bit number (generally a PTS) that will be reordered and
+     * output in AVFrame.reordered_opaque
+     * @deprecated in favor of pkt_pts
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    int64_t reordered_opaque;
+
+    /**
+     * Hardware accelerator in use
+     * - encoding: unused.
+     * - decoding: Set by libavcodec
+     */
+    struct AVHWAccel *hwaccel;
+
+    /**
+     * Hardware accelerator context.
+     * For some hardware accelerators, a global context needs to be
+     * provided by the user. In that case, this holds display-dependent
+     * data Libav cannot instantiate itself. Please refer to the
+     * Libav HW accelerator documentation to know how to fill this
+     * is. e.g. for VA API, this is a struct vaapi_context.
+     * - encoding: unused
+     * - decoding: Set by user
+     */
+    void *hwaccel_context;
+
+    /**
+     * error
+     * - encoding: Set by libavcodec if flags&CODEC_FLAG_PSNR.
+     * - decoding: unused
+     */
+    uint64_t error[AV_NUM_DATA_POINTERS];
+
+    /**
+     * DCT algorithm, see FF_DCT_* below
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int dct_algo;
+#define FF_DCT_AUTO    0
+#define FF_DCT_FASTINT 1
+#define FF_DCT_INT     2
+#define FF_DCT_MMX     3
+#define FF_DCT_ALTIVEC 5
+#define FF_DCT_FAAN    6
+
+    /**
+     * IDCT algorithm, see FF_IDCT_* below.
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int idct_algo;
+#define FF_IDCT_AUTO          0
+#define FF_IDCT_INT           1
+#define FF_IDCT_SIMPLE        2
+#define FF_IDCT_SIMPLEMMX     3
+#define FF_IDCT_ARM           7
+#define FF_IDCT_ALTIVEC       8
+#define FF_IDCT_SH4           9
+#define FF_IDCT_SIMPLEARM     10
+#define FF_IDCT_IPP           13
+#define FF_IDCT_XVIDMMX       14
+#define FF_IDCT_SIMPLEARMV5TE 16
+#define FF_IDCT_SIMPLEARMV6   17
+#define FF_IDCT_SIMPLEVIS     18
+#define FF_IDCT_FAAN          20
+#define FF_IDCT_SIMPLENEON    22
+#if FF_API_ARCH_ALPHA
+#define FF_IDCT_SIMPLEALPHA   23
+#endif
+
+    /**
+     * bits per sample/pixel from the demuxer (needed for huffyuv).
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by user.
+     */
+     int bits_per_coded_sample;
+
+    /**
+     * Bits per sample/pixel of internal libavcodec pixel/sample format.
+     * - encoding: set by user.
+     * - decoding: set by libavcodec.
+     */
+    int bits_per_raw_sample;
+
+#if FF_API_LOWRES
+    /**
+     * low resolution decoding, 1-> 1/2 size, 2->1/4 size
+     * - encoding: unused
+     * - decoding: Set by user.
+     *
+     * @deprecated use decoder private options instead
+     */
+    attribute_deprecated int lowres;
+#endif
+
+    /**
+     * the picture in the bitstream
+     * - encoding: Set by libavcodec.
+     * - decoding: unused
+     */
+    AVFrame *coded_frame;
+
+    /**
+     * thread count
+     * is used to decide how many independent tasks should be passed to execute()
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int thread_count;
+
+    /**
+     * Which multithreading methods to use.
+     * Use of FF_THREAD_FRAME will increase decoding delay by one frame per thread,
+     * so clients which cannot provide future frames should not use it.
+     *
+     * - encoding: Set by user, otherwise the default is used.
+     * - decoding: Set by user, otherwise the default is used.
+     */
+    int thread_type;
+#define FF_THREAD_FRAME   1 ///< Decode more than one frame at once
+#define FF_THREAD_SLICE   2 ///< Decode more than one part of a single frame at once
+
+    /**
+     * Which multithreading methods are in use by the codec.
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by libavcodec.
+     */
+    int active_thread_type;
+
+    /**
+     * Set by the client if its custom get_buffer() callback can be called
+     * synchronously from another thread, which allows faster multithreaded decoding.
+     * draw_horiz_band() will be called from other threads regardless of this setting.
+     * Ignored if the default get_buffer() is used.
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int thread_safe_callbacks;
+
+    /**
+     * The codec may call this to execute several independent things.
+     * It will return only after finishing all tasks.
+     * The user may replace this with some multithreaded implementation,
+     * the default implementation will execute the parts serially.
+     * @param count the number of things to execute
+     * - encoding: Set by libavcodec, user can override.
+     * - decoding: Set by libavcodec, user can override.
+     */
+    int (*execute)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg), void *arg2, int *ret, int count, int size);
+
+    /**
+     * The codec may call this to execute several independent things.
+     * It will return only after finishing all tasks.
+     * The user may replace this with some multithreaded implementation,
+     * the default implementation will execute the parts serially.
+     * Also see avcodec_thread_init and e.g. the --enable-pthread configure option.
+     * @param c context passed also to func
+     * @param count the number of things to execute
+     * @param arg2 argument passed unchanged to func
+     * @param ret return values of executed functions, must have space for "count" values. May be NULL.
+     * @param func function that will be called count times, with jobnr from 0 to count-1.
+     *             threadnr will be in the range 0 to c->thread_count-1 < MAX_THREADS and so that no
+     *             two instances of func executing at the same time will have the same threadnr.
+     * @return always 0 currently, but code should handle a future improvement where when any call to func
+     *         returns < 0 no further calls to func may be done and < 0 is returned.
+     * - encoding: Set by libavcodec, user can override.
+     * - decoding: Set by libavcodec, user can override.
+     */
+    int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count);
+
+#if FF_API_THREAD_OPAQUE
+    /**
+     * @deprecated this field should not be used from outside of lavc
+     */
+    attribute_deprecated
+    void *thread_opaque;
+#endif
+
+    /**
+     * noise vs. sse weight for the nsse comparsion function
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+     int nsse_weight;
+
+    /**
+     * profile
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+     int profile;
+#define FF_PROFILE_UNKNOWN -99
+#define FF_PROFILE_RESERVED -100
+
+#define FF_PROFILE_AAC_MAIN 0
+#define FF_PROFILE_AAC_LOW  1
+#define FF_PROFILE_AAC_SSR  2
+#define FF_PROFILE_AAC_LTP  3
+#define FF_PROFILE_AAC_HE   4
+#define FF_PROFILE_AAC_HE_V2 28
+#define FF_PROFILE_AAC_LD   22
+#define FF_PROFILE_AAC_ELD  38
+#define FF_PROFILE_MPEG2_AAC_LOW 128
+#define FF_PROFILE_MPEG2_AAC_HE  131
+
+#define FF_PROFILE_DTS         20
+#define FF_PROFILE_DTS_ES      30
+#define FF_PROFILE_DTS_96_24   40
+#define FF_PROFILE_DTS_HD_HRA  50
+#define FF_PROFILE_DTS_HD_MA   60
+
+#define FF_PROFILE_MPEG2_422    0
+#define FF_PROFILE_MPEG2_HIGH   1
+#define FF_PROFILE_MPEG2_SS     2
+#define FF_PROFILE_MPEG2_SNR_SCALABLE  3
+#define FF_PROFILE_MPEG2_MAIN   4
+#define FF_PROFILE_MPEG2_SIMPLE 5
+
+#define FF_PROFILE_H264_CONSTRAINED  (1<<9)  // 8+1; constraint_set1_flag
+#define FF_PROFILE_H264_INTRA        (1<<11) // 8+3; constraint_set3_flag
+
+#define FF_PROFILE_H264_BASELINE             66
+#define FF_PROFILE_H264_CONSTRAINED_BASELINE (66|FF_PROFILE_H264_CONSTRAINED)
+#define FF_PROFILE_H264_MAIN                 77
+#define FF_PROFILE_H264_EXTENDED             88
+#define FF_PROFILE_H264_HIGH                 100
+#define FF_PROFILE_H264_HIGH_10              110
+#define FF_PROFILE_H264_HIGH_10_INTRA        (110|FF_PROFILE_H264_INTRA)
+#define FF_PROFILE_H264_HIGH_422             122
+#define FF_PROFILE_H264_HIGH_422_INTRA       (122|FF_PROFILE_H264_INTRA)
+#define FF_PROFILE_H264_HIGH_444             144
+#define FF_PROFILE_H264_HIGH_444_PREDICTIVE  244
+#define FF_PROFILE_H264_HIGH_444_INTRA       (244|FF_PROFILE_H264_INTRA)
+#define FF_PROFILE_H264_CAVLC_444            44
+
+#define FF_PROFILE_VC1_SIMPLE   0
+#define FF_PROFILE_VC1_MAIN     1
+#define FF_PROFILE_VC1_COMPLEX  2
+#define FF_PROFILE_VC1_ADVANCED 3
+
+#define FF_PROFILE_MPEG4_SIMPLE                     0
+#define FF_PROFILE_MPEG4_SIMPLE_SCALABLE            1
+#define FF_PROFILE_MPEG4_CORE                       2
+#define FF_PROFILE_MPEG4_MAIN                       3
+#define FF_PROFILE_MPEG4_N_BIT                      4
+#define FF_PROFILE_MPEG4_SCALABLE_TEXTURE           5
+#define FF_PROFILE_MPEG4_SIMPLE_FACE_ANIMATION      6
+#define FF_PROFILE_MPEG4_BASIC_ANIMATED_TEXTURE     7
+#define FF_PROFILE_MPEG4_HYBRID                     8
+#define FF_PROFILE_MPEG4_ADVANCED_REAL_TIME         9
+#define FF_PROFILE_MPEG4_CORE_SCALABLE             10
+#define FF_PROFILE_MPEG4_ADVANCED_CODING           11
+#define FF_PROFILE_MPEG4_ADVANCED_CORE             12
+#define FF_PROFILE_MPEG4_ADVANCED_SCALABLE_TEXTURE 13
+#define FF_PROFILE_MPEG4_SIMPLE_STUDIO             14
+#define FF_PROFILE_MPEG4_ADVANCED_SIMPLE           15
+
+#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_0   0
+#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_1   1
+#define FF_PROFILE_JPEG2000_CSTREAM_NO_RESTRICTION  2
+#define FF_PROFILE_JPEG2000_DCINEMA_2K              3
+#define FF_PROFILE_JPEG2000_DCINEMA_4K              4
+
+
+#define FF_PROFILE_HEVC_MAIN                        1
+#define FF_PROFILE_HEVC_MAIN_10                     2
+#define FF_PROFILE_HEVC_MAIN_STILL_PICTURE          3
+
+    /**
+     * level
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+     int level;
+#define FF_LEVEL_UNKNOWN -99
+
+    /**
+     *
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    enum AVDiscard skip_loop_filter;
+
+    /**
+     *
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    enum AVDiscard skip_idct;
+
+    /**
+     *
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    enum AVDiscard skip_frame;
+
+    /**
+     * Header containing style information for text subtitles.
+     * For SUBTITLE_ASS subtitle type, it should contain the whole ASS
+     * [Script Info] and [V4+ Styles] section, plus the [Events] line and
+     * the Format line following. It shouldn't include any Dialogue line.
+     * - encoding: Set/allocated/freed by user (before avcodec_open2())
+     * - decoding: Set/allocated/freed by libavcodec (by avcodec_open2())
+     */
+    uint8_t *subtitle_header;
+    int subtitle_header_size;
+
+#if FF_API_ERROR_RATE
+    /**
+     * @deprecated use the 'error_rate' private AVOption of the mpegvideo
+     * encoders
+     */
+    attribute_deprecated
+    int error_rate;
+#endif
+
+#if FF_API_CODEC_PKT
+    /**
+     * @deprecated this field is not supposed to be accessed from outside lavc
+     */
+    attribute_deprecated
+    AVPacket *pkt;
+#endif
+
+    /**
+     * VBV delay coded in the last frame (in periods of a 27 MHz clock).
+     * Used for compliant TS muxing.
+     * - encoding: Set by libavcodec.
+     * - decoding: unused.
+     */
+    uint64_t vbv_delay;
+} AVCodecContext;
+
+/**
+ * AVProfile.
+ */
+typedef struct AVProfile {
+    int profile;
+    const char *name; ///< short name for the profile
+} AVProfile;
+
+typedef struct AVCodecDefault AVCodecDefault;
+
+struct AVSubtitle;
+
+/**
+ * AVCodec.
+ */
+typedef struct AVCodec {
+    /**
+     * Name of the codec implementation.
+     * The name is globally unique among encoders and among decoders (but an
+     * encoder and a decoder can share the same name).
+     * This is the primary way to find a codec from the user perspective.
+     */
+    const char *name;
+    /**
+     * Descriptive name for the codec, meant to be more human readable than name.
+     * You should use the NULL_IF_CONFIG_SMALL() macro to define it.
+     */
+    const char *long_name;
+    enum AVMediaType type;
+    enum AVCodecID id;
+    /**
+     * Codec capabilities.
+     * see CODEC_CAP_*
+     */
+    int capabilities;
+    const AVRational *supported_framerates; ///< array of supported framerates, or NULL if any, array is terminated by {0,0}
+    const enum AVPixelFormat *pix_fmts;     ///< array of supported pixel formats, or NULL if unknown, array is terminated by -1
+    const int *supported_samplerates;       ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
+    const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1
+    const uint64_t *channel_layouts;         ///< array of support channel layouts, or NULL if unknown. array is terminated by 0
+#if FF_API_LOWRES
+    attribute_deprecated uint8_t max_lowres; ///< maximum value for lowres supported by the decoder
+#endif
+    const AVClass *priv_class;              ///< AVClass for the private context
+    const AVProfile *profiles;              ///< array of recognized profiles, or NULL if unknown, array is terminated by {FF_PROFILE_UNKNOWN}
+
+    /*****************************************************************
+     * No fields below this line are part of the public API. They
+     * may not be used outside of libavcodec and can be changed and
+     * removed at will.
+     * New public fields should be added right above.
+     *****************************************************************
+     */
+    int priv_data_size;
+    struct AVCodec *next;
+    /**
+     * @name Frame-level threading support functions
+     * @{
+     */
+    /**
+     * If defined, called on thread contexts when they are created.
+     * If the codec allocates writable tables in init(), re-allocate them here.
+     * priv_data will be set to a copy of the original.
+     */
+    int (*init_thread_copy)(AVCodecContext *);
+    /**
+     * Copy necessary context variables from a previous thread context to the current one.
+     * If not defined, the next thread will start automatically; otherwise, the codec
+     * must call ff_thread_finish_setup().
+     *
+     * dst and src will (rarely) point to the same context, in which case memcpy should be skipped.
+     */
+    int (*update_thread_context)(AVCodecContext *dst, const AVCodecContext *src);
+    /** @} */
+
+    /**
+     * Private codec-specific defaults.
+     */
+    const AVCodecDefault *defaults;
+
+    /**
+     * Initialize codec static data, called from avcodec_register().
+     */
+    void (*init_static_data)(struct AVCodec *codec);
+
+    int (*init)(AVCodecContext *);
+    int (*encode_sub)(AVCodecContext *, uint8_t *buf, int buf_size,
+                      const struct AVSubtitle *sub);
+    /**
+     * Encode data to an AVPacket.
+     *
+     * @param      avctx          codec context
+     * @param      avpkt          output AVPacket (may contain a user-provided buffer)
+     * @param[in]  frame          AVFrame containing the raw data to be encoded
+     * @param[out] got_packet_ptr encoder sets to 0 or 1 to indicate that a
+     *                            non-empty packet was returned in avpkt.
+     * @return 0 on success, negative error code on failure
+     */
+    int (*encode2)(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame,
+                   int *got_packet_ptr);
+    int (*decode)(AVCodecContext *, void *outdata, int *outdata_size, AVPacket *avpkt);
+    int (*close)(AVCodecContext *);
+    /**
+     * Flush buffers.
+     * Will be called when seeking
+     */
+    void (*flush)(AVCodecContext *);
+} AVCodec;
+
+/**
+ * AVHWAccel.
+ */
+typedef struct AVHWAccel {
+    /**
+     * Name of the hardware accelerated codec.
+     * The name is globally unique among encoders and among decoders (but an
+     * encoder and a decoder can share the same name).
+     */
+    const char *name;
+
+    /**
+     * Type of codec implemented by the hardware accelerator.
+     *
+     * See AVMEDIA_TYPE_xxx
+     */
+    enum AVMediaType type;
+
+    /**
+     * Codec implemented by the hardware accelerator.
+     *
+     * See AV_CODEC_ID_xxx
+     */
+    enum AVCodecID id;
+
+    /**
+     * Supported pixel format.
+     *
+     * Only hardware accelerated formats are supported here.
+     */
+    enum AVPixelFormat pix_fmt;
+
+    /**
+     * Hardware accelerated codec capabilities.
+     * see FF_HWACCEL_CODEC_CAP_*
+     */
+    int capabilities;
+
+    struct AVHWAccel *next;
+
+    /**
+     * Called at the beginning of each frame or field picture.
+     *
+     * Meaningful frame information (codec specific) is guaranteed to
+     * be parsed at this point. This function is mandatory.
+     *
+     * Note that buf can be NULL along with buf_size set to 0.
+     * Otherwise, this means the whole frame is available at this point.
+     *
+     * @param avctx the codec context
+     * @param buf the frame data buffer base
+     * @param buf_size the size of the frame in bytes
+     * @return zero if successful, a negative value otherwise
+     */
+    int (*start_frame)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size);
+
+    /**
+     * Callback for each slice.
+     *
+     * Meaningful slice information (codec specific) is guaranteed to
+     * be parsed at this point. This function is mandatory.
+     *
+     * @param avctx the codec context
+     * @param buf the slice data buffer base
+     * @param buf_size the size of the slice in bytes
+     * @return zero if successful, a negative value otherwise
+     */
+    int (*decode_slice)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size);
+
+    /**
+     * Called at the end of each frame or field picture.
+     *
+     * The whole picture is parsed at this point and can now be sent
+     * to the hardware accelerator. This function is mandatory.
+     *
+     * @param avctx the codec context
+     * @return zero if successful, a negative value otherwise
+     */
+    int (*end_frame)(AVCodecContext *avctx);
+
+    /**
+     * Size of HW accelerator private data.
+     *
+     * Private data is allocated with av_mallocz() before
+     * AVCodecContext.get_buffer() and deallocated after
+     * AVCodecContext.release_buffer().
+     */
+    int priv_data_size;
+} AVHWAccel;
+
+/**
+ * @defgroup lavc_picture AVPicture
+ *
+ * Functions for working with AVPicture
+ * @{
+ */
+
+/**
+ * four components are given, that's all.
+ * the last component is alpha
+ */
+typedef struct AVPicture {
+    uint8_t *data[AV_NUM_DATA_POINTERS];
+    int linesize[AV_NUM_DATA_POINTERS];     ///< number of bytes per line
+} AVPicture;
+
+/**
+ * @}
+ */
+
+#define AVPALETTE_SIZE 1024
+#define AVPALETTE_COUNT 256
+
+enum AVSubtitleType {
+    SUBTITLE_NONE,
+
+    SUBTITLE_BITMAP,                ///< A bitmap, pict will be set
+
+    /**
+     * Plain text, the text field must be set by the decoder and is
+     * authoritative. ass and pict fields may contain approximations.
+     */
+    SUBTITLE_TEXT,
+
+    /**
+     * Formatted text, the ass field must be set by the decoder and is
+     * authoritative. pict and text fields may contain approximations.
+     */
+    SUBTITLE_ASS,
+};
+
+#define AV_SUBTITLE_FLAG_FORCED 0x00000001
+
+typedef struct AVSubtitleRect {
+    int x;         ///< top left corner  of pict, undefined when pict is not set
+    int y;         ///< top left corner  of pict, undefined when pict is not set
+    int w;         ///< width            of pict, undefined when pict is not set
+    int h;         ///< height           of pict, undefined when pict is not set
+    int nb_colors; ///< number of colors in pict, undefined when pict is not set
+
+    /**
+     * data+linesize for the bitmap of this subtitle.
+     * can be set for text/ass as well once they where rendered
+     */
+    AVPicture pict;
+    enum AVSubtitleType type;
+
+    char *text;                     ///< 0 terminated plain UTF-8 text
+
+    /**
+     * 0 terminated ASS/SSA compatible event line.
+     * The pressentation of this is unaffected by the other values in this
+     * struct.
+     */
+    char *ass;
+    int flags;
+} AVSubtitleRect;
+
+typedef struct AVSubtitle {
+    uint16_t format; /* 0 = graphics */
+    uint32_t start_display_time; /* relative to packet pts, in ms */
+    uint32_t end_display_time; /* relative to packet pts, in ms */
+    unsigned num_rects;
+    AVSubtitleRect **rects;
+    int64_t pts;    ///< Same as packet pts, in AV_TIME_BASE
+} AVSubtitle;
+
+/**
+ * If c is NULL, returns the first registered codec,
+ * if c is non-NULL, returns the next registered codec after c,
+ * or NULL if c is the last one.
+ */
+AVCodec *av_codec_next(const AVCodec *c);
+
+/**
+ * Return the LIBAVCODEC_VERSION_INT constant.
+ */
+unsigned avcodec_version(void);
+
+/**
+ * Return the libavcodec build-time configuration.
+ */
+const char *avcodec_configuration(void);
+
+/**
+ * Return the libavcodec license.
+ */
+const char *avcodec_license(void);
+
+/**
+ * Register the codec codec and initialize libavcodec.
+ *
+ * @warning either this function or avcodec_register_all() must be called
+ * before any other libavcodec functions.
+ *
+ * @see avcodec_register_all()
+ */
+void avcodec_register(AVCodec *codec);
+
+/**
+ * Register all the codecs, parsers and bitstream filters which were enabled at
+ * configuration time. If you do not call this function you can select exactly
+ * which formats you want to support, by using the individual registration
+ * functions.
+ *
+ * @see avcodec_register
+ * @see av_register_codec_parser
+ * @see av_register_bitstream_filter
+ */
+void avcodec_register_all(void);
+
+/**
+ * Allocate an AVCodecContext and set its fields to default values.  The
+ * resulting struct can be deallocated by calling avcodec_close() on it followed
+ * by av_free().
+ *
+ * @param codec if non-NULL, allocate private data and initialize defaults
+ *              for the given codec. It is illegal to then call avcodec_open2()
+ *              with a different codec.
+ *              If NULL, then the codec-specific defaults won't be initialized,
+ *              which may result in suboptimal default settings (this is
+ *              important mainly for encoders, e.g. libx264).
+ *
+ * @return An AVCodecContext filled with default values or NULL on failure.
+ * @see avcodec_get_context_defaults
+ */
+AVCodecContext *avcodec_alloc_context3(const AVCodec *codec);
+
+/**
+ * Set the fields of the given AVCodecContext to default values corresponding
+ * to the given codec (defaults may be codec-dependent).
+ *
+ * Do not call this function if a non-NULL codec has been passed
+ * to avcodec_alloc_context3() that allocated this AVCodecContext.
+ * If codec is non-NULL, it is illegal to call avcodec_open2() with a
+ * different codec on this AVCodecContext.
+ */
+int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec);
+
+/**
+ * Get the AVClass for AVCodecContext. It can be used in combination with
+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
+ *
+ * @see av_opt_find().
+ */
+const AVClass *avcodec_get_class(void);
+
+/**
+ * Copy the settings of the source AVCodecContext into the destination
+ * AVCodecContext. The resulting destination codec context will be
+ * unopened, i.e. you are required to call avcodec_open2() before you
+ * can use this AVCodecContext to decode/encode video/audio data.
+ *
+ * @param dest target codec context, should be initialized with
+ *             avcodec_alloc_context3(), but otherwise uninitialized
+ * @param src source codec context
+ * @return AVERROR() on error (e.g. memory allocation error), 0 on success
+ */
+int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src);
+
+#if FF_API_AVFRAME_LAVC
+/**
+ * @deprecated use av_frame_alloc()
+ */
+attribute_deprecated
+AVFrame *avcodec_alloc_frame(void);
+
+/**
+ * Set the fields of the given AVFrame to default values.
+ *
+ * @param frame The AVFrame of which the fields should be set to default values.
+ *
+ * @deprecated use av_frame_unref()
+ */
+attribute_deprecated
+void avcodec_get_frame_defaults(AVFrame *frame);
+
+/**
+ * Free the frame and any dynamically allocated objects in it,
+ * e.g. extended_data.
+ *
+ * @param frame frame to be freed. The pointer will be set to NULL.
+ *
+ * @warning this function does NOT free the data buffers themselves
+ * (it does not know how, since they might have been allocated with
+ *  a custom get_buffer()).
+ *
+ * @deprecated use av_frame_free()
+ */
+attribute_deprecated
+void avcodec_free_frame(AVFrame **frame);
+#endif
+
+/**
+ * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
+ * function the context has to be allocated with avcodec_alloc_context3().
+ *
+ * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(),
+ * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for
+ * retrieving a codec.
+ *
+ * @warning This function is not thread safe!
+ *
+ * @code
+ * avcodec_register_all();
+ * av_dict_set(&opts, "b", "2.5M", 0);
+ * codec = avcodec_find_decoder(AV_CODEC_ID_H264);
+ * if (!codec)
+ *     exit(1);
+ *
+ * context = avcodec_alloc_context3(codec);
+ *
+ * if (avcodec_open2(context, codec, opts) < 0)
+ *     exit(1);
+ * @endcode
+ *
+ * @param avctx The context to initialize.
+ * @param codec The codec to open this context for. If a non-NULL codec has been
+ *              previously passed to avcodec_alloc_context3() or
+ *              avcodec_get_context_defaults3() for this context, then this
+ *              parameter MUST be either NULL or equal to the previously passed
+ *              codec.
+ * @param options A dictionary filled with AVCodecContext and codec-private options.
+ *                On return this object will be filled with options that were not found.
+ *
+ * @return zero on success, a negative value on error
+ * @see avcodec_alloc_context3(), avcodec_find_decoder(), avcodec_find_encoder(),
+ *      av_dict_set(), av_opt_find().
+ */
+int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options);
+
+/**
+ * Close a given AVCodecContext and free all the data associated with it
+ * (but not the AVCodecContext itself).
+ *
+ * Calling this function on an AVCodecContext that hasn't been opened will free
+ * the codec-specific data allocated in avcodec_alloc_context3() /
+ * avcodec_get_context_defaults3() with a non-NULL codec. Subsequent calls will
+ * do nothing.
+ */
+int avcodec_close(AVCodecContext *avctx);
+
+/**
+ * Free all allocated data in the given subtitle struct.
+ *
+ * @param sub AVSubtitle to free.
+ */
+void avsubtitle_free(AVSubtitle *sub);
+
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup lavc_packet
+ * @{
+ */
+
+#if FF_API_DESTRUCT_PACKET
+/**
+ * Default packet destructor.
+ * @deprecated use the AVBuffer API instead
+ */
+attribute_deprecated
+void av_destruct_packet(AVPacket *pkt);
+#endif
+
+/**
+ * Initialize optional fields of a packet with default values.
+ *
+ * Note, this does not touch the data and size members, which have to be
+ * initialized separately.
+ *
+ * @param pkt packet
+ */
+void av_init_packet(AVPacket *pkt);
+
+/**
+ * Allocate the payload of a packet and initialize its fields with
+ * default values.
+ *
+ * @param pkt packet
+ * @param size wanted payload size
+ * @return 0 if OK, AVERROR_xxx otherwise
+ */
+int av_new_packet(AVPacket *pkt, int size);
+
+/**
+ * Reduce packet size, correctly zeroing padding
+ *
+ * @param pkt packet
+ * @param size new size
+ */
+void av_shrink_packet(AVPacket *pkt, int size);
+
+/**
+ * Increase packet size, correctly zeroing padding
+ *
+ * @param pkt packet
+ * @param grow_by number of bytes by which to increase the size of the packet
+ */
+int av_grow_packet(AVPacket *pkt, int grow_by);
+
+/**
+ * Initialize a reference-counted packet from av_malloc()ed data.
+ *
+ * @param pkt packet to be initialized. This function will set the data, size,
+ *        buf and destruct fields, all others are left untouched.
+ * @param data Data allocated by av_malloc() to be used as packet data. If this
+ *        function returns successfully, the data is owned by the underlying AVBuffer.
+ *        The caller may not access the data through other means.
+ * @param size size of data in bytes, without the padding. I.e. the full buffer
+ *        size is assumed to be size + FF_INPUT_BUFFER_PADDING_SIZE.
+ *
+ * @return 0 on success, a negative AVERROR on error
+ */
+int av_packet_from_data(AVPacket *pkt, uint8_t *data, int size);
+
+/**
+ * @warning This is a hack - the packet memory allocation stuff is broken. The
+ * packet is allocated if it was not really allocated.
+ */
+int av_dup_packet(AVPacket *pkt);
+
+/**
+ * Free a packet.
+ *
+ * @param pkt packet to free
+ */
+void av_free_packet(AVPacket *pkt);
+
+/**
+ * Allocate new information of a packet.
+ *
+ * @param pkt packet
+ * @param type side information type
+ * @param size side information size
+ * @return pointer to fresh allocated data or NULL otherwise
+ */
+uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+                                 int size);
+
+/**
+ * Shrink the already allocated side data buffer
+ *
+ * @param pkt packet
+ * @param type side information type
+ * @param size new side information size
+ * @return 0 on success, < 0 on failure
+ */
+int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+                               int size);
+
+/**
+ * Get side information from packet.
+ *
+ * @param pkt packet
+ * @param type desired side information type
+ * @param size pointer for side information size to store (optional)
+ * @return pointer to data if present or NULL otherwise
+ */
+uint8_t* av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+                                 int *size);
+
+/**
+ * Convenience function to free all the side data stored.
+ * All the other fields stay untouched.
+ *
+ * @param pkt packet
+ */
+void av_packet_free_side_data(AVPacket *pkt);
+
+/**
+ * Setup a new reference to the data described by a given packet
+ *
+ * If src is reference-counted, setup dst as a new reference to the
+ * buffer in src. Otherwise allocate a new buffer in dst and copy the
+ * data from src into it.
+ *
+ * All the other fields are copied from src.
+ *
+ * @see av_packet_unref
+ *
+ * @param dst Destination packet
+ * @param src Source packet
+ *
+ * @return 0 on success, a negative AVERROR on error.
+ */
+int av_packet_ref(AVPacket *dst, AVPacket *src);
+
+/**
+ * Wipe the packet.
+ *
+ * Unreference the buffer referenced by the packet and reset the
+ * remaining packet fields to their default values.
+ *
+ * @param pkt The packet to be unreferenced.
+ */
+void av_packet_unref(AVPacket *pkt);
+
+/**
+ * Move every field in src to dst and reset src.
+ *
+ * @see av_packet_unref
+ *
+ * @param src Source packet, will be reset
+ * @param dst Destination packet
+ */
+void av_packet_move_ref(AVPacket *dst, AVPacket *src);
+
+/**
+ * Copy only "properties" fields from src to dst.
+ *
+ * Properties for the purpose of this function are all the fields
+ * beside those related to the packet data (buf, data, size)
+ *
+ * @param dst Destination packet
+ * @param src Source packet
+ *
+ * @return 0 on success AVERROR on failure.
+ *
+ */
+int av_packet_copy_props(AVPacket *dst, const AVPacket *src);
+
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup lavc_decoding
+ * @{
+ */
+
+/**
+ * Find a registered decoder with a matching codec ID.
+ *
+ * @param id AVCodecID of the requested decoder
+ * @return A decoder if one was found, NULL otherwise.
+ */
+AVCodec *avcodec_find_decoder(enum AVCodecID id);
+
+/**
+ * Find a registered decoder with the specified name.
+ *
+ * @param name name of the requested decoder
+ * @return A decoder if one was found, NULL otherwise.
+ */
+AVCodec *avcodec_find_decoder_by_name(const char *name);
+
+#if FF_API_GET_BUFFER
+attribute_deprecated int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic);
+attribute_deprecated void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic);
+attribute_deprecated int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic);
+#endif
+
+/**
+ * The default callback for AVCodecContext.get_buffer2(). It is made public so
+ * it can be called by custom get_buffer2() implementations for decoders without
+ * CODEC_CAP_DR1 set.
+ */
+int avcodec_default_get_buffer2(AVCodecContext *s, AVFrame *frame, int flags);
+
+#if FF_API_EMU_EDGE
+/**
+ * Return the amount of padding in pixels which the get_buffer callback must
+ * provide around the edge of the image for codecs which do not have the
+ * CODEC_FLAG_EMU_EDGE flag.
+ *
+ * @return Required padding in pixels.
+ *
+ * @deprecated CODEC_FLAG_EMU_EDGE is deprecated, so this function is no longer
+ * needed
+ */
+attribute_deprecated
+unsigned avcodec_get_edge_width(void);
+#endif
+
+/**
+ * Modify width and height values so that they will result in a memory
+ * buffer that is acceptable for the codec if you do not use any horizontal
+ * padding.
+ *
+ * May only be used if a codec with CODEC_CAP_DR1 has been opened.
+ */
+void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height);
+
+/**
+ * Modify width and height values so that they will result in a memory
+ * buffer that is acceptable for the codec if you also ensure that all
+ * line sizes are a multiple of the respective linesize_align[i].
+ *
+ * May only be used if a codec with CODEC_CAP_DR1 has been opened.
+ */
+void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
+                               int linesize_align[AV_NUM_DATA_POINTERS]);
+
+/**
+ * Decode the audio frame of size avpkt->size from avpkt->data into frame.
+ *
+ * Some decoders may support multiple frames in a single AVPacket. Such
+ * decoders would then just decode the first frame and the return value would be
+ * less than the packet size. In this case, avcodec_decode_audio4 has to be
+ * called again with an AVPacket containing the remaining data in order to
+ * decode the second frame, etc...  Even if no frames are returned, the packet
+ * needs to be fed to the decoder with remaining data until it is completely
+ * consumed or an error occurs.
+ *
+ * Some decoders (those marked with CODEC_CAP_DELAY) have a delay between input
+ * and output. This means that for some packets they will not immediately
+ * produce decoded output and need to be flushed at the end of decoding to get
+ * all the decoded data. Flushing is done by calling this function with packets
+ * with avpkt->data set to NULL and avpkt->size set to 0 until it stops
+ * returning samples. It is safe to flush even those decoders that are not
+ * marked with CODEC_CAP_DELAY, then no samples will be returned.
+ *
+ * @warning The input buffer, avpkt->data must be FF_INPUT_BUFFER_PADDING_SIZE
+ *          larger than the actual read bytes because some optimized bitstream
+ *          readers read 32 or 64 bits at once and could read over the end.
+ *
+ * @param      avctx the codec context
+ * @param[out] frame The AVFrame in which to store decoded audio samples.
+ *                   The decoder will allocate a buffer for the decoded frame by
+ *                   calling the AVCodecContext.get_buffer2() callback.
+ *                   When AVCodecContext.refcounted_frames is set to 1, the frame is
+ *                   reference counted and the returned reference belongs to the
+ *                   caller. The caller must release the frame using av_frame_unref()
+ *                   when the frame is no longer needed. The caller may safely write
+ *                   to the frame if av_frame_is_writable() returns 1.
+ *                   When AVCodecContext.refcounted_frames is set to 0, the returned
+ *                   reference belongs to the decoder and is valid only until the
+ *                   next call to this function or until closing or flushing the
+ *                   decoder. The caller may not write to it.
+ * @param[out] got_frame_ptr Zero if no frame could be decoded, otherwise it is
+ *                           non-zero. Note that this field being set to zero
+ *                           does not mean that an error has occurred. For
+ *                           decoders with CODEC_CAP_DELAY set, no given decode
+ *                           call is guaranteed to produce a frame.
+ * @param[in]  avpkt The input AVPacket containing the input buffer.
+ *                   At least avpkt->data and avpkt->size should be set. Some
+ *                   decoders might also require additional fields to be set.
+ * @return A negative error code is returned if an error occurred during
+ *         decoding, otherwise the number of bytes consumed from the input
+ *         AVPacket is returned.
+ */
+int avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame,
+                          int *got_frame_ptr, AVPacket *avpkt);
+
+/**
+ * Decode the video frame of size avpkt->size from avpkt->data into picture.
+ * Some decoders may support multiple frames in a single AVPacket, such
+ * decoders would then just decode the first frame.
+ *
+ * @warning The input buffer must be FF_INPUT_BUFFER_PADDING_SIZE larger than
+ * the actual read bytes because some optimized bitstream readers read 32 or 64
+ * bits at once and could read over the end.
+ *
+ * @warning The end of the input buffer buf should be set to 0 to ensure that
+ * no overreading happens for damaged MPEG streams.
+ *
+ * @note Codecs which have the CODEC_CAP_DELAY capability set have a delay
+ * between input and output, these need to be fed with avpkt->data=NULL,
+ * avpkt->size=0 at the end to return the remaining frames.
+ *
+ * @param avctx the codec context
+ * @param[out] picture The AVFrame in which the decoded video frame will be stored.
+ *             Use av_frame_alloc() to get an AVFrame. The codec will
+ *             allocate memory for the actual bitmap by calling the
+ *             AVCodecContext.get_buffer2() callback.
+ *             When AVCodecContext.refcounted_frames is set to 1, the frame is
+ *             reference counted and the returned reference belongs to the
+ *             caller. The caller must release the frame using av_frame_unref()
+ *             when the frame is no longer needed. The caller may safely write
+ *             to the frame if av_frame_is_writable() returns 1.
+ *             When AVCodecContext.refcounted_frames is set to 0, the returned
+ *             reference belongs to the decoder and is valid only until the
+ *             next call to this function or until closing or flushing the
+ *             decoder. The caller may not write to it.
+ *
+ * @param[in] avpkt The input AVpacket containing the input buffer.
+ *            You can create such packet with av_init_packet() and by then setting
+ *            data and size, some decoders might in addition need other fields like
+ *            flags&AV_PKT_FLAG_KEY. All decoders are designed to use the least
+ *            fields possible.
+ * @param[in,out] got_picture_ptr Zero if no frame could be decompressed, otherwise, it is nonzero.
+ * @return On error a negative value is returned, otherwise the number of bytes
+ * used or zero if no frame could be decompressed.
+ */
+int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
+                         int *got_picture_ptr,
+                         AVPacket *avpkt);
+
+/**
+ * Decode a subtitle message.
+ * Return a negative value on error, otherwise return the number of bytes used.
+ * If no subtitle could be decompressed, got_sub_ptr is zero.
+ * Otherwise, the subtitle is stored in *sub.
+ * Note that CODEC_CAP_DR1 is not available for subtitle codecs. This is for
+ * simplicity, because the performance difference is expect to be negligible
+ * and reusing a get_buffer written for video codecs would probably perform badly
+ * due to a potentially very different allocation pattern.
+ *
+ * @param avctx the codec context
+ * @param[out] sub The AVSubtitle in which the decoded subtitle will be stored, must be
+                   freed with avsubtitle_free if *got_sub_ptr is set.
+ * @param[in,out] got_sub_ptr Zero if no subtitle could be decompressed, otherwise, it is nonzero.
+ * @param[in] avpkt The input AVPacket containing the input buffer.
+ */
+int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
+                            int *got_sub_ptr,
+                            AVPacket *avpkt);
+
+/**
+ * @defgroup lavc_parsing Frame parsing
+ * @{
+ */
+
+enum AVPictureStructure {
+    AV_PICTURE_STRUCTURE_UNKNOWN,      //< unknown
+    AV_PICTURE_STRUCTURE_TOP_FIELD,    //< coded as top field
+    AV_PICTURE_STRUCTURE_BOTTOM_FIELD, //< coded as bottom field
+    AV_PICTURE_STRUCTURE_FRAME,        //< coded as frame
+};
+
+typedef struct AVCodecParserContext {
+    void *priv_data;
+    struct AVCodecParser *parser;
+    int64_t frame_offset; /* offset of the current frame */
+    int64_t cur_offset; /* current offset
+                           (incremented by each av_parser_parse()) */
+    int64_t next_frame_offset; /* offset of the next frame */
+    /* video info */
+    int pict_type; /* XXX: Put it back in AVCodecContext. */
+    /**
+     * This field is used for proper frame duration computation in lavf.
+     * It signals, how much longer the frame duration of the current frame
+     * is compared to normal frame duration.
+     *
+     * frame_duration = (1 + repeat_pict) * time_base
+     *
+     * It is used by codecs like H.264 to display telecined material.
+     */
+    int repeat_pict; /* XXX: Put it back in AVCodecContext. */
+    int64_t pts;     /* pts of the current frame */
+    int64_t dts;     /* dts of the current frame */
+
+    /* private data */
+    int64_t last_pts;
+    int64_t last_dts;
+    int fetch_timestamp;
+
+#define AV_PARSER_PTS_NB 4
+    int cur_frame_start_index;
+    int64_t cur_frame_offset[AV_PARSER_PTS_NB];
+    int64_t cur_frame_pts[AV_PARSER_PTS_NB];
+    int64_t cur_frame_dts[AV_PARSER_PTS_NB];
+
+    int flags;
+#define PARSER_FLAG_COMPLETE_FRAMES           0x0001
+#define PARSER_FLAG_ONCE                      0x0002
+/// Set if the parser has a valid file offset
+#define PARSER_FLAG_FETCHED_OFFSET            0x0004
+
+    int64_t offset;      ///< byte offset from starting packet start
+    int64_t cur_frame_end[AV_PARSER_PTS_NB];
+
+    /**
+     * Set by parser to 1 for key frames and 0 for non-key frames.
+     * It is initialized to -1, so if the parser doesn't set this flag,
+     * old-style fallback using AV_PICTURE_TYPE_I picture type as key frames
+     * will be used.
+     */
+    int key_frame;
+
+    /**
+     * Time difference in stream time base units from the pts of this
+     * packet to the point at which the output from the decoder has converged
+     * independent from the availability of previous frames. That is, the
+     * frames are virtually identical no matter if decoding started from
+     * the very first frame or from this keyframe.
+     * Is AV_NOPTS_VALUE if unknown.
+     * This field is not the display duration of the current frame.
+     * This field has no meaning if the packet does not have AV_PKT_FLAG_KEY
+     * set.
+     *
+     * The purpose of this field is to allow seeking in streams that have no
+     * keyframes in the conventional sense. It corresponds to the
+     * recovery point SEI in H.264 and match_time_delta in NUT. It is also
+     * essential for some types of subtitle streams to ensure that all
+     * subtitles are correctly displayed after seeking.
+     */
+    int64_t convergence_duration;
+
+    // Timestamp generation support:
+    /**
+     * Synchronization point for start of timestamp generation.
+     *
+     * Set to >0 for sync point, 0 for no sync point and <0 for undefined
+     * (default).
+     *
+     * For example, this corresponds to presence of H.264 buffering period
+     * SEI message.
+     */
+    int dts_sync_point;
+
+    /**
+     * Offset of the current timestamp against last timestamp sync point in
+     * units of AVCodecContext.time_base.
+     *
+     * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
+     * contain a valid timestamp offset.
+     *
+     * Note that the timestamp of sync point has usually a nonzero
+     * dts_ref_dts_delta, which refers to the previous sync point. Offset of
+     * the next frame after timestamp sync point will be usually 1.
+     *
+     * For example, this corresponds to H.264 cpb_removal_delay.
+     */
+    int dts_ref_dts_delta;
+
+    /**
+     * Presentation delay of current frame in units of AVCodecContext.time_base.
+     *
+     * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
+     * contain valid non-negative timestamp delta (presentation time of a frame
+     * must not lie in the past).
+     *
+     * This delay represents the difference between decoding and presentation
+     * time of the frame.
+     *
+     * For example, this corresponds to H.264 dpb_output_delay.
+     */
+    int pts_dts_delta;
+
+    /**
+     * Position of the packet in file.
+     *
+     * Analogous to cur_frame_pts/dts
+     */
+    int64_t cur_frame_pos[AV_PARSER_PTS_NB];
+
+    /**
+     * Byte position of currently parsed frame in stream.
+     */
+    int64_t pos;
+
+    /**
+     * Previous frame byte position.
+     */
+    int64_t last_pos;
+
+    /**
+     * Duration of the current frame.
+     * For audio, this is in units of 1 / AVCodecContext.sample_rate.
+     * For all other types, this is in units of AVCodecContext.time_base.
+     */
+    int duration;
+
+    enum AVFieldOrder field_order;
+
+    /**
+     * Indicate whether a picture is coded as a frame, top field or bottom field.
+     *
+     * For example, H.264 field_pic_flag equal to 0 corresponds to
+     * AV_PICTURE_STRUCTURE_FRAME. An H.264 picture with field_pic_flag
+     * equal to 1 and bottom_field_flag equal to 0 corresponds to
+     * AV_PICTURE_STRUCTURE_TOP_FIELD.
+     */
+    enum AVPictureStructure picture_structure;
+
+    /**
+     * Picture number incremented in presentation or output order.
+     * This field may be reinitialized at the first picture of a new sequence.
+     *
+     * For example, this corresponds to H.264 PicOrderCnt.
+     */
+    int output_picture_number;
+} AVCodecParserContext;
+
+typedef struct AVCodecParser {
+    int codec_ids[5]; /* several codec IDs are permitted */
+    int priv_data_size;
+    int (*parser_init)(AVCodecParserContext *s);
+    int (*parser_parse)(AVCodecParserContext *s,
+                        AVCodecContext *avctx,
+                        const uint8_t **poutbuf, int *poutbuf_size,
+                        const uint8_t *buf, int buf_size);
+    void (*parser_close)(AVCodecParserContext *s);
+    int (*split)(AVCodecContext *avctx, const uint8_t *buf, int buf_size);
+    struct AVCodecParser *next;
+} AVCodecParser;
+
+AVCodecParser *av_parser_next(AVCodecParser *c);
+
+void av_register_codec_parser(AVCodecParser *parser);
+AVCodecParserContext *av_parser_init(int codec_id);
+
+/**
+ * Parse a packet.
+ *
+ * @param s             parser context.
+ * @param avctx         codec context.
+ * @param poutbuf       set to pointer to parsed buffer or NULL if not yet finished.
+ * @param poutbuf_size  set to size of parsed buffer or zero if not yet finished.
+ * @param buf           input buffer.
+ * @param buf_size      input length, to signal EOF, this should be 0 (so that the last frame can be output).
+ * @param pts           input presentation timestamp.
+ * @param dts           input decoding timestamp.
+ * @param pos           input byte position in stream.
+ * @return the number of bytes of the input bitstream used.
+ *
+ * Example:
+ * @code
+ *   while(in_len){
+ *       len = av_parser_parse2(myparser, AVCodecContext, &data, &size,
+ *                                        in_data, in_len,
+ *                                        pts, dts, pos);
+ *       in_data += len;
+ *       in_len  -= len;
+ *
+ *       if(size)
+ *          decode_frame(data, size);
+ *   }
+ * @endcode
+ */
+int av_parser_parse2(AVCodecParserContext *s,
+                     AVCodecContext *avctx,
+                     uint8_t **poutbuf, int *poutbuf_size,
+                     const uint8_t *buf, int buf_size,
+                     int64_t pts, int64_t dts,
+                     int64_t pos);
+
+/**
+ * @return 0 if the output buffer is a subset of the input, 1 if it is allocated and must be freed
+ * @deprecated use AVBitstreamFilter
+ */
+int av_parser_change(AVCodecParserContext *s,
+                     AVCodecContext *avctx,
+                     uint8_t **poutbuf, int *poutbuf_size,
+                     const uint8_t *buf, int buf_size, int keyframe);
+void av_parser_close(AVCodecParserContext *s);
+
+/**
+ * @}
+ * @}
+ */
+
+/**
+ * @addtogroup lavc_encoding
+ * @{
+ */
+
+/**
+ * Find a registered encoder with a matching codec ID.
+ *
+ * @param id AVCodecID of the requested encoder
+ * @return An encoder if one was found, NULL otherwise.
+ */
+AVCodec *avcodec_find_encoder(enum AVCodecID id);
+
+/**
+ * Find a registered encoder with the specified name.
+ *
+ * @param name name of the requested encoder
+ * @return An encoder if one was found, NULL otherwise.
+ */
+AVCodec *avcodec_find_encoder_by_name(const char *name);
+
+/**
+ * Encode a frame of audio.
+ *
+ * Takes input samples from frame and writes the next output packet, if
+ * available, to avpkt. The output packet does not necessarily contain data for
+ * the most recent frame, as encoders can delay, split, and combine input frames
+ * internally as needed.
+ *
+ * @param avctx     codec context
+ * @param avpkt     output AVPacket.
+ *                  The user can supply an output buffer by setting
+ *                  avpkt->data and avpkt->size prior to calling the
+ *                  function, but if the size of the user-provided data is not
+ *                  large enough, encoding will fail. All other AVPacket fields
+ *                  will be reset by the encoder using av_init_packet(). If
+ *                  avpkt->data is NULL, the encoder will allocate it.
+ *                  The encoder will set avpkt->size to the size of the
+ *                  output packet.
+ *
+ *                  If this function fails or produces no output, avpkt will be
+ *                  freed using av_free_packet() (i.e. avpkt->destruct will be
+ *                  called to free the user supplied buffer).
+ * @param[in] frame AVFrame containing the raw audio data to be encoded.
+ *                  May be NULL when flushing an encoder that has the
+ *                  CODEC_CAP_DELAY capability set.
+ *                  If CODEC_CAP_VARIABLE_FRAME_SIZE is set, then each frame
+ *                  can have any number of samples.
+ *                  If it is not set, frame->nb_samples must be equal to
+ *                  avctx->frame_size for all frames except the last.
+ *                  The final frame may be smaller than avctx->frame_size.
+ * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the
+ *                            output packet is non-empty, and to 0 if it is
+ *                            empty. If the function returns an error, the
+ *                            packet can be assumed to be invalid, and the
+ *                            value of got_packet_ptr is undefined and should
+ *                            not be used.
+ * @return          0 on success, negative error code on failure
+ */
+int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt,
+                          const AVFrame *frame, int *got_packet_ptr);
+
+/**
+ * Encode a frame of video.
+ *
+ * Takes input raw video data from frame and writes the next output packet, if
+ * available, to avpkt. The output packet does not necessarily contain data for
+ * the most recent frame, as encoders can delay and reorder input frames
+ * internally as needed.
+ *
+ * @param avctx     codec context
+ * @param avpkt     output AVPacket.
+ *                  The user can supply an output buffer by setting
+ *                  avpkt->data and avpkt->size prior to calling the
+ *                  function, but if the size of the user-provided data is not
+ *                  large enough, encoding will fail. All other AVPacket fields
+ *                  will be reset by the encoder using av_init_packet(). If
+ *                  avpkt->data is NULL, the encoder will allocate it.
+ *                  The encoder will set avpkt->size to the size of the
+ *                  output packet. The returned data (if any) belongs to the
+ *                  caller, he is responsible for freeing it.
+ *
+ *                  If this function fails or produces no output, avpkt will be
+ *                  freed using av_free_packet() (i.e. avpkt->destruct will be
+ *                  called to free the user supplied buffer).
+ * @param[in] frame AVFrame containing the raw video data to be encoded.
+ *                  May be NULL when flushing an encoder that has the
+ *                  CODEC_CAP_DELAY capability set.
+ * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the
+ *                            output packet is non-empty, and to 0 if it is
+ *                            empty. If the function returns an error, the
+ *                            packet can be assumed to be invalid, and the
+ *                            value of got_packet_ptr is undefined and should
+ *                            not be used.
+ * @return          0 on success, negative error code on failure
+ */
+int avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt,
+                          const AVFrame *frame, int *got_packet_ptr);
+
+int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size,
+                            const AVSubtitle *sub);
+
+
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup lavc_picture
+ * @{
+ */
+
+/**
+ * Allocate memory for a picture.  Call avpicture_free() to free it.
+ *
+ * @see avpicture_fill()
+ *
+ * @param picture the picture to be filled in
+ * @param pix_fmt the format of the picture
+ * @param width the width of the picture
+ * @param height the height of the picture
+ * @return zero if successful, a negative value if not
+ */
+int avpicture_alloc(AVPicture *picture, enum AVPixelFormat pix_fmt, int width, int height);
+
+/**
+ * Free a picture previously allocated by avpicture_alloc().
+ * The data buffer used by the AVPicture is freed, but the AVPicture structure
+ * itself is not.
+ *
+ * @param picture the AVPicture to be freed
+ */
+void avpicture_free(AVPicture *picture);
+
+/**
+ * Fill in the AVPicture fields.
+ * The fields of the given AVPicture are filled in by using the 'ptr' address
+ * which points to the image data buffer. Depending on the specified picture
+ * format, one or multiple image data pointers and line sizes will be set.
+ * If a planar format is specified, several pointers will be set pointing to
+ * the different picture planes and the line sizes of the different planes
+ * will be stored in the lines_sizes array.
+ * Call with ptr == NULL to get the required size for the ptr buffer.
+ *
+ * To allocate the buffer and fill in the AVPicture fields in one call,
+ * use avpicture_alloc().
+ *
+ * @param picture AVPicture whose fields are to be filled in
+ * @param ptr Buffer which will contain or contains the actual image data
+ * @param pix_fmt The format in which the picture data is stored.
+ * @param width the width of the image in pixels
+ * @param height the height of the image in pixels
+ * @return size of the image data in bytes
+ */
+int avpicture_fill(AVPicture *picture, uint8_t *ptr,
+                   enum AVPixelFormat pix_fmt, int width, int height);
+
+/**
+ * Copy pixel data from an AVPicture into a buffer.
+ * The data is stored compactly, without any gaps for alignment or padding
+ * which may be applied by avpicture_fill().
+ *
+ * @see avpicture_get_size()
+ *
+ * @param[in] src AVPicture containing image data
+ * @param[in] pix_fmt The format in which the picture data is stored.
+ * @param[in] width the width of the image in pixels.
+ * @param[in] height the height of the image in pixels.
+ * @param[out] dest A buffer into which picture data will be copied.
+ * @param[in] dest_size The size of 'dest'.
+ * @return The number of bytes written to dest, or a negative value (error code) on error.
+ */
+int avpicture_layout(const AVPicture* src, enum AVPixelFormat pix_fmt,
+                     int width, int height,
+                     unsigned char *dest, int dest_size);
+
+/**
+ * Calculate the size in bytes that a picture of the given width and height
+ * would occupy if stored in the given picture format.
+ * Note that this returns the size of a compact representation as generated
+ * by avpicture_layout(), which can be smaller than the size required for e.g.
+ * avpicture_fill().
+ *
+ * @param pix_fmt the given picture format
+ * @param width the width of the image
+ * @param height the height of the image
+ * @return Image data size in bytes or -1 on error (e.g. too large dimensions).
+ */
+int avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height);
+
+#if FF_API_DEINTERLACE
+/**
+ *  deinterlace - if not supported return -1
+ *
+ * @deprecated - use yadif (in libavfilter) instead
+ */
+attribute_deprecated
+int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
+                          enum AVPixelFormat pix_fmt, int width, int height);
+#endif
+/**
+ * Copy image src to dst. Wraps av_picture_data_copy() above.
+ */
+void av_picture_copy(AVPicture *dst, const AVPicture *src,
+                     enum AVPixelFormat pix_fmt, int width, int height);
+
+/**
+ * Crop image top and left side.
+ */
+int av_picture_crop(AVPicture *dst, const AVPicture *src,
+                    enum AVPixelFormat pix_fmt, int top_band, int left_band);
+
+/**
+ * Pad image.
+ */
+int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, enum AVPixelFormat pix_fmt,
+            int padtop, int padbottom, int padleft, int padright, int *color);
+
+/**
+ * @}
+ */
+
+/**
+ * @defgroup lavc_misc Utility functions
+ * @ingroup libavc
+ *
+ * Miscellaneous utility functions related to both encoding and decoding
+ * (or neither).
+ * @{
+ */
+
+/**
+ * @defgroup lavc_misc_pixfmt Pixel formats
+ *
+ * Functions for working with pixel formats.
+ * @{
+ */
+
+/**
+ * @deprecated Use av_pix_fmt_get_chroma_sub_sample
+ */
+
+void attribute_deprecated avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift);
+
+/**
+ * Return a value representing the fourCC code associated to the
+ * pixel format pix_fmt, or 0 if no associated fourCC code can be
+ * found.
+ */
+unsigned int avcodec_pix_fmt_to_codec_tag(enum AVPixelFormat pix_fmt);
+
+#define FF_LOSS_RESOLUTION  0x0001 /**< loss due to resolution change */
+#define FF_LOSS_DEPTH       0x0002 /**< loss due to color depth change */
+#define FF_LOSS_COLORSPACE  0x0004 /**< loss due to color space conversion */
+#define FF_LOSS_ALPHA       0x0008 /**< loss of alpha bits */
+#define FF_LOSS_COLORQUANT  0x0010 /**< loss due to color quantization */
+#define FF_LOSS_CHROMA      0x0020 /**< loss of chroma (e.g. RGB to gray conversion) */
+
+/**
+ * Compute what kind of losses will occur when converting from one specific
+ * pixel format to another.
+ * When converting from one pixel format to another, information loss may occur.
+ * For example, when converting from RGB24 to GRAY, the color information will
+ * be lost. Similarly, other losses occur when converting from some formats to
+ * other formats. These losses can involve loss of chroma, but also loss of
+ * resolution, loss of color depth, loss due to the color space conversion, loss
+ * of the alpha bits or loss due to color quantization.
+ * avcodec_get_fix_fmt_loss() informs you about the various types of losses
+ * which will occur when converting from one pixel format to another.
+ *
+ * @param[in] dst_pix_fmt destination pixel format
+ * @param[in] src_pix_fmt source pixel format
+ * @param[in] has_alpha Whether the source pixel format alpha channel is used.
+ * @return Combination of flags informing you what kind of losses will occur.
+ */
+int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, enum AVPixelFormat src_pix_fmt,
+                             int has_alpha);
+
+/**
+ * Find the best pixel format to convert to given a certain source pixel
+ * format.  When converting from one pixel format to another, information loss
+ * may occur.  For example, when converting from RGB24 to GRAY, the color
+ * information will be lost. Similarly, other losses occur when converting from
+ * some formats to other formats. avcodec_find_best_pix_fmt2() searches which of
+ * the given pixel formats should be used to suffer the least amount of loss.
+ * The pixel formats from which it chooses one, are determined by the
+ * pix_fmt_list parameter.
+ *
+ *
+ * @param[in] pix_fmt_list AV_PIX_FMT_NONE terminated array of pixel formats to choose from
+ * @param[in] src_pix_fmt source pixel format
+ * @param[in] has_alpha Whether the source pixel format alpha channel is used.
+ * @param[out] loss_ptr Combination of flags informing you what kind of losses will occur.
+ * @return The best pixel format to convert to or -1 if none was found.
+ */
+enum AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat *pix_fmt_list,
+                                              enum AVPixelFormat src_pix_fmt,
+                                              int has_alpha, int *loss_ptr);
+
+enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum AVPixelFormat * fmt);
+
+/**
+ * @}
+ */
+
+#if FF_API_SET_DIMENSIONS
+/**
+ * @deprecated this function is not supposed to be used from outside of lavc
+ */
+attribute_deprecated
+void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
+#endif
+
+/**
+ * Put a string representing the codec tag codec_tag in buf.
+ *
+ * @param buf       buffer to place codec tag in
+ * @param buf_size size in bytes of buf
+ * @param codec_tag codec tag to assign
+ * @return the length of the string that would have been generated if
+ * enough space had been available, excluding the trailing null
+ */
+size_t av_get_codec_tag_string(char *buf, size_t buf_size, unsigned int codec_tag);
+
+void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode);
+
+/**
+ * Return a name for the specified profile, if available.
+ *
+ * @param codec the codec that is searched for the given profile
+ * @param profile the profile value for which a name is requested
+ * @return A name for the profile if found, NULL otherwise.
+ */
+const char *av_get_profile_name(const AVCodec *codec, int profile);
+
+int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size);
+int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count);
+//FIXME func typedef
+
+/**
+ * Fill audio frame data and linesize.
+ * AVFrame extended_data channel pointers are allocated if necessary for
+ * planar audio.
+ *
+ * @param frame       the AVFrame
+ *                    frame->nb_samples must be set prior to calling the
+ *                    function. This function fills in frame->data,
+ *                    frame->extended_data, frame->linesize[0].
+ * @param nb_channels channel count
+ * @param sample_fmt  sample format
+ * @param buf         buffer to use for frame data
+ * @param buf_size    size of buffer
+ * @param align       plane size sample alignment (0 = default)
+ * @return            0 on success, negative error code on failure
+ */
+int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels,
+                             enum AVSampleFormat sample_fmt, const uint8_t *buf,
+                             int buf_size, int align);
+
+/**
+ * Reset the internal decoder state / flush internal buffers. Should be called
+ * e.g. when seeking or when switching to a different stream.
+ *
+ * @note when refcounted frames are not used (i.e. avctx->refcounted_frames is 0),
+ * this invalidates the frames previously returned from the decoder. When
+ * refcounted frames are used, the decoder just releases any references it might
+ * keep internally, but the caller's reference remains valid.
+ */
+void avcodec_flush_buffers(AVCodecContext *avctx);
+
+/**
+ * Return codec bits per sample.
+ *
+ * @param[in] codec_id the codec
+ * @return Number of bits per sample or zero if unknown for the given codec.
+ */
+int av_get_bits_per_sample(enum AVCodecID codec_id);
+
+/**
+ * Return codec bits per sample.
+ * Only return non-zero if the bits per sample is exactly correct, not an
+ * approximation.
+ *
+ * @param[in] codec_id the codec
+ * @return Number of bits per sample or zero if unknown for the given codec.
+ */
+int av_get_exact_bits_per_sample(enum AVCodecID codec_id);
+
+/**
+ * Return audio frame duration.
+ *
+ * @param avctx        codec context
+ * @param frame_bytes  size of the frame, or 0 if unknown
+ * @return             frame duration, in samples, if known. 0 if not able to
+ *                     determine.
+ */
+int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes);
+
+
+typedef struct AVBitStreamFilterContext {
+    void *priv_data;
+    struct AVBitStreamFilter *filter;
+    AVCodecParserContext *parser;
+    struct AVBitStreamFilterContext *next;
+} AVBitStreamFilterContext;
+
+
+typedef struct AVBitStreamFilter {
+    const char *name;
+    int priv_data_size;
+    int (*filter)(AVBitStreamFilterContext *bsfc,
+                  AVCodecContext *avctx, const char *args,
+                  uint8_t **poutbuf, int *poutbuf_size,
+                  const uint8_t *buf, int buf_size, int keyframe);
+    void (*close)(AVBitStreamFilterContext *bsfc);
+    struct AVBitStreamFilter *next;
+} AVBitStreamFilter;
+
+void av_register_bitstream_filter(AVBitStreamFilter *bsf);
+AVBitStreamFilterContext *av_bitstream_filter_init(const char *name);
+int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc,
+                               AVCodecContext *avctx, const char *args,
+                               uint8_t **poutbuf, int *poutbuf_size,
+                               const uint8_t *buf, int buf_size, int keyframe);
+void av_bitstream_filter_close(AVBitStreamFilterContext *bsf);
+
+AVBitStreamFilter *av_bitstream_filter_next(AVBitStreamFilter *f);
+
+/* memory */
+
+/**
+ * Allocate a buffer with padding, reusing the given one if large enough.
+ *
+ * Same behaviour av_fast_malloc but the buffer has additional
+ * FF_INPUT_PADDING_SIZE at the end which will always memset to 0.
+ *
+ */
+void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size);
+
+/**
+ * Encode extradata length to a buffer. Used by xiph codecs.
+ *
+ * @param s buffer to write to; must be at least (v/255+1) bytes long
+ * @param v size of extradata in bytes
+ * @return number of bytes written to the buffer.
+ */
+unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
+
+#if FF_API_MISSING_SAMPLE
+/**
+ * Log a generic warning message about a missing feature. This function is
+ * intended to be used internally by Libav (libavcodec, libavformat, etc.)
+ * only, and would normally not be used by applications.
+ * @param[in] avc a pointer to an arbitrary struct of which the first field is
+ * a pointer to an AVClass struct
+ * @param[in] feature string containing the name of the missing feature
+ * @param[in] want_sample indicates if samples are wanted which exhibit this feature.
+ * If want_sample is non-zero, additional verbage will be added to the log
+ * message which tells the user how to report samples to the development
+ * mailing list.
+ * @deprecated Use avpriv_report_missing_feature() instead.
+ */
+attribute_deprecated
+void av_log_missing_feature(void *avc, const char *feature, int want_sample);
+
+/**
+ * Log a generic warning message asking for a sample. This function is
+ * intended to be used internally by Libav (libavcodec, libavformat, etc.)
+ * only, and would normally not be used by applications.
+ * @param[in] avc a pointer to an arbitrary struct of which the first field is
+ * a pointer to an AVClass struct
+ * @param[in] msg string containing an optional message, or NULL if no message
+ * @deprecated Use avpriv_request_sample() instead.
+ */
+attribute_deprecated
+void av_log_ask_for_sample(void *avc, const char *msg, ...) av_printf_format(2, 3);
+#endif /* FF_API_MISSING_SAMPLE */
+
+/**
+ * Register the hardware accelerator hwaccel.
+ */
+void av_register_hwaccel(AVHWAccel *hwaccel);
+
+/**
+ * If hwaccel is NULL, returns the first registered hardware accelerator,
+ * if hwaccel is non-NULL, returns the next registered hardware accelerator
+ * after hwaccel, or NULL if hwaccel is the last one.
+ */
+AVHWAccel *av_hwaccel_next(AVHWAccel *hwaccel);
+
+
+/**
+ * Lock operation used by lockmgr
+ */
+enum AVLockOp {
+  AV_LOCK_CREATE,  ///< Create a mutex
+  AV_LOCK_OBTAIN,  ///< Lock the mutex
+  AV_LOCK_RELEASE, ///< Unlock the mutex
+  AV_LOCK_DESTROY, ///< Free mutex resources
+};
+
+/**
+ * Register a user provided lock manager supporting the operations
+ * specified by AVLockOp. mutex points to a (void *) where the
+ * lockmgr should store/get a pointer to a user allocated mutex. It's
+ * NULL upon AV_LOCK_CREATE and != NULL for all other ops.
+ *
+ * @param cb User defined callback. Note: Libav may invoke calls to this
+ *           callback during the call to av_lockmgr_register().
+ *           Thus, the application must be prepared to handle that.
+ *           If cb is set to NULL the lockmgr will be unregistered.
+ *           Also note that during unregistration the previously registered
+ *           lockmgr callback may also be invoked.
+ */
+int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op));
+
+/**
+ * Get the type of the given codec.
+ */
+enum AVMediaType avcodec_get_type(enum AVCodecID codec_id);
+
+/**
+ * @return a positive value if s is open (i.e. avcodec_open2() was called on it
+ * with no corresponding avcodec_close()), 0 otherwise.
+ */
+int avcodec_is_open(AVCodecContext *s);
+
+/**
+ * @return a non-zero number if codec is an encoder, zero otherwise
+ */
+int av_codec_is_encoder(const AVCodec *codec);
+
+/**
+ * @return a non-zero number if codec is a decoder, zero otherwise
+ */
+int av_codec_is_decoder(const AVCodec *codec);
+
+/**
+ * @return descriptor for given codec ID or NULL if no descriptor exists.
+ */
+const AVCodecDescriptor *avcodec_descriptor_get(enum AVCodecID id);
+
+/**
+ * Iterate over all codec descriptors known to libavcodec.
+ *
+ * @param prev previous descriptor. NULL to get the first descriptor.
+ *
+ * @return next descriptor or NULL after the last descriptor
+ */
+const AVCodecDescriptor *avcodec_descriptor_next(const AVCodecDescriptor *prev);
+
+/**
+ * @return codec descriptor with the given name or NULL if no such descriptor
+ *         exists.
+ */
+const AVCodecDescriptor *avcodec_descriptor_get_by_name(const char *name);
+
+/**
+ * @}
+ */
+
+#endif /* AVCODEC_AVCODEC_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavcodec/avfft.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavcodec/avfft.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavcodec/avfft.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavcodec/avfft.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,118 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_AVFFT_H
+#define AVCODEC_AVFFT_H
+
+/**
+ * @file
+ * @ingroup lavc_fft
+ * FFT functions
+ */
+
+/**
+ * @defgroup lavc_fft FFT functions
+ * @ingroup lavc_misc
+ *
+ * @{
+ */
+
+typedef float FFTSample;
+
+typedef struct FFTComplex {
+    FFTSample re, im;
+} FFTComplex;
+
+typedef struct FFTContext FFTContext;
+
+/**
+ * Set up a complex FFT.
+ * @param nbits           log2 of the length of the input array
+ * @param inverse         if 0 perform the forward transform, if 1 perform the inverse
+ */
+FFTContext *av_fft_init(int nbits, int inverse);
+
+/**
+ * Do the permutation needed BEFORE calling ff_fft_calc().
+ */
+void av_fft_permute(FFTContext *s, FFTComplex *z);
+
+/**
+ * Do a complex FFT with the parameters defined in av_fft_init(). The
+ * input data must be permuted before. No 1.0/sqrt(n) normalization is done.
+ */
+void av_fft_calc(FFTContext *s, FFTComplex *z);
+
+void av_fft_end(FFTContext *s);
+
+FFTContext *av_mdct_init(int nbits, int inverse, double scale);
+void av_imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input);
+void av_imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input);
+void av_mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input);
+void av_mdct_end(FFTContext *s);
+
+/* Real Discrete Fourier Transform */
+
+enum RDFTransformType {
+    DFT_R2C,
+    IDFT_C2R,
+    IDFT_R2C,
+    DFT_C2R,
+};
+
+typedef struct RDFTContext RDFTContext;
+
+/**
+ * Set up a real FFT.
+ * @param nbits           log2 of the length of the input array
+ * @param trans           the type of transform
+ */
+RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans);
+void av_rdft_calc(RDFTContext *s, FFTSample *data);
+void av_rdft_end(RDFTContext *s);
+
+/* Discrete Cosine Transform */
+
+typedef struct DCTContext DCTContext;
+
+enum DCTTransformType {
+    DCT_II = 0,
+    DCT_III,
+    DCT_I,
+    DST_I,
+};
+
+/**
+ * Set up DCT.
+ *
+ * @param nbits           size of the input array:
+ *                        (1 << nbits)     for DCT-II, DCT-III and DST-I
+ *                        (1 << nbits) + 1 for DCT-I
+ * @param type            the type of transform
+ *
+ * @note the first element of the input of DST-I is ignored
+ */
+DCTContext *av_dct_init(int nbits, enum DCTTransformType type);
+void av_dct_calc(DCTContext *s, FFTSample *data);
+void av_dct_end (DCTContext *s);
+
+/**
+ * @}
+ */
+
+#endif /* AVCODEC_AVFFT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavcodec/dxva2.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavcodec/dxva2.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavcodec/dxva2.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavcodec/dxva2.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,88 @@
+/*
+ * DXVA2 HW acceleration
+ *
+ * copyright (c) 2009 Laurent Aimar
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_DXVA_H
+#define AVCODEC_DXVA_H
+
+/**
+ * @file
+ * @ingroup lavc_codec_hwaccel_dxva2
+ * Public libavcodec DXVA2 header.
+ */
+
+#define _WIN32_WINNT 0x0600
+#include <stdint.h>
+#include <d3d9.h>
+#include <dxva2api.h>
+
+/**
+ * @defgroup lavc_codec_hwaccel_dxva2 DXVA2
+ * @ingroup lavc_codec_hwaccel
+ *
+ * @{
+ */
+
+#define FF_DXVA2_WORKAROUND_SCALING_LIST_ZIGZAG 1 ///< Work around for DXVA2 and old UVD/UVD+ ATI video cards
+
+/**
+ * This structure is used to provides the necessary configurations and data
+ * to the DXVA2 Libav HWAccel implementation.
+ *
+ * The application must make it available as AVCodecContext.hwaccel_context.
+ */
+struct dxva_context {
+    /**
+     * DXVA2 decoder object
+     */
+    IDirectXVideoDecoder *decoder;
+
+    /**
+     * DXVA2 configuration used to create the decoder
+     */
+    const DXVA2_ConfigPictureDecode *cfg;
+
+    /**
+     * The number of surface in the surface array
+     */
+    unsigned surface_count;
+
+    /**
+     * The array of Direct3D surfaces used to create the decoder
+     */
+    LPDIRECT3DSURFACE9 *surface;
+
+    /**
+     * A bit field configuring the workarounds needed for using the decoder
+     */
+    uint64_t workaround;
+
+    /**
+     * Private to the Libav AVHWAccel implementation
+     */
+    unsigned report_id;
+};
+
+/**
+ * @}
+ */
+
+#endif /* AVCODEC_DXVA_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavcodec/vaapi.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavcodec/vaapi.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavcodec/vaapi.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavcodec/vaapi.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,173 @@
+/*
+ * Video Acceleration API (shared data between Libav and the video player)
+ * HW decode acceleration for MPEG-2, MPEG-4, H.264 and VC-1
+ *
+ * Copyright (C) 2008-2009 Splitted-Desktop Systems
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VAAPI_H
+#define AVCODEC_VAAPI_H
+
+/**
+ * @file
+ * @ingroup lavc_codec_hwaccel_vaapi
+ * Public libavcodec VA API header.
+ */
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavc_codec_hwaccel_vaapi VA API Decoding
+ * @ingroup lavc_codec_hwaccel
+ * @{
+ */
+
+/**
+ * This structure is used to share data between the Libav library and
+ * the client video application.
+ * This shall be zero-allocated and available as
+ * AVCodecContext.hwaccel_context. All user members can be set once
+ * during initialization or through each AVCodecContext.get_buffer()
+ * function call. In any case, they must be valid prior to calling
+ * decoding functions.
+ */
+struct vaapi_context {
+    /**
+     * Window system dependent data
+     *
+     * - encoding: unused
+     * - decoding: Set by user
+     */
+    void *display;
+
+    /**
+     * Configuration ID
+     *
+     * - encoding: unused
+     * - decoding: Set by user
+     */
+    uint32_t config_id;
+
+    /**
+     * Context ID (video decode pipeline)
+     *
+     * - encoding: unused
+     * - decoding: Set by user
+     */
+    uint32_t context_id;
+
+    /**
+     * VAPictureParameterBuffer ID
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    uint32_t pic_param_buf_id;
+
+    /**
+     * VAIQMatrixBuffer ID
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    uint32_t iq_matrix_buf_id;
+
+    /**
+     * VABitPlaneBuffer ID (for VC-1 decoding)
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    uint32_t bitplane_buf_id;
+
+    /**
+     * Slice parameter/data buffer IDs
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    uint32_t *slice_buf_ids;
+
+    /**
+     * Number of effective slice buffer IDs to send to the HW
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    unsigned int n_slice_buf_ids;
+
+    /**
+     * Size of pre-allocated slice_buf_ids
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    unsigned int slice_buf_ids_alloc;
+
+    /**
+     * Pointer to VASliceParameterBuffers
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    void *slice_params;
+
+    /**
+     * Size of a VASliceParameterBuffer element
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    unsigned int slice_param_size;
+
+    /**
+     * Size of pre-allocated slice_params
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    unsigned int slice_params_alloc;
+
+    /**
+     * Number of slices currently filled in
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    unsigned int slice_count;
+
+    /**
+     * Pointer to slice data buffer base
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    const uint8_t *slice_data;
+
+    /**
+     * Current size of slice data
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec
+     */
+    uint32_t slice_data_size;
+};
+
+/* @} */
+
+#endif /* AVCODEC_VAAPI_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavcodec/vda.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavcodec/vda.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavcodec/vda.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavcodec/vda.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,142 @@
+/*
+ * VDA HW acceleration
+ *
+ * copyright (c) 2011 Sebastien Zwickert
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VDA_H
+#define AVCODEC_VDA_H
+
+/**
+ * @file
+ * @ingroup lavc_codec_hwaccel_vda
+ * Public libavcodec VDA header.
+ */
+
+#include "libavcodec/version.h"
+
+#include <stdint.h>
+
+// emmintrin.h is unable to compile with -std=c99 -Werror=missing-prototypes
+// http://openradar.appspot.com/8026390
+#undef __GNUC_STDC_INLINE__
+
+#define Picture QuickdrawPicture
+#include <VideoDecodeAcceleration/VDADecoder.h>
+#undef Picture
+
+/**
+ * @defgroup lavc_codec_hwaccel_vda VDA
+ * @ingroup lavc_codec_hwaccel
+ *
+ * @{
+ */
+
+/**
+ * This structure is used to provide the necessary configurations and data
+ * to the VDA Libav HWAccel implementation.
+ *
+ * The application must make it available as AVCodecContext.hwaccel_context.
+ */
+struct vda_context {
+    /**
+     * VDA decoder object.
+     *
+     * - encoding: unused
+     * - decoding: Set/Unset by libavcodec.
+     */
+    VDADecoder          decoder;
+
+    /**
+     * The Core Video pixel buffer that contains the current image data.
+     *
+     * encoding: unused
+     * decoding: Set by libavcodec. Unset by user.
+     */
+    CVPixelBufferRef    cv_buffer;
+
+    /**
+     * Use the hardware decoder in synchronous mode.
+     *
+     * encoding: unused
+     * decoding: Set by user.
+     */
+    int                 use_sync_decoding;
+
+    /**
+     * The frame width.
+     *
+     * - encoding: unused
+     * - decoding: Set/Unset by user.
+     */
+    int                 width;
+
+    /**
+     * The frame height.
+     *
+     * - encoding: unused
+     * - decoding: Set/Unset by user.
+     */
+    int                 height;
+
+    /**
+     * The frame format.
+     *
+     * - encoding: unused
+     * - decoding: Set/Unset by user.
+     */
+    int                 format;
+
+    /**
+     * The pixel format for output image buffers.
+     *
+     * - encoding: unused
+     * - decoding: Set/Unset by user.
+     */
+    OSType              cv_pix_fmt_type;
+
+    /**
+     * The current bitstream buffer.
+     */
+    uint8_t             *priv_bitstream;
+
+    /**
+     * The current size of the bitstream.
+     */
+    int                 priv_bitstream_size;
+
+    /**
+     * The reference size used for fast reallocation.
+     */
+    int                 priv_allocated_size;
+};
+
+/** Create the video decoder. */
+int ff_vda_create_decoder(struct vda_context *vda_ctx,
+                          uint8_t *extradata,
+                          int extradata_size);
+
+/** Destroy the video decoder. */
+int ff_vda_destroy_decoder(struct vda_context *vda_ctx);
+
+/**
+ * @}
+ */
+
+#endif /* AVCODEC_VDA_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavcodec/vdpau.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavcodec/vdpau.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavcodec/vdpau.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavcodec/vdpau.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,189 @@
+/*
+ * The Video Decode and Presentation API for UNIX (VDPAU) is used for
+ * hardware-accelerated decoding of MPEG-1/2, H.264 and VC-1.
+ *
+ * Copyright (C) 2008 NVIDIA
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VDPAU_H
+#define AVCODEC_VDPAU_H
+
+/**
+ * @file
+ * @ingroup lavc_codec_hwaccel_vdpau
+ * Public libavcodec VDPAU header.
+ */
+
+
+/**
+ * @defgroup lavc_codec_hwaccel_vdpau VDPAU Decoder and Renderer
+ * @ingroup lavc_codec_hwaccel
+ *
+ * VDPAU hardware acceleration has two modules
+ * - VDPAU decoding
+ * - VDPAU presentation
+ *
+ * The VDPAU decoding module parses all headers using Libav
+ * parsing mechanisms and uses VDPAU for the actual decoding.
+ *
+ * As per the current implementation, the actual decoding
+ * and rendering (API calls) are done as part of the VDPAU
+ * presentation (vo_vdpau.c) module.
+ *
+ * @{
+ */
+
+#include <vdpau/vdpau.h>
+#include <vdpau/vdpau_x11.h>
+
+#include "libavutil/attributes.h"
+
+#include "avcodec.h"
+#include "version.h"
+
+#if FF_API_BUFS_VDPAU
+union AVVDPAUPictureInfo {
+    VdpPictureInfoH264        h264;
+    VdpPictureInfoMPEG1Or2    mpeg;
+    VdpPictureInfoVC1          vc1;
+    VdpPictureInfoMPEG4Part2 mpeg4;
+};
+#endif
+
+/**
+ * This structure is used to share data between the libavcodec library and
+ * the client video application.
+ * The user shall zero-allocate the structure and make it available as
+ * AVCodecContext.hwaccel_context. Members can be set by the user once
+ * during initialization or through each AVCodecContext.get_buffer()
+ * function call. In any case, they must be valid prior to calling
+ * decoding functions.
+ *
+ * The size of this structure is not a part of the public ABI and must not
+ * be used outside of libavcodec. Use av_vdpau_alloc_context() to allocate an
+ * AVVDPAUContext.
+ */
+typedef struct AVVDPAUContext {
+    /**
+     * VDPAU decoder handle
+     *
+     * Set by user.
+     */
+    VdpDecoder decoder;
+
+    /**
+     * VDPAU decoder render callback
+     *
+     * Set by the user.
+     */
+    VdpDecoderRender *render;
+
+#if FF_API_BUFS_VDPAU
+    /**
+     * VDPAU picture information
+     *
+     * Set by libavcodec.
+     */
+    attribute_deprecated
+    union AVVDPAUPictureInfo info;
+
+    /**
+     * Allocated size of the bitstream_buffers table.
+     *
+     * Set by libavcodec.
+     */
+    attribute_deprecated
+    int bitstream_buffers_allocated;
+
+    /**
+     * Useful bitstream buffers in the bitstream buffers table.
+     *
+     * Set by libavcodec.
+     */
+    attribute_deprecated
+    int bitstream_buffers_used;
+
+   /**
+     * Table of bitstream buffers.
+     * The user is responsible for freeing this buffer using av_freep().
+     *
+     * Set by libavcodec.
+     */
+    attribute_deprecated
+    VdpBitstreamBuffer *bitstream_buffers;
+#endif
+} AVVDPAUContext;
+
+/**
+ * Allocate an AVVDPAUContext.
+ *
+ * @return Newly-allocated AVVDPAUContext or NULL on failure.
+ */
+AVVDPAUContext *av_vdpau_alloc_context(void);
+
+/**
+ * Get a decoder profile that should be used for initializing a VDPAU decoder.
+ * Should be called from the AVCodecContext.get_format() callback.
+ *
+ * @param avctx the codec context being used for decoding the stream
+ * @param profile a pointer into which the result will be written on success.
+ *                The contents of profile are undefined if this function returns
+ *                an error.
+ *
+ * @return 0 on success (non-negative), a negative AVERROR on failure.
+ */
+int av_vdpau_get_profile(AVCodecContext *avctx, VdpDecoderProfile *profile);
+
+#if FF_API_CAP_VDPAU
+/** @brief The videoSurface is used for rendering. */
+#define FF_VDPAU_STATE_USED_FOR_RENDER 1
+
+/**
+ * @brief The videoSurface is needed for reference/prediction.
+ * The codec manipulates this.
+ */
+#define FF_VDPAU_STATE_USED_FOR_REFERENCE 2
+
+/**
+ * @brief This structure is used as a callback between the Libav
+ * decoder (vd_) and presentation (vo_) module.
+ * This is used for defining a video frame containing surface,
+ * picture parameter, bitstream information etc which are passed
+ * between the Libav decoder and its clients.
+ */
+struct vdpau_render_state {
+    VdpVideoSurface surface; ///< Used as rendered surface, never changed.
+
+    int state; ///< Holds FF_VDPAU_STATE_* values.
+
+    /** picture parameter information for all supported codecs */
+    union AVVDPAUPictureInfo info;
+
+    /** Describe size/location of the compressed video data.
+        Set to 0 when freeing bitstream_buffers. */
+    int bitstream_buffers_allocated;
+    int bitstream_buffers_used;
+    /** The user is responsible for freeing this buffer using av_freep(). */
+    VdpBitstreamBuffer *bitstream_buffers;
+};
+#endif
+
+/* @}*/
+
+#endif /* AVCODEC_VDPAU_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavcodec/version.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavcodec/version.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavcodec/version.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavcodec/version.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,127 @@
+/*
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VERSION_H
+#define AVCODEC_VERSION_H
+
+/**
+ * @file
+ * @ingroup libavc
+ * Libavcodec version macros.
+ */
+
+#include "libavutil/version.h"
+
+#define LIBAVCODEC_VERSION_MAJOR 55
+#define LIBAVCODEC_VERSION_MINOR 34
+#define LIBAVCODEC_VERSION_MICRO  1
+
+#define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
+                                               LIBAVCODEC_VERSION_MINOR, \
+                                               LIBAVCODEC_VERSION_MICRO)
+#define LIBAVCODEC_VERSION      AV_VERSION(LIBAVCODEC_VERSION_MAJOR,    \
+                                           LIBAVCODEC_VERSION_MINOR,    \
+                                           LIBAVCODEC_VERSION_MICRO)
+#define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
+
+#define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
+
+/**
+ * FF_API_* defines may be placed below to indicate public API that will be
+ * dropped at a future version bump. The defines themselves are not part of
+ * the public API and may change, break or disappear at any time.
+ */
+
+#ifndef FF_API_REQUEST_CHANNELS
+#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_DEINTERLACE
+#define FF_API_DEINTERLACE       (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_DESTRUCT_PACKET
+#define FF_API_DESTRUCT_PACKET   (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_GET_BUFFER
+#define FF_API_GET_BUFFER        (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_MISSING_SAMPLE
+#define FF_API_MISSING_SAMPLE    (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_LOWRES
+#define FF_API_LOWRES            (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_CAP_VDPAU
+#define FF_API_CAP_VDPAU         (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_BUFS_VDPAU
+#define FF_API_BUFS_VDPAU        (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_VOXWARE
+#define FF_API_VOXWARE           (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_SET_DIMENSIONS
+#define FF_API_SET_DIMENSIONS    (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_DEBUG_MV
+#define FF_API_DEBUG_MV          (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_AC_VLC
+#define FF_API_AC_VLC            (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_OLD_MSMPEG4
+#define FF_API_OLD_MSMPEG4       (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_ASPECT_EXTENDED
+#define FF_API_ASPECT_EXTENDED   (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_THREAD_OPAQUE
+#define FF_API_THREAD_OPAQUE     (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_CODEC_PKT
+#define FF_API_CODEC_PKT         (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_ARCH_ALPHA
+#define FF_API_ARCH_ALPHA        (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_XVMC
+#define FF_API_XVMC              (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_ERROR_RATE
+#define FF_API_ERROR_RATE        (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_QSCALE_TYPE
+#define FF_API_QSCALE_TYPE       (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_MB_TYPE
+#define FF_API_MB_TYPE           (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_MAX_BFRAMES
+#define FF_API_MAX_BFRAMES       (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_FAST_MALLOC
+#define FF_API_FAST_MALLOC       (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_NEG_LINESIZES
+#define FF_API_NEG_LINESIZES     (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_EMU_EDGE
+#define FF_API_EMU_EDGE          (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+
+#endif /* AVCODEC_VERSION_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavcodec/xvmc.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavcodec/xvmc.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavcodec/xvmc.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavcodec/xvmc.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2003 Ivan Kalvachev
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_XVMC_H
+#define AVCODEC_XVMC_H
+
+/**
+ * @file
+ * @ingroup lavc_codec_hwaccel_xvmc
+ * Public libavcodec XvMC header.
+ */
+
+#include <X11/extensions/XvMC.h>
+
+#include "libavutil/attributes.h"
+#include "version.h"
+#include "avcodec.h"
+
+#if FF_API_XVMC
+
+/**
+ * @defgroup lavc_codec_hwaccel_xvmc XvMC
+ * @ingroup lavc_codec_hwaccel
+ *
+ * @{
+ */
+
+#define AV_XVMC_ID                    0x1DC711C0  /**< special value to ensure that regular pixel routines haven't corrupted the struct
+                                                       the number is 1337 speak for the letters IDCT MCo (motion compensation) */
+
+attribute_deprecated struct xvmc_pix_fmt {
+    /** The field contains the special constant value AV_XVMC_ID.
+        It is used as a test that the application correctly uses the API,
+        and that there is no corruption caused by pixel routines.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             xvmc_id;
+
+    /** Pointer to the block array allocated by XvMCCreateBlocks().
+        The array has to be freed by XvMCDestroyBlocks().
+        Each group of 64 values represents one data block of differential
+        pixel information (in MoCo mode) or coefficients for IDCT.
+        - application - set the pointer during initialization
+        - libavcodec  - fills coefficients/pixel data into the array
+    */
+    short*          data_blocks;
+
+    /** Pointer to the macroblock description array allocated by
+        XvMCCreateMacroBlocks() and freed by XvMCDestroyMacroBlocks().
+        - application - set the pointer during initialization
+        - libavcodec  - fills description data into the array
+    */
+    XvMCMacroBlock* mv_blocks;
+
+    /** Number of macroblock descriptions that can be stored in the mv_blocks
+        array.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             allocated_mv_blocks;
+
+    /** Number of blocks that can be stored at once in the data_blocks array.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             allocated_data_blocks;
+
+    /** Indicate that the hardware would interpret data_blocks as IDCT
+        coefficients and perform IDCT on them.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             idct;
+
+    /** In MoCo mode it indicates that intra macroblocks are assumed to be in
+        unsigned format; same as the XVMC_INTRA_UNSIGNED flag.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             unsigned_intra;
+
+    /** Pointer to the surface allocated by XvMCCreateSurface().
+        It has to be freed by XvMCDestroySurface() on application exit.
+        It identifies the frame and its state on the video hardware.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    XvMCSurface*    p_surface;
+
+/** Set by the decoder before calling ff_draw_horiz_band(),
+    needed by the XvMCRenderSurface function. */
+//@{
+    /** Pointer to the surface used as past reference
+        - application - unchanged
+        - libavcodec  - set
+    */
+    XvMCSurface*    p_past_surface;
+
+    /** Pointer to the surface used as future reference
+        - application - unchanged
+        - libavcodec  - set
+    */
+    XvMCSurface*    p_future_surface;
+
+    /** top/bottom field or frame
+        - application - unchanged
+        - libavcodec  - set
+    */
+    unsigned int    picture_structure;
+
+    /** XVMC_SECOND_FIELD - 1st or 2nd field in the sequence
+        - application - unchanged
+        - libavcodec  - set
+    */
+    unsigned int    flags;
+//}@
+
+    /** Number of macroblock descriptions in the mv_blocks array
+        that have already been passed to the hardware.
+        - application - zeroes it on get_buffer().
+                        A successful ff_draw_horiz_band() may increment it
+                        with filled_mb_block_num or zero both.
+        - libavcodec  - unchanged
+    */
+    int             start_mv_blocks_num;
+
+    /** Number of new macroblock descriptions in the mv_blocks array (after
+        start_mv_blocks_num) that are filled by libavcodec and have to be
+        passed to the hardware.
+        - application - zeroes it on get_buffer() or after successful
+                        ff_draw_horiz_band().
+        - libavcodec  - increment with one of each stored MB
+    */
+    int             filled_mv_blocks_num;
+
+    /** Number of the next free data block; one data block consists of
+        64 short values in the data_blocks array.
+        All blocks before this one have already been claimed by placing their
+        position into the corresponding block description structure field,
+        that are part of the mv_blocks array.
+        - application - zeroes it on get_buffer().
+                        A successful ff_draw_horiz_band() may zero it together
+                        with start_mb_blocks_num.
+        - libavcodec  - each decoded macroblock increases it by the number
+                        of coded blocks it contains.
+    */
+    int             next_free_data_block_num;
+};
+
+/**
+ * @}
+ */
+
+#endif /* FF_API_XVMC */
+
+#endif /* AVCODEC_XVMC_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavformat/avformat.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavformat/avformat.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavformat/avformat.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavformat/avformat.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,1869 @@
+/*
+ * copyright (c) 2001 Fabrice Bellard
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFORMAT_AVFORMAT_H
+#define AVFORMAT_AVFORMAT_H
+
+/**
+ * @file
+ * @ingroup libavf
+ * Main libavformat public API header
+ */
+
+/**
+ * @defgroup libavf I/O and Muxing/Demuxing Library
+ * @{
+ *
+ * Libavformat (lavf) is a library for dealing with various media container
+ * formats. Its main two purposes are demuxing - i.e. splitting a media file
+ * into component streams, and the reverse process of muxing - writing supplied
+ * data in a specified container format. It also has an @ref lavf_io
+ * "I/O module" which supports a number of protocols for accessing the data (e.g.
+ * file, tcp, http and others). Before using lavf, you need to call
+ * av_register_all() to register all compiled muxers, demuxers and protocols.
+ * Unless you are absolutely sure you won't use libavformat's network
+ * capabilities, you should also call avformat_network_init().
+ *
+ * A supported input format is described by an AVInputFormat struct, conversely
+ * an output format is described by AVOutputFormat. You can iterate over all
+ * registered input/output formats using the av_iformat_next() /
+ * av_oformat_next() functions. The protocols layer is not part of the public
+ * API, so you can only get the names of supported protocols with the
+ * avio_enum_protocols() function.
+ *
+ * Main lavf structure used for both muxing and demuxing is AVFormatContext,
+ * which exports all information about the file being read or written. As with
+ * most Libav structures, its size is not part of public ABI, so it cannot be
+ * allocated on stack or directly with av_malloc(). To create an
+ * AVFormatContext, use avformat_alloc_context() (some functions, like
+ * avformat_open_input() might do that for you).
+ *
+ * Most importantly an AVFormatContext contains:
+ * @li the @ref AVFormatContext.iformat "input" or @ref AVFormatContext.oformat
+ * "output" format. It is either autodetected or set by user for input;
+ * always set by user for output.
+ * @li an @ref AVFormatContext.streams "array" of AVStreams, which describe all
+ * elementary streams stored in the file. AVStreams are typically referred to
+ * using their index in this array.
+ * @li an @ref AVFormatContext.pb "I/O context". It is either opened by lavf or
+ * set by user for input, always set by user for output (unless you are dealing
+ * with an AVFMT_NOFILE format).
+ *
+ * @section lavf_options Passing options to (de)muxers
+ * Lavf allows to configure muxers and demuxers using the @ref avoptions
+ * mechanism. Generic (format-independent) libavformat options are provided by
+ * AVFormatContext, they can be examined from a user program by calling
+ * av_opt_next() / av_opt_find() on an allocated AVFormatContext (or its AVClass
+ * from avformat_get_class()). Private (format-specific) options are provided by
+ * AVFormatContext.priv_data if and only if AVInputFormat.priv_class /
+ * AVOutputFormat.priv_class of the corresponding format struct is non-NULL.
+ * Further options may be provided by the @ref AVFormatContext.pb "I/O context",
+ * if its AVClass is non-NULL, and the protocols layer. See the discussion on
+ * nesting in @ref avoptions documentation to learn how to access those.
+ *
+ * @defgroup lavf_decoding Demuxing
+ * @{
+ * Demuxers read a media file and split it into chunks of data (@em packets). A
+ * @ref AVPacket "packet" contains one or more encoded frames which belongs to a
+ * single elementary stream. In the lavf API this process is represented by the
+ * avformat_open_input() function for opening a file, av_read_frame() for
+ * reading a single packet and finally avformat_close_input(), which does the
+ * cleanup.
+ *
+ * @section lavf_decoding_open Opening a media file
+ * The minimum information required to open a file is its URL or filename, which
+ * is passed to avformat_open_input(), as in the following code:
+ * @code
+ * const char    *url = "in.mp3";
+ * AVFormatContext *s = NULL;
+ * int ret = avformat_open_input(&s, url, NULL, NULL);
+ * if (ret < 0)
+ *     abort();
+ * @endcode
+ * The above code attempts to allocate an AVFormatContext, open the
+ * specified file (autodetecting the format) and read the header, exporting the
+ * information stored there into s. Some formats do not have a header or do not
+ * store enough information there, so it is recommended that you call the
+ * avformat_find_stream_info() function which tries to read and decode a few
+ * frames to find missing information.
+ *
+ * In some cases you might want to preallocate an AVFormatContext yourself with
+ * avformat_alloc_context() and do some tweaking on it before passing it to
+ * avformat_open_input(). One such case is when you want to use custom functions
+ * for reading input data instead of lavf internal I/O layer.
+ * To do that, create your own AVIOContext with avio_alloc_context(), passing
+ * your reading callbacks to it. Then set the @em pb field of your
+ * AVFormatContext to newly created AVIOContext.
+ *
+ * Since the format of the opened file is in general not known until after
+ * avformat_open_input() has returned, it is not possible to set demuxer private
+ * options on a preallocated context. Instead, the options should be passed to
+ * avformat_open_input() wrapped in an AVDictionary:
+ * @code
+ * AVDictionary *options = NULL;
+ * av_dict_set(&options, "video_size", "640x480", 0);
+ * av_dict_set(&options, "pixel_format", "rgb24", 0);
+ *
+ * if (avformat_open_input(&s, url, NULL, &options) < 0)
+ *     abort();
+ * av_dict_free(&options);
+ * @endcode
+ * This code passes the private options 'video_size' and 'pixel_format' to the
+ * demuxer. They would be necessary for e.g. the rawvideo demuxer, since it
+ * cannot know how to interpret raw video data otherwise. If the format turns
+ * out to be something different than raw video, those options will not be
+ * recognized by the demuxer and therefore will not be applied. Such unrecognized
+ * options are then returned in the options dictionary (recognized options are
+ * consumed). The calling program can handle such unrecognized options as it
+ * wishes, e.g.
+ * @code
+ * AVDictionaryEntry *e;
+ * if (e = av_dict_get(options, "", NULL, AV_DICT_IGNORE_SUFFIX)) {
+ *     fprintf(stderr, "Option %s not recognized by the demuxer.\n", e->key);
+ *     abort();
+ * }
+ * @endcode
+ *
+ * After you have finished reading the file, you must close it with
+ * avformat_close_input(). It will free everything associated with the file.
+ *
+ * @section lavf_decoding_read Reading from an opened file
+ * Reading data from an opened AVFormatContext is done by repeatedly calling
+ * av_read_frame() on it. Each call, if successful, will return an AVPacket
+ * containing encoded data for one AVStream, identified by
+ * AVPacket.stream_index. This packet may be passed straight into the libavcodec
+ * decoding functions avcodec_decode_video2(), avcodec_decode_audio4() or
+ * avcodec_decode_subtitle2() if the caller wishes to decode the data.
+ *
+ * AVPacket.pts, AVPacket.dts and AVPacket.duration timing information will be
+ * set if known. They may also be unset (i.e. AV_NOPTS_VALUE for
+ * pts/dts, 0 for duration) if the stream does not provide them. The timing
+ * information will be in AVStream.time_base units, i.e. it has to be
+ * multiplied by the timebase to convert them to seconds.
+ *
+ * If AVPacket.buf is set on the returned packet, then the packet is
+ * allocated dynamically and the user may keep it indefinitely.
+ * Otherwise, if AVPacket.buf is NULL, the packet data is backed by a
+ * static storage somewhere inside the demuxer and the packet is only valid
+ * until the next av_read_frame() call or closing the file. If the caller
+ * requires a longer lifetime, av_dup_packet() will make an av_malloc()ed copy
+ * of it.
+ * In both cases, the packet must be freed with av_free_packet() when it is no
+ * longer needed.
+ *
+ * @section lavf_decoding_seek Seeking
+ * @}
+ *
+ * @defgroup lavf_encoding Muxing
+ * @{
+ * Muxers take encoded data in the form of @ref AVPacket "AVPackets" and write
+ * it into files or other output bytestreams in the specified container format.
+ *
+ * The main API functions for muxing are avformat_write_header() for writing the
+ * file header, av_write_frame() / av_interleaved_write_frame() for writing the
+ * packets and av_write_trailer() for finalizing the file.
+ *
+ * At the beginning of the muxing process, the caller must first call
+ * avformat_alloc_context() to create a muxing context. The caller then sets up
+ * the muxer by filling the various fields in this context:
+ *
+ * - The @ref AVFormatContext.oformat "oformat" field must be set to select the
+ *   muxer that will be used.
+ * - Unless the format is of the AVFMT_NOFILE type, the @ref AVFormatContext.pb
+ *   "pb" field must be set to an opened IO context, either returned from
+ *   avio_open2() or a custom one.
+ * - Unless the format is of the AVFMT_NOSTREAMS type, at least one stream must
+ *   be created with the avformat_new_stream() function. The caller should fill
+ *   the @ref AVStream.codec "stream codec context" information, such as the
+ *   codec @ref AVCodecContext.codec_type "type", @ref AVCodecContext.codec_id
+ *   "id" and other parameters (e.g. width / height, the pixel or sample format,
+ *   etc.) as known. The @ref AVCodecContext.time_base "codec timebase" should
+ *   be set to the timebase that the caller desires to use for this stream (note
+ *   that the timebase actually used by the muxer can be different, as will be
+ *   described later).
+ * - The caller may fill in additional information, such as @ref
+ *   AVFormatContext.metadata "global" or @ref AVStream.metadata "per-stream"
+ *   metadata, @ref AVFormatContext.chapters "chapters", @ref
+ *   AVFormatContext.programs "programs", etc. as described in the
+ *   AVFormatContext documentation. Whether such information will actually be
+ *   stored in the output depends on what the container format and the muxer
+ *   support.
+ *
+ * When the muxing context is fully set up, the caller must call
+ * avformat_write_header() to initialize the muxer internals and write the file
+ * header. Whether anything actually is written to the IO context at this step
+ * depends on the muxer, but this function must always be called. Any muxer
+ * private options must be passed in the options parameter to this function.
+ *
+ * The data is then sent to the muxer by repeatedly calling av_write_frame() or
+ * av_interleaved_write_frame() (consult those functions' documentation for
+ * discussion on the difference between them; only one of them may be used with
+ * a single muxing context, they should not be mixed). Do note that the timing
+ * information on the packets sent to the muxer must be in the corresponding
+ * AVStream's timebase. That timebase is set by the muxer (in the
+ * avformat_write_header() step) and may be different from the timebase the
+ * caller set on the codec context.
+ *
+ * Once all the data has been written, the caller must call av_write_trailer()
+ * to flush any buffered packets and finalize the output file, then close the IO
+ * context (if any) and finally free the muxing context with
+ * avformat_free_context().
+ * @}
+ *
+ * @defgroup lavf_io I/O Read/Write
+ * @{
+ * @}
+ *
+ * @defgroup lavf_codec Demuxers
+ * @{
+ * @defgroup lavf_codec_native Native Demuxers
+ * @{
+ * @}
+ * @defgroup lavf_codec_wrappers External library wrappers
+ * @{
+ * @}
+ * @}
+ * @defgroup lavf_protos I/O Protocols
+ * @{
+ * @}
+ * @defgroup lavf_internal Internal
+ * @{
+ * @}
+ * @}
+ *
+ */
+
+#include <time.h>
+#include <stdio.h>  /* FILE */
+#include "libavcodec/avcodec.h"
+#include "libavutil/dict.h"
+#include "libavutil/log.h"
+
+#include "avio.h"
+#include "libavformat/version.h"
+
+struct AVFormatContext;
+
+
+/**
+ * @defgroup metadata_api Public Metadata API
+ * @{
+ * @ingroup libavf
+ * The metadata API allows libavformat to export metadata tags to a client
+ * application when demuxing. Conversely it allows a client application to
+ * set metadata when muxing.
+ *
+ * Metadata is exported or set as pairs of key/value strings in the 'metadata'
+ * fields of the AVFormatContext, AVStream, AVChapter and AVProgram structs
+ * using the @ref lavu_dict "AVDictionary" API. Like all strings in Libav,
+ * metadata is assumed to be UTF-8 encoded Unicode. Note that metadata
+ * exported by demuxers isn't checked to be valid UTF-8 in most cases.
+ *
+ * Important concepts to keep in mind:
+ * -  Keys are unique; there can never be 2 tags with the same key. This is
+ *    also meant semantically, i.e., a demuxer should not knowingly produce
+ *    several keys that are literally different but semantically identical.
+ *    E.g., key=Author5, key=Author6. In this example, all authors must be
+ *    placed in the same tag.
+ * -  Metadata is flat, not hierarchical; there are no subtags. If you
+ *    want to store, e.g., the email address of the child of producer Alice
+ *    and actor Bob, that could have key=alice_and_bobs_childs_email_address.
+ * -  Several modifiers can be applied to the tag name. This is done by
+ *    appending a dash character ('-') and the modifier name in the order
+ *    they appear in the list below -- e.g. foo-eng-sort, not foo-sort-eng.
+ *    -  language -- a tag whose value is localized for a particular language
+ *       is appended with the ISO 639-2/B 3-letter language code.
+ *       For example: Author-ger=Michael, Author-eng=Mike
+ *       The original/default language is in the unqualified "Author" tag.
+ *       A demuxer should set a default if it sets any translated tag.
+ *    -  sorting  -- a modified version of a tag that should be used for
+ *       sorting will have '-sort' appended. E.g. artist="The Beatles",
+ *       artist-sort="Beatles, The".
+ *
+ * -  Demuxers attempt to export metadata in a generic format, however tags
+ *    with no generic equivalents are left as they are stored in the container.
+ *    Follows a list of generic tag names:
+ *
+ @verbatim
+ album        -- name of the set this work belongs to
+ album_artist -- main creator of the set/album, if different from artist.
+                 e.g. "Various Artists" for compilation albums.
+ artist       -- main creator of the work
+ comment      -- any additional description of the file.
+ composer     -- who composed the work, if different from artist.
+ copyright    -- name of copyright holder.
+ creation_time-- date when the file was created, preferably in ISO 8601.
+ date         -- date when the work was created, preferably in ISO 8601.
+ disc         -- number of a subset, e.g. disc in a multi-disc collection.
+ encoder      -- name/settings of the software/hardware that produced the file.
+ encoded_by   -- person/group who created the file.
+ filename     -- original name of the file.
+ genre        -- <self-evident>.
+ language     -- main language in which the work is performed, preferably
+                 in ISO 639-2 format. Multiple languages can be specified by
+                 separating them with commas.
+ performer    -- artist who performed the work, if different from artist.
+                 E.g for "Also sprach Zarathustra", artist would be "Richard
+                 Strauss" and performer "London Philharmonic Orchestra".
+ publisher    -- name of the label/publisher.
+ service_name     -- name of the service in broadcasting (channel name).
+ service_provider -- name of the service provider in broadcasting.
+ title        -- name of the work.
+ track        -- number of this work in the set, can be in form current/total.
+ variant_bitrate -- the total bitrate of the bitrate variant that the current stream is part of
+ @endverbatim
+ *
+ * Look in the examples section for an application example how to use the Metadata API.
+ *
+ * @}
+ */
+
+/* packet functions */
+
+
+/**
+ * Allocate and read the payload of a packet and initialize its
+ * fields with default values.
+ *
+ * @param s    associated IO context
+ * @param pkt packet
+ * @param size desired payload size
+ * @return >0 (read size) if OK, AVERROR_xxx otherwise
+ */
+int av_get_packet(AVIOContext *s, AVPacket *pkt, int size);
+
+
+/**
+ * Read data and append it to the current content of the AVPacket.
+ * If pkt->size is 0 this is identical to av_get_packet.
+ * Note that this uses av_grow_packet and thus involves a realloc
+ * which is inefficient. Thus this function should only be used
+ * when there is no reasonable way to know (an upper bound of)
+ * the final size.
+ *
+ * @param s    associated IO context
+ * @param pkt packet
+ * @param size amount of data to read
+ * @return >0 (read size) if OK, AVERROR_xxx otherwise, previous data
+ *         will not be lost even if an error occurs.
+ */
+int av_append_packet(AVIOContext *s, AVPacket *pkt, int size);
+
+/*************************************************/
+/* fractional numbers for exact pts handling */
+
+/**
+ * The exact value of the fractional number is: 'val + num / den'.
+ * num is assumed to be 0 <= num < den.
+ */
+typedef struct AVFrac {
+    int64_t val, num, den;
+} AVFrac;
+
+/*************************************************/
+/* input/output formats */
+
+struct AVCodecTag;
+
+/**
+ * This structure contains the data a format has to probe a file.
+ */
+typedef struct AVProbeData {
+    const char *filename;
+    unsigned char *buf; /**< Buffer must have AVPROBE_PADDING_SIZE of extra allocated bytes filled with zero. */
+    int buf_size;       /**< Size of buf except extra allocated bytes */
+} AVProbeData;
+
+#define AVPROBE_SCORE_EXTENSION  50 ///< score for file extension
+#define AVPROBE_SCORE_MAX       100 ///< maximum score
+
+#define AVPROBE_PADDING_SIZE 32             ///< extra allocated bytes at the end of the probe buffer
+
+/// Demuxer will use avio_open, no opened file should be provided by the caller.
+#define AVFMT_NOFILE        0x0001
+#define AVFMT_NEEDNUMBER    0x0002 /**< Needs '%d' in filename. */
+#define AVFMT_SHOW_IDS      0x0008 /**< Show format stream IDs numbers. */
+#define AVFMT_RAWPICTURE    0x0020 /**< Format wants AVPicture structure for
+                                      raw picture data. */
+#define AVFMT_GLOBALHEADER  0x0040 /**< Format wants global header. */
+#define AVFMT_NOTIMESTAMPS  0x0080 /**< Format does not need / have any timestamps. */
+#define AVFMT_GENERIC_INDEX 0x0100 /**< Use generic index building code. */
+#define AVFMT_TS_DISCONT    0x0200 /**< Format allows timestamp discontinuities. Note, muxers always require valid (monotone) timestamps */
+#define AVFMT_VARIABLE_FPS  0x0400 /**< Format allows variable fps. */
+#define AVFMT_NODIMENSIONS  0x0800 /**< Format does not need width/height */
+#define AVFMT_NOSTREAMS     0x1000 /**< Format does not require any streams */
+#define AVFMT_NOBINSEARCH   0x2000 /**< Format does not allow to fall back on binary search via read_timestamp */
+#define AVFMT_NOGENSEARCH   0x4000 /**< Format does not allow to fall back on generic search */
+#define AVFMT_NO_BYTE_SEEK  0x8000 /**< Format does not allow seeking by bytes */
+#define AVFMT_ALLOW_FLUSH  0x10000 /**< Format allows flushing. If not set, the muxer will not receive a NULL packet in the write_packet function. */
+#define AVFMT_TS_NONSTRICT 0x20000 /**< Format does not require strictly
+                                        increasing timestamps, but they must
+                                        still be monotonic */
+#define AVFMT_TS_NEGATIVE  0x40000 /**< Format allows muxing negative
+                                        timestamps. If not set the timestamp
+                                        will be shifted in av_write_frame and
+                                        av_interleaved_write_frame so they
+                                        start from 0. */
+
+/**
+ * @addtogroup lavf_encoding
+ * @{
+ */
+typedef struct AVOutputFormat {
+    const char *name;
+    /**
+     * Descriptive name for the format, meant to be more human-readable
+     * than name. You should use the NULL_IF_CONFIG_SMALL() macro
+     * to define it.
+     */
+    const char *long_name;
+    const char *mime_type;
+    const char *extensions; /**< comma-separated filename extensions */
+    /* output support */
+    enum AVCodecID audio_codec;    /**< default audio codec */
+    enum AVCodecID video_codec;    /**< default video codec */
+    enum AVCodecID subtitle_codec; /**< default subtitle codec */
+    /**
+     * can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_RAWPICTURE,
+     * AVFMT_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS,
+     * AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS, AVFMT_ALLOW_FLUSH,
+     * AVFMT_TS_NONSTRICT
+     */
+    int flags;
+
+    /**
+     * List of supported codec_id-codec_tag pairs, ordered by "better
+     * choice first". The arrays are all terminated by AV_CODEC_ID_NONE.
+     */
+    const struct AVCodecTag * const *codec_tag;
+
+
+    const AVClass *priv_class; ///< AVClass for the private context
+
+    /*****************************************************************
+     * No fields below this line are part of the public API. They
+     * may not be used outside of libavformat and can be changed and
+     * removed at will.
+     * New public fields should be added right above.
+     *****************************************************************
+     */
+    struct AVOutputFormat *next;
+    /**
+     * size of private data so that it can be allocated in the wrapper
+     */
+    int priv_data_size;
+
+    int (*write_header)(struct AVFormatContext *);
+    /**
+     * Write a packet. If AVFMT_ALLOW_FLUSH is set in flags,
+     * pkt can be NULL in order to flush data buffered in the muxer.
+     * When flushing, return 0 if there still is more data to flush,
+     * or 1 if everything was flushed and there is no more buffered
+     * data.
+     */
+    int (*write_packet)(struct AVFormatContext *, AVPacket *pkt);
+    int (*write_trailer)(struct AVFormatContext *);
+    /**
+     * Currently only used to set pixel format if not YUV420P.
+     */
+    int (*interleave_packet)(struct AVFormatContext *, AVPacket *out,
+                             AVPacket *in, int flush);
+    /**
+     * Test if the given codec can be stored in this container.
+     *
+     * @return 1 if the codec is supported, 0 if it is not.
+     *         A negative number if unknown.
+     */
+    int (*query_codec)(enum AVCodecID id, int std_compliance);
+} AVOutputFormat;
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup lavf_decoding
+ * @{
+ */
+typedef struct AVInputFormat {
+    /**
+     * A comma separated list of short names for the format. New names
+     * may be appended with a minor bump.
+     */
+    const char *name;
+
+    /**
+     * Descriptive name for the format, meant to be more human-readable
+     * than name. You should use the NULL_IF_CONFIG_SMALL() macro
+     * to define it.
+     */
+    const char *long_name;
+
+    /**
+     * Can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_SHOW_IDS,
+     * AVFMT_GENERIC_INDEX, AVFMT_TS_DISCONT, AVFMT_NOBINSEARCH,
+     * AVFMT_NOGENSEARCH, AVFMT_NO_BYTE_SEEK.
+     */
+    int flags;
+
+    /**
+     * If extensions are defined, then no probe is done. You should
+     * usually not use extension format guessing because it is not
+     * reliable enough
+     */
+    const char *extensions;
+
+    const struct AVCodecTag * const *codec_tag;
+
+    const AVClass *priv_class; ///< AVClass for the private context
+
+    /*****************************************************************
+     * No fields below this line are part of the public API. They
+     * may not be used outside of libavformat and can be changed and
+     * removed at will.
+     * New public fields should be added right above.
+     *****************************************************************
+     */
+    struct AVInputFormat *next;
+
+    /**
+     * Raw demuxers store their codec ID here.
+     */
+    int raw_codec_id;
+
+    /**
+     * Size of private data so that it can be allocated in the wrapper.
+     */
+    int priv_data_size;
+
+    /**
+     * Tell if a given file has a chance of being parsed as this format.
+     * The buffer provided is guaranteed to be AVPROBE_PADDING_SIZE bytes
+     * big so you do not have to check for that unless you need more.
+     */
+    int (*read_probe)(AVProbeData *);
+
+    /**
+     * Read the format header and initialize the AVFormatContext
+     * structure. Return 0 if OK. Only used in raw format right
+     * now. 'avformat_new_stream' should be called to create new streams.
+     */
+    int (*read_header)(struct AVFormatContext *);
+
+    /**
+     * Read one packet and put it in 'pkt'. pts and flags are also
+     * set. 'avformat_new_stream' can be called only if the flag
+     * AVFMTCTX_NOHEADER is used and only in the calling thread (not in a
+     * background thread).
+     * @return 0 on success, < 0 on error.
+     *         When returning an error, pkt must not have been allocated
+     *         or must be freed before returning
+     */
+    int (*read_packet)(struct AVFormatContext *, AVPacket *pkt);
+
+    /**
+     * Close the stream. The AVFormatContext and AVStreams are not
+     * freed by this function
+     */
+    int (*read_close)(struct AVFormatContext *);
+
+    /**
+     * Seek to a given timestamp relative to the frames in
+     * stream component stream_index.
+     * @param stream_index Must not be -1.
+     * @param flags Selects which direction should be preferred if no exact
+     *              match is available.
+     * @return >= 0 on success (but not necessarily the new offset)
+     */
+    int (*read_seek)(struct AVFormatContext *,
+                     int stream_index, int64_t timestamp, int flags);
+
+    /**
+     * Get the next timestamp in stream[stream_index].time_base units.
+     * @return the timestamp or AV_NOPTS_VALUE if an error occurred
+     */
+    int64_t (*read_timestamp)(struct AVFormatContext *s, int stream_index,
+                              int64_t *pos, int64_t pos_limit);
+
+    /**
+     * Start/resume playing - only meaningful if using a network-based format
+     * (RTSP).
+     */
+    int (*read_play)(struct AVFormatContext *);
+
+    /**
+     * Pause playing - only meaningful if using a network-based format
+     * (RTSP).
+     */
+    int (*read_pause)(struct AVFormatContext *);
+
+    /**
+     * Seek to timestamp ts.
+     * Seeking will be done so that the point from which all active streams
+     * can be presented successfully will be closest to ts and within min/max_ts.
+     * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
+     */
+    int (*read_seek2)(struct AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
+} AVInputFormat;
+/**
+ * @}
+ */
+
+enum AVStreamParseType {
+    AVSTREAM_PARSE_NONE,
+    AVSTREAM_PARSE_FULL,       /**< full parsing and repack */
+    AVSTREAM_PARSE_HEADERS,    /**< Only parse headers, do not repack. */
+    AVSTREAM_PARSE_TIMESTAMPS, /**< full parsing and interpolation of timestamps for frames not starting on a packet boundary */
+    AVSTREAM_PARSE_FULL_ONCE,  /**< full parsing and repack of the first frame only, only implemented for H.264 currently */
+};
+
+typedef struct AVIndexEntry {
+    int64_t pos;
+    int64_t timestamp;
+#define AVINDEX_KEYFRAME 0x0001
+    int flags:2;
+    int size:30; //Yeah, trying to keep the size of this small to reduce memory requirements (it is 24 vs. 32 bytes due to possible 8-byte alignment).
+    int min_distance;         /**< Minimum distance between this and the previous keyframe, used to avoid unneeded searching. */
+} AVIndexEntry;
+
+#define AV_DISPOSITION_DEFAULT   0x0001
+#define AV_DISPOSITION_DUB       0x0002
+#define AV_DISPOSITION_ORIGINAL  0x0004
+#define AV_DISPOSITION_COMMENT   0x0008
+#define AV_DISPOSITION_LYRICS    0x0010
+#define AV_DISPOSITION_KARAOKE   0x0020
+
+/**
+ * Track should be used during playback by default.
+ * Useful for subtitle track that should be displayed
+ * even when user did not explicitly ask for subtitles.
+ */
+#define AV_DISPOSITION_FORCED    0x0040
+#define AV_DISPOSITION_HEARING_IMPAIRED  0x0080  /**< stream for hearing impaired audiences */
+#define AV_DISPOSITION_VISUAL_IMPAIRED   0x0100  /**< stream for visual impaired audiences */
+#define AV_DISPOSITION_CLEAN_EFFECTS     0x0200  /**< stream without voice */
+/**
+ * The stream is stored in the file as an attached picture/"cover art" (e.g.
+ * APIC frame in ID3v2). The single packet associated with it will be returned
+ * among the first few packets read from the file unless seeking takes place.
+ * It can also be accessed at any time in AVStream.attached_pic.
+ */
+#define AV_DISPOSITION_ATTACHED_PIC      0x0400
+
+/**
+ * Stream structure.
+ * New fields can be added to the end with minor version bumps.
+ * Removal, reordering and changes to existing fields require a major
+ * version bump.
+ * sizeof(AVStream) must not be used outside libav*.
+ */
+typedef struct AVStream {
+    int index;    /**< stream index in AVFormatContext */
+    /**
+     * Format-specific stream ID.
+     * decoding: set by libavformat
+     * encoding: set by the user, replaced by libavformat if left unset
+     */
+    int id;
+    /**
+     * Codec context associated with this stream. Allocated and freed by
+     * libavformat.
+     *
+     * - decoding: The demuxer exports codec information stored in the headers
+     *             here.
+     * - encoding: The user sets codec information, the muxer writes it to the
+     *             output. Mandatory fields as specified in AVCodecContext
+     *             documentation must be set even if this AVCodecContext is
+     *             not actually used for encoding.
+     */
+    AVCodecContext *codec;
+    void *priv_data;
+
+    /**
+     * encoding: pts generation when outputting stream
+     */
+    struct AVFrac pts;
+
+    /**
+     * This is the fundamental unit of time (in seconds) in terms
+     * of which frame timestamps are represented.
+     *
+     * decoding: set by libavformat
+     * encoding: set by libavformat in avformat_write_header. The muxer may use the
+     * user-provided value of @ref AVCodecContext.time_base "codec->time_base"
+     * as a hint.
+     */
+    AVRational time_base;
+
+    /**
+     * Decoding: pts of the first frame of the stream, in stream time base.
+     * Only set this if you are absolutely 100% sure that the value you set
+     * it to really is the pts of the first frame.
+     * This may be undefined (AV_NOPTS_VALUE).
+     */
+    int64_t start_time;
+
+    /**
+     * Decoding: duration of the stream, in stream time base.
+     * If a source file does not specify a duration, but does specify
+     * a bitrate, this value will be estimated from bitrate and file size.
+     */
+    int64_t duration;
+
+    int64_t nb_frames;                 ///< number of frames in this stream if known or 0
+
+    int disposition; /**< AV_DISPOSITION_* bit field */
+
+    enum AVDiscard discard; ///< Selects which packets can be discarded at will and do not need to be demuxed.
+
+    /**
+     * sample aspect ratio (0 if unknown)
+     * - encoding: Set by user.
+     * - decoding: Set by libavformat.
+     */
+    AVRational sample_aspect_ratio;
+
+    AVDictionary *metadata;
+
+    /**
+     * Average framerate
+     */
+    AVRational avg_frame_rate;
+
+    /**
+     * For streams with AV_DISPOSITION_ATTACHED_PIC disposition, this packet
+     * will contain the attached picture.
+     *
+     * decoding: set by libavformat, must not be modified by the caller.
+     * encoding: unused
+     */
+    AVPacket attached_pic;
+
+    /*****************************************************************
+     * All fields below this line are not part of the public API. They
+     * may not be used outside of libavformat and can be changed and
+     * removed at will.
+     * New public fields should be added right above.
+     *****************************************************************
+     */
+
+    /**
+     * Stream information used internally by av_find_stream_info()
+     */
+#define MAX_STD_TIMEBASES (60*12+5)
+    struct {
+        int nb_decoded_frames;
+        int found_decoder;
+
+        /**
+         * Those are used for average framerate estimation.
+         */
+        int64_t fps_first_dts;
+        int     fps_first_dts_idx;
+        int64_t fps_last_dts;
+        int     fps_last_dts_idx;
+
+    } *info;
+
+    int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
+
+#if FF_API_REFERENCE_DTS
+    /* a hack to keep ABI compatibility for avconv, which accesses parser even
+     * though it should not */
+    int64_t do_not_use;
+#endif
+    // Timestamp generation support:
+    int64_t first_dts;
+    int64_t cur_dts;
+    int64_t last_IP_pts;
+    int last_IP_duration;
+
+    /**
+     * Number of packets to buffer for codec probing
+     */
+#define MAX_PROBE_PACKETS 2500
+    int probe_packets;
+
+    /**
+     * Number of frames that have been demuxed during av_find_stream_info()
+     */
+    int codec_info_nb_frames;
+
+    /* av_read_frame() support */
+    enum AVStreamParseType need_parsing;
+    struct AVCodecParserContext *parser;
+
+    /**
+     * last packet in packet_buffer for this stream when muxing.
+     */
+    struct AVPacketList *last_in_packet_buffer;
+    AVProbeData probe_data;
+#define MAX_REORDER_DELAY 16
+    int64_t pts_buffer[MAX_REORDER_DELAY+1];
+
+    AVIndexEntry *index_entries; /**< Only used if the format does not
+                                    support seeking natively. */
+    int nb_index_entries;
+    unsigned int index_entries_allocated_size;
+} AVStream;
+
+#define AV_PROGRAM_RUNNING 1
+
+/**
+ * New fields can be added to the end with minor version bumps.
+ * Removal, reordering and changes to existing fields require a major
+ * version bump.
+ * sizeof(AVProgram) must not be used outside libav*.
+ */
+typedef struct AVProgram {
+    int            id;
+    int            flags;
+    enum AVDiscard discard;        ///< selects which program to discard and which to feed to the caller
+    unsigned int   *stream_index;
+    unsigned int   nb_stream_indexes;
+    AVDictionary *metadata;
+} AVProgram;
+
+#define AVFMTCTX_NOHEADER      0x0001 /**< signal that no header is present
+                                         (streams are added dynamically) */
+
+typedef struct AVChapter {
+    int id;                 ///< unique ID to identify the chapter
+    AVRational time_base;   ///< time base in which the start/end timestamps are specified
+    int64_t start, end;     ///< chapter start/end time in time_base units
+    AVDictionary *metadata;
+} AVChapter;
+
+typedef struct AVFormatInternal AVFormatInternal;
+
+/**
+ * Format I/O context.
+ * New fields can be added to the end with minor version bumps.
+ * Removal, reordering and changes to existing fields require a major
+ * version bump.
+ * sizeof(AVFormatContext) must not be used outside libav*, use
+ * avformat_alloc_context() to create an AVFormatContext.
+ */
+typedef struct AVFormatContext {
+    /**
+     * A class for logging and @ref avoptions. Set by avformat_alloc_context().
+     * Exports (de)muxer private options if they exist.
+     */
+    const AVClass *av_class;
+
+    /**
+     * The input container format.
+     *
+     * Demuxing only, set by avformat_open_input().
+     */
+    struct AVInputFormat *iformat;
+
+    /**
+     * The output container format.
+     *
+     * Muxing only, must be set by the caller before avformat_write_header().
+     */
+    struct AVOutputFormat *oformat;
+
+    /**
+     * Format private data. This is an AVOptions-enabled struct
+     * if and only if iformat/oformat.priv_class is not NULL.
+     *
+     * - muxing: set by avformat_write_header()
+     * - demuxing: set by avformat_open_input()
+     */
+    void *priv_data;
+
+    /**
+     * I/O context.
+     *
+     * - demuxing: either set by the user before avformat_open_input() (then
+     *             the user must close it manually) or set by avformat_open_input().
+     * - muxing: set by the user before avformat_write_header(). The caller must
+     *           take care of closing / freeing the IO context.
+     *
+     * Do NOT set this field if AVFMT_NOFILE flag is set in
+     * iformat/oformat.flags. In such a case, the (de)muxer will handle
+     * I/O in some other way and this field will be NULL.
+     */
+    AVIOContext *pb;
+
+    /* stream info */
+    int ctx_flags; /**< Format-specific flags, see AVFMTCTX_xx */
+
+    /**
+     * Number of elements in AVFormatContext.streams.
+     *
+     * Set by avformat_new_stream(), must not be modified by any other code.
+     */
+    unsigned int nb_streams;
+    /**
+     * A list of all streams in the file. New streams are created with
+     * avformat_new_stream().
+     *
+     * - demuxing: streams are created by libavformat in avformat_open_input().
+     *             If AVFMTCTX_NOHEADER is set in ctx_flags, then new streams may also
+     *             appear in av_read_frame().
+     * - muxing: streams are created by the user before avformat_write_header().
+     *
+     * Freed by libavformat in avformat_free_context().
+     */
+    AVStream **streams;
+
+    /**
+     * input or output filename
+     *
+     * - demuxing: set by avformat_open_input()
+     * - muxing: may be set by the caller before avformat_write_header()
+     */
+    char filename[1024];
+
+    /**
+     * Position of the first frame of the component, in
+     * AV_TIME_BASE fractional seconds. NEVER set this value directly:
+     * It is deduced from the AVStream values.
+     *
+     * Demuxing only, set by libavformat.
+     */
+    int64_t start_time;
+
+    /**
+     * Duration of the stream, in AV_TIME_BASE fractional
+     * seconds. Only set this value if you know none of the individual stream
+     * durations and also do not set any of them. This is deduced from the
+     * AVStream values if not set.
+     *
+     * Demuxing only, set by libavformat.
+     */
+    int64_t duration;
+
+    /**
+     * Total stream bitrate in bit/s, 0 if not
+     * available. Never set it directly if the file_size and the
+     * duration are known as Libav can compute it automatically.
+     */
+    int bit_rate;
+
+    unsigned int packet_size;
+    int max_delay;
+
+    int flags;
+#define AVFMT_FLAG_GENPTS       0x0001 ///< Generate missing pts even if it requires parsing future frames.
+#define AVFMT_FLAG_IGNIDX       0x0002 ///< Ignore index.
+#define AVFMT_FLAG_NONBLOCK     0x0004 ///< Do not block when reading packets from input.
+#define AVFMT_FLAG_IGNDTS       0x0008 ///< Ignore DTS on frames that contain both DTS & PTS
+#define AVFMT_FLAG_NOFILLIN     0x0010 ///< Do not infer any values from other values, just return what is stored in the container
+#define AVFMT_FLAG_NOPARSE      0x0020 ///< Do not use AVParsers, you also must set AVFMT_FLAG_NOFILLIN as the fillin code works on frames and no parsing -> no frames. Also seeking to frames can not work if parsing to find frame boundaries has been disabled
+#define AVFMT_FLAG_NOBUFFER     0x0040 ///< Do not buffer frames when possible
+#define AVFMT_FLAG_CUSTOM_IO    0x0080 ///< The caller has supplied a custom AVIOContext, don't avio_close() it.
+#define AVFMT_FLAG_DISCARD_CORRUPT  0x0100 ///< Discard frames marked corrupted
+#define AVFMT_FLAG_FLUSH_PACKETS    0x0200 ///< Flush the AVIOContext every packet.
+
+    /**
+     * Maximum size of the data read from input for determining
+     * the input container format.
+     * Demuxing only, set by the caller before avformat_open_input().
+     */
+    unsigned int probesize;
+
+    /**
+     * Maximum duration (in AV_TIME_BASE units) of the data read
+     * from input in avformat_find_stream_info().
+     * Demuxing only, set by the caller before avformat_find_stream_info().
+     */
+    int max_analyze_duration;
+
+    const uint8_t *key;
+    int keylen;
+
+    unsigned int nb_programs;
+    AVProgram **programs;
+
+    /**
+     * Forced video codec_id.
+     * Demuxing: Set by user.
+     */
+    enum AVCodecID video_codec_id;
+
+    /**
+     * Forced audio codec_id.
+     * Demuxing: Set by user.
+     */
+    enum AVCodecID audio_codec_id;
+
+    /**
+     * Forced subtitle codec_id.
+     * Demuxing: Set by user.
+     */
+    enum AVCodecID subtitle_codec_id;
+
+    /**
+     * Maximum amount of memory in bytes to use for the index of each stream.
+     * If the index exceeds this size, entries will be discarded as
+     * needed to maintain a smaller size. This can lead to slower or less
+     * accurate seeking (depends on demuxer).
+     * Demuxers for which a full in-memory index is mandatory will ignore
+     * this.
+     * - muxing: unused
+     * - demuxing: set by user
+     */
+    unsigned int max_index_size;
+
+    /**
+     * Maximum amount of memory in bytes to use for buffering frames
+     * obtained from realtime capture devices.
+     */
+    unsigned int max_picture_buffer;
+
+    /**
+     * Number of chapters in AVChapter array.
+     * When muxing, chapters are normally written in the file header,
+     * so nb_chapters should normally be initialized before write_header
+     * is called. Some muxers (e.g. mov and mkv) can also write chapters
+     * in the trailer.  To write chapters in the trailer, nb_chapters
+     * must be zero when write_header is called and non-zero when
+     * write_trailer is called.
+     * - muxing: set by user
+     * - demuxing: set by libavformat
+     */
+    unsigned int nb_chapters;
+    AVChapter **chapters;
+
+    /**
+     * Metadata that applies to the whole file.
+     *
+     * - demuxing: set by libavformat in avformat_open_input()
+     * - muxing: may be set by the caller before avformat_write_header()
+     *
+     * Freed by libavformat in avformat_free_context().
+     */
+    AVDictionary *metadata;
+
+    /**
+     * Start time of the stream in real world time, in microseconds
+     * since the Unix epoch (00:00 1st January 1970). That is, pts=0 in the
+     * stream was captured at this real world time.
+     * Muxing only, set by the caller before avformat_write_header().
+     */
+    int64_t start_time_realtime;
+
+    /**
+     * The number of frames used for determining the framerate in
+     * avformat_find_stream_info().
+     * Demuxing only, set by the caller before avformat_find_stream_info().
+     */
+    int fps_probe_size;
+
+    /**
+     * Error recognition; higher values will detect more errors but may
+     * misdetect some more or less valid parts as errors.
+     * Demuxing only, set by the caller before avformat_open_input().
+     */
+    int error_recognition;
+
+    /**
+     * Custom interrupt callbacks for the I/O layer.
+     *
+     * demuxing: set by the user before avformat_open_input().
+     * muxing: set by the user before avformat_write_header()
+     * (mainly useful for AVFMT_NOFILE formats). The callback
+     * should also be passed to avio_open2() if it's used to
+     * open the file.
+     */
+    AVIOInterruptCB interrupt_callback;
+
+    /**
+     * Flags to enable debugging.
+     */
+    int debug;
+#define FF_FDEBUG_TS        0x0001
+
+    /**
+     * Maximum buffering duration for interleaving.
+     *
+     * To ensure all the streams are interleaved correctly,
+     * av_interleaved_write_frame() will wait until it has at least one packet
+     * for each stream before actually writing any packets to the output file.
+     * When some streams are "sparse" (i.e. there are large gaps between
+     * successive packets), this can result in excessive buffering.
+     *
+     * This field specifies the maximum difference between the timestamps of the
+     * first and the last packet in the muxing queue, above which libavformat
+     * will output a packet regardless of whether it has queued a packet for all
+     * the streams.
+     *
+     * Muxing only, set by the caller before avformat_write_header().
+     */
+    int64_t max_interleave_delta;
+
+    /*****************************************************************
+     * All fields below this line are not part of the public API. They
+     * may not be used outside of libavformat and can be changed and
+     * removed at will.
+     * New public fields should be added right above.
+     *****************************************************************
+     */
+
+    /**
+     * This buffer is only needed when packets were already buffered but
+     * not decoded, for example to get the codec parameters in MPEG
+     * streams.
+     */
+    struct AVPacketList *packet_buffer;
+    struct AVPacketList *packet_buffer_end;
+
+    /* av_seek_frame() support */
+    int64_t data_offset; /**< offset of the first packet */
+
+    /**
+     * Raw packets from the demuxer, prior to parsing and decoding.
+     * This buffer is used for buffering packets until the codec can
+     * be identified, as parsing cannot be done without knowing the
+     * codec.
+     */
+    struct AVPacketList *raw_packet_buffer;
+    struct AVPacketList *raw_packet_buffer_end;
+    /**
+     * Packets split by the parser get queued here.
+     */
+    struct AVPacketList *parse_queue;
+    struct AVPacketList *parse_queue_end;
+    /**
+     * Remaining size available for raw_packet_buffer, in bytes.
+     */
+#define RAW_PACKET_BUFFER_SIZE 2500000
+    int raw_packet_buffer_remaining_size;
+
+    /**
+     * Offset to remap timestamps to be non-negative.
+     * Expressed in timebase units.
+     */
+    int64_t offset;
+
+    /**
+     * Timebase for the timestamp offset.
+     */
+    AVRational offset_timebase;
+
+    /**
+     * An opaque field for libavformat internal usage.
+     * Must not be accessed in any way by callers.
+     */
+    AVFormatInternal *internal;
+} AVFormatContext;
+
+typedef struct AVPacketList {
+    AVPacket pkt;
+    struct AVPacketList *next;
+} AVPacketList;
+
+
+/**
+ * @defgroup lavf_core Core functions
+ * @ingroup libavf
+ *
+ * Functions for querying libavformat capabilities, allocating core structures,
+ * etc.
+ * @{
+ */
+
+/**
+ * Return the LIBAVFORMAT_VERSION_INT constant.
+ */
+unsigned avformat_version(void);
+
+/**
+ * Return the libavformat build-time configuration.
+ */
+const char *avformat_configuration(void);
+
+/**
+ * Return the libavformat license.
+ */
+const char *avformat_license(void);
+
+/**
+ * Initialize libavformat and register all the muxers, demuxers and
+ * protocols. If you do not call this function, then you can select
+ * exactly which formats you want to support.
+ *
+ * @see av_register_input_format()
+ * @see av_register_output_format()
+ * @see av_register_protocol()
+ */
+void av_register_all(void);
+
+void av_register_input_format(AVInputFormat *format);
+void av_register_output_format(AVOutputFormat *format);
+
+/**
+ * Do global initialization of network components. This is optional,
+ * but recommended, since it avoids the overhead of implicitly
+ * doing the setup for each session.
+ *
+ * Calling this function will become mandatory if using network
+ * protocols at some major version bump.
+ */
+int avformat_network_init(void);
+
+/**
+ * Undo the initialization done by avformat_network_init.
+ */
+int avformat_network_deinit(void);
+
+/**
+ * If f is NULL, returns the first registered input format,
+ * if f is non-NULL, returns the next registered input format after f
+ * or NULL if f is the last one.
+ */
+AVInputFormat  *av_iformat_next(AVInputFormat  *f);
+
+/**
+ * If f is NULL, returns the first registered output format,
+ * if f is non-NULL, returns the next registered output format after f
+ * or NULL if f is the last one.
+ */
+AVOutputFormat *av_oformat_next(AVOutputFormat *f);
+
+/**
+ * Allocate an AVFormatContext.
+ * avformat_free_context() can be used to free the context and everything
+ * allocated by the framework within it.
+ */
+AVFormatContext *avformat_alloc_context(void);
+
+/**
+ * Free an AVFormatContext and all its streams.
+ * @param s context to free
+ */
+void avformat_free_context(AVFormatContext *s);
+
+/**
+ * Get the AVClass for AVFormatContext. It can be used in combination with
+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
+ *
+ * @see av_opt_find().
+ */
+const AVClass *avformat_get_class(void);
+
+/**
+ * Add a new stream to a media file.
+ *
+ * When demuxing, it is called by the demuxer in read_header(). If the
+ * flag AVFMTCTX_NOHEADER is set in s.ctx_flags, then it may also
+ * be called in read_packet().
+ *
+ * When muxing, should be called by the user before avformat_write_header().
+ *
+ * @param s media file handle
+ * @param c If non-NULL, the AVCodecContext corresponding to the new stream
+ * will be initialized to use this codec. This is needed for e.g. codec-specific
+ * defaults to be set, so codec should be provided if it is known.
+ *
+ * @return newly created stream or NULL on error.
+ */
+AVStream *avformat_new_stream(AVFormatContext *s, AVCodec *c);
+
+AVProgram *av_new_program(AVFormatContext *s, int id);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @addtogroup lavf_decoding
+ * @{
+ */
+
+/**
+ * Find AVInputFormat based on the short name of the input format.
+ */
+AVInputFormat *av_find_input_format(const char *short_name);
+
+/**
+ * Guess the file format.
+ *
+ * @param pd        data to be probed
+ * @param is_opened Whether the file is already opened; determines whether
+ *                  demuxers with or without AVFMT_NOFILE are probed.
+ */
+AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened);
+
+/**
+ * Guess the file format.
+ *
+ * @param pd        data to be probed
+ * @param is_opened Whether the file is already opened; determines whether
+ *                  demuxers with or without AVFMT_NOFILE are probed.
+ * @param score_max A probe score larger that this is required to accept a
+ *                  detection, the variable is set to the actual detection
+ *                  score afterwards.
+ *                  If the score is <= AVPROBE_SCORE_MAX / 4 it is recommended
+ *                  to retry with a larger probe buffer.
+ */
+AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max);
+
+/**
+ * Probe a bytestream to determine the input format. Each time a probe returns
+ * with a score that is too low, the probe buffer size is increased and another
+ * attempt is made. When the maximum probe size is reached, the input format
+ * with the highest score is returned.
+ *
+ * @param pb the bytestream to probe
+ * @param fmt the input format is put here
+ * @param filename the filename of the stream
+ * @param logctx the log context
+ * @param offset the offset within the bytestream to probe from
+ * @param max_probe_size the maximum probe buffer size (zero for default)
+ * @return 0 in case of success, a negative value corresponding to an
+ * AVERROR code otherwise
+ */
+int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
+                          const char *filename, void *logctx,
+                          unsigned int offset, unsigned int max_probe_size);
+
+/**
+ * Open an input stream and read the header. The codecs are not opened.
+ * The stream must be closed with avformat_close_input().
+ *
+ * @param ps Pointer to user-supplied AVFormatContext (allocated by avformat_alloc_context).
+ *           May be a pointer to NULL, in which case an AVFormatContext is allocated by this
+ *           function and written into ps.
+ *           Note that a user-supplied AVFormatContext will be freed on failure.
+ * @param filename Name of the stream to open.
+ * @param fmt If non-NULL, this parameter forces a specific input format.
+ *            Otherwise the format is autodetected.
+ * @param options  A dictionary filled with AVFormatContext and demuxer-private options.
+ *                 On return this parameter will be destroyed and replaced with a dict containing
+ *                 options that were not found. May be NULL.
+ *
+ * @return 0 on success, a negative AVERROR on failure.
+ *
+ * @note If you want to use custom IO, preallocate the format context and set its pb field.
+ */
+int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputFormat *fmt, AVDictionary **options);
+
+/**
+ * Read packets of a media file to get stream information. This
+ * is useful for file formats with no headers such as MPEG. This
+ * function also computes the real framerate in case of MPEG-2 repeat
+ * frame mode.
+ * The logical file position is not changed by this function;
+ * examined packets may be buffered for later processing.
+ *
+ * @param ic media file handle
+ * @param options  If non-NULL, an ic.nb_streams long array of pointers to
+ *                 dictionaries, where i-th member contains options for
+ *                 codec corresponding to i-th stream.
+ *                 On return each dictionary will be filled with options that were not found.
+ * @return >=0 if OK, AVERROR_xxx on error
+ *
+ * @note this function isn't guaranteed to open all the codecs, so
+ *       options being non-empty at return is a perfectly normal behavior.
+ *
+ * @todo Let the user decide somehow what information is needed so that
+ *       we do not waste time getting stuff the user does not need.
+ */
+int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options);
+
+/**
+ * Find the "best" stream in the file.
+ * The best stream is determined according to various heuristics as the most
+ * likely to be what the user expects.
+ * If the decoder parameter is non-NULL, av_find_best_stream will find the
+ * default decoder for the stream's codec; streams for which no decoder can
+ * be found are ignored.
+ *
+ * @param ic                media file handle
+ * @param type              stream type: video, audio, subtitles, etc.
+ * @param wanted_stream_nb  user-requested stream number,
+ *                          or -1 for automatic selection
+ * @param related_stream    try to find a stream related (eg. in the same
+ *                          program) to this one, or -1 if none
+ * @param decoder_ret       if non-NULL, returns the decoder for the
+ *                          selected stream
+ * @param flags             flags; none are currently defined
+ * @return  the non-negative stream number in case of success,
+ *          AVERROR_STREAM_NOT_FOUND if no stream with the requested type
+ *          could be found,
+ *          AVERROR_DECODER_NOT_FOUND if streams were found but no decoder
+ * @note  If av_find_best_stream returns successfully and decoder_ret is not
+ *        NULL, then *decoder_ret is guaranteed to be set to a valid AVCodec.
+ */
+int av_find_best_stream(AVFormatContext *ic,
+                        enum AVMediaType type,
+                        int wanted_stream_nb,
+                        int related_stream,
+                        AVCodec **decoder_ret,
+                        int flags);
+
+/**
+ * Return the next frame of a stream.
+ * This function returns what is stored in the file, and does not validate
+ * that what is there are valid frames for the decoder. It will split what is
+ * stored in the file into frames and return one for each call. It will not
+ * omit invalid data between valid frames so as to give the decoder the maximum
+ * information possible for decoding.
+ *
+ * If pkt->buf is NULL, then the packet is valid until the next
+ * av_read_frame() or until avformat_close_input(). Otherwise the packet
+ * is valid indefinitely. In both cases the packet must be freed with
+ * av_free_packet when it is no longer needed. For video, the packet contains
+ * exactly one frame. For audio, it contains an integer number of frames if each
+ * frame has a known fixed size (e.g. PCM or ADPCM data). If the audio frames
+ * have a variable size (e.g. MPEG audio), then it contains one frame.
+ *
+ * pkt->pts, pkt->dts and pkt->duration are always set to correct
+ * values in AVStream.time_base units (and guessed if the format cannot
+ * provide them). pkt->pts can be AV_NOPTS_VALUE if the video format
+ * has B-frames, so it is better to rely on pkt->dts if you do not
+ * decompress the payload.
+ *
+ * @return 0 if OK, < 0 on error or end of file
+ */
+int av_read_frame(AVFormatContext *s, AVPacket *pkt);
+
+/**
+ * Seek to the keyframe at timestamp.
+ * 'timestamp' in 'stream_index'.
+ *
+ * @param s media file handle
+ * @param stream_index If stream_index is (-1), a default
+ * stream is selected, and timestamp is automatically converted
+ * from AV_TIME_BASE units to the stream specific time_base.
+ * @param timestamp Timestamp in AVStream.time_base units
+ *        or, if no stream is specified, in AV_TIME_BASE units.
+ * @param flags flags which select direction and seeking mode
+ * @return >= 0 on success
+ */
+int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp,
+                  int flags);
+
+/**
+ * Seek to timestamp ts.
+ * Seeking will be done so that the point from which all active streams
+ * can be presented successfully will be closest to ts and within min/max_ts.
+ * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
+ *
+ * If flags contain AVSEEK_FLAG_BYTE, then all timestamps are in bytes and
+ * are the file position (this may not be supported by all demuxers).
+ * If flags contain AVSEEK_FLAG_FRAME, then all timestamps are in frames
+ * in the stream with stream_index (this may not be supported by all demuxers).
+ * Otherwise all timestamps are in units of the stream selected by stream_index
+ * or if stream_index is -1, in AV_TIME_BASE units.
+ * If flags contain AVSEEK_FLAG_ANY, then non-keyframes are treated as
+ * keyframes (this may not be supported by all demuxers).
+ *
+ * @param s media file handle
+ * @param stream_index index of the stream which is used as time base reference
+ * @param min_ts smallest acceptable timestamp
+ * @param ts target timestamp
+ * @param max_ts largest acceptable timestamp
+ * @param flags flags
+ * @return >=0 on success, error code otherwise
+ *
+ * @note This is part of the new seek API which is still under construction.
+ *       Thus do not use this yet. It may change at any time, do not expect
+ *       ABI compatibility yet!
+ */
+int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
+
+/**
+ * Start playing a network-based stream (e.g. RTSP stream) at the
+ * current position.
+ */
+int av_read_play(AVFormatContext *s);
+
+/**
+ * Pause a network-based stream (e.g. RTSP stream).
+ *
+ * Use av_read_play() to resume it.
+ */
+int av_read_pause(AVFormatContext *s);
+
+/**
+ * Close an opened input AVFormatContext. Free it and all its contents
+ * and set *s to NULL.
+ */
+void avformat_close_input(AVFormatContext **s);
+/**
+ * @}
+ */
+
+#define AVSEEK_FLAG_BACKWARD 1 ///< seek backward
+#define AVSEEK_FLAG_BYTE     2 ///< seeking based on position in bytes
+#define AVSEEK_FLAG_ANY      4 ///< seek to any frame, even non-keyframes
+#define AVSEEK_FLAG_FRAME    8 ///< seeking based on frame number
+
+/**
+ * @addtogroup lavf_encoding
+ * @{
+ */
+/**
+ * Allocate the stream private data and write the stream header to
+ * an output media file.
+ *
+ * @param s Media file handle, must be allocated with avformat_alloc_context().
+ *          Its oformat field must be set to the desired output format;
+ *          Its pb field must be set to an already opened AVIOContext.
+ * @param options  An AVDictionary filled with AVFormatContext and muxer-private options.
+ *                 On return this parameter will be destroyed and replaced with a dict containing
+ *                 options that were not found. May be NULL.
+ *
+ * @return 0 on success, negative AVERROR on failure.
+ *
+ * @see av_opt_find, av_dict_set, avio_open, av_oformat_next.
+ */
+int avformat_write_header(AVFormatContext *s, AVDictionary **options);
+
+/**
+ * Write a packet to an output media file.
+ *
+ * This function passes the packet directly to the muxer, without any buffering
+ * or reordering. The caller is responsible for correctly interleaving the
+ * packets if the format requires it. Callers that want libavformat to handle
+ * the interleaving should call av_interleaved_write_frame() instead of this
+ * function.
+ *
+ * @param s media file handle
+ * @param pkt The packet containing the data to be written. Note that unlike
+ *            av_interleaved_write_frame(), this function does not take
+ *            ownership of the packet passed to it (though some muxers may make
+ *            an internal reference to the input packet).
+ *            <br>
+ *            This parameter can be NULL (at any time, not just at the end), in
+ *            order to immediately flush data buffered within the muxer, for
+ *            muxers that buffer up data internally before writing it to the
+ *            output.
+ *            <br>
+ *            Packet's @ref AVPacket.stream_index "stream_index" field must be
+ *            set to the index of the corresponding stream in @ref
+ *            AVFormatContext.streams "s->streams". It is very strongly
+ *            recommended that timing information (@ref AVPacket.pts "pts", @ref
+ *            AVPacket.dts "dts", @ref AVPacket.duration "duration") is set to
+ *            correct values.
+ * @return < 0 on error, = 0 if OK, 1 if flushed and there is no more data to flush
+ *
+ * @see av_interleaved_write_frame()
+ */
+int av_write_frame(AVFormatContext *s, AVPacket *pkt);
+
+/**
+ * Write a packet to an output media file ensuring correct interleaving.
+ *
+ * This function will buffer the packets internally as needed to make sure the
+ * packets in the output file are properly interleaved in the order of
+ * increasing dts. Callers doing their own interleaving should call
+ * av_write_frame() instead of this function.
+ *
+ * @param s media file handle
+ * @param pkt The packet containing the data to be written.
+ *            <br>
+ *            If the packet is reference-counted, this function will take
+ *            ownership of this reference and unreference it later when it sees
+ *            fit.
+ *            The caller must not access the data through this reference after
+ *            this function returns. If the packet is not reference-counted,
+ *            libavformat will make a copy.
+ *            <br>
+ *            This parameter can be NULL (at any time, not just at the end), to
+ *            flush the interleaving queues.
+ *            <br>
+ *            Packet's @ref AVPacket.stream_index "stream_index" field must be
+ *            set to the index of the corresponding stream in @ref
+ *            AVFormatContext.streams "s->streams". It is very strongly
+ *            recommended that timing information (@ref AVPacket.pts "pts", @ref
+ *            AVPacket.dts "dts", @ref AVPacket.duration "duration") is set to
+ *            correct values.
+ *
+ * @return 0 on success, a negative AVERROR on error. Libavformat will always
+ *         take care of freeing the packet, even if this function fails.
+ *
+ * @see av_write_frame(), AVFormatContext.max_interleave_delta
+ */
+int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt);
+
+/**
+ * Write the stream trailer to an output media file and free the
+ * file private data.
+ *
+ * May only be called after a successful call to avformat_write_header.
+ *
+ * @param s media file handle
+ * @return 0 if OK, AVERROR_xxx on error
+ */
+int av_write_trailer(AVFormatContext *s);
+
+/**
+ * Return the output format in the list of registered output formats
+ * which best matches the provided parameters, or return NULL if
+ * there is no match.
+ *
+ * @param short_name if non-NULL checks if short_name matches with the
+ * names of the registered formats
+ * @param filename if non-NULL checks if filename terminates with the
+ * extensions of the registered formats
+ * @param mime_type if non-NULL checks if mime_type matches with the
+ * MIME type of the registered formats
+ */
+AVOutputFormat *av_guess_format(const char *short_name,
+                                const char *filename,
+                                const char *mime_type);
+
+/**
+ * Guess the codec ID based upon muxer and filename.
+ */
+enum AVCodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
+                            const char *filename, const char *mime_type,
+                            enum AVMediaType type);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @defgroup lavf_misc Utility functions
+ * @ingroup libavf
+ * @{
+ *
+ * Miscellaneous utility functions related to both muxing and demuxing
+ * (or neither).
+ */
+
+/**
+ * Send a nice hexadecimal dump of a buffer to the specified file stream.
+ *
+ * @param f The file stream pointer where the dump should be sent to.
+ * @param buf buffer
+ * @param size buffer size
+ *
+ * @see av_hex_dump_log, av_pkt_dump2, av_pkt_dump_log2
+ */
+void av_hex_dump(FILE *f, const uint8_t *buf, int size);
+
+/**
+ * Send a nice hexadecimal dump of a buffer to the log.
+ *
+ * @param avcl A pointer to an arbitrary struct of which the first field is a
+ * pointer to an AVClass struct.
+ * @param level The importance level of the message, lower values signifying
+ * higher importance.
+ * @param buf buffer
+ * @param size buffer size
+ *
+ * @see av_hex_dump, av_pkt_dump2, av_pkt_dump_log2
+ */
+void av_hex_dump_log(void *avcl, int level, const uint8_t *buf, int size);
+
+/**
+ * Send a nice dump of a packet to the specified file stream.
+ *
+ * @param f The file stream pointer where the dump should be sent to.
+ * @param pkt packet to dump
+ * @param dump_payload True if the payload must be displayed, too.
+ * @param st AVStream that the packet belongs to
+ */
+void av_pkt_dump2(FILE *f, AVPacket *pkt, int dump_payload, AVStream *st);
+
+
+/**
+ * Send a nice dump of a packet to the log.
+ *
+ * @param avcl A pointer to an arbitrary struct of which the first field is a
+ * pointer to an AVClass struct.
+ * @param level The importance level of the message, lower values signifying
+ * higher importance.
+ * @param pkt packet to dump
+ * @param dump_payload True if the payload must be displayed, too.
+ * @param st AVStream that the packet belongs to
+ */
+void av_pkt_dump_log2(void *avcl, int level, AVPacket *pkt, int dump_payload,
+                      AVStream *st);
+
+/**
+ * Get the AVCodecID for the given codec tag tag.
+ * If no codec id is found returns AV_CODEC_ID_NONE.
+ *
+ * @param tags list of supported codec_id-codec_tag pairs, as stored
+ * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
+ * @param tag  codec tag to match to a codec ID
+ */
+enum AVCodecID av_codec_get_id(const struct AVCodecTag * const *tags, unsigned int tag);
+
+/**
+ * Get the codec tag for the given codec id id.
+ * If no codec tag is found returns 0.
+ *
+ * @param tags list of supported codec_id-codec_tag pairs, as stored
+ * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
+ * @param id   codec ID to match to a codec tag
+ */
+unsigned int av_codec_get_tag(const struct AVCodecTag * const *tags, enum AVCodecID id);
+
+int av_find_default_stream_index(AVFormatContext *s);
+
+/**
+ * Get the index for a specific timestamp.
+ *
+ * @param st        stream that the timestamp belongs to
+ * @param timestamp timestamp to retrieve the index for
+ * @param flags if AVSEEK_FLAG_BACKWARD then the returned index will correspond
+ *                 to the timestamp which is <= the requested one, if backward
+ *                 is 0, then it will be >=
+ *              if AVSEEK_FLAG_ANY seek to any frame, only keyframes otherwise
+ * @return < 0 if no such timestamp could be found
+ */
+int av_index_search_timestamp(AVStream *st, int64_t timestamp, int flags);
+
+/**
+ * Add an index entry into a sorted list. Update the entry if the list
+ * already contains it.
+ *
+ * @param timestamp timestamp in the time base of the given stream
+ */
+int av_add_index_entry(AVStream *st, int64_t pos, int64_t timestamp,
+                       int size, int distance, int flags);
+
+
+/**
+ * Split a URL string into components.
+ *
+ * The pointers to buffers for storing individual components may be null,
+ * in order to ignore that component. Buffers for components not found are
+ * set to empty strings. If the port is not found, it is set to a negative
+ * value.
+ *
+ * @param proto the buffer for the protocol
+ * @param proto_size the size of the proto buffer
+ * @param authorization the buffer for the authorization
+ * @param authorization_size the size of the authorization buffer
+ * @param hostname the buffer for the host name
+ * @param hostname_size the size of the hostname buffer
+ * @param port_ptr a pointer to store the port number in
+ * @param path the buffer for the path
+ * @param path_size the size of the path buffer
+ * @param url the URL to split
+ */
+void av_url_split(char *proto,         int proto_size,
+                  char *authorization, int authorization_size,
+                  char *hostname,      int hostname_size,
+                  int *port_ptr,
+                  char *path,          int path_size,
+                  const char *url);
+
+
+void av_dump_format(AVFormatContext *ic,
+                    int index,
+                    const char *url,
+                    int is_output);
+
+/**
+ * Return in 'buf' the path with '%d' replaced by a number.
+ *
+ * Also handles the '%0nd' format where 'n' is the total number
+ * of digits and '%%'.
+ *
+ * @param buf destination buffer
+ * @param buf_size destination buffer size
+ * @param path numbered sequence string
+ * @param number frame number
+ * @return 0 if OK, -1 on format error
+ */
+int av_get_frame_filename(char *buf, int buf_size,
+                          const char *path, int number);
+
+/**
+ * Check whether filename actually is a numbered sequence generator.
+ *
+ * @param filename possible numbered sequence string
+ * @return 1 if a valid numbered sequence string, 0 otherwise
+ */
+int av_filename_number_test(const char *filename);
+
+/**
+ * Generate an SDP for an RTP session.
+ *
+ * Note, this overwrites the id values of AVStreams in the muxer contexts
+ * for getting unique dynamic payload types.
+ *
+ * @param ac array of AVFormatContexts describing the RTP streams. If the
+ *           array is composed by only one context, such context can contain
+ *           multiple AVStreams (one AVStream per RTP stream). Otherwise,
+ *           all the contexts in the array (an AVCodecContext per RTP stream)
+ *           must contain only one AVStream.
+ * @param n_files number of AVCodecContexts contained in ac
+ * @param buf buffer where the SDP will be stored (must be allocated by
+ *            the caller)
+ * @param size the size of the buffer
+ * @return 0 if OK, AVERROR_xxx on error
+ */
+int av_sdp_create(AVFormatContext *ac[], int n_files, char *buf, int size);
+
+/**
+ * Return a positive value if the given filename has one of the given
+ * extensions, 0 otherwise.
+ *
+ * @param filename   file name to check against the given extensions
+ * @param extensions a comma-separated list of filename extensions
+ */
+int av_match_ext(const char *filename, const char *extensions);
+
+/**
+ * Test if the given container can store a codec.
+ *
+ * @param ofmt           container to check for compatibility
+ * @param codec_id       codec to potentially store in container
+ * @param std_compliance standards compliance level, one of FF_COMPLIANCE_*
+ *
+ * @return 1 if codec with ID codec_id can be stored in ofmt, 0 if it cannot.
+ *         A negative number if this information is not available.
+ */
+int avformat_query_codec(AVOutputFormat *ofmt, enum AVCodecID codec_id, int std_compliance);
+
+/**
+ * @defgroup riff_fourcc RIFF FourCCs
+ * @{
+ * Get the tables mapping RIFF FourCCs to libavcodec AVCodecIDs. The tables are
+ * meant to be passed to av_codec_get_id()/av_codec_get_tag() as in the
+ * following code:
+ * @code
+ * uint32_t tag = MKTAG('H', '2', '6', '4');
+ * const struct AVCodecTag *table[] = { avformat_get_riff_video_tags(), 0 };
+ * enum AVCodecID id = av_codec_get_id(table, tag);
+ * @endcode
+ */
+/**
+ * @return the table mapping RIFF FourCCs for video to libavcodec AVCodecID.
+ */
+const struct AVCodecTag *avformat_get_riff_video_tags(void);
+/**
+ * @return the table mapping RIFF FourCCs for audio to AVCodecID.
+ */
+const struct AVCodecTag *avformat_get_riff_audio_tags(void);
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#endif /* AVFORMAT_AVFORMAT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavformat/avio.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavformat/avio.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavformat/avio.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavformat/avio.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,439 @@
+/*
+ * copyright (c) 2001 Fabrice Bellard
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#ifndef AVFORMAT_AVIO_H
+#define AVFORMAT_AVIO_H
+
+/**
+ * @file
+ * @ingroup lavf_io
+ * Buffered I/O operations
+ */
+
+#include <stdint.h>
+
+#include "libavutil/common.h"
+#include "libavutil/dict.h"
+#include "libavutil/log.h"
+
+#include "libavformat/version.h"
+
+
+#define AVIO_SEEKABLE_NORMAL 0x0001 /**< Seeking works like for a local file */
+
+/**
+ * Callback for checking whether to abort blocking functions.
+ * AVERROR_EXIT is returned in this case by the interrupted
+ * function. During blocking operations, callback is called with
+ * opaque as parameter. If the callback returns 1, the
+ * blocking operation will be aborted.
+ *
+ * No members can be added to this struct without a major bump, if
+ * new elements have been added after this struct in AVFormatContext
+ * or AVIOContext.
+ */
+typedef struct AVIOInterruptCB {
+    int (*callback)(void*);
+    void *opaque;
+} AVIOInterruptCB;
+
+/**
+ * Bytestream IO Context.
+ * New fields can be added to the end with minor version bumps.
+ * Removal, reordering and changes to existing fields require a major
+ * version bump.
+ * sizeof(AVIOContext) must not be used outside libav*.
+ *
+ * @note None of the function pointers in AVIOContext should be called
+ *       directly, they should only be set by the client application
+ *       when implementing custom I/O. Normally these are set to the
+ *       function pointers specified in avio_alloc_context()
+ */
+typedef struct AVIOContext {
+    /**
+     * A class for private options.
+     *
+     * If this AVIOContext is created by avio_open2(), av_class is set and
+     * passes the options down to protocols.
+     *
+     * If this AVIOContext is manually allocated, then av_class may be set by
+     * the caller.
+     *
+     * warning -- this field can be NULL, be sure to not pass this AVIOContext
+     * to any av_opt_* functions in that case.
+     */
+    const AVClass *av_class;
+    unsigned char *buffer;  /**< Start of the buffer. */
+    int buffer_size;        /**< Maximum buffer size */
+    unsigned char *buf_ptr; /**< Current position in the buffer */
+    unsigned char *buf_end; /**< End of the data, may be less than
+                                 buffer+buffer_size if the read function returned
+                                 less data than requested, e.g. for streams where
+                                 no more data has been received yet. */
+    void *opaque;           /**< A private pointer, passed to the read/write/seek/...
+                                 functions. */
+    int (*read_packet)(void *opaque, uint8_t *buf, int buf_size);
+    int (*write_packet)(void *opaque, uint8_t *buf, int buf_size);
+    int64_t (*seek)(void *opaque, int64_t offset, int whence);
+    int64_t pos;            /**< position in the file of the current buffer */
+    int must_flush;         /**< true if the next seek should flush */
+    int eof_reached;        /**< true if eof reached */
+    int write_flag;         /**< true if open for writing */
+    int max_packet_size;
+    unsigned long checksum;
+    unsigned char *checksum_ptr;
+    unsigned long (*update_checksum)(unsigned long checksum, const uint8_t *buf, unsigned int size);
+    int error;              /**< contains the error code or 0 if no error happened */
+    /**
+     * Pause or resume playback for network streaming protocols - e.g. MMS.
+     */
+    int (*read_pause)(void *opaque, int pause);
+    /**
+     * Seek to a given timestamp in stream with the specified stream_index.
+     * Needed for some network streaming protocols which don't support seeking
+     * to byte position.
+     */
+    int64_t (*read_seek)(void *opaque, int stream_index,
+                         int64_t timestamp, int flags);
+    /**
+     * A combination of AVIO_SEEKABLE_ flags or 0 when the stream is not seekable.
+     */
+    int seekable;
+} AVIOContext;
+
+/* unbuffered I/O */
+
+/**
+ * Return AVIO_FLAG_* access flags corresponding to the access permissions
+ * of the resource in url, or a negative value corresponding to an
+ * AVERROR code in case of failure. The returned access flags are
+ * masked by the value in flags.
+ *
+ * @note This function is intrinsically unsafe, in the sense that the
+ * checked resource may change its existence or permission status from
+ * one call to another. Thus you should not trust the returned value,
+ * unless you are sure that no other processes are accessing the
+ * checked resource.
+ */
+int avio_check(const char *url, int flags);
+
+/**
+ * Allocate and initialize an AVIOContext for buffered I/O. It must be later
+ * freed with av_free().
+ *
+ * @param buffer Memory block for input/output operations via AVIOContext.
+ *        The buffer must be allocated with av_malloc() and friends.
+ * @param buffer_size The buffer size is very important for performance.
+ *        For protocols with fixed blocksize it should be set to this blocksize.
+ *        For others a typical size is a cache page, e.g. 4kb.
+ * @param write_flag Set to 1 if the buffer should be writable, 0 otherwise.
+ * @param opaque An opaque pointer to user-specific data.
+ * @param read_packet  A function for refilling the buffer, may be NULL.
+ * @param write_packet A function for writing the buffer contents, may be NULL.
+ * @param seek A function for seeking to specified byte position, may be NULL.
+ *
+ * @return Allocated AVIOContext or NULL on failure.
+ */
+AVIOContext *avio_alloc_context(
+                  unsigned char *buffer,
+                  int buffer_size,
+                  int write_flag,
+                  void *opaque,
+                  int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
+                  int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
+                  int64_t (*seek)(void *opaque, int64_t offset, int whence));
+
+void avio_w8(AVIOContext *s, int b);
+void avio_write(AVIOContext *s, const unsigned char *buf, int size);
+void avio_wl64(AVIOContext *s, uint64_t val);
+void avio_wb64(AVIOContext *s, uint64_t val);
+void avio_wl32(AVIOContext *s, unsigned int val);
+void avio_wb32(AVIOContext *s, unsigned int val);
+void avio_wl24(AVIOContext *s, unsigned int val);
+void avio_wb24(AVIOContext *s, unsigned int val);
+void avio_wl16(AVIOContext *s, unsigned int val);
+void avio_wb16(AVIOContext *s, unsigned int val);
+
+/**
+ * Write a NULL-terminated string.
+ * @return number of bytes written.
+ */
+int avio_put_str(AVIOContext *s, const char *str);
+
+/**
+ * Convert an UTF-8 string to UTF-16LE and write it.
+ * @return number of bytes written.
+ */
+int avio_put_str16le(AVIOContext *s, const char *str);
+
+/**
+ * Passing this as the "whence" parameter to a seek function causes it to
+ * return the filesize without seeking anywhere. Supporting this is optional.
+ * If it is not supported then the seek function will return <0.
+ */
+#define AVSEEK_SIZE 0x10000
+
+/**
+ * Oring this flag as into the "whence" parameter to a seek function causes it to
+ * seek by any means (like reopening and linear reading) or other normally unreasonble
+ * means that can be extreemly slow.
+ * This may be ignored by the seek code.
+ */
+#define AVSEEK_FORCE 0x20000
+
+/**
+ * fseek() equivalent for AVIOContext.
+ * @return new position or AVERROR.
+ */
+int64_t avio_seek(AVIOContext *s, int64_t offset, int whence);
+
+/**
+ * Skip given number of bytes forward
+ * @return new position or AVERROR.
+ */
+static av_always_inline int64_t avio_skip(AVIOContext *s, int64_t offset)
+{
+    return avio_seek(s, offset, SEEK_CUR);
+}
+
+/**
+ * ftell() equivalent for AVIOContext.
+ * @return position or AVERROR.
+ */
+static av_always_inline int64_t avio_tell(AVIOContext *s)
+{
+    return avio_seek(s, 0, SEEK_CUR);
+}
+
+/**
+ * Get the filesize.
+ * @return filesize or AVERROR
+ */
+int64_t avio_size(AVIOContext *s);
+
+/** @warning currently size is limited */
+int avio_printf(AVIOContext *s, const char *fmt, ...) av_printf_format(2, 3);
+
+void avio_flush(AVIOContext *s);
+
+
+/**
+ * Read size bytes from AVIOContext into buf.
+ * @return number of bytes read or AVERROR
+ */
+int avio_read(AVIOContext *s, unsigned char *buf, int size);
+
+/**
+ * @name Functions for reading from AVIOContext
+ * @{
+ *
+ * @note return 0 if EOF, so you cannot use it if EOF handling is
+ *       necessary
+ */
+int          avio_r8  (AVIOContext *s);
+unsigned int avio_rl16(AVIOContext *s);
+unsigned int avio_rl24(AVIOContext *s);
+unsigned int avio_rl32(AVIOContext *s);
+uint64_t     avio_rl64(AVIOContext *s);
+unsigned int avio_rb16(AVIOContext *s);
+unsigned int avio_rb24(AVIOContext *s);
+unsigned int avio_rb32(AVIOContext *s);
+uint64_t     avio_rb64(AVIOContext *s);
+/**
+ * @}
+ */
+
+/**
+ * Read a string from pb into buf. The reading will terminate when either
+ * a NULL character was encountered, maxlen bytes have been read, or nothing
+ * more can be read from pb. The result is guaranteed to be NULL-terminated, it
+ * will be truncated if buf is too small.
+ * Note that the string is not interpreted or validated in any way, it
+ * might get truncated in the middle of a sequence for multi-byte encodings.
+ *
+ * @return number of bytes read (is always <= maxlen).
+ * If reading ends on EOF or error, the return value will be one more than
+ * bytes actually read.
+ */
+int avio_get_str(AVIOContext *pb, int maxlen, char *buf, int buflen);
+
+/**
+ * Read a UTF-16 string from pb and convert it to UTF-8.
+ * The reading will terminate when either a null or invalid character was
+ * encountered or maxlen bytes have been read.
+ * @return number of bytes read (is always <= maxlen)
+ */
+int avio_get_str16le(AVIOContext *pb, int maxlen, char *buf, int buflen);
+int avio_get_str16be(AVIOContext *pb, int maxlen, char *buf, int buflen);
+
+
+/**
+ * @name URL open modes
+ * The flags argument to avio_open must be one of the following
+ * constants, optionally ORed with other flags.
+ * @{
+ */
+#define AVIO_FLAG_READ  1                                      /**< read-only */
+#define AVIO_FLAG_WRITE 2                                      /**< write-only */
+#define AVIO_FLAG_READ_WRITE (AVIO_FLAG_READ|AVIO_FLAG_WRITE)  /**< read-write pseudo flag */
+/**
+ * @}
+ */
+
+/**
+ * Use non-blocking mode.
+ * If this flag is set, operations on the context will return
+ * AVERROR(EAGAIN) if they can not be performed immediately.
+ * If this flag is not set, operations on the context will never return
+ * AVERROR(EAGAIN).
+ * Note that this flag does not affect the opening/connecting of the
+ * context. Connecting a protocol will always block if necessary (e.g. on
+ * network protocols) but never hang (e.g. on busy devices).
+ * Warning: non-blocking protocols is work-in-progress; this flag may be
+ * silently ignored.
+ */
+#define AVIO_FLAG_NONBLOCK 8
+
+/**
+ * Create and initialize a AVIOContext for accessing the
+ * resource indicated by url.
+ * @note When the resource indicated by url has been opened in
+ * read+write mode, the AVIOContext can be used only for writing.
+ *
+ * @param s Used to return the pointer to the created AVIOContext.
+ * In case of failure the pointed to value is set to NULL.
+ * @param url resource to access
+ * @param flags flags which control how the resource indicated by url
+ * is to be opened
+ * @return 0 in case of success, a negative value corresponding to an
+ * AVERROR code in case of failure
+ */
+int avio_open(AVIOContext **s, const char *url, int flags);
+
+/**
+ * Create and initialize a AVIOContext for accessing the
+ * resource indicated by url.
+ * @note When the resource indicated by url has been opened in
+ * read+write mode, the AVIOContext can be used only for writing.
+ *
+ * @param s Used to return the pointer to the created AVIOContext.
+ * In case of failure the pointed to value is set to NULL.
+ * @param url resource to access
+ * @param flags flags which control how the resource indicated by url
+ * is to be opened
+ * @param int_cb an interrupt callback to be used at the protocols level
+ * @param options  A dictionary filled with protocol-private options. On return
+ * this parameter will be destroyed and replaced with a dict containing options
+ * that were not found. May be NULL.
+ * @return 0 in case of success, a negative value corresponding to an
+ * AVERROR code in case of failure
+ */
+int avio_open2(AVIOContext **s, const char *url, int flags,
+               const AVIOInterruptCB *int_cb, AVDictionary **options);
+
+/**
+ * Close the resource accessed by the AVIOContext s and free it.
+ * This function can only be used if s was opened by avio_open().
+ *
+ * The internal buffer is automatically flushed before closing the
+ * resource.
+ *
+ * @return 0 on success, an AVERROR < 0 on error.
+ * @see avio_closep
+ */
+int avio_close(AVIOContext *s);
+
+/**
+ * Close the resource accessed by the AVIOContext *s, free it
+ * and set the pointer pointing to it to NULL.
+ * This function can only be used if s was opened by avio_open().
+ *
+ * The internal buffer is automatically flushed before closing the
+ * resource.
+ *
+ * @return 0 on success, an AVERROR < 0 on error.
+ * @see avio_close
+ */
+int avio_closep(AVIOContext **s);
+
+
+/**
+ * Open a write only memory stream.
+ *
+ * @param s new IO context
+ * @return zero if no error.
+ */
+int avio_open_dyn_buf(AVIOContext **s);
+
+/**
+ * Return the written size and a pointer to the buffer. The buffer
+ * must be freed with av_free().
+ * Padding of FF_INPUT_BUFFER_PADDING_SIZE is added to the buffer.
+ *
+ * @param s IO context
+ * @param pbuffer pointer to a byte buffer
+ * @return the length of the byte buffer
+ */
+int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer);
+
+/**
+ * Iterate through names of available protocols.
+ *
+ * @param opaque A private pointer representing current protocol.
+ *        It must be a pointer to NULL on first iteration and will
+ *        be updated by successive calls to avio_enum_protocols.
+ * @param output If set to 1, iterate over output protocols,
+ *               otherwise over input protocols.
+ *
+ * @return A static string containing the name of current protocol or NULL
+ */
+const char *avio_enum_protocols(void **opaque, int output);
+
+/**
+ * Pause and resume playing - only meaningful if using a network streaming
+ * protocol (e.g. MMS).
+ *
+ * @param h     IO context from which to call the read_pause function pointer
+ * @param pause 1 for pause, 0 for resume
+ */
+int     avio_pause(AVIOContext *h, int pause);
+
+/**
+ * Seek to a given timestamp relative to some component stream.
+ * Only meaningful if using a network streaming protocol (e.g. MMS.).
+ *
+ * @param h IO context from which to call the seek function pointers
+ * @param stream_index The stream index that the timestamp is relative to.
+ *        If stream_index is (-1) the timestamp should be in AV_TIME_BASE
+ *        units from the beginning of the presentation.
+ *        If a stream_index >= 0 is used and the protocol does not support
+ *        seeking based on component streams, the call will fail with ENOTSUP.
+ * @param timestamp timestamp in AVStream.time_base units
+ *        or if there is no stream specified then in AV_TIME_BASE units.
+ * @param flags Optional combination of AVSEEK_FLAG_BACKWARD, AVSEEK_FLAG_BYTE
+ *        and AVSEEK_FLAG_ANY. The protocol may silently ignore
+ *        AVSEEK_FLAG_BACKWARD and AVSEEK_FLAG_ANY, but AVSEEK_FLAG_BYTE will
+ *        fail with ENOTSUP if used and not supported.
+ * @return >= 0 on success
+ * @see AVInputFormat::read_seek
+ */
+int64_t avio_seek_time(AVIOContext *h, int stream_index,
+                       int64_t timestamp, int flags);
+
+#endif /* AVFORMAT_AVIO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavformat/version.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavformat/version.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavformat/version.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavformat/version.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,55 @@
+/*
+ * Version macros.
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFORMAT_VERSION_H
+#define AVFORMAT_VERSION_H
+
+/**
+ * @file
+ * @ingroup libavf
+ * Libavformat version macros
+ */
+
+#include "libavutil/version.h"
+
+#define LIBAVFORMAT_VERSION_MAJOR 55
+#define LIBAVFORMAT_VERSION_MINOR 12
+#define LIBAVFORMAT_VERSION_MICRO  0
+
+#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
+                                               LIBAVFORMAT_VERSION_MINOR, \
+                                               LIBAVFORMAT_VERSION_MICRO)
+#define LIBAVFORMAT_VERSION     AV_VERSION(LIBAVFORMAT_VERSION_MAJOR,   \
+                                           LIBAVFORMAT_VERSION_MINOR,   \
+                                           LIBAVFORMAT_VERSION_MICRO)
+#define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
+
+#define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
+
+/**
+ * FF_API_* defines may be placed below to indicate public API that will be
+ * dropped at a future version bump. The defines themselves are not part of
+ * the public API and may change, break or disappear at any time.
+ */
+#ifndef FF_API_REFERENCE_DTS
+#define FF_API_REFERENCE_DTS            (LIBAVFORMAT_VERSION_MAJOR < 56)
+#endif
+
+#endif /* AVFORMAT_VERSION_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/adler32.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/adler32.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/adler32.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/adler32.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,43 @@
+/*
+ * copyright (c) 2006 Mans Rullgard
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_ADLER32_H
+#define AVUTIL_ADLER32_H
+
+#include <stdint.h>
+#include "attributes.h"
+
+/**
+ * @ingroup lavu_crypto
+ * Calculate the Adler32 checksum of a buffer.
+ *
+ * Passing the return value to a subsequent av_adler32_update() call
+ * allows the checksum of multiple buffers to be calculated as though
+ * they were concatenated.
+ *
+ * @param adler initial checksum value
+ * @param buf   pointer to input buffer
+ * @param len   size of input buffer
+ * @return      updated checksum
+ */
+unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf,
+                                unsigned int len) av_pure;
+
+#endif /* AVUTIL_ADLER32_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/aes.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/aes.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/aes.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/aes.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,67 @@
+/*
+ * copyright (c) 2007 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_AES_H
+#define AVUTIL_AES_H
+
+#include <stdint.h>
+
+#include "attributes.h"
+#include "version.h"
+
+/**
+ * @defgroup lavu_aes AES
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+#if FF_API_CONTEXT_SIZE
+extern attribute_deprecated const int av_aes_size;
+#endif
+
+struct AVAES;
+
+/**
+ * Allocate an AVAES context.
+ */
+struct AVAES *av_aes_alloc(void);
+
+/**
+ * Initialize an AVAES context.
+ * @param key_bits 128, 192 or 256
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+int av_aes_init(struct AVAES *a, const uint8_t *key, int key_bits, int decrypt);
+
+/**
+ * Encrypt or decrypt a buffer using a previously initialized context.
+ * @param count number of 16 byte blocks
+ * @param dst destination array, can be equal to src
+ * @param src source array, can be equal to dst
+ * @param iv initialization vector for CBC mode, if NULL then ECB will be used
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+void av_aes_crypt(struct AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_AES_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/attributes.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/attributes.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/attributes.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/attributes.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,126 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Macro definitions for various function/variable attributes
+ */
+
+#ifndef AVUTIL_ATTRIBUTES_H
+#define AVUTIL_ATTRIBUTES_H
+
+#ifdef __GNUC__
+#    define AV_GCC_VERSION_AT_LEAST(x,y) (__GNUC__ > x || __GNUC__ == x && __GNUC_MINOR__ >= y)
+#else
+#    define AV_GCC_VERSION_AT_LEAST(x,y) 0
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(3,1)
+#    define av_always_inline __attribute__((always_inline)) inline
+#elif defined(_MSC_VER)
+#    define av_always_inline __forceinline
+#else
+#    define av_always_inline inline
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(3,1)
+#    define av_noinline __attribute__((noinline))
+#elif defined(_MSC_VER)
+#    define av_noinline __declspec(noinline)
+#else
+#    define av_noinline
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(3,1)
+#    define av_pure __attribute__((pure))
+#else
+#    define av_pure
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(2,6)
+#    define av_const __attribute__((const))
+#else
+#    define av_const
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(4,3)
+#    define av_cold __attribute__((cold))
+#else
+#    define av_cold
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(4,1) && !defined(__llvm__)
+#    define av_flatten __attribute__((flatten))
+#else
+#    define av_flatten
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(3,1)
+#    define attribute_deprecated __attribute__((deprecated))
+#elif defined(_MSC_VER)
+#    define attribute_deprecated __declspec(deprecated)
+#else
+#    define attribute_deprecated
+#endif
+
+#if defined(__GNUC__)
+#    define av_unused __attribute__((unused))
+#else
+#    define av_unused
+#endif
+
+/**
+ * Mark a variable as used and prevent the compiler from optimizing it
+ * away.  This is useful for variables accessed only from inline
+ * assembler without the compiler being aware.
+ */
+#if AV_GCC_VERSION_AT_LEAST(3,1)
+#    define av_used __attribute__((used))
+#else
+#    define av_used
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(3,3)
+#   define av_alias __attribute__((may_alias))
+#else
+#   define av_alias
+#endif
+
+#if defined(__GNUC__) && !defined(__ICC)
+#    define av_uninit(x) x=x
+#else
+#    define av_uninit(x) x
+#endif
+
+#ifdef __GNUC__
+#    define av_builtin_constant_p __builtin_constant_p
+#    define av_printf_format(fmtpos, attrpos) __attribute__((__format__(__printf__, fmtpos, attrpos)))
+#else
+#    define av_builtin_constant_p(x) 0
+#    define av_printf_format(fmtpos, attrpos)
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(2,5)
+#    define av_noreturn __attribute__((noreturn))
+#else
+#    define av_noreturn
+#endif
+
+#endif /* AVUTIL_ATTRIBUTES_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/audioconvert.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/audioconvert.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/audioconvert.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/audioconvert.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,6 @@
+
+#include "version.h"
+
+#if FF_API_AUDIOCONVERT
+#include "channel_layout.h"
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/audio_fifo.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/audio_fifo.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/audio_fifo.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/audio_fifo.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,146 @@
+/*
+ * Audio FIFO
+ * Copyright (c) 2012 Justin Ruggles <justin.ruggles@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Audio FIFO Buffer
+ */
+
+#ifndef AVUTIL_AUDIO_FIFO_H
+#define AVUTIL_AUDIO_FIFO_H
+
+#include "avutil.h"
+#include "fifo.h"
+#include "samplefmt.h"
+
+/**
+ * @addtogroup lavu_audio
+ * @{
+ */
+
+/**
+ * Context for an Audio FIFO Buffer.
+ *
+ * - Operates at the sample level rather than the byte level.
+ * - Supports multiple channels with either planar or packed sample format.
+ * - Automatic reallocation when writing to a full buffer.
+ */
+typedef struct AVAudioFifo AVAudioFifo;
+
+/**
+ * Free an AVAudioFifo.
+ *
+ * @param af  AVAudioFifo to free
+ */
+void av_audio_fifo_free(AVAudioFifo *af);
+
+/**
+ * Allocate an AVAudioFifo.
+ *
+ * @param sample_fmt  sample format
+ * @param channels    number of channels
+ * @param nb_samples  initial allocation size, in samples
+ * @return            newly allocated AVAudioFifo, or NULL on error
+ */
+AVAudioFifo *av_audio_fifo_alloc(enum AVSampleFormat sample_fmt, int channels,
+                                 int nb_samples);
+
+/**
+ * Reallocate an AVAudioFifo.
+ *
+ * @param af          AVAudioFifo to reallocate
+ * @param nb_samples  new allocation size, in samples
+ * @return            0 if OK, or negative AVERROR code on failure
+ */
+int av_audio_fifo_realloc(AVAudioFifo *af, int nb_samples);
+
+/**
+ * Write data to an AVAudioFifo.
+ *
+ * The AVAudioFifo will be reallocated automatically if the available space
+ * is less than nb_samples.
+ *
+ * @see enum AVSampleFormat
+ * The documentation for AVSampleFormat describes the data layout.
+ *
+ * @param af          AVAudioFifo to write to
+ * @param data        audio data plane pointers
+ * @param nb_samples  number of samples to write
+ * @return            number of samples actually written, or negative AVERROR
+ *                    code on failure.
+ */
+int av_audio_fifo_write(AVAudioFifo *af, void **data, int nb_samples);
+
+/**
+ * Read data from an AVAudioFifo.
+ *
+ * @see enum AVSampleFormat
+ * The documentation for AVSampleFormat describes the data layout.
+ *
+ * @param af          AVAudioFifo to read from
+ * @param data        audio data plane pointers
+ * @param nb_samples  number of samples to read
+ * @return            number of samples actually read, or negative AVERROR code
+ *                    on failure.
+ */
+int av_audio_fifo_read(AVAudioFifo *af, void **data, int nb_samples);
+
+/**
+ * Drain data from an AVAudioFifo.
+ *
+ * Removes the data without reading it.
+ *
+ * @param af          AVAudioFifo to drain
+ * @param nb_samples  number of samples to drain
+ * @return            0 if OK, or negative AVERROR code on failure
+ */
+int av_audio_fifo_drain(AVAudioFifo *af, int nb_samples);
+
+/**
+ * Reset the AVAudioFifo buffer.
+ *
+ * This empties all data in the buffer.
+ *
+ * @param af  AVAudioFifo to reset
+ */
+void av_audio_fifo_reset(AVAudioFifo *af);
+
+/**
+ * Get the current number of samples in the AVAudioFifo available for reading.
+ *
+ * @param af  the AVAudioFifo to query
+ * @return    number of samples available for reading
+ */
+int av_audio_fifo_size(AVAudioFifo *af);
+
+/**
+ * Get the current number of samples in the AVAudioFifo available for writing.
+ *
+ * @param af  the AVAudioFifo to query
+ * @return    number of samples available for writing
+ */
+int av_audio_fifo_space(AVAudioFifo *af);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_AUDIO_FIFO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/avassert.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/avassert.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/avassert.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/avassert.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,66 @@
+/*
+ * copyright (c) 2010 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * simple assert() macros that are a bit more flexible than ISO C assert().
+ * @author Michael Niedermayer <michaelni@gmx.at>
+ */
+
+#ifndef AVUTIL_AVASSERT_H
+#define AVUTIL_AVASSERT_H
+
+#include <stdlib.h>
+#include "avutil.h"
+#include "log.h"
+
+/**
+ * assert() equivalent, that is always enabled.
+ */
+#define av_assert0(cond) do {                                           \
+    if (!(cond)) {                                                      \
+        av_log(NULL, AV_LOG_FATAL, "Assertion %s failed at %s:%d\n",    \
+               AV_STRINGIFY(cond), __FILE__, __LINE__);                 \
+        abort();                                                        \
+    }                                                                   \
+} while (0)
+
+
+/**
+ * assert() equivalent, that does not lie in speed critical code.
+ * These asserts() thus can be enabled without fearing speedloss.
+ */
+#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 0
+#define av_assert1(cond) av_assert0(cond)
+#else
+#define av_assert1(cond) ((void)0)
+#endif
+
+
+/**
+ * assert() equivalent, that does lie in speed critical code.
+ */
+#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 1
+#define av_assert2(cond) av_assert0(cond)
+#else
+#define av_assert2(cond) ((void)0)
+#endif
+
+#endif /* AVUTIL_AVASSERT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/avconfig.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/avconfig.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/avconfig.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/avconfig.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,6 @@
+/* Generated by ffconf */
+#ifndef AVUTIL_AVCONFIG_H
+#define AVUTIL_AVCONFIG_H
+#define AV_HAVE_BIGENDIAN 0
+#define AV_HAVE_FAST_UNALIGNED 1
+#endif /* AVUTIL_AVCONFIG_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/avstring.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/avstring.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/avstring.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/avstring.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 2007 Mans Rullgard
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_AVSTRING_H
+#define AVUTIL_AVSTRING_H
+
+#include <stddef.h>
+#include "attributes.h"
+
+/**
+ * @addtogroup lavu_string
+ * @{
+ */
+
+/**
+ * Return non-zero if pfx is a prefix of str. If it is, *ptr is set to
+ * the address of the first character in str after the prefix.
+ *
+ * @param str input string
+ * @param pfx prefix to test
+ * @param ptr updated if the prefix is matched inside str
+ * @return non-zero if the prefix matches, zero otherwise
+ */
+int av_strstart(const char *str, const char *pfx, const char **ptr);
+
+/**
+ * Return non-zero if pfx is a prefix of str independent of case. If
+ * it is, *ptr is set to the address of the first character in str
+ * after the prefix.
+ *
+ * @param str input string
+ * @param pfx prefix to test
+ * @param ptr updated if the prefix is matched inside str
+ * @return non-zero if the prefix matches, zero otherwise
+ */
+int av_stristart(const char *str, const char *pfx, const char **ptr);
+
+/**
+ * Locate the first case-independent occurrence in the string haystack
+ * of the string needle.  A zero-length string needle is considered to
+ * match at the start of haystack.
+ *
+ * This function is a case-insensitive version of the standard strstr().
+ *
+ * @param haystack string to search in
+ * @param needle   string to search for
+ * @return         pointer to the located match within haystack
+ *                 or a null pointer if no match
+ */
+char *av_stristr(const char *haystack, const char *needle);
+
+/**
+ * Locate the first occurrence of the string needle in the string haystack
+ * where not more than hay_length characters are searched. A zero-length
+ * string needle is considered to match at the start of haystack.
+ *
+ * This function is a length-limited version of the standard strstr().
+ *
+ * @param haystack   string to search in
+ * @param needle     string to search for
+ * @param hay_length length of string to search in
+ * @return           pointer to the located match within haystack
+ *                   or a null pointer if no match
+ */
+char *av_strnstr(const char *haystack, const char *needle, size_t hay_length);
+
+/**
+ * Copy the string src to dst, but no more than size - 1 bytes, and
+ * null-terminate dst.
+ *
+ * This function is the same as BSD strlcpy().
+ *
+ * @param dst destination buffer
+ * @param src source string
+ * @param size size of destination buffer
+ * @return the length of src
+ *
+ * @warning since the return value is the length of src, src absolutely
+ * _must_ be a properly 0-terminated string, otherwise this will read beyond
+ * the end of the buffer and possibly crash.
+ */
+size_t av_strlcpy(char *dst, const char *src, size_t size);
+
+/**
+ * Append the string src to the string dst, but to a total length of
+ * no more than size - 1 bytes, and null-terminate dst.
+ *
+ * This function is similar to BSD strlcat(), but differs when
+ * size <= strlen(dst).
+ *
+ * @param dst destination buffer
+ * @param src source string
+ * @param size size of destination buffer
+ * @return the total length of src and dst
+ *
+ * @warning since the return value use the length of src and dst, these
+ * absolutely _must_ be a properly 0-terminated strings, otherwise this
+ * will read beyond the end of the buffer and possibly crash.
+ */
+size_t av_strlcat(char *dst, const char *src, size_t size);
+
+/**
+ * Append output to a string, according to a format. Never write out of
+ * the destination buffer, and always put a terminating 0 within
+ * the buffer.
+ * @param dst destination buffer (string to which the output is
+ *  appended)
+ * @param size total size of the destination buffer
+ * @param fmt printf-compatible format string, specifying how the
+ *  following parameters are used
+ * @return the length of the string that would have been generated
+ *  if enough space had been available
+ */
+size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...) av_printf_format(3, 4);
+
+/**
+ * Convert a number to a av_malloced string.
+ */
+char *av_d2str(double d);
+
+/**
+ * Unescape the given string until a non escaped terminating char,
+ * and return the token corresponding to the unescaped string.
+ *
+ * The normal \ and ' escaping is supported. Leading and trailing
+ * whitespaces are removed, unless they are escaped with '\' or are
+ * enclosed between ''.
+ *
+ * @param buf the buffer to parse, buf will be updated to point to the
+ * terminating char
+ * @param term a 0-terminated list of terminating chars
+ * @return the malloced unescaped string, which must be av_freed by
+ * the user, NULL in case of allocation failure
+ */
+char *av_get_token(const char **buf, const char *term);
+
+/**
+ * Locale-independent conversion of ASCII isdigit.
+ */
+int av_isdigit(int c);
+
+/**
+ * Locale-independent conversion of ASCII isgraph.
+ */
+int av_isgraph(int c);
+
+/**
+ * Locale-independent conversion of ASCII isspace.
+ */
+int av_isspace(int c);
+
+/**
+ * Locale-independent conversion of ASCII characters to uppercase.
+ */
+static inline int av_toupper(int c)
+{
+    if (c >= 'a' && c <= 'z')
+        c ^= 0x20;
+    return c;
+}
+
+/**
+ * Locale-independent conversion of ASCII characters to lowercase.
+ */
+static inline int av_tolower(int c)
+{
+    if (c >= 'A' && c <= 'Z')
+        c ^= 0x20;
+    return c;
+}
+
+/**
+ * Locale-independent conversion of ASCII isxdigit.
+ */
+int av_isxdigit(int c);
+
+/*
+ * Locale-independent case-insensitive compare.
+ * @note This means only ASCII-range characters are case-insensitive
+ */
+int av_strcasecmp(const char *a, const char *b);
+
+/**
+ * Locale-independent case-insensitive compare.
+ * @note This means only ASCII-range characters are case-insensitive
+ */
+int av_strncasecmp(const char *a, const char *b, size_t n);
+
+
+/**
+ * Thread safe basename.
+ * @param path the path, on DOS both \ and / are considered separators.
+ * @return pointer to the basename substring.
+ */
+const char *av_basename(const char *path);
+
+/**
+ * Thread safe dirname.
+ * @param path the path, on DOS both \ and / are considered separators.
+ * @return the path with the separator replaced by the string terminator or ".".
+ * @note the function may change the input string.
+ */
+const char *av_dirname(char *path);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_AVSTRING_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/avutil.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/avutil.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/avutil.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/avutil.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,284 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_AVUTIL_H
+#define AVUTIL_AVUTIL_H
+
+/**
+ * @file
+ * external API header
+ */
+
+/**
+ * @mainpage
+ *
+ * @section libav_intro Introduction
+ *
+ * This document describes the usage of the different libraries
+ * provided by Libav.
+ *
+ * @li @ref libavc "libavcodec" encoding/decoding library
+ * @li @ref lavfi "libavfilter" graph-based frame editing library
+ * @li @ref libavf "libavformat" I/O and muxing/demuxing library
+ * @li @ref lavd "libavdevice" special devices muxing/demuxing library
+ * @li @ref lavu "libavutil" common utility library
+ * @li @ref lavr "libavresample" audio resampling, format conversion and mixing
+ * @li @ref libsws "libswscale"  color conversion and scaling library
+ *
+ * @section libav_versioning Versioning and compatibility
+ *
+ * Each of the Libav libraries contains a version.h header, which defines a
+ * major, minor and micro version number with the
+ * <em>LIBRARYNAME_VERSION_{MAJOR,MINOR,MICRO}</em> macros. The major version
+ * number is incremented with backward incompatible changes - e.g. removing
+ * parts of the public API, reordering public struct members, etc. The minor
+ * version number is incremented for backward compatible API changes or major
+ * new features - e.g. adding a new public function or a new decoder. The micro
+ * version number is incremented for smaller changes that a calling program
+ * might still want to check for - e.g. changing behavior in a previously
+ * unspecified situation.
+ *
+ * Libav guarantees backward API and ABI compatibility for each library as long
+ * as its major version number is unchanged. This means that no public symbols
+ * will be removed or renamed. Types and names of the public struct members and
+ * values of public macros and enums will remain the same (unless they were
+ * explicitly declared as not part of the public API). Documented behavior will
+ * not change.
+ *
+ * In other words, any correct program that works with a given Libav snapshot
+ * should work just as well without any changes with any later snapshot with the
+ * same major versions. This applies to both rebuilding the program against new
+ * Libav versions or to replacing the dynamic Libav libraries that a program
+ * links against.
+ *
+ * However, new public symbols may be added and new members may be appended to
+ * public structs whose size is not part of public ABI (most public structs in
+ * Libav). New macros and enum values may be added. Behavior in undocumented
+ * situations may change slightly (and be documented). All those are accompanied
+ * by an entry in doc/APIchanges and incrementing either the minor or micro
+ * version number.
+ */
+
+/**
+ * @defgroup lavu Common utility functions
+ *
+ * @brief
+ * libavutil contains the code shared across all the other Libav
+ * libraries
+ *
+ * @note In order to use the functions provided by avutil you must include
+ * the specific header.
+ *
+ * @{
+ *
+ * @defgroup lavu_crypto Crypto and Hashing
+ *
+ * @{
+ * @}
+ *
+ * @defgroup lavu_math Maths
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_string String Manipulation
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_mem Memory Management
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_data Data Structures
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_audio Audio related
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_error Error Codes
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_log Logging Facility
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_misc Other
+ *
+ * @{
+ *
+ * @defgroup lavu_internal Internal
+ *
+ * Not exported functions, for internal usage only
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup preproc_misc Preprocessor String Macros
+ *
+ * @{
+ *
+ * @}
+ */
+
+
+/**
+ * @addtogroup lavu_ver
+ * @{
+ */
+
+/**
+ * Return the LIBAVUTIL_VERSION_INT constant.
+ */
+unsigned avutil_version(void);
+
+/**
+ * Return the libavutil build-time configuration.
+ */
+const char *avutil_configuration(void);
+
+/**
+ * Return the libavutil license.
+ */
+const char *avutil_license(void);
+
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup lavu_media Media Type
+ * @brief Media Type
+ */
+
+enum AVMediaType {
+    AVMEDIA_TYPE_UNKNOWN = -1,  ///< Usually treated as AVMEDIA_TYPE_DATA
+    AVMEDIA_TYPE_VIDEO,
+    AVMEDIA_TYPE_AUDIO,
+    AVMEDIA_TYPE_DATA,          ///< Opaque data information usually continuous
+    AVMEDIA_TYPE_SUBTITLE,
+    AVMEDIA_TYPE_ATTACHMENT,    ///< Opaque data information usually sparse
+    AVMEDIA_TYPE_NB
+};
+
+/**
+ * @defgroup lavu_const Constants
+ * @{
+ *
+ * @defgroup lavu_enc Encoding specific
+ *
+ * @note those definition should move to avcodec
+ * @{
+ */
+
+#define FF_LAMBDA_SHIFT 7
+#define FF_LAMBDA_SCALE (1<<FF_LAMBDA_SHIFT)
+#define FF_QP2LAMBDA 118 ///< factor to convert from H.263 QP to lambda
+#define FF_LAMBDA_MAX (256*128-1)
+
+#define FF_QUALITY_SCALE FF_LAMBDA_SCALE //FIXME maybe remove
+
+/**
+ * @}
+ * @defgroup lavu_time Timestamp specific
+ *
+ * Libav internal timebase and timestamp definitions
+ *
+ * @{
+ */
+
+/**
+ * @brief Undefined timestamp value
+ *
+ * Usually reported by demuxer that work on containers that do not provide
+ * either pts or dts.
+ */
+
+#define AV_NOPTS_VALUE          INT64_C(0x8000000000000000)
+
+/**
+ * Internal time base represented as integer
+ */
+
+#define AV_TIME_BASE            1000000
+
+/**
+ * Internal time base represented as fractional value
+ */
+
+#define AV_TIME_BASE_Q          (AVRational){1, AV_TIME_BASE}
+
+/**
+ * @}
+ * @}
+ * @defgroup lavu_picture Image related
+ *
+ * AVPicture types, pixel formats and basic image planes manipulation.
+ *
+ * @{
+ */
+
+enum AVPictureType {
+    AV_PICTURE_TYPE_I = 1, ///< Intra
+    AV_PICTURE_TYPE_P,     ///< Predicted
+    AV_PICTURE_TYPE_B,     ///< Bi-dir predicted
+    AV_PICTURE_TYPE_S,     ///< S(GMC)-VOP MPEG4
+    AV_PICTURE_TYPE_SI,    ///< Switching Intra
+    AV_PICTURE_TYPE_SP,    ///< Switching Predicted
+    AV_PICTURE_TYPE_BI,    ///< BI type
+};
+
+/**
+ * Return a single letter to describe the given picture type
+ * pict_type.
+ *
+ * @param[in] pict_type the picture type @return a single character
+ * representing the picture type, '?' if pict_type is unknown
+ */
+char av_get_picture_type_char(enum AVPictureType pict_type);
+
+/**
+ * @}
+ */
+
+#include "error.h"
+#include "version.h"
+#include "macros.h"
+
+/**
+ * @}
+ * @}
+ */
+
+#endif /* AVUTIL_AVUTIL_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/base64.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/base64.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/base64.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/base64.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2006 Ryan Martell. (rdm4@martellventures.com)
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_BASE64_H
+#define AVUTIL_BASE64_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_base64 Base64
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+
+/**
+ * Decode a base64-encoded string.
+ *
+ * @param out      buffer for decoded data
+ * @param in       null-terminated input string
+ * @param out_size size in bytes of the out buffer, must be at
+ *                 least 3/4 of the length of in
+ * @return         number of bytes written, or a negative value in case of
+ *                 invalid input
+ */
+int av_base64_decode(uint8_t *out, const char *in, int out_size);
+
+/**
+ * Encode data to base64 and null-terminate.
+ *
+ * @param out      buffer for encoded data
+ * @param out_size size in bytes of the output buffer, must be at
+ *                 least AV_BASE64_SIZE(in_size)
+ * @param in_size  size in bytes of the 'in' buffer
+ * @return         'out' or NULL in case of error
+ */
+char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size);
+
+/**
+ * Calculate the output size needed to base64-encode x bytes.
+ */
+#define AV_BASE64_SIZE(x)  (((x)+2) / 3 * 4 + 1)
+
+ /**
+  * @}
+  */
+
+#endif /* AVUTIL_BASE64_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/blowfish.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/blowfish.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/blowfish.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/blowfish.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,76 @@
+/*
+ * Blowfish algorithm
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_BLOWFISH_H
+#define AVUTIL_BLOWFISH_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_blowfish Blowfish
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+#define AV_BF_ROUNDS 16
+
+typedef struct AVBlowfish {
+    uint32_t p[AV_BF_ROUNDS + 2];
+    uint32_t s[4][256];
+} AVBlowfish;
+
+/**
+ * Initialize an AVBlowfish context.
+ *
+ * @param ctx an AVBlowfish context
+ * @param key a key
+ * @param key_len length of the key
+ */
+void av_blowfish_init(struct AVBlowfish *ctx, const uint8_t *key, int key_len);
+
+/**
+ * Encrypt or decrypt a buffer using a previously initialized context.
+ *
+ * @param ctx an AVBlowfish context
+ * @param xl left four bytes halves of input to be encrypted
+ * @param xr right four bytes halves of input to be encrypted
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+void av_blowfish_crypt_ecb(struct AVBlowfish *ctx, uint32_t *xl, uint32_t *xr,
+                           int decrypt);
+
+/**
+ * Encrypt or decrypt a buffer using a previously initialized context.
+ *
+ * @param ctx an AVBlowfish context
+ * @param dst destination array, can be equal to src
+ * @param src source array, can be equal to dst
+ * @param count number of 8 byte blocks
+ * @param iv initialization vector for CBC mode, if NULL ECB will be used
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+void av_blowfish_crypt(struct AVBlowfish *ctx, uint8_t *dst, const uint8_t *src,
+                       int count, uint8_t *iv, int decrypt);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_BLOWFISH_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/bswap.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/bswap.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/bswap.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/bswap.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,111 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * byte swapping routines
+ */
+
+#ifndef AVUTIL_BSWAP_H
+#define AVUTIL_BSWAP_H
+
+#include <stdint.h>
+#include "libavutil/avconfig.h"
+#include "attributes.h"
+
+#ifdef HAVE_AV_CONFIG_H
+
+#include "config.h"
+
+#if   ARCH_AARCH64
+#   include "aarch64/bswap.h"
+#elif ARCH_ARM
+#   include "arm/bswap.h"
+#elif ARCH_AVR32
+#   include "avr32/bswap.h"
+#elif ARCH_BFIN
+#   include "bfin/bswap.h"
+#elif ARCH_SH4
+#   include "sh4/bswap.h"
+#elif ARCH_X86
+#   include "x86/bswap.h"
+#endif
+
+#endif /* HAVE_AV_CONFIG_H */
+
+#define AV_BSWAP16C(x) (((x) << 8 & 0xff00)  | ((x) >> 8 & 0x00ff))
+#define AV_BSWAP32C(x) (AV_BSWAP16C(x) << 16 | AV_BSWAP16C((x) >> 16))
+#define AV_BSWAP64C(x) (AV_BSWAP32C(x) << 32 | AV_BSWAP32C((x) >> 32))
+
+#define AV_BSWAPC(s, x) AV_BSWAP##s##C(x)
+
+#ifndef av_bswap16
+static av_always_inline av_const uint16_t av_bswap16(uint16_t x)
+{
+    x= (x>>8) | (x<<8);
+    return x;
+}
+#endif
+
+#ifndef av_bswap32
+static av_always_inline av_const uint32_t av_bswap32(uint32_t x)
+{
+    return AV_BSWAP32C(x);
+}
+#endif
+
+#ifndef av_bswap64
+static inline uint64_t av_const av_bswap64(uint64_t x)
+{
+    return (uint64_t)av_bswap32(x) << 32 | av_bswap32(x >> 32);
+}
+#endif
+
+// be2ne ... big-endian to native-endian
+// le2ne ... little-endian to native-endian
+
+#if AV_HAVE_BIGENDIAN
+#define av_be2ne16(x) (x)
+#define av_be2ne32(x) (x)
+#define av_be2ne64(x) (x)
+#define av_le2ne16(x) av_bswap16(x)
+#define av_le2ne32(x) av_bswap32(x)
+#define av_le2ne64(x) av_bswap64(x)
+#define AV_BE2NEC(s, x) (x)
+#define AV_LE2NEC(s, x) AV_BSWAPC(s, x)
+#else
+#define av_be2ne16(x) av_bswap16(x)
+#define av_be2ne32(x) av_bswap32(x)
+#define av_be2ne64(x) av_bswap64(x)
+#define av_le2ne16(x) (x)
+#define av_le2ne32(x) (x)
+#define av_le2ne64(x) (x)
+#define AV_BE2NEC(s, x) AV_BSWAPC(s, x)
+#define AV_LE2NEC(s, x) (x)
+#endif
+
+#define AV_BE2NE16C(x) AV_BE2NEC(16, x)
+#define AV_BE2NE32C(x) AV_BE2NEC(32, x)
+#define AV_BE2NE64C(x) AV_BE2NEC(64, x)
+#define AV_LE2NE16C(x) AV_LE2NEC(16, x)
+#define AV_LE2NE32C(x) AV_LE2NEC(32, x)
+#define AV_LE2NE64C(x) AV_LE2NEC(64, x)
+
+#endif /* AVUTIL_BSWAP_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/buffer.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/buffer.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/buffer.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/buffer.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,267 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * @ingroup lavu_buffer
+ * refcounted data buffer API
+ */
+
+#ifndef AVUTIL_BUFFER_H
+#define AVUTIL_BUFFER_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_buffer AVBuffer
+ * @ingroup lavu_data
+ *
+ * @{
+ * AVBuffer is an API for reference-counted data buffers.
+ *
+ * There are two core objects in this API -- AVBuffer and AVBufferRef. AVBuffer
+ * represents the data buffer itself; it is opaque and not meant to be accessed
+ * by the caller directly, but only through AVBufferRef. However, the caller may
+ * e.g. compare two AVBuffer pointers to check whether two different references
+ * are describing the same data buffer. AVBufferRef represents a single
+ * reference to an AVBuffer and it is the object that may be manipulated by the
+ * caller directly.
+ *
+ * There are two functions provided for creating a new AVBuffer with a single
+ * reference -- av_buffer_alloc() to just allocate a new buffer, and
+ * av_buffer_create() to wrap an existing array in an AVBuffer. From an existing
+ * reference, additional references may be created with av_buffer_ref().
+ * Use av_buffer_unref() to free a reference (this will automatically free the
+ * data once all the references are freed).
+ *
+ * The convention throughout this API and the rest of Libav is such that the
+ * buffer is considered writable if there exists only one reference to it (and
+ * it has not been marked as read-only). The av_buffer_is_writable() function is
+ * provided to check whether this is true and av_buffer_make_writable() will
+ * automatically create a new writable buffer when necessary.
+ * Of course nothing prevents the calling code from violating this convention,
+ * however that is safe only when all the existing references are under its
+ * control.
+ *
+ * @note Referencing and unreferencing the buffers is thread-safe and thus
+ * may be done from multiple threads simultaneously without any need for
+ * additional locking.
+ *
+ * @note Two different references to the same buffer can point to different
+ * parts of the buffer (i.e. their AVBufferRef.data will not be equal).
+ */
+
+/**
+ * A reference counted buffer type. It is opaque and is meant to be used through
+ * references (AVBufferRef).
+ */
+typedef struct AVBuffer AVBuffer;
+
+/**
+ * A reference to a data buffer.
+ *
+ * The size of this struct is not a part of the public ABI and it is not meant
+ * to be allocated directly.
+ */
+typedef struct AVBufferRef {
+    AVBuffer *buffer;
+
+    /**
+     * The data buffer. It is considered writable if and only if
+     * this is the only reference to the buffer, in which case
+     * av_buffer_is_writable() returns 1.
+     */
+    uint8_t *data;
+    /**
+     * Size of data in bytes.
+     */
+    int      size;
+} AVBufferRef;
+
+/**
+ * Allocate an AVBuffer of the given size using av_malloc().
+ *
+ * @return an AVBufferRef of given size or NULL when out of memory
+ */
+AVBufferRef *av_buffer_alloc(int size);
+
+/**
+ * Same as av_buffer_alloc(), except the returned buffer will be initialized
+ * to zero.
+ */
+AVBufferRef *av_buffer_allocz(int size);
+
+/**
+ * Always treat the buffer as read-only, even when it has only one
+ * reference.
+ */
+#define AV_BUFFER_FLAG_READONLY (1 << 0)
+
+/**
+ * Create an AVBuffer from an existing array.
+ *
+ * If this function is successful, data is owned by the AVBuffer. The caller may
+ * only access data through the returned AVBufferRef and references derived from
+ * it.
+ * If this function fails, data is left untouched.
+ * @param data   data array
+ * @param size   size of data in bytes
+ * @param free   a callback for freeing this buffer's data
+ * @param opaque parameter to be passed to free
+ * @param flags  a combination of AV_BUFFER_FLAG_*
+ *
+ * @return an AVBufferRef referring to data on success, NULL on failure.
+ */
+AVBufferRef *av_buffer_create(uint8_t *data, int size,
+                              void (*free)(void *opaque, uint8_t *data),
+                              void *opaque, int flags);
+
+/**
+ * Default free callback, which calls av_free() on the buffer data.
+ * This function is meant to be passed to av_buffer_create(), not called
+ * directly.
+ */
+void av_buffer_default_free(void *opaque, uint8_t *data);
+
+/**
+ * Create a new reference to an AVBuffer.
+ *
+ * @return a new AVBufferRef referring to the same AVBuffer as buf or NULL on
+ * failure.
+ */
+AVBufferRef *av_buffer_ref(AVBufferRef *buf);
+
+/**
+ * Free a given reference and automatically free the buffer if there are no more
+ * references to it.
+ *
+ * @param buf the reference to be freed. The pointer is set to NULL on return.
+ */
+void av_buffer_unref(AVBufferRef **buf);
+
+/**
+ * @return 1 if the caller may write to the data referred to by buf (which is
+ * true if and only if buf is the only reference to the underlying AVBuffer).
+ * Return 0 otherwise.
+ * A positive answer is valid until av_buffer_ref() is called on buf.
+ */
+int av_buffer_is_writable(const AVBufferRef *buf);
+
+/**
+ * Create a writable reference from a given buffer reference, avoiding data copy
+ * if possible.
+ *
+ * @param buf buffer reference to make writable. On success, buf is either left
+ *            untouched, or it is unreferenced and a new writable AVBufferRef is
+ *            written in its place. On failure, buf is left untouched.
+ * @return 0 on success, a negative AVERROR on failure.
+ */
+int av_buffer_make_writable(AVBufferRef **buf);
+
+/**
+ * Reallocate a given buffer.
+ *
+ * @param buf  a buffer reference to reallocate. On success, buf will be
+ *             unreferenced and a new reference with the required size will be
+ *             written in its place. On failure buf will be left untouched. *buf
+ *             may be NULL, then a new buffer is allocated.
+ * @param size required new buffer size.
+ * @return 0 on success, a negative AVERROR on failure.
+ *
+ * @note the buffer is actually reallocated with av_realloc() only if it was
+ * initially allocated through av_buffer_realloc(NULL) and there is only one
+ * reference to it (i.e. the one passed to this function). In all other cases
+ * a new buffer is allocated and the data is copied.
+ */
+int av_buffer_realloc(AVBufferRef **buf, int size);
+
+/**
+ * @}
+ */
+
+/**
+ * @defgroup lavu_bufferpool AVBufferPool
+ * @ingroup lavu_data
+ *
+ * @{
+ * AVBufferPool is an API for a lock-free thread-safe pool of AVBuffers.
+ *
+ * Frequently allocating and freeing large buffers may be slow. AVBufferPool is
+ * meant to solve this in cases when the caller needs a set of buffers of the
+ * same size (the most obvious use case being buffers for raw video or audio
+ * frames).
+ *
+ * At the beginning, the user must call av_buffer_pool_init() to create the
+ * buffer pool. Then whenever a buffer is needed, call av_buffer_pool_get() to
+ * get a reference to a new buffer, similar to av_buffer_alloc(). This new
+ * reference works in all aspects the same way as the one created by
+ * av_buffer_alloc(). However, when the last reference to this buffer is
+ * unreferenced, it is returned to the pool instead of being freed and will be
+ * reused for subsequent av_buffer_pool_get() calls.
+ *
+ * When the caller is done with the pool and no longer needs to allocate any new
+ * buffers, av_buffer_pool_uninit() must be called to mark the pool as freeable.
+ * Once all the buffers are released, it will automatically be freed.
+ *
+ * Allocating and releasing buffers with this API is thread-safe as long as
+ * either the default alloc callback is used, or the user-supplied one is
+ * thread-safe.
+ */
+
+/**
+ * The buffer pool. This structure is opaque and not meant to be accessed
+ * directly. It is allocated with av_buffer_pool_init() and freed with
+ * av_buffer_pool_uninit().
+ */
+typedef struct AVBufferPool AVBufferPool;
+
+/**
+ * Allocate and initialize a buffer pool.
+ *
+ * @param size size of each buffer in this pool
+ * @param alloc a function that will be used to allocate new buffers when the
+ * pool is empty. May be NULL, then the default allocator will be used
+ * (av_buffer_alloc()).
+ * @return newly created buffer pool on success, NULL on error.
+ */
+AVBufferPool *av_buffer_pool_init(int size, AVBufferRef* (*alloc)(int size));
+
+/**
+ * Mark the pool as being available for freeing. It will actually be freed only
+ * once all the allocated buffers associated with the pool are released. Thus it
+ * is safe to call this function while some of the allocated buffers are still
+ * in use.
+ *
+ * @param pool pointer to the pool to be freed. It will be set to NULL.
+ * @see av_buffer_pool_can_uninit()
+ */
+void av_buffer_pool_uninit(AVBufferPool **pool);
+
+/**
+ * Allocate a new AVBuffer, reusing an old buffer from the pool when available.
+ * This function may be called simultaneously from multiple threads.
+ *
+ * @return a reference to the new buffer on success, NULL on error.
+ */
+AVBufferRef *av_buffer_pool_get(AVBufferPool *pool);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_BUFFER_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/channel_layout.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/channel_layout.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/channel_layout.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/channel_layout.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ * Copyright (c) 2008 Peter Ross
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_CHANNEL_LAYOUT_H
+#define AVUTIL_CHANNEL_LAYOUT_H
+
+#include <stdint.h>
+
+/**
+ * @file
+ * audio channel layout utility functions
+ */
+
+/**
+ * @addtogroup lavu_audio
+ * @{
+ */
+
+/**
+ * @defgroup channel_masks Audio channel masks
+ * @{
+ */
+#define AV_CH_FRONT_LEFT             0x00000001
+#define AV_CH_FRONT_RIGHT            0x00000002
+#define AV_CH_FRONT_CENTER           0x00000004
+#define AV_CH_LOW_FREQUENCY          0x00000008
+#define AV_CH_BACK_LEFT              0x00000010
+#define AV_CH_BACK_RIGHT             0x00000020
+#define AV_CH_FRONT_LEFT_OF_CENTER   0x00000040
+#define AV_CH_FRONT_RIGHT_OF_CENTER  0x00000080
+#define AV_CH_BACK_CENTER            0x00000100
+#define AV_CH_SIDE_LEFT              0x00000200
+#define AV_CH_SIDE_RIGHT             0x00000400
+#define AV_CH_TOP_CENTER             0x00000800
+#define AV_CH_TOP_FRONT_LEFT         0x00001000
+#define AV_CH_TOP_FRONT_CENTER       0x00002000
+#define AV_CH_TOP_FRONT_RIGHT        0x00004000
+#define AV_CH_TOP_BACK_LEFT          0x00008000
+#define AV_CH_TOP_BACK_CENTER        0x00010000
+#define AV_CH_TOP_BACK_RIGHT         0x00020000
+#define AV_CH_STEREO_LEFT            0x20000000  ///< Stereo downmix.
+#define AV_CH_STEREO_RIGHT           0x40000000  ///< See AV_CH_STEREO_LEFT.
+#define AV_CH_WIDE_LEFT              0x0000000080000000ULL
+#define AV_CH_WIDE_RIGHT             0x0000000100000000ULL
+#define AV_CH_SURROUND_DIRECT_LEFT   0x0000000200000000ULL
+#define AV_CH_SURROUND_DIRECT_RIGHT  0x0000000400000000ULL
+#define AV_CH_LOW_FREQUENCY_2        0x0000000800000000ULL
+
+/** Channel mask value used for AVCodecContext.request_channel_layout
+    to indicate that the user requests the channel order of the decoder output
+    to be the native codec channel order. */
+#define AV_CH_LAYOUT_NATIVE          0x8000000000000000ULL
+
+/**
+ * @}
+ * @defgroup channel_mask_c Audio channel convenience macros
+ * @{
+ * */
+#define AV_CH_LAYOUT_MONO              (AV_CH_FRONT_CENTER)
+#define AV_CH_LAYOUT_STEREO            (AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT)
+#define AV_CH_LAYOUT_2POINT1           (AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_2_1               (AV_CH_LAYOUT_STEREO|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_SURROUND          (AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER)
+#define AV_CH_LAYOUT_3POINT1           (AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_4POINT0           (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_4POINT1           (AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_2_2               (AV_CH_LAYOUT_STEREO|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
+#define AV_CH_LAYOUT_QUAD              (AV_CH_LAYOUT_STEREO|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_5POINT0           (AV_CH_LAYOUT_SURROUND|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
+#define AV_CH_LAYOUT_5POINT1           (AV_CH_LAYOUT_5POINT0|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_5POINT0_BACK      (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_5POINT1_BACK      (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_6POINT0           (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_6POINT0_FRONT     (AV_CH_LAYOUT_2_2|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_HEXAGONAL         (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_6POINT1           (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_6POINT1_BACK      (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_6POINT1_FRONT     (AV_CH_LAYOUT_6POINT0_FRONT|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_7POINT0           (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_7POINT0_FRONT     (AV_CH_LAYOUT_5POINT0|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_7POINT1           (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_7POINT1_WIDE      (AV_CH_LAYOUT_5POINT1|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_7POINT1_WIDE_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_OCTAGONAL         (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_STEREO_DOWNMIX    (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT)
+
+enum AVMatrixEncoding {
+    AV_MATRIX_ENCODING_NONE,
+    AV_MATRIX_ENCODING_DOLBY,
+    AV_MATRIX_ENCODING_DPLII,
+    AV_MATRIX_ENCODING_DPLIIX,
+    AV_MATRIX_ENCODING_DPLIIZ,
+    AV_MATRIX_ENCODING_DOLBYEX,
+    AV_MATRIX_ENCODING_DOLBYHEADPHONE,
+    AV_MATRIX_ENCODING_NB
+};
+
+/**
+ * @}
+ */
+
+/**
+ * Return a channel layout id that matches name, or 0 if no match is found.
+ *
+ * name can be one or several of the following notations,
+ * separated by '+' or '|':
+ * - the name of an usual channel layout (mono, stereo, 4.0, quad, 5.0,
+ *   5.0(side), 5.1, 5.1(side), 7.1, 7.1(wide), downmix);
+ * - the name of a single channel (FL, FR, FC, LFE, BL, BR, FLC, FRC, BC,
+ *   SL, SR, TC, TFL, TFC, TFR, TBL, TBC, TBR, DL, DR);
+ * - a number of channels, in decimal, optionally followed by 'c', yielding
+ *   the default channel layout for that number of channels (@see
+ *   av_get_default_channel_layout);
+ * - a channel layout mask, in hexadecimal starting with "0x" (see the
+ *   AV_CH_* macros).
+ *
+ * Example: "stereo+FC" = "2+FC" = "2c+1c" = "0x7"
+ */
+uint64_t av_get_channel_layout(const char *name);
+
+/**
+ * Return a description of a channel layout.
+ * If nb_channels is <= 0, it is guessed from the channel_layout.
+ *
+ * @param buf put here the string containing the channel layout
+ * @param buf_size size in bytes of the buffer
+ */
+void av_get_channel_layout_string(char *buf, int buf_size, int nb_channels, uint64_t channel_layout);
+
+/**
+ * Return the number of channels in the channel layout.
+ */
+int av_get_channel_layout_nb_channels(uint64_t channel_layout);
+
+/**
+ * Return default channel layout for a given number of channels.
+ */
+uint64_t av_get_default_channel_layout(int nb_channels);
+
+/**
+ * Get the index of a channel in channel_layout.
+ *
+ * @param channel a channel layout describing exactly one channel which must be
+ *                present in channel_layout.
+ *
+ * @return index of channel in channel_layout on success, a negative AVERROR
+ *         on error.
+ */
+int av_get_channel_layout_channel_index(uint64_t channel_layout,
+                                        uint64_t channel);
+
+/**
+ * Get the channel with the given index in channel_layout.
+ */
+uint64_t av_channel_layout_extract_channel(uint64_t channel_layout, int index);
+
+/**
+ * Get the name of a given channel.
+ *
+ * @return channel name on success, NULL on error.
+ */
+const char *av_get_channel_name(uint64_t channel);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_CHANNEL_LAYOUT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/common.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/common.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/common.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/common.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,406 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * common internal and external API header
+ */
+
+#ifndef AVUTIL_COMMON_H
+#define AVUTIL_COMMON_H
+
+#include <errno.h>
+#include <inttypes.h>
+#include <limits.h>
+#include <math.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "attributes.h"
+#include "version.h"
+#include "libavutil/avconfig.h"
+
+#if AV_HAVE_BIGENDIAN
+#   define AV_NE(be, le) (be)
+#else
+#   define AV_NE(be, le) (le)
+#endif
+
+//rounded division & shift
+#define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
+/* assume b>0 */
+#define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b))
+#define FFABS(a) ((a) >= 0 ? (a) : (-(a)))
+#define FFSIGN(a) ((a) > 0 ? 1 : -1)
+
+#define FFMAX(a,b) ((a) > (b) ? (a) : (b))
+#define FFMAX3(a,b,c) FFMAX(FFMAX(a,b),c)
+#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
+#define FFMIN3(a,b,c) FFMIN(FFMIN(a,b),c)
+
+#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
+#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
+#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))
+
+/* misc math functions */
+
+#if FF_API_AV_REVERSE
+extern attribute_deprecated const uint8_t av_reverse[256];
+#endif
+
+#ifdef HAVE_AV_CONFIG_H
+#   include "config.h"
+#   include "intmath.h"
+#endif
+
+/* Pull in unguarded fallback defines at the end of this file. */
+#include "common.h"
+
+#ifndef av_log2
+av_const int av_log2(unsigned v);
+#endif
+
+#ifndef av_log2_16bit
+av_const int av_log2_16bit(unsigned v);
+#endif
+
+/**
+ * Clip a signed integer value into the amin-amax range.
+ * @param a value to clip
+ * @param amin minimum value of the clip range
+ * @param amax maximum value of the clip range
+ * @return clipped value
+ */
+static av_always_inline av_const int av_clip_c(int a, int amin, int amax)
+{
+    if      (a < amin) return amin;
+    else if (a > amax) return amax;
+    else               return a;
+}
+
+/**
+ * Clip a signed integer value into the 0-255 range.
+ * @param a value to clip
+ * @return clipped value
+ */
+static av_always_inline av_const uint8_t av_clip_uint8_c(int a)
+{
+    if (a&(~0xFF)) return (-a)>>31;
+    else           return a;
+}
+
+/**
+ * Clip a signed integer value into the -128,127 range.
+ * @param a value to clip
+ * @return clipped value
+ */
+static av_always_inline av_const int8_t av_clip_int8_c(int a)
+{
+    if ((a+0x80) & ~0xFF) return (a>>31) ^ 0x7F;
+    else                  return a;
+}
+
+/**
+ * Clip a signed integer value into the 0-65535 range.
+ * @param a value to clip
+ * @return clipped value
+ */
+static av_always_inline av_const uint16_t av_clip_uint16_c(int a)
+{
+    if (a&(~0xFFFF)) return (-a)>>31;
+    else             return a;
+}
+
+/**
+ * Clip a signed integer value into the -32768,32767 range.
+ * @param a value to clip
+ * @return clipped value
+ */
+static av_always_inline av_const int16_t av_clip_int16_c(int a)
+{
+    if ((a+0x8000) & ~0xFFFF) return (a>>31) ^ 0x7FFF;
+    else                      return a;
+}
+
+/**
+ * Clip a signed 64-bit integer value into the -2147483648,2147483647 range.
+ * @param a value to clip
+ * @return clipped value
+ */
+static av_always_inline av_const int32_t av_clipl_int32_c(int64_t a)
+{
+    if ((a+0x80000000u) & ~UINT64_C(0xFFFFFFFF)) return (a>>63) ^ 0x7FFFFFFF;
+    else                                         return a;
+}
+
+/**
+ * Clip a signed integer to an unsigned power of two range.
+ * @param  a value to clip
+ * @param  p bit position to clip at
+ * @return clipped value
+ */
+static av_always_inline av_const unsigned av_clip_uintp2_c(int a, int p)
+{
+    if (a & ~((1<<p) - 1)) return -a >> 31 & ((1<<p) - 1);
+    else                   return  a;
+}
+
+/**
+ * Add two signed 32-bit values with saturation.
+ *
+ * @param  a one value
+ * @param  b another value
+ * @return sum with signed saturation
+ */
+static av_always_inline int av_sat_add32_c(int a, int b)
+{
+    return av_clipl_int32((int64_t)a + b);
+}
+
+/**
+ * Add a doubled value to another value with saturation at both stages.
+ *
+ * @param  a first value
+ * @param  b value doubled and added to a
+ * @return sum with signed saturation
+ */
+static av_always_inline int av_sat_dadd32_c(int a, int b)
+{
+    return av_sat_add32(a, av_sat_add32(b, b));
+}
+
+/**
+ * Clip a float value into the amin-amax range.
+ * @param a value to clip
+ * @param amin minimum value of the clip range
+ * @param amax maximum value of the clip range
+ * @return clipped value
+ */
+static av_always_inline av_const float av_clipf_c(float a, float amin, float amax)
+{
+    if      (a < amin) return amin;
+    else if (a > amax) return amax;
+    else               return a;
+}
+
+/** Compute ceil(log2(x)).
+ * @param x value used to compute ceil(log2(x))
+ * @return computed ceiling of log2(x)
+ */
+static av_always_inline av_const int av_ceil_log2_c(int x)
+{
+    return av_log2((x - 1) << 1);
+}
+
+/**
+ * Count number of bits set to one in x
+ * @param x value to count bits of
+ * @return the number of bits set to one in x
+ */
+static av_always_inline av_const int av_popcount_c(uint32_t x)
+{
+    x -= (x >> 1) & 0x55555555;
+    x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
+    x = (x + (x >> 4)) & 0x0F0F0F0F;
+    x += x >> 8;
+    return (x + (x >> 16)) & 0x3F;
+}
+
+/**
+ * Count number of bits set to one in x
+ * @param x value to count bits of
+ * @return the number of bits set to one in x
+ */
+static av_always_inline av_const int av_popcount64_c(uint64_t x)
+{
+    return av_popcount(x) + av_popcount(x >> 32);
+}
+
+#define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24))
+#define MKBETAG(a,b,c,d) ((d) | ((c) << 8) | ((b) << 16) | ((unsigned)(a) << 24))
+
+/**
+ * Convert a UTF-8 character (up to 4 bytes) to its 32-bit UCS-4 encoded form.
+ *
+ * @param val      Output value, must be an lvalue of type uint32_t.
+ * @param GET_BYTE Expression reading one byte from the input.
+ *                 Evaluated up to 7 times (4 for the currently
+ *                 assigned Unicode range).  With a memory buffer
+ *                 input, this could be *ptr++.
+ * @param ERROR    Expression to be evaluated on invalid input,
+ *                 typically a goto statement.
+ */
+#define GET_UTF8(val, GET_BYTE, ERROR)\
+    val= GET_BYTE;\
+    {\
+        uint32_t top = (val & 128) >> 1;\
+        if ((val & 0xc0) == 0x80)\
+            ERROR\
+        while (val & top) {\
+            int tmp= GET_BYTE - 128;\
+            if(tmp>>6)\
+                ERROR\
+            val= (val<<6) + tmp;\
+            top <<= 5;\
+        }\
+        val &= (top << 1) - 1;\
+    }
+
+/**
+ * Convert a UTF-16 character (2 or 4 bytes) to its 32-bit UCS-4 encoded form.
+ *
+ * @param val       Output value, must be an lvalue of type uint32_t.
+ * @param GET_16BIT Expression returning two bytes of UTF-16 data converted
+ *                  to native byte order.  Evaluated one or two times.
+ * @param ERROR     Expression to be evaluated on invalid input,
+ *                  typically a goto statement.
+ */
+#define GET_UTF16(val, GET_16BIT, ERROR)\
+    val = GET_16BIT;\
+    {\
+        unsigned int hi = val - 0xD800;\
+        if (hi < 0x800) {\
+            val = GET_16BIT - 0xDC00;\
+            if (val > 0x3FFU || hi > 0x3FFU)\
+                ERROR\
+            val += (hi<<10) + 0x10000;\
+        }\
+    }\
+
+/**
+ * @def PUT_UTF8(val, tmp, PUT_BYTE)
+ * Convert a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes long).
+ * @param val is an input-only argument and should be of type uint32_t. It holds
+ * a UCS-4 encoded Unicode character that is to be converted to UTF-8. If
+ * val is given as a function it is executed only once.
+ * @param tmp is a temporary variable and should be of type uint8_t. It
+ * represents an intermediate value during conversion that is to be
+ * output by PUT_BYTE.
+ * @param PUT_BYTE writes the converted UTF-8 bytes to any proper destination.
+ * It could be a function or a statement, and uses tmp as the input byte.
+ * For example, PUT_BYTE could be "*output++ = tmp;" PUT_BYTE will be
+ * executed up to 4 times for values in the valid UTF-8 range and up to
+ * 7 times in the general case, depending on the length of the converted
+ * Unicode character.
+ */
+#define PUT_UTF8(val, tmp, PUT_BYTE)\
+    {\
+        int bytes, shift;\
+        uint32_t in = val;\
+        if (in < 0x80) {\
+            tmp = in;\
+            PUT_BYTE\
+        } else {\
+            bytes = (av_log2(in) + 4) / 5;\
+            shift = (bytes - 1) * 6;\
+            tmp = (256 - (256 >> bytes)) | (in >> shift);\
+            PUT_BYTE\
+            while (shift >= 6) {\
+                shift -= 6;\
+                tmp = 0x80 | ((in >> shift) & 0x3f);\
+                PUT_BYTE\
+            }\
+        }\
+    }
+
+/**
+ * @def PUT_UTF16(val, tmp, PUT_16BIT)
+ * Convert a 32-bit Unicode character to its UTF-16 encoded form (2 or 4 bytes).
+ * @param val is an input-only argument and should be of type uint32_t. It holds
+ * a UCS-4 encoded Unicode character that is to be converted to UTF-16. If
+ * val is given as a function it is executed only once.
+ * @param tmp is a temporary variable and should be of type uint16_t. It
+ * represents an intermediate value during conversion that is to be
+ * output by PUT_16BIT.
+ * @param PUT_16BIT writes the converted UTF-16 data to any proper destination
+ * in desired endianness. It could be a function or a statement, and uses tmp
+ * as the input byte.  For example, PUT_BYTE could be "*output++ = tmp;"
+ * PUT_BYTE will be executed 1 or 2 times depending on input character.
+ */
+#define PUT_UTF16(val, tmp, PUT_16BIT)\
+    {\
+        uint32_t in = val;\
+        if (in < 0x10000) {\
+            tmp = in;\
+            PUT_16BIT\
+        } else {\
+            tmp = 0xD800 | ((in - 0x10000) >> 10);\
+            PUT_16BIT\
+            tmp = 0xDC00 | ((in - 0x10000) & 0x3FF);\
+            PUT_16BIT\
+        }\
+    }\
+
+
+
+#include "mem.h"
+
+#ifdef HAVE_AV_CONFIG_H
+#    include "internal.h"
+#endif /* HAVE_AV_CONFIG_H */
+
+#endif /* AVUTIL_COMMON_H */
+
+/*
+ * The following definitions are outside the multiple inclusion guard
+ * to ensure they are immediately available in intmath.h.
+ */
+
+#ifndef av_ceil_log2
+#   define av_ceil_log2     av_ceil_log2_c
+#endif
+#ifndef av_clip
+#   define av_clip          av_clip_c
+#endif
+#ifndef av_clip_uint8
+#   define av_clip_uint8    av_clip_uint8_c
+#endif
+#ifndef av_clip_int8
+#   define av_clip_int8     av_clip_int8_c
+#endif
+#ifndef av_clip_uint16
+#   define av_clip_uint16   av_clip_uint16_c
+#endif
+#ifndef av_clip_int16
+#   define av_clip_int16    av_clip_int16_c
+#endif
+#ifndef av_clipl_int32
+#   define av_clipl_int32   av_clipl_int32_c
+#endif
+#ifndef av_clip_uintp2
+#   define av_clip_uintp2   av_clip_uintp2_c
+#endif
+#ifndef av_sat_add32
+#   define av_sat_add32     av_sat_add32_c
+#endif
+#ifndef av_sat_dadd32
+#   define av_sat_dadd32    av_sat_dadd32_c
+#endif
+#ifndef av_clipf
+#   define av_clipf         av_clipf_c
+#endif
+#ifndef av_popcount
+#   define av_popcount      av_popcount_c
+#endif
+#ifndef av_popcount64
+#   define av_popcount64    av_popcount64_c
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/cpu.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/cpu.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/cpu.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/cpu.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_CPU_H
+#define AVUTIL_CPU_H
+
+#include "version.h"
+
+#define AV_CPU_FLAG_FORCE    0x80000000 /* force usage of selected flags (OR) */
+
+    /* lower 16 bits - CPU features */
+#define AV_CPU_FLAG_MMX          0x0001 ///< standard MMX
+#define AV_CPU_FLAG_MMXEXT       0x0002 ///< SSE integer functions or AMD MMX ext
+#if FF_API_CPU_FLAG_MMX2
+#define AV_CPU_FLAG_MMX2         0x0002 ///< SSE integer functions or AMD MMX ext
+#endif
+#define AV_CPU_FLAG_3DNOW        0x0004 ///< AMD 3DNOW
+#define AV_CPU_FLAG_SSE          0x0008 ///< SSE functions
+#define AV_CPU_FLAG_SSE2         0x0010 ///< PIV SSE2 functions
+#define AV_CPU_FLAG_SSE2SLOW 0x40000000 ///< SSE2 supported, but usually not faster
+                                        ///< than regular MMX/SSE (e.g. Core1)
+#define AV_CPU_FLAG_3DNOWEXT     0x0020 ///< AMD 3DNowExt
+#define AV_CPU_FLAG_SSE3         0x0040 ///< Prescott SSE3 functions
+#define AV_CPU_FLAG_SSE3SLOW 0x20000000 ///< SSE3 supported, but usually not faster
+                                        ///< than regular MMX/SSE (e.g. Core1)
+#define AV_CPU_FLAG_SSSE3        0x0080 ///< Conroe SSSE3 functions
+#define AV_CPU_FLAG_ATOM     0x10000000 ///< Atom processor, some SSSE3 instructions are slower
+#define AV_CPU_FLAG_SSE4         0x0100 ///< Penryn SSE4.1 functions
+#define AV_CPU_FLAG_SSE42        0x0200 ///< Nehalem SSE4.2 functions
+#define AV_CPU_FLAG_AVX          0x4000 ///< AVX functions: requires OS support even if YMM registers aren't used
+#define AV_CPU_FLAG_XOP          0x0400 ///< Bulldozer XOP functions
+#define AV_CPU_FLAG_FMA4         0x0800 ///< Bulldozer FMA4 functions
+#define AV_CPU_FLAG_CMOV         0x1000 ///< i686 cmov
+#define AV_CPU_FLAG_AVX2         0x8000 ///< AVX2 functions: requires OS support even if YMM registers aren't used
+
+#define AV_CPU_FLAG_ALTIVEC      0x0001 ///< standard
+
+#define AV_CPU_FLAG_ARMV5TE      (1 << 0)
+#define AV_CPU_FLAG_ARMV6        (1 << 1)
+#define AV_CPU_FLAG_ARMV6T2      (1 << 2)
+#define AV_CPU_FLAG_VFP          (1 << 3)
+#define AV_CPU_FLAG_VFPV3        (1 << 4)
+#define AV_CPU_FLAG_NEON         (1 << 5)
+
+/**
+ * Return the flags which specify extensions supported by the CPU.
+ */
+int av_get_cpu_flags(void);
+
+/**
+ * Set a mask on flags returned by av_get_cpu_flags().
+ * This function is mainly useful for testing.
+ *
+ * @warning this function is not thread safe.
+ */
+void av_set_cpu_flags_mask(int mask);
+
+/**
+ * Parse CPU flags from a string.
+ *
+ * @return a combination of AV_CPU_* flags, negative on error.
+ */
+int av_parse_cpu_flags(const char *s);
+
+/**
+ * @return the number of logical CPU cores present.
+ */
+int av_cpu_count(void);
+
+#endif /* AVUTIL_CPU_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/crc.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/crc.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/crc.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/crc.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,74 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_CRC_H
+#define AVUTIL_CRC_H
+
+#include <stdint.h>
+#include <stddef.h>
+#include "attributes.h"
+
+typedef uint32_t AVCRC;
+
+typedef enum {
+    AV_CRC_8_ATM,
+    AV_CRC_16_ANSI,
+    AV_CRC_16_CCITT,
+    AV_CRC_32_IEEE,
+    AV_CRC_32_IEEE_LE,  /*< reversed bitorder version of AV_CRC_32_IEEE */
+    AV_CRC_MAX,         /*< Not part of public API! Do not use outside libavutil. */
+}AVCRCId;
+
+/**
+ * Initialize a CRC table.
+ * @param ctx must be an array of size sizeof(AVCRC)*257 or sizeof(AVCRC)*1024
+ * @param le If 1, the lowest bit represents the coefficient for the highest
+ *           exponent of the corresponding polynomial (both for poly and
+ *           actual CRC).
+ *           If 0, you must swap the CRC parameter and the result of av_crc
+ *           if you need the standard representation (can be simplified in
+ *           most cases to e.g. bswap16):
+ *           av_bswap32(crc << (32-bits))
+ * @param bits number of bits for the CRC
+ * @param poly generator polynomial without the x**bits coefficient, in the
+ *             representation as specified by le
+ * @param ctx_size size of ctx in bytes
+ * @return <0 on failure
+ */
+int av_crc_init(AVCRC *ctx, int le, int bits, uint32_t poly, int ctx_size);
+
+/**
+ * Get an initialized standard CRC table.
+ * @param crc_id ID of a standard CRC
+ * @return a pointer to the CRC table or NULL on failure
+ */
+const AVCRC *av_crc_get_table(AVCRCId crc_id);
+
+/**
+ * Calculate the CRC of a block.
+ * @param crc CRC of previous blocks if any or initial value for CRC
+ * @return CRC updated with the data from the given block
+ *
+ * @see av_crc_init() "le" parameter
+ */
+uint32_t av_crc(const AVCRC *ctx, uint32_t crc,
+                const uint8_t *buffer, size_t length) av_pure;
+
+#endif /* AVUTIL_CRC_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/dict.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/dict.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/dict.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/dict.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,146 @@
+/*
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Public dictionary API.
+ */
+
+#ifndef AVUTIL_DICT_H
+#define AVUTIL_DICT_H
+
+/**
+ * @addtogroup lavu_dict AVDictionary
+ * @ingroup lavu_data
+ *
+ * @brief Simple key:value store
+ *
+ * @{
+ * Dictionaries are used for storing key:value pairs. To create
+ * an AVDictionary, simply pass an address of a NULL pointer to
+ * av_dict_set(). NULL can be used as an empty dictionary wherever
+ * a pointer to an AVDictionary is required.
+ * Use av_dict_get() to retrieve an entry or iterate over all
+ * entries and finally av_dict_free() to free the dictionary
+ * and all its contents.
+ *
+ @code
+   AVDictionary *d = NULL;           // "create" an empty dictionary
+   AVDictionaryEntry *t = NULL;
+
+   av_dict_set(&d, "foo", "bar", 0); // add an entry
+
+   char *k = av_strdup("key");       // if your strings are already allocated,
+   char *v = av_strdup("value");     // you can avoid copying them like this
+   av_dict_set(&d, k, v, AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
+
+   while (t = av_dict_get(d, "", t, AV_DICT_IGNORE_SUFFIX)) {
+       <....>                             // iterate over all entries in d
+   }
+   av_dict_free(&d);
+ @endcode
+ *
+ */
+
+#define AV_DICT_MATCH_CASE      1
+#define AV_DICT_IGNORE_SUFFIX   2
+#define AV_DICT_DONT_STRDUP_KEY 4   /**< Take ownership of a key that's been
+                                         allocated with av_malloc() and children. */
+#define AV_DICT_DONT_STRDUP_VAL 8   /**< Take ownership of a value that's been
+                                         allocated with av_malloc() and chilren. */
+#define AV_DICT_DONT_OVERWRITE 16   ///< Don't overwrite existing entries.
+#define AV_DICT_APPEND         32   /**< If the entry already exists, append to it.  Note that no
+                                      delimiter is added, the strings are simply concatenated. */
+
+typedef struct AVDictionaryEntry {
+    char *key;
+    char *value;
+} AVDictionaryEntry;
+
+typedef struct AVDictionary AVDictionary;
+
+/**
+ * Get a dictionary entry with matching key.
+ *
+ * @param prev Set to the previous matching element to find the next.
+ *             If set to NULL the first matching element is returned.
+ * @param flags Allows case as well as suffix-insensitive comparisons.
+ * @return Found entry or NULL, changing key or value leads to undefined behavior.
+ */
+AVDictionaryEntry *
+av_dict_get(AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags);
+
+/**
+ * Get number of entries in dictionary.
+ *
+ * @param m dictionary
+ * @return  number of entries in dictionary
+ */
+int av_dict_count(const AVDictionary *m);
+
+/**
+ * Set the given entry in *pm, overwriting an existing entry.
+ *
+ * @param pm pointer to a pointer to a dictionary struct. If *pm is NULL
+ * a dictionary struct is allocated and put in *pm.
+ * @param key entry key to add to *pm (will be av_strduped depending on flags)
+ * @param value entry value to add to *pm (will be av_strduped depending on flags).
+ *        Passing a NULL value will cause an existing entry to be deleted.
+ * @return >= 0 on success otherwise an error code <0
+ */
+int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags);
+
+/**
+ * Parse the key/value pairs list and add to a dictionary.
+ *
+ * @param key_val_sep  a 0-terminated list of characters used to separate
+ *                     key from value
+ * @param pairs_sep    a 0-terminated list of characters used to separate
+ *                     two pairs from each other
+ * @param flags        flags to use when adding to dictionary.
+ *                     AV_DICT_DONT_STRDUP_KEY and AV_DICT_DONT_STRDUP_VAL
+ *                     are ignored since the key/value tokens will always
+ *                     be duplicated.
+ * @return             0 on success, negative AVERROR code on failure
+ */
+int av_dict_parse_string(AVDictionary **pm, const char *str,
+                         const char *key_val_sep, const char *pairs_sep,
+                         int flags);
+
+/**
+ * Copy entries from one AVDictionary struct into another.
+ * @param dst pointer to a pointer to a AVDictionary struct. If *dst is NULL,
+ *            this function will allocate a struct for you and put it in *dst
+ * @param src pointer to source AVDictionary struct
+ * @param flags flags to use when setting entries in *dst
+ * @note metadata is read using the AV_DICT_IGNORE_SUFFIX flag
+ */
+void av_dict_copy(AVDictionary **dst, AVDictionary *src, int flags);
+
+/**
+ * Free all the memory allocated for an AVDictionary struct
+ * and all keys and values.
+ */
+void av_dict_free(AVDictionary **m);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_DICT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/downmix_info.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/downmix_info.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/downmix_info.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/downmix_info.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2014 Tim Walker <tdskywalker@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_DOWNMIX_INFO_H
+#define AVUTIL_DOWNMIX_INFO_H
+
+#include "frame.h"
+
+/**
+ * @file
+ * audio downmix medatata
+ */
+
+/**
+ * @addtogroup lavu_audio
+ * @{
+ */
+
+/**
+ * @defgroup downmix_info Audio downmix metadata
+ * @{
+ */
+
+/**
+ * Possible downmix types.
+ */
+enum AVDownmixType {
+    AV_DOWNMIX_TYPE_UNKNOWN, /**< Not indicated. */
+    AV_DOWNMIX_TYPE_LORO,    /**< Lo/Ro 2-channel downmix (Stereo). */
+    AV_DOWNMIX_TYPE_LTRT,    /**< Lt/Rt 2-channel downmix, Dolby Surround compatible. */
+    AV_DOWNMIX_TYPE_DPLII,   /**< Lt/Rt 2-channel downmix, Dolby Pro Logic II compatible. */
+    AV_DOWNMIX_TYPE_NB       /**< Number of downmix types. Not part of ABI. */
+};
+
+/**
+ * This structure describes optional metadata relevant to a downmix procedure.
+ *
+ * All fields are set by the decoder to the value indicated in the audio
+ * bitstream (if present), or to a "sane" default otherwise.
+ */
+typedef struct AVDownmixInfo {
+    /**
+     * Type of downmix preferred by the mastering engineer.
+     */
+    enum AVDownmixType preferred_downmix_type;
+
+    /**
+     * Absolute scale factor representing the nominal level of the center
+     * channel during a regular downmix.
+     */
+    double center_mix_level;
+
+    /**
+     * Absolute scale factor representing the nominal level of the center
+     * channel during an Lt/Rt compatible downmix.
+     */
+    double center_mix_level_ltrt;
+
+    /**
+     * Absolute scale factor representing the nominal level of the surround
+     * channels during a regular downmix.
+     */
+    double surround_mix_level;
+
+    /**
+     * Absolute scale factor representing the nominal level of the surround
+     * channels during an Lt/Rt compatible downmix.
+     */
+    double surround_mix_level_ltrt;
+
+    /**
+     * Absolute scale factor representing the level at which the LFE data is
+     * mixed into L/R channels during downmixing.
+     */
+    double lfe_mix_level;
+} AVDownmixInfo;
+
+/**
+ * Get a frame's AV_FRAME_DATA_DOWNMIX_INFO side data for editing.
+ *
+ * The side data is created and added to the frame if it's absent.
+ *
+ * @param frame the frame for which the side data is to be obtained.
+ *
+ * @return the AVDownmixInfo structure to be edited by the caller.
+ */
+AVDownmixInfo *av_downmix_info_update_side_data(AVFrame *frame);
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_DOWNMIX_INFO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/error.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/error.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/error.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/error.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,82 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * error code definitions
+ */
+
+#ifndef AVUTIL_ERROR_H
+#define AVUTIL_ERROR_H
+
+#include <errno.h>
+#include <stddef.h>
+
+/**
+ * @addtogroup lavu_error
+ *
+ * @{
+ */
+
+
+/* error handling */
+#if EDOM > 0
+#define AVERROR(e) (-(e))   ///< Returns a negative error code from a POSIX error code, to return from library functions.
+#define AVUNERROR(e) (-(e)) ///< Returns a POSIX error code from a library function error return value.
+#else
+/* Some platforms have E* and errno already negated. */
+#define AVERROR(e) (e)
+#define AVUNERROR(e) (e)
+#endif
+
+#define AVERROR_BSF_NOT_FOUND      (-0x39acbd08) ///< Bitstream filter not found
+#define AVERROR_DECODER_NOT_FOUND  (-0x3cbabb08) ///< Decoder not found
+#define AVERROR_DEMUXER_NOT_FOUND  (-0x32babb08) ///< Demuxer not found
+#define AVERROR_ENCODER_NOT_FOUND  (-0x3cb1ba08) ///< Encoder not found
+#define AVERROR_EOF                (-0x5fb9b0bb) ///< End of file
+#define AVERROR_EXIT               (-0x2bb6a7bb) ///< Immediate exit was requested; the called function should not be restarted
+#define AVERROR_FILTER_NOT_FOUND   (-0x33b6b908) ///< Filter not found
+#define AVERROR_INVALIDDATA        (-0x3ebbb1b7) ///< Invalid data found when processing input
+#define AVERROR_MUXER_NOT_FOUND    (-0x27aab208) ///< Muxer not found
+#define AVERROR_OPTION_NOT_FOUND   (-0x2bafb008) ///< Option not found
+#define AVERROR_PATCHWELCOME       (-0x3aa8beb0) ///< Not yet implemented in Libav, patches welcome
+#define AVERROR_PROTOCOL_NOT_FOUND (-0x30adaf08) ///< Protocol not found
+#define AVERROR_STREAM_NOT_FOUND   (-0x2dabac08) ///< Stream not found
+#define AVERROR_BUG                (-0x5fb8aabe) ///< Bug detected, please report the issue
+#define AVERROR_UNKNOWN            (-0x31b4b1ab) ///< Unknown error, typically from an external library
+#define AVERROR_EXPERIMENTAL       (-0x2bb2afa8) ///< Requested feature is flagged experimental. Set strict_std_compliance if you really want to use it.
+
+/**
+ * Put a description of the AVERROR code errnum in errbuf.
+ * In case of failure the global variable errno is set to indicate the
+ * error. Even in case of failure av_strerror() will print a generic
+ * error message indicating the errnum provided to errbuf.
+ *
+ * @param errnum      error code to describe
+ * @param errbuf      buffer to which description is written
+ * @param errbuf_size the size in bytes of errbuf
+ * @return 0 on success, a negative value if a description for errnum
+ * cannot be found
+ */
+int av_strerror(int errnum, char *errbuf, size_t errbuf_size);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_ERROR_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/eval.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/eval.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/eval.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/eval.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2002 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * simple arithmetic expression evaluator
+ */
+
+#ifndef AVUTIL_EVAL_H
+#define AVUTIL_EVAL_H
+
+#include "avutil.h"
+
+typedef struct AVExpr AVExpr;
+
+/**
+ * Parse and evaluate an expression.
+ * Note, this is significantly slower than av_expr_eval().
+ *
+ * @param res a pointer to a double where is put the result value of
+ * the expression, or NAN in case of error
+ * @param s expression as a zero terminated string, for example "1+2^3+5*5+sin(2/3)"
+ * @param const_names NULL terminated array of zero terminated strings of constant identifiers, for example {"PI", "E", 0}
+ * @param const_values a zero terminated array of values for the identifiers from const_names
+ * @param func1_names NULL terminated array of zero terminated strings of funcs1 identifiers
+ * @param funcs1 NULL terminated array of function pointers for functions which take 1 argument
+ * @param func2_names NULL terminated array of zero terminated strings of funcs2 identifiers
+ * @param funcs2 NULL terminated array of function pointers for functions which take 2 arguments
+ * @param opaque a pointer which will be passed to all functions from funcs1 and funcs2
+ * @param log_ctx parent logging context
+ * @return 0 in case of success, a negative value corresponding to an
+ * AVERROR code otherwise
+ */
+int av_expr_parse_and_eval(double *res, const char *s,
+                           const char * const *const_names, const double *const_values,
+                           const char * const *func1_names, double (* const *funcs1)(void *, double),
+                           const char * const *func2_names, double (* const *funcs2)(void *, double, double),
+                           void *opaque, int log_offset, void *log_ctx);
+
+/**
+ * Parse an expression.
+ *
+ * @param expr a pointer where is put an AVExpr containing the parsed
+ * value in case of successful parsing, or NULL otherwise.
+ * The pointed to AVExpr must be freed with av_expr_free() by the user
+ * when it is not needed anymore.
+ * @param s expression as a zero terminated string, for example "1+2^3+5*5+sin(2/3)"
+ * @param const_names NULL terminated array of zero terminated strings of constant identifiers, for example {"PI", "E", 0}
+ * @param func1_names NULL terminated array of zero terminated strings of funcs1 identifiers
+ * @param funcs1 NULL terminated array of function pointers for functions which take 1 argument
+ * @param func2_names NULL terminated array of zero terminated strings of funcs2 identifiers
+ * @param funcs2 NULL terminated array of function pointers for functions which take 2 arguments
+ * @param log_ctx parent logging context
+ * @return 0 in case of success, a negative value corresponding to an
+ * AVERROR code otherwise
+ */
+int av_expr_parse(AVExpr **expr, const char *s,
+                  const char * const *const_names,
+                  const char * const *func1_names, double (* const *funcs1)(void *, double),
+                  const char * const *func2_names, double (* const *funcs2)(void *, double, double),
+                  int log_offset, void *log_ctx);
+
+/**
+ * Evaluate a previously parsed expression.
+ *
+ * @param const_values a zero terminated array of values for the identifiers from av_expr_parse() const_names
+ * @param opaque a pointer which will be passed to all functions from funcs1 and funcs2
+ * @return the value of the expression
+ */
+double av_expr_eval(AVExpr *e, const double *const_values, void *opaque);
+
+/**
+ * Free a parsed expression previously created with av_expr_parse().
+ */
+void av_expr_free(AVExpr *e);
+
+/**
+ * Parse the string in numstr and return its value as a double. If
+ * the string is empty, contains only whitespaces, or does not contain
+ * an initial substring that has the expected syntax for a
+ * floating-point number, no conversion is performed. In this case,
+ * returns a value of zero and the value returned in tail is the value
+ * of numstr.
+ *
+ * @param numstr a string representing a number, may contain one of
+ * the International System number postfixes, for example 'K', 'M',
+ * 'G'. If 'i' is appended after the postfix, powers of 2 are used
+ * instead of powers of 10. The 'B' postfix multiplies the value for
+ * 8, and can be appended after another postfix or used alone. This
+ * allows using for example 'KB', 'MiB', 'G' and 'B' as postfix.
+ * @param tail if non-NULL puts here the pointer to the char next
+ * after the last parsed character
+ */
+double av_strtod(const char *numstr, char **tail);
+
+#endif /* AVUTIL_EVAL_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/fifo.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/fifo.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/fifo.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/fifo.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,131 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * a very simple circular buffer FIFO implementation
+ */
+
+#ifndef AVUTIL_FIFO_H
+#define AVUTIL_FIFO_H
+
+#include <stdint.h>
+#include "avutil.h"
+#include "attributes.h"
+
+typedef struct AVFifoBuffer {
+    uint8_t *buffer;
+    uint8_t *rptr, *wptr, *end;
+    uint32_t rndx, wndx;
+} AVFifoBuffer;
+
+/**
+ * Initialize an AVFifoBuffer.
+ * @param size of FIFO
+ * @return AVFifoBuffer or NULL in case of memory allocation failure
+ */
+AVFifoBuffer *av_fifo_alloc(unsigned int size);
+
+/**
+ * Free an AVFifoBuffer.
+ * @param f AVFifoBuffer to free
+ */
+void av_fifo_free(AVFifoBuffer *f);
+
+/**
+ * Reset the AVFifoBuffer to the state right after av_fifo_alloc, in particular it is emptied.
+ * @param f AVFifoBuffer to reset
+ */
+void av_fifo_reset(AVFifoBuffer *f);
+
+/**
+ * Return the amount of data in bytes in the AVFifoBuffer, that is the
+ * amount of data you can read from it.
+ * @param f AVFifoBuffer to read from
+ * @return size
+ */
+int av_fifo_size(AVFifoBuffer *f);
+
+/**
+ * Return the amount of space in bytes in the AVFifoBuffer, that is the
+ * amount of data you can write into it.
+ * @param f AVFifoBuffer to write into
+ * @return size
+ */
+int av_fifo_space(AVFifoBuffer *f);
+
+/**
+ * Feed data from an AVFifoBuffer to a user-supplied callback.
+ * @param f AVFifoBuffer to read from
+ * @param buf_size number of bytes to read
+ * @param func generic read function
+ * @param dest data destination
+ */
+int av_fifo_generic_read(AVFifoBuffer *f, void *dest, int buf_size, void (*func)(void*, void*, int));
+
+/**
+ * Feed data from a user-supplied callback to an AVFifoBuffer.
+ * @param f AVFifoBuffer to write to
+ * @param src data source; non-const since it may be used as a
+ * modifiable context by the function defined in func
+ * @param size number of bytes to write
+ * @param func generic write function; the first parameter is src,
+ * the second is dest_buf, the third is dest_buf_size.
+ * func must return the number of bytes written to dest_buf, or <= 0 to
+ * indicate no more data available to write.
+ * If func is NULL, src is interpreted as a simple byte array for source data.
+ * @return the number of bytes written to the FIFO
+ */
+int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int));
+
+/**
+ * Resize an AVFifoBuffer.
+ * @param f AVFifoBuffer to resize
+ * @param size new AVFifoBuffer size in bytes
+ * @return <0 for failure, >=0 otherwise
+ */
+int av_fifo_realloc2(AVFifoBuffer *f, unsigned int size);
+
+/**
+ * Read and discard the specified amount of data from an AVFifoBuffer.
+ * @param f AVFifoBuffer to read from
+ * @param size amount of data to read in bytes
+ */
+void av_fifo_drain(AVFifoBuffer *f, int size);
+
+/**
+ * Return a pointer to the data stored in a FIFO buffer at a certain offset.
+ * The FIFO buffer is not modified.
+ *
+ * @param f    AVFifoBuffer to peek at, f must be non-NULL
+ * @param offs an offset in bytes, its absolute value must be less
+ *             than the used buffer size or the returned pointer will
+ *             point outside to the buffer data.
+ *             The used buffer size can be checked with av_fifo_size().
+ */
+static inline uint8_t *av_fifo_peek2(const AVFifoBuffer *f, int offs)
+{
+    uint8_t *ptr = f->rptr + offs;
+    if (ptr >= f->end)
+        ptr = f->buffer + (ptr - f->end);
+    else if (ptr < f->buffer)
+        ptr = f->end - (f->buffer - ptr);
+    return ptr;
+}
+
+#endif /* AVUTIL_FIFO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/file.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/file.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/file.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/file.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,54 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_FILE_H
+#define AVUTIL_FILE_H
+
+#include <stdint.h>
+
+#include "avutil.h"
+
+/**
+ * @file
+ * Misc file utilities.
+ */
+
+/**
+ * Read the file with name filename, and put its content in a newly
+ * allocated buffer or map it with mmap() when available.
+ * In case of success set *bufptr to the read or mmapped buffer, and
+ * *size to the size in bytes of the buffer in *bufptr.
+ * The returned buffer must be released with av_file_unmap().
+ *
+ * @param log_offset loglevel offset used for logging
+ * @param log_ctx context used for logging
+ * @return a non negative number in case of success, a negative value
+ * corresponding to an AVERROR error code in case of failure
+ */
+int av_file_map(const char *filename, uint8_t **bufptr, size_t *size,
+                int log_offset, void *log_ctx);
+
+/**
+ * Unmap or free the buffer bufptr created by av_file_map().
+ *
+ * @param size size in bytes of bufptr, must be the same as returned
+ * by av_file_map()
+ */
+void av_file_unmap(uint8_t *bufptr, size_t size);
+
+#endif /* AVUTIL_FILE_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/frame.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/frame.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/frame.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/frame.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,552 @@
+/*
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * @ingroup lavu_frame
+ * reference-counted frame API
+ */
+
+#ifndef AVUTIL_FRAME_H
+#define AVUTIL_FRAME_H
+
+#include <stdint.h>
+
+#include "avutil.h"
+#include "buffer.h"
+#include "dict.h"
+#include "rational.h"
+#include "samplefmt.h"
+#include "version.h"
+
+
+/**
+ * @defgroup lavu_frame AVFrame
+ * @ingroup lavu_data
+ *
+ * @{
+ * AVFrame is an abstraction for reference-counted raw multimedia data.
+ */
+
+enum AVFrameSideDataType {
+    /**
+     * The data is the AVPanScan struct defined in libavcodec.
+     */
+    AV_FRAME_DATA_PANSCAN,
+    /**
+     * ATSC A53 Part 4 Closed Captions.
+     * A53 CC bitstream is stored as uint8_t in AVFrameSideData.data.
+     * The number of bytes of CC data is AVFrameSideData.size.
+     */
+    AV_FRAME_DATA_A53_CC,
+    /**
+     * Stereoscopic 3d metadata.
+     * The data is the AVStereo3D struct defined in libavutil/stereo3d.h.
+     */
+    AV_FRAME_DATA_STEREO3D,
+    /**
+     * The data is the AVMatrixEncoding enum defined in libavutil/channel_layout.h.
+     */
+    AV_FRAME_DATA_MATRIXENCODING,
+    /**
+     * Metadata relevant to a downmix procedure.
+     * The data is the AVDownmixInfo struct defined in libavutil/downmix_info.h.
+     */
+    AV_FRAME_DATA_DOWNMIX_INFO,
+};
+
+typedef struct AVFrameSideData {
+    enum AVFrameSideDataType type;
+    uint8_t *data;
+    int      size;
+    AVDictionary *metadata;
+} AVFrameSideData;
+
+/**
+ * This structure describes decoded (raw) audio or video data.
+ *
+ * AVFrame must be allocated using av_frame_alloc(). Note that this only
+ * allocates the AVFrame itself, the buffers for the data must be managed
+ * through other means (see below).
+ * AVFrame must be freed with av_frame_free().
+ *
+ * AVFrame is typically allocated once and then reused multiple times to hold
+ * different data (e.g. a single AVFrame to hold frames received from a
+ * decoder). In such a case, av_frame_unref() will free any references held by
+ * the frame and reset it to its original clean state before it
+ * is reused again.
+ *
+ * The data described by an AVFrame is usually reference counted through the
+ * AVBuffer API. The underlying buffer references are stored in AVFrame.buf /
+ * AVFrame.extended_buf. An AVFrame is considered to be reference counted if at
+ * least one reference is set, i.e. if AVFrame.buf[0] != NULL. In such a case,
+ * every single data plane must be contained in one of the buffers in
+ * AVFrame.buf or AVFrame.extended_buf.
+ * There may be a single buffer for all the data, or one separate buffer for
+ * each plane, or anything in between.
+ *
+ * sizeof(AVFrame) is not a part of the public ABI, so new fields may be added
+ * to the end with a minor bump.
+ */
+typedef struct AVFrame {
+#define AV_NUM_DATA_POINTERS 8
+    /**
+     * pointer to the picture/channel planes.
+     * This might be different from the first allocated byte
+     */
+    uint8_t *data[AV_NUM_DATA_POINTERS];
+
+    /**
+     * For video, size in bytes of each picture line.
+     * For audio, size in bytes of each plane.
+     *
+     * For audio, only linesize[0] may be set. For planar audio, each channel
+     * plane must be the same size.
+     *
+     * @note The linesize may be larger than the size of usable data -- there
+     * may be extra padding present for performance reasons.
+     */
+    int linesize[AV_NUM_DATA_POINTERS];
+
+    /**
+     * pointers to the data planes/channels.
+     *
+     * For video, this should simply point to data[].
+     *
+     * For planar audio, each channel has a separate data pointer, and
+     * linesize[0] contains the size of each channel buffer.
+     * For packed audio, there is just one data pointer, and linesize[0]
+     * contains the total size of the buffer for all channels.
+     *
+     * Note: Both data and extended_data should always be set in a valid frame,
+     * but for planar audio with more channels that can fit in data,
+     * extended_data must be used in order to access all channels.
+     */
+    uint8_t **extended_data;
+
+    /**
+     * width and height of the video frame
+     */
+    int width, height;
+
+    /**
+     * number of audio samples (per channel) described by this frame
+     */
+    int nb_samples;
+
+    /**
+     * format of the frame, -1 if unknown or unset
+     * Values correspond to enum AVPixelFormat for video frames,
+     * enum AVSampleFormat for audio)
+     */
+    int format;
+
+    /**
+     * 1 -> keyframe, 0-> not
+     */
+    int key_frame;
+
+    /**
+     * Picture type of the frame.
+     */
+    enum AVPictureType pict_type;
+
+#if FF_API_AVFRAME_LAVC
+    attribute_deprecated
+    uint8_t *base[AV_NUM_DATA_POINTERS];
+#endif
+
+    /**
+     * Sample aspect ratio for the video frame, 0/1 if unknown/unspecified.
+     */
+    AVRational sample_aspect_ratio;
+
+    /**
+     * Presentation timestamp in time_base units (time when frame should be shown to user).
+     */
+    int64_t pts;
+
+    /**
+     * PTS copied from the AVPacket that was decoded to produce this frame.
+     */
+    int64_t pkt_pts;
+
+    /**
+     * DTS copied from the AVPacket that triggered returning this frame.
+     */
+    int64_t pkt_dts;
+
+    /**
+     * picture number in bitstream order
+     */
+    int coded_picture_number;
+    /**
+     * picture number in display order
+     */
+    int display_picture_number;
+
+    /**
+     * quality (between 1 (good) and FF_LAMBDA_MAX (bad))
+     */
+    int quality;
+
+#if FF_API_AVFRAME_LAVC
+    attribute_deprecated
+    int reference;
+
+    /**
+     * QP table
+     */
+    attribute_deprecated
+    int8_t *qscale_table;
+    /**
+     * QP store stride
+     */
+    attribute_deprecated
+    int qstride;
+
+    attribute_deprecated
+    int qscale_type;
+
+    /**
+     * mbskip_table[mb]>=1 if MB didn't change
+     * stride= mb_width = (width+15)>>4
+     */
+    attribute_deprecated
+    uint8_t *mbskip_table;
+
+    /**
+     * motion vector table
+     * @code
+     * example:
+     * int mv_sample_log2= 4 - motion_subsample_log2;
+     * int mb_width= (width+15)>>4;
+     * int mv_stride= (mb_width << mv_sample_log2) + 1;
+     * motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y];
+     * @endcode
+     */
+    attribute_deprecated
+    int16_t (*motion_val[2])[2];
+
+    /**
+     * macroblock type table
+     * mb_type_base + mb_width + 2
+     */
+    attribute_deprecated
+    uint32_t *mb_type;
+
+    /**
+     * DCT coefficients
+     */
+    attribute_deprecated
+    short *dct_coeff;
+
+    /**
+     * motion reference frame index
+     * the order in which these are stored can depend on the codec.
+     */
+    attribute_deprecated
+    int8_t *ref_index[2];
+#endif
+
+    /**
+     * for some private data of the user
+     */
+    void *opaque;
+
+    /**
+     * error
+     */
+    uint64_t error[AV_NUM_DATA_POINTERS];
+
+#if FF_API_AVFRAME_LAVC
+    attribute_deprecated
+    int type;
+#endif
+
+    /**
+     * When decoding, this signals how much the picture must be delayed.
+     * extra_delay = repeat_pict / (2*fps)
+     */
+    int repeat_pict;
+
+    /**
+     * The content of the picture is interlaced.
+     */
+    int interlaced_frame;
+
+    /**
+     * If the content is interlaced, is top field displayed first.
+     */
+    int top_field_first;
+
+    /**
+     * Tell user application that palette has changed from previous frame.
+     */
+    int palette_has_changed;
+
+#if FF_API_AVFRAME_LAVC
+    attribute_deprecated
+    int buffer_hints;
+
+    /**
+     * Pan scan.
+     */
+    attribute_deprecated
+    struct AVPanScan *pan_scan;
+#endif
+
+    /**
+     * reordered opaque 64bit (generally an integer or a double precision float
+     * PTS but can be anything).
+     * The user sets AVCodecContext.reordered_opaque to represent the input at
+     * that time,
+     * the decoder reorders values as needed and sets AVFrame.reordered_opaque
+     * to exactly one of the values provided by the user through AVCodecContext.reordered_opaque
+     * @deprecated in favor of pkt_pts
+     */
+    int64_t reordered_opaque;
+
+#if FF_API_AVFRAME_LAVC
+    /**
+     * @deprecated this field is unused
+     */
+    attribute_deprecated void *hwaccel_picture_private;
+
+    attribute_deprecated
+    struct AVCodecContext *owner;
+    attribute_deprecated
+    void *thread_opaque;
+
+    /**
+     * log2 of the size of the block which a single vector in motion_val represents:
+     * (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2)
+     */
+    attribute_deprecated
+    uint8_t motion_subsample_log2;
+#endif
+
+    /**
+     * Sample rate of the audio data.
+     */
+    int sample_rate;
+
+    /**
+     * Channel layout of the audio data.
+     */
+    uint64_t channel_layout;
+
+    /**
+     * AVBuffer references backing the data for this frame. If all elements of
+     * this array are NULL, then this frame is not reference counted.
+     *
+     * There may be at most one AVBuffer per data plane, so for video this array
+     * always contains all the references. For planar audio with more than
+     * AV_NUM_DATA_POINTERS channels, there may be more buffers than can fit in
+     * this array. Then the extra AVBufferRef pointers are stored in the
+     * extended_buf array.
+     */
+    AVBufferRef *buf[AV_NUM_DATA_POINTERS];
+
+    /**
+     * For planar audio which requires more than AV_NUM_DATA_POINTERS
+     * AVBufferRef pointers, this array will hold all the references which
+     * cannot fit into AVFrame.buf.
+     *
+     * Note that this is different from AVFrame.extended_data, which always
+     * contains all the pointers. This array only contains the extra pointers,
+     * which cannot fit into AVFrame.buf.
+     *
+     * This array is always allocated using av_malloc() by whoever constructs
+     * the frame. It is freed in av_frame_unref().
+     */
+    AVBufferRef **extended_buf;
+    /**
+     * Number of elements in extended_buf.
+     */
+    int        nb_extended_buf;
+
+    AVFrameSideData **side_data;
+    int            nb_side_data;
+
+/**
+ * @defgroup lavu_frame_flags AV_FRAME_FLAGS
+ * Flags describing additional frame properties.
+ *
+ * @{
+ */
+
+/**
+ * The frame data may be corrupted, e.g. due to decoding errors.
+ */
+#define AV_FRAME_FLAG_CORRUPT       (1 << 0)
+/**
+ * @}
+ */
+
+    /**
+     * Frame flags, a combination of @ref lavu_frame_flags
+     */
+    int flags;
+} AVFrame;
+
+/**
+ * Allocate an AVFrame and set its fields to default values.  The resulting
+ * struct must be freed using av_frame_free().
+ *
+ * @return An AVFrame filled with default values or NULL on failure.
+ *
+ * @note this only allocates the AVFrame itself, not the data buffers. Those
+ * must be allocated through other means, e.g. with av_frame_get_buffer() or
+ * manually.
+ */
+AVFrame *av_frame_alloc(void);
+
+/**
+ * Free the frame and any dynamically allocated objects in it,
+ * e.g. extended_data. If the frame is reference counted, it will be
+ * unreferenced first.
+ *
+ * @param frame frame to be freed. The pointer will be set to NULL.
+ */
+void av_frame_free(AVFrame **frame);
+
+/**
+ * Set up a new reference to the data described by the source frame.
+ *
+ * Copy frame properties from src to dst and create a new reference for each
+ * AVBufferRef from src.
+ *
+ * If src is not reference counted, new buffers are allocated and the data is
+ * copied.
+ *
+ * @return 0 on success, a negative AVERROR on error
+ */
+int av_frame_ref(AVFrame *dst, const AVFrame *src);
+
+/**
+ * Create a new frame that references the same data as src.
+ *
+ * This is a shortcut for av_frame_alloc()+av_frame_ref().
+ *
+ * @return newly created AVFrame on success, NULL on error.
+ */
+AVFrame *av_frame_clone(const AVFrame *src);
+
+/**
+ * Unreference all the buffers referenced by frame and reset the frame fields.
+ */
+void av_frame_unref(AVFrame *frame);
+
+/**
+ * Move everythnig contained in src to dst and reset src.
+ */
+void av_frame_move_ref(AVFrame *dst, AVFrame *src);
+
+/**
+ * Allocate new buffer(s) for audio or video data.
+ *
+ * The following fields must be set on frame before calling this function:
+ * - format (pixel format for video, sample format for audio)
+ * - width and height for video
+ * - nb_samples and channel_layout for audio
+ *
+ * This function will fill AVFrame.data and AVFrame.buf arrays and, if
+ * necessary, allocate and fill AVFrame.extended_data and AVFrame.extended_buf.
+ * For planar formats, one buffer will be allocated for each plane.
+ *
+ * @param frame frame in which to store the new buffers.
+ * @param align required buffer size alignment
+ *
+ * @return 0 on success, a negative AVERROR on error.
+ */
+int av_frame_get_buffer(AVFrame *frame, int align);
+
+/**
+ * Check if the frame data is writable.
+ *
+ * @return A positive value if the frame data is writable (which is true if and
+ * only if each of the underlying buffers has only one reference, namely the one
+ * stored in this frame). Return 0 otherwise.
+ *
+ * If 1 is returned the answer is valid until av_buffer_ref() is called on any
+ * of the underlying AVBufferRefs (e.g. through av_frame_ref() or directly).
+ *
+ * @see av_frame_make_writable(), av_buffer_is_writable()
+ */
+int av_frame_is_writable(AVFrame *frame);
+
+/**
+ * Ensure that the frame data is writable, avoiding data copy if possible.
+ *
+ * Do nothing if the frame is writable, allocate new buffers and copy the data
+ * if it is not.
+ *
+ * @return 0 on success, a negative AVERROR on error.
+ *
+ * @see av_frame_is_writable(), av_buffer_is_writable(),
+ * av_buffer_make_writable()
+ */
+int av_frame_make_writable(AVFrame *frame);
+
+/**
+ * Copy only "metadata" fields from src to dst.
+ *
+ * Metadata for the purpose of this function are those fields that do not affect
+ * the data layout in the buffers.  E.g. pts, sample rate (for audio) or sample
+ * aspect ratio (for video), but not width/height or channel layout.
+ * Side data is also copied.
+ */
+int av_frame_copy_props(AVFrame *dst, const AVFrame *src);
+
+/**
+ * Get the buffer reference a given data plane is stored in.
+ *
+ * @param plane index of the data plane of interest in frame->extended_data.
+ *
+ * @return the buffer reference that contains the plane or NULL if the input
+ * frame is not valid.
+ */
+AVBufferRef *av_frame_get_plane_buffer(AVFrame *frame, int plane);
+
+/**
+ * Add a new side data to a frame.
+ *
+ * @param frame a frame to which the side data should be added
+ * @param type type of the added side data
+ * @param size size of the side data
+ *
+ * @return newly added side data on success, NULL on error
+ */
+AVFrameSideData *av_frame_new_side_data(AVFrame *frame,
+                                        enum AVFrameSideDataType type,
+                                        int size);
+
+/**
+ * @return a pointer to the side data of a given type on success, NULL if there
+ * is no side data with such type in this frame.
+ */
+AVFrameSideData *av_frame_get_side_data(const AVFrame *frame,
+                                        enum AVFrameSideDataType type);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_FRAME_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/hmac.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/hmac.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/hmac.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/hmac.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2012 Martin Storsjo
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_HMAC_H
+#define AVUTIL_HMAC_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_hmac HMAC
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+enum AVHMACType {
+    AV_HMAC_MD5,
+    AV_HMAC_SHA1,
+};
+
+typedef struct AVHMAC AVHMAC;
+
+/**
+ * Allocate an AVHMAC context.
+ * @param type The hash function used for the HMAC.
+ */
+AVHMAC *av_hmac_alloc(enum AVHMACType type);
+
+/**
+ * Free an AVHMAC context.
+ * @param ctx The context to free, may be NULL
+ */
+void av_hmac_free(AVHMAC *ctx);
+
+/**
+ * Initialize an AVHMAC context with an authentication key.
+ * @param ctx    The HMAC context
+ * @param key    The authentication key
+ * @param keylen The length of the key, in bytes
+ */
+void av_hmac_init(AVHMAC *ctx, const uint8_t *key, unsigned int keylen);
+
+/**
+ * Hash data with the HMAC.
+ * @param ctx  The HMAC context
+ * @param data The data to hash
+ * @param len  The length of the data, in bytes
+ */
+void av_hmac_update(AVHMAC *ctx, const uint8_t *data, unsigned int len);
+
+/**
+ * Finish hashing and output the HMAC digest.
+ * @param ctx    The HMAC context
+ * @param out    The output buffer to write the digest into
+ * @param outlen The length of the out buffer, in bytes
+ * @return       The number of bytes written to out, or a negative error code.
+ */
+int av_hmac_final(AVHMAC *ctx, uint8_t *out, unsigned int outlen);
+
+/**
+ * Hash an array of data with a key.
+ * @param ctx    The HMAC context
+ * @param data   The data to hash
+ * @param len    The length of the data, in bytes
+ * @param key    The authentication key
+ * @param keylen The length of the key, in bytes
+ * @param out    The output buffer to write the digest into
+ * @param outlen The length of the out buffer, in bytes
+ * @return       The number of bytes written to out, or a negative error code.
+ */
+int av_hmac_calc(AVHMAC *ctx, const uint8_t *data, unsigned int len,
+                 const uint8_t *key, unsigned int keylen,
+                 uint8_t *out, unsigned int outlen);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_HMAC_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/imgutils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/imgutils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/imgutils.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/imgutils.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,138 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_IMGUTILS_H
+#define AVUTIL_IMGUTILS_H
+
+/**
+ * @file
+ * misc image utilities
+ *
+ * @addtogroup lavu_picture
+ * @{
+ */
+
+#include "avutil.h"
+#include "pixdesc.h"
+
+/**
+ * Compute the max pixel step for each plane of an image with a
+ * format described by pixdesc.
+ *
+ * The pixel step is the distance in bytes between the first byte of
+ * the group of bytes which describe a pixel component and the first
+ * byte of the successive group in the same plane for the same
+ * component.
+ *
+ * @param max_pixsteps an array which is filled with the max pixel step
+ * for each plane. Since a plane may contain different pixel
+ * components, the computed max_pixsteps[plane] is relative to the
+ * component in the plane with the max pixel step.
+ * @param max_pixstep_comps an array which is filled with the component
+ * for each plane which has the max pixel step. May be NULL.
+ */
+void av_image_fill_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4],
+                                const AVPixFmtDescriptor *pixdesc);
+
+/**
+ * Compute the size of an image line with format pix_fmt and width
+ * width for the plane plane.
+ *
+ * @return the computed size in bytes
+ */
+int av_image_get_linesize(enum AVPixelFormat pix_fmt, int width, int plane);
+
+/**
+ * Fill plane linesizes for an image with pixel format pix_fmt and
+ * width width.
+ *
+ * @param linesizes array to be filled with the linesize for each plane
+ * @return >= 0 in case of success, a negative error code otherwise
+ */
+int av_image_fill_linesizes(int linesizes[4], enum AVPixelFormat pix_fmt, int width);
+
+/**
+ * Fill plane data pointers for an image with pixel format pix_fmt and
+ * height height.
+ *
+ * @param data pointers array to be filled with the pointer for each image plane
+ * @param ptr the pointer to a buffer which will contain the image
+ * @param linesizes the array containing the linesize for each
+ * plane, should be filled by av_image_fill_linesizes()
+ * @return the size in bytes required for the image buffer, a negative
+ * error code in case of failure
+ */
+int av_image_fill_pointers(uint8_t *data[4], enum AVPixelFormat pix_fmt, int height,
+                           uint8_t *ptr, const int linesizes[4]);
+
+/**
+ * Allocate an image with size w and h and pixel format pix_fmt, and
+ * fill pointers and linesizes accordingly.
+ * The allocated image buffer has to be freed by using
+ * av_freep(&pointers[0]).
+ *
+ * @param align the value to use for buffer size alignment
+ * @return the size in bytes required for the image buffer, a negative
+ * error code in case of failure
+ */
+int av_image_alloc(uint8_t *pointers[4], int linesizes[4],
+                   int w, int h, enum AVPixelFormat pix_fmt, int align);
+
+/**
+ * Copy image plane from src to dst.
+ * That is, copy "height" number of lines of "bytewidth" bytes each.
+ * The first byte of each successive line is separated by *_linesize
+ * bytes.
+ *
+ * @param dst_linesize linesize for the image plane in dst
+ * @param src_linesize linesize for the image plane in src
+ */
+void av_image_copy_plane(uint8_t       *dst, int dst_linesize,
+                         const uint8_t *src, int src_linesize,
+                         int bytewidth, int height);
+
+/**
+ * Copy image in src_data to dst_data.
+ *
+ * @param dst_linesizes linesizes for the image in dst_data
+ * @param src_linesizes linesizes for the image in src_data
+ */
+void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4],
+                   const uint8_t *src_data[4], const int src_linesizes[4],
+                   enum AVPixelFormat pix_fmt, int width, int height);
+
+/**
+ * Check if the given dimension of an image is valid, meaning that all
+ * bytes of the image can be addressed with a signed int.
+ *
+ * @param w the width of the picture
+ * @param h the height of the picture
+ * @param log_offset the offset to sum to the log level for logging with log_ctx
+ * @param log_ctx the parent logging context, it may be NULL
+ * @return >= 0 if valid, a negative error code otherwise
+ */
+int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx);
+
+int avpriv_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt);
+
+/**
+ * @}
+ */
+
+
+#endif /* AVUTIL_IMGUTILS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/intfloat.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/intfloat.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/intfloat.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/intfloat.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2011 Mans Rullgard
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_INTFLOAT_H
+#define AVUTIL_INTFLOAT_H
+
+#include <stdint.h>
+#include "attributes.h"
+
+union av_intfloat32 {
+    uint32_t i;
+    float    f;
+};
+
+union av_intfloat64 {
+    uint64_t i;
+    double   f;
+};
+
+/**
+ * Reinterpret a 32-bit integer as a float.
+ */
+static av_always_inline float av_int2float(uint32_t i)
+{
+    union av_intfloat32 v;
+    v.i = i;
+    return v.f;
+}
+
+/**
+ * Reinterpret a float as a 32-bit integer.
+ */
+static av_always_inline uint32_t av_float2int(float f)
+{
+    union av_intfloat32 v;
+    v.f = f;
+    return v.i;
+}
+
+/**
+ * Reinterpret a 64-bit integer as a double.
+ */
+static av_always_inline double av_int2double(uint64_t i)
+{
+    union av_intfloat64 v;
+    v.i = i;
+    return v.f;
+}
+
+/**
+ * Reinterpret a double as a 64-bit integer.
+ */
+static av_always_inline uint64_t av_double2int(double f)
+{
+    union av_intfloat64 v;
+    v.f = f;
+    return v.i;
+}
+
+#endif /* AVUTIL_INTFLOAT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/intreadwrite.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/intreadwrite.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/intreadwrite.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/intreadwrite.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,549 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_INTREADWRITE_H
+#define AVUTIL_INTREADWRITE_H
+
+#include <stdint.h>
+#include "libavutil/avconfig.h"
+#include "attributes.h"
+#include "bswap.h"
+
+typedef union {
+    uint64_t u64;
+    uint32_t u32[2];
+    uint16_t u16[4];
+    uint8_t  u8 [8];
+    double   f64;
+    float    f32[2];
+} av_alias av_alias64;
+
+typedef union {
+    uint32_t u32;
+    uint16_t u16[2];
+    uint8_t  u8 [4];
+    float    f32;
+} av_alias av_alias32;
+
+typedef union {
+    uint16_t u16;
+    uint8_t  u8 [2];
+} av_alias av_alias16;
+
+/*
+ * Arch-specific headers can provide any combination of
+ * AV_[RW][BLN](16|24|32|64) and AV_(COPY|SWAP|ZERO)(64|128) macros.
+ * Preprocessor symbols must be defined, even if these are implemented
+ * as inline functions.
+ */
+
+#ifdef HAVE_AV_CONFIG_H
+
+#include "config.h"
+
+#if   ARCH_ARM
+#   include "arm/intreadwrite.h"
+#elif ARCH_AVR32
+#   include "avr32/intreadwrite.h"
+#elif ARCH_MIPS
+#   include "mips/intreadwrite.h"
+#elif ARCH_PPC
+#   include "ppc/intreadwrite.h"
+#elif ARCH_TOMI
+#   include "tomi/intreadwrite.h"
+#elif ARCH_X86
+#   include "x86/intreadwrite.h"
+#endif
+
+#endif /* HAVE_AV_CONFIG_H */
+
+/*
+ * Map AV_RNXX <-> AV_R[BL]XX for all variants provided by per-arch headers.
+ */
+
+#if AV_HAVE_BIGENDIAN
+
+#   if    defined(AV_RN16) && !defined(AV_RB16)
+#       define AV_RB16(p) AV_RN16(p)
+#   elif !defined(AV_RN16) &&  defined(AV_RB16)
+#       define AV_RN16(p) AV_RB16(p)
+#   endif
+
+#   if    defined(AV_WN16) && !defined(AV_WB16)
+#       define AV_WB16(p, v) AV_WN16(p, v)
+#   elif !defined(AV_WN16) &&  defined(AV_WB16)
+#       define AV_WN16(p, v) AV_WB16(p, v)
+#   endif
+
+#   if    defined(AV_RN24) && !defined(AV_RB24)
+#       define AV_RB24(p) AV_RN24(p)
+#   elif !defined(AV_RN24) &&  defined(AV_RB24)
+#       define AV_RN24(p) AV_RB24(p)
+#   endif
+
+#   if    defined(AV_WN24) && !defined(AV_WB24)
+#       define AV_WB24(p, v) AV_WN24(p, v)
+#   elif !defined(AV_WN24) &&  defined(AV_WB24)
+#       define AV_WN24(p, v) AV_WB24(p, v)
+#   endif
+
+#   if    defined(AV_RN32) && !defined(AV_RB32)
+#       define AV_RB32(p) AV_RN32(p)
+#   elif !defined(AV_RN32) &&  defined(AV_RB32)
+#       define AV_RN32(p) AV_RB32(p)
+#   endif
+
+#   if    defined(AV_WN32) && !defined(AV_WB32)
+#       define AV_WB32(p, v) AV_WN32(p, v)
+#   elif !defined(AV_WN32) &&  defined(AV_WB32)
+#       define AV_WN32(p, v) AV_WB32(p, v)
+#   endif
+
+#   if    defined(AV_RN64) && !defined(AV_RB64)
+#       define AV_RB64(p) AV_RN64(p)
+#   elif !defined(AV_RN64) &&  defined(AV_RB64)
+#       define AV_RN64(p) AV_RB64(p)
+#   endif
+
+#   if    defined(AV_WN64) && !defined(AV_WB64)
+#       define AV_WB64(p, v) AV_WN64(p, v)
+#   elif !defined(AV_WN64) &&  defined(AV_WB64)
+#       define AV_WN64(p, v) AV_WB64(p, v)
+#   endif
+
+#else /* AV_HAVE_BIGENDIAN */
+
+#   if    defined(AV_RN16) && !defined(AV_RL16)
+#       define AV_RL16(p) AV_RN16(p)
+#   elif !defined(AV_RN16) &&  defined(AV_RL16)
+#       define AV_RN16(p) AV_RL16(p)
+#   endif
+
+#   if    defined(AV_WN16) && !defined(AV_WL16)
+#       define AV_WL16(p, v) AV_WN16(p, v)
+#   elif !defined(AV_WN16) &&  defined(AV_WL16)
+#       define AV_WN16(p, v) AV_WL16(p, v)
+#   endif
+
+#   if    defined(AV_RN24) && !defined(AV_RL24)
+#       define AV_RL24(p) AV_RN24(p)
+#   elif !defined(AV_RN24) &&  defined(AV_RL24)
+#       define AV_RN24(p) AV_RL24(p)
+#   endif
+
+#   if    defined(AV_WN24) && !defined(AV_WL24)
+#       define AV_WL24(p, v) AV_WN24(p, v)
+#   elif !defined(AV_WN24) &&  defined(AV_WL24)
+#       define AV_WN24(p, v) AV_WL24(p, v)
+#   endif
+
+#   if    defined(AV_RN32) && !defined(AV_RL32)
+#       define AV_RL32(p) AV_RN32(p)
+#   elif !defined(AV_RN32) &&  defined(AV_RL32)
+#       define AV_RN32(p) AV_RL32(p)
+#   endif
+
+#   if    defined(AV_WN32) && !defined(AV_WL32)
+#       define AV_WL32(p, v) AV_WN32(p, v)
+#   elif !defined(AV_WN32) &&  defined(AV_WL32)
+#       define AV_WN32(p, v) AV_WL32(p, v)
+#   endif
+
+#   if    defined(AV_RN64) && !defined(AV_RL64)
+#       define AV_RL64(p) AV_RN64(p)
+#   elif !defined(AV_RN64) &&  defined(AV_RL64)
+#       define AV_RN64(p) AV_RL64(p)
+#   endif
+
+#   if    defined(AV_WN64) && !defined(AV_WL64)
+#       define AV_WL64(p, v) AV_WN64(p, v)
+#   elif !defined(AV_WN64) &&  defined(AV_WL64)
+#       define AV_WN64(p, v) AV_WL64(p, v)
+#   endif
+
+#endif /* !AV_HAVE_BIGENDIAN */
+
+/*
+ * Define AV_[RW]N helper macros to simplify definitions not provided
+ * by per-arch headers.
+ */
+
+#if defined(__GNUC__) && !defined(__TI_COMPILER_VERSION__)
+
+union unaligned_64 { uint64_t l; } __attribute__((packed)) av_alias;
+union unaligned_32 { uint32_t l; } __attribute__((packed)) av_alias;
+union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias;
+
+#   define AV_RN(s, p) (((const union unaligned_##s *) (p))->l)
+#   define AV_WN(s, p, v) ((((union unaligned_##s *) (p))->l) = (v))
+
+#elif defined(__DECC)
+
+#   define AV_RN(s, p) (*((const __unaligned uint##s##_t*)(p)))
+#   define AV_WN(s, p, v) (*((__unaligned uint##s##_t*)(p)) = (v))
+
+#elif AV_HAVE_FAST_UNALIGNED
+
+#   define AV_RN(s, p) (((const av_alias##s*)(p))->u##s)
+#   define AV_WN(s, p, v) (((av_alias##s*)(p))->u##s = (v))
+
+#else
+
+#ifndef AV_RB16
+#   define AV_RB16(x)                           \
+    ((((const uint8_t*)(x))[0] << 8) |          \
+      ((const uint8_t*)(x))[1])
+#endif
+#ifndef AV_WB16
+#   define AV_WB16(p, d) do {                   \
+        ((uint8_t*)(p))[1] = (d);               \
+        ((uint8_t*)(p))[0] = (d)>>8;            \
+    } while(0)
+#endif
+
+#ifndef AV_RL16
+#   define AV_RL16(x)                           \
+    ((((const uint8_t*)(x))[1] << 8) |          \
+      ((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL16
+#   define AV_WL16(p, d) do {                   \
+        ((uint8_t*)(p))[0] = (d);               \
+        ((uint8_t*)(p))[1] = (d)>>8;            \
+    } while(0)
+#endif
+
+#ifndef AV_RB32
+#   define AV_RB32(x)                                \
+    (((uint32_t)((const uint8_t*)(x))[0] << 24) |    \
+               (((const uint8_t*)(x))[1] << 16) |    \
+               (((const uint8_t*)(x))[2] <<  8) |    \
+                ((const uint8_t*)(x))[3])
+#endif
+#ifndef AV_WB32
+#   define AV_WB32(p, d) do {                   \
+        ((uint8_t*)(p))[3] = (d);               \
+        ((uint8_t*)(p))[2] = (d)>>8;            \
+        ((uint8_t*)(p))[1] = (d)>>16;           \
+        ((uint8_t*)(p))[0] = (d)>>24;           \
+    } while(0)
+#endif
+
+#ifndef AV_RL32
+#   define AV_RL32(x)                                \
+    (((uint32_t)((const uint8_t*)(x))[3] << 24) |    \
+               (((const uint8_t*)(x))[2] << 16) |    \
+               (((const uint8_t*)(x))[1] <<  8) |    \
+                ((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL32
+#   define AV_WL32(p, d) do {                   \
+        ((uint8_t*)(p))[0] = (d);               \
+        ((uint8_t*)(p))[1] = (d)>>8;            \
+        ((uint8_t*)(p))[2] = (d)>>16;           \
+        ((uint8_t*)(p))[3] = (d)>>24;           \
+    } while(0)
+#endif
+
+#ifndef AV_RB64
+#   define AV_RB64(x)                                   \
+    (((uint64_t)((const uint8_t*)(x))[0] << 56) |       \
+     ((uint64_t)((const uint8_t*)(x))[1] << 48) |       \
+     ((uint64_t)((const uint8_t*)(x))[2] << 40) |       \
+     ((uint64_t)((const uint8_t*)(x))[3] << 32) |       \
+     ((uint64_t)((const uint8_t*)(x))[4] << 24) |       \
+     ((uint64_t)((const uint8_t*)(x))[5] << 16) |       \
+     ((uint64_t)((const uint8_t*)(x))[6] <<  8) |       \
+      (uint64_t)((const uint8_t*)(x))[7])
+#endif
+#ifndef AV_WB64
+#   define AV_WB64(p, d) do {                   \
+        ((uint8_t*)(p))[7] = (d);               \
+        ((uint8_t*)(p))[6] = (d)>>8;            \
+        ((uint8_t*)(p))[5] = (d)>>16;           \
+        ((uint8_t*)(p))[4] = (d)>>24;           \
+        ((uint8_t*)(p))[3] = (d)>>32;           \
+        ((uint8_t*)(p))[2] = (d)>>40;           \
+        ((uint8_t*)(p))[1] = (d)>>48;           \
+        ((uint8_t*)(p))[0] = (d)>>56;           \
+    } while(0)
+#endif
+
+#ifndef AV_RL64
+#   define AV_RL64(x)                                   \
+    (((uint64_t)((const uint8_t*)(x))[7] << 56) |       \
+     ((uint64_t)((const uint8_t*)(x))[6] << 48) |       \
+     ((uint64_t)((const uint8_t*)(x))[5] << 40) |       \
+     ((uint64_t)((const uint8_t*)(x))[4] << 32) |       \
+     ((uint64_t)((const uint8_t*)(x))[3] << 24) |       \
+     ((uint64_t)((const uint8_t*)(x))[2] << 16) |       \
+     ((uint64_t)((const uint8_t*)(x))[1] <<  8) |       \
+      (uint64_t)((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL64
+#   define AV_WL64(p, d) do {                   \
+        ((uint8_t*)(p))[0] = (d);               \
+        ((uint8_t*)(p))[1] = (d)>>8;            \
+        ((uint8_t*)(p))[2] = (d)>>16;           \
+        ((uint8_t*)(p))[3] = (d)>>24;           \
+        ((uint8_t*)(p))[4] = (d)>>32;           \
+        ((uint8_t*)(p))[5] = (d)>>40;           \
+        ((uint8_t*)(p))[6] = (d)>>48;           \
+        ((uint8_t*)(p))[7] = (d)>>56;           \
+    } while(0)
+#endif
+
+#if AV_HAVE_BIGENDIAN
+#   define AV_RN(s, p)    AV_RB##s(p)
+#   define AV_WN(s, p, v) AV_WB##s(p, v)
+#else
+#   define AV_RN(s, p)    AV_RL##s(p)
+#   define AV_WN(s, p, v) AV_WL##s(p, v)
+#endif
+
+#endif /* HAVE_FAST_UNALIGNED */
+
+#ifndef AV_RN16
+#   define AV_RN16(p) AV_RN(16, p)
+#endif
+
+#ifndef AV_RN32
+#   define AV_RN32(p) AV_RN(32, p)
+#endif
+
+#ifndef AV_RN64
+#   define AV_RN64(p) AV_RN(64, p)
+#endif
+
+#ifndef AV_WN16
+#   define AV_WN16(p, v) AV_WN(16, p, v)
+#endif
+
+#ifndef AV_WN32
+#   define AV_WN32(p, v) AV_WN(32, p, v)
+#endif
+
+#ifndef AV_WN64
+#   define AV_WN64(p, v) AV_WN(64, p, v)
+#endif
+
+#if AV_HAVE_BIGENDIAN
+#   define AV_RB(s, p)    AV_RN##s(p)
+#   define AV_WB(s, p, v) AV_WN##s(p, v)
+#   define AV_RL(s, p)    av_bswap##s(AV_RN##s(p))
+#   define AV_WL(s, p, v) AV_WN##s(p, av_bswap##s(v))
+#else
+#   define AV_RB(s, p)    av_bswap##s(AV_RN##s(p))
+#   define AV_WB(s, p, v) AV_WN##s(p, av_bswap##s(v))
+#   define AV_RL(s, p)    AV_RN##s(p)
+#   define AV_WL(s, p, v) AV_WN##s(p, v)
+#endif
+
+#define AV_RB8(x)     (((const uint8_t*)(x))[0])
+#define AV_WB8(p, d)  do { ((uint8_t*)(p))[0] = (d); } while(0)
+
+#define AV_RL8(x)     AV_RB8(x)
+#define AV_WL8(p, d)  AV_WB8(p, d)
+
+#ifndef AV_RB16
+#   define AV_RB16(p)    AV_RB(16, p)
+#endif
+#ifndef AV_WB16
+#   define AV_WB16(p, v) AV_WB(16, p, v)
+#endif
+
+#ifndef AV_RL16
+#   define AV_RL16(p)    AV_RL(16, p)
+#endif
+#ifndef AV_WL16
+#   define AV_WL16(p, v) AV_WL(16, p, v)
+#endif
+
+#ifndef AV_RB32
+#   define AV_RB32(p)    AV_RB(32, p)
+#endif
+#ifndef AV_WB32
+#   define AV_WB32(p, v) AV_WB(32, p, v)
+#endif
+
+#ifndef AV_RL32
+#   define AV_RL32(p)    AV_RL(32, p)
+#endif
+#ifndef AV_WL32
+#   define AV_WL32(p, v) AV_WL(32, p, v)
+#endif
+
+#ifndef AV_RB64
+#   define AV_RB64(p)    AV_RB(64, p)
+#endif
+#ifndef AV_WB64
+#   define AV_WB64(p, v) AV_WB(64, p, v)
+#endif
+
+#ifndef AV_RL64
+#   define AV_RL64(p)    AV_RL(64, p)
+#endif
+#ifndef AV_WL64
+#   define AV_WL64(p, v) AV_WL(64, p, v)
+#endif
+
+#ifndef AV_RB24
+#   define AV_RB24(x)                           \
+    ((((const uint8_t*)(x))[0] << 16) |         \
+     (((const uint8_t*)(x))[1] <<  8) |         \
+      ((const uint8_t*)(x))[2])
+#endif
+#ifndef AV_WB24
+#   define AV_WB24(p, d) do {                   \
+        ((uint8_t*)(p))[2] = (d);               \
+        ((uint8_t*)(p))[1] = (d)>>8;            \
+        ((uint8_t*)(p))[0] = (d)>>16;           \
+    } while(0)
+#endif
+
+#ifndef AV_RL24
+#   define AV_RL24(x)                           \
+    ((((const uint8_t*)(x))[2] << 16) |         \
+     (((const uint8_t*)(x))[1] <<  8) |         \
+      ((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL24
+#   define AV_WL24(p, d) do {                   \
+        ((uint8_t*)(p))[0] = (d);               \
+        ((uint8_t*)(p))[1] = (d)>>8;            \
+        ((uint8_t*)(p))[2] = (d)>>16;           \
+    } while(0)
+#endif
+
+/*
+ * The AV_[RW]NA macros access naturally aligned data
+ * in a type-safe way.
+ */
+
+#define AV_RNA(s, p)    (((const av_alias##s*)(p))->u##s)
+#define AV_WNA(s, p, v) (((av_alias##s*)(p))->u##s = (v))
+
+#ifndef AV_RN16A
+#   define AV_RN16A(p) AV_RNA(16, p)
+#endif
+
+#ifndef AV_RN32A
+#   define AV_RN32A(p) AV_RNA(32, p)
+#endif
+
+#ifndef AV_RN64A
+#   define AV_RN64A(p) AV_RNA(64, p)
+#endif
+
+#ifndef AV_WN16A
+#   define AV_WN16A(p, v) AV_WNA(16, p, v)
+#endif
+
+#ifndef AV_WN32A
+#   define AV_WN32A(p, v) AV_WNA(32, p, v)
+#endif
+
+#ifndef AV_WN64A
+#   define AV_WN64A(p, v) AV_WNA(64, p, v)
+#endif
+
+/*
+ * The AV_COPYxxU macros are suitable for copying data to/from unaligned
+ * memory locations.
+ */
+
+#define AV_COPYU(n, d, s) AV_WN##n(d, AV_RN##n(s));
+
+#ifndef AV_COPY16U
+#   define AV_COPY16U(d, s) AV_COPYU(16, d, s)
+#endif
+
+#ifndef AV_COPY32U
+#   define AV_COPY32U(d, s) AV_COPYU(32, d, s)
+#endif
+
+#ifndef AV_COPY64U
+#   define AV_COPY64U(d, s) AV_COPYU(64, d, s)
+#endif
+
+#ifndef AV_COPY128U
+#   define AV_COPY128U(d, s)                                    \
+    do {                                                        \
+        AV_COPY64U(d, s);                                       \
+        AV_COPY64U((char *)(d) + 8, (const char *)(s) + 8);     \
+    } while(0)
+#endif
+
+/* Parameters for AV_COPY*, AV_SWAP*, AV_ZERO* must be
+ * naturally aligned. They may be implemented using MMX,
+ * so emms_c() must be called before using any float code
+ * afterwards.
+ */
+
+#define AV_COPY(n, d, s) \
+    (((av_alias##n*)(d))->u##n = ((const av_alias##n*)(s))->u##n)
+
+#ifndef AV_COPY16
+#   define AV_COPY16(d, s) AV_COPY(16, d, s)
+#endif
+
+#ifndef AV_COPY32
+#   define AV_COPY32(d, s) AV_COPY(32, d, s)
+#endif
+
+#ifndef AV_COPY64
+#   define AV_COPY64(d, s) AV_COPY(64, d, s)
+#endif
+
+#ifndef AV_COPY128
+#   define AV_COPY128(d, s)                    \
+    do {                                       \
+        AV_COPY64(d, s);                       \
+        AV_COPY64((char*)(d)+8, (char*)(s)+8); \
+    } while(0)
+#endif
+
+#define AV_SWAP(n, a, b) FFSWAP(av_alias##n, *(av_alias##n*)(a), *(av_alias##n*)(b))
+
+#ifndef AV_SWAP64
+#   define AV_SWAP64(a, b) AV_SWAP(64, a, b)
+#endif
+
+#define AV_ZERO(n, d) (((av_alias##n*)(d))->u##n = 0)
+
+#ifndef AV_ZERO16
+#   define AV_ZERO16(d) AV_ZERO(16, d)
+#endif
+
+#ifndef AV_ZERO32
+#   define AV_ZERO32(d) AV_ZERO(32, d)
+#endif
+
+#ifndef AV_ZERO64
+#   define AV_ZERO64(d) AV_ZERO(64, d)
+#endif
+
+#ifndef AV_ZERO128
+#   define AV_ZERO128(d)         \
+    do {                         \
+        AV_ZERO64(d);            \
+        AV_ZERO64((char*)(d)+8); \
+    } while(0)
+#endif
+
+#endif /* AVUTIL_INTREADWRITE_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/lfg.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/lfg.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/lfg.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/lfg.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,62 @@
+/*
+ * Lagged Fibonacci PRNG
+ * Copyright (c) 2008 Michael Niedermayer
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_LFG_H
+#define AVUTIL_LFG_H
+
+typedef struct AVLFG {
+    unsigned int state[64];
+    int index;
+} AVLFG;
+
+void av_lfg_init(AVLFG *c, unsigned int seed);
+
+/**
+ * Get the next random unsigned 32-bit number using an ALFG.
+ *
+ * Please also consider a simple LCG like state= state*1664525+1013904223,
+ * it may be good enough and faster for your specific use case.
+ */
+static inline unsigned int av_lfg_get(AVLFG *c){
+    c->state[c->index & 63] = c->state[(c->index-24) & 63] + c->state[(c->index-55) & 63];
+    return c->state[c->index++ & 63];
+}
+
+/**
+ * Get the next random unsigned 32-bit number using a MLFG.
+ *
+ * Please also consider av_lfg_get() above, it is faster.
+ */
+static inline unsigned int av_mlfg_get(AVLFG *c){
+    unsigned int a= c->state[(c->index-55) & 63];
+    unsigned int b= c->state[(c->index-24) & 63];
+    return c->state[c->index++ & 63] = 2*a*b+a+b;
+}
+
+/**
+ * Get the next two numbers generated by a Box-Muller Gaussian
+ * generator using the random numbers issued by lfg.
+ *
+ * @param out array where the two generated numbers are placed
+ */
+void av_bmg_get(AVLFG *lfg, double out[2]);
+
+#endif /* AVUTIL_LFG_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/log.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/log.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/log.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/log.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,262 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_LOG_H
+#define AVUTIL_LOG_H
+
+#include <stdarg.h>
+#include "avutil.h"
+#include "attributes.h"
+
+/**
+ * Describe the class of an AVClass context structure. That is an
+ * arbitrary struct of which the first field is a pointer to an
+ * AVClass struct (e.g. AVCodecContext, AVFormatContext etc.).
+ */
+typedef struct AVClass {
+    /**
+     * The name of the class; usually it is the same name as the
+     * context structure type to which the AVClass is associated.
+     */
+    const char* class_name;
+
+    /**
+     * A pointer to a function which returns the name of a context
+     * instance ctx associated with the class.
+     */
+    const char* (*item_name)(void* ctx);
+
+    /**
+     * a pointer to the first option specified in the class if any or NULL
+     *
+     * @see av_set_default_options()
+     */
+    const struct AVOption *option;
+
+    /**
+     * LIBAVUTIL_VERSION with which this structure was created.
+     * This is used to allow fields to be added without requiring major
+     * version bumps everywhere.
+     */
+
+    int version;
+
+    /**
+     * Offset in the structure where log_level_offset is stored.
+     * 0 means there is no such variable
+     */
+    int log_level_offset_offset;
+
+    /**
+     * Offset in the structure where a pointer to the parent context for
+     * logging is stored. For example a decoder could pass its AVCodecContext
+     * to eval as such a parent context, which an av_log() implementation
+     * could then leverage to display the parent context.
+     * The offset can be NULL.
+     */
+    int parent_log_context_offset;
+
+    /**
+     * Return next AVOptions-enabled child or NULL
+     */
+    void* (*child_next)(void *obj, void *prev);
+
+    /**
+     * Return an AVClass corresponding to the next potential
+     * AVOptions-enabled child.
+     *
+     * The difference between child_next and this is that
+     * child_next iterates over _already existing_ objects, while
+     * child_class_next iterates over _all possible_ children.
+     */
+    const struct AVClass* (*child_class_next)(const struct AVClass *prev);
+} AVClass;
+
+/**
+ * @addtogroup lavu_log
+ *
+ * @{
+ *
+ * @defgroup lavu_log_constants Logging Constants
+ *
+ * @{
+ */
+
+/**
+ * Print no output.
+ */
+#define AV_LOG_QUIET    -8
+
+/**
+ * Something went really wrong and we will crash now.
+ */
+#define AV_LOG_PANIC     0
+
+/**
+ * Something went wrong and recovery is not possible.
+ * For example, no header was found for a format which depends
+ * on headers or an illegal combination of parameters is used.
+ */
+#define AV_LOG_FATAL     8
+
+/**
+ * Something went wrong and cannot losslessly be recovered.
+ * However, not all future data is affected.
+ */
+#define AV_LOG_ERROR    16
+
+/**
+ * Something somehow does not look correct. This may or may not
+ * lead to problems. An example would be the use of '-vstrict -2'.
+ */
+#define AV_LOG_WARNING  24
+
+/**
+ * Standard information.
+ */
+#define AV_LOG_INFO     32
+
+/**
+ * Detailed information.
+ */
+#define AV_LOG_VERBOSE  40
+
+/**
+ * Stuff which is only useful for libav* developers.
+ */
+#define AV_LOG_DEBUG    48
+
+/**
+ * @}
+ */
+
+/**
+ * Send the specified message to the log if the level is less than or equal
+ * to the current av_log_level. By default, all logging messages are sent to
+ * stderr. This behavior can be altered by setting a different logging callback
+ * function.
+ * @see av_log_set_callback
+ *
+ * @param avcl A pointer to an arbitrary struct of which the first field is a
+ *        pointer to an AVClass struct.
+ * @param level The importance level of the message expressed using a @ref
+ *        lavu_log_constants "Logging Constant".
+ * @param fmt The format string (printf-compatible) that specifies how
+ *        subsequent arguments are converted to output.
+ */
+void av_log(void *avcl, int level, const char *fmt, ...) av_printf_format(3, 4);
+
+
+/**
+ * Send the specified message to the log if the level is less than or equal
+ * to the current av_log_level. By default, all logging messages are sent to
+ * stderr. This behavior can be altered by setting a different logging callback
+ * function.
+ * @see av_log_set_callback
+ *
+ * @param avcl A pointer to an arbitrary struct of which the first field is a
+ *        pointer to an AVClass struct.
+ * @param level The importance level of the message expressed using a @ref
+ *        lavu_log_constants "Logging Constant".
+ * @param fmt The format string (printf-compatible) that specifies how
+ *        subsequent arguments are converted to output.
+ * @param vl The arguments referenced by the format string.
+ */
+void av_vlog(void *avcl, int level, const char *fmt, va_list vl);
+
+/**
+ * Get the current log level
+ *
+ * @see lavu_log_constants
+ *
+ * @return Current log level
+ */
+int av_log_get_level(void);
+
+/**
+ * Set the log level
+ *
+ * @see lavu_log_constants
+ *
+ * @param level Logging level
+ */
+void av_log_set_level(int level);
+
+/**
+ * Set the logging callback
+ *
+ * @see av_log_default_callback
+ *
+ * @param callback A logging function with a compatible signature.
+ */
+void av_log_set_callback(void (*callback)(void*, int, const char*, va_list));
+
+/**
+ * Default logging callback
+ *
+ * It prints the message to stderr, optionally colorizing it.
+ *
+ * @param avcl A pointer to an arbitrary struct of which the first field is a
+ *        pointer to an AVClass struct.
+ * @param level The importance level of the message expressed using a @ref
+ *        lavu_log_constants "Logging Constant".
+ * @param fmt The format string (printf-compatible) that specifies how
+ *        subsequent arguments are converted to output.
+ * @param vl The arguments referenced by the format string.
+ */
+void av_log_default_callback(void *avcl, int level, const char *fmt,
+                             va_list vl);
+
+/**
+ * Return the context name
+ *
+ * @param  ctx The AVClass context
+ *
+ * @return The AVClass class_name
+ */
+const char* av_default_item_name(void* ctx);
+
+/**
+ * av_dlog macros
+ * Useful to print debug messages that shouldn't get compiled in normally.
+ */
+
+#ifdef DEBUG
+#    define av_dlog(pctx, ...) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__)
+#else
+#    define av_dlog(pctx, ...)
+#endif
+
+/**
+ * Skip repeated messages, this requires the user app to use av_log() instead of
+ * (f)printf as the 2 would otherwise interfere and lead to
+ * "Last message repeated x times" messages below (f)printf messages with some
+ * bad luck.
+ * Also to receive the last, "last repeated" line if any, the user app must
+ * call av_log(NULL, AV_LOG_QUIET, ""); at the end
+ */
+#define AV_LOG_SKIP_REPEATED 1
+void av_log_set_flags(int arg);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_LOG_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/lzo.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/lzo.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/lzo.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/lzo.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,66 @@
+/*
+ * LZO 1x decompression
+ * copyright (c) 2006 Reimar Doeffinger
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_LZO_H
+#define AVUTIL_LZO_H
+
+/**
+ * @defgroup lavu_lzo LZO
+ * @ingroup lavu_crypto
+ *
+ * @{
+ */
+
+#include <stdint.h>
+
+/** @name Error flags returned by av_lzo1x_decode
+ * @{ */
+/// end of the input buffer reached before decoding finished
+#define AV_LZO_INPUT_DEPLETED  1
+/// decoded data did not fit into output buffer
+#define AV_LZO_OUTPUT_FULL     2
+/// a reference to previously decoded data was wrong
+#define AV_LZO_INVALID_BACKPTR 4
+/// a non-specific error in the compressed bitstream
+#define AV_LZO_ERROR           8
+/** @} */
+
+#define AV_LZO_INPUT_PADDING   8
+#define AV_LZO_OUTPUT_PADDING 12
+
+/**
+ * @brief Decodes LZO 1x compressed data.
+ * @param out output buffer
+ * @param outlen size of output buffer, number of bytes left are returned here
+ * @param in input buffer
+ * @param inlen size of input buffer, number of bytes left are returned here
+ * @return 0 on success, otherwise a combination of the error flags above
+ *
+ * Make sure all buffers are appropriately padded, in must provide
+ * AV_LZO_INPUT_PADDING, out must provide AV_LZO_OUTPUT_PADDING additional bytes.
+ */
+int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_LZO_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/macros.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/macros.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/macros.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/macros.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,48 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * @ingroup lavu
+ * Utility Preprocessor macros
+ */
+
+#ifndef AVUTIL_MACROS_H
+#define AVUTIL_MACROS_H
+
+/**
+ * @addtogroup preproc_misc Preprocessor String Macros
+ *
+ * String manipulation macros
+ *
+ * @{
+ */
+
+#define AV_STRINGIFY(s)         AV_TOSTRING(s)
+#define AV_TOSTRING(s) #s
+
+#define AV_GLUE(a, b) a ## b
+#define AV_JOIN(a, b) AV_GLUE(a, b)
+
+/**
+ * @}
+ */
+
+#define AV_PRAGMA(s) _Pragma(#s)
+
+#endif /* AVUTIL_MACROS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/mathematics.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/mathematics.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/mathematics.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/mathematics.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,111 @@
+/*
+ * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_MATHEMATICS_H
+#define AVUTIL_MATHEMATICS_H
+
+#include <stdint.h>
+#include <math.h>
+#include "attributes.h"
+#include "rational.h"
+#include "intfloat.h"
+
+#ifndef M_LOG2_10
+#define M_LOG2_10      3.32192809488736234787  /* log_2 10 */
+#endif
+#ifndef M_PHI
+#define M_PHI          1.61803398874989484820   /* phi / golden ratio */
+#endif
+#ifndef NAN
+#define NAN            av_int2float(0x7fc00000)
+#endif
+#ifndef INFINITY
+#define INFINITY       av_int2float(0x7f800000)
+#endif
+
+/**
+ * @addtogroup lavu_math
+ * @{
+ */
+
+
+enum AVRounding {
+    AV_ROUND_ZERO     = 0, ///< Round toward zero.
+    AV_ROUND_INF      = 1, ///< Round away from zero.
+    AV_ROUND_DOWN     = 2, ///< Round toward -infinity.
+    AV_ROUND_UP       = 3, ///< Round toward +infinity.
+    AV_ROUND_NEAR_INF = 5, ///< Round to nearest and halfway cases away from zero.
+};
+
+/**
+ * Return the greatest common divisor of a and b.
+ * If both a and b are 0 or either or both are <0 then behavior is
+ * undefined.
+ */
+int64_t av_const av_gcd(int64_t a, int64_t b);
+
+/**
+ * Rescale a 64-bit integer with rounding to nearest.
+ * A simple a*b/c isn't possible as it can overflow.
+ */
+int64_t av_rescale(int64_t a, int64_t b, int64_t c) av_const;
+
+/**
+ * Rescale a 64-bit integer with specified rounding.
+ * A simple a*b/c isn't possible as it can overflow.
+ */
+int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding) av_const;
+
+/**
+ * Rescale a 64-bit integer by 2 rational numbers.
+ */
+int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const;
+
+/**
+ * Rescale a 64-bit integer by 2 rational numbers with specified rounding.
+ */
+int64_t av_rescale_q_rnd(int64_t a, AVRational bq, AVRational cq,
+                         enum AVRounding) av_const;
+
+/**
+ * Compare 2 timestamps each in its own timebases.
+ * The result of the function is undefined if one of the timestamps
+ * is outside the int64_t range when represented in the others timebase.
+ * @return -1 if ts_a is before ts_b, 1 if ts_a is after ts_b or 0 if they represent the same position
+ */
+int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b);
+
+/**
+ * Compare 2 integers modulo mod.
+ * That is we compare integers a and b for which only the least
+ * significant log2(mod) bits are known.
+ *
+ * @param mod must be a power of 2
+ * @return a negative value if a is smaller than b
+ *         a positive value if a is greater than b
+ *         0                if a equals          b
+ */
+int64_t av_compare_mod(uint64_t a, uint64_t b, uint64_t mod);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_MATHEMATICS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/md5.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/md5.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/md5.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/md5.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,51 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_MD5_H
+#define AVUTIL_MD5_H
+
+#include <stdint.h>
+
+#include "attributes.h"
+#include "version.h"
+
+/**
+ * @defgroup lavu_md5 MD5
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+#if FF_API_CONTEXT_SIZE
+extern attribute_deprecated const int av_md5_size;
+#endif
+
+struct AVMD5;
+
+struct AVMD5 *av_md5_alloc(void);
+void av_md5_init(struct AVMD5 *ctx);
+void av_md5_update(struct AVMD5 *ctx, const uint8_t *src, const int len);
+void av_md5_final(struct AVMD5 *ctx, uint8_t *dst);
+void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_MD5_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/mem.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/mem.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/mem.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/mem.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,265 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * memory handling functions
+ */
+
+#ifndef AVUTIL_MEM_H
+#define AVUTIL_MEM_H
+
+#include <limits.h>
+#include <stdint.h>
+
+#include "attributes.h"
+#include "avutil.h"
+
+/**
+ * @addtogroup lavu_mem
+ * @{
+ */
+
+
+#if defined(__ICC) && __ICC < 1200 || defined(__SUNPRO_C)
+    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
+    #define DECLARE_ASM_CONST(n,t,v)    const t __attribute__ ((aligned (n))) v
+#elif defined(__TI_COMPILER_VERSION__)
+    #define DECLARE_ALIGNED(n,t,v)                      \
+        AV_PRAGMA(DATA_ALIGN(v,n))                      \
+        t __attribute__((aligned(n))) v
+    #define DECLARE_ASM_CONST(n,t,v)                    \
+        AV_PRAGMA(DATA_ALIGN(v,n))                      \
+        static const t __attribute__((aligned(n))) v
+#elif defined(__GNUC__)
+    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
+    #define DECLARE_ASM_CONST(n,t,v)    static const t av_used __attribute__ ((aligned (n))) v
+#elif defined(_MSC_VER)
+    #define DECLARE_ALIGNED(n,t,v)      __declspec(align(n)) t v
+    #define DECLARE_ASM_CONST(n,t,v)    __declspec(align(n)) static const t v
+#else
+    #define DECLARE_ALIGNED(n,t,v)      t v
+    #define DECLARE_ASM_CONST(n,t,v)    static const t v
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(3,1)
+    #define av_malloc_attrib __attribute__((__malloc__))
+#else
+    #define av_malloc_attrib
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(4,3)
+    #define av_alloc_size(...) __attribute__((alloc_size(__VA_ARGS__)))
+#else
+    #define av_alloc_size(...)
+#endif
+
+/**
+ * Allocate a block of size bytes with alignment suitable for all
+ * memory accesses (including vectors if available on the CPU).
+ * @param size Size in bytes for the memory block to be allocated.
+ * @return Pointer to the allocated block, NULL if the block cannot
+ * be allocated.
+ * @see av_mallocz()
+ */
+void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1);
+
+/**
+ * Allocate a block of size * nmemb bytes with av_malloc().
+ * @param nmemb Number of elements
+ * @param size Size of the single element
+ * @return Pointer to the allocated block, NULL if the block cannot
+ * be allocated.
+ * @see av_malloc()
+ */
+av_alloc_size(1, 2) static inline void *av_malloc_array(size_t nmemb, size_t size)
+{
+    if (!size || nmemb >= INT_MAX / size)
+        return NULL;
+    return av_malloc(nmemb * size);
+}
+
+/**
+ * Allocate or reallocate a block of memory.
+ * If ptr is NULL and size > 0, allocate a new block. If
+ * size is zero, free the memory block pointed to by ptr.
+ * @param ptr Pointer to a memory block already allocated with
+ * av_realloc() or NULL.
+ * @param size Size in bytes of the memory block to be allocated or
+ * reallocated.
+ * @return Pointer to a newly-reallocated block or NULL if the block
+ * cannot be reallocated or the function is used to free the memory block.
+ * @warning Pointers originating from the av_malloc() family of functions must
+ *          not be passed to av_realloc(). The former can be implemented using
+ *          memalign() (or other functions), and there is no guarantee that
+ *          pointers from such functions can be passed to realloc() at all.
+ *          The situation is undefined according to POSIX and may crash with
+ *          some libc implementations.
+ * @see av_fast_realloc()
+ */
+void *av_realloc(void *ptr, size_t size) av_alloc_size(2);
+
+/**
+ * Allocate or reallocate a block of memory.
+ * If *ptr is NULL and size > 0, allocate a new block. If
+ * size is zero, free the memory block pointed to by ptr.
+ * @param   ptr Pointer to a pointer to a memory block already allocated
+ *          with av_realloc(), or pointer to a pointer to NULL.
+ *          The pointer is updated on success, or freed on failure.
+ * @param   size Size in bytes for the memory block to be allocated or
+ *          reallocated
+ * @return  Zero on success, an AVERROR error code on failure.
+ * @warning Pointers originating from the av_malloc() family of functions must
+ *          not be passed to av_reallocp(). The former can be implemented using
+ *          memalign() (or other functions), and there is no guarantee that
+ *          pointers from such functions can be passed to realloc() at all.
+ *          The situation is undefined according to POSIX and may crash with
+ *          some libc implementations.
+ */
+int av_reallocp(void *ptr, size_t size);
+
+/**
+ * Allocate or reallocate an array.
+ * If ptr is NULL and nmemb > 0, allocate a new block. If
+ * nmemb is zero, free the memory block pointed to by ptr.
+ * @param ptr Pointer to a memory block already allocated with
+ * av_realloc() or NULL.
+ * @param nmemb Number of elements
+ * @param size Size of the single element
+ * @return Pointer to a newly-reallocated block or NULL if the block
+ * cannot be reallocated or the function is used to free the memory block.
+ * @warning Pointers originating from the av_malloc() family of functions must
+ *          not be passed to av_realloc(). The former can be implemented using
+ *          memalign() (or other functions), and there is no guarantee that
+ *          pointers from such functions can be passed to realloc() at all.
+ *          The situation is undefined according to POSIX and may crash with
+ *          some libc implementations.
+ */
+av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size);
+
+/**
+ * Allocate or reallocate an array through a pointer to a pointer.
+ * If *ptr is NULL and nmemb > 0, allocate a new block. If
+ * nmemb is zero, free the memory block pointed to by ptr.
+ * @param ptr Pointer to a pointer to a memory block already allocated
+ * with av_realloc(), or pointer to a pointer to NULL.
+ * The pointer is updated on success, or freed on failure.
+ * @param nmemb Number of elements
+ * @param size Size of the single element
+ * @return Zero on success, an AVERROR error code on failure.
+ * @warning Pointers originating from the av_malloc() family of functions must
+ *          not be passed to av_realloc(). The former can be implemented using
+ *          memalign() (or other functions), and there is no guarantee that
+ *          pointers from such functions can be passed to realloc() at all.
+ *          The situation is undefined according to POSIX and may crash with
+ *          some libc implementations.
+ */
+av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
+
+/**
+ * Free a memory block which has been allocated with av_malloc(z)() or
+ * av_realloc().
+ * @param ptr Pointer to the memory block which should be freed.
+ * @note ptr = NULL is explicitly allowed.
+ * @note It is recommended that you use av_freep() instead.
+ * @see av_freep()
+ */
+void av_free(void *ptr);
+
+/**
+ * Allocate a block of size bytes with alignment suitable for all
+ * memory accesses (including vectors if available on the CPU) and
+ * zero all the bytes of the block.
+ * @param size Size in bytes for the memory block to be allocated.
+ * @return Pointer to the allocated block, NULL if it cannot be allocated.
+ * @see av_malloc()
+ */
+void *av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1);
+
+/**
+ * Allocate a block of size * nmemb bytes with av_mallocz().
+ * @param nmemb Number of elements
+ * @param size Size of the single element
+ * @return Pointer to the allocated block, NULL if the block cannot
+ * be allocated.
+ * @see av_mallocz()
+ * @see av_malloc_array()
+ */
+av_alloc_size(1, 2) static inline void *av_mallocz_array(size_t nmemb, size_t size)
+{
+    if (!size || nmemb >= INT_MAX / size)
+        return NULL;
+    return av_mallocz(nmemb * size);
+}
+
+/**
+ * Duplicate the string s.
+ * @param s string to be duplicated
+ * @return Pointer to a newly-allocated string containing a
+ * copy of s or NULL if the string cannot be allocated.
+ */
+char *av_strdup(const char *s) av_malloc_attrib;
+
+/**
+ * Free a memory block which has been allocated with av_malloc(z)() or
+ * av_realloc() and set the pointer pointing to it to NULL.
+ * @param ptr Pointer to the pointer to the memory block which should
+ * be freed.
+ * @see av_free()
+ */
+void av_freep(void *ptr);
+
+/**
+ * deliberately overlapping memcpy implementation
+ * @param dst destination buffer
+ * @param back how many bytes back we start (the initial size of the overlapping window)
+ * @param cnt number of bytes to copy, must be >= 0
+ *
+ * cnt > back is valid, this will copy the bytes we just copied,
+ * thus creating a repeating pattern with a period length of back.
+ */
+void av_memcpy_backptr(uint8_t *dst, int back, int cnt);
+
+/**
+ * Reallocate the given block if it is not large enough, otherwise do nothing.
+ *
+ * @see av_realloc
+ */
+void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size);
+
+/**
+ * Allocate a buffer, reusing the given one if large enough.
+ *
+ * Contrary to av_fast_realloc the current buffer contents might not be
+ * preserved and on error the old buffer is freed, thus no special
+ * handling to avoid memleaks is necessary.
+ *
+ * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer
+ * @param size size of the buffer *ptr points to
+ * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and
+ *                 *size 0 if an error occurred.
+ */
+void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_MEM_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/old_pix_fmts.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/old_pix_fmts.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/old_pix_fmts.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/old_pix_fmts.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,134 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_OLD_PIX_FMTS_H
+#define AVUTIL_OLD_PIX_FMTS_H
+
+/*
+ * This header exists to prevent new pixel formats from being accidentally added
+ * to the deprecated list.
+ * Do not include it directly. It will be removed on next major bump
+ *
+ * Do not add new items to this list. Use the AVPixelFormat enum instead.
+ */
+    PIX_FMT_NONE = AV_PIX_FMT_NONE,
+    PIX_FMT_YUV420P,   ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
+    PIX_FMT_YUYV422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
+    PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
+    PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
+    PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
+    PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
+    PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
+    PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
+    PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
+    PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
+    PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
+    PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
+    PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
+    PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
+    PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
+#if FF_API_XVMC
+    PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
+    PIX_FMT_XVMC_MPEG2_IDCT,
+#endif /* FF_API_XVMC */
+    PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
+    PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
+    PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
+    PIX_FMT_BGR4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
+    PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
+    PIX_FMT_RGB8,      ///< packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
+    PIX_FMT_RGB4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
+    PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
+    PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
+    PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
+
+    PIX_FMT_ARGB,      ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
+    PIX_FMT_RGBA,      ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
+    PIX_FMT_ABGR,      ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
+    PIX_FMT_BGRA,      ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
+
+    PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
+    PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
+    PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
+    PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
+    PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
+#if FF_API_VDPAU
+    PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+#endif
+    PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
+    PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
+
+    PIX_FMT_RGB565BE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian
+    PIX_FMT_RGB565LE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), little-endian
+    PIX_FMT_RGB555BE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
+    PIX_FMT_RGB555LE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
+
+    PIX_FMT_BGR565BE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), big-endian
+    PIX_FMT_BGR565LE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), little-endian
+    PIX_FMT_BGR555BE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
+    PIX_FMT_BGR555LE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
+
+    PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
+    PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
+    PIX_FMT_VAAPI_VLD,  ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+
+    PIX_FMT_YUV420P16LE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    PIX_FMT_YUV420P16BE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    PIX_FMT_YUV422P16LE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+#if FF_API_VDPAU
+    PIX_FMT_VDPAU_MPEG4,  ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+#endif
+    PIX_FMT_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
+
+    PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
+    PIX_FMT_RGB444BE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
+    PIX_FMT_BGR444LE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
+    PIX_FMT_BGR444BE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
+    PIX_FMT_Y400A,     ///< 8bit gray, 8bit alpha
+    PIX_FMT_BGR48BE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
+    PIX_FMT_BGR48LE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
+    PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    PIX_FMT_VDA_VLD,    ///< hardware decoding through VDA
+    PIX_FMT_GBRP,      ///< planar GBR 4:4:4 24bpp
+    PIX_FMT_GBRP9BE,   ///< planar GBR 4:4:4 27bpp, big endian
+    PIX_FMT_GBRP9LE,   ///< planar GBR 4:4:4 27bpp, little endian
+    PIX_FMT_GBRP10BE,  ///< planar GBR 4:4:4 30bpp, big endian
+    PIX_FMT_GBRP10LE,  ///< planar GBR 4:4:4 30bpp, little endian
+    PIX_FMT_GBRP16BE,  ///< planar GBR 4:4:4 48bpp, big endian
+    PIX_FMT_GBRP16LE,  ///< planar GBR 4:4:4 48bpp, little endian
+    PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
+
+#endif /* AVUTIL_OLD_PIX_FMTS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/opt.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/opt.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/opt.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/opt.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,516 @@
+/*
+ * AVOptions
+ * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_OPT_H
+#define AVUTIL_OPT_H
+
+/**
+ * @file
+ * AVOptions
+ */
+
+#include "rational.h"
+#include "avutil.h"
+#include "dict.h"
+#include "log.h"
+
+/**
+ * @defgroup avoptions AVOptions
+ * @ingroup lavu_data
+ * @{
+ * AVOptions provide a generic system to declare options on arbitrary structs
+ * ("objects"). An option can have a help text, a type and a range of possible
+ * values. Options may then be enumerated, read and written to.
+ *
+ * @section avoptions_implement Implementing AVOptions
+ * This section describes how to add AVOptions capabilities to a struct.
+ *
+ * All AVOptions-related information is stored in an AVClass. Therefore
+ * the first member of the struct must be a pointer to an AVClass describing it.
+ * The option field of the AVClass must be set to a NULL-terminated static array
+ * of AVOptions. Each AVOption must have a non-empty name, a type, a default
+ * value and for number-type AVOptions also a range of allowed values. It must
+ * also declare an offset in bytes from the start of the struct, where the field
+ * associated with this AVOption is located. Other fields in the AVOption struct
+ * should also be set when applicable, but are not required.
+ *
+ * The following example illustrates an AVOptions-enabled struct:
+ * @code
+ * typedef struct test_struct {
+ *     AVClass *class;
+ *     int      int_opt;
+ *     char    *str_opt;
+ *     uint8_t *bin_opt;
+ *     int      bin_len;
+ * } test_struct;
+ *
+ * static const AVOption test_options[] = {
+ *   { "test_int", "This is a test option of int type.", offsetof(test_struct, int_opt),
+ *     AV_OPT_TYPE_INT, { .i64 = -1 }, INT_MIN, INT_MAX },
+ *   { "test_str", "This is a test option of string type.", offsetof(test_struct, str_opt),
+ *     AV_OPT_TYPE_STRING },
+ *   { "test_bin", "This is a test option of binary type.", offsetof(test_struct, bin_opt),
+ *     AV_OPT_TYPE_BINARY },
+ *   { NULL },
+ * };
+ *
+ * static const AVClass test_class = {
+ *     .class_name = "test class",
+ *     .item_name  = av_default_item_name,
+ *     .option     = test_options,
+ *     .version    = LIBAVUTIL_VERSION_INT,
+ * };
+ * @endcode
+ *
+ * Next, when allocating your struct, you must ensure that the AVClass pointer
+ * is set to the correct value. Then, av_opt_set_defaults() must be called to
+ * initialize defaults. After that the struct is ready to be used with the
+ * AVOptions API.
+ *
+ * When cleaning up, you may use the av_opt_free() function to automatically
+ * free all the allocated string and binary options.
+ *
+ * Continuing with the above example:
+ *
+ * @code
+ * test_struct *alloc_test_struct(void)
+ * {
+ *     test_struct *ret = av_malloc(sizeof(*ret));
+ *     ret->class = &test_class;
+ *     av_opt_set_defaults(ret);
+ *     return ret;
+ * }
+ * void free_test_struct(test_struct **foo)
+ * {
+ *     av_opt_free(*foo);
+ *     av_freep(foo);
+ * }
+ * @endcode
+ *
+ * @subsection avoptions_implement_nesting Nesting
+ *      It may happen that an AVOptions-enabled struct contains another
+ *      AVOptions-enabled struct as a member (e.g. AVCodecContext in
+ *      libavcodec exports generic options, while its priv_data field exports
+ *      codec-specific options). In such a case, it is possible to set up the
+ *      parent struct to export a child's options. To do that, simply
+ *      implement AVClass.child_next() and AVClass.child_class_next() in the
+ *      parent struct's AVClass.
+ *      Assuming that the test_struct from above now also contains a
+ *      child_struct field:
+ *
+ *      @code
+ *      typedef struct child_struct {
+ *          AVClass *class;
+ *          int flags_opt;
+ *      } child_struct;
+ *      static const AVOption child_opts[] = {
+ *          { "test_flags", "This is a test option of flags type.",
+ *            offsetof(child_struct, flags_opt), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX },
+ *          { NULL },
+ *      };
+ *      static const AVClass child_class = {
+ *          .class_name = "child class",
+ *          .item_name  = av_default_item_name,
+ *          .option     = child_opts,
+ *          .version    = LIBAVUTIL_VERSION_INT,
+ *      };
+ *
+ *      void *child_next(void *obj, void *prev)
+ *      {
+ *          test_struct *t = obj;
+ *          if (!prev && t->child_struct)
+ *              return t->child_struct;
+ *          return NULL
+ *      }
+ *      const AVClass child_class_next(const AVClass *prev)
+ *      {
+ *          return prev ? NULL : &child_class;
+ *      }
+ *      @endcode
+ *      Putting child_next() and child_class_next() as defined above into
+ *      test_class will now make child_struct's options accessible through
+ *      test_struct (again, proper setup as described above needs to be done on
+ *      child_struct right after it is created).
+ *
+ *      From the above example it might not be clear why both child_next()
+ *      and child_class_next() are needed. The distinction is that child_next()
+ *      iterates over actually existing objects, while child_class_next()
+ *      iterates over all possible child classes. E.g. if an AVCodecContext
+ *      was initialized to use a codec which has private options, then its
+ *      child_next() will return AVCodecContext.priv_data and finish
+ *      iterating. OTOH child_class_next() on AVCodecContext.av_class will
+ *      iterate over all available codecs with private options.
+ *
+ * @subsection avoptions_implement_named_constants Named constants
+ *      It is possible to create named constants for options. Simply set the unit
+ *      field of the option the constants should apply to to a string and
+ *      create the constants themselves as options of type AV_OPT_TYPE_CONST
+ *      with their unit field set to the same string.
+ *      Their default_val field should contain the value of the named
+ *      constant.
+ *      For example, to add some named constants for the test_flags option
+ *      above, put the following into the child_opts array:
+ *      @code
+ *      { "test_flags", "This is a test option of flags type.",
+ *        offsetof(child_struct, flags_opt), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX, "test_unit" },
+ *      { "flag1", "This is a flag with value 16", 0, AV_OPT_TYPE_CONST, { .i64 = 16 }, 0, 0, "test_unit" },
+ *      @endcode
+ *
+ * @section avoptions_use Using AVOptions
+ * This section deals with accessing options in an AVOptions-enabled struct.
+ * Such structs in Libav are e.g. AVCodecContext in libavcodec or
+ * AVFormatContext in libavformat.
+ *
+ * @subsection avoptions_use_examine Examining AVOptions
+ * The basic functions for examining options are av_opt_next(), which iterates
+ * over all options defined for one object, and av_opt_find(), which searches
+ * for an option with the given name.
+ *
+ * The situation is more complicated with nesting. An AVOptions-enabled struct
+ * may have AVOptions-enabled children. Passing the AV_OPT_SEARCH_CHILDREN flag
+ * to av_opt_find() will make the function search children recursively.
+ *
+ * For enumerating there are basically two cases. The first is when you want to
+ * get all options that may potentially exist on the struct and its children
+ * (e.g.  when constructing documentation). In that case you should call
+ * av_opt_child_class_next() recursively on the parent struct's AVClass.  The
+ * second case is when you have an already initialized struct with all its
+ * children and you want to get all options that can be actually written or read
+ * from it. In that case you should call av_opt_child_next() recursively (and
+ * av_opt_next() on each result).
+ *
+ * @subsection avoptions_use_get_set Reading and writing AVOptions
+ * When setting options, you often have a string read directly from the
+ * user. In such a case, simply passing it to av_opt_set() is enough. For
+ * non-string type options, av_opt_set() will parse the string according to the
+ * option type.
+ *
+ * Similarly av_opt_get() will read any option type and convert it to a string
+ * which will be returned. Do not forget that the string is allocated, so you
+ * have to free it with av_free().
+ *
+ * In some cases it may be more convenient to put all options into an
+ * AVDictionary and call av_opt_set_dict() on it. A specific case of this
+ * are the format/codec open functions in lavf/lavc which take a dictionary
+ * filled with option as a parameter. This allows to set some options
+ * that cannot be set otherwise, since e.g. the input file format is not known
+ * before the file is actually opened.
+ */
+
+enum AVOptionType{
+    AV_OPT_TYPE_FLAGS,
+    AV_OPT_TYPE_INT,
+    AV_OPT_TYPE_INT64,
+    AV_OPT_TYPE_DOUBLE,
+    AV_OPT_TYPE_FLOAT,
+    AV_OPT_TYPE_STRING,
+    AV_OPT_TYPE_RATIONAL,
+    AV_OPT_TYPE_BINARY,  ///< offset must point to a pointer immediately followed by an int for the length
+    AV_OPT_TYPE_CONST = 128,
+};
+
+/**
+ * AVOption
+ */
+typedef struct AVOption {
+    const char *name;
+
+    /**
+     * short English help text
+     * @todo What about other languages?
+     */
+    const char *help;
+
+    /**
+     * The offset relative to the context structure where the option
+     * value is stored. It should be 0 for named constants.
+     */
+    int offset;
+    enum AVOptionType type;
+
+    /**
+     * the default value for scalar options
+     */
+    union {
+        int64_t i64;
+        double dbl;
+        const char *str;
+        /* TODO those are unused now */
+        AVRational q;
+    } default_val;
+    double min;                 ///< minimum valid value for the option
+    double max;                 ///< maximum valid value for the option
+
+    int flags;
+#define AV_OPT_FLAG_ENCODING_PARAM  1   ///< a generic parameter which can be set by the user for muxing or encoding
+#define AV_OPT_FLAG_DECODING_PARAM  2   ///< a generic parameter which can be set by the user for demuxing or decoding
+#define AV_OPT_FLAG_METADATA        4   ///< some data extracted or inserted into the file like title, comment, ...
+#define AV_OPT_FLAG_AUDIO_PARAM     8
+#define AV_OPT_FLAG_VIDEO_PARAM     16
+#define AV_OPT_FLAG_SUBTITLE_PARAM  32
+//FIXME think about enc-audio, ... style flags
+
+    /**
+     * The logical unit to which the option belongs. Non-constant
+     * options and corresponding named constants share the same
+     * unit. May be NULL.
+     */
+    const char *unit;
+} AVOption;
+
+/**
+ * Show the obj options.
+ *
+ * @param req_flags requested flags for the options to show. Show only the
+ * options for which it is opt->flags & req_flags.
+ * @param rej_flags rejected flags for the options to show. Show only the
+ * options for which it is !(opt->flags & req_flags).
+ * @param av_log_obj log context to use for showing the options
+ */
+int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags);
+
+/**
+ * Set the values of all AVOption fields to their default values.
+ *
+ * @param s an AVOption-enabled struct (its first member must be a pointer to AVClass)
+ */
+void av_opt_set_defaults(void *s);
+
+/**
+ * Parse the key/value pairs list in opts. For each key/value pair
+ * found, stores the value in the field in ctx that is named like the
+ * key. ctx must be an AVClass context, storing is done using
+ * AVOptions.
+ *
+ * @param key_val_sep a 0-terminated list of characters used to
+ * separate key from value
+ * @param pairs_sep a 0-terminated list of characters used to separate
+ * two pairs from each other
+ * @return the number of successfully set key/value pairs, or a negative
+ * value corresponding to an AVERROR code in case of error:
+ * AVERROR(EINVAL) if opts cannot be parsed,
+ * the error code issued by av_set_string3() if a key/value pair
+ * cannot be set
+ */
+int av_set_options_string(void *ctx, const char *opts,
+                          const char *key_val_sep, const char *pairs_sep);
+
+/**
+ * Free all string and binary options in obj.
+ */
+void av_opt_free(void *obj);
+
+/**
+ * Check whether a particular flag is set in a flags field.
+ *
+ * @param field_name the name of the flag field option
+ * @param flag_name the name of the flag to check
+ * @return non-zero if the flag is set, zero if the flag isn't set,
+ *         isn't of the right type, or the flags field doesn't exist.
+ */
+int av_opt_flag_is_set(void *obj, const char *field_name, const char *flag_name);
+
+/*
+ * Set all the options from a given dictionary on an object.
+ *
+ * @param obj a struct whose first element is a pointer to AVClass
+ * @param options options to process. This dictionary will be freed and replaced
+ *                by a new one containing all options not found in obj.
+ *                Of course this new dictionary needs to be freed by caller
+ *                with av_dict_free().
+ *
+ * @return 0 on success, a negative AVERROR if some option was found in obj,
+ *         but could not be set.
+ *
+ * @see av_dict_copy()
+ */
+int av_opt_set_dict(void *obj, struct AVDictionary **options);
+
+/**
+ * @defgroup opt_eval_funcs Evaluating option strings
+ * @{
+ * This group of functions can be used to evaluate option strings
+ * and get numbers out of them. They do the same thing as av_opt_set(),
+ * except the result is written into the caller-supplied pointer.
+ *
+ * @param obj a struct whose first element is a pointer to AVClass.
+ * @param o an option for which the string is to be evaluated.
+ * @param val string to be evaluated.
+ * @param *_out value of the string will be written here.
+ *
+ * @return 0 on success, a negative number on failure.
+ */
+int av_opt_eval_flags (void *obj, const AVOption *o, const char *val, int        *flags_out);
+int av_opt_eval_int   (void *obj, const AVOption *o, const char *val, int        *int_out);
+int av_opt_eval_int64 (void *obj, const AVOption *o, const char *val, int64_t    *int64_out);
+int av_opt_eval_float (void *obj, const AVOption *o, const char *val, float      *float_out);
+int av_opt_eval_double(void *obj, const AVOption *o, const char *val, double     *double_out);
+int av_opt_eval_q     (void *obj, const AVOption *o, const char *val, AVRational *q_out);
+/**
+ * @}
+ */
+
+#define AV_OPT_SEARCH_CHILDREN   0x0001 /**< Search in possible children of the
+                                             given object first. */
+/**
+ *  The obj passed to av_opt_find() is fake -- only a double pointer to AVClass
+ *  instead of a required pointer to a struct containing AVClass. This is
+ *  useful for searching for options without needing to allocate the corresponding
+ *  object.
+ */
+#define AV_OPT_SEARCH_FAKE_OBJ   0x0002
+
+/**
+ * Look for an option in an object. Consider only options which
+ * have all the specified flags set.
+ *
+ * @param[in] obj A pointer to a struct whose first element is a
+ *                pointer to an AVClass.
+ *                Alternatively a double pointer to an AVClass, if
+ *                AV_OPT_SEARCH_FAKE_OBJ search flag is set.
+ * @param[in] name The name of the option to look for.
+ * @param[in] unit When searching for named constants, name of the unit
+ *                 it belongs to.
+ * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG).
+ * @param search_flags A combination of AV_OPT_SEARCH_*.
+ *
+ * @return A pointer to the option found, or NULL if no option
+ *         was found.
+ *
+ * @note Options found with AV_OPT_SEARCH_CHILDREN flag may not be settable
+ * directly with av_set_string3(). Use special calls which take an options
+ * AVDictionary (e.g. avformat_open_input()) to set options found with this
+ * flag.
+ */
+const AVOption *av_opt_find(void *obj, const char *name, const char *unit,
+                            int opt_flags, int search_flags);
+
+/**
+ * Look for an option in an object. Consider only options which
+ * have all the specified flags set.
+ *
+ * @param[in] obj A pointer to a struct whose first element is a
+ *                pointer to an AVClass.
+ *                Alternatively a double pointer to an AVClass, if
+ *                AV_OPT_SEARCH_FAKE_OBJ search flag is set.
+ * @param[in] name The name of the option to look for.
+ * @param[in] unit When searching for named constants, name of the unit
+ *                 it belongs to.
+ * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG).
+ * @param search_flags A combination of AV_OPT_SEARCH_*.
+ * @param[out] target_obj if non-NULL, an object to which the option belongs will be
+ * written here. It may be different from obj if AV_OPT_SEARCH_CHILDREN is present
+ * in search_flags. This parameter is ignored if search_flags contain
+ * AV_OPT_SEARCH_FAKE_OBJ.
+ *
+ * @return A pointer to the option found, or NULL if no option
+ *         was found.
+ */
+const AVOption *av_opt_find2(void *obj, const char *name, const char *unit,
+                             int opt_flags, int search_flags, void **target_obj);
+
+/**
+ * Iterate over all AVOptions belonging to obj.
+ *
+ * @param obj an AVOptions-enabled struct or a double pointer to an
+ *            AVClass describing it.
+ * @param prev result of the previous call to av_opt_next() on this object
+ *             or NULL
+ * @return next AVOption or NULL
+ */
+const AVOption *av_opt_next(void *obj, const AVOption *prev);
+
+/**
+ * Iterate over AVOptions-enabled children of obj.
+ *
+ * @param prev result of a previous call to this function or NULL
+ * @return next AVOptions-enabled child or NULL
+ */
+void *av_opt_child_next(void *obj, void *prev);
+
+/**
+ * Iterate over potential AVOptions-enabled children of parent.
+ *
+ * @param prev result of a previous call to this function or NULL
+ * @return AVClass corresponding to next potential child or NULL
+ */
+const AVClass *av_opt_child_class_next(const AVClass *parent, const AVClass *prev);
+
+/**
+ * @defgroup opt_set_funcs Option setting functions
+ * @{
+ * Those functions set the field of obj with the given name to value.
+ *
+ * @param[in] obj A struct whose first element is a pointer to an AVClass.
+ * @param[in] name the name of the field to set
+ * @param[in] val The value to set. In case of av_opt_set() if the field is not
+ * of a string type, then the given string is parsed.
+ * SI postfixes and some named scalars are supported.
+ * If the field is of a numeric type, it has to be a numeric or named
+ * scalar. Behavior with more than one scalar and +- infix operators
+ * is undefined.
+ * If the field is of a flags type, it has to be a sequence of numeric
+ * scalars or named flags separated by '+' or '-'. Prefixing a flag
+ * with '+' causes it to be set without affecting the other flags;
+ * similarly, '-' unsets a flag.
+ * @param search_flags flags passed to av_opt_find2. I.e. if AV_OPT_SEARCH_CHILDREN
+ * is passed here, then the option may be set on a child of obj.
+ *
+ * @return 0 if the value has been set, or an AVERROR code in case of
+ * error:
+ * AVERROR_OPTION_NOT_FOUND if no matching option exists
+ * AVERROR(ERANGE) if the value is out of range
+ * AVERROR(EINVAL) if the value is not valid
+ */
+int av_opt_set       (void *obj, const char *name, const char *val, int search_flags);
+int av_opt_set_int   (void *obj, const char *name, int64_t     val, int search_flags);
+int av_opt_set_double(void *obj, const char *name, double      val, int search_flags);
+int av_opt_set_q     (void *obj, const char *name, AVRational  val, int search_flags);
+int av_opt_set_bin   (void *obj, const char *name, const uint8_t *val, int size, int search_flags);
+/**
+ * @}
+ */
+
+/**
+ * @defgroup opt_get_funcs Option getting functions
+ * @{
+ * Those functions get a value of the option with the given name from an object.
+ *
+ * @param[in] obj a struct whose first element is a pointer to an AVClass.
+ * @param[in] name name of the option to get.
+ * @param[in] search_flags flags passed to av_opt_find2. I.e. if AV_OPT_SEARCH_CHILDREN
+ * is passed here, then the option may be found in a child of obj.
+ * @param[out] out_val value of the option will be written here
+ * @return 0 on success, a negative error code otherwise
+ */
+/**
+ * @note the returned string will av_malloc()ed and must be av_free()ed by the caller
+ */
+int av_opt_get       (void *obj, const char *name, int search_flags, uint8_t   **out_val);
+int av_opt_get_int   (void *obj, const char *name, int search_flags, int64_t    *out_val);
+int av_opt_get_double(void *obj, const char *name, int search_flags, double     *out_val);
+int av_opt_get_q     (void *obj, const char *name, int search_flags, AVRational *out_val);
+/**
+ * @}
+ * @}
+ */
+
+#endif /* AVUTIL_OPT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/parseutils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/parseutils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/parseutils.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/parseutils.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,124 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_PARSEUTILS_H
+#define AVUTIL_PARSEUTILS_H
+
+#include <time.h>
+
+#include "rational.h"
+
+/**
+ * @file
+ * misc parsing utilities
+ */
+
+/**
+ * Parse str and put in width_ptr and height_ptr the detected values.
+ *
+ * @param[in,out] width_ptr pointer to the variable which will contain the detected
+ * width value
+ * @param[in,out] height_ptr pointer to the variable which will contain the detected
+ * height value
+ * @param[in] str the string to parse: it has to be a string in the format
+ * width x height or a valid video size abbreviation.
+ * @return >= 0 on success, a negative error code otherwise
+ */
+int av_parse_video_size(int *width_ptr, int *height_ptr, const char *str);
+
+/**
+ * Parse str and store the detected values in *rate.
+ *
+ * @param[in,out] rate pointer to the AVRational which will contain the detected
+ * frame rate
+ * @param[in] str the string to parse: it has to be a string in the format
+ * rate_num / rate_den, a float number or a valid video rate abbreviation
+ * @return >= 0 on success, a negative error code otherwise
+ */
+int av_parse_video_rate(AVRational *rate, const char *str);
+
+/**
+ * Put the RGBA values that correspond to color_string in rgba_color.
+ *
+ * @param color_string a string specifying a color. It can be the name of
+ * a color (case insensitive match) or a [0x|#]RRGGBB[AA] sequence,
+ * possibly followed by "@" and a string representing the alpha
+ * component.
+ * The alpha component may be a string composed by "0x" followed by an
+ * hexadecimal number or a decimal number between 0.0 and 1.0, which
+ * represents the opacity value (0x00/0.0 means completely transparent,
+ * 0xff/1.0 completely opaque).
+ * If the alpha component is not specified then 0xff is assumed.
+ * The string "random" will result in a random color.
+ * @param slen length of the initial part of color_string containing the
+ * color. It can be set to -1 if color_string is a null terminated string
+ * containing nothing else than the color.
+ * @return >= 0 in case of success, a negative value in case of
+ * failure (for example if color_string cannot be parsed).
+ */
+int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen,
+                   void *log_ctx);
+
+/**
+ * Parse timestr and return in *time a corresponding number of
+ * microseconds.
+ *
+ * @param timeval puts here the number of microseconds corresponding
+ * to the string in timestr. If the string represents a duration, it
+ * is the number of microseconds contained in the time interval.  If
+ * the string is a date, is the number of microseconds since 1st of
+ * January, 1970 up to the time of the parsed date.  If timestr cannot
+ * be successfully parsed, set *time to INT64_MIN.
+
+ * @param timestr a string representing a date or a duration.
+ * - If a date the syntax is:
+ * @code
+ * [{YYYY-MM-DD|YYYYMMDD}[T|t| ]]{{HH[:MM[:SS[.m...]]]}|{HH[MM[SS[.m...]]]}}[Z]
+ * now
+ * @endcode
+ * If the value is "now" it takes the current time.
+ * Time is local time unless Z is appended, in which case it is
+ * interpreted as UTC.
+ * If the year-month-day part is not specified it takes the current
+ * year-month-day.
+ * - If a duration the syntax is:
+ * @code
+ * [-]HH[:MM[:SS[.m...]]]
+ * [-]S+[.m...]
+ * @endcode
+ * @param duration flag which tells how to interpret timestr, if not
+ * zero timestr is interpreted as a duration, otherwise as a date
+ * @return 0 in case of success, a negative value corresponding to an
+ * AVERROR code otherwise
+ */
+int av_parse_time(int64_t *timeval, const char *timestr, int duration);
+
+/**
+ * Attempt to find a specific tag in a URL.
+ *
+ * syntax: '?tag1=val1&tag2=val2...'. Little URL decoding is done.
+ * Return 1 if found.
+ */
+int av_find_info_tag(char *arg, int arg_size, const char *tag1, const char *info);
+
+/**
+ * Convert the decomposed UTC time in tm to a time_t value.
+ */
+time_t av_timegm(struct tm *tm);
+
+#endif /* AVUTIL_PARSEUTILS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/pixdesc.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/pixdesc.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/pixdesc.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/pixdesc.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,276 @@
+/*
+ * pixel format descriptor
+ * Copyright (c) 2009 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_PIXDESC_H
+#define AVUTIL_PIXDESC_H
+
+#include <inttypes.h>
+
+#include "attributes.h"
+#include "pixfmt.h"
+
+typedef struct AVComponentDescriptor{
+    uint16_t plane        :2;            ///< which of the 4 planes contains the component
+
+    /**
+     * Number of elements between 2 horizontally consecutive pixels minus 1.
+     * Elements are bits for bitstream formats, bytes otherwise.
+     */
+    uint16_t step_minus1  :3;
+
+    /**
+     * Number of elements before the component of the first pixel plus 1.
+     * Elements are bits for bitstream formats, bytes otherwise.
+     */
+    uint16_t offset_plus1 :3;
+    uint16_t shift        :3;            ///< number of least significant bits that must be shifted away to get the value
+    uint16_t depth_minus1 :4;            ///< number of bits in the component minus 1
+}AVComponentDescriptor;
+
+/**
+ * Descriptor that unambiguously describes how the bits of a pixel are
+ * stored in the up to 4 data planes of an image. It also stores the
+ * subsampling factors and number of components.
+ *
+ * @note This is separate of the colorspace (RGB, YCbCr, YPbPr, JPEG-style YUV
+ *       and all the YUV variants) AVPixFmtDescriptor just stores how values
+ *       are stored not what these values represent.
+ */
+typedef struct AVPixFmtDescriptor{
+    const char *name;
+    uint8_t nb_components;      ///< The number of components each pixel has, (1-4)
+
+    /**
+     * Amount to shift the luma width right to find the chroma width.
+     * For YV12 this is 1 for example.
+     * chroma_width = -((-luma_width) >> log2_chroma_w)
+     * The note above is needed to ensure rounding up.
+     * This value only refers to the chroma components.
+     */
+    uint8_t log2_chroma_w;      ///< chroma_width = -((-luma_width )>>log2_chroma_w)
+
+    /**
+     * Amount to shift the luma height right to find the chroma height.
+     * For YV12 this is 1 for example.
+     * chroma_height= -((-luma_height) >> log2_chroma_h)
+     * The note above is needed to ensure rounding up.
+     * This value only refers to the chroma components.
+     */
+    uint8_t log2_chroma_h;
+    uint8_t flags;
+
+    /**
+     * Parameters that describe how pixels are packed. If the format
+     * has chroma components, they must be stored in comp[1] and
+     * comp[2].
+     */
+    AVComponentDescriptor comp[4];
+}AVPixFmtDescriptor;
+
+/**
+ * Pixel format is big-endian.
+ */
+#define AV_PIX_FMT_FLAG_BE           (1 << 0)
+/**
+ * Pixel format has a palette in data[1], values are indexes in this palette.
+ */
+#define AV_PIX_FMT_FLAG_PAL          (1 << 1)
+/**
+ * All values of a component are bit-wise packed end to end.
+ */
+#define AV_PIX_FMT_FLAG_BITSTREAM    (1 << 2)
+/**
+ * Pixel format is an HW accelerated format.
+ */
+#define AV_PIX_FMT_FLAG_HWACCEL      (1 << 3)
+/**
+ * At least one pixel component is not in the first data plane.
+ */
+#define AV_PIX_FMT_FLAG_PLANAR       (1 << 4)
+/**
+ * The pixel format contains RGB-like data (as opposed to YUV/grayscale).
+ */
+#define AV_PIX_FMT_FLAG_RGB          (1 << 5)
+/**
+ * The pixel format is "pseudo-paletted". This means that Libav treats it as
+ * paletted internally, but the palette is generated by the decoder and is not
+ * stored in the file.
+ */
+#define AV_PIX_FMT_FLAG_PSEUDOPAL    (1 << 6)
+/**
+ * The pixel format has an alpha channel.
+ */
+#define AV_PIX_FMT_FLAG_ALPHA        (1 << 7)
+
+#if FF_API_PIX_FMT
+/**
+ * @deprecated use the AV_PIX_FMT_FLAG_* flags
+ */
+#define PIX_FMT_BE        AV_PIX_FMT_FLAG_BE
+#define PIX_FMT_PAL       AV_PIX_FMT_FLAG_PAL
+#define PIX_FMT_BITSTREAM AV_PIX_FMT_FLAG_BITSTREAM
+#define PIX_FMT_HWACCEL   AV_PIX_FMT_FLAG_HWACCEL
+#define PIX_FMT_PLANAR    AV_PIX_FMT_FLAG_PLANAR
+#define PIX_FMT_RGB       AV_PIX_FMT_FLAG_RGB
+#define PIX_FMT_PSEUDOPAL AV_PIX_FMT_FLAG_PSEUDOPAL
+#define PIX_FMT_ALPHA     AV_PIX_FMT_FLAG_ALPHA
+#endif
+
+#if FF_API_PIX_FMT_DESC
+/**
+ * The array of all the pixel format descriptors.
+ */
+extern attribute_deprecated const AVPixFmtDescriptor av_pix_fmt_descriptors[];
+#endif
+
+/**
+ * Read a line from an image, and write the values of the
+ * pixel format component c to dst.
+ *
+ * @param data the array containing the pointers to the planes of the image
+ * @param linesize the array containing the linesizes of the image
+ * @param desc the pixel format descriptor for the image
+ * @param x the horizontal coordinate of the first pixel to read
+ * @param y the vertical coordinate of the first pixel to read
+ * @param w the width of the line to read, that is the number of
+ * values to write to dst
+ * @param read_pal_component if not zero and the format is a paletted
+ * format writes the values corresponding to the palette
+ * component c in data[1] to dst, rather than the palette indexes in
+ * data[0]. The behavior is undefined if the format is not paletted.
+ */
+void av_read_image_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4],
+                        const AVPixFmtDescriptor *desc, int x, int y, int c, int w, int read_pal_component);
+
+/**
+ * Write the values from src to the pixel format component c of an
+ * image line.
+ *
+ * @param src array containing the values to write
+ * @param data the array containing the pointers to the planes of the
+ * image to write into. It is supposed to be zeroed.
+ * @param linesize the array containing the linesizes of the image
+ * @param desc the pixel format descriptor for the image
+ * @param x the horizontal coordinate of the first pixel to write
+ * @param y the vertical coordinate of the first pixel to write
+ * @param w the width of the line to write, that is the number of
+ * values to write to the image line
+ */
+void av_write_image_line(const uint16_t *src, uint8_t *data[4], const int linesize[4],
+                         const AVPixFmtDescriptor *desc, int x, int y, int c, int w);
+
+/**
+ * Return the pixel format corresponding to name.
+ *
+ * If there is no pixel format with name name, then looks for a
+ * pixel format with the name corresponding to the native endian
+ * format of name.
+ * For example in a little-endian system, first looks for "gray16",
+ * then for "gray16le".
+ *
+ * Finally if no pixel format has been found, returns PIX_FMT_NONE.
+ */
+enum AVPixelFormat av_get_pix_fmt(const char *name);
+
+/**
+ * Return the short name for a pixel format, NULL in case pix_fmt is
+ * unknown.
+ *
+ * @see av_get_pix_fmt(), av_get_pix_fmt_string()
+ */
+const char *av_get_pix_fmt_name(enum AVPixelFormat pix_fmt);
+
+/**
+ * Print in buf the string corresponding to the pixel format with
+ * number pix_fmt, or an header if pix_fmt is negative.
+ *
+ * @param buf the buffer where to write the string
+ * @param buf_size the size of buf
+ * @param pix_fmt the number of the pixel format to print the
+ * corresponding info string, or a negative value to print the
+ * corresponding header.
+ */
+char *av_get_pix_fmt_string (char *buf, int buf_size, enum AVPixelFormat pix_fmt);
+
+/**
+ * Return the number of bits per pixel used by the pixel format
+ * described by pixdesc. Note that this is not the same as the number
+ * of bits per sample.
+ *
+ * The returned number of bits refers to the number of bits actually
+ * used for storing the pixel information, that is padding bits are
+ * not counted.
+ */
+int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc);
+
+/**
+ * @return a pixel format descriptor for provided pixel format or NULL if
+ * this pixel format is unknown.
+ */
+const AVPixFmtDescriptor *av_pix_fmt_desc_get(enum AVPixelFormat pix_fmt);
+
+/**
+ * Iterate over all pixel format descriptors known to libavutil.
+ *
+ * @param prev previous descriptor. NULL to get the first descriptor.
+ *
+ * @return next descriptor or NULL after the last descriptor
+ */
+const AVPixFmtDescriptor *av_pix_fmt_desc_next(const AVPixFmtDescriptor *prev);
+
+/**
+ * @return an AVPixelFormat id described by desc, or AV_PIX_FMT_NONE if desc
+ * is not a valid pointer to a pixel format descriptor.
+ */
+enum AVPixelFormat av_pix_fmt_desc_get_id(const AVPixFmtDescriptor *desc);
+
+/**
+ * Utility function to access log2_chroma_w log2_chroma_h from
+ * the pixel format AVPixFmtDescriptor.
+ *
+ * @param[in]  pix_fmt the pixel format
+ * @param[out] h_shift store log2_chroma_h
+ * @param[out] v_shift store log2_chroma_w
+ *
+ * @return 0 on success, AVERROR(ENOSYS) on invalid or unknown pixel format
+ */
+int av_pix_fmt_get_chroma_sub_sample(enum AVPixelFormat pix_fmt,
+                                     int *h_shift, int *v_shift);
+
+/**
+ * @return number of planes in pix_fmt, a negative AVERROR if pix_fmt is not a
+ * valid pixel format.
+ */
+int av_pix_fmt_count_planes(enum AVPixelFormat pix_fmt);
+
+
+/**
+ * Utility function to swap the endianness of a pixel format.
+ *
+ * @param[in]  pix_fmt the pixel format
+ *
+ * @return pixel format with swapped endianness if it exists,
+ * otherwise AV_PIX_FMT_NONE
+ */
+enum AVPixelFormat av_pix_fmt_swap_endianness(enum AVPixelFormat pix_fmt);
+
+
+#endif /* AVUTIL_PIXDESC_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/pixfmt.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/pixfmt.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/pixfmt.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/pixfmt.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,283 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_PIXFMT_H
+#define AVUTIL_PIXFMT_H
+
+/**
+ * @file
+ * pixel format definitions
+ *
+ */
+
+#include "libavutil/avconfig.h"
+#include "version.h"
+
+/**
+ * Pixel format.
+ *
+ * @note
+ * PIX_FMT_RGB32 is handled in an endian-specific manner. An RGBA
+ * color is put together as:
+ *  (A << 24) | (R << 16) | (G << 8) | B
+ * This is stored as BGRA on little-endian CPU architectures and ARGB on
+ * big-endian CPUs.
+ *
+ * @par
+ * When the pixel format is palettized RGB (PIX_FMT_PAL8), the palettized
+ * image data is stored in AVFrame.data[0]. The palette is transported in
+ * AVFrame.data[1], is 1024 bytes long (256 4-byte entries) and is
+ * formatted the same as in PIX_FMT_RGB32 described above (i.e., it is
+ * also endian-specific). Note also that the individual RGB palette
+ * components stored in AVFrame.data[1] should be in the range 0..255.
+ * This is important as many custom PAL8 video codecs that were designed
+ * to run on the IBM VGA graphics adapter use 6-bit palette components.
+ *
+ * @par
+ * For all the 8bit per pixel formats, an RGB32 palette is in data[1] like
+ * for pal8. This palette is filled in automatically by the function
+ * allocating the picture.
+ *
+ * @note
+ * Make sure that all newly added big-endian formats have pix_fmt & 1 == 1
+ * and that all newly added little-endian formats have pix_fmt & 1 == 0.
+ * This allows simpler detection of big vs little-endian.
+ */
+enum AVPixelFormat {
+    AV_PIX_FMT_NONE = -1,
+    AV_PIX_FMT_YUV420P,   ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
+    AV_PIX_FMT_YUYV422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
+    AV_PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
+    AV_PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
+    AV_PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
+    AV_PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
+    AV_PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
+    AV_PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
+    AV_PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
+    AV_PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
+    AV_PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
+    AV_PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
+    AV_PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
+    AV_PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
+    AV_PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
+#if FF_API_XVMC
+    AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
+    AV_PIX_FMT_XVMC_MPEG2_IDCT,
+#endif /* FF_API_XVMC */
+    AV_PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
+    AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
+    AV_PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
+    AV_PIX_FMT_BGR4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
+    AV_PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
+    AV_PIX_FMT_RGB8,      ///< packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
+    AV_PIX_FMT_RGB4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
+    AV_PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
+    AV_PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
+    AV_PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
+
+    AV_PIX_FMT_ARGB,      ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
+    AV_PIX_FMT_RGBA,      ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
+    AV_PIX_FMT_ABGR,      ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
+    AV_PIX_FMT_BGRA,      ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
+
+    AV_PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
+    AV_PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
+    AV_PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
+    AV_PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
+    AV_PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
+#if FF_API_VDPAU
+    AV_PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    AV_PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    AV_PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    AV_PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    AV_PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+#endif
+    AV_PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
+    AV_PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
+
+    AV_PIX_FMT_RGB565BE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian
+    AV_PIX_FMT_RGB565LE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), little-endian
+    AV_PIX_FMT_RGB555BE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
+    AV_PIX_FMT_RGB555LE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
+
+    AV_PIX_FMT_BGR565BE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), big-endian
+    AV_PIX_FMT_BGR565LE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), little-endian
+    AV_PIX_FMT_BGR555BE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
+    AV_PIX_FMT_BGR555LE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
+
+    AV_PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
+    AV_PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
+    AV_PIX_FMT_VAAPI_VLD,  ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+
+    AV_PIX_FMT_YUV420P16LE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    AV_PIX_FMT_YUV420P16BE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    AV_PIX_FMT_YUV422P16LE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    AV_PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    AV_PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    AV_PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+#if FF_API_VDPAU
+    AV_PIX_FMT_VDPAU_MPEG4,  ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+#endif
+    AV_PIX_FMT_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
+
+    AV_PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
+    AV_PIX_FMT_RGB444BE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
+    AV_PIX_FMT_BGR444LE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
+    AV_PIX_FMT_BGR444BE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
+    AV_PIX_FMT_Y400A,     ///< 8bit gray, 8bit alpha
+    AV_PIX_FMT_BGR48BE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
+    AV_PIX_FMT_BGR48LE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
+    AV_PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    AV_PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    AV_PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    AV_PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    AV_PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    AV_PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    AV_PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    AV_PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    AV_PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    AV_PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    AV_PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    AV_PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    AV_PIX_FMT_VDA_VLD,    ///< hardware decoding through VDA
+    AV_PIX_FMT_GBRP,      ///< planar GBR 4:4:4 24bpp
+    AV_PIX_FMT_GBRP9BE,   ///< planar GBR 4:4:4 27bpp, big-endian
+    AV_PIX_FMT_GBRP9LE,   ///< planar GBR 4:4:4 27bpp, little-endian
+    AV_PIX_FMT_GBRP10BE,  ///< planar GBR 4:4:4 30bpp, big-endian
+    AV_PIX_FMT_GBRP10LE,  ///< planar GBR 4:4:4 30bpp, little-endian
+    AV_PIX_FMT_GBRP16BE,  ///< planar GBR 4:4:4 48bpp, big-endian
+    AV_PIX_FMT_GBRP16LE,  ///< planar GBR 4:4:4 48bpp, little-endian
+    AV_PIX_FMT_YUVA422P,  ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
+    AV_PIX_FMT_YUVA444P,  ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples)
+    AV_PIX_FMT_YUVA420P9BE,  ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per 2x2 Y & A samples), big-endian
+    AV_PIX_FMT_YUVA420P9LE,  ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per 2x2 Y & A samples), little-endian
+    AV_PIX_FMT_YUVA422P9BE,  ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per 2x1 Y & A samples), big-endian
+    AV_PIX_FMT_YUVA422P9LE,  ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per 2x1 Y & A samples), little-endian
+    AV_PIX_FMT_YUVA444P9BE,  ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per 1x1 Y & A samples), big-endian
+    AV_PIX_FMT_YUVA444P9LE,  ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per 1x1 Y & A samples), little-endian
+    AV_PIX_FMT_YUVA420P10BE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per 2x2 Y & A samples, big-endian)
+    AV_PIX_FMT_YUVA420P10LE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per 2x2 Y & A samples, little-endian)
+    AV_PIX_FMT_YUVA422P10BE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per 2x1 Y & A samples, big-endian)
+    AV_PIX_FMT_YUVA422P10LE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per 2x1 Y & A samples, little-endian)
+    AV_PIX_FMT_YUVA444P10BE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per 1x1 Y & A samples, big-endian)
+    AV_PIX_FMT_YUVA444P10LE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per 1x1 Y & A samples, little-endian)
+    AV_PIX_FMT_YUVA420P16BE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per 2x2 Y & A samples, big-endian)
+    AV_PIX_FMT_YUVA420P16LE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per 2x2 Y & A samples, little-endian)
+    AV_PIX_FMT_YUVA422P16BE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per 2x1 Y & A samples, big-endian)
+    AV_PIX_FMT_YUVA422P16LE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per 2x1 Y & A samples, little-endian)
+    AV_PIX_FMT_YUVA444P16BE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, big-endian)
+    AV_PIX_FMT_YUVA444P16LE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, little-endian)
+    AV_PIX_FMT_VDPAU,     ///< HW acceleration through VDPAU, Picture.data[3] contains a VdpVideoSurface
+    AV_PIX_FMT_XYZ12LE,      ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y, 12Z (lsb), the 2-byte value for each X/Y/Z is stored as little-endian, the 4 lower bits are set to 0
+    AV_PIX_FMT_XYZ12BE,      ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y, 12Z (lsb), the 2-byte value for each X/Y/Z is stored as big-endian, the 4 lower bits are set to 0
+    AV_PIX_FMT_NV16,         ///< interleaved chroma YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
+    AV_PIX_FMT_NV20LE,       ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    AV_PIX_FMT_NV20BE,       ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    AV_PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
+
+#if FF_API_PIX_FMT
+#include "old_pix_fmts.h"
+#endif
+};
+
+#if AV_HAVE_BIGENDIAN
+#   define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##be
+#else
+#   define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##le
+#endif
+
+#define AV_PIX_FMT_RGB32   AV_PIX_FMT_NE(ARGB, BGRA)
+#define AV_PIX_FMT_RGB32_1 AV_PIX_FMT_NE(RGBA, ABGR)
+#define AV_PIX_FMT_BGR32   AV_PIX_FMT_NE(ABGR, RGBA)
+#define AV_PIX_FMT_BGR32_1 AV_PIX_FMT_NE(BGRA, ARGB)
+
+#define AV_PIX_FMT_GRAY16 AV_PIX_FMT_NE(GRAY16BE, GRAY16LE)
+#define AV_PIX_FMT_RGB48  AV_PIX_FMT_NE(RGB48BE,  RGB48LE)
+#define AV_PIX_FMT_RGB565 AV_PIX_FMT_NE(RGB565BE, RGB565LE)
+#define AV_PIX_FMT_RGB555 AV_PIX_FMT_NE(RGB555BE, RGB555LE)
+#define AV_PIX_FMT_RGB444 AV_PIX_FMT_NE(RGB444BE, RGB444LE)
+#define AV_PIX_FMT_BGR48  AV_PIX_FMT_NE(BGR48BE,  BGR48LE)
+#define AV_PIX_FMT_BGR565 AV_PIX_FMT_NE(BGR565BE, BGR565LE)
+#define AV_PIX_FMT_BGR555 AV_PIX_FMT_NE(BGR555BE, BGR555LE)
+#define AV_PIX_FMT_BGR444 AV_PIX_FMT_NE(BGR444BE, BGR444LE)
+
+#define AV_PIX_FMT_YUV420P9  AV_PIX_FMT_NE(YUV420P9BE , YUV420P9LE)
+#define AV_PIX_FMT_YUV422P9  AV_PIX_FMT_NE(YUV422P9BE , YUV422P9LE)
+#define AV_PIX_FMT_YUV444P9  AV_PIX_FMT_NE(YUV444P9BE , YUV444P9LE)
+#define AV_PIX_FMT_YUV420P10 AV_PIX_FMT_NE(YUV420P10BE, YUV420P10LE)
+#define AV_PIX_FMT_YUV422P10 AV_PIX_FMT_NE(YUV422P10BE, YUV422P10LE)
+#define AV_PIX_FMT_YUV444P10 AV_PIX_FMT_NE(YUV444P10BE, YUV444P10LE)
+#define AV_PIX_FMT_YUV420P16 AV_PIX_FMT_NE(YUV420P16BE, YUV420P16LE)
+#define AV_PIX_FMT_YUV422P16 AV_PIX_FMT_NE(YUV422P16BE, YUV422P16LE)
+#define AV_PIX_FMT_YUV444P16 AV_PIX_FMT_NE(YUV444P16BE, YUV444P16LE)
+
+#define AV_PIX_FMT_GBRP9     AV_PIX_FMT_NE(GBRP9BE ,    GBRP9LE)
+#define AV_PIX_FMT_GBRP10    AV_PIX_FMT_NE(GBRP10BE,    GBRP10LE)
+#define AV_PIX_FMT_GBRP16    AV_PIX_FMT_NE(GBRP16BE,    GBRP16LE)
+
+#define AV_PIX_FMT_YUVA420P9  AV_PIX_FMT_NE(YUVA420P9BE , YUVA420P9LE)
+#define AV_PIX_FMT_YUVA422P9  AV_PIX_FMT_NE(YUVA422P9BE , YUVA422P9LE)
+#define AV_PIX_FMT_YUVA444P9  AV_PIX_FMT_NE(YUVA444P9BE , YUVA444P9LE)
+#define AV_PIX_FMT_YUVA420P10 AV_PIX_FMT_NE(YUVA420P10BE, YUVA420P10LE)
+#define AV_PIX_FMT_YUVA422P10 AV_PIX_FMT_NE(YUVA422P10BE, YUVA422P10LE)
+#define AV_PIX_FMT_YUVA444P10 AV_PIX_FMT_NE(YUVA444P10BE, YUVA444P10LE)
+#define AV_PIX_FMT_YUVA420P16 AV_PIX_FMT_NE(YUVA420P16BE, YUVA420P16LE)
+#define AV_PIX_FMT_YUVA422P16 AV_PIX_FMT_NE(YUVA422P16BE, YUVA422P16LE)
+#define AV_PIX_FMT_YUVA444P16 AV_PIX_FMT_NE(YUVA444P16BE, YUVA444P16LE)
+
+#define AV_PIX_FMT_XYZ12      AV_PIX_FMT_NE(XYZ12BE, XYZ12LE)
+#define AV_PIX_FMT_NV20       AV_PIX_FMT_NE(NV20BE,  NV20LE)
+
+#if FF_API_PIX_FMT
+#define PixelFormat AVPixelFormat
+
+#define PIX_FMT_NE(be, le) AV_PIX_FMT_NE(be, le)
+
+#define PIX_FMT_RGB32   AV_PIX_FMT_RGB32
+#define PIX_FMT_RGB32_1 AV_PIX_FMT_RGB32_1
+#define PIX_FMT_BGR32   AV_PIX_FMT_BGR32
+#define PIX_FMT_BGR32_1 AV_PIX_FMT_BGR32_1
+
+#define PIX_FMT_GRAY16 AV_PIX_FMT_GRAY16
+#define PIX_FMT_RGB48  AV_PIX_FMT_RGB48
+#define PIX_FMT_RGB565 AV_PIX_FMT_RGB565
+#define PIX_FMT_RGB555 AV_PIX_FMT_RGB555
+#define PIX_FMT_RGB444 AV_PIX_FMT_RGB444
+#define PIX_FMT_BGR48  AV_PIX_FMT_BGR48
+#define PIX_FMT_BGR565 AV_PIX_FMT_BGR565
+#define PIX_FMT_BGR555 AV_PIX_FMT_BGR555
+#define PIX_FMT_BGR444 AV_PIX_FMT_BGR444
+
+#define PIX_FMT_YUV420P9  AV_PIX_FMT_YUV420P9
+#define PIX_FMT_YUV422P9  AV_PIX_FMT_YUV422P9
+#define PIX_FMT_YUV444P9  AV_PIX_FMT_YUV444P9
+#define PIX_FMT_YUV420P10 AV_PIX_FMT_YUV420P10
+#define PIX_FMT_YUV422P10 AV_PIX_FMT_YUV422P10
+#define PIX_FMT_YUV444P10 AV_PIX_FMT_YUV444P10
+#define PIX_FMT_YUV420P16 AV_PIX_FMT_YUV420P16
+#define PIX_FMT_YUV422P16 AV_PIX_FMT_YUV422P16
+#define PIX_FMT_YUV444P16 AV_PIX_FMT_YUV444P16
+
+#define PIX_FMT_GBRP9  AV_PIX_FMT_GBRP9
+#define PIX_FMT_GBRP10 AV_PIX_FMT_GBRP10
+#define PIX_FMT_GBRP16 AV_PIX_FMT_GBRP16
+#endif
+
+#endif /* AVUTIL_PIXFMT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/random_seed.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/random_seed.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/random_seed.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/random_seed.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2009 Baptiste Coudurier <baptiste.coudurier@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_RANDOM_SEED_H
+#define AVUTIL_RANDOM_SEED_H
+
+#include <stdint.h>
+/**
+ * @addtogroup lavu_crypto
+ * @{
+ */
+
+/**
+ * Get random data.
+ *
+ * This function can be called repeatedly to generate more random bits
+ * as needed. It is generally quite slow, and usually used to seed a
+ * PRNG.  As it uses /dev/urandom and /dev/random, the quality of the
+ * returned random data depends on the platform.
+ */
+uint32_t av_get_random_seed(void);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_RANDOM_SEED_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/rational.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/rational.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/rational.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/rational.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,155 @@
+/*
+ * rational numbers
+ * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * rational numbers
+ * @author Michael Niedermayer <michaelni@gmx.at>
+ */
+
+#ifndef AVUTIL_RATIONAL_H
+#define AVUTIL_RATIONAL_H
+
+#include <stdint.h>
+#include <limits.h>
+#include "attributes.h"
+
+/**
+ * @addtogroup lavu_math
+ * @{
+ */
+
+/**
+ * rational number numerator/denominator
+ */
+typedef struct AVRational{
+    int num; ///< numerator
+    int den; ///< denominator
+} AVRational;
+
+/**
+ * Compare two rationals.
+ * @param a first rational
+ * @param b second rational
+ * @return 0 if a==b, 1 if a>b, -1 if a<b, and INT_MIN if one of the
+ * values is of the form 0/0
+ */
+static inline int av_cmp_q(AVRational a, AVRational b){
+    const int64_t tmp= a.num * (int64_t)b.den - b.num * (int64_t)a.den;
+
+    if(tmp) return ((tmp ^ a.den ^ b.den)>>63)|1;
+    else if(b.den && a.den) return 0;
+    else if(a.num && b.num) return (a.num>>31) - (b.num>>31);
+    else                    return INT_MIN;
+}
+
+/**
+ * Convert rational to double.
+ * @param a rational to convert
+ * @return (double) a
+ */
+static inline double av_q2d(AVRational a){
+    return a.num / (double) a.den;
+}
+
+/**
+ * Reduce a fraction.
+ * This is useful for framerate calculations.
+ * @param dst_num destination numerator
+ * @param dst_den destination denominator
+ * @param num source numerator
+ * @param den source denominator
+ * @param max the maximum allowed for dst_num & dst_den
+ * @return 1 if exact, 0 otherwise
+ */
+int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max);
+
+/**
+ * Multiply two rationals.
+ * @param b first rational
+ * @param c second rational
+ * @return b*c
+ */
+AVRational av_mul_q(AVRational b, AVRational c) av_const;
+
+/**
+ * Divide one rational by another.
+ * @param b first rational
+ * @param c second rational
+ * @return b/c
+ */
+AVRational av_div_q(AVRational b, AVRational c) av_const;
+
+/**
+ * Add two rationals.
+ * @param b first rational
+ * @param c second rational
+ * @return b+c
+ */
+AVRational av_add_q(AVRational b, AVRational c) av_const;
+
+/**
+ * Subtract one rational from another.
+ * @param b first rational
+ * @param c second rational
+ * @return b-c
+ */
+AVRational av_sub_q(AVRational b, AVRational c) av_const;
+
+/**
+ * Invert a rational.
+ * @param q value
+ * @return 1 / q
+ */
+static av_always_inline AVRational av_inv_q(AVRational q)
+{
+    AVRational r = { q.den, q.num };
+    return r;
+}
+
+/**
+ * Convert a double precision floating point number to a rational.
+ * inf is expressed as {1,0} or {-1,0} depending on the sign.
+ *
+ * @param d double to convert
+ * @param max the maximum allowed numerator and denominator
+ * @return (AVRational) d
+ */
+AVRational av_d2q(double d, int max) av_const;
+
+/**
+ * @return 1 if q1 is nearer to q than q2, -1 if q2 is nearer
+ * than q1, 0 if they have the same distance.
+ */
+int av_nearer_q(AVRational q, AVRational q1, AVRational q2);
+
+/**
+ * Find the nearest value in q_list to q.
+ * @param q_list an array of rationals terminated by {0, 0}
+ * @return the index of the nearest value found in the array
+ */
+int av_find_nearest_q_idx(AVRational q, const AVRational* q_list);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_RATIONAL_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/samplefmt.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/samplefmt.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/samplefmt.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/samplefmt.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,220 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_SAMPLEFMT_H
+#define AVUTIL_SAMPLEFMT_H
+
+#include <stdint.h>
+
+#include "avutil.h"
+#include "attributes.h"
+
+/**
+ * Audio Sample Formats
+ *
+ * @par
+ * The data described by the sample format is always in native-endian order.
+ * Sample values can be expressed by native C types, hence the lack of a signed
+ * 24-bit sample format even though it is a common raw audio data format.
+ *
+ * @par
+ * The floating-point formats are based on full volume being in the range
+ * [-1.0, 1.0]. Any values outside this range are beyond full volume level.
+ *
+ * @par
+ * The data layout as used in av_samples_fill_arrays() and elsewhere in Libav
+ * (such as AVFrame in libavcodec) is as follows:
+ *
+ * For planar sample formats, each audio channel is in a separate data plane,
+ * and linesize is the buffer size, in bytes, for a single plane. All data
+ * planes must be the same size. For packed sample formats, only the first data
+ * plane is used, and samples for each channel are interleaved. In this case,
+ * linesize is the buffer size, in bytes, for the 1 plane.
+ */
+enum AVSampleFormat {
+    AV_SAMPLE_FMT_NONE = -1,
+    AV_SAMPLE_FMT_U8,          ///< unsigned 8 bits
+    AV_SAMPLE_FMT_S16,         ///< signed 16 bits
+    AV_SAMPLE_FMT_S32,         ///< signed 32 bits
+    AV_SAMPLE_FMT_FLT,         ///< float
+    AV_SAMPLE_FMT_DBL,         ///< double
+
+    AV_SAMPLE_FMT_U8P,         ///< unsigned 8 bits, planar
+    AV_SAMPLE_FMT_S16P,        ///< signed 16 bits, planar
+    AV_SAMPLE_FMT_S32P,        ///< signed 32 bits, planar
+    AV_SAMPLE_FMT_FLTP,        ///< float, planar
+    AV_SAMPLE_FMT_DBLP,        ///< double, planar
+
+    AV_SAMPLE_FMT_NB           ///< Number of sample formats. DO NOT USE if linking dynamically
+};
+
+/**
+ * Return the name of sample_fmt, or NULL if sample_fmt is not
+ * recognized.
+ */
+const char *av_get_sample_fmt_name(enum AVSampleFormat sample_fmt);
+
+/**
+ * Return a sample format corresponding to name, or AV_SAMPLE_FMT_NONE
+ * on error.
+ */
+enum AVSampleFormat av_get_sample_fmt(const char *name);
+
+/**
+ * Get the packed alternative form of the given sample format.
+ *
+ * If the passed sample_fmt is already in packed format, the format returned is
+ * the same as the input.
+ *
+ * @return  the packed alternative form of the given sample format or
+            AV_SAMPLE_FMT_NONE on error.
+ */
+enum AVSampleFormat av_get_packed_sample_fmt(enum AVSampleFormat sample_fmt);
+
+/**
+ * Get the planar alternative form of the given sample format.
+ *
+ * If the passed sample_fmt is already in planar format, the format returned is
+ * the same as the input.
+ *
+ * @return  the planar alternative form of the given sample format or
+            AV_SAMPLE_FMT_NONE on error.
+ */
+enum AVSampleFormat av_get_planar_sample_fmt(enum AVSampleFormat sample_fmt);
+
+/**
+ * Generate a string corresponding to the sample format with
+ * sample_fmt, or a header if sample_fmt is negative.
+ *
+ * @param buf the buffer where to write the string
+ * @param buf_size the size of buf
+ * @param sample_fmt the number of the sample format to print the
+ * corresponding info string, or a negative value to print the
+ * corresponding header.
+ * @return the pointer to the filled buffer or NULL if sample_fmt is
+ * unknown or in case of other errors
+ */
+char *av_get_sample_fmt_string(char *buf, int buf_size, enum AVSampleFormat sample_fmt);
+
+/**
+ * Return number of bytes per sample.
+ *
+ * @param sample_fmt the sample format
+ * @return number of bytes per sample or zero if unknown for the given
+ * sample format
+ */
+int av_get_bytes_per_sample(enum AVSampleFormat sample_fmt);
+
+/**
+ * Check if the sample format is planar.
+ *
+ * @param sample_fmt the sample format to inspect
+ * @return 1 if the sample format is planar, 0 if it is interleaved
+ */
+int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt);
+
+/**
+ * Get the required buffer size for the given audio parameters.
+ *
+ * @param[out] linesize calculated linesize, may be NULL
+ * @param nb_channels   the number of channels
+ * @param nb_samples    the number of samples in a single channel
+ * @param sample_fmt    the sample format
+ * @param align         buffer size alignment (0 = default, 1 = no alignment)
+ * @return              required buffer size, or negative error code on failure
+ */
+int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples,
+                               enum AVSampleFormat sample_fmt, int align);
+
+/**
+ * Fill channel data pointers and linesize for samples with sample
+ * format sample_fmt.
+ *
+ * The pointers array is filled with the pointers to the samples data:
+ * for planar, set the start point of each channel's data within the buffer,
+ * for packed, set the start point of the entire buffer only.
+ *
+ * The linesize array is filled with the aligned size of each channel's data
+ * buffer for planar layout, or the aligned size of the buffer for all channels
+ * for packed layout.
+ *
+ * @see enum AVSampleFormat
+ * The documentation for AVSampleFormat describes the data layout.
+ *
+ * @param[out] audio_data  array to be filled with the pointer for each channel
+ * @param[out] linesize    calculated linesize, may be NULL
+ * @param buf              the pointer to a buffer containing the samples
+ * @param nb_channels      the number of channels
+ * @param nb_samples       the number of samples in a single channel
+ * @param sample_fmt       the sample format
+ * @param align            buffer size alignment (0 = default, 1 = no alignment)
+ * @return                 0 on success or a negative error code on failure
+ */
+int av_samples_fill_arrays(uint8_t **audio_data, int *linesize,
+                           const uint8_t *buf,
+                           int nb_channels, int nb_samples,
+                           enum AVSampleFormat sample_fmt, int align);
+
+/**
+ * Allocate a samples buffer for nb_samples samples, and fill data pointers and
+ * linesize accordingly.
+ * The allocated samples buffer can be freed by using av_freep(&audio_data[0])
+ * Allocated data will be initialized to silence.
+ *
+ * @see enum AVSampleFormat
+ * The documentation for AVSampleFormat describes the data layout.
+ *
+ * @param[out] audio_data  array to be filled with the pointer for each channel
+ * @param[out] linesize    aligned size for audio buffer(s), may be NULL
+ * @param nb_channels      number of audio channels
+ * @param nb_samples       number of samples per channel
+ * @param align            buffer size alignment (0 = default, 1 = no alignment)
+ * @return                 0 on success or a negative error code on failure
+ * @see av_samples_fill_arrays()
+ */
+int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels,
+                     int nb_samples, enum AVSampleFormat sample_fmt, int align);
+
+/**
+ * Copy samples from src to dst.
+ *
+ * @param dst destination array of pointers to data planes
+ * @param src source array of pointers to data planes
+ * @param dst_offset offset in samples at which the data will be written to dst
+ * @param src_offset offset in samples at which the data will be read from src
+ * @param nb_samples number of samples to be copied
+ * @param nb_channels number of audio channels
+ * @param sample_fmt audio sample format
+ */
+int av_samples_copy(uint8_t **dst, uint8_t * const *src, int dst_offset,
+                    int src_offset, int nb_samples, int nb_channels,
+                    enum AVSampleFormat sample_fmt);
+
+/**
+ * Fill an audio buffer with silence.
+ *
+ * @param audio_data  array of pointers to data planes
+ * @param offset      offset in samples at which to start filling
+ * @param nb_samples  number of samples to fill
+ * @param nb_channels number of audio channels
+ * @param sample_fmt  audio sample format
+ */
+int av_samples_set_silence(uint8_t **audio_data, int offset, int nb_samples,
+                           int nb_channels, enum AVSampleFormat sample_fmt);
+
+#endif /* AVUTIL_SAMPLEFMT_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/sha.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/sha.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/sha.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/sha.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_SHA_H
+#define AVUTIL_SHA_H
+
+#include <stdint.h>
+
+#include "attributes.h"
+#include "version.h"
+
+/**
+ * @defgroup lavu_sha SHA
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+#if FF_API_CONTEXT_SIZE
+extern attribute_deprecated const int av_sha_size;
+#endif
+
+struct AVSHA;
+
+/**
+ * Allocate an AVSHA context.
+ */
+struct AVSHA *av_sha_alloc(void);
+
+/**
+ * Initialize SHA-1 or SHA-2 hashing.
+ *
+ * @param context pointer to the function context (of size av_sha_size)
+ * @param bits    number of bits in digest (SHA-1 - 160 bits, SHA-2 224 or 256 bits)
+ * @return        zero if initialization succeeded, -1 otherwise
+ */
+int av_sha_init(struct AVSHA* context, int bits);
+
+/**
+ * Update hash value.
+ *
+ * @param context hash function context
+ * @param data    input data to update hash with
+ * @param len     input data length
+ */
+void av_sha_update(struct AVSHA* context, const uint8_t* data, unsigned int len);
+
+/**
+ * Finish hashing and output digest value.
+ *
+ * @param context hash function context
+ * @param digest  buffer where output digest value is stored
+ */
+void av_sha_final(struct AVSHA* context, uint8_t *digest);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_SHA_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/stereo3d.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/stereo3d.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/stereo3d.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/stereo3d.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2013 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdint.h>
+
+#include "frame.h"
+
+/**
+ * List of possible 3D Types
+ */
+enum AVStereo3DType {
+    /**
+     * Video is not stereoscopic (and metadata has to be there).
+     */
+    AV_STEREO3D_2D,
+
+    /**
+     * Views are next to each other.
+     *
+     *    LLLLRRRR
+     *    LLLLRRRR
+     *    LLLLRRRR
+     *    ...
+     */
+    AV_STEREO3D_SIDEBYSIDE,
+
+    /**
+     * Views are on top of each other.
+     *
+     *    LLLLLLLL
+     *    LLLLLLLL
+     *    RRRRRRRR
+     *    RRRRRRRR
+     */
+    AV_STEREO3D_TOPBOTTOM,
+
+    /**
+     * Views are alternated temporally.
+     *
+     *     frame0   frame1   frame2   ...
+     *    LLLLLLLL RRRRRRRR LLLLLLLL
+     *    LLLLLLLL RRRRRRRR LLLLLLLL
+     *    LLLLLLLL RRRRRRRR LLLLLLLL
+     *    ...      ...      ...
+     */
+    AV_STEREO3D_FRAMESEQUENCE,
+
+    /**
+     * Views are packed in a checkerboard-like structure per pixel.
+     *
+     *    LRLRLRLR
+     *    RLRLRLRL
+     *    LRLRLRLR
+     *    ...
+     */
+    AV_STEREO3D_CHECKERBOARD,
+
+    /**
+     * Views are next to each other, but when upscaling
+     * apply a checkerboard pattern.
+     *
+     *     LLLLRRRR          L L L L    R R R R
+     *     LLLLRRRR    =>     L L L L  R R R R
+     *     LLLLRRRR          L L L L    R R R R
+     *     LLLLRRRR           L L L L  R R R R
+     */
+    AV_STEREO3D_SIDEBYSIDE_QUINCUNX,
+
+    /**
+     * Views are packed per line, as if interlaced.
+     *
+     *    LLLLLLLL
+     *    RRRRRRRR
+     *    LLLLLLLL
+     *    ...
+     */
+    AV_STEREO3D_LINES,
+
+    /**
+     * Views are packed per column.
+     *
+     *    LRLRLRLR
+     *    LRLRLRLR
+     *    LRLRLRLR
+     *    ...
+     */
+    AV_STEREO3D_COLUMNS,
+};
+
+
+/**
+ * Inverted views, Right/Bottom represents the left view.
+ */
+#define AV_STEREO3D_FLAG_INVERT     (1 << 0)
+
+/**
+ * Stereo 3D type: this structure describes how two videos are packed
+ * within a single video surface, with additional information as needed.
+ *
+ * @note The struct must be allocated with av_stereo3d_alloc() and
+ *       its size is not a part of the public ABI.
+ */
+typedef struct AVStereo3D {
+    /**
+     * How views are packed within the video.
+     */
+    enum AVStereo3DType type;
+
+    /**
+     * Additional information about the frame packing.
+     */
+    int flags;
+} AVStereo3D;
+
+/**
+ * Allocate an AVStereo3D structure and set its fields to default values.
+ * The resulting struct can be freed using av_freep().
+ *
+ * @return An AVStereo3D filled with default values or NULL on failure.
+ */
+AVStereo3D *av_stereo3d_alloc(void);
+
+/**
+ * Allocate a complete AVFrameSideData and add it to the frame.
+ *
+ * @param frame The frame which side data is added to.
+ *
+ * @return The AVStereo3D structure to be filled by caller.
+ */
+AVStereo3D *av_stereo3d_create_side_data(AVFrame *frame);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/time.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/time.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/time.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/time.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_TIME_H
+#define AVUTIL_TIME_H
+
+#include <stdint.h>
+
+/**
+ * Get the current time in microseconds.
+ */
+int64_t av_gettime(void);
+
+/**
+ * Sleep for a period of time.  Although the duration is expressed in
+ * microseconds, the actual delay may be rounded to the precision of the
+ * system timer.
+ *
+ * @param  usec Number of microseconds to sleep.
+ * @return zero on success or (negative) error code.
+ */
+int av_usleep(unsigned usec);
+
+#endif /* AVUTIL_TIME_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/version.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/version.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/version.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/version.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,116 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_VERSION_H
+#define AVUTIL_VERSION_H
+
+#include "macros.h"
+
+/**
+ * @defgroup version_utils Library Version Macros
+ *
+ * Useful to check and match library version in order to maintain
+ * backward compatibility.
+ *
+ * @{
+ */
+
+#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
+#define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c
+#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
+
+/**
+ * @}
+ */
+
+/**
+ * @file
+ * @ingroup lavu
+ * Libavutil version macros
+ */
+
+/**
+ * @defgroup lavu_ver Version and Build diagnostics
+ *
+ * Macros and function useful to check at compiletime and at runtime
+ * which version of libavutil is in use.
+ *
+ * @{
+ */
+
+#define LIBAVUTIL_VERSION_MAJOR 53
+#define LIBAVUTIL_VERSION_MINOR  3
+#define LIBAVUTIL_VERSION_MICRO  0
+
+#define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
+                                               LIBAVUTIL_VERSION_MINOR, \
+                                               LIBAVUTIL_VERSION_MICRO)
+#define LIBAVUTIL_VERSION       AV_VERSION(LIBAVUTIL_VERSION_MAJOR,     \
+                                           LIBAVUTIL_VERSION_MINOR,     \
+                                           LIBAVUTIL_VERSION_MICRO)
+#define LIBAVUTIL_BUILD         LIBAVUTIL_VERSION_INT
+
+#define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
+
+/**
+ * @}
+ *
+ * @defgroup depr_guards Deprecation guards
+ * FF_API_* defines may be placed below to indicate public API that will be
+ * dropped at a future version bump. The defines themselves are not part of
+ * the public API and may change, break or disappear at any time.
+ *
+ * @{
+ */
+
+#ifndef FF_API_PIX_FMT
+#define FF_API_PIX_FMT                  (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_CONTEXT_SIZE
+#define FF_API_CONTEXT_SIZE             (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_PIX_FMT_DESC
+#define FF_API_PIX_FMT_DESC             (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_AV_REVERSE
+#define FF_API_AV_REVERSE               (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_AUDIOCONVERT
+#define FF_API_AUDIOCONVERT             (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_CPU_FLAG_MMX2
+#define FF_API_CPU_FLAG_MMX2            (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_LLS_PRIVATE
+#define FF_API_LLS_PRIVATE              (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_AVFRAME_LAVC
+#define FF_API_AVFRAME_LAVC             (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_VDPAU
+#define FF_API_VDPAU                    (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_XVMC
+#define FF_API_XVMC                     (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_VERSION_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/xtea.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/xtea.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/include/libavutil/xtea.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/include/libavutil/xtea.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,61 @@
+/*
+ * A 32-bit implementation of the XTEA algorithm
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_XTEA_H
+#define AVUTIL_XTEA_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_xtea XTEA
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+typedef struct AVXTEA {
+    uint32_t key[16];
+} AVXTEA;
+
+/**
+ * Initialize an AVXTEA context.
+ *
+ * @param ctx an AVXTEA context
+ * @param key a key of 16 bytes used for encryption/decryption
+ */
+void av_xtea_init(struct AVXTEA *ctx, const uint8_t key[16]);
+
+/**
+ * Encrypt or decrypt a buffer using a previously initialized context.
+ *
+ * @param ctx an AVXTEA context
+ * @param dst destination array, can be equal to src
+ * @param src source array, can be equal to dst
+ * @param count number of 8 byte blocks
+ * @param iv initialization vector for CBC mode, if NULL then ECB will be used
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+void av_xtea_crypt(struct AVXTEA *ctx, uint8_t *dst, const uint8_t *src,
+                   int count, uint8_t *iv, int decrypt);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_XTEA_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/libav55/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/libav55/moz.build	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,26 @@
+# -*- 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 += [
+    '../FFmpegAudioDecoder.cpp',
+    '../FFmpegDataDecoder.cpp',
+    '../FFmpegDecoderModule.cpp',
+    '../FFmpegH264Decoder.cpp',
+]
+LOCAL_INCLUDES += [
+    '..',
+    'include',
+]
+CXXFLAGS += [ '-Wno-deprecated-declarations' ]
+
+FINAL_LIBRARY = 'xul'
+
+FAIL_ON_WARNINGS = True
+
+if CONFIG['CLANG_CXX']:
+  CXXFLAGS += [
+    '-Wno-unknown-attributes',
+  ]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/README_mozilla firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/README_mozilla
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/ffmpeg/README_mozilla	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/ffmpeg/README_mozilla	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,11 @@
+These headers are taken from Libav versions 0.8.9, 0.9 and 1.0.
+
+These headers are licensed under the GNU Lesser General Public License version
+2.1. For more information see the file COPYING.LGPLv2.1
+
+While the function ABIs of FFmpeg/Libav tend to be stable between even major
+versions, the class layouts can change considerably. This can lead to major
+crashes if we build against the wrong headers. We include these headers to make
+sure we have the same version every time we build, and to ease the pain of
+acquiring the correct libraries for a build, especially for those distributions
+who oppose distributing such packages.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/gonk/GonkAudioDecoderManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/gonk/GonkAudioDecoderManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/gonk/GonkAudioDecoderManager.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/gonk/GonkAudioDecoderManager.cpp	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,310 @@
+/* -*- 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 "MediaCodecProxy.h"
+#include <OMX_IVCommon.h>
+#include <gui/Surface.h>
+#include <ICrypto.h>
+#include "GonkAudioDecoderManager.h"
+#include "MediaDecoderReader.h"
+#include "mp4_demuxer/Adts.h"
+#include "VideoUtils.h"
+#include "nsTArray.h"
+#include "mozilla/Logging.h"
+#include "stagefright/MediaBuffer.h"
+#include "stagefright/MetaData.h"
+#include "stagefright/MediaErrors.h"
+#include <stagefright/foundation/AMessage.h>
+#include <stagefright/foundation/ALooper.h>
+#include "media/openmax/OMX_Audio.h"
+#include "MediaData.h"
+#include "MediaInfo.h"
+
+#include <android/log.h>
+#define GADM_LOG(...) __android_log_print(ANDROID_LOG_DEBUG, "GonkAudioDecoderManager", __VA_ARGS__)
+
+PRLogModuleInfo* GetDemuxerLog();
+#define LOG(...) MOZ_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__))
+#define READ_OUTPUT_BUFFER_TIMEOUT_US  3000
+
+using namespace android;
+typedef android::MediaCodecProxy MediaCodecProxy;
+
+namespace mozilla {
+
+GonkAudioDecoderManager::GonkAudioDecoderManager(const AudioInfo& aConfig)
+  : mAudioChannels(aConfig.mChannels)
+  , mAudioRate(aConfig.mRate)
+  , mAudioProfile(aConfig.mProfile)
+  , mUseAdts(true)
+  , mAudioBuffer(nullptr)
+  , mMonitor("GonkAudioDecoderManager")
+{
+  MOZ_COUNT_CTOR(GonkAudioDecoderManager);
+  MOZ_ASSERT(mAudioChannels);
+  mCodecSpecificData = aConfig.mCodecSpecificConfig;
+  mMimeType = aConfig.mMimeType;
+
+  // Pass through mp3 without applying an ADTS header.
+  if (!aConfig.mMimeType.EqualsLiteral("audio/mp4a-latm")) {
+      mUseAdts = false;
+  }
+}
+
+GonkAudioDecoderManager::~GonkAudioDecoderManager()
+{
+  MOZ_COUNT_DTOR(GonkAudioDecoderManager);
+}
+
+android::sp<MediaCodecProxy>
+GonkAudioDecoderManager::Init(MediaDataDecoderCallback* aCallback)
+{
+  status_t rv = OK;
+  if (mLooper != nullptr) {
+    return nullptr;
+  }
+  // Create ALooper
+  mLooper = new ALooper;
+  mLooper->setName("GonkAudioDecoderManager");
+  mLooper->start();
+
+  mDecoder = MediaCodecProxy::CreateByType(mLooper, mMimeType.get(), false, nullptr);
+  if (!mDecoder.get()) {
+    return nullptr;
+  }
+  if (!mDecoder->AskMediaCodecAndWait())
+  {
+    mDecoder = nullptr;
+    return nullptr;
+  }
+  sp<AMessage> format = new AMessage;
+  // Fixed values
+  GADM_LOG("Configure audio mime type:%s, chan no:%d, sample-rate:%d", mMimeType.get(), mAudioChannels, mAudioRate);
+  format->setString("mime", mMimeType.get());
+  format->setInt32("channel-count", mAudioChannels);
+  format->setInt32("sample-rate", mAudioRate);
+  format->setInt32("aac-profile", mAudioProfile);
+  format->setInt32("is-adts", true);
+  status_t err = mDecoder->configure(format, nullptr, nullptr, 0);
+  if (err != OK || !mDecoder->Prepare()) {
+    return nullptr;
+  }
+
+  if (mMimeType.EqualsLiteral("audio/mp4a-latm")) {
+    rv = mDecoder->Input(mCodecSpecificData->Elements(), mCodecSpecificData->Length(), 0,
+                         android::MediaCodec::BUFFER_FLAG_CODECCONFIG);
+  }
+
+  if (rv == OK) {
+    return mDecoder;
+  } else {
+    GADM_LOG("Failed to input codec specific data!");
+    return nullptr;
+  }
+}
+
+bool
+GonkAudioDecoderManager::HasQueuedSample()
+{
+    MonitorAutoLock mon(mMonitor);
+    return mQueueSample.Length();
+}
+
+nsresult
+GonkAudioDecoderManager::Input(MediaRawData* aSample)
+{
+  MonitorAutoLock mon(mMonitor);
+  nsRefPtr<MediaRawData> sample;
+
+  if (aSample) {
+    sample = aSample;
+    if (!PerformFormatSpecificProcess(sample)) {
+      return NS_ERROR_FAILURE;
+    }
+  } else {
+    // It means EOS with empty sample.
+    sample = new MediaRawData();
+  }
+
+  mQueueSample.AppendElement(sample);
+
+  status_t rv;
+  while (mQueueSample.Length()) {
+    nsRefPtr<MediaRawData> data = mQueueSample.ElementAt(0);
+    {
+      MonitorAutoUnlock mon_exit(mMonitor);
+      rv = mDecoder->Input(reinterpret_cast<const uint8_t*>(data->mData),
+                           data->mSize,
+                           data->mTime,
+                           0);
+    }
+    if (rv == OK) {
+      mQueueSample.RemoveElementAt(0);
+    } else if (rv == -EAGAIN || rv == -ETIMEDOUT) {
+      // In most cases, EAGAIN or ETIMEOUT are safe because OMX can't fill
+      // buffer on time.
+      return NS_OK;
+    } else {
+      return NS_ERROR_UNEXPECTED;
+    }
+  }
+
+  return NS_OK;
+}
+
+bool
+GonkAudioDecoderManager::PerformFormatSpecificProcess(MediaRawData* aSample)
+{
+  if (aSample && mUseAdts) {
+    int8_t frequency_index =
+        mp4_demuxer::Adts::GetFrequencyIndex(mAudioRate);
+    bool rv = mp4_demuxer::Adts::ConvertSample(mAudioChannels,
+                                               frequency_index,
+                                               mAudioProfile,
+                                               aSample);
+    if (!rv) {
+      GADM_LOG("Failed to apply ADTS header");
+      return false;
+    }
+  }
+
+  return true;
+}
+
+nsresult
+GonkAudioDecoderManager::CreateAudioData(int64_t aStreamOffset, AudioData **v) {
+  if (!(mAudioBuffer != nullptr && mAudioBuffer->data() != nullptr)) {
+    GADM_LOG("Audio Buffer is not valid!");
+    return NS_ERROR_UNEXPECTED;
+  }
+
+  int64_t timeUs;
+  if (!mAudioBuffer->meta_data()->findInt64(kKeyTime, &timeUs)) {
+    return NS_ERROR_UNEXPECTED;
+  }
+
+  if (mAudioBuffer->range_length() == 0) {
+    // Some decoders may return spurious empty buffers that we just want to ignore
+    // quoted from Android's AwesomePlayer.cpp
+    ReleaseAudioBuffer();
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+
+  const uint8_t *data = static_cast<const uint8_t*>(mAudioBuffer->data());
+  size_t dataOffset = mAudioBuffer->range_offset();
+  size_t size = mAudioBuffer->range_length();
+
+  nsAutoArrayPtr<AudioDataValue> buffer(new AudioDataValue[size/2]);
+  memcpy(buffer.get(), data+dataOffset, size);
+  uint32_t frames = size / (2 * mAudioChannels);
+
+  CheckedInt64 duration = FramesToUsecs(frames, mAudioRate);
+  if (!duration.isValid()) {
+    return NS_ERROR_UNEXPECTED;
+  }
+  nsRefPtr<AudioData> audioData = new AudioData(aStreamOffset,
+                                                timeUs,
+                                                duration.value(),
+                                                frames,
+                                                buffer.forget(),
+                                                mAudioChannels,
+                                                mAudioRate);
+  ReleaseAudioBuffer();
+  audioData.forget(v);
+  return NS_OK;
+}
+
+nsresult
+GonkAudioDecoderManager::Flush()
+{
+  {
+    MonitorAutoLock mon(mMonitor);
+    mQueueSample.Clear();
+  }
+
+  if (mDecoder->flush() != OK) {
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+nsresult
+GonkAudioDecoderManager::Output(int64_t aStreamOffset,
+                                nsRefPtr<MediaData>& aOutData)
+{
+  aOutData = nullptr;
+  status_t err;
+  err = mDecoder->Output(&mAudioBuffer, READ_OUTPUT_BUFFER_TIMEOUT_US);
+
+  switch (err) {
+    case OK:
+    {
+      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;
+      } else if (rv != NS_OK || data == nullptr) {
+        return NS_ERROR_UNEXPECTED;
+      }
+      aOutData = data;
+      return NS_OK;
+    }
+    case android::INFO_FORMAT_CHANGED:
+    {
+      // If the format changed, update our cached info.
+      GADM_LOG("Decoder format changed");
+      return Output(aStreamOffset, aOutData);
+    }
+    case android::INFO_OUTPUT_BUFFERS_CHANGED:
+    {
+      GADM_LOG("Info Output Buffers Changed");
+      if (mDecoder->UpdateOutputBuffers()) {
+        return Output(aStreamOffset, aOutData);
+      }
+      return NS_ERROR_FAILURE;
+    }
+    case -EAGAIN:
+    {
+      return NS_ERROR_NOT_AVAILABLE;
+    }
+    case android::ERROR_END_OF_STREAM:
+    {
+      GADM_LOG("Got EOS frame!");
+      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;
+      } else if (rv != NS_OK || data == nullptr) {
+        GADM_LOG("Failed to create audio data!");
+        return NS_ERROR_UNEXPECTED;
+      }
+      aOutData = data;
+      return NS_ERROR_ABORT;
+    }
+    case -ETIMEDOUT:
+    {
+      GADM_LOG("Timeout. can try again next time");
+      return NS_ERROR_UNEXPECTED;
+    }
+    default:
+    {
+      GADM_LOG("Decoder failed, err=%d", err);
+      return NS_ERROR_UNEXPECTED;
+    }
+  }
+
+  return NS_OK;
+}
+
+void GonkAudioDecoderManager::ReleaseAudioBuffer() {
+  if (mAudioBuffer) {
+    mDecoder->ReleaseMediaBuffer(mAudioBuffer);
+    mAudioBuffer = nullptr;
+  }
+}
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/gonk/GonkAudioDecoderManager.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/gonk/GonkAudioDecoderManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/gonk/GonkAudioDecoderManager.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/gonk/GonkAudioDecoderManager.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,71 @@
+/* -*- 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(GonkAudioDecoderManager_h_)
+#define GonkAudioDecoderManager_h_
+
+#include "mozilla/RefPtr.h"
+#include "GonkMediaDataDecoder.h"
+
+using namespace android;
+
+namespace android {
+struct MOZ_EXPORT ALooper;
+class MOZ_EXPORT MediaBuffer;
+} // namespace android
+
+namespace mozilla {
+
+class GonkAudioDecoderManager : public GonkDecoderManager {
+typedef android::MediaCodecProxy MediaCodecProxy;
+public:
+  GonkAudioDecoderManager(const AudioInfo& aConfig);
+
+  virtual ~GonkAudioDecoderManager() override;
+
+  virtual android::sp<MediaCodecProxy> Init(MediaDataDecoderCallback* aCallback) override;
+
+  virtual nsresult Input(MediaRawData* aSample) override;
+
+  virtual nsresult Output(int64_t aStreamOffset,
+                          nsRefPtr<MediaData>& aOutput) override;
+
+  virtual nsresult Flush() override;
+
+  virtual bool HasQueuedSample() override;
+
+private:
+  bool PerformFormatSpecificProcess(MediaRawData* aSample);
+
+  nsresult CreateAudioData(int64_t aStreamOffset,
+                              AudioData** aOutData);
+
+  void ReleaseAudioBuffer();
+
+  const uint32_t mAudioChannels;
+  const uint32_t mAudioRate;
+  const uint32_t mAudioProfile;
+  bool mUseAdts;
+
+  MediaDataDecoderCallback*  mReaderCallback;
+  android::MediaBuffer* mAudioBuffer;
+  android::sp<ALooper> mLooper;
+
+  // MediaCodedc's wrapper that performs the decoding.
+  android::sp<android::MediaCodecProxy> mDecoder;
+
+  // This monitor protects mQueueSample.
+  Monitor mMonitor;
+
+  // An queue with the MP4 samples which are waiting to be sent into OMX.
+  // If an element is an empty MP4Sample, that menas EOS. There should not
+  // any sample be queued after EOS.
+  nsTArray<nsRefPtr<MediaRawData>> mQueueSample;
+};
+
+} // namespace mozilla
+
+#endif // GonkAudioDecoderManager_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/gonk/GonkDecoderModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/gonk/GonkDecoderModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/gonk/GonkDecoderModule.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/gonk/GonkDecoderModule.cpp	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,73 @@
+/* -*- 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 "GonkDecoderModule.h"
+#include "GonkVideoDecoderManager.h"
+#include "GonkAudioDecoderManager.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/DebugOnly.h"
+#include "GonkMediaDataDecoder.h"
+
+namespace mozilla {
+GonkDecoderModule::GonkDecoderModule()
+{
+}
+
+GonkDecoderModule::~GonkDecoderModule()
+{
+}
+
+/* static */
+void
+GonkDecoderModule::Init()
+{
+  MOZ_ASSERT(NS_IsMainThread(), "Must be on main thread.");
+}
+
+already_AddRefed<MediaDataDecoder>
+GonkDecoderModule::CreateVideoDecoder(const VideoInfo& aConfig,
+                                     mozilla::layers::LayersBackend aLayersBackend,
+                                     mozilla::layers::ImageContainer* aImageContainer,
+                                     FlushableMediaTaskQueue* aVideoTaskQueue,
+                                     MediaDataDecoderCallback* aCallback)
+{
+  nsRefPtr<MediaDataDecoder> decoder =
+  new GonkMediaDataDecoder(new GonkVideoDecoderManager(aImageContainer, aConfig),
+                           aVideoTaskQueue, aCallback);
+  return decoder.forget();
+}
+
+already_AddRefed<MediaDataDecoder>
+GonkDecoderModule::CreateAudioDecoder(const AudioInfo& aConfig,
+                                      FlushableMediaTaskQueue* aAudioTaskQueue,
+                                      MediaDataDecoderCallback* aCallback)
+{
+  nsRefPtr<MediaDataDecoder> decoder =
+  new GonkMediaDataDecoder(new GonkAudioDecoderManager(aConfig),
+                           aAudioTaskQueue, aCallback);
+  return decoder.forget();
+}
+
+PlatformDecoderModule::ConversionRequired
+GonkDecoderModule::DecoderNeedsConversion(const TrackInfo& aConfig) const
+{
+  if (aConfig.IsVideo()) {
+    return kNeedAnnexB;
+  } else {
+    return kNeedNone;
+  }
+}
+
+bool
+GonkDecoderModule::SupportsMimeType(const nsACString& aMimeType)
+{
+  return aMimeType.EqualsLiteral("audio/mp4a-latm") ||
+    aMimeType.EqualsLiteral("audio/3gpp") ||
+    aMimeType.EqualsLiteral("audio/amr-wb") ||
+    aMimeType.EqualsLiteral("video/mp4") ||
+    aMimeType.EqualsLiteral("video/mp4v-es") ||
+    aMimeType.EqualsLiteral("video/avc");
+}
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/gonk/GonkDecoderModule.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/gonk/GonkDecoderModule.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/gonk/GonkDecoderModule.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/gonk/GonkDecoderModule.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,44 @@
+/* -*- 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(GonkPlatformDecoderModule_h_)
+#define GonkPlatformDecoderModule_h_
+
+#include "PlatformDecoderModule.h"
+
+namespace mozilla {
+
+class GonkDecoderModule : public PlatformDecoderModule {
+public:
+  GonkDecoderModule();
+  virtual ~GonkDecoderModule();
+
+  // Decode thread.
+  virtual already_AddRefed<MediaDataDecoder>
+  CreateVideoDecoder(const VideoInfo& aConfig,
+                     mozilla::layers::LayersBackend aLayersBackend,
+                     mozilla::layers::ImageContainer* aImageContainer,
+                     FlushableMediaTaskQueue* aVideoTaskQueue,
+                     MediaDataDecoderCallback* aCallback) override;
+
+  // Decode thread.
+  virtual already_AddRefed<MediaDataDecoder>
+  CreateAudioDecoder(const AudioInfo& aConfig,
+                     FlushableMediaTaskQueue* aAudioTaskQueue,
+                     MediaDataDecoderCallback* aCallback) override;
+
+  static void Init();
+
+  virtual ConversionRequired
+  DecoderNeedsConversion(const TrackInfo& aConfig) const override;
+
+  virtual bool SupportsMimeType(const nsACString& aMimeType) override;
+
+};
+
+} // namespace mozilla
+
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/gonk/GonkMediaDataDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/gonk/GonkMediaDataDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/gonk/GonkMediaDataDecoder.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/gonk/GonkMediaDataDecoder.cpp	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,171 @@
+/* -*- 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 "GonkMediaDataDecoder.h"
+#include "VideoUtils.h"
+#include "nsTArray.h"
+#include "MediaCodecProxy.h"
+#include "MediaData.h"
+
+#include "mozilla/Logging.h"
+#include <android/log.h>
+#define GMDD_LOG(...) __android_log_print(ANDROID_LOG_DEBUG, "GonkMediaDataDecoder", __VA_ARGS__)
+
+PRLogModuleInfo* GetDemuxerLog();
+#define LOG(...) MOZ_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__))
+
+using namespace android;
+
+namespace mozilla {
+
+GonkMediaDataDecoder::GonkMediaDataDecoder(GonkDecoderManager* aManager,
+                                           FlushableMediaTaskQueue* aTaskQueue,
+                                           MediaDataDecoderCallback* aCallback)
+  : mTaskQueue(aTaskQueue)
+  , mCallback(aCallback)
+  , mManager(aManager)
+  , mSignaledEOS(false)
+  , mDrainComplete(false)
+{
+  MOZ_COUNT_CTOR(GonkMediaDataDecoder);
+}
+
+GonkMediaDataDecoder::~GonkMediaDataDecoder()
+{
+  MOZ_COUNT_DTOR(GonkMediaDataDecoder);
+}
+
+nsresult
+GonkMediaDataDecoder::Init()
+{
+  sp<MediaCodecProxy> decoder;
+  decoder = mManager->Init(mCallback);
+  mDecoder = decoder;
+  mDrainComplete = false;
+
+  return NS_OK;
+}
+
+nsresult
+GonkMediaDataDecoder::Shutdown()
+{
+  if (!mDecoder.get()) {
+    return NS_OK;
+  }
+
+  mDecoder->stop();
+  mDecoder->ReleaseMediaResources();
+  mDecoder = nullptr;
+  return NS_OK;
+}
+
+// Inserts data into the decoder's pipeline.
+nsresult
+GonkMediaDataDecoder::Input(MediaRawData* aSample)
+{
+  nsCOMPtr<nsIRunnable> runnable(
+    NS_NewRunnableMethodWithArg<nsRefPtr<MediaRawData>>(
+      this,
+      &GonkMediaDataDecoder::ProcessDecode,
+      nsRefPtr<MediaRawData>(aSample)));
+  mTaskQueue->Dispatch(runnable.forget());
+  return NS_OK;
+}
+
+void
+GonkMediaDataDecoder::ProcessDecode(MediaRawData* aSample)
+{
+  nsresult rv = mManager->Input(aSample);
+  if (rv != NS_OK) {
+    NS_WARNING("GonkMediaDataDecoder failed to input data");
+    GMDD_LOG("Failed to input data err: %d",int(rv));
+    mCallback->Error();
+    return;
+  }
+  if (aSample) {
+    mLastStreamOffset = aSample->mOffset;
+  }
+  ProcessOutput();
+}
+
+void
+GonkMediaDataDecoder::ProcessOutput()
+{
+  nsRefPtr<MediaData> output;
+  nsresult rv = NS_ERROR_ABORT;
+
+  while (!mDrainComplete) {
+    // There are samples in queue, try to send them into decoder when EOS.
+    if (mSignaledEOS && mManager->HasQueuedSample()) {
+      GMDD_LOG("ProcessOutput: drain all input samples");
+      rv = mManager->Input(nullptr);
+    }
+    rv = mManager->Output(mLastStreamOffset, output);
+    if (rv == NS_OK) {
+      mCallback->Output(output);
+      continue;
+    } else if (rv == NS_ERROR_NOT_AVAILABLE && mSignaledEOS) {
+      // Try to get more frames before getting EOS frame
+      continue;
+    }
+    else {
+      break;
+    }
+  }
+
+  if (rv == NS_ERROR_NOT_AVAILABLE && !mSignaledEOS) {
+    mCallback->InputExhausted();
+    return;
+  }
+  if (rv != NS_OK) {
+    NS_WARNING("GonkMediaDataDecoder failed to output data");
+    GMDD_LOG("Failed to output data");
+    // GonkDecoderManangers report NS_ERROR_ABORT when EOS is reached.
+    if (rv == NS_ERROR_ABORT) {
+      if (output) {
+        mCallback->Output(output);
+      }
+      mCallback->DrainComplete();
+      MOZ_ASSERT_IF(mSignaledEOS, !mManager->HasQueuedSample());
+      mSignaledEOS = false;
+      mDrainComplete = true;
+      return;
+    }
+    GMDD_LOG("Callback error!");
+    mCallback->Error();
+  }
+}
+
+nsresult
+GonkMediaDataDecoder::Flush()
+{
+  // Flush the input task queue. This cancels all pending Decode() calls.
+  // Note this blocks until the task queue finishes its current job, if
+  // it's executing at all. Note the MP4Reader ignores all output while
+  // flushing.
+  mTaskQueue->Flush();
+  mDrainComplete = false;
+  return mManager->Flush();
+}
+
+void
+GonkMediaDataDecoder::ProcessDrain()
+{
+  // Notify decoder input EOS by sending a null data.
+  ProcessDecode(nullptr);
+  mSignaledEOS = true;
+  ProcessOutput();
+}
+
+nsresult
+GonkMediaDataDecoder::Drain()
+{
+  nsCOMPtr<nsIRunnable> runnable =
+    NS_NewRunnableMethod(this, &GonkMediaDataDecoder::ProcessDrain);
+  mTaskQueue->Dispatch(runnable.forget());
+  return NS_OK;
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/gonk/GonkMediaDataDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/gonk/GonkMediaDataDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/gonk/GonkMediaDataDecoder.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/gonk/GonkMediaDataDecoder.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,107 @@
+/* -*- 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(GonkMediaDataDecoder_h_)
+#define GonkMediaDataDecoder_h_
+#include "PlatformDecoderModule.h"
+
+namespace android {
+class MediaCodecProxy;
+} // namespace android
+
+namespace mozilla {
+class MediaRawData;
+
+// Manage the data flow from inputting encoded data and outputting decode data.
+class GonkDecoderManager {
+public:
+  virtual ~GonkDecoderManager() {}
+
+  // Creates and initializs the GonkDecoder.
+  // Returns nullptr on failure.
+  virtual android::sp<android::MediaCodecProxy> Init(MediaDataDecoderCallback* aCallback) = 0;
+
+  // Add samples into OMX decoder or queue them if decoder is out of input buffer.
+  virtual nsresult Input(MediaRawData* aSample) = 0;
+
+  // Produces decoded output, it blocks until output can be produced or a timeout
+  // is expired or until EOS. Returns NS_OK on success, or NS_ERROR_NOT_AVAILABLE
+  // if there's not enough data to produce more output. If this returns a failure
+  // code other than NS_ERROR_NOT_AVAILABLE, an error will be reported to the
+  // MP4Reader.
+  // The overrided class should follow the same behaviour.
+  virtual nsresult Output(int64_t aStreamOffset,
+                          nsRefPtr<MediaData>& aOutput) = 0;
+
+  // Flush the queued sample.
+  virtual nsresult Flush() = 0;
+
+  // True if sample is queued.
+  virtual bool HasQueuedSample() = 0;
+
+protected:
+  nsRefPtr<MediaByteBuffer> mCodecSpecificData;
+
+  nsAutoCString mMimeType;
+};
+
+// Samples are decoded using the GonkDecoder (MediaCodec)
+// created by the GonkDecoderManager. This class implements
+// the higher-level logic that drives mapping the Gonk to the async
+// MediaDataDecoder interface. The specifics of decoding the exact stream
+// type are handled by GonkDecoderManager and the GonkDecoder it creates.
+class GonkMediaDataDecoder : public MediaDataDecoder {
+public:
+  GonkMediaDataDecoder(GonkDecoderManager* aDecoderManager,
+                       FlushableMediaTaskQueue* aTaskQueue,
+                       MediaDataDecoderCallback* aCallback);
+
+  ~GonkMediaDataDecoder();
+
+  virtual nsresult Init() override;
+
+  virtual nsresult Input(MediaRawData* aSample);
+
+  virtual nsresult Flush() override;
+
+  virtual nsresult Drain() override;
+
+  virtual nsresult Shutdown() override;
+
+private:
+
+  // Called on the task queue. Inserts the sample into the decoder, and
+  // extracts output if available, if aSample is null, it means there is
+  // no data from source, it will notify the decoder EOS and flush all the
+  // decoded frames.
+  void ProcessDecode(MediaRawData* aSample);
+
+  // Called on the task queue. Extracts output if available, and delivers
+  // it to the reader. Called after ProcessDecode() and ProcessDrain().
+  void ProcessOutput();
+
+  // Called on the task queue. Orders the Gonk to drain, and then extracts
+  // all available output.
+  void ProcessDrain();
+
+  RefPtr<FlushableMediaTaskQueue> mTaskQueue;
+  MediaDataDecoderCallback* mCallback;
+
+  android::sp<android::MediaCodecProxy> mDecoder;
+  nsAutoPtr<GonkDecoderManager> mManager;
+
+  // The last offset into the media resource that was passed into Input().
+  // This is used to approximate the decoder's position in the media resource.
+  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
+
+#endif // GonkMediaDataDecoder_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/gonk/GonkVideoDecoderManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/gonk/GonkVideoDecoderManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/gonk/GonkVideoDecoderManager.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/gonk/GonkVideoDecoderManager.cpp	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,615 @@
+/* -*- 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 "MediaCodecProxy.h"
+#include <OMX_IVCommon.h>
+#include <gui/Surface.h>
+#include <ICrypto.h>
+#include "GonkVideoDecoderManager.h"
+#include "MediaDecoderReader.h"
+#include "ImageContainer.h"
+#include "VideoUtils.h"
+#include "nsThreadUtils.h"
+#include "Layers.h"
+#include "mozilla/Logging.h"
+#include "stagefright/MediaBuffer.h"
+#include "stagefright/MetaData.h"
+#include "stagefright/MediaErrors.h"
+#include <stagefright/foundation/ADebug.h>
+#include <stagefright/foundation/AMessage.h>
+#include <stagefright/foundation/AString.h>
+#include <stagefright/foundation/ALooper.h>
+#include "GonkNativeWindow.h"
+#include "GonkNativeWindowClient.h"
+#include "mozilla/layers/GrallocTextureClient.h"
+#include "mozilla/layers/TextureClient.h"
+
+#define READ_OUTPUT_BUFFER_TIMEOUT_US  3000
+
+#include <android/log.h>
+#define GVDM_LOG(...) __android_log_print(ANDROID_LOG_DEBUG, "GonkVideoDecoderManager", __VA_ARGS__)
+
+PRLogModuleInfo* GetDemuxerLog();
+#define LOG(...) MOZ_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__))
+using namespace mozilla::layers;
+using namespace android;
+typedef android::MediaCodecProxy MediaCodecProxy;
+
+namespace mozilla {
+
+GonkVideoDecoderManager::GonkVideoDecoderManager(
+  mozilla::layers::ImageContainer* aImageContainer,
+  const VideoInfo& aConfig)
+  : mImageContainer(aImageContainer)
+  , mReaderCallback(nullptr)
+  , mLastDecodedTime(0)
+  , mColorConverterBufferSize(0)
+  , mNativeWindow(nullptr)
+  , mPendingVideoBuffersLock("GonkVideoDecoderManager::mPendingVideoBuffersLock")
+  , mMonitor("GonkVideoDecoderManager")
+{
+  MOZ_COUNT_CTOR(GonkVideoDecoderManager);
+  mMimeType = aConfig.mMimeType;
+  mVideoWidth  = aConfig.mDisplay.width;
+  mVideoHeight = aConfig.mDisplay.height;
+  mDisplayWidth = aConfig.mDisplay.width;
+  mDisplayHeight = aConfig.mDisplay.height;
+  mInfo.mVideo = aConfig;
+
+  mCodecSpecificData = aConfig.mCodecSpecificConfig;
+  nsIntRect pictureRect(0, 0, mVideoWidth, mVideoHeight);
+  nsIntSize frameSize(mVideoWidth, mVideoHeight);
+  mPicture = pictureRect;
+  mInitialFrame = frameSize;
+  mHandler = new MessageHandler(this);
+  mVideoListener = new VideoResourceListener(this);
+
+}
+
+GonkVideoDecoderManager::~GonkVideoDecoderManager()
+{
+  MOZ_COUNT_DTOR(GonkVideoDecoderManager);
+}
+
+android::sp<MediaCodecProxy>
+GonkVideoDecoderManager::Init(MediaDataDecoderCallback* aCallback)
+{
+  nsIntSize displaySize(mDisplayWidth, mDisplayHeight);
+  nsIntRect pictureRect(0, 0, mVideoWidth, mVideoHeight);
+  // Validate the container-reported frame and pictureRect sizes. This ensures
+  // that our video frame creation code doesn't overflow.
+  nsIntSize frameSize(mVideoWidth, mVideoHeight);
+  if (!IsValidVideoRegion(frameSize, pictureRect, displaySize)) {
+    GVDM_LOG("It is not a valid region");
+    return nullptr;
+  }
+
+  mReaderCallback = aCallback;
+
+  if (mLooper.get() != nullptr) {
+    return nullptr;
+  }
+  // Create ALooper
+  mLooper = new ALooper;
+  mManagerLooper = new ALooper;
+  mManagerLooper->setName("GonkVideoDecoderManager");
+  // Register AMessage handler to ALooper.
+  mManagerLooper->registerHandler(mHandler);
+  // Start ALooper thread.
+  if (mLooper->start() != OK || mManagerLooper->start() != OK ) {
+    return nullptr;
+  }
+  mDecoder = MediaCodecProxy::CreateByType(mLooper, mMimeType.get(), false, mVideoListener);
+  mDecoder->AskMediaCodecAndWait();
+  uint32_t capability = MediaCodecProxy::kEmptyCapability;
+  if (mDecoder->getCapability(&capability) == OK && (capability &
+      MediaCodecProxy::kCanExposeGraphicBuffer)) {
+    mNativeWindow = new GonkNativeWindow();
+  }
+
+  return mDecoder;
+}
+
+nsresult
+GonkVideoDecoderManager::Input(MediaRawData* aSample)
+{
+  MonitorAutoLock mon(mMonitor);
+  nsRefPtr<MediaRawData> sample;
+
+  if (!aSample) {
+    // It means EOS with empty sample.
+    sample = new MediaRawData();
+  } else {
+    sample = aSample;
+  }
+
+  mQueueSample.AppendElement(sample);
+
+  status_t rv;
+  while (mQueueSample.Length()) {
+    nsRefPtr<MediaRawData> data = mQueueSample.ElementAt(0);
+    {
+      MonitorAutoUnlock mon_unlock(mMonitor);
+      rv = mDecoder->Input(reinterpret_cast<const uint8_t*>(data->mData),
+                           data->mSize,
+                           data->mTime,
+                           0);
+    }
+    if (rv == OK) {
+      mQueueSample.RemoveElementAt(0);
+    } else if (rv == -EAGAIN || rv == -ETIMEDOUT) {
+      // In most cases, EAGAIN or ETIMEOUT are safe because OMX can't fill
+      // buffer on time.
+      return NS_OK;
+    } else {
+      return NS_ERROR_UNEXPECTED;
+    }
+  }
+
+  return NS_OK;
+}
+
+bool
+GonkVideoDecoderManager::HasQueuedSample()
+{
+    MonitorAutoLock mon(mMonitor);
+    return mQueueSample.Length();
+}
+
+nsresult
+GonkVideoDecoderManager::CreateVideoData(int64_t aStreamOffset, VideoData **v)
+{
+  *v = nullptr;
+  nsRefPtr<VideoData> data;
+  int64_t timeUs;
+  int32_t keyFrame;
+
+  if (mVideoBuffer == nullptr) {
+    GVDM_LOG("Video Buffer is not valid!");
+    return NS_ERROR_UNEXPECTED;
+  }
+
+  if (!mVideoBuffer->meta_data()->findInt64(kKeyTime, &timeUs)) {
+    ReleaseVideoBuffer();
+    GVDM_LOG("Decoder did not return frame time");
+    return NS_ERROR_UNEXPECTED;
+  }
+
+  if (mLastDecodedTime > timeUs) {
+    ReleaseVideoBuffer();
+    GVDM_LOG("Output decoded sample time is revert. time=%lld", timeUs);
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+  mLastDecodedTime = timeUs;
+
+  if (mVideoBuffer->range_length() == 0) {
+    // Some decoders may return spurious empty buffers that we just want to ignore
+    // quoted from Android's AwesomePlayer.cpp
+    ReleaseVideoBuffer();
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+
+  if (!mVideoBuffer->meta_data()->findInt32(kKeyIsSyncFrame, &keyFrame)) {
+    keyFrame = 0;
+  }
+
+  gfx::IntRect picture = mPicture;
+  if (mFrameInfo.mWidth != mInitialFrame.width ||
+      mFrameInfo.mHeight != mInitialFrame.height) {
+
+    // Frame size is different from what the container reports. This is legal,
+    // 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 * mFrameInfo.mWidth) / mInitialFrame.width;
+    picture.y = (mPicture.y * mFrameInfo.mHeight) / mInitialFrame.height;
+    picture.width = (mFrameInfo.mWidth * mPicture.width) / mInitialFrame.width;
+    picture.height = (mFrameInfo.mHeight * mPicture.height) / mInitialFrame.height;
+  }
+
+  RefPtr<mozilla::layers::TextureClient> textureClient;
+
+  if ((mVideoBuffer->graphicBuffer().get())) {
+    textureClient = mNativeWindow->getTextureClientFromBuffer(mVideoBuffer->graphicBuffer().get());
+  }
+
+  if (textureClient) {
+    GrallocTextureClientOGL* grallocClient = static_cast<GrallocTextureClientOGL*>(textureClient.get());
+    grallocClient->SetMediaBuffer(mVideoBuffer);
+    textureClient->SetRecycleCallback(GonkVideoDecoderManager::RecycleCallback, this);
+
+    data = VideoData::Create(mInfo.mVideo,
+                             mImageContainer,
+                             aStreamOffset,
+                             timeUs,
+                             1, // No way to pass sample duration from muxer to
+                                // OMX codec, so we hardcode the duration here.
+                             textureClient,
+                             keyFrame,
+                             -1,
+                             picture);
+  } else {
+    if (!mVideoBuffer->data()) {
+      GVDM_LOG("No data in Video Buffer!");
+      return NS_ERROR_UNEXPECTED;
+    }
+    uint8_t *yuv420p_buffer = (uint8_t *)mVideoBuffer->data();
+    int32_t stride = mFrameInfo.mStride;
+    int32_t slice_height = mFrameInfo.mSliceHeight;
+
+    // Converts to OMX_COLOR_FormatYUV420Planar
+    if (mFrameInfo.mColorFormat != OMX_COLOR_FormatYUV420Planar) {
+      ARect crop;
+      crop.top = 0;
+      crop.bottom = mFrameInfo.mHeight;
+      crop.left = 0;
+      crop.right = mFrameInfo.mWidth;
+      yuv420p_buffer = GetColorConverterBuffer(mFrameInfo.mWidth, mFrameInfo.mHeight);
+      if (mColorConverter.convertDecoderOutputToI420(mVideoBuffer->data(),
+          mFrameInfo.mWidth, mFrameInfo.mHeight, crop, yuv420p_buffer) != OK) {
+          ReleaseVideoBuffer();
+          GVDM_LOG("Color conversion failed!");
+          return NS_ERROR_UNEXPECTED;
+      }
+        stride = mFrameInfo.mWidth;
+        slice_height = mFrameInfo.mHeight;
+    }
+
+    size_t yuv420p_y_size = stride * slice_height;
+    size_t yuv420p_u_size = ((stride + 1) / 2) * ((slice_height + 1) / 2);
+    uint8_t *yuv420p_y = yuv420p_buffer;
+    uint8_t *yuv420p_u = yuv420p_y + yuv420p_y_size;
+    uint8_t *yuv420p_v = yuv420p_u + yuv420p_u_size;
+
+    // This is the approximate byte position in the stream.
+    int64_t pos = aStreamOffset;
+
+    VideoData::YCbCrBuffer b;
+    b.mPlanes[0].mData = yuv420p_y;
+    b.mPlanes[0].mWidth = mFrameInfo.mWidth;
+    b.mPlanes[0].mHeight = mFrameInfo.mHeight;
+    b.mPlanes[0].mStride = stride;
+    b.mPlanes[0].mOffset = 0;
+    b.mPlanes[0].mSkip = 0;
+
+    b.mPlanes[1].mData = yuv420p_u;
+    b.mPlanes[1].mWidth = (mFrameInfo.mWidth + 1) / 2;
+    b.mPlanes[1].mHeight = (mFrameInfo.mHeight + 1) / 2;
+    b.mPlanes[1].mStride = (stride + 1) / 2;
+    b.mPlanes[1].mOffset = 0;
+    b.mPlanes[1].mSkip = 0;
+
+    b.mPlanes[2].mData = yuv420p_v;
+    b.mPlanes[2].mWidth =(mFrameInfo.mWidth + 1) / 2;
+    b.mPlanes[2].mHeight = (mFrameInfo.mHeight + 1) / 2;
+    b.mPlanes[2].mStride = (stride + 1) / 2;
+    b.mPlanes[2].mOffset = 0;
+    b.mPlanes[2].mSkip = 0;
+
+    data = VideoData::Create(
+        mInfo.mVideo,
+        mImageContainer,
+        pos,
+        timeUs,
+        1, // We don't know the duration.
+        b,
+        keyFrame,
+        -1,
+        picture);
+    ReleaseVideoBuffer();
+  }
+
+  data.forget(v);
+  return NS_OK;
+}
+
+bool
+GonkVideoDecoderManager::SetVideoFormat()
+{
+  // read video metadata from MediaCodec
+  sp<AMessage> codecFormat;
+  if (mDecoder->getOutputFormat(&codecFormat) == OK) {
+    AString mime;
+    int32_t width = 0;
+    int32_t height = 0;
+    int32_t stride = 0;
+    int32_t slice_height = 0;
+    int32_t color_format = 0;
+    int32_t crop_left = 0;
+    int32_t crop_top = 0;
+    int32_t crop_right = 0;
+    int32_t crop_bottom = 0;
+    if (!codecFormat->findString("mime", &mime) ||
+        !codecFormat->findInt32("width", &width) ||
+        !codecFormat->findInt32("height", &height) ||
+        !codecFormat->findInt32("stride", &stride) ||
+        !codecFormat->findInt32("slice-height", &slice_height) ||
+        !codecFormat->findInt32("color-format", &color_format) ||
+        !codecFormat->findRect("crop", &crop_left, &crop_top, &crop_right, &crop_bottom)) {
+      GVDM_LOG("Failed to find values");
+      return false;
+    }
+    mFrameInfo.mWidth = width;
+    mFrameInfo.mHeight = height;
+    mFrameInfo.mStride = stride;
+    mFrameInfo.mSliceHeight = slice_height;
+    mFrameInfo.mColorFormat = color_format;
+
+    nsIntSize displaySize(width, height);
+    if (!IsValidVideoRegion(mInitialFrame, mPicture, displaySize)) {
+      GVDM_LOG("It is not a valid region");
+      return false;
+    }
+    return true;
+  }
+  GVDM_LOG("Fail to get output format");
+  return false;
+}
+
+nsresult
+GonkVideoDecoderManager::Flush()
+{
+  {
+    MonitorAutoLock mon(mMonitor);
+    mQueueSample.Clear();
+  }
+
+ mLastDecodedTime = 0;
+
+  if (mDecoder->flush() != OK) {
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+// Blocks until decoded sample is produced by the deoder.
+nsresult
+GonkVideoDecoderManager::Output(int64_t aStreamOffset,
+                                nsRefPtr<MediaData>& aOutData)
+{
+  aOutData = nullptr;
+  status_t err;
+  if (mDecoder == nullptr) {
+    GVDM_LOG("Decoder is not inited");
+    return NS_ERROR_UNEXPECTED;
+  }
+  err = mDecoder->Output(&mVideoBuffer, READ_OUTPUT_BUFFER_TIMEOUT_US);
+
+  switch (err) {
+    case OK:
+    {
+      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;
+      } else if (rv != NS_OK || data == nullptr) {
+        GVDM_LOG("Failed to create VideoData");
+        return NS_ERROR_UNEXPECTED;
+      }
+      aOutData = data;
+      return NS_OK;
+    }
+    case android::INFO_FORMAT_CHANGED:
+    {
+      // If the format changed, update our cached info.
+      GVDM_LOG("Decoder format changed");
+      if (!SetVideoFormat()) {
+        return NS_ERROR_UNEXPECTED;
+      }
+      return Output(aStreamOffset, aOutData);
+    }
+    case android::INFO_OUTPUT_BUFFERS_CHANGED:
+    {
+      if (mDecoder->UpdateOutputBuffers()) {
+        return Output(aStreamOffset, aOutData);
+      }
+      GVDM_LOG("Fails to update output buffers!");
+      return NS_ERROR_FAILURE;
+    }
+    case -EAGAIN:
+    {
+//      GVDM_LOG("Need to try again!");
+      return NS_ERROR_NOT_AVAILABLE;
+    }
+    case android::ERROR_END_OF_STREAM:
+    {
+      GVDM_LOG("Got the EOS frame!");
+      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;
+      }
+      if (rv != NS_OK || data == nullptr) {
+        GVDM_LOG("Failed to create video data");
+        return NS_ERROR_UNEXPECTED;
+      }
+      aOutData = data;
+      return NS_ERROR_ABORT;
+    }
+    case -ETIMEDOUT:
+    {
+      GVDM_LOG("Timeout. can try again next time");
+      return NS_ERROR_UNEXPECTED;
+    }
+    default:
+    {
+      GVDM_LOG("Decoder failed, err=%d", err);
+      return NS_ERROR_UNEXPECTED;
+    }
+  }
+
+  return NS_OK;
+}
+
+void GonkVideoDecoderManager::ReleaseVideoBuffer() {
+  if (mVideoBuffer) {
+    mDecoder->ReleaseMediaBuffer(mVideoBuffer);
+    mVideoBuffer = nullptr;
+  }
+}
+
+void
+GonkVideoDecoderManager::codecReserved()
+{
+  GVDM_LOG("codecReserved");
+  sp<AMessage> format = new AMessage;
+  sp<Surface> surface;
+  status_t rv = OK;
+  // Fixed values
+  GVDM_LOG("Configure video mime type: %s, widht:%d, height:%d", mMimeType.get(), mVideoWidth, mVideoHeight);
+  format->setString("mime", mMimeType.get());
+  format->setInt32("width", mVideoWidth);
+  format->setInt32("height", mVideoHeight);
+  if (mNativeWindow != nullptr) {
+    surface = new Surface(mNativeWindow->getBufferQueue());
+  }
+  mDecoder->configure(format, surface, nullptr, 0);
+  mDecoder->Prepare();
+
+  if (mMimeType.EqualsLiteral("video/mp4v-es")) {
+    rv = mDecoder->Input(mCodecSpecificData->Elements(),
+                         mCodecSpecificData->Length(), 0,
+                         android::MediaCodec::BUFFER_FLAG_CODECCONFIG);
+  }
+
+  if (rv != OK) {
+    GVDM_LOG("Failed to configure codec!!!!");
+    mReaderCallback->Error();
+  }
+}
+
+void
+GonkVideoDecoderManager::codecCanceled()
+{
+  mDecoder = nullptr;
+}
+
+// Called on GonkVideoDecoderManager::mManagerLooper thread.
+void
+GonkVideoDecoderManager::onMessageReceived(const sp<AMessage> &aMessage)
+{
+  switch (aMessage->what()) {
+    case kNotifyPostReleaseBuffer:
+    {
+      ReleaseAllPendingVideoBuffers();
+      break;
+    }
+
+    default:
+      TRESPASS();
+      break;
+  }
+}
+
+GonkVideoDecoderManager::MessageHandler::MessageHandler(GonkVideoDecoderManager *aManager)
+  : mManager(aManager)
+{
+}
+
+GonkVideoDecoderManager::MessageHandler::~MessageHandler()
+{
+  mManager = nullptr;
+}
+
+void
+GonkVideoDecoderManager::MessageHandler::onMessageReceived(const android::sp<android::AMessage> &aMessage)
+{
+  if (mManager != nullptr) {
+    mManager->onMessageReceived(aMessage);
+  }
+}
+
+GonkVideoDecoderManager::VideoResourceListener::VideoResourceListener(GonkVideoDecoderManager *aManager)
+  : mManager(aManager)
+{
+}
+
+GonkVideoDecoderManager::VideoResourceListener::~VideoResourceListener()
+{
+  mManager = nullptr;
+}
+
+void
+GonkVideoDecoderManager::VideoResourceListener::codecReserved()
+{
+  if (mManager != nullptr) {
+    mManager->codecReserved();
+  }
+}
+
+void
+GonkVideoDecoderManager::VideoResourceListener::codecCanceled()
+{
+  if (mManager != nullptr) {
+    mManager->codecCanceled();
+  }
+}
+
+uint8_t *
+GonkVideoDecoderManager::GetColorConverterBuffer(int32_t aWidth, int32_t aHeight)
+{
+  // Allocate a temporary YUV420Planer buffer.
+  size_t yuv420p_y_size = aWidth * aHeight;
+  size_t yuv420p_u_size = ((aWidth + 1) / 2) * ((aHeight + 1) / 2);
+  size_t yuv420p_v_size = yuv420p_u_size;
+  size_t yuv420p_size = yuv420p_y_size + yuv420p_u_size + yuv420p_v_size;
+  if (mColorConverterBufferSize != yuv420p_size) {
+    mColorConverterBuffer = nullptr; // release the previous buffer first
+    mColorConverterBuffer = new uint8_t[yuv420p_size];
+    mColorConverterBufferSize = yuv420p_size;
+  }
+  return mColorConverterBuffer.get();
+}
+
+/* static */
+void
+GonkVideoDecoderManager::RecycleCallback(TextureClient* aClient, void* aClosure)
+{
+  GonkVideoDecoderManager* videoManager = static_cast<GonkVideoDecoderManager*>(aClosure);
+  GrallocTextureClientOGL* client = static_cast<GrallocTextureClientOGL*>(aClient);
+  aClient->ClearRecycleCallback();
+  videoManager->PostReleaseVideoBuffer(client->GetMediaBuffer());
+}
+
+void GonkVideoDecoderManager::PostReleaseVideoBuffer(
+                                android::MediaBuffer *aBuffer)
+{
+  {
+    MutexAutoLock autoLock(mPendingVideoBuffersLock);
+    if (aBuffer) {
+      mPendingVideoBuffers.append(aBuffer);
+    }
+  }
+  sp<AMessage> notify =
+            new AMessage(kNotifyPostReleaseBuffer, mHandler->id());
+  notify->post();
+
+}
+
+void GonkVideoDecoderManager::ReleaseAllPendingVideoBuffers()
+{
+  Vector<android::MediaBuffer*> releasingVideoBuffers;
+  {
+    MutexAutoLock autoLock(mPendingVideoBuffersLock);
+    int size = mPendingVideoBuffers.length();
+    for (int i = 0; i < size; i++) {
+      releasingVideoBuffers.append(mPendingVideoBuffers[i]);
+    }
+    mPendingVideoBuffers.clear();
+  }
+  // Free all pending video buffers without holding mPendingVideoBuffersLock.
+  int size = releasingVideoBuffers.length();
+  for (int i = 0; i < size; i++) {
+    android::MediaBuffer *buffer;
+    buffer = releasingVideoBuffers[i];
+    mDecoder->ReleaseMediaBuffer(buffer);
+    buffer = nullptr;
+  }
+  releasingVideoBuffers.clear();
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/gonk/GonkVideoDecoderManager.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/gonk/GonkVideoDecoderManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/gonk/GonkVideoDecoderManager.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/gonk/GonkVideoDecoderManager.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,173 @@
+/* -*- 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(GonkVideoDecoderManager_h_)
+#define GonkVideoDecoderManager_h_
+
+#include <set>
+#include "nsRect.h"
+#include "GonkMediaDataDecoder.h"
+#include "mozilla/RefPtr.h"
+#include "I420ColorConverterHelper.h"
+#include "MediaCodecProxy.h"
+#include <stagefright/foundation/AHandler.h>
+#include "GonkNativeWindow.h"
+#include "GonkNativeWindowClient.h"
+
+using namespace android;
+
+namespace android {
+struct ALooper;
+class MediaBuffer;
+struct MOZ_EXPORT AString;
+class GonkNativeWindow;
+} // namespace android
+
+namespace mozilla {
+
+namespace layers {
+class TextureClient;
+} // namespace mozilla::layers
+
+class GonkVideoDecoderManager : public GonkDecoderManager {
+typedef android::MediaCodecProxy MediaCodecProxy;
+typedef mozilla::layers::TextureClient TextureClient;
+
+public:
+  GonkVideoDecoderManager(mozilla::layers::ImageContainer* aImageContainer,
+                          const VideoInfo& aConfig);
+
+  virtual ~GonkVideoDecoderManager() override;
+
+  virtual android::sp<MediaCodecProxy> Init(MediaDataDecoderCallback* aCallback) override;
+
+  virtual nsresult Input(MediaRawData* aSample) override;
+
+  virtual nsresult Output(int64_t aStreamOffset,
+                          nsRefPtr<MediaData>& aOutput) override;
+
+  virtual nsresult Flush() override;
+
+  virtual bool HasQueuedSample() override;
+
+  static void RecycleCallback(TextureClient* aClient, void* aClosure);
+
+private:
+  struct FrameInfo
+  {
+    int32_t mWidth = 0;
+    int32_t mHeight = 0;
+    int32_t mStride = 0;
+    int32_t mSliceHeight = 0;
+    int32_t mColorFormat = 0;
+    int32_t mCropLeft = 0;
+    int32_t mCropTop = 0;
+    int32_t mCropRight = 0;
+    int32_t mCropBottom = 0;
+  };
+  class MessageHandler : public android::AHandler
+  {
+  public:
+    MessageHandler(GonkVideoDecoderManager *aManager);
+    ~MessageHandler();
+
+    virtual void onMessageReceived(const android::sp<android::AMessage> &aMessage);
+
+  private:
+    // Forbidden
+    MessageHandler() = delete;
+    MessageHandler(const MessageHandler &rhs) = delete;
+    const MessageHandler &operator=(const MessageHandler &rhs) = delete;
+
+    GonkVideoDecoderManager *mManager;
+  };
+  friend class MessageHandler;
+
+  class VideoResourceListener : public android::MediaCodecProxy::CodecResourceListener
+  {
+  public:
+    VideoResourceListener(GonkVideoDecoderManager *aManager);
+    ~VideoResourceListener();
+
+    virtual void codecReserved() override;
+    virtual void codecCanceled() override;
+
+  private:
+    // Forbidden
+    VideoResourceListener() = delete;
+    VideoResourceListener(const VideoResourceListener &rhs) = delete;
+    const VideoResourceListener &operator=(const VideoResourceListener &rhs) = delete;
+
+    GonkVideoDecoderManager *mManager;
+  };
+  friend class VideoResourceListener;
+
+  bool SetVideoFormat();
+
+  nsresult CreateVideoData(int64_t aStreamOffset, VideoData** aOutData);
+  void ReleaseVideoBuffer();
+  uint8_t* GetColorConverterBuffer(int32_t aWidth, int32_t aHeight);
+
+  // For codec resource management
+  void codecReserved();
+  void codecCanceled();
+  void onMessageReceived(const sp<AMessage> &aMessage);
+
+  void ReleaseAllPendingVideoBuffers();
+  void PostReleaseVideoBuffer(android::MediaBuffer *aBuffer);
+
+  uint32_t mVideoWidth;
+  uint32_t mVideoHeight;
+  uint32_t mDisplayWidth;
+  uint32_t mDisplayHeight;
+  nsIntRect mPicture;
+  nsIntSize mInitialFrame;
+
+  nsRefPtr<layers::ImageContainer> mImageContainer;
+
+  android::MediaBuffer* mVideoBuffer;
+
+  MediaDataDecoderCallback*  mReaderCallback;
+  MediaInfo mInfo;
+  android::sp<VideoResourceListener> mVideoListener;
+  android::sp<MessageHandler> mHandler;
+  android::sp<ALooper> mLooper;
+  android::sp<ALooper> mManagerLooper;
+  FrameInfo mFrameInfo;
+
+  int64_t mLastDecodedTime;  // The last decoded frame presentation time.
+
+  // color converter
+  android::I420ColorConverterHelper mColorConverter;
+  nsAutoArrayPtr<uint8_t> mColorConverterBuffer;
+  size_t mColorConverterBufferSize;
+
+  android::sp<android::GonkNativeWindow> mNativeWindow;
+  enum {
+    kNotifyPostReleaseBuffer = 'nprb',
+  };
+
+  // Hold video's MediaBuffers that are released.
+  // The holded MediaBuffers are released soon after flush.
+  Vector<android::MediaBuffer*> mPendingVideoBuffers;
+  // The lock protects mPendingVideoBuffers.
+  Mutex mPendingVideoBuffersLock;
+
+  // MediaCodedc's wrapper that performs the decoding.
+  android::sp<android::MediaCodecProxy> mDecoder;
+
+  // This monitor protects mQueueSample.
+  Monitor mMonitor;
+
+  // An queue with the MP4 samples which are waiting to be sent into OMX.
+  // If an element is an empty MP4Sample, that menas EOS. There should not
+  // any sample be queued after EOS.
+  nsTArray<nsRefPtr<MediaRawData>> mQueueSample;
+};
+
+} // namespace mozilla
+
+#endif // GonkVideoDecoderManager_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/gonk/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/gonk/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/gonk/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/gonk/moz.build	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,42 @@
+# -*- 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 += [
+    'GonkAudioDecoderManager.h',
+    'GonkDecoderModule.h',
+    'GonkMediaDataDecoder.h',
+    'GonkVideoDecoderManager.h',
+]
+UNIFIED_SOURCES += [
+    'GonkAudioDecoderManager.cpp',
+    'GonkDecoderModule.cpp',
+    'GonkMediaDataDecoder.cpp',
+    'GonkVideoDecoderManager.cpp',
+]
+LOCAL_INCLUDES += [
+    '/dom/media/omx/',
+    '/dom/media/omx/mediaresourcemanager',
+]
+include('/ipc/chromium/chromium-config.mozbuild')
+
+# Suppress some GCC/clang warnings being treated as errors:
+#  - about attributes on forward declarations for types that are already
+#    defined, which complains about an important MOZ_EXPORT for android::AString
+#  - about multi-character constants which are used in codec-related code
+if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']:
+  CXXFLAGS += [
+    '-Wno-error=attributes',
+    '-Wno-error=multichar'
+  ]
+
+FINAL_LIBRARY = 'xul'
+
+FAIL_ON_WARNINGS = True
+
+CXXFLAGS += [
+    '-I%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [
+        'frameworks/native/opengl/include',]
+]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/moz.build	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,81 @@
+# -*- 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 += [
+    'PlatformDecoderModule.h',
+    'SharedDecoderManager.h',
+    'wrappers/H264Converter.h'
+]
+
+UNIFIED_SOURCES += [
+    'agnostic/BlankDecoderModule.cpp',
+    'PlatformDecoderModule.cpp',
+    'SharedDecoderManager.cpp',
+    'wrappers/H264Converter.cpp'
+]
+
+DIRS += ['agnostic/gmp']
+
+if CONFIG['MOZ_WMF']:
+    DIRS += [ 'wmf' ];
+
+if CONFIG['MOZ_EME']:
+    DIRS += ['agnostic/eme']
+
+if CONFIG['MOZ_FFMPEG']:
+    EXPORTS += [
+        'ffmpeg/FFmpegRuntimeLinker.h',
+    ]
+    UNIFIED_SOURCES += [
+        'ffmpeg/FFmpegLog.cpp',
+        'ffmpeg/FFmpegRuntimeLinker.cpp',
+    ]
+    DIRS += [
+        'ffmpeg/libav53',
+        'ffmpeg/libav54',
+        'ffmpeg/libav55',
+    ]
+    LOCAL_INCLUDES += [
+        'ffmpeg',
+    ]
+
+if CONFIG['MOZ_APPLEMEDIA']:
+  EXPORTS += [
+      'apple/AppleDecoderModule.h',
+  ]
+  UNIFIED_SOURCES += [
+      'apple/AppleATDecoder.cpp',
+      'apple/AppleCMLinker.cpp',
+      'apple/AppleDecoderModule.cpp',
+      'apple/AppleVDADecoder.cpp',
+      'apple/AppleVDALinker.cpp',
+      'apple/AppleVTDecoder.cpp',
+      'apple/AppleVTLinker.cpp',
+  ]
+  OS_LIBS += [
+      '-framework AudioToolbox',
+  ]
+
+if CONFIG['MOZ_GONK_MEDIACODEC']:
+    DEFINES['MOZ_GONK_MEDIACODEC'] = True
+    DIRS += ['gonk']
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
+    EXPORTS += [
+        'android/AndroidDecoderModule.h',
+    ]
+    UNIFIED_SOURCES += [
+        'android/AndroidDecoderModule.cpp',
+    ]
+
+FINAL_LIBRARY = 'xul'
+
+FAIL_ON_WARNINGS = True
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    DEFINES['NOMINMAX'] = True
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/PlatformDecoderModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/PlatformDecoderModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/PlatformDecoderModule.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/PlatformDecoderModule.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,227 @@
+/* -*- 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 "PlatformDecoderModule.h"
+
+#ifdef XP_WIN
+#include "WMFDecoderModule.h"
+#endif
+#ifdef MOZ_FFMPEG
+#include "FFmpegRuntimeLinker.h"
+#endif
+#ifdef MOZ_APPLEMEDIA
+#include "AppleDecoderModule.h"
+#endif
+#ifdef MOZ_GONK_MEDIACODEC
+#include "GonkDecoderModule.h"
+#endif
+#ifdef MOZ_WIDGET_ANDROID
+#include "AndroidDecoderModule.h"
+#endif
+#include "GMPDecoderModule.h"
+
+#include "mozilla/Preferences.h"
+#ifdef MOZ_EME
+#include "EMEDecoderModule.h"
+#include "mozilla/CDMProxy.h"
+#endif
+#include "SharedThreadPool.h"
+#include "MediaTaskQueue.h"
+
+#include "MediaInfo.h"
+#include "H264Converter.h"
+
+namespace mozilla {
+
+extern already_AddRefed<PlatformDecoderModule> CreateBlankDecoderModule();
+
+bool PlatformDecoderModule::sUseBlankDecoder = false;
+bool PlatformDecoderModule::sFFmpegDecoderEnabled = false;
+bool PlatformDecoderModule::sGonkDecoderEnabled = false;
+bool PlatformDecoderModule::sAndroidMCDecoderEnabled = false;
+bool PlatformDecoderModule::sAndroidMCDecoderPreferred = false;
+bool PlatformDecoderModule::sGMPDecoderEnabled = false;
+
+/* static */
+void
+PlatformDecoderModule::Init()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  static bool alreadyInitialized = false;
+  if (alreadyInitialized) {
+    return;
+  }
+  alreadyInitialized = true;
+
+  Preferences::AddBoolVarCache(&sUseBlankDecoder,
+                               "media.fragmented-mp4.use-blank-decoder");
+  Preferences::AddBoolVarCache(&sFFmpegDecoderEnabled,
+                               "media.fragmented-mp4.ffmpeg.enabled", false);
+
+#ifdef MOZ_GONK_MEDIACODEC
+  Preferences::AddBoolVarCache(&sGonkDecoderEnabled,
+                               "media.fragmented-mp4.gonk.enabled", false);
+#endif
+#ifdef MOZ_WIDGET_ANDROID
+  Preferences::AddBoolVarCache(&sAndroidMCDecoderEnabled,
+                               "media.fragmented-mp4.android-media-codec.enabled", false);
+  Preferences::AddBoolVarCache(&sAndroidMCDecoderPreferred,
+                               "media.fragmented-mp4.android-media-codec.preferred", false);
+#endif
+
+  Preferences::AddBoolVarCache(&sGMPDecoderEnabled,
+                               "media.fragmented-mp4.gmp.enabled", false);
+
+#ifdef XP_WIN
+  WMFDecoderModule::Init();
+#endif
+#ifdef MOZ_APPLEMEDIA
+  AppleDecoderModule::Init();
+#endif
+#ifdef MOZ_FFMPEG
+  FFmpegRuntimeLinker::Link();
+#endif
+}
+
+#ifdef MOZ_EME
+/* static */
+already_AddRefed<PlatformDecoderModule>
+PlatformDecoderModule::CreateCDMWrapper(CDMProxy* aProxy,
+                                        bool aHasAudio,
+                                        bool aHasVideo)
+{
+  bool cdmDecodesAudio;
+  bool cdmDecodesVideo;
+  {
+    CDMCaps::AutoLock caps(aProxy->Capabilites());
+    cdmDecodesAudio = caps.CanDecryptAndDecodeAudio();
+    cdmDecodesVideo = caps.CanDecryptAndDecodeVideo();
+  }
+
+  nsRefPtr<PlatformDecoderModule> pdm;
+  if ((!cdmDecodesAudio && aHasAudio) || (!cdmDecodesVideo && aHasVideo)) {
+    // The CDM itself can't decode. We need to wrap a PDM to decode the
+    // decrypted output of the CDM.
+    pdm = Create();
+    if (!pdm) {
+      return nullptr;
+    }
+  }
+
+  nsRefPtr<PlatformDecoderModule> emepdm(
+    new EMEDecoderModule(aProxy, pdm, cdmDecodesAudio, cdmDecodesVideo));
+  return emepdm.forget();
+}
+#endif
+
+/* static */
+already_AddRefed<PlatformDecoderModule>
+PlatformDecoderModule::Create()
+{
+  // Note: This (usually) runs on the decode thread.
+
+  nsRefPtr<PlatformDecoderModule> m(CreatePDM());
+
+  if (m && NS_SUCCEEDED(m->Startup())) {
+    return m.forget();
+  }
+  return nullptr;
+}
+
+/* static */
+already_AddRefed<PlatformDecoderModule>
+PlatformDecoderModule::CreatePDM()
+{
+#ifdef MOZ_WIDGET_ANDROID
+  if(sAndroidMCDecoderPreferred && sAndroidMCDecoderEnabled){
+    nsRefPtr<PlatformDecoderModule> m(new AndroidDecoderModule());
+    return m.forget();
+  }
+#endif
+  if (sUseBlankDecoder) {
+    return CreateBlankDecoderModule();
+  }
+#ifdef XP_WIN
+  nsRefPtr<PlatformDecoderModule> m(new WMFDecoderModule());
+  return m.forget();
+#endif
+#ifdef MOZ_FFMPEG
+  if (sFFmpegDecoderEnabled) {
+    nsRefPtr<PlatformDecoderModule> m = FFmpegRuntimeLinker::CreateDecoderModule();
+    if (m) {
+      return m.forget();
+    }
+  }
+#endif
+#ifdef MOZ_APPLEMEDIA
+  nsRefPtr<PlatformDecoderModule> m(new AppleDecoderModule());
+  return m.forget();
+#endif
+#ifdef MOZ_GONK_MEDIACODEC
+  if (sGonkDecoderEnabled) {
+    nsRefPtr<PlatformDecoderModule> m(new GonkDecoderModule());
+    return m.forget();
+  }
+#endif
+#ifdef MOZ_WIDGET_ANDROID
+  if(sAndroidMCDecoderEnabled){
+    nsRefPtr<PlatformDecoderModule> m(new AndroidDecoderModule());
+    return m.forget();
+  }
+#endif
+  if (sGMPDecoderEnabled) {
+    nsRefPtr<PlatformDecoderModule> m(new GMPDecoderModule());
+    return m.forget();
+  }
+  return nullptr;
+}
+
+already_AddRefed<MediaDataDecoder>
+PlatformDecoderModule::CreateDecoder(const TrackInfo& aConfig,
+                                     FlushableMediaTaskQueue* aTaskQueue,
+                                     MediaDataDecoderCallback* aCallback,
+                                     layers::LayersBackend aLayersBackend,
+                                     layers::ImageContainer* aImageContainer)
+{
+  nsRefPtr<MediaDataDecoder> m;
+
+  if (aConfig.GetAsAudioInfo()) {
+    m = CreateAudioDecoder(*aConfig.GetAsAudioInfo(),
+                           aTaskQueue,
+                           aCallback);
+    return m.forget();
+  }
+
+  if (!aConfig.GetAsVideoInfo()) {
+    return nullptr;
+  }
+
+  if (H264Converter::IsH264(aConfig)) {
+    m = new H264Converter(this,
+                          *aConfig.GetAsVideoInfo(),
+                          aLayersBackend,
+                          aImageContainer,
+                          aTaskQueue,
+                          aCallback);
+  } else {
+    m = CreateVideoDecoder(*aConfig.GetAsVideoInfo(),
+                           aLayersBackend,
+                           aImageContainer,
+                           aTaskQueue,
+                           aCallback);
+  }
+  return m.forget();
+}
+
+bool
+PlatformDecoderModule::SupportsMimeType(const nsACString& aMimeType)
+{
+  return aMimeType.EqualsLiteral("audio/mp4a-latm") ||
+    aMimeType.EqualsLiteral("video/mp4") ||
+    aMimeType.EqualsLiteral("video/avc");
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/PlatformDecoderModule.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/PlatformDecoderModule.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/PlatformDecoderModule.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/PlatformDecoderModule.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,267 @@
+/* -*- 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(PlatformDecoderModule_h_)
+#define PlatformDecoderModule_h_
+
+#include "MediaDecoderReader.h"
+#include "mozilla/layers/LayersTypes.h"
+#include "nsTArray.h"
+#include "mozilla/RefPtr.h"
+#include <queue>
+
+namespace mozilla {
+class TrackInfo;
+class AudioInfo;
+class VideoInfo;
+class MediaRawData;
+
+namespace layers {
+class ImageContainer;
+}
+
+class MediaDataDecoder;
+class MediaDataDecoderCallback;
+class FlushableMediaTaskQueue;
+class CDMProxy;
+typedef int64_t Microseconds;
+
+// The PlatformDecoderModule interface is used by the MP4Reader to abstract
+// access to the H264 and Audio (AAC/MP3) decoders provided by various platforms.
+// It may be extended to support other codecs in future. Each platform (Windows,
+// MacOSX, Linux, B2G etc) must implement a PlatformDecoderModule to provide
+// access to its decoders in order to get decompressed H.264/AAC from the
+// MP4Reader.
+//
+// Video decoding is asynchronous, and should be performed on the task queue
+// provided if the underlying platform isn't already exposing an async API.
+//
+// Platforms that don't have a corresponding PlatformDecoderModule won't be
+// able to play the H.264/AAC data output by the MP4Reader. In practice this
+// means that we won't have fragmented MP4 supported in Media Source
+// Extensions.
+//
+// A cross-platform decoder module that discards input and produces "blank"
+// output samples exists for testing, and is created when the pref
+// "media.fragmented-mp4.use-blank-decoder" is true.
+class PlatformDecoderModule {
+public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(PlatformDecoderModule)
+
+  // Call on the main thread to initialize the static state
+  // needed by Create().
+  static void Init();
+
+  // Factory method that creates the appropriate PlatformDecoderModule for
+  // the platform we're running on. Caller is responsible for deleting this
+  // instance. It's expected that there will be multiple
+  // PlatformDecoderModules alive at the same time. There is one
+  // PlatformDecoderModule created per MP4Reader.
+  // This is called on the decode task queue.
+  static already_AddRefed<PlatformDecoderModule> Create();
+  // As Create() but do not initialize the created PlatformDecoderModule.
+  static already_AddRefed<PlatformDecoderModule> CreatePDM();
+
+  // Perform any per-instance initialization.
+  // This is called on the decode task queue.
+  virtual nsresult Startup() { return NS_OK; };
+
+#ifdef MOZ_EME
+  // Creates a PlatformDecoderModule that uses a CDMProxy to decrypt or
+  // decrypt-and-decode EME encrypted content. If the CDM only decrypts and
+  // does not decode, we create a PDM and use that to create MediaDataDecoders
+  // that we use on on aTaskQueue to decode the decrypted stream.
+  // This is called on the decode task queue.
+  static already_AddRefed<PlatformDecoderModule>
+  CreateCDMWrapper(CDMProxy* aProxy,
+                   bool aHasAudio,
+                   bool aHasVideo);
+#endif
+
+  // Creates a decoder.
+  // See CreateVideoDecoder and CreateAudioDecoder for implementation details.
+  virtual already_AddRefed<MediaDataDecoder>
+  CreateDecoder(const TrackInfo& aConfig,
+                FlushableMediaTaskQueue* aTaskQueue,
+                MediaDataDecoderCallback* aCallback,
+                layers::LayersBackend aLayersBackend = layers::LayersBackend::LAYERS_NONE,
+                layers::ImageContainer* aImageContainer = nullptr);
+
+  // An audio decoder module must support AAC by default.
+  // A video decoder must support H264 by default.
+  // If more codecs are to be supported, SupportsMimeType will have
+  // to be extended
+  virtual bool SupportsMimeType(const nsACString& aMimeType);
+
+  enum ConversionRequired {
+    kNeedNone,
+    kNeedAVCC,
+    kNeedAnnexB,
+  };
+
+  // Indicates that the decoder requires a specific format.
+  // The PlatformDecoderModule will convert the demuxed data accordingly before
+  // feeding it to MediaDataDecoder::Input.
+  virtual ConversionRequired DecoderNeedsConversion(const TrackInfo& aConfig) const = 0;
+
+  virtual void DisableHardwareAcceleration() {}
+
+  virtual bool SupportsSharedDecoders(const VideoInfo& aConfig) const {
+    return true;
+  }
+
+protected:
+  PlatformDecoderModule() {}
+  virtual ~PlatformDecoderModule() {}
+
+  friend class H264Converter;
+  // Creates a Video decoder. The layers backend is passed in so that
+  // decoders can determine whether hardware accelerated decoding can be used.
+  // Asynchronous decoding of video should be done in runnables dispatched
+  // to aVideoTaskQueue. If the task queue isn't needed, the decoder should
+  // not hold a reference to it.
+  // Output and errors should be returned to the reader via aCallback.
+  // On Windows the task queue's threads in have MSCOM initialized with
+  // COINIT_MULTITHREADED.
+  // Returns nullptr if the decoder can't be created.
+  // It is safe to store a reference to aConfig.
+  // This is called on the decode task queue.
+  virtual already_AddRefed<MediaDataDecoder>
+  CreateVideoDecoder(const VideoInfo& aConfig,
+                     layers::LayersBackend aLayersBackend,
+                     layers::ImageContainer* aImageContainer,
+                     FlushableMediaTaskQueue* aVideoTaskQueue,
+                     MediaDataDecoderCallback* aCallback) = 0;
+
+  // Creates an Audio decoder with the specified properties.
+  // Asynchronous decoding of audio should be done in runnables dispatched to
+  // aAudioTaskQueue. If the task queue isn't needed, the decoder should
+  // not hold a reference to it.
+  // Output and errors should be returned to the reader via aCallback.
+  // Returns nullptr if the decoder can't be created.
+  // On Windows the task queue's threads in have MSCOM initialized with
+  // COINIT_MULTITHREADED.
+  // It is safe to store a reference to aConfig.
+  // This is called on the decode task queue.
+  virtual already_AddRefed<MediaDataDecoder>
+  CreateAudioDecoder(const AudioInfo& aConfig,
+                     FlushableMediaTaskQueue* aAudioTaskQueue,
+                     MediaDataDecoderCallback* aCallback) = 0;
+
+  // Caches pref media.fragmented-mp4.use-blank-decoder
+  static bool sUseBlankDecoder;
+  static bool sFFmpegDecoderEnabled;
+  static bool sGonkDecoderEnabled;
+  static bool sAndroidMCDecoderPreferred;
+  static bool sAndroidMCDecoderEnabled;
+  static bool sGMPDecoderEnabled;
+};
+
+// A callback used by MediaDataDecoder to return output/errors to the
+// MP4Reader. Implementation is threadsafe, and can be called on any thread.
+class MediaDataDecoderCallback {
+public:
+  virtual ~MediaDataDecoderCallback() {}
+
+  // 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
+  // the decoder.
+  virtual void Error() = 0;
+
+  // Denotes that the last input sample has been inserted into the decoder,
+  // and no more output can be produced unless more input is sent.
+  virtual void InputExhausted() = 0;
+
+  virtual void DrainComplete() = 0;
+
+  virtual void ReleaseMediaResources() {};
+
+  virtual bool OnReaderTaskQueue() = 0;
+};
+
+// MediaDataDecoder is the interface exposed by decoders created by the
+// PlatformDecoderModule's Create*Decoder() functions. The type of
+// media data that the decoder accepts as valid input and produces as
+// output is determined when the MediaDataDecoder is created.
+//
+// Unless otherwise noted, all functions are only called on the decode task
+// queue.  An exception is the MediaDataDecoder in
+// MP4Reader::IsVideoAccelerated() for which all calls (Init(),
+// IsHardwareAccelerated(), and Shutdown()) are from the main thread.
+//
+// Don't block inside these functions, unless it's explicitly noted that you
+// should (like in Flush()).
+//
+// Decoding is done asynchronously. Any async work can be done on the
+// MediaTaskQueue passed into the PlatformDecoderModules's Create*Decoder()
+// function. This may not be necessary for platforms with async APIs
+// for decoding.
+class MediaDataDecoder {
+protected:
+  virtual ~MediaDataDecoder() {};
+
+public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MediaDataDecoder)
+
+  // Initialize the decoder. The decoder should be ready to decode after
+  // this returns. The decoder should do any initialization here, rather
+  // than in its constructor or PlatformDecoderModule::Create*Decoder(),
+  // so that if the MP4Reader needs to shutdown during initialization,
+  // it can call Shutdown() to cancel this operation. Any initialization
+  // that requires blocking the calling thread in this function *must*
+  // be done here so that it can be canceled by calling Shutdown()!
+  virtual nsresult Init() = 0;
+
+  // Inserts a sample into the decoder's decode pipeline.
+  virtual nsresult Input(MediaRawData* aSample) = 0;
+
+  // Causes all samples in the decoding pipeline to be discarded. When
+  // this function returns, the decoder must be ready to accept new input
+  // for decoding. This function is called when the demuxer seeks, before
+  // decoding resumes after the seek.
+  // While the reader calls Flush(), it ignores all output sent to it;
+  // it is safe (but pointless) to send output while Flush is called.
+  // The MP4Reader will not call Input() while it's calling Flush().
+  virtual nsresult Flush() = 0;
+
+  // Causes all complete samples in the pipeline that can be decoded to be
+  // output. If the decoder can't produce samples from the current output,
+  // it drops the input samples. The decoder may be holding onto samples
+  // that are required to decode samples that it expects to get in future.
+  // This is called when the demuxer reaches end of stream.
+  // The MP4Reader will not call Input() while it's calling Drain().
+  // This function is asynchronous. The MediaDataDecoder must call
+  // MediaDataDecoderCallback::DrainComplete() once all remaining
+  // samples have been output.
+  virtual nsresult Drain() = 0;
+
+  // Cancels all init/input/drain operations, and shuts down the
+  // decoder. The platform decoder should clean up any resources it's using
+  // and release memory etc. Shutdown() must block until the decoder has
+  // completed shutdown. The reader calls Flush() before calling Shutdown().
+  // The reader will delete the decoder once Shutdown() returns.
+  // The MediaDataDecoderCallback *must* not be called after Shutdown() has
+  // returned.
+  virtual nsresult Shutdown() = 0;
+
+  // Called from the state machine task queue or main thread.
+  virtual bool IsHardwareAccelerated() const { return false; }
+
+  // ConfigurationChanged will be called to inform the video or audio decoder
+  // that the format of the next input sample is about to change.
+  // If video decoder, aConfig will be a VideoInfo object.
+  // If audio decoder, aConfig will be a AudioInfo object.
+  virtual nsresult ConfigurationChanged(const TrackInfo& aConfig)
+  {
+    return NS_OK;
+  }
+};
+
+} // namespace mozilla
+
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/SharedDecoderManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/SharedDecoderManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/SharedDecoderManager.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/SharedDecoderManager.cpp	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,277 @@
+/* -*- 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"
+
+namespace mozilla {
+
+class SharedDecoderCallback : public MediaDataDecoderCallback
+{
+public:
+  explicit SharedDecoderCallback(SharedDecoderManager* aManager)
+    : mManager(aManager)
+  {
+  }
+
+  virtual void Output(MediaData* aData) override
+  {
+    if (mManager->mActiveCallback) {
+      AssertHaveActiveProxy();
+      mManager->mActiveCallback->Output(aData);
+    }
+  }
+  virtual void Error() override
+  {
+    if (mManager->mActiveCallback) {
+      AssertHaveActiveProxy();
+      mManager->mActiveCallback->Error();
+    }
+  }
+  virtual void InputExhausted() override
+  {
+    if (mManager->mActiveCallback) {
+      AssertHaveActiveProxy();
+      mManager->mActiveCallback->InputExhausted();
+    }
+  }
+  virtual void DrainComplete() override
+  {
+    if (mManager->mActiveCallback) {
+      AssertHaveActiveProxy();
+      mManager->DrainComplete();
+    }
+  }
+  virtual void ReleaseMediaResources() override
+  {
+    if (mManager->mActiveCallback) {
+      AssertHaveActiveProxy();
+      mManager->mActiveCallback->ReleaseMediaResources();
+    }
+  }
+  virtual bool OnReaderTaskQueue() override
+  {
+    MOZ_ASSERT(mManager->mActiveCallback);
+    return mManager->mActiveCallback->OnReaderTaskQueue();
+  }
+
+private:
+  void AssertHaveActiveProxy() {
+#ifdef MOZ_FFMPEG // bug 1161895
+    NS_WARN_IF_FALSE(mManager->mActiveProxy, "callback not active proxy");
+#else
+    MOZ_DIAGNOSTIC_ASSERT(mManager->mActiveProxy);
+#endif
+  }
+
+  SharedDecoderManager* mManager;
+};
+
+SharedDecoderManager::SharedDecoderManager()
+  : mTaskQueue(new FlushableMediaTaskQueue(GetMediaThreadPool(MediaThreadType::PLATFORM_DECODER)))
+  , mActiveProxy(nullptr)
+  , mActiveCallback(nullptr)
+  , mWaitForInternalDrain(false)
+  , mMonitor("SharedDecoderProxy")
+  , mDecoderReleasedResources(false)
+{
+  MOZ_ASSERT(NS_IsMainThread()); // taskqueue must be created on main thread.
+  mCallback = new SharedDecoderCallback(this);
+}
+
+SharedDecoderManager::~SharedDecoderManager()
+{
+}
+
+already_AddRefed<MediaDataDecoder>
+SharedDecoderManager::CreateVideoDecoder(
+  PlatformDecoderModule* aPDM,
+  const VideoInfo& aConfig,
+  layers::LayersBackend aLayersBackend,
+  layers::ImageContainer* aImageContainer,
+  FlushableMediaTaskQueue* aVideoTaskQueue,
+  MediaDataDecoderCallback* aCallback)
+{
+  if (!mDecoder) {
+    mLayersBackend = aLayersBackend;
+    mImageContainer = aImageContainer;
+    // We use the manager's task queue for the decoder, rather than the one
+    // passed in, so that none of the objects sharing the decoder can shutdown
+    // the task queue while we're potentially still using it for a *different*
+    // object also sharing the decoder.
+    mDecoder =
+      aPDM->CreateDecoder(aConfig,
+                          mTaskQueue,
+                          mCallback,
+                          mLayersBackend,
+                          mImageContainer);
+    if (!mDecoder) {
+      mPDM = nullptr;
+      return nullptr;
+    }
+    nsresult rv = mDecoder->Init();
+    if (NS_FAILED(rv)) {
+      mDecoder = nullptr;
+      return nullptr;
+    }
+    mPDM = aPDM;
+  }
+
+  nsRefPtr<SharedDecoderProxy> proxy(new SharedDecoderProxy(this, aCallback));
+  return proxy.forget();
+}
+
+void
+SharedDecoderManager::DisableHardwareAcceleration()
+{
+  MOZ_ASSERT(mPDM);
+  mPDM->DisableHardwareAcceleration();
+}
+
+bool
+SharedDecoderManager::Recreate(const VideoInfo& aConfig)
+{
+  mDecoder->Flush();
+  mDecoder->Shutdown();
+  mDecoder = mPDM->CreateDecoder(aConfig,
+                                 mTaskQueue,
+                                 mCallback,
+                                 mLayersBackend,
+                                 mImageContainer);
+  if (!mDecoder) {
+    return false;
+  }
+  nsresult rv = mDecoder->Init();
+  return rv == NS_OK;
+}
+
+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) {
+    MonitorAutoLock mon(mMonitor);
+    mWaitForInternalDrain = true;
+    nsresult rv;
+    {
+      // We don't want to hold the lock while calling Drain() has some
+      // platform implementations call DrainComplete() immediately.
+      MonitorAutoUnlock mon(mMonitor);
+      rv = mActiveProxy->Drain();
+    }
+    if (NS_SUCCEEDED(rv)) {
+      while (mWaitForInternalDrain) {
+        mon.Wait();
+      }
+    }
+    mActiveProxy->Flush();
+    mActiveProxy = nullptr;
+  }
+}
+
+void
+SharedDecoderManager::DrainComplete()
+{
+  {
+    MonitorAutoLock mon(mMonitor);
+    if (mWaitForInternalDrain) {
+      mWaitForInternalDrain = false;
+      mon.NotifyAll();
+      return;
+    }
+  }
+  mActiveCallback->DrainComplete();
+}
+
+void
+SharedDecoderManager::Shutdown()
+{
+  // Shutdown() should have been called on any proxies.
+  MOZ_ASSERT(!mActiveProxy);
+
+  if (mDecoder) {
+    mDecoder->Shutdown();
+    mDecoder = nullptr;
+  }
+  mPDM = nullptr;
+  if (mTaskQueue) {
+    mTaskQueue->BeginShutdown();
+    mTaskQueue->AwaitShutdownAndIdle();
+    mTaskQueue = nullptr;
+  }
+}
+
+SharedDecoderProxy::SharedDecoderProxy(SharedDecoderManager* aManager,
+                                       MediaDataDecoderCallback* aCallback)
+  : mManager(aManager)
+  , mCallback(aCallback)
+{
+}
+
+SharedDecoderProxy::~SharedDecoderProxy()
+{
+  Shutdown();
+}
+
+nsresult
+SharedDecoderProxy::Init()
+{
+  return NS_OK;
+}
+
+nsresult
+SharedDecoderProxy::Input(MediaRawData* aSample)
+{
+  if (mManager->mActiveProxy != this) {
+    mManager->Select(this);
+  }
+  return mManager->mDecoder->Input(aSample);
+}
+
+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();
+  } else {
+    mCallback->DrainComplete();
+    return NS_OK;
+  }
+}
+
+nsresult
+SharedDecoderProxy::Shutdown()
+{
+  mManager->SetIdle(this);
+  return NS_OK;
+}
+
+bool
+SharedDecoderProxy::IsHardwareAccelerated() const
+{
+  return mManager->mDecoder->IsHardwareAccelerated();
+}
+
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/SharedDecoderManager.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/SharedDecoderManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/SharedDecoderManager.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/SharedDecoderManager.h	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,86 @@
+/* -*- 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(
+    PlatformDecoderModule* aPDM,
+    const VideoInfo& aConfig,
+    layers::LayersBackend aLayersBackend,
+    layers::ImageContainer* aImageContainer,
+    FlushableMediaTaskQueue* aVideoTaskQueue,
+    MediaDataDecoderCallback* aCallback);
+
+  void SetReader(MediaDecoderReader* aReader);
+  void Select(SharedDecoderProxy* aProxy);
+  void SetIdle(MediaDataDecoder* aProxy);
+  void ReleaseMediaResources();
+  void Shutdown();
+
+  friend class SharedDecoderProxy;
+  friend class SharedDecoderCallback;
+
+  void DisableHardwareAcceleration();
+  bool Recreate(const VideoInfo& aConfig);
+
+private:
+  virtual ~SharedDecoderManager();
+  void DrainComplete();
+
+  nsRefPtr<PlatformDecoderModule> mPDM;
+  nsRefPtr<MediaDataDecoder> mDecoder;
+  layers::LayersBackend mLayersBackend;
+  nsRefPtr<layers::ImageContainer> mImageContainer;
+  nsRefPtr<FlushableMediaTaskQueue> mTaskQueue;
+  SharedDecoderProxy* mActiveProxy;
+  MediaDataDecoderCallback* mActiveCallback;
+  nsAutoPtr<MediaDataDecoderCallback> mCallback;
+  bool mWaitForInternalDrain;
+  Monitor mMonitor;
+  bool mDecoderReleasedResources;
+};
+
+class SharedDecoderProxy : public MediaDataDecoder
+{
+public:
+  SharedDecoderProxy(SharedDecoderManager* aManager,
+                     MediaDataDecoderCallback* aCallback);
+  virtual ~SharedDecoderProxy();
+
+  virtual nsresult Init() override;
+  virtual nsresult Input(MediaRawData* aSample) override;
+  virtual nsresult Flush() override;
+  virtual nsresult Drain() override;
+  virtual nsresult Shutdown() override;
+  virtual bool IsHardwareAccelerated() const override;
+
+  friend class SharedDecoderManager;
+
+private:
+  nsRefPtr<SharedDecoderManager> mManager;
+  MediaDataDecoderCallback* mCallback;
+};
+}
+
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wmf/MFTDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wmf/MFTDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wmf/MFTDecoder.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wmf/MFTDecoder.cpp	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,308 @@
+/* -*- 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 "MFTDecoder.h"
+#include "nsThreadUtils.h"
+#include "WMFUtils.h"
+#include "mozilla/Logging.h"
+
+PRLogModuleInfo* GetDemuxerLog();
+#define LOG(...) MOZ_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__))
+
+namespace mozilla {
+
+MFTDecoder::MFTDecoder()
+  : mMFTProvidesOutputSamples(false)
+  , mDiscontinuity(true)
+{
+  memset(&mInputStreamInfo, 0, sizeof(MFT_INPUT_STREAM_INFO));
+  memset(&mOutputStreamInfo, 0, sizeof(MFT_OUTPUT_STREAM_INFO));
+}
+
+MFTDecoder::~MFTDecoder()
+{
+}
+
+HRESULT
+MFTDecoder::Create(const GUID& aMFTClsID)
+{
+  // Create the IMFTransform to do the decoding.
+  HRESULT hr;
+  hr = CoCreateInstance(aMFTClsID,
+                        nullptr,
+                        CLSCTX_INPROC_SERVER,
+                        IID_IMFTransform,
+                        reinterpret_cast<void**>(static_cast<IMFTransform**>(byRef(mDecoder))));
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  return S_OK;
+}
+
+HRESULT
+MFTDecoder::SetMediaTypes(IMFMediaType* aInputType,
+                          IMFMediaType* aOutputType,
+                          ConfigureOutputCallback aCallback,
+                          void* aData)
+{
+  mOutputType = aOutputType;
+
+  // Set the input type to the one the caller gave us...
+  HRESULT hr = mDecoder->SetInputType(0, aInputType, 0);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  hr = SetDecoderOutputType(aCallback, aData);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  hr = mDecoder->GetInputStreamInfo(0, &mInputStreamInfo);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  hr = SendMFTMessage(MFT_MESSAGE_NOTIFY_BEGIN_STREAMING, 0);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  hr = SendMFTMessage(MFT_MESSAGE_NOTIFY_START_OF_STREAM, 0);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  return S_OK;
+}
+
+TemporaryRef<IMFAttributes>
+MFTDecoder::GetAttributes()
+{
+  RefPtr<IMFAttributes> attr;
+  HRESULT hr = mDecoder->GetAttributes(byRef(attr));
+  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
+  return attr.forget();
+}
+
+HRESULT
+MFTDecoder::SetDecoderOutputType(ConfigureOutputCallback aCallback, void* aData)
+{
+  NS_ENSURE_TRUE(mDecoder != nullptr, E_POINTER);
+
+  // Iterate the enumerate the output types, until we find one compatible
+  // with what we need.
+  HRESULT hr;
+  RefPtr<IMFMediaType> outputType;
+  UINT32 typeIndex = 0;
+  while (SUCCEEDED(mDecoder->GetOutputAvailableType(0, typeIndex++, byRef(outputType)))) {
+    BOOL resultMatch;
+    hr = mOutputType->Compare(outputType, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &resultMatch);
+    if (SUCCEEDED(hr) && resultMatch == TRUE) {
+      if (aCallback) {
+        hr = aCallback(outputType, aData);
+        NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+      }
+      hr = mDecoder->SetOutputType(0, outputType, 0);
+      NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+      hr = mDecoder->GetOutputStreamInfo(0, &mOutputStreamInfo);
+      NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+      mMFTProvidesOutputSamples = IsFlagSet(mOutputStreamInfo.dwFlags, MFT_OUTPUT_STREAM_PROVIDES_SAMPLES);
+
+      return S_OK;
+    }
+    outputType = nullptr;
+  }
+  return E_FAIL;
+}
+
+HRESULT
+MFTDecoder::SendMFTMessage(MFT_MESSAGE_TYPE aMsg, ULONG_PTR aData)
+{
+  NS_ENSURE_TRUE(mDecoder != nullptr, E_POINTER);
+  HRESULT hr = mDecoder->ProcessMessage(aMsg, aData);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+  return S_OK;
+}
+
+HRESULT
+MFTDecoder::CreateInputSample(const uint8_t* aData,
+                              uint32_t aDataSize,
+                              int64_t aTimestamp,
+                              RefPtr<IMFSample>* aOutSample)
+{
+  NS_ENSURE_TRUE(mDecoder != nullptr, E_POINTER);
+
+  HRESULT hr;
+  RefPtr<IMFSample> sample;
+  hr = wmf::MFCreateSample(byRef(sample));
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  RefPtr<IMFMediaBuffer> buffer;
+  int32_t bufferSize = std::max<uint32_t>(uint32_t(mInputStreamInfo.cbSize), aDataSize);
+  UINT32 alignment = (mInputStreamInfo.cbAlignment > 1) ? mInputStreamInfo.cbAlignment - 1 : 0;
+  hr = wmf::MFCreateAlignedMemoryBuffer(bufferSize, alignment, byRef(buffer));
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  DWORD maxLength = 0;
+  DWORD currentLength = 0;
+  BYTE* dst = nullptr;
+  hr = buffer->Lock(&dst, &maxLength, &currentLength);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  // Copy data into sample's buffer.
+  memcpy(dst, aData, aDataSize);
+
+  hr = buffer->Unlock();
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  hr = buffer->SetCurrentLength(aDataSize);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  hr = sample->AddBuffer(buffer);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  hr = sample->SetSampleTime(UsecsToHNs(aTimestamp));
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  *aOutSample = sample.forget();
+
+  return S_OK;
+}
+
+HRESULT
+MFTDecoder::CreateOutputSample(RefPtr<IMFSample>* aOutSample)
+{
+  NS_ENSURE_TRUE(mDecoder != nullptr, E_POINTER);
+
+  HRESULT hr;
+  RefPtr<IMFSample> sample;
+  hr = wmf::MFCreateSample(byRef(sample));
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  RefPtr<IMFMediaBuffer> buffer;
+  int32_t bufferSize = mOutputStreamInfo.cbSize;
+  UINT32 alignment = (mOutputStreamInfo.cbAlignment > 1) ? mOutputStreamInfo.cbAlignment - 1 : 0;
+  hr = wmf::MFCreateAlignedMemoryBuffer(bufferSize, alignment, byRef(buffer));
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  DWORD maxLength = 0;
+  DWORD currentLength = 0;
+  BYTE* dst = nullptr;
+
+  hr = sample->AddBuffer(buffer);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  *aOutSample = sample.forget();
+
+  return S_OK;
+}
+
+HRESULT
+MFTDecoder::Output(RefPtr<IMFSample>* aOutput)
+{
+  NS_ENSURE_TRUE(mDecoder != nullptr, E_POINTER);
+
+  HRESULT hr;
+
+  MFT_OUTPUT_DATA_BUFFER output = {0};
+
+  bool providedSample = false;
+  RefPtr<IMFSample> sample;
+  if (*aOutput) {
+    output.pSample = *aOutput;
+    providedSample = true;
+  } else if (!mMFTProvidesOutputSamples) {
+    hr = CreateOutputSample(&sample);
+    NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+    output.pSample = sample;
+  }
+
+  DWORD status = 0;
+  hr = mDecoder->ProcessOutput(0, 1, &output, &status);
+  if (output.pEvents) {
+    // We must release this, as per the IMFTransform::ProcessOutput()
+    // MSDN documentation.
+    output.pEvents->Release();
+    output.pEvents = nullptr;
+  }
+
+  if (hr == MF_E_TRANSFORM_STREAM_CHANGE) {
+    // Type change, probably geometric aperature change.
+    // Reconfigure decoder output type, so that GetOutputMediaType()
+    // returns the new type, and return the error code to caller.
+    // This is an expected failure, so don't warn on encountering it.
+    hr = SetDecoderOutputType(nullptr, nullptr);
+    NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+    // Return the error, so that the caller knows to retry.
+    return MF_E_TRANSFORM_STREAM_CHANGE;
+  }
+
+  if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) {
+    // Not enough input to produce output. This is an expected failure,
+    // so don't warn on encountering it.
+    return hr;
+  }
+  // Treat other errors as unexpected, and warn.
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  MOZ_ASSERT(output.pSample);
+
+  if (mDiscontinuity) {
+    output.pSample->SetUINT32(MFSampleExtension_Discontinuity, TRUE);
+    mDiscontinuity = false;
+  }
+
+  *aOutput = output.pSample; // AddRefs
+  if (mMFTProvidesOutputSamples && !providedSample) {
+    // If the MFT is providing samples, we must release the sample here.
+    // Typically only the H.264 MFT provides samples when using DXVA,
+    // and it always re-uses the same sample, so if we don't release it
+    // MFT::ProcessOutput() deadlocks waiting for the sample to be released.
+    output.pSample->Release();
+    output.pSample = nullptr;
+  }
+
+  return S_OK;
+}
+
+HRESULT
+MFTDecoder::Input(const uint8_t* aData,
+                  uint32_t aDataSize,
+                  int64_t aTimestamp)
+{
+  NS_ENSURE_TRUE(mDecoder != nullptr, E_POINTER);
+
+  RefPtr<IMFSample> input;
+  HRESULT hr = CreateInputSample(aData, aDataSize, aTimestamp, &input);
+  NS_ENSURE_TRUE(SUCCEEDED(hr) && input != nullptr, hr);
+
+  return Input(input);
+}
+
+HRESULT
+MFTDecoder::Input(IMFSample* aSample)
+{
+  HRESULT hr = mDecoder->ProcessInput(0, aSample, 0);
+  if (hr == MF_E_NOTACCEPTING) {
+    // MFT *already* has enough data to produce a sample. Retrieve it.
+    return MF_E_NOTACCEPTING;
+  }
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  return S_OK;
+}
+
+HRESULT
+MFTDecoder::Flush()
+{
+  HRESULT hr = SendMFTMessage(MFT_MESSAGE_COMMAND_FLUSH, 0);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  mDiscontinuity = true;
+
+  return S_OK;
+}
+
+HRESULT
+MFTDecoder::GetOutputMediaType(RefPtr<IMFMediaType>& aMediaType)
+{
+  NS_ENSURE_TRUE(mDecoder, E_POINTER);
+  return mDecoder->GetOutputCurrentType(0, byRef(aMediaType));
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wmf/MFTDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wmf/MFTDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wmf/MFTDecoder.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wmf/MFTDecoder.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,110 @@
+/* -*- 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(MFTDecoder_h_)
+#define MFTDecoder_h_
+
+#include "WMF.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/ReentrantMonitor.h"
+#include "nsIThread.h"
+
+namespace mozilla {
+
+class MFTDecoder final {
+  ~MFTDecoder();
+
+public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MFTDecoder)
+
+  MFTDecoder();
+
+  // Creates the MFT. First thing to do as part of setup.
+  //
+  // Params:
+  //  - aMFTClsID the clsid used by CoCreateInstance to instantiate the
+  //    decoder MFT.
+  HRESULT Create(const GUID& aMFTClsID);
+
+  // Sets the input and output media types. Call after Init().
+  //
+  // Params:
+  //  - aInputType needs at least major and minor types set.
+  //  - aOutputType needs at least major and minor types set.
+  //    This is used to select the matching output type out
+  //    of all the available output types of the MFT.
+  typedef HRESULT (*ConfigureOutputCallback)(IMFMediaType* aOutputType, void* aData);
+  HRESULT SetMediaTypes(IMFMediaType* aInputType,
+                        IMFMediaType* aOutputType,
+                        ConfigureOutputCallback aCallback = nullptr,
+                        void* aData = nullptr);
+
+  // Returns the MFT's IMFAttributes object.
+  TemporaryRef<IMFAttributes> GetAttributes();
+
+  // Retrieves the media type being output. This may not be valid until
+  //  the first sample is decoded.
+  HRESULT GetOutputMediaType(RefPtr<IMFMediaType>& aMediaType);
+
+  // Submits data into the MFT for processing.
+  //
+  // Returns:
+  //  - MF_E_NOTACCEPTING if the decoder can't accept input. The data
+  //    must be resubmitted after Output() stops producing output.
+  HRESULT Input(const uint8_t* aData,
+                uint32_t aDataSize,
+                int64_t aTimestampUsecs);
+  HRESULT Input(IMFSample* aSample);
+
+  // Retrieves output from the MFT. Call this once Input() returns
+  // MF_E_NOTACCEPTING. Some MFTs with hardware acceleration (the H.264
+  // decoder MFT in particular) can't handle it if clients hold onto
+  // references to the output IMFSample, so don't do that.
+  //
+  // Returns:
+  //  - MF_E_TRANSFORM_STREAM_CHANGE if the underlying stream output
+  //    type changed. Retrieve the output media type and reconfig client,
+  //    else you may misinterpret the MFT's output.
+  //  - MF_E_TRANSFORM_NEED_MORE_INPUT if no output can be produced
+  //    due to lack of input.
+  //  - S_OK if an output frame is produced.
+  HRESULT Output(RefPtr<IMFSample>* aOutput);
+
+  // Sends a flush message to the MFT. This causes it to discard all
+  // input data. Use before seeking.
+  HRESULT Flush();
+
+  // Sends a message to the MFT.
+  HRESULT SendMFTMessage(MFT_MESSAGE_TYPE aMsg, ULONG_PTR aData);
+
+private:
+
+  HRESULT SetDecoderOutputType(ConfigureOutputCallback aCallback, void* aData);
+
+  HRESULT CreateInputSample(const uint8_t* aData,
+                            uint32_t aDataSize,
+                            int64_t aTimestampUsecs,
+                            RefPtr<IMFSample>* aOutSample);
+
+  HRESULT CreateOutputSample(RefPtr<IMFSample>* aOutSample);
+
+  MFT_INPUT_STREAM_INFO mInputStreamInfo;
+  MFT_OUTPUT_STREAM_INFO mOutputStreamInfo;
+
+  RefPtr<IMFTransform> mDecoder;
+
+  RefPtr<IMFMediaType> mOutputType;
+
+  // True if the IMFTransform allocates the samples that it returns.
+  bool mMFTProvidesOutputSamples;
+
+  // True if we need to mark the next sample as a discontinuity.
+  bool mDiscontinuity;
+};
+
+} // namespace mozilla
+
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wmf/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wmf/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wmf/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wmf/moz.build	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,26 @@
+# -*- 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 += [
+    'MFTDecoder.h',
+    'WMFAudioMFTManager.h',
+    'WMFDecoderModule.h',
+    'WMFMediaDataDecoder.h',
+    'WMFVideoMFTManager.h',
+]
+UNIFIED_SOURCES += [
+    'MFTDecoder.cpp',
+    'WMFAudioMFTManager.cpp',
+    'WMFDecoderModule.cpp',
+    'WMFMediaDataDecoder.cpp',
+    'WMFVideoMFTManager.cpp',
+]
+
+FINAL_LIBRARY = 'xul'
+
+FAIL_ON_WARNINGS = True
+
+CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wmf/WMFAudioMFTManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wmf/WMFAudioMFTManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wmf/WMFAudioMFTManager.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wmf/WMFAudioMFTManager.cpp	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,318 @@
+/* -*- 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 "WMFAudioMFTManager.h"
+#include "MediaInfo.h"
+#include "VideoUtils.h"
+#include "WMFUtils.h"
+#include "nsTArray.h"
+
+#include "mozilla/Logging.h"
+
+PRLogModuleInfo* GetDemuxerLog();
+#define LOG(...) MOZ_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__))
+
+namespace mozilla {
+
+static void
+AACAudioSpecificConfigToUserData(uint8_t aAACProfileLevelIndication,
+                                 const uint8_t* aAudioSpecConfig,
+                                 uint32_t aConfigLength,
+                                 nsTArray<BYTE>& aOutUserData)
+{
+  MOZ_ASSERT(aOutUserData.IsEmpty());
+
+  // The MF_MT_USER_DATA for AAC is defined here:
+  // http://msdn.microsoft.com/en-us/library/windows/desktop/dd742784%28v=vs.85%29.aspx
+  //
+  // For MFAudioFormat_AAC, MF_MT_USER_DATA contains the portion of
+  // the HEAACWAVEINFO structure that appears after the WAVEFORMATEX
+  // structure (that is, after the wfx member). This is followed by
+  // the AudioSpecificConfig() data, as defined by ISO/IEC 14496-3.
+  // [...]
+  // The length of the AudioSpecificConfig() data is 2 bytes for AAC-LC
+  // or HE-AAC with implicit signaling of SBR/PS. It is more than 2 bytes
+  // for HE-AAC with explicit signaling of SBR/PS.
+  //
+  // The value of audioObjectType as defined in AudioSpecificConfig()
+  // must be 2, indicating AAC-LC. The value of extensionAudioObjectType
+  // must be 5 for SBR or 29 for PS.
+  //
+  // HEAACWAVEINFO structure:
+  //    typedef struct heaacwaveinfo_tag {
+  //      WAVEFORMATEX wfx;
+  //      WORD         wPayloadType;
+  //      WORD         wAudioProfileLevelIndication;
+  //      WORD         wStructType;
+  //      WORD         wReserved1;
+  //      DWORD        dwReserved2;
+  //    }
+  const UINT32 heeInfoLen = 4 * sizeof(WORD) + sizeof(DWORD);
+
+  // The HEAACWAVEINFO must have payload and profile set,
+  // the rest can be all 0x00.
+  BYTE heeInfo[heeInfoLen] = {0};
+  WORD* w = (WORD*)heeInfo;
+  w[0] = 0x0; // Payload type raw AAC packet
+  w[1] = aAACProfileLevelIndication;
+
+  aOutUserData.AppendElements(heeInfo, heeInfoLen);
+  aOutUserData.AppendElements(aAudioSpecConfig, aConfigLength);
+}
+
+WMFAudioMFTManager::WMFAudioMFTManager(
+  const AudioInfo& aConfig)
+  : mAudioChannels(aConfig.mChannels)
+  , mAudioRate(aConfig.mRate)
+  , mAudioFrameOffset(0)
+  , mAudioFrameSum(0)
+  , mMustRecaptureAudioPosition(true)
+{
+  MOZ_COUNT_CTOR(WMFAudioMFTManager);
+
+  if (aConfig.mMimeType.EqualsLiteral("audio/mpeg")) {
+    mStreamType = MP3;
+  } else if (aConfig.mMimeType.EqualsLiteral("audio/mp4a-latm")) {
+    mStreamType = AAC;
+    AACAudioSpecificConfigToUserData(aConfig.mProfile,
+                                     aConfig.mCodecSpecificConfig->Elements(),
+                                     aConfig.mCodecSpecificConfig->Length(),
+                                     mUserData);
+  } else {
+    mStreamType = Unknown;
+  }
+}
+
+WMFAudioMFTManager::~WMFAudioMFTManager()
+{
+  MOZ_COUNT_DTOR(WMFAudioMFTManager);
+}
+
+const GUID&
+WMFAudioMFTManager::GetMFTGUID()
+{
+  MOZ_ASSERT(mStreamType != Unknown);
+  switch (mStreamType) {
+    case AAC: return CLSID_CMSAACDecMFT;
+    case MP3: return CLSID_CMP3DecMediaObject;
+    default: return GUID_NULL;
+  };
+}
+
+const GUID&
+WMFAudioMFTManager::GetMediaSubtypeGUID()
+{
+  MOZ_ASSERT(mStreamType != Unknown);
+  switch (mStreamType) {
+    case AAC: return MFAudioFormat_AAC;
+    case MP3: return MFAudioFormat_MP3;
+    default: return GUID_NULL;
+  };
+}
+
+TemporaryRef<MFTDecoder>
+WMFAudioMFTManager::Init()
+{
+  NS_ENSURE_TRUE(mStreamType != Unknown, nullptr);
+
+  RefPtr<MFTDecoder> decoder(new MFTDecoder());
+
+  HRESULT hr = decoder->Create(GetMFTGUID());
+  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
+
+  // Setup input/output media types
+  RefPtr<IMFMediaType> inputType;
+
+  hr = wmf::MFCreateMediaType(byRef(inputType));
+  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
+
+  hr = inputType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
+
+  hr = inputType->SetGUID(MF_MT_SUBTYPE, GetMediaSubtypeGUID());
+  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
+
+  hr = inputType->SetUINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, mAudioRate);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
+
+  hr = inputType->SetUINT32(MF_MT_AUDIO_NUM_CHANNELS, mAudioChannels);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
+
+  if (mStreamType == AAC) {
+    hr = inputType->SetUINT32(MF_MT_AAC_PAYLOAD_TYPE, 0x0); // Raw AAC packet
+    NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
+
+    hr = inputType->SetBlob(MF_MT_USER_DATA,
+                            mUserData.Elements(),
+                            mUserData.Length());
+    NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
+  }
+
+  RefPtr<IMFMediaType> outputType;
+  hr = wmf::MFCreateMediaType(byRef(outputType));
+  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
+
+  hr = outputType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
+
+  hr = outputType->SetGUID(MF_MT_SUBTYPE, MFAudioFormat_PCM);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
+
+  hr = outputType->SetUINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 16);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
+
+  hr = decoder->SetMediaTypes(inputType, outputType);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
+
+  mDecoder = decoder;
+
+  return decoder.forget();
+}
+
+HRESULT
+WMFAudioMFTManager::Input(MediaRawData* aSample)
+{
+  return mDecoder->Input(aSample->mData,
+                         uint32_t(aSample->mSize),
+                         aSample->mTime);
+}
+
+HRESULT
+WMFAudioMFTManager::UpdateOutputType()
+{
+  HRESULT hr;
+
+  RefPtr<IMFMediaType> type;
+  hr = mDecoder->GetOutputMediaType(type);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  hr = type->GetUINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, &mAudioRate);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  hr = type->GetUINT32(MF_MT_AUDIO_NUM_CHANNELS, &mAudioChannels);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  return S_OK;
+}
+
+HRESULT
+WMFAudioMFTManager::Output(int64_t aStreamOffset,
+                           nsRefPtr<MediaData>& aOutData)
+{
+  aOutData = nullptr;
+  RefPtr<IMFSample> sample;
+  HRESULT hr;
+  while (true) {
+    hr = mDecoder->Output(&sample);
+    if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) {
+      return hr;
+    }
+    if (hr == MF_E_TRANSFORM_STREAM_CHANGE) {
+      hr = UpdateOutputType();
+      NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+      continue;
+    }
+    break;
+  }
+
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  RefPtr<IMFMediaBuffer> buffer;
+  hr = sample->ConvertToContiguousBuffer(byRef(buffer));
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  BYTE* data = nullptr; // Note: *data will be owned by the IMFMediaBuffer, we don't need to free it.
+  DWORD maxLength = 0, currentLength = 0;
+  hr = buffer->Lock(&data, &maxLength, &currentLength);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  // Sometimes when starting decoding, the AAC decoder gives us samples
+  // with a negative timestamp. AAC does usually have preroll (or encoder
+  // delay) encoded into its bitstream, but the amount encoded to the stream
+  // is variable, and it not signalled in-bitstream. There is sometimes
+  // signalling in the MP4 container what the preroll amount, but it's
+  // inconsistent. It looks like WMF's AAC encoder may take this into
+  // account, so strip off samples with a negative timestamp to get us
+  // to a 0-timestamp start. This seems to maintain A/V sync, so we can run
+  // with this until someone complains...
+
+  // We calculate the timestamp and the duration based on the number of audio
+  // frames we've already played. We don't trust the timestamp stored on the
+  // IMFSample, as sometimes it's wrong, possibly due to buggy encoders?
+
+  // If this sample block comes after a discontinuity (i.e. a gap or seek)
+  // reset the frame counters, and capture the timestamp. Future timestamps
+  // will be offset from this block's timestamp.
+  UINT32 discontinuity = false;
+  sample->GetUINT32(MFSampleExtension_Discontinuity, &discontinuity);
+  if (mMustRecaptureAudioPosition || discontinuity) {
+    // Update the output type, in case this segment has a different
+    // rate. This also triggers on the first sample, which can have a
+    // different rate than is advertised in the container, and sometimes we
+    // don't get a MF_E_TRANSFORM_STREAM_CHANGE when the rate changes.
+    hr = UpdateOutputType();
+    NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+    mAudioFrameSum = 0;
+    LONGLONG timestampHns = 0;
+    hr = sample->GetSampleTime(&timestampHns);
+    NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+    hr = HNsToFrames(timestampHns, mAudioRate, &mAudioFrameOffset);
+    NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+    mMustRecaptureAudioPosition = false;
+  }
+  // We can assume PCM 16 output.
+  int32_t numSamples = currentLength / 2;
+  int32_t numFrames = numSamples / mAudioChannels;
+  MOZ_ASSERT(numFrames >= 0);
+  MOZ_ASSERT(numSamples >= 0);
+  if (numFrames == 0) {
+    // All data from this chunk stripped, loop back and try to output the next
+    // frame, if possible.
+    return S_OK;
+  }
+
+  nsAutoArrayPtr<AudioDataValue> audioData(new AudioDataValue[numSamples]);
+
+  int16_t* pcm = (int16_t*)data;
+  for (int32_t i = 0; i < numSamples; ++i) {
+    audioData[i] = AudioSampleToFloat(pcm[i]);
+  }
+
+  buffer->Unlock();
+  int64_t timestamp;
+  hr = FramesToUsecs(mAudioFrameOffset + mAudioFrameSum, mAudioRate, &timestamp);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  mAudioFrameSum += numFrames;
+
+  int64_t duration;
+  hr = FramesToUsecs(numFrames, mAudioRate, &duration);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  aOutData = new AudioData(aStreamOffset,
+                           timestamp,
+                           duration,
+                           numFrames,
+                           audioData.forget(),
+                           mAudioChannels,
+                           mAudioRate);
+
+  #ifdef LOG_SAMPLE_DECODE
+  LOG("Decoded audio sample! timestamp=%lld duration=%lld currentLength=%u",
+      timestamp, duration, currentLength);
+  #endif
+
+  return S_OK;
+}
+
+void
+WMFAudioMFTManager::Shutdown()
+{
+  mDecoder = nullptr;
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wmf/WMFAudioMFTManager.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wmf/WMFAudioMFTManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wmf/WMFAudioMFTManager.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wmf/WMFAudioMFTManager.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,71 @@
+/* -*- 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(WMFAudioOutputSource_h_)
+#define WMFAudioOutputSource_h_
+
+#include "WMF.h"
+#include "MP4Reader.h"
+#include "MFTDecoder.h"
+#include "mozilla/RefPtr.h"
+#include "WMFMediaDataDecoder.h"
+
+namespace mozilla {
+
+class WMFAudioMFTManager : public MFTManager {
+public:
+  WMFAudioMFTManager(const AudioInfo& aConfig);
+  ~WMFAudioMFTManager();
+
+  virtual TemporaryRef<MFTDecoder> Init() override;
+
+  virtual HRESULT Input(MediaRawData* aSample) override;
+
+  // Note WMF's AAC decoder sometimes output negatively timestamped samples,
+  // 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,
+                         nsRefPtr<MediaData>& aOutput) override;
+
+  virtual void Shutdown() override;
+
+private:
+
+  HRESULT UpdateOutputType();
+
+  // IMFTransform wrapper that performs the decoding.
+  RefPtr<MFTDecoder> mDecoder;
+
+  uint32_t mAudioChannels;
+  uint32_t mAudioRate;
+  nsTArray<BYTE> mUserData;
+
+  // The offset, in audio frames, at which playback started since the
+  // last discontinuity.
+  int64_t mAudioFrameOffset;
+  // The number of audio frames that we've played since the last
+  // discontinuity.
+  int64_t mAudioFrameSum;
+
+  enum StreamType {
+    Unknown,
+    AAC,
+    MP3
+  };
+  StreamType mStreamType;
+
+  const GUID& GetMFTGUID();
+  const GUID& GetMediaSubtypeGUID();
+
+  // True if we need to re-initialize mAudioFrameOffset and mAudioFrameSum
+  // from the next audio packet we decode. This happens after a seek, since
+  // WMF doesn't mark a stream as having a discontinuity after a seek(0).
+  bool mMustRecaptureAudioPosition;
+};
+
+} // namespace mozilla
+
+#endif // WMFAudioOutputSource_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wmf/WMFDecoderModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wmf/WMFDecoderModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wmf/WMFDecoderModule.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wmf/WMFDecoderModule.cpp	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,186 @@
+/* -*- 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 "WMF.h"
+#include "WMFDecoderModule.h"
+#include "WMFDecoder.h"
+#include "WMFVideoMFTManager.h"
+#include "WMFAudioMFTManager.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/DebugOnly.h"
+#include "WMFMediaDataDecoder.h"
+#include "nsIWindowsRegKey.h"
+#include "nsComponentManagerUtils.h"
+#include "nsServiceManagerUtils.h"
+#include "nsIGfxInfo.h"
+#include "GfxDriverInfo.h"
+#include "gfxWindowsPlatform.h"
+#include "MediaInfo.h"
+
+namespace mozilla {
+
+bool WMFDecoderModule::sIsWMFEnabled = false;
+bool WMFDecoderModule::sDXVAEnabled = false;
+
+WMFDecoderModule::WMFDecoderModule()
+{
+}
+
+WMFDecoderModule::~WMFDecoderModule()
+{
+  DebugOnly<HRESULT> hr = wmf::MFShutdown();
+  NS_ASSERTION(SUCCEEDED(hr), "MFShutdown failed");
+}
+
+/* static */
+void
+WMFDecoderModule::Init()
+{
+  MOZ_ASSERT(NS_IsMainThread(), "Must be on main thread.");
+  sIsWMFEnabled = Preferences::GetBool("media.windows-media-foundation.enabled", false);
+  if (!sIsWMFEnabled) {
+    return;
+  }
+  if (NS_FAILED(WMFDecoder::LoadDLLs())) {
+    sIsWMFEnabled = false;
+  }
+  sDXVAEnabled = !gfxWindowsPlatform::GetPlatform()->IsWARP() &&
+                 gfxPlatform::CanUseHardwareVideoDecoding();
+}
+
+nsresult
+WMFDecoderModule::Startup()
+{
+  if (!sIsWMFEnabled) {
+    return NS_ERROR_FAILURE;
+  }
+  if (FAILED(wmf::MFStartup())) {
+    NS_WARNING("Failed to initialize Windows Media Foundation");
+    return NS_ERROR_FAILURE;
+  }
+  return NS_OK;
+}
+
+already_AddRefed<MediaDataDecoder>
+WMFDecoderModule::CreateVideoDecoder(const VideoInfo& aConfig,
+                                     layers::LayersBackend aLayersBackend,
+                                     layers::ImageContainer* aImageContainer,
+                                     FlushableMediaTaskQueue* aVideoTaskQueue,
+                                     MediaDataDecoderCallback* aCallback)
+{
+  nsRefPtr<MediaDataDecoder> decoder =
+    new WMFMediaDataDecoder(new WMFVideoMFTManager(aConfig,
+                                                   aLayersBackend,
+                                                   aImageContainer,
+                                                   sDXVAEnabled && ShouldUseDXVA(aConfig)),
+                            aVideoTaskQueue,
+                            aCallback);
+  return decoder.forget();
+}
+
+already_AddRefed<MediaDataDecoder>
+WMFDecoderModule::CreateAudioDecoder(const AudioInfo& aConfig,
+                                     FlushableMediaTaskQueue* aAudioTaskQueue,
+                                     MediaDataDecoderCallback* aCallback)
+{
+  nsRefPtr<MediaDataDecoder> decoder =
+    new WMFMediaDataDecoder(new WMFAudioMFTManager(aConfig),
+                            aAudioTaskQueue,
+                            aCallback);
+  return decoder.forget();
+}
+
+bool
+WMFDecoderModule::ShouldUseDXVA(const VideoInfo& aConfig) const
+{
+  static bool isAMD = false;
+  static bool initialized = false;
+  if (!initialized) {
+    nsCOMPtr<nsIGfxInfo> gfxInfo = do_GetService("@mozilla.org/gfx/info;1");
+    nsAutoString vendor;
+    gfxInfo->GetAdapterVendorID(vendor);
+    isAMD = vendor.Equals(widget::GfxDriverInfo::GetDeviceVendor(widget::VendorAMD), nsCaseInsensitiveStringComparator()) ||
+            vendor.Equals(widget::GfxDriverInfo::GetDeviceVendor(widget::VendorATI), nsCaseInsensitiveStringComparator());
+    initialized = true;
+  }
+  if (!isAMD) {
+    return true;
+  }
+  // Don't use DXVA for 4k videos or above, since it seems to perform poorly.
+  return aConfig.mDisplay.width <= 1920 && aConfig.mDisplay.height <= 1200;
+}
+
+bool
+WMFDecoderModule::SupportsSharedDecoders(const VideoInfo& aConfig) const
+{
+  // If DXVA is enabled, but we're not going to use it for this specific config, then
+  // we can't use the shared decoder.
+  return !sDXVAEnabled || ShouldUseDXVA(aConfig);
+}
+
+bool
+WMFDecoderModule::SupportsMimeType(const nsACString& aMimeType)
+{
+  return aMimeType.EqualsLiteral("video/mp4") ||
+         aMimeType.EqualsLiteral("video/avc") ||
+         aMimeType.EqualsLiteral("video/webm; codecs=vp8") ||
+         aMimeType.EqualsLiteral("video/webm; codecs=vp9") ||
+         aMimeType.EqualsLiteral("audio/mp4a-latm") ||
+         aMimeType.EqualsLiteral("audio/mpeg");
+}
+
+PlatformDecoderModule::ConversionRequired
+WMFDecoderModule::DecoderNeedsConversion(const TrackInfo& aConfig) const
+{
+  if (aConfig.IsVideo() &&
+      (aConfig.mMimeType.EqualsLiteral("video/avc") ||
+       aConfig.mMimeType.EqualsLiteral("video/mp4"))) {
+    return kNeedAnnexB;
+  } else {
+    return kNeedNone;
+  }
+}
+
+static bool
+ClassesRootRegKeyExists(const nsAString& aRegKeyPath)
+{
+  nsresult rv;
+
+  nsCOMPtr<nsIWindowsRegKey> regKey =
+    do_CreateInstance("@mozilla.org/windows-registry-key;1", &rv);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return false;
+  }
+
+  rv = regKey->Open(nsIWindowsRegKey::ROOT_KEY_CLASSES_ROOT,
+                    aRegKeyPath,
+                    nsIWindowsRegKey::ACCESS_READ);
+  if (NS_FAILED(rv)) {
+    return false;
+  }
+
+  regKey->Close();
+
+  return true;
+}
+
+/* static */ bool
+WMFDecoderModule::HasH264()
+{
+  // CLSID_CMSH264DecoderMFT
+  return ClassesRootRegKeyExists(
+    NS_LITERAL_STRING("CLSID\\{32D186A7-218F-4C75-8876-DD77273A8999}"));
+}
+
+/* static */ bool
+WMFDecoderModule::HasAAC()
+{
+  // CLSID_CMSAACDecMFT
+  return ClassesRootRegKeyExists(
+    NS_LITERAL_STRING("CLSID\\{62CE7E72-4C71-4D20-B15D-452831A87D9D}"));
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wmf/WMFDecoderModule.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wmf/WMFDecoderModule.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wmf/WMFDecoderModule.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wmf/WMFDecoderModule.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,64 @@
+/* -*- 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(WMFPlatformDecoderModule_h_)
+#define WMFPlatformDecoderModule_h_
+
+#include "PlatformDecoderModule.h"
+
+namespace mozilla {
+
+class WMFDecoderModule : public PlatformDecoderModule {
+public:
+  WMFDecoderModule();
+  virtual ~WMFDecoderModule();
+
+  // Initializes the module, loads required dynamic libraries, etc.
+  virtual nsresult Startup() override;
+
+  virtual already_AddRefed<MediaDataDecoder>
+  CreateVideoDecoder(const VideoInfo& aConfig,
+                     layers::LayersBackend aLayersBackend,
+                     layers::ImageContainer* aImageContainer,
+                     FlushableMediaTaskQueue* aVideoTaskQueue,
+                     MediaDataDecoderCallback* aCallback) override;
+
+  virtual already_AddRefed<MediaDataDecoder>
+  CreateAudioDecoder(const AudioInfo& aConfig,
+                     FlushableMediaTaskQueue* aAudioTaskQueue,
+                     MediaDataDecoderCallback* aCallback) override;
+
+  bool SupportsMimeType(const nsACString& aMimeType) override;
+
+  virtual void DisableHardwareAcceleration() override
+  {
+    sDXVAEnabled = false;
+  }
+
+  virtual bool SupportsSharedDecoders(const VideoInfo& aConfig) const override;
+
+  virtual ConversionRequired
+  DecoderNeedsConversion(const TrackInfo& aConfig) const override;
+
+  // Accessors that report whether we have the required MFTs available
+  // on the system to play various codecs. Windows Vista doesn't have the
+  // H.264/AAC decoders if the "Platform Update Supplement for Windows Vista"
+  // is not installed.
+  static bool HasAAC();
+  static bool HasH264();
+
+  // Called on main thread.
+  static void Init();
+private:
+  bool ShouldUseDXVA(const VideoInfo& aConfig) const;
+
+  static bool sIsWMFEnabled;
+  static bool sDXVAEnabled;
+};
+
+} // namespace mozilla
+
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wmf/WMFMediaDataDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wmf/WMFMediaDataDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wmf/WMFMediaDataDecoder.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wmf/WMFMediaDataDecoder.cpp	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,243 @@
+/* -*- 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 "WMFMediaDataDecoder.h"
+#include "VideoUtils.h"
+#include "WMFUtils.h"
+#include "nsTArray.h"
+#include "mozilla/Telemetry.h"
+
+#include "mozilla/Logging.h"
+
+PRLogModuleInfo* GetDemuxerLog();
+#define LOG(...) MOZ_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__))
+
+namespace mozilla {
+
+WMFMediaDataDecoder::WMFMediaDataDecoder(MFTManager* aMFTManager,
+                                         FlushableMediaTaskQueue* aTaskQueue,
+                                         MediaDataDecoderCallback* aCallback)
+  : mTaskQueue(aTaskQueue)
+  , mCallback(aCallback)
+  , mMFTManager(aMFTManager)
+  , mMonitor("WMFMediaDataDecoder")
+  , mIsFlushing(false)
+  , mIsShutDown(false)
+{
+}
+
+WMFMediaDataDecoder::~WMFMediaDataDecoder()
+{
+}
+
+nsresult
+WMFMediaDataDecoder::Init()
+{
+  MOZ_ASSERT(!mDecoder);
+  MOZ_ASSERT(!mIsShutDown);
+
+  mDecoder = mMFTManager->Init();
+  NS_ENSURE_TRUE(mDecoder, NS_ERROR_FAILURE);
+
+  return NS_OK;
+}
+
+// A single telemetry sample is reported for each MediaDataDecoder object
+// that has detected error or produced output successfully.
+static void
+SendTelemetry(HRESULT hr)
+{
+  // Collapse the error codes into a range of 0-0xff that can be viewed in
+  // telemetry histograms.  For most MF_E_* errors, unique samples are used,
+  // retaining the least significant 7 or 8 bits.  Other error codes are
+  // bucketed.
+  uint32_t sample;
+  if (SUCCEEDED(hr)) {
+    sample = 0;
+  } else if (hr < 0xc00d36b0) {
+    sample = 1; // low bucket
+  } else if (hr < 0xc00d3700) {
+    sample = hr & 0xffU; // MF_E_*
+  } else if (hr <= 0xc00d3705) {
+    sample = 0x80 + (hr & 0xfU); // more MF_E_*
+  } else if (hr < 0xc00d6d60) {
+    sample = 2; // mid bucket
+  } else if (hr <= 0xc00d6d78) {
+    sample = hr & 0xffU; // MF_E_TRANSFORM_*
+  } else {
+    sample = 3; // high bucket
+  }
+
+  nsCOMPtr<nsIRunnable> runnable = NS_NewRunnableFunction(
+    [sample] {
+      Telemetry::Accumulate(Telemetry::MEDIA_WMF_DECODE_ERROR, sample);
+    });
+  NS_DispatchToMainThread(runnable);
+}
+
+nsresult
+WMFMediaDataDecoder::Shutdown()
+{
+  MOZ_DIAGNOSTIC_ASSERT(!mIsShutDown);
+
+  if (mTaskQueue) {
+    nsCOMPtr<nsIRunnable> runnable =
+      NS_NewRunnableMethod(this, &WMFMediaDataDecoder::ProcessShutdown);
+    mTaskQueue->Dispatch(runnable.forget());
+  } else {
+    ProcessShutdown();
+  }
+  mIsShutDown = true;
+  return NS_OK;
+}
+
+void
+WMFMediaDataDecoder::ProcessShutdown()
+{
+  if (mMFTManager) {
+    mMFTManager->Shutdown();
+    mMFTManager = nullptr;
+    if (!mRecordedError && mHasSuccessfulOutput) {
+      SendTelemetry(S_OK);
+    }
+  }
+  mDecoder = nullptr;
+}
+
+// Inserts data into the decoder's pipeline.
+nsresult
+WMFMediaDataDecoder::Input(MediaRawData* aSample)
+{
+  MOZ_ASSERT(mCallback->OnReaderTaskQueue());
+  MOZ_DIAGNOSTIC_ASSERT(!mIsShutDown);
+
+  nsCOMPtr<nsIRunnable> runnable =
+    NS_NewRunnableMethodWithArg<nsRefPtr<MediaRawData>>(
+      this,
+      &WMFMediaDataDecoder::ProcessDecode,
+      nsRefPtr<MediaRawData>(aSample));
+  mTaskQueue->Dispatch(runnable.forget());
+  return NS_OK;
+}
+
+void
+WMFMediaDataDecoder::ProcessDecode(MediaRawData* aSample)
+{
+  {
+    MonitorAutoLock mon(mMonitor);
+    if (mIsFlushing) {
+      // Skip sample, to be released by runnable.
+      return;
+    }
+  }
+
+  HRESULT hr = mMFTManager->Input(aSample);
+  if (FAILED(hr)) {
+    NS_WARNING("MFTManager rejected sample");
+    mCallback->Error();
+    if (!mRecordedError) {
+      SendTelemetry(hr);
+      mRecordedError = true;
+    }
+    return;
+  }
+
+  mLastStreamOffset = aSample->mOffset;
+
+  ProcessOutput();
+}
+
+void
+WMFMediaDataDecoder::ProcessOutput()
+{
+  nsRefPtr<MediaData> output;
+  HRESULT hr = S_OK;
+  while (SUCCEEDED(hr = mMFTManager->Output(mLastStreamOffset, output)) &&
+         output) {
+    mHasSuccessfulOutput = true;
+    mCallback->Output(output);
+  }
+  if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) {
+    if (mTaskQueue->IsEmpty()) {
+      mCallback->InputExhausted();
+    }
+  } else if (FAILED(hr)) {
+    NS_WARNING("WMFMediaDataDecoder failed to output data");
+    mCallback->Error();
+    if (!mRecordedError) {
+      SendTelemetry(hr);
+      mRecordedError = true;
+    }
+  }
+}
+
+void
+WMFMediaDataDecoder::ProcessFlush()
+{
+  if (mDecoder) {
+    mDecoder->Flush();
+  }
+  MonitorAutoLock mon(mMonitor);
+  mIsFlushing = false;
+  mon.NotifyAll();
+}
+
+nsresult
+WMFMediaDataDecoder::Flush()
+{
+  MOZ_ASSERT(mCallback->OnReaderTaskQueue());
+  MOZ_DIAGNOSTIC_ASSERT(!mIsShutDown);
+
+  nsCOMPtr<nsIRunnable> runnable =
+    NS_NewRunnableMethod(this, &WMFMediaDataDecoder::ProcessFlush);
+  MonitorAutoLock mon(mMonitor);
+  mIsFlushing = true;
+  mTaskQueue->Dispatch(runnable.forget());
+  while (mIsFlushing) {
+    mon.Wait();
+  }
+  return NS_OK;
+}
+
+void
+WMFMediaDataDecoder::ProcessDrain()
+{
+  bool isFlushing;
+  {
+    MonitorAutoLock mon(mMonitor);
+    isFlushing = mIsFlushing;
+  }
+  if (!isFlushing && mDecoder) {
+    // Order the decoder to drain...
+    if (FAILED(mDecoder->SendMFTMessage(MFT_MESSAGE_COMMAND_DRAIN, 0))) {
+      NS_WARNING("Failed to send DRAIN command to MFT");
+    }
+    // Then extract all available output.
+    ProcessOutput();
+  }
+  mCallback->DrainComplete();
+}
+
+nsresult
+WMFMediaDataDecoder::Drain()
+{
+  MOZ_ASSERT(mCallback->OnReaderTaskQueue());
+  MOZ_DIAGNOSTIC_ASSERT(!mIsShutDown);
+
+  nsCOMPtr<nsIRunnable> runnable =
+    NS_NewRunnableMethod(this, &WMFMediaDataDecoder::ProcessDrain);
+  mTaskQueue->Dispatch(runnable.forget());
+  return NS_OK;
+}
+
+bool
+WMFMediaDataDecoder::IsHardwareAccelerated() const {
+  MOZ_ASSERT(!mIsShutDown);
+
+  return mMFTManager && mMFTManager->IsHardwareAccelerated();
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wmf/WMFMediaDataDecoder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wmf/WMFMediaDataDecoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wmf/WMFMediaDataDecoder.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wmf/WMFMediaDataDecoder.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,120 @@
+/* -*- 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(WMFMediaDataDecoder_h_)
+#define WMFMediaDataDecoder_h_
+
+
+#include "WMF.h"
+#include "MP4Reader.h"
+#include "MFTDecoder.h"
+#include "mozilla/RefPtr.h"
+
+namespace mozilla {
+
+// Encapsulates the initialization of the MFTDecoder appropriate for decoding
+// a given stream, and the process of converting the IMFSample produced
+// by the MFT into a MediaData object.
+class MFTManager {
+public:
+  virtual ~MFTManager() {}
+
+  // Creates an initializs the MFTDecoder.
+  // Returns nullptr on failure.
+  virtual TemporaryRef<MFTDecoder> Init() = 0;
+
+  // Submit a compressed sample for decoding.
+  // This should forward to the MFTDecoder after performing
+  // any required sample formatting.
+  virtual HRESULT Input(MediaRawData* aSample) = 0;
+
+  // Produces decoded output, if possible. Blocks until output can be produced,
+  // or until no more is able to be produced.
+  // Returns S_OK on success, or MF_E_TRANSFORM_NEED_MORE_INPUT if there's not
+  // enough data to produce more output. If this returns a failure code other
+  // than MF_E_TRANSFORM_NEED_MORE_INPUT, an error will be reported to the
+  // MP4Reader.
+  virtual HRESULT Output(int64_t aStreamOffset,
+                         nsRefPtr<MediaData>& aOutput) = 0;
+
+  // Destroys all resources.
+  virtual void Shutdown() = 0;
+
+  virtual bool IsHardwareAccelerated() const { return false; }
+
+};
+
+// Decodes audio and video using Windows Media Foundation. Samples are decoded
+// using the MFTDecoder created by the MFTManager. This class implements
+// the higher-level logic that drives mapping the MFT to the async
+// MediaDataDecoder interface. The specifics of decoding the exact stream
+// type are handled by MFTManager and the MFTDecoder it creates.
+class WMFMediaDataDecoder : public MediaDataDecoder {
+public:
+  WMFMediaDataDecoder(MFTManager* aOutputSource,
+                      FlushableMediaTaskQueue* aAudioTaskQueue,
+                      MediaDataDecoderCallback* aCallback);
+  ~WMFMediaDataDecoder();
+
+  virtual nsresult Init() override;
+
+  virtual nsresult Input(MediaRawData* aSample);
+
+  virtual nsresult Flush() override;
+
+  virtual nsresult Drain() override;
+
+  virtual nsresult Shutdown() override;
+
+  virtual bool IsHardwareAccelerated() const override;
+
+private:
+
+  // Called on the task queue. Inserts the sample into the decoder, and
+  // extracts output if available.
+  void ProcessDecode(MediaRawData* aSample);
+
+  // Called on the task queue. Extracts output if available, and delivers
+  // it to the reader. Called after ProcessDecode() and ProcessDrain().
+  void ProcessOutput();
+
+  // Called on the task queue. Orders the MFT to flush.  There is no output to
+  // extract.
+  void ProcessFlush();
+
+  // Called on the task queue. Orders the MFT to drain, and then extracts
+  // all available output.
+  void ProcessDrain();
+
+  void ProcessShutdown();
+
+  RefPtr<FlushableMediaTaskQueue> mTaskQueue;
+  MediaDataDecoderCallback* mCallback;
+
+  RefPtr<MFTDecoder> mDecoder;
+  nsAutoPtr<MFTManager> mMFTManager;
+
+  // The last offset into the media resource that was passed into Input().
+  // This is used to approximate the decoder's position in the media resource.
+  int64_t mLastStreamOffset;
+
+  // For access to and waiting on mIsFlushing
+  Monitor mMonitor;
+  // Set on reader/decode thread calling Flush() to indicate that output is
+  // not required and so input samples on mTaskQueue need not be processed.
+  // Cleared on mTaskQueue.
+  bool mIsFlushing;
+
+  bool mIsShutDown;
+
+  // For telemetry
+  bool mHasSuccessfulOutput = false;
+  bool mRecordedError = false;
+};
+
+} // namespace mozilla
+
+#endif // WMFMediaDataDecoder_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wmf/WMFVideoMFTManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wmf/WMFVideoMFTManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wmf/WMFVideoMFTManager.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wmf/WMFVideoMFTManager.cpp	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,540 @@
+/* -*- 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 <algorithm>
+#include "WMFVideoMFTManager.h"
+#include "MediaDecoderReader.h"
+#include "WMFUtils.h"
+#include "ImageContainer.h"
+#include "VideoUtils.h"
+#include "DXVA2Manager.h"
+#include "nsThreadUtils.h"
+#include "Layers.h"
+#include "mozilla/layers/LayersTypes.h"
+#include "MediaInfo.h"
+#include "mozilla/Logging.h"
+#include "gfx2DGlue.h"
+#include "gfxWindowsPlatform.h"
+#include "IMFYCbCrImage.h"
+#include "mozilla/WindowsVersion.h"
+
+PRLogModuleInfo* GetDemuxerLog();
+#define LOG(...) MOZ_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__))
+
+using mozilla::layers::Image;
+using mozilla::layers::IMFYCbCrImage;
+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(
+                            const VideoInfo& aConfig,
+                            mozilla::layers::LayersBackend aLayersBackend,
+                            mozilla::layers::ImageContainer* aImageContainer,
+                            bool aDXVAEnabled)
+  : mImageContainer(aImageContainer)
+  , mDXVAEnabled(aDXVAEnabled)
+  , mLayersBackend(aLayersBackend)
+  // mVideoStride, mVideoWidth, mVideoHeight, mUseHwAccel are initialized in
+  // Init().
+{
+  MOZ_COUNT_CTOR(WMFVideoMFTManager);
+
+  // Need additional checks/params to check vp8/vp9
+  if (aConfig.mMimeType.EqualsLiteral("video/mp4") ||
+      aConfig.mMimeType.EqualsLiteral("video/avc")) {
+    mStreamType = H264;
+  } else if (aConfig.mMimeType.EqualsLiteral("video/webm; codecs=vp8")) {
+    mStreamType = VP8;
+  } else if (aConfig.mMimeType.EqualsLiteral("video/webm; codecs=vp9")) {
+    mStreamType = VP9;
+  } else {
+    mStreamType = Unknown;
+  }
+}
+
+WMFVideoMFTManager::~WMFVideoMFTManager()
+{
+  MOZ_COUNT_DTOR(WMFVideoMFTManager);
+  // Ensure DXVA/D3D9 related objects are released on the main thread.
+  if (mDXVA2Manager) {
+    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:
+  CreateDXVAManagerEvent(LayersBackend aBackend)
+    : mBackend(aBackend)
+  {}
+
+  NS_IMETHOD Run() {
+    NS_ASSERTION(NS_IsMainThread(), "Must be on main thread.");
+    if (mBackend == LayersBackend::LAYERS_D3D11 &&
+        IsWin8OrLater()) {
+      mDXVA2Manager = DXVA2Manager::CreateD3D11DXVA();
+    } else {
+      mDXVA2Manager = DXVA2Manager::CreateD3D9DXVA();
+    }
+    return NS_OK;
+  }
+  nsAutoPtr<DXVA2Manager> mDXVA2Manager;
+  LayersBackend mBackend;
+};
+
+bool
+WMFVideoMFTManager::InitializeDXVA(bool aForceD3D9)
+{
+  MOZ_ASSERT(!mDXVA2Manager);
+
+  // If we use DXVA but aren't running with a D3D layer manager then the
+  // readback of decoded video frames from GPU to CPU memory grinds painting
+  // to a halt, and makes playback performance *worse*.
+  if (!mDXVAEnabled ||
+      (mLayersBackend != LayersBackend::LAYERS_D3D9 &&
+       mLayersBackend != LayersBackend::LAYERS_D3D11)) {
+    return false;
+  }
+
+  // The DXVA manager must be created on the main thread.
+  nsRefPtr<CreateDXVAManagerEvent> event = 
+    new CreateDXVAManagerEvent(aForceD3D9 ? LayersBackend::LAYERS_D3D9 : mLayersBackend);
+
+  if (NS_IsMainThread()) {
+    event->Run();
+  } else {
+    NS_DispatchToMainThread(event, NS_DISPATCH_SYNC);
+  }
+  mDXVA2Manager = event->mDXVA2Manager;
+
+  return mDXVA2Manager != nullptr;
+}
+
+TemporaryRef<MFTDecoder>
+WMFVideoMFTManager::Init()
+{
+  RefPtr<MFTDecoder> decoder = InitInternal(/* aForceD3D9 = */ false);
+
+  // If initialization failed with d3d11 DXVA then try falling back
+  // to d3d9.
+  if (!decoder && mDXVA2Manager && mDXVA2Manager->IsD3D11()) {
+    mDXVA2Manager = nullptr;
+    decoder = InitInternal(true);
+  }
+
+  return decoder.forget();
+}
+
+TemporaryRef<MFTDecoder>
+WMFVideoMFTManager::InitInternal(bool aForceD3D9)
+{
+  mUseHwAccel = false; // default value; changed if D3D setup succeeds.
+  bool useDxva = InitializeDXVA(aForceD3D9);
+
+  RefPtr<MFTDecoder> decoder(new MFTDecoder());
+
+  HRESULT hr = decoder->Create(GetMFTGUID());
+  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
+
+  if (useDxva) {
+    RefPtr<IMFAttributes> attr(decoder->GetAttributes());
+
+    UINT32 aware = 0;
+    if (attr) {
+      attr->GetUINT32(MF_SA_D3D_AWARE, &aware);
+    }
+    if (aware) {
+      // TODO: Test if I need this anywhere... Maybe on Vista?
+      //hr = attr->SetUINT32(CODECAPI_AVDecVideoAcceleration_H264, TRUE);
+      //NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+      MOZ_ASSERT(mDXVA2Manager);
+      ULONG_PTR manager = ULONG_PTR(mDXVA2Manager->GetDXVADeviceManager());
+      hr = decoder->SendMFTMessage(MFT_MESSAGE_SET_D3D_MANAGER, manager);
+      if (SUCCEEDED(hr)) {
+        mUseHwAccel = true;
+      }
+    }
+  }
+
+  // Setup the input/output media types.
+  RefPtr<IMFMediaType> inputType;
+  hr = wmf::MFCreateMediaType(byRef(inputType));
+  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
+
+  hr = inputType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Video);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
+
+  hr = inputType->SetGUID(MF_MT_SUBTYPE, GetMediaSubtypeGUID());
+  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
+
+  hr = inputType->SetUINT32(MF_MT_INTERLACE_MODE, MFVideoInterlace_MixedInterlaceOrProgressive);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
+
+  RefPtr<IMFMediaType> outputType;
+  hr = wmf::MFCreateMediaType(byRef(outputType));
+  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
+
+  hr = outputType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Video);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
+
+  GUID outputSubType = mUseHwAccel ? MFVideoFormat_NV12 : MFVideoFormat_YV12;
+  hr = outputType->SetGUID(MF_MT_SUBTYPE, outputSubType);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
+
+  hr = decoder->SetMediaTypes(inputType, outputType);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
+
+  mDecoder = decoder;
+  LOG("Video Decoder initialized, Using DXVA: %s", (mUseHwAccel ? "Yes" : "No"));
+
+  // Just in case ConfigureVideoFrameGeometry() does not set these
+  mVideoInfo = VideoInfo();
+  mVideoStride = 0;
+  mVideoWidth = 0;
+  mVideoHeight = 0;
+  mPictureRegion.SetEmpty();
+
+  return decoder.forget();
+}
+
+HRESULT
+WMFVideoMFTManager::Input(MediaRawData* aSample)
+{
+  if (!mDecoder) {
+    // This can happen during shutdown.
+    return E_FAIL;
+  }
+  // Forward sample data to the decoder.
+  return mDecoder->Input(aSample->mData,
+                         uint32_t(aSample->mSize),
+                         aSample->mTime);
+}
+
+HRESULT
+WMFVideoMFTManager::ConfigureVideoFrameGeometry()
+{
+  RefPtr<IMFMediaType> mediaType;
+  HRESULT hr = mDecoder->GetOutputMediaType(mediaType);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  // Verify that the video subtype is what we expect it to be.
+  // When using hardware acceleration/DXVA2 the video format should
+  // be NV12, which is DXVA2's preferred format. For software decoding
+  // we use YV12, as that's easier for us to stick into our rendering
+  // pipeline than NV12. NV12 has interleaved UV samples, whereas YV12
+  // is a planar format.
+  GUID videoFormat;
+  hr = mediaType->GetGUID(MF_MT_SUBTYPE, &videoFormat);
+  NS_ENSURE_TRUE(videoFormat == MFVideoFormat_NV12 || !mUseHwAccel, E_FAIL);
+  NS_ENSURE_TRUE(videoFormat == MFVideoFormat_YV12 || mUseHwAccel, E_FAIL);
+
+  nsIntRect pictureRegion;
+  hr = GetPictureRegion(mediaType, pictureRegion);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  UINT32 width = 0, height = 0;
+  hr = MFGetAttributeSize(mediaType, MF_MT_FRAME_SIZE, &width, &height);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  uint32_t aspectNum = 0, aspectDenom = 0;
+  hr = MFGetAttributeRatio(mediaType,
+                           MF_MT_PIXEL_ASPECT_RATIO,
+                           &aspectNum,
+                           &aspectDenom);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  // Calculate and validate the picture region and frame dimensions after
+  // scaling by the pixel aspect ratio.
+  nsIntSize frameSize = nsIntSize(width, height);
+  nsIntSize displaySize = nsIntSize(pictureRegion.width, pictureRegion.height);
+  ScaleDisplayByAspectRatio(displaySize, float(aspectNum) / float(aspectDenom));
+  if (!IsValidVideoRegion(frameSize, pictureRegion, displaySize)) {
+    // Video track's frame sizes will overflow. Ignore the video track.
+    return E_FAIL;
+  }
+
+  if (mDXVA2Manager) {
+    hr = mDXVA2Manager->ConfigureForSize(width, height);
+    NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+  }
+
+  // Success! Save state.
+  mVideoInfo.mDisplay = displaySize;
+  GetDefaultStride(mediaType, &mVideoStride);
+  mVideoWidth = width;
+  mVideoHeight = height;
+  mPictureRegion = pictureRegion;
+
+  LOG("WMFVideoMFTManager frame geometry frame=(%u,%u) stride=%u picture=(%d, %d, %d, %d) display=(%d,%d) PAR=%d:%d",
+      width, height,
+      mVideoStride,
+      mPictureRegion.x, mPictureRegion.y, mPictureRegion.width, mPictureRegion.height,
+      displaySize.width, displaySize.height,
+      aspectNum, aspectDenom);
+
+  return S_OK;
+}
+
+HRESULT
+WMFVideoMFTManager::CreateBasicVideoFrame(IMFSample* aSample,
+                                          int64_t aStreamOffset,
+                                          VideoData** aOutVideoData)
+{
+  NS_ENSURE_TRUE(aSample, E_POINTER);
+  NS_ENSURE_TRUE(aOutVideoData, E_POINTER);
+
+  *aOutVideoData = nullptr;
+
+  HRESULT hr;
+  RefPtr<IMFMediaBuffer> buffer;
+
+  // Must convert to contiguous buffer to use IMD2DBuffer interface.
+  hr = aSample->ConvertToContiguousBuffer(byRef(buffer));
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+
+  // Try and use the IMF2DBuffer interface if available, otherwise fallback
+  // to the IMFMediaBuffer interface. Apparently IMF2DBuffer is more efficient,
+  // but only some systems (Windows 8?) support it.
+  BYTE* data = nullptr;
+  LONG stride = 0;
+  RefPtr<IMF2DBuffer> twoDBuffer;
+  hr = buffer->QueryInterface(static_cast<IMF2DBuffer**>(byRef(twoDBuffer)));
+  if (SUCCEEDED(hr)) {
+    hr = twoDBuffer->Lock2D(&data, &stride);
+    NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+  } else {
+    hr = buffer->Lock(&data, nullptr, nullptr);
+    NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+    stride = mVideoStride;
+  }
+
+  // YV12, planar format: [YYYY....][VVVV....][UUUU....]
+  // i.e., Y, then V, then U.
+  VideoData::YCbCrBuffer b;
+
+  // Y (Y') plane
+  b.mPlanes[0].mData = data;
+  b.mPlanes[0].mStride = stride;
+  b.mPlanes[0].mHeight = mVideoHeight;
+  b.mPlanes[0].mWidth = mVideoWidth;
+  b.mPlanes[0].mOffset = 0;
+  b.mPlanes[0].mSkip = 0;
+
+  // The V and U planes are stored 16-row-aligned, so we need to add padding
+  // to the row heights to ensure the Y'CbCr planes are referenced properly.
+  uint32_t padding = 0;
+  if (mVideoHeight % 16 != 0) {
+    padding = 16 - (mVideoHeight % 16);
+  }
+  uint32_t y_size = stride * (mVideoHeight + padding);
+  uint32_t v_size = stride * (mVideoHeight + padding) / 4;
+  uint32_t halfStride = (stride + 1) / 2;
+  uint32_t halfHeight = (mVideoHeight + 1) / 2;
+  uint32_t halfWidth = (mVideoWidth + 1) / 2;
+
+  // U plane (Cb)
+  b.mPlanes[1].mData = data + y_size + v_size;
+  b.mPlanes[1].mStride = halfStride;
+  b.mPlanes[1].mHeight = halfHeight;
+  b.mPlanes[1].mWidth = halfWidth;
+  b.mPlanes[1].mOffset = 0;
+  b.mPlanes[1].mSkip = 0;
+
+  // V plane (Cr)
+  b.mPlanes[2].mData = data + y_size;
+  b.mPlanes[2].mStride = halfStride;
+  b.mPlanes[2].mHeight = halfHeight;
+  b.mPlanes[2].mWidth = halfWidth;
+  b.mPlanes[2].mOffset = 0;
+  b.mPlanes[2].mSkip = 0;
+
+  Microseconds pts = GetSampleTime(aSample);
+  Microseconds duration = GetSampleDuration(aSample);
+
+  nsRefPtr<layers::PlanarYCbCrImage> image =
+    new IMFYCbCrImage(buffer, twoDBuffer);
+
+  VideoData::SetVideoDataToImage(image,
+                                 mVideoInfo,
+                                 b,
+                                 mPictureRegion,
+                                 false);
+
+  nsRefPtr<VideoData> v =
+    VideoData::CreateFromImage(mVideoInfo,
+                               mImageContainer,
+                               aStreamOffset,
+                               std::max(0LL, pts),
+                               duration,
+                               image.forget(),
+                               false,
+                               -1,
+                               mPictureRegion);
+
+  v.forget(aOutVideoData);
+  return S_OK;
+}
+
+HRESULT
+WMFVideoMFTManager::CreateD3DVideoFrame(IMFSample* aSample,
+                                        int64_t aStreamOffset,
+                                        VideoData** aOutVideoData)
+{
+  NS_ENSURE_TRUE(aSample, E_POINTER);
+  NS_ENSURE_TRUE(aOutVideoData, E_POINTER);
+  NS_ENSURE_TRUE(mDXVA2Manager, E_ABORT);
+  NS_ENSURE_TRUE(mUseHwAccel, E_ABORT);
+
+  *aOutVideoData = nullptr;
+  HRESULT hr;
+
+  nsRefPtr<Image> image;
+  hr = mDXVA2Manager->CopyToImage(aSample,
+                                  mPictureRegion,
+                                  mImageContainer,
+                                  getter_AddRefs(image));
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+  NS_ENSURE_TRUE(image, E_FAIL);
+
+  Microseconds pts = GetSampleTime(aSample);
+  Microseconds duration = GetSampleDuration(aSample);
+  nsRefPtr<VideoData> v = VideoData::CreateFromImage(mVideoInfo,
+                                                     mImageContainer,
+                                                     aStreamOffset,
+                                                     pts,
+                                                     duration,
+                                                     image.forget(),
+                                                     false,
+                                                     -1,
+                                                     mPictureRegion);
+
+  NS_ENSURE_TRUE(v, E_FAIL);
+  v.forget(aOutVideoData);
+
+  return S_OK;
+}
+
+// Blocks until decoded sample is produced by the deoder.
+HRESULT
+WMFVideoMFTManager::Output(int64_t aStreamOffset,
+                           nsRefPtr<MediaData>& aOutData)
+{
+  RefPtr<IMFSample> sample;
+  HRESULT hr;
+  aOutData = nullptr;
+
+  // Loop until we decode a sample, or an unexpected error that we can't
+  // handle occurs.
+  while (true) {
+    hr = mDecoder->Output(&sample);
+    if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) {
+      return MF_E_TRANSFORM_NEED_MORE_INPUT;
+    }
+    if (hr == MF_E_TRANSFORM_STREAM_CHANGE) {
+      // Video stream output type change. Probably a geometric apperature
+      // change. Reconfigure the video geometry, so that we output the
+      // correct size frames.
+      MOZ_ASSERT(!sample);
+      hr = ConfigureVideoFrameGeometry();
+      NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+      // Loop back and try decoding again...
+      continue;
+    }
+    if (SUCCEEDED(hr)) {
+      break;
+    }
+    // Else unexpected error, assert, and bail.
+    NS_WARNING("WMFVideoMFTManager::Output() unexpected error");
+    return hr;
+  }
+
+  nsRefPtr<VideoData> frame;
+  if (mUseHwAccel) {
+    hr = CreateD3DVideoFrame(sample, aStreamOffset, getter_AddRefs(frame));
+  } else {
+    hr = CreateBasicVideoFrame(sample, aStreamOffset, getter_AddRefs(frame));
+  }
+  // Frame should be non null only when we succeeded.
+  MOZ_ASSERT((frame != nullptr) == SUCCEEDED(hr));
+  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+  NS_ENSURE_TRUE(frame, E_FAIL);
+
+  aOutData = frame;
+
+  return S_OK;
+}
+
+void
+WMFVideoMFTManager::Shutdown()
+{
+  mDecoder = nullptr;
+  DeleteOnMainThread(mDXVA2Manager);
+}
+
+bool
+WMFVideoMFTManager::IsHardwareAccelerated() const
+{
+  return mDecoder && mUseHwAccel;
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wmf/WMFVideoMFTManager.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wmf/WMFVideoMFTManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wmf/WMFVideoMFTManager.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wmf/WMFVideoMFTManager.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,86 @@
+/* -*- 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(WMFVideoMFTManager_h_)
+#define WMFVideoMFTManager_h_
+
+#include "WMF.h"
+#include "MP4Reader.h"
+#include "MFTDecoder.h"
+#include "nsRect.h"
+#include "WMFMediaDataDecoder.h"
+#include "mozilla/RefPtr.h"
+
+namespace mozilla {
+
+class DXVA2Manager;
+
+class WMFVideoMFTManager : public MFTManager {
+public:
+  WMFVideoMFTManager(const VideoInfo& aConfig,
+                     mozilla::layers::LayersBackend aLayersBackend,
+                     mozilla::layers::ImageContainer* aImageContainer,
+                     bool aDXVAEnabled);
+  ~WMFVideoMFTManager();
+
+  virtual TemporaryRef<MFTDecoder> Init() override;
+
+  virtual HRESULT Input(MediaRawData* aSample) override;
+
+  virtual HRESULT Output(int64_t aStreamOffset,
+                         nsRefPtr<MediaData>& aOutput) override;
+
+  virtual void Shutdown() override;
+
+  virtual bool IsHardwareAccelerated() const override;
+
+private:
+
+  bool InitializeDXVA(bool aForceD3D9);
+
+  TemporaryRef<MFTDecoder> InitInternal(bool aForceD3D9);
+
+  HRESULT ConfigureVideoFrameGeometry();
+
+  HRESULT CreateBasicVideoFrame(IMFSample* aSample,
+                                int64_t aStreamOffset,
+                                VideoData** aOutVideoData);
+
+  HRESULT CreateD3DVideoFrame(IMFSample* aSample,
+                              int64_t aStreamOffset,
+                              VideoData** aOutVideoData);
+
+  // Video frame geometry.
+  VideoInfo mVideoInfo;
+  uint32_t mVideoStride;
+  uint32_t mVideoWidth;
+  uint32_t mVideoHeight;
+  nsIntRect mPictureRegion;
+
+  RefPtr<MFTDecoder> mDecoder;
+  RefPtr<layers::ImageContainer> mImageContainer;
+  nsAutoPtr<DXVA2Manager> mDXVA2Manager;
+
+  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
+
+#endif // WMFVideoMFTManager_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wrappers/H264Converter.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wrappers/H264Converter.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wrappers/H264Converter.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wrappers/H264Converter.cpp	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,201 @@
+/* -*- 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 "H264Converter.h"
+#include "ImageContainer.h"
+#include "MediaTaskQueue.h"
+#include "MediaInfo.h"
+#include "mp4_demuxer/AnnexB.h"
+#include "mp4_demuxer/H264.h"
+
+namespace mozilla
+{
+
+H264Converter::H264Converter(PlatformDecoderModule* aPDM,
+                             const VideoInfo& aConfig,
+                             layers::LayersBackend aLayersBackend,
+                             layers::ImageContainer* aImageContainer,
+                             FlushableMediaTaskQueue* aVideoTaskQueue,
+                             MediaDataDecoderCallback* aCallback)
+  : mPDM(aPDM)
+  , mCurrentConfig(aConfig)
+  , mLayersBackend(aLayersBackend)
+  , mImageContainer(aImageContainer)
+  , mVideoTaskQueue(aVideoTaskQueue)
+  , mCallback(aCallback)
+  , mDecoder(nullptr)
+  , mNeedAVCC(aPDM->DecoderNeedsConversion(aConfig) == PlatformDecoderModule::kNeedAVCC)
+  , mLastError(NS_OK)
+{
+  CreateDecoder();
+}
+
+H264Converter::~H264Converter()
+{
+}
+
+nsresult
+H264Converter::Init()
+{
+  if (mDecoder) {
+    return mDecoder->Init();
+  }
+  return mLastError;
+}
+
+nsresult
+H264Converter::Input(MediaRawData* aSample)
+{
+  if (!mNeedAVCC) {
+    if (!mp4_demuxer::AnnexB::ConvertSampleToAnnexB(aSample)) {
+      return NS_ERROR_FAILURE;
+    }
+  } else {
+    if (!mp4_demuxer::AnnexB::ConvertSampleToAVCC(aSample)) {
+      return NS_ERROR_FAILURE;
+    }
+  }
+  nsresult rv;
+  if (!mDecoder) {
+    // It is not possible to create an AVCC H264 decoder without SPS.
+    // As such, creation will fail if the extra_data just extracted doesn't
+    // contain a SPS.
+    rv = CreateDecoderAndInit(aSample);
+    if (rv == NS_ERROR_NOT_INITIALIZED) {
+      // We are missing the required SPS to create the decoder.
+      // Ignore for the time being, the MediaRawData will be dropped.
+      return NS_OK;
+    }
+  } else {
+    rv = CheckForSPSChange(aSample);
+  }
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  aSample->mExtraData = mCurrentConfig.mExtraData;
+
+  return mDecoder->Input(aSample);
+}
+
+nsresult
+H264Converter::Flush()
+{
+  if (mDecoder) {
+    return mDecoder->Flush();
+  }
+  return mLastError;
+}
+
+nsresult
+H264Converter::Drain()
+{
+  if (mDecoder) {
+    return mDecoder->Drain();
+  }
+  return mLastError;
+}
+
+nsresult
+H264Converter::Shutdown()
+{
+  if (mDecoder) {
+    nsresult rv = mDecoder->Shutdown();
+    mDecoder = nullptr;
+    return rv;
+  }
+  return NS_OK;
+}
+
+bool
+H264Converter::IsHardwareAccelerated() const
+{
+  if (mDecoder) {
+    return mDecoder->IsHardwareAccelerated();
+  }
+  return MediaDataDecoder::IsHardwareAccelerated();
+}
+
+nsresult
+H264Converter::CreateDecoder()
+{
+  if (mNeedAVCC && !mp4_demuxer::AnnexB::HasSPS(mCurrentConfig.mExtraData)) {
+    // nothing found yet, will try again later
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+  UpdateConfigFromExtraData(mCurrentConfig.mExtraData);
+
+  mDecoder = mPDM->CreateVideoDecoder(mCurrentConfig,
+                                      mLayersBackend,
+                                      mImageContainer,
+                                      mVideoTaskQueue,
+                                      mCallback);
+  if (!mDecoder) {
+    mLastError = NS_ERROR_FAILURE;
+    return NS_ERROR_FAILURE;
+  }
+  return NS_OK;
+}
+
+nsresult
+H264Converter::CreateDecoderAndInit(MediaRawData* aSample)
+{
+  nsRefPtr<MediaByteBuffer> extra_data =
+    mp4_demuxer::AnnexB::ExtractExtraData(aSample);
+  if (!mp4_demuxer::AnnexB::HasSPS(extra_data)) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+  UpdateConfigFromExtraData(extra_data);
+
+  nsresult rv = CreateDecoder();
+  NS_ENSURE_SUCCESS(rv, rv);
+  return Init();
+}
+
+nsresult
+H264Converter::CheckForSPSChange(MediaRawData* aSample)
+{
+  nsRefPtr<MediaByteBuffer> extra_data =
+    mp4_demuxer::AnnexB::ExtractExtraData(aSample);
+  if (!mp4_demuxer::AnnexB::HasSPS(extra_data) ||
+      mp4_demuxer::AnnexB::CompareExtraData(extra_data,
+                                            mCurrentConfig.mExtraData)) {
+        return NS_OK;
+      }
+  if (!mNeedAVCC) {
+    UpdateConfigFromExtraData(extra_data);
+    mDecoder->ConfigurationChanged(mCurrentConfig);
+    return NS_OK;
+  }
+  // The SPS has changed, signal to flush the current decoder and create a
+  // new one.
+  mDecoder->Flush();
+  Shutdown();
+  return CreateDecoderAndInit(aSample);
+}
+
+void
+H264Converter::UpdateConfigFromExtraData(MediaByteBuffer* aExtraData)
+{
+  mp4_demuxer::SPSData spsdata;
+  if (mp4_demuxer::H264::DecodeSPSFromExtraData(aExtraData, spsdata) &&
+      spsdata.pic_width > 0 && spsdata.pic_height > 0) {
+    mp4_demuxer::H264::EnsureSPSIsSane(spsdata);
+    mCurrentConfig.mImage.width = spsdata.pic_width;
+    mCurrentConfig.mImage.height = spsdata.pic_height;
+    mCurrentConfig.mDisplay.width = spsdata.display_width;
+    mCurrentConfig.mDisplay.height = spsdata.display_height;
+  }
+  mCurrentConfig.mExtraData = aExtraData;
+}
+
+/* static */
+bool
+H264Converter::IsH264(const TrackInfo& aConfig)
+{
+  return aConfig.mMimeType.EqualsLiteral("video/avc") ||
+    aConfig.mMimeType.EqualsLiteral("video/mp4");
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wrappers/H264Converter.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wrappers/H264Converter.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/platforms/wrappers/H264Converter.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/platforms/wrappers/H264Converter.h	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,64 @@
+/* -*- 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_H264Converter_h
+#define mozilla_H264Converter_h
+
+#include "PlatformDecoderModule.h"
+
+namespace mozilla {
+
+// H264Converter is a MediaDataDecoder wrapper used to ensure that
+// only AVCC or AnnexB is fed to the underlying MediaDataDecoder.
+// The H264Converter allows playback of content where the SPS NAL may not be
+// provided in the init segment (e.g. AVC3 or Annex B)
+// H264Converter will monitor the input data, and will delay creation of the
+// MediaDataDecoder until a SPS and PPS NALs have been extracted.
+
+class H264Converter : public MediaDataDecoder {
+public:
+
+  H264Converter(PlatformDecoderModule* aPDM,
+                const VideoInfo& aConfig,
+                layers::LayersBackend aLayersBackend,
+                layers::ImageContainer* aImageContainer,
+                FlushableMediaTaskQueue* aVideoTaskQueue,
+                MediaDataDecoderCallback* aCallback);
+  virtual ~H264Converter();
+
+  virtual nsresult Init() override;
+  virtual nsresult Input(MediaRawData* aSample) override;
+  virtual nsresult Flush() override;
+  virtual nsresult Drain() override;
+  virtual nsresult Shutdown() override;
+  virtual bool IsHardwareAccelerated() const override;
+
+  // Return true if mimetype is H.264.
+  static bool IsH264(const TrackInfo& aConfig);
+
+private:
+  // Will create the required MediaDataDecoder if need AVCC and we have a SPS NAL.
+  // Returns NS_ERROR_FAILURE if error is permanent and can't be recovered and
+  // will set mError accordingly.
+  nsresult CreateDecoder();
+  nsresult CreateDecoderAndInit(MediaRawData* aSample);
+  nsresult CheckForSPSChange(MediaRawData* aSample);
+  void UpdateConfigFromExtraData(MediaByteBuffer* aExtraData);
+
+  nsRefPtr<PlatformDecoderModule> mPDM;
+  VideoInfo mCurrentConfig;
+  layers::LayersBackend mLayersBackend;
+  nsRefPtr<layers::ImageContainer> mImageContainer;
+  nsRefPtr<FlushableMediaTaskQueue> mVideoTaskQueue;
+  MediaDataDecoderCallback* mCallback;
+  nsRefPtr<MediaDataDecoder> mDecoder;
+  bool mNeedAVCC;
+  nsresult mLastError;
+};
+
+} // namespace mozilla
+
+#endif // mozilla_H264Converter_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/raw/RawReader.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/raw/RawReader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/raw/RawReader.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/raw/RawReader.cpp	2015-05-25 20:43:43.000000000 +0000
@@ -284,7 +284,7 @@
   return NS_OK;
 }
 
-nsresult RawReader::GetBuffered(dom::TimeRanges* aBuffered)
+media::TimeIntervals RawReader::GetBuffered()
 {
-  return NS_OK;
+  return media::TimeIntervals();
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/raw/RawReader.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/raw/RawReader.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/raw/RawReader.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/raw/RawReader.h	2015-05-25 20:43:43.000000000 +0000
@@ -42,7 +42,7 @@
   virtual nsRefPtr<SeekPromise>
   Seek(int64_t aTime, int64_t aEndTime) override;
 
-  virtual nsresult GetBuffered(dom::TimeRanges* aBuffered) override;
+  virtual media::TimeIntervals GetBuffered() override;
 
   virtual bool IsMediaSeekable() override;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/RtspMediaResource.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/RtspMediaResource.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/RtspMediaResource.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/RtspMediaResource.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -20,17 +20,12 @@
 #endif
 using namespace mozilla::net;
 
-#ifdef PR_LOGGING
 PRLogModuleInfo* gRtspMediaResourceLog;
-#define RTSP_LOG(msg, ...) PR_LOG(gRtspMediaResourceLog, PR_LOG_DEBUG, \
+#define RTSP_LOG(msg, ...) MOZ_LOG(gRtspMediaResourceLog, PR_LOG_DEBUG, \
                                   (msg, ##__VA_ARGS__))
 // Debug logging macro with object pointer and class name.
 #define RTSPMLOG(msg, ...) \
         RTSP_LOG("%p [RtspMediaResource]: " msg, this, ##__VA_ARGS__)
-#else
-#define RTSP_LOG(msg, ...)
-#define RTSPMLOG(msg, ...)
-#endif
 
 namespace mozilla {
 
@@ -509,12 +504,10 @@
   MOZ_ASSERT(mMediaStreamController);
   mListener = new Listener(this);
   mMediaStreamController->AsyncOpen(mListener);
-#ifdef PR_LOGGING
   if (!gRtspMediaResourceLog) {
     gRtspMediaResourceLog = PR_NewLogModule("RtspMediaResource");
   }
 #endif
-#endif
 }
 
 RtspMediaResource::~RtspMediaResource()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/StateMirroring.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/StateMirroring.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/StateMirroring.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/StateMirroring.h	2015-05-25 20:43:40.000000000 +0000
@@ -16,7 +16,7 @@
 #include "mozilla/UniquePtr.h"
 #include "mozilla/unused.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsISupportsImpl.h"
 
 /*
@@ -50,7 +50,7 @@
 // the same log module.
 #define MIRROR_LOG(x, ...) \
   MOZ_ASSERT(gStateWatchingLog); \
-  PR_LOG(gStateWatchingLog, PR_LOG_DEBUG, (x, ##__VA_ARGS__))
+  MOZ_LOG(gStateWatchingLog, PR_LOG_DEBUG, (x, ##__VA_ARGS__))
 
 template<typename T> class AbstractMirror;
 
@@ -130,7 +130,7 @@
       : AbstractCanonical<T>(aThread), WatchTarget(aName), mValue(aInitialValue)
     {
       MIRROR_LOG("%s [%p] initialized", mName, this);
-      MOZ_ASSERT(aThread->RequiresTailDispatch(), "Can't get coherency without tail dispatch");
+      MOZ_ASSERT(aThread->SupportsTailDispatch(), "Can't get coherency without tail dispatch");
     }
 
     void AddMirror(AbstractMirror<T>* aMirror) override
@@ -303,6 +303,7 @@
       : AbstractMirror<T>(aThread), WatchTarget(aName), mValue(aInitialValue)
     {
       MIRROR_LOG("%s [%p] initialized", mName, this);
+      MOZ_ASSERT(aThread->SupportsTailDispatch(), "Can't get coherency without tail dispatch");
     }
 
     operator const T&()
@@ -334,6 +335,7 @@
       MIRROR_LOG("%s [%p] Connecting to %p", mName, this, aCanonical);
       MOZ_ASSERT(OwnerThread()->IsCurrentThreadIn());
       MOZ_ASSERT(!IsConnected());
+      MOZ_ASSERT(OwnerThread()->RequiresTailDispatch(aCanonical->OwnerThread()), "Can't get coherency without tail dispatch");
 
       nsCOMPtr<nsIRunnable> r = NS_NewRunnableMethodWithArg<StorensRefPtrPassByPtr<AbstractMirror<T>>>
                                   (aCanonical, &AbstractCanonical<T>::AddMirror, this);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/StateWatching.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/StateWatching.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/StateWatching.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/StateWatching.h	2015-05-25 20:43:40.000000000 +0000
@@ -60,7 +60,7 @@
 
 #define WATCH_LOG(x, ...) \
   MOZ_ASSERT(gStateWatchingLog); \
-  PR_LOG(gStateWatchingLog, PR_LOG_DEBUG, (x, ##__VA_ARGS__))
+  MOZ_LOG(gStateWatchingLog, PR_LOG_DEBUG, (x, ##__VA_ARGS__))
 
 /*
  * AbstractWatcher is a superclass from which all watchers must inherit.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/StreamBuffer.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/StreamBuffer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/StreamBuffer.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/StreamBuffer.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -4,17 +4,13 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "StreamBuffer.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include <algorithm>
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* gMediaStreamGraphLog;
-#define STREAM_LOG(type, msg) PR_LOG(gMediaStreamGraphLog, type, msg)
-#else
-#define STREAM_LOG(type, msg)
-#endif
+#define STREAM_LOG(type, msg) MOZ_LOG(gMediaStreamGraphLog, type, msg)
 
 #ifdef DEBUG
 void
@@ -67,14 +63,30 @@
 StreamBuffer::Track*
 StreamBuffer::FindTrack(TrackID aID)
 {
-  if (aID == TRACK_NONE)
+  if (aID == TRACK_NONE || mTracks.IsEmpty()) {
     return nullptr;
-  for (uint32_t i = 0; i < mTracks.Length(); ++i) {
-    Track* track = mTracks[i];
-    if (track->GetID() == aID) {
-      return track;
+  }
+
+  // The tracks are sorted by ID. We can use a binary search.
+
+  uint32_t left = 0, right = mTracks.Length() - 1;
+  while (left <= right) {
+    uint32_t middle = (left + right) / 2;
+    if (mTracks[middle]->GetID() == aID) {
+      return mTracks[middle];
+    }
+
+    if (mTracks[middle]->GetID() > aID) {
+      if (middle == 0) {
+        break;
+      }
+
+      right = middle - 1;
+    } else {
+      left = middle + 1;
     }
   }
+
   return nullptr;
 }
 
@@ -93,6 +105,7 @@
     Track* track = mTracks[i];
     if (track->IsEnded() && track->GetEnd() <= aTime) {
       mTracks.RemoveElementAt(i);
+      mTracksDirty = true;
       --i;
       continue;
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/StreamBuffer.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/StreamBuffer.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/StreamBuffer.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/StreamBuffer.h	2015-05-25 20:43:40.000000000 +0000
@@ -50,7 +50,8 @@
  * the data for each track is a MediaSegment. The set of tracks can vary
  * over the timeline of the StreamBuffer.
  */
-class StreamBuffer {
+class StreamBuffer
+{
 public:
   /**
    * Every track has a start time --- when it started in the StreamBuffer.
@@ -63,7 +64,8 @@
    * TODO Add TimeVarying<StreamTime,bool> mEnabled.
    * Takes ownership of aSegment.
    */
-  class Track {
+  class Track final
+  {
     Track(TrackID aID, StreamTime aStart, MediaSegment* aSegment)
       : mStart(aStart),
         mSegment(aSegment),
@@ -75,11 +77,13 @@
       NS_ASSERTION(aID > TRACK_NONE, "Bad track ID");
       NS_ASSERTION(0 <= aStart && aStart <= aSegment->GetDuration(), "Bad start position");
     }
+
   public:
     ~Track()
     {
       MOZ_COUNT_DTOR(Track);
     }
+
     template <class T> T* Get() const
     {
       if (mSegment->GetType() == T::StaticType()) {
@@ -87,6 +91,7 @@
       }
       return nullptr;
     }
+
     MediaSegment* GetSegment() const { return mSegment; }
     TrackID GetID() const { return mID; }
     bool IsEnded() const { return mEnded; }
@@ -129,7 +134,7 @@
       return amount;
     }
 
-  protected:
+  private:
     friend class StreamBuffer;
 
     // Start offset is in ticks at rate mRate
@@ -143,7 +148,8 @@
     bool mEnded;
   };
 
-  class CompareTracksByID {
+  class MOZ_STACK_CLASS CompareTracksByID final
+  {
   public:
     bool Equals(Track* aA, Track* aB) const {
       return aA->GetID() == aB->GetID();
@@ -154,7 +160,9 @@
   };
 
   StreamBuffer()
-    : mTracksKnownTime(0), mForgottenTime(0)
+    : mTracksKnownTime(0)
+    , mForgottenTime(0)
+    , mTracksDirty(false)
 #ifdef DEBUG
     , mGraphRateIsSet(false)
 #endif
@@ -206,6 +214,7 @@
 
     Track* track = new Track(aID, aStart, aSegment);
     mTracks.InsertElementSorted(track, CompareTracksByID());
+    mTracksDirty = true;
 
     if (mTracksKnownTime == STREAM_TIME_MAX) {
       // There exists code like
@@ -216,6 +225,7 @@
     }
     return *track;
   }
+
   void AdvanceKnownTracksTime(StreamTime aKnownTime)
   {
     NS_ASSERTION(aKnownTime >= mTracksKnownTime, "Can't move tracks-known time earlier");
@@ -241,7 +251,8 @@
 
   Track* FindTrack(TrackID aID);
 
-  class TrackIter {
+  class MOZ_STACK_CLASS TrackIter final
+  {
   public:
     /**
      * Iterate through the tracks of aBuffer in order of ID.
@@ -294,14 +305,28 @@
     return mForgottenTime;
   }
 
+  bool GetAndResetTracksDirty()
+  {
+    if (!mTracksDirty) {
+      return false;
+    }
+
+    mTracksDirty = false;
+    return true;
+  }
+
 protected:
   TrackRate mGraphRate; // StreamTime per second
   // Any new tracks added will start at or after this time. In other words, the track
   // list is complete and correct for all times less than this time.
   StreamTime mTracksKnownTime;
   StreamTime mForgottenTime;
+
+private:
   // All known tracks for this StreamBuffer
-  nsTArray<nsAutoPtr<Track> > mTracks;
+  nsTArray<nsAutoPtr<Track>> mTracks;
+  bool mTracksDirty;
+
 #ifdef DEBUG
   bool mGraphRateIsSet;
 #endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/systemservices/LoadManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/systemservices/LoadManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/systemservices/LoadManager.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/systemservices/LoadManager.cpp	2015-05-25 20:43:43.000000000 +0000
@@ -6,7 +6,7 @@
 #include "LoadManager.h"
 #include "LoadMonitor.h"
 #include "nsString.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prtime.h"
 #include "prinrval.h"
 #include "prsystem.h"
@@ -21,13 +21,8 @@
 PRLogModuleInfo *gLoadManagerLog = nullptr;
 #undef LOG
 #undef LOG_ENABLED
-#if defined(PR_LOGGING)
-#define LOG(args) PR_LOG(gLoadManagerLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gLoadManagerLog, PR_LOG_DEBUG, args)
 #define LOG_ENABLED() PR_LOG_TEST(gLoadManagerLog, 5)
-#else
-#define LOG(args)
-#define LOG_ENABLED() (false)
-#endif
 
 namespace mozilla {
 
@@ -50,10 +45,8 @@
     mHighLoadThreshold(aHighLoadThreshold),
     mLowLoadThreshold(aLowLoadThreshold)
 {
-#if defined(PR_LOGGING)
   if (!gLoadManagerLog)
     gLoadManagerLog = PR_NewLogModule("LoadManager");
-#endif
   LOG(("LoadManager - Initializing (%dms x %d, %f, %f)",
        mLoadMeasurementInterval, mAveragingMeasurements,
        mHighLoadThreshold, mLowLoadThreshold));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/systemservices/LoadMonitor.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/systemservices/LoadMonitor.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/systemservices/LoadMonitor.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/systemservices/LoadMonitor.cpp	2015-05-25 20:43:43.000000000 +0000
@@ -6,7 +6,7 @@
 #include "LoadMonitor.h"
 #include "LoadManager.h"
 #include "nsString.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prtime.h"
 #include "prinrval.h"
 #include "prsystem.h"
@@ -56,15 +56,9 @@
 // NSPR_LOG_MODULES=LoadManager:5
 #undef LOG
 #undef LOG_ENABLED
-#if defined(PR_LOGGING)
-#define LOG(args) PR_LOG(gLoadManagerLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gLoadManagerLog, PR_LOG_DEBUG, args)
 #define LOG_ENABLED() PR_LOG_TEST(gLoadManagerLog, 4)
 #define LOG_MANY_ENABLED() PR_LOG_TEST(gLoadManagerLog, 5)
-#else
-#define LOG(args)
-#define LOG_ENABLED() (false)
-#define LOG_MANY_ENABLED() (false)
-#endif
 
 namespace mozilla {
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/systemservices/MediaChild.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/systemservices/MediaChild.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/systemservices/MediaChild.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/systemservices/MediaChild.cpp	2015-05-25 20:43:43.000000000 +0000
@@ -10,17 +10,12 @@
 #include "mozilla/ipc/PBackgroundChild.h"
 #include "nsGlobalWindow.h"
 #include "mozilla/MediaManager.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsQueryObject.h"
 
 #undef LOG
-#if defined(PR_LOGGING)
 PRLogModuleInfo *gMediaChildLog;
-#define LOG(args) PR_LOG(gMediaChildLog, PR_LOG_DEBUG, args)
-#else
-#define LOG(args)
-#endif
-
+#define LOG(args) MOZ_LOG(gMediaChildLog, PR_LOG_DEBUG, args)
 
 namespace mozilla {
 namespace media {
@@ -104,11 +99,9 @@
 
 Child::Child()
 {
-#if defined(PR_LOGGING)
   if (!gMediaChildLog) {
     gMediaChildLog = PR_NewLogModule("MediaChild");
   }
-#endif
   LOG(("media::Child: %p", this));
   MOZ_COUNT_CTOR(Child);
 }
@@ -120,30 +113,16 @@
   MOZ_COUNT_DTOR(Child);
 }
 
-uint32_t Child::sRequestCounter = 0;
-
 uint32_t
 Child::AddRequestPledge(ChildPledge<nsCString>& aPledge)
 {
-  uint32_t id = ++sRequestCounter;
-  nsRefPtr<ChildPledge<nsCString>> ptr(&aPledge);
-  mRequestPledges.AppendElement(PledgeEntry(id, ptr));
-  return id;
+  return mRequestPledges.Append(aPledge);
 }
 
 already_AddRefed<ChildPledge<nsCString>>
 Child::RemoveRequestPledge(uint32_t aRequestId)
 {
-  for (PledgeEntry& entry : mRequestPledges) {
-    if (entry.first == aRequestId) {
-      nsRefPtr<ChildPledge<nsCString>> ref;
-      ref.swap(entry.second);
-      mRequestPledges.RemoveElement(entry);
-      return ref.forget();
-    }
-  }
-  MOZ_ASSERT_UNREACHABLE("Received response with no matching media::ChildPledge!");
-  return nullptr;
+  return mRequestPledges.Remove(aRequestId);
 }
 
 bool
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/systemservices/MediaChild.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/systemservices/MediaChild.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/systemservices/MediaChild.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/systemservices/MediaChild.h	2015-05-25 20:43:43.000000000 +0000
@@ -60,9 +60,7 @@
 private:
   virtual ~Child();
 
-  typedef std::pair<uint32_t,nsRefPtr<ChildPledge<nsCString>>> PledgeEntry;
-  static uint32_t sRequestCounter;
-  nsTArray<PledgeEntry> mRequestPledges;
+  CoatCheck<ChildPledge<nsCString>> mRequestPledges;
 };
 
 PMediaChild* AllocPMediaChild();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/systemservices/MediaParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/systemservices/MediaParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/systemservices/MediaParent.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/systemservices/MediaParent.cpp	2015-05-25 20:43:43.000000000 +0000
@@ -17,15 +17,11 @@
 #include "nsILineInputStream.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsISupportsImpl.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #undef LOG
-#if defined(PR_LOGGING)
 PRLogModuleInfo *gMediaParentLog;
-#define LOG(args) PR_LOG(gMediaParentLog, PR_LOG_DEBUG, args)
-#else
-#define LOG(args)
-#endif
+#define LOG(args) MOZ_LOG(gMediaParentLog, PR_LOG_DEBUG, args)
 
 // A file in the profile dir is used to persist mOriginKeys used to anonymize
 // deviceIds to be unique per origin, to avoid them being supercookies.
@@ -108,10 +104,7 @@
   class OriginKeysLoader : public OriginKeysTable
   {
   public:
-    OriginKeysLoader()
-    {
-      Load();
-    }
+    OriginKeysLoader() {}
 
     nsresult
     GetOriginKey(const nsACString& aOrigin, nsCString& result)
@@ -127,13 +120,7 @@
     already_AddRefed<nsIFile>
     GetFile()
     {
-      if (!mProfileDir) {
-        nsresult rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
-                                             getter_AddRefs(mProfileDir));
-        if (NS_WARN_IF(NS_FAILED(rv))) {
-          return nullptr;
-        }
-      }
+      MOZ_ASSERT(mProfileDir);
       nsCOMPtr<nsIFile> file;
       nsresult rv = mProfileDir->Clone(getter_AddRefs(file));
       if (NS_WARN_IF(NS_FAILED(rv))) {
@@ -321,6 +308,17 @@
       return NS_OK;
     }
 
+    void
+    SetProfileDir(nsIFile* aProfileDir)
+    {
+      MOZ_ASSERT(!NS_IsMainThread());
+      bool first = !mProfileDir;
+      mProfileDir = aProfileDir;
+      // Load from disk when we first get a profileDir, but not subsequently.
+      if (first) {
+        Load();
+      }
+    }
   private:
     nsCOMPtr<nsIFile> mProfileDir;
   };
@@ -348,8 +346,12 @@
     return sParentSingleton;
   }
 
+  // Only accessed on StreamTS thread
   OriginKeysLoader mOriginKeys;
   OriginKeysTable mPrivateBrowsingOriginKeys;
+
+  // Only accessed on return thread
+  CoatCheck<Pledge<nsCString>> mOutstandingPledges;
 };
 
 NS_IMPL_ISUPPORTS0(ParentSingleton)
@@ -359,25 +361,69 @@
                          const nsCString& aOrigin,
                          const bool& aPrivateBrowsing)
 {
-  // Hand over to stream-transport thread.
+  // TODO: Replace all this when moving MediaParent to PContent soon (1037389)
 
-  nsCOMPtr<nsIEventTarget> sts = do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID);
-  MOZ_ASSERT(sts);
   nsRefPtr<ParentSingleton> singleton(mSingleton);
+  nsCOMPtr<nsIThread> returnThread = NS_GetCurrentThread();
+  nsRefPtr<Pledge<nsCString>> p = new Pledge<nsCString>();
+  nsresult rv;
+
+  // First, over to main thread to get profile dir.
+
+  // Pledges are non-threadsafe by design, so check them and pass an id instead.
+  uint32_t id = singleton->mOutstandingPledges.Append(*p);
+
+  rv = NS_DispatchToMainThread(NewRunnableFrom([id, returnThread,
+                                                singleton, aOrigin,
+                                                aPrivateBrowsing]() -> nsresult {
+    MOZ_ASSERT(NS_IsMainThread());
+    nsCOMPtr<nsIFile> profileDir;
+    nsresult rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
+                                         getter_AddRefs(profileDir));
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+
+    // Then from there over to stream-transport thread to do the actual file io.
 
-  nsRefPtr<PledgeRunnable<nsCString>> p = PledgeRunnable<nsCString>::New(
-      [singleton, aOrigin, aPrivateBrowsing](nsCString& aResult) {
-    if (aPrivateBrowsing) {
-      singleton->mPrivateBrowsingOriginKeys.GetOriginKey(aOrigin, aResult);
-    } else {
-      singleton->mOriginKeys.GetOriginKey(aOrigin, aResult);
+    nsCOMPtr<nsIEventTarget> sts = do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID);
+    MOZ_ASSERT(sts);
+    rv = sts->Dispatch(NewRunnableFrom([profileDir, id, returnThread, singleton,
+                                        aOrigin, aPrivateBrowsing]() -> nsresult {
+      MOZ_ASSERT(!NS_IsMainThread());
+      singleton->mOriginKeys.SetProfileDir(profileDir);
+      nsCString result;
+      if (aPrivateBrowsing) {
+        singleton->mPrivateBrowsingOriginKeys.GetOriginKey(aOrigin, result);
+      } else {
+        singleton->mOriginKeys.GetOriginKey(aOrigin, result);
+      }
+
+      // Pass result back to original thread.
+      nsresult rv;
+      rv = returnThread->Dispatch(NewRunnableFrom([id, singleton,
+                                                   result]() -> nsresult {
+        nsRefPtr<Pledge<nsCString>> p = singleton->mOutstandingPledges.Remove(id);
+        if (!p) {
+          return NS_ERROR_UNEXPECTED;
+        }
+        p->Resolve(result);
+        return NS_OK;
+      }), NS_DISPATCH_NORMAL);
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return rv;
+      }
+      return NS_OK;
+    }), NS_DISPATCH_NORMAL);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
     }
     return NS_OK;
-  });
-  nsresult rv = sts->Dispatch(p, NS_DISPATCH_NORMAL);
+  }));
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return false;
   }
+
   nsRefPtr<media::Parent> keepAlive(this);
   p->Then([this, keepAlive, aRequestId](const nsCString& aKey) mutable {
     if (!mDestroyed) {
@@ -391,19 +437,36 @@
 bool
 Parent::RecvSanitizeOriginKeys(const uint64_t& aSinceWhen)
 {
-  // Hand over to stream-transport thread.
-
-  nsCOMPtr<nsIEventTarget> sts = do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID);
-  MOZ_ASSERT(sts);
   nsRefPtr<ParentSingleton> singleton(mSingleton);
 
-  nsRefPtr<PledgeRunnable<bool>> p = PledgeRunnable<bool>::New(
-      [singleton, aSinceWhen](bool) {
-    singleton->mPrivateBrowsingOriginKeys.Clear(aSinceWhen);
-    singleton->mOriginKeys.Clear(aSinceWhen);
+  // First, over to main to get profile dir.
+  nsresult rv;
+
+  rv = NS_DispatchToMainThread(NewRunnableFrom([singleton,
+                                                aSinceWhen]() -> nsresult {
+    MOZ_ASSERT(NS_IsMainThread());
+    nsCOMPtr<nsIFile> profileDir;
+    nsresult rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
+                                         getter_AddRefs(profileDir));
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+    // Then from there over to stream-transport thread to do the file io.
+
+    nsCOMPtr<nsIEventTarget> sts = do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID);
+    MOZ_ASSERT(sts);
+    rv = sts->Dispatch(NewRunnableFrom([profileDir, singleton, aSinceWhen]() -> nsresult {
+      MOZ_ASSERT(!NS_IsMainThread());
+      singleton->mOriginKeys.SetProfileDir(profileDir);
+      singleton->mPrivateBrowsingOriginKeys.Clear(aSinceWhen);
+      singleton->mOriginKeys.Clear(aSinceWhen);
+      return NS_OK;
+    }), NS_DISPATCH_NORMAL);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
     return NS_OK;
-  });
-  nsresult rv = sts->Dispatch(p, NS_DISPATCH_NORMAL);
+  }));
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return false;
   }
@@ -422,10 +485,8 @@
   : mSingleton(ParentSingleton::Get())
   , mDestroyed(false)
 {
-#if defined(PR_LOGGING)
   if (!gMediaParentLog)
     gMediaParentLog = PR_NewLogModule("MediaParent");
-#endif
   LOG(("media::Parent: %p", this));
 
   MOZ_COUNT_CTOR(Parent);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/systemservices/MediaUtils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/systemservices/MediaUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/systemservices/MediaUtils.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/systemservices/MediaUtils.h	2015-05-25 20:43:43.000000000 +0000
@@ -13,20 +13,38 @@
 namespace mozilla {
 namespace media {
 
-// A media::Pledge is a promise-like pattern for c++ that takes lambda functions.
-//
-// Asynchronous APIs that proxy to the chrome process and back, may return a
-// pledge to allow callers to use pledge.Then() to specify a lambda function to
-// invoke with the result once the asynchronous API resolves later back on the
-// same thread.
-//
-// An advantage of this pattern is that lambdas allow "capturing" of local
-// variables, much like closures in JavaScript.
+/*
+ * media::Pledge - A promise-like pattern for c++ that takes lambda functions.
+ *
+ * Asynchronous APIs that proxy to another thread or to the chrome process and
+ * back may find it useful to return a pledge to callers who then use
+ * pledge.Then(func) to specify a lambda function to be invoked with the result
+ * later back on this same thread.
+ *
+ * Callers will enjoy that lambdas allow "capturing" of local variables, much
+ * like closures in JavaScript (safely by-copy by default).
+ *
+ * Callers will also enjoy that they do not need to be thread-safe (their code
+ * runs on the same thread after all).
+ *
+ * Advantageously, pledges are non-threadsafe by design (because locking and
+ * event queues are redundant). This means none of the lambdas you pass in,
+ * or variables you lambda-capture into them, need be threasafe or support
+ * threadsafe refcounting. After all, they'll run later on the same thread.
+ *
+ *   nsRefPtr<media::Pledge<Foo>> p = GetFooAsynchronously(); // returns a pledge
+ *   p->Then([](const Foo& foo) {
+ *     // use foo here (same thread. Need not be thread-safe!)
+ *   });
+ *
+ * See media::CoatCheck below for an example of GetFooAsynchronously().
+ */
 
 template<typename ValueType>
 class Pledge
 {
   // TODO: Remove workaround once mozilla allows std::function from <functional>
+  // wo/std::function support, do template + virtual trick to accept lambdas
   class FunctorsBase
   {
   public:
@@ -37,6 +55,7 @@
   };
 
 public:
+  NS_INLINE_DECL_REFCOUNTING(Pledge);
   explicit Pledge() : mDone(false), mResult(NS_OK) {}
 
   template<typename OnSuccessType>
@@ -77,13 +96,12 @@
     }
   }
 
-protected:
   void Resolve(const ValueType& aValue)
   {
     mValue = aValue;
     Resolve();
   }
-
+protected:
   void Resolve()
   {
     if (!mDone) {
@@ -108,72 +126,56 @@
 
   ValueType mValue;
 protected:
+  ~Pledge() {};
   bool mDone;
   nsresult mResult;
 private:
   nsAutoPtr<FunctorsBase> mFunctors;
 };
 
-// General purpose runnable that also acts as a Pledge for the resulting value.
-// Use PledgeRunnable<>::New() factory function to use with lambdas.
-
-template<typename ValueType>
-class PledgeRunnable : public Pledge<ValueType>, public nsRunnable
-{
-public:
-  template<typename OnRunType>
-  static PledgeRunnable<ValueType>*
-  New(OnRunType aOnRun)
-  {
-    class P : public PledgeRunnable<ValueType>
-    {
-    public:
-      explicit P(OnRunType& aOnRun)
-      : mOriginThread(NS_GetCurrentThread())
-      , mOnRun(aOnRun)
-      , mHasRun(false) {}
-    private:
-      virtual ~P() {}
-      NS_IMETHODIMP
-      Run()
-      {
-        if (!mHasRun) {
-          P::mResult = mOnRun(P::mValue);
-          mHasRun = true;
-          return mOriginThread->Dispatch(this, NS_DISPATCH_NORMAL);
-        }
-        bool on;
-        MOZ_RELEASE_ASSERT(NS_SUCCEEDED(mOriginThread->IsOnCurrentThread(&on)));
-        MOZ_RELEASE_ASSERT(on);
-
-        if (NS_SUCCEEDED(P::mResult)) {
-          P::Resolve();
-        } else {
-          P::Reject(P::mResult);
-        }
-        return NS_OK;
-      }
-      nsCOMPtr<nsIThread> mOriginThread;
-      OnRunType mOnRun;
-      bool mHasRun;
-    };
-
-    return new P(aOnRun);
-  }
-
-protected:
-  virtual ~PledgeRunnable() {}
-};
-
-// General purpose runnable with an eye toward lambdas
+/* media::NewRunnableFrom() - Create an nsRunnable from a lambda.
+ *
+ * Passing variables (closures) to an async function is clunky with nsRunnable:
+ *
+ *   void Foo()
+ *   {
+ *     class FooRunnable : public nsRunnable
+ *     {
+ *     public:
+ *       FooRunnable(const Bar &aBar) : mBar(aBar) {}
+ *       NS_IMETHOD Run()
+ *       {
+ *         // Use mBar
+ *       }
+ *     private:
+ *       nsRefPtr<Bar> mBar;
+ *     };
+ *
+ *     nsRefPtr<Bar> bar = new Bar();
+ *     NS_DispatchToMainThread(new FooRunnable(bar);
+ *   }
+ *
+ * It's worse with more variables. Lambdas have a leg up with variable capture:
+ *
+ *   void Foo()
+ *   {
+ *     nsRefPtr<Bar> bar = new Bar();
+ *     NS_DispatchToMainThread(media::NewRunnableFrom([bar]() mutable {
+ *       // use bar
+ *     });
+ *   }
+ *
+ * Capture is by-copy by default, so the nsRefPtr 'bar' is safely copied for
+ * access on the other thread (threadsafe refcounting in bar is assumed).
+ *
+ * The 'mutable' keyword is only needed for non-const access to bar.
+ */
 
-namespace CallbackRunnable
-{
 template<typename OnRunType>
-class Impl : public nsRunnable
+class LambdaRunnable : public nsRunnable
 {
 public:
-  explicit Impl(OnRunType& aOnRun) : mOnRun(aOnRun) {}
+  explicit LambdaRunnable(OnRunType& aOnRun) : mOnRun(aOnRun) {}
 private:
   NS_IMETHODIMP
   Run()
@@ -184,13 +186,110 @@
 };
 
 template<typename OnRunType>
-Impl<OnRunType>*
-New(OnRunType aOnRun)
+LambdaRunnable<OnRunType>*
+NewRunnableFrom(OnRunType aOnRun)
 {
-  return new Impl<OnRunType>(aOnRun);
-}
+  return new LambdaRunnable<OnRunType>(aOnRun);
 }
 
+/* media::CoatCheck - There and back again. Park an object in exchange for an id.
+ *
+ * A common problem with calling asynchronous functions that do work on other
+ * threads or processes is how to pass in a heap object for use once the
+ * function completes, without requiring that object to have threadsafe
+ * refcounting, contain mutexes, be marshaled, or leak if things fail
+ * (or worse, intermittent use-after-free because of lifetime issues).
+ *
+ * One solution is to set up a coat-check on the caller side, park your object
+ * in exchange for an id, and send the id. Common in IPC, but equally useful
+ * for same-process thread-hops, because by never leaving the thread there's
+ * no need for objects to be threadsafe or use threadsafe refcounting. E.g.
+ *
+ *   class FooDoer
+ *   {
+ *     CoatCheck<Foo> mOutstandingFoos;
+ *
+ *   public:
+ *     void DoFoo()
+ *     {
+ *       nsRefPtr<Foo> foo = new Foo();
+ *       uint32_t requestId = mOutstandingFoos.Append(foo);
+ *       sChild->SendFoo(requestId);
+ *     }
+ *
+ *     void RecvFooResponse(uint32_t requestId)
+ *     {
+ *       nsRefPtr<Foo> foo = mOutstandingFoos.Remove(requestId);
+ *       if (foo) {
+ *         // use foo
+ *       }
+ *     }
+ *   };
+ *
+ * If you read media::Pledge earlier, here's how this is useful for pledges:
+ *
+ *   class FooGetter
+ *   {
+ *     CoatCheck<Foo> mOutstandingPledges;
+ *
+ *   public:
+ *     already_addRefed<Pledge<Foo>> GetFooAsynchronously()
+ *     {
+ *       nsRefPtr<Pledge<Foo>> p = new Pledge<Foo>();
+ *       uint32_t requestId = mOutstandingPledges.Append(p);
+ *       sChild->SendFoo(requestId);
+ *       return p.forget();
+ *     }
+ *
+ *     void RecvFooResponse(uint32_t requestId, const Foo& fooResult)
+ *     {
+ *       nsRefPtr<Foo> p = mOutstandingPledges.Remove(requestId);
+ *       if (p) {
+ *         p->Resolve(fooResult);
+ *       }
+ *     }
+ *   };
+ *
+ * This helper is currently optimized for very small sets (i.e. not optimized).
+ * It is also not thread-safe as the whole point is to stay on the same thread.
+ */
+
+template<class T>
+class CoatCheck
+{
+public:
+  typedef std::pair<uint32_t, nsRefPtr<T>> Element;
+
+  uint32_t Append(T& t)
+  {
+    uint32_t id = GetNextId();
+    mElements.AppendElement(Element(id, nsRefPtr<T>(&t)));
+    return id;
+  }
+
+  already_AddRefed<T> Remove(uint32_t aId)
+  {
+    for (auto& element : mElements) {
+      if (element.first == aId) {
+        nsRefPtr<T> ref;
+        ref.swap(element.second);
+        mElements.RemoveElement(element);
+        return ref.forget();
+      }
+    }
+    MOZ_ASSERT_UNREACHABLE("Received id with no matching parked object!");
+    return nullptr;
+  }
+
+private:
+  static uint32_t GetNextId()
+  {
+    static uint32_t counter = 0;
+    return ++counter;
+  };
+  nsAutoTArray<Element, 3> mElements;
+};
+
 }
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/systemservices/OpenSLESProvider.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/systemservices/OpenSLESProvider.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/systemservices/OpenSLESProvider.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/systemservices/OpenSLESProvider.cpp	2015-05-25 20:43:43.000000000 +0000
@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "OpenSLESProvider.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsDebug.h"
 
 #include <dlfcn.h>
@@ -14,14 +14,9 @@
 // NSPR_LOG_MODULES=OpenSLESProvider:5
 #undef LOG
 #undef LOG_ENABLED
-#if defined(PR_LOGGING)
 PRLogModuleInfo *gOpenSLESProviderLog;
-#define LOG(args) PR_LOG(gOpenSLESProviderLog, PR_LOG_DEBUG, args)
-#define LOG_ENABLED() PR_LOG_TEST(gLoadManagerLog, 5)
-#else
-#define LOG(args)
-#define LOG_ENABLED() (false)
-#endif
+#define LOG(args) MOZ_LOG(gOpenSLESProviderLog, PR_LOG_DEBUG, args)
+#define LOG_ENABLED() PR_LOG_TEST(gOpenSLESProviderLog, PR_LOG_DEBUG)
 
 namespace mozilla {
 
@@ -32,11 +27,9 @@
     mIsRealized(false),
     mOpenSLESLib(nullptr)
 {
-#if defined(PR_LOGGING)
   if (!gOpenSLESProviderLog)
     gOpenSLESProviderLog = PR_NewLogModule("OpenSLESProvider");
   LOG(("OpenSLESProvider being initialized"));
-#endif
 }
 
 OpenSLESProvider::~OpenSLESProvider()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/test/crashtests/1122218.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/test/crashtests/1122218.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/test/crashtests/1122218.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/test/crashtests/1122218.html	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,24 @@
+<html>
+<head>
+<script>
+function boom() {
+  var r0=new AudioContext();
+
+  var cm=r0.createChannelMerger(20);
+
+  var o1=r0.createOscillator();
+  var o2=r0.createOscillator();
+
+  var pw=r0.createPeriodicWave(new Float32Array(4),new Float32Array(4));
+  o2.setPeriodicWave(pw);
+
+  o1.connect(cm);
+  cm.connect(o2.frequency);
+
+  o1.start();
+  o2.start(0.476);
+}
+</script>
+</head>
+<body onload="boom();"></body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/test/crashtests/1127188.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/test/crashtests/1127188.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/test/crashtests/1127188.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/test/crashtests/1127188.html	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,3 @@
+<script>
+  (new AudioContext).close();
+</script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/test/crashtests/crashtests.list firefox-trunk-41.0~a1~hg20150524r245419/dom/media/test/crashtests/crashtests.list
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/test/crashtests/crashtests.list	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/test/crashtests/crashtests.list	2015-05-25 20:43:44.000000000 +0000
@@ -77,6 +77,8 @@
 load 1080986.html
 load 1158427.html
 load 1157994.html
+load 1122218.html
+load 1127188.html
 include ../../mediasource/test/crashtests/crashtests.list
 
 # This needs to run at the end to avoid leaking busted state into other tests.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/test/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/media/test/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/test/mochitest.ini	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/test/mochitest.ini	2015-05-25 20:43:44.000000000 +0000
@@ -400,6 +400,7 @@
 [test_eme_requestKeySystemAccess.html]
 skip-if = toolkit == 'android' # bug 1043403
 [test_eme_stream_capture_blocked.html]
+tags=msg
 skip-if = toolkit == 'android' || (os == 'win' && !debug) # bug 1043403, bug 1140675
 [test_empty_resource.html]
 [test_error_in_video_document.html]
@@ -427,31 +428,51 @@
 [test_media_sniffer.html]
 skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 914439
 [test_mediarecorder_avoid_recursion.html]
+tags=msg
 [test_mediarecorder_creation.html]
+tags=msg
 [test_mediarecorder_creation_fail.html]
+tags=msg
 [test_mediarecorder_getencodeddata.html]
+tags=msg
 [test_mediarecorder_record_4ch_audiocontext.html]
+tags=msg
 [test_mediarecorder_record_audiocontext.html]
+tags=msg
 [test_mediarecorder_record_audiocontext_mlk.html]
+tags=msg
 [test_mediarecorder_record_audionode.html]
+tags=msg
 [test_mediarecorder_record_gum_video_timeslice.html]
+tags=msg
 skip-if = buildapp == 'b2g' || toolkit == 'android' # mimetype check, bug 969289
 [test_mediarecorder_record_immediate_stop.html]
+tags=msg
 [test_mediarecorder_record_no_timeslice.html]
+tags=msg
 skip-if = toolkit == 'gonk' && debug
 [test_mediarecorder_record_nosrc.html]
+tags=msg
 [test_mediarecorder_record_session.html]
+tags=msg
 [test_mediarecorder_record_startstopstart.html]
+tags=msg
 skip-if = toolkit == 'gonk' && debug
 [test_mediarecorder_record_stopms.html]
+tags=msg
 [test_mediarecorder_record_timeslice.html]
+tags=msg
 skip-if = toolkit == 'gonk' && debug
 [test_mediarecorder_reload_crash.html]
+tags=msg
 [test_mediarecorder_unsupported_src.html]
+tags=msg
 [test_mediarecorder_record_getdata_afterstart.html]
+tags=msg
 skip-if = toolkit == 'gonk' && debug
 [test_mediatrack_consuming_mediaresource.html]
 [test_mediatrack_consuming_mediastream.html]
+tags=msg
 [test_mediatrack_events.html]
 skip-if = toolkit == 'gonk' && debug # bug 1065924
 [test_mediatrack_parsing_ogg.html]
@@ -530,18 +551,27 @@
 [test_standalone.html]
 skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 914439
 [test_streams_autoplay.html]
+tags=msg
 [test_streams_element_capture.html]
 #x86 only bug 914439, b2g desktop bug 752796
 skip-if = (toolkit == 'android' && processor == 'x86') || (buildapp == 'b2g' && toolkit != 'gonk')
+tags=msg
 [test_streams_element_capture_createObjectURL.html]
 skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 914439
+tags=msg
 [test_streams_element_capture_playback.html]
+tags=msg
 [test_streams_element_capture_reset.html]
+tags=msg
 [test_streams_gc.html]
 skip-if = buildapp == 'b2g' && toolkit != 'gonk' # bug 1096270
+tags=msg
 [test_streams_individual_pause.html]
+tags=msg
 [test_streams_srcObject.html]
+tags=msg
 [test_streams_tracks.html]
+tags=msg
 [test_texttrack.html]
 [test_texttrackcue.html]
 [test_texttracklist.html]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/test/test_empty_resource.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/test/test_empty_resource.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/test/test_empty_resource.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/test/test_empty_resource.html	2015-05-25 20:43:45.000000000 +0000
@@ -19,17 +19,10 @@
 <pre id="test">
 <script type="application/javascript">
 
-function onTimeout() {
-  ok(false, "timed out without getting an error event");
-  SimpleTest.finish();
-}
-
-// We expect this test to finish very soon.
-// A timeout of 90s should be enough for the slow B2G emulator.
-var timer = setTimeout(onTimeout, 90000);
+// Shorter timeout for this test should finish soon.
+SimpleTest.requestLongerTimeout(0.3);
 
 function finish(v) {
-  clearTimeout(timer);
   isnot(v.error, null, "should've got an error event");
   SimpleTest.finish();
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/head.js firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/head.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/head.js	2015-05-25 20:43:45.000000000 +0000
@@ -115,8 +115,7 @@
 }
 
 // These are the promises we use to track that the prerequisites for the test
-// are in place before running it.  Users of this file need to ensure that they
-// also provide a promise called `scriptsReady` as well.
+// are in place before running it.
 var setTestOptions;
 var testConfigured = new Promise(r => setTestOptions = r);
 
@@ -131,11 +130,11 @@
   window.finish = () => SimpleTest.finish();
   SpecialPowers.pushPrefEnv({
     'set': [
+      ['canvas.capturestream.enabled', true],
       ['dom.messageChannel.enabled', true],
       ['media.peerconnection.enabled', true],
       ['media.peerconnection.identity.enabled', true],
       ['media.peerconnection.identity.timeout', 12000],
-      ['media.peerconnection.default_iceservers', '[]'],
       ['media.navigator.permission.disabled', true],
       ['media.getusermedia.screensharing.enabled', true],
       ['media.getusermedia.screensharing.allowed_domains', "mochi.test"]
@@ -163,15 +162,10 @@
 
 function runTestWhenReady(testFunc) {
   setupEnvironment();
-  return Promise.all([scriptsReady, testConfigured]).then(() => {
-    try {
-      return testConfigured.then(options => testFunc(options));
-    } catch (e) {
-      ok(false, 'Error executing test: ' + e +
-         ((typeof e.stack === 'string') ?
-          (' ' + e.stack.split('\n').join(' ... ')) : ''));
-    }
-  });
+  return testConfigured.then(options => testFunc(options))
+    .catch(e => ok(false, 'Error executing test: ' + e +
+        ((typeof e.stack === 'string') ?
+        (' ' + e.stack.split('\n').join(' ... ')) : '')));
 }
 
 
@@ -386,8 +380,8 @@
   /**
    * Inserts the new commands after the specified command.
    */
-  insertAfter: function(functionOrName, commands) {
-    this._insertHelper(functionOrName, commands, 1);
+  insertAfter: function(functionOrName, commands, all, start) {
+    this._insertHelper(functionOrName, commands, 1, all, start);
   },
 
   /**
@@ -437,8 +431,8 @@
   /**
    * Removes all commands after the specified one, returns what was removed.
    */
-  removeAfter: function(functionOrName) {
-    var index = this.indexOf(functionOrName);
+  removeAfter: function(functionOrName, start) {
+    var index = this.indexOf(functionOrName, start);
     if (index >= 0) {
       return this.commands.splice(index + 1);
     }
@@ -467,8 +461,8 @@
   /**
    * Replaces all commands after the specified one, returns what was removed.
    */
-  replaceAfter: function(functionOrName, commands) {
-    var oldCommands = this.removeAfter(functionOrName);
+  replaceAfter: function(functionOrName, commands, start) {
+    var oldCommands = this.removeAfter(functionOrName, start);
     this.append(commands);
     return oldCommands;
   },
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/identity/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/identity/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/identity/mochitest.ini	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/identity/mochitest.ini	2015-05-25 20:43:45.000000000 +0000
@@ -6,6 +6,7 @@
 support-files =
   /.well-known/idp-proxy/idp.js
   identityPcTest.js
+tags = msg
 
 [test_idpproxy.html]
 support-files =
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/ipc/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/ipc/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/ipc/mochitest.ini	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/ipc/mochitest.ini	2015-05-25 20:43:45.000000000 +0000
@@ -1,8 +1,9 @@
 [DEFAULT]
+tags=msg
 support-files =
   ipc.json
 
 skip-if = e10s
 
 [test_ipc.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 910661 # b2g(nested ipc not working) b2g-debug(debug-only failure) b2g-desktop(nested ipc not working)
+skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #bug 910661 # b2g(nested ipc not working) b2g-debug(debug-only failure) b2g-desktop(nested ipc not working)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/mediaStreamPlayback.js firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/mediaStreamPlayback.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/mediaStreamPlayback.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/mediaStreamPlayback.js	2015-05-25 20:43:45.000000000 +0000
@@ -47,9 +47,10 @@
   startMedia : function(isResume) {
     var canPlayThroughFired = false;
 
-    // If we're initially running this media, check that the time is zero
+    // If we're playing this media element for the first time,
+    // check that the time is zero.
     if (!isResume) {
-      is(this.mediaStream.currentTime, 0,
+      is(this.mediaElement.currentTime, 0,
          "Before starting the media element, currentTime = 0");
     }
 
@@ -227,6 +228,6 @@
   return scriptsReady.then(() => realCreateHTML(options));
 }
 
-function runTest(f) {
-  return scriptsReady.then(() => runTestWhenReady(f));
-}
+var runTest = testFunction => scriptsReady
+  .then(() => runTestWhenReady(testFunction))
+  .then(() => finish());
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/mochitest.ini	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/mochitest.ini	2015-05-25 20:43:45.000000000 +0000
@@ -1,5 +1,6 @@
 [DEFAULT]
 # strictContentSandbox - bug 1042735, Android 2.3 - bug 981881
+tags = msg webrtc
 skip-if = (os == 'win' && strictContentSandbox) || android_version == '10' || android_version == '18' || (buildapp == 'mulet')
 support-files =
   head.js
@@ -29,6 +30,8 @@
 skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g emulator seems to be too slow (Bug 1016498 and 1008080)
 [test_dataChannel_noOffer.html]
 skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g (Bug 1059867)
+[test_enumerateDevices.html]
+skip-if = buildapp == 'mulet'
 [test_getUserMedia_basicAudio.html]
 skip-if = (toolkit == 'gonk' || buildapp == 'mulet' && debug) # debug-only failure
 [test_getUserMedia_basicVideo.html]
@@ -103,6 +106,10 @@
 skip-if = buildapp == 'b2g' || buildapp == 'mulet' || os == 'android' # bug 1043403 # Bug 1141029 Mulet parity with B2G Desktop for TC
 [test_peerConnection_capturedVideo.html]
 skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g(Bug 960442, video support for WebRTC is disabled on b2g)
+[test_peerConnection_captureStream_canvas_2d.html]
+skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g(Bug 960442, video support for WebRTC is disabled on b2g)
+[test_peerConnection_captureStream_canvas_webgl.html]
+skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g(Bug 960442, video support for WebRTC is disabled on b2g)
 [test_peerConnection_close.html]
 skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g (Bug 1059867)
 [test_peerConnection_errorCallbacks.html]
@@ -187,6 +194,15 @@
 [test_peerConnection_addDataChannelNoBundle.html]
 skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g (Bug 1059867)
 [test_peerConnection_webAudio.html]
+tags = webaudio webrtc
+skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g (Bug 1059867)
+[test_peerConnection_localRollback.html]
+skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g (Bug 1059867)
+[test_peerConnection_localReofferRollback.html]
+skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g (Bug 1059867)
+[test_peerConnection_remoteRollback.html]
+skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g (Bug 1059867)
+[test_peerConnection_remoteReofferRollback.html]
 skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g (Bug 1059867)
 
 # Bug 950317: Hack for making a cleanup hook after finishing all WebRTC cases
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/pc.js firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/pc.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/pc.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/pc.js	2015-05-25 20:43:45.000000000 +0000
@@ -774,7 +774,6 @@
 
   this._local_ice_candidates = [];
   this._remote_ice_candidates = [];
-  this.holdIceCandidates = new Promise(r => this.releaseIceCandidates = r);
   this.localRequiresTrickleIce = false;
   this.remoteRequiresTrickleIce = false;
   this.localMediaElements = [];
@@ -1085,7 +1084,12 @@
     this.observedNegotiationNeeded = undefined;
     return this._pc.setRemoteDescription(desc).then(() => {
       info(this + ": Successfully set remote description");
-      this.releaseIceCandidates();
+      if (desc.type == "rollback") {
+        this.holdIceCandidates = new Promise(r => this.releaseIceCandidates = r);
+
+      } else {
+        this.releaseIceCandidates();
+      }
     });
   },
 
@@ -1318,10 +1322,15 @@
 
     var resolveEndOfTrickle;
     this.endOfTrickleIce = new Promise(r => resolveEndOfTrickle = r);
+    this.holdIceCandidates = new Promise(r => this.releaseIceCandidates = r);
 
     this.endOfTrickleIce.then(() => {
       this._pc.onicecandidate = () =>
         ok(false, this.label + " received ICE candidate after end of trickle");
+      var localSdp = this._pc.getLocalDescription();
+      ok(localSdp.includes("a=end-of-candidates"));
+      ok(localSdp.includes("a=rtcp:"));
+      ok(!localSdp.includes("c=IN IP4 0.0.0.0"));
     });
 
     this._pc.onicecandidate = anEvent => {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_enumerateDevices.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_enumerateDevices.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_enumerateDevices.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_enumerateDevices.html	2015-05-25 20:43:45.000000000 +0000
@@ -0,0 +1,28 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <script src="mediaStreamPlayback.js"></script>
+</head>
+<body>
+<pre id="test">
+<script type="application/javascript">
+createHTML({ title: "Run enumerateDevices code", bug: "1046245" });
+/**
+  Tests covering enumerateDevices API. Exercise code.
+*/
+
+runTest(() => navigator.mediaDevices.enumerateDevices()
+  .then(devices => {
+    ok(devices.length > 0, "At least one device found");
+    devices.forEach(d => {
+      ok(d.kind == "videoinput" || d.kind == "audioinput", "Known device kind");
+      is(d.deviceId.length, 44, "Correct device id length");
+      ok(d.label.length !== undefined, "Device label: " + d.label);
+      is(d.groupId, "", "Don't support groupId yet");
+    });
+  }));
+
+</script>
+</pre>
+</body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_basicAudio.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_basicAudio.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_basicAudio.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_basicAudio.html	2015-05-25 20:43:45.000000000 +0000
@@ -15,12 +15,12 @@
     var testAudio = createMediaElement('audio', 'testAudio');
     var constraints = {audio: true};
 
-    getUserMedia(constraints).then(aStream => {
-      checkMediaStreamTracks(constraints, aStream);
+    return getUserMedia(constraints).then(stream => {
+      checkMediaStreamTracks(constraints, stream);
 
-      var playback = new LocalMediaStreamPlayback(testAudio, aStream);
+      var playback = new LocalMediaStreamPlayback(testAudio, stream);
       return playback.playMedia(false);
-    }).then(() => SimpleTest.finish(), generateErrorCallback());
+    });
   });
 
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_basicScreenshare.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_basicScreenshare.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_basicScreenshare.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_basicScreenshare.html	2015-05-25 20:43:45.000000000 +0000
@@ -18,7 +18,6 @@
     const isWinXP = navigator.userAgent.indexOf("Windows NT 5.1") != -1;
     if (IsMacOSX10_6orOlder() || isWinXP) {
         ok(true, "Screensharing disabled for OSX10.6 and WinXP");
-        SimpleTest.finish();
         return;
     }
     var testVideo = createMediaElement('video', 'testVideo');
@@ -30,12 +29,12 @@
       fake: false
     };
 
-    getUserMedia(constraints).then(aStream => {
-      checkMediaStreamTracks(constraints, aStream);
+    return getUserMedia(constraints).then(stream => {
+      checkMediaStreamTracks(constraints, stream);
 
-      var playback = new LocalMediaStreamPlayback(testVideo, aStream);
+      var playback = new LocalMediaStreamPlayback(testVideo, stream);
       return playback.playMediaWithStreamStop(false);
-    }).then(() => SimpleTest.finish(), generateErrorCallback());
+    });
 
   });
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_basicVideoAudio.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_basicVideoAudio.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_basicVideoAudio.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_basicVideoAudio.html	2015-05-25 20:43:45.000000000 +0000
@@ -18,12 +18,12 @@
     var testVideoAudio = createMediaElement('video', 'testVideoAudio');
     var constraints = {video: true, audio: true};
 
-    getUserMedia(constraints).then(aStream => {
-      checkMediaStreamTracks(constraints, aStream);
+    return getUserMedia(constraints).then(stream => {
+      checkMediaStreamTracks(constraints, stream);
 
-      var playback = new LocalMediaStreamPlayback(testVideoAudio, aStream);
+      var playback = new LocalMediaStreamPlayback(testVideoAudio, stream);
       return playback.playMedia(false);
-    }).then(() => SimpleTest.finish(), generateErrorCallback());
+    });
   });
 
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_basicVideo.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_basicVideo.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_basicVideo.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_basicVideo.html	2015-05-25 20:43:45.000000000 +0000
@@ -18,12 +18,12 @@
     var testVideo = createMediaElement('video', 'testVideo');
     var constraints = {video: true};
 
-    getUserMedia(constraints).then(aStream => {
-      checkMediaStreamTracks(constraints, aStream);
+    return getUserMedia(constraints).then(stream => {
+      checkMediaStreamTracks(constraints, stream);
 
-      var playback = new LocalMediaStreamPlayback(testVideo, aStream);
+      var playback = new LocalMediaStreamPlayback(testVideo, stream);
       return playback.playMedia(false);
-    }).then(() => SimpleTest.finish(), generateErrorCallback());
+    });
   });
 
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_basicVideo_playAfterLoadedmetadata.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_basicVideo_playAfterLoadedmetadata.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_basicVideo_playAfterLoadedmetadata.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_basicVideo_playAfterLoadedmetadata.html	2015-05-25 20:43:45.000000000 +0000
@@ -18,13 +18,13 @@
     var testVideo = createMediaElement('video', 'testVideo');
     var constraints = {video: true};
 
-    getUserMedia(constraints).then(aStream => {
-      checkMediaStreamTracks(constraints, aStream);
+    return getUserMedia(constraints).then(stream => {
+      checkMediaStreamTracks(constraints, stream);
 
-      var playback = new LocalMediaStreamPlayback(testVideo, aStream);
+      var playback = new LocalMediaStreamPlayback(testVideo, stream);
       var video = playback.mediaElement;
 
-      video.mozSrcObject = aStream;
+      video.mozSrcObject = stream;
       return new Promise(resolve => {
         ok(playback.mediaElement.paused,
            "Media element should be paused before play()ing");
@@ -34,7 +34,7 @@
           resolve();
         });
       });
-    }).then(() => SimpleTest.finish(), generateErrorCallback());
+    });
   });
 
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_basicWindowshare.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_basicWindowshare.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_basicWindowshare.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_basicWindowshare.html	2015-05-25 20:43:45.000000000 +0000
@@ -18,7 +18,6 @@
     const isWinXP = navigator.userAgent.indexOf("Windows NT 5.1") != -1;
     if (IsMacOSX10_6orOlder() || isWinXP) {
         ok(true, "Screensharing disabled for OSX10.6 and WinXP");
-        SimpleTest.finish();
         return;
     }
     var testVideo = createMediaElement('video', 'testVideo');
@@ -30,12 +29,12 @@
       fake: false
     };
 
-    getUserMedia(constraints).then(aStream => {
-      checkMediaStreamTracks(constraints, aStream);
+    return getUserMedia(constraints).then(stream => {
+      checkMediaStreamTracks(constraints, stream);
 
-      var playback = new LocalMediaStreamPlayback(testVideo, aStream);
+      var playback = new LocalMediaStreamPlayback(testVideo, stream);
       return playback.playMediaWithStreamStop(false);
-    }).then(() => SimpleTest.finish(), generateErrorCallback());
+    });
 
   });
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_callbacks.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_callbacks.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_callbacks.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_callbacks.html	2015-05-25 20:43:45.000000000 +0000
@@ -18,13 +18,15 @@
     var constraints = {audio: true};
 
     SimpleTest.waitForExplicitFinish();
-    navigator.mozGetUserMedia(constraints, aStream => {
-      checkMediaStreamTracks(constraints, aStream);
+    return new Promise(resolve =>
+      navigator.mozGetUserMedia(constraints, stream => {
+        checkMediaStreamTracks(constraints, stream);
 
-      var playback = new LocalMediaStreamPlayback(testAudio, aStream);
-      return playback.playMedia(false)
-        .then(() => SimpleTest.finish(), generateErrorCallback());
-    }, generateErrorCallback());
+        var playback = new LocalMediaStreamPlayback(testAudio, stream);
+        return playback.playMedia(false)
+          .then(() => resolve(), generateErrorCallback());
+      }, generateErrorCallback())
+    );
   });
 
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_constraints.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_constraints.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_constraints.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_constraints.html	2015-05-25 20:43:45.000000000 +0000
@@ -84,12 +84,10 @@
               ['media.getusermedia.screensharing.enabled', false] ]
     }, resolve));
 
-  tests.reduce((p, test) =>
+  return tests.reduce((p, test) =>
     p.then(() => navigator.mediaDevices.getUserMedia(test.constraints))
     .then(() => is(null, test.error, test.message),
-          e => is(e.name, test.error, test.message + ": " + e.message)), p)
-  .catch(e => ok(false, "Unexpected failure: " + e.name + ", " + e.message))
-  .then(SimpleTest.finish);
+          e => is(e.name, test.error, test.message + ": " + e.message)), p);
 });
 
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_gumWithinGum.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_gumWithinGum.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_gumWithinGum.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_gumWithinGum.html	2015-05-25 20:43:45.000000000 +0000
@@ -13,7 +13,7 @@
    * the audio gum call happens within the video gum call.
    */
   runTest(function () {
-    getUserMedia({video: true})
+    return getUserMedia({video: true})
       .then(videoStream => {
         var testVideo = createMediaElement('video', 'testVideo');
         var videoPlayback = new LocalMediaStreamPlayback(testVideo,
@@ -30,8 +30,7 @@
               .then(() => audioStream.stop());
           })
           .then(() => videoStream.stop());
-      })
-      .then(() => SimpleTest.finish(), generateErrorCallback());
+      });
   });
 
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_peerIdentity.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_peerIdentity.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_peerIdentity.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_peerIdentity.html	2015-05-25 20:43:45.000000000 +0000
@@ -26,11 +26,8 @@
   };
 
   // both without and with the constraint
-  testPeerIdentityConstraint(false)
-    .then(() => testPeerIdentityConstraint(true))
-    .catch(e => ok(false, 'error in test: ' + e))
-    .then(() => SimpleTest.finish())
-    .catch(e => ok(false, 'something is really messed up: ' + e));
+  return testPeerIdentityConstraint(false)
+    .then(() => testPeerIdentityConstraint(true));
 }
 
 runTest(theTest);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_playAudioTwice.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_playAudioTwice.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_playAudioTwice.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_playAudioTwice.html	2015-05-25 20:43:45.000000000 +0000
@@ -11,14 +11,14 @@
    * Run a test that we can complete an audio playback cycle twice in a row.
    */
   runTest(function () {
-    getUserMedia({audio: true}).then(audioStream => {
+    return getUserMedia({audio: true}).then(audioStream => {
       var testAudio = createMediaElement('audio', 'testAudio');
       var playback = new LocalMediaStreamPlayback(testAudio, audioStream);
 
       return playback.playMedia(false)
         .then(() => playback.playMedia(true))
         .then(() => audioStream.stop());
-    }).then(() => SimpleTest.finish(), generateErrorCallback());
+    });
   });
 </script>
 </pre>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_playVideoAudioTwice.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_playVideoAudioTwice.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_playVideoAudioTwice.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_playVideoAudioTwice.html	2015-05-25 20:43:45.000000000 +0000
@@ -11,14 +11,14 @@
    * Run a test that we can complete a video playback cycle twice in a row.
    */
   runTest(function () {
-    getUserMedia({video: true, audio: true}).then(stream => {
+    return getUserMedia({video: true, audio: true}).then(stream => {
       var testVideo = createMediaElement('video', 'testVideo');
       var playback = new LocalMediaStreamPlayback(testVideo, stream);
 
       return playback.playMedia(false)
         .then(() => playback.playMedia(true))
         .then(() => stream.stop());
-    }).then(() => SimpleTest.finish(), generateErrorCallback());
+    });
   });
 
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_playVideoTwice.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_playVideoTwice.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_playVideoTwice.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_playVideoTwice.html	2015-05-25 20:43:45.000000000 +0000
@@ -11,14 +11,14 @@
    * Run a test that we can complete a video playback cycle twice in a row.
    */
   runTest(function () {
-    getUserMedia({video: true}).then(stream => {
+    return getUserMedia({video: true}).then(stream => {
       var testVideo = createMediaElement('video', 'testVideo');
       var streamPlayback = new LocalMediaStreamPlayback(testVideo, stream);
 
       return streamPlayback.playMedia(false)
         .then(() => streamPlayback.playMedia(true))
         .then(() => stream.stop());
-    }).then(() => SimpleTest.finish(), generateErrorCallback());
+    });
   });
 
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_stopAudioStream.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_stopAudioStream.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_stopAudioStream.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_stopAudioStream.html	2015-05-25 20:43:45.000000000 +0000
@@ -12,14 +12,13 @@
    * call stop() on the stream, and successfully get an ended event fired.
    */
   runTest(function () {
-    getUserMedia({audio: true})
+    return getUserMedia({audio: true})
       .then(stream => {
         var testAudio = createMediaElement('audio', 'testAudio');
         var streamPlayback = new LocalMediaStreamPlayback(testAudio, stream);
 
         return streamPlayback.playMediaWithStreamStop(false);
-      })
-      .then(() => SimpleTest.finish(), generateErrorCallback());
+      });
   });
 
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_stopAudioStreamWithFollowupAudio.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_stopAudioStreamWithFollowupAudio.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_stopAudioStreamWithFollowupAudio.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_stopAudioStreamWithFollowupAudio.html	2015-05-25 20:43:45.000000000 +0000
@@ -13,7 +13,7 @@
    * in a media element.
    */
   runTest(function () {
-    getUserMedia({audio: true})
+    return getUserMedia({audio: true})
       .then(firstStream => {
         var testAudio = createMediaElement('audio', 'testAudio');
         var streamPlayback = new LocalMediaStreamPlayback(testAudio, firstStream);
@@ -26,8 +26,7 @@
             return streamPlayback.playMedia(false)
               .then(() => secondStream.stop());
           });
-      })
-      .then(() => SimpleTest.finish(), generateErrorCallback());
+      });
   });
 
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_stopVideoAudioStream.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_stopVideoAudioStream.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_stopVideoAudioStream.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_stopVideoAudioStream.html	2015-05-25 20:43:45.000000000 +0000
@@ -13,14 +13,13 @@
    * ended event fired.
    */
   runTest(function () {
-    getUserMedia({video: true, audio: true})
+    return getUserMedia({video: true, audio: true})
       .then(stream => {
         var testVideo = createMediaElement('video', 'testVideo');
         var playback = new LocalMediaStreamPlayback(testVideo, stream);
 
         return playback.playMediaWithStreamStop(false);
-      })
-      .then(() => SimpleTest.finish(), generateErrorCallback());
+      });
   });
 
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_stopVideoAudioStreamWithFollowupVideoAudio.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_stopVideoAudioStreamWithFollowupVideoAudio.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_stopVideoAudioStreamWithFollowupVideoAudio.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_stopVideoAudioStreamWithFollowupVideoAudio.html	2015-05-25 20:43:45.000000000 +0000
@@ -16,7 +16,7 @@
    * playback in a media element.
    */
   runTest(function () {
-    getUserMedia({video: true, audio: true})
+    return getUserMedia({video: true, audio: true})
       .then(stream => {
         var testVideo = createMediaElement('video', 'testVideo');
         var streamPlayback = new LocalMediaStreamPlayback(testVideo, stream);
@@ -29,8 +29,7 @@
             return streamPlayback.playMedia(false)
               .then(() => secondStream.stop());
           });
-      })
-      .then(() => SimpleTest.finish(), generateErrorCallback());
+      });
   });
 
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_stopVideoStream.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_stopVideoStream.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_stopVideoStream.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_stopVideoStream.html	2015-05-25 20:43:45.000000000 +0000
@@ -13,14 +13,13 @@
    * ended event fired.
    */
   runTest(function () {
-    getUserMedia({video: true})
+    return getUserMedia({video: true})
       .then(stream => {
         var testVideo = createMediaElement('video', 'testVideo');
         var streamPlayback = new LocalMediaStreamPlayback(testVideo, stream);
 
         return streamPlayback.playMediaWithStreamStop(false);
-      })
-      .then(() => SimpleTest.finish(), generateErrorCallback());
+      });
   });
 
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_stopVideoStreamWithFollowupVideo.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_stopVideoStreamWithFollowupVideo.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_getUserMedia_stopVideoStreamWithFollowupVideo.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_getUserMedia_stopVideoStreamWithFollowupVideo.html	2015-05-25 20:43:45.000000000 +0000
@@ -13,7 +13,7 @@
    * playback in a media element.
    */
   runTest(function () {
-    getUserMedia({video: true})
+    return getUserMedia({video: true})
       .then(stream => {
         var testVideo = createMediaElement('video', 'testVideo');
         var streamPlayback = new LocalMediaStreamPlayback(testVideo, stream);
@@ -26,8 +26,7 @@
             return streamPlayback.playMedia(false)
               .then(() => secondStream.stop());
           });
-      })
-      .then(() => SimpleTest.finish(), generateErrorCallback());
+      });
   });
 
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_peerConnection_captureStream_canvas_2d.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_peerConnection_captureStream_canvas_2d.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_peerConnection_captureStream_canvas_2d.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_peerConnection_captureStream_canvas_2d.html	2015-05-25 20:43:45.000000000 +0000
@@ -0,0 +1,55 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <script type="application/javascript" src="pc.js"></script>
+  <script type="application/javascript" src="/tests/dom/canvas/test/captureStream_common.js"></script>
+</head>
+<body>
+<pre id="test">
+<script type="application/javascript;version=1.8">
+createHTML({
+  bug: "1032848",
+  title: "Canvas(2D)::CaptureStream as video-only input to peerconnection",
+  visible: true
+});
+
+runNetworkTest(() => {
+  var test = new PeerConnectionTest();
+  var vremote;
+  var h = new CaptureStreamTestHelper2D();
+  var canvas = document.createElement('canvas');
+  canvas.id = 'source_canvas';
+  canvas.width = canvas.height = 10;
+  document.getElementById('content').appendChild(canvas);
+
+  test.setMediaConstraints([{video: true}], []);
+  test.chain.replace("PC_LOCAL_GUM", [
+    function DRAW_LOCAL_GREEN(test) {
+      h.drawColor(canvas, h.green);
+    },
+    function PC_LOCAL_CANVAS_CAPTURESTREAM(test) {
+      var stream = canvas.captureStream(10);
+      test.pcLocal.attachMedia(stream, 'video', 'local');
+    }
+  ]);
+  test.chain.append([
+    function FIND_REMOTE_VIDEO() {
+      vremote = document.getElementById('pcRemote_remote1_video');
+      ok(!!vremote, "Should have remote video element for pcRemote");
+    },
+    function WAIT_FOR_REMOTE_GREEN() {
+      return h.waitForPixel(vremote, h.green, 128, "pcRemote's remote should become green");
+    },
+    function DRAW_LOCAL_RED() {
+      h.drawColor(canvas, h.red);
+    },
+    function WAIT_FOR_REMOTE_RED() {
+      return h.waitForPixel(vremote, h.red, 128, "pcRemote's remote should become red");
+    }
+  ]);
+  test.run();
+});
+</script>
+</pre>
+</body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_peerConnection_captureStream_canvas_webgl.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_peerConnection_captureStream_canvas_webgl.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_peerConnection_captureStream_canvas_webgl.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_peerConnection_captureStream_canvas_webgl.html	2015-05-25 20:43:45.000000000 +0000
@@ -0,0 +1,108 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <script type="application/javascript" src="pc.js"></script>
+  <script type="application/javascript" src="/tests/dom/canvas/test/captureStream_common.js"></script>
+  <script type="application/javascript" src="/tests/dom/canvas/test/webgl-mochitest/webgl-util.js"></script>
+</head>
+<body>
+<pre id="test">
+<script id="v-shader" type="x-shader/x-vertex">
+  attribute vec2 aPosition;
+  void main() {
+   gl_Position = vec4(aPosition, 0, 1);
+}
+</script>
+<script id="f-shader" type="x-shader/x-fragment">
+  precision mediump float;
+  uniform vec4 uColor;
+  void main() { gl_FragColor = uColor; }
+</script>
+<script type="application/javascript;version=1.8">
+createHTML({
+  bug: "1032848",
+  title: "Canvas(WebGL)::CaptureStream as video-only input to peerconnection"
+});
+
+runNetworkTest(() => {
+  var test = new PeerConnectionTest();
+  var vremote;
+  var h = new CaptureStreamTestHelperWebGL();
+  var canvas = document.createElement('canvas');
+  canvas.id = 'source_canvas';
+  canvas.width = canvas.height = 10;
+  document.getElementById('content').appendChild(canvas);
+
+  var gl = WebGLUtil.getWebGL(canvas.id, false, { preserveDrawingBuffer: true });
+  if (!gl) {
+    todo(false, "WebGL unavailable.");
+    networkTestFinished();
+    return;
+  }
+
+  var errorFunc = str => ok(false, 'Error: ' + str);
+  WebGLUtil.setErrorFunc(errorFunc);
+  WebGLUtil.setWarningFunc(errorFunc);
+
+  test.setMediaConstraints([{video: true}], []);
+  test.chain.replace("PC_LOCAL_GUM", [
+    function WEBGL_SETUP(test) {
+      var program = WebGLUtil.createProgramByIds(gl, 'v-shader', 'f-shader');
+
+      if (!program) {
+        ok(false, "Program should link");
+        return Promise.reject();
+      }
+      gl.useProgram(program);
+
+      var uColorLocation = gl.getUniformLocation(program, "uColor");
+      h.setFragmentColorLocation(uColorLocation);
+
+      var squareBuffer = gl.createBuffer();
+      gl.bindBuffer(gl.ARRAY_BUFFER, squareBuffer);
+
+      var vertices = [ 0,  0,
+                      -1,  0,
+                       0,  1,
+                      -1,  1 ];
+      gl.bufferData(gl.ARRAY_BUFFER, new Float32Array(vertices), gl.STATIC_DRAW);
+      squareBuffer.itemSize = 2;
+      squareBuffer.numItems = 4;
+
+      program.aPosition = gl.getAttribLocation(program, "aPosition");
+      gl.enableVertexAttribArray(program.aPosition);
+      gl.vertexAttribPointer(program.aPosition, squareBuffer.itemSize, gl.FLOAT, false, 0, 0);
+    },
+    function DRAW_LOCAL_GREEN(test) {
+      h.drawColor(canvas, h.green);
+    },
+    function PC_LOCAL_CANVAS_CAPTURESTREAM(test) {
+      test.pcLocal.canvasStream = canvas.captureStream(0.0);
+      is(test.pcLocal.canvasStream.canvas, canvas, "Canvas attribute is correct");
+      test.pcLocal.attachMedia(test.pcLocal.canvasStream, 'video', 'local');
+    }
+  ]);
+  test.chain.append([
+    function FIND_REMOTE_VIDEO() {
+      vremote = document.getElementById('pcRemote_remote1_video');
+      ok(!!vremote, "Should have remote video element for pcRemote");
+    },
+    function WAIT_FOR_REMOTE_GREEN() {
+      return h.waitForPixel(vremote, h.green, 128, "pcRemote's remote should become green");
+    },
+    function DRAW_LOCAL_RED() {
+      h.drawColor(canvas, h.red);
+    },
+    function REQUEST_FRAME(test) {
+      test.pcLocal.canvasStream.requestFrame();
+    },
+    function WAIT_FOR_REMOTE_RED() {
+      return h.waitForPixel(vremote, h.red, 128, "pcRemote's remote should become red");
+    }
+  ]);
+  test.run();
+});
+</script>
+</pre>
+</body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_peerConnection_localReofferRollback.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_peerConnection_localReofferRollback.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_peerConnection_localReofferRollback.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_peerConnection_localReofferRollback.html	2015-05-25 20:43:45.000000000 +0000
@@ -0,0 +1,57 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <script type="application/javascript" src="pc.js"></script>
+</head>
+<body>
+<pre id="test">
+<script type="application/javascript">
+  createHTML({
+    bug: "952145",
+    title: "Rollback local reoffer"
+  });
+
+  var test;
+  runNetworkTest(function (options) {
+    test = new PeerConnectionTest(options);
+    addRenegotiation(test.chain, [
+        function PC_LOCAL_ADD_SECOND_STREAM(test) {
+          test.setMediaConstraints([{audio: true}, {audio: true}],
+                                   [{audio: true}]);
+          return test.pcLocal.getAllUserMedia([{audio: true}]);
+        },
+
+        function PC_REMOTE_SETUP_ICE_HANDLER(test) {
+          test.pcRemote.setupIceCandidateHandler(test);
+          if (test.steeplechase) {
+            test.pcRemote.endOfTrickleIce.then(() => {
+              send_message({"type": "end_of_trickle_ice"});
+            });
+          }
+        },
+
+        function PC_REMOTE_CREATE_AND_SET_OFFER(test) {
+          return test.createOffer(test.pcRemote).then(offer => {
+            return test.setLocalDescription(test.pcRemote, offer, HAVE_LOCAL_OFFER);
+          });
+        },
+
+        function PC_REMOTE_ROLLBACK(test) {
+          return test.setLocalDescription(
+              test.pcRemote,
+              new mozRTCSessionDescription({ type: "rollback", sdp: ""}),
+              STABLE);
+        },
+
+        // Rolling back should shut down gathering
+        function PC_REMOTE_WAIT_FOR_END_OF_TRICKLE(test) {
+          return test.pcRemote.endOfTrickleIce;
+        },
+    ]);
+    test.setMediaConstraints([{audio: true}], [{audio: true}]);
+    test.run();
+  });
+</script>
+</pre>
+</body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_peerConnection_localRollback.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_peerConnection_localRollback.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_peerConnection_localRollback.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_peerConnection_localRollback.html	2015-05-25 20:43:45.000000000 +0000
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <script type="application/javascript" src="pc.js"></script>
+</head>
+<body>
+<pre id="test">
+<script type="application/javascript">
+  createHTML({
+    bug: "952145",
+    title: "Rollback local offer"
+  });
+
+  var test;
+  runNetworkTest(function (options) {
+    test = new PeerConnectionTest(options);
+    test.setMediaConstraints([{audio: true}], [{audio: true}]);
+    test.chain.insertBefore('PC_LOCAL_CREATE_OFFER', [
+        function PC_REMOTE_CREATE_AND_SET_OFFER(test) {
+          return test.createOffer(test.pcRemote).then(offer => {
+            return test.setLocalDescription(test.pcRemote, offer, HAVE_LOCAL_OFFER);
+          });
+        },
+
+        function PC_REMOTE_ROLLBACK(test) {
+          return test.setLocalDescription(
+              test.pcRemote,
+              new mozRTCSessionDescription({ type: "rollback", sdp: ""}),
+              STABLE);
+        },
+
+        // Rolling back should shut down gathering
+        function PC_REMOTE_WAIT_FOR_END_OF_TRICKLE(test) {
+          return test.pcRemote.endOfTrickleIce;
+        },
+
+        function PC_REMOTE_SETUP_ICE_HANDLER(test) {
+          test.pcRemote.setupIceCandidateHandler(test);
+          if (test.steeplechase) {
+            test.pcRemote.endOfTrickleIce.then(() => {
+              send_message({"type": "end_of_trickle_ice"});
+              });
+          }
+        },
+    ]);
+    test.run();
+  });
+</script>
+</pre>
+</body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_peerConnection_remoteReofferRollback.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_peerConnection_remoteReofferRollback.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_peerConnection_remoteReofferRollback.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_peerConnection_remoteReofferRollback.html	2015-05-25 20:43:46.000000000 +0000
@@ -0,0 +1,66 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <script type="application/javascript" src="pc.js"></script>
+</head>
+<body>
+<pre id="test">
+<script type="application/javascript">
+  createHTML({
+    bug: "952145",
+    title: "Rollback remote reoffer"
+  });
+
+  var test;
+  runNetworkTest(function (options) {
+    test = new PeerConnectionTest(options);
+    addRenegotiation(test.chain,
+      [
+        function PC_LOCAL_ADD_SECOND_STREAM(test) {
+          test.setMediaConstraints([{audio: true}, {audio: true}],
+                                   [{audio: true}]);
+          return test.pcLocal.getAllUserMedia([{audio: true}]);
+        },
+      ]
+    );
+    test.chain.replaceAfter('PC_REMOTE_SET_REMOTE_DESCRIPTION',
+      [
+        function PC_LOCAL_SETUP_ICE_HANDLER(test) {
+          test.pcLocal.setupIceCandidateHandler(test);
+          if (test.steeplechase) {
+            test.pcLocal.endOfTrickleIce.then(() => {
+              send_message({"type": "end_of_trickle_ice"});
+            });
+          }
+        },
+
+        function PC_REMOTE_ROLLBACK(test) {
+          return test.setRemoteDescription(
+              test.pcRemote,
+              new mozRTCSessionDescription({ type: "rollback" }),
+              STABLE);
+        },
+
+        function PC_LOCAL_ROLLBACK(test) {
+          return test.setLocalDescription(
+              test.pcLocal,
+              new mozRTCSessionDescription({ type: "rollback", sdp: ""}),
+              STABLE);
+        },
+
+        // Rolling back should shut down gathering
+        function PC_LOCAL_WAIT_FOR_END_OF_TRICKLE(test) {
+          return test.pcLocal.endOfTrickleIce;
+        },
+      ],
+      1 // Second PC_REMOTE_SET_REMOTE_DESCRIPTION
+    );
+    test.chain.append(commandsPeerConnectionOfferAnswer);
+    test.setMediaConstraints([{audio: true}], [{audio: true}]);
+    test.run();
+  });
+</script>
+</pre>
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_peerConnection_remoteRollback.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_peerConnection_remoteRollback.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/tests/mochitest/test_peerConnection_remoteRollback.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/tests/mochitest/test_peerConnection_remoteRollback.html	2015-05-25 20:43:46.000000000 +0000
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <script type="application/javascript" src="pc.js"></script>
+</head>
+<body>
+<pre id="test">
+<script type="application/javascript">
+  createHTML({
+    bug: "952145",
+    title: "Rollback remote offer"
+  });
+
+  var test;
+  runNetworkTest(function (options) {
+    test = new PeerConnectionTest(options);
+    test.setMediaConstraints([{audio: true}], [{audio: true}]);
+    test.chain.removeAfter('PC_REMOTE_SET_REMOTE_DESCRIPTION');
+    test.chain.append([
+        function PC_REMOTE_ROLLBACK(test) {
+          return test.setRemoteDescription(
+              test.pcRemote,
+              new mozRTCSessionDescription({ type: "rollback" }),
+              STABLE);
+        },
+
+        function PC_LOCAL_ROLLBACK(test) {
+          return test.setLocalDescription(
+              test.pcLocal,
+              new mozRTCSessionDescription({ type: "rollback", sdp: ""}),
+              STABLE);
+        },
+
+        // Rolling back should shut down gathering
+        function PC_LOCAL_WAIT_FOR_END_OF_TRICKLE(test) {
+          return test.pcLocal.endOfTrickleIce;
+        },
+    ]);
+    test.chain.append(commandsPeerConnectionOfferAnswer);
+    test.run();
+  });
+</script>
+</pre>
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/TimeUnits.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/TimeUnits.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/TimeUnits.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/TimeUnits.h	2015-05-25 20:43:40.000000000 +0000
@@ -8,7 +8,6 @@
 #define TIME_UNITS_H
 
 #include "Intervals.h"
-#include "VideoUtils.h"
 #include "mozilla/CheckedInt.h"
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/dom/TimeRanges.h"
@@ -16,6 +15,15 @@
 namespace mozilla {
 namespace media {
 
+// Number of microseconds per second. 1e6.
+static const int64_t USECS_PER_S = 1000000;
+
+// Number of microseconds per millisecond.
+static const int64_t USECS_PER_MS = 1000;
+
+// Number of nanoseconds per second. 1e9.
+static const int64_t NSECS_PER_S = 1000000000;
+
 struct Microseconds {
   Microseconds()
     : mValue(0)
@@ -61,11 +69,16 @@
   int64_t mValue;
 };
 
+// TimeUnit at present uses a CheckedInt64 as storage.
+// INT64_MAX has the special meaning of being +oo.
 class TimeUnit final {
 public:
   static TimeUnit FromSeconds(double aValue) {
     MOZ_ASSERT(!IsNaN(aValue));
 
+    if (mozilla::IsInfinite<double>(aValue)) {
+      return FromInfinity();
+    }
     double val = aValue * USECS_PER_S;
     if (val >= double(INT64_MAX)) {
       return FromMicroseconds(INT64_MAX);
@@ -84,14 +97,33 @@
     return TimeUnit(aValue.mValue);
   }
 
+  static TimeUnit FromNanoseconds(int64_t aValue) {
+    return TimeUnit(aValue / 1000);
+  }
+
+  static TimeUnit FromInfinity() {
+    return TimeUnit(INT64_MAX);
+  }
+
   int64_t ToMicroseconds() const {
     return mValue.value();
   }
 
+  int64_t ToNanoseconds() const {
+    return mValue.value() * 1000;
+  }
+
   double ToSeconds() const {
+    if (IsInfinite()) {
+      return PositiveInfinity<double>();
+    }
     return double(mValue.value()) / USECS_PER_S;
   }
 
+  bool IsInfinite() const {
+    return mValue.value() == INT64_MAX;
+  }
+
   bool operator == (const TimeUnit& aOther) const {
     MOZ_ASSERT(IsValid() && aOther.IsValid());
     return mValue.value() == aOther.mValue.value();
@@ -111,9 +143,16 @@
     return !(*this >= aOther);
   }
   TimeUnit operator + (const TimeUnit& aOther) const {
+    if (IsInfinite() || aOther.IsInfinite()) {
+      return FromInfinity();
+    }
     return TimeUnit(mValue + aOther.mValue);
   }
   TimeUnit operator - (const TimeUnit& aOther) const {
+    if (IsInfinite() && !aOther.IsInfinite()) {
+      return FromInfinity();
+    }
+    MOZ_ASSERT(!IsInfinite() && !aOther.IsInfinite());
     return TimeUnit(mValue - aOther.mValue);
   }
 
@@ -175,6 +214,17 @@
     : BaseType(Move(aOther))
   {}
 
+  static TimeIntervals Invalid()
+  {
+    return TimeIntervals(TimeInterval(TimeUnit::FromMicroseconds(INT64_MIN),
+                                      TimeUnit::FromMicroseconds(INT64_MIN)));
+  }
+  bool IsInvalid()
+  {
+    return Length() == 1 && Start(0).ToMicroseconds() == INT64_MIN &&
+      End(0).ToMicroseconds() == INT64_MIN;
+  }
+
   TimeIntervals() = default;
 
   // Make TimeIntervals interchangeable with dom::TimeRanges.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/TrackUnionStream.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/TrackUnionStream.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/TrackUnionStream.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/TrackUnionStream.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -16,7 +16,7 @@
 #include "nsServiceManagerUtils.h"
 #include "nsWidgetsCID.h"
 #include "prerror.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "mozilla/Attributes.h"
 #include "TrackUnionStream.h"
 #include "ImageContainer.h"
@@ -42,21 +42,15 @@
 #undef STREAM_LOG
 #endif
 
-#ifdef PR_LOGGING
 PRLogModuleInfo* gTrackUnionStreamLog;
-#define STREAM_LOG(type, msg) PR_LOG(gTrackUnionStreamLog, type, msg)
-#else
-#define STREAM_LOG(type, msg)
-#endif
+#define STREAM_LOG(type, msg) MOZ_LOG(gTrackUnionStreamLog, type, msg)
 
 TrackUnionStream::TrackUnionStream(DOMMediaStream* aWrapper) :
   ProcessedMediaStream(aWrapper)
 {
-#ifdef PR_LOGGING
   if (!gTrackUnionStreamLog) {
     gTrackUnionStreamLog = PR_NewLogModule("TrackUnionStream");
   }
-#endif
 }
 
   void TrackUnionStream::RemoveInput(MediaInputPort* aPort)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/VideoUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/VideoUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/VideoUtils.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/VideoUtils.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -4,7 +4,7 @@
 
 #include "VideoUtils.h"
 #include "MediaResource.h"
-#include "mozilla/dom/TimeRanges.h"
+#include "TimeUnits.h"
 #include "nsMathUtils.h"
 #include "nsSize.h"
 #include "VorbisUtils.h"
@@ -70,18 +70,20 @@
   return int64_t(double(durationUs) * r);
 }
 
-void GetEstimatedBufferedTimeRanges(mozilla::MediaResource* aStream,
-                                    int64_t aDurationUsecs,
-                                    mozilla::dom::TimeRanges* aOutBuffered)
+media::TimeIntervals GetEstimatedBufferedTimeRanges(mozilla::MediaResource* aStream,
+                                                    int64_t aDurationUsecs)
 {
+  media::TimeIntervals buffered;
   // Nothing to cache if the media takes 0us to play.
-  if (aDurationUsecs <= 0 || !aStream || !aOutBuffered)
-    return;
+  if (aDurationUsecs <= 0 || !aStream)
+    return buffered;
 
   // Special case completely cached files.  This also handles local files.
   if (aStream->IsDataCachedToEndOfResource(0)) {
-    aOutBuffered->Add(0, double(aDurationUsecs) / USECS_PER_S);
-    return;
+    buffered +=
+      media::TimeInterval(media::TimeUnit::FromMicroseconds(0),
+                          media::TimeUnit::FromMicroseconds(aDurationUsecs));
+    return buffered;
   }
 
   int64_t totalBytes = aStream->GetLength();
@@ -90,7 +92,7 @@
   // buffered. This will put us in a state of eternally-low-on-undecoded-data
   // which is not great, but about the best we can do.
   if (totalBytes <= 0)
-    return;
+    return buffered;
 
   int64_t startOffset = aStream->GetNextCachedData(0);
   while (startOffset >= 0) {
@@ -102,12 +104,14 @@
     int64_t startUs = BytesToTime(startOffset, totalBytes, aDurationUsecs);
     int64_t endUs = BytesToTime(endOffset, totalBytes, aDurationUsecs);
     if (startUs != endUs) {
-      aOutBuffered->Add(double(startUs) / USECS_PER_S,
-                        double(endUs) / USECS_PER_S);
+      buffered +=
+        media::TimeInterval(media::TimeUnit::FromMicroseconds(startUs),
+
+                              media::TimeUnit::FromMicroseconds(endUs));
     }
     startOffset = aStream->GetNextCachedData(endOffset);
   }
-  return;
+  return buffered;
 }
 
 int DownmixAudioToStereo(mozilla::AudioDataValue* buffer,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/VideoUtils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/VideoUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/VideoUtils.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/VideoUtils.h	2015-05-25 20:43:40.000000000 +0000
@@ -23,6 +23,7 @@
 #include "prtime.h"
 #include "AudioSampleFormat.h"
 #include "mozilla/RefPtr.h"
+#include "TimeUnits.h"
 
 using mozilla::CheckedInt64;
 using mozilla::CheckedUint64;
@@ -115,19 +116,14 @@
 
 class MediaResource;
 
-namespace dom {
-class TimeRanges;
-}
-
 // Estimates the buffered ranges of a MediaResource using a simple
 // (byteOffset/length)*duration method. Probably inaccurate, but won't
 // do file I/O, and can be used when we don't have detailed knowledge
 // of the byte->time mapping of a resource. aDurationUsecs is the duration
 // of the media in microseconds. Estimated buffered ranges are stored in
 // aOutBuffered. Ranges are 0-normalized, i.e. in the range of (0,duration].
-void GetEstimatedBufferedTimeRanges(mozilla::MediaResource* aStream,
-                                    int64_t aDurationUsecs,
-                                    mozilla::dom::TimeRanges* aOutBuffered);
+media::TimeIntervals GetEstimatedBufferedTimeRanges(mozilla::MediaResource* aStream,
+                                                    int64_t aDurationUsecs);
 
 // Converts from number of audio frames (aFrames) to microseconds, given
 // the specified audio rate (aRate). Stores result in aOutUsecs. Returns true
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/wave/WaveReader.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/wave/WaveReader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/wave/WaveReader.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/wave/WaveReader.cpp	2015-05-25 20:43:46.000000000 +0000
@@ -7,7 +7,6 @@
 #include "AbstractMediaDecoder.h"
 #include "MediaResource.h"
 #include "WaveReader.h"
-#include "mozilla/dom/TimeRanges.h"
 #include "MediaDecoderStateMachine.h"
 #include "VideoUtils.h"
 #include "nsISeekableStream.h"
@@ -23,18 +22,13 @@
 // Un-comment to enable logging of seek bisections.
 //#define SEEK_LOGGING
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* gMediaDecoderLog;
-#define LOG(type, msg) PR_LOG(gMediaDecoderLog, type, msg)
+#define LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 #ifdef SEEK_LOGGING
-#define SEEK_LOG(type, msg) PR_LOG(gMediaDecoderLog, type, msg)
+#define SEEK_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 #else
 #define SEEK_LOG(type, msg)
 #endif
-#else
-#define LOG(type, msg)
-#define SEEK_LOG(type, msg)
-#endif
 
 struct waveIdToName {
   uint32_t id;
@@ -280,15 +274,12 @@
   }
 }
 
-static double RoundToUsecs(double aSeconds) {
-  return floor(aSeconds * USECS_PER_S) / USECS_PER_S;
-}
-
-nsresult WaveReader::GetBuffered(dom::TimeRanges* aBuffered)
+media::TimeIntervals WaveReader::GetBuffered()
 {
   if (!mInfo.HasAudio()) {
-    return NS_OK;
+    return media::TimeIntervals();
   }
+  media::TimeIntervals buffered;
   AutoPinned<MediaResource> resource(mDecoder->GetResource());
   int64_t startOffset = resource->GetNextCachedData(mWavePCMOffset);
   while (startOffset >= 0) {
@@ -300,11 +291,12 @@
     // We need to round the buffered ranges' times to microseconds so that they
     // have the same precision as the currentTime and duration attribute on
     // the media element.
-    aBuffered->Add(RoundToUsecs(BytesToTime(startOffset - mWavePCMOffset)),
-                   RoundToUsecs(BytesToTime(endOffset - mWavePCMOffset)));
+    buffered += media::TimeInterval(
+      media::TimeUnit::FromSeconds(BytesToTime(startOffset - mWavePCMOffset)),
+      media::TimeUnit::FromSeconds(BytesToTime(endOffset - mWavePCMOffset)));
     startOffset = resource->GetNextCachedData(endOffset);
   }
-  return NS_OK;
+  return buffered;
 }
 
 bool
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/wave/WaveReader.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/wave/WaveReader.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/wave/WaveReader.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/wave/WaveReader.h	2015-05-25 20:43:46.000000000 +0000
@@ -10,12 +10,6 @@
 #include "mozilla/dom/HTMLMediaElement.h"
 
 namespace mozilla {
-namespace dom {
-class TimeRanges;
-}
-}
-
-namespace mozilla {
 
 class WaveReader : public MediaDecoderReader
 {
@@ -46,7 +40,7 @@
   virtual nsRefPtr<SeekPromise>
   Seek(int64_t aTime, int64_t aEndTime) override;
 
-  virtual nsresult GetBuffered(dom::TimeRanges* aBuffered) override;
+  virtual media::TimeIntervals GetBuffered() override;
 
   virtual bool IsMediaSeekable() override;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/AudioBufferSourceNode.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/AudioBufferSourceNode.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/AudioBufferSourceNode.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/AudioBufferSourceNode.cpp	2015-05-25 20:43:46.000000000 +0000
@@ -175,7 +175,7 @@
     if (!mResampler) {
       mChannels = aChannels;
       mResampler = speex_resampler_init(mChannels, mBufferSampleRate, aOutRate,
-                                        SPEEX_RESAMPLER_QUALITY_DEFAULT,
+                                        SPEEX_RESAMPLER_QUALITY_MIN,
                                         nullptr);
     } else {
       uint32_t currentOutSampleRate, currentInSampleRate;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/AudioContext.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/AudioContext.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/AudioContext.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/AudioContext.cpp	2015-05-25 20:43:46.000000000 +0000
@@ -666,11 +666,9 @@
 {
   mIsShutDown = true;
 
-  // We mute rather than suspending, because the delay between the ::Shutdown
-  // call and the CC would make us overbuffer in the MediaStreamGraph.
-  // See bug 936784 for details.
   if (!mIsOffline) {
-    Mute();
+    ErrorResult dummy;
+    nsRefPtr<Promise> ignored = Close(dummy);
   }
 
   // Release references to active nodes.
@@ -771,13 +769,19 @@
   nsRefPtr<AudioContext> mAudioContext;
 };
 
-
-
 void
 AudioContext::OnStateChanged(void* aPromise, AudioContextState aNewState)
 {
   MOZ_ASSERT(NS_IsMainThread());
 
+  // This can happen if close() was called right after creating the
+  // AudioContext, before the context has switched to "running".
+  if (mAudioContextState == AudioContextState::Closed &&
+      aNewState == AudioContextState::Running &&
+      !aPromise) {
+    return;
+  }
+
   MOZ_ASSERT((mAudioContextState == AudioContextState::Suspended &&
               aNewState == AudioContextState::Running)   ||
              (mAudioContextState == AudioContextState::Running   &&
@@ -908,14 +912,18 @@
   mCloseCalled = true;
 
   mPromiseGripArray.AppendElement(promise);
-  Graph()->ApplyAudioContextOperation(DestinationStream()->AsAudioNodeStream(),
-                                      AudioContextOperation::Close, promise);
 
+  // This can be called when freeing a document, and the streams are dead at
+  // this point, so we need extra null-checks.
   MediaStream* ds = DestinationStream();
   if (ds) {
-    ds->BlockStreamIfNeeded();
-  }
+    Graph()->ApplyAudioContextOperation(ds->AsAudioNodeStream(),
+                                        AudioContextOperation::Close, promise);
 
+    if (ds) {
+      ds->BlockStreamIfNeeded();
+    }
+  }
   return promise.forget();
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/AudioDestinationNode.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/AudioDestinationNode.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/AudioDestinationNode.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/AudioDestinationNode.cpp	2015-05-25 20:43:46.000000000 +0000
@@ -62,7 +62,7 @@
       // These allocations might fail if content provides a huge number of
       // channels or size, but it's OK since we'll deal with the failure
       // gracefully.
-      if (mInputChannels.SetLength(mNumberOfChannels)) {
+      if (mInputChannels.SetLength(mNumberOfChannels, fallible)) {
         for (uint32_t i = 0; i < mNumberOfChannels; ++i) {
           mInputChannels[i] = new (fallible) float[mLength];
           if (!mInputChannels[i]) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/AudioNodeEngine.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/AudioNodeEngine.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/AudioNodeEngine.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/AudioNodeEngine.h	2015-05-25 20:43:46.000000000 +0000
@@ -110,7 +110,7 @@
   }
 
 private:
-  AutoFallibleTArray<Storage,2> mContents;
+  nsAutoTArray<Storage, 2> mContents;
 };
 
 /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/blink/HRTFDatabaseLoader.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/blink/HRTFDatabaseLoader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/blink/HRTFDatabaseLoader.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/blink/HRTFDatabaseLoader.cpp	2015-05-25 20:43:46.000000000 +0000
@@ -56,7 +56,7 @@
     loader = entry->mLoader;
     if (loader) { // existing entry
         MOZ_ASSERT(sampleRate == loader->databaseSampleRate());
-        return loader;
+        return loader.forget();
     }
 
     loader = new HRTFDatabaseLoader(sampleRate);
@@ -64,7 +64,7 @@
 
     loader->loadAsynchronously();
 
-    return loader;
+    return loader.forget();
 }
 
 HRTFDatabaseLoader::HRTFDatabaseLoader(float sampleRate)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/blink/HRTFElevation.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/blink/HRTFElevation.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/blink/HRTFElevation.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/blink/HRTFElevation.cpp	2015-05-25 20:43:46.000000000 +0000
@@ -232,7 +232,7 @@
 
     SpeexResamplerState* resampler = sampleRate == rawSampleRate ? nullptr :
         speex_resampler_init(1, rawSampleRate, sampleRate,
-                             SPEEX_RESAMPLER_QUALITY_DEFAULT, nullptr);
+                             SPEEX_RESAMPLER_QUALITY_MIN, nullptr);
 
     // Load convolution kernels from HRTF files.
     int interpolatedIndex = 0;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/BufferDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/BufferDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/BufferDecoder.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/BufferDecoder.cpp	2015-05-25 20:43:46.000000000 +0000
@@ -11,9 +11,7 @@
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* gMediaDecoderLog;
-#endif
 
 NS_IMPL_ISUPPORTS0(BufferDecoder)
 
@@ -23,11 +21,9 @@
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_COUNT_CTOR(BufferDecoder);
-#ifdef PR_LOGGING
   if (!gMediaDecoderLog) {
     gMediaDecoderLog = PR_NewLogModule("MediaDecoder");
   }
-#endif
 }
 
 BufferDecoder::~BufferDecoder()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/DelayBuffer.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/DelayBuffer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/DelayBuffer.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/DelayBuffer.cpp	2015-05-25 20:43:46.000000000 +0000
@@ -196,7 +196,7 @@
     // block size, so that no block of writes will need to wrap.
     const int chunkCount = (mMaxDelayTicks + 2 * WEBAUDIO_BLOCK_SIZE - 1) >>
                                          WEBAUDIO_BLOCK_SIZE_BITS;
-    if (!mChunks.SetLength(chunkCount)) {
+    if (!mChunks.SetLength(chunkCount, fallible)) {
       return false;
     }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/MediaBufferDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/MediaBufferDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/MediaBufferDecoder.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/MediaBufferDecoder.cpp	2015-05-25 20:43:46.000000000 +0000
@@ -100,16 +100,10 @@
     , mLength(aLength)
     , mDecodeJob(aDecodeJob)
     , mPhase(PhaseEnum::Decode)
+    , mFirstFrameDecoded(false)
   {
     MOZ_ASSERT(aBuffer);
     MOZ_ASSERT(NS_IsMainThread());
-
-    nsCOMPtr<nsPIDOMWindow> pWindow = do_QueryInterface(mDecodeJob.mContext->GetParentObject());
-    nsCOMPtr<nsIScriptObjectPrincipal> scriptPrincipal =
-      do_QueryInterface(pWindow);
-    if (scriptPrincipal) {
-      mPrincipal = scriptPrincipal->GetPrincipal();
-    }
   }
 
   NS_IMETHOD Run();
@@ -132,6 +126,8 @@
   }
 
   void Decode();
+  void OnMetadataRead(MetadataHolder* aMetadata);
+  void OnMetadataNotRead(ReadMetadataFailureReason aReason);
   void RequestSample();
   void SampleDecoded(AudioData* aData);
   void SampleNotDecoded(MediaDecoderReader::NotDecodedReason aReason);
@@ -156,11 +152,11 @@
   uint32_t mLength;
   WebAudioDecodeJob& mDecodeJob;
   PhaseEnum mPhase;
-  nsCOMPtr<nsIPrincipal> mPrincipal;
   nsRefPtr<BufferDecoder> mBufferDecoder;
   nsRefPtr<MediaDecoderReader> mDecoderReader;
   MediaInfo mMediaInfo;
   MediaQueue<AudioData> mAudioQueue;
+  bool mFirstFrameDecoded;
 };
 
 NS_IMETHODIMP
@@ -187,9 +183,16 @@
 {
   MOZ_ASSERT(NS_IsMainThread());
 
+
+  nsCOMPtr<nsIPrincipal> principal;
+  nsCOMPtr<nsIScriptObjectPrincipal> sop = do_QueryInterface(mDecodeJob.mContext->GetParentObject());
+  if (sop) {
+    principal = sop->GetPrincipal();
+  }
+
   nsRefPtr<BufferMediaResource> resource =
     new BufferMediaResource(static_cast<uint8_t*> (mBuffer),
-                            mLength, mPrincipal, mContentType);
+                            mLength, principal, mContentType);
 
   MOZ_ASSERT(!mBufferDecoder);
   mBufferDecoder = new BufferDecoder(resource);
@@ -250,27 +253,36 @@
 
   // Tell the decoder reader that we are not going to play the data directly,
   // and that we should not reject files with more channels than the audio
-  // bakend support.
+  // backend support.
   mDecoderReader->SetIgnoreAudioOutputFormat();
 
-  nsAutoPtr<MetadataTags> tags;
-  nsresult rv = mDecoderReader->ReadMetadata(&mMediaInfo, getter_Transfers(tags));
-  if (NS_FAILED(rv)) {
-    mDecoderReader->Shutdown();
-    ReportFailureOnMainThread(WebAudioDecodeJob::InvalidContent);
-    return;
-  }
+  mDecoderReader->AsyncReadMetadata()->Then(mDecoderReader->GetTaskQueue(), __func__, this,
+                                       &MediaDecodeTask::OnMetadataRead,
+                                       &MediaDecodeTask::OnMetadataNotRead);
+}
 
-  if (!mDecoderReader->HasAudio()) {
+void
+MediaDecodeTask::OnMetadataRead(MetadataHolder* aMetadata)
+{
+  mMediaInfo = aMetadata->mInfo;
+  if (!mMediaInfo.HasAudio()) {
     mDecoderReader->Shutdown();
     ReportFailureOnMainThread(WebAudioDecodeJob::NoAudio);
     return;
   }
-
   RequestSample();
 }
 
 void
+MediaDecodeTask::OnMetadataNotRead(ReadMetadataFailureReason aReason)
+{
+  MOZ_RELEASE_ASSERT(aReason != ReadMetadataFailureReason::WAITING_FOR_RESOURCES);
+  mDecoderReader->Shutdown();
+  ReportFailureOnMainThread(WebAudioDecodeJob::InvalidContent);
+  return;
+}
+
+void
 MediaDecodeTask::RequestSample()
 {
   mDecoderReader->RequestAudioData()->Then(mDecoderReader->GetTaskQueue(), __func__, this,
@@ -283,6 +295,10 @@
 {
   MOZ_ASSERT(!NS_IsMainThread());
   mAudioQueue.Push(aData);
+  if (!mFirstFrameDecoded) {
+    mDecoderReader->ReadUpdatedMetadata(&mMediaInfo);
+    mFirstFrameDecoded = true;
+  }
   RequestSample();
 }
 
@@ -336,7 +352,7 @@
   // write fewer bytes than mResampledFrames to the output buffer, in which
   // case mWriteIndex will tell us how many valid samples we have.
   bool memoryAllocationSuccess = true;
-  if (!mDecodeJob.mChannelBuffers.SetLength(channelCount)) {
+  if (!mDecodeJob.mChannelBuffers.SetLength(channelCount, fallible)) {
     memoryAllocationSuccess = false;
   } else {
     for (uint32_t i = 0; i < channelCount; ++i) {
@@ -491,7 +507,12 @@
                            WebAudioDecodeJob::UnknownError);
     NS_DispatchToMainThread(event);
   } else {
-    task->Reader()->GetTaskQueue()->Dispatch(task);
+    // If we did this without a temporary:
+    //   task->Reader()->GetTaskQueue()->Dispatch(task.forget())
+    // we might evaluate the task.forget() before calling Reader(). Enforce
+    // a non-crashy order-of-operations.
+    MediaTaskQueue* taskQueue = task->Reader()->GetTaskQueue();
+    taskQueue->Dispatch(task.forget());
   }
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/MediaStreamAudioSourceNode.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/MediaStreamAudioSourceNode.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/MediaStreamAudioSourceNode.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/MediaStreamAudioSourceNode.cpp	2015-05-25 20:43:46.000000000 +0000
@@ -80,7 +80,7 @@
     if (doc) {
       nsIPrincipal* docPrincipal = doc->NodePrincipal();
       nsIPrincipal* streamPrincipal = mInputStream->GetPrincipal();
-      if (NS_FAILED(docPrincipal->Subsumes(streamPrincipal, &subsumes))) {
+      if (!streamPrincipal || NS_FAILED(docPrincipal->Subsumes(streamPrincipal, &subsumes))) {
         subsumes = false;
       }
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/OscillatorNode.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/OscillatorNode.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/OscillatorNode.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/OscillatorNode.cpp	2015-05-25 20:43:46.000000000 +0000
@@ -303,7 +303,7 @@
       *aFinished = true;
       return;
     }
-    if (ticks + WEBAUDIO_BLOCK_SIZE < mStart) {
+    if (ticks + WEBAUDIO_BLOCK_SIZE <= mStart) {
       // We're not playing yet.
       ComputeSilence(aOutput);
       return;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/test/blink/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/test/blink/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/test/blink/mochitest.ini	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/test/blink/mochitest.ini	2015-05-25 20:43:46.000000000 +0000
@@ -1,4 +1,5 @@
 [DEFAULT]
+tags=msg
 support-files =
   audio-testing.js
   convolution-testing.js
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/test/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/test/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/test/mochitest.ini	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/test/mochitest.ini	2015-05-25 20:43:46.000000000 +0000
@@ -1,4 +1,6 @@
 [DEFAULT]
+tags=msg
+tags = webaudio
 skip-if = ((buildapp == 'mulet' || buildapp == 'b2g') && (toolkit != 'gonk' || debug)) || (os == 'win' && strictContentSandbox) #b2g-debug,b2g-desktop(bug 916135); strictContentSandbox(Bug 1042735)
 support-files =
   audio-expected.wav
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/test/test_audioContextSuspendResumeClose.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/test/test_audioContextSuspendResumeClose.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/test/test_audioContextSuspendResumeClose.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/test/test_audioContextSuspendResumeClose.html	2015-05-25 20:43:46.000000000 +0000
@@ -94,56 +94,59 @@
   var ac1 = new AudioContext(),
       ac2 = new AudioContext();
 
-  var osc1 = ac1.createOscillator(),
-      mediaStreamDestination1 = ac1.createMediaStreamDestination();
+  ac1.onstatechange = function() {
+    ac1.onstatechange = null;
 
-  var mediaStreamAudioSourceNode2 =
-    ac2.createMediaStreamSource(mediaStreamDestination1.stream),
-    sp2 = ac2.createScriptProcessor(),
-    suspendCalled = false,
-    silentBuffersInARow = 0;
-
-
-  sp2.onaudioprocess = function(e) {
-    if (!suspendCalled) {
-      ac1.suspend();
-      suspendCalled = true;
-    } else {
-      // Wait until the context that produce the tone is actually suspended. It
-      // can be that the second context receives a little amount of data because
-      // of the buffering between the two contexts.
-      if (ac1.state == "suspended") {
-        var input = e.inputBuffer.getChannelData(0);
-        var silent = true;
-        for (var i = 0; i < input.length; i++) {
-          if (input[i] != 0.0) {
-            silent = false;
-          }
+    var osc1 = ac1.createOscillator(),
+        mediaStreamDestination1 = ac1.createMediaStreamDestination();
+
+    var mediaStreamAudioSourceNode2 =
+      ac2.createMediaStreamSource(mediaStreamDestination1.stream),
+      sp2 = ac2.createScriptProcessor(),
+      silentBuffersInARow = 0;
+
+
+    sp2.onaudioprocess = function(e) {
+      ac1.suspend().then(function() {
+        is(ac1.state, "suspended", "ac1 is suspended");
+        sp2.onaudioprocess = checkSilence;
+      });
+      sp2.onaudioprocess = null;
+    }
+
+    function checkSilence(e) {
+      var input = e.inputBuffer.getChannelData(0);
+      var silent = true;
+      for (var i = 0; i < input.length; i++) {
+        if (input[i] != 0.0) {
+          silent = false;
         }
+      }
+
+      todo(false, "input buffer is " + (silent ? "silent" : "noisy"));
 
-        if (silent) {
-          silentBuffersInARow++;
-          if (silentBuffersInARow == 10) {
-            ok(true,
-                "MediaStreams produce silence when their input is blocked.");
-            sp2.onaudioprocess = null;
-            ac1.close();
-            ac2.close();
-            todo(false,"1");
-            finish();
-          }
-        } else {
-          is(silentBuffersInARow, 0,
-              "No non silent buffer inbetween silent buffers.");
+      if (silent) {
+        silentBuffersInARow++;
+        if (silentBuffersInARow == 10) {
+          ok(true,
+              "MediaStreams produce silence when their input is blocked.");
+          sp2.onaudioprocess = null;
+          ac1.close();
+          ac2.close();
+          todo(false,"1");
+          finish();
         }
+      } else {
+        is(silentBuffersInARow, 0,
+            "No non silent buffer inbetween silent buffers.");
       }
     }
-  }
 
-  osc1.connect(mediaStreamDestination1);
+    osc1.connect(mediaStreamDestination1);
 
-  mediaStreamAudioSourceNode2.connect(sp2);
-  osc1.start();
+    mediaStreamAudioSourceNode2.connect(sp2);
+    osc1.start();
+  }
 }
 
 
@@ -155,47 +158,24 @@
   var ac1 = new AudioContext(),
       ac2 = new AudioContext();
 
-  var osc1 = ac1.createOscillator(),
-      mediaStreamDestination1 = ac1.createMediaStreamDestination(),
-      sp1 = ac1.createScriptProcessor();
-
-  var mediaStreamAudioSourceNode2 =
-    ac2.createMediaStreamSource(mediaStreamDestination1.stream),
-    sp2 = ac2.createScriptProcessor(),
-    resumed = false,
-    suspended = false,
-    countEventOnFirstSP = true,
-    eventReceived = 0;
-
-
-  osc1.frequency.value = 0.0001;
-
-  // We keep a first ScriptProcessor to get a periodic callback, since we can't
-  // use setTimeout anymore.
-  sp1.onaudioprocess = function(e) {
-    if (countEventOnFirstSP) {
-      eventReceived++;
-    }
-    if (eventReceived > 3 && suspended) {
-      countEventOnFirstSP = false;
+  ac1.onstatechange = function() {
+    ac1.onstatechange = null;
+
+    var osc1 = ac1.createOscillator(),
+        mediaStreamDestination1 = ac1.createMediaStreamDestination(),
+        sp1 = ac1.createScriptProcessor();
+
+    var mediaStreamAudioSourceNode2 =
+      ac2.createMediaStreamSource(mediaStreamDestination1.stream),
+      sp2 = ac2.createScriptProcessor(),
       eventReceived = 0;
-      ac2.resume().then(function() {
-        resumed = true;
-      });
-    }
-  }
 
-  sp2.onaudioprocess = function(e) {
-    var inputBuffer = e.inputBuffer.getChannelData(0);
-    if (!resumed) {
-      // save the last value of the buffer before suspending.
-      sp2.value = inputBuffer[inputBuffer.length - 1];
-      ac2.suspend().then(function() {
-        suspended = true;
-      });
-    } else {
-      eventReceived++;
-      if (eventReceived == 3) {
+
+    osc1.frequency.value = 0.0001;
+
+    function checkDiscontinuity(e) {
+      var inputBuffer = e.inputBuffer.getChannelData(0);
+      if (eventReceived++ == 3) {
         var delta = Math.abs(inputBuffer[1] - sp2.value),
             theoreticalIncrement = 2048 * 3 * Math.PI * 2 * osc1.frequency.value / ac1.sampleRate;
         ok(delta >= theoreticalIncrement,
@@ -208,13 +188,23 @@
         finish();
       }
     }
-  }
 
-  osc1.connect(mediaStreamDestination1);
-  osc1.connect(sp1);
+    sp2.onaudioprocess = function(e) {
+      var inputBuffer = e.inputBuffer.getChannelData(0);
+      sp2.value = inputBuffer[inputBuffer.length - 1];
+      ac2.suspend().then(function() {
+          ac2.resume().then(function() {
+            sp2.onaudioprocess = checkDiscontinuity;
+            });
+          });
+    }
+
+    osc1.connect(mediaStreamDestination1);
+    osc1.connect(sp1);
 
-  mediaStreamAudioSourceNode2.connect(sp2);
-  osc1.start();
+    mediaStreamAudioSourceNode2.connect(sp2);
+    osc1.start();
+  }
 }
 
 // Test that ScriptProcessorNode's onaudioprocess don't get called while the
@@ -226,23 +216,26 @@
   var sp = ac.createScriptProcessor();
   var remainingIterations = 30;
   var afterResume = false;
-  sp.onaudioprocess = function() {
-    ok(ac.state == "running" || remainingIterations == 3, "If onaudioprocess is called, the context" +
-        " must be running (was " + ac.state + ", remainingIterations:" + remainingIterations +")");
-    remainingIterations--;
-    if (!afterResume) {
-      if (remainingIterations == 0) {
-        ac.suspend().then(function() {
-          ac.resume().then(function() {
-            remainingIterations = 30;
-            afterResume = true;
+  ac.onstatechange = function() {
+    ac.onstatechange = null;
+    sp.onaudioprocess = function() {
+      ok(ac.state == "running", "If onaudioprocess is called, the context" +
+          " must be running (was " + ac.state + ", remainingIterations:" + remainingIterations +")");
+      remainingIterations--;
+      if (!afterResume) {
+        if (remainingIterations == 0) {
+          ac.suspend().then(function() {
+            ac.resume().then(function() {
+              remainingIterations = 30;
+              afterResume = true;
+            });
           });
-        });
+        }
+      } else {
+        sp.onaudioprocess = null;
+        todo(false,"3");
+        finish();
       }
-    } else {
-      sp.onaudioprocess = null;
-      todo(false,"3");
-      finish();
     }
   }
   sp.connect(ac.destination);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/WaveShaperNode.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/WaveShaperNode.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webaudio/WaveShaperNode.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webaudio/WaveShaperNode.cpp	2015-05-25 20:43:46.000000000 +0000
@@ -87,12 +87,12 @@
     mUpSampler = speex_resampler_init(aChannels,
                                       aSampleRate,
                                       aSampleRate * ValueOf(aType),
-                                      SPEEX_RESAMPLER_QUALITY_DEFAULT,
+                                      SPEEX_RESAMPLER_QUALITY_MIN,
                                       nullptr);
     mDownSampler = speex_resampler_init(aChannels,
                                         aSampleRate * ValueOf(aType),
                                         aSampleRate,
-                                        SPEEX_RESAMPLER_QUALITY_DEFAULT,
+                                        SPEEX_RESAMPLER_QUALITY_MIN,
                                         nullptr);
     mBuffer.SetLength(WEBAUDIO_BLOCK_SIZE*ValueOf(aType));
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webm/IntelWebMVideoDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webm/IntelWebMVideoDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webm/IntelWebMVideoDecoder.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webm/IntelWebMVideoDecoder.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -20,12 +20,8 @@
 #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
+#define LOG(...) MOZ_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__))
 
 using namespace mp4_demuxer;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webm/SoftwareWebMVideoDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webm/SoftwareWebMVideoDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webm/SoftwareWebMVideoDecoder.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webm/SoftwareWebMVideoDecoder.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -8,9 +8,9 @@
 #include "gfx2DGlue.h"
 #include "MediaDecoderStateMachine.h"
 #include "MediaResource.h"
-#include "mozilla/dom/TimeRanges.h"
 #include "nsError.h"
 #include "OggReader.h"
+#include "TimeUnits.h"
 #include "VorbisUtils.h"
 #include "WebMBufferedParser.h"
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webm/WebMBufferedParser.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webm/WebMBufferedParser.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webm/WebMBufferedParser.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webm/WebMBufferedParser.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -6,7 +6,6 @@
 
 #include "nsAlgorithm.h"
 #include "WebMBufferedParser.h"
-#include "mozilla/dom/TimeRanges.h"
 #include "nsThreadUtils.h"
 #include <algorithm>
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webm/WebMReader.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webm/WebMReader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webm/WebMReader.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webm/WebMReader.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -10,7 +10,6 @@
 #include "SoftwareWebMVideoDecoder.h"
 #include "WebMReader.h"
 #include "WebMBufferedParser.h"
-#include "mozilla/dom/TimeRanges.h"
 #include "VorbisUtils.h"
 #include "gfx2DGlue.h"
 #include "Layers.h"
@@ -35,18 +34,13 @@
 
 #undef LOG
 
-#ifdef PR_LOGGING
 #include "prprf.h"
-#define LOG(type, msg) PR_LOG(gMediaDecoderLog, type, msg)
+#define LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 #ifdef SEEK_LOGGING
-#define SEEK_LOG(type, msg) PR_LOG(gMediaDecoderLog, type, msg)
+#define SEEK_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 #else
 #define SEEK_LOG(type, msg)
 #endif
-#else
-#define LOG(type, msg)
-#define SEEK_LOG(type, msg)
-#endif
 
 namespace mozilla {
 
@@ -110,7 +104,10 @@
                      unsigned int severity,
                      char const * format, ...)
 {
-#ifdef PR_LOGGING
+  if (!PR_LOG_TEST(gNesteggLog, PR_LOG_DEBUG)) {
+    return;
+  }
+
   va_list args;
   char msg[256];
   const char * sevStr;
@@ -140,10 +137,9 @@
 
   PR_snprintf(msg, sizeof(msg), "%p [Nestegg-%s] ", context, sevStr);
   PR_vsnprintf(msg+strlen(msg), sizeof(msg)-strlen(msg), format, args);
-  PR_LOG(gNesteggLog, PR_LOG_DEBUG, (msg));
+  MOZ_LOG(gNesteggLog, PR_LOG_DEBUG, (msg));
 
   va_end(args);
-#endif
 }
 
 ogg_packet InitOggPacket(const unsigned char* aData, size_t aLength,
@@ -184,11 +180,9 @@
   , mPaddingDiscarded(false)
 {
   MOZ_COUNT_CTOR(WebMReader);
-#ifdef PR_LOGGING
   if (!gNesteggLog) {
     gNesteggLog = PR_NewLogModule("Nestegg");
   }
-#endif
   // Zero these member vars to avoid crashes in VP8 destroy and Vorbis clear
   // functions when destructor is called before |Init|.
   memset(&mVorbisBlock, 0, sizeof(vorbis_block));
@@ -1048,7 +1042,7 @@
 bool WebMReader::DecodeVideoFrame(bool &aKeyframeSkip, int64_t aTimeThreshold)
 {
   if (!(aKeyframeSkip && ShouldSkipVideoFrame(aTimeThreshold))) {
-    LOG(PR_LOG_DEBUG, ("Reader [%p]: set the aKeyframeSkip to false.",this));
+    LOG(PR_LOG_DEBUG+1, ("Reader [%p]: set the aKeyframeSkip to false.",this));
     aKeyframeSkip = false;
   }
   return mVideoDecoder->DecodeVideoFrame(aKeyframeSkip, aTimeThreshold);
@@ -1112,21 +1106,20 @@
   return NS_OK;
 }
 
-nsresult WebMReader::GetBuffered(dom::TimeRanges* aBuffered)
+media::TimeIntervals WebMReader::GetBuffered()
 {
   MOZ_ASSERT(mStartTime != -1, "Need to finish metadata decode first");
-  if (aBuffered->Length() != 0) {
-    return NS_ERROR_FAILURE;
-  }
-
   AutoPinned<MediaResource> resource(mDecoder->GetResource());
 
+  media::TimeIntervals buffered;
   // Special case completely cached files.  This also handles local files.
   if (mContext && resource->IsDataCachedToEndOfResource(0)) {
     uint64_t duration = 0;
     if (nestegg_duration(mContext, &duration) == 0) {
-      aBuffered->Add(0, duration / NS_PER_S);
-      return NS_OK;
+      buffered +=
+        media::TimeInterval(media::TimeUnit::FromSeconds(0),
+                            media::TimeUnit::FromSeconds(duration / NS_PER_S));
+      return buffered;
     }
   }
 
@@ -1134,7 +1127,7 @@
   // the WebM bitstream.
   nsTArray<MediaByteRange> ranges;
   nsresult res = resource->GetCachedRanges(ranges);
-  NS_ENSURE_SUCCESS(res, res);
+  NS_ENSURE_SUCCESS(res, media::TimeIntervals::Invalid());
 
   for (uint32_t index = 0; index < ranges.Length(); index++) {
     uint64_t start, end;
@@ -1159,12 +1152,12 @@
           endTime = duration / NS_PER_S;
         }
       }
-
-      aBuffered->Add(startTime, endTime);
+      buffered += media::TimeInterval(media::TimeUnit::FromSeconds(startTime),
+                                      media::TimeUnit::FromSeconds(endTime));
     }
   }
 
-  return NS_OK;
+  return buffered;
 }
 
 void WebMReader::NotifyDataArrived(const char* aBuffer, uint32_t aLength,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webm/WebMReader.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webm/WebMReader.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webm/WebMReader.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webm/WebMReader.h	2015-05-25 20:43:47.000000000 +0000
@@ -172,7 +172,7 @@
   virtual nsRefPtr<SeekPromise>
   Seek(int64_t aTime, int64_t aEndTime) override;
 
-  virtual nsresult GetBuffered(dom::TimeRanges* aBuffered) override;
+  virtual media::TimeIntervals GetBuffered() override;
   virtual void NotifyDataArrived(const char* aBuffer, uint32_t aLength,
                                  int64_t aOffset) override;
   virtual int64_t GetEvictionOffset(double aTime) override;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webrtc/MediaEngineCameraVideoSource.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webrtc/MediaEngineCameraVideoSource.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webrtc/MediaEngineCameraVideoSource.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webrtc/MediaEngineCameraVideoSource.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -15,14 +15,9 @@
 using dom::ConstrainDoubleRange;
 using dom::MediaTrackConstraintSet;
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetMediaManagerLog();
-#define LOG(msg) PR_LOG(GetMediaManagerLog(), PR_LOG_DEBUG, msg)
-#define LOGFRAME(msg) PR_LOG(GetMediaManagerLog(), 6, msg)
-#else
-#define LOG(msg)
-#define LOGFRAME(msg)
-#endif
+#define LOG(msg) MOZ_LOG(GetMediaManagerLog(), PR_LOG_DEBUG, msg)
+#define LOGFRAME(msg) MOZ_LOG(GetMediaManagerLog(), 6, msg)
 
 // guts for appending data to the MSG track
 bool MediaEngineCameraVideoSource::AppendToTrack(SourceMediaStream* aSource,
@@ -200,7 +195,6 @@
 MediaEngineCameraVideoSource::LogConstraints(
     const MediaTrackConstraintSet& aConstraints, bool aAdvanced)
 {
-#ifdef PR_LOGGING
   NormalizedConstraintSet c(aConstraints, aAdvanced);
   LOG(((c.mWidth.mIdeal.WasPassed()?
         "Constraints: width: { min: %d, max: %d, ideal: %d }" :
@@ -217,7 +211,6 @@
         "             frameRate: { min: %f, max: %f }"),
        c.mFrameRate.mMin, c.mFrameRate.mMax,
        c.mFrameRate.mIdeal.WasPassed()? c.mFrameRate.mIdeal.Value() : 0));
-#endif
 }
 
 bool
@@ -225,18 +218,18 @@
     const dom::MediaTrackConstraints &aConstraints,
     const MediaEnginePrefs &aPrefs)
 {
-#ifdef PR_LOGGING
-  LOG(("ChooseCapability: prefs: %dx%d @%d-%dfps",
-       aPrefs.GetWidth(), aPrefs.GetHeight(),
-       aPrefs.mFPS, aPrefs.mMinFPS));
-  LogConstraints(aConstraints, false);
-  if (aConstraints.mAdvanced.WasPassed()) {
-    LOG(("Advanced array[%u]:", aConstraints.mAdvanced.Value().Length()));
-    for (auto& advanced : aConstraints.mAdvanced.Value()) {
-      LogConstraints(advanced, true);
+  if (PR_LOG_TEST(GetMediaManagerLog(), PR_LOG_DEBUG)) {
+    LOG(("ChooseCapability: prefs: %dx%d @%d-%dfps",
+         aPrefs.GetWidth(), aPrefs.GetHeight(),
+         aPrefs.mFPS, aPrefs.mMinFPS));
+    LogConstraints(aConstraints, false);
+    if (aConstraints.mAdvanced.WasPassed()) {
+      LOG(("Advanced array[%u]:", aConstraints.mAdvanced.Value().Length()));
+      for (auto& advanced : aConstraints.mAdvanced.Value()) {
+        LogConstraints(advanced, true);
+      }
     }
   }
-#endif
 
   size_t num = NumCapabilities();
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webrtc/MediaEngineGonkVideoSource.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webrtc/MediaEngineGonkVideoSource.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webrtc/MediaEngineGonkVideoSource.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webrtc/MediaEngineGonkVideoSource.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -25,14 +25,9 @@
 using namespace android;
 
 #undef LOG
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetMediaManagerLog();
-#define LOG(msg) PR_LOG(GetMediaManagerLog(), PR_LOG_DEBUG, msg)
-#define LOGFRAME(msg) PR_LOG(GetMediaManagerLog(), 6, msg)
-#else
-#define LOG(msg)
-#define LOGFRAME(msg)
-#endif
+#define LOG(msg) MOZ_LOG(GetMediaManagerLog(), PR_LOG_DEBUG, msg)
+#define LOGFRAME(msg) MOZ_LOG(GetMediaManagerLog(), 6, msg)
 
 class MediaBufferListener : public GonkCameraSource::DirectBufferListener {
 public:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webrtc/MediaEngineGonkVideoSource.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webrtc/MediaEngineGonkVideoSource.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webrtc/MediaEngineGonkVideoSource.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webrtc/MediaEngineGonkVideoSource.h	2015-05-25 20:43:47.000000000 +0000
@@ -112,7 +112,7 @@
   mozilla::ReentrantMonitor mCallbackMonitor; // Monitor for camera callback handling
   // This is only modified on MainThread (AllocImpl and DeallocImpl)
   nsRefPtr<ICameraControl> mCameraControl;
-  nsCOMPtr<nsIDOMFile> mLastCapture;
+  nsRefPtr<dom::File> mLastCapture;
 
   android::sp<android::GonkCameraSource> mCameraSource;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webrtc/MediaEngineWebRTCAudio.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webrtc/MediaEngineWebRTCAudio.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webrtc/MediaEngineWebRTCAudio.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webrtc/MediaEngineWebRTCAudio.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -36,14 +36,9 @@
 #undef LOG
 #endif
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetMediaManagerLog();
-#define LOG(msg) PR_LOG(GetMediaManagerLog(), PR_LOG_DEBUG, msg)
-#define LOG_FRAMES(msg) PR_LOG(GetMediaManagerLog(), 6, msg)
-#else
-#define LOG(msg)
-#define LOG_FRAMES(msg)
-#endif
+#define LOG(msg) MOZ_LOG(GetMediaManagerLog(), PR_LOG_DEBUG, msg)
+#define LOG_FRAMES(msg) MOZ_LOG(GetMediaManagerLog(), 6, msg)
 
 /**
  * Webrtc audio source.
@@ -280,15 +275,13 @@
       LOG(("Audio device is not initalized"));
       return NS_ERROR_FAILURE;
     }
-  } else {
-#ifdef PR_LOGGING
+  } else if (PR_LOG_TEST(GetMediaManagerLog(), PR_LOG_DEBUG)) {
     MonitorAutoLock lock(mMonitor);
     if (mSources.IsEmpty()) {
       LOG(("Audio device %d reallocated", mCapIndex));
     } else {
       LOG(("Audio device %d allocated shared", mCapIndex));
     }
-#endif
   }
   return NS_OK;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webrtc/MediaEngineWebRTC.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webrtc/MediaEngineWebRTC.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webrtc/MediaEngineWebRTC.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webrtc/MediaEngineWebRTC.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -8,7 +8,6 @@
 #include "CSFLog.h"
 #include "prenv.h"
 
-#ifdef PR_LOGGING
 static PRLogModuleInfo*
 GetUserMediaLog()
 {
@@ -17,7 +16,6 @@
     sLog = PR_NewLogModule("GetUserMedia");
   return sLog;
 }
-#endif
 
 #include "MediaEngineWebRTC.h"
 #include "ImageContainer.h"
@@ -37,7 +35,7 @@
 #endif
 
 #undef LOG
-#define LOG(args) PR_LOG(GetUserMediaLog(), PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(GetUserMediaLog(), PR_LOG_DEBUG, args)
 
 namespace mozilla {
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webrtc/MediaEngineWebRTC.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webrtc/MediaEngineWebRTC.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webrtc/MediaEngineWebRTC.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webrtc/MediaEngineWebRTC.h	2015-05-25 20:43:47.000000000 +0000
@@ -137,7 +137,6 @@
   MediaEngineWebRTCAudioSource(nsIThread* aThread, webrtc::VoiceEngine* aVoiceEnginePtr,
                                int aIndex, const char* name, const char* uuid)
     : MediaEngineAudioSource(kReleased)
-    , mSamples(0)
     , mVoiceEngine(aVoiceEnginePtr)
     , mMonitor("WebRTCMic.Monitor")
     , mThread(aThread)
@@ -199,12 +198,6 @@
 protected:
   ~MediaEngineWebRTCAudioSource() { Shutdown(); }
 
-  // mSamples is an int to avoid conversions when comparing/etc to
-  // samplingFreq & length. Making mSamples protected instead of private is a
-  // silly way to avoid -Wunused-private-field warnings when PR_LOGGING is not
-  // #defined. mSamples is not actually expected to be used by a derived class.
-  int mSamples;
-
 private:
   void Init();
   void Shutdown();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webrtc/MediaEngineWebRTCVideo.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webrtc/MediaEngineWebRTCVideo.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webrtc/MediaEngineWebRTCVideo.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webrtc/MediaEngineWebRTCVideo.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -18,14 +18,9 @@
 using dom::ConstrainDoubleRange;
 using dom::MediaTrackConstraintSet;
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetMediaManagerLog();
-#define LOG(msg) PR_LOG(GetMediaManagerLog(), PR_LOG_DEBUG, msg)
-#define LOGFRAME(msg) PR_LOG(GetMediaManagerLog(), 6, msg)
-#else
-#define LOG(msg)
-#define LOGFRAME(msg)
-#endif
+#define LOG(msg) MOZ_LOG(GetMediaManagerLog(), PR_LOG_DEBUG, msg)
+#define LOGFRAME(msg) MOZ_LOG(GetMediaManagerLog(), 6, msg)
 
 /**
  * Webrtc video source.
@@ -232,15 +227,13 @@
     }
     mState = kAllocated;
     LOG(("Video device %d allocated", mCaptureIndex));
-  } else {
-#ifdef PR_LOGGING
+  } else if (PR_LOG_TEST(GetMediaManagerLog(), PR_LOG_DEBUG)) {
     MonitorAutoLock lock(mMonitor);
     if (mSources.IsEmpty()) {
       LOG(("Video device %d reallocated", mCaptureIndex));
     } else {
       LOG(("Video device %d allocated shared", mCaptureIndex));
     }
-#endif
   }
 
   return NS_OK;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/recognition/SpeechRecognition.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/recognition/SpeechRecognition.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/recognition/SpeechRecognition.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/recognition/SpeechRecognition.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -48,7 +48,6 @@
 // kSAMPLE_RATE frames = 1s, kESTIMATION_FRAMES frames = 300ms
 static const uint32_t kESTIMATION_SAMPLES = 300 * kSAMPLE_RATE / 1000;
 
-#ifdef PR_LOGGING
 PRLogModuleInfo*
 GetSpeechRecognitionLog()
 {
@@ -59,10 +58,7 @@
 
   return sLog;
 }
-#define SR_LOG(...) PR_LOG(GetSpeechRecognitionLog(), PR_LOG_DEBUG, (__VA_ARGS__))
-#else
-#define SR_LOG(...)
-#endif
+#define SR_LOG(...) MOZ_LOG(GetSpeechRecognitionLog(), PR_LOG_DEBUG, (__VA_ARGS__))
 
 already_AddRefed<nsISpeechRecognitionService>
 GetSpeechRecognitionService()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/recognition/SpeechRecognition.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/recognition/SpeechRecognition.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/recognition/SpeechRecognition.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/recognition/SpeechRecognition.h	2015-05-25 20:43:47.000000000 +0000
@@ -44,12 +44,8 @@
 class GlobalObject;
 class SpeechEvent;
 
-#ifdef PR_LOGGING
 PRLogModuleInfo* GetSpeechRecognitionLog();
-#define SR_LOG(...) PR_LOG(GetSpeechRecognitionLog(), PR_LOG_DEBUG, (__VA_ARGS__))
-#else
-#define SR_LOG(...)
-#endif
+#define SR_LOG(...) MOZ_LOG(GetSpeechRecognitionLog(), PR_LOG_DEBUG, (__VA_ARGS__))
 
 already_AddRefed<nsISpeechRecognitionService> GetSpeechRecognitionService();
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/recognition/test/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/recognition/test/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/recognition/test/mochitest.ini	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/recognition/test/mochitest.ini	2015-05-25 20:43:47.000000000 +0000
@@ -1,4 +1,5 @@
 [DEFAULT]
+tags=msg
 support-files =
   head.js
   hello.ogg
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/ipc/PSpeechSynthesisRequest.ipdl firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/ipc/PSpeechSynthesisRequest.ipdl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/ipc/PSpeechSynthesisRequest.ipdl	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/ipc/PSpeechSynthesisRequest.ipdl	2015-05-25 20:43:47.000000000 +0000
@@ -25,7 +25,7 @@
 
   __delete__(bool aIsError, float aElapsedTime, uint32_t aCharIndex);
 
-  OnStart();
+  OnStart(nsString aUri);
 
   OnPause(float aElapsedTime, uint32_t aCharIndex);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/ipc/SpeechSynthesisChild.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/ipc/SpeechSynthesisChild.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/ipc/SpeechSynthesisChild.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/ipc/SpeechSynthesisChild.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -73,9 +73,9 @@
 }
 
 bool
-SpeechSynthesisRequestChild::RecvOnStart()
+SpeechSynthesisRequestChild::RecvOnStart(const nsString& aUri)
 {
-  mTask->DispatchStartImpl();
+  mTask->DispatchStartImpl(aUri);
   return true;
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/ipc/SpeechSynthesisChild.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/ipc/SpeechSynthesisChild.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/ipc/SpeechSynthesisChild.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/ipc/SpeechSynthesisChild.h	2015-05-25 20:43:47.000000000 +0000
@@ -48,7 +48,7 @@
   virtual ~SpeechSynthesisRequestChild();
 
 protected:
-  virtual bool RecvOnStart() override;
+  virtual bool RecvOnStart(const nsString& aUri) override;
 
   virtual bool Recv__delete__(const bool& aIsError,
                               const float& aElapsedTime,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/ipc/SpeechSynthesisParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/ipc/SpeechSynthesisParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/ipc/SpeechSynthesisParent.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/ipc/SpeechSynthesisParent.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -120,10 +120,10 @@
 // SpeechTaskParent
 
 nsresult
-SpeechTaskParent::DispatchStartImpl()
+SpeechTaskParent::DispatchStartImpl(const nsAString& aUri)
 {
   MOZ_ASSERT(mActor);
-  NS_ENSURE_TRUE(mActor->SendOnStart(), NS_ERROR_FAILURE);
+  NS_ENSURE_TRUE(mActor->SendOnStart(nsString(aUri)), NS_ERROR_FAILURE);
 
   return NS_OK;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/ipc/SpeechSynthesisParent.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/ipc/SpeechSynthesisParent.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/ipc/SpeechSynthesisParent.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/ipc/SpeechSynthesisParent.h	2015-05-25 20:43:47.000000000 +0000
@@ -75,7 +75,7 @@
   SpeechTaskParent(float aVolume, const nsAString& aUtterance)
     : nsSpeechTask(aVolume, aUtterance) {}
 
-  virtual nsresult DispatchStartImpl();
+  virtual nsresult DispatchStartImpl(const nsAString& aUri);
 
   virtual nsresult DispatchEndImpl(float aElapsedTime, uint32_t aCharIndex);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/ipc/test/file_ipc.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/ipc/test/file_ipc.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/ipc/test/file_ipc.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/ipc/test/file_ipc.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,196 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test for OOP TTS</title>
-  <script type="application/javascript" src="../../test/common.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-  <body>
-
-  <script type="application/javascript;version=1.7">
-    "use strict";
-
-    window.SimpleTest = parent.SimpleTest;
-    window.ok = parent.ok;
-    window.is = parent.is;
-    window.info = parent.info;
-
-    // The crash observer registration functions are stubbed out here to
-    // prevent the iframe test runner from breaking later crash-related tests.
-    function iframeScriptFirst() {
-      SpecialPowers.prototype.registerProcessCrashObservers = () => {};
-      SpecialPowers.prototype.unregisterProcessCrashObservers = () => {};
-
-      content.wrappedJSObject.RunSet.reloadAndRunAll({
-          preventDefault: function() { },
-          __exposedProps__: { preventDefault: 'r' }
-      });
-    }
-
-    function iframeScriptSecond() {
-      let TestRunner = content.wrappedJSObject.TestRunner;
-
-      let oldComplete = TestRunner.onComplete;
-
-      TestRunner.onComplete = function() {
-        TestRunner.onComplete = oldComplete;
-
-        sendAsyncMessage("test:SpeechSynthesis:ipcTestComplete", {
-          result: JSON.stringify(TestRunner._failedTests)
-        });
-
-        if (oldComplete) {
-          oldComplete();
-        }
-      };
-      TestRunner.structuredLogger._dumpMessage = function(msg) {
-        sendAsyncMessage("test:SpeechSynthesis:ipcTestMessage", { msg: msg });
-      }
-    }
-
-    let VALID_ACTIONS = ['suite_start', 'suite_end', 'test_start', 'test_end', 'test_status', 'process_output', 'log'];
-    function validStructuredMessage(message) {
-      return message.action !== undefined && VALID_ACTIONS.indexOf(message.action) >= 0;
-    }
-    function onTestMessage(data) {
-      let message = SpecialPowers.wrap(data).data.msg;
-
-      if (validStructuredMessage(message)) {
-        switch (message.action) {
-          case "test_status":
-          case "test_end":
-            let test_tokens = message.test.split("/");
-            let test_name = test_tokens[test_tokens.length - 1];
-            if (message.subtest) {
-                test_name += " | " + message.subtest;
-            }
-            ok(message.expected === undefined, test_name, message.message);
-            break;
-          case "log":
-            info(message.message);
-            break;
-          default:
-            // nothing
-        }
-      }
-    }
-
-    function onTestComplete() {
-      let comp = SpecialPowers.wrap(SpecialPowers.Components);
-      let mm = SpecialPowers.getBrowserFrameMessageManager(iframe);
-      let spObserver = comp.classes["@mozilla.org/special-powers-observer;1"]
-                            .getService(comp.interfaces.nsIMessageListener);
-
-      mm.removeMessageListener("SPPrefService", spObserver);
-      mm.removeMessageListener("SPProcessCrashService", spObserver);
-      mm.removeMessageListener("SPPingService", spObserver);
-      mm.removeMessageListener("SpecialPowers.Quit", spObserver);
-      mm.removeMessageListener("SPPermissionManager", spObserver);
-
-      mm.removeMessageListener("test:SpeechSynthesis:ipcTestMessage", onTestMessage);
-      mm.removeMessageListener("test:SpeechSynthesis:ipcTestComplete", onTestComplete);
-
-      let ppmm = SpecialPowers.Cc["@mozilla.org/parentprocessmessagemanager;1"]
-        .getService(SpecialPowers.Ci.nsIMessageBroadcaster);
-      ppmm.removeMessageListener("test:SpeechSynthesis:ipcSynthAddVoice", onSynthAddVoice);
-      ppmm.removeMessageListener("test:SpeechSynthesis:ipcSynthSetDefault", onSynthSetDefault);
-      ppmm.removeMessageListener("test:SpeechSynthesis:ipcSynthCleanup", onSynthCleanup);
-
-      SimpleTest.executeSoon(function () { SimpleTest.finish(); });
-    }
-
-    function onSynthAddVoice(data) {
-      let message = SpecialPowers.wrap(data).json;
-      return synthAddVoice.apply(synthAddVoice, message);
-    }
-
-    function onSynthSetDefault(data) {
-      let message = SpecialPowers.wrap(data).json;
-      synthSetDefault.apply(synthSetDefault, message);
-    }
-
-    function onSynthCleanup(data) {
-      synthCleanup();
-    }
-
-    function runTests() {
-      let iframe = document.createElement("iframe");
-      SpecialPowers.wrap(iframe).mozbrowser = true;
-      iframe.id = "iframe";
-      iframe.style.width = "100%";
-      iframe.style.height = "1000px";
-
-      function iframeLoadSecond() {
-        ok(true, "Got second iframe load event.");
-        iframe.removeEventListener("mozbrowserloadend", iframeLoadSecond);
-        let mm = SpecialPowers.getBrowserFrameMessageManager(iframe);
-        mm.loadFrameScript("data:,(" + iframeScriptSecond.toString() + ")();",
-                           false);
-      }
-
-      function iframeLoadFirst() {
-        ok(true, "Got first iframe load event.");
-        iframe.removeEventListener("mozbrowserloadend", iframeLoadFirst);
-        iframe.addEventListener("mozbrowserloadend", iframeLoadSecond);
-
-        let mm = SpecialPowers.getBrowserFrameMessageManager(iframe);
-
-        let comp = SpecialPowers.wrap(SpecialPowers.Components);
-
-        let spObserver =
-          comp.classes["@mozilla.org/special-powers-observer;1"]
-              .getService(comp.interfaces.nsIMessageListener);
-
-        mm.addMessageListener("SPPrefService", spObserver);
-        mm.addMessageListener("SPProcessCrashService", spObserver);
-        mm.addMessageListener("SPPingService", spObserver);
-        mm.addMessageListener("SpecialPowers.Quit", spObserver);
-        mm.addMessageListener("SPPermissionManager", spObserver);
-
-        mm.addMessageListener("test:SpeechSynthesis:ipcTestMessage", onTestMessage);
-        mm.addMessageListener("test:SpeechSynthesis:ipcTestComplete", onTestComplete);
-
-        let specialPowersBase = "chrome://specialpowers/content/";
-        mm.loadFrameScript(specialPowersBase + "MozillaLogger.js", false);
-        mm.loadFrameScript(specialPowersBase + "specialpowersAPI.js", false);
-        mm.loadFrameScript(specialPowersBase + "specialpowers.js", false);
-
-        mm.loadFrameScript("data:,(" + iframeScriptFirst.toString() + ")();", false);
-
-        let ppmm = SpecialPowers.Cc["@mozilla.org/parentprocessmessagemanager;1"]
-          .getService(SpecialPowers.Ci.nsIMessageBroadcaster);
-        ppmm.addMessageListener("test:SpeechSynthesis:ipcSynthAddVoice", onSynthAddVoice);
-        ppmm.addMessageListener("test:SpeechSynthesis:ipcSynthSetDefault", onSynthSetDefault);
-        ppmm.addMessageListener("test:SpeechSynthesis:ipcSynthCleanup", onSynthCleanup);
-      }
-
-      iframe.addEventListener("mozbrowserloadend", iframeLoadFirst);
-
-      // Strip this filename and one directory level and then add "/test".
-      let href =  window.location.href;
-      href = href.substring(0, href.lastIndexOf('/'));
-      href = href.substring(0, href.lastIndexOf('/'));
-      href = href.substring(0, href.lastIndexOf('/'));
-      iframe.src = href + "/test?consoleLevel=INFO";
-
-      document.body.appendChild(iframe);
-    }
-
-    addEventListener("load", function() {
-
-      SpecialPowers.addPermission("browser", true, document);
-      SpecialPowers.pushPrefEnv({
-        "set": [
-          // TODO: remove this as part of bug 820712
-          ["network.disable.ipc.security", true],
-
-          ["dom.ipc.browser_frames.oop_by_default", true],
-          ["dom.mozBrowserFramesEnabled", true],
-          ["browser.pagethumbnails.capturing_disabled", true]
-        ]
-      }, runTests);
-    });
-
-  </script>
-</body>
-</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/ipc/test/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/ipc/test/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/ipc/test/mochitest.ini	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/ipc/test/mochitest.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-[DEFAULT]
-skip-if = e10s
-support-files =
-  file_ipc.html
-
-[test_ipc.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 857673 # b2g(comp.classes['@mozilla.org/special-powers-observer;1'] is undefined) b2g-debug(comp.classes['@mozilla.org/special-powers-observer;1'] is undefined) b2g-desktop(comp.classes['@mozilla.org/special-powers-observer;1'] is undefined)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/ipc/test/test_ipc.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/ipc/test/test_ipc.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/ipc/test/test_ipc.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/ipc/test/test_ipc.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test for OOP TTS</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-  <body>
-  <iframe id="testFrame"></iframe>
-  <script type="application/javascript;version=1.7">
-    SimpleTest.waitForExplicitFinish();
-
-    SpecialPowers.pushPrefEnv({ set: [['media.webspeech.synth.enabled', true]] },
-                              function() { document.getElementById("testFrame").src = "file_ipc.html"; });
-  </script>
-</body>
-</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/moz.build	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/moz.build	2015-05-25 20:43:47.000000000 +0000
@@ -5,7 +5,6 @@
 
 if CONFIG['MOZ_WEBSPEECH']:
     MOCHITEST_MANIFESTS += [
-        'ipc/test/mochitest.ini',
         'test/mochitest.ini',
     ]
 
@@ -34,6 +33,8 @@
         'SpeechSynthesis.cpp',
         'SpeechSynthesisUtterance.cpp',
         'SpeechSynthesisVoice.cpp',
+        'test/FakeSynthModule.cpp',
+        'test/nsFakeSynthServices.cpp'
     ]
 
     if CONFIG['MOZ_SYNTH_PICO']:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/nsSpeechTask.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/nsSpeechTask.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/nsSpeechTask.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/nsSpeechTask.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -15,12 +15,8 @@
 #endif
 
 #undef LOG
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetSpeechSynthLog();
-#define LOG(type, msg) PR_LOG(GetSpeechSynthLog(), type, msg)
-#else
-#define LOG(type, msg)
-#endif
+#define LOG(type, msg) MOZ_LOG(GetSpeechSynthLog(), type, msg)
 
 namespace mozilla {
 namespace dom {
@@ -88,7 +84,7 @@
 
 // nsSpeechTask
 
-NS_IMPL_CYCLE_COLLECTION(nsSpeechTask, mSpeechSynthesis, mUtterance);
+NS_IMPL_CYCLE_COLLECTION(nsSpeechTask, mSpeechSynthesis, mUtterance, mCallback);
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSpeechTask)
   NS_INTERFACE_MAP_ENTRY(nsISpeechTask)
@@ -140,6 +136,12 @@
   mPort = aStream->AllocateInputPort(mStream, 0);
 }
 
+void
+nsSpeechTask::SetChosenVoiceURI(const nsAString& aUri)
+{
+  mChosenVoiceURI = aUri;
+}
+
 NS_IMETHODIMP
 nsSpeechTask::Setup(nsISpeechTaskCallback* aCallback,
                     uint32_t aChannels, uint32_t aRate, uint8_t argc)
@@ -282,6 +284,12 @@
 nsresult
 nsSpeechTask::DispatchStartImpl()
 {
+  return DispatchStartImpl(mChosenVoiceURI);
+}
+
+nsresult
+nsSpeechTask::DispatchStartImpl(const nsAString& aUri)
+{
   LOG(PR_LOG_DEBUG, ("nsSpeechTask::DispatchStart"));
 
   MOZ_ASSERT(mUtterance);
@@ -289,6 +297,7 @@
                  NS_ERROR_NOT_AVAILABLE);
 
   mUtterance->mState = SpeechSynthesisUtterance::STATE_SPEAKING;
+  mUtterance->mChosenVoiceURI = aUri;
   mUtterance->DispatchSpeechSynthesisEvent(NS_LITERAL_STRING("start"), 0, 0,
                                            NS_LITERAL_STRING(""));
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/nsSpeechTask.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/nsSpeechTask.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/nsSpeechTask.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/nsSpeechTask.h	2015-05-25 20:43:47.000000000 +0000
@@ -47,10 +47,14 @@
 
   void BindStream(ProcessedMediaStream* aStream);
 
+  void SetChosenVoiceURI(const nsAString& aUri);
+
 protected:
   virtual ~nsSpeechTask();
 
-  virtual nsresult DispatchStartImpl();
+  nsresult DispatchStartImpl();
+
+  virtual nsresult DispatchStartImpl(const nsAString& aUri);
 
   virtual nsresult DispatchEndImpl(float aElapsedTime, uint32_t aCharIndex);
 
@@ -89,6 +93,8 @@
   nsRefPtr<SpeechSynthesis> mSpeechSynthesis;
 
   bool mIndirectAudio;
+
+  nsString mChosenVoiceURI;
 };
 
 } // namespace dom
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -23,12 +23,8 @@
 #include "SpeechSynthesisParent.h"
 
 #undef LOG
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* GetSpeechSynthLog();
-#define LOG(type, msg) PR_LOG(GetSpeechSynthLog(), type, msg)
-#else
-#define LOG(type, msg)
-#endif
+#define LOG(type, msg) MOZ_LOG(GetSpeechSynthLog(), type, msg)
 
 namespace {
 
@@ -567,6 +563,8 @@
     return;
   }
 
+  aTask->SetChosenVoiceURI(voice->mUri);
+
   LOG(PR_LOG_DEBUG, ("nsSynthVoiceRegistry::Speak - Using voice URI: %s",
                      NS_ConvertUTF16toUTF8(voice->mUri).get()));
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/pico/nsPicoService.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/pico/nsPicoService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/pico/nsPicoService.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/pico/nsPicoService.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -17,7 +17,7 @@
 #include "nsIFile.h"
 #include "nsThreadUtils.h"
 #include "prenv.h"
-
+#include "mozilla/Preferences.h"
 #include "mozilla/DebugOnly.h"
 #include <dlfcn.h>
 
@@ -453,6 +453,11 @@
   MOZ_ASSERT(NS_IsMainThread());
   NS_ENSURE_TRUE(!strcmp(aTopic, "profile-after-change"), NS_ERROR_UNEXPECTED);
 
+  if (!Preferences::GetBool("media.webspeech.synth.enabled") ||
+      Preferences::GetBool("media.webspeech.synth.test")) {
+    return NS_OK;
+  }
+
   DebugOnly<nsresult> rv = NS_NewNamedThread("Pico Worker", getter_AddRefs(mThread));
   MOZ_ASSERT(NS_SUCCEEDED(rv));
   return mThread->Dispatch(
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/SpeechSynthesis.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/SpeechSynthesis.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/SpeechSynthesis.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/SpeechSynthesis.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsSpeechTask.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/Element.h"
@@ -16,7 +16,6 @@
 #include "nsIDocument.h"
 
 #undef LOG
-#ifdef PR_LOGGING
 PRLogModuleInfo*
 GetSpeechSynthLog()
 {
@@ -28,10 +27,7 @@
 
   return sLog;
 }
-#define LOG(type, msg) PR_LOG(GetSpeechSynthLog(), type, msg)
-#else
-#define LOG(type, msg)
-#endif
+#define LOG(type, msg) MOZ_LOG(GetSpeechSynthLog(), type, msg)
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/SpeechSynthesisUtterance.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/SpeechSynthesisUtterance.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/SpeechSynthesisUtterance.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/SpeechSynthesisUtterance.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -148,6 +148,12 @@
 }
 
 void
+SpeechSynthesisUtterance::GetChosenVoiceURI(nsString& aResult) const
+{
+  aResult = mChosenVoiceURI;
+}
+
+void
 SpeechSynthesisUtterance::DispatchSpeechSynthesisEvent(const nsAString& aEventType,
                                                        uint32_t aCharIndex,
                                                        float aElapsedTime,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/SpeechSynthesisUtterance.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/SpeechSynthesisUtterance.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/SpeechSynthesisUtterance.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/SpeechSynthesisUtterance.h	2015-05-25 20:43:47.000000000 +0000
@@ -71,6 +71,8 @@
 
   void SetPitch(float aPitch);
 
+  void GetChosenVoiceURI(nsString& aResult) const;
+
   enum {
     STATE_NONE,
     STATE_PENDING,
@@ -107,6 +109,8 @@
 
   float mPitch;
 
+  nsString mChosenVoiceURI;
+
   uint32_t mState;
 
   bool mPaused;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/test/common.js firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/test/common.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/test/common.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/test/common.js	2015-05-25 20:43:47.000000000 +0000
@@ -1,199 +1,3 @@
-var gSpeechRegistry = SpecialPowers.Cc["@mozilla.org/synth-voice-registry;1"]
-  .getService(SpecialPowers.Ci.nsISynthVoiceRegistry);
-
-var gAddedVoices = [];
-
-function SpeechTaskCallback(onpause, onresume, oncancel) {
-  this.onpause = onpause;
-  this.onresume = onresume;
-  this.oncancel = oncancel;
-}
-
-SpeechTaskCallback.prototype = {
-  QueryInterface: function(iid) {
-    return this;
-  },
-
-  getInterfaces: function(c) {},
-
-  getScriptableHelper: function() {},
-
-  onPause: function onPause() {
-    if (this.onpause)
-      this.onpause();
-  },
-
-  onResume: function onResume() {
-    if (this.onresume)
-      this.onresume();
-  },
-
-  onCancel: function onCancel() {
-    if (this.oncancel)
-      this.oncancel();
-  }
-};
-
-var TestSpeechServiceWithAudio = SpecialPowers.wrapCallbackObject({
-  CHANNELS: 1,
-  SAMPLE_RATE: 16000,
-
-  serviceType: SpecialPowers.Ci.nsISpeechService.SERVICETYPE_DIRECT_AUDIO,
-
-  speak: function speak(aText, aUri, aVolume, aRate, aPitch, aTask) {
-    var task = SpecialPowers.wrap(aTask);
-
-    window.setTimeout(
-      function () {
-        task.setup(SpecialPowers.wrapCallbackObject(new SpeechTaskCallback()), this.CHANNELS, this.SAMPLE_RATE);
-        // 0.025 seconds per character.
-        task.sendAudio(new Int16Array((this.SAMPLE_RATE/40)*aText.length), []);
-        task.sendAudio(new Int16Array(0), []);
-      }.bind(this), 0);
-  },
-
-  QueryInterface: function(iid) {
-    return this;
-  },
-
-  getInterfaces: function(c) {},
-
-  getScriptableHelper: function() {}
-});
-
-var TestSpeechServiceNoAudio = SpecialPowers.wrapCallbackObject({
-  serviceType: SpecialPowers.Ci.nsISpeechService.SERVICETYPE_INDIRECT_AUDIO,
-
-  speak: function speak(aText, aUri, aVolume, aRate, aPitch, aTask) {
-    var pair = this.expectedSpeaks.shift();
-    if (pair) {
-      // XXX: These tests do not happen in OOP
-      var utterance = pair[0];
-      var expected = pair[1];
-
-      is(aText, utterance.text, "Speak text matches utterance text");
-
-      var args = {uri: aUri, rate: aRate, pitch: aPitch};
-
-      for (var attr in args) {
-        if (expected[attr] != undefined)
-          is(args[attr], expected[attr], "expected service arg " + attr);
-      }
-    }
-
-    // If the utterance contains the phrase 'callback events', we will dispatch
-    // an appropriate event for each callback method.
-    var no_events = (aText.indexOf('callback events') < 0);
-    // If the utterance contains the phrase 'never end', we don't immediately
-    // end the 'synthesis' of the utterance.
-    var end_utterance = (aText.indexOf('never end') < 0);
-
-    var task = SpecialPowers.wrap(aTask);
-    task.setup(SpecialPowers.wrapCallbackObject(new SpeechTaskCallback(
-      function() {
-        if (!no_events) {
-          task.dispatchPause(1, 1.23);
-        }
-      },
-      function() {
-        if (!no_events) {
-          task.dispatchResume(1, 1.23);
-        }
-      },
-      function() {
-        if (!no_events) {
-          task.dispatchEnd(1, 1.23);
-        }
-      })));
-    setTimeout(function () {
-                 task.dispatchStart();
-                 if (end_utterance) {
-                   setTimeout(function () {
-                                task.dispatchEnd(
-                                  aText.length / 2.0, aText.length);
-                              }, 0);
-                 }
-               }, 0);
-  },
-
-  QueryInterface: function(iid) {
-    return this;
-  },
-
-  getInterfaces: function(c) {},
-
-  getScriptableHelper: function() {},
-
-  expectedSpeaks: []
-});
-
-function synthAddVoice(aServiceName, aName, aLang, aIsLocal) {
-  if (SpecialPowers.isMainProcess()) {
-    var voicesBefore = speechSynthesis.getVoices().length;
-    var uri = "urn:moz-tts:mylittleservice:" + encodeURI(aName + '?' + aLang);
-    gSpeechRegistry.addVoice(window[aServiceName], uri, aName, aLang, aIsLocal);
-
-    gAddedVoices.push([window[aServiceName], uri]);
-    var voicesAfter = speechSynthesis.getVoices().length;
-
-    is(voicesBefore + 1, voicesAfter, "Voice added");
-    var voice = speechSynthesis.getVoices()[voicesAfter - 1];
-    is(voice.voiceURI, uri, "voice URI matches");
-    is(voice.name, aName, "voice name matches");
-    is(voice.lang, aLang, "voice lang matches");
-    is(voice.localService, aIsLocal, "voice localService matches");
-
-    return uri;
-  } else {
-    // XXX: It would be nice to check here that the child gets the voice
-    // added update, but alas, it is aynchronous.
-    var mm = SpecialPowers.Cc["@mozilla.org/childprocessmessagemanager;1"]
-      .getService(SpecialPowers.Ci.nsISyncMessageSender);
-
-    return mm.sendSyncMessage(
-      'test:SpeechSynthesis:ipcSynthAddVoice',
-      [aServiceName, aName, aLang, aIsLocal])[0];
-  }
-}
-
-function synthSetDefault(aUri, aIsDefault) {
-  if (SpecialPowers.isMainProcess()) {
-    gSpeechRegistry.setDefaultVoice(aUri, aIsDefault);
-    var voices = speechSynthesis.getVoices();
-    for (var i in voices) {
-      if (voices[i].voiceURI == aUri)
-        ok(voices[i]['default'], "Voice set to default");
-    }
-  } else {
-    // XXX: It would be nice to check here that the child gets the voice
-    // added update, but alas, it is aynchronous.
-    var mm = SpecialPowers.Cc["@mozilla.org/childprocessmessagemanager;1"]
-      .getService(SpecialPowers.Ci.nsISyncMessageSender);
-
-    return mm.sendSyncMessage(
-      'test:SpeechSynthesis:ipcSynthSetDefault', [aUri, aIsDefault])[0];
-  }
-}
-
-function synthCleanup() {
-  if (SpecialPowers.isMainProcess()) {
-    var voicesBefore = speechSynthesis.getVoices().length;
-    var toRemove = gAddedVoices.length;
-    var removeArgs;
-    while ((removeArgs = gAddedVoices.shift()))
-      gSpeechRegistry.removeVoice.apply(gSpeechRegistry.removeVoice, removeArgs);
-
-    var voicesAfter = speechSynthesis.getVoices().length;
-    is(voicesAfter, voicesBefore - toRemove, "Successfully removed test voices");
-  } else {
-    // XXX: It would be nice to check here that the child gets the voice
-    // removed update, but alas, it is aynchronous.
-    var mm = SpecialPowers.Cc["@mozilla.org/childprocessmessagemanager;1"]
-      .getService(SpecialPowers.Ci.nsISyncMessageSender);
-    mm.sendSyncMessage('test:SpeechSynthesis:ipcSynthCleanup');
-  }
-}
-
 function synthTestQueue(aTestArgs, aEndFunc) {
   var utterances = [];
   for (var i in aTestArgs) {
@@ -220,6 +24,16 @@
       }
     }
 
+    u.addEventListener('start',
+      (function (expectedUri) {
+        return function (e) {
+          if (expectedUri) {
+            var chosenVoice = SpecialPowers.wrap(e).target.chosenVoiceURI;
+            is(chosenVoice, expectedUri, "Incorrect URI is used");
+          }
+        };
+      })(aTestArgs[i][1] ? aTestArgs[i][1].uri : null));
+
     u.addEventListener('end', onend_handler);
     u.addEventListener('error', onend_handler);
 
@@ -229,7 +43,6 @@
       });
 
     utterances.push(u);
-    TestSpeechServiceNoAudio.expectedSpeaks.push([u, aTestArgs[i][1]]);
     speechSynthesis.speak(u);
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/test/FakeSynthModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/test/FakeSynthModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/test/FakeSynthModule.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/test/FakeSynthModule.cpp	2015-05-25 20:43:47.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 "mozilla/ModuleUtils.h"
+#include "nsIClassInfoImpl.h"
+
+#include "nsFakeSynthServices.h"
+
+using namespace mozilla::dom;
+
+#define FAKESYNTHSERVICE_CID \
+  {0xe7d52d9e, 0xc148, 0x47d8, {0xab, 0x2a, 0x95, 0xd7, 0xf4, 0x0e, 0xa5, 0x3d}}
+
+#define FAKESYNTHSERVICE_CONTRACTID "@mozilla.org/fakesynth;1"
+
+// Defines nsFakeSynthServicesConstructor
+NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsFakeSynthServices,
+                                         nsFakeSynthServices::GetInstanceForService)
+
+// Defines kFAKESYNTHSERVICE_CID
+NS_DEFINE_NAMED_CID(FAKESYNTHSERVICE_CID);
+
+static const mozilla::Module::CIDEntry kCIDs[] = {
+  { &kFAKESYNTHSERVICE_CID, true, nullptr, nsFakeSynthServicesConstructor },
+  { nullptr }
+};
+
+static const mozilla::Module::ContractIDEntry kContracts[] = {
+  { FAKESYNTHSERVICE_CONTRACTID, &kFAKESYNTHSERVICE_CID },
+  { nullptr }
+};
+
+static const mozilla::Module::CategoryEntry kCategories[] = {
+  { "profile-after-change", "Fake Speech Synth", FAKESYNTHSERVICE_CONTRACTID },
+  { nullptr }
+};
+
+static void
+UnloadFakeSynthmodule()
+{
+  nsFakeSynthServices::Shutdown();
+}
+
+static const mozilla::Module kModule = {
+  mozilla::Module::kVersion,
+  kCIDs,
+  kContracts,
+  kCategories,
+  nullptr,
+  nullptr,
+  UnloadFakeSynthmodule
+};
+
+NSMODULE_DEFN(fakesynth) = &kModule;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/test/file_indirect_service_events.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/test/file_indirect_service_events.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/test/file_indirect_service_events.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/test/file_indirect_service_events.html	2015-05-25 20:43:47.000000000 +0000
@@ -26,11 +26,10 @@
 
 /** Test for Bug 1155034 **/
 
-synthAddVoice('TestSpeechServiceNoAudio', 'Female 1', 'en-GB', true);
-
 function test_with_events() {
   info('test_with_events');
   var utterance = new SpeechSynthesisUtterance("never end, callback events");
+  utterance.lang = 'it-IT-noend';
 
   utterance.addEventListener('start', function(e) {
     speechSynthesis.pause();
@@ -38,20 +37,20 @@
   });
 
   utterance.addEventListener('pause', function(e) {
-    ok(e.charIndex, 1, 'pause event charIndex matches service arguments');
-    ok(e.elapsedTime, 1.23, 'pause event elapsedTime matches service arguments');
+    is(e.charIndex, 1, 'pause event charIndex matches service arguments');
+    is(e.elapsedTime, 1.5, 'pause event elapsedTime matches service arguments');
     speechSynthesis.resume();
   });
 
   utterance.addEventListener('resume', function(e) {
-    ok(e.charIndex, 1, 'resume event charIndex matches service arguments');
-    ok(e.elapsedTime, 1.23, 'resume event elapsedTime matches service arguments');
+    is(e.charIndex, 1, 'resume event charIndex matches service arguments');
+    is(e.elapsedTime, 1.5, 'resume event elapsedTime matches service arguments');
     speechSynthesis.cancel();
   });
 
   utterance.addEventListener('end', function(e) {
     ok(e.charIndex, 1, 'resume event charIndex matches service arguments');
-    ok(e.elapsedTime, 1.23, 'end event elapsedTime matches service arguments');
+    ok(e.elapsedTime, 1.5, 'end event elapsedTime matches service arguments');
     test_no_events();
   });
 
@@ -60,12 +59,11 @@
 
 function test_no_events() {
   var utterance = new SpeechSynthesisUtterance("never end");
-
+  utterance.lang = "it-IT-noevents-noend";
   utterance.addEventListener('start', function(e) {
     speechSynthesis.pause();
     // Wait to see if we get some bad events we didn't expect.
     setTimeout(function() {
-      synthCleanup();
       SimpleTest.finish();
     }, 1000);
   });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/test/file_setup.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/test/file_setup.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/test/file_setup.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/test/file_setup.html	2015-05-25 20:43:47.000000000 +0000
@@ -25,12 +25,6 @@
 
 /** Test for Bug 525444 **/
 
-synthAddVoice('TestSpeechServiceNoAudio', 'Bob Marley', 'en-JM', true);
-synthAddVoice('TestSpeechServiceNoAudio', 'Amy Winehouse', 'en-GB', true);
-synthAddVoice('TestSpeechServiceNoAudio', 'Leonard Cohen', 'en-CA', true);
-synthAddVoice('TestSpeechServiceNoAudio', 'Celine Dion', 'fr-CA', true);
-synthAddVoice('TestSpeechServiceNoAudio', 'Julieta Venegas', 'es-MX', true);
-
 ok(SpeechSynthesis, "SpeechSynthesis exists in global scope");
 ok(SpeechSynthesisVoice, "SpeechSynthesisVoice exists in global scope");
 ok(SpeechSynthesisEvent, "SpeechSynthesisEvent exists in global scope");
@@ -75,8 +69,6 @@
   ok(voices1[i] == voices2[i], "Voice instance matches");
 }
 
-synthCleanup();
-
 SimpleTest.finish();
 </script>
 </pre>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/test/file_speech_cancel.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/test/file_speech_cancel.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/test/file_speech_cancel.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/test/file_speech_cancel.html	2015-05-25 20:43:47.000000000 +0000
@@ -26,16 +26,35 @@
 
 /** Test for Bug 1150315 **/
 
-synthAddVoice('TestSpeechServiceWithAudio', 'Male 1', 'en-GB', true);
-
 var gotEndEvent = false;
-var utterance = new SpeechSynthesisUtterance("Hello, world!");
+// A long utterance that we will interrupt.
+var utterance = new SpeechSynthesisUtterance("Donec ac nunc feugiat, posuere " +
+  "mauris id, pharetra velit. Donec fermentum orci nunc, sit amet maximus" +
+  "dui tincidunt ut. Sed ultricies ac nisi a laoreet. Proin interdum," +
+  "libero maximus hendrerit posuere, lorem risus egestas nisl, a" +
+  "ultricies massa justo eu nisi. Duis mattis nibh a ligula tincidunt" +
+  "tincidunt non eu erat. Sed bibendum varius vulputate. Cras leo magna," +
+  "ornare ac posuere vel, luctus id metus. Mauris nec quam ac augue" +
+  "consectetur bibendum. Integer a commodo tortor. Duis semper dolor eu" +
+  "facilisis facilisis. Etiam venenatis turpis est, quis tincidunt velit" +
+  "suscipit a. Cras semper orci in sapien rhoncus bibendum. Suspendisse" +
+  "eu ex lobortis, finibus enim in, condimentum quam. Maecenas eget dui" +
+  "ipsum. Aliquam tortor leo, interdum eget congue ut, tempor id elit.");
 utterance.addEventListener('start', function(e) {
+  ok(true, 'start utterance 1');
   speechSynthesis.cancel();
   speechSynthesis.speak(utterance2);
 });
 
-var utterance2 = new SpeechSynthesisUtterance("Hello, world 2!");
+var utterance2 = new SpeechSynthesisUtterance("Proin ornare neque vitae " +
+  "risus mattis rutrum. Suspendisse a velit ut est convallis aliquet." +
+  "Nullam ante elit, malesuada vel luctus rutrum, ultricies nec libero." +
+  "Praesent eu iaculis orci. Sed nisl diam, sodales ac purus et," +
+  "volutpat interdum tortor. Nullam aliquam porta elit et maximus. Cras" +
+  "risus lectus, elementum vel sodales vel, ultricies eget lectus." +
+  "Curabitur velit lacus, mollis vel finibus et, molestie sit amet" +
+  "sapien. Proin vitae dolor ac augue posuere efficitur ac scelerisque" +
+  "diam. Nulla sed odio elit.");
 utterance2.addEventListener('start', function() {
   speechSynthesis.cancel();
   speechSynthesis.speak(utterance3);
@@ -46,10 +65,9 @@
 
 var utterance3 = new SpeechSynthesisUtterance("Hello, world 3!");
 utterance3.addEventListener('start', function() {
-  ok(gotEndEvent, "didn't get start event for this utterance")
+  ok(gotEndEvent, "didn't get start event for this utterance");
 });
 utterance3.addEventListener('end', function(e) {
-  synthCleanup();
   SimpleTest.finish();
 });
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/test/file_speech_queue.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/test/file_speech_queue.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/test/file_speech_queue.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/test/file_speech_queue.html	2015-05-25 20:43:47.000000000 +0000
@@ -18,48 +18,54 @@
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=525444">Mozilla Bug 525444</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-  
+
 </div>
 <pre id="test">
 <script type="application/javascript">
 
 /** Test for Bug 525444 **/
 
-var englishJamaican = synthAddVoice('TestSpeechServiceNoAudio',
-                                    'Bob Marley', 'en-JM', true);
-var englishBritish = synthAddVoice('TestSpeechServiceNoAudio',
-                                   'Amy Winehouse', 'en-GB', true);
-var englishCanadian = synthAddVoice('TestSpeechServiceNoAudio',
-                                    'Leonard Cohen', 'en-CA', true);
-var frenchCanadian = synthAddVoice('TestSpeechServiceNoAudio',
-                                   'Celine Dion', 'fr-CA', true);
-var spanishMexican = synthAddVoice('TestSpeechServiceNoAudio',
-                                   'Julieta Venegas', 'es-MX', true);
+// XXX: Rate and pitch are not tested.
+
+var langUriMap = {};
+
+for (var voice of speechSynthesis.getVoices()) {
+  if (voice.voiceURI.indexOf('urn:moz-tts:fake-direct') < 0) {
+    continue;
+  }
+  langUriMap[voice.lang] = voice.voiceURI;
+  ok(true, voice.lang + ' ' + voice.voiceURI + ' ' + voice.default);
+  is(voice.default, voice.lang == 'en-JM', 'Only Jamaican voice should be default');
+}
 
-synthSetDefault(englishBritish, true);
+ok(langUriMap['en-JM'], 'No English-Jamaican voice');
+ok(langUriMap['en-GB'], 'No English-British voice');
+ok(langUriMap['en-CA'], 'No English-Canadian voice');
+ok(langUriMap['fr-CA'], 'No French-Canadian voice');
+ok(langUriMap['es-MX'], 'No Spanish-Mexican voice');
 
 synthTestQueue(
   [[{text: "Hello, world."},
-    { uri: englishBritish }],
+    { uri: langUriMap['en-JM'] }],
    [{text: "Bonjour tout le monde .", lang: "fr", rate: 0.5, pitch: 0.75},
-    { uri: frenchCanadian, rate: 0.5, pitch: 0.75}],
+    { uri: langUriMap['fr-CA'], rate: 0.5, pitch: 0.75}],
    [{text: "How are you doing?", lang: "en-GB"},
-    { rate: 1, pitch: 1, uri: englishBritish}],
-   [{text: "¡hasta mañana", lang: "es-ES"},
-    { uri: spanishMexican }]],
+    { rate: 1, pitch: 1, uri: langUriMap['en-GB']}],
+   [{text: "¡hasta mañana!", lang: "es-MX"},
+    { uri: langUriMap['es-MX'] }]],
   function () {
-    synthSetDefault(englishJamaican, true);
-    var test_data = [[{text: "I shot the  sheriff."},
-                      { uri: englishJamaican }]];
+    var test_data = [];
     var voices = speechSynthesis.getVoices();
-    for (var i in voices) {
-      test_data.push([{text: "Hello world", voice: voices[i]},
-                      {uri: voices[i].voiceURI}]);
+    for (var voice of voices) {
+      if (voice.voiceURI.indexOf('urn:moz-tts:fake-direct') < 0) {
+        continue;
+      }
+      test_data.push([{text: "Hello world", voice: voice},
+                      {uri: voice.voiceURI}]);
     }
 
     synthTestQueue(test_data,
                    function () {
-                     synthCleanup();
                      SimpleTest.finish();
                    });
   });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/test/file_speech_simple.html firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/test/file_speech_simple.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/test/file_speech_simple.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/test/file_speech_simple.html	2015-05-25 20:43:47.000000000 +0000
@@ -26,8 +26,6 @@
 
 /** Test for Bug 525444 **/
 
-synthAddVoice('TestSpeechServiceWithAudio', 'Male 1', 'en-GB', true);
-
 var gotStartEvent = false;
 var gotBoundaryEvent = false;
 var utterance = new SpeechSynthesisUtterance("Hello, world!");
@@ -42,7 +40,6 @@
   ok(!speechSynthesis.pending, "speechSynthesis has no other utterances queued.");
   ok(gotStartEvent, "Got 'start' event.");
   info('end ' + e.elapsedTime);
-  synthCleanup();
   SimpleTest.finish();
 });
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/test/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/test/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/test/mochitest.ini	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/test/mochitest.ini	2015-05-25 20:43:47.000000000 +0000
@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = e10s
+tags=msg
 support-files =
   common.js
   file_setup.html
@@ -10,10 +10,6 @@
 
 [test_setup.html]
 [test_speech_queue.html]
-skip-if = buildapp == 'b2g' # b2g(Test timed out)
 [test_speech_simple.html]
-skip-if = buildapp == 'b2g' # b2g(Test timed out)
 [test_speech_cancel.html]
-skip-if = toolkit == 'gonk' # b2g(Test timed out)
 [test_indirect_service_events.html]
-skip-if = toolkit == 'gonk' # b2g(Test timed out)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/test/nsFakeSynthServices.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/test/nsFakeSynthServices.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/test/nsFakeSynthServices.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/test/nsFakeSynthServices.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -0,0 +1,359 @@
+/* -*- 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 "nsISupports.h"
+#include "nsFakeSynthServices.h"
+#include "nsPrintfCString.h"
+#include "nsIWeakReferenceUtils.h"
+#include "SharedBuffer.h"
+#include "nsISimpleEnumerator.h"
+
+#include "mozilla/dom/nsSynthVoiceRegistry.h"
+#include "mozilla/dom/nsSpeechTask.h"
+
+#include "nsThreadUtils.h"
+#include "prenv.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/DebugOnly.h"
+
+#define CHANNELS 1
+#define SAMPLERATE 1600
+
+namespace mozilla {
+namespace dom {
+
+StaticRefPtr<nsFakeSynthServices> nsFakeSynthServices::sSingleton;
+
+enum VoiceFlags
+{
+  eSuppressEvents = 1,
+  eSuppressEnd = 2
+};
+
+struct VoiceDetails
+{
+  const char* uri;
+  const char* name;
+  const char* lang;
+  bool defaultVoice;
+  uint32_t flags;
+};
+
+static const VoiceDetails sDirectVoices[] = {
+  {"urn:moz-tts:fake-direct:bob", "Bob Marley", "en-JM", true, 0},
+  {"urn:moz-tts:fake-direct:amy", "Amy Winehouse", "en-GB", false, 0},
+  {"urn:moz-tts:fake-direct:lenny", "Leonard Cohen", "en-CA", false, 0},
+  {"urn:moz-tts:fake-direct:celine", "Celine Dion", "fr-CA", false, 0},
+  {"urn:moz-tts:fake-direct:julie", "Julieta Venegas", "es-MX", false, },
+};
+
+static const VoiceDetails sIndirectVoices[] = {
+  {"urn:moz-tts:fake-indirect:zanetta", "Zanetta Farussi", "it-IT", false, 0},
+  {"urn:moz-tts:fake-indirect:margherita", "Margherita Durastanti", "it-IT-noevents-noend", false, eSuppressEvents | eSuppressEnd},
+  {"urn:moz-tts:fake-indirect:teresa", "Teresa Cornelys", "it-IT-noend", false, eSuppressEnd},
+};
+
+// FakeSynthCallback
+class FakeSynthCallback : public nsISpeechTaskCallback
+{
+public:
+  explicit FakeSynthCallback(nsISpeechTask* aTask) : mTask(aTask) { }
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(FakeSynthCallback, nsISpeechTaskCallback)
+
+  NS_IMETHOD OnPause() override
+  {
+    if (mTask) {
+      mTask->DispatchPause(1.5, 1);
+    }
+
+    return NS_OK;
+  }
+
+  NS_IMETHOD OnResume() override
+  {
+    if (mTask) {
+      mTask->DispatchResume(1.5, 1);
+    }
+
+    return NS_OK;
+  }
+
+  NS_IMETHOD OnCancel() override
+  {
+    if (mTask) {
+      mTask->DispatchEnd(1.5, 1);
+    }
+
+    return NS_OK;
+  }
+
+private:
+  virtual ~FakeSynthCallback() { }
+
+  nsCOMPtr<nsISpeechTask> mTask;
+};
+
+NS_IMPL_CYCLE_COLLECTION(FakeSynthCallback, mTask);
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(FakeSynthCallback)
+  NS_INTERFACE_MAP_ENTRY(nsISpeechTaskCallback)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISpeechTaskCallback)
+NS_INTERFACE_MAP_END
+
+NS_IMPL_CYCLE_COLLECTING_ADDREF(FakeSynthCallback)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(FakeSynthCallback)
+
+// FakeDirectAudioSynth
+
+class FakeDirectAudioSynth : public nsISpeechService
+{
+
+public:
+  FakeDirectAudioSynth() { }
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSISPEECHSERVICE
+
+private:
+  virtual ~FakeDirectAudioSynth() { }
+};
+
+NS_IMPL_ISUPPORTS(FakeDirectAudioSynth, nsISpeechService)
+
+NS_IMETHODIMP
+FakeDirectAudioSynth::Speak(const nsAString& aText, const nsAString& aUri,
+                            float aVolume, float aRate, float aPitch,
+                            nsISpeechTask* aTask)
+{
+  class Runnable final : public nsRunnable
+  {
+  public:
+    Runnable(nsISpeechTask* aTask, const nsAString& aText) :
+      mTask(aTask), mText(aText)
+    {
+    }
+
+    NS_IMETHOD Run() override
+    {
+      nsRefPtr<FakeSynthCallback> cb = new FakeSynthCallback(nullptr);
+      mTask->Setup(cb, CHANNELS, SAMPLERATE, 2);
+
+      // Just an arbitrary multiplier. Pretend that each character is
+      // synthesized to 40 frames.
+      uint32_t frames_length = 40 * mText.Length();
+      nsAutoArrayPtr<int16_t> frames(new int16_t[frames_length]());
+      mTask->SendAudioNative(frames, frames_length);
+
+      mTask->SendAudioNative(nullptr, 0);
+
+      return NS_OK;
+    }
+
+  private:
+    nsCOMPtr<nsISpeechTask> mTask;
+    nsString mText;
+  };
+
+  nsCOMPtr<nsIRunnable> runnable = new Runnable(aTask, aText);
+  NS_DispatchToMainThread(runnable);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+FakeDirectAudioSynth::GetServiceType(SpeechServiceType* aServiceType)
+{
+  *aServiceType = nsISpeechService::SERVICETYPE_DIRECT_AUDIO;
+  return NS_OK;
+}
+
+// FakeDirectAudioSynth
+
+class FakeIndirectAudioSynth : public nsISpeechService
+{
+
+public:
+  FakeIndirectAudioSynth() {}
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSISPEECHSERVICE
+
+private:
+  virtual ~FakeIndirectAudioSynth() { }
+};
+
+NS_IMPL_ISUPPORTS(FakeIndirectAudioSynth, nsISpeechService)
+
+NS_IMETHODIMP
+FakeIndirectAudioSynth::Speak(const nsAString& aText, const nsAString& aUri,
+                              float aVolume, float aRate, float aPitch,
+                              nsISpeechTask* aTask)
+{
+  class DispatchStart final : public nsRunnable
+  {
+  public:
+    explicit DispatchStart(nsISpeechTask* aTask) :
+      mTask(aTask)
+    {
+    }
+
+    NS_IMETHOD Run() override
+    {
+      mTask->DispatchStart();
+
+      return NS_OK;
+    }
+
+  private:
+    nsCOMPtr<nsISpeechTask> mTask;
+  };
+
+  class DispatchEnd final : public nsRunnable
+  {
+  public:
+    DispatchEnd(nsISpeechTask* aTask, const nsAString& aText) :
+      mTask(aTask), mText(aText)
+    {
+    }
+
+    NS_IMETHOD Run() override
+    {
+      mTask->DispatchEnd(mText.Length()/2, mText.Length());
+
+      return NS_OK;
+    }
+
+  private:
+    nsCOMPtr<nsISpeechTask> mTask;
+    nsString mText;
+  };
+
+  uint32_t flags = 0;
+  for (uint32_t i = 0; i < ArrayLength(sIndirectVoices); i++) {
+    if (aUri.EqualsASCII(sIndirectVoices[i].uri)) {
+      flags = sIndirectVoices[i].flags;
+    }
+  }
+
+  nsRefPtr<FakeSynthCallback> cb = new FakeSynthCallback(
+    (flags & eSuppressEvents) ? nullptr : aTask);
+
+  aTask->Setup(cb, 0, 0, 0);
+
+  nsCOMPtr<nsIRunnable> runnable = new DispatchStart(aTask);
+  NS_DispatchToMainThread(runnable);
+
+  if ((flags & eSuppressEnd) == 0) {
+    runnable = new DispatchEnd(aTask, aText);
+    NS_DispatchToMainThread(runnable);
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+FakeIndirectAudioSynth::GetServiceType(SpeechServiceType* aServiceType)
+{
+  *aServiceType = nsISpeechService::SERVICETYPE_INDIRECT_AUDIO;
+  return NS_OK;
+}
+
+// nsFakeSynthService
+
+NS_INTERFACE_MAP_BEGIN(nsFakeSynthServices)
+  NS_INTERFACE_MAP_ENTRY(nsIObserver)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIObserver)
+NS_INTERFACE_MAP_END
+
+NS_IMPL_ADDREF(nsFakeSynthServices)
+NS_IMPL_RELEASE(nsFakeSynthServices)
+
+nsFakeSynthServices::nsFakeSynthServices()
+{
+}
+
+nsFakeSynthServices::~nsFakeSynthServices()
+{
+}
+
+static void
+AddVoices(nsISpeechService* aService, const VoiceDetails* aVoices, uint32_t aLength)
+{
+  nsSynthVoiceRegistry* registry = nsSynthVoiceRegistry::GetInstance();
+  for (uint32_t i = 0; i < aLength; i++) {
+    NS_ConvertUTF8toUTF16 name(aVoices[i].name);
+    NS_ConvertUTF8toUTF16 uri(aVoices[i].uri);
+    NS_ConvertUTF8toUTF16 lang(aVoices[i].lang);
+    registry->AddVoice(aService, uri, name, lang, true);
+    if (aVoices[i].defaultVoice) {
+      registry->SetDefaultVoice(uri, true);
+    }
+  }
+}
+
+void
+nsFakeSynthServices::Init()
+{
+  mDirectService = new FakeDirectAudioSynth();
+  AddVoices(mDirectService, sDirectVoices, ArrayLength(sDirectVoices));
+
+  mIndirectService = new FakeIndirectAudioSynth();
+  AddVoices(mIndirectService, sIndirectVoices, ArrayLength(sIndirectVoices));
+}
+
+// nsIObserver
+
+NS_IMETHODIMP
+nsFakeSynthServices::Observe(nsISupports* aSubject, const char* aTopic,
+                             const char16_t* aData)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  NS_ENSURE_TRUE(!strcmp(aTopic, "profile-after-change"), NS_ERROR_UNEXPECTED);
+
+  if (Preferences::GetBool("media.webspeech.synth.test")) {
+    Init();
+  }
+
+  return NS_OK;
+}
+
+// static methods
+
+nsFakeSynthServices*
+nsFakeSynthServices::GetInstance()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  if (XRE_GetProcessType() != GeckoProcessType_Default) {
+    MOZ_ASSERT(false, "nsFakeSynthServices can only be started on main gecko process");
+    return nullptr;
+  }
+
+  if (!sSingleton) {
+    sSingleton = new nsFakeSynthServices();
+  }
+
+  return sSingleton;
+}
+
+already_AddRefed<nsFakeSynthServices>
+nsFakeSynthServices::GetInstanceForService()
+{
+  nsRefPtr<nsFakeSynthServices> picoService = GetInstance();
+  return picoService.forget();
+}
+
+void
+nsFakeSynthServices::Shutdown()
+{
+  if (!sSingleton) {
+    return;
+  }
+
+  sSingleton = nullptr;
+}
+
+} // namespace dom
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/test/nsFakeSynthServices.h firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/test/nsFakeSynthServices.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/webspeech/synth/test/nsFakeSynthServices.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/webspeech/synth/test/nsFakeSynthServices.h	2015-05-25 20:43:47.000000000 +0000
@@ -0,0 +1,53 @@
+/* -*- 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 nsFakeSynthServices_h
+#define nsFakeSynthServices_h
+
+#include "nsAutoPtr.h"
+#include "nsTArray.h"
+#include "nsIObserver.h"
+#include "nsIThread.h"
+#include "nsISpeechService.h"
+#include "nsRefPtrHashtable.h"
+#include "mozilla/StaticPtr.h"
+#include "mozilla/Monitor.h"
+
+namespace mozilla {
+namespace dom {
+
+class nsFakeSynthServices : public nsIObserver
+{
+
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIOBSERVER
+
+  nsFakeSynthServices();
+
+  static nsFakeSynthServices* GetInstance();
+
+  static already_AddRefed<nsFakeSynthServices> GetInstanceForService();
+
+  static void Shutdown();
+
+private:
+
+  virtual ~nsFakeSynthServices();
+
+  void Init();
+
+  nsCOMPtr<nsISpeechService> mDirectService;
+
+  nsCOMPtr<nsISpeechService> mIndirectService;
+
+  static StaticRefPtr<nsFakeSynthServices> sSingleton;
+};
+
+} // namespace dom
+} // namespace mozilla
+
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/WebVTTListener.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/WebVTTListener.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/WebVTTListener.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/WebVTTListener.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -28,22 +28,16 @@
 NS_IMPL_CYCLE_COLLECTING_ADDREF(WebVTTListener)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(WebVTTListener)
 
-#ifdef PR_LOGGING
 PRLogModuleInfo* gTextTrackLog;
-# define VTT_LOG(...) PR_LOG(gTextTrackLog, PR_LOG_DEBUG, (__VA_ARGS__))
-#else
-# define VTT_LOG(msg)
-#endif
+# define VTT_LOG(...) MOZ_LOG(gTextTrackLog, PR_LOG_DEBUG, (__VA_ARGS__))
 
 WebVTTListener::WebVTTListener(HTMLTrackElement* aElement)
   : mElement(aElement)
 {
   MOZ_ASSERT(mElement, "Must pass an element to the callback");
-#ifdef PR_LOGGING
   if (!gTextTrackLog) {
     gTextTrackLog = PR_NewLogModule("TextTrack");
   }
-#endif
   VTT_LOG("WebVTTListener created.");
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/wmf/WMFByteStream.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/wmf/WMFByteStream.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/wmf/WMFByteStream.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/wmf/WMFByteStream.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -25,12 +25,8 @@
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
 PRLogModuleInfo* gWMFByteStreamLog = nullptr;
-#define WMF_BS_LOG(...) PR_LOG(gWMFByteStreamLog, PR_LOG_DEBUG, (__VA_ARGS__))
-#else
-#define WMF_BS_LOG(...)
-#endif
+#define WMF_BS_LOG(...) MOZ_LOG(gWMFByteStreamLog, PR_LOG_DEBUG, (__VA_ARGS__))
 
 WMFByteStream::WMFByteStream(MediaResource* aResource,
                              WMFSourceReaderCallback* aSourceReaderCallback)
@@ -43,11 +39,9 @@
   NS_ASSERTION(NS_IsMainThread(), "Must be on main thread.");
   NS_ASSERTION(mSourceReaderCallback, "Must have a source reader callback.");
 
-#ifdef PR_LOGGING
   if (!gWMFByteStreamLog) {
     gWMFByteStreamLog = PR_NewLogModule("WMFByteStream");
   }
-#endif
   WMF_BS_LOG("[%p] WMFByteStream CTOR", this);
   MOZ_COUNT_CTOR(WMFByteStream);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/wmf/WMFReader.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/wmf/WMFReader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/wmf/WMFReader.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/wmf/WMFReader.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -10,7 +10,6 @@
 #include "WMFByteStream.h"
 #include "WMFSourceReaderCallback.h"
 #include "mozilla/ArrayUtils.h"
-#include "mozilla/dom/TimeRanges.h"
 #include "mozilla/dom/HTMLMediaElement.h"
 #include "mozilla/Preferences.h"
 #include "DXVA2Manager.h"
@@ -34,12 +33,8 @@
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
 extern PRLogModuleInfo* gMediaDecoderLog;
-#define DECODER_LOG(...) PR_LOG(gMediaDecoderLog, PR_LOG_DEBUG, (__VA_ARGS__))
-#else
-#define DECODER_LOG(...)
-#endif
+#define DECODER_LOG(...) MOZ_LOG(gMediaDecoderLog, PR_LOG_DEBUG, (__VA_ARGS__))
 
 // Uncomment to enable verbose per-sample logging.
 //#define LOG_SAMPLE_DECODE 1
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/wmf/WMFSourceReaderCallback.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/wmf/WMFSourceReaderCallback.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/wmf/WMFSourceReaderCallback.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/wmf/WMFSourceReaderCallback.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -9,12 +9,8 @@
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
 static PRLogModuleInfo* gWMFSourceReaderCallbackLog = nullptr;
-#define WMF_CB_LOG(...) PR_LOG(gWMFSourceReaderCallbackLog, PR_LOG_DEBUG, (__VA_ARGS__))
-#else
-#define WMF_CB_LOG(...)
-#endif
+#define WMF_CB_LOG(...) MOZ_LOG(gWMFSourceReaderCallbackLog, PR_LOG_DEBUG, (__VA_ARGS__))
 
 // IUnknown Methods
 STDMETHODIMP
@@ -44,11 +40,9 @@
   , mSample(nullptr)
   , mReadFinished(false)
 {
-#ifdef PR_LOGGING
   if (!gWMFSourceReaderCallbackLog) {
     gWMFSourceReaderCallbackLog = PR_NewLogModule("WMFSourceReaderCallback");
   }
-#endif
 }
 
 HRESULT
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/media/wmf/WMFUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/media/wmf/WMFUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/media/wmf/WMFUtils.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/media/wmf/WMFUtils.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -9,7 +9,7 @@
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/WindowsVersion.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsThreadUtils.h"
 #include "nsWindowsHelpers.h"
 #include "mozilla/CheckedInt.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/messages/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/messages/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/messages/moz.build	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/messages/moz.build	2015-05-25 20:43:47.000000000 +0000
@@ -18,3 +18,4 @@
 ]
 
 MOCHITEST_MANIFESTS += ['test/mochitest.ini']
+MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/messages/SystemMessagePermissionsChecker.jsm firefox-trunk-41.0~a1~hg20150524r245419/dom/messages/SystemMessagePermissionsChecker.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/messages/SystemMessagePermissionsChecker.jsm	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/messages/SystemMessagePermissionsChecker.jsm	2015-05-25 20:43:47.000000000 +0000
@@ -67,6 +67,7 @@
     "wifi-manage": []
   },
   "dummy-system-message": { }, // for system message testing framework
+  "dummy-system-message2": { }, // for system message testing framework
   "headset-button": { },
   "icc-stkcommand": {
     "settings": ["read", "write"]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/messages/test/chrome.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/messages/test/chrome.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/messages/test/chrome.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/messages/test/chrome.ini	2015-05-25 20:43:47.000000000 +0000
@@ -0,0 +1,3 @@
+[test_hasPendingMessage.html]
+skip-if = (buildapp != "browser") || e10s
+support-files = file_hasPendingMessage.html
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/messages/test/file_hasPendingMessage.html firefox-trunk-41.0~a1~hg20150524r245419/dom/messages/test/file_hasPendingMessage.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/messages/test/file_hasPendingMessage.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/messages/test/file_hasPendingMessage.html	2015-05-25 20:43:47.000000000 +0000
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <script type="application/javascript;version=1.8">
+      "use strict";
+      if (navigator.mozHasPendingMessage("dummy-system-message")) {
+        alert("before load");
+      }
+      window.addEventListener("load", e => {
+        if (navigator.mozHasPendingMessage("dummy-system-message")) {
+          alert("load");
+        }
+      });
+      window.addEventListener("hashchange", e => {
+        switch (window.location.hash) {
+          case "#checkPendingMessages":
+            if (navigator.mozHasPendingMessage("dummy-system-message2")) {
+              alert("after launch");
+            }
+            break;
+          case "#setMessageHandler":
+            navigator.mozSetMessageHandler("dummy-system-message", () => {
+              alert("handle message");
+              if (!navigator.mozHasPendingMessage("dummy-system-message")) {
+                alert("no hasPendingMessages");
+              }
+            });
+            break;
+          case "#setMessageHandler2":
+            navigator.mozSetMessageHandler("dummy-system-message2", () => {
+              alert("handle message");
+              if (!navigator.mozHasPendingMessage("dummy-system-message2")) {
+                alert("no hasPendingMessages");
+              }
+            });
+            break;
+        }
+      });
+    </script>
+  </head>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/messages/test/test_hasPendingMessage.html firefox-trunk-41.0~a1~hg20150524r245419/dom/messages/test/test_hasPendingMessage.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/messages/test/test_hasPendingMessage.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/messages/test/test_hasPendingMessage.html	2015-05-25 20:43:47.000000000 +0000
@@ -0,0 +1,96 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Test navigator.mozHasPendingMessage</title>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="chrome://global/skin"/>
+  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
+  <script type="application/javascript;version=1.8">
+    "use strict";
+
+    const { utils: Cu, interfaces: Ci, classes: Cc } = Components;
+    Cu.import("resource://gre/modules/Services.jsm");
+
+    SimpleTest.waitForExplicitFinish();
+
+    function expectAlert(iframe, message, assertion) {
+      return new Promise((resolve, reject) => {
+        iframe.addEventListener("mozbrowsershowmodalprompt", function cb(e) {
+          iframe.removeEventListener("mozbrowsershowmodalprompt", cb);
+          is(e.detail.message, message, assertion);
+          resolve();
+        });
+      });
+    }
+
+    function runTest(isRemote) {
+      return new Promise((finish, reject) => {
+        let testURL = "http://mochi.test:8888/chrome/dom/messages/test/file_hasPendingMessage.html";
+        let manifestURL = "http://example.org/manifest.webapp";
+        let testURI = Services.io.newURI(testURL, null, null);
+        let manifestURI = Services.io.newURI(manifestURL, null, null);
+        let body = document.getElementsByTagName("body")[0];
+        let test_frame = document.createElement("iframe");
+        test_frame.setAttribute("mozbrowser", "true");
+        test_frame.setAttribute("remote", isRemote);
+        test_frame.setAttribute("src", testURL);
+        test_frame.setAttribute("mozapp", manifestURL);
+
+        // Step 0. Register Page or install app
+        let smi = Cc["@mozilla.org/system-message-internal;1"]
+                  .getService(Ci.nsISystemMessagesInternal);
+        smi.registerPage("dummy-system-message", testURI, manifestURI);
+        smi.registerPage("dummy-system-message2", testURI, manifestURI);
+        // XXX lie to SystemMessageInternal to unblock sendMessage
+        Services.obs.notifyObservers(null, "webapps-registry-ready", null);
+        // Step 1. Send system message
+        smi.sendMessage("dummy-system-message", null, testURI, manifestURI);
+        // Step 2. Run app & check hasPendingMessages
+        body.appendChild(test_frame);
+        expectAlert(test_frame, "before load", "hasPendingMessages before load").then(() => {
+          // Step 3. Wait load & check hasPendingMessages
+          return expectAlert(test_frame, "load", "hasPendingMessages after load");
+        }).then(() => {
+          // Step 4. Send second system message
+          smi.sendMessage("dummy-system-message2", null, testURI, manifestURI);
+          // Step 5. Check hasPendingMessages
+          test_frame.src = testURL + "#checkPendingMessages";
+          return expectAlert(test_frame, "after launch", "hasPendingMessages after app launch");
+        }).then(() => {
+          // Step 6. mozSetMessageHandler
+          test_frame.src = testURL + "#setMessageHandler";
+          return expectAlert(test_frame, "handle message", "message handled");
+        }).then(() => {
+          // Setp 7. Check hasPendingMessages
+          return expectAlert(test_frame, "no hasPendingMessages",
+                             "no hasPendingMessages after mozSetMessageHandler");
+        }).then(() => {
+          // Step 6. mozSetMessageHandler2
+          test_frame.src = testURL + "#setMessageHandler2";
+          return expectAlert(test_frame, "handle message", "message handled");
+        }).then(() => {
+          // Setp 7. Check hasPendingMessages2
+          return expectAlert(test_frame, "no hasPendingMessages",
+                             "no hasPendingMessages after mozSetMessageHandler");
+        }).then(() => {
+          test_frame.remove();
+          finish();
+        });
+      });
+    }
+
+    window.addEventListener("load", function onLoad() {
+      window.removeEventListener("load", onLoad);
+      SpecialPowers.pushPrefEnv({'set': [["dom.mozBrowserFramesEnabled", true],
+                                         ["dom.sysmsg.enabled", true]]}, () => {
+        runTest(/* isRemote= */false)
+          .then(() => runTest(/* isRemote= */true))
+          .then(SimpleTest.finish);
+      });
+    });
+  </script>
+</head>
+<body>
+</body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/mobileconnection/gonk/MobileConnectionService.js firefox-trunk-41.0~a1~hg20150524r245419/dom/mobileconnection/gonk/MobileConnectionService.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/mobileconnection/gonk/MobileConnectionService.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/mobileconnection/gonk/MobileConnectionService.js	2015-05-25 20:43:47.000000000 +0000
@@ -42,6 +42,7 @@
 const NS_XPCOM_SHUTDOWN_OBSERVER_ID      = "xpcom-shutdown";
 const NS_PREFBRANCH_PREFCHANGE_TOPIC_ID  = "nsPref:changed";
 const NS_NETWORK_ACTIVE_CHANGED_TOPIC_ID = "network-active-changed";
+const NS_DATA_CALL_ERROR_TOPIC_ID        = "data-call-error";
 
 const kPrefRilDebuggingEnabled = "ril.debugging.enabled";
 
@@ -1126,6 +1127,7 @@
 
   Services.prefs.addObserver(kPrefRilDebuggingEnabled, this, false);
   Services.obs.addObserver(this, NS_NETWORK_ACTIVE_CHANGED_TOPIC_ID, false);
+  Services.obs.addObserver(this, NS_DATA_CALL_ERROR_TOPIC_ID, false);
   Services.obs.addObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, false);
 
   debug("init complete");
@@ -1148,6 +1150,7 @@
   _shutdown: function() {
     Services.prefs.removeObserver(kPrefRilDebuggingEnabled, this);
     Services.obs.removeObserver(this, NS_NETWORK_ACTIVE_CHANGED_TOPIC_ID);
+    Services.obs.removeObserver(this, NS_DATA_CALL_ERROR_TOPIC_ID);
     Services.obs.removeObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID);
   },
 
@@ -1418,6 +1421,15 @@
           provider.updateDataInfo({});
         }
         break;
+      case NS_DATA_CALL_ERROR_TOPIC_ID:
+        let network = aSubject;
+        try {
+          if (network instanceof Ci.nsIRilNetworkInterface) {
+            let rilNetwork = network.QueryInterface(Ci.nsIRilNetworkInterface);
+            this.notifyDataError(rilNetwork.serviceId, rilNetwork);
+          }
+        } catch (e) {}
+        break;
       case NS_PREFBRANCH_PREFCHANGE_TOPIC_ID:
         if (aData === kPrefRilDebuggingEnabled) {
           this._updateDebugFlag();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/mobileconnection/tests/marionette/test_call_barring_change_password.js firefox-trunk-41.0~a1~hg20150524r245419/dom/mobileconnection/tests/marionette/test_call_barring_change_password.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/mobileconnection/tests/marionette/test_call_barring_change_password.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/mobileconnection/tests/marionette/test_call_barring_change_password.js	2015-05-25 20:43:47.000000000 +0000
@@ -4,33 +4,11 @@
 MARIONETTE_TIMEOUT = 60000;
 MARIONETTE_HEAD_JS = "head.js";
 
-const TEST_DATA = [
-  // [<pin>, <new pin>, <expected error>]
+function testChangeCallBarringPassword(aExpectedError, aOptions) {
+  log("Test changing call barring password from " +
+      aOptions.pin + " to " + aOptions.newPin);
 
-  // Test passing an invalid pin or newPin.
-  [null, "0000", "InvalidPassword"],
-  ["0000", null, "InvalidPassword"],
-  [null, null, "InvalidPassword"],
-
-  // Test passing mismatched newPin.
-  ["000", "0000", "InvalidPassword"],
-  ["00000", "1111", "InvalidPassword"],
-  ["abcd", "efgh", "InvalidPassword"],
-
-  // TODO: Bug 906603 - B2G RIL: Support Change Call Barring Password on Emulator.
-  // Currently emulator doesn't support REQUEST_CHANGE_BARRING_PASSWORD, so we
-  // expect to get a 'RequestNotSupported' error here.
-  ["1234", "1234", "RequestNotSupported"]
-];
-
-function testChangeCallBarringPassword(aPin, aNewPin, aExpectedError) {
-  log("Test changing call barring password to " + aPin + "/" + aNewPin);
-
-  let options = {
-    pin: aPin,
-    newPin: aNewPin
-  };
-  return changeCallBarringPassword(options)
+  return changeCallBarringPassword(aOptions)
     .then(function resolve() {
       ok(!aExpectedError, "changeCallBarringPassword success");
     }, function reject(aError) {
@@ -40,11 +18,67 @@
 
 // Start tests
 startTestCommon(function() {
-  let promise = Promise.resolve();
-  for (let i = 0; i < TEST_DATA.length; i++) {
-    let data = TEST_DATA[i];
-    promise =
-      promise.then(() => testChangeCallBarringPassword(data[0], data[1], data[2]));
-  }
-  return promise;
+  return Promise.resolve()
+
+    // According to TS.22.004 clause 5.2, the password should consist of four
+    // digits in the range 0000 to 9999.
+
+    // Test passing an invalid pin.
+    .then(() => testChangeCallBarringPassword("InvalidPassword", {
+      pin: null,
+      newPin: "0000"
+    }))
+
+    .then(() => testChangeCallBarringPassword("InvalidPassword", {
+      pin: "000",
+      newPin: "0000"
+    }))
+
+    .then(() => testChangeCallBarringPassword("InvalidPassword", {
+      pin: "00000",
+      newPin: "0000"
+    }))
+
+    .then(() => testChangeCallBarringPassword("InvalidPassword", {
+      pin: "abcd",
+      newPin: "0000"
+    }))
+
+    // Test passing an invalid newPin
+    .then(() => testChangeCallBarringPassword("InvalidPassword", {
+      pin: "0000",
+      newPin: null
+    }))
+
+    .then(() => testChangeCallBarringPassword("InvalidPassword", {
+      pin: "0000",
+      newPin: "000"
+    }))
+
+    .then(() => testChangeCallBarringPassword("InvalidPassword", {
+      pin: "0000",
+      newPin: "00000"
+    }))
+
+    .then(() => testChangeCallBarringPassword("InvalidPassword", {
+      pin: "0000",
+      newPin: "abcd"
+    }))
+
+    // Test passing an incorrect password, where the default password is "0000".
+    .then(() => testChangeCallBarringPassword("IncorrectPassword", {
+      pin: "1111",
+      newPin: "2222"
+    }))
+
+    // Sucessful
+    .then(() => testChangeCallBarringPassword(null, {
+      pin: "0000",
+      newPin: "2222"
+    }))
+
+    .then(() => testChangeCallBarringPassword(null, {
+      pin: "2222",
+      newPin: "0000"
+    }));
 });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/mobileconnection/tests/marionette/test_mobile_preferred_network_type.js firefox-trunk-41.0~a1~hg20150524r245419/dom/mobileconnection/tests/marionette/test_mobile_preferred_network_type.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/mobileconnection/tests/marionette/test_mobile_preferred_network_type.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/mobileconnection/tests/marionette/test_mobile_preferred_network_type.js	2015-05-25 20:43:47.000000000 +0000
@@ -37,6 +37,9 @@
   }, {
     preferredNetworkType: "lte",
     expectedErrorMessage: "ModeNotSupported"
+  }, {
+    preferredNetworkType: "lte/wcdma",
+    expectedErrorMessage: "ModeNotSupported"
   },
   // Test passing an invalid mode. We expect to get an exception here.
   {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/mobilemessage/ipc/SmsChild.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/mobilemessage/ipc/SmsChild.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/mobilemessage/ipc/SmsChild.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/mobilemessage/ipc/SmsChild.cpp	2015-05-25 20:43:48.000000000 +0000
@@ -348,10 +348,10 @@
   MOZ_ASSERT(length);
 
   AutoFallibleTArray<nsISupports*, 1> autoArray;
-  NS_ENSURE_TRUE_VOID(autoArray.SetCapacity(length));
+  NS_ENSURE_TRUE_VOID(autoArray.SetCapacity(length, fallible));
 
   AutoFallibleTArray<nsCOMPtr<nsISupports>, 1> messages;
-  NS_ENSURE_TRUE_VOID(messages.SetCapacity(length));
+  NS_ENSURE_TRUE_VOID(messages.SetCapacity(length, fallible));
 
   for (uint32_t i = 0; i < length; i++) {
     nsCOMPtr<nsISupports> message = CreateMessageFromMessageData(aDataArray[i]);
@@ -369,10 +369,10 @@
   MOZ_ASSERT(length);
 
   AutoFallibleTArray<nsISupports*, 1> autoArray;
-  NS_ENSURE_TRUE_VOID(autoArray.SetCapacity(length));
+  NS_ENSURE_TRUE_VOID(autoArray.SetCapacity(length, fallible));
 
   AutoFallibleTArray<nsCOMPtr<nsISupports>, 1> threads;
-  NS_ENSURE_TRUE_VOID(threads.SetCapacity(length));
+  NS_ENSURE_TRUE_VOID(threads.SetCapacity(length, fallible));
 
   for (uint32_t i = 0; i < length; i++) {
     nsCOMPtr<nsISupports> thread = new MobileMessageThread(aDataArray[i]);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/mobilemessage/MobileMessageManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/mobilemessage/MobileMessageManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/mobilemessage/MobileMessageManager.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/mobilemessage/MobileMessageManager.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -356,7 +356,7 @@
 {
   const uint32_t size = aParams.Length();
   FallibleTArray<int32_t> idArray;
-  if (!idArray.SetLength(size)) {
+  if (!idArray.SetLength(size, fallible)) {
     aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
     return nullptr;
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/mobilemessage/tests/marionette/test_replace_short_message_type.js firefox-trunk-41.0~a1~hg20150524r245419/dom/mobilemessage/tests/marionette/test_replace_short_message_type.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/mobilemessage/tests/marionette/test_replace_short_message_type.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/mobilemessage/tests/marionette/test_replace_short_message_type.js	2015-05-25 20:43:48.000000000 +0000
@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-MARIONETTE_TIMEOUT = 120000;
+MARIONETTE_TIMEOUT = 240000;
 MARIONETTE_HEAD_JS = 'head.js';
 
 const PDU_SMSC_NONE = "00"; // no SMSC Address
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/network/tests/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/network/tests/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/network/tests/mochitest.ini	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/network/tests/mochitest.ini	2015-05-25 20:43:48.000000000 +0000
@@ -14,13 +14,13 @@
 [test_tcpsocket_enabled_with_perm.html]
 skip-if = toolkit == "gonk" || e10s
 [test_networkstats_alarms.html]
-skip-if = true # Bug 958689
+skip-if = toolkit != "gonk"
 [test_networkstats_basics.html]
-skip-if = true # Bug 958689, bug 858005
+skip-if = toolkit != "gonk"
 [test_networkstats_disabled.html]
 skip-if = toolkit != "gonk"
 [test_networkstats_enabled_no_perm.html]
-skip-if = true # Bug 958689
+skip-if = toolkit != "gonk"
 [test_networkstats_enabled_perm.html]
 skip-if = toolkit != "gonk"
 [test_udpsocket.html]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/network/tests/test_networkstats_alarms.html firefox-trunk-41.0~a1~hg20150524r245419/dom/network/tests/test_networkstats_alarms.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/network/tests/test_networkstats_alarms.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/network/tests/test_networkstats_alarms.html	2015-05-25 20:43:48.000000000 +0000
@@ -149,7 +149,6 @@
   },
   function () {
     ok(true, "all done!\n");
-    SpecialPowers.removePermission("networkstats-manage", document);
     SimpleTest.finish();
     return;
   }
@@ -170,21 +169,23 @@
 
 SimpleTest.waitForExplicitFinish();
 
-SpecialPowers.addPermission("networkstats-manage", true, document);
 SpecialPowers.pushPrefEnv({'set': [["dom.mozNetworkStats.enabled", true]]},
                           function() {
-  ok(SpecialPowers.hasPermission("networkstats-manage", document),
-     "Has permission 'networkstats-manage'.");
+  SpecialPowers.pushPermissions([{ 'type': 'networkstats-manage', 'allow': 1, 'context': window.document }],
+                                function() {
+    ok(SpecialPowers.hasPermission("networkstats-manage", document),
+       "Has permission 'networkstats-manage'.");
 
-  ok(SpecialPowers.getBoolPref("dom.mozNetworkStats.enabled"),
-     "Preference 'dom.mozNetworkStats.enabled' is true.");
+    ok(SpecialPowers.getBoolPref("dom.mozNetworkStats.enabled"),
+       "Preference 'dom.mozNetworkStats.enabled' is true.");
 
-  ok('mozNetworkStats' in navigator, "navigator.mozNetworkStats should exist");
+    ok('mozNetworkStats' in navigator, "navigator.mozNetworkStats should exist");
 
-  ok(navigator.mozNetworkStats instanceof SpecialPowers.Ci.nsIDOMMozNetworkStatsManager,
-     "navigator.mozNetworkStats should be a nsIDOMMozNetworkStatsManager object");
+    ok(navigator.mozNetworkStats instanceof SpecialPowers.Ci.nsIDOMMozNetworkStatsManager,
+       "navigator.mozNetworkStats should be a nsIDOMMozNetworkStatsManager object");
 
-  test();
+    test();
+  });
 });
 
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/network/tests/test_networkstats_basics.html firefox-trunk-41.0~a1~hg20150524r245419/dom/network/tests/test_networkstats_basics.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/network/tests/test_networkstats_basics.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/network/tests/test_networkstats_basics.html	2015-05-25 20:43:48.000000000 +0000
@@ -301,7 +301,6 @@
   },
   function () {
     ok(true, "all done!\n");
-    SpecialPowers.removePermission("networkstats-manage", document);
     SimpleTest.finish();
     return;
   }
@@ -322,21 +321,23 @@
 
 SimpleTest.waitForExplicitFinish();
 
-SpecialPowers.addPermission("networkstats-manage", true, document);
 SpecialPowers.pushPrefEnv({'set': [["dom.mozNetworkStats.enabled", true]]},
                           function() {
-  ok(SpecialPowers.hasPermission("networkstats-manage", document),
-     "Has permission 'networkstats-manage'.");
+  SpecialPowers.pushPermissions([{ 'type': 'networkstats-manage', 'allow': 1, 'context': window.document }],
+                                function() {
+    ok(SpecialPowers.hasPermission("networkstats-manage", document),
+       "Has permission 'networkstats-manage'.");
 
-  ok(SpecialPowers.getBoolPref("dom.mozNetworkStats.enabled"),
-     "Preference 'dom.mozNetworkStats.enabled' is true.");
+    ok(SpecialPowers.getBoolPref("dom.mozNetworkStats.enabled"),
+       "Preference 'dom.mozNetworkStats.enabled' is true.");
 
-  ok('mozNetworkStats' in navigator, "navigator.mozNetworkStats should exist");
+    ok('mozNetworkStats' in navigator, "navigator.mozNetworkStats should exist");
 
-  ok(navigator.mozNetworkStats instanceof SpecialPowers.Ci.nsIDOMMozNetworkStatsManager,
-     "navigator.mozNetworkStats should be a nsIDOMMozNetworkStatsManager object");
+    ok(navigator.mozNetworkStats instanceof SpecialPowers.Ci.nsIDOMMozNetworkStatsManager,
+       "navigator.mozNetworkStats should be a nsIDOMMozNetworkStatsManager object");
 
-  test();
+    test();
+  });
 });
 
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/network/tests/test_networkstats_enabled_no_perm.html firefox-trunk-41.0~a1~hg20150524r245419/dom/network/tests/test_networkstats_enabled_no_perm.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/network/tests/test_networkstats_enabled_no_perm.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/network/tests/test_networkstats_enabled_no_perm.html	2015-05-25 20:43:48.000000000 +0000
@@ -15,10 +15,12 @@
 // Test to ensure NetworkStats is enabled but mozNetworkStats.getAvailableNetworks
 // does not work in content because mozNetworkStats is null when no permission.
   SimpleTest.waitForExplicitFinish();
-  SpecialPowers.pushPrefEnv({"set": [['dom.mozNetworkStats.enabled', true]]}, runTest);
-  function runTest() {
-    SpecialPowers.removePermission("networkstats-manage", document);
+  SpecialPowers.pushPrefEnv({"set": [['dom.mozNetworkStats.enabled', true]]},
+                            function() {
+    SpecialPowers.pushPermissions([{ 'type': 'networkstats-manage', 'allow': 0, 'context': window.document }], runTest);
+  });
 
+  function runTest() {
     ok(SpecialPowers.getBoolPref("dom.mozNetworkStats.enabled"),
       "Preference 'dom.mozNetworkStats.enabled' is true.");
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/network/tests/test_networkstats_enabled_perm.html firefox-trunk-41.0~a1~hg20150524r245419/dom/network/tests/test_networkstats_enabled_perm.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/network/tests/test_networkstats_enabled_perm.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/network/tests/test_networkstats_enabled_perm.html	2015-05-25 20:43:48.000000000 +0000
@@ -16,23 +16,25 @@
 
 SimpleTest.waitForExplicitFinish();
 
-// Test to ensure NetworkStats is not accessible when it is disabled
-SpecialPowers.addPermission("networkstats-manage", true, document);
+// Test to ensure NetworkStats is not accessible when it is disabled.
 SpecialPowers.pushPrefEnv({'set': [["dom.mozNetworkStats.enabled", true]]},
-                          function(){
-  ok(SpecialPowers.hasPermission("networkstats-manage", document),
-     "Has permission 'networkstats-manage'.");
+                          function() {
+  SpecialPowers.pushPermissions([{ 'type': 'networkstats-manage', 'allow': 1, 'context': window.document }],
+                                function() {
 
-  ok(SpecialPowers.getBoolPref("dom.mozNetworkStats.enabled"),
-     "Preference 'dom.mozNetworkStats.enabled' is true.");
+    ok(SpecialPowers.hasPermission("networkstats-manage", document),
+       "Has permission 'networkstats-manage'.");
 
-  ok('mozNetworkStats' in navigator, "navigator.mozNetworkStats should exist");
+    ok(SpecialPowers.getBoolPref("dom.mozNetworkStats.enabled"),
+       "Preference 'dom.mozNetworkStats.enabled' is true.");
 
-  ok(navigator.mozNetworkStats instanceof SpecialPowers.Ci.nsIDOMMozNetworkStatsManager,
-     "navigator.mozNetworkStats should be a nsIDOMMozNetworkStatsManager object");
+    ok('mozNetworkStats' in navigator, "navigator.mozNetworkStats should exist");
 
-  SpecialPowers.removePermission("networkstats-manage", document);
-  SimpleTest.finish();
+    ok(navigator.mozNetworkStats instanceof SpecialPowers.Ci.nsIDOMMozNetworkStatsManager,
+       "navigator.mozNetworkStats should be a nsIDOMMozNetworkStatsManager object");
+
+    SimpleTest.finish();
+  });
 });
 
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/network/UDPSocket.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/network/UDPSocket.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/network/UDPSocket.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/network/UDPSocket.cpp	2015-05-25 20:43:48.000000000 +0000
@@ -339,7 +339,7 @@
   if (aData.IsBlob()) {
     Blob& blob = aData.GetAsBlob();
 
-    aRv = blob.GetInternalStream(getter_AddRefs(stream));
+    blob.GetInternalStream(getter_AddRefs(stream), aRv);
     if (NS_WARN_IF(aRv.Failed())) {
       return false;
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/gonk/Nfc.js firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/gonk/Nfc.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/gonk/Nfc.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/gonk/Nfc.js	2015-05-25 20:43:48.000000000 +0000
@@ -57,6 +57,7 @@
 const NFC_IPC_MSG_ENTRIES = [
   { permission: null,
     messages: ["NFC:AddEventListener",
+               "NFC:RemoveEventListener",
                "NFC:QueryInfo",
                "NFC:CallDefaultFoundHandler",
                "NFC:CallDefaultLostHandler"] },
@@ -219,6 +220,7 @@
         return;
       }
 
+      options.tabId = this.focusApp;
       target.sendAsyncMessage("NFC:DOMEvent", options);
     },
 
@@ -255,12 +257,16 @@
     removeEventListener: function removeEventListener(target) {
       for (let id in this.eventListeners) {
         if (target == this.eventListeners[id]) {
-          delete this.eventListeners[id];
+          this.removeEventListenerById(id);
           break;
         }
       }
     },
 
+    removeEventListenerById: function removeEventListenerById(id) {
+      delete this.eventListeners[id];
+    },
+
     checkP2PRegistration: function checkP2PRegistration(message) {
       let target = this.peerTargets[message.data.appId];
       let sessionToken = SessionHelper.getCurrentP2PToken();
@@ -384,6 +390,9 @@
         case "NFC:AddEventListener":
           this.addEventListener(message.target, message.data.tabId);
           return null;
+        case "NFC:RemoveEventListener":
+          this.removeEventListenerById(message.data.tabId);
+          return null;
         case "NFC:RegisterPeerReadyTarget":
           this.registerPeerReadyTarget(message.target, message.data.appId);
           return null;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/gonk/NfcService.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/gonk/NfcService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/gonk/NfcService.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/gonk/NfcService.cpp	2015-05-25 20:43:48.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/dom/NfcOptionsBinding.h"
 #include "mozilla/dom/ToJSValue.h"
 #include "mozilla/dom/RootedDictionary.h"
+#include "mozilla/ipc/NfcConnector.h"
 #include "mozilla/unused.h"
 #include "nsAutoPtr.h"
 #include "nsString.h"
@@ -311,14 +312,14 @@
   mListenSocketName = BASE_SOCKET_NAME;
 
   mListenSocket = new NfcListenSocket(this);
-
-  bool success = mListenSocket->Listen(new NfcConnector(), mConsumer);
-  if (!success) {
+  nsresult rv = mListenSocket->Listen(new NfcConnector(mListenSocketName),
+                                      mConsumer);
+  if (NS_FAILED(rv)) {
     mConsumer = nullptr;
-    return NS_ERROR_FAILURE;
+    return rv;
   }
 
-  nsresult rv = NS_NewNamedThread("NfcThread", getter_AddRefs(mThread));
+  rv = NS_NewNamedThread("NfcThread", getter_AddRefs(mThread));
   if (NS_FAILED(rv)) {
     NS_WARNING("Can't create Nfc worker thread.");
     mListenSocket->Close();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/NfcContentHelper.js firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/NfcContentHelper.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/NfcContentHelper.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/NfcContentHelper.js	2015-05-25 20:43:48.000000000 +0000
@@ -71,6 +71,8 @@
   Services.obs.addObserver(this, "xpcom-shutdown", false);
 
   this._requestMap = [];
+  this.initDOMRequestHelper(/* window */ null, NFC_IPC_MSG_NAMES);
+  this.eventListeners = {};
 }
 
 NfcContentHelper.prototype = {
@@ -88,60 +90,11 @@
                        Ci.nsINfcBrowserAPI]
   }),
 
-  _window: null,
   _requestMap: null,
-  _rfState: null,
-  _tabId: null,
-  eventListener: null,
-
-  init: function init(aWindow) {
-    if (aWindow == null) {
-      throw Components.Exception("Can't get window object",
-                                  Cr.NS_ERROR_UNEXPECTED);
-    }
-    this._window = aWindow;
-    this.initDOMRequestHelper(this._window, NFC_IPC_MSG_NAMES);
-
-    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() {
-        DEBUG = nfcDebug.result[NFC.SETTING_NFC_DEBUG];
-        updateDebug();
-      };
-    }
-
-    let info = cpmm.sendSyncMessage("NFC:QueryInfo")[0];
-    this._rfState = info.rfState;
-
-    // For now, we assume app will run in oop mode so we can get
-    // tab id for each app. Fix bug 1116449 if we are going to
-    // support in-process mode.
-    let docShell = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
-                          .getInterface(Ci.nsIWebNavigation)
-                          .QueryInterface(Ci.nsIDocShell);
-    try {
-      this._tabId = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
-                            .getInterface(Ci.nsITabChild)
-                            .tabId;
-    } catch(e) {
-      // Only parent process does not have tab id, so in this case
-      // NfcContentHelper is used by system app. Use -1(tabId) to
-      // indicate its system app.
-      let inParent = Cc["@mozilla.org/xre/app-info;1"]
-                       .getService(Ci.nsIXULRuntime)
-                       .processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT;
-      if (inParent) {
-        this._tabId = Ci.nsINfcBrowserAPI.SYSTEM_APP_ID;
-      } else {
-        throw Components.Exception("Can't get tab id in child process",
-                                   Cr.NS_ERROR_UNEXPECTED);
-      }
-    }
-  },
+  eventListeners: null,
 
   queryRFState: function queryRFState() {
-    return this._rfState;
+    return cpmm.sendSyncMessage("NFC:QueryInfo")[0].rfState;
   },
 
   setFocusApp: function setFocusApp(tabId, isFocus) {
@@ -224,9 +177,27 @@
     });
   },
 
-  addEventListener: function addEventListener(listener) {
-    this.eventListener = listener;
-    cpmm.sendAsyncMessage("NFC:AddEventListener", { tabId: this._tabId });
+  addEventListener: function addEventListener(listener, tabId) {
+    let _window = listener.window;
+
+    // TODO Bug 1166210 - enable NFC debug for child process.
+    if (!NFC.DEBUG_CONTENT_HELPER && _window.navigator.mozSettings) {
+      let lock = _window.navigator.mozSettings.createLock();
+      var nfcDebug = lock.get(NFC.SETTING_NFC_DEBUG);
+      nfcDebug.onsuccess = function _nfcDebug() {
+        DEBUG = nfcDebug.result[NFC.SETTING_NFC_DEBUG];
+        updateDebug();
+      };
+    }
+
+    this.eventListeners[tabId] = listener;
+    cpmm.sendAsyncMessage("NFC:AddEventListener", { tabId: tabId });
+  },
+
+  removeEventListener: function removeEventListener(tabId) {
+    delete this.eventListeners[tabId];
+
+    cpmm.sendAsyncMessage("NFC:RemoveEventListener", { tabId: tabId });
   },
 
   registerTargetForPeerReady: function registerTargetForPeerReady(appId) {
@@ -317,45 +288,7 @@
         this.handleGeneralResponse(result);
         break;
       case "NFC:DOMEvent":
-        switch (result.event) {
-          case NFC.PEER_EVENT_READY:
-            this.eventListener.notifyPeerFound(result.sessionToken, /* isPeerReady */ true);
-            break;
-          case NFC.PEER_EVENT_FOUND:
-            this.eventListener.notifyPeerFound(result.sessionToken);
-            break;
-          case NFC.PEER_EVENT_LOST:
-            this.eventListener.notifyPeerLost(result.sessionToken);
-            break;
-          case NFC.TAG_EVENT_FOUND:
-            let ndefInfo = null;
-            if (result.tagType !== undefined &&
-                result.maxNDEFSize !== undefined &&
-                result.isReadOnly !== undefined &&
-                result.isFormatable !== undefined) {
-              ndefInfo = new TagNDEFInfo(result.tagType,
-                                         result.maxNDEFSize,
-                                         result.isReadOnly,
-                                         result.isFormatable);
-            }
-
-            let tagInfo = new TagInfo(result.techList, result.tagId);
-            this.eventListener.notifyTagFound(result.sessionToken,
-                                              tagInfo,
-                                              ndefInfo,
-                                              result.records);
-            break;
-          case NFC.TAG_EVENT_LOST:
-            this.eventListener.notifyTagLost(result.sessionToken);
-            break;
-          case NFC.RF_EVENT_STATE_CHANGED:
-            this._rfState = result.rfState;
-            this.eventListener.notifyRFStateChanged(this._rfState);
-            break;
-          case NFC.FOCUS_CHANGED:
-            this.eventListener.notifyFocusChanged(result.focus);
-            break;
-        }
+        this.handleDOMEvent(result);
         break;
     }
   },
@@ -399,16 +332,7 @@
       return;
     }
 
-    let ndefMsg = new this._window.Array();
-    let records = result.records;
-    for (let i = 0; i < records.length; i++) {
-      let record = records[i];
-      ndefMsg.push(new this._window.MozNDEFRecord({tnf: record.tnf,
-                                                   type: record.type,
-                                                   id: record.id,
-                                                   payload: record.payload}));
-    }
-    callback.notifySuccessWithNDEFRecords(ndefMsg);
+    callback.notifySuccessWithNDEFRecords(result.records);
   },
 
   handleCheckP2PRegistrationResponse: function handleCheckP2PRegistrationResponse(result) {
@@ -441,6 +365,53 @@
 
     callback.notifySuccessWithByteArray(result.response);
   },
+
+  handleDOMEvent: function handleDOMEvent(result) {
+    let listener = this.eventListeners[result.tabId];
+    if (!listener) {
+      debug("no listener for tabId " + result.tabId);
+      return;
+    }
+
+    switch (result.event) {
+      case NFC.PEER_EVENT_READY:
+        listener.notifyPeerFound(result.sessionToken, /* isPeerReady */ true);
+        break;
+      case NFC.PEER_EVENT_FOUND:
+        listener.notifyPeerFound(result.sessionToken);
+        break;
+      case NFC.PEER_EVENT_LOST:
+        listener.notifyPeerLost(result.sessionToken);
+        break;
+      case NFC.TAG_EVENT_FOUND:
+        let ndefInfo = null;
+        if (result.tagType !== undefined &&
+            result.maxNDEFSize !== undefined &&
+            result.isReadOnly !== undefined &&
+            result.isFormatable !== undefined) {
+          ndefInfo = new TagNDEFInfo(result.tagType,
+                                     result.maxNDEFSize,
+                                     result.isReadOnly,
+                                     result.isFormatable);
+        }
+
+        let tagInfo = new TagInfo(result.techList, result.tagId);
+        listener.notifyTagFound(result.sessionToken,
+                                          tagInfo,
+                                          ndefInfo,
+                                          result.records);
+        break;
+      case NFC.TAG_EVENT_LOST:
+        listener.notifyTagLost(result.sessionToken);
+        break;
+      case NFC.RF_EVENT_STATE_CHANGED:
+        listener.notifyRFStateChanged(result.rfState);
+        break;
+      case NFC.FOCUS_CHANGED:
+        listener.notifyFocusChanged(result.focus);
+        break;
+    }
+  }
 };
 
 function TagNDEFInfo(tagType, maxNDEFSize, isReadOnly, isFormatable) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/nsINfcContentHelper.idl firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/nsINfcContentHelper.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/nsINfcContentHelper.idl	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/nsINfcContentHelper.idl	2015-05-25 20:43:48.000000000 +0000
@@ -31,7 +31,7 @@
   readonly attribute boolean isFormatable;
 };
 
-[scriptable, uuid(151b4024-0443-434f-99ca-47ec247508ce)]
+[scriptable, uuid(86e46a0c-016d-4e5d-9fb5-789eb71848a1)]
 interface nsINfcEventListener : nsISupports
 {
   /**
@@ -92,6 +92,11 @@
    *        focus value receveid from parent process.
    */
   void notifyFocusChanged(in boolean focus);
+
+  /**
+   * The window object of this event listener.
+   */
+  readonly attribute nsIDOMWindow window;
 };
 
 [scriptable, uuid(6c913015-9658-46a9-88d9-6ecfda2bd020)]
@@ -119,11 +124,9 @@
                    in boolean isFocus);
 };
 
-[scriptable, uuid(9cf841c9-0347-4564-99e5-18c0f74eca4d)]
+[scriptable, uuid(75f0c8c0-2e5a-491f-a75d-4f3849c4feec)]
 interface nsINfcContentHelper : nsISupports
 {
-  void init(in nsIDOMWindow window);
-
   /**
    * Read current NDEF data on the tag.
    *
@@ -201,7 +204,7 @@
                   in nsINfcRequestCallback callback);
 
   /**
-   * Get current RF state.
+   * Get current RF state. This function will be blocking.
    */
   DOMString queryRFState();
 
@@ -210,7 +213,7 @@
    *
    * @param blob
    *        Raw data of the file to be sent. This object represents a file-like
-   *        (nsIDOMFile) object of immutable, raw data. The blob data needs
+   *        (DOM File) object of immutable, raw data. The blob data needs
    *        to be 'object wrapped' before calling this interface.
    *
    * @param sessionToken
@@ -228,8 +231,18 @@
    *
    * @param listener
    *        An instance of the nsINfcEventListener.
+   * @param tabId
+   *        The tab ID of the listener.
+   */
+  void addEventListener(in nsINfcEventListener listener, in uint64_t tabId);
+
+  /**
+   * Remove event listener.
+   *
+   * @param tabId
+   *        The tabId provided in addEventListener.
    */
-  void addEventListener(in nsINfcEventListener listener);
+  void removeEventListener(in uint64_t tabId);
 
   /**
    * Register the given application id with parent process
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/nsNfc.js firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/nsNfc.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/nsNfc.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/nsNfc.js	2015-05-25 20:43:48.000000000 +0000
@@ -73,7 +73,16 @@
       debug("can not find promise resolver for id: " + this._requestId);
       return;
     }
-    resolver.resolve(aRecords);
+
+    let records = new this._window.Array();
+    for (let i = 0; i < aRecords.length; i++) {
+      let record = aRecords[i];
+      records.push(new this._window.MozNDEFRecord({tnf: record.tnf,
+                                                   type: record.type,
+                                                   id: record.id,
+                                                   payload: record.payload}));
+    }
+    resolver.resolve(records);
   },
 
   notifySuccessWithByteArray: function notifySuccessWithByteArray(aArray) {
@@ -334,7 +343,9 @@
 }
 MozNFCImpl.prototype = {
   _nfcContentHelper: null,
-  _window: null,
+  window: null,
+  _tabId: null,
+  _innerWindowId: null,
   _rfState: null,
   _contentObj: null,
   nfcPeer: null,
@@ -343,20 +354,57 @@
 
   init: function init(aWindow) {
     debug("MozNFCImpl init called");
-    this._window = aWindow;
+    this.window = aWindow;
+    let util = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
+                      .getInterface(Ci.nsIDOMWindowUtils);
+    this._innerWindowId = util.currentInnerWindowID;
+
     this.defineEventHandlerGetterSetter("ontagfound");
     this.defineEventHandlerGetterSetter("ontaglost");
     this.defineEventHandlerGetterSetter("onpeerready");
     this.defineEventHandlerGetterSetter("onpeerfound");
     this.defineEventHandlerGetterSetter("onpeerlost");
 
+    Services.obs.addObserver(this, "inner-window-destroyed",
+                             /* weak-ref */ false);
+
     if (this._nfcContentHelper) {
-      this._nfcContentHelper.init(aWindow);
-      this._nfcContentHelper.addEventListener(this);
+      this._tabId = this.getTabId(aWindow);
+      this._nfcContentHelper.addEventListener(this, this._tabId);
       this._rfState = this._nfcContentHelper.queryRFState();
     }
   },
 
+  getTabId: function getTabId(aWindow) {
+    let tabId;
+    // For now, we assume app will run in oop mode so we can get
+    // tab id for each app. Fix bug 1116449 if we are going to
+    // support in-process mode.
+    let docShell = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
+                          .getInterface(Ci.nsIWebNavigation)
+                          .QueryInterface(Ci.nsIDocShell);
+    try {
+      tabId = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
+                      .getInterface(Ci.nsITabChild)
+                      .tabId;
+    } catch(e) {
+      // Only parent process does not have tab id, so in this case
+      // NfcContentHelper is used by system app. Use -1(tabId) to
+      // indicate its system app.
+      let inParent = Cc["@mozilla.org/xre/app-info;1"]
+                       .getService(Ci.nsIXULRuntime)
+                       .processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT;
+      if (inParent) {
+        tabId = Ci.nsINfcBrowserAPI.SYSTEM_APP_ID;
+      } else {
+        throw Components.Exception("Can't get tab id in child process",
+                                   Cr.NS_ERROR_UNEXPECTED);
+      }
+    }
+
+    return tabId;
+  },
+
   // Only apps which have nfc-manager permission can call the following interfaces
   // 'checkP2PRegistration' , 'notifyUserAcceptedP2P' , 'notifySendFileStatus',
   // 'startPoll', 'stopPoll', and 'powerOff'.
@@ -364,7 +412,7 @@
     // Get the AppID and pass it to ContentHelper
     let appID = appsService.getAppLocalIdByManifestURL(manifestUrl);
 
-    let callback = new NfcCallback(this._window);
+    let callback = new NfcCallback(this.window);
     this._nfcContentHelper.checkP2PRegistration(appID, callback);
     return callback.promise;
   },
@@ -380,19 +428,19 @@
   },
 
   startPoll: function startPoll() {
-    let callback = new NfcCallback(this._window);
+    let callback = new NfcCallback(this.window);
     this._nfcContentHelper.changeRFState(RFState.DISCOVERY, callback);
     return callback.promise;
   },
 
   stopPoll: function stopPoll() {
-    let callback = new NfcCallback(this._window);
+    let callback = new NfcCallback(this.window);
     this._nfcContentHelper.changeRFState(RFState.LISTEN, callback);
     return callback.promise;
   },
 
   powerOff: function powerOff() {
-    let callback = new NfcCallback(this._window);
+    let callback = new NfcCallback(this.window);
     this._nfcContentHelper.changeRFState(RFState.IDLE, callback);
     return callback.promise;
   },
@@ -401,6 +449,19 @@
     return this._rfState != RFState.IDLE;
   },
 
+  observe: function observe(subject, topic, data) {
+    if (topic !== "inner-window-destroyed") {
+      return;
+    }
+
+    let wId = subject.QueryInterface(Ci.nsISupportsPRUint64).data;
+    if (wId != this._innerWindowId) {
+      return;
+    }
+
+    this._nfcContentHelper.removeEventListener(this._tabId);
+  },
+
   defineEventHandlerGetterSetter: function defineEventHandlerGetterSetter(name) {
     Object.defineProperty(this, name, {
       get: function get() {
@@ -417,7 +478,7 @@
       return;
     }
 
-    let appId = this._window.document.nodePrincipal.appId;
+    let appId = this.window.document.nodePrincipal.appId;
     this._nfcContentHelper.registerTargetForPeerReady(appId);
   },
 
@@ -426,7 +487,7 @@
       return;
     }
 
-    let appId = this._window.document.nodePrincipal.appId;
+    let appId = this.window.document.nodePrincipal.appId;
     this._nfcContentHelper.unregisterTargetForPeerReady(appId);
   },
 
@@ -443,7 +504,7 @@
    */
   handleTagFound: function handleTagFound(sessionToken, tagInfo, ndefInfo, records) {
     if (this.hasDeadWrapper()) {
-      dump("this._window or this.__DOM_IMPL__ is a dead wrapper.");
+      dump("this.window or this.__DOM_IMPL__ is a dead wrapper.");
       return false;
     }
 
@@ -456,8 +517,8 @@
       return false;
     }
 
-    let tagImpl = new MozNFCTagImpl(this._window, sessionToken, tagInfo, ndefInfo);
-    let tag = this._window.MozNFCTag._create(this._window, tagImpl);
+    let tagImpl = new MozNFCTagImpl(this.window, sessionToken, tagInfo, ndefInfo);
+    let tag = this.window.MozNFCTag._create(this.window, tagImpl);
 
     tagImpl._contentObj = tag;
     this.nfcTag = tag;
@@ -466,7 +527,7 @@
     let ndefRecords = records ? [] : null;
     for (let i = 0; i < length; i++) {
       let record = records[i];
-      ndefRecords.push(new this._window.MozNDEFRecord({tnf: record.tnf,
+      ndefRecords.push(new this.window.MozNDEFRecord({tnf: record.tnf,
                                                        type: record.type,
                                                        id: record.id,
                                                        payload: record.payload}));
@@ -479,7 +540,7 @@
     };
 
     debug("fire ontagfound " + sessionToken);
-    let tagEvent = new this._window.MozNFCTagEvent("tagfound", eventData);
+    let tagEvent = new this.window.MozNFCTagEvent("tagfound", eventData);
     this.__DOM_IMPL__.dispatchEvent(tagEvent);
 
     // If defaultPrevented is false, means we need to take the default action
@@ -500,7 +561,7 @@
 
   handleTagLost: function handleTagLost(sessionToken) {
     if (this.hasDeadWrapper()) {
-      dump("this._window or this.__DOM_IMPL__ is a dead wrapper.");
+      dump("this.window or this.__DOM_IMPL__ is a dead wrapper.");
       return false;
     }
 
@@ -517,7 +578,7 @@
     this.nfcTag = null;
 
     debug("fire ontaglost " + sessionToken);
-    let event = new this._window.Event("taglost");
+    let event = new this.window.Event("taglost");
     this.__DOM_IMPL__.dispatchEvent(event);
 
     return true;
@@ -536,7 +597,7 @@
    */
   handlePeerFound: function handlePeerFound(sessionToken, isPeerReady) {
     if (this.hasDeadWrapper()) {
-      dump("this._window or this.__DOM_IMPL__ is a dead wrapper.");
+      dump("this.window or this.__DOM_IMPL__ is a dead wrapper.");
       return false;
     }
 
@@ -551,8 +612,8 @@
       return false;
     }
 
-    let peerImpl = new MozNFCPeerImpl(this._window, sessionToken);
-    this.nfcPeer = this._window.MozNFCPeer._create(this._window, peerImpl);
+    let peerImpl = new MozNFCPeerImpl(this.window, sessionToken);
+    this.nfcPeer = this.window.MozNFCPeer._create(this.window, peerImpl);
 
     let eventType;
     let eventData = {
@@ -567,7 +628,7 @@
     }
 
     debug("fire on" + eventType + " " + sessionToken);
-    let event = new this._window.MozNFCPeerEvent(eventType, eventData);
+    let event = new this.window.MozNFCPeerEvent(eventType, eventData);
     this.__DOM_IMPL__.dispatchEvent(event);
 
     // For peerready we don't take the default action.
@@ -593,7 +654,7 @@
 
   handlePeerLost: function handlePeerLost(sessionToken) {
     if (this.hasDeadWrapper()) {
-      dump("this._window or this.__DOM_IMPL__ is a dead wrapper.");
+      dump("this.window or this.__DOM_IMPL__ is a dead wrapper.");
       return false;
     }
 
@@ -610,7 +671,7 @@
     this.nfcPeer = null;
 
     debug("fire onpeerlost");
-    let event = new this._window.Event("peerlost");
+    let event = new this.window.Event("peerlost");
     this.__DOM_IMPL__.dispatchEvent(event);
 
     return true;
@@ -637,7 +698,7 @@
   },
 
   checkPermissions: function checkPermissions(perms) {
-    let principal = this._window.document.nodePrincipal;
+    let principal = this.window.document.nodePrincipal;
     for (let perm of perms) {
       let permValue =
         Services.perms.testExactPermissionFromPrincipal(principal, perm);
@@ -652,14 +713,15 @@
   },
 
   hasDeadWrapper: function hasDeadWrapper() {
-    return Cu.isDeadWrapper(this._window) || Cu.isDeadWrapper(this.__DOM_IMPL__);
+    return Cu.isDeadWrapper(this.window) || Cu.isDeadWrapper(this.__DOM_IMPL__);
   },
 
   classID: Components.ID("{6ff2b290-2573-11e3-8224-0800200c9a66}"),
   contractID: "@mozilla.org/nfc/manager;1",
   QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports,
                                          Ci.nsIDOMGlobalPropertyInitializer,
-                                         Ci.nsINfcEventListener]),
+                                         Ci.nsINfcEventListener,
+                                         Ci.nsIObserver]),
 };
 
 function NFCSendFileWrapper() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/tests/marionette/head.js firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/tests/marionette/head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/tests/marionette/head.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/tests/marionette/head.js	2015-05-25 20:43:48.000000000 +0000
@@ -194,21 +194,64 @@
 function toggleNFC(enabled) {
   let deferred = Promise.defer();
 
-  let promise;
-  if (enabled) {
-    promise = nfc.startPoll();
-  } else {
-    promise = nfc.powerOff();
-  }
+  // In bug 1109592, nfcd will only run when nfc is enabled.
+  // The way we activate/deactivate nfcd is by using set property "ctl.start" & "ctl.stop".
+  // In emulator it seems sometimes enable/disable NFC too quick will cause nfcd won't starat,
+  // So here we use a simple workaround to delay enable or disable for 100ms, bug 1164786 is
+  // created to track this issue.
+  setTimeout(function() {
+    let promise;
+    if (enabled) {
+      promise = nfc.startPoll();
+    } else {
+      promise = nfc.powerOff();
+    }
 
-  promise.then(() => {
+    promise.then(() => {
+      deferred.resolve();
+    }).catch(() => {
+      ok(false, 'operation failed, error ' + req.error.name);
+      deferred.reject();
+      finish();
+    });
+  }, 100);
+
+  return deferred.promise;
+}
+
+function activateAndwaitForTechDiscovered(re) {
+  let deferred = Promise.defer();
+
+  sysMsgHelper.waitForTechDiscovered(function() {
+    deferred.resolve();
+  });
+
+  NCI.activateRE(re);
+
+  return deferred.promise;
+}
+
+function deactivateAndWaitForTechLost() {
+  let deferred = Promise.defer();
+
+  sysMsgHelper.waitForTechLost(function() {
     deferred.resolve();
-  }).catch(() => {
-    ok(false, 'operation failed, error ' + req.error.name);
-    deferred.reject();
-    finish();
   });
 
+  NCI.deactivate();
+
+  return deferred.promise;
+}
+
+function deactivateAndWaitForPeerLost() {
+  let deferred = Promise.defer();
+
+  nfc.onpeerlost = function() {
+    deferred.resolve();
+  };
+
+  NCI.deactivate();
+
   return deferred.promise;
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/tests/marionette/test_nfc_checkP2PRegistration.js firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/tests/marionette/test_nfc_checkP2PRegistration.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/tests/marionette/test_nfc_checkP2PRegistration.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/tests/marionette/test_nfc_checkP2PRegistration.js	2015-05-25 20:43:48.000000000 +0000
@@ -6,7 +6,7 @@
 /* globals log, is, ok, runTests, toggleNFC, runNextTest,
    SpecialPowers, nfc */
 
-const MARIONETTE_TIMEOUT = 30000;
+const MARIONETTE_TIMEOUT = 60000;
 const MARIONETTE_HEAD_JS = 'head.js';
 
 const MANIFEST_URL = 'app://system.gaiamobile.org/manifest.webapp';
@@ -18,7 +18,7 @@
  */
 function testNoTargetNoSessionToken() {
   log('testNoTargetNoSessionToken');
-  fireCheckP2PReg(MANIFEST_URL)
+  nfc.checkP2PRegistration(MANIFEST_URL)
   .then((result) => {
     is(result, false, 'No target, no sesionToken, result should be false');
     runNextTest();
@@ -33,7 +33,7 @@
 function testWithTargetNoSessionToken() {
   log('testWithTargetNoSessionToken');
   registerOnpeerready()
-  .then(() => fireCheckP2PReg(MANIFEST_URL))
+  .then(() => nfc.checkP2PRegistration(MANIFEST_URL))
   .then((result) => {
     is(result, false,
       'session token is available and it shouldnt be');
@@ -50,13 +50,13 @@
 function testWithSessionTokenWithTarget() {
   log('testWithSessionTokenWithTarget');
   toggleNFC(true)
-  .then(() => NCI.activateRE(emulator.P2P_RE_INDEX_0))
+  .then(() => activateAndwaitForTechDiscovered(emulator.P2P_RE_INDEX_0))
   .then(registerOnpeerready)
-  .then(() => fireCheckP2PReg(MANIFEST_URL))
+  .then(() => nfc.checkP2PRegistration(MANIFEST_URL))
   .then((result) => {
     is(result, true, 'should be true, onpeerready reg, sessionToken set');
     nfc.onpeerready = null;
-    return toggleNFC(false);
+    return deactivateAndWaitForTechLost().then(() => toggleNFC(false));
   })
   .then(runNextTest)
   .catch(handleRejectedPromiseWithNfcOn);
@@ -69,12 +69,12 @@
 function testWithSessionTokenNoTarget() {
   log('testWithSessionTokenNoTarget');
   toggleNFC(true)
-  .then(() => NCI.activateRE(emulator.P2P_RE_INDEX_0))
-  .then(() => fireCheckP2PReg(MANIFEST_URL))
+  .then(() => activateAndwaitForTechDiscovered(emulator.P2P_RE_INDEX_0))
+  .then(() => nfc.checkP2PRegistration(MANIFEST_URL))
   .then((result) => {
     is(result, false,
       'session token  avilable but onpeerready not registered');
-    return toggleNFC(false);
+    return deactivateAndWaitForTechLost().then(() => toggleNFC(false));
   })
   .then(runNextTest)
   .catch(handleRejectedPromiseWithNfcOn);
@@ -87,13 +87,13 @@
 function testWithSessionTokenWrongTarget() {
   log('testWithSessionTokenWrongTarget');
   toggleNFC(true)
-  .then(() => NCI.activateRE(emulator.P2P_RE_INDEX_0))
+  .then(() => activateAndwaitForTechDiscovered(emulator.P2P_RE_INDEX_0))
   .then(registerOnpeerready)
-  .then(() => fireCheckP2PReg(FAKE_MANIFEST_URL))
+  .then(() => nfc.checkP2PRegistration(FAKE_MANIFEST_URL))
   .then((result) => {
     is(result, false, 'should be false, fake manifest, sessionToken set');
     nfc.onpeerready = null;
-    return toggleNFC(false);
+    return deactivateAndWaitForTechLost().then(() => toggleNFC(false));
   })
   .then(runNextTest)
   .catch(handleRejectedPromiseWithNfcOn);
@@ -108,21 +108,6 @@
   return d.promise;
 }
 
-function fireCheckP2PReg(manifestUrl) {
-  let deferred = Promise.defer();
-
-  let promise = nfc.checkP2PRegistration(manifestUrl);
-  promise.then(() => {
-    ok(true, 'checkP2PRegistration allways results in success');
-    deferred.resolve(request.result);
-  }).catch(() => {
-    ok(false, 'see NfcContentHelper.handleCheckP2PRegistrationResponse');
-    deferred.reject();
-  });
-
-  return deferred.promise;
-}
-
 function handleRejectedPromise() {
    ok(false, 'Promise rejected. This should not happen');
    nfc.onpeerready = null;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/tests/marionette/test_nfc_error_messages.js firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/tests/marionette/test_nfc_error_messages.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/tests/marionette/test_nfc_error_messages.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/tests/marionette/test_nfc_error_messages.js	2015-05-25 20:43:48.000000000 +0000
@@ -25,8 +25,9 @@
 function testNfcNotEnabledError() {
   log('testNfcNotEnabledError');
   toggleNFC(true)
-  .then(() => NCI.activateRE(emulator.P2P_RE_INDEX_0))
+  .then(() => activateAndwaitForTechDiscovered(emulator.P2P_RE_INDEX_0))
   .then(registerAndFireOnpeerready)
+  .then(() => deactivateAndWaitForPeerLost())
   .then(() => toggleNFC(false))
   .then(() => sendNDEFExpectError(nfcPeers[0]))
   .then(endTest)
@@ -43,13 +44,14 @@
 function testNfcBadSessionIdError() {
   log('testNfcBadSessionIdError');
   toggleNFC(true)
-  .then(() => NCI.activateRE(emulator.P2P_RE_INDEX_0))
+  .then(() => activateAndwaitForTechDiscovered(emulator.P2P_RE_INDEX_0))
   .then(registerAndFireOnpeerready)
   .then(() => NCI.deactivate())
-  .then(() => NCI.activateRE(emulator.P2P_RE_INDEX_0))
+  .then(() => activateAndwaitForTechDiscovered(emulator.P2P_RE_INDEX_0))
   .then(registerAndFireOnpeerready)
   // we have 2 peers in nfcPeers array, peer0 has old/invalid session token
   .then(() => sendNDEFExpectError(nfcPeers[0]))
+  .then(() => deactivateAndWaitForPeerLost())
   .then(() => toggleNFC(false))
   .then(endTest)
   .catch(handleRejectedPromise);
@@ -65,7 +67,7 @@
 
   let techDiscoveredHandler = function(msg) {
     ok('Message handler for nfc-manager-tech-discovered');
-    is(msg.type, 'techDiscovered');
+    ok(msg.peer, 'check for correct tech type');
     is(msg.errorMsg, undefined, 'Should not get error msg in tech discovered');
 
     setAndFireTechLostHandler()
@@ -108,13 +110,13 @@
 function sendNDEFExpectError(peer) {
   let deferred = Promise.defer();
 
-  try {
-    peer.sendNDEF(NDEF_MESSAGE);
+  peer.sendNDEF(NDEF_MESSAGE)
+  .then(() => {
     deferred.reject();
-  } catch (e) {
+  }).catch((e) => {
     ok(true, 'this should happen ' + e);
     deferred.resolve();
-  }
+  });
 
   return deferred.promise;
 }
@@ -124,7 +126,6 @@
 
   let techLostHandler = function(msg) {
     ok('Message handler for nfc-manager-tech-lost');
-    is(msg.type, 'techLost');
     is(msg.errorMsg, undefined, 'Should not get error msg in tech lost');
 
     deferred.resolve();
@@ -139,7 +140,8 @@
 
 let tests = [
   testNfcNotEnabledError,
-  testNfcBadSessionIdError,
+// This testcase is temporarily removed due to Bug 1055959, will reopen when it is fixed
+//  testNfcBadSessionIdError
   testNoErrorInTechMsg
 ];
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/tests/marionette/test_nfc_manager_tech_discovered.js firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/tests/marionette/test_nfc_manager_tech_discovered.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/tests/marionette/test_nfc_manager_tech_discovered.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/tests/marionette/test_nfc_manager_tech_discovered.js	2015-05-25 20:43:48.000000000 +0000
@@ -1,14 +1,13 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-MARIONETTE_TIMEOUT = 30000;
+MARIONETTE_TIMEOUT = 60000;
 MARIONETTE_HEAD_JS = 'head.js';
 
 function handleTechnologyDiscoveredRE0(msg) {
   log('Received \'nfc-manager-tech-discovered\'');
-  is(msg.type, 'techDiscovered', 'check for correct message type');
-  is(msg.isP2P, 'P2P', 'check for correct tech type');
-  toggleNFC(false).then(runNextTest);
+  ok(msg.peer, 'check for correct tech type');
+  deactivateAndWaitForTechLost().then(() => toggleNFC(false)).then(runNextTest);
 }
 
 function testActivateRE0() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/tests/marionette/test_nfc_manager_tech_discovered_ndef.js firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/tests/marionette/test_nfc_manager_tech_discovered_ndef.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/tests/marionette/test_nfc_manager_tech_discovered_ndef.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/tests/marionette/test_nfc_manager_tech_discovered_ndef.js	2015-05-25 20:43:48.000000000 +0000
@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-MARIONETTE_TIMEOUT = 30000;
+MARIONETTE_TIMEOUT = 60000;
 MARIONETTE_HEAD_JS = 'head.js';
 
 let tnf = NDEF.TNF_WELL_KNOWN;
@@ -18,13 +18,12 @@
                                  type: NfcUtils.fromUTF8(type),
                                  payload: NfcUtils.fromUTF8(payload)})];
   NDEF.compare(ndef, msg.records);
-  toggleNFC(false).then(runNextTest);
+  deactivateAndWaitForTechLost().then(() => toggleNFC(false)).then(runNextTest);
 }
 
 function handleTechnologyDiscoveredRE0(msg) {
   log("Received 'nfc-manager-tech-discovered'");
-  is(msg.type, "techDiscovered", "check for correct message type");
-  is(msg.isP2P, "P2P", "check for correct tech type");
+  ok(msg.peer, "check for correct tech type");
 
   sysMsgHelper.waitForTechDiscovered(handleSnep);
   SNEP.put(SNEP.SAP_NDEF, SNEP.SAP_NDEF, 0, tnf, btoa(type), btoa(id), btoa(payload));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/tests/marionette/test_nfc_manager_tech_lost.js firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/tests/marionette/test_nfc_manager_tech_lost.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/tests/marionette/test_nfc_manager_tech_lost.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/tests/marionette/test_nfc_manager_tech_lost.js	2015-05-25 20:43:48.000000000 +0000
@@ -6,15 +6,14 @@
 
 function handleTechnologyLost(msg) {
   log('Received \'nfc-manager-tech-lost\'');
-  is(msg.type, 'techLost', 'check for correct message type');
+  ok(true);
 
   toggleNFC(false).then(runNextTest)
 }
 
 function handleTechnologyDiscoveredRE0(msg) {
   log('Received \'nfc-manager-tech-discovered\'');
-  is(msg.type, 'techDiscovered', 'check for correct message type');
-  is(msg.isP2P, 'P2P', 'check for correct tech type');
+  ok(msg.peer, 'check for correct tech type');
 
   NCI.deactivate();
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/tests/marionette/test_nfc_peer.js firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/tests/marionette/test_nfc_peer.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/tests/marionette/test_nfc_peer.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/tests/marionette/test_nfc_peer.js	2015-05-25 20:43:48.000000000 +0000
@@ -28,8 +28,7 @@
 
 function handleTechnologyDiscoveredRE0(msg) {
   log("Received \'nfc-manager-tech-discovered\'");
-  is(msg.type, "techDiscovered", "check for correct message type");
-  is(msg.isP2P, "P2P", "check for correct tech type");
+  ok(msg.peer, "check for correct tech type");
 
   nfc.onpeerready = peerReadyCb;
   nfc.onpeerlost = peerLostCb;
@@ -39,19 +38,13 @@
 
 function handleTechnologyDiscoveredRE0ForP2PRegFailure(msg) {
   log("Received \'nfc-manager-tech-discovered\'");
-  is(msg.type, "techDiscovered", "check for correct message type");
-  is(msg.isP2P, "P2P", "check for correct tech type");
+  ok(msg.peer, "check for correct tech type");
 
   nfc.onpeerready = peerReadyCb;
 
-  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);
-  }).catch(() => {
-    ok(false, "checkP2PRegistration failed.");
+  nfc.checkP2PRegistration(INCORRECT_MANIFEST_URL)
+  .then((result) => {
+    is(result, false, "check for P2P registration result");
 
     nfc.onpeerready = null;
     NCI.deactivate().then(() => toggleNFC(false)).then(runNextTest);
@@ -150,19 +143,19 @@
 
   nfc.onpeerlost = function () {
     log("testPeerShouldThrow peerlost");
-    try {
-      peer.sendNDEF(ndef);
+    peer.sendNDEF(ndef)
+    .then(() => {
       ok(false, "sendNDEF should throw error");
-    } catch (e) {
+    }).catch((e) => {
       ok(true, "Exception expected " + e);
-    }
+    });
 
-    try {
-      peer.sendFile(new Blob());
+    peer.sendFile(new Blob())
+    .then(() => {
       ok(false, "sendfile should throw error");
-    } catch (e) {
+    }).catch((e) => {
       ok(true, "Exception expected" + e);
-    }
+    });
 
     nfc.onpeerready = null;
     nfc.onpeerlost = null;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/tests/marionette/test_nfc_peer_sendFile.js firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/tests/marionette/test_nfc_peer_sendFile.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/tests/marionette/test_nfc_peer_sendFile.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/tests/marionette/test_nfc_peer_sendFile.js	2015-05-25 20:43:48.000000000 +0000
@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-MARIONETTE_TIMEOUT = 30000;
+MARIONETTE_TIMEOUT = 60000;
 MARIONETTE_HEAD_JS = "head.js";
 
 let MANIFEST_URL = "app://system.gaiamobile.org/manifest.webapp";
@@ -23,16 +23,14 @@
   };
 
   sysMsgHelper.waitForTechDiscovered(function(msg) {
-    let request = nfc.checkP2PRegistration(MANIFEST_URL);
-    request.onsuccess = function(evt) {
-      is(request.result, true, "check for P2P registration result");
-      nfc.notifyUserAcceptedP2P(MANIFEST_URL);
-    }
-
-    request.onerror = function() {
-      ok(false, "checkP2PRegistration failed.");
-      toggleNFC(false).then(runNextTest);
-    }
+    nfc.checkP2PRegistration(MANIFEST_URL).then(result => {
+      if (result) {
+        nfc.notifyUserAcceptedP2P(MANIFEST_URL);
+      } else {
+        ok(false, "checkP2PRegistration failed.");
+        deactivateAndWaitForTechLost().then(() => toggleNFC(false)).then(runNextTest);
+      }
+    });
   });
 
   toggleNFC(true).then(() => NCI.activateRE(emulator.P2P_RE_INDEX_0));
@@ -43,6 +41,5 @@
 ];
 
 SpecialPowers.pushPermissions(
-  [{"type": "nfc", "allow": true,
-                   "read": true, 'write': true, context: document},
+  [{"type": "nfc-share", "allow": true, context: document},
    {"type": "nfc-manager", 'allow': true, context: document}], runTests);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/tests/marionette/test_nfc_peer_sendndef.js firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/tests/marionette/test_nfc_peer_sendndef.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/tests/marionette/test_nfc_peer_sendndef.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/tests/marionette/test_nfc_peer_sendndef.js	2015-05-25 20:43:48.000000000 +0000
@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-MARIONETTE_TIMEOUT = 30000;
+MARIONETTE_TIMEOUT = 60000;
 MARIONETTE_HEAD_JS = "head.js";
 
 let url = "https://www.example.com";
@@ -21,18 +21,17 @@
     emulator.run(cmd, function(result) {
       is(result.pop(), "OK", "check SNEP PUT result");
       NDEF.compare(ndef, NDEF.parseString(result.pop()));
-      toggleNFC(false).then(runNextTest);
+      deactivateAndWaitForTechLost().then(() => toggleNFC(false)).then(runNextTest);
     });
   }).catch(() => {
     ok(false, "Failed to send NDEF message, error \'" + this.error + "\'");
-    toggleNFC(false).then(runNextTest);
+    deactivateAndWaitForTechLost().then(() => toggleNFC(false)).then(runNextTest);
   });
 }
 
 function handleTechnologyDiscoveredRE0(msg) {
   log("Received \'nfc-manager-tech-discovered\' " + JSON.stringify(msg));
-  is(msg.type, "techDiscovered", "check for correct message type");
-  is(msg.isP2P, "check for \'P2P\' in tech list");
+  ok(msg.peer, "techDiscovered", "check for correct message type");
   sendNDEF(msg.peer);
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/tests/marionette/test_nfc_read_tag.js firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/tests/marionette/test_nfc_read_tag.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/nfc/tests/marionette/test_nfc_read_tag.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/nfc/tests/marionette/test_nfc_read_tag.js	2015-05-25 20:43:48.000000000 +0000
@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-MARIONETTE_TIMEOUT = 30000;
+MARIONETTE_TIMEOUT = 60000;
 MARIONETTE_HEAD_JS = "head.js";
 
 let url = "http://www.mozilla.org";
@@ -16,16 +16,16 @@
 
   sysMsgHelper.waitForTechDiscovered(function(msg) {
     log("Received \'nfc-manager-tech-ndiscovered\'");
-    is(msg.type, "techDiscovered", "check for correct message type");
+    ok(msg.peer === undefined, "peer object should be undefined");
 
-    let records = Cu.waiveXrays(msg.records);
+    let records = msg.records;
     ok(records.length > 0);
 
     is(tnf, records[0].tnf, "check for TNF field in NDEF");
-    is(type, NfcUtils.toUTF8(records[0].type), "check for type field in NDEF");
-    is(payload, NfcUtils.toUTF8(records[0].payload), "check for payload field in NDEF");
+    is(type, NfcUtils.toUTF8(Cu.waiveXrays(records[0].type)), "check for type field in NDEF");
+    is(payload, NfcUtils.toUTF8(Cu.waiveXrays(records[0].payload)), "check for payload field in NDEF");
 
-    toggleNFC(false).then(runNextTest);
+    deactivateAndWaitForTechLost().then(() => toggleNFC(false)).then(runNextTest);
   });
 
   toggleNFC(true)
@@ -38,12 +38,12 @@
 
   sysMsgHelper.waitForTechDiscovered(function(msg) {
     log("Received \'nfc-manager-tech-ndiscovered\'");
-    is(msg.type, "techDiscovered", "check for correct message type");
+    ok(msg.peer === undefined, "peer object should be undefined");
 
     let records = msg.records;
     ok(records == null);
 
-    toggleNFC(false).then(runNextTest);
+    deactivateAndWaitForTechLost().then(() => toggleNFC(false)).then(runNextTest);
   });
 
   toggleNFC(true)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/notification/Notification.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/notification/Notification.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/notification/Notification.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/notification/Notification.cpp	2015-05-25 20:43:48.000000000 +0000
@@ -91,7 +91,7 @@
     notification->SetStoredState(true);
 
     JSAutoCompartment ac(aCx, mGlobal);
-    JS::Rooted<JSObject*> element(aCx, notification->WrapObject(aCx, JS::NullPtr()));
+    JS::Rooted<JSObject*> element(aCx, notification->WrapObject(aCx, nullptr));
     NS_ENSURE_TRUE(element, NS_ERROR_FAILURE);
 
     JS::Rooted<JSObject*> notifications(aCx, mNotifications);
@@ -384,7 +384,6 @@
   }
 
   if (!strcmp("alertclickcallback", aTopic)) {
-
     nsCOMPtr<nsIDOMEvent> event;
     NS_NewDOMEvent(getter_AddRefs(event), mNotification, nullptr, nullptr);
     nsresult rv = event->InitEvent(NS_LITERAL_STRING("click"), false, true);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/notification/NotificationDB.jsm firefox-trunk-41.0~a1~hg20150524r245419/dom/notification/NotificationDB.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/notification/NotificationDB.jsm	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/notification/NotificationDB.jsm	2015-05-25 20:43:48.000000000 +0000
@@ -24,6 +24,10 @@
                                    "@mozilla.org/parentprocessmessagemanager;1",
                                    "nsIMessageListenerManager");
 
+XPCOMUtils.defineLazyServiceGetter(this, "notificationStorage",
+                                   "@mozilla.org/notificationStorage;1",
+                                   "nsINotificationStorage");
+
 const NOTIFICATION_STORE_DIR = OS.Constants.Path.profileDir;
 const NOTIFICATION_STORE_PATH =
         OS.Path.join(NOTIFICATION_STORE_DIR, "notificationstore.json");
@@ -77,14 +81,29 @@
     }
   },
 
+  filterNonAppNotifications: function(notifications) {
+    let origins = Object.keys(notifications);
+    for (let origin of origins) {
+      let canPut = notificationStorage.canPut(origin);
+      if (!canPut) {
+        if (DEBUG) debug("Origin " + origin + " is not linked to an app manifest, deleting.");
+	delete notifications[origin];
+      }
+    }
+    return notifications;
+  },
+
   // Attempt to read notification file, if it's not there we will create it.
   load: function() {
     var promise = OS.File.read(NOTIFICATION_STORE_PATH, { encoding: "utf-8"});
     return promise.then(
       function onSuccess(data) {
         if (data.length > 0) {
-          this.notifications = JSON.parse(data);
+	  // Preprocessing phase intends to cleanly separate any migration-related
+          // tasks.
+	  this.notifications = this.filterNonAppNotifications(JSON.parse(data));
         }
+
         // populate the list of notifications by tag
         if (this.notifications) {
           for (var origin in this.notifications) {
@@ -97,6 +116,7 @@
             }
           }
         }
+
         this.loaded = true;
       }.bind(this),
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/notification/NotificationStorage.js firefox-trunk-41.0~a1~hg20150524r245419/dom/notification/NotificationStorage.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/notification/NotificationStorage.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/notification/NotificationStorage.js	2015-05-25 20:43:48.000000000 +0000
@@ -23,6 +23,10 @@
                                    "@mozilla.org/childprocessmessagemanager;1",
                                    "nsIMessageSender");
 
+XPCOMUtils.defineLazyServiceGetter(this, "appsService",
+                                   "@mozilla.org/AppsService;1",
+                                   "nsIAppsService");
+
 const kMessageNotificationGetAllOk = "Notification:GetAll:Return:OK";
 const kMessageNotificationGetAllKo = "Notification:GetAll:Return:KO";
 const kMessageNotificationSaveKo   = "Notification:Save:Return:KO";
@@ -45,6 +49,7 @@
   this._requestCount = 0;
 
   Services.obs.addObserver(this, "xpcom-shutdown", false);
+
   // Register for message listeners.
   this.registerListeners();
 }
@@ -65,12 +70,19 @@
 
   observe: function(aSubject, aTopic, aData) {
     if (DEBUG) debug("Topic: " + aTopic);
-    if (aTopic == "xpcom-shutdown") {
+    if (aTopic === "xpcom-shutdown") {
       Services.obs.removeObserver(this, "xpcom-shutdown");
       this.unregisterListeners();
     }
   },
 
+  canPut: function(aOrigin) {
+    if (DEBUG) debug("Querying appService for: " + aOrigin);
+    let rv = !!appsService.getAppByManifestURL(aOrigin);
+    if (DEBUG) debug("appService returned: " + rv);
+    return rv;
+  },
+
   put: function(origin, id, title, dir, lang, body, tag, icon, alertName,
                 data, behavior) {
     if (DEBUG) { debug("PUT: " + id + ": " + title); }
@@ -105,10 +117,12 @@
       this._byTag[origin][tag] = notification;
     };
 
-    cpmm.sendAsyncMessage("Notification:Save", {
-      origin: origin,
-      notification: notification
-    });
+    if (this.canPut(origin)) {
+      cpmm.sendAsyncMessage("Notification:Save", {
+        origin: origin,
+        notification: notification
+      });
+    }
   },
 
   get: function(origin, tag, callback) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/phonenumberutils/tests/test_phonenumberutils_basics.html firefox-trunk-41.0~a1~hg20150524r245419/dom/phonenumberutils/tests/test_phonenumberutils_basics.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/phonenumberutils/tests/test_phonenumberutils_basics.html	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/phonenumberutils/tests/test_phonenumberutils_basics.html	2015-05-25 20:43:48.000000000 +0000
@@ -22,7 +22,7 @@
 "use strict";
 
 var mozPhoneNumberService = window.navigator.mozPhoneNumberService;
-ise(mozPhoneNumberService, undefined, "mozPhoneNumberService should not be accessible");
+is(mozPhoneNumberService, undefined, "mozPhoneNumberService should not be accessible");
 </script>
 </pre>
 </body>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/base/nsJSNPRuntime.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/base/nsJSNPRuntime.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/base/nsJSNPRuntime.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/base/nsJSNPRuntime.cpp	2015-05-25 20:43:49.000000000 +0000
@@ -83,7 +83,7 @@
 static bool sJSObjWrappersAccessible = false;
 
 // Hash of NPObject wrappers that wrap NPObjects as JSObjects.
-static PLDHashTable sNPObjWrappers;
+static PLDHashTable2* sNPObjWrappers;
 
 // Global wrapper count. This includes JSObject wrappers *and*
 // NPObject wrappers. When this count goes to zero, there are no more
@@ -401,23 +401,24 @@
 static bool
 CreateNPObjWrapperTable()
 {
-  MOZ_ASSERT(!sNPObjWrappers.IsInitialized());
+  MOZ_ASSERT(!sNPObjWrappers);
 
   if (!RegisterGCCallbacks()) {
     return false;
   }
 
-  PL_DHashTableInit(&sNPObjWrappers, PL_DHashGetStubOps(),
-                    sizeof(NPObjWrapperHashEntry));
+  sNPObjWrappers =
+    new PLDHashTable2(PL_DHashGetStubOps(), sizeof(NPObjWrapperHashEntry));
   return true;
 }
 
 static void
 DestroyNPObjWrapperTable()
 {
-  MOZ_ASSERT(sNPObjWrappers.EntryCount() == 0);
+  MOZ_ASSERT(sNPObjWrappers->EntryCount() == 0);
 
-  PL_DHashTableFinish(&sNPObjWrappers);
+  delete sNPObjWrappers;
+  sNPObjWrappers = nullptr;
 }
 
 static void
@@ -436,7 +437,7 @@
       DestroyJSObjWrapperTable();
     }
 
-    if (sNPObjWrappers.IsInitialized()) {
+    if (sNPObjWrappers) {
       // No more wrappers, and our hash was initialized. Finish the
       // hash to prevent leaking it.
       DestroyNPObjWrapperTable();
@@ -1761,8 +1762,8 @@
 {
   NPObject *npobj = (NPObject *)::JS_GetPrivate(obj);
   if (npobj) {
-    if (sNPObjWrappers.IsInitialized()) {
-      PL_DHashTableRemove(&sNPObjWrappers, npobj);
+    if (sNPObjWrappers) {
+      PL_DHashTableRemove(sNPObjWrappers, npobj);
     }
   }
 
@@ -1777,7 +1778,7 @@
   // The wrapper JSObject has been moved, so we need to update the entry in the
   // sNPObjWrappers hash table, if present.
 
-  if (!sNPObjWrappers.IsInitialized()) {
+  if (!sNPObjWrappers) {
     return;
   }
 
@@ -1790,7 +1791,7 @@
   JS::AutoSuppressGCAnalysis nogc;
 
   NPObjWrapperHashEntry *entry = static_cast<NPObjWrapperHashEntry *>
-    (PL_DHashTableSearch(&sNPObjWrappers, npobj));
+    (PL_DHashTableSearch(sNPObjWrappers, npobj));
   MOZ_ASSERT(entry && entry->mJSObj);
   MOZ_ASSERT(entry->mJSObj == old);
   entry->mJSObj = obj;
@@ -1836,14 +1837,14 @@
     return;
   }
 
-  if (!sNPObjWrappers.IsInitialized()) {
+  if (!sNPObjWrappers) {
     // No hash yet (or any more), no used wrappers available.
 
     return;
   }
 
   NPObjWrapperHashEntry *entry = static_cast<NPObjWrapperHashEntry *>
-    (PL_DHashTableSearch(&sNPObjWrappers, npobj));
+    (PL_DHashTableSearch(sNPObjWrappers, npobj));
 
   if (entry && entry->mJSObj) {
     // Found a live NPObject wrapper, null out its JSObjects' private
@@ -1852,7 +1853,7 @@
     ::JS_SetPrivate(entry->mJSObj, nullptr);
 
     // Remove the npobj from the hash now that it went away.
-    PL_DHashTableRawRemove(&sNPObjWrappers, entry);
+    PL_DHashTableRawRemove(sNPObjWrappers, entry);
 
     // The finalize hook will call OnWrapperDestroyed().
   }
@@ -1886,7 +1887,7 @@
     return nullptr;
   }
 
-  if (!sNPObjWrappers.IsInitialized()) {
+  if (!sNPObjWrappers) {
     // No hash yet (or any more), initialize it.
     if (!CreateNPObjWrapperTable()) {
       return nullptr;
@@ -1894,7 +1895,7 @@
   }
 
   NPObjWrapperHashEntry *entry = static_cast<NPObjWrapperHashEntry *>
-    (PL_DHashTableAdd(&sNPObjWrappers, npobj, fallible));
+    (PL_DHashTableAdd(sNPObjWrappers, npobj, fallible));
 
   if (!entry) {
     // Out of memory
@@ -1916,24 +1917,24 @@
   entry->mNPObj = npobj;
   entry->mNpp = npp;
 
-  uint32_t generation = sNPObjWrappers.Generation();
+  uint32_t generation = sNPObjWrappers->Generation();
 
   // No existing JSObject, create one.
 
   JS::Rooted<JSObject*> obj(cx, ::JS_NewObject(cx, js::Jsvalify(&sNPObjectJSWrapperClass)));
 
-  if (generation != sNPObjWrappers.Generation()) {
+  if (generation != sNPObjWrappers->Generation()) {
       // Reload entry if the JS_NewObject call caused a GC and reallocated
       // the table (see bug 445229). This is guaranteed to succeed.
 
-      NS_ASSERTION(PL_DHashTableSearch(&sNPObjWrappers, npobj),
+      NS_ASSERTION(PL_DHashTableSearch(sNPObjWrappers, npobj),
                    "Hashtable didn't find what we just added?");
   }
 
   if (!obj) {
     // OOM? Remove the stale entry from the hash.
 
-    PL_DHashTableRawRemove(&sNPObjWrappers, entry);
+    PL_DHashTableRawRemove(sNPObjWrappers, entry);
 
     return nullptr;
   }
@@ -1967,10 +1968,10 @@
   NppAndCx *nppcx = reinterpret_cast<NppAndCx *>(arg);
 
   if (entry->mNpp == nppcx->npp) {
-    // Prevent invalidate() and deallocate() from touching the hash
-    // we're enumerating.
-    const PLDHashTableOps *ops = table->Ops();
-    table->SetOps(nullptr);
+    // HACK: temporarily hide the hash we're enumerating so that invalidate()
+    // and deallocate() don't touch it.
+    PLDHashTable2 *tmp = static_cast<PLDHashTable2*>(table);
+    sNPObjWrappers = nullptr;
 
     NPObject *npobj = entry->mNPObj;
 
@@ -1998,7 +1999,7 @@
 
     ::JS_SetPrivate(entry->mJSObj, nullptr);
 
-    table->SetOps(ops);
+    sNPObjWrappers = tmp;
 
     if (sDelayedReleases && sDelayedReleases->RemoveElement(npobj)) {
       OnWrapperDestroyed();
@@ -2039,9 +2040,9 @@
   // Use the safe JSContext here as we're not always able to find the
   // JSContext associated with the NPP any more.
   AutoSafeJSContext cx;
-  if (sNPObjWrappers.IsInitialized()) {
+  if (sNPObjWrappers) {
     NppAndCx nppcx = { npp, cx };
-    PL_DHashTableEnumerate(&sNPObjWrappers,
+    PL_DHashTableEnumerate(sNPObjWrappers,
                            NPObjWrapperPluginDestroyedCallback, &nppcx);
   }
 }
@@ -2074,7 +2075,7 @@
   }
 
   NPObjWrapperHashEntry *entry = static_cast<NPObjWrapperHashEntry *>
-    (PL_DHashTableAdd(&sNPObjWrappers, npobj, fallible));
+    (PL_DHashTableAdd(sNPObjWrappers, npobj, fallible));
 
   if (!entry) {
     return nullptr;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/base/nsNPAPIPlugin.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/base/nsNPAPIPlugin.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/base/nsNPAPIPlugin.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/base/nsNPAPIPlugin.cpp	2015-05-25 20:43:49.000000000 +0000
@@ -2468,10 +2468,10 @@
 
 #ifdef PLUGIN_LOGGING
   for(NPByteRange * range = rangeList; range != nullptr; range = range->next)
-    PR_LOG(nsPluginLogging::gNPNLog,PLUGIN_LOG_NOISY,
+    MOZ_LOG(nsPluginLogging::gNPNLog,PLUGIN_LOG_NOISY,
     ("%i-%i", range->offset, range->offset + range->length - 1));
 
-  PR_LOG(nsPluginLogging::gNPNLog,PLUGIN_LOG_NOISY, ("\n\n"));
+  MOZ_LOG(nsPluginLogging::gNPNLog,PLUGIN_LOG_NOISY, ("\n\n"));
   PR_LogFlush();
 #endif
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/base/nsNPAPIPluginInstance.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/base/nsNPAPIPluginInstance.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/base/nsNPAPIPluginInstance.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/base/nsNPAPIPluginInstance.cpp	2015-05-25 20:43:49.000000000 +0000
@@ -10,7 +10,7 @@
 #include "base/basictypes.h"
 #endif
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prmem.h"
 #include "nscore.h"
 #include "prenv.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/base/nsPluginHost.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/base/nsPluginHost.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/base/nsPluginHost.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/base/nsPluginHost.cpp	2015-05-25 20:43:49.000000000 +0000
@@ -284,9 +284,9 @@
   nsPluginLogging::gNPPLog = PR_NewLogModule(NPP_LOG_NAME);
   nsPluginLogging::gPluginLog = PR_NewLogModule(PLUGIN_LOG_NAME);
 
-  PR_LOG(nsPluginLogging::gNPNLog, PLUGIN_LOG_ALWAYS,("NPN Logging Active!\n"));
-  PR_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_ALWAYS,("General Plugin Logging Active! (nsPluginHost::ctor)\n"));
-  PR_LOG(nsPluginLogging::gNPPLog, PLUGIN_LOG_ALWAYS,("NPP Logging Active!\n"));
+  MOZ_LOG(nsPluginLogging::gNPNLog, PLUGIN_LOG_ALWAYS,("NPN Logging Active!\n"));
+  MOZ_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_ALWAYS,("General Plugin Logging Active! (nsPluginHost::ctor)\n"));
+  MOZ_LOG(nsPluginLogging::gNPPLog, PLUGIN_LOG_ALWAYS,("NPP Logging Active!\n"));
 
   PLUGIN_LOG(PLUGIN_LOG_ALWAYS,("nsPluginHost::ctor\n"));
   PR_LogFlush();
@@ -789,7 +789,7 @@
   if (aURL)
     aURL->GetAsciiSpec(urlSpec);
 
-  PR_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_NORMAL,
+  MOZ_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_NORMAL,
         ("nsPluginHost::InstantiatePlugin Begin mime=%s, url=%s\n",
          PromiseFlatCString(aMimeType).get(), urlSpec.get()));
 
@@ -852,7 +852,7 @@
   nsAutoCString urlSpec2;
   if (aURL != nullptr) aURL->GetAsciiSpec(urlSpec2);
 
-  PR_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_NORMAL,
+  MOZ_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_NORMAL,
         ("nsPluginHost::InstantiatePlugin Finished mime=%s, rv=%d, url=%s\n",
          PromiseFlatCString(aMimeType).get(), rv, urlSpec2.get()));
 
@@ -930,7 +930,7 @@
   nsAutoCString urlSpec;
   if (aURL != nullptr) aURL->GetSpec(urlSpec);
 
-  PR_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_NORMAL,
+  MOZ_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_NORMAL,
         ("nsPluginHost::TrySetupPluginInstance Begin mime=%s, owner=%p, url=%s\n",
          PromiseFlatCString(aMimeType).get(), aOwner, urlSpec.get()));
 
@@ -993,7 +993,7 @@
   if (aURL)
     aURL->GetSpec(urlSpec2);
 
-  PR_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_BASIC,
+  MOZ_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_BASIC,
         ("nsPluginHost::TrySetupPluginInstance Finished mime=%s, rv=%d, owner=%p, url=%s\n",
          PromiseFlatCString(aMimeType).get(), rv, aOwner, urlSpec2.get()));
 
@@ -2967,7 +2967,7 @@
       tag->ImportFlagsToPrefs(tagflag);
     }
 
-    PR_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_BASIC,
+    MOZ_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_BASIC,
       ("LoadCachedPluginsInfo : Loading Cached plugininfo for %s\n", tag->mFileName.get()));
     tag->mNext = mCachedPlugins;
     mCachedPlugins = tag;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/base/nsPluginLogging.h firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/base/nsPluginLogging.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/base/nsPluginLogging.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/base/nsPluginLogging.h	2015-05-25 20:43:49.000000000 +0000
@@ -8,7 +8,7 @@
 #ifndef nsPluginLogging_h__
 #define nsPluginLogging_h__
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #ifndef PLUGIN_LOGGING    // allow external override
 #define PLUGIN_LOGGING 1  // master compile-time switch for pluging logging
@@ -60,7 +60,7 @@
 #ifdef PLUGIN_LOGGING
  #define NPN_PLUGIN_LOG(a, b)                              \
    PR_BEGIN_MACRO                                        \
-   PR_LOG(nsPluginLogging::gNPNLog, a, b); \
+   MOZ_LOG(nsPluginLogging::gNPNLog, a, b); \
    PR_LogFlush();                                                    \
    PR_END_MACRO
 #else
@@ -70,7 +70,7 @@
 #ifdef PLUGIN_LOGGING
  #define NPP_PLUGIN_LOG(a, b)                              \
    PR_BEGIN_MACRO                                         \
-   PR_LOG(nsPluginLogging::gNPPLog, a, b); \
+   MOZ_LOG(nsPluginLogging::gNPPLog, a, b); \
    PR_LogFlush();                                                    \
    PR_END_MACRO
 #else
@@ -80,7 +80,7 @@
 #ifdef PLUGIN_LOGGING
  #define PLUGIN_LOG(a, b)                              \
    PR_BEGIN_MACRO                                         \
-   PR_LOG(nsPluginLogging::gPluginLog, a, b); \
+   MOZ_LOG(nsPluginLogging::gPluginLog, a, b); \
    PR_LogFlush();                                                    \
    PR_END_MACRO
 #else
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/base/nsPluginStreamListenerPeer.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/base/nsPluginStreamListenerPeer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/base/nsPluginStreamListenerPeer.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/base/nsPluginStreamListenerPeer.cpp	2015-05-25 20:43:49.000000000 +0000
@@ -280,7 +280,7 @@
 nsPluginStreamListenerPeer::~nsPluginStreamListenerPeer()
 {
 #ifdef PLUGIN_LOGGING
-  PR_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_NORMAL,
+  MOZ_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_NORMAL,
          ("nsPluginStreamListenerPeer::dtor this=%p, url=%s\n",this, mURLSpec.get()));
 #endif
 
@@ -309,7 +309,7 @@
   nsAutoCString urlSpec;
   if (aURL != nullptr) aURL->GetSpec(urlSpec);
 
-  PR_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_NORMAL,
+  MOZ_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_NORMAL,
          ("nsPluginStreamListenerPeer::Initialize instance=%p, url=%s\n", aInstance, urlSpec.get()));
 
   PR_LogFlush();
@@ -555,7 +555,7 @@
     mContentType = contentType;
 
 #ifdef PLUGIN_LOGGING
-  PR_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_NOISY,
+  MOZ_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_NOISY,
          ("nsPluginStreamListenerPeer::OnStartRequest this=%p request=%p mime=%s, url=%s\n",
           this, request, contentType.get(), mURLSpec.get()));
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/ipc/PluginInstanceChild.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/ipc/PluginInstanceChild.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/ipc/PluginInstanceChild.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/ipc/PluginInstanceChild.cpp	2015-05-25 20:43:49.000000000 +0000
@@ -500,7 +500,7 @@
 #endif
 
     default:
-        PR_LOG(GetPluginLog(), PR_LOG_WARNING,
+        MOZ_LOG(GetPluginLog(), PR_LOG_WARNING,
                ("In PluginInstanceChild::NPN_GetValue: Unhandled NPNVariable %i (%s)",
                 (int) aVar, NPNVariableToString(aVar)));
         return NPERR_GENERIC_ERROR;
@@ -529,7 +529,7 @@
 NPError
 PluginInstanceChild::NPN_SetValue(NPPVariable aVar, void* aValue)
 {
-    PR_LOG(GetPluginLog(), PR_LOG_DEBUG, ("%s (aVar=%i, aValue=%p)",
+    MOZ_LOG(GetPluginLog(), PR_LOG_DEBUG, ("%s (aVar=%i, aValue=%p)",
                                       FULLFUNCTION, (int) aVar, aValue));
 
     AssertPluginThread();
@@ -618,7 +618,7 @@
 #endif
 
     default:
-        PR_LOG(GetPluginLog(), PR_LOG_WARNING,
+        MOZ_LOG(GetPluginLog(), PR_LOG_WARNING,
                ("In PluginInstanceChild::NPN_SetValue: Unhandled NPPVariable %i (%s)",
                 (int) aVar, NPPVariableToString(aVar)));
         return NPERR_GENERIC_ERROR;
@@ -2207,7 +2207,7 @@
 bool
 PluginInstanceChild::AnswerSetPluginFocus()
 {
-    PR_LOG(GetPluginLog(), PR_LOG_DEBUG, ("%s", FULLFUNCTION));
+    MOZ_LOG(GetPluginLog(), PR_LOG_DEBUG, ("%s", FULLFUNCTION));
 
 #if defined(OS_WIN)
     // Parent is letting us know the dom set focus to the plugin. Note,
@@ -2230,7 +2230,7 @@
 bool
 PluginInstanceChild::AnswerUpdateWindow()
 {
-    PR_LOG(GetPluginLog(), PR_LOG_DEBUG, ("%s", FULLFUNCTION));
+    MOZ_LOG(GetPluginLog(), PR_LOG_DEBUG, ("%s", FULLFUNCTION));
 
 #if defined(OS_WIN)
     if (mPluginWindowHWND) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/ipc/PluginInstanceParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/ipc/PluginInstanceParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/ipc/PluginInstanceParent.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/ipc/PluginInstanceParent.cpp	2015-05-25 20:43:49.000000000 +0000
@@ -1119,7 +1119,7 @@
 #endif
 
     default:
-        PR_LOG(GetPluginLog(), PR_LOG_WARNING,
+        MOZ_LOG(GetPluginLog(), PR_LOG_WARNING,
                ("In PluginInstanceParent::NPP_GetValue: Unhandled NPPVariable %i (%s)",
                 (int) aVariable, NPPVariableToString(aVariable)));
         return NPERR_GENERIC_ERROR;
@@ -1140,7 +1140,7 @@
 
     default:
         NS_ERROR("Unhandled NPNVariable in NPP_SetValue");
-        PR_LOG(GetPluginLog(), PR_LOG_WARNING,
+        MOZ_LOG(GetPluginLog(), PR_LOG_WARNING,
                ("In PluginInstanceParent::NPP_SetValue: Unhandled NPNVariable %i (%s)",
                 (int) variable, NPNVariableToString(variable)));
         return NPERR_GENERIC_ERROR;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/ipc/PluginInterposeOSX.mm firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/ipc/PluginInterposeOSX.mm
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/ipc/PluginInterposeOSX.mm	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/ipc/PluginInterposeOSX.mm	2015-05-25 20:43:49.000000000 +0000
@@ -38,8 +38,7 @@
 #import <objc/runtime.h>
 #import <Carbon/Carbon.h>
 
-using mozilla::plugins::PluginModuleChild;
-using mozilla::plugins::AssertPluginThread;
+using namespace mozilla::plugins;
 
 namespace mac_plugin_interposing {
 
@@ -544,7 +543,7 @@
 bool NSCursorInfo::GetNativeCursorsSupported()
 {
   if (mNativeCursorsSupported == -1) {
-    AssertPluginThread();
+    ENSURE_PLUGIN_THREAD(false);
     PluginModuleChild *pmc = PluginModuleChild::GetChrome();
     if (pmc) {
       bool result = pmc->GetNativeCursorsSupported();
@@ -689,7 +688,7 @@
 
 void NotifyBrowserOfPluginShowWindow(uint32_t window_id, CGRect bounds,
                                      bool modal) {
-  AssertPluginThread();
+  ENSURE_PLUGIN_THREAD_VOID();
 
   PluginModuleChild *pmc = PluginModuleChild::GetChrome();
   if (pmc)
@@ -697,7 +696,7 @@
 }
 
 void NotifyBrowserOfPluginHideWindow(uint32_t window_id, CGRect bounds) {
-  AssertPluginThread();
+  ENSURE_PLUGIN_THREAD_VOID();
 
   PluginModuleChild *pmc = PluginModuleChild::GetChrome();
   if (pmc)
@@ -706,7 +705,7 @@
 
 void NotifyBrowserOfSetCursor(NSCursorInfo& aCursorInfo)
 {
-  AssertPluginThread();
+  ENSURE_PLUGIN_THREAD_VOID();
   PluginModuleChild *pmc = PluginModuleChild::GetChrome();
   if (pmc) {
     pmc->SetCursor(aCursorInfo);
@@ -715,7 +714,7 @@
 
 void NotifyBrowserOfShowCursor(bool show)
 {
-  AssertPluginThread();
+  ENSURE_PLUGIN_THREAD_VOID();
   PluginModuleChild *pmc = PluginModuleChild::GetChrome();
   if (pmc) {
     pmc->ShowCursor(show);
@@ -724,7 +723,7 @@
 
 void NotifyBrowserOfPushCursor(NSCursorInfo& aCursorInfo)
 {
-  AssertPluginThread();
+  ENSURE_PLUGIN_THREAD_VOID();
   PluginModuleChild *pmc = PluginModuleChild::GetChrome();
   if (pmc) {
     pmc->PushCursor(aCursorInfo);
@@ -733,7 +732,7 @@
 
 void NotifyBrowserOfPopCursor()
 {
-  AssertPluginThread();
+  ENSURE_PLUGIN_THREAD_VOID();
   PluginModuleChild *pmc = PluginModuleChild::GetChrome();
   if (pmc) {
     pmc->PopCursor();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/ipc/PluginMessageUtils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/ipc/PluginMessageUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/ipc/PluginMessageUtils.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/ipc/PluginMessageUtils.h	2015-05-25 20:43:49.000000000 +0000
@@ -20,7 +20,7 @@
 #include "nsAutoPtr.h"
 #include "nsString.h"
 #include "nsTArray.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsHashKeys.h"
 #ifdef MOZ_CRASHREPORTER
 #  include "nsExceptionHandler.h"
@@ -62,9 +62,9 @@
 #define FULLFUNCTION __FUNCTION__
 #endif
 
-#define PLUGIN_LOG_DEBUG(args) PR_LOG(GetPluginLog(), PR_LOG_DEBUG, args)
-#define PLUGIN_LOG_DEBUG_FUNCTION PR_LOG(GetPluginLog(), PR_LOG_DEBUG, ("%s", FULLFUNCTION))
-#define PLUGIN_LOG_DEBUG_METHOD PR_LOG(GetPluginLog(), PR_LOG_DEBUG, ("%s [%p]", FULLFUNCTION, (void*) this))
+#define PLUGIN_LOG_DEBUG(args) MOZ_LOG(GetPluginLog(), PR_LOG_DEBUG, args)
+#define PLUGIN_LOG_DEBUG_FUNCTION MOZ_LOG(GetPluginLog(), PR_LOG_DEBUG, ("%s", FULLFUNCTION))
+#define PLUGIN_LOG_DEBUG_METHOD MOZ_LOG(GetPluginLog(), PR_LOG_DEBUG, ("%s [%p]", FULLFUNCTION, (void*) this))
 
 /**
  * This is NPByteRange without the linked list.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/ipc/PluginModuleParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/ipc/PluginModuleParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/ipc/PluginModuleParent.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/ipc/PluginModuleParent.cpp	2015-05-25 20:43:49.000000000 +0000
@@ -2372,7 +2372,7 @@
 PluginModuleParent::NP_GetValue(void *future, NPPVariable aVariable,
                                    void *aValue, NPError* error)
 {
-    PR_LOG(GetPluginLog(), PR_LOG_WARNING, ("%s Not implemented, requested variable %i", __FUNCTION__,
+    MOZ_LOG(GetPluginLog(), PR_LOG_WARNING, ("%s Not implemented, requested variable %i", __FUNCTION__,
                                         (int) aVariable));
 
     //TODO: implement this correctly
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/ipc/PluginScriptableObjectChild.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/ipc/PluginScriptableObjectChild.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/ipc/PluginScriptableObjectChild.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/ipc/PluginScriptableObjectChild.cpp	2015-05-25 20:43:49.000000000 +0000
@@ -778,7 +778,7 @@
   AutoFallibleTArray<NPVariant, 10> convertedArgs;
   uint32_t argCount = aArgs.Length();
 
-  if (!convertedArgs.SetLength(argCount)) {
+  if (!convertedArgs.SetLength(argCount, mozilla::fallible)) {
     *aResult = void_t();
     *aSuccess = false;
     return true;
@@ -848,7 +848,7 @@
   AutoFallibleTArray<NPVariant, 10> convertedArgs;
   uint32_t argCount = aArgs.Length();
 
-  if (!convertedArgs.SetLength(argCount)) {
+  if (!convertedArgs.SetLength(argCount, mozilla::fallible)) {
     *aResult = void_t();
     *aSuccess = false;
     return true;
@@ -1099,7 +1099,7 @@
   AutoFallibleTArray<NPVariant, 10> convertedArgs;
   uint32_t argCount = aArgs.Length();
 
-  if (!convertedArgs.SetLength(argCount)) {
+  if (!convertedArgs.SetLength(argCount, mozilla::fallible)) {
     *aResult = void_t();
     *aSuccess = false;
     return true;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/ipc/PluginScriptableObjectParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/ipc/PluginScriptableObjectParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/ipc/PluginScriptableObjectParent.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/ipc/PluginScriptableObjectParent.cpp	2015-05-25 20:43:49.000000000 +0000
@@ -824,7 +824,7 @@
   AutoFallibleTArray<NPVariant, 10> convertedArgs;
   uint32_t argCount = aArgs.Length();
 
-  if (!convertedArgs.SetLength(argCount)) {
+  if (!convertedArgs.SetLength(argCount, fallible)) {
     *aResult = void_t();
     *aSuccess = false;
     return true;
@@ -907,7 +907,7 @@
   AutoFallibleTArray<NPVariant, 10> convertedArgs;
   uint32_t argCount = aArgs.Length();
 
-  if (!convertedArgs.SetLength(argCount)) {
+  if (!convertedArgs.SetLength(argCount, fallible)) {
     *aResult = void_t();
     *aSuccess = false;
     return true;
@@ -1227,7 +1227,7 @@
   AutoFallibleTArray<NPVariant, 10> convertedArgs;
   uint32_t argCount = aArgs.Length();
 
-  if (!convertedArgs.SetLength(argCount)) {
+  if (!convertedArgs.SetLength(argCount, fallible)) {
     *aResult = void_t();
     *aSuccess = false;
     return true;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/test/unit/xpcshell.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/test/unit/xpcshell.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/plugins/test/unit/xpcshell.ini	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/plugins/test/unit/xpcshell.ini	2015-05-25 20:43:50.000000000 +0000
@@ -16,6 +16,10 @@
 # Bug 676953: test fails consistently on Android
 fail-if = os == "android"
 [test_persist_in_prefs.js]
+skip-if = appname == "thunderbird"
+reason = plugins are disabled by default in Thunderbird
 [test_bug854467.js]
 [test_plugin_default_state.js]
+skip-if = appname == "thunderbird"
+reason = plugins are disabled by default in Thunderbird
 [test_plugin_default_state_xpi.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/presentation/provider/TCPPresentationServer.js firefox-trunk-41.0~a1~hg20150524r245419/dom/presentation/provider/TCPPresentationServer.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/presentation/provider/TCPPresentationServer.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/presentation/provider/TCPPresentationServer.js	2015-05-25 20:43:50.000000000 +0000
@@ -235,17 +235,21 @@
   onStopListening: function(aServerSocket, aStatus) {
     DEBUG && log("TCPPresentationServer - onStopListening: " + aStatus);
 
-    // manually closed
-    if (aStatus === Cr.NS_BINDING_ABORTED) {
+    if (this._serverSocket) {
+      DEBUG && log("TCPPresentationServer - should be non-manually closed");
+      this.close();
+    } else if (aStatus === Cr.NS_BINDING_ABORTED) {
+      DEBUG && log("TCPPresentationServer - should be manually closed");
       aStatus = Cr.NS_OK;
     }
+
     this._listener && this._listener.onClose(aStatus);
-    this._serverSocket = null;
   },
 
   close: function() {
-    DEBUG && log("TCPPresentationServer - close signalling channel");
+    DEBUG && log("TCPPresentationServer - close");
     if (this._serverSocket) {
+      DEBUG && log("TCPPresentationServer - close server socket");
       this._serverSocket.close();
       this._serverSocket = null;
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/presentation/tests/mochitest/test_presentation_device_info_permission.html firefox-trunk-41.0~a1~hg20150524r245419/dom/presentation/tests/mochitest/test_presentation_device_info_permission.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/presentation/tests/mochitest/test_presentation_device_info_permission.html	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/presentation/tests/mochitest/test_presentation_device_info_permission.html	2015-05-25 20:43:50.000000000 +0000
@@ -17,7 +17,7 @@
 SimpleTest.waitForExplicitFinish();
 
 function runTests() {
-  ise(navigator.mozPresentationDeviceInfo, undefined, 'navigator.mozPresentationDeviceInfo is undefined');
+  is(navigator.mozPresentationDeviceInfo, undefined, 'navigator.mozPresentationDeviceInfo is undefined');
   SimpleTest.finish();
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/presentation/tests/xpcshell/test_tcp_control_channel.js firefox-trunk-41.0~a1~hg20150524r245419/dom/presentation/tests/xpcshell/test_tcp_control_channel.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/presentation/tests/xpcshell/test_tcp_control_channel.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/presentation/tests/xpcshell/test_tcp_control_channel.js	2015-05-25 20:43:50.000000000 +0000
@@ -41,8 +41,7 @@
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationChannelDescription]),
 }
 
-function loopOfferAnser()
-{
+function loopOfferAnser() {
   const CONTROLLER_CONTROL_CHANNEL_PORT = 36777;
   const PRESENTER_CONTROL_CHANNEL_PORT = 36888;
 
@@ -59,8 +58,6 @@
   let controllerDevice, controllerControlChannel;
   let presenterDevice, presenterControlChannel;
 
-  Services.prefs.setBoolPref("dom.presentation.tcp_server.debug", true);
-
   tps = Cc["@mozilla.org/presentation-device/tcp-presentation-server;1"]
         .createInstance(Ci.nsITCPPresentationServer);
   tps.init(null, PRESENTER_CONTROL_CHANNEL_PORT);
@@ -171,20 +168,50 @@
   };
 }
 
-function shutdown()
-{
+function shutdownAndOneMoreLoop() {
+  const PRESENTER_CONTROL_CHANNEL_PORT = 36888;
+
+  let isFirstClose = true;
+  let expectedReason;
   tps.listener = {
     onClose: function(aReason) {
-      Assert.equal(aReason, Cr.NS_OK, 'TCPPresentationServer close success');
-      Services.prefs.clearUserPref("dom.presentation.tcp_server.debug");
-      run_next_test();
+      expectedReason = isFirstClose ? Cr.NS_ERROR_ABORT // non-manually closed
+                                    : Cr.NS_OK;         // manually closed
+      Assert.equal(aReason, expectedReason, 'TCPPresentationServer close as expected');
+      if (isFirstClose){
+        isFirstClose = false;
+        try {
+          tps.init('controllerID', PRESENTER_CONTROL_CHANNEL_PORT);
+          tps.close();
+        } catch (e) {
+          Assert.ok(false, 'TCP presentation init fail:' + e);
+          run_next_test();
+        }
+      } else {
+        run_next_test();
+      }
     },
   }
-  tps.close();
+
+  // A fake event to pretend the server socket is closed non-manually
+  tps.QueryInterface(Ci.nsIServerSocketListener)
+     .onStopListening(null, Cr.NS_ERROR_ABORT);
+}
+
+function setPref() {
+  Services.prefs.setBoolPref("dom.presentation.tcp_server.debug", true);
+  run_next_test();
+}
+
+function clearPref() {
+  Services.prefs.clearUserPref("dom.presentation.tcp_server.debug");
+  run_next_test();
 }
 
+add_test(setPref);
 add_test(loopOfferAnser);
-add_test(shutdown);
+add_test(shutdownAndOneMoreLoop);
+add_test(clearPref);
 
 function run_test() {
   run_next_test();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/promise/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/promise/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/promise/moz.build	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/promise/moz.build	2015-05-25 20:43:50.000000000 +0000
@@ -35,4 +35,5 @@
 MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
 
 MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
-BROWSER_CHROME_MANIFESTS += ['tests/browser.ini']
+
+XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/promise/PromiseCallback.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/promise/PromiseCallback.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/promise/PromiseCallback.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/promise/PromiseCallback.cpp	2015-05-25 20:43:50.000000000 +0000
@@ -285,7 +285,7 @@
       }
 
       JS::Rooted<JS::Value> typeError(aCx);
-      if (!JS::CreateError(aCx, JSEXN_TYPEERR, JS::NullPtr(), fn, lineNumber, 0,
+      if (!JS::CreateError(aCx, JSEXN_TYPEERR, nullptr, fn, lineNumber, 0,
                            nullptr, message, &typeError)) {
         // Out of memory. Promise will stay unresolved.
         JS_ClearPendingException(aCx);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/promise/tests/browser.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/promise/tests/browser.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/promise/tests/browser.ini	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/promise/tests/browser.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-[DEFAULT]
-
-[browser_monitorUncaught.js]
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/promise/tests/browser_monitorUncaught.js firefox-trunk-41.0~a1~hg20150524r245419/dom/promise/tests/browser_monitorUncaught.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/promise/tests/browser_monitorUncaught.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/promise/tests/browser_monitorUncaught.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,266 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-Cu.import("resource://gre/modules/Timer.jsm", this);
-
-add_task(function* test_globals() {
-  Assert.equal(Promise.defer || undefined, undefined, "We are testing DOM Promise.");
-  Assert.notEqual(PromiseDebugging, undefined, "PromiseDebugging is available.");
-});
-
-add_task(function* test_promiseID() {
-  let p1 = new Promise(resolve => {});
-  let p2 = new Promise(resolve => {});
-  let p3 = p2.then(null, null);
-  let promise = [p1, p2, p3];
-
-  let identifiers = promise.map(PromiseDebugging.getPromiseID);
-  info("Identifiers: " + JSON.stringify(identifiers));
-  let idSet = new Set(identifiers);
-  Assert.equal(idSet.size, identifiers.length,
-    "PromiseDebugging.getPromiseID returns a distinct id per promise");
-
-  let identifiers2 = promise.map(PromiseDebugging.getPromiseID);
-  Assert.equal(JSON.stringify(identifiers),
-               JSON.stringify(identifiers2),
-               "Successive calls to PromiseDebugging.getPromiseID return the same id for the same promise");
-});
-
-add_task(function* test_observe_uncaught() {
-  // The names of Promise instances
-  let names = new Map();
-
-  // The results for UncaughtPromiseObserver callbacks.
-  let CallbackResults = function(name) {
-    this.name = name;
-    this.expected = new Set();
-    this.observed = new Set();
-    this.blocker = new Promise(resolve => this.resolve = resolve);
-  };
-  CallbackResults.prototype = {
-    observe: function(promise) {
-      info(this.name + " observing Promise " + names.get(promise));
-      Assert.equal(PromiseDebugging.getState(promise).state, "rejected",
-                   this.name + " observed a rejected Promise");
-      if (!this.expected.has(promise)) {
-        Assert.ok(false,
-            this.name + " observed a Promise that it expected to observe, " +
-            names.get(promise) +
-            " (" + PromiseDebugging.getPromiseID(promise) +
-            ", " + PromiseDebugging.getAllocationStack(promise) + ")");
-
-      }
-      Assert.ok(this.expected.delete(promise),
-                this.name + " observed a Promise that it expected to observe, " +
-                names.get(promise)  + " (" + PromiseDebugging.getPromiseID(promise) + ")");
-      Assert.ok(!this.observed.has(promise),
-                this.name + " observed a Promise that it has not observed yet");
-      this.observed.add(promise);
-      if (this.expected.size == 0) {
-        this.resolve();
-      } else {
-        info(this.name + " is still waiting for " + this.expected.size + " observations:");
-        info(JSON.stringify([names.get(x) for (x of this.expected.values())]));
-      }
-    },
-  };
-
-  let onLeftUncaught = new CallbackResults("onLeftUncaught");
-  let onConsumed = new CallbackResults("onConsumed");
-
-  let observer = {
-    onLeftUncaught: function(promise, data) {
-      onLeftUncaught.observe(promise);
-    },
-    onConsumed: function(promise) {
-      onConsumed.observe(promise);
-    },
-  };
-
-  let resolveLater = function(delay = 20) {
-    return new Promise((resolve, reject) => setTimeout(resolve, delay));
-  };
-  let rejectLater = function(delay = 20) {
-    return new Promise((resolve, reject) => setTimeout(reject, delay));
-  };
-  let makeSamples = function*() {
-    yield {
-      promise: Promise.resolve(0),
-      name: "Promise.resolve",
-    };
-    yield {
-      promise: Promise.resolve(resolve => resolve(0)),
-      name: "Resolution callback",
-    };
-    yield {
-      promise: Promise.resolve(0).then(null, null),
-      name: "`then(null, null)`"
-    };
-    yield {
-      promise: Promise.reject(0).then(null, () => {}),
-      name: "Reject and catch immediately",
-    };
-    yield {
-      promise: resolveLater(),
-      name: "Resolve later",
-    };
-    yield {
-      promise: Promise.reject("Simple rejection"),
-      leftUncaught: true,
-      consumed: false,
-      name: "Promise.reject",
-    };
-
-    // Reject a promise now, consume it later.
-    let p = Promise.reject("Reject now, consume later");
-    setTimeout(() => p.then(null, () => {
-      info("Consumed promise");
-    }), 200);
-    yield {
-      promise: p,
-      leftUncaught: true,
-      consumed: true,
-      name: "Reject now, consume later",
-    };
-
-    yield {
-      promise: Promise.all([
-        Promise.resolve("Promise.all"),
-        rejectLater()
-      ]),
-      leftUncaught: true,
-      name: "Rejecting through Promise.all"
-    };
-    yield {
-      promise: Promise.race([
-        resolveLater(500),
-        Promise.reject(),
-      ]),
-      leftUncaught: true, // The rejection wins the race.
-      name: "Rejecting through Promise.race",
-    };
-    yield {
-      promise: Promise.race([
-        Promise.resolve(),
-        rejectLater(500)
-      ]),
-      leftUncaught: false, // The resolution wins the race.
-      name: "Resolving through Promise.race",
-    };
-
-    let boom = new Error("`throw` in the constructor");
-    yield {
-      promise: new Promise(() => { throw boom; }),
-      leftUncaught: true,
-      name: "Throwing in the constructor",
-    };
-
-    let rejection = Promise.reject("`reject` during resolution");
-    yield {
-      promise: rejection,
-      leftUncaught: false,
-      consumed: false, // `rejection` is consumed immediately (see below)
-      name: "Promise.reject, again",
-    };
-
-    yield {
-      promise: new Promise(resolve => resolve(rejection)),
-      leftUncaught: true,
-      consumed: false,
-      name: "Resolving with a rejected promise",
-    };
-
-    yield {
-      promise: Promise.resolve(0).then(() => rejection),
-      leftUncaught: true,
-      consumed: false,
-      name: "Returning a rejected promise from success handler",
-    };
-
-    yield {
-      promise: Promise.resolve(0).then(() => { throw new Error(); }),
-      leftUncaught: true,
-      consumed: false,
-      name: "Throwing during the call to the success callback",
-    };
-  };
-  let samples = [];
-  for (let s of makeSamples()) {
-    samples.push(s);
-    info("Promise '" + s.name + "' has id " + PromiseDebugging.getPromiseID(s.promise));
-  }
-
-  PromiseDebugging.addUncaughtRejectionObserver(observer);
-
-  for (let s of samples) {
-    names.set(s.promise, s.name);
-    if (s.leftUncaught || false) {
-      onLeftUncaught.expected.add(s.promise);
-    }
-    if (s.consumed || false) {
-      onConsumed.expected.add(s.promise);
-    }
-  }
-
-  info("Test setup, waiting for callbacks.");
-  yield onLeftUncaught.blocker;
-
-  info("All calls to onLeftUncaught are complete.");
-  if (onConsumed.expected.size != 0) {
-    info("onConsumed is still waiting for the following Promise:");
-    info(JSON.stringify([names.get(x) for (x of onConsumed.expected.values())]));
-    yield onConsumed.blocker;
-  }
-
-  info("All calls to onConsumed are complete.");
-  let removed = PromiseDebugging.removeUncaughtRejectionObserver(observer);
-  Assert.ok(removed, "removeUncaughtRejectionObserver succeeded");
-  removed = PromiseDebugging.removeUncaughtRejectionObserver(observer);
-  Assert.ok(!removed, "second call to removeUncaughtRejectionObserver didn't remove anything");
-});
-
-
-add_task(function* test_uninstall_observer() {
-  let Observer = function() {
-    this.blocker = new Promise(resolve => this.resolve = resolve);
-    this.active = true;
-  };
-  Observer.prototype = {
-    set active(x) {
-      this._active = x;
-      if (x) {
-        PromiseDebugging.addUncaughtRejectionObserver(this);
-      } else {
-        PromiseDebugging.removeUncaughtRejectionObserver(this);
-      }
-    },
-    onLeftUncaught: function() {
-      Assert.ok(this._active, "This observer is active.");
-      this.resolve();
-    },
-    onConsumed: function() {
-      Assert.ok(false, "We should not consume any Promise.");
-    },
-  };
-
-  info("Adding an observer.");
-  let deactivate = new Observer();
-  Promise.reject("I am an uncaught rejection.");
-  yield deactivate.blocker;
-  Assert.ok(true, "The observer has observed an uncaught Promise.");
-  deactivate.active = false;
-  info("Removing the observer, it should not observe any further uncaught Promise.");
-
-  info("Rejecting a Promise and waiting a little to give a chance to observers.");
-  let wait = new Observer();
-  Promise.reject("I am another uncaught rejection.");
-  yield wait.blocker;
-  yield new Promise(resolve => setTimeout(resolve, 100));
-  // Normally, `deactivate` should not be notified of the uncaught rejection.
-  wait.active = false;
-
-});
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/promise/tests/test_resolver_return_value.html firefox-trunk-41.0~a1~hg20150524r245419/dom/promise/tests/test_resolver_return_value.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/promise/tests/test_resolver_return_value.html	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/promise/tests/test_resolver_return_value.html	2015-05-25 20:43:50.000000000 +0000
@@ -13,13 +13,13 @@
   /** Test for Bug 1120235 **/
   var res, rej;
   var p = new Promise(function(resolve, reject) { res = resolve; rej = reject; });
-  ise(res(1), undefined, "Resolve function should return undefined");
-  ise(rej(2), undefined, "Reject function should return undefined");
+  is(res(1), undefined, "Resolve function should return undefined");
+  is(rej(2), undefined, "Reject function should return undefined");
 
   var thenable = {
     then: function(resolve, reject) {
-      ise(resolve(3), undefined, "Thenable resolve argument should return undefined");
-      ise(reject(4), undefined, "Thenable reject argument should return undefined");
+      is(resolve(3), undefined, "Thenable resolve argument should return undefined");
+      is(reject(4), undefined, "Thenable reject argument should return undefined");
       SimpleTest.finish();
     }
   };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/promise/tests/unit/test_monitor_uncaught.js firefox-trunk-41.0~a1~hg20150524r245419/dom/promise/tests/unit/test_monitor_uncaught.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/promise/tests/unit/test_monitor_uncaught.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/promise/tests/unit/test_monitor_uncaught.js	2015-05-25 20:43:50.000000000 +0000
@@ -0,0 +1,270 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 { utils: Cu } = Components;
+
+Cu.import("resource://gre/modules/Timer.jsm", this);
+
+add_task(function* test_globals() {
+  Assert.equal(Promise.defer || undefined, undefined, "We are testing DOM Promise.");
+  Assert.notEqual(PromiseDebugging, undefined, "PromiseDebugging is available.");
+});
+
+add_task(function* test_promiseID() {
+  let p1 = new Promise(resolve => {});
+  let p2 = new Promise(resolve => {});
+  let p3 = p2.then(null, null);
+  let promise = [p1, p2, p3];
+
+  let identifiers = promise.map(PromiseDebugging.getPromiseID);
+  do_print("Identifiers: " + JSON.stringify(identifiers));
+  let idSet = new Set(identifiers);
+  Assert.equal(idSet.size, identifiers.length,
+    "PromiseDebugging.getPromiseID returns a distinct id per promise");
+
+  let identifiers2 = promise.map(PromiseDebugging.getPromiseID);
+  Assert.equal(JSON.stringify(identifiers),
+               JSON.stringify(identifiers2),
+               "Successive calls to PromiseDebugging.getPromiseID return the same id for the same promise");
+});
+
+add_task(function* test_observe_uncaught() {
+  // The names of Promise instances
+  let names = new Map();
+
+  // The results for UncaughtPromiseObserver callbacks.
+  let CallbackResults = function(name) {
+    this.name = name;
+    this.expected = new Set();
+    this.observed = new Set();
+    this.blocker = new Promise(resolve => this.resolve = resolve);
+  };
+  CallbackResults.prototype = {
+    observe: function(promise) {
+      do_print(this.name + " observing Promise " + names.get(promise));
+      Assert.equal(PromiseDebugging.getState(promise).state, "rejected",
+                   this.name + " observed a rejected Promise");
+      if (!this.expected.has(promise)) {
+        Assert.ok(false,
+            this.name + " observed a Promise that it expected to observe, " +
+            names.get(promise) +
+            " (" + PromiseDebugging.getPromiseID(promise) +
+            ", " + PromiseDebugging.getAllocationStack(promise) + ")");
+
+      }
+      Assert.ok(this.expected.delete(promise),
+                this.name + " observed a Promise that it expected to observe, " +
+                names.get(promise)  + " (" + PromiseDebugging.getPromiseID(promise) + ")");
+      Assert.ok(!this.observed.has(promise),
+                this.name + " observed a Promise that it has not observed yet");
+      this.observed.add(promise);
+      if (this.expected.size == 0) {
+        this.resolve();
+      } else {
+        do_print(this.name + " is still waiting for " + this.expected.size + " observations:");
+        do_print(JSON.stringify([names.get(x) for (x of this.expected.values())]));
+      }
+    },
+  };
+
+  let onLeftUncaught = new CallbackResults("onLeftUncaught");
+  let onConsumed = new CallbackResults("onConsumed");
+
+  let observer = {
+    onLeftUncaught: function(promise, data) {
+      onLeftUncaught.observe(promise);
+    },
+    onConsumed: function(promise) {
+      onConsumed.observe(promise);
+    },
+  };
+
+  let resolveLater = function(delay = 20) {
+    return new Promise((resolve, reject) => setTimeout(resolve, delay));
+  };
+  let rejectLater = function(delay = 20) {
+    return new Promise((resolve, reject) => setTimeout(reject, delay));
+  };
+  let makeSamples = function*() {
+    yield {
+      promise: Promise.resolve(0),
+      name: "Promise.resolve",
+    };
+    yield {
+      promise: Promise.resolve(resolve => resolve(0)),
+      name: "Resolution callback",
+    };
+    yield {
+      promise: Promise.resolve(0).then(null, null),
+      name: "`then(null, null)`"
+    };
+    yield {
+      promise: Promise.reject(0).then(null, () => {}),
+      name: "Reject and catch immediately",
+    };
+    yield {
+      promise: resolveLater(),
+      name: "Resolve later",
+    };
+    yield {
+      promise: Promise.reject("Simple rejection"),
+      leftUncaught: true,
+      consumed: false,
+      name: "Promise.reject",
+    };
+
+    // Reject a promise now, consume it later.
+    let p = Promise.reject("Reject now, consume later");
+    setTimeout(() => p.then(null, () => {
+      do_print("Consumed promise");
+    }), 200);
+    yield {
+      promise: p,
+      leftUncaught: true,
+      consumed: true,
+      name: "Reject now, consume later",
+    };
+
+    yield {
+      promise: Promise.all([
+        Promise.resolve("Promise.all"),
+        rejectLater()
+      ]),
+      leftUncaught: true,
+      name: "Rejecting through Promise.all"
+    };
+    yield {
+      promise: Promise.race([
+        resolveLater(500),
+        Promise.reject(),
+      ]),
+      leftUncaught: true, // The rejection wins the race.
+      name: "Rejecting through Promise.race",
+    };
+    yield {
+      promise: Promise.race([
+        Promise.resolve(),
+        rejectLater(500)
+      ]),
+      leftUncaught: false, // The resolution wins the race.
+      name: "Resolving through Promise.race",
+    };
+
+    let boom = new Error("`throw` in the constructor");
+    yield {
+      promise: new Promise(() => { throw boom; }),
+      leftUncaught: true,
+      name: "Throwing in the constructor",
+    };
+
+    let rejection = Promise.reject("`reject` during resolution");
+    yield {
+      promise: rejection,
+      leftUncaught: false,
+      consumed: false, // `rejection` is consumed immediately (see below)
+      name: "Promise.reject, again",
+    };
+
+    yield {
+      promise: new Promise(resolve => resolve(rejection)),
+      leftUncaught: true,
+      consumed: false,
+      name: "Resolving with a rejected promise",
+    };
+
+    yield {
+      promise: Promise.resolve(0).then(() => rejection),
+      leftUncaught: true,
+      consumed: false,
+      name: "Returning a rejected promise from success handler",
+    };
+
+    yield {
+      promise: Promise.resolve(0).then(() => { throw new Error(); }),
+      leftUncaught: true,
+      consumed: false,
+      name: "Throwing during the call to the success callback",
+    };
+  };
+  let samples = [];
+  for (let s of makeSamples()) {
+    samples.push(s);
+    do_print("Promise '" + s.name + "' has id " + PromiseDebugging.getPromiseID(s.promise));
+  }
+
+  PromiseDebugging.addUncaughtRejectionObserver(observer);
+
+  for (let s of samples) {
+    names.set(s.promise, s.name);
+    if (s.leftUncaught || false) {
+      onLeftUncaught.expected.add(s.promise);
+    }
+    if (s.consumed || false) {
+      onConsumed.expected.add(s.promise);
+    }
+  }
+
+  do_print("Test setup, waiting for callbacks.");
+  yield onLeftUncaught.blocker;
+
+  do_print("All calls to onLeftUncaught are complete.");
+  if (onConsumed.expected.size != 0) {
+    do_print("onConsumed is still waiting for the following Promise:");
+    do_print(JSON.stringify([names.get(x) for (x of onConsumed.expected.values())]));
+    yield onConsumed.blocker;
+  }
+
+  do_print("All calls to onConsumed are complete.");
+  let removed = PromiseDebugging.removeUncaughtRejectionObserver(observer);
+  Assert.ok(removed, "removeUncaughtRejectionObserver succeeded");
+  removed = PromiseDebugging.removeUncaughtRejectionObserver(observer);
+  Assert.ok(!removed, "second call to removeUncaughtRejectionObserver didn't remove anything");
+});
+
+
+add_task(function* test_uninstall_observer() {
+  let Observer = function() {
+    this.blocker = new Promise(resolve => this.resolve = resolve);
+    this.active = true;
+  };
+  Observer.prototype = {
+    set active(x) {
+      this._active = x;
+      if (x) {
+        PromiseDebugging.addUncaughtRejectionObserver(this);
+      } else {
+        PromiseDebugging.removeUncaughtRejectionObserver(this);
+      }
+    },
+    onLeftUncaught: function() {
+      Assert.ok(this._active, "This observer is active.");
+      this.resolve();
+    },
+    onConsumed: function() {
+      Assert.ok(false, "We should not consume any Promise.");
+    },
+  };
+
+  do_print("Adding an observer.");
+  let deactivate = new Observer();
+  Promise.reject("I am an uncaught rejection.");
+  yield deactivate.blocker;
+  Assert.ok(true, "The observer has observed an uncaught Promise.");
+  deactivate.active = false;
+  do_print("Removing the observer, it should not observe any further uncaught Promise.");
+
+  do_print("Rejecting a Promise and waiting a little to give a chance to observers.");
+  let wait = new Observer();
+  Promise.reject("I am another uncaught rejection.");
+  yield wait.blocker;
+  yield new Promise(resolve => setTimeout(resolve, 100));
+  // Normally, `deactivate` should not be notified of the uncaught rejection.
+  wait.active = false;
+});
+
+function run_test() {
+  run_next_test();
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/promise/tests/unit/xpcshell.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/promise/tests/unit/xpcshell.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/promise/tests/unit/xpcshell.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/promise/tests/unit/xpcshell.ini	2015-05-25 20:43:50.000000000 +0000
@@ -0,0 +1,5 @@
+[DEFAULT]
+head =
+tail =
+
+[test_monitor_uncaught.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/push/PushService.jsm firefox-trunk-41.0~a1~hg20150524r245419/dom/push/PushService.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/push/PushService.jsm	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/push/PushService.jsm	2015-05-25 20:43:50.000000000 +0000
@@ -89,151 +89,161 @@
   /*
    * @param aChannelRecord
    *        The record to be added.
-   * @param aSuccessCb
-   *        Callback function to invoke with result ID.
-   * @param aErrorCb [optional]
-   *        Callback function to invoke when there was an error.
    */
-  put: function(aChannelRecord, aSuccessCb, aErrorCb) {
+  put: function(aChannelRecord) {
     debug("put()" + JSON.stringify(aChannelRecord));
 
-    this.newTxn(
-      "readwrite",
-      kPUSHDB_STORE_NAME,
-      function txnCb(aTxn, aStore) {
-        debug("Going to put " + aChannelRecord.channelID);
-        aStore.put(aChannelRecord).onsuccess = function setTxnResult(aEvent) {
-          debug("Request successful. Updated record ID: " +
-                aEvent.target.result);
-        };
-      },
-      aSuccessCb,
-      aErrorCb
+    return new Promise((resolve, reject) =>
+      this.newTxn(
+        "readwrite",
+        kPUSHDB_STORE_NAME,
+        function txnCb(aTxn, aStore) {
+          debug("Going to put " + aChannelRecord.channelID);
+          aStore.put(aChannelRecord).onsuccess = function setTxnResult(aEvent) {
+            debug("Request successful. Updated record ID: " +
+                  aEvent.target.result);
+          };
+        },
+        resolve,
+        reject
+      )
     );
   },
 
   /*
    * @param aChannelID
    *        The ID of record to be deleted.
-   * @param aSuccessCb
-   *        Callback function to invoke with result.
-   * @param aErrorCb [optional]
-   *        Callback function to invoke when there was an error.
+
    */
-  delete: function(aChannelID, aSuccessCb, aErrorCb) {
+  delete: function(aChannelID) {
     debug("delete()");
 
-    this.newTxn(
-      "readwrite",
-      kPUSHDB_STORE_NAME,
-      function txnCb(aTxn, aStore) {
-        debug("Going to delete " + aChannelID);
-        aStore.delete(aChannelID);
-      },
-      aSuccessCb,
-      aErrorCb
+    return new Promise((resolve, reject) =>
+      this.newTxn(
+        "readwrite",
+        kPUSHDB_STORE_NAME,
+        function txnCb(aTxn, aStore) {
+          debug("Going to delete " + aChannelID);
+          aStore.delete(aChannelID);
+        },
+        resolve,
+        reject
+      )
     );
   },
 
-  clearAll: function clear(aSuccessCb, aErrorCb) {
-    this.newTxn(
-      "readwrite",
-      kPUSHDB_STORE_NAME,
-      function (aTxn, aStore) {
-        debug("Going to clear all!");
-        aStore.clear();
-      },
-      aSuccessCb,
-      aErrorCb
+  clearAll: function clear() {
+    return new Promise((resolve, reject) =>
+      this.newTxn(
+        "readwrite",
+        kPUSHDB_STORE_NAME,
+        function (aTxn, aStore) {
+          debug("Going to clear all!");
+          aStore.clear();
+        },
+        resolve,
+        reject
+      )
     );
   },
 
-  getByPushEndpoint: function(aPushEndpoint, aSuccessCb, aErrorCb) {
+  getByPushEndpoint: function(aPushEndpoint) {
     debug("getByPushEndpoint()");
 
-    this.newTxn(
-      "readonly",
-      kPUSHDB_STORE_NAME,
-      function txnCb(aTxn, aStore) {
-        aTxn.result = undefined;
-
-        let index = aStore.index("pushEndpoint");
-        index.get(aPushEndpoint).onsuccess = function setTxnResult(aEvent) {
-          aTxn.result = aEvent.target.result;
-          debug("Fetch successful " + aEvent.target.result);
-        }
-      },
-      aSuccessCb,
-      aErrorCb
+    return new Promise((resolve, reject) =>
+      this.newTxn(
+        "readonly",
+        kPUSHDB_STORE_NAME,
+        function txnCb(aTxn, aStore) {
+          aTxn.result = undefined;
+
+          let index = aStore.index("pushEndpoint");
+          index.get(aPushEndpoint).onsuccess = function setTxnResult(aEvent) {
+            aTxn.result = aEvent.target.result;
+            debug("Fetch successful " + aEvent.target.result);
+          }
+        },
+        resolve,
+        reject
+      )
     );
   },
 
-  getByChannelID: function(aChannelID, aSuccessCb, aErrorCb) {
+  getByChannelID: function(aChannelID) {
     debug("getByChannelID()");
 
-    this.newTxn(
-      "readonly",
-      kPUSHDB_STORE_NAME,
-      function txnCb(aTxn, aStore) {
-        aTxn.result = undefined;
-
-        aStore.get(aChannelID).onsuccess = function setTxnResult(aEvent) {
-          aTxn.result = aEvent.target.result;
-          debug("Fetch successful " + aEvent.target.result);
-        }
-      },
-      aSuccessCb,
-      aErrorCb
+    return new Promise((resolve, reject) =>
+      this.newTxn(
+        "readonly",
+        kPUSHDB_STORE_NAME,
+        function txnCb(aTxn, aStore) {
+          aTxn.result = undefined;
+
+          aStore.get(aChannelID).onsuccess = function setTxnResult(aEvent) {
+            aTxn.result = aEvent.target.result;
+            debug("Fetch successful " + aEvent.target.result);
+          }
+        },
+        resolve,
+        reject
+      )
     );
   },
 
 
-  getByScope: function(aScope, aSuccessCb, aErrorCb) {
+  getByScope: function(aScope) {
     debug("getByScope() " + aScope);
 
-    this.newTxn(
-      "readonly",
-      kPUSHDB_STORE_NAME,
-      function txnCb(aTxn, aStore) {
-        aTxn.result = undefined;
-
-        let index = aStore.index("scope");
-        index.get(aScope).onsuccess = function setTxnResult(aEvent) {
-          aTxn.result = aEvent.target.result;
-          debug("Fetch successful " + aEvent.target.result);
-        }
-      },
-      aSuccessCb,
-      aErrorCb
+    return new Promise((resolve, reject) =>
+      this.newTxn(
+        "readonly",
+        kPUSHDB_STORE_NAME,
+        function txnCb(aTxn, aStore) {
+          aTxn.result = undefined;
+
+          let index = aStore.index("scope");
+          index.get(aScope).onsuccess = function setTxnResult(aEvent) {
+            aTxn.result = aEvent.target.result;
+            debug("Fetch successful " + aEvent.target.result);
+          }
+        },
+        resolve,
+        reject
+      )
     );
   },
 
-  getAllChannelIDs: function(aSuccessCb, aErrorCb) {
+  getAllChannelIDs: function() {
     debug("getAllChannelIDs()");
 
-    this.newTxn(
-      "readonly",
-      kPUSHDB_STORE_NAME,
-      function txnCb(aTxn, aStore) {
-        aStore.mozGetAll().onsuccess = function(event) {
-          aTxn.result = event.target.result;
-        }
-      },
-      aSuccessCb,
-      aErrorCb
+    return new Promise((resolve, reject) =>
+      this.newTxn(
+        "readonly",
+        kPUSHDB_STORE_NAME,
+        function txnCb(aTxn, aStore) {
+          aStore.mozGetAll().onsuccess = function(event) {
+            aTxn.result = event.target.result;
+          }
+        },
+        resolve,
+        reject
+      )
     );
   },
 
-  drop: function(aSuccessCb, aErrorCb) {
+  drop: function() {
     debug("drop()");
-    this.newTxn(
-      "readwrite",
-      kPUSHDB_STORE_NAME,
-      function txnCb(aTxn, aStore) {
-        aStore.clear();
-      },
-      aSuccessCb,
-      aErrorCb
+
+    return new Promise((resolve, reject) =>
+      this.newTxn(
+        "readwrite",
+        kPUSHDB_STORE_NAME,
+        function txnCb(aTxn, aStore) {
+          aStore.clear();
+        },
+        resolve,
+        reject
+      )
     );
   }
 };
@@ -400,21 +410,31 @@
           return;
         }
 
-        this._db.getByScope(scope, function(record) {
-          this._db.delete(records.channelID, null, function() {
-              debug("webapps-clear-data: " + scope +
-                    " Could not delete entry " + records.channelID);
-
-            // courtesy, but don't establish a connection
-            // just for it
-            if (this._ws) {
-              debug("Had a connection, so telling the server");
-              this._send("unregister", {channelID: records.channelID});
-            }
-          }.bind(this), function() {
+        this._db.getByScope(scope)
+          .then(record => {
+            this._db.delete(records.channelID)
+              .then(_ => {
+                // courtesy, but don't establish a connection
+                // just for it
+                if (this._ws) {
+                  debug("Had a connection, so telling the server");
+                  this._send("unregister", {channelID: records.channelID});
+                }
+              }, err => {
+                debug("webapps-clear-data: " + scope +
+                      " Could not delete entry " + records.channelID);
+
+                // courtesy, but don't establish a connection
+                // just for it
+                if (this._ws) {
+                  debug("Had a connection, so telling the server");
+                  this._send("unregister", {channelID: records.channelID});
+                }
+                throw "Database error";
+              });
+          }, _ => {
             debug("webapps-clear-data: Error in getByScope(" + scope + ")");
           });
-        });
 
         break;
     }
@@ -954,11 +974,12 @@
       this._beginWSSetup();
       return;
     }
-    this._db.getAllChannelIDs(function(channelIDs) {
-      if (channelIDs.length > 0) {
-        this._beginWSSetup();
-      }
-    }.bind(this));
+    this._db.getAllChannelIDs()
+      .then(channelIDs => {
+        if (channelIDs.length > 0) {
+          this._beginWSSetup();
+        }
+      });
   },
 
   /** |delay| should be in milliseconds. */
@@ -1354,18 +1375,18 @@
       debug("Could not get channelID " + aChannelIDFromServer + " from DB");
     }
 
-    this._db.getByChannelID(aChannelID,
-                            compareRecordVersionAndNotify.bind(this),
-                            recoverNoSuchChannelID.bind(this));
+    this._db.getByChannelID(aChannelID)
+      .then(compareRecordVersionAndNotify.bind(this),
+            err => recoverNoSuchChannelID(err));
   },
 
   // Fires a push-register system message to all applications that have
   // registration.
   _notifyAllAppsRegister: function() {
     debug("notifyAllAppsRegister()");
-    return new Promise((resolve, reject) => {
-      // records are objects describing the registration as stored in IndexedDB.
-      this._db.getAllChannelIDs(records => {
+    // records are objects describing the registration as stored in IndexedDB.
+    return this._db.getAllChannelIDs()
+      .then(records => {
         let scopes = new Set();
         for (let record of records) {
           scopes.add(record.scope);
@@ -1380,9 +1401,7 @@
           );
           globalMM.broadcastAsyncMessage('pushsubscriptionchanged', scope);
         }
-        resolve();
-      }, reject);
-    });
+      });
   },
 
   _notifyApp: function(aPushRecord) {
@@ -1428,15 +1447,11 @@
 
   _updatePushRecord: function(aPushRecord) {
     debug("updatePushRecord()");
-    let deferred = Promise.defer();
-    this._db.put(aPushRecord, deferred.resolve, deferred.reject);
-    return deferred.promise;
+    return this._db.put(aPushRecord);
   },
 
   _dropRegistration: function() {
-    let deferred = Promise.defer();
-    this._db.drop(deferred.resolve, deferred.reject);
-    return deferred.promise;
+    return this._db.drop();
   },
 
   receiveMessage: function(aMessage) {
@@ -1474,11 +1489,8 @@
   },
 
   _register: function(aPageRecord) {
-    let recordPromise = new Promise((resolve, reject) =>
-      this._db.getByScope(aPageRecord.scope, resolve, reject));
-
-    return recordPromise.then(
-      pushRecord => {
+    return this._db.getByScope(aPageRecord.scope)
+      .then(pushRecord => {
         if (pushRecord == null) {
           let channelID = this._generateID();
           return this._registerWithServer(channelID, aPageRecord);
@@ -1603,33 +1615,24 @@
   _unregister: function(aPageRecord) {
     debug("unregisterWithServer()");
 
-    let deferred = Promise.defer();
-    let fail = function(error) {
-      debug("unregister() fail() error " + error);
-      deferred.reject(error);
-    };
-
     if (!aPageRecord.scope) {
-      fail("NotFoundError");
-      return deferred.promise;
+      return Promise.reject("NotFoundError");
     }
 
-    this._db.getByScope(aPageRecord.scope, function(record) {
-      // If the endpoint didn't exist, let's just fail.
-      if (record === undefined) {
-        fail("NotFoundError");
-        return;
-      }
-
-      this._db.delete(record.channelID, function() {
-        // Let's be nice to the server and try to inform it, but we don't care
-        // about the reply.
-        this._send("unregister", {channelID: record.channelID});
-        deferred.resolve();
-      }.bind(this), fail);
-    }.bind(this), fail);
+    return this._db.getByScope(aPageRecord.scope)
+      .then(record => {
+        // If the endpoint didn't exist, let's just fail.
+        if (record === undefined) {
+          throw "NotFoundError";
+        }
 
-    return deferred.promise;
+        this._db.delete(record.channelID)
+          .then(_ =>
+            // Let's be nice to the server and try to inform it, but we don't care
+            // about the reply.
+            this._send("unregister", {channelID: record.channelID})
+          );
+      });
   },
 
   unregister: function(aPageRecord, aMessageManager) {
@@ -1652,23 +1655,19 @@
   },
 
   _clearAll: function _clearAll() {
-    return new Promise((resolve, reject) => {
-      this._db.clearAll(() => resolve(),
-                        () => reject("Database error"));
-    });
+    return this._db.clearAll();
   },
-  
+
   /**
    * Called on message from the child process
    */
   _registration: function(aPageRecord) {
-    return new Promise((resolve, reject) => {
-      if (!aPageRecord.scope) {
-        reject("Database error");
-        return;
-      }
-      this._db.getByScope(aPageRecord.scope,
-        pushRecord => {
+    if (!aPageRecord.scope) {
+      return Promise.reject("Database error");
+    }
+
+    return this._db.getByScope(aPageRecord.scope)
+        .then(pushRecord => {
           let registration = null;
           if (pushRecord) {
             registration = {
@@ -1678,11 +1677,10 @@
               pushCount: pushRecord.pushCount
             };
           }
-          resolve(registration);
-        },
-        () => reject("Database error")
-      );
-    });
+          return registration;
+        }, _ => {
+          throw "Database error";
+        });
   },
 
   registration: function(aPageRecord, aMessageManager) {
@@ -1751,8 +1749,9 @@
         };
       }
 
-      this._db.getAllChannelIDs(sendHelloMessage.bind(this),
-                                sendHelloMessage.bind(this));
+      this._db.getAllChannelIDs()
+        .then(sendHelloMessage.bind(this),
+              sendHelloMessage.bind(this));
     });
   },
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/head.js firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/head.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/head.js	2015-05-25 20:43:50.000000000 +0000
@@ -62,46 +62,6 @@
 }
 
 /**
- * Wraps a Push database in a proxy that returns promises for all asynchronous
- * methods. This makes it easier to test the database code with Task.jsm.
- *
- * @param {PushDB} db A Push database.
- * @returns {Proxy} A proxy that traps function property gets and returns
- *  promisified functions.
- */
-function promisifyDatabase(db) {
-  return new Proxy(db, {
-    get(target, property) {
-      let method = target[property];
-      if (typeof method != 'function') {
-        return method;
-      }
-      return function(...params) {
-        return new Promise((resolve, reject) => {
-          method.call(target, ...params, resolve, reject);
-        });
-      };
-    }
-  });
-}
-
-/**
- * Clears and closes an open Push database.
- *
- * @param {PushDB} db A Push database.
- * @returns {Promise} A promise that fulfills when the database is closed.
- */
-function cleanupDatabase(db) {
-  return new Promise(resolve => {
-    function close() {
-      db.close();
-      resolve();
-    }
-    db.drop(close, close);
-  });
-}
-
-/**
  * Defers one or more callbacks until the next turn of the event loop. Multiple
  * callbacks are executed in order.
  *
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_clearAll_successful.js firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_clearAll_successful.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_clearAll_successful.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_clearAll_successful.js	2015-05-25 20:43:50.000000000 +0000
@@ -15,9 +15,8 @@
 
 add_task(function* test_unregister_success() {
   let db = new PushDB();
-  let promiseDB = promisifyDatabase(db);
-  do_register_cleanup(() => cleanupDatabase(db));
-  yield promiseDB.put({
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
+  yield db.put({
     channelID,
     pushEndpoint: 'https://example.org/update/unregister-success',
     scope: 'https://example.com/page/unregister-success',
@@ -42,6 +41,6 @@
   });
 
   yield PushNotificationService.clearAll();
-  let record = yield promiseDB.getByChannelID(channelID);
+  let record = yield db.getByChannelID(channelID);
   ok(!record, 'Unregister did not remove record');
 });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_notification_ack.js firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_notification_ack.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_notification_ack.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_notification_ack.js	2015-05-25 20:43:50.000000000 +0000
@@ -20,8 +20,7 @@
 
 add_task(function* test_notification_ack() {
   let db = new PushDB();
-  let promiseDB = promisifyDatabase(db);
-  do_register_cleanup(() => cleanupDatabase(db));
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
   let records = [{
     channelID: '21668e05-6da8-42c9-b8ab-9cc3f4d5630c',
     pushEndpoint: 'https://example.com/update/1',
@@ -39,7 +38,7 @@
     version: 3
   }];
   for (let record of records) {
-    yield promiseDB.put(record);
+    yield db.put(record);
   }
 
   let notifyPromise = Promise.all([
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_notification_duplicate.js firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_notification_duplicate.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_notification_duplicate.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_notification_duplicate.js	2015-05-25 20:43:50.000000000 +0000
@@ -18,8 +18,7 @@
 // Should acknowledge duplicate notifications, but not notify apps.
 add_task(function* test_notification_duplicate() {
   let db = new PushDB();
-  let promiseDB = promisifyDatabase(db);
-  do_register_cleanup(() => cleanupDatabase(db));
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
   let records = [{
     channelID: '8d2d9400-3597-4c5a-8a38-c546b0043bcc',
     pushEndpoint: 'https://example.org/update/1',
@@ -32,7 +31,7 @@
     version: 2
   }];
   for (let record of records) {
-    yield promiseDB.put(record);
+    yield db.put(record);
   }
 
   let notifyPromise = promiseObserverNotification('push-notification');
@@ -72,11 +71,11 @@
   yield waitForPromise(ackDefer.promise, DEFAULT_TIMEOUT,
     'Timed out waiting for stale acknowledgement');
 
-  let staleRecord = yield promiseDB.getByChannelID(
+  let staleRecord = yield db.getByChannelID(
     '8d2d9400-3597-4c5a-8a38-c546b0043bcc');
   strictEqual(staleRecord.version, 2, 'Wrong stale record version');
 
-  let updatedRecord = yield promiseDB.getByChannelID(
+  let updatedRecord = yield db.getByChannelID(
     '27d1e393-03ef-4c72-a5e6-9e890dfccad0');
   strictEqual(updatedRecord.version, 3, 'Wrong updated record version');
 });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_notification_error.js firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_notification_error.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_notification_error.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_notification_error.js	2015-05-25 20:43:50.000000000 +0000
@@ -18,8 +18,7 @@
 
 add_task(function* test_notification_error() {
   let db = new PushDB();
-  let promiseDB = promisifyDatabase(db);
-  do_register_cleanup(() => cleanupDatabase(db));
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
   let records = [{
     channelID: 'f04f1e46-9139-4826-b2d1-9411b0821283',
     pushEndpoint: 'https://example.org/update/success-1',
@@ -37,7 +36,7 @@
     version: 3
   }];
   for (let record of records) {
-    yield promiseDB.put(record);
+    yield db.put(record);
   }
 
   let notifyPromise = Promise.all([
@@ -56,11 +55,11 @@
   PushService.init({
     networkInfo: new MockDesktopNetworkInfo(),
     db: makeStub(db, {
-      getByChannelID(prev, channelID, successCb, failureCb) {
+      getByChannelID(prev, channelID) {
         if (channelID == '3c3930ba-44de-40dc-a7ca-8a133ec1a866') {
-          return failureCb('splines not reticulated');
+          return Promise.reject('splines not reticulated');
         }
-        return prev.call(this, channelID, successCb, failureCb);
+        return prev.call(this, channelID);
       }
     }),
     makeWebSocket(uri) {
@@ -107,19 +106,19 @@
   yield waitForPromise(ackDefer.promise, DEFAULT_TIMEOUT,
     'Timed out waiting for acknowledgements');
 
-  let aRecord = yield promiseDB.getByScope('https://example.com/a');
+  let aRecord = yield db.getByScope('https://example.com/a');
   equal(aRecord.channelID, 'f04f1e46-9139-4826-b2d1-9411b0821283',
     'Wrong channel ID for record A');
   strictEqual(aRecord.version, 2,
     'Should return the new version for record A');
 
-  let bRecord = yield promiseDB.getByScope('https://example.com/b');
+  let bRecord = yield db.getByScope('https://example.com/b');
   equal(bRecord.channelID, '3c3930ba-44de-40dc-a7ca-8a133ec1a866',
     'Wrong channel ID for record B');
   strictEqual(bRecord.version, 2,
     'Should return the previous version for record B');
 
-  let cRecord = yield promiseDB.getByScope('https://example.com/c');
+  let cRecord = yield db.getByScope('https://example.com/c');
   equal(cRecord.channelID, 'b63f7bef-0a0d-4236-b41e-086a69dfd316',
     'Wrong channel ID for record C');
   strictEqual(cRecord.version, 4,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_notification_incomplete.js firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_notification_incomplete.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_notification_incomplete.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_notification_incomplete.js	2015-05-25 20:43:50.000000000 +0000
@@ -19,8 +19,7 @@
 
 add_task(function* test_notification_incomplete() {
   let db = new PushDB();
-  let promiseDB = promisifyDatabase(db);
-  do_register_cleanup(() => cleanupDatabase(db));
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
   let records = [{
     channelID: '123',
     pushEndpoint: 'https://example.org/update/1',
@@ -43,7 +42,7 @@
     version: 10
   }];
   for (let record of records) {
-    promiseDB.put(record);
+    db.put(record);
   }
 
   Services.obs.addObserver(function observe(subject, topic, data) {
@@ -102,7 +101,7 @@
   yield waitForPromise(notificationDefer.promise, DEFAULT_TIMEOUT,
     'Timed out waiting for incomplete notifications');
 
-  let storeRecords = yield promiseDB.getAllChannelIDs();
+  let storeRecords = yield db.getAllChannelIDs();
   storeRecords.sort(({pushEndpoint: a}, {pushEndpoint: b}) =>
     compareAscending(a, b));
   recordsAreEqual(records, storeRecords);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_notification_version_string.js firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_notification_version_string.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_notification_version_string.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_notification_version_string.js	2015-05-25 20:43:50.000000000 +0000
@@ -16,9 +16,8 @@
 
 add_task(function* test_notification_version_string() {
   let db = new PushDB();
-  let promiseDB = promisifyDatabase(db);
-  do_register_cleanup(() => cleanupDatabase(db));
-  yield promiseDB.put({
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
+  yield db.put({
     channelID: '6ff97d56-d0c0-43bc-8f5b-61b855e1d93b',
     pushEndpoint: 'https://example.org/updates/1',
     scope: 'https://example.com/page/1',
@@ -66,7 +65,7 @@
   yield waitForPromise(ackDefer.promise, DEFAULT_TIMEOUT,
     'Timed out waiting for string acknowledgement');
 
-  let storeRecord = yield promiseDB.getByChannelID(
+  let storeRecord = yield db.getByChannelID(
     '6ff97d56-d0c0-43bc-8f5b-61b855e1d93b');
   strictEqual(storeRecord.version, 4, 'Wrong record version');
 });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_register_case.js firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_register_case.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_register_case.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_register_case.js	2015-05-25 20:43:50.000000000 +0000
@@ -18,8 +18,7 @@
 
 add_task(function* test_register_case() {
   let db = new PushDB();
-  let promiseDB = promisifyDatabase(db);
-  do_register_cleanup(() => cleanupDatabase(db));
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
 
   PushService.init({
     networkInfo: new MockDesktopNetworkInfo(),
@@ -56,7 +55,7 @@
   equal(newRecord.scope, 'https://example.net/case',
     'Wrong scope in registration record');
 
-  let record = yield promiseDB.getByChannelID(newRecord.channelID);
+  let record = yield db.getByChannelID(newRecord.channelID);
   equal(record.pushEndpoint, 'https://example.com/update/case',
     'Wrong push endpoint in database record');
   equal(record.scope, 'https://example.net/case',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_register_flush.js firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_register_flush.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_register_flush.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_register_flush.js	2015-05-25 20:43:50.000000000 +0000
@@ -24,15 +24,14 @@
 
 add_task(function* test_register_flush() {
   let db = new PushDB();
-  let promiseDB = promisifyDatabase(db);
-  do_register_cleanup(() => cleanupDatabase(db));
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
   let record = {
     channelID: '9bcc7efb-86c7-4457-93ea-e24e6eb59b74',
     pushEndpoint: 'https://example.org/update/1',
     scope: 'https://example.com/page/1',
     version: 2
   };
-  yield promiseDB.put(record);
+  yield db.put(record);
 
   let notifyPromise = promiseObserverNotification('push-notification');
 
@@ -89,14 +88,14 @@
   yield waitForPromise(ackDefer.promise, DEFAULT_TIMEOUT,
      'Timed out waiting for acknowledgements');
 
-  let prevRecord = yield promiseDB.getByChannelID(
+  let prevRecord = yield db.getByChannelID(
     '9bcc7efb-86c7-4457-93ea-e24e6eb59b74');
   equal(prevRecord.pushEndpoint, 'https://example.org/update/1',
     'Wrong existing push endpoint');
   strictEqual(prevRecord.version, 3,
     'Should record version updates sent before register responses');
 
-  let registeredRecord = yield promiseDB.getByChannelID(newRecord.channelID);
+  let registeredRecord = yield db.getByChannelID(newRecord.channelID);
   equal(registeredRecord.pushEndpoint, 'https://example.org/update/2',
     'Wrong new push endpoint');
   ok(!registeredRecord.version, 'Should not record premature updates');
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_register_invalid_channel.js firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_register_invalid_channel.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_register_invalid_channel.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_register_invalid_channel.js	2015-05-25 20:43:50.000000000 +0000
@@ -19,8 +19,7 @@
 
 add_task(function* test_register_invalid_channel() {
   let db = new PushDB();
-  let promiseDB = promisifyDatabase(db);
-  do_register_cleanup(() => cleanupDatabase(db));
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
 
   PushService._generateID = () => channelID;
   PushService.init({
@@ -55,6 +54,6 @@
     'Wrong error for invalid channel ID'
   );
 
-  let record = yield promiseDB.getByChannelID(channelID);
+  let record = yield db.getByChannelID(channelID);
   ok(!record, 'Should not store records for error responses');
 });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_register_invalid_endpoint.js firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_register_invalid_endpoint.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_register_invalid_endpoint.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_register_invalid_endpoint.js	2015-05-25 20:43:50.000000000 +0000
@@ -19,8 +19,7 @@
 
 add_task(function* test_register_invalid_endpoint() {
   let db = new PushDB();
-  let promiseDB = promisifyDatabase(db);
-  do_register_cleanup(() => cleanupDatabase(db));
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
 
   PushService._generateID = () => channelID;
   PushService.init({
@@ -57,6 +56,6 @@
     'Wrong error for invalid endpoint'
   );
 
-  let record = yield promiseDB.getByChannelID(channelID);
+  let record = yield db.getByChannelID(channelID);
   ok(!record, 'Should not store records with invalid endpoints');
 });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_register_request_queue.js firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_register_request_queue.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_register_request_queue.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_register_request_queue.js	2015-05-25 20:43:50.000000000 +0000
@@ -19,8 +19,7 @@
 
 add_task(function* test_register_request_queue() {
   let db = new PushDB();
-  let promiseDB = promisifyDatabase(db);
-  do_register_cleanup(() => cleanupDatabase(db));
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
 
   let helloDefer = Promise.defer();
   let onHello = after(2, function onHello(request) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_register_rollback.js firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_register_rollback.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_register_rollback.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_register_rollback.js	2015-05-25 20:43:50.000000000 +0000
@@ -23,7 +23,7 @@
 
 add_task(function* test_register_rollback() {
   let db = new PushDB();
-  do_register_cleanup(() => cleanupDatabase(db));
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
 
   let handshakes = 0;
   let registers = 0;
@@ -32,8 +32,8 @@
   PushService.init({
     networkInfo: new MockDesktopNetworkInfo(),
     db: makeStub(db, {
-      put(prev, record, successCb, failureCb) {
-        failureCb('universe has imploded');
+      put(prev, record) {
+        return Promise.reject('universe has imploded');
       }
     }),
     makeWebSocket(uri) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_register_success.js firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_register_success.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_register_success.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_register_success.js	2015-05-25 20:43:50.000000000 +0000
@@ -23,8 +23,7 @@
 
 add_task(function* test_register_success() {
   let db = new PushDB();
-  let promiseDB = promisifyDatabase(db);
-  do_register_cleanup(() => cleanupDatabase(db));
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
 
   PushService._generateID = () => channelID;
   PushService.init({
@@ -66,7 +65,7 @@
   equal(newRecord.scope, 'https://example.org/1',
     'Wrong scope in registration record');
 
-  let record = yield promiseDB.getByChannelID(channelID);
+  let record = yield db.getByChannelID(channelID);
   equal(record.channelID, channelID,
     'Wrong channel ID in database record');
   equal(record.pushEndpoint, 'https://example.com/update/1',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_register_timeout.js firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_register_timeout.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_register_timeout.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_register_timeout.js	2015-05-25 20:43:50.000000000 +0000
@@ -26,8 +26,7 @@
   let registers = 0;
 
   let db = new PushDB();
-  let promiseDB = promisifyDatabase(db);
-  do_register_cleanup(() => cleanupDatabase(db));
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
 
   PushService._generateID = () => channelID;
   PushService.init({
@@ -90,7 +89,7 @@
     'Wrong error for request timeout'
   );
 
-  let record = yield promiseDB.getByChannelID(channelID);
+  let record = yield db.getByChannelID(channelID);
   ok(!record, 'Should not store records for timed-out responses');
 
   yield waitForPromise(
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_registration_error.js firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_registration_error.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_registration_error.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_registration_error.js	2015-05-25 20:43:50.000000000 +0000
@@ -15,13 +15,13 @@
 
 add_task(function* test_registrations_error() {
   let db = new PushDB();
-  do_register_cleanup(() => cleanupDatabase(db));
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
 
   PushService.init({
     networkInfo: new MockDesktopNetworkInfo(),
     db: makeStub(db, {
-      getByScope(prev, scope, successCb, failureCb) {
-        failureCb('oops');
+      getByScope(prev, scope) {
+        return Promise.reject('oops');
       }
     }),
     makeWebSocket(uri) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_registration_success.js firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_registration_success.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_registration_success.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_registration_success.js	2015-05-25 20:43:50.000000000 +0000
@@ -15,8 +15,7 @@
 
 add_task(function* test_registration_success() {
   let db = new PushDB();
-  let promiseDB = promisifyDatabase(db);
-  do_register_cleanup(() => cleanupDatabase(db));
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
   let records = [{
     channelID: 'bf001fe0-2684-42f2-bc4d-a3e14b11dd5b',
     pushEndpoint: 'https://example.com/update/same-manifest/1',
@@ -34,7 +33,7 @@
     version: 15
   }];
   for (let record of records) {
-    yield promiseDB.put(record);
+    yield db.put(record);
   }
 
   PushService.init({
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_unregister_error.js firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_unregister_error.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_unregister_error.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_unregister_error.js	2015-05-25 20:43:50.000000000 +0000
@@ -15,9 +15,8 @@
 
 add_task(function* test_unregister_error() {
   let db = new PushDB();
-  let promiseDB = promisifyDatabase(db);
-  do_register_cleanup(() => cleanupDatabase(db));
-  yield promiseDB.put({
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
+  yield db.put({
     channelID: channelID,
     pushEndpoint: 'https://example.org/update/failure',
     scope: 'https://example.net/page/failure',
@@ -56,7 +55,7 @@
   yield PushNotificationService.unregister(
     'https://example.net/page/failure');
 
-  let result = yield promiseDB.getByChannelID(channelID);
+  let result = yield db.getByChannelID(channelID);
   ok(!result, 'Deleted push record exists');
 
   // Make sure we send a request to the server.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_unregister_invalid_json.js firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_unregister_invalid_json.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_unregister_invalid_json.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_unregister_invalid_json.js	2015-05-25 20:43:50.000000000 +0000
@@ -19,8 +19,7 @@
 
 add_task(function* test_unregister_invalid_json() {
   let db = new PushDB();
-  let promiseDB = promisifyDatabase(db);
-  do_register_cleanup(() => cleanupDatabase(db));
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
   let records = [{
     channelID: '87902e90-c57e-4d18-8354-013f4a556559',
     pushEndpoint: 'https://example.org/update/1',
@@ -33,7 +32,7 @@
     version: 1
   }];
   for (let record of records) {
-    yield promiseDB.put(record);
+    yield db.put(record);
   }
 
   let unregisterDefer = Promise.defer();
@@ -62,13 +61,13 @@
   // _sendRequest().
   yield PushNotificationService.unregister(
     'https://example.edu/page/1');
-  let record = yield promiseDB.getByChannelID(
+  let record = yield db.getByChannelID(
     '87902e90-c57e-4d18-8354-013f4a556559');
   ok(!record, 'Failed to delete unregistered record');
 
   yield PushNotificationService.unregister(
     'https://example.net/page/1');
-  record = yield promiseDB.getByChannelID(
+  record = yield db.getByChannelID(
     '057caa8f-9b99-47ff-891c-adad18ce603e');
   ok(!record,
     'Failed to delete unregistered record after receiving invalid JSON');
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_unregister_success.js firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_unregister_success.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/push/test/xpcshell/test_unregister_success.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/push/test/xpcshell/test_unregister_success.js	2015-05-25 20:43:50.000000000 +0000
@@ -15,9 +15,8 @@
 
 add_task(function* test_unregister_success() {
   let db = new PushDB();
-  let promiseDB = promisifyDatabase(db);
-  do_register_cleanup(() => cleanupDatabase(db));
-  yield promiseDB.put({
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
+  yield db.put({
     channelID,
     pushEndpoint: 'https://example.org/update/unregister-success',
     scope: 'https://example.com/page/unregister-success',
@@ -52,7 +51,7 @@
 
   yield PushNotificationService.unregister(
     'https://example.com/page/unregister-success');
-  let record = yield promiseDB.getByChannelID(channelID);
+  let record = yield db.getByChannelID(channelID);
   ok(!record, 'Unregister did not remove record');
 
   yield waitForPromise(unregisterDefer.promise, DEFAULT_TIMEOUT,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/quota/Client.h firefox-trunk-41.0~a1~hg20150524r245419/dom/quota/Client.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/quota/Client.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/quota/Client.h	2015-05-25 20:43:50.000000000 +0000
@@ -116,6 +116,9 @@
                             nsIRunnable* aCallback) = 0;
 
   virtual void
+  PerformIdleMaintenance() = 0;
+
+  virtual void
   ShutdownWorkThreads() = 0;
 
 protected:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/quota/QuotaManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/quota/QuotaManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/quota/QuotaManager.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/quota/QuotaManager.cpp	2015-05-25 20:43:50.000000000 +0000
@@ -10,6 +10,7 @@
 #include "nsIBinaryInputStream.h"
 #include "nsIBinaryOutputStream.h"
 #include "nsIFile.h"
+#include "nsIIdleService.h"
 #include "nsIObserverService.h"
 #include "nsIOfflineStorage.h"
 #include "nsIPermissionManager.h"
@@ -111,12 +112,12 @@
 const char kAboutHomeOrigin[] = "moz-safe-about:home";
 const char kIndexedDBOriginPrefix[] = "indexeddb://";
 
-const char kIndexedDBDirectoryName[] = "indexedDB";
-const char kStorageDirectoryName[] = "storage";
-const char kPersistentDirectoryName[] = "persistent";
-const char kPermanentDirectoryName[] = "permanent";
-const char kTemporaryDirectoryName[] = "temporary";
-const char kDefaultDirectoryName[] = "default";
+#define INDEXEDDB_DIRECTORY_NAME "indexedDB"
+#define STORAGE_DIRECTORY_NAME "storage"
+#define PERSISTENT_DIRECTORY_NAME "persistent"
+#define PERMANENT_DIRECTORY_NAME "permanent"
+#define TEMPORARY_DIRECTORY_NAME "temporary"
+#define DEFAULT_DIRECTORY_NAME "default"
 
 enum AppId {
   kNoAppId = nsIScriptSecurityManager::NO_APP_ID,
@@ -801,7 +802,7 @@
 
 nsresult
 CloneStoragePath(nsIFile* aBaseDir,
-                 const nsACString& aStorageName,
+                 const nsAString& aStorageName,
                  nsAString& aStoragePath)
 {
   nsresult rv;
@@ -812,8 +813,7 @@
     return rv;
   }
 
-  NS_ConvertASCIItoUTF16 dirName(aStorageName);
-  rv = storageDir->Append(dirName);
+  rv = storageDir->Append(aStorageName);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -1079,7 +1079,7 @@
 GetDirectoryMetadataInputStream(nsIFile* aDirectory,
                                 nsIBinaryInputStream** aStream)
 {
-  AssertIsOnIOThread();
+  MOZ_ASSERT(!NS_IsMainThread());
   MOZ_ASSERT(aDirectory);
   MOZ_ASSERT(aStream);
 
@@ -1110,51 +1110,6 @@
 }
 
 nsresult
-GetDirectoryMetadata(nsIFile* aDirectory,
-                     int64_t* aTimestamp,
-                     nsACString& aGroup,
-                     nsACString& aOrigin,
-                     bool* aIsApp)
-{
-  AssertIsOnIOThread();
-  MOZ_ASSERT(aDirectory);
-  MOZ_ASSERT(aTimestamp);
-
-  nsCOMPtr<nsIBinaryInputStream> binaryStream;
-  nsresult rv =
-    GetDirectoryMetadataInputStream(aDirectory, getter_AddRefs(binaryStream));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  uint64_t timestamp;
-  rv = binaryStream->Read64(&timestamp);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsCString group;
-  rv = binaryStream->ReadCString(group);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsCString origin;
-  rv = binaryStream->ReadCString(origin);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  bool isApp;
-  if (aIsApp) {
-    rv = binaryStream->ReadBoolean(&isApp);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-  }
-
-  *aTimestamp = timestamp;
-  aGroup = group;
-  aOrigin = origin;
-  if (aIsApp) {
-    *aIsApp = isApp;
-  }
-  return NS_OK;
-}
-
-nsresult
 GetDirectoryMetadataWithRestore(nsIFile* aDirectory,
                                 bool aPersistent,
                                 int64_t* aTimestamp,
@@ -1162,22 +1117,22 @@
                                 nsACString& aOrigin,
                                 bool* aIsApp)
 {
-  nsresult rv = GetDirectoryMetadata(aDirectory,
-                                     aTimestamp,
-                                     aGroup,
-                                     aOrigin,
-                                     aIsApp);
+  nsresult rv = QuotaManager::GetDirectoryMetadata(aDirectory,
+                                                   aTimestamp,
+                                                   aGroup,
+                                                   aOrigin,
+                                                   aIsApp);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     rv = RestoreDirectoryMetadata(aDirectory, aPersistent);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
 
-    rv = GetDirectoryMetadata(aDirectory,
-                              aTimestamp,
-                              aGroup,
-                              aOrigin,
-                              aIsApp);
+    rv = QuotaManager::GetDirectoryMetadata(aDirectory,
+                                            aTimestamp,
+                                            aGroup,
+                                            aOrigin,
+                                            aIsApp);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
@@ -1427,29 +1382,28 @@
     NS_ENSURE_SUCCESS(rv, rv);
 
     rv = CloneStoragePath(baseDir,
-                          NS_LITERAL_CSTRING(kIndexedDBDirectoryName),
+                          NS_LITERAL_STRING(INDEXEDDB_DIRECTORY_NAME),
                           mIndexedDBPath);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    NS_ConvertASCIItoUTF16 dirName(NS_LITERAL_CSTRING(kStorageDirectoryName));
-    rv = baseDir->Append(dirName);
+    rv = baseDir->Append(NS_LITERAL_STRING(STORAGE_DIRECTORY_NAME));
     NS_ENSURE_SUCCESS(rv, rv);
 
     rv = baseDir->GetPath(mStoragePath);
     NS_ENSURE_SUCCESS(rv, rv);
 
     rv = CloneStoragePath(baseDir,
-                          NS_LITERAL_CSTRING(kPermanentDirectoryName),
+                          NS_LITERAL_STRING(PERMANENT_DIRECTORY_NAME),
                           mPermanentStoragePath);
     NS_ENSURE_SUCCESS(rv, rv);
 
     rv = CloneStoragePath(baseDir,
-                          NS_LITERAL_CSTRING(kTemporaryDirectoryName),
+                          NS_LITERAL_STRING(TEMPORARY_DIRECTORY_NAME),
                           mTemporaryStoragePath);
     NS_ENSURE_SUCCESS(rv, rv);
 
     rv = CloneStoragePath(baseDir,
-                          NS_LITERAL_CSTRING(kDefaultDirectoryName),
+                          NS_LITERAL_STRING(DEFAULT_DIRECTORY_NAME),
                           mDefaultStoragePath);
     NS_ENSURE_SUCCESS(rv, rv);
 
@@ -1484,10 +1438,8 @@
   NS_ASSERTION(mClients.Capacity() == Client::TYPE_MAX,
                "Should be using an auto array with correct capacity!");
 
-  nsRefPtr<Client> idbClient = indexedDB::CreateQuotaClient();
-
   // Register clients.
-  mClients.AppendElement(idbClient);
+  mClients.AppendElement(indexedDB::CreateQuotaClient());
   mClients.AppendElement(asmjscache::CreateClient());
   mClients.AppendElement(cache::CreateQuotaClient());
 
@@ -2017,6 +1969,37 @@
   return NS_OK;
 }
 
+namespace {
+
+// The Cache API was creating top level morgue directories by accident for
+// a short time in nightly.  This unfortunately prevents all storage from
+// working.  So recover these profiles by removing these corrupt directories.
+// This should be removed at some point in the future.
+bool
+MaybeRemoveCorruptDirectory(const nsAString& aLeafName, nsIFile* aDir)
+{
+#ifdef NIGHTLY_BUILD
+  MOZ_ASSERT(aDir);
+
+  if (aLeafName != NS_LITERAL_STRING("morgue")) {
+    return false;
+  }
+
+  NS_WARNING("QuotaManager removing corrupt morgue directory!");
+
+  nsresult rv = aDir->Remove(true /* recursive */);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return false;
+  }
+
+  return true;
+#else
+  return false
+#endif // NIGHTLY_BUILD
+}
+
+} // anonymous namespace
+
 nsresult
 QuotaManager::InitializeOrigin(PersistenceType aPersistenceType,
                                const nsACString& aGroup,
@@ -2074,6 +2057,10 @@
       return NS_ERROR_UNEXPECTED;
     }
 
+    if (MaybeRemoveCorruptDirectory(leafName, file)) {
+      continue;
+    }
+
     Client::Type clientType;
     rv = Client::TypeFromText(leafName, clientType);
     if (NS_FAILED(rv)) {
@@ -2133,8 +2120,7 @@
   rv = persistentStorageDir->InitWithPath(mStoragePath);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  NS_ConvertASCIItoUTF16 dirName(NS_LITERAL_CSTRING(kPersistentDirectoryName));
-  rv = persistentStorageDir->Append(dirName);
+  rv = persistentStorageDir->Append(NS_LITERAL_STRING(PERSISTENT_DIRECTORY_NAME));
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = persistentStorageDir->Exists(&exists);
@@ -2155,7 +2141,7 @@
   // However there's a theoretical possibility that the indexedDB directory
   // is on different volume, but it should be rare enough that we don't have
   // to worry about it.
-  rv = indexedDBDir->MoveTo(storageDir, dirName);
+  rv = indexedDBDir->MoveTo(storageDir, NS_LITERAL_STRING(PERSISTENT_DIRECTORY_NAME));
   NS_ENSURE_SUCCESS(rv, rv);
 
   return NS_OK;
@@ -2179,8 +2165,7 @@
     return rv;
   }
 
-  NS_ConvertASCIItoUTF16 dirName(NS_LITERAL_CSTRING(kPersistentDirectoryName));
-  rv = persistentStorageDir->Append(dirName);
+  rv = persistentStorageDir->Append(NS_LITERAL_STRING(PERSISTENT_DIRECTORY_NAME));
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -2275,8 +2260,7 @@
   }
 
   // And finally rename persistent to default.
-  NS_ConvertASCIItoUTF16 defDirName(NS_LITERAL_CSTRING(kDefaultDirectoryName));
-  rv = persistentStorageDir->RenameTo(nullptr, defDirName);
+  rv = persistentStorageDir->RenameTo(nullptr, NS_LITERAL_STRING(DEFAULT_DIRECTORY_NAME));
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -2485,7 +2469,7 @@
   str.Append('*');
   str.AppendInt(aClientType);
   str.Append('*');
-  str.Append(NS_ConvertUTF16toUTF8(aName));
+  AppendUTF16toUTF8(aName, str);
 
   aDatabaseId = str;
 }
@@ -2606,7 +2590,7 @@
   }
 
   nsCString origin;
-  rv = aPrincipal->GetOrigin(getter_Copies(origin));
+  rv = aPrincipal->GetOriginNoSuffix(origin);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (origin.EqualsLiteral(kChromeOrigin)) {
@@ -2746,6 +2730,52 @@
   aOrigin.AssignLiteral(kChromeOrigin);
 }
 
+// static
+nsresult
+QuotaManager::GetDirectoryMetadata(nsIFile* aDirectory,
+                                   int64_t* aTimestamp,
+                                   nsACString& aGroup,
+                                   nsACString& aOrigin,
+                                   bool* aIsApp)
+{
+  MOZ_ASSERT(!NS_IsMainThread());
+  MOZ_ASSERT(aDirectory);
+  MOZ_ASSERT(aTimestamp);
+
+  nsCOMPtr<nsIBinaryInputStream> binaryStream;
+  nsresult rv =
+    GetDirectoryMetadataInputStream(aDirectory, getter_AddRefs(binaryStream));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  uint64_t timestamp;
+  rv = binaryStream->Read64(&timestamp);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCString group;
+  rv = binaryStream->ReadCString(group);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCString origin;
+  rv = binaryStream->ReadCString(origin);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  bool isApp;
+  if (aIsApp) {
+    rv = binaryStream->ReadBoolean(&isApp);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+  }
+
+  *aTimestamp = timestamp;
+  aGroup = group;
+  aOrigin = origin;
+  if (aIsApp) {
+    *aIsApp = isApp;
+  }
+  return NS_OK;
+}
+
 NS_IMPL_ISUPPORTS(QuotaManager, nsIQuotaManager, nsIObserver)
 
 NS_IMETHODIMP
@@ -3031,6 +3061,13 @@
     return NS_OK;
   }
 
+  if (!strcmp(aTopic, OBSERVER_TOPIC_IDLE_DAILY)) {
+    for (auto& client : mClients) {
+      client->PerformIdleMaintenance();
+    }
+    return NS_OK;
+  }
+
   NS_NOTREACHED("Unknown topic!");
   return NS_ERROR_UNEXPECTED;
 }
@@ -4178,6 +4215,10 @@
         }
       }
 
+      if (MaybeRemoveCorruptDirectory(leafName, file)) {
+        continue;
+      }
+
       Client::Type clientType;
       rv = Client::TypeFromText(leafName, clientType);
       if (NS_FAILED(rv)) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/quota/QuotaManager.h firefox-trunk-41.0~a1~hg20150524r245419/dom/quota/QuotaManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/quota/QuotaManager.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/quota/QuotaManager.h	2015-05-25 20:43:50.000000000 +0000
@@ -313,6 +313,13 @@
                                   EmptyCString(), _retval);
   }
 
+  static nsresult
+  GetDirectoryMetadata(nsIFile* aDirectory,
+                       int64_t* aTimestamp,
+                       nsACString& aGroup,
+                       nsACString& aOrigin,
+                       bool* aIsApp);
+
 private:
   QuotaManager();
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/requestsync/RequestSyncService.jsm firefox-trunk-41.0~a1~hg20150524r245419/dom/requestsync/RequestSyncService.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/requestsync/RequestSyncService.jsm	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/requestsync/RequestSyncService.jsm	2015-05-25 20:43:50.000000000 +0000
@@ -209,7 +209,7 @@
   principalToKey: function(aPrincipal) {
     return aPrincipal.appId + '|' +
            aPrincipal.isInBrowserElement + '|' +
-           aPrincipal.origin;
+           aPrincipal.originNoSuffix;
   },
 
   // Add a task to the _registrations map and create the timer if it's needed.
@@ -287,20 +287,7 @@
     }
 
     // The principal is used to validate the message.
-    if (!aMessage.principal) {
-      return;
-    }
-
-    let uri = Services.io.newURI(aMessage.principal.origin, null, null);
-
-    let principal;
-    try {
-      principal = secMan.getAppCodebasePrincipal(uri,
-        aMessage.principal.appId, aMessage.principal.isInBrowserElement);
-    } catch(e) {
-      return;
-    }
-
+    let principal = aMessage.principal;
     if (!principal) {
       return;
     }
@@ -398,7 +385,7 @@
     let dbKey = aData.task + "|" +
                 aPrincipal.appId + '|' +
                 aPrincipal.isInBrowserElement + '|' +
-                aPrincipal.origin;
+                aPrincipal.originNoSuffix;
 
     let data = { principal: aPrincipal,
                  dbKey: dbKey,
@@ -514,7 +501,7 @@
       }
 
       if (aObj.principal.isInBrowserElement != aData.isInBrowserElement ||
-          aObj.principal.origin != aData.origin) {
+          aObj.principal.originNoSuffix != aData.origin) {
         return;
       }
 
@@ -562,7 +549,7 @@
       }
 
       if (aObj.principal.isInBrowserElement != aData.isInBrowserElement ||
-          aObj.principal.origin != aData.origin) {
+          aObj.principal.originNoSuffix != aData.origin) {
         return;
       }
 
@@ -607,7 +594,7 @@
     let obj = this.createPartialTaskObject(aObj);
 
     obj.app = { manifestURL: '',
-                origin: aObj.principal.origin,
+                origin: aObj.principal.originNoSuffix,
                 isInBrowserElement: aObj.principal.isInBrowserElement };
 
     let app = appsService.getAppByLocalId(aObj.principal.appId);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/requestsync/tests/common_basic.js firefox-trunk-41.0~a1~hg20150524r245419/dom/requestsync/tests/common_basic.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/requestsync/tests/common_basic.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/requestsync/tests/common_basic.js	2015-05-25 20:43:50.000000000 +0000
@@ -61,8 +61,8 @@
   });
 }
 
-function genericError() {
-  ok(false, "Some promise failed");
+function genericError(name, val) {
+  ok(false, "Promise from " + name + " rejected with value: " + val);
 }
 
 function test_register() {
@@ -70,7 +70,7 @@
   function() {
     ok(true, "navigator.sync.register() worked!");
     runTests();
-  }, genericError);
+  }, genericError.bind(null, 'register'));
 }
 
 function test_unregister() {
@@ -78,12 +78,12 @@
   function() {
     ok(true, "navigator.sync.unregister() worked!");
     runTests();
-  }, genericError);
+  }, genericError.bind(null, 'unregister'));
 }
 
 function test_unregisterDuplicate() {
   navigator.sync.unregister('foobar').then(
-  genericError,
+  genericError.bind(null, 'unregisterDuplicate'),
   function(error) {
     ok(true, "navigator.sync.unregister() should throw if the task doesn't exist.");
     ok(error, "UnknownTaskError", "Duplicate unregistration error is correct");
@@ -97,7 +97,7 @@
     is(results, null, "navigator.sync.registration() should return null.");
     runTests();
   },
-  genericError);
+  genericError.bind(null, 'registrationEmpty'));
 }
 
 function test_registration() {
@@ -113,7 +113,7 @@
     ok(!("app" in results), "navigator.sync.registrations().app is correct");
     runTests();
   },
-  genericError);
+  genericError.bind(null, 'registration'));
 }
 
 function test_registrationsEmpty() {
@@ -122,7 +122,7 @@
     is(results.length, 0, "navigator.sync.registrations() should return an empty array.");
     runTests();
   },
-  genericError);
+  genericError.bind(null, 'registrationEmpty'));
 }
 
 function test_registrations() {
@@ -139,7 +139,7 @@
     ok(!("app" in results[0]), "navigator.sync.registrations()[0].app is correct");
     runTests();
   },
-  genericError);
+  genericError.bind(null, 'registrations'));
 }
 
 function test_managerRegistrationsEmpty() {
@@ -148,7 +148,7 @@
     is(results.length, 0, "navigator.syncManager.registrations() should return an empty array.");
     runTests();
   },
-  genericError);
+  genericError.bind(null, 'managerRegistrationsEmpty'));
 }
 
 function test_managerRegistrations(state, overwrittenMinInterval) {
@@ -172,7 +172,7 @@
     ok("runNow" in results[0], "navigator.sync.registrations()[0].runNow is correct");
     runTests();
   },
-  genericError);
+  genericError.bind(null, 'managerRegistrations'));
 }
 
 function test_managerSetPolicy(state, overwrittenMinInterval) {
@@ -183,6 +183,6 @@
       ok(state, results[0].state, "State matches");
       ok(overwrittenMinInterval, results[0].overwrittenMinInterval, "OverwrittenMinInterval matches");
       runTests();
-    }, genericError);
-  }).catch(genericError);
+    }, genericError.bind(null, 'managerSetPolicy'));
+  }).catch(genericError.bind(null, 'managerSetPolicy_catch'));
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/DOMSecureElement.js firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/DOMSecureElement.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/DOMSecureElement.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/DOMSecureElement.js	2015-05-25 20:43:51.000000000 +0000
@@ -99,6 +99,7 @@
   _sessions: [],
 
   type: null,
+  _isSEPresent: false,
 
   classID: Components.ID("{1c7bdba3-cd35-4f8b-a546-55b3232457d5}"),
   contractID: "@mozilla.org/secureelement/reader;1",
@@ -112,22 +113,34 @@
     }
   },
 
-  initialize: function initialize(win, type) {
+  initialize: function initialize(win, type, isPresent) {
     this._window = win;
     this.type = type;
+    this._isSEPresent = isPresent;
+  },
+
+  _checkPresence: function _checkPresence() {
+    if (!this._isSEPresent) {
+      throw new Error(SE.ERROR_NOTPRESENT);
+    }
   },
 
   openSession: function openSession() {
+    this._checkPresence();
+
     return PromiseHelpers.createSEPromise((resolverId) => {
-      let chromeObj = new SESessionImpl();
-      chromeObj.initialize(this._window, this);
-      let contentObj = this._window.SESession._create(this._window, chromeObj);
-      this._sessions.push(contentObj);
-      PromiseHelpers.takePromiseResolver(resolverId).resolve(contentObj);
+      let sessionImpl = new SESessionImpl();
+      sessionImpl.initialize(this._window, this);
+      this._window.SESession._create(this._window, sessionImpl);
+      this._sessions.push(sessionImpl);
+      PromiseHelpers.takePromiseResolver(resolverId)
+                    .resolve(sessionImpl.__DOM_IMPL__);
     });
   },
 
   closeAll: function closeAll() {
+    this._checkPresence();
+
     return PromiseHelpers.createSEPromise((resolverId) => {
       let promises = [];
       for (let session of this._sessions) {
@@ -148,10 +161,24 @@
     });
   },
 
+  updateSEPresence: function updateSEPresence(isSEPresent) {
+    if (!isSEPresent) {
+      this.invalidate();
+      return;
+    }
+
+    this._isSEPresent = isSEPresent;
+  },
+
+  invalidate: function invalidate() {
+    debug("Invalidating SE reader: " + this.type);
+    this._isSEPresent = false;
+    this._sessions.forEach(s => s.invalidate());
+    this._sessions = [];
+  },
+
   get isSEPresent() {
-    // TODO: Bug 1119152 - Implement new idl with interfaces to detect
-    //                     secureelement state changes.
-    return true;
+    return this._isSEPresent;
   }
 };
 
@@ -254,6 +281,12 @@
     });
   },
 
+  invalidate: function invlidate() {
+    this._isClosed = true;
+    this._channels.forEach(ch => ch.invalidate());
+    this._channels = [];
+  },
+
   get reader() {
     return this._reader.__DOM_IMPL__;
   },
@@ -261,10 +294,6 @@
   get isClosed() {
     return this._isClosed;
   },
-
-  set isClosed(isClosed) {
-    this._isClosed = isClosed;
-  }
 };
 
 /**
@@ -387,6 +416,10 @@
     }, this);
   },
 
+  invalidate: function invalidate() {
+    this._isClosed = true;
+  },
+
   get session() {
     return this._session.__DOM_IMPL__;
   },
@@ -394,10 +427,6 @@
   get isClosed() {
     return this._isClosed;
   },
-
-  set isClosed(isClosed) {
-    this._isClosed = isClosed;
-  }
 };
 
 function SEResponseImpl() {}
@@ -447,6 +476,8 @@
     Ci.nsIObserver
   ]),
 
+  _readers: [],
+
   init: function init(win) {
     this._window = win;
     PromiseHelpers = new PromiseHelpersSubclass(this._window);
@@ -459,7 +490,8 @@
                       "SE:GetSEReadersRejected",
                       "SE:OpenChannelRejected",
                       "SE:CloseChannelRejected",
-                      "SE:TransmitAPDURejected"];
+                      "SE:TransmitAPDURejected",
+                      "SE:ReaderPresenceChanged"];
 
     this.initDOMRequestHelper(win, messages);
   },
@@ -476,13 +508,13 @@
   },
 
   getSEReaders: function getSEReaders() {
+    // invalidate previous readers on new request
+    if (this._readers.length) {
+      this._readers.forEach(r => r.invalidate());
+      this._readers = [];
+    }
+
     return PromiseHelpers.createSEPromise((resolverId) => {
-      /**
-       * @params for 'SE:GetSEReaders'
-       *
-       * resolverId  : Id that identifies this IPC request.
-       * appId       : Current appId obtained from 'Principal' obj
-       */
       cpmm.sendAsyncMessage("SE:GetSEReaders", {
         resolverId: resolverId,
         appId: this._window.document.nodePrincipal.appId
@@ -491,9 +523,9 @@
   },
 
   receiveMessage: function receiveMessage(message) {
+    DEBUG && debug("Message received: " + JSON.stringify(message));
+
     let result = message.data.result;
-    let chromeObj = null;
-    let contentObj = null;
     let resolver = null;
     let context = null;
 
@@ -504,40 +536,41 @@
       context = promiseResolver.context;
     }
 
-    debug("receiveMessage(): " + message.name);
     switch (message.name) {
       case "SE:GetSEReadersResolved":
         let readers = new this._window.Array();
-        for (let i = 0; i < result.readerTypes.length; i++) {
-          chromeObj = new SEReaderImpl();
-          chromeObj.initialize(this._window, result.readerTypes[i]);
-          contentObj = this._window.SEReader._create(this._window, chromeObj);
-          readers.push(contentObj);
-        }
+        result.readers.forEach(reader => {
+          let readerImpl = new SEReaderImpl();
+          readerImpl.initialize(this._window, reader.type, reader.isPresent);
+          this._window.SEReader._create(this._window, readerImpl);
+
+          this._readers.push(readerImpl);
+          readers.push(readerImpl.__DOM_IMPL__);
+        });
         resolver.resolve(readers);
         break;
       case "SE:OpenChannelResolved":
-        chromeObj = new SEChannelImpl();
-        chromeObj.initialize(this._window,
-                             result.channelToken,
-                             result.isBasicChannel,
-                             result.openResponse,
-                             context);
-        contentObj = this._window.SEChannel._create(this._window, chromeObj);
+        let channelImpl = new SEChannelImpl();
+        channelImpl.initialize(this._window,
+                               result.channelToken,
+                               result.isBasicChannel,
+                               result.openResponse,
+                               context);
+        this._window.SEChannel._create(this._window, channelImpl);
         if (context) {
           // Notify context's handler with SEChannel instance
-          context.onChannelOpen(contentObj);
+          context.onChannelOpen(channelImpl);
         }
-        resolver.resolve(contentObj);
+        resolver.resolve(channelImpl.__DOM_IMPL__);
         break;
       case "SE:TransmitAPDUResolved":
-        chromeObj = new SEResponseImpl();
-        chromeObj.initialize(result.sw1,
-                             result.sw2,
-                             result.response,
-                             context);
-        contentObj = this._window.SEResponse._create(this._window, chromeObj);
-        resolver.resolve(contentObj);
+        let responseImpl = new SEResponseImpl();
+        responseImpl.initialize(result.sw1,
+                                result.sw2,
+                                result.response,
+                                context);
+        this._window.SEResponse._create(this._window, responseImpl);
+        resolver.resolve(responseImpl.__DOM_IMPL__);
         break;
       case "SE:CloseChannelResolved":
         if (context) {
@@ -553,6 +586,13 @@
         let error = result.error || SE.ERROR_GENERIC;
         resolver.reject(error);
         break;
+      case "SE:ReaderPresenceChanged":
+        debug("Reader " + result.type + " present: " + result.isPresent);
+        let reader = this._readers.find(r => r.type === result.type);
+        if (reader) {
+          reader.updateSEPresence(result.isPresent);
+        }
+        break;
       default:
         debug("Could not find a handler for " + message.name);
         resolver.reject();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/DOMSecureElement.manifest firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/DOMSecureElement.manifest
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/DOMSecureElement.manifest	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/DOMSecureElement.manifest	2015-05-25 20:43:51.000000000 +0000
@@ -10,12 +10,5 @@
 component {181ebcf4-5164-4e28-99f2-877ec6fa83b9} DOMSecureElement.js
 contract @mozilla.org/secureelement/channel;1 {181ebcf4-5164-4e28-99f2-877ec6fa83b9}
 
-# component {cb8ccb1c-0e99-4a62-bf7d-11acc13848e0} DOMSecureElement.js
-# contract @mozilla.org/secureelement/command;1 {cb8ccb1c-0e99-4a62-bf7d-11acc13848e0}
-
 component {58bc6c7b-686c-47cc-8867-578a6ed23f4e} DOMSecureElement.js
 contract @mozilla.org/secureelement/response;1 {58bc6c7b-686c-47cc-8867-578a6ed23f4e}
-
-
-
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/gonk/ACEService.js firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/gonk/ACEService.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/gonk/ACEService.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/gonk/ACEService.js	2015-05-25 20:43:51.000000000 +0000
@@ -0,0 +1,183 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* Copyright © 2015, Deutsche Telekom, Inc. */
+
+"use strict";
+
+const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Promise.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "DOMApplicationRegistry",
+                                  "resource://gre/modules/Webapps.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "SEUtils",
+                                  "resource://gre/modules/SEUtils.jsm");
+
+XPCOMUtils.defineLazyGetter(this, "SE", function() {
+  let obj = {};
+  Cu.import("resource://gre/modules/se_consts.js", obj);
+  return obj;
+});
+
+let DEBUG = SE.DEBUG_ACE;
+function debug(msg) {
+  if (DEBUG) {
+    dump("ACEservice: " + msg + "\n");
+  }
+}
+
+/**
+ * Implements decision making algorithm as described in GPD specification,
+ * mostly in 3.1, 3.2 and 4.2.3.
+ *
+ * TODO: Bug 1137533: Implement GPAccessRulesManager APDU filters
+ */
+function GPAccessDecision(rules, certHash, aid) {
+  this.rules = rules;
+  this.certHash = certHash;
+  this.aid = aid;
+}
+
+GPAccessDecision.prototype = {
+  isAccessAllowed: function isAccessAllowed() {
+    // GPD SE Access Control v1.1, 3.4.1, Table 3-2: (Conflict resolution)
+    // If a specific rule allows, all other non-specific access is denied.
+    // Conflicting specific rules will resolve to the first Allowed == "true"
+    // match. Given no specific rule, the global "All" rules will determine
+    // access. "Some", skips further processing if access Allowed == "true".
+    //
+    // Access must be decided before the SE connector openChannel, and the
+    // exchangeAPDU call.
+    //
+    // NOTE: This implementation may change with the introduction of APDU
+    //       filters.
+    let decision = this.rules.some(this._decideAppAccess.bind(this));
+    return decision;
+  },
+
+  _decideAppAccess: function _decideAppAccess(rule) {
+    let appMatched, appletMatched;
+
+    // GPD SE AC 4.2.3: Algorithm for Applying Rules
+    // Specific rule overrides global rule.
+    //
+    // DeviceAppID is the application hash, and the AID is SE Applet ID:
+    //
+    // GPD SE AC 4.2.3 A:
+    //   SearchRuleFor(DeviceAppID, AID)
+    // GPD SE AC 4.2.3 B: If no rule fits A:
+    //   SearchRuleFor(<AllDeviceApplications>, AID)
+    // GPD SE AC 4.2.3 C: If no rule fits A or B:
+    //   SearchRuleFor(DeviceAppID, <AllSEApplications>)
+    // GPD SE AC 4.2.3 D: If no rule fits A, B, or C:
+    //   SearchRuleFor(<AllDeviceApplications>, <AllSEApplications>)
+
+    // Device App
+    appMatched = Array.isArray(rule.application) ?
+      // GPD SE AC 4.2.3 A and 4.2.3 C (DeviceAppID rule)
+      this._appCertHashMatches(rule.application) :
+      // GPD SE AC 4.2.3 B and 4.2.3 D (All Device Applications)
+      rule.application === Ci.nsIAccessRulesManager.ALLOW_ALL;
+
+    if (!appMatched) {
+      return false; // bail out early.
+    }
+
+    // SE Applet
+    appletMatched = Array.isArray(rule.applet) ?
+      // GPD SE AC 4.2.3 A and 4.2.3 B (AID rule)
+      SEUtils.arraysEqual(rule.applet, this.aid) :
+      // GPD SE AC 4.2.3 C and 4.2.3 D (All AID)
+      rule.applet === Ci.nsIAccessRulesManager.ALL_APPLET;
+
+    return appletMatched;
+  },
+
+  _appCertHashMatches: function _appCertHashMatches(hashArray) {
+    if (!Array.isArray(hashArray)) {
+      return false;
+    }
+
+    return !!(hashArray.find((hash) => {
+      return SEUtils.arraysEqual(hash, this.certHash);
+    }));
+  }
+};
+
+function ACEService() {
+  this._rulesManagers = new Map();
+
+  this._rulesManagers.set(
+    SE.TYPE_UICC,
+    Cc["@mozilla.org/secureelement/access-control/rules-manager;1"]
+      .createInstance(Ci.nsIAccessRulesManager));
+}
+
+ACEService.prototype = {
+  _rulesManagers: null,
+
+  isAccessAllowed: function isAccessAllowed(localId, seType, aid) {
+    let manifestURL = DOMApplicationRegistry.getManifestURLByLocalId(localId);
+    if (!manifestURL) {
+      return Promise.reject(Error("Missing manifest for app: " + localId));
+    }
+
+    let rulesManager = this._rulesManagers.get(seType);
+    if (!rulesManager) {
+      debug("App " + manifestURL + " tried to access '" + seType + "' SE" +
+            " which is not supported.");
+      return Promise.reject(Error("SE type '" + seType + "' not supported"));
+    }
+
+    return new Promise((resolve, reject) => {
+      debug("isAccessAllowed for " + manifestURL + " to " + aid);
+
+      // Bug 1132749: Implement ACE crypto signature verification
+      this._getDevCertHashForApp(manifestURL).then((certHash) => {
+        if (!certHash) {
+          debug("App " + manifestURL + " tried to access SE, but no developer" +
+                " certificate present");
+          reject(Error("No developer certificate found"));
+          return;
+        }
+
+        rulesManager.getAccessRules().then((rules) => {
+          let decision = new GPAccessDecision(rules,
+            SEUtils.hexStringToByteArray(certHash), aid);
+
+          resolve(decision.isAccessAllowed());
+        });
+      });
+    });
+  },
+
+  _getDevCertHashForApp: function getDevCertHashForApp(manifestURL) {
+    return DOMApplicationRegistry.getManifestFor(manifestURL)
+    .then((manifest) => {
+      DEBUG && debug("manifest retrieved: " + JSON.stringify(manifest));
+
+      // TODO: Bug 973823
+      //  - retrieve the cert from the app
+      //  - verify GUID signature
+      //  - compute the hash of the cert and possibly store it for future use
+      //    (right now we have the cert hash included in manifest file)
+      //  - remove this once we have fixed all the todos
+      let certHash = manifest.dev_cert_hash || "";
+      return Promise.resolve(certHash);
+    })
+    .catch((error) => {
+      return Promise.reject(Error("Not able to retrieve certificate hash: " +
+                                  error));
+    });
+  },
+
+  classID: Components.ID("{882a7463-2ca7-4d61-a89a-10eb6fd70478}"),
+  contractID: "@mozilla.org/secureelement/access-control/ace;1",
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIAccessControlEnforcer])
+};
+
+this.NSGetFactory = XPCOMUtils.generateNSGetFactory([ACEService]);
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/gonk/ACEService.manifest firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/gonk/ACEService.manifest
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/gonk/ACEService.manifest	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/gonk/ACEService.manifest	2015-05-25 20:43:51.000000000 +0000
@@ -0,0 +1,2 @@
+component {882a7463-2ca7-4d61-a89a-10eb6fd70478} ACEService.js
+contract @mozilla.org/secureelement/access-control/ace;1 {882a7463-2ca7-4d61-a89a-10eb6fd70478}
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/gonk/GPAccessRulesManager.js firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/gonk/GPAccessRulesManager.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/gonk/GPAccessRulesManager.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/gonk/GPAccessRulesManager.js	2015-05-25 20:43:51.000000000 +0000
@@ -0,0 +1,436 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* Copyright © 2015, Deutsche Telekom, Inc. */
+
+"use strict";
+
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Promise.jsm");
+Cu.import("resource://gre/modules/Task.jsm");
+Cu.import("resource://gre/modules/systemlibs.js");
+
+XPCOMUtils.defineLazyServiceGetter(this, "UiccConnector",
+                                   "@mozilla.org/secureelement/connector/uicc;1",
+                                   "nsISecureElementConnector");
+
+XPCOMUtils.defineLazyModuleGetter(this, "SEUtils",
+                                  "resource://gre/modules/SEUtils.jsm");
+
+XPCOMUtils.defineLazyGetter(this, "SE", function() {
+  let obj = {};
+  Cu.import("resource://gre/modules/se_consts.js", obj);
+  return obj;
+});
+
+XPCOMUtils.defineLazyGetter(this, "GP", function() {
+  let obj = {};
+  Cu.import("resource://gre/modules/gp_consts.js", obj);
+  return obj;
+});
+
+let DEBUG = SE.DEBUG_ACE;
+function debug(msg) {
+  if (DEBUG) {
+    dump("-*- GPAccessRulesManager " + msg);
+  }
+}
+
+/**
+ * Based on [1] - "GlobalPlatform Device Technology
+ * Secure Element Access Control Version 1.0".
+ * GPAccessRulesManager reads and parses access rules from SE file system
+ * as defined in section #7 of [1]: "Structure of Access Rule Files (ARF)".
+ * Rules retrieval from ARA-M applet is not implmented due to lack of
+ * commercial implemenations of ARA-M.
+ * @todo Bug 1137537: Implement ARA-M support according to section #4 of [1]
+ */
+function GPAccessRulesManager() {}
+
+GPAccessRulesManager.prototype = {
+  // source [1] section 7.1.3 PKCS#15 Selection
+  PKCS_AID: "a000000063504b43532d3135",
+
+  // APDUs (ISO 7816-4) for accessing rules on SE file system
+  // see for more details: http://www.cardwerk.com/smartcards/
+  // smartcard_standard_ISO7816-4_6_basic_interindustry_commands.aspx
+  READ_BINARY:   [GP.CLA_SM, GP.INS_RB, GP.P1_RB, GP.P2_RB],
+  GET_RESPONSE:  [GP.CLA_SM, GP.INS_GR, GP.P1_GR, GP.P2_GR],
+  SELECT_BY_DF:  [GP.CLA_SM, GP.INS_SF, GP.P1_SF_DF, GP.P2_SF_FCP],
+
+  // Non-null if there is a channel open
+  channel: null,
+
+  // Refresh tag path in the acMain file as described in GPD spec,
+  // sections 7.1.5 and C.1.
+  REFRESH_TAG_PATH: [GP.TAG_SEQUENCE, GP.TAG_OCTETSTRING],
+  refreshTag: null,
+
+  // Contains rules as read from the SE
+  rules: [],
+
+  // Returns the latest rules. Results are cached.
+  getAccessRules: function getAccessRules() {
+    debug("getAccessRules");
+
+    return new Promise((resolve, reject) => {
+      this._readAccessRules(() => resolve(this.rules));
+    });
+  },
+
+  _readAccessRules: Task.async(function*(done) {
+    try {
+      yield this._openChannel(this.PKCS_AID);
+
+      let odf = yield this._readODF();
+      let dodf = yield this._readDODF(odf);
+
+      let acmf = yield this._readACMF(dodf);
+      let refreshTag = acmf[this.REFRESH_TAG_PATH[0]]
+                           [this.REFRESH_TAG_PATH[1]];
+
+      // Update cached rules based on refreshTag.
+      if (SEUtils.arraysEqual(this.refreshTag, refreshTag)) {
+        debug("_readAccessRules: refresh tag equals to the one saved.");
+        yield this._closeChannel();
+        return done();
+      }
+
+      this.refreshTag = refreshTag;
+      debug("_readAccessRules: refresh tag saved: " + this.refreshTag);
+
+      let acrf = yield this._readACRules(acmf);
+      let accf = yield this._readACConditions(acrf);
+      this.rules = yield this._parseRules(acrf, accf);
+
+      DEBUG && debug("_readAccessRules: " + JSON.stringify(this.rules, 0, 2));
+
+      yield this._closeChannel();
+      done();
+    } catch (error) {
+      debug("_readAccessRules: " + error);
+      this.rules = [];
+      yield this._closeChannel();
+      done();
+    }
+  }),
+
+  _openChannel: function _openChannel(aid) {
+    if (this.channel !== null) {
+      debug("_openChannel: Channel already opened, rejecting.");
+      return Promise.reject();
+    }
+
+    return new Promise((resolve, reject) => {
+      UiccConnector.openChannel(aid, {
+        notifyOpenChannelSuccess: (channel, openResponse) => {
+          debug("_openChannel/notifyOpenChannelSuccess: Channel " + channel +
+                " opened, open response: " + openResponse);
+          this.channel = channel;
+          resolve();
+        },
+        notifyError: (error) => {
+          debug("_openChannel/notifyError: failed to open channel, error: " +
+                error);
+          reject(error);
+        }
+      });
+    });
+  },
+
+  _closeChannel: function _closeChannel() {
+    if (this.channel === null) {
+      debug("_closeChannel: Channel not opened, rejecting.");
+      return Promise.reject();
+    }
+
+    return new Promise((resolve, reject) => {
+      UiccConnector.closeChannel(this.channel, {
+        notifyCloseChannelSuccess: () => {
+          debug("_closeChannel/notifyCloseChannelSuccess: chanel " +
+                this.channel + " closed");
+          this.channel = null;
+          resolve();
+        },
+        notifyError: (error) => {
+          debug("_closeChannel/notifyError: error closing channel, error" +
+                error);
+          reject(error);
+        }
+      });
+    });
+  },
+
+  _exchangeAPDU: function _exchangeAPDU(bytes) {
+    DEBUG && debug("apdu " + JSON.stringify(bytes));
+
+    let apdu = this._bytesToAPDU(bytes);
+    return new Promise((resolve, reject) => {
+      UiccConnector.exchangeAPDU(this.channel, apdu.cla,
+        apdu.ins, apdu.p1, apdu.p2, apdu.data, apdu.le,
+        {
+          notifyExchangeAPDUResponse: (sw1, sw2, data) => {
+            debug("APDU response is " + sw1.toString(16) + sw2.toString(16) +
+                  " data: " + data);
+
+            // 90 00 is "success"
+            if (sw1 !== 0x90 && sw2 !== 0x00) {
+              debug("rejecting APDU response");
+              reject(new Error("Response " + sw1 + "," + sw2));
+              return;
+            }
+
+            resolve(this._parseTLV(data));
+          },
+
+          notifyError: (error) => {
+            debug("_exchangeAPDU/notifyError " + error);
+            reject(error);
+          }
+        }
+      );
+    });
+  },
+
+  _readBinaryFile: function _readBinaryFile(selectResponse) {
+    DEBUG && debug("Select response: " + JSON.stringify(selectResponse));
+    // 0x80 tag parameter - get the elementary file (EF) length
+    // without structural information.
+    let fileLength = selectResponse[GP.TAG_FCP][0x80];
+
+    // If file is empty, no need to attempt to read it.
+    if (fileLength[0] === 0 && fileLength[1] === 0) {
+      return Promise.resolve(null);
+    }
+
+    // TODO READ BINARY with filelength not supported
+    // let readApdu = this.READ_BINARY.concat(fileLength);
+    return this._exchangeAPDU(this.READ_BINARY);
+  },
+
+  _selectAndRead: function _selectAndRead(df) {
+    return this._exchangeAPDU(this.SELECT_BY_DF.concat(df.length & 0xFF, df))
+           .then((resp) => this._readBinaryFile(resp));
+  },
+
+  _readODF: function _readODF() {
+    debug("_readODF");
+    return this._selectAndRead(GP.ODF_DF);
+  },
+
+  _readDODF: function _readDODF(odfFile) {
+    debug("_readDODF, ODF file: " + odfFile);
+
+    // Data Object Directory File (DODF) is used as an entry point to the
+    // Access Control data. It is specified in PKCS#15 section 6.7.6.
+    // DODF is referenced by the ODF file, which looks as follows:
+    //   A7 06
+    //      30 04
+    //         04 02 XY WZ
+    // where [0xXY, 0xWZ] is a DF of DODF file.
+    let DODF_DF = odfFile[GP.TAG_EF_ODF][GP.TAG_SEQUENCE][GP.TAG_OCTETSTRING];
+    return this._selectAndRead(DODF_DF);
+  },
+
+  _readACMF: function _readACMF(dodfFile) {
+    debug("_readACMF, DODF file: " + dodfFile);
+
+    // ACMF file DF is referenced in DODF file, which looks like this:
+    //
+    //  A1 29
+    //     30 00
+    //     30 0F
+    //        0C 0D 47 50 20 53 45 20 41 63 63 20 43 74 6C
+    //     A1 14
+    //        30 12
+    //           06 0A 2A 86 48 86 FC 6B 81 48 01 01  <-- GPD registered OID
+    //           30 04
+    //              04 02 AB CD  <-- ACMF DF
+    //  A1 2B
+    //     30 00
+    //     30 0F
+    //        0C 0D 53 41 54 53 41 20 47 54 4F 20 31 2E 31
+    //     A1 16
+    //        30 14
+    //           06 0C 2B 06 01 04 01 2A 02 6E 03 01 01 01  <-- some other OID
+    //           30 04
+    //              04 02 XY WZ  <-- some other file's DF
+    //
+    // DODF file consists of DataTypes with oidDO entries. Entry with OID
+    // equal to "1.2.840.114283.200.1.1" ("2A 86 48 86 FC 6B 81 48 01 01")
+    // contains DF of the ACMF. In the file above, it means that ACMF DF
+    // equals to [0xAB, 0xCD], and not [0xXY, 0xWZ].
+    //
+    // Algorithm used to encode OID to an byte array:
+    //   http://www.snmpsharpnet.com/?p=153
+
+    let gpdOid = [0x2A,                 // 1.2
+                  0x86, 0x48,           // 840
+                  0x86, 0xFC, 0x6B,     // 114283
+                  0x81, 0x48,           // 129
+                  0x01,                 // 1
+                  0x01];                // 1
+
+    let records = SEUtils.ensureIsArray(dodfFile[GP.TAG_EXTERNALDO]);
+
+    // Look for the OID registered for GPD SE.
+    let gpdRecords = records.filter((record) => {
+      let oid = record[GP.TAG_EXTERNALDO][GP.TAG_SEQUENCE][GP.TAG_OID];
+      return SEUtils.arraysEqual(oid, gpdOid);
+    });
+
+    // [1] 7.1.5: "There shall be only one ACMF file per Secure Element.
+    // If a Secure Element contains several ACMF files, then the security shall
+    // be considered compromised and the Access Control enforcer shall forbid
+    // access to all (...) apps."
+    if (gpdRecords.length !== 1) {
+      return Promise.reject(new Error(gpdRecords.length + " ACMF files found"));
+    }
+
+    let ACMain_DF = gpdRecords[0][GP.TAG_EXTERNALDO][GP.TAG_SEQUENCE]
+                                 [GP.TAG_SEQUENCE][GP.TAG_OCTETSTRING];
+    return this._selectAndRead(ACMain_DF);
+  },
+
+  _readACRules: function _readACRules(acMainFile) {
+    debug("_readACRules, ACMain file: " + acMainFile);
+
+    // ACMF looks like this:
+    //
+    //  30 10
+    //    04 08 XX XX XX XX XX XX XX XX
+    //    30 04
+    //       04 02 XY WZ
+    //
+    // where [XY, WZ] is a DF of ACRF, and XX XX XX XX XX XX XX XX is a refresh
+    // tag.
+
+    let ACRules_DF = acMainFile[GP.TAG_SEQUENCE][GP.TAG_SEQUENCE][GP.TAG_OCTETSTRING];
+    return this._selectAndRead(ACRules_DF);
+  },
+
+  _readACConditions: function _readACConditions(acRulesFile) {
+    debug("_readACCondition, ACRules file: " + acRulesFile);
+
+    let acRules = SEUtils.ensureIsArray(acRulesFile[GP.TAG_SEQUENCE]);
+    if (acRules.length === 0) {
+      debug("No rules found in ACRules file.");
+      return Promise.reject(new Error("No rules found in ACRules file"));
+    }
+
+    // We first read all the condition files referenced in the ACRules file,
+    // because ACRules file might reference one ACCondition file more than
+    // once. Since reading it isn't exactly fast, we optimize here.
+    let acReadQueue = Promise.resolve({});
+
+    acRules.forEach((ruleEntry) => {
+      let df = ruleEntry[GP.TAG_SEQUENCE][GP.TAG_OCTETSTRING];
+
+      // Promise chain read condition entries:
+      let readAcCondition = (acConditionFiles) => {
+        if (acConditionFiles[df] !== undefined) {
+          debug("Skipping previously read acCondition df: " + df);
+          return acConditionFiles;
+        }
+
+        return this._selectAndRead(df)
+               .then((acConditionFileContents) => {
+                 acConditionFiles[df] = acConditionFileContents;
+                 return acConditionFiles;
+               });
+      }
+
+      acReadQueue = acReadQueue.then(readAcCondition);
+    });
+
+    return acReadQueue;
+  },
+
+  _parseRules: function _parseRules(acRulesFile, acConditionFiles) {
+    DEBUG && debug("_parseRules: acConditionFiles " + JSON.stringify(acConditionFiles));
+    let rules = [];
+
+    let acRules = SEUtils.ensureIsArray(acRulesFile[GP.TAG_SEQUENCE]);
+    acRules.forEach((ruleEntry) => {
+      DEBUG && debug("Parsing one rule: " + JSON.stringify(ruleEntry));
+      let rule = {};
+
+      // 0xA0 and 0x82 tags as per GPD spec sections C.1 - C.3. 0xA0 means
+      // that rule describes access to one SE applet only (and its AID is
+      // given). 0x82 means that rule describes acccess to all SE applets.
+      let oneApplet = ruleEntry[GP.TAG_GPD_AID];
+      let allApplets = ruleEntry[GP.TAG_GPD_ALL];
+
+      if (oneApplet) {
+        rule.applet = oneApplet[GP.TAG_OCTETSTRING];
+      } else if (allApplets) {
+        rule.applet = Ci.nsIAccessRulesManager.ALL_APPLET;
+      } else {
+        throw Error("Unknown applet definition");
+      }
+
+      let df = ruleEntry[GP.TAG_SEQUENCE][GP.TAG_OCTETSTRING];
+      let condition = acConditionFiles[df];
+      if (condition === null) {
+        rule.application = Ci.nsIAccessRulesManager.DENY_ALL;
+      } else if (condition[GP.TAG_SEQUENCE]) {
+        if (!Array.isArray(condition[GP.TAG_SEQUENCE]) &&
+            !condition[GP.TAG_SEQUENCE][GP.TAG_OCTETSTRING]) {
+          rule.application = Ci.nsIAccessRulesManager.ALLOW_ALL;
+        } else {
+          rule.application = SEUtils.ensureIsArray(condition[GP.TAG_SEQUENCE])
+                             .map((conditionEntry) => {
+            return conditionEntry[GP.TAG_OCTETSTRING];
+          });
+        }
+      } else {
+        throw Error("Unknown application definition");
+      }
+
+      DEBUG && debug("Rule parsed, adding to the list: " + JSON.stringify(rule));
+      rules.push(rule);
+    });
+
+    DEBUG && debug("All rules parsed, we have those in total: " + JSON.stringify(rules));
+    return rules;
+  },
+
+  _parseTLV: function _parseTLV(bytes) {
+    let containerTags = [
+      GP.TAG_SEQUENCE,
+      GP.TAG_FCP,
+      GP.TAG_GPD_AID,
+      GP.TAG_EXTERNALDO,
+      GP.TAG_INDIRECT,
+      GP.TAG_EF_ODF
+    ];
+    return SEUtils.parseTLV(bytes, containerTags);
+  },
+
+  // TODO consider removing if better format for storing
+  // APDU consts will be introduced
+  _bytesToAPDU: function _bytesToAPDU(arr) {
+    let apdu = {
+      cla: arr[0] & 0xFF,
+      ins: arr[1] & 0xFF,
+      p1: arr[2] & 0xFF,
+      p2: arr[3] & 0xFF,
+      p3: arr[4] & 0xFF,
+      le: 0
+    };
+
+    let data = (apdu.p3 > 0) ? (arr.slice(5)) : [];
+    apdu.data = (data.length) ? SEUtils.byteArrayToHexString(data) : null;
+    return apdu;
+  },
+
+  classID: Components.ID("{3e046b4b-9e66-439a-97e0-98a69f39f55f}"),
+  contractID: "@mozilla.org/secureelement/access-control/rules-manager;1",
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIAccessRulesManager])
+};
+
+this.NSGetFactory = XPCOMUtils.generateNSGetFactory([GPAccessRulesManager]);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/gonk/GPAccessRulesManager.manifest firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/gonk/GPAccessRulesManager.manifest
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/gonk/GPAccessRulesManager.manifest	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/gonk/GPAccessRulesManager.manifest	2015-05-25 20:43:51.000000000 +0000
@@ -0,0 +1,2 @@
+component {3e046b4b-9e66-439a-97e0-98a69f39f55f} GPAccessRulesManager.js
+contract @mozilla.org/secureelement/access-control/rules-manager;1 {3e046b4b-9e66-439a-97e0-98a69f39f55f}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/gonk/gp_consts.js firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/gonk/gp_consts.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/gonk/gp_consts.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/gonk/gp_consts.js	2015-05-25 20:43:51.000000000 +0000
@@ -0,0 +1,62 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* Copyright © 2015, Deutsche Telekom, Inc. */
+
+/* Object Directory File (ODF) is an elementary file which contain
+   pointers to other EFs. It is specified in PKCS#15 section 6.7. */
+this.ODF_DF = [0x50, 0x31];
+
+/* ISO 7816-4: secure messaging */
+this.CLA_SM = 0x00;
+
+/* ISO 7816-4, 5.4.1 table 11 */
+this.INS_SF = 0xA4; // select file
+this.INS_GR = 0xC0; // get response
+this.INS_RB = 0xB0; // read binary
+
+/* ISO 7816-4: select file, see 6.11.3, table 58 & 59 */
+this.P1_SF_DF = 0x00; // select DF
+this.P2_SF_FCP = 0x04; // return FCP
+
+/* ISO 7816-4: read binary, 6.1.3. P1 and P2 describe offset of the first byte
+   to be read. We always read the whole files at the moment. */
+this.P1_RB = 0x00;
+this.P2_RB = 0x00;
+
+/* ISO 7816-4: get response, 7.1.3 table 74,  P1-P2 '0000' (other values RFU) */
+this.P1_GR = 0x00;
+this.P2_GR = 0x00;
+
+/* ISO 7816-4: 5.1.5 File Control Information, Table 1. For FCP and FMD. */
+this.TAG_PROPRIETARY = 0x00;
+this.TAG_NON_TLV = 0x53;
+this.TAG_BER_TLV = 0x73;
+
+/* ASN.1 tags */
+this.TAG_SEQUENCE = 0x30;
+this.TAG_OCTETSTRING = 0x04;
+this.TAG_OID = 0x06; // Object Identifier
+
+/* ISO 7816-4: 5.1.5 File Control Information, Templates. */
+this.TAG_FCP = 0x62; // File control parameters template
+this.TAG_FMD = 0x64; // File management data template
+this.TAG_FCI = 0x6F; // File control information template
+
+/* EF_DIR tags */
+this.TAG_APPLTEMPLATE = 0x61;
+this.TAG_APPLIDENTIFIER = 0x4F;
+this.TAG_APPLLABEL = 0x50;
+this.TAG_APPLPATH = 0x51;
+
+this.TAG_GPD_ALL = 0x82; // EF-ACRules - GPD spec. "all applets"
+
+/* Generic TLVs that are parsed */
+this.TAG_GPD_AID = 0xA0; // AID in the EF-ACRules - GPD spec, "one applet"
+this.TAG_EXTERNALDO = 0xA1; // External data objects - PKCS#15
+this.TAG_INDIRECT = 0xA5; // Indirect value.
+this.TAG_EF_ODF = 0xA7; // Elemenetary File Object Directory File
+
+// Allow this file to be imported via Components.utils.import().
+this.EXPORTED_SYMBOLS = Object.keys(this);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/gonk/nsIAccessControlEnforcer.idl firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/gonk/nsIAccessControlEnforcer.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/gonk/nsIAccessControlEnforcer.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/gonk/nsIAccessControlEnforcer.idl	2015-05-25 20:43:51.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/. */
+
+/* Copyright © 2015, Deutsche Telekom, Inc. */
+
+#include "nsISupports.idl"
+
+interface nsIVariant;
+
+[scriptable, uuid(4994a960-26d9-4d71-82dd-4505bd97bf2a)]
+interface nsIAccessControlEnforcer : nsISupports
+{
+  /**
+   * Determines whether application identified by its ID should be allowed
+   * to access Secure Element's applet identified by its AID. Decision
+   * is made according to the GPD specification.
+   *
+   * @param  localId
+   *         ID of an application accessing SE
+   * @param  seType
+   *         Type of the SE.
+   * @param  aid
+   *         AID of a SE applet
+   * @return Promise which is resolved to true if access should be allowed,
+   *         false otherwise, and rejected if the application contains
+   *         no developer certificate.
+   */
+  jsval isAccessAllowed(in unsigned long localId,
+                        in DOMString seType,
+                        in DOMString aid);
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/gonk/nsIAccessRulesManager.idl firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/gonk/nsIAccessRulesManager.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/gonk/nsIAccessRulesManager.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/gonk/nsIAccessRulesManager.idl	2015-05-25 20:43:51.000000000 +0000
@@ -0,0 +1,50 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* Copyright © 2015, Deutsche Telekom, Inc. */
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(7baedd2a-3189-4b03-b2a3-34016043b5e2)]
+interface nsIAccessRulesManager : nsISupports
+{
+  /* Wildcard: rule allows all applications to access an SE applet */
+  const unsigned short ALLOW_ALL = 1;
+  /* Wildcard: rule denies all applications to access an SE applet */
+  const unsigned short DENY_ALL = 2;
+  /* Wildcard: rule allows application(s) access to all SE applets */
+  const unsigned short ALL_APPLET = 3;
+
+  /**
+   * Initiates Access Rules Manager, this should perform the initial
+   * reading of rules from access rule source
+   * @return Promise which is resolved if init is successful or rejected
+   *         otherwise
+   */
+  jsval init();
+
+  /**
+   * Retrieves all access rules.
+   *
+   * Rules are stored in an array. Each rule contains the following properties:
+   *  - applet - describes an SE applet referenced by this rule. Might equal
+   *             to an applet AID (as a byte array), or to a wildcard "all"
+   *             meaning all applets.
+   *  - application - describes an application referenced by this rule. Might
+   *                  be an array of developer certificate hashes (each as
+   *                  a byte array) in which case it lists all applications
+   *                  allowed access. Alternatively, might equal to wildcard
+   *                  "allowed-all" or "denied-all".
+   *
+   * Example rule format:
+   *   [{ applet: ALL_APPLET,
+   *      application: [[0x01, 0x02, ..., 0x20],
+   *                    [0x20, 0x19, ...., 0x01]],
+   *    { applet: [0x00, 0x01, ..., 0x05],
+   *      application: ALLOW_ALL}}]
+   *
+   * @return Promise which resolves with Array containing parsed access rules
+   */
+  jsval getAccessRules();
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/gonk/nsISecureElementConnector.idl firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/gonk/nsISecureElementConnector.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/gonk/nsISecureElementConnector.idl	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/gonk/nsISecureElementConnector.idl	2015-05-25 20:43:51.000000000 +0000
@@ -46,7 +46,13 @@
   void notifyError(in DOMString error);
 };
 
-[scriptable, uuid(88e23684-0de3-4792-83a0-0eb67a6ca448)]
+[scriptable, uuid(417f59ee-f582-45b9-9a4e-e9dcefecb4f7)]
+interface nsISEListener : nsISupports
+{
+  void notifySEPresenceChanged(in DOMString seType, in boolean isPresent);
+};
+
+[scriptable, uuid(3cef313a-1d01-432d-9cd2-6610a80911f3)]
 interface nsISecureElementConnector : nsISupports
 {
    /**
@@ -101,4 +107,18 @@
     */
    void closeChannel(in long channel,
                      in nsISEChannelCallback callback);
+
+   /**
+    * Register a Secure Element listener
+    *
+    * @param listener
+    */
+   void registerListener(in nsISEListener listener);
+
+   /**
+    * Unregister a Secure Element listener
+    *
+    * @param listener
+    */
+   void unregisterListener(in nsISEListener listener);
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/gonk/se_consts.js firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/gonk/se_consts.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/gonk/se_consts.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/gonk/se_consts.js	2015-05-25 20:43:51.000000000 +0000
@@ -20,6 +20,7 @@
 
 // Set individually to debug specific layers
 this.DEBUG_CONNECTOR = DEBUG_ALL || false;
+this.DEBUG_ACE = DEBUG_ALL || false ;
 this.DEBUG_SE = DEBUG_ALL || false ;
 
 // Maximun logical channels per session.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/gonk/SecureElement.js firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/gonk/SecureElement.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/gonk/SecureElement.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/gonk/SecureElement.js	2015-05-25 20:43:51.000000000 +0000
@@ -91,7 +91,6 @@
     // {
     //   "appId1": {
     //     target: target1,
-    //     readerType: ["uicc", "eSE"],
     //     channels: {
     //       "channelToken1": {
     //         seType: "uicc",
@@ -105,7 +104,7 @@
     // }
     appInfoMap: {},
 
-    registerSecureElementTarget: function(appId, readerTypes, target) {
+    registerSecureElementTarget: function(appId, target) {
       if (this.isAppIdRegistered(appId)) {
         debug("AppId: " + appId + "already registered");
         return;
@@ -113,7 +112,6 @@
 
       this.appInfoMap[appId] = {
         target: target,
-        readerTypes: readerTypes,
         channels: {}
       };
 
@@ -181,6 +179,11 @@
       return Object.keys(this.appInfoMap[appId].channels)
                    .map(token => this.appInfoMap[appId].channels[token]);
     },
+
+    getTargets: function() {
+      return Object.keys(this.appInfoMap)
+                   .map(appId => this.appInfoMap[appId].target);
+    },
   };
 });
 
@@ -188,29 +191,45 @@
  * 'SecureElementManager' is the main object that handles IPC messages from
  * child process. It interacts with other objects such as 'gMap' & 'Connector
  * instances (UiccConnector, eSEConnector)' to perform various
- * SE-related (open,close,transmit) operations.
+ * SE-related (open, close, transmit) operations.
+ * @TODO: Bug 1118097 Support slot based SE/reader names
+ * @TODO: Bug 1118101 Introduce SE type specific permissions
  */
 function SecureElementManager() {
   this._registerMessageListeners();
+  this._registerSEListeners();
   Services.obs.addObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, false);
+  this._acEnforcer =
+    Cc["@mozilla.org/secureelement/access-control/ace;1"]
+    .getService(Ci.nsIAccessControlEnforcer);
 }
 
 SecureElementManager.prototype = {
   QueryInterface: XPCOMUtils.generateQI([
     Ci.nsIMessageListener,
+    Ci.nsISEListener,
     Ci.nsIObserver]),
   classID: SECUREELEMENTMANAGER_CID,
   classInfo: XPCOMUtils.generateCI({
     classID:          SECUREELEMENTMANAGER_CID,
     classDescription: "SecureElementManager",
     interfaces:       [Ci.nsIMessageListener,
+                       Ci.nsISEListener,
                        Ci.nsIObserver]
   }),
 
+  // Stores information about supported SE types and their presence.
+  // key: secure element type, value: (Boolean) is present/accessible
+  _sePresence: {},
+
+  _acEnforcer: null,
+
   _shutdown: function() {
+    this._acEnforcer = null;
     this.secureelement = null;
     Services.obs.removeObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID);
     this._unregisterMessageListeners();
+    this._unregisterSEListeners();
   },
 
   _registerMessageListeners: function() {
@@ -228,19 +247,36 @@
     ppmm = null;
   },
 
-  _getAvailableReaderTypes: function() {
-    let readerTypes = [];
-    // TODO 1: Bug 1118096 - Add IDL so that other sub-systems such as RIL ,
-    // NFC can implement it.
-    // TODO 2: Bug 1118097 - According to OpenMobile spec, the reader names
-    // should support slot based naming convention.
-    // i;e; Instead of returning 'uicc', return 'uicc<slot#>'.
-
-    if (UiccConnector) {
-      readerTypes.push(SE.TYPE_UICC);
+  _registerSEListeners: function() {
+    let connector = getConnector(SE.TYPE_UICC);
+    if (!connector) {
+      return;
     }
 
-    return readerTypes;
+    this._sePresence[SE.TYPE_UICC] = false;
+    connector.registerListener(this);
+  },
+
+  _unregisterSEListeners: function() {
+    Object.keys(this._sePresence).forEach((type) => {
+      let connector = getConnector(type);
+      if (connector) {
+        connector.unregisterListener(this);
+      }
+    });
+
+    this._sePresence = {};
+  },
+
+  notifySEPresenceChanged: function(type, isPresent) {
+    // we need to notify all targets, even those without open channels,
+    // app could've stored the reader without actually using it
+    debug("notifying DOM about SE state change");
+    this._sePresence[type] = isPresent;
+    gMap.getTargets().forEach(target => {
+      let result = { type: type, isPresent: isPresent };
+      target.sendAsyncMessage("SE:ReaderPresenceChanged", { result: result });
+    });
   },
 
   _canOpenChannel: function(appId, type) {
@@ -258,7 +294,6 @@
       return;
     }
 
-    // TODO: Bug 1118098  - Integrate with ACE module
     let connector = getConnector(msg.type);
     if (!connector) {
       debug("No SE connector available");
@@ -266,29 +301,41 @@
       return;
     }
 
-    connector.openChannel(SEUtils.byteArrayToHexString(msg.aid), {
-      notifyOpenChannelSuccess: (channelNumber, openResponse) => {
-        // Add the new 'channel' to the map upon success
-        let channelToken =
-          gMap.addChannel(msg.appId, msg.type, msg.aid, channelNumber);
-        if (channelToken) {
-          callback({
-            error: SE.ERROR_NONE,
-            channelToken: channelToken,
-            isBasicChannel: (channelNumber === SE.BASIC_CHANNEL),
-            openResponse: SEUtils.hexStringToByteArray(openResponse)
-          });
-        } else {
-          callback({ error: SE.ERROR_GENERIC });
-        }
-      },
-
-      notifyError: (reason) => {
-        debug("Failed to open the channel to AID : " +
-               SEUtils.byteArrayToHexString(msg.aid) +
-               ", Rejected with Reason : " + reason);
-        callback({ error: SE.ERROR_GENERIC, reason: reason, response: [] });
+    this._acEnforcer.isAccessAllowed(msg.appId, msg.type, msg.aid)
+    .then((allowed) => {
+      if (!allowed) {
+        callback({ error: SE.ERROR_SECURITY });
+        return;
       }
+      connector.openChannel(SEUtils.byteArrayToHexString(msg.aid), {
+
+        notifyOpenChannelSuccess: (channelNumber, openResponse) => {
+          // Add the new 'channel' to the map upon success
+          let channelToken =
+            gMap.addChannel(msg.appId, msg.type, msg.aid, channelNumber);
+          if (channelToken) {
+            callback({
+              error: SE.ERROR_NONE,
+              channelToken: channelToken,
+              isBasicChannel: (channelNumber === SE.BASIC_CHANNEL),
+              openResponse: SEUtils.hexStringToByteArray(openResponse)
+            });
+          } else {
+            callback({ error: SE.ERROR_GENERIC });
+          }
+        },
+
+        notifyError: (reason) => {
+          debug("Failed to open the channel to AID : " +
+                SEUtils.byteArrayToHexString(msg.aid) +
+                ", Rejected with Reason : " + reason);
+          callback({ error: SE.ERROR_GENERIC, reason: reason, response: [] });
+        }
+      });
+    })
+    .catch((error) => {
+      debug("Failed to get info from accessControlEnforcer " + error);
+      callback({ error: SE.ERROR_SECURITY });
     });
   },
 
@@ -307,6 +354,7 @@
       return;
     }
 
+    // Bug 1137533 - ACE GPAccessRulesManager APDU filters
     connector.exchangeAPDU(channel.channelNumber, msg.apdu.cla, msg.apdu.ins,
                            msg.apdu.p1, msg.apdu.p2,
                            SEUtils.byteArrayToHexString(msg.apdu.data),
@@ -357,11 +405,11 @@
   },
 
   _handleGetSEReadersRequest: function(msg, target, callback) {
-    // TODO: Bug 1118101 Get supported readerTypes based on the permissions
-    // available for the given application.
-    let seReaderTypes = this._getAvailableReaderTypes();
-    gMap.registerSecureElementTarget(msg.appId, seReaderTypes, target);
-    callback({ readerTypes: seReaderTypes, error: SE.ERROR_NONE });
+    gMap.registerSecureElementTarget(msg.appId, target);
+    let readers = Object.keys(this._sePresence).map(type => {
+      return { type: type, isPresent: this._sePresence[type] };
+    });
+    callback({ readers: readers, error: SE.ERROR_NONE });
   },
 
   _handleChildProcessShutdown: function(target) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/gonk/UiccConnector.js firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/gonk/UiccConnector.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/gonk/UiccConnector.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/gonk/UiccConnector.js	2015-05-25 20:43:51.000000000 +0000
@@ -18,9 +18,9 @@
 "use strict";
 
 /* globals Components, XPCOMUtils, SE, dump, libcutils, Services,
-   iccProvider, iccService, SEUtils */
+   iccService, SEUtils */
 
-const { interfaces: Ci, utils: Cu } = Components;
+const { interfaces: Ci, utils: Cu, results: Cr } = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
@@ -43,10 +43,6 @@
 XPCOMUtils.defineLazyModuleGetter(this, "SEUtils",
                                   "resource://gre/modules/SEUtils.jsm");
 
-XPCOMUtils.defineLazyServiceGetter(this, "iccProvider",
-                                   "@mozilla.org/ril/content-helper;1",
-                                   "nsIIccProvider");
-
 XPCOMUtils.defineLazyServiceGetter(this, "iccService",
                                    "@mozilla.org/icc/iccservice;1",
                                    "nsIIccService");
@@ -65,7 +61,7 @@
   libcutils.property_get("ro.moz.se.def_client_id", "0");
 
 /**
- * 'UiccConnector' object is a wrapper over iccProvider's channel management
+ * 'UiccConnector' object is a wrapper over iccService's channel management
  * related interfaces that implements nsISecureElementConnector interface.
  */
 function UiccConnector() {
@@ -73,7 +69,8 @@
 }
 
 UiccConnector.prototype = {
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsISecureElementConnector]),
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsISecureElementConnector,
+                                         Ci.nsIIccListener]),
   classID: UICCCONNECTOR_CID,
   classInfo: XPCOMUtils.generateCI({
     classID: UICCCONNECTOR_CID,
@@ -84,6 +81,7 @@
                  Ci.nsIObserver]
   }),
 
+  _SEListeners: [],
   _isPresent: false,
 
   _init: function() {
@@ -113,8 +111,18 @@
     ];
 
     let cardState = iccService.getIccByServiceId(PREFERRED_UICC_CLIENTID).cardState;
-    this._isPresent = cardState !== null &&
+    let uiccPresent = cardState !== null &&
                       uiccNotReadyStates.indexOf(cardState) == -1;
+
+    if (this._isPresent === uiccPresent) {
+      return;
+    }
+
+    debug("Uicc presence changed " + this._isPresent + " -> " + uiccPresent);
+    this._isPresent = uiccPresent;
+    this._SEListeners.forEach((listener) => {
+      listener.notifySEPresenceChanged(SE.TYPE_UICC, this._isPresent);
+    });
   },
 
   // See GP Spec, 11.1.4 Class Byte Coding
@@ -162,8 +170,8 @@
 
   _doIccExchangeAPDU: function(channel, cla, ins, p1, p2, p3,
                                data, appendResp, callback) {
-    iccProvider.iccExchangeAPDU(PREFERRED_UICC_CLIENTID, channel, cla & 0xFC,
-                                ins, p1, p2, p3, data, {
+    let icc = iccService.getIccByServiceId(PREFERRED_UICC_CLIENTID);
+    icc.iccExchangeAPDU(channel, cla & 0xFC, ins, p1, p2, p3, data, {
       notifyExchangeAPDUResponse: (sw1, sw2, response) => {
         debug("sw1 : " + sw1 + ", sw2 : " + sw2 + ", response : " + response);
 
@@ -230,7 +238,8 @@
     // some erroneous conditions such as gecko restart /, crash it can read
     // the persistent storage to check if there are any held resources
     // (opened channels) and close them.
-    iccProvider.iccOpenChannel(PREFERRED_UICC_CLIENTID, aid, {
+    let icc = iccService.getIccByServiceId(PREFERRED_UICC_CLIENTID);
+    icc.iccOpenChannel(aid, {
       notifyOpenChannelSuccess: (channel) => {
         this._doGetOpenResponse(channel, 0x00, function(result) {
           if (callback) {
@@ -287,7 +296,8 @@
       return;
     }
 
-    iccProvider.iccCloseChannel(PREFERRED_UICC_CLIENTID, channel, {
+    let icc = iccService.getIccByServiceId(PREFERRED_UICC_CLIENTID);
+    icc.iccCloseChannel(channel, {
       notifyCloseChannelSuccess: function() {
         debug("closeChannel successfully closed the channel # : " + channel);
         if (callback) {
@@ -305,6 +315,23 @@
     });
   },
 
+  registerListener: function(listener) {
+    if (this._SEListeners.indexOf(listener) !== -1) {
+      throw Cr.NS_ERROR_UNEXPECTED;
+    }
+
+    this._SEListeners.push(listener);
+    // immediately notify listener about the current state
+    listener.notifySEPresenceChanged(SE.TYPE_UICC, this._isPresent);
+  },
+
+  unregisterListener: function(listener) {
+    let idx = this._SEListeners.indexOf(listener);
+    if (idx !== -1) {
+      this._listeners.splice(idx, 1);
+    }
+  },
+
   /**
    * nsIIccListener interface methods.
    */
@@ -315,6 +342,7 @@
   notifyIccInfoChanged: function() {},
 
   notifyCardStateChanged: function() {
+    debug("Card state changed, updating UICC presence.");
     this._updatePresenceState();
   },
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/moz.build	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/moz.build	2015-05-25 20:43:51.000000000 +0000
@@ -13,14 +13,21 @@
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['MOZ_SECUREELEMENT']:
     EXTRA_COMPONENTS += [
+        'gonk/ACEService.js',
+        'gonk/ACEService.manifest',
+        'gonk/GPAccessRulesManager.js',
+        'gonk/GPAccessRulesManager.manifest',
         'gonk/SecureElement.js',
         'gonk/SecureElement.manifest',
     ]
     XPIDL_MODULE = 'dom_secureelement'
     XPIDL_SOURCES += [
+        'gonk/nsIAccessControlEnforcer.idl',
+        'gonk/nsIAccessRulesManager.idl',
         'gonk/nsISecureElementConnector.idl',
     ]
     EXTRA_JS_MODULES += [
+        'gonk/gp_consts.js',
         'gonk/se_consts.js',
         'SEUtils.jsm'
     ]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/SEUtils.jsm firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/SEUtils.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/SEUtils.jsm	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/SEUtils.jsm	2015-05-25 20:43:51.000000000 +0000
@@ -50,6 +50,67 @@
 
     return true;
   },
+
+  ensureIsArray: function ensureIsArray(obj) {
+    return Array.isArray(obj) ? obj : [obj];
+  },
+
+  /**
+   * parseTLV is intended primarily to be used to parse Global Platform Device
+   * Technology secure element access control data.
+   *
+   * The parsed result value is an internal format only.
+   *
+   * All tags will be treated as simple Tag Length Values (TLV), (i.e. with a
+   * plain value, not subject to further unpacking), unless those tags are
+   * listed in the containerTags array.
+   *
+   * @param bytes - byte array
+   * @param containerTags - byte array of tags
+   */
+  parseTLV: function parseTLV(bytes, containerTags) {
+    let result = {};
+
+    if (typeof bytes === "string") {
+      bytes = this.hexStringToByteArray(bytes);
+    }
+
+    if (!Array.isArray(bytes)) {
+      debug("Passed value is not an array nor a string.");
+      return null;
+    }
+
+    for (let pos = 0; pos < bytes.length; ) {
+      let tag = bytes[pos],
+          length = bytes[pos + 1],
+          value = bytes.slice(pos + 2, pos + 2 + length),
+          parsed = null;
+
+      // Support for 0xFF padded files (GPD 7.1.2)
+      if (tag === 0xFF) {
+        break;
+      }
+
+      if (containerTags.indexOf(tag) >= 0) {
+        parsed = this.parseTLV(value, containerTags);
+      } else {
+        parsed = value;
+      }
+
+      // Internal parsed format.
+      if (!result[tag]) {
+        result[tag] = parsed;
+      } else if (Array.isArray(result[tag])) {
+        result[tag].push(parsed);
+      } else {
+        result[tag] = [result[tag], parsed];
+      }
+
+      pos = pos + 2 + length;
+    }
+
+    return result;
+  }
 };
 
 this.EXPORTED_SYMBOLS = ["SEUtils"];
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/tests/unit/header_helper.js firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/tests/unit/header_helper.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/tests/unit/header_helper.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/tests/unit/header_helper.js	2015-05-25 20:43:51.000000000 +0000
@@ -0,0 +1,9 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Strips spaces, and returns a byte array.
+ */
+function formatHexAndCreateByteArray(hexStr) {
+  return SEUtils.hexStringToByteArray(hexStr.replace(/\s+/g, ""));
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/tests/unit/test_SEUtils.js firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/tests/unit/test_SEUtils.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/tests/unit/test_SEUtils.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/tests/unit/test_SEUtils.js	2015-05-25 20:43:51.000000000 +0000
@@ -7,10 +7,22 @@
 /* exported run_test */
 
 Components.utils.import("resource://gre/modules/SEUtils.jsm");
+let GP = {};
+Components.utils.import("resource://gre/modules/gp_consts.js", GP);
 
 const VALID_HEX_STR = "0123456789ABCDEF";
 const VALID_BYTE_ARR = [0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF];
 
+// This set should be what the actual ACE uses.
+let containerTags = [
+  GP.TAG_SEQUENCE,
+  GP.TAG_FCP,
+  GP.TAG_GPD_AID,
+  GP.TAG_EXTERNALDO,
+  GP.TAG_INDIRECT,
+  GP.TAG_EF_ODF
+];
+
 function run_test() {
   ok(!!SEUtils, "SEUtils should be available");
   run_next_test();
@@ -66,3 +78,151 @@
 
   run_next_test();
 });
+
+add_test(function test_ensureIsArray() {
+  let obj = {a: "a"};
+  let targetArray = [obj];
+  let result = null;
+
+  result = SEUtils.ensureIsArray(obj);
+  ok(targetArray[0].a === result[0].a,
+     "should return true if array element contains the same value");
+  deepEqual(result, targetArray,
+            "result should be deeply equal to targetArray");
+
+  result = SEUtils.ensureIsArray(targetArray);
+  deepEqual(result, targetArray,
+            "ensureIsAray with an array should return same array value.");
+
+  run_next_test();
+});
+
+add_test(function test_parseTLV_empty() {
+  let containerTags = [];
+  let result = null;
+
+  // Base:
+  result = SEUtils.parseTLV([], []);
+  deepEqual({}, result,
+     "empty parse input should result in an " +
+     "empty object (internal SEUtils format only).");
+  run_next_test();
+});
+
+add_test(function test_parseTLV_selectResponse() {
+  let result = null;
+  let hexStr = "62 27 82 02 78 21 83 02 7F 50 A5 06 83 04 00 04 C1 DC 8A" +
+               "01 05 8B 06 2F 06 01 16 00 14 C6 06 90 01 00 83 01 01 81" +
+               "02 FF FF";
+
+  let expected = {
+    0x62: {
+      0x82: [0x78, 0x21],
+      0x83: [0x7F, 0x50],
+      0xA5: {
+        0x83: [0x00, 0x04, 0xC1, 0xDC]
+      },
+      0x8A: [0x05],
+      0x8B: [0x2F, 0x06, 0x01, 0x16, 0x00, 0x14],
+      0xC6: [0x90, 0x01, 0x00, 0x83, 0x01, 0x01],
+      0x81: [0xFF, 0xFF]
+    }
+  };
+
+  result = SEUtils.parseTLV(formatHexAndCreateByteArray(hexStr), containerTags);
+  deepEqual(result, expected,
+            "parsed real selectResponse should equal the expected rules");
+  run_next_test();
+});
+
+add_test(function test_parseTLV_DODF() {
+  let result = null;
+  let hexStr = "A1 29 30 00 30 0F 0C 0D 47 50 20 53 45 20 41 63 63 20 43" +
+               "74 6C A1 14 30 12 06 0A 2A 86 48 86 FC 6B 81 48 01 01 30" +
+               "04 04 02 43 00 A1 2B 30 00 30 0F 0C 0D 53 41 54 53 41 20" +
+               "47 54 4F 20 31 2E 31 A1 16 30 14 06 0C 2B 06 01 04 01 2A" +
+               "02 6E 03 01 01 01 30 04 04 02 45 31 FF FF FF FF FF FF FF" +
+               "FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF" +
+               "FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF" +
+               "FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF" +
+               "FF FF FF FF FF FF FF FF FF FF FF FF";
+
+  let expected = {
+    0xA1: [
+      {
+        0x30: [
+          {},
+          {
+            0x0C: [0x47, 0x50, 0x20, 0x53, 0x45, 0x20, 0x41, 0x63, 0x63,
+                   0x20, 0x43, 0x74, 0x6C]
+          }
+        ],
+        0xA1: {
+          0x30: {
+            0x06: [0x2A, 0x86, 0x48, 0x86, 0xFC, 0x6B, 0x81, 0x48, 0x01,
+                   0x01],
+            0x30: {
+              0x04: [0x43, 0x00]
+            }
+          }
+        }
+      },
+      {
+        0x30: [
+          {},
+          {
+            0x0C: [0x53, 0x41, 0x54, 0x53, 0x41, 0x20, 0x47, 0x54, 0x4F,
+                   0x20, 0x31, 0x2E, 0x31]
+          }
+        ],
+        0xA1: {
+          0x30: {
+            0x06: [0x2B, 0x06, 0x01, 0x04, 0x01, 0x2A, 0x02, 0x6E, 0x03,
+                   0x01, 0x01, 0x01],
+            0x30: {
+              0x04: [0x45, 0x31]
+            }
+          }
+        }
+      }
+    ]
+  };
+
+  result = SEUtils.parseTLV(formatHexAndCreateByteArray(hexStr), containerTags);
+  deepEqual(result, expected,
+            "Real Access Control Enforcer DODF file, with 0xFF padding. " +
+            "Should equal expected rules.");
+  run_next_test();
+});
+
+add_test(function test_parseTLV_acRules() {
+  let result = null;
+  let hexStr = "30 08 82 00 30 04 04 02 43 11 FF FF FF FF FF FF FF FF FF" +
+               "FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF" +
+               "FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF" +
+               "FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF" +
+               "FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF" +
+               "FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF" +
+               "FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF" +
+               "FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF" +
+               "FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF" +
+               "FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF" +
+               "FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF" +
+               "FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF" +
+               "FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF" +
+               "FF FF FF FF FF FF FF FF FF";
+
+  let expected = {
+    0x30: {
+      0x82: [],
+      0x30: {
+        0x04: [0x43, 0x11]
+      }
+    }
+  };
+
+  result = SEUtils.parseTLV(formatHexAndCreateByteArray(hexStr), containerTags);
+  deepEqual(result, expected,
+            "Parsed Access Control Rules should equal the expected rules");
+  run_next_test();
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/tests/unit/xpcshell.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/tests/unit/xpcshell.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/secureelement/tests/unit/xpcshell.ini	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/secureelement/tests/unit/xpcshell.ini	2015-05-25 20:43:51.000000000 +0000
@@ -1,5 +1,5 @@
 [DEFAULT]
-head =
+head = header_helper.js
 tail =
 
 [test_SEUtils.js]
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/security/nsCSPContext.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/security/nsCSPContext.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/security/nsCSPContext.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/security/nsCSPContext.cpp	2015-05-25 20:43:51.000000000 +0000
@@ -35,8 +35,9 @@
 #include "nsSupportsPrimitives.h"
 #include "nsThreadUtils.h"
 #include "nsString.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "mozilla/dom/CSPReportBinding.h"
+#include "mozilla/dom/CSPDictionariesBinding.h"
 #include "mozilla/net/ReferrerPolicy.h"
 #include "nsINetworkInterceptController.h"
 
@@ -51,7 +52,7 @@
   return gCspContextPRLog;
 }
 
-#define CSPCONTEXTLOG(args) PR_LOG(GetCspContextLog(), PR_LOG_DEBUG, args)
+#define CSPCONTEXTLOG(args) MOZ_LOG(GetCspContextLog(), PR_LOG_DEBUG, args)
 #define CSPCONTEXTLOGENABLED() PR_LOG_TEST(GetCspContextLog(), PR_LOG_DEBUG)
 
 static const uint32_t CSP_CACHE_URI_CUTOFF_SIZE = 512;
@@ -1186,6 +1187,26 @@
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsCSPContext::ToJSON(nsAString& outCSPinJSON)
+{
+  outCSPinJSON.Truncate();
+  dom::CSPPolicies jsonPolicies;
+  jsonPolicies.mCsp_policies.Construct();
+
+  for (uint32_t p = 0; p < mPolicies.Length(); p++) {
+    dom::CSP jsonCSP;
+    mPolicies[p]->toDomCSPStruct(jsonCSP);
+    jsonPolicies.mCsp_policies.Value().AppendElement(jsonCSP);
+  }
+
+  // convert the gathered information to JSON
+  if (!jsonPolicies.ToJSON(outCSPinJSON)) {
+    return NS_ERROR_FAILURE;
+  }
+  return NS_OK;
+}
+
 /* ========== CSPViolationReportListener implementation ========== */
 
 NS_IMPL_ISUPPORTS(CSPViolationReportListener, nsIStreamListener, nsIRequestObserver, nsISupports);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/security/nsCSPParser.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/security/nsCSPParser.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/security/nsCSPParser.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/security/nsCSPParser.cpp	2015-05-25 20:43:51.000000000 +0000
@@ -28,7 +28,7 @@
   return gCspParserPRLog;
 }
 
-#define CSPPARSERLOG(args) PR_LOG(GetCspParserLog(), PR_LOG_DEBUG, args)
+#define CSPPARSERLOG(args) MOZ_LOG(GetCspParserLog(), PR_LOG_DEBUG, args)
 #define CSPPARSERLOGENABLED() PR_LOG_TEST(GetCspParserLog(), PR_LOG_DEBUG)
 
 static const char16_t COLON        = ':';
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/security/nsCSPService.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/security/nsCSPService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/security/nsCSPService.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/security/nsCSPService.cpp	2015-05-25 20:43:51.000000000 +0000
@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsString.h"
 #include "nsCOMPtr.h"
 #include "nsIURI.h"
@@ -112,7 +112,7 @@
   if (PR_LOG_TEST(gCspPRLog, PR_LOG_DEBUG)) {
     nsAutoCString location;
     aContentLocation->GetSpec(location);
-    PR_LOG(gCspPRLog, PR_LOG_DEBUG,
+    MOZ_LOG(gCspPRLog, PR_LOG_DEBUG,
            ("CSPService::ShouldLoad called for %s", location.get()));
   }
 
@@ -211,7 +211,7 @@
           for (uint32_t i=0; i<numPolicies; i++) {
             nsAutoString policy;
             csp->GetPolicy(i, policy);
-            PR_LOG(gCspPRLog, PR_LOG_DEBUG,
+            MOZ_LOG(gCspPRLog, PR_LOG_DEBUG,
                    ("Document has CSP[%d]: %s", i,
                    NS_ConvertUTF16toUTF8(policy).get()));
           }
@@ -231,7 +231,7 @@
   else if (PR_LOG_TEST(gCspPRLog, PR_LOG_DEBUG)) {
     nsAutoCString uriSpec;
     aContentLocation->GetSpec(uriSpec);
-    PR_LOG(gCspPRLog, PR_LOG_DEBUG,
+    MOZ_LOG(gCspPRLog, PR_LOG_DEBUG,
            ("COULD NOT get nsINode for location: %s", uriSpec.get()));
   }
 
@@ -319,16 +319,16 @@
   if (newUri && PR_LOG_TEST(gCspPRLog, PR_LOG_DEBUG)) {
     nsAutoCString newUriSpec("None");
     newUri->GetSpec(newUriSpec);
-    PR_LOG(gCspPRLog, PR_LOG_DEBUG,
+    MOZ_LOG(gCspPRLog, PR_LOG_DEBUG,
            ("CSPService::AsyncOnChannelRedirect called for %s",
             newUriSpec.get()));
   }
   if (aDecision == 1) {
-    PR_LOG(gCspPRLog, PR_LOG_DEBUG,
+    MOZ_LOG(gCspPRLog, PR_LOG_DEBUG,
            ("CSPService::AsyncOnChannelRedirect ALLOWING request."));
   }
   else {
-    PR_LOG(gCspPRLog, PR_LOG_DEBUG,
+    MOZ_LOG(gCspPRLog, PR_LOG_DEBUG,
            ("CSPService::AsyncOnChannelRedirect CANCELLING request."));
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/security/nsCSPUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/security/nsCSPUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/security/nsCSPUtils.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/security/nsCSPUtils.cpp	2015-05-25 20:43:51.000000000 +0000
@@ -23,7 +23,7 @@
   return gCspUtilsPRLog;
 }
 
-#define CSPUTILSLOG(args) PR_LOG(GetCspUtilsLog(), PR_LOG_DEBUG, args)
+#define CSPUTILSLOG(args) MOZ_LOG(GetCspUtilsLog(), PR_LOG_DEBUG, args)
 #define CSPUTILSLOGENABLED() PR_LOG_TEST(GetCspUtilsLog(), PR_LOG_DEBUG)
 
 void
@@ -769,6 +769,93 @@
   }
 }
 
+void
+nsCSPDirective::toDomCSPStruct(mozilla::dom::CSP& outCSP) const
+{
+  mozilla::dom::Sequence<nsString> srcs;
+  nsString src;
+  for (uint32_t i = 0; i < mSrcs.Length(); i++) {
+    src.Truncate();
+    mSrcs[i]->toString(src);
+    srcs.AppendElement(src);
+  }
+
+  switch(mDirective) {
+    case nsIContentSecurityPolicy::DEFAULT_SRC_DIRECTIVE:
+      outCSP.mDefault_src.Construct();
+      outCSP.mDefault_src.Value() = srcs;
+      return;
+
+    case nsIContentSecurityPolicy::SCRIPT_SRC_DIRECTIVE:
+      outCSP.mScript_src.Construct();
+      outCSP.mScript_src.Value() = srcs;
+      return;
+
+    case nsIContentSecurityPolicy::OBJECT_SRC_DIRECTIVE:
+      outCSP.mObject_src.Construct();
+      outCSP.mObject_src.Value() = srcs;
+      return;
+
+    case nsIContentSecurityPolicy::STYLE_SRC_DIRECTIVE:
+      outCSP.mStyle_src.Construct();
+      outCSP.mStyle_src.Value() = srcs;
+      return;
+
+    case nsIContentSecurityPolicy::IMG_SRC_DIRECTIVE:
+      outCSP.mImg_src.Construct();
+      outCSP.mImg_src.Value() = srcs;
+      return;
+
+    case nsIContentSecurityPolicy::MEDIA_SRC_DIRECTIVE:
+      outCSP.mMedia_src.Construct();
+      outCSP.mMedia_src.Value() = srcs;
+      return;
+
+    case nsIContentSecurityPolicy::FRAME_SRC_DIRECTIVE:
+      outCSP.mFrame_src.Construct();
+      outCSP.mFrame_src.Value() = srcs;
+      return;
+
+    case nsIContentSecurityPolicy::FONT_SRC_DIRECTIVE:
+      outCSP.mFont_src.Construct();
+      outCSP.mFont_src.Value() = srcs;
+      return;
+
+    case nsIContentSecurityPolicy::CONNECT_SRC_DIRECTIVE:
+      outCSP.mConnect_src.Construct();
+      outCSP.mConnect_src.Value() = srcs;
+      return;
+
+    case nsIContentSecurityPolicy::REPORT_URI_DIRECTIVE:
+      outCSP.mReport_uri.Construct();
+      outCSP.mReport_uri.Value() = srcs;
+      return;
+
+    case nsIContentSecurityPolicy::FRAME_ANCESTORS_DIRECTIVE:
+      outCSP.mFrame_ancestors.Construct();
+      outCSP.mFrame_ancestors.Value() = srcs;
+      return;
+
+    // not supporting REFLECTED_XSS_DIRECTIVE
+
+    case nsIContentSecurityPolicy::BASE_URI_DIRECTIVE:
+      outCSP.mBase_uri.Construct();
+      outCSP.mBase_uri.Value() = srcs;
+      return;
+
+    case nsIContentSecurityPolicy::FORM_ACTION_DIRECTIVE:
+      outCSP.mForm_action.Construct();
+      outCSP.mForm_action.Value() = srcs;
+      return;
+
+    // REFERRER_DIRECTIVE is handled in nsCSPPolicy::toDomCSPStruct()
+
+    default:
+      NS_ASSERTION(false, "cannot find directive to convert CSP to JSON");
+  }
+}
+
+
 bool
 nsCSPDirective::restrictsContentType(nsContentPolicyType aContentType) const
 {
@@ -935,6 +1022,23 @@
     }
   }
 }
+
+void
+nsCSPPolicy::toDomCSPStruct(mozilla::dom::CSP& outCSP) const
+{
+  outCSP.mReport_only = mReportOnly;
+
+  for (uint32_t i = 0; i < mDirectives.Length(); ++i) {
+    if (mDirectives[i]->equals(nsIContentSecurityPolicy::REFERRER_DIRECTIVE)) {
+      mozilla::dom::Sequence<nsString> srcs;
+      srcs.AppendElement(mReferrerPolicy);
+      outCSP.mReferrer.Construct();
+      outCSP.mReferrer.Value() = srcs;
+    } else {
+      mDirectives[i]->toDomCSPStruct(outCSP);
+    }
+  }
+}
 
 bool
 nsCSPPolicy::hasDirective(CSPDirective aDir) const
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/security/nsCSPUtils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/security/nsCSPUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/security/nsCSPUtils.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/security/nsCSPUtils.h	2015-05-25 20:43:51.000000000 +0000
@@ -14,7 +14,13 @@
 #include "nsString.h"
 #include "nsTArray.h"
 #include "nsUnicharUtils.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
+
+namespace mozilla {
+namespace dom {
+  struct CSP;
+}
+}
 
 /* =============== Logging =================== */
 
@@ -58,7 +64,8 @@
 
 // these strings map to the CSPDirectives in nsIContentSecurityPolicy
 // NOTE: When implementing a new directive, you will need to add it here but also
-// add a corresponding entry to the constants in nsIContentSecurityPolicy.idl
+// add a corresponding entry to the constants in nsIContentSecurityPolicy.idl and
+// also create an entry for the new directive in nsCSPDirective::toDomCSPStruct().
 static const char* CSPStrDirectives[] = {
   "-error-",    // NO_DIRECTIVE
   "default-src",     // DEFAULT_SRC_DIRECTIVE
@@ -284,6 +291,7 @@
     bool permits(nsIURI* aUri) const;
     bool allows(enum CSPKeyword aKeyword, const nsAString& aHashOrNonce) const;
     void toString(nsAString& outStr) const;
+    void toDomCSPStruct(mozilla::dom::CSP& outCSP) const;
 
     inline void addSrcs(const nsTArray<nsCSPBaseSrc*>& aSrcs)
       { mSrcs = aSrcs; }
@@ -325,6 +333,7 @@
     bool allows(nsContentPolicyType aContentType,
                 enum CSPKeyword aKeyword) const;
     void toString(nsAString& outStr) const;
+    void toDomCSPStruct(mozilla::dom::CSP& outCSP) const;
 
     inline void addDirective(nsCSPDirective* aDir)
       { mDirectives.AppendElement(aDir); }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/security/nsMixedContentBlocker.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/security/nsMixedContentBlocker.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/security/nsMixedContentBlocker.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/security/nsMixedContentBlocker.cpp	2015-05-25 20:43:51.000000000 +0000
@@ -33,7 +33,7 @@
 #include "nsAsyncRedirectVerifyHelper.h"
 #include "mozilla/LoadInfo.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 using namespace mozilla;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/settings/SettingsDB.jsm firefox-trunk-41.0~a1~hg20150524r245419/dom/settings/SettingsDB.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/settings/SettingsDB.jsm	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/settings/SettingsDB.jsm	2015-05-25 20:43:51.000000000 +0000
@@ -8,7 +8,7 @@
 let Ci = Components.interfaces;
 let Cu = Components.utils;
 
-Cu.importGlobalProperties(['Blob']);
+Cu.importGlobalProperties(['Blob', 'File']);
 Cu.import("resource://gre/modules/Services.jsm");
 
 this.EXPORTED_SYMBOLS = ["SettingsDB", "SETTINGSDB_NAME", "SETTINGSSTORE_NAME"];
@@ -80,14 +80,9 @@
       }
     }
 
-    let chan = NetUtil.newChannel2(settingsFile,
-                                   null,
-                                   null,
-                                   null,      // aLoadingNode
-                                   Services.scriptSecurityManager.getSystemPrincipal(),
-                                   null,      // aTriggeringPrincipal
-                                   Ci.nsILoadInfo.SEC_NORMAL,
-                                   Ci.nsIContentPolicy.TYPE_OTHER);
+    let chan = NetUtil.newChannel({
+      uri: NetUtil.newURI(settingsFile),
+      loadUsingSystemPrincipal: true});
     let stream = chan.open();
     // Obtain a converter to read from a UTF-8 encoded input stream.
     let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
@@ -209,7 +204,7 @@
       return "primitive";
     } else if (Array.isArray(aObject)) {
       return "array";
-    } else if (aObject instanceof Ci.nsIDOMFile) {
+    } else if (aObject instanceof File) {
       return "file";
     } else if (aObject instanceof Ci.nsIDOMBlob) {
       return "blob";
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/settings/SettingsRequestManager.jsm firefox-trunk-41.0~a1~hg20150524r245419/dom/settings/SettingsRequestManager.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/settings/SettingsRequestManager.jsm	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/settings/SettingsRequestManager.jsm	2015-05-25 20:43:51.000000000 +0000
@@ -8,6 +8,8 @@
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 
+Cu.importGlobalProperties(['File']);
+
 this.EXPORTED_SYMBOLS = ["SettingsRequestManager"];
 
 Cu.import("resource://gre/modules/SettingsDB.jsm");
@@ -245,7 +247,7 @@
       if (!aValue || !aValue.constructor) {
         return false;
       }
-      return (aValue.constructor.name == "Date") || (aValue instanceof Ci.nsIDOMFile) ||
+      return (aValue.constructor.name == "Date") || (aValue instanceof File) ||
              (aValue instanceof Ci.nsIDOMBlob);
     }
     // We need to serialize settings objects, otherwise they can change between
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/settings/tests/test_settings_events.html firefox-trunk-41.0~a1~hg20150524r245419/dom/settings/tests/test_settings_events.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/settings/tests/test_settings_events.html	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/settings/tests/test_settings_events.html	2015-05-25 20:43:51.000000000 +0000
@@ -12,10 +12,14 @@
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=678695">Mozilla Bug 678695</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-  
+
 </div>
 <pre id="test">
 <script type="application/javascript">
+SpecialPowers.addPermission("settings-api-read", true, document);
+SpecialPowers.addPermission("settings-api-write", true, document);
+SpecialPowers.addPermission("settings-read", true, document);
+SpecialPowers.addPermission("settings-write", true, document);
 
 /** Test for Bug 678695 **/
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/settings/tests/test_settings_navigator_object.html firefox-trunk-41.0~a1~hg20150524r245419/dom/settings/tests/test_settings_navigator_object.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/settings/tests/test_settings_navigator_object.html	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/settings/tests/test_settings_navigator_object.html	2015-05-25 20:43:51.000000000 +0000
@@ -25,7 +25,7 @@
   SpecialPowers.pushPrefEnv({
     set: [["dom.mozSettings.enabled", false]]
   }, function() {
-    ise(navigator.mozSettings, undefined, "navigator.mozSettings is undefined");
+    is(navigator.mozSettings, undefined, "navigator.mozSettings is undefined");
     SimpleTest.finish();
   });
 }
@@ -37,7 +37,7 @@
   {type: "settings-api-write", allow: 0, context: document},
   {type: "settings-clear", allow: 0, context: document}
 ], function() {
-  ise(frames[0].navigator.mozSettings, null, "navigator.mozSettings is null when the page doesn't have permissions");
+  is(frames[0].navigator.mozSettings, null, "navigator.mozSettings is null when the page doesn't have permissions");
   testPref();
 });
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/smil/nsSMILAnimationFunction.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/smil/nsSMILAnimationFunction.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/smil/nsSMILAnimationFunction.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/smil/nsSMILAnimationFunction.cpp	2015-05-25 20:43:51.000000000 +0000
@@ -780,26 +780,27 @@
       mValueNeedsReparsingEverySample = true;
     }
 
-    if (!parseOk)
+    if (!parseOk || !result.SetCapacity(2, mozilla::fallible)) {
       return NS_ERROR_FAILURE;
+    }
 
-    result.SetCapacity(2);
+    // AppendElement() below must succeed, because SetCapacity() succeeded.
     if (!to.IsNull()) {
       if (!from.IsNull()) {
-        result.AppendElement(from);
-        result.AppendElement(to);
+        MOZ_ALWAYS_TRUE(result.AppendElement(from));
+        MOZ_ALWAYS_TRUE(result.AppendElement(to));
       } else {
-        result.AppendElement(to);
+        MOZ_ALWAYS_TRUE(result.AppendElement(to));
       }
     } else if (!by.IsNull()) {
       nsSMILValue effectiveFrom(by.mType);
       if (!from.IsNull())
         effectiveFrom = from;
       // Set values to 'from; from + by'
-      result.AppendElement(effectiveFrom);
+      MOZ_ALWAYS_TRUE(result.AppendElement(effectiveFrom));
       nsSMILValue effectiveTo(effectiveFrom);
       if (!effectiveTo.IsNull() && NS_SUCCEEDED(effectiveTo.Add(by))) {
-        result.AppendElement(effectiveTo);
+        MOZ_ALWAYS_TRUE(result.AppendElement(effectiveTo));
       } else {
         // Using by-animation with non-additive type or bad base-value
         return NS_ERROR_FAILURE;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/smil/test/test_smilInvalidValues.html firefox-trunk-41.0~a1~hg20150524r245419/dom/smil/test/test_smilInvalidValues.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/smil/test/test_smilInvalidValues.html	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/smil/test/test_smilInvalidValues.html	2015-05-25 20:43:51.000000000 +0000
@@ -48,9 +48,9 @@
   function runTests() {
     [testSimpleDuration, testMin, testMax, testRepeatDur, testRepeatCount]
       .forEach(function(test) {
-        ise(b.getStartTime(), 100, "initial state before running " + test.name);
+        is(b.getStartTime(), 100, "initial state before running " + test.name);
         test();
-        ise(b.getStartTime(), 100, "final state after running " + test.name);
+        is(b.getStartTime(), 100, "final state after running " + test.name);
       });
     SimpleTest.finish();
   }
@@ -58,11 +58,11 @@
   function testSimpleDuration() {
     // Verify a valid value updates as expected
     a.setAttribute("dur", "50s");
-    ise(b.safeGetStartTime(), 50, "valid simple duration");
+    is(b.safeGetStartTime(), 50, "valid simple duration");
 
     // Check an invalid value also causes the model to be updated
     a.setAttribute("dur", "abc"); // -> indefinite
-    ise(b.safeGetStartTime(), "none", "invalid simple duration");
+    is(b.safeGetStartTime(), "none", "invalid simple duration");
 
     // Restore state
     a.setAttribute("dur", "100s");
@@ -70,40 +70,40 @@
 
   function testMin() {
     a.setAttribute("min", "200s");
-    ise(b.safeGetStartTime(), 200, "valid min duration");
+    is(b.safeGetStartTime(), 200, "valid min duration");
 
     a.setAttribute("min", "abc"); // -> indefinite
-    ise(b.safeGetStartTime(), 100, "invalid min duration");
+    is(b.safeGetStartTime(), 100, "invalid min duration");
 
     a.removeAttribute("min");
   }
 
   function testMax() {
     a.setAttribute("max", "50s");
-    ise(b.safeGetStartTime(), 50, "valid max duration");
+    is(b.safeGetStartTime(), 50, "valid max duration");
 
     a.setAttribute("max", "abc"); // -> indefinite
-    ise(b.safeGetStartTime(), 100, "invalid max duration");
+    is(b.safeGetStartTime(), 100, "invalid max duration");
 
     a.removeAttribute("max");
   }
 
   function testRepeatDur() {
     a.setAttribute("repeatDur", "200s");
-    ise(b.safeGetStartTime(), 200, "valid repeatDur duration");
+    is(b.safeGetStartTime(), 200, "valid repeatDur duration");
 
     a.setAttribute("repeatDur", "abc"); // -> indefinite
-    ise(b.safeGetStartTime(), 100, "invalid repeatDur duration");
+    is(b.safeGetStartTime(), 100, "invalid repeatDur duration");
 
     a.removeAttribute("repeatDur");
   }
 
   function testRepeatCount() {
     a.setAttribute("repeatCount", "2");
-    ise(b.safeGetStartTime(), 200, "valid repeatCount duration");
+    is(b.safeGetStartTime(), 200, "valid repeatCount duration");
 
     a.setAttribute("repeatCount", "abc"); // -> indefinite
-    ise(b.safeGetStartTime(), 100, "invalid repeatCount duration");
+    is(b.safeGetStartTime(), 100, "invalid repeatCount duration");
 
     a.removeAttribute("repeatCount");
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/smil/test/test_smilMinTiming.html firefox-trunk-41.0~a1~hg20150524r245419/dom/smil/test/test_smilMinTiming.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/smil/test/test_smilMinTiming.html	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/smil/test/test_smilMinTiming.html	2015-05-25 20:43:51.000000000 +0000
@@ -48,42 +48,42 @@
     // In the extended period (t=150s) we should not be animating or filling
     // since the default fill mode is "none".
     animation.ownerSVGElement.setCurrentTime(150);
-    ise(rect.x.animVal.value, 0,
-        "Shouldn't fill in extended period with fill='none'");
+    is(rect.x.animVal.value, 0,
+       "Shouldn't fill in extended period with fill='none'");
 
     // If we set the fill mode we should start filling.
     animation.setAttribute("fill", "freeze");
-    ise(rect.x.animVal.value, 100,
-        "Should fill in extended period with fill='freeze'");
+    is(rect.x.animVal.value, 100,
+       "Should fill in extended period with fill='freeze'");
 
     // If we unset the fill attribute we should stop filling.
     animation.removeAttribute("fill");
-    ise(rect.x.animVal.value, 0, "Shouldn't fill after unsetting fill");
+    is(rect.x.animVal.value, 0, "Shouldn't fill after unsetting fill");
 
     // If we jump back into the repeated interval (at t=50s) we should be
     // animating.
     animation.ownerSVGElement.setCurrentTime(50);
-    ise(rect.x.animVal.value, 50, "Should be active in repeating interval");
+    is(rect.x.animVal.value, 50, "Should be active in repeating interval");
 
     // If we jump to the boundary at the start of the extended period we should
     // not be filling (since we removed the fill attribute above).
     animation.ownerSVGElement.setCurrentTime(100);
-    ise(rect.x.animVal.value, 0,
-        "Shouldn't fill after seeking to boundary of extended period");
+    is(rect.x.animVal.value, 0,
+       "Shouldn't fill after seeking to boundary of extended period");
 
     // If we apply a fill mode at this boundary point we should do regular fill
     // behavior of using the last value in the interpolation range.
     animation.setAttribute("fill", "freeze");
-    ise(rect.x.animVal.value, 100,
-        "Should fill at boundary to extended period");
+    is(rect.x.animVal.value, 100,
+       "Should fill at boundary to extended period");
 
     // Check that if we seek past the interval we fill with the value at the end
     // of the _repeat_duration_ not the value at the end of the
     // _active_duration_.
     animation.setAttribute("repeatCount", "1.5");
     animation.ownerSVGElement.setCurrentTime(225);
-    ise(rect.x.animVal.value, 50,
-        "Should fill with the end of the repeat duration value");
+    is(rect.x.animVal.value, 50,
+       "Should fill with the end of the repeat duration value");
 
     SimpleTest.finish();
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/smil/test/test_smilRepeatDuration.html firefox-trunk-41.0~a1~hg20150524r245419/dom/smil/test/test_smilRepeatDuration.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/smil/test/test_smilRepeatDuration.html	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/smil/test/test_smilRepeatDuration.html	2015-05-25 20:43:51.000000000 +0000
@@ -128,7 +128,7 @@
       var msg = msgPieces.join(', ');
 
       // Check the result
-      ise(getRepeatDuration(), test.result, msg);
+      is(getRepeatDuration(), test.result, msg);
     });
 
     SimpleTest.finish();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/storage/DOMStorageManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/storage/DOMStorageManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/storage/DOMStorageManager.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/storage/DOMStorageManager.cpp	2015-05-25 20:43:52.000000000 +0000
@@ -166,19 +166,9 @@
     key.Append(nsPrintfCString(":%d", port));
   }
 
-  bool unknownAppId;
-  rv = aPrincipal->GetUnknownAppId(&unknownAppId);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (!unknownAppId) {
-    uint32_t appId;
-    rv = aPrincipal->GetAppId(&appId);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    bool isInBrowserElement;
-    rv = aPrincipal->GetIsInBrowserElement(&isInBrowserElement);
-    NS_ENSURE_SUCCESS(rv, rv);
-
+  if (!aPrincipal->GetUnknownAppId()) {
+    uint32_t appId = aPrincipal->GetAppId();
+    bool isInBrowserElement = aPrincipal->GetIsInBrowserElement();
     if (appId == nsIScriptSecurityManager::NO_APP_ID && !isInBrowserElement) {
       aKey.Assign(key);
       return NS_OK;
@@ -221,19 +211,9 @@
 
   CreateReversedDomain(eTLDplusOne, subdomainsDBKey);
 
-  bool unknownAppId;
-  rv = aPrincipal->GetUnknownAppId(&unknownAppId);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (!unknownAppId) {
-    uint32_t appId;
-    rv = aPrincipal->GetAppId(&appId);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    bool isInBrowserElement;
-    rv = aPrincipal->GetIsInBrowserElement(&isInBrowserElement);
-    NS_ENSURE_SUCCESS(rv, rv);
-
+  if (!aPrincipal->GetUnknownAppId()) {
+    uint32_t appId = aPrincipal->GetAppId();
+    bool isInBrowserElement = aPrincipal->GetIsInBrowserElement();
     if (appId == nsIScriptSecurityManager::NO_APP_ID && !isInBrowserElement) {
       aKey.Assign(subdomainsDBKey);
       return NS_OK;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/DOMSVGLengthList.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/DOMSVGLengthList.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/DOMSVGLengthList.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/DOMSVGLengthList.cpp	2015-05-25 20:43:52.000000000 +0000
@@ -131,7 +131,7 @@
     }
   }
 
-  if (!mItems.SetLength(aNewLength)) {
+  if (!mItems.SetLength(aNewLength, fallible)) {
     // We silently ignore SetLength OOM failure since being out of sync is safe
     // so long as we have *fewer* items than our internal list.
     mItems.Clear();
@@ -255,7 +255,7 @@
   }
 
   // Ensure we have enough memory so we can avoid complex error handling below:
-  if (!mItems.SetCapacity(mItems.Length() + 1) ||
+  if (!mItems.SetCapacity(mItems.Length() + 1, fallible) ||
       !InternalList().SetCapacity(InternalList().Length() + 1)) {
     error.Throw(NS_ERROR_OUT_OF_MEMORY);
     return nullptr;
@@ -266,7 +266,7 @@
   MaybeInsertNullInAnimValListAt(index);
 
   InternalList().InsertItem(index, domItem->ToSVGLength());
-  mItems.InsertElementAt(index, domItem.get());
+  MOZ_ALWAYS_TRUE(mItems.InsertElementAt(index, domItem.get()));
 
   // This MUST come after the insertion into InternalList(), or else under the
   // insertion into InternalList() the values read from domItem would be bad
@@ -380,7 +380,7 @@
   MOZ_ASSERT(animVal->mItems.Length() == mItems.Length(),
              "animVal list not in sync!");
 
-  animVal->mItems.InsertElementAt(aIndex, static_cast<DOMSVGLength*>(nullptr));
+  MOZ_ALWAYS_TRUE(animVal->mItems.InsertElementAt(aIndex, nullptr));
 
   UpdateListIndicesFromIndex(animVal->mItems, aIndex + 1);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/DOMSVGNumberList.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/DOMSVGNumberList.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/DOMSVGNumberList.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/DOMSVGNumberList.cpp	2015-05-25 20:43:52.000000000 +0000
@@ -132,7 +132,7 @@
     }
   }
 
-  if (!mItems.SetLength(aNewLength)) {
+  if (!mItems.SetLength(aNewLength, fallible)) {
     // We silently ignore SetLength OOM failure since being out of sync is safe
     // so long as we have *fewer* items than our internal list.
     mItems.Clear();
@@ -239,7 +239,7 @@
   nsRefPtr<DOMSVGNumber> domItem = aItem.HasOwner() ? aItem.Clone() : &aItem;
 
   // Ensure we have enough memory so we can avoid complex error handling below:
-  if (!mItems.SetCapacity(mItems.Length() + 1) ||
+  if (!mItems.SetCapacity(mItems.Length() + 1, fallible) ||
       !InternalList().SetCapacity(InternalList().Length() + 1)) {
     error.Throw(NS_ERROR_OUT_OF_MEMORY);
     return nullptr;
@@ -250,7 +250,7 @@
   MaybeInsertNullInAnimValListAt(index);
 
   InternalList().InsertItem(index, domItem->ToSVGNumber());
-  mItems.InsertElementAt(index, domItem);
+  MOZ_ALWAYS_TRUE(mItems.InsertElementAt(index, domItem));
 
   // This MUST come after the insertion into InternalList(), or else under the
   // insertion into InternalList() the values read from domItem would be bad
@@ -359,7 +359,7 @@
   MOZ_ASSERT(animVal->mItems.Length() == mItems.Length(),
              "animVal list not in sync!");
 
-  animVal->mItems.InsertElementAt(aIndex, static_cast<DOMSVGNumber*>(nullptr));
+  MOZ_ALWAYS_TRUE(animVal->mItems.InsertElementAt(aIndex, nullptr));
 
   UpdateListIndicesFromIndex(animVal->mItems, aIndex + 1);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/DOMSVGPathSegList.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/DOMSVGPathSegList.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/DOMSVGPathSegList.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/DOMSVGPathSegList.cpp	2015-05-25 20:43:52.000000000 +0000
@@ -370,8 +370,9 @@
   uint32_t argCount = SVGPathSegUtils::ArgCountForType(domItem->Type());
 
   // Ensure we have enough memory so we can avoid complex error handling below:
-  if (!mItems.SetCapacity(mItems.Length() + 1) ||
-      !InternalList().mData.SetCapacity(InternalList().mData.Length() + 1 + argCount)) {
+  if (!mItems.SetCapacity(mItems.Length() + 1, fallible) ||
+      !InternalList().mData.SetCapacity(InternalList().mData.Length() + 1 + argCount,
+                                        fallible)) {
     aError.Throw(NS_ERROR_OUT_OF_MEMORY);
     return nullptr;
   }
@@ -383,8 +384,12 @@
   float segAsRaw[1 + NS_SVG_PATH_SEG_MAX_ARGS];
   domItem->ToSVGPathSegEncodedData(segAsRaw);
 
-  InternalList().mData.InsertElementsAt(internalIndex, segAsRaw, 1 + argCount);
-  mItems.InsertElementAt(aIndex, ItemProxy(domItem.get(), internalIndex));
+  MOZ_ALWAYS_TRUE(InternalList().mData.InsertElementsAt(internalIndex,
+                                                        segAsRaw,
+                                                        1 + argCount));
+  MOZ_ALWAYS_TRUE(mItems.InsertElementAt(aIndex,
+                                         ItemProxy(domItem.get(),
+                                                   internalIndex)));
 
   // This MUST come after the insertion into InternalList(), or else under the
   // insertion into InternalList() the values read from domItem would be bad
@@ -437,10 +442,9 @@
   float segAsRaw[1 + NS_SVG_PATH_SEG_MAX_ARGS];
   domItem->ToSVGPathSegEncodedData(segAsRaw);
 
-  bool ok = !!InternalList().mData.ReplaceElementsAt(
-                  internalIndex, 1 + oldArgCount,
-                  segAsRaw, 1 + newArgCount);
-  if (!ok) {
+  if (!InternalList().mData.ReplaceElementsAt(internalIndex, 1 + oldArgCount,
+                                              segAsRaw, 1 + newArgCount,
+                                              fallible)) {
     aError.Throw(NS_ERROR_OUT_OF_MEMORY);
     return nullptr;
   }
@@ -537,7 +541,9 @@
   MOZ_ASSERT(animVal->mItems.Length() == mItems.Length(),
              "animVal list not in sync!");
 
-  animVal->mItems.InsertElementAt(aIndex, ItemProxy(nullptr, aInternalIndex));
+  MOZ_ALWAYS_TRUE(animVal->mItems.InsertElementAt(aIndex,
+                                                  ItemProxy(nullptr,
+                                                            aInternalIndex)));
 
   animVal->UpdateListIndicesFromIndex(aIndex + 1, 1 + aArgCountForItem);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/DOMSVGPointList.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/DOMSVGPointList.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/DOMSVGPointList.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/DOMSVGPointList.cpp	2015-05-25 20:43:52.000000000 +0000
@@ -166,7 +166,7 @@
     }
   }
 
-  if (!mItems.SetLength(newLength)) {
+  if (!mItems.SetLength(newLength, fallible)) {
     // We silently ignore SetLength OOM failure since being out of sync is safe
     // so long as we have *fewer* items than our internal list.
     mItems.Clear();
@@ -306,7 +306,7 @@
   }
 
   // Ensure we have enough memory so we can avoid complex error handling below:
-  if (!mItems.SetCapacity(mItems.Length() + 1) ||
+  if (!mItems.SetCapacity(mItems.Length() + 1, fallible) ||
       !InternalList().SetCapacity(InternalList().Length() + 1)) {
     aError.Throw(NS_ERROR_OUT_OF_MEMORY);
     return nullptr;
@@ -317,7 +317,7 @@
   MaybeInsertNullInAnimValListAt(aIndex);
 
   InternalList().InsertItem(aIndex, domItem->ToSVGPoint());
-  mItems.InsertElementAt(aIndex, domItem);
+  MOZ_ALWAYS_TRUE(mItems.InsertElementAt(aIndex, domItem));
 
   // This MUST come after the insertion into InternalList(), or else under the
   // insertion into InternalList() the values read from domItem would be bad
@@ -433,7 +433,7 @@
   MOZ_ASSERT(animVal->mItems.Length() == mItems.Length(),
              "animVal list not in sync!");
 
-  animVal->mItems.InsertElementAt(aIndex, static_cast<nsISVGPoint*>(nullptr));
+  MOZ_ALWAYS_TRUE(animVal->mItems.InsertElementAt(aIndex, nullptr));
 
   UpdateListIndicesFromIndex(animVal->mItems, aIndex + 1);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/DOMSVGTransformList.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/DOMSVGTransformList.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/DOMSVGTransformList.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/DOMSVGTransformList.cpp	2015-05-25 20:43:52.000000000 +0000
@@ -132,7 +132,7 @@
     }
   }
 
-  if (!mItems.SetLength(aNewLength)) {
+  if (!mItems.SetLength(aNewLength, fallible)) {
     // We silently ignore SetLength OOM failure since being out of sync is safe
     // so long as we have *fewer* items than our internal list.
     mItems.Clear();
@@ -247,7 +247,7 @@
   }
 
   // Ensure we have enough memory so we can avoid complex error handling below:
-  if (!mItems.SetCapacity(mItems.Length() + 1) ||
+  if (!mItems.SetCapacity(mItems.Length() + 1, fallible) ||
       !InternalList().SetCapacity(InternalList().Length() + 1)) {
     error.Throw(NS_ERROR_OUT_OF_MEMORY);
     return nullptr;
@@ -258,7 +258,7 @@
   MaybeInsertNullInAnimValListAt(index);
 
   InternalList().InsertItem(index, domItem->ToSVGTransform());
-  mItems.InsertElementAt(index, domItem.get());
+  MOZ_ALWAYS_TRUE(mItems.InsertElementAt(index, domItem.get()));
 
   // This MUST come after the insertion into InternalList(), or else under the
   // insertion into InternalList() the values read from domItem would be bad
@@ -406,8 +406,7 @@
   MOZ_ASSERT(animVal->mItems.Length() == mItems.Length(),
              "animVal list not in sync!");
 
-  animVal->mItems.InsertElementAt(aIndex,
-                                  static_cast<SVGTransform*>(nullptr));
+  MOZ_ALWAYS_TRUE(animVal->mItems.InsertElementAt(aIndex, nullptr));
 
   UpdateListIndicesFromIndex(animVal->mItems, aIndex + 1);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/nsSVGElement.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/nsSVGElement.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/nsSVGElement.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/nsSVGElement.cpp	2015-05-25 20:43:53.000000000 +0000
@@ -1129,7 +1129,7 @@
   MappedAttrParser(css::Loader* aLoader,
                    nsIURI* aDocURI,
                    already_AddRefed<nsIURI> aBaseURI,
-                   nsIPrincipal* aNodePrincipal);
+                   nsSVGElement* aElement);
   ~MappedAttrParser();
 
   // Parses a mapped attribute value.
@@ -1149,18 +1149,20 @@
   // Arguments for nsCSSParser::ParseProperty
   nsIURI*           mDocURI;
   nsCOMPtr<nsIURI>  mBaseURI;
-  nsIPrincipal*     mNodePrincipal;
 
   // Declaration for storing parsed values (lazily initialized)
   css::Declaration* mDecl;
+
+  // For reporting use counters
+  nsSVGElement*     mElement;
 };
 
 MappedAttrParser::MappedAttrParser(css::Loader* aLoader,
                                    nsIURI* aDocURI,
                                    already_AddRefed<nsIURI> aBaseURI,
-                                   nsIPrincipal* aNodePrincipal)
+                                   nsSVGElement* aElement)
   : mParser(aLoader), mDocURI(aDocURI), mBaseURI(aBaseURI),
-    mNodePrincipal(aNodePrincipal), mDecl(nullptr)
+    mDecl(nullptr), mElement(aElement)
 {
 }
 
@@ -1187,7 +1189,7 @@
   if (propertyID != eCSSProperty_UNKNOWN) {
     bool changed; // outparam for ParseProperty. (ignored)
     mParser.ParseProperty(propertyID, aMappedAttrValue, mDocURI, mBaseURI,
-                          mNodePrincipal, mDecl, &changed, false, true);
+                          mElement->NodePrincipal(), mDecl, &changed, false, true);
     return;
   }
   MOZ_ASSERT(aMappedAttrName == nsGkAtoms::lang,
@@ -1234,7 +1236,7 @@
 
   nsIDocument* doc = OwnerDoc();
   MappedAttrParser mappedAttrParser(doc->CSSLoader(), doc->GetDocumentURI(),
-                                    GetBaseURI(), NodePrincipal());
+                                    GetBaseURI(), this);
 
   for (uint32_t i = 0; i < attrCount; ++i) {
     const nsAttrName* attrName = mAttrsAndChildren.AttrNameAt(i);
@@ -1325,7 +1327,7 @@
   }
 
   MappedAttrParser mappedAttrParser(doc->CSSLoader(), doc->GetDocumentURI(),
-                                    GetBaseURI(), NodePrincipal());
+                                    GetBaseURI(), this);
   doc->PropertyTable(SMIL_MAPPED_ATTR_ANIMVAL)->
     Enumerate(this, ParseMappedAttrAnimValueCallback, &mappedAttrParser);
  
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/nsSVGPathGeometryElement.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/nsSVGPathGeometryElement.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/nsSVGPathGeometryElement.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/nsSVGPathGeometryElement.cpp	2015-05-25 20:43:53.000000000 +0000
@@ -89,7 +89,8 @@
   // looking at the global variable that the pref's stored in.
   if (cacheable && mCachedPath) {
     if (aDrawTarget.GetBackendType() == mCachedPath->GetBackendType()) {
-      return mCachedPath;
+      RefPtr<Path> path(mCachedPath);
+      return path.forget();
     }
   }
   RefPtr<PathBuilder> builder = aDrawTarget.CreatePathBuilder(aFillRule);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGLengthList.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGLengthList.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGLengthList.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGLengthList.cpp	2015-05-25 20:43:52.000000000 +0000
@@ -18,7 +18,7 @@
 nsresult
 SVGLengthList::CopyFrom(const SVGLengthList& rhs)
 {
-  if (!mLengths.SetCapacity(rhs.Length())) {
+  if (!mLengths.SetCapacity(rhs.Length(), fallible)) {
     // Yes, we do want fallible alloc here
     return NS_ERROR_OUT_OF_MEMORY;
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGLengthList.h firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGLengthList.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGLengthList.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGLengthList.h	2015-05-25 20:43:52.000000000 +0000
@@ -59,7 +59,7 @@
   bool operator==(const SVGLengthList& rhs) const;
 
   bool SetCapacity(uint32_t size) {
-    return mLengths.SetCapacity(size);
+    return mLengths.SetCapacity(size, fallible);
   }
 
   void Compact() {
@@ -90,7 +90,7 @@
    * increased, in which case the list will be left unmodified.
    */
   bool SetLength(uint32_t aNumberOfItems) {
-    return mLengths.SetLength(aNumberOfItems);
+    return mLengths.SetLength(aNumberOfItems, fallible);
   }
 
 private:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGMotionSMILType.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGMotionSMILType.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGMotionSMILType.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGMotionSMILType.cpp	2015-05-25 20:43:52.000000000 +0000
@@ -199,7 +199,7 @@
   MotionSegmentArray& dstArr = ExtractMotionSegmentArray(aDest);
 
   // Ensure we have sufficient memory.
-  if (!dstArr.SetCapacity(srcArr.Length())) {
+  if (!dstArr.SetCapacity(srcArr.Length(), fallible)) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
@@ -307,8 +307,7 @@
 
   // Replace destination's current value -- a point-on-a-path -- with the
   // translation that results from our addition.
-  dstArr.Clear();
-  dstArr.AppendElement(MotionSegment(newX, newY, rotateAngle));
+  dstArr.ReplaceElementAt(0, MotionSegment(newX, newY, rotateAngle));
   return NS_OK;
 }
 
@@ -441,8 +440,9 @@
 
   // Construct the intermediate result segment, and put it in our outparam.
   // AppendElement has guaranteed success here, since Init() allocates 1 slot.
-  resultArr.AppendElement(MotionSegment(path, resultDist,
-                                        rotateType, rotateAngle));
+  MOZ_ALWAYS_TRUE(resultArr.AppendElement(MotionSegment(path, resultDist,
+                                                        rotateType,
+                                                        rotateAngle)));
   return NS_OK;
 }
 
@@ -484,7 +484,8 @@
   MotionSegmentArray& arr = ExtractMotionSegmentArray(smilVal);
 
   // AppendElement has guaranteed success here, since Init() allocates 1 slot.
-  arr.AppendElement(MotionSegment(aPath, aDist, aRotateType, aRotateAngle));
+  MOZ_ALWAYS_TRUE(arr.AppendElement(MotionSegment(aPath, aDist,
+                                                  aRotateType, aRotateAngle)));
   return smilVal;
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGNumberList.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGNumberList.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGNumberList.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGNumberList.cpp	2015-05-25 20:43:52.000000000 +0000
@@ -17,7 +17,7 @@
 nsresult
 SVGNumberList::CopyFrom(const SVGNumberList& rhs)
 {
-  if (!mNumbers.SetCapacity(rhs.Length())) {
+  if (!mNumbers.SetCapacity(rhs.Length(), fallible)) {
     // Yes, we do want fallible alloc here
     return NS_ERROR_OUT_OF_MEMORY;
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGNumberList.h firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGNumberList.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGNumberList.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGNumberList.h	2015-05-25 20:43:52.000000000 +0000
@@ -60,7 +60,7 @@
   }
 
   bool SetCapacity(uint32_t size) {
-    return mNumbers.SetCapacity(size);
+    return mNumbers.SetCapacity(size, fallible);
   }
 
   void Compact() {
@@ -91,7 +91,7 @@
    * increased, in which case the list will be left unmodified.
    */
   bool SetLength(uint32_t aNumberOfItems) {
-    return mNumbers.SetLength(aNumberOfItems);
+    return mNumbers.SetLength(aNumberOfItems, fallible);
   }
 
 private:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGPathData.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGPathData.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGPathData.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGPathData.cpp	2015-05-25 20:43:52.000000000 +0000
@@ -34,7 +34,7 @@
 nsresult
 SVGPathData::CopyFrom(const SVGPathData& rhs)
 {
-  if (!mData.SetCapacity(rhs.mData.Length())) {
+  if (!mData.SetCapacity(rhs.mData.Length(), fallible)) {
     // Yes, we do want fallible alloc here
     return NS_ERROR_OUT_OF_MEMORY;
   }
@@ -81,7 +81,7 @@
 {
   uint32_t oldLength = mData.Length();
   uint32_t newLength = oldLength + 1 + SVGPathSegUtils::ArgCountForType(aType);
-  if (!mData.SetLength(newLength)) {
+  if (!mData.SetLength(newLength, fallible)) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGPathData.h firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGPathData.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGPathData.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGPathData.h	2015-05-25 20:43:52.000000000 +0000
@@ -135,7 +135,7 @@
   }
 
   bool SetCapacity(uint32_t aSize) {
-    return mData.SetCapacity(aSize);
+    return mData.SetCapacity(aSize, fallible);
   }
 
   void Compact() {
@@ -202,7 +202,7 @@
    * increased, in which case the list will be left unmodified.
    */
   bool SetLength(uint32_t aLength) {
-    return mData.SetLength(aLength);
+    return mData.SetLength(aLength, fallible);
   }
 
   nsresult SetValueFromString(const nsAString& aValue);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGPointList.h firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGPointList.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGPointList.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGPointList.h	2015-05-25 20:43:52.000000000 +0000
@@ -68,7 +68,7 @@
   }
 
   bool SetCapacity(uint32_t aSize) {
-    return mItems.SetCapacity(aSize);
+    return mItems.SetCapacity(aSize, fallible);
   }
 
   void Compact() {
@@ -99,7 +99,7 @@
    * increased, in which case the list will be left unmodified.
    */
   bool SetLength(uint32_t aNumberOfItems) {
-    return mItems.SetLength(aNumberOfItems);
+    return mItems.SetLength(aNumberOfItems, fallible);
   }
 
 private:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGScriptElement.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGScriptElement.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGScriptElement.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGScriptElement.cpp	2015-05-25 20:43:52.000000000 +0000
@@ -124,9 +124,7 @@
 void
 SVGScriptElement::GetScriptText(nsAString& text)
 {
-  if (!nsContentUtils::GetNodeTextContent(this, false, text)) {
-    NS_RUNTIMEABORT("OOM");
-  }
+  nsContentUtils::GetNodeTextContent(this, false, text);
 }
 
 void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGStringList.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGStringList.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGStringList.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGStringList.cpp	2015-05-25 20:43:52.000000000 +0000
@@ -16,7 +16,7 @@
 nsresult
 SVGStringList::CopyFrom(const SVGStringList& rhs)
 {
-  if (!mStrings.SetCapacity(rhs.Length())) {
+  if (!mStrings.SetCapacity(rhs.Length(), fallible)) {
     // Yes, we do want fallible alloc here
     return NS_ERROR_OUT_OF_MEMORY;
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGStringList.h firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGStringList.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGStringList.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGStringList.h	2015-05-25 20:43:52.000000000 +0000
@@ -56,7 +56,7 @@
   }
 
   bool SetCapacity(uint32_t size) {
-    return mStrings.SetCapacity(size);
+    return mStrings.SetCapacity(size, fallible);
   }
 
   void Compact() {
@@ -92,7 +92,7 @@
    * increased, in which case the list will be left unmodified.
    */
   bool SetLength(uint32_t aStringOfItems) {
-    return mStrings.SetLength(aStringOfItems);
+    return mStrings.SetLength(aStringOfItems, fallible);
   }
 
 private:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGTransformList.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGTransformList.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGTransformList.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGTransformList.cpp	2015-05-25 20:43:52.000000000 +0000
@@ -43,7 +43,7 @@
 nsresult
 SVGTransformList::CopyFrom(const nsTArray<nsSVGTransform>& aTransformArray)
 {
-  if (!mItems.SetCapacity(aTransformArray.Length())) {
+  if (!mItems.SetCapacity(aTransformArray.Length(), fallible)) {
     // Yes, we do want fallible alloc here
     return NS_ERROR_OUT_OF_MEMORY;
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGTransformList.h firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGTransformList.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGTransformList.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGTransformList.h	2015-05-25 20:43:52.000000000 +0000
@@ -60,7 +60,7 @@
   }
 
   bool SetCapacity(uint32_t size) {
-    return mItems.SetCapacity(size);
+    return mItems.SetCapacity(size, fallible);
   }
 
   void Compact() {
@@ -94,7 +94,7 @@
    * increased, in which case the list will be left unmodified.
    */
   bool SetLength(uint32_t aNumberOfItems) {
-    return mItems.SetLength(aNumberOfItems);
+    return mItems.SetLength(aNumberOfItems, fallible);
   }
 
 private:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGTransformListSMILType.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGTransformListSMILType.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/SVGTransformListSMILType.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/SVGTransformListSMILType.cpp	2015-05-25 20:43:52.000000000 +0000
@@ -50,7 +50,7 @@
   TransformArray* dstTransforms = static_cast<TransformArray*>(aDest.mU.mPtr);
 
   // Before we assign, ensure we have sufficient memory
-  bool result = dstTransforms->SetCapacity(srcTransforms->Length());
+  bool result = dstTransforms->SetCapacity(srcTransforms->Length(), fallible);
   NS_ENSURE_TRUE(result,NS_ERROR_OUT_OF_MEMORY);
 
   *dstTransforms = *srcTransforms;
@@ -336,13 +336,13 @@
 
   TransformArray& transforms = *static_cast<TransformArray*>(aValue.mU.mPtr);
 
-  if (!transforms.SetCapacity(transforms.Length() + aList.Length()))
+  if (!transforms.SetCapacity(transforms.Length() + aList.Length(), fallible))
     return false;
 
   for (uint32_t i = 0; i < aList.Length(); ++i) {
     // No need to check the return value below since we have already allocated
     // the necessary space
-    transforms.AppendElement(SVGTransformSMILData(aList[i]));
+    MOZ_ALWAYS_TRUE(transforms.AppendElement(SVGTransformSMILData(aList[i])));
   }
   return true;
 }
@@ -358,7 +358,7 @@
     *static_cast<const TransformArray*>(aValue.mU.mPtr);
 
   aTransforms.Clear();
-  if (!aTransforms.SetCapacity(smilTransforms.Length()))
+  if (!aTransforms.SetCapacity(smilTransforms.Length(), fallible))
       return false;
 
   for (uint32_t i = 0; i < smilTransforms.Length(); ++i) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/test/test_lengthParsing.html firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/test/test_lengthParsing.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/test/test_lengthParsing.html	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/test/test_lengthParsing.html	2015-05-25 20:43:53.000000000 +0000
@@ -65,7 +65,7 @@
   if (typeof units == "undefined") {
     units = "";
   }
-  ise(rect.x.baseVal.unitType, unitMapping[units], spec + " (unit)");
+  is(rect.x.baseVal.unitType, unitMapping[units], spec + " (unit)");
 }
 
 function checkParseFail(spec) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/test/test_transformParsing.html firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/test/test_transformParsing.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/svg/test/test_transformParsing.html	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/svg/test/test_transformParsing.html	2015-05-25 20:43:53.000000000 +0000
@@ -76,12 +76,12 @@
 
   // Compare type
   if (typeof expected.type != "undefined") {
-    ise(transform.type, typeMapping[expected.type], name + " - transform type");
+    is(transform.type, typeMapping[expected.type], name + " - transform type");
   }
 
   // Compare angle
   if (typeof expected.angle != "undefined") {
-    ise(transform.angle, expected.angle, name + " - angle");
+    is(transform.angle, expected.angle, name + " - angle");
   }
 
   // Compare matrix values (roughly)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/DataCallInterfaceService.js firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/DataCallInterfaceService.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/DataCallInterfaceService.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/DataCallInterfaceService.js	2015-05-25 20:43:53.000000000 +0000
@@ -0,0 +1,274 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 DATACALLINTERFACE_CONTRACTID = "@mozilla.org/datacall/interface;1";
+const DATACALLINTERFACESERVICE_CONTRACTID =
+  "@mozilla.org/datacall/interfaceservice;1";
+const DATACALLINTERFACE_CID =
+  Components.ID("{ff669306-4390-462a-989b-ba37fc42153f}");
+const DATACALLINTERFACESERVICE_CID =
+  Components.ID("{e23e9337-592d-40b9-8cef-7bd47c28b72e}");
+
+const TOPIC_XPCOM_SHUTDOWN      = "xpcom-shutdown";
+const TOPIC_PREF_CHANGED        = "nsPref:changed";
+const PREF_RIL_DEBUG_ENABLED    = "ril.debugging.enabled";
+
+XPCOMUtils.defineLazyGetter(this, "RIL", function () {
+  let obj = {};
+  Cu.import("resource://gre/modules/ril_consts.js", obj);
+  return obj;
+});
+
+XPCOMUtils.defineLazyServiceGetter(this, "gRil",
+                                   "@mozilla.org/ril;1",
+                                   "nsIRadioInterfaceLayer");
+
+XPCOMUtils.defineLazyServiceGetter(this, "gMobileConnectionService",
+                                   "@mozilla.org/mobileconnection/mobileconnectionservice;1",
+                                   "nsIMobileConnectionService");
+
+var DEBUG = RIL.DEBUG_RIL;
+
+function updateDebugFlag() {
+  // Read debug setting from pref
+  let debugPref;
+  try {
+    debugPref = Services.prefs.getBoolPref(PREF_RIL_DEBUG_ENABLED);
+  } catch (e) {
+    debugPref = false;
+  }
+  DEBUG = debugPref || RIL.DEBUG_RIL;
+}
+updateDebugFlag();
+
+function DataCall(aAttributes) {
+  for (let key in aAttributes) {
+    if (key === "pdpType") {
+      // Convert pdp type into constant int value.
+      this[key] = RIL.RIL_DATACALL_PDP_TYPES.indexOf(aAttributes[key]);
+      continue;
+    }
+
+    this[key] = aAttributes[key];
+  }
+}
+DataCall.prototype = {
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIDataCall]),
+
+  failCause: Ci.nsIDataCallInterface.DATACALL_FAIL_NONE,
+  suggestedRetryTime: -1,
+  cid: -1,
+  active: -1,
+  pdpType: -1,
+  ifname: null,
+  addreses: null,
+  dnses: null,
+  gateways: null
+};
+
+function DataCallInterfaceService() {
+  this._dataCallInterfaces = [];
+
+  let numClients = gRil.numRadioInterfaces;
+  for (let i = 0; i < numClients; i++) {
+    this._dataCallInterfaces.push(new DataCallInterface(i));
+  }
+
+  Services.obs.addObserver(this, TOPIC_XPCOM_SHUTDOWN, false);
+  Services.prefs.addObserver(PREF_RIL_DEBUG_ENABLED, this, false);
+}
+DataCallInterfaceService.prototype = {
+  classID:   DATACALLINTERFACESERVICE_CID,
+  classInfo: XPCOMUtils.generateCI({
+    classID: DATACALLINTERFACESERVICE_CID,
+    contractID: DATACALLINTERFACESERVICE_CONTRACTID,
+    classDescription: "Data Call Interface Service",
+    interfaces: [Ci.nsIDataCallInterfaceService,
+                 Ci.nsIGonkDataCallInterfaceService]
+  }),
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIDataCallInterfaceService,
+                                         Ci.nsIGonkDataCallInterfaceService],
+                                         Ci.nsIObserver),
+
+  // An array of DataCallInterface instances.
+  _dataCallInterfaces: null,
+
+  debug: function(aMessage) {
+    dump("-*- DataCallInterfaceService: " + aMessage + "\n");
+  },
+
+  // nsIDataCallInterfaceService
+
+  getDataCallInterface: function(aClientId) {
+    let dataCallInterface = this._dataCallInterfaces[aClientId];
+    if (!dataCallInterface) {
+      throw Cr.NS_ERROR_UNEXPECTED;
+    }
+
+    return dataCallInterface;
+  },
+
+  // nsIGonkDataCallInterfaceService
+
+  notifyDataCallListChanged: function(aClientId, aCount, aDataCalls) {
+    let dataCallInterface = this.getDataCallInterface(aClientId);
+    dataCallInterface.handleDataCallListChanged(aCount, aDataCalls);
+  },
+
+  // nsIObserver
+
+  observe: function(aSubject, aTopic, aData) {
+    switch (aTopic) {
+      case TOPIC_PREF_CHANGED:
+        if (aData === PREF_RIL_DEBUG_ENABLED) {
+          updateDebugFlag();
+        }
+        break;
+      case TOPIC_XPCOM_SHUTDOWN:
+        Services.prefs.removeObserver(PREF_RIL_DEBUG_ENABLED, this);
+        Services.obs.removeObserver(this, TOPIC_XPCOM_SHUTDOWN);
+        break;
+    }
+  },
+};
+
+function DataCallInterface(aClientId) {
+  this._clientId = aClientId;
+  this._radioInterface = gRil.getRadioInterface(aClientId);
+  this._listeners = [];
+
+  if (DEBUG) this.debug("DataCallInterface: " + aClientId);
+}
+DataCallInterface.prototype = {
+  classID:   DATACALLINTERFACE_CID,
+  classInfo: XPCOMUtils.generateCI({classID: DATACALLINTERFACE_CID,
+                                    contractID: DATACALLINTERFACE_CONTRACTID,
+                                    classDescription: "Data Call Interface",
+                                    interfaces: [Ci.nsIDataCallInterface]}),
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIDataCallInterface]),
+
+  debug: function(aMessage) {
+    dump("-*- DataCallInterface[" + this._clientId + "]: " + aMessage + "\n");
+  },
+
+  _clientId: -1,
+
+  _radioInterface: null,
+
+  _listeners: null,
+
+  // nsIDataCallInterface
+
+  setupDataCall: function(aApn, aUsername, aPassword, aAuthType, aPdpType,
+                          aCallback) {
+    let connection =
+      gMobileConnectionService.getItemByServiceId(this._clientId);
+    let dataInfo = connection && connection.data;
+    let radioTechType = dataInfo.type;
+    let radioTechnology = RIL.GECKO_RADIO_TECH.indexOf(radioTechType);
+    // Convert pdp type into string value.
+    let pdpType = RIL.RIL_DATACALL_PDP_TYPES[aPdpType];
+
+    this._radioInterface.sendWorkerMessage("setupDataCall", {
+      radioTech: radioTechnology,
+      apn: aApn,
+      user: aUsername,
+      passwd: aPassword,
+      chappap: aAuthType,
+      pdptype: pdpType
+    }, (aResponse) => {
+      if (aResponse.errorMsg) {
+        aCallback.notifyError(aResponse.errorMsg);
+      } else {
+        let dataCall = new DataCall(aResponse);
+        aCallback.notifySetupDataCallSuccess(dataCall);
+      }
+    });
+  },
+
+  deactivateDataCall: function(aCid, aReason, aCallback) {
+    this._radioInterface.sendWorkerMessage("deactivateDataCall", {
+      cid: aCid,
+      reason: aReason
+    }, (aResponse) => {
+      if (aResponse.errorMsg) {
+        aCallback.notifyError(aResponse.errorMsg);
+      } else {
+        aCallback.notifySuccess();
+      }
+    });
+  },
+
+  getDataCallList: function(aCallback) {
+    this._radioInterface.sendWorkerMessage("getDataCallList", null,
+      (aResponse) => {
+        if (aResponse.errorMsg) {
+          aCallback.notifyError(aResponse.errorMsg);
+        } else {
+          let dataCalls = aResponse.datacalls.map(
+            dataCall => new DataCall(dataCall));
+          aCallback.notifyGetDataCallListSuccess(dataCalls.length, dataCalls);
+        }
+      });
+  },
+
+  setDataRegistration: function(aAttach, aCallback) {
+    this._radioInterface.sendWorkerMessage("setDataRegistration", {
+      attach: aAttach
+    }, (aResponse) => {
+      if (aResponse.errorMsg) {
+        aCallback.notifyError(aResponse.errorMsg);
+      } else {
+        aCallback.notifySuccess();
+      }
+    });
+  },
+
+  handleDataCallListChanged: function(aCount, aDataCalls) {
+    this._notifyAllListeners("notifyDataCallListChanged", [aCount, aDataCalls]);
+  },
+
+  _notifyAllListeners: function(aMethodName, aArgs) {
+    let listeners = this._listeners.slice();
+    for (let listener of listeners) {
+      if (this._listeners.indexOf(listener) == -1) {
+        // Listener has been unregistered in previous run.
+        continue;
+      }
+
+      let handler = listener[aMethodName];
+      try {
+        handler.apply(listener, aArgs);
+      } catch (e) {
+        if (DEBUG) {
+          this.debug("listener for " + aMethodName + " threw an exception: " + e);
+        }
+      }
+    }
+  },
+
+  registerListener: function(aListener) {
+    if (this._listeners.indexOf(aListener) >= 0) {
+      return;
+    }
+
+    this._listeners.push(aListener);
+  },
+
+  unregisterListener: function(aListener) {
+    let index = this._listeners.indexOf(aListener);
+    if (index >= 0) {
+      this._listeners.splice(index, 1);
+    }
+  },
+};
+
+this.NSGetFactory = XPCOMUtils.generateNSGetFactory([DataCallInterfaceService]);
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/DataCallInterfaceService.manifest firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/DataCallInterfaceService.manifest
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/DataCallInterfaceService.manifest	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/DataCallInterfaceService.manifest	2015-05-25 20:43:53.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 {e23e9337-592d-40b9-8cef-7bd47c28b72e} DataCallInterfaceService.js
+contract @mozilla.org/datacall/interfaceservice;1 {e23e9337-592d-40b9-8cef-7bd47c28b72e}
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/DataCallManager.js firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/DataCallManager.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/DataCallManager.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/DataCallManager.js	2015-05-25 20:43:53.000000000 +0000
@@ -0,0 +1,1655 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/systemlibs.js");
+
+XPCOMUtils.defineLazyServiceGetter(this, "gSettingsService",
+                                   "@mozilla.org/settingsService;1",
+                                   "nsISettingsService");
+
+XPCOMUtils.defineLazyServiceGetter(this, "gNetworkManager",
+                                   "@mozilla.org/network/manager;1",
+                                   "nsINetworkManager");
+
+XPCOMUtils.defineLazyServiceGetter(this, "gMobileConnectionService",
+                                   "@mozilla.org/mobileconnection/mobileconnectionservice;1",
+                                   "nsIMobileConnectionService");
+
+XPCOMUtils.defineLazyServiceGetter(this, "gIccService",
+                                   "@mozilla.org/icc/iccservice;1",
+                                   "nsIIccService");
+
+XPCOMUtils.defineLazyServiceGetter(this, "gDataCallInterfaceService",
+                                   "@mozilla.org/datacall/interfaceservice;1",
+                                   "nsIDataCallInterfaceService");
+
+XPCOMUtils.defineLazyGetter(this, "RIL", function() {
+  let obj = {};
+  Cu.import("resource://gre/modules/ril_consts.js", obj);
+  return obj;
+});
+
+// Ril quirk to attach data registration on demand.
+let RILQUIRKS_DATA_REGISTRATION_ON_DEMAND =
+  libcutils.property_get("ro.moz.ril.data_reg_on_demand", "false") == "true";
+
+// Ril quirk to control the uicc/data subscription.
+let RILQUIRKS_SUBSCRIPTION_CONTROL =
+  libcutils.property_get("ro.moz.ril.subscription_control", "false") == "true";
+
+// Ril quirk to enable IPv6 protocol/roaming protocol in APN settings.
+let RILQUIRKS_HAVE_IPV6 =
+  libcutils.property_get("ro.moz.ril.ipv6", "false") == "true";
+
+const DATACALLMANAGER_CID =
+  Components.ID("{35b9efa2-e42c-45ce-8210-0a13e6f4aadc}");
+const DATACALLHANDLER_CID =
+  Components.ID("{132b650f-c4d8-4731-96c5-83785cb31dee}");
+const RILNETWORKINTERFACE_CID =
+  Components.ID("{8c11bef9-9b4f-4d96-bed7-f5a1f48eabda}");
+
+const TOPIC_XPCOM_SHUTDOWN      = "xpcom-shutdown";
+const TOPIC_MOZSETTINGS_CHANGED = "mozsettings-changed";
+const TOPIC_PREF_CHANGED        = "nsPref:changed";
+const TOPIC_DATA_CALL_ERROR     = "data-call-error";
+const PREF_RIL_DEBUG_ENABLED    = "ril.debugging.enabled";
+
+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 NETWORK_STATE_UNKNOWN       = Ci.nsINetworkInterface.NETWORK_STATE_UNKNOWN;
+const NETWORK_STATE_CONNECTING    = Ci.nsINetworkInterface.NETWORK_STATE_CONNECTING;
+const NETWORK_STATE_CONNECTED     = Ci.nsINetworkInterface.NETWORK_STATE_CONNECTED;
+const NETWORK_STATE_DISCONNECTING = Ci.nsINetworkInterface.NETWORK_STATE_DISCONNECTING;
+const NETWORK_STATE_DISCONNECTED  = Ci.nsINetworkInterface.NETWORK_STATE_DISCONNECTED;
+
+const INT32_MAX = 2147483647;
+
+// set to true in ril_consts.js to see debug messages
+var DEBUG = RIL.DEBUG_RIL;
+
+function updateDebugFlag() {
+  // Read debug setting from pref
+  let debugPref;
+  try {
+    debugPref = Services.prefs.getBoolPref(PREF_RIL_DEBUG_ENABLED);
+  } catch (e) {
+    debugPref = false;
+  }
+  DEBUG = debugPref || RIL.DEBUG_RIL;
+}
+updateDebugFlag();
+
+function DataCallManager() {
+  this._connectionHandlers = [];
+
+  let numRadioInterfaces = gMobileConnectionService.numItems;
+  for (let clientId = 0; clientId < numRadioInterfaces; clientId++) {
+    this._connectionHandlers.push(new DataCallHandler(clientId));
+  }
+
+  let lock = gSettingsService.createLock();
+  // Read the APN data from the settings DB.
+  lock.get("ril.data.apnSettings", this);
+  // Read the data enabled setting from DB.
+  lock.get("ril.data.enabled", this);
+  lock.get("ril.data.roaming_enabled", this);
+  // Read the default client id for data call.
+  lock.get("ril.data.defaultServiceId", this);
+
+  Services.obs.addObserver(this, TOPIC_XPCOM_SHUTDOWN, false);
+  Services.obs.addObserver(this, TOPIC_MOZSETTINGS_CHANGED, false);
+  Services.prefs.addObserver(PREF_RIL_DEBUG_ENABLED, this, false);
+}
+DataCallManager.prototype = {
+  classID:   DATACALLMANAGER_CID,
+  classInfo: XPCOMUtils.generateCI({classID: DATACALLMANAGER_CID,
+                                    classDescription: "Data Call Manager",
+                                    interfaces: [Ci.nsIDataCallManager]}),
+
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIDataCallManager,
+                                         Ci.nsIObserver,
+                                         Ci.nsISettingsServiceCallback]),
+
+  _connectionHandlers: null,
+
+  // Flag to determine the data state to start with when we boot up. It
+  // corresponds to the 'ril.data.enabled' setting from the UI.
+  _dataEnabled: false,
+
+  // Flag to record the default client id for data call. It corresponds to
+  // the 'ril.data.defaultServiceId' setting from the UI.
+  _dataDefaultClientId: -1,
+
+  // Flag to record the current default client id for data call.
+  // It differs from _dataDefaultClientId in that it is set only when
+  // the switch of client id process is done.
+  _currentDataClientId: -1,
+
+  // Pending function to execute when we are notified that another data call has
+  // been disconnected.
+  _pendingDataCallRequest: null,
+
+  debug: function(aMsg) {
+    dump("-*- DataCallManager: " + aMsg + "\n");
+  },
+
+  getDataCallHandler: function(aClientId) {
+    let handler = this._connectionHandlers[aClientId]
+    if (!handler) {
+      throw Cr.NS_ERROR_UNEXPECTED;
+    }
+
+    return handler;
+  },
+
+  _setDataRegistration: function(aDataCallInterface, aAttach) {
+    return new Promise(function(aResolve, aReject) {
+      let callback = {
+        QueryInterface: XPCOMUtils.generateQI([Ci.nsIDataCallCallback]),
+        notifySuccess: function() {
+          aResolve();
+        },
+        notifyError: function(aErrorMsg) {
+          aReject(aErrorMsg);
+        }
+      };
+
+      aDataCallInterface.setDataRegistration(aAttach, callback);
+    });
+  },
+
+  _handleDataClientIdChange: function(aNewClientId) {
+    if (this._dataDefaultClientId === aNewClientId) {
+       return;
+    }
+    this._dataDefaultClientId = aNewClientId;
+
+    // This is to handle boot up stage.
+    if (this._currentDataClientId == -1) {
+      this._currentDataClientId = this._dataDefaultClientId;
+      let connHandler = this._connectionHandlers[this._currentDataClientId];
+      let dcInterface = connHandler.dataCallInterface;
+      if (RILQUIRKS_DATA_REGISTRATION_ON_DEMAND ||
+          RILQUIRKS_SUBSCRIPTION_CONTROL) {
+        this._setDataRegistration(dcInterface, true);
+      }
+      if (this._dataEnabled) {
+        let settings = connHandler.dataCallSettings;
+        settings.oldEnabled = settings.enabled;
+        settings.enabled = true;
+        connHandler.updateRILNetworkInterface();
+      }
+      return;
+    }
+
+    let oldConnHandler = this._connectionHandlers[this._currentDataClientId];
+    let oldIface = oldConnHandler.dataCallInterface;
+    let oldSettings = oldConnHandler.dataCallSettings;
+    let newConnHandler = this._connectionHandlers[this._dataDefaultClientId];
+    let newIface = newConnHandler.dataCallInterface;
+    let newSettings = newConnHandler.dataCallSettings;
+
+    let applyPendingDataSettings = () => {
+      if (DEBUG) {
+        this.debug("Apply pending data registration and settings.");
+      }
+
+      if (RILQUIRKS_DATA_REGISTRATION_ON_DEMAND ||
+          RILQUIRKS_SUBSCRIPTION_CONTROL) {
+        this._setDataRegistration(oldIface, false).then(() => {
+          if (this._dataEnabled) {
+            newSettings.oldEnabled = newSettings.enabled;
+            newSettings.enabled = true;
+          }
+          this._currentDataClientId = this._dataDefaultClientId;
+
+          this._setDataRegistration(newIface, true).then(() => {
+            newConnHandler.updateRILNetworkInterface();
+          });
+        });
+        return;
+      }
+
+      if (this._dataEnabled) {
+        newSettings.oldEnabled = newSettings.enabled;
+        newSettings.enabled = true;
+      }
+
+      this._currentDataClientId = this._dataDefaultClientId;
+      newConnHandler.updateRILNetworkInterface();
+    };
+
+    if (this._dataEnabled) {
+      oldSettings.oldEnabled = oldSettings.enabled;
+      oldSettings.enabled = false;
+    }
+
+    oldConnHandler.deactivateDataCallsAndWait().then(() => {
+      applyPendingDataSettings();
+    });
+  },
+
+  _shutdown: function() {
+    for (let handler of this._connectionHandlers) {
+      handler.shutdown();
+    }
+    this._connectionHandlers = null;
+    Services.prefs.removeObserver(PREF_RIL_DEBUG_ENABLED, this);
+    Services.obs.removeObserver(this, TOPIC_XPCOM_SHUTDOWN);
+    Services.obs.removeObserver(this, TOPIC_MOZSETTINGS_CHANGED);
+  },
+
+  /**
+   * nsISettingsServiceCallback
+   */
+  handle: function(aName, aResult) {
+    switch (aName) {
+      case "ril.data.apnSettings":
+        if (DEBUG) {
+          this.debug("'ril.data.apnSettings' is now " +
+                     JSON.stringify(aResult));
+        }
+        if (!aResult) {
+          break;
+        }
+        for (let clientId in this._connectionHandlers) {
+          let handler = this._connectionHandlers[clientId];
+          let apnSetting = aResult[clientId];
+          if (handler && apnSetting) {
+            handler.updateApnSettings(apnSetting);
+          }
+        }
+        break;
+      case "ril.data.enabled":
+        if (DEBUG) {
+          this.debug("'ril.data.enabled' is now " + aResult);
+        }
+        if (this._dataEnabled === aResult) {
+          break;
+        }
+        this._dataEnabled = aResult;
+
+        if (DEBUG) {
+          this.debug("Default id for data call: " + this._dataDefaultClientId);
+        }
+        if (this._dataDefaultClientId === -1) {
+          // We haven't got the default id for data from db.
+          break;
+        }
+
+        let connHandler = this._connectionHandlers[this._dataDefaultClientId];
+        let settings = connHandler.dataCallSettings;
+        settings.oldEnabled = settings.enabled;
+        settings.enabled = aResult;
+        connHandler.updateRILNetworkInterface();
+        break;
+      case "ril.data.roaming_enabled":
+        if (DEBUG) {
+          this.debug("'ril.data.roaming_enabled' is now " + aResult);
+          this.debug("Default id for data call: " + this._dataDefaultClientId);
+        }
+        for (let clientId = 0; clientId < this._connectionHandlers.length; clientId++) {
+          let connHandler = this._connectionHandlers[clientId];
+          let settings = connHandler.dataCallSettings;
+          settings.roamingEnabled = Array.isArray(aResult) ? aResult[clientId]
+                                                           : aResult;
+        }
+        if (this._dataDefaultClientId === -1) {
+          // We haven't got the default id for data from db.
+          break;
+        }
+        this._connectionHandlers[this._dataDefaultClientId].updateRILNetworkInterface();
+        break;
+      case "ril.data.defaultServiceId":
+        aResult = aResult || 0;
+        if (DEBUG) {
+          this.debug("'ril.data.defaultServiceId' is now " + aResult);
+        }
+        this._handleDataClientIdChange(aResult);
+        break;
+    }
+  },
+
+  handleError: function(aErrorMessage) {
+    if (DEBUG) {
+      this.debug("There was an error while reading RIL settings.");
+    }
+  },
+
+  /**
+   * nsIObserver interface methods.
+   */
+  observe: function(aSubject, aTopic, aData) {
+    switch (aTopic) {
+      case TOPIC_MOZSETTINGS_CHANGED:
+        if ("wrappedJSObject" in aSubject) {
+          aSubject = aSubject.wrappedJSObject;
+        }
+        this.handle(aSubject.key, aSubject.value);
+        break;
+      case TOPIC_PREF_CHANGED:
+        if (aData === PREF_RIL_DEBUG_ENABLED) {
+          updateDebugFlag();
+        }
+        break;
+      case TOPIC_XPCOM_SHUTDOWN:
+        this._shutdown();
+        break;
+    }
+  },
+};
+
+function DataCallHandler(aClientId) {
+  // Initial owning attributes.
+  this.clientId = aClientId;
+  this.dataCallSettings = {
+    oldEnabled: false,
+    enabled: false,
+    roamingEnabled: false
+  };
+  this._dataCalls = [];
+  this._listeners = [];
+
+  // This map is used to collect all the apn types and its corresponding
+  // RILNetworkInterface.
+  this.dataNetworkInterfaces = new Map();
+
+  this.dataCallInterface = gDataCallInterfaceService.getDataCallInterface(aClientId);
+  this.dataCallInterface.registerListener(this);
+
+  let mobileConnection = gMobileConnectionService.getItemByServiceId(aClientId);
+  mobileConnection.registerListener(this);
+
+  this._dataInfo = {
+    state: mobileConnection.data.state,
+    type: mobileConnection.data.type,
+    roaming: mobileConnection.data.roaming
+  }
+}
+DataCallHandler.prototype = {
+  classID:   DATACALLHANDLER_CID,
+  classInfo: XPCOMUtils.generateCI({classID: DATACALLHANDLER_CID,
+                                    classDescription: "Data Call Handler",
+                                    interfaces: [Ci.nsIDataCallHandler]}),
+
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIDataCallHandler,
+                                         Ci.nsIDataCallInterfaceListener,
+                                         Ci.nsIMobileConnectionListener]),
+
+  clientId: 0,
+  dataCallInterface: null,
+  dataCallSettings: null,
+  dataNetworkInterfaces: null,
+  _dataCalls: null,
+  _dataInfo: null,
+
+  // Apn settings to be setup after data call are cleared.
+  _pendingApnSettings: null,
+
+  debug: function(aMsg) {
+    dump("-*- DataCallHandler[" + this.clientId + "]: " + aMsg + "\n");
+  },
+
+  shutdown: function() {
+    // Shutdown all RIL network interfaces
+    this.dataNetworkInterfaces.forEach(function(networkInterface) {
+      gNetworkManager.unregisterNetworkInterface(networkInterface);
+      networkInterface.shutdown();
+      networkInterface = null;
+    });
+    this.dataNetworkInterfaces.clear();
+    this._dataCalls = [];
+    this.clientId = null;
+
+    this.dataCallinterface.unregisterListener(this);
+    this.dataCallInterface = null;
+
+    let mobileConnection =
+      gMobileConnectionService.getItemByServiceId(this.clientId);
+    mobileConnection.unregisterListener(this);
+  },
+
+  /**
+   * Check if we get all necessary APN data.
+   */
+  _validateApnSetting: function(aApnSetting) {
+    return (aApnSetting &&
+            aApnSetting.apn &&
+            aApnSetting.types &&
+            aApnSetting.types.length);
+  },
+
+  _convertApnType: function(aApnType) {
+    switch (aApnType) {
+      case "default":
+        return NETWORK_TYPE_MOBILE;
+      case "mms":
+        return NETWORK_TYPE_MOBILE_MMS;
+      case "supl":
+        return NETWORK_TYPE_MOBILE_SUPL;
+      case "ims":
+        return NETWORK_TYPE_MOBILE_IMS;
+      case "dun":
+        return NETWORK_TYPE_MOBILE_DUN;
+      default:
+        return NETWORK_TYPE_UNKNOWN;
+     }
+  },
+
+  _compareDataCallOptions: function(aDataCall, aNewDataCall) {
+    return aDataCall.apnProfile.apn == aNewDataCall.apnProfile.apn &&
+           aDataCall.apnProfile.user == aNewDataCall.apnProfile.user &&
+           aDataCall.apnProfile.password == aNewDataCall.apnProfile.passwd &&
+           aDataCall.apnProfile.authType == aNewDataCall.apnProfile.authType &&
+           aDataCall.apnProfile.protocol == aNewDataCall.apnProfile.protocol &&
+           aDataCall.apnProfile.roaming_protocol == aNewDataCall.apnProfile.roaming_protocol;
+  },
+
+  /**
+   * This function will do the following steps:
+   *   1. Clear the cached APN settings in the RIL.
+   *   2. Combine APN, user name, and password as the key of |byApn| object to
+   *      refer to the corresponding APN setting.
+   *   3. Use APN type as the index of |byType| object to refer to the
+   *      corresponding APN setting.
+   *   4. Create RilNetworkInterface for each APN setting created at step 2.
+   */
+  _setupApnSettings: function(aNewApnSettings) {
+    if (!aNewApnSettings) {
+      return;
+    }
+    if (DEBUG) this.debug("setupApnSettings: " + JSON.stringify(aNewApnSettings));
+
+    // Shutdown all network interfaces and clear data calls.
+    this.dataNetworkInterfaces.forEach(function(networkInterface) {
+      gNetworkManager.unregisterNetworkInterface(networkInterface);
+      networkInterface.shutdown();
+      networkInterface = null;
+    });
+    this.dataNetworkInterfaces.clear();
+    this._dataCalls = [];
+
+    // Cache the APN settings by APNs and by types in the RIL.
+    for (let inputApnSetting of aNewApnSettings) {
+      if (!this._validateApnSetting(inputApnSetting)) {
+        continue;
+      }
+
+      // Use APN type as the key of dataNetworkInterfaces to refer to the
+      // corresponding RILNetworkInterface.
+      for (let i = 0; i < inputApnSetting.types.length; i++) {
+        let apnType = inputApnSetting.types[i];
+        let networkType = this._convertApnType(apnType);
+        if (networkType === NETWORK_TYPE_UNKNOWN) {
+          if (DEBUG) this.debug("Invalid apn type: " + apnType);
+          continue;
+        }
+
+        if (DEBUG) this.debug("Preparing RILNetworkInterface for type: " + apnType);
+        // Create DataCall for RILNetworkInterface or reuse one that is shareable.
+        let dataCall;
+        for (let i = 0; i < this._dataCalls.length; i++) {
+          if (this._dataCalls[i].canHandleApn(inputApnSetting)) {
+            if (DEBUG) this.debug("Found shareable DataCall, reusing it.");
+            dataCall = this._dataCalls[i];
+            break;
+          }
+        }
+
+        if (!dataCall) {
+          if (DEBUG) this.debug("No shareable DataCall found, creating one.");
+          dataCall = new DataCall(this.clientId, inputApnSetting, this);
+          this._dataCalls.push(dataCall);
+        }
+
+        try {
+          let networkInterface = new RILNetworkInterface(this, networkType,
+                                                         inputApnSetting,
+                                                         dataCall);
+          gNetworkManager.registerNetworkInterface(networkInterface);
+          this.dataNetworkInterfaces.set(networkType, networkInterface);
+        } catch (e) {
+          if (DEBUG) {
+            this.debug("Error setting up RILNetworkInterface for type " +
+                        apnType + ": " + e);
+          }
+        }
+      }
+    }
+  },
+
+  /**
+   * Check if all data is disconnected.
+   */
+  allDataDisconnected: function() {
+    for (let i = 0; i < this._dataCalls.length; i++) {
+      let dataCall = this._dataCalls[i];
+      if (dataCall.state != NETWORK_STATE_UNKNOWN &&
+          dataCall.state != NETWORK_STATE_DISCONNECTED) {
+        return false;
+      }
+    }
+    return true;
+  },
+
+  deactivateDataCallsAndWait: function() {
+    return new Promise((aResolve, aReject) => {
+      this.deactivateDataCalls({
+        notifyDataCallsDisconnected: function() {
+          aResolve();
+        }
+      });
+    });
+  },
+
+  updateApnSettings: function(aNewApnSettings) {
+    if (!aNewApnSettings) {
+      return;
+    }
+    if (this._pendingApnSettings) {
+      // Change of apn settings in process, just update to the newest.
+      this._pengingApnSettings = aNewApnSettings;
+      return;
+    }
+
+    this._pendingApnSettings = aNewApnSettings;
+    this.deactivateDataCallsAndWait().then(() => {
+      this._setupApnSettings(this._pendingApnSettings);
+      this._pendingApnSettings = null;
+      this.updateRILNetworkInterface();
+    });
+  },
+
+  updateRILNetworkInterface: function() {
+    let networkInterface = this.dataNetworkInterfaces.get(NETWORK_TYPE_MOBILE);
+    if (!networkInterface) {
+      if (DEBUG) {
+        this.debug("No network interface for default data.");
+      }
+      return;
+    }
+
+    let connection =
+      gMobileConnectionService.getItemByServiceId(this.clientId);
+
+    // This check avoids data call connection if the radio is not ready
+    // yet after toggling off airplane mode.
+    let radioState = connection && connection.radioState;
+    if (radioState != Ci.nsIMobileConnection.MOBILE_RADIO_STATE_ENABLED) {
+      if (DEBUG) {
+        this.debug("RIL is not ready for data connection: radio's not ready");
+      }
+      return;
+    }
+
+    // We only watch at "ril.data.enabled" flag changes for connecting or
+    // disconnecting the data call. If the value of "ril.data.enabled" is
+    // true and any of the remaining flags change the setting application
+    // should turn this flag to false and then to true in order to reload
+    // the new values and reconnect the data call.
+    if (this.dataCallSettings.oldEnabled === this.dataCallSettings.enabled) {
+      if (DEBUG) {
+        this.debug("No changes for ril.data.enabled flag. Nothing to do.");
+      }
+      return;
+    }
+
+    let dataInfo = connection && connection.data;
+    let isRegistered =
+      dataInfo &&
+      dataInfo.state == RIL.GECKO_MOBILE_CONNECTION_STATE_REGISTERED;
+    let haveDataConnection =
+      dataInfo &&
+      dataInfo.type != RIL.GECKO_MOBILE_CONNECTION_STATE_UNKNOWN;
+    if (!isRegistered || !haveDataConnection) {
+      if (DEBUG) {
+        this.debug("RIL is not ready for data connection: Phone's not " +
+                   "registered or doesn't have data connection.");
+      }
+      return;
+    }
+    let wifi_active = false;
+    if (gNetworkManager.active &&
+        gNetworkManager.active.type == NETWORK_TYPE_WIFI) {
+      wifi_active = true;
+    }
+
+    let defaultDataCallConnected = networkInterface.connected;
+
+    // We have moved part of the decision making into DataCall, the rest will be
+    // moved after Bug 904514 - [meta] NetworkManager enhancement.
+    if (networkInterface.enabled &&
+        (!this.dataCallSettings.enabled ||
+         (dataInfo.roaming && !this.dataCallSettings.roamingEnabled))) {
+      if (DEBUG) {
+        this.debug("Data call settings: disconnect data call.");
+      }
+      networkInterface.disconnect();
+      return;
+    }
+
+    if (networkInterface.enabled && wifi_active) {
+      if (DEBUG) {
+        this.debug("Disconnect data call when Wifi is connected.");
+      }
+      networkInterface.disconnect();
+      return;
+    }
+
+    if (!this.dataCallSettings.enabled || defaultDataCallConnected) {
+      if (DEBUG) {
+        this.debug("Data call settings: nothing to do.");
+      }
+      return;
+    }
+    if (dataInfo.roaming && !this.dataCallSettings.roamingEnabled) {
+      if (DEBUG) {
+        this.debug("We're roaming, but data roaming is disabled.");
+      }
+      return;
+    }
+    if (wifi_active) {
+      if (DEBUG) {
+        this.debug("Don't connect data call when Wifi is connected.");
+      }
+      return;
+    }
+    if (this._pendingApnSettings) {
+      if (DEBUG) this.debug("We're changing apn settings, ignore any changes.");
+      return;
+    }
+
+    if (this._deactivatingDataCalls) {
+      if (DEBUG) this.debug("We're deactivating all data calls, ignore any changes.");
+      return;
+    }
+
+    if (DEBUG) {
+      this.debug("Data call settings: connect data call.");
+    }
+    networkInterface.connect();
+  },
+
+  _isMobileNetworkType: function(aNetworkType) {
+    if (aNetworkType === NETWORK_TYPE_MOBILE ||
+        aNetworkType === NETWORK_TYPE_MOBILE_MMS ||
+        aNetworkType === NETWORK_TYPE_MOBILE_SUPL ||
+        aNetworkType === NETWORK_TYPE_MOBILE_IMS ||
+        aNetworkType === NETWORK_TYPE_MOBILE_DUN) {
+      return true;
+    }
+
+    return false;
+  },
+
+  getDataCallStateByType: function(aNetworkType) {
+    if (!this._isMobileNetworkType(aNetworkType)) {
+      if (DEBUG) this.debug(aNetworkType + " is not a mobile network type!");
+      throw Cr.NS_ERROR_INVALID_ARG;
+    }
+
+    let networkInterface = this.dataNetworkInterfaces.get(aNetworkType);
+    if (!networkInterface) {
+      return NETWORK_STATE_UNKNOWN;
+    }
+    return networkInterface.state;
+  },
+
+  setupDataCallByType: function(aNetworkType) {
+    if (DEBUG) {
+      this.debug("setupDataCallByType: " + aNetworkType);
+    }
+
+    if (!this._isMobileNetworkType(aNetworkType)) {
+      if (DEBUG) this.debug(aNetworkType + " is not a mobile network type!");
+      throw Cr.NS_ERROR_INVALID_ARG;
+    }
+
+    let networkInterface = this.dataNetworkInterfaces.get(aNetworkType);
+    if (!networkInterface) {
+      if (DEBUG) {
+        this.debug("No network interface for type: " + aNetworkType);
+      }
+      return;
+    }
+
+    networkInterface.connect();
+  },
+
+  deactivateDataCallByType: function(aNetworkType) {
+    if (DEBUG) {
+      this.debug("deactivateDataCallByType: " + aNetworkType);
+    }
+
+    if (!this._isMobileNetworkType(aNetworkType)) {
+      if (DEBUG) this.debug(aNetworkType + " is not a mobile network type!");
+      throw Cr.NS_ERROR_INVALID_ARG;
+    }
+
+    let networkInterface = this.dataNetworkInterfaces.get(aNetworkType);
+    if (!networkInterface) {
+      if (DEBUG) {
+        this.debug("No network interface for type: " + aNetworkType);
+      }
+      return;
+    }
+
+    networkInterface.disconnect();
+  },
+
+  _deactivatingDataCalls: false,
+
+  deactivateDataCalls: function(aCallback) {
+    let dataDisconnecting = false;
+    this.dataNetworkInterfaces.forEach(function(networkInterface) {
+      if (networkInterface.enabled) {
+        if (networkInterface.state != NETWORK_STATE_UNKNOWN &&
+            networkInterface.state != NETWORK_STATE_DISCONNECTED) {
+          dataDisconnecting = true;
+        }
+        networkInterface.disconnect();
+      }
+    });
+
+    this._deactivatingDataCalls = dataDisconnecting;
+    if (!dataDisconnecting) {
+      aCallback.notifyDataCallsDisconnected();
+      return;
+    }
+
+    let callback = {
+      notifyAllDataDisconnected: () => {
+        this._unregisterListener(callback);
+        aCallback.notifyDataCallsDisconnected();
+      }
+    };
+    this._registerListener(callback);
+  },
+
+  _listeners: null,
+
+  _notifyListeners: function(aMethodName, aArgs) {
+    let listeners = this._listeners.slice();
+    for (let listener of listeners) {
+      if (this._listeners.indexOf(listener) == -1) {
+        // Listener has been unregistered in previous run.
+        continue;
+      }
+
+      let handler = listener[aMethodName];
+      try {
+        handler.apply(listener, aArgs);
+      } catch (e) {
+        this.debug("listener for " + aMethodName + " threw an exception: " + e);
+      }
+    }
+  },
+
+  _registerListener: function(aListener) {
+    if (this._listeners.indexOf(aListener) >= 0) {
+      return;
+    }
+
+    this._listeners.push(aListener);
+  },
+
+  _unregisterListener: function(aListener) {
+    let index = this._listeners.indexOf(aListener);
+    if (index >= 0) {
+      this._listeners.splice(index, 1);
+    }
+  },
+
+  _findDataCallByCid: function(aCid) {
+    if (aCid === undefined || aCid < 0) {
+      return -1;
+    }
+
+    for (let i = 0; i < this._dataCalls.length; i++) {
+      let datacall = this._dataCalls[i];
+      if (datacall.linkInfo.cid != null &&
+          datacall.linkInfo.cid == aCid) {
+        return i;
+      }
+    }
+
+    return -1;
+  },
+
+  /**
+   * Notify about data call setup error, called from DataCall.
+   */
+  notifyDataCallError: function(aMessage) {
+    // Notify data call error only for data APN
+    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
+      // data call setup.
+      if (aMessage.cid !== undefined) {
+        if (aMessage.linkInfo.cid == dataCall.linkInfo.cid) {
+          Services.obs.notifyObservers(networkInterface, TOPIC_DATA_CALL_ERROR,
+                                       null);
+        }
+      } else {
+        if (this._compareDataCallOptions(dataCall, aMessage)) {
+          Services.obs.notifyObservers(networkInterface, TOPIC_DATA_CALL_ERROR,
+                                       null);
+        }
+      }
+    }
+  },
+
+  /**
+   * Notify about data call changed, called from DataCall.
+   */
+  notifyDataCallChanged: function(aUpdatedDataCall) {
+    // Process pending radio power off request after all data calls
+    // are disconnected.
+    if (aUpdatedDataCall.state == NETWORK_STATE_DISCONNECTED ||
+        aUpdatedDataCall.state == NETWORK_STATE_UNKNOWN &&
+        this.allDataDisconnected() && this._deactivatingDataCalls) {
+      this._deactivatingDataCalls = false;
+      this._notifyListeners("notifyAllDataDisconnected", {
+        clientId: this.clientId
+      });
+    }
+  },
+
+  // nsIDataCallInterfaceListener
+
+  notifyDataCallListChanged: function(aCount, aDataCallList) {
+    let currentDataCalls = this._dataCalls.slice();
+    for (let i = 0; i < aDataCallList.length; i++) {
+      let dataCall = aDataCallList[i];
+      let index = this._findDataCallByCid(dataCall.cid);
+      if (index == -1) {
+        if (DEBUG) {
+          this.debug("Unexpected new data call: " + JSON.stringify(dataCall));
+        }
+        continue;
+      }
+      currentDataCalls[index].onDataCallChanged(dataCall);
+      currentDataCalls[index] = null;
+    }
+
+    // If there is any CONNECTED DataCall left in currentDataCalls, means that
+    // it is missing in dataCallList, we should send a DISCONNECTED event to
+    // notify about this.
+    for (let i = 0; i < currentDataCalls.length; i++) {
+      let currentDataCall = currentDataCalls[i];
+      if (currentDataCall && currentDataCall.linkInfo.cid != null &&
+          currentDataCall.state == NETWORK_STATE_CONNECTED) {
+        if (DEBUG) {
+          this.debug("Expected data call missing: " + JSON.stringify(
+            currentDataCall.apnProfile) + ", must have been DISCONNECTED.");
+        }
+        currentDataCall.onDataCallChanged({
+          state: NETWORK_STATE_DISCONNECTED
+        });
+      }
+    }
+  },
+
+  // nsIMobileConnectionListener
+
+  notifyVoiceChanged: function() {},
+
+  notifyDataChanged: function () {
+    let connection = gMobileConnectionService.getItemByServiceId(this.clientId);
+    let newDataInfo = connection.data;
+
+    if (this._dataInfo.state == newDataInfo.state &&
+        this._dataInfo.type == newDataInfo.type &&
+        this._dataInfo.roaming == newDataInfo.roaming) {
+      return;
+    }
+
+    this._dataInfo.state = newDataInfo.state;
+    this._dataInfo.type = newDataInfo.type;
+    this._dataInfo.roaming = newDataInfo.roaming;
+    this.updateRILNetworkInterface();
+  },
+
+  notifyDataError: function (aMessage) {},
+
+  notifyCFStateChanged: function(aAction, aReason, aNumber, aTimeSeconds, aServiceClass) {},
+
+  notifyEmergencyCbModeChanged: function(aActive, aTimeoutMs) {},
+
+  notifyOtaStatusChanged: function(aStatus) {},
+
+  notifyRadioStateChanged: function() {},
+
+  notifyClirModeChanged: function(aMode) {},
+
+  notifyLastKnownNetworkChanged: function() {},
+
+  notifyLastKnownHomeNetworkChanged: function() {},
+
+  notifyNetworkSelectionModeChanged: function() {}
+};
+
+function DataCall(aClientId, aApnSetting, aDataCallHandler) {
+  this.clientId = aClientId;
+  this.dataCallHandler = aDataCallHandler;
+  this.apnProfile = {
+    apn: aApnSetting.apn,
+    user: aApnSetting.user,
+    password: aApnSetting.password,
+    authType: aApnSetting.authtype,
+    protocol: aApnSetting.protocol,
+    roaming_protocol: aApnSetting.roaming_protocol
+  };
+  this.linkInfo = {
+    cid: null,
+    ifname: null,
+    addresses: [],
+    dnses: [],
+    gateways: []
+  };
+  this.state = NETWORK_STATE_UNKNOWN;
+  this.requestedNetworkIfaces = [];
+}
+DataCall.prototype = {
+  /**
+   * Standard values for the APN connection retry process
+   * Retry funcion: time(secs) = A * numer_of_retries^2 + B
+   */
+  NETWORK_APNRETRY_FACTOR: 8,
+  NETWORK_APNRETRY_ORIGIN: 3,
+  NETWORK_APNRETRY_MAXRETRIES: 10,
+
+  dataCallHandler: null,
+
+  // Event timer for connection retries
+  timer: null,
+
+  // APN failed connections. Retry counter
+  apnRetryCounter: 0,
+
+  // Array to hold RILNetworkInterfaces that requested this DataCall.
+  requestedNetworkIfaces: null,
+
+  /**
+   * @return "deactivate" if <ifname> changes or one of the aCurrentDataCall
+   *         addresses is missing in updatedDataCall, or "identical" if no
+   *         changes found, or "changed" otherwise.
+   */
+  _compareDataCallLink: function(aUpdatedDataCall, aCurrentDataCall) {
+    // If network interface is changed, report as "deactivate".
+    if (aUpdatedDataCall.ifname != aCurrentDataCall.ifname) {
+      return "deactivate";
+    }
+
+    // If any existing address is missing, report as "deactivate".
+    for (let i = 0; i < aCurrentDataCall.addresses.length; i++) {
+      let address = aCurrentDataCall.addresses[i];
+      if (aUpdatedDataCall.addresses.indexOf(address) < 0) {
+        return "deactivate";
+      }
+    }
+
+    if (aCurrentDataCall.addresses.length != aUpdatedDataCall.addresses.length) {
+      // Since now all |aCurrentDataCall.addresses| are found in
+      // |aUpdatedDataCall.addresses|, this means one or more new addresses are
+      // reported.
+      return "changed";
+    }
+
+    let fields = ["gateways", "dnses"];
+    for (let i = 0; i < fields.length; i++) {
+      // Compare <datacall>.<field>.
+      let field = fields[i];
+      let lhs = aUpdatedDataCall[field], rhs = aCurrentDataCall[field];
+      if (lhs.length != rhs.length) {
+        return "changed";
+      }
+      for (let i = 0; i < lhs.length; i++) {
+        if (lhs[i] != rhs[i]) {
+          return "changed";
+        }
+      }
+    }
+
+    return "identical";
+  },
+
+  _getGeckoDataCallState:function (aDataCall) {
+    if (aDataCall.active == Ci.nsIDataCallInterface.DATACALL_STATE_ACTIVE_UP ||
+        aDataCall.active == Ci.nsIDataCallInterface.DATACALL_STATE_ACTIVE_DOWN) {
+      return NETWORK_STATE_CONNECTED;
+    }
+
+    return NETWORK_STATE_DISCONNECTED;
+  },
+
+  onSetupDataCallResult: function(aDataCall) {
+    this.debug("onSetupDataCallResult: " + JSON.stringify(aDataCall));
+    let errorMsg = aDataCall.errorMsg;
+    if (aDataCall.failCause &&
+        aDataCall.failCause != Ci.nsIDataCallInterface.DATACALL_FAIL_NONE) {
+      errorMsg =
+        RIL.RIL_DATACALL_FAILCAUSE_TO_GECKO_DATACALL_ERROR[aDataCall.failCause];
+    }
+
+    if (errorMsg) {
+      if (DEBUG) {
+        this.debug("SetupDataCall error for apn " + this.apnProfile.apn + ": " +
+                   errorMsg + " (" + aDataCall.failCause + "), retry time: " +
+                   aDataCall.suggestedRetryTime);
+      }
+
+      this.state = NETWORK_STATE_DISCONNECTED;
+
+      if (this.requestedNetworkIfaces.length === 0) {
+        if (DEBUG) this.debug("This DataCall is not requested anymore.");
+        return;
+      }
+
+      // Let DataCallHandler notify MobileConnectionService
+      this.dataCallHandler.notifyDataCallError(this);
+
+      // For suggestedRetryTime, the value of INT32_MAX(0x7fffffff) means no retry.
+      if (aDataCall.suggestedRetryTime === INT32_MAX ||
+          this.isPermanentFail(aDataCall.failCause, errorMsg)) {
+        if (DEBUG) this.debug("Data call error: no retry needed.");
+        return;
+      }
+
+      this.retry(aDataCall.suggestedRetryTime);
+      return;
+    }
+
+    this.apnRetryCounter = 0;
+    this.linkInfo.cid = aDataCall.cid;
+
+    if (this.requestedNetworkIfaces.length === 0) {
+      if (DEBUG) {
+        this.debug("State is connected, but no network interface requested" +
+                   " this DataCall");
+      }
+      this.deactivate();
+      return;
+    }
+
+    this.linkInfo.ifname = aDataCall.ifname;
+    this.linkInfo.addresses = aDataCall.addresses ? aDataCall.addresses.split(" ") : [];
+    this.linkInfo.gateways = aDataCall.gateways ? aDataCall.gateways.split(" ") : [];
+    this.linkInfo.dnses = aDataCall.dnses ? aDataCall.dnses.split(" ") : [];
+    this.state = this._getGeckoDataCallState(aDataCall);
+
+    // Notify DataCallHandler about data call connected.
+    this.dataCallHandler.notifyDataCallChanged(this);
+
+    for (let i = 0; i < this.requestedNetworkIfaces.length; i++) {
+      this.requestedNetworkIfaces[i].notifyRILNetworkInterface();
+    }
+  },
+
+  onDeactivateDataCallResult: function() {
+    if (DEBUG) this.debug("onDeactivateDataCallResult");
+
+    this.reset();
+
+    if (this.requestedNetworkIfaces.length > 0) {
+      if (DEBUG) {
+        this.debug("State is disconnected/unknown, but this DataCall is" +
+                   " requested.");
+      }
+      this.setup();
+      return;
+    }
+
+    // Notify DataCallHandler about data call disconnected.
+    this.dataCallHandler.notifyDataCallChanged(this);
+  },
+
+  onDataCallChanged: function(aUpdatedDataCall) {
+    if (DEBUG) {
+      this.debug("onDataCallChanged: " + JSON.stringify(aUpdatedDataCall));
+    }
+
+    if (this.state == NETWORK_STATE_CONNECTING ||
+        this.state == NETWORK_STATE_DISCONNECTING) {
+      if (DEBUG) {
+        this.debug("We are in connecting/disconnecting state, ignore any " +
+                   "unsolicited event for now.");
+      }
+      return;
+    }
+
+    let dataCallState = this._getGeckoDataCallState(aUpdatedDataCall);
+    if (this.state == dataCallState &&
+        dataCallState != NETWORK_STATE_CONNECTED) {
+      return;
+    }
+
+    let newLinkInfo = {
+      ifname: aUpdatedDataCall.ifname,
+      addresses: aUpdatedDataCall.addresses ? aUpdatedDataCall.addresses.split(" ") : [],
+      dnses: aUpdatedDataCall.dnses ? aUpdatedDataCall.dnses.split(" ") : [],
+      gateways: aUpdatedDataCall.gateways ? aUpdatedDataCall.gateways.split(" ") : []
+    };
+
+    switch (dataCallState) {
+      case NETWORK_STATE_CONNECTED:
+        if (this.state == NETWORK_STATE_CONNECTED) {
+          let result =
+            this._compareDataCallLink(newLinkInfo, this.linkInfo);
+
+          if (result == "identical") {
+            if (DEBUG) this.debug("No changes in data call.");
+            return;
+          }
+          if (result == "deactivate") {
+            if (DEBUG) this.debug("Data link changed, cleanup.");
+            this.deactivate();
+            return;
+          }
+          // Minor change, just update and notify.
+          if (DEBUG) {
+            this.debug("Data link minor change, just update and notify.");
+          }
+
+          this.linkInfo.addresses = newLinkInfo.addresses.slice();
+          this.linkInfo.gateways = newLinkInfo.gateways.slice();
+          this.linkInfo.dnses = newLinkInfo.dnses.slice();
+        }
+        break;
+      case NETWORK_STATE_DISCONNECTED:
+      case NETWORK_STATE_UNKNOWN:
+        if (this.state == NETWORK_STATE_CONNECTED) {
+          // Notify first on unexpected data call disconnection.
+          this.state = dataCallState;
+          for (let i = 0; i < this.requestedNetworkIfaces.length; i++) {
+            this.requestedNetworkIfaces[i].notifyRILNetworkInterface();
+          }
+        }
+        this.reset();
+
+        if (this.requestedNetworkIfaces.length > 0) {
+          if (DEBUG) {
+            this.debug("State is disconnected/unknown, but this DataCall is" +
+                       " requested.");
+          }
+          this.setup();
+          return;
+        }
+        break;
+    }
+
+    this.state = dataCallState;
+
+    // Notify DataCallHandler about data call changed.
+    this.dataCallHandler.notifyDataCallChanged(this);
+
+    for (let i = 0; i < this.requestedNetworkIfaces.length; i++) {
+      this.requestedNetworkIfaces[i].notifyRILNetworkInterface();
+    }
+  },
+
+  // Helpers
+
+  debug: function(aMsg) {
+    dump("-*- DataCall[" + this.clientId + ":" + this.apnProfile.apn + "]: " +
+      aMsg + "\n");
+  },
+
+  get connected() {
+    return this.state == NETWORK_STATE_CONNECTED;
+  },
+
+  isPermanentFail: function(aDataFailCause, aErrorMsg) {
+    // Check ril.h for 'no retry' data call fail causes.
+    if (aErrorMsg === RIL.GECKO_ERROR_RADIO_NOT_AVAILABLE ||
+        aErrorMsg === RIL.GECKO_ERROR_INVALID_PARAMETER ||
+        aDataFailCause === Ci.nsIDataCallInterface.DATACALL_FAIL_OPERATOR_BARRED ||
+        aDataFailCause === Ci.nsIDataCallInterface.DATACALL_FAIL_MISSING_UKNOWN_APN ||
+        aDataFailCause === Ci.nsIDataCallInterface.DATACALL_FAIL_UNKNOWN_PDP_ADDRESS_TYPE ||
+        aDataFailCause === Ci.nsIDataCallInterface.DATACALL_FAIL_USER_AUTHENTICATION ||
+        aDataFailCause === Ci.nsIDataCallInterface.DATACALL_FAIL_ACTIVATION_REJECT_GGSN ||
+        aDataFailCause === Ci.nsIDataCallInterface.DATACALL_FAIL_SERVICE_OPTION_NOT_SUPPORTED ||
+        aDataFailCause === Ci.nsIDataCallInterface.DATACALL_FAIL_SERVICE_OPTION_NOT_SUBSCRIBED ||
+        aDataFailCause === Ci.nsIDataCallInterface.DATACALL_FAIL_NSAPI_IN_USE ||
+        aDataFailCause === Ci.nsIDataCallInterface.DATACALL_FAIL_ONLY_IPV4_ALLOWED ||
+        aDataFailCause === Ci.nsIDataCallInterface.DATACALL_FAIL_ONLY_IPV6_ALLOWED ||
+        aDataFailCause === Ci.nsIDataCallInterface.DATACALL_FAIL_PROTOCOL_ERRORS ||
+        aDataFailCause === Ci.nsIDataCallInterface.DATACALL_FAIL_RADIO_POWER_OFF ||
+        aDataFailCause === Ci.nsIDataCallInterface.DATACALL_FAIL_TETHERED_CALL_ACTIVE) {
+      return true;
+    }
+
+    return false;
+  },
+
+  inRequestedTypes: function(aType) {
+    for (let i = 0; i < this.requestedNetworkIfaces.length; i++) {
+      if (this.requestedNetworkIfaces[i].type == aType) {
+        return true;
+      }
+    }
+    return false;
+  },
+
+  canHandleApn: function(aApnSetting) {
+    let isIdentical = this.apnProfile.apn == aApnSetting.apn &&
+                      (this.apnProfile.user || '') == (aApnSetting.user || '') &&
+                      (this.apnProfile.password || '') == (aApnSetting.password || '') &&
+                      (this.apnProfile.authType || '') == (aApnSetting.authtype || '');
+
+    if (RILQUIRKS_HAVE_IPV6) {
+      isIdentical = isIdentical &&
+                    (this.apnProfile.protocol || '') == (aApnSetting.protocol || '') &&
+                    (this.apnProfile.roaming_protocol || '') == (aApnSetting.roaming_protocol || '');
+    }
+
+    return isIdentical;
+  },
+
+  resetLinkInfo: function() {
+    this.linkInfo.cid = null;
+    this.linkInfo.ifname = null;
+    this.linkInfo.addresses = [];
+    this.linkInfo.dnses = [];
+    this.linkInfo.gateways = [];
+  },
+
+  reset: function() {
+    this.resetLinkInfo();
+
+    this.state = NETWORK_STATE_UNKNOWN;
+  },
+
+  connect: function(aNetworkInterface) {
+    if (DEBUG) this.debug("connect: " + aNetworkInterface.type);
+
+    if (this.requestedNetworkIfaces.indexOf(aNetworkInterface) == -1) {
+      this.requestedNetworkIfaces.push(aNetworkInterface);
+    }
+
+    if (this.state == NETWORK_STATE_CONNECTING ||
+        this.state == NETWORK_STATE_DISCONNECTING) {
+      return;
+    }
+    if (this.state == NETWORK_STATE_CONNECTED) {
+      // This needs to run asynchronously, to behave the same way as the case of
+      // non-shared apn, see bug 1059110.
+      Services.tm.currentThread.dispatch(() => {
+        // Do not notify if state changed while this event was being dispatched,
+        // the state probably was notified already or need not to be notified.
+        if (aNetworkInterface.state == RIL.GECKO_NETWORK_STATE_CONNECTED) {
+          aNetworkInterface.notifyRILNetworkInterface();
+        }
+      }, Ci.nsIEventTarget.DISPATCH_NORMAL);
+      return;
+    }
+
+    // If retry mechanism is running on background, stop it since we are going
+    // to setup data call now.
+    if (this.timer) {
+      this.timer.cancel();
+    }
+
+    this.setup();
+  },
+
+  setup: function() {
+    if (DEBUG) {
+      this.debug("Going to set up data connection with APN " +
+                 this.apnProfile.apn);
+    }
+
+    let connection =
+      gMobileConnectionService.getItemByServiceId(this.clientId);
+    let dataInfo = connection && connection.data;
+    if (dataInfo == null ||
+        dataInfo.state != RIL.GECKO_MOBILE_CONNECTION_STATE_REGISTERED ||
+        dataInfo.type == RIL.GECKO_MOBILE_CONNECTION_STATE_UNKNOWN) {
+      return;
+    }
+
+    let radioTechType = dataInfo.type;
+    let radioTechnology = RIL.GECKO_RADIO_TECH.indexOf(radioTechType);
+    let authType = RIL.RIL_DATACALL_AUTH_TO_GECKO.indexOf(this.apnProfile.authType);
+    // Use the default authType if the value in database is invalid.
+    // For the case that user might not select the authentication type.
+    if (authType == -1) {
+      if (DEBUG) {
+        this.debug("Invalid authType '" + this.apnProfile.authtype +
+                   "', using '" + RIL.GECKO_DATACALL_AUTH_DEFAULT + "'");
+      }
+      authType = RIL.RIL_DATACALL_AUTH_TO_GECKO.indexOf(RIL.GECKO_DATACALL_AUTH_DEFAULT);
+    }
+
+    let pdpType = Ci.nsIDataCallInterface.DATACALL_PDP_TYPE_IPV4;
+    if (RILQUIRKS_HAVE_IPV6) {
+      pdpType = !dataInfo.roaming
+              ? RIL.RIL_DATACALL_PDP_TYPES.indexOf(this.apnProfile.protocol)
+              : RIL.RIL_DATACALL_PDP_TYPES.indexOf(this.apnProfile.roaming_protocol);
+      if (pdpType == -1) {
+        if (DEBUG) {
+          this.debug("Invalid pdpType '" + (!dataInfo.roaming
+                     ? this.apnProfile.protocol
+                     : this.apnProfile.roaming_protocol) +
+                     "', using '" + RIL.GECKO_DATACALL_PDP_TYPE_DEFAULT + "'");
+        }
+        pdpType = RIL.RIL_DATACALL_PDP_TYPES.indexOf(RIL.GECKO_DATACALL_PDP_TYPE_DEFAULT);
+      }
+    }
+
+    let dcInterface = this.dataCallHandler.dataCallInterface;
+    dcInterface.setupDataCall(
+      this.apnProfile.apn, this.apnProfile.user, this.apnProfile.password,
+      authType, pdpType, {
+        QueryInterface: XPCOMUtils.generateQI([Ci.nsIDataCallCallback]),
+        notifySetupDataCallSuccess: (aDataCall) => {
+          this.onSetupDataCallResult(aDataCall);
+        },
+        notifyError: (aErrorMsg) => {
+          this.onSetupDataCallResult({errorMsg: aErrorMsg});
+        }
+      });
+    this.state = NETWORK_STATE_CONNECTING;
+  },
+
+  retry: function(aSuggestedRetryTime) {
+    let apnRetryTimer;
+
+    // We will retry the connection in increasing times
+    // based on the function: time = A * numer_of_retries^2 + B
+    if (this.apnRetryCounter >= this.NETWORK_APNRETRY_MAXRETRIES) {
+      this.apnRetryCounter = 0;
+      this.timer = null;
+      if (DEBUG) this.debug("Too many APN Connection retries - STOP retrying");
+      return;
+    }
+
+    // If there is a valid aSuggestedRetryTime, override the retry timer.
+    if (aSuggestedRetryTime !== undefined && aSuggestedRetryTime >= 0) {
+      apnRetryTimer = aSuggestedRetryTime / 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): " +
+                 apnRetryTimer + "-" + this.apnRetryCounter);
+    }
+
+    if (this.timer == null) {
+      // Event timer for connection retries
+      this.timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+    }
+    this.timer.initWithCallback(this, apnRetryTimer * 1000,
+                                Ci.nsITimer.TYPE_ONE_SHOT);
+  },
+
+  disconnect: function(aNetworkInterface) {
+    if (DEBUG) this.debug("disconnect: " + aNetworkInterface.type);
+
+    let index = this.requestedNetworkIfaces.indexOf(aNetworkInterface);
+    if (index != -1) {
+      this.requestedNetworkIfaces.splice(index, 1);
+
+      if (this.state == NETWORK_STATE_DISCONNECTED ||
+          this.state == NETWORK_STATE_UNKNOWN) {
+        if (this.timer) {
+          this.timer.cancel();
+        }
+        this.reset();
+        return;
+      }
+
+      // Notify the DISCONNECTED event immediately after network interface is
+      // removed from requestedNetworkIfaces, to make the DataCall, shared or
+      // not, to have the same behavior.
+      Services.tm.currentThread.dispatch(() => {
+        // Do not notify if state changed while this event was being dispatched,
+        // the state probably was notified already or need not to be notified.
+        if (aNetworkInterface.state == RIL.GECKO_NETWORK_STATE_DISCONNECTED) {
+          aNetworkInterface.notifyRILNetworkInterface();
+
+          // Clear link info after notifying NetworkManager.
+          if (this.requestedNetworkIfaces.length === 0) {
+            this.resetLinkInfo();
+          }
+        }
+      }, Ci.nsIEventTarget.DISPATCH_NORMAL);
+    }
+
+    // Only deactivate data call if no more network interface needs this
+    // DataCall and if state is CONNECTED, for other states, we simply remove
+    // the network interface from requestedNetworkIfaces.
+    if (this.requestedNetworkIfaces.length > 0 ||
+        this.state != NETWORK_STATE_CONNECTED) {
+      return;
+    }
+
+    this.deactivate();
+  },
+
+  deactivate: function() {
+    let reason = Ci.nsINetworkInterface.DATACALL_DEACTIVATE_NO_REASON;
+    if (DEBUG) {
+      this.debug("Going to disconnect data connection cid " + this.linkInfo.cid);
+    }
+
+    let dcInterface = this.dataCallHandler.dataCallInterface;
+    dcInterface.deactivateDataCall(this.linkInfo.cid, reason, {
+      QueryInterface: XPCOMUtils.generateQI([Ci.nsIDataCallCallback]),
+      notifySuccess: () => {
+        this.onDeactivateDataCallResult();
+      },
+      notifyError: (aErrorMsg) => {
+        this.onDeactivateDataCallResult();
+      }
+    });
+
+    this.state = NETWORK_STATE_DISCONNECTING;
+  },
+
+  // Entry method for timer events. Used to reconnect to a failed APN
+  notify: function(aTimer) {
+    this.setup();
+  },
+
+  shutdown: function() {
+    if (this.timer) {
+      this.timer.cancel();
+      this.timer = null;
+    }
+  }
+};
+
+function RILNetworkInterface(aDataCallHandler, aType, aApnSetting, aDataCall) {
+  if (!aDataCall) {
+    throw new Error("No dataCall for RILNetworkInterface: " + type);
+  }
+
+  this.dataCallHandler = aDataCallHandler;
+  this.type = aType;
+  this.apnSetting = aApnSetting;
+  this.dataCall = aDataCall;
+
+  this.enabled = false;
+}
+
+RILNetworkInterface.prototype = {
+  classID:   RILNETWORKINTERFACE_CID,
+  classInfo: XPCOMUtils.generateCI({classID: RILNETWORKINTERFACE_CID,
+                                    classDescription: "RILNetworkInterface",
+                                    interfaces: [Ci.nsINetworkInterface,
+                                                 Ci.nsIRilNetworkInterface]}),
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsINetworkInterface,
+                                         Ci.nsIRilNetworkInterface]),
+
+  // Hold reference to DataCall object which is determined at initilization.
+  dataCall: null,
+
+  // If this RILNetworkInterface type is enabled or not.
+  enabled: null,
+
+  /**
+   * nsINetworkInterface Implementation
+   */
+
+  get state() {
+    if (!this.dataCall.inRequestedTypes(this.type)) {
+      return NETWORK_STATE_DISCONNECTED;
+    }
+    return this.dataCall.state;
+  },
+
+  type: null,
+
+  get name() {
+    return this.dataCall.linkInfo.ifname;
+  },
+
+  get httpProxyHost() {
+    return this.apnSetting.proxy || "";
+  },
+
+  get httpProxyPort() {
+    return this.apnSetting.port || "";
+  },
+
+  getAddresses: function(aIps, aPrefixLengths) {
+    let addresses = this.dataCall.linkInfo.addresses;
+
+    let ips = [];
+    let prefixLengths = [];
+    for (let i = 0; i < addresses.length; i++) {
+      let [ip, prefixLength] = addresses[i].split("/");
+      ips.push(ip);
+      prefixLengths.push(prefixLength);
+    }
+
+    aIps.value = ips.slice();
+    aPrefixLengths.value = prefixLengths.slice();
+
+    return ips.length;
+  },
+
+  getGateways: function(aCount) {
+    let linkInfo = this.dataCall.linkInfo;
+
+    if (aCount) {
+      aCount.value = linkInfo.gateways.length;
+    }
+    return linkInfo.gateways.slice();
+  },
+
+  getDnses: function(aCount) {
+    let linkInfo = this.dataCall.linkInfo;
+
+    if (aCount) {
+      aCount.value = linkInfo.dnses.length;
+    }
+    return linkInfo.dnses.slice();
+  },
+
+  /**
+   * nsIRilNetworkInterface Implementation
+   */
+
+  get serviceId() {
+    return this.dataCallHandler.clientId;
+  },
+
+  get iccId() {
+    let icc = gIccService.getIccByServiceId(this.dataCallHandler.clientId);
+    let iccInfo = icc && icc.iccInfo;
+
+    return iccInfo && iccInfo.iccid;
+  },
+
+  get mmsc() {
+    if (this.type != NETWORK_TYPE_MOBILE_MMS) {
+      if (DEBUG) this.debug("Error! Only MMS network can get MMSC.");
+      throw Cr.NS_ERROR_UNEXPECTED;
+    }
+
+    return this.apnSetting.mmsc || "";
+  },
+
+  get mmsProxy() {
+    if (this.type != NETWORK_TYPE_MOBILE_MMS) {
+      if (DEBUG) this.debug("Error! Only MMS network can get MMS proxy.");
+      throw Cr.NS_ERROR_UNEXPECTED;
+    }
+
+    return this.apnSetting.mmsproxy || "";
+  },
+
+  get mmsPort() {
+    if (this.type != NETWORK_TYPE_MOBILE_MMS) {
+      if (DEBUG) this.debug("Error! Only MMS network can get MMS port.");
+      throw Cr.NS_ERROR_UNEXPECTED;
+    }
+
+    // Note: Port 0 is reserved, so we treat it as invalid as well.
+    // See http://www.iana.org/assignments/port-numbers
+    return this.apnSetting.mmsport || -1;
+  },
+
+  // Helpers
+
+  debug: function(aMsg) {
+    dump("-*- RILNetworkInterface[" + this.dataCallHandler.clientId + ":" +
+         this.type + "]: " + aMsg + "\n");
+  },
+
+  apnSetting: null,
+
+  get connected() {
+    return this.state == NETWORK_STATE_CONNECTED;
+  },
+
+  notifyRILNetworkInterface: function() {
+    if (DEBUG) {
+      this.debug("notifyRILNetworkInterface type: " + this.type + ", state: " +
+                 this.state);
+    }
+
+    gNetworkManager.updateNetworkInterface(this);
+  },
+
+  connect: function() {
+    this.enabled = true;
+
+    this.dataCall.connect(this);
+  },
+
+  disconnect: function() {
+    if (!this.enabled) {
+      return;
+    }
+    this.enabled = false;
+
+    this.dataCall.disconnect(this);
+  },
+
+  shutdown: function() {
+    this.dataCall.shutdown();
+    this.dataCall = null;
+  }
+};
+
+this.NSGetFactory = XPCOMUtils.generateNSGetFactory([DataCallManager]);
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/DataCallManager.manifest firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/DataCallManager.manifest
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/DataCallManager.manifest	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/DataCallManager.manifest	2015-05-25 20:43:53.000000000 +0000
@@ -0,0 +1,4 @@
+# DataCallManager.js
+component {35b9efa2-e42c-45ce-8210-0a13e6f4aadc} DataCallManager.js
+contract @mozilla.org/datacall/manager;1 {35b9efa2-e42c-45ce-8210-0a13e6f4aadc}
+category profile-after-change DataCallManager @mozilla.org/datacall/manager;1
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/GonkGPSGeolocationProvider.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/GonkGPSGeolocationProvider.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/GonkGPSGeolocationProvider.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/GonkGPSGeolocationProvider.cpp	2015-05-25 20:43:53.000000000 +0000
@@ -44,6 +44,7 @@
 #include "nsIMobileNetworkInfo.h"
 #include "nsIRadioInterfaceLayer.h"
 #include "nsIIccService.h"
+#include "nsIDataCallManager.h"
 #endif
 
 #ifdef AGPS_TYPE_INVALID
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/moz.build	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/moz.build	2015-05-25 20:43:53.000000000 +0000
@@ -86,9 +86,14 @@
 
 if CONFIG['MOZ_B2G_RIL']:
     XPIDL_SOURCES += [
+        'nsIDataCallInterfaceService.idl',
+        'nsIDataCallManager.idl',
+        'nsIGonkDataCallInterfaceService.idl',
         'nsIRadioInterfaceLayer.idl',
     ]
     EXTRA_COMPONENTS += [
+        'DataCallManager.js',
+        'DataCallManager.manifest',
         'RILContentHelper.js', # TODO: Bug 815526, deprecate RILContentHelper.
         'RILContentHelper.manifest', # TODO: Bug 815526, deprecate RILContentHelper.
         'RILSystemMessengerHelper.js',
@@ -103,6 +108,8 @@
     ]
     if not CONFIG['DISABLE_MOZ_RIL_GEOLOC']:
         EXTRA_COMPONENTS += [
+            'DataCallInterfaceService.js',
+            'DataCallInterfaceService.manifest',
             'RadioInterfaceLayer.js',
             'RadioInterfaceLayer.manifest',
         ]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/MozMtpDatabase.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/MozMtpDatabase.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/MozMtpDatabase.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/MozMtpDatabase.cpp	2015-05-25 20:43:53.000000000 +0000
@@ -164,7 +164,7 @@
   if (aHandle > 0 && aHandle < mDb.Length()) {
     entry = mDb[aHandle];
   }
-  return entry;
+  return entry.forget();
 }
 
 void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/NetworkManager.js firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/NetworkManager.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/NetworkManager.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/NetworkManager.js	2015-05-25 20:43:53.000000000 +0000
@@ -786,15 +786,18 @@
 
     // Find a suitable network interface to activate.
     this.active = null;
+    let anyConnected = false;
 
-    let defaultDataNetwork;
     for each (let network in this.networkInterfaces) {
       if (network.state != Ci.nsINetworkInterface.NETWORK_STATE_CONNECTED) {
         continue;
       }
+      anyConnected = true;
 
-      if (network.type == Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE) {
-        defaultDataNetwork = network;
+      // Set active only for default connections.
+      if (network.type != Ci.nsINetworkInterface.NETWORK_TYPE_WIFI &&
+          network.type != Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE) {
+        continue;
       }
 
       this.active = network;
@@ -804,19 +807,9 @@
       }
     }
 
-    // Give higher priority to default data APN than secondary APN.
-    // If default data APN is not connected, we still set default route
-    // and DNS on secondary APN.
-    if (this.active && defaultDataNetwork &&
-        this.isNetworkTypeSecondaryMobile(this.active.type) &&
-        this.active.type != this.preferredNetworkType) {
-      this.active = defaultDataNetwork;
-    }
-
     return Promise.resolve()
       .then(() => {
-        // Don't set default route on secondary APN
-        if (!this.active || this.isNetworkTypeSecondaryMobile(this.active.type)) {
+        if (!this.active) {
           return Promise.resolve();
         }
 
@@ -828,7 +821,7 @@
         }
 
         if (this._manageOfflineStatus) {
-          Services.io.offline = !this.active;
+          Services.io.offline = !anyConnected;
         }
       });
   },
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/NetworkService.js firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/NetworkService.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/NetworkService.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/NetworkService.js	2015-05-25 20:43:53.000000000 +0000
@@ -240,7 +240,10 @@
       return;
     }
 
-    NetUtil.asyncFetch2(file, function(inputStream, status) {
+    NetUtil.asyncFetch({
+      uri: NetUtil.newURI(file),
+      loadUsingSystemPrincipal: true
+    }, function(inputStream, status) {
       let rxBytes = 0,
           txBytes = 0,
           now = Date.now();
@@ -263,12 +266,7 @@
 
       // netd always return success even interface doesn't exist.
       callback.networkStatsAvailable(true, rxBytes, txBytes, now);
-    },
-    null,      // aLoadingNode
-    Services.scriptSecurityManager.getSystemPrincipal(),
-    null,      // aTriggeringPrincipal
-    Ci.nsILoadInfo.SEC_NORMAL,
-    Ci.nsIContentPolicy.TYPE_OTHER);
+    });
   },
 
   setNetworkInterfaceAlarm: function(networkName, threshold, callback) {
@@ -649,6 +647,17 @@
     });
   },
 
+  stopDhcp: function(interfaceName, callback) {
+    let params = {
+      cmd: "stopDhcp",
+      ifname: interfaceName
+    };
+
+    this.controlMessage(params, function(result) {
+      callback.nativeCommandResult(!result.error);
+    });
+  },
+
   enableInterface: function(interfaceName, callback) {
     let params = {
       cmd: "enableInterface",
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/NetworkUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/NetworkUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/NetworkUtils.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/NetworkUtils.cpp	2015-05-25 20:43:53.000000000 +0000
@@ -51,6 +51,11 @@
 // Use this command to continue the function chain.
 static const char* DUMMY_COMMAND = "tether status";
 
+// IPV6 Tethering is not supported in AOSP, use the property to
+// identify vendor specific support in IPV6. We can remove this flag
+// once upstream Android support IPV6 in tethering.
+static const char* IPV6_TETHERING = "ro.tethering.ipv6";
+
 // Retry 20 times (2 seconds) for usb state transition.
 static const uint32_t USB_FUNCTION_RETRY_TIMES = 20;
 // Check "sys.usb.state" every 100ms.
@@ -81,6 +86,7 @@
 static const int32_t SUCCESS = 0;
 
 static uint32_t SDK_VERSION;
+static uint32_t SUPPORT_IPV6_TETHERING;
 
 struct IFProperties {
   char gateway[PROPERTY_VALUE_MAX];
@@ -201,6 +207,7 @@
   NetworkUtils::tetheringStatus,
   NetworkUtils::startTethering,
   NetworkUtils::setDnsForwarders,
+  NetworkUtils::addUpstreamInterface,
   NetworkUtils::usbTetheringSuccess
 };
 
@@ -209,6 +216,7 @@
   NetworkUtils::removeInterfaceFromLocalNetwork,
   NetworkUtils::preTetherInterfaceList,
   NetworkUtils::postTetherInterfaceList,
+  NetworkUtils::removeUpstreamInterface,
   NetworkUtils::disableNat,
   NetworkUtils::setIpForwardingEnabled,
   NetworkUtils::stopTethering,
@@ -223,7 +231,9 @@
 
 const CommandFunc NetworkUtils::sUpdateUpStreamChain[] = {
   NetworkUtils::cleanUpStream,
+  NetworkUtils::removeUpstreamInterface,
   NetworkUtils::createUpStream,
+  NetworkUtils::addUpstreamInterface,
   NetworkUtils::updateUpStreamSuccess
 };
 
@@ -813,6 +823,79 @@
   doCommand(command, aChain, aCallback);
 }
 
+bool isCommandChainIPv6(CommandChain* aChain, const char *externalInterface) {
+  // Check by gateway address
+  if (getIpType(GET_CHAR(mGateway)) == AF_INET6) {
+    return true;
+  }
+
+  uint32_t length = GET_FIELD(mGateways).Length();
+  for (uint32_t i = 0; i < length; i++) {
+    NS_ConvertUTF16toUTF8 autoGateway(GET_FIELD(mGateways)[i]);
+    if(getIpType(autoGateway.get()) == AF_INET6) {
+      return true;
+    }
+  }
+
+  // Check by external inteface address
+  FILE *file = fopen("/proc/net/if_inet6", "r");
+  if (!file) {
+    return false;
+  }
+
+  bool isIPv6 = false;
+  char interface[32];
+  while(fscanf(file, "%*s %*s %*s %*s %*s %32s", interface)) {
+    if (strcmp(interface, externalInterface) == 0) {
+      isIPv6 = true;
+      break;
+    }
+  }
+
+  fclose(file);
+  return isIPv6;
+}
+
+void NetworkUtils::addUpstreamInterface(CommandChain* aChain,
+                                        CommandCallback aCallback,
+                                        NetworkResultOptions& aResult)
+{
+  nsCString interface(GET_CHAR(mExternalIfname));
+  if (!interface.get()[0]) {
+    interface = GET_CHAR(mCurExternalIfname);
+  }
+
+  if (SUPPORT_IPV6_TETHERING == 0 || !isCommandChainIPv6(aChain, interface.get())) {
+    aCallback(aChain, false, aResult);
+    return;
+  }
+
+  char command[MAX_COMMAND_SIZE];
+  snprintf(command, MAX_COMMAND_SIZE - 1, "tether interface add_upstream %s",
+           interface.get());
+  doCommand(command, aChain, aCallback);
+}
+
+void NetworkUtils::removeUpstreamInterface(CommandChain* aChain,
+                                           CommandCallback aCallback,
+                                           NetworkResultOptions& aResult)
+{
+  nsCString interface(GET_CHAR(mExternalIfname));
+  if (!interface.get()[0]) {
+    interface = GET_CHAR(mPreExternalIfname);
+  }
+
+  if (SUPPORT_IPV6_TETHERING == 0 || !isCommandChainIPv6(aChain, interface.get())) {
+    aCallback(aChain, false, aResult);
+    return;
+  }
+
+  char command[MAX_COMMAND_SIZE];
+  snprintf(command, MAX_COMMAND_SIZE - 1, "tether interface remove_upstream %s",
+           interface.get());
+  doCommand(command, aChain, aCallback);
+}
+
 void NetworkUtils::setIpForwardingEnabled(CommandChain* aChain,
                                           CommandCallback aCallback,
                                           NetworkResultOptions& aResult)
@@ -1482,6 +1565,9 @@
   property_get("ro.build.version.sdk", value, nullptr);
   SDK_VERSION = atoi(value);
 
+  property_get(IPV6_TETHERING, value, "0");
+  SUPPORT_IPV6_TETHERING = atoi(value);
+
   gNetworkUtils = this;
 }
 
@@ -1529,6 +1615,7 @@
     BUILD_ENTRY(updateUpStream),
     BUILD_ENTRY(configureInterface),
     BUILD_ENTRY(dhcpRequest),
+    BUILD_ENTRY(stopDhcp),
     BUILD_ENTRY(enableInterface),
     BUILD_ENTRY(disableInterface),
     BUILD_ENTRY(resetConnections),
@@ -1747,6 +1834,11 @@
   );
 }
 
+CommandResult NetworkUtils::stopDhcp(NetworkParams& aOptions)
+{
+  return mNetUtils->do_dhcp_stop(GET_CHAR(mIfname));
+}
+
 CommandResult NetworkUtils::dhcpRequest(NetworkParams& aOptions) {
     mozilla::dom::NetworkResultOptions result;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/NetworkUtils.h firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/NetworkUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/NetworkUtils.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/NetworkUtils.h	2015-05-25 20:43:53.000000000 +0000
@@ -287,6 +287,7 @@
    */
   CommandResult configureInterface(NetworkParams& aOptions);
   CommandResult dhcpRequest(NetworkParams& aOptions);
+  CommandResult stopDhcp(NetworkParams& aOptions);
   CommandResult enableInterface(NetworkParams& aOptions);
   CommandResult disableInterface(NetworkParams& aOptions);
   CommandResult resetConnections(NetworkParams& aOptions);
@@ -362,6 +363,8 @@
   static void addRouteToLocalNetwork(PARAMS);
   static void preTetherInterfaceList(PARAMS);
   static void postTetherInterfaceList(PARAMS);
+  static void addUpstreamInterface(PARAMS);
+  static void removeUpstreamInterface(PARAMS);
   static void setIpForwardingEnabled(PARAMS);
   static void tetheringStatus(PARAMS);
   static void stopTethering(PARAMS);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/nsIDataCallInterfaceService.idl firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/nsIDataCallInterfaceService.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/nsIDataCallInterfaceService.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/nsIDataCallInterfaceService.idl	2015-05-25 20:43:53.000000000 +0000
@@ -0,0 +1,257 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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(d27ce247-9c7c-4582-826b-125e8275e9c2)]
+interface nsIDataCall : nsISupports
+{
+  /**
+   * Data call fail cause. One of the nsIDataCallInterface.DATACALL_FAIL_*
+   * values.
+   */
+  readonly attribute long failCause;
+
+  /**
+   * If failCause != nsIDataCallInterface.DATACALL_FAIL_NONE, this field
+   * indicates the suggested retry back-off timer. The unit is milliseconds.
+   */
+  readonly attribute long suggestedRetryTime;
+
+  /**
+   * Context ID, uniquely identifies this call.
+   */
+  readonly attribute long cid;
+
+  /**
+   * Data call network state. One of the nsIDataCallInterface.DATACALL_STATE_*
+   * values.
+   */
+  readonly attribute long active;
+
+  /**
+   * Data call connection type. One of the
+   * nsIDataCallInterface.DATACALL_PDP_TYPE_* values.
+   */
+  readonly attribute long pdpType;
+
+  /**
+   * The network interface name.
+   */
+  readonly attribute DOMString ifname;
+
+  /**
+   * A space-delimited list of addresses with optional "/" prefix length.
+   */
+  readonly attribute DOMString addresses;
+
+  /**
+   * A space-delimited list of DNS server addresses.
+   */
+  readonly attribute DOMString dnses;
+
+  /**
+   * A space-delimited list of default gateway addresses.
+   */
+  readonly attribute DOMString gateways;
+};
+
+[scriptable, uuid(e119c54b-9354-4ad6-a1ee-18608bde9320)]
+interface nsIDataCallInterfaceListener : nsISupports
+{
+  /**
+   * Notify data call interface listeners about unsolicited data call state
+   * changes.
+   */
+  void notifyDataCallListChanged(in uint32_t count,
+                                 [array, size_is(count)] in nsIDataCall
+                                   dataCalls);
+};
+
+[scriptable, uuid(db0b640a-3b3a-4f48-84dc-256e176876c2)]
+interface nsIDataCallCallback : nsISupports
+{
+  /**
+   * Called when setupDataCall() returns succesfully.
+   */
+  void notifySetupDataCallSuccess(in nsIDataCall dataCall);
+
+  /**
+   * Called when getDataCallList() returns succesfully.
+   */
+  void notifyGetDataCallListSuccess(in uint32_t count,
+                                    [array, size_is(count)] in nsIDataCall
+                                      dataCalls);
+  /**
+   * Called when request returns succesfully.
+   */
+  void notifySuccess();
+
+  /**
+   * Called when request returns error.
+   */
+  void notifyError(in AString errorMsg);
+};
+
+[scriptable, uuid(ec219021-8623-4b9f-aba5-4db58c60684f)]
+interface nsIDataCallInterface : nsISupports
+{
+  /**
+   * Data fail causes, defined in TS 24.008.
+   */
+  const long DATACALL_FAIL_NONE                          = 0;
+  const long DATACALL_FAIL_OPERATOR_BARRED               = 0x08;
+  const long DATACALL_FAIL_INSUFFICIENT_RESOURCES        = 0x1A;
+  const long DATACALL_FAIL_MISSING_UKNOWN_APN            = 0x1B;
+  const long DATACALL_FAIL_UNKNOWN_PDP_ADDRESS_TYPE      = 0x1C;
+  const long DATACALL_FAIL_USER_AUTHENTICATION           = 0x1D;
+  const long DATACALL_FAIL_ACTIVATION_REJECT_GGSN        = 0x1E;
+  const long DATACALL_FAIL_ACTIVATION_REJECT_UNSPECIFIED = 0x1F;
+  const long DATACALL_FAIL_SERVICE_OPTION_NOT_SUPPORTED  = 0x20;
+  const long DATACALL_FAIL_SERVICE_OPTION_NOT_SUBSCRIBED = 0x21;
+  const long DATACALL_FAIL_SERVICE_OPTION_OUT_OF_ORDER   = 0x22;
+  const long DATACALL_FAIL_NSAPI_IN_USE                  = 0x23;
+  const long DATACALL_FAIL_ONLY_IPV4_ALLOWED             = 0x32;
+  const long DATACALL_FAIL_ONLY_IPV6_ALLOWED             = 0x33;
+  const long DATACALL_FAIL_ONLY_SINGLE_BEARER_ALLOWED    = 0x34;
+  const long DATACALL_FAIL_PROTOCOL_ERRORS               = 0x6F;
+  /* Not mentioned in the specification */
+  const long DATACALL_FAIL_VOICE_REGISTRATION_FAIL       = -1;
+  const long DATACALL_FAIL_DATA_REGISTRATION_FAIL        = -2;
+  const long DATACALL_FAIL_SIGNAL_LOST                   = -3;
+  const long DATACALL_FAIL_PREF_RADIO_TECH_CHANGED       = -4;
+  const long DATACALL_FAIL_RADIO_POWER_OFF               = -5;
+  const long DATACALL_FAIL_TETHERED_CALL_ACTIVE          = -6;
+  const long DATACALL_FAIL_ERROR_UNSPECIFIED             = 0xFFFF;
+
+  /**
+   * Data call network state.
+   */
+  const long DATACALL_STATE_INACTIVE    = 0;
+  const long DATACALL_STATE_ACTIVE_DOWN = 1;
+  const long DATACALL_STATE_ACTIVE_UP   = 2;
+
+  /**
+   * Data call authentication type. Must match the values in ril_consts
+   * RIL_DATACALL_AUTH_TO_GECKO array.
+   */
+  const long DATACALL_AUTH_NONE         = 0;
+  const long DATACALL_AUTH_PAP          = 1;
+  const long DATACALL_AUTH_CHAP         = 2;
+  const long DATACALL_AUTH_PAP_OR_CHAP  = 3;
+
+   /**
+    * Data call protocol type. Must match the values in ril_consts
+    * RIL_DATACALL_PDP_TYPES array.
+    */
+  const long DATACALL_PDP_TYPE_IPV4   = 0;
+  const long DATACALL_PDP_TYPE_IPV4V6 = 1;
+  const long DATACALL_PDP_TYPE_IPV6   = 2;
+
+  /**
+   * Reason for deactivating data call.
+   */
+  const long DATACALL_DEACTIVATE_NO_REASON      = 0;
+  const long DATACALL_DEACTIVATE_RADIO_SHUTDOWN = 1;
+
+  /**
+   * Setup data call.
+   *
+   * @param apn
+   *        Apn to connect to.
+   * @param username
+   *        Username for apn.
+   * @param password
+   *        Password for apn.
+   * @param authType
+   *        Authentication type. One of the DATACALL_AUTH_* values.
+   * @param pdpType
+   *        Connection type. One of the DATACALL_PDP_TYPE_* values.
+   * @param nsIDataCallCallback
+   *        Called when request is finished.
+   *
+   * If successful, the notifySetupDataCallSuccess() will be called with the
+   * new nsIDataCall.
+   *
+   * Otherwise, the notifyError() will be called, and the error will be either
+   * 'RadioNotAvailable', 'OpNotAllowedBeforeRegToNw',
+   * 'OpNotAllowedDuringVoiceCall', 'RequestNotSupported' or 'GenericFailure'.
+   */
+  void setupDataCall(in AString apn, in AString username,
+                     in AString password, in long authType,
+                     in long pdpType,
+                     in nsIDataCallCallback callback);
+
+  /**
+   * Deactivate data call.
+   *
+   * @param cid
+   *        Context id.
+   * @param reason
+   *        Disconnect Reason. One of the DATACALL_DEACTIVATE_* values.
+   * @param nsIDataCallCallback
+   *        Called when request is finished.
+   *
+   * If successful, the notifySuccess() will be called.
+   *
+   * Otherwise, the notifyError() will be called, and the error will be either
+   * 'RadioNotAvailable' or 'GenericFailure'.
+   */
+  void deactivateDataCall(in long cid,
+                          in long reason,
+                          in nsIDataCallCallback callback);
+
+  /**
+   * Get current data call list.
+   *
+   * @param nsIDataCallCallback
+   *        Called when request is finished.
+   *
+   * If successful, the notifyGetDataCallListSuccess() will be called with the
+   * list of nsIDataCall(s).
+   *
+   * Otherwise, the notifyError() will be called, and the error will be either
+   * 'RadioNotAvailable' or 'GenericFailure'.
+   */
+  void getDataCallList(in nsIDataCallCallback callback);
+
+  /**
+   * Set data registration state.
+   *
+   * @param attach
+   *        whether to attach data registration or not.
+   * @param nsIDataCallCallback
+   *        Called when request is finished.
+   *
+   * If successful, the notifySuccess() will be called.
+   *
+   * Otherwise, the notifyError() will be called, and the error will be either
+   * 'RadioNotAvailable', 'SubscriptionNotAvailable' or 'GenericFailure'.
+   */
+  void setDataRegistration(in boolean attach,
+                           in nsIDataCallCallback callback);
+
+  /**
+   * Register to receive unsolicited events from this nsIDataCallInterface.
+   */
+  void registerListener(in nsIDataCallInterfaceListener listener);
+
+  /**
+   * Unregister to stop receiving unsolicited events from this
+   * nsIDataCallInterface.
+   */
+  void unregisterListener(in nsIDataCallInterfaceListener listener);
+};
+
+[scriptable, uuid(64700406-7429-4743-a6ae-f82e9877fd0d)]
+interface nsIDataCallInterfaceService : nsISupports
+{
+  /**
+   * Get the corresponding data call interface.
+   *
+   * @param clientId
+   *        clientId of the data call interface to get.
+   */
+  nsIDataCallInterface getDataCallInterface(in long clientId);
+};
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/nsIDataCallManager.idl firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/nsIDataCallManager.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/nsIDataCallManager.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/nsIDataCallManager.idl	2015-05-25 20:43:53.000000000 +0000
@@ -0,0 +1,68 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsISupports.idl"
+#include "nsINetworkManager.idl"
+
+[scriptable, uuid(e48d290b-ea3b-4987-9333-2e01f64c92ba)]
+interface nsIRilNetworkInterface : nsINetworkInterface
+{
+  readonly attribute unsigned long serviceId;
+  readonly attribute DOMString iccId;
+
+  /* The following attributes are for MMS proxy settings. */
+  readonly attribute DOMString mmsc;     // Empty string if not set.
+  readonly attribute DOMString mmsProxy; // Empty string if not set.
+  readonly attribute long      mmsPort;  // -1 if not set.
+};
+
+[scriptable, function, uuid(cb2f0f5b-67f4-4c14-93e8-01e66b630464)]
+interface nsIDeactivateDataCallsCallback : nsISupports
+{
+  /**
+   * Callback function used to notify when all data calls are disconnected.
+   */
+  void notifyDataCallsDisconnected();
+};
+
+[scriptable, uuid(e3feec20-36b4-47de-a7a5-e32a65f20186)]
+interface nsIDataCallHandler : nsISupports
+{
+  /**
+   * 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 long networkType);
+  void deactivateDataCallByType(in long networkType);
+  long getDataCallStateByType(in long networkType);
+
+  /**
+   * Deactivate all data calls.
+   *
+   * @param callback
+   *        Callback to notify when all data calls are disconnected.
+   */
+  void deactivateDataCalls(in nsIDeactivateDataCallsCallback callback);
+
+  /**
+   * Called to reconsider data call state.
+   */
+  void updateRILNetworkInterface();
+};
+
+[scriptable, uuid(aac54873-5771-4093-a72b-fe39967c6607)]
+interface nsIDataCallManager : nsISupports
+{
+  /**
+   * Get the corresponding data call handler.
+   *
+   * @param clientId
+   *        clientId of the data call handler to get.
+   */
+  nsIDataCallHandler getDataCallHandler(in unsigned long clientId);
+};
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/nsIGonkDataCallInterfaceService.idl firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/nsIGonkDataCallInterfaceService.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/nsIGonkDataCallInterfaceService.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/nsIGonkDataCallInterfaceService.idl	2015-05-25 20:43:53.000000000 +0000
@@ -0,0 +1,18 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 "nsIDataCallInterfaceService.idl"
+
+[scriptable, uuid(f008d00c-e2b8-49b2-8f88-19111577938e)]
+interface nsIGonkDataCallInterfaceService : nsIDataCallInterfaceService
+{
+  /**
+   * Called by RadioInterface or lower layer to notify about data call list
+   * changes.
+   */
+  void notifyDataCallListChanged(in unsigned long clientId,
+                                 in uint32_t count,
+                                 [array, size_is(count)] in nsIDataCall
+                                   dataCalls);
+};
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/nsINetworkService.idl firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/nsINetworkService.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/nsINetworkService.idl	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/nsINetworkService.idl	2015-05-25 20:43:53.000000000 +0000
@@ -159,7 +159,7 @@
 /**
  * Provide network services.
  */
-[scriptable, uuid(8216224c-a4e0-43fa-9662-3f2446b500c6)]
+[scriptable, uuid(214c0810-fd41-11e4-b939-0800200c9a66)]
 interface nsINetworkService : nsISupports
 {
   const long MODIFY_ROUTE_ADD    = 0;
@@ -418,6 +418,18 @@
                    in nsIDhcpRequestCallback callback);
 
   /**
+   * Stop Dhcp daemon.
+   *
+   * @param ifname
+   *        Target interface.
+   *
+   * @param callback
+   *        Callback to notify the result of stopping dhcp request.
+   */
+  void stopDhcp(in DOMString ifname,
+                in nsINativeCommandCallback callback);
+
+  /**
    * Enable a network interface.
    *
    * @param networkInterface
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/nsIRadioInterfaceLayer.idl firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/nsIRadioInterfaceLayer.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/nsIRadioInterfaceLayer.idl	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/nsIRadioInterfaceLayer.idl	2015-05-25 20:43:53.000000000 +0000
@@ -3,24 +3,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
-#include "nsINetworkManager.idl"
 
 interface nsIIccInfo;
 interface nsIMobileConnectionInfo;
 interface nsIMobileMessageCallback;
 
-[scriptable, uuid(6e0f45b8-410e-11e3-8c8e-b715b2cd0128)]
-interface nsIRilNetworkInterface : nsINetworkInterface
-{
-  readonly attribute unsigned long serviceId;
-  readonly attribute DOMString iccId;
-
-  /* The following attributes are for MMS proxy settings. */
-  readonly attribute DOMString mmsc;     // Empty string if not set.
-  readonly attribute DOMString mmsProxy; // Empty string if not set.
-  readonly attribute long      mmsPort;  // -1 if not set.
-};
-
 [scriptable, function, uuid(3bc96351-53b0-47a1-a888-c74c64b60f25)]
 interface nsIRilSendWorkerMessageCallback : nsISupports
 {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/nsVolumeService.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/nsVolumeService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/nsVolumeService.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/nsVolumeService.cpp	2015-05-25 20:43:53.000000000 +0000
@@ -439,7 +439,7 @@
 nsVolumeService::CreateFakeVolume(const nsAString& name, const nsAString& path)
 {
   if (XRE_GetProcessType() == GeckoProcessType_Default) {
-    nsRefPtr<nsVolume> vol = new nsVolume(name, path, nsIVolume::STATE_MOUNTED,
+    nsRefPtr<nsVolume> vol = new nsVolume(name, path, nsIVolume::STATE_INIT,
                                           -1    /* mountGeneration */,
                                           true  /* isMediaPresent */,
                                           false /* isSharing */,
@@ -448,6 +448,7 @@
                                           false /* isUnmounting */,
                                           false /* isRemovable */,
                                           false /* isHotSwappable */);
+    vol->SetState(nsIVolume::STATE_MOUNTED);
     vol->LogState();
     UpdateVolume(vol.get());
     return NS_OK;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/RadioInterfaceLayer.js firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/RadioInterfaceLayer.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/RadioInterfaceLayer.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/RadioInterfaceLayer.js	2015-05-25 20:43:53.000000000 +0000
@@ -54,8 +54,6 @@
   Components.ID("{2d831c8d-6017-435b-a80c-e5d422810cea}");
 const RADIOINTERFACE_CID =
   Components.ID("{6a7c91f0-a2b3-4193-8562-8969296c0b54}");
-const RILNETWORKINTERFACE_CID =
-  Components.ID("{3bdd52a9-3965-4130-b569-0ac5afed045e}");
 
 const NS_XPCOM_SHUTDOWN_OBSERVER_ID      = "xpcom-shutdown";
 const kNetworkConnStateChangedTopic      = "network-connection-state-changed";
@@ -77,8 +75,6 @@
 const RADIO_POWER_OFF_TIMEOUT = 30000;
 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;
@@ -93,9 +89,6 @@
   "RIL:SendStkMenuSelection",
   "RIL:SendStkTimerExpiration",
   "RIL:SendStkEventDownload",
-  "RIL:IccOpenChannel",
-  "RIL:IccExchangeAPDU",
-  "RIL:IccCloseChannel",
   "RIL:ReadIccContacts",
   "RIL:UpdateIccContact",
   "RIL:RegisterIccMsg",
@@ -168,6 +161,14 @@
                                    "@mozilla.org/ril/system-messenger-helper;1",
                                    "nsIIccMessenger");
 
+XPCOMUtils.defineLazyServiceGetter(this, "gDataCallManager",
+                                   "@mozilla.org/datacall/manager;1",
+                                   "nsIDataCallManager");
+
+XPCOMUtils.defineLazyServiceGetter(this, "gDataCallInterfaceService",
+                                   "@mozilla.org/datacall/interfaceservice;1",
+                                   "nsIGonkDataCallInterfaceService");
+
 XPCOMUtils.defineLazyGetter(this, "gStkCmdFactory", function() {
   let stk = {};
   Cu.import("resource://gre/modules/StkProactiveCmdFactory.jsm", stk);
@@ -417,18 +418,6 @@
       this._startProcessingPending();
     },
 
-    isDeactivatingDataCalls: function() {
-      return _request !== null;
-    },
-
-    finishDeactivatingDataCalls: function(clientId) {
-      if (DEBUG) debug("RadioControl: finishDeactivatingDataCalls: " + clientId);
-      let deferred = _deactivatingDeferred[clientId];
-      if (deferred) {
-        deferred.resolve();
-      }
-    },
-
     notifyRadioStateChanged: function(clientId, radioState) {
       gMobileConnectionService.notifyRadioStateChanged(clientId, radioState);
     },
@@ -566,8 +555,12 @@
     _deactivateDataCallsForClient: function(clientId) {
       return function() {
         let deferred = _deactivatingDeferred[clientId] = Promise.defer();
-        let dataConnectionHandler = gDataConnectionManager.getConnectionHandler(clientId);
-        dataConnectionHandler.deactivateDataCalls();
+        let dataCallHandler = gDataCallManager.getDataCallHandler(clientId);
+
+        dataCallHandler.deactivateDataCalls(function() {
+          deferred.resolve();
+        });
+
         return deferred.promise;
       };
     },
@@ -599,261 +592,6 @@
   };
 });
 
-XPCOMUtils.defineLazyGetter(this, "gDataConnectionManager", function () {
-  return {
-    QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
-                                           Ci.nsISettingsServiceCallback]),
-
-    _connectionHandlers: null,
-
-    // Flag to determine the data state to start with when we boot up. It
-    // corresponds to the 'ril.data.enabled' setting from the UI.
-    _dataEnabled: false,
-
-    // Flag to record the default client id for data call. It corresponds to
-    // the 'ril.data.defaultServiceId' setting from the UI.
-    _dataDefaultClientId: -1,
-
-    // Flag to record the current default client id for data call.
-    // It differs from _dataDefaultClientId in that it is set only when
-    // the switch of client id process is done.
-    _currentDataClientId: -1,
-
-    // Pending function to execute when we are notified that another data call has
-    // been disconnected.
-    _pendingDataCallRequest: null,
-
-    debug: function(s) {
-      dump("-*- DataConnectionManager: " + s + "\n");
-    },
-
-    init: function(ril) {
-      if (!ril) {
-        return;
-      }
-
-      this._connectionHandlers = [];
-      for (let clientId = 0; clientId < ril.numRadioInterfaces; clientId++) {
-        let radioInterface = ril.getRadioInterface(clientId);
-        this._connectionHandlers.push(
-          new DataConnectionHandler(clientId, radioInterface));
-      }
-
-      let lock = gSettingsService.createLock();
-      // Read the APN data from the settings DB.
-      lock.get("ril.data.apnSettings", this);
-      // Read the data enabled setting from DB.
-      lock.get("ril.data.enabled", this);
-      lock.get("ril.data.roaming_enabled", this);
-      // Read the default client id for data call.
-      lock.get("ril.data.defaultServiceId", this);
-
-      Services.obs.addObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, false);
-      Services.obs.addObserver(this, kMozSettingsChangedObserverTopic, false);
-    },
-
-    getConnectionHandler: function(clientId) {
-      return this._connectionHandlers[clientId];
-    },
-
-    isSwitchingDataClientId: function() {
-      return this._pendingDataCallRequest !== null;
-    },
-
-    notifyDataCallStateChange: function(clientId) {
-      if (!this.isSwitchingDataClientId() ||
-          clientId != this._currentDataClientId) {
-        return;
-      }
-
-      let connHandler = this._connectionHandlers[this._currentDataClientId];
-      if (connHandler.allDataDisconnected() &&
-          typeof this._pendingDataCallRequest === "function") {
-        if (DEBUG) {
-          this.debug("All data calls disconnected, process pending data settings.");
-        }
-        this._pendingDataCallRequest();
-        this._pendingDataCallRequest = null;
-      }
-    },
-
-    _handleDataClientIdChange: function(newDefault) {
-      if (this._dataDefaultClientId === newDefault) {
-         return;
-      }
-      this._dataDefaultClientId = newDefault;
-
-      // This is to handle boot up stage.
-      if (this._currentDataClientId == -1) {
-        this._currentDataClientId = this._dataDefaultClientId;
-        let connHandler = this._connectionHandlers[this._currentDataClientId];
-        let radioInterface = connHandler.radioInterface;
-        if (RILQUIRKS_DATA_REGISTRATION_ON_DEMAND ||
-            RILQUIRKS_SUBSCRIPTION_CONTROL) {
-          radioInterface.setDataRegistration(true);
-        }
-        if (this._dataEnabled) {
-          let settings = connHandler.dataCallSettings;
-          settings.oldEnabled = settings.enabled;
-          settings.enabled = true;
-          connHandler.updateRILNetworkInterface();
-        }
-        return;
-      }
-
-      let oldConnHandler = this._connectionHandlers[this._currentDataClientId];
-      let oldIface = oldConnHandler.radioInterface;
-      let oldSettings = oldConnHandler.dataCallSettings;
-      let newConnHandler = this._connectionHandlers[this._dataDefaultClientId];
-      let newIface = newConnHandler.radioInterface;
-      let newSettings = newConnHandler.dataCallSettings;
-
-      let applyPendingDataSettings = (function() {
-        if (RILQUIRKS_DATA_REGISTRATION_ON_DEMAND ||
-            RILQUIRKS_SUBSCRIPTION_CONTROL) {
-          oldIface.setDataRegistration(false)
-            .then(() => {
-              if (this._dataEnabled) {
-                newSettings.oldEnabled = newSettings.enabled;
-                newSettings.enabled = true;
-              }
-              this._currentDataClientId = this._dataDefaultClientId;
-              return newIface.setDataRegistration(true);
-            })
-            .then(() => newConnHandler.updateRILNetworkInterface());
-          return;
-        }
-
-        if (this._dataEnabled) {
-          newSettings.oldEnabled = newSettings.enabled;
-          newSettings.enabled = true;
-        }
-        this._currentDataClientId = this._dataDefaultClientId;
-        newConnHandler.updateRILNetworkInterface();
-      }).bind(this);
-
-      if (this._dataEnabled) {
-        oldSettings.oldEnabled = oldSettings.enabled;
-        oldSettings.enabled = false;
-      }
-
-      if (oldConnHandler.deactivateDataCalls()) {
-        this._pendingDataCallRequest = applyPendingDataSettings;
-        if (DEBUG) {
-          this.debug("_handleDataClientIdChange: existing data call(s) active" +
-                     ", wait for them to get disconnected.");
-        }
-        return;
-      }
-
-      applyPendingDataSettings();
-    },
-
-    _shutdown: function() {
-      for (let handler of this._connectionHandlers) {
-        handler.shutdown();
-      }
-      this._connectionHandlers = null;
-      Services.obs.removeObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID);
-      Services.obs.removeObserver(this, kMozSettingsChangedObserverTopic);
-    },
-
-    /**
-     * nsISettingsServiceCallback
-     */
-    handle: function(name, result) {
-      switch(name) {
-        case "ril.data.apnSettings":
-          if (DEBUG) {
-            this.debug("'ril.data.apnSettings' is now " +
-                       JSON.stringify(result));
-          }
-          if (!result) {
-            break;
-          }
-          for (let clientId in this._connectionHandlers) {
-            let handler = this._connectionHandlers[clientId];
-            let apnSetting = result[clientId];
-            if (handler && apnSetting) {
-              handler.updateApnSettings(apnSetting);
-              handler.updateRILNetworkInterface();
-            }
-          }
-          break;
-        case "ril.data.enabled":
-          if (DEBUG) {
-            this.debug("'ril.data.enabled' is now " + result);
-          }
-          if (this._dataEnabled === result) {
-            break;
-          }
-          this._dataEnabled = result;
-
-          if (DEBUG) {
-            this.debug("Default id for data call: " + this._dataDefaultClientId);
-          }
-          if (this._dataDefaultClientId === -1) {
-            // We haven't got the default id for data from db.
-            break;
-          }
-
-          let connHandler = this._connectionHandlers[this._dataDefaultClientId];
-          let settings = connHandler.dataCallSettings;
-          settings.oldEnabled = settings.enabled;
-          settings.enabled = result;
-          connHandler.updateRILNetworkInterface();
-          break;
-        case "ril.data.roaming_enabled":
-          if (DEBUG) {
-            this.debug("'ril.data.roaming_enabled' is now " + result);
-            this.debug("Default id for data call: " + this._dataDefaultClientId);
-          }
-          for (let clientId = 0; clientId < this._connectionHandlers.length; clientId++) {
-            let connHandler = this._connectionHandlers[clientId];
-            let settings = connHandler.dataCallSettings;
-            settings.roamingEnabled = Array.isArray(result) ? result[clientId] : result;
-          }
-          if (this._dataDefaultClientId === -1) {
-            // We haven't got the default id for data from db.
-            break;
-          }
-          this._connectionHandlers[this._dataDefaultClientId].updateRILNetworkInterface();
-          break;
-        case "ril.data.defaultServiceId":
-          result = result || 0;
-          if (DEBUG) {
-            this.debug("'ril.data.defaultServiceId' is now " + result);
-          }
-          this._handleDataClientIdChange(result);
-          break;
-      }
-    },
-
-    handleError: function(errorMessage) {
-      if (DEBUG) {
-        this.debug("There was an error while reading RIL settings.");
-      }
-    },
-
-    /**
-     * nsIObserver interface methods.
-     */
-    observe: function(subject, topic, data) {
-      switch (topic) {
-        case kMozSettingsChangedObserverTopic:
-          if ("wrappedJSObject" in subject) {
-            subject = subject.wrappedJSObject;
-          }
-          this.handle(subject.key, subject.value);
-          break;
-        case NS_XPCOM_SHUTDOWN_OBSERVER_ID:
-          this._shutdown();
-          break;
-      }
-    },
-  };
-});
-
 // Initialize shared preference "ril.numRadioInterfaces" according to system
 // property.
 try {
@@ -873,499 +611,29 @@
   })());
 } catch (e) {}
 
-function DataConnectionHandler(clientId, radioInterface) {
-  // Initial owning attributes.
-  this.clientId = clientId;
-  this.radioInterface = radioInterface;
-  this.dataCallSettings = {
-    oldEnabled: false,
-    enabled: false,
-    roamingEnabled: false
-  };
-  this._dataCalls = [];
-
-  // This map is used to collect all the apn types and its corresponding
-  // RILNetworkInterface.
-  this.dataNetworkInterfaces = new Map();
-}
-DataConnectionHandler.prototype = {
-  clientId: 0,
-  radioInterface: null,
-  // Data calls setting.
-  dataCallSettings: null,
-  dataNetworkInterfaces: null,
-  _dataCalls: null,
-
-  // Apn settings to be setup after data call are cleared.
-  _pendingApnSettings: null,
-
-  debug: function(s) {
-    dump("-*- DataConnectionHandler[" + this.clientId + "]: " + s + "\n");
-  },
-
-  shutdown: function() {
-    // Shutdown all RIL network interfaces
-    this.dataNetworkInterfaces.forEach(function(networkInterface) {
-      gNetworkManager.unregisterNetworkInterface(networkInterface);
-      networkInterface.shutdown();
-      networkInterface = null;
-    });
-    this.dataNetworkInterfaces.clear();
-    this._dataCalls = [];
-    this.clientId = null;
-    this.radioInterface = null;
-  },
-
-  /**
-   * Check if we get all necessary APN data.
-   */
-  _validateApnSetting: function(apnSetting) {
-    return (apnSetting &&
-            apnSetting.apn &&
-            apnSetting.types &&
-            apnSetting.types.length);
-  },
-
-  _convertApnType: function(apnType) {
-    switch(apnType) {
-      case "default":
-        return NETWORK_TYPE_MOBILE;
-      case "mms":
-        return NETWORK_TYPE_MOBILE_MMS;
-      case "supl":
-        return NETWORK_TYPE_MOBILE_SUPL;
-      case "ims":
-        return NETWORK_TYPE_MOBILE_IMS;
-      case "dun":
-        return NETWORK_TYPE_MOBILE_DUN;
-      default:
-        return NETWORK_TYPE_UNKNOWN;
-     }
-  },
-
-  _compareDataCallOptions: function(dataCall, newDataCall) {
-    return dataCall.apnProfile.apn == newDataCall.apnProfile.apn &&
-           dataCall.apnProfile.user == newDataCall.apnProfile.user &&
-           dataCall.apnProfile.password == newDataCall.apnProfile.passwd &&
-           dataCall.chappap == newDataCall.chappap &&
-           dataCall.pdptype == newDataCall.pdptype;
-  },
-
-  /**
-   * This function will do the following steps:
-   *   1. Clear the cached APN settings in the RIL.
-   *   2. Combine APN, user name, and password as the key of |byApn| object to
-   *      refer to the corresponding APN setting.
-   *   3. Use APN type as the index of |byType| object to refer to the
-   *      corresponding APN setting.
-   *   4. Create RilNetworkInterface for each APN setting created at step 2.
-   */
-  _setupApnSettings: function(newApnSettings) {
-    if (!newApnSettings) {
-      return;
-    }
-    if (DEBUG) this.debug("setupApnSettings: " + JSON.stringify(newApnSettings));
-
-    // Shutdown all network interfaces and clear data calls.
-    this.dataNetworkInterfaces.forEach(function(networkInterface) {
-      gNetworkManager.unregisterNetworkInterface(networkInterface);
-      networkInterface.shutdown();
-      networkInterface = null;
-    });
-    this.dataNetworkInterfaces.clear();
-    this._dataCalls = [];
-
-    // Cache the APN settings by APNs and by types in the RIL.
-    for (let inputApnSetting of newApnSettings) {
-      if (!this._validateApnSetting(inputApnSetting)) {
-        continue;
-      }
-
-      // Use APN type as the key of dataNetworkInterfaces to refer to the
-      // corresponding RILNetworkInterface.
-      for (let i = 0; i < inputApnSetting.types.length; i++) {
-        let apnType = inputApnSetting.types[i];
-        let networkType = this._convertApnType(apnType);
-        if (networkType === NETWORK_TYPE_UNKNOWN) {
-          if (DEBUG) this.debug("Invalid apn type: " + apnType);
-          continue;
-        }
-
-        if (DEBUG) this.debug("Preparing RILNetworkInterface for type: " + apnType);
-        // Create DataCall for RILNetworkInterface or reuse one that is shareable.
-        let dataCall;
-        for (let i = 0; i < this._dataCalls.length; i++) {
-          if (this._dataCalls[i].canHandleApn(inputApnSetting)) {
-            if (DEBUG) this.debug("Found shareable DataCall, reusing it.");
-            dataCall = this._dataCalls[i];
-            break;
-          }
-        }
-
-        if (!dataCall) {
-          if (DEBUG) this.debug("No shareable DataCall found, creating one.");
-          dataCall = new DataCall(this.clientId, inputApnSetting);
-          this._dataCalls.push(dataCall);
-        }
-
-        try {
-          let networkInterface = new RILNetworkInterface(this, networkType,
-                                                         inputApnSetting,
-                                                         dataCall);
-          gNetworkManager.registerNetworkInterface(networkInterface);
-          this.dataNetworkInterfaces.set(networkType, networkInterface);
-        } catch (e) {
-          if (DEBUG) {
-            this.debug("Error setting up RILNetworkInterface for type " +
-                        apnType + ": " + e);
-          }
-        }
-      }
-    }
-  },
-
-  /**
-   * Check if all data is disconnected.
-   */
-  allDataDisconnected: function() {
-    for (let i = 0; i < this._dataCalls.length; i++) {
-      let dataCall = this._dataCalls[i];
-      if (dataCall.state != RIL.GECKO_NETWORK_STATE_UNKNOWN &&
-          dataCall.state != RIL.GECKO_NETWORK_STATE_DISCONNECTED) {
-        return false;
-      }
-    }
-    return true;
-  },
-
-  updateApnSettings: function(newApnSettings) {
-    if (!newApnSettings) {
-      return;
-    }
-    if (this._pendingApnSettings) {
-      // Change of apn settings in process, just update to the newest.
-      this._pengingApnSettings = newApnSettings;
-      return;
-    }
-
-    let isDeactivatingDataCalls = false;
-    this.dataNetworkInterfaces.forEach(function(networkInterface) {
-      // Clear all existing connections.
-      if (networkInterface.state == RIL.GECKO_NETWORK_STATE_CONNECTED) {
-        networkInterface.disconnect();
-        isDeactivatingDataCalls = true;
-      }
-    });
-
-    if (isDeactivatingDataCalls) {
-      // Defer apn settings setup until all data calls are cleared.
-      this._pendingApnSettings = newApnSettings;
-      return;
-    }
-    this._setupApnSettings(newApnSettings);
-  },
-
-  updateRILNetworkInterface: function() {
-    let networkInterface = this.dataNetworkInterfaces.get(NETWORK_TYPE_MOBILE);
-    if (!networkInterface) {
-      if (DEBUG) {
-        this.debug("No network interface for default data.");
-      }
-      return;
-    }
-
-    let connection =
-      gMobileConnectionService.getItemByServiceId(this.clientId);
-
-    // This check avoids data call connection if the radio is not ready
-    // yet after toggling off airplane mode.
-    let radioState = connection && connection.radioState;
-    if (radioState != Ci.nsIMobileConnection.MOBILE_RADIO_STATE_ENABLED) {
-      if (DEBUG) {
-        this.debug("RIL is not ready for data connection: radio's not ready");
-      }
-      return;
-    }
-
-    // We only watch at "ril.data.enabled" flag changes for connecting or
-    // disconnecting the data call. If the value of "ril.data.enabled" is
-    // true and any of the remaining flags change the setting application
-    // should turn this flag to false and then to true in order to reload
-    // the new values and reconnect the data call.
-    if (this.dataCallSettings.oldEnabled === this.dataCallSettings.enabled) {
-      if (DEBUG) {
-        this.debug("No changes for ril.data.enabled flag. Nothing to do.");
-      }
-      return;
-    }
-
-    let dataInfo = connection && connection.data;
-    let isRegistered =
-      dataInfo &&
-      dataInfo.state == RIL.GECKO_MOBILE_CONNECTION_STATE_REGISTERED;
-    let haveDataConnection =
-      dataInfo &&
-      dataInfo.type != RIL.GECKO_MOBILE_CONNECTION_STATE_UNKNOWN;
-    if (!isRegistered || !haveDataConnection) {
-      if (DEBUG) {
-        this.debug("RIL is not ready for data connection: Phone's not " +
-                   "registered or doesn't have data connection.");
-      }
-      return;
-    }
-    let wifi_active = false;
-    if (gNetworkManager.active &&
-        gNetworkManager.active.type == NETWORK_TYPE_WIFI) {
-      wifi_active = true;
-    }
-
-    let defaultDataCallConnected = networkInterface.connected;
-
-    // We have moved part of the decision making into DataCall, the rest will be
-    // moved after Bug 904514 - [meta] NetworkManager enhancement.
-    if (networkInterface.enabled &&
-        (!this.dataCallSettings.enabled ||
-         (dataInfo.roaming && !this.dataCallSettings.roamingEnabled))) {
-      if (DEBUG) {
-        this.debug("Data call settings: disconnect data call.");
-      }
-      networkInterface.disconnect();
-      return;
-    }
-
-    if (networkInterface.enabled && wifi_active) {
-      if (DEBUG) {
-        this.debug("Disconnect data call when Wifi is connected.");
-      }
-      networkInterface.disconnect();
-      return;
-    }
-
-    if (!this.dataCallSettings.enabled || defaultDataCallConnected) {
-      if (DEBUG) {
-        this.debug("Data call settings: nothing to do.");
-      }
-      return;
-    }
-    if (dataInfo.roaming && !this.dataCallSettings.roamingEnabled) {
-      if (DEBUG) {
-        this.debug("We're roaming, but data roaming is disabled.");
-      }
-      return;
-    }
-    if (wifi_active) {
-      if (DEBUG) {
-        this.debug("Don't connect data call when Wifi is connected.");
-      }
-      return;
-    }
-    if (this._pendingApnSettings) {
-      if (DEBUG) this.debug("We're changing apn settings, ignore any changes.");
-      return;
+function DataCall(aAttributes) {
+  for (let key in aAttributes) {
+    if (key === "pdpType") {
+      // Convert pdp type into constant int value.
+      this[key] = RIL.RIL_DATACALL_PDP_TYPES.indexOf(aAttributes[key]);
+      continue;
     }
 
-    if (gRadioEnabledController.isDeactivatingDataCalls()) {
-      // We're changing the radio power currently, ignore any changes.
-      return;
-    }
-
-    if (DEBUG) {
-      this.debug("Data call settings: connect data call.");
-    }
-    networkInterface.connect();
-  },
-
-  _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(networkType) {
-    if (DEBUG) {
-      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(networkType);
-    if (!networkInterface) {
-      if (DEBUG) {
-        this.debug("No network interface for type: " + networkType);
-      }
-      return;
-    }
-
-    networkInterface.connect();
-  },
-
-  deactivateDataCallByType: function(networkType) {
-    if (DEBUG) {
-      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(networkType);
-    if (!networkInterface) {
-      if (DEBUG) {
-        this.debug("No network interface for type: " + networkType);
-      }
-      return;
-    }
-
-    networkInterface.disconnect();
-  },
-
-  deactivateDataCalls: function() {
-    let dataDisconnecting = false;
-    this.dataNetworkInterfaces.forEach(function(networkInterface) {
-      if (networkInterface.enabled) {
-        if (networkInterface.state == RIL.GECKO_NETWORK_STATE_CONNECTED) {
-          dataDisconnecting = true;
-        }
-        networkInterface.disconnect();
-      }
-    });
-
-    // No data calls exist. It's safe to proceed the pending radio power off
-    // request.
-    if (gRadioEnabledController.isDeactivatingDataCalls() && !dataDisconnecting) {
-      gRadioEnabledController.finishDeactivatingDataCalls(this.clientId);
-    }
-
-    return dataDisconnecting;
-  },
-
-  _findDataCallByCid: function(cid) {
-    if (cid === undefined || cid < 0) {
-      return -1;
-    }
-
-    for (let i = 0; i < this._dataCalls.length; i++) {
-      let datacall = this._dataCalls[i];
-      if (datacall.linkInfo.cid != null &&
-          datacall.linkInfo.cid === cid) {
-        return i;
-      }
-    }
-
-    return -1;
-  },
-
-  /**
-   * Handle unsolicidated data call list changed, called from RadioInterface.
-   */
-  handleDataCallListChanged: function(dataCallList) {
-    let currentDataCalls = this._dataCalls.slice();
-    for (let i = 0; i < dataCallList.length; i++) {
-      let dataCall = dataCallList[i];
-      let index = this._findDataCallByCid(dataCall.cid);
-      if (index == -1) {
-        if (DEBUG) {
-          this.debug("Unexpected new data call: " + JSON.stringify(dataCall));
-        }
-        continue;
-      }
-      currentDataCalls[index].onDataCallChanged(dataCall);
-      currentDataCalls[index] = null;
-    }
-
-    // If there is any CONNECTED DataCall left in currentDataCalls, means that
-    // it is missing in dataCallList, we should send a DISCONNECTED event to
-    // notify about this.
-    for (let i = 0; i < currentDataCalls.length; i++) {
-      let currentDataCall = currentDataCalls[i];
-      if (currentDataCall && currentDataCall.linkInfo.cid != null &&
-          currentDataCall.state == RIL.GECKO_NETWORK_STATE_CONNECTED) {
-        if (DEBUG) {
-          this.debug("Expected data call missing: " + JSON.stringify(
-            currentDataCall.apnProfile) + ", must have been DISCONNECTED.");
-        }
-        currentDataCall.onDataCallChanged({
-          state: RIL.GECKO_NETWORK_STATE_DISCONNECTED
-        });
-      }
-    }
-  },
-
-  /**
-   * Notify about data call setup error, called from DataCall.
-   */
-  notifyDataCallError: function(message) {
-    // Notify data call error only for data APN
-    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
-      // data call setup.
-      if (message.cid !== undefined) {
-        if (message.linkInfo.cid == dataCall.linkInfo.cid) {
-          gMobileConnectionService.notifyDataError(this.clientId, message);
-        }
-      } else {
-        if (this._compareDataCallOptions(dataCall, message)) {
-          gMobileConnectionService.notifyDataError(this.clientId, message);
-        }
-      }
-    }
-  },
-
-  /**
-   * Notify about data call changed, called from DataCall.
-   */
-  notifyDataCallChanged: function(updatedDataCall) {
-    // Process pending radio power off request after all data calls
-    // are disconnected.
-    if (updatedDataCall.state == RIL.GECKO_NETWORK_STATE_DISCONNECTED ||
-        updatedDataCall.state == RIL.GECKO_NETWORK_STATE_UNKNOWN &&
-        this.allDataDisconnected()) {
-      if (gRadioEnabledController.isDeactivatingDataCalls()) {
-        if (DEBUG) {
-          this.debug("All data calls are disconnected.");
-        }
-        gRadioEnabledController.finishDeactivatingDataCalls(this.clientId);
-      }
-
-      if (this._pendingApnSettings) {
-        if (DEBUG) {
-          this.debug("Setup pending apn settings.");
-        }
-        this._setupApnSettings(this._pendingApnSettings);
-        this._pendingApnSettings = null;
-        this.updateRILNetworkInterface();
-      }
+    this[key] = aAttributes[key];
+  }
+}
+DataCall.prototype = {
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIDataCall]),
 
-      if (gDataConnectionManager.isSwitchingDataClientId()) {
-        gDataConnectionManager.notifyDataCallStateChange(this.clientId);
-      }
-    }
-  },
+  failCause: Ci.nsIDataCallInterface.DATACALL_FAIL_NONE,
+  suggestedRetryTime: -1,
+  cid: -1,
+  active: -1,
+  pdpType: -1,
+  ifname: null,
+  addreses: null,
+  dnses: null,
+  gateways: null
 };
 
 function RadioInterfaceLayer() {
@@ -1385,7 +653,6 @@
 
   gMessageManager.init(this); // TODO: Bug 815526, deprecate RILContentHelper.
   gRadioEnabledController.init(this);
-  gDataConnectionManager.init(this);
 }
 RadioInterfaceLayer.prototype = {
 
@@ -1732,15 +999,6 @@
       case "RIL:SendStkEventDownload":
         this.workerMessenger.send("sendStkEventDownload", msg.json.data);
         break;
-      case "RIL:IccOpenChannel":
-        this.workerMessenger.sendWithIPCMessage(msg, "iccOpenChannel");
-        break;
-      case "RIL:IccCloseChannel":
-        this.workerMessenger.sendWithIPCMessage(msg, "iccCloseChannel");
-        break;
-      case "RIL:IccExchangeAPDU":
-        this.workerMessenger.sendWithIPCMessage(msg, "iccExchangeAPDU");
-        break;
       case "RIL:ReadIccContacts":
         this.workerMessenger.sendWithIPCMessage(msg, "readICCContacts");
         break;
@@ -1752,7 +1010,6 @@
   },
 
   handleUnsolicitedWorkerMessage: function(message) {
-    let connHandler = gDataConnectionManager.getConnectionHandler(this.clientId);
     switch (message.rilMessageType) {
       case "callRing":
         gTelephonyService.notifyCallRing();
@@ -1774,7 +1031,10 @@
                                              message.sessionEnded);
         break;
       case "datacalllistchanged":
-        connHandler.handleDataCallListChanged(message.datacalls);
+        let dataCalls = message.datacalls.map(dataCall => new DataCall(dataCall));
+        gDataCallInterfaceService.notifyDataCallListChanged(this.clientId,
+                                                            dataCalls.length,
+                                                            dataCalls);
         break;
       case "emergencyCbModeChange":
         gMobileConnectionService.notifyEmergencyCallbackModeChanged(this.clientId,
@@ -1784,9 +1044,6 @@
       case "networkinfochanged":
         gMobileConnectionService.notifyNetworkInfoChanged(this.clientId,
                                                           message);
-        if (message[RIL.NETWORK_INFO_DATA_REGISTRATION_STATE]) {
-          connHandler.updateRILNetworkInterface();
-        }
         break;
       case "networkselectionmodechange":
         gMobileConnectionService.notifyNetworkSelectModeChanged(this.clientId,
@@ -1797,7 +1054,6 @@
         break;
       case "dataregistrationstatechange":
         gMobileConnectionService.notifyDataInfoChanged(this.clientId, message);
-        connHandler.updateRILNetworkInterface();
         break;
       case "signalstrengthchange":
         gMobileConnectionService.notifySignalStrengthChanged(this.clientId,
@@ -1875,7 +1131,7 @@
    *                    NetworkManager
    */
   updateRILNetworkInterface: function() {
-    let connHandler = gDataConnectionManager.getConnectionHandler(this.clientId);
+    let connHandler = gDataCallManager.getDataCallHandler(this.clientId);
     connHandler.updateRILNetworkInterface();
   },
 
@@ -2342,20 +1598,20 @@
   // TODO: Bug 928861 - B2G NetworkManager: Provide a more generic function
   //                    for connecting
   setupDataCallByType: function(networkType) {
-    let connHandler = gDataConnectionManager.getConnectionHandler(this.clientId);
+    let connHandler = gDataCallManager.getDataCallHandler(this.clientId);
     connHandler.setupDataCallByType(networkType);
   },
 
   // TODO: Bug 928861 - B2G NetworkManager: Provide a more generic function
   //                    for connecting
   deactivateDataCallByType: function(networkType) {
-    let connHandler = gDataConnectionManager.getConnectionHandler(this.clientId);
+    let connHandler = gDataCallManager.getDataCallHandler(this.clientId);
     connHandler.deactivateDataCallByType(networkType);
   },
 
   // TODO: Bug 904514 - [meta] NetworkManager enhancement
   getDataCallStateByType: function(networkType) {
-    let connHandler = gDataConnectionManager.getConnectionHandler(this.clientId);
+    let connHandler = gDataCallManager.getDataCallHandler(this.clientId);
     return connHandler.getDataCallStateByType(networkType);
   },
 
@@ -2378,685 +1634,4 @@
   },
 };
 
-function DataCall(clientId, apnSetting) {
-  this.clientId = clientId;
-  this.apnProfile = {
-    apn: apnSetting.apn,
-    user: apnSetting.user,
-    password: apnSetting.password,
-    authType: apnSetting.authtype,
-    protocol: apnSetting.protocol,
-    roaming_protocol: apnSetting.roaming_protocol
-  };
-  this.linkInfo = {
-    cid: null,
-    ifname: null,
-    addresses: [],
-    dnses: [],
-    gateways: []
-  };
-  this.state = RIL.GECKO_NETWORK_STATE_UNKNOWN;
-  this.requestedNetworkIfaces = [];
-}
-
-DataCall.prototype = {
-  /**
-   * Standard values for the APN connection retry process
-   * Retry funcion: time(secs) = A * numer_of_retries^2 + B
-   */
-  NETWORK_APNRETRY_FACTOR: 8,
-  NETWORK_APNRETRY_ORIGIN: 3,
-  NETWORK_APNRETRY_MAXRETRIES: 10,
-
-  // Event timer for connection retries
-  timer: null,
-
-  // APN failed connections. Retry counter
-  apnRetryCounter: 0,
-
-  // Array to hold RILNetworkInterfaces that requested this DataCall.
-  requestedNetworkIfaces: null,
-
-  // Holds the pdp type sent to ril worker.
-  pdptype: null,
-
-  // Holds the authentication type sent to ril worker.
-  chappap: null,
-
-  /**
-   * @return "deactivate" if <ifname> changes or one of the currentDataCall
-   *         addresses is missing in updatedDataCall, or "identical" if no
-   *         changes found, or "changed" otherwise.
-   */
-  _compareDataCallLink: function(updatedDataCall, currentDataCall) {
-    // If network interface is changed, report as "deactivate".
-    if (updatedDataCall.ifname != currentDataCall.ifname) {
-      return "deactivate";
-    }
-
-    // If any existing address is missing, report as "deactivate".
-    for (let i = 0; i < currentDataCall.addresses.length; i++) {
-      let address = currentDataCall.addresses[i];
-      if (updatedDataCall.addresses.indexOf(address) < 0) {
-        return "deactivate";
-      }
-    }
-
-    if (currentDataCall.addresses.length != updatedDataCall.addresses.length) {
-      // Since now all |currentDataCall.addresses| are found in
-      // |updatedDataCall.addresses|, this means one or more new addresses are
-      // reported.
-      return "changed";
-    }
-
-    let fields = ["gateways", "dnses"];
-    for (let i = 0; i < fields.length; i++) {
-      // Compare <datacall>.<field>.
-      let field = fields[i];
-      let lhs = updatedDataCall[field], rhs = currentDataCall[field];
-      if (lhs.length != rhs.length) {
-        return "changed";
-      }
-      for (let i = 0; i < lhs.length; i++) {
-        if (lhs[i] != rhs[i]) {
-          return "changed";
-        }
-      }
-    }
-
-    return "identical";
-  },
-
-  onSetupDataCallResult: function(dataCall) {
-    if (dataCall.status && dataCall.status != RIL.DATACALL_FAIL_NONE) {
-      dataCall.errorMsg =
-        RIL.RIL_DATACALL_FAILCAUSE_TO_GECKO_DATACALL_ERROR[dataCall.status];
-    }
-
-    if (dataCall.errorMsg) {
-      if (DEBUG) {
-        this.debug("SetupDataCall error for apn " + dataCall.apn + ": " +
-                   dataCall.errorMsg + " (" + dataCall.status + "), retry time: " +
-                   dataCall.suggestedRetryTime);
-      }
-
-      this.state = RIL.GECKO_NETWORK_STATE_DISCONNECTED;
-
-      if (this.requestedNetworkIfaces.length === 0) {
-        if (DEBUG) this.debug("This DataCall is not requested anymore.");
-        return;
-      }
-
-      // Let DataConnectionHandler notify MobileConnectionService
-      let connHandler = gDataConnectionManager.getConnectionHandler(this.clientId);
-      connHandler.notifyDataCallError(this);
-
-      // For suggestedRetryTime, the value of INT32_MAX(0x7fffffff) means no retry.
-      if (dataCall.suggestedRetryTime === INT32_MAX ||
-          this.isPermanentFail(dataCall.status, dataCall.errorMsg)) {
-        if (DEBUG) this.debug("Data call error: no retry needed.");
-        return;
-      }
-
-      this.retry(dataCall.suggestedRetryTime);
-      return;
-    }
-
-    this.apnRetryCounter = 0;
-    this.linkInfo.cid = dataCall.cid;
-
-    if (this.requestedNetworkIfaces.length === 0) {
-      if (DEBUG) {
-        this.debug("State is connected, but no network interface requested" +
-                   " this DataCall");
-      }
-      this.deactivate();
-      return;
-    }
-
-    this.linkInfo.ifname = dataCall.ifname;
-    this.linkInfo.addresses = dataCall.addresses.slice();
-    this.linkInfo.gateways = dataCall.gateways.slice();
-    this.linkInfo.dnses = dataCall.dnses.slice();
-    this.state = dataCall.state;
-
-    // Notify DataConnectionHandler about data call connected.
-    let connHandler = gDataConnectionManager.getConnectionHandler(this.clientId);
-    connHandler.notifyDataCallChanged(this);
-
-    for (let i = 0; i < this.requestedNetworkIfaces.length; i++) {
-      this.requestedNetworkIfaces[i].notifyRILNetworkInterface();
-    }
-  },
-
-  onDeactivateDataCallResult: function() {
-    this.reset();
-
-    if (this.requestedNetworkIfaces.length > 0) {
-      if (DEBUG) {
-        this.debug("State is disconnected/unknown, but this DataCall is" +
-                   " requested.");
-      }
-      this.setup();
-      return;
-    }
-
-    // Notify DataConnectionHandler about data call disconnected.
-    let connHandler = gDataConnectionManager.getConnectionHandler(this.clientId);
-    connHandler.notifyDataCallChanged(this);
-  },
-
-  onDataCallChanged: function(updatedDataCall) {
-    if (DEBUG) {
-      this.debug("onDataCallChanged: " + JSON.stringify(updatedDataCall));
-    }
-
-    if (this.state == updatedDataCall.state &&
-        updatedDataCall.state != RIL.GECKO_NETWORK_STATE_CONNECTED) {
-      return;
-    }
-
-    switch (updatedDataCall.state) {
-      case RIL.GECKO_NETWORK_STATE_CONNECTED:
-        if (this.state == RIL.GECKO_NETWORK_STATE_CONNECTED) {
-          let result =
-            this._compareDataCallLink(updatedDataCall, this.linkInfo);
-
-          if (result == "identical") {
-            if (DEBUG) this.debug("No changes in data call.");
-            return;
-          }
-          if (result == "deactivate") {
-            if (DEBUG) this.debug("Data link changed, cleanup.");
-            this.deactivate();
-            return;
-          }
-          // Minor change, just update and notify.
-          if (DEBUG) {
-            this.debug("Data link minor change, just update and notify.");
-          }
-
-          this.linkInfo.addresses = updatedDataCall.addresses.slice();
-          this.linkInfo.gateways = updatedDataCall.gateways.slice();
-          this.linkInfo.dnses = updatedDataCall.dnses.slice();
-        }
-        break;
-      case RIL.GECKO_NETWORK_STATE_DISCONNECTED:
-      case RIL.GECKO_NETWORK_STATE_UNKNOWN:
-        if (this.state == RIL.GECKO_NETWORK_STATE_CONNECTED) {
-          // Notify first on unexpected data call disconnection.
-          this.state = updatedDataCall.state;
-          for (let i = 0; i < this.requestedNetworkIfaces.length; i++) {
-            this.requestedNetworkIfaces[i].notifyRILNetworkInterface();
-          }
-        }
-        this.reset();
-
-        if (this.requestedNetworkIfaces.length > 0) {
-          if (DEBUG) {
-            this.debug("State is disconnected/unknown, but this DataCall is" +
-                       " requested.");
-          }
-          this.setup();
-          return;
-        }
-        break;
-    }
-
-    this.state = updatedDataCall.state;
-
-    // Notify DataConnectionHandler about data call changed.
-    let connHandler = gDataConnectionManager.getConnectionHandler(this.clientId);
-    connHandler.notifyDataCallChanged(this);
-
-    for (let i = 0; i < this.requestedNetworkIfaces.length; i++) {
-      this.requestedNetworkIfaces[i].notifyRILNetworkInterface();
-    }
-  },
-
-  // Helpers
-
-  debug: function(s) {
-    dump("-*- DataCall[" + this.clientId + ":" + this.apnProfile.apn + "]: " +
-      s + "\n");
-  },
-
-  get connected() {
-    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) {
-        return true;
-      }
-    }
-    return false;
-  },
-
-  canHandleApn: function(apnSetting) {
-    let isIdentical = this.apnProfile.apn == apnSetting.apn &&
-                      (this.apnProfile.user || '') == (apnSetting.user || '') &&
-                      (this.apnProfile.password || '') == (apnSetting.password || '') &&
-                      (this.apnProfile.authType || '') == (apnSetting.authtype || '');
-
-    if (RILQUIRKS_HAVE_IPV6) {
-      isIdentical = isIdentical &&
-                    (this.apnProfile.protocol || '') == (apnSetting.protocol || '') &&
-                    (this.apnProfile.roaming_protocol || '') == (apnSetting.roaming_protocol || '');
-    }
-
-    return isIdentical;
-  },
-
-  resetLinkInfo: function() {
-    this.linkInfo.cid = null;
-    this.linkInfo.ifname = null;
-    this.linkInfo.addresses = [];
-    this.linkInfo.dnses = [];
-    this.linkInfo.gateways = [];
-  },
-
-  reset: function() {
-    this.resetLinkInfo();
-
-    this.state = RIL.GECKO_NETWORK_STATE_UNKNOWN;
-
-    this.chappap = null;
-    this.pdptype = null;
-  },
-
-  connect: function(networkInterface) {
-    if (DEBUG) this.debug("connect: " + networkInterface.type);
-
-    if (this.requestedNetworkIfaces.indexOf(networkInterface) == -1) {
-      this.requestedNetworkIfaces.push(networkInterface);
-    }
-
-    if (this.state == RIL.GECKO_NETWORK_STATE_CONNECTING ||
-        this.state == RIL.GECKO_NETWORK_STATE_DISCONNECTING) {
-      return;
-    }
-    if (this.state == RIL.GECKO_NETWORK_STATE_CONNECTED) {
-      // This needs to run asynchronously, to behave the same way as the case of
-      // non-shared apn, see bug 1059110.
-      Services.tm.currentThread.dispatch(() => {
-        // Do not notify if state changed while this event was being dispatched,
-        // the state probably was notified already or need not to be notified.
-        if (networkInterface.state == RIL.GECKO_NETWORK_STATE_CONNECTED) {
-          networkInterface.notifyRILNetworkInterface();
-        }
-      }, Ci.nsIEventTarget.DISPATCH_NORMAL);
-      return;
-    }
-
-    // If retry mechanism is running on background, stop it since we are going
-    // to setup data call now.
-    if (this.timer) {
-      this.timer.cancel();
-    }
-
-    this.setup();
-  },
-
-  setup: function() {
-    if (DEBUG) {
-      this.debug("Going to set up data connection with APN " +
-                 this.apnProfile.apn);
-    }
-
-    let connection =
-      gMobileConnectionService.getItemByServiceId(this.clientId);
-    let dataInfo = connection && connection.data;
-    if (dataInfo == null ||
-        dataInfo.state != RIL.GECKO_MOBILE_CONNECTION_STATE_REGISTERED ||
-        dataInfo.type == RIL.GECKO_MOBILE_CONNECTION_STATE_UNKNOWN) {
-      return;
-    }
-
-    let radioTechType = dataInfo.type;
-    let radioTechnology = RIL.GECKO_RADIO_TECH.indexOf(radioTechType);
-    let authType = RIL.RIL_DATACALL_AUTH_TO_GECKO.indexOf(this.apnProfile.authType);
-    // Use the default authType if the value in database is invalid.
-    // For the case that user might not select the authentication type.
-    if (authType == -1) {
-      if (DEBUG) {
-        this.debug("Invalid authType " + this.apnProfile.authtype);
-      }
-      authType = RIL.RIL_DATACALL_AUTH_TO_GECKO.indexOf(RIL.GECKO_DATACALL_AUTH_DEFAULT);
-    }
-    this.chappap = authType;
-
-    let pdpType = RIL.GECKO_DATACALL_PDP_TYPE_IP;
-    if (RILQUIRKS_HAVE_IPV6) {
-      pdpType = !dataInfo.roaming
-              ? this.apnProfile.protocol
-              : this.apnProfile.roaming_protocol;
-      if (RIL.RIL_DATACALL_PDP_TYPES.indexOf(pdpType) < 0) {
-        if (DEBUG) {
-          this.debug("Invalid pdpType '" + pdpType + "', using '" +
-                     RIL.GECKO_DATACALL_PDP_TYPE_DEFAULT + "'");
-        }
-        pdpType = RIL.GECKO_DATACALL_PDP_TYPE_DEFAULT;
-      }
-    }
-    this.pdptype = pdpType;
-
-    let radioInterface = this.gRIL.getRadioInterface(this.clientId);
-    radioInterface.sendWorkerMessage("setupDataCall", {
-      radioTech: radioTechnology,
-      apn: this.apnProfile.apn,
-      user: this.apnProfile.user,
-      passwd: this.apnProfile.password,
-      chappap: authType,
-      pdptype: pdpType
-    }, this.onSetupDataCallResult.bind(this));
-    this.state = RIL.GECKO_NETWORK_STATE_CONNECTING;
-  },
-
-  retry: function(suggestedRetryTime) {
-    let apnRetryTimer;
-
-    // We will retry the connection in increasing times
-    // based on the function: time = A * numer_of_retries^2 + B
-    if (this.apnRetryCounter >= this.NETWORK_APNRETRY_MAXRETRIES) {
-      this.apnRetryCounter = 0;
-      this.timer = null;
-      if (DEBUG) this.debug("Too many APN Connection retries - STOP retrying");
-      return;
-    }
-
-    // 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): " +
-                 apnRetryTimer + "-" + this.apnRetryCounter);
-    }
-
-    if (this.timer == null) {
-      // Event timer for connection retries
-      this.timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
-    }
-    this.timer.initWithCallback(this, apnRetryTimer * 1000,
-                                Ci.nsITimer.TYPE_ONE_SHOT);
-  },
-
-  disconnect: function(networkInterface) {
-    if (DEBUG) this.debug("disconnect: " + networkInterface.type);
-    let index = this.requestedNetworkIfaces.indexOf(networkInterface);
-    if (index != -1) {
-      this.requestedNetworkIfaces.splice(index, 1);
-
-      if (this.state == RIL.GECKO_NETWORK_STATE_DISCONNECTED ||
-          this.state == RIL.GECKO_NETWORK_STATE_UNKNOWN) {
-        if (this.timer) {
-          this.timer.cancel();
-        }
-        this.reset();
-        return;
-      }
-
-      // Notify the DISCONNECTED event immediately after network interface is
-      // removed from requestedNetworkIfaces, to make the DataCall, shared or
-      // not, to have the same behavior.
-      Services.tm.currentThread.dispatch(() => {
-        // Do not notify if state changed while this event was being dispatched,
-        // the state probably was notified already or need not to be notified.
-        if (networkInterface.state == RIL.GECKO_NETWORK_STATE_DISCONNECTED) {
-          networkInterface.notifyRILNetworkInterface();
-
-          // Clear link info after notifying NetworkManager.
-          if (this.requestedNetworkIfaces.length === 0) {
-            this.resetLinkInfo();
-          }
-        }
-      }, Ci.nsIEventTarget.DISPATCH_NORMAL);
-    }
-
-    // Only deactivate data call if no more network interface needs this
-    // DataCall and if state is CONNECTED, for other states, we simply remove
-    // the network interface from requestedNetworkIfaces.
-    if (this.requestedNetworkIfaces.length > 0 ||
-        this.state != RIL.GECKO_NETWORK_STATE_CONNECTED) {
-      return;
-    }
-
-    this.deactivate();
-  },
-
-  deactivate: function() {
-    let reason = RIL.DATACALL_DEACTIVATE_NO_REASON;
-    if (DEBUG) {
-      this.debug("Going to disconnect data connection cid " + this.linkInfo.cid);
-    }
-    let radioInterface = this.gRIL.getRadioInterface(this.clientId);
-    radioInterface.sendWorkerMessage("deactivateDataCall", {
-      cid: this.linkInfo.cid,
-      reason: reason
-    }, this.onDeactivateDataCallResult.bind(this));
-
-    this.state = RIL.GECKO_NETWORK_STATE_DISCONNECTING;
-  },
-
-  // Entry method for timer events. Used to reconnect to a failed APN
-  notify: function(timer) {
-    this.setup();
-  },
-
-  shutdown: function() {
-    if (this.timer) {
-      this.timer.cancel();
-      this.timer = null;
-    }
-  }
-};
-
-function RILNetworkInterface(dataConnectionHandler, type, apnSetting, dataCall) {
-  if (!dataCall) {
-    throw new Error("No dataCall for RILNetworkInterface: " + type);
-  }
-
-  this.dataConnectionHandler = dataConnectionHandler;
-  this.type = type;
-  this.apnSetting = apnSetting;
-  this.dataCall = dataCall;
-
-  this.enabled = false;
-}
-
-RILNetworkInterface.prototype = {
-  classID:   RILNETWORKINTERFACE_CID,
-  classInfo: XPCOMUtils.generateCI({classID: RILNETWORKINTERFACE_CID,
-                                    classDescription: "RILNetworkInterface",
-                                    interfaces: [Ci.nsINetworkInterface,
-                                                 Ci.nsIRilNetworkInterface]}),
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsINetworkInterface,
-                                         Ci.nsIRilNetworkInterface]),
-
-  // Hold reference to DataCall object which is determined at initilization.
-  dataCall: null,
-
-  // If this RILNetworkInterface type is enabled or not.
-  enabled: null,
-
-  /**
-   * nsINetworkInterface Implementation
-   */
-
-  get state() {
-    if (!this.dataCall.inRequestedTypes(this.type)) {
-      return Ci.nsINetworkInterface.NETWORK_STATE_DISCONNECTED;
-    }
-    return this.dataCall.state;
-  },
-
-  type: null,
-
-  get name() {
-    return this.dataCall.linkInfo.ifname;
-  },
-
-  get httpProxyHost() {
-    return this.apnSetting.proxy || "";
-  },
-
-  get httpProxyPort() {
-    return this.apnSetting.port || "";
-  },
-
-  getAddresses: function(aIps, aPrefixLengths) {
-    let addresses = this.dataCall.linkInfo.addresses;
-
-    let ips = [];
-    let prefixLengths = [];
-    for (let i = 0; i < addresses.length; i++) {
-      let [ip, prefixLength] = addresses[i].split("/");
-      ips.push(ip);
-      prefixLengths.push(prefixLength);
-    }
-
-    aIps.value = ips.slice();
-    aPrefixLengths.value = prefixLengths.slice();
-
-    return ips.length;
-  },
-
-  getGateways: function(aCount) {
-    let linkInfo = this.dataCall.linkInfo;
-
-    if (aCount) {
-      aCount.value = linkInfo.gateways.length;
-    }
-    return linkInfo.gateways.slice();
-  },
-
-  getDnses: function(aCount) {
-    let linkInfo = this.dataCall.linkInfo;
-
-    if (aCount) {
-      aCount.value = linkInfo.dnses.length;
-    }
-    return linkInfo.dnses.slice();
-  },
-
-  /**
-   * nsIRilNetworkInterface Implementation
-   */
-
-  get serviceId() {
-    return this.dataConnectionHandler.clientId;
-  },
-
-  get iccId() {
-    let iccInfo = this.dataConnectionHandler.radioInterface.getIccInfo();
-    return iccInfo ? iccInfo.iccid : null;
-  },
-
-  get mmsc() {
-    if (this.type != NETWORK_TYPE_MOBILE_MMS) {
-      if (DEBUG) this.debug("Error! Only MMS network can get MMSC.");
-      throw Cr.NS_ERROR_UNEXPECTED;
-    }
-
-    return this.apnSetting.mmsc || "";
-  },
-
-  get mmsProxy() {
-    if (this.type != NETWORK_TYPE_MOBILE_MMS) {
-      if (DEBUG) this.debug("Error! Only MMS network can get MMS proxy.");
-      throw Cr.NS_ERROR_UNEXPECTED;
-    }
-
-    return this.apnSetting.mmsproxy || "";
-  },
-
-  get mmsPort() {
-    if (this.type != NETWORK_TYPE_MOBILE_MMS) {
-      if (DEBUG) this.debug("Error! Only MMS network can get MMS port.");
-      throw Cr.NS_ERROR_UNEXPECTED;
-    }
-
-    // Note: Port 0 is reserved, so we treat it as invalid as well.
-    // See http://www.iana.org/assignments/port-numbers
-    return this.apnSetting.mmsport || -1;
-  },
-
-  // Helpers
-
-  debug: function(s) {
-    dump("-*- RILNetworkInterface[" + this.dataConnectionHandler.clientId + ":" +
-         this.type + "]: " + s + "\n");
-  },
-
-  apnSetting: null,
-
-  get connected() {
-    return this.state == Ci.nsINetworkInterface.NETWORK_STATE_CONNECTED;
-  },
-
-  notifyRILNetworkInterface: function() {
-    if (DEBUG) {
-      this.debug("notifyRILNetworkInterface type: " + this.type + ", state: " +
-                 this.state);
-    }
-
-    gNetworkManager.updateNetworkInterface(this);
-  },
-
-  connect: function() {
-    this.enabled = true;
-
-    this.dataCall.connect(this);
-  },
-
-  disconnect: function() {
-    if (!this.enabled) {
-      return;
-    }
-    this.enabled = false;
-
-    this.dataCall.disconnect(this);
-  },
-
-  shutdown: function() {
-    this.dataCall.shutdown();
-    this.dataCall = null;
-  }
-
-};
-
-XPCOMUtils.defineLazyServiceGetter(DataCall.prototype, "gRIL",
-                                   "@mozilla.org/ril;1",
-                                   "nsIRadioInterfaceLayer");
-
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([RadioInterfaceLayer]);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/ril_consts.js firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/ril_consts.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/ril_consts.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/ril_consts.js	2015-05-25 20:43:53.000000000 +0000
@@ -400,6 +400,7 @@
 this.GECKO_PREFERRED_NETWORK_TYPE_WCDMA_GSM_CDMA_EVDO = "wcdma/gsm/cdma/evdo";
 this.GECKO_PREFERRED_NETWORK_TYPE_LTE_CDMA_EVDO = "lte/cdma/evdo";
 this.GECKO_PREFERRED_NETWORK_TYPE_LTE_WCDMA_GSM = "lte/wcdma/gsm";
+this.GECKO_PREFERRED_NETWORK_TYPE_LTE_WCDMA = "lte/wcdma";
 this.GECKO_PREFERRED_NETWORK_TYPE_LTE_WCDMA_GSM_CDMA_EVDO = "lte/wcdma/gsm/cdma/evdo";
 this.GECKO_PREFERRED_NETWORK_TYPE_LTE_ONLY = "lte";
 this.RIL_PREFERRED_NETWORK_TYPE_TO_GECKO = [
@@ -414,7 +415,8 @@
   GECKO_PREFERRED_NETWORK_TYPE_LTE_CDMA_EVDO,
   GECKO_PREFERRED_NETWORK_TYPE_LTE_WCDMA_GSM,
   GECKO_PREFERRED_NETWORK_TYPE_LTE_WCDMA_GSM_CDMA_EVDO,
-  GECKO_PREFERRED_NETWORK_TYPE_LTE_ONLY
+  GECKO_PREFERRED_NETWORK_TYPE_LTE_ONLY,
+  GECKO_PREFERRED_NETWORK_TYPE_LTE_WCDMA
 ];
 
 this.GECKO_SUPPORTED_NETWORK_TYPES_DEFAULT = "gsm,wcdma";
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/RILContentHelper.js firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/RILContentHelper.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/RILContentHelper.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/RILContentHelper.js	2015-05-25 20:43:53.000000000 +0000
@@ -46,9 +46,6 @@
 const RIL_IPC_MSG_NAMES = [
   "RIL:StkCommand",
   "RIL:StkSessionEnd",
-  "RIL:IccOpenChannel",
-  "RIL:IccCloseChannel",
-  "RIL:IccExchangeAPDU",
   "RIL:ReadIccContacts",
   "RIL:UpdateIccContact",
 ];
@@ -89,7 +86,6 @@
   this.initDOMRequestHelper(/* aWindow */ null, RIL_IPC_MSG_NAMES);
   this._windowsMap = [];
   this._iccListeners = [];
-  this._iccChannelCallback = [];
 
   Services.obs.addObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, false);
 
@@ -173,60 +169,6 @@
     });
   },
 
-  iccOpenChannel: function(clientId, aid, callback) {
-    let requestId = UUIDGenerator.generateUUID().toString();
-    this._addIccChannelCallback(requestId, callback);
-
-    cpmm.sendAsyncMessage("RIL:IccOpenChannel", {
-      clientId: clientId,
-      data: {
-        requestId: requestId,
-        aid: aid
-      }
-    });
-  },
-
-  iccExchangeAPDU: function(clientId, channel, cla, ins, p1, p2, p3, data, callback) {
-    let requestId = UUIDGenerator.generateUUID().toString();
-    this._addIccChannelCallback(requestId, callback);
-
-    if (!data) {
-      if (DEBUG) debug('data is not set , p3 : ' + p3);
-    }
-
-    let apdu = {
-      cla: cla,
-      command: ins,
-      p1: p1,
-      p2: p2,
-      p3: p3,
-      data: data
-    };
-
-    //Potentially you need serialization here and can't pass the jsval through
-    cpmm.sendAsyncMessage("RIL:IccExchangeAPDU", {
-      clientId: clientId,
-      data: {
-        requestId: requestId,
-        channel: channel,
-        apdu: apdu
-      }
-    });
-  },
-
-  iccCloseChannel: function(clientId, channel, callback) {
-    let requestId = UUIDGenerator.generateUUID().toString();
-    this._addIccChannelCallback(requestId, callback);
-
-    cpmm.sendAsyncMessage("RIL:IccCloseChannel", {
-      clientId: clientId,
-      data: {
-        requestId: requestId,
-        channel: channel
-      }
-    });
-  },
-
   readContacts: function(clientId, window, contactType) {
     if (window == null) {
       throw Components.Exception("Can't get window object",
@@ -330,24 +272,6 @@
     }
   },
 
-  _iccChannelCallback: null,
-
-  _addIccChannelCallback: function(requestId, channelCb) {
-    let cbInterfaces = this._iccChannelCallback;
-    if (!cbInterfaces[requestId] && channelCb) {
-      cbInterfaces[requestId] = channelCb;
-      return;
-    }
-
-    if (DEBUG) debug("Unable to add channelCbInterface for requestId : " + requestId);
-  },
-
-  _getIccChannelCallback: function(requestId) {
-    let cb = this._iccChannelCallback[requestId];
-    delete this._iccChannelCallback[requestId];
-    return cb;
-  },
-
   registerIccMsg: function(clientId, listener) {
     if (DEBUG) debug("Registering for ICC related messages");
     this.registerListener("_iccListeners", clientId, listener);
@@ -454,15 +378,6 @@
       case "RIL:StkSessionEnd":
         this._deliverEvent(clientId, "_iccListeners", "notifyStkSessionEnd", null);
         break;
-      case "RIL:IccOpenChannel":
-        this.handleIccOpenChannel(data);
-        break;
-      case "RIL:IccCloseChannel":
-        this.handleIccCloseChannel(data);
-        break;
-      case "RIL:IccExchangeAPDU":
-        this.handleIccExchangeAPDU(data);
-        break;
       case "RIL:ReadIccContacts":
         this.handleReadIccContacts(data);
         break;
@@ -472,48 +387,6 @@
     }
   },
 
-  handleSimpleRequest: function(requestId, errorMsg, result) {
-    if (errorMsg) {
-      this.fireRequestError(requestId, errorMsg);
-    } else {
-      this.fireRequestSuccess(requestId, result);
-    }
-  },
-
-  handleIccOpenChannel: function(message) {
-    let requestId = message.requestId;
-    let callback = this._getIccChannelCallback(requestId);
-    if (!callback) {
-      return;
-    }
-
-    return !message.errorMsg ? callback.notifyOpenChannelSuccess(message.channel) :
-                               callback.notifyError(message.errorMsg);
-  },
-
-  handleIccCloseChannel: function(message) {
-    let requestId = message.requestId;
-    let callback = this._getIccChannelCallback(requestId);
-    if (!callback) {
-      return;
-    }
-
-    return !message.errorMsg ? callback.notifyCloseChannelSuccess() :
-                               callback.notifyError(message.errorMsg);
-  },
-
-  handleIccExchangeAPDU: function(message) {
-    let requestId = message.requestId;
-    let callback = this._getIccChannelCallback(requestId);
-    if (!callback) {
-      return;
-    }
-
-    return !message.errorMsg ?
-           callback.notifyExchangeAPDUResponse(message.sw1, message.sw2, message.simResponse) :
-           callback.notifyError(message.errorMsg);
-  },
-
   handleReadIccContacts: function(message) {
     if (message.errorMsg) {
       this.fireRequestError(message.requestId, message.errorMsg);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/ril_worker.js firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/ril_worker.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/ril_worker.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/ril_worker.js	2015-05-25 20:43:53.000000000 +0000
@@ -1884,8 +1884,10 @@
     let Buf = this.context.Buf;
     Buf.newParcel(REQUEST_DEACTIVATE_DATA_CALL, options);
     Buf.writeInt32(2);
-    Buf.writeString(options.cid);
-    Buf.writeString(options.reason || DATACALL_DEACTIVATE_NO_REASON);
+    Buf.writeString(options.cid.toString());
+    Buf.writeString(options.reason !== undefined ?
+                    options.reason.toString() :
+                    DATACALL_DEACTIVATE_NO_REASON.toString());
     Buf.sendParcel();
   },
 
@@ -3435,18 +3437,6 @@
     }
   },
 
-  _setDataCallGeckoState: function(datacall) {
-    switch (datacall.active) {
-      case DATACALL_INACTIVE:
-        datacall.state = GECKO_NETWORK_STATE_DISCONNECTED;
-        break;
-      case DATACALL_ACTIVE_DOWN:
-      case DATACALL_ACTIVE_UP:
-        datacall.state = GECKO_NETWORK_STATE_CONNECTED;
-        break;
-    }
-  },
-
   _processSuppSvcNotification: function(info) {
     if (DEBUG) {
       this.context.debug("handle supp svc notification: " + JSON.stringify(info));
@@ -5262,12 +5252,10 @@
   options.active = Buf.readInt32(); // DATACALL_ACTIVE_*
   options.type = Buf.readString();
   options.apn = Buf.readString();
-  let addresses = Buf.readString();
-  let dnses = Buf.readString();
-  options.addresses = addresses ? addresses.split(" ") : [];
-  options.dnses = dnses ? dnses.split(" ") : [];
+  options.addresses = Buf.readString();
+  options.dnses = Buf.readString();
   options.gateways = [];
-  this._setDataCallGeckoState(options);
+
   return options;
 };
 
@@ -5276,19 +5264,16 @@
     options = {};
   }
   let Buf = this.context.Buf;
-  options.status = Buf.readInt32();  // DATACALL_FAIL_*
+  options.failCause = Buf.readInt32();  // DATACALL_FAIL_*
   options.suggestedRetryTime = Buf.readInt32();
   options.cid = Buf.readInt32().toString();
   options.active = Buf.readInt32();  // DATACALL_ACTIVE_*
   options.type = Buf.readString();
   options.ifname = Buf.readString();
-  let addresses = Buf.readString();
-  let dnses = Buf.readString();
-  let gateways = Buf.readString();
-  options.addresses = addresses ? addresses.split(" ") : [];
-  options.dnses = dnses ? dnses.split(" ") : [];
-  options.gateways = gateways ? gateways.split(" ") : [];
-  this._setDataCallGeckoState(options);
+  options.addresses = Buf.readString();
+  options.dnses = Buf.readString();
+  options.gateways = Buf.readString();
+
   return options;
 };
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/tests/marionette/test_fakevolume.js firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/tests/marionette/test_fakevolume.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/tests/marionette/test_fakevolume.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/tests/marionette/test_fakevolume.js	2015-05-25 20:43:54.000000000 +0000
@@ -18,12 +18,8 @@
 
 is(volName, vol.name, "name");
 is(mountPoint, vol.mountPoint, "moutnPoint");
-is(Ci.nsIVolume.STATE_INIT, vol.state, "state");
-
-
-let oldMountGen = vol.mountGeneration;
-volumeService.SetFakeVolumeState(volName, Ci.nsIVolume.STATE_MOUNTED);
 is(Ci.nsIVolume.STATE_MOUNTED, vol.state, "state");
-ok(vol.mountGeneration > oldMountGen, "mount generation should be incremented");
+
+ok(vol.mountGeneration > 0, "mount generation should not be zero");
 
 finish();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/tests/marionette/test_ril_code_quality.py firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/tests/marionette/test_ril_code_quality.py
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/tests/marionette/test_ril_code_quality.py	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/tests/marionette/test_ril_code_quality.py	2015-05-25 20:43:54.000000000 +0000
@@ -31,7 +31,7 @@
 """
 
 
-from marionette_test import MarionetteTestCase
+from marionette.marionette_test import MarionetteTestCase
 import bisect
 import inspect
 import os
@@ -109,8 +109,8 @@
     }
 
     CODE_OPEN_CHANNEL_BY_URI = '''
-    var Cc = SpecialPowers.Cc;
-    var Ci = SpecialPowers.Ci;
+    var Cc = Components.classes;
+    var Ci = Components.interfaces;
     var ios = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
     var secMan = Cc["@mozilla.org/scriptsecuritymanager;1"].getService(Ci.nsIScriptSecurityManager);
     global.uri = '%(uri)s';
@@ -129,8 +129,8 @@
     '''
 
     CODE_READ_CONTENT = '''
-    var Cc = SpecialPowers.Cc;
-    var Ci = SpecialPowers.Ci;
+    var Cc = Components.classes;
+    var Ci = Components.interfaces;
 
     var zipReader = Cc["@mozilla.org/libjar/zip-reader;1"].createInstance(Ci.nsIZipReader);
     var inputStream = Cc["@mozilla.org/scriptableinputstream;1"].createInstance(Ci.nsIScriptableInputStream);
@@ -155,7 +155,9 @@
             return cls.URI_PREFIX + cls.URI_PATH[filename]
 
     def __init__(self, marionette):
-        self.runjs = lambda x: marionette.execute_script(x, new_sandbox=False)
+        self.runjs = lambda x: marionette.execute_script(x,
+                                                         new_sandbox=False,
+                                                         sandbox='system')
 
     def read_file(self, filename):
         """Read file and return the contents as string."""
@@ -210,7 +212,9 @@
                             for line in config.splitlines()])
 
         # Set global (JSHINT, options, global) in js environment.
-        self.runjs = lambda x: marionette.execute_script(x, new_sandbox=False)
+        self.runjs = lambda x: marionette.execute_script(x,
+                                                         new_sandbox=False,
+                                                         sandbox='system')
         self.runjs(self.CODE_INIT_JSHINT %
                    {'script': script, 'config_string': repr(config)})
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/VolumeManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/VolumeManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/gonk/VolumeManager.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/gonk/VolumeManager.cpp	2015-05-25 20:43:53.000000000 +0000
@@ -75,7 +75,8 @@
 VolumeManager::GetVolume(size_t aIndex)
 {
   MOZ_ASSERT(aIndex < NumVolumes());
-  return sVolumeManager->mVolumeArray[aIndex];
+  RefPtr<Volume> vol = sVolumeManager->mVolumeArray[aIndex];
+  return vol.forget();
 }
 
 //static
@@ -135,7 +136,7 @@
   for (volIndex = 0; volIndex < numVolumes; volIndex++) {
     RefPtr<Volume> vol = GetVolume(volIndex);
     if (vol->Name().Equals(aName)) {
-      return vol;
+      return vol.forget();
     }
   }
   return nullptr;
@@ -147,12 +148,12 @@
 {
   RefPtr<Volume> vol = FindVolumeByName(aName);
   if (vol) {
-    return vol;
+    return vol.forget();
   }
   // No volume found, create and add a new one.
   vol = new Volume(aName);
   sVolumeManager->mVolumeArray.AppendElement(vol);
-  return vol;
+  return vol.forget();
 }
 
 //static
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/system/qt/QtHapticFeedback.h firefox-trunk-41.0~a1~hg20150524r245419/dom/system/qt/QtHapticFeedback.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/system/qt/QtHapticFeedback.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/system/qt/QtHapticFeedback.h	2015-05-25 20:43:54.000000000 +0000
@@ -10,4 +10,6 @@
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIHAPTICFEEDBACK
+protected:
+  virtual ~QtHapticFeedback() {}
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/telephony/gonk/TelephonyService.js firefox-trunk-41.0~a1~hg20150524r245419/dom/telephony/gonk/TelephonyService.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/telephony/gonk/TelephonyService.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/telephony/gonk/TelephonyService.js	2015-05-25 20:43:54.000000000 +0000
@@ -1461,7 +1461,7 @@
     }
 
     // Store unique value in the list.
-    disconnectedCalls = [...Set(disconnectedCalls)];
+    disconnectedCalls = [...new Set(disconnectedCalls)];
 
     let callsForStateChanged = [];
 
@@ -1695,37 +1695,4 @@
   }
 };
 
-/**
- * This implements nsISystemMessagesWrapper.wrapMessage(), which provides a
- * plugable way to wrap a "ussd-received" type system message.
- *
- * Please see SystemMessageManager.js to know how it customizes the wrapper.
- */
-function USSDReceivedWrapper() {
-  if (DEBUG) debug("USSDReceivedWrapper()");
-}
-USSDReceivedWrapper.prototype = {
-  // nsISystemMessagesWrapper implementation.
-  wrapMessage: function(aMessage, aWindow) {
-    if (DEBUG) debug("wrapMessage: " + JSON.stringify(aMessage));
-
-    let session = aMessage.sessionEnded ? null :
-      new aWindow.USSDSession(aMessage.serviceId);
-
-    let event = new aWindow.USSDReceivedEvent("ussdreceived", {
-      serviceId: aMessage.serviceId,
-      message: aMessage.message,
-      session: session
-    });
-
-    return event;
-  },
-
-  classDescription: "USSDReceivedWrapper",
-  classID: Components.ID("{d03684ed-ede4-4210-8206-f4f32772d9f5}"),
-  contractID: "@mozilla.org/dom/system-messages/wrapper/ussd-received;1",
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsISystemMessagesWrapper])
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([TelephonyService,
-                                                    USSDReceivedWrapper]);
+this.NSGetFactory = XPCOMUtils.generateNSGetFactory([TelephonyService]);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/telephony/gonk/TelephonyService.manifest firefox-trunk-41.0~a1~hg20150524r245419/dom/telephony/gonk/TelephonyService.manifest
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/telephony/gonk/TelephonyService.manifest	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/telephony/gonk/TelephonyService.manifest	2015-05-25 20:43:54.000000000 +0000
@@ -1,5 +1,3 @@
 component {67d26434-d063-4d28-9f48-5b3189788155} TelephonyService.js
 contract @mozilla.org/telephony/gonktelephonyservice;1 {67d26434-d063-4d28-9f48-5b3189788155}
 
-component {d03684ed-ede4-4210-8206-f4f32772d9f5} TelephonyService.js
-contract @mozilla.org/dom/system-messages/wrapper/ussd-received;1 {d03684ed-ede4-4210-8206-f4f32772d9f5}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/telephony/gonk/USSDReceivedWrapper.js firefox-trunk-41.0~a1~hg20150524r245419/dom/telephony/gonk/USSDReceivedWrapper.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/telephony/gonk/USSDReceivedWrapper.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/telephony/gonk/USSDReceivedWrapper.js	2015-05-25 20:43:54.000000000 +0000
@@ -0,0 +1,82 @@
+/* -*- 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 NS_PREFBRANCH_PREFCHANGE_TOPIC_ID = "nsPref:changed";
+const kPrefRilDebuggingEnabled = "ril.debugging.enabled";
+
+let DEBUG;
+function debug(s) {
+  dump("USSDReceivedWrapper: " + s + "\n");
+}
+
+XPCOMUtils.defineLazyGetter(this, "RIL", function () {
+  let obj = {};
+  Cu.import("resource://gre/modules/ril_consts.js", obj);
+  return obj;
+});
+
+/**
+ * This implements nsISystemMessagesWrapper.wrapMessage(), which provides a
+ * plugable way to wrap a "ussd-received" type system message.
+ *
+ * Please see SystemMessageManager.js to know how it customizes the wrapper.
+ */
+function USSDReceivedWrapper() {
+  this._updateDebugFlag();
+  Services.prefs.addObserver(kPrefRilDebuggingEnabled, this, false);
+  if (DEBUG) debug("USSDReceivedWrapper()");
+}
+USSDReceivedWrapper.prototype = {
+  _updateDebugFlag: function() {
+    try {
+      DEBUG = RIL.DEBUG_RIL ||
+              Services.prefs.getBoolPref(kPrefRilDebuggingEnabled);
+    } catch (e) {}
+  },
+
+  /**
+   * nsIObserver interface.
+   */
+  observe: function(aSubject, aTopic, aData) {
+    switch (aTopic) {
+      case NS_PREFBRANCH_PREFCHANGE_TOPIC_ID:
+        if (aData === kPrefRilDebuggingEnabled) {
+          this._updateDebugFlag();
+        }
+        break;
+    }
+  },
+
+  // nsISystemMessagesWrapper implementation.
+  wrapMessage: function(aMessage, aWindow) {
+    if (DEBUG) debug("wrapMessage: " + JSON.stringify(aMessage));
+
+    let session = aMessage.sessionEnded ? null :
+      new aWindow.USSDSession(aMessage.serviceId);
+
+    let event = new aWindow.USSDReceivedEvent("ussdreceived", {
+      serviceId: aMessage.serviceId,
+      message: aMessage.message,
+      session: session
+    });
+
+    return event;
+  },
+
+  classDescription: "USSDReceivedWrapper",
+  classID: Components.ID("{d03684ed-ede4-4210-8206-f4f32772d9f5}"),
+  contractID: "@mozilla.org/dom/system-messages/wrapper/ussd-received;1",
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
+                                         Ci.nsISystemMessagesWrapper])
+};
+
+this.NSGetFactory = XPCOMUtils.generateNSGetFactory([USSDReceivedWrapper]);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/telephony/gonk/USSDReceivedWrapper.manifest firefox-trunk-41.0~a1~hg20150524r245419/dom/telephony/gonk/USSDReceivedWrapper.manifest
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/telephony/gonk/USSDReceivedWrapper.manifest	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/telephony/gonk/USSDReceivedWrapper.manifest	2015-05-25 20:43:54.000000000 +0000
@@ -0,0 +1,2 @@
+component {d03684ed-ede4-4210-8206-f4f32772d9f5} USSDReceivedWrapper.js
+contract @mozilla.org/dom/system-messages/wrapper/ussd-received;1 {d03684ed-ede4-4210-8206-f4f32772d9f5}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/telephony/ipc/TelephonyIPCSerializer.h firefox-trunk-41.0~a1~hg20150524r245419/dom/telephony/ipc/TelephonyIPCSerializer.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/telephony/ipc/TelephonyIPCSerializer.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/telephony/ipc/TelephonyIPCSerializer.h	2015-05-25 20:43:54.000000000 +0000
@@ -37,10 +37,13 @@
     uint32_t clientId;
     uint32_t callIndex;
     uint16_t callState;
+    nsString disconnectedReason;
+
     nsString number;
     uint16_t numberPresentation;
     nsString name;
     uint16_t namePresentation;
+
     bool isOutgoing;
     bool isEmergency;
     bool isConference;
@@ -50,10 +53,13 @@
     aParam->GetClientId(&clientId);
     aParam->GetCallIndex(&callIndex);
     aParam->GetCallState(&callState);
+    aParam->GetDisconnectedReason(disconnectedReason);
+
     aParam->GetNumber(number);
     aParam->GetNumberPresentation(&numberPresentation);
     aParam->GetName(name);
     aParam->GetNamePresentation(&namePresentation);
+
     aParam->GetIsOutgoing(&isOutgoing);
     aParam->GetIsEmergency(&isEmergency);
     aParam->GetIsConference(&isConference);
@@ -63,10 +69,13 @@
     WriteParam(aMsg, clientId);
     WriteParam(aMsg, callIndex);
     WriteParam(aMsg, callState);
+    WriteParam(aMsg, disconnectedReason);
+
     WriteParam(aMsg, number);
     WriteParam(aMsg, numberPresentation);
     WriteParam(aMsg, name);
     WriteParam(aMsg, namePresentation);
+
     WriteParam(aMsg, isOutgoing);
     WriteParam(aMsg, isEmergency);
     WriteParam(aMsg, isConference);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/telephony/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/telephony/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/telephony/moz.build	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/telephony/moz.build	2015-05-25 20:43:54.000000000 +0000
@@ -63,6 +63,8 @@
     EXTRA_COMPONENTS += [
         'gonk/TelephonyAudioService.js',
         'gonk/TelephonyAudioService.manifest',
+        'gonk/USSDReceivedWrapper.js',
+        'gonk/USSDReceivedWrapper.manifest',
     ]
     if not CONFIG['DISABLE_MOZ_RIL_GEOLOC']:
         EXTRA_COMPONENTS += [
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/telephony/test/marionette/test_mmi_change_barring_password.js firefox-trunk-41.0~a1~hg20150524r245419/dom/telephony/test/marionette/test_mmi_change_barring_password.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/telephony/test/marionette/test_mmi_change_barring_password.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/telephony/test/marionette/test_mmi_change_barring_password.js	2015-05-25 20:43:54.000000000 +0000
@@ -41,16 +41,17 @@
       name: "emMmiErrorInvalidPassword"
     }
   },
-  // TODO: Bug 906603 - B2G RIL: Support Change Call Barring Password on Emulator.
-  // Currently emulator doesn't support REQUEST_CHANGE_BARRING_PASSWORD, so we
-  // expect to get a 'RequestNotSupported' error here.
+  // Expect to succeed.
   {
-    password: "0000",
+    password: "0000",  // 0000 is the default password for call barring
     newPassword: "1234",
-    newPasswordAgain: "1234",
-    expectedError: {
-      name: "RequestNotSupported"
-    }
+    newPasswordAgain: "1234"
+  },
+  // Restore to the default password
+  {
+    password: "1234",
+    newPassword: "0000",
+    newPasswordAgain: "0000"
   }
 ];
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/bugs/test_bug291377.html firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/bugs/test_bug291377.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/bugs/test_bug291377.html	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/bugs/test_bug291377.html	2015-05-25 20:43:55.000000000 +0000
@@ -26,7 +26,7 @@
   /* Check that we can touch various properties */
   isnot(e.lineNumber, undefined, "Unexpected line number"); //This line number is dependent on the implementation of the SpecialPowers API
   is(e.name, "NS_ERROR_MALFORMED_URI", "Unexpected exception name");
-  ise(e.message, "", "Should not have a message for this case");
+  is(e.message, "", "Should not have a message for this case");
   isnot(e.result, 0, "Should have a result");
   
   is(e.result, SpecialPowers.Cr.NS_ERROR_MALFORMED_URI);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/bugs/test_resize_move_windows.html firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/bugs/test_resize_move_windows.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/bugs/test_resize_move_windows.html	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/bugs/test_resize_move_windows.html	2015-05-25 20:43:56.000000000 +0000
@@ -111,18 +111,18 @@
   }
 
   function changeTest() {
-    ise(getProp("innerWidth"), originalWidth,
-        "Window width shouldn't have changed");
-    ise(getProp("innerHeight"), originalHeight,
-        "Window height shouldn't have changed");
-    ise(getProp("screenX"), originalX,
-        "Window x position shouldn't have changed");
-    ise(getProp("screenY"), originalY,
-        "Window y position shouldn't have changed");
-    ise(getProp("outerWidth"), oWidth,
-        "Window outerWidth shouldn't have changed");
-    ise(getProp("outerHeight"), oHeight,
-        "Window outerHeight shouldn't have changed");
+    is(getProp("innerWidth"), originalWidth,
+       "Window width shouldn't have changed");
+    is(getProp("innerHeight"), originalHeight,
+       "Window height shouldn't have changed");
+    is(getProp("screenX"), originalX,
+       "Window x position shouldn't have changed");
+    is(getProp("screenY"), originalY,
+       "Window y position shouldn't have changed");
+    is(getProp("outerWidth"), oWidth,
+       "Window outerWidth shouldn't have changed");
+    is(getProp("outerHeight"), oHeight,
+       "Window outerHeight shouldn't have changed");
   }
 
   /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/chrome/chrome.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/chrome/chrome.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/chrome/chrome.ini	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/chrome/chrome.ini	2015-05-25 20:43:56.000000000 +0000
@@ -7,6 +7,7 @@
   MozDomFullscreen_chrome.xul
   child_focus_frame.html
   file_DOM_element_instanceof.xul
+  file_MozDomFullscreen.html
   file_bug799299.xul
   file_bug800817.xul
   file_bug830858.xul
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/chrome/file_MozDomFullscreen.html firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/chrome/file_MozDomFullscreen.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/chrome/file_MozDomFullscreen.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/chrome/file_MozDomFullscreen.html	2015-05-25 20:43:56.000000000 +0000
@@ -0,0 +1,8 @@
+<html>
+<head>
+</head>
+<body style="background-color: blue;">
+<p>Outer doc</p>
+<iframe id="innerFrame" src="http://mochi.test:8888/"></iframe>
+</body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/chrome/MozDomFullscreen_chrome.xul firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/chrome/MozDomFullscreen_chrome.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/chrome/MozDomFullscreen_chrome.xul	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/chrome/MozDomFullscreen_chrome.xul	2015-05-25 20:43:56.000000000 +0000
@@ -2,22 +2,21 @@
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
 <?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
 <!--
-  Test that "MozEnteredFullscreen" is dispatched to chrome on documents that enter fullscreen.
+  Test that "MozDOMFullscreen:*" events are dispatched to chrome on documents that use DOM fullscreen.
 
   Test Description:
   
   This chrome window has a browser. The browser's contentDocument (the "outer document")
   in turn has an iframe (the "inner document").
   
-  We request fullscreen in the outer document, and check that MozEnteredDomFullscreen is
-  dispatched to chrome, targeted at the outer document.
+  We request fullscreen in the outer document, and check that MozDOMFullscreen:Entered and
+  MozDOMFullscreen:NewOrigin are dispatched to chrome, targeted at the outer document.
   
-  Then we request fullscreen in the inner document, and check that MozEnteredDomFullscreen
+  Then we request fullscreen in the inner document, and check that MozDOMFullscreen:NewOrigin
   is dispatched to chrome, targeted at the inner document.
   
-  Then we cancel fullscreen in the inner document, and check that MozEnteredDomFullscreen is
-  dispatched again to chrome, targeted at the outer document. This still happens, since the
-  outer document's domain was never approved for fullscreen.
+  Then we cancel fullscreen in the inner document, and check that MozDOMFullscreen:NewOrigin is
+  dispatched again to chrome, targeted at the outer document.
 -->
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="start();">
 
@@ -38,39 +37,55 @@
 var gOuterDoc = null;
 var gInnerDoc = null;
 
+var gReceivedFullscreenEnteredEvent = false;
+var gReceivedNewOriginEvent = false;
 function firstEntry(event) {
-  is(event.target, gOuterDoc, "First MozEnteredDomFullscreen should be targeted at outer doc");
-  window.removeEventListener("MozEnteredDomFullscreen", firstEntry, false);
+  if (event.type == "MozDOMFullscreen:Entered") {
+    window.removeEventListener("MozDOMFullscreen:Entered", firstEntry, false);
+    ok(!gReceivedFullscreenEnteredEvent, "MozDOMFullscreen:Entered shouldn't have been triggered twice");
+    gReceivedFullscreenEnteredEvent = true;
+  } else if (event.type == "MozDOMFullscreen:NewOrigin") {
+    window.removeEventListener("MozDOMFullscreen:NewOrigin", firstEntry, false);
+    ok(!gReceivedNewOriginEvent, "MozDOMFullscreen:NewOrigin shouldn't have been triggered twice");
+    gReceivedNewOriginEvent = true;
+  } else {
+    ok(false, "Unknown event received");
+  }
+  is(event.target, gOuterDoc, "First " + event.type + " should be targeted at outer doc");
+  if (!gReceivedFullscreenEnteredEvent || !gReceivedNewOriginEvent) {
+    return;
+  }
+
   ok(gOuterDoc.mozFullScreenElement != null, "Outer doc should be in fullscreen");
   gInnerDoc = gOuterDoc.getElementById("innerFrame").contentDocument;
-  window.addEventListener("MozEnteredDomFullscreen", secondEntry, false);
+  window.addEventListener("MozDOMFullscreen:NewOrigin", secondEntry, false);
   gInnerDoc.defaultView.focus();
   gInnerDoc.body.mozRequestFullScreen();
 }
 
 function secondEntry(event) {
-  is(event.target, gInnerDoc, "Second MozEnteredDomFullscreen should be targeted at inner doc");
+  is(event.target, gInnerDoc, "Second MozDOMFullscreen:NewOrigin should be targeted at inner doc");
   ok(gInnerDoc.mozFullScreenElement != null, "Inner doc should be in fullscreen");
-  window.removeEventListener("MozEnteredDomFullscreen", secondEntry, false);
-  window.addEventListener("MozEnteredDomFullscreen", thirdEntry, false);
+  window.removeEventListener("MozDOMFullscreen:NewOrigin", secondEntry, false);
+  window.addEventListener("MozDOMFullscreen:NewOrigin", thirdEntry, false);
   gInnerDoc.mozCancelFullScreen();
 }
 
 function thirdEntry(event) {
-  is(event.target, gOuterDoc, "Third MozEnteredDomFullscreen should be targeted at outer doc");
+  is(event.target, gOuterDoc, "Third MozDOMFullscreen:NewOrigin should be targeted at outer doc");
   ok(gOuterDoc.mozFullScreenElement != null, "Outer doc return to fullscreen after cancel fullscreen in inner doc");
-  window.removeEventListener("MozEnteredDomFullscreen", thirdEntry, false);
-  window.removeEventListener("MozExitedDomFullscreen", earlyExit, false);
-  window.addEventListener("MozExitedDomFullscreen", lastExit, false);
+  window.removeEventListener("MozDOMFullscreen:NewOrigin", thirdEntry, false);
+  window.removeEventListener("MozDOMFullscreen:Exited", earlyExit, false);
+  window.addEventListener("MozDOMFullscreen:Exited", lastExit, false);
   gOuterDoc.mozCancelFullScreen();
 }
 
 function earlyExit(event) {
-  ok(false, "MozExitedDomFullscreen should only be triggered after cancel all fullscreen");
+  ok(false, "MozDOMFullscreen:Exited should only be triggered after cancel all fullscreen");
 }
 
 function lastExit(event) {
-  is(event.target, gOuterDoc, "MozExitedDomFullscreen should be targeted at the last exited doc");
+  is(event.target, gOuterDoc, "MozDOMFullscreen:Exited should be targeted at the last exited doc");
   ok(gOuterDoc.mozFullScreenElement == null, "Fullscreen should have been fully exited");
   window.opener.wrappedJSObject.done();
 }
@@ -81,15 +96,14 @@
       gBrowser = document.getElementById("browser");
       gOuterDoc = gBrowser.contentDocument;
       gBrowser.contentWindow.focus();
-      window.addEventListener("MozEnteredDomFullscreen", firstEntry, false);
-      window.addEventListener("MozExitedDomFullscreen", earlyExit, false);
+      window.addEventListener("MozDOMFullscreen:Entered", firstEntry, false);
+      window.addEventListener("MozDOMFullscreen:NewOrigin", firstEntry, false);
       gOuterDoc.body.mozRequestFullScreen();
     });
 }
 
 ]]>
 </script>
-<!-- chrome://mochitests/content/chrome/dom/tests/mochitest/chrome/test_MozEnteredDomFullscreen_event.xul -->
-<browser type="content" id="browser" width="400" height="400" src="http://mochi.test:8888/tests/dom/tests/mochitest/general/file_MozDomFullscreen.html"/>
+<browser type="content" id="browser" width="400" height="400" src="file_MozDomFullscreen.html"/>
 
 </window>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/fetch_test_framework.js firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/fetch_test_framework.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/fetch_test_framework.js	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/fetch_test_framework.js	2015-05-25 20:44:02.000000000 +0000
@@ -1,12 +1,25 @@
 function testScript(script) {
+  function setupPrefs() {
+    return new Promise(function(resolve, reject) {
+      SpecialPowers.pushPrefEnv({
+        "set": [["dom.serviceWorkers.enabled", true],
+                ["dom.serviceWorkers.testing.enabled", true],
+                ["dom.serviceWorkers.exemptFromPerDomainMax", true]]
+      }, resolve);
+    });
+  }
+
   function workerTest() {
     return new Promise(function(resolve, reject) {
       var worker = new Worker("worker_wrapper.js");
       worker.onmessage = function(event) {
+        if (event.data.context != "Worker") {
+          return;
+        }
         if (event.data.type == 'finish') {
           resolve();
         } else if (event.data.type == 'status') {
-          ok(event.data.status, "Worker fetch test: " + event.data.msg);
+          ok(event.data.status, event.data.context + ": " + event.data.msg);
         }
       }
       worker.onerror = function(event) {
@@ -17,6 +30,60 @@
     });
   }
 
+  function serviceWorkerTest() {
+    var isB2G = !navigator.userAgent.includes("Android") &&
+                /Mobile|Tablet/.test(navigator.userAgent);
+    if (isB2G) {
+      // TODO B2G doesn't support running service workers for now due to bug 1137683.
+      dump("Skipping running the test in SW until bug 1137683 gets fixed.\n");
+      return Promise.resolve();
+    }
+    return new Promise(function(resolve, reject) {
+      function setupSW(registration) {
+        var worker = registration.waiting ||
+                     registration.active;
+
+        window.addEventListener("message",function onMessage(event) {
+          if (event.data.context != "ServiceWorker") {
+            return;
+          }
+          if (event.data.type == 'finish') {
+            window.removeEventListener("message", onMessage);
+            registration.unregister()
+              .then(resolve)
+              .catch(reject);
+          } else if (event.data.type == 'status') {
+            ok(event.data.status, event.data.context + ": " + event.data.msg);
+          }
+        }, false);
+
+        worker.onerror = reject;
+
+        var iframe = document.createElement("iframe");
+        iframe.src = "message_receiver.html";
+        iframe.onload = function() {
+          worker.postMessage({ script: script });
+        };
+        document.body.appendChild(iframe);
+      }
+
+      navigator.serviceWorker.register("worker_wrapper.js", {scope: "."})
+        .then(function(registration) {
+          if (registration.installing) {
+            var done = false;
+            registration.installing.onstatechange = function() {
+              if (!done) {
+                done = true;
+                setupSW(registration);
+              }
+            };
+          } else {
+            setupSW(registration);
+          }
+        });
+    });
+  }
+
   function windowTest() {
     return new Promise(function(resolve, reject) {
       var scriptEl = document.createElement("script");
@@ -29,13 +96,19 @@
   }
 
   SimpleTest.waitForExplicitFinish();
-  // We have to run the window and worker tests sequentially since some tests
-  // set and compare cookies and running in parallel can lead to conflicting
-  // values.
-  windowTest()
+  // We have to run the window, worker and service worker tests sequentially
+  // since some tests set and compare cookies and running in parallel can lead
+  // to conflicting values.
+  setupPrefs()
+    .then(function() {
+      return windowTest();
+    })
     .then(function() {
       return workerTest();
     })
+    .then(function() {
+      return serviceWorkerTest();
+    })
     .catch(function(e) {
       ok(false, "Some test failed in " + script);
       info(e);
@@ -43,7 +116,11 @@
       return Promise.resolve();
     })
     .then(function() {
-      SimpleTest.finish();
+      if (parent && parent.finishTest) {
+        parent.finishTest();
+      } else {
+        SimpleTest.finish();
+      }
     });
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/message_receiver.html firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/message_receiver.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/message_receiver.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/message_receiver.html	2015-05-25 20:44:02.000000000 +0000
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<script>
+  navigator.serviceWorker.onmessage = function(e) {
+    window.parent.postMessage(e.data, "*");
+  };
+</script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/mochitest.ini	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/mochitest.ini	2015-05-25 20:44:02.000000000 +0000
@@ -11,13 +11,34 @@
   test_response.js
   utils.js
   worker_wrapper.js
+  message_receiver.html
+  reroute.html
+  reroute.js
+  reroute.js^headers^
+  sw_reroute.js
 
 [test_headers.html]
+[test_headers_sw_reroute.html]
+skip-if = buildapp == 'b2g' # Bug 1137683
 [test_headers_mainthread.html]
 [test_fetch_app_protocol.html]
 [test_fetch_basic.html]
+[test_fetch_basic_sw_reroute.html]
+skip-if = buildapp == 'b2g' # Bug 1137683
 [test_fetch_basic_http.html]
+[test_fetch_basic_http_sw_reroute.html]
+skip-if = true # Bug 1122161, need proper support for redirects
+#skip-if = buildapp == 'b2g' # Bug 1137683
 [test_fetch_cors.html]
+[test_fetch_cors_sw_reroute.html]
+skip-if = true # Bug 1122161, need proper support for redirects
+#skip-if = buildapp == 'b2g' # Bug 1137683
 [test_formdataparsing.html]
+[test_formdataparsing_sw_reroute.html]
+skip-if = buildapp == 'b2g' # Bug 1137683
 [test_request.html]
+[test_request_sw_reroute.html]
+skip-if = buildapp == 'b2g' # Bug 1137683
 [test_response.html]
+[test_response_sw_reroute.html]
+skip-if = buildapp == 'b2g' # Bug 1137683
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/reroute.html firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/reroute.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/reroute.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/reroute.html	2015-05-25 20:44:02.000000000 +0000
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<script>
+["SimpleTest", "ok", "info", "is", "$"]
+  .forEach((v) => window[v] = window.parent[v]);
+</script>
+<script type="text/javascript" src="utils.js"> </script>
+<script type="text/javascript" src="fetch_test_framework.js"> </script>
+<script>
+testScript(location.search.substring(1) + ".js");
+</script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/reroute.js firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/reroute.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/reroute.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/reroute.js	2015-05-25 20:44:02.000000000 +0000
@@ -0,0 +1,3 @@
+onfetch = function(e) {
+  e.respondWith(fetch(e.request));
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/reroute.js^headers^ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/reroute.js^headers^
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/reroute.js^headers^	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/reroute.js^headers^	2015-05-25 20:44:02.000000000 +0000
@@ -0,0 +1 @@
+Service-Worker-Allowed: /
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/sw_reroute.js firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/sw_reroute.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/sw_reroute.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/sw_reroute.js	2015-05-25 20:44:02.000000000 +0000
@@ -0,0 +1,29 @@
+var gRegistration;
+
+function testScript(script) {
+  function setupSW(registration) {
+    gRegistration = registration;
+
+    var iframe = document.createElement("iframe");
+    iframe.src = "reroute.html?" + script.replace(".js", "");
+    document.body.appendChild(iframe);
+  }
+
+  SpecialPowers.pushPrefEnv({
+    "set": [["dom.serviceWorkers.enabled", true],
+            ["dom.serviceWorkers.testing.enabled", true],
+            ["dom.serviceWorkers.exemptFromPerDomainMax", true]]
+  }, function() {
+    navigator.serviceWorker.ready.then(setupSW);
+    navigator.serviceWorker.register("reroute.js", {scope: "/"});
+  });
+}
+
+function finishTest() {
+  gRegistration.unregister().then(SimpleTest.finish, function(e) {
+    dump("unregistration failed: " + e + "\n");
+    SimpleTest.finish();
+  });
+}
+
+SimpleTest.waitForExplicitFinish();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/test_fetch_app_protocol.html firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/test_fetch_app_protocol.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/test_fetch_app_protocol.html	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/test_fetch_app_protocol.html	2015-05-25 20:44:02.000000000 +0000
@@ -26,8 +26,7 @@
   return new Promise((resolve, reject) => {
     SpecialPowers.setAllAppsLaunchable(true);
     SpecialPowers.pushPrefEnv({'set': [
-      ['dom.mozBrowserFramesEnabled', true],
-      ['security.uri.allow_scheme_mismatch', true]
+      ['dom.mozBrowserFramesEnabled', true]
     ]}, () => {
       SpecialPowers.pushPermissions([
         { 'type': 'webapps-manage', 'allow': 1, 'context': document },
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/test_fetch_basic_http_sw_reroute.html firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/test_fetch_basic_http_sw_reroute.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/test_fetch_basic_http_sw_reroute.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/test_fetch_basic_http_sw_reroute.html	2015-05-25 20:44:02.000000000 +0000
@@ -0,0 +1,22 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Bug 1039846 - Test fetch() http fetching in worker</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<p id="display"></p>
+<div id="content" style="display: none"></div>
+<pre id="test"></pre>
+<script type="text/javascript" src="sw_reroute.js"> </script>
+<script class="testbody" type="text/javascript">
+testScript("test_fetch_basic_http.js");
+</script>
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/test_fetch_basic_sw_reroute.html firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/test_fetch_basic_sw_reroute.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/test_fetch_basic_sw_reroute.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/test_fetch_basic_sw_reroute.html	2015-05-25 20:44:02.000000000 +0000
@@ -0,0 +1,22 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Bug 1039846 - Test fetch() function in worker</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<p id="display"></p>
+<div id="content" style="display: none"></div>
+<pre id="test"></pre>
+<script type="text/javascript" src="sw_reroute.js"> </script>
+<script class="testbody" type="text/javascript">
+testScript("test_fetch_basic.js");
+</script>
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/test_fetch_cors_sw_reroute.html firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/test_fetch_cors_sw_reroute.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/test_fetch_cors_sw_reroute.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/test_fetch_cors_sw_reroute.html	2015-05-25 20:44:02.000000000 +0000
@@ -0,0 +1,22 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Bug 1039846 - Test fetch() CORS mode</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<p id="display"></p>
+<div id="content" style="display: none"></div>
+<pre id="test"></pre>
+<script type="text/javascript" src="sw_reroute.js"> </script>
+<script class="testbody" type="text/javascript">
+testScript("test_fetch_cors.js");
+</script>
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/test_formdataparsing_sw_reroute.html firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/test_formdataparsing_sw_reroute.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/test_formdataparsing_sw_reroute.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/test_formdataparsing_sw_reroute.html	2015-05-25 20:44:02.000000000 +0000
@@ -0,0 +1,22 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Bug 1109751 - Test FormData parsing</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<p id="display"></p>
+<div id="content" style="display: none"></div>
+<pre id="test"></pre>
+<script type="text/javascript" src="sw_reroute.js"> </script>
+<script class="testbody" type="text/javascript">
+testScript("test_formdataparsing.js");
+</script>
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/test_headers_sw_reroute.html firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/test_headers_sw_reroute.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/test_headers_sw_reroute.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/test_headers_sw_reroute.html	2015-05-25 20:44:02.000000000 +0000
@@ -0,0 +1,16 @@
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test Fetch Headers - Basic</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 type="text/javascript" src="sw_reroute.js"> </script>
+<script class="testbody" type="text/javascript">
+testScript("test_headers_common.js");
+</script>
+</body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/test_request.html firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/test_request.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/test_request.html	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/test_request.html	2015-05-25 20:44:02.000000000 +0000
@@ -5,7 +5,7 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Bug XXXXXX - Test Request object in worker</title>
+  <title>Test Request object in worker</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/test_request.js firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/test_request.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/test_request.js	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/test_request.js	2015-05-25 20:44:02.000000000 +0000
@@ -442,6 +442,20 @@
   }
 }
 
+// HEAD/GET Requests are not allowed to have a body even when copying another
+// Request.
+function testBug1154268() {
+  var r1 = new Request("/index.html", { method: "POST", body: "Hi there" });
+  ["HEAD", "GET"].forEach(function(method) {
+    try {
+      var r2 = new Request(r1, { method: method });
+      ok(false, method + " Request copied from POST Request with body should fail.");
+    } catch (e) {
+      is(e.name, "TypeError", method + " Request copied from POST Request with body should fail.");
+    }
+  });
+}
+
 function runTest() {
   testDefaultCtor();
   testSimpleUrlParse();
@@ -450,6 +464,7 @@
   testBug1109574();
   testHeaderGuard();
   testModeCorsPreflightEnumValue();
+  testBug1154268();
 
   return Promise.resolve()
     .then(testBodyCreation)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/test_request_sw_reroute.html firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/test_request_sw_reroute.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/test_request_sw_reroute.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/test_request_sw_reroute.html	2015-05-25 20:44:02.000000000 +0000
@@ -0,0 +1,22 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test Request object in worker</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<p id="display"></p>
+<div id="content" style="display: none"></div>
+<pre id="test"></pre>
+<script type="text/javascript" src="sw_reroute.js"> </script>
+<script class="testbody" type="text/javascript">
+testScript("test_request.js");
+</script>
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/test_response_sw_reroute.html firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/test_response_sw_reroute.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/test_response_sw_reroute.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/test_response_sw_reroute.html	2015-05-25 20:44:02.000000000 +0000
@@ -0,0 +1,22 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Bug 1039846 - Test Response object in worker</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<p id="display"></p>
+<div id="content" style="display: none"></div>
+<pre id="test"></pre>
+<script type="text/javascript" src="sw_reroute.js"> </script>
+<script class="testbody" type="text/javascript">
+testScript("test_response.js");
+</script>
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/worker_wrapper.js firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/worker_wrapper.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/fetch/worker_wrapper.js	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/fetch/worker_wrapper.js	2015-05-25 20:44:02.000000000 +0000
@@ -1,31 +1,58 @@
 importScripts("utils.js");
+var client;
+var context;
 
 function ok(a, msg) {
-  postMessage({type: 'status', status: !!a, msg: a + ": " + msg });
+  client.postMessage({type: 'status', status: !!a,
+                      msg: a + ": " + msg, context: context});
 }
 
 function is(a, b, msg) {
-  postMessage({type: 'status', status: a === b, msg: a + " === " + b + ": " + msg });
+  client.postMessage({type: 'status', status: a === b,
+                      msg: a + " === " + b + ": " + msg, context: context});
 }
 
 addEventListener('message', function workerWrapperOnMessage(e) {
   removeEventListener('message', workerWrapperOnMessage);
   var data = e.data;
 
-  var done = function() {
-    postMessage({ type: 'finish' });
+  function loadTest() {
+    var done = function() {
+      client.postMessage({ type: 'finish', context: context });
+    }
+
+    try {
+      importScripts(data.script);
+      // runTest() is provided by the test.
+      runTest().then(done, done);
+    } catch(e) {
+      client.postMessage({
+        type: 'status',
+        status: false,
+        msg: 'worker failed to import ' + data.script + "; error: " + e.message,
+        context: context
+      });
+      done();
+    }
   }
 
-  try {
-    importScripts(data.script);
-    // runTest() is provided by the test.
-    runTest().then(done, done);
-  } catch(e) {
-    postMessage({
-      type: 'status',
-      status: false,
-      msg: 'worker failed to import ' + data.script + "; error: " + e.message
+  if ("ServiceWorker" in self) {
+    self.clients.matchAll().then(function(clients) {
+      for (var i = 0; i < clients.length; ++i) {
+        if (clients[i].url.indexOf("message_receiver.html") > -1) {
+          client = clients[i];
+          break;
+        }
+      }
+      if (!client) {
+        dump("We couldn't find the message_receiver window, the test will fail\n");
+      }
+      context = "ServiceWorker";
+      loadTest();
     });
-    done();
+  } else {
+    client = self;
+    context = "Worker";
+    loadTest();
   }
 });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/general/file_MozDomFullscreen.html firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/general/file_MozDomFullscreen.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/general/file_MozDomFullscreen.html	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/general/file_MozDomFullscreen.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-<html>
-<head>
-</head>
-<body style="background-color: blue;">
-<p>Outer doc</p>
-<iframe id="innerFrame" src="data:text/html,<html><body style='background-color: red;'><p>Inner doc</p></body></html>"></iframe>
-</body>
-</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/general/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/general/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/general/mochitest.ini	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/general/mochitest.ini	2015-05-25 20:44:02.000000000 +0000
@@ -1,7 +1,6 @@
 [DEFAULT]
 support-files =
   497633.html
-  file_MozDomFullscreen.html
   file_bug628069.html
   file_clonewrapper.html
   file_domWindowUtils_scrollbarSize.html
@@ -101,3 +100,4 @@
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_navigation_timing.html]
 skip-if = buildapp == 'b2g' || buildapp == 'mulet'
+[test_bug1161721.html]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/general/test_bug1161721.html firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/general/test_bug1161721.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/general/test_bug1161721.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/general/test_bug1161721.html	2015-05-25 20:44:02.000000000 +0000
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1161721
+-->
+<head>
+  <title>Test for Bug 1161721</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/WindowSnapshot.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=1161721">Mozilla Bug 1161721</a>
+<p id="display"></p>
+
+<div id="content">
+</div>
+
+<pre id="test">
+  <script type="application/javascript">
+    ok(!document.queryCommandSupported("paste"), "Paste isn't supported in non-privilged JavaScript");
+    ok(document.queryCommandSupported("copy"), "Copy is supported in non-privilged JavaScript");
+    ok(document.queryCommandSupported("cut"), "Cut is supported in non-privilged JavaScript");
+
+    ok(SpecialPowers.wrap(document).queryCommandSupported("paste"), "Paste is supported in privilged JavaScript");
+    ok(SpecialPowers.wrap(document).queryCommandSupported("copy"), "Copy is supported in privilged JavaScript");
+    ok(SpecialPowers.wrap(document).queryCommandSupported("cut"), "Cut is supported in privilged JavaScript");
+  </script>
+</pre>
+</body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/general/test_DOMMatrix.html firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/general/test_DOMMatrix.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/general/test_DOMMatrix.html	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/general/test_DOMMatrix.html	2015-05-25 20:44:02.000000000 +0000
@@ -297,7 +297,7 @@
   } catch (e) {
     exn = e;
   }
-  ise(exn, null, "did not throw exception with zero coord for rotateFromVector");
+  is(exn, null, "did not throw exception with zero coord for rotateFromVector");
 
   // Test bad input (2)
   exn = null;
@@ -306,7 +306,7 @@
   } catch (e) {
     exn = e;
   }
-  ise(exn, null, "did not throw exception with zero coord for rotateFromVector");
+  is(exn, null, "did not throw exception with zero coord for rotateFromVector");
 }
 
 // DOMMatrix flipX();
@@ -470,7 +470,7 @@
   // Should be initialised to identity
   cmpMatrix(m, [1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0],
             "DOMMatrix should produce identity matrix");
-  ise(m.is2D, false, "should produce 3d matrix");
+  is(m.is2D, false, "should produce 3d matrix");
 }
 
 // DOMMatrix multiply(in DOMMatrix secondMatrix);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/general/test_interfaces.html firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/general/test_interfaces.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/general/test_interfaces.html	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/general/test_interfaces.html	2015-05-25 20:44:03.000000000 +0000
@@ -231,6 +231,8 @@
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "CameraStateChangeEvent", b2g: true},
 // IMPORTANT: Do not change this list without review from a DOM peer!
+    {name: "CanvasCaptureMediaStream", disabled: true},
+// IMPORTANT: Do not change this list without review from a DOM peer!
     "CanvasGradient",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "CanvasPattern",
@@ -689,7 +691,7 @@
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "MediaRecorder",
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "MediaSource", android: false, linux: false, release: false},
+    {name: "MediaSource", linux: false, release: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "MediaStream",
 // IMPORTANT: Do not change this list without review from a DOM peer!
@@ -915,11 +917,11 @@
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "Selection",
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "ServiceWorker", nightly: true, b2g: false},
+    {name: "ServiceWorker", disabled: true, b2g: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "ServiceWorkerContainer", nightly: true, b2g: false},
+    {name: "ServiceWorkerContainer", disabled: true, b2g: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "ServiceWorkerRegistration", nightly: true, b2g: false},
+    {name: "ServiceWorkerRegistration", disabled: true, b2g: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "SettingsLock",
 // IMPORTANT: Do not change this list without review from a DOM peer!
@@ -933,9 +935,9 @@
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "SimpleTest", xbl: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "SourceBuffer", android: false, linux: false, release: false},
+    {name: "SourceBuffer", linux: false, release: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "SourceBufferList", android: false, linux: false, release: false},
+    {name: "SourceBufferList", linux: false, release: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "SpeechSynthesisEvent", b2g: true},
 // IMPORTANT: Do not change this list without review from a DOM peer!
@@ -1287,7 +1289,7 @@
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "ValidityState",
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "VideoPlaybackQuality", android: false, linux: false, release: false},
+    {name: "VideoPlaybackQuality", linux: false, release: false},
 // 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!
@@ -1390,8 +1392,8 @@
   var isB2G = !isDesktop && !navigator.userAgent.includes("Android");
   var isMac = /Mac OS/.test(navigator.oscpu);
   var isWindows = /Windows/.test(navigator.oscpu);
-  var isLinux = /Linux/.test(navigator.oscpu);
   var isAndroid = navigator.userAgent.includes("Android");
+  var isLinux = /Linux/.test(navigator.oscpu) && !isAndroid;
   var hasPermission = function (aPermissions) {
     var result = false;
     for (var p of aPermissions) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/general/test_paste_selection.html firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/general/test_paste_selection.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/general/test_paste_selection.html	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/general/test_paste_selection.html	2015-05-25 20:44:03.000000000 +0000
@@ -47,8 +47,7 @@
     var clipboardHelper = SpecialPowers.Cc["@mozilla.org/widget/clipboardhelper;1"]
                                        .getService(SpecialPowers.Ci.nsIClipboardHelper);
     clipboardHelper.copyStringToClipboard("COPY TEXT",
-                                          SpecialPowers.Ci.nsIClipboard.kSelectionClipboard,
-                                          document);
+                                          SpecialPowers.Ci.nsIClipboard.kSelectionClipboard);
   }
 
   setTimeout(checkSelectionClipboardText, 50, 0);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/notification/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/notification/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/notification/mochitest.ini	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/notification/mochitest.ini	2015-05-25 20:44:03.000000000 +0000
@@ -1,12 +1,13 @@
 [DEFAULT]
-skip-if = buildapp == 'mulet'
+
 support-files =
   MockServices.js
   NotificationTest.js
 
 [test_notification_basics.html]
 [test_notification_storage.html]
-skip-if = toolkit == 'android' || toolkit == 'gonk' #bug 960762
 [test_bug931307.html]
-skip-if = (toolkit == 'gonk' && debug) #debug-only timeout
 [test_notification_resend.html]
+skip-if = e10s # On e10s, faking the app seems to be failing
+[test_notification_noresend.html]
+skip-if = (toolkit == 'gonk') # Mochitest on Gonk registers an app manifest that messes with the logic
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/notification/NotificationTest.js firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/notification/NotificationTest.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/notification/NotificationTest.js	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/notification/NotificationTest.js	2015-05-25 20:44:03.000000000 +0000
@@ -44,6 +44,19 @@
     })(tests);
   }
 
+  function fakeApp(aManifest) {
+    var aApp = {
+      "origin": "{mochitest}",
+      "manifestURL": aManifest
+    };
+
+    SpecialPowers.injectApp("{mochitest}", aApp);
+  }
+
+  function unfakeApp() {
+    SpecialPowers.rejectApp("{mochitest}");
+  }
+
   var fakeCustomData = (function () {
     var buffer = new ArrayBuffer(2);
     var dv = new DataView(buffer).setInt16(0, 42, true);
@@ -107,6 +120,10 @@
 
     info: info,
 
+    fakeApp: fakeApp,
+
+    unfakeApp: unfakeApp,
+
     customDataMatches: function(dataObj) {
       var url = "http://www.domain.com";
       try {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/notification/test_bug931307.html firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/notification/test_bug931307.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/notification/test_bug931307.html	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/notification/test_bug931307.html	2015-05-25 20:44:03.000000000 +0000
@@ -17,15 +17,16 @@
 var promise = Notification.get();
 promise.then(
   function onSuccess() {
-    ok(true, "No crash!");
-    notification.close();
-    SimpleTest.finish();
+    ok(true, "No error when creating a notification without title");
   },
   function onFailure() {
-    ok(false, "Should not get an error in promise callback");
-    notification.close();
+    ok(false, "Should not throw error when creating a notification without title");
   }
-);
+).then(() => {
+  notification.close();
+}).then(() => {
+  SimpleTest.finish();
+});
 
 </script>
 </pre>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/notification/test_notification_noresend.html firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/notification/test_notification_noresend.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/notification/test_notification_noresend.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/notification/test_notification_noresend.html	2015-05-25 20:44:03.000000000 +0000
@@ -0,0 +1,88 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Testing mozResendAllNotifications() resend behavior for Pages</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="MockServices.js"></script>
+  <script type="text/javascript" src="NotificationTest.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=1159128">Bug 1159128</a>
+<p id="display"></p>
+<div id="content" style="display: none"></div>
+<pre id="test"></pre>
+<script type="text/javascript">
+  var info = NotificationTest.info;
+  var notifications = [];
+
+  SimpleTest.requestFlakyTimeout("untriaged");
+
+  var steps = [
+    function (done) {
+      if (window.Notification) {
+        SpecialPowers.pushPrefEnv({"set": [
+          ["dom.ignore_webidl_scope_checks", true],
+          ]}, done);
+      } else {
+        ok(true, "Notifications are not enabled on the platform.");
+        done();
+      }
+    },
+
+    function (done) {
+      info("Test that we have mozChromeNotifications API");
+      ok(('mozChromeNotifications' in navigator), "should have mozChromeNotifications API");
+      ok(('mozResendAllNotifications' in navigator.mozChromeNotifications), "should have mozResendAllNotifications()");
+      done();
+    },
+
+    function (done) {
+      info("Making sure we have no previous notification pending");
+      var promise = Notification.get();
+      promise.then(function (notifications) {
+        is(notifications.length, 0, "notifications are all cleaned");
+        done();
+      });
+    },
+
+    // The notification is expected to be created and living properly
+    // so it will be accessible via Notification.get(), but NotificationStorage
+    // should not have sent it to NotificationDB.
+    function (done) {
+      info("Sending one notification");
+      var notif = new Notification("title");
+      ok(notif, "Notification object is valid");
+      notifications.push(notif);
+
+      var promise = Notification.get();
+      promise.then(function (notifications) {
+        is(notifications.length, 1, "one notification has been sent");
+        done();
+      });
+    },
+
+    // mozResendAllNotifications will poke directly NotificationDB, so we
+    // expect our notification to NOT have been put there and thus not being
+    // resent.
+    function (done) {
+      info("Trying to resend the notification");
+      var notif = notifications.pop();
+      notif.onclose = function() {
+        done();
+      };
+
+      navigator.mozChromeNotifications.mozResendAllNotifications(function(number) {
+        is(number, 0, "No notification resent");
+        notif.close();
+      });
+    }
+  ];
+
+  MockServices.register();
+  NotificationTest.run(steps, function () {
+    MockServices.unregister();
+  });
+</script>
+</body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/notification/test_notification_resend.html firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/notification/test_notification_resend.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/notification/test_notification_resend.html	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/notification/test_notification_resend.html	2015-05-25 20:44:03.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Testing mozResendAllNotifications() resend behavior</title>
+  <title>Testing mozResendAllNotifications() resend behavior for Apps</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="MockServices.js"></script>
   <script type="text/javascript" src="NotificationTest.js"></script>
@@ -22,17 +22,6 @@
 
   var steps = [
     function (done) {
-      if (window.Notification) {
-        SpecialPowers.pushPrefEnv({"set": [
-          ["dom.ignore_webidl_scope_checks", true],
-          ]}, done);
-      } else {
-        ok(true, "Notifications are not enabled on the platform.");
-        done();
-      }
-    },
-
-    function (done) {
       info("Set manifestURL");
       var request = window.navigator.mozApps.getSelf();
       request.onsuccess = function() {
@@ -47,6 +36,18 @@
     },
 
     function (done) {
+      if (window.Notification) {
+        NotificationTest.fakeApp(manifestURL);
+        SpecialPowers.pushPrefEnv({"set": [
+          ["dom.ignore_webidl_scope_checks", true],
+          ]}, done);
+      } else {
+        ok(true, "Notifications are not enabled on the platform.");
+        done();
+      }
+    },
+
+    function (done) {
       info("Test that we have mozChromeNotifications API");
       ok(('mozChromeNotifications' in navigator), "should have mozChromeNotifications API");
       ok(('mozResendAllNotifications' in navigator.mozChromeNotifications), "should have mozResendAllNotifications()");
@@ -194,11 +195,12 @@
 
         notif2.close();
       });
-    }
+    },
   ];
 
   MockServices.register();
   NotificationTest.run(steps, function () {
+    NotificationTest.unfakeApp();
     MockServices.unregister();
   });
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/notification/test_notification_storage.html firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/notification/test_notification_storage.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/notification/test_notification_storage.html	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/notification/test_notification_storage.html	2015-05-25 20:44:03.000000000 +0000
@@ -15,12 +15,13 @@
 
   SimpleTest.requestFlakyTimeout("untriaged");
 
-  function deleteAllNotifications() {
+  function deleteAllNotifications(done) {
     var promise = Notification.get();
     promise.then(function (notifications) {
       notifications.forEach(function(notification) {
         notification.close();
       });
+      done();
     });
   }
 
@@ -120,10 +121,10 @@
       var promise = Notification.get();
       promise.then(function (notifications) {
         is(notifications.length, 3, "should return 3 notifications");
-        done();
         n1.close();
         n2.close();
         n3.close();
+        done();
       });
     },
 
@@ -134,13 +135,17 @@
       var n = new Notification("test-title" + Math.random());
       n.onclose = function() {
         Notification.get().then(function(notifications) {
-            is(notifications.length, 0, "should return 0 notifications");
-            done();
+          is(notifications.length, 0, "should return 0 notifications");
+          done();
         });
-      }
-      window.setTimeout(function() {
+      };
+      info("Installing 'onshow' for " + n.title);
+      n.onshow = function() {
+        info("Triggered 'onshow' for " + n.title);
+        window.setTimeout(function() {
           NotificationTest.fireCloseEvent(n.title);
-      }, 100);
+        }, 100);
+      };
     }
   ];
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/whatwg/test_bug500328.html firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/whatwg/test_bug500328.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/mochitest/whatwg/test_bug500328.html	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/mochitest/whatwg/test_bug500328.html	2015-05-25 20:44:03.000000000 +0000
@@ -278,19 +278,19 @@
 
   iframeCw.history.back();
   popstateExpected("Going back to page 0 should trigger a popstate.");
-  ise(gLastPopStateEvent.state, null,
-      "Going back to page 0 should pop a null state.");
-  ise(iframeCw.history.state, null,
-      "Going back to page 0 should pop a null state.");
-  ise(iframeCw.location.search, "",
-      "Going back to page 0 should clear the querystring.");
+  is(gLastPopStateEvent.state, null,
+     "Going back to page 0 should pop a null state.");
+  is(iframeCw.history.state, null,
+     "Going back to page 0 should pop a null state.");
+  is(iframeCw.location.search, "",
+     "Going back to page 0 should clear the querystring.");
 
   iframeCw.history.forward();
   popstateExpected("Going forward to page 1 should trigger a popstate.");
   is(JSON.stringify(gLastPopStateEvent.state), JSON.stringify(testObj1),
       "Wrong state object popped after going forward to page 1.");
-  ise(gLastPopStateEvent.state, iframeCw.history.state,
-      "Wrong state object in document after going forward to page 1.");
+  is(gLastPopStateEvent.state, iframeCw.history.state,
+     "Wrong state object in document after going forward to page 1.");
   ok(iframeCw.location.toString().match(/file_bug500328_1.html$/),
       "Going forward to page 1 should leave us at original page.");
 
@@ -300,7 +300,7 @@
   popstateExpected("Going forward to page 2 should trigger a popstate.");
   is(JSON.stringify(gLastPopStateEvent.state), JSON.stringify(testObj2),
      "Wrong state object popped after going forward to page 2.");
-  ise(iframeCw.history.state, gLastPopStateEvent.state,
+  is(iframeCw.history.state, gLastPopStateEvent.state,
      "Wrong state object in document after going forward to page 2.");
   ok(iframeCw.location.toString().match(/file_bug500328_1.html\?test1#foo$/),
      "Going forward to page 2 took us to " + iframeCw.location.toString());
@@ -329,7 +329,7 @@
       "search should be ?test1 after clicking link.");
   is(iframeCw.location.hash, "#1",
       "hash should be #1 after clicking link.");
-  ise(iframeCw.history.state, null,
+  is(iframeCw.history.state, null,
      "Wrong state object in document after clicking link to hash '#1'.");
 
   /*
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/unit/test_xhr_init.js firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/unit/test_xhr_init.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/unit/test_xhr_init.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/unit/test_xhr_init.js	2015-05-25 20:44:03.000000000 +0000
@@ -0,0 +1,16 @@
+function run_test()
+{
+    Components.utils.importGlobalProperties(["XMLHttpRequest"]);
+
+    var x = new XMLHttpRequest({mozAnon: true, mozSystem: false});
+    do_check_true(x.mozAnon);
+    do_check_true(x.mozSystem); // Because we're system principal
+
+    x = new XMLHttpRequest({mozAnon: true});
+    do_check_true(x.mozAnon);
+    do_check_true(x.mozSystem);
+
+    x = new XMLHttpRequest();
+    do_check_false(x.mozAnon);
+    do_check_true(x.mozSystem);
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/unit/xpcshell.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/unit/xpcshell.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/tests/unit/xpcshell.ini	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/tests/unit/xpcshell.ini	2015-05-25 20:44:03.000000000 +0000
@@ -23,3 +23,4 @@
 [test_geolocation_position_unavailable_wrap.js]
 skip-if = os == "mac" || os == "android"
 [test_PromiseDebugging.js]
+[test_xhr_init.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/Animation.webidl firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/Animation.webidl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/Animation.webidl	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/Animation.webidl	2015-05-25 20:44:04.000000000 +0000
@@ -33,9 +33,9 @@
   void cancel ();
   [Throws]
   void finish ();
-  [BinaryName="playFromJS"]
+  [Throws, BinaryName="playFromJS"]
   void play ();
-  [BinaryName="pauseFromJS"]
+  [Throws, BinaryName="pauseFromJS"]
   void pause ();
   /*
   void reverse ();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/CanvasCaptureMediaStream.webidl firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/CanvasCaptureMediaStream.webidl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/CanvasCaptureMediaStream.webidl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/CanvasCaptureMediaStream.webidl	2015-05-25 20:44:04.000000000 +0000
@@ -0,0 +1,17 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * The origin of this IDL file is
+ * https://w3c.github.io/mediacapture-fromelement/index.html
+ *
+ * Copyright © 2015 W3C® (MIT, ERCIM, Keio, Beihang), All Rights Reserved.
+ * W3C liability, trademark and document use rules apply.
+ */
+
+[Pref="canvas.capturestream.enabled"]
+interface CanvasCaptureMediaStream : MediaStream {
+    readonly attribute HTMLCanvasElement canvas;
+    void requestFrame();
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/Clients.webidl firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/Clients.webidl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/Clients.webidl	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/Clients.webidl	2015-05-25 20:44:04.000000000 +0000
@@ -14,6 +14,7 @@
   [Throws]
   Promise<sequence<Client>?> matchAll(optional ClientQueryOptions options);
   Promise<WindowClient> openWindow(USVString url);
+  [Throws]
   Promise<void> claim();
 };
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/CloseEvent.webidl firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/CloseEvent.webidl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/CloseEvent.webidl	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/CloseEvent.webidl	2015-05-25 20:44:04.000000000 +0000
@@ -15,15 +15,7 @@
 {
   readonly attribute boolean wasClean;
   readonly attribute unsigned short code;
-  readonly attribute DOMString? reason;
-
-  [Throws]
-  void initCloseEvent(DOMString aType,
-                      boolean aCanBubble,
-                      boolean aCancelable,
-                      boolean aWasClean,
-                      unsigned short aReasonCode,
-                      DOMString? aReason);
+  readonly attribute DOMString reason;
 };
 
 dictionary CloseEventInit : EventInit
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/CSPDictionaries.webidl firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/CSPDictionaries.webidl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/CSPDictionaries.webidl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/CSPDictionaries.webidl	2015-05-25 20:44: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/. */
+
+/**
+  * Dictionary used to display CSP info.
+  */
+
+dictionary CSP {
+  boolean report-only = false;
+
+  sequence<DOMString> default-src;
+  sequence<DOMString> script-src;
+  sequence<DOMString> object-src;
+  sequence<DOMString> style-src;
+  sequence<DOMString> img-src;
+  sequence<DOMString> media-src;
+  sequence<DOMString> frame-src;
+  sequence<DOMString> font-src;
+  sequence<DOMString> connect-src;
+  sequence<DOMString> report-uri;
+  sequence<DOMString> frame-ancestors;
+  // sequence<DOMString> reflected-xss; // not suppored in Firefox
+  sequence<DOMString> base-uri;
+  sequence<DOMString> form-action;
+  sequence<DOMString> referrer;
+};
+
+dictionary CSPPolicies {
+  sequence<CSP> csp-policies;
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/EventTarget.webidl firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/EventTarget.webidl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/EventTarget.webidl	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/EventTarget.webidl	2015-05-25 20:44:04.000000000 +0000
@@ -43,6 +43,6 @@
 // chrome easier.  This returns the window which can be used to create
 // events to fire at this EventTarget, or null if there isn't one.
 partial interface EventTarget {
-  [ChromeOnly, Exposed=Window]
+  [ChromeOnly, Exposed=Window, BinaryName="ownerGlobalForBindings"]
   readonly attribute WindowProxy? ownerGlobal;
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/File.webidl firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/File.webidl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/File.webidl	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/File.webidl	2015-05-25 20:44:04.000000000 +0000
@@ -45,6 +45,8 @@
   readonly attribute Date lastModifiedDate;
 
   [GetterThrows, ChromeOnly]
-  readonly attribute DOMString mozFullPath;
+  readonly attribute DOMString path;
 
+  [GetterThrows, ChromeOnly]
+  readonly attribute DOMString mozFullPath;
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/FontFaceSet.webidl firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/FontFaceSet.webidl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/FontFaceSet.webidl	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/FontFaceSet.webidl	2015-05-25 20:44:04.000000000 +0000
@@ -36,7 +36,7 @@
   readonly attribute unsigned long size;
   [Throws] void add(FontFace font);
   boolean has(FontFace font);
-  [Throws] boolean delete(FontFace font);
+  boolean delete(FontFace font);
   void clear();
   [NewObject] FontFaceSetIterator entries();
   // Iterator keys();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/HTMLCanvasElement.webidl firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/HTMLCanvasElement.webidl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/HTMLCanvasElement.webidl	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/HTMLCanvasElement.webidl	2015-05-25 20:44:04.000000000 +0000
@@ -43,6 +43,9 @@
   [ChromeOnly]
   void mozFetchAsStream(nsIInputStreamCallback callback, optional DOMString? type = null);
            attribute PrintCallback? mozPrintCallback;
+
+  [Throws, UnsafeInPrerendering, Pref="canvas.capturestream.enabled"]
+  CanvasCaptureMediaStream captureStream(optional double frameRate);
 };
 
 [ChromeOnly]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/HTMLInputElement.webidl firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/HTMLInputElement.webidl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/HTMLInputElement.webidl	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/HTMLInputElement.webidl	2015-05-25 20:44:05.000000000 +0000
@@ -148,7 +148,7 @@
   [GetterThrows]
   readonly attribute long                  textLength;
 
-  [ChromeOnly]
+  [Throws, ChromeOnly]
   sequence<DOMString> mozGetFileNameArray();
 
   [ChromeOnly, Throws]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/MouseEvent.webidl firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/MouseEvent.webidl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/MouseEvent.webidl	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/MouseEvent.webidl	2015-05-25 20:44:05.000000000 +0000
@@ -10,6 +10,7 @@
  * liability, trademark and document use rules apply.
  */
 
+[Constructor(DOMString typeArg, optional MouseEventInit mouseEventInitDict)]
 interface MouseEvent : UIEvent {
   readonly attribute long           screenX;
   readonly attribute long           screenY;
@@ -25,6 +26,11 @@
   readonly attribute unsigned short buttons;
   readonly attribute EventTarget?   relatedTarget;
   readonly attribute DOMString?     region;
+
+  // Pointer Lock
+  readonly attribute long           movementX;
+  readonly attribute long           movementY;
+
   // Deprecated in DOM Level 3:
   [Throws]
   void                              initMouseEvent(DOMString typeArg, 
@@ -46,13 +52,6 @@
   boolean                           getModifierState(DOMString keyArg);
 };
 
-
-// Event Constructor Syntax:
-[Constructor(DOMString typeArg, optional MouseEventInit mouseEventInitDict)]
-partial interface MouseEvent
-{
-};
-
 // Suggested initMouseEvent replacement initializer:
 dictionary MouseEventInit : EventModifierInit {
   // Attributes for MouseEvent:
@@ -64,12 +63,18 @@
   // Note: "buttons" was not previously initializable through initMouseEvent!
   unsigned short buttons       = 0;
   EventTarget?   relatedTarget = null;
+
+  // Pointer Lock
+  long           movementX = 0;
+  long           movementY = 0;
 };
 
 // Mozilla extensions
 partial interface MouseEvent
 {
+  [BinaryName="movementX"]
   readonly attribute long mozMovementX;
+  [BinaryName="movementY"]
   readonly attribute long mozMovementY;
 
   // Finger or touch pressure event value
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/moz.build firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/moz.build	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/moz.build	2015-05-25 20:44:06.000000000 +0000
@@ -65,6 +65,7 @@
     'CameraControl.webidl',
     'CameraManager.webidl',
     'CameraUtil.webidl',
+    'CanvasCaptureMediaStream.webidl',
     'CanvasRenderingContext2D.webidl',
     'CaretPosition.webidl',
     'CDATASection.webidl',
@@ -86,6 +87,7 @@
     'ConvolverNode.webidl',
     'Coordinates.webidl',
     'Crypto.webidl',
+    'CSPDictionaries.webidl',
     'CSPReport.webidl',
     'CSS.webidl',
     'CSSLexer.webidl',
@@ -508,6 +510,7 @@
     'SVGViewElement.webidl',
     'SVGZoomAndPan.webidl',
     'SVGZoomEvent.webidl',
+    'SystemDictionaries.webidl',
     'Telephony.webidl',
     'TelephonyCall.webidl',
     'TelephonyCallGroup.webidl',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/MozMobileConnection.webidl firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/MozMobileConnection.webidl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/MozMobileConnection.webidl	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/MozMobileConnection.webidl	2015-05-25 20:44:05.000000000 +0000
@@ -9,7 +9,7 @@
                                  "cdma/evdo", "cdma", "evdo",
                                  "wcdma/gsm/cdma/evdo", "lte/cdma/evdo",
                                  "lte/wcdma/gsm", "lte/wcdma/gsm/cdma/evdo",
-                                 "lte"};
+                                 "lte", "lte/wcdma"};
 enum MobileRoamingMode {"home", "affiliated", "any"};
 
 [Pref="dom.mobileconnection.enabled"]
@@ -187,7 +187,7 @@
    * result will be a string indicating the current preferred network type.
    * The value will be either 'wcdma/gsm', 'gsm', 'wcdma', 'wcdma/gsm-auto',
    * 'cdma/evdo', 'cdma', 'evdo', 'wcdma/gsm/cdma/evdo', 'lte/cdma/evdo',
-   * 'lte/wcdma/gsm', 'lte/wcdma/gsm/cdma/evdo' or 'lte'.
+   * 'lte/wcdma/gsm', 'lte/wcdma/gsm/cdma/evdo', 'lte' or 'lte/wcdma'.
    *
    * Otherwise, the request's onerror will be called, and the request's error
    * will be either 'RadioNotAvailable', 'RequestNotSupported',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/PopupBoxObject.webidl firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/PopupBoxObject.webidl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/PopupBoxObject.webidl	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/PopupBoxObject.webidl	2015-05-25 20:44:05.000000000 +0000
@@ -130,6 +130,21 @@
                          Event? triggerEvent);
 
   /**
+   * Open the popup anchored at a specific screen rectangle. This function is
+   * similar to openPopup except that that rectangle of the anchor is supplied
+   * rather than an element. The anchor rectangle arguments are screen
+   * coordinates.
+   */
+  void openPopupAtScreenRect(optional DOMString position = "",
+                             long x,
+                             long y,
+                             long width,
+                             long height,
+                             boolean isContextMenu,
+                             boolean attributesOverride,
+                             Event? triggerEvent);
+
+  /**
    * Returns the state of the popup:
    *   closed - the popup is closed
    *   open - the popup is open
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/ProfileTimelineMarker.webidl firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/ProfileTimelineMarker.webidl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/ProfileTimelineMarker.webidl	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/ProfileTimelineMarker.webidl	2015-05-25 20:44:05.000000000 +0000
@@ -4,6 +4,17 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+// For Javascript markers, the |stack| of a ProfileTimelineMarker
+// holds an object of this type.  It intentionally looks like a
+// SavedStack object and is a representation of the frame that is
+// about to be constructed at the entry point.
+dictionary ProfileTimelineStackFrame {
+  long line;
+  long column = 0;
+  DOMString source;
+  DOMString functionDisplayName;
+};
+
 dictionary ProfileTimelineLayerRect {
   long x = 0;
   long y = 0;
@@ -25,4 +36,6 @@
   unsigned short eventPhase;
   /* For Paint markers.  */
   sequence<ProfileTimelineLayerRect> rectangles;
+  /* For Style markers. */
+  DOMString restyleHint;
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/RTCSessionDescription.webidl firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/RTCSessionDescription.webidl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/RTCSessionDescription.webidl	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/RTCSessionDescription.webidl	2015-05-25 20:44:05.000000000 +0000
@@ -10,12 +10,13 @@
 enum RTCSdpType {
   "offer",
   "pranswer",
-  "answer"
+  "answer",
+  "rollback"
 };
 
 dictionary RTCSessionDescriptionInit {
   RTCSdpType? type = null;
-  DOMString? sdp = null;
+  DOMString? sdp = "";
 };
 
 [Pref="media.peerconnection.enabled",
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/SecureElement.webidl firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/SecureElement.webidl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/SecureElement.webidl	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/SecureElement.webidl	2015-05-25 20:44:05.000000000 +0000
@@ -15,6 +15,7 @@
   "SEBadStateError",            // Error occuring as a result of bad state.
   "SEInvalidChannelError",      // Opening a channel failed because no channel is available.
   "SEInvalidApplicationError",  // The requested application was not found on the secure element.
+  "SENotPresentError",          // Secure Element is not present
   "SEGenericError"              // Generic failures.
 };
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/SpeechSynthesisUtterance.webidl firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/SpeechSynthesisUtterance.webidl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/SpeechSynthesisUtterance.webidl	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/SpeechSynthesisUtterance.webidl	2015-05-25 20:44:06.000000000 +0000
@@ -28,4 +28,7 @@
   attribute EventHandler onresume;
   attribute EventHandler onmark;
   attribute EventHandler onboundary;
+
+  [ChromeOnly]
+  readonly attribute DOMString chosenVoiceURI;
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/SystemDictionaries.webidl firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/SystemDictionaries.webidl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/SystemDictionaries.webidl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/SystemDictionaries.webidl	2015-05-25 20:44:06.000000000 +0000
@@ -0,0 +1,22 @@
+/* -*- 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/.
+ *
+ * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
+ * liability, trademark and document use rules apply.
+ */
+
+/*
+ * Used by principals and the script security manager to represent origin
+ * attributes.
+ *
+ * IMPORTANT: If you add any members here, you need to update the
+ * methods on mozilla::OriginAttributes, and bump the CIDs of all
+ * the principal implementations that use OriginAttributes in their
+ * nsISerializable implementations.
+ */
+dictionary OriginAttributesDictionary {
+  unsigned long appId = 0;
+  boolean inBrowser = false;
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/WebGLRenderingContext.webidl firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/WebGLRenderingContext.webidl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/WebGLRenderingContext.webidl	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/WebGLRenderingContext.webidl	2015-05-25 20:44:06.000000000 +0000
@@ -41,6 +41,7 @@
     boolean antialias = true;
     boolean premultipliedAlpha = true;
     boolean preserveDrawingBuffer = false;
+    boolean failIfMajorPerformanceCaveat = false;
 };
 
 interface WebGLBuffer {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/WebSocket.webidl firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/WebSocket.webidl
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/webidl/WebSocket.webidl	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/webidl/WebSocket.webidl	2015-05-25 20:44:06.000000000 +0000
@@ -12,8 +12,7 @@
 
 enum BinaryType { "blob", "arraybuffer" };
 
-[Func="mozilla::dom::WebSocket::PrefEnabled",
- Exposed=(Window,Worker),
+[Exposed=(Window,Worker),
  Constructor(DOMString url),
  Constructor(DOMString url, DOMString protocols),
  Constructor(DOMString url, sequence<DOMString> protocols)]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/wifi/WifiCertService.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/wifi/WifiCertService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/wifi/WifiCertService.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/wifi/WifiCertService.cpp	2015-05-25 20:44:06.000000000 +0000
@@ -14,11 +14,12 @@
 #include "mozilla/Endian.h"
 #include "mozilla/ModuleUtils.h"
 #include "mozilla/RefPtr.h"
+#include "mozilla/dom/File.h"
 #include "mozilla/dom/ToJSValue.h"
 #include "cert.h"
 #include "certdb.h"
 #include "CryptoTask.h"
-#include "nsIDOMFile.h"
+#include "nsIDOMBlob.h"
 #include "nsIWifiService.h"
 #include "nsNetUtil.h"
 #include "nsServiceManagerUtils.h"
@@ -39,7 +40,7 @@
 class ImportCertTask final: public CryptoTask
 {
 public:
-  ImportCertTask(int32_t aId, nsIDOMBlob* aCertBlob,
+  ImportCertTask(int32_t aId, Blob* aCertBlob,
                  const nsAString& aCertPassword,
                  const nsAString& aCertNickname)
     : mBlob(aCertBlob)
@@ -240,24 +241,26 @@
     NS_ENSURE_ARG_POINTER(mBlob);
 
     static const uint64_t MAX_FILE_SIZE = 16384;
-    uint64_t size;
-    nsresult rv = mBlob->GetSize(&size);
-    if (NS_FAILED(rv)) {
-      return rv;
+
+    ErrorResult rv;
+    uint64_t size = mBlob->GetSize(rv);
+    if (NS_WARN_IF(rv.Failed())) {
+      return rv.StealNSResult();
     }
+
     if (size > MAX_FILE_SIZE) {
       return NS_ERROR_FILE_TOO_BIG;
     }
 
     nsCOMPtr<nsIInputStream> inputStream;
-    rv = mBlob->GetInternalStream(getter_AddRefs(inputStream));
-    if (NS_FAILED(rv)) {
-      return rv;
+    mBlob->GetInternalStream(getter_AddRefs(inputStream), rv);
+    if (NS_WARN_IF(rv.Failed())) {
+      return rv.StealNSResult();
     }
 
     rv = NS_ReadInputStreamToString(inputStream, aBuf, (uint32_t)size);
-    if (NS_FAILED(rv)) {
-      return rv;
+    if (NS_WARN_IF(rv.Failed())) {
+      return rv.StealNSResult();
     }
 
     return NS_OK;
@@ -299,7 +302,7 @@
     return NS_OK;
   }
 
-  nsCOMPtr<nsIDOMBlob> mBlob;
+  nsRefPtr<Blob> mBlob;
   nsString mPassword;
   WifiCertServiceResultOptions mResult;
 };
@@ -460,7 +463,8 @@
                             const nsAString& aCertPassword,
                             const nsAString& aCertNickname)
 {
-  RefPtr<CryptoTask> task = new ImportCertTask(aId, aCertBlob, aCertPassword,
+  nsRefPtr<Blob> blob = static_cast<Blob*>(aCertBlob);
+  RefPtr<CryptoTask> task = new ImportCertTask(aId, blob, aCertPassword,
                                                aCertNickname);
   return task->Dispatch("WifiImportCert");
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/wifi/WifiProxyService.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/wifi/WifiProxyService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/wifi/WifiProxyService.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/wifi/WifiProxyService.cpp	2015-05-25 20:44:06.000000000 +0000
@@ -67,9 +67,6 @@
   NS_IMETHOD Run()
   {
     MOZ_ASSERT(!NS_IsMainThread());
-#ifdef MOZ_NUWA_PROCESS
-    NS_SetIgnoreStatusOfCurrentThread();
-#endif
     nsAutoString event;
     gWpaSupplicant->WaitForEvent(event, mInterface);
     if (!event.IsEmpty()) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/wifi/WifiWorker.js firefox-trunk-41.0~a1~hg20150524r245419/dom/wifi/WifiWorker.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/wifi/WifiWorker.js	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/wifi/WifiWorker.js	2015-05-25 20:44:06.000000000 +0000
@@ -3290,6 +3290,17 @@
       }
     }
 
+    function connectToNetwork() {
+      WifiManager.updateNetwork(privnet, (function(ok) {
+        if (!ok) {
+          self._sendMessage(message, false, "Network is misconfigured", msg);
+          return;
+        }
+
+        networkReady();
+      }));
+    }
+
     let ssid = privnet.ssid;
     let networkKey = getNetworkKey(privnet);
     let configured;
@@ -3311,14 +3322,22 @@
       // it can be sorted correctly in _reprioritizeNetworks() because the
       // function sort network based on priority in configure list.
       configured.priority = privnet.priority;
-      WifiManager.updateNetwork(privnet, (function(ok) {
-        if (!ok) {
-          this._sendMessage(message, false, "Network is misconfigured", msg);
-          return;
-        }
 
-        networkReady();
-      }).bind(this));
+      // When investigating Bug 1123680, we observed that gaia may unexpectedly
+      // request to associate with incorrect password before successfully
+      // forgetting the network. It would cause the network unable to connect
+      // subsequently. Aside from preventing the racing forget/associate, we
+      // also try to disable network prior to updating the network.
+      WifiManager.getNetworkId(dequote(configured.ssid), function(netId) {
+        if (netId) {
+          WifiManager.disableNetwork(netId, function() {
+            connectToNetwork();
+          });
+        }
+        else {
+          connectToNetwork();
+        }
+      });
     } else {
       // networkReady, above, calls saveConfig. We want to remember the new
       // network as being enabled, which isn't the default, so we explicitly
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/FileReaderSync.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/FileReaderSync.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/FileReaderSync.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/FileReaderSync.cpp	2015-05-25 20:44:06.000000000 +0000
@@ -56,10 +56,8 @@
                                   JS::MutableHandle<JSObject*> aRetval,
                                   ErrorResult& aRv)
 {
-  uint64_t blobSize;
-  nsresult rv = aBlob.GetSize(&blobSize);
-  if (NS_FAILED(rv)) {
-    aRv.Throw(rv);
+  uint64_t blobSize = aBlob.GetSize(aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
     return;
   }
 
@@ -70,16 +68,14 @@
   }
 
   nsCOMPtr<nsIInputStream> stream;
-  rv = aBlob.GetInternalStream(getter_AddRefs(stream));
-  if (NS_FAILED(rv)) {
-    aRv.Throw(rv);
+  aBlob.GetInternalStream(getter_AddRefs(stream), aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
     return;
   }
 
   uint32_t numRead;
-  rv = stream->Read(bufferData.get(), blobSize, &numRead);
-  if (NS_FAILED(rv)) {
-    aRv.Throw(rv);
+  aRv = stream->Read(bufferData.get(), blobSize, &numRead);
+  if (NS_WARN_IF(aRv.Failed())) {
     return;
   }
   NS_ASSERTION(numRead == blobSize, "failed to read data");
@@ -100,18 +96,16 @@
                                    ErrorResult& aRv)
 {
   nsCOMPtr<nsIInputStream> stream;
-  nsresult rv = aBlob.GetInternalStream(getter_AddRefs(stream));
-  if (NS_FAILED(rv)) {
-    aRv.Throw(rv);
+  aBlob.GetInternalStream(getter_AddRefs(stream), aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
     return;
   }
 
   uint32_t numRead;
   do {
     char readBuf[4096];
-    rv = stream->Read(readBuf, sizeof(readBuf), &numRead);
-    if (NS_FAILED(rv)) {
-      aRv.Throw(rv);
+    aRv = stream->Read(readBuf, sizeof(readBuf), &numRead);
+    if (NS_WARN_IF(aRv.Failed())) {
       return;
     }
 
@@ -131,19 +125,17 @@
                            ErrorResult& aRv)
 {
   nsCOMPtr<nsIInputStream> stream;
-  nsresult rv = aBlob.GetInternalStream(getter_AddRefs(stream));
-  if (NS_FAILED(rv)) {
-    aRv.Throw(rv);
+  aBlob.GetInternalStream(getter_AddRefs(stream), aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
     return;
   }
 
   nsAutoCString encoding;
   unsigned char sniffBuf[3] = { 0, 0, 0 };
   uint32_t numRead;
-  rv = stream->Read(reinterpret_cast<char*>(sniffBuf),
-                    sizeof(sniffBuf), &numRead);
-  if (NS_FAILED(rv)) {
-    aRv.Throw(rv);
+  aRv = stream->Read(reinterpret_cast<char*>(sniffBuf),
+                     sizeof(sniffBuf), &numRead);
+  if (NS_WARN_IF(aRv.Failed())) {
     return;
   }
 
@@ -181,15 +173,13 @@
 
   // Seek to 0 because to undo the BOM sniffing advance. UTF-8 and UTF-16
   // decoders will swallow the BOM.
-  rv = seekable->Seek(nsISeekableStream::NS_SEEK_SET, 0);
-  if (NS_FAILED(rv)) {
-    aRv.Throw(rv);
+  aRv = seekable->Seek(nsISeekableStream::NS_SEEK_SET, 0);
+  if (NS_WARN_IF(aRv.Failed())) {
     return;
   }
 
-  rv = ConvertStream(stream, encoding.get(), aResult);
-  if (NS_FAILED(rv)) {
-    aRv.Throw(rv);
+  aRv = ConvertStream(stream, encoding.get(), aResult);
+  if (NS_WARN_IF(aRv.Failed())) {
     return;
   }
 }
@@ -212,30 +202,25 @@
   scratchResult.AppendLiteral(";base64,");
 
   nsCOMPtr<nsIInputStream> stream;
-  nsresult rv = aBlob.GetInternalStream(getter_AddRefs(stream));
-  if (NS_FAILED(rv)) {
-    aRv.Throw(rv);
+  aBlob.GetInternalStream(getter_AddRefs(stream), aRv);
+  if (NS_WARN_IF(aRv.Failed())){
     return;
   }
 
-  uint64_t size;
-  rv = aBlob.GetSize(&size);
-  if (NS_FAILED(rv)) {
-    aRv.Throw(rv);
+  uint64_t size = aBlob.GetSize(aRv);
+  if (NS_WARN_IF(aRv.Failed())){
     return;
   }
 
   nsCOMPtr<nsIInputStream> bufferedStream;
-  rv = NS_NewBufferedInputStream(getter_AddRefs(bufferedStream), stream, size);
-  if (NS_FAILED(rv)) {
-    aRv.Throw(rv);
+  aRv = NS_NewBufferedInputStream(getter_AddRefs(bufferedStream), stream, size);
+  if (NS_WARN_IF(aRv.Failed())){
     return;
   }
 
   nsAutoString encodedData;
-  rv = Base64EncodeInputStream(bufferedStream, encodedData, size);
-  if (NS_FAILED(rv)) {
-    aRv.Throw(rv);
+  aRv = Base64EncodeInputStream(bufferedStream, encodedData, size);
+  if (NS_WARN_IF(aRv.Failed())){
     return;
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/Navigator.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/Navigator.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/Navigator.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/Navigator.cpp	2015-05-25 20:44:06.000000000 +0000
@@ -143,7 +143,7 @@
     if (!global) {
       MOZ_ASSERT(false, "cannot get global!");
     } else {
-      workerStoreObj = workerStore->WrapObject(aCx, JS::NullPtr());
+      workerStoreObj = workerStore->WrapObject(aCx, nullptr);
       if (!JS_WrapObject(aCx, &workerStoreObj)) {
         MOZ_ASSERT(false, "cannot wrap object for workerStoreObj!");
         workerStoreObj = nullptr;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/RuntimeService.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/RuntimeService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/RuntimeService.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/RuntimeService.cpp	2015-05-25 20:44:06.000000000 +0000
@@ -2391,6 +2391,7 @@
   AssertIsOnMainThread();
   MOZ_ASSERT(aLoadInfo);
   MOZ_ASSERT(aLoadInfo->mResolvedScriptURI);
+  MOZ_ASSERT_IF(aType == WorkerTypeService, aLoadInfo->mServiceWorkerID > 0);
 
   nsRefPtr<WorkerPrivate> workerPrivate;
   {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/ServiceWorkerClient.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/ServiceWorkerClient.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/ServiceWorkerClient.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/ServiceWorkerClient.cpp	2015-05-25 20:44:06.000000000 +0000
@@ -28,17 +28,21 @@
 NS_INTERFACE_MAP_END
 
 ServiceWorkerClientInfo::ServiceWorkerClientInfo(nsIDocument* aDoc)
+  : mWindowId(0)
 {
   MOZ_ASSERT(aDoc);
-  MOZ_ASSERT(aDoc->GetWindow());
-
   nsresult rv = aDoc->GetId(mClientId);
   if (NS_FAILED(rv)) {
     NS_WARNING("Failed to get the UUID of the document.");
   }
 
-  nsRefPtr<nsGlobalWindow> outerWindow = static_cast<nsGlobalWindow*>(aDoc->GetWindow());
-  mWindowId = outerWindow->WindowID();
+  nsRefPtr<nsGlobalWindow> innerWindow = static_cast<nsGlobalWindow*>(aDoc->GetInnerWindow());
+  if (innerWindow) {
+    // XXXcatalinb: The inner window can be null if the document is navigating
+    // and was detached.
+    mWindowId = innerWindow->WindowID();
+  }
+
   aDoc->GetURL(mUrl);
   mVisibilityState = aDoc->VisibilityState();
 
@@ -48,6 +52,8 @@
     NS_WARNING("Failed to get focus information.");
   }
 
+  nsRefPtr<nsGlobalWindow> outerWindow = static_cast<nsGlobalWindow*>(aDoc->GetWindow());
+  MOZ_ASSERT(outerWindow);
   if (!outerWindow->IsTopLevelWindow()) {
     mFrameType = FrameType::Nested;
   } else if (outerWindow->HadOriginalOpener()) {
@@ -85,7 +91,7 @@
   Run()
   {
     AssertIsOnMainThread();
-    nsGlobalWindow* window = nsGlobalWindow::GetOuterWindowWithId(mWindowId);
+    nsGlobalWindow* window = nsGlobalWindow::GetInnerWindowWithId(mWindowId);
     if (!window) {
       return NS_ERROR_FAILURE;
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/ServiceWorkerClients.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/ServiceWorkerClients.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/ServiceWorkerClients.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/ServiceWorkerClients.cpp	2015-05-25 20:44:06.000000000 +0000
@@ -136,6 +136,101 @@
   }
 };
 
+class ResolveClaimRunnable final : public WorkerRunnable
+{
+  nsRefPtr<PromiseWorkerProxy> mPromiseProxy;
+  nsresult mResult;
+
+public:
+  ResolveClaimRunnable(WorkerPrivate* aWorkerPrivate,
+                       PromiseWorkerProxy* aPromiseProxy,
+                       nsresult aResult)
+    : WorkerRunnable(aWorkerPrivate, WorkerThreadModifyBusyCount)
+    , mPromiseProxy(aPromiseProxy)
+    , mResult(aResult)
+  {
+    AssertIsOnMainThread();
+  }
+
+  bool
+  WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate) override
+  {
+    MOZ_ASSERT(aWorkerPrivate);
+    aWorkerPrivate->AssertIsOnWorkerThread();
+
+    Promise* promise = mPromiseProxy->GetWorkerPromise();
+    MOZ_ASSERT(promise);
+
+    if (NS_SUCCEEDED(mResult)) {
+      promise->MaybeResolve(JS::UndefinedHandleValue);
+    } else {
+      promise->MaybeReject(NS_ERROR_DOM_INVALID_STATE_ERR);
+    }
+
+    // Release the reference on the worker thread.
+    mPromiseProxy->CleanUp(aCx);
+
+    return true;
+  }
+};
+
+class ClaimRunnable final : public nsRunnable
+{
+  nsRefPtr<PromiseWorkerProxy> mPromiseProxy;
+  nsCString mScope;
+  // We grab the ID so we don't have to hold a lock the entire time the claim
+  // operation is happening on the main thread.
+  uint64_t mServiceWorkerID;
+
+public:
+  ClaimRunnable(PromiseWorkerProxy* aPromiseProxy, const nsCString& aScope)
+    : mPromiseProxy(aPromiseProxy)
+    , mScope(aScope)
+    , mServiceWorkerID(aPromiseProxy->GetWorkerPrivate()->ServiceWorkerID())
+  {
+    MOZ_ASSERT(aPromiseProxy);
+  }
+
+  NS_IMETHOD
+  Run() override
+  {
+    nsRefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
+    MOZ_ASSERT(swm);
+
+    nsresult rv = swm->ClaimClients(mScope, mServiceWorkerID);
+
+    MutexAutoLock lock(mPromiseProxy->GetCleanUpLock());
+    if (mPromiseProxy->IsClean()) {
+      // Don't resolve the promise if it was already released.
+      return NS_OK;
+    }
+
+    WorkerPrivate* workerPrivate = mPromiseProxy->GetWorkerPrivate();
+    MOZ_ASSERT(workerPrivate);
+
+    nsRefPtr<ResolveClaimRunnable> r =
+      new ResolveClaimRunnable(workerPrivate, mPromiseProxy, rv);
+
+    AutoJSAPI jsapi;
+    jsapi.Init();
+    JSContext* cx = jsapi.cx();
+    if (r->Dispatch(cx)) {
+      return NS_OK;
+    }
+
+    // Dispatch to worker thread failed because the worker is shutting down.
+    // Use a control runnable to release the runnable on the worker thread.
+    nsRefPtr<PromiseWorkerProxyControlRunnable> releaseRunnable =
+      new PromiseWorkerProxyControlRunnable(workerPrivate, mPromiseProxy);
+
+    if (!releaseRunnable->Dispatch(cx)) {
+      NS_RUNTIMEABORT("Failed to dispatch Claim control runnable.");
+    }
+
+    return NS_OK;
+  }
+};
+
 } // anonymous namespace
 
 already_AddRefed<Promise>
@@ -193,14 +288,33 @@
 }
 
 already_AddRefed<Promise>
-ServiceWorkerClients::Claim()
+ServiceWorkerClients::Claim(ErrorResult& aRv)
 {
-  ErrorResult result;
-  nsRefPtr<Promise> promise = Promise::Create(mWorkerScope, result);
-  if (NS_WARN_IF(result.Failed())) {
+  WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate();
+  MOZ_ASSERT(workerPrivate);
+
+  nsRefPtr<Promise> promise = Promise::Create(mWorkerScope, aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
     return nullptr;
   }
 
-  promise->MaybeResolve(JS::UndefinedHandleValue);
+  nsRefPtr<PromiseWorkerProxy> promiseProxy =
+    PromiseWorkerProxy::Create(workerPrivate, promise);
+  if (!promiseProxy->GetWorkerPromise()) {
+    // Don't dispatch if adding the worker feature failed.
+    return promise.forget();
+  }
+
+  nsString scope;
+  mWorkerScope->GetScope(scope);
+
+  nsRefPtr<ClaimRunnable> runnable =
+    new ClaimRunnable(promiseProxy, NS_ConvertUTF16toUTF8(scope));
+
+  aRv = NS_DispatchToMainThread(runnable);
+  if (NS_WARN_IF(aRv.Failed())) {
+    promise->MaybeReject(NS_ERROR_DOM_ABORT_ERR);
+  }
+
   return promise.forget();
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/ServiceWorkerClients.h firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/ServiceWorkerClients.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/ServiceWorkerClients.h	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/ServiceWorkerClients.h	2015-05-25 20:44:06.000000000 +0000
@@ -36,7 +36,7 @@
   OpenWindow(const nsAString& aUrl);
 
   already_AddRefed<Promise>
-  Claim();
+  Claim(ErrorResult& aRv);
 
   JSObject*
   WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/ServiceWorkerContainer.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/ServiceWorkerContainer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/ServiceWorkerContainer.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/ServiceWorkerContainer.cpp	2015-05-25 20:44:06.000000000 +0000
@@ -50,6 +50,13 @@
 }
 
 void
+ServiceWorkerContainer::ControllerChanged(ErrorResult& aRv)
+{
+  mControllerWorker = nullptr;
+  aRv = DispatchTrustedEvent(NS_LITERAL_STRING("controllerchange"));
+}
+
+void
 ServiceWorkerContainer::RemoveReadyPromise()
 {
   nsCOMPtr<nsPIDOMWindow> window = GetOwner();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/ServiceWorkerContainer.h firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/ServiceWorkerContainer.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/ServiceWorkerContainer.h	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/ServiceWorkerContainer.h	2015-05-25 20:44:06.000000000 +0000
@@ -63,14 +63,18 @@
   // DOMEventTargetHelper
   void DisconnectFromOwner() override;
 
+  // Invalidates |mControllerWorker| and dispatches a "controllerchange"
+  // event.
+  void
+  ControllerChanged(ErrorResult& aRv);
+
 private:
   ~ServiceWorkerContainer();
 
   void RemoveReadyPromise();
 
   // This only changes when a worker hijacks everything in its scope by calling
-  // replace().
-  // FIXME(nsm): Bug 982711. Provide API to let SWM invalidate this.
+  // claim.
   nsRefPtr<workers::ServiceWorker> mControllerWorker;
 
   nsRefPtr<Promise> mReadyPromise;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/ServiceWorkerManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/ServiceWorkerManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/ServiceWorkerManager.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/ServiceWorkerManager.cpp	2015-05-25 20:44:06.000000000 +0000
@@ -445,7 +445,7 @@
     JS::Rooted<JSString*> msg(cx, msgval.toString());
 
     JS::Rooted<JS::Value> error(cx);
-    if (!JS::CreateError(cx, JSEXN_ERR, JS::NullPtr(), fn, aErrorDesc.mLineno,
+    if (!JS::CreateError(cx, JSEXN_ERR, nullptr, fn, aErrorDesc.mLineno,
                          aErrorDesc.mColno, nullptr, msg, &error)) {
       JS_ClearPendingException(cx);
       mPromise->MaybeReject(NS_ERROR_DOM_ABORT_ERR);
@@ -2137,6 +2137,7 @@
 
   MOZ_ASSERT(!aInfo->CacheName().IsEmpty());
   loadInfo.mServiceWorkerCacheName = aInfo->CacheName();
+  loadInfo.mServiceWorkerID = aInfo->ID();
 
   RuntimeService* rs = RuntimeService::GetOrCreateService();
   if (!rs) {
@@ -2330,14 +2331,17 @@
 ServiceWorkerManager::MaybeStartControlling(nsIDocument* aDoc)
 {
   AssertIsOnMainThread();
+
+  // We keep a set of documents that service workers may choose to start
+  // controlling using claim().
+  MOZ_ASSERT(!mAllDocuments.Contains(aDoc));
+  mAllDocuments.PutEntry(aDoc);
+
   nsRefPtr<ServiceWorkerRegistrationInfo> registration =
     GetServiceWorkerRegistrationInfo(aDoc);
   if (registration) {
     MOZ_ASSERT(!mControlledDocuments.Contains(aDoc));
-    registration->StartControllingADocument();
-    // Use the already_AddRefed<> form of Put to avoid the addref-deref since
-    // we don't need the registration pointer in this function anymore.
-    mControlledDocuments.Put(aDoc, registration.forget());
+    StartControllingADocument(registration, aDoc);
   }
 }
 
@@ -2351,14 +2355,35 @@
   // it will always call MaybeStopControlling() even if there isn't an
   // associated registration. So this check is required.
   if (registration) {
-    registration->StopControllingADocument();
-    if (!registration->IsControllingDocuments()) {
-      if (registration->mPendingUninstall) {
-        registration->Clear();
-        RemoveRegistration(registration);
-      } else {
-        registration->TryToActivate();
-      }
+    StopControllingADocument(registration);
+  }
+
+  if (mAllDocuments.Contains(aDoc)) {
+    mAllDocuments.RemoveEntry(aDoc);
+  }
+}
+
+void
+ServiceWorkerManager::StartControllingADocument(ServiceWorkerRegistrationInfo* aRegistration,
+                                                nsIDocument* aDoc)
+{
+  MOZ_ASSERT(aRegistration);
+  MOZ_ASSERT(aDoc);
+
+  aRegistration->StartControllingADocument();
+  mControlledDocuments.Put(aDoc, aRegistration);
+}
+
+void
+ServiceWorkerManager::StopControllingADocument(ServiceWorkerRegistrationInfo* aRegistration)
+{
+  aRegistration->StopControllingADocument();
+  if (!aRegistration->IsControllingDocuments()) {
+    if (aRegistration->mPendingUninstall) {
+      aRegistration->Clear();
+      RemoveRegistration(aRegistration);
+    } else {
+      aRegistration->TryToActivate();
     }
   }
 }
@@ -2921,6 +2946,7 @@
   info.mResolvedScriptURI = info.mBaseURI;
   MOZ_ASSERT(!aInfo->CacheName().IsEmpty());
   info.mServiceWorkerCacheName = aInfo->CacheName();
+  info.mServiceWorkerID = aInfo->ID();
 
   rv = info.mBaseURI->GetHost(info.mDomain);
   if (NS_WARN_IF(NS_FAILED(rv))) {
@@ -3066,6 +3092,33 @@
   return PL_DHASH_NEXT;
 }
 
+static void
+FireControllerChangeOnDocument(nsIDocument* aDocument)
+{
+  AssertIsOnMainThread();
+  MOZ_ASSERT(aDocument);
+
+  nsCOMPtr<nsPIDOMWindow> w = aDocument->GetWindow();
+  MOZ_ASSERT(w);
+  auto* window = static_cast<nsGlobalWindow*>(w.get());
+  if (NS_WARN_IF(!window)) {
+    NS_WARNING("No valid nsGlobalWindow");
+    return;
+  }
+
+  ErrorResult result;
+  dom::Navigator* navigator = window->GetNavigator(result);
+  if (NS_WARN_IF(result.Failed())) {
+    return;
+  }
+
+  nsRefPtr<ServiceWorkerContainer> container = navigator->ServiceWorker();
+  container->ControllerChanged(result);
+  if (result.Failed()) {
+    NS_WARNING("Failed to dispatch controllerchange event");
+  }
+}
+
 static PLDHashOperator
 FireControllerChangeOnMatchingDocument(nsISupports* aKey,
                                        ServiceWorkerRegistrationInfo* aValue,
@@ -3083,25 +3136,20 @@
     return PL_DHASH_NEXT;
   }
 
-  nsCOMPtr<nsPIDOMWindow> w = doc->GetWindow();
-  MOZ_ASSERT(w);
-  auto* window = static_cast<nsGlobalWindow*>(w.get());
-  if (NS_WARN_IF(!window)) {
-    NS_WARNING("No valid nsGlobalWindow");
-    return PL_DHASH_NEXT;
-  }
+  FireControllerChangeOnDocument(doc);
 
-  ErrorResult result;
-  dom::Navigator* navigator = window->GetNavigator(result);
-  if (NS_WARN_IF(result.Failed())) {
-    return PL_DHASH_NEXT;
-  }
+  return PL_DHASH_NEXT;
+}
 
-  nsRefPtr<ServiceWorkerContainer> container = navigator->ServiceWorker();
-  result = container->DispatchTrustedEvent(NS_LITERAL_STRING("controllerchange"));
-  if (result.Failed()) {
-    NS_WARNING("Failed to dispatch controllerchange event");
-  }
+static PLDHashOperator
+ClaimMatchingClients(nsISupportsHashKey* aKey, void* aData)
+{
+  nsRefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
+  ServiceWorkerRegistrationInfo* workerRegistration =
+    static_cast<ServiceWorkerRegistrationInfo*>(aData);
+  nsCOMPtr<nsIDocument> document = do_QueryInterface(aKey->GetKey());
+
+  swm->MaybeClaimClient(document, workerRegistration);
 
   return PL_DHASH_NEXT;
 }
@@ -3124,6 +3172,56 @@
 }
 
 void
+ServiceWorkerManager::MaybeClaimClient(nsIDocument* aDocument,
+                                       ServiceWorkerRegistrationInfo* aWorkerRegistration)
+{
+  MOZ_ASSERT(aWorkerRegistration);
+  MOZ_ASSERT(aWorkerRegistration->mActiveWorker);
+
+  // Same origin check
+  if (!aWorkerRegistration->mPrincipal->Equals(aDocument->NodePrincipal())) {
+    return;
+  }
+
+  // The registration that should be controlling the client
+  nsRefPtr<ServiceWorkerRegistrationInfo> matchingRegistration =
+    GetServiceWorkerRegistrationInfo(aDocument);
+
+  // The registration currently controlling the client
+  nsRefPtr<ServiceWorkerRegistrationInfo> controllingRegistration;
+  GetDocumentRegistration(aDocument, getter_AddRefs(controllingRegistration));
+
+  if (aWorkerRegistration != matchingRegistration ||
+        aWorkerRegistration == controllingRegistration) {
+    return;
+  }
+
+  if (controllingRegistration) {
+    StopControllingADocument(controllingRegistration);
+  }
+
+  StartControllingADocument(aWorkerRegistration, aDocument);
+  FireControllerChangeOnDocument(aDocument);
+}
+
+nsresult
+ServiceWorkerManager::ClaimClients(const nsCString& aScope, uint64_t aId)
+{
+  nsRefPtr<ServiceWorkerRegistrationInfo> registration =
+    GetRegistration(aScope);
+
+  if (!registration || !registration->mActiveWorker ||
+      !(registration->mActiveWorker->ID() == aId)) {
+    // The worker is not active.
+    return NS_ERROR_DOM_INVALID_STATE_ERR;
+  }
+
+  mAllDocuments.EnumerateEntries(ClaimMatchingClients, registration);
+
+  return NS_OK;
+}
+
+void
 ServiceWorkerManager::FireControllerChange(ServiceWorkerRegistrationInfo* aRegistration)
 {
   mControlledDocuments.EnumerateRead(FireControllerChangeOnMatchingDocument, aRegistration);
@@ -3527,4 +3625,13 @@
     mInstances[i]->QueueStateChangeEvent(mState);
   }
 }
+
+static uint64_t gServiceWorkerInfoCurrentID = 0;
+
+uint64_t
+ServiceWorkerInfo::GetNextID() const
+{
+  return ++gServiceWorkerInfoCurrentID;
+}
+
 END_WORKERS_NAMESPACE
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/ServiceWorkerManager.h firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/ServiceWorkerManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/ServiceWorkerManager.h	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/ServiceWorkerManager.h	2015-05-25 20:44:06.000000000 +0000
@@ -235,6 +235,11 @@
   nsCString mScriptSpec;
   nsString mCacheName;
   ServiceWorkerState mState;
+
+  // This id is shared with WorkerPrivate to match requests issued by service
+  // workers to their corresponding serviceWorkerInfo.
+  uint64_t mServiceWorkerID;
+
   // We hold rawptrs since the ServiceWorker constructor and destructor ensure
   // addition and removal.
   // There is a high chance of there being at least one ServiceWorker
@@ -244,6 +249,11 @@
   ~ServiceWorkerInfo()
   { }
 
+  // Generates a unique id for the service worker, with zero being treated as
+  // invalid.
+  uint64_t
+  GetNextID() const;
+
 public:
   NS_INLINE_DECL_REFCOUNTING(ServiceWorkerInfo)
 
@@ -272,6 +282,7 @@
     , mScriptSpec(aScriptSpec)
     , mCacheName(aCacheName)
     , mState(ServiceWorkerState::EndGuard_)
+    , mServiceWorkerID(GetNextID())
   {
     MOZ_ASSERT(mRegistration);
     MOZ_ASSERT(!aCacheName.IsEmpty());
@@ -289,6 +300,12 @@
     return mCacheName;
   }
 
+  uint64_t
+  ID() const
+  {
+    return mServiceWorkerID;
+  }
+
   void
   UpdateState(ServiceWorkerState aState);
 
@@ -364,6 +381,9 @@
 
   nsRefPtrHashtable<nsISupportsHashKey, ServiceWorkerRegistrationInfo> mControlledDocuments;
 
+  // Set of all documents that may be controlled by a service worker.
+  nsTHashtable<nsISupportsHashKey> mAllDocuments;
+
   // Maps scopes to job queues.
   nsClassHashtable<nsCStringHashKey, ServiceWorkerJobQueue> mJobQueues;
 
@@ -412,6 +432,13 @@
   GetAllClients(const nsCString& aScope,
                 nsTArray<ServiceWorkerClientInfo>& aControlledDocuments);
 
+  void
+  MaybeClaimClient(nsIDocument* aDocument,
+                   ServiceWorkerRegistrationInfo* aWorkerRegistration);
+
+  nsresult
+  ClaimClients(const nsCString& aScope, uint64_t aId);
+
   static already_AddRefed<ServiceWorkerManager>
   GetInstance();
 
@@ -466,6 +493,13 @@
   InvalidateServiceWorkerRegistrationWorker(ServiceWorkerRegistrationInfo* aRegistration,
                                             WhichServiceWorker aWhichOnes);
 
+  void
+  StartControllingADocument(ServiceWorkerRegistrationInfo* aRegistration,
+                            nsIDocument* aDoc);
+
+  void
+  StopControllingADocument(ServiceWorkerRegistrationInfo* aRegistration);
+
   already_AddRefed<ServiceWorkerRegistrationInfo>
   GetServiceWorkerRegistrationInfo(nsPIDOMWindow* aWindow);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/ServiceWorkerRegistration.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/ServiceWorkerRegistration.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/ServiceWorkerRegistration.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/ServiceWorkerRegistration.cpp	2015-05-25 20:44:06.000000000 +0000
@@ -53,9 +53,6 @@
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServiceWorkerRegistrationBase)
 NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper)
 
-NS_IMPL_CYCLE_COLLECTION_INHERITED(ServiceWorkerRegistrationBase,
-                                   DOMEventTargetHelper, mCCDummy);
-
 ServiceWorkerRegistrationBase::ServiceWorkerRegistrationBase(nsPIDOMWindow* aWindow,
                                                              const nsAString& aScope)
   : DOMEventTargetHelper(aWindow)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/ServiceWorkerRegistration.h firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/ServiceWorkerRegistration.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/ServiceWorkerRegistration.h	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/ServiceWorkerRegistration.h	2015-05-25 20:44:06.000000000 +0000
@@ -66,8 +66,6 @@
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(ServiceWorkerRegistrationBase,
-                                           DOMEventTargetHelper)
 
   IMPL_EVENT_HANDLER(updatefound)
 
@@ -91,8 +89,6 @@
   { }
 
   const nsString mScope;
-private:
-  nsCOMPtr<nsISupports> mCCDummy;
 };
 
 class ServiceWorkerRegistrationMainThread final : public ServiceWorkerRegistrationBase,
@@ -120,10 +116,10 @@
 
   already_AddRefed<workers::ServiceWorker>
   GetWaiting() override;
-  
+
   already_AddRefed<workers::ServiceWorker>
   GetActive() override;
-  
+
   already_AddRefed<PushManager>
   GetPushManager(ErrorResult& aRv);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/ServiceWorkerScriptCache.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/ServiceWorkerScriptCache.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/ServiceWorkerScriptCache.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/ServiceWorkerScriptCache.cpp	2015-05-25 20:44:06.000000000 +0000
@@ -596,6 +596,11 @@
 {
   AssertIsOnMainThread();
 
+  // If no channel, Abort() has been called.
+  if (!mChannel) {
+    return NS_OK;
+  }
+
 #ifdef DEBUG
   nsCOMPtr<nsIChannel> channel = do_QueryInterface(aRequest);
   MOZ_ASSERT(channel == mChannel);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/ServiceWorkerWindowClient.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/ServiceWorkerWindowClient.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/ServiceWorkerWindowClient.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/ServiceWorkerWindowClient.cpp	2015-05-25 20:44:06.000000000 +0000
@@ -80,7 +80,7 @@
   Run() override
   {
     AssertIsOnMainThread();
-    nsGlobalWindow* window = nsGlobalWindow::GetOuterWindowWithId(mWindowId);
+    nsGlobalWindow* window = nsGlobalWindow::GetInnerWindowWithId(mWindowId);
     UniquePtr<ServiceWorkerClientInfo> clientInfo;
 
     if (window) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/mochitest.ini	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/mochitest.ini	2015-05-25 20:44:07.000000000 +0000
@@ -199,7 +199,6 @@
 [test_bug978260.html]
 [test_webSocket_sharedWorker.html]
 skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #bug 982828
-[test_websocket_pref.html]
 [test_bug1104064.html]
 [test_consoleAndBlobs.html]
 [test_bug1132395.html]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/serviceworkers/claim_clients/client.html firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/serviceworkers/claim_clients/client.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/serviceworkers/claim_clients/client.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/serviceworkers/claim_clients/client.html	2015-05-25 20:44:07.000000000 +0000
@@ -0,0 +1,44 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Bug 1130684 - claim client </title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<p id="display"></p>
+<div id="content" style="display: none"></div>
+<pre id="test"></pre>
+<script class="testbody" type="text/javascript">
+
+  if (!parent) {
+    info("This page shouldn't be launched directly!");
+  }
+
+  window.onload = function() {
+    parent.postMessage("READY", "*");
+  }
+
+  navigator.serviceWorker.oncontrollerchange = function() {
+    parent.postMessage({
+      event: "controllerchange",
+      controller: (navigator.serviceWorker.controller !== null)
+    }, "*");
+  }
+
+  navigator.serviceWorker.onmessage = function(e) {
+    parent.postMessage({
+      event: "message",
+      data: e.data
+    }, "*");
+  }
+
+</script>
+</pre>
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/serviceworkers/claim_fetch_worker.js firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/serviceworkers/claim_fetch_worker.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/serviceworkers/claim_fetch_worker.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/serviceworkers/claim_fetch_worker.js	2015-05-25 20:44:07.000000000 +0000
@@ -0,0 +1,12 @@
+onfetch = function(e) {
+  if (e.request.url.indexOf("service_worker_controlled") >= 0) {
+    // pass through
+    e.respondWith(fetch(e.request));
+  } else {
+    e.respondWith(new Response("Fetch was intercepted"));
+  }
+}
+
+onmessage = function(e) {
+  clients.claim();
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/serviceworkers/claim_oninstall_worker.js firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/serviceworkers/claim_oninstall_worker.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/serviceworkers/claim_oninstall_worker.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/serviceworkers/claim_oninstall_worker.js	2015-05-25 20:44:07.000000000 +0000
@@ -0,0 +1,7 @@
+oninstall = function(e) {
+  var claimFailedPromise = new Promise(function(resolve, reject) {
+    clients.claim().then(reject, () => resolve());
+  });
+
+  e.waitUntil(claimFailedPromise);
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/serviceworkers/claim_worker_1.js firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/serviceworkers/claim_worker_1.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/serviceworkers/claim_worker_1.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/serviceworkers/claim_worker_1.js	2015-05-25 20:44:07.000000000 +0000
@@ -0,0 +1,28 @@
+onactivate = function(e) {
+  var result = {
+    resolve_value: false,
+    match_count_before: -1,
+    match_count_after: -1,
+    message: "claim_worker_1"
+  };
+
+  self.clients.matchAll().then(function(matched) {
+    // should be 0
+    result.match_count_before = matched.length;
+  }).then(function() {
+    var claimPromise = self.clients.claim().then(function(ret) {
+      result.resolve_value = ret;
+    });
+
+    return claimPromise.then(self.clients.matchAll().then(function(matched) {
+      // should be 2
+      result.match_count_after = matched.length;
+      for (i = 0; i < matched.length; i++) {
+        matched[i].postMessage(result);
+      }
+      if (result.match_count_after !== 2) {
+        dump("ERROR: claim_worker_1 failed to capture clients.\n");
+      }
+    }));
+  });
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/serviceworkers/claim_worker_2.js firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/serviceworkers/claim_worker_2.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/serviceworkers/claim_worker_2.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/serviceworkers/claim_worker_2.js	2015-05-25 20:44:07.000000000 +0000
@@ -0,0 +1,27 @@
+onactivate = function(e) {
+  var result = {
+    resolve_value: false,
+    match_count_before: -1,
+    match_count_after: -1,
+    message: "claim_worker_2"
+  };
+
+  self.clients.matchAll().then(function(matched) {
+    // should be 0
+    result.match_count_before = matched.length;
+  }).then(function() {
+    var claimPromise = self.clients.claim().then(function(ret) {
+      result.resolve_value = ret;
+    });
+
+    return claimPromise.then(self.clients.matchAll().then(function(matched) {
+      // should be 1
+      result.match_count_after = matched.length;
+      if (result.match_count_after === 1) {
+        matched[0].postMessage(result);
+      } else {
+        dump("ERROR: claim_worker_2 failed to capture clients.\n");
+      }
+    }));
+  });
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/serviceworkers/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/serviceworkers/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/serviceworkers/mochitest.ini	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/serviceworkers/mochitest.ini	2015-05-25 20:44:07.000000000 +0000
@@ -92,6 +92,11 @@
   swa/worker_scope_too_deep.js^headers^
   swa/worker_scope_too_narrow.js
   swa/worker_scope_too_narrow.js^headers^
+  claim_oninstall_worker.js
+  claim_worker_1.js
+  claim_worker_2.js
+  claim_clients/client.html
+  claim_fetch_worker.js
 
 [test_unregister.html]
 [test_installation_simple.html]
@@ -123,7 +128,10 @@
 [test_workerupdatefoundevent.html]
 [test_empty_serviceworker.html]
 [test_periodic_update.html]
+[test_claim_oninstall.html]
+[test_claim.html]
 [test_periodic_https_update.html]
 [test_sanitize.html]
 [test_sanitize_domain.html]
 [test_service_worker_allowed.html]
+[test_claim_fetch.html]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/serviceworkers/test_claim_fetch.html firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/serviceworkers/test_claim_fetch.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/serviceworkers/test_claim_fetch.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/serviceworkers/test_claim_fetch.html	2015-05-25 20:44:07.000000000 +0000
@@ -0,0 +1,98 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Bug 1130684 - Test fetch events are intercepted after claim </title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<p id="display"></p>
+<div id="content" style="display: none">
+  <a ping="ping" href="fetch.txt">link</a>
+</div>
+<pre id="test"></pre>
+<script class="testbody" type="text/javascript">
+  var registration;
+
+  function register() {
+    return navigator.serviceWorker.register("claim_fetch_worker.js",
+                                            { scope: "./" })
+      .then((swr) => registration = swr);
+  }
+
+  function unregister() {
+    return registration.unregister().then(function(result) {
+      ok(result, "Unregister should return true.");
+    });
+  }
+
+  function createClient() {
+    var p = new Promise(function(res, rej){
+      window.onmessage = function(e) {
+        if(e.data === "READY") {
+          res();
+        }
+      }
+    });
+
+    var content = document.getElementById("content");
+    ok(content, "Parent exists.");
+
+    iframe = document.createElement("iframe");
+    iframe.setAttribute('src', "sw_clients/service_worker_controlled.html");
+    content.appendChild(iframe);
+
+    return p;
+  }
+
+  function testFetch(before) {
+    return fetch("fetch/real-file.txt").then(function(res) {
+      ok(res.ok, "Response should be valid.");
+      return res.text().then(function(body) {
+        if (before) {
+          ok(body !== "Fetch was intercepted", "Fetch events should not be intercepted.");
+        } else {
+          ok(body === "Fetch was intercepted", "Fetch events should be intercepted.");
+        }
+      });
+    });
+  }
+
+  function claimThisPage() {
+    ok(registration.active, "Worker is active.");
+    var p = new Promise(function (res, rej) {
+      navigator.serviceWorker.oncontrollerchange = res;
+    });
+
+    registration.active.postMessage("Claim");
+
+    return p;
+  }
+
+  function runTest() {
+    register()
+      .then(createClient)
+      .then(testFetch.bind(this, true))
+      .then(claimThisPage)
+      .then(testFetch.bind(this, false))
+      .then(unregister)
+      .catch(function(e) {
+        ok(false, "Some test failed with error " + e);
+      }).then(SimpleTest.finish);
+  }
+
+  SimpleTest.waitForExplicitFinish();
+  SpecialPowers.pushPrefEnv({"set": [
+    ["dom.serviceWorkers.exemptFromPerDomainMax", true],
+    ["dom.serviceWorkers.enabled", true],
+    ["dom.serviceWorkers.testing.enabled", true]
+  ]}, runTest);
+</script>
+</pre>
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/serviceworkers/test_claim.html firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/serviceworkers/test_claim.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/serviceworkers/test_claim.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/serviceworkers/test_claim.html	2015-05-25 20:44:07.000000000 +0000
@@ -0,0 +1,172 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Bug 1130684 - Test service worker clients claim onactivate </title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<p id="display"></p>
+<div id="content" style="display: none"></div>
+<pre id="test"></pre>
+<script class="testbody" type="text/javascript">
+  var registration_1;
+  var registration_2;
+  var client;
+
+  function register_1() {
+    return navigator.serviceWorker.register("claim_worker_1.js",
+                                            { scope: "./" })
+      .then((swr) => registration_1 = swr);
+  }
+
+  function register_2() {
+    return navigator.serviceWorker.register("claim_worker_2.js",
+                                            { scope: "./claim_clients/client.html" })
+      .then((swr) => registration_2 = swr);
+  }
+
+  function unregister(reg) {
+    return reg.unregister().then(function(result) {
+      ok(result, "Unregister should return true.");
+    });
+  }
+
+  function createClient() {
+    var p = new Promise(function(res, rej) {
+      window.onmessage = function(e) {
+        if (e.data === "READY") {
+          res();
+        }
+      }
+    });
+
+    content = document.getElementById("content");
+    ok(content, "parent exists.");
+
+    client = document.createElement("iframe");
+    client.setAttribute('src', "claim_clients/client.html");
+    content.appendChild(client);
+
+    return p;
+  }
+
+  function testController() {
+    ok(navigator.serviceWorker.controller.scriptURL.match("claim_worker_1"),
+        "Controlling service worker has the correct url.");
+  }
+
+  function testClientWasClaimed(expected) {
+    var resolveClientMessage, resolveClientControllerChange;
+    var messageFromClient = new Promise(function(res, rej) {
+      resolveClientMessage = res;
+    });
+    var controllerChangeFromClient = new Promise(function(res, rej) {
+      resolveClientControllerChange = res;
+    });
+    window.onmessage = function(e) {
+      if (!e.data.event) {
+        ok(false, "Unknown message received: " + e.data);
+      }
+
+      if (e.data.event === "controllerchange") {
+        ok(e.data.controller,
+           "Client was claimed and received controllerchange event.");
+        resolveClientControllerChange();
+      }
+
+      if (e.data.event === "message") {
+        ok(e.data.data.resolve_value === undefined,
+            "Claim should resolve with undefined.");
+        ok(e.data.data.message === expected.message,
+           "Client received message from claiming worker.");
+        ok(e.data.data.match_count_before === expected.match_count_before,
+            "MatchAll clients count before claim should be " + expected.match_count_before);
+        ok(e.data.data.match_count_after === expected.match_count_after,
+            "MatchAll clients count after claim should be " + expected.match_count_after);
+        resolveClientMessage();
+      }
+    }
+
+    return Promise.all([messageFromClient, controllerChangeFromClient])
+      .then(() => window.onmessage = null);
+  }
+
+  function testClaimFirstWorker() {
+    // wait for the worker to control us
+    var controllerChange = new Promise(function(res, rej) {
+      navigator.serviceWorker.oncontrollerchange = function(e) {
+        ok(true, "controller changed event received.");
+        res();
+      };
+    });
+
+    var messageFromWorker = new Promise(function(res, rej) {
+      navigator.serviceWorker.onmessage = function(e) {
+        ok(e.data.resolve_value === undefined,
+            "Claim should resolve with undefined.");
+        ok(e.data.message === "claim_worker_1",
+            "Received message from claiming worker.");
+        ok(e.data.match_count_before === 0,
+            "Worker doesn't control any client before claim.");
+        ok(e.data.match_count_after === 2, "Worker should claim 2 clients.");
+        res();
+      }
+    });
+
+    var clientClaim = testClientWasClaimed({
+      message: "claim_worker_1",
+      match_count_before: 0,
+      match_count_after: 2
+    });
+
+    return Promise.all([controllerChange, messageFromWorker, clientClaim])
+      .then(testController);
+  }
+
+  function testClaimSecondWorker() {
+    navigator.serviceWorker.oncontrollerchange = function(e) {
+      ok(false, "Claim_worker_2 shouldn't claim this window.");
+    }
+
+    navigator.serviceWorker.onmessage = function(e) {
+      ok(false, "Claim_worker_2 shouldn't claim this window.");
+    }
+
+    var clientClaim = testClientWasClaimed({
+      message: "claim_worker_2",
+      match_count_before: 0,
+      match_count_after: 1
+    });
+
+    return clientClaim.then(testController);
+  }
+
+  function runTest() {
+    createClient()
+      .then(register_1)
+      .then(testClaimFirstWorker)
+      .then(register_2)
+      .then(testClaimSecondWorker)
+      .then(function() { return unregister(registration_1); })
+      .then(function() { return unregister(registration_2); })
+      .catch(function(e) {
+        ok(false, "Some test failed with error " + e);
+      }).then(SimpleTest.finish);
+  }
+
+  SimpleTest.waitForExplicitFinish();
+  SpecialPowers.pushPrefEnv({"set": [
+    ["dom.serviceWorkers.exemptFromPerDomainMax", true],
+    ["dom.serviceWorkers.enabled", true],
+    ["dom.serviceWorkers.testing.enabled", true]
+  ]}, runTest);
+</script>
+</pre>
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/serviceworkers/test_claim_oninstall.html firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/serviceworkers/test_claim_oninstall.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/serviceworkers/test_claim_oninstall.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/serviceworkers/test_claim_oninstall.html	2015-05-25 20:44:07.000000000 +0000
@@ -0,0 +1,73 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Bug 1130684 - Test service worker clients.claim oninstall</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<p id="display"></p>
+<div id="content" style="display: none"></div>
+<pre id="test"></pre>
+<script class="testbody" type="text/javascript">
+  var registration;
+
+  function register() {
+    return navigator.serviceWorker.register("claim_oninstall_worker.js",
+                                            { scope: "./" })
+      .then((swr) => registration = swr);
+  }
+
+
+  function unregister() {
+    return registration.unregister().then(function(result) {
+      ok(result, "Unregister should return true.");
+    });
+  }
+
+  function testClaim() {
+    ok(registration.installing, "Worker should be in installing state");
+
+    navigator.serviceWorker.oncontrollerchange = function() {
+      ok(false, "Claim should not succeed when the worker is not active.");
+    }
+
+    var p = new Promise(function(res, rej) {
+      registration.installing.onstatechange = function(e) {
+        // The worker will become active only if claim will reject inside the
+        // install handler.
+
+        ok(registration.active, "Claim should reject if the worker is not active");
+        ok(navigator.serviceWorker.controller === null, "Client is not controlled.");
+        e.target.onstatechange = null;
+        res();
+      }
+    });
+
+    return p;
+  }
+
+  function runTest() {
+    register()
+      .then(testClaim)
+      .then(unregister)
+      .catch(function(e) {
+        ok(false, "Some test failed with error " + e);
+      }).then(SimpleTest.finish);
+  }
+
+  SimpleTest.waitForExplicitFinish();
+  SpecialPowers.pushPrefEnv({"set": [
+    ["dom.serviceWorkers.exemptFromPerDomainMax", true],
+    ["dom.serviceWorkers.enabled", true],
+    ["dom.serviceWorkers.testing.enabled", true]
+  ]}, runTest);
+</script>
+</pre>
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/test_websocket_basic.html firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/test_websocket_basic.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/test_websocket_basic.html	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/test_websocket_basic.html	2015-05-25 20:44:08.000000000 +0000
@@ -15,8 +15,6 @@
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
-SpecialPowers.pushPrefEnv({"set": [["dom.workers.websocket.enabled", true]]},
-function() {
   var worker = new Worker("websocket_basic_worker.js");
 
   worker.onmessage = function(event) {
@@ -51,9 +49,7 @@
   }
 
   runTest();
-});
-
-SimpleTest.waitForExplicitFinish();
+  SimpleTest.waitForExplicitFinish();
 
 </script>
 </pre>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/test_websocket.html firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/test_websocket.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/test_websocket.html	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/test_websocket.html	2015-05-25 20:44:08.000000000 +0000
@@ -14,8 +14,6 @@
 <pre id="feedback"></pre>
 <script class="testbody" type="text/javascript">
 
-SpecialPowers.pushPrefEnv({"set": [["dom.workers.websocket.enabled", true]]},
-function() {
   var worker = new Worker("websocket_worker.js");
 
   worker.onmessage = function(event) {
@@ -40,9 +38,7 @@
   };
 
   worker.postMessage('foobar');
-});
-
-SimpleTest.waitForExplicitFinish();
+  SimpleTest.waitForExplicitFinish();
 
 </script>
 </pre>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/test_websocket_loadgroup.html firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/test_websocket_loadgroup.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/test_websocket_loadgroup.html	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/test_websocket_loadgroup.html	2015-05-25 20:44:08.000000000 +0000
@@ -15,8 +15,6 @@
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
-SpecialPowers.pushPrefEnv({"set": [["dom.workers.websocket.enabled", true]]},
-function() {
   var worker = new Worker("websocket_loadgroup_worker.js");
 
   var stopped = false;
@@ -55,9 +53,7 @@
   }
 
   runTest();
-});
-
-SimpleTest.waitForExplicitFinish();
+  SimpleTest.waitForExplicitFinish();
 
 </script>
 </pre>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/test_websocket_pref.html firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/test_websocket_pref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/test_websocket_pref.html	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/test_websocket_pref.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-<!--
-  Any copyright is dedicated to the Public Domain.
-  http://creativecommons.org/publicdomain/zero/1.0/
--->
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test for WebSocket object in workers</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 id="js_script" type="text/js-worker">
-onmessage = function() {
-  postMessage("WebSocket" in this ? "OK" : "KO");
-}
-</script>
-
-<script class="testbody" type="text/javascript">
-
-SpecialPowers.pushPrefEnv({"set": [["dom.workers.websocket.enabled", true]]},
-function() {
-  var blob = new Blob([document.getElementById("js_script").textContent],
-                      {type: "text/javascript"});
-  var url = URL.createObjectURL(blob);
-
-  var tests = [
-    function() {
-      SpecialPowers.pushPrefEnv({"set": [["dom.workers.websocket.enabled", true]]},
-      function() {
-        ok("WebSocket" in window, "WebSocket are always enabled on main-thread");
-
-        var w = new Worker(url);
-        w.onmessage = function(e) {
-          is(e.data, "OK", "WebSocket enabled in workers!");
-          runTest();
-        }
-        w.postMessage('go');
-      });
-    },
-
-    function() {
-      SpecialPowers.pushPrefEnv({"set": [["dom.workers.websocket.enabled", false]]},
-      function() {
-        ok("WebSocket" in window, "WebSocket are always enabled on main-thread");
-
-        var w = new Worker(url);
-        w.onmessage = function(e) {
-          is(e.data, "KO", "WebSocket disabled in workers!");
-          runTest();
-        }
-        w.postMessage('go');
-      });
-    }
-  ];
-
-  function runTest() {
-    if (!tests.length) {
-      SimpleTest.finish();
-      return;
-    }
-
-    var t = tests.shift();
-    t();
-  }
-
-  runTest();
-});
-
-SimpleTest.waitForExplicitFinish();
-
-</script>
-</pre>
-</body>
-</html>
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/test_webSocket_sharedWorker.html firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/test_webSocket_sharedWorker.html
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/test_webSocket_sharedWorker.html	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/test_webSocket_sharedWorker.html	2015-05-25 20:44:08.000000000 +0000
@@ -13,8 +13,8 @@
 
 <script class="testbody" type="text/javascript">
 
-SpecialPowers.pushPrefEnv({ set: [["dom.workers.sharedWorkers.enabled", true],
-                                  ["dom.workers.websocket.enabled", true]]}, function() {
+SpecialPowers.pushPrefEnv({ set: [["dom.workers.sharedWorkers.enabled", true]]},
+function() {
   var sw = new SharedWorker('webSocket_sharedWorker.js');
   sw.port.onmessage = function(event) {
     if (event.data.type == 'finish') {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/test_worker_interfaces.js firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/test_worker_interfaces.js
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/test/test_worker_interfaces.js	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/test/test_worker_interfaces.js	2015-05-25 20:44:08.000000000 +0000
@@ -151,7 +151,7 @@
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "Response",
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    { name: "ServiceWorkerRegistration", nightly: true, b2g: false },
+    { name: "ServiceWorkerRegistration", disabled: true, b2g: false },
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "TextDecoder",
 // IMPORTANT: Do not change this list without review from a DOM peer!
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/WorkerPrivate.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/WorkerPrivate.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/WorkerPrivate.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/WorkerPrivate.cpp	2015-05-25 20:44:06.000000000 +0000
@@ -447,7 +447,7 @@
                JS::MutableHandle<JSObject*> aBlobOrFile)
 {
   nsRefPtr<Blob> blob = ReadBlobOrFileNoWrap(aCx, aReader, aIsMainThread);
-  aBlobOrFile.set(blob->WrapObject(aCx, JS::NullPtr()));
+  aBlobOrFile.set(blob->WrapObject(aCx, nullptr));
 }
 
 // See WriteFormData for serialization format.
@@ -505,7 +505,7 @@
     }
   }
 
-  aFormData.set(formData->WrapObject(aCx, JS::NullPtr()));
+  aFormData.set(formData->WrapObject(aCx, nullptr));
 }
 
 bool
@@ -2232,6 +2232,7 @@
 
 WorkerLoadInfo::WorkerLoadInfo()
   : mWindowID(UINT64_MAX)
+  , mServiceWorkerID(0)
   , mFromWindow(false)
   , mEvalAllowed(false)
   , mReportCSPViolations(false)
@@ -2285,6 +2286,7 @@
   mDomain = aOther.mDomain;
   mServiceWorkerCacheName = aOther.mServiceWorkerCacheName;
   mWindowID = aOther.mWindowID;
+  mServiceWorkerID = aOther.mServiceWorkerID;
   mFromWindow = aOther.mFromWindow;
   mEvalAllowed = aOther.mEvalAllowed;
   mReportCSPViolations = aOther.mReportCSPViolations;
@@ -5640,15 +5642,6 @@
   // The main thread may be waiting so we must notify.
   mMemoryReportCondVar.Notify();
 
-#ifdef MOZ_NUWA_PROCESS
-  {
-    MOZ_ASSERT(mThread);
-
-    ReentrantMonitorAutoEnter mon(mThread->ThreadStatusMonitor());
-    mThread->SetIdle();
-  }
-#endif // MOZ_NUWA_PROCESS
-
   // Now wait for an actual worker event.
   mCondVar.Wait(aInterval);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/WorkerPrivate.h firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/WorkerPrivate.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/WorkerPrivate.h	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/WorkerPrivate.h	2015-05-25 20:44:06.000000000 +0000
@@ -465,6 +465,12 @@
     return mLoadInfo.mWindowID;
   }
 
+  uint64_t
+  ServiceWorkerID() const
+  {
+    return mLoadInfo.mServiceWorkerID;
+  }
+
   nsIURI*
   GetBaseURI() const
   {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/Workers.h firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/Workers.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/workers/Workers.h	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/workers/Workers.h	2015-05-25 20:44:06.000000000 +0000
@@ -247,6 +247,7 @@
   nsCString mSecurityInfo;
 
   uint64_t mWindowID;
+  uint64_t mServiceWorkerID;
 
   bool mFromWindow;
   bool mEvalAllowed;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xbl/nsXBLBinding.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xbl/nsXBLBinding.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xbl/nsXBLBinding.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xbl/nsXBLBinding.cpp	2015-05-25 20:44:08.000000000 +0000
@@ -941,7 +941,7 @@
 
   // We don't have an entry. Create one and stick it in the map.
   JS::Rooted<JSObject*> entry(cx);
-  entry = JS_NewObjectWithGivenProto(cx, nullptr, JS::NullPtr());
+  entry = JS_NewObjectWithGivenProto(cx, nullptr, nullptr);
   if (!entry) {
     return nullptr;
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xbl/nsXBLProtoImpl.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xbl/nsXBLProtoImpl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xbl/nsXBLProtoImpl.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xbl/nsXBLProtoImpl.cpp	2015-05-25 20:44:08.000000000 +0000
@@ -114,7 +114,7 @@
   } else if (scopeObject != globalObject) {
 
     // This is just a property holder, so it doesn't need any special JSClass.
-    propertyHolder = JS_NewObjectWithGivenProto(cx, nullptr, JS::NullPtr());
+    propertyHolder = JS_NewObjectWithGivenProto(cx, nullptr, nullptr);
     NS_ENSURE_TRUE(propertyHolder, NS_ERROR_OUT_OF_MEMORY);
 
     // Define it as a property on the scopeObject, using the same name used on
@@ -248,7 +248,7 @@
   jsapi.TakeOwnershipOfErrorReporting();
   JSContext* cx = jsapi.cx();
 
-  mPrecompiledMemberHolder = JS_NewObjectWithGivenProto(cx, nullptr, JS::NullPtr());
+  mPrecompiledMemberHolder = JS_NewObjectWithGivenProto(cx, nullptr, nullptr);
   if (!mPrecompiledMemberHolder)
     return NS_ERROR_OUT_OF_MEMORY;
 
@@ -367,7 +367,7 @@
   AssertInCompilationScope();
   AutoJSContext cx;
   // Set up a class object first so that deserialization is possible
-  mPrecompiledMemberHolder = JS_NewObjectWithGivenProto(cx, nullptr, JS::NullPtr());
+  mPrecompiledMemberHolder = JS_NewObjectWithGivenProto(cx, nullptr, nullptr);
   if (!mPrecompiledMemberHolder)
     return NS_ERROR_OUT_OF_MEMORY;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xbl/nsXBLPrototypeBinding.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xbl/nsXBLPrototypeBinding.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xbl/nsXBLPrototypeBinding.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xbl/nsXBLPrototypeBinding.cpp	2015-05-25 20:44:08.000000000 +0000
@@ -361,9 +361,7 @@
         // Check to see if the src attribute is xbl:text.  If so, then we need to obtain the
         // children of the real element and get the text nodes' values.
         if (aAttribute == nsGkAtoms::text && aNameSpaceID == kNameSpaceID_XBL) {
-          if (!nsContentUtils::GetNodeTextContent(aChangedElement, false, value)) {
-            NS_RUNTIMEABORT("OOM");
-          }
+          nsContentUtils::GetNodeTextContent(aChangedElement, false, value);
           value.StripChar(char16_t('\n'));
           value.StripChar(char16_t('\r'));
           nsAutoString stripVal(value);
@@ -514,10 +512,8 @@
   bool attrPresent = true;
 
   if (src == nsGkAtoms::text && srcNs == kNameSpaceID_XBL) {
-    if (!nsContentUtils::GetNodeTextContent(changeData->mBoundElement, false,
-                                       value)) {
-      NS_RUNTIMEABORT("OOM");
-    }
+    nsContentUtils::GetNodeTextContent(changeData->mBoundElement, false,
+                                       value);
     value.StripChar(char16_t('\n'));
     value.StripChar(char16_t('\r'));
     nsAutoString stripVal(value);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xml/nsXMLContentSink.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xml/nsXMLContentSink.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xml/nsXMLContentSink.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xml/nsXMLContentSink.cpp	2015-05-25 20:44:08.000000000 +0000
@@ -30,7 +30,7 @@
 #include "nsIScriptSecurityManager.h"
 #include "nsIContentViewer.h"
 #include "prtime.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prmem.h"
 #include "nsRect.h"
 #include "nsIWebNavigation.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xslt/base/txLog.h firefox-trunk-41.0~a1~hg20150524r245419/dom/xslt/base/txLog.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xslt/base/txLog.h	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xslt/base/txLog.h	2015-05-25 20:44:09.000000000 +0000
@@ -6,7 +6,7 @@
 #ifndef txLog_h__
 #define txLog_h__
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 class txLog
 {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xslt/xslt/txExecutionState.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xslt/xslt/txExecutionState.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xslt/xslt/txExecutionState.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xslt/xslt/txExecutionState.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -384,7 +384,7 @@
         return nullptr;
     }
 
-    PR_LOG(txLog::xslt, PR_LOG_DEBUG,
+    MOZ_LOG(txLog::xslt, PR_LOG_DEBUG,
            ("Retrieve Document %s", NS_LossyConvertUTF16toASCII(aUri).get()));
 
     // try to get already loaded document
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xslt/xslt/txMozillaStylesheetCompiler.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xslt/xslt/txMozillaStylesheetCompiler.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xslt/xslt/txMozillaStylesheetCompiler.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xslt/xslt/txMozillaStylesheetCompiler.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -519,7 +519,7 @@
 
     nsAutoCString spec;
     aUri->GetSpec(spec);
-    PR_LOG(txLog::xslt, PR_LOG_ALWAYS, ("TX_LoadSheet: %s\n", spec.get()));
+    MOZ_LOG(txLog::xslt, PR_LOG_ALWAYS, ("TX_LoadSheet: %s\n", spec.get()));
 
     // Content Policy
     int16_t shouldLoad = nsIContentPolicy::ACCEPT;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xslt/xslt/txMozillaXMLOutput.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xslt/xslt/txMozillaXMLOutput.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xslt/xslt/txMozillaXMLOutput.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xslt/xslt/txMozillaXMLOutput.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -264,7 +264,7 @@
 
     if (mBadChildLevel) {
         --mBadChildLevel;
-        PR_LOG(txLog::xslt, PR_LOG_DEBUG,
+        MOZ_LOG(txLog::xslt, PR_LOG_DEBUG,
                ("endElement, mBadChildLevel = %d\n", mBadChildLevel));
         return NS_OK;
     }
@@ -493,7 +493,7 @@
 
     if (mBadChildLevel) {
         ++mBadChildLevel;
-        PR_LOG(txLog::xslt, PR_LOG_DEBUG,
+        MOZ_LOG(txLog::xslt, PR_LOG_DEBUG,
                ("startElement, mBadChildLevel = %d\n", mBadChildLevel));
         return NS_OK;
     }
@@ -506,7 +506,7 @@
         // eCloseElement couldn't add the parent so we fail as well or we've
         // reached the limit of the depth of the tree that we allow.
         ++mBadChildLevel;
-        PR_LOG(txLog::xslt, PR_LOG_DEBUG,
+        MOZ_LOG(txLog::xslt, PR_LOG_DEBUG,
                ("startElement, mBadChildLevel = %d\n", mBadChildLevel));
         return NS_OK;
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xslt/xslt/txStylesheetCompiler.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xslt/xslt/txStylesheetCompiler.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xslt/xslt/txStylesheetCompiler.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xslt/xslt/txStylesheetCompiler.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -377,7 +377,7 @@
 nsresult
 txStylesheetCompiler::doneLoading()
 {
-    PR_LOG(txLog::xslt, PR_LOG_ALWAYS,
+    MOZ_LOG(txLog::xslt, PR_LOG_ALWAYS,
            ("Compiler::doneLoading: %s\n",
             NS_LossyConvertUTF16toASCII(mStylesheetURI).get()));
     if (NS_FAILED(mStatus)) {
@@ -393,7 +393,7 @@
 txStylesheetCompiler::cancel(nsresult aError, const char16_t *aErrorText,
                              const char16_t *aParam)
 {
-    PR_LOG(txLog::xslt, PR_LOG_ALWAYS,
+    MOZ_LOG(txLog::xslt, PR_LOG_ALWAYS,
            ("Compiler::cancel: %s, module: %d, code %d\n",
             NS_LossyConvertUTF16toASCII(mStylesheetURI).get(),
             NS_ERROR_GET_MODULE(aError),
@@ -422,7 +422,7 @@
                               ReferrerPolicy aReferrerPolicy,
                               txStylesheetCompiler* aCompiler)
 {
-    PR_LOG(txLog::xslt, PR_LOG_ALWAYS,
+    MOZ_LOG(txLog::xslt, PR_LOG_ALWAYS,
            ("Compiler::loadURI forwards %s thru %s\n",
             NS_LossyConvertUTF16toASCII(aUri).get(),
             NS_LossyConvertUTF16toASCII(mStylesheetURI).get()));
@@ -676,7 +676,7 @@
 txStylesheetCompilerState::pushPtr(void* aPtr, enumStackType aType)
 {
 #ifdef TX_DEBUG_STACK
-    PR_LOG(txLog::xslt, PR_LOG_DEBUG, ("pushPtr: 0x%x type %u\n", aPtr, aType));
+    MOZ_LOG(txLog::xslt, PR_LOG_DEBUG, ("pushPtr: 0x%x type %u\n", aPtr, aType));
 #endif
     mTypeStack.AppendElement(aType);
     return mOtherStack.push(aPtr);
@@ -695,7 +695,7 @@
     void* value = mOtherStack.pop();
     
 #ifdef TX_DEBUG_STACK
-    PR_LOG(txLog::xslt, PR_LOG_DEBUG, ("popPtr: 0x%x type %u requested %u\n", value, type, aType));
+    MOZ_LOG(txLog::xslt, PR_LOG_DEBUG, ("popPtr: 0x%x type %u requested %u\n", value, type, aType));
 #endif
     
     if (type != aType) {
@@ -750,7 +750,7 @@
 nsresult
 txStylesheetCompilerState::loadIncludedStylesheet(const nsAString& aURI)
 {
-    PR_LOG(txLog::xslt, PR_LOG_ALWAYS,
+    MOZ_LOG(txLog::xslt, PR_LOG_ALWAYS,
            ("CompilerState::loadIncludedStylesheet: %s\n",
             NS_LossyConvertUTF16toASCII(aURI).get()));
     if (mStylesheetURI.Equals(aURI)) {
@@ -795,7 +795,7 @@
 txStylesheetCompilerState::loadImportedStylesheet(const nsAString& aURI,
                                                   txStylesheet::ImportFrame* aFrame)
 {
-    PR_LOG(txLog::xslt, PR_LOG_ALWAYS,
+    MOZ_LOG(txLog::xslt, PR_LOG_ALWAYS,
            ("CompilerState::loadImportedStylesheet: %s\n",
             NS_LossyConvertUTF16toASCII(aURI).get()));
     if (mStylesheetURI.Equals(aURI)) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xslt/xslt/txStylesheet.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xslt/xslt/txStylesheet.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xslt/xslt/txStylesheet.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xslt/xslt/txStylesheet.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -168,14 +168,14 @@
 #ifdef TX_TO_STRING
           match->toString(matchAttr);
 #endif
-          PR_LOG(txLog::xslt, PR_LOG_DEBUG,
+          MOZ_LOG(txLog::xslt, PR_LOG_DEBUG,
                  ("MatchTemplate, Pattern %s, Mode %s, Node %s\n",
                   NS_LossyConvertUTF16toASCII(matchAttr).get(),
                   NS_LossyConvertUTF16toASCII(mode).get(),
                   NS_LossyConvertUTF16toASCII(nodeName).get()));
       }
       else {
-          PR_LOG(txLog::xslt, PR_LOG_DEBUG,
+          MOZ_LOG(txLog::xslt, PR_LOG_DEBUG,
                  ("No match, Node %s, Mode %s\n", 
                   NS_LossyConvertUTF16toASCII(nodeName).get(),
                   NS_LossyConvertUTF16toASCII(mode).get()));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/nsXULCommandDispatcher.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/nsXULCommandDispatcher.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/nsXULCommandDispatcher.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/nsXULCommandDispatcher.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -25,7 +25,7 @@
 #include "nsPIWindowRoot.h"
 #include "nsRDFCID.h"
 #include "nsXULCommandDispatcher.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsContentUtils.h"
 #include "nsReadableUtils.h"
 #include "nsCRT.h"
@@ -274,7 +274,7 @@
         targetsC.AssignWithConversion(updater->mTargets);
         CopyUTF16toUTF8(aEvents, aeventsC);
         CopyUTF16toUTF8(aTargets, atargetsC);
-        PR_LOG(gCommandLog, PR_LOG_NOTICE,
+        MOZ_LOG(gCommandLog, PR_LOG_NOTICE,
                ("xulcmd[%p] replace %p(events=%s targets=%s) with (events=%s targets=%s)",
                 this, aElement,
                 eventsC.get(),
@@ -301,7 +301,7 @@
     CopyUTF16toUTF8(aEvents, aeventsC);
     CopyUTF16toUTF8(aTargets, atargetsC);
 
-    PR_LOG(gCommandLog, PR_LOG_NOTICE,
+    MOZ_LOG(gCommandLog, PR_LOG_NOTICE,
            ("xulcmd[%p] add     %p(events=%s targets=%s)",
             this, aElement,
             aeventsC.get(),
@@ -335,7 +335,7 @@
         nsAutoCString eventsC, targetsC; 
         eventsC.AssignWithConversion(updater->mEvents);
         targetsC.AssignWithConversion(updater->mTargets);
-        PR_LOG(gCommandLog, PR_LOG_NOTICE,
+        MOZ_LOG(gCommandLog, PR_LOG_NOTICE,
                ("xulcmd[%p] remove  %p(events=%s targets=%s)",
                 this, aElement,
                 eventsC.get(),
@@ -394,7 +394,7 @@
     if (PR_LOG_TEST(gCommandLog, PR_LOG_NOTICE)) {
       nsAutoCString aeventnameC; 
       CopyUTF16toUTF8(aEventName, aeventnameC);
-      PR_LOG(gCommandLog, PR_LOG_NOTICE,
+      MOZ_LOG(gCommandLog, PR_LOG_NOTICE,
              ("xulcmd[%p] update %p event=%s",
               this, content,
               aeventnameC.get()));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/nsXULContentSink.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/nsXULContentSink.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/nsXULContentSink.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/nsXULContentSink.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -41,7 +41,7 @@
 #include "nsXPIDLString.h"
 #include "nsReadableUtils.h"
 #include "nsXULElement.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prmem.h"
 #include "nsCRT.h"
 
@@ -477,7 +477,7 @@
 
   case eInEpilog:
   case eInScript:
-      PR_LOG(gContentSinkLog, PR_LOG_WARNING,
+      MOZ_LOG(gContentSinkLog, PR_LOG_WARNING,
              ("xul: warning: unexpected tags in epilog at line %d",
              aLineNumber));
       rv = NS_ERROR_UNEXPECTED; // XXX
@@ -728,7 +728,7 @@
 
     if (aNodeInfo->Equals(nsGkAtoms::script, kNameSpaceID_XHTML) ||
         aNodeInfo->Equals(nsGkAtoms::script, kNameSpaceID_XUL)) {
-        PR_LOG(gContentSinkLog, PR_LOG_ERROR,
+        MOZ_LOG(gContentSinkLog, PR_LOG_ERROR,
                ("xul: script tag not allowed as root content element"));
 
         return NS_ERROR_UNEXPECTED;
@@ -742,7 +742,7 @@
         if (PR_LOG_TEST(gContentSinkLog, PR_LOG_ERROR)) {
             nsAutoString anodeC;
             aNodeInfo->GetName(anodeC);
-            PR_LOG(gContentSinkLog, PR_LOG_ERROR,
+            MOZ_LOG(gContentSinkLog, PR_LOG_ERROR,
                    ("xul: unable to create element '%s' at line %d",
                     NS_ConvertUTF16toUTF8(anodeC).get(),
                     -1)); // XXX pass in line number
@@ -783,7 +783,7 @@
         if (PR_LOG_TEST(gContentSinkLog, PR_LOG_ERROR)) {
             nsAutoString anodeC;
             aNodeInfo->GetName(anodeC);
-            PR_LOG(gContentSinkLog, PR_LOG_ERROR,
+            MOZ_LOG(gContentSinkLog, PR_LOG_ERROR,
                    ("xul: unable to create element '%s' at line %d",
                     NS_ConvertUTF16toUTF8(anodeC).get(),
                     aLineNumber));
@@ -985,7 +985,7 @@
           nsAutoString qnameC,valueC;
           qnameC.Assign(aAttributes[0]);
           valueC.Assign(aAttributes[1]);
-          PR_LOG(gContentSinkLog, PR_LOG_DEBUG,
+          MOZ_LOG(gContentSinkLog, PR_LOG_DEBUG,
                  ("xul: %.5d. %s    %s=%s",
                   -1, // XXX pass in line number
                   NS_ConvertUTF16toUTF8(extraWhiteSpace).get(),
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/nsXULElement.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/nsXULElement.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/nsXULElement.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/nsXULElement.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -87,7 +87,7 @@
 #include "nsXULContentUtils.h"
 #include "nsNodeUtils.h"
 #include "nsFrameLoader.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "rdf.h"
 #include "nsIControllers.h"
 #include "nsAttrValueOrString.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsContentTestNode.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsContentTestNode.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsContentTestNode.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsContentTestNode.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -12,7 +12,7 @@
 #include "nsIXULTemplateBuilder.h"
 #include "nsXULTemplateQueryProcessorRDF.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 extern PRLogModuleInfo* gXULTemplateLog;
 
 nsContentTestNode::nsContentTestNode(nsXULTemplateQueryProcessorRDF* aProcessor,
@@ -32,7 +32,7 @@
         if (aRefVariable)
             aRefVariable->ToString(refvar);
 
-        PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+        MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                ("nsContentTestNode[%p]: ref-var=%s tag=%s",
                 this, NS_ConvertUTF16toUTF8(refvar).get(),
                 NS_ConvertUTF16toUTF8(tag).get()));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsInstantiationNode.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsInstantiationNode.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsInstantiationNode.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsInstantiationNode.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -7,7 +7,7 @@
 #include "nsTemplateRule.h"
 #include "nsXULTemplateQueryProcessorRDF.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 extern PRLogModuleInfo* gXULTemplateLog;
 
 nsInstantiationNode::nsInstantiationNode(nsXULTemplateQueryProcessorRDF* aProcessor,
@@ -15,7 +15,7 @@
         : mProcessor(aProcessor),
           mQuery(aQuery)
 {
-    PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+    MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
            ("nsInstantiationNode[%p] query=%p", this, aQuery));
 
     MOZ_COUNT_CTOR(nsInstantiationNode);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsRDFConInstanceTestNode.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsRDFConInstanceTestNode.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsRDFConInstanceTestNode.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsRDFConInstanceTestNode.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -11,7 +11,7 @@
 #include "nsRDFConInstanceTestNode.h"
 #include "nsResourceSet.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsXULContentUtils.h"
 extern PRLogModuleInfo* gXULTemplateLog;
 
@@ -58,7 +58,7 @@
         if (mContainerVariable)
             mContainerVariable->ToString(cvar);
 
-        PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+        MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                ("nsRDFConInstanceTestNode[%p]: parent=%p member-props=(%s) container-var=%s container=%s empty=%s",
                 this,
                 aParent,
@@ -104,7 +104,7 @@
             const char* container = "(unbound)";
             valueres->GetValueConst(&container);
 
-            PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+            MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                    ("nsRDFConInstanceTestNode[%p]::FilterInstantiations() container=[%s]",
                     this, container));
         }
@@ -192,11 +192,11 @@
                 }
             }
 
-            PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+            MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                    ("    empty => %s",
                     (empty == mEmpty) ? "consistent" : "inconsistent"));
 
-            PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+            MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                    ("    container => %s",
                     (container == mContainer) ? "consistent" : "inconsistent"));
 
@@ -255,7 +255,7 @@
         nsAutoString target;
         nsXULContentUtils::GetTextForNode(aTarget, target);
 
-        PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+        MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                ("nsRDFConInstanceTestNode[%p]: CanPropagate([%s]==[%s]=>[%s]) => %s",
                 this, source, property, NS_ConvertUTF16toUTF8(target).get(),
                 canpropagate ? "true" : "false"));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsRDFConMemberTestNode.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsRDFConMemberTestNode.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsRDFConMemberTestNode.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsRDFConMemberTestNode.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -12,7 +12,7 @@
 #include "nsString.h"
 #include "nsXULContentUtils.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 extern PRLogModuleInfo* gXULTemplateLog;
 
 nsRDFConMemberTestNode::nsRDFConMemberTestNode(TestNode* aParent,
@@ -50,7 +50,7 @@
         if (mMemberVariable)
             mMemberVariable->ToString(mvar);
 
-        PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+        MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                ("nsRDFConMemberTestNode[%p]: parent=%p member-props=(%s) container-var=%s member-var=%s",
                 this,
                 aParent,
@@ -120,7 +120,7 @@
             if (hasMemberBinding)
                 nsXULContentUtils::GetTextForNode(memberValue, member);
 
-            PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+            MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                    ("nsRDFConMemberTestNode[%p]: FilterInstantiations() container=[%s] member=[%s]",
                     this, container, NS_ConvertUTF16toUTF8(member).get()));
         }
@@ -168,7 +168,7 @@
                 }
             }
 
-            PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+            MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                    ("    consistency check => %s", isconsistent ? "passed" : "failed"));
 
             if (isconsistent) {
@@ -219,7 +219,7 @@
                     nsAutoString member;
                     nsXULContentUtils::GetTextForNode(node, member);
 
-                    PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+                    MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                            ("    member => %s", NS_ConvertUTF16toUTF8(member).get()));
                 }
 
@@ -306,7 +306,7 @@
                             const char* container;
                             source->GetValueConst(&container);
 
-                            PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+                            MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                                    ("    container => %s", container));
                         }
 
@@ -376,7 +376,7 @@
                             nsAutoString s;
                             nsXULContentUtils::GetTextForNode(value, s);
 
-                            PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+                            MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                                    ("    member => %s", NS_ConvertUTF16toUTF8(s).get()));
                         }
                     }
@@ -393,7 +393,7 @@
                             const char* s;
                             valueRes->GetValueConst(&s);
 
-                            PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+                            MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                                    ("    container => %s", s));
                         }
                     }
@@ -476,7 +476,7 @@
         nsAutoString target;
         nsXULContentUtils::GetTextForNode(aTarget, target);
 
-        PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+        MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                ("nsRDFConMemberTestNode[%p]: CanPropagate([%s]==[%s]=>[%s]) => %s",
                 this, source, property, NS_ConvertUTF16toUTF8(target).get(),
                 canpropagate ? "true" : "false"));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsRDFPropertyTestNode.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsRDFPropertyTestNode.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsRDFPropertyTestNode.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsRDFPropertyTestNode.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -7,7 +7,7 @@
 #include "nsString.h"
 #include "nsXULContentUtils.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 extern PRLogModuleInfo* gXULTemplateLog;
 #include "nsIRDFLiteral.h"
 
@@ -37,7 +37,7 @@
         if (mTargetVariable)
             mTargetVariable->ToString(tvar);
 
-        PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+        MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                ("nsRDFPropertyTestNode[%p]: parent=%p source=%s property=%s target=%s",
                 this, aParent, NS_ConvertUTF16toUTF8(svar).get(), prop, NS_ConvertUTF16toUTF8(tvar).get()));
     }
@@ -70,7 +70,7 @@
         if (mTargetVariable)
             mTargetVariable->ToString(tvar);
 
-        PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+        MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                ("nsRDFPropertyTestNode[%p]: parent=%p source=%s property=%s target=%s",
                 this, aParent, source, prop, NS_ConvertUTF16toUTF8(tvar).get()));
     }
@@ -102,7 +102,7 @@
         nsAutoString target;
         nsXULContentUtils::GetTextForNode(aTarget, target);
 
-        PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+        MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                ("nsRDFPropertyTestNode[%p]: parent=%p source=%s property=%s target=%s",
                 this, aParent, NS_ConvertUTF16toUTF8(svar).get(), prop, NS_ConvertUTF16toUTF8(target).get()));
     }
@@ -157,7 +157,7 @@
             if (hasTargetBinding)
                 nsXULContentUtils::GetTextForNode(targetValue, target);
 
-            PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+            MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                    ("nsRDFPropertyTestNode[%p]: FilterInstantiations() source=[%s] target=[%s]",
                     this, source, NS_ConvertUTF16toUTF8(target).get()));
         }
@@ -169,7 +169,7 @@
                                   true, &hasAssertion);
             if (NS_FAILED(rv)) return rv;
 
-            PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+            MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                    ("    consistency check => %s", hasAssertion ? "passed" : "failed"));
 
             if (hasAssertion) {
@@ -234,7 +234,7 @@
                         if (value)
                             nsXULContentUtils::GetTextForNode(value, s);
 
-                        PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+                        MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                                ("    target => %s", NS_ConvertUTF16toUTF8(s).get()));
                     }
 
@@ -253,7 +253,7 @@
                         if (source)
                             source->GetValueConst(&s);
 
-                        PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+                        MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                                ("    source => %s", s));
                     }
 
@@ -331,7 +331,7 @@
         nsAutoString target;
         nsXULContentUtils::GetTextForNode(aTarget, target);
 
-        PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+        MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                ("nsRDFPropertyTestNode[%p]: CanPropagate([%s]==[%s]=>[%s]) => %s",
                 this, source, property, NS_ConvertUTF16toUTF8(target).get(),
                 result ? "true" : "false"));
@@ -356,7 +356,7 @@
             nsAutoString target;
             nsXULContentUtils::GetTextForNode(aTarget, target);
 
-            PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+            MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                    ("nsRDFPropertyTestNode[%p]: Retract([%s]==[%s]=>[%s])",
                     this, source, property, NS_ConvertUTF16toUTF8(target).get()));
         }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsRuleNetwork.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsRuleNetwork.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsRuleNetwork.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsRuleNetwork.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -20,7 +20,7 @@
 #include "nsCOMPtr.h"
 #include "plhash.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 extern PRLogModuleInfo* gXULTemplateLog;
 
 #include "nsString.h"
@@ -294,7 +294,7 @@
 TestNode::Propagate(InstantiationSet& aInstantiations,
                     bool aIsUpdate, bool& aTakenInstantiations)
 {
-    PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+    MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
            ("TestNode[%p]: Propagate() begin", this));
 
     aTakenInstantiations = false;
@@ -313,7 +313,7 @@
     if (! aInstantiations.Empty()) {
         ReteNodeSet::Iterator last = mKids.Last();
         for (ReteNodeSet::Iterator kid = mKids.First(); kid != last; ++kid) {
-            PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+            MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                    ("TestNode[%p]: Propagate() passing to child %p", this, kid.operator->()));
 
             // create a copy of the instantiations
@@ -337,7 +337,7 @@
         }
     }
 
-    PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+    MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
            ("TestNode[%p]: Propagate() end", this));
 
     return NS_OK;
@@ -349,7 +349,7 @@
 {
     nsresult rv;
 
-    PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+    MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
            ("TestNode[%p]: Constrain() begin", this));
 
     // if the cantHandleYet flag is set by FilterInstantiations,
@@ -366,7 +366,7 @@
         // could not be filled in yet, then ride 'em on up to the
         // parent to narrow them.
 
-        PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+        MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                ("TestNode[%p]: Constrain() passing to parent %p", this, mParent));
 
         rv = mParent->Constrain(aInstantiations);
@@ -375,13 +375,13 @@
             rv = FilterInstantiations(aInstantiations, nullptr);
     }
     else {
-        PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+        MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                ("TestNode[%p]: Constrain() failed", this));
 
         rv = NS_OK;
     }
 
-    PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+    MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
            ("TestNode[%p]: Constrain() end", this));
 
     return rv;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsXULContentBuilder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsXULContentBuilder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsXULContentBuilder.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsXULContentBuilder.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -447,14 +447,14 @@
     nsresult rv;
 
     if (PR_LOG_TEST(gXULTemplateLog, PR_LOG_DEBUG)) {
-        PR_LOG(gXULTemplateLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gXULTemplateLog, PR_LOG_ALWAYS,
                ("nsXULContentBuilder::BuildContentFromTemplate (is unique: %d)",
                aIsUnique));
 
         nsAutoString id;
         aChild->GetId(id);
 
-        PR_LOG(gXULTemplateLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gXULTemplateLog, PR_LOG_ALWAYS,
                ("Tags: [Template: %s  Resource: %s  Real: %s] for id %s",
                 nsAtomCString(aTemplateNode->NodeInfo()->NameAtom()).get(),
                 nsAtomCString(aResourceNode->NodeInfo()->NameAtom()).get(),
@@ -524,7 +524,7 @@
         nsIAtom *tag = tmplKid->NodeInfo()->NameAtom();
 
         if (PR_LOG_TEST(gXULTemplateLog, PR_LOG_DEBUG)) {
-            PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+            MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                    ("xultemplate[%p]     building %s %s %s",
                     this, nsAtomCString(tag).get(),
                     (isGenerationElement ? "[resource]" : ""),
@@ -939,7 +939,7 @@
     // and 2) recursive subcontent (if the current element refers to a
     // container result).
 
-    PR_LOG(gXULTemplateLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gXULTemplateLog, PR_LOG_ALWAYS,
            ("nsXULContentBuilder::CreateTemplateAndContainerContents start - flags: %d",
             mFlags));
 
@@ -975,7 +975,7 @@
                                     false, true);
     }
 
-    PR_LOG(gXULTemplateLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gXULTemplateLog, PR_LOG_ALWAYS,
            ("nsXULContentBuilder::CreateTemplateAndContainerContents end"));
 
     return NS_OK;
@@ -1076,7 +1076,7 @@
     if (PR_LOG_TEST(gXULTemplateLog, PR_LOG_DEBUG)) {
         nsAutoString id;
         aResult->GetId(id);
-        PR_LOG(gXULTemplateLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gXULTemplateLog, PR_LOG_ALWAYS,
                ("nsXULContentBuilder::CreateContainerContentsForQuerySet start for ref %s\n",
                NS_ConvertUTF16toUTF8(id).get()));
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsXULContentUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsXULContentUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsXULContentUtils.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsXULContentUtils.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -45,7 +45,7 @@
 #include "nsString.h"
 #include "nsXPIDLString.h"
 #include "nsGkAtoms.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prtime.h"
 #include "rdf.h"
 #include "nsContentUtils.h"
@@ -363,6 +363,6 @@
   nsCOMPtr<nsIConsoleService> cs = do_GetService(NS_CONSOLESERVICE_CONTRACTID);
   if (cs) {
     cs->LogStringMessage(message.get());
-    PR_LOG(gXULTemplateLog, PR_LOG_ALWAYS, ("Error parsing template: %s", aStr));
+    MOZ_LOG(gXULTemplateLog, PR_LOG_ALWAYS, ("Error parsing template: %s", aStr));
   }
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsXULTemplateBuilder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsXULTemplateBuilder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsXULTemplateBuilder.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsXULTemplateBuilder.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -55,7 +55,7 @@
 #include "nsGkAtoms.h"
 #include "nsXULElement.h"
 #include "jsapi.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "rdf.h"
 #include "pldhash.h"
 #include "plhash.h"
@@ -502,7 +502,7 @@
                                    nsIXULTemplateResult* aNewResult,
                                    nsIDOMNode* aQueryNode)
 {
-    PR_LOG(gXULTemplateLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gXULTemplateLog, PR_LOG_ALWAYS,
            ("nsXULTemplateBuilder::UpdateResult %p %p %p",
            aOldResult, aNewResult, aQueryNode));
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsXULTemplateBuilder.h firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsXULTemplateBuilder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsXULTemplateBuilder.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsXULTemplateBuilder.h	2015-05-25 20:44:10.000000000 +0000
@@ -25,7 +25,7 @@
 #include "nsIXULTemplateQueryProcessor.h"
 #include "nsCycleCollectionParticipant.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 extern PRLogModuleInfo* gXULTemplateLog;
 
 class nsIContent;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -492,7 +492,7 @@
                 nsAutoString mvar;
                 query->mMemberVariable->ToString(mvar);
 
-                PR_LOG(gXULTemplateLog, PR_LOG_ALWAYS,
+                MOZ_LOG(gXULTemplateLog, PR_LOG_ALWAYS,
                        ("QueryProcessor::GenerateResults using ref %s and vars [ ref: %s  member: %s]",
                        NS_ConvertUTF16toUTF8(id).get(),
                        NS_ConvertUTF16toUTF8(rvar).get(),
@@ -871,7 +871,7 @@
         nsAutoString targetStr;
         nsXULContentUtils::GetTextForNode(aTarget, targetStr);
 
-        PR_LOG(gXULTemplateLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gXULTemplateLog, PR_LOG_ALWAYS,
                ("nsXULTemplateQueryProcessorRDF::Propagate: [%s] -> [%s] -> [%s]\n",
                sourceStr, propertyStr, NS_ConvertUTF16toUTF8(targetStr).get()));
     }
@@ -958,7 +958,7 @@
         nsAutoString targetStr;
         nsXULContentUtils::GetTextForNode(aTarget, targetStr);
 
-        PR_LOG(gXULTemplateLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gXULTemplateLog, PR_LOG_ALWAYS,
                ("nsXULTemplateQueryProcessorRDF::Retract: [%s] -> [%s] -> [%s]\n",
                sourceStr, propertyStr, NS_ConvertUTF16toUTF8(targetStr).get()));
     }
@@ -1031,7 +1031,7 @@
         if (NS_FAILED(rv))
             return rv;
 
-        PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+        MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                ("xultemplate[%p] %8s [%s]--", this, aOperation, sourceStr));
 
         const char* propertyStr;
@@ -1046,7 +1046,7 @@
 
         nsAutoCString targetstrC;
         targetstrC.AssignWithConversion(targetStr);
-        PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+        MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                ("                        --[%s]-->[%s]",
                 propertyStr,
                 targetstrC.get()));
@@ -1275,7 +1275,7 @@
 
         nsAutoCString tagstrC;
         tagstrC.AssignWithConversion(tagstr);
-        PR_LOG(gXULTemplateLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gXULTemplateLog, PR_LOG_ALWAYS,
                ("xultemplate[%p] unrecognized condition test <%s>",
                 this, tagstrC.get()));
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsXULTemplateQueryProcessorRDF.h firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsXULTemplateQueryProcessorRDF.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsXULTemplateQueryProcessorRDF.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsXULTemplateQueryProcessorRDF.h	2015-05-25 20:44:10.000000000 +0000
@@ -28,7 +28,7 @@
 #include "nsCycleCollectionParticipant.h"
 #include "mozilla/Attributes.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 extern PRLogModuleInfo* gXULTemplateLog;
 
 class nsIContent;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -290,7 +290,7 @@
     nsAutoString sqlQuery;
 
     // Let's get all text nodes (which should be the query) 
-    if (!nsContentUtils::GetNodeTextContent(queryContent, false, sqlQuery)) {
+    if (!nsContentUtils::GetNodeTextContent(queryContent, false, sqlQuery, fallible)) {
       return NS_ERROR_OUT_OF_MEMORY;
     }
 
@@ -308,7 +308,7 @@
 
         if (child->NodeInfo()->Equals(nsGkAtoms::param, kNameSpaceID_XUL)) {
             nsAutoString value;
-            if (!nsContentUtils::GetNodeTextContent(child, false, value)) {
+            if (!nsContentUtils::GetNodeTextContent(child, false, value, fallible)) {
               return NS_ERROR_OUT_OF_MEMORY;
             }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsXULTreeBuilder.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsXULTreeBuilder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/templates/nsXULTreeBuilder.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/templates/nsXULTreeBuilder.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -1230,7 +1230,7 @@
         if (row >= 0)
             mBoxObject->InvalidateRow(row);
 
-        PR_LOG(gXULTemplateLog, PR_LOG_DEBUG,
+        MOZ_LOG(gXULTemplateLog, PR_LOG_DEBUG,
                ("xultemplate[%p]   => row %d", this, row));
     }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/XULDocument.cpp firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/XULDocument.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/XULDocument.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/XULDocument.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -50,7 +50,7 @@
 #include "nsPIWindowRoot.h"
 #include "nsXULCommandDispatcher.h"
 #include "nsXULElement.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "rdf.h"
 #include "nsIFrame.h"
 #include "nsXBLService.h"
@@ -383,7 +383,7 @@
             nsAutoCString urlspec;
             rv = uri->GetSpec(urlspec);
             if (NS_SUCCEEDED(rv)) {
-                PR_LOG(gXULLog, PR_LOG_WARNING,
+                MOZ_LOG(gXULLog, PR_LOG_WARNING,
                        ("xul: load document '%s'", urlspec.get()));
             }
         }
@@ -563,7 +563,7 @@
         nsAutoCString urlspec;
         rv = uri->GetSpec(urlspec);
         if (NS_SUCCEEDED(rv)) {
-            PR_LOG(gXULLog, PR_LOG_WARNING,
+            MOZ_LOG(gXULLog, PR_LOG_WARNING,
                    ("xul: Finished loading document '%s'", urlspec.get()));
         }
     }
@@ -765,7 +765,7 @@
     };
 
     if (! mBroadcasterMap) {
-        mBroadcasterMap = new PLDHashTable(&gOps, sizeof(BroadcasterMapEntry));
+        mBroadcasterMap = new PLDHashTable2(&gOps, sizeof(BroadcasterMapEntry));
     }
 
     BroadcasterMapEntry* entry =
@@ -2278,7 +2278,7 @@
             rv = url->GetSpec(urlspec);
             if (NS_FAILED(rv)) return rv;
 
-            PR_LOG(gXULLog, PR_LOG_ERROR,
+            MOZ_LOG(gXULLog, PR_LOG_ERROR,
                    ("xul: error parsing '%s'", urlspec.get()));
         }
 
@@ -2553,7 +2553,7 @@
         if (!(parentDoc.get()))
             parentDoc = "";
 
-        PR_LOG(gXULLog, PR_LOG_DEBUG,
+        MOZ_LOG(gXULLog, PR_LOG_DEBUG,
                 ("xul: %s loading overlay %s", parentDoc.get(), urlspec.get()));
     }
 
@@ -2613,7 +2613,7 @@
             return NS_OK;
         }
 
-        PR_LOG(gXULLog, PR_LOG_DEBUG, ("xul: overlay was cached"));
+        MOZ_LOG(gXULLog, PR_LOG_DEBUG, ("xul: overlay was cached"));
 
         // Found the overlay's prototype in the cache, fully loaded. If
         // this is a dynamic overlay, this will call ResumeWalk.
@@ -2622,10 +2622,10 @@
     }
     else {
         // Not there. Initiate a load.
-        PR_LOG(gXULLog, PR_LOG_DEBUG, ("xul: overlay was not cached"));
+        MOZ_LOG(gXULLog, PR_LOG_DEBUG, ("xul: overlay was not cached"));
 
         if (mIsGoingAway) {
-            PR_LOG(gXULLog, PR_LOG_DEBUG, ("xul: ...and document already destroyed"));
+            MOZ_LOG(gXULLog, PR_LOG_DEBUG, ("xul: ...and document already destroyed"));
             return NS_ERROR_NOT_AVAILABLE;
         }
 
@@ -3577,7 +3577,7 @@
     nsresult rv = NS_OK;
 
     if (PR_LOG_TEST(gXULLog, PR_LOG_NOTICE)) {
-        PR_LOG(gXULLog, PR_LOG_NOTICE,
+        MOZ_LOG(gXULLog, PR_LOG_NOTICE,
                ("xul: creating <%s> from prototype",
                 NS_ConvertUTF16toUTF8(aPrototype->mNodeInfo->QualifiedName()).get()));
     }
@@ -3849,7 +3849,7 @@
     if (PR_LOG_TEST(gXULLog, PR_LOG_NOTICE)) {
         nsAutoCString idC;
         idC.AssignWithConversion(id);
-        PR_LOG(gXULLog, PR_LOG_NOTICE,
+        MOZ_LOG(gXULLog, PR_LOG_NOTICE,
                ("xul: overlay resolved '%s'",
                 idC.get()));
     }
@@ -4031,7 +4031,7 @@
         nsresult rv = mDocument->mChannel->GetOriginalURI(getter_AddRefs(docURI));
         if (NS_SUCCEEDED(rv))
             docURI->GetSpec(parentDoc);
-        PR_LOG(gXULLog, PR_LOG_WARNING,
+        MOZ_LOG(gXULLog, PR_LOG_WARNING,
                ("xul: %s overlay failed to resolve '%s' in %s",
                 urlspec.get(), idC.get(), parentDoc.get()));
     }
@@ -4076,7 +4076,7 @@
         nsAutoCString attributeC,broadcasteridC;
         attributeC.AssignWithConversion(attribute);
         broadcasteridC.AssignWithConversion(broadcasterID);
-        PR_LOG(gXULLog, PR_LOG_WARNING,
+        MOZ_LOG(gXULLog, PR_LOG_WARNING,
                ("xul: broadcaster hookup failed <%s attribute='%s'> to %s",
                 nsAtomCString(mObservesElement->NodeInfo()->NameAtom()).get(),
                 attributeC.get(),
@@ -4288,7 +4288,7 @@
         nsAutoCString attributeC,broadcasteridC;
         attributeC.AssignWithConversion(attribute);
         broadcasteridC.AssignWithConversion(broadcasterID);
-        PR_LOG(gXULLog, PR_LOG_NOTICE,
+        MOZ_LOG(gXULLog, PR_LOG_NOTICE,
                ("xul: broadcaster hookup <%s attribute='%s'> to %s",
                 nsAtomCString(content->NodeInfo()->NameAtom()).get(),
                 attributeC.get(),
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/XULDocument.h firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/XULDocument.h
--- firefox-trunk-41.0~a1~hg20150513r243603/dom/xul/XULDocument.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/dom/xul/XULDocument.h	2015-05-25 20:44:09.000000000 +0000
@@ -719,7 +719,7 @@
     /**
      * A map from a broadcaster element to a list of listener elements.
      */
-    PLDHashTable* mBroadcasterMap;
+    PLDHashTable2* mBroadcasterMap;
 
     nsAutoPtr<nsInterfaceHashtable<nsURIHashKey,nsIObserver> > mOverlayLoadObservers;
     nsAutoPtr<nsInterfaceHashtable<nsURIHashKey,nsIObserver> > mPendingOverlayLoadNotifications;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/editor/composer/nsComposerCommands.cpp firefox-trunk-41.0~a1~hg20150524r245419/editor/composer/nsComposerCommands.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/editor/composer/nsComposerCommands.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/editor/composer/nsComposerCommands.cpp	2015-05-25 20:44:11.000000000 +0000
@@ -1311,7 +1311,15 @@
 NS_IMETHODIMP
 nsInsertHTMLCommand::DoCommand(const char *aCommandName, nsISupports *refCon)
 {
-  return NS_ERROR_NOT_IMPLEMENTED;
+  // If nsInsertHTMLCommand is called with no parameters, it was probably called with
+  // an empty string parameter ''. In this case, it should act the same as the delete command
+  NS_ENSURE_ARG_POINTER(refCon);
+
+  nsCOMPtr<nsIHTMLEditor> editor = do_QueryInterface(refCon);
+  NS_ENSURE_TRUE(editor, NS_ERROR_NOT_IMPLEMENTED);
+
+  nsString html = EmptyString();
+  return editor->InsertHTML(html);
 }
 
 NS_IMETHODIMP
@@ -1330,10 +1338,7 @@
   nsresult rv = aParams->GetStringValue(STATE_DATA, html);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  if (!html.IsEmpty())
-    return editor->InsertHTML(html);
-
-  return NS_OK;
+  return editor->InsertHTML(html);
 }
 
 NS_IMETHODIMP
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/nsEditor.cpp firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/nsEditor.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/nsEditor.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/nsEditor.cpp	2015-05-25 20:44:11.000000000 +0000
@@ -1807,10 +1807,12 @@
 void
 nsEditor::NotifyEditorObservers(NotificationForEditorObservers aNotification)
 {
+  // Copy the observers since EditAction()s can modify mEditorObservers.
+  nsTArray<mozilla::dom::OwningNonNull<nsIEditorObserver>> observers(mEditorObservers);
   switch (aNotification) {
     case eNotifyEditorObserversOfEnd:
       mIsInEditAction = false;
-      for (auto& observer : mEditorObservers) {
+      for (auto& observer : observers) {
         observer->EditAction();
       }
 
@@ -1822,13 +1824,13 @@
       break;
     case eNotifyEditorObserversOfBefore:
       mIsInEditAction = true;
-      for (auto& observer : mEditorObservers) {
+      for (auto& observer : observers) {
         observer->BeforeEditAction();
       }
       break;
     case eNotifyEditorObserversOfCancel:
       mIsInEditAction = false;
-      for (auto& observer : mEditorObservers) {
+      for (auto& observer : observers) {
         observer->CancelEditAction();
       }
       break;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/nsEditorUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/nsEditorUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/nsEditorUtils.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/nsEditorUtils.cpp	2015-05-25 20:44:11.000000000 +0000
@@ -66,19 +66,18 @@
  * some helper classes for iterating the dom tree
  *****************************************************************************/
 
-nsDOMIterator::nsDOMIterator(nsRange& aRange)
+nsDOMIterator::nsDOMIterator(nsINode& aNode)
 {
-  MOZ_ASSERT(aRange.GetStartParent(), "Invalid range");
   mIter = NS_NewContentIterator();
-  DebugOnly<nsresult> res = mIter->Init(&aRange);
+  DebugOnly<nsresult> res = mIter->Init(&aNode);
   MOZ_ASSERT(NS_SUCCEEDED(res));
 }
 
-nsDOMIterator::nsDOMIterator(nsINode& aNode)
+nsresult
+nsDOMIterator::Init(nsRange& aRange)
 {
   mIter = NS_NewContentIterator();
-  DebugOnly<nsresult> res = mIter->Init(&aNode);
-  MOZ_ASSERT(NS_SUCCEEDED(res));
+  return mIter->Init(&aRange);
 }
 
 nsDOMIterator::nsDOMIterator()
@@ -103,11 +102,15 @@
   }
 }
 
-nsDOMSubtreeIterator::nsDOMSubtreeIterator(nsRange& aRange)
+nsDOMSubtreeIterator::nsDOMSubtreeIterator()
+{
+}
+
+nsresult
+nsDOMSubtreeIterator::Init(nsRange& aRange)
 {
   mIter = NS_NewContentSubtreeIterator();
-  DebugOnly<nsresult> res = mIter->Init(&aRange);
-  MOZ_ASSERT(NS_SUCCEEDED(res));
+  return mIter->Init(&aRange);
 }
 
 nsDOMSubtreeIterator::~nsDOMSubtreeIterator()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/nsEditorUtils.h firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/nsEditorUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/nsEditorUtils.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/nsEditorUtils.h	2015-05-25 20:44:11.000000000 +0000
@@ -173,24 +173,26 @@
 class MOZ_STACK_CLASS nsDOMIterator
 {
   public:
-    explicit nsDOMIterator(nsRange& aRange);
+    nsDOMIterator();
+
     explicit nsDOMIterator(nsINode& aNode);
     virtual ~nsDOMIterator();
 
+    nsresult Init(nsRange& aRange);
+
     void AppendList(const nsBoolDomIterFunctor& functor,
                     nsTArray<mozilla::dom::OwningNonNull<nsINode>>& arrayOfNodes) const;
   protected:
     nsCOMPtr<nsIContentIterator> mIter;
-
-    // For nsDOMSubtreeIterator
-    nsDOMIterator();
 };
 
 class MOZ_STACK_CLASS nsDOMSubtreeIterator : public nsDOMIterator
 {
   public:
-    explicit nsDOMSubtreeIterator(nsRange& aRange);
+    nsDOMSubtreeIterator();
     virtual ~nsDOMSubtreeIterator();
+
+    nsresult Init(nsRange& aRange);
 };
 
 class nsTrivialFunctor : public nsBoolDomIterFunctor
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/nsHTMLAbsPosition.cpp firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/nsHTMLAbsPosition.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/nsHTMLAbsPosition.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/nsHTMLAbsPosition.cpp	2015-05-25 20:44:11.000000000 +0000
@@ -500,7 +500,7 @@
 
     AddPositioningOffset(x, y);
     SnapToGrid(x, y);
-    SetElementPosition(aElement, x, y);
+    SetElementPosition(*element, x, y);
 
     // we may need to create a br if the positioned element is alone in its
     // container
@@ -579,13 +579,19 @@
 {
   nsCOMPtr<Element> element = do_QueryInterface(aElement);
   NS_ENSURE_STATE(element);
-  nsAutoEditBatch batchIt(this);
 
-  mHTMLCSSUtils->SetCSSPropertyPixels(*element, *nsGkAtoms::left, aX);
-  mHTMLCSSUtils->SetCSSPropertyPixels(*element, *nsGkAtoms::top, aY);
+  SetElementPosition(*element, aX, aY);
   return NS_OK;
 }
 
+void
+nsHTMLEditor::SetElementPosition(dom::Element& aElement, int32_t aX, int32_t aY)
+{
+  nsAutoEditBatch batchIt(this);
+  mHTMLCSSUtils->SetCSSPropertyPixels(aElement, *nsGkAtoms::left, aX);
+  mHTMLCSSUtils->SetCSSPropertyPixels(aElement, *nsGkAtoms::top, aY);
+}
+
 // self-explanatory
 NS_IMETHODIMP
 nsHTMLEditor::GetPositionedElement(nsIDOMElement ** aReturn)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/nsHTMLDataTransfer.cpp firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/nsHTMLDataTransfer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/nsHTMLDataTransfer.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/nsHTMLDataTransfer.cpp	2015-05-25 20:44:11.000000000 +0000
@@ -99,7 +99,7 @@
 static bool FindIntegerAfterString(const char *aLeadingString, 
                                      nsCString &aCStr, int32_t &foundNumber);
 static nsresult RemoveFragComments(nsCString &theStr);
-static void RemoveBodyAndHead(nsIDOMNode *aNode);
+static void RemoveBodyAndHead(nsINode& aNode);
 static nsresult FindTargetNode(nsIDOMNode *aStart, nsCOMPtr<nsIDOMNode> &aResult);
 
 nsresult
@@ -303,6 +303,11 @@
                            streamEndParentNode, streamEndOffset);
 
   if (nodeList.Length() == 0) {
+    // We aren't inserting anything, but if aDeleteSelection is set, we do want
+    // to delete everything.
+    if (aDeleteSelection) {
+      return DeleteSelection(eNone, eStrip);
+    }
     return NS_OK;
   }
 
@@ -769,36 +774,27 @@
 
 
 nsresult
-nsHTMLEditor::StripFormattingNodes(nsIDOMNode *aNode, bool aListOnly)
+nsHTMLEditor::StripFormattingNodes(nsIContent& aNode, bool aListOnly)
 {
-  NS_ENSURE_TRUE(aNode, NS_ERROR_NULL_POINTER);
-
-  nsCOMPtr<nsIContent> content = do_QueryInterface(aNode);
-  if (content->TextIsOnlyWhitespace())
-  {
-    nsCOMPtr<nsIDOMNode> parent, ignored;
-    aNode->GetParentNode(getter_AddRefs(parent));
-    if (parent)
-    {
+  if (aNode.TextIsOnlyWhitespace()) {
+    nsCOMPtr<nsINode> parent = aNode.GetParentNode();
+    if (parent) {
       if (!aListOnly || nsHTMLEditUtils::IsList(parent)) {
-        return parent->RemoveChild(aNode, getter_AddRefs(ignored));
+        ErrorResult rv;
+        parent->RemoveChild(aNode, rv);
+        return rv.StealNSResult();
       }
       return NS_OK;
     }
   }
 
-  if (!nsHTMLEditUtils::IsPre(aNode))
-  {
-    nsCOMPtr<nsIDOMNode> child;
-    aNode->GetLastChild(getter_AddRefs(child));
-
-    while (child)
-    {
-      nsCOMPtr<nsIDOMNode> tmp;
-      child->GetPreviousSibling(getter_AddRefs(tmp));
-      nsresult rv = StripFormattingNodes(child, aListOnly);
+  if (!aNode.IsHTMLElement(nsGkAtoms::pre)) {
+    nsCOMPtr<nsIContent> child = aNode.GetLastChild();
+    while (child) {
+      nsCOMPtr<nsIContent> previous = child->GetPreviousSibling();
+      nsresult rv = StripFormattingNodes(*child, aListOnly);
       NS_ENSURE_SUCCESS(rv, rv);
-      child = tmp;
+      child = previous.forget();
     }
   }
   return NS_OK;
@@ -1093,7 +1089,7 @@
                                  aSourceDoc,
                                  aDestinationNode, aDestOffset,
                                  aDoDeleteSelection,
-                                 aIsSafe);
+                                 aIsSafe, false);
   }
 
   return NS_OK;
@@ -1893,39 +1889,34 @@
 }
 
 
-void RemoveBodyAndHead(nsIDOMNode *aNode)
+void RemoveBodyAndHead(nsINode& aNode)
 {
-  if (!aNode)
-    return;
-
-  nsCOMPtr<nsIDOMNode> tmp, child, body, head;
+  nsCOMPtr<nsIContent> body, head;
   // find the body and head nodes if any.
   // look only at immediate children of aNode.
-  aNode->GetFirstChild(getter_AddRefs(child));
-  while (child)
-  {
-    if (nsTextEditUtils::IsBody(child))
-    {
+  for (nsCOMPtr<nsIContent> child = aNode.GetFirstChild();
+       child;
+       child = child->GetNextSibling()) {
+    if (child->IsHTMLElement(nsGkAtoms::body)) {
       body = child;
-    } else if (nsEditor::NodeIsType(child, nsGkAtoms::head)) {
+    } else if (child->IsHTMLElement(nsGkAtoms::head)) {
       head = child;
     }
-    child->GetNextSibling(getter_AddRefs(tmp));
-    child = tmp;
   }
-  if (head)
-  {
-    aNode->RemoveChild(head, getter_AddRefs(tmp));
-  }
-  if (body)
-  {
-    body->GetFirstChild(getter_AddRefs(child));
-    while (child)
-    {
-      aNode->InsertBefore(child, body, getter_AddRefs(tmp));
-      body->GetFirstChild(getter_AddRefs(child));
+  if (head) {
+    ErrorResult ignored;
+    aNode.RemoveChild(*head, ignored);
+  }
+  if (body) {
+    nsCOMPtr<nsIContent> child = body->GetFirstChild();
+    while (child) {
+      ErrorResult ignored;
+      aNode.InsertBefore(*child, body, ignored);
+      child = body->GetFirstChild();
     }
-    aNode->RemoveChild(body, getter_AddRefs(tmp));
+
+    ErrorResult ignored;
+    aNode.RemoveChild(*body, ignored);
   }
 }
 
@@ -2006,27 +1997,24 @@
                                                   bool aTrustedInput)
 {
   NS_ENSURE_TRUE(outFragNode && outStartNode && outEndNode, NS_ERROR_NULL_POINTER);
-  nsCOMPtr<nsIDOMDocumentFragment> docfrag;
-  nsCOMPtr<nsIDOMNode> contextAsNode, tmp;
-  nsresult rv = NS_OK;
 
   nsCOMPtr<nsIDocument> doc = GetDocument();
   NS_ENSURE_TRUE(doc, NS_ERROR_FAILURE);
 
   // if we have context info, create a fragment for that
-  nsCOMPtr<nsIDOMDocumentFragment> contextfrag;
-  nsCOMPtr<nsIDOMNode> contextLeaf, junk;
-  if (!aContextStr.IsEmpty())
-  {
-    rv = ParseFragment(aContextStr, nullptr, doc, address_of(contextAsNode),
+  nsresult rv = NS_OK;
+  nsCOMPtr<nsIDOMNode> contextLeaf;
+  nsRefPtr<DocumentFragment> contextAsNode;
+  if (!aContextStr.IsEmpty()) {
+    rv = ParseFragment(aContextStr, nullptr, doc, getter_AddRefs(contextAsNode),
                        aTrustedInput);
     NS_ENSURE_SUCCESS(rv, rv);
     NS_ENSURE_TRUE(contextAsNode, NS_ERROR_FAILURE);
 
-    rv = StripFormattingNodes(contextAsNode);
+    rv = StripFormattingNodes(*contextAsNode);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    RemoveBodyAndHead(contextAsNode);
+    RemoveBodyAndHead(*contextAsNode);
 
     rv = FindTargetNode(contextAsNode, contextLeaf);
     if (rv == NS_FOUND_TARGET) {
@@ -2047,64 +2035,65 @@
   } else {
     contextAtom = nsGkAtoms::body;
   }
+  nsRefPtr<DocumentFragment> fragment;
   rv = ParseFragment(aInputString,
                      contextAtom,
                      doc,
-                     outFragNode,
+                     getter_AddRefs(fragment),
                      aTrustedInput);
   NS_ENSURE_SUCCESS(rv, rv);
-  NS_ENSURE_TRUE(*outFragNode, NS_ERROR_FAILURE);
+  NS_ENSURE_TRUE(fragment, NS_ERROR_FAILURE);
 
-  RemoveBodyAndHead(*outFragNode);
+  RemoveBodyAndHead(*fragment);
 
-  if (contextAsNode)
-  {
+  if (contextAsNode) {
     // unite the two trees
-    contextLeaf->AppendChild(*outFragNode, getter_AddRefs(junk));
-    *outFragNode = contextAsNode;
+    nsCOMPtr<nsIDOMNode> junk;
+    contextLeaf->AppendChild(fragment, getter_AddRefs(junk));
+    fragment = contextAsNode;
   }
 
-  rv = StripFormattingNodes(*outFragNode, true);
+  rv = StripFormattingNodes(*fragment, true);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // If there was no context, then treat all of the data we did get as the
   // pasted data.
-  if (contextLeaf)
+  if (contextLeaf) {
     *outEndNode = *outStartNode = contextLeaf;
-  else
-    *outEndNode = *outStartNode = *outFragNode;
+  } else {
+    *outEndNode = *outStartNode = fragment;
+  }
 
+  *outFragNode = fragment.forget();
   *outStartOffset = 0;
 
   // get the infoString contents
-  nsAutoString numstr1, numstr2;
-  if (!aInfoStr.IsEmpty())
-  {
-    int32_t sep, num;
-    sep = aInfoStr.FindChar((char16_t)',');
-    numstr1 = Substring(aInfoStr, 0, sep);
-    numstr2 = Substring(aInfoStr, sep+1, aInfoStr.Length() - (sep+1));
+  if (!aInfoStr.IsEmpty()) {
+    int32_t sep = aInfoStr.FindChar((char16_t)',');
+    nsAutoString numstr1(Substring(aInfoStr, 0, sep));
+    nsAutoString numstr2(Substring(aInfoStr, sep+1, aInfoStr.Length() - (sep+1)));
 
     // Move the start and end children.
     nsresult err;
-    num = numstr1.ToInteger(&err);
-    while (num--)
-    {
+    int32_t num = numstr1.ToInteger(&err);
+
+    nsCOMPtr<nsIDOMNode> tmp;
+    while (num--) {
       (*outStartNode)->GetFirstChild(getter_AddRefs(tmp));
       NS_ENSURE_TRUE(tmp, NS_ERROR_FAILURE);
       tmp.swap(*outStartNode);
     }
 
     num = numstr2.ToInteger(&err);
-    while (num--)
-    {
+    while (num--) {
       (*outEndNode)->GetLastChild(getter_AddRefs(tmp));
       NS_ENSURE_TRUE(tmp, NS_ERROR_FAILURE);
       tmp.swap(*outEndNode);
     }
   }
 
-  GetLengthOfDOMNode(*outEndNode, (uint32_t&)*outEndOffset);
+  nsCOMPtr<nsINode> node = do_QueryInterface(*outEndNode);
+  *outEndOffset = node->Length();
   return NS_OK;
 }
 
@@ -2112,7 +2101,7 @@
 nsresult nsHTMLEditor::ParseFragment(const nsAString & aFragStr,
                                      nsIAtom* aContextLocalName,
                                      nsIDocument* aTargetDocument,
-                                     nsCOMPtr<nsIDOMNode> *outNode,
+                                     DocumentFragment** aFragment,
                                      bool aTrustedInput)
 {
   nsAutoScriptBlockerSuppressNodeRemoved autoBlocker;
@@ -2132,7 +2121,7 @@
                               nsIParserUtils::SanitizerAllowComments);
     sanitizer.Sanitize(fragment);
   }
-  *outNode = fragment.forget();
+  fragment.forget(aFragment);
   return rv;
 }
 
@@ -2162,7 +2151,9 @@
 
   // Now use a subtree iterator over the range to create a list of nodes
   nsTrivialFunctor functor;
-  nsDOMSubtreeIterator iter(*docFragRange);
+  nsDOMSubtreeIterator iter;
+  rv = iter.Init(*docFragRange);
+  NS_ENSURE_SUCCESS(rv, );
   iter.AppendList(functor, outNodeList);
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/nsHTMLEditor.h firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/nsHTMLEditor.h
--- firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/nsHTMLEditor.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/nsHTMLEditor.h	2015-05-25 20:44:11.000000000 +0000
@@ -54,8 +54,9 @@
 
 namespace mozilla {
 namespace dom {
+class DocumentFragment;
 template<class T> class OwningNonNull;
-}
+} // namespace dom
 namespace widget {
 struct IMEState;
 } // namespace widget
@@ -580,7 +581,7 @@
                                      bool *aDoContinue);
 
   bool       IsInLink(nsIDOMNode *aNode, nsCOMPtr<nsIDOMNode> *outLink = nullptr);
-  nsresult   StripFormattingNodes(nsIDOMNode *aNode, bool aOnlyList = false);
+  nsresult   StripFormattingNodes(nsIContent& aNode, bool aOnlyList = false);
   nsresult   CreateDOMFragmentFromPaste(const nsAString & aInputString,
                                         const nsAString & aContextStr,
                                         const nsAString & aInfoStr,
@@ -592,7 +593,7 @@
                                         bool aTrustedInput);
   nsresult   ParseFragment(const nsAString & aStr, nsIAtom* aContextLocalName,
                            nsIDocument* aTargetDoc,
-                           nsCOMPtr<nsIDOMNode> *outNode,
+                           mozilla::dom::DocumentFragment** aFragment,
                            bool aTrustedInput);
   void       CreateListOfNodesToPaste(mozilla::dom::DocumentFragment& aFragment,
                                       nsTArray<mozilla::dom::OwningNonNull<nsINode>>& outNodeList,
@@ -673,6 +674,10 @@
                              nsIAtom *aProperty, 
                              const nsAString *aAttribute, 
                              const bool aChildrenOnly = false);
+  nsresult RemoveStyleInside(nsIContent& aNode,
+                             nsIAtom* aProperty,
+                             const nsAString* aAttribute,
+                             const bool aChildrenOnly = false);
   nsresult RemoveInlinePropertyImpl(nsIAtom* aProperty,
                                     const nsAString* aAttribute);
 
@@ -724,7 +729,7 @@
                                  nsAString* outValue,
                                  bool aCheckDefaults = true);
   bool HasStyleOrIdOrClass(mozilla::dom::Element* aElement);
-  nsresult RemoveElementIfNoStyleOrIdOrClass(nsIDOMNode* aElement);
+  nsresult RemoveElementIfNoStyleOrIdOrClass(mozilla::dom::Element& aElement);
 
   // Whether the outer window of the DOM event target has focus or not.
   bool     OurWindowHasFocus();
@@ -753,6 +758,9 @@
   nsresult ClearStyle(nsCOMPtr<nsIDOMNode>* aNode, int32_t* aOffset,
                       nsIAtom* aProperty, const nsAString* aAttribute);
 
+  void SetElementPosition(mozilla::dom::Element& aElement,
+                          int32_t aX, int32_t aY);
+
 // Data members
 protected:
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/nsHTMLEditorStyle.cpp firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/nsHTMLEditorStyle.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/nsHTMLEditorStyle.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/nsHTMLEditorStyle.cpp	2015-05-25 20:44:11.000000000 +0000
@@ -483,7 +483,7 @@
   NS_ENSURE_STATE(aNode.GetParentNode());
   OwningNonNull<nsINode> parent = *aNode.GetParentNode();
 
-  nsresult res = RemoveStyleInside(aNode.AsDOMNode(), &aProperty, aAttribute);
+  nsresult res = RemoveStyleInside(aNode, &aProperty, aAttribute);
   NS_ENSURE_SUCCESS(res, res);
 
   if (aNode.GetParentNode()) {
@@ -722,68 +722,79 @@
                                          const bool aChildrenOnly)
 {
   NS_ENSURE_TRUE(aNode, NS_ERROR_NULL_POINTER);
-  if (IsTextNode(aNode)) {
-    return NS_OK;
-  }
-  nsresult res;
   nsCOMPtr<nsIContent> content = do_QueryInterface(aNode);
   NS_ENSURE_STATE(content);
 
+  return RemoveStyleInside(*content, aProperty, aAttribute, aChildrenOnly);
+}
+
+nsresult
+nsHTMLEditor::RemoveStyleInside(nsIContent& aNode,
+                                nsIAtom* aProperty,
+                                const nsAString* aAttribute,
+                                const bool aChildrenOnly /* = false */)
+{
+  if (aNode.NodeType() == nsIDOMNode::TEXT_NODE) {
+    return NS_OK;
+  }
+
   // first process the children
-  nsCOMPtr<nsIDOMNode> child, tmp;
-  aNode->GetFirstChild(getter_AddRefs(child));
+  nsRefPtr<nsIContent> child = aNode.GetFirstChild();
   while (child) {
     // cache next sibling since we might remove child
-    child->GetNextSibling(getter_AddRefs(tmp));
-    res = RemoveStyleInside(child, aProperty, aAttribute);
+    nsCOMPtr<nsIContent> next = child->GetNextSibling();
+    nsresult res = RemoveStyleInside(*child, aProperty, aAttribute);
     NS_ENSURE_SUCCESS(res, res);
-    child = tmp;
+    child = next.forget();
   }
 
   // then process the node itself
   if (!aChildrenOnly &&
     (
       // node is prop we asked for
-      (aProperty && NodeIsType(aNode, aProperty)) ||
+      (aProperty && aNode.NodeInfo()->NameAtom() == aProperty) ||
       // but check for link (<a href=...)
-      (aProperty == nsGkAtoms::href && nsHTMLEditUtils::IsLink(aNode)) ||
+      (aProperty == nsGkAtoms::href && nsHTMLEditUtils::IsLink(&aNode)) ||
       // and for named anchors
-      (aProperty == nsGkAtoms::name && nsHTMLEditUtils::IsNamedAnchor(aNode)) ||
+      (aProperty == nsGkAtoms::name && nsHTMLEditUtils::IsNamedAnchor(&aNode)) ||
       // or node is any prop and we asked for that
-      (!aProperty && NodeIsProperty(aNode))
+      (!aProperty && NodeIsProperty(aNode.AsDOMNode()))
     )
   ) {
+    nsresult res;
     // if we weren't passed an attribute, then we want to 
     // remove any matching inlinestyles entirely
     if (!aAttribute || aAttribute->IsEmpty()) {
       NS_NAMED_LITERAL_STRING(styleAttr, "style");
       NS_NAMED_LITERAL_STRING(classAttr, "class");
-      bool hasStyleAttr = HasAttr(aNode, &styleAttr);
-      bool hasClassAttr = HasAttr(aNode, &classAttr);
+
+      bool hasStyleAttr = aNode.HasAttr(kNameSpaceID_None, nsGkAtoms::style);
+      bool hasClassAttr = aNode.HasAttr(kNameSpaceID_None, nsGkAtoms::_class);
       if (aProperty && (hasStyleAttr || hasClassAttr)) {
         // aNode carries inline styles or a class attribute so we can't
         // just remove the element... We need to create above the element
         // a span that will carry those styles or class, then we can delete
         // the node.
         nsCOMPtr<Element> spanNode =
-          InsertContainerAbove(content, nsGkAtoms::span);
+          InsertContainerAbove(&aNode, nsGkAtoms::span);
         NS_ENSURE_STATE(spanNode);
-        res = CloneAttribute(styleAttr, spanNode->AsDOMNode(), aNode);
+        res = CloneAttribute(styleAttr, spanNode->AsDOMNode(), aNode.AsDOMNode());
         NS_ENSURE_SUCCESS(res, res);
-        res = CloneAttribute(classAttr, spanNode->AsDOMNode(), aNode);
+        res = CloneAttribute(classAttr, spanNode->AsDOMNode(), aNode.AsDOMNode());
         NS_ENSURE_SUCCESS(res, res);
       }
-      res = RemoveContainer(content);
+      res = RemoveContainer(&aNode);
       NS_ENSURE_SUCCESS(res, res);
     } else {
       // otherwise we just want to eliminate the attribute
-      if (HasAttr(aNode, aAttribute)) {
+      nsCOMPtr<nsIAtom> attribute = do_GetAtom(*aAttribute);
+      if (aNode.HasAttr(kNameSpaceID_None, attribute)) {
         // if this matching attribute is the ONLY one on the node,
         // then remove the whole node.  Otherwise just nix the attribute.
-        if (IsOnlyAttribute(aNode, aAttribute)) {
-          res = RemoveContainer(content);
+        if (IsOnlyAttribute(&aNode, *aAttribute)) {
+          res = RemoveContainer(&aNode);
         } else {
-          nsCOMPtr<nsIDOMElement> elem = do_QueryInterface(aNode);
+          nsCOMPtr<nsIDOMElement> elem = do_QueryInterface(&aNode);
           NS_ENSURE_TRUE(elem, NS_ERROR_NULL_POINTER);
           res = RemoveAttribute(elem, *aAttribute);
         }
@@ -793,25 +804,24 @@
   }
 
   if (!aChildrenOnly &&
-      mHTMLCSSUtils->IsCSSEditableProperty(content, aProperty, aAttribute)) {
+      mHTMLCSSUtils->IsCSSEditableProperty(&aNode, aProperty, aAttribute)) {
     // the HTML style defined by aProperty/aAttribute has a CSS equivalence in
     // this implementation for the node aNode; let's check if it carries those
     // css styles
     nsAutoString propertyValue;
-    bool isSet;
-    mHTMLCSSUtils->IsCSSEquivalentToHTMLInlineStyleSet(aNode, aProperty,
-      aAttribute, isSet, propertyValue, nsHTMLCSSUtils::eSpecified);
-    if (isSet) {
+    bool isSet = mHTMLCSSUtils->IsCSSEquivalentToHTMLInlineStyleSet(&aNode,
+      aProperty, aAttribute, propertyValue, nsHTMLCSSUtils::eSpecified);
+    if (isSet && aNode.IsElement()) {
       // yes, tmp has the corresponding css declarations in its style attribute
       // let's remove them
-      mHTMLCSSUtils->RemoveCSSEquivalentToHTMLStyle(aNode,
+      mHTMLCSSUtils->RemoveCSSEquivalentToHTMLStyle(aNode.AsElement(),
                                                     aProperty,
                                                     aAttribute,
                                                     &propertyValue,
                                                     false);
       // remove the node if it is a span or font, if its style attribute is
       // empty or absent, and if it does not have a class nor an id
-      RemoveElementIfNoStyleOrIdOrClass(aNode);
+      RemoveElementIfNoStyleOrIdOrClass(*aNode.AsElement());
     }
   }
 
@@ -819,12 +829,12 @@
     (
       // Or node is big or small and we are setting font size
       aProperty == nsGkAtoms::font &&
-      (nsHTMLEditUtils::IsBig(aNode) || nsHTMLEditUtils::IsSmall(aNode)) &&
+      (aNode.IsHTMLElement(nsGkAtoms::big) || aNode.IsHTMLElement(nsGkAtoms::small)) &&
       (aAttribute && aAttribute->LowerCaseEqualsLiteral("size"))
     )
   ) {
     // if we are setting font size, remove any nested bigs and smalls
-    return RemoveContainer(content);
+    return RemoveContainer(&aNode);
   }
   return NS_OK;
 }
@@ -1792,17 +1802,14 @@
 }
 
 nsresult
-nsHTMLEditor::RemoveElementIfNoStyleOrIdOrClass(nsIDOMNode* aElement)
+nsHTMLEditor::RemoveElementIfNoStyleOrIdOrClass(dom::Element& aElement)
 {
-  nsCOMPtr<dom::Element> element = do_QueryInterface(aElement);
-  NS_ENSURE_TRUE(element, NS_ERROR_NULL_POINTER);
-
   // early way out if node is not the right kind of element
-  if ((!element->IsHTMLElement(nsGkAtoms::span) &&
-       !element->IsHTMLElement(nsGkAtoms::font)) ||
-      HasStyleOrIdOrClass(element)) {
+  if ((!aElement.IsHTMLElement(nsGkAtoms::span) &&
+       !aElement.IsHTMLElement(nsGkAtoms::font)) ||
+      HasStyleOrIdOrClass(&aElement)) {
     return NS_OK;
   }
 
-  return RemoveContainer(element);
+  return RemoveContainer(&aElement);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/nsHTMLEditRules.cpp firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/nsHTMLEditRules.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/nsHTMLEditRules.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/nsHTMLEditRules.cpp	2015-05-25 20:44:11.000000000 +0000
@@ -276,6 +276,7 @@
   if (node->IsElement()) {
     ErrorResult rv;
     mDocChangeRange->SelectNode(*node, rv);
+    NS_ENSURE_TRUE(!rv.Failed(), rv.StealNSResult());
     AdjustSpecialBreaks();
   }
 
@@ -2403,7 +2404,9 @@
           // Build a list of nodes in the range
           nsTArray<OwningNonNull<nsINode>> arrayOfNodes;
           nsTrivialFunctor functor;
-          nsDOMSubtreeIterator iter(*range);
+          nsDOMSubtreeIterator iter;
+          nsresult res = iter.Init(*range);
+          NS_ENSURE_SUCCESS(res, res);
           iter.AppendList(functor, arrayOfNodes);
 
           // Now that we have the list, delete non-table elements
@@ -5783,7 +5786,9 @@
   }
   // Gather up a list of all the nodes
   for (auto& range : aArrayOfRanges) {
-    nsDOMSubtreeIterator iter(*range);
+    nsDOMSubtreeIterator iter;
+    nsresult res = iter.Init(*range);
+    NS_ENSURE_SUCCESS(res, res);
     if (aOutArrayOfNodes.Length() == 0) {
       iter.AppendList(nsTrivialFunctor(), aOutArrayOfNodes);
     } else {
@@ -7291,7 +7296,9 @@
   // Gather list of empty nodes
   nsTArray<OwningNonNull<nsINode>> nodeArray;
   nsEmptyEditableFunctor functor(mHTMLEditor);
-  nsDOMIterator iter(*mDocChangeRange);
+  nsDOMIterator iter;
+  nsresult res = iter.Init(*mDocChangeRange);
+  NS_ENSURE_SUCCESS(res, );
   iter.AppendList(functor, nodeArray);
 
   // Put moz-br's into these empty li's and td's
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/nsHTMLEditUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/nsHTMLEditUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/nsHTMLEditUtils.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/nsHTMLEditUtils.cpp	2015-05-25 20:44:11.000000000 +0000
@@ -27,15 +27,6 @@
 using namespace mozilla;
 
 ///////////////////////////////////////////////////////////////////////////
-//                  
-bool 
-nsHTMLEditUtils::IsBig(nsIDOMNode* aNode)
-{
-  return nsEditor::NodeIsType(aNode, nsGkAtoms::big);
-}
-
-
-///////////////////////////////////////////////////////////////////////////
 // IsInlineStyle true if node is an inline style
 //                  
 bool 
@@ -106,15 +97,6 @@
       || (nodeAtom == nsGkAtoms::blockquote);
 }
 
-///////////////////////////////////////////////////////////////////////////
-//                  
-bool 
-nsHTMLEditUtils::IsSmall(nsIDOMNode* aNode)
-{
-  return nsEditor::NodeIsType(aNode, nsGkAtoms::small);
-}
-
-
 /********************************************************
  *  helper methods from nsHTMLEditRules
  ********************************************************/
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/nsHTMLEditUtils.h firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/nsHTMLEditUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/nsHTMLEditUtils.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/nsHTMLEditUtils.h	2015-05-25 20:44:11.000000000 +0000
@@ -14,10 +14,6 @@
 class nsHTMLEditUtils
 {
 public:
-  // from nsTextEditRules:
-  static bool IsBig(nsIDOMNode *aNode);
-  static bool IsSmall(nsIDOMNode *aNode);
-
   // from nsHTMLEditRules:
   static bool IsInlineStyle(nsINode* aNode);
   static bool IsInlineStyle(nsIDOMNode *aNode);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/tests/browserscope/lib/richtext2/currentStatus.js firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/tests/browserscope/lib/richtext2/currentStatus.js
--- firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/tests/browserscope/lib/richtext2/currentStatus.js	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/tests/browserscope/lib/richtext2/currentStatus.js	2015-05-25 20:44:11.000000000 +0000
@@ -289,6 +289,9 @@
     "Q-Proposed-UNBOOKMARK_TEXT-1-dM": true,
     "Q-Proposed-UNBOOKMARK_TEXT-1-body": true,
     "Q-Proposed-UNBOOKMARK_TEXT-1-div": true,
+    "Q-Proposed-PASTE_TEXT-1-dM": true,
+    "Q-Proposed-PASTE_TEXT-1-body": true,
+    "Q-Proposed-PASTE_TEXT-1-div": true,
     "QE-Proposed-UNSELECT_TEXT-1-dM": true,
     "QE-Proposed-UNSELECT_TEXT-1-body": true,
     "QE-Proposed-UNSELECT_TEXT-1-div": true,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/tests/chrome.ini firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/tests/chrome.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/tests/chrome.ini	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/tests/chrome.ini	2015-05-25 20:44:11.000000000 +0000
@@ -25,6 +25,7 @@
 [test_bug1102906.html]
 [test_bug1101392.html]
 [test_bug1140105.html]
+[test_bug1140617.xul]
 [test_bug1154791.html]
 [test_composition_event_created_in_chrome.html]
 [test_contenteditable_text_input_handling.html]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/tests/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/tests/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/tests/mochitest.ini	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/tests/mochitest.ini	2015-05-25 20:44:11.000000000 +0000
@@ -19,6 +19,7 @@
 skip-if = os != "mac"
 [test_bug290026.html]
 [test_bug291780.html]
+[test_bug309731.html]
 [test_bug316447.html]
 [test_bug318065.html]
 [test_bug332636.html]
@@ -161,4 +162,4 @@
 [test_spellcheck_pref.html]
 skip-if = toolkit == 'android'
 [test_bug1068979.html]
-[test_bug1109465.html]
+[test_bug1109465.html]
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/tests/test_bug1140617.xul firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/tests/test_bug1140617.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/tests/test_bug1140617.xul	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/tests/test_bug1140617.xul	2015-05-25 20:44:11.000000000 +0000
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin"
+                 type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
+                 type="text/css"?>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1140617
+-->
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="Mozilla Bug 1140617" onload="runTest();">
+  <script type="application/javascript"
+          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+
+  <body xmlns="http://www.w3.org/1999/xhtml">
+  <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1140617"
+     target="_blank">Mozilla Bug 1140617</a>
+  <p/>
+  <iframe id="i1" width="200" height="100" src="about:blank" /><br />
+  <img id="i" src="green.png" />
+  <p/>
+  <pre id="test">
+  </pre>
+  </body>
+  <script class="testbody" type="application/javascript">
+  <![CDATA[
+
+function runTest() {
+  function pasteIntoAndCheck() {
+    var e = document.getElementById('i1');
+    var doc = e.contentDocument;
+    doc.designMode = "on";
+    doc.defaultView.focus();
+    var selection = doc.defaultView.getSelection();
+    selection.removeAllRanges();
+    selection.selectAllChildren(doc.body);
+    selection.collapseToEnd();
+
+    doc.execCommand("fontname", false, "Arial");
+    doc.execCommand("bold", false, null);
+    doc.execCommand("insertText", false, "12345");
+    doc.execCommand("paste", false, null);
+    doc.execCommand("insertText", false, "a");
+
+    is(doc.queryCommandValue("fontname"), "Arial", "Arial expected");
+    is(doc.queryCommandState("bold"), true, "Bold expected");
+  }
+
+  function copyToClipBoard() {
+    var tmpNode = document.popupNode;
+    document.popupNode = document.getElementById("i");
+
+    const kCmd = "cmd_copyImageContents";
+    var controller = top.document.commandDispatcher
+                     .getControllerForCommand(kCmd);
+    ok((controller && controller.isCommandEnabled(kCmd)), "have copy command");
+    controller.doCommand(kCmd);
+
+    document.popupNode = tmpNode;
+  }
+
+  copyToClipBoard();
+  pasteIntoAndCheck();
+
+  SimpleTest.finish();
+}
+
+SimpleTest.waitForExplicitFinish();
+]]>
+</script>
+</window>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/tests/test_bug309731.html firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/tests/test_bug309731.html
--- firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/tests/test_bug309731.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/tests/test_bug309731.html	2015-05-25 20:44:11.000000000 +0000
@@ -0,0 +1,58 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=309731
+-->
+<head>
+  <title>Test for Bug 309731</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=309731">Mozilla Bug 309731</a>
+<p id="display"></p>
+
+<div id="content">
+  <div id="input" contentEditable="true"></div>
+</div>
+<pre id="test">
+<script type="application/javascript">
+/** Test for Bug 309731 **/
+
+function selectNode(node) {
+  getSelection().selectAllChildren(node);
+}
+
+function selectInNode(node) {
+  getSelection().collapse(node, 0);
+}
+
+function doTest() {
+  var input = document.getElementById("input");
+
+  is(input.textContent, "", "Input node starts empty");
+
+  selectInNode(input);
+  ok(document.execCommand("inserthtml", false, ""), "execCommand should return true");
+  is(input.textContent, "", "empty inserthtml with empty selection shouldn't change contents");
+
+  selectInNode(input);
+  ok(document.execCommand("inserthtml", false, "foo"), "execCommand should return true");
+  is(input.textContent, "foo", "'foo'inserthtml with empty selection should add foo to contents");
+
+  selectNode(input);
+  ok(document.execCommand("inserthtml", false, "bar"), "execCommand should return true");
+  is(input.textContent, "bar", "'bar' inserthtml with complete selection should replace contents with bar");
+
+  selectNode(input);
+  ok(document.execCommand("inserthtml", false, ""), "execCommand should return true");
+  is(input.textContent, "", "empty inserthtml with complete selection should delete everything");
+}
+
+doTest();
+
+</script>
+</pre>
+</body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/tests/test_bug681229.html firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/tests/test_bug681229.html
--- firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/tests/test_bug681229.html	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/tests/test_bug681229.html	2015-05-25 20:44:12.000000000 +0000
@@ -32,7 +32,7 @@
 
   SimpleTest.waitForClipboard(kExpectedValue,
     function() {
-      SpecialPowers.copyString(kValue, document);
+      SpecialPowers.clipboardCopyString(kValue);
     },
     function() {
       synthesizeKey("V", {accelKey: true});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/tests/test_bug830600.html firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/tests/test_bug830600.html
--- firefox-trunk-41.0~a1~hg20150513r243603/editor/libeditor/tests/test_bug830600.html	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/editor/libeditor/tests/test_bug830600.html	2015-05-25 20:44:12.000000000 +0000
@@ -40,7 +40,7 @@
             function() {
               Components.classes["@mozilla.org/widget/clipboardhelper;1"]
                         .getService(Components.interfaces.nsIClipboardHelper)
-                        .copyString(str, document);
+                        .copyString(str);
             },
             function() {
               synthesizeKey("V", {accelKey: true});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/browser/build/nsWebBrowserModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/embedding/browser/build/nsWebBrowserModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/browser/build/nsWebBrowserModule.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/browser/build/nsWebBrowserModule.cpp	2015-05-25 20:44:13.000000000 +0000
@@ -1,6 +1,6 @@
-/* -*- 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
+/* -*- 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/. */
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/browser/nsCommandHandler.cpp firefox-trunk-41.0~a1~hg20150524r245419/embedding/browser/nsCommandHandler.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/browser/nsCommandHandler.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/browser/nsCommandHandler.cpp	2015-05-25 20:44:13.000000000 +0000
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- 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/. */
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/browser/nsCommandHandler.h firefox-trunk-41.0~a1~hg20150524r245419/embedding/browser/nsCommandHandler.h
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/browser/nsCommandHandler.h	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/browser/nsCommandHandler.h	2015-05-25 20:44:13.000000000 +0000
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- 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/. */
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/browser/nsContextMenuInfo.cpp firefox-trunk-41.0~a1~hg20150524r245419/embedding/browser/nsContextMenuInfo.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/browser/nsContextMenuInfo.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/browser/nsContextMenuInfo.cpp	2015-05-25 20:44:13.000000000 +0000
@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- 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/. */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/browser/nsContextMenuInfo.h firefox-trunk-41.0~a1~hg20150524r245419/embedding/browser/nsContextMenuInfo.h
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/browser/nsContextMenuInfo.h	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/browser/nsContextMenuInfo.h	2015-05-25 20:44:13.000000000 +0000
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- 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/. */
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/browser/nsCTooltipTextProvider.h firefox-trunk-41.0~a1~hg20150524r245419/embedding/browser/nsCTooltipTextProvider.h
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/browser/nsCTooltipTextProvider.h	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/browser/nsCTooltipTextProvider.h	2015-05-25 20:44:13.000000000 +0000
@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- 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/. */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/browser/nsDocShellTreeOwner.cpp firefox-trunk-41.0~a1~hg20150524r245419/embedding/browser/nsDocShellTreeOwner.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/browser/nsDocShellTreeOwner.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/browser/nsDocShellTreeOwner.cpp	2015-05-25 20:44:13.000000000 +0000
@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- 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/. */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/browser/nsDocShellTreeOwner.h firefox-trunk-41.0~a1~hg20150524r245419/embedding/browser/nsDocShellTreeOwner.h
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/browser/nsDocShellTreeOwner.h	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/browser/nsDocShellTreeOwner.h	2015-05-25 20:44:13.000000000 +0000
@@ -1,6 +1,6 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- 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/. */
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/browser/nsEmbedStream.cpp firefox-trunk-41.0~a1~hg20150524r245419/embedding/browser/nsEmbedStream.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/browser/nsEmbedStream.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/browser/nsEmbedStream.cpp	2015-05-25 20:44:13.000000000 +0000
@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- 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/. */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/browser/nsEmbedStream.h firefox-trunk-41.0~a1~hg20150524r245419/embedding/browser/nsEmbedStream.h
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/browser/nsEmbedStream.h	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/browser/nsEmbedStream.h	2015-05-25 20:44:13.000000000 +0000
@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- 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/. */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/browser/nsWebBrowserContentPolicy.cpp firefox-trunk-41.0~a1~hg20150524r245419/embedding/browser/nsWebBrowserContentPolicy.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/browser/nsWebBrowserContentPolicy.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/browser/nsWebBrowserContentPolicy.cpp	2015-05-25 20:44:13.000000000 +0000
@@ -1,7 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: ft=cpp tw=78 sw=4 et ts=8
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- 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/. */
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/browser/nsWebBrowserContentPolicy.h firefox-trunk-41.0~a1~hg20150524r245419/embedding/browser/nsWebBrowserContentPolicy.h
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/browser/nsWebBrowserContentPolicy.h	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/browser/nsWebBrowserContentPolicy.h	2015-05-25 20:44:13.000000000 +0000
@@ -1,6 +1,6 @@
-/* -*- 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
+/* -*- 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/. */
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/commandhandler/nsBaseCommandController.cpp firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/commandhandler/nsBaseCommandController.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/commandhandler/nsBaseCommandController.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/commandhandler/nsBaseCommandController.cpp	2015-05-25 20:44:13.000000000 +0000
@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- 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/. */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/commandhandler/nsBaseCommandController.h firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/commandhandler/nsBaseCommandController.h
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/commandhandler/nsBaseCommandController.h	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/commandhandler/nsBaseCommandController.h	2015-05-25 20:44:13.000000000 +0000
@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- 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/. */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/commandhandler/nsCommandGroup.cpp firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/commandhandler/nsCommandGroup.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/commandhandler/nsCommandGroup.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/commandhandler/nsCommandGroup.cpp	2015-05-25 20:44:13.000000000 +0000
@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- 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/. */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/commandhandler/nsCommandGroup.h firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/commandhandler/nsCommandGroup.h
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/commandhandler/nsCommandGroup.h	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/commandhandler/nsCommandGroup.h	2015-05-25 20:44:13.000000000 +0000
@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- 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/. */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/commandhandler/nsCommandManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/commandhandler/nsCommandManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/commandhandler/nsCommandManager.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/commandhandler/nsCommandManager.cpp	2015-05-25 20:44:13.000000000 +0000
@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- 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/. */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/commandhandler/nsCommandManager.h firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/commandhandler/nsCommandManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/commandhandler/nsCommandManager.h	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/commandhandler/nsCommandManager.h	2015-05-25 20:44:13.000000000 +0000
@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- 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/. */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/commandhandler/nsControllerCommandTable.cpp firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/commandhandler/nsControllerCommandTable.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/commandhandler/nsControllerCommandTable.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/commandhandler/nsControllerCommandTable.cpp	2015-05-25 20:44:13.000000000 +0000
@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- 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/. */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/commandhandler/nsControllerCommandTable.h firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/commandhandler/nsControllerCommandTable.h
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/commandhandler/nsControllerCommandTable.h	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/commandhandler/nsControllerCommandTable.h	2015-05-25 20:44:13.000000000 +0000
@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- 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/. */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/find/nsFind.cpp firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/find/nsFind.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/find/nsFind.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/find/nsFind.cpp	2015-05-25 20:44:13.000000000 +0000
@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- 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/. */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/find/nsFind.h firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/find/nsFind.h
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/find/nsFind.h	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/find/nsFind.h	2015-05-25 20:44:13.000000000 +0000
@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- 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/. */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/find/nsWebBrowserFind.cpp firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/find/nsWebBrowserFind.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/find/nsWebBrowserFind.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/find/nsWebBrowserFind.cpp	2015-05-25 20:44:13.000000000 +0000
@@ -1,6 +1,6 @@
-/* -*- 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
+/* -*- 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/. */
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/find/nsWebBrowserFind.h firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/find/nsWebBrowserFind.h
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/find/nsWebBrowserFind.h	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/find/nsWebBrowserFind.h	2015-05-25 20:44:13.000000000 +0000
@@ -1,6 +1,6 @@
-/* -*- 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
+/* -*- 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/. */
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/windowwatcher/nsAutoWindowStateHelper.cpp firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/windowwatcher/nsAutoWindowStateHelper.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/windowwatcher/nsAutoWindowStateHelper.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/windowwatcher/nsAutoWindowStateHelper.cpp	2015-05-25 20:44:13.000000000 +0000
@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- 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/. */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/windowwatcher/nsAutoWindowStateHelper.h firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/windowwatcher/nsAutoWindowStateHelper.h
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/windowwatcher/nsAutoWindowStateHelper.h	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/windowwatcher/nsAutoWindowStateHelper.h	2015-05-25 20:44:13.000000000 +0000
@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- 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/. */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/windowwatcher/nsDialogParamBlock.cpp firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/windowwatcher/nsDialogParamBlock.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/windowwatcher/nsDialogParamBlock.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/windowwatcher/nsDialogParamBlock.cpp	2015-05-25 20:44:13.000000000 +0000
@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- 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/. */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/windowwatcher/nsDialogParamBlock.h firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/windowwatcher/nsDialogParamBlock.h
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/windowwatcher/nsDialogParamBlock.h	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/windowwatcher/nsDialogParamBlock.h	2015-05-25 20:44:13.000000000 +0000
@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- 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/. */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/windowwatcher/nsPromptUtils.h firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/windowwatcher/nsPromptUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/windowwatcher/nsPromptUtils.h	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/windowwatcher/nsPromptUtils.h	2015-05-25 20:44:13.000000000 +0000
@@ -1,3 +1,5 @@
+/* -*- 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/. */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/windowwatcher/nsWindowWatcher.cpp firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/windowwatcher/nsWindowWatcher.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/windowwatcher/nsWindowWatcher.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/windowwatcher/nsWindowWatcher.cpp	2015-05-25 20:44:13.000000000 +0000
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 sw=2 et tw=78: */
+/* -*- 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/. */
@@ -1481,14 +1481,22 @@
                                       bool aHasChromeParent,
                                       bool aOpenedFromRemoteTab)
 {
-  if (!aFeaturesSpecified || !aFeatures) {
+  uint32_t chromeFlags = 0;
+  bool isCallerChrome =
+    nsContentUtils::IsCallerChrome() && !aOpenedFromRemoteTab;
+
+  bool onlyPrivateFlag = aFeaturesSpecified && aFeatures && isCallerChrome &&
+    nsCRT::strcasecmp(aFeatures, "private") == 0;
+  if (!aFeaturesSpecified || !aFeatures || onlyPrivateFlag) {
+    chromeFlags = nsIWebBrowserChrome::CHROME_ALL;
     if (aDialog) {
-      return nsIWebBrowserChrome::CHROME_ALL |
-             nsIWebBrowserChrome::CHROME_OPENAS_DIALOG |
-             nsIWebBrowserChrome::CHROME_OPENAS_CHROME;
-    } else {
-      return nsIWebBrowserChrome::CHROME_ALL;
+      chromeFlags |= nsIWebBrowserChrome::CHROME_OPENAS_DIALOG |
+                     nsIWebBrowserChrome::CHROME_OPENAS_CHROME;
     }
+    if (onlyPrivateFlag) {
+      chromeFlags |= nsIWebBrowserChrome::CHROME_PRIVATE_WINDOW;
+    }
+    return chromeFlags;
   }
 
   /* This function has become complicated since browser windows and
@@ -1499,7 +1507,6 @@
      "OS's choice," and also support an "all" flag explicitly disallowed
      in the standards-compliant window.(normal)open. */
 
-  uint32_t chromeFlags = 0;
   bool presenceFlag = false;
 
   chromeFlags = nsIWebBrowserChrome::CHROME_WINDOW_BORDERS;
@@ -1509,9 +1516,6 @@
 
   /* Next, allow explicitly named options to override the initial settings */
 
-  bool isCallerChrome =
-    nsContentUtils::IsCallerChrome() && !aOpenedFromRemoteTab;
-
   // Determine whether the window is a private browsing window
   if (isCallerChrome) {
     chromeFlags |= WinHasOption(aFeatures, "private", 0, &presenceFlag) ?
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/windowwatcher/nsWindowWatcher.h firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/windowwatcher/nsWindowWatcher.h
--- firefox-trunk-41.0~a1~hg20150513r243603/embedding/components/windowwatcher/nsWindowWatcher.h	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/embedding/components/windowwatcher/nsWindowWatcher.h	2015-05-25 20:44:13.000000000 +0000
@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- 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/. */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/extensions/auth/nsAuthFactory.cpp firefox-trunk-41.0~a1~hg20150524r245419/extensions/auth/nsAuthFactory.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/extensions/auth/nsAuthFactory.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/extensions/auth/nsAuthFactory.cpp	2015-05-25 20:44:13.000000000 +0000
@@ -220,7 +220,6 @@
 };
 
 //-----------------------------------------------------------------------------
-#if defined( PR_LOGGING )
 PRLogModuleInfo *gNegotiateLog;
 
 // setup nspr logging ...
@@ -230,9 +229,6 @@
   gNegotiateLog = PR_NewLogModule("negotiateauth");
   return NS_OK;
 }
-#else
-#define InitNegotiateAuth nullptr
-#endif
 
 static void
 DestroyNegotiateAuth()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/extensions/auth/nsAuthGSSAPI.cpp firefox-trunk-41.0~a1~hg20150524r245419/extensions/auth/nsAuthGSSAPI.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/extensions/auth/nsAuthGSSAPI.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/extensions/auth/nsAuthGSSAPI.cpp	2015-05-25 20:44:13.000000000 +0000
@@ -227,13 +227,15 @@
     return NS_OK;
 }
 
-#if defined( PR_LOGGING )
-
 // Generate proper GSSAPI error messages from the major and
 // minor status codes.
 void
 LogGssError(OM_uint32 maj_stat, OM_uint32 min_stat, const char *prefix)
 {
+    if (!PR_LOG_TEST(gNegotiateLog, PR_LOG_DEBUG)) {
+        return;
+    }
+
     OM_uint32 new_stat;
     OM_uint32 msg_ctx = 0;
     gss_buffer_desc status1_string;
@@ -270,12 +272,6 @@
     LOG(("%s\n", errorStr.get()));
 }
 
-#else /* PR_LOGGING */
-
-#define LogGssError(x,y,z)
-
-#endif /* PR_LOGGING */
-
 //-----------------------------------------------------------------------------
 
 nsAuthGSSAPI::nsAuthGSSAPI(pType package)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/extensions/auth/nsAuth.h firefox-trunk-41.0~a1~hg20150524r245419/extensions/auth/nsAuth.h
--- firefox-trunk-41.0~a1~hg20150513r243603/extensions/auth/nsAuth.h	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/extensions/auth/nsAuth.h	2015-05-25 20:44:13.000000000 +0000
@@ -12,9 +12,8 @@
      PACKAGE_TYPE_NTLM
 };
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
-#if defined( PR_LOGGING )
 //
 // in order to do logging, the following environment variables need to be set:
 // 
@@ -23,9 +22,6 @@
 //
 extern PRLogModuleInfo* gNegotiateLog;
 
-#define LOG(args) PR_LOG(gNegotiateLog, PR_LOG_DEBUG, args)
-#else
-#define LOG(args)
-#endif
+#define LOG(args) MOZ_LOG(gNegotiateLog, PR_LOG_DEBUG, args)
 
 #endif /* !defined( nsAuth_h__ ) */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/extensions/auth/nsAuthSSPI.cpp firefox-trunk-41.0~a1~hg20150524r245419/extensions/auth/nsAuthSSPI.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/extensions/auth/nsAuthSSPI.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/extensions/auth/nsAuthSSPI.cpp	2015-05-25 20:44:13.000000000 +0000
@@ -478,12 +478,11 @@
                                             &ignored);
     if (rc == SEC_I_CONTINUE_NEEDED || rc == SEC_E_OK) {
 
-#ifdef PR_LOGGING
         if (rc == SEC_E_OK)
             LOG(("InitializeSecurityContext: succeeded.\n"));
         else
             LOG(("InitializeSecurityContext: continue.\n"));
-#endif
+
         if (sspi_cbt)
             free(sspi_cbt);
             
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/extensions/auth/nsHttpNegotiateAuth.cpp firefox-trunk-41.0~a1~hg20150524r245419/extensions/auth/nsHttpNegotiateAuth.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/extensions/auth/nsHttpNegotiateAuth.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/extensions/auth/nsHttpNegotiateAuth.cpp	2015-05-25 20:44:13.000000000 +0000
@@ -33,7 +33,7 @@
 #include "plbase64.h"
 #include "plstr.h"
 #include "prprf.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prmem.h"
 #include "prnetdb.h"
 #include "mozilla/Likely.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/extensions/cookie/nsPermissionManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/extensions/cookie/nsPermissionManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/extensions/cookie/nsPermissionManager.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/extensions/cookie/nsPermissionManager.cpp	2015-05-25 20:44:13.000000000 +0000
@@ -36,6 +36,8 @@
 #include "mozilla/net/NeckoMessageUtils.h"
 #include "mozilla/Preferences.h"
 #include "nsReadLine.h"
+#include "mozilla/Telemetry.h"
+#include "nsIConsoleService.h"
 
 static nsPermissionManager *gPermissionManager = nullptr;
 
@@ -66,6 +68,18 @@
   return nullptr;
 }
 
+static void
+LogToConsole(const nsAString& aMsg)
+{
+  nsCOMPtr<nsIConsoleService> console(do_GetService("@mozilla.org/consoleservice;1"));
+  if (!console) {
+    NS_WARNING("Failed to log message to console.");
+    return;
+  }
+
+  nsAutoString msg(aMsg);
+  console->LogStringMessage(msg.get());
+}
 
 #define ENSURE_NOT_CHILD_PROCESS_(onError) \
   PR_BEGIN_MACRO \
@@ -156,7 +170,7 @@
   }
 
   // Some entries like "file://" uses the origin.
-  rv = aPrincipal->GetOrigin(getter_Copies(aHost));
+  rv = aPrincipal->GetOriginNoSuffix(aHost);
   if (NS_SUCCEEDED(rv) && !aHost.IsEmpty()) {
     return NS_OK;
   }
@@ -356,10 +370,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 // nsPermissionManager Implementation
 
-static const char kPermissionsFileName[] = "permissions.sqlite";
+#define PERMISSIONS_FILE_NAME "permissions.sqlite"
 #define HOSTS_SCHEMA_VERSION 4
 
-static const char kHostpermFileName[] = "hostperm.1";
+#define HOSTPERM_FILE_NAME "hostperm.1"
 
 // Default permissions are read from a URL - this is the preference we read
 // to find that URL. If not set, don't use any default permissions.
@@ -453,7 +467,7 @@
   }
   NS_ENSURE_SUCCESS(rv, NS_ERROR_UNEXPECTED);
 
-  rv = permissionsFile->AppendNative(NS_LITERAL_CSTRING(kPermissionsFileName));
+  rv = permissionsFile->AppendNative(NS_LITERAL_CSTRING(PERMISSIONS_FILE_NAME));
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (aRemoveFile) {
@@ -472,29 +486,52 @@
 
   // cache a connection to the hosts database
   rv = storage->OpenDatabase(permissionsFile, getter_AddRefs(mDBConn));
-  NS_ENSURE_SUCCESS(rv, rv);
+  if (rv == NS_ERROR_FILE_CORRUPTED) {
+    LogToConsole(NS_LITERAL_STRING("permissions.sqlite is corrupted! Try again!"));
+
+    // Add telemetry probe
+    mozilla::Telemetry::Accumulate(mozilla::Telemetry::PERMISSIONS_SQL_CORRUPTED, 1);
+
+    // delete corrupted permissions.sqlite and try again
+    rv = permissionsFile->Remove(false);
+    NS_ENSURE_SUCCESS(rv, rv);
+    LogToConsole(NS_LITERAL_STRING("Corrupted permissions.sqlite has been removed."));
+
+    rv = storage->OpenDatabase(permissionsFile, getter_AddRefs(mDBConn));
+    NS_ENSURE_SUCCESS(rv, rv);
+    LogToConsole(NS_LITERAL_STRING("OpenDatabase to permissions.sqlite is successful!"));
+  }
 
   bool ready;
   mDBConn->GetConnectionReady(&ready);
   if (!ready) {
+    LogToConsole(NS_LITERAL_STRING("Fail to get connection to permissions.sqlite! Try again!"));
+
     // delete and try again
     rv = permissionsFile->Remove(false);
     NS_ENSURE_SUCCESS(rv, rv);
+    LogToConsole(NS_LITERAL_STRING("Defective permissions.sqlite has been removed."));
+
+    // Add telemetry probe
+    mozilla::Telemetry::Accumulate(mozilla::Telemetry::DEFECTIVE_PERMISSIONS_SQL_REMOVED, 1);
 
     rv = storage->OpenDatabase(permissionsFile, getter_AddRefs(mDBConn));
     NS_ENSURE_SUCCESS(rv, rv);
+    LogToConsole(NS_LITERAL_STRING("OpenDatabase to permissions.sqlite is successful!"));
 
     mDBConn->GetConnectionReady(&ready);
     if (!ready)
       return NS_ERROR_UNEXPECTED;
   }
 
+  LogToConsole(NS_LITERAL_STRING("Get a connection to permissions.sqlite."));
+
   bool tableExists = false;
   mDBConn->TableExists(NS_LITERAL_CSTRING("moz_hosts"), &tableExists);
   if (!tableExists) {
     rv = CreateTable();
     NS_ENSURE_SUCCESS(rv, rv);
-
+    LogToConsole(NS_LITERAL_STRING("DB table(moz_hosts) is created!"));
   } else {
     // table already exists; check the schema version before reading
     int32_t dbSchemaVersion;
@@ -589,9 +626,6 @@
     }
   }
 
-  // make operations on the table asynchronous, for performance
-  mDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING("PRAGMA synchronous = OFF"));
-
   // cache frequently used statements (for insertion, deletion, and updating)
   rv = mDBConn->CreateAsyncStatement(NS_LITERAL_CSTRING(
     "INSERT INTO moz_hosts "
@@ -1861,7 +1895,7 @@
   rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(permissionsFile));
   if (NS_FAILED(rv)) return rv;
 
-  rv = permissionsFile->AppendNative(NS_LITERAL_CSTRING(kHostpermFileName));
+  rv = permissionsFile->AppendNative(NS_LITERAL_CSTRING(HOSTPERM_FILE_NAME));
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIInputStream> fileInputStream;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/extensions/cookie/test/unit/test_cookies_persistence.js firefox-trunk-41.0~a1~hg20150524r245419/extensions/cookie/test/unit/test_cookies_persistence.js
--- firefox-trunk-41.0~a1~hg20150513r243603/extensions/cookie/test/unit/test_cookies_persistence.js	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/extensions/cookie/test/unit/test_cookies_persistence.js	2015-05-25 20:44:14.000000000 +0000
@@ -29,22 +29,8 @@
   var spec2 = "http://bar.com/bar.html";
   var uri1 = NetUtil.newURI(spec1);
   var uri2 = NetUtil.newURI(spec2);
-  var channel1 = NetUtil.newChannel2(uri1,
-                                     null,
-                                     null,
-                                     null,      // aLoadingNode
-                                     Services.scriptSecurityManager.getSystemPrincipal(),
-                                     null,      // aTriggeringPrincipal
-                                     Ci.nsILoadInfo.SEC_NORMAL,
-                                     Ci.nsIContentPolicy.TYPE_OTHER);
-  var channel2 = NetUtil.newChannel2(uri2,
-                                     null,
-                                     null,
-                                     null,      // aLoadingNode
-                                     Services.scriptSecurityManager.getSystemPrincipal(),
-                                     null,      // aTriggeringPrincipal
-                                     Ci.nsILoadInfo.SEC_NORMAL,
-                                     Ci.nsIContentPolicy.TYPE_OTHER);
+  var channel1 = NetUtil.newChannel({uri: uri1, loadUsingSystemPrincipal: true});
+  var channel2 = NetUtil.newChannel({uri: uri2, loadUsingSystemPrincipal: true});
 
   // Force the channel URI to be used when determining the originating URI of
   // the channel.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/extensions/cookie/test/unit/test_cookies_thirdparty.js firefox-trunk-41.0~a1~hg20150524r245419/extensions/cookie/test/unit/test_cookies_thirdparty.js
--- firefox-trunk-41.0~a1~hg20150513r243603/extensions/cookie/test/unit/test_cookies_thirdparty.js	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/extensions/cookie/test/unit/test_cookies_thirdparty.js	2015-05-25 20:44:14.000000000 +0000
@@ -12,22 +12,8 @@
   var spec2 = "http://bar.com/bar.html";
   var uri1 = NetUtil.newURI(spec1);
   var uri2 = NetUtil.newURI(spec2);
-  var channel1 = NetUtil.newChannel2(uri1,
-                                     null,
-                                     null,
-                                     null,      // aLoadingNode
-                                     Services.scriptSecurityManager.getSystemPrincipal(),
-                                     null,      // aTriggeringPrincipal
-                                     Ci.nsILoadInfo.SEC_NORMAL,
-                                     Ci.nsIContentPolicy.TYPE_OTHER);
-  var channel2 = NetUtil.newChannel2(uri2,
-                                     null,
-                                     null,
-                                     null,      // aLoadingNode
-                                     Services.scriptSecurityManager.getSystemPrincipal(),
-                                     null,      // aTriggeringPrincipal
-                                     Ci.nsILoadInfo.SEC_NORMAL,
-                                     Ci.nsIContentPolicy.TYPE_OTHER);
+  var channel1 = NetUtil.newChannel({uri: uri1, loadUsingSystemPrincipal: true});
+  var channel2 = NetUtil.newChannel({uri: uri2, loadUsingSystemPrincipal: true});
 
   // test with cookies enabled
   Services.prefs.setIntPref("network.cookie.cookieBehavior", 0);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/extensions/cookie/test/unit/test_cookies_thirdparty_session.js firefox-trunk-41.0~a1~hg20150524r245419/extensions/cookie/test/unit/test_cookies_thirdparty_session.js
--- firefox-trunk-41.0~a1~hg20150513r243603/extensions/cookie/test/unit/test_cookies_thirdparty_session.js	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/extensions/cookie/test/unit/test_cookies_thirdparty_session.js	2015-05-25 20:44:14.000000000 +0000
@@ -29,22 +29,8 @@
   var spec2 = "http://bar.com/bar.html";
   var uri1 = NetUtil.newURI(spec1);
   var uri2 = NetUtil.newURI(spec2);
-  var channel1 = NetUtil.newChannel2(uri1,
-                                     null,
-                                     null,
-                                     null,      // aLoadingNode
-                                     Services.scriptSecurityManager.getSystemPrincipal(),
-                                     null,      // aTriggeringPrincipal
-                                     Ci.nsILoadInfo.SEC_NORMAL,
-                                     Ci.nsIContentPolicy.TYPE_OTHER);
-  var channel2 = NetUtil.newChannel2(uri2,
-                                     null,
-                                     null,
-                                     null,      // aLoadingNode
-                                     Services.scriptSecurityManager.getSystemPrincipal(),
-                                     null,      // aTriggeringPrincipal
-                                     Ci.nsILoadInfo.SEC_NORMAL,
-                                     Ci.nsIContentPolicy.TYPE_OTHER);
+  var channel1 = NetUtil.newChannel({uri: uri1, loadUsingSystemPrincipal: true});
+  var channel2 = NetUtil.newChannel({uri: uri2, loadUsingSystemPrincipal: true});
 
   // Force the channel URI to be used when determining the originating URI of
   // the channel.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/extensions/gio/nsGIOProtocolHandler.cpp firefox-trunk-41.0~a1~hg20150524r245419/extensions/gio/nsGIOProtocolHandler.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/extensions/gio/nsGIOProtocolHandler.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/extensions/gio/nsGIOProtocolHandler.cpp	2015-05-25 20:44:14.000000000 +0000
@@ -28,12 +28,8 @@
 //-----------------------------------------------------------------------------
 
 // NSPR_LOG_MODULES=gio:5
-#ifdef PR_LOGGING
 static PRLogModuleInfo *sGIOLog;
-#define LOG(args) PR_LOG(sGIOLog, PR_LOG_DEBUG, args)
-#else
-#define LOG(args)
-#endif
+#define LOG(args) MOZ_LOG(sGIOLog, PR_LOG_DEBUG, args)
 
 
 //-----------------------------------------------------------------------------
@@ -906,9 +902,7 @@
 nsresult
 nsGIOProtocolHandler::Init()
 {
-#ifdef PR_LOGGING
   sGIOLog = PR_NewLogModule("gio");
-#endif
 
   nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
   if (prefs)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/extensions/pref/autoconfig/src/nsAutoConfig.cpp firefox-trunk-41.0~a1~hg20150524r245419/extensions/pref/autoconfig/src/nsAutoConfig.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/extensions/pref/autoconfig/src/nsAutoConfig.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/extensions/pref/autoconfig/src/nsAutoConfig.cpp	2015-05-25 20:44:14.000000000 +0000
@@ -20,6 +20,8 @@
 #include "nspr.h"
 #include <algorithm>
 
+#include "mozilla/Logging.h"
+
 PRLogModuleInfo *MCD;
 
 extern nsresult EvaluateAdminConfigScript(const char *js_buffer, size_t length,
@@ -120,7 +122,7 @@
 
     // If the request is failed, go read the failover.jsc file
     if (NS_FAILED(aStatus)) {
-        PR_LOG(MCD, PR_LOG_DEBUG, ("mcd request failed with status %x\n", aStatus));
+        MOZ_LOG(MCD, PR_LOG_DEBUG, ("mcd request failed with status %x\n", aStatus));
         return readOfflineFile();
     }
 
@@ -131,7 +133,7 @@
         pHTTPCon->GetResponseStatus(&httpStatus);
         if (httpStatus != 200) 
         {
-            PR_LOG(MCD, PR_LOG_DEBUG, ("mcd http request failed with status %x\n", httpStatus));
+            MOZ_LOG(MCD, PR_LOG_DEBUG, ("mcd http request failed with status %x\n", httpStatus));
             return readOfflineFile();
         }
     }
@@ -196,7 +198,7 @@
     static bool firstTime = true;
     
     if (mConfigURL.IsEmpty()) {
-        PR_LOG(MCD, PR_LOG_DEBUG, ("global config url is empty - did you set autoadmin.global_config_url?\n"));
+        MOZ_LOG(MCD, PR_LOG_DEBUG, ("global config url is empty - did you set autoadmin.global_config_url?\n"));
         NS_WARNING("AutoConfig called without global_config_url");
         return NS_OK;
     }
@@ -270,11 +272,11 @@
     rv = NS_NewURI(getter_AddRefs(url), mConfigURL.get(), nullptr, nullptr);
     if (NS_FAILED(rv))
     {
-        PR_LOG(MCD, PR_LOG_DEBUG, ("failed to create URL - is autoadmin.global_config_url valid? - %s\n", mConfigURL.get()));
+        MOZ_LOG(MCD, PR_LOG_DEBUG, ("failed to create URL - is autoadmin.global_config_url valid? - %s\n", mConfigURL.get()));
         return rv;
     }
 
-    PR_LOG(MCD, PR_LOG_DEBUG, ("running MCD url %s\n", mConfigURL.get()));
+    MOZ_LOG(MCD, PR_LOG_DEBUG, ("running MCD url %s\n", mConfigURL.get()));
     // open a channel for the url
     rv = NS_NewChannel(getter_AddRefs(channel),
                        url,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/extensions/pref/autoconfig/src/nsReadConfig.cpp firefox-trunk-41.0~a1~hg20150524r245419/extensions/pref/autoconfig/src/nsReadConfig.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/extensions/pref/autoconfig/src/nsReadConfig.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/extensions/pref/autoconfig/src/nsReadConfig.cpp	2015-05-25 20:44:14.000000000 +0000
@@ -140,7 +140,7 @@
                                   getter_Copies(lockFileName));
 
 
-    PR_LOG(MCD, PR_LOG_DEBUG, ("general.config.filename = %s\n", lockFileName.get()));
+    MOZ_LOG(MCD, PR_LOG_DEBUG, ("general.config.filename = %s\n", lockFileName.get()));
     if (NS_FAILED(rv))
         return rv;
 
@@ -174,11 +174,11 @@
 
     int32_t obscureValue = 0;
     (void) defaultPrefBranch->GetIntPref("general.config.obscure_value", &obscureValue);
-    PR_LOG(MCD, PR_LOG_DEBUG, ("evaluating .cfg file %s with obscureValue %d\n", lockFileName.get(), obscureValue));
+    MOZ_LOG(MCD, PR_LOG_DEBUG, ("evaluating .cfg file %s with obscureValue %d\n", lockFileName.get(), obscureValue));
     rv = openAndEvaluateJSFile(lockFileName.get(), obscureValue, true, true);
     if (NS_FAILED(rv))
     {
-      PR_LOG(MCD, PR_LOG_DEBUG, ("error evaluating .cfg file %s %x\n", lockFileName.get(), rv));
+      MOZ_LOG(MCD, PR_LOG_DEBUG, ("error evaluating .cfg file %s %x\n", lockFileName.get(), rv));
       return rv;
     }
     
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/BorrowedContext.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/BorrowedContext.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/BorrowedContext.h	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/BorrowedContext.h	2015-05-25 20:44:16.000000000 +0000
@@ -8,6 +8,11 @@
 
 #include "2D.h"
 
+#ifdef MOZ_X11
+#include <X11/extensions/Xrender.h>
+#include <X11/Xlib.h>
+#endif
+
 struct _cairo;
 typedef struct _cairo cairo_t;
 
@@ -69,6 +74,69 @@
   DrawTarget *mDT;
 };
 
+#ifdef MOZ_X11
+/* This is a helper class that let's you borrow an Xlib drawable from
+ * a DrawTarget. This is used for drawing themed widgets.
+ *
+ * Callers should check the Xlib drawable after constructing the object
+ * to see if it succeeded. The DrawTarget should not be used while
+ * the drawable is borrowed. */
+class BorrowedXlibDrawable
+{
+public:
+  BorrowedXlibDrawable()
+    : mDT(nullptr),
+      mDisplay(nullptr),
+      mDrawable(None),
+      mScreen(nullptr),
+      mVisual(nullptr),
+      mXRenderFormat(nullptr)
+  {}
+
+  explicit BorrowedXlibDrawable(DrawTarget *aDT)
+    : mDT(nullptr),
+      mDisplay(nullptr),
+      mDrawable(None),
+      mScreen(nullptr),
+      mVisual(nullptr),
+      mXRenderFormat(nullptr)
+  {
+    Init(aDT);
+  }
+
+  // We can optionally Init after construction in
+  // case we don't know what the DT will be at construction
+  // time.
+  bool Init(DrawTarget *aDT);
+
+  // The caller needs to call Finish if drawable is non-zero when
+  // they are done with the context. This is currently explicit
+  // instead of happening implicitly in the destructor to make
+  // what's happening in the caller more clear. It also
+  // let's you resume using the DrawTarget in the same scope.
+  void Finish();
+
+  ~BorrowedXlibDrawable() {
+    MOZ_ASSERT(!mDrawable);
+  }
+
+  Display *GetDisplay() const { return mDisplay; }
+  Drawable GetDrawable() const { return mDrawable; }
+  Screen *GetScreen() const { return mScreen; }
+  Visual *GetVisual() const { return mVisual; }
+
+  XRenderPictFormat* GetXRenderFormat() const { return mXRenderFormat; }
+
+private:
+  DrawTarget *mDT;
+  Display *mDisplay;
+  Drawable mDrawable;
+  Screen *mScreen;
+  Visual *mVisual;
+  XRenderPictFormat *mXRenderFormat;
+};
+#endif
+
 #ifdef XP_MACOSX
 /* This is a helper class that let's you borrow a CGContextRef from a
  * DrawTargetCG. This is used for drawing themed widgets.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DataSourceSurface.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DataSourceSurface.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DataSourceSurface.cpp	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DataSourceSurface.cpp	2015-05-25 20:44:16.000000000 +0000
@@ -12,7 +12,9 @@
 TemporaryRef<DataSourceSurface>
 DataSourceSurface::GetDataSurface()
 {
-  return (GetType() == SurfaceType::DATA) ? this : new DataSourceSurfaceWrapper(this);
+  RefPtr<DataSourceSurface> surface =
+    (GetType() == SurfaceType::DATA) ? this : new DataSourceSurfaceWrapper(this);
+  return surface.forget();
 }
 
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DrawTargetCairo.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DrawTargetCairo.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DrawTargetCairo.cpp	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DrawTargetCairo.cpp	2015-05-25 20:44:16.000000000 +0000
@@ -658,7 +658,8 @@
 DrawTargetCairo::Snapshot()
 {
   if (mSnapshot) {
-    return mSnapshot;
+    RefPtr<SourceSurface> snapshot(mSnapshot);
+    return snapshot.forget();
   }
 
   IntSize size = GetSize();
@@ -667,7 +668,8 @@
                                      size,
                                      GfxFormatForCairoSurface(mSurface),
                                      this);
-  return mSnapshot;
+  RefPtr<SourceSurface> snapshot(mSnapshot);
+  return snapshot.forget();
 }
 
 bool
@@ -1326,7 +1328,7 @@
 TemporaryRef<PathBuilder>
 DrawTargetCairo::CreatePathBuilder(FillRule aFillRule /* = FillRule::FILL_WINDING */) const
 {
-  return new PathBuilderCairo(aFillRule);
+  return MakeAndAddRef<PathBuilderCairo>(aFillRule);
 }
 
 void
@@ -1346,7 +1348,7 @@
 DrawTargetCairo::CreateGradientStops(GradientStop *aStops, uint32_t aNumStops,
                                      ExtendMode aExtendMode) const
 {
-  return new GradientStopsCairo(aStops, aNumStops, aExtendMode);
+  return MakeAndAddRef<GradientStopsCairo>(aStops, aNumStops, aExtendMode);
 }
 
 TemporaryRef<FilterNode>
@@ -1400,21 +1402,22 @@
 TemporaryRef<SourceSurface>
 DrawTargetCairo::OptimizeSourceSurface(SourceSurface *aSurface) const
 {
+  RefPtr<SourceSurface> surface(aSurface);
 #ifdef CAIRO_HAS_XLIB_SURFACE
   cairo_surface_type_t ctype = cairo_surface_get_type(mSurface);
   if (aSurface->GetType() == SurfaceType::CAIRO &&
       cairo_surface_get_type(
         static_cast<SourceSurfaceCairo*>(aSurface)->GetSurface()) == ctype) {
-    return aSurface;
+    return surface.forget();
   }
 
   if (ctype != CAIRO_SURFACE_TYPE_XLIB) {
-    return aSurface;
+    return surface.forget();
   }
 
   IntSize size = aSurface->GetSize();
   if (!size.width || !size.height) {
-    return aSurface;
+    return surface.forget();
   }
 
   // Although the dimension parameters in the xCreatePixmapReq wire protocol are
@@ -1424,7 +1427,7 @@
 
   if (size.width > XLIB_IMAGE_SIDE_SIZE_LIMIT ||
       size.height > XLIB_IMAGE_SIDE_SIZE_LIMIT) {
-    return aSurface;
+    return surface.forget();
   }
 
   SurfaceFormat format = aSurface->GetFormat();
@@ -1442,17 +1445,17 @@
     xrenderFormat = XRenderFindStandardFormat(dpy, PictStandardA8);
     break;
   default:
-    return aSurface;
+    return surface.forget();
   }
   if (!xrenderFormat) {
-    return aSurface;
+    return surface.forget();
   }
 
   Drawable pixmap = XCreatePixmap(dpy, RootWindowOfScreen(screen),
                                   size.width, size.height,
                                   xrenderFormat->depth);
   if (!pixmap) {
-    return aSurface;
+    return surface.forget();
   }
 
   ScopedDeletePtr<DestroyPixmapClosure> closure(
@@ -1463,7 +1466,7 @@
                                                   screen, xrenderFormat,
                                                   size.width, size.height));
   if (!csurf || cairo_surface_status(csurf)) {
-    return aSurface;
+    return surface.forget();
   }
 
   cairo_surface_set_user_data(csurf, &gDestroyPixmapKey,
@@ -1471,7 +1474,7 @@
 
   RefPtr<DrawTargetCairo> dt = new DrawTargetCairo();
   if (!dt->Init(csurf, size, &format)) {
-    return aSurface;
+    return surface.forget();
   }
 
   dt->CopySurface(aSurface,
@@ -1479,10 +1482,10 @@
                   IntPoint(0, 0));
   dt->Flush();
 
-  return new SourceSurfaceCairo(csurf, size, format);
+  surface = new SourceSurfaceCairo(csurf, size, format);
 #endif
 
-  return aSurface;
+  return surface.forget();
 }
 
 TemporaryRef<SourceSurface>
@@ -1495,7 +1498,7 @@
       return nullptr;
     }
     cairo_surface_t* surf = static_cast<cairo_surface_t*>(aSurface.mSurface);
-    return new SourceSurfaceCairo(surf, aSurface.mSize, aSurface.mFormat);
+    return MakeAndAddRef<SourceSurfaceCairo>(surf, aSurface.mSize, aSurface.mFormat);
   }
 
   return nullptr;
@@ -1714,5 +1717,50 @@
   cairoDT->mContext = aCairo;
 }
 
+#ifdef MOZ_X11
+bool
+BorrowedXlibDrawable::Init(DrawTarget* aDT)
+{
+  MOZ_ASSERT(aDT, "Caller should check for nullptr");
+  MOZ_ASSERT(!mDT, "Can't initialize twice!");
+  mDT = aDT;
+  mDrawable = None;
+
+#ifdef CAIRO_HAS_XLIB_SURFACE
+  if (aDT->GetBackendType() != BackendType::CAIRO ||
+      aDT->IsDualDrawTarget() ||
+      aDT->IsTiledDrawTarget()) {
+    return false;
+  }
+
+  DrawTargetCairo* cairoDT = static_cast<DrawTargetCairo*>(aDT);
+  cairo_surface_t* surf = cairoDT->mSurface;
+  if (cairo_surface_get_type(surf) != CAIRO_SURFACE_TYPE_XLIB) {
+    return false;
+  }
+
+  cairoDT->WillChange();
+
+  mDisplay = cairo_xlib_surface_get_display(surf);
+  mDrawable = cairo_xlib_surface_get_drawable(surf);
+  mScreen = cairo_xlib_surface_get_screen(surf);
+  mVisual = cairo_xlib_surface_get_visual(surf);
+  mXRenderFormat = cairo_xlib_surface_get_xrender_format(surf);
+
+  return true;
+#else
+  return false;
+#endif
+}
+
+void
+BorrowedXlibDrawable::Finish()
+{
+  if (mDrawable) {
+    mDrawable = None;
+  }
+}
+#endif
+
 }
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DrawTargetCairo.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DrawTargetCairo.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DrawTargetCairo.h	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DrawTargetCairo.h	2015-05-25 20:44:16.000000000 +0000
@@ -54,6 +54,7 @@
 public:
   MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(DrawTargetCairo, override)
   friend class BorrowedCairoContext;
+  friend class BorrowedXlibDrawable;
 
   DrawTargetCairo();
   virtual ~DrawTargetCairo();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DrawTargetCG.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DrawTargetCG.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DrawTargetCG.cpp	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DrawTargetCG.cpp	2015-05-25 20:44:16.000000000 +0000
@@ -191,13 +191,14 @@
 {
   if (!mSnapshot) {
     if (GetContextType(mCg) == CG_CONTEXT_TYPE_IOSURFACE) {
-      return new SourceSurfaceCGIOSurfaceContext(this);
+      return MakeAndAddRef<SourceSurfaceCGIOSurfaceContext>(this);
     }
     Flush();
     mSnapshot = new SourceSurfaceCGBitmapContext(this);
   }
 
-  return mSnapshot;
+  RefPtr<SourceSurface> snapshot(mSnapshot);
+  return snapshot.forget();
 }
 
 TemporaryRef<DrawTarget>
@@ -251,7 +252,7 @@
       if (!data) {
         MOZ_CRASH("unsupported source surface");
       }
-      data->AddRef();
+      data.get()->AddRef();
       return CreateCGImage(releaseDataSurface, data.get(),
                            data->GetData(), data->GetSize(),
                            data->Stride(), data->GetFormat());
@@ -262,7 +263,8 @@
 TemporaryRef<SourceSurface>
 DrawTargetCG::OptimizeSourceSurface(SourceSurface *aSurface) const
 {
-  return aSurface;
+  RefPtr<SourceSurface> surface(aSurface);
+  return surface.forget();
 }
 
 class UnboundnessFixer
@@ -465,7 +467,7 @@
                                   ExtendMode aExtendMode) const
 {
   std::vector<GradientStop> stops(aStops, aStops+aNumStops);
-  return new GradientStopsCG(mColorSpace, stops, aExtendMode);
+  return MakeAndAddRef<GradientStopsCG>(mColorSpace, stops, aExtendMode);
 }
 
 static void
@@ -1905,7 +1907,7 @@
 TemporaryRef<PathBuilder>
 DrawTargetCG::CreatePathBuilder(FillRule aFillRule) const
 {
-  return new PathBuilderCG(aFillRule);
+  return MakeAndAddRef<PathBuilderCG>(aFillRule);
 }
 
 void*
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DrawTarget.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DrawTarget.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DrawTarget.cpp	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DrawTarget.cpp	2015-05-25 20:44:16.000000000 +0000
@@ -21,7 +21,7 @@
     return nullptr;
   }
 
-  return dt;
+  return dt.forget();
 }
 
 void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DrawTargetD2D1.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DrawTargetD2D1.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DrawTargetD2D1.cpp	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DrawTargetD2D1.cpp	2015-05-25 20:44:16.000000000 +0000
@@ -69,7 +69,8 @@
 DrawTargetD2D1::Snapshot()
 {
   if (mSnapshot) {
-    return mSnapshot;
+    RefPtr<SourceSurface> snapshot(mSnapshot);
+    return snapshot.forget();
   }
   PopAllClips();
 
@@ -77,7 +78,8 @@
 
   mSnapshot = new SourceSurfaceD2D1(mBitmap, mDC, mFormat, mSize, this);
 
-  return mSnapshot;
+  RefPtr<SourceSurface> snapshot(mSnapshot);
+  return snapshot.forget();
 }
 
 void
@@ -657,7 +659,7 @@
     return nullptr;
   }
 
-  return new SourceSurfaceD2D1(bitmap.get(), mDC, aFormat, aSize);
+  return MakeAndAddRef<SourceSurfaceD2D1>(bitmap.get(), mDC, aFormat, aSize);
 }
 
 TemporaryRef<DrawTarget>
@@ -694,7 +696,7 @@
     sink->SetFillMode(D2D1_FILL_MODE_WINDING);
   }
 
-  return new PathBuilderD2D(sink, path, aFillRule, BackendType::DIRECT2D1_1);
+  return MakeAndAddRef<PathBuilderD2D>(sink, path, aFillRule, BackendType::DIRECT2D1_1);
 }
 
 TemporaryRef<GradientStops>
@@ -725,7 +727,7 @@
     return nullptr;
   }
 
-  return new GradientStopsD2D(stopCollection, Factory::GetDirect3D11Device());
+  return MakeAndAddRef<GradientStopsD2D>(stopCollection, Factory::GetDirect3D11Device());
 }
 
 TemporaryRef<FilterNode>
@@ -944,12 +946,16 @@
 {
   MarkChanged();
 
-  if (aOp == CompositionOp::OP_OVER && IsPatternSupportedByD2D(aPattern)) {
+  if (D2DSupportsPrimitiveBlendMode(aOp) && IsPatternSupportedByD2D(aPattern)) {
     // It's important to do this before FlushTransformToDC! As this will cause
     // the transform to become dirty.
     PushAllClips();
 
     FlushTransformToDC();
+
+    if (aOp != CompositionOp::OP_OVER)
+      mDC->SetPrimitiveBlend(D2DPrimitiveBlendMode(aOp));
+
     return;
   }
 
@@ -967,7 +973,9 @@
 {
   bool patternSupported = IsPatternSupportedByD2D(aPattern);
 
-  if (aOp == CompositionOp::OP_OVER && patternSupported) {
+  if (D2DSupportsPrimitiveBlendMode(aOp) && patternSupported) {
+    if (aOp != CompositionOp::OP_OVER)
+      mDC->SetPrimitiveBlend(D2D1_PRIMITIVE_BLEND_SOURCE_OVER);
     return;
   }
 
@@ -1128,7 +1136,8 @@
 {
   if (mCurrentClippedGeometry) {
     *aClipBounds = mCurrentClipBounds;
-    return mCurrentClippedGeometry;
+    RefPtr<ID2D1Geometry> clippedGeometry(mCurrentClippedGeometry);
+    return clippedGeometry.forget();
   }
 
   MOZ_ASSERT(mPushedClips.size());
@@ -1209,7 +1218,8 @@
   }
   mCurrentClippedGeometry = pathGeom.forget();
   *aClipBounds = mCurrentClipBounds;
-  return mCurrentClippedGeometry;
+  RefPtr<ID2D1Geometry> clippedGeometry(mCurrentClippedGeometry);
+  return clippedGeometry.forget();
 }
 
 TemporaryRef<ID2D1Geometry>
@@ -1227,7 +1237,7 @@
   rectGeom->CombineWithGeometry(geom, D2D1_COMBINE_MODE_EXCLUDE, D2D1::IdentityMatrix(), sink);
   sink->Close();
 
-  return inverseGeom;
+  return inverseGeom.forget();
 }
 
 void
@@ -1289,7 +1299,7 @@
 {
   RefPtr<ID2D1SolidColorBrush> brush = mSolidColorBrush;
   brush->SetColor(aColor);
-  return brush;
+  return brush.forget();
 }
 
 TemporaryRef<ID2D1Brush>
@@ -1453,7 +1463,8 @@
 DrawTargetD2D1::OptimizeSourceSurface(SourceSurface* aSurface) const
 {
   if (aSurface->GetType() == SurfaceType::D2D1_1_IMAGE) {
-    return aSurface;
+    RefPtr<SourceSurface> surface(aSurface);
+    return surface.forget();
   }
 
   RefPtr<DataSourceSurface> data = aSurface->GetDataSurface();
@@ -1478,7 +1489,7 @@
     return data.forget();
   }
 
-  return new SourceSurfaceD2D1(bitmap.get(), mDC, data->GetFormat(), data->GetSize());
+  return MakeAndAddRef<SourceSurfaceD2D1>(bitmap.get(), mDC, data->GetFormat(), data->GetSize());
 }
 
 void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DrawTargetD2D.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DrawTargetD2D.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DrawTargetD2D.cpp	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DrawTargetD2D.cpp	2015-05-25 20:44:16.000000000 +0000
@@ -227,7 +227,8 @@
     Flush();
   }
 
-  return mSnapshot;
+  RefPtr<SourceSurface> snapshot(mSnapshot);
+  return snapshot.forget();
 }
 
 void
@@ -326,7 +327,7 @@
     break;
   }
 
-  return bitmap;
+  return bitmap.forget();
 }
 
 TemporaryRef<ID2D1Image>
@@ -337,7 +338,7 @@
   Rect r(Point(), Size(aSurface->GetSize()));
   image = GetBitmapForSurface(aSurface, r);
 
-  return image;
+  return image.forget();
 }
 
 void
@@ -1207,7 +1208,8 @@
 {
   if (aSurface->GetType() == SurfaceType::D2D1_BITMAP ||
       aSurface->GetType() == SurfaceType::D2D1_DRAWTARGET) {
-    return aSurface;
+    RefPtr<SourceSurface> surface(aSurface);
+    return surface.forget();
   }
 
   RefPtr<DataSourceSurface> data = aSurface->GetDataSurface();
@@ -1284,7 +1286,7 @@
     sink->SetFillMode(D2D1_FILL_MODE_WINDING);
   }
 
-  return new PathBuilderD2D(sink, path, aFillRule, BackendType::DIRECT2D);
+  return MakeAndAddRef<PathBuilderD2D>(sink, path, aFillRule, BackendType::DIRECT2D);
 }
 
 TemporaryRef<GradientStops>
@@ -1310,7 +1312,7 @@
     return nullptr;
   }
 
-  return new GradientStopsD2D(stopCollection, Factory::GetDirect3D11Device());
+  return MakeAndAddRef<GradientStopsD2D>(stopCollection, Factory::GetDirect3D11Device());
 }
 
 TemporaryRef<FilterNode>
@@ -1867,7 +1869,8 @@
 {
   if (mCurrentClippedGeometry) {
     *aClipBounds = mCurrentClipBounds;
-    return mCurrentClippedGeometry;
+    RefPtr<ID2D1Geometry> clippedGeometry(mCurrentClippedGeometry);
+    return clippedGeometry.forget();
   }
 
   mCurrentClipBounds = IntRect(IntPoint(0, 0), mSize);
@@ -1946,7 +1949,8 @@
   }
   mCurrentClippedGeometry = pathGeom.forget();
   *aClipBounds = mCurrentClipBounds;
-  return mCurrentClippedGeometry;
+  RefPtr<ID2D1Geometry> clippedGeometry(mCurrentClippedGeometry);
+  return clippedGeometry.forget();
 }
 
 TemporaryRef<ID2D1RenderTarget>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DrawTargetDual.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DrawTargetDual.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DrawTargetDual.cpp	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DrawTargetDual.cpp	2015-05-25 20:44:16.000000000 +0000
@@ -192,7 +192,7 @@
     return nullptr;
   }
 
-  return new DrawTargetDual(dtA, dtB);
+  return MakeAndAddRef<DrawTargetDual>(dtA, dtB);
 }
 
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DrawTargetDual.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DrawTargetDual.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DrawTargetDual.h	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DrawTargetDual.h	2015-05-25 20:44:16.000000000 +0000
@@ -45,7 +45,9 @@
      
   virtual DrawTargetType GetType() const override { return mA->GetType(); }
   virtual BackendType GetBackendType() const override { return mA->GetBackendType(); }
-  virtual TemporaryRef<SourceSurface> Snapshot() override { return new SourceSurfaceDual(mA, mB); }
+  virtual TemporaryRef<SourceSurface> Snapshot() override {
+    return MakeAndAddRef<SourceSurfaceDual>(mA, mB);
+  }
   virtual IntSize GetSize() override { return mA->GetSize(); }
      
   FORWARD_FUNCTION(Flush)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DrawTargetRecording.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DrawTargetRecording.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DrawTargetRecording.cpp	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DrawTargetRecording.cpp	2015-05-25 20:44:16.000000000 +0000
@@ -541,14 +541,14 @@
 DrawTargetRecording::CreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const
 {
   RefPtr<DrawTarget> dt = mFinalDT->CreateSimilarDrawTarget(aSize, aFormat);
-  return new DrawTargetRecording(mRecorder.get(), dt);
+  return MakeAndAddRef<DrawTargetRecording>(mRecorder.get(), dt);
 }
 
 TemporaryRef<PathBuilder>
 DrawTargetRecording::CreatePathBuilder(FillRule aFillRule) const
 {
   RefPtr<PathBuilder> builder = mFinalDT->CreatePathBuilder(aFillRule);
-  return new PathBuilderRecording(builder, aFillRule);
+  return MakeAndAddRef<PathBuilderRecording>(builder, aFillRule);
 }
 
 TemporaryRef<GradientStops>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DrawTargetSkia.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DrawTargetSkia.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DrawTargetSkia.cpp	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DrawTargetSkia.cpp	2015-05-25 20:44:16.000000000 +0000
@@ -148,6 +148,35 @@
   return snapshot.forget();
 }
 
+bool
+DrawTargetSkia::LockBits(uint8_t** aData, IntSize* aSize,
+                          int32_t* aStride, SurfaceFormat* aFormat)
+{
+  const SkBitmap &bitmap = mCanvas->getDevice()->accessBitmap(false);
+  if (!bitmap.lockPixelsAreWritable()) {
+    return false;
+  }
+
+  MarkChanged();
+
+  bitmap.lockPixels();
+  *aData = reinterpret_cast<uint8_t*>(bitmap.getPixels());
+  *aSize = IntSize(bitmap.width(), bitmap.height());
+  *aStride = int32_t(bitmap.rowBytes());
+  *aFormat = SkiaColorTypeToGfxFormat(bitmap.colorType());
+  return true;
+}
+
+void
+DrawTargetSkia::ReleaseBits(uint8_t* aData)
+{
+  const SkBitmap &bitmap = mCanvas->getDevice()->accessBitmap(false);
+  MOZ_ASSERT(bitmap.lockPixelsAreWritable());
+
+  bitmap.unlockPixels();
+  bitmap.notifyPixelsChanged();
+}
+
 static void
 SetPaintPattern(SkPaint& aPaint, const Pattern& aPattern, TempBitmap& aTmpBitmap,
                 Float aAlpha = 1.0)
@@ -497,6 +526,26 @@
   mCanvas->drawPath(skiaPath->GetPath(), paint.mPaint);
 }
 
+bool
+DrawTargetSkia::ShouldLCDRenderText(FontType aFontType, AntialiasMode aAntialiasMode)
+{
+  // For non-opaque surfaces, only allow subpixel AA if explicitly permitted.
+  if (!IsOpaque(mFormat) && !mPermitSubpixelAA) {
+    return false;
+  }
+
+  if (aAntialiasMode == AntialiasMode::DEFAULT) {
+    switch (aFontType) {
+      case FontType::MAC:
+        return true;
+      default:
+        // TODO: Figure out what to do for the other platforms.
+        return false;
+    }
+  }
+  return (aAntialiasMode == AntialiasMode::SUBPIXEL);
+}
+
 void
 DrawTargetSkia::FillGlyphs(ScaledFont *aFont,
                            const GlyphBuffer &aBuffer,
@@ -519,6 +568,9 @@
   paint.mPaint.setTextSize(SkFloatToScalar(skiaFont->mSize));
   paint.mPaint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
 
+  bool shouldLCDRenderText = ShouldLCDRenderText(aFont->GetType(), aOptions.mAntialiasMode);
+  paint.mPaint.setLCDRenderText(shouldLCDRenderText);
+
   if (aRenderingOptions && aRenderingOptions->GetType() == FontType::CAIRO) {
     switch (static_cast<const GlyphRenderingOptionsCairo*>(aRenderingOptions)->GetHinting()) {
       case FontHinting::NONE:
@@ -538,6 +590,9 @@
     if (static_cast<const GlyphRenderingOptionsCairo*>(aRenderingOptions)->GetAutoHinting()) {
       paint.mPaint.setAutohinted(true);
     }
+  } else if (aFont->GetType() == FontType::MAC && shouldLCDRenderText) {
+    // SkFontHost_mac only supports subpixel antialiasing when hinting is turned off.
+    paint.mPaint.setHinting(SkPaint::kNo_Hinting);
   } else {
     paint.mPaint.setHinting(SkPaint::kNormal_Hinting);
   }
@@ -649,7 +704,8 @@
 DrawTargetSkia::OptimizeSourceSurface(SourceSurface *aSurface) const
 {
   if (aSurface->GetType() == SurfaceType::SKIA) {
-    return aSurface;
+    RefPtr<SourceSurface> surface(aSurface);
+    return surface.forget();
   }
 
   if (!UsingSkiaGPU()) {
@@ -686,13 +742,13 @@
       return nullptr;
     }
     cairo_surface_t* surf = static_cast<cairo_surface_t*>(aSurface.mSurface);
-    return new SourceSurfaceCairo(surf, aSurface.mSize, aSurface.mFormat);
+    return MakeAndAddRef<SourceSurfaceCairo>(surf, aSurface.mSize, aSurface.mFormat);
 #if USE_SKIA_GPU
-  } else if (aSurface.mType == NativeSurfaceType::OPENGL_TEXTURE) {
+  } else if (aSurface.mType == NativeSurfaceType::OPENGL_TEXTURE && UsingSkiaGPU()) {
     RefPtr<SourceSurfaceSkia> newSurf = new SourceSurfaceSkia();
     unsigned int texture = (unsigned int)((uintptr_t)aSurface.mSurface);
-    if (UsingSkiaGPU() && newSurf->InitFromTexture((DrawTargetSkia*)this, texture, aSurface.mSize, aSurface.mFormat)) {
-      return newSurf;
+    if (newSurf->InitFromTexture((DrawTargetSkia*)this, texture, aSurface.mSize, aSurface.mFormat)) {
+      return newSurf.forget();
     }
     return nullptr;
 #endif
@@ -873,7 +929,7 @@
 TemporaryRef<PathBuilder>
 DrawTargetSkia::CreatePathBuilder(FillRule aFillRule) const
 {
-  return new PathBuilderSkia(aFillRule);
+  return MakeAndAddRef<PathBuilderSkia>(aFillRule);
 }
 
 void
@@ -926,7 +982,7 @@
   }
   std::stable_sort(stops.begin(), stops.end());
 
-  return new GradientStopsSkia(stops, aNumStops, aExtendMode);
+  return MakeAndAddRef<GradientStopsSkia>(stops, aNumStops, aExtendMode);
 }
 
 TemporaryRef<FilterNode>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DrawTargetSkia.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DrawTargetSkia.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DrawTargetSkia.h	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DrawTargetSkia.h	2015-05-25 20:44:16.000000000 +0000
@@ -36,6 +36,9 @@
   virtual BackendType GetBackendType() const override { return BackendType::SKIA; }
   virtual TemporaryRef<SourceSurface> Snapshot() override;
   virtual IntSize GetSize() override { return mSize; }
+  virtual bool LockBits(uint8_t** aData, IntSize* aSize,
+                        int32_t* aStride, SurfaceFormat* aFormat) override;
+  virtual void ReleaseBits(uint8_t* aData) override;
   virtual void Flush() override;
   virtual void DrawSurface(SourceSurface *aSurface,
                            const Rect &aDest,
@@ -126,6 +129,8 @@
 
   void MarkChanged();
 
+  bool ShouldLCDRenderText(FontType aFontType, AntialiasMode aAntialiasMode);
+
   SkRect SkRectCoveringWholeSurface() const;
 
   bool UsingSkiaGPU() const;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DrawTargetTiled.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DrawTargetTiled.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/DrawTargetTiled.cpp	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/DrawTargetTiled.cpp	2015-05-25 20:44:16.000000000 +0000
@@ -51,7 +51,7 @@
 TemporaryRef<SourceSurface>
 DrawTargetTiled::Snapshot()
 {
-  return new SnapshotTiled(mTiles, mRect);
+  return MakeAndAddRef<SnapshotTiled>(mTiles, mRect);
 }
 
 // Skip the mClippedOut check since this is only used for Flush() which
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/Factory.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/Factory.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/Factory.cpp	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/Factory.cpp	2015-05-25 20:44:16.000000000 +0000
@@ -337,7 +337,7 @@
   }
 
   if (mRecorder && retVal) {
-    return new DrawTargetRecording(mRecorder, retVal);
+    return MakeAndAddRef<DrawTargetRecording>(mRecorder, retVal);
   }
 
   if (!retVal) {
@@ -351,7 +351,7 @@
 TemporaryRef<DrawTarget>
 Factory::CreateRecordingDrawTarget(DrawEventRecorder *aRecorder, DrawTarget *aDT)
 {
-  return new DrawTargetRecording(aRecorder, aDT);
+  return MakeAndAddRef<DrawTargetRecording>(aRecorder, aDT);
 }
 
 TemporaryRef<DrawTarget>
@@ -406,7 +406,7 @@
   }
 
   if (mRecorder && retVal) {
-    return new DrawTargetRecording(mRecorder, retVal, true);
+    return MakeAndAddRef<DrawTargetRecording>(mRecorder, retVal, true);
   }
 
   if (!retVal) {
@@ -478,25 +478,25 @@
 #ifdef WIN32
   case NativeFontType::DWRITE_FONT_FACE:
     {
-      return new ScaledFontDWrite(static_cast<IDWriteFontFace*>(aNativeFont.mFont), aSize);
+      return MakeAndAddRef<ScaledFontDWrite>(static_cast<IDWriteFontFace*>(aNativeFont.mFont), aSize);
     }
 #if defined(USE_CAIRO) || defined(USE_SKIA)
   case NativeFontType::GDI_FONT_FACE:
     {
-      return new ScaledFontWin(static_cast<LOGFONT*>(aNativeFont.mFont), aSize);
+      return MakeAndAddRef<ScaledFontWin>(static_cast<LOGFONT*>(aNativeFont.mFont), aSize);
     }
 #endif
 #endif
 #ifdef XP_MACOSX
   case NativeFontType::MAC_FONT_FACE:
     {
-      return new ScaledFontMac(static_cast<CGFontRef>(aNativeFont.mFont), aSize);
+      return MakeAndAddRef<ScaledFontMac>(static_cast<CGFontRef>(aNativeFont.mFont), aSize);
     }
 #endif
 #if defined(USE_CAIRO) || defined(USE_SKIA_FREETYPE)
   case NativeFontType::CAIRO_FONT_FACE:
     {
-      return new ScaledFontCairo(static_cast<cairo_scaled_font_t*>(aNativeFont.mFont), aSize);
+      return MakeAndAddRef<ScaledFontCairo>(static_cast<cairo_scaled_font_t*>(aNativeFont.mFont), aSize);
     }
 #endif
   default:
@@ -514,7 +514,7 @@
 #ifdef WIN32
   case FontType::DWRITE:
     {
-      return new ScaledFontDWrite(aData, aSize, aFaceIndex, aGlyphSize);
+      return MakeAndAddRef<ScaledFontDWrite>(aData, aSize, aFaceIndex, aGlyphSize);
     }
 #endif
   default:
@@ -652,7 +652,7 @@
       retVal = new DrawTargetRecording(mRecorder, retVal, true);
     }
 
-    return retVal;
+    return retVal.forget();
   }
 
   gfxWarning() << "Failed to create draw target for D3D11 texture.";
@@ -706,7 +706,7 @@
 TemporaryRef<GlyphRenderingOptions>
 Factory::CreateDWriteGlyphRenderingOptions(IDWriteRenderingParams *aParams)
 {
-  return new GlyphRenderingOptionsDWrite(aParams);
+  return MakeAndAddRef<GlyphRenderingOptionsDWrite>(aParams);
 }
 
 uint64_t
@@ -780,8 +780,7 @@
   }
 
   if (mRecorder && retVal) {
-    RefPtr<DrawTarget> recordDT = new DrawTargetRecording(mRecorder, retVal, true);
-    return recordDT.forget();
+    return MakeAndAddRef<DrawTargetRecording>(mRecorder, retVal, true);
   }
 #endif
   return retVal.forget();
@@ -800,7 +799,7 @@
   }
 
   if (mRecorder && retVal) {
-    return new DrawTargetRecording(mRecorder, retVal);
+    return MakeAndAddRef<DrawTargetRecording>(mRecorder, retVal);
   }
   return retVal.forget();
 }
@@ -808,7 +807,7 @@
 TemporaryRef<GlyphRenderingOptions>
 Factory::CreateCGGlyphRenderingOptions(const Color &aFontSmoothingBackgroundColor)
 {
-  return new GlyphRenderingOptionsCG(aFontSmoothingBackgroundColor);
+  return MakeAndAddRef<GlyphRenderingOptionsCG>(aFontSmoothingBackgroundColor);
 }
 #endif
 
@@ -873,7 +872,7 @@
 TemporaryRef<DrawEventRecorder>
 Factory::CreateEventRecorderForFile(const char *aFilename)
 {
-  return new DrawEventRecorderFile(aFilename);
+  return MakeAndAddRef<DrawEventRecorderFile>(aFilename);
 }
 
 void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/FilterNodeD2D1.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/FilterNodeD2D1.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/FilterNodeD2D1.cpp	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/FilterNodeD2D1.cpp	2015-05-25 20:44:16.000000000 +0000
@@ -541,7 +541,7 @@
 FilterNodeD2D1::Create(ID2D1DeviceContext *aDC, FilterType aType)
 {
   if (aType == FilterType::CONVOLVE_MATRIX) {
-    return new FilterNodeConvolveD2D1(aDC);
+    return MakeAndAddRef<FilterNodeConvolveD2D1>(aDC);
   }
 
   RefPtr<ID2D1Effect> effect;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/FilterNodeSoftware.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/FilterNodeSoftware.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/FilterNodeSoftware.cpp	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/FilterNodeSoftware.cpp	2015-05-25 20:44:16.000000000 +0000
@@ -1302,7 +1302,8 @@
 Premultiply(DataSourceSurface* aSurface)
 {
   if (aSurface->GetFormat() == SurfaceFormat::A8) {
-    return aSurface;
+    RefPtr<DataSourceSurface> surface(aSurface);
+    return surface.forget();
   }
 
   IntSize size = aSurface->GetSize();
@@ -1327,7 +1328,8 @@
 Unpremultiply(DataSourceSurface* aSurface)
 {
   if (aSurface->GetFormat() == SurfaceFormat::A8) {
-    return aSurface;
+    RefPtr<DataSourceSurface> surface(aSurface);
+    return surface.forget();
   }
 
   IntSize size = aSurface->GetSize();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/FilterProcessingSIMD-inl.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/FilterProcessingSIMD-inl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/FilterProcessingSIMD-inl.h	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/FilterProcessingSIMD-inl.h	2015-05-25 20:44:16.000000000 +0000
@@ -95,7 +95,7 @@
       output = nullptr;
       break;
   }
-  return output;
+  return output.forget();
 }
 
 template<typename u8x16_t>
@@ -334,7 +334,7 @@
     }
   }
 
-  return target;
+  return target.forget();
 }
 
 template<typename i32x4_t, typename i16x8_t, typename u8x16_t>
@@ -608,7 +608,7 @@
     }
   }
 
-  return target;
+  return target.forget();
 }
 
 // source / dest: bgra bgra
@@ -1074,7 +1074,7 @@
     }
   }
 
-  return target;
+  return target.forget();
 }
 
 } // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/HelpersD2D.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/HelpersD2D.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/HelpersD2D.h	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/HelpersD2D.h	2015-05-25 20:44:16.000000000 +0000
@@ -11,6 +11,7 @@
 #include <vector>
 
 #include <dwrite.h>
+#include <versionhelpers.h>
 #include "2D.h"
 #include "Logging.h"
 #include "Tools.h"
@@ -272,6 +273,41 @@
   }
 }
 
+static inline bool D2DSupportsPrimitiveBlendMode(CompositionOp aOp)
+{
+  switch (aOp) {
+    case CompositionOp::OP_OVER:
+//  case CompositionOp::OP_SOURCE:
+      return true;
+//  case CompositionOp::OP_DARKEN:
+    case CompositionOp::OP_ADD:
+      return IsWindows8Point1OrGreater();
+    default:
+      return false;
+  }
+}
+
+static inline D2D1_PRIMITIVE_BLEND D2DPrimitiveBlendMode(CompositionOp aOp)
+{
+  switch (aOp) {
+    case CompositionOp::OP_OVER:
+      return D2D1_PRIMITIVE_BLEND_SOURCE_OVER;
+    // D2D1_PRIMITIVE_BLEND_COPY should leave pixels out of the source's
+    // bounds unchanged, but doesn't- breaking unbounded ops.
+    // D2D1_PRIMITIVE_BLEND_MIN doesn't quite work like darken either, as it
+    // accounts for the source alpha.
+    //
+    // case CompositionOp::OP_SOURCE:
+    //   return D2D1_PRIMITIVE_BLEND_COPY;
+    // case CompositionOp::OP_DARKEN:
+    //   return D2D1_PRIMITIVE_BLEND_MIN;
+    case CompositionOp::OP_ADD:
+      return D2D1_PRIMITIVE_BLEND_ADD;
+    default:
+      return D2D1_PRIMITIVE_BLEND_SOURCE_OVER;
+  }
+}
+
 static inline bool IsPatternSupportedByD2D(const Pattern &aPattern)
 {
   if (aPattern.GetType() != PatternType::RADIAL_GRADIENT) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/Logging.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/Logging.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/Logging.h	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/Logging.h	2015-05-25 20:44:16.000000000 +0000
@@ -12,7 +12,7 @@
 #include <vector>
 
 #ifdef MOZ_LOGGING
-#include <prlog.h>
+#include "mozilla/Logging.h"
 #endif
 
 #if defined(MOZ_WIDGET_GONK) || defined(MOZ_WIDGET_ANDROID)
@@ -246,7 +246,7 @@
     if (!str.empty()) {
       WriteLog(str);
     }
-    mMessage.clear();
+    mMessage.str("");
   }
 
   Log &operator <<(char aChar) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/moz.build firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/moz.build	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/moz.build	2015-05-25 20:44:17.000000000 +0000
@@ -24,6 +24,7 @@
     'DrawTargetTiled.h',
     'Filters.h',
     'Helpers.h',
+    'HelpersCairo.h',
     'Logging.h',
     'Matrix.h',
     'NumericTools.h',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/PathCairo.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/PathCairo.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/PathCairo.cpp	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/PathCairo.cpp	2015-05-25 20:44:16.000000000 +0000
@@ -125,7 +125,7 @@
 TemporaryRef<Path>
 PathBuilderCairo::Finish()
 {
-  return new PathCairo(mFillRule, mPathData, mCurrentPoint);
+  return MakeAndAddRef<PathCairo>(mFillRule, mPathData, mCurrentPoint);
 }
 
 PathCairo::PathCairo(FillRule aFillRule, std::vector<cairo_path_data_t> &aPathData, const Point &aCurrentPoint)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/PathCG.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/PathCG.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/PathCG.cpp	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/PathCG.cpp	2015-05-25 20:44:16.000000000 +0000
@@ -130,14 +130,14 @@
 TemporaryRef<Path>
 PathBuilderCG::Finish()
 {
-  return new PathCG(mCGPath, mFillRule);
+  return MakeAndAddRef<PathCG>(mCGPath, mFillRule);
 }
 
 TemporaryRef<PathBuilder>
 PathCG::CopyToBuilder(FillRule aFillRule) const
 {
   CGMutablePathRef path = CGPathCreateMutableCopy(mPath);
-  return new PathBuilderCG(path, aFillRule);
+  return MakeAndAddRef<PathBuilderCG>(path, aFillRule);
 }
 
 
@@ -197,7 +197,7 @@
   ta.transform = GfxMatrixToCGAffineTransform(aTransform);
 
   CGPathApply(mPath, &ta, TransformApplier::TranformCGPathApplierFunc);
-  return new PathBuilderCG(ta.path, aFillRule);
+  return MakeAndAddRef<PathBuilderCG>(ta.path, aFillRule);
 }
 
 static void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/PathD2D.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/PathD2D.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/PathD2D.cpp	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/PathD2D.cpp	2015-05-25 20:44:16.000000000 +0000
@@ -303,7 +303,7 @@
     return nullptr;
   }
 
-  return new PathD2D(mGeometry, mFigureActive, mCurrentPoint, mFillRule, mBackendType);
+  return MakeAndAddRef<PathD2D>(mGeometry, mFigureActive, mCurrentPoint, mFillRule, mBackendType);
 }
 
 TemporaryRef<PathBuilder>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/PathHelpers.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/PathHelpers.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/PathHelpers.h	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/PathHelpers.h	2015-05-25 20:44:16.000000000 +0000
@@ -354,16 +354,19 @@
  * This function has the same behavior as UserToDevicePixelSnapped except that
  * aRect is not transformed to device space.
  */
-inline void MaybeSnapToDevicePixels(Rect& aRect, const DrawTarget& aDrawTarget,
-                                    bool aIgnoreScale = false)
+inline bool MaybeSnapToDevicePixels(Rect& aRect, const DrawTarget& aDrawTarget,
+                                    bool aAllowScaleOr90DegreeRotate = false)
 {
-  if (UserToDevicePixelSnapped(aRect, aDrawTarget, aIgnoreScale)) {
+  if (UserToDevicePixelSnapped(aRect, aDrawTarget,
+                               aAllowScaleOr90DegreeRotate)) {
     // Since UserToDevicePixelSnapped returned true we know there is no
     // rotation/skew in 'mat', so we can just use TransformBounds() here.
     Matrix mat = aDrawTarget.GetTransform();
     mat.Invert();
     aRect = mat.TransformBounds(aRect);
+    return true;
   }
+  return false;
 }
 
 } // namespace gfx
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/PathRecording.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/PathRecording.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/PathRecording.cpp	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/PathRecording.cpp	2015-05-25 20:44:16.000000000 +0000
@@ -73,7 +73,7 @@
 PathBuilderRecording::Finish()
 {
   RefPtr<Path> path = mPathBuilder->Finish();
-  return new PathRecording(path, mPathOps, mFillRule);
+  return MakeAndAddRef<PathRecording>(path, mPathOps, mFillRule);
 }
 
 PathRecording::~PathRecording()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/PathSkia.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/PathSkia.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/PathSkia.cpp	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/PathSkia.cpp	2015-05-25 20:44:16.000000000 +0000
@@ -105,7 +105,7 @@
 TemporaryRef<Path>
 PathBuilderSkia::Finish()
 {
-  return new PathSkia(mPath, mFillRule);
+  return MakeAndAddRef<PathSkia>(mPath, mFillRule);
 }
 
 void
@@ -123,7 +123,7 @@
 TemporaryRef<PathBuilder>
 PathSkia::TransformedCopyToBuilder(const Matrix &aTransform, FillRule aFillRule) const
 {
-  return new PathBuilderSkia(aTransform, mPath, aFillRule);
+  return MakeAndAddRef<PathBuilderSkia>(aTransform, mPath, aFillRule);
 }
 
 bool
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/Rect.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/Rect.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/Rect.h	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/Rect.h	2015-05-25 20:44:16.000000000 +0000
@@ -181,10 +181,12 @@
 template<class units>
 IntRectTyped<units> RoundedToInt(const RectTyped<units>& aRect)
 {
-  return IntRectTyped<units>(int32_t(floorf(aRect.x + 0.5f)),
-                             int32_t(floorf(aRect.y + 0.5f)),
-                             int32_t(floorf(aRect.width + 0.5f)),
-                             int32_t(floorf(aRect.height + 0.5f)));
+  RectTyped<units> copy(aRect);
+  copy.Round();
+  return IntRectTyped<units>(int32_t(copy.x),
+                             int32_t(copy.y),
+                             int32_t(copy.width),
+                             int32_t(copy.height));
 }
 
 template<class units>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/ScaledFontBase.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/ScaledFontBase.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/ScaledFontBase.cpp	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/ScaledFontBase.cpp	2015-05-25 20:44:16.000000000 +0000
@@ -80,7 +80,7 @@
 #ifdef USE_SKIA
   if (aTarget->GetBackendType() == BackendType::SKIA) {
     SkPath path = GetSkiaPathForGlyphs(aBuffer);
-    return new PathSkia(path, FillRule::FILL_WINDING);
+    return MakeAndAddRef<PathSkia>(path, FillRule::FILL_WINDING);
   }
 #endif
 #ifdef USE_CAIRO
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/ScaledFontMac.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/ScaledFontMac.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/ScaledFontMac.cpp	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/ScaledFontMac.cpp	2015-05-25 20:44:16.000000000 +0000
@@ -94,9 +94,9 @@
           CGPathAddPath(path, &matrix, glyphPath);
           CGPathRelease(glyphPath);
       }
-      TemporaryRef<Path> ret = new PathCG(path, FillRule::FILL_WINDING);
+      RefPtr<Path> ret = new PathCG(path, FillRule::FILL_WINDING);
       CGPathRelease(path);
-      return ret;
+      return ret.forget();
   }
   return ScaledFontBase::GetPathForGlyphs(aBuffer, aTarget);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/SourceSurfaceCairo.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/SourceSurfaceCairo.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/SourceSurfaceCairo.cpp	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/SourceSurfaceCairo.cpp	2015-05-25 20:44:17.000000000 +0000
@@ -81,7 +81,7 @@
 
   // We also need to make sure that the returned surface has
   // surface->GetType() == SurfaceType::DATA.
-  return new DataSourceSurfaceWrapper(dataSurf);
+  return MakeAndAddRef<DataSourceSurfaceWrapper>(dataSurf);
 }
 
 cairo_surface_t*
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/SourceSurfaceCG.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/SourceSurfaceCG.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/SourceSurfaceCG.cpp	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/SourceSurfaceCG.cpp	2015-05-25 20:44:17.000000000 +0000
@@ -45,7 +45,7 @@
 
   // We also need to make sure that the returned surface has
   // surface->GetType() == SurfaceType::DATA.
-  return new DataSourceSurfaceWrapper(dataSurf);
+  return MakeAndAddRef<DataSourceSurfaceWrapper>(dataSurf);
 }
 
 static void releaseCallback(void *info, const void *data, size_t size) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/SourceSurfaceCG.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/SourceSurfaceCG.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/SourceSurfaceCG.h	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/SourceSurfaceCG.h	2015-05-25 20:44:17.000000000 +0000
@@ -127,7 +127,8 @@
     //
     // For more information see bug 925448.
     DrawTargetWillChange();
-    return this;
+    RefPtr<DataSourceSurface> copy(this);
+    return copy.forget();
   }
 
   CGImageRef GetImage() { EnsureImage(); return mImage; }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/SourceSurfaceD2D1.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/SourceSurfaceD2D1.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/SourceSurfaceD2D1.cpp	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/SourceSurfaceD2D1.cpp	2015-05-25 20:44:17.000000000 +0000
@@ -66,7 +66,7 @@
     return nullptr;
   }
 
-  return new DataSourceSurfaceD2D1(softwareBitmap, mFormat);
+  return MakeAndAddRef<DataSourceSurfaceD2D1>(softwareBitmap, mFormat);
 }
 
 void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/SVGTurbulenceRenderer-inl.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/SVGTurbulenceRenderer-inl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/2d/SVGTurbulenceRenderer-inl.h	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/2d/SVGTurbulenceRenderer-inl.h	2015-05-25 20:44:16.000000000 +0000
@@ -353,7 +353,7 @@
     }
   }
 
-  return target;
+  return target.forget();
 }
 
 } // namespace gfx
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/cairo/cairo/src/cairo-rename.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/cairo/cairo/src/cairo-rename.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/cairo/cairo/src/cairo-rename.h	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/cairo/cairo/src/cairo-rename.h	2015-05-25 20:44:20.000000000 +0000
@@ -14,11 +14,44 @@
 #define cairo_copy_path_flat _moz_cairo_copy_path_flat
 #define cairo_create _moz_cairo_create
 #define cairo_curve_to _moz_cairo_curve_to
+#define cairo_d2d_create_device _moz_cairo_d2d_create_device
+#define cairo_d2d_create_device_from_d3d10device _moz_cairo_d2d_create_device_from_d3d10device
+#define cairo_d2d_device_get_device _moz_cairo_d2d_device_get_device
+#define cairo_d2d_get_dc _moz_cairo_d2d_get_dc
+#define cairo_d2d_get_image_surface_cache_usage _moz_cairo_d2d_get_image_surface_cache_usage
+#define cairo_d2d_get_surface_vram_usage _moz_cairo_d2d_get_surface_vram_usage
+#define cairo_d2d_present_backbuffer _moz_cairo_d2d_present_backbuffer
+#define cairo_d2d_release_dc _moz_cairo_d2d_release_dc
+#define cairo_d2d_scroll _moz_cairo_d2d_scroll
+#define cairo_d2d_surface_create _moz_cairo_d2d_surface_create
+#define cairo_d2d_surface_create_for_handle _moz_cairo_d2d_surface_create_for_handle
+#define cairo_d2d_surface_create_for_hwnd _moz_cairo_d2d_surface_create_for_hwnd
+#define cairo_d2d_surface_create_for_texture _moz_cairo_d2d_surface_create_for_texture
+#define cairo_d2d_surface_get_height _moz_cairo_d2d_surface_get_height
+#define cairo_d2d_surface_get_texture _moz_cairo_d2d_surface_get_texture
+#define cairo_d2d_surface_get_width _moz_cairo_d2d_surface_get_width
 #define cairo_debug_reset_static_data _moz_cairo_debug_reset_static_data
 #define cairo_destroy _moz_cairo_destroy
+#define cairo_device_acquire _moz_cairo_device_acquire
+#define cairo_device_destroy _moz_cairo_device_destroy
+#define cairo_device_finish _moz_cairo_device_finish
+#define cairo_device_flush _moz_cairo_device_flush
+#define cairo_device_get_reference_count _moz_cairo_device_get_reference_count
+#define cairo_device_get_type _moz_cairo_device_get_type
+#define cairo_device_get_user_data _moz_cairo_device_get_user_data
+#define cairo_device_release _moz_cairo_device_release
+#define cairo_device_set_user_data _moz_cairo_device_set_user_data
+#define cairo_device_status _moz_cairo_device_status
+#define cairo_device_reference _moz_cairo_device_reference
 #define cairo_device_to_user _moz_cairo_device_to_user
 #define cairo_device_to_user_distance _moz_cairo_device_to_user_distance
 #define cairo_directfb_surface_create _moz_cairo_directfb_surface_create
+#define cairo_dwrite_font_face_create_for_dwrite_fontface _moz_cairo_dwrite_font_face_create_for_dwrite_fontface
+#define cairo_dwrite_get_cleartype_rendering_mode _moz_cairo_dwrite_get_cleartype_rendering_mode
+#define cairo_dwrite_scaled_font_allow_manual_show_glyphs _moz_cairo_dwrite_scaled_font_allow_manual_show_glyphs
+#define cairo_dwrite_scaled_font_get_force_GDI_classic _moz_cairo_dwrite_scaled_font_get_force_GDI_classic
+#define cairo_dwrite_scaled_font_set_force_GDI_classic _moz_cairo_dwrite_scaled_font_set_force_GDI_classic
+#define cairo_dwrite_set_cleartype_params _moz_cairo_dwrite_set_cleartype_params
 #define cairo_fill _moz_cairo_fill
 #define cairo_fill_extents _moz_cairo_fill_extents
 #define cairo_fill_preserve _moz_cairo_fill_preserve
@@ -112,6 +145,7 @@
 #define cairo_move_to _moz_cairo_move_to
 #define cairo_new_path _moz_cairo_new_path
 #define cairo_new_sub_path _moz_cairo_new_sub_path
+#define cairo_null_surface_create _moz_cairo_null_surface_create
 #define cairo_os2_fini _moz_cairo_os2_fini
 #define cairo_os2_init _moz_cairo_os2_init
 #define cairo_os2_surface_create _moz_cairo_os2_surface_create
@@ -215,9 +249,12 @@
 #define cairo_region_translate _moz_cairo_region_translate
 #define cairo_region_union _moz_cairo_region_union
 #define cairo_region_union_rectangle _moz_cairo_region_union_rectangle
+#define cairo_region_xor _moz_cairo_region_xor
+#define cairo_region_xor_rectangle _moz_cairo_region_xor_rectangle
 #define cairo_rel_curve_to _moz_cairo_rel_curve_to
 #define cairo_rel_line_to _moz_cairo_rel_line_to
 #define cairo_rel_move_to _moz_cairo_rel_move_to
+#define cairo_release_device _moz_cairo_release_device
 #define cairo_reset_clip _moz_cairo_reset_clip
 #define cairo_restore _moz_cairo_restore
 #define cairo_rotate _moz_cairo_rotate
@@ -271,12 +308,16 @@
 #define cairo_stroke_extents _moz_cairo_stroke_extents
 #define cairo_stroke_preserve _moz_cairo_stroke_preserve
 #define cairo_stroke_to_path _moz_cairo_stroke_to_path
+#define cairo_surface_attach_snapshot _moz_cairo_surface_attach_snapshot
 #define cairo_surface_copy_page _moz_cairo_surface_copy_page
+#define cairo_surface_create_for_rectangle _moz_cairo_surface_create_for_rectangle
 #define cairo_surface_create_similar _moz_cairo_surface_create_similar
+#define cairo_surface_detach_snapshot _moz_cairo_surface_detach_snapshot
 #define cairo_surface_destroy _moz_cairo_surface_destroy
 #define cairo_surface_finish _moz_cairo_surface_finish
 #define cairo_surface_flush _moz_cairo_surface_flush
 #define cairo_surface_get_content _moz_cairo_surface_get_content
+#define cairo_surface_get_device _moz_cairo_surface_get_device
 #define cairo_surface_get_device_offset _moz_cairo_surface_get_device_offset
 #define cairo_surface_get_fallback_resolution _moz_cairo_surface_get_fallback_resolution
 #define cairo_surface_get_font_options _moz_cairo_surface_get_font_options
@@ -330,6 +371,8 @@
 #define cairo_user_to_device_distance _moz_cairo_user_to_device_distance
 #define cairo_version _moz_cairo_version
 #define cairo_version_string _moz_cairo_version_string
+#define cairo_win32_get_dc_with_clip _moz_cairo_win32_get_dc_with_clip
+#define cairo_win32_get_system_text_quality _moz_cairo_win32_get_system_text_quality
 #define cairo_win32_font_face_create_for_hfont _moz_cairo_win32_font_face_create_for_hfont
 #define cairo_win32_font_face_create_for_logfontw _moz_cairo_win32_font_face_create_for_logfontw
 #define cairo_win32_font_face_create_for_logfontw_hfont _moz_cairo_win32_font_face_create_for_logfontw_hfont
@@ -340,11 +383,15 @@
 #define cairo_win32_scaled_font_get_metrics_factor _moz_cairo_win32_scaled_font_get_metrics_factor
 #define cairo_win32_scaled_font_select_font _moz_cairo_win32_scaled_font_select_font
 #define cairo_win32_surface_create _moz_cairo_win32_surface_create
+#define cairo_win32_surface_create_with_alpha _moz_cairo_win32_surface_create_with_alpha
 #define cairo_win32_surface_create_with_d3dsurface9 _moz_cairo_win32_surface_create_with_d3dsurface9
 #define cairo_win32_surface_create_with_ddb _moz_cairo_win32_surface_create_with_ddb
 #define cairo_win32_surface_create_with_dib _moz_cairo_win32_surface_create_with_dib
 #define cairo_win32_surface_get_dc _moz_cairo_win32_surface_get_dc
+#define cairo_win32_surface_get_height _moz_cairo_win32_surface_get_height
 #define cairo_win32_surface_get_image _moz_cairo_win32_surface_get_image
+#define cairo_win32_surface_get_width _moz_cairo_win32_surface_get_width
+#define cairo_win32_surface_set_can_convert_to_dib _moz_cairo_win32_surface_set_can_convert_to_dib
 #define cairo_xcb_surface_create _moz_cairo_xcb_surface_create
 #define cairo_xcb_surface_create_for_bitmap _moz_cairo_xcb_surface_create_for_bitmap
 #define cairo_xcb_surface_create_with_xrender_format _moz_cairo_xcb_surface_create_with_xrender_format
@@ -362,4 +409,3 @@
 #define cairo_xlib_surface_get_xrender_format _moz_cairo_xlib_surface_get_xrender_format
 #define cairo_xlib_surface_set_drawable _moz_cairo_xlib_surface_set_drawable
 #define cairo_xlib_surface_set_size _moz_cairo_xlib_surface_set_size
-#include "pixman-rename.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/cairo/cairo/src/pixman-rename.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/cairo/cairo/src/pixman-rename.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/cairo/cairo/src/pixman-rename.h	2015-05-13 18:06:30.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/cairo/cairo/src/pixman-rename.h	2015-05-25 20:44:20.000000000 +0000
@@ -1,4 +1,15 @@
 #ifdef MOZ_TREE_PIXMAN
+#define pixman_composite_glyphs _moz_pixman_composite_glyphs
+#define pixman_composite_glyphs_no_mask _moz_pixman_composite_glyphs_no_mask
+#define pixman_glyph_cache_create _moz_pixman_glyph_cache_create
+#define pixman_glyph_cache_destroy _moz_pixman_glyph_cache_destroy
+#define pixman_glyph_cache_freeze _moz_pixman_glyph_cache_freeze
+#define pixman_glyph_cache_insert _moz_pixman_glyph_cache_insert
+#define pixman_glyph_cache_lookup _moz_pixman_glyph_cache_lookup
+#define pixman_glyph_cache_remove _moz_pixman_glyph_cache_remove
+#define pixman_glyph_cache_thaw _moz_pixman_glyph_cache_thaw
+#define pixman_glyph_get_extents _moz_pixman_glyph_get_extents
+#define pixman_glyph_get_mask_format _moz_pixman_glyph_get_mask_format
 #define pixman_region_set_static_pointers _moz_pixman_region_set_static_pointers
 #define pixman_region_init _moz_pixman_region_init
 #define pixman_region_init_rect _moz_pixman_region_init_rect
@@ -21,6 +32,8 @@
 #define pixman_region_equal _moz_pixman_region_equal
 #define pixman_region_selfcheck _moz_pixman_region_selfcheck
 #define pixman_region_reset _moz_pixman_region_reset
+#define pixman_region_clear _moz_pixman_region_clear
+#define pixman_region_print _moz_pixman_region_print
 #define pixman_region32_init _moz_pixman_region32_init
 #define pixman_region32_init_rect _moz_pixman_region32_init_rect
 #define pixman_region32_init_rects _moz_pixman_region32_init_rects
@@ -45,6 +58,7 @@
 #define pixman_region32_selfcheck _moz_pixman_region32_selfcheck
 #define pixman_region32_reset _moz_pixman_region32_reset
 #define pixman_region32_clear _moz_pixman_region32_clear
+#define pixman_region32_print _moz_pixman_region32_print
 #define pixman_blt _moz_pixman_blt
 #define pixman_fill _moz_pixman_fill
 #define pixman_transform_point_3d _moz_pixman_transform_point_3d
@@ -86,6 +100,9 @@
 #define pixman_rasterize_edges _moz_pixman_rasterize_edges
 #define pixman_add_traps _moz_pixman_add_traps
 #define pixman_add_trapezoids _moz_pixman_add_trapezoids
+#define pixman_add_triangles _moz_pixman_add_triangles
+#define pixman_composite_trapezoids _moz_pixman_composite_trapezoids
+#define pixman_composite_triangles _moz_pixman_composite_triangles
 #define pixman_rasterize_trapezoid _moz_pixman_rasterize_trapezoid
 #define pixman_disable_out_of_bounds_workaround _moz_pixman_disable_out_of_bounds_workaround
 #define pixman_f_transform_bounds _moz_pixman_f_transform_bounds
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/gl/GLBlitHelper.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/gl/GLBlitHelper.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/gl/GLBlitHelper.cpp	2015-05-13 18:06:31.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/gl/GLBlitHelper.cpp	2015-05-25 20:44:21.000000000 +0000
@@ -969,7 +969,8 @@
                                        GLenum destTarget,
                                        bool internalFBs)
 {
-    MOZ_ASSERT(!srcFB || mGL->fIsFramebuffer(srcFB));
+    // On the Android 4.3 emulator, IsFramebuffer may return false incorrectly.
+    MOZ_ASSERT_IF(mGL->Renderer() != GLRenderer::AndroidEmulator, !srcFB || mGL->fIsFramebuffer(srcFB));
     MOZ_ASSERT(mGL->fIsTexture(destTex));
 
     if (mGL->IsSupported(GLFeature::framebuffer_blit)) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/gl/SharedSurface.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/gl/SharedSurface.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/gl/SharedSurface.cpp	2015-05-13 18:06:31.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/gl/SharedSurface.cpp	2015-05-25 20:44:21.000000000 +0000
@@ -347,7 +347,7 @@
     // is no longer being used.
     surf->WaitForBufferOwnership();
 
-    return new ShSurfHandle(this, Move(surf));
+    return MakeAndAddRef<ShSurfHandle>(this, Move(surf));
 }
 
 // Auto-deletes surfs of the wrong type.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/gl/SharedSurfaceGralloc.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/gl/SharedSurfaceGralloc.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/gl/SharedSurfaceGralloc.cpp	2015-05-13 18:06:31.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/gl/SharedSurfaceGralloc.cpp	2015-05-25 20:44:21.000000000 +0000
@@ -194,9 +194,7 @@
             int fenceFd = mEGL->fDupNativeFenceFDANDROID(mEGL->Display(), sync);
             if (fenceFd != -1) {
                 mEGL->fDestroySync(mEGL->Display(), sync);
-                android::sp<android::Fence> fence(new android::Fence(fenceFd));
-                FenceHandle handle = FenceHandle(fence);
-                mTextureClient->SetAcquireFenceHandle(handle);
+                mTextureClient->SetAcquireFenceHandle(FenceHandle(new FenceHandle::FdObj(fenceFd)));
             } else {
                 mSync = sync;
             }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/async-scrollbar-1-h.html firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/async-scrollbar-1-h.html
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/async-scrollbar-1-h.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/async-scrollbar-1-h.html	2015-05-25 20:44:23.000000000 +0000
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html class="reftest-wait"
+      reftest-async-scroll
+      reftest-async-scroll-x="449" reftest-async-scroll-y="0"><head>
+<meta name="viewport" content="width=device-width">
+</head>
+<!-- Doing scrollTo(1,0) is to activate the left arrow in the scrollbar
+     for non-overlay scrollbar environments -->
+<body onload="scrollTo(1,0); document.documentElement.classList.remove('reftest-wait')">
+<div style="width: 9000px; height: 10px; background: white"></div>
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/async-scrollbar-1-h-ref.html firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/async-scrollbar-1-h-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/async-scrollbar-1-h-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/async-scrollbar-1-h-ref.html	2015-05-25 20:44:23.000000000 +0000
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html class="reftest-wait"><head>
+<meta name="viewport" content="width=device-width">
+</head>
+<body onload="scrollTo(450,0); document.documentElement.classList.remove('reftest-wait')">
+<div style="width: 9000px; height: 10px; background: white;"></div>
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/async-scrollbar-1-h-rtl.html firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/async-scrollbar-1-h-rtl.html
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/async-scrollbar-1-h-rtl.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/async-scrollbar-1-h-rtl.html	2015-05-25 20:44:23.000000000 +0000
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html class="reftest-wait"
+      reftest-async-scroll
+      reftest-async-scroll-x="-449" reftest-async-scroll-y="0"><head>
+<meta name="viewport" content="width=device-width">
+<style> html { direction: rtl; } </style>
+</head>
+<!-- Doing scrollTo(-1,0) is to activate the right arrow in the scrollbar
+     for non-overlay scrollbar environments -->
+<body onload="scrollTo(-1,0); document.documentElement.classList.remove('reftest-wait')">
+<div style="width: 9000px; height: 10px; background: white"></div>
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/async-scrollbar-1-h-rtl-ref.html firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/async-scrollbar-1-h-rtl-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/async-scrollbar-1-h-rtl-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/async-scrollbar-1-h-rtl-ref.html	2015-05-25 20:44:23.000000000 +0000
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html class="reftest-wait"><head>
+<meta name="viewport" content="width=device-width">
+<style> html { direction: rtl; } </style>
+</head>
+<body onload="scrollTo(-450,0); document.documentElement.classList.remove('reftest-wait')">
+<div style="width: 9000px; height: 10px; background: white;"></div>
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/async-scrollbar-1-vh.html firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/async-scrollbar-1-vh.html
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/async-scrollbar-1-vh.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/async-scrollbar-1-vh.html	2015-05-25 20:44:23.000000000 +0000
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html class="reftest-wait"
+      reftest-async-scroll
+      reftest-async-scroll-x="449" reftest-async-scroll-y="9999"><head>
+<meta name="viewport" content="width=device-width">
+</head>
+<!-- Doing scrollTo(1,1) is to activate the left/up arrows in the scrollbars
+     for non-overlay scrollbar environments -->
+<body onload="scrollTo(1,1); document.documentElement.classList.remove('reftest-wait')">
+<div style="width: 9000px; height: 20000px; background: white;"></div>
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/async-scrollbar-1-vh-ref.html firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/async-scrollbar-1-vh-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/async-scrollbar-1-vh-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/async-scrollbar-1-vh-ref.html	2015-05-25 20:44:23.000000000 +0000
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html class="reftest-wait"><head>
+<meta name="viewport" content="width=device-width">
+</head>
+<body onload="scrollTo(450,10000); document.documentElement.classList.remove('reftest-wait')">
+<div style="width: 9000px; height: 20000px; background: white;"></div>
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/async-scrollbar-1-vh-rtl.html firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/async-scrollbar-1-vh-rtl.html
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/async-scrollbar-1-vh-rtl.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/async-scrollbar-1-vh-rtl.html	2015-05-25 20:44:23.000000000 +0000
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html class="reftest-wait"
+      reftest-async-scroll
+      reftest-async-scroll-x="-440" reftest-async-scroll-y="9999"><head>
+<meta name="viewport" content="width=device-width">
+<style> html { direction: rtl; } </style>
+</head>
+<!-- Doing scrollTo(-10,1) is to activate the right/up arrows in the scrollbars
+     for non-overlay scrollbar environments -->
+<body onload="scrollTo(-10,1); document.documentElement.classList.remove('reftest-wait')">
+<div style="width: 9000px; height: 20000px; background: white;"></div>
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/async-scrollbar-1-vh-rtl-ref.html firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/async-scrollbar-1-vh-rtl-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/async-scrollbar-1-vh-rtl-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/async-scrollbar-1-vh-rtl-ref.html	2015-05-25 20:44:23.000000000 +0000
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html class="reftest-wait"><head>
+<meta name="viewport" content="width=device-width">
+<style> html { direction: rtl; } </style>
+</head>
+<body onload="scrollTo(-450,10000); document.documentElement.classList.remove('reftest-wait')">
+<div style="width: 9000px; height: 20000px; background: white;"></div>
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/async-scrollbar-1-v.html firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/async-scrollbar-1-v.html
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/async-scrollbar-1-v.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/async-scrollbar-1-v.html	2015-05-25 20:44:23.000000000 +0000
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html class="reftest-wait"
+      reftest-async-scroll
+      reftest-async-scroll-x="0" reftest-async-scroll-y="9999"><head>
+<meta name="viewport" content="width=device-width">
+</head>
+<!-- Doing scrollTo(0,1) is to activate the up arrow in the scrollbar
+     for non-overlay scrollbar environments -->
+<body onload="scrollTo(0,1); document.documentElement.classList.remove('reftest-wait')">
+<div style="width: 10px; height: 20000px; background: white;"></div>
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/async-scrollbar-1-v-ref.html firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/async-scrollbar-1-v-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/async-scrollbar-1-v-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/async-scrollbar-1-v-ref.html	2015-05-25 20:44:23.000000000 +0000
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html class="reftest-wait"><head>
+<meta name="viewport" content="width=device-width">
+</head>
+<body onload="scrollTo(0,10000); document.documentElement.classList.remove('reftest-wait')">
+<div style="width: 10px; height: 20000px; background: white;"></div>
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/async-scrollbar-1-v-rtl.html firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/async-scrollbar-1-v-rtl.html
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/async-scrollbar-1-v-rtl.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/async-scrollbar-1-v-rtl.html	2015-05-25 20:44:23.000000000 +0000
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html class="reftest-wait"
+      reftest-async-scroll
+      reftest-async-scroll-x="0" reftest-async-scroll-y="9999"><head>
+<meta name="viewport" content="width=device-width">
+<style> html { direction: rtl; } </style>
+</head>
+<!-- Doing scrollTo(0,1) is to activate the up arrow in the scrollbar
+     for non-overlay scrollbar environments -->
+<body onload="scrollTo(0,1); document.documentElement.classList.remove('reftest-wait')">
+<div style="width: 10px; height: 20000px; background: white;"></div>
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/async-scrollbar-1-v-rtl-ref.html firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/async-scrollbar-1-v-rtl-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/async-scrollbar-1-v-rtl-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/async-scrollbar-1-v-rtl-ref.html	2015-05-25 20:44:23.000000000 +0000
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html class="reftest-wait"><head>
+<meta name="viewport" content="width=device-width">
+<style> html { direction: rtl; } </style>
+</head>
+<body onload="scrollTo(0,10000); document.documentElement.classList.remove('reftest-wait')">
+<div style="width: 10px; height: 20000px; background: white;"></div>
+</body>
+</html>
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/reftest.list firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/reftest.list
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/reftests/reftest.list	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/reftests/reftest.list	2015-05-25 20:44:23.000000000 +0000
@@ -0,0 +1,8 @@
+# The following tests test the async positioning of the scrollbars.
+# Basic root-frame scrollbar with async scrolling
+skip-if(!asyncPanZoom) == async-scrollbar-1-v.html async-scrollbar-1-v-ref.html
+skip-if(!asyncPanZoom) == async-scrollbar-1-h.html async-scrollbar-1-h-ref.html
+skip-if(!asyncPanZoom) == async-scrollbar-1-vh.html async-scrollbar-1-vh-ref.html
+skip-if(!asyncPanZoom) == async-scrollbar-1-v-rtl.html async-scrollbar-1-v-rtl-ref.html
+skip-if(!asyncPanZoom) == async-scrollbar-1-h-rtl.html async-scrollbar-1-h-rtl-ref.html
+skip-if(!asyncPanZoom) == async-scrollbar-1-vh-rtl.html async-scrollbar-1-vh-rtl-ref.html
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/src/APZUtils.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/src/APZUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/src/APZUtils.h	2015-05-13 18:06:31.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/src/APZUtils.h	2015-05-25 20:44:23.000000000 +0000
@@ -38,11 +38,19 @@
 
 typedef uint32_t TouchBehaviorFlags;
 
+// Epsilon to be used when comparing 'float' coordinate values
+// with FuzzyEqualsAdditive. The rationale is that 'float' has 7 decimal
+// digits of precision, and coordinate values should be no larger than in the
+// ten thousands. Note also that the smallest legitimate difference in page
+// coordinates is 1 app unit, which is 1/60 of a (CSS pixel), so this epsilon
+// isn't too large.
+const float COORDINATE_EPSILON = 0.01f;
+
 template <typename Units>
 static bool IsZero(const gfx::PointTyped<Units>& aPoint)
 {
-  return FuzzyEqualsAdditive(aPoint.x, 0.0f)
-      && FuzzyEqualsAdditive(aPoint.y, 0.0f);
+  return FuzzyEqualsAdditive(aPoint.x, 0.0f, COORDINATE_EPSILON)
+      && FuzzyEqualsAdditive(aPoint.y, 0.0f, COORDINATE_EPSILON);
 }
 
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/src/AsyncPanZoomController.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/src/AsyncPanZoomController.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/src/AsyncPanZoomController.cpp	2015-05-13 18:06:31.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/src/AsyncPanZoomController.cpp	2015-05-25 20:44:23.000000000 +0000
@@ -382,18 +382,13 @@
 #endif
 }
 
-static TimeStamp sFrameTime;
-
 // Counter used to give each APZC a unique id
 static uint32_t sAsyncPanZoomControllerCount = 0;
 
 TimeStamp
-AsyncPanZoomController::GetFrameTime()
+AsyncPanZoomController::GetFrameTime() const
 {
-  if (sFrameTime.IsNull()) {
-    return TimeStamp::Now();
-  }
-  return sFrameTime;
+  return TimeStamp::Now();
 }
 
 class MOZ_STACK_CLASS StateChangeNotificationBlocker {
@@ -432,7 +427,7 @@
     , mOverscrollHandoffChain(aOverscrollHandoffChain)
   {
     MOZ_ASSERT(mOverscrollHandoffChain);
-    TimeStamp now = AsyncPanZoomController::GetFrameTime();
+    TimeStamp now = aApzc.GetFrameTime();
 
     // Drop any velocity on axes where we don't have room to scroll anyways
     // (in this APZC, or an APZC further in the handoff chain).
@@ -532,8 +527,6 @@
       // We may have reached the end of the scroll range along one axis but
       // not the other. In such a case we only want to hand off the relevant
       // component of the fling.
-      // TODO(botond): If our intention is to continue the other component
-      // in this APZC, we should not be returning 'false'.
       if (FuzzyEqualsAdditive(overscroll.x, 0.0f, COORDINATE_EPSILON)) {
         velocity.x = 0;
       } else if (FuzzyEqualsAdditive(overscroll.y, 0.0f, COORDINATE_EPSILON)) {
@@ -557,7 +550,11 @@
                                               velocity,
                                               mOverscrollHandoffChain));
 
-      return false;
+      // If there is a remaining velocity on this APZC, continue this fling
+      // as well. (This fling and the handed-off fling will run concurrently.)
+      // Note that AdjustDisplacement() will have zeroed out the velocity
+      // along the axes where we're overscrolled.
+      return !IsZero(mApzc.GetVelocityVector());
     }
 
     return true;
@@ -775,11 +772,6 @@
   AxisPhysicsMSDModel mXAxisModel, mYAxisModel;
 };
 
-void
-AsyncPanZoomController::SetFrameTime(const TimeStamp& aTime) {
-  sFrameTime = aTime;
-}
-
 /*static*/ void
 AsyncPanZoomController::InitializeGlobalState()
 {
@@ -1875,6 +1867,11 @@
   return ParentLayerPoint(mX.GetVelocity(), mY.GetVelocity());
 }
 
+void AsyncPanZoomController::SetVelocityVector(const ParentLayerPoint& aVelocityVector) {
+  mX.SetVelocity(aVelocityVector.x);
+  mY.SetVelocity(aVelocityVector.y);
+}
+
 void AsyncPanZoomController::HandlePanningWithTouchAction(double aAngle) {
   // Handling of cross sliding will need to be added in this method after touch-action released
   // enabled by default.
@@ -2451,7 +2448,9 @@
 
 bool AsyncPanZoomController::SnapBackIfOverscrolled() {
   ReentrantMonitorAutoEnter lock(mMonitor);
-  if (IsOverscrolled()) {
+  // It's possible that we're already in the middle of an overscroll
+  // animation - if so, don't start a new one.
+  if (IsOverscrolled() && mState != OVERSCROLL_ANIMATION) {
     APZC_LOG("%p is overscrolled, starting snap-back\n", this);
     StartOverscrollAnimation(ParentLayerPoint(0, 0));
     return true;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/src/AsyncPanZoomController.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/src/AsyncPanZoomController.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/src/AsyncPanZoomController.h	2015-05-13 18:06:31.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/src/AsyncPanZoomController.h	2015-05-25 20:44:23.000000000 +0000
@@ -378,8 +378,14 @@
   void NotifyMozMouseScrollEvent(const nsString& aString) const;
 
 protected:
+  // These functions are protected virtual so test code can override them.
+
+  // Returns the cached current frame time.
+  virtual TimeStamp GetFrameTime() const;
+
+protected:
   // Protected destructor, to discourage deletion outside of Release():
-  ~AsyncPanZoomController();
+  virtual ~AsyncPanZoomController();
 
   /**
    * Helper method for touches beginning. Sets everything up for panning and any
@@ -519,6 +525,11 @@
   const ParentLayerPoint GetVelocityVector() const;
 
   /**
+   * Sets the velocities of each axis.
+   */
+  void SetVelocityVector(const ParentLayerPoint& aVelocityVector);
+
+  /**
    * Gets the first touch point from a MultiTouchInput.  This gets only
    * the first one and assumes the rest are either missing or not relevant.
    */
@@ -845,9 +856,6 @@
   friend class SmoothScrollAnimation;
   friend class WheelScrollAnimation;
 
-  // Returns the cached current frame time.
-  static TimeStamp GetFrameTime();
-
   // The initial velocity of the most recent fling.
   ParentLayerPoint mLastFlingVelocity;
   // The time at which the most recent fling started.
@@ -1055,12 +1063,6 @@
    */
 public:
   /**
-   * Sync panning and zooming animation using a fixed frame time.
-   * This will ensure that we animate the APZC correctly with other external
-   * animations to the same timestamp.
-   */
-  static void SetFrameTime(const TimeStamp& aMilliseconds);
-  /**
    * Set an extra offset for testing async scrolling.
    */
   void SetTestAsyncScrollOffset(const CSSPoint& aPoint)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/src/Axis.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/src/Axis.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/src/Axis.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/src/Axis.cpp	2015-05-25 20:44:23.000000000 +0000
@@ -182,6 +182,11 @@
 
 void Axis::OverscrollBy(ParentLayerCoord aOverscroll) {
   MOZ_ASSERT(CanScroll());
+  // We can get some spurious calls to OverscrollBy() with near-zero values
+  // due to rounding error. Ignore those (they might trip the asserts below.)
+  if (FuzzyEqualsAdditive(aOverscroll.value, 0.0f, COORDINATE_EPSILON)) {
+    return;
+  }
   ClearOverscrollAnimationState();
   aOverscroll = ApplyResistance(aOverscroll);
   if (aOverscroll > 0) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/src/Axis.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/src/Axis.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/src/Axis.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/src/Axis.h	2015-05-25 20:44:23.000000000 +0000
@@ -8,6 +8,7 @@
 #define mozilla_layers_Axis_h
 
 #include <sys/types.h>                  // for int32_t
+#include "APZUtils.h"
 #include "Units.h"
 #include "mozilla/TimeStamp.h"          // for TimeDuration
 #include "nsTArray.h"                   // for nsTArray
@@ -17,14 +18,6 @@
 
 const float EPSILON = 0.0001f;
 
-// Epsilon to be used when comparing 'float' coordinate values
-// with FuzzyEqualsAdditive. The rationale is that 'float' has 7 decimal
-// digits of precision, and coordinate values should be no larger than in the
-// ten thousands. Note also that the smallest legitimate difference in page
-// coordinates is 1 app unit, which is 1/60 of a (CSS pixel), so this epsilon
-// isn't too large.
-const float COORDINATE_EPSILON = 0.01f;
-
 /**
  * Compare two coordinates for equality, accounting for rounding error.
  * Use both FuzzyEqualsAdditive() with COORDINATE_EPISLON, which accounts for
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/src/WheelScrollAnimation.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/src/WheelScrollAnimation.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/src/WheelScrollAnimation.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/src/WheelScrollAnimation.cpp	2015-05-25 20:42:33.000000000 +0000
@@ -36,7 +36,7 @@
 bool
 WheelScrollAnimation::DoSample(FrameMetrics& aFrameMetrics, const TimeDuration& aDelta)
 {
-  TimeStamp now = AsyncPanZoomController::GetFrameTime();
+  TimeStamp now = mApzc.GetFrameTime();
   CSSToParentLayerScale2D zoom = aFrameMetrics.GetZoom();
 
   // If the animation is finished, make sure the final position is correct by
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/test/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/test/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/test/mochitest.ini	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/test/mochitest.ini	2015-05-25 20:42:33.000000000 +0000
@@ -10,4 +10,4 @@
 [test_bug1151663.html]
 skip-if = toolkit != 'gonk'  # bug 991198
 [test_wheel_scroll.html]
-skip-if = (os == 'android') || (os == 'b2g') # wheel events not supported
+skip-if = (os == 'android') || (os == 'b2g') || (buildapp == 'mulet') # wheel events not supported on mobile; see bug 1164274 for mulet
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/util/APZCCallbackHelper.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/util/APZCCallbackHelper.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/util/APZCCallbackHelper.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/util/APZCCallbackHelper.cpp	2015-05-25 20:42:33.000000000 +0000
@@ -196,15 +196,17 @@
   CSSSize scrollPort = aMetrics.CalculateCompositedSizeInCssPixels();
   nsLayoutUtils::SetScrollPositionClampingScrollPortSize(aPresShell, scrollPort);
 
-  nsIContent* content = nsLayoutUtils::FindContentFor(aMetrics.GetScrollId());
-  ScrollFrame(content, aMetrics);
-
   // The pres shell resolution is updated by the the async zoom since the
   // last paint.
   presShellResolution = aMetrics.GetPresShellResolution()
                       * aMetrics.GetAsyncZoom().scale;
   nsLayoutUtils::SetResolutionAndScaleTo(aPresShell, presShellResolution);
 
+  // Do this as late as possible since scrolling can flush layout. It also
+  // adjusts the display port margins, so do it before we set those.
+  nsIContent* content = nsLayoutUtils::FindContentFor(aMetrics.GetScrollId());
+  ScrollFrame(content, aMetrics);
+
   SetDisplayPortMargins(aPresShell, content, aMetrics);
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/util/InputAPZContext.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/util/InputAPZContext.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/util/InputAPZContext.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/util/InputAPZContext.cpp	2015-05-25 20:42:33.000000000 +0000
@@ -10,6 +10,7 @@
 
 ScrollableLayerGuid InputAPZContext::sGuid;
 uint64_t InputAPZContext::sBlockId = 0;
+nsEventStatus InputAPZContext::sApzResponse = nsEventStatus_eIgnore;
 bool InputAPZContext::sRoutedToChildProcess = false;
 
 /*static*/ ScrollableLayerGuid
@@ -24,6 +25,12 @@
   return sBlockId;
 }
 
+/*static*/ nsEventStatus
+InputAPZContext::GetApzResponse()
+{
+  return sApzResponse;
+}
+
 /*static*/ void
 InputAPZContext::SetRoutedToChildProcess()
 {
@@ -31,13 +38,16 @@
 }
 
 InputAPZContext::InputAPZContext(const ScrollableLayerGuid& aGuid,
-                                 const uint64_t& aBlockId)
+                                 const uint64_t& aBlockId,
+                                 const nsEventStatus& aApzResponse)
   : mOldGuid(sGuid)
   , mOldBlockId(sBlockId)
+  , mOldApzResponse(sApzResponse)
   , mOldRoutedToChildProcess(sRoutedToChildProcess)
 {
   sGuid = aGuid;
   sBlockId = aBlockId;
+  sApzResponse = aApzResponse;
   sRoutedToChildProcess = false;
 }
 
@@ -45,6 +55,7 @@
 {
   sGuid = mOldGuid;
   sBlockId = mOldBlockId;
+  sApzResponse = mOldApzResponse;
   sRoutedToChildProcess = mOldRoutedToChildProcess;
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/util/InputAPZContext.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/util/InputAPZContext.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/apz/util/InputAPZContext.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/apz/util/InputAPZContext.h	2015-05-25 20:42:33.000000000 +0000
@@ -7,28 +7,32 @@
 #define mozilla_layers_InputAPZContext_h
 
 #include "FrameMetrics.h"
+#include "mozilla/EventForwards.h"
 
 namespace mozilla {
 namespace layers {
 
-// InputAPZContext is used to communicate the ScrollableLayerGuid and input
-// block ID from nsIWidget to RenderFrameParent. It is conceptually attached
-// to any WidgetInputEvent that has been processed by APZ directly from a
-// widget.
+// InputAPZContext is used to communicate the ScrollableLayerGuid,
+// input block ID, APZ response from nsIWidget to RenderFrameParent.
+// It is conceptually attached to any WidgetInputEvent
+// that has been processed by APZ directly from a widget.
 class MOZ_STACK_CLASS InputAPZContext
 {
 private:
   static ScrollableLayerGuid sGuid;
   static uint64_t sBlockId;
+  static nsEventStatus sApzResponse;
   static bool sRoutedToChildProcess;
 
 public:
   static ScrollableLayerGuid GetTargetLayerGuid();
   static uint64_t GetInputBlockId();
+  static nsEventStatus GetApzResponse();
   static void SetRoutedToChildProcess();
 
   InputAPZContext(const ScrollableLayerGuid& aGuid,
-                    const uint64_t& aBlockId);
+                  const uint64_t& aBlockId,
+                  const nsEventStatus& aApzResponse);
   ~InputAPZContext();
 
   bool WasRoutedToChildProcess();
@@ -36,6 +40,7 @@
 private:
   ScrollableLayerGuid mOldGuid;
   uint64_t mOldBlockId;
+  nsEventStatus mOldApzResponse;
   bool mOldRoutedToChildProcess;
 };
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/basic/BasicCompositor.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/basic/BasicCompositor.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/basic/BasicCompositor.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/basic/BasicCompositor.cpp	2015-05-25 20:42:33.000000000 +0000
@@ -517,7 +517,7 @@
   RefPtr<CompositingRenderTarget> target = CreateRenderTarget(mInvalidRect, INIT_MODE_CLEAR);
   if (!target) {
     if (!mTarget) {
-      mWidget->EndRemoteDrawing();
+      mWidget->EndRemoteDrawingInRegion(mDrawTarget, mInvalidRegion);
     }
     return;
   }
@@ -579,7 +579,7 @@
                       IntPoint(r->x - offset.x, r->y - offset.y));
   }
   if (!mTarget) {
-    mWidget->EndRemoteDrawing();
+    mWidget->EndRemoteDrawingInRegion(mDrawTarget, mInvalidRegion);
   }
 
   mDrawTarget = nullptr;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/basic/BasicImages.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/basic/BasicImages.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/basic/BasicImages.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/basic/BasicImages.cpp	2015-05-25 20:42:33.000000000 +0000
@@ -136,7 +136,8 @@
   NS_ASSERTION(NS_IsMainThread(), "Must be main thread");
 
   if (mSourceSurface) {
-    return mSourceSurface.get();
+    RefPtr<gfx::SourceSurface> surface(mSourceSurface);
+    return surface.forget();
   }
 
   if (!mDecodedBuffer) {
@@ -165,7 +166,7 @@
   mRecycleBin->RecycleBuffer(mDecodedBuffer.forget(), mSize.height * mStride);
 
   mSourceSurface = surface;
-  return mSourceSurface.get();
+  return surface.forget();
 }
 
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/basic/BasicLayerManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/basic/BasicLayerManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/basic/BasicLayerManager.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/basic/BasicLayerManager.cpp	2015-05-25 20:42:33.000000000 +0000
@@ -793,6 +793,7 @@
 BasicLayerManager::PaintSelfOrChildren(PaintLayerContext& aPaintContext,
                                        gfxContext* aGroupTarget)
 {
+  MOZ_ASSERT(aGroupTarget);
   BasicImplData* data = ToData(aPaintContext.mLayer);
 
   /* Only paint ourself, or our children - This optimization relies on this! */
@@ -852,6 +853,8 @@
                               DrawPaintedLayerCallback aCallback,
                               void* aCallbackData)
 {
+  MOZ_ASSERT(aTarget);
+
   PROFILER_LABEL("BasicLayerManager", "PaintLayer",
     js::ProfileEntry::Category::GRAPHICS);
 
@@ -911,7 +914,7 @@
     paintLayerContext.AnnotateOpaqueRect();
   }
 
-  bool clipIsEmpty = !aTarget || aTarget->GetClipExtents().IsEmpty();
+  bool clipIsEmpty = aTarget->GetClipExtents().IsEmpty();
   if (clipIsEmpty) {
     PaintSelfOrChildren(paintLayerContext, aTarget);
     return;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/basic/TextureClientX11.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/basic/TextureClientX11.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/basic/TextureClientX11.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/basic/TextureClientX11.cpp	2015-05-25 20:42:33.000000000 +0000
@@ -46,7 +46,7 @@
     return nullptr;
   }
 
-  return tex;
+  return tex.forget();
 }
 
 bool
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/basic/TextureHostBasic.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/basic/TextureHostBasic.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/basic/TextureHostBasic.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/basic/TextureHostBasic.cpp	2015-05-25 20:42:33.000000000 +0000
@@ -23,8 +23,7 @@
   if (aDesc.type() == SurfaceDescriptor::TSurfaceDescriptorMacIOSurface) {
     const SurfaceDescriptorMacIOSurface& desc =
       aDesc.get_SurfaceDescriptorMacIOSurface();
-    RefPtr<TextureHost> result = new MacIOSurfaceTextureHostBasic(aFlags, desc);
-    return result;
+    return MakeAndAddRef<MacIOSurfaceTextureHostBasic>(aFlags, desc);
   }
 #endif
   return CreateBackendIndependentTextureHost(aDesc, aDeallocator, aFlags);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/client/CanvasClient.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/client/CanvasClient.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/client/CanvasClient.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/client/CanvasClient.cpp	2015-05-25 20:42:33.000000000 +0000
@@ -40,16 +40,18 @@
 #ifndef MOZ_WIDGET_GONK
   if (XRE_GetProcessType() != GeckoProcessType_Default) {
     NS_WARNING("Most platforms still need an optimized way to share GL cross process.");
-    return new CanvasClient2D(aForwarder, aFlags);
+    return MakeAndAddRef<CanvasClient2D>(aForwarder, aFlags);
   }
 #endif
 
   switch (aType) {
   case CanvasClientTypeShSurf:
-    return new CanvasClientSharedSurface(aForwarder, aFlags);
+    return MakeAndAddRef<CanvasClientSharedSurface>(aForwarder, aFlags);
+    break;
 
   default:
-    return new CanvasClient2D(aForwarder, aFlags);
+    return MakeAndAddRef<CanvasClient2D>(aForwarder, aFlags);
+    break;
   }
 }
 
@@ -167,7 +169,7 @@
 #endif
 
     default:
-      return new SharedSurfaceTextureClient(aAllocator, flags, surf);
+      return MakeAndAddRef<SharedSurfaceTextureClient>(aAllocator, flags, surf);
   }
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/client/ContentClient.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/client/ContentClient.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/client/ContentClient.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/client/ContentClient.cpp	2015-05-25 20:42:33.000000000 +0000
@@ -91,9 +91,9 @@
   }
 
   if (useDoubleBuffering || PR_GetEnv("MOZ_FORCE_DOUBLE_BUFFERING")) {
-    return new ContentClientDoubleBuffered(aForwarder);
+    return MakeAndAddRef<ContentClientDoubleBuffered>(aForwarder);
   }
-  return new ContentClientSingleBuffered(aForwarder);
+  return MakeAndAddRef<ContentClientSingleBuffered>(aForwarder);
 }
 
 void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/client/ImageClient.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/client/ImageClient.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/client/ImageClient.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/client/ImageClient.cpp	2015-05-25 20:42:33.000000000 +0000
@@ -120,8 +120,7 @@
 TemporaryRef<AsyncTransactionTracker>
 ImageClientSingle::PrepareFlushAllImages()
 {
-  RefPtr<AsyncTransactionTracker> status = new RemoveTextureFromCompositableTracker();
-  return status;
+  return MakeAndAddRef<RemoveTextureFromCompositableTracker>();
 }
 
 void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/client/TextureClient.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/client/TextureClient.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/client/TextureClient.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/client/TextureClient.cpp	2015-05-25 20:42:33.000000000 +0000
@@ -364,9 +364,12 @@
   if (!texture && aFormat == SurfaceFormat::B8G8R8X8 &&
       aAllocator->IsSameProcess() &&
       aMoz2DBackend == gfx::BackendType::CAIRO) {
-    texture = new DIBTextureClient(aAllocator, aFormat, aTextureFlags);
+    if (aAllocator->IsSameProcess()) {
+      texture = new TextureClientMemoryDIB(aAllocator, aFormat, aTextureFlags);
+    } else {
+      texture = new TextureClientShmemDIB(aAllocator, aFormat, aTextureFlags);
+    }
   }
-
 #endif
 
 #ifdef MOZ_X11
@@ -405,7 +408,7 @@
   MOZ_ASSERT(!texture || texture->CanExposeDrawTarget(), "texture cannot expose a DrawTarget?");
 
   if (texture && texture->AllocateForSurface(aSize, aAllocFlags)) {
-    return texture;
+    return texture.forget();
   }
 
   if (aAllocFlags & ALLOC_DISALLOW_BUFFERTEXTURECLIENT) {
@@ -423,7 +426,7 @@
     return nullptr;
   }
 
-  return texture;
+  return texture.forget();
 }
 
 // static
@@ -443,7 +446,7 @@
       return nullptr;
     }
   }
-  return texture;
+  return texture.forget();
 }
 
 // static
@@ -469,7 +472,7 @@
     return nullptr;
   }
 
-  return texture;
+  return texture.forget();
 }
 
 // static
@@ -494,7 +497,7 @@
     return nullptr;
   }
 
-  return texture;
+  return texture.forget();
 }
 
 TextureClient::TextureClient(ISurfaceAllocator* aAllocator, TextureFlags aFlags)
@@ -759,8 +762,7 @@
     mAllocator, mFormat, mSize, mBackend, mFlags | aFlags, aAllocFlags
   );
 
-  RefPtr<TextureClient> newTex = newBufferTex.get();
-  return newTex;
+  return newBufferTex.forget();
 }
 
 bool
@@ -947,8 +949,7 @@
   }
 
 #ifdef XP_WIN
-  RefPtr<SyncObject> syncObject = new SyncObjectD3D11(aHandle);
-  return syncObject;
+  return MakeAndAddRef<SyncObjectD3D11>(aHandle);
 #else
   MOZ_ASSERT_UNREACHABLE();
   return nullptr;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/client/TextureClient.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/client/TextureClient.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/client/TextureClient.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/client/TextureClient.h	2015-05-25 20:42:33.000000000 +0000
@@ -288,7 +288,7 @@
     RefPtr<gfx::SourceSurface> surf = BorrowDrawTarget()->Snapshot();
     RefPtr<gfx::DataSourceSurface> data = surf->GetDataSurface();
     Unlock();
-    return data;
+    return data.forget();
   }
 
   virtual void PrintInfo(std::stringstream& aStream, const char* aPrefix);
@@ -428,17 +428,19 @@
    */
   void ForceRemove(bool sync = false);
 
-  virtual void SetReleaseFenceHandle(FenceHandle aReleaseFenceHandle)
+  virtual void SetReleaseFenceHandle(const FenceHandle& aReleaseFenceHandle)
   {
     mReleaseFenceHandle.Merge(aReleaseFenceHandle);
   }
 
-  const FenceHandle& GetReleaseFenceHandle() const
+  FenceHandle GetAndResetReleaseFenceHandle()
   {
-    return mReleaseFenceHandle;
+    FenceHandle fence;
+    mReleaseFenceHandle.TransferToAnotherFenceHandle(fence);
+    return fence;
   }
 
-  virtual void SetAcquireFenceHandle(FenceHandle aAcquireFenceHandle)
+  virtual void SetAcquireFenceHandle(const FenceHandle& aAcquireFenceHandle)
   {
     mAcquireFenceHandle = aAcquireFenceHandle;
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/client/TextureClientPool.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/client/TextureClientPool.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/client/TextureClientPool.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/client/TextureClientPool.cpp	2015-05-25 20:42:33.000000000 +0000
@@ -96,7 +96,7 @@
 #endif
     TCP_LOG("TexturePool %p giving %p from pool; size %u outstanding %u\n",
         this, textureClient.get(), mTextureClients.size(), mOutstandingClients);
-    return textureClient;
+    return textureClient.forget();
   }
 
   // We're increasing the number of outstanding TextureClients without reusing a
@@ -122,7 +122,7 @@
 #endif
   TCP_LOG("TexturePool %p giving new %p; size %u outstanding %u\n",
       this, textureClient.get(), mTextureClients.size(), mOutstandingClients);
-  return textureClient;
+  return textureClient.forget();
 }
 
 void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/client/TextureClientRecycleAllocator.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/client/TextureClientRecycleAllocator.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/client/TextureClientRecycleAllocator.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/client/TextureClientRecycleAllocator.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -198,7 +198,8 @@
     mInUseClients[textureHolder->GetTextureClient()] = textureHolder;
   }
   textureHolder->GetTextureClient()->SetRecycleCallback(TextureClientRecycleAllocatorImp::RecycleCallback, this);
-  return textureHolder->GetTextureClient();
+  RefPtr<TextureClient> client(textureHolder->GetTextureClient());
+  return client.forget();
 }
 
 void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/client/TiledContentClient.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/client/TiledContentClient.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/client/TiledContentClient.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/client/TiledContentClient.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -598,12 +598,12 @@
                 const gfx::IntRect& aRectToCopy)
 {
   if (!aFront->Lock(OpenMode::OPEN_READ)) {
-    NS_WARNING("Failed to lock the tile's front buffer");
+    gfxCriticalError() << "[Tiling:Client] Failed to lock the tile's front buffer";
     return false;
   }
 
   if (!aBack->Lock(OpenMode::OPEN_READ_WRITE)) {
-    NS_WARNING("Failed to lock the tile's back buffer");
+    gfxCriticalError() << "[Tiling:Client] Failed to lock the tile's back buffer";
     return false;
   }
 
@@ -1141,7 +1141,7 @@
   mPaintedRegion.Or(mPaintedRegion, extraPainted);
 
   if (!backBuffer) {
-    NS_WARNING("Failed to allocate a tile TextureClient");
+    gfxCriticalError() << "[Tiling:Client] Failed to allocate a TextureClient";
     aTile.DiscardBackBuffer();
     aTile.DiscardFrontBuffer();
     return TileClient();
@@ -1150,7 +1150,7 @@
   // the back buffer may have been already locked in ValidateBackBufferFromFront
   if (!backBuffer->IsLocked()) {
     if (!backBuffer->Lock(OpenMode::OPEN_READ_WRITE)) {
-      NS_WARNING("Failed to lock a tile TextureClient");
+      gfxCriticalError() << "[Tiling:Client] Failed to lock a tile";
       aTile.DiscardBackBuffer();
       aTile.DiscardFrontBuffer();
       return TileClient();
@@ -1159,7 +1159,7 @@
 
   if (backBufferOnWhite && !backBufferOnWhite->IsLocked()) {
     if (!backBufferOnWhite->Lock(OpenMode::OPEN_READ_WRITE)) {
-      NS_WARNING("Failed to lock tile TextureClient for updating.");
+      gfxCriticalError() << "[Tiling:Client] Failed to lock a tile";
       aTile.DiscardBackBuffer();
       aTile.DiscardFrontBuffer();
       return TileClient();
@@ -1169,13 +1169,13 @@
   if (usingTiledDrawTarget) {
     if (createdTextureClient) {
       if (!mCompositableClient->AddTextureClient(backBuffer)) {
-        NS_WARNING("Failed to add tile TextureClient.");
+        gfxCriticalError() << "[Tiling:Client] Failed to connect a TextureClient (a)";
         aTile.DiscardFrontBuffer();
         aTile.DiscardBackBuffer();
         return aTile;
       }
       if (backBufferOnWhite && !mCompositableClient->AddTextureClient(backBufferOnWhite)) {
-        NS_WARNING("Failed to add tile TextureClient.");
+        gfxCriticalError() << "[Tiling:Client] Failed to connect a TextureClient (b)";
         aTile.DiscardFrontBuffer();
         aTile.DiscardBackBuffer();
         return aTile;
@@ -1312,7 +1312,7 @@
 
   if (createdTextureClient) {
     if (!mCompositableClient->AddTextureClient(backBuffer)) {
-      NS_WARNING("Failed to add tile TextureClient.");
+      gfxCriticalError() << "[Tiling:Client] Failed to connect a TextureClient (c)";
       aTile.DiscardFrontBuffer();
       aTile.DiscardBackBuffer();
       return aTile;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/client/TiledContentClient.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/client/TiledContentClient.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/client/TiledContentClient.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/client/TiledContentClient.h	2015-05-25 20:42:34.000000000 +0000
@@ -404,6 +404,8 @@
     : mPaintedLayer(nullptr)
     , mCompositableClient(nullptr)
     , mManager(nullptr)
+    , mCallback(nullptr)
+    , mCallbackData(nullptr)
     , mLastPaintContentType(gfxContentType::COLOR)
     , mLastPaintSurfaceMode(SurfaceMode::SURFACE_OPAQUE)
     , mSharedFrameMetricsHelper(nullptr)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/composite/AsyncCompositionManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/composite/AsyncCompositionManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/composite/AsyncCompositionManager.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/composite/AsyncCompositionManager.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -477,19 +477,19 @@
       dom::KeyframeEffectReadOnly::GetComputedTimingAt(
         Nullable<TimeDuration>(elapsedDuration), timing);
 
-    MOZ_ASSERT(0.0 <= computedTiming.mTimeFraction &&
-               computedTiming.mTimeFraction <= 1.0,
-               "time fraction should be in [0-1]");
+    MOZ_ASSERT(0.0 <= computedTiming.mProgress &&
+               computedTiming.mProgress <= 1.0,
+               "iteration progress should be in [0-1]");
 
     int segmentIndex = 0;
     AnimationSegment* segment = animation.segments().Elements();
-    while (segment->endPortion() < computedTiming.mTimeFraction) {
+    while (segment->endPortion() < computedTiming.mProgress) {
       ++segment;
       ++segmentIndex;
     }
 
     double positionInSegment =
-      (computedTiming.mTimeFraction - segment->startPortion()) /
+      (computedTiming.mProgress - segment->startPortion()) /
       (segment->endPortion() - segment->startPortion());
 
     double portion =
@@ -730,17 +730,17 @@
     // fraction of the whole srollable rect that is in view.
     const float yScale = 1.f / asyncZoomY;
 
-    // Note: |metrics.GetZoom()| doesn't yet include the async zoom, so
-    // |metrics.CalculateCompositedSizeInCssPixels()| would not give a correct
-    // result.
+    // Note: |metrics.GetZoom()| doesn't yet include the async zoom.
     const CSSToParentLayerScale effectiveZoom(metrics.GetZoom().yScale * asyncZoomY);
 
-    const LayoutDeviceToParentLayerScale nonLayoutScale = effectiveZoom /
-        metrics.GetDevPixelsPerCSSPixel();
     // Here we convert the scrollbar thumb ratio into a true unitless ratio by
     // dividing out the conversion factor from the scrollframe's parent's space
     // to the scrollframe's space.
-    const float ratio = aScrollbar->GetScrollbarThumbRatio() / nonLayoutScale.scale;
+    const float ratio = aScrollbar->GetScrollbarThumbRatio() /
+        (metrics.GetPresShellResolution() * asyncZoomY);
+    // The scroll thumb needs to be translated in opposite direction of the
+    // async scroll. This is because scrolling down, which translates the layer
+    // content up, should result in moving the scroll thumb down.
     ParentLayerCoord yTranslation = -asyncScrollY * ratio;
 
     // The scroll thumb additionally needs to be translated to compensate for
@@ -760,14 +760,13 @@
     const ParentLayerCoord thumbOriginDeltaPL = thumbOriginDelta * effectiveZoom;
     yTranslation -= thumbOriginDeltaPL;
 
-    if (aScrollbarIsDescendant) {
-      // In cases where the scrollbar is a descendant of the content, the
-      // scrollbar gets painted at the same resolution as the content. Since the
-      // coordinate space we apply this transform in includes the resolution, we
-      // need to adjust for it as well here. Note that in another
-      // aScrollbarIsDescendant hunk below we apply a resolution-cancelling
-      // transform which ensures the scroll thumb isn't actually rendered
-      // at a larger scale.
+    if (metrics.IsRootScrollable()) {
+      // Scrollbar for the root are painted at the same resolution as the
+      // content. Since the coordinate space we apply this transform in includes
+      // the resolution, we need to adjust for it as well here. Note that in
+      // another metrics.IsRootScrollable() hunk below we apply a
+      // resolution-cancelling transform which ensures the scroll thumb isn't
+      // actually rendered at a larger scale.
       yTranslation *= metrics.GetPresShellResolution();
     }
 
@@ -784,9 +783,8 @@
 
     const CSSToParentLayerScale effectiveZoom(metrics.GetZoom().xScale * asyncZoomX);
 
-    const LayoutDeviceToParentLayerScale nonLayoutScale = effectiveZoom /
-        metrics.GetDevPixelsPerCSSPixel();
-    const float ratio = aScrollbar->GetScrollbarThumbRatio() / nonLayoutScale.scale;
+    const float ratio = aScrollbar->GetScrollbarThumbRatio() /
+        (metrics.GetPresShellResolution() * asyncZoomX);
     ParentLayerCoord xTranslation = -asyncScrollX * ratio;
 
     const CSSCoord thumbOrigin = (metrics.GetScrollOffset().x * ratio);
@@ -795,7 +793,7 @@
     const ParentLayerCoord thumbOriginDeltaPL = thumbOriginDelta * effectiveZoom;
     xTranslation -= thumbOriginDeltaPL;
 
-    if (aScrollbarIsDescendant) {
+    if (metrics.IsRootScrollable()) {
       xTranslation *= metrics.GetPresShellResolution();
     }
 
@@ -805,48 +803,49 @@
 
   Matrix4x4 transform = aScrollbar->GetLocalTransform() * scrollbarTransform;
 
-  if (aScrollbarIsDescendant) {
-    // If the scrollbar layer is a child of the content it is a scrollbar for,
-    // then we need to make a couple of adjustments to the scrollbar's transform.
-    //
-    //  - First, the content's resolution applies to the scrollbar as well.
-    //    Since we don't actually want the scroll thumb's size to vary with
-    //    the zoom (other than its length reflecting the fraction of the
-    //    scrollable length that's in view, which is taken care of above),
-    //    we apply a transform to cancel out this resolution.
-    //
-    //  - Second, if there is any async transform (including an overscroll
-    //    transform) on the content, this needs to be cancelled out because
-    //    layout positions and sizes the scrollbar on the assumption that there
-    //    is no async transform, and without this adjustment the scrollbar will
-    //    end up in the wrong place.
-    //
-    //    Note that since the async transform is applied on top of the content's
-    //    regular transform, we need to make sure to unapply the async transform
-    //    in the same coordinate space. This requires applying the content
-    //    transform and then unapplying it after unapplying the async transform.
-    Matrix4x4 resolutionCancellingTransform =
+  Matrix4x4 compensation;
+  // If the scrollbar layer is for the root then the content's resolution
+  // applies to the scrollbar as well. Since we don't actually want the scroll
+  // thumb's size to vary with the zoom (other than its length reflecting the
+  // fraction of the scrollable length that's in view, which is taken care of
+  // above), we apply a transform to cancel out this resolution.
+  if (metrics.IsRootScrollable()) {
+    compensation =
         Matrix4x4::Scaling(metrics.GetPresShellResolution(),
                            metrics.GetPresShellResolution(),
                            1.0f).Inverse();
+  }
+  // If the scrollbar layer is a child of the content it is a scrollbar for,
+  // then we need to adjust for any async transform (including an overscroll
+  // transform) on the content. This needs to be cancelled out because layout
+  // positions and sizes the scrollbar on the assumption that there is no async
+  // transform, and without this adjustment the scrollbar will end up in the
+  // wrong place.
+  //
+  // Note that since the async transform is applied on top of the content's
+  // regular transform, we need to make sure to unapply the async transform in
+  // the same coordinate space. This requires applying the content transform
+  // and then unapplying it after unapplying the async transform.
+  if (aScrollbarIsDescendant) {
     Matrix4x4 asyncUntransform = (asyncTransform * apzc->GetOverscrollTransform()).Inverse();
     Matrix4x4 contentTransform = aContent.GetTransform();
     Matrix4x4 contentUntransform = contentTransform.Inverse();
 
-    Matrix4x4 compensation = resolutionCancellingTransform
-                           * contentTransform
-                           * asyncUntransform
-                           * contentUntransform;
-    transform = transform * compensation;
+    Matrix4x4 asyncCompensation = contentTransform
+                                * asyncUntransform
+                                * contentUntransform;
+
+    compensation = compensation * asyncCompensation;
 
     // We also need to make a corresponding change on the clip rect of all the
     // layers on the ancestor chain from the scrollbar layer up to but not
     // including the layer with the async transform. Otherwise the scrollbar
     // shifts but gets clipped and so appears to flicker.
     for (Layer* ancestor = aScrollbar; ancestor != aContent.GetLayer(); ancestor = ancestor->GetParent()) {
-      TransformClipRect(ancestor, compensation);
+      TransformClipRect(ancestor, asyncCompensation);
     }
   }
+  transform = transform * compensation;
 
   SetShadowTransform(aScrollbar, transform);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/composite/CompositableHost.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/composite/CompositableHost.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/composite/CompositableHost.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/composite/CompositableHost.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -206,7 +206,7 @@
   default:
     NS_ERROR("Unknown CompositableType");
   }
-  return result;
+  return result.forget();
 }
 
 void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/composite/FPSCounter.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/composite/FPSCounter.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/composite/FPSCounter.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/composite/FPSCounter.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -29,6 +29,7 @@
 
 FPSCounter::FPSCounter(const char* aName)
   : mWriteIndex(0)
+  , mIteratorIndex(-1)
   , mFPSName(aName)
 {
   Init();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/composite/LayerManagerComposite.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/composite/LayerManagerComposite.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/composite/LayerManagerComposite.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/composite/LayerManagerComposite.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -417,7 +417,7 @@
     // Draw a translation delay warning overlay
     int width;
     int border;
-    if ((now - mWarnTime).ToMilliseconds() < kVisualWarningDuration) {
+    if (!mWarnTime.IsNull() && (now - mWarnTime).ToMilliseconds() < kVisualWarningDuration) {
       EffectChain effects;
 
       // Black blorder
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/composite/TextRenderer.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/composite/TextRenderer.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/composite/TextRenderer.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/composite/TextRenderer.h	2015-05-25 20:42:34.000000000 +0000
@@ -23,7 +23,7 @@
   NS_INLINE_DECL_REFCOUNTING(TextRenderer)
 
   explicit TextRenderer(Compositor *aCompositor)
-    : mCompositor(aCompositor)
+    : mCompositor(aCompositor), mMap({nullptr, 0})
   {
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/composite/TextureHost.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/composite/TextureHost.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/composite/TextureHost.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/composite/TextureHost.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -180,6 +180,7 @@
     case SurfaceDescriptor::TSurfaceDescriptorShmem:
     case SurfaceDescriptor::TSurfaceDescriptorMemory:
     case SurfaceDescriptor::TSurfaceDescriptorDIB:
+    case SurfaceDescriptor::TSurfaceDescriptorFileMapping:
       return CreateBackendIndependentTextureHost(aDesc, aDeallocator, aFlags);
 
     case SurfaceDescriptor::TEGLImageDescriptor:
@@ -188,7 +189,7 @@
       return CreateTextureHostOGL(aDesc, aDeallocator, aFlags);
 
     case SurfaceDescriptor::TSharedSurfaceDescriptor:
-      return new SharedSurfaceTextureHost(aFlags, aDesc.get_SharedSurfaceDescriptor());
+      return MakeAndAddRef<SharedSurfaceTextureHost>(aFlags, aDesc.get_SharedSurfaceDescriptor());
 
     case SurfaceDescriptor::TSurfaceDescriptorMacIOSurface:
       if (Compositor::GetBackend() == LayersBackend::LAYERS_OPENGL) {
@@ -200,8 +201,7 @@
 #ifdef MOZ_X11
     case SurfaceDescriptor::TSurfaceDescriptorX11: {
       const SurfaceDescriptorX11& desc = aDesc.get_SurfaceDescriptorX11();
-      RefPtr<TextureHost> result = new X11TextureHost(aFlags, desc);
-      return result;
+      return MakeAndAddRef<X11TextureHost>(aFlags, desc);
     }
 #endif
 
@@ -249,12 +249,16 @@
       result = new DIBTextureHost(aFlags, aDesc);
       break;
     }
+    case SurfaceDescriptor::TSurfaceDescriptorFileMapping: {
+      result = new TextureHostFileMapping(aFlags, aDesc);
+      break;
+    }
 #endif
     default: {
       NS_WARNING("No backend independent TextureHost for this descriptor type");
     }
   }
-  return result;
+  return result.forget();
 }
 
 void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/d3d11/CompositorD3D11.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/d3d11/CompositorD3D11.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/d3d11/CompositorD3D11.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/d3d11/CompositorD3D11.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -465,7 +465,7 @@
     mContext->ClearRenderTargetView(rt->mRTView, clear);
   }
 
-  return rt;
+  return rt.forget();
 }
 
 TemporaryRef<CompositingRenderTarget>
@@ -524,7 +524,7 @@
     new CompositingRenderTargetD3D11(texture, aRect.TopLeft());
   rt->SetSize(aRect.Size());
 
-  return rt;
+  return rt.forget();
 }
 
 void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/d3d11/TextureD3D11.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/d3d11/TextureD3D11.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/d3d11/TextureD3D11.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/d3d11/TextureD3D11.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -167,7 +167,7 @@
       NS_WARNING("Unsupported SurfaceDescriptor type");
     }
   }
-  return result;
+  return result.forget();
 }
 
 TextureClientD3D11::TextureClientD3D11(ISurfaceAllocator* aAllocator,
@@ -225,7 +225,7 @@
                                                              aFlags);
   texture->mTexture = aTexture;
   texture->mSize = aSize;
-  return texture;
+  return texture.forget();
 }
 
 TemporaryRef<TextureClient>
@@ -239,7 +239,7 @@
     return nullptr;
   }
 
-  return tex;
+  return tex.forget();
 }
 
 void
@@ -575,7 +575,7 @@
   texture->mSize = aSize;
   texture->mSizeY = aSizeY;
   texture->mSizeCbCr = aSizeCbCr;
-  return texture;
+  return texture.forget();
 }
 
 bool
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/d3d9/CompositorD3D9.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/d3d9/CompositorD3D9.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/d3d9/CompositorD3D9.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/d3d9/CompositorD3D9.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -97,7 +97,7 @@
 TemporaryRef<DataTextureSource>
 CompositorD3D9::CreateDataTextureSource(TextureFlags aFlags)
 {
-  return new DataTextureSourceD3D9(SurfaceFormat::UNKNOWN, this, aFlags);
+  return MakeAndAddRef<DataTextureSourceD3D9>(SurfaceFormat::UNKNOWN, this, aFlags);
 }
 
 TemporaryRef<CompositingRenderTarget>
@@ -125,10 +125,7 @@
     return nullptr;
   }
 
-  RefPtr<CompositingRenderTargetD3D9> rt =
-    new CompositingRenderTargetD3D9(texture, aInit, aRect);
-
-  return rt;
+  return MakeAndAddRef<CompositingRenderTargetD3D9>(texture, aInit, aRect);
 }
 
 TemporaryRef<CompositingRenderTarget>
@@ -192,12 +189,9 @@
     }
   }
 
-  RefPtr<CompositingRenderTargetD3D9> rt =
-    new CompositingRenderTargetD3D9(texture,
-                                    INIT_MODE_NONE,
-                                    aRect);
-
-  return rt;
+  return MakeAndAddRef<CompositingRenderTargetD3D9>(texture,
+                                                    INIT_MODE_NONE,
+                                                    aRect);
 }
 
 void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/d3d9/DeviceManagerD3D9.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/d3d9/DeviceManagerD3D9.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/d3d9/DeviceManagerD3D9.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/d3d9/DeviceManagerD3D9.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -844,7 +844,7 @@
     RegisterTextureHost(aTextureHost);
   }
 
-  return result;
+  return result.forget();
 }
 
 #ifdef DEBUG
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/d3d9/TextureD3D9.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/d3d9/TextureD3D9.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/d3d9/TextureD3D9.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/d3d9/TextureD3D9.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -198,7 +198,7 @@
     return nullptr;
   }
 
-  return result;
+  return result.forget();
 }
 
 /**
@@ -246,7 +246,7 @@
 
   FinishTextures(aDeviceManager, texture, surface);
 
-  return texture;
+  return texture.forget();
 }
 
 TemporaryRef<IDirect3DTexture9>
@@ -270,7 +270,7 @@
     return nullptr;
   }
 
-  return texture;
+  return texture.forget();
 }
 
 TemporaryRef<IDirect3DTexture9>
@@ -311,7 +311,7 @@
 
   FinishTextures(aDeviceManager, texture, surface);
 
-  return texture;
+  return texture.forget();
 }
 
 DataTextureSourceD3D9::DataTextureSourceD3D9(gfx::SurfaceFormat aFormat,
@@ -585,7 +585,7 @@
     return nullptr;
   }
 
-  return tex;
+  return tex.forget();
 }
 
 bool
@@ -782,7 +782,7 @@
   if (texture->mTexture) {
     gfxWindowsPlatform::sD3D9SharedTextureUsed += texture->mDesc.Width * texture->mDesc.Height * 4;
   }
-  return texture;
+  return texture.forget();
 }
 
 bool
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/D3D9SurfaceImage.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/D3D9SurfaceImage.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/D3D9SurfaceImage.cpp	2015-05-13 18:06:31.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/D3D9SurfaceImage.cpp	2015-05-25 20:44:22.000000000 +0000
@@ -269,7 +269,7 @@
   systemMemorySurface->UnlockRect();
   surface->Unmap();
 
-  return surface;
+  return surface.forget();
 }
 
 } /* layers */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/Effects.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/Effects.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/Effects.h	2015-05-13 18:06:31.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/Effects.h	2015-05-25 20:44:22.000000000 +0000
@@ -268,7 +268,7 @@
     break;
   }
 
-  return result;
+  return result.forget();
 }
 
 /**
@@ -287,7 +287,7 @@
   if (aSourceOnWhite) {
     MOZ_ASSERT(aSource->GetFormat() == gfx::SurfaceFormat::R8G8B8X8 ||
                aSourceOnWhite->GetFormat() == gfx::SurfaceFormat::B8G8R8X8);
-    return new EffectComponentAlpha(aSource, aSourceOnWhite, aFilter);
+    return MakeAndAddRef<EffectComponentAlpha>(aSource, aSourceOnWhite, aFilter);
   }
 
   return CreateTexturedEffect(aSource->GetFormat(),
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/GrallocImages.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/GrallocImages.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/GrallocImages.cpp	2015-05-13 18:06:31.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/GrallocImages.cpp	2015-05-25 20:44:22.000000000 +0000
@@ -407,7 +407,7 @@
   rv = ConvertOmxYUVFormatToRGB565(graphicBuffer, surface, &mappedSurface, mData);
   if (rv == OK) {
     surface->Unmap();
-    return surface;
+    return surface.forget();
   }
 
   rv = ConvertVendorYUVFormatToRGB565(graphicBuffer, surface, &mappedSurface);
@@ -417,7 +417,7 @@
     return nullptr;
   }
 
-  return surface;
+  return surface.forget();
 }
 
 android::sp<android::GraphicBuffer>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ImageContainer.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ImageContainer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ImageContainer.cpp	2015-05-13 18:06:31.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ImageContainer.cpp	2015-05-25 20:44:22.000000000 +0000
@@ -458,7 +458,8 @@
 PlanarYCbCrImage::GetAsSourceSurface()
 {
   if (mSourceSurface) {
-    return mSourceSurface.get();
+    RefPtr<gfx::SourceSurface> surface(mSourceSurface);
+    return surface.forget();
   }
 
   gfx::IntSize size(mSize);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ImageContainer.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ImageContainer.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ImageContainer.h	2015-05-13 18:06:31.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ImageContainer.h	2015-05-25 20:44:22.000000000 +0000
@@ -804,7 +804,8 @@
 
   virtual TemporaryRef<gfx::SourceSurface> GetAsSourceSurface() override
   {
-    return mSourceSurface.get();
+    RefPtr<gfx::SourceSurface> surface(mSourceSurface);
+    return surface.forget();
   }
 
   virtual TextureClient* GetTextureClient(CompositableClient* aClient) override;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/IMFYCbCrImage.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/IMFYCbCrImage.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/IMFYCbCrImage.cpp	2015-05-13 18:06:31.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/IMFYCbCrImage.cpp	2015-05-25 20:44:22.000000000 +0000
@@ -95,7 +95,7 @@
     return nullptr;
   }
 
-  return result;
+  return result.forget();
 }
 
 static void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/CompositableTransactionParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/CompositableTransactionParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/CompositableTransactionParent.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/CompositableTransactionParent.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -179,12 +179,10 @@
       if (maybeFence.type() == MaybeFence::TFenceHandle) {
         FenceHandle fence = maybeFence.get_FenceHandle();
         if (fence.IsValid() && tex) {
-#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
           TextureHostOGL* hostOGL = tex->AsHostOGL();
           if (hostOGL) {
-            hostOGL->SetAcquireFence(fence.mFence);
+            hostOGL->SetAcquireFence(fence);
           }
-#endif
         }
       }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/CompositorBench.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/CompositorBench.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/CompositorBench.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/CompositorBench.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -135,10 +135,10 @@
       red = modf(i * 0.03f, &tmp);
       EffectChain effects;
       gfxRGBA color(red, 0.4f, 0.4f, 1.0f);
-      return new EffectSolidColor(gfx::Color(color.r,
-                                             color.g,
-                                             color.b,
-                                             color.a));
+      return MakeAndAddRef<EffectSolidColor>(gfx::Color(color.r,
+                                                        color.g,
+                                                        color.b,
+                                                        color.a));
   }
 };
 
@@ -161,10 +161,10 @@
       red = modf(i * 0.03f, &tmp);
       EffectChain effects;
       gfxRGBA color(red, 0.4f, 0.4f, 1.0f);
-      return new EffectSolidColor(gfx::Color(color.r,
-                                             color.g,
-                                             color.b,
-                                             color.a));
+      return MakeAndAddRef<EffectSolidColor>(gfx::Color(color.r,
+                                                        color.g,
+                                                        color.b,
+                                                        color.a));
   }
 };
 
@@ -241,8 +241,7 @@
   }
 
   TemporaryRef<Effect> CreateEffect(size_t i) {
-    RefPtr<TexturedEffect> effect = CreateTexturedEffect(SurfaceFormat::B8G8R8A8, mTexture, Filter::POINT, true);
-    return effect;
+    return CreateTexturedEffect(SurfaceFormat::B8G8R8A8, mTexture, Filter::POINT, true);
   }
 };
 
@@ -285,8 +284,7 @@
   }
 
   virtual TemporaryRef<Effect> CreateEffect(size_t i) {
-    RefPtr<TexturedEffect> effect = CreateTexturedEffect(SurfaceFormat::B8G8R8A8, mTexture, Filter::POINT, true);
-    return effect;
+    return CreateTexturedEffect(SurfaceFormat::B8G8R8A8, mTexture, Filter::POINT, true);
   }
 };
 
@@ -328,8 +326,7 @@
   }
 
   virtual TemporaryRef<Effect> CreateEffect(size_t i) {
-    RefPtr<TexturedEffect> effect = CreateTexturedEffect(SurfaceFormat::B8G8R8A8, mTexture, Filter::POINT);
-    return effect;
+    return CreateTexturedEffect(SurfaceFormat::B8G8R8A8, mTexture, Filter::POINT);
   }
 };
 
@@ -370,8 +367,7 @@
   }
 
   virtual TemporaryRef<Effect> CreateEffect(size_t i) {
-    RefPtr<TexturedEffect> effect = CreateTexturedEffect(SurfaceFormat::B8G8R8A8, mTexture, Filter::POINT);
-    return effect;
+    return CreateTexturedEffect(SurfaceFormat::B8G8R8A8, mTexture, Filter::POINT);
   }
 };
 #endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/CompositorChild.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/CompositorChild.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/CompositorChild.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/CompositorChild.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -372,6 +372,16 @@
   mOverfillObservers.AppendElement(aLayerManager);
 }
 
+bool
+CompositorChild::RecvClearCachedResources(const uint64_t& aId)
+{
+  dom::TabChild* child = dom::TabChild::GetFrom(aId);
+  if (child) {
+    child->ClearCachedResources();
+  }
+  return true;
+}
+
 void
 CompositorChild::ActorDestroy(ActorDestroyReason aWhy)
 {
@@ -550,6 +560,26 @@
 }
 
 bool
+CompositorChild::SendNotifyHidden(const uint64_t& id)
+{
+  MOZ_ASSERT(mCanSend);
+  if (!mCanSend) {
+    return true;
+  }
+  return PCompositorChild::SendNotifyHidden(id);
+}
+
+bool
+CompositorChild::SendNotifyVisible(const uint64_t& id)
+{
+  MOZ_ASSERT(mCanSend);
+  if (!mCanSend) {
+    return true;
+  }
+  return PCompositorChild::SendNotifyVisible(id);
+}
+
+bool
 CompositorChild::SendNotifyChildCreated(const uint64_t& id)
 {
   MOZ_ASSERT(mCanSend);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/CompositorChild.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/CompositorChild.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/CompositorChild.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/CompositorChild.h	2015-05-25 20:42:34.000000000 +0000
@@ -71,6 +71,9 @@
   void AddOverfillObserver(ClientLayerManager* aLayerManager);
 
   virtual bool
+  RecvClearCachedResources(const uint64_t& id) override;
+
+  virtual bool
   RecvDidComposite(const uint64_t& aId, const uint64_t& aTransactionId) override;
 
   virtual bool
@@ -106,6 +109,8 @@
   bool SendWillStop();
   bool SendPause();
   bool SendResume();
+  bool SendNotifyHidden(const uint64_t& id);
+  bool SendNotifyVisible(const uint64_t& id);
   bool SendNotifyChildCreated(const uint64_t& id);
   bool SendAdoptChild(const uint64_t& id);
   bool SendMakeSnapshot(const SurfaceDescriptor& inSnapshot, const gfx::IntRect& dirtyRect);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/CompositorLRU.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/CompositorLRU.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/CompositorLRU.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/CompositorLRU.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -0,0 +1,101 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=8 et :
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "CompositorLRU.h"
+
+#include "mozilla/ClearOnShutdown.h"
+#include "mozilla/DebugOnly.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/unused.h"
+
+#include "CompositorParent.h"
+
+namespace mozilla {
+namespace layers {
+
+mozilla::StaticRefPtr<CompositorLRU> CompositorLRU::sSingleton;
+
+void
+CompositorLRU::Init()
+{
+  unused << GetSingleton();
+}
+
+CompositorLRU*
+CompositorLRU::GetSingleton()
+{
+  if (sSingleton) {
+    return sSingleton;
+  }
+  sSingleton = new CompositorLRU();
+  ClearOnShutdown(&sSingleton);
+
+  return sSingleton;
+}
+
+CompositorLRU::CompositorLRU()
+{
+  mLRUSize = Preferences::GetUint("layers.compositor-lru-size", uint32_t(0));
+}
+
+CompositorLRU::~CompositorLRU()
+{
+}
+
+void
+CompositorLRU::Add(PCompositorParent* aCompositor, const uint64_t& aId)
+{
+  auto index = mLRU.IndexOf(std::make_pair(aCompositor, aId));
+  if (index != nsTArray<CompositorLayerPair>::NoIndex) {
+    return;
+  }
+
+  if (mLRUSize == 0) {
+    unused << aCompositor->SendClearCachedResources(aId);
+    return;
+  }
+
+  if (mLRU.Length() == mLRUSize) {
+    CompositorLayerPair victim = mLRU.LastElement();
+    unused << victim.first->SendClearCachedResources(victim.second);
+    mLRU.RemoveElement(victim);
+  }
+  mLRU.InsertElementAt(0, std::make_pair(aCompositor, aId));
+}
+
+void
+CompositorLRU::Remove(PCompositorParent* aCompositor, const uint64_t& aId)
+{
+  if (mLRUSize == 0) {
+    return;
+  }
+
+  auto index = mLRU.IndexOf(std::make_pair(aCompositor, aId));
+
+  if (index == nsTArray<PCompositorParent*>::NoIndex) {
+    return;
+  }
+
+  mLRU.RemoveElementAt(index);
+}
+
+void
+CompositorLRU::Remove(PCompositorParent* aCompositor)
+{
+  if (mLRUSize == 0) {
+    return;
+  }
+
+  for (int32_t i = mLRU.Length() - 1; i >= 0; --i) {
+    if (mLRU[i].first == aCompositor) {
+      mLRU.RemoveElementAt(i);
+    }
+  }
+}
+
+} // namespace layers
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/CompositorLRU.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/CompositorLRU.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/CompositorLRU.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/CompositorLRU.h	2015-05-25 20:42:34.000000000 +0000
@@ -0,0 +1,61 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=8 et :
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_CompositorLRU_h
+#define mozilla_CompositorLRU_h
+
+#include "mozilla/StaticPtr.h"
+
+#include "nsISupportsImpl.h"
+#include "nsTArray.h"
+
+#include <utility>
+
+namespace mozilla {
+namespace layers {
+
+class PCompositorParent;
+
+class CompositorLRU final
+{
+  typedef std::pair<PCompositorParent*, uint64_t> CompositorLayerPair;
+public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(CompositorLRU)
+
+  static void Init();
+  static CompositorLRU* GetSingleton();
+
+  /**
+   * Adds the (PCompositorParent, LayerId) pair to the LRU pool. If
+   * the pool size grows over mLRUSize, the oldest PCompositorParent
+   * is evicted.
+   */
+  void Add(PCompositorParent* aCompositor, const uint64_t& id);
+
+  /**
+   * Remove the (PCompositorParent, LayersId) pair from the LRU pool.
+   */
+  void Remove(PCompositorParent* aCompositor, const uint64_t& id);
+
+  /**
+   * Remove all PCompositorParents from the LRU pool.
+   */
+  void Remove(PCompositorParent* aCompositor);
+
+private:
+  static StaticRefPtr<CompositorLRU> sSingleton;
+
+  CompositorLRU();
+  ~CompositorLRU();
+  uint32_t mLRUSize;
+  nsTArray<CompositorLayerPair> mLRU;
+};
+
+} // namespace layers
+} // namespace mozilla
+
+#endif // mozilla_CompositorLRU_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/CompositorParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/CompositorParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/CompositorParent.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/CompositorParent.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -34,6 +34,7 @@
 #include "mozilla/layers/AsyncCompositionManager.h"
 #include "mozilla/layers/BasicCompositor.h"  // for BasicCompositor
 #include "mozilla/layers/Compositor.h"  // for Compositor
+#include "mozilla/layers/CompositorLRU.h"  // for CompositorLRU
 #include "mozilla/layers/CompositorOGL.h"  // for CompositorOGL
 #include "mozilla/layers/CompositorTypes.h"
 #include "mozilla/layers/LayerManagerComposite.h"
@@ -1686,6 +1687,8 @@
   virtual bool RecvStop() override { return true; }
   virtual bool RecvPause() override { return true; }
   virtual bool RecvResume() override { return true; }
+  virtual bool RecvNotifyHidden(const uint64_t& id) override;
+  virtual bool RecvNotifyVisible(const uint64_t& id) override;
   virtual bool RecvNotifyChildCreated(const uint64_t& child) override;
   virtual bool RecvAdoptChild(const uint64_t& child) override { return false; }
   virtual bool RecvMakeSnapshot(const SurfaceDescriptor& aInSnapshot,
@@ -1842,6 +1845,22 @@
 }
 
 bool
+CrossProcessCompositorParent::RecvNotifyHidden(const uint64_t& id)
+{
+  nsRefPtr<CompositorLRU> lru = CompositorLRU::GetSingleton();
+  lru->Add(this, id);
+  return true;
+}
+
+bool
+CrossProcessCompositorParent::RecvNotifyVisible(const uint64_t& id)
+{
+  nsRefPtr<CompositorLRU> lru = CompositorLRU::GetSingleton();
+  lru->Remove(this, id);
+  return true;
+}
+
+bool
 CrossProcessCompositorParent::RecvRequestNotifyAfterRemotePaint()
 {
   mNotifyAfterRemotePaint = true;
@@ -1851,6 +1870,9 @@
 void
 CrossProcessCompositorParent::ActorDestroy(ActorDestroyReason aWhy)
 {
+  nsRefPtr<CompositorLRU> lru = CompositorLRU::GetSingleton();
+  lru->Remove(this);
+
   MessageLoop::current()->PostTask(
     FROM_HERE,
     NewRunnableMethod(this, &CrossProcessCompositorParent::DeferredDestroy));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/CompositorParent.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/CompositorParent.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/CompositorParent.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/CompositorParent.h	2015-05-25 20:42:34.000000000 +0000
@@ -234,6 +234,8 @@
   virtual bool RecvStop() override;
   virtual bool RecvPause() override;
   virtual bool RecvResume() override;
+  virtual bool RecvNotifyHidden(const uint64_t& id) override { return true; }
+  virtual bool RecvNotifyVisible(const uint64_t& id) override { return true; }
   virtual bool RecvNotifyChildCreated(const uint64_t& child) override;
   virtual bool RecvAdoptChild(const uint64_t& child) override;
   virtual bool RecvMakeSnapshot(const SurfaceDescriptor& aInSnapshot,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/FenceUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/FenceUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/FenceUtils.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/FenceUtils.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -0,0 +1,111 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=8 et :
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
+#pragma GCC visibility push(default)
+#include "sync/sync.h"       // for sync_merge
+#pragma GCC visibility pop
+#endif
+
+#include "FenceUtils.h"
+
+using namespace mozilla::layers;
+
+namespace IPC {
+
+void
+ParamTraits<FenceHandle>::Write(Message* aMsg,
+                                const paramType& aParam)
+{
+  FenceHandle handle = aParam;
+
+  MOZ_ASSERT(handle.IsValid());
+
+#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
+  nsRefPtr<FenceHandle::FdObj> fence = handle.GetAndResetFdObj();
+  aMsg->WriteFileDescriptor(base::FileDescriptor(fence->GetAndResetFd(), true));
+#endif
+}
+
+bool
+ParamTraits<FenceHandle>::Read(const Message* aMsg,
+                               void** aIter, paramType* aResult)
+{
+#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
+  base::FileDescriptor fd;
+  if (aMsg->ReadFileDescriptor(aIter, &fd)) {
+    aResult->Merge(FenceHandle(new FenceHandle::FdObj(fd.fd)));
+  }
+#endif
+  return true;
+}
+
+} // namespace IPC
+
+namespace mozilla {
+namespace layers {
+
+FenceHandle::FenceHandle()
+  : mFence(new FdObj())
+{
+}
+
+FenceHandle::FenceHandle(FdObj* aFdObj)
+  : mFence(aFdObj)
+{
+  MOZ_ASSERT(aFdObj);
+}
+
+void
+FenceHandle::Merge(const FenceHandle& aFenceHandle)
+{
+#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
+  if (!aFenceHandle.IsValid()) {
+    return;
+  }
+
+  if (!IsValid()) {
+    mFence = aFenceHandle.mFence;
+  } else {
+    int result = sync_merge("FenceHandle", mFence->mFd, aFenceHandle.mFence->mFd);
+    if (result == -1) {
+      mFence = aFenceHandle.mFence;
+    } else {
+      mFence = new FdObj(result);
+    }
+  }
+#endif
+}
+
+void
+FenceHandle::TransferToAnotherFenceHandle(FenceHandle& aFenceHandle)
+{
+  aFenceHandle.mFence = this->GetAndResetFdObj();
+}
+
+already_AddRefed<FenceHandle::FdObj>
+FenceHandle::GetAndResetFdObj()
+{
+  nsRefPtr<FdObj> fence = mFence;
+  mFence = new FdObj();
+  return fence.forget();
+}
+
+already_AddRefed<FenceHandle::FdObj>
+FenceHandle::GetDupFdObj()
+{
+  nsRefPtr<FdObj> fdObj;
+  if (IsValid()) {
+    fdObj = new FenceHandle::FdObj(dup(mFence->mFd));
+  } else {
+    fdObj = new FenceHandle::FdObj();
+  }
+  return fdObj.forget();
+}
+
+} // namespace layers
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/FenceUtilsGonk.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/FenceUtilsGonk.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/FenceUtilsGonk.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/FenceUtilsGonk.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,154 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=8 et :
- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "GLContext.h"
-#include "mozilla/unused.h"
-#include "nsXULAppAPI.h"
-
-#include "FenceUtilsGonk.h"
-
-using namespace android;
-using namespace mozilla::layers;
-
-using base::FileDescriptor;
-
-namespace IPC {
-
-void
-ParamTraits<FenceHandle>::Write(Message* aMsg,
-                                const paramType& aParam)
-{
-#if ANDROID_VERSION >= 19
-  sp<Fence> flattenable = aParam.mFence;
-#else
-  Flattenable *flattenable = aParam.mFence.get();
-#endif
-  size_t nbytes = flattenable->getFlattenedSize();
-  size_t nfds = flattenable->getFdCount();
-  char data[nbytes];
-  int fds[nfds];
-
-#if ANDROID_VERSION >= 19
-  // Make a copy of "data" and "fds" for flatten() to avoid casting problem
-  void *pdata = (void *)data;
-  int *pfds = fds;
-
-  flattenable->flatten(pdata, nbytes, pfds, nfds);
-
-  // In Kitkat, flatten() will change the value of nbytes and nfds, which dues
-  // to multiple parcelable object consumption. The actual size and fd count
-  // which returned by getFlattenedSize() and getFdCount() are not changed.
-  // So we change nbytes and nfds back by call corresponding calls.
-  nbytes = flattenable->getFlattenedSize();
-  nfds = flattenable->getFdCount();
-#else
-  flattenable->flatten(data, nbytes, fds, nfds);
-#endif
-  aMsg->WriteSize(nbytes);
-  aMsg->WriteSize(nfds);
-  aMsg->WriteBytes(data, nbytes);
-  for (size_t n = 0; n < nfds; ++n) {
-    // Dupe the fd to make sure the fence life time and set auto-close
-    // for cross-process. If IPC is cross-thread, the other side will use
-    // the duped fd directly.
-    aMsg->WriteFileDescriptor(FileDescriptor(dup(fds[n]), true));
-  }
-}
-
-bool
-ParamTraits<FenceHandle>::Read(const Message* aMsg,
-                               void** aIter, paramType* aResult)
-{
-  size_t nbytes;
-  size_t nfds;
-  const char* data;
-
-  if (!aMsg->ReadSize(aIter, &nbytes) ||
-      !aMsg->ReadSize(aIter, &nfds) ||
-      !aMsg->ReadBytes(aIter, &data, nbytes)) {
-    return false;
-  }
-
-  // Check if nfds is correct.
-  // aMsg->num_fds() could include fds of another ParamTraits<>s.
-  if (nfds > aMsg->num_fds()) {
-    return false;
-  }
-  int fds[nfds];
-
-  for (size_t n = 0; n < nfds; ++n) {
-    FileDescriptor fd;
-    if (!aMsg->ReadFileDescriptor(aIter, &fd)) {
-      return false;
-    }
-    // If the GraphicBuffer was shared cross-process, SCM_RIGHTS does
-    // the right thing and dup's the fd.  If it's shared cross-thread,
-    // SCM_RIGHTS doesn't dup the fd.  That's surprising, but we just
-    // deal with it here.  NB: only the "default" (master) process can
-    // alloc gralloc buffers.
-    fds[n] = fd.fd;
-  }
-
-  sp<Fence> buffer(new Fence());
-#if ANDROID_VERSION >= 19
-  // Make a copy of "data" and "fds" for unflatten() to avoid casting problem
-  void const *pdata = (void const *)data;
-  int const *pfds = fds;
-
-  if (NO_ERROR == buffer->unflatten(pdata, nbytes, pfds, nfds)) {
-#else
-  Flattenable *flattenable = buffer.get();
-
-  if (NO_ERROR == flattenable->unflatten(data, nbytes, fds, nfds)) {
-#endif
-    aResult->mFence = buffer;
-    return true;
-  }
-  return false;
-}
-
-} // namespace IPC
-
-namespace mozilla {
-namespace layers {
-
-FenceHandle::FenceHandle()
-  : mFence(android::Fence::NO_FENCE)
-{
-}
-
-FenceHandle::FenceHandle(const sp<Fence>& aFence)
-  : mFence(aFence)
-{
-}
-
-void
-FenceHandle::Merge(const FenceHandle& aFenceHandle)
-{
-  if (!aFenceHandle.IsValid()) {
-    return;
-  }
-
-  if (!IsValid()) {
-    mFence = aFenceHandle.mFence;
-  } else {
-    android::sp<android::Fence> mergedFence = android::Fence::merge(
-                  android::String8::format("FenceHandle"),
-                  mFence, aFenceHandle.mFence);
-    if (!mergedFence.get()) {
-      // synchronization is broken, the best we can do is hope fences
-      // signal in order so the new fence will act like a union.
-      // This error handling is same as android::ConsumerBase does.
-      mFence = aFenceHandle.mFence;
-      return;
-    }
-    mFence = mergedFence;
-  }
-}
-
-} // namespace layers
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/FenceUtilsGonk.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/FenceUtilsGonk.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/FenceUtilsGonk.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/FenceUtilsGonk.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=8 et :
- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef mozilla_layers_FenceUtilsGonk_h
-#define mozilla_layers_FenceUtilsGonk_h
-
-#include <unistd.h>
-#include <ui/Fence.h>
-
-#include "ipc/IPCMessageUtils.h"
-
-namespace mozilla {
-namespace layers {
-
-struct FenceHandle {
-  typedef android::Fence Fence;
-
-  FenceHandle();
-
-  explicit FenceHandle(const android::sp<Fence>& aFence);
-
-  bool operator==(const FenceHandle& aOther) const {
-    return mFence.get() == aOther.mFence.get();
-  }
-
-  bool IsValid() const
-  {
-    return mFence.get() && mFence->isValid();
-  }
-
-  void Merge(const FenceHandle& aFenceHandle);
-
-  android::sp<Fence> mFence;
-};
-
-} // namespace layers
-} // namespace mozilla
-
-namespace IPC {
-
-template <>
-struct ParamTraits<mozilla::layers::FenceHandle> {
-  typedef mozilla::layers::FenceHandle paramType;
-
-  static void Write(Message* aMsg, const paramType& aParam);
-  static bool Read(const Message* aMsg, void** aIter, paramType* aResult);
-};
-
-} // namespace IPC
-
-#endif  // mozilla_layers_FenceUtilsGonk_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/FenceUtils.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/FenceUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/FenceUtils.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/FenceUtils.h	2015-05-25 20:42:34.000000000 +0000
@@ -9,56 +9,75 @@
 #define IPC_FencerUtils_h
 
 #include "ipc/IPCMessageUtils.h"
+#include "nsRefPtr.h"             // for nsRefPtr
 
-/**
- * FenceHandle is used for delivering Fence object via ipc.
- */
-#if MOZ_WIDGET_GONK && ANDROID_VERSION >= 17
-# include "mozilla/layers/FenceUtilsGonk.h"
-#else
 namespace mozilla {
 namespace layers {
 
-struct FenceHandleFromChild;
+class FenceHandle {
+public:
+  class FdObj {
+    NS_INLINE_DECL_THREADSAFE_REFCOUNTING(FdObj)
+    friend class FenceHandle;
+  public:
+    FdObj()
+      : mFd(-1) {}
+    explicit FdObj(int aFd)
+      : mFd(aFd) {}
+    int GetAndResetFd()
+    {
+      int fd = mFd;
+      mFd = -1;
+      return fd;
+    }
+
+  private:
+    virtual ~FdObj() {
+      if (mFd != -1) {
+        close(mFd);
+      }
+    }
+
+    int mFd;
+  };
+
+  FenceHandle();
+
+  explicit FenceHandle(FdObj* aFdObj);
+
+  bool operator==(const FenceHandle& aOther) const {
+    return mFence.get() == aOther.mFence.get();
+  }
+
+  bool IsValid() const
+  {
+    return (mFence->mFd != -1);
+  }
+
+  void Merge(const FenceHandle& aFenceHandle);
 
-struct FenceHandle {
-  FenceHandle() {}
-  explicit FenceHandle(const FenceHandleFromChild& aFenceHandle) {}
-  bool operator==(const FenceHandle&) const { return false; }
-  bool IsValid() const { return false; }
-  void Merge(const FenceHandle& aFenceHandle) {}
-};
+  void TransferToAnotherFenceHandle(FenceHandle& aFenceHandle);
+
+  already_AddRefed<FdObj> GetAndResetFdObj();
+
+  already_AddRefed<FdObj> GetDupFdObj();
 
-struct FenceHandleFromChild {
-  FenceHandleFromChild() {}
-  explicit FenceHandleFromChild(const FenceHandle& aFence) {}
-  bool operator==(const FenceHandle&) const { return false; }
-  bool operator==(const FenceHandleFromChild&) const { return false; }
-  bool IsValid() const { return false; }
+private:
+  nsRefPtr<FdObj> mFence;
 };
 
 } // namespace layers
 } // namespace mozilla
-#endif // MOZ_WIDGET_GONK && ANDROID_VERSION >= 17
 
 namespace IPC {
 
-#if MOZ_WIDGET_GONK && ANDROID_VERSION >= 17
-#else
 template <>
 struct ParamTraits<mozilla::layers::FenceHandle> {
   typedef mozilla::layers::FenceHandle paramType;
-  static void Write(Message*, const paramType&) {}
-  static bool Read(const Message*, void**, paramType*) { return false; }
-};
 
-template <>
-struct ParamTraits<mozilla::layers::FenceHandleFromChild> {
-  typedef mozilla::layers::FenceHandleFromChild paramType;
-  static void Write(Message*, const paramType&) {}
-  static bool Read(const Message*, void**, paramType*) { return false; }
+  static void Write(Message* aMsg, const paramType& aParam);
+  static bool Read(const Message* aMsg, void** aIter, paramType* aResult);
 };
-#endif // MOZ_WIDGET_GONK && ANDROID_VERSION >= 17
 
 } // namespace IPC
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/ISurfaceAllocator.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/ISurfaceAllocator.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/ISurfaceAllocator.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/ISurfaceAllocator.h	2015-05-25 20:42:34.000000000 +0000
@@ -158,6 +158,7 @@
 
   virtual bool IPCOpen() const { return true; }
   virtual bool IsSameProcess() const = 0;
+  virtual base::ProcessId ParentPid() const { return base::ProcessId(); }
 
   virtual bool IsImageBridgeChild() const { return false; }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/LayersSurfaces.ipdlh firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/LayersSurfaces.ipdlh
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/LayersSurfaces.ipdlh	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/LayersSurfaces.ipdlh	2015-05-25 20:42:34.000000000 +0000
@@ -38,6 +38,12 @@
   uintptr_t texture;
 };
 
+struct SurfaceDescriptorFileMapping {
+  WindowsHandle handle;
+  SurfaceFormat format;
+  IntSize size;
+};
+
 struct SurfaceDescriptorDIB {
   // gfxWindowsSurface*
   uintptr_t surface;
@@ -112,6 +118,7 @@
   SurfaceDescriptorD3D9;
   SurfaceDescriptorDIB;
   SurfaceDescriptorD3D10;
+  SurfaceDescriptorFileMapping;
   SurfaceDescriptorDXGIYCbCr;
   SurfaceDescriptorX11;
   SurfaceTextureDescriptor;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/PCompositor.ipdl firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/PCompositor.ipdl
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/PCompositor.ipdl	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/PCompositor.ipdl	2015-05-25 20:42:34.000000000 +0000
@@ -70,6 +70,12 @@
    */
   async UpdatePluginVisibility(uintptr_t[] aVisibleIdList);
 
+  /**
+   * Drop any buffers that might be retained on the child compositor
+   * side.
+   */
+  async ClearCachedResources(uint64_t id);
+
 parent:
   // Child sends the parent a request for fill ratio numbers.
   async RequestOverfill();
@@ -85,6 +91,14 @@
   sync Pause();
   sync Resume();
 
+  // The child layer tree is hidden. id is the layers id of the child
+  // layer tree.
+  async NotifyHidden(uint64_t id);
+
+  // The child layer tree is visible. id is the layers id of the child
+  // layer tree.
+  async NotifyVisible(uint64_t id);
+
   async NotifyChildCreated(uint64_t id);
   async AdoptChild(uint64_t id);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/ShadowLayers.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/ShadowLayers.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/ShadowLayers.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/ShadowLayers.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -731,6 +731,16 @@
   return mShadowManager->OtherPid() == base::GetCurrentProcId();
 }
 
+base::ProcessId
+ShadowLayerForwarder::ParentPid() const
+{
+  if (!HasShadowManager() || !mShadowManager->IPCOpen()) {
+    return base::ProcessId();
+  }
+
+  return mShadowManager->OtherPid();
+}
+
 /**
   * We bail out when we have no shadow manager. That can happen when the
   * layer manager is created by the preallocated process.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/ShadowLayers.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/ShadowLayers.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/ShadowLayers.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/ShadowLayers.h	2015-05-25 20:42:34.000000000 +0000
@@ -341,6 +341,7 @@
 
   virtual bool IPCOpen() const override;
   virtual bool IsSameProcess() const override;
+  virtual base::ProcessId ParentPid() const override;
 
   /**
    * Construct a shadow of |aLayer| on the "other side", at the
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/SharedBufferManagerParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/SharedBufferManagerParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/ipc/SharedBufferManagerParent.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/ipc/SharedBufferManagerParent.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -364,7 +364,11 @@
 SharedBufferManagerParent::GetGraphicBuffer(GrallocBufferRef aRef)
 {
   MonitorAutoLock lock(*sManagerMonitor.get());
-  return GetInstance(aRef.mOwner)->GetGraphicBuffer(aRef.mKey);
+  SharedBufferManagerParent* parent = GetInstance(aRef.mOwner);
+  if (!parent) {
+    return nullptr;
+  }
+  return parent->GetGraphicBuffer(aRef.mKey);
 }
 #endif
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/LayerScope.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/LayerScope.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/LayerScope.cpp	2015-05-13 18:06:31.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/LayerScope.cpp	2015-05-25 20:44:22.000000000 +0000
@@ -712,16 +712,15 @@
         aGLContext->GetUIntegerv(LOCAL_GL_TEXTURE_BINDING_RECTANGLE, &textureId);
     }
 
-    gfx::IntSize size = aSource->GetSize();
-
-    // By sending 0 to ReadTextureImage rely upon aSource->BindTexture binding
-    // texture correctly. textureId is used for tracking in DebugGLTextureData.
-    RefPtr<DataSourceSurface> img =
-        aGLContext->ReadTexImageHelper()->ReadTexImage(0, textureTarget,
-                                                       size,
-                                                       shaderConfig, aFlipY);
-
     if (!IsTextureIdContainsInList(textureId)) {
+      gfx::IntSize size = aSource->GetSize();
+
+      // By sending 0 to ReadTextureImage rely upon aSource->BindTexture binding
+      // texture correctly. textureId is used for tracking in DebugGLTextureData.
+      RefPtr<DataSourceSurface> img =
+          aGLContext->ReadTexImageHelper()->ReadTexImage(0, textureTarget,
+                                                         size,
+                                                         shaderConfig, aFlipY);
       sTextureIdList.push_back(textureId);
       WebSocketHelper::GetSocketManager()->AppendDebugData(
           new DebugGLTextureData(aGLContext, aLayerRef, textureTarget,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/Layers.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/Layers.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/Layers.cpp	2015-05-13 18:06:31.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/Layers.cpp	2015-05-25 20:44:22.000000000 +0000
@@ -1796,6 +1796,7 @@
 {
   Layer::PrintInfo(aStream, aPrefix);
   AppendToString(aStream, mColor, " [color=", "]");
+  AppendToString(aStream, mBounds, " [bounds=", "]");
 }
 
 void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/Layers.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/Layers.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/Layers.h	2015-05-13 18:06:31.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/Layers.h	2015-05-25 20:44:22.000000000 +0000
@@ -44,7 +44,7 @@
 #include "nsTArray.h"                   // for nsTArray
 #include "nsTArrayForwardDeclare.h"     // for InfallibleTArray
 #include "nscore.h"                     // for nsACString, nsAString
-#include "prlog.h"                      // for PRLogModuleInfo
+#include "mozilla/Logging.h"                      // for PRLogModuleInfo
 #include "nsIWidget.h"                  // For plugin window configuration information structs
 #include "gfxVR.h"
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/LayersLogging.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/LayersLogging.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/LayersLogging.cpp	2015-05-13 18:06:31.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/LayersLogging.cpp	2015-05-25 20:44:22.000000000 +0000
@@ -215,28 +215,37 @@
 }
 
 void
-AppendToString(std::stringstream& aStream, const Matrix4x4& m,
+AppendToString(std::stringstream& aStream, const Matrix& m,
                const char* pfx, const char* sfx)
 {
   aStream << pfx;
-  if (m.Is2D()) {
-    Matrix matrix = m.As2D();
-    if (matrix.IsIdentity()) {
-      aStream << "[ I ]";
-      aStream << sfx;
-      return;
-    }
-    aStream << nsPrintfCString(
-      "[ %g %g; %g %g; %g %g; ]",
-      matrix._11, matrix._12, matrix._21, matrix._22, matrix._31, matrix._32).get();
+  if (m.IsIdentity()) {
+    aStream << "[ I ]";
   } else {
     aStream << nsPrintfCString(
-      "[ %g %g %g %g; %g %g %g %g; %g %g %g %g; %g %g %g %g; ]",
-      m._11, m._12, m._13, m._14,
-      m._21, m._22, m._23, m._24,
-      m._31, m._32, m._33, m._34,
-      m._41, m._42, m._43, m._44).get();
+      "[ %g %g; %g %g; %g %g; ]",
+      m._11, m._12, m._21, m._22, m._31, m._32).get();
+  }
+  aStream << sfx;
+}
+
+void
+AppendToString(std::stringstream& aStream, const Matrix4x4& m,
+               const char* pfx, const char* sfx)
+{
+  if (m.Is2D()) {
+    Matrix matrix = m.As2D();
+    AppendToString(aStream, matrix, pfx, sfx);
+    return;
   }
+
+  aStream << pfx;
+  aStream << nsPrintfCString(
+    "[ %g %g %g %g; %g %g %g %g; %g %g %g %g; %g %g %g %g; ]",
+    m._11, m._12, m._13, m._14,
+    m._21, m._22, m._23, m._24,
+    m._31, m._32, m._33, m._34,
+    m._41, m._42, m._43, m._44).get();
   aStream << sfx;
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/LayersLogging.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/LayersLogging.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/LayersLogging.h	2015-05-13 18:06:31.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/LayersLogging.h	2015-05-25 20:44:22.000000000 +0000
@@ -183,6 +183,10 @@
 }
 
 void
+AppendToString(std::stringstream& aStream, const mozilla::gfx::Matrix& m,
+               const char* pfx="", const char* sfx="");
+
+void
 AppendToString(std::stringstream& aStream, const mozilla::gfx::Matrix4x4& m,
                const char* pfx="", const char* sfx="");
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/LayersTypes.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/LayersTypes.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/LayersTypes.h	2015-05-13 18:06:31.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/LayersTypes.h	2015-05-25 20:44:22.000000000 +0000
@@ -16,14 +16,14 @@
 #include <ui/GraphicBuffer.h>
 #endif
 #include <stdio.h>            // FILE
-#include "prlog.h"            // for PR_LOG
+#include "mozilla/Logging.h"            // for PR_LOG
 #ifndef MOZ_LAYERS_HAVE_LOG
 #  define MOZ_LAYERS_HAVE_LOG
 #endif
 #define MOZ_LAYERS_LOG(_args)                             \
-  PR_LOG(LayerManager::GetLog(), PR_LOG_DEBUG, _args)
+  MOZ_LOG(LayerManager::GetLog(), PR_LOG_DEBUG, _args)
 #define MOZ_LAYERS_LOG_IF_SHADOWABLE(layer, _args)         \
-  do { if (layer->AsShadowableLayer()) { PR_LOG(LayerManager::GetLog(), PR_LOG_DEBUG, _args); } } while (0)
+  do { if (layer->AsShadowableLayer()) { MOZ_LOG(LayerManager::GetLog(), PR_LOG_DEBUG, _args); } } while (0)
 
 #define INVALID_OVERLAY -1
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/MacIOSurfaceImage.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/MacIOSurfaceImage.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/MacIOSurfaceImage.cpp	2015-05-13 18:06:31.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/MacIOSurfaceImage.cpp	2015-05-25 20:44:22.000000000 +0000
@@ -51,5 +51,5 @@
   dataSurface->Unmap();
   mSurface->Unlock();
 
-  return dataSurface;
+  return dataSurface.forget();
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/moz.build firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/moz.build	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/moz.build	2015-05-25 20:42:34.000000000 +0000
@@ -139,6 +139,7 @@
     'ipc/CompositableForwarder.h',
     'ipc/CompositableTransactionParent.h',
     'ipc/CompositorChild.h',
+    'ipc/CompositorLRU.h',
     'ipc/CompositorParent.h',
     'ipc/FenceUtils.h',
     'ipc/ImageBridgeChild.h',
@@ -213,18 +214,15 @@
         'opengl/GrallocTextureHost.cpp',
     ]
     LOCAL_INCLUDES += ['/widget/gonk']
+    CXXFLAGS += [
+         '-I%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [
+             'system/core/libsync/include'
+         ]
+    ]
     SOURCES += [
         'ipc/ShadowLayerUtilsGralloc.cpp',
     ]
 
-    if CONFIG['ANDROID_VERSION'] >= '17':
-        EXPORTS.mozilla.layers += [
-            'ipc/FenceUtilsGonk.h',
-        ]
-        SOURCES += [
-            'ipc/FenceUtilsGonk.cpp',
-        ]
-
 UNIFIED_SOURCES += [
     'apz/src/APZCTreeManager.cpp',
     'apz/src/AsyncPanZoomController.cpp',
@@ -294,7 +292,9 @@
     'ipc/CompositableTransactionParent.cpp',
     'ipc/CompositorBench.cpp',
     'ipc/CompositorChild.cpp',
+    'ipc/CompositorLRU.cpp',
     'ipc/CompositorParent.cpp',
+    'ipc/FenceUtils.cpp',
     'ipc/ImageBridgeChild.cpp',
     'ipc/ImageBridgeParent.cpp',
     'ipc/ISurfaceAllocator.cpp',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/opengl/CompositorOGL.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/opengl/CompositorOGL.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/opengl/CompositorOGL.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/opengl/CompositorOGL.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -1297,11 +1297,8 @@
     return;
   }
 
-  android::sp<android::Fence> fence = new android::Fence(GetGonkDisplay()->GetPrevDispAcquireFd());
-  if (fence.get() && fence->isValid()) {
-    FenceHandle handle = FenceHandle(fence);
-    mReleaseFenceHandle.Merge(handle);
-  }
+  RefPtr<FenceHandle::FdObj> fence = new FenceHandle::FdObj(GetGonkDisplay()->GetPrevDispAcquireFd());
+  mReleaseFenceHandle.Merge(FenceHandle(fence));
 }
 
 FenceHandle
@@ -1310,7 +1307,9 @@
   if (!mReleaseFenceHandle.IsValid()) {
     return FenceHandle();
   }
-  return FenceHandle(new android::Fence(mReleaseFenceHandle.mFence->dup()));
+
+  nsRefPtr<FenceHandle::FdObj> fdObj = mReleaseFenceHandle.GetDupFdObj();
+  return FenceHandle(fdObj);
 }
 
 #else
@@ -1425,9 +1424,7 @@
 TemporaryRef<DataTextureSource>
 CompositorOGL::CreateDataTextureSource(TextureFlags aFlags)
 {
-  RefPtr<DataTextureSource> result =
-    new TextureImageTextureSourceOGL(this, aFlags);
-  return result;
+  return MakeAndAddRef<TextureImageTextureSourceOGL>(this, aFlags);
 }
 
 bool
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/opengl/CompositorOGL.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/opengl/CompositorOGL.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/opengl/CompositorOGL.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/opengl/CompositorOGL.h	2015-05-25 20:42:34.000000000 +0000
@@ -32,9 +32,6 @@
 #include "nsThreadUtils.h"              // for nsRunnable
 #include "nsXULAppAPI.h"                // for XRE_GetProcessType
 #include "nscore.h"                     // for NS_IMETHOD
-#ifdef MOZ_WIDGET_GONK
-#include <ui/GraphicBuffer.h>
-#endif
 #include "gfxVR.h"
 
 class nsIWidget;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/opengl/GrallocTextureClient.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/opengl/GrallocTextureClient.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/opengl/GrallocTextureClient.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/opengl/GrallocTextureClient.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -14,6 +14,10 @@
 #include "gfx2DGlue.h"
 #include "SharedSurfaceGralloc.h"
 
+#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
+#include <ui/Fence.h>
+#endif
+
 namespace mozilla {
 namespace layers {
 
@@ -56,7 +60,7 @@
     return nullptr;
   }
 
-  return tex;
+  return tex.forget();
 }
 
 bool
@@ -91,7 +95,8 @@
 
 #if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
    if (mReleaseFenceHandle.IsValid()) {
-     android::sp<Fence> fence = mReleaseFenceHandle.mFence;
+     nsRefPtr<FenceHandle::FdObj> fdObj = mReleaseFenceHandle.GetAndResetFdObj();
+     android::sp<Fence> fence = new Fence(fdObj->GetAndResetFd());
 #if ANDROID_VERSION == 17
      fence->waitForever(1000, "GrallocTextureClientOGL::Lock");
      // 1000 is what Android uses. It is a warning timeout in ms.
@@ -130,14 +135,10 @@
     usage |= GRALLOC_USAGE_SW_WRITE_OFTEN;
   }
 #if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 21
-  android::sp<Fence> fence = android::Fence::NO_FENCE;
-  if (mReleaseFenceHandle.IsValid()) {
-    fence = mReleaseFenceHandle.mFence;
-  }
-  mReleaseFenceHandle = FenceHandle();
+  nsRefPtr<FenceHandle::FdObj> fdObj = mReleaseFenceHandle.GetAndResetFdObj();
   int32_t rv = mGraphicBuffer->lockAsync(usage,
                                          reinterpret_cast<void**>(&mMappedBuffer),
-                                         fence->dup());
+                                         fdObj->GetAndResetFd());
 #else
   int32_t rv = mGraphicBuffer->lock(usage,
                                     reinterpret_cast<void**>(&mMappedBuffer));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/opengl/GrallocTextureHost.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/opengl/GrallocTextureHost.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/opengl/GrallocTextureHost.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/opengl/GrallocTextureHost.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -231,6 +231,9 @@
 TemporaryRef<gfx::DataSourceSurface>
 GrallocTextureHostOGL::GetAsSurface() {
   android::GraphicBuffer* graphicBuffer = GetGraphicBufferFromDesc(mGrallocHandle).get();
+  if (!graphicBuffer) {
+    return nullptr;
+  }
   uint8_t* grallocData;
   graphicBuffer->lock(GRALLOC_USAGE_SW_READ_OFTEN, reinterpret_cast<void**>(&grallocData));
   RefPtr<gfx::DataSourceSurface> grallocTempSurf =
@@ -263,14 +266,7 @@
 FenceHandle
 GrallocTextureHostOGL::GetAndResetReleaseFenceHandle()
 {
-#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
-  android::sp<android::Fence> fence = GetAndResetReleaseFence();
-  if (fence.get() && fence->isValid()) {
-    FenceHandle handle = FenceHandle(fence);
-    return handle;
-  }
-#endif
-  return FenceHandle();
+  return GetAndResetReleaseFence();
 }
 
 GLenum GetTextureTarget(gl::GLContext* aGL, android::PixelFormat aFormat) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/opengl/GrallocTextureHost.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/opengl/GrallocTextureHost.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/opengl/GrallocTextureHost.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/opengl/GrallocTextureHost.h	2015-05-25 20:42:34.000000000 +0000
@@ -16,9 +16,7 @@
 namespace layers {
 
 class GrallocTextureHostOGL : public TextureHost
-#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
                             , public TextureHostOGL
-#endif
 {
   friend class GrallocBufferActor;
 public:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/opengl/MacIOSurfaceTextureClientOGL.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/opengl/MacIOSurfaceTextureClientOGL.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/opengl/MacIOSurfaceTextureClientOGL.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/opengl/MacIOSurfaceTextureClientOGL.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -33,7 +33,7 @@
   MOZ_ASSERT(texture->IsValid());
   MOZ_ASSERT(!texture->IsAllocated());
   texture->mSurface = aSurface;
-  return texture;
+  return texture.forget();
 }
 
 bool
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/opengl/TextureHostOGL.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/opengl/TextureHostOGL.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/opengl/TextureHostOGL.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/opengl/TextureHostOGL.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -110,71 +110,50 @@
   return static_cast<gl::TextureImage::Flags>(result);
 }
 
-#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
 bool
-TextureHostOGL::SetReleaseFence(const android::sp<android::Fence>& aReleaseFence)
+TextureHostOGL::SetReleaseFence(const FenceHandle& aReleaseFence)
 {
-  if (!aReleaseFence.get() || !aReleaseFence->isValid()) {
+  if (!aReleaseFence.IsValid()) {
     // HWC might not provide Fence.
     // In this case, HWC implicitly handles buffer's fence.
     return false;
   }
 
-  if (!mReleaseFence.get()) {
-    mReleaseFence = aReleaseFence;
-  } else {
-    android::sp<android::Fence> mergedFence = android::Fence::merge(
-                  android::String8::format("TextureHostOGL"),
-                  mReleaseFence, aReleaseFence);
-    if (!mergedFence.get()) {
-      // synchronization is broken, the best we can do is hope fences
-      // signal in order so the new fence will act like a union.
-      // This error handling is same as android::ConsumerBase does.
-      mReleaseFence = aReleaseFence;
-      return false;
-    }
-    mReleaseFence = mergedFence;
-  }
+  mReleaseFence.Merge(aReleaseFence);
+
   return true;
 }
 
-android::sp<android::Fence>
+FenceHandle
 TextureHostOGL::GetAndResetReleaseFence()
 {
-  // Hold previous ReleaseFence to prevent Fence delivery failure via gecko IPC.
-  mPrevReleaseFence = mReleaseFence;
-  // Reset current ReleaseFence.
-  mReleaseFence = android::Fence::NO_FENCE;
-  return mPrevReleaseFence;
+  FenceHandle fence;
+  mReleaseFence.TransferToAnotherFenceHandle(fence);
+  return fence;
 }
 
 void
-TextureHostOGL::SetAcquireFence(const android::sp<android::Fence>& aAcquireFence)
+TextureHostOGL::SetAcquireFence(const FenceHandle& aAcquireFence)
 {
   mAcquireFence = aAcquireFence;
 }
 
-android::sp<android::Fence>
+FenceHandle
 TextureHostOGL::GetAndResetAcquireFence()
 {
-  android::sp<android::Fence> fence = mAcquireFence;
-  // Reset current AcquireFence.
-  mAcquireFence = android::Fence::NO_FENCE;
-  return fence;
+  nsRefPtr<FenceHandle::FdObj> fdObj = mAcquireFence.GetAndResetFdObj();
+  return FenceHandle(fdObj);
 }
 
 void
 TextureHostOGL::WaitAcquireFenceSyncComplete()
 {
-  if (!mAcquireFence.get() || !mAcquireFence->isValid()) {
+  if (!mAcquireFence.IsValid()) {
     return;
   }
 
-  int fenceFd = mAcquireFence->dup();
-  if (fenceFd == -1) {
-    NS_WARNING("failed to dup fence fd");
-    return;
-  }
+  nsRefPtr<FenceHandle::FdObj> fence = mAcquireFence.GetAndResetFdObj();
+  int fenceFd = fence->GetAndResetFd();
 
   EGLint attribs[] = {
               LOCAL_EGL_SYNC_NATIVE_FENCE_FD_ANDROID, fenceFd,
@@ -200,11 +179,8 @@
     NS_ERROR("failed to wait native fence sync");
   }
   MOZ_ALWAYS_TRUE( sEGLLibrary.fDestroySync(EGL_DISPLAY(), sync) );
-  mAcquireFence = nullptr;
 }
 
-#endif
-
 bool
 TextureImageTextureSourceOGL::Update(gfx::DataSourceSurface* aSurface,
                                      nsIntRegion* aDestRegion,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/opengl/TextureHostOGL.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/opengl/TextureHostOGL.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/opengl/TextureHostOGL.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/opengl/TextureHostOGL.h	2015-05-25 20:42:34.000000000 +0000
@@ -30,12 +30,6 @@
 #include "nsDebug.h"                    // for NS_WARNING
 #include "nsISupportsImpl.h"            // for TextureImage::Release, etc
 #include "OGLShaderProgram.h"           // for ShaderProgramType, etc
-#ifdef MOZ_WIDGET_GONK
-#include <ui/GraphicBuffer.h>
-#if ANDROID_VERSION >= 17
-#include <ui/Fence.h>
-#endif
-#endif
 
 class nsIntRegion;
 
@@ -134,40 +128,30 @@
 class TextureHostOGL
 {
 public:
-#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
-
   /**
    * Store a fence that will signal when the current buffer is no longer being read.
    * Similar to android's GLConsumer::setReleaseFence()
    */
-  virtual bool SetReleaseFence(const android::sp<android::Fence>& aReleaseFence);
+  virtual bool SetReleaseFence(const FenceHandle& aReleaseFence);
 
   /**
    * Return a releaseFence's Fence and clear a reference to the Fence.
    */
-  virtual android::sp<android::Fence> GetAndResetReleaseFence();
+  virtual FenceHandle GetAndResetReleaseFence();
 
-  virtual void SetAcquireFence(const android::sp<android::Fence>& aAcquireFence);
+  virtual void SetAcquireFence(const FenceHandle& aAcquireFence);
 
   /**
    * Return a acquireFence's Fence and clear a reference to the Fence.
    */
-  virtual android::sp<android::Fence> GetAndResetAcquireFence();
+  virtual FenceHandle GetAndResetAcquireFence();
 
   virtual void WaitAcquireFenceSyncComplete();
 
 protected:
-  android::sp<android::Fence> mReleaseFence;
-
-  android::sp<android::Fence> mAcquireFence;
+  FenceHandle mReleaseFence;
 
-  /**
-   * Hold previous ReleaseFence to prevent Fence delivery failure via gecko IPC.
-   * Fence is a kernel object and its lifetime is managed by a reference count.
-   * Until the Fence is delivered to client side, need to hold Fence on host side.
-   */
-  android::sp<android::Fence> mPrevReleaseFence;
-#endif
+  FenceHandle mAcquireFence;
 };
 
 /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/RotatedBuffer.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/RotatedBuffer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/RotatedBuffer.cpp	2015-05-13 18:06:31.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/RotatedBuffer.cpp	2015-05-25 20:44:23.000000000 +0000
@@ -191,7 +191,7 @@
   }
 
   MOZ_ASSERT(surf);
-  return surf;
+  return surf.forget();
 }
 
 /* static */ bool
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/TextureDIB.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/TextureDIB.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/TextureDIB.cpp	2015-05-13 18:06:31.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/TextureDIB.cpp	2015-05-25 20:44:23.000000000 +0000
@@ -5,6 +5,8 @@
 
 #include "TextureDIB.h"
 #include "gfx2DGlue.h"
+#include "mozilla/layers/ISurfaceAllocator.h"
+#include "mozilla/ipc/ProtocolUtils.h"
 
 namespace mozilla {
 
@@ -12,37 +14,8 @@
 
 namespace layers {
 
-DIBTextureClient::DIBTextureClient(ISurfaceAllocator* aAllocator,
-                                   gfx::SurfaceFormat aFormat,
-                                   TextureFlags aFlags)
-  : TextureClient(aAllocator, aFlags)
-  , mFormat(aFormat)
-  , mIsLocked(false)
-{
-  MOZ_COUNT_CTOR(DIBTextureClient);
-}
-
-DIBTextureClient::~DIBTextureClient()
-{
-  MOZ_COUNT_DTOR(DIBTextureClient);
-}
-
-TemporaryRef<TextureClient>
-DIBTextureClient::CreateSimilar(TextureFlags aFlags,
-                                TextureAllocationFlags aAllocFlags) const
-{
-  RefPtr<TextureClient> tex = new DIBTextureClient(mAllocator, mFormat,
-                                                   mFlags | aFlags);
-
-  if (!tex->AllocateForSurface(mSize, aAllocFlags)) {
-    return nullptr;
-  }
-
-  return tex;
-}
-
 bool
-DIBTextureClient::Lock(OpenMode)
+TextureClientDIB::Lock(OpenMode)
 {
   MOZ_ASSERT(!mIsLocked);
   if (!IsValid()) {
@@ -53,7 +26,7 @@
 }
 
 void
-DIBTextureClient::Unlock()
+TextureClientDIB::Unlock()
 {
   MOZ_ASSERT(mIsLocked, "Unlocked called while the texture is not locked!");
   if (mDrawTarget) {
@@ -70,13 +43,54 @@
   mIsLocked = false;
 }
 
+gfx::DrawTarget*
+TextureClientDIB::BorrowDrawTarget()
+{
+  MOZ_ASSERT(mIsLocked && IsAllocated());
+
+  if (!mDrawTarget) {
+    mDrawTarget =
+      gfxPlatform::GetPlatform()->CreateDrawTargetForSurface(mSurface, mSize);
+  }
+
+  return mDrawTarget;
+}
+
+TextureClientMemoryDIB::TextureClientMemoryDIB(ISurfaceAllocator* aAllocator,
+                                   gfx::SurfaceFormat aFormat,
+                                   TextureFlags aFlags)
+  : TextureClientDIB(aAllocator, aFormat, aFlags)
+{
+  MOZ_COUNT_CTOR(TextureClientMemoryDIB);
+}
+
+TextureClientMemoryDIB::~TextureClientMemoryDIB()
+{
+  MOZ_COUNT_DTOR(TextureClientMemoryDIB);
+}
+
+TemporaryRef<TextureClient>
+TextureClientMemoryDIB::CreateSimilar(TextureFlags aFlags,
+                                      TextureAllocationFlags aAllocFlags) const
+{
+  RefPtr<TextureClient> tex = new TextureClientMemoryDIB(mAllocator, mFormat,
+                                                         mFlags | aFlags);
+
+  if (!tex->AllocateForSurface(mSize, aAllocFlags)) {
+    return nullptr;
+  }
+
+  return tex.forget();
+}
+
 bool
-DIBTextureClient::ToSurfaceDescriptor(SurfaceDescriptor& aOutDescriptor)
+TextureClientMemoryDIB::ToSurfaceDescriptor(SurfaceDescriptor& aOutDescriptor)
 {
   MOZ_ASSERT(IsValid());
   if (!IsAllocated()) {
     return false;
   }
+
   MOZ_ASSERT(mSurface);
   // The host will release this ref when it receives the surface descriptor.
   // We AddRef in case we die before the host receives the pointer.
@@ -85,54 +99,181 @@
   return true;
 }
 
-gfx::DrawTarget*
-DIBTextureClient::BorrowDrawTarget()
+bool
+TextureClientMemoryDIB::AllocateForSurface(gfx::IntSize aSize, TextureAllocationFlags aFlags)
 {
-  MOZ_ASSERT(mIsLocked && IsAllocated());
+  MOZ_ASSERT(!IsAllocated());
+  mSize = aSize;
 
-  if (!mDrawTarget) {
-    mDrawTarget =
-      gfxPlatform::GetPlatform()->CreateDrawTargetForSurface(mSurface, mSize);
+  mSurface = new gfxWindowsSurface(gfxIntSize(aSize.width, aSize.height),
+                                   SurfaceFormatToImageFormat(mFormat));
+  if (!mSurface || mSurface->CairoStatus())
+  {
+    NS_WARNING("Could not create surface");
+    mSurface = nullptr;
+    return false;
   }
 
-  return mDrawTarget;
+  return true;
+}
+
+TextureClientShmemDIB::TextureClientShmemDIB(ISurfaceAllocator* aAllocator,
+                                             gfx::SurfaceFormat aFormat,
+                                             TextureFlags aFlags)
+  : TextureClientDIB(aAllocator, aFormat, aFlags)
+  , mFileMapping(NULL)
+  , mHostHandle(NULL)
+  , mDC(NULL)
+  , mBitmap(NULL)
+{
+  MOZ_COUNT_CTOR(TextureClientShmemDIB);
+}
+
+TextureClientShmemDIB::~TextureClientShmemDIB()
+{
+  MOZ_COUNT_DTOR(TextureClientShmemDIB);
+
+  ::DeleteObject(mBitmap);
+  ::DeleteDC(mDC);
+  ::CloseHandle(mFileMapping);
+}
+
+TemporaryRef<TextureClient>
+TextureClientShmemDIB::CreateSimilar(TextureFlags aFlags,
+                                     TextureAllocationFlags aAllocFlags) const
+{
+  RefPtr<TextureClient> tex = new TextureClientShmemDIB(mAllocator, mFormat,
+                                                        mFlags | aFlags);
+
+  if (!tex->AllocateForSurface(mSize, aAllocFlags)) {
+    return nullptr;
+  }
+
+  return tex.forget();
 }
 
 bool
-DIBTextureClient::AllocateForSurface(gfx::IntSize aSize, TextureAllocationFlags aFlags)
+TextureClientShmemDIB::ToSurfaceDescriptor(SurfaceDescriptor& aOutDescriptor)
+{
+  MOZ_ASSERT(IsValid());
+  MOZ_ASSERT(mAllocator->ParentPid() != base::ProcessId());
+  if (!IsAllocated() || GetFormat() == gfx::SurfaceFormat::UNKNOWN) {
+    return false;
+  }
+
+  ::GdiFlush();
+  aOutDescriptor = SurfaceDescriptorFileMapping((WindowsHandle)mHostHandle, mFormat, mSize);
+  return true;
+}
+
+bool
+TextureClientShmemDIB::AllocateForSurface(gfx::IntSize aSize, TextureAllocationFlags aFlags)
 {
   MOZ_ASSERT(!IsAllocated());
+  MOZ_ASSERT(mAllocator->ParentPid() != base::ProcessId());
+
   mSize = aSize;
 
-  mSurface = new gfxWindowsSurface(gfxIntSize(aSize.width, aSize.height),
-                                   SurfaceFormatToImageFormat(mFormat));
-  if (!mSurface || mSurface->CairoStatus())
+  DWORD mapSize = mSize.width * mSize.height * BytesPerPixel(mFormat);
+  mFileMapping = ::CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, mapSize, NULL);
+
+  if (!mFileMapping) {
+    gfxCriticalError() << "Failed to create memory file mapping for " << mapSize << " bytes.";
+    return false;
+  }
+
+  uint8_t* data = (uint8_t*)::MapViewOfFile(mFileMapping, FILE_MAP_WRITE | FILE_MAP_READ, 0, 0, mSize.width * mSize.height * BytesPerPixel(mFormat));
+
+  memset(data, 0x80, mSize.width * mSize.height * BytesPerPixel(mFormat));
+
+  ::UnmapViewOfFile(mFileMapping);
+
+  BITMAPV4HEADER header;
+  memset(&header, 0, sizeof(BITMAPV4HEADER));
+  header.bV4Size          = sizeof(BITMAPV4HEADER);
+  header.bV4Width         = mSize.width;
+  header.bV4Height        = -LONG(mSize.height); // top-to-buttom DIB
+  header.bV4Planes        = 1;
+  header.bV4BitCount      = 32;
+  header.bV4V4Compression = BI_BITFIELDS;
+  header.bV4RedMask       = 0x00FF0000;
+  header.bV4GreenMask     = 0x0000FF00;
+  header.bV4BlueMask      = 0x000000FF;
+
+  mDC = ::CreateCompatibleDC(::GetDC(NULL));
+
+  if (!mDC) {
+    ::CloseHandle(mFileMapping);
+    gfxCriticalError() << "Failed to create DC for bitmap.";
+    return false;
+  }
+
+  void* bits;
+  mBitmap = ::CreateDIBSection(mDC, (BITMAPINFO*)&header, DIB_RGB_COLORS, &bits, mFileMapping, 0);
+
+  if (!mBitmap) {
+    gfxCriticalError() << "Failed to create DIB section for a bitmap of size " << mSize;
+    ::CloseHandle(mFileMapping);
+    ::DeleteDC(mDC);
+    return false;
+  }
+
+  ::SelectObject(mDC, mBitmap);
+
+  mSurface = new gfxWindowsSurface(mDC, 0);
+  if (mSurface->CairoStatus())
   {
-    NS_WARNING("Could not create surface");
+    ::DeleteObject(mBitmap);
+    ::DeleteDC(mDC);
+    ::CloseHandle(mFileMapping);
+    gfxCriticalError() << "Could not create surface, status: " << mSurface->CairoStatus();
     mSurface = nullptr;
     return false;
   }
 
+  if (!ipc::DuplicateHandle(mFileMapping, mAllocator->ParentPid(), &mHostHandle, 0, DUPLICATE_SAME_ACCESS)) {
+    gfxCriticalError() << "Failed to duplicate handle to parent process for surface.";
+    ::DeleteObject(mBitmap);
+    ::DeleteDC(mDC);
+    ::CloseHandle(mFileMapping);
+    return false;
+  }
+
   return true;
 }
 
-DIBTextureHost::DIBTextureHost(TextureFlags aFlags,
-                               const SurfaceDescriptorDIB& aDescriptor)
-  : TextureHost(aFlags)
-  , mIsLocked(false)
+
+bool
+TextureHostDirectUpload::Lock()
 {
-  // We added an extra ref for transport, so we shouldn't AddRef now.
-  mSurface =
-    dont_AddRef(reinterpret_cast<gfxWindowsSurface*>(aDescriptor.surface()));
-  MOZ_ASSERT(mSurface);
+  MOZ_ASSERT(!mIsLocked);
+  mIsLocked = true;
+  return true;
+}
 
-  mSize = mSurface->GetSize();
-  mFormat = ImageFormatToSurfaceFormat(
-    gfxPlatform::GetPlatform()->OptimalFormatForContent(mSurface->GetContentType()));
+void
+TextureHostDirectUpload::Unlock()
+{
+  MOZ_ASSERT(mIsLocked);
+  mIsLocked = false;
+}
+
+void
+TextureHostDirectUpload::SetCompositor(Compositor* aCompositor)
+{
+  mCompositor = aCompositor;
+}
+
+void
+TextureHostDirectUpload::DeallocateDeviceData()
+{
+  if (mTextureSource) {
+    mTextureSource->DeallocateDeviceData();
+  }
 }
 
 bool
-DIBTextureHost::BindTextureSource(CompositableTextureSourceRef& aTexture)
+TextureHostDirectUpload::BindTextureSource(CompositableTextureSourceRef& aTexture)
 {
   if (!mTextureSource) {
     Updated();
@@ -142,6 +283,20 @@
   return !!aTexture;
 }
 
+DIBTextureHost::DIBTextureHost(TextureFlags aFlags,
+                               const SurfaceDescriptorDIB& aDescriptor)
+  : TextureHostDirectUpload(aFlags, SurfaceFormat::B8G8R8X8, IntSize())
+{
+  // We added an extra ref for transport, so we shouldn't AddRef now.
+  mSurface =
+    dont_AddRef(reinterpret_cast<gfxWindowsSurface*>(aDescriptor.surface()));
+  MOZ_ASSERT(mSurface);
+
+  mSize = mSurface->GetSize();
+  mFormat = ImageFormatToSurfaceFormat(
+    gfxPlatform::GetPlatform()->OptimalFormatForContent(mSurface->GetContentType()));
+}
+
 void
 DIBTextureHost::Updated(const nsIntRegion* aRegion)
 {
@@ -164,34 +319,45 @@
   }
 }
 
-bool
-DIBTextureHost::Lock()
+TextureHostFileMapping::TextureHostFileMapping(TextureFlags aFlags,
+                                               const SurfaceDescriptorFileMapping& aDescriptor)
+  : TextureHostDirectUpload(aFlags, aDescriptor.format(), aDescriptor.size())
+  , mFileMapping((HANDLE)aDescriptor.handle())
 {
-  MOZ_ASSERT(!mIsLocked);
-  mIsLocked = true;
-  return true;
 }
 
-void
-DIBTextureHost::Unlock()
+TextureHostFileMapping::~TextureHostFileMapping()
 {
-  MOZ_ASSERT(mIsLocked);
-  mIsLocked = false;
+  ::CloseHandle(mFileMapping);
 }
 
 void
-DIBTextureHost::SetCompositor(Compositor* aCompositor)
+TextureHostFileMapping::Updated(const nsIntRegion* aRegion)
 {
-  mCompositor = aCompositor;
-}
+  if (!mCompositor) {
+    // This can happen if we send textures to a compositable that isn't yet
+    // attached to a layer.
+    return;
+  }
 
-void
-DIBTextureHost::DeallocateDeviceData()
-{
-  if (mTextureSource) {
-    mTextureSource->DeallocateDeviceData();
+  if (!mTextureSource) {
+    mTextureSource = mCompositor->CreateDataTextureSource(mFlags);
   }
+
+  uint8_t* data = (uint8_t*)::MapViewOfFile(mFileMapping, FILE_MAP_READ, 0, 0, mSize.width * mSize.height * BytesPerPixel(mFormat));
+
+  if (data) {
+    RefPtr<DataSourceSurface> surf = Factory::CreateWrappingDataSourceSurface(data, mSize.width * BytesPerPixel(mFormat), mSize, mFormat);
+
+    if (!mTextureSource->Update(surf, const_cast<nsIntRegion*>(aRegion))) {
+      mTextureSource = nullptr;
+    }
+  } else {
+    mTextureSource = nullptr;
+  }
+
+  ::UnmapViewOfFile(data);
 }
 
 }
-}
\ No newline at end of file
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/TextureDIB.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/TextureDIB.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/layers/TextureDIB.h	2015-05-13 18:06:31.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/layers/TextureDIB.h	2015-05-25 20:44:23.000000000 +0000
@@ -15,64 +15,117 @@
 namespace mozilla {
 namespace layers {
 
+class TextureClientDIB : public TextureClient
+{
+public:
+  virtual bool IsAllocated() const override { return !!mSurface; }
+
+  virtual bool Lock(OpenMode aOpenMode) override;
+
+  virtual void Unlock() override;
+
+  virtual bool IsLocked() const override{ return mIsLocked; }
+
+  virtual gfx::IntSize GetSize() const override { return mSize; }
+
+  virtual gfx::SurfaceFormat GetFormat() const override { return mFormat; }
+
+  virtual bool CanExposeDrawTarget() const override { return true; }
+
+  virtual gfx::DrawTarget* BorrowDrawTarget() override;
+
+  virtual bool HasInternalBuffer() const override { return true; }
+
+protected:
+  TextureClientDIB(ISurfaceAllocator* aAllocator, gfx::SurfaceFormat aFormat, TextureFlags aFlags)
+    : TextureClient(aAllocator, aFlags)
+    , mFormat(aFormat)
+    , mIsLocked(false)
+  { }
+
+  nsRefPtr<gfxWindowsSurface> mSurface;
+  RefPtr<gfx::DrawTarget> mDrawTarget;
+  gfx::IntSize mSize;
+  gfx::SurfaceFormat mFormat;
+  bool mIsLocked;
+};
+
 /**
   * Can only be drawn into through Cairo.
   * Prefer CairoTextureClient when possible.
   * The coresponding TextureHost depends on the compositor
   */
-class DIBTextureClient : public TextureClient
+class TextureClientMemoryDIB : public TextureClientDIB
 {
 public:
-  DIBTextureClient(ISurfaceAllocator* aAllocator,
-                   gfx::SurfaceFormat aFormat,
-                   TextureFlags aFlags);
+  TextureClientMemoryDIB(ISurfaceAllocator* aAllocator,
+                         gfx::SurfaceFormat aFormat,
+                         TextureFlags aFlags);
 
-  virtual ~DIBTextureClient();
+  virtual ~TextureClientMemoryDIB();
 
   // TextureClient
 
-  virtual bool IsAllocated() const override { return !!mSurface; }
+  virtual bool ToSurfaceDescriptor(SurfaceDescriptor& aOutDescriptor) override;
 
-  virtual bool Lock(OpenMode aOpenMode) override;
+  virtual bool AllocateForSurface(gfx::IntSize aSize,
+    TextureAllocationFlags aFlags = ALLOC_DEFAULT) override;
 
-  virtual void Unlock() override;
+  virtual TemporaryRef<TextureClient>
+  CreateSimilar(TextureFlags aFlags = TextureFlags::DEFAULT,
+                TextureAllocationFlags aAllocFlags = ALLOC_DEFAULT) const override;
 
-  virtual bool IsLocked() const override{ return mIsLocked; }
 
-  virtual bool ToSurfaceDescriptor(SurfaceDescriptor& aOutDescriptor) override;
+};
 
-  virtual gfx::IntSize GetSize() const override { return mSize; }
+/**
+  * Can only be drawn into through Cairo.
+  * Prefer CairoTextureClient when possible.
+  * The coresponding TextureHost depends on the compositor
+  */
+class TextureClientShmemDIB : public TextureClientDIB
+{
+public:
+  TextureClientShmemDIB(ISurfaceAllocator* aAllocator,
+                        gfx::SurfaceFormat aFormat,
+                        TextureFlags aFlags);
 
-  virtual gfx::SurfaceFormat GetFormat() const override { return mFormat; }
+  virtual ~TextureClientShmemDIB();
 
-  virtual bool CanExposeDrawTarget() const override { return true; }
+  // TextureClient
 
-  virtual gfx::DrawTarget* BorrowDrawTarget() override;
+  virtual bool ToSurfaceDescriptor(SurfaceDescriptor& aOutDescriptor) override;
 
   virtual bool AllocateForSurface(gfx::IntSize aSize,
     TextureAllocationFlags aFlags = ALLOC_DEFAULT) override;
 
-  virtual bool HasInternalBuffer() const override { return true; }
-
   virtual TemporaryRef<TextureClient>
   CreateSimilar(TextureFlags aFlags = TextureFlags::DEFAULT,
                 TextureAllocationFlags aAllocFlags = ALLOC_DEFAULT) const override;
 
 protected:
-  nsRefPtr<gfxWindowsSurface> mSurface;
-  RefPtr<gfx::DrawTarget> mDrawTarget;
-  gfx::IntSize mSize;
-  gfx::SurfaceFormat mFormat;
-  bool mIsLocked;
+  HANDLE mFileMapping;
+  HANDLE mHostHandle;
+  HDC mDC;
+  HBITMAP mBitmap;
 };
 
-class DIBTextureHost : public TextureHost
+/**
+  * This is meant for a texture host which does a direct upload from
+  * Updated to a Compositor specific DataTextureSource and therefor doesn't
+  * need any specific Lock/Unlock magic.
+  */
+class TextureHostDirectUpload : public TextureHost
 {
 public:
-  DIBTextureHost(TextureFlags aFlags,
-                 const SurfaceDescriptorDIB& aDescriptor);
-
-  virtual bool BindTextureSource(CompositableTextureSourceRef& aTexture) override;
+  TextureHostDirectUpload(TextureFlags aFlags,
+                          gfx::SurfaceFormat aFormat,
+                          gfx::IntSize aSize)
+    : TextureHost(aFlags)
+    , mFormat(aFormat)
+    , mSize(aSize)
+    , mIsLocked(false)
+  { }
 
   virtual void DeallocateDeviceData() override;
 
@@ -86,6 +139,22 @@
 
   virtual void Unlock() override;
 
+  virtual bool BindTextureSource(CompositableTextureSourceRef& aTexture) override;
+
+protected:
+  RefPtr<DataTextureSource> mTextureSource;
+  RefPtr<Compositor> mCompositor;
+  gfx::SurfaceFormat mFormat;
+  gfx::IntSize mSize;
+  bool mIsLocked;
+};
+
+class DIBTextureHost : public TextureHostDirectUpload
+{
+public:
+  DIBTextureHost(TextureFlags aFlags,
+                 const SurfaceDescriptorDIB& aDescriptor);
+
   virtual void Updated(const nsIntRegion* aRegion = nullptr) override;
 
   virtual TemporaryRef<gfx::DataSourceSurface> GetAsSurface() override
@@ -95,11 +164,26 @@
 
 protected:
   nsRefPtr<gfxWindowsSurface> mSurface;
-  RefPtr<DataTextureSource> mTextureSource;
-  RefPtr<Compositor> mCompositor;
-  gfx::SurfaceFormat mFormat;
-  gfx::IntSize mSize;
-  bool mIsLocked;
+};
+
+class TextureHostFileMapping : public TextureHostDirectUpload
+{
+public:
+  TextureHostFileMapping(TextureFlags aFlags,
+                         const SurfaceDescriptorFileMapping& aDescriptor);
+  ~TextureHostFileMapping();
+
+  virtual void Updated(const nsIntRegion* aRegion = nullptr) override;
+
+  virtual TemporaryRef<gfx::DataSourceSurface> GetAsSurface() override
+  {
+    MOZ_CRASH(); // Not implemented! It would be tricky to keep track of the
+                 // scope of the file mapping. We could do this through UserData
+                 // on the DataSourceSurface but we don't need this right now.
+  }
+
+protected:
+  HANDLE mFileMapping;
 };
 
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/qcms/transform-sse1.c firefox-trunk-41.0~a1~hg20150524r245419/gfx/qcms/transform-sse1.c
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/qcms/transform-sse1.c	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/qcms/transform-sse1.c	2015-05-25 20:42:35.000000000 +0000
@@ -48,7 +48,7 @@
     const __m128 scale = _mm_load_ps(floatScaleX4);
 
     /* working variables */
-    __m128 vec_r, vec_g, vec_b, result;
+    __m128 vec_r, vec_g, vec_b, result, result_hi;
 
     /* CYA */
     if (!length)
@@ -84,21 +84,23 @@
         result = _mm_mul_ps(vec_r, scale);
 
         /* store calc'd output tables indices */
+        /* Bug 1163740 temporary investigation:
+         * Write output[0] last, to keep |result| in a register in minidumps */
+        result_hi = _mm_movehl_ps(result, result);
+        *((__m64 *)&output[2]) = _mm_cvtps_pi32(result_hi);
         *((__m64 *)&output[0]) = _mm_cvtps_pi32(result);
-        result = _mm_movehl_ps(result, result);
-        *((__m64 *)&output[2]) = _mm_cvtps_pi32(result) ;
-
-        /* load for next loop while store completes */
-        vec_r = _mm_load_ss(&igtbl_r[src[0]]);
-        vec_g = _mm_load_ss(&igtbl_g[src[1]]);
-        vec_b = _mm_load_ss(&igtbl_b[src[2]]);
-        src += 3;
 
         /* use calc'd indices to output RGB values */
         dest[OUTPUT_R_INDEX] = otdata_r[output[0]];
         dest[OUTPUT_G_INDEX] = otdata_g[output[1]];
         dest[OUTPUT_B_INDEX] = otdata_b[output[2]];
         dest += RGB_OUTPUT_COMPONENTS;
+
+        /* load for next loop while store completes */
+        vec_r = _mm_load_ss(&igtbl_r[src[0]]);
+        vec_g = _mm_load_ss(&igtbl_g[src[1]]);
+        vec_b = _mm_load_ss(&igtbl_b[src[2]]);
+        src += 3;
     }
 
     /* handle final (maybe only) pixel */
@@ -165,7 +167,7 @@
     const __m128 scale = _mm_load_ps(floatScaleX4);
 
     /* working variables */
-    __m128 vec_r, vec_g, vec_b, result;
+    __m128 vec_r, vec_g, vec_b, result, result_hi;
     unsigned char alpha;
 
     /* CYA */
@@ -206,22 +208,23 @@
         vec_r  = _mm_min_ps(max, vec_r);
         result = _mm_mul_ps(vec_r, scale);
 
-        /* store calc'd output tables indices */
+        /* Bug 1163740 temporary investigation:
+         * Write output[0] last, to keep |result| in a register in minidumps */
+        result_hi = _mm_movehl_ps(result, result);
+        *((__m64 *)&output[2]) = _mm_cvtps_pi32(result_hi);
         *((__m64 *)&output[0]) = _mm_cvtps_pi32(result);
-        result = _mm_movehl_ps(result, result);
-        *((__m64 *)&output[2]) = _mm_cvtps_pi32(result);
-
-        /* load gamma values for next loop while store completes */
-        vec_r = _mm_load_ss(&igtbl_r[src[0]]);
-        vec_g = _mm_load_ss(&igtbl_g[src[1]]);
-        vec_b = _mm_load_ss(&igtbl_b[src[2]]);
-        src += 4;
 
         /* use calc'd indices to output RGB values */
         dest[OUTPUT_R_INDEX] = otdata_r[output[0]];
         dest[OUTPUT_G_INDEX] = otdata_g[output[1]];
         dest[OUTPUT_B_INDEX] = otdata_b[output[2]];
         dest += 4;
+
+        /* load gamma values for next loop while store completes */
+        vec_r = _mm_load_ss(&igtbl_r[src[0]]);
+        vec_g = _mm_load_ss(&igtbl_g[src[1]]);
+        vec_b = _mm_load_ss(&igtbl_b[src[2]]);
+        src += 4;
     }
 
     /* handle final (maybe only) pixel */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/src/FilterSupport.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/src/FilterSupport.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/src/FilterSupport.cpp	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/src/FilterSupport.cpp	2015-05-25 20:42:40.000000000 +0000
@@ -103,7 +103,7 @@
   {
     RefPtr<FilterNode> filter = aDT->CreateFilter(FilterType::UNPREMULTIPLY);
     filter->SetInput(IN_UNPREMULTIPLY_IN, aInput);
-    return filter;
+    return filter.forget();
   }
 
   static TemporaryRef<FilterNode>
@@ -111,7 +111,7 @@
   {
     RefPtr<FilterNode> filter = aDT->CreateFilter(FilterType::PREMULTIPLY);
     filter->SetInput(IN_PREMULTIPLY_IN, aInput);
-    return filter;
+    return filter.forget();
   }
 
   static TemporaryRef<FilterNode>
@@ -126,7 +126,7 @@
     transfer->SetAttribute(ATT_DISCRETE_TRANSFER_TABLE_B, glinearRGBTosRGBMap, 256);
     transfer->SetAttribute(ATT_DISCRETE_TRANSFER_DISABLE_A, true);
     transfer->SetInput(IN_DISCRETE_TRANSFER_IN, aInput);
-    return transfer;
+    return transfer.forget();
   }
 
   static TemporaryRef<FilterNode>
@@ -141,7 +141,7 @@
     transfer->SetAttribute(ATT_DISCRETE_TRANSFER_TABLE_B, gsRGBToLinearRGBMap, 256);
     transfer->SetAttribute(ATT_DISCRETE_TRANSFER_DISABLE_A, true);
     transfer->SetInput(IN_DISCRETE_TRANSFER_IN, aInput);
-    return transfer;
+    return transfer.forget();
   }
 
   static TemporaryRef<FilterNode>
@@ -150,7 +150,7 @@
     RefPtr<FilterNode> filter = aDT->CreateFilter(FilterType::CROP);
     filter->SetAttribute(ATT_CROP_RECT, Rect(aRect));
     filter->SetInput(IN_CROP_IN, aInputFilter);
-    return filter;
+    return filter.forget();
   }
 
   static TemporaryRef<FilterNode>
@@ -159,7 +159,7 @@
     RefPtr<FilterNode> filter = aDT->CreateFilter(FilterType::TRANSFORM);
     filter->SetAttribute(ATT_TRANSFORM_MATRIX, Matrix::Translation(aOffset.x, aOffset.y));
     filter->SetInput(IN_TRANSFORM_IN, aInputFilter);
-    return filter;
+    return filter.forget();
   }
 
   static TemporaryRef<FilterNode>
@@ -171,7 +171,7 @@
       RefPtr<FilterNode> filter = aDT->CreateFilter(FilterType::GAUSSIAN_BLUR);
       filter->SetAttribute(ATT_GAUSSIAN_BLUR_STD_DEVIATION, stdX);
       filter->SetInput(IN_GAUSSIAN_BLUR_IN, aInputFilter);
-      return filter;
+      return filter.forget();
     }
     RefPtr<FilterNode> filterH = aDT->CreateFilter(FilterType::DIRECTIONAL_BLUR);
     RefPtr<FilterNode> filterV = aDT->CreateFilter(FilterType::DIRECTIONAL_BLUR);
@@ -181,7 +181,7 @@
     filterV->SetAttribute(ATT_DIRECTIONAL_BLUR_STD_DEVIATION, stdY);
     filterH->SetInput(IN_DIRECTIONAL_BLUR_IN, aInputFilter);
     filterV->SetInput(IN_DIRECTIONAL_BLUR_IN, filterH);
-    return filterV;
+    return filterV.forget();
   }
 
   static TemporaryRef<FilterNode>
@@ -189,7 +189,7 @@
   {
     RefPtr<FilterNode> filter = aDT->CreateFilter(FilterType::FLOOD);
     filter->SetAttribute(ATT_FLOOD_COLOR, Color(0,0,0,0));
-    return filter;
+    return filter.forget();
   }
 
   static TemporaryRef<FilterNode>
@@ -200,7 +200,7 @@
     filter->SetAttribute(ATT_TRANSFORM_MATRIX,
       Matrix::Translation(aSurfacePosition.x, aSurfacePosition.y));
     filter->SetInput(IN_TRANSFORM_IN, aSurface);
-    return filter;
+    return filter.forget();
   }
 
   static TemporaryRef<FilterNode>
@@ -216,7 +216,7 @@
     transfer->SetAttribute(ATT_DISCRETE_TRANSFER_TABLE_B, &zero, 1);
     transfer->SetAttribute(ATT_DISCRETE_TRANSFER_DISABLE_A, true);
     transfer->SetInput(IN_DISCRETE_TRANSFER_IN, aInput);
-    return transfer;
+    return transfer.forget();
   }
 
 }
@@ -280,7 +280,8 @@
   if (!mFilterForColorModel[aColorModel.ToIndex()]) {
     mFilterForColorModel[aColorModel.ToIndex()] = WrapForColorModel(aColorModel);
   }
-  return mFilterForColorModel[aColorModel.ToIndex()];
+  RefPtr<FilterNode> filter(mFilterForColorModel[aColorModel.ToIndex()]);
+  return filter.forget();
 }
 
 TemporaryRef<FilterNode>
@@ -698,7 +699,7 @@
         filter->SetInput(IN_BLEND_IN, aSources[0]);
         filter->SetInput(IN_BLEND_IN2, aSources[1]);
       }
-      return filter;
+      return filter.forget();
     }
 
     case PrimitiveType::ColorMatrix:
@@ -707,7 +708,8 @@
       uint32_t type = atts.GetUint(eColorMatrixType);
       const nsTArray<float>& values = atts.GetFloats(eColorMatrixValues);
       if (NS_FAILED(ComputeColorMatrix(type, values, colorMatrix))) {
-        return aSources[0];
+        RefPtr<FilterNode> filter(aSources[0]);
+        return filter.forget();
       }
       Matrix5x4 matrix(colorMatrix[0], colorMatrix[5], colorMatrix[10],  colorMatrix[15],
                        colorMatrix[1], colorMatrix[6], colorMatrix[11],  colorMatrix[16],
@@ -718,7 +720,7 @@
       filter->SetAttribute(ATT_COLOR_MATRIX_MATRIX, matrix);
       filter->SetAttribute(ATT_COLOR_MATRIX_ALPHA_MODE, (uint32_t)ALPHA_MODE_STRAIGHT);
       filter->SetInput(IN_COLOR_MATRIX_IN, aSources[0]);
-      return filter;
+      return filter.forget();
     }
 
     case PrimitiveType::Morphology:
@@ -745,7 +747,7 @@
       filter->SetAttribute(ATT_MORPHOLOGY_RADII, IntSize(rx, ry));
       filter->SetAttribute(ATT_MORPHOLOGY_OPERATOR, (uint32_t)op);
       filter->SetInput(IN_MORPHOLOGY_IN, aSources[0]);
-      return filter;
+      return filter.forget();
     }
 
     case PrimitiveType::Flood:
@@ -753,7 +755,7 @@
       Color color = atts.GetColor(eFloodColor);
       RefPtr<FilterNode> filter = aDT->CreateFilter(FilterType::FLOOD);
       filter->SetAttribute(ATT_FLOOD_COLOR, color);
-      return filter;
+      return filter.forget();
     }
 
     case PrimitiveType::Tile:
@@ -761,7 +763,7 @@
       RefPtr<FilterNode> filter = aDT->CreateFilter(FilterType::TILE);
       filter->SetAttribute(ATT_TILE_SOURCE_RECT, aSourceRegions[0]);
       filter->SetInput(IN_TILE_IN, aSources[0]);
-      return filter;
+      return filter.forget();
     }
 
     case PrimitiveType::ComponentTransfer:
@@ -789,7 +791,7 @@
         }
       }
 
-      return lastFilter;
+      return lastFilter.forget();
     }
 
     case PrimitiveType::ConvolveMatrix:
@@ -820,7 +822,7 @@
       filter->SetAttribute(ATT_CONVOLVE_MATRIX_PRESERVE_ALPHA,
                            atts.GetBool(eConvolveMatrixPreserveAlpha));
       filter->SetInput(IN_CONVOLVE_MATRIX_IN, aSources[0]);
-      return filter;
+      return filter.forget();
     }
 
     case PrimitiveType::Offset:
@@ -847,7 +849,7 @@
                            (uint32_t)channel[atts.GetUint(eDisplacementMapYChannel)]);
       filter->SetInput(IN_DISPLACEMENT_MAP_IN, aSources[0]);
       filter->SetInput(IN_DISPLACEMENT_MAP_IN2, aSources[1]);
-      return filter;
+      return filter.forget();
     }
 
     case PrimitiveType::Turbulence:
@@ -898,7 +900,7 @@
         filter->SetInput(IN_COMPOSITE_IN_START, aSources[1]);
         filter->SetInput(IN_COMPOSITE_IN_START + 1, aSources[0]);
       }
-      return filter;
+      return filter.forget();
     }
 
     case PrimitiveType::Merge:
@@ -907,14 +909,15 @@
         return nullptr;
       }
       if (aSources.Length() == 1) {
-        return aSources[0];
+        RefPtr<FilterNode> filter(aSources[0]);
+        return filter.forget();
       }
       RefPtr<FilterNode> filter = aDT->CreateFilter(FilterType::COMPOSITE);
       filter->SetAttribute(ATT_COMPOSITE_OPERATOR, (uint32_t)COMPOSITE_OPERATOR_OVER);
       for (size_t i = 0; i < aSources.Length(); i++) {
         filter->SetInput(IN_COMPOSITE_IN_START + i, aSources[i]);
       }
-      return filter;
+      return filter.forget();
     }
 
     case PrimitiveType::GaussianBlur:
@@ -949,7 +952,7 @@
       filter->SetAttribute(ATT_COMPOSITE_OPERATOR, (uint32_t)COMPOSITE_OPERATOR_OVER);
       filter->SetInput(IN_COMPOSITE_IN_START, composite);
       filter->SetInput(IN_COMPOSITE_IN_START + 1, aSources[0]);
-      return filter;
+      return filter.forget();
     }
 
     case PrimitiveType::DiffuseLighting:
@@ -1021,7 +1024,7 @@
 
       filter->SetInput(IN_LIGHTING_IN, aSources[0]);
 
-      return filter;
+      return filter.forget();
     }
 
     case PrimitiveType::Image:
@@ -1040,7 +1043,7 @@
       transform->SetInput(IN_TRANSFORM_IN, inputImage);
       transform->SetAttribute(ATT_TRANSFORM_MATRIX, TM);
       transform->SetAttribute(ATT_TRANSFORM_FILTER, atts.GetUint(eImageFilter));
-      return transform;
+      return transform.forget();
     }
 
     case PrimitiveType::ToAlpha:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/src/nsRegion.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/src/nsRegion.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/src/nsRegion.h	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/src/nsRegion.h	2015-05-25 20:42:40.000000000 +0000
@@ -715,6 +715,12 @@
     return This();
   }
 
+  Derived& ScaleInverseRoundOut (float aXScale, float aYScale)
+  {
+    mImpl.ScaleInverseRoundOut(aXScale, aYScale);
+    return This();
+  }
+
   Derived& Transform (const gfx3DMatrix &aTransform)
   {
     mImpl.Transform(aTransform);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/tests/crashtests/crashtests.list firefox-trunk-41.0~a1~hg20150524r245419/gfx/tests/crashtests/crashtests.list
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/tests/crashtests/crashtests.list	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/tests/crashtests/crashtests.list	2015-05-25 20:42:40.000000000 +0000
@@ -102,7 +102,7 @@
 load 783041-2.html
 load 783041-3.html
 load 783041-4.html
-asserts-if(gtk2Widget,1) load 798853.html # bug 868792
+load 798853.html # bug 868792
 asserts-if(winWidget,0-1) skip-if(B2G) load 815489.html
 load 836225-1.html
 load 839745-1.html
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/tests/gtest/moz.build firefox-trunk-41.0~a1~hg20150524r245419/gfx/tests/gtest/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/tests/gtest/moz.build	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/tests/gtest/moz.build	2015-05-25 20:42:40.000000000 +0000
@@ -13,6 +13,7 @@
     'TestColorNames.cpp',
     'TestCompositor.cpp',
     'TestGfxPrefs.cpp',
+    'TestGfxWidgets.cpp',
     'TestLayers.cpp',
     'TestRegion.cpp',
     'TestSkipChars.cpp',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/tests/gtest/TestAsyncPanZoomController.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/tests/gtest/TestAsyncPanZoomController.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/tests/gtest/TestAsyncPanZoomController.cpp	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/tests/gtest/TestAsyncPanZoomController.cpp	2015-05-25 20:42:40.000000000 +0000
@@ -124,21 +124,27 @@
 
 class TestAPZCTreeManager : public APZCTreeManager {
 public:
+  explicit TestAPZCTreeManager(TimeStamp& aTime) : mTime(aTime) {}
+
   nsRefPtr<InputQueue> GetInputQueue() const {
     return mInputQueue;
   }
 
 protected:
   AsyncPanZoomController* MakeAPZCInstance(uint64_t aLayersId, GeckoContentController* aController) override;
+private:
+  TimeStamp& mTime;
 };
 
 class TestAsyncPanZoomController : public AsyncPanZoomController {
 public:
   TestAsyncPanZoomController(uint64_t aLayersId, GeckoContentController* aMcc,
                              TestAPZCTreeManager* aTreeManager,
+                             TimeStamp& aTime,
                              GestureBehavior aBehavior = DEFAULT_GESTURES)
     : AsyncPanZoomController(aLayersId, aTreeManager, aTreeManager->GetInputQueue(), aMcc, aBehavior)
     , mWaitForMainThread(false)
+    , mTime(aTime)
   {}
 
   nsEventStatus ReceiveInputEvent(const InputData& aEvent, ScrollableLayerGuid* aDummy, uint64_t* aOutInputBlockId) {
@@ -211,14 +217,25 @@
     mWaitForMainThread = true;
   }
 
+  TimeStamp GetFrameTime() const {
+    return mTime;
+  }
+
+  static TimeStamp GetStartupTime() {
+    static TimeStamp sStartupTime = TimeStamp::Now();
+    return sStartupTime;
+  }
+
 private:
   bool mWaitForMainThread;
+  TimeStamp& mTime;
 };
 
 AsyncPanZoomController*
 TestAPZCTreeManager::MakeAPZCInstance(uint64_t aLayersId, GeckoContentController* aController)
 {
-  return new TestAsyncPanZoomController(aLayersId, aController, this, AsyncPanZoomController::USE_GESTURE_DETECTOR);
+  return new TestAsyncPanZoomController(aLayersId, aController, this,
+      mTime, AsyncPanZoomController::USE_GESTURE_DETECTOR);
 }
 
 static FrameMetrics
@@ -248,12 +265,11 @@
     APZThreadUtils::SetThreadAssertionsEnabled(false);
     APZThreadUtils::SetControllerThread(MessageLoop::current());
 
-    testStartTime = TimeStamp::Now();
-    AsyncPanZoomController::SetFrameTime(testStartTime);
+    mTime = TimeStamp::Now();
 
     mcc = new NiceMock<MockContentControllerDelayed>();
-    tm = new TestAPZCTreeManager();
-    apzc = new TestAsyncPanZoomController(0, mcc, tm, mGestureBehavior);
+    tm = new TestAPZCTreeManager(mTime);
+    apzc = new TestAsyncPanZoomController(0, mcc, tm, mTime, mGestureBehavior);
     apzc->SetFrameMetrics(TestFrameMetrics());
   }
 
@@ -288,7 +304,7 @@
     apzc->UpdateZoomConstraints(ZoomConstraints(false, false, CSSToParentLayerScale(1.0f), CSSToParentLayerScale(1.0f)));
   }
 
-  void PanIntoOverscroll(int& aTime);
+  void PanIntoOverscroll();
 
   /**
    * Sample animations once, 1 ms later than the last sample.
@@ -298,8 +314,8 @@
     const TimeDuration increment = TimeDuration::FromMilliseconds(1);
     ParentLayerPoint pointOut;
     ViewTransform viewTransformOut;
-    testStartTime += increment;
-    apzc->SampleContentTransformForFrame(testStartTime, &viewTransformOut, pointOut);
+    mTime += increment;
+    apzc->SampleContentTransformForFrame(mTime, &viewTransformOut, pointOut);
   }
 
   /**
@@ -313,7 +329,7 @@
     bool recoveredFromOverscroll = false;
     ParentLayerPoint pointOut;
     ViewTransform viewTransformOut;
-    while (apzc->SampleContentTransformForFrame(testStartTime, &viewTransformOut, pointOut)) {
+    while (apzc->SampleContentTransformForFrame(mTime, &viewTransformOut, pointOut)) {
       // The reported scroll offset should be the same throughout.
       EXPECT_EQ(aExpectedScrollOffset, pointOut);
 
@@ -325,7 +341,7 @@
         recoveredFromOverscroll = true;
       }
 
-      testStartTime += increment;
+      mTime += increment;
     }
     EXPECT_TRUE(recoveredFromOverscroll);
     apzc->AssertStateIsReset();
@@ -334,7 +350,7 @@
   void TestOverscroll();
 
   AsyncPanZoomController::GestureBehavior mGestureBehavior;
-  TimeStamp testStartTime;
+  TimeStamp mTime;
   nsRefPtr<MockContentControllerDelayed> mcc;
   nsRefPtr<TestAPZCTreeManager> tm;
   nsRefPtr<TestAsyncPanZoomController> apzc;
@@ -399,32 +415,45 @@
   aTarget->SetAllowedTouchBehavior(aInputBlockId, defaultBehaviors);
 }
 
+static uint32_t
+MillisecondsSinceStartup(TimeStamp aTime)
+{
+  return (aTime - TestAsyncPanZoomController::GetStartupTime()).ToMilliseconds();
+}
+
+static MultiTouchInput
+CreateMultiTouchInput(MultiTouchInput::MultiTouchType aType, TimeStamp aTime)
+{
+  return MultiTouchInput(aType, MillisecondsSinceStartup(aTime), aTime, 0);
+}
+
 template<class InputReceiver> static nsEventStatus
-TouchDown(const nsRefPtr<InputReceiver>& aTarget, int aX, int aY, int aTime, uint64_t* aOutInputBlockId = nullptr)
+TouchDown(const nsRefPtr<InputReceiver>& aTarget, int aX, int aY, TimeStamp aTime, uint64_t* aOutInputBlockId = nullptr)
 {
-  MultiTouchInput mti = MultiTouchInput(MultiTouchInput::MULTITOUCH_START, aTime, TimeStamp(), 0);
+  MultiTouchInput mti = CreateMultiTouchInput(MultiTouchInput::MULTITOUCH_START, aTime);
   mti.mTouches.AppendElement(CreateSingleTouchData(0, aX, aY));
   return aTarget->ReceiveInputEvent(mti, nullptr, aOutInputBlockId);
 }
 
 template<class InputReceiver> static nsEventStatus
-TouchMove(const nsRefPtr<InputReceiver>& aTarget, int aX, int aY, int aTime)
+TouchMove(const nsRefPtr<InputReceiver>& aTarget, int aX, int aY, TimeStamp aTime)
 {
-  MultiTouchInput mti = MultiTouchInput(MultiTouchInput::MULTITOUCH_MOVE, aTime, TimeStamp(), 0);
+  MultiTouchInput mti = CreateMultiTouchInput(MultiTouchInput::MULTITOUCH_MOVE, aTime);
   mti.mTouches.AppendElement(CreateSingleTouchData(0, aX, aY));
   return aTarget->ReceiveInputEvent(mti, nullptr, nullptr);
 }
 
 template<class InputReceiver> static nsEventStatus
-TouchUp(const nsRefPtr<InputReceiver>& aTarget, int aX, int aY, int aTime)
+TouchUp(const nsRefPtr<InputReceiver>& aTarget, int aX, int aY, TimeStamp aTime)
 {
-  MultiTouchInput mti = MultiTouchInput(MultiTouchInput::MULTITOUCH_END, aTime, TimeStamp(), 0);
+  MultiTouchInput mti = CreateMultiTouchInput(MultiTouchInput::MULTITOUCH_END, aTime);
   mti.mTouches.AppendElement(CreateSingleTouchData(0, aX, aY));
   return aTarget->ReceiveInputEvent(mti, nullptr, nullptr);
 }
 
 template<class InputReceiver> static void
-Tap(const nsRefPtr<InputReceiver>& aTarget, int aX, int aY, int& aTime, int aTapLength,
+Tap(const nsRefPtr<InputReceiver>& aTarget, int aX, int aY, TimeStamp& aTime,
+    TimeDuration aTapLength,
     nsEventStatus (*aOutEventStatuses)[2] = nullptr,
     uint64_t* aOutInputBlockId = nullptr)
 {
@@ -454,7 +483,8 @@
 }
 
 template<class InputReceiver> static void
-TapAndCheckStatus(const nsRefPtr<InputReceiver>& aTarget, int aX, int aY, int& aTime, int aTapLength)
+TapAndCheckStatus(const nsRefPtr<InputReceiver>& aTarget, int aX, int aY,
+    TimeStamp& aTime, TimeDuration aTapLength)
 {
   nsEventStatus statuses[2];
   Tap(aTarget, aX, aY, aTime, aTapLength, &statuses);
@@ -464,9 +494,9 @@
 
 template<class InputReceiver> static void
 Pan(const nsRefPtr<InputReceiver>& aTarget,
-    int& aTime,
-    int aTouchStartY,
-    int aTouchEndY,
+    TimeStamp& aTime,
+    const ScreenPoint& aTouchStart,
+    const ScreenPoint& aTouchEnd,
     bool aKeepFingerDown = false,
     nsTArray<uint32_t>* aAllowedTouchBehaviors = nullptr,
     nsEventStatus (*aOutEventStatuses)[4] = nullptr,
@@ -479,7 +509,7 @@
   gfxPrefs::SetAPZTouchStartTolerance(1.0f / 1000.0f);
   const int OVERCOME_TOUCH_TOLERANCE = 1;
 
-  const int TIME_BETWEEN_TOUCH_EVENT = 100;
+  const TimeDuration TIME_BETWEEN_TOUCH_EVENT = TimeDuration::FromMilliseconds(100);
 
   // Even if the caller doesn't care about the block id, we need it to set the
   // allowed touch behaviour below, so make sure aOutInputBlockId is non-null.
@@ -489,7 +519,7 @@
   }
 
   // Make sure the move is large enough to not be handled as a tap
-  nsEventStatus status = TouchDown(aTarget, 10, aTouchStartY + OVERCOME_TOUCH_TOLERANCE, aTime, aOutInputBlockId);
+  nsEventStatus status = TouchDown(aTarget, aTouchStart.x, aTouchStart.y + OVERCOME_TOUCH_TOLERANCE, aTime, aOutInputBlockId);
   if (aOutEventStatuses) {
     (*aOutEventStatuses)[0] = status;
   }
@@ -506,14 +536,14 @@
     }
   }
 
-  status = TouchMove(aTarget, 10, aTouchStartY, aTime);
+  status = TouchMove(aTarget, aTouchStart.x, aTouchStart.y, aTime);
   if (aOutEventStatuses) {
     (*aOutEventStatuses)[1] = status;
   }
 
   aTime += TIME_BETWEEN_TOUCH_EVENT;
 
-  status = TouchMove(aTarget, 10, aTouchEndY, aTime);
+  status = TouchMove(aTarget, aTouchEnd.x, aTouchEnd.y, aTime);
   if (aOutEventStatuses) {
     (*aOutEventStatuses)[2] = status;
   }
@@ -521,7 +551,7 @@
   aTime += TIME_BETWEEN_TOUCH_EVENT;
 
   if (!aKeepFingerDown) {
-    status = TouchUp(aTarget, 10, aTouchEndY, aTime);
+    status = TouchUp(aTarget, aTouchEnd.x, aTouchEnd.y, aTime);
   } else {
     status = nsEventStatus_eIgnore;
   }
@@ -529,7 +559,26 @@
     (*aOutEventStatuses)[3] = status;
   }
 
-  aTime += TIME_BETWEEN_TOUCH_EVENT;
+  // Don't increment the time here. Animations started on touch-up, such as
+  // flings, are affected by elapsed time, and we want to be able to sample
+  // them immediately after they start, without time having elapsed.
+}
+
+// A version of Pan() that only takes y coordinates rather than (x, y) points
+// for the touch start and end points, and uses 10 for the x coordinates.
+// This is for convenience, as most tests only need to pan in one direction.
+template<class InputReceiver> static void
+Pan(const nsRefPtr<InputReceiver>& aTarget,
+    TimeStamp& aTime,
+    int aTouchStartY,
+    int aTouchEndY,
+    bool aKeepFingerDown = false,
+    nsTArray<uint32_t>* aAllowedTouchBehaviors = nullptr,
+    nsEventStatus (*aOutEventStatuses)[4] = nullptr,
+    uint64_t* aOutInputBlockId = nullptr)
+{
+  ::Pan(aTarget, aTime, ScreenPoint(10, aTouchStartY), ScreenPoint(10, aTouchEndY),
+      aKeepFingerDown, aAllowedTouchBehaviors, aOutEventStatuses, aOutInputBlockId);
 }
 
 /*
@@ -538,7 +587,7 @@
  */
 template<class InputReceiver> static void
 PanAndCheckStatus(const nsRefPtr<InputReceiver>& aTarget,
-                  int& aTime,
+                  TimeStamp& aTime,
                   int aTouchStartY,
                   int aTouchEndY,
                   bool aExpectConsumed,
@@ -562,7 +611,7 @@
 
 static void
 ApzcPanNoFling(const nsRefPtr<TestAsyncPanZoomController>& aApzc,
-               int& aTime,
+               TimeStamp& aTime,
                int aTouchStartY,
                int aTouchEndY,
                uint64_t* aOutInputBlockId = nullptr)
@@ -877,7 +926,7 @@
 TEST_F(APZCBasicTester, SimpleTransform) {
   ParentLayerPoint pointOut;
   ViewTransform viewTransformOut;
-  apzc->SampleContentTransformForFrame(testStartTime, &viewTransformOut, pointOut);
+  apzc->SampleContentTransformForFrame(mTime, &viewTransformOut, pointOut);
 
   EXPECT_EQ(ParentLayerPoint(), pointOut);
   EXPECT_EQ(ViewTransform(), viewTransformOut);
@@ -900,7 +949,8 @@
   // CSS pixels). The displayport is 1 extra CSS pixel on all
   // sides.
 
-  nsRefPtr<TestAsyncPanZoomController> childApzc = new TestAsyncPanZoomController(0, mcc, tm);
+  nsRefPtr<TestAsyncPanZoomController> childApzc =
+      new TestAsyncPanZoomController(0, mcc, tm, mTime);
 
   const char* layerTreeSyntax = "c(c)";
   // LayerID                     0 1
@@ -945,39 +995,39 @@
   // initial transform
   apzc->SetFrameMetrics(metrics);
   apzc->NotifyLayersUpdated(metrics, true);
-  apzc->SampleContentTransformForFrame(testStartTime, &viewTransformOut, pointOut);
+  apzc->SampleContentTransformForFrame(mTime, &viewTransformOut, pointOut);
   EXPECT_EQ(ViewTransform(LayerToParentLayerScale(1), ParentLayerPoint()), viewTransformOut);
   EXPECT_EQ(ParentLayerPoint(60, 60), pointOut);
 
   childApzc->SetFrameMetrics(childMetrics);
   childApzc->NotifyLayersUpdated(childMetrics, true);
-  childApzc->SampleContentTransformForFrame(testStartTime, &viewTransformOut, pointOut);
+  childApzc->SampleContentTransformForFrame(mTime, &viewTransformOut, pointOut);
   EXPECT_EQ(ViewTransform(LayerToParentLayerScale(1), ParentLayerPoint()), viewTransformOut);
   EXPECT_EQ(ParentLayerPoint(60, 60), pointOut);
 
   // do an async scroll by 5 pixels and check the transform
   metrics.ScrollBy(CSSPoint(5, 0));
   apzc->SetFrameMetrics(metrics);
-  apzc->SampleContentTransformForFrame(testStartTime, &viewTransformOut, pointOut);
+  apzc->SampleContentTransformForFrame(mTime, &viewTransformOut, pointOut);
   EXPECT_EQ(ViewTransform(LayerToParentLayerScale(1), ParentLayerPoint(-30, 0)), viewTransformOut);
   EXPECT_EQ(ParentLayerPoint(90, 60), pointOut);
 
   childMetrics.ScrollBy(CSSPoint(5, 0));
   childApzc->SetFrameMetrics(childMetrics);
-  childApzc->SampleContentTransformForFrame(testStartTime, &viewTransformOut, pointOut);
+  childApzc->SampleContentTransformForFrame(mTime, &viewTransformOut, pointOut);
   EXPECT_EQ(ViewTransform(LayerToParentLayerScale(1), ParentLayerPoint(-30, 0)), viewTransformOut);
   EXPECT_EQ(ParentLayerPoint(90, 60), pointOut);
 
   // do an async zoom of 1.5x and check the transform
   metrics.ZoomBy(1.5f);
   apzc->SetFrameMetrics(metrics);
-  apzc->SampleContentTransformForFrame(testStartTime, &viewTransformOut, pointOut);
+  apzc->SampleContentTransformForFrame(mTime, &viewTransformOut, pointOut);
   EXPECT_EQ(ViewTransform(LayerToParentLayerScale(1.5), ParentLayerPoint(-45, 0)), viewTransformOut);
   EXPECT_EQ(ParentLayerPoint(135, 90), pointOut);
 
   childMetrics.ZoomBy(1.5f);
   childApzc->SetFrameMetrics(childMetrics);
-  childApzc->SampleContentTransformForFrame(testStartTime, &viewTransformOut, pointOut);
+  childApzc->SampleContentTransformForFrame(mTime, &viewTransformOut, pointOut);
   EXPECT_EQ(ViewTransform(LayerToParentLayerScale(1.5), ParentLayerPoint(-45, 0)), viewTransformOut);
   EXPECT_EQ(ParentLayerPoint(135, 90), pointOut);
 
@@ -996,7 +1046,6 @@
       EXPECT_CALL(*mcc, RequestContentRepaint(_)).Times(0);
     }
 
-    int time = 0;
     int touchStart = 50;
     int touchEnd = 10;
     ParentLayerPoint pointOut;
@@ -1006,8 +1055,8 @@
     allowedTouchBehaviors.AppendElement(aBehavior);
 
     // Pan down
-    PanAndCheckStatus(apzc, time, touchStart, touchEnd, aShouldBeConsumed, &allowedTouchBehaviors);
-    apzc->SampleContentTransformForFrame(testStartTime, &viewTransformOut, pointOut);
+    PanAndCheckStatus(apzc, mTime, touchStart, touchEnd, aShouldBeConsumed, &allowedTouchBehaviors);
+    apzc->SampleContentTransformForFrame(mTime, &viewTransformOut, pointOut);
 
     if (aShouldTriggerScroll) {
       EXPECT_EQ(ParentLayerPoint(0, -(touchEnd-touchStart)), pointOut);
@@ -1022,8 +1071,8 @@
     apzc->CancelAnimation();
 
     // Pan back
-    PanAndCheckStatus(apzc, time, touchEnd, touchStart, aShouldBeConsumed, &allowedTouchBehaviors);
-    apzc->SampleContentTransformForFrame(testStartTime, &viewTransformOut, pointOut);
+    PanAndCheckStatus(apzc, mTime, touchEnd, touchStart, aShouldBeConsumed, &allowedTouchBehaviors);
+    apzc->SampleContentTransformForFrame(mTime, &viewTransformOut, pointOut);
 
     EXPECT_EQ(ParentLayerPoint(), pointOut);
     EXPECT_EQ(ViewTransform(), viewTransformOut);
@@ -1033,7 +1082,6 @@
   {
     MakeApzcWaitForMainThread();
 
-    int time = 0;
     int touchStart = 50;
     int touchEnd = 10;
     ParentLayerPoint pointOut;
@@ -1043,7 +1091,7 @@
     // Pan down
     nsTArray<uint32_t> allowedTouchBehaviors;
     allowedTouchBehaviors.AppendElement(mozilla::layers::AllowedTouchBehavior::VERTICAL_PAN);
-    PanAndCheckStatus(apzc, time, touchStart, touchEnd, true, &allowedTouchBehaviors, &blockId);
+    PanAndCheckStatus(apzc, mTime, touchStart, touchEnd, true, &allowedTouchBehaviors, &blockId);
 
     // Send the signal that content has handled and preventDefaulted the touch
     // events. This flushes the event queue.
@@ -1052,7 +1100,7 @@
     // prevent-default timer).
     EXPECT_LE(1, mcc->RunThroughDelayedTasks());
 
-    apzc->SampleContentTransformForFrame(testStartTime, &viewTransformOut, pointOut);
+    apzc->SampleContentTransformForFrame(mTime, &viewTransformOut, pointOut);
     EXPECT_EQ(ParentLayerPoint(), pointOut);
     EXPECT_EQ(ViewTransform(), viewTransformOut);
 
@@ -1108,17 +1156,16 @@
   EXPECT_CALL(*mcc, SendAsyncScrollDOMEvent(_,_,_)).Times(AtLeast(1));
   EXPECT_CALL(*mcc, RequestContentRepaint(_)).Times(1);
 
-  int time = 0;
   int touchStart = 50;
   int touchEnd = 10;
   ParentLayerPoint pointOut;
   ViewTransform viewTransformOut;
 
   // Fling down. Each step scroll further down
-  Pan(apzc, time, touchStart, touchEnd);
+  Pan(apzc, mTime, touchStart, touchEnd);
   ParentLayerPoint lastPoint;
   for (int i = 1; i < 50; i+=1) {
-    apzc->SampleContentTransformForFrame(testStartTime+TimeDuration::FromMilliseconds(i), &viewTransformOut, pointOut);
+    apzc->SampleContentTransformForFrame(mTime+TimeDuration::FromMilliseconds(i), &viewTransformOut, pointOut);
     EXPECT_GT(pointOut.y, lastPoint.y);
     lastPoint = pointOut;
   }
@@ -1129,24 +1176,23 @@
   SCOPED_GFX_PREF(APZOverscrollEnabled, bool, true);
 
   // Scroll down by 25 px. Don't fling for simplicity.
-  int time = 0;
-  ApzcPanNoFling(apzc, time, 50, 25);
+  ApzcPanNoFling(apzc, mTime, 50, 25);
 
   // Now scroll back up by 20px, this time flinging after.
   // The fling should cover the remaining 5 px of room to scroll, then
   // go into overscroll, and finally snap-back to recover from overscroll.
-  Pan(apzc, time, 25, 45);
+  Pan(apzc, mTime, 25, 45);
   const TimeDuration increment = TimeDuration::FromMilliseconds(1);
   bool reachedOverscroll = false;
   bool recoveredFromOverscroll = false;
-  while (apzc->AdvanceAnimations(testStartTime)) {
+  while (apzc->AdvanceAnimations(mTime)) {
     if (!reachedOverscroll && apzc->IsOverscrolled()) {
       reachedOverscroll = true;
     }
     if (reachedOverscroll && !apzc->IsOverscrolled()) {
       recoveredFromOverscroll = true;
     }
-    testStartTime += increment;
+    mTime += increment;
   }
   EXPECT_TRUE(reachedOverscroll);
   EXPECT_TRUE(recoveredFromOverscroll);
@@ -1182,28 +1228,26 @@
     EXPECT_CALL(check, Call("Done"));
   }
 
-  int time = 0;
   check.Call("Simple pan");
-  ApzcPanNoFling(apzc, time, 50, 25);
+  ApzcPanNoFling(apzc, mTime, 50, 25);
   check.Call("Complex pan");
-  Pan(apzc, time, 25, 45);
-  apzc->AdvanceAnimationsUntilEnd(testStartTime);
+  Pan(apzc, mTime, 25, 45);
+  apzc->AdvanceAnimationsUntilEnd(mTime);
   check.Call("Done");
 }
 
-void APZCBasicTester::PanIntoOverscroll(int& aTime)
+void APZCBasicTester::PanIntoOverscroll()
 {
   int touchStart = 500;
   int touchEnd = 10;
-  Pan(apzc, aTime, touchStart, touchEnd);
+  Pan(apzc, mTime, touchStart, touchEnd);
   EXPECT_TRUE(apzc->IsOverscrolled());
 }
 
 void APZCBasicTester::TestOverscroll()
 {
   // Pan sufficiently to hit overscroll behavior
-  int time = 0;
-  PanIntoOverscroll(time);
+  PanIntoOverscroll();
 
   // Check that we recover from overscroll via an animation.
   ParentLayerPoint expectedScrollOffset(0, GetScrollRange().YMost());
@@ -1246,8 +1290,7 @@
   SCOPED_GFX_PREF(APZOverscrollStopDistanceThreshold, float, 0.1f);
 
   // Pan sufficiently to hit overscroll behavior
-  int time = 0;
-  PanIntoOverscroll(time);
+  PanIntoOverscroll();
 
   // Sample animations once, to give the fling animation started on touch-up
   // a chance to realize it's overscrolled, and schedule a call to
@@ -1266,8 +1309,8 @@
   // to schedule a new one since we're still overscrolled. We don't pan because
   // panning can trigger functions that clear the overscroll animation state
   // in other ways.
-  TouchDown(apzc, 10, 10, time, nullptr);
-  TouchUp(apzc, 10, 10, time);
+  TouchDown(apzc, 10, 10, mTime, nullptr);
+  TouchUp(apzc, 10, 10, mTime);
 
   // Sample the second overscroll animation to its end.
   // If the ending of the first overscroll animation fails to clear state
@@ -1280,10 +1323,9 @@
   SCOPED_GFX_PREF(APZOverscrollEnabled, bool, true);
 
   // Pan sufficiently to hit overscroll behavior
-  int time = 0;
   int touchStart = 500;
   int touchEnd = 10;
-  Pan(apzc, time, touchStart, touchEnd);
+  Pan(apzc, mTime, touchStart, touchEnd);
   EXPECT_TRUE(apzc->IsOverscrolled());
 
   ParentLayerPoint pointOut;
@@ -1291,7 +1333,7 @@
 
   // This sample call will run to the end of the fling animation
   // and will schedule the overscroll animation.
-  apzc->SampleContentTransformForFrame(testStartTime + TimeDuration::FromMilliseconds(10000), &viewTransformOut, pointOut);
+  apzc->SampleContentTransformForFrame(mTime + TimeDuration::FromMilliseconds(10000), &viewTransformOut, pointOut);
   EXPECT_TRUE(apzc->IsOverscrolled());
 
   // At this point, we have an active overscroll animation.
@@ -1306,10 +1348,9 @@
 
   // Pan sufficiently to hit overscroll behaviour. Keep the finger down so
   // the pan does not end.
-  int time = 0;
   int touchStart = 500;
   int touchEnd = 10;
-  Pan(apzc, time, touchStart, touchEnd, true); // keep finger down
+  Pan(apzc, mTime, touchStart, touchEnd, true); // keep finger down
   EXPECT_TRUE(apzc->IsOverscrolled());
 
   // Check that calling CancelAnimation() while the user is still panning
@@ -1330,12 +1371,11 @@
   // is at a slow velocity, and we check that the tap does trigger sending
   // a tap to content. See bug 1022956.
   void DoFlingStopTest(bool aSlow) {
-    int time = 0;
     int touchStart = 50;
     int touchEnd = 10;
 
     // Start the fling down.
-    Pan(apzc, time, touchStart, touchEnd);
+    Pan(apzc, mTime, touchStart, touchEnd);
     // The touchstart from the pan will leave some cancelled tasks in the queue, clear them out
     while (mcc->RunThroughDelayedTasks());
 
@@ -1348,23 +1388,23 @@
     // Advance the fling animation by timeDelta milliseconds.
     ParentLayerPoint pointOut;
     ViewTransform viewTransformOut;
-    apzc->SampleContentTransformForFrame(testStartTime + TimeDuration::FromMilliseconds(timeDelta), &viewTransformOut, pointOut);
+    apzc->SampleContentTransformForFrame(mTime + TimeDuration::FromMilliseconds(timeDelta), &viewTransformOut, pointOut);
 
     // Deliver a tap to abort the fling. Ensure that we get a HandleSingleTap
     // call out of it if and only if the fling is slow.
     EXPECT_CALL(*mcc, HandleSingleTap(_, 0, apzc->GetGuid())).Times(tapCallsExpected);
-    Tap(apzc, 10, 10, time, 0);
+    Tap(apzc, 10, 10, mTime, 0);
     while (mcc->RunThroughDelayedTasks());
 
     // Deliver another tap, to make sure that taps are flowing properly once
     // the fling is aborted.
-    time += 500;
-    Tap(apzc, 100, 100, time, 0);
+    mTime += TimeDuration::FromMilliseconds(500);
+    Tap(apzc, 100, 100, mTime, 0);
     while (mcc->RunThroughDelayedTasks());
 
     // Verify that we didn't advance any further after the fling was aborted, in either case.
     ParentLayerPoint finalPointOut;
-    apzc->SampleContentTransformForFrame(testStartTime + TimeDuration::FromMilliseconds(timeDelta + 1000), &viewTransformOut, finalPointOut);
+    apzc->SampleContentTransformForFrame(mTime + TimeDuration::FromMilliseconds(timeDelta + 1000), &viewTransformOut, finalPointOut);
     EXPECT_EQ(pointOut.x, finalPointOut.x);
     EXPECT_EQ(pointOut.y, finalPointOut.y);
 
@@ -1374,28 +1414,27 @@
   void DoFlingStopWithSlowListener(bool aPreventDefault) {
     MakeApzcWaitForMainThread();
 
-    int time = 0;
     int touchStart = 50;
     int touchEnd = 10;
     uint64_t blockId = 0;
 
     // Start the fling down.
-    Pan(apzc, time, touchStart, touchEnd, false, nullptr, nullptr, &blockId);
+    Pan(apzc, mTime, touchStart, touchEnd, false, nullptr, nullptr, &blockId);
     apzc->ContentReceivedInputBlock(blockId, false);
     while (mcc->RunThroughDelayedTasks());
 
     // Sample the fling a couple of times to ensure it's going.
     ParentLayerPoint point, finalPoint;
     ViewTransform viewTransform;
-    apzc->SampleContentTransformForFrame(testStartTime + TimeDuration::FromMilliseconds(10), &viewTransform, point);
-    apzc->SampleContentTransformForFrame(testStartTime + TimeDuration::FromMilliseconds(20), &viewTransform, finalPoint);
+    apzc->SampleContentTransformForFrame(mTime + TimeDuration::FromMilliseconds(10), &viewTransform, point);
+    apzc->SampleContentTransformForFrame(mTime + TimeDuration::FromMilliseconds(20), &viewTransform, finalPoint);
     EXPECT_GT(finalPoint.y, point.y);
 
     // Now we put our finger down to stop the fling
-    TouchDown(apzc, 10, 10, time, &blockId);
+    TouchDown(apzc, 10, 10, mTime, &blockId);
 
     // Re-sample to make sure it hasn't moved
-    apzc->SampleContentTransformForFrame(testStartTime + TimeDuration::FromMilliseconds(30), &viewTransform, point);
+    apzc->SampleContentTransformForFrame(mTime + TimeDuration::FromMilliseconds(30), &viewTransform, point);
     EXPECT_EQ(finalPoint.x, point.x);
     EXPECT_EQ(finalPoint.y, point.y);
 
@@ -1405,12 +1444,12 @@
     while (mcc->RunThroughDelayedTasks());
 
     // Verify the page hasn't moved
-    apzc->SampleContentTransformForFrame(testStartTime + TimeDuration::FromMilliseconds(100), &viewTransform, point);
+    apzc->SampleContentTransformForFrame(mTime + TimeDuration::FromMilliseconds(100), &viewTransform, point);
     EXPECT_EQ(finalPoint.x, point.x);
     EXPECT_EQ(finalPoint.y, point.y);
 
     // clean up
-    TouchUp(apzc, 10, 10, time);
+    TouchUp(apzc, 10, 10, mTime);
     while (mcc->RunThroughDelayedTasks());
 
     apzc->AssertStateIsReset();
@@ -1436,8 +1475,7 @@
 TEST_F(APZCGestureDetectorTester, ShortPress) {
   MakeApzcUnzoomable();
 
-  int time = 0;
-  TapAndCheckStatus(apzc, 10, 10, time, 100);
+  TapAndCheckStatus(apzc, 10, 10, mTime, TimeDuration::FromMilliseconds(100));
   // There will be delayed tasks posted for the long-tap and MAX_TAP timeouts, but
   // we want to clear those.
   mcc->ClearDelayedTask();
@@ -1456,8 +1494,7 @@
 TEST_F(APZCGestureDetectorTester, MediumPress) {
   MakeApzcUnzoomable();
 
-  int time = 0;
-  TapAndCheckStatus(apzc, 10, 10, time, 400);
+  TapAndCheckStatus(apzc, 10, 10, mTime, TimeDuration::FromMilliseconds(400));
   // There will be delayed tasks posted for the long-tap and MAX_TAP timeouts, but
   // we want to clear those.
   mcc->ClearDelayedTask();
@@ -1478,10 +1515,9 @@
   void DoLongPressTest(uint32_t aBehavior) {
     MakeApzcUnzoomable();
 
-    int time = 0;
     uint64_t blockId = 0;
 
-    nsEventStatus status = TouchDown(apzc, 10, 10, time, &blockId);
+    nsEventStatus status = TouchDown(apzc, 10, 10, mTime, &blockId);
     EXPECT_EQ(nsEventStatus_eConsumeDoDefault, status);
 
     if (gfxPrefs::TouchActionEnabled() && status != nsEventStatus_eConsumeNoDefault) {
@@ -1528,12 +1564,12 @@
     mcc->CheckHasDelayedTask();
     mcc->RunDelayedTask();
 
-    time += 1000;
+    mTime += TimeDuration::FromMilliseconds(1000);
 
     // Finally, simulate lifting the finger. Since the long-press wasn't
     // prevent-defaulted, we should get a long-tap-up event.
     check.Call("preHandleSingleTap");
-    status = TouchUp(apzc, 10, 10, time);
+    status = TouchUp(apzc, 10, 10, mTime);
     mcc->RunDelayedTask();
     EXPECT_EQ(nsEventStatus_eConsumeDoDefault, status);
     check.Call("postHandleSingleTap");
@@ -1551,9 +1587,8 @@
         touchStartY = 10,
         touchEndY = 50;
 
-    int time = 0;
     uint64_t blockId = 0;
-    nsEventStatus status = TouchDown(apzc, touchX, touchStartY, time, &blockId);
+    nsEventStatus status = TouchDown(apzc, touchX, touchStartY, mTime, &blockId);
     EXPECT_EQ(nsEventStatus_eConsumeDoDefault, status);
 
     if (gfxPrefs::TouchActionEnabled() && status != nsEventStatus_eConsumeNoDefault) {
@@ -1595,20 +1630,20 @@
     mcc->CheckHasDelayedTask();
     mcc->RunDelayedTask();
 
-    time += 1000;
+    mTime += TimeDuration::FromMilliseconds(1000);
 
-    MultiTouchInput mti = MultiTouchInput(MultiTouchInput::MULTITOUCH_MOVE, time, TimeStamp(), 0);
+    MultiTouchInput mti = CreateMultiTouchInput(MultiTouchInput::MULTITOUCH_MOVE, mTime);
     mti.mTouches.AppendElement(SingleTouchData(0, ParentLayerPoint(touchX, touchEndY), ScreenSize(0, 0), 0, 0));
     status = apzc->ReceiveInputEvent(mti, nullptr);
     EXPECT_EQ(nsEventStatus_eConsumeDoDefault, status);
 
     EXPECT_CALL(*mcc, HandleSingleTap(CSSPoint(touchX, touchEndY), 0, apzc->GetGuid())).Times(0);
-    status = TouchUp(apzc, touchX, touchEndY, time);
+    status = TouchUp(apzc, touchX, touchEndY, mTime);
     EXPECT_EQ(nsEventStatus_eConsumeDoDefault, status);
 
     ParentLayerPoint pointOut;
     ViewTransform viewTransformOut;
-    apzc->SampleContentTransformForFrame(testStartTime, &viewTransformOut, pointOut);
+    apzc->SampleContentTransformForFrame(mTime, &viewTransformOut, pointOut);
 
     EXPECT_EQ(ParentLayerPoint(), pointOut);
     EXPECT_EQ(ViewTransform(), viewTransformOut);
@@ -1642,7 +1677,7 @@
 }
 
 template<class InputReceiver> static void
-DoubleTap(const nsRefPtr<InputReceiver>& aTarget, int aX, int aY, int& aTime,
+DoubleTap(const nsRefPtr<InputReceiver>& aTarget, int aX, int aY, TimeStamp& aTime,
           nsEventStatus (*aOutEventStatuses)[4] = nullptr,
           uint64_t (*aOutInputBlockIds)[2] = nullptr)
 {
@@ -1654,7 +1689,7 @@
   if (aOutInputBlockIds) {
     (*aOutInputBlockIds)[0] = blockId;
   }
-  aTime += 10;
+  aTime += TimeDuration::FromMilliseconds(10);
 
   // If touch-action is enabled then simulate the allowed touch behaviour
   // notification that the main thread is supposed to deliver.
@@ -1666,7 +1701,7 @@
   if (aOutEventStatuses) {
     (*aOutEventStatuses)[1] = status;
   }
-  aTime += 10;
+  aTime += TimeDuration::FromMilliseconds(10);
   status = TouchDown(aTarget, aX, aY, aTime, &blockId);
   if (aOutEventStatuses) {
     (*aOutEventStatuses)[2] = status;
@@ -1674,7 +1709,7 @@
   if (aOutInputBlockIds) {
     (*aOutInputBlockIds)[1] = blockId;
   }
-  aTime += 10;
+  aTime += TimeDuration::FromMilliseconds(10);
 
   if (gfxPrefs::TouchActionEnabled() && status != nsEventStatus_eConsumeNoDefault) {
     SetDefaultAllowedTouchBehavior(aTarget, blockId);
@@ -1687,7 +1722,8 @@
 }
 
 template<class InputReceiver> static void
-DoubleTapAndCheckStatus(const nsRefPtr<InputReceiver>& aTarget, int aX, int aY, int& aTime, uint64_t (*aOutInputBlockIds)[2] = nullptr)
+DoubleTapAndCheckStatus(const nsRefPtr<InputReceiver>& aTarget, int aX, int aY,
+    TimeStamp& aTime, uint64_t (*aOutInputBlockIds)[2] = nullptr)
 {
   nsEventStatus statuses[4];
   DoubleTap(aTarget, aX, aY, aTime, &statuses, aOutInputBlockIds);
@@ -1704,9 +1740,8 @@
   EXPECT_CALL(*mcc, HandleSingleTap(CSSPoint(10, 10), 0, apzc->GetGuid())).Times(0);
   EXPECT_CALL(*mcc, HandleDoubleTap(CSSPoint(10, 10), 0, apzc->GetGuid())).Times(1);
 
-  int time = 0;
   uint64_t blockIds[2];
-  DoubleTapAndCheckStatus(apzc, 10, 10, time, &blockIds);
+  DoubleTapAndCheckStatus(apzc, 10, 10, mTime, &blockIds);
 
   // responses to the two touchstarts
   apzc->ContentReceivedInputBlock(blockIds[0], false);
@@ -1724,9 +1759,8 @@
   EXPECT_CALL(*mcc, HandleSingleTap(CSSPoint(10, 10), 0, apzc->GetGuid())).Times(2);
   EXPECT_CALL(*mcc, HandleDoubleTap(CSSPoint(10, 10), 0, apzc->GetGuid())).Times(0);
 
-  int time = 0;
   uint64_t blockIds[2];
-  DoubleTapAndCheckStatus(apzc, 10, 10, time, &blockIds);
+  DoubleTapAndCheckStatus(apzc, 10, 10, mTime, &blockIds);
 
   // responses to the two touchstarts
   apzc->ContentReceivedInputBlock(blockIds[0], false);
@@ -1744,9 +1778,8 @@
   EXPECT_CALL(*mcc, HandleSingleTap(CSSPoint(10, 10), 0, apzc->GetGuid())).Times(1);
   EXPECT_CALL(*mcc, HandleDoubleTap(CSSPoint(10, 10), 0, apzc->GetGuid())).Times(0);
 
-  int time = 0;
   uint64_t blockIds[2];
-  DoubleTapAndCheckStatus(apzc, 10, 10, time, &blockIds);
+  DoubleTapAndCheckStatus(apzc, 10, 10, mTime, &blockIds);
 
   // responses to the two touchstarts
   apzc->ContentReceivedInputBlock(blockIds[0], true);
@@ -1764,9 +1797,8 @@
   EXPECT_CALL(*mcc, HandleSingleTap(CSSPoint(10, 10), 0, apzc->GetGuid())).Times(0);
   EXPECT_CALL(*mcc, HandleDoubleTap(CSSPoint(10, 10), 0, apzc->GetGuid())).Times(0);
 
-  int time = 0;
   uint64_t blockIds[2];
-  DoubleTapAndCheckStatus(apzc, 10, 10, time, &blockIds);
+  DoubleTapAndCheckStatus(apzc, 10, 10, mTime, &blockIds);
 
   // responses to the two touchstarts
   apzc->ContentReceivedInputBlock(blockIds[0], true);
@@ -1784,17 +1816,16 @@
 
   EXPECT_CALL(*mcc, HandleSingleTap(CSSPoint(10, 10), 0, apzc->GetGuid())).Times(1);
 
-  int time = 0;
-  Tap(apzc, 10, 10, time, 100);
+  Tap(apzc, 10, 10, mTime, TimeDuration::FromMilliseconds(100));
 
   int inputId = 0;
   MultiTouchInput mti;
-  mti = MultiTouchInput(MultiTouchInput::MULTITOUCH_START, time, TimeStamp(), 0);
+  mti = CreateMultiTouchInput(MultiTouchInput::MULTITOUCH_START, mTime);
   mti.mTouches.AppendElement(SingleTouchData(inputId, ParentLayerPoint(20, 20), ScreenSize(0, 0), 0, 0));
   mti.mTouches.AppendElement(SingleTouchData(inputId + 1, ParentLayerPoint(10, 10), ScreenSize(0, 0), 0, 0));
   apzc->ReceiveInputEvent(mti, nullptr);
 
-  mti = MultiTouchInput(MultiTouchInput::MULTITOUCH_END, time, TimeStamp(), 0);
+  mti = CreateMultiTouchInput(MultiTouchInput::MULTITOUCH_END, mTime);
   mti.mTouches.AppendElement(SingleTouchData(inputId, ParentLayerPoint(20, 20), ScreenSize(0, 0), 0, 0));
   mti.mTouches.AppendElement(SingleTouchData(inputId + 1, ParentLayerPoint(10, 10), ScreenSize(0, 0), 0, 0));
   apzc->ReceiveInputEvent(mti, nullptr);
@@ -1809,21 +1840,20 @@
 
   EXPECT_CALL(*mcc, HandleSingleTap(CSSPoint(10, 10), 0, apzc->GetGuid())).Times(1);
 
-  int time = 0;
-  Tap(apzc, 10, 10, time, 100);
+  Tap(apzc, 10, 10, mTime, TimeDuration::FromMilliseconds(100));
 
   int inputId = 0;
   MultiTouchInput mti;
-  mti = MultiTouchInput(MultiTouchInput::MULTITOUCH_START, time, TimeStamp(), 0);
+  mti = CreateMultiTouchInput(MultiTouchInput::MULTITOUCH_START, mTime);
   mti.mTouches.AppendElement(SingleTouchData(inputId, ParentLayerPoint(20, 20), ScreenSize(0, 0), 0, 0));
   apzc->ReceiveInputEvent(mti, nullptr);
 
-  mti = MultiTouchInput(MultiTouchInput::MULTITOUCH_START, time, TimeStamp(), 0);
+  mti = CreateMultiTouchInput(MultiTouchInput::MULTITOUCH_START, mTime);
   mti.mTouches.AppendElement(SingleTouchData(inputId, ParentLayerPoint(20, 20), ScreenSize(0, 0), 0, 0));
   mti.mTouches.AppendElement(SingleTouchData(inputId + 1, ParentLayerPoint(10, 10), ScreenSize(0, 0), 0, 0));
   apzc->ReceiveInputEvent(mti, nullptr);
 
-  mti = MultiTouchInput(MultiTouchInput::MULTITOUCH_END, time, TimeStamp(), 0);
+  mti = CreateMultiTouchInput(MultiTouchInput::MULTITOUCH_END, mTime);
   mti.mTouches.AppendElement(SingleTouchData(inputId, ParentLayerPoint(20, 20), ScreenSize(0, 0), 0, 0));
   mti.mTouches.AppendElement(SingleTouchData(inputId + 1, ParentLayerPoint(10, 10), ScreenSize(0, 0), 0, 0));
   apzc->ReceiveInputEvent(mti, nullptr);
@@ -1840,18 +1870,17 @@
     APZThreadUtils::SetThreadAssertionsEnabled(false);
     APZThreadUtils::SetControllerThread(MessageLoop::current());
 
-    testStartTime = TimeStamp::Now();
-    AsyncPanZoomController::SetFrameTime(testStartTime);
+    mTime = TimeStamp::Now();
 
     mcc = new NiceMock<MockContentControllerDelayed>();
-    manager = new TestAPZCTreeManager();
+    manager = new TestAPZCTreeManager(mTime);
   }
 
   virtual void TearDown() {
     manager->ClearTree();
   }
 
-  TimeStamp testStartTime;
+  TimeStamp mTime;
   nsRefPtr<MockContentControllerDelayed> mcc;
 
   nsTArray<nsRefPtr<Layer> > layers;
@@ -2139,13 +2168,12 @@
   // Pan the root layer upward by 50 pixels.
   // This causes layers[1] to scroll out of view, and an async transform
   // of -50 to be set on the root layer.
-  int time = 0;
   EXPECT_CALL(*mcc, RequestContentRepaint(_)).Times(1);
 
   // This first pan will move the APZC by 50 pixels, and dispatch a paint request.
   // Since this paint request is in the queue to Gecko, transformToGecko will
   // take it into account.
-  ApzcPanNoFling(apzcroot, time, 100, 50);
+  ApzcPanNoFling(apzcroot, mTime, 100, 50);
 
   // Hit where layers[3] used to be. It should now hit the root.
   hit = GetTargetAPZC(ScreenPoint(75, 75));
@@ -2171,7 +2199,7 @@
   // request dispatched above has not "completed", we will not dispatch another
   // one yet. Now we have an async transform on top of the pending paint request
   // transform.
-  ApzcPanNoFling(apzcroot, time, 100, 50);
+  ApzcPanNoFling(apzcroot, mTime, 100, 50);
 
   // Hit where layers[3] used to be. It should now hit the root.
   hit = GetTargetAPZC(ScreenPoint(75, 75));
@@ -2354,13 +2382,12 @@
     EXPECT_CALL(check, Call("post-second-touch-start"));
   }
 
-  int time = 0;
   // This first pan will move the APZC by 50 pixels, and dispatch a paint request.
-  ApzcPanNoFling(apzcroot, time, 100, 50);
+  ApzcPanNoFling(apzcroot, mTime, 100, 50);
 
   // Verify that a touch start doesn't get untransformed
   ScreenIntPoint touchPoint(50, 50);
-  MultiTouchInput mti = MultiTouchInput(MultiTouchInput::MULTITOUCH_START, time, TimeStamp(), 0);
+  MultiTouchInput mti = CreateMultiTouchInput(MultiTouchInput::MULTITOUCH_START, mTime);
   mti.mTouches.AppendElement(SingleTouchData(0, touchPoint, ScreenSize(0, 0), 0, 0));
 
   EXPECT_EQ(nsEventStatus_eConsumeDoDefault, manager->ReceiveInputEvent(mti, nullptr, nullptr));
@@ -2371,7 +2398,7 @@
   mti.mType = MultiTouchInput::MULTITOUCH_END;
   manager->ReceiveInputEvent(mti, nullptr, nullptr);
 
-  AsyncPanZoomController::SetFrameTime(testStartTime + TimeDuration::FromMilliseconds(1000));
+  mTime += TimeDuration::FromMilliseconds(1000);
 
   // Now do two pans. The first of these will dispatch a repaint request, as above.
   // The second will get stuck in the paint throttler because the first one doesn't
@@ -2379,9 +2406,9 @@
   // (Note that any outstanding repaint requests from the first half of this test
   // don't impact this half because we advance the time by 1 second, which will trigger
   // the max-wait-exceeded codepath in the paint throttler).
-  ApzcPanNoFling(apzcroot, time, 100, 50);
+  ApzcPanNoFling(apzcroot, mTime, 100, 50);
   check.Call("post-second-fling");
-  ApzcPanNoFling(apzcroot, time, 100, 50);
+  ApzcPanNoFling(apzcroot, mTime, 100, 50);
 
   // Ensure that a touch start again doesn't get untransformed by flushing
   // a repaint
@@ -2411,23 +2438,22 @@
     EXPECT_CALL(check, Call("Tapped with interleaved transform"));
   }
 
-  int time = 0;
-  Tap(manager, 100, 100, time, 100);
+  Tap(manager, 100, 100, mTime, TimeDuration::FromMilliseconds(100));
   mcc->RunThroughDelayedTasks();
   check.Call("Tapped without transform");
 
   uint64_t blockId;
-  TouchDown(manager, 100, 100, time, &blockId);
+  TouchDown(manager, 100, 100, mTime, &blockId);
   if (gfxPrefs::TouchActionEnabled()) {
     SetDefaultAllowedTouchBehavior(manager, blockId);
   }
-  time += 100;
+  mTime += TimeDuration::FromMilliseconds(100);
 
   layers[0]->SetVisibleRegion(nsIntRegion(IntRect(0,50,200,150)));
   layers[0]->SetBaseTransform(Matrix4x4::Translation(0, 50, 0));
   manager->UpdateHitTestingTree(nullptr, root, false, 0, 0);
 
-  TouchUp(manager, 100, 100, time);
+  TouchUp(manager, 100, 100, mTime);
   mcc->RunThroughDelayedTasks();
   check.Call("Tapped with interleaved transform");
 }
@@ -2523,9 +2549,8 @@
   childApzc->SetWaitForMainThread();
 
   // Queue input events for a pan.
-  int time = 0;
   uint64_t blockId = 0;
-  ApzcPanNoFling(childApzc, time, 90, 30, &blockId);
+  ApzcPanNoFling(childApzc, mTime, 90, 30, &blockId);
 
   // Allow the pan to be processed.
   childApzc->ContentReceivedInputBlock(blockId, false);
@@ -2552,9 +2577,8 @@
   childApzc->SetWaitForMainThread();
 
   // Queue input events for a pan.
-  int time = 0;
   uint64_t blockId = 0;
-  ApzcPanNoFling(childApzc, time, 90, 30, &blockId);
+  ApzcPanNoFling(childApzc, mTime, 90, 30, &blockId);
 
   // Modify the APZC tree to insert a new APZC 'middle' into the handoff chain
   // between the child and the root.
@@ -2565,7 +2589,7 @@
 
   // Queue input events for another pan.
   uint64_t secondBlockId = 0;
-  ApzcPanNoFling(childApzc, time, 30, 90, &secondBlockId);
+  ApzcPanNoFling(childApzc, mTime, 30, 90, &secondBlockId);
 
   // Allow the first pan to be processed.
   childApzc->ContentReceivedInputBlock(blockId, false);
@@ -2599,8 +2623,7 @@
   TestAsyncPanZoomController* child = ApzcOf(layers[1]);
 
   // Pan, causing the parent APZC to overscroll.
-  int time = 0;
-  Pan(manager, time, 10, 40, true /* keep finger down */);
+  Pan(manager, mTime, 10, 40, true /* keep finger down */);
   EXPECT_FALSE(child->IsOverscrolled());
   EXPECT_TRUE(rootApzc->IsOverscrolled());
 
@@ -2617,14 +2640,39 @@
   manager->ReceiveInputEvent(fingersUp, nullptr, nullptr);
 
   // Allow any animations to run their course.
-  child->AdvanceAnimationsUntilEnd(testStartTime);
-  rootApzc->AdvanceAnimationsUntilEnd(testStartTime);
+  child->AdvanceAnimationsUntilEnd(mTime);
+  rootApzc->AdvanceAnimationsUntilEnd(mTime);
 
   // Make sure nothing is overscrolled.
   EXPECT_FALSE(child->IsOverscrolled());
   EXPECT_FALSE(rootApzc->IsOverscrolled());
 }
 
+// Test that flinging in a direction where one component of the fling goes into
+// overscroll but the other doesn't, results in just the one component being
+// handed off to the parent, while the original APZC continues flinging in the
+// other direction.
+TEST_F(APZOverscrollHandoffTester, PartialFlingHandoff) {
+  CreateOverscrollHandoffLayerTree1();
+
+  // Fling up and to the left. The child APZC has room to scroll up, but not
+  // to the left, so the horizontal component of the fling should be handed
+  // off to the parent APZC.
+  Pan(manager, mTime, ScreenPoint(90, 90), ScreenPoint(55, 55));
+
+  nsRefPtr<TestAsyncPanZoomController> parent = ApzcOf(root);
+  nsRefPtr<TestAsyncPanZoomController> child = ApzcOf(layers[1]);
+
+  // Advance the child's fling animation once to give the partial handoff
+  // a chance to occur.
+  mTime += TimeDuration::FromMilliseconds(10);
+  child->AdvanceAnimations(mTime);
+
+  // Assert that partial handoff has occurred.
+  child->AssertStateIsFling();
+  parent->AssertStateIsFling();
+}
+
 // Here we test that if two flings are happening simultaneously, overscroll
 // is handed off correctly for each.
 TEST_F(APZOverscrollHandoffTester, SimultaneousFlings) {
@@ -2637,11 +2685,10 @@
   nsRefPtr<TestAsyncPanZoomController> child2 = ApzcOf(layers[4]);
 
   // Pan on the lower child.
-  int time = 0;
-  Pan(child2, time, 45, 5);
+  Pan(child2, mTime, 45, 5);
 
   // Pan on the upper child.
-  Pan(child1, time, 95, 55);
+  Pan(child1, mTime, 95, 55);
 
   // Check that child1 and child2 are in a FLING state.
   child1->AssertStateIsFling();
@@ -2667,8 +2714,7 @@
 
   // Pan on the child, enough to fully scroll the scrollgrab parent (20 px)
   // and leave some more (another 15 px) for the child.
-  int time = 0;
-  Pan(childApzc, time, 80, 45);
+  Pan(childApzc, mTime, 80, 45);
 
   // Check that the parent and child have scrolled as much as we expect.
   EXPECT_EQ(20, rootApzc->GetFrameMetrics().GetScrollOffset().y);
@@ -2682,8 +2728,7 @@
   nsRefPtr<TestAsyncPanZoomController> childApzc = ApzcOf(layers[1]);
 
   // Pan on the child, not enough to fully scroll the scrollgrab parent.
-  int time = 0;
-  Pan(childApzc, time, 80, 70);
+  Pan(childApzc, mTime, 80, 70);
 
   // Check that it is the scrollgrab parent that's in a fling, not the child.
   rootApzc->AssertStateIsFling();
@@ -2862,21 +2907,22 @@
     EXPECT_CALL(check, Call("Tapped on left this time"));
   }
 
-  int time = 0;
+  TimeDuration tapDuration = TimeDuration::FromMilliseconds(100);
+
   // 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);
+  Tap(manager, 10, 10, mTime, tapDuration);
   mcc->RunThroughDelayedTasks();    // this runs the tap event
   check.Call("Tapped on left");
-  Tap(manager, 110, 110, time, 100);
+  Tap(manager, 110, 110, mTime, tapDuration);
   mcc->RunThroughDelayedTasks();    // this runs the tap event
   check.Call("Tapped on bottom");
-  Tap(manager, 110, 10, time, 100);
+  Tap(manager, 110, 10, mTime, tapDuration);
   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);
+  Tap(manager, 10, 110, mTime, tapDuration);
   mcc->RunThroughDelayedTasks();    // this runs the main-thread timeout
   check.Call("Tap pending on d-t-c region");
   mcc->RunThroughDelayedTasks();    // this runs the tap event
@@ -2884,7 +2930,7 @@
 
   // Now let's do that again, but simulate a main-thread response
   uint64_t inputBlockId = 0;
-  Tap(manager, 10, 110, time, 100, nullptr, &inputBlockId);
+  Tap(manager, 10, 110, mTime, tapDuration, nullptr, &inputBlockId);
   nsTArray<ScrollableLayerGuid> targets;
   targets.AppendElement(left->GetGuid());
   manager->SetTargetAPZC(inputBlockId, targets);
@@ -2895,13 +2941,12 @@
 TEST_F(APZEventRegionsTester, HitRegionAccumulatesChildren) {
   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);
+  Tap(manager, 10, 160, mTime, TimeDuration::FromMilliseconds(100));
   mcc->RunThroughDelayedTasks();    // this runs the tap event
 }
 
@@ -2914,8 +2959,7 @@
   TestAsyncPanZoomController* parent = ApzcOf(layers[1]);
   TestAsyncPanZoomController* child = ApzcOf(layers[2]);
 
-  int time = 0;
-  ApzcPanNoFling(parent, time, 75, 25);
+  ApzcPanNoFling(parent, mTime, 75, 25);
 
   HitTestResult result;
   nsRefPtr<AsyncPanZoomController> hit = manager->GetTargetAPZC(ScreenPoint(50, 75), &result);
@@ -2941,9 +2985,8 @@
 
   // These touch events should hit the dispatch-to-content region of layers[3]
   // and so get queued with that APZC as the tentative target.
-  int time = 0;
   uint64_t inputBlockId = 0;
-  Tap(manager, 55, 5, time, 100, nullptr, &inputBlockId);
+  Tap(manager, 55, 5, mTime, TimeDuration::FromMilliseconds(100), nullptr, &inputBlockId);
   // But now we tell the APZ that really it hit layers[2], and expect the tap
   // to be delivered at the correct coordinates.
   EXPECT_CALL(*mcc, HandleSingleTap(CSSPoint(55, 5), 0, apzc2->GetGuid())).Times(1);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/tests/gtest/TestCompositor.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/tests/gtest/TestCompositor.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/tests/gtest/TestCompositor.cpp	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/tests/gtest/TestCompositor.cpp	2015-05-25 20:42:40.000000000 +0000
@@ -125,7 +125,7 @@
     abort();
   }
 
-  return compositor;
+  return compositor.forget();
 }
 
 /**
@@ -172,10 +172,8 @@
 
 static TemporaryRef<DrawTarget> CreateDT()
 {
-  RefPtr<DrawTarget> dt = gfxPlatform::GetPlatform()->CreateOffscreenContentDrawTarget(
+  return gfxPlatform::GetPlatform()->CreateOffscreenContentDrawTarget(
     IntSize(gCompWidth, gCompHeight), SurfaceFormat::B8G8R8A8);
-
-  return dt;
 }
 
 static bool CompositeAndCompare(nsRefPtr<LayerManagerComposite> layerManager, DrawTarget* refDT)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/tests/gtest/TestGfxWidgets.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/tests/gtest/TestGfxWidgets.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/tests/gtest/TestGfxWidgets.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/tests/gtest/TestGfxWidgets.cpp	2015-05-25 20:42:40.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 "gtest/gtest.h"
+#include "GfxDriverInfo.h"
+#include "nsVersionComparator.h"
+
+using namespace mozilla::widget;
+
+TEST(GfxWidgets, Split) {
+  char aStr[8], bStr[8], cStr[8], dStr[8];
+
+  ASSERT_TRUE(SplitDriverVersion("33.4.3.22", aStr, bStr, cStr, dStr));
+  ASSERT_TRUE(atoi(aStr) == 33 && atoi(bStr) == 4 && atoi(cStr) == 3 && atoi(dStr) == 22);
+
+  ASSERT_TRUE(SplitDriverVersion("28.74.0.0", aStr, bStr, cStr, dStr));
+  ASSERT_TRUE(atoi(aStr) == 28 && atoi(bStr) == 74 && atoi(cStr) == 0 && atoi(dStr) == 0);
+
+  ASSERT_TRUE(SplitDriverVersion("132.0.0.0", aStr, bStr, cStr, dStr));
+  ASSERT_TRUE(atoi(aStr) == 132 && atoi(bStr) == 0 && atoi(cStr) == 0 && atoi(dStr) == 0);
+
+  ASSERT_TRUE(SplitDriverVersion("2.3.0.0", aStr, bStr, cStr, dStr));
+  ASSERT_TRUE(atoi(aStr) == 2 && atoi(bStr) == 3 && atoi(cStr) == 0 && atoi(dStr) == 0);
+
+  ASSERT_TRUE(SplitDriverVersion("25.4.0.8", aStr, bStr, cStr, dStr));
+  ASSERT_TRUE(atoi(aStr) == 25 && atoi(bStr) == 4 && atoi(cStr) == 0 && atoi(dStr) == 8);
+
+}
+
+TEST(GfxWidgets, Versioning) {
+  ASSERT_TRUE(mozilla::Version("0") < mozilla::Version("41.0a1"));
+  ASSERT_TRUE(mozilla::Version("39.0.5b7") < mozilla::Version("41.0a1"));
+  ASSERT_TRUE(mozilla::Version("18.0.5b7") < mozilla::Version("18.2"));
+  ASSERT_TRUE(mozilla::Version("30.0.5b7") < mozilla::Version("41.0b9"));
+  ASSERT_TRUE(mozilla::Version("100") > mozilla::Version("43.0a1"));
+  ASSERT_FALSE(mozilla::Version("42.0") < mozilla::Version("42.0"));
+  ASSERT_TRUE(mozilla::Version("42.0b2") < mozilla::Version("42.0"));
+  ASSERT_TRUE(mozilla::Version("42.0b2") < mozilla::Version("42"));
+  ASSERT_TRUE(mozilla::Version("42.0b2") < mozilla::Version("43.0a1"));
+  ASSERT_TRUE(mozilla::Version("42") < mozilla::Version("43.0a1"));
+  ASSERT_TRUE(mozilla::Version("42.0") < mozilla::Version("43.0a1"));
+  ASSERT_TRUE(mozilla::Version("42.0.5") < mozilla::Version("43.0a1"));
+  ASSERT_TRUE(mozilla::Version("42.1") < mozilla::Version("43.0a1"));
+  ASSERT_TRUE(mozilla::Version("42.0a1") < mozilla::Version("42"));
+  ASSERT_TRUE(mozilla::Version("42.0a1") < mozilla::Version("42.0.5"));
+  ASSERT_TRUE(mozilla::Version("42.0b7") < mozilla::Version("42.0.5"));
+  ASSERT_TRUE(mozilla::Version("") == mozilla::Version("0"));
+
+  // Note these two; one would expect for 42.0b1 and 42b1 to compare the
+  // same, but they do not.  If this ever changes, we want to know, so
+  // leave the test here to fail.
+  ASSERT_TRUE(mozilla::Version("42.0a1") < mozilla::Version("42.0b2"));
+  ASSERT_FALSE(mozilla::Version("42.0a1") < mozilla::Version("42b2"));
+}
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxAndroidPlatform.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxAndroidPlatform.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxAndroidPlatform.cpp	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxAndroidPlatform.cpp	2015-05-25 20:42:40.000000000 +0000
@@ -247,9 +247,9 @@
 }
 
 void
-gfxAndroidPlatform::GetFontList(InfallibleTArray<FontListEntry>* retValue)
+gfxAndroidPlatform::GetSystemFontList(InfallibleTArray<FontListEntry>* retValue)
 {
-    gfxFT2FontList::PlatformFontList()->GetFontList(retValue);
+    gfxFT2FontList::PlatformFontList()->GetSystemFontList(retValue);
 }
 
 nsresult
@@ -487,12 +487,12 @@
 already_AddRefed<mozilla::gfx::VsyncSource>
 gfxAndroidPlatform::CreateHardwareVsyncSource()
 {
-    // Only enable true hardware vsync on kit-kat due to L HwcComposer issues
-    // Jelly Bean has inaccurate hardware vsync so disable on JB
-    // Android pre-JB doesn't have hardware vsync
-    // Once L HwcComposer issues have been resolved, re-enable for L devices
-    // L is andriod version 21, Kit-kat is 19, 20 is kit-kat for wearables
-#if defined(MOZ_WIDGET_GONK) && (ANDROID_VERSION == 19)
+    // Only enable true hardware vsync on kit-kat and L device. Jelly Bean has
+    // inaccurate hardware vsync so disable on JB. Android pre-JB doesn't have
+    // hardware vsync.
+    // L is android version 21, L-MR1 is 22, kit-kat is 19, 20 is kit-kat for
+    // wearables.
+#if defined(MOZ_WIDGET_GONK) && (ANDROID_VERSION == 19 || ANDROID_VERSION >= 21)
     nsRefPtr<GonkVsyncSource> vsyncSource = new GonkVsyncSource();
     VsyncSource::Display& display = vsyncSource->GetGlobalDisplay();
     display.EnableVsync();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxAndroidPlatform.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxAndroidPlatform.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxAndroidPlatform.h	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxAndroidPlatform.h	2015-05-25 20:42:40.000000000 +0000
@@ -40,7 +40,7 @@
       GetScaledFontForFont(mozilla::gfx::DrawTarget* aTarget, gfxFont *aFont);
 
     // to support IPC font list (sharing between chrome and content)
-    void GetFontList(InfallibleTArray<FontListEntry>* retValue);
+    void GetSystemFontList(InfallibleTArray<FontListEntry>* retValue);
 
     // platform implementations of font functions
     virtual bool IsFontFormatSupported(nsIURI *aFontURI, uint32_t aFormatFlags);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxContext.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxContext.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxContext.cpp	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxContext.cpp	2015-05-25 20:42:40.000000000 +0000
@@ -204,7 +204,8 @@
 TemporaryRef<Path> gfxContext::GetPath()
 {
   EnsurePath();
-  return mPath;
+  RefPtr<Path> path(mPath);
+  return path.forget();
 }
 
 void gfxContext::SetPath(Path* path)
@@ -461,7 +462,7 @@
   const AzureState &state = CurrentState();
   int count = state.strokeOptions.mDashLength;
 
-  if (count <= 0 || !dashes.SetLength(count)) {
+  if (count <= 0 || !dashes.SetLength(count, fallible)) {
     return false;
   }
 
@@ -619,6 +620,23 @@
 }
 
 bool
+gfxContext::HasComplexClip() const
+{
+  for (int i = mStateStack.Length() - 1; i >= 0; i--) {
+    for (unsigned int c = 0; c < mStateStack[i].pushedClips.Length(); c++) {
+      const AzureState::PushedClip &clip = mStateStack[i].pushedClips[c];
+      if (clip.path || !clip.transform.IsRectilinear()) {
+        return true;
+      }
+    }
+    if (mStateStack[i].clipWasReset) {
+      break;
+    }
+  }
+  return false;
+}
+
+bool
 gfxContext::ClipContainsRect(const gfxRect& aRect)
 {
   unsigned int lastReset = 0;
@@ -932,7 +950,7 @@
   deviceOffsetTranslation.PreTranslate(deviceOffset.x, deviceOffset.y);
 
   *aTransform = deviceOffsetTranslation * mat;
-  return src;
+  return src.forget();
 }
 
 void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxContext.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxContext.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxContext.h	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxContext.h	2015-05-25 20:42:41.000000000 +0000
@@ -446,6 +446,11 @@
     gfxRect GetClipExtents();
 
     /**
+     * Whether the current clip is not a simple rectangle.
+     */
+    bool HasComplexClip() const;
+
+    /**
      * Returns true if the given rectangle is fully contained in the current clip. 
      * This is conservative; it may return false even when the given rectangle is 
      * fully contained by the current clip.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxCoreTextShaper.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxCoreTextShaper.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxCoreTextShaper.cpp	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxCoreTextShaper.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -315,7 +315,7 @@
 
     static const int32_t NO_GLYPH = -1;
     AutoFallibleTArray<int32_t,SMALL_GLYPH_RUN> charToGlyphArray;
-    if (!charToGlyphArray.SetLength(stringRange.length)) {
+    if (!charToGlyphArray.SetLength(stringRange.length, fallible)) {
         return NS_ERROR_OUT_OF_MEMORY;
     }
     int32_t *charToGlyph = charToGlyphArray.Elements();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxDWriteFontList.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxDWriteFontList.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxDWriteFontList.cpp	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxDWriteFontList.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -27,13 +27,13 @@
 
 using namespace mozilla;
 
-#define LOG_FONTLIST(args) PR_LOG(gfxPlatform::GetLog(eGfxLog_fontlist), \
+#define LOG_FONTLIST(args) MOZ_LOG(gfxPlatform::GetLog(eGfxLog_fontlist), \
                                PR_LOG_DEBUG, args)
 #define LOG_FONTLIST_ENABLED() PR_LOG_TEST( \
                                    gfxPlatform::GetLog(eGfxLog_fontlist), \
                                    PR_LOG_DEBUG)
 
-#define LOG_FONTINIT(args) PR_LOG(gfxPlatform::GetLog(eGfxLog_fontinit), \
+#define LOG_FONTINIT(args) MOZ_LOG(gfxPlatform::GetLog(eGfxLog_fontinit), \
                                PR_LOG_DEBUG, args)
 #define LOG_FONTINIT_ENABLED() PR_LOG_TEST( \
                                    gfxPlatform::GetLog(eGfxLog_fontinit), \
@@ -1304,7 +1304,9 @@
 }
 
 gfxFontFamily*
-gfxDWriteFontList::FindFamily(const nsAString& aFamily, bool aUseSystemFonts)
+gfxDWriteFontList::FindFamily(const nsAString& aFamily,
+                              nsIAtom* aLanguage,
+                              bool aUseSystemFonts)
 {
     if (!mInitialized) {
         mInitialized = true;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxDWriteFontList.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxDWriteFontList.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxDWriteFontList.h	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxDWriteFontList.h	2015-05-25 20:42:41.000000000 +0000
@@ -365,6 +365,7 @@
     bool UseGDIFontTableAccess() { return mGDIFontTableAccess; }
 
     virtual gfxFontFamily* FindFamily(const nsAString& aFamily,
+                                      nsIAtom* aLanguage = nullptr,
                                       bool aUseSystemFonts = false);
 
     virtual void GetFontFamilyList(nsTArray<nsRefPtr<gfxFontFamily> >& aFamilyArray);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxDWriteFonts.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxDWriteFonts.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxDWriteFonts.cpp	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxDWriteFonts.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -674,7 +674,8 @@
 {
   bool wantCairo = aTarget->GetBackendType() == BackendType::CAIRO;
   if (mAzureScaledFont && mAzureScaledFontIsCairo == wantCairo) {
-    return mAzureScaledFont;
+    RefPtr<ScaledFont> scaledFont(mAzureScaledFont);
+    return scaledFont.forget();
   }
 
   NativeFont nativeFont;
@@ -692,5 +693,6 @@
 
   mAzureScaledFontIsCairo = wantCairo;
 
-  return mAzureScaledFont;
+  RefPtr<ScaledFont> scaledFont(mAzureScaledFont);
+  return scaledFont.forget();
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFcPlatformFontList.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFcPlatformFontList.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFcPlatformFontList.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFcPlatformFontList.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -0,0 +1,1505 @@
+/* -*- 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 "mozilla/Logging.h"
+
+#include "gfxFcPlatformFontList.h"
+#include "gfxFont.h"
+#include "gfxFontConstants.h"
+#include "gfxFontFamilyList.h"
+#include "gfxFT2Utils.h"
+#include "gfxPlatform.h"
+#include "mozilla/ArrayUtils.h"
+#include "mozilla/TimeStamp.h"
+#include "nsGkAtoms.h"
+#include "nsILanguageAtomService.h"
+#include "nsUnicodeProperties.h"
+#include "nsUnicodeRange.h"
+#include "nsDirectoryServiceUtils.h"
+#include "nsDirectoryServiceDefs.h"
+#include "nsAppDirectoryServiceDefs.h"
+
+#include <fontconfig/fcfreetype.h>
+
+#ifdef MOZ_WIDGET_GTK
+#include <gdk/gdk.h>
+#endif
+
+using namespace mozilla;
+using namespace mozilla::unicode;
+
+#ifndef FC_POSTSCRIPT_NAME
+#define FC_POSTSCRIPT_NAME  "postscriptname"      /* String */
+#endif
+
+#define PRINTING_FC_PROPERTY "gfx.printing"
+
+#define LOG_FONTLIST(args) MOZ_LOG(gfxPlatform::GetLog(eGfxLog_fontlist), \
+                               PR_LOG_DEBUG, args)
+#define LOG_FONTLIST_ENABLED() PR_LOG_TEST( \
+                                   gfxPlatform::GetLog(eGfxLog_fontlist), \
+                                   PR_LOG_DEBUG)
+#define LOG_CMAPDATA_ENABLED() PR_LOG_TEST( \
+                                   gfxPlatform::GetLog(eGfxLog_cmapdata), \
+                                   PR_LOG_DEBUG)
+
+static const FcChar8*
+ToFcChar8Ptr(const char* aStr)
+{
+    return reinterpret_cast<const FcChar8*>(aStr);
+}
+
+static const char*
+ToCharPtr(const FcChar8 *aStr)
+{
+    return reinterpret_cast<const char*>(aStr);
+}
+
+FT_Library gfxFcPlatformFontList::sCairoFTLibrary = nullptr;
+static cairo_user_data_key_t sFcFontlistUserFontDataKey;
+
+// canonical name ==> first en name or first name if no en name
+// This is the required logic for fullname lookups as per CSS3 Fonts spec.
+static uint32_t
+FindCanonicalNameIndex(FcPattern* aFont, const char* aLangField)
+{
+    uint32_t n = 0, en = 0;
+    FcChar8* lang;
+    while (FcPatternGetString(aFont, aLangField, n, &lang) == FcResultMatch) {
+        // look for 'en' or variants, en-US, en-JP etc.
+        uint32_t len = strlen(ToCharPtr(lang));
+        bool enPrefix = (strncmp(ToCharPtr(lang), "en", 2) == 0);
+        if (enPrefix && (len == 2 || (len > 2 && aLangField[2] == '-'))) {
+            en = n;
+            break;
+        }
+        n++;
+    }
+    return en;
+}
+
+static void
+GetFaceNames(FcPattern* aFont, const nsAString& aFamilyName,
+             nsAString& aPostscriptName, nsAString& aFullname)
+{
+    // get the Postscript name
+    FcChar8* psname;
+    if (FcPatternGetString(aFont, FC_POSTSCRIPT_NAME, 0, &psname) == FcResultMatch) {
+        AppendUTF8toUTF16(ToCharPtr(psname), aPostscriptName);
+    }
+
+    // get the canonical fullname (i.e. en name or first name)
+    uint32_t en = FindCanonicalNameIndex(aFont, FC_FULLNAMELANG);
+    FcChar8* fullname;
+    if (FcPatternGetString(aFont, FC_FULLNAME, en, &fullname) == FcResultMatch) {
+        AppendUTF8toUTF16(ToCharPtr(fullname), aFullname);
+    }
+
+    // if have fullname, done
+    if (!aFullname.IsEmpty()) {
+        return;
+    }
+
+    // otherwise, set the fullname to family + style name [en] and use that
+    aFullname.Append(aFamilyName);
+
+    // figure out the en style name
+    en = FindCanonicalNameIndex(aFont, FC_STYLELANG);
+    nsAutoString style;
+    FcChar8* stylename = nullptr;
+    FcPatternGetString(aFont, FC_STYLE, en, &stylename);
+    if (stylename) {
+        AppendUTF8toUTF16(ToCharPtr(stylename), style);
+    }
+
+    if (!style.IsEmpty() && !style.EqualsLiteral("Regular")) {
+        aFullname.Append(' ');
+        aFullname.Append(style);
+    }
+}
+
+static uint16_t
+MapFcWeight(int aFcWeight)
+{
+    if (aFcWeight <= (FC_WEIGHT_THIN + FC_WEIGHT_EXTRALIGHT) / 2) {
+        return 100;
+    } else if (aFcWeight <= (FC_WEIGHT_EXTRALIGHT + FC_WEIGHT_LIGHT) / 2) {
+        return 200;
+    } else if (aFcWeight <= (FC_WEIGHT_LIGHT + FC_WEIGHT_BOOK) / 2) {
+        return 300;
+    } else if (aFcWeight <= (FC_WEIGHT_REGULAR + FC_WEIGHT_MEDIUM) / 2) {
+        // This includes FC_WEIGHT_BOOK
+        return 400;
+    } else if (aFcWeight <= (FC_WEIGHT_MEDIUM + FC_WEIGHT_DEMIBOLD) / 2) {
+        return 500;
+    } else if (aFcWeight <= (FC_WEIGHT_DEMIBOLD + FC_WEIGHT_BOLD) / 2) {
+        return 600;
+    } else if (aFcWeight <= (FC_WEIGHT_BOLD + FC_WEIGHT_EXTRABOLD) / 2) {
+        return 700;
+    } else if (aFcWeight <= (FC_WEIGHT_EXTRABOLD + FC_WEIGHT_BLACK) / 2) {
+        return 800;
+    } else if (aFcWeight <= FC_WEIGHT_BLACK) {
+        return 900;
+    }
+
+    // including FC_WEIGHT_EXTRABLACK
+    return 901;
+}
+
+static int16_t
+MapFcWidth(int aFcWidth)
+{
+    if (aFcWidth <= (FC_WIDTH_ULTRACONDENSED + FC_WIDTH_EXTRACONDENSED) / 2) {
+        return NS_FONT_STRETCH_ULTRA_CONDENSED;
+    }
+    if (aFcWidth <= (FC_WIDTH_EXTRACONDENSED + FC_WIDTH_CONDENSED) / 2) {
+        return NS_FONT_STRETCH_EXTRA_CONDENSED;
+    }
+    if (aFcWidth <= (FC_WIDTH_CONDENSED + FC_WIDTH_SEMICONDENSED) / 2) {
+        return NS_FONT_STRETCH_CONDENSED;
+    }
+    if (aFcWidth <= (FC_WIDTH_SEMICONDENSED + FC_WIDTH_NORMAL) / 2) {
+        return NS_FONT_STRETCH_SEMI_CONDENSED;
+    }
+    if (aFcWidth <= (FC_WIDTH_NORMAL + FC_WIDTH_SEMIEXPANDED) / 2) {
+        return NS_FONT_STRETCH_NORMAL;
+    }
+    if (aFcWidth <= (FC_WIDTH_SEMIEXPANDED + FC_WIDTH_EXPANDED) / 2) {
+        return NS_FONT_STRETCH_SEMI_EXPANDED;
+    }
+    if (aFcWidth <= (FC_WIDTH_EXPANDED + FC_WIDTH_EXTRAEXPANDED) / 2) {
+        return NS_FONT_STRETCH_EXPANDED;
+    }
+    if (aFcWidth <= (FC_WIDTH_EXTRAEXPANDED + FC_WIDTH_ULTRAEXPANDED) / 2) {
+        return NS_FONT_STRETCH_EXTRA_EXPANDED;
+    }
+    return NS_FONT_STRETCH_ULTRA_EXPANDED;
+}
+
+// mapping of moz lang groups ==> default lang
+struct MozLangGroupData {
+    nsIAtom* const& mozLangGroup;
+    const char *defaultLang;
+};
+
+const MozLangGroupData MozLangGroups[] = {
+    { nsGkAtoms::x_western,      "en" },
+    { nsGkAtoms::x_cyrillic,     "ru" },
+    { nsGkAtoms::x_devanagari,   "hi" },
+    { nsGkAtoms::x_tamil,        "ta" },
+    { nsGkAtoms::x_armn,         "hy" },
+    { nsGkAtoms::x_beng,         "bn" },
+    { nsGkAtoms::x_cans,         "iu" },
+    { nsGkAtoms::x_ethi,         "am" },
+    { nsGkAtoms::x_geor,         "ka" },
+    { nsGkAtoms::x_gujr,         "gu" },
+    { nsGkAtoms::x_guru,         "pa" },
+    { nsGkAtoms::x_khmr,         "km" },
+    { nsGkAtoms::x_knda,         "kn" },
+    { nsGkAtoms::x_mlym,         "ml" },
+    { nsGkAtoms::x_orya,         "or" },
+    { nsGkAtoms::x_sinh,         "si" },
+    { nsGkAtoms::x_tamil,        "ta" },
+    { nsGkAtoms::x_telu,         "te" },
+    { nsGkAtoms::x_tibt,         "bo" },
+    { nsGkAtoms::Unicode,        0    }
+};
+
+static void
+GetSampleLangForGroup(nsIAtom* aLanguage, nsACString& aLangStr)
+{
+    aLangStr.Truncate();
+    if (aLanguage) {
+        // set up lang string
+        const MozLangGroupData *mozLangGroup = nullptr;
+
+        // -- look it up in the list of moz lang groups
+        for (unsigned int i = 0; i < ArrayLength(MozLangGroups); ++i) {
+            if (aLanguage == MozLangGroups[i].mozLangGroup) {
+                mozLangGroup = &MozLangGroups[i];
+                break;
+            }
+        }
+
+        // xxx - Is this sufficient? The code in
+        // gfxFontconfigUtils::GetSampleLangForGroup has logic for sniffing the
+        // LANGUAGE environment to try and map langGroup ==> closest user language
+        // but I'm guessing that's not really all that useful. For now, just use
+        // the default lang mapping.
+
+        // -- get the BCP47 string representation of the lang group
+        if (mozLangGroup) {
+            if (mozLangGroup->defaultLang) {
+                aLangStr.Assign(mozLangGroup->defaultLang);
+            }
+        } else {
+            // Not a special mozilla language group.
+            // Use aLangGroup as a language code.
+            aLanguage->ToUTF8String(aLangStr);
+        }
+    }
+}
+
+gfxFontconfigFontEntry::gfxFontconfigFontEntry(const nsAString& aFaceName,
+                                               FcPattern* aFontPattern)
+        : gfxFontEntry(aFaceName), mFontPattern(aFontPattern),
+          mFTFace(nullptr), mFTFaceInitialized(false),
+          mAspect(0.0), mFontData(nullptr)
+{
+    // italic
+    int slant;
+    if (FcPatternGetInteger(aFontPattern, FC_SLANT, 0, &slant) != FcResultMatch) {
+        slant = FC_SLANT_ROMAN;
+    }
+    if (slant > 0) {
+        mItalic = true;
+    }
+
+    // weight
+    int weight;
+    if (FcPatternGetInteger(aFontPattern, FC_WEIGHT, 0, &weight) != FcResultMatch) {
+        weight = FC_WEIGHT_REGULAR;
+    }
+    mWeight = MapFcWeight(weight);
+
+    // width
+    int width;
+    if (FcPatternGetInteger(aFontPattern, FC_WIDTH, 0, &width) != FcResultMatch) {
+        width = FC_WIDTH_NORMAL;
+    }
+    mStretch = MapFcWidth(width);
+}
+
+gfxFontconfigFontEntry::gfxFontconfigFontEntry(const nsAString& aFaceName,
+                                               uint16_t aWeight,
+                                               int16_t aStretch,
+                                               bool aItalic,
+                                               const uint8_t *aData,
+                                               FT_Face aFace)
+    : gfxFontEntry(aFaceName), mFontPattern(FcPatternCreate()),
+      mFTFace(aFace), mFTFaceInitialized(true),
+      mAspect(0.0), mFontData(aData)
+{
+    mWeight = aWeight;
+    mItalic = aItalic;
+    mStretch = aStretch;
+    mIsDataUserFont = true;
+
+    // Make a new pattern and store the face in it so that cairo uses
+    // that when creating a cairo font face.
+    FcPatternAddFTFace(mFontPattern, FC_FT_FACE, mFTFace);
+
+    mUserFontData = new FTUserFontData(mFTFace, mFontData);
+}
+
+gfxFontconfigFontEntry::gfxFontconfigFontEntry(const nsAString& aFaceName,
+                                               FcPattern* aFontPattern,
+                                               uint16_t aWeight,
+                                               int16_t aStretch,
+                                               bool aItalic)
+        : gfxFontEntry(aFaceName), mFontPattern(aFontPattern),
+          mFTFace(nullptr), mFTFaceInitialized(false),
+          mAspect(0.0), mFontData(nullptr)
+{
+    mWeight = aWeight;
+    mItalic = aItalic;
+    mStretch = aStretch;
+    mIsLocalUserFont = true;
+}
+
+gfxFontconfigFontEntry::~gfxFontconfigFontEntry()
+{
+}
+
+bool
+gfxFontconfigFontEntry::SupportsLangGroup(nsIAtom *aLangGroup) const
+{
+    if (!aLangGroup || aLangGroup == nsGkAtoms::Unicode) {
+        return true;
+    }
+
+    nsAutoCString fcLang;
+    GetSampleLangForGroup(aLangGroup, fcLang);
+    if (fcLang.IsEmpty()) {
+        return true;
+    }
+
+    // is lang included in the underlying pattern?
+    FcLangSet *langset;
+    if (FcPatternGetLangSet(mFontPattern, FC_LANG, 0, &langset) != FcResultMatch) {
+        return false;
+    }
+
+    if (FcLangSetHasLang(langset, (FcChar8 *)fcLang.get()) != FcLangDifferentLang) {
+        return true;
+    }
+
+    return false;
+}
+
+nsresult
+gfxFontconfigFontEntry::ReadCMAP(FontInfoData *aFontInfoData)
+{
+    // attempt this once, if errors occur leave a blank cmap
+    if (mCharacterMap) {
+        return NS_OK;
+    }
+
+    nsRefPtr<gfxCharacterMap> charmap;
+    nsresult rv;
+    bool symbolFont;
+
+    if (aFontInfoData && (charmap = GetCMAPFromFontInfo(aFontInfoData,
+                                                        mUVSOffset,
+                                                        symbolFont))) {
+        rv = NS_OK;
+    } else {
+        uint32_t kCMAP = TRUETYPE_TAG('c','m','a','p');
+        charmap = new gfxCharacterMap();
+        AutoTable cmapTable(this, kCMAP);
+
+        if (cmapTable) {
+            bool unicodeFont = false, symbolFont = false; // currently ignored
+            uint32_t cmapLen;
+            const uint8_t* cmapData =
+                reinterpret_cast<const uint8_t*>(hb_blob_get_data(cmapTable,
+                                                                  &cmapLen));
+            rv = gfxFontUtils::ReadCMAP(cmapData, cmapLen,
+                                        *charmap, mUVSOffset,
+                                        unicodeFont, symbolFont);
+        } else {
+            rv = NS_ERROR_NOT_AVAILABLE;
+        }
+    }
+
+    mHasCmapTable = NS_SUCCEEDED(rv);
+    if (mHasCmapTable) {
+        gfxPlatformFontList *pfl = gfxPlatformFontList::PlatformFontList();
+        mCharacterMap = pfl->FindCharMap(charmap);
+    } else {
+        // if error occurred, initialize to null cmap
+        mCharacterMap = new gfxCharacterMap();
+    }
+
+    LOG_FONTLIST(("(fontlist-cmap) name: %s, size: %d hash: %8.8x%s\n",
+                  NS_ConvertUTF16toUTF8(mName).get(),
+                  charmap->SizeOfIncludingThis(moz_malloc_size_of),
+                  charmap->mHash, mCharacterMap == charmap ? " new" : ""));
+    if (LOG_CMAPDATA_ENABLED()) {
+        char prefix[256];
+        sprintf(prefix, "(cmapdata) name: %.220s",
+                NS_ConvertUTF16toUTF8(mName).get());
+        charmap->Dump(prefix, eGfxLog_cmapdata);
+    }
+
+    return rv;
+}
+
+static bool
+HasChar(FcPattern *aFont, FcChar32 aCh)
+{
+    FcCharSet *charset = nullptr;
+    FcPatternGetCharSet(aFont, FC_CHARSET, 0, &charset);
+    return charset && FcCharSetHasChar(charset, aCh);
+}
+
+bool
+gfxFontconfigFontEntry::TestCharacterMap(uint32_t aCh)
+{
+    // for system fonts, use the charmap in the pattern
+    if (!mIsDataUserFont) {
+        return HasChar(mFontPattern, aCh);
+    }
+    return gfxFontEntry::TestCharacterMap(aCh);
+}
+
+hb_blob_t*
+gfxFontconfigFontEntry::GetFontTable(uint32_t aTableTag)
+{
+    // for data fonts, read directly from the font data
+    if (mFontData) {
+        return GetTableFromFontData(mFontData, aTableTag);
+    }
+
+    return gfxFontEntry::GetFontTable(aTableTag);
+}
+
+void
+gfxFontconfigFontEntry::MaybeReleaseFTFace()
+{
+    // don't release if either HB or Gr face still exists
+    if (mHBFace || mGrFace) {
+        return;
+    }
+    // only close out FT_Face for system fonts, not for data fonts
+    if (!mIsDataUserFont) {
+        if (mFTFace) {
+            FT_Done_Face(mFTFace);
+            mFTFace = nullptr;
+        }
+        mFTFaceInitialized = false;
+    }
+}
+
+void
+gfxFontconfigFontEntry::ForgetHBFace()
+{
+    gfxFontEntry::ForgetHBFace();
+    MaybeReleaseFTFace();
+}
+
+void
+gfxFontconfigFontEntry::ReleaseGrFace(gr_face* aFace)
+{
+    gfxFontEntry::ReleaseGrFace(aFace);
+    MaybeReleaseFTFace();
+}
+
+double
+gfxFontconfigFontEntry::GetAspect()
+{
+    if (mAspect == 0.0) {
+        // default to aspect = 0.5
+        mAspect = 0.5;
+
+        // create a font to calculate x-height / em-height
+        gfxFontStyle s;
+        s.size = 100.0; // pick large size to avoid possible hinting artifacts
+        nsRefPtr<gfxFont> font = FindOrMakeFont(&s, false);
+        if (font) {
+            const gfxFont::Metrics& metrics =
+                font->GetMetrics(gfxFont::eHorizontal);
+
+            // The factor of 0.1 ensures that xHeight is sane so fonts don't
+            // become huge.  Strictly ">" ensures that xHeight and emHeight are
+            // not both zero.
+            if (metrics.xHeight > 0.1 * metrics.emHeight) {
+                mAspect = metrics.xHeight / metrics.emHeight;
+            }
+        }
+    }
+    return mAspect;
+}
+
+static void
+PrepareFontOptions(FcPattern* aPattern,
+                   cairo_font_options_t* aFontOptions)
+{
+    NS_ASSERTION(aFontOptions, "null font options passed to PrepareFontOptions");
+
+    // xxx - taken from the gfxFontconfigFonts code, needs to be reviewed
+
+    FcBool printing;
+    if (FcPatternGetBool(aPattern, PRINTING_FC_PROPERTY, 0, &printing) !=
+            FcResultMatch) {
+        printing = FcFalse;
+    }
+
+    // Font options are set explicitly here to improve cairo's caching
+    // behavior and to record the relevant parts of the pattern for
+    // SetupCairoFont (so that the pattern can be released).
+    //
+    // Most font_options have already been set as defaults on the FcPattern
+    // with cairo_ft_font_options_substitute(), then user and system
+    // fontconfig configurations were applied.  The resulting font_options
+    // have been recorded on the face during
+    // cairo_ft_font_face_create_for_pattern().
+    //
+    // None of the settings here cause this scaled_font to behave any
+    // differently from how it would behave if it were created from the same
+    // face with default font_options.
+    //
+    // We set options explicitly so that the same scaled_font will be found in
+    // the cairo_scaled_font_map when cairo loads glyphs from a context with
+    // the same font_face, font_matrix, ctm, and surface font_options.
+    //
+    // Unfortunately, _cairo_scaled_font_keys_equal doesn't know about the
+    // font_options on the cairo_ft_font_face, and doesn't consider default
+    // option values to not match any explicit values.
+    //
+    // Even after cairo_set_scaled_font is used to set font_options for the
+    // cairo context, when cairo looks for a scaled_font for the context, it
+    // will look for a font with some option values from the target surface if
+    // any values are left default on the context font_options.  If this
+    // scaled_font is created with default font_options, cairo will not find
+    // it.
+    //
+    // The one option not recorded in the pattern is hint_metrics, which will
+    // affect glyph metrics.  The default behaves as CAIRO_HINT_METRICS_ON.
+    // We should be considering the font_options of the surface on which this
+    // font will be used, but currently we don't have different gfxFonts for
+    // different surface font_options, so we'll create a font suitable for the
+    // Screen. Image and xlib surfaces default to CAIRO_HINT_METRICS_ON.
+    if (printing) {
+        cairo_font_options_set_hint_metrics(aFontOptions, CAIRO_HINT_METRICS_OFF);
+    } else {
+        cairo_font_options_set_hint_metrics(aFontOptions, CAIRO_HINT_METRICS_ON);
+    }
+
+    // The remaining options have been recorded on the pattern and the face.
+    // _cairo_ft_options_merge has some logic to decide which options from the
+    // scaled_font or from the cairo_ft_font_face take priority in the way the
+    // font behaves.
+    //
+    // In the majority of cases, _cairo_ft_options_merge uses the options from
+    // the cairo_ft_font_face, so sometimes it is not so important which
+    // values are set here so long as they are not defaults, but we'll set
+    // them to the exact values that we expect from the font, to be consistent
+    // and to protect against changes in cairo.
+    //
+    // In some cases, _cairo_ft_options_merge uses some options from the
+    // scaled_font's font_options rather than options on the
+    // cairo_ft_font_face (from fontconfig).
+    // https://bugs.freedesktop.org/show_bug.cgi?id=11838
+    //
+    // Surface font options were set on the pattern in
+    // cairo_ft_font_options_substitute.  If fontconfig has changed the
+    // hint_style then that is what the user (or distribution) wants, so we
+    // use the setting from the FcPattern.
+    //
+    // Fallback values here mirror treatment of defaults in cairo-ft-font.c.
+    FcBool hinting = FcFalse;
+    if (FcPatternGetBool(aPattern, FC_HINTING, 0, &hinting) != FcResultMatch) {
+        hinting = FcTrue;
+    }
+
+    cairo_hint_style_t hint_style;
+    if (printing || !hinting) {
+        hint_style = CAIRO_HINT_STYLE_NONE;
+    } else {
+        int fc_hintstyle;
+        if (FcPatternGetInteger(aPattern, FC_HINT_STYLE,
+                                0, &fc_hintstyle) != FcResultMatch) {
+            fc_hintstyle = FC_HINT_FULL;
+        }
+        switch (fc_hintstyle) {
+            case FC_HINT_NONE:
+                hint_style = CAIRO_HINT_STYLE_NONE;
+                break;
+            case FC_HINT_SLIGHT:
+                hint_style = CAIRO_HINT_STYLE_SLIGHT;
+                break;
+            case FC_HINT_MEDIUM:
+            default: // This fallback mirrors _get_pattern_ft_options in cairo.
+                hint_style = CAIRO_HINT_STYLE_MEDIUM;
+                break;
+            case FC_HINT_FULL:
+                hint_style = CAIRO_HINT_STYLE_FULL;
+                break;
+        }
+    }
+    cairo_font_options_set_hint_style(aFontOptions, hint_style);
+
+    int rgba;
+    if (FcPatternGetInteger(aPattern,
+                            FC_RGBA, 0, &rgba) != FcResultMatch) {
+        rgba = FC_RGBA_UNKNOWN;
+    }
+    cairo_subpixel_order_t subpixel_order = CAIRO_SUBPIXEL_ORDER_DEFAULT;
+    switch (rgba) {
+        case FC_RGBA_UNKNOWN:
+        case FC_RGBA_NONE:
+        default:
+            // There is no CAIRO_SUBPIXEL_ORDER_NONE.  Subpixel antialiasing
+            // is disabled through cairo_antialias_t.
+            rgba = FC_RGBA_NONE;
+            // subpixel_order won't be used by the font as we won't use
+            // CAIRO_ANTIALIAS_SUBPIXEL, but don't leave it at default for
+            // caching reasons described above.  Fall through:
+        case FC_RGBA_RGB:
+            subpixel_order = CAIRO_SUBPIXEL_ORDER_RGB;
+            break;
+        case FC_RGBA_BGR:
+            subpixel_order = CAIRO_SUBPIXEL_ORDER_BGR;
+            break;
+        case FC_RGBA_VRGB:
+            subpixel_order = CAIRO_SUBPIXEL_ORDER_VRGB;
+            break;
+        case FC_RGBA_VBGR:
+            subpixel_order = CAIRO_SUBPIXEL_ORDER_VBGR;
+            break;
+    }
+    cairo_font_options_set_subpixel_order(aFontOptions, subpixel_order);
+
+    FcBool fc_antialias;
+    if (FcPatternGetBool(aPattern,
+                         FC_ANTIALIAS, 0, &fc_antialias) != FcResultMatch) {
+        fc_antialias = FcTrue;
+    }
+    cairo_antialias_t antialias;
+    if (!fc_antialias) {
+        antialias = CAIRO_ANTIALIAS_NONE;
+    } else if (rgba == FC_RGBA_NONE) {
+        antialias = CAIRO_ANTIALIAS_GRAY;
+    } else {
+        antialias = CAIRO_ANTIALIAS_SUBPIXEL;
+    }
+    cairo_font_options_set_antialias(aFontOptions, antialias);
+}
+
+cairo_scaled_font_t*
+gfxFontconfigFontEntry::CreateScaledFont(FcPattern* aRenderPattern,
+                                         const gfxFontStyle *aStyle,
+                                         bool aNeedsBold)
+{
+    if (aNeedsBold) {
+        FcPatternAddBool(aRenderPattern, FC_EMBOLDEN, FcTrue);
+    }
+
+    // synthetic oblique by skewing via the font matrix
+    bool needsOblique = !IsItalic() &&
+            (aStyle->style & (NS_FONT_STYLE_ITALIC | NS_FONT_STYLE_OBLIQUE)) &&
+            aStyle->allowSyntheticStyle;
+
+    if (needsOblique) {
+        // disable embedded bitmaps (mimics behavior in 90-synthetic.conf)
+        FcPatternDel(aRenderPattern, FC_EMBEDDED_BITMAP);
+        FcPatternAddBool(aRenderPattern, FC_EMBEDDED_BITMAP, FcFalse);
+    }
+
+    cairo_font_face_t *face =
+        cairo_ft_font_face_create_for_pattern(aRenderPattern);
+
+    if (mFontData) {
+        // for data fonts, add the face/data pointer to the cairo font face
+        // so that it gets deleted whenever cairo decides
+        NS_ASSERTION(mFTFace, "FT_Face is null when setting user data");
+        NS_ASSERTION(mUserFontData, "user font data is null when setting user data");
+        cairo_font_face_set_user_data(face,
+                                      &sFcFontlistUserFontDataKey,
+                                      new FTUserFontDataRef(mUserFontData),
+                                      FTUserFontDataRef::Destroy);
+    }
+
+    cairo_scaled_font_t *scaledFont = nullptr;
+
+    cairo_matrix_t sizeMatrix;
+    cairo_matrix_t identityMatrix;
+
+    double adjustedSize = aStyle->size;
+    if (aStyle->sizeAdjust >= 0.0) {
+        adjustedSize = aStyle->GetAdjustedSize(GetAspect());
+    }
+    cairo_matrix_init_scale(&sizeMatrix, adjustedSize, adjustedSize);
+    cairo_matrix_init_identity(&identityMatrix);
+
+    if (needsOblique) {
+        const double kSkewFactor = OBLIQUE_SKEW_FACTOR;
+
+        cairo_matrix_t style;
+        cairo_matrix_init(&style,
+                          1,                //xx
+                          0,                //yx
+                          -1 * kSkewFactor,  //xy
+                          1,                //yy
+                          0,                //x0
+                          0);               //y0
+        cairo_matrix_multiply(&sizeMatrix, &sizeMatrix, &style);
+    }
+
+    cairo_font_options_t *fontOptions = cairo_font_options_create();
+    PrepareFontOptions(aRenderPattern, fontOptions);
+
+    scaledFont = cairo_scaled_font_create(face, &sizeMatrix,
+                                          &identityMatrix, fontOptions);
+    cairo_font_options_destroy(fontOptions);
+
+    NS_ASSERTION(cairo_scaled_font_status(scaledFont) == CAIRO_STATUS_SUCCESS,
+                 "Failed to make scaled font");
+
+    cairo_font_face_destroy(face);
+
+    return scaledFont;
+}
+
+#ifdef MOZ_WIDGET_GTK
+// defintion included below
+static void ApplyGdkScreenFontOptions(FcPattern *aPattern);
+#endif
+
+static void
+PreparePattern(FcPattern* aPattern, bool aIsPrinterFont)
+{
+    FcConfigSubstitute(nullptr, aPattern, FcMatchPattern);
+
+    // This gets cairo_font_options_t for the Screen.  We should have
+    // different font options for printing (no hinting) but we are not told
+    // what we are measuring for.
+    //
+    // If cairo adds support for lcd_filter, gdk will not provide the default
+    // setting for that option.  We could get the default setting by creating
+    // an xlib surface once, recording its font_options, and then merging the
+    // gdk options.
+    //
+    // Using an xlib surface would also be an option to get Screen font
+    // options for non-GTK X11 toolkits, but less efficient than using GDK to
+    // pick up dynamic changes.
+    if(aIsPrinterFont) {
+       cairo_font_options_t *options = cairo_font_options_create();
+       cairo_font_options_set_hint_style (options, CAIRO_HINT_STYLE_NONE);
+       cairo_font_options_set_antialias (options, CAIRO_ANTIALIAS_GRAY);
+       cairo_ft_font_options_substitute(options, aPattern);
+       cairo_font_options_destroy(options);
+       FcPatternAddBool(aPattern, PRINTING_FC_PROPERTY, FcTrue);
+    } else {
+#ifdef MOZ_WIDGET_GTK
+       ApplyGdkScreenFontOptions(aPattern);
+#endif
+    }
+
+    FcDefaultSubstitute(aPattern);
+}
+
+gfxFont*
+gfxFontconfigFontEntry::CreateFontInstance(const gfxFontStyle *aFontStyle,
+                                           bool aNeedsBold)
+{
+    nsAutoRef<FcPattern> pattern(FcPatternCreate());
+    FcPatternAddDouble(pattern, FC_PIXEL_SIZE, aFontStyle->size);
+
+    PreparePattern(pattern, aFontStyle->printerFont);
+    nsAutoRef<FcPattern> renderPattern
+        (FcFontRenderPrepare(nullptr, pattern, mFontPattern));
+
+    cairo_scaled_font_t* scaledFont =
+        CreateScaledFont(renderPattern, aFontStyle, aNeedsBold);
+    gfxFont* newFont =
+        new gfxFontconfigFont(scaledFont, this, aFontStyle, aNeedsBold);
+    cairo_scaled_font_destroy(scaledFont);
+
+    return newFont;
+}
+
+nsresult
+gfxFontconfigFontEntry::CopyFontTable(uint32_t aTableTag,
+                                      FallibleTArray<uint8_t>& aBuffer)
+{
+    NS_ASSERTION(!mIsDataUserFont,
+                 "data fonts should be reading tables directly from memory");
+
+    if (!mFTFaceInitialized) {
+        mFTFaceInitialized = true;
+        FcChar8 *filename;
+        if (FcPatternGetString(mFontPattern, FC_FILE, 0, &filename) != FcResultMatch) {
+            return NS_ERROR_FAILURE;
+        }
+        int index;
+        if (FcPatternGetInteger(mFontPattern, FC_INDEX, 0, &index) != FcResultMatch) {
+            index = 0; // default to 0 if not found in pattern
+        }
+        if (FT_New_Face(gfxFcPlatformFontList::GetFTLibrary(),
+                        (const char*)filename, index, &mFTFace) != 0) {
+            return NS_ERROR_FAILURE;
+        }
+    }
+
+    if (!mFTFace) {
+        return NS_ERROR_NOT_AVAILABLE;
+    }
+
+    FT_ULong length = 0;
+    if (FT_Load_Sfnt_Table(mFTFace, aTableTag, 0, nullptr, &length) != 0) {
+        return NS_ERROR_NOT_AVAILABLE;
+    }
+    if (!aBuffer.SetLength(length)) {
+        return NS_ERROR_OUT_OF_MEMORY;
+    }
+    if (FT_Load_Sfnt_Table(mFTFace, aTableTag, 0, aBuffer.Elements(), &length) != 0) {
+        aBuffer.Clear();
+        return NS_ERROR_FAILURE;
+    }
+
+    return NS_OK;
+}
+
+void
+gfxFontconfigFontFamily::FindStyleVariations(FontInfoData *aFontInfoData)
+{
+    if (mHasStyles) {
+        return;
+    }
+
+    // add font entries for each of the faces
+    gfxPlatformFontList *fp = gfxPlatformFontList::PlatformFontList();
+    uint32_t numFonts = mFontPatterns.Length();
+    NS_ASSERTION(numFonts, "font family containing no faces!!");
+    for (uint32_t i = 0; i < numFonts; i++) {
+        FcPattern* face = mFontPatterns[i];
+
+        // figure out the psname/fullname and choose which to use as the facename
+        nsAutoString psname, fullname;
+        GetFaceNames(face, mName, psname, fullname);
+        const nsAutoString& faceName = !psname.IsEmpty() ? psname : fullname;
+
+        gfxFontconfigFontEntry *fontEntry =
+            new gfxFontconfigFontEntry(faceName, face);
+        AddFontEntry(fontEntry);
+
+        // add entry to local name lists
+        if (!psname.IsEmpty()) {
+            fp->AddPostscriptName(fontEntry, psname);
+        }
+        NS_ASSERTION(!fullname.IsEmpty(), "empty font fullname");
+        if (!fullname.IsEmpty()) {
+            fp->AddFullname(fontEntry, fullname);
+        }
+
+        if (LOG_FONTLIST_ENABLED()) {
+            LOG_FONTLIST(("(fontlist) added (%s) to family (%s)"
+                 " with style: %s weight: %d stretch: %d"
+                 " psname: %s fullname: %s",
+                 NS_ConvertUTF16toUTF8(fontEntry->Name()).get(),
+                 NS_ConvertUTF16toUTF8(Name()).get(),
+                 fontEntry->IsItalic() ? "italic" : "normal",
+                 fontEntry->Weight(), fontEntry->Stretch(),
+                 NS_ConvertUTF16toUTF8(psname).get(),
+                 NS_ConvertUTF16toUTF8(fullname).get()));
+        }
+    }
+    mFaceNamesInitialized = true;
+    mFontPatterns.Clear();
+    SetHasStyles(true);
+}
+
+void
+gfxFontconfigFontFamily::AddFontPattern(FcPattern* aFontPattern)
+{
+    NS_ASSERTION(!mHasStyles,
+                 "font patterns must not be added to already enumerated families");
+
+    nsCountedRef<FcPattern> pattern(aFontPattern);
+    mFontPatterns.AppendElement(pattern);
+}
+
+gfxFontconfigFont::gfxFontconfigFont(cairo_scaled_font_t *aScaledFont,
+                                     gfxFontEntry *aFontEntry,
+                                     const gfxFontStyle *aFontStyle,
+                                     bool aNeedsBold) :
+    gfxFT2FontBase(aScaledFont, aFontEntry, aFontStyle)
+{
+}
+
+gfxFontconfigFont::~gfxFontconfigFont()
+{
+}
+
+#ifdef USE_SKIA
+mozilla::TemporaryRef<mozilla::gfx::GlyphRenderingOptions>
+gfxFontconfigFont::GetGlyphRenderingOptions(const TextRunDrawParams* aRunParams)
+{
+  cairo_scaled_font_t *scaled_font = CairoScaledFont();
+  cairo_font_options_t *options = cairo_font_options_create();
+  cairo_scaled_font_get_font_options(scaled_font, options);
+  cairo_hint_style_t hint_style = cairo_font_options_get_hint_style(options);
+  cairo_font_options_destroy(options);
+
+  mozilla::gfx::FontHinting hinting;
+
+  switch (hint_style) {
+    case CAIRO_HINT_STYLE_NONE:
+      hinting = mozilla::gfx::FontHinting::NONE;
+      break;
+    case CAIRO_HINT_STYLE_SLIGHT:
+      hinting = mozilla::gfx::FontHinting::LIGHT;
+      break;
+    case CAIRO_HINT_STYLE_FULL:
+      hinting = mozilla::gfx::FontHinting::FULL;
+      break;
+    default:
+      hinting = mozilla::gfx::FontHinting::NORMAL;
+      break;
+  }
+
+  // We don't want to force the use of the autohinter over the font's built in hints
+  return mozilla::gfx::Factory::CreateCairoGlyphRenderingOptions(hinting, false);
+}
+#endif
+
+gfxFcPlatformFontList::gfxFcPlatformFontList()
+    : mLocalNames(64), mGenericMappings(32), mLastConfig(nullptr)
+{
+    // if the rescan interval is set, start the timer
+    int rescanInterval = FcConfigGetRescanInterval(nullptr);
+    if (rescanInterval) {
+        mLastConfig = FcConfigGetCurrent();
+        mCheckFontUpdatesTimer = do_CreateInstance("@mozilla.org/timer;1");
+        if (mCheckFontUpdatesTimer) {
+            mCheckFontUpdatesTimer->
+                InitWithFuncCallback(CheckFontUpdates, this,
+                                     (rescanInterval + 1) * 1000,
+                                     nsITimer::TYPE_REPEATING_SLACK);
+        } else {
+            NS_WARNING("Failure to create font updates timer");
+        }
+    }
+
+#ifdef MOZ_BUNDLED_FONTS
+    mBundledFontsInitialized = false;
+#endif
+}
+
+gfxFcPlatformFontList::~gfxFcPlatformFontList()
+{
+    if (mCheckFontUpdatesTimer) {
+        mCheckFontUpdatesTimer->Cancel();
+        mCheckFontUpdatesTimer = nullptr;
+    }
+}
+
+void
+gfxFcPlatformFontList::AddFontSetFamilies(FcFontSet* aFontSet)
+{
+    // This iterates over the fonts in a font set and adds in gfxFontFamily
+    // objects for each family. The patterns for individual fonts are not
+    // copied here. When a family is actually used, the fonts in the family
+    // are enumerated and the patterns copied. Note that we're explicitly
+    // excluding non-scalable fonts such as X11 bitmap fonts, which
+    // Chrome Skia/Webkit code does also.
+
+    if (!aFontSet) {
+        NS_WARNING("AddFontSetFamilies called with a null font set.");
+        return;
+    }
+
+    FcChar8* lastFamilyName = (FcChar8*)"";
+    gfxFontFamily* fontFamily = nullptr;
+    nsAutoString familyName;
+    for (int f = 0; f < aFontSet->nfont; f++) {
+        FcPattern* font = aFontSet->fonts[f];
+
+        // not scalable? skip...
+        FcBool scalable;
+        if (FcPatternGetBool(font, FC_SCALABLE, 0, &scalable) != FcResultMatch ||
+            !scalable) {
+            continue;
+        }
+
+        // get canonical name
+        uint32_t cIndex = FindCanonicalNameIndex(font, FC_FAMILYLANG);
+        FcChar8* canonical = nullptr;
+        FcPatternGetString(font, FC_FAMILY, cIndex, &canonical);
+        if (!canonical) {
+            continue;
+        }
+
+        // same as the last one? no need to add a new family, skip
+        if (FcStrCmp(canonical, lastFamilyName) != 0) {
+            lastFamilyName = canonical;
+
+            // add new family if one doesn't already exist
+            familyName.Truncate();
+            AppendUTF8toUTF16(ToCharPtr(canonical), familyName);
+            nsAutoString keyName(familyName);
+            ToLowerCase(keyName);
+
+            fontFamily = mFontFamilies.GetWeak(keyName);
+            if (!fontFamily) {
+                fontFamily = new gfxFontconfigFontFamily(familyName);
+                mFontFamilies.Put(keyName, fontFamily);
+            }
+
+            // Add pointers to other localized family names. Most fonts
+            // only have a single name, so the first call to GetString
+            // will usually not match
+            FcChar8* otherName;
+            int n = (cIndex == 0 ? 1 : 0);
+            while (FcPatternGetString(font, FC_FAMILY, n, &otherName) == FcResultMatch) {
+                NS_ConvertUTF8toUTF16 otherFamilyName(ToCharPtr(otherName));
+                AddOtherFamilyName(fontFamily, otherFamilyName);
+                n++;
+                if (n == int(cIndex)) {
+                    n++; // skip over canonical name
+                }
+            }
+        }
+
+        NS_ASSERTION(fontFamily, "font must belong to a font family");
+        gfxFontconfigFontFamily* fcFamily =
+            static_cast<gfxFontconfigFontFamily*>(fontFamily);
+        fcFamily->AddFontPattern(font);
+
+        // map the psname, fullname ==> font family for local font lookups
+        nsAutoString psname, fullname;
+        GetFaceNames(font, familyName, psname, fullname);
+        if (!psname.IsEmpty()) {
+            ToLowerCase(psname);
+            mLocalNames.Put(psname, fontFamily);
+        }
+        if (!fullname.IsEmpty()) {
+            ToLowerCase(fullname);
+            mLocalNames.Put(fullname, fontFamily);
+        }
+    }
+}
+
+nsresult
+gfxFcPlatformFontList::InitFontList()
+{
+    mLastConfig = FcConfigGetCurrent();
+
+    // reset font lists
+    gfxPlatformFontList::InitFontList();
+
+    mLocalNames.Clear();
+    mGenericMappings.Clear();
+
+    // iterate over available fonts
+    FcFontSet* systemFonts = FcConfigGetFonts(nullptr, FcSetSystem);
+    AddFontSetFamilies(systemFonts);
+
+#ifdef MOZ_BUNDLED_FONTS
+    ActivateBundledFonts();
+    FcFontSet* appFonts = FcConfigGetFonts(nullptr, FcSetApplication);
+    AddFontSetFamilies(appFonts);
+#endif
+
+    mOtherFamilyNamesInitialized = true;
+    return NS_OK;
+}
+
+// For displaying the fontlist in UI, use explicit call to FcFontList. Using
+// FcFontList results in the list containing the localized names as dictated
+// by system defaults.
+static void
+GetSystemFontList(nsTArray<nsString>& aListOfFonts, nsIAtom *aLangGroup)
+{
+    aListOfFonts.Clear();
+
+    nsAutoRef<FcPattern> pat(FcPatternCreate());
+    if (!pat) {
+        return;
+    }
+
+    nsAutoRef<FcObjectSet> os(FcObjectSetBuild(FC_FAMILY, nullptr));
+    if (!os) {
+        return;
+    }
+
+    // add the lang to the pattern
+    nsAutoCString fcLang;
+    GetSampleLangForGroup(aLangGroup, fcLang);
+    if (!fcLang.IsEmpty()) {
+        FcPatternAddString(pat, FC_LANG, ToFcChar8Ptr(fcLang.get()));
+    }
+
+    // ignore size-specific fonts
+    FcPatternAddBool(pat, FC_SCALABLE, FcTrue);
+
+    nsAutoRef<FcFontSet> fs(FcFontList(nullptr, pat, os));
+    if (!fs) {
+        return;
+    }
+
+    for (int i = 0; i < fs->nfont; i++) {
+        char *family;
+
+        if (FcPatternGetString(fs->fonts[i], FC_FAMILY, 0,
+                               (FcChar8 **) &family) != FcResultMatch)
+        {
+            continue;
+        }
+
+        // Remove duplicates...
+        nsAutoString strFamily;
+        AppendUTF8toUTF16(family, strFamily);
+        if (aListOfFonts.Contains(strFamily)) {
+            continue;
+        }
+
+        aListOfFonts.AppendElement(strFamily);
+    }
+
+    aListOfFonts.Sort();
+}
+
+void
+gfxFcPlatformFontList::GetFontList(nsIAtom *aLangGroup,
+                                   const nsACString& aGenericFamily,
+                                   nsTArray<nsString>& aListOfFonts)
+{
+    // Get the list of font family names using fontconfig
+    GetSystemFontList(aListOfFonts, aLangGroup);
+
+    // Under Linux, the generics "serif", "sans-serif" and "monospace"
+    // are included in the pref fontlist. These map to whatever fontconfig
+    // decides they should be for a given language, rather than one of the
+    // fonts listed in the prefs font lists (e.g. font.name.*, font.name-list.*)
+    bool serif = false, sansSerif = false, monospace = false;
+    if (aGenericFamily.IsEmpty())
+        serif = sansSerif = monospace = true;
+    else if (aGenericFamily.LowerCaseEqualsLiteral("serif"))
+        serif = true;
+    else if (aGenericFamily.LowerCaseEqualsLiteral("sans-serif"))
+        sansSerif = true;
+    else if (aGenericFamily.LowerCaseEqualsLiteral("monospace"))
+        monospace = true;
+    else if (aGenericFamily.LowerCaseEqualsLiteral("cursive") ||
+             aGenericFamily.LowerCaseEqualsLiteral("fantasy"))
+        serif = sansSerif = true;
+    else
+        NS_NOTREACHED("unexpected CSS generic font family");
+
+    // The first in the list becomes the default in
+    // FontBuilder.readFontSelection() if the preference-selected font is not
+    // available, so put system configured defaults first.
+    if (monospace)
+        aListOfFonts.InsertElementAt(0, NS_LITERAL_STRING("monospace"));
+    if (sansSerif)
+        aListOfFonts.InsertElementAt(0, NS_LITERAL_STRING("sans-serif"));
+    if (serif)
+        aListOfFonts.InsertElementAt(0, NS_LITERAL_STRING("serif"));
+}
+
+gfxFontFamily*
+gfxFcPlatformFontList::GetDefaultFont(const gfxFontStyle* aStyle)
+{
+    return FindGenericFamily(NS_LITERAL_STRING("serif"), nsGkAtoms::x_western);
+}
+
+gfxFontEntry*
+gfxFcPlatformFontList::LookupLocalFont(const nsAString& aFontName,
+                                       uint16_t aWeight,
+                                       int16_t aStretch,
+                                       bool aItalic)
+{
+    gfxFontEntry* lookup;
+
+    // first, lookup in face name lists
+    lookup = FindFaceName(aFontName);
+    if (!lookup) {
+        // if not found, check in global facename ==> family list
+        nsAutoString keyName(aFontName);
+        ToLowerCase(keyName);
+        gfxFontFamily* fontFamily = mLocalNames.GetWeak(keyName);
+
+        // name is not in the global list, done
+        if (!fontFamily) {
+            return nullptr;
+        }
+
+        // name is in global list but family needs enumeration
+        fontFamily->FindStyleVariations();
+
+        // facename ==> font entry should now be in the list
+        lookup = FindFaceName(aFontName);
+        NS_ASSERTION(lookup, "facename to family mapping failure");
+        if (!lookup) {
+            return nullptr;
+        }
+    }
+
+    gfxFontconfigFontEntry* fcFontEntry =
+        static_cast<gfxFontconfigFontEntry*>(lookup);
+
+    return new gfxFontconfigFontEntry(fcFontEntry->Name(),
+                                      fcFontEntry->GetPattern(),
+                                      aWeight, aStretch, aItalic);
+}
+
+gfxFontEntry*
+gfxFcPlatformFontList::MakePlatformFont(const nsAString& aFontName,
+                                        uint16_t aWeight,
+                                        int16_t aStretch,
+                                        bool aItalic,
+                                        const uint8_t* aFontData,
+                                        uint32_t aLength)
+{
+    FT_Face face;
+    FT_Error error =
+        FT_New_Memory_Face(gfxFcPlatformFontList::GetFTLibrary(),
+                           aFontData, aLength, 0, &face);
+    if (error != FT_Err_Ok) {
+        NS_Free((void*)aFontData);
+        return nullptr;
+    }
+    if (FT_Err_Ok != FT_Select_Charmap(face, FT_ENCODING_UNICODE)) {
+        FT_Done_Face(face);
+        NS_Free((void*)aFontData);
+        return nullptr;
+    }
+
+    return new gfxFontconfigFontEntry(aFontName, aWeight, aStretch, aItalic,
+                                      aFontData, face);
+}
+
+gfxFontFamily*
+gfxFcPlatformFontList::FindFamily(const nsAString& aFamily,
+                                  nsIAtom* aLanguage,
+                                  bool aUseSystemFonts)
+{
+    nsAutoString familyName(aFamily);
+    ToLowerCase(familyName);
+
+    // deprecated generic names are explicitly converted to standard generics
+    bool isDeprecatedGeneric = false;
+    if (familyName.EqualsLiteral("sans") ||
+        familyName.EqualsLiteral("sans serif")) {
+        familyName.AssignLiteral("sans-serif");
+        isDeprecatedGeneric = true;
+    } else if (familyName.EqualsLiteral("mono")) {
+        familyName.AssignLiteral("monospace");
+        isDeprecatedGeneric = true;
+    }
+
+    // fontconfig generics? use fontconfig to determine the family for lang
+    if (isDeprecatedGeneric ||
+        mozilla::FontFamilyName::Convert(familyName).IsGeneric()) {
+        return FindGenericFamily(familyName, aLanguage);
+    }
+
+    // fontconfig allows conditional substitutions in such a way that it's
+    // difficult to distinguish an explicit substitution from other suggested
+    // choices. To sniff out explicit substitutions, compare the substitutions
+    // for "font, -moz-sentinel" to "-moz-sentinel" to sniff out the
+    // substitutions
+    //
+    // Example:
+    //
+    //   serif ==> DejaVu Serif, ...
+    //   Helvetica, serif ==> Helvetica, TeX Gyre Heros, Nimbus Sans L, DejaVu Serif
+    //
+    // In this case fontconfig is including Tex Gyre Heros and
+    // Nimbus Sans L as alternatives for Helvetica.
+
+    // substitutions for serif pattern
+    const FcChar8* kSentinelName = ToFcChar8Ptr("-moz-sentinel");
+    nsAutoRef<FcPattern> sentinelSubst(FcPatternCreate());
+    FcPatternAddString(sentinelSubst, FC_FAMILY, kSentinelName);
+    FcConfigSubstitute(nullptr, sentinelSubst, FcMatchPattern);
+    FcChar8* sentinelFirstFamily = nullptr;
+    FcPatternGetString(sentinelSubst, FC_FAMILY, 0, &sentinelFirstFamily);
+
+    // substitutions for font, -moz-sentinel pattern
+    nsAutoRef<FcPattern> fontWithSentinel(FcPatternCreate());
+    NS_ConvertUTF16toUTF8 familyToFind(familyName);
+    FcPatternAddString(fontWithSentinel, FC_FAMILY, ToFcChar8Ptr(familyToFind.get()));
+    FcPatternAddString(fontWithSentinel, FC_FAMILY, kSentinelName);
+    FcConfigSubstitute(nullptr, fontWithSentinel, FcMatchPattern);
+
+    // iterate through substitutions until hitting the first serif font
+    FcChar8* substName = nullptr;
+    for (int i = 0;
+         FcPatternGetString(fontWithSentinel, FC_FAMILY,
+                            i, &substName) == FcResultMatch;
+         i++)
+    {
+        NS_ConvertUTF8toUTF16 subst(ToCharPtr(substName));
+        if (sentinelFirstFamily && FcStrCmp(substName, sentinelFirstFamily) == 0) {
+            break;
+        }
+        gfxFontFamily* foundFamily = gfxPlatformFontList::FindFamily(subst);
+        if (foundFamily) {
+            return foundFamily;
+        }
+    }
+
+    return nullptr;
+}
+
+bool
+gfxFcPlatformFontList::GetStandardFamilyName(const nsAString& aFontName,
+                                             nsAString& aFamilyName)
+{
+    // The fontconfig list of fonts includes generic family names in the
+    // font list. For these, just use the generic name.
+    if (aFontName.EqualsLiteral("serif") ||
+        aFontName.EqualsLiteral("sans-serif") ||
+        aFontName.EqualsLiteral("monospace")) {
+        aFamilyName.Assign(aFontName);
+        return true;
+    }
+
+    gfxFontFamily *family = FindFamily(aFontName);
+    if (family) {
+        family->LocalizedName(aFamilyName);
+        return true;
+    }
+
+    return false;
+}
+
+/* static */ FT_Library
+gfxFcPlatformFontList::GetFTLibrary()
+{
+    if (!sCairoFTLibrary) {
+        // Use cairo's FT_Library so that cairo takes care of shutdown of the
+        // FT_Library after it has destroyed its font_faces, and FT_Done_Face
+        // has been called on each FT_Face, at least until this bug is fixed:
+        // https://bugs.freedesktop.org/show_bug.cgi?id=18857
+        //
+        // Cairo keeps it's own FT_Library object for creating FT_Face
+        // instances, so use that. There's no simple API for accessing this
+        // so use the hacky method below of making a font and extracting
+        // the library pointer from that.
+
+        bool needsBold;
+        gfxFontStyle style;
+        gfxPlatformFontList* pfl = gfxPlatformFontList::PlatformFontList();
+        gfxFontFamily* family = pfl->GetDefaultFont(&style);
+        NS_ASSERTION(family, "couldn't find a default font family");
+        gfxFontEntry* fe = family->FindFontForStyle(style, needsBold);
+        if (!fe) {
+            return nullptr;
+        }
+        nsRefPtr<gfxFont> font = fe->FindOrMakeFont(&style, false);
+        if (!font) {
+            return nullptr;
+        }
+
+        gfxFT2FontBase* ft2Font = reinterpret_cast<gfxFT2FontBase*>(font.get());
+        gfxFT2LockedFace face(ft2Font);
+        if (!face.get()) {
+            return nullptr;
+        }
+
+        sCairoFTLibrary = face.get()->glyph->library;
+    }
+
+    return sCairoFTLibrary;
+}
+
+gfxFontFamily*
+gfxFcPlatformFontList::FindGenericFamily(const nsAString& aGeneric,
+                                         nsIAtom* aLanguage)
+{
+    // set up name
+    NS_ConvertUTF16toUTF8 generic(aGeneric);
+
+    nsAutoCString fcLang;
+    GetSampleLangForGroup(aLanguage, fcLang);
+
+    nsAutoCString genericLang(generic);
+    genericLang.Append(fcLang);
+
+    // try to get the family from the cache
+    gfxFontFamily *genericFamily = mGenericMappings.GetWeak(genericLang);
+    if (genericFamily) {
+        return genericFamily;
+    }
+
+    // if not found, ask fontconfig to pick the appropriate font
+    nsAutoRef<FcPattern> genericPattern(FcPatternCreate());
+    FcPatternAddString(genericPattern, FC_FAMILY,
+                       ToFcChar8Ptr(generic.get()));
+
+    // -- add the lang to the pattern
+    if (!fcLang.IsEmpty()) {
+        FcPatternAddString(genericPattern, FC_LANG,
+                           ToFcChar8Ptr(fcLang.get()));
+    }
+
+    // -- perform substitutions
+    FcConfigSubstitute(nullptr, genericPattern, FcMatchPattern);
+    FcDefaultSubstitute(genericPattern);
+
+    // -- sort to get the closest matches
+    FcResult result;
+    nsAutoRef<FcFontSet> faces(FcFontSort(nullptr, genericPattern, FcFalse,
+                                          nullptr, &result));
+
+    // -- pick the first font for which a font family exists
+    for (int i = 0; i < faces->nfont; i++) {
+        FcPattern* font = faces->fonts[i];
+        FcChar8* mappedGeneric = nullptr;
+
+        // not scalable? skip...
+        FcBool scalable;
+        if (FcPatternGetBool(font, FC_SCALABLE, 0, &scalable) != FcResultMatch ||
+            !scalable) {
+            continue;
+        }
+
+        FcPatternGetString(font, FC_FAMILY, 0, &mappedGeneric);
+        if (mappedGeneric) {
+            NS_ConvertUTF8toUTF16 mappedGenericName(ToCharPtr(mappedGeneric));
+            genericFamily = gfxPlatformFontList::FindFamily(mappedGenericName);
+            if (genericFamily) {
+                //printf("generic %s ==> %s\n", genericLang.get(), (const char*)mappedGeneric);
+                mGenericMappings.Put(genericLang, genericFamily);
+                break;
+            }
+        }
+    }
+
+    return genericFamily;
+}
+
+/* static */ void
+gfxFcPlatformFontList::CheckFontUpdates(nsITimer *aTimer, void *aThis)
+{
+    // check for font updates
+    FcInitBringUptoDate();
+
+    // update fontlist if current config changed
+    gfxFcPlatformFontList *pfl = static_cast<gfxFcPlatformFontList*>(aThis);
+    FcConfig* current = FcConfigGetCurrent();
+    if (current != pfl->GetLastConfig()) {
+        pfl->UpdateFontList();
+        pfl->ForceGlobalReflow();
+    }
+}
+
+#ifdef MOZ_BUNDLED_FONTS
+void
+gfxFcPlatformFontList::ActivateBundledFonts()
+{
+    if (!mBundledFontsInitialized) {
+        mBundledFontsInitialized = true;
+        nsCOMPtr<nsIFile> localDir;
+        nsresult rv = NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(localDir));
+        if (NS_FAILED(rv)) {
+            return;
+        }
+        if (NS_FAILED(localDir->Append(NS_LITERAL_STRING("fonts")))) {
+            return;
+        }
+        bool isDir;
+        if (NS_FAILED(localDir->IsDirectory(&isDir)) || !isDir) {
+            return;
+        }
+        if (NS_FAILED(localDir->GetNativePath(mBundledFontsPath))) {
+            return;
+        }
+    }
+    if (!mBundledFontsPath.IsEmpty()) {
+        FcConfigAppFontAddDir(nullptr, ToFcChar8Ptr(mBundledFontsPath.get()));
+    }
+}
+#endif
+
+#ifdef MOZ_WIDGET_GTK
+/***************************************************************************
+ *
+ * This function must be last in the file because it uses the system cairo
+ * library.  Above this point the cairo library used is the tree cairo if
+ * MOZ_TREE_CAIRO.
+ */
+
+#if MOZ_TREE_CAIRO
+// Tree cairo symbols have different names.  Disable their activation through
+// preprocessor macros.
+#undef cairo_ft_font_options_substitute
+
+// The system cairo functions are not declared because the include paths cause
+// the gdk headers to pick up the tree cairo.h.
+extern "C" {
+NS_VISIBILITY_DEFAULT void
+cairo_ft_font_options_substitute (const cairo_font_options_t *options,
+                                  FcPattern                  *pattern);
+}
+#endif
+
+static void
+ApplyGdkScreenFontOptions(FcPattern *aPattern)
+{
+    const cairo_font_options_t *options =
+        gdk_screen_get_font_options(gdk_screen_get_default());
+
+    cairo_ft_font_options_substitute(options, aPattern);
+}
+
+#endif // MOZ_WIDGET_GTK2
+
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFcPlatformFontList.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFcPlatformFontList.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFcPlatformFontList.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFcPlatformFontList.h	2015-05-25 20:42:41.000000000 +0000
@@ -0,0 +1,263 @@
+/* -*- 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 GFXFCPLATFORMFONTLIST_H_
+#define GFXFCPLATFORMFONTLIST_H_
+
+#include "gfxFont.h"
+#include "gfxFontEntry.h"
+#include "gfxFT2FontBase.h"
+#include "gfxPlatformFontList.h"
+#include "mozilla/mozalloc.h"
+
+#include <fontconfig/fontconfig.h>
+#include "ft2build.h"
+#include FT_FREETYPE_H
+#include FT_TRUETYPE_TABLES_H
+#include <cairo.h>
+#include <cairo-ft.h>
+
+#include "gfxFontconfigUtils.h" // xxx - only for nsAutoRefTraits<FcPattern>, etc.
+
+template <>
+class nsAutoRefTraits<FcObjectSet> : public nsPointerRefTraits<FcObjectSet>
+{
+public:
+    static void Release(FcObjectSet *ptr) { FcObjectSetDestroy(ptr); }
+};
+
+template <>
+class nsAutoRefTraits<FcConfig> : public nsPointerRefTraits<FcConfig>
+{
+public:
+    static void Release(FcConfig *ptr) { FcConfigDestroy(ptr); }
+    static void AddRef(FcConfig *ptr) { FcConfigReference(ptr); }
+};
+
+// Helper classes used for clearning out user font data when cairo font
+// face is destroyed. Since multiple faces may use the same data, be
+// careful to assure that the data is only cleared out when all uses
+// expire. The font entry object contains a refptr to FTUserFontData and
+// each cairo font created from that font entry contains a
+// FTUserFontDataRef with a refptr to that same FTUserFontData object.
+
+class FTUserFontData {
+public:
+    NS_INLINE_DECL_REFCOUNTING(FTUserFontData)
+
+    explicit FTUserFontData(FT_Face aFace, const uint8_t* aData)
+        : mFace(aFace), mFontData(aData)
+    {
+    }
+
+    const uint8_t *FontData() const { return mFontData; }
+
+private:
+    ~FTUserFontData()
+    {
+        FT_Done_Face(mFace);
+        if (mFontData) {
+            NS_Free((void*)mFontData);
+        }
+    }
+
+    FT_Face        mFace;
+    const uint8_t *mFontData;
+};
+
+class FTUserFontDataRef {
+public:
+    explicit FTUserFontDataRef(FTUserFontData *aUserFontData)
+        : mUserFontData(aUserFontData)
+    {
+    }
+
+    static void Destroy(void* aData) {
+        FTUserFontDataRef* aUserFontDataRef =
+            static_cast<FTUserFontDataRef*>(aData);
+        delete aUserFontDataRef;
+    }
+
+private:
+    nsRefPtr<FTUserFontData> mUserFontData;
+};
+
+// The names for the font entry and font classes should really
+// the common 'Fc' abbreviation but the gfxPangoFontGroup code already
+// defines versions of these, so use the verbose name for now.
+
+class gfxFontconfigFontEntry : public gfxFontEntry {
+public:
+    // used for system fonts with explicit patterns
+    explicit gfxFontconfigFontEntry(const nsAString& aFaceName,
+                                    FcPattern* aFontPattern);
+
+    // used for data fonts where the fontentry takes ownership
+    // of the font data and the FT_Face
+    explicit gfxFontconfigFontEntry(const nsAString& aFaceName,
+                                    uint16_t aWeight,
+                                    int16_t aStretch,
+                                    bool aItalic,
+                                    const uint8_t *aData,
+                                    FT_Face aFace);
+
+    // used for @font-face local system fonts with explicit patterns
+    explicit gfxFontconfigFontEntry(const nsAString& aFaceName,
+                                    FcPattern* aFontPattern,
+                                    uint16_t aWeight,
+                                    int16_t aStretch,
+                                    bool aItalic);
+
+    FcPattern* GetPattern() { return mFontPattern; }
+
+    bool SupportsLangGroup(nsIAtom *aLangGroup) const override;
+
+    nsresult ReadCMAP(FontInfoData *aFontInfoData = nullptr) override;
+    bool TestCharacterMap(uint32_t aCh) override;
+
+    hb_blob_t* GetFontTable(uint32_t aTableTag) override;
+
+    void ForgetHBFace() override;
+    void ReleaseGrFace(gr_face* aFace) override;
+
+protected:
+    virtual ~gfxFontconfigFontEntry();
+
+    gfxFont *CreateFontInstance(const gfxFontStyle *aFontStyle,
+                                bool aNeedsBold) override;
+
+    // helper method for creating cairo font from pattern
+    cairo_scaled_font_t*
+    CreateScaledFont(FcPattern* aRenderPattern,
+                     const gfxFontStyle *aStyle,
+                     bool aNeedsBold);
+
+    // override to pull data from FTFace
+    virtual nsresult
+    CopyFontTable(uint32_t aTableTag,
+                  FallibleTArray<uint8_t>& aBuffer) override;
+
+    // if HB or GR faces are gone, close down the FT_Face
+    void MaybeReleaseFTFace();
+
+    double GetAspect();
+
+    // pattern for a single face of a family
+    nsCountedRef<FcPattern> mFontPattern;
+
+    // user font data, when needed
+    nsRefPtr<FTUserFontData> mUserFontData;
+
+    // FTFace - initialized when needed
+    FT_Face   mFTFace;
+    bool      mFTFaceInitialized;
+    double    mAspect;
+
+    // data font
+    const uint8_t* mFontData;
+};
+
+class gfxFontconfigFontFamily : public gfxFontFamily {
+public:
+    explicit gfxFontconfigFontFamily(const nsAString& aName) :
+        gfxFontFamily(aName) { }
+
+    void FindStyleVariations(FontInfoData *aFontInfoData = nullptr) override;
+
+    // Families are constructed initially with just references to patterns.
+    // When necessary, these are enumerated within FindStyleVariations.
+    void AddFontPattern(FcPattern* aFontPattern);
+
+protected:
+    virtual ~gfxFontconfigFontFamily() { }
+
+    nsTArray<nsCountedRef<FcPattern> > mFontPatterns;
+};
+
+class gfxFontconfigFont : public gfxFT2FontBase {
+public:
+    gfxFontconfigFont(cairo_scaled_font_t *aScaledFont,
+                      gfxFontEntry *aFontEntry,
+                      const gfxFontStyle *aFontStyle,
+                      bool aNeedsBold);
+
+#ifdef USE_SKIA
+    virtual mozilla::TemporaryRef<mozilla::gfx::GlyphRenderingOptions>
+    GetGlyphRenderingOptions(const TextRunDrawParams* aRunParams = nullptr) override;
+#endif
+
+protected:
+    virtual ~gfxFontconfigFont();
+};
+
+class gfxFcPlatformFontList : public gfxPlatformFontList {
+public:
+    gfxFcPlatformFontList();
+
+    // initialize font lists
+    nsresult InitFontList() override;
+
+    void GetFontList(nsIAtom *aLangGroup,
+                     const nsACString& aGenericFamily,
+                     nsTArray<nsString>& aListOfFonts) override;
+
+
+    gfxFontFamily*
+    GetDefaultFont(const gfxFontStyle* aStyle) override;
+
+    gfxFontEntry*
+    LookupLocalFont(const nsAString& aFontName, uint16_t aWeight,
+                    int16_t aStretch, bool aItalic) override;
+
+    gfxFontEntry*
+    MakePlatformFont(const nsAString& aFontName, uint16_t aWeight,
+                     int16_t aStretch, bool aItalic,
+                     const uint8_t* aFontData,
+                     uint32_t aLength) override;
+
+    gfxFontFamily* FindFamily(const nsAString& aFamily,
+                              nsIAtom* aLanguage = nullptr,
+                              bool aUseSystemFonts = false) override;
+
+    bool GetStandardFamilyName(const nsAString& aFontName,
+                               nsAString& aFamilyName) override;
+
+    FcConfig* GetLastConfig() const { return mLastConfig; }
+
+    static FT_Library GetFTLibrary();
+
+protected:
+    virtual ~gfxFcPlatformFontList();
+
+    // add all the font families found in a font set
+    void AddFontSetFamilies(FcFontSet* aFontSet);
+
+    // figure out which family fontconfig maps a generic to
+    // (aGeneric assumed already lowercase)
+    gfxFontFamily* FindGenericFamily(const nsAString& aGeneric,
+                                     nsIAtom* aLanguage);
+
+    static void CheckFontUpdates(nsITimer *aTimer, void *aThis);
+
+#ifdef MOZ_BUNDLED_FONTS
+    void ActivateBundledFonts();
+    nsCString mBundledFontsPath;
+    bool mBundledFontsInitialized;
+#endif
+
+    // to avoid enumerating all fonts, maintain a mapping of local font
+    // names to family
+    nsRefPtrHashtable<nsStringHashKey, gfxFontFamily> mLocalNames;
+
+    // caching generic/lang ==> font family
+    nsRefPtrHashtable<nsCStringHashKey, gfxFontFamily> mGenericMappings;
+
+    nsCOMPtr<nsITimer> mCheckFontUpdatesTimer;
+    nsCountedRef<FcConfig> mLastConfig;
+
+    static FT_Library sCairoFTLibrary;
+};
+
+#endif /* GFXPLATFORMFONTLIST_H_ */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFontconfigFonts.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFontconfigFonts.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFontconfigFonts.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFontconfigFonts.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -0,0 +1,2165 @@
+/* -*- 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 "prlink.h"
+#include "gfxTypes.h"
+
+#include "nsTArray.h"
+
+#include "gfxContext.h"
+#ifdef MOZ_WIDGET_GTK
+#include "gfxPlatformGtk.h"
+#endif
+#ifdef MOZ_WIDGET_QT
+#include "gfxQtPlatform.h"
+#endif
+#include "gfxFontconfigFonts.h"
+#include "gfxFT2FontBase.h"
+#include "gfxFT2Utils.h"
+#include "harfbuzz/hb.h"
+#include "harfbuzz/hb-ot.h"
+#include "nsUnicodeProperties.h"
+#include "nsUnicodeScriptCodes.h"
+#include "gfxFontconfigUtils.h"
+#include "gfxUserFontSet.h"
+#include "gfxFontConstants.h"
+
+#include <cairo.h>
+#include <cairo-ft.h>
+
+#include <fontconfig/fcfreetype.h>
+#include <pango/pango.h>
+
+#include FT_TRUETYPE_TABLES_H
+
+#ifdef MOZ_WIDGET_GTK
+#include <gdk/gdk.h>
+#endif
+
+#include <math.h>
+
+using namespace mozilla;
+using namespace mozilla::unicode;
+
+#define PRINTING_FC_PROPERTY "gfx.printing"
+
+static PangoLanguage *GuessPangoLanguage(nsIAtom *aLanguage);
+
+static cairo_scaled_font_t *
+CreateScaledFont(FcPattern *aPattern, cairo_font_face_t *aFace);
+
+static FT_Library gFTLibrary;
+
+// FC_FAMILYLANG and FC_FULLNAME were introduced in fontconfig-2.2.97
+// and so fontconfig-2.3.0 (2005).
+#ifndef FC_FAMILYLANG
+#define FC_FAMILYLANG "familylang"
+#endif
+#ifndef FC_FULLNAME
+#define FC_FULLNAME "fullname"
+#endif
+
+static PRFuncPtr
+FindFunctionSymbol(const char *name)
+{
+    PRLibrary *lib = nullptr;
+    PRFuncPtr result = PR_FindFunctionSymbolAndLibrary(name, &lib);
+    if (lib) {
+        PR_UnloadLibrary(lib);
+    }
+
+    return result;
+}
+
+static bool HasChar(FcPattern *aFont, FcChar32 wc)
+{
+    FcCharSet *charset = nullptr;
+    FcPatternGetCharSet(aFont, FC_CHARSET, 0, &charset);
+
+    return charset && FcCharSetHasChar(charset, wc);
+}
+
+/**
+ * gfxFcFontEntry:
+ *
+ * An abstract base class of for gfxFontEntry implementations used by
+ * gfxFcFont and gfxUserFontSet.
+ */
+
+class gfxFcFontEntry : public gfxFontEntry {
+public:
+    // For all FontEntrys attached to gfxFcFonts, there will be only one
+    // pattern in this array.  This is always a font pattern, not a fully
+    // resolved pattern.  gfxFcFont only uses this to construct a PangoFont.
+    //
+    // FontEntrys for src:local() fonts in gfxUserFontSet may return more than
+    // one pattern.  (See comment in gfxUserFcFontEntry.)
+    const nsTArray< nsCountedRef<FcPattern> >& GetPatterns()
+    {
+        return mPatterns;
+    }
+
+    static gfxFcFontEntry *LookupFontEntry(cairo_font_face_t *aFace)
+    {
+        return static_cast<gfxFcFontEntry*>
+            (cairo_font_face_get_user_data(aFace, &sFontEntryKey));
+    }
+
+    // override the gfxFontEntry impl to read the name from fontconfig
+    // instead of trying to get the 'name' table, as we don't implement
+    // GetFontTable() here
+    virtual nsString RealFaceName();
+
+    // This is needed to make gfxFontEntry::HasCharacter(aCh) work.
+    virtual bool TestCharacterMap(uint32_t aCh)
+    {
+        for (uint32_t i = 0; i < mPatterns.Length(); ++i) {
+            if (HasChar(mPatterns[i], aCh)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+protected:
+    explicit gfxFcFontEntry(const nsAString& aName)
+        : gfxFontEntry(aName)
+    {
+    }
+
+    // One pattern is the common case and some subclasses rely on successful
+    // addition of the first element to the array.
+    AutoFallibleTArray<nsCountedRef<FcPattern>,1> mPatterns;
+
+    static cairo_user_data_key_t sFontEntryKey;
+};
+
+cairo_user_data_key_t gfxFcFontEntry::sFontEntryKey;
+
+nsString
+gfxFcFontEntry::RealFaceName()
+{
+    FcChar8 *name;
+    if (!mPatterns.IsEmpty()) {
+        if (FcPatternGetString(mPatterns[0],
+                               FC_FULLNAME, 0, &name) == FcResultMatch) {
+            return NS_ConvertUTF8toUTF16((const char*)name);
+        }
+        if (FcPatternGetString(mPatterns[0],
+                               FC_FAMILY, 0, &name) == FcResultMatch) {
+            NS_ConvertUTF8toUTF16 result((const char*)name);
+            if (FcPatternGetString(mPatterns[0],
+                                   FC_STYLE, 0, &name) == FcResultMatch) {
+                result.Append(' ');
+                AppendUTF8toUTF16((const char*)name, result);
+            }
+            return result;
+        }
+    }
+    // fall back to gfxFontEntry implementation (only works for sfnt fonts)
+    return gfxFontEntry::RealFaceName();
+}
+
+/**
+ * gfxSystemFcFontEntry:
+ *
+ * An implementation of gfxFcFontEntry used by gfxFcFonts for system fonts,
+ * including those from regular family-name based font selection as well as
+ * those from src:local().
+ *
+ * All gfxFcFonts using the same cairo_font_face_t share the same FontEntry. 
+ */
+
+class gfxSystemFcFontEntry : public gfxFcFontEntry {
+public:
+    // For memory efficiency, aFontPattern should be a font pattern,
+    // not a fully resolved pattern.
+    gfxSystemFcFontEntry(cairo_font_face_t *aFontFace,
+                         FcPattern *aFontPattern,
+                         const nsAString& aName)
+        : gfxFcFontEntry(aName), mFontFace(aFontFace),
+          mFTFace(nullptr), mFTFaceInitialized(false)
+    {
+        cairo_font_face_reference(mFontFace);
+        cairo_font_face_set_user_data(mFontFace, &sFontEntryKey, this, nullptr);
+        mPatterns.AppendElement();
+        // mPatterns is an nsAutoTArray with 1 space always available, so the
+        // AppendElement always succeeds.
+        mPatterns[0] = aFontPattern;
+
+        FcChar8 *name;
+        if (FcPatternGetString(aFontPattern,
+                               FC_FAMILY, 0, &name) == FcResultMatch) {
+            mFamilyName = NS_ConvertUTF8toUTF16((const char*)name);
+        }
+    }
+
+    ~gfxSystemFcFontEntry()
+    {
+        cairo_font_face_set_user_data(mFontFace,
+                                      &sFontEntryKey,
+                                      nullptr,
+                                      nullptr);
+        cairo_font_face_destroy(mFontFace);
+    }
+
+    virtual void ForgetHBFace() override;
+    virtual void ReleaseGrFace(gr_face* aFace) override;
+
+protected:
+    virtual nsresult
+    CopyFontTable(uint32_t aTableTag, FallibleTArray<uint8_t>& aBuffer) override;
+
+    void MaybeReleaseFTFace();
+
+private:
+    cairo_font_face_t *mFontFace;
+    FT_Face            mFTFace;
+    bool               mFTFaceInitialized;
+};
+
+nsresult
+gfxSystemFcFontEntry::CopyFontTable(uint32_t aTableTag,
+                                    FallibleTArray<uint8_t>& aBuffer)
+{
+    if (!mFTFaceInitialized) {
+        mFTFaceInitialized = true;
+        FcChar8 *filename;
+        if (FcPatternGetString(mPatterns[0], FC_FILE, 0, &filename) != FcResultMatch) {
+            return NS_ERROR_FAILURE;
+        }
+        int index;
+        if (FcPatternGetInteger(mPatterns[0], FC_INDEX, 0, &index) != FcResultMatch) {
+            index = 0; // default to 0 if not found in pattern
+        }
+        if (FT_New_Face(gfxPangoFontGroup::GetFTLibrary(),
+                        (const char*)filename, index, &mFTFace) != 0) {
+            return NS_ERROR_FAILURE;
+        }
+    }
+
+    if (!mFTFace) {
+        return NS_ERROR_NOT_AVAILABLE;
+    }
+
+    FT_ULong length = 0;
+    if (FT_Load_Sfnt_Table(mFTFace, aTableTag, 0, nullptr, &length) != 0) {
+        return NS_ERROR_NOT_AVAILABLE;
+    }
+    if (!aBuffer.SetLength(length)) {
+        return NS_ERROR_OUT_OF_MEMORY;
+    }
+    if (FT_Load_Sfnt_Table(mFTFace, aTableTag, 0, aBuffer.Elements(), &length) != 0) {
+        aBuffer.Clear();
+        return NS_ERROR_FAILURE;
+    }
+
+    return NS_OK;
+}
+
+void
+gfxSystemFcFontEntry::MaybeReleaseFTFace()
+{
+    // don't release if either HB or Gr face still exists
+    if (mHBFace || mGrFace) {
+        return;
+    }
+    if (mFTFace) {
+        FT_Done_Face(mFTFace);
+        mFTFace = nullptr;
+    }
+    mFTFaceInitialized = false;
+}
+
+void
+gfxSystemFcFontEntry::ForgetHBFace()
+{
+    gfxFontEntry::ForgetHBFace();
+    MaybeReleaseFTFace();
+}
+
+void
+gfxSystemFcFontEntry::ReleaseGrFace(gr_face* aFace)
+{
+    gfxFontEntry::ReleaseGrFace(aFace);
+    MaybeReleaseFTFace();
+}
+
+// A namespace for @font-face family names in FcPatterns so that fontconfig
+// aliases do not pick up families from @font-face rules and so that
+// fontconfig rules can distinguish between web fonts and platform fonts.
+// http://lists.freedesktop.org/archives/fontconfig/2008-November/003037.html
+#define FONT_FACE_FAMILY_PREFIX "@font-face:"
+
+/**
+ * gfxUserFcFontEntry:
+ *
+ * An abstract class for objects in a gfxUserFontSet that can provide
+ * FcPattern* handles to fonts.
+ *
+ * Separate implementations of this class support local fonts from src:local()
+ * and web fonts from src:url().
+ */
+
+// There is a one-to-one correspondence between gfxUserFcFontEntry objects and
+// @font-face rules, but sometimes a one-to-many correspondence between font
+// entries and font patterns.
+//
+// http://www.w3.org/TR/2002/WD-css3-webfonts-20020802#font-descriptions
+// provided a font-size descriptor to specify the sizes supported by the face,
+// but the "Editor's Draft 27 June 2008"
+// http://dev.w3.org/csswg/css3-fonts/#font-resources does not provide such a
+// descriptor, and Mozilla does not recognize such a descriptor.
+//
+// Font face names used in src:local() also do not usually specify a size.
+//
+// PCF format fonts have each size in a different file, and each of these
+// files is referenced by its own pattern, but really these are each
+// different sizes of one face with one name.
+//
+// Multiple patterns in an entry also effectively deals with a set of
+// PostScript Type 1 font files that all have the same face name but are in
+// several files because of the limit on the number of glyphs in a Type 1 font
+// file.  (e.g. Computer Modern.)
+
+class gfxUserFcFontEntry : public gfxFcFontEntry {
+protected:
+    explicit gfxUserFcFontEntry(const nsAString& aFontName,
+                       uint16_t aWeight,
+                       int16_t aStretch,
+                       bool aItalic)
+        : gfxFcFontEntry(aFontName)
+    {
+        mItalic = aItalic;
+        mWeight = aWeight;
+        mStretch = aStretch;
+    }
+
+    // Helper function to change a pattern so that it matches the CSS style
+    // descriptors and so gets properly sorted in font selection.  This also
+    // avoids synthetic style effects being added by the renderer when the
+    // style of the font itself does not match the descriptor provided by the
+    // author.
+    void AdjustPatternToCSS(FcPattern *aPattern);
+};
+
+void
+gfxUserFcFontEntry::AdjustPatternToCSS(FcPattern *aPattern)
+{
+    int fontWeight = -1;
+    FcPatternGetInteger(aPattern, FC_WEIGHT, 0, &fontWeight);
+    int cssWeight = gfxFontconfigUtils::FcWeightForBaseWeight(mWeight / 100);
+    if (cssWeight != fontWeight) {
+        FcPatternDel(aPattern, FC_WEIGHT);
+        FcPatternAddInteger(aPattern, FC_WEIGHT, cssWeight);
+    }
+
+    int fontSlant;
+    FcResult res = FcPatternGetInteger(aPattern, FC_SLANT, 0, &fontSlant);
+    // gfxFontEntry doesn't understand the difference between oblique
+    // and italic.
+    if (res != FcResultMatch ||
+        IsItalic() != (fontSlant != FC_SLANT_ROMAN)) {
+        FcPatternDel(aPattern, FC_SLANT);
+        FcPatternAddInteger(aPattern, FC_SLANT,
+                            IsItalic() ? FC_SLANT_OBLIQUE : FC_SLANT_ROMAN);
+    }
+
+    int fontWidth = -1;
+    FcPatternGetInteger(aPattern, FC_WIDTH, 0, &fontWidth);
+    int cssWidth = gfxFontconfigUtils::FcWidthForThebesStretch(mStretch);
+    if (cssWidth != fontWidth) {
+        FcPatternDel(aPattern, FC_WIDTH);
+        FcPatternAddInteger(aPattern, FC_WIDTH, cssWidth);
+    }
+
+    // Ensure that there is a fullname property (if there is a family
+    // property) so that fontconfig rules can identify the real name of the
+    // font, because the family property will be replaced.
+    FcChar8 *unused;
+    if (FcPatternGetString(aPattern,
+                           FC_FULLNAME, 0, &unused) == FcResultNoMatch) {
+        nsAutoCString fullname;
+        if (gfxFontconfigUtils::GetFullnameFromFamilyAndStyle(aPattern,
+                                                              &fullname)) {
+            FcPatternAddString(aPattern, FC_FULLNAME,
+                               gfxFontconfigUtils::ToFcChar8(fullname));
+        }
+    }
+
+    nsAutoCString family;
+    family.Append(FONT_FACE_FAMILY_PREFIX);
+    AppendUTF16toUTF8(Name(), family);
+
+    FcPatternDel(aPattern, FC_FAMILY);
+    FcPatternDel(aPattern, FC_FAMILYLANG);
+    FcPatternAddString(aPattern, FC_FAMILY,
+                       gfxFontconfigUtils::ToFcChar8(family));
+}
+
+/**
+ * gfxLocalFcFontEntry:
+ *
+ * An implementation of gfxUserFcFontEntry for local fonts from src:local().
+ *
+ * This class is used only in gfxUserFontSet and for providing FcPattern*
+ * handles to system fonts for font selection.  gfxFcFonts created from these
+ * patterns will use gfxSystemFcFontEntrys, which may be shared with
+ * gfxFcFonts from regular family-name based font selection.
+ */
+
+class gfxLocalFcFontEntry : public gfxUserFcFontEntry {
+public:
+    gfxLocalFcFontEntry(const nsAString& aFontName,
+                        uint16_t aWeight,
+                        int16_t aStretch,
+                        bool aItalic,
+                        const nsTArray< nsCountedRef<FcPattern> >& aPatterns)
+        : gfxUserFcFontEntry(aFontName, aWeight, aStretch, aItalic)
+    {
+        if (!mPatterns.SetCapacity(aPatterns.Length()))
+            return; // OOM
+
+        for (uint32_t i = 0; i < aPatterns.Length(); ++i) {
+            FcPattern *pattern = FcPatternDuplicate(aPatterns.ElementAt(i));
+            if (!pattern)
+                return; // OOM
+
+            AdjustPatternToCSS(pattern);
+
+            mPatterns.AppendElement();
+            mPatterns[i].own(pattern);
+        }
+        mIsLocalUserFont = true;
+    }
+};
+
+/**
+ * gfxDownloadedFcFontEntry:
+ *
+ * An implementation of gfxFcFontEntry for web fonts from src:url().
+ * 
+ * When a cairo_font_face_t is created for these fonts, the cairo_font_face_t
+ * keeps a reference to the FontEntry to keep the font data alive.
+ */
+
+class gfxDownloadedFcFontEntry : public gfxUserFcFontEntry {
+public:
+    // This takes ownership of the face and its underlying data
+    gfxDownloadedFcFontEntry(const nsAString& aFontName,
+                             uint16_t aWeight,
+                             int16_t aStretch,
+                             bool aItalic,
+                             const uint8_t *aData, FT_Face aFace)
+        : gfxUserFcFontEntry(aFontName, aWeight, aStretch, aItalic),
+          mFontData(aData), mFace(aFace)
+    {
+        NS_PRECONDITION(aFace != nullptr, "aFace is NULL!");
+        mIsDataUserFont = true;
+        InitPattern();
+    }
+
+    virtual ~gfxDownloadedFcFontEntry();
+
+    // Returns true on success
+    bool SetCairoFace(cairo_font_face_t *aFace);
+
+    virtual hb_blob_t* GetFontTable(uint32_t aTableTag) override;
+
+protected:
+    void InitPattern();
+
+    // mFontData holds the data used to instantiate the FT_Face;
+    // this has to persist until we are finished with the face,
+    // then be released with free().
+    const uint8_t* mFontData;
+
+    FT_Face mFace;
+};
+
+// A property for recording gfxDownloadedFcFontEntrys on FcPatterns.
+static const char *kFontEntryFcProp = "-moz-font-entry";
+
+static FcBool AddDownloadedFontEntry(FcPattern *aPattern,
+                                     gfxDownloadedFcFontEntry *aFontEntry)
+{
+    FcValue value;
+    value.type = FcTypeFTFace; // void* field of union
+    value.u.f = aFontEntry;
+
+    return FcPatternAdd(aPattern, kFontEntryFcProp, value, FcFalse);
+}
+
+static FcBool DelDownloadedFontEntry(FcPattern *aPattern)
+{
+    return FcPatternDel(aPattern, kFontEntryFcProp);
+}
+
+static gfxDownloadedFcFontEntry *GetDownloadedFontEntry(FcPattern *aPattern)
+{
+    FcValue value;
+    if (FcPatternGet(aPattern, kFontEntryFcProp, 0, &value) != FcResultMatch)
+        return nullptr;
+
+    if (value.type != FcTypeFTFace) {
+        NS_NOTREACHED("Wrong type for -moz-font-entry font property");
+        return nullptr;
+    }
+
+    return static_cast<gfxDownloadedFcFontEntry*>(value.u.f);
+}
+
+gfxDownloadedFcFontEntry::~gfxDownloadedFcFontEntry()
+{
+    if (mPatterns.Length() != 0) {
+        // Remove back reference to this font entry and the face in case
+        // anyone holds a reference to the pattern.
+        NS_ASSERTION(mPatterns.Length() == 1,
+                     "More than one pattern in gfxDownloadedFcFontEntry!");
+        DelDownloadedFontEntry(mPatterns[0]);
+        FcPatternDel(mPatterns[0], FC_FT_FACE);
+    }
+    FT_Done_Face(mFace);
+    free((void*)mFontData);
+}
+
+typedef FcPattern* (*QueryFaceFunction)(const FT_Face face,
+                                        const FcChar8 *file, int id,
+                                        FcBlanks *blanks);
+
+void
+gfxDownloadedFcFontEntry::InitPattern()
+{
+    static QueryFaceFunction sQueryFacePtr =
+        reinterpret_cast<QueryFaceFunction>
+        (FindFunctionSymbol("FcFreeTypeQueryFace"));
+    FcPattern *pattern;
+
+    // FcFreeTypeQueryFace is the same function used to construct patterns for
+    // system fonts and so is the preferred function to use for this purpose.
+    // This will set up the langset property, which helps with sorting, and
+    // the foundry, fullname, and fontversion properties, which properly
+    // identify the font to fontconfig rules.  However, FcFreeTypeQueryFace is
+    // available only from fontconfig-2.4.2 (December 2006).  (CentOS 5.0 has
+    // fontconfig-2.4.1.)
+    if (sQueryFacePtr) {
+        // The "file" argument cannot be nullptr (in fontconfig-2.6.0 at
+        // least). The dummy file passed here is removed below.
+        //
+        // When fontconfig scans the system fonts, FcConfigGetBlanks(nullptr)
+        // is passed as the "blanks" argument, which provides that unexpectedly
+        // blank glyphs are elided.  Here, however, we pass nullptr for
+        // "blanks", effectively assuming that, if the font has a blank glyph,
+        // then the author intends any associated character to be rendered
+        // blank.
+        pattern =
+            (*sQueryFacePtr)(mFace,
+                             gfxFontconfigUtils::ToFcChar8(""),
+                             0,
+                             nullptr);
+        if (!pattern)
+            // Either OOM, or fontconfig chose to skip this font because it
+            // has "no encoded characters", which I think means "BDF and PCF
+            // fonts which are not in Unicode (or the effectively equivalent
+            // ISO Latin-1) encoding".
+            return;
+
+        // These properties don't make sense for this face without a file.
+        FcPatternDel(pattern, FC_FILE);
+        FcPatternDel(pattern, FC_INDEX);
+
+    } else {
+        // Do the minimum necessary to construct a pattern for sorting.
+
+        // FC_CHARSET is vital to determine which characters are supported.
+        nsAutoRef<FcCharSet> charset(FcFreeTypeCharSet(mFace, nullptr));
+        // If there are no characters then assume we don't know how to read
+        // this font.
+        if (!charset || FcCharSetCount(charset) == 0)
+            return;
+
+        pattern = FcPatternCreate();
+        FcPatternAddCharSet(pattern, FC_CHARSET, charset);
+
+        // FC_PIXEL_SIZE can be important for font selection of fixed-size
+        // fonts.
+        if (!(mFace->face_flags & FT_FACE_FLAG_SCALABLE)) {
+            for (FT_Int i = 0; i < mFace->num_fixed_sizes; ++i) {
+#if HAVE_FT_BITMAP_SIZE_Y_PPEM
+                double size = FLOAT_FROM_26_6(mFace->available_sizes[i].y_ppem);
+#else
+                double size = mFace->available_sizes[i].height;
+#endif
+                FcPatternAddDouble (pattern, FC_PIXEL_SIZE, size);
+            }
+
+            // Not sure whether this is important;
+            // imitating FcFreeTypeQueryFace:
+            FcPatternAddBool (pattern, FC_ANTIALIAS, FcFalse);
+        }
+
+        // Setting up the FC_LANGSET property is very difficult with the APIs
+        // available prior to FcFreeTypeQueryFace.  Having no FC_LANGSET
+        // property seems better than having a property with an empty LangSet.
+        // With no FC_LANGSET property, fontconfig sort functions will
+        // consider this face to have the same priority as (otherwise equal)
+        // faces that have support for the primary requested language, but
+        // will not consider any language to have been satisfied (and so will
+        // continue to look for a face with language support in fallback
+        // fonts).
+    }
+
+    AdjustPatternToCSS(pattern);
+
+    FcPatternAddFTFace(pattern, FC_FT_FACE, mFace);
+    AddDownloadedFontEntry(pattern, this);
+
+    // There is never more than one pattern
+    mPatterns.AppendElement();
+    mPatterns[0].own(pattern);
+}
+
+static void ReleaseDownloadedFontEntry(void *data)
+{
+    gfxDownloadedFcFontEntry *downloadedFontEntry =
+        static_cast<gfxDownloadedFcFontEntry*>(data);
+    NS_RELEASE(downloadedFontEntry);
+}
+
+bool gfxDownloadedFcFontEntry::SetCairoFace(cairo_font_face_t *aFace)
+{
+    if (CAIRO_STATUS_SUCCESS !=
+        cairo_font_face_set_user_data(aFace, &sFontEntryKey, this,
+                                      ReleaseDownloadedFontEntry))
+        return false;
+
+    // Hold a reference to this font entry to keep the font face data.
+    NS_ADDREF(this);
+    return true;
+}
+
+hb_blob_t *
+gfxDownloadedFcFontEntry::GetFontTable(uint32_t aTableTag)
+{
+    // The entry already owns the (sanitized) sfnt data in mFontData,
+    // so we can just return a blob that "wraps" the appropriate chunk of it.
+    // The blob should not attempt to free its data, as the entire sfnt data
+    // will be freed when the font entry is deleted.
+    return GetTableFromFontData(mFontData, aTableTag);
+}
+
+/*
+ * gfxFcFont
+ *
+ * This is a gfxFont implementation using a CAIRO_FONT_TYPE_FT
+ * cairo_scaled_font created from an FcPattern.
+ */
+
+class gfxFcFont : public gfxFT2FontBase {
+public:
+    virtual ~gfxFcFont();
+    static already_AddRefed<gfxFcFont>
+    GetOrMakeFont(FcPattern *aRequestedPattern, FcPattern *aFontPattern,
+                  const gfxFontStyle *aFontStyle);
+
+#ifdef USE_SKIA
+    virtual mozilla::TemporaryRef<mozilla::gfx::GlyphRenderingOptions>
+        GetGlyphRenderingOptions(const TextRunDrawParams* aRunParams = nullptr) override;
+#endif
+
+    // return a cloned font resized and offset to simulate sub/superscript glyphs
+    virtual already_AddRefed<gfxFont>
+    GetSubSuperscriptFont(int32_t aAppUnitsPerDevPixel) override;
+
+protected:
+    virtual already_AddRefed<gfxFont> MakeScaledFont(gfxFontStyle *aFontStyle,
+                                                     gfxFloat aFontScale);
+    virtual already_AddRefed<gfxFont> GetSmallCapsFont() override;
+
+private:
+    gfxFcFont(cairo_scaled_font_t *aCairoFont, gfxFcFontEntry *aFontEntry,
+              const gfxFontStyle *aFontStyle);
+
+    // key for locating a gfxFcFont corresponding to a cairo_scaled_font
+    static cairo_user_data_key_t sGfxFontKey;
+};
+
+/**
+ * gfxFcFontSet:
+ *
+ * Translation from a desired FcPattern to a sorted set of font references
+ * (fontconfig cache data) and (when needed) fonts.
+ */
+
+class gfxFcFontSet final {
+public:
+    NS_INLINE_DECL_REFCOUNTING(gfxFcFontSet)
+    
+    explicit gfxFcFontSet(FcPattern *aPattern,
+                               gfxUserFontSet *aUserFontSet)
+        : mSortPattern(aPattern), mUserFontSet(aUserFontSet),
+          mFcFontsTrimmed(0),
+          mHaveFallbackFonts(false)
+    {
+        bool waitForUserFont;
+        mFcFontSet = SortPreferredFonts(waitForUserFont);
+        mWaitingForUserFont = waitForUserFont;
+    }
+
+    // A reference is held by the FontSet.
+    // The caller may add a ref to keep the font alive longer than the FontSet.
+    gfxFcFont *GetFontAt(uint32_t i, const gfxFontStyle *aFontStyle)
+    {
+        if (i >= mFonts.Length() || !mFonts[i].mFont) { 
+            // GetFontPatternAt sets up mFonts
+            FcPattern *fontPattern = GetFontPatternAt(i);
+            if (!fontPattern)
+                return nullptr;
+
+            mFonts[i].mFont =
+                gfxFcFont::GetOrMakeFont(mSortPattern, fontPattern,
+                                         aFontStyle);
+        }
+        return mFonts[i].mFont;
+    }
+
+    FcPattern *GetFontPatternAt(uint32_t i);
+
+    bool WaitingForUserFont() const {
+        return mWaitingForUserFont;
+    }
+
+private:
+    // Private destructor, to discourage deletion outside of Release():
+    ~gfxFcFontSet()
+    {
+    }
+
+    nsReturnRef<FcFontSet> SortPreferredFonts(bool& aWaitForUserFont);
+    nsReturnRef<FcFontSet> SortFallbackFonts();
+
+    struct FontEntry {
+        explicit FontEntry(FcPattern *aPattern) : mPattern(aPattern) {}
+        nsCountedRef<FcPattern> mPattern;
+        nsRefPtr<gfxFcFont> mFont;
+    };
+
+    struct LangSupportEntry {
+        LangSupportEntry(FcChar8 *aLang, FcLangResult aSupport) :
+            mLang(aLang), mBestSupport(aSupport) {}
+        FcChar8 *mLang;
+        FcLangResult mBestSupport;
+    };
+
+public:
+    // public for nsTArray
+    class LangComparator {
+    public:
+        bool Equals(const LangSupportEntry& a, const FcChar8 *b) const
+        {
+            return FcStrCmpIgnoreCase(a.mLang, b) == 0;
+        }
+    };
+
+private:
+    // The requested pattern
+    nsCountedRef<FcPattern> mSortPattern;
+    // Fonts from @font-face rules
+    nsRefPtr<gfxUserFontSet> mUserFontSet;
+    // A (trimmed) list of font patterns and fonts that is built up as
+    // required.
+    nsTArray<FontEntry> mFonts;
+    // Holds a list of font patterns that will be trimmed.  This is first set
+    // to a list of preferred fonts.  Then, if/when all the preferred fonts
+    // have been trimmed and added to mFonts, this is set to a list of
+    // fallback fonts.
+    nsAutoRef<FcFontSet> mFcFontSet;
+    // The set of characters supported by the fonts in mFonts.
+    nsAutoRef<FcCharSet> mCharSet;
+    // The index of the next font in mFcFontSet that has not yet been
+    // considered for mFonts.
+    int mFcFontsTrimmed;
+    // True iff fallback fonts are either stored in mFcFontSet or have been
+    // trimmed and added to mFonts (so that mFcFontSet is nullptr).
+    bool mHaveFallbackFonts;
+    // True iff there was a user font set with pending downloads,
+    // so the set may be updated when downloads complete
+    bool mWaitingForUserFont;
+};
+
+// Find the FcPattern for an @font-face font suitable for CSS family |aFamily|
+// and style |aStyle| properties.
+static const nsTArray< nsCountedRef<FcPattern> >*
+FindFontPatterns(gfxUserFontSet *mUserFontSet,
+                 const nsACString &aFamily, uint8_t aStyle,
+                 uint16_t aWeight, int16_t aStretch,
+                 bool& aWaitForUserFont)
+{
+    // Convert to UTF16
+    NS_ConvertUTF8toUTF16 utf16Family(aFamily);
+
+    // needsBold is not used here.  Instead synthetic bold is enabled through
+    // FcFontRenderPrepare when the weight in the requested pattern is
+    // compared against the weight in the font pattern.
+    bool needsBold;
+
+    gfxFontStyle style;
+    style.style = aStyle;
+    style.weight = aWeight;
+    style.stretch = aStretch;
+
+    gfxUserFcFontEntry *fontEntry = nullptr;
+    gfxFontFamily *family = mUserFontSet->LookupFamily(utf16Family);
+    if (family) {
+        gfxUserFontEntry* userFontEntry =
+            mUserFontSet->FindUserFontEntryAndLoad(family, style, needsBold,
+                                                   aWaitForUserFont);
+        if (userFontEntry) {
+            fontEntry = static_cast<gfxUserFcFontEntry*>
+                (userFontEntry->GetPlatformFontEntry());
+        }
+
+        // Accept synthetic oblique for italic and oblique.
+        // xxx - this isn't really ideal behavior, for docs that only use a
+        //       single italic face it will also pull down the normal face
+        //       and probably never use it
+        if (!fontEntry && aStyle != NS_FONT_STYLE_NORMAL) {
+            style.style = NS_FONT_STYLE_NORMAL;
+            userFontEntry =
+                mUserFontSet->FindUserFontEntryAndLoad(family, style,
+                                                       needsBold,
+                                                       aWaitForUserFont);
+            if (userFontEntry) {
+                fontEntry = static_cast<gfxUserFcFontEntry*>
+                    (userFontEntry->GetPlatformFontEntry());
+            }
+        }
+    }
+
+    if (!fontEntry) {
+        return nullptr;
+    }
+
+    return &fontEntry->GetPatterns();
+}
+
+typedef FcBool (*FcPatternRemoveFunction)(FcPattern *p, const char *object,
+                                          int id);
+
+// FcPatternRemove is available in fontconfig-2.3.0 (2005)
+static FcBool
+moz_FcPatternRemove(FcPattern *p, const char *object, int id)
+{
+    static FcPatternRemoveFunction sFcPatternRemovePtr =
+        reinterpret_cast<FcPatternRemoveFunction>
+        (FindFunctionSymbol("FcPatternRemove"));
+
+    if (!sFcPatternRemovePtr)
+        return FcFalse;
+
+    return (*sFcPatternRemovePtr)(p, object, id);
+}
+
+// fontconfig prefers a matching family or lang to pixelsize of bitmap
+// fonts.  CSS suggests a tolerance of 20% on pixelsize.
+static bool
+SizeIsAcceptable(FcPattern *aFont, double aRequestedSize)
+{
+    double size;
+    int v = 0;
+    while (FcPatternGetDouble(aFont,
+                              FC_PIXEL_SIZE, v, &size) == FcResultMatch) {
+        ++v;
+        if (5.0 * fabs(size - aRequestedSize) < aRequestedSize)
+            return true;
+    }
+
+    // No size means scalable
+    return v == 0;
+}
+
+// Sorting only the preferred fonts first usually saves having to sort through
+// every font on the system.
+nsReturnRef<FcFontSet>
+gfxFcFontSet::SortPreferredFonts(bool &aWaitForUserFont)
+{
+    aWaitForUserFont = false;
+
+    gfxFontconfigUtils *utils = gfxFontconfigUtils::GetFontconfigUtils();
+    if (!utils)
+        return nsReturnRef<FcFontSet>();
+
+    // The list of families in mSortPattern has values with both weak and
+    // strong bindings.  Values with strong bindings should be preferred.
+    // Values with weak bindings are default fonts that should be considered
+    // only when the font provides the best support for a requested language
+    // or after other fonts have satisfied all the requested languages.
+    //
+    // There are no direct fontconfig APIs to get the binding type.  The
+    // binding only takes effect in the sort and match functions.
+
+    // |requiredLangs| is a list of requested languages that have not yet been
+    // satisfied.  gfxFontconfigUtils only sets one FC_LANG property value,
+    // but FcConfigSubstitute may add more values (e.g. prepending "en" to
+    // "ja" will use western fonts to render Latin/Arabic numerals in Japanese
+    // text.)
+    nsAutoTArray<LangSupportEntry,10> requiredLangs;
+    for (int v = 0; ; ++v) {
+        FcChar8 *lang;
+        FcResult result = FcPatternGetString(mSortPattern, FC_LANG, v, &lang);
+        if (result != FcResultMatch) {
+            // No need to check FcPatternGetLangSet() because
+            // gfxFontconfigUtils sets only a string value for FC_LANG and
+            // FcConfigSubstitute cannot add LangSets.
+            NS_ASSERTION(result != FcResultTypeMismatch,
+                         "Expected a string for FC_LANG");
+            break;
+        }
+
+        if (!requiredLangs.Contains(lang, LangComparator())) {
+            FcLangResult bestLangSupport = utils->GetBestLangSupport(lang);
+            if (bestLangSupport != FcLangDifferentLang) {
+                requiredLangs.
+                    AppendElement(LangSupportEntry(lang, bestLangSupport));
+            }
+        }
+    }
+
+    nsAutoRef<FcFontSet> fontSet(FcFontSetCreate());
+    if (!fontSet)
+        return fontSet.out();
+
+    // FcDefaultSubstitute() ensures a slant on mSortPattern, but, if that ever
+    // doesn't happen, Roman will be used.
+    int requestedSlant = FC_SLANT_ROMAN;
+    FcPatternGetInteger(mSortPattern, FC_SLANT, 0, &requestedSlant);
+    double requestedSize = -1.0;
+    FcPatternGetDouble(mSortPattern, FC_PIXEL_SIZE, 0, &requestedSize);
+
+    nsTHashtable<gfxFontconfigUtils::DepFcStrEntry> existingFamilies(32);
+    FcChar8 *family;
+    for (int v = 0;
+         FcPatternGetString(mSortPattern,
+                            FC_FAMILY, v, &family) == FcResultMatch; ++v) {
+        const nsTArray< nsCountedRef<FcPattern> > *familyFonts = nullptr;
+
+        // Is this an @font-face family?
+        bool isUserFont = false;
+        if (mUserFontSet) {
+            // Have some @font-face definitions
+
+            nsDependentCString cFamily(gfxFontconfigUtils::ToCString(family));
+            NS_NAMED_LITERAL_CSTRING(userPrefix, FONT_FACE_FAMILY_PREFIX);
+
+            if (StringBeginsWith(cFamily, userPrefix)) {
+                isUserFont = true;
+
+                // Trim off the prefix
+                nsDependentCSubstring cssFamily(cFamily, userPrefix.Length());
+
+                uint8_t thebesStyle =
+                    gfxFontconfigUtils::FcSlantToThebesStyle(requestedSlant);
+                uint16_t thebesWeight =
+                    gfxFontconfigUtils::GetThebesWeight(mSortPattern);
+                int16_t thebesStretch =
+                    gfxFontconfigUtils::GetThebesStretch(mSortPattern);
+
+                bool waitForUserFont;
+                familyFonts = FindFontPatterns(mUserFontSet, cssFamily,
+                                               thebesStyle,
+                                               thebesWeight, thebesStretch,
+                                               waitForUserFont);
+                if (waitForUserFont) {
+                    aWaitForUserFont = true;
+                }
+            }
+        }
+
+        if (!isUserFont) {
+            familyFonts = &utils->GetFontsForFamily(family);
+        }
+
+        if (!familyFonts || familyFonts->Length() == 0) {
+            // There are no fonts matching this family, so there is no point
+            // in searching for this family in the FontSort.
+            //
+            // Perhaps the original pattern should be retained for
+            // FcFontRenderPrepare.  However, the only a useful config
+            // substitution test against missing families that i can imagine
+            // would only be interested in the preferred family
+            // (qual="first"), so always keep the first family and use the
+            // same pattern for Sort and RenderPrepare.
+            if (v != 0 && moz_FcPatternRemove(mSortPattern, FC_FAMILY, v)) {
+                --v;
+            }
+            continue;
+        }
+
+        // Aliases seem to often end up occurring more than once, but
+        // duplicate families can't be removed from the sort pattern without
+        // knowing whether duplicates have the same binding.
+        gfxFontconfigUtils::DepFcStrEntry *entry =
+            existingFamilies.PutEntry(family);
+        if (entry) {
+            if (entry->mKey) // old entry
+                continue;
+
+            entry->mKey = family; // initialize new entry
+        }
+
+        for (uint32_t f = 0; f < familyFonts->Length(); ++f) {
+            FcPattern *font = familyFonts->ElementAt(f);
+
+            // Fix up the family name of user-font patterns, as the same
+            // font entry may be used (via the UserFontCache) for multiple
+            // CSS family names
+            if (isUserFont) {
+                font = FcPatternDuplicate(font);
+                FcPatternDel(font, FC_FAMILY);
+                FcPatternAddString(font, FC_FAMILY, family);
+            }
+
+            // User fonts are already filtered by slant (but not size) in
+            // mUserFontSet->FindUserFontEntry().
+            if (requestedSize != -1.0 && !SizeIsAcceptable(font, requestedSize))
+                continue;
+
+            for (uint32_t r = 0; r < requiredLangs.Length(); ++r) {
+                const LangSupportEntry& entry = requiredLangs[r];
+                FcLangResult support =
+                    gfxFontconfigUtils::GetLangSupport(font, entry.mLang);
+                if (support <= entry.mBestSupport) { // lower is better
+                    requiredLangs.RemoveElementAt(r);
+                    --r;
+                }
+            }
+
+            // FcFontSetDestroy will remove a reference but FcFontSetAdd
+            // does _not_ take a reference!
+            if (FcFontSetAdd(fontSet, font)) {
+                // We don't add a reference here for user fonts, because we're
+                // using a local clone of the pattern (see above) in order to
+                // override the family name
+                if (!isUserFont) {
+                    FcPatternReference(font);
+                }
+            }
+        }
+    }
+
+    FcPattern *truncateMarker = nullptr;
+    for (uint32_t r = 0; r < requiredLangs.Length(); ++r) {
+        const nsTArray< nsCountedRef<FcPattern> >& langFonts =
+            utils->GetFontsForLang(requiredLangs[r].mLang);
+
+        bool haveLangFont = false;
+        for (uint32_t f = 0; f < langFonts.Length(); ++f) {
+            FcPattern *font = langFonts[f];
+            if (requestedSize != -1.0 && !SizeIsAcceptable(font, requestedSize))
+                continue;
+
+            haveLangFont = true;
+            if (FcFontSetAdd(fontSet, font)) {
+                FcPatternReference(font);
+            }
+        }
+
+        if (!haveLangFont && langFonts.Length() > 0) {
+            // There is a font that supports this language but it didn't pass
+            // the slant and size criteria.  Weak default font families should
+            // not be considered until the language has been satisfied.
+            //
+            // Insert a font that supports the language so that it will mark
+            // the position of fonts from weak families in the sorted set and
+            // they can be removed.  The language and weak families will be
+            // considered in the fallback fonts, which use fontconfig's
+            // algorithm.
+            //
+            // Of the fonts that don't meet slant and size criteria, strong
+            // default font families should be considered before (other) fonts
+            // for this language, so this marker font will be removed (as well
+            // as the fonts from weak families), and strong families will be
+            // reconsidered in the fallback fonts.
+            FcPattern *font = langFonts[0];
+            if (FcFontSetAdd(fontSet, font)) {
+                FcPatternReference(font);
+                truncateMarker = font;
+            }
+            break;
+        }
+    }
+
+    FcFontSet *sets[1] = { fontSet };
+    FcResult result;
+#ifdef SOLARIS
+    // Get around a crash of FcFontSetSort when FcConfig is nullptr
+    // Solaris's FcFontSetSort needs an FcConfig (bug 474758)
+    fontSet.own(FcFontSetSort(FcConfigGetCurrent(), sets, 1, mSortPattern,
+                              FcFalse, nullptr, &result));
+#else
+    fontSet.own(FcFontSetSort(nullptr, sets, 1, mSortPattern,
+                              FcFalse, nullptr, &result));
+#endif
+
+    if (truncateMarker != nullptr && fontSet) {
+        nsAutoRef<FcFontSet> truncatedSet(FcFontSetCreate());
+
+        for (int f = 0; f < fontSet->nfont; ++f) {
+            FcPattern *font = fontSet->fonts[f];
+            if (font == truncateMarker)
+                break;
+
+            if (FcFontSetAdd(truncatedSet, font)) {
+                FcPatternReference(font);
+            }
+        }
+
+        fontSet.steal(truncatedSet);
+    }
+
+    return fontSet.out();
+}
+
+nsReturnRef<FcFontSet>
+gfxFcFontSet::SortFallbackFonts()
+{
+    // Setting trim to FcTrue would provide a much smaller (~ 1/10) FcFontSet,
+    // but would take much longer due to comparing all the character sets.
+    //
+    // The references to fonts in this FcFontSet are almost free
+    // as they are pointers into mmaped cache files.
+    //
+    // GetFontPatternAt() will trim lazily if and as needed, which will also
+    // remove duplicates of preferred fonts.
+    FcResult result;
+    return nsReturnRef<FcFontSet>(FcFontSort(nullptr, mSortPattern,
+                                             FcFalse, nullptr, &result));
+}
+
+// GetFontAt relies on this setting up all patterns up to |i|.
+FcPattern *
+gfxFcFontSet::GetFontPatternAt(uint32_t i)
+{
+    while (i >= mFonts.Length()) {
+        while (!mFcFontSet) {
+            if (mHaveFallbackFonts)
+                return nullptr;
+
+            mFcFontSet = SortFallbackFonts();
+            mHaveFallbackFonts = true;
+            mFcFontsTrimmed = 0;
+            // Loop to test that mFcFontSet is non-nullptr.
+        }
+
+        while (mFcFontsTrimmed < mFcFontSet->nfont) {
+            FcPattern *font = mFcFontSet->fonts[mFcFontsTrimmed];
+            ++mFcFontsTrimmed;
+
+            if (mFonts.Length() != 0) {
+                // See if the next font provides support for any extra
+                // characters.  Most often the next font is not going to
+                // support more characters so check for a SubSet first before
+                // allocating a new CharSet with Union.
+                FcCharSet *supportedChars = mCharSet;
+                if (!supportedChars) {
+                    FcPatternGetCharSet(mFonts[mFonts.Length() - 1].mPattern,
+                                        FC_CHARSET, 0, &supportedChars);
+                }
+
+                if (supportedChars) {
+                    FcCharSet *newChars = nullptr;
+                    FcPatternGetCharSet(font, FC_CHARSET, 0, &newChars);
+                    if (newChars) {
+                        if (FcCharSetIsSubset(newChars, supportedChars))
+                            continue;
+
+                        mCharSet.own(FcCharSetUnion(supportedChars, newChars));
+                    } else if (!mCharSet) {
+                        mCharSet.own(FcCharSetCopy(supportedChars));
+                    }
+                }
+            }
+
+            mFonts.AppendElement(font);
+            if (mFonts.Length() >= i)
+                break;
+        }
+
+        if (mFcFontsTrimmed == mFcFontSet->nfont) {
+            // finished with this font set
+            mFcFontSet.reset();
+        }
+    }
+
+    return mFonts[i].mPattern;
+}
+
+#ifdef MOZ_WIDGET_GTK
+static void ApplyGdkScreenFontOptions(FcPattern *aPattern);
+#endif
+
+// Apply user settings and defaults to pattern in preparation for matching.
+static void
+PrepareSortPattern(FcPattern *aPattern, double aFallbackSize,
+                   double aSizeAdjustFactor, bool aIsPrinterFont)
+{
+    FcConfigSubstitute(nullptr, aPattern, FcMatchPattern);
+
+    // This gets cairo_font_options_t for the Screen.  We should have
+    // different font options for printing (no hinting) but we are not told
+    // what we are measuring for.
+    //
+    // If cairo adds support for lcd_filter, gdk will not provide the default
+    // setting for that option.  We could get the default setting by creating
+    // an xlib surface once, recording its font_options, and then merging the
+    // gdk options.
+    //
+    // Using an xlib surface would also be an option to get Screen font
+    // options for non-GTK X11 toolkits, but less efficient than using GDK to
+    // pick up dynamic changes.
+    if(aIsPrinterFont) {
+       cairo_font_options_t *options = cairo_font_options_create();
+       cairo_font_options_set_hint_style (options, CAIRO_HINT_STYLE_NONE);
+       cairo_font_options_set_antialias (options, CAIRO_ANTIALIAS_GRAY);
+       cairo_ft_font_options_substitute(options, aPattern);
+       cairo_font_options_destroy(options);
+       FcPatternAddBool(aPattern, PRINTING_FC_PROPERTY, FcTrue);
+    } else {
+#ifdef MOZ_WIDGET_GTK
+       ApplyGdkScreenFontOptions(aPattern);
+#endif
+    }
+
+    // Protect against any fontconfig settings that may have incorrectly
+    // modified the pixelsize, and consider aSizeAdjustFactor.
+    double size = aFallbackSize;
+    if (FcPatternGetDouble(aPattern, FC_PIXEL_SIZE, 0, &size) != FcResultMatch
+        || aSizeAdjustFactor != 1.0) {
+        FcPatternDel(aPattern, FC_PIXEL_SIZE);
+        FcPatternAddDouble(aPattern, FC_PIXEL_SIZE, size * aSizeAdjustFactor);
+    }
+
+    FcDefaultSubstitute(aPattern);
+}
+
+/**
+ ** gfxPangoFontGroup
+ **/
+
+gfxPangoFontGroup::gfxPangoFontGroup(const FontFamilyList& aFontFamilyList,
+                                     const gfxFontStyle *aStyle,
+                                     gfxUserFontSet *aUserFontSet)
+    : gfxFontGroup(aFontFamilyList, aStyle, aUserFontSet),
+      mPangoLanguage(GuessPangoLanguage(aStyle->language))
+{
+    // This language is passed to the font for shaping.
+    // Shaping doesn't know about lang groups so make it a real language.
+    if (mPangoLanguage) {
+        mStyle.language = do_GetAtom(pango_language_to_string(mPangoLanguage));
+    }
+
+    // dummy entry, will be replaced when actually needed
+    mFonts.AppendElement(FamilyFace());
+    mSkipUpdateUserFonts = true;
+}
+
+gfxPangoFontGroup::~gfxPangoFontGroup()
+{
+}
+
+gfxFontGroup *
+gfxPangoFontGroup::Copy(const gfxFontStyle *aStyle)
+{
+    return new gfxPangoFontGroup(mFamilyList, aStyle, mUserFontSet);
+}
+
+void
+gfxPangoFontGroup::FindPlatformFont(const nsAString& fontName,
+                                    bool aUseFontSet,
+                                    void *aClosure)
+{
+    nsTArray<nsString> *list = static_cast<nsTArray<nsString>*>(aClosure);
+
+    if (!list->Contains(fontName)) {
+        // names present in the user fontset are not matched against system fonts
+        if (aUseFontSet && mUserFontSet && mUserFontSet->HasFamily(fontName)) {
+            nsAutoString userFontName =
+                NS_LITERAL_STRING(FONT_FACE_FAMILY_PREFIX) + fontName;
+            list->AppendElement(userFontName);
+        } else {
+            list->AppendElement(fontName);
+        }
+    }
+}
+
+gfxFcFont *
+gfxPangoFontGroup::GetBaseFont()
+{
+    if (mFonts[0].Font() == nullptr) {
+        gfxFont* font = GetBaseFontSet()->GetFontAt(0, GetStyle());
+        mFonts[0] = FamilyFace(nullptr, font);
+    }
+
+    return static_cast<gfxFcFont*>(mFonts[0].Font());
+}
+
+gfxFont*
+gfxPangoFontGroup::GetFirstValidFont(uint32_t aCh)
+{
+    return GetFontAt(0);
+}
+
+gfxFont *
+gfxPangoFontGroup::GetFontAt(int32_t i, uint32_t aCh)
+{
+    // If it turns out to be hard for all clients that cache font
+    // groups to call UpdateUserFonts at appropriate times, we could
+    // instead consider just calling UpdateUserFonts from someplace
+    // more central (such as here).
+    NS_ASSERTION(!mUserFontSet || mCurrGeneration == GetGeneration(),
+                 "Whoever was caching this font group should have "
+                 "called UpdateUserFonts on it");
+
+    NS_PRECONDITION(i == 0, "Only have one font");
+
+    return GetBaseFont();
+}
+
+void
+gfxPangoFontGroup::UpdateUserFonts()
+{
+    uint64_t newGeneration = GetGeneration();
+    if (newGeneration == mCurrGeneration)
+        return;
+
+    mFonts[0] = FamilyFace();
+    mFontSets.Clear();
+    mCachedEllipsisTextRun = nullptr;
+    mUnderlineOffset = UNDERLINE_OFFSET_NOT_SET;
+    mCurrGeneration = newGeneration;
+    mSkipDrawing = false;
+}
+
+already_AddRefed<gfxFcFontSet>
+gfxPangoFontGroup::MakeFontSet(PangoLanguage *aLang, gfxFloat aSizeAdjustFactor,
+                               nsAutoRef<FcPattern> *aMatchPattern)
+{
+    const char *lang = pango_language_to_string(aLang);
+
+    nsRefPtr <nsIAtom> langGroup;
+    if (aLang != mPangoLanguage) {
+        // Set up langGroup for Mozilla's font prefs.
+        langGroup = do_GetAtom(lang);
+    }
+
+    nsAutoTArray<nsString, 20> fcFamilyList;
+    EnumerateFontList(langGroup ? langGroup.get() : mStyle.language.get(),
+                      &fcFamilyList);
+
+    // To consider: A fontset cache here could be helpful.
+
+    // Get a pattern suitable for matching.
+    nsAutoRef<FcPattern> pattern
+        (gfxFontconfigUtils::NewPattern(fcFamilyList, mStyle, lang));
+
+    PrepareSortPattern(pattern, mStyle.size, aSizeAdjustFactor, mStyle.printerFont);
+
+    nsRefPtr<gfxFcFontSet> fontset =
+        new gfxFcFontSet(pattern, mUserFontSet);
+
+    mSkipDrawing = fontset->WaitingForUserFont();
+
+    if (aMatchPattern)
+        aMatchPattern->steal(pattern);
+
+    return fontset.forget();
+}
+
+gfxPangoFontGroup::
+FontSetByLangEntry::FontSetByLangEntry(PangoLanguage *aLang,
+                                       gfxFcFontSet *aFontSet)
+    : mLang(aLang), mFontSet(aFontSet)
+{
+}
+
+gfxFcFontSet *
+gfxPangoFontGroup::GetFontSet(PangoLanguage *aLang)
+{
+    GetBaseFontSet(); // sets mSizeAdjustFactor and mFontSets[0]
+
+    if (!aLang)
+        return mFontSets[0].mFontSet;
+
+    for (uint32_t i = 0; i < mFontSets.Length(); ++i) {
+        if (mFontSets[i].mLang == aLang)
+            return mFontSets[i].mFontSet;
+    }
+
+    nsRefPtr<gfxFcFontSet> fontSet =
+        MakeFontSet(aLang, mSizeAdjustFactor);
+    mFontSets.AppendElement(FontSetByLangEntry(aLang, fontSet));
+
+    return fontSet;
+}
+
+already_AddRefed<gfxFont>
+gfxPangoFontGroup::FindFontForChar(uint32_t aCh, uint32_t aPrevCh,
+                                   uint32_t aNextCh, int32_t aRunScript,
+                                   gfxFont *aPrevMatchedFont,
+                                   uint8_t *aMatchType)
+{
+    if (aPrevMatchedFont) {
+        // Don't switch fonts for control characters, regardless of
+        // whether they are present in the current font, as they won't
+        // actually be rendered (see bug 716229)
+        uint8_t category = GetGeneralCategory(aCh);
+        if (category == HB_UNICODE_GENERAL_CATEGORY_CONTROL) {
+            return nsRefPtr<gfxFont>(aPrevMatchedFont).forget();
+        }
+
+        // if this character is a join-control or the previous is a join-causer,
+        // use the same font as the previous range if we can
+        if (gfxFontUtils::IsJoinControl(aCh) ||
+            gfxFontUtils::IsJoinCauser(aPrevCh)) {
+            if (aPrevMatchedFont->HasCharacter(aCh)) {
+                return nsRefPtr<gfxFont>(aPrevMatchedFont).forget();
+            }
+        }
+    }
+
+    // if this character is a variation selector,
+    // use the previous font regardless of whether it supports VS or not.
+    // otherwise the text run will be divided.
+    if (gfxFontUtils::IsVarSelector(aCh)) {
+        if (aPrevMatchedFont) {
+            return nsRefPtr<gfxFont>(aPrevMatchedFont).forget();
+        }
+        // VS alone. it's meaningless to search different fonts
+        return nullptr;
+    }
+
+    // The real fonts that fontconfig provides for generic/fallback families
+    // depend on the language used, so a different FontSet is used for each
+    // language (except for the variation below).
+    //
+    //   With most fontconfig configurations any real family names prior to a
+    //   fontconfig generic with corresponding fonts installed will still lead
+    //   to the same leading fonts in each FontSet.
+    //
+    //   There is an inefficiency here therefore because the same base FontSet
+    //   could often be used if these real families support the character.
+    //   However, with fontconfig aliases, it is difficult to distinguish
+    //   where exactly alias fonts end and generic/fallback fonts begin.
+    //
+    // The variation from pure language-based matching used here is that the
+    // same primary/base font is always used irrespective of the language.
+    // This provides that SCRIPT_COMMON characters are consistently rendered
+    // with the same font (bug 339513 and bug 416725).  This is particularly
+    // important with the word cache as script can't be reliably determined
+    // from surrounding words.  It also often avoids the unnecessary extra
+    // FontSet efficiency mentioned above.
+    //
+    // However, in two situations, the base font is not checked before the
+    // language-specific FontSet.
+    //
+    //   1. When we don't have a language to make a good choice for
+    //      the base font.
+    //
+    //   2. For system fonts, use the default Pango behavior to give
+    //      consistency with other apps.  This is relevant when un-localized
+    //      builds are run in non-Latin locales.  This special-case probably
+    //      wouldn't be necessary but for bug 91190.
+
+    gfxFcFontSet *fontSet = GetBaseFontSet();
+    uint32_t nextFont = 0;
+    FcPattern *basePattern = nullptr;
+    if (!mStyle.systemFont && mPangoLanguage) {
+        basePattern = fontSet->GetFontPatternAt(0);
+        if (HasChar(basePattern, aCh)) {
+            *aMatchType = gfxTextRange::kFontGroup;
+            return nsRefPtr<gfxFont>(GetBaseFont()).forget();
+        }
+
+        nextFont = 1;
+    }
+
+    // Pango, GLib, and Thebes (but not harfbuzz!) all happen to use the same
+    // script codes, so we can just cast the value here.
+    const PangoScript script = static_cast<PangoScript>(aRunScript);
+    // Might be nice to call pango_language_includes_script only once for the
+    // run rather than for each character.
+    PangoLanguage *scriptLang;
+    if ((!basePattern ||
+         !pango_language_includes_script(mPangoLanguage, script)) &&
+        (scriptLang = pango_script_get_sample_language(script))) {
+        fontSet = GetFontSet(scriptLang);
+        nextFont = 0;
+    }
+
+    for (uint32_t i = nextFont;
+         FcPattern *pattern = fontSet->GetFontPatternAt(i);
+         ++i) {
+        if (pattern == basePattern) {
+            continue; // already checked basePattern
+        }
+
+        if (HasChar(pattern, aCh)) {
+            *aMatchType = gfxTextRange::kFontGroup;
+            return nsRefPtr<gfxFont>(fontSet->GetFontAt(i, GetStyle())).forget();
+        }
+    }
+
+    return nullptr;
+}
+
+// Sanity-check: spot-check a few constants to confirm that Thebes and
+// Pango script codes really do match
+#define CHECK_SCRIPT_CODE(script) \
+    PR_STATIC_ASSERT(int32_t(MOZ_SCRIPT_##script) == \
+                     int32_t(PANGO_SCRIPT_##script))
+
+CHECK_SCRIPT_CODE(COMMON);
+CHECK_SCRIPT_CODE(INHERITED);
+CHECK_SCRIPT_CODE(ARABIC);
+CHECK_SCRIPT_CODE(LATIN);
+CHECK_SCRIPT_CODE(UNKNOWN);
+CHECK_SCRIPT_CODE(NKO);
+
+/**
+ ** gfxFcFont
+ **/
+
+cairo_user_data_key_t gfxFcFont::sGfxFontKey;
+
+gfxFcFont::gfxFcFont(cairo_scaled_font_t *aCairoFont,
+                     gfxFcFontEntry *aFontEntry,
+                     const gfxFontStyle *aFontStyle)
+    : gfxFT2FontBase(aCairoFont, aFontEntry, aFontStyle)
+{
+    cairo_scaled_font_set_user_data(mScaledFont, &sGfxFontKey, this, nullptr);
+}
+
+gfxFcFont::~gfxFcFont()
+{
+    cairo_scaled_font_set_user_data(mScaledFont,
+                                    &sGfxFontKey,
+                                    nullptr,
+                                    nullptr);
+}
+
+already_AddRefed<gfxFont>
+gfxFcFont::GetSubSuperscriptFont(int32_t aAppUnitsPerDevPixel)
+{
+    gfxFontStyle style(*GetStyle());
+    style.AdjustForSubSuperscript(aAppUnitsPerDevPixel);
+    return MakeScaledFont(&style, style.size / GetStyle()->size);
+}
+
+already_AddRefed<gfxFont>
+gfxFcFont::MakeScaledFont(gfxFontStyle *aFontStyle, gfxFloat aScaleFactor)
+{
+    gfxFcFontEntry* fe = static_cast<gfxFcFontEntry*>(GetFontEntry());
+    nsRefPtr<gfxFont> font = gfxFontCache::GetCache()->Lookup(fe, aFontStyle);
+    if (font) {
+        return font.forget();
+    }
+
+    cairo_matrix_t fontMatrix;
+    cairo_scaled_font_get_font_matrix(mScaledFont, &fontMatrix);
+    cairo_matrix_scale(&fontMatrix, aScaleFactor, aScaleFactor);
+
+    cairo_matrix_t ctm;
+    cairo_scaled_font_get_ctm(mScaledFont, &ctm);
+
+    cairo_font_options_t *options = cairo_font_options_create();
+    cairo_scaled_font_get_font_options(mScaledFont, options);
+
+    cairo_scaled_font_t *newFont =
+        cairo_scaled_font_create(cairo_scaled_font_get_font_face(mScaledFont),
+                                 &fontMatrix, &ctm, options);
+    cairo_font_options_destroy(options);
+
+    font = new gfxFcFont(newFont, fe, aFontStyle);
+    gfxFontCache::GetCache()->AddNew(font);
+    cairo_scaled_font_destroy(newFont);
+
+    return font.forget();
+}
+
+already_AddRefed<gfxFont>
+gfxFcFont::GetSmallCapsFont()
+{
+    gfxFontStyle style(*GetStyle());
+    style.size *= SMALL_CAPS_SCALE_FACTOR;
+    style.variantCaps = NS_FONT_VARIANT_CAPS_NORMAL;
+    return MakeScaledFont(&style, SMALL_CAPS_SCALE_FACTOR);
+}
+
+/* static */ void
+gfxPangoFontGroup::Shutdown()
+{
+    // Resetting gFTLibrary in case this is wanted again after a
+    // cairo_debug_reset_static_data.
+    gFTLibrary = nullptr;
+}
+
+/* static */ gfxFontEntry *
+gfxPangoFontGroup::NewFontEntry(const nsAString& aFontName,
+                                uint16_t aWeight,
+                                int16_t aStretch,
+                                bool aItalic)
+{
+    gfxFontconfigUtils *utils = gfxFontconfigUtils::GetFontconfigUtils();
+    if (!utils)
+        return nullptr;
+
+    // The font face name from @font-face { src: local() } is not well
+    // defined.
+    //
+    // On MS Windows, this name gets compared with
+    // ENUMLOGFONTEXW::elfFullName, which for OpenType fonts seems to be the
+    // full font name from the name table.  For CFF OpenType fonts this is the
+    // same as the PostScript name, but for TrueType fonts it is usually
+    // different.
+    //
+    // On Mac, the font face name is compared with the PostScript name, even
+    // for TrueType fonts.
+    //
+    // Fontconfig only records the full font names, so the behavior here
+    // follows that on MS Windows.  However, to provide the possibility
+    // of aliases to compensate for variations, the font face name is passed
+    // through FcConfigSubstitute.
+
+    nsAutoRef<FcPattern> pattern(FcPatternCreate());
+    if (!pattern)
+        return nullptr;
+
+    NS_ConvertUTF16toUTF8 fullname(aFontName);
+    FcPatternAddString(pattern, FC_FULLNAME,
+                       gfxFontconfigUtils::ToFcChar8(fullname));
+    FcConfigSubstitute(nullptr, pattern, FcMatchPattern);
+
+    FcChar8 *name;
+    for (int v = 0;
+         FcPatternGetString(pattern, FC_FULLNAME, v, &name) == FcResultMatch;
+         ++v) {
+        const nsTArray< nsCountedRef<FcPattern> >& fonts =
+            utils->GetFontsForFullname(name);
+
+        if (fonts.Length() != 0)
+            return new gfxLocalFcFontEntry(aFontName,
+                                           aWeight,
+                                           aStretch,
+                                           aItalic,
+                                           fonts);
+    }
+
+    return nullptr;
+}
+
+/* static */ FT_Library
+gfxPangoFontGroup::GetFTLibrary()
+{
+    if (!gFTLibrary) {
+        // Use cairo's FT_Library so that cairo takes care of shutdown of the
+        // FT_Library after it has destroyed its font_faces, and FT_Done_Face
+        // has been called on each FT_Face, at least until this bug is fixed:
+        // https://bugs.freedesktop.org/show_bug.cgi?id=18857
+        //
+        // Cairo's FT_Library can be obtained from any cairo_scaled_font.  The
+        // font properties requested here are chosen to get an FT_Face that is
+        // likely to be also used elsewhere.
+        gfxFontStyle style;
+        nsRefPtr<gfxPangoFontGroup> fontGroup =
+            new gfxPangoFontGroup(FontFamilyList(eFamily_sans_serif),
+                                  &style, nullptr);
+
+        gfxFcFont *font = fontGroup->GetBaseFont();
+        if (!font)
+            return nullptr;
+
+        gfxFT2LockedFace face(font);
+        if (!face.get())
+            return nullptr;
+
+        gFTLibrary = face.get()->glyph->library;
+    }
+
+    return gFTLibrary;
+}
+
+/* static */ gfxFontEntry *
+gfxPangoFontGroup::NewFontEntry(const nsAString& aFontName,
+                                uint16_t aWeight,
+                                int16_t aStretch,
+                                bool aItalic,
+                                const uint8_t* aFontData,
+                                uint32_t aLength)
+{
+    // Ownership of aFontData is passed in here, and transferred to the
+    // new fontEntry, which will release it when no longer needed.
+
+    // Using face_index = 0 for the first face in the font, as we have no
+    // other information.  FT_New_Memory_Face checks for a nullptr FT_Library.
+    FT_Face face;
+    FT_Error error =
+        FT_New_Memory_Face(GetFTLibrary(), aFontData, aLength, 0, &face);
+    if (error != 0) {
+        free((void*)aFontData);
+        return nullptr;
+    }
+
+    return new gfxDownloadedFcFontEntry(aFontName, aWeight,
+                                        aStretch, aItalic,
+                                        aFontData, face);
+}
+
+
+static double
+GetPixelSize(FcPattern *aPattern)
+{
+    double size;
+    if (FcPatternGetDouble(aPattern,
+                           FC_PIXEL_SIZE, 0, &size) == FcResultMatch)
+        return size;
+
+    NS_NOTREACHED("No size on pattern");
+    return 0.0;
+}
+
+/**
+ * The following gfxFcFonts are accessed from the cairo_scaled_font or created
+ * from the FcPattern, not from the gfxFontCache hash table.  The gfxFontCache
+ * hash table is keyed by desired family and style, whereas here we only know
+ * actual family and style.  There may be more than one of these fonts with
+ * the same family and style, but different PangoFont and actual font face.
+ * 
+ * The point of this is to record the exact font face for gfxTextRun glyph
+ * indices.  The style of this font does not necessarily represent the exact
+ * gfxFontStyle used to build the text run.  Notably, the language is not
+ * recorded.
+ */
+
+/* static */
+already_AddRefed<gfxFcFont>
+gfxFcFont::GetOrMakeFont(FcPattern *aRequestedPattern, FcPattern *aFontPattern,
+                         const gfxFontStyle *aFontStyle)
+{
+    nsAutoRef<FcPattern> renderPattern
+        (FcFontRenderPrepare(nullptr, aRequestedPattern, aFontPattern));
+
+    // If synthetic bold/italic is not allowed by the style, adjust the
+    // resulting pattern to match the actual properties of the font.
+    if (!aFontStyle->allowSyntheticWeight) {
+        int weight;
+        if (FcPatternGetInteger(aFontPattern, FC_WEIGHT, 0,
+                                &weight) == FcResultMatch) {
+            FcPatternDel(renderPattern, FC_WEIGHT);
+            FcPatternAddInteger(renderPattern, FC_WEIGHT, weight);
+        }
+    }
+    if (!aFontStyle->allowSyntheticStyle) {
+        int slant;
+        if (FcPatternGetInteger(aFontPattern, FC_SLANT, 0,
+                                &slant) == FcResultMatch) {
+            FcPatternDel(renderPattern, FC_SLANT);
+            FcPatternAddInteger(renderPattern, FC_SLANT, slant);
+        }
+    }
+
+    cairo_font_face_t *face =
+        cairo_ft_font_face_create_for_pattern(renderPattern);
+
+    // Reuse an existing font entry if available.
+    nsRefPtr<gfxFcFontEntry> fe = gfxFcFontEntry::LookupFontEntry(face);
+    if (!fe) {
+        gfxDownloadedFcFontEntry *downloadedFontEntry =
+            GetDownloadedFontEntry(aFontPattern);
+        if (downloadedFontEntry) {
+            // Web font
+            fe = downloadedFontEntry;
+            if (cairo_font_face_status(face) == CAIRO_STATUS_SUCCESS) {
+                // cairo_font_face_t is using the web font data.
+                // Hold a reference to the font entry to keep the font face
+                // data.
+                if (!downloadedFontEntry->SetCairoFace(face)) {
+                    // OOM.  Let cairo pick a fallback font
+                    cairo_font_face_destroy(face);
+                    face = cairo_ft_font_face_create_for_pattern(aRequestedPattern);
+                    fe = gfxFcFontEntry::LookupFontEntry(face);
+                }
+            }
+        }
+        if (!fe) {
+            // Get a unique name for the font face from the file and id.
+            nsAutoString name;
+            FcChar8 *fc_file;
+            if (FcPatternGetString(renderPattern,
+                                   FC_FILE, 0, &fc_file) == FcResultMatch) {
+                int index;
+                if (FcPatternGetInteger(renderPattern,
+                                        FC_INDEX, 0, &index) != FcResultMatch) {
+                    // cairo defaults to 0.
+                    index = 0;
+                }
+
+                AppendUTF8toUTF16(gfxFontconfigUtils::ToCString(fc_file), name);
+                if (index != 0) {
+                    name.Append('/');
+                    name.AppendInt(index);
+                }
+            }
+
+            fe = new gfxSystemFcFontEntry(face, aFontPattern, name);
+        }
+    }
+
+    gfxFontStyle style(*aFontStyle);
+    style.size = GetPixelSize(renderPattern);
+    style.style = gfxFontconfigUtils::GetThebesStyle(renderPattern);
+    style.weight = gfxFontconfigUtils::GetThebesWeight(renderPattern);
+
+    nsRefPtr<gfxFont> font = gfxFontCache::GetCache()->Lookup(fe, &style);
+    if (!font) {
+        // Note that a file/index pair (or FT_Face) and the gfxFontStyle are
+        // not necessarily enough to provide a key that will describe a unique
+        // font.  cairoFont contains information from renderPattern, which is a
+        // fully resolved pattern from FcFontRenderPrepare.
+        // FcFontRenderPrepare takes the requested pattern and the face
+        // pattern as input and can modify elements of the resulting pattern
+        // that affect rendering but are not included in the gfxFontStyle.
+        cairo_scaled_font_t *cairoFont = CreateScaledFont(renderPattern, face);
+        font = new gfxFcFont(cairoFont, fe, &style);
+        gfxFontCache::GetCache()->AddNew(font);
+        cairo_scaled_font_destroy(cairoFont);
+    }
+
+    cairo_font_face_destroy(face);
+
+    nsRefPtr<gfxFcFont> retval(static_cast<gfxFcFont*>(font.get()));
+    return retval.forget();
+}
+
+gfxFcFontSet *
+gfxPangoFontGroup::GetBaseFontSet()
+{
+    if (mFontSets.Length() > 0)
+        return mFontSets[0].mFontSet;
+
+    mSizeAdjustFactor = 1.0; // will be adjusted below if necessary
+    nsAutoRef<FcPattern> pattern;
+    nsRefPtr<gfxFcFontSet> fontSet =
+        MakeFontSet(mPangoLanguage, mSizeAdjustFactor, &pattern);
+
+    double size = GetPixelSize(pattern);
+    if (size != 0.0 && mStyle.sizeAdjust > 0.0) {
+        gfxFcFont *font = fontSet->GetFontAt(0, GetStyle());
+        if (font) {
+            const gfxFont::Metrics& metrics =
+                font->GetMetrics(gfxFont::eHorizontal); // XXX vertical?
+
+            // The factor of 0.1 ensures that xHeight is sane so fonts don't
+            // become huge.  Strictly ">" ensures that xHeight and emHeight are
+            // not both zero.
+            if (metrics.xHeight > 0.1 * metrics.emHeight) {
+                mSizeAdjustFactor =
+                    mStyle.sizeAdjust * metrics.emHeight / metrics.xHeight;
+
+                size *= mSizeAdjustFactor;
+                FcPatternDel(pattern, FC_PIXEL_SIZE);
+                FcPatternAddDouble(pattern, FC_PIXEL_SIZE, size);
+
+                fontSet = new gfxFcFontSet(pattern, mUserFontSet);
+            }
+        }
+    }
+
+    PangoLanguage *pangoLang = mPangoLanguage;
+    FcChar8 *fcLang;
+    if (!pangoLang &&
+        FcPatternGetString(pattern, FC_LANG, 0, &fcLang) == FcResultMatch) {
+        pangoLang =
+            pango_language_from_string(gfxFontconfigUtils::ToCString(fcLang));
+    }
+
+    mFontSets.AppendElement(FontSetByLangEntry(pangoLang, fontSet));
+
+    return fontSet;
+}
+
+/**
+ ** gfxTextRun
+ * 
+ * A serious problem:
+ *
+ * -- We draw with a font that's hinted for the CTM, but we measure with a font
+ * hinted to the identity matrix, so our "bounding metrics" may not be accurate.
+ * 
+ **/
+
+// This will fetch an existing scaled_font if one exists.
+static cairo_scaled_font_t *
+CreateScaledFont(FcPattern *aPattern, cairo_font_face_t *aFace)
+{
+    double size = GetPixelSize(aPattern);
+        
+    cairo_matrix_t fontMatrix;
+    FcMatrix *fcMatrix;
+    if (FcPatternGetMatrix(aPattern, FC_MATRIX, 0, &fcMatrix) == FcResultMatch)
+        cairo_matrix_init(&fontMatrix, fcMatrix->xx, -fcMatrix->yx, -fcMatrix->xy, fcMatrix->yy, 0, 0);
+    else
+        cairo_matrix_init_identity(&fontMatrix);
+    cairo_matrix_scale(&fontMatrix, size, size);
+
+    FcBool printing;
+    if (FcPatternGetBool(aPattern, PRINTING_FC_PROPERTY, 0, &printing) != FcResultMatch) {
+        printing = FcFalse;
+    }
+
+    // The cairo_scaled_font is created with a unit ctm so that metrics and
+    // positions are in user space, but this means that hinting effects will
+    // not be estimated accurately for non-unit transformations.
+    cairo_matrix_t identityMatrix;
+    cairo_matrix_init_identity(&identityMatrix);
+
+    // Font options are set explicitly here to improve cairo's caching
+    // behavior and to record the relevant parts of the pattern for
+    // SetupCairoFont (so that the pattern can be released).
+    //
+    // Most font_options have already been set as defaults on the FcPattern
+    // with cairo_ft_font_options_substitute(), then user and system
+    // fontconfig configurations were applied.  The resulting font_options
+    // have been recorded on the face during
+    // cairo_ft_font_face_create_for_pattern().
+    //
+    // None of the settings here cause this scaled_font to behave any
+    // differently from how it would behave if it were created from the same
+    // face with default font_options.
+    //
+    // We set options explicitly so that the same scaled_font will be found in
+    // the cairo_scaled_font_map when cairo loads glyphs from a context with
+    // the same font_face, font_matrix, ctm, and surface font_options.
+    //
+    // Unfortunately, _cairo_scaled_font_keys_equal doesn't know about the
+    // font_options on the cairo_ft_font_face, and doesn't consider default
+    // option values to not match any explicit values.
+    //
+    // Even after cairo_set_scaled_font is used to set font_options for the
+    // cairo context, when cairo looks for a scaled_font for the context, it
+    // will look for a font with some option values from the target surface if
+    // any values are left default on the context font_options.  If this
+    // scaled_font is created with default font_options, cairo will not find
+    // it.
+    cairo_font_options_t *fontOptions = cairo_font_options_create();
+
+    // The one option not recorded in the pattern is hint_metrics, which will
+    // affect glyph metrics.  The default behaves as CAIRO_HINT_METRICS_ON.
+    // We should be considering the font_options of the surface on which this
+    // font will be used, but currently we don't have different gfxFonts for
+    // different surface font_options, so we'll create a font suitable for the
+    // Screen. Image and xlib surfaces default to CAIRO_HINT_METRICS_ON.
+    if (printing) {
+        cairo_font_options_set_hint_metrics(fontOptions, CAIRO_HINT_METRICS_OFF);
+    } else {
+        cairo_font_options_set_hint_metrics(fontOptions, CAIRO_HINT_METRICS_ON);
+    }
+
+    // The remaining options have been recorded on the pattern and the face.
+    // _cairo_ft_options_merge has some logic to decide which options from the
+    // scaled_font or from the cairo_ft_font_face take priority in the way the
+    // font behaves.
+    //
+    // In the majority of cases, _cairo_ft_options_merge uses the options from
+    // the cairo_ft_font_face, so sometimes it is not so important which
+    // values are set here so long as they are not defaults, but we'll set
+    // them to the exact values that we expect from the font, to be consistent
+    // and to protect against changes in cairo.
+    //
+    // In some cases, _cairo_ft_options_merge uses some options from the
+    // scaled_font's font_options rather than options on the
+    // cairo_ft_font_face (from fontconfig).
+    // https://bugs.freedesktop.org/show_bug.cgi?id=11838
+    //
+    // Surface font options were set on the pattern in
+    // cairo_ft_font_options_substitute.  If fontconfig has changed the
+    // hint_style then that is what the user (or distribution) wants, so we
+    // use the setting from the FcPattern.
+    //
+    // Fallback values here mirror treatment of defaults in cairo-ft-font.c.
+    FcBool hinting = FcFalse;
+    if (FcPatternGetBool(aPattern, FC_HINTING, 0, &hinting) != FcResultMatch) {
+        hinting = FcTrue;
+    }
+
+    cairo_hint_style_t hint_style;
+    if (printing || !hinting) {
+        hint_style = CAIRO_HINT_STYLE_NONE;
+    } else {
+#ifdef FC_HINT_STYLE  // FC_HINT_STYLE is available from fontconfig 2.2.91.
+        int fc_hintstyle;
+        if (FcPatternGetInteger(aPattern, FC_HINT_STYLE,
+                                0, &fc_hintstyle        ) != FcResultMatch) {
+            fc_hintstyle = FC_HINT_FULL;
+        }
+        switch (fc_hintstyle) {
+            case FC_HINT_NONE:
+                hint_style = CAIRO_HINT_STYLE_NONE;
+                break;
+            case FC_HINT_SLIGHT:
+                hint_style = CAIRO_HINT_STYLE_SLIGHT;
+                break;
+            case FC_HINT_MEDIUM:
+            default: // This fallback mirrors _get_pattern_ft_options in cairo.
+                hint_style = CAIRO_HINT_STYLE_MEDIUM;
+                break;
+            case FC_HINT_FULL:
+                hint_style = CAIRO_HINT_STYLE_FULL;
+                break;
+        }
+#else // no FC_HINT_STYLE
+        hint_style = CAIRO_HINT_STYLE_FULL;
+#endif
+    }
+    cairo_font_options_set_hint_style(fontOptions, hint_style);
+
+    int rgba;
+    if (FcPatternGetInteger(aPattern,
+                            FC_RGBA, 0, &rgba) != FcResultMatch) {
+        rgba = FC_RGBA_UNKNOWN;
+    }
+    cairo_subpixel_order_t subpixel_order = CAIRO_SUBPIXEL_ORDER_DEFAULT;
+    switch (rgba) {
+        case FC_RGBA_UNKNOWN:
+        case FC_RGBA_NONE:
+        default:
+            // There is no CAIRO_SUBPIXEL_ORDER_NONE.  Subpixel antialiasing
+            // is disabled through cairo_antialias_t.
+            rgba = FC_RGBA_NONE;
+            // subpixel_order won't be used by the font as we won't use
+            // CAIRO_ANTIALIAS_SUBPIXEL, but don't leave it at default for
+            // caching reasons described above.  Fall through:
+        case FC_RGBA_RGB:
+            subpixel_order = CAIRO_SUBPIXEL_ORDER_RGB;
+            break;
+        case FC_RGBA_BGR:
+            subpixel_order = CAIRO_SUBPIXEL_ORDER_BGR;
+            break;
+        case FC_RGBA_VRGB:
+            subpixel_order = CAIRO_SUBPIXEL_ORDER_VRGB;
+            break;
+        case FC_RGBA_VBGR:
+            subpixel_order = CAIRO_SUBPIXEL_ORDER_VBGR;
+            break;
+    }
+    cairo_font_options_set_subpixel_order(fontOptions, subpixel_order);
+
+    FcBool fc_antialias;
+    if (FcPatternGetBool(aPattern,
+                         FC_ANTIALIAS, 0, &fc_antialias) != FcResultMatch) {
+        fc_antialias = FcTrue;
+    }
+    cairo_antialias_t antialias;
+    if (!fc_antialias) {
+        antialias = CAIRO_ANTIALIAS_NONE;
+    } else if (rgba == FC_RGBA_NONE) {
+        antialias = CAIRO_ANTIALIAS_GRAY;
+    } else {
+        antialias = CAIRO_ANTIALIAS_SUBPIXEL;
+    }
+    cairo_font_options_set_antialias(fontOptions, antialias);
+
+    cairo_scaled_font_t *scaledFont =
+        cairo_scaled_font_create(aFace, &fontMatrix, &identityMatrix,
+                                 fontOptions);
+
+    cairo_font_options_destroy(fontOptions);
+
+    NS_ASSERTION(cairo_scaled_font_status(scaledFont) == CAIRO_STATUS_SUCCESS,
+                 "Failed to create scaled font");
+    return scaledFont;
+}
+
+/* static */
+PangoLanguage *
+GuessPangoLanguage(nsIAtom *aLanguage)
+{
+    if (!aLanguage)
+        return nullptr;
+
+    // Pango and fontconfig won't understand mozilla's internal langGroups, so
+    // find a real language.
+    nsAutoCString lang;
+    gfxFontconfigUtils::GetSampleLangForGroup(aLanguage, &lang);
+    if (lang.IsEmpty())
+        return nullptr;
+
+    return pango_language_from_string(lang.get());
+}
+
+#ifdef MOZ_WIDGET_GTK
+/***************************************************************************
+ *
+ * This function must be last in the file because it uses the system cairo
+ * library.  Above this point the cairo library used is the tree cairo if
+ * MOZ_TREE_CAIRO.
+ */
+
+#if MOZ_TREE_CAIRO
+// Tree cairo symbols have different names.  Disable their activation through
+// preprocessor macros.
+#undef cairo_ft_font_options_substitute
+
+// The system cairo functions are not declared because the include paths cause
+// the gdk headers to pick up the tree cairo.h.
+extern "C" {
+NS_VISIBILITY_DEFAULT void
+cairo_ft_font_options_substitute (const cairo_font_options_t *options,
+                                  FcPattern                  *pattern);
+}
+#endif
+
+static void
+ApplyGdkScreenFontOptions(FcPattern *aPattern)
+{
+    const cairo_font_options_t *options =
+        gdk_screen_get_font_options(gdk_screen_get_default());
+
+    cairo_ft_font_options_substitute(options, aPattern);
+}
+
+#endif // MOZ_WIDGET_GTK2
+
+#ifdef USE_SKIA
+mozilla::TemporaryRef<mozilla::gfx::GlyphRenderingOptions>
+gfxFcFont::GetGlyphRenderingOptions(const TextRunDrawParams* aRunParams)
+{
+  cairo_scaled_font_t *scaled_font = CairoScaledFont();
+  cairo_font_options_t *options = cairo_font_options_create();
+  cairo_scaled_font_get_font_options(scaled_font, options);
+  cairo_hint_style_t hint_style = cairo_font_options_get_hint_style(options);     
+  cairo_font_options_destroy(options);
+
+  mozilla::gfx::FontHinting hinting;
+
+  switch (hint_style) {
+    case CAIRO_HINT_STYLE_NONE:
+      hinting = mozilla::gfx::FontHinting::NONE;
+      break;
+    case CAIRO_HINT_STYLE_SLIGHT:
+      hinting = mozilla::gfx::FontHinting::LIGHT;
+      break;
+    case CAIRO_HINT_STYLE_FULL:
+      hinting = mozilla::gfx::FontHinting::FULL;
+      break;
+    default:
+      hinting = mozilla::gfx::FontHinting::NORMAL;
+      break;
+  }
+
+  // We don't want to force the use of the autohinter over the font's built in hints
+  return mozilla::gfx::Factory::CreateCairoGlyphRenderingOptions(hinting, false);
+}
+#endif
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFontconfigFonts.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFontconfigFonts.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFontconfigFonts.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFontconfigFonts.h	2015-05-25 20:42:41.000000000 +0000
@@ -0,0 +1,105 @@
+/* -*- 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 GFX_FONTCONFIG_FONTS_H
+#define GFX_FONTCONFIG_FONTS_H
+
+#include "cairo.h"
+#include "gfxTypes.h"
+#include "gfxTextRun.h"
+
+#include "nsAutoRef.h"
+#include "nsTArray.h"
+
+#include <pango/pango.h>
+
+class gfxFcFontSet;
+class gfxFcFont;
+typedef struct _FcPattern FcPattern;
+typedef struct FT_FaceRec_* FT_Face;
+typedef struct FT_LibraryRec_  *FT_Library;
+
+class gfxPangoFontGroup : public gfxFontGroup {
+public:
+    gfxPangoFontGroup(const mozilla::FontFamilyList& aFontFamilyList,
+                      const gfxFontStyle *aStyle,
+                      gfxUserFontSet *aUserFontSet);
+    virtual ~gfxPangoFontGroup();
+
+    virtual gfxFontGroup *Copy(const gfxFontStyle *aStyle);
+
+    virtual gfxFont* GetFirstValidFont(uint32_t aCh = 0x20);
+
+    virtual void UpdateUserFonts();
+
+    virtual already_AddRefed<gfxFont>
+        FindFontForChar(uint32_t aCh, uint32_t aPrevCh, uint32_t aNextCh,
+                        int32_t aRunScript, gfxFont *aPrevMatchedFont,
+                        uint8_t *aMatchType);
+
+    static void Shutdown();
+
+    // Used for @font-face { src: local(); }
+    static gfxFontEntry *NewFontEntry(const nsAString& aFontName,
+                                      uint16_t aWeight,
+                                      int16_t aStretch,
+                                      bool aItalic);
+    // Used for @font-face { src: url(); }
+    static gfxFontEntry *NewFontEntry(const nsAString& aFontName,
+                                      uint16_t aWeight,
+                                      int16_t aStretch,
+                                      bool aItalic,
+                                      const uint8_t* aFontData,
+                                      uint32_t aLength);
+
+private:
+
+    virtual gfxFont *GetFontAt(int32_t i, uint32_t aCh = 0x20);
+
+    // @param aLang [in] language to use for pref fonts and system default font
+    //        selection, or nullptr for the language guessed from the
+    //        gfxFontStyle.
+    // The FontGroup holds a reference to this set.
+    gfxFcFontSet *GetFontSet(PangoLanguage *aLang = nullptr);
+
+    class FontSetByLangEntry {
+    public:
+        FontSetByLangEntry(PangoLanguage *aLang, gfxFcFontSet *aFontSet);
+        PangoLanguage *mLang;
+        nsRefPtr<gfxFcFontSet> mFontSet;
+    };
+    // There is only one of entry in this array unless characters from scripts
+    // of other languages are measured.
+    nsAutoTArray<FontSetByLangEntry,1> mFontSets;
+
+    gfxFloat mSizeAdjustFactor;
+    PangoLanguage *mPangoLanguage;
+
+    // @param aLang [in] language to use for pref fonts and system font
+    //        resolution, or nullptr to guess a language from the gfxFontStyle.
+    // @param aMatchPattern [out] if non-nullptr, will return the pattern used.
+    already_AddRefed<gfxFcFontSet>
+    MakeFontSet(PangoLanguage *aLang, gfxFloat aSizeAdjustFactor,
+                nsAutoRef<FcPattern> *aMatchPattern = nullptr);
+
+    gfxFcFontSet *GetBaseFontSet();
+    gfxFcFont *GetBaseFont();
+
+    gfxFloat GetSizeAdjustFactor()
+    {
+        if (mFontSets.Length() == 0)
+            GetBaseFontSet();
+        return mSizeAdjustFactor;
+    }
+
+    virtual void FindPlatformFont(const nsAString& aName,
+                                  bool aUseFontSet,
+                                  void *aClosure);
+
+    friend class gfxSystemFcFontEntry;
+    static FT_Library GetFTLibrary();
+};
+
+#endif /* GFX_FONTCONFIG_FONTS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFontconfigUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFontconfigUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFontconfigUtils.cpp	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFontconfigUtils.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -361,7 +361,7 @@
         NS_NOTREACHED("unexpected CSS generic font family");
 
     // The first in the list becomes the default in
-    // gFontsDialog.readFontSelection() if the preference-selected font is not
+    // FontBuilder.readFontSelection() if the preference-selected font is not
     // available, so put system configured defaults first.
     if (monospace)
         aListOfFonts.InsertElementAt(0, NS_LITERAL_STRING("monospace"));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFont.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFont.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFont.cpp	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFont.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -10,7 +10,7 @@
 #include "mozilla/gfx/2D.h"
 #include "mozilla/MathAlgorithms.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "nsExpirationTracker.h"
 #include "nsITimer.h"
@@ -72,7 +72,7 @@
 uint32_t gGlyphExtentsSetupFallBackToTight = 0;
 #endif
 
-#define LOG_FONTINIT(args) PR_LOG(gfxPlatform::GetLog(eGfxLog_fontinit), \
+#define LOG_FONTINIT(args) MOZ_LOG(gfxPlatform::GetLog(eGfxLog_fontinit), \
                                   PR_LOG_DEBUG, args)
 #define LOG_FONTINIT_ENABLED() PR_LOG_TEST( \
                                         gfxPlatform::GetLog(eGfxLog_fontinit), \
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFontEntry.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFontEntry.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFontEntry.cpp	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFontEntry.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -6,7 +6,7 @@
 #include "mozilla/DebugOnly.h"
 #include "mozilla/MathAlgorithms.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "nsServiceManagerUtils.h"
 #include "nsExpirationTracker.h"
@@ -886,7 +886,8 @@
                  aFeatureTag == HB_TAG('p','c','a','p') ||
                  aFeatureTag == HB_TAG('c','2','p','c') ||
                  aFeatureTag == HB_TAG('s','u','p','s') ||
-                 aFeatureTag == HB_TAG('s','u','b','s'),
+                 aFeatureTag == HB_TAG('s','u','b','s') ||
+                 aFeatureTag == HB_TAG('v','e','r','t'),
                  "use of unknown feature tag");
 
     // note: graphite feature support uses the last script index
@@ -1482,7 +1483,7 @@
             if (MOZ_UNLIKELY(PR_LOG_TEST(log, PR_LOG_DEBUG))) {
                 uint32_t unicodeRange = FindCharUnicodeRange(aMatchData->mCh);
                 uint32_t script = GetScriptCode(aMatchData->mCh);
-                PR_LOG(log, PR_LOG_DEBUG,\
+                MOZ_LOG(log, PR_LOG_DEBUG,\
                        ("(textrun-systemfallback-fonts) char: u+%6.6x "
                         "unicode-range: %d script: %d match: [%s]\n",
                         aMatchData->mCh,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFont.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFont.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFont.h	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFont.h	2015-05-25 20:42:41.000000000 +0000
@@ -54,6 +54,8 @@
 // we use a platform-dependent value to harmonize with the platform's own APIs.
 #ifdef XP_WIN
 #define OBLIQUE_SKEW_FACTOR  0.3
+#elif defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
+#define OBLIQUE_SKEW_FACTOR  0.2
 #else
 #define OBLIQUE_SKEW_FACTOR  0.25
 #endif
@@ -1842,7 +1844,7 @@
     // (and with variantCaps set to normal).
     // Default implementation relies on gfxFontEntry::CreateFontInstance;
     // backends that don't implement that will need to override this and use
-    // an alternative technique. (gfxPangoFonts, I'm looking at you...)
+    // an alternative technique. (gfxFontconfigFonts, I'm looking at you...)
     virtual already_AddRefed<gfxFont> GetSmallCapsFont();
 
     // subclasses may provide (possibly hinted) glyph widths (in font units);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFontTest.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFontTest.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFontTest.h	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFontTest.h	2015-05-25 20:42:41.000000000 +0000
@@ -9,7 +9,7 @@
 #include "nsString.h"
 #include "nsTArray.h"
 
-#include "cairo/cairo.h"
+#include "cairo.h"
 
 struct gfxFontTestItem {
     gfxFontTestItem(const nsCString& fontName,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFontUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFontUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFontUtils.cpp	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFontUtils.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -23,9 +23,9 @@
 #include "harfbuzz/hb.h"
 
 #include "plbase64.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
-#define LOG(log, args) PR_LOG(gfxPlatform::GetLog(log), \
+#define LOG(log, args) MOZ_LOG(gfxPlatform::GetLog(log), \
                                PR_LOG_DEBUG, args)
 
 #define UNICODE_BMP_LIMIT 0x10000
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFT2FontList.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFT2FontList.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFT2FontList.cpp	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFT2FontList.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -60,7 +60,7 @@
 }
 
 #undef LOG
-#define LOG(args) PR_LOG(GetFontInfoLog(), PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(GetFontInfoLog(), PR_LOG_DEBUG, args)
 #define LOG_ENABLED() PR_LOG_TEST(GetFontInfoLog(), PR_LOG_DEBUG)
 
 static cairo_user_data_key_t sFTUserFontDataKey;
@@ -1357,7 +1357,7 @@
 }
 
 void
-gfxFT2FontList::GetFontList(InfallibleTArray<FontListEntry>* retValue)
+gfxFT2FontList::GetSystemFontList(InfallibleTArray<FontListEntry>* retValue)
 {
     mFontFamilies.Enumerate(AddFamilyToFontList, retValue);
     mHiddenFontFamilies.Enumerate(AddHiddenFamilyToFontList, retValue);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFT2FontList.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFT2FontList.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFT2FontList.h	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFT2FontList.h	2015-05-25 20:42:41.000000000 +0000
@@ -134,7 +134,7 @@
                                            const uint8_t* aFontData,
                                            uint32_t aLength);
 
-    void GetFontList(InfallibleTArray<FontListEntry>* retValue);
+    void GetSystemFontList(InfallibleTArray<FontListEntry>* retValue);
 
     static gfxFT2FontList* PlatformFontList() {
         return static_cast<gfxFT2FontList*>(gfxPlatformFontList::PlatformFontList());
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFT2Fonts.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFT2Fonts.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxFT2Fonts.cpp	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxFT2Fonts.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -31,7 +31,7 @@
 #include "nsCRT.h"
 #include "nsXULAppAPI.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prinit.h"
 
 #include "mozilla/MemoryReporting.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxGDIFont.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxGDIFont.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxGDIFont.cpp	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxGDIFont.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -304,6 +304,39 @@
             mMetrics->maxAdvance = mMetrics->aveCharWidth;
         }
 
+        // For fonts with USE_TYPO_METRICS set in the fsSelection field,
+        // let the OS/2 sTypo* metrics override the previous values.
+        // (see http://www.microsoft.com/typography/otspec/os2.htm#fss)
+        // Using the equivalent values from oMetrics provides inconsistent
+        // results with CFF fonts, so we instead rely on OS2Table.
+        gfxFontEntry::AutoTable os2Table(mFontEntry,
+                                         TRUETYPE_TAG('O','S','/','2'));
+        if (os2Table) {
+            uint32_t len;
+            const OS2Table *os2 =
+                reinterpret_cast<const OS2Table*>(hb_blob_get_data(os2Table,
+                                                                   &len));
+            if (len >= offsetof(OS2Table, sTypoLineGap) + sizeof(int16_t)) {
+                const uint16_t kUseTypoMetricsMask = 1 << 7;
+                if ((uint16_t(os2->fsSelection) & kUseTypoMetricsMask)) {
+                    double ascent = int16_t(os2->sTypoAscender);
+                    double descent = int16_t(os2->sTypoDescender);
+                    double lineGap = int16_t(os2->sTypoLineGap);
+                    mMetrics->maxAscent = ROUND(ascent * mFUnitsConvFactor);
+                    mMetrics->maxDescent = -ROUND(descent * mFUnitsConvFactor);
+                    mMetrics->maxHeight =
+                        mMetrics->maxAscent + mMetrics->maxDescent;
+                    mMetrics->internalLeading =
+                        mMetrics->maxHeight - mMetrics->emHeight;
+                    gfxFloat lineHeight =
+                        ROUND((ascent - descent + lineGap) * mFUnitsConvFactor);
+                    lineHeight = std::max(lineHeight, mMetrics->maxHeight);
+                    mMetrics->externalLeading =
+                        lineHeight - mMetrics->maxHeight;
+                }
+            }
+        }
+
         // Cache the width of a single space.
         SIZE size;
         GetTextExtentPoint32W(dc.GetDC(), L" ", 1, &size);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxGDIFontList.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxGDIFontList.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxGDIFontList.cpp	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxGDIFontList.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -6,7 +6,7 @@
 #include "mozilla/DebugOnly.h"
 #include <algorithm>
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "gfxGDIFontList.h"
 #include "gfxWindowsPlatform.h"
@@ -40,7 +40,7 @@
 #define CLEARTYPE_QUALITY 5
 #endif
 
-#define LOG_FONTLIST(args) PR_LOG(gfxPlatform::GetLog(eGfxLog_fontlist), \
+#define LOG_FONTLIST(args) MOZ_LOG(gfxPlatform::GetLog(eGfxLog_fontlist), \
                                PR_LOG_DEBUG, args)
 #define LOG_FONTLIST_ENABLED() PR_LOG_TEST( \
                                    gfxPlatform::GetLog(eGfxLog_fontlist), \
@@ -527,12 +527,10 @@
     EnumFontFamiliesExW(hdc, &logFont,
                         (FONTENUMPROCW)GDIFontFamily::FamilyAddStylesProc,
                         (LPARAM)this, 0);
-#ifdef PR_LOGGING
     if (LOG_FONTLIST_ENABLED() && mAvailableFonts.Length() == 0) {
         LOG_FONTLIST(("(fontlist) no styles available in family \"%s\"",
                       NS_ConvertUTF16toUTF8(mName).get()));
     }
-#endif
 
     ReleaseDC(nullptr, hdc);
 
@@ -830,7 +828,9 @@
 }
 
 gfxFontFamily*
-gfxGDIFontList::FindFamily(const nsAString& aFamily, bool aUseSystemFonts)
+gfxGDIFontList::FindFamily(const nsAString& aFamily,
+                           nsIAtom* aLanguage,
+                           bool aUseSystemFonts)
 {
     nsAutoString keyName(aFamily);
     BuildKeyNameFromFontName(keyName);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxGDIFontList.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxGDIFontList.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxGDIFontList.h	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxGDIFontList.h	2015-05-25 20:42:41.000000000 +0000
@@ -310,6 +310,7 @@
     virtual gfxFontFamily* GetDefaultFont(const gfxFontStyle* aStyle);
 
     virtual gfxFontFamily* FindFamily(const nsAString& aFamily,
+                                      nsIAtom* aLanguage = nullptr,
                                       bool aUseSystemFonts = false);
 
     virtual gfxFontEntry* LookupLocalFont(const nsAString& aFontName,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxGraphiteShaper.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxGraphiteShaper.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxGraphiteShaper.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxGraphiteShaper.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -213,10 +213,10 @@
     AutoFallibleTArray<float,SMALL_GLYPH_RUN> xLocs;
     AutoFallibleTArray<float,SMALL_GLYPH_RUN> yLocs;
 
-    if (!clusters.SetLength(aLength) ||
-        !gids.SetLength(glyphCount) ||
-        !xLocs.SetLength(glyphCount) ||
-        !yLocs.SetLength(glyphCount))
+    if (!clusters.SetLength(aLength, fallible) ||
+        !gids.SetLength(glyphCount, fallible) ||
+        !xLocs.SetLength(glyphCount, fallible) ||
+        !yLocs.SetLength(glyphCount, fallible))
     {
         return NS_ERROR_OUT_OF_MEMORY;
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxHarfBuzzShaper.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxHarfBuzzShaper.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxHarfBuzzShaper.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxHarfBuzzShaper.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -184,6 +184,61 @@
     return gid;
 }
 
+static int
+VertFormsGlyphCompare(const void* aKey, const void* aElem)
+{
+    return int(*((hb_codepoint_t*)(aKey))) - int(*((uint16_t*)(aElem)));
+}
+
+// Return a vertical presentation-form codepoint corresponding to the
+// given Unicode value, or 0 if no such form is available.
+static hb_codepoint_t
+GetVerticalPresentationForm(hb_codepoint_t unicode)
+{
+    static const uint16_t sVerticalForms[][2] = {
+        { 0x2013, 0xfe32 }, // EN DASH
+        { 0x2014, 0xfe31 }, // EM DASH
+        { 0x2025, 0xfe30 }, // TWO DOT LEADER
+        { 0x2026, 0xfe19 }, // HORIZONTAL ELLIPSIS
+        { 0x3001, 0xfe11 }, // IDEOGRAPHIC COMMA
+        { 0x3002, 0xfe12 }, // IDEOGRAPHIC FULL STOP
+        { 0x3008, 0xfe3f }, // LEFT ANGLE BRACKET
+        { 0x3009, 0xfe40 }, // RIGHT ANGLE BRACKET
+        { 0x300a, 0xfe3d }, // LEFT DOUBLE ANGLE BRACKET
+        { 0x300b, 0xfe3e }, // RIGHT DOUBLE ANGLE BRACKET
+        { 0x300c, 0xfe41 }, // LEFT CORNER BRACKET
+        { 0x300d, 0xfe42 }, // RIGHT CORNER BRACKET
+        { 0x300e, 0xfe43 }, // LEFT WHITE CORNER BRACKET
+        { 0x300f, 0xfe44 }, // RIGHT WHITE CORNER BRACKET
+        { 0x3010, 0xfe3b }, // LEFT BLACK LENTICULAR BRACKET
+        { 0x3011, 0xfe3c }, // RIGHT BLACK LENTICULAR BRACKET
+        { 0x3014, 0xfe39 }, // LEFT TORTOISE SHELL BRACKET
+        { 0x3015, 0xfe3a }, // RIGHT TORTOISE SHELL BRACKET
+        { 0x3016, 0xfe17 }, // LEFT WHITE LENTICULAR BRACKET
+        { 0x3017, 0xfe18 }, // RIGHT WHITE LENTICULAR BRACKET
+        { 0xfe4f, 0xfe34 }, // WAVY LOW LINE
+        { 0xff01, 0xfe15 }, // FULLWIDTH EXCLAMATION MARK
+        { 0xff08, 0xfe35 }, // FULLWIDTH LEFT PARENTHESIS
+        { 0xff09, 0xfe36 }, // FULLWIDTH RIGHT PARENTHESIS
+        { 0xff0c, 0xfe10 }, // FULLWIDTH COMMA
+        { 0xff1a, 0xfe13 }, // FULLWIDTH COLON
+        { 0xff1b, 0xfe14 }, // FULLWIDTH SEMICOLON
+        { 0xff1f, 0xfe16 }, // FULLWIDTH QUESTION MARK
+        { 0xff3b, 0xfe47 }, // FULLWIDTH LEFT SQUARE BRACKET
+        { 0xff3d, 0xfe48 }, // FULLWIDTH RIGHT SQUARE BRACKET
+        { 0xff3f, 0xfe33 }, // FULLWIDTH LOW LINE
+        { 0xff5b, 0xfe37 }, // FULLWIDTH LEFT CURLY BRACKET
+        { 0xff5d, 0xfe38 }  // FULLWIDTH RIGHT CURLY BRACKET
+    };
+    const uint16_t* charPair =
+        static_cast<const uint16_t*>(bsearch(&unicode,
+                                             sVerticalForms,
+                                             ArrayLength(sVerticalForms),
+                                             sizeof(sVerticalForms[0]),
+                                             VertFormsGlyphCompare));
+    return charPair ? charPair[1] : 0;
+}
+
 static hb_bool_t
 HBGetGlyph(hb_font_t *font, void *font_data,
            hb_codepoint_t unicode, hb_codepoint_t variation_selector,
@@ -192,6 +247,18 @@
 {
     const gfxHarfBuzzShaper::FontCallbackData *fcd =
         static_cast<const gfxHarfBuzzShaper::FontCallbackData*>(font_data);
+
+    if (fcd->mShaper->UseVerticalPresentationForms()) {
+        hb_codepoint_t verticalForm = GetVerticalPresentationForm(unicode);
+        if (verticalForm) {
+            *glyph = fcd->mShaper->GetGlyph(verticalForm, variation_selector);
+            if (*glyph != 0) {
+                return true;
+            }
+        }
+        // fall back to the non-vertical form if we didn't find an alternate
+    }
+
     *glyph = fcd->mShaper->GetGlyph(unicode, variation_selector);
     return *glyph != 0;
 }
@@ -1419,6 +1486,7 @@
     }
 
     mCallbackData.mContext = aContext;
+    mUseVerticalPresentationForms = false;
 
     if (!Initialize()) {
         return false;
@@ -1428,6 +1496,10 @@
         if (!InitializeVertical()) {
             return false;
         }
+        if (!mFont->GetFontEntry()->
+            SupportsOpenTypeFeature(aScript, HB_TAG('v','e','r','t'))) {
+            mUseVerticalPresentationForms = true;
+        }
     }
 
     const gfxFontStyle *style = mFont->GetStyle();
@@ -1534,7 +1606,7 @@
     uint32_t wordLength = aLength;
     static const int32_t NO_GLYPH = -1;
     AutoFallibleTArray<int32_t,SMALL_GLYPH_RUN> charToGlyphArray;
-    if (!charToGlyphArray.SetLength(wordLength)) {
+    if (!charToGlyphArray.SetLength(wordLength, fallible)) {
         return NS_ERROR_OUT_OF_MEMORY;
     }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxHarfBuzzShaper.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxHarfBuzzShaper.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxHarfBuzzShaper.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxHarfBuzzShaper.h	2015-05-25 20:42:41.000000000 +0000
@@ -76,6 +76,11 @@
     hb_bool_t GetGlyphExtents(hb_codepoint_t aGlyph,
                               hb_glyph_extents_t *aExtents) const;
 
+    bool UseVerticalPresentationForms() const
+    {
+        return mUseVerticalPresentationForms;
+    }
+
     static hb_script_t
     GetHBScriptUsedForShaping(int32_t aScript) {
         // Decide what harfbuzz script code will be used for shaping
@@ -176,6 +181,10 @@
     bool mInitialized;
     bool mVerticalInitialized;
 
+    // Whether to use vertical presentation forms for CJK characters
+    // when available (only set if the 'vert' feature is not available).
+    bool mUseVerticalPresentationForms;
+
     // these are set from the FindGlyf callback on first use of the glyf data
     mutable bool mLoadedLocaGlyf;
     mutable bool mLocaLongOffsets;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxMacFont.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxMacFont.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxMacFont.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxMacFont.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -437,7 +437,8 @@
     mAzureScaledFont = mozilla::gfx::Factory::CreateScaledFontWithCairo(nativeFont, GetAdjustedSize(), mScaledFont);
   }
 
-  return mAzureScaledFont;
+  RefPtr<ScaledFont> scaledFont(mAzureScaledFont);
+  return scaledFont.forget();
 }
 
 TemporaryRef<mozilla::gfx::GlyphRenderingOptions>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxMacPlatformFontList.mm firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxMacPlatformFontList.mm
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxMacPlatformFontList.mm	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxMacPlatformFontList.mm	2015-05-25 20:42:41.000000000 +0000
@@ -38,7 +38,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include <algorithm>
 
@@ -129,7 +129,7 @@
                                    length:aSrc.Length()];
 }
 
-#define LOG_FONTLIST(args) PR_LOG(gfxPlatform::GetLog(eGfxLog_fontlist), \
+#define LOG_FONTLIST(args) MOZ_LOG(gfxPlatform::GetLog(eGfxLog_fontlist), \
                                PR_LOG_DEBUG, args)
 #define LOG_FONTLIST_ENABLED() PR_LOG_TEST( \
                                    gfxPlatform::GetLog(eGfxLog_fontlist), \
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxPangoFonts.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxPangoFonts.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxPangoFonts.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxPangoFonts.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,2164 +0,0 @@
-/* -*- 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 "prlink.h"
-#include "gfxTypes.h"
-
-#include "nsTArray.h"
-
-#include "gfxContext.h"
-#ifdef MOZ_WIDGET_GTK
-#include "gfxPlatformGtk.h"
-#endif
-#ifdef MOZ_WIDGET_QT
-#include "gfxQtPlatform.h"
-#endif
-#include "gfxPangoFonts.h"
-#include "gfxFT2FontBase.h"
-#include "gfxFT2Utils.h"
-#include "harfbuzz/hb.h"
-#include "harfbuzz/hb-ot.h"
-#include "nsUnicodeProperties.h"
-#include "nsUnicodeScriptCodes.h"
-#include "gfxFontconfigUtils.h"
-#include "gfxUserFontSet.h"
-#include "gfxFontConstants.h"
-
-#include <cairo.h>
-#include <cairo-ft.h>
-
-#include <fontconfig/fcfreetype.h>
-#include <pango/pango.h>
-
-#include FT_TRUETYPE_TABLES_H
-
-#ifdef MOZ_WIDGET_GTK
-#include <gdk/gdk.h>
-#endif
-
-#include <math.h>
-
-using namespace mozilla;
-using namespace mozilla::unicode;
-
-#define PRINTING_FC_PROPERTY "gfx.printing"
-
-static PangoLanguage *GuessPangoLanguage(nsIAtom *aLanguage);
-
-static cairo_scaled_font_t *
-CreateScaledFont(FcPattern *aPattern, cairo_font_face_t *aFace);
-
-static FT_Library gFTLibrary;
-
-// FC_FAMILYLANG and FC_FULLNAME were introduced in fontconfig-2.2.97
-// and so fontconfig-2.3.0 (2005).
-#ifndef FC_FAMILYLANG
-#define FC_FAMILYLANG "familylang"
-#endif
-#ifndef FC_FULLNAME
-#define FC_FULLNAME "fullname"
-#endif
-
-static PRFuncPtr
-FindFunctionSymbol(const char *name)
-{
-    PRLibrary *lib = nullptr;
-    PRFuncPtr result = PR_FindFunctionSymbolAndLibrary(name, &lib);
-    if (lib) {
-        PR_UnloadLibrary(lib);
-    }
-
-    return result;
-}
-
-static bool HasChar(FcPattern *aFont, FcChar32 wc)
-{
-    FcCharSet *charset = nullptr;
-    FcPatternGetCharSet(aFont, FC_CHARSET, 0, &charset);
-
-    return charset && FcCharSetHasChar(charset, wc);
-}
-
-/**
- * gfxFcFontEntry:
- *
- * An abstract base class of for gfxFontEntry implementations used by
- * gfxFcFont and gfxUserFontSet.
- */
-
-class gfxFcFontEntry : public gfxFontEntry {
-public:
-    // For all FontEntrys attached to gfxFcFonts, there will be only one
-    // pattern in this array.  This is always a font pattern, not a fully
-    // resolved pattern.  gfxFcFont only uses this to construct a PangoFont.
-    //
-    // FontEntrys for src:local() fonts in gfxUserFontSet may return more than
-    // one pattern.  (See comment in gfxUserFcFontEntry.)
-    const nsTArray< nsCountedRef<FcPattern> >& GetPatterns()
-    {
-        return mPatterns;
-    }
-
-    static gfxFcFontEntry *LookupFontEntry(cairo_font_face_t *aFace)
-    {
-        return static_cast<gfxFcFontEntry*>
-            (cairo_font_face_get_user_data(aFace, &sFontEntryKey));
-    }
-
-    // override the gfxFontEntry impl to read the name from fontconfig
-    // instead of trying to get the 'name' table, as we don't implement
-    // GetFontTable() here
-    virtual nsString RealFaceName();
-
-    // This is needed to make gfxFontEntry::HasCharacter(aCh) work.
-    virtual bool TestCharacterMap(uint32_t aCh)
-    {
-        for (uint32_t i = 0; i < mPatterns.Length(); ++i) {
-            if (HasChar(mPatterns[i], aCh)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-protected:
-    explicit gfxFcFontEntry(const nsAString& aName)
-        : gfxFontEntry(aName)
-    {
-    }
-
-    // One pattern is the common case and some subclasses rely on successful
-    // addition of the first element to the array.
-    AutoFallibleTArray<nsCountedRef<FcPattern>,1> mPatterns;
-
-    static cairo_user_data_key_t sFontEntryKey;
-};
-
-cairo_user_data_key_t gfxFcFontEntry::sFontEntryKey;
-
-nsString
-gfxFcFontEntry::RealFaceName()
-{
-    FcChar8 *name;
-    if (!mPatterns.IsEmpty()) {
-        if (FcPatternGetString(mPatterns[0],
-                               FC_FULLNAME, 0, &name) == FcResultMatch) {
-            return NS_ConvertUTF8toUTF16((const char*)name);
-        }
-        if (FcPatternGetString(mPatterns[0],
-                               FC_FAMILY, 0, &name) == FcResultMatch) {
-            NS_ConvertUTF8toUTF16 result((const char*)name);
-            if (FcPatternGetString(mPatterns[0],
-                                   FC_STYLE, 0, &name) == FcResultMatch) {
-                result.Append(' ');
-                AppendUTF8toUTF16((const char*)name, result);
-            }
-            return result;
-        }
-    }
-    // fall back to gfxFontEntry implementation (only works for sfnt fonts)
-    return gfxFontEntry::RealFaceName();
-}
-
-/**
- * gfxSystemFcFontEntry:
- *
- * An implementation of gfxFcFontEntry used by gfxFcFonts for system fonts,
- * including those from regular family-name based font selection as well as
- * those from src:local().
- *
- * All gfxFcFonts using the same cairo_font_face_t share the same FontEntry. 
- */
-
-class gfxSystemFcFontEntry : public gfxFcFontEntry {
-public:
-    // For memory efficiency, aFontPattern should be a font pattern,
-    // not a fully resolved pattern.
-    gfxSystemFcFontEntry(cairo_font_face_t *aFontFace,
-                         FcPattern *aFontPattern,
-                         const nsAString& aName)
-        : gfxFcFontEntry(aName), mFontFace(aFontFace),
-          mFTFace(nullptr), mFTFaceInitialized(false)
-    {
-        cairo_font_face_reference(mFontFace);
-        cairo_font_face_set_user_data(mFontFace, &sFontEntryKey, this, nullptr);
-        mPatterns.AppendElement();
-        // mPatterns is an nsAutoTArray with 1 space always available, so the
-        // AppendElement always succeeds.
-        mPatterns[0] = aFontPattern;
-
-        FcChar8 *name;
-        if (FcPatternGetString(aFontPattern,
-                               FC_FAMILY, 0, &name) == FcResultMatch) {
-            mFamilyName = NS_ConvertUTF8toUTF16((const char*)name);
-        }
-    }
-
-    ~gfxSystemFcFontEntry()
-    {
-        cairo_font_face_set_user_data(mFontFace,
-                                      &sFontEntryKey,
-                                      nullptr,
-                                      nullptr);
-        cairo_font_face_destroy(mFontFace);
-    }
-
-    virtual void ForgetHBFace() override;
-    virtual void ReleaseGrFace(gr_face* aFace) override;
-
-protected:
-    virtual nsresult
-    CopyFontTable(uint32_t aTableTag, FallibleTArray<uint8_t>& aBuffer) override;
-
-    void MaybeReleaseFTFace();
-
-private:
-    cairo_font_face_t *mFontFace;
-    FT_Face            mFTFace;
-    bool               mFTFaceInitialized;
-};
-
-nsresult
-gfxSystemFcFontEntry::CopyFontTable(uint32_t aTableTag,
-                                    FallibleTArray<uint8_t>& aBuffer)
-{
-    if (!mFTFaceInitialized) {
-        mFTFaceInitialized = true;
-        FcChar8 *filename;
-        if (FcPatternGetString(mPatterns[0], FC_FILE, 0, &filename) != FcResultMatch) {
-            return NS_ERROR_FAILURE;
-        }
-        int index;
-        if (FcPatternGetInteger(mPatterns[0], FC_INDEX, 0, &index) != FcResultMatch) {
-            index = 0; // default to 0 if not found in pattern
-        }
-        if (FT_New_Face(gfxPangoFontGroup::GetFTLibrary(),
-                        (const char*)filename, index, &mFTFace) != 0) {
-            return NS_ERROR_FAILURE;
-        }
-    }
-
-    if (!mFTFace) {
-        return NS_ERROR_NOT_AVAILABLE;
-    }
-
-    FT_ULong length = 0;
-    if (FT_Load_Sfnt_Table(mFTFace, aTableTag, 0, nullptr, &length) != 0) {
-        return NS_ERROR_NOT_AVAILABLE;
-    }
-    if (!aBuffer.SetLength(length)) {
-        return NS_ERROR_OUT_OF_MEMORY;
-    }
-    if (FT_Load_Sfnt_Table(mFTFace, aTableTag, 0, aBuffer.Elements(), &length) != 0) {
-        aBuffer.Clear();
-        return NS_ERROR_FAILURE;
-    }
-
-    return NS_OK;
-}
-
-void
-gfxSystemFcFontEntry::MaybeReleaseFTFace()
-{
-    // don't release if either HB or Gr face still exists
-    if (mHBFace || mGrFace) {
-        return;
-    }
-    if (mFTFace) {
-        FT_Done_Face(mFTFace);
-        mFTFace = nullptr;
-    }
-    mFTFaceInitialized = false;
-}
-
-void
-gfxSystemFcFontEntry::ForgetHBFace()
-{
-    gfxFontEntry::ForgetHBFace();
-    MaybeReleaseFTFace();
-}
-
-void
-gfxSystemFcFontEntry::ReleaseGrFace(gr_face* aFace)
-{
-    gfxFontEntry::ReleaseGrFace(aFace);
-    MaybeReleaseFTFace();
-}
-
-// A namespace for @font-face family names in FcPatterns so that fontconfig
-// aliases do not pick up families from @font-face rules and so that
-// fontconfig rules can distinguish between web fonts and platform fonts.
-// http://lists.freedesktop.org/archives/fontconfig/2008-November/003037.html
-#define FONT_FACE_FAMILY_PREFIX "@font-face:"
-
-/**
- * gfxUserFcFontEntry:
- *
- * An abstract class for objects in a gfxUserFontSet that can provide
- * FcPattern* handles to fonts.
- *
- * Separate implementations of this class support local fonts from src:local()
- * and web fonts from src:url().
- */
-
-// There is a one-to-one correspondence between gfxUserFcFontEntry objects and
-// @font-face rules, but sometimes a one-to-many correspondence between font
-// entries and font patterns.
-//
-// http://www.w3.org/TR/2002/WD-css3-webfonts-20020802#font-descriptions
-// provided a font-size descriptor to specify the sizes supported by the face,
-// but the "Editor's Draft 27 June 2008"
-// http://dev.w3.org/csswg/css3-fonts/#font-resources does not provide such a
-// descriptor, and Mozilla does not recognize such a descriptor.
-//
-// Font face names used in src:local() also do not usually specify a size.
-//
-// PCF format fonts have each size in a different file, and each of these
-// files is referenced by its own pattern, but really these are each
-// different sizes of one face with one name.
-//
-// Multiple patterns in an entry also effectively deals with a set of
-// PostScript Type 1 font files that all have the same face name but are in
-// several files because of the limit on the number of glyphs in a Type 1 font
-// file.  (e.g. Computer Modern.)
-
-class gfxUserFcFontEntry : public gfxFcFontEntry {
-protected:
-    explicit gfxUserFcFontEntry(const nsAString& aFontName,
-                       uint16_t aWeight,
-                       int16_t aStretch,
-                       bool aItalic)
-        : gfxFcFontEntry(aFontName)
-    {
-        mItalic = aItalic;
-        mWeight = aWeight;
-        mStretch = aStretch;
-    }
-
-    // Helper function to change a pattern so that it matches the CSS style
-    // descriptors and so gets properly sorted in font selection.  This also
-    // avoids synthetic style effects being added by the renderer when the
-    // style of the font itself does not match the descriptor provided by the
-    // author.
-    void AdjustPatternToCSS(FcPattern *aPattern);
-};
-
-void
-gfxUserFcFontEntry::AdjustPatternToCSS(FcPattern *aPattern)
-{
-    int fontWeight = -1;
-    FcPatternGetInteger(aPattern, FC_WEIGHT, 0, &fontWeight);
-    int cssWeight = gfxFontconfigUtils::FcWeightForBaseWeight(mWeight / 100);
-    if (cssWeight != fontWeight) {
-        FcPatternDel(aPattern, FC_WEIGHT);
-        FcPatternAddInteger(aPattern, FC_WEIGHT, cssWeight);
-    }
-
-    int fontSlant;
-    FcResult res = FcPatternGetInteger(aPattern, FC_SLANT, 0, &fontSlant);
-    // gfxFontEntry doesn't understand the difference between oblique
-    // and italic.
-    if (res != FcResultMatch ||
-        IsItalic() != (fontSlant != FC_SLANT_ROMAN)) {
-        FcPatternDel(aPattern, FC_SLANT);
-        FcPatternAddInteger(aPattern, FC_SLANT,
-                            IsItalic() ? FC_SLANT_OBLIQUE : FC_SLANT_ROMAN);
-    }
-
-    int fontWidth = -1;
-    FcPatternGetInteger(aPattern, FC_WIDTH, 0, &fontWidth);
-    int cssWidth = gfxFontconfigUtils::FcWidthForThebesStretch(mStretch);
-    if (cssWidth != fontWidth) {
-        FcPatternDel(aPattern, FC_WIDTH);
-        FcPatternAddInteger(aPattern, FC_WIDTH, cssWidth);
-    }
-
-    // Ensure that there is a fullname property (if there is a family
-    // property) so that fontconfig rules can identify the real name of the
-    // font, because the family property will be replaced.
-    FcChar8 *unused;
-    if (FcPatternGetString(aPattern,
-                           FC_FULLNAME, 0, &unused) == FcResultNoMatch) {
-        nsAutoCString fullname;
-        if (gfxFontconfigUtils::GetFullnameFromFamilyAndStyle(aPattern,
-                                                              &fullname)) {
-            FcPatternAddString(aPattern, FC_FULLNAME,
-                               gfxFontconfigUtils::ToFcChar8(fullname));
-        }
-    }
-
-    nsAutoCString family;
-    family.Append(FONT_FACE_FAMILY_PREFIX);
-    AppendUTF16toUTF8(Name(), family);
-
-    FcPatternDel(aPattern, FC_FAMILY);
-    FcPatternDel(aPattern, FC_FAMILYLANG);
-    FcPatternAddString(aPattern, FC_FAMILY,
-                       gfxFontconfigUtils::ToFcChar8(family));
-}
-
-/**
- * gfxLocalFcFontEntry:
- *
- * An implementation of gfxUserFcFontEntry for local fonts from src:local().
- *
- * This class is used only in gfxUserFontSet and for providing FcPattern*
- * handles to system fonts for font selection.  gfxFcFonts created from these
- * patterns will use gfxSystemFcFontEntrys, which may be shared with
- * gfxFcFonts from regular family-name based font selection.
- */
-
-class gfxLocalFcFontEntry : public gfxUserFcFontEntry {
-public:
-    gfxLocalFcFontEntry(const nsAString& aFontName,
-                        uint16_t aWeight,
-                        int16_t aStretch,
-                        bool aItalic,
-                        const nsTArray< nsCountedRef<FcPattern> >& aPatterns)
-        : gfxUserFcFontEntry(aFontName, aWeight, aStretch, aItalic)
-    {
-        if (!mPatterns.SetCapacity(aPatterns.Length()))
-            return; // OOM
-
-        for (uint32_t i = 0; i < aPatterns.Length(); ++i) {
-            FcPattern *pattern = FcPatternDuplicate(aPatterns.ElementAt(i));
-            if (!pattern)
-                return; // OOM
-
-            AdjustPatternToCSS(pattern);
-
-            mPatterns.AppendElement();
-            mPatterns[i].own(pattern);
-        }
-        mIsLocalUserFont = true;
-    }
-};
-
-/**
- * gfxDownloadedFcFontEntry:
- *
- * An implementation of gfxFcFontEntry for web fonts from src:url().
- * 
- * When a cairo_font_face_t is created for these fonts, the cairo_font_face_t
- * keeps a reference to the FontEntry to keep the font data alive.
- */
-
-class gfxDownloadedFcFontEntry : public gfxUserFcFontEntry {
-public:
-    // This takes ownership of the face and its underlying data
-    gfxDownloadedFcFontEntry(const nsAString& aFontName,
-                             uint16_t aWeight,
-                             int16_t aStretch,
-                             bool aItalic,
-                             const uint8_t *aData, FT_Face aFace)
-        : gfxUserFcFontEntry(aFontName, aWeight, aStretch, aItalic),
-          mFontData(aData), mFace(aFace)
-    {
-        NS_PRECONDITION(aFace != nullptr, "aFace is NULL!");
-        mIsDataUserFont = true;
-        InitPattern();
-    }
-
-    virtual ~gfxDownloadedFcFontEntry();
-
-    // Returns true on success
-    bool SetCairoFace(cairo_font_face_t *aFace);
-
-    virtual hb_blob_t* GetFontTable(uint32_t aTableTag) override;
-
-protected:
-    void InitPattern();
-
-    // mFontData holds the data used to instantiate the FT_Face;
-    // this has to persist until we are finished with the face,
-    // then be released with free().
-    const uint8_t* mFontData;
-
-    FT_Face mFace;
-};
-
-// A property for recording gfxDownloadedFcFontEntrys on FcPatterns.
-static const char *kFontEntryFcProp = "-moz-font-entry";
-
-static FcBool AddDownloadedFontEntry(FcPattern *aPattern,
-                                     gfxDownloadedFcFontEntry *aFontEntry)
-{
-    FcValue value;
-    value.type = FcTypeFTFace; // void* field of union
-    value.u.f = aFontEntry;
-
-    return FcPatternAdd(aPattern, kFontEntryFcProp, value, FcFalse);
-}
-
-static FcBool DelDownloadedFontEntry(FcPattern *aPattern)
-{
-    return FcPatternDel(aPattern, kFontEntryFcProp);
-}
-
-static gfxDownloadedFcFontEntry *GetDownloadedFontEntry(FcPattern *aPattern)
-{
-    FcValue value;
-    if (FcPatternGet(aPattern, kFontEntryFcProp, 0, &value) != FcResultMatch)
-        return nullptr;
-
-    if (value.type != FcTypeFTFace) {
-        NS_NOTREACHED("Wrong type for -moz-font-entry font property");
-        return nullptr;
-    }
-
-    return static_cast<gfxDownloadedFcFontEntry*>(value.u.f);
-}
-
-gfxDownloadedFcFontEntry::~gfxDownloadedFcFontEntry()
-{
-    if (mPatterns.Length() != 0) {
-        // Remove back reference to this font entry and the face in case
-        // anyone holds a reference to the pattern.
-        NS_ASSERTION(mPatterns.Length() == 1,
-                     "More than one pattern in gfxDownloadedFcFontEntry!");
-        DelDownloadedFontEntry(mPatterns[0]);
-        FcPatternDel(mPatterns[0], FC_FT_FACE);
-    }
-    FT_Done_Face(mFace);
-    free((void*)mFontData);
-}
-
-typedef FcPattern* (*QueryFaceFunction)(const FT_Face face,
-                                        const FcChar8 *file, int id,
-                                        FcBlanks *blanks);
-
-void
-gfxDownloadedFcFontEntry::InitPattern()
-{
-    static QueryFaceFunction sQueryFacePtr =
-        reinterpret_cast<QueryFaceFunction>
-        (FindFunctionSymbol("FcFreeTypeQueryFace"));
-    FcPattern *pattern;
-
-    // FcFreeTypeQueryFace is the same function used to construct patterns for
-    // system fonts and so is the preferred function to use for this purpose.
-    // This will set up the langset property, which helps with sorting, and
-    // the foundry, fullname, and fontversion properties, which properly
-    // identify the font to fontconfig rules.  However, FcFreeTypeQueryFace is
-    // available only from fontconfig-2.4.2 (December 2006).  (CentOS 5.0 has
-    // fontconfig-2.4.1.)
-    if (sQueryFacePtr) {
-        // The "file" argument cannot be nullptr (in fontconfig-2.6.0 at
-        // least). The dummy file passed here is removed below.
-        //
-        // When fontconfig scans the system fonts, FcConfigGetBlanks(nullptr)
-        // is passed as the "blanks" argument, which provides that unexpectedly
-        // blank glyphs are elided.  Here, however, we pass nullptr for
-        // "blanks", effectively assuming that, if the font has a blank glyph,
-        // then the author intends any associated character to be rendered
-        // blank.
-        pattern =
-            (*sQueryFacePtr)(mFace,
-                             gfxFontconfigUtils::ToFcChar8(""),
-                             0,
-                             nullptr);
-        if (!pattern)
-            // Either OOM, or fontconfig chose to skip this font because it
-            // has "no encoded characters", which I think means "BDF and PCF
-            // fonts which are not in Unicode (or the effectively equivalent
-            // ISO Latin-1) encoding".
-            return;
-
-        // These properties don't make sense for this face without a file.
-        FcPatternDel(pattern, FC_FILE);
-        FcPatternDel(pattern, FC_INDEX);
-
-    } else {
-        // Do the minimum necessary to construct a pattern for sorting.
-
-        // FC_CHARSET is vital to determine which characters are supported.
-        nsAutoRef<FcCharSet> charset(FcFreeTypeCharSet(mFace, nullptr));
-        // If there are no characters then assume we don't know how to read
-        // this font.
-        if (!charset || FcCharSetCount(charset) == 0)
-            return;
-
-        pattern = FcPatternCreate();
-        FcPatternAddCharSet(pattern, FC_CHARSET, charset);
-
-        // FC_PIXEL_SIZE can be important for font selection of fixed-size
-        // fonts.
-        if (!(mFace->face_flags & FT_FACE_FLAG_SCALABLE)) {
-            for (FT_Int i = 0; i < mFace->num_fixed_sizes; ++i) {
-#if HAVE_FT_BITMAP_SIZE_Y_PPEM
-                double size = FLOAT_FROM_26_6(mFace->available_sizes[i].y_ppem);
-#else
-                double size = mFace->available_sizes[i].height;
-#endif
-                FcPatternAddDouble (pattern, FC_PIXEL_SIZE, size);
-            }
-
-            // Not sure whether this is important;
-            // imitating FcFreeTypeQueryFace:
-            FcPatternAddBool (pattern, FC_ANTIALIAS, FcFalse);
-        }
-
-        // Setting up the FC_LANGSET property is very difficult with the APIs
-        // available prior to FcFreeTypeQueryFace.  Having no FC_LANGSET
-        // property seems better than having a property with an empty LangSet.
-        // With no FC_LANGSET property, fontconfig sort functions will
-        // consider this face to have the same priority as (otherwise equal)
-        // faces that have support for the primary requested language, but
-        // will not consider any language to have been satisfied (and so will
-        // continue to look for a face with language support in fallback
-        // fonts).
-    }
-
-    AdjustPatternToCSS(pattern);
-
-    FcPatternAddFTFace(pattern, FC_FT_FACE, mFace);
-    AddDownloadedFontEntry(pattern, this);
-
-    // There is never more than one pattern
-    mPatterns.AppendElement();
-    mPatterns[0].own(pattern);
-}
-
-static void ReleaseDownloadedFontEntry(void *data)
-{
-    gfxDownloadedFcFontEntry *downloadedFontEntry =
-        static_cast<gfxDownloadedFcFontEntry*>(data);
-    NS_RELEASE(downloadedFontEntry);
-}
-
-bool gfxDownloadedFcFontEntry::SetCairoFace(cairo_font_face_t *aFace)
-{
-    if (CAIRO_STATUS_SUCCESS !=
-        cairo_font_face_set_user_data(aFace, &sFontEntryKey, this,
-                                      ReleaseDownloadedFontEntry))
-        return false;
-
-    // Hold a reference to this font entry to keep the font face data.
-    NS_ADDREF(this);
-    return true;
-}
-
-hb_blob_t *
-gfxDownloadedFcFontEntry::GetFontTable(uint32_t aTableTag)
-{
-    // The entry already owns the (sanitized) sfnt data in mFontData,
-    // so we can just return a blob that "wraps" the appropriate chunk of it.
-    // The blob should not attempt to free its data, as the entire sfnt data
-    // will be freed when the font entry is deleted.
-    return GetTableFromFontData(mFontData, aTableTag);
-}
-
-/*
- * gfxFcFont
- *
- * This is a gfxFont implementation using a CAIRO_FONT_TYPE_FT
- * cairo_scaled_font created from an FcPattern.
- */
-
-class gfxFcFont : public gfxFT2FontBase {
-public:
-    virtual ~gfxFcFont();
-    static already_AddRefed<gfxFcFont>
-    GetOrMakeFont(FcPattern *aRequestedPattern, FcPattern *aFontPattern,
-                  const gfxFontStyle *aFontStyle);
-
-#ifdef USE_SKIA
-    virtual mozilla::TemporaryRef<mozilla::gfx::GlyphRenderingOptions>
-        GetGlyphRenderingOptions(const TextRunDrawParams* aRunParams = nullptr) override;
-#endif
-
-    // return a cloned font resized and offset to simulate sub/superscript glyphs
-    virtual already_AddRefed<gfxFont>
-    GetSubSuperscriptFont(int32_t aAppUnitsPerDevPixel) override;
-
-protected:
-    virtual already_AddRefed<gfxFont> MakeScaledFont(gfxFontStyle *aFontStyle,
-                                                     gfxFloat aFontScale);
-    virtual already_AddRefed<gfxFont> GetSmallCapsFont() override;
-
-private:
-    gfxFcFont(cairo_scaled_font_t *aCairoFont, gfxFcFontEntry *aFontEntry,
-              const gfxFontStyle *aFontStyle);
-
-    // key for locating a gfxFcFont corresponding to a cairo_scaled_font
-    static cairo_user_data_key_t sGfxFontKey;
-};
-
-/**
- * gfxFcFontSet:
- *
- * Translation from a desired FcPattern to a sorted set of font references
- * (fontconfig cache data) and (when needed) fonts.
- */
-
-class gfxFcFontSet final {
-public:
-    NS_INLINE_DECL_REFCOUNTING(gfxFcFontSet)
-    
-    explicit gfxFcFontSet(FcPattern *aPattern,
-                               gfxUserFontSet *aUserFontSet)
-        : mSortPattern(aPattern), mUserFontSet(aUserFontSet),
-          mFcFontsTrimmed(0),
-          mHaveFallbackFonts(false)
-    {
-        bool waitForUserFont;
-        mFcFontSet = SortPreferredFonts(waitForUserFont);
-        mWaitingForUserFont = waitForUserFont;
-    }
-
-    // A reference is held by the FontSet.
-    // The caller may add a ref to keep the font alive longer than the FontSet.
-    gfxFcFont *GetFontAt(uint32_t i, const gfxFontStyle *aFontStyle)
-    {
-        if (i >= mFonts.Length() || !mFonts[i].mFont) { 
-            // GetFontPatternAt sets up mFonts
-            FcPattern *fontPattern = GetFontPatternAt(i);
-            if (!fontPattern)
-                return nullptr;
-
-            mFonts[i].mFont =
-                gfxFcFont::GetOrMakeFont(mSortPattern, fontPattern,
-                                         aFontStyle);
-        }
-        return mFonts[i].mFont;
-    }
-
-    FcPattern *GetFontPatternAt(uint32_t i);
-
-    bool WaitingForUserFont() const {
-        return mWaitingForUserFont;
-    }
-
-private:
-    // Private destructor, to discourage deletion outside of Release():
-    ~gfxFcFontSet()
-    {
-    }
-
-    nsReturnRef<FcFontSet> SortPreferredFonts(bool& aWaitForUserFont);
-    nsReturnRef<FcFontSet> SortFallbackFonts();
-
-    struct FontEntry {
-        explicit FontEntry(FcPattern *aPattern) : mPattern(aPattern) {}
-        nsCountedRef<FcPattern> mPattern;
-        nsRefPtr<gfxFcFont> mFont;
-    };
-
-    struct LangSupportEntry {
-        LangSupportEntry(FcChar8 *aLang, FcLangResult aSupport) :
-            mLang(aLang), mBestSupport(aSupport) {}
-        FcChar8 *mLang;
-        FcLangResult mBestSupport;
-    };
-
-public:
-    // public for nsTArray
-    class LangComparator {
-    public:
-        bool Equals(const LangSupportEntry& a, const FcChar8 *b) const
-        {
-            return FcStrCmpIgnoreCase(a.mLang, b) == 0;
-        }
-    };
-
-private:
-    // The requested pattern
-    nsCountedRef<FcPattern> mSortPattern;
-    // Fonts from @font-face rules
-    nsRefPtr<gfxUserFontSet> mUserFontSet;
-    // A (trimmed) list of font patterns and fonts that is built up as
-    // required.
-    nsTArray<FontEntry> mFonts;
-    // Holds a list of font patterns that will be trimmed.  This is first set
-    // to a list of preferred fonts.  Then, if/when all the preferred fonts
-    // have been trimmed and added to mFonts, this is set to a list of
-    // fallback fonts.
-    nsAutoRef<FcFontSet> mFcFontSet;
-    // The set of characters supported by the fonts in mFonts.
-    nsAutoRef<FcCharSet> mCharSet;
-    // The index of the next font in mFcFontSet that has not yet been
-    // considered for mFonts.
-    int mFcFontsTrimmed;
-    // True iff fallback fonts are either stored in mFcFontSet or have been
-    // trimmed and added to mFonts (so that mFcFontSet is nullptr).
-    bool mHaveFallbackFonts;
-    // True iff there was a user font set with pending downloads,
-    // so the set may be updated when downloads complete
-    bool mWaitingForUserFont;
-};
-
-// Find the FcPattern for an @font-face font suitable for CSS family |aFamily|
-// and style |aStyle| properties.
-static const nsTArray< nsCountedRef<FcPattern> >*
-FindFontPatterns(gfxUserFontSet *mUserFontSet,
-                 const nsACString &aFamily, uint8_t aStyle,
-                 uint16_t aWeight, int16_t aStretch,
-                 bool& aWaitForUserFont)
-{
-    // Convert to UTF16
-    NS_ConvertUTF8toUTF16 utf16Family(aFamily);
-
-    // needsBold is not used here.  Instead synthetic bold is enabled through
-    // FcFontRenderPrepare when the weight in the requested pattern is
-    // compared against the weight in the font pattern.
-    bool needsBold;
-
-    gfxFontStyle style;
-    style.style = aStyle;
-    style.weight = aWeight;
-    style.stretch = aStretch;
-
-    gfxUserFcFontEntry *fontEntry = nullptr;
-    gfxFontFamily *family = mUserFontSet->LookupFamily(utf16Family);
-    if (family) {
-        gfxUserFontEntry* userFontEntry =
-            mUserFontSet->FindUserFontEntryAndLoad(family, style, needsBold,
-                                                   aWaitForUserFont);
-        if (userFontEntry) {
-            fontEntry = static_cast<gfxUserFcFontEntry*>
-                (userFontEntry->GetPlatformFontEntry());
-        }
-
-        // Accept synthetic oblique for italic and oblique.
-        // xxx - this isn't really ideal behavior, for docs that only use a
-        //       single italic face it will also pull down the normal face
-        //       and probably never use it
-        if (!fontEntry && aStyle != NS_FONT_STYLE_NORMAL) {
-            style.style = NS_FONT_STYLE_NORMAL;
-            userFontEntry =
-                mUserFontSet->FindUserFontEntryAndLoad(family, style,
-                                                       needsBold,
-                                                       aWaitForUserFont);
-            if (userFontEntry) {
-                fontEntry = static_cast<gfxUserFcFontEntry*>
-                    (userFontEntry->GetPlatformFontEntry());
-            }
-        }
-    }
-
-    if (!fontEntry) {
-        return nullptr;
-    }
-
-    return &fontEntry->GetPatterns();
-}
-
-typedef FcBool (*FcPatternRemoveFunction)(FcPattern *p, const char *object,
-                                          int id);
-
-// FcPatternRemove is available in fontconfig-2.3.0 (2005)
-static FcBool
-moz_FcPatternRemove(FcPattern *p, const char *object, int id)
-{
-    static FcPatternRemoveFunction sFcPatternRemovePtr =
-        reinterpret_cast<FcPatternRemoveFunction>
-        (FindFunctionSymbol("FcPatternRemove"));
-
-    if (!sFcPatternRemovePtr)
-        return FcFalse;
-
-    return (*sFcPatternRemovePtr)(p, object, id);
-}
-
-// fontconfig prefers a matching family or lang to pixelsize of bitmap
-// fonts.  CSS suggests a tolerance of 20% on pixelsize.
-static bool
-SizeIsAcceptable(FcPattern *aFont, double aRequestedSize)
-{
-    double size;
-    int v = 0;
-    while (FcPatternGetDouble(aFont,
-                              FC_PIXEL_SIZE, v, &size) == FcResultMatch) {
-        ++v;
-        if (5.0 * fabs(size - aRequestedSize) < aRequestedSize)
-            return true;
-    }
-
-    // No size means scalable
-    return v == 0;
-}
-
-// Sorting only the preferred fonts first usually saves having to sort through
-// every font on the system.
-nsReturnRef<FcFontSet>
-gfxFcFontSet::SortPreferredFonts(bool &aWaitForUserFont)
-{
-    aWaitForUserFont = false;
-
-    gfxFontconfigUtils *utils = gfxFontconfigUtils::GetFontconfigUtils();
-    if (!utils)
-        return nsReturnRef<FcFontSet>();
-
-    // The list of families in mSortPattern has values with both weak and
-    // strong bindings.  Values with strong bindings should be preferred.
-    // Values with weak bindings are default fonts that should be considered
-    // only when the font provides the best support for a requested language
-    // or after other fonts have satisfied all the requested languages.
-    //
-    // There are no direct fontconfig APIs to get the binding type.  The
-    // binding only takes effect in the sort and match functions.
-
-    // |requiredLangs| is a list of requested languages that have not yet been
-    // satisfied.  gfxFontconfigUtils only sets one FC_LANG property value,
-    // but FcConfigSubstitute may add more values (e.g. prepending "en" to
-    // "ja" will use western fonts to render Latin/Arabic numerals in Japanese
-    // text.)
-    nsAutoTArray<LangSupportEntry,10> requiredLangs;
-    for (int v = 0; ; ++v) {
-        FcChar8 *lang;
-        FcResult result = FcPatternGetString(mSortPattern, FC_LANG, v, &lang);
-        if (result != FcResultMatch) {
-            // No need to check FcPatternGetLangSet() because
-            // gfxFontconfigUtils sets only a string value for FC_LANG and
-            // FcConfigSubstitute cannot add LangSets.
-            NS_ASSERTION(result != FcResultTypeMismatch,
-                         "Expected a string for FC_LANG");
-            break;
-        }
-
-        if (!requiredLangs.Contains(lang, LangComparator())) {
-            FcLangResult bestLangSupport = utils->GetBestLangSupport(lang);
-            if (bestLangSupport != FcLangDifferentLang) {
-                requiredLangs.
-                    AppendElement(LangSupportEntry(lang, bestLangSupport));
-            }
-        }
-    }
-
-    nsAutoRef<FcFontSet> fontSet(FcFontSetCreate());
-    if (!fontSet)
-        return fontSet.out();
-
-    // FcDefaultSubstitute() ensures a slant on mSortPattern, but, if that ever
-    // doesn't happen, Roman will be used.
-    int requestedSlant = FC_SLANT_ROMAN;
-    FcPatternGetInteger(mSortPattern, FC_SLANT, 0, &requestedSlant);
-    double requestedSize = -1.0;
-    FcPatternGetDouble(mSortPattern, FC_PIXEL_SIZE, 0, &requestedSize);
-
-    nsTHashtable<gfxFontconfigUtils::DepFcStrEntry> existingFamilies(32);
-    FcChar8 *family;
-    for (int v = 0;
-         FcPatternGetString(mSortPattern,
-                            FC_FAMILY, v, &family) == FcResultMatch; ++v) {
-        const nsTArray< nsCountedRef<FcPattern> > *familyFonts = nullptr;
-
-        // Is this an @font-face family?
-        bool isUserFont = false;
-        if (mUserFontSet) {
-            // Have some @font-face definitions
-
-            nsDependentCString cFamily(gfxFontconfigUtils::ToCString(family));
-            NS_NAMED_LITERAL_CSTRING(userPrefix, FONT_FACE_FAMILY_PREFIX);
-
-            if (StringBeginsWith(cFamily, userPrefix)) {
-                isUserFont = true;
-
-                // Trim off the prefix
-                nsDependentCSubstring cssFamily(cFamily, userPrefix.Length());
-
-                uint8_t thebesStyle =
-                    gfxFontconfigUtils::FcSlantToThebesStyle(requestedSlant);
-                uint16_t thebesWeight =
-                    gfxFontconfigUtils::GetThebesWeight(mSortPattern);
-                int16_t thebesStretch =
-                    gfxFontconfigUtils::GetThebesStretch(mSortPattern);
-
-                bool waitForUserFont;
-                familyFonts = FindFontPatterns(mUserFontSet, cssFamily,
-                                               thebesStyle,
-                                               thebesWeight, thebesStretch,
-                                               waitForUserFont);
-                if (waitForUserFont) {
-                    aWaitForUserFont = true;
-                }
-            }
-        }
-
-        if (!isUserFont) {
-            familyFonts = &utils->GetFontsForFamily(family);
-        }
-
-        if (!familyFonts || familyFonts->Length() == 0) {
-            // There are no fonts matching this family, so there is no point
-            // in searching for this family in the FontSort.
-            //
-            // Perhaps the original pattern should be retained for
-            // FcFontRenderPrepare.  However, the only a useful config
-            // substitution test against missing families that i can imagine
-            // would only be interested in the preferred family
-            // (qual="first"), so always keep the first family and use the
-            // same pattern for Sort and RenderPrepare.
-            if (v != 0 && moz_FcPatternRemove(mSortPattern, FC_FAMILY, v)) {
-                --v;
-            }
-            continue;
-        }
-
-        // Aliases seem to often end up occurring more than once, but
-        // duplicate families can't be removed from the sort pattern without
-        // knowing whether duplicates have the same binding.
-        gfxFontconfigUtils::DepFcStrEntry *entry =
-            existingFamilies.PutEntry(family);
-        if (entry) {
-            if (entry->mKey) // old entry
-                continue;
-
-            entry->mKey = family; // initialize new entry
-        }
-
-        for (uint32_t f = 0; f < familyFonts->Length(); ++f) {
-            FcPattern *font = familyFonts->ElementAt(f);
-
-            // Fix up the family name of user-font patterns, as the same
-            // font entry may be used (via the UserFontCache) for multiple
-            // CSS family names
-            if (isUserFont) {
-                font = FcPatternDuplicate(font);
-                FcPatternDel(font, FC_FAMILY);
-                FcPatternAddString(font, FC_FAMILY, family);
-            }
-
-            // User fonts are already filtered by slant (but not size) in
-            // mUserFontSet->FindUserFontEntry().
-            if (requestedSize != -1.0 && !SizeIsAcceptable(font, requestedSize))
-                continue;
-
-            for (uint32_t r = 0; r < requiredLangs.Length(); ++r) {
-                const LangSupportEntry& entry = requiredLangs[r];
-                FcLangResult support =
-                    gfxFontconfigUtils::GetLangSupport(font, entry.mLang);
-                if (support <= entry.mBestSupport) { // lower is better
-                    requiredLangs.RemoveElementAt(r);
-                    --r;
-                }
-            }
-
-            // FcFontSetDestroy will remove a reference but FcFontSetAdd
-            // does _not_ take a reference!
-            if (FcFontSetAdd(fontSet, font)) {
-                // We don't add a reference here for user fonts, because we're
-                // using a local clone of the pattern (see above) in order to
-                // override the family name
-                if (!isUserFont) {
-                    FcPatternReference(font);
-                }
-            }
-        }
-    }
-
-    FcPattern *truncateMarker = nullptr;
-    for (uint32_t r = 0; r < requiredLangs.Length(); ++r) {
-        const nsTArray< nsCountedRef<FcPattern> >& langFonts =
-            utils->GetFontsForLang(requiredLangs[r].mLang);
-
-        bool haveLangFont = false;
-        for (uint32_t f = 0; f < langFonts.Length(); ++f) {
-            FcPattern *font = langFonts[f];
-            if (requestedSize != -1.0 && !SizeIsAcceptable(font, requestedSize))
-                continue;
-
-            haveLangFont = true;
-            if (FcFontSetAdd(fontSet, font)) {
-                FcPatternReference(font);
-            }
-        }
-
-        if (!haveLangFont && langFonts.Length() > 0) {
-            // There is a font that supports this language but it didn't pass
-            // the slant and size criteria.  Weak default font families should
-            // not be considered until the language has been satisfied.
-            //
-            // Insert a font that supports the language so that it will mark
-            // the position of fonts from weak families in the sorted set and
-            // they can be removed.  The language and weak families will be
-            // considered in the fallback fonts, which use fontconfig's
-            // algorithm.
-            //
-            // Of the fonts that don't meet slant and size criteria, strong
-            // default font families should be considered before (other) fonts
-            // for this language, so this marker font will be removed (as well
-            // as the fonts from weak families), and strong families will be
-            // reconsidered in the fallback fonts.
-            FcPattern *font = langFonts[0];
-            if (FcFontSetAdd(fontSet, font)) {
-                FcPatternReference(font);
-                truncateMarker = font;
-            }
-            break;
-        }
-    }
-
-    FcFontSet *sets[1] = { fontSet };
-    FcResult result;
-#ifdef SOLARIS
-    // Get around a crash of FcFontSetSort when FcConfig is nullptr
-    // Solaris's FcFontSetSort needs an FcConfig (bug 474758)
-    fontSet.own(FcFontSetSort(FcConfigGetCurrent(), sets, 1, mSortPattern,
-                              FcFalse, nullptr, &result));
-#else
-    fontSet.own(FcFontSetSort(nullptr, sets, 1, mSortPattern,
-                              FcFalse, nullptr, &result));
-#endif
-
-    if (truncateMarker != nullptr && fontSet) {
-        nsAutoRef<FcFontSet> truncatedSet(FcFontSetCreate());
-
-        for (int f = 0; f < fontSet->nfont; ++f) {
-            FcPattern *font = fontSet->fonts[f];
-            if (font == truncateMarker)
-                break;
-
-            if (FcFontSetAdd(truncatedSet, font)) {
-                FcPatternReference(font);
-            }
-        }
-
-        fontSet.steal(truncatedSet);
-    }
-
-    return fontSet.out();
-}
-
-nsReturnRef<FcFontSet>
-gfxFcFontSet::SortFallbackFonts()
-{
-    // Setting trim to FcTrue would provide a much smaller (~ 1/10) FcFontSet,
-    // but would take much longer due to comparing all the character sets.
-    //
-    // The references to fonts in this FcFontSet are almost free
-    // as they are pointers into mmaped cache files.
-    //
-    // GetFontPatternAt() will trim lazily if and as needed, which will also
-    // remove duplicates of preferred fonts.
-    FcResult result;
-    return nsReturnRef<FcFontSet>(FcFontSort(nullptr, mSortPattern,
-                                             FcFalse, nullptr, &result));
-}
-
-// GetFontAt relies on this setting up all patterns up to |i|.
-FcPattern *
-gfxFcFontSet::GetFontPatternAt(uint32_t i)
-{
-    while (i >= mFonts.Length()) {
-        while (!mFcFontSet) {
-            if (mHaveFallbackFonts)
-                return nullptr;
-
-            mFcFontSet = SortFallbackFonts();
-            mHaveFallbackFonts = true;
-            mFcFontsTrimmed = 0;
-            // Loop to test that mFcFontSet is non-nullptr.
-        }
-
-        while (mFcFontsTrimmed < mFcFontSet->nfont) {
-            FcPattern *font = mFcFontSet->fonts[mFcFontsTrimmed];
-            ++mFcFontsTrimmed;
-
-            if (mFonts.Length() != 0) {
-                // See if the next font provides support for any extra
-                // characters.  Most often the next font is not going to
-                // support more characters so check for a SubSet first before
-                // allocating a new CharSet with Union.
-                FcCharSet *supportedChars = mCharSet;
-                if (!supportedChars) {
-                    FcPatternGetCharSet(mFonts[mFonts.Length() - 1].mPattern,
-                                        FC_CHARSET, 0, &supportedChars);
-                }
-
-                if (supportedChars) {
-                    FcCharSet *newChars = nullptr;
-                    FcPatternGetCharSet(font, FC_CHARSET, 0, &newChars);
-                    if (newChars) {
-                        if (FcCharSetIsSubset(newChars, supportedChars))
-                            continue;
-
-                        mCharSet.own(FcCharSetUnion(supportedChars, newChars));
-                    } else if (!mCharSet) {
-                        mCharSet.own(FcCharSetCopy(supportedChars));
-                    }
-                }
-            }
-
-            mFonts.AppendElement(font);
-            if (mFonts.Length() >= i)
-                break;
-        }
-
-        if (mFcFontsTrimmed == mFcFontSet->nfont) {
-            // finished with this font set
-            mFcFontSet.reset();
-        }
-    }
-
-    return mFonts[i].mPattern;
-}
-
-#ifdef MOZ_WIDGET_GTK
-static void ApplyGdkScreenFontOptions(FcPattern *aPattern);
-#endif
-
-// Apply user settings and defaults to pattern in preparation for matching.
-static void
-PrepareSortPattern(FcPattern *aPattern, double aFallbackSize,
-                   double aSizeAdjustFactor, bool aIsPrinterFont)
-{
-    FcConfigSubstitute(nullptr, aPattern, FcMatchPattern);
-
-    // This gets cairo_font_options_t for the Screen.  We should have
-    // different font options for printing (no hinting) but we are not told
-    // what we are measuring for.
-    //
-    // If cairo adds support for lcd_filter, gdk will not provide the default
-    // setting for that option.  We could get the default setting by creating
-    // an xlib surface once, recording its font_options, and then merging the
-    // gdk options.
-    //
-    // Using an xlib surface would also be an option to get Screen font
-    // options for non-GTK X11 toolkits, but less efficient than using GDK to
-    // pick up dynamic changes.
-    if(aIsPrinterFont) {
-       cairo_font_options_t *options = cairo_font_options_create();
-       cairo_font_options_set_hint_style (options, CAIRO_HINT_STYLE_NONE);
-       cairo_font_options_set_antialias (options, CAIRO_ANTIALIAS_GRAY);
-       cairo_ft_font_options_substitute(options, aPattern);
-       cairo_font_options_destroy(options);
-       FcPatternAddBool(aPattern, PRINTING_FC_PROPERTY, FcTrue);
-    } else {
-#ifdef MOZ_WIDGET_GTK
-       ApplyGdkScreenFontOptions(aPattern);
-#endif
-    }
-
-    // Protect against any fontconfig settings that may have incorrectly
-    // modified the pixelsize, and consider aSizeAdjustFactor.
-    double size = aFallbackSize;
-    if (FcPatternGetDouble(aPattern, FC_PIXEL_SIZE, 0, &size) != FcResultMatch
-        || aSizeAdjustFactor != 1.0) {
-        FcPatternDel(aPattern, FC_PIXEL_SIZE);
-        FcPatternAddDouble(aPattern, FC_PIXEL_SIZE, size * aSizeAdjustFactor);
-    }
-
-    FcDefaultSubstitute(aPattern);
-}
-
-/**
- ** gfxPangoFontGroup
- **/
-
-gfxPangoFontGroup::gfxPangoFontGroup(const FontFamilyList& aFontFamilyList,
-                                     const gfxFontStyle *aStyle,
-                                     gfxUserFontSet *aUserFontSet)
-    : gfxFontGroup(aFontFamilyList, aStyle, aUserFontSet),
-      mPangoLanguage(GuessPangoLanguage(aStyle->language))
-{
-    // This language is passed to the font for shaping.
-    // Shaping doesn't know about lang groups so make it a real language.
-    if (mPangoLanguage) {
-        mStyle.language = do_GetAtom(pango_language_to_string(mPangoLanguage));
-    }
-
-    // dummy entry, will be replaced when actually needed
-    mFonts.AppendElement(FamilyFace());
-}
-
-gfxPangoFontGroup::~gfxPangoFontGroup()
-{
-}
-
-gfxFontGroup *
-gfxPangoFontGroup::Copy(const gfxFontStyle *aStyle)
-{
-    return new gfxPangoFontGroup(mFamilyList, aStyle, mUserFontSet);
-}
-
-void
-gfxPangoFontGroup::FindPlatformFont(const nsAString& fontName,
-                                    bool aUseFontSet,
-                                    void *aClosure)
-{
-    nsTArray<nsString> *list = static_cast<nsTArray<nsString>*>(aClosure);
-
-    if (!list->Contains(fontName)) {
-        // names present in the user fontset are not matched against system fonts
-        if (aUseFontSet && mUserFontSet && mUserFontSet->HasFamily(fontName)) {
-            nsAutoString userFontName =
-                NS_LITERAL_STRING(FONT_FACE_FAMILY_PREFIX) + fontName;
-            list->AppendElement(userFontName);
-        } else {
-            list->AppendElement(fontName);
-        }
-    }
-}
-
-gfxFcFont *
-gfxPangoFontGroup::GetBaseFont()
-{
-    if (mFonts[0].Font() == nullptr) {
-        gfxFont* font = GetBaseFontSet()->GetFontAt(0, GetStyle());
-        mFonts[0] = FamilyFace(nullptr, font);
-    }
-
-    return static_cast<gfxFcFont*>(mFonts[0].Font());
-}
-
-gfxFont*
-gfxPangoFontGroup::GetFirstValidFont(uint32_t aCh)
-{
-    return GetFontAt(0);
-}
-
-gfxFont *
-gfxPangoFontGroup::GetFontAt(int32_t i, uint32_t aCh)
-{
-    // If it turns out to be hard for all clients that cache font
-    // groups to call UpdateUserFonts at appropriate times, we could
-    // instead consider just calling UpdateUserFonts from someplace
-    // more central (such as here).
-    NS_ASSERTION(!mUserFontSet || mCurrGeneration == GetGeneration(),
-                 "Whoever was caching this font group should have "
-                 "called UpdateUserFonts on it");
-
-    NS_PRECONDITION(i == 0, "Only have one font");
-
-    return GetBaseFont();
-}
-
-void
-gfxPangoFontGroup::UpdateUserFonts()
-{
-    uint64_t newGeneration = GetGeneration();
-    if (newGeneration == mCurrGeneration)
-        return;
-
-    mFonts[0] = FamilyFace();
-    mFontSets.Clear();
-    mCachedEllipsisTextRun = nullptr;
-    mUnderlineOffset = UNDERLINE_OFFSET_NOT_SET;
-    mCurrGeneration = newGeneration;
-    mSkipDrawing = false;
-}
-
-already_AddRefed<gfxFcFontSet>
-gfxPangoFontGroup::MakeFontSet(PangoLanguage *aLang, gfxFloat aSizeAdjustFactor,
-                               nsAutoRef<FcPattern> *aMatchPattern)
-{
-    const char *lang = pango_language_to_string(aLang);
-
-    nsRefPtr <nsIAtom> langGroup;
-    if (aLang != mPangoLanguage) {
-        // Set up langGroup for Mozilla's font prefs.
-        langGroup = do_GetAtom(lang);
-    }
-
-    nsAutoTArray<nsString, 20> fcFamilyList;
-    EnumerateFontList(langGroup ? langGroup.get() : mStyle.language.get(),
-                      &fcFamilyList);
-
-    // To consider: A fontset cache here could be helpful.
-
-    // Get a pattern suitable for matching.
-    nsAutoRef<FcPattern> pattern
-        (gfxFontconfigUtils::NewPattern(fcFamilyList, mStyle, lang));
-
-    PrepareSortPattern(pattern, mStyle.size, aSizeAdjustFactor, mStyle.printerFont);
-
-    nsRefPtr<gfxFcFontSet> fontset =
-        new gfxFcFontSet(pattern, mUserFontSet);
-
-    mSkipDrawing = fontset->WaitingForUserFont();
-
-    if (aMatchPattern)
-        aMatchPattern->steal(pattern);
-
-    return fontset.forget();
-}
-
-gfxPangoFontGroup::
-FontSetByLangEntry::FontSetByLangEntry(PangoLanguage *aLang,
-                                       gfxFcFontSet *aFontSet)
-    : mLang(aLang), mFontSet(aFontSet)
-{
-}
-
-gfxFcFontSet *
-gfxPangoFontGroup::GetFontSet(PangoLanguage *aLang)
-{
-    GetBaseFontSet(); // sets mSizeAdjustFactor and mFontSets[0]
-
-    if (!aLang)
-        return mFontSets[0].mFontSet;
-
-    for (uint32_t i = 0; i < mFontSets.Length(); ++i) {
-        if (mFontSets[i].mLang == aLang)
-            return mFontSets[i].mFontSet;
-    }
-
-    nsRefPtr<gfxFcFontSet> fontSet =
-        MakeFontSet(aLang, mSizeAdjustFactor);
-    mFontSets.AppendElement(FontSetByLangEntry(aLang, fontSet));
-
-    return fontSet;
-}
-
-already_AddRefed<gfxFont>
-gfxPangoFontGroup::FindFontForChar(uint32_t aCh, uint32_t aPrevCh,
-                                   uint32_t aNextCh, int32_t aRunScript,
-                                   gfxFont *aPrevMatchedFont,
-                                   uint8_t *aMatchType)
-{
-    if (aPrevMatchedFont) {
-        // Don't switch fonts for control characters, regardless of
-        // whether they are present in the current font, as they won't
-        // actually be rendered (see bug 716229)
-        uint8_t category = GetGeneralCategory(aCh);
-        if (category == HB_UNICODE_GENERAL_CATEGORY_CONTROL) {
-            return nsRefPtr<gfxFont>(aPrevMatchedFont).forget();
-        }
-
-        // if this character is a join-control or the previous is a join-causer,
-        // use the same font as the previous range if we can
-        if (gfxFontUtils::IsJoinControl(aCh) ||
-            gfxFontUtils::IsJoinCauser(aPrevCh)) {
-            if (aPrevMatchedFont->HasCharacter(aCh)) {
-                return nsRefPtr<gfxFont>(aPrevMatchedFont).forget();
-            }
-        }
-    }
-
-    // if this character is a variation selector,
-    // use the previous font regardless of whether it supports VS or not.
-    // otherwise the text run will be divided.
-    if (gfxFontUtils::IsVarSelector(aCh)) {
-        if (aPrevMatchedFont) {
-            return nsRefPtr<gfxFont>(aPrevMatchedFont).forget();
-        }
-        // VS alone. it's meaningless to search different fonts
-        return nullptr;
-    }
-
-    // The real fonts that fontconfig provides for generic/fallback families
-    // depend on the language used, so a different FontSet is used for each
-    // language (except for the variation below).
-    //
-    //   With most fontconfig configurations any real family names prior to a
-    //   fontconfig generic with corresponding fonts installed will still lead
-    //   to the same leading fonts in each FontSet.
-    //
-    //   There is an inefficiency here therefore because the same base FontSet
-    //   could often be used if these real families support the character.
-    //   However, with fontconfig aliases, it is difficult to distinguish
-    //   where exactly alias fonts end and generic/fallback fonts begin.
-    //
-    // The variation from pure language-based matching used here is that the
-    // same primary/base font is always used irrespective of the language.
-    // This provides that SCRIPT_COMMON characters are consistently rendered
-    // with the same font (bug 339513 and bug 416725).  This is particularly
-    // important with the word cache as script can't be reliably determined
-    // from surrounding words.  It also often avoids the unnecessary extra
-    // FontSet efficiency mentioned above.
-    //
-    // However, in two situations, the base font is not checked before the
-    // language-specific FontSet.
-    //
-    //   1. When we don't have a language to make a good choice for
-    //      the base font.
-    //
-    //   2. For system fonts, use the default Pango behavior to give
-    //      consistency with other apps.  This is relevant when un-localized
-    //      builds are run in non-Latin locales.  This special-case probably
-    //      wouldn't be necessary but for bug 91190.
-
-    gfxFcFontSet *fontSet = GetBaseFontSet();
-    uint32_t nextFont = 0;
-    FcPattern *basePattern = nullptr;
-    if (!mStyle.systemFont && mPangoLanguage) {
-        basePattern = fontSet->GetFontPatternAt(0);
-        if (HasChar(basePattern, aCh)) {
-            *aMatchType = gfxTextRange::kFontGroup;
-            return nsRefPtr<gfxFont>(GetBaseFont()).forget();
-        }
-
-        nextFont = 1;
-    }
-
-    // Pango, GLib, and Thebes (but not harfbuzz!) all happen to use the same
-    // script codes, so we can just cast the value here.
-    const PangoScript script = static_cast<PangoScript>(aRunScript);
-    // Might be nice to call pango_language_includes_script only once for the
-    // run rather than for each character.
-    PangoLanguage *scriptLang;
-    if ((!basePattern ||
-         !pango_language_includes_script(mPangoLanguage, script)) &&
-        (scriptLang = pango_script_get_sample_language(script))) {
-        fontSet = GetFontSet(scriptLang);
-        nextFont = 0;
-    }
-
-    for (uint32_t i = nextFont;
-         FcPattern *pattern = fontSet->GetFontPatternAt(i);
-         ++i) {
-        if (pattern == basePattern) {
-            continue; // already checked basePattern
-        }
-
-        if (HasChar(pattern, aCh)) {
-            *aMatchType = gfxTextRange::kFontGroup;
-            return nsRefPtr<gfxFont>(fontSet->GetFontAt(i, GetStyle())).forget();
-        }
-    }
-
-    return nullptr;
-}
-
-// Sanity-check: spot-check a few constants to confirm that Thebes and
-// Pango script codes really do match
-#define CHECK_SCRIPT_CODE(script) \
-    PR_STATIC_ASSERT(int32_t(MOZ_SCRIPT_##script) == \
-                     int32_t(PANGO_SCRIPT_##script))
-
-CHECK_SCRIPT_CODE(COMMON);
-CHECK_SCRIPT_CODE(INHERITED);
-CHECK_SCRIPT_CODE(ARABIC);
-CHECK_SCRIPT_CODE(LATIN);
-CHECK_SCRIPT_CODE(UNKNOWN);
-CHECK_SCRIPT_CODE(NKO);
-
-/**
- ** gfxFcFont
- **/
-
-cairo_user_data_key_t gfxFcFont::sGfxFontKey;
-
-gfxFcFont::gfxFcFont(cairo_scaled_font_t *aCairoFont,
-                     gfxFcFontEntry *aFontEntry,
-                     const gfxFontStyle *aFontStyle)
-    : gfxFT2FontBase(aCairoFont, aFontEntry, aFontStyle)
-{
-    cairo_scaled_font_set_user_data(mScaledFont, &sGfxFontKey, this, nullptr);
-}
-
-gfxFcFont::~gfxFcFont()
-{
-    cairo_scaled_font_set_user_data(mScaledFont,
-                                    &sGfxFontKey,
-                                    nullptr,
-                                    nullptr);
-}
-
-already_AddRefed<gfxFont>
-gfxFcFont::GetSubSuperscriptFont(int32_t aAppUnitsPerDevPixel)
-{
-    gfxFontStyle style(*GetStyle());
-    style.AdjustForSubSuperscript(aAppUnitsPerDevPixel);
-    return MakeScaledFont(&style, style.size / GetStyle()->size);
-}
-
-already_AddRefed<gfxFont>
-gfxFcFont::MakeScaledFont(gfxFontStyle *aFontStyle, gfxFloat aScaleFactor)
-{
-    gfxFcFontEntry* fe = static_cast<gfxFcFontEntry*>(GetFontEntry());
-    nsRefPtr<gfxFont> font = gfxFontCache::GetCache()->Lookup(fe, aFontStyle);
-    if (font) {
-        return font.forget();
-    }
-
-    cairo_matrix_t fontMatrix;
-    cairo_scaled_font_get_font_matrix(mScaledFont, &fontMatrix);
-    cairo_matrix_scale(&fontMatrix, aScaleFactor, aScaleFactor);
-
-    cairo_matrix_t ctm;
-    cairo_scaled_font_get_ctm(mScaledFont, &ctm);
-
-    cairo_font_options_t *options = cairo_font_options_create();
-    cairo_scaled_font_get_font_options(mScaledFont, options);
-
-    cairo_scaled_font_t *newFont =
-        cairo_scaled_font_create(cairo_scaled_font_get_font_face(mScaledFont),
-                                 &fontMatrix, &ctm, options);
-    cairo_font_options_destroy(options);
-
-    font = new gfxFcFont(newFont, fe, aFontStyle);
-    gfxFontCache::GetCache()->AddNew(font);
-    cairo_scaled_font_destroy(newFont);
-
-    return font.forget();
-}
-
-already_AddRefed<gfxFont>
-gfxFcFont::GetSmallCapsFont()
-{
-    gfxFontStyle style(*GetStyle());
-    style.size *= SMALL_CAPS_SCALE_FACTOR;
-    style.variantCaps = NS_FONT_VARIANT_CAPS_NORMAL;
-    return MakeScaledFont(&style, SMALL_CAPS_SCALE_FACTOR);
-}
-
-/* static */ void
-gfxPangoFontGroup::Shutdown()
-{
-    // Resetting gFTLibrary in case this is wanted again after a
-    // cairo_debug_reset_static_data.
-    gFTLibrary = nullptr;
-}
-
-/* static */ gfxFontEntry *
-gfxPangoFontGroup::NewFontEntry(const nsAString& aFontName,
-                                uint16_t aWeight,
-                                int16_t aStretch,
-                                bool aItalic)
-{
-    gfxFontconfigUtils *utils = gfxFontconfigUtils::GetFontconfigUtils();
-    if (!utils)
-        return nullptr;
-
-    // The font face name from @font-face { src: local() } is not well
-    // defined.
-    //
-    // On MS Windows, this name gets compared with
-    // ENUMLOGFONTEXW::elfFullName, which for OpenType fonts seems to be the
-    // full font name from the name table.  For CFF OpenType fonts this is the
-    // same as the PostScript name, but for TrueType fonts it is usually
-    // different.
-    //
-    // On Mac, the font face name is compared with the PostScript name, even
-    // for TrueType fonts.
-    //
-    // Fontconfig only records the full font names, so the behavior here
-    // follows that on MS Windows.  However, to provide the possibility
-    // of aliases to compensate for variations, the font face name is passed
-    // through FcConfigSubstitute.
-
-    nsAutoRef<FcPattern> pattern(FcPatternCreate());
-    if (!pattern)
-        return nullptr;
-
-    NS_ConvertUTF16toUTF8 fullname(aFontName);
-    FcPatternAddString(pattern, FC_FULLNAME,
-                       gfxFontconfigUtils::ToFcChar8(fullname));
-    FcConfigSubstitute(nullptr, pattern, FcMatchPattern);
-
-    FcChar8 *name;
-    for (int v = 0;
-         FcPatternGetString(pattern, FC_FULLNAME, v, &name) == FcResultMatch;
-         ++v) {
-        const nsTArray< nsCountedRef<FcPattern> >& fonts =
-            utils->GetFontsForFullname(name);
-
-        if (fonts.Length() != 0)
-            return new gfxLocalFcFontEntry(aFontName,
-                                           aWeight,
-                                           aStretch,
-                                           aItalic,
-                                           fonts);
-    }
-
-    return nullptr;
-}
-
-/* static */ FT_Library
-gfxPangoFontGroup::GetFTLibrary()
-{
-    if (!gFTLibrary) {
-        // Use cairo's FT_Library so that cairo takes care of shutdown of the
-        // FT_Library after it has destroyed its font_faces, and FT_Done_Face
-        // has been called on each FT_Face, at least until this bug is fixed:
-        // https://bugs.freedesktop.org/show_bug.cgi?id=18857
-        //
-        // Cairo's FT_Library can be obtained from any cairo_scaled_font.  The
-        // font properties requested here are chosen to get an FT_Face that is
-        // likely to be also used elsewhere.
-        gfxFontStyle style;
-        nsRefPtr<gfxPangoFontGroup> fontGroup =
-            new gfxPangoFontGroup(FontFamilyList(eFamily_sans_serif),
-                                  &style, nullptr);
-
-        gfxFcFont *font = fontGroup->GetBaseFont();
-        if (!font)
-            return nullptr;
-
-        gfxFT2LockedFace face(font);
-        if (!face.get())
-            return nullptr;
-
-        gFTLibrary = face.get()->glyph->library;
-    }
-
-    return gFTLibrary;
-}
-
-/* static */ gfxFontEntry *
-gfxPangoFontGroup::NewFontEntry(const nsAString& aFontName,
-                                uint16_t aWeight,
-                                int16_t aStretch,
-                                bool aItalic,
-                                const uint8_t* aFontData,
-                                uint32_t aLength)
-{
-    // Ownership of aFontData is passed in here, and transferred to the
-    // new fontEntry, which will release it when no longer needed.
-
-    // Using face_index = 0 for the first face in the font, as we have no
-    // other information.  FT_New_Memory_Face checks for a nullptr FT_Library.
-    FT_Face face;
-    FT_Error error =
-        FT_New_Memory_Face(GetFTLibrary(), aFontData, aLength, 0, &face);
-    if (error != 0) {
-        free((void*)aFontData);
-        return nullptr;
-    }
-
-    return new gfxDownloadedFcFontEntry(aFontName, aWeight,
-                                        aStretch, aItalic,
-                                        aFontData, face);
-}
-
-
-static double
-GetPixelSize(FcPattern *aPattern)
-{
-    double size;
-    if (FcPatternGetDouble(aPattern,
-                           FC_PIXEL_SIZE, 0, &size) == FcResultMatch)
-        return size;
-
-    NS_NOTREACHED("No size on pattern");
-    return 0.0;
-}
-
-/**
- * The following gfxFcFonts are accessed from the cairo_scaled_font or created
- * from the FcPattern, not from the gfxFontCache hash table.  The gfxFontCache
- * hash table is keyed by desired family and style, whereas here we only know
- * actual family and style.  There may be more than one of these fonts with
- * the same family and style, but different PangoFont and actual font face.
- * 
- * The point of this is to record the exact font face for gfxTextRun glyph
- * indices.  The style of this font does not necessarily represent the exact
- * gfxFontStyle used to build the text run.  Notably, the language is not
- * recorded.
- */
-
-/* static */
-already_AddRefed<gfxFcFont>
-gfxFcFont::GetOrMakeFont(FcPattern *aRequestedPattern, FcPattern *aFontPattern,
-                         const gfxFontStyle *aFontStyle)
-{
-    nsAutoRef<FcPattern> renderPattern
-        (FcFontRenderPrepare(nullptr, aRequestedPattern, aFontPattern));
-
-    // If synthetic bold/italic is not allowed by the style, adjust the
-    // resulting pattern to match the actual properties of the font.
-    if (!aFontStyle->allowSyntheticWeight) {
-        int weight;
-        if (FcPatternGetInteger(aFontPattern, FC_WEIGHT, 0,
-                                &weight) == FcResultMatch) {
-            FcPatternDel(renderPattern, FC_WEIGHT);
-            FcPatternAddInteger(renderPattern, FC_WEIGHT, weight);
-        }
-    }
-    if (!aFontStyle->allowSyntheticStyle) {
-        int slant;
-        if (FcPatternGetInteger(aFontPattern, FC_SLANT, 0,
-                                &slant) == FcResultMatch) {
-            FcPatternDel(renderPattern, FC_SLANT);
-            FcPatternAddInteger(renderPattern, FC_SLANT, slant);
-        }
-    }
-
-    cairo_font_face_t *face =
-        cairo_ft_font_face_create_for_pattern(renderPattern);
-
-    // Reuse an existing font entry if available.
-    nsRefPtr<gfxFcFontEntry> fe = gfxFcFontEntry::LookupFontEntry(face);
-    if (!fe) {
-        gfxDownloadedFcFontEntry *downloadedFontEntry =
-            GetDownloadedFontEntry(aFontPattern);
-        if (downloadedFontEntry) {
-            // Web font
-            fe = downloadedFontEntry;
-            if (cairo_font_face_status(face) == CAIRO_STATUS_SUCCESS) {
-                // cairo_font_face_t is using the web font data.
-                // Hold a reference to the font entry to keep the font face
-                // data.
-                if (!downloadedFontEntry->SetCairoFace(face)) {
-                    // OOM.  Let cairo pick a fallback font
-                    cairo_font_face_destroy(face);
-                    face = cairo_ft_font_face_create_for_pattern(aRequestedPattern);
-                    fe = gfxFcFontEntry::LookupFontEntry(face);
-                }
-            }
-        }
-        if (!fe) {
-            // Get a unique name for the font face from the file and id.
-            nsAutoString name;
-            FcChar8 *fc_file;
-            if (FcPatternGetString(renderPattern,
-                                   FC_FILE, 0, &fc_file) == FcResultMatch) {
-                int index;
-                if (FcPatternGetInteger(renderPattern,
-                                        FC_INDEX, 0, &index) != FcResultMatch) {
-                    // cairo defaults to 0.
-                    index = 0;
-                }
-
-                AppendUTF8toUTF16(gfxFontconfigUtils::ToCString(fc_file), name);
-                if (index != 0) {
-                    name.Append('/');
-                    name.AppendInt(index);
-                }
-            }
-
-            fe = new gfxSystemFcFontEntry(face, aFontPattern, name);
-        }
-    }
-
-    gfxFontStyle style(*aFontStyle);
-    style.size = GetPixelSize(renderPattern);
-    style.style = gfxFontconfigUtils::GetThebesStyle(renderPattern);
-    style.weight = gfxFontconfigUtils::GetThebesWeight(renderPattern);
-
-    nsRefPtr<gfxFont> font = gfxFontCache::GetCache()->Lookup(fe, &style);
-    if (!font) {
-        // Note that a file/index pair (or FT_Face) and the gfxFontStyle are
-        // not necessarily enough to provide a key that will describe a unique
-        // font.  cairoFont contains information from renderPattern, which is a
-        // fully resolved pattern from FcFontRenderPrepare.
-        // FcFontRenderPrepare takes the requested pattern and the face
-        // pattern as input and can modify elements of the resulting pattern
-        // that affect rendering but are not included in the gfxFontStyle.
-        cairo_scaled_font_t *cairoFont = CreateScaledFont(renderPattern, face);
-        font = new gfxFcFont(cairoFont, fe, &style);
-        gfxFontCache::GetCache()->AddNew(font);
-        cairo_scaled_font_destroy(cairoFont);
-    }
-
-    cairo_font_face_destroy(face);
-
-    nsRefPtr<gfxFcFont> retval(static_cast<gfxFcFont*>(font.get()));
-    return retval.forget();
-}
-
-gfxFcFontSet *
-gfxPangoFontGroup::GetBaseFontSet()
-{
-    if (mFontSets.Length() > 0)
-        return mFontSets[0].mFontSet;
-
-    mSizeAdjustFactor = 1.0; // will be adjusted below if necessary
-    nsAutoRef<FcPattern> pattern;
-    nsRefPtr<gfxFcFontSet> fontSet =
-        MakeFontSet(mPangoLanguage, mSizeAdjustFactor, &pattern);
-
-    double size = GetPixelSize(pattern);
-    if (size != 0.0 && mStyle.sizeAdjust > 0.0) {
-        gfxFcFont *font = fontSet->GetFontAt(0, GetStyle());
-        if (font) {
-            const gfxFont::Metrics& metrics =
-                font->GetMetrics(gfxFont::eHorizontal); // XXX vertical?
-
-            // The factor of 0.1 ensures that xHeight is sane so fonts don't
-            // become huge.  Strictly ">" ensures that xHeight and emHeight are
-            // not both zero.
-            if (metrics.xHeight > 0.1 * metrics.emHeight) {
-                mSizeAdjustFactor =
-                    mStyle.sizeAdjust * metrics.emHeight / metrics.xHeight;
-
-                size *= mSizeAdjustFactor;
-                FcPatternDel(pattern, FC_PIXEL_SIZE);
-                FcPatternAddDouble(pattern, FC_PIXEL_SIZE, size);
-
-                fontSet = new gfxFcFontSet(pattern, mUserFontSet);
-            }
-        }
-    }
-
-    PangoLanguage *pangoLang = mPangoLanguage;
-    FcChar8 *fcLang;
-    if (!pangoLang &&
-        FcPatternGetString(pattern, FC_LANG, 0, &fcLang) == FcResultMatch) {
-        pangoLang =
-            pango_language_from_string(gfxFontconfigUtils::ToCString(fcLang));
-    }
-
-    mFontSets.AppendElement(FontSetByLangEntry(pangoLang, fontSet));
-
-    return fontSet;
-}
-
-/**
- ** gfxTextRun
- * 
- * A serious problem:
- *
- * -- We draw with a font that's hinted for the CTM, but we measure with a font
- * hinted to the identity matrix, so our "bounding metrics" may not be accurate.
- * 
- **/
-
-// This will fetch an existing scaled_font if one exists.
-static cairo_scaled_font_t *
-CreateScaledFont(FcPattern *aPattern, cairo_font_face_t *aFace)
-{
-    double size = GetPixelSize(aPattern);
-        
-    cairo_matrix_t fontMatrix;
-    FcMatrix *fcMatrix;
-    if (FcPatternGetMatrix(aPattern, FC_MATRIX, 0, &fcMatrix) == FcResultMatch)
-        cairo_matrix_init(&fontMatrix, fcMatrix->xx, -fcMatrix->yx, -fcMatrix->xy, fcMatrix->yy, 0, 0);
-    else
-        cairo_matrix_init_identity(&fontMatrix);
-    cairo_matrix_scale(&fontMatrix, size, size);
-
-    FcBool printing;
-    if (FcPatternGetBool(aPattern, PRINTING_FC_PROPERTY, 0, &printing) != FcResultMatch) {
-        printing = FcFalse;
-    }
-
-    // The cairo_scaled_font is created with a unit ctm so that metrics and
-    // positions are in user space, but this means that hinting effects will
-    // not be estimated accurately for non-unit transformations.
-    cairo_matrix_t identityMatrix;
-    cairo_matrix_init_identity(&identityMatrix);
-
-    // Font options are set explicitly here to improve cairo's caching
-    // behavior and to record the relevant parts of the pattern for
-    // SetupCairoFont (so that the pattern can be released).
-    //
-    // Most font_options have already been set as defaults on the FcPattern
-    // with cairo_ft_font_options_substitute(), then user and system
-    // fontconfig configurations were applied.  The resulting font_options
-    // have been recorded on the face during
-    // cairo_ft_font_face_create_for_pattern().
-    //
-    // None of the settings here cause this scaled_font to behave any
-    // differently from how it would behave if it were created from the same
-    // face with default font_options.
-    //
-    // We set options explicitly so that the same scaled_font will be found in
-    // the cairo_scaled_font_map when cairo loads glyphs from a context with
-    // the same font_face, font_matrix, ctm, and surface font_options.
-    //
-    // Unfortunately, _cairo_scaled_font_keys_equal doesn't know about the
-    // font_options on the cairo_ft_font_face, and doesn't consider default
-    // option values to not match any explicit values.
-    //
-    // Even after cairo_set_scaled_font is used to set font_options for the
-    // cairo context, when cairo looks for a scaled_font for the context, it
-    // will look for a font with some option values from the target surface if
-    // any values are left default on the context font_options.  If this
-    // scaled_font is created with default font_options, cairo will not find
-    // it.
-    cairo_font_options_t *fontOptions = cairo_font_options_create();
-
-    // The one option not recorded in the pattern is hint_metrics, which will
-    // affect glyph metrics.  The default behaves as CAIRO_HINT_METRICS_ON.
-    // We should be considering the font_options of the surface on which this
-    // font will be used, but currently we don't have different gfxFonts for
-    // different surface font_options, so we'll create a font suitable for the
-    // Screen. Image and xlib surfaces default to CAIRO_HINT_METRICS_ON.
-    if (printing) {
-        cairo_font_options_set_hint_metrics(fontOptions, CAIRO_HINT_METRICS_OFF);
-    } else {
-        cairo_font_options_set_hint_metrics(fontOptions, CAIRO_HINT_METRICS_ON);
-    }
-
-    // The remaining options have been recorded on the pattern and the face.
-    // _cairo_ft_options_merge has some logic to decide which options from the
-    // scaled_font or from the cairo_ft_font_face take priority in the way the
-    // font behaves.
-    //
-    // In the majority of cases, _cairo_ft_options_merge uses the options from
-    // the cairo_ft_font_face, so sometimes it is not so important which
-    // values are set here so long as they are not defaults, but we'll set
-    // them to the exact values that we expect from the font, to be consistent
-    // and to protect against changes in cairo.
-    //
-    // In some cases, _cairo_ft_options_merge uses some options from the
-    // scaled_font's font_options rather than options on the
-    // cairo_ft_font_face (from fontconfig).
-    // https://bugs.freedesktop.org/show_bug.cgi?id=11838
-    //
-    // Surface font options were set on the pattern in
-    // cairo_ft_font_options_substitute.  If fontconfig has changed the
-    // hint_style then that is what the user (or distribution) wants, so we
-    // use the setting from the FcPattern.
-    //
-    // Fallback values here mirror treatment of defaults in cairo-ft-font.c.
-    FcBool hinting = FcFalse;
-    if (FcPatternGetBool(aPattern, FC_HINTING, 0, &hinting) != FcResultMatch) {
-        hinting = FcTrue;
-    }
-
-    cairo_hint_style_t hint_style;
-    if (printing || !hinting) {
-        hint_style = CAIRO_HINT_STYLE_NONE;
-    } else {
-#ifdef FC_HINT_STYLE  // FC_HINT_STYLE is available from fontconfig 2.2.91.
-        int fc_hintstyle;
-        if (FcPatternGetInteger(aPattern, FC_HINT_STYLE,
-                                0, &fc_hintstyle        ) != FcResultMatch) {
-            fc_hintstyle = FC_HINT_FULL;
-        }
-        switch (fc_hintstyle) {
-            case FC_HINT_NONE:
-                hint_style = CAIRO_HINT_STYLE_NONE;
-                break;
-            case FC_HINT_SLIGHT:
-                hint_style = CAIRO_HINT_STYLE_SLIGHT;
-                break;
-            case FC_HINT_MEDIUM:
-            default: // This fallback mirrors _get_pattern_ft_options in cairo.
-                hint_style = CAIRO_HINT_STYLE_MEDIUM;
-                break;
-            case FC_HINT_FULL:
-                hint_style = CAIRO_HINT_STYLE_FULL;
-                break;
-        }
-#else // no FC_HINT_STYLE
-        hint_style = CAIRO_HINT_STYLE_FULL;
-#endif
-    }
-    cairo_font_options_set_hint_style(fontOptions, hint_style);
-
-    int rgba;
-    if (FcPatternGetInteger(aPattern,
-                            FC_RGBA, 0, &rgba) != FcResultMatch) {
-        rgba = FC_RGBA_UNKNOWN;
-    }
-    cairo_subpixel_order_t subpixel_order = CAIRO_SUBPIXEL_ORDER_DEFAULT;
-    switch (rgba) {
-        case FC_RGBA_UNKNOWN:
-        case FC_RGBA_NONE:
-        default:
-            // There is no CAIRO_SUBPIXEL_ORDER_NONE.  Subpixel antialiasing
-            // is disabled through cairo_antialias_t.
-            rgba = FC_RGBA_NONE;
-            // subpixel_order won't be used by the font as we won't use
-            // CAIRO_ANTIALIAS_SUBPIXEL, but don't leave it at default for
-            // caching reasons described above.  Fall through:
-        case FC_RGBA_RGB:
-            subpixel_order = CAIRO_SUBPIXEL_ORDER_RGB;
-            break;
-        case FC_RGBA_BGR:
-            subpixel_order = CAIRO_SUBPIXEL_ORDER_BGR;
-            break;
-        case FC_RGBA_VRGB:
-            subpixel_order = CAIRO_SUBPIXEL_ORDER_VRGB;
-            break;
-        case FC_RGBA_VBGR:
-            subpixel_order = CAIRO_SUBPIXEL_ORDER_VBGR;
-            break;
-    }
-    cairo_font_options_set_subpixel_order(fontOptions, subpixel_order);
-
-    FcBool fc_antialias;
-    if (FcPatternGetBool(aPattern,
-                         FC_ANTIALIAS, 0, &fc_antialias) != FcResultMatch) {
-        fc_antialias = FcTrue;
-    }
-    cairo_antialias_t antialias;
-    if (!fc_antialias) {
-        antialias = CAIRO_ANTIALIAS_NONE;
-    } else if (rgba == FC_RGBA_NONE) {
-        antialias = CAIRO_ANTIALIAS_GRAY;
-    } else {
-        antialias = CAIRO_ANTIALIAS_SUBPIXEL;
-    }
-    cairo_font_options_set_antialias(fontOptions, antialias);
-
-    cairo_scaled_font_t *scaledFont =
-        cairo_scaled_font_create(aFace, &fontMatrix, &identityMatrix,
-                                 fontOptions);
-
-    cairo_font_options_destroy(fontOptions);
-
-    NS_ASSERTION(cairo_scaled_font_status(scaledFont) == CAIRO_STATUS_SUCCESS,
-                 "Failed to create scaled font");
-    return scaledFont;
-}
-
-/* static */
-PangoLanguage *
-GuessPangoLanguage(nsIAtom *aLanguage)
-{
-    if (!aLanguage)
-        return nullptr;
-
-    // Pango and fontconfig won't understand mozilla's internal langGroups, so
-    // find a real language.
-    nsAutoCString lang;
-    gfxFontconfigUtils::GetSampleLangForGroup(aLanguage, &lang);
-    if (lang.IsEmpty())
-        return nullptr;
-
-    return pango_language_from_string(lang.get());
-}
-
-#ifdef MOZ_WIDGET_GTK
-/***************************************************************************
- *
- * This function must be last in the file because it uses the system cairo
- * library.  Above this point the cairo library used is the tree cairo if
- * MOZ_TREE_CAIRO.
- */
-
-#if MOZ_TREE_CAIRO
-// Tree cairo symbols have different names.  Disable their activation through
-// preprocessor macros.
-#undef cairo_ft_font_options_substitute
-
-// The system cairo functions are not declared because the include paths cause
-// the gdk headers to pick up the tree cairo.h.
-extern "C" {
-NS_VISIBILITY_DEFAULT void
-cairo_ft_font_options_substitute (const cairo_font_options_t *options,
-                                  FcPattern                  *pattern);
-}
-#endif
-
-static void
-ApplyGdkScreenFontOptions(FcPattern *aPattern)
-{
-    const cairo_font_options_t *options =
-        gdk_screen_get_font_options(gdk_screen_get_default());
-
-    cairo_ft_font_options_substitute(options, aPattern);
-}
-
-#endif // MOZ_WIDGET_GTK2
-
-#ifdef USE_SKIA
-mozilla::TemporaryRef<mozilla::gfx::GlyphRenderingOptions>
-gfxFcFont::GetGlyphRenderingOptions(const TextRunDrawParams* aRunParams)
-{
-  cairo_scaled_font_t *scaled_font = CairoScaledFont();
-  cairo_font_options_t *options = cairo_font_options_create();
-  cairo_scaled_font_get_font_options(scaled_font, options);
-  cairo_hint_style_t hint_style = cairo_font_options_get_hint_style(options);     
-  cairo_font_options_destroy(options);
-
-  mozilla::gfx::FontHinting hinting;
-
-  switch (hint_style) {
-    case CAIRO_HINT_STYLE_NONE:
-      hinting = mozilla::gfx::FontHinting::NONE;
-      break;
-    case CAIRO_HINT_STYLE_SLIGHT:
-      hinting = mozilla::gfx::FontHinting::LIGHT;
-      break;
-    case CAIRO_HINT_STYLE_FULL:
-      hinting = mozilla::gfx::FontHinting::FULL;
-      break;
-    default:
-      hinting = mozilla::gfx::FontHinting::NORMAL;
-      break;
-  }
-
-  // We don't want to force the use of the autohinter over the font's built in hints
-  return mozilla::gfx::Factory::CreateCairoGlyphRenderingOptions(hinting, false);
-}
-#endif
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxPangoFonts.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxPangoFonts.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxPangoFonts.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxPangoFonts.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-/* -*- 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 GFX_PANGOFONTS_H
-#define GFX_PANGOFONTS_H
-
-#include "cairo.h"
-#include "gfxTypes.h"
-#include "gfxTextRun.h"
-
-#include "nsAutoRef.h"
-#include "nsTArray.h"
-
-#include <pango/pango.h>
-
-class gfxFcFontSet;
-class gfxFcFont;
-typedef struct _FcPattern FcPattern;
-typedef struct FT_FaceRec_* FT_Face;
-typedef struct FT_LibraryRec_  *FT_Library;
-
-class gfxPangoFontGroup : public gfxFontGroup {
-public:
-    gfxPangoFontGroup(const mozilla::FontFamilyList& aFontFamilyList,
-                      const gfxFontStyle *aStyle,
-                      gfxUserFontSet *aUserFontSet);
-    virtual ~gfxPangoFontGroup();
-
-    virtual gfxFontGroup *Copy(const gfxFontStyle *aStyle);
-
-    virtual gfxFont* GetFirstValidFont(uint32_t aCh = 0x20);
-
-    virtual void UpdateUserFonts();
-
-    virtual already_AddRefed<gfxFont>
-        FindFontForChar(uint32_t aCh, uint32_t aPrevCh, uint32_t aNextCh,
-                        int32_t aRunScript, gfxFont *aPrevMatchedFont,
-                        uint8_t *aMatchType);
-
-    static void Shutdown();
-
-    // Used for @font-face { src: local(); }
-    static gfxFontEntry *NewFontEntry(const nsAString& aFontName,
-                                      uint16_t aWeight,
-                                      int16_t aStretch,
-                                      bool aItalic);
-    // Used for @font-face { src: url(); }
-    static gfxFontEntry *NewFontEntry(const nsAString& aFontName,
-                                      uint16_t aWeight,
-                                      int16_t aStretch,
-                                      bool aItalic,
-                                      const uint8_t* aFontData,
-                                      uint32_t aLength);
-
-private:
-
-    virtual gfxFont *GetFontAt(int32_t i, uint32_t aCh = 0x20);
-
-    // @param aLang [in] language to use for pref fonts and system default font
-    //        selection, or nullptr for the language guessed from the
-    //        gfxFontStyle.
-    // The FontGroup holds a reference to this set.
-    gfxFcFontSet *GetFontSet(PangoLanguage *aLang = nullptr);
-
-    class FontSetByLangEntry {
-    public:
-        FontSetByLangEntry(PangoLanguage *aLang, gfxFcFontSet *aFontSet);
-        PangoLanguage *mLang;
-        nsRefPtr<gfxFcFontSet> mFontSet;
-    };
-    // There is only one of entry in this array unless characters from scripts
-    // of other languages are measured.
-    nsAutoTArray<FontSetByLangEntry,1> mFontSets;
-
-    gfxFloat mSizeAdjustFactor;
-    PangoLanguage *mPangoLanguage;
-
-    // @param aLang [in] language to use for pref fonts and system font
-    //        resolution, or nullptr to guess a language from the gfxFontStyle.
-    // @param aMatchPattern [out] if non-nullptr, will return the pattern used.
-    already_AddRefed<gfxFcFontSet>
-    MakeFontSet(PangoLanguage *aLang, gfxFloat aSizeAdjustFactor,
-                nsAutoRef<FcPattern> *aMatchPattern = nullptr);
-
-    gfxFcFontSet *GetBaseFontSet();
-    gfxFcFont *GetBaseFont();
-
-    gfxFloat GetSizeAdjustFactor()
-    {
-        if (mFontSets.Length() == 0)
-            GetBaseFontSet();
-        return mSizeAdjustFactor;
-    }
-
-    virtual void FindPlatformFont(const nsAString& aName,
-                                  bool aUseFontSet,
-                                  void *aClosure);
-
-    friend class gfxSystemFcFontEntry;
-    static FT_Library GetFTLibrary();
-};
-
-#endif /* GFX_PANGOFONTS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxPlatform.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxPlatform.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxPlatform.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxPlatform.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -10,7 +10,7 @@
 #include "mozilla/layers/SharedBufferManagerChild.h"
 #include "mozilla/layers/ISurfaceAllocator.h"     // for GfxMemoryImageReporter
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prprf.h"
 
 #include "gfxPlatform.h"
@@ -76,6 +76,10 @@
 #include "GLContextProvider.h"
 #include "mozilla/gfx/Logging.h"
 
+#if defined(MOZ_WIDGET_GTK)
+#include "gfxPlatformGtk.h" // xxx - for UseFcFontList
+#endif
+
 #ifdef MOZ_WIDGET_ANDROID
 #include "TexturePoolOGL.h"
 #endif
@@ -382,6 +386,39 @@
     "x-unicode",
 };
 
+// this needs to match the list of pref font.default.xx entries listed in all.js!
+// the order *must* match the order in eFontPrefLang
+static nsIAtom* gPrefLangToLangGroups[] = {
+    nsGkAtoms::x_western,
+    nsGkAtoms::Japanese,
+    nsGkAtoms::Taiwanese,
+    nsGkAtoms::Chinese,
+    nsGkAtoms::HongKongChinese,
+    nsGkAtoms::ko,
+    nsGkAtoms::x_cyrillic,
+    nsGkAtoms::el,
+    nsGkAtoms::th,
+    nsGkAtoms::he,
+    nsGkAtoms::ar,
+    nsGkAtoms::x_devanagari,
+    nsGkAtoms::x_tamil,
+    nsGkAtoms::x_armn,
+    nsGkAtoms::x_beng,
+    nsGkAtoms::x_cans,
+    nsGkAtoms::x_ethi,
+    nsGkAtoms::x_geor,
+    nsGkAtoms::x_gujr,
+    nsGkAtoms::x_guru,
+    nsGkAtoms::x_khmr,
+    nsGkAtoms::x_mlym,
+    nsGkAtoms::x_orya,
+    nsGkAtoms::x_telu,
+    nsGkAtoms::x_knda,
+    nsGkAtoms::x_sinh,
+    nsGkAtoms::x_tibt,
+    nsGkAtoms::Unicode
+};
+
 gfxPlatform::gfxPlatform()
   : mTileWidth(-1)
   , mTileHeight(-1)
@@ -503,13 +540,20 @@
 
     nsresult rv;
 
-#if defined(XP_MACOSX) || defined(XP_WIN) || defined(ANDROID) // temporary, until this is implemented on others
-    rv = gfxPlatformFontList::Init();
-    if (NS_FAILED(rv)) {
-        NS_RUNTIMEABORT("Could not initialize gfxPlatformFontList");
-    }
+    bool usePlatformFontList = true;
+#if defined(MOZ_WIDGET_GTK)
+    usePlatformFontList = gfxPlatformGtk::UseFcFontList();
+#elif defined(MOZ_WIDGET_QT)
+    usePlatformFontList = false;
 #endif
 
+    if (usePlatformFontList) {
+        rv = gfxPlatformFontList::Init();
+        if (NS_FAILED(rv)) {
+            NS_RUNTIMEABORT("Could not initialize gfxPlatformFontList");
+        }
+    }
+
     gPlatform->mScreenReferenceSurface =
         gPlatform->CreateOffscreenSurface(IntSize(1, 1),
                                           gfxContentType::COLOR_ALPHA);
@@ -814,7 +858,8 @@
     SourceSurfaceUserData *surf = static_cast<SourceSurfaceUserData*>(userData);
 
     if (surf->mSrcSurface->IsValid() && surf->mBackendType == aTarget->GetBackendType()) {
-      return surf->mSrcSurface;
+      RefPtr<SourceSurface> srcSurface(surf->mSrcSurface);
+      return srcSurface.forget();
     }
     // We can just continue here as when setting new user data the destroy
     // function will be called for the old user data.
@@ -981,10 +1026,8 @@
   NativeFont nativeFont;
   nativeFont.mType = NativeFontType::CAIRO_FONT_FACE;
   nativeFont.mFont = aFont->GetCairoScaledFont();
-  RefPtr<ScaledFont> scaledFont =
-    Factory::CreateScaledFontForNativeFont(nativeFont,
-                                           aFont->GetAdjustedSize());
-  return scaledFont;
+  return Factory::CreateScaledFontForNativeFont(nativeFont,
+                                                aFont->GetAdjustedSize());
 }
 
 int
@@ -1474,6 +1517,19 @@
     return GetFontPrefLangFor(lang.get());
 }
 
+nsIAtom*
+gfxPlatform::GetLangGroupForPrefLang(eFontPrefLang aLang)
+{
+    // the special CJK set pref lang should be resolved into separate
+    // calls to individual CJK pref langs before getting here
+    NS_ASSERTION(aLang != eFontPrefLang_CJKSet, "unresolved CJK set pref lang");
+
+    if (uint32_t(aLang) < ArrayLength(gPrefLangToLangGroups)) {
+        return gPrefLangToLangGroups[uint32_t(aLang)];
+    }
+    return nsGkAtoms::Unicode;
+}
+
 const char*
 gfxPlatform::GetPrefLangName(eFontPrefLang aLang)
 {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxPlatformFontList.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxPlatformFontList.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxPlatformFontList.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxPlatformFontList.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "gfxPlatformFontList.h"
 #include "gfxTextRun.h"
@@ -23,12 +23,12 @@
 
 using namespace mozilla;
 
-#define LOG_FONTLIST(args) PR_LOG(gfxPlatform::GetLog(eGfxLog_fontlist), \
+#define LOG_FONTLIST(args) MOZ_LOG(gfxPlatform::GetLog(eGfxLog_fontlist), \
                                PR_LOG_DEBUG, args)
 #define LOG_FONTLIST_ENABLED() PR_LOG_TEST( \
                                    gfxPlatform::GetLog(eGfxLog_fontlist), \
                                    PR_LOG_DEBUG)
-#define LOG_FONTINIT(args) PR_LOG(gfxPlatform::GetLog(eGfxLog_fontinit), \
+#define LOG_FONTINIT(args) MOZ_LOG(gfxPlatform::GetLog(eGfxLog_fontinit), \
                                PR_LOG_DEBUG, args)
 #define LOG_FONTINIT_ENABLED() PR_LOG_TEST( \
                                    gfxPlatform::GetLog(eGfxLog_fontinit), \
@@ -583,7 +583,7 @@
     if (MOZ_UNLIKELY(PR_LOG_TEST(log, PR_LOG_WARNING))) {
         uint32_t unicodeRange = FindCharUnicodeRange(aCh);
         int32_t script = mozilla::unicode::GetScriptCode(aCh);
-        PR_LOG(log, PR_LOG_WARNING,\
+        MOZ_LOG(log, PR_LOG_WARNING,\
                ("(textrun-systemfallback-%s) char: u+%6.6x "
                  "unicode-range: %d script: %d match: [%s]"
                 " time: %dus cmaps: %d\n",
@@ -650,8 +650,7 @@
         const char *fallbackFamily = defaultFallbacks[i];
 
         familyName.AppendASCII(fallbackFamily);
-        gfxFontFamily *fallback =
-                gfxPlatformFontList::PlatformFontList()->FindFamily(familyName);
+        gfxFontFamily *fallback = FindFamilyByCanonicalName(familyName);
         if (!fallback)
             continue;
 
@@ -726,7 +725,9 @@
 }
 
 gfxFontFamily* 
-gfxPlatformFontList::FindFamily(const nsAString& aFamily, bool aUseSystemFonts)
+gfxPlatformFontList::FindFamily(const nsAString& aFamily,
+                                nsIAtom* aLanguage,
+                                bool aUseSystemFonts)
 {
     nsAutoString key;
     gfxFontFamily *familyEntry;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxPlatformFontList.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxPlatformFontList.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxPlatformFontList.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxPlatformFontList.h	2015-05-25 20:42:41.000000000 +0000
@@ -110,9 +110,9 @@
     // initialize font lists
     virtual nsresult InitFontList();
 
-    void GetFontList (nsIAtom *aLangGroup,
-                      const nsACString& aGenericFamily,
-                      nsTArray<nsString>& aListOfFonts);
+    virtual void GetFontList(nsIAtom *aLangGroup,
+                             const nsACString& aGenericFamily,
+                             nsTArray<nsString>& aListOfFonts);
 
     void UpdateFontList();
 
@@ -126,6 +126,7 @@
                           const gfxFontStyle* aStyle);
 
     virtual gfxFontFamily* FindFamily(const nsAString& aFamily,
+                                      nsIAtom* aLanguage = nullptr,
                                       bool aUseSystemFonts = false);
 
     gfxFontEntry* FindFontForFamily(const nsAString& aFamily, const gfxFontStyle* aStyle, bool& aNeedsBold);
@@ -210,6 +211,18 @@
                                                nsRefPtr<gfxFontFamily>& aFamilyEntry,
                                                void* userArg);
 
+    // Lookup family name in global family list without substitutions or
+    // localized family name lookup. Used for common font fallback families.
+    gfxFontFamily* FindFamilyByCanonicalName(const nsAString& aFamily) {
+        nsAutoString key;
+        gfxFontFamily *familyEntry;
+        GenerateFontListKey(aFamily, key);
+        if ((familyEntry = mFontFamilies.GetWeak(key))) {
+            return CheckFamily(familyEntry);
+        }
+        return nullptr;
+    }
+
     // returns default font for a given character, null otherwise
     gfxFontEntry* CommonFontFallback(uint32_t aCh, uint32_t aNextCh,
                                      int32_t aRunScript,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxPlatformGtk.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxPlatformGtk.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxPlatformGtk.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxPlatformGtk.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -12,8 +12,9 @@
 #include "nsUnicharUtils.h"
 #include "nsUnicodeProperties.h"
 #include "gfx2DGlue.h"
+#include "gfxFcPlatformFontList.h"
 #include "gfxFontconfigUtils.h"
-#include "gfxPangoFonts.h"
+#include "gfxFontconfigFonts.h"
 #include "gfxContext.h"
 #include "gfxUserFontSet.h"
 #include "gfxUtils.h"
@@ -59,10 +60,15 @@
     bool gfxPlatformGtk::sUseXRender = true;
 #endif
 
+bool gfxPlatformGtk::sUseFcFontList = false;
+
 gfxPlatformGtk::gfxPlatformGtk()
 {
-    if (!sFontconfigUtils)
+    sUseFcFontList = mozilla::Preferences::GetBool("gfx.font_rendering.fontconfig.fontlist.enabled");
+    if (!sUseFcFontList && !sFontconfigUtils) {
         sFontconfigUtils = gfxFontconfigUtils::GetFontconfigUtils();
+    }
+
 #ifdef MOZ_X11
     sUseXRender = (GDK_IS_X11_DISPLAY(gdk_display_get_default())) ? 
                     mozilla::Preferences::GetBool("gfx.xrender.enabled") : false;
@@ -76,10 +82,11 @@
 
 gfxPlatformGtk::~gfxPlatformGtk()
 {
-    gfxFontconfigUtils::Shutdown();
-    sFontconfigUtils = nullptr;
-
-    gfxPangoFontGroup::Shutdown();
+    if (!sUseFcFontList) {
+        gfxFontconfigUtils::Shutdown();
+        sFontconfigUtils = nullptr;
+        gfxPangoFontGroup::Shutdown();
+    }
 }
 
 void
@@ -149,19 +156,84 @@
                             const nsACString& aGenericFamily,
                             nsTArray<nsString>& aListOfFonts)
 {
-    return sFontconfigUtils->GetFontList(aLangGroup, aGenericFamily,
+    if (sUseFcFontList) {
+        gfxPlatformFontList::PlatformFontList()->GetFontList(aLangGroup,
+                                                             aGenericFamily,
+                                                             aListOfFonts);
+        return NS_OK;
+    }
+
+    return sFontconfigUtils->GetFontList(aLangGroup,
+                                         aGenericFamily,
                                          aListOfFonts);
 }
 
 nsresult
 gfxPlatformGtk::UpdateFontList()
 {
+    if (sUseFcFontList) {
+        gfxPlatformFontList::PlatformFontList()->UpdateFontList();
+        return NS_OK;
+    }
+
     return sFontconfigUtils->UpdateFontList();
 }
 
+// xxx - this is ubuntu centric, need to go through other distros and flesh
+// out a more general list
+static const char kFontDejaVuSans[] = "DejaVu Sans";
+static const char kFontDejaVuSerif[] = "DejaVu Serif";
+static const char kFontFreeSans[] = "FreeSans";
+static const char kFontFreeSerif[] = "FreeSerif";
+static const char kFontTakaoPGothic[] = "TakaoPGothic";
+static const char kFontDroidSansFallback[] = "Droid Sans Fallback";
+static const char kFontWenQuanYiMicroHei[] = "WenQuanYi Micro Hei";
+static const char kFontNanumGothic[] = "NanumGothic";
+
+void
+gfxPlatformGtk::GetCommonFallbackFonts(uint32_t aCh, uint32_t aNextCh,
+                                       int32_t aRunScript,
+                                       nsTArray<const char*>& aFontList)
+{
+    aFontList.AppendElement(kFontDejaVuSerif);
+    aFontList.AppendElement(kFontFreeSerif);
+    aFontList.AppendElement(kFontDejaVuSans);
+    aFontList.AppendElement(kFontFreeSans);
+
+    // add fonts for CJK ranges
+    // xxx - this isn't really correct, should use the same CJK font ordering
+    // as the pref font code
+    if (aCh >= 0x3000 &&
+        ((aCh < 0xe000) ||
+         (aCh >= 0xf900 && aCh < 0xfff0) ||
+         ((aCh >> 16) == 2))) {
+        aFontList.AppendElement(kFontTakaoPGothic);
+        aFontList.AppendElement(kFontDroidSansFallback);
+        aFontList.AppendElement(kFontWenQuanYiMicroHei);
+        aFontList.AppendElement(kFontNanumGothic);
+    }
+}
+
+gfxPlatformFontList*
+gfxPlatformGtk::CreatePlatformFontList()
+{
+    gfxPlatformFontList* list = new gfxFcPlatformFontList();
+    if (NS_SUCCEEDED(list->InitFontList())) {
+        return list;
+    }
+    gfxPlatformFontList::Shutdown();
+    return nullptr;
+}
+
 nsresult
 gfxPlatformGtk::GetStandardFamilyName(const nsAString& aFontName, nsAString& aFamilyName)
 {
+    if (sUseFcFontList) {
+        gfxPlatformFontList::PlatformFontList()->
+            GetStandardFamilyName(aFontName, aFamilyName);
+        return NS_OK;
+    }
+
     return sFontconfigUtils->GetStandardFamilyName(aFontName, aFamilyName);
 }
 
@@ -170,6 +242,10 @@
                                 const gfxFontStyle *aStyle,
                                 gfxUserFontSet *aUserFontSet)
 {
+    if (sUseFcFontList) {
+        return new gfxFontGroup(aFontFamilyList, aStyle, aUserFontSet);
+    }
+
     return new gfxPangoFontGroup(aFontFamilyList, aStyle, aUserFontSet);
 }
 
@@ -179,6 +255,11 @@
                                 int16_t aStretch,
                                 bool aItalic)
 {
+    if (sUseFcFontList) {
+        gfxPlatformFontList* pfl = gfxPlatformFontList::PlatformFontList();
+        return pfl->LookupLocalFont(aFontName, aWeight, aStretch, aItalic);
+    }
+
     return gfxPangoFontGroup::NewFontEntry(aFontName, aWeight,
                                            aStretch, aItalic);
 }
@@ -191,6 +272,12 @@
                                  const uint8_t* aFontData,
                                  uint32_t aLength)
 {
+    if (sUseFcFontList) {
+        gfxPlatformFontList* pfl = gfxPlatformFontList::PlatformFontList();
+        return pfl->MakePlatformFont(aFontName, aWeight, aStretch, aItalic,
+                                     aFontData, aLength);
+    }
+
     // passing ownership of the font data to the new font entry
     return gfxPangoFontGroup::NewFontEntry(aFontName, aWeight,
                                            aStretch, aItalic,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxPlatformGtk.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxPlatformGtk.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxPlatformGtk.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxPlatformGtk.h	2015-05-25 20:42:41.000000000 +0000
@@ -41,6 +41,13 @@
 
     virtual nsresult UpdateFontList() override;
 
+    virtual void
+    GetCommonFallbackFonts(uint32_t aCh, uint32_t aNextCh,
+                           int32_t aRunScript,
+                           nsTArray<const char*>& aFontList) override;
+
+    virtual gfxPlatformFontList* CreatePlatformFontList() override;
+
     virtual nsresult GetStandardFamilyName(const nsAString& aFontName,
                                            nsAString& aFamilyName) override;
 
@@ -101,6 +108,8 @@
 #endif
     }
 
+    static bool UseFcFontList() { return sUseFcFontList; }
+
     bool UseImageOffscreenSurfaces() {
         // We want to turn on image offscreen surfaces ONLY for GTK3 builds
         // since GTK2 theme rendering still requires xlib surfaces per se.
@@ -129,6 +138,10 @@
 #ifdef MOZ_X11
     static bool sUseXRender;
 #endif
+
+    // xxx - this will be removed once the new fontconfig platform font list
+    // replaces gfxPangoFontGroup
+    static bool sUseFcFontList;
 };
 
 #endif /* GFX_PLATFORM_GTK_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxPlatform.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxPlatform.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxPlatform.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxPlatform.h	2015-05-25 20:42:41.000000000 +0000
@@ -6,7 +6,7 @@
 #ifndef GFX_PLATFORM_H
 #define GFX_PLATFORM_H
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "mozilla/gfx/Types.h"
 #include "nsTArray.h"
 #include "nsString.h"
@@ -470,6 +470,9 @@
     // convert a lang group atom to enum constant
     static eFontPrefLang GetFontPrefLangFor(nsIAtom *aLang);
 
+    // convert an enum constant to a lang group atom
+    static nsIAtom* GetLangGroupForPrefLang(eFontPrefLang aLang);
+
     // convert a enum constant to lang group string (i.e. eFontPrefLang_ChineseTW ==> "zh-TW")
     static const char* GetPrefLangName(eFontPrefLang aLang);
    
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxPlatformMac.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxPlatformMac.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxPlatformMac.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxPlatformMac.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -8,6 +8,7 @@
 #include "gfxQuartzSurface.h"
 #include "gfxQuartzImageSurface.h"
 #include "mozilla/gfx/2D.h"
+#include "mozilla/gfx/MacIOSurface.h"
 
 #include "gfxMacPlatformFontList.h"
 #include "gfxMacFont.h"
@@ -94,6 +95,8 @@
             NS_WARNING("Unable to bump RLIMIT_NOFILE to the maximum number on this OS");
         }
     }
+
+    MacIOSurfaceLib::LoadLibrary();
 }
 
 gfxPlatformMac::~gfxPlatformMac()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxPrefs.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxPrefs.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxPrefs.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxPrefs.h	2015-05-25 20:42:41.000000000 +0000
@@ -368,6 +368,8 @@
   DECL_GFX_PREF(Live, "ui.click_hold_context_menus.delay",     UiClickHoldContextMenusDelay, int32_t, 500);
   DECL_GFX_PREF(Once, "webgl.angle.force-d3d11",               WebGLANGLEForceD3D11, bool, false);
   DECL_GFX_PREF(Once, "webgl.angle.try-d3d11",                 WebGLANGLETryD3D11, bool, false);
+  DECL_GFX_PREF(Live, "webgl.disable-fail-if-major-performance-caveat",
+                WebGLDisableFailIfMajorPerformanceCaveat, bool, false);
   DECL_GFX_PREF(Once, "webgl.force-layers-readback",           WebGLForceLayersReadback, bool, false);
 
   // WARNING:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxQtPlatform.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxQtPlatform.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxQtPlatform.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxQtPlatform.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -23,7 +23,7 @@
 #include "gfxQPainterSurface.h"
 #include "nsUnicodeProperties.h"
 
-#include "gfxPangoFonts.h"
+#include "gfxFontconfigFonts.h"
 #include "gfxContext.h"
 #include "gfxUserFontSet.h"
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxTextRun.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxTextRun.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxTextRun.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxTextRun.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -23,6 +23,10 @@
 #include "mozilla/Likely.h"
 #include "gfx2DGlue.h"
 
+#if defined(MOZ_WIDGET_GTK)
+#include "gfxPlatformGtk.h" // xxx - for UseFcFontList
+#endif
+
 #include "cairo.h"
 
 using namespace mozilla;
@@ -1536,6 +1540,7 @@
     , mTextPerf(nullptr)
     , mPageLang(gfxPlatform::GetFontPrefLangFor(aStyle->language))
     , mSkipDrawing(false)
+    , mSkipUpdateUserFonts(false)
 {
     // We don't use SetUserFontSet() here, as we want to unconditionally call
     // BuildFontList() rather than only do UpdateUserFonts() if it changed.
@@ -1682,10 +1687,17 @@
 void
 gfxFontGroup::BuildFontList()
 {
-// gfxPangoFontGroup behaves differently, so this method is a no-op on that platform
-#if defined(XP_MACOSX) || defined(XP_WIN) || defined(ANDROID)
-    EnumerateFontList(mStyle.language);
+    bool enumerateFonts = true;
+
+#if defined(MOZ_WIDGET_GTK)
+    // xxx - eliminate this once gfxPangoFontGroup is no longer needed
+    enumerateFonts = gfxPlatformGtk::UseFcFontList();
+#elif defined(MOZ_WIDGET_QT)
+    enumerateFonts = false;
 #endif
+    if (enumerateFonts) {
+        EnumerateFontList(mStyle.language);
+    }
 }
 
 void
@@ -1724,7 +1736,7 @@
     // Not known in the user font set ==> check system fonts
     if (!family) {
         gfxPlatformFontList *fontList = gfxPlatformFontList::PlatformFontList();
-        family = fontList->FindFamily(aName, mStyle.systemFont);
+        family = fontList->FindFamily(aName, mStyle.language, mStyle.systemFont);
         if (family) {
             fe = family->FindFontForStyle(mStyle, needsBold);
         }
@@ -2216,7 +2228,7 @@
                 nsAutoString families;
                 mFamilyList.ToString(families);
                 nsAutoCString str((const char*)aString, aLength);
-                PR_LOG(log, PR_LOG_WARNING,\
+                MOZ_LOG(log, PR_LOG_WARNING,\
                        ("(%s) fontgroup: [%s] default: %s lang: %s script: %d "
                         "len %d weight: %d width: %d style: %s size: %6.2f %d-byte "
                         "TEXTRUN [%s] ENDTEXTRUN\n",
@@ -2264,7 +2276,7 @@
                     nsAutoString families;
                     mFamilyList.ToString(families);
                     uint32_t runLen = runLimit - runStart;
-                    PR_LOG(log, PR_LOG_WARNING,\
+                    MOZ_LOG(log, PR_LOG_WARNING,\
                            ("(%s) fontgroup: [%s] default: %s lang: %s script: %d "
                             "len %d weight: %d width: %d style: %s size: %6.2f "
                             "%d-byte TEXTRUN [%s] ENDTEXTRUN\n",
@@ -2345,13 +2357,11 @@
     NS_ASSERTION(aTextRun->GetShapingState() != gfxTextRun::eShapingState_Aborted,
                  "don't call InitScriptRun with aborted shaping state");
 
-#if defined(XP_MACOSX) || defined(XP_WIN) || defined(ANDROID)
-    // non-linux platforms build the fontlist lazily and include userfonts
-    // so need to confirm the load state of userfonts in the list
-    if (mUserFontSet && mCurrGeneration != mUserFontSet->GetGeneration()) {
+    // confirm the load state of userfonts in the list
+    if (!mSkipUpdateUserFonts && mUserFontSet &&
+        mCurrGeneration != mUserFontSet->GetGeneration()) {
         UpdateUserFonts();
     }
-#endif
 
     gfxFont *mainFont = GetFirstValidFont();
 
@@ -2607,10 +2617,6 @@
     NS_ASSERTION(mStyle.style != NS_FONT_STYLE_NORMAL,
                  "should only be called in the italic/oblique case");
 
-    if (!aFamily->TestCharacterMap(aCh)) {
-        return nullptr;
-    }
-
     gfxFontStyle regularStyle = mStyle;
     regularStyle.style = NS_FONT_STYLE_NORMAL;
     bool needsBold;
@@ -2797,9 +2803,11 @@
 
         // If italic, test the regular face to see if it supports the character.
         // Only do this for platform fonts, not userfonts.
+        fe = ff.FontEntry();
         if (mStyle.style != NS_FONT_STYLE_NORMAL &&
-            !ff.FontEntry()->IsUserFont()) {
-            font = FindNonItalicFaceForChar(mFonts[i].Family(), aCh);
+            !fe->mIsUserFontContainer &&
+            !fe->IsUserFont()) {
+            font = FindNonItalicFaceForChar(ff.Family(), aCh);
             if (font) {
                 *aMatchType = gfxTextRange::kFontGroup;
                 return font.forget();
@@ -3082,7 +3090,10 @@
     {
         PrefFontCallbackData *prefFontData = static_cast<PrefFontCallbackData*>(aClosure);
 
-        gfxFontFamily *family = gfxPlatformFontList::PlatformFontList()->FindFamily(aName);
+        // map pref lang to langGroup for language-sensitive lookups
+        nsIAtom* lang = gfxPlatform::GetLangGroupForPrefLang(aLang);
+        gfxFontFamily *family =
+            gfxPlatformFontList::PlatformFontList()->FindFamily(aName, lang);
         if (family) {
             prefFontData->mPrefFamilies.AppendElement(family);
         }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxTextRun.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxTextRun.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxTextRun.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxTextRun.h	2015-05-25 20:42:41.000000000 +0000
@@ -1056,6 +1056,9 @@
                                           // download to complete (or fallback
                                           // timer to fire)
 
+    // xxx - gfxPangoFontGroup skips UpdateUserFonts
+    bool                    mSkipUpdateUserFonts;
+
     /**
      * Textrun creation short-cuts for special cases where we don't need to
      * call a font shaper to generate glyphs.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxUserFontSet.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxUserFontSet.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxUserFontSet.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxUserFontSet.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "gfxUserFontSet.h"
 #include "gfxPlatform.h"
@@ -33,7 +33,7 @@
     return sLog;
 }
 
-#define LOG(args) PR_LOG(gfxUserFontSet::GetUserFontsLog(), PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gfxUserFontSet::GetUserFontsLog(), PR_LOG_DEBUG, args)
 #define LOG_ENABLED() PR_LOG_TEST(gfxUserFontSet::GetUserFontsLog(), PR_LOG_DEBUG)
 
 static uint64_t sFontSetGeneration = 0;
@@ -370,7 +370,7 @@
     if (metaOffset >= aLength || metaCompLen > aLength - metaOffset) {
         return;
     }
-    if (!aMetadata->SetLength(woff->metaCompLen)) {
+    if (!aMetadata->SetLength(woff->metaCompLen, fallible)) {
         return;
     }
     memcpy(aMetadata->Elements(), aFontData + metaOffset, metaCompLen);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxUtils.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxUtils.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -331,7 +331,8 @@
     DataSourceSurface::MappedSurface destMap;
     if (!MapSrcAndCreateMappedDest(srcSurf, &destSurf, &srcMap, &destMap)) {
         MOZ_ASSERT(false, "MapSrcAndCreateMappedDest failed.");
-        return srcSurf;
+        RefPtr<DataSourceSurface> surface(srcSurf);
+        return surface.forget();
     }
 
     PremultiplyData(srcMap.mData, srcMap.mStride,
@@ -340,7 +341,7 @@
                     srcSurf->GetSize().height);
 
     UnmapSrcDest(srcSurf, destSurf);
-    return destSurf;
+    return destSurf.forget();
 }
 
 TemporaryRef<DataSourceSurface>
@@ -351,7 +352,8 @@
     DataSourceSurface::MappedSurface destMap;
     if (!MapSrcAndCreateMappedDest(srcSurf, &destSurf, &srcMap, &destMap)) {
         MOZ_ASSERT(false, "MapSrcAndCreateMappedDest failed.");
-        return srcSurf;
+        RefPtr<DataSourceSurface> surface(srcSurf);
+        return surface.forget();
     }
 
     UnpremultiplyData(srcMap.mData, srcMap.mStride,
@@ -360,7 +362,7 @@
                       srcSurf->GetSize().height);
 
     UnmapSrcDest(srcSurf, destSurf);
-    return destSurf;
+    return destSurf.forget();
 }
 
 void
@@ -717,8 +719,7 @@
     pb->LineTo(Point(r->x, r->YMost()));
     pb->Close();
   }
-  RefPtr<Path> path = pb->Finish();
-  return path;
+  return pb->Finish();
 }
 
 static void
@@ -1262,7 +1263,7 @@
   } else {
     nsCOMPtr<nsIClipboardHelper> clipboard(do_GetService("@mozilla.org/widget/clipboardhelper;1", &rv));
     if (clipboard) {
-      clipboard->CopyString(NS_ConvertASCIItoUTF16(string), nullptr);
+      clipboard->CopyString(NS_ConvertASCIItoUTF16(string));
     }
   }
   return NS_OK;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxWindowsPlatform.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxWindowsPlatform.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/gfxWindowsPlatform.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/gfxWindowsPlatform.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -1890,11 +1890,22 @@
     if (NS_SUCCEEDED(gfxInfo->GetFeatureStatus(nsIGfxInfo::FEATURE_DIRECT3D_11_LAYERS, &status))) {
       if (status != nsIGfxInfo::FEATURE_STATUS_OK) {
 
-        // It seems like nvdxgiwrapper makes a mess of WARP. See bug 1154703 for more.
-        if (gfxPrefs::LayersD3D11DisableWARP() || GetModuleHandleA("nvdxgiwrapper.dll")) {
+        // It seems like nvdxgiwrap makes a mess of WARP. See bug 1154703 for more.
+        if (gfxPrefs::LayersD3D11DisableWARP() || GetModuleHandleA("nvdxgiwrap.dll")) {
           return;
         }
 
+        if (!IsWin8OrLater()) {
+            /* On Windows 7 WARP runs very badly on the builtin vga driver */
+            nsString driver;
+            gfxInfo->GetAdapterDriver(driver);
+            // driver can start with vga or svga so only look for "framebuf..."
+            if (driver.Find("framebuf vga256 vga64k") != kNotFound) {
+                gfxCriticalError(CriticalLog::DefaultOptions(false)) << "Disabling WARP on builtin vga driver";
+                return;
+            }
+        }
+
         useWARP = true;
       }
     }
@@ -2081,7 +2092,7 @@
 
   multi->SetMultithreadProtected(TRUE);
 
-  return device;
+  return device.forget();
 }
 
 static bool
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/moz.build firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/moz.build	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/moz.build	2015-05-25 20:42:41.000000000 +0000
@@ -102,20 +102,21 @@
     ]
 elif CONFIG['MOZ_WIDGET_GTK']:
     EXPORTS += [
+        'gfxFontconfigFonts.h',
         'gfxFT2FontBase.h',
         'gfxGdkNativeRenderer.h',
-        'gfxPangoFonts.h',
         'gfxPDFSurface.h',
         'gfxPlatformGtk.h',
         'gfxPSSurface.h',
     ]
 
     SOURCES += [
+        'gfxFcPlatformFontList.cpp',
+        'gfxFontconfigFonts.cpp',
         'gfxFontconfigUtils.cpp',
         'gfxFT2FontBase.cpp',
         'gfxFT2Utils.cpp',
         'gfxGdkNativeRenderer.cpp',
-        'gfxPangoFonts.cpp',
         'gfxPDFSurface.cpp',
         'gfxPlatformGtk.cpp',
         'gfxPSSurface.cpp',
@@ -133,18 +134,18 @@
 
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
     EXPORTS += [
+        'gfxFontconfigFonts.h',
         'gfxFT2FontBase.h',
-        'gfxPangoFonts.h',
         'gfxPDFSurface.h',
         'gfxQPainterSurface.h',
         'gfxQtNativeRenderer.h',
         'gfxQtPlatform.h',
     ]
     SOURCES += [
+        'gfxFontconfigFonts.cpp',
         'gfxFontconfigUtils.cpp',
         'gfxFT2FontBase.cpp',
         'gfxFT2Utils.cpp',
-        'gfxPangoFonts.cpp',
         'gfxPDFSurface.cpp',
         'gfxQPainterSurface.cpp',
         'gfxQtPlatform.cpp',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/nsUnicodeRange.cpp firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/nsUnicodeRange.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/nsUnicodeRange.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/nsUnicodeRange.cpp	2015-05-25 20:42:41.000000000 +0000
@@ -4,39 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsUnicodeRange.h"
-#include "nsGkAtoms.h"
-
-// This table depends on unicode range definitions. 
-// Each item's index must correspond unicode range value
-// eg. x-cyrillic = LangGroupTable[kRangeCyrillic]
-static nsIAtom **gUnicodeRangeToLangGroupAtomTable[] =
-{
-  &nsGkAtoms::x_cyrillic,
-  &nsGkAtoms::el_,
-  &nsGkAtoms::he,
-  &nsGkAtoms::ar,
-  &nsGkAtoms::th,
-  &nsGkAtoms::ko,
-  &nsGkAtoms::Japanese,
-  &nsGkAtoms::zh_cn,
-  &nsGkAtoms::zh_tw,
-  &nsGkAtoms::x_devanagari,
-  &nsGkAtoms::x_tamil,
-  &nsGkAtoms::x_armn,
-  &nsGkAtoms::x_beng,
-  &nsGkAtoms::x_cans,
-  &nsGkAtoms::x_ethi,
-  &nsGkAtoms::x_geor,
-  &nsGkAtoms::x_gujr,
-  &nsGkAtoms::x_guru,
-  &nsGkAtoms::x_khmr,
-  &nsGkAtoms::x_mlym,
-  &nsGkAtoms::x_orya,
-  &nsGkAtoms::x_telu,
-  &nsGkAtoms::x_knda,
-  &nsGkAtoms::x_sinh,
-  &nsGkAtoms::x_tibt
-};
 
 /**********************************************************************
  * Unicode subranges as defined in unicode 3.0
@@ -450,12 +417,3 @@
   // Yet another table to look at : U+0700 - U+16FF : 128 code point blocks
   return gUnicodeTertiaryRangeTable[(ch - 0x0700) >> 7];
 }
-
-nsIAtom *LangGroupFromUnicodeRange(uint8_t unicodeRange)
-{
-  if (kRangeSpecificItemNum > unicodeRange) {
-    nsIAtom **atom = gUnicodeRangeToLangGroupAtomTable[unicodeRange];
-    return *atom;
-  }
-  return nullptr;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/nsUnicodeRange.h firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/nsUnicodeRange.h
--- firefox-trunk-41.0~a1~hg20150513r243603/gfx/thebes/nsUnicodeRange.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/gfx/thebes/nsUnicodeRange.h	2015-05-25 20:42:41.000000000 +0000
@@ -8,8 +8,6 @@
 
 #include <stdint.h>
 
-class nsIAtom;
-
 // The following constants define unicode subranges
 // values below kRangeNum must be continuous so that we can map to 
 // lang group directly.
@@ -89,6 +87,5 @@
 
 
 uint32_t FindCharUnicodeRange(uint32_t ch);
-nsIAtom* LangGroupFromUnicodeRange(uint8_t unicodeRange);
 
 #endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/hal/gonk/GonkHal.cpp firefox-trunk-41.0~a1~hg20150524r245419/hal/gonk/GonkHal.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/hal/gonk/GonkHal.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/hal/gonk/GonkHal.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -632,6 +632,7 @@
   if (aBatteryInfo->charging() != previousCharging){
     aBatteryInfo->remainingTime() = dom::battery::kUnknownRemainingTime;
     memset(&lastLevelChange, 0, sizeof(struct timespec));
+    remainingTime = 0.0;
   }
 
   if (aBatteryInfo->charging()) {
@@ -668,7 +669,37 @@
     }
 
   } else {
-    aBatteryInfo->remainingTime() = dom::battery::kUnknownRemainingTime;
+    if (aBatteryInfo->level() == 0.0) {
+      aBatteryInfo->remainingTime() = dom::battery::kDefaultRemainingTime;
+    } else if (aBatteryInfo->level() != previousLevel){
+      if (lastLevelChange.tv_sec != 0) {
+        clock_gettime(CLOCK_MONOTONIC, &now);
+        dtime = now.tv_sec - lastLevelChange.tv_sec;
+        dlevel = previousLevel - aBatteryInfo->level();
+
+        if (dlevel <= 0.0) {
+          aBatteryInfo->remainingTime() = dom::battery::kUnknownRemainingTime;
+        } else {
+          remainingTime = (double) round(dtime / dlevel * aBatteryInfo->level());
+          aBatteryInfo->remainingTime() = remainingTime;
+        }
+
+        lastLevelChange = now;
+      } else { // lastLevelChange.tv_sec == 0
+        clock_gettime(CLOCK_MONOTONIC, &lastLevelChange);
+        aBatteryInfo->remainingTime() = dom::battery::kUnknownRemainingTime;
+      }
+
+    } else {
+      clock_gettime(CLOCK_MONOTONIC, &now);
+      dtime = now.tv_sec - lastLevelChange.tv_sec;
+      if (dtime < remainingTime) {
+        aBatteryInfo->remainingTime() = round(remainingTime - dtime);
+      } else {
+        aBatteryInfo->remainingTime() = dom::battery::kUnknownRemainingTime;
+      }
+
+    }
   }
 
   previousCharging = aBatteryInfo->charging();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/hal/Hal.cpp firefox-trunk-41.0~a1~hg20150524r245419/hal/Hal.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/hal/Hal.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/hal/Hal.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -888,8 +888,6 @@
     return "FOREGROUND_KEYBOARD";
   case PROCESS_PRIORITY_BACKGROUND_PERCEIVABLE:
     return "BACKGROUND_PERCEIVABLE";
-  case PROCESS_PRIORITY_BACKGROUND_HOMESCREEN:
-    return "BACKGROUND_HOMESCREEN";
   case PROCESS_PRIORITY_BACKGROUND:
     return "BACKGROUND";
   case PROCESS_PRIORITY_UNKNOWN:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/hal/HalLog.h firefox-trunk-41.0~a1~hg20150524r245419/hal/HalLog.h
--- firefox-trunk-41.0~a1~hg20150513r243603/hal/HalLog.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/hal/HalLog.h	2015-05-25 20:42:42.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef mozilla_HalLog_h
 #define mozilla_HalLog_h
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 /*
  * HalLog.h contains internal macros and functions used for logging.
@@ -22,9 +22,9 @@
 
 extern PRLogModuleInfo *GetHalLog();
 #define HAL_LOG(...) \
-  PR_LOG(mozilla::hal::GetHalLog(), PR_LOG_DEBUG, (__VA_ARGS__))
+  MOZ_LOG(mozilla::hal::GetHalLog(), PR_LOG_DEBUG, (__VA_ARGS__))
 #define HAL_ERR(...) \
-  PR_LOG(mozilla::hal::GetHalLog(), PR_LOG_ERROR, (__VA_ARGS__))
+  MOZ_LOG(mozilla::hal::GetHalLog(), PR_LOG_ERROR, (__VA_ARGS__))
 
 } // namespace hal
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/hal/HalTypes.h firefox-trunk-41.0~a1~hg20150524r245419/hal/HalTypes.h
--- firefox-trunk-41.0~a1~hg20150513r243603/hal/HalTypes.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/hal/HalTypes.h	2015-05-25 20:42:42.000000000 +0000
@@ -58,7 +58,6 @@
 enum ProcessPriority {
   PROCESS_PRIORITY_UNKNOWN = -1,
   PROCESS_PRIORITY_BACKGROUND,
-  PROCESS_PRIORITY_BACKGROUND_HOMESCREEN,
   PROCESS_PRIORITY_BACKGROUND_PERCEIVABLE,
   PROCESS_PRIORITY_FOREGROUND_KEYBOARD,
   // The special class for the preallocated process, high memory priority but
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/BMPFileHeaders.h firefox-trunk-41.0~a1~hg20150524r245419/image/BMPFileHeaders.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/BMPFileHeaders.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/BMPFileHeaders.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,144 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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_image_BMPFileHeaders_h
+#define mozilla_image_BMPFileHeaders_h
+
+namespace mozilla {
+namespace image {
+
+struct BMPFILEHEADER {
+  char signature[2];   // String "BM"
+  uint32_t filesize;
+  int32_t reserved;    // Zero
+  uint32_t dataoffset; // Offset to raster data
+
+  uint32_t bihsize;
+};
+
+// The length of the bitmap file header as defined in the BMP spec.
+#define BFH_LENGTH 14
+// Internally we store the bitmap file header with an additional 4 bytes which
+// is used to store the bitmap information header size.
+#define BFH_INTERNAL_LENGTH 18
+
+#define OS2_INTERNAL_BIH_LENGTH 8
+#define WIN_V3_INTERNAL_BIH_LENGTH 36
+#define WIN_V5_INTERNAL_BIH_LENGTH 120
+
+#define OS2_BIH_LENGTH 12     // This is the real BIH size (as contained in the
+                              // bihsize field of BMPFILEHEADER)
+#define WIN_V3_BIH_LENGTH 40  // This is the real BIH size (as contained in the
+                              // bihsize field of BMPFILEHEADER)
+#define WIN_V5_BIH_LENGTH 124 // This is the real BIH size (as contained in the
+                              // bihsize field of BMPFILEHEADER)
+
+#define OS2_HEADER_LENGTH (BFH_INTERNAL_LENGTH + OS2_INTERNAL_BIH_LENGTH)
+#define WIN_V3_HEADER_LENGTH (BFH_INTERNAL_LENGTH + WIN_V3_INTERNAL_BIH_LENGTH)
+#define WIN_V5_HEADER_LENGTH (BFH_INTERNAL_LENGTH + WIN_V5_INTERNAL_BIH_LENGTH)
+
+#ifndef LCS_sRGB
+#define LCS_sRGB 0x73524742
+#endif
+
+struct xyz {
+  int32_t x, y, z;
+};
+
+struct xyzTriple {
+  xyz r, g, b;
+};
+
+struct BITMAPV5HEADER {
+  int32_t width;             // Uint16 in OS/2 BMPs
+  int32_t height;            // Uint16 in OS/2 BMPs
+  uint16_t planes;           // =1
+  uint16_t bpp;              // Bits per pixel.
+  // The rest of the header is not available in OS/2 BMP Files
+  uint32_t compression;      // 0=no compression 1=8bit RLE 2=4bit RLE
+  uint32_t image_size;       // (compressed) image size. Can be 0 if
+                             // compression==0
+  uint32_t xppm;             // Pixels per meter, horizontal
+  uint32_t yppm;             // Pixels per meter, vertical
+  uint32_t colors;           // Used Colors
+  uint32_t important_colors; // Number of important colors. 0=all
+  uint32_t red_mask;         // Bits used for red component
+  uint32_t green_mask;       // Bits used for green component
+  uint32_t blue_mask;        // Bits used for blue component
+  uint32_t alpha_mask;       // Bits used for alpha component
+  uint32_t color_space;      // 0x73524742=LCS_sRGB ...
+  // These members are unused unless color_space == LCS_CALIBRATED_RGB
+  xyzTriple white_point;     // Logical white point
+  uint32_t gamma_red;        // Red gamma component
+  uint32_t gamma_green;      // Green gamma component
+  uint32_t gamma_blue;       // Blue gamma component
+  uint32_t intent;           // Rendering intent
+  // These members are unused unless color_space == LCS_PROFILE_*
+  uint32_t profile_offset;   // Offset to profile data in bytes
+  uint32_t profile_size;     // Size of profile data in bytes
+  uint32_t reserved;         // =0
+};
+
+struct colorTable {
+  uint8_t red;
+  uint8_t green;
+  uint8_t blue;
+};
+
+struct bitFields {
+  uint32_t red;
+  uint32_t green;
+  uint32_t blue;
+  uint8_t redLeftShift;
+  uint8_t redRightShift;
+  uint8_t greenLeftShift;
+  uint8_t greenRightShift;
+  uint8_t blueLeftShift;
+  uint8_t blueRightShift;
+};
+
+} // namespace image
+} // namespace mozilla
+
+#define BITFIELD_LENGTH 12 // Length of the bitfields structure in the bmp file
+#define USE_RGB
+
+// BMPINFOHEADER.compression defines
+#ifndef BI_RGB
+#define BI_RGB 0
+#endif
+#ifndef BI_RLE8
+#define BI_RLE8 1
+#endif
+#ifndef BI_RLE4
+#define BI_RLE4 2
+#endif
+#ifndef BI_BITFIELDS
+#define BI_BITFIELDS 3
+#endif
+// BI_ALPHABITFIELDS  means no compression and specifies alpha bits
+// valid only for 32bpp and 16bpp
+#ifndef BI_ALPHABITFIELDS
+#define BI_ALPHABITFIELDS 4
+#endif
+
+// RLE Escape codes
+#define RLE_ESCAPE       0
+#define RLE_ESCAPE_EOL   0
+#define RLE_ESCAPE_EOF   1
+#define RLE_ESCAPE_DELTA 2
+
+/// enums for mState
+enum ERLEState {
+  eRLEStateInitial,
+  eRLEStateNeedSecondEscapeByte,
+  eRLEStateNeedXDelta,
+  eRLEStateNeedYDelta,        ///< mStateData will hold x delta
+  eRLEStateAbsoluteMode,      ///< mStateData will hold count of existing data
+                              ///< to read
+  eRLEStateAbsoluteModePadded ///< As above, but another byte of data has to
+                              ///< be read as padding
+};
+
+#endif // mozilla_image_BMPFileHeaders_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/build/moz.build firefox-trunk-41.0~a1~hg20150524r245419/image/build/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/image/build/moz.build	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/build/moz.build	2015-05-25 20:42:42.000000000 +0000
@@ -16,10 +16,10 @@
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '../encoders/bmp',
-    '../encoders/ico',
-    '../encoders/jpeg',
-    '../encoders/png',
-    '../src',
+    '/image',
+    '/image/encoders/bmp',
+    '/image/encoders/ico',
+    '/image/encoders/jpeg',
+    '/image/encoders/png',
 ]
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/ClippedImage.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/ClippedImage.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/ClippedImage.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/ClippedImage.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,486 @@
+/* -*- 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 <new>      // Workaround for bug in VS10; see bug 981264.
+#include <cmath>
+#include <utility>
+
+#include "gfxDrawable.h"
+#include "gfxPlatform.h"
+#include "gfxUtils.h"
+#include "mozilla/gfx/2D.h"
+#include "mozilla/RefPtr.h"
+
+#include "ImageRegion.h"
+#include "Orientation.h"
+#include "SVGImageContext.h"
+
+#include "ClippedImage.h"
+
+namespace mozilla {
+
+using namespace gfx;
+using layers::LayerManager;
+using layers::ImageContainer;
+using std::make_pair;
+using std::modf;
+using std::pair;
+
+namespace image {
+
+class ClippedImageCachedSurface
+{
+public:
+  ClippedImageCachedSurface(TemporaryRef<SourceSurface> aSurface,
+                            const nsIntSize& aSize,
+                            const Maybe<SVGImageContext>& aSVGContext,
+                            float aFrame,
+                            uint32_t aFlags)
+    : mSurface(aSurface)
+    , mSize(aSize)
+    , mFrame(aFrame)
+    , mFlags(aFlags)
+  {
+    MOZ_ASSERT(mSurface, "Must have a valid surface");
+    if (aSVGContext) {
+      mSVGContext.emplace(*aSVGContext);
+    }
+  }
+
+  bool Matches(const nsIntSize& aSize,
+               const Maybe<SVGImageContext>& aSVGContext,
+               float aFrame,
+               uint32_t aFlags)
+  {
+    return mSize == aSize &&
+           mSVGContext == aSVGContext &&
+           mFrame == aFrame &&
+           mFlags == aFlags;
+  }
+
+  TemporaryRef<SourceSurface> Surface() {
+    RefPtr<SourceSurface> surf(mSurface);
+    return surf.forget();
+  }
+
+private:
+  RefPtr<SourceSurface>  mSurface;
+  const nsIntSize        mSize;
+  Maybe<SVGImageContext> mSVGContext;
+  const float            mFrame;
+  const uint32_t         mFlags;
+};
+
+class DrawSingleTileCallback : public gfxDrawingCallback
+{
+public:
+  DrawSingleTileCallback(ClippedImage* aImage,
+                         const nsIntSize& aSize,
+                         const Maybe<SVGImageContext>& aSVGContext,
+                         uint32_t aWhichFrame,
+                         uint32_t aFlags)
+    : mImage(aImage)
+    , mSize(aSize)
+    , mSVGContext(aSVGContext)
+    , mWhichFrame(aWhichFrame)
+    , mFlags(aFlags)
+  {
+    MOZ_ASSERT(mImage, "Must have an image to clip");
+  }
+
+  virtual bool operator()(gfxContext* aContext,
+                          const gfxRect& aFillRect,
+                          const GraphicsFilter& aFilter,
+                          const gfxMatrix& aTransform)
+  {
+    MOZ_ASSERT(aTransform.IsIdentity(),
+               "Caller is probably CreateSamplingRestrictedDrawable, "
+               "which should not happen");
+
+    // Draw the image. |gfxCallbackDrawable| always calls this function with
+    // arguments that guarantee we never tile.
+    mImage->DrawSingleTile(aContext, mSize, ImageRegion::Create(aFillRect),
+                           mWhichFrame, aFilter, mSVGContext, mFlags);
+
+    return true;
+  }
+
+private:
+  nsRefPtr<ClippedImage>        mImage;
+  const nsIntSize               mSize;
+  const Maybe<SVGImageContext>& mSVGContext;
+  const uint32_t                mWhichFrame;
+  const uint32_t                mFlags;
+};
+
+ClippedImage::ClippedImage(Image* aImage,
+                           nsIntRect aClip)
+  : ImageWrapper(aImage)
+  , mClip(aClip)
+{
+  MOZ_ASSERT(aImage != nullptr, "ClippedImage requires an existing Image");
+}
+
+ClippedImage::~ClippedImage()
+{ }
+
+bool
+ClippedImage::ShouldClip()
+{
+  // We need to evaluate the clipping region against the image's width and
+  // height once they're available to determine if it's valid and whether we
+  // actually need to do any work. We may fail if the image's width and height
+  // aren't available yet, in which case we'll try again later.
+  if (mShouldClip.isNothing()) {
+    int32_t width, height;
+    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);
+    } else if (NS_SUCCEEDED(InnerImage()->GetWidth(&width)) && width > 0 &&
+               NS_SUCCEEDED(InnerImage()->GetHeight(&height)) && height > 0) {
+      // Clamp the clipping region to the size of the underlying image.
+      mClip = mClip.Intersect(nsIntRect(0, 0, width, height));
+
+      // 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 (progressTracker &&
+               !(progressTracker->GetProgress() & FLAG_LOAD_COMPLETE)) {
+      // 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 memorizing
+      // anything.
+      return false;
+    } else {
+      // We have a fully loaded image without a clearly defined width and
+      // height. This can happen with SVG images.
+      mShouldClip.emplace(false);
+    }
+  }
+
+  MOZ_ASSERT(mShouldClip.isSome(), "Should have computed a result");
+  return *mShouldClip;
+}
+
+NS_IMPL_ISUPPORTS_INHERITED0(ClippedImage, ImageWrapper)
+
+NS_IMETHODIMP
+ClippedImage::GetWidth(int32_t* aWidth)
+{
+  if (!ShouldClip()) {
+    return InnerImage()->GetWidth(aWidth);
+  }
+
+  *aWidth = mClip.width;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+ClippedImage::GetHeight(int32_t* aHeight)
+{
+  if (!ShouldClip()) {
+    return InnerImage()->GetHeight(aHeight);
+  }
+
+  *aHeight = mClip.height;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+ClippedImage::GetIntrinsicSize(nsSize* aSize)
+{
+  if (!ShouldClip()) {
+    return InnerImage()->GetIntrinsicSize(aSize);
+  }
+
+  *aSize = nsSize(mClip.width, mClip.height);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+ClippedImage::GetIntrinsicRatio(nsSize* aRatio)
+{
+  if (!ShouldClip()) {
+    return InnerImage()->GetIntrinsicRatio(aRatio);
+  }
+
+  *aRatio = nsSize(mClip.width, mClip.height);
+  return NS_OK;
+}
+
+NS_IMETHODIMP_(TemporaryRef<SourceSurface>)
+ClippedImage::GetFrame(uint32_t aWhichFrame,
+                       uint32_t aFlags)
+{
+  return GetFrameInternal(mClip.Size(), Nothing(), aWhichFrame, aFlags);
+}
+
+TemporaryRef<SourceSurface>
+ClippedImage::GetFrameInternal(const nsIntSize& aSize,
+                               const Maybe<SVGImageContext>& aSVGContext,
+                               uint32_t aWhichFrame,
+                               uint32_t aFlags)
+{
+  if (!ShouldClip()) {
+    return InnerImage()->GetFrame(aWhichFrame, aFlags);
+  }
+
+  float frameToDraw = InnerImage()->GetFrameIndex(aWhichFrame);
+  if (!mCachedSurface || !mCachedSurface->Matches(aSize,
+                                                  aSVGContext,
+                                                  frameToDraw,
+                                                  aFlags)) {
+    // Create a surface to draw into.
+    RefPtr<DrawTarget> target = gfxPlatform::GetPlatform()->
+      CreateOffscreenContentDrawTarget(IntSize(aSize.width, aSize.height),
+                                       SurfaceFormat::B8G8R8A8);
+    if (!target) {
+      NS_ERROR("Could not create a DrawTarget");
+      return nullptr;
+    }
+
+    nsRefPtr<gfxContext> ctx = new gfxContext(target);
+
+    // Create our callback.
+    nsRefPtr<gfxDrawingCallback> drawTileCallback =
+      new DrawSingleTileCallback(this, aSize, aSVGContext, aWhichFrame, aFlags);
+    nsRefPtr<gfxDrawable> drawable =
+      new gfxCallbackDrawable(drawTileCallback, aSize);
+
+    // Actually draw. The callback will end up invoking DrawSingleTile.
+    gfxUtils::DrawPixelSnapped(ctx, drawable, aSize,
+                               ImageRegion::Create(aSize),
+                               SurfaceFormat::B8G8R8A8,
+                               GraphicsFilter::FILTER_FAST,
+                               imgIContainer::FLAG_CLAMP);
+
+    // Cache the resulting surface.
+    mCachedSurface = new ClippedImageCachedSurface(target->Snapshot(), aSize,
+                                                   aSVGContext, frameToDraw,
+                                                   aFlags);
+  }
+
+  MOZ_ASSERT(mCachedSurface, "Should have a cached surface now");
+  return mCachedSurface->Surface();
+}
+
+NS_IMETHODIMP_(bool)
+ClippedImage::IsImageContainerAvailable(LayerManager* aManager, uint32_t aFlags)
+{
+  if (!ShouldClip()) {
+    return InnerImage()->IsImageContainerAvailable(aManager, aFlags);
+  }
+  return false;
+}
+
+NS_IMETHODIMP_(already_AddRefed<ImageContainer>)
+ClippedImage::GetImageContainer(LayerManager* aManager, uint32_t aFlags)
+{
+  // XXX(seth): We currently don't have a way of clipping the result of
+  // GetImageContainer. We work around this by always returning null, but if it
+  // ever turns out that ClippedImage is widely used on codepaths that can
+  // actually benefit from GetImageContainer, it would be a good idea to fix
+  // that method for performance reasons.
+
+  if (!ShouldClip()) {
+    return InnerImage()->GetImageContainer(aManager, aFlags);
+  }
+
+  return nullptr;
+}
+
+static bool
+MustCreateSurface(gfxContext* aContext,
+                  const nsIntSize& aSize,
+                  const ImageRegion& aRegion,
+                  const uint32_t aFlags)
+{
+  gfxRect imageRect(0, 0, aSize.width, aSize.height);
+  bool willTile = !imageRect.Contains(aRegion.Rect()) &&
+                  !(aFlags & imgIContainer::FLAG_CLAMP);
+  bool willResample = aContext->CurrentMatrix().HasNonIntegerTranslation() &&
+                      (willTile || !aRegion.RestrictionContains(imageRect));
+  return willTile || willResample;
+}
+
+NS_IMETHODIMP_(DrawResult)
+ClippedImage::Draw(gfxContext* aContext,
+                   const nsIntSize& aSize,
+                   const ImageRegion& aRegion,
+                   uint32_t aWhichFrame,
+                   GraphicsFilter aFilter,
+                   const Maybe<SVGImageContext>& aSVGContext,
+                   uint32_t aFlags)
+{
+  if (!ShouldClip()) {
+    return InnerImage()->Draw(aContext, aSize, aRegion, aWhichFrame,
+                              aFilter, aSVGContext, aFlags);
+  }
+
+  // Check for tiling. If we need to tile then we need to create a
+  // gfxCallbackDrawable to handle drawing for us.
+  if (MustCreateSurface(aContext, aSize, aRegion, aFlags)) {
+    // Create a temporary surface containing a single tile of this image.
+    // GetFrame will call DrawSingleTile internally.
+    RefPtr<SourceSurface> surface =
+      GetFrameInternal(aSize, aSVGContext, aWhichFrame, aFlags);
+    if (!surface) {
+      return DrawResult::TEMPORARY_ERROR;
+    }
+
+    // Create a drawable from that surface.
+    nsRefPtr<gfxSurfaceDrawable> drawable =
+      new gfxSurfaceDrawable(surface, aSize);
+
+    // Draw.
+    gfxUtils::DrawPixelSnapped(aContext, drawable, aSize, aRegion,
+                               SurfaceFormat::B8G8R8A8, aFilter);
+
+    return DrawResult::SUCCESS;
+  }
+
+  return DrawSingleTile(aContext, aSize, aRegion, aWhichFrame,
+                        aFilter, aSVGContext, aFlags);
+}
+
+static SVGImageContext
+UnclipViewport(const SVGImageContext& aOldContext,
+               const pair<nsIntSize, nsIntSize>& aInnerAndClipSize)
+{
+  nsIntSize innerSize(aInnerAndClipSize.first);
+  nsIntSize clipSize(aInnerAndClipSize.second);
+
+  // Map the viewport to the inner image. (Note that we don't take the aSize
+  // parameter of Draw into account, just the clipping region.)
+  CSSIntSize vSize(aOldContext.GetViewportSize());
+  vSize.width = ceil(vSize.width * double(innerSize.width) / clipSize.width);
+  vSize.height =
+    ceil(vSize.height * double(innerSize.height) / clipSize.height);
+
+  return SVGImageContext(vSize,
+                         aOldContext.GetPreserveAspectRatio());
+}
+
+DrawResult
+ClippedImage::DrawSingleTile(gfxContext* aContext,
+                             const nsIntSize& aSize,
+                             const ImageRegion& aRegion,
+                             uint32_t aWhichFrame,
+                             GraphicsFilter aFilter,
+                             const Maybe<SVGImageContext>& aSVGContext,
+                             uint32_t aFlags)
+{
+  MOZ_ASSERT(!MustCreateSurface(aContext, aSize, aRegion, aFlags),
+             "Shouldn't need to create a surface");
+
+  gfxRect clip(mClip.x, mClip.y, mClip.width, mClip.height);
+  nsIntSize size(aSize), innerSize(aSize);
+  if (NS_SUCCEEDED(InnerImage()->GetWidth(&innerSize.width)) &&
+      NS_SUCCEEDED(InnerImage()->GetHeight(&innerSize.height))) {
+    double scaleX = aSize.width / clip.width;
+    double scaleY = aSize.height / clip.height;
+
+    // Map the clip and size to the scale requested by the caller.
+    clip.Scale(scaleX, scaleY);
+    size = innerSize;
+    size.Scale(scaleX, scaleY);
+  } else {
+    MOZ_ASSERT(false,
+               "If ShouldClip() led us to draw then we should never get here");
+  }
+
+  // We restrict our drawing to only the clipping region, and translate so that
+  // the clipping region is placed at the position the caller expects.
+  ImageRegion region(aRegion);
+  region.MoveBy(clip.x, clip.y);
+  region = region.Intersect(clip);
+
+  gfxContextMatrixAutoSaveRestore saveMatrix(aContext);
+  aContext->Multiply(gfxMatrix::Translation(-clip.x, -clip.y));
+
+  return InnerImage()->Draw(aContext, size, region,
+                            aWhichFrame, aFilter,
+                            aSVGContext.map(UnclipViewport,
+                                            make_pair(innerSize, mClip.Size())),
+                            aFlags);
+}
+
+NS_IMETHODIMP
+ClippedImage::RequestDiscard()
+{
+  // We're very aggressive about discarding.
+  mCachedSurface = nullptr;
+
+  return InnerImage()->RequestDiscard();
+}
+
+NS_IMETHODIMP_(Orientation)
+ClippedImage::GetOrientation()
+{
+  // XXX(seth): This should not actually be here; this is just to work around a
+  // what appears to be a bug in MSVC's linker.
+  return InnerImage()->GetOrientation();
+}
+
+nsIntSize
+ClippedImage::OptimalImageSizeForDest(const gfxSize& aDest,
+                                      uint32_t aWhichFrame,
+                                      GraphicsFilter aFilter, uint32_t aFlags)
+{
+  if (!ShouldClip()) {
+    return InnerImage()->OptimalImageSizeForDest(aDest, aWhichFrame, aFilter,
+                                                 aFlags);
+  }
+
+  int32_t imgWidth, imgHeight;
+  if (NS_SUCCEEDED(InnerImage()->GetWidth(&imgWidth)) &&
+      NS_SUCCEEDED(InnerImage()->GetHeight(&imgHeight))) {
+    // To avoid ugly sampling artifacts, ClippedImage needs the image size to
+    // be chosen such that the clipping region lies on pixel boundaries.
+
+    // First, we select a scale that's good for ClippedImage. An integer
+    // multiple of the size of the clipping region is always fine.
+    nsIntSize scale(ceil(aDest.width / mClip.width),
+                    ceil(aDest.height / mClip.height));
+
+    // Determine the size we'd prefer to render the inner image at, and ask the
+    // inner image what size we should actually use.
+    gfxSize desiredSize(imgWidth * scale.width, imgHeight * scale.height);
+    nsIntSize innerDesiredSize =
+      InnerImage()->OptimalImageSizeForDest(desiredSize, aWhichFrame,
+                                            aFilter, aFlags);
+
+    // To get our final result, we take the inner image's desired size and
+    // determine how large the clipped region would be at that scale. (Again, we
+    // ensure an integer multiple of the size of the clipping region.)
+    nsIntSize finalScale(ceil(double(innerDesiredSize.width) / imgWidth),
+                         ceil(double(innerDesiredSize.height) / imgHeight));
+    return mClip.Size() * finalScale;
+  } else {
+    MOZ_ASSERT(false,
+               "If ShouldClip() led us to draw then we should never get here");
+    return InnerImage()->OptimalImageSizeForDest(aDest, aWhichFrame, aFilter,
+                                                 aFlags);
+  }
+}
+
+NS_IMETHODIMP_(nsIntRect)
+ClippedImage::GetImageSpaceInvalidationRect(const nsIntRect& aRect)
+{
+  if (!ShouldClip()) {
+    return InnerImage()->GetImageSpaceInvalidationRect(aRect);
+  }
+
+  nsIntRect rect(InnerImage()->GetImageSpaceInvalidationRect(aRect));
+  rect = rect.Intersect(mClip);
+  rect.MoveBy(-mClip.x, -mClip.y);
+  return rect;
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/ClippedImage.h firefox-trunk-41.0~a1~hg20150524r245419/image/ClippedImage.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/ClippedImage.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/ClippedImage.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,94 @@
+/* -*- 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_image_ClippedImage_h
+#define mozilla_image_ClippedImage_h
+
+#include "ImageWrapper.h"
+#include "mozilla/gfx/2D.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/RefPtr.h"
+
+namespace mozilla {
+namespace image {
+
+class ClippedImageCachedSurface;
+class DrawSingleTileCallback;
+
+/**
+ * An Image wrapper that clips an image against a rectangle. Right now only
+ * absolute coordinates in pixels are supported.
+ *
+ * XXX(seth): There a known (performance, not correctness) issue with
+ * GetImageContainer. See the comments for that method for more information.
+ */
+class ClippedImage : public ImageWrapper
+{
+  typedef gfx::SourceSurface SourceSurface;
+
+public:
+  NS_DECL_ISUPPORTS_INHERITED
+
+  NS_IMETHOD GetWidth(int32_t* aWidth) override;
+  NS_IMETHOD GetHeight(int32_t* aHeight) override;
+  NS_IMETHOD GetIntrinsicSize(nsSize* aSize) override;
+  NS_IMETHOD GetIntrinsicRatio(nsSize* aRatio) override;
+  NS_IMETHOD_(TemporaryRef<SourceSurface>)
+    GetFrame(uint32_t aWhichFrame, uint32_t aFlags) override;
+  NS_IMETHOD_(bool) IsImageContainerAvailable(layers::LayerManager* aManager,
+                                              uint32_t aFlags) override;
+  NS_IMETHOD_(already_AddRefed<layers::ImageContainer>)
+    GetImageContainer(layers::LayerManager* aManager,
+                      uint32_t aFlags) override;
+  NS_IMETHOD_(DrawResult) Draw(gfxContext* aContext,
+                               const nsIntSize& aSize,
+                               const ImageRegion& aRegion,
+                               uint32_t aWhichFrame,
+                               GraphicsFilter aFilter,
+                               const Maybe<SVGImageContext>& aSVGContext,
+                               uint32_t aFlags) override;
+  NS_IMETHOD RequestDiscard() override;
+  NS_IMETHOD_(Orientation) GetOrientation() override;
+  NS_IMETHOD_(nsIntRect) GetImageSpaceInvalidationRect(const nsIntRect& aRect)
+    override;
+  nsIntSize OptimalImageSizeForDest(const gfxSize& aDest,
+                                    uint32_t aWhichFrame,
+                                    GraphicsFilter aFilter,
+                                    uint32_t aFlags) override;
+
+protected:
+  ClippedImage(Image* aImage, nsIntRect aClip);
+
+  virtual ~ClippedImage();
+
+private:
+  TemporaryRef<SourceSurface>
+    GetFrameInternal(const nsIntSize& aSize,
+                     const Maybe<SVGImageContext>& aSVGContext,
+                     uint32_t aWhichFrame,
+                     uint32_t aFlags);
+  bool ShouldClip();
+  DrawResult DrawSingleTile(gfxContext* aContext,
+                            const nsIntSize& aSize,
+                            const ImageRegion& aRegion,
+                            uint32_t aWhichFrame,
+                            GraphicsFilter aFilter,
+                            const Maybe<SVGImageContext>& aSVGContext,
+                            uint32_t aFlags);
+
+  // If we are forced to draw a temporary surface, we cache it here.
+  nsAutoPtr<ClippedImageCachedSurface> mCachedSurface;
+
+  nsIntRect   mClip;              // The region to clip to.
+  Maybe<bool> mShouldClip;        // Memoized ShouldClip() if present.
+
+  friend class DrawSingleTileCallback;
+  friend class ImageOps;
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_ClippedImage_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/DecodePool.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/DecodePool.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/DecodePool.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/DecodePool.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,497 @@
+/* -*- 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 "mozilla/Monitor.h"
+#include "nsAutoPtr.h"
+#include "nsCOMPtr.h"
+#include "nsIObserverService.h"
+#include "nsIThreadPool.h"
+#include "nsThreadManager.h"
+#include "nsThreadUtils.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,
+                       Progress aProgress,
+                       const nsIntRect& aInvalidRect,
+                       uint32_t aFlags)
+  {
+    MOZ_ASSERT(aImage);
+
+    nsCOMPtr<nsIRunnable> worker =
+      new NotifyProgressWorker(aImage, aProgress, aInvalidRect, aFlags);
+    NS_DispatchToMainThread(worker);
+  }
+
+  NS_IMETHOD Run() override
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+    mImage->NotifyProgress(mProgress, mInvalidRect, mFlags);
+    return NS_OK;
+  }
+
+private:
+  NotifyProgressWorker(RasterImage* aImage, Progress aProgress,
+                       const nsIntRect& aInvalidRect, uint32_t aFlags)
+    : mImage(aImage)
+    , mProgress(aProgress)
+    , mInvalidRect(aInvalidRect)
+    , mFlags(aFlags)
+  { }
+
+  nsRefPtr<RasterImage> mImage;
+  const Progress mProgress;
+  const nsIntRect mInvalidRect;
+  const uint32_t mFlags;
+};
+
+class NotifyDecodeCompleteWorker : public nsRunnable
+{
+public:
+  /**
+   * Called by the DecodePool when decoding is complete, so that final cleanup
+   * can be performed.
+   */
+  static void Dispatch(Decoder* aDecoder)
+  {
+    MOZ_ASSERT(aDecoder);
+
+    nsCOMPtr<nsIRunnable> worker = new NotifyDecodeCompleteWorker(aDecoder);
+    NS_DispatchToMainThread(worker);
+  }
+
+  NS_IMETHOD Run() override
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+    mDecoder->Finish();
+    mDecoder->GetImage()->FinalizeDecoder(mDecoder);
+    return NS_OK;
+  }
+
+private:
+  explicit NotifyDecodeCompleteWorker(Decoder* aDecoder)
+    : mDecoder(aDecoder)
+  { }
+
+  nsRefPtr<Decoder> mDecoder;
+};
+
+#ifdef MOZ_NUWA_PROCESS
+
+class RegisterDecodeIOThreadWithNuwaRunnable : public nsRunnable
+{
+public:
+  NS_IMETHOD Run()
+  {
+    NuwaMarkCurrentThread(static_cast<void(*)(void*)>(nullptr), nullptr);
+    return NS_OK;
+  }
+};
+
+#endif // MOZ_NUWA_PROCESS
+
+
+///////////////////////////////////////////////////////////////////////////////
+// DecodePool implementation.
+///////////////////////////////////////////////////////////////////////////////
+
+/* static */ StaticRefPtr<DecodePool> DecodePool::sSingleton;
+
+NS_IMPL_ISUPPORTS(DecodePool, nsIObserver)
+
+struct Work
+{
+  enum class Type {
+    DECODE,
+    SHUTDOWN
+  } mType;
+
+  nsRefPtr<Decoder> mDecoder;
+};
+
+class DecodePoolImpl
+{
+public:
+  MOZ_DECLARE_REFCOUNTED_TYPENAME(DecodePoolImpl)
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(DecodePoolImpl)
+
+  DecodePoolImpl()
+    : mMonitor("DecodePoolImpl")
+    , mShuttingDown(false)
+  { }
+
+  /// Initialize the current thread for use by the decode pool.
+  void InitCurrentThread()
+  {
+    MOZ_ASSERT(!NS_IsMainThread());
+
+    mThreadNaming.SetThreadPoolName(NS_LITERAL_CSTRING("ImgDecoder"));
+
+#ifdef MOZ_NUWA_PROCESS
+    if (IsNuwaProcess()) {
+      NuwaMarkCurrentThread(static_cast<void(*)(void*)>(nullptr), nullptr);
+    }
+#endif // MOZ_NUWA_PROCESS
+  }
+
+  /// Shut down the provided decode pool thread.
+  static void ShutdownThread(nsIThread* aThisThread)
+  {
+    // Threads have to be shut down from another thread, so we'll ask the
+    // main thread to do it for us.
+    nsCOMPtr<nsIRunnable> runnable =
+      NS_NewRunnableMethod(aThisThread, &nsIThread::Shutdown);
+    NS_DispatchToMainThread(runnable);
+  }
+
+  /**
+   * Requests shutdown. New work items will be dropped on the floor, and all
+   * decode pool threads will be shut down once existing work items have been
+   * processed.
+   */
+  void RequestShutdown()
+  {
+    MonitorAutoLock lock(mMonitor);
+    mShuttingDown = true;
+    mMonitor.NotifyAll();
+  }
+
+  /// Pushes a new decode work item.
+  void PushWork(Decoder* aDecoder)
+  {
+    MOZ_ASSERT(aDecoder);
+    nsRefPtr<Decoder> decoder(aDecoder);
+
+    MonitorAutoLock lock(mMonitor);
+
+    if (mShuttingDown) {
+      // Drop any new work on the floor if we're shutting down.
+      return;
+    }
+
+    if (aDecoder->IsSizeDecode()) {
+      mSizeDecodeQueue.AppendElement(Move(decoder));
+    } else {
+      mFullDecodeQueue.AppendElement(Move(decoder));
+    }
+
+    mMonitor.Notify();
+  }
+
+  /// Pops a new work item, blocking if necessary.
+  Work PopWork()
+  {
+    MonitorAutoLock lock(mMonitor);
+
+    do {
+      // XXX(seth): The queue popping code below is NOT efficient, obviously,
+      // since we're removing an element from the front of the array. However,
+      // it's not worth implementing something better right now, because we are
+      // replacing this FIFO behavior with LIFO behavior very soon.
+
+      // Prioritize size decodes over full decodes.
+      if (!mSizeDecodeQueue.IsEmpty()) {
+        return PopWorkFromQueue(mSizeDecodeQueue);
+      }
+
+      if (!mFullDecodeQueue.IsEmpty()) {
+        return PopWorkFromQueue(mFullDecodeQueue);
+      }
+
+      if (mShuttingDown) {
+        Work work;
+        work.mType = Work::Type::SHUTDOWN;
+        return work;
+      }
+
+      // Nothing to do; block until some work is available.
+      mMonitor.Wait();
+    } while (true);
+  }
+
+private:
+  ~DecodePoolImpl() { }
+
+  Work PopWorkFromQueue(nsTArray<nsRefPtr<Decoder>>& aQueue)
+  {
+    Work work;
+    work.mType = Work::Type::DECODE;
+    work.mDecoder = aQueue.ElementAt(0);
+    aQueue.RemoveElementAt(0);
+
+    return work;
+  }
+
+  nsThreadPoolNaming mThreadNaming;
+
+  // mMonitor guards mQueue and mShuttingDown.
+  Monitor mMonitor;
+  nsTArray<nsRefPtr<Decoder>> mSizeDecodeQueue;
+  nsTArray<nsRefPtr<Decoder>> mFullDecodeQueue;
+  bool mShuttingDown;
+};
+
+class DecodePoolWorker : public nsRunnable
+{
+public:
+  explicit DecodePoolWorker(DecodePoolImpl* aImpl) : mImpl(aImpl) { }
+
+  NS_IMETHOD Run()
+  {
+    MOZ_ASSERT(!NS_IsMainThread());
+
+    mImpl->InitCurrentThread();
+
+    nsCOMPtr<nsIThread> thisThread;
+    nsThreadManager::get()->GetCurrentThread(getter_AddRefs(thisThread));
+
+    do {
+      Work work = mImpl->PopWork();
+      switch (work.mType) {
+        case Work::Type::DECODE:
+          DecodePool::Singleton()->Decode(work.mDecoder);
+          break;
+
+        case Work::Type::SHUTDOWN:
+          DecodePoolImpl::ShutdownThread(thisThread);
+          return NS_OK;
+
+        default:
+          MOZ_ASSERT_UNREACHABLE("Unknown work type");
+      }
+    } while (true);
+
+    MOZ_ASSERT_UNREACHABLE("Exiting thread without Work::Type::SHUTDOWN");
+    return NS_OK;
+  }
+
+private:
+  nsRefPtr<DecodePoolImpl> mImpl;
+};
+
+/* static */ void
+DecodePool::Initialize()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  DecodePool::Singleton();
+}
+
+/* static */ DecodePool*
+DecodePool::Singleton()
+{
+  if (!sSingleton) {
+    MOZ_ASSERT(NS_IsMainThread());
+    sSingleton = new DecodePool();
+    ClearOnShutdown(&sSingleton);
+  }
+
+  return sSingleton;
+}
+
+DecodePool::DecodePool()
+  : mImpl(new DecodePoolImpl)
+  , mMutex("image::DecodePool")
+{
+  // Determine the number of threads we want.
+  int32_t prefLimit = gfxPrefs::ImageMTDecodingLimit();
+  uint32_t limit;
+  if (prefLimit <= 0) {
+    int32_t numCores = PR_GetNumberOfProcessors();
+    if (numCores <= 1) {
+      limit = 1;
+    } else if (numCores == 2) {
+      // On an otherwise mostly idle system, having two image decoding threads
+      // doubles decoding performance, so it's worth doing on dual-core devices,
+      // even if under load we can't actually get that level of parallelism.
+      limit = 2;
+    } else {
+      limit = numCores - 1;
+    }
+  } else {
+    limit = static_cast<uint32_t>(prefLimit);
+  }
+
+  // Initialize the thread pool.
+  for (uint32_t i = 0 ; i < limit ; ++i) {
+    nsCOMPtr<nsIRunnable> worker = new DecodePoolWorker(mImpl);
+    nsCOMPtr<nsIThread> thread;
+    nsresult rv = NS_NewThread(getter_AddRefs(thread), worker);
+    MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv) && thread,
+                       "Should successfully create image decoding threads");
+    mThreads.AppendElement(Move(thread));
+  }
+
+  // Initialize the I/O thread.
+  nsresult rv = NS_NewNamedThread("ImageIO", getter_AddRefs(mIOThread));
+  MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv) && mIOThread,
+                     "Should successfully create image I/O thread");
+
+#ifdef MOZ_NUWA_PROCESS
+  nsCOMPtr<nsIRunnable> worker = new RegisterDecodeIOThreadWithNuwaRunnable();
+  rv = mIOThread->Dispatch(worker, NS_DISPATCH_NORMAL);
+  MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv),
+                     "Should register decode IO thread with Nuwa process");
+#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");
+
+  nsCOMArray<nsIThread> threads;
+  nsCOMPtr<nsIThread> ioThread;
+
+  {
+    MutexAutoLock lock(mMutex);
+    threads.AppendElements(mThreads);
+    mThreads.Clear();
+    ioThread.swap(mIOThread);
+  }
+
+  mImpl->RequestShutdown();
+
+  for (int32_t i = 0 ; i < threads.Count() ; ++i) {
+    threads[i]->Shutdown();
+  }
+
+  if (ioThread) {
+    ioThread->Shutdown();
+  }
+
+  return NS_OK;
+}
+
+void
+DecodePool::AsyncDecode(Decoder* aDecoder)
+{
+  MOZ_ASSERT(aDecoder);
+  mImpl->PushWork(aDecoder);
+}
+
+void
+DecodePool::SyncDecodeIfSmall(Decoder* aDecoder)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(aDecoder);
+
+  if (aDecoder->ShouldSyncDecode(gfxPrefs::ImageMemDecodeBytesAtATime())) {
+    Decode(aDecoder);
+    return;
+  }
+
+  AsyncDecode(aDecoder);
+}
+
+void
+DecodePool::SyncDecodeIfPossible(Decoder* aDecoder)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  Decode(aDecoder);
+}
+
+already_AddRefed<nsIEventTarget>
+DecodePool::GetIOEventTarget()
+{
+  MutexAutoLock threadPoolLock(mMutex);
+  nsCOMPtr<nsIEventTarget> target = do_QueryInterface(mIOThread);
+  return target.forget();
+}
+
+void
+DecodePool::Decode(Decoder* aDecoder)
+{
+  MOZ_ASSERT(aDecoder);
+
+  nsresult rv = aDecoder->Decode();
+
+  if (NS_SUCCEEDED(rv) && !aDecoder->GetDecodeDone()) {
+    if (aDecoder->HasProgress()) {
+      NotifyProgress(aDecoder);
+    }
+    // The decoder will ensure that a new worker gets enqueued to continue
+    // decoding when more data is available.
+  } else {
+    NotifyDecodeComplete(aDecoder);
+  }
+}
+
+void
+DecodePool::NotifyProgress(Decoder* aDecoder)
+{
+  MOZ_ASSERT(aDecoder);
+
+  if (!NS_IsMainThread() ||
+      (aDecoder->GetFlags() & imgIContainer::FLAG_ASYNC_NOTIFY)) {
+    NotifyProgressWorker::Dispatch(aDecoder->GetImage(),
+                                   aDecoder->TakeProgress(),
+                                   aDecoder->TakeInvalidRect(),
+                                   aDecoder->GetDecodeFlags());
+    return;
+  }
+
+  aDecoder->GetImage()->NotifyProgress(aDecoder->TakeProgress(),
+                                       aDecoder->TakeInvalidRect(),
+                                       aDecoder->GetDecodeFlags());
+}
+
+void
+DecodePool::NotifyDecodeComplete(Decoder* aDecoder)
+{
+  MOZ_ASSERT(aDecoder);
+
+  if (!NS_IsMainThread() ||
+      (aDecoder->GetFlags() & imgIContainer::FLAG_ASYNC_NOTIFY)) {
+    NotifyDecodeCompleteWorker::Dispatch(aDecoder);
+    return;
+  }
+
+  aDecoder->Finish();
+  aDecoder->GetImage()->FinalizeDecoder(aDecoder);
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/DecodePool.h firefox-trunk-41.0~a1~hg20150524r245419/image/DecodePool.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/DecodePool.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/DecodePool.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,101 @@
+/* -*- 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_image_DecodePool_h
+#define mozilla_image_DecodePool_h
+
+#include "mozilla/Mutex.h"
+#include "mozilla/StaticPtr.h"
+#include "nsCOMArray.h"
+#include "nsCOMPtr.h"
+#include "nsIEventTarget.h"
+#include "nsIObserver.h"
+#include "nsRefPtr.h"
+
+class nsIThread;
+class nsIThreadPool;
+
+namespace mozilla {
+namespace image {
+
+class Decoder;
+class DecodePoolImpl;
+
+/**
+ * DecodePool is a singleton class that manages decoding of raster images. It
+ * owns a pool of image decoding threads that are used for asynchronous
+ * decoding.
+ *
+ * DecodePool allows callers to run a decoder, handling management of the
+ * decoder's lifecycle and whether it executes on the main thread,
+ * off-main-thread in the image decoding thread pool, or on some combination of
+ * the two.
+ */
+class DecodePool : public nsIObserver
+{
+public:
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_NSIOBSERVER
+
+  /// Initializes the singleton instance. Should be called from the main thread.
+  static void Initialize();
+
+  /// Returns the singleton instance.
+  static DecodePool* Singleton();
+
+  /// Ask the DecodePool to run @aDecoder asynchronously and return immediately.
+  void AsyncDecode(Decoder* aDecoder);
+
+  /**
+   * Run @aDecoder synchronously if the image it's decoding is small. If the
+   * image is too large, or if the source data isn't complete yet, run @aDecoder
+   * asynchronously instead.
+   */
+  void SyncDecodeIfSmall(Decoder* aDecoder);
+
+  /**
+   * Run aDecoder synchronously if at all possible. If it can't complete
+   * synchronously because the source data isn't complete, asynchronously decode
+   * the rest.
+   */
+  void SyncDecodeIfPossible(Decoder* aDecoder);
+
+  /**
+   * Returns an event target interface to the DecodePool's I/O thread. Callers
+   * who want to deliver data to workers on the DecodePool can use this event
+   * target.
+   *
+   * @return An nsIEventTarget interface to the thread pool's I/O thread.
+   */
+  already_AddRefed<nsIEventTarget> GetIOEventTarget();
+
+private:
+  friend class DecodePoolWorker;
+
+  DecodePool();
+  virtual ~DecodePool();
+
+  void Decode(Decoder* aDecoder);
+  void NotifyDecodeComplete(Decoder* aDecoder);
+  void NotifyProgress(Decoder* aDecoder);
+
+  static StaticRefPtr<DecodePool> sSingleton;
+
+  nsRefPtr<DecodePoolImpl>    mImpl;
+
+  // mMutex protects mThreads and mIOThread.
+  Mutex                     mMutex;
+  nsCOMArray<nsIThread>     mThreads;
+  nsCOMPtr<nsIThread>       mIOThread;
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_DecodePool_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/Decoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/Decoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/Decoder.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/Decoder.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,719 @@
+
+/* -*- 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 "Decoder.h"
+
+#include "mozilla/gfx/2D.h"
+#include "DecodePool.h"
+#include "GeckoProfiler.h"
+#include "imgIContainer.h"
+#include "nsIConsoleService.h"
+#include "nsIScriptError.h"
+#include "nsProxyRelease.h"
+#include "nsServiceManagerUtils.h"
+#include "nsComponentManagerUtils.h"
+#include "mozilla/Telemetry.h"
+
+using mozilla::gfx::IntSize;
+using mozilla::gfx::SurfaceFormat;
+
+namespace mozilla {
+namespace image {
+
+Decoder::Decoder(RasterImage* aImage)
+  : mImage(aImage)
+  , mProgress(NoProgress)
+  , mImageData(nullptr)
+  , mColormap(nullptr)
+  , mChunkCount(0)
+  , mFlags(0)
+  , mBytesDecoded(0)
+  , mSendPartialInvalidations(false)
+  , mDataDone(false)
+  , mDecodeDone(false)
+  , mDataError(false)
+  , mDecodeAborted(false)
+  , mShouldReportError(false)
+  , mImageIsTransient(false)
+  , mImageIsLocked(false)
+  , 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;
+
+  if (!NS_IsMainThread()) {
+    // Dispatch mImage to main thread to prevent it from being destructed by the
+    // 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");
+    }
+  }
+}
+
+/*
+ * Common implementation of the decoder interface.
+ */
+
+void
+Decoder::Init()
+{
+  // No re-initializing
+  MOZ_ASSERT(!mInitialized, "Can't re-initialize a decoder!");
+
+  // Fire OnStartDecode at init time to support bug 512435.
+  if (!IsSizeDecode()) {
+      mProgress |= FLAG_DECODE_STARTED | FLAG_ONLOAD_BLOCKED;
+  }
+
+  // Implementation-specific initialization
+  InitInternal();
+
+  mInitialized = true;
+}
+
+// Initializes a decoder whose image and observer is already being used by a
+// parent decoder
+void
+Decoder::InitSharedDecoder(uint8_t* aImageData, uint32_t aImageDataLength,
+                           uint32_t* aColormap, uint32_t aColormapSize,
+                           RawAccessFrameRef&& aFrameRef)
+{
+  // No re-initializing
+  MOZ_ASSERT(!mInitialized, "Can't re-initialize a decoder!");
+
+  mImageData = aImageData;
+  mImageDataLength = aImageDataLength;
+  mColormap = aColormap;
+  mColormapSize = aColormapSize;
+  mCurrentFrame = Move(aFrameRef);
+
+  // We have all the frame data, so we've started the frame.
+  if (!IsSizeDecode()) {
+    mFrameCount++;
+    PostFrameStart();
+  }
+
+  // Implementation-specific initialization
+  InitInternal();
+  mInitialized = true;
+}
+
+nsresult
+Decoder::Decode()
+{
+  MOZ_ASSERT(mInitialized, "Should be initialized here");
+  MOZ_ASSERT(mIterator, "Should have a SourceBufferIterator");
+
+  // We keep decoding chunks until the decode completes or there are no more
+  // chunks available.
+  while (!GetDecodeDone() && !HasError()) {
+    auto newState = mIterator->AdvanceOrScheduleResume(this);
+
+    if (newState == SourceBufferIterator::WAITING) {
+      // We can't continue because the rest of the data hasn't arrived from the
+      // network yet. We don't have to do anything special; the
+      // SourceBufferIterator will ensure that Decode() gets called again on a
+      // DecodePool thread when more data is available.
+      return NS_OK;
+    }
+
+    if (newState == SourceBufferIterator::COMPLETE) {
+      mDataDone = true;
+
+      nsresult finalStatus = mIterator->CompletionStatus();
+      if (NS_FAILED(finalStatus)) {
+        PostDataError();
+      }
+
+      CompleteDecode();
+      return finalStatus;
+    }
+
+    MOZ_ASSERT(newState == SourceBufferIterator::READY);
+
+    Write(mIterator->Data(), mIterator->Length());
+  }
+
+  CompleteDecode();
+  return HasError() ? NS_ERROR_FAILURE : NS_OK;
+}
+
+void
+Decoder::Resume()
+{
+  DecodePool* decodePool = DecodePool::Singleton();
+  MOZ_ASSERT(decodePool);
+  decodePool->AsyncDecode(this);
+}
+
+bool
+Decoder::ShouldSyncDecode(size_t aByteLimit)
+{
+  MOZ_ASSERT(aByteLimit > 0);
+  MOZ_ASSERT(mIterator, "Should have a SourceBufferIterator");
+
+  return mIterator->RemainingBytesIsNoMoreThan(aByteLimit);
+}
+
+void
+Decoder::Write(const char* aBuffer, uint32_t aCount)
+{
+  PROFILER_LABEL("ImageDecoder", "Write",
+    js::ProfileEntry::Category::GRAPHICS);
+
+  // 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 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;
+  }
+
+  if (IsSizeDecode() && HasSize()) {
+    // More data came in since we found the size. We have nothing to do here.
+    return;
+  }
+
+  MOZ_ASSERT(!NeedsNewFrame() || HasDataError(),
+             "Should not need a new frame before writing anything");
+  MOZ_ASSERT(!NeedsToFlushData() || HasDataError(),
+             "Should not need to flush data before writing anything");
+
+  // Pass the data along to the implementation.
+  WriteInternal(aBuffer, aCount);
+
+  // If we need a new frame to proceed, let's create one and call it again.
+  while (NeedsNewFrame() && !HasDataError()) {
+    MOZ_ASSERT(!IsSizeDecode(), "Shouldn't need new frame for size decode");
+
+    nsresult rv = AllocateFrame();
+
+    if (NS_SUCCEEDED(rv)) {
+      // Use the data we saved when we asked for a new frame.
+      WriteInternal(nullptr, 0);
+    }
+
+    mNeedsToFlushData = false;
+  }
+
+  // Finish telemetry.
+  mDecodeTime += (TimeStamp::Now() - start);
+}
+
+void
+Decoder::CompleteDecode()
+{
+  // Implementation-specific finalization
+  if (!HasError()) {
+    FinishInternal();
+  }
+
+  // If the implementation left us mid-frame, finish that up.
+  if (mInFrame && !HasError()) {
+    PostFrameStop();
+  }
+
+  // If PostDecodeDone() has not been called, and this decoder wasn't aborted
+  // early because of low-memory conditions or losing a race with another
+  // decoder, we need to send teardown notifications (and report an error to the
+  // console later).
+  if (!IsSizeDecode() && !mDecodeDone && !WasAborted()) {
+    mShouldReportError = true;
+
+    // If we only have a data error, we're usable if we have at least one
+    // complete frame.
+    if (!HasDecoderError() && GetCompleteFrameCount() > 0) {
+      // We're usable, so do exactly what we should have when the decoder
+      // completed.
+
+      // Not writing to the entire frame may have left us transparent.
+      PostHasTransparency();
+
+      if (mInFrame) {
+        PostFrameStop();
+      }
+      PostDecodeDone();
+    } else {
+      // We're not usable. Record some final progress indicating the error.
+      if (!IsSizeDecode()) {
+        mProgress |= FLAG_DECODE_COMPLETE | FLAG_ONLOAD_UNBLOCKED;
+      }
+      mProgress |= FLAG_HAS_ERROR;
+    }
+  }
+}
+
+void
+Decoder::Finish()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  MOZ_ASSERT(HasError() || !mInFrame, "Finishing while we're still in a frame");
+
+  // If we detected an error in CompleteDecode(), log it to the error console.
+  if (mShouldReportError && !WasAborted()) {
+    nsCOMPtr<nsIConsoleService> consoleService =
+      do_GetService(NS_CONSOLESERVICE_CONTRACTID);
+    nsCOMPtr<nsIScriptError> errorObject =
+      do_CreateInstance(NS_SCRIPTERROR_CONTRACTID);
+
+    if (consoleService && errorObject && !HasDecoderError()) {
+      nsAutoString msg(NS_LITERAL_STRING("Image corrupt or truncated."));
+      nsAutoString src;
+      if (mImage->GetURI()) {
+        nsCString uri;
+        if (mImage->GetURI()->GetSpecTruncatedTo1k(uri) == ImageURL::TruncatedTo1k) {
+          msg += NS_LITERAL_STRING(" URI in this note truncated due to length.");
+        }
+        src = NS_ConvertUTF8toUTF16(uri);
+      }
+      if (NS_SUCCEEDED(errorObject->InitWithWindowID(
+                         msg,
+                         src,
+                         EmptyString(), 0, 0, nsIScriptError::errorFlag,
+                         "Image", mImage->InnerWindowID()
+                       ))) {
+        consoleService->LogMessage(errorObject);
+      }
+    }
+  }
+
+  // Set image metadata before calling DecodingComplete, because
+  // DecodingComplete calls Optimize().
+  mImageMetadata.SetOnImage(mImage);
+
+  if (HasSize()) {
+    SetSizeOnImage();
+  }
+
+  if (mDecodeDone && !IsSizeDecode()) {
+    MOZ_ASSERT(HasError() || mCurrentFrame, "Should have an error or a frame");
+
+    // If this image wasn't animated and isn't a transient image, mark its frame
+    // as optimizable. We don't support optimizing animated images and
+    // optimizing transient images isn't worth it.
+    if (!mIsAnimated && !mImageIsTransient && mCurrentFrame) {
+      mCurrentFrame->SetOptimizable();
+    }
+
+    mImage->OnDecodingComplete();
+  }
+}
+
+void
+Decoder::FinishSharedDecoder()
+{
+  if (!HasError()) {
+    FinishInternal();
+  }
+}
+
+nsresult
+Decoder::AllocateFrame(const nsIntSize& aTargetSize /* = nsIntSize() */)
+{
+  MOZ_ASSERT(mNeedsNewFrame);
+
+  nsIntSize targetSize = aTargetSize;
+  if (targetSize == nsIntSize()) {
+    MOZ_ASSERT(HasSize());
+    targetSize = mImageMetadata.GetSize();
+  }
+
+  mCurrentFrame = EnsureFrame(mNewFrameData.mFrameNum,
+                              targetSize,
+                              mNewFrameData.mFrameRect,
+                              GetDecodeFlags(),
+                              mNewFrameData.mFormat,
+                              mNewFrameData.mPaletteDepth,
+                              mCurrentFrame.get());
+
+  if (mCurrentFrame) {
+    // Gather the raw pointers the decoders will use.
+    mCurrentFrame->GetImageData(&mImageData, &mImageDataLength);
+    mCurrentFrame->GetPaletteData(&mColormap, &mColormapSize);
+
+    if (mNewFrameData.mFrameNum + 1 == mFrameCount) {
+      PostFrameStart();
+    }
+  } else {
+    PostDataError();
+  }
+
+  // Mark ourselves as not needing another frame before talking to anyone else
+  // 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 mCurrentFrame ? NS_OK : NS_ERROR_FAILURE;
+}
+
+RawAccessFrameRef
+Decoder::EnsureFrame(uint32_t aFrameNum,
+                     const nsIntSize& aTargetSize,
+                     const nsIntRect& aFrameRect,
+                     uint32_t aDecodeFlags,
+                     SurfaceFormat aFormat,
+                     uint8_t aPaletteDepth,
+                     imgFrame* aPreviousFrame)
+{
+  if (mDataError || NS_FAILED(mFailCode)) {
+    return RawAccessFrameRef();
+  }
+
+  MOZ_ASSERT(aFrameNum <= mFrameCount, "Invalid frame index!");
+  if (aFrameNum > mFrameCount) {
+    return RawAccessFrameRef();
+  }
+
+  // Adding a frame that doesn't already exist. This is the normal case.
+  if (aFrameNum == mFrameCount) {
+    return InternalAddFrame(aFrameNum, aTargetSize, aFrameRect, aDecodeFlags,
+                            aFormat, aPaletteDepth, aPreviousFrame);
+  }
+
+  // We're replacing a frame. It must be the first frame; there's no reason to
+  // ever replace any other frame, since the first frame is the only one we
+  // speculatively allocate without knowing what the decoder really needs.
+  // XXX(seth): I'm not convinced there's any reason to support this at all. We
+  // should figure out how to avoid triggering this and rip it out.
+  MOZ_ASSERT(aFrameNum == 0, "Replacing a frame other than the first?");
+  MOZ_ASSERT(mFrameCount == 1, "Should have only one frame");
+  MOZ_ASSERT(aPreviousFrame, "Need the previous frame to replace");
+  if (aFrameNum != 0 || !aPreviousFrame || mFrameCount != 1) {
+    return RawAccessFrameRef();
+  }
+
+  MOZ_ASSERT(!aPreviousFrame->GetRect().IsEqualEdges(aFrameRect) ||
+             aPreviousFrame->GetFormat() != aFormat ||
+             aPreviousFrame->GetPaletteDepth() != aPaletteDepth,
+             "Replacing first frame with the same kind of frame?");
+
+  // Reset our state.
+  mInFrame = false;
+  RawAccessFrameRef ref = Move(mCurrentFrame);
+
+  MOZ_ASSERT(ref, "No ref to current frame?");
+
+  // Reinitialize the old frame.
+  nsIntSize oldSize = aPreviousFrame->GetImageSize();
+  bool nonPremult =
+    aDecodeFlags & imgIContainer::FLAG_DECODE_NO_PREMULTIPLY_ALPHA;
+  if (NS_FAILED(aPreviousFrame->ReinitForDecoder(oldSize, aFrameRect, aFormat,
+                                                 aPaletteDepth, nonPremult))) {
+    NS_WARNING("imgFrame::ReinitForDecoder should succeed");
+    mFrameCount = 0;
+    aPreviousFrame->Abort();
+    return RawAccessFrameRef();
+  }
+
+  return ref;
+}
+
+RawAccessFrameRef
+Decoder::InternalAddFrame(uint32_t aFrameNum,
+                          const nsIntSize& aTargetSize,
+                          const nsIntRect& aFrameRect,
+                          uint32_t aDecodeFlags,
+                          SurfaceFormat aFormat,
+                          uint8_t aPaletteDepth,
+                          imgFrame* aPreviousFrame)
+{
+  MOZ_ASSERT(aFrameNum <= mFrameCount, "Invalid frame index!");
+  if (aFrameNum > mFrameCount) {
+    return RawAccessFrameRef();
+  }
+
+  if (aTargetSize.width <= 0 || aTargetSize.height <= 0 ||
+      aFrameRect.width <= 0 || aFrameRect.height <= 0) {
+    NS_WARNING("Trying to add frame with zero or negative size");
+    return RawAccessFrameRef();
+  }
+
+  const uint32_t bytesPerPixel = aPaletteDepth == 0 ? 4 : 1;
+  if (!SurfaceCache::CanHold(aFrameRect.Size(), bytesPerPixel)) {
+    NS_WARNING("Trying to add frame that's too large for the SurfaceCache");
+    return RawAccessFrameRef();
+  }
+
+  nsRefPtr<imgFrame> frame = new imgFrame();
+  bool nonPremult =
+    aDecodeFlags & imgIContainer::FLAG_DECODE_NO_PREMULTIPLY_ALPHA;
+  if (NS_FAILED(frame->InitForDecoder(aTargetSize, aFrameRect, aFormat,
+                                      aPaletteDepth, nonPremult))) {
+    NS_WARNING("imgFrame::Init should succeed");
+    return RawAccessFrameRef();
+  }
+
+  RawAccessFrameRef ref = frame->RawAccessRef();
+  if (!ref) {
+    frame->Abort();
+    return RawAccessFrameRef();
+  }
+
+  InsertOutcome outcome =
+    SurfaceCache::Insert(frame, ImageKey(mImage.get()),
+                         RasterSurfaceKey(aTargetSize,
+                                          aDecodeFlags,
+                                          aFrameNum),
+                         Lifetime::Persistent);
+  if (outcome == InsertOutcome::FAILURE) {
+    // We couldn't insert the surface, almost certainly due to low memory. We
+    // treat this as a permanent error to help the system recover; otherwise, we
+    // might just end up attempting to decode this image again immediately.
+    ref->Abort();
+    return RawAccessFrameRef();
+  } else if (outcome == InsertOutcome::FAILURE_ALREADY_PRESENT) {
+    // Another decoder beat us to decoding this frame. We abort this decoder
+    // rather than treat this as a real error.
+    mDecodeAborted = true;
+    ref->Abort();
+    return RawAccessFrameRef();
+  }
+
+  nsIntRect refreshArea;
+
+  if (aFrameNum == 1) {
+    MOZ_ASSERT(aPreviousFrame, "Must provide a previous frame when animated");
+    aPreviousFrame->SetRawAccessOnly();
+
+    // If we dispose of the first frame by clearing it, then the first frame's
+    // refresh area is all of itself.
+    // RESTORE_PREVIOUS is invalid (assumed to be DISPOSE_CLEAR).
+    AnimationData previousFrameData = aPreviousFrame->GetAnimationData();
+    if (previousFrameData.mDisposalMethod == DisposalMethod::CLEAR ||
+        previousFrameData.mDisposalMethod == DisposalMethod::CLEAR_ALL ||
+        previousFrameData.mDisposalMethod == DisposalMethod::RESTORE_PREVIOUS) {
+      refreshArea = previousFrameData.mRect;
+    }
+  }
+
+  if (aFrameNum > 0) {
+    ref->SetRawAccessOnly();
+
+    // Some GIFs are huge but only have a small area that they animate. We only
+    // need to refresh that small area when frame 0 comes around again.
+    refreshArea.UnionRect(refreshArea, frame->GetRect());
+  }
+
+  mFrameCount++;
+  mImage->OnAddedFrame(mFrameCount, refreshArea);
+
+  return ref;
+}
+
+void
+Decoder::SetSizeOnImage()
+{
+  MOZ_ASSERT(mImageMetadata.HasSize(), "Should have size");
+  MOZ_ASSERT(mImageMetadata.HasOrientation(), "Should have orientation");
+
+  nsresult rv = mImage->SetSize(mImageMetadata.GetWidth(),
+                                mImageMetadata.GetHeight(),
+                                mImageMetadata.GetOrientation());
+  if (NS_FAILED(rv)) {
+    PostResizeError();
+  }
+}
+
+/*
+ * Hook stubs. Override these as necessary in decoder implementations.
+ */
+
+void Decoder::InitInternal() { }
+void Decoder::WriteInternal(const char* aBuffer, uint32_t aCount) { }
+void Decoder::FinishInternal() { }
+
+/*
+ * Progress Notifications
+ */
+
+void
+Decoder::PostSize(int32_t aWidth,
+                  int32_t aHeight,
+                  Orientation aOrientation /* = Orientation()*/)
+{
+  // Validate
+  MOZ_ASSERT(aWidth >= 0, "Width can't be negative!");
+  MOZ_ASSERT(aHeight >= 0, "Height can't be negative!");
+
+  // Tell the image
+  mImageMetadata.SetSize(aWidth, aHeight, aOrientation);
+
+  // Record this notification.
+  mProgress |= FLAG_SIZE_AVAILABLE;
+}
+
+void
+Decoder::PostHasTransparency()
+{
+  mProgress |= FLAG_HAS_TRANSPARENCY;
+}
+
+void
+Decoder::PostFrameStart()
+{
+  // We shouldn't already be mid-frame
+  MOZ_ASSERT(!mInFrame, "Starting new frame but not done with old one!");
+
+  // Update our state to reflect the new frame
+  mInFrame = true;
+
+  // If we just became animated, record that fact.
+  if (mFrameCount > 1) {
+    mIsAnimated = true;
+    mProgress |= FLAG_IS_ANIMATED;
+  }
+}
+
+void
+Decoder::PostFrameStop(Opacity aFrameOpacity    /* = Opacity::TRANSPARENT */,
+                       DisposalMethod aDisposalMethod
+                                                /* = DisposalMethod::KEEP */,
+                       int32_t aTimeout         /* = 0 */,
+                       BlendMethod aBlendMethod /* = BlendMethod::OVER */)
+{
+  // We should be mid-frame
+  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;
+
+  mCurrentFrame->Finish(aFrameOpacity, aDisposalMethod, aTimeout, aBlendMethod);
+
+  mProgress |= FLAG_FRAME_COMPLETE | FLAG_ONLOAD_UNBLOCKED;
+
+  // If we're not sending partial invalidations, then we send an invalidation
+  // here when the first frame is complete.
+  if (!mSendPartialInvalidations && !mIsAnimated) {
+    mInvalidRect.UnionRect(mInvalidRect,
+                           gfx::IntRect(gfx::IntPoint(0, 0), GetSize()));
+  }
+}
+
+void
+Decoder::PostInvalidation(const nsIntRect& aRect,
+                          const Maybe<nsIntRect>& aRectAtTargetSize
+                            /* = Nothing() */)
+{
+  // We should be mid-frame
+  MOZ_ASSERT(mInFrame, "Can't invalidate when not mid-frame!");
+  MOZ_ASSERT(mCurrentFrame, "Can't invalidate when not mid-frame!");
+
+  // Record this invalidation, unless we're not sending partial invalidations
+  // or we're past the first frame.
+  if (mSendPartialInvalidations && !mIsAnimated) {
+    mInvalidRect.UnionRect(mInvalidRect, aRect);
+    mCurrentFrame->ImageUpdated(aRectAtTargetSize.valueOr(aRect));
+  }
+}
+
+void
+Decoder::PostDecodeDone(int32_t aLoopCount /* = 0 */)
+{
+  MOZ_ASSERT(!IsSizeDecode(), "Can't be done with decoding with size decode!");
+  MOZ_ASSERT(!mInFrame, "Can't be done decoding if we're mid-frame!");
+  MOZ_ASSERT(!mDecodeDone, "Decode already done!");
+  mDecodeDone = true;
+
+  mImageMetadata.SetLoopCount(aLoopCount);
+
+  mProgress |= FLAG_DECODE_COMPLETE;
+}
+
+void
+Decoder::PostDataError()
+{
+  mDataError = true;
+
+  if (mInFrame && mCurrentFrame) {
+    mCurrentFrame->Abort();
+  }
+}
+
+void
+Decoder::PostDecoderError(nsresult aFailureCode)
+{
+  MOZ_ASSERT(NS_FAILED(aFailureCode), "Not a failure code!");
+
+  mFailCode = aFailureCode;
+
+  // XXXbholley - we should report the image URI here, but imgContainer
+  // needs to know its URI first
+  NS_WARNING("Image decoding error - This is probably a bug!");
+
+  if (mInFrame && mCurrentFrame) {
+    mCurrentFrame->Abort();
+  }
+}
+
+void
+Decoder::NeedNewFrame(uint32_t framenum, uint32_t x_offset, uint32_t y_offset,
+                      uint32_t width, uint32_t height,
+                      gfx::SurfaceFormat format,
+                      uint8_t palette_depth /* = 0 */)
+{
+  // Decoders should never call NeedNewFrame without yielding back to Write().
+  MOZ_ASSERT(!mNeedsNewFrame);
+
+  // We don't want images going back in time or skipping frames.
+  MOZ_ASSERT(framenum == mFrameCount || framenum == (mFrameCount - 1));
+
+  mNewFrameData = NewFrameData(framenum,
+                               nsIntRect(x_offset, y_offset, width, height),
+                               format, palette_depth);
+  mNeedsNewFrame = true;
+}
+
+Telemetry::ID
+Decoder::SpeedHistogram()
+{
+  // Use HistogramCount as an invalid Histogram ID.
+  return Telemetry::HistogramCount;
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/Decoder.h firefox-trunk-41.0~a1~hg20150524r245419/image/Decoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/Decoder.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/Decoder.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,505 @@
+/* -*- 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_image_Decoder_h
+#define mozilla_image_Decoder_h
+
+#include "FrameAnimator.h"
+#include "RasterImage.h"
+#include "mozilla/RefPtr.h"
+#include "DecodePool.h"
+#include "ImageMetadata.h"
+#include "Orientation.h"
+#include "SourceBuffer.h"
+
+namespace mozilla {
+
+namespace Telemetry {
+  enum ID : uint32_t;
+}
+
+namespace image {
+
+class Decoder : public IResumable
+{
+public:
+
+  explicit Decoder(RasterImage* aImage);
+
+  /**
+   * Initialize an image decoder. Decoders may not be re-initialized.
+   */
+  void Init();
+
+  /**
+   * Initializes a decoder whose image and observer is already being used by a
+   * parent decoder. Decoders may not be re-initialized.
+   *
+   * Notifications Sent: TODO
+   */
+  void InitSharedDecoder(uint8_t* aImageData, uint32_t aImageDataLength,
+                         uint32_t* aColormap, uint32_t aColormapSize,
+                         RawAccessFrameRef&& aFrameRef);
+
+  /**
+   * Decodes, reading all data currently available in the SourceBuffer. If more
+   * 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.
+   *
+   * data is needed, Decode() automatically ensures that it will be called again
+   * on a DecodePool thread when the data becomes available.
+   *
+   * Any errors are reported by setting the appropriate state on the decoder.
+   */
+  nsresult Decode();
+
+  /**
+   * Cleans up the decoder's state and notifies our image about success or
+   * failure. May only be called on the main thread.
+   */
+  void Finish();
+
+  /**
+   * Given a maximum number of bytes we're willing to decode, @aByteLimit,
+   * returns true if we should attempt to run this decoder synchronously.
+   */
+  bool ShouldSyncDecode(size_t aByteLimit);
+
+  /**
+   * Informs the shared decoder that all the data has been written.
+   * Should only be used if InitSharedDecoder was useed
+   *
+   * Notifications Sent: TODO
+   */
+  void FinishSharedDecoder();
+
+  /**
+   * Gets the invalidation region accumulated by the decoder so far, and clears
+   * the decoder's invalidation region. This means that each call to
+   * TakeInvalidRect() returns only the invalidation region accumulated since
+   * the last call to TakeInvalidRect().
+   */
+  nsIntRect TakeInvalidRect()
+  {
+    nsIntRect invalidRect = mInvalidRect;
+    mInvalidRect.SetEmpty();
+    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;
+  }
+
+  /**
+   * Returns true if there's any progress to report.
+   */
+  bool HasProgress() const
+  {
+    return mProgress != NoProgress || !mInvalidRect.IsEmpty();
+  }
+
+  // We're not COM-y, so we don't get refcounts by default
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(Decoder, override)
+
+  // Implement IResumable.
+  virtual void Resume() override;
+
+  /*
+   * State.
+   */
+
+  // If we're doing a "size decode", we more or less pass through the image
+  // data, stopping only to scoop out the image dimensions. A size decode
+  // must be enabled by SetSizeDecode() _before_calling Init().
+  bool IsSizeDecode() { return mSizeDecode; }
+  void SetSizeDecode(bool aSizeDecode)
+  {
+    MOZ_ASSERT(!mInitialized, "Shouldn't be initialized yet");
+    mSizeDecode = aSizeDecode;
+  }
+
+  /**
+   * If this decoder supports downscale-during-decode, sets the target size that
+   * this image should be decoded to.
+   *
+   * If this decoder *doesn't* support downscale-during-decode, returns
+   * NS_ERROR_NOT_AVAILABLE. If the provided size is unacceptable, returns
+   * another error.
+   *
+   * Returning NS_OK from this method is a promise that the decoder will decode
+   * the image to the requested target size unless it encounters an error.
+   *
+   * This must be called before Init() is called.
+   */
+  virtual nsresult SetTargetSize(const nsIntSize& aSize)
+  {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+
+  /**
+   * Set whether should send partial invalidations.
+   *
+   * If @aSend is true, we'll send partial invalidations when decoding the first
+   * frame of the image, so image notifications observers will be able to
+   * gradually draw in the image as it downloads.
+   *
+   * If @aSend is false (the default), we'll only send an invalidation when we
+   * complete the first frame.
+   *
+   * This must be called before Init() is called.
+   */
+  void SetSendPartialInvalidations(bool aSend)
+  {
+    MOZ_ASSERT(!mInitialized, "Shouldn't be initialized yet");
+    mSendPartialInvalidations = aSend;
+  }
+
+  /**
+   * Set an iterator to the SourceBuffer which will feed data to this decoder.
+   *
+   * This should be called for almost all decoders; the exceptions are the
+   * contained decoders of an nsICODecoder, which will be fed manually via Write
+   * instead.
+   *
+   * This must be called before Init() is called.
+   */
+  void SetIterator(SourceBufferIterator&& aIterator)
+  {
+    MOZ_ASSERT(!mInitialized, "Shouldn't be initialized yet");
+    mIterator.emplace(Move(aIterator));
+  }
+
+  /**
+   * Set whether this decoder is associated with a transient image. The decoder
+   * may choose to avoid certain optimizations that don't pay off for
+   * short-lived images in this case.
+   */
+  void SetImageIsTransient(bool aIsTransient)
+  {
+    MOZ_ASSERT(!mInitialized, "Shouldn't be initialized yet");
+    mImageIsTransient = aIsTransient;
+  }
+
+  /**
+   * Set whether the image is locked for the lifetime of this decoder. We lock
+   * the image during our initial decode to ensure that we don't evict any
+   * surfaces before we realize that the image is animated.
+   */
+  void SetImageIsLocked()
+  {
+    MOZ_ASSERT(!mInitialized, "Shouldn't be initialized yet");
+    mImageIsLocked = true;
+  }
+
+  bool ImageIsLocked() const { return mImageIsLocked; }
+
+  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; }
+
+  // The number of complete frames we have (ie, not including anything
+  // in-progress).
+  uint32_t GetCompleteFrameCount() {
+    return mInFrame ? mFrameCount - 1 : mFrameCount;
+  }
+
+  // Error tracking
+  bool HasError() const { return HasDataError() || HasDecoderError(); }
+  bool HasDataError() const { return mDataError; }
+  bool HasDecoderError() const { return NS_FAILED(mFailCode); }
+  nsresult GetDecoderError() const { return mFailCode; }
+  void PostResizeError() { PostDataError(); }
+
+  bool GetDecodeDone() const
+  {
+    return mDecodeDone || (mSizeDecode && HasSize()) || HasError() || mDataDone;
+  }
+
+  /**
+   * Returns true if this decoder was aborted.
+   *
+   * This may happen due to a low-memory condition, or because another decoder
+   * was racing with this one to decode the same frames with the same flags and
+   * this decoder lost the race. Either way, this is not a permanent situation
+   * and does not constitute an error, so we don't report any errors when this
+   * happens.
+   */
+  bool WasAborted() const { return mDecodeAborted; }
+
+  enum DecodeStyle {
+      PROGRESSIVE, // produce intermediate frames representing the partial
+                   // state of the image
+      SEQUENTIAL   // decode to final image immediately
+  };
+
+  void SetFlags(uint32_t aFlags) { mFlags = aFlags; }
+  uint32_t GetFlags() const { return mFlags; }
+  uint32_t GetDecodeFlags() const { return DecodeFlags(mFlags); }
+
+  bool HasSize() const { return mImageMetadata.HasSize(); }
+  void SetSizeOnImage();
+
+  void SetSize(const nsIntSize& aSize, const Orientation& aOrientation)
+  {
+    PostSize(aSize.width, aSize.height, aOrientation);
+  }
+
+  nsIntSize GetSize() const
+  {
+    MOZ_ASSERT(HasSize());
+    return mImageMetadata.GetSize();
+  }
+
+  virtual Telemetry::ID SpeedHistogram();
+
+  ImageMetadata& GetImageMetadata() { return mImageMetadata; }
+
+  /**
+   * Returns a weak pointer to the image associated with this decoder.
+   */
+  RasterImage* GetImage() const { MOZ_ASSERT(mImage); return mImage.get(); }
+
+  // Tell the decoder infrastructure to allocate a frame. By default, frame 0
+  // is created as an ARGB frame with no offset and with size width * height.
+  // If decoders need something different, they must ask for it.
+  // This is called by decoders when they need a new frame. These decoders
+  // must then save the data they have been sent but not yet processed and
+  // return from WriteInternal. When the new frame is created, WriteInternal
+  // will be called again with nullptr and 0 as arguments.
+  void NeedNewFrame(uint32_t frameNum, uint32_t x_offset, uint32_t y_offset,
+                    uint32_t width, uint32_t height,
+                    gfx::SurfaceFormat format,
+                    uint8_t palette_depth = 0);
+
+  virtual bool NeedsNewFrame() const { return mNeedsNewFrame; }
+
+  // Try to allocate a frame as described in mNewFrameData and return the
+  // status code from that attempt. Clears mNewFrameData.
+  virtual nsresult AllocateFrame(const nsIntSize& aTargetSize = nsIntSize());
+
+  already_AddRefed<imgFrame> GetCurrentFrame()
+  {
+    nsRefPtr<imgFrame> frame = mCurrentFrame.get();
+    return frame.forget();
+  }
+
+  RawAccessFrameRef GetCurrentFrameRef()
+  {
+    return mCurrentFrame ? mCurrentFrame->RawAccessRef()
+                         : RawAccessFrameRef();
+  }
+
+  /**
+   * Writes data to the decoder. Only public for the benefit of nsICODecoder;
+   * other callers should use Decode().
+   *
+   * @param aBuffer buffer containing the data to be written
+   * @param aCount the number of bytes to write
+   *
+   * Any errors are reported by setting the appropriate state on the decoder.
+   */
+  void Write(const char* aBuffer, uint32_t aCount);
+
+
+protected:
+  virtual ~Decoder();
+
+  /*
+   * Internal hooks. Decoder implementations may override these and
+   * only these methods.
+   */
+  virtual void InitInternal();
+  virtual void WriteInternal(const char* aBuffer, uint32_t aCount);
+  virtual void FinishInternal();
+
+  /*
+   * Progress notifications.
+   */
+
+  // Called by decoders when they determine the size of the image. Informs
+  // the image of its size and sends notifications.
+  void PostSize(int32_t aWidth,
+                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 aFrameOpacity 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();
+
+  // Called by decoders when they end a frame. Informs the image, sends
+  // notifications, and does internal book-keeping.
+  // Specify whether this frame is opaque as an optimization.
+  // For animated images, specify the disposal, blend method and timeout for
+  // this frame.
+  void PostFrameStop(Opacity aFrameOpacity = Opacity::SOME_TRANSPARENCY,
+                     DisposalMethod aDisposalMethod = DisposalMethod::KEEP,
+                     int32_t aTimeout = 0,
+                     BlendMethod aBlendMethod = BlendMethod::OVER);
+
+  /**
+   * Called by the decoders when they have a region to invalidate. We may not
+   * actually pass these invalidations on right away.
+   *
+   * @param aRect The invalidation rect in the coordinate system of the unscaled
+   *              image (that is, the image at its intrinsic size).
+   * @param aRectAtTargetSize If not Nothing(), the invalidation rect in the
+   *                          coordinate system of the scaled image (that is,
+   *                          the image at our target decoding size). This must
+   *                          be supplied if we're downscaling during decode.
+   */
+  void PostInvalidation(const nsIntRect& aRect,
+                        const Maybe<nsIntRect>& aRectAtTargetSize = Nothing());
+
+  // Called by the decoders when they have successfully decoded the image. This
+  // may occur as the result of the decoder getting to the appropriate point in
+  // the stream, or by us calling FinishInternal().
+  //
+  // May not be called mid-frame.
+  //
+  // For animated images, specify the loop count. -1 means loop forever, 0
+  // means a single iteration, stopping on the last frame.
+  void PostDecodeDone(int32_t aLoopCount = 0);
+
+  // Data errors are the fault of the source data, decoder errors are our fault
+  void PostDataError();
+  void PostDecoderError(nsresult aFailCode);
+
+  // 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; }
+
+  /**
+   * CompleteDecode() finishes up the decoding process after Decode() determines
+   * that we're finished. It records final progress and does all the cleanup
+   * that's possible off-main-thread.
+   */
+  void CompleteDecode();
+
+  /**
+   * Ensures that a given frame number exists with the given parameters, and
+   * returns a RawAccessFrameRef for that frame.
+   * It is not possible to create sparse frame arrays; you can only append
+   * frames to the current frame array, or if there is only one frame in the
+   * array, replace that frame.
+   * @aTargetSize specifies the target size we're decoding to. If we're not
+   * downscaling during decode, this will always be the same as the image's
+   * intrinsic size.
+   *
+   * If a non-paletted frame is desired, pass 0 for aPaletteDepth.
+   */
+  RawAccessFrameRef EnsureFrame(uint32_t aFrameNum,
+                                const nsIntSize& aTargetSize,
+                                const nsIntRect& aFrameRect,
+                                uint32_t aDecodeFlags,
+                                gfx::SurfaceFormat aFormat,
+                                uint8_t aPaletteDepth,
+                                imgFrame* aPreviousFrame);
+
+  RawAccessFrameRef InternalAddFrame(uint32_t aFrameNum,
+                                     const nsIntSize& aTargetSize,
+                                     const nsIntRect& aFrameRect,
+                                     uint32_t aDecodeFlags,
+                                     gfx::SurfaceFormat aFormat,
+                                     uint8_t aPaletteDepth,
+                                     imgFrame* aPreviousFrame);
+
+  /*
+   * Member variables.
+   *
+   */
+  nsRefPtr<RasterImage> mImage;
+  Maybe<SourceBufferIterator> mIterator;
+  RawAccessFrameRef mCurrentFrame;
+  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 mFlags;
+  size_t mBytesDecoded;
+  bool mSendPartialInvalidations;
+  bool mDataDone;
+  bool mDecodeDone;
+  bool mDataError;
+  bool mDecodeAborted;
+  bool mShouldReportError;
+  bool mImageIsTransient;
+  bool mImageIsLocked;
+
+private:
+  uint32_t mFrameCount; // Number of frames, including anything in-progress
+
+  nsresult mFailCode;
+
+  struct NewFrameData
+  {
+    NewFrameData() { }
+
+    NewFrameData(uint32_t aFrameNum, const nsIntRect& aFrameRect,
+                 gfx::SurfaceFormat aFormat, uint8_t aPaletteDepth)
+      : mFrameNum(aFrameNum)
+      , mFrameRect(aFrameRect)
+      , mFormat(aFormat)
+      , mPaletteDepth(aPaletteDepth)
+    { }
+
+    uint32_t mFrameNum;
+    nsIntRect mFrameRect;
+    gfx::SurfaceFormat mFormat;
+    uint8_t mPaletteDepth;
+  };
+
+  NewFrameData mNewFrameData;
+  bool mNeedsNewFrame;
+  bool mNeedsToFlushData;
+  bool mInitialized;
+  bool mSizeDecode;
+  bool mInFrame;
+  bool mIsAnimated;
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_Decoder_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/decoders/icon/qt/moz.build firefox-trunk-41.0~a1~hg20150524r245419/image/decoders/icon/qt/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/image/decoders/icon/qt/moz.build	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/decoders/icon/qt/moz.build	2015-05-25 20:42:42.000000000 +0000
@@ -4,7 +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/.
 
-DIRS += ['public']
+XPIDL_SOURCES += [
+    'nsGtkQtIconsConverter.idl',
+]
+
+XPIDL_MODULE = 'gtkqticonsconverter'
 
 SOURCES += [
     'nsIconChannel.cpp',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/decoders/icon/qt/nsGtkQtIconsConverter.idl firefox-trunk-41.0~a1~hg20150524r245419/image/decoders/icon/qt/nsGtkQtIconsConverter.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/image/decoders/icon/qt/nsGtkQtIconsConverter.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/decoders/icon/qt/nsGtkQtIconsConverter.idl	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,12 @@
+/* vim:set ts=2 sw=2 sts=2 cin 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 "nsISupports.idl"
+
+[scriptable, uuid(c0783c34-a831-40c6-8c03-98c9f74cca45)]
+interface nsIGtkQtIconsConverter : nsISupports
+{
+  long convert(in string icon);
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/decoders/icon/qt/public/moz.build firefox-trunk-41.0~a1~hg20150524r245419/image/decoders/icon/qt/public/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/image/decoders/icon/qt/public/moz.build	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/decoders/icon/qt/public/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPIDL_SOURCES += [
-    'nsGtkQtIconsConverter.idl',
-]
-
-XPIDL_MODULE = 'gtkqticonsconverter'
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/decoders/icon/qt/public/nsGtkQtIconsConverter.idl firefox-trunk-41.0~a1~hg20150524r245419/image/decoders/icon/qt/public/nsGtkQtIconsConverter.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/image/decoders/icon/qt/public/nsGtkQtIconsConverter.idl	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/decoders/icon/qt/public/nsGtkQtIconsConverter.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 cin 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 "nsISupports.idl"
-
-[scriptable, uuid(c0783c34-a831-40c6-8c03-98c9f74cca45)]
-interface nsIGtkQtIconsConverter : nsISupports
-{
-  long convert(in string icon);
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/decoders/moz.build firefox-trunk-41.0~a1~hg20150524r245419/image/decoders/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/image/decoders/moz.build	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/decoders/moz.build	2015-05-25 20:42:42.000000000 +0000
@@ -36,7 +36,7 @@
 
 # Decoders need RasterImage.h
 LOCAL_INCLUDES += [
-    '/image/src',
+    '/image',
 ]
 
 FINAL_LIBRARY = 'xul'
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/decoders/nsBMPDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/decoders/nsBMPDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/decoders/nsBMPDecoder.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/decoders/nsBMPDecoder.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -336,7 +336,7 @@
       mProcessedHeader = true;
 
       ProcessInfoHeader();
-      PR_LOG(GetBMPLog(), PR_LOG_DEBUG,
+      MOZ_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
@@ -405,20 +405,20 @@
       // 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,
+        MOZ_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,
+        MOZ_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,
+        MOZ_LOG(GetBMPLog(), PR_LOG_DEBUG,
                ("BMP ALPHABITFIELDS only supports 16 or 32 bits per pixel\n"
                 ));
         PostDataError();
@@ -690,7 +690,7 @@
       if (((mBIH.compression == BI_RLE8) && (mBIH.bpp != 8)) ||
           ((mBIH.compression == BI_RLE4) && (mBIH.bpp != 4) &&
            (mBIH.bpp != 1))) {
-        PR_LOG(GetBMPLog(), PR_LOG_DEBUG,
+        MOZ_LOG(GetBMPLog(), PR_LOG_DEBUG,
                ("BMP RLE8/RLE4 compression only supports 8/4 bits per"
                " pixel\n"));
         PostDataError();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/decoders/nsGIFDecoder2.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/decoders/nsGIFDecoder2.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/decoders/nsGIFDecoder2.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/decoders/nsGIFDecoder2.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -824,10 +824,15 @@
       mGIFStruct.is_transparent = *q & 0x1;
       mGIFStruct.tpixel = q[3];
       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) {
+        // Some specs say 3rd bit (value 4), other specs say value 3.
+        // Let's choose 3 (the more popular).
         mGIFStruct.disposal_method = 3;
+      } else if (mGIFStruct.disposal_method > 4) {
+        // This GIF is using a disposal method which is undefined in the spec.
+        // Treat it as DisposalMethod::NOT_SPECIFIED.
+        mGIFStruct.disposal_method = 0;
       }
 
       {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/decoders/nsJPEGDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/decoders/nsJPEGDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/decoders/nsJPEGDecoder.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/decoders/nsJPEGDecoder.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -105,7 +105,7 @@
 
   mCMSMode = 0;
 
-  PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
+  MOZ_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
          ("nsJPEGDecoder::nsJPEGDecoder: Creating JPEG decoder %p",
           this));
 }
@@ -124,7 +124,7 @@
     qcms_profile_release(mInProfile);
   }
 
-  PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
+  MOZ_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
          ("nsJPEGDecoder::~nsJPEGDecoder: Destroying JPEG decoder %p",
           this));
 }
@@ -218,7 +218,7 @@
       // 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,
+      MOZ_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
              ("} (setjmp returned NS_ERROR_FAILURE)"));
       return;
     } else {
@@ -227,13 +227,13 @@
       // mozilla is seconds away from falling flat on its face.
       PostDecoderError(error_code);
       mState = JPEG_ERROR;
-      PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
+      MOZ_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
              ("} (setjmp returned an error)"));
       return;
     }
   }
 
-  PR_LOG(GetJPEGLog(), PR_LOG_DEBUG,
+  MOZ_LOG(GetJPEGLog(), PR_LOG_DEBUG,
          ("[this=%p] nsJPEGDecoder::Write -- processing JPEG data\n", this));
 
   switch (mState) {
@@ -243,7 +243,7 @@
 
       // Step 3: read file parameters with jpeg_read_header()
       if (jpeg_read_header(&mInfo, TRUE) == JPEG_SUSPENDED) {
-        PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
+        MOZ_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
                ("} (JPEG_SUSPENDED)"));
         return; // I/O suspension
       }
@@ -309,7 +309,7 @@
         default:
           mState = JPEG_ERROR;
           PostDataError();
-          PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
+          MOZ_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
                  ("} (unknown colorpsace (1))"));
           return;
       }
@@ -326,7 +326,7 @@
           default:
             mState = JPEG_ERROR;
             PostDataError();
-            PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
+            MOZ_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
                    ("} (unknown colorpsace (2))"));
             return;
         }
@@ -385,7 +385,7 @@
         default:
           mState = JPEG_ERROR;
           PostDataError();
-          PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
+          MOZ_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
                  ("} (unknown colorpsace (3))"));
           return;
       }
@@ -399,7 +399,7 @@
     if (!mImageData) {
       mState = JPEG_ERROR;
       PostDecoderError(NS_ERROR_OUT_OF_MEMORY);
-      PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
+      MOZ_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
              ("} (could not initialize image frame)"));
       return;
     }
@@ -414,7 +414,7 @@
       }
     }
 
-    PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
+    MOZ_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
            ("        JPEGDecoderAccounting: nsJPEGDecoder::"
             "Write -- created image frame with %ux%u pixels",
             mInfo.output_width, mInfo.output_height));
@@ -438,7 +438,7 @@
 
     // Step 5: Start decompressor
     if (jpeg_start_decompress(&mInfo) == FALSE) {
-      PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
+      MOZ_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
              ("} (I/O suspension after jpeg_start_decompress())"));
       return; // I/O suspension
     }
@@ -457,7 +457,7 @@
       OutputScanlines(&suspend);
 
       if (suspend) {
-        PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
+        MOZ_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
                ("} (I/O suspension after OutputScanlines() - SEQUENTIAL)"));
         return; // I/O suspension
       }
@@ -493,7 +493,7 @@
             scan--;
 
           if (!jpeg_start_output(&mInfo, scan)) {
-            PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
+            MOZ_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
                    ("} (I/O suspension after jpeg_start_output() -"
                     " PROGRESSIVE)"));
             return; // I/O suspension
@@ -513,14 +513,14 @@
             // jpeg_start_output() multiple times for the same scan
             mInfo.output_scanline = 0xffffff;
           }
-          PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
+          MOZ_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
                  ("} (I/O suspension after OutputScanlines() - PROGRESSIVE)"));
           return; // I/O suspension
         }
 
         if (mInfo.output_scanline == mInfo.output_height) {
           if (!jpeg_finish_output(&mInfo)) {
-            PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
+            MOZ_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
                    ("} (I/O suspension after jpeg_finish_output() -"
                     " PROGRESSIVE)"));
             return; // I/O suspension
@@ -548,7 +548,7 @@
     // Step 7: Finish decompression
 
     if (jpeg_finish_decompress(&mInfo) == FALSE) {
-      PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
+      MOZ_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
              ("} (I/O suspension after jpeg_finish_decompress() - DONE)"));
       return; // I/O suspension
     }
@@ -559,7 +559,7 @@
     break;
   }
   case JPEG_SINK_NON_JPEG_TRAILER:
-    PR_LOG(GetJPEGLog(), PR_LOG_DEBUG,
+    MOZ_LOG(GetJPEGLog(), PR_LOG_DEBUG,
            ("[this=%p] nsJPEGDecoder::ProcessData -- entering"
             " JPEG_SINK_NON_JPEG_TRAILER case\n", this));
 
@@ -571,7 +571,7 @@
                "decoder");
   }
 
-  PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
+  MOZ_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
          ("} (end of function)"));
   return;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/decoders/nsPNGDecoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/decoders/nsPNGDecoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/decoders/nsPNGDecoder.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/decoders/nsPNGDecoder.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -168,7 +168,7 @@
 
   mFrameRect = neededRect;
 
-  PR_LOG(GetPNGDecoderAccountingLog(), PR_LOG_DEBUG,
+  MOZ_LOG(GetPNGDecoderAccountingLog(), PR_LOG_DEBUG,
          ("PNGDecoderAccounting: nsPNGDecoder::CreateFrame -- created "
           "image frame with %dx%d pixels in container %p",
           width, height,
@@ -876,7 +876,7 @@
 void
 nsPNGDecoder::error_callback(png_structp png_ptr, png_const_charp error_msg)
 {
-  PR_LOG(GetPNGLog(), PR_LOG_ERROR, ("libpng error: %s\n", error_msg));
+  MOZ_LOG(GetPNGLog(), PR_LOG_ERROR, ("libpng error: %s\n", error_msg));
   png_longjmp(png_ptr, 1);
 }
 
@@ -884,7 +884,7 @@
 void
 nsPNGDecoder::warning_callback(png_structp png_ptr, png_const_charp warning_msg)
 {
-  PR_LOG(GetPNGLog(), PR_LOG_WARNING, ("libpng warning: %s\n", warning_msg));
+  MOZ_LOG(GetPNGLog(), PR_LOG_WARNING, ("libpng warning: %s\n", warning_msg));
 }
 
 Telemetry::ID
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/Downscaler.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/Downscaler.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/Downscaler.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/Downscaler.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,255 @@
+/* -*- 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 "Downscaler.h"
+
+#include <algorithm>
+#include <ctime>
+#include "gfxPrefs.h"
+#include "image_operations.h"
+#include "convolver.h"
+#include "skia/SkTypes.h"
+
+using std::max;
+using std::swap;
+
+namespace mozilla {
+namespace image {
+
+Downscaler::Downscaler(const nsIntSize& aTargetSize)
+  : mTargetSize(aTargetSize)
+  , mOutputBuffer(nullptr)
+  , mXFilter(MakeUnique<skia::ConvolutionFilter1D>())
+  , mYFilter(MakeUnique<skia::ConvolutionFilter1D>())
+  , mWindowCapacity(0)
+  , mHasAlpha(true)
+{
+  MOZ_ASSERT(gfxPrefs::ImageDownscaleDuringDecodeEnabled(),
+             "Downscaling even though downscale-during-decode is disabled?");
+  MOZ_ASSERT(mTargetSize.width > 0 && mTargetSize.height > 0,
+             "Invalid target size");
+}
+
+Downscaler::~Downscaler()
+{
+  ReleaseWindow();
+}
+
+void
+Downscaler::ReleaseWindow()
+{
+  if (!mWindow) {
+    return;
+  }
+
+  for (int32_t i = 0; i < mWindowCapacity; ++i) {
+    delete[] mWindow[i];
+  }
+
+  mWindow = nullptr;
+  mWindowCapacity = 0;
+}
+
+nsresult
+Downscaler::BeginFrame(const nsIntSize& aOriginalSize,
+                       uint8_t* aOutputBuffer,
+                       bool aHasAlpha)
+{
+  MOZ_ASSERT(aOutputBuffer);
+  MOZ_ASSERT(mTargetSize != aOriginalSize,
+             "Created a downscaler, but not downscaling?");
+  MOZ_ASSERT(mTargetSize.width <= aOriginalSize.width,
+             "Created a downscaler, but width is larger");
+  MOZ_ASSERT(mTargetSize.height <= aOriginalSize.height,
+             "Created a downscaler, but height is larger");
+  MOZ_ASSERT(aOriginalSize.width > 0 && aOriginalSize.height > 0,
+             "Invalid original size");
+
+  mOriginalSize = aOriginalSize;
+  mScale = gfxSize(double(mOriginalSize.width) / mTargetSize.width,
+                   double(mOriginalSize.height) / mTargetSize.height);
+  mOutputBuffer = aOutputBuffer;
+  mHasAlpha = aHasAlpha;
+
+  ResetForNextProgressivePass();
+  ReleaseWindow();
+
+  auto resizeMethod = skia::ImageOperations::RESIZE_LANCZOS3;
+
+  skia::resize::ComputeFilters(resizeMethod,
+                               mOriginalSize.width, mTargetSize.width,
+                               0, mTargetSize.width,
+                               mXFilter.get());
+
+  skia::resize::ComputeFilters(resizeMethod,
+                               mOriginalSize.height, mTargetSize.height,
+                               0, mTargetSize.height,
+                               mYFilter.get());
+
+  // Allocate the buffer, which contains scanlines of the original image.
+  mRowBuffer = MakeUnique<uint8_t[]>(mOriginalSize.width * sizeof(uint32_t));
+  if (MOZ_UNLIKELY(!mRowBuffer)) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
+  // Allocate the window, which contains horizontally downscaled scanlines. (We
+  // can store scanlines which are already downscale because our downscaling
+  // filter is separable.)
+  mWindowCapacity = mYFilter->max_filter();
+  mWindow = MakeUnique<uint8_t*[]>(mWindowCapacity);
+  if (MOZ_UNLIKELY(!mWindow)) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
+  bool anyAllocationFailed = false;
+  const int rowSize = mTargetSize.width * sizeof(uint32_t);
+  for (int32_t i = 0; i < mWindowCapacity; ++i) {
+    mWindow[i] = new uint8_t[rowSize];
+    anyAllocationFailed = anyAllocationFailed || mWindow[i] == nullptr;
+  }
+
+  if (MOZ_UNLIKELY(anyAllocationFailed)) {
+    // We intentionally iterate through the entire array even if an allocation
+    // fails, to ensure that all the pointers in it are either valid or nullptr.
+    // That in turn ensures that ReleaseWindow() can clean up correctly.
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
+  return NS_OK;
+}
+
+void
+Downscaler::ResetForNextProgressivePass()
+{
+  mPrevInvalidatedLine = 0;
+  mCurrentOutLine = 0;
+  mCurrentInLine = 0;
+  mLinesInBuffer = 0;
+}
+
+static void
+GetFilterOffsetAndLength(UniquePtr<skia::ConvolutionFilter1D>& aFilter,
+                         int32_t aOutputImagePosition,
+                         int32_t* aFilterOffsetOut,
+                         int32_t* aFilterLengthOut)
+{
+  MOZ_ASSERT(aOutputImagePosition < aFilter->num_values());
+  aFilter->FilterForValue(aOutputImagePosition,
+                          aFilterOffsetOut,
+                          aFilterLengthOut);
+}
+
+void
+Downscaler::CommitRow()
+{
+  MOZ_ASSERT(mOutputBuffer, "Should have a current frame");
+  MOZ_ASSERT(mCurrentInLine < mOriginalSize.height, "Past end of input");
+  MOZ_ASSERT(mCurrentOutLine < mTargetSize.height, "Past end of output");
+
+  int32_t filterOffset = 0;
+  int32_t filterLength = 0;
+  GetFilterOffsetAndLength(mYFilter, mCurrentOutLine,
+                           &filterOffset, &filterLength);
+
+  int32_t inLineToRead = filterOffset + mLinesInBuffer;
+  MOZ_ASSERT(mCurrentInLine <= inLineToRead, "Reading past end of input");
+  if (mCurrentInLine == inLineToRead) {
+    skia::ConvolveHorizontally(mRowBuffer.get(), *mXFilter,
+                               mWindow[mLinesInBuffer++], mHasAlpha,
+                               /* use_sse2 = */ true);
+  }
+
+  MOZ_ASSERT(mCurrentOutLine < mTargetSize.height,
+             "Writing past end of output");
+
+  while (mLinesInBuffer == filterLength) {
+    DownscaleInputLine();
+
+    if (mCurrentOutLine == mTargetSize.height) {
+      break;  // We're done.
+    }
+
+    GetFilterOffsetAndLength(mYFilter, mCurrentOutLine,
+                             &filterOffset, &filterLength);
+  }
+
+  mCurrentInLine += 1;
+}
+
+bool
+Downscaler::HasInvalidation() const
+{
+  return mCurrentOutLine > mPrevInvalidatedLine;
+}
+
+DownscalerInvalidRect
+Downscaler::TakeInvalidRect()
+{
+  if (MOZ_UNLIKELY(!HasInvalidation())) {
+    return DownscalerInvalidRect();
+  }
+
+  DownscalerInvalidRect invalidRect;
+
+  // Compute the target size invalid rect.
+  invalidRect.mTargetSizeRect =
+    nsIntRect(0, mPrevInvalidatedLine,
+              mTargetSize.width, mCurrentOutLine - mPrevInvalidatedLine);
+  mPrevInvalidatedLine = mCurrentOutLine;
+
+  // Compute the original size invalid rect.
+  invalidRect.mOriginalSizeRect = invalidRect.mTargetSizeRect;
+  invalidRect.mOriginalSizeRect.ScaleRoundOut(mScale.width, mScale.height);
+
+  return invalidRect;
+}
+
+void
+Downscaler::DownscaleInputLine()
+{
+  typedef skia::ConvolutionFilter1D::Fixed FilterValue;
+
+  MOZ_ASSERT(mOutputBuffer);
+  MOZ_ASSERT(mCurrentOutLine < mTargetSize.height,
+             "Writing past end of output");
+
+  int32_t filterOffset = 0;
+  int32_t filterLength = 0;
+  MOZ_ASSERT(mCurrentOutLine < mYFilter->num_values());
+  auto filterValues =
+    mYFilter->FilterForValue(mCurrentOutLine, &filterOffset, &filterLength);
+
+  uint8_t* outputLine =
+    &mOutputBuffer[mCurrentOutLine * mTargetSize.width * sizeof(uint32_t)];
+  skia::ConvolveVertically(static_cast<const FilterValue*>(filterValues),
+                           filterLength, mWindow.get(), mXFilter->num_values(),
+                           outputLine, mHasAlpha, /* use_sse2 = */ true);
+
+  mCurrentOutLine += 1;
+
+  if (mCurrentOutLine == mTargetSize.height) {
+    // We're done.
+    return;
+  }
+
+  int32_t newFilterOffset = 0;
+  int32_t newFilterLength = 0;
+  GetFilterOffsetAndLength(mYFilter, mCurrentOutLine,
+                           &newFilterOffset, &newFilterLength);
+
+  int diff = newFilterOffset - filterOffset;
+  MOZ_ASSERT(diff >= 0, "Moving backwards in the filter?");
+
+  // Shift the buffer. We're just moving pointers here, so this is cheap.
+  mLinesInBuffer -= diff;
+  mLinesInBuffer = max(mLinesInBuffer, 0);
+  for (int32_t i = 0; i < mLinesInBuffer; ++i) {
+    swap(mWindow[i], mWindow[filterLength - mLinesInBuffer + i]);
+  }
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/Downscaler.h firefox-trunk-41.0~a1~hg20150524r245419/image/Downscaler.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/Downscaler.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/Downscaler.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,159 @@
+/* -*- 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/. */
+
+/**
+ * Downscaler is a high-quality, streaming image downscaler based upon Skia's
+ * scaling implementation.
+ */
+
+#ifndef mozilla_image_Downscaler_h
+#define mozilla_image_Downscaler_h
+
+#include "mozilla/UniquePtr.h"
+#include "nsRect.h"
+
+
+namespace skia {
+  class ConvolutionFilter1D;
+} // namespace skia
+
+namespace mozilla {
+namespace image {
+
+/**
+ * DownscalerInvalidRect wraps two invalidation rects: one in terms of the
+ * original image size, and one in terms of the target size.
+ */
+struct DownscalerInvalidRect
+{
+  nsIntRect mOriginalSizeRect;
+  nsIntRect mTargetSizeRect;
+};
+
+#ifdef MOZ_ENABLE_SKIA
+
+/**
+ * Downscaler is a high-quality, streaming image downscaler based upon Skia's
+ * scaling implementation.
+ *
+ * Decoders can construct a Downscaler once they know their target size, then
+ * call BeginFrame() for each frame they decode. They should write a decoded row
+ * into the buffer returned by RowBuffer(), and then call CommitRow() to signal
+ * that they have finished.
+ *
+
+ * Because invalidations need to be computed in terms of the scaled version of
+ * the image, Downscaler also tracks them. Decoders can call HasInvalidation()
+ * and TakeInvalidRect() instead of tracking invalidations themselves.
+ */
+class Downscaler
+{
+public:
+  /// Constructs a new Downscaler which to scale to size @aTargetSize.
+  explicit Downscaler(const nsIntSize& aTargetSize);
+  ~Downscaler();
+
+  const nsIntSize& OriginalSize() const { return mOriginalSize; }
+  const nsIntSize& TargetSize() const { return mTargetSize; }
+  const gfxSize& Scale() const { return mScale; }
+
+  /**
+   * Begins a new frame and reinitializes the Downscaler.
+   *
+   * @param aOriginalSize The original size of this frame, before scaling.
+   * @param aOutputBuffer The buffer to which the Downscaler should write its
+   *                      output; this is the same buffer where the Decoder
+   *                      would write its output when not downscaling during
+   *                      decode.
+   * @param aHasAlpha Whether or not this frame has an alpha channel.
+   *                  Performance is a little better if it doesn't have one.
+   */
+  nsresult BeginFrame(const nsIntSize& aOriginalSize,
+                      uint8_t* aOutputBuffer,
+                      bool aHasAlpha);
+
+  /// Retrieves the buffer into which the Decoder should write each row.
+  uint8_t* RowBuffer() { return mRowBuffer.get(); }
+
+  /// Signals that the decoder has finished writing a row into the row buffer.
+  void CommitRow();
+
+  /// Returns true if there is a non-empty invalid rect available.
+  bool HasInvalidation() const;
+
+  /// Takes the Downscaler's current invalid rect and resets it.
+  DownscalerInvalidRect TakeInvalidRect();
+
+  /**
+   * Resets the Downscaler's position in the image, for a new progressive pass
+   * over the same frame. Because the same data structures can be reused, this
+   * is more efficient than calling BeginFrame.
+   */
+  void ResetForNextProgressivePass();
+
+private:
+  void DownscaleInputLine();
+  void ReleaseWindow();
+
+  nsIntSize mOriginalSize;
+  nsIntSize mTargetSize;
+  gfxSize mScale;
+
+  uint8_t* mOutputBuffer;
+
+  UniquePtr<uint8_t[]> mRowBuffer;
+  UniquePtr<uint8_t*[]> mWindow;
+
+  UniquePtr<skia::ConvolutionFilter1D> mXFilter;
+  UniquePtr<skia::ConvolutionFilter1D> mYFilter;
+
+  int32_t mWindowCapacity;
+
+  int32_t mLinesInBuffer;
+  int32_t mPrevInvalidatedLine;
+  int32_t mCurrentOutLine;
+  int32_t mCurrentInLine;
+
+  bool mHasAlpha;
+};
+
+#else
+
+/**
+ * Downscaler requires Skia to work, so we provide a dummy implementation if
+ * Skia is disabled that asserts if constructed.
+ */
+
+class Downscaler
+{
+public:
+  explicit Downscaler(const nsIntSize&)
+  {
+    MOZ_RELEASE_ASSERT(false, "Skia is not enabled");
+  }
+
+  const nsIntSize& OriginalSize() const { return nsIntSize(); }
+  const nsIntSize& TargetSize() const { return nsIntSize(); }
+  const gfxSize& Scale() const { return gfxSize(1.0, 1.0); }
+
+  nsresult BeginFrame(const nsIntSize&, uint8_t*, bool)
+  {
+    return NS_ERROR_FAILURE;
+  }
+
+  uint8_t* RowBuffer() { return nullptr; }
+  void CommitRow() { }
+  bool HasInvalidation() const { return false; }
+  DownscalerInvalidRect TakeInvalidRect() { return DownscalerInvalidRect(); }
+  void ResetForNextProgressivePass() { }
+};
+
+#endif // MOZ_ENABLE_SKIA
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_Downscaler_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/DynamicImage.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/DynamicImage.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/DynamicImage.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/DynamicImage.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,340 @@
+/* -*- 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 "DynamicImage.h"
+#include "gfxPlatform.h"
+#include "gfxUtils.h"
+#include "mozilla/gfx/2D.h"
+#include "mozilla/RefPtr.h"
+#include "ImageRegion.h"
+#include "Orientation.h"
+#include "SVGImageContext.h"
+
+#include "mozilla/MemoryReporting.h"
+
+using namespace mozilla;
+using namespace mozilla::gfx;
+using mozilla::layers::LayerManager;
+using mozilla::layers::ImageContainer;
+
+namespace mozilla {
+namespace image {
+
+// Inherited methods from Image.
+
+already_AddRefed<ProgressTracker>
+DynamicImage::GetProgressTracker()
+{
+  return nullptr;
+}
+
+size_t
+DynamicImage::SizeOfSourceWithComputedFallback(MallocSizeOf aMallocSizeOf) const
+{
+  return 0;
+}
+
+void
+DynamicImage::CollectSizeOfSurfaces(nsTArray<SurfaceMemoryCounter>& aCounters,
+                                    MallocSizeOf aMallocSizeOf) const
+{
+  // We can't report anything useful because gfxDrawable doesn't expose this
+  // information.
+}
+
+void
+DynamicImage::IncrementAnimationConsumers()
+{ }
+
+void
+DynamicImage::DecrementAnimationConsumers()
+{ }
+
+#ifdef DEBUG
+uint32_t
+DynamicImage::GetAnimationConsumers()
+{
+  return 0;
+}
+#endif
+
+nsresult
+DynamicImage::OnImageDataAvailable(nsIRequest* aRequest,
+                                   nsISupports* aContext,
+                                   nsIInputStream* aInStr,
+                                   uint64_t aSourceOffset,
+                                   uint32_t aCount)
+{
+  return NS_OK;
+}
+
+nsresult
+DynamicImage::OnImageDataComplete(nsIRequest* aRequest,
+                                  nsISupports* aContext,
+                                  nsresult aStatus,
+                                  bool aLastPart)
+{
+  return NS_OK;
+}
+
+void
+DynamicImage::OnSurfaceDiscarded()
+{ }
+
+void
+DynamicImage::SetInnerWindowID(uint64_t aInnerWindowId)
+{ }
+
+uint64_t
+DynamicImage::InnerWindowID() const
+{
+  return 0;
+}
+
+bool
+DynamicImage::HasError()
+{
+  return !mDrawable;
+}
+
+void
+DynamicImage::SetHasError()
+{ }
+
+ImageURL*
+DynamicImage::GetURI()
+{
+  return nullptr;
+}
+
+// Methods inherited from XPCOM interfaces.
+
+NS_IMPL_ISUPPORTS(DynamicImage, imgIContainer)
+
+NS_IMETHODIMP
+DynamicImage::GetWidth(int32_t* aWidth)
+{
+  *aWidth = mDrawable->Size().width;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+DynamicImage::GetHeight(int32_t* aHeight)
+{
+  *aHeight = mDrawable->Size().height;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+DynamicImage::GetIntrinsicSize(nsSize* aSize)
+{
+  gfxIntSize intSize(mDrawable->Size());
+  *aSize = nsSize(intSize.width, intSize.height);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+DynamicImage::GetIntrinsicRatio(nsSize* aSize)
+{
+  gfxIntSize intSize(mDrawable->Size());
+  *aSize = nsSize(intSize.width, intSize.height);
+  return NS_OK;
+}
+
+NS_IMETHODIMP_(Orientation)
+DynamicImage::GetOrientation()
+{
+  return Orientation();
+}
+
+NS_IMETHODIMP
+DynamicImage::GetType(uint16_t* aType)
+{
+  *aType = imgIContainer::TYPE_RASTER;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+DynamicImage::GetAnimated(bool* aAnimated)
+{
+  *aAnimated = false;
+  return NS_OK;
+}
+
+NS_IMETHODIMP_(TemporaryRef<SourceSurface>)
+DynamicImage::GetFrame(uint32_t aWhichFrame,
+                       uint32_t aFlags)
+{
+  gfxIntSize size(mDrawable->Size());
+
+  RefPtr<DrawTarget> dt = gfxPlatform::GetPlatform()->
+    CreateOffscreenContentDrawTarget(IntSize(size.width, size.height),
+                                     SurfaceFormat::B8G8R8A8);
+  if (!dt) {
+    gfxWarning() <<
+      "DynamicImage::GetFrame failed in CreateOffscreenContentDrawTarget";
+    return nullptr;
+  }
+  nsRefPtr<gfxContext> context = new gfxContext(dt);
+
+  auto result = Draw(context, size, ImageRegion::Create(size),
+                     aWhichFrame, GraphicsFilter::FILTER_NEAREST,
+                     Nothing(), aFlags);
+
+  return result == DrawResult::SUCCESS ? dt->Snapshot() : nullptr;
+}
+
+NS_IMETHODIMP_(bool)
+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.
+  return false;
+}
+
+NS_IMETHODIMP_(bool)
+DynamicImage::IsImageContainerAvailable(LayerManager* aManager, uint32_t aFlags)
+{
+  return false;
+}
+
+NS_IMETHODIMP_(already_AddRefed<ImageContainer>)
+DynamicImage::GetImageContainer(LayerManager* aManager, uint32_t aFlags)
+{
+  return nullptr;
+}
+
+NS_IMETHODIMP_(DrawResult)
+DynamicImage::Draw(gfxContext* aContext,
+                   const nsIntSize& aSize,
+                   const ImageRegion& aRegion,
+                   uint32_t aWhichFrame,
+                   GraphicsFilter aFilter,
+                   const Maybe<SVGImageContext>& aSVGContext,
+                   uint32_t aFlags)
+{
+  MOZ_ASSERT(!aSize.IsEmpty(), "Unexpected empty size");
+
+  gfxIntSize drawableSize(mDrawable->Size());
+
+  if (aSize == drawableSize) {
+    gfxUtils::DrawPixelSnapped(aContext, mDrawable, drawableSize, aRegion,
+                               SurfaceFormat::B8G8R8A8, aFilter);
+    return DrawResult::SUCCESS;
+  }
+
+  gfxSize scale(double(aSize.width) / drawableSize.width,
+                double(aSize.height) / drawableSize.height);
+
+  ImageRegion region(aRegion);
+  region.Scale(1.0 / scale.width, 1.0 / scale.height);
+
+  gfxContextMatrixAutoSaveRestore saveMatrix(aContext);
+  aContext->Multiply(gfxMatrix::Scaling(scale.width, scale.height));
+
+  gfxUtils::DrawPixelSnapped(aContext, mDrawable, drawableSize, region,
+                             SurfaceFormat::B8G8R8A8, aFilter);
+  return DrawResult::SUCCESS;
+}
+
+NS_IMETHODIMP
+DynamicImage::RequestDecode()
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+DynamicImage::StartDecoding()
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+DynamicImage::RequestDecodeForSize(const nsIntSize& aSize, uint32_t aFlags)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+DynamicImage::LockImage()
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+DynamicImage::UnlockImage()
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+DynamicImage::RequestDiscard()
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP_(void)
+DynamicImage::RequestRefresh(const mozilla::TimeStamp& aTime)
+{ }
+
+NS_IMETHODIMP
+DynamicImage::GetAnimationMode(uint16_t* aAnimationMode)
+{
+  *aAnimationMode = kNormalAnimMode;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+DynamicImage::SetAnimationMode(uint16_t aAnimationMode)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+DynamicImage::ResetAnimation()
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP_(float)
+DynamicImage::GetFrameIndex(uint32_t aWhichFrame)
+{
+  return 0;
+}
+
+NS_IMETHODIMP_(int32_t)
+DynamicImage::GetFirstFrameDelay()
+{
+  return 0;
+}
+
+NS_IMETHODIMP_(void)
+DynamicImage::SetAnimationStartTime(const mozilla::TimeStamp& aTime)
+{ }
+
+nsIntSize
+DynamicImage::OptimalImageSizeForDest(const gfxSize& aDest,
+                                      uint32_t aWhichFrame,
+                                      GraphicsFilter aFilter, uint32_t aFlags)
+{
+  gfxIntSize size(mDrawable->Size());
+  return nsIntSize(size.width, size.height);
+}
+
+NS_IMETHODIMP_(nsIntRect)
+DynamicImage::GetImageSpaceInvalidationRect(const nsIntRect& aRect)
+{
+  return aRect;
+}
+
+already_AddRefed<imgIContainer>
+DynamicImage::Unwrap()
+{
+  nsCOMPtr<imgIContainer> self(this);
+  return self.forget();
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/DynamicImage.h firefox-trunk-41.0~a1~hg20150524r245419/image/DynamicImage.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/DynamicImage.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/DynamicImage.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,75 @@
+/* -*- 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_image_DynamicImage_h
+#define mozilla_image_DynamicImage_h
+
+#include "mozilla/MemoryReporting.h"
+#include "gfxDrawable.h"
+#include "Image.h"
+
+namespace mozilla {
+namespace image {
+
+/**
+ * An Image that is dynamically created. The content of the image is provided by
+ * a gfxDrawable. It's anticipated that most uses of DynamicImage will be
+ * ephemeral.
+ */
+class DynamicImage : public Image
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_IMGICONTAINER
+
+  explicit DynamicImage(gfxDrawable* aDrawable)
+    : mDrawable(aDrawable)
+  {
+    MOZ_ASSERT(aDrawable, "Must have a gfxDrawable to wrap");
+  }
+
+  // Inherited methods from Image.
+  virtual already_AddRefed<ProgressTracker> GetProgressTracker() override;
+  virtual size_t SizeOfSourceWithComputedFallback(
+                                 MallocSizeOf aMallocSizeOf) const override;
+  virtual void CollectSizeOfSurfaces(nsTArray<SurfaceMemoryCounter>& aCounters,
+                                     MallocSizeOf aMallocSizeOf) const override;
+
+  virtual void IncrementAnimationConsumers() override;
+  virtual void DecrementAnimationConsumers() override;
+#ifdef DEBUG
+  virtual uint32_t GetAnimationConsumers() override;
+#endif
+
+  virtual nsresult OnImageDataAvailable(nsIRequest* aRequest,
+                                        nsISupports* aContext,
+                                        nsIInputStream* aInStr,
+                                        uint64_t aSourceOffset,
+                                        uint32_t aCount) override;
+  virtual nsresult OnImageDataComplete(nsIRequest* aRequest,
+                                       nsISupports* aContext,
+                                       nsresult aStatus,
+                                       bool aLastPart) override;
+
+  virtual void OnSurfaceDiscarded() override;
+
+  virtual void SetInnerWindowID(uint64_t aInnerWindowId) override;
+  virtual uint64_t InnerWindowID() const override;
+
+  virtual bool HasError() override;
+  virtual void SetHasError() override;
+
+  virtual ImageURL* GetURI() override;
+
+private:
+  virtual ~DynamicImage() { }
+
+  nsRefPtr<gfxDrawable> mDrawable;
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_DynamicImage_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/encoders/bmp/moz.build firefox-trunk-41.0~a1~hg20150524r245419/image/encoders/bmp/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/image/encoders/bmp/moz.build	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/encoders/bmp/moz.build	2015-05-25 20:42:42.000000000 +0000
@@ -11,7 +11,7 @@
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
-    '/image/src',
+    '/image',
 ]
 
 FINAL_LIBRARY = 'xul'
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/encoders/ico/moz.build firefox-trunk-41.0~a1~hg20150524r245419/image/encoders/ico/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/image/encoders/ico/moz.build	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/encoders/ico/moz.build	2015-05-25 20:42:42.000000000 +0000
@@ -12,9 +12,9 @@
 
 # Decoders need RasterImage.h
 LOCAL_INCLUDES += [
-    '../bmp',
-    '../png',
-    '/image/src',
+    '/image',
+    '/image/encoders/bmp',
+    '/image/encoders/png',
 ]
 
 FINAL_LIBRARY = 'xul'
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/encoders/png/moz.build firefox-trunk-41.0~a1~hg20150524r245419/image/encoders/png/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/image/encoders/png/moz.build	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/encoders/png/moz.build	2015-05-25 20:42:42.000000000 +0000
@@ -11,7 +11,7 @@
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
-    '/image/src',
+    '/image',
 ]
 
 FINAL_LIBRARY = 'xul'
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/encoders/png/nsPNGEncoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/encoders/png/nsPNGEncoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/encoders/png/nsPNGEncoder.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/encoders/png/nsPNGEncoder.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -697,7 +697,7 @@
 nsPNGEncoder::WarningCallback(png_structp png_ptr,
                             png_const_charp warning_msg)
 {
-  PR_LOG(GetPNGEncoderLog(), PR_LOG_WARNING,
+  MOZ_LOG(GetPNGEncoderLog(), PR_LOG_WARNING,
          ("libpng warning: %s\n", warning_msg));
 }
 
@@ -708,7 +708,7 @@
 nsPNGEncoder::ErrorCallback(png_structp png_ptr,
                             png_const_charp error_msg)
 {
-  PR_LOG(GetPNGEncoderLog(), PR_LOG_ERROR, ("libpng error: %s\n", error_msg));
+  MOZ_LOG(GetPNGEncoderLog(), PR_LOG_ERROR, ("libpng error: %s\n", error_msg));
   png_longjmp(png_ptr, 1);
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/FrameAnimator.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/FrameAnimator.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/FrameAnimator.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/FrameAnimator.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,810 @@
+/* -*- 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 "FrameAnimator.h"
+
+#include "mozilla/MemoryReporting.h"
+#include "mozilla/Move.h"
+#include "imgIContainer.h"
+#include "MainThreadUtils.h"
+#include "RasterImage.h"
+
+#include "pixman.h"
+
+namespace mozilla {
+
+using namespace gfx;
+
+namespace image {
+
+int32_t
+FrameAnimator::GetSingleLoopTime() const
+{
+  // If we aren't done decoding, we don't know the image's full play time.
+  if (!mDoneDecoding) {
+    return -1;
+  }
+
+  // If we're not looping, a single loop time has no meaning
+  if (mAnimationMode != imgIContainer::kNormalAnimMode) {
+    return -1;
+  }
+
+  uint32_t looptime = 0;
+  for (uint32_t i = 0; i < mImage->GetNumFrames(); ++i) {
+    int32_t timeout = GetTimeoutForFrame(i);
+    if (timeout >= 0) {
+      looptime += static_cast<uint32_t>(timeout);
+    } else {
+      // If we have a frame that never times out, we're probably in an error
+      // case, but let's handle it more gracefully.
+      NS_WARNING("Negative frame timeout - how did this happen?");
+      return -1;
+    }
+  }
+
+  return looptime;
+}
+
+TimeStamp
+FrameAnimator::GetCurrentImgFrameEndTime() const
+{
+  TimeStamp currentFrameTime = mCurrentAnimationFrameTime;
+  int32_t timeout =
+    GetTimeoutForFrame(mCurrentAnimationFrameIndex);
+
+  if (timeout < 0) {
+    // We need to return a sentinel value in this case, because our logic
+    // doesn't work correctly if we have a negative timeout value. We use
+    // one year in the future as the sentinel because it works with the loop
+    // in RequestRefresh() below.
+    // XXX(seth): It'd be preferable to make our logic work correctly with
+    // negative timeouts.
+    return TimeStamp::NowLoRes() +
+           TimeDuration::FromMilliseconds(31536000.0);
+  }
+
+  TimeDuration durationOfTimeout =
+    TimeDuration::FromMilliseconds(static_cast<double>(timeout));
+  TimeStamp currentFrameEndTime = currentFrameTime + durationOfTimeout;
+
+  return currentFrameEndTime;
+}
+
+FrameAnimator::RefreshResult
+FrameAnimator::AdvanceFrame(TimeStamp aTime)
+{
+  NS_ASSERTION(aTime <= TimeStamp::Now(),
+               "Given time appears to be in the future");
+
+  uint32_t currentFrameIndex = mCurrentAnimationFrameIndex;
+  uint32_t nextFrameIndex = currentFrameIndex + 1;
+  int32_t timeout = 0;
+
+  RefreshResult ret;
+  RawAccessFrameRef nextFrame = GetRawFrame(nextFrameIndex);
+
+  // If we're done decoding, we know we've got everything we're going to get.
+  // If we aren't, we only display fully-downloaded frames; everything else
+  // gets delayed.
+  bool canDisplay = mDoneDecoding ||
+                    (nextFrame && nextFrame->IsImageComplete());
+
+  if (!canDisplay) {
+    // Uh oh, the frame we want to show is currently being decoded (partial)
+    // Wait until the next refresh driver tick and try again
+    return ret;
+  }
+
+  // If we're done decoding the next frame, go ahead and display it now and
+  // reinit with the next frame's delay time.
+  if (mImage->GetNumFrames() == nextFrameIndex) {
+    // End of an animation loop...
+
+    // If we are not looping forever, initialize the loop counter
+    if (mLoopRemainingCount < 0 && LoopCount() >= 0) {
+      mLoopRemainingCount = LoopCount();
+    }
+
+    // If animation mode is "loop once", or we're at end of loop counter,
+    // it's time to stop animating.
+    if (mAnimationMode == imgIContainer::kLoopOnceAnimMode ||
+        mLoopRemainingCount == 0) {
+      ret.animationFinished = true;
+    }
+
+    nextFrameIndex = 0;
+
+    if (mLoopRemainingCount > 0) {
+      mLoopRemainingCount--;
+    }
+
+    // If we're done, exit early.
+    if (ret.animationFinished) {
+      return ret;
+    }
+  }
+
+  timeout = GetTimeoutForFrame(nextFrameIndex);
+
+  // Bad data
+  if (timeout < 0) {
+    ret.animationFinished = true;
+    ret.error = true;
+  }
+
+  if (nextFrameIndex == 0) {
+    ret.dirtyRect = mFirstFrameRefreshArea;
+  } else {
+    // Change frame
+    if (nextFrameIndex != currentFrameIndex + 1) {
+      nextFrame = GetRawFrame(nextFrameIndex);
+    }
+
+    if (!DoBlend(&ret.dirtyRect, currentFrameIndex,
+                               nextFrameIndex)) {
+      // something went wrong, move on to next
+      NS_WARNING("FrameAnimator::AdvanceFrame(): Compositing of frame failed");
+      nextFrame->SetCompositingFailed(true);
+      mCurrentAnimationFrameTime = GetCurrentImgFrameEndTime();
+      mCurrentAnimationFrameIndex = nextFrameIndex;
+
+      ret.error = true;
+      return ret;
+    }
+
+    nextFrame->SetCompositingFailed(false);
+  }
+
+  mCurrentAnimationFrameTime = GetCurrentImgFrameEndTime();
+
+  // If we can get closer to the current time by a multiple of the image's loop
+  // time, we should.
+  uint32_t loopTime = GetSingleLoopTime();
+  if (loopTime > 0) {
+    TimeDuration delay = aTime - mCurrentAnimationFrameTime;
+    if (delay.ToMilliseconds() > loopTime) {
+      // Explicitly use integer division to get the floor of the number of
+      // loops.
+      uint32_t loops = static_cast<uint32_t>(delay.ToMilliseconds()) / loopTime;
+      mCurrentAnimationFrameTime +=
+        TimeDuration::FromMilliseconds(loops * loopTime);
+    }
+  }
+
+  // Set currentAnimationFrameIndex at the last possible moment
+  mCurrentAnimationFrameIndex = nextFrameIndex;
+
+  // If we're here, we successfully advanced the frame.
+  ret.frameAdvanced = true;
+
+  return ret;
+}
+
+FrameAnimator::RefreshResult
+FrameAnimator::RequestRefresh(const TimeStamp& aTime)
+{
+  // only advance the frame if the current time is greater than or
+  // equal to the current frame's end time.
+  TimeStamp currentFrameEndTime = GetCurrentImgFrameEndTime();
+
+  // By default, an empty RefreshResult.
+  RefreshResult ret;
+
+  while (currentFrameEndTime <= aTime) {
+    TimeStamp oldFrameEndTime = currentFrameEndTime;
+
+    RefreshResult frameRes = AdvanceFrame(aTime);
+
+    // Accumulate our result for returning to callers.
+    ret.Accumulate(frameRes);
+
+    currentFrameEndTime = GetCurrentImgFrameEndTime();
+
+    // if we didn't advance a frame, and our frame end time didn't change,
+    // then we need to break out of this loop & wait for the frame(s)
+    // to finish downloading
+    if (!frameRes.frameAdvanced && (currentFrameEndTime == oldFrameEndTime)) {
+      break;
+    }
+  }
+
+  return ret;
+}
+
+void
+FrameAnimator::ResetAnimation()
+{
+  mCurrentAnimationFrameIndex = 0;
+  mLastCompositedFrameIndex = -1;
+}
+
+void
+FrameAnimator::SetDoneDecoding(bool aDone)
+{
+  mDoneDecoding = aDone;
+}
+
+void
+FrameAnimator::SetAnimationMode(uint16_t aAnimationMode)
+{
+  mAnimationMode = aAnimationMode;
+}
+
+void
+FrameAnimator::InitAnimationFrameTimeIfNecessary()
+{
+  if (mCurrentAnimationFrameTime.IsNull()) {
+    mCurrentAnimationFrameTime = TimeStamp::Now();
+  }
+}
+
+void
+FrameAnimator::SetAnimationFrameTime(const TimeStamp& aTime)
+{
+  mCurrentAnimationFrameTime = aTime;
+}
+
+void
+FrameAnimator::UnionFirstFrameRefreshArea(const nsIntRect& aRect)
+{
+  mFirstFrameRefreshArea.UnionRect(mFirstFrameRefreshArea, aRect);
+}
+
+uint32_t
+FrameAnimator::GetCurrentAnimationFrameIndex() const
+{
+  return mCurrentAnimationFrameIndex;
+}
+
+nsIntRect
+FrameAnimator::GetFirstFrameRefreshArea() const
+{
+  return mFirstFrameRefreshArea;
+}
+
+DrawableFrameRef
+FrameAnimator::GetCompositedFrame(uint32_t aFrameNum)
+{
+  MOZ_ASSERT(aFrameNum != 0, "First frame is never composited");
+
+  // If we have a composited version of this frame, return that.
+  if (mLastCompositedFrameIndex == int32_t(aFrameNum)) {
+    return mCompositingFrame->DrawableRef();
+  }
+
+  // Otherwise return the raw frame. DoBlend is required to ensure that we only
+  // hit this case if the frame is not paletted and doesn't require compositing.
+  DrawableFrameRef ref =
+    SurfaceCache::Lookup(ImageKey(mImage),
+                         RasterSurfaceKey(mSize,
+                                          0,  // Default decode flags.
+                                          aFrameNum));
+  MOZ_ASSERT(!ref || !ref->GetIsPaletted(), "About to return a paletted frame");
+  return ref;
+}
+
+int32_t
+FrameAnimator::GetTimeoutForFrame(uint32_t aFrameNum) const
+{
+  RawAccessFrameRef frame = GetRawFrame(aFrameNum);
+  if (!frame) {
+    NS_WARNING("No frame; called GetTimeoutForFrame too early?");
+    return 100;
+  }
+
+  AnimationData data = frame->GetAnimationData();
+
+  // Ensure a minimal time between updates so we don't throttle the UI thread.
+  // consider 0 == unspecified and make it fast but not too fast.  Unless we
+  // have a single loop GIF. See bug 890743, bug 125137, bug 139677, and bug
+  // 207059. The behavior of recent IE and Opera versions seems to be:
+  // IE 6/Win:
+  //   10 - 50ms go 100ms
+  //   >50ms go correct speed
+  // Opera 7 final/Win:
+  //   10ms goes 100ms
+  //   >10ms go correct speed
+  // It seems that there are broken tools out there that set a 0ms or 10ms
+  // timeout when they really want a "default" one.  So munge values in that
+  // range.
+  if (data.mRawTimeout >= 0 && data.mRawTimeout <= 10 && mLoopCount != 0) {
+    return 100;
+  }
+
+  return data.mRawTimeout;
+}
+
+static void
+DoCollectSizeOfCompositingSurfaces(const RawAccessFrameRef& aSurface,
+                                   SurfaceMemoryCounterType aType,
+                                   nsTArray<SurfaceMemoryCounter>& aCounters,
+                                   MallocSizeOf aMallocSizeOf)
+{
+  // Concoct a SurfaceKey for this surface.
+  SurfaceKey key = RasterSurfaceKey(aSurface->GetImageSize(),
+                                    imgIContainer::DECODE_FLAGS_DEFAULT,
+                                    /* aFrameNum = */ 0);
+
+  // Create a counter for this surface.
+  SurfaceMemoryCounter counter(key, /* aIsLocked = */ true, aType);
+
+  // Extract the surface's memory usage information.
+  size_t heap = aSurface
+    ->SizeOfExcludingThis(gfxMemoryLocation::IN_PROCESS_HEAP, aMallocSizeOf);
+  counter.Values().SetDecodedHeap(heap);
+
+  size_t nonHeap = aSurface
+    ->SizeOfExcludingThis(gfxMemoryLocation::IN_PROCESS_NONHEAP, nullptr);
+  counter.Values().SetDecodedNonHeap(nonHeap);
+
+  // Record it.
+  aCounters.AppendElement(counter);
+}
+
+void
+FrameAnimator::CollectSizeOfCompositingSurfaces(
+    nsTArray<SurfaceMemoryCounter>& aCounters,
+    MallocSizeOf aMallocSizeOf) const
+{
+  if (mCompositingFrame) {
+    DoCollectSizeOfCompositingSurfaces(mCompositingFrame,
+                                       SurfaceMemoryCounterType::COMPOSITING,
+                                       aCounters,
+                                       aMallocSizeOf);
+  }
+
+  if (mCompositingPrevFrame) {
+    DoCollectSizeOfCompositingSurfaces(mCompositingPrevFrame,
+                                       SurfaceMemoryCounterType::COMPOSITING_PREV,
+                                       aCounters,
+                                       aMallocSizeOf);
+  }
+}
+
+RawAccessFrameRef
+FrameAnimator::GetRawFrame(uint32_t aFrameNum) const
+{
+  DrawableFrameRef ref =
+    SurfaceCache::Lookup(ImageKey(mImage),
+                         RasterSurfaceKey(mSize,
+                                          0,  // Default decode flags.
+                                          aFrameNum));
+  return ref ? ref->RawAccessRef()
+             : RawAccessFrameRef();
+}
+
+//******************************************************************************
+// DoBlend gets called when the timer for animation get fired and we have to
+// update the composited frame of the animation.
+bool
+FrameAnimator::DoBlend(nsIntRect* aDirtyRect,
+                       uint32_t aPrevFrameIndex,
+                       uint32_t aNextFrameIndex)
+{
+  RawAccessFrameRef prevFrame = GetRawFrame(aPrevFrameIndex);
+  RawAccessFrameRef nextFrame = GetRawFrame(aNextFrameIndex);
+
+  MOZ_ASSERT(prevFrame && nextFrame, "Should have frames here");
+
+  AnimationData prevFrameData = prevFrame->GetAnimationData();
+  if (prevFrameData.mDisposalMethod == DisposalMethod::RESTORE_PREVIOUS &&
+      !mCompositingPrevFrame) {
+    prevFrameData.mDisposalMethod = DisposalMethod::CLEAR;
+  }
+
+  bool isFullPrevFrame = prevFrameData.mRect.x == 0 &&
+                         prevFrameData.mRect.y == 0 &&
+                         prevFrameData.mRect.width == mSize.width &&
+                         prevFrameData.mRect.height == mSize.height;
+
+  // Optimization: DisposeClearAll if the previous frame is the same size as
+  //               container and it's clearing itself
+  if (isFullPrevFrame &&
+      (prevFrameData.mDisposalMethod == DisposalMethod::CLEAR)) {
+    prevFrameData.mDisposalMethod = DisposalMethod::CLEAR_ALL;
+  }
+
+  AnimationData nextFrameData = nextFrame->GetAnimationData();
+  bool isFullNextFrame = nextFrameData.mRect.x == 0 &&
+                         nextFrameData.mRect.y == 0 &&
+                         nextFrameData.mRect.width == mSize.width &&
+                         nextFrameData.mRect.height == mSize.height;
+
+  if (!nextFrame->GetIsPaletted()) {
+    // Optimization: Skip compositing if the previous frame wants to clear the
+    //               whole image
+    if (prevFrameData.mDisposalMethod == DisposalMethod::CLEAR_ALL) {
+      aDirtyRect->SetRect(0, 0, mSize.width, mSize.height);
+      return true;
+    }
+
+    // Optimization: Skip compositing if this frame is the same size as the
+    //               container and it's fully drawing over prev frame (no alpha)
+    if (isFullNextFrame &&
+        (nextFrameData.mDisposalMethod != DisposalMethod::RESTORE_PREVIOUS) &&
+        !nextFrameData.mHasAlpha) {
+      aDirtyRect->SetRect(0, 0, mSize.width, mSize.height);
+      return true;
+    }
+  }
+
+  // Calculate area that needs updating
+  switch (prevFrameData.mDisposalMethod) {
+    default:
+      MOZ_ASSERT_UNREACHABLE("Unexpected DisposalMethod");
+    case DisposalMethod::NOT_SPECIFIED:
+    case DisposalMethod::KEEP:
+      *aDirtyRect = nextFrameData.mRect;
+      break;
+
+    case DisposalMethod::CLEAR_ALL:
+      // Whole image container is cleared
+      aDirtyRect->SetRect(0, 0, mSize.width, mSize.height);
+      break;
+
+    case DisposalMethod::CLEAR:
+      // Calc area that needs to be redrawn (the combination of previous and
+      // this frame)
+      // XXX - This could be done with multiple framechanged calls
+      //       Having prevFrame way at the top of the image, and nextFrame
+      //       way at the bottom, and both frames being small, we'd be
+      //       telling framechanged to refresh the whole image when only two
+      //       small areas are needed.
+      aDirtyRect->UnionRect(nextFrameData.mRect, prevFrameData.mRect);
+      break;
+
+    case DisposalMethod::RESTORE_PREVIOUS:
+      aDirtyRect->SetRect(0, 0, mSize.width, mSize.height);
+      break;
+  }
+
+  // Optimization:
+  //   Skip compositing if the last composited frame is this frame
+  //   (Only one composited frame was made for this animation.  Example:
+  //    Only Frame 3 of a 10 frame image required us to build a composite frame
+  //    On the second loop, we do not need to rebuild the frame
+  //    since it's still sitting in compositingFrame)
+  if (mLastCompositedFrameIndex == int32_t(aNextFrameIndex)) {
+    return true;
+  }
+
+  bool needToBlankComposite = false;
+
+  // Create the Compositing Frame
+  if (!mCompositingFrame) {
+    nsRefPtr<imgFrame> newFrame = new imgFrame;
+    nsresult rv = newFrame->InitForDecoder(mSize,
+                                           SurfaceFormat::B8G8R8A8);
+    if (NS_FAILED(rv)) {
+      mCompositingFrame.reset();
+      return false;
+    }
+    mCompositingFrame = newFrame->RawAccessRef();
+    needToBlankComposite = true;
+  } else if (int32_t(aNextFrameIndex) != mLastCompositedFrameIndex+1) {
+
+    // If we are not drawing on top of last composited frame,
+    // then we are building a new composite frame, so let's clear it first.
+    needToBlankComposite = true;
+  }
+
+  AnimationData compositingFrameData = mCompositingFrame->GetAnimationData();
+
+  // More optimizations possible when next frame is not transparent
+  // But if the next frame has DisposalMethod::RESTORE_PREVIOUS,
+  // this "no disposal" optimization is not possible,
+  // because the frame in "after disposal operation" state
+  // needs to be stored in compositingFrame, so it can be
+  // copied into compositingPrevFrame later.
+  bool doDisposal = true;
+  if (!nextFrameData.mHasAlpha &&
+      nextFrameData.mDisposalMethod != DisposalMethod::RESTORE_PREVIOUS) {
+    if (isFullNextFrame) {
+      // Optimization: No need to dispose prev.frame when
+      // next frame is full frame and not transparent.
+      doDisposal = false;
+      // No need to blank the composite frame
+      needToBlankComposite = false;
+    } else {
+      if ((prevFrameData.mRect.x >= nextFrameData.mRect.x) &&
+          (prevFrameData.mRect.y >= nextFrameData.mRect.y) &&
+          (prevFrameData.mRect.x + prevFrameData.mRect.width <=
+              nextFrameData.mRect.x + nextFrameData.mRect.width) &&
+          (prevFrameData.mRect.y + prevFrameData.mRect.height <=
+              nextFrameData.mRect.y + nextFrameData.mRect.height)) {
+        // Optimization: No need to dispose prev.frame when
+        // next frame fully overlaps previous frame.
+        doDisposal = false;
+      }
+    }
+  }
+
+  if (doDisposal) {
+    // Dispose of previous: clear, restore, or keep (copy)
+    switch (prevFrameData.mDisposalMethod) {
+      case DisposalMethod::CLEAR:
+        if (needToBlankComposite) {
+          // If we just created the composite, it could have anything in its
+          // buffer. Clear whole frame
+          ClearFrame(compositingFrameData.mRawData,
+                     compositingFrameData.mRect);
+        } else {
+          // Only blank out previous frame area (both color & Mask/Alpha)
+          ClearFrame(compositingFrameData.mRawData,
+                     compositingFrameData.mRect,
+                     prevFrameData.mRect);
+        }
+        break;
+
+      case DisposalMethod::CLEAR_ALL:
+        ClearFrame(compositingFrameData.mRawData,
+                   compositingFrameData.mRect);
+        break;
+
+      case DisposalMethod::RESTORE_PREVIOUS:
+        // It would be better to copy only the area changed back to
+        // compositingFrame.
+        if (mCompositingPrevFrame) {
+          AnimationData compositingPrevFrameData =
+            mCompositingPrevFrame->GetAnimationData();
+
+          CopyFrameImage(compositingPrevFrameData.mRawData,
+                         compositingPrevFrameData.mRect,
+                         compositingFrameData.mRawData,
+                         compositingFrameData.mRect);
+
+          // destroy only if we don't need it for this frame's disposal
+          if (nextFrameData.mDisposalMethod !=
+              DisposalMethod::RESTORE_PREVIOUS) {
+            mCompositingPrevFrame.reset();
+          }
+        } else {
+          ClearFrame(compositingFrameData.mRawData,
+                     compositingFrameData.mRect);
+        }
+        break;
+
+      default:
+        MOZ_ASSERT_UNREACHABLE("Unexpected DisposalMethod");
+      case DisposalMethod::NOT_SPECIFIED:
+      case DisposalMethod::KEEP:
+        // Copy previous frame into compositingFrame before we put the new
+        // frame on top
+        // Assumes that the previous frame represents a full frame (it could be
+        // smaller in size than the container, as long as the frame before it
+        // erased itself)
+        // Note: Frame 1 never gets into DoBlend(), so (aNextFrameIndex - 1)
+        // will always be a valid frame number.
+        if (mLastCompositedFrameIndex != int32_t(aNextFrameIndex - 1)) {
+          if (isFullPrevFrame && !prevFrame->GetIsPaletted()) {
+            // Just copy the bits
+            CopyFrameImage(prevFrameData.mRawData,
+                           prevFrameData.mRect,
+                           compositingFrameData.mRawData,
+                           compositingFrameData.mRect);
+          } else {
+            if (needToBlankComposite) {
+              // Only blank composite when prev is transparent or not full.
+              if (prevFrameData.mHasAlpha || !isFullPrevFrame) {
+                ClearFrame(compositingFrameData.mRawData,
+                           compositingFrameData.mRect);
+              }
+            }
+            DrawFrameTo(prevFrameData.mRawData, prevFrameData.mRect,
+                        prevFrameData.mPaletteDataLength,
+                        prevFrameData.mHasAlpha,
+                        compositingFrameData.mRawData,
+                        compositingFrameData.mRect,
+                        prevFrameData.mBlendMethod);
+          }
+        }
+    }
+  } else if (needToBlankComposite) {
+    // If we just created the composite, it could have anything in its
+    // buffers. Clear them
+    ClearFrame(compositingFrameData.mRawData,
+               compositingFrameData.mRect);
+  }
+
+  // Check if the frame we are composing wants the previous image restored after
+  // it is done. Don't store it (again) if last frame wanted its image restored
+  // too
+  if ((nextFrameData.mDisposalMethod == DisposalMethod::RESTORE_PREVIOUS) &&
+      (prevFrameData.mDisposalMethod != DisposalMethod::RESTORE_PREVIOUS)) {
+    // We are storing the whole image.
+    // It would be better if we just stored the area that nextFrame is going to
+    // overwrite.
+    if (!mCompositingPrevFrame) {
+      nsRefPtr<imgFrame> newFrame = new imgFrame;
+      nsresult rv = newFrame->InitForDecoder(mSize,
+                                             SurfaceFormat::B8G8R8A8);
+      if (NS_FAILED(rv)) {
+        mCompositingPrevFrame.reset();
+        return false;
+      }
+
+      mCompositingPrevFrame = newFrame->RawAccessRef();
+    }
+
+    AnimationData compositingPrevFrameData =
+      mCompositingPrevFrame->GetAnimationData();
+
+    CopyFrameImage(compositingFrameData.mRawData,
+                   compositingFrameData.mRect,
+                   compositingPrevFrameData.mRawData,
+                   compositingPrevFrameData.mRect);
+
+    mCompositingPrevFrame->Finish();
+  }
+
+  // blit next frame into it's correct spot
+  DrawFrameTo(nextFrameData.mRawData, nextFrameData.mRect,
+              nextFrameData.mPaletteDataLength,
+              nextFrameData.mHasAlpha,
+              compositingFrameData.mRawData,
+              compositingFrameData.mRect,
+              nextFrameData.mBlendMethod);
+
+  // Tell the image that it is fully 'downloaded'.
+  mCompositingFrame->Finish();
+
+  mLastCompositedFrameIndex = int32_t(aNextFrameIndex);
+
+  return true;
+}
+
+//******************************************************************************
+// Fill aFrame with black. Does also clears the mask.
+void
+FrameAnimator::ClearFrame(uint8_t* aFrameData, const nsIntRect& aFrameRect)
+{
+  if (!aFrameData) {
+    return;
+  }
+
+  memset(aFrameData, 0, aFrameRect.width * aFrameRect.height * 4);
+}
+
+//******************************************************************************
+void
+FrameAnimator::ClearFrame(uint8_t* aFrameData, const nsIntRect& aFrameRect,
+                          const nsIntRect& aRectToClear)
+{
+  if (!aFrameData || aFrameRect.width <= 0 || aFrameRect.height <= 0 ||
+      aRectToClear.width <= 0 || aRectToClear.height <= 0) {
+    return;
+  }
+
+  nsIntRect toClear = aFrameRect.Intersect(aRectToClear);
+  if (toClear.IsEmpty()) {
+    return;
+  }
+
+  uint32_t bytesPerRow = aFrameRect.width * 4;
+  for (int row = toClear.y; row < toClear.y + toClear.height; ++row) {
+    memset(aFrameData + toClear.x * 4 + row * bytesPerRow, 0,
+           toClear.width * 4);
+  }
+}
+
+//******************************************************************************
+// Whether we succeed or fail will not cause a crash, and there's not much
+// we can do about a failure, so there we don't return a nsresult
+bool
+FrameAnimator::CopyFrameImage(const uint8_t* aDataSrc,
+                              const nsIntRect& aRectSrc,
+                              uint8_t* aDataDest,
+                              const nsIntRect& aRectDest)
+{
+  uint32_t dataLengthSrc = aRectSrc.width * aRectSrc.height * 4;
+  uint32_t dataLengthDest = aRectDest.width * aRectDest.height * 4;
+
+  if (!aDataDest || !aDataSrc || dataLengthSrc != dataLengthDest) {
+    return false;
+  }
+
+  memcpy(aDataDest, aDataSrc, dataLengthDest);
+
+  return true;
+}
+
+nsresult
+FrameAnimator::DrawFrameTo(const uint8_t* aSrcData, const nsIntRect& aSrcRect,
+                           uint32_t aSrcPaletteLength, bool aSrcHasAlpha,
+                           uint8_t* aDstPixels, const nsIntRect& aDstRect,
+                           BlendMethod aBlendMethod)
+{
+  NS_ENSURE_ARG_POINTER(aSrcData);
+  NS_ENSURE_ARG_POINTER(aDstPixels);
+
+  // According to both AGIF and APNG specs, offsets are unsigned
+  if (aSrcRect.x < 0 || aSrcRect.y < 0) {
+    NS_WARNING("FrameAnimator::DrawFrameTo: negative offsets not allowed");
+    return NS_ERROR_FAILURE;
+  }
+  // Outside the destination frame, skip it
+  if ((aSrcRect.x > aDstRect.width) || (aSrcRect.y > aDstRect.height)) {
+    return NS_OK;
+  }
+
+  if (aSrcPaletteLength) {
+    // Larger than the destination frame, clip it
+    int32_t width = std::min(aSrcRect.width, aDstRect.width - aSrcRect.x);
+    int32_t height = std::min(aSrcRect.height, aDstRect.height - aSrcRect.y);
+
+    // The clipped image must now fully fit within destination image frame
+    NS_ASSERTION((aSrcRect.x >= 0) && (aSrcRect.y >= 0) &&
+                 (aSrcRect.x + width <= aDstRect.width) &&
+                 (aSrcRect.y + height <= aDstRect.height),
+                "FrameAnimator::DrawFrameTo: Invalid aSrcRect");
+
+    // clipped image size may be smaller than source, but not larger
+    NS_ASSERTION((width <= aSrcRect.width) && (height <= aSrcRect.height),
+      "FrameAnimator::DrawFrameTo: source must be smaller than dest");
+
+    // Get pointers to image data
+    const uint8_t* srcPixels = aSrcData + aSrcPaletteLength;
+    uint32_t* dstPixels = reinterpret_cast<uint32_t*>(aDstPixels);
+    const uint32_t* colormap = reinterpret_cast<const uint32_t*>(aSrcData);
+
+    // Skip to the right offset
+    dstPixels += aSrcRect.x + (aSrcRect.y * aDstRect.width);
+    if (!aSrcHasAlpha) {
+      for (int32_t r = height; r > 0; --r) {
+        for (int32_t c = 0; c < width; c++) {
+          dstPixels[c] = colormap[srcPixels[c]];
+        }
+        // Go to the next row in the source resp. destination image
+        srcPixels += aSrcRect.width;
+        dstPixels += aDstRect.width;
+      }
+    } else {
+      for (int32_t r = height; r > 0; --r) {
+        for (int32_t c = 0; c < width; c++) {
+          const uint32_t color = colormap[srcPixels[c]];
+          if (color) {
+            dstPixels[c] = color;
+          }
+        }
+        // Go to the next row in the source resp. destination image
+        srcPixels += aSrcRect.width;
+        dstPixels += aDstRect.width;
+      }
+    }
+  } else {
+    pixman_image_t* src =
+      pixman_image_create_bits(
+          aSrcHasAlpha ? PIXMAN_a8r8g8b8 : PIXMAN_x8r8g8b8,
+          aSrcRect.width, aSrcRect.height,
+          reinterpret_cast<uint32_t*>(const_cast<uint8_t*>(aSrcData)),
+          aSrcRect.width * 4);
+    pixman_image_t* dst =
+      pixman_image_create_bits(PIXMAN_a8r8g8b8,
+                               aDstRect.width,
+                               aDstRect.height,
+                               reinterpret_cast<uint32_t*>(aDstPixels),
+                               aDstRect.width * 4);
+
+    auto op = aBlendMethod == BlendMethod::SOURCE ? PIXMAN_OP_SRC
+                                                  : PIXMAN_OP_OVER;
+    pixman_image_composite32(op,
+                             src,
+                             nullptr,
+                             dst,
+                             0, 0,
+                             0, 0,
+                             aSrcRect.x, aSrcRect.y,
+                             aSrcRect.width, aSrcRect.height);
+
+    pixman_image_unref(src);
+    pixman_image_unref(dst);
+  }
+
+  return NS_OK;
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/FrameAnimator.h firefox-trunk-41.0~a1~hg20150524r245419/image/FrameAnimator.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/FrameAnimator.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/FrameAnimator.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,290 @@
+/* -*- 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_image_FrameAnimator_h
+#define mozilla_image_FrameAnimator_h
+
+#include "mozilla/MemoryReporting.h"
+#include "mozilla/TimeStamp.h"
+#include "gfx2DGlue.h"
+#include "gfxTypes.h"
+#include "imgFrame.h"
+#include "nsCOMPtr.h"
+#include "nsRect.h"
+#include "SurfaceCache.h"
+
+namespace mozilla {
+namespace image {
+
+class RasterImage;
+
+class FrameAnimator
+{
+public:
+  FrameAnimator(RasterImage* aImage,
+                gfx::IntSize aSize,
+                uint16_t aAnimationMode)
+    : mImage(aImage)
+    , mSize(aSize)
+    , mCurrentAnimationFrameIndex(0)
+    , mLoopRemainingCount(-1)
+    , mLastCompositedFrameIndex(-1)
+    , mLoopCount(-1)
+    , mAnimationMode(aAnimationMode)
+    , mDoneDecoding(false)
+  { }
+
+  /**
+   * Return value from RequestRefresh. Tells callers what happened in that call
+   * to RequestRefresh.
+   */
+  struct RefreshResult
+  {
+    // The dirty rectangle to be re-drawn after this RequestRefresh().
+    nsIntRect dirtyRect;
+
+    // Whether any frame changed, and hence the dirty rect was set.
+    bool frameAdvanced : 1;
+
+    // Whether the animation has finished playing.
+    bool animationFinished : 1;
+
+    // Whether an error has occurred when trying to advance a frame. Note that
+    // errors do not, on their own, end the animation.
+    bool error : 1;
+
+    RefreshResult()
+      : frameAdvanced(false)
+      , animationFinished(false)
+      , error(false)
+    { }
+
+    void Accumulate(const RefreshResult& other)
+    {
+      frameAdvanced = frameAdvanced || other.frameAdvanced;
+      animationFinished = animationFinished || other.animationFinished;
+      error = error || other.error;
+      dirtyRect = dirtyRect.Union(other.dirtyRect);
+    }
+  };
+
+  /**
+   * Re-evaluate what frame we're supposed to be on, and do whatever blending
+   * is necessary to get us to that frame.
+   *
+   * Returns the result of that blending, including whether the current frame
+   * changed and what the resulting dirty rectangle is.
+   */
+  RefreshResult RequestRefresh(const TimeStamp& aTime);
+
+  /**
+   * Call when this image is finished decoding so we know that there aren't any
+   * more frames coming.
+   */
+  void SetDoneDecoding(bool aDone);
+
+  /**
+   * Call when you need to re-start animating. Ensures we start from the first
+   * frame.
+   */
+  void ResetAnimation();
+
+  /**
+   * The animation mode of the image.
+   *
+   * Constants defined in imgIContainer.idl.
+   */
+  void SetAnimationMode(uint16_t aAnimationMode);
+
+  /**
+   * Union the area to refresh when we loop around to the first frame with this
+   * rect.
+   */
+  void UnionFirstFrameRefreshArea(const nsIntRect& aRect);
+
+  /**
+   * If the animation frame time has not yet been set, set it to
+   * TimeStamp::Now().
+   */
+  void InitAnimationFrameTimeIfNecessary();
+
+  /**
+   * Set the animation frame time to @aTime.
+   */
+  void SetAnimationFrameTime(const TimeStamp& aTime);
+
+  /**
+   * The current frame we're on, from 0 to (numFrames - 1).
+   */
+  uint32_t GetCurrentAnimationFrameIndex() const;
+
+  /**
+   * Get the area we refresh when we loop around to the first frame.
+   */
+  nsIntRect GetFirstFrameRefreshArea() const;
+
+  /**
+   * If we have a composited frame for @aFrameNum, returns it. Otherwise,
+   * returns an empty DrawableFrameRef. It is an error to call this method with
+   * aFrameNum == 0, because the first frame is never composited.
+   */
+  DrawableFrameRef GetCompositedFrame(uint32_t aFrameNum);
+
+  /*
+   * Returns the frame's adjusted timeout. If the animation loops and the
+   * timeout falls in between a certain range then the timeout is adjusted so
+   * that it's never 0. If the animation does not loop then no adjustments are
+   * made.
+   */
+  int32_t GetTimeoutForFrame(uint32_t aFrameNum) const;
+
+  /*
+   * Set number of times to loop the image.
+   * @note -1 means loop forever.
+   */
+  void SetLoopCount(int32_t aLoopCount) { mLoopCount = aLoopCount; }
+  int32_t LoopCount() const { return mLoopCount; }
+
+  /**
+   * Collect an accounting of the memory occupied by the compositing surfaces we
+   * use during animation playback. All of the actual animation frames are
+   * stored in the SurfaceCache, so we don't need to report them here.
+   */
+  void CollectSizeOfCompositingSurfaces(nsTArray<SurfaceMemoryCounter>& aCounters,
+                                        MallocSizeOf aMallocSizeOf) const;
+
+private: // methods
+  /**
+   * Gets the length of a single loop of this image, in milliseconds.
+   *
+   * If this image is not finished decoding, is not animated, or it is animated
+   * but does not loop, returns -1. Can return 0 in the case of an animated
+   * image that has a 0ms delay between its frames and does not loop.
+   */
+  int32_t GetSingleLoopTime() const;
+
+  /**
+   * Advances the animation. Typically, this will advance a single frame, but it
+   * may advance multiple frames. This may happen if we have infrequently
+   * "ticking" refresh drivers (e.g. in background tabs), or extremely short-
+   * lived animation frames.
+   *
+   * @param aTime the time that the animation should advance to. This will
+   *              typically be <= TimeStamp::Now().
+   *
+   * @returns a RefreshResult that shows whether the frame was successfully
+   *          advanced, and its resulting dirty rect.
+   */
+  RefreshResult AdvanceFrame(TimeStamp aTime);
+
+  /**
+   * Get the time the frame we're currently displaying is supposed to end.
+   *
+   * In the error case, returns an "infinity" timestamp.
+   */
+  TimeStamp GetCurrentImgFrameEndTime() const;
+
+  bool DoBlend(nsIntRect* aDirtyRect, uint32_t aPrevFrameIndex,
+               uint32_t aNextFrameIndex);
+
+  /**
+   * Get the @aIndex-th frame in the frame index, ignoring results of blending.
+   */
+  RawAccessFrameRef GetRawFrame(uint32_t aFrameNum) const;
+
+  /** Clears an area of <aFrame> with transparent black.
+   *
+   * @param aFrameData Target Frame data
+   * @param aFrameRect The rectangle of the data pointed ot by aFrameData
+   *
+   * @note Does also clears the transparency mask
+   */
+  static void ClearFrame(uint8_t* aFrameData, const nsIntRect& aFrameRect);
+
+  //! @overload
+  static void ClearFrame(uint8_t* aFrameData, const nsIntRect& aFrameRect,
+                         const nsIntRect& aRectToClear);
+
+  //! Copy one frame's image and mask into another
+  static bool CopyFrameImage(const uint8_t* aDataSrc, const nsIntRect& aRectSrc,
+                             uint8_t* aDataDest, const nsIntRect& aRectDest);
+
+  /**
+   * Draws one frame's image to into another, at the position specified by
+   * aSrcRect.
+   *
+   * @aSrcData the raw data of the current frame being drawn
+   * @aSrcRect the size of the source frame, and the position of that frame in
+   *           the composition frame
+   * @aSrcPaletteLength the length (in bytes) of the palette at the beginning
+   *                    of the source data (0 if image is not paletted)
+   * @aSrcHasAlpha whether the source data represents an image with alpha
+   * @aDstPixels the raw data of the composition frame where the current frame
+   *             is drawn into (32-bit ARGB)
+   * @aDstRect the size of the composition frame
+   * @aBlendMethod the blend method for how to blend src on the composition
+   * frame.
+   */
+  static nsresult DrawFrameTo(const uint8_t* aSrcData,
+                              const nsIntRect& aSrcRect,
+                              uint32_t aSrcPaletteLength, bool aSrcHasAlpha,
+                              uint8_t* aDstPixels, const nsIntRect& aDstRect,
+                              BlendMethod aBlendMethod);
+
+private: // data
+  //! A weak pointer to our owning image.
+  RasterImage* mImage;
+
+  //! The intrinsic size of the image.
+  gfx::IntSize mSize;
+
+  /** For managing blending of frames
+   *
+   * Some animations will use the compositingFrame to composite images
+   * and just hand this back to the caller when it is time to draw the frame.
+   * NOTE: When clearing compositingFrame, remember to set
+   *       lastCompositedFrameIndex to -1.  Code assume that if
+   *       lastCompositedFrameIndex >= 0 then compositingFrame exists.
+   */
+  RawAccessFrameRef mCompositingFrame;
+
+  /** the previous composited frame, for DISPOSE_RESTORE_PREVIOUS
+   *
+   * The Previous Frame (all frames composited up to the current) needs to be
+   * stored in cases where the image specifies it wants the last frame back
+   * when it's done with the current frame.
+   */
+  RawAccessFrameRef mCompositingPrevFrame;
+
+  //! Area of the first frame that needs to be redrawn on subsequent loops.
+  nsIntRect mFirstFrameRefreshArea;
+
+  //! the time that the animation advanced to the current frame
+  TimeStamp mCurrentAnimationFrameTime;
+
+  //! The current frame index we're on. 0 to (numFrames - 1).
+  uint32_t mCurrentAnimationFrameIndex;
+
+  //! number of loops remaining before animation stops (-1 no stop)
+  int32_t mLoopRemainingCount;
+
+  //! Track the last composited frame for Optimizations (See DoComposite code)
+  int32_t mLastCompositedFrameIndex;
+
+  //! The total number of loops for the image.
+  int32_t mLoopCount;
+
+  //! The animation mode of this image. Constants defined in imgIContainer.
+  uint16_t mAnimationMode;
+
+  //! Whether this image is done being decoded.
+  bool mDoneDecoding;
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_FrameAnimator_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/FrozenImage.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/FrozenImage.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/FrozenImage.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/FrozenImage.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,112 @@
+/* -*- 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 "FrozenImage.h"
+
+namespace mozilla {
+
+using namespace gfx;
+
+namespace image {
+
+NS_IMPL_ISUPPORTS_INHERITED0(FrozenImage, ImageWrapper)
+
+void
+FrozenImage::IncrementAnimationConsumers()
+{
+  // Do nothing. This will prevent animation from starting if there are no other
+  // instances of this image.
+}
+
+void
+FrozenImage::DecrementAnimationConsumers()
+{
+  // Do nothing.
+}
+
+NS_IMETHODIMP
+FrozenImage::GetAnimated(bool* aAnimated)
+{
+  bool dummy;
+  nsresult rv = InnerImage()->GetAnimated(&dummy);
+  if (NS_SUCCEEDED(rv)) {
+    *aAnimated = false;
+  }
+  return rv;
+}
+
+NS_IMETHODIMP_(TemporaryRef<SourceSurface>)
+FrozenImage::GetFrame(uint32_t aWhichFrame,
+                      uint32_t aFlags)
+{
+  return InnerImage()->GetFrame(FRAME_FIRST, aFlags);
+}
+
+NS_IMETHODIMP_(bool)
+FrozenImage::IsImageContainerAvailable(LayerManager* aManager, uint32_t aFlags)
+{
+  return false;
+}
+
+NS_IMETHODIMP_(already_AddRefed<ImageContainer>)
+FrozenImage::GetImageContainer(layers::LayerManager* aManager, uint32_t aFlags)
+{
+  // XXX(seth): GetImageContainer does not currently support anything but the
+  // current frame. We work around this by always returning null, but if it ever
+  // turns out that FrozenImage is widely used on codepaths that can actually
+  // benefit from GetImageContainer, it would be a good idea to fix that method
+  // for performance reasons.
+  return nullptr;
+}
+
+NS_IMETHODIMP_(DrawResult)
+FrozenImage::Draw(gfxContext* aContext,
+                  const nsIntSize& aSize,
+                  const ImageRegion& aRegion,
+                  uint32_t /* aWhichFrame - ignored */,
+                  GraphicsFilter aFilter,
+                  const Maybe<SVGImageContext>& aSVGContext,
+                  uint32_t aFlags)
+{
+  return InnerImage()->Draw(aContext, aSize, aRegion, FRAME_FIRST,
+                            aFilter, aSVGContext, aFlags);
+}
+
+NS_IMETHODIMP_(void)
+FrozenImage::RequestRefresh(const TimeStamp& aTime)
+{
+  // Do nothing.
+}
+
+NS_IMETHODIMP
+FrozenImage::GetAnimationMode(uint16_t* aAnimationMode)
+{
+  *aAnimationMode = kNormalAnimMode;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+FrozenImage::SetAnimationMode(uint16_t aAnimationMode)
+{
+  // Do nothing.
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+FrozenImage::ResetAnimation()
+{
+  // Do nothing.
+  return NS_OK;
+}
+
+NS_IMETHODIMP_(float)
+FrozenImage::GetFrameIndex(uint32_t aWhichFrame)
+{
+  MOZ_ASSERT(aWhichFrame <= FRAME_MAX_VALUE, "Invalid argument");
+  return 0;
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/FrozenImage.h firefox-trunk-41.0~a1~hg20150524r245419/image/FrozenImage.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/FrozenImage.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/FrozenImage.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,69 @@
+/* -*- 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_image_FrozenImage_h
+#define mozilla_image_FrozenImage_h
+
+#include "ImageWrapper.h"
+#include "mozilla/gfx/2D.h"
+#include "mozilla/RefPtr.h"
+
+namespace mozilla {
+namespace image {
+
+/**
+ * An Image wrapper that disables animation, freezing the image at its first
+ * frame. It does this using two strategies. If this is the only instance of the
+ * image, animation will never start, because IncrementAnimationConsumers is
+ * ignored. If there is another instance that is animated, that's still OK,
+ * because any imgIContainer method that is affected by animation gets its
+ * aWhichFrame argument set to FRAME_FIRST when it passes through FrozenImage.
+ *
+ * XXX(seth): There a known (performance, not correctness) issue with
+ * GetImageContainer. See the comments for that method for more information.
+ */
+class FrozenImage : public ImageWrapper
+{
+  typedef gfx::SourceSurface SourceSurface;
+
+public:
+  NS_DECL_ISUPPORTS_INHERITED
+
+  virtual void IncrementAnimationConsumers() override;
+  virtual void DecrementAnimationConsumers() override;
+
+  NS_IMETHOD GetAnimated(bool* aAnimated) override;
+  NS_IMETHOD_(TemporaryRef<SourceSurface>)
+    GetFrame(uint32_t aWhichFrame, uint32_t aFlags) override;
+  NS_IMETHOD_(bool) IsImageContainerAvailable(layers::LayerManager* aManager,
+                                              uint32_t aFlags) override;
+  NS_IMETHOD_(already_AddRefed<layers::ImageContainer>)
+    GetImageContainer(layers::LayerManager* aManager,
+                      uint32_t aFlags) override;
+  NS_IMETHOD_(DrawResult) Draw(gfxContext* aContext,
+                               const nsIntSize& aSize,
+                               const ImageRegion& aRegion,
+                               uint32_t aWhichFrame,
+                               GraphicsFilter aFilter,
+                               const Maybe<SVGImageContext>& aSVGContext,
+                               uint32_t aFlags) override;
+  NS_IMETHOD_(void) RequestRefresh(const TimeStamp& aTime) override;
+  NS_IMETHOD GetAnimationMode(uint16_t* aAnimationMode) override;
+  NS_IMETHOD SetAnimationMode(uint16_t aAnimationMode) override;
+  NS_IMETHOD ResetAnimation() override;
+  NS_IMETHOD_(float) GetFrameIndex(uint32_t aWhichFrame) override;
+
+protected:
+  explicit FrozenImage(Image* aImage) : ImageWrapper(aImage) { }
+  virtual ~FrozenImage() { }
+
+private:
+  friend class ImageOps;
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_FrozenImage_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/ICOFileHeaders.h firefox-trunk-41.0~a1~hg20150524r245419/image/ICOFileHeaders.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/ICOFileHeaders.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/ICOFileHeaders.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,81 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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_image_ICOFileHeaders_h
+#define mozilla_image_ICOFileHeaders_h
+
+namespace mozilla {
+namespace image {
+
+#define ICONFILEHEADERSIZE 6
+#define ICODIRENTRYSIZE 16
+#define PNGSIGNATURESIZE 8
+#define BMPFILEHEADERSIZE 14
+
+/**
+ * The header that comes right at the start of an icon file. (This
+ * corresponds to the Windows ICONDIR structure.)
+ */
+struct IconFileHeader
+{
+  /**
+   * Must be set to 0;
+   */
+  uint16_t   mReserved;
+  /**
+   * 1 for icon (.ICO) image (or 2 for cursor (.CUR) image (icon with the
+   * addition of a hotspot), but we don't support cursor).
+   */
+  uint16_t   mType;
+  /**
+   * The number of BMP/PNG images contained in the icon file.
+   */
+  uint16_t   mCount;
+};
+
+/**
+ * For each BMP/PNG image that the icon file contains there must be a
+ * corresponding icon dir entry. (This corresponds to the Windows
+ * ICONDIRENTRY structure.) These entries are encoded directly after the
+ * IconFileHeader.
+ */
+struct IconDirEntry
+{
+  uint8_t   mWidth;
+  uint8_t   mHeight;
+  /**
+   * The number of colors in the color palette of the BMP/PNG that this dir
+   * entry corresponds to, or 0 if the image does not use a color palette.
+   */
+  uint8_t   mColorCount;
+  /**
+   * Should be set to 0.
+   */
+  uint8_t   mReserved;
+  union {
+    uint16_t mPlanes;   // ICO
+    uint16_t mXHotspot; // CUR
+  };
+  union {
+    uint16_t mBitCount; // ICO (bits per pixel)
+    uint16_t mYHotspot; // CUR
+  };
+  /**
+   * "bytes in resource" is the length of the encoded BMP/PNG that this dir
+   * entry corresponds to.
+   */
+  uint32_t  mBytesInRes;
+  /**
+   * The offset of the start of the encoded BMP/PNG that this dir entry
+   * corresponds to (from the start of the icon file).
+   */
+  uint32_t  mImageOffset;
+};
+
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_ICOFileHeaders_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/ImageCacheKey.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/ImageCacheKey.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/ImageCacheKey.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/ImageCacheKey.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,123 @@
+/* -*- 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 "ImageCacheKey.h"
+
+#include "mozilla/Move.h"
+#include "File.h"
+#include "ImageURL.h"
+#include "nsHostObjectProtocolHandler.h"
+#include "nsString.h"
+
+namespace mozilla {
+
+using namespace dom;
+
+namespace image {
+
+bool
+URISchemeIs(ImageURL* aURI, const char* aScheme)
+{
+  bool schemeMatches = false;
+  if (NS_WARN_IF(NS_FAILED(aURI->SchemeIs(aScheme, &schemeMatches)))) {
+    return false;
+  }
+  return schemeMatches;
+}
+
+static Maybe<uint64_t>
+BlobSerial(ImageURL* aURI)
+{
+  nsAutoCString spec;
+  aURI->GetSpec(spec);
+
+  nsRefPtr<BlobImpl> blob;
+  if (NS_SUCCEEDED(NS_GetBlobForBlobURISpec(spec, getter_AddRefs(blob))) &&
+      blob) {
+    return Some(blob->GetSerialNumber());
+  }
+
+  return Nothing();
+}
+
+ImageCacheKey::ImageCacheKey(nsIURI* aURI)
+  : mURI(new ImageURL(aURI))
+  , mIsChrome(URISchemeIs(mURI, "chrome"))
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  if (URISchemeIs(mURI, "blob")) {
+    mBlobSerial = BlobSerial(mURI);
+  }
+
+  mHash = ComputeHash(mURI, mBlobSerial);
+}
+
+ImageCacheKey::ImageCacheKey(ImageURL* aURI)
+  : mURI(aURI)
+  , mIsChrome(URISchemeIs(mURI, "chrome"))
+{
+  MOZ_ASSERT(aURI);
+
+  if (URISchemeIs(mURI, "blob")) {
+    mBlobSerial = BlobSerial(mURI);
+  }
+
+  mHash = ComputeHash(mURI, mBlobSerial);
+}
+
+ImageCacheKey::ImageCacheKey(const ImageCacheKey& aOther)
+  : mURI(aOther.mURI)
+  , mBlobSerial(aOther.mBlobSerial)
+  , mHash(aOther.mHash)
+  , mIsChrome(aOther.mIsChrome)
+{ }
+
+ImageCacheKey::ImageCacheKey(ImageCacheKey&& aOther)
+  : mURI(Move(aOther.mURI))
+  , mBlobSerial(Move(aOther.mBlobSerial))
+  , mHash(aOther.mHash)
+  , mIsChrome(aOther.mIsChrome)
+{ }
+
+bool
+ImageCacheKey::operator==(const ImageCacheKey& aOther) const
+{
+  if (mBlobSerial || aOther.mBlobSerial) {
+    // If at least one of us has a blob serial, just compare those.
+    return mBlobSerial == aOther.mBlobSerial;
+  }
+
+  // For non-blob URIs, compare the URIs.
+  return *mURI == *aOther.mURI;
+}
+
+const char*
+ImageCacheKey::Spec() const
+{
+  return mURI->Spec();
+}
+
+/* static */ uint32_t
+ImageCacheKey::ComputeHash(ImageURL* aURI,
+                           const Maybe<uint64_t>& aBlobSerial)
+{
+  // Since we frequently call Hash() several times in a row on the same
+  // ImageCacheKey, as an optimization we compute our hash once and store it.
+
+  if (aBlobSerial) {
+    // For blob URIs, we hash the serial number of the underlying blob, so that
+    // different blob URIs which point to the same blob share a cache entry.
+    return HashGeneric(*aBlobSerial);
+  }
+
+  // For non-blob URIs, we hash the URI spec.
+  nsAutoCString spec;
+  aURI->GetSpec(spec);
+  return HashString(spec);
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/ImageCacheKey.h firefox-trunk-41.0~a1~hg20150524r245419/image/ImageCacheKey.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/ImageCacheKey.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/ImageCacheKey.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,59 @@
+/* -*- 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/. */
+
+/**
+ * ImageCacheKey is the key type for the image cache (see imgLoader.h).
+ */
+
+#ifndef mozilla_image_src_ImageCacheKey_h
+#define mozilla_image_src_ImageCacheKey_h
+
+#include "mozilla/Maybe.h"
+
+class nsIURI;
+
+namespace mozilla {
+namespace image {
+
+class ImageURL;
+
+/**
+ * An ImageLib cache entry key.
+ *
+ * We key the cache on the initial URI (before any redirects), with some
+ * canonicalization applied. See ComputeHash() for the details.
+ */
+class ImageCacheKey final
+{
+public:
+  explicit ImageCacheKey(nsIURI* aURI);
+  explicit ImageCacheKey(ImageURL* aURI);
+
+  ImageCacheKey(const ImageCacheKey& aOther);
+  ImageCacheKey(ImageCacheKey&& aOther);
+
+  bool operator==(const ImageCacheKey& aOther) const;
+  uint32_t Hash() const { return mHash; }
+
+  /// A weak pointer to the URI spec for this cache entry. For logging only.
+  const char* Spec() const;
+
+  /// Is this cache entry for a chrome image?
+  bool IsChrome() const { return mIsChrome; }
+
+private:
+  static uint32_t ComputeHash(ImageURL* aURI,
+                              const Maybe<uint64_t>& aBlobSerial);
+
+  nsRefPtr<ImageURL> mURI;
+  Maybe<uint64_t> mBlobSerial;
+  uint32_t mHash;
+  bool mIsChrome;
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_src_ImageCacheKey_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/Image.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/Image.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/Image.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/Image.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,198 @@
+/* -*- 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 "nsMimeTypes.h"
+
+#include "Image.h"
+#include "nsRefreshDriver.h"
+#include "mozilla/TimeStamp.h"
+
+namespace mozilla {
+namespace image {
+
+///////////////////////////////////////////////////////////////////////////////
+// Memory Reporting
+///////////////////////////////////////////////////////////////////////////////
+
+ImageMemoryCounter::ImageMemoryCounter(Image* aImage,
+                                       MallocSizeOf aMallocSizeOf,
+                                       bool aIsUsed)
+  : mIsUsed(aIsUsed)
+{
+  MOZ_ASSERT(aImage);
+
+  // Extract metadata about the image.
+  nsRefPtr<ImageURL> imageURL(aImage->GetURI());
+  if (imageURL) {
+    imageURL->GetSpec(mURI);
+  }
+
+  int32_t width = 0;
+  int32_t height = 0;
+  aImage->GetWidth(&width);
+  aImage->GetHeight(&height);
+  mIntrinsicSize.SizeTo(width, height);
+
+  mType = aImage->GetType();
+
+  // Populate memory counters for source and decoded data.
+  mValues.SetSource(aImage->SizeOfSourceWithComputedFallback(aMallocSizeOf));
+  aImage->CollectSizeOfSurfaces(mSurfaces, aMallocSizeOf);
+
+  // Compute totals.
+  for (const SurfaceMemoryCounter& surfaceCounter : mSurfaces) {
+    mValues += surfaceCounter.Values();
+  }
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+// Image Base Types
+///////////////////////////////////////////////////////////////////////////////
+
+// Constructor
+ImageResource::ImageResource(ImageURL* aURI) :
+  mURI(aURI),
+  mInnerWindowId(0),
+  mAnimationConsumers(0),
+  mAnimationMode(kNormalAnimMode),
+  mInitialized(false),
+  mAnimating(false),
+  mError(false)
+{ }
+
+ImageResource::~ImageResource()
+{
+  // Ask our ProgressTracker to drop its weak reference to us.
+  mProgressTracker->ResetImage();
+}
+
+// Translates a mimetype into a concrete decoder
+Image::eDecoderType
+Image::GetDecoderType(const char* aMimeType)
+{
+  // By default we don't know
+  eDecoderType rv = eDecoderType_unknown;
+
+  // PNG
+  if (!strcmp(aMimeType, IMAGE_PNG)) {
+    rv = eDecoderType_png;
+
+  } else if (!strcmp(aMimeType, IMAGE_X_PNG)) {
+    rv = eDecoderType_png;
+
+  // GIF
+  } else if (!strcmp(aMimeType, IMAGE_GIF)) {
+    rv = eDecoderType_gif;
+
+  // JPEG
+  } else if (!strcmp(aMimeType, IMAGE_JPEG)) {
+    rv = eDecoderType_jpeg;
+  } else if (!strcmp(aMimeType, IMAGE_PJPEG)) {
+    rv = eDecoderType_jpeg;
+  } else if (!strcmp(aMimeType, IMAGE_JPG)) {
+    rv = eDecoderType_jpeg;
+
+  // BMP
+  } else if (!strcmp(aMimeType, IMAGE_BMP)) {
+    rv = eDecoderType_bmp;
+  } else if (!strcmp(aMimeType, IMAGE_BMP_MS)) {
+    rv = eDecoderType_bmp;
+
+  // ICO
+  } else if (!strcmp(aMimeType, IMAGE_ICO)) {
+    rv = eDecoderType_ico;
+  } else if (!strcmp(aMimeType, IMAGE_ICO_MS)) {
+    rv = eDecoderType_ico;
+
+  // Icon
+  } else if (!strcmp(aMimeType, IMAGE_ICON_MS)) {
+    rv = eDecoderType_icon;
+  }
+
+  return rv;
+}
+
+void
+ImageResource::IncrementAnimationConsumers()
+{
+  MOZ_ASSERT(NS_IsMainThread(), "Main thread only to encourage serialization "
+                                "with DecrementAnimationConsumers");
+  mAnimationConsumers++;
+}
+
+void
+ImageResource::DecrementAnimationConsumers()
+{
+  MOZ_ASSERT(NS_IsMainThread(), "Main thread only to encourage serialization "
+                                "with IncrementAnimationConsumers");
+  MOZ_ASSERT(mAnimationConsumers >= 1,
+             "Invalid no. of animation consumers!");
+  mAnimationConsumers--;
+}
+
+nsresult
+ImageResource::GetAnimationModeInternal(uint16_t* aAnimationMode)
+{
+  if (mError) {
+    return NS_ERROR_FAILURE;
+  }
+
+  NS_ENSURE_ARG_POINTER(aAnimationMode);
+
+  *aAnimationMode = mAnimationMode;
+  return NS_OK;
+}
+
+nsresult
+ImageResource::SetAnimationModeInternal(uint16_t aAnimationMode)
+{
+  if (mError) {
+    return NS_ERROR_FAILURE;
+  }
+
+  NS_ASSERTION(aAnimationMode == kNormalAnimMode ||
+               aAnimationMode == kDontAnimMode ||
+               aAnimationMode == kLoopOnceAnimMode,
+               "Wrong Animation Mode is being set!");
+
+  mAnimationMode = aAnimationMode;
+
+  return NS_OK;
+}
+
+bool
+ImageResource::HadRecentRefresh(const TimeStamp& aTime)
+{
+  // Our threshold for "recent" is 1/2 of the default refresh-driver interval.
+  // This ensures that we allow for frame rates at least as fast as the
+  // refresh driver's default rate.
+  static TimeDuration recentThreshold =
+      TimeDuration::FromMilliseconds(nsRefreshDriver::DefaultInterval() / 2.0);
+
+  if (!mLastRefreshTime.IsNull() &&
+      aTime - mLastRefreshTime < recentThreshold) {
+    return true;
+  }
+
+  // else, we can proceed with a refresh.
+  // But first, update our last refresh time:
+  mLastRefreshTime = aTime;
+  return false;
+}
+
+void
+ImageResource::EvaluateAnimation()
+{
+  if (!mAnimating && ShouldAnimate()) {
+    nsresult rv = StartAnimation();
+    mAnimating = NS_SUCCEEDED(rv);
+  } else if (mAnimating && !ShouldAnimate()) {
+    StopAnimation();
+  }
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/ImageFactory.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/ImageFactory.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/ImageFactory.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/ImageFactory.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,316 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <algorithm>
+
+#include "mozilla/Likely.h"
+
+#include "nsIHttpChannel.h"
+#include "nsIFileChannel.h"
+#include "nsIFile.h"
+#include "nsMimeTypes.h"
+#include "nsIRequest.h"
+
+#include "MultipartImage.h"
+#include "RasterImage.h"
+#include "VectorImage.h"
+#include "Image.h"
+#include "nsMediaFragmentURIParser.h"
+#include "nsContentUtils.h"
+#include "nsIScriptSecurityManager.h"
+
+#include "ImageFactory.h"
+#include "gfxPrefs.h"
+
+namespace mozilla {
+namespace image {
+
+/*static*/ void
+ImageFactory::Initialize()
+{ }
+
+static bool
+ShouldDownscaleDuringDecode(const nsCString& aMimeType)
+{
+  return aMimeType.EqualsLiteral(IMAGE_JPEG) ||
+         aMimeType.EqualsLiteral(IMAGE_JPG) ||
+         aMimeType.EqualsLiteral(IMAGE_PJPEG);
+}
+
+static uint32_t
+ComputeImageFlags(ImageURL* uri, const nsCString& aMimeType, bool isMultiPart)
+{
+  nsresult rv;
+
+  // We default to the static globals.
+  bool isDiscardable = gfxPrefs::ImageMemDiscardable();
+  bool doDecodeOnlyOnDraw = gfxPrefs::ImageDecodeOnlyOnDrawEnabled() &&
+                            gfxPrefs::AsyncPanZoomEnabled();
+  bool doDecodeImmediately = gfxPrefs::ImageDecodeImmediatelyEnabled();
+  bool doDownscaleDuringDecode = gfxPrefs::ImageDownscaleDuringDecodeEnabled();
+
+  // We want UI to be as snappy as possible and not to flicker. Disable
+  // discarding and decode-only-on-draw for chrome URLS.
+  bool isChrome = false;
+  rv = uri->SchemeIs("chrome", &isChrome);
+  if (NS_SUCCEEDED(rv) && isChrome) {
+    isDiscardable = doDecodeOnlyOnDraw = false;
+  }
+
+  // We don't want resources like the "loading" icon to be discardable or
+  // decode-only-on-draw either.
+  bool isResource = false;
+  rv = uri->SchemeIs("resource", &isResource);
+  if (NS_SUCCEEDED(rv) && isResource) {
+    isDiscardable = doDecodeOnlyOnDraw = false;
+  }
+
+  // Downscale-during-decode and decode-only-on-draw are only enabled for
+  // certain content types.
+  if ((doDownscaleDuringDecode || doDecodeOnlyOnDraw) &&
+      !ShouldDownscaleDuringDecode(aMimeType)) {
+    doDownscaleDuringDecode = false;
+    doDecodeOnlyOnDraw = false;
+  }
+
+  // If we're decoding immediately, disable decode-only-on-draw.
+  if (doDecodeImmediately) {
+    doDecodeOnlyOnDraw = false;
+  }
+
+  // For multipart/x-mixed-replace, we basically want a direct channel to the
+  // decoder. Disable everything for this case.
+  if (isMultiPart) {
+    isDiscardable = doDecodeOnlyOnDraw = doDownscaleDuringDecode = false;
+  }
+
+  // We have all the information we need.
+  uint32_t imageFlags = Image::INIT_FLAG_NONE;
+  if (isDiscardable) {
+    imageFlags |= Image::INIT_FLAG_DISCARDABLE;
+  }
+  if (doDecodeOnlyOnDraw) {
+    imageFlags |= Image::INIT_FLAG_DECODE_ONLY_ON_DRAW;
+  }
+  if (doDecodeImmediately) {
+    imageFlags |= Image::INIT_FLAG_DECODE_IMMEDIATELY;
+  }
+  if (isMultiPart) {
+    imageFlags |= Image::INIT_FLAG_TRANSIENT;
+  }
+  if (doDownscaleDuringDecode) {
+    imageFlags |= Image::INIT_FLAG_DOWNSCALE_DURING_DECODE;
+  }
+
+  return imageFlags;
+}
+
+/* static */ already_AddRefed<Image>
+ImageFactory::CreateImage(nsIRequest* aRequest,
+                          ProgressTracker* aProgressTracker,
+                          const nsCString& aMimeType,
+                          ImageURL* aURI,
+                          bool aIsMultiPart,
+                          uint32_t aInnerWindowId)
+{
+  MOZ_ASSERT(gfxPrefs::SingletonExists(),
+             "Pref observers should have been initialized already");
+
+  // Compute the image's initialization flags.
+  uint32_t imageFlags = ComputeImageFlags(aURI, aMimeType, aIsMultiPart);
+
+  // Select the type of image to create based on MIME type.
+  if (aMimeType.EqualsLiteral(IMAGE_SVG_XML)) {
+    return CreateVectorImage(aRequest, aProgressTracker, aMimeType,
+                             aURI, imageFlags, aInnerWindowId);
+  } else {
+    return CreateRasterImage(aRequest, aProgressTracker, aMimeType,
+                             aURI, imageFlags, aInnerWindowId);
+  }
+}
+
+// Marks an image as having an error before returning it. Used with macros like
+// NS_ENSURE_SUCCESS, since we guarantee to always return an image even if an
+// error occurs, but callers need to be able to tell that this happened.
+template <typename T>
+static already_AddRefed<Image>
+BadImage(nsRefPtr<T>& image)
+{
+  image->SetHasError();
+  return image.forget();
+}
+
+/* static */ already_AddRefed<Image>
+ImageFactory::CreateAnonymousImage(const nsCString& aMimeType)
+{
+  nsresult rv;
+
+  nsRefPtr<RasterImage> newImage = new RasterImage();
+
+  nsRefPtr<ProgressTracker> newTracker = new ProgressTracker();
+  newTracker->SetImage(newImage);
+  newImage->SetProgressTracker(newTracker);
+
+  rv = newImage->Init(aMimeType.get(), Image::INIT_FLAG_NONE);
+  NS_ENSURE_SUCCESS(rv, BadImage(newImage));
+
+  return newImage.forget();
+}
+
+/* static */ already_AddRefed<MultipartImage>
+ImageFactory::CreateMultipartImage(Image* aFirstPart,
+                                   ProgressTracker* aProgressTracker)
+{
+  MOZ_ASSERT(aFirstPart);
+  MOZ_ASSERT(aProgressTracker);
+
+  nsRefPtr<MultipartImage> newImage = new MultipartImage(aFirstPart);
+  aProgressTracker->SetImage(newImage);
+  newImage->SetProgressTracker(aProgressTracker);
+
+  newImage->Init();
+
+  return newImage.forget();
+}
+
+int32_t
+SaturateToInt32(int64_t val)
+{
+  if (val > INT_MAX) {
+    return INT_MAX;
+  }
+  if (val < INT_MIN) {
+    return INT_MIN;
+  }
+
+  return static_cast<int32_t>(val);
+}
+
+uint32_t
+GetContentSize(nsIRequest* aRequest)
+{
+  nsCOMPtr<nsIChannel> channel(do_QueryInterface(aRequest));
+  if (channel) {
+    int64_t size;
+    nsresult rv = channel->GetContentLength(&size);
+    if (NS_SUCCEEDED(rv)) {
+      return std::max(SaturateToInt32(size), 0);
+    }
+  }
+
+  // Use the file size as a size hint for file channels.
+  nsCOMPtr<nsIFileChannel> fileChannel(do_QueryInterface(aRequest));
+  if (fileChannel) {
+    nsCOMPtr<nsIFile> file;
+    nsresult rv = fileChannel->GetFile(getter_AddRefs(file));
+    if (NS_SUCCEEDED(rv)) {
+      int64_t filesize;
+      rv = file->GetFileSize(&filesize);
+      if (NS_SUCCEEDED(rv)) {
+        return std::max(SaturateToInt32(filesize), 0);
+      }
+    }
+  }
+
+  // Fallback - neither http nor file. We'll use dynamic allocation.
+  return 0;
+}
+
+/* static */ already_AddRefed<Image>
+ImageFactory::CreateRasterImage(nsIRequest* aRequest,
+                                ProgressTracker* aProgressTracker,
+                                const nsCString& aMimeType,
+                                ImageURL* aURI,
+                                uint32_t aImageFlags,
+                                uint32_t aInnerWindowId)
+{
+  MOZ_ASSERT(aProgressTracker);
+
+  nsresult rv;
+
+  nsRefPtr<RasterImage> newImage = new RasterImage(aURI);
+  aProgressTracker->SetImage(newImage);
+  newImage->SetProgressTracker(aProgressTracker);
+
+  rv = newImage->Init(aMimeType.get(), aImageFlags);
+  NS_ENSURE_SUCCESS(rv, BadImage(newImage));
+
+  newImage->SetInnerWindowID(aInnerWindowId);
+
+  uint32_t len = GetContentSize(aRequest);
+
+  // Pass anything usable on so that the RasterImage can preallocate
+  // its source buffer.
+  if (len > 0) {
+    // Bound by something reasonable
+    uint32_t sizeHint = std::min<uint32_t>(len, 20000000);
+    rv = newImage->SetSourceSizeHint(sizeHint);
+    if (NS_FAILED(rv)) {
+      // Flush memory, try to get some back, and try again.
+      rv = nsMemory::HeapMinimize(true);
+      nsresult rv2 = newImage->SetSourceSizeHint(sizeHint);
+      // If we've still failed at this point, things are going downhill.
+      if (NS_FAILED(rv) || NS_FAILED(rv2)) {
+        NS_WARNING("About to hit OOM in imagelib!");
+      }
+    }
+  }
+
+  nsAutoCString ref;
+  aURI->GetRef(ref);
+  net::nsMediaFragmentURIParser parser(ref);
+  if (parser.HasResolution()) {
+    newImage->SetRequestedResolution(parser.GetResolution());
+  }
+
+  if (parser.HasSampleSize()) {
+      /* Get our principal */
+      nsCOMPtr<nsIChannel> chan(do_QueryInterface(aRequest));
+      nsCOMPtr<nsIPrincipal> principal;
+      if (chan) {
+        nsContentUtils::GetSecurityManager()
+          ->GetChannelResultPrincipal(chan, getter_AddRefs(principal));
+      }
+
+      if ((principal &&
+           principal->GetAppStatus() == nsIPrincipal::APP_STATUS_CERTIFIED) ||
+          gfxPrefs::ImageMozSampleSizeEnabled()) {
+        newImage->SetRequestedSampleSize(parser.GetSampleSize());
+      }
+  }
+
+  return newImage.forget();
+}
+
+/* static */ already_AddRefed<Image>
+ImageFactory::CreateVectorImage(nsIRequest* aRequest,
+                                ProgressTracker* aProgressTracker,
+                                const nsCString& aMimeType,
+                                ImageURL* aURI,
+                                uint32_t aImageFlags,
+                                uint32_t aInnerWindowId)
+{
+  MOZ_ASSERT(aProgressTracker);
+
+  nsresult rv;
+
+  nsRefPtr<VectorImage> newImage = new VectorImage(aURI);
+  aProgressTracker->SetImage(newImage);
+  newImage->SetProgressTracker(aProgressTracker);
+
+  rv = newImage->Init(aMimeType.get(), aImageFlags);
+  NS_ENSURE_SUCCESS(rv, BadImage(newImage));
+
+  newImage->SetInnerWindowID(aInnerWindowId);
+
+  rv = newImage->OnStartRequest(aRequest, nullptr);
+  NS_ENSURE_SUCCESS(rv, BadImage(newImage));
+
+  return newImage.forget();
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/ImageFactory.h firefox-trunk-41.0~a1~hg20150524r245419/image/ImageFactory.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/ImageFactory.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/ImageFactory.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,95 @@
+/* -*- 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_image_ImageFactory_h
+#define mozilla_image_ImageFactory_h
+
+#include "nsCOMPtr.h"
+#include "nsProxyRelease.h"
+
+class nsCString;
+class nsIRequest;
+
+namespace mozilla {
+namespace image {
+
+class Image;
+class ImageURL;
+class MultipartImage;
+class ProgressTracker;
+
+class ImageFactory
+{
+public:
+  /**
+   * Registers vars with Preferences. Should only be called on the main thread.
+   */
+  static void Initialize();
+
+  /**
+   * Creates a new image with the given properties.
+   * Can be called on or off the main thread.
+   *
+   * @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,
+                                             ProgressTracker* aProgressTracker,
+                                             const nsCString& aMimeType,
+                                             ImageURL* aURI,
+                                             bool aIsMultiPart,
+                                             uint32_t aInnerWindowId);
+  /**
+   * Creates a new image which isn't associated with a URI or loaded through
+   * the usual image loading mechanism.
+   *
+   * @param aMimeType      The mimetype of the image.
+   */
+  static already_AddRefed<Image>
+  CreateAnonymousImage(const nsCString& aMimeType);
+
+  /**
+   * Creates a new multipart/x-mixed-replace image wrapper, and initializes it
+   * with the first part. Subsequent parts should be passed to the existing
+   * MultipartImage via MultipartImage::BeginTransitionToPart().
+   *
+   * @param aFirstPart       An image containing the first part of the multipart
+   *                         stream.
+   * @param aProgressTracker A progress tracker for the multipart image.
+   */
+  static already_AddRefed<MultipartImage>
+  CreateMultipartImage(Image* aFirstPart, ProgressTracker* aProgressTracker);
+
+private:
+  // Factory functions that create specific types of image containers.
+  static already_AddRefed<Image>
+  CreateRasterImage(nsIRequest* aRequest,
+                    ProgressTracker* aProgressTracker,
+                    const nsCString& aMimeType,
+                    ImageURL* aURI,
+                    uint32_t aImageFlags,
+                    uint32_t aInnerWindowId);
+
+  static already_AddRefed<Image>
+  CreateVectorImage(nsIRequest* aRequest,
+                    ProgressTracker* aProgressTracker,
+                    const nsCString& aMimeType,
+                    ImageURL* aURI,
+                    uint32_t aImageFlags,
+                    uint32_t aInnerWindowId);
+
+  // This is a static factory class, so disallow instantiation.
+  virtual ~ImageFactory() = 0;
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_ImageFactory_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/Image.h firefox-trunk-41.0~a1~hg20150524r245419/image/Image.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/Image.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/Image.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,342 @@
+/* -*- 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_image_Image_h
+#define mozilla_image_Image_h
+
+#include "mozilla/MemoryReporting.h"
+#include "mozilla/TimeStamp.h"
+#include "gfx2DGlue.h"                // for gfxMemoryLocation
+#include "imgIContainer.h"
+#include "ImageURL.h"
+#include "nsStringFwd.h"
+#include "ProgressTracker.h"
+#include "SurfaceCache.h"
+
+class nsIRequest;
+class nsIInputStream;
+
+namespace mozilla {
+namespace image {
+
+class Image;
+
+///////////////////////////////////////////////////////////////////////////////
+// Memory Reporting
+///////////////////////////////////////////////////////////////////////////////
+
+struct MemoryCounter
+{
+  MemoryCounter()
+    : mSource(0)
+    , mDecodedHeap(0)
+    , mDecodedNonHeap(0)
+  { }
+
+  void SetSource(size_t aCount) { mSource = aCount; }
+  size_t Source() const { return mSource; }
+  void SetDecodedHeap(size_t aCount) { mDecodedHeap = aCount; }
+  size_t DecodedHeap() const { return mDecodedHeap; }
+  void SetDecodedNonHeap(size_t aCount) { mDecodedNonHeap = aCount; }
+  size_t DecodedNonHeap() const { return mDecodedNonHeap; }
+
+  MemoryCounter& operator+=(const MemoryCounter& aOther)
+  {
+    mSource += aOther.mSource;
+    mDecodedHeap += aOther.mDecodedHeap;
+    mDecodedNonHeap += aOther.mDecodedNonHeap;
+    return *this;
+  }
+
+private:
+  size_t mSource;
+  size_t mDecodedHeap;
+  size_t mDecodedNonHeap;
+};
+
+enum class SurfaceMemoryCounterType
+{
+  NORMAL,
+  COMPOSITING,
+  COMPOSITING_PREV
+};
+
+struct SurfaceMemoryCounter
+{
+  SurfaceMemoryCounter(const SurfaceKey& aKey,
+                       bool aIsLocked,
+                       SurfaceMemoryCounterType aType =
+                         SurfaceMemoryCounterType::NORMAL)
+    : mKey(aKey)
+    , mType(aType)
+    , mIsLocked(aIsLocked)
+  { }
+
+  const SurfaceKey& Key() const { return mKey; }
+  Maybe<gfx::IntSize>& SubframeSize() { return mSubframeSize; }
+  const Maybe<gfx::IntSize>& SubframeSize() const { return mSubframeSize; }
+  MemoryCounter& Values() { return mValues; }
+  const MemoryCounter& Values() const { return mValues; }
+  SurfaceMemoryCounterType Type() const { return mType; }
+  bool IsLocked() const { return mIsLocked; }
+
+private:
+  const SurfaceKey mKey;
+  Maybe<gfx::IntSize> mSubframeSize;
+  MemoryCounter mValues;
+  const SurfaceMemoryCounterType mType;
+  const bool mIsLocked;
+};
+
+struct ImageMemoryCounter
+{
+  ImageMemoryCounter(Image* aImage,
+                     MallocSizeOf aMallocSizeOf,
+                     bool aIsUsed);
+
+  nsCString& URI() { return mURI; }
+  const nsCString& URI() const { return mURI; }
+  const nsTArray<SurfaceMemoryCounter>& Surfaces() const { return mSurfaces; }
+  const gfx::IntSize IntrinsicSize() const { return mIntrinsicSize; }
+  const MemoryCounter& Values() const { return mValues; }
+  uint16_t Type() const { return mType; }
+  bool IsUsed() const { return mIsUsed; }
+
+  bool IsNotable() const
+  {
+    const size_t NotableThreshold = 16 * 1024;
+    size_t total = mValues.Source() + mValues.DecodedHeap()
+                                    + mValues.DecodedNonHeap();
+    return total >= NotableThreshold;
+  }
+
+private:
+  nsCString mURI;
+  nsTArray<SurfaceMemoryCounter> mSurfaces;
+  gfx::IntSize mIntrinsicSize;
+  MemoryCounter mValues;
+  uint16_t mType;
+  const bool mIsUsed;
+};
+
+
+///////////////////////////////////////////////////////////////////////////////
+// Image Base Types
+///////////////////////////////////////////////////////////////////////////////
+
+class Image : public imgIContainer
+{
+public:
+  // Mimetype translation
+  enum eDecoderType {
+    eDecoderType_png     = 0,
+    eDecoderType_gif     = 1,
+    eDecoderType_jpeg    = 2,
+    eDecoderType_bmp     = 3,
+    eDecoderType_ico     = 4,
+    eDecoderType_icon    = 5,
+    eDecoderType_unknown = 6
+  };
+  static eDecoderType GetDecoderType(const char* aMimeType);
+
+  /**
+   * Flags for Image initialization.
+   *
+   * Meanings:
+   *
+   * INIT_FLAG_NONE: Lack of flags
+   *
+   * INIT_FLAG_DISCARDABLE: The container should be discardable
+   *
+   * INIT_FLAG_DECODE_ONLY_ON_DRAW: The container should decode on draw rather
+   * than possibly being speculatively decoded earlier.
+   *
+   * INIT_FLAG_DECODE_IMMEDIATELY: The container should decode as soon as
+   * possible, regardless of what our heuristics say.
+   *
+   * INIT_FLAG_TRANSIENT: The container is likely to exist for only a short time
+   * before being destroyed. (For example, containers for
+   * multipart/x-mixed-replace image parts fall into this category.) If this
+   * flag is set, INIT_FLAG_DISCARDABLE and INIT_FLAG_DECODE_ONLY_ON_DRAW must
+   * not be set.
+   *
+   * INIT_FLAG_DOWNSCALE_DURING_DECODE: The container should attempt to
+   * downscale images during decoding instead of decoding them to their
+   * intrinsic size.
+   */
+  static const uint32_t INIT_FLAG_NONE                     = 0x0;
+  static const uint32_t INIT_FLAG_DISCARDABLE              = 0x1;
+  static const uint32_t INIT_FLAG_DECODE_ONLY_ON_DRAW      = 0x2;
+  static const uint32_t INIT_FLAG_DECODE_IMMEDIATELY       = 0x4;
+  static const uint32_t INIT_FLAG_TRANSIENT                = 0x8;
+  static const uint32_t INIT_FLAG_DOWNSCALE_DURING_DECODE  = 0x10;
+
+  virtual already_AddRefed<ProgressTracker> GetProgressTracker() = 0;
+  virtual void SetProgressTracker(ProgressTracker* aProgressTracker) {}
+
+  /**
+   * The size, in bytes, occupied by the compressed source data of the image.
+   * If MallocSizeOf does not work on this platform, uses a fallback approach to
+   * ensure that something reasonable is always returned.
+   */
+  virtual size_t
+    SizeOfSourceWithComputedFallback(MallocSizeOf aMallocSizeOf) const = 0;
+
+  /**
+   * Collect an accounting of the memory occupied by the image's surfaces (which
+   * together make up its decoded data). Each surface is recorded as a separate
+   * SurfaceMemoryCounter, stored in @aCounters.
+   */
+  virtual void CollectSizeOfSurfaces(nsTArray<SurfaceMemoryCounter>& aCounters,
+                                     MallocSizeOf aMallocSizeOf) const = 0;
+
+  virtual void IncrementAnimationConsumers() = 0;
+  virtual void DecrementAnimationConsumers() = 0;
+#ifdef DEBUG
+  virtual uint32_t GetAnimationConsumers() = 0;
+#endif
+
+  /**
+   * Called from OnDataAvailable when the stream associated with the image has
+   * received new image data. The arguments are the same as OnDataAvailable's,
+   * but by separating this functionality into a different method we don't
+   * interfere with subclasses which wish to implement nsIStreamListener.
+   *
+   * Images should not do anything that could send out notifications until they
+   * have received their first OnImageDataAvailable notification; in
+   * particular, this means that instantiating decoders should be deferred
+   * until OnImageDataAvailable is called.
+   */
+  virtual nsresult OnImageDataAvailable(nsIRequest* aRequest,
+                                        nsISupports* aContext,
+                                        nsIInputStream* aInStr,
+                                        uint64_t aSourceOffset,
+                                        uint32_t aCount) = 0;
+
+  /**
+   * Called from OnStopRequest when the image's underlying request completes.
+   *
+   * @param aRequest  The completed request.
+   * @param aContext  Context from Necko's OnStopRequest.
+   * @param aStatus   A success or failure code.
+   * @param aLastPart Whether this is the final part of the underlying request.
+   */
+  virtual nsresult OnImageDataComplete(nsIRequest* aRequest,
+                                       nsISupports* aContext,
+                                       nsresult aStatus,
+                                       bool aLastPart) = 0;
+
+  /**
+   * Called when the SurfaceCache discards a persistent surface belonging to
+   * this image.
+   */
+  virtual void OnSurfaceDiscarded() = 0;
+
+  virtual void SetInnerWindowID(uint64_t aInnerWindowId) = 0;
+  virtual uint64_t InnerWindowID() const = 0;
+
+  virtual bool HasError() = 0;
+  virtual void SetHasError() = 0;
+
+  virtual ImageURL* GetURI() = 0;
+};
+
+class ImageResource : public Image
+{
+public:
+  already_AddRefed<ProgressTracker> GetProgressTracker() override
+  {
+    nsRefPtr<ProgressTracker> progressTracker = mProgressTracker;
+    MOZ_ASSERT(progressTracker);
+    return progressTracker.forget();
+  }
+
+  void SetProgressTracker(
+                       ProgressTracker* aProgressTracker) override final
+  {
+    MOZ_ASSERT(aProgressTracker);
+    MOZ_ASSERT(!mProgressTracker);
+    mProgressTracker = aProgressTracker;
+  }
+
+  virtual void IncrementAnimationConsumers() override;
+  virtual void DecrementAnimationConsumers() override;
+#ifdef DEBUG
+  virtual uint32_t GetAnimationConsumers() override
+  {
+    return mAnimationConsumers;
+  }
+#endif
+
+  virtual void OnSurfaceDiscarded() override { }
+
+  virtual void SetInnerWindowID(uint64_t aInnerWindowId) override
+  {
+    mInnerWindowId = aInnerWindowId;
+  }
+  virtual uint64_t InnerWindowID() const override { return mInnerWindowId; }
+
+  virtual bool HasError() override    { return mError; }
+  virtual void SetHasError() override { mError = true; }
+
+  /*
+   * Returns a non-AddRefed pointer to the URI associated with this image.
+   * Illegal to use off-main-thread.
+   */
+  virtual ImageURL* GetURI() override { return mURI.get(); }
+
+protected:
+  explicit ImageResource(ImageURL* aURI);
+  ~ImageResource();
+
+  // Shared functionality for implementors of imgIContainer. Every
+  // implementation of attribute animationMode should forward here.
+  nsresult GetAnimationModeInternal(uint16_t* aAnimationMode);
+  nsresult SetAnimationModeInternal(uint16_t aAnimationMode);
+
+  /**
+   * Helper for RequestRefresh.
+   *
+   * If we've had a "recent" refresh (i.e. if this image is being used in
+   * multiple documents & some other document *just* called RequestRefresh() on
+   * this image with a timestamp close to aTime), this method returns true.
+   *
+   * Otherwise, this method updates mLastRefreshTime to aTime & returns false.
+   */
+  bool HadRecentRefresh(const TimeStamp& aTime);
+
+  /**
+   * Decides whether animation should or should not be happening,
+   * and makes sure the right thing is being done.
+   */
+  virtual void EvaluateAnimation();
+
+  /**
+   * Extended by child classes, if they have additional
+   * conditions for being able to animate.
+   */
+  virtual bool ShouldAnimate() {
+    return mAnimationConsumers > 0 && mAnimationMode != kDontAnimMode;
+  }
+
+  virtual nsresult StartAnimation() = 0;
+  virtual nsresult StopAnimation() = 0;
+
+  // Member data shared by all implementations of this abstract class
+  nsRefPtr<ProgressTracker>     mProgressTracker;
+  nsRefPtr<ImageURL>            mURI;
+  TimeStamp                     mLastRefreshTime;
+  uint64_t                      mInnerWindowId;
+  uint32_t                      mAnimationConsumers;
+  uint16_t                      mAnimationMode; // Enum values in imgIContainer
+  bool                          mInitialized:1; // Have we been initalized?
+  bool                          mAnimating:1;   // Are we currently animating?
+  bool                          mError:1;       // Error handling
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_Image_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/ImageLogging.h firefox-trunk-41.0~a1~hg20150524r245419/image/ImageLogging.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/ImageLogging.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/ImageLogging.h	2015-05-25 20:42:42.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef mozilla_image_ImageLogging_h
 #define mozilla_image_ImageLogging_h
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prinrval.h"
 #include "nsString.h"
 
@@ -24,7 +24,7 @@
     , mFrom(aFrom)
     , mFunc(aFunc)
   {
-    PR_LOG(mLog, PR_LOG_DEBUG, ("%d [this=%p] %s {ENTER}\n",
+    MOZ_LOG(mLog, PR_LOG_DEBUG, ("%d [this=%p] %s {ENTER}\n",
                                 GIVE_ME_MS_NOW(), mFrom, mFunc));
   }
 
@@ -35,7 +35,7 @@
     , mFrom(from)
     , mFunc(fn)
   {
-    PR_LOG(mLog, PR_LOG_DEBUG, ("%d [this=%p] %s (%s=\"%s\") {ENTER}\n",
+    MOZ_LOG(mLog, PR_LOG_DEBUG, ("%d [this=%p] %s (%s=\"%s\") {ENTER}\n",
                                  GIVE_ME_MS_NOW(), mFrom, mFunc,
                                  paramName, paramValue));
   }
@@ -47,7 +47,7 @@
     , mFrom(from)
     , mFunc(fn)
   {
-    PR_LOG(mLog, PR_LOG_DEBUG, ("%d [this=%p] %s (%s=%p) {ENTER}\n",
+    MOZ_LOG(mLog, PR_LOG_DEBUG, ("%d [this=%p] %s (%s=%p) {ENTER}\n",
                                 GIVE_ME_MS_NOW(), mFrom, mFunc,
                                 paramName, paramValue));
   }
@@ -59,7 +59,7 @@
     , mFrom(from)
     , mFunc(fn)
   {
-    PR_LOG(mLog, PR_LOG_DEBUG, ("%d [this=%p] %s (%s=\"%d\") {ENTER}\n",
+    MOZ_LOG(mLog, PR_LOG_DEBUG, ("%d [this=%p] %s (%s=\"%d\") {ENTER}\n",
                                 GIVE_ME_MS_NOW(), mFrom, mFunc,
                                 paramName, paramValue));
   }
@@ -71,14 +71,14 @@
     , mFrom(from)
     , mFunc(fn)
   {
-    PR_LOG(mLog, PR_LOG_DEBUG, ("%d [this=%p] %s (%s=\"%d\") {ENTER}\n",
+    MOZ_LOG(mLog, PR_LOG_DEBUG, ("%d [this=%p] %s (%s=\"%d\") {ENTER}\n",
                                 GIVE_ME_MS_NOW(), mFrom, mFunc,
                                 paramName, paramValue));
   }
 
   ~LogScope()
   {
-    PR_LOG(mLog, PR_LOG_DEBUG, ("%d [this=%p] %s {EXIT}\n",
+    MOZ_LOG(mLog, PR_LOG_DEBUG, ("%d [this=%p] %s {EXIT}\n",
                                 GIVE_ME_MS_NOW(), mFrom, mFunc));
   }
 
@@ -92,14 +92,14 @@
 public:
   LogFunc(PRLogModuleInfo* aLog, void* from, const char* fn)
   {
-    PR_LOG(aLog, PR_LOG_DEBUG, ("%d [this=%p] %s\n",
+    MOZ_LOG(aLog, PR_LOG_DEBUG, ("%d [this=%p] %s\n",
                                 GIVE_ME_MS_NOW(), from, fn));
   }
 
   LogFunc(PRLogModuleInfo* aLog, void* from, const char* fn,
           const char* paramName, const char* paramValue)
   {
-    PR_LOG(aLog, PR_LOG_DEBUG, ("%d [this=%p] %s (%s=\"%s\")\n",
+    MOZ_LOG(aLog, PR_LOG_DEBUG, ("%d [this=%p] %s (%s=\"%s\")\n",
                                 GIVE_ME_MS_NOW(), from, fn,
                                 paramName, paramValue));
   }
@@ -107,7 +107,7 @@
   LogFunc(PRLogModuleInfo* aLog, void* from, const char* fn,
           const char* paramName, const void* paramValue)
   {
-    PR_LOG(aLog, PR_LOG_DEBUG, ("%d [this=%p] %s (%s=\"%p\")\n",
+    MOZ_LOG(aLog, PR_LOG_DEBUG, ("%d [this=%p] %s (%s=\"%p\")\n",
                                 GIVE_ME_MS_NOW(), from, fn,
                                 paramName, paramValue));
   }
@@ -116,7 +116,7 @@
   LogFunc(PRLogModuleInfo* aLog, void* from, const char* fn,
           const char* paramName, uint32_t paramValue)
   {
-    PR_LOG(aLog, PR_LOG_DEBUG, ("%d [this=%p] %s (%s=\"%d\")\n",
+    MOZ_LOG(aLog, PR_LOG_DEBUG, ("%d [this=%p] %s (%s=\"%d\")\n",
                                 GIVE_ME_MS_NOW(), from, fn,
                                 paramName, paramValue));
   }
@@ -129,7 +129,7 @@
   LogMessage(PRLogModuleInfo* aLog, void* from, const char* fn,
              const char* msg)
   {
-    PR_LOG(aLog, PR_LOG_DEBUG, ("%d [this=%p] %s -- %s\n",
+    MOZ_LOG(aLog, PR_LOG_DEBUG, ("%d [this=%p] %s -- %s\n",
                                 GIVE_ME_MS_NOW(), from, fn, msg));
   }
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/ImageMetadata.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/ImageMetadata.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/ImageMetadata.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/ImageMetadata.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,35 @@
+/* -*- 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 "ImageMetadata.h"
+
+#include "RasterImage.h"
+#include "nsComponentManagerUtils.h"
+#include "nsISupportsPrimitives.h"
+#include "nsXPCOMCID.h"
+
+namespace mozilla {
+namespace image {
+
+void
+ImageMetadata::SetOnImage(RasterImage* image)
+{
+  if (mHotspotX != -1 && mHotspotY != -1) {
+    nsCOMPtr<nsISupportsPRUint32> intwrapx =
+      do_CreateInstance(NS_SUPPORTS_PRUINT32_CONTRACTID);
+    nsCOMPtr<nsISupportsPRUint32> intwrapy =
+      do_CreateInstance(NS_SUPPORTS_PRUINT32_CONTRACTID);
+    intwrapx->SetData(mHotspotX);
+    intwrapy->SetData(mHotspotY);
+    image->Set("hotspotX", intwrapx);
+    image->Set("hotspotY", intwrapy);
+  }
+
+  image->SetLoopCount(mLoopCount);
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/ImageMetadata.h firefox-trunk-41.0~a1~hg20150524r245419/image/ImageMetadata.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/ImageMetadata.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/ImageMetadata.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,74 @@
+/* -*- 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_image_ImageMetadata_h
+#define mozilla_image_ImageMetadata_h
+
+#include <stdint.h>
+#include "mozilla/Maybe.h"
+#include "nsSize.h"
+#include "Orientation.h"
+
+namespace mozilla {
+namespace image {
+
+class RasterImage;
+
+// The metadata about an image that decoders accumulate as they decode.
+class ImageMetadata
+{
+public:
+  ImageMetadata()
+    : mHotspotX(-1)
+    , mHotspotY(-1)
+    , mLoopCount(-1)
+  { }
+
+  // Set the metadata this object represents on an image.
+  void SetOnImage(RasterImage* image);
+
+  void SetHotspot(uint16_t hotspotx, uint16_t hotspoty)
+  {
+    mHotspotX = hotspotx;
+    mHotspotY = hotspoty;
+  }
+  void SetLoopCount(int32_t loopcount)
+  {
+    mLoopCount = loopcount;
+  }
+
+  void SetSize(int32_t width, int32_t height, Orientation orientation)
+  {
+    if (!HasSize()) {
+      mSize.emplace(nsIntSize(width, height));
+      mOrientation.emplace(orientation);
+    }
+  }
+
+  bool HasSize() const { return mSize.isSome(); }
+  bool HasOrientation() const { return mOrientation.isSome(); }
+
+  int32_t GetWidth() const { return mSize->width; }
+  int32_t GetHeight() const { return mSize->height; }
+  nsIntSize GetSize() const { return *mSize; }
+  Orientation GetOrientation() const { return *mOrientation; }
+
+private:
+  // The hotspot found on cursors, or -1 if none was found.
+  int32_t mHotspotX;
+  int32_t mHotspotY;
+
+  // The loop count for animated images, or -1 for infinite loop.
+  int32_t mLoopCount;
+
+  Maybe<nsIntSize> mSize;
+  Maybe<Orientation> mOrientation;
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_ImageMetadata_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/ImageOps.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/ImageOps.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/ImageOps.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/ImageOps.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,72 @@
+/* -*- 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 "imgIContainer.h"
+#include "ClippedImage.h"
+#include "DynamicImage.h"
+#include "FrozenImage.h"
+#include "OrientedImage.h"
+#include "Image.h"
+
+#include "ImageOps.h"
+
+namespace mozilla {
+namespace image {
+
+/* static */ already_AddRefed<Image>
+ImageOps::Freeze(Image* aImage)
+{
+  nsRefPtr<Image> frozenImage = new FrozenImage(aImage);
+  return frozenImage.forget();
+}
+
+/* static */ already_AddRefed<imgIContainer>
+ImageOps::Freeze(imgIContainer* aImage)
+{
+  nsCOMPtr<imgIContainer> frozenImage =
+    new FrozenImage(static_cast<Image*>(aImage));
+  return frozenImage.forget();
+}
+
+/* static */ already_AddRefed<Image>
+ImageOps::Clip(Image* aImage, nsIntRect aClip)
+{
+  nsRefPtr<Image> clippedImage = new ClippedImage(aImage, aClip);
+  return clippedImage.forget();
+}
+
+/* static */ already_AddRefed<imgIContainer>
+ImageOps::Clip(imgIContainer* aImage, nsIntRect aClip)
+{
+  nsCOMPtr<imgIContainer> clippedImage =
+    new ClippedImage(static_cast<Image*>(aImage), aClip);
+  return clippedImage.forget();
+}
+
+/* static */ already_AddRefed<Image>
+ImageOps::Orient(Image* aImage, Orientation aOrientation)
+{
+  nsRefPtr<Image> orientedImage = new OrientedImage(aImage, aOrientation);
+  return orientedImage.forget();
+}
+
+/* static */ already_AddRefed<imgIContainer>
+ImageOps::Orient(imgIContainer* aImage, Orientation aOrientation)
+{
+  nsCOMPtr<imgIContainer> orientedImage =
+    new OrientedImage(static_cast<Image*>(aImage), aOrientation);
+  return orientedImage.forget();
+}
+
+/* static */ already_AddRefed<imgIContainer>
+ImageOps::CreateFromDrawable(gfxDrawable* aDrawable)
+{
+  nsCOMPtr<imgIContainer> drawableImage = new DynamicImage(aDrawable);
+  return drawableImage.forget();
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/ImageOps.h firefox-trunk-41.0~a1~hg20150524r245419/image/ImageOps.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/ImageOps.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/ImageOps.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,72 @@
+/* -*- 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_image_ImageOps_h
+#define mozilla_image_ImageOps_h
+
+#include "nsCOMPtr.h"
+#include "nsRect.h"
+
+class gfxDrawable;
+class imgIContainer;
+
+namespace mozilla {
+namespace image {
+
+class Image;
+struct Orientation;
+
+class ImageOps
+{
+public:
+  /**
+   * Creates a version of an existing image which does not animate and is frozen
+   * at the first frame.
+   *
+   * @param aImage         The existing image.
+   */
+  static already_AddRefed<Image> Freeze(Image* aImage);
+  static already_AddRefed<imgIContainer> Freeze(imgIContainer* aImage);
+
+  /**
+   * Creates a clipped version of an existing image. Animation is unaffected.
+   *
+   * @param aImage         The existing image.
+   * @param aClip          The rectangle to clip the image against.
+   */
+  static already_AddRefed<Image> Clip(Image* aImage, nsIntRect aClip);
+  static already_AddRefed<imgIContainer> Clip(imgIContainer* aImage,
+                                              nsIntRect aClip);
+
+  /**
+   * Creates a version of an existing image which is rotated and/or flipped to
+   * the specified orientation.
+   *
+   * @param aImage         The existing image.
+   * @param aOrientation   The desired orientation.
+   */
+  static already_AddRefed<Image> Orient(Image* aImage,
+                                        Orientation aOrientation);
+  static already_AddRefed<imgIContainer> Orient(imgIContainer* aImage,
+                                                Orientation aOrientation);
+
+  /**
+   * Creates an image from a gfxDrawable.
+   *
+   * @param aDrawable      The gfxDrawable.
+   */
+  static already_AddRefed<imgIContainer>
+  CreateFromDrawable(gfxDrawable* aDrawable);
+
+private:
+  // This is a static utility class, so disallow instantiation.
+  virtual ~ImageOps() = 0;
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_ImageOps_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/ImageRegion.h firefox-trunk-41.0~a1~hg20150524r245419/image/ImageRegion.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/ImageRegion.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/ImageRegion.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,158 @@
+/* -*- 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_image_ImageRegion_h
+#define mozilla_image_ImageRegion_h
+
+#include "gfxRect.h"
+
+namespace mozilla {
+namespace image {
+
+/**
+ * An axis-aligned rectangle in tiled image space, with an optional sampling
+ * restriction rect. The drawing code ensures that if a sampling restriction
+ * rect is present, any pixels sampled during the drawing process are found
+ * within that rect.
+ *
+ * The sampling restriction rect exists primarily for callers which perform
+ * pixel snapping. Other callers should generally use one of the Create()
+ * overloads.
+ */
+class ImageRegion
+{
+public:
+  static ImageRegion Empty()
+  {
+    return ImageRegion(gfxRect());
+  }
+
+  static ImageRegion Create(const gfxRect& aRect)
+  {
+    return ImageRegion(aRect);
+  }
+
+  static ImageRegion Create(const gfxSize& aSize)
+  {
+    return ImageRegion(gfxRect(0, 0, aSize.width, aSize.height));
+  }
+
+  static ImageRegion Create(const nsIntSize& aSize)
+  {
+    return ImageRegion(gfxRect(0, 0, aSize.width, aSize.height));
+  }
+
+  static ImageRegion CreateWithSamplingRestriction(const gfxRect& aRect,
+                                                   const gfxRect& aRestriction)
+  {
+    return ImageRegion(aRect, aRestriction);
+  }
+
+  bool IsRestricted() const { return mIsRestricted; }
+  const gfxRect& Rect() const { return mRect; }
+
+  const gfxRect& Restriction() const
+  {
+    MOZ_ASSERT(mIsRestricted);
+    return mRestriction;
+  }
+
+  bool RestrictionContains(const gfxRect& aRect) const
+  {
+    if (!mIsRestricted) {
+      return true;
+    }
+    return mRestriction.Contains(aRect);
+  }
+
+  ImageRegion Intersect(const gfxRect& aRect) const
+  {
+    if (mIsRestricted) {
+      return CreateWithSamplingRestriction(aRect.Intersect(mRect),
+                                           aRect.Intersect(mRestriction));
+    }
+    return Create(aRect.Intersect(mRect));
+  }
+
+  gfxRect IntersectAndRestrict(const gfxRect& aRect) const
+  {
+    gfxRect intersection = mRect.Intersect(aRect);
+    if (mIsRestricted) {
+      intersection = mRestriction.Intersect(intersection);
+    }
+    return intersection;
+  }
+
+  void MoveBy(gfxFloat dx, gfxFloat dy)
+  {
+    mRect.MoveBy(dx, dy);
+    if (mIsRestricted) {
+      mRestriction.MoveBy(dx, dy);
+    }
+  }
+
+  void Scale(gfxFloat sx, gfxFloat sy)
+  {
+    mRect.Scale(sx, sy);
+    if (mIsRestricted) {
+      mRestriction.Scale(sx, sy);
+    }
+  }
+
+  void TransformBy(const gfxMatrix& aMatrix)
+  {
+    mRect = aMatrix.Transform(mRect);
+    if (mIsRestricted) {
+      mRestriction = aMatrix.Transform(mRestriction);
+    }
+  }
+
+  void TransformBoundsBy(const gfxMatrix& aMatrix)
+  {
+    mRect = aMatrix.TransformBounds(mRect);
+    if (mIsRestricted) {
+      mRestriction = aMatrix.TransformBounds(mRestriction);
+    }
+  }
+
+  ImageRegion operator-(const gfxPoint& aPt) const
+  {
+    if (mIsRestricted) {
+      return CreateWithSamplingRestriction(mRect - aPt, mRestriction - aPt);
+    }
+    return Create(mRect - aPt);
+  }
+
+  ImageRegion operator+(const gfxPoint& aPt) const
+  {
+    if (mIsRestricted) {
+      return CreateWithSamplingRestriction(mRect + aPt, mRestriction + aPt);
+    }
+    return Create(mRect + aPt);
+  }
+
+  /* ImageRegion() : mIsRestricted(false) { } */
+
+private:
+  explicit ImageRegion(const gfxRect& aRect)
+    : mRect(aRect)
+    , mIsRestricted(false)
+  { }
+
+  ImageRegion(const gfxRect& aRect, const gfxRect& aRestriction)
+    : mRect(aRect)
+    , mRestriction(aRestriction)
+    , mIsRestricted(true)
+  { }
+
+  gfxRect mRect;
+  gfxRect mRestriction;
+  bool    mIsRestricted;
+};
+
+}  // namespace image
+}  // namespace mozilla
+
+#endif // mozilla_image_ImageRegion_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/ImageURL.h firefox-trunk-41.0~a1~hg20150524r245419/image/ImageURL.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/ImageURL.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/ImageURL.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,120 @@
+/* -*- 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_image_ImageURL_h
+#define mozilla_image_ImageURL_h
+
+#include "nsIURI.h"
+#include "MainThreadUtils.h"
+#include "nsNetUtil.h"
+
+namespace mozilla {
+namespace image {
+
+/** ImageURL
+ *
+ * nsStandardURL is not threadsafe, so this class is created to hold only the
+ * necessary URL data required for image loading and decoding.
+ *
+ * Note: Although several APIs have the same or similar prototypes as those
+ * found in nsIURI/nsStandardURL, the class does not implement nsIURI. This is
+ * intentional; functionality is limited, and is only useful for imagelib code.
+ * By not implementing nsIURI, external code cannot unintentionally be given an
+ * nsIURI pointer with this limited class behind it; instead, conversion to a
+ * fully implemented nsIURI is required (e.g. through NS_NewURI).
+ */
+class ImageURL
+{
+public:
+  explicit ImageURL(nsIURI* aURI)
+  {
+    MOZ_ASSERT(NS_IsMainThread(), "Cannot use nsIURI off main thread!");
+    aURI->GetSpec(mSpec);
+    aURI->GetScheme(mScheme);
+    aURI->GetRef(mRef);
+  }
+
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(ImageURL)
+
+  nsresult GetSpec(nsACString& result)
+  {
+    result = mSpec;
+    return NS_OK;
+  }
+
+  /// A weak pointer to the URI spec for this ImageURL. For logging only.
+  const char* Spec() const { return mSpec.get(); }
+
+  enum TruncatedSpecStatus {
+    FitsInto1k,
+    TruncatedTo1k
+  };
+  TruncatedSpecStatus GetSpecTruncatedTo1k(nsACString& result)
+  {
+    static const size_t sMaxTruncatedLength = 1024;
+
+    if (sMaxTruncatedLength >= mSpec.Length()) {
+      result = mSpec;
+      return FitsInto1k;
+    }
+
+    result = Substring(mSpec, 0, sMaxTruncatedLength);
+    return TruncatedTo1k;
+  }
+
+  nsresult GetScheme(nsACString& result)
+  {
+    result = mScheme;
+    return NS_OK;
+  }
+
+  nsresult SchemeIs(const char* scheme, bool* result)
+  {
+    NS_PRECONDITION(scheme, "scheme is null");
+    NS_PRECONDITION(result, "result is null");
+
+    *result = mScheme.Equals(scheme);
+    return NS_OK;
+  }
+
+  nsresult GetRef(nsACString& result)
+  {
+    result = mRef;
+    return NS_OK;
+  }
+
+  already_AddRefed<nsIURI> ToIURI()
+  {
+    MOZ_ASSERT(NS_IsMainThread(),
+               "Convert to nsIURI on main thread only; it is not threadsafe.");
+    nsCOMPtr<nsIURI> newURI;
+    NS_NewURI(getter_AddRefs(newURI), mSpec);
+    return newURI.forget();
+  }
+
+  bool operator==(const ImageURL& aOther) const
+  {
+    // Note that we don't need to consider mScheme and mRef, because they're
+    // already represented in mSpec.
+    return mSpec == aOther.mSpec;
+  }
+
+private:
+  // Since this is a basic storage class, no duplication of spec parsing is
+  // included in the functionality. Instead, the class depends upon the
+  // parsing implementation in the nsIURI class used in object construction.
+  // This means each field is stored separately, but since only a few are
+  // required, this small memory tradeoff for threadsafe usage should be ok.
+  nsAutoCString mSpec;
+  nsAutoCString mScheme;
+  nsAutoCString mRef;
+
+  ~ImageURL() { }
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_ImageURL_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/ImageWrapper.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/ImageWrapper.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/ImageWrapper.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/ImageWrapper.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,312 @@
+/* -*- 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 "ImageWrapper.h"
+#include "mozilla/gfx/2D.h"
+#include "mozilla/RefPtr.h"
+#include "Orientation.h"
+
+#include "mozilla/MemoryReporting.h"
+
+namespace mozilla {
+
+using gfx::DataSourceSurface;
+using gfx::SourceSurface;
+using layers::LayerManager;
+using layers::ImageContainer;
+
+namespace image {
+
+// Inherited methods from Image.
+
+already_AddRefed<ProgressTracker>
+ImageWrapper::GetProgressTracker()
+{
+  return mInnerImage->GetProgressTracker();
+}
+
+size_t
+ImageWrapper::SizeOfSourceWithComputedFallback(MallocSizeOf aMallocSizeOf) const
+{
+  return mInnerImage->SizeOfSourceWithComputedFallback(aMallocSizeOf);
+}
+
+void
+ImageWrapper::CollectSizeOfSurfaces(nsTArray<SurfaceMemoryCounter>& aCounters,
+                                    MallocSizeOf aMallocSizeOf) const
+{
+  mInnerImage->CollectSizeOfSurfaces(aCounters, aMallocSizeOf);
+}
+
+void
+ImageWrapper::IncrementAnimationConsumers()
+{
+  MOZ_ASSERT(NS_IsMainThread(), "Main thread only to encourage serialization "
+                                "with DecrementAnimationConsumers");
+  mInnerImage->IncrementAnimationConsumers();
+}
+
+void
+ImageWrapper::DecrementAnimationConsumers()
+{
+  MOZ_ASSERT(NS_IsMainThread(), "Main thread only to encourage serialization "
+                                "with IncrementAnimationConsumers");
+  mInnerImage->DecrementAnimationConsumers();
+}
+
+#ifdef DEBUG
+uint32_t
+ImageWrapper::GetAnimationConsumers()
+{
+  return mInnerImage->GetAnimationConsumers();
+}
+#endif
+
+nsresult
+ImageWrapper::OnImageDataAvailable(nsIRequest* aRequest,
+                                   nsISupports* aContext,
+                                   nsIInputStream* aInStr,
+                                   uint64_t aSourceOffset,
+                                   uint32_t aCount)
+{
+  return mInnerImage->OnImageDataAvailable(aRequest, aContext, aInStr,
+                                           aSourceOffset, aCount);
+}
+
+nsresult
+ImageWrapper::OnImageDataComplete(nsIRequest* aRequest,
+                                  nsISupports* aContext,
+                                  nsresult aStatus,
+                                  bool aLastPart)
+{
+  return mInnerImage->OnImageDataComplete(aRequest, aContext, aStatus,
+                                          aLastPart);
+}
+
+void
+ImageWrapper::OnSurfaceDiscarded()
+{
+  return mInnerImage->OnSurfaceDiscarded();
+}
+
+void
+ImageWrapper::SetInnerWindowID(uint64_t aInnerWindowId)
+{
+  mInnerImage->SetInnerWindowID(aInnerWindowId);
+}
+
+uint64_t
+ImageWrapper::InnerWindowID() const
+{
+  return mInnerImage->InnerWindowID();
+}
+
+bool
+ImageWrapper::HasError()
+{
+  return mInnerImage->HasError();
+}
+
+void
+ImageWrapper::SetHasError()
+{
+  mInnerImage->SetHasError();
+}
+
+ImageURL*
+ImageWrapper::GetURI()
+{
+  return mInnerImage->GetURI();
+}
+
+// Methods inherited from XPCOM interfaces.
+
+NS_IMPL_ISUPPORTS(ImageWrapper, imgIContainer)
+
+NS_IMETHODIMP
+ImageWrapper::GetWidth(int32_t* aWidth)
+{
+  return mInnerImage->GetWidth(aWidth);
+}
+
+NS_IMETHODIMP
+ImageWrapper::GetHeight(int32_t* aHeight)
+{
+  return mInnerImage->GetHeight(aHeight);
+}
+
+NS_IMETHODIMP
+ImageWrapper::GetIntrinsicSize(nsSize* aSize)
+{
+  return mInnerImage->GetIntrinsicSize(aSize);
+}
+
+NS_IMETHODIMP
+ImageWrapper::GetIntrinsicRatio(nsSize* aSize)
+{
+  return mInnerImage->GetIntrinsicRatio(aSize);
+}
+
+NS_IMETHODIMP_(Orientation)
+ImageWrapper::GetOrientation()
+{
+  return mInnerImage->GetOrientation();
+}
+
+NS_IMETHODIMP
+ImageWrapper::GetType(uint16_t* aType)
+{
+  return mInnerImage->GetType(aType);
+}
+
+NS_IMETHODIMP
+ImageWrapper::GetAnimated(bool* aAnimated)
+{
+  return mInnerImage->GetAnimated(aAnimated);
+}
+
+NS_IMETHODIMP_(TemporaryRef<SourceSurface>)
+ImageWrapper::GetFrame(uint32_t aWhichFrame,
+                       uint32_t aFlags)
+{
+  return mInnerImage->GetFrame(aWhichFrame, aFlags);
+}
+
+NS_IMETHODIMP_(bool)
+ImageWrapper::IsOpaque()
+{
+  return mInnerImage->IsOpaque();
+}
+
+NS_IMETHODIMP_(bool)
+ImageWrapper::IsImageContainerAvailable(LayerManager* aManager, uint32_t aFlags)
+{
+  return mInnerImage->IsImageContainerAvailable(aManager, aFlags);
+}
+
+NS_IMETHODIMP_(already_AddRefed<ImageContainer>)
+ImageWrapper::GetImageContainer(LayerManager* aManager, uint32_t aFlags)
+{
+  return mInnerImage->GetImageContainer(aManager, aFlags);
+}
+
+NS_IMETHODIMP_(DrawResult)
+ImageWrapper::Draw(gfxContext* aContext,
+                   const nsIntSize& aSize,
+                   const ImageRegion& aRegion,
+                   uint32_t aWhichFrame,
+                   GraphicsFilter aFilter,
+                   const Maybe<SVGImageContext>& aSVGContext,
+                   uint32_t aFlags)
+{
+  return mInnerImage->Draw(aContext, aSize, aRegion, aWhichFrame,
+                           aFilter, aSVGContext, aFlags);
+}
+
+NS_IMETHODIMP
+ImageWrapper::RequestDecode()
+{
+  return mInnerImage->RequestDecode();
+}
+
+NS_IMETHODIMP
+ImageWrapper::StartDecoding()
+{
+  return mInnerImage->StartDecoding();
+}
+
+NS_IMETHODIMP
+ImageWrapper::RequestDecodeForSize(const nsIntSize& aSize, uint32_t aFlags)
+{
+  return mInnerImage->RequestDecodeForSize(aSize, aFlags);
+}
+
+NS_IMETHODIMP
+ImageWrapper::LockImage()
+{
+  MOZ_ASSERT(NS_IsMainThread(),
+             "Main thread to encourage serialization with UnlockImage");
+  return mInnerImage->LockImage();
+}
+
+NS_IMETHODIMP
+ImageWrapper::UnlockImage()
+{
+  MOZ_ASSERT(NS_IsMainThread(),
+             "Main thread to encourage serialization with LockImage");
+  return mInnerImage->UnlockImage();
+}
+
+NS_IMETHODIMP
+ImageWrapper::RequestDiscard()
+{
+  return mInnerImage->RequestDiscard();
+}
+
+NS_IMETHODIMP_(void)
+ImageWrapper::RequestRefresh(const TimeStamp& aTime)
+{
+  return mInnerImage->RequestRefresh(aTime);
+}
+
+NS_IMETHODIMP
+ImageWrapper::GetAnimationMode(uint16_t* aAnimationMode)
+{
+  return mInnerImage->GetAnimationMode(aAnimationMode);
+}
+
+NS_IMETHODIMP
+ImageWrapper::SetAnimationMode(uint16_t aAnimationMode)
+{
+  return mInnerImage->SetAnimationMode(aAnimationMode);
+}
+
+NS_IMETHODIMP
+ImageWrapper::ResetAnimation()
+{
+  return mInnerImage->ResetAnimation();
+}
+
+NS_IMETHODIMP_(float)
+ImageWrapper::GetFrameIndex(uint32_t aWhichFrame)
+{
+  return mInnerImage->GetFrameIndex(aWhichFrame);
+}
+
+NS_IMETHODIMP_(int32_t)
+ImageWrapper::GetFirstFrameDelay()
+{
+  return mInnerImage->GetFirstFrameDelay();
+}
+
+NS_IMETHODIMP_(void)
+ImageWrapper::SetAnimationStartTime(const TimeStamp& aTime)
+{
+  mInnerImage->SetAnimationStartTime(aTime);
+}
+
+nsIntSize
+ImageWrapper::OptimalImageSizeForDest(const gfxSize& aDest,
+                                      uint32_t aWhichFrame,
+                                      GraphicsFilter aFilter, uint32_t aFlags)
+{
+  return mInnerImage->OptimalImageSizeForDest(aDest, aWhichFrame, aFilter,
+                                              aFlags);
+}
+
+NS_IMETHODIMP_(nsIntRect)
+ImageWrapper::GetImageSpaceInvalidationRect(const nsIntRect& aRect)
+{
+  return mInnerImage->GetImageSpaceInvalidationRect(aRect);
+}
+
+already_AddRefed<imgIContainer>
+ImageWrapper::Unwrap()
+{
+  return mInnerImage->Unwrap();
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/ImageWrapper.h firefox-trunk-41.0~a1~hg20150524r245419/image/ImageWrapper.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/ImageWrapper.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/ImageWrapper.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,85 @@
+/* -*- 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_image_ImageWrapper_h
+#define mozilla_image_ImageWrapper_h
+
+#include "mozilla/MemoryReporting.h"
+#include "Image.h"
+
+namespace mozilla {
+namespace image {
+
+/**
+ * Abstract superclass for Images that wrap other Images.
+ */
+class ImageWrapper : public Image
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_IMGICONTAINER
+
+  // Inherited methods from Image.
+  virtual already_AddRefed<ProgressTracker> GetProgressTracker() override;
+
+  virtual size_t
+    SizeOfSourceWithComputedFallback(MallocSizeOf aMallocSizeOf) const override;
+  virtual void CollectSizeOfSurfaces(nsTArray<SurfaceMemoryCounter>& aCounters,
+                                     MallocSizeOf aMallocSizeOf) const override;
+
+  virtual void IncrementAnimationConsumers() override;
+  virtual void DecrementAnimationConsumers() override;
+#ifdef DEBUG
+  virtual uint32_t GetAnimationConsumers() override;
+#endif
+
+  virtual nsresult OnImageDataAvailable(nsIRequest* aRequest,
+                                        nsISupports* aContext,
+                                        nsIInputStream* aInStr,
+                                        uint64_t aSourceOffset,
+                                        uint32_t aCount) override;
+  virtual nsresult OnImageDataComplete(nsIRequest* aRequest,
+                                       nsISupports* aContext,
+                                       nsresult aStatus,
+                                       bool aLastPart) override;
+
+  virtual void OnSurfaceDiscarded() override;
+
+  virtual void SetInnerWindowID(uint64_t aInnerWindowId) override;
+  virtual uint64_t InnerWindowID() const override;
+
+  virtual bool HasError() override;
+  virtual void SetHasError() override;
+
+  virtual ImageURL* GetURI() override;
+
+protected:
+  explicit ImageWrapper(Image* aInnerImage)
+    : mInnerImage(aInnerImage)
+  {
+    MOZ_ASSERT(aInnerImage, "Need an image to wrap");
+  }
+
+  virtual ~ImageWrapper() { }
+
+  /**
+   * Returns a weak reference to the inner image wrapped by this ImageWrapper.
+   */
+  Image* InnerImage() const { return mInnerImage.get(); }
+
+  void SetInnerImage(Image* aInnerImage)
+  {
+    MOZ_ASSERT(aInnerImage, "Need an image to wrap");
+    mInnerImage = aInnerImage;
+  }
+
+private:
+  nsRefPtr<Image> mInnerImage;
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_ImageWrapper_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/imgFrame.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/imgFrame.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/imgFrame.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/imgFrame.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,1227 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "imgFrame.h"
+#include "ImageRegion.h"
+#include "ShutdownTracker.h"
+
+#include "prenv.h"
+
+#include "gfx2DGlue.h"
+#include "gfxPlatform.h"
+#include "gfxUtils.h"
+#include "gfxAlphaRecovery.h"
+
+static bool gDisableOptimize = false;
+
+#include "GeckoProfiler.h"
+#include "mozilla/Likely.h"
+#include "MainThreadUtils.h"
+#include "mozilla/MemoryReporting.h"
+#include "nsMargin.h"
+#include "nsThreadUtils.h"
+#include "mozilla/CheckedInt.h"
+#include "mozilla/gfx/Tools.h"
+
+
+namespace mozilla {
+
+using namespace gfx;
+
+namespace image {
+
+static UserDataKey kVolatileBuffer;
+
+static void
+VolatileBufferRelease(void* vbuf)
+{
+  delete static_cast<VolatileBufferPtr<unsigned char>*>(vbuf);
+}
+
+static int32_t
+VolatileSurfaceStride(const IntSize& size, SurfaceFormat format)
+{
+  // Stride must be a multiple of four or cairo will complain.
+  return (size.width * BytesPerPixel(format) + 0x3) & ~0x3;
+}
+
+static TemporaryRef<DataSourceSurface>
+CreateLockedSurface(VolatileBuffer* vbuf,
+                    const IntSize& size,
+                    SurfaceFormat format)
+{
+  VolatileBufferPtr<unsigned char>* vbufptr =
+    new VolatileBufferPtr<unsigned char>(vbuf);
+  MOZ_ASSERT(!vbufptr->WasBufferPurged(), "Expected image data!");
+
+  int32_t stride = VolatileSurfaceStride(size, format);
+  RefPtr<DataSourceSurface> surf =
+    Factory::CreateWrappingDataSourceSurface(*vbufptr, stride, size, format);
+  if (!surf) {
+    delete vbufptr;
+    return nullptr;
+  }
+
+  surf->AddUserData(&kVolatileBuffer, vbufptr, VolatileBufferRelease);
+  return surf.forget();
+}
+
+static TemporaryRef<VolatileBuffer>
+AllocateBufferForImage(const IntSize& size, SurfaceFormat format)
+{
+  int32_t stride = VolatileSurfaceStride(size, format);
+  RefPtr<VolatileBuffer> buf = new VolatileBuffer();
+  if (buf->Init(stride * size.height,
+                1 << gfxAlphaRecovery::GoodAlignmentLog2())) {
+    return buf.forget();
+  }
+
+  return nullptr;
+}
+
+// Returns true if an image of aWidth x aHeight is allowed and legal.
+static bool
+AllowedImageSize(int32_t aWidth, int32_t aHeight)
+{
+  // reject over-wide or over-tall images
+  const int32_t k64KLimit = 0x0000FFFF;
+  if (MOZ_UNLIKELY(aWidth > k64KLimit || aHeight > k64KLimit )) {
+    NS_WARNING("image too big");
+    return false;
+  }
+
+  // protect against invalid sizes
+  if (MOZ_UNLIKELY(aHeight <= 0 || aWidth <= 0)) {
+    return false;
+  }
+
+  // check to make sure we don't overflow a 32-bit
+  CheckedInt32 requiredBytes = CheckedInt32(aWidth) * CheckedInt32(aHeight) * 4;
+  if (MOZ_UNLIKELY(!requiredBytes.isValid())) {
+    NS_WARNING("width or height too large");
+    return false;
+  }
+#if defined(XP_MACOSX)
+  // CoreGraphics is limited to images < 32K in *height*, so clamp all surfaces
+  // on the Mac to that height
+  if (MOZ_UNLIKELY(aHeight > SHRT_MAX)) {
+    NS_WARNING("image too big");
+    return false;
+  }
+#endif
+  return true;
+}
+
+static bool AllowedImageAndFrameDimensions(const nsIntSize& aImageSize,
+                                           const nsIntRect& aFrameRect)
+{
+  if (!AllowedImageSize(aImageSize.width, aImageSize.height)) {
+    return false;
+  }
+  if (!AllowedImageSize(aFrameRect.width, aFrameRect.height)) {
+    return false;
+  }
+  nsIntRect imageRect(0, 0, aImageSize.width, aImageSize.height);
+  if (!imageRect.Contains(aFrameRect)) {
+    NS_WARNING("Animated image frame does not fit inside bounds of image");
+  }
+  return true;
+}
+
+imgFrame::imgFrame()
+  : mMonitor("imgFrame")
+  , mDecoded(0, 0, 0, 0)
+  , mLockCount(0)
+  , mTimeout(100)
+  , mDisposalMethod(DisposalMethod::NOT_SPECIFIED)
+  , mBlendMethod(BlendMethod::OVER)
+  , mHasNoAlpha(false)
+  , mAborted(false)
+  , mPalettedImageData(nullptr)
+  , mPaletteDepth(0)
+  , mNonPremult(false)
+  , mSinglePixel(false)
+  , mCompositingFailed(false)
+  , mOptimizable(false)
+{
+  static bool hasCheckedOptimize = false;
+  if (!hasCheckedOptimize) {
+    if (PR_GetEnv("MOZ_DISABLE_IMAGE_OPTIMIZE")) {
+      gDisableOptimize = true;
+    }
+    hasCheckedOptimize = true;
+  }
+}
+
+imgFrame::~imgFrame()
+{
+#ifdef DEBUG
+  MonitorAutoLock lock(mMonitor);
+  MOZ_ASSERT(mAborted || IsImageCompleteInternal());
+#endif
+
+  free(mPalettedImageData);
+  mPalettedImageData = nullptr;
+}
+
+nsresult
+imgFrame::ReinitForDecoder(const nsIntSize& aImageSize,
+                           const nsIntRect& aRect,
+                           SurfaceFormat aFormat,
+                           uint8_t aPaletteDepth /* = 0 */,
+                           bool aNonPremult /* = false */)
+{
+  MonitorAutoLock lock(mMonitor);
+
+  if (mDecoded.x != 0 || mDecoded.y != 0 ||
+      mDecoded.width != 0 || mDecoded.height != 0) {
+    MOZ_ASSERT_UNREACHABLE("Shouldn't reinit after write");
+    return NS_ERROR_FAILURE;
+  }
+  if (mAborted) {
+    MOZ_ASSERT_UNREACHABLE("Shouldn't reinit if aborted");
+    return NS_ERROR_FAILURE;
+  }
+  if (mLockCount < 1) {
+    MOZ_ASSERT_UNREACHABLE("Shouldn't reinit unless locked");
+    return NS_ERROR_FAILURE;
+  }
+
+  // Restore everything (except mLockCount, which we need to keep) to how it was
+  // when we were first created.
+  // XXX(seth): This is probably a little excessive, but I want to be *really*
+  // sure that nothing got missed.
+  mDecoded = nsIntRect(0, 0, 0, 0);
+  mTimeout = 100;
+  mDisposalMethod = DisposalMethod::NOT_SPECIFIED;
+  mBlendMethod = BlendMethod::OVER;
+  mHasNoAlpha = false;
+  mAborted = false;
+  mPaletteDepth = 0;
+  mNonPremult = false;
+  mSinglePixel = false;
+  mCompositingFailed = false;
+  mOptimizable = false;
+  mImageSize = IntSize();
+  mSize = IntSize();
+  mOffset = nsIntPoint();
+  mSinglePixelColor = Color();
+
+  // Release all surfaces.
+  mImageSurface = nullptr;
+  mOptSurface = nullptr;
+  mVBuf = nullptr;
+  mVBufPtr = nullptr;
+  free(mPalettedImageData);
+  mPalettedImageData = nullptr;
+
+  // Reinitialize.
+  nsresult rv = InitForDecoder(aImageSize, aRect, aFormat,
+                               aPaletteDepth, aNonPremult);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  // We were locked before; perform the same actions we would've performed when
+  // we originally got locked.
+  if (mImageSurface) {
+    mVBufPtr = mVBuf;
+    return NS_OK;
+  }
+
+  if (!mPalettedImageData) {
+    MOZ_ASSERT_UNREACHABLE("We got optimized somehow during reinit");
+    return NS_ERROR_FAILURE;
+  }
+
+  // Paletted images don't have surfaces, so there's nothing to do.
+  return NS_OK;
+}
+
+nsresult
+imgFrame::InitForDecoder(const nsIntSize& aImageSize,
+                         const nsIntRect& aRect,
+                         SurfaceFormat aFormat,
+                         uint8_t aPaletteDepth /* = 0 */,
+                         bool aNonPremult /* = false */)
+{
+  // Assert for properties that should be verified by decoders,
+  // warn for properties related to bad content.
+  if (!AllowedImageAndFrameDimensions(aImageSize, aRect)) {
+    NS_WARNING("Should have legal image size");
+    mAborted = true;
+    return NS_ERROR_FAILURE;
+  }
+
+  mImageSize = aImageSize;
+  mOffset.MoveTo(aRect.x, aRect.y);
+  mSize.SizeTo(aRect.width, aRect.height);
+
+  mFormat = aFormat;
+  mPaletteDepth = aPaletteDepth;
+  mNonPremult = aNonPremult;
+
+  if (aPaletteDepth != 0) {
+    // We're creating for a paletted image.
+    if (aPaletteDepth > 8) {
+      NS_WARNING("Should have legal palette depth");
+      NS_ERROR("This Depth is not supported");
+      mAborted = true;
+      return NS_ERROR_FAILURE;
+    }
+
+    // Use the fallible allocator here. Paletted images always use 1 byte per
+    // pixel, so calculating the amount of memory we need is straightforward.
+    mPalettedImageData =
+      static_cast<uint8_t*>(malloc(PaletteDataLength() +
+                                   (mSize.width * mSize.height)));
+    if (!mPalettedImageData) {
+      NS_WARNING("malloc for paletted image data should succeed");
+    }
+    NS_ENSURE_TRUE(mPalettedImageData, NS_ERROR_OUT_OF_MEMORY);
+  } else {
+    MOZ_ASSERT(!mImageSurface, "Called imgFrame::InitForDecoder() twice?");
+
+    mVBuf = AllocateBufferForImage(mSize, mFormat);
+    if (!mVBuf) {
+      mAborted = true;
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
+    if (mVBuf->OnHeap()) {
+      int32_t stride = VolatileSurfaceStride(mSize, mFormat);
+      VolatileBufferPtr<uint8_t> ptr(mVBuf);
+      memset(ptr, 0, stride * mSize.height);
+    }
+    mImageSurface = CreateLockedSurface(mVBuf, mSize, mFormat);
+
+    if (!mImageSurface) {
+      NS_WARNING("Failed to create VolatileDataSourceSurface");
+      mAborted = true;
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
+  }
+
+  return NS_OK;
+}
+
+nsresult
+imgFrame::InitWithDrawable(gfxDrawable* aDrawable,
+                           const nsIntSize& aSize,
+                           const SurfaceFormat aFormat,
+                           GraphicsFilter aFilter,
+                           uint32_t aImageFlags)
+{
+  // Assert for properties that should be verified by decoders,
+  // warn for properties related to bad content.
+  if (!AllowedImageSize(aSize.width, aSize.height)) {
+    NS_WARNING("Should have legal image size");
+    mAborted = true;
+    return NS_ERROR_FAILURE;
+  }
+
+  mImageSize = aSize;
+  mOffset.MoveTo(0, 0);
+  mSize.SizeTo(aSize.width, aSize.height);
+
+  mFormat = aFormat;
+  mPaletteDepth = 0;
+
+  RefPtr<DrawTarget> target;
+
+  bool canUseDataSurface =
+    gfxPlatform::GetPlatform()->CanRenderContentToDataSurface();
+
+  if (canUseDataSurface) {
+    // It's safe to use data surfaces for content on this platform, so we can
+    // get away with using volatile buffers.
+    MOZ_ASSERT(!mImageSurface, "Called imgFrame::InitWithDrawable() twice?");
+
+    mVBuf = AllocateBufferForImage(mSize, mFormat);
+    if (!mVBuf) {
+      mAborted = true;
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
+
+    int32_t stride = VolatileSurfaceStride(mSize, mFormat);
+    VolatileBufferPtr<uint8_t> ptr(mVBuf);
+    if (!ptr) {
+      mAborted = true;
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
+    if (mVBuf->OnHeap()) {
+      memset(ptr, 0, stride * mSize.height);
+    }
+    mImageSurface = CreateLockedSurface(mVBuf, mSize, mFormat);
+
+    target = gfxPlatform::GetPlatform()->
+      CreateDrawTargetForData(ptr, mSize, stride, mFormat);
+  } else {
+    // We can't use data surfaces for content, so we'll create an offscreen
+    // surface instead.  This means if someone later calls RawAccessRef(), we
+    // may have to do an expensive readback, but we warned callers about that in
+    // the documentation for this method.
+    MOZ_ASSERT(!mOptSurface, "Called imgFrame::InitWithDrawable() twice?");
+
+    target = gfxPlatform::GetPlatform()->
+      CreateOffscreenContentDrawTarget(mSize, mFormat);
+  }
+
+  if (!target) {
+    mAborted = true;
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
+  // Draw using the drawable the caller provided.
+  nsIntRect imageRect(0, 0, mSize.width, mSize.height);
+  nsRefPtr<gfxContext> ctx = new gfxContext(target);
+  gfxUtils::DrawPixelSnapped(ctx, aDrawable, mSize,
+                             ImageRegion::Create(imageRect),
+                             mFormat, aFilter, aImageFlags);
+
+  if (canUseDataSurface && !mImageSurface) {
+    NS_WARNING("Failed to create VolatileDataSourceSurface");
+    mAborted = true;
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
+  if (!canUseDataSurface) {
+    // We used an offscreen surface, which is an "optimized" surface from
+    // imgFrame's perspective.
+    mOptSurface = target->Snapshot();
+  }
+
+  // If we reach this point, we should regard ourselves as complete.
+  mDecoded = GetRect();
+  MOZ_ASSERT(IsImageComplete());
+
+  return NS_OK;
+}
+
+nsresult
+imgFrame::Optimize()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  mMonitor.AssertCurrentThreadOwns();
+  MOZ_ASSERT(mLockCount == 1,
+             "Should only optimize when holding the lock exclusively");
+
+  // Don't optimize during shutdown because gfxPlatform may not be available.
+  if (ShutdownTracker::ShutdownHasStarted()) {
+    return NS_OK;
+  }
+
+  if (!mOptimizable || gDisableOptimize) {
+    return NS_OK;
+  }
+
+  if (mPalettedImageData || mOptSurface || mSinglePixel) {
+    return NS_OK;
+  }
+
+  // Don't do single-color opts on non-premult data.
+  // Cairo doesn't support non-premult single-colors.
+  if (mNonPremult) {
+    return NS_OK;
+  }
+
+  /* Figure out if the entire image is a constant color */
+
+  if (gfxPrefs::ImageSingleColorOptimizationEnabled() &&
+      mImageSurface->Stride() == mSize.width * 4) {
+    uint32_t* imgData = (uint32_t*) ((uint8_t*) mVBufPtr);
+    uint32_t firstPixel = * (uint32_t*) imgData;
+    uint32_t pixelCount = mSize.width * mSize.height + 1;
+
+    while (--pixelCount && *imgData++ == firstPixel)
+      ;
+
+    if (pixelCount == 0) {
+      // all pixels were the same
+      if (mFormat == SurfaceFormat::B8G8R8A8 ||
+          mFormat == SurfaceFormat::B8G8R8X8) {
+        mSinglePixel = true;
+        mSinglePixelColor.a = ((firstPixel >> 24) & 0xFF) * (1.0f / 255.0f);
+        mSinglePixelColor.r = ((firstPixel >> 16) & 0xFF) * (1.0f / 255.0f);
+        mSinglePixelColor.g = ((firstPixel >>  8) & 0xFF) * (1.0f / 255.0f);
+        mSinglePixelColor.b = ((firstPixel >>  0) & 0xFF) * (1.0f / 255.0f);
+        mSinglePixelColor.r /= mSinglePixelColor.a;
+        mSinglePixelColor.g /= mSinglePixelColor.a;
+        mSinglePixelColor.b /= mSinglePixelColor.a;
+
+        // blow away the older surfaces (if they exist), to release their memory
+        mVBuf = nullptr;
+        mVBufPtr = nullptr;
+        mImageSurface = nullptr;
+        mOptSurface = nullptr;
+
+        return NS_OK;
+      }
+    }
+
+    // if it's not RGB24/ARGB32, don't optimize, but we never hit this at the
+    // moment
+  }
+
+#ifdef ANDROID
+  SurfaceFormat optFormat = gfxPlatform::GetPlatform()
+    ->Optimal2DFormatForContent(gfxContentType::COLOR);
+
+  if (mFormat != SurfaceFormat::B8G8R8A8 &&
+      optFormat == SurfaceFormat::R5G6B5) {
+    RefPtr<VolatileBuffer> buf =
+      AllocateBufferForImage(mSize, optFormat);
+    if (!buf) {
+      return NS_OK;
+    }
+
+    RefPtr<DataSourceSurface> surf =
+      CreateLockedSurface(buf, mSize, optFormat);
+    if (!surf) {
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
+
+    DataSourceSurface::MappedSurface mapping;
+    DebugOnly<bool> success =
+      surf->Map(DataSourceSurface::MapType::WRITE, &mapping);
+    NS_ASSERTION(success, "Failed to map surface");
+    RefPtr<DrawTarget> target =
+      Factory::CreateDrawTargetForData(BackendType::CAIRO,
+                                       mapping.mData,
+                                       mSize,
+                                       mapping.mStride,
+                                       optFormat);
+
+    if (!target) {
+      gfxWarning() << "imgFrame::Optimize failed in CreateDrawTargetForData";
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
+    Rect rect(0, 0, mSize.width, mSize.height);
+    target->DrawSurface(mImageSurface, rect, rect);
+    target->Flush();
+    surf->Unmap();
+
+    mImageSurface = surf;
+    mVBuf = buf;
+    mFormat = optFormat;
+  }
+#else
+  mOptSurface = gfxPlatform::GetPlatform()
+    ->ScreenReferenceDrawTarget()->OptimizeSourceSurface(mImageSurface);
+  if (mOptSurface == mImageSurface) {
+    mOptSurface = nullptr;
+  }
+#endif
+
+  if (mOptSurface) {
+    mVBuf = nullptr;
+    mVBufPtr = nullptr;
+    mImageSurface = nullptr;
+  }
+
+#ifdef MOZ_WIDGET_ANDROID
+  // On Android, free mImageSurface unconditionally if we're discardable. This
+  // allows the operating system to free our volatile buffer.
+  // XXX(seth): We'd eventually like to do this on all platforms, but right now
+  // converting raw memory to a SourceSurface is expensive on some backends.
+  mImageSurface = nullptr;
+#endif
+
+  return NS_OK;
+}
+
+DrawableFrameRef
+imgFrame::DrawableRef()
+{
+  return DrawableFrameRef(this);
+}
+
+RawAccessFrameRef
+imgFrame::RawAccessRef()
+{
+  return RawAccessFrameRef(this);
+}
+
+void
+imgFrame::SetRawAccessOnly()
+{
+  AssertImageDataLocked();
+
+  // Lock our data and throw away the key.
+  LockImageData();
+}
+
+
+imgFrame::SurfaceWithFormat
+imgFrame::SurfaceForDrawing(bool               aDoPadding,
+                            bool               aDoPartialDecode,
+                            bool               aDoTile,
+                            gfxContext*        aContext,
+                            const nsIntMargin& aPadding,
+                            gfxRect&           aImageRect,
+                            ImageRegion&       aRegion,
+                            SourceSurface*     aSurface)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  mMonitor.AssertCurrentThreadOwns();
+
+  IntSize size(int32_t(aImageRect.Width()), int32_t(aImageRect.Height()));
+  if (!aDoPadding && !aDoPartialDecode) {
+    NS_ASSERTION(!mSinglePixel, "This should already have been handled");
+    return SurfaceWithFormat(new gfxSurfaceDrawable(aSurface, size), mFormat);
+  }
+
+  gfxRect available = gfxRect(mDecoded.x, mDecoded.y, mDecoded.width,
+                              mDecoded.height);
+
+  if (aDoTile || mSinglePixel) {
+    // Create a temporary surface.
+    // Give this surface an alpha channel because there are
+    // transparent pixels in the padding or undecoded area
+    RefPtr<DrawTarget> target =
+      gfxPlatform::GetPlatform()->
+        CreateOffscreenContentDrawTarget(size, SurfaceFormat::B8G8R8A8);
+    if (!target) {
+      return SurfaceWithFormat();
+    }
+
+    // Fill 'available' with whatever we've got
+    if (mSinglePixel) {
+      target->FillRect(ToRect(aRegion.Intersect(available).Rect()),
+                       ColorPattern(mSinglePixelColor),
+                       DrawOptions(1.0f, CompositionOp::OP_SOURCE));
+    } else {
+      SurfacePattern pattern(aSurface,
+                             ExtendMode::REPEAT,
+                             Matrix::Translation(mDecoded.x, mDecoded.y));
+      target->FillRect(ToRect(aRegion.Intersect(available).Rect()), pattern);
+    }
+
+    RefPtr<SourceSurface> newsurf = target->Snapshot();
+    return SurfaceWithFormat(new gfxSurfaceDrawable(newsurf, size),
+                             target->GetFormat());
+  }
+
+  // Not tiling, and we have a surface, so we can account for
+  // padding and/or a partial decode just by twiddling parameters.
+  gfxPoint paddingTopLeft(aPadding.left, aPadding.top);
+  aRegion = aRegion.Intersect(available) - paddingTopLeft;
+  aContext->Multiply(gfxMatrix::Translation(paddingTopLeft));
+  aImageRect = gfxRect(0, 0, mSize.width, mSize.height);
+
+  gfxIntSize availableSize(mDecoded.width, mDecoded.height);
+  return SurfaceWithFormat(new gfxSurfaceDrawable(aSurface, availableSize),
+                           mFormat);
+}
+
+bool imgFrame::Draw(gfxContext* aContext, const ImageRegion& aRegion,
+                    GraphicsFilter aFilter, uint32_t aImageFlags)
+{
+  PROFILER_LABEL("imgFrame", "Draw",
+    js::ProfileEntry::Category::GRAPHICS);
+
+  MOZ_ASSERT(NS_IsMainThread());
+  NS_ASSERTION(!aRegion.Rect().IsEmpty(), "Drawing empty region!");
+  NS_ASSERTION(!aRegion.IsRestricted() ||
+               !aRegion.Rect().Intersect(aRegion.Restriction()).IsEmpty(),
+               "We must be allowed to sample *some* source pixels!");
+  NS_ASSERTION(!mPalettedImageData, "Directly drawing a paletted image!");
+
+  MonitorAutoLock lock(mMonitor);
+
+  nsIntMargin padding(mOffset.y,
+                      mImageSize.width - (mOffset.x + mSize.width),
+                      mImageSize.height - (mOffset.y + mSize.height),
+                      mOffset.x);
+
+  bool doPadding = padding != nsIntMargin(0,0,0,0);
+  bool doPartialDecode = !IsImageCompleteInternal();
+
+  if (mSinglePixel && !doPadding && !doPartialDecode) {
+    if (mSinglePixelColor.a == 0.0) {
+      return true;
+    }
+    RefPtr<DrawTarget> dt = aContext->GetDrawTarget();
+    dt->FillRect(ToRect(aRegion.Rect()),
+                 ColorPattern(mSinglePixelColor),
+                 DrawOptions(1.0f,
+                             CompositionOpForOp(aContext->CurrentOperator())));
+    return true;
+  }
+
+  RefPtr<SourceSurface> surf = GetSurfaceInternal();
+  if (!surf && !mSinglePixel) {
+    return false;
+  }
+
+  gfxRect imageRect(0, 0, mImageSize.width, mImageSize.height);
+  bool doTile = !imageRect.Contains(aRegion.Rect()) &&
+                !(aImageFlags & imgIContainer::FLAG_CLAMP);
+  ImageRegion region(aRegion);
+  // SurfaceForDrawing changes the current transform, and we need it to still
+  // be changed when we call gfxUtils::DrawPixelSnapped. We still need to
+  // restore it before returning though.
+  // XXXjwatt In general having functions require someone further up the stack
+  // to undo transform changes that they make is bad practice. We should
+  // change how this code works.
+  gfxContextMatrixAutoSaveRestore autoSR(aContext);
+  SurfaceWithFormat surfaceResult =
+    SurfaceForDrawing(doPadding, doPartialDecode, doTile, aContext,
+                      padding, imageRect, region, surf);
+
+  if (surfaceResult.IsValid()) {
+    gfxUtils::DrawPixelSnapped(aContext, surfaceResult.mDrawable,
+                               imageRect.Size(), region, surfaceResult.mFormat,
+                               aFilter, aImageFlags);
+  }
+  return true;
+}
+
+nsresult
+imgFrame::ImageUpdated(const nsIntRect& aUpdateRect)
+{
+  MonitorAutoLock lock(mMonitor);
+  return ImageUpdatedInternal(aUpdateRect);
+}
+
+nsresult
+imgFrame::ImageUpdatedInternal(const nsIntRect& aUpdateRect)
+{
+  mMonitor.AssertCurrentThreadOwns();
+
+  mDecoded.UnionRect(mDecoded, aUpdateRect);
+
+  // clamp to bounds, in case someone sends a bogus updateRect (I'm looking at
+  // you, gif decoder)
+  nsIntRect boundsRect(mOffset, mSize);
+  mDecoded.IntersectRect(mDecoded, boundsRect);
+
+  // If the image is now complete, wake up anyone who's waiting.
+  if (IsImageCompleteInternal()) {
+    mMonitor.NotifyAll();
+  }
+
+  return NS_OK;
+}
+
+void
+imgFrame::Finish(Opacity aFrameOpacity /* = Opacity::SOME_TRANSPARENCY */,
+                 DisposalMethod aDisposalMethod /* = DisposalMethod::KEEP */,
+                 int32_t aRawTimeout /* = 0 */,
+                 BlendMethod aBlendMethod /* = BlendMethod::OVER */)
+{
+  MonitorAutoLock lock(mMonitor);
+  MOZ_ASSERT(mLockCount > 0, "Image data should be locked");
+
+  if (aFrameOpacity == Opacity::OPAQUE) {
+    mHasNoAlpha = true;
+  }
+
+  mDisposalMethod = aDisposalMethod;
+  mTimeout = aRawTimeout;
+  mBlendMethod = aBlendMethod;
+  ImageUpdatedInternal(GetRect());
+}
+
+nsIntRect
+imgFrame::GetRect() const
+{
+  return gfx::IntRect(mOffset, mSize);
+}
+
+int32_t
+imgFrame::GetStride() const
+{
+  mMonitor.AssertCurrentThreadOwns();
+
+  if (mImageSurface) {
+    return mImageSurface->Stride();
+  }
+
+  return VolatileSurfaceStride(mSize, mFormat);
+}
+
+SurfaceFormat
+imgFrame::GetFormat() const
+{
+  MonitorAutoLock lock(mMonitor);
+  return mFormat;
+}
+
+uint32_t
+imgFrame::GetImageBytesPerRow() const
+{
+  mMonitor.AssertCurrentThreadOwns();
+
+  if (mVBuf) {
+    return mSize.width * BytesPerPixel(mFormat);
+  }
+
+  if (mPaletteDepth) {
+    return mSize.width;
+  }
+
+  return 0;
+}
+
+uint32_t
+imgFrame::GetImageDataLength() const
+{
+  return GetImageBytesPerRow() * mSize.height;
+}
+
+void
+imgFrame::GetImageData(uint8_t** aData, uint32_t* aLength) const
+{
+  MonitorAutoLock lock(mMonitor);
+  GetImageDataInternal(aData, aLength);
+}
+
+void
+imgFrame::GetImageDataInternal(uint8_t** aData, uint32_t* aLength) const
+{
+  mMonitor.AssertCurrentThreadOwns();
+  MOZ_ASSERT(mLockCount > 0, "Image data should be locked");
+
+  if (mImageSurface) {
+    *aData = mVBufPtr;
+    MOZ_ASSERT(*aData,
+      "mImageSurface is non-null, but mVBufPtr is null in GetImageData");
+  } else if (mPalettedImageData) {
+    *aData = mPalettedImageData + PaletteDataLength();
+    MOZ_ASSERT(*aData,
+      "mPalettedImageData is non-null, but result is null in GetImageData");
+  } else {
+    MOZ_ASSERT(false,
+      "Have neither mImageSurface nor mPalettedImageData in GetImageData");
+    *aData = nullptr;
+  }
+
+  *aLength = GetImageDataLength();
+}
+
+uint8_t*
+imgFrame::GetImageData() const
+{
+  uint8_t* data;
+  uint32_t length;
+  GetImageData(&data, &length);
+  return data;
+}
+
+bool
+imgFrame::GetIsPaletted() const
+{
+  return mPalettedImageData != nullptr;
+}
+
+void
+imgFrame::GetPaletteData(uint32_t** aPalette, uint32_t* length) const
+{
+  AssertImageDataLocked();
+
+  if (!mPalettedImageData) {
+    *aPalette = nullptr;
+    *length = 0;
+  } else {
+    *aPalette = (uint32_t*) mPalettedImageData;
+    *length = PaletteDataLength();
+  }
+}
+
+uint32_t*
+imgFrame::GetPaletteData() const
+{
+  uint32_t* data;
+  uint32_t length;
+  GetPaletteData(&data, &length);
+  return data;
+}
+
+nsresult
+imgFrame::LockImageData()
+{
+  MonitorAutoLock lock(mMonitor);
+
+  MOZ_ASSERT(mLockCount >= 0, "Unbalanced locks and unlocks");
+  if (mLockCount < 0) {
+    return NS_ERROR_FAILURE;
+  }
+
+  mLockCount++;
+
+  // If we are not the first lock, there's nothing to do.
+  if (mLockCount != 1) {
+    return NS_OK;
+  }
+
+  // If we're the first lock, but have an image surface, we're OK.
+  if (mImageSurface) {
+    mVBufPtr = mVBuf;
+    return NS_OK;
+  }
+
+  // Paletted images don't have surfaces, so there's nothing to do.
+  if (mPalettedImageData) {
+    return NS_OK;
+  }
+
+  return Deoptimize();
+}
+
+nsresult
+imgFrame::Deoptimize()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  mMonitor.AssertCurrentThreadOwns();
+  MOZ_ASSERT(!mImageSurface);
+
+  if (!mImageSurface) {
+    if (mVBuf) {
+      VolatileBufferPtr<uint8_t> ref(mVBuf);
+      if (ref.WasBufferPurged()) {
+        return NS_ERROR_FAILURE;
+      }
+
+      mImageSurface = CreateLockedSurface(mVBuf, mSize, mFormat);
+      if (!mImageSurface) {
+        return NS_ERROR_OUT_OF_MEMORY;
+      }
+    }
+    if (mOptSurface || mSinglePixel || mFormat == SurfaceFormat::R5G6B5) {
+      SurfaceFormat format = mFormat;
+      if (mFormat == SurfaceFormat::R5G6B5) {
+        format = SurfaceFormat::B8G8R8A8;
+      }
+
+      // Recover the pixels
+      RefPtr<VolatileBuffer> buf =
+        AllocateBufferForImage(mSize, format);
+      if (!buf) {
+        return NS_ERROR_OUT_OF_MEMORY;
+      }
+
+      RefPtr<DataSourceSurface> surf =
+        CreateLockedSurface(buf, mSize, format);
+      if (!surf) {
+        return NS_ERROR_OUT_OF_MEMORY;
+      }
+
+      DataSourceSurface::MappedSurface mapping;
+      DebugOnly<bool> success =
+        surf->Map(DataSourceSurface::MapType::WRITE, &mapping);
+      NS_ASSERTION(success, "Failed to map surface");
+      RefPtr<DrawTarget> target =
+        Factory::CreateDrawTargetForData(BackendType::CAIRO,
+                                         mapping.mData,
+                                         mSize,
+                                         mapping.mStride,
+                                         format);
+      if (!target) {
+        gfxWarning() <<
+          "imgFrame::Deoptimize failed in CreateDrawTargetForData";
+        return NS_ERROR_OUT_OF_MEMORY;
+      }
+
+      Rect rect(0, 0, mSize.width, mSize.height);
+      if (mSinglePixel) {
+        target->FillRect(rect, ColorPattern(mSinglePixelColor),
+                         DrawOptions(1.0f, CompositionOp::OP_SOURCE));
+      } else if (mFormat == SurfaceFormat::R5G6B5) {
+        target->DrawSurface(mImageSurface, rect, rect);
+      } else {
+        target->DrawSurface(mOptSurface, rect, rect,
+                            DrawSurfaceOptions(),
+                            DrawOptions(1.0f, CompositionOp::OP_SOURCE));
+      }
+      target->Flush();
+      surf->Unmap();
+
+      mFormat = format;
+      mVBuf = buf;
+      mImageSurface = surf;
+      mOptSurface = nullptr;
+    }
+  }
+
+  mVBufPtr = mVBuf;
+  return NS_OK;
+}
+
+void
+imgFrame::AssertImageDataLocked() const
+{
+#ifdef DEBUG
+  MonitorAutoLock lock(mMonitor);
+  MOZ_ASSERT(mLockCount > 0, "Image data should be locked");
+#endif
+}
+
+class UnlockImageDataRunnable : public nsRunnable
+{
+public:
+  explicit UnlockImageDataRunnable(imgFrame* aTarget)
+    : mTarget(aTarget)
+  {
+    MOZ_ASSERT(mTarget);
+  }
+
+  NS_IMETHOD Run() { return mTarget->UnlockImageData(); }
+
+private:
+  nsRefPtr<imgFrame> mTarget;
+};
+
+nsresult
+imgFrame::UnlockImageData()
+{
+  MonitorAutoLock lock(mMonitor);
+
+  MOZ_ASSERT(mLockCount > 0, "Unlocking an unlocked image!");
+  if (mLockCount <= 0) {
+    return NS_ERROR_FAILURE;
+  }
+
+  MOZ_ASSERT(mLockCount > 1 || IsImageCompleteInternal() || mAborted,
+             "Should have marked complete or aborted before unlocking");
+
+  // If we're about to become unlocked, we don't need to hold on to our data
+  // surface anymore. (But we don't need to do anything for paletted images,
+  // which don't have surfaces.)
+  if (mLockCount == 1 && !mPalettedImageData) {
+    // We can't safely optimize off-main-thread, so create a runnable to do it.
+    if (!NS_IsMainThread()) {
+      nsCOMPtr<nsIRunnable> runnable = new UnlockImageDataRunnable(this);
+      NS_DispatchToMainThread(runnable);
+      return NS_OK;
+    }
+
+    // If we're using a surface format with alpha but the image has no alpha,
+    // change the format. This doesn't change the underlying data at all, but
+    // allows DrawTargets to avoid blending when drawing known opaque images.
+    if (mHasNoAlpha && mFormat == SurfaceFormat::B8G8R8A8 && mImageSurface) {
+      mFormat = SurfaceFormat::B8G8R8X8;
+      mImageSurface = CreateLockedSurface(mVBuf, mSize, mFormat);
+    }
+
+    // Convert the data surface to a GPU surface or a single color if possible.
+    // This will also release mImageSurface if possible.
+    Optimize();
+
+    // Allow the OS to release our data surface.
+    mVBufPtr = nullptr;
+  }
+
+  mLockCount--;
+
+  return NS_OK;
+}
+
+void
+imgFrame::SetOptimizable()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  AssertImageDataLocked();
+  mOptimizable = true;
+}
+
+Color
+imgFrame::SinglePixelColor() const
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  return mSinglePixelColor;
+}
+
+bool
+imgFrame::IsSinglePixel() const
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  return mSinglePixel;
+}
+
+TemporaryRef<SourceSurface>
+imgFrame::GetSurface()
+{
+  MonitorAutoLock lock(mMonitor);
+  return GetSurfaceInternal();
+}
+
+TemporaryRef<SourceSurface>
+imgFrame::GetSurfaceInternal()
+{
+  mMonitor.AssertCurrentThreadOwns();
+
+  if (mOptSurface) {
+    if (mOptSurface->IsValid()) {
+      RefPtr<SourceSurface> surf(mOptSurface);
+      return surf.forget();
+    } else {
+      mOptSurface = nullptr;
+    }
+  }
+
+  if (mImageSurface) {
+    RefPtr<SourceSurface> surf(mImageSurface);
+    return surf.forget();
+  }
+
+  if (!mVBuf) {
+    return nullptr;
+  }
+
+  VolatileBufferPtr<char> buf(mVBuf);
+  if (buf.WasBufferPurged()) {
+    return nullptr;
+  }
+
+  return CreateLockedSurface(mVBuf, mSize, mFormat);
+}
+
+TemporaryRef<DrawTarget>
+imgFrame::GetDrawTarget()
+{
+  MonitorAutoLock lock(mMonitor);
+
+  uint8_t* data;
+  uint32_t length;
+  GetImageDataInternal(&data, &length);
+  if (!data) {
+    return nullptr;
+  }
+
+  int32_t stride = GetStride();
+  return gfxPlatform::GetPlatform()->
+    CreateDrawTargetForData(data, mSize, stride, mFormat);
+}
+
+AnimationData
+imgFrame::GetAnimationData() const
+{
+  MonitorAutoLock lock(mMonitor);
+  MOZ_ASSERT(mLockCount > 0, "Image data should be locked");
+
+  uint8_t* data;
+  if (mPalettedImageData) {
+    data = mPalettedImageData;
+  } else {
+    uint32_t length;
+    GetImageDataInternal(&data, &length);
+  }
+
+  bool hasAlpha = mFormat == SurfaceFormat::B8G8R8A8;
+
+  return AnimationData(data, PaletteDataLength(), mTimeout, GetRect(),
+                       mBlendMethod, mDisposalMethod, hasAlpha);
+}
+
+ScalingData
+imgFrame::GetScalingData() const
+{
+  MonitorAutoLock lock(mMonitor);
+  MOZ_ASSERT(mLockCount > 0, "Image data should be locked");
+  MOZ_ASSERT(!GetIsPaletted(), "GetScalingData can't handle paletted images");
+
+  uint8_t* data;
+  uint32_t length;
+  GetImageDataInternal(&data, &length);
+
+  return ScalingData(data, mSize, GetImageBytesPerRow(), mFormat);
+}
+
+void
+imgFrame::Abort()
+{
+  MonitorAutoLock lock(mMonitor);
+
+  mAborted = true;
+
+  // Wake up anyone who's waiting.
+  mMonitor.NotifyAll();
+}
+
+bool
+imgFrame::IsImageComplete() const
+{
+  MonitorAutoLock lock(mMonitor);
+  return IsImageCompleteInternal();
+}
+
+void
+imgFrame::WaitUntilComplete() const
+{
+  MonitorAutoLock lock(mMonitor);
+
+  while (true) {
+    // Return if we're aborted or complete.
+    if (mAborted || IsImageCompleteInternal()) {
+      return;
+    }
+
+    // Not complete yet, so we'll have to wait.
+    mMonitor.Wait();
+  }
+}
+
+bool
+imgFrame::IsImageCompleteInternal() const
+{
+  mMonitor.AssertCurrentThreadOwns();
+  return mDecoded.IsEqualInterior(nsIntRect(mOffset.x, mOffset.y,
+                                            mSize.width, mSize.height));
+}
+
+bool imgFrame::GetCompositingFailed() const
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  return mCompositingFailed;
+}
+
+void
+imgFrame::SetCompositingFailed(bool val)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  mCompositingFailed = val;
+}
+
+size_t
+imgFrame::SizeOfExcludingThis(gfxMemoryLocation aLocation,
+                              MallocSizeOf aMallocSizeOf) const
+{
+  MonitorAutoLock lock(mMonitor);
+
+  // aMallocSizeOf is only used if aLocation is
+  // gfxMemoryLocation::IN_PROCESS_HEAP.  It
+  // should be nullptr otherwise.
+  MOZ_ASSERT(
+    (aLocation == gfxMemoryLocation::IN_PROCESS_HEAP &&  aMallocSizeOf) ||
+    (aLocation != gfxMemoryLocation::IN_PROCESS_HEAP && !aMallocSizeOf),
+    "mismatch between aLocation and aMallocSizeOf");
+
+  size_t n = 0;
+
+  if (mPalettedImageData && aLocation == gfxMemoryLocation::IN_PROCESS_HEAP) {
+    n += aMallocSizeOf(mPalettedImageData);
+  }
+  if (mImageSurface && aLocation == gfxMemoryLocation::IN_PROCESS_HEAP) {
+    n += aMallocSizeOf(mImageSurface);
+  }
+  if (mOptSurface && aLocation == gfxMemoryLocation::IN_PROCESS_HEAP) {
+    n += aMallocSizeOf(mOptSurface);
+  }
+
+  if (mVBuf && aLocation == gfxMemoryLocation::IN_PROCESS_HEAP) {
+    n += aMallocSizeOf(mVBuf);
+    n += mVBuf->HeapSizeOfExcludingThis(aMallocSizeOf);
+  }
+
+  if (mVBuf && aLocation == gfxMemoryLocation::IN_PROCESS_NONHEAP) {
+    n += mVBuf->NonHeapSizeOfExcludingThis();
+  }
+
+  return n;
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/imgFrame.h firefox-trunk-41.0~a1~hg20150524r245419/image/imgFrame.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/imgFrame.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/imgFrame.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,535 @@
+/* -*- 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_image_imgFrame_h
+#define mozilla_image_imgFrame_h
+
+#include "mozilla/MemoryReporting.h"
+#include "mozilla/Monitor.h"
+#include "mozilla/Move.h"
+#include "mozilla/VolatileBuffer.h"
+#include "gfxDrawable.h"
+#include "imgIContainer.h"
+#include "MainThreadUtils.h"
+
+namespace mozilla {
+namespace image {
+
+class ImageRegion;
+class DrawableFrameRef;
+class RawAccessFrameRef;
+
+enum class BlendMethod : int8_t {
+  // All color components of the frame, including alpha, overwrite the current
+  // contents of the frame's output buffer region.
+  SOURCE,
+
+  // The frame should be composited onto the output buffer based on its alpha,
+  // using a simple OVER operation.
+  OVER
+};
+
+enum class DisposalMethod : int8_t {
+  CLEAR_ALL = -1,  // Clear the whole image, revealing what's underneath.
+  NOT_SPECIFIED,   // Leave the frame and let the new frame draw on top.
+  KEEP,            // Leave the frame and let the new frame draw on top.
+  CLEAR,           // Clear the frame's area, revealing what's underneath.
+  RESTORE_PREVIOUS // Restore the previous (composited) frame.
+};
+
+enum class Opacity : uint8_t {
+  OPAQUE,
+  SOME_TRANSPARENCY
+};
+
+/**
+ * AnimationData contains all of the information necessary for using an imgFrame
+ * as part of an animation.
+ *
+ * It includes pointers to the raw image data of the underlying imgFrame, but
+ * does not own that data. A RawAccessFrameRef for the underlying imgFrame must
+ * outlive the AnimationData for it to remain valid.
+ */
+struct AnimationData
+{
+  AnimationData(uint8_t* aRawData, uint32_t aPaletteDataLength,
+                int32_t aRawTimeout, const nsIntRect& aRect,
+                BlendMethod aBlendMethod, DisposalMethod aDisposalMethod,
+                bool aHasAlpha)
+    : mRawData(aRawData)
+    , mPaletteDataLength(aPaletteDataLength)
+    , mRawTimeout(aRawTimeout)
+    , mRect(aRect)
+    , mBlendMethod(aBlendMethod)
+    , mDisposalMethod(aDisposalMethod)
+    , mHasAlpha(aHasAlpha)
+  { }
+
+  uint8_t* mRawData;
+  uint32_t mPaletteDataLength;
+  int32_t mRawTimeout;
+  nsIntRect mRect;
+  BlendMethod mBlendMethod;
+  DisposalMethod mDisposalMethod;
+  bool mHasAlpha;
+};
+
+/**
+ * ScalingData contains all of the information necessary for performing
+ * high-quality (CPU-based) scaling an imgFrame.
+ *
+ * It includes pointers to the raw image data of the underlying imgFrame, but
+ * does not own that data. A RawAccessFrameRef for the underlying imgFrame must
+ * outlive the ScalingData for it to remain valid.
+ */
+struct ScalingData
+{
+  ScalingData(uint8_t* aRawData,
+              gfx::IntSize aSize,
+              uint32_t aBytesPerRow,
+              gfx::SurfaceFormat aFormat)
+    : mRawData(aRawData)
+    , mSize(aSize)
+    , mBytesPerRow(aBytesPerRow)
+    , mFormat(aFormat)
+  { }
+
+  uint8_t* mRawData;
+  gfx::IntSize mSize;
+  uint32_t mBytesPerRow;
+  gfx::SurfaceFormat mFormat;
+};
+
+class imgFrame
+{
+  typedef gfx::Color Color;
+  typedef gfx::DataSourceSurface DataSourceSurface;
+  typedef gfx::DrawTarget DrawTarget;
+  typedef gfx::IntSize IntSize;
+  typedef gfx::SourceSurface SourceSurface;
+  typedef gfx::SurfaceFormat SurfaceFormat;
+
+public:
+  MOZ_DECLARE_REFCOUNTED_TYPENAME(imgFrame)
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(imgFrame)
+
+  imgFrame();
+
+  /**
+   * Initialize this imgFrame with an empty surface and prepare it for being
+   * written to by a decoder.
+   *
+   * This is appropriate for use with decoded images, but it should not be used
+   * when drawing content into an imgFrame, as it may use a different graphics
+   * backend than normal content drawing.
+   */
+  nsresult InitForDecoder(const nsIntSize& aImageSize,
+                          const nsIntRect& aRect,
+                          SurfaceFormat aFormat,
+                          uint8_t aPaletteDepth = 0,
+                          bool aNonPremult = false);
+
+  nsresult InitForDecoder(const nsIntSize& aSize,
+                          SurfaceFormat aFormat,
+                          uint8_t aPaletteDepth = 0)
+  {
+    return InitForDecoder(aSize, nsIntRect(0, 0, aSize.width, aSize.height),
+                          aFormat, aPaletteDepth);
+  }
+
+
+  /**
+   * Initialize this imgFrame with a new surface and draw the provided
+   * gfxDrawable into it.
+   *
+   * This is appropriate to use when drawing content into an imgFrame, as it
+   * uses the same graphics backend as normal content drawing. The downside is
+   * that the underlying surface may not be stored in a volatile buffer on all
+   * platforms, and raw access to the surface (using RawAccessRef()) may be much
+   * more expensive than in the InitForDecoder() case.
+   */
+  nsresult InitWithDrawable(gfxDrawable* aDrawable,
+                            const nsIntSize& aSize,
+                            const SurfaceFormat aFormat,
+                            GraphicsFilter aFilter,
+                            uint32_t aImageFlags);
+
+  /**
+   * Reinitializes an existing imgFrame with new parameters. You must be holding
+   * a RawAccessFrameRef to the imgFrame, and it must never have been written
+   * to, marked finished, or aborted.
+   *
+   * XXX(seth): We will remove this in bug 1117607.
+   */
+  nsresult ReinitForDecoder(const nsIntSize& aImageSize,
+                            const nsIntRect& aRect,
+                            SurfaceFormat aFormat,
+                            uint8_t aPaletteDepth = 0,
+                            bool aNonPremult = false);
+
+  DrawableFrameRef DrawableRef();
+  RawAccessFrameRef RawAccessRef();
+
+  /**
+   * Make this imgFrame permanently available for raw access.
+   *
+   * This is irrevocable, and should be avoided whenever possible, since it
+   * prevents this imgFrame from being optimized and makes it impossible for its
+   * volatile buffer to be freed.
+   *
+   * It is an error to call this without already holding a RawAccessFrameRef to
+   * this imgFrame.
+   */
+  void SetRawAccessOnly();
+
+  bool Draw(gfxContext* aContext, const ImageRegion& aRegion,
+            GraphicsFilter aFilter, uint32_t aImageFlags);
+
+  nsresult ImageUpdated(const nsIntRect& aUpdateRect);
+
+  /**
+   * Mark this imgFrame as completely decoded, and set final options.
+   *
+   * You must always call either Finish() or Abort() before releasing the last
+   * RawAccessFrameRef pointing to an imgFrame.
+   *
+   * @param aFrameOpacity    Whether this imgFrame is opaque.
+   * @param aDisposalMethod  For animation frames, how this imgFrame is cleared
+   *                         from the compositing frame before the next frame is
+   *                         displayed.
+   * @param aRawTimeout      For animation frames, the timeout in milliseconds
+   *                         before the next frame is displayed. This timeout is
+   *                         not necessarily the timeout that will actually be
+   *                         used; see FrameAnimator::GetTimeoutForFrame.
+   * @param aBlendMethod     For animation frames, a blending method to be used
+   *                         when compositing this frame.
+   */
+  void Finish(Opacity aFrameOpacity = Opacity::SOME_TRANSPARENCY,
+              DisposalMethod aDisposalMethod = DisposalMethod::KEEP,
+              int32_t aRawTimeout = 0,
+              BlendMethod aBlendMethod = BlendMethod::OVER);
+
+  /**
+   * Mark this imgFrame as aborted. This informs the imgFrame that if it isn't
+   * completely decoded now, it never will be.
+   *
+   * You must always call either Finish() or Abort() before releasing the last
+   * RawAccessFrameRef pointing to an imgFrame.
+   */
+  void Abort();
+
+  /**
+   * Returns true if this imgFrame is completely decoded.
+   */
+  bool IsImageComplete() const;
+
+  /**
+   * Blocks until this imgFrame is either completely decoded, or is marked as
+   * aborted.
+   *
+   * Note that calling this on the main thread _blocks the main thread_. Be very
+   * careful in your use of this method to avoid excessive main thread jank or
+   * deadlock.
+   */
+  void WaitUntilComplete() const;
+
+  /**
+   * Returns the number of bytes per pixel this imgFrame requires.  This is a
+   * worst-case value that does not take into account the effects of format
+   * changes caused by Optimize(), since an imgFrame is not optimized throughout
+   * its lifetime.
+   */
+  uint32_t GetBytesPerPixel() const { return GetIsPaletted() ? 1 : 4; }
+
+  IntSize GetImageSize() const { return mImageSize; }
+  nsIntRect GetRect() const;
+  IntSize GetSize() const { return mSize; }
+  bool NeedsPadding() const { return mOffset != nsIntPoint(0, 0); }
+  void GetImageData(uint8_t** aData, uint32_t* length) const;
+  uint8_t* GetImageData() const;
+
+  bool GetIsPaletted() const;
+  void GetPaletteData(uint32_t** aPalette, uint32_t* length) const;
+  uint32_t* GetPaletteData() const;
+  uint8_t GetPaletteDepth() const { return mPaletteDepth; }
+
+  /**
+   * Get the SurfaceFormat for this imgFrame.
+   *
+   * This should only be used for assertions.
+   */
+  SurfaceFormat GetFormat() const;
+
+  AnimationData GetAnimationData() const;
+  ScalingData GetScalingData() const;
+
+  bool GetCompositingFailed() const;
+  void SetCompositingFailed(bool val);
+
+  void SetOptimizable();
+
+  Color SinglePixelColor() const;
+  bool IsSinglePixel() const;
+
+  TemporaryRef<SourceSurface> GetSurface();
+  TemporaryRef<DrawTarget> GetDrawTarget();
+
+  size_t SizeOfExcludingThis(gfxMemoryLocation aLocation,
+                             MallocSizeOf aMallocSizeOf) const;
+
+private: // methods
+
+  ~imgFrame();
+
+  nsresult LockImageData();
+  nsresult UnlockImageData();
+  nsresult Optimize();
+  nsresult Deoptimize();
+
+  void AssertImageDataLocked() const;
+
+  bool IsImageCompleteInternal() const;
+  nsresult ImageUpdatedInternal(const nsIntRect& aUpdateRect);
+  void GetImageDataInternal(uint8_t** aData, uint32_t* length) const;
+  uint32_t GetImageBytesPerRow() const;
+  uint32_t GetImageDataLength() const;
+  int32_t GetStride() const;
+  TemporaryRef<SourceSurface> GetSurfaceInternal();
+
+  uint32_t PaletteDataLength() const
+  {
+    return mPaletteDepth ? (size_t(1) << mPaletteDepth) * sizeof(uint32_t)
+                         : 0;
+  }
+
+  struct SurfaceWithFormat {
+    nsRefPtr<gfxDrawable> mDrawable;
+    SurfaceFormat mFormat;
+    SurfaceWithFormat() { }
+    SurfaceWithFormat(gfxDrawable* aDrawable, SurfaceFormat aFormat)
+      : mDrawable(aDrawable), mFormat(aFormat)
+    { }
+    bool IsValid() { return !!mDrawable; }
+  };
+
+  SurfaceWithFormat SurfaceForDrawing(bool               aDoPadding,
+                                      bool               aDoPartialDecode,
+                                      bool               aDoTile,
+                                      gfxContext*        aContext,
+                                      const nsIntMargin& aPadding,
+                                      gfxRect&           aImageRect,
+                                      ImageRegion&       aRegion,
+                                      SourceSurface*     aSurface);
+
+private: // data
+  friend class DrawableFrameRef;
+  friend class RawAccessFrameRef;
+  friend class UnlockImageDataRunnable;
+
+  //////////////////////////////////////////////////////////////////////////////
+  // Thread-safe mutable data, protected by mMonitor.
+  //////////////////////////////////////////////////////////////////////////////
+
+  mutable Monitor mMonitor;
+
+  RefPtr<DataSourceSurface> mImageSurface;
+  RefPtr<SourceSurface> mOptSurface;
+
+  RefPtr<VolatileBuffer> mVBuf;
+  VolatileBufferPtr<uint8_t> mVBufPtr;
+
+  nsIntRect mDecoded;
+
+  //! Number of RawAccessFrameRefs currently alive for this imgFrame.
+  int32_t mLockCount;
+
+  //! Raw timeout for this frame. (See FrameAnimator::GetTimeoutForFrame.)
+  int32_t mTimeout; // -1 means display forever.
+
+  DisposalMethod mDisposalMethod;
+  BlendMethod    mBlendMethod;
+  SurfaceFormat  mFormat;
+
+  bool mHasNoAlpha;
+  bool mAborted;
+
+
+  //////////////////////////////////////////////////////////////////////////////
+  // Effectively const data, only mutated in the Init methods.
+  //////////////////////////////////////////////////////////////////////////////
+
+  IntSize      mImageSize;
+  IntSize      mSize;
+  nsIntPoint   mOffset;
+
+  // The palette and image data for images that are paletted, since Cairo
+  // doesn't support these images.
+  // The paletted data comes first, then the image data itself.
+  // Total length is PaletteDataLength() + GetImageDataLength().
+  uint8_t*     mPalettedImageData;
+  uint8_t      mPaletteDepth;
+
+  bool mNonPremult;
+
+
+  //////////////////////////////////////////////////////////////////////////////
+  // Main-thread-only mutable data.
+  //////////////////////////////////////////////////////////////////////////////
+
+  // Note that the data stored in gfx::Color is *non-alpha-premultiplied*.
+  Color        mSinglePixelColor;
+
+  bool mSinglePixel;
+  bool mCompositingFailed;
+  bool mOptimizable;
+};
+
+/**
+ * A reference to an imgFrame that holds the imgFrame's surface in memory,
+ * allowing drawing. If you have a DrawableFrameRef |ref| and |if (ref)| returns
+ * true, then calls to Draw() and GetSurface() are guaranteed to succeed.
+ */
+class DrawableFrameRef final
+{
+public:
+  DrawableFrameRef() { }
+
+  explicit DrawableFrameRef(imgFrame* aFrame)
+    : mFrame(aFrame)
+    , mRef(aFrame->mVBuf)
+  {
+    if (mRef.WasBufferPurged()) {
+      mFrame = nullptr;
+      mRef = nullptr;
+    }
+  }
+
+  DrawableFrameRef(DrawableFrameRef&& aOther)
+    : mFrame(aOther.mFrame.forget())
+    , mRef(Move(aOther.mRef))
+  { }
+
+  DrawableFrameRef& operator=(DrawableFrameRef&& aOther)
+  {
+    MOZ_ASSERT(this != &aOther, "Self-moves are prohibited");
+    mFrame = aOther.mFrame.forget();
+    mRef = Move(aOther.mRef);
+    return *this;
+  }
+
+  explicit operator bool() const { return bool(mFrame); }
+
+  imgFrame* operator->()
+  {
+    MOZ_ASSERT(mFrame);
+    return mFrame;
+  }
+
+  const imgFrame* operator->() const
+  {
+    MOZ_ASSERT(mFrame);
+    return mFrame;
+  }
+
+  imgFrame* get() { return mFrame; }
+  const imgFrame* get() const { return mFrame; }
+
+  void reset()
+  {
+    mFrame = nullptr;
+    mRef = nullptr;
+  }
+
+private:
+  nsRefPtr<imgFrame> mFrame;
+  VolatileBufferPtr<uint8_t> mRef;
+};
+
+/**
+ * A reference to an imgFrame that holds the imgFrame's surface in memory in a
+ * format appropriate for access as raw data. If you have a RawAccessFrameRef
+ * |ref| and |if (ref)| is true, then calls to GetImageData(), GetPaletteData(),
+ * and GetDrawTarget() are guaranteed to succeed. This guarantee is stronger
+ * than DrawableFrameRef, so everything that a valid DrawableFrameRef guarantees
+ * is also guaranteed by a valid RawAccessFrameRef.
+ *
+ * This may be considerably more expensive than is necessary just for drawing,
+ * so only use this when you need to read or write the raw underlying image data
+ * that the imgFrame holds.
+ */
+class RawAccessFrameRef final
+{
+public:
+  RawAccessFrameRef() { }
+
+  explicit RawAccessFrameRef(imgFrame* aFrame)
+    : mFrame(aFrame)
+  {
+    MOZ_ASSERT(mFrame, "Need a frame");
+
+    if (NS_FAILED(mFrame->LockImageData())) {
+      mFrame->UnlockImageData();
+      mFrame = nullptr;
+    }
+  }
+
+  RawAccessFrameRef(RawAccessFrameRef&& aOther)
+    : mFrame(aOther.mFrame.forget())
+  { }
+
+  ~RawAccessFrameRef()
+  {
+    if (mFrame) {
+      mFrame->UnlockImageData();
+    }
+  }
+
+  RawAccessFrameRef& operator=(RawAccessFrameRef&& aOther)
+  {
+    MOZ_ASSERT(this != &aOther, "Self-moves are prohibited");
+
+    if (mFrame) {
+      mFrame->UnlockImageData();
+    }
+
+    mFrame = aOther.mFrame.forget();
+
+    return *this;
+  }
+
+  explicit operator bool() const { return bool(mFrame); }
+
+  imgFrame* operator->()
+  {
+    MOZ_ASSERT(mFrame);
+    return mFrame.get();
+  }
+
+  const imgFrame* operator->() const
+  {
+    MOZ_ASSERT(mFrame);
+    return mFrame;
+  }
+
+  imgFrame* get() { return mFrame; }
+  const imgFrame* get() const { return mFrame; }
+
+  void reset()
+  {
+    if (mFrame) {
+      mFrame->UnlockImageData();
+    }
+    mFrame = nullptr;
+  }
+
+private:
+  nsRefPtr<imgFrame> mFrame;
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_imgFrame_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/imgIContainer.idl firefox-trunk-41.0~a1~hg20150524r245419/image/imgIContainer.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/image/imgIContainer.idl	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/imgIContainer.idl	2015-05-25 20:42:42.000000000 +0000
@@ -116,7 +116,7 @@
  *
  * Internally, imgIContainer also manages animation of images.
  */
-[scriptable, builtinclass, uuid(e3261ae7-4749-4cf6-bf06-59946233366f)]
+[scriptable, builtinclass, uuid(f5e1230a-3733-477f-b49b-fee8717a786b)]
 interface imgIContainer : nsISupports
 {
   /**
@@ -270,8 +270,17 @@
   [notxpcom] boolean isOpaque();
 
   /**
+   * @return true if getImageContainer() is expected to return a valid
+   *         ImageContainer when passed the given @Manager and @Flags
+   *         parameters.
+   */
+  [noscript, notxpcom] boolean isImageContainerAvailable(in LayerManager aManager,
+                                                         in uint32_t aFlags);
+  /**
    * Attempts to create an ImageContainer (and Image) containing the current
-   * frame. Only valid for RASTER type images.
+   * frame.
+   *
+   * Avoid calling this unless you're actually going to layerize this image.
    *
    * @param aManager The LayerManager which will be used to create the
    *                 ImageContainer.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/imgLoader.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/imgLoader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/imgLoader.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/imgLoader.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,2990 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozilla/Attributes.h"
+#include "mozilla/ClearOnShutdown.h"
+#include "mozilla/Move.h"
+#include "mozilla/Preferences.h"
+
+#include "ImageLogging.h"
+#include "nsPrintfCString.h"
+#include "imgLoader.h"
+#include "imgRequestProxy.h"
+
+#include "nsCOMPtr.h"
+
+#include "nsContentPolicyUtils.h"
+#include "nsContentUtils.h"
+#include "nsCORSListenerProxy.h"
+#include "nsNetUtil.h"
+#include "nsMimeTypes.h"
+#include "nsStreamUtils.h"
+#include "nsIHttpChannel.h"
+#include "nsICachingChannel.h"
+#include "nsIInterfaceRequestor.h"
+#include "nsIProgressEventSink.h"
+#include "nsIChannelEventSink.h"
+#include "nsIAsyncVerifyRedirectCallback.h"
+#include "nsIFileURL.h"
+#include "nsCRT.h"
+#include "nsINetworkPredictor.h"
+#include "mozilla/dom/nsMixedContentBlocker.h"
+
+#include "nsIApplicationCache.h"
+#include "nsIApplicationCacheContainer.h"
+
+#include "nsIMemoryReporter.h"
+#include "Image.h"
+#include "gfxPrefs.h"
+
+// we want to explore making the document own the load group
+// so we can associate the document URI with the load group.
+// until this point, we have an evil hack:
+#include "nsIHttpChannelInternal.h"
+#include "nsILoadContext.h"
+#include "nsILoadGroupChild.h"
+
+using namespace mozilla;
+using namespace mozilla::image;
+using namespace mozilla::net;
+
+MOZ_DEFINE_MALLOC_SIZE_OF(ImagesMallocSizeOf)
+
+class imgMemoryReporter final : public nsIMemoryReporter
+{
+  ~imgMemoryReporter() { }
+
+public:
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD CollectReports(nsIHandleReportCallback* aHandleReport,
+                            nsISupports* aData, bool aAnonymize) override
+  {
+    nsresult rv;
+    nsTArray<ImageMemoryCounter> chrome;
+    nsTArray<ImageMemoryCounter> content;
+    nsTArray<ImageMemoryCounter> uncached;
+
+    for (uint32_t i = 0; i < mKnownLoaders.Length(); i++) {
+      mKnownLoaders[i]->mChromeCache.EnumerateRead(DoRecordCounter, &chrome);
+      mKnownLoaders[i]->mCache.EnumerateRead(DoRecordCounter, &content);
+      MutexAutoLock lock(mKnownLoaders[i]->mUncachedImagesMutex);
+      mKnownLoaders[i]->
+        mUncachedImages.EnumerateEntries(DoRecordCounterUncached, &uncached);
+    }
+
+    // Note that we only need to anonymize content image URIs.
+
+    rv = ReportCounterArray(aHandleReport, aData, chrome, "images/chrome");
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = ReportCounterArray(aHandleReport, aData, content,
+                            "images/content", aAnonymize);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    // Uncached images may be content or chrome, so anonymize them.
+    rv = ReportCounterArray(aHandleReport, aData, uncached,
+                            "images/uncached", aAnonymize);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    return NS_OK;
+  }
+
+  static int64_t ImagesContentUsedUncompressedDistinguishedAmount()
+  {
+    size_t n = 0;
+    for (uint32_t i = 0; i < imgLoader::sMemReporter->mKnownLoaders.Length();
+         i++) {
+      imgLoader::sMemReporter->mKnownLoaders[i]->
+        mCache.EnumerateRead(DoRecordCounterUsedDecoded, &n);
+    }
+    return n;
+  }
+
+  void RegisterLoader(imgLoader* aLoader)
+  {
+    mKnownLoaders.AppendElement(aLoader);
+  }
+
+  void UnregisterLoader(imgLoader* aLoader)
+  {
+    mKnownLoaders.RemoveElement(aLoader);
+  }
+
+private:
+  nsTArray<imgLoader*> mKnownLoaders;
+
+  struct MemoryTotal
+  {
+    MemoryTotal& operator+=(const ImageMemoryCounter& aImageCounter)
+    {
+      if (aImageCounter.Type() == imgIContainer::TYPE_RASTER) {
+        if (aImageCounter.IsUsed()) {
+          mUsedRasterCounter += aImageCounter.Values();
+        } else {
+          mUnusedRasterCounter += aImageCounter.Values();
+        }
+      } else if (aImageCounter.Type() == imgIContainer::TYPE_VECTOR) {
+        if (aImageCounter.IsUsed()) {
+          mUsedVectorCounter += aImageCounter.Values();
+        } else {
+          mUnusedVectorCounter += aImageCounter.Values();
+        }
+      } else {
+        MOZ_CRASH("Unexpected image type");
+      }
+
+      return *this;
+    }
+
+    const MemoryCounter& UsedRaster() const { return mUsedRasterCounter; }
+    const MemoryCounter& UnusedRaster() const { return mUnusedRasterCounter; }
+    const MemoryCounter& UsedVector() const { return mUsedVectorCounter; }
+    const MemoryCounter& UnusedVector() const { return mUnusedVectorCounter; }
+
+  private:
+    MemoryCounter mUsedRasterCounter;
+    MemoryCounter mUnusedRasterCounter;
+    MemoryCounter mUsedVectorCounter;
+    MemoryCounter mUnusedVectorCounter;
+  };
+
+  // Reports all images of a single kind, e.g. all used chrome images.
+  nsresult ReportCounterArray(nsIHandleReportCallback* aHandleReport,
+                              nsISupports* aData,
+                              nsTArray<ImageMemoryCounter>& aCounterArray,
+                              const char* aPathPrefix,
+                              bool aAnonymize = false)
+  {
+    nsresult rv;
+    MemoryTotal summaryTotal;
+    MemoryTotal nonNotableTotal;
+
+    // Report notable images, and compute total and non-notable aggregate sizes.
+    for (uint32_t i = 0; i < aCounterArray.Length(); i++) {
+      ImageMemoryCounter& counter = aCounterArray[i];
+
+      if (aAnonymize) {
+        counter.URI().Truncate();
+        counter.URI().AppendPrintf("<anonymized-%u>", i);
+      } else {
+        // The URI could be an extremely long data: URI. Truncate if needed.
+        static const size_t max = 256;
+        if (counter.URI().Length() > max) {
+          counter.URI().Truncate(max);
+          counter.URI().AppendLiteral(" (truncated)");
+        }
+        counter.URI().ReplaceChar('/', '\\');
+      }
+
+      summaryTotal += counter;
+
+      if (counter.IsNotable()) {
+        rv = ReportImage(aHandleReport, aData, aPathPrefix, counter);
+        NS_ENSURE_SUCCESS(rv, rv);
+      } else {
+        nonNotableTotal += counter;
+      }
+    }
+
+    // Report non-notable images in aggregate.
+    rv = ReportTotal(aHandleReport, aData, /* aExplicit = */ true,
+                     aPathPrefix, "<non-notable images>/", nonNotableTotal);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    // Report a summary in aggregate, outside of the explicit tree.
+    rv = ReportTotal(aHandleReport, aData, /* aExplicit = */ false,
+                     aPathPrefix, "", summaryTotal);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    return NS_OK;
+  }
+
+  static nsresult ReportImage(nsIHandleReportCallback* aHandleReport,
+                              nsISupports* aData,
+                              const char* aPathPrefix,
+                              const ImageMemoryCounter& aCounter)
+  {
+    nsresult rv;
+
+    nsAutoCString pathPrefix(NS_LITERAL_CSTRING("explicit/"));
+    pathPrefix.Append(aPathPrefix);
+    pathPrefix.Append(aCounter.Type() == imgIContainer::TYPE_RASTER
+                        ? "/raster/"
+                        : "/vector/");
+    pathPrefix.Append(aCounter.IsUsed() ? "used/" : "unused/");
+    pathPrefix.Append("image(");
+    pathPrefix.AppendInt(aCounter.IntrinsicSize().width);
+    pathPrefix.Append("x");
+    pathPrefix.AppendInt(aCounter.IntrinsicSize().height);
+    pathPrefix.Append(", ");
+
+    if (aCounter.URI().IsEmpty()) {
+      pathPrefix.Append("<unknown URI>");
+    } else {
+      pathPrefix.Append(aCounter.URI());
+    }
+
+    pathPrefix.Append(")/");
+
+    rv = ReportSurfaces(aHandleReport, aData, pathPrefix, aCounter);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = ReportSourceValue(aHandleReport, aData, pathPrefix, aCounter.Values());
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    return NS_OK;
+  }
+
+  static nsresult ReportSurfaces(nsIHandleReportCallback* aHandleReport,
+                                 nsISupports* aData,
+                                 const nsACString& aPathPrefix,
+                                 const ImageMemoryCounter& aCounter)
+  {
+    for (const SurfaceMemoryCounter& counter : aCounter.Surfaces()) {
+      nsAutoCString surfacePathPrefix(aPathPrefix);
+      surfacePathPrefix.Append(counter.IsLocked() ? "locked/" : "unlocked/");
+      surfacePathPrefix.Append("surface(");
+
+      if (counter.SubframeSize() &&
+          *counter.SubframeSize() != counter.Key().Size()) {
+        surfacePathPrefix.AppendInt(counter.SubframeSize()->width);
+        surfacePathPrefix.Append("x");
+        surfacePathPrefix.AppendInt(counter.SubframeSize()->height);
+        surfacePathPrefix.Append(" subframe of ");
+      }
+
+      surfacePathPrefix.AppendInt(counter.Key().Size().width);
+      surfacePathPrefix.Append("x");
+      surfacePathPrefix.AppendInt(counter.Key().Size().height);
+
+      if (counter.Type() == SurfaceMemoryCounterType::NORMAL) {
+        surfacePathPrefix.Append("@");
+        surfacePathPrefix.AppendFloat(counter.Key().AnimationTime());
+
+        if (counter.Key().Flags() != imgIContainer::DECODE_FLAGS_DEFAULT) {
+          surfacePathPrefix.Append(", flags:");
+          surfacePathPrefix.AppendInt(counter.Key().Flags(), /* aRadix = */ 16);
+        }
+      } else if (counter.Type() == SurfaceMemoryCounterType::COMPOSITING) {
+        surfacePathPrefix.Append(", compositing frame");
+      } else if (counter.Type() == SurfaceMemoryCounterType::COMPOSITING_PREV) {
+        surfacePathPrefix.Append(", compositing prev frame");
+      } else {
+        MOZ_ASSERT_UNREACHABLE("Unknown counter type");
+      }
+
+      surfacePathPrefix.Append(")/");
+
+      nsresult rv = ReportValues(aHandleReport, aData, surfacePathPrefix,
+                                 counter.Values());
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+
+    return NS_OK;
+  }
+
+  static nsresult ReportTotal(nsIHandleReportCallback* aHandleReport,
+                              nsISupports* aData,
+                              bool aExplicit,
+                              const char* aPathPrefix,
+                              const char* aPathInfix,
+                              const MemoryTotal& aTotal)
+  {
+    nsresult rv;
+
+    nsAutoCString pathPrefix;
+    if (aExplicit) {
+      pathPrefix.Append("explicit/");
+    }
+    pathPrefix.Append(aPathPrefix);
+
+    nsAutoCString rasterUsedPrefix(pathPrefix);
+    rasterUsedPrefix.Append("/raster/used/");
+    rasterUsedPrefix.Append(aPathInfix);
+    rv = ReportValues(aHandleReport, aData, rasterUsedPrefix,
+                      aTotal.UsedRaster());
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsAutoCString rasterUnusedPrefix(pathPrefix);
+    rasterUnusedPrefix.Append("/raster/unused/");
+    rasterUnusedPrefix.Append(aPathInfix);
+    rv = ReportValues(aHandleReport, aData, rasterUnusedPrefix,
+                      aTotal.UnusedRaster());
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsAutoCString vectorUsedPrefix(pathPrefix);
+    vectorUsedPrefix.Append("/vector/used/");
+    vectorUsedPrefix.Append(aPathInfix);
+    rv = ReportValues(aHandleReport, aData, vectorUsedPrefix,
+                      aTotal.UsedVector());
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsAutoCString vectorUnusedPrefix(pathPrefix);
+    vectorUnusedPrefix.Append("/vector/unused/");
+    vectorUnusedPrefix.Append(aPathInfix);
+    rv = ReportValues(aHandleReport, aData, vectorUnusedPrefix,
+                      aTotal.UnusedVector());
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    return NS_OK;
+  }
+
+  static nsresult ReportValues(nsIHandleReportCallback* aHandleReport,
+                               nsISupports* aData,
+                               const nsACString& aPathPrefix,
+                               const MemoryCounter& aCounter)
+  {
+    nsresult rv;
+
+    rv = ReportSourceValue(aHandleReport, aData, aPathPrefix, aCounter);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = ReportValue(aHandleReport, aData, KIND_HEAP, aPathPrefix,
+                     "decoded-heap",
+                     "Decoded image data which is stored on the heap.",
+                     aCounter.DecodedHeap());
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = ReportValue(aHandleReport, aData, KIND_NONHEAP, aPathPrefix,
+                     "decoded-nonheap",
+                     "Decoded image data which isn't stored on the heap.",
+                     aCounter.DecodedNonHeap());
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    return NS_OK;
+  }
+
+  static nsresult ReportSourceValue(nsIHandleReportCallback* aHandleReport,
+                                    nsISupports* aData,
+                                    const nsACString& aPathPrefix,
+                                    const MemoryCounter& aCounter)
+  {
+    nsresult rv;
+
+    rv = ReportValue(aHandleReport, aData, KIND_HEAP, aPathPrefix,
+                     "source",
+                     "Raster image source data and vector image documents.",
+                     aCounter.Source());
+
+    return rv;
+  }
+
+  static nsresult ReportValue(nsIHandleReportCallback* aHandleReport,
+                              nsISupports* aData,
+                              int32_t aKind,
+                              const nsACString& aPathPrefix,
+                              const char* aPathSuffix,
+                              const char* aDescription,
+                              size_t aValue)
+  {
+    if (aValue == 0) {
+      return NS_OK;
+    }
+
+    nsAutoCString desc(aDescription);
+    nsAutoCString path(aPathPrefix);
+    path.Append(aPathSuffix);
+
+    return aHandleReport->Callback(EmptyCString(), path, aKind, UNITS_BYTES,
+                                   aValue, desc, aData);
+  }
+
+  static PLDHashOperator DoRecordCounter(const ImageCacheKey&,
+                                         imgCacheEntry* aEntry,
+                                         void* aUserArg)
+  {
+    nsRefPtr<imgRequest> req = aEntry->GetRequest();
+    RecordCounterForRequest(req,
+                           static_cast<nsTArray<ImageMemoryCounter>*>(aUserArg),
+                           !aEntry->HasNoProxies());
+    return PL_DHASH_NEXT;
+  }
+
+  static PLDHashOperator
+  DoRecordCounterUncached(nsPtrHashKey<imgRequest>* aEntry, void* aUserArg)
+  {
+    nsRefPtr<imgRequest> req = aEntry->GetKey();
+    RecordCounterForRequest(req,
+                           static_cast<nsTArray<ImageMemoryCounter>*>(aUserArg),
+                           req->HasConsumers());
+    return PL_DHASH_NEXT;
+  }
+
+  static void RecordCounterForRequest(imgRequest* aRequest,
+                                      nsTArray<ImageMemoryCounter>* aArray,
+                                      bool aIsUsed)
+  {
+    nsRefPtr<Image> image = aRequest->GetImage();
+    if (!image) {
+      return;
+    }
+
+    ImageMemoryCounter counter(image, ImagesMallocSizeOf, aIsUsed);
+
+    aArray->AppendElement(Move(counter));
+  }
+
+  static PLDHashOperator DoRecordCounterUsedDecoded(const ImageCacheKey&,
+                                                    imgCacheEntry* aEntry,
+                                                    void* aUserArg)
+  {
+    if (aEntry->HasNoProxies()) {
+      return PL_DHASH_NEXT;
+    }
+
+    nsRefPtr<imgRequest> req = aEntry->GetRequest();
+    nsRefPtr<Image> image = req->GetImage();
+    if (!image) {
+      return PL_DHASH_NEXT;
+    }
+
+    // Both this and EntryImageSizes measure images/content/raster/used/decoded
+    // memory.  This function's measurement is secondary -- the result doesn't
+    // go in the "explicit" tree -- so we use moz_malloc_size_of instead of
+    // ImagesMallocSizeOf to prevent DMD from seeing it reported twice.
+    ImageMemoryCounter counter(image, moz_malloc_size_of, /* aIsUsed = */ true);
+
+    auto n = static_cast<size_t*>(aUserArg);
+    *n += counter.Values().DecodedHeap();
+    *n += counter.Values().DecodedNonHeap();
+
+    return PL_DHASH_NEXT;
+  }
+};
+
+NS_IMPL_ISUPPORTS(imgMemoryReporter, nsIMemoryReporter)
+
+NS_IMPL_ISUPPORTS(nsProgressNotificationProxy,
+                  nsIProgressEventSink,
+                  nsIChannelEventSink,
+                  nsIInterfaceRequestor)
+
+NS_IMETHODIMP
+nsProgressNotificationProxy::OnProgress(nsIRequest* request,
+                                        nsISupports* ctxt,
+                                        int64_t progress,
+                                        int64_t progressMax)
+{
+  nsCOMPtr<nsILoadGroup> loadGroup;
+  request->GetLoadGroup(getter_AddRefs(loadGroup));
+
+  nsCOMPtr<nsIProgressEventSink> target;
+  NS_QueryNotificationCallbacks(mOriginalCallbacks,
+                                loadGroup,
+                                NS_GET_IID(nsIProgressEventSink),
+                                getter_AddRefs(target));
+  if (!target) {
+    return NS_OK;
+  }
+  return target->OnProgress(mImageRequest, ctxt, progress, progressMax);
+}
+
+NS_IMETHODIMP
+nsProgressNotificationProxy::OnStatus(nsIRequest* request,
+                                      nsISupports* ctxt,
+                                      nsresult status,
+                                      const char16_t* statusArg)
+{
+  nsCOMPtr<nsILoadGroup> loadGroup;
+  request->GetLoadGroup(getter_AddRefs(loadGroup));
+
+  nsCOMPtr<nsIProgressEventSink> target;
+  NS_QueryNotificationCallbacks(mOriginalCallbacks,
+                                loadGroup,
+                                NS_GET_IID(nsIProgressEventSink),
+                                getter_AddRefs(target));
+  if (!target) {
+    return NS_OK;
+  }
+  return target->OnStatus(mImageRequest, ctxt, status, statusArg);
+}
+
+NS_IMETHODIMP
+nsProgressNotificationProxy::
+  AsyncOnChannelRedirect(nsIChannel* oldChannel,
+                         nsIChannel* newChannel,
+                         uint32_t flags,
+                         nsIAsyncVerifyRedirectCallback* cb)
+{
+  // Tell the original original callbacks about it too
+  nsCOMPtr<nsILoadGroup> loadGroup;
+  newChannel->GetLoadGroup(getter_AddRefs(loadGroup));
+  nsCOMPtr<nsIChannelEventSink> target;
+  NS_QueryNotificationCallbacks(mOriginalCallbacks,
+                                loadGroup,
+                                NS_GET_IID(nsIChannelEventSink),
+                                getter_AddRefs(target));
+  if (!target) {
+      cb->OnRedirectVerifyCallback(NS_OK);
+      return NS_OK;
+  }
+
+  // Delegate to |target| if set, reusing |cb|
+  return target->AsyncOnChannelRedirect(oldChannel, newChannel, flags, cb);
+}
+
+NS_IMETHODIMP
+nsProgressNotificationProxy::GetInterface(const nsIID& iid,
+                                          void** result)
+{
+  if (iid.Equals(NS_GET_IID(nsIProgressEventSink))) {
+    *result = static_cast<nsIProgressEventSink*>(this);
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+  if (iid.Equals(NS_GET_IID(nsIChannelEventSink))) {
+    *result = static_cast<nsIChannelEventSink*>(this);
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+  if (mOriginalCallbacks) {
+    return mOriginalCallbacks->GetInterface(iid, result);
+  }
+  return NS_NOINTERFACE;
+}
+
+static void
+NewRequestAndEntry(bool aForcePrincipalCheckForCacheEntry, imgLoader* aLoader,
+                   const ImageCacheKey& aKey,
+                   imgRequest** aRequest, imgCacheEntry** aEntry)
+{
+  nsRefPtr<imgRequest> request = new imgRequest(aLoader, aKey);
+  nsRefPtr<imgCacheEntry> entry =
+    new imgCacheEntry(aLoader, request, aForcePrincipalCheckForCacheEntry);
+  aLoader->AddToUncachedImages(request);
+  request.forget(aRequest);
+  entry.forget(aEntry);
+}
+
+static bool
+ShouldRevalidateEntry(imgCacheEntry* aEntry,
+                      nsLoadFlags aFlags,
+                      bool aHasExpired)
+{
+  bool bValidateEntry = false;
+
+  if (aFlags & nsIRequest::LOAD_BYPASS_CACHE) {
+    return false;
+  }
+
+  if (aFlags & nsIRequest::VALIDATE_ALWAYS) {
+    bValidateEntry = true;
+  } else if (aEntry->GetMustValidate()) {
+    bValidateEntry = true;
+  } else if (aHasExpired) {
+    // The cache entry has expired...  Determine whether the stale cache
+    // entry can be used without validation...
+    if (aFlags & (nsIRequest::VALIDATE_NEVER |
+                  nsIRequest::VALIDATE_ONCE_PER_SESSION)) {
+      // VALIDATE_NEVER and VALIDATE_ONCE_PER_SESSION allow stale cache
+      // entries to be used unless they have been explicitly marked to
+      // indicate that revalidation is necessary.
+      bValidateEntry = false;
+
+    } else if (!(aFlags & nsIRequest::LOAD_FROM_CACHE)) {
+      // LOAD_FROM_CACHE allows a stale cache entry to be used... Otherwise,
+      // the entry must be revalidated.
+      bValidateEntry = true;
+    }
+  }
+
+  return bValidateEntry;
+}
+
+/* Call content policies on cached images that went through a redirect */
+static bool
+ShouldLoadCachedImage(imgRequest* aImgRequest,
+                      nsISupports* aLoadingContext,
+                      nsIPrincipal* aLoadingPrincipal)
+{
+  /* Call content policies on cached images - Bug 1082837
+   * Cached images are keyed off of the first uri in a redirect chain.
+   * Hence content policies don't get a chance to test the intermediate hops
+   * or the final desitnation.  Here we test the final destination using
+   * mCurrentURI off of the imgRequest and passing it into content policies.
+   * For Mixed Content Blocker, we do an additional check to determine if any
+   * of the intermediary hops went through an insecure redirect with the
+   * mHadInsecureRedirect flag
+   */
+  bool insecureRedirect = aImgRequest->HadInsecureRedirect();
+  nsCOMPtr<nsIURI> contentLocation;
+  aImgRequest->GetCurrentURI(getter_AddRefs(contentLocation));
+  nsresult rv;
+
+  int16_t decision = nsIContentPolicy::REJECT_REQUEST;
+  rv = NS_CheckContentLoadPolicy(nsIContentPolicy::TYPE_IMAGE,
+                                 contentLocation,
+                                 aLoadingPrincipal,
+                                 aLoadingContext,
+                                 EmptyCString(), //mime guess
+                                 nullptr, //aExtra
+                                 &decision,
+                                 nsContentUtils::GetContentPolicy(),
+                                 nsContentUtils::GetSecurityManager());
+  if (NS_FAILED(rv) || !NS_CP_ACCEPTED(decision)) {
+    return false;
+  }
+
+  // We call all Content Policies above, but we also have to call mcb
+  // individually to check the intermediary redirect hops are secure.
+  if (insecureRedirect) {
+    if (!nsContentUtils::IsSystemPrincipal(aLoadingPrincipal)) {
+      // Set the requestingLocation from the aLoadingPrincipal.
+      nsCOMPtr<nsIURI> requestingLocation;
+      if (aLoadingPrincipal) {
+        rv = aLoadingPrincipal->GetURI(getter_AddRefs(requestingLocation));
+        NS_ENSURE_SUCCESS(rv, false);
+      }
+
+      // reset the decision for mixed content blocker check
+      decision = nsIContentPolicy::REJECT_REQUEST;
+      rv = nsMixedContentBlocker::ShouldLoad(insecureRedirect,
+                                             nsIContentPolicy::TYPE_IMAGE,
+                                             contentLocation,
+                                             requestingLocation,
+                                             aLoadingContext,
+                                             EmptyCString(), //mime guess
+                                             nullptr,
+                                             aLoadingPrincipal,
+                                             &decision);
+      if (NS_FAILED(rv) || !NS_CP_ACCEPTED(decision)) {
+        return false;
+      }
+    }
+  }
+
+  return true;
+}
+
+// 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.  Also checks the Referrer Policy, since requests with different
+// referrers/policies may generate different responses.
+static bool
+ValidateSecurityInfo(imgRequest* request, bool forcePrincipalCheck,
+                     int32_t corsmode, nsIPrincipal* loadingPrincipal,
+                     nsISupports* aCX, 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) {
+    return false;
+  } else if (request->GetCORSMode() != imgIRequest::CORS_NONE ||
+             forcePrincipalCheck) {
+    nsCOMPtr<nsIPrincipal> otherprincipal = request->GetLoadingPrincipal();
+
+    // If we previously had a principal, but we don't now, we can't use this
+    // request.
+    if (otherprincipal && !loadingPrincipal) {
+      return false;
+    }
+
+    if (otherprincipal && loadingPrincipal) {
+      bool equals = false;
+      otherprincipal->Equals(loadingPrincipal, &equals);
+      if (!equals) {
+        return false;
+      }
+    }
+  }
+
+  // Content Policy Check on Cached Images
+  return ShouldLoadCachedImage(request, aCX, loadingPrincipal);
+}
+
+static nsresult
+NewImageChannel(nsIChannel** aResult,
+                // If aForcePrincipalCheckForCacheEntry is true, then we will
+                // force a principal check even when not using CORS before
+                // assuming we have a cache hit on a cache entry that we
+                // create for this channel.  This is an out param that should
+                // be set to true if this channel ends up depending on
+                // aLoadingPrincipal and false otherwise.
+                bool* aForcePrincipalCheckForCacheEntry,
+                nsIURI* aURI,
+                nsIURI* aInitialDocumentURI,
+                nsIURI* aReferringURI,
+                ReferrerPolicy aReferrerPolicy,
+                nsILoadGroup* aLoadGroup,
+                const nsCString& aAcceptHeader,
+                nsLoadFlags aLoadFlags,
+                nsContentPolicyType aPolicyType,
+                nsIPrincipal* aLoadingPrincipal,
+                nsISupports* aRequestingContext)
+{
+  MOZ_ASSERT(aResult);
+
+  nsresult rv;
+  nsCOMPtr<nsIHttpChannel> newHttpChannel;
+
+  nsCOMPtr<nsIInterfaceRequestor> callbacks;
+
+  if (aLoadGroup) {
+    // Get the notification callbacks from the load group for the new channel.
+    //
+    // XXX: This is not exactly correct, because the network request could be
+    //      referenced by multiple windows...  However, the new channel needs
+    //      something.  So, using the 'first' notification callbacks is better
+    //      than nothing...
+    //
+    aLoadGroup->GetNotificationCallbacks(getter_AddRefs(callbacks));
+  }
+
+  // Pass in a nullptr loadgroup because this is the underlying network
+  // request. This request may be referenced by several proxy image requests
+  // (possibly in different documents).
+  // If all of the proxy requests are canceled then this request should be
+  // canceled too.
+  //
+  aLoadFlags |= nsIChannel::LOAD_CLASSIFY_URI;
+
+  nsCOMPtr<nsIPrincipal> triggeringPrincipal = aLoadingPrincipal;
+  bool isSandBoxed = false;
+  // only inherit if we have a principal
+  bool inherit = false;
+  if (triggeringPrincipal) {
+    inherit = nsContentUtils::
+      ChannelShouldInheritPrincipal(triggeringPrincipal,
+                                    aURI,
+                                    false,  // aInheritForAboutBlank
+                                    false); // aForceInherit
+  } else {
+    triggeringPrincipal = nsContentUtils::GetSystemPrincipal();
+  }
+  nsCOMPtr<nsINode> requestingNode = do_QueryInterface(aRequestingContext);
+  nsSecurityFlags securityFlags = nsILoadInfo::SEC_NORMAL;
+  if (inherit) {
+    securityFlags |= nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL;
+  }
+
+  // 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,
+                                              aPolicyType,
+                                              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,
+                       aPolicyType,
+                       nullptr,   // loadGroup
+                       callbacks,
+                       aLoadFlags);
+  }
+
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  *aForcePrincipalCheckForCacheEntry = inherit && !isSandBoxed;
+
+  // Initialize HTTP-specific attributes
+  newHttpChannel = do_QueryInterface(*aResult);
+  if (newHttpChannel) {
+    newHttpChannel->SetRequestHeader(NS_LITERAL_CSTRING("Accept"),
+                                     aAcceptHeader,
+                                     false);
+
+    nsCOMPtr<nsIHttpChannelInternal> httpChannelInternal =
+      do_QueryInterface(newHttpChannel);
+    NS_ENSURE_TRUE(httpChannelInternal, NS_ERROR_UNEXPECTED);
+    httpChannelInternal->SetDocumentURI(aInitialDocumentURI);
+    newHttpChannel->SetReferrerWithPolicy(aReferringURI, aReferrerPolicy);
+  }
+
+  // Image channels are loaded by default with reduced priority.
+  nsCOMPtr<nsISupportsPriority> p = do_QueryInterface(*aResult);
+  if (p) {
+    uint32_t priority = nsISupportsPriority::PRIORITY_LOW;
+
+    if (aLoadFlags & nsIRequest::LOAD_BACKGROUND) {
+      ++priority; // further reduce priority for background loads
+    }
+
+    p->AdjustPriority(priority);
+  }
+
+  // Create a new loadgroup for this new channel, using the old group as
+  // the parent. The indirection keeps the channel insulated from cancels,
+  // but does allow a way for this revalidation to be associated with at
+  // least one base load group for scheduling/caching purposes.
+
+  nsCOMPtr<nsILoadGroup> loadGroup = do_CreateInstance(NS_LOADGROUP_CONTRACTID);
+  nsCOMPtr<nsILoadGroupChild> childLoadGroup = do_QueryInterface(loadGroup);
+  if (childLoadGroup) {
+    childLoadGroup->SetParentLoadGroup(aLoadGroup);
+  }
+  (*aResult)->SetLoadGroup(loadGroup);
+
+  return NS_OK;
+}
+
+static uint32_t
+SecondsFromPRTime(PRTime prTime)
+{
+  return uint32_t(int64_t(prTime) / int64_t(PR_USEC_PER_SEC));
+}
+
+imgCacheEntry::imgCacheEntry(imgLoader* loader, imgRequest* request,
+                             bool forcePrincipalCheck)
+ : mLoader(loader),
+   mRequest(request),
+   mDataSize(0),
+   mTouchedTime(SecondsFromPRTime(PR_Now())),
+   mExpiryTime(0),
+   mMustValidate(false),
+   // We start off as evicted so we don't try to update the cache. PutIntoCache
+   // will set this to false.
+   mEvicted(true),
+   mHasNoProxies(true),
+   mForcePrincipalCheck(forcePrincipalCheck)
+{ }
+
+imgCacheEntry::~imgCacheEntry()
+{
+  LOG_FUNC(GetImgLog(), "imgCacheEntry::~imgCacheEntry()");
+}
+
+void
+imgCacheEntry::Touch(bool updateTime /* = true */)
+{
+  LOG_SCOPE(GetImgLog(), "imgCacheEntry::Touch");
+
+  if (updateTime) {
+    mTouchedTime = SecondsFromPRTime(PR_Now());
+  }
+
+  UpdateCache();
+}
+
+void
+imgCacheEntry::UpdateCache(int32_t diff /* = 0 */)
+{
+  // Don't update the cache if we've been removed from it or it doesn't care
+  // about our size or usage.
+  if (!Evicted() && HasNoProxies()) {
+    mLoader->CacheEntriesChanged(mRequest->IsChrome(), diff);
+  }
+}
+
+void
+imgCacheEntry::SetHasNoProxies(bool hasNoProxies)
+{
+  if (PR_LOG_TEST(GetImgLog(), PR_LOG_DEBUG)) {
+    if (hasNoProxies) {
+      LOG_FUNC_WITH_PARAM(GetImgLog(), "imgCacheEntry::SetHasNoProxies true",
+                          "uri", mRequest->CacheKey().Spec());
+    } else {
+      LOG_FUNC_WITH_PARAM(GetImgLog(), "imgCacheEntry::SetHasNoProxies false",
+                          "uri", mRequest->CacheKey().Spec());
+    }
+  }
+
+  mHasNoProxies = hasNoProxies;
+}
+
+imgCacheQueue::imgCacheQueue()
+ : mDirty(false),
+   mSize(0)
+{ }
+
+void
+imgCacheQueue::UpdateSize(int32_t diff)
+{
+  mSize += diff;
+}
+
+uint32_t
+imgCacheQueue::GetSize() const
+{
+  return mSize;
+}
+
+#include <algorithm>
+using namespace std;
+
+void
+imgCacheQueue::Remove(imgCacheEntry* entry)
+{
+  queueContainer::iterator it = find(mQueue.begin(), mQueue.end(), entry);
+  if (it != mQueue.end()) {
+    mSize -= (*it)->GetDataSize();
+    mQueue.erase(it);
+    MarkDirty();
+  }
+}
+
+void
+imgCacheQueue::Push(imgCacheEntry* entry)
+{
+  mSize += entry->GetDataSize();
+
+  nsRefPtr<imgCacheEntry> refptr(entry);
+  mQueue.push_back(refptr);
+  MarkDirty();
+}
+
+already_AddRefed<imgCacheEntry>
+imgCacheQueue::Pop()
+{
+  if (mQueue.empty()) {
+    return nullptr;
+  }
+  if (IsDirty()) {
+    Refresh();
+  }
+
+  nsRefPtr<imgCacheEntry> entry = mQueue[0];
+  std::pop_heap(mQueue.begin(), mQueue.end(), imgLoader::CompareCacheEntries);
+  mQueue.pop_back();
+
+  mSize -= entry->GetDataSize();
+  return entry.forget();
+}
+
+void
+imgCacheQueue::Refresh()
+{
+  std::make_heap(mQueue.begin(), mQueue.end(), imgLoader::CompareCacheEntries);
+  mDirty = false;
+}
+
+void
+imgCacheQueue::MarkDirty()
+{
+  mDirty = true;
+}
+
+bool
+imgCacheQueue::IsDirty()
+{
+  return mDirty;
+}
+
+uint32_t
+imgCacheQueue::GetNumElements() const
+{
+  return mQueue.size();
+}
+
+imgCacheQueue::iterator
+imgCacheQueue::begin()
+{
+  return mQueue.begin();
+}
+
+imgCacheQueue::const_iterator
+imgCacheQueue::begin() const
+{
+  return mQueue.begin();
+}
+
+imgCacheQueue::iterator
+imgCacheQueue::end()
+{
+  return mQueue.end();
+}
+
+imgCacheQueue::const_iterator
+imgCacheQueue::end() const
+{
+  return mQueue.end();
+}
+
+nsresult
+imgLoader::CreateNewProxyForRequest(imgRequest* aRequest,
+                                    nsILoadGroup* aLoadGroup,
+                                    imgINotificationObserver* aObserver,
+                                    nsLoadFlags aLoadFlags,
+                                    imgRequestProxy** _retval)
+{
+  LOG_SCOPE_WITH_PARAM(GetImgLog(), "imgLoader::CreateNewProxyForRequest",
+                       "imgRequest", aRequest);
+
+  /* XXX If we move decoding onto separate threads, we should save off the
+     calling thread here and pass it off to |proxyRequest| so that it call
+     proxy calls to |aObserver|.
+   */
+
+  nsRefPtr<imgRequestProxy> proxyRequest = new imgRequestProxy();
+
+  /* It is important to call |SetLoadFlags()| before calling |Init()| because
+     |Init()| adds the request to the loadgroup.
+   */
+  proxyRequest->SetLoadFlags(aLoadFlags);
+
+  nsRefPtr<ImageURL> uri;
+  aRequest->GetURI(getter_AddRefs(uri));
+
+  // init adds itself to imgRequest's list of observers
+  nsresult rv = proxyRequest->Init(aRequest, aLoadGroup, uri, aObserver);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  proxyRequest.forget(_retval);
+  return NS_OK;
+}
+
+class imgCacheExpirationTracker final
+  : public nsExpirationTracker<imgCacheEntry, 3>
+{
+  enum { TIMEOUT_SECONDS = 10 };
+public:
+  imgCacheExpirationTracker();
+
+protected:
+  void NotifyExpired(imgCacheEntry* entry);
+};
+
+imgCacheExpirationTracker::imgCacheExpirationTracker()
+ : nsExpirationTracker<imgCacheEntry, 3>(TIMEOUT_SECONDS * 1000)
+{ }
+
+void
+imgCacheExpirationTracker::NotifyExpired(imgCacheEntry* entry)
+{
+  // Hold on to a reference to this entry, because the expiration tracker
+  // mechanism doesn't.
+  nsRefPtr<imgCacheEntry> kungFuDeathGrip(entry);
+
+  if (PR_LOG_TEST(GetImgLog(), PR_LOG_DEBUG)) {
+    nsRefPtr<imgRequest> req = entry->GetRequest();
+    if (req) {
+      LOG_FUNC_WITH_PARAM(GetImgLog(),
+                         "imgCacheExpirationTracker::NotifyExpired",
+                         "entry", req->CacheKey().Spec());
+    }
+  }
+
+  // We can be called multiple times on the same entry. Don't do work multiple
+  // times.
+  if (!entry->Evicted()) {
+    entry->Loader()->RemoveFromCache(entry);
+  }
+
+  entry->Loader()->VerifyCacheSizes();
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+// imgLoader
+///////////////////////////////////////////////////////////////////////////////
+
+double imgLoader::sCacheTimeWeight;
+uint32_t imgLoader::sCacheMaxSize;
+imgMemoryReporter* imgLoader::sMemReporter;
+
+NS_IMPL_ISUPPORTS(imgLoader, imgILoader, nsIContentSniffer, imgICache,
+                  nsISupportsWeakReference, nsIObserver)
+
+static imgLoader* gSingleton = nullptr;
+static imgLoader* gPBSingleton = nullptr;
+
+imgLoader*
+imgLoader::Singleton()
+{
+  if (!gSingleton) {
+    gSingleton = imgLoader::Create();
+  }
+  return gSingleton;
+}
+
+imgLoader*
+imgLoader::PBSingleton()
+{
+  if (!gPBSingleton) {
+    gPBSingleton = imgLoader::Create();
+    gPBSingleton->RespectPrivacyNotifications();
+  }
+  return gPBSingleton;
+}
+
+imgLoader::imgLoader()
+: mUncachedImagesMutex("imgLoader::UncachedImages"), mRespectPrivacy(false)
+{
+  sMemReporter->AddRef();
+  sMemReporter->RegisterLoader(this);
+}
+
+already_AddRefed<imgLoader>
+imgLoader::GetInstance()
+{
+  static nsRefPtr<imgLoader> singleton;
+  if (!singleton) {
+    singleton = imgLoader::Create();
+    if (!singleton) {
+        return nullptr;
+    }
+    ClearOnShutdown(&singleton);
+  }
+  nsRefPtr<imgLoader> loader = singleton.get();
+  return loader.forget();
+}
+
+static PLDHashOperator
+ClearLoaderPointer(nsPtrHashKey<imgRequest>* aEntry, void* aUserArg)
+{
+  nsRefPtr<imgRequest> req = aEntry->GetKey();
+  req->ClearLoader();
+
+  return PL_DHASH_NEXT;
+}
+
+imgLoader::~imgLoader()
+{
+  ClearChromeImageCache();
+  ClearImageCache();
+  {
+    // If there are any of our imgRequest's left they are in the uncached
+    // images set, so clear their pointer to us.
+    MutexAutoLock lock(mUncachedImagesMutex);
+    mUncachedImages.EnumerateEntries(ClearLoaderPointer, nullptr);
+  }
+  sMemReporter->UnregisterLoader(this);
+  sMemReporter->Release();
+}
+
+void
+imgLoader::VerifyCacheSizes()
+{
+#ifdef DEBUG
+  if (!mCacheTracker) {
+    return;
+  }
+
+  uint32_t cachesize = mCache.Count() + mChromeCache.Count();
+  uint32_t queuesize =
+    mCacheQueue.GetNumElements() + mChromeCacheQueue.GetNumElements();
+  uint32_t trackersize = 0;
+  for (nsExpirationTracker<imgCacheEntry, 3>::Iterator it(mCacheTracker);
+       it.Next(); ){
+    trackersize++;
+  }
+  MOZ_ASSERT(queuesize == trackersize, "Queue and tracker sizes out of sync!");
+  MOZ_ASSERT(queuesize <= cachesize, "Queue has more elements than cache!");
+#endif
+}
+
+imgLoader::imgCacheTable&
+imgLoader::GetCache(bool aForChrome)
+{
+  return aForChrome ? mChromeCache : mCache;
+}
+
+imgLoader::imgCacheTable&
+imgLoader::GetCache(const ImageCacheKey& aKey)
+{
+  return GetCache(aKey.IsChrome());
+}
+
+imgCacheQueue&
+imgLoader::GetCacheQueue(bool aForChrome)
+{
+  return aForChrome ? mChromeCacheQueue : mCacheQueue;
+
+}
+
+imgCacheQueue&
+imgLoader::GetCacheQueue(const ImageCacheKey& aKey)
+{
+  return GetCacheQueue(aKey.IsChrome());
+
+}
+
+void imgLoader::GlobalInit()
+{
+  sCacheTimeWeight = gfxPrefs::ImageCacheTimeWeight() / 1000.0;
+  int32_t cachesize = gfxPrefs::ImageCacheSize();
+  sCacheMaxSize = cachesize > 0 ? cachesize : 0;
+
+  sMemReporter = new imgMemoryReporter();
+  RegisterStrongMemoryReporter(sMemReporter);
+  RegisterImagesContentUsedUncompressedDistinguishedAmount(
+    imgMemoryReporter::ImagesContentUsedUncompressedDistinguishedAmount);
+}
+
+nsresult
+imgLoader::InitCache()
+{
+  nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
+  if (!os) {
+    return NS_ERROR_FAILURE;
+  }
+
+  os->AddObserver(this, "memory-pressure", false);
+  os->AddObserver(this, "app-theme-changed", false);
+  os->AddObserver(this, "chrome-flush-skin-caches", false);
+  os->AddObserver(this, "chrome-flush-caches", false);
+  os->AddObserver(this, "last-pb-context-exited", false);
+  os->AddObserver(this, "profile-before-change", false);
+  os->AddObserver(this, "xpcom-shutdown", false);
+
+  mCacheTracker = new imgCacheExpirationTracker();
+
+  return NS_OK;
+}
+
+nsresult
+imgLoader::Init()
+{
+  InitCache();
+
+  ReadAcceptHeaderPref();
+
+  Preferences::AddWeakObserver(this, "image.http.accept");
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+imgLoader::RespectPrivacyNotifications()
+{
+  mRespectPrivacy = true;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+imgLoader::Observe(nsISupports* aSubject, const char* aTopic,
+                   const char16_t* aData)
+{
+  // We listen for pref change notifications...
+  if (!strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID)) {
+    if (!NS_strcmp(aData, MOZ_UTF16("image.http.accept"))) {
+      ReadAcceptHeaderPref();
+    }
+
+  } else if (strcmp(aTopic, "memory-pressure") == 0) {
+    MinimizeCaches();
+  } else if (strcmp(aTopic, "app-theme-changed") == 0) {
+    ClearImageCache();
+    MinimizeCaches();
+  } else if (strcmp(aTopic, "chrome-flush-skin-caches") == 0 ||
+             strcmp(aTopic, "chrome-flush-caches") == 0) {
+    MinimizeCaches();
+    ClearChromeImageCache();
+  } else if (strcmp(aTopic, "last-pb-context-exited") == 0) {
+    if (mRespectPrivacy) {
+      ClearImageCache();
+      ClearChromeImageCache();
+    }
+  } else if (strcmp(aTopic, "profile-before-change") == 0 ||
+             strcmp(aTopic, "xpcom-shutdown") == 0) {
+    mCacheTracker = nullptr;
+
+  } else {
+  // (Nothing else should bring us here)
+    MOZ_ASSERT(0, "Invalid topic received");
+  }
+
+  return NS_OK;
+}
+
+void imgLoader::ReadAcceptHeaderPref()
+{
+  nsAdoptingCString accept = Preferences::GetCString("image.http.accept");
+  if (accept) {
+    mAcceptHeader = accept;
+  } else {
+    mAcceptHeader =
+        IMAGE_PNG "," IMAGE_WILDCARD ";q=0.8," ANY_WILDCARD ";q=0.5";
+  }
+}
+
+/* void clearCache (in boolean chrome); */
+NS_IMETHODIMP
+imgLoader::ClearCache(bool chrome)
+{
+  if (chrome) {
+    return ClearChromeImageCache();
+  } else {
+    return ClearImageCache();
+  }
+}
+
+/* void removeEntry(in nsIURI uri); */
+NS_IMETHODIMP
+imgLoader::RemoveEntry(nsIURI* aURI)
+{
+  if (aURI && RemoveFromCache(ImageCacheKey(aURI))) {
+    return NS_OK;
+  }
+
+  return NS_ERROR_NOT_AVAILABLE;
+}
+
+/* imgIRequest findEntry(in nsIURI uri); */
+NS_IMETHODIMP
+imgLoader::FindEntryProperties(nsIURI* uri, nsIProperties** _retval)
+{
+  *_retval = nullptr;
+
+  ImageCacheKey key(uri);
+  imgCacheTable& cache = GetCache(key);
+
+  nsRefPtr<imgCacheEntry> entry;
+  if (cache.Get(key, getter_AddRefs(entry)) && entry) {
+    if (mCacheTracker && entry->HasNoProxies()) {
+      mCacheTracker->MarkUsed(entry);
+    }
+
+    nsRefPtr<imgRequest> request = entry->GetRequest();
+    if (request) {
+      nsCOMPtr<nsIProperties> properties = request->Properties();
+      properties.forget(_retval);
+    }
+  }
+
+  return NS_OK;
+}
+
+void
+imgLoader::Shutdown()
+{
+  NS_IF_RELEASE(gSingleton);
+  NS_IF_RELEASE(gPBSingleton);
+}
+
+nsresult
+imgLoader::ClearChromeImageCache()
+{
+  return EvictEntries(mChromeCache);
+}
+
+nsresult
+imgLoader::ClearImageCache()
+{
+  return EvictEntries(mCache);
+}
+
+void
+imgLoader::MinimizeCaches()
+{
+  EvictEntries(mCacheQueue);
+  EvictEntries(mChromeCacheQueue);
+}
+
+bool
+imgLoader::PutIntoCache(const ImageCacheKey& aKey, imgCacheEntry* entry)
+{
+  imgCacheTable& cache = GetCache(aKey);
+
+  LOG_STATIC_FUNC_WITH_PARAM(GetImgLog(),
+                             "imgLoader::PutIntoCache", "uri", aKey.Spec());
+
+  // Check to see if this request already exists in the cache. If so, we'll
+  // replace the old version.
+  nsRefPtr<imgCacheEntry> tmpCacheEntry;
+  if (cache.Get(aKey, getter_AddRefs(tmpCacheEntry)) && tmpCacheEntry) {
+    MOZ_LOG(GetImgLog(), PR_LOG_DEBUG,
+           ("[this=%p] imgLoader::PutIntoCache -- Element already in the cache",
+            nullptr));
+    nsRefPtr<imgRequest> tmpRequest = tmpCacheEntry->GetRequest();
+
+    // If it already exists, and we're putting the same key into the cache, we
+    // should remove the old version.
+    MOZ_LOG(GetImgLog(), PR_LOG_DEBUG,
+           ("[this=%p] imgLoader::PutIntoCache -- Replacing cached element",
+            nullptr));
+
+    RemoveFromCache(aKey);
+  } else {
+    MOZ_LOG(GetImgLog(), PR_LOG_DEBUG,
+           ("[this=%p] imgLoader::PutIntoCache --"
+            " Element NOT already in the cache", nullptr));
+  }
+
+  cache.Put(aKey, entry);
+
+  // We can be called to resurrect an evicted entry.
+  if (entry->Evicted()) {
+    entry->SetEvicted(false);
+  }
+
+  // If we're resurrecting an entry with no proxies, put it back in the
+  // tracker and queue.
+  if (entry->HasNoProxies()) {
+    nsresult addrv = NS_OK;
+
+    if (mCacheTracker) {
+      addrv = mCacheTracker->AddObject(entry);
+    }
+
+    if (NS_SUCCEEDED(addrv)) {
+      imgCacheQueue& queue = GetCacheQueue(aKey);
+      queue.Push(entry);
+    }
+  }
+
+  nsRefPtr<imgRequest> request = entry->GetRequest();
+  request->SetIsInCache(true);
+  RemoveFromUncachedImages(request);
+
+  return true;
+}
+
+bool
+imgLoader::SetHasNoProxies(imgRequest* aRequest, imgCacheEntry* aEntry)
+{
+  LOG_STATIC_FUNC_WITH_PARAM(GetImgLog(),
+                             "imgLoader::SetHasNoProxies", "uri",
+                             aRequest->CacheKey().Spec());
+
+  aEntry->SetHasNoProxies(true);
+
+  if (aEntry->Evicted()) {
+    return false;
+  }
+
+  imgCacheQueue& queue = GetCacheQueue(aRequest->IsChrome());
+
+  nsresult addrv = NS_OK;
+
+  if (mCacheTracker) {
+    addrv = mCacheTracker->AddObject(aEntry);
+  }
+
+  if (NS_SUCCEEDED(addrv)) {
+    queue.Push(aEntry);
+  }
+
+  imgCacheTable& cache = GetCache(aRequest->IsChrome());
+  CheckCacheLimits(cache, queue);
+
+  return true;
+}
+
+bool
+imgLoader::SetHasProxies(imgRequest* aRequest)
+{
+  VerifyCacheSizes();
+
+  const ImageCacheKey& key = aRequest->CacheKey();
+  imgCacheTable& cache = GetCache(key);
+
+  LOG_STATIC_FUNC_WITH_PARAM(GetImgLog(),
+                             "imgLoader::SetHasProxies", "uri", key.Spec());
+
+  nsRefPtr<imgCacheEntry> entry;
+  if (cache.Get(key, getter_AddRefs(entry)) && entry) {
+    // Make sure the cache entry is for the right request
+    nsRefPtr<imgRequest> entryRequest = entry->GetRequest();
+    if (entryRequest == aRequest && entry->HasNoProxies()) {
+      imgCacheQueue& queue = GetCacheQueue(key);
+      queue.Remove(entry);
+
+      if (mCacheTracker) {
+        mCacheTracker->RemoveObject(entry);
+      }
+
+      entry->SetHasNoProxies(false);
+
+      return true;
+    }
+  }
+
+  return false;
+}
+
+void
+imgLoader::CacheEntriesChanged(bool aForChrome, int32_t aSizeDiff /* = 0 */)
+{
+  imgCacheQueue& queue = GetCacheQueue(aForChrome);
+  queue.MarkDirty();
+  queue.UpdateSize(aSizeDiff);
+}
+
+void
+imgLoader::CheckCacheLimits(imgCacheTable& cache, imgCacheQueue& queue)
+{
+  if (queue.GetNumElements() == 0) {
+    NS_ASSERTION(queue.GetSize() == 0,
+                 "imgLoader::CheckCacheLimits -- incorrect cache size");
+  }
+
+  // Remove entries from the cache until we're back at our desired max size.
+  while (queue.GetSize() > sCacheMaxSize) {
+    // Remove the first entry in the queue.
+    nsRefPtr<imgCacheEntry> entry(queue.Pop());
+
+    NS_ASSERTION(entry, "imgLoader::CheckCacheLimits -- NULL entry pointer");
+
+    if (PR_LOG_TEST(GetImgLog(), PR_LOG_DEBUG)) {
+      nsRefPtr<imgRequest> req = entry->GetRequest();
+      if (req) {
+        LOG_STATIC_FUNC_WITH_PARAM(GetImgLog(),
+                                   "imgLoader::CheckCacheLimits",
+                                   "entry", req->CacheKey().Spec());
+      }
+    }
+
+    if (entry) {
+      RemoveFromCache(entry);
+    }
+  }
+}
+
+bool
+imgLoader::ValidateRequestWithNewChannel(imgRequest* request,
+                                         nsIURI* aURI,
+                                         nsIURI* aInitialDocumentURI,
+                                         nsIURI* aReferrerURI,
+                                         ReferrerPolicy aReferrerPolicy,
+                                         nsILoadGroup* aLoadGroup,
+                                         imgINotificationObserver* aObserver,
+                                         nsISupports* aCX,
+                                         nsLoadFlags aLoadFlags,
+                                         nsContentPolicyType aLoadPolicyType,
+                                         imgRequestProxy** aProxyRequest,
+                                         nsIPrincipal* aLoadingPrincipal,
+                                         int32_t aCORSMode)
+{
+  // now we need to insert a new channel request object inbetween the real
+  // request and the proxy that basically delays loading the image until it
+  // gets a 304 or figures out that this needs to be a new request
+
+  nsresult rv;
+
+  // If we're currently in the middle of validating this request, just hand
+  // back a proxy to it; the required work will be done for us.
+  if (request->GetValidator()) {
+    rv = CreateNewProxyForRequest(request, aLoadGroup, aObserver,
+                                  aLoadFlags, aProxyRequest);
+    if (NS_FAILED(rv)) {
+      return false;
+    }
+
+    if (*aProxyRequest) {
+      imgRequestProxy* proxy = static_cast<imgRequestProxy*>(*aProxyRequest);
+
+      // We will send notifications from imgCacheValidator::OnStartRequest().
+      // In the mean time, we must defer notifications because we are added to
+      // the imgRequest's proxy list, and we can get extra notifications
+      // resulting from methods such as RequestDecode(). See bug 579122.
+      proxy->SetNotificationsDeferred(true);
+
+      // Attach the proxy without notifying
+      request->GetValidator()->AddProxy(proxy);
+    }
+
+    return NS_SUCCEEDED(rv);
+
+  } else {
+    // We will rely on Necko to cache this request when it's possible, and to
+    // tell imgCacheValidator::OnStartRequest whether the request came from its
+    // cache.
+    nsCOMPtr<nsIChannel> newChannel;
+    bool forcePrincipalCheck;
+    rv = NewImageChannel(getter_AddRefs(newChannel),
+                         &forcePrincipalCheck,
+                         aURI,
+                         aInitialDocumentURI,
+                         aReferrerURI,
+                         aReferrerPolicy,
+                         aLoadGroup,
+                         mAcceptHeader,
+                         aLoadFlags,
+                         aLoadPolicyType,
+                         aLoadingPrincipal,
+                         aCX);
+    if (NS_FAILED(rv)) {
+      return false;
+    }
+
+    nsRefPtr<imgRequestProxy> req;
+    rv = CreateNewProxyForRequest(request, aLoadGroup, aObserver,
+                                  aLoadFlags, getter_AddRefs(req));
+    if (NS_FAILED(rv)) {
+      return false;
+    }
+
+    // Make sure that OnStatus/OnProgress calls have the right request set...
+    nsRefPtr<nsProgressNotificationProxy> progressproxy =
+        new nsProgressNotificationProxy(newChannel, req);
+    if (!progressproxy) {
+      return false;
+    }
+
+    nsRefPtr<imgCacheValidator> hvc =
+      new imgCacheValidator(progressproxy, this, request, aCX,
+                            forcePrincipalCheck);
+
+    // Casting needed here to get past multiple inheritance.
+    nsCOMPtr<nsIStreamListener> listener =
+      do_QueryInterface(static_cast<nsIThreadRetargetableStreamListener*>(hvc));
+    NS_ENSURE_TRUE(listener, false);
+
+    // We must set the notification callbacks before setting up the
+    // CORS listener, because that's also interested inthe
+    // notification callbacks.
+    newChannel->SetNotificationCallbacks(hvc);
+
+    if (aCORSMode != imgIRequest::CORS_NONE) {
+      bool withCredentials = aCORSMode == imgIRequest::CORS_USE_CREDENTIALS;
+      nsRefPtr<nsCORSListenerProxy> corsproxy =
+        new nsCORSListenerProxy(listener, aLoadingPrincipal, withCredentials);
+      rv = corsproxy->Init(newChannel, DataURIHandling::Allow);
+      if (NS_FAILED(rv)) {
+        return false;
+      }
+
+      listener = corsproxy;
+    }
+
+    request->SetValidator(hvc);
+
+    // We will send notifications from imgCacheValidator::OnStartRequest().
+    // In the mean time, we must defer notifications because we are added to
+    // the imgRequest's proxy list, and we can get extra notifications
+    // resulting from methods such as RequestDecode(). See bug 579122.
+    req->SetNotificationsDeferred(true);
+
+    // Add the proxy without notifying
+    hvc->AddProxy(req);
+
+    mozilla::net::PredictorLearn(aURI, aInitialDocumentURI,
+        nsINetworkPredictor::LEARN_LOAD_SUBRESOURCE, aLoadGroup);
+
+    rv = newChannel->AsyncOpen(listener, nullptr);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return false;
+    }
+
+    req.forget(aProxyRequest);
+    return true;
+  }
+}
+
+bool
+imgLoader::ValidateEntry(imgCacheEntry* aEntry,
+                         nsIURI* aURI,
+                         nsIURI* aInitialDocumentURI,
+                         nsIURI* aReferrerURI,
+                         ReferrerPolicy aReferrerPolicy,
+                         nsILoadGroup* aLoadGroup,
+                         imgINotificationObserver* aObserver,
+                         nsISupports* aCX,
+                         nsLoadFlags aLoadFlags,
+                         nsContentPolicyType aLoadPolicyType,
+                         bool aCanMakeNewChannel,
+                         imgRequestProxy** aProxyRequest,
+                         nsIPrincipal* aLoadingPrincipal,
+                         int32_t aCORSMode)
+{
+  LOG_SCOPE(GetImgLog(), "imgLoader::ValidateEntry");
+
+  bool hasExpired;
+  uint32_t expirationTime = aEntry->GetExpiryTime();
+  if (expirationTime <= SecondsFromPRTime(PR_Now())) {
+    hasExpired = true;
+  } else {
+    hasExpired = false;
+  }
+
+  nsresult rv;
+
+  // Special treatment for file URLs - aEntry has expired if file has changed
+  nsCOMPtr<nsIFileURL> fileUrl(do_QueryInterface(aURI));
+  if (fileUrl) {
+    uint32_t lastModTime = aEntry->GetTouchedTime();
+
+    nsCOMPtr<nsIFile> theFile;
+    rv = fileUrl->GetFile(getter_AddRefs(theFile));
+    if (NS_SUCCEEDED(rv)) {
+      PRTime fileLastMod;
+      rv = theFile->GetLastModifiedTime(&fileLastMod);
+      if (NS_SUCCEEDED(rv)) {
+        // nsIFile uses millisec, NSPR usec
+        fileLastMod *= 1000;
+        hasExpired = SecondsFromPRTime((PRTime)fileLastMod) > lastModTime;
+      }
+    }
+  }
+
+  nsRefPtr<imgRequest> request(aEntry->GetRequest());
+
+  if (!request) {
+    return false;
+  }
+
+  if (!ValidateSecurityInfo(request, aEntry->ForcePrincipalCheck(),
+                            aCORSMode, aLoadingPrincipal,
+                            aCX, aReferrerPolicy))
+    return false;
+
+  // data URIs are immutable and by their nature can't leak data, so we can
+  // just return true in that case.  Doing so would mean that shift-reload
+  // doesn't reload data URI documents/images though (which is handy for
+  // debugging during gecko development) so we make an exception in that case.
+  nsAutoCString scheme;
+  aURI->GetScheme(scheme);
+  if (scheme.EqualsLiteral("data") &&
+      !(aLoadFlags & nsIRequest::LOAD_BYPASS_CACHE)) {
+    return true;
+  }
+
+  bool validateRequest = false;
+
+  // If the request's loadId is the same as the aCX, then it is ok to use
+  // this one because it has already been validated for this context.
+  //
+  // XXX: nullptr seems to be a 'special' key value that indicates that NO
+  //      validation is required.
+  //
+  void *key = (void*) aCX;
+  if (request->LoadId() != key) {
+    // If we would need to revalidate this entry, but we're being told to
+    // bypass the cache, we don't allow this entry to be used.
+    if (aLoadFlags & nsIRequest::LOAD_BYPASS_CACHE) {
+      return false;
+    }
+
+    // Determine whether the cache aEntry must be revalidated...
+    validateRequest = ShouldRevalidateEntry(aEntry, aLoadFlags, hasExpired);
+
+    MOZ_LOG(GetImgLog(), PR_LOG_DEBUG,
+           ("imgLoader::ValidateEntry validating cache entry. "
+            "validateRequest = %d", validateRequest));
+  } else if (!key && PR_LOG_TEST(GetImgLog(), PR_LOG_DEBUG)) {
+    nsAutoCString spec;
+    aURI->GetSpec(spec);
+
+    MOZ_LOG(GetImgLog(), PR_LOG_DEBUG,
+           ("imgLoader::ValidateEntry BYPASSING cache validation for %s "
+            "because of NULL LoadID", spec.get()));
+  }
+
+  // We can't use a cached request if it comes from a different
+  // application cache than this load is expecting.
+  nsCOMPtr<nsIApplicationCacheContainer> appCacheContainer;
+  nsCOMPtr<nsIApplicationCache> requestAppCache;
+  nsCOMPtr<nsIApplicationCache> groupAppCache;
+  if ((appCacheContainer = do_GetInterface(request->GetRequest()))) {
+    appCacheContainer->GetApplicationCache(getter_AddRefs(requestAppCache));
+  }
+  if ((appCacheContainer = do_QueryInterface(aLoadGroup))) {
+    appCacheContainer->GetApplicationCache(getter_AddRefs(groupAppCache));
+  }
+
+  if (requestAppCache != groupAppCache) {
+    MOZ_LOG(GetImgLog(), PR_LOG_DEBUG,
+           ("imgLoader::ValidateEntry - Unable to use cached imgRequest "
+            "[request=%p] because of mismatched application caches\n",
+            address_of(request)));
+    return false;
+  }
+
+  if (validateRequest && aCanMakeNewChannel) {
+    LOG_SCOPE(GetImgLog(),
+              "imgLoader::ValidateRequest |cache hit| must validate");
+
+    return ValidateRequestWithNewChannel(request, aURI, aInitialDocumentURI,
+                                         aReferrerURI, aReferrerPolicy,
+                                         aLoadGroup, aObserver,
+                                         aCX, aLoadFlags, aLoadPolicyType,
+                                         aProxyRequest, aLoadingPrincipal,
+                                         aCORSMode);
+  }
+
+  return !validateRequest;
+}
+
+bool
+imgLoader::RemoveFromCache(const ImageCacheKey& aKey)
+{
+  LOG_STATIC_FUNC_WITH_PARAM(GetImgLog(),
+                             "imgLoader::RemoveFromCache", "uri", aKey.Spec());
+
+  imgCacheTable& cache = GetCache(aKey);
+  imgCacheQueue& queue = GetCacheQueue(aKey);
+
+  nsRefPtr<imgCacheEntry> entry;
+  if (cache.Get(aKey, getter_AddRefs(entry)) && entry) {
+    cache.Remove(aKey);
+
+    MOZ_ASSERT(!entry->Evicted(), "Evicting an already-evicted cache entry!");
+
+    // Entries with no proxies are in the tracker.
+    if (entry->HasNoProxies()) {
+      if (mCacheTracker) {
+        mCacheTracker->RemoveObject(entry);
+      }
+      queue.Remove(entry);
+    }
+
+    entry->SetEvicted(true);
+
+    nsRefPtr<imgRequest> request = entry->GetRequest();
+    request->SetIsInCache(false);
+    AddToUncachedImages(request);
+
+    return true;
+
+  } else {
+    return false;
+  }
+}
+
+bool
+imgLoader::RemoveFromCache(imgCacheEntry* entry)
+{
+  LOG_STATIC_FUNC(GetImgLog(), "imgLoader::RemoveFromCache entry");
+
+  nsRefPtr<imgRequest> request = entry->GetRequest();
+  if (request) {
+    const ImageCacheKey& key = request->CacheKey();
+    imgCacheTable& cache = GetCache(key);
+    imgCacheQueue& queue = GetCacheQueue(key);
+
+    LOG_STATIC_FUNC_WITH_PARAM(GetImgLog(),
+                               "imgLoader::RemoveFromCache", "entry's uri",
+                               key.Spec());
+
+    cache.Remove(key);
+
+    if (entry->HasNoProxies()) {
+      LOG_STATIC_FUNC(GetImgLog(),
+                      "imgLoader::RemoveFromCache removing from tracker");
+      if (mCacheTracker) {
+        mCacheTracker->RemoveObject(entry);
+      }
+      queue.Remove(entry);
+    }
+
+    entry->SetEvicted(true);
+    request->SetIsInCache(false);
+    AddToUncachedImages(request);
+
+    return true;
+  }
+
+  return false;
+}
+
+static PLDHashOperator
+EnumEvictEntries(const ImageCacheKey&,
+                 nsRefPtr<imgCacheEntry>& aData,
+                 void* data)
+{
+  nsTArray<nsRefPtr<imgCacheEntry> >* entries =
+    reinterpret_cast<nsTArray<nsRefPtr<imgCacheEntry> > *>(data);
+
+  entries->AppendElement(aData);
+
+  return PL_DHASH_NEXT;
+}
+
+nsresult
+imgLoader::EvictEntries(imgCacheTable& aCacheToClear)
+{
+  LOG_STATIC_FUNC(GetImgLog(), "imgLoader::EvictEntries table");
+
+  // We have to make a temporary, since RemoveFromCache removes the element
+  // from the queue, invalidating iterators.
+  nsTArray<nsRefPtr<imgCacheEntry> > entries;
+  aCacheToClear.Enumerate(EnumEvictEntries, &entries);
+
+  for (uint32_t i = 0; i < entries.Length(); ++i) {
+    if (!RemoveFromCache(entries[i])) {
+      return NS_ERROR_FAILURE;
+    }
+  }
+
+  MOZ_ASSERT(aCacheToClear.Count() == 0);
+
+  return NS_OK;
+}
+
+nsresult
+imgLoader::EvictEntries(imgCacheQueue& aQueueToClear)
+{
+  LOG_STATIC_FUNC(GetImgLog(), "imgLoader::EvictEntries queue");
+
+  // We have to make a temporary, since RemoveFromCache removes the element
+  // from the queue, invalidating iterators.
+  nsTArray<nsRefPtr<imgCacheEntry> > entries(aQueueToClear.GetNumElements());
+  for (imgCacheQueue::const_iterator i = aQueueToClear.begin();
+       i != aQueueToClear.end(); ++i) {
+    entries.AppendElement(*i);
+  }
+
+  for (uint32_t i = 0; i < entries.Length(); ++i) {
+    if (!RemoveFromCache(entries[i])) {
+      return NS_ERROR_FAILURE;
+    }
+  }
+
+  MOZ_ASSERT(aQueueToClear.GetNumElements() == 0);
+
+  return NS_OK;
+}
+
+void
+imgLoader::AddToUncachedImages(imgRequest* aRequest)
+{
+  MutexAutoLock lock(mUncachedImagesMutex);
+  mUncachedImages.PutEntry(aRequest);
+}
+
+void
+imgLoader::RemoveFromUncachedImages(imgRequest* aRequest)
+{
+  MutexAutoLock lock(mUncachedImagesMutex);
+  mUncachedImages.RemoveEntry(aRequest);
+}
+
+
+#define LOAD_FLAGS_CACHE_MASK    (nsIRequest::LOAD_BYPASS_CACHE | \
+                                  nsIRequest::LOAD_FROM_CACHE)
+
+#define LOAD_FLAGS_VALIDATE_MASK (nsIRequest::VALIDATE_ALWAYS |   \
+                                  nsIRequest::VALIDATE_NEVER |    \
+                                  nsIRequest::VALIDATE_ONCE_PER_SESSION)
+
+NS_IMETHODIMP
+imgLoader::LoadImageXPCOM(nsIURI* aURI,
+                          nsIURI* aInitialDocumentURI,
+                          nsIURI* aReferrerURI,
+                          const nsAString& aReferrerPolicy,
+                          nsIPrincipal* aLoadingPrincipal,
+                          nsILoadGroup* aLoadGroup,
+                          imgINotificationObserver* aObserver,
+                          nsISupports* aCX,
+                          nsLoadFlags aLoadFlags,
+                          nsISupports* aCacheKey,
+                          nsContentPolicyType aContentPolicyType,
+                          imgIRequest** _retval)
+{
+    // Optional parameter, so defaults to 0 (== TYPE_INVALID)
+    if (!aContentPolicyType) {
+      aContentPolicyType = nsIContentPolicy::TYPE_IMAGE;
+    }
+    imgRequestProxy* proxy;
+    ReferrerPolicy refpol = ReferrerPolicyFromString(aReferrerPolicy);
+    nsresult rv = LoadImage(aURI,
+                            aInitialDocumentURI,
+                            aReferrerURI,
+                            refpol,
+                            aLoadingPrincipal,
+                            aLoadGroup,
+                            aObserver,
+                            aCX,
+                            aLoadFlags,
+                            aCacheKey,
+                            aContentPolicyType,
+                            EmptyString(),
+                            &proxy);
+    *_retval = proxy;
+    return rv;
+}
+
+// imgIRequest loadImage(in nsIURI aURI,
+//                       in nsIURI aInitialDocumentURL,
+//                       in nsIURI aReferrerURI,
+//                       in nsIPrincipal aLoadingPrincipal,
+//                       in nsILoadGroup aLoadGroup,
+//                       in imgINotificationObserver aObserver,
+//                       in nsISupports aCX,
+//                       in nsLoadFlags aLoadFlags,
+//                       in nsISupports cacheKey);
+nsresult
+imgLoader::LoadImage(nsIURI* aURI,
+                     nsIURI* aInitialDocumentURI,
+                     nsIURI* aReferrerURI,
+                     ReferrerPolicy aReferrerPolicy,
+                     nsIPrincipal* aLoadingPrincipal,
+                     nsILoadGroup* aLoadGroup,
+                     imgINotificationObserver* aObserver,
+                     nsISupports* aCX,
+                     nsLoadFlags aLoadFlags,
+                     nsISupports* aCacheKey,
+                     nsContentPolicyType aContentPolicyType,
+                     const nsAString& initiatorType,
+                     imgRequestProxy** _retval)
+{
+  VerifyCacheSizes();
+
+  NS_ASSERTION(aURI, "imgLoader::LoadImage -- NULL URI pointer");
+
+  if (!aURI) {
+    return NS_ERROR_NULL_POINTER;
+  }
+
+  nsAutoCString spec;
+  aURI->GetSpec(spec);
+  LOG_SCOPE_WITH_PARAM(GetImgLog(), "imgLoader::LoadImage", "aURI", spec.get());
+
+  *_retval = nullptr;
+
+  nsRefPtr<imgRequest> request;
+
+  nsresult rv;
+  nsLoadFlags requestFlags = nsIRequest::LOAD_NORMAL;
+
+#ifdef DEBUG
+  bool isPrivate = false;
+
+  if (aLoadGroup) {
+    nsCOMPtr<nsIInterfaceRequestor> callbacks;
+    aLoadGroup->GetNotificationCallbacks(getter_AddRefs(callbacks));
+    if (callbacks) {
+      nsCOMPtr<nsILoadContext> loadContext = do_GetInterface(callbacks);
+      isPrivate = loadContext && loadContext->UsePrivateBrowsing();
+    }
+  }
+  MOZ_ASSERT(isPrivate == mRespectPrivacy);
+#endif
+
+  // Get the default load flags from the loadgroup (if possible)...
+  if (aLoadGroup) {
+    aLoadGroup->GetLoadFlags(&requestFlags);
+  }
+  //
+  // Merge the default load flags with those passed in via aLoadFlags.
+  // Currently, *only* the caching, validation and background load flags
+  // are merged...
+  //
+  // The flags in aLoadFlags take precedence over the default flags!
+  //
+  if (aLoadFlags & LOAD_FLAGS_CACHE_MASK) {
+    // Override the default caching flags...
+    requestFlags = (requestFlags & ~LOAD_FLAGS_CACHE_MASK) |
+                   (aLoadFlags & LOAD_FLAGS_CACHE_MASK);
+  }
+  if (aLoadFlags & LOAD_FLAGS_VALIDATE_MASK) {
+    // Override the default validation flags...
+    requestFlags = (requestFlags & ~LOAD_FLAGS_VALIDATE_MASK) |
+                   (aLoadFlags & LOAD_FLAGS_VALIDATE_MASK);
+  }
+  if (aLoadFlags & nsIRequest::LOAD_BACKGROUND) {
+    // Propagate background loading...
+    requestFlags |= nsIRequest::LOAD_BACKGROUND;
+  }
+
+  int32_t corsmode = imgIRequest::CORS_NONE;
+  if (aLoadFlags & imgILoader::LOAD_CORS_ANONYMOUS) {
+    corsmode = imgIRequest::CORS_ANONYMOUS;
+  } else if (aLoadFlags & imgILoader::LOAD_CORS_USE_CREDENTIALS) {
+    corsmode = imgIRequest::CORS_USE_CREDENTIALS;
+  }
+
+  nsRefPtr<imgCacheEntry> entry;
+
+  // Look in the cache for our URI, and then validate it.
+  // XXX For now ignore aCacheKey. We will need it in the future
+  // for correctly dealing with image load requests that are a result
+  // of post data.
+  ImageCacheKey key(aURI);
+  imgCacheTable& cache = GetCache(key);
+
+  if (cache.Get(key, getter_AddRefs(entry)) && entry) {
+    if (ValidateEntry(entry, aURI, aInitialDocumentURI, aReferrerURI,
+                      aReferrerPolicy, aLoadGroup, aObserver, aCX,
+                      requestFlags, aContentPolicyType, true, _retval,
+                      aLoadingPrincipal, corsmode)) {
+      request = entry->GetRequest();
+
+      // If this entry has no proxies, its request has no reference to the
+      // entry.
+      if (entry->HasNoProxies()) {
+        LOG_FUNC_WITH_PARAM(GetImgLog(),
+          "imgLoader::LoadImage() adding proxyless entry", "uri", key.Spec());
+        MOZ_ASSERT(!request->HasCacheEntry(),
+          "Proxyless entry's request has cache entry!");
+        request->SetCacheEntry(entry);
+
+        if (mCacheTracker) {
+          mCacheTracker->MarkUsed(entry);
+        }
+      }
+
+      entry->Touch();
+
+#ifdef DEBUG_joe
+      printf("CACHEGET: %d %s %d\n", time(nullptr), spec.get(),
+             entry->SizeOfData());
+#endif
+    } else {
+      // We can't use this entry. We'll try to load it off the network, and if
+      // successful, overwrite the old entry in the cache with a new one.
+      entry = nullptr;
+    }
+  }
+
+  // Keep the channel in this scope, so we can adjust its notificationCallbacks
+  // later when we create the proxy.
+  nsCOMPtr<nsIChannel> newChannel;
+  // If we didn't get a cache hit, we need to load from the network.
+  if (!request) {
+    LOG_SCOPE(GetImgLog(), "imgLoader::LoadImage |cache miss|");
+
+    bool forcePrincipalCheck;
+    rv = NewImageChannel(getter_AddRefs(newChannel),
+                         &forcePrincipalCheck,
+                         aURI,
+                         aInitialDocumentURI,
+                         aReferrerURI,
+                         aReferrerPolicy,
+                         aLoadGroup,
+                         mAcceptHeader,
+                         requestFlags,
+                         aContentPolicyType,
+                         aLoadingPrincipal,
+                         aCX);
+    if (NS_FAILED(rv)) {
+      return NS_ERROR_FAILURE;
+    }
+
+    MOZ_ASSERT(NS_UsePrivateBrowsing(newChannel) == mRespectPrivacy);
+
+    NewRequestAndEntry(forcePrincipalCheck, this, key,
+                       getter_AddRefs(request),
+                       getter_AddRefs(entry));
+
+    MOZ_LOG(GetImgLog(), PR_LOG_DEBUG,
+           ("[this=%p] imgLoader::LoadImage -- Created new imgRequest"
+            " [request=%p]\n", this, request.get()));
+
+    nsCOMPtr<nsILoadGroup> channelLoadGroup;
+    newChannel->GetLoadGroup(getter_AddRefs(channelLoadGroup));
+    request->Init(aURI, aURI, /* aHadInsecureRedirect = */ false,
+                  channelLoadGroup, newChannel, entry, aCX,
+                  aLoadingPrincipal, corsmode, aReferrerPolicy);
+
+    // Add the initiator type for this image load
+    nsCOMPtr<nsITimedChannel> timedChannel = do_QueryInterface(newChannel);
+    if (timedChannel) {
+      timedChannel->SetInitiatorType(initiatorType);
+    }
+
+    // create the proxy listener
+    nsCOMPtr<nsIStreamListener> pl = new ProxyListener(request.get());
+
+    // See if we need to insert a CORS proxy between the proxy listener and the
+    // request.
+    nsCOMPtr<nsIStreamListener> listener = pl;
+    if (corsmode != imgIRequest::CORS_NONE) {
+      MOZ_LOG(GetImgLog(), PR_LOG_DEBUG,
+             ("[this=%p] imgLoader::LoadImage -- Setting up a CORS load",
+              this));
+      bool withCredentials = corsmode == imgIRequest::CORS_USE_CREDENTIALS;
+
+      nsRefPtr<nsCORSListenerProxy> corsproxy =
+        new nsCORSListenerProxy(pl, aLoadingPrincipal, withCredentials);
+      rv = corsproxy->Init(newChannel, DataURIHandling::Allow);
+      if (NS_FAILED(rv)) {
+        MOZ_LOG(GetImgLog(), PR_LOG_DEBUG,
+               ("[this=%p] imgLoader::LoadImage -- nsCORSListenerProxy "
+                "creation failed: 0x%x\n", this, rv));
+        request->CancelAndAbort(rv);
+        return NS_ERROR_FAILURE;
+      }
+
+      listener = corsproxy;
+    }
+
+    MOZ_LOG(GetImgLog(), PR_LOG_DEBUG,
+           ("[this=%p] imgLoader::LoadImage -- Calling channel->AsyncOpen()\n",
+            this));
+
+    mozilla::net::PredictorLearn(aURI, aInitialDocumentURI,
+        nsINetworkPredictor::LEARN_LOAD_SUBRESOURCE, aLoadGroup);
+
+    nsresult openRes = newChannel->AsyncOpen(listener, nullptr);
+
+    if (NS_FAILED(openRes)) {
+      MOZ_LOG(GetImgLog(), PR_LOG_DEBUG,
+             ("[this=%p] imgLoader::LoadImage -- AsyncOpen() failed: 0x%x\n",
+              this, openRes));
+      request->CancelAndAbort(openRes);
+      return openRes;
+    }
+
+    // Try to add the new request into the cache.
+    PutIntoCache(key, entry);
+  } else {
+    LOG_MSG_WITH_PARAM(GetImgLog(),
+                       "imgLoader::LoadImage |cache hit|", "request", request);
+  }
+
+
+  // If we didn't get a proxy when validating the cache entry, we need to
+  // create one.
+  if (!*_retval) {
+    // ValidateEntry() has three return values: "Is valid," "might be valid --
+    // validating over network", and "not valid." If we don't have a _retval,
+    // we know ValidateEntry is not validating over the network, so it's safe
+    // to SetLoadId here because we know this request is valid for this context.
+    //
+    // Note, however, that this doesn't guarantee the behaviour we want (one
+    // URL maps to the same image on a page) if we load the same image in a
+    // different tab (see bug 528003), because its load id will get re-set, and
+    // that'll cause us to validate over the network.
+    request->SetLoadId(aCX);
+
+    LOG_MSG(GetImgLog(), "imgLoader::LoadImage", "creating proxy request.");
+    rv = CreateNewProxyForRequest(request, aLoadGroup, aObserver,
+                                  requestFlags, _retval);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+
+    imgRequestProxy* proxy = *_retval;
+
+    // Make sure that OnStatus/OnProgress calls have the right request set, if
+    // we did create a channel here.
+    if (newChannel) {
+      nsCOMPtr<nsIInterfaceRequestor> requestor(
+          new nsProgressNotificationProxy(newChannel, proxy));
+      if (!requestor) {
+        return NS_ERROR_OUT_OF_MEMORY;
+      }
+      newChannel->SetNotificationCallbacks(requestor);
+    }
+
+    // Note that it's OK to add here even if the request is done.  If it is,
+    // it'll send a OnStopRequest() to the proxy in imgRequestProxy::Notify and
+    // the proxy will be removed from the loadgroup.
+    proxy->AddToLoadGroup();
+
+    // If we're loading off the network, explicitly don't notify our proxy,
+    // because necko (or things called from necko, such as imgCacheValidator)
+    // are going to call our notifications asynchronously, and we can't make it
+    // further asynchronous because observers might rely on imagelib completing
+    // its work between the channel's OnStartRequest and OnStopRequest.
+    if (!newChannel) {
+      proxy->NotifyListener();
+    }
+
+    return rv;
+  }
+
+  NS_ASSERTION(*_retval, "imgLoader::LoadImage -- no return value");
+
+  return NS_OK;
+}
+
+/* imgIRequest
+loadImageWithChannelXPCOM(in nsIChannel channel,
+                          in imgINotificationObserver aObserver,
+                          in nsISupports cx,
+                          out nsIStreamListener); */
+NS_IMETHODIMP
+imgLoader::LoadImageWithChannelXPCOM(nsIChannel* channel,
+                                     imgINotificationObserver* aObserver,
+                                     nsISupports* aCX,
+                                     nsIStreamListener** listener,
+                                     imgIRequest** _retval)
+{
+    nsresult result;
+    imgRequestProxy* proxy;
+    result = LoadImageWithChannel(channel,
+                                  aObserver,
+                                  aCX,
+                                  listener,
+                                  &proxy);
+    *_retval = proxy;
+    return result;
+}
+
+nsresult
+imgLoader::LoadImageWithChannel(nsIChannel* channel,
+                                imgINotificationObserver* aObserver,
+                                nsISupports* aCX,
+                                nsIStreamListener** listener,
+                                imgRequestProxy** _retval)
+{
+  NS_ASSERTION(channel,
+               "imgLoader::LoadImageWithChannel -- NULL channel pointer");
+
+  MOZ_ASSERT(NS_UsePrivateBrowsing(channel) == mRespectPrivacy);
+
+  nsRefPtr<imgRequest> request;
+
+  nsCOMPtr<nsIURI> uri;
+  channel->GetURI(getter_AddRefs(uri));
+  ImageCacheKey key(uri);
+
+  nsLoadFlags requestFlags = nsIRequest::LOAD_NORMAL;
+  channel->GetLoadFlags(&requestFlags);
+
+  nsRefPtr<imgCacheEntry> entry;
+
+  if (requestFlags & nsIRequest::LOAD_BYPASS_CACHE) {
+    RemoveFromCache(key);
+  } else {
+    // Look in the cache for our URI, and then validate it.
+    // XXX For now ignore aCacheKey. We will need it in the future
+    // for correctly dealing with image load requests that are a result
+    // of post data.
+    imgCacheTable& cache = GetCache(key);
+    if (cache.Get(key, getter_AddRefs(entry)) && entry) {
+      // We don't want to kick off another network load. So we ask
+      // ValidateEntry to only do validation without creating a new proxy. If
+      // it says that the entry isn't valid any more, we'll only use the entry
+      // we're getting if the channel is loading from the cache anyways.
+      //
+      // XXX -- should this be changed? it's pretty much verbatim from the old
+      // code, but seems nonsensical.
+      //
+      // Since aCanMakeNewChannel == false, we don't need to pass content policy
+      // type/principal/etc
+      if (ValidateEntry(entry, uri, nullptr, nullptr, RP_Default,
+                        nullptr, aObserver, aCX, requestFlags,
+                        nsIContentPolicy::TYPE_INVALID, false, nullptr,
+                        nullptr, imgIRequest::CORS_NONE)) {
+        request = entry->GetRequest();
+      } else {
+        nsCOMPtr<nsICachingChannel> cacheChan(do_QueryInterface(channel));
+        bool bUseCacheCopy;
+
+        if (cacheChan) {
+          cacheChan->IsFromCache(&bUseCacheCopy);
+        } else {
+          bUseCacheCopy = false;
+        }
+
+        if (!bUseCacheCopy) {
+          entry = nullptr;
+        } else {
+          request = entry->GetRequest();
+        }
+      }
+
+      if (request && entry) {
+        // If this entry has no proxies, its request has no reference to
+        // the entry.
+        if (entry->HasNoProxies()) {
+          LOG_FUNC_WITH_PARAM(GetImgLog(),
+            "imgLoader::LoadImageWithChannel() adding proxyless entry",
+            "uri", key.Spec());
+          MOZ_ASSERT(!request->HasCacheEntry(),
+            "Proxyless entry's request has cache entry!");
+          request->SetCacheEntry(entry);
+
+          if (mCacheTracker) {
+            mCacheTracker->MarkUsed(entry);
+          }
+        }
+      }
+    }
+  }
+
+  nsCOMPtr<nsILoadGroup> loadGroup;
+  channel->GetLoadGroup(getter_AddRefs(loadGroup));
+
+  // Filter out any load flags not from nsIRequest
+  requestFlags &= nsIRequest::LOAD_REQUESTMASK;
+
+  nsresult rv = NS_OK;
+  if (request) {
+    // we have this in our cache already.. cancel the current (document) load
+
+    // this should fire an OnStopRequest
+    channel->Cancel(NS_ERROR_PARSED_DATA_CACHED);
+
+    *listener = nullptr; // give them back a null nsIStreamListener
+
+    rv = CreateNewProxyForRequest(request, loadGroup, aObserver,
+                                  requestFlags, _retval);
+    static_cast<imgRequestProxy*>(*_retval)->NotifyListener();
+  } else {
+    // We use originalURI here to fulfil the imgIRequest contract on GetURI.
+    nsCOMPtr<nsIURI> originalURI;
+    channel->GetOriginalURI(getter_AddRefs(originalURI));
+
+    // XXX(seth): We should be able to just use |key| here, except that |key| is
+    // constructed above with the *current URI* and not the *original URI*. I'm
+    // pretty sure this is a bug, and it's preventing us from ever getting a
+    // cache hit in LoadImageWithChannel when redirects are involved.
+    ImageCacheKey originalURIKey(originalURI);
+
+    // Default to doing a principal check because we don't know who
+    // started that load and whether their principal ended up being
+    // inherited on the channel.
+    NewRequestAndEntry(/* aForcePrincipalCheckForCacheEntry = */ true,
+                       this, originalURIKey,
+                       getter_AddRefs(request),
+                       getter_AddRefs(entry));
+
+    // No principal specified here, because we're not passed one.
+    // In LoadImageWithChannel, the redirects that may have been
+    // assoicated with this load would have gone through necko.
+    // We only have the final URI in ImageLib and hence don't know
+    // if the request went through insecure redirects.  But if it did,
+    // the necko cache should have handled that (since all necko cache hits
+    // including the redirects will go through content policy).  Hence, we
+    // can set aHadInsecureRedirect to false here.
+    request->Init(originalURI, uri, /* aHadInsecureRedirect = */ false,
+                  channel, channel, entry, aCX, nullptr,
+                  imgIRequest::CORS_NONE, RP_Default);
+
+    nsRefPtr<ProxyListener> pl =
+      new ProxyListener(static_cast<nsIStreamListener*>(request.get()));
+    pl.forget(listener);
+
+    // Try to add the new request into the cache.
+    PutIntoCache(originalURIKey, entry);
+
+    rv = CreateNewProxyForRequest(request, loadGroup, aObserver,
+                                  requestFlags, _retval);
+
+    // Explicitly don't notify our proxy, because we're loading off the
+    // network, and necko (or things called from necko, such as
+    // imgCacheValidator) are going to call our notifications asynchronously,
+    // and we can't make it further asynchronous because observers might rely
+    // on imagelib completing its work between the channel's OnStartRequest and
+    // OnStopRequest.
+  }
+
+  return rv;
+}
+
+bool
+imgLoader::SupportImageWithMimeType(const char* aMimeType,
+                                    AcceptedMimeTypes aAccept
+                                      /* = AcceptedMimeTypes::IMAGES */)
+{
+  nsAutoCString mimeType(aMimeType);
+  ToLowerCase(mimeType);
+
+  if (aAccept == AcceptedMimeTypes::IMAGES_AND_DOCUMENTS &&
+      mimeType.EqualsLiteral("image/svg+xml")) {
+    return true;
+  }
+
+  return Image::GetDecoderType(mimeType.get()) != Image::eDecoderType_unknown;
+}
+
+NS_IMETHODIMP
+imgLoader::GetMIMETypeFromContent(nsIRequest* aRequest,
+                                  const uint8_t* aContents,
+                                  uint32_t aLength,
+                                  nsACString& aContentType)
+{
+  return GetMimeTypeFromContent((const char*)aContents, aLength, aContentType);
+}
+
+/* static */
+nsresult
+imgLoader::GetMimeTypeFromContent(const char* aContents,
+                                  uint32_t aLength,
+                                  nsACString& aContentType)
+{
+  /* Is it a GIF? */
+  if (aLength >= 6 && (!nsCRT::strncmp(aContents, "GIF87a", 6) ||
+                       !nsCRT::strncmp(aContents, "GIF89a", 6))) {
+    aContentType.AssignLiteral(IMAGE_GIF);
+
+  /* or a PNG? */
+  } else if (aLength >= 8 && ((unsigned char)aContents[0]==0x89 &&
+                              (unsigned char)aContents[1]==0x50 &&
+                              (unsigned char)aContents[2]==0x4E &&
+                              (unsigned char)aContents[3]==0x47 &&
+                              (unsigned char)aContents[4]==0x0D &&
+                              (unsigned char)aContents[5]==0x0A &&
+                              (unsigned char)aContents[6]==0x1A &&
+                              (unsigned char)aContents[7]==0x0A)) {
+    aContentType.AssignLiteral(IMAGE_PNG);
+
+  /* maybe a JPEG (JFIF)? */
+  /* JFIF files start with SOI APP0 but older files can start with SOI DQT
+   * so we test for SOI followed by any marker, i.e. FF D8 FF
+   * this will also work for SPIFF JPEG files if they appear in the future.
+   *
+   * (JFIF is 0XFF 0XD8 0XFF 0XE0 <skip 2> 0X4A 0X46 0X49 0X46 0X00)
+   */
+  } else if (aLength >= 3 &&
+             ((unsigned char)aContents[0])==0xFF &&
+             ((unsigned char)aContents[1])==0xD8 &&
+             ((unsigned char)aContents[2])==0xFF) {
+    aContentType.AssignLiteral(IMAGE_JPEG);
+
+  /* or how about ART? */
+  /* ART begins with JG (4A 47). Major version offset 2.
+   * Minor version offset 3. Offset 4 must be nullptr.
+   */
+  } else if (aLength >= 5 &&
+             ((unsigned char) aContents[0])==0x4a &&
+             ((unsigned char) aContents[1])==0x47 &&
+             ((unsigned char) aContents[4])==0x00 ) {
+    aContentType.AssignLiteral(IMAGE_ART);
+
+  } else if (aLength >= 2 && !nsCRT::strncmp(aContents, "BM", 2)) {
+    aContentType.AssignLiteral(IMAGE_BMP);
+
+  // ICOs always begin with a 2-byte 0 followed by a 2-byte 1.
+  // CURs begin with 2-byte 0 followed by 2-byte 2.
+  } else if (aLength >= 4 && (!memcmp(aContents, "\000\000\001\000", 4) ||
+                              !memcmp(aContents, "\000\000\002\000", 4))) {
+    aContentType.AssignLiteral(IMAGE_ICO);
+
+  } else {
+    /* none of the above?  I give up */
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+
+  return NS_OK;
+}
+
+/**
+ * proxy stream listener class used to handle multipart/x-mixed-replace
+ */
+
+#include "nsIRequest.h"
+#include "nsIStreamConverterService.h"
+
+NS_IMPL_ISUPPORTS(ProxyListener,
+                  nsIStreamListener,
+                  nsIThreadRetargetableStreamListener,
+                  nsIRequestObserver)
+
+ProxyListener::ProxyListener(nsIStreamListener* dest) :
+  mDestListener(dest)
+{
+  /* member initializers and constructor code */
+}
+
+ProxyListener::~ProxyListener()
+{
+  /* destructor code */
+}
+
+
+/** nsIRequestObserver methods **/
+
+/* void onStartRequest (in nsIRequest request, in nsISupports ctxt); */
+NS_IMETHODIMP
+ProxyListener::OnStartRequest(nsIRequest* aRequest, nsISupports* ctxt)
+{
+  if (!mDestListener) {
+    return NS_ERROR_FAILURE;
+  }
+
+  nsCOMPtr<nsIChannel> channel(do_QueryInterface(aRequest));
+  if (channel) {
+    // We need to set the initiator type for the image load
+    nsCOMPtr<nsITimedChannel> timedChannel = do_QueryInterface(channel);
+    if (timedChannel) {
+      nsAutoString type;
+      timedChannel->GetInitiatorType(type);
+      if (type.IsEmpty()) {
+        timedChannel->SetInitiatorType(NS_LITERAL_STRING("img"));
+      }
+    }
+
+    nsAutoCString contentType;
+    nsresult rv = channel->GetContentType(contentType);
+
+    if (!contentType.IsEmpty()) {
+     /* If multipart/x-mixed-replace content, we'll insert a MIME decoder
+        in the pipeline to handle the content and pass it along to our
+        original listener.
+      */
+      if (NS_LITERAL_CSTRING("multipart/x-mixed-replace").Equals(contentType)) {
+
+        nsCOMPtr<nsIStreamConverterService> convServ(
+          do_GetService("@mozilla.org/streamConverters;1", &rv));
+        if (NS_SUCCEEDED(rv)) {
+          nsCOMPtr<nsIStreamListener> toListener(mDestListener);
+          nsCOMPtr<nsIStreamListener> fromListener;
+
+          rv = convServ->AsyncConvertData("multipart/x-mixed-replace",
+                                          "*/*",
+                                          toListener,
+                                          nullptr,
+                                          getter_AddRefs(fromListener));
+          if (NS_SUCCEEDED(rv)) {
+            mDestListener = fromListener;
+          }
+        }
+      }
+    }
+  }
+
+  return mDestListener->OnStartRequest(aRequest, ctxt);
+}
+
+/* void onStopRequest (in nsIRequest request, in nsISupports ctxt,
+                       in nsresult status); */
+NS_IMETHODIMP
+ProxyListener::OnStopRequest(nsIRequest* aRequest,
+                             nsISupports* ctxt,
+                             nsresult status)
+{
+  if (!mDestListener) {
+    return NS_ERROR_FAILURE;
+  }
+
+  return mDestListener->OnStopRequest(aRequest, ctxt, status);
+}
+
+/** nsIStreamListener methods **/
+
+/* void onDataAvailable (in nsIRequest request, in nsISupports ctxt,
+                         in nsIInputStream inStr,
+                         in unsigned long long sourceOffset,
+                         in unsigned long count); */
+NS_IMETHODIMP
+ProxyListener::OnDataAvailable(nsIRequest* aRequest, nsISupports* ctxt,
+                               nsIInputStream* inStr, uint64_t sourceOffset,
+                               uint32_t count)
+{
+  if (!mDestListener) {
+    return NS_ERROR_FAILURE;
+  }
+
+  return mDestListener->OnDataAvailable(aRequest, ctxt, inStr,
+                                        sourceOffset, count);
+}
+
+/** nsThreadRetargetableStreamListener methods **/
+NS_IMETHODIMP
+ProxyListener::CheckListenerChain()
+{
+  NS_ASSERTION(NS_IsMainThread(), "Should be on the main thread!");
+  nsresult rv = NS_OK;
+  nsCOMPtr<nsIThreadRetargetableStreamListener> retargetableListener =
+    do_QueryInterface(mDestListener, &rv);
+  if (retargetableListener) {
+    rv = retargetableListener->CheckListenerChain();
+  }
+  MOZ_LOG(GetImgLog(), PR_LOG_DEBUG,
+         ("ProxyListener::CheckListenerChain %s [this=%p listener=%p rv=%x]",
+          (NS_SUCCEEDED(rv) ? "success" : "failure"),
+          this, (nsIStreamListener*)mDestListener, rv));
+  return rv;
+}
+
+/**
+ * http validate class.  check a channel for a 304
+ */
+
+NS_IMPL_ISUPPORTS(imgCacheValidator, nsIStreamListener, nsIRequestObserver,
+                  nsIThreadRetargetableStreamListener,
+                  nsIChannelEventSink, nsIInterfaceRequestor,
+                  nsIAsyncVerifyRedirectCallback)
+
+imgCacheValidator::imgCacheValidator(nsProgressNotificationProxy* progress,
+                                     imgLoader* loader, imgRequest* request,
+                                     nsISupports* aContext,
+                                     bool forcePrincipalCheckForCacheEntry)
+ : mProgressProxy(progress),
+   mRequest(request),
+   mContext(aContext),
+   mImgLoader(loader),
+   mHadInsecureRedirect(false)
+{
+  NewRequestAndEntry(forcePrincipalCheckForCacheEntry, loader,
+                     mRequest->CacheKey(),
+                     getter_AddRefs(mNewRequest),
+                     getter_AddRefs(mNewEntry));
+}
+
+imgCacheValidator::~imgCacheValidator()
+{
+  if (mRequest) {
+    mRequest->SetValidator(nullptr);
+  }
+}
+
+void
+imgCacheValidator::AddProxy(imgRequestProxy* aProxy)
+{
+  // aProxy needs to be in the loadgroup since we're validating from
+  // the network.
+  aProxy->AddToLoadGroup();
+
+  mProxies.AppendObject(aProxy);
+}
+
+/** nsIRequestObserver methods **/
+
+/* void onStartRequest (in nsIRequest request, in nsISupports ctxt); */
+NS_IMETHODIMP
+imgCacheValidator::OnStartRequest(nsIRequest* aRequest, nsISupports* ctxt)
+{
+  // We may be holding on to a document, so ensure that it's released.
+  nsCOMPtr<nsISupports> context = mContext.forget();
+
+  // If for some reason we don't still have an existing request (probably
+  // because OnStartRequest got delivered more than once), just bail.
+  if (!mRequest) {
+    MOZ_ASSERT_UNREACHABLE("OnStartRequest delivered more than once?");
+    aRequest->Cancel(NS_BINDING_ABORTED);
+    return NS_ERROR_FAILURE;
+  }
+
+  // If this request is coming from cache and has the same URI as our
+  // imgRequest, the request all our proxies are pointing at is valid, and all
+  // we have to do is tell them to notify their listeners.
+  nsCOMPtr<nsICachingChannel> cacheChan(do_QueryInterface(aRequest));
+  nsCOMPtr<nsIChannel> channel(do_QueryInterface(aRequest));
+  if (cacheChan && channel && !mRequest->CacheChanged(aRequest)) {
+    bool isFromCache = false;
+    cacheChan->IsFromCache(&isFromCache);
+
+    nsCOMPtr<nsIURI> channelURI;
+    channel->GetURI(getter_AddRefs(channelURI));
+
+    nsCOMPtr<nsIURI> currentURI;
+    mRequest->GetCurrentURI(getter_AddRefs(currentURI));
+
+    bool sameURI = false;
+    if (channelURI && currentURI) {
+      channelURI->Equals(currentURI, &sameURI);
+    }
+
+    if (isFromCache && sameURI) {
+      uint32_t count = mProxies.Count();
+      for (int32_t i = count-1; i>=0; i--) {
+        imgRequestProxy* proxy = static_cast<imgRequestProxy*>(mProxies[i]);
+
+        // Proxies waiting on cache validation should be deferring
+        // notifications. Undefer them.
+        MOZ_ASSERT(proxy->NotificationsDeferred(),
+                   "Proxies waiting on cache validation should be "
+                   "deferring notifications!");
+        proxy->SetNotificationsDeferred(false);
+
+        // Notify synchronously, because we're already in OnStartRequest, an
+        // asynchronously-called function.
+        proxy->SyncNotifyListener();
+      }
+
+      // We don't need to load this any more.
+      aRequest->Cancel(NS_BINDING_ABORTED);
+
+      mRequest->SetLoadId(context);
+      mRequest->SetValidator(nullptr);
+
+      mRequest = nullptr;
+
+      mNewRequest = nullptr;
+      mNewEntry = nullptr;
+
+      return NS_OK;
+    }
+  }
+
+  // We can't load out of cache. We have to create a whole new request for the
+  // data that's coming in off the channel.
+  nsCOMPtr<nsIURI> uri;
+  {
+    nsRefPtr<ImageURL> imageURL;
+    mRequest->GetURI(getter_AddRefs(imageURL));
+    uri = imageURL->ToIURI();
+  }
+
+  if (PR_LOG_TEST(GetImgLog(), PR_LOG_DEBUG)) {
+    nsAutoCString spec;
+    uri->GetSpec(spec);
+    LOG_MSG_WITH_PARAM(GetImgLog(),
+                       "imgCacheValidator::OnStartRequest creating new request",
+                       "uri", spec.get());
+  }
+
+  int32_t corsmode = mRequest->GetCORSMode();
+  ReferrerPolicy refpol = mRequest->GetReferrerPolicy();
+  nsCOMPtr<nsIPrincipal> loadingPrincipal = mRequest->GetLoadingPrincipal();
+
+  // Doom the old request's cache entry
+  mRequest->RemoveFromCache();
+
+  mRequest->SetValidator(nullptr);
+  mRequest = nullptr;
+
+  // We use originalURI here to fulfil the imgIRequest contract on GetURI.
+  nsCOMPtr<nsIURI> originalURI;
+  channel->GetOriginalURI(getter_AddRefs(originalURI));
+  mNewRequest->Init(originalURI, uri, mHadInsecureRedirect, aRequest, channel,
+                    mNewEntry, context, loadingPrincipal, corsmode, refpol);
+
+  mDestListener = new ProxyListener(mNewRequest);
+
+  // Try to add the new request into the cache. Note that the entry must be in
+  // the cache before the proxies' ownership changes, because adding a proxy
+  // changes the caching behaviour for imgRequests.
+  mImgLoader->PutIntoCache(mNewRequest->CacheKey(), mNewEntry);
+
+  uint32_t count = mProxies.Count();
+  for (int32_t i = count-1; i>=0; i--) {
+    imgRequestProxy* proxy = static_cast<imgRequestProxy*>(mProxies[i]);
+    proxy->ChangeOwner(mNewRequest);
+
+    // Notify synchronously, because we're already in OnStartRequest, an
+    // asynchronously-called function.
+    proxy->SetNotificationsDeferred(false);
+    proxy->SyncNotifyListener();
+  }
+
+  mNewRequest = nullptr;
+  mNewEntry = nullptr;
+
+  return mDestListener->OnStartRequest(aRequest, ctxt);
+}
+
+/* void onStopRequest (in nsIRequest request, in nsISupports ctxt,
+                       in nsresult status); */
+NS_IMETHODIMP
+imgCacheValidator::OnStopRequest(nsIRequest* aRequest,
+                                 nsISupports* ctxt,
+                                 nsresult status)
+{
+  // Be sure we've released the document that we may have been holding on to.
+  mContext = nullptr;
+
+  if (!mDestListener) {
+    return NS_OK;
+  }
+
+  return mDestListener->OnStopRequest(aRequest, ctxt, status);
+}
+
+/** nsIStreamListener methods **/
+
+
+/* void
+   onDataAvailable (in nsIRequest request, in nsISupports ctxt,
+   in nsIInputStream inStr, in unsigned long long sourceOffset,
+   in unsigned long count); */
+NS_IMETHODIMP
+imgCacheValidator::OnDataAvailable(nsIRequest* aRequest, nsISupports* ctxt,
+                                   nsIInputStream* inStr,
+                                   uint64_t sourceOffset, uint32_t count)
+{
+  if (!mDestListener) {
+    // XXX see bug 113959
+    uint32_t _retval;
+    inStr->ReadSegments(NS_DiscardSegment, nullptr, count, &_retval);
+    return NS_OK;
+  }
+
+  return mDestListener->OnDataAvailable(aRequest, ctxt, inStr, sourceOffset,
+                                        count);
+}
+
+/** nsIThreadRetargetableStreamListener methods **/
+
+NS_IMETHODIMP
+imgCacheValidator::CheckListenerChain()
+{
+  NS_ASSERTION(NS_IsMainThread(), "Should be on the main thread!");
+  nsresult rv = NS_OK;
+  nsCOMPtr<nsIThreadRetargetableStreamListener> retargetableListener =
+    do_QueryInterface(mDestListener, &rv);
+  if (retargetableListener) {
+    rv = retargetableListener->CheckListenerChain();
+  }
+  MOZ_LOG(GetImgLog(), PR_LOG_DEBUG,
+         ("[this=%p] imgCacheValidator::CheckListenerChain -- rv %d=%s",
+          this, NS_SUCCEEDED(rv) ? "succeeded" : "failed", rv));
+  return rv;
+}
+
+/** nsIInterfaceRequestor methods **/
+
+NS_IMETHODIMP
+imgCacheValidator::GetInterface(const nsIID& aIID, void** aResult)
+{
+  if (aIID.Equals(NS_GET_IID(nsIChannelEventSink))) {
+    return QueryInterface(aIID, aResult);
+  }
+
+  return mProgressProxy->GetInterface(aIID, aResult);
+}
+
+// These functions are materially the same as the same functions in imgRequest.
+// We duplicate them because we're verifying whether cache loads are necessary,
+// not unconditionally loading.
+
+/** nsIChannelEventSink methods **/
+NS_IMETHODIMP
+imgCacheValidator::
+  AsyncOnChannelRedirect(nsIChannel* oldChannel,
+                         nsIChannel* newChannel,
+                         uint32_t flags,
+                         nsIAsyncVerifyRedirectCallback* callback)
+{
+  // Note all cache information we get from the old channel.
+  mNewRequest->SetCacheValidation(mNewEntry, oldChannel);
+
+  // If the previous URI is a non-HTTPS URI, record that fact for later use by
+  // security code, which needs to know whether there is an insecure load at any
+  // point in the redirect chain.
+  nsCOMPtr<nsIURI> oldURI;
+  bool isHttps = false;
+  bool isChrome = false;
+  bool schemeLocal = false;
+  if (NS_FAILED(oldChannel->GetURI(getter_AddRefs(oldURI))) ||
+      NS_FAILED(oldURI->SchemeIs("https", &isHttps)) ||
+      NS_FAILED(oldURI->SchemeIs("chrome", &isChrome)) ||
+      NS_FAILED(NS_URIChainHasFlags(oldURI,
+                                    nsIProtocolHandler::URI_IS_LOCAL_RESOURCE,
+                                    &schemeLocal))  ||
+      (!isHttps && !isChrome && !schemeLocal)) {
+    mHadInsecureRedirect = true;
+  }
+
+  // Prepare for callback
+  mRedirectCallback = callback;
+  mRedirectChannel = newChannel;
+
+  return mProgressProxy->AsyncOnChannelRedirect(oldChannel, newChannel, flags,
+                                                this);
+}
+
+NS_IMETHODIMP
+imgCacheValidator::OnRedirectVerifyCallback(nsresult aResult)
+{
+  // If we've already been told to abort, just do so.
+  if (NS_FAILED(aResult)) {
+      mRedirectCallback->OnRedirectVerifyCallback(aResult);
+      mRedirectCallback = nullptr;
+      mRedirectChannel = nullptr;
+      return NS_OK;
+  }
+
+  // make sure we have a protocol that returns data rather than opens
+  // an external application, e.g. mailto:
+  nsCOMPtr<nsIURI> uri;
+  mRedirectChannel->GetURI(getter_AddRefs(uri));
+  bool doesNotReturnData = false;
+  NS_URIChainHasFlags(uri, nsIProtocolHandler::URI_DOES_NOT_RETURN_DATA,
+                      &doesNotReturnData);
+
+  nsresult result = NS_OK;
+
+  if (doesNotReturnData) {
+    result = NS_ERROR_ABORT;
+  }
+
+  mRedirectCallback->OnRedirectVerifyCallback(result);
+  mRedirectCallback = nullptr;
+  mRedirectChannel = nullptr;
+  return NS_OK;
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/imgLoader.h firefox-trunk-41.0~a1~hg20150524r245419/image/imgLoader.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/imgLoader.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/imgLoader.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,544 @@
+/* -*- 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_image_imgLoader_h
+#define mozilla_image_imgLoader_h
+
+#include "mozilla/Attributes.h"
+#include "mozilla/Mutex.h"
+
+#include "imgILoader.h"
+#include "imgICache.h"
+#include "nsWeakReference.h"
+#include "nsIContentSniffer.h"
+#include "nsRefPtrHashtable.h"
+#include "nsExpirationTracker.h"
+#include "nsAutoPtr.h"
+#include "ImageCacheKey.h"
+#include "imgRequest.h"
+#include "nsIProgressEventSink.h"
+#include "nsIChannel.h"
+#include "nsIThreadRetargetableStreamListener.h"
+#include "imgIRequest.h"
+#include "mozilla/net/ReferrerPolicy.h"
+
+class imgLoader;
+class imgRequestProxy;
+class imgINotificationObserver;
+class nsILoadGroup;
+class imgCacheExpirationTracker;
+class imgMemoryReporter;
+
+namespace mozilla {
+namespace image {
+class ImageURL;
+}
+}
+
+class imgCacheEntry
+{
+public:
+  imgCacheEntry(imgLoader* loader, imgRequest* request,
+                bool aForcePrincipalCheck);
+  ~imgCacheEntry();
+
+  nsrefcnt AddRef()
+  {
+    NS_PRECONDITION(int32_t(mRefCnt) >= 0, "illegal refcnt");
+    MOZ_ASSERT(_mOwningThread.GetThread() == PR_GetCurrentThread(),
+      "imgCacheEntry addref isn't thread-safe!");
+    ++mRefCnt;
+    NS_LOG_ADDREF(this, mRefCnt, "imgCacheEntry", sizeof(*this));
+    return mRefCnt;
+  }
+
+  nsrefcnt Release()
+  {
+    NS_PRECONDITION(0 != mRefCnt, "dup release");
+    MOZ_ASSERT(_mOwningThread.GetThread() == PR_GetCurrentThread(),
+      "imgCacheEntry release isn't thread-safe!");
+    --mRefCnt;
+    NS_LOG_RELEASE(this, mRefCnt, "imgCacheEntry");
+    if (mRefCnt == 0) {
+      mRefCnt = 1; /* stabilize */
+      delete this;
+      return 0;
+    }
+    return mRefCnt;
+  }
+
+  uint32_t GetDataSize() const
+  {
+    return mDataSize;
+  }
+  void SetDataSize(uint32_t aDataSize)
+  {
+    int32_t oldsize = mDataSize;
+    mDataSize = aDataSize;
+    UpdateCache(mDataSize - oldsize);
+  }
+
+  int32_t GetTouchedTime() const
+  {
+    return mTouchedTime;
+  }
+  void SetTouchedTime(int32_t time)
+  {
+    mTouchedTime = time;
+    Touch(/* updateTime = */ false);
+  }
+
+  int32_t GetExpiryTime() const
+  {
+    return mExpiryTime;
+  }
+  void SetExpiryTime(int32_t aExpiryTime)
+  {
+    mExpiryTime = aExpiryTime;
+    Touch();
+  }
+
+  bool GetMustValidate() const
+  {
+    return mMustValidate;
+  }
+  void SetMustValidate(bool aValidate)
+  {
+    mMustValidate = aValidate;
+    Touch();
+  }
+
+  already_AddRefed<imgRequest> GetRequest() const
+  {
+    nsRefPtr<imgRequest> req = mRequest;
+    return req.forget();
+  }
+
+  bool Evicted() const
+  {
+    return mEvicted;
+  }
+
+  nsExpirationState* GetExpirationState()
+  {
+    return &mExpirationState;
+  }
+
+  bool HasNoProxies() const
+  {
+    return mHasNoProxies;
+  }
+
+  bool ForcePrincipalCheck() const
+  {
+    return mForcePrincipalCheck;
+  }
+
+  imgLoader* Loader() const
+  {
+    return mLoader;
+  }
+
+private: // methods
+  friend class imgLoader;
+  friend class imgCacheQueue;
+  void Touch(bool updateTime = true);
+  void UpdateCache(int32_t diff = 0);
+  void SetEvicted(bool evict)
+  {
+    mEvicted = evict;
+  }
+  void SetHasNoProxies(bool hasNoProxies);
+
+  // Private, unimplemented copy constructor.
+  imgCacheEntry(const imgCacheEntry&);
+
+private: // data
+  nsAutoRefCnt mRefCnt;
+  NS_DECL_OWNINGTHREAD
+
+  imgLoader* mLoader;
+  nsRefPtr<imgRequest> mRequest;
+  uint32_t mDataSize;
+  int32_t mTouchedTime;
+  int32_t mExpiryTime;
+  nsExpirationState mExpirationState;
+  bool mMustValidate : 1;
+  bool mEvicted : 1;
+  bool mHasNoProxies : 1;
+  bool mForcePrincipalCheck : 1;
+};
+
+#include <vector>
+
+#define NS_IMGLOADER_CID \
+{ /* c1354898-e3fe-4602-88a7-c4520c21cb4e */         \
+     0xc1354898,                                     \
+     0xe3fe,                                         \
+     0x4602,                                         \
+    {0x88, 0xa7, 0xc4, 0x52, 0x0c, 0x21, 0xcb, 0x4e} \
+}
+
+class imgCacheQueue
+{
+public:
+  imgCacheQueue();
+  void Remove(imgCacheEntry*);
+  void Push(imgCacheEntry*);
+  void MarkDirty();
+  bool IsDirty();
+  already_AddRefed<imgCacheEntry> Pop();
+  void Refresh();
+  uint32_t GetSize() const;
+  void UpdateSize(int32_t diff);
+  uint32_t GetNumElements() const;
+  typedef std::vector<nsRefPtr<imgCacheEntry> > queueContainer;
+  typedef queueContainer::iterator iterator;
+  typedef queueContainer::const_iterator const_iterator;
+
+  iterator begin();
+  const_iterator begin() const;
+  iterator end();
+  const_iterator end() const;
+
+private:
+  queueContainer mQueue;
+  bool mDirty;
+  uint32_t mSize;
+};
+
+enum class AcceptedMimeTypes : uint8_t {
+  IMAGES,
+  IMAGES_AND_DOCUMENTS,
+};
+
+class imgLoader final : public imgILoader,
+                        public nsIContentSniffer,
+                        public imgICache,
+                        public nsSupportsWeakReference,
+                        public nsIObserver
+{
+  virtual ~imgLoader();
+
+public:
+  typedef mozilla::image::ImageCacheKey ImageCacheKey;
+  typedef mozilla::image::ImageURL ImageURL;
+  typedef nsRefPtrHashtable<nsGenericHashKey<ImageCacheKey>,
+                            imgCacheEntry> imgCacheTable;
+  typedef nsTHashtable<nsPtrHashKey<imgRequest>> imgSet;
+  typedef mozilla::net::ReferrerPolicy ReferrerPolicy;
+  typedef mozilla::Mutex Mutex;
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_IMGILOADER
+  NS_DECL_NSICONTENTSNIFFER
+  NS_DECL_IMGICACHE
+  NS_DECL_NSIOBSERVER
+
+  static imgLoader* Singleton();
+  static imgLoader* PBSingleton();
+
+  imgLoader();
+
+  nsresult Init();
+
+  static imgLoader* Create()
+  {
+      // Unfortunately, we rely on XPCOM module init happening
+      // before imgLoader creation. For now, it's easier
+      // to just call CallCreateInstance() which will init
+      // the image module instead of calling new imgLoader
+      // directly.
+      imgILoader* loader;
+      CallCreateInstance("@mozilla.org/image/loader;1", &loader);
+      // There's only one imgLoader implementation so we
+      // can safely cast to it.
+      return static_cast<imgLoader*>(loader);
+  }
+
+  static already_AddRefed<imgLoader>
+  GetInstance();
+
+  nsresult LoadImage(nsIURI* aURI,
+                     nsIURI* aInitialDocumentURI,
+                     nsIURI* aReferrerURI,
+                     ReferrerPolicy aReferrerPolicy,
+                     nsIPrincipal* aLoadingPrincipal,
+                     nsILoadGroup* aLoadGroup,
+                     imgINotificationObserver* aObserver,
+                     nsISupports* aCX,
+                     nsLoadFlags aLoadFlags,
+                     nsISupports* aCacheKey,
+                     nsContentPolicyType aContentPolicyType,
+                     const nsAString& initiatorType,
+                     imgRequestProxy** _retval);
+
+  nsresult LoadImageWithChannel(nsIChannel* channel,
+                                imgINotificationObserver* aObserver,
+                                nsISupports* aCX,
+                                nsIStreamListener** listener,
+                                imgRequestProxy** _retval);
+
+  static nsresult GetMimeTypeFromContent(const char* aContents,
+                                         uint32_t aLength,
+                                         nsACString& aContentType);
+
+  /**
+   * Returns true if the given mime type may be interpreted as an image.
+   *
+   * Some MIME types may be interpreted as both images and documents. (At the
+   * moment only "image/svg+xml" falls into this category, but there may be more
+   * in the future.) Callers which want this function to return true for such
+   * MIME types should pass AcceptedMimeTypes::IMAGES_AND_DOCUMENTS for
+   * @aAccept.
+   *
+   * @param aMimeType The MIME type to evaluate.
+   * @param aAcceptedMimeTypes Which kinds of MIME types to treat as images.
+   */
+  static NS_EXPORT_(bool)
+  SupportImageWithMimeType(const char* aMimeType,
+                           AcceptedMimeTypes aAccept =
+                             AcceptedMimeTypes::IMAGES);
+
+  static void GlobalInit(); // for use by the factory
+  static void Shutdown(); // for use by the factory
+
+  nsresult ClearChromeImageCache();
+  nsresult ClearImageCache();
+  void MinimizeCaches();
+
+  nsresult InitCache();
+
+  bool RemoveFromCache(const ImageCacheKey& aKey);
+  bool RemoveFromCache(imgCacheEntry* entry);
+
+  bool PutIntoCache(const ImageCacheKey& aKey, imgCacheEntry* aEntry);
+
+  void AddToUncachedImages(imgRequest* aRequest);
+  void RemoveFromUncachedImages(imgRequest* aRequest);
+
+  // Returns true if we should prefer evicting cache entry |two| over cache
+  // entry |one|.
+  // This mixes units in the worst way, but provides reasonable results.
+  inline static bool CompareCacheEntries(const nsRefPtr<imgCacheEntry>& one,
+                                         const nsRefPtr<imgCacheEntry>& two)
+  {
+    if (!one) {
+      return false;
+    }
+    if (!two) {
+      return true;
+    }
+
+    const double sizeweight = 1.0 - sCacheTimeWeight;
+
+    // We want large, old images to be evicted first (depending on their
+    // relative weights). Since a larger time is actually newer, we subtract
+    // time's weight, so an older image has a larger weight.
+    double oneweight = double(one->GetDataSize()) * sizeweight -
+                       double(one->GetTouchedTime()) * sCacheTimeWeight;
+    double twoweight = double(two->GetDataSize()) * sizeweight -
+                       double(two->GetTouchedTime()) * sCacheTimeWeight;
+
+    return oneweight < twoweight;
+  }
+
+  void VerifyCacheSizes();
+
+  // The image loader maintains a hash table of all imgCacheEntries. However,
+  // only some of them will be evicted from the cache: those who have no
+  // imgRequestProxies watching their imgRequests.
+  //
+  // Once an imgRequest has no imgRequestProxies, it should notify us by
+  // calling HasNoObservers(), and null out its cache entry pointer.
+  //
+  // Upon having a proxy start observing again, it should notify us by calling
+  // HasObservers(). The request's cache entry will be re-set before this
+  // happens, by calling imgRequest::SetCacheEntry() when an entry with no
+  // observers is re-requested.
+  bool SetHasNoProxies(imgRequest* aRequest, imgCacheEntry* aEntry);
+  bool SetHasProxies(imgRequest* aRequest);
+
+private: // methods
+
+  bool ValidateEntry(imgCacheEntry* aEntry, nsIURI* aKey,
+                     nsIURI* aInitialDocumentURI, nsIURI* aReferrerURI,
+                     ReferrerPolicy aReferrerPolicy,
+                     nsILoadGroup* aLoadGroup,
+                     imgINotificationObserver* aObserver, nsISupports* aCX,
+                     nsLoadFlags aLoadFlags,
+                     nsContentPolicyType aContentPolicyType,
+                     bool aCanMakeNewChannel,
+                     imgRequestProxy** aProxyRequest,
+                     nsIPrincipal* aLoadingPrincipal,
+                     int32_t aCORSMode);
+
+  bool ValidateRequestWithNewChannel(imgRequest* request, nsIURI* aURI,
+                                     nsIURI* aInitialDocumentURI,
+                                     nsIURI* aReferrerURI,
+                                     ReferrerPolicy aReferrerPolicy,
+                                     nsILoadGroup* aLoadGroup,
+                                     imgINotificationObserver* aObserver,
+                                     nsISupports* aCX, nsLoadFlags aLoadFlags,
+                                     nsContentPolicyType aContentPolicyType,
+                                     imgRequestProxy** aProxyRequest,
+                                     nsIPrincipal* aLoadingPrincipal,
+                                     int32_t aCORSMode);
+
+  nsresult CreateNewProxyForRequest(imgRequest* aRequest,
+                                    nsILoadGroup* aLoadGroup,
+                                    imgINotificationObserver* aObserver,
+                                    nsLoadFlags aLoadFlags,
+                                    imgRequestProxy** _retval);
+
+  void ReadAcceptHeaderPref();
+
+  nsresult EvictEntries(imgCacheTable& aCacheToClear);
+  nsresult EvictEntries(imgCacheQueue& aQueueToClear);
+
+  imgCacheTable& GetCache(bool aForChrome);
+  imgCacheTable& GetCache(const ImageCacheKey& aKey);
+  imgCacheQueue& GetCacheQueue(bool aForChrome);
+  imgCacheQueue& GetCacheQueue(const ImageCacheKey& aKey);
+  void CacheEntriesChanged(bool aForChrome, int32_t aSizeDiff = 0);
+  void CheckCacheLimits(imgCacheTable& cache, imgCacheQueue& queue);
+
+private: // data
+  friend class imgCacheEntry;
+  friend class imgMemoryReporter;
+
+  imgCacheTable mCache;
+  imgCacheQueue mCacheQueue;
+
+  imgCacheTable mChromeCache;
+  imgCacheQueue mChromeCacheQueue;
+
+  // Hash set of every imgRequest for this loader that isn't in mCache or
+  // mChromeCache. The union over all imgLoader's of mCache, mChromeCache, and
+  // mUncachedImages should be every imgRequest that is alive. These are weak
+  // pointers so we rely on the imgRequest destructor to remove itself.
+  imgSet mUncachedImages;
+  // The imgRequest can have refs to them held on non-main thread, so we need
+  // a mutex because we modify the uncached images set from the imgRequest
+  // destructor.
+  Mutex mUncachedImagesMutex;
+
+  static double sCacheTimeWeight;
+  static uint32_t sCacheMaxSize;
+  static imgMemoryReporter* sMemReporter;
+
+  nsCString mAcceptHeader;
+
+  nsAutoPtr<imgCacheExpirationTracker> mCacheTracker;
+  bool mRespectPrivacy;
+};
+
+
+
+/**
+ * proxy stream listener class used to handle multipart/x-mixed-replace
+ */
+
+#include "nsCOMPtr.h"
+#include "nsIStreamListener.h"
+#include "nsIThreadRetargetableStreamListener.h"
+
+class ProxyListener : public nsIStreamListener
+                    , public nsIThreadRetargetableStreamListener
+{
+public:
+  explicit ProxyListener(nsIStreamListener* dest);
+
+  /* additional members */
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_NSISTREAMLISTENER
+  NS_DECL_NSITHREADRETARGETABLESTREAMLISTENER
+  NS_DECL_NSIREQUESTOBSERVER
+
+private:
+  virtual ~ProxyListener();
+
+  nsCOMPtr<nsIStreamListener> mDestListener;
+};
+
+/**
+ * A class that implements nsIProgressEventSink and forwards all calls to it to
+ * the original notification callbacks of the channel. Also implements
+ * nsIInterfaceRequestor and gives out itself for nsIProgressEventSink calls,
+ * and forwards everything else to the channel's notification callbacks.
+ */
+class nsProgressNotificationProxy final
+  : public nsIProgressEventSink
+  , public nsIChannelEventSink
+  , public nsIInterfaceRequestor
+{
+  public:
+    nsProgressNotificationProxy(nsIChannel* channel,
+                                imgIRequest* proxy)
+        : mImageRequest(proxy) {
+      channel->GetNotificationCallbacks(getter_AddRefs(mOriginalCallbacks));
+    }
+
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSIPROGRESSEVENTSINK
+    NS_DECL_NSICHANNELEVENTSINK
+    NS_DECL_NSIINTERFACEREQUESTOR
+  private:
+    ~nsProgressNotificationProxy() { }
+
+    nsCOMPtr<nsIInterfaceRequestor> mOriginalCallbacks;
+    nsCOMPtr<nsIRequest> mImageRequest;
+};
+
+/**
+ * validate checker
+ */
+
+#include "nsCOMArray.h"
+
+class imgCacheValidator : public nsIStreamListener,
+                          public nsIThreadRetargetableStreamListener,
+                          public nsIChannelEventSink,
+                          public nsIInterfaceRequestor,
+                          public nsIAsyncVerifyRedirectCallback
+{
+public:
+  imgCacheValidator(nsProgressNotificationProxy* progress, imgLoader* loader,
+                    imgRequest* aRequest, nsISupports* aContext,
+                    bool forcePrincipalCheckForCacheEntry);
+
+  void AddProxy(imgRequestProxy* aProxy);
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSITHREADRETARGETABLESTREAMLISTENER
+  NS_DECL_NSISTREAMLISTENER
+  NS_DECL_NSIREQUESTOBSERVER
+  NS_DECL_NSICHANNELEVENTSINK
+  NS_DECL_NSIINTERFACEREQUESTOR
+  NS_DECL_NSIASYNCVERIFYREDIRECTCALLBACK
+
+private:
+  virtual ~imgCacheValidator();
+
+  nsCOMPtr<nsIStreamListener> mDestListener;
+  nsRefPtr<nsProgressNotificationProxy> mProgressProxy;
+  nsCOMPtr<nsIAsyncVerifyRedirectCallback> mRedirectCallback;
+  nsCOMPtr<nsIChannel> mRedirectChannel;
+
+  nsRefPtr<imgRequest> mRequest;
+  nsCOMArray<imgIRequest> mProxies;
+
+  nsRefPtr<imgRequest> mNewRequest;
+  nsRefPtr<imgCacheEntry> mNewEntry;
+
+  nsCOMPtr<nsISupports> mContext;
+
+  imgLoader* mImgLoader;
+
+  bool mHadInsecureRedirect;
+};
+
+#endif // mozilla_image_imgLoader_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/imgRequest.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/imgRequest.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/imgRequest.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/imgRequest.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,1290 @@
+/* -*- 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 "imgRequest.h"
+#include "ImageLogging.h"
+
+#include "imgLoader.h"
+#include "imgRequestProxy.h"
+#include "DecodePool.h"
+#include "ProgressTracker.h"
+#include "ImageFactory.h"
+#include "Image.h"
+#include "MultipartImage.h"
+#include "RasterImage.h"
+
+#include "nsIChannel.h"
+#include "nsICachingChannel.h"
+#include "nsIDocument.h"
+#include "nsIThreadRetargetableRequest.h"
+#include "nsIInputStream.h"
+#include "nsIMultiPartChannel.h"
+#include "nsIHttpChannel.h"
+#include "nsIApplicationCache.h"
+#include "nsIApplicationCacheChannel.h"
+#include "nsMimeTypes.h"
+
+#include "nsIInterfaceRequestorUtils.h"
+#include "nsISupportsPrimitives.h"
+#include "nsIScriptSecurityManager.h"
+#include "nsContentUtils.h"
+
+#include "nsICacheEntry.h"
+
+#include "plstr.h" // PL_strcasestr(...)
+#include "nsNetUtil.h"
+#include "nsIProtocolHandler.h"
+#include "imgIRequest.h"
+
+using namespace mozilla;
+using namespace mozilla::image;
+
+PRLogModuleInfo*
+GetImgLog()
+{
+  static PRLogModuleInfo* sImgLog;
+  if (!sImgLog) {
+    sImgLog = PR_NewLogModule("imgRequest");
+  }
+  return sImgLog;
+}
+#define LOG_TEST(level) (GetImgLog() && PR_LOG_TEST(GetImgLog(), (level)))
+
+NS_IMPL_ISUPPORTS(imgRequest,
+                  nsIStreamListener, nsIRequestObserver,
+                  nsIThreadRetargetableStreamListener,
+                  nsIChannelEventSink,
+                  nsIInterfaceRequestor,
+                  nsIAsyncVerifyRedirectCallback)
+
+imgRequest::imgRequest(imgLoader* aLoader, const ImageCacheKey& aCacheKey)
+ : mLoader(aLoader)
+ , mCacheKey(aCacheKey)
+ , mLoadId(nullptr)
+ , mValidator(nullptr)
+ , mInnerWindowId(0)
+ , mCORSMode(imgIRequest::CORS_NONE)
+ , mReferrerPolicy(mozilla::net::RP_Default)
+ , mImageErrorCode(NS_OK)
+ , mMutex("imgRequest")
+ , mProgressTracker(new ProgressTracker())
+ , mIsMultiPartChannel(false)
+ , mGotData(false)
+ , mIsInCache(false)
+ , mDecodeRequested(false)
+ , mNewPartPending(false)
+ , mHadInsecureRedirect(false)
+{ }
+
+imgRequest::~imgRequest()
+{
+  if (mLoader) {
+    mLoader->RemoveFromUncachedImages(this);
+  }
+  if (mURI) {
+    nsAutoCString spec;
+    mURI->GetSpec(spec);
+    LOG_FUNC_WITH_PARAM(GetImgLog(), "imgRequest::~imgRequest()",
+                        "keyuri", spec.get());
+  } else
+    LOG_FUNC(GetImgLog(), "imgRequest::~imgRequest()");
+}
+
+nsresult
+imgRequest::Init(nsIURI *aURI,
+                 nsIURI *aCurrentURI,
+                 bool aHadInsecureRedirect,
+                 nsIRequest *aRequest,
+                 nsIChannel *aChannel,
+                 imgCacheEntry *aCacheEntry,
+                 nsISupports* aCX,
+                 nsIPrincipal* aLoadingPrincipal,
+                 int32_t aCORSMode,
+                 ReferrerPolicy aReferrerPolicy)
+{
+  MOZ_ASSERT(NS_IsMainThread(), "Cannot use nsIURI off main thread!");
+
+  LOG_FUNC(GetImgLog(), "imgRequest::Init");
+
+  MOZ_ASSERT(!mImage, "Multiple calls to init");
+  MOZ_ASSERT(aURI, "No uri");
+  MOZ_ASSERT(aCurrentURI, "No current uri");
+  MOZ_ASSERT(aRequest, "No request");
+  MOZ_ASSERT(aChannel, "No channel");
+
+  mProperties = do_CreateInstance("@mozilla.org/properties;1");
+
+  // Use ImageURL to ensure access to URI data off main thread.
+  mURI = new ImageURL(aURI);
+  mCurrentURI = aCurrentURI;
+  mRequest = aRequest;
+  mChannel = aChannel;
+  mTimedChannel = do_QueryInterface(mChannel);
+
+  mLoadingPrincipal = aLoadingPrincipal;
+  mCORSMode = aCORSMode;
+  mReferrerPolicy = aReferrerPolicy;
+
+  // If the original URI and the current URI are different, check whether the
+  // original URI is secure. We deliberately don't take the current URI into
+  // account, as it needs to be handled using more complicated rules than
+  // earlier elements of the redirect chain.
+  if (aURI != aCurrentURI) {
+    bool isHttps = false;
+    bool isChrome = false;
+    bool schemeLocal = false;
+    if (NS_FAILED(aURI->SchemeIs("https", &isHttps)) ||
+        NS_FAILED(aURI->SchemeIs("chrome", &isChrome)) ||
+        NS_FAILED(NS_URIChainHasFlags(
+                  aURI,
+                  nsIProtocolHandler::URI_IS_LOCAL_RESOURCE , &schemeLocal))  ||
+        (!isHttps && !isChrome && !schemeLocal)) {
+      mHadInsecureRedirect = true;
+    }
+  }
+
+  // imgCacheValidator may have handled redirects before we were created, so we
+  // allow the caller to let us know if any redirects were insecure.
+  mHadInsecureRedirect = mHadInsecureRedirect || aHadInsecureRedirect;
+
+  mChannel->GetNotificationCallbacks(getter_AddRefs(mPrevChannelSink));
+
+  NS_ASSERTION(mPrevChannelSink != this,
+               "Initializing with a channel that already calls back to us!");
+
+  mChannel->SetNotificationCallbacks(this);
+
+  mCacheEntry = aCacheEntry;
+
+  SetLoadId(aCX);
+
+  // Grab the inner window ID of the loading document, if possible.
+  nsCOMPtr<nsIDocument> doc = do_QueryInterface(aCX);
+  if (doc) {
+    mInnerWindowId = doc->InnerWindowID();
+  }
+
+  return NS_OK;
+}
+
+void
+imgRequest::ClearLoader() {
+  mLoader = nullptr;
+}
+
+already_AddRefed<ProgressTracker>
+imgRequest::GetProgressTracker() const
+{
+  MutexAutoLock lock(mMutex);
+
+  if (mImage) {
+    MOZ_ASSERT(!mProgressTracker,
+               "Should have given mProgressTracker to mImage");
+    return mImage->GetProgressTracker();
+  } else {
+    MOZ_ASSERT(mProgressTracker,
+               "Should have mProgressTracker until we create mImage");
+    nsRefPtr<ProgressTracker> progressTracker = mProgressTracker;
+    MOZ_ASSERT(progressTracker);
+    return progressTracker.forget();
+  }
+}
+
+void imgRequest::SetCacheEntry(imgCacheEntry* entry)
+{
+  mCacheEntry = entry;
+}
+
+bool
+imgRequest::HasCacheEntry() const
+{
+  return mCacheEntry != nullptr;
+}
+
+void
+imgRequest::ResetCacheEntry()
+{
+  if (HasCacheEntry()) {
+    mCacheEntry->SetDataSize(0);
+  }
+}
+
+void
+imgRequest::AddProxy(imgRequestProxy* proxy)
+{
+  NS_PRECONDITION(proxy, "null imgRequestProxy passed in");
+  LOG_SCOPE_WITH_PARAM(GetImgLog(), "imgRequest::AddProxy", "proxy", proxy);
+
+  // If we're empty before adding, we have to tell the loader we now have
+  // proxies.
+  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+  if (progressTracker->ObserverCount() == 0) {
+    MOZ_ASSERT(mURI, "Trying to SetHasProxies without key uri.");
+    if (mLoader) {
+      mLoader->SetHasProxies(this);
+    }
+  }
+
+  progressTracker->AddObserver(proxy);
+}
+
+nsresult
+imgRequest::RemoveProxy(imgRequestProxy* proxy, nsresult aStatus)
+{
+  LOG_SCOPE_WITH_PARAM(GetImgLog(), "imgRequest::RemoveProxy", "proxy", proxy);
+
+  // This will remove our animation consumers, so after removing
+  // this proxy, we don't end up without proxies with observers, but still
+  // have animation consumers.
+  proxy->ClearAnimationConsumers();
+
+  // Let the status tracker do its thing before we potentially call Cancel()
+  // 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<ProgressTracker> progressTracker = GetProgressTracker();
+  if (!progressTracker->RemoveObserver(proxy)) {
+    return NS_OK;
+  }
+
+  if (progressTracker->ObserverCount() == 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.
+    if (mCacheEntry) {
+      MOZ_ASSERT(mURI, "Removing last observer without key uri.");
+
+      if (mLoader) {
+        mLoader->SetHasNoProxies(this, mCacheEntry);
+      }
+    } else if (PR_LOG_TEST(GetImgLog(), PR_LOG_DEBUG)) {
+      nsAutoCString spec;
+      mURI->GetSpec(spec);
+      LOG_MSG_WITH_PARAM(GetImgLog(),
+                         "imgRequest::RemoveProxy no cache entry",
+                         "uri", spec.get());
+    }
+
+    /* If |aStatus| is a failure code, then cancel the load if it is still in
+       progress.  Otherwise, let the load continue, keeping 'this' in the cache
+       with no observers.  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 (!(progressTracker->GetProgress() & FLAG_LAST_PART_COMPLETE) &&
+        NS_FAILED(aStatus)) {
+      LOG_MSG(GetImgLog(), "imgRequest::RemoveProxy",
+              "load in progress.  canceling");
+
+      this->Cancel(NS_BINDING_ABORTED);
+    }
+
+    /* break the cycle from the cache entry. */
+    mCacheEntry = nullptr;
+  }
+
+  // If a proxy is removed for a reason other than its owner being
+  // changed, remove the proxy from the loadgroup.
+  if (aStatus != NS_IMAGELIB_CHANGING_OWNER) {
+    proxy->RemoveFromLoadGroup(true);
+  }
+
+  return NS_OK;
+}
+
+void
+imgRequest::CancelAndAbort(nsresult aStatus)
+{
+  LOG_SCOPE(GetImgLog(), "imgRequest::CancelAndAbort");
+
+  Cancel(aStatus);
+
+  // It's possible for the channel to fail to open after we've set our
+  // notification callbacks. In that case, make sure to break the cycle between
+  // the channel and us, because it won't.
+  if (mChannel) {
+    mChannel->SetNotificationCallbacks(mPrevChannelSink);
+    mPrevChannelSink = nullptr;
+  }
+}
+
+class imgRequestMainThreadCancel : public nsRunnable
+{
+public:
+  imgRequestMainThreadCancel(imgRequest* aImgRequest, nsresult aStatus)
+    : mImgRequest(aImgRequest)
+    , mStatus(aStatus)
+  {
+    MOZ_ASSERT(!NS_IsMainThread(), "Create me off main thread only!");
+    MOZ_ASSERT(aImgRequest);
+  }
+
+  NS_IMETHOD Run()
+  {
+    MOZ_ASSERT(NS_IsMainThread(), "I should be running on the main thread!");
+    mImgRequest->ContinueCancel(mStatus);
+    return NS_OK;
+  }
+private:
+  nsRefPtr<imgRequest> mImgRequest;
+  nsresult mStatus;
+};
+
+void
+imgRequest::Cancel(nsresult aStatus)
+{
+  /* The Cancel() method here should only be called by this class. */
+  LOG_SCOPE(GetImgLog(), "imgRequest::Cancel");
+
+  if (NS_IsMainThread()) {
+    ContinueCancel(aStatus);
+  } else {
+    NS_DispatchToMainThread(new imgRequestMainThreadCancel(this, aStatus));
+  }
+}
+
+void
+imgRequest::ContinueCancel(nsresult aStatus)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+  progressTracker->SyncNotifyProgress(FLAG_HAS_ERROR | FLAG_ONLOAD_UNBLOCKED);
+
+  RemoveFromCache();
+
+  if (mRequest && !(progressTracker->GetProgress() & FLAG_LAST_PART_COMPLETE)) {
+     mRequest->Cancel(aStatus);
+  }
+}
+
+class imgRequestMainThreadEvict : public nsRunnable
+{
+public:
+  explicit imgRequestMainThreadEvict(imgRequest* aImgRequest)
+    : mImgRequest(aImgRequest)
+  {
+    MOZ_ASSERT(!NS_IsMainThread(), "Create me off main thread only!");
+    MOZ_ASSERT(aImgRequest);
+  }
+
+  NS_IMETHOD Run()
+  {
+    MOZ_ASSERT(NS_IsMainThread(), "I should be running on the main thread!");
+    mImgRequest->ContinueEvict();
+    return NS_OK;
+  }
+private:
+  nsRefPtr<imgRequest> mImgRequest;
+};
+
+// EvictFromCache() is written to allowed to get called from any thread
+void
+imgRequest::EvictFromCache()
+{
+  /* The EvictFromCache() method here should only be called by this class. */
+  LOG_SCOPE(GetImgLog(), "imgRequest::EvictFromCache");
+
+  if (NS_IsMainThread()) {
+    ContinueEvict();
+  } else {
+    NS_DispatchToMainThread(new imgRequestMainThreadEvict(this));
+  }
+}
+
+// Helper-method used by EvictFromCache()
+void
+imgRequest::ContinueEvict()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  RemoveFromCache();
+}
+
+void
+imgRequest::RequestDecode()
+{
+  MutexAutoLock lock(mMutex);
+  mDecodeRequested = true;
+}
+
+bool
+imgRequest::IsDecodeRequested() const
+{
+  MutexAutoLock lock(mMutex);
+  return mDecodeRequested;
+}
+
+nsresult imgRequest::GetURI(ImageURL** aURI)
+{
+  MOZ_ASSERT(aURI);
+
+  LOG_FUNC(GetImgLog(), "imgRequest::GetURI");
+
+  if (mURI) {
+    *aURI = mURI;
+    NS_ADDREF(*aURI);
+    return NS_OK;
+  }
+
+  return NS_ERROR_FAILURE;
+}
+
+nsresult
+imgRequest::GetCurrentURI(nsIURI** aURI)
+{
+  MOZ_ASSERT(aURI);
+
+  LOG_FUNC(GetImgLog(), "imgRequest::GetCurrentURI");
+
+  if (mCurrentURI) {
+    *aURI = mCurrentURI;
+    NS_ADDREF(*aURI);
+    return NS_OK;
+  }
+
+  return NS_ERROR_FAILURE;
+}
+
+bool
+imgRequest::IsChrome() const
+{
+  bool isChrome = false;
+  if (NS_WARN_IF(NS_FAILED(mURI->SchemeIs("chrome", &isChrome)))) {
+    return false;
+  }
+  return isChrome;
+}
+
+nsresult
+imgRequest::GetImageErrorCode()
+{
+  return mImageErrorCode;
+}
+
+nsresult
+imgRequest::GetSecurityInfo(nsISupports** aSecurityInfo)
+{
+  LOG_FUNC(GetImgLog(), "imgRequest::GetSecurityInfo");
+
+  // Missing security info means this is not a security load
+  // i.e. it is not an error when security info is missing
+  NS_IF_ADDREF(*aSecurityInfo = mSecurityInfo);
+  return NS_OK;
+}
+
+void
+imgRequest::RemoveFromCache()
+{
+  LOG_SCOPE(GetImgLog(), "imgRequest::RemoveFromCache");
+
+  bool isInCache = false;
+
+  {
+    MutexAutoLock lock(mMutex);
+    isInCache = mIsInCache;
+  }
+
+  if (isInCache && mLoader) {
+    // mCacheEntry is nulled out when we have no more observers.
+    if (mCacheEntry) {
+      mLoader->RemoveFromCache(mCacheEntry);
+    } else {
+      mLoader->RemoveFromCache(ImageCacheKey(mURI));
+    }
+  }
+
+  mCacheEntry = nullptr;
+}
+
+bool
+imgRequest::HasConsumers() const
+{
+  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+  return progressTracker && progressTracker->ObserverCount() > 0;
+}
+
+already_AddRefed<Image>
+imgRequest::GetImage() const
+{
+  MutexAutoLock lock(mMutex);
+  nsRefPtr<Image> image = mImage;
+  return image.forget();
+}
+
+int32_t imgRequest::Priority() const
+{
+  int32_t priority = nsISupportsPriority::PRIORITY_NORMAL;
+  nsCOMPtr<nsISupportsPriority> p = do_QueryInterface(mRequest);
+  if (p) {
+    p->GetPriority(&priority);
+  }
+  return priority;
+}
+
+void
+imgRequest::AdjustPriority(imgRequestProxy* proxy, int32_t delta)
+{
+  // only the first proxy is allowed to modify the priority of this image load.
+  //
+  // XXX(darin): this is probably not the most optimal algorithm as we may want
+  // to increase the priority of requests that have a lot of proxies.  the key
+  // concern though is that image loads remain lower priority than other pieces
+  // of content such as link clicks, CSS, and JS.
+  //
+  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+  if (!progressTracker->FirstObserverIs(proxy)) {
+    return;
+  }
+
+  nsCOMPtr<nsISupportsPriority> p = do_QueryInterface(mChannel);
+  if (p) {
+    p->AdjustPriority(delta);
+  }
+}
+
+bool
+imgRequest::HasTransferredData() const
+{
+  MutexAutoLock lock(mMutex);
+  return mGotData;
+}
+
+void
+imgRequest::SetIsInCache(bool aInCache)
+{
+  LOG_FUNC_WITH_PARAM(GetImgLog(),
+                      "imgRequest::SetIsCacheable", "aInCache", aInCache);
+  MutexAutoLock lock(mMutex);
+  mIsInCache = aInCache;
+}
+
+void
+imgRequest::UpdateCacheEntrySize()
+{
+  if (!mCacheEntry) {
+    return;
+  }
+
+  nsRefPtr<Image> image = GetImage();
+  size_t size = image->SizeOfSourceWithComputedFallback(moz_malloc_size_of);
+  mCacheEntry->SetDataSize(size);
+}
+
+void
+imgRequest::SetCacheValidation(imgCacheEntry* aCacheEntry, nsIRequest* aRequest)
+{
+  /* get the expires info */
+  if (aCacheEntry) {
+    nsCOMPtr<nsICachingChannel> cacheChannel(do_QueryInterface(aRequest));
+    if (cacheChannel) {
+      nsCOMPtr<nsISupports> cacheToken;
+      cacheChannel->GetCacheToken(getter_AddRefs(cacheToken));
+      if (cacheToken) {
+        nsCOMPtr<nsICacheEntry> entryDesc(do_QueryInterface(cacheToken));
+        if (entryDesc) {
+          uint32_t expiration;
+          /* get the expiration time from the caching channel's token */
+          entryDesc->GetExpirationTime(&expiration);
+
+          // Expiration time defaults to 0. We set the expiration time on our
+          // entry if it hasn't been set yet.
+          if (aCacheEntry->GetExpiryTime() == 0) {
+            aCacheEntry->SetExpiryTime(expiration);
+          }
+        }
+      }
+    }
+
+    // Determine whether the cache entry must be revalidated when we try to use
+    // it. Currently, only HTTP specifies this information...
+    nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(aRequest));
+    if (httpChannel) {
+      bool bMustRevalidate = false;
+
+      httpChannel->IsNoStoreResponse(&bMustRevalidate);
+
+      if (!bMustRevalidate) {
+        httpChannel->IsNoCacheResponse(&bMustRevalidate);
+      }
+
+      if (!bMustRevalidate) {
+        nsAutoCString cacheHeader;
+
+        httpChannel->GetResponseHeader(NS_LITERAL_CSTRING("Cache-Control"),
+                                            cacheHeader);
+        if (PL_strcasestr(cacheHeader.get(), "must-revalidate")) {
+          bMustRevalidate = true;
+        }
+      }
+
+      // Cache entries default to not needing to validate. We ensure that
+      // multiple calls to this function don't override an earlier decision to
+      // validate by making validation a one-way decision.
+      if (bMustRevalidate) {
+        aCacheEntry->SetMustValidate(bMustRevalidate);
+      }
+    }
+  }
+}
+
+namespace { // anon
+
+already_AddRefed<nsIApplicationCache>
+GetApplicationCache(nsIRequest* aRequest)
+{
+  nsresult rv;
+
+  nsCOMPtr<nsIApplicationCacheChannel> appCacheChan =
+    do_QueryInterface(aRequest);
+  if (!appCacheChan) {
+    return nullptr;
+  }
+
+  bool fromAppCache;
+  rv = appCacheChan->GetLoadedFromApplicationCache(&fromAppCache);
+  NS_ENSURE_SUCCESS(rv, nullptr);
+
+  if (!fromAppCache) {
+    return nullptr;
+  }
+
+  nsCOMPtr<nsIApplicationCache> appCache;
+  rv = appCacheChan->GetApplicationCache(getter_AddRefs(appCache));
+  NS_ENSURE_SUCCESS(rv, nullptr);
+
+  return appCache.forget();
+}
+
+} // anon
+
+bool
+imgRequest::CacheChanged(nsIRequest* aNewRequest)
+{
+  nsCOMPtr<nsIApplicationCache> newAppCache = GetApplicationCache(aNewRequest);
+
+  // Application cache not involved at all or the same app cache involved
+  // in both of the loads (original and new).
+  if (newAppCache == mApplicationCache) {
+    return false;
+  }
+
+  // In a rare case it may happen that two objects still refer
+  // the same application cache version.
+  if (newAppCache && mApplicationCache) {
+    nsresult rv;
+
+    nsAutoCString oldAppCacheClientId, newAppCacheClientId;
+    rv = mApplicationCache->GetClientID(oldAppCacheClientId);
+    NS_ENSURE_SUCCESS(rv, true);
+    rv = newAppCache->GetClientID(newAppCacheClientId);
+    NS_ENSURE_SUCCESS(rv, true);
+
+    if (oldAppCacheClientId == newAppCacheClientId) {
+      return false;
+    }
+  }
+
+  // When we get here, app caches differ or app cache is involved
+  // just in one of the loads what we also consider as a change
+  // in a loading cache.
+  return true;
+}
+
+bool
+imgRequest::GetMultipart() const
+{
+  MutexAutoLock lock(mMutex);
+  return mIsMultiPartChannel;
+}
+
+bool
+imgRequest::HadInsecureRedirect() const
+{
+  MutexAutoLock lock(mMutex);
+  return mHadInsecureRedirect;
+}
+
+/** nsIRequestObserver methods **/
+
+/* void onStartRequest (in nsIRequest request, in nsISupports ctxt); */
+NS_IMETHODIMP
+imgRequest::OnStartRequest(nsIRequest* aRequest, nsISupports* ctxt)
+{
+  LOG_SCOPE(GetImgLog(), "imgRequest::OnStartRequest");
+
+  nsRefPtr<Image> image;
+
+  // Figure out if we're multipart.
+  nsCOMPtr<nsIMultiPartChannel> multiPartChannel = do_QueryInterface(aRequest);
+  MOZ_ASSERT(multiPartChannel || !mIsMultiPartChannel,
+             "Stopped being multipart?"); {
+    MutexAutoLock lock(mMutex);
+    mNewPartPending = true;
+    image = mImage;
+    mIsMultiPartChannel = bool(multiPartChannel);
+  }
+
+  // If we're not multipart, we shouldn't have an image yet.
+  if (image && !multiPartChannel) {
+    MOZ_ASSERT_UNREACHABLE("Already have an image for a non-multipart request");
+    Cancel(NS_IMAGELIB_ERROR_FAILURE);
+    return NS_ERROR_FAILURE;
+  }
+
+  /*
+   * If mRequest is null here, then we need to set it so that we'll be able to
+   * cancel it if our Cancel() method is called.  Note that this can only
+   * happen for multipart channels.  We could simply not null out mRequest for
+   * non-last parts, if GetIsLastPart() were reliable, but it's not.  See
+   * https://bugzilla.mozilla.org/show_bug.cgi?id=339610
+   */
+  if (!mRequest) {
+    MOZ_ASSERT(multiPartChannel, "Should have mRequest unless we're multipart");
+    nsCOMPtr<nsIChannel> baseChannel;
+    multiPartChannel->GetBaseChannel(getter_AddRefs(baseChannel));
+    mRequest = baseChannel;
+  }
+
+  nsCOMPtr<nsIChannel> channel(do_QueryInterface(aRequest));
+  if (channel) {
+    channel->GetSecurityInfo(getter_AddRefs(mSecurityInfo));
+
+    /* Get our principal */
+    nsCOMPtr<nsIScriptSecurityManager>
+      secMan = nsContentUtils::GetSecurityManager();
+    if (secMan) {
+      nsresult rv =
+        secMan->GetChannelResultPrincipal(channel, getter_AddRefs(mPrincipal));
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+    }
+  }
+
+  SetCacheValidation(mCacheEntry, aRequest);
+
+  mApplicationCache = GetApplicationCache(aRequest);
+
+  // Shouldn't we be dead already if this gets hit?
+  // Probably multipart/x-mixed-replace...
+  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+  if (progressTracker->ObserverCount() == 0) {
+    this->Cancel(NS_IMAGELIB_ERROR_FAILURE);
+  }
+
+  // Try to retarget OnDataAvailable to a decode thread.
+  nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(aRequest);
+  nsCOMPtr<nsIThreadRetargetableRequest> retargetable =
+    do_QueryInterface(aRequest);
+  if (httpChannel && retargetable) {
+    nsAutoCString mimeType;
+    nsresult rv = httpChannel->GetContentType(mimeType);
+    if (NS_SUCCEEDED(rv) && !mimeType.EqualsLiteral(IMAGE_SVG_XML)) {
+      // Retarget OnDataAvailable to the DecodePool's IO thread.
+      nsCOMPtr<nsIEventTarget> target =
+        DecodePool::Singleton()->GetIOEventTarget();
+      rv = retargetable->RetargetDeliveryTo(target);
+    }
+    MOZ_LOG(GetImgLog(), PR_LOG_WARNING,
+           ("[this=%p] imgRequest::OnStartRequest -- "
+            "RetargetDeliveryTo rv %d=%s\n",
+            this, rv, NS_SUCCEEDED(rv) ? "succeeded" : "failed"));
+  }
+
+  return NS_OK;
+}
+
+/* void onStopRequest (in nsIRequest request, in nsISupports ctxt,
+                       nsresult status); */
+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");
+
+  nsRefPtr<Image> image = GetImage();
+
+  // XXXldb What if this is a non-last part of a multipart request?
+  // xxx before we release our reference to mRequest, lets
+  // save the last status that we saw so that the
+  // imgRequestProxy will have access to it.
+  if (mRequest) {
+    mRequest = nullptr;  // we no longer need the request
+  }
+
+  // stop holding a ref to the channel, since we don't need it anymore
+  if (mChannel) {
+    mChannel->SetNotificationCallbacks(mPrevChannelSink);
+    mPrevChannelSink = nullptr;
+    mChannel = nullptr;
+  }
+
+  bool lastPart = true;
+  nsCOMPtr<nsIMultiPartChannel> mpchan(do_QueryInterface(aRequest));
+  if (mpchan) {
+    mpchan->GetIsLastPart(&lastPart);
+  }
+
+  bool isPartial = false;
+  if (image && (status == NS_ERROR_NET_PARTIAL_TRANSFER)) {
+    isPartial = true;
+    status = NS_OK; // fake happy face
+  }
+
+  // Tell the image that it has all of the source data. Note that this can
+  // trigger a failure, since the image might be waiting for more non-optional
+  // data and this is the point where we break the news that it's not coming.
+  if (image) {
+    nsresult rv = image->OnImageDataComplete(aRequest, ctxt, status, lastPart);
+
+    // If we got an error in the OnImageDataComplete() call, we don't want to
+    // proceed as if nothing bad happened. However, we also want to give
+    // precedence to failure status codes from necko, since presumably they're
+    // more meaningful.
+    if (NS_FAILED(rv) && NS_SUCCEEDED(status)) {
+      status = rv;
+    }
+  }
+
+  // If the request went through, update the cache entry size. Otherwise,
+  // cancel the request, which removes us from the cache.
+  if (image && NS_SUCCEEDED(status) && !isPartial) {
+    // We update the cache entry size here because this is where we finish
+    // loading compressed source data, which is part of our size calculus.
+    UpdateCacheEntrySize();
+
+  } else if (isPartial) {
+    // Remove the partial image from the cache.
+    this->EvictFromCache();
+
+  } else {
+    mImageErrorCode = status;
+
+    // if the error isn't "just" a partial transfer
+    // stops animations, removes from cache
+    this->Cancel(status);
+  }
+
+  if (!image) {
+    // We have to fire the OnStopRequest notifications ourselves because there's
+    // no image capable of doing so.
+    Progress progress =
+      LoadCompleteProgress(lastPart, /* aError = */ false, status);
+
+    nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+    progressTracker->SyncNotifyProgress(progress);
+  }
+
+  mTimedChannel = nullptr;
+  return NS_OK;
+}
+
+struct mimetype_closure
+{
+  nsACString* newType;
+};
+
+/* prototype for these defined below */
+static NS_METHOD
+sniff_mimetype_callback(nsIInputStream* in, void* closure,
+                        const char* fromRawSegment, uint32_t toOffset,
+                        uint32_t count, uint32_t* writeCount);
+
+/** nsThreadRetargetableStreamListener methods **/
+NS_IMETHODIMP
+imgRequest::CheckListenerChain()
+{
+  // TODO Might need more checking here.
+  NS_ASSERTION(NS_IsMainThread(), "Should be on the main thread!");
+  return NS_OK;
+}
+
+/** nsIStreamListener methods **/
+
+struct NewPartResult final
+{
+  explicit NewPartResult(Image* aExistingImage)
+    : mImage(aExistingImage)
+    , mIsFirstPart(!aExistingImage)
+    , mSucceeded(false)
+  { }
+
+  nsAutoCString mContentType;
+  nsAutoCString mContentDisposition;
+  nsRefPtr<Image> mImage;
+  const bool mIsFirstPart;
+  bool mSucceeded;
+};
+
+static NewPartResult
+PrepareForNewPart(nsIRequest* aRequest, nsIInputStream* aInStr, uint32_t aCount,
+                  ImageURL* aURI, bool aIsMultipart, Image* aExistingImage,
+                  ProgressTracker* aProgressTracker, uint32_t aInnerWindowId)
+{
+  NewPartResult result(aExistingImage);
+
+  mimetype_closure closure;
+  closure.newType = &result.mContentType;
+
+  // Look at the first few bytes and see if we can tell what the data is from
+  // that since servers tend to lie. :(
+  uint32_t out;
+  aInStr->ReadSegments(sniff_mimetype_callback, &closure, aCount, &out);
+
+  nsCOMPtr<nsIChannel> chan(do_QueryInterface(aRequest));
+  if (result.mContentType.IsEmpty()) {
+    nsresult rv = NS_ERROR_FAILURE;
+    if (chan) {
+      rv = chan->GetContentType(result.mContentType);
+      chan->GetContentDispositionHeader(result.mContentDisposition);
+    }
+
+    if (NS_FAILED(rv)) {
+      MOZ_LOG(GetImgLog(),
+             PR_LOG_ERROR, ("imgRequest::PrepareForNewPart "
+                            "-- Content type unavailable from the channel\n"));
+      return result;
+    }
+  }
+
+  MOZ_LOG(GetImgLog(), PR_LOG_DEBUG,
+         ("imgRequest::PrepareForNewPart -- Got content type %s\n",
+          result.mContentType.get()));
+
+  // XXX If server lied about mimetype and it's SVG, we may need to copy
+  // the data and dispatch back to the main thread, AND tell the channel to
+  // dispatch there in the future.
+
+  // Create the new image and give it ownership of our ProgressTracker.
+  if (aIsMultipart) {
+    // Create the ProgressTracker and image for this part.
+    nsRefPtr<ProgressTracker> progressTracker = new ProgressTracker();
+    nsRefPtr<Image> partImage =
+      ImageFactory::CreateImage(aRequest, progressTracker, result.mContentType,
+                                aURI, /* aIsMultipart = */ true,
+                                aInnerWindowId);
+
+    if (result.mIsFirstPart) {
+      // First part for a multipart channel. Create the MultipartImage wrapper.
+      MOZ_ASSERT(aProgressTracker, "Shouldn't have given away tracker yet");
+      result.mImage =
+        ImageFactory::CreateMultipartImage(partImage, aProgressTracker);
+    } else {
+      // Transition to the new part.
+      auto multipartImage = static_cast<MultipartImage*>(aExistingImage);
+      multipartImage->BeginTransitionToPart(partImage);
+    }
+  } else {
+    MOZ_ASSERT(!aExistingImage, "New part for non-multipart channel?");
+    MOZ_ASSERT(aProgressTracker, "Shouldn't have given away tracker yet");
+
+    // Create an image using our progress tracker.
+    result.mImage =
+      ImageFactory::CreateImage(aRequest, aProgressTracker, result.mContentType,
+                                aURI, /* aIsMultipart = */ false,
+                                aInnerWindowId);
+  }
+
+  MOZ_ASSERT(result.mImage);
+  if (!result.mImage->HasError() || aIsMultipart) {
+    // We allow multipart images to fail to initialize (which generally
+    // indicates a bad content type) without cancelling the load, because
+    // subsequent parts might be fine.
+    result.mSucceeded = true;
+  }
+
+  return result;
+}
+
+class FinishPreparingForNewPartRunnable final : public nsRunnable
+{
+public:
+  FinishPreparingForNewPartRunnable(imgRequest* aImgRequest,
+                                    NewPartResult&& aResult)
+    : mImgRequest(aImgRequest)
+    , mResult(aResult)
+  {
+    MOZ_ASSERT(aImgRequest);
+  }
+
+  NS_IMETHOD Run() override
+  {
+    mImgRequest->FinishPreparingForNewPart(mResult);
+    return NS_OK;
+  }
+
+private:
+  nsRefPtr<imgRequest> mImgRequest;
+  NewPartResult mResult;
+};
+
+void
+imgRequest::FinishPreparingForNewPart(const NewPartResult& aResult)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  mContentType = aResult.mContentType;
+
+  SetProperties(aResult.mContentType, aResult.mContentDisposition);
+
+  if (aResult.mIsFirstPart) {
+    // Notify listeners that we have an image.
+    nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+    progressTracker->OnImageAvailable();
+    MOZ_ASSERT(progressTracker->HasImage());
+  }
+
+  if (IsDecodeRequested()) {
+    aResult.mImage->RequestDecode();
+  }
+}
+
+NS_IMETHODIMP
+imgRequest::OnDataAvailable(nsIRequest* aRequest, nsISupports* aContext,
+                            nsIInputStream* aInStr, uint64_t aOffset,
+                            uint32_t aCount)
+{
+  LOG_SCOPE_WITH_PARAM(GetImgLog(), "imgRequest::OnDataAvailable",
+                       "count", aCount);
+
+  NS_ASSERTION(aRequest, "imgRequest::OnDataAvailable -- no request!");
+
+  nsRefPtr<Image> image;
+  nsRefPtr<ProgressTracker> progressTracker;
+  bool isMultipart = false;
+  bool newPartPending = false;
+
+  // Retrieve and update our state.
+  {
+    MutexAutoLock lock(mMutex);
+    mGotData = true;
+    image = mImage;
+    progressTracker = mProgressTracker;
+    isMultipart = mIsMultiPartChannel;
+    newPartPending = mNewPartPending;
+    mNewPartPending = false;
+  }
+
+  // If this is a new part, we need to sniff its content type and create an
+  // appropriate image.
+  if (newPartPending) {
+    NewPartResult result = PrepareForNewPart(aRequest, aInStr, aCount, mURI,
+                                             isMultipart, image,
+                                             progressTracker, mInnerWindowId);
+    bool succeeded = result.mSucceeded;
+
+    if (result.mImage) {
+      image = result.mImage;
+
+      // Update our state to reflect this new part.
+      {
+        MutexAutoLock lock(mMutex);
+        mImage = image;
+        mProgressTracker = nullptr;
+      }
+
+      // Some property objects are not threadsafe, and we need to send
+      // OnImageAvailable on the main thread, so finish on the main thread.
+      if (NS_IsMainThread()) {
+        FinishPreparingForNewPart(result);
+      } else {
+        nsCOMPtr<nsIRunnable> runnable =
+          new FinishPreparingForNewPartRunnable(this, Move(result));
+        NS_DispatchToMainThread(runnable);
+      }
+    }
+
+    if (!succeeded) {
+      // Something went wrong; probably a content type issue.
+      Cancel(NS_IMAGELIB_ERROR_FAILURE);
+      return NS_BINDING_ABORTED;
+    }
+  }
+
+  // Notify the image that it has new data.
+  nsresult rv =
+    image->OnImageDataAvailable(aRequest, aContext, aInStr, aOffset, aCount);
+
+  if (NS_FAILED(rv)) {
+    MOZ_LOG(GetImgLog(), PR_LOG_WARNING,
+           ("[this=%p] imgRequest::OnDataAvailable -- "
+            "copy to RasterImage failed\n", this));
+    Cancel(NS_IMAGELIB_ERROR_FAILURE);
+    return NS_BINDING_ABORTED;
+  }
+
+  return NS_OK;
+}
+
+void
+imgRequest::SetProperties(const nsACString& aContentType,
+                          const nsACString& aContentDisposition)
+{
+  /* set our mimetype as a property */
+  nsCOMPtr<nsISupportsCString> contentType =
+    do_CreateInstance("@mozilla.org/supports-cstring;1");
+  if (contentType) {
+    contentType->SetData(aContentType);
+    mProperties->Set("type", contentType);
+  }
+
+  /* set our content disposition as a property */
+  if (!aContentDisposition.IsEmpty()) {
+    nsCOMPtr<nsISupportsCString> contentDisposition =
+      do_CreateInstance("@mozilla.org/supports-cstring;1");
+    if (contentDisposition) {
+      contentDisposition->SetData(aContentDisposition);
+      mProperties->Set("content-disposition", contentDisposition);
+    }
+  }
+}
+
+static NS_METHOD
+sniff_mimetype_callback(nsIInputStream* in,
+                        void* data,
+                        const char* fromRawSegment,
+                        uint32_t toOffset,
+                        uint32_t count,
+                        uint32_t* writeCount)
+{
+  mimetype_closure* closure = static_cast<mimetype_closure*>(data);
+
+  NS_ASSERTION(closure, "closure is null!");
+
+  if (count > 0) {
+    imgLoader::GetMimeTypeFromContent(fromRawSegment, count, *closure->newType);
+  }
+
+  *writeCount = 0;
+  return NS_ERROR_FAILURE;
+}
+
+
+/** nsIInterfaceRequestor methods **/
+
+NS_IMETHODIMP
+imgRequest::GetInterface(const nsIID & aIID, void** aResult)
+{
+  if (!mPrevChannelSink || aIID.Equals(NS_GET_IID(nsIChannelEventSink))) {
+    return QueryInterface(aIID, aResult);
+  }
+
+  NS_ASSERTION(mPrevChannelSink != this,
+    "Infinite recursion - don't keep track of channel sinks that are us!");
+  return mPrevChannelSink->GetInterface(aIID, aResult);
+}
+
+/** nsIChannelEventSink methods **/
+NS_IMETHODIMP
+imgRequest::AsyncOnChannelRedirect(nsIChannel* oldChannel,
+                                   nsIChannel* newChannel, uint32_t flags,
+                                   nsIAsyncVerifyRedirectCallback* callback)
+{
+  NS_ASSERTION(mRequest && mChannel,
+               "Got a channel redirect after we nulled out mRequest!");
+  NS_ASSERTION(mChannel == oldChannel,
+               "Got a channel redirect for an unknown channel!");
+  NS_ASSERTION(newChannel, "Got a redirect to a NULL channel!");
+
+  SetCacheValidation(mCacheEntry, oldChannel);
+
+  // Prepare for callback
+  mRedirectCallback = callback;
+  mNewRedirectChannel = newChannel;
+
+  nsCOMPtr<nsIChannelEventSink> sink(do_GetInterface(mPrevChannelSink));
+  if (sink) {
+    nsresult rv = sink->AsyncOnChannelRedirect(oldChannel, newChannel, flags,
+                                               this);
+    if (NS_FAILED(rv)) {
+        mRedirectCallback = nullptr;
+        mNewRedirectChannel = nullptr;
+    }
+    return rv;
+  }
+
+  (void) OnRedirectVerifyCallback(NS_OK);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+imgRequest::OnRedirectVerifyCallback(nsresult result)
+{
+  NS_ASSERTION(mRedirectCallback, "mRedirectCallback not set in callback");
+  NS_ASSERTION(mNewRedirectChannel, "mNewRedirectChannel not set in callback");
+
+  if (NS_FAILED(result)) {
+      mRedirectCallback->OnRedirectVerifyCallback(result);
+      mRedirectCallback = nullptr;
+      mNewRedirectChannel = nullptr;
+      return NS_OK;
+  }
+
+  mChannel = mNewRedirectChannel;
+  mTimedChannel = do_QueryInterface(mChannel);
+  mNewRedirectChannel = nullptr;
+
+  if (LOG_TEST(PR_LOG_DEBUG)) {
+    nsAutoCString spec;
+    if (mCurrentURI) {
+      mCurrentURI->GetSpec(spec);
+    }
+    LOG_MSG_WITH_PARAM(GetImgLog(),
+                       "imgRequest::OnChannelRedirect", "old", spec.get());
+  }
+
+  // If the previous URI is a non-HTTPS URI, record that fact for later use by
+  // security code, which needs to know whether there is an insecure load at any
+  // point in the redirect chain.
+  bool isHttps = false;
+  bool isChrome = false;
+  bool schemeLocal = false;
+  if (NS_FAILED(mCurrentURI->SchemeIs("https", &isHttps)) ||
+      NS_FAILED(mCurrentURI->SchemeIs("chrome", &isChrome)) ||
+      NS_FAILED(NS_URIChainHasFlags(mCurrentURI,
+                                    nsIProtocolHandler::URI_IS_LOCAL_RESOURCE,
+                                    &schemeLocal))  ||
+      (!isHttps && !isChrome && !schemeLocal)) {
+    MutexAutoLock lock(mMutex);
+    mHadInsecureRedirect = true;
+  }
+
+  // Update the current URI.
+  mChannel->GetURI(getter_AddRefs(mCurrentURI));
+
+  if (LOG_TEST(PR_LOG_DEBUG)) {
+    nsAutoCString spec;
+    if (mCurrentURI) {
+      mCurrentURI->GetSpec(spec);
+    }
+    LOG_MSG_WITH_PARAM(GetImgLog(), "imgRequest::OnChannelRedirect",
+                       "new", spec.get());
+  }
+
+  // Make sure we have a protocol that returns data rather than opens an
+  // external application, e.g. 'mailto:'.
+  bool doesNotReturnData = false;
+  nsresult rv =
+    NS_URIChainHasFlags(mCurrentURI,
+                        nsIProtocolHandler::URI_DOES_NOT_RETURN_DATA,
+                        &doesNotReturnData);
+
+  if (NS_SUCCEEDED(rv) && doesNotReturnData) {
+    rv = NS_ERROR_ABORT;
+  }
+
+  if (NS_FAILED(rv)) {
+    mRedirectCallback->OnRedirectVerifyCallback(rv);
+    mRedirectCallback = nullptr;
+    return NS_OK;
+  }
+
+  mRedirectCallback->OnRedirectVerifyCallback(NS_OK);
+  mRedirectCallback = nullptr;
+  return NS_OK;
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/imgRequest.h firefox-trunk-41.0~a1~hg20150524r245419/image/imgRequest.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/imgRequest.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/imgRequest.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,290 @@
+/* -*- 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_image_imgRequest_h
+#define mozilla_image_imgRequest_h
+
+#include "nsIChannelEventSink.h"
+#include "nsIInterfaceRequestor.h"
+#include "nsIStreamListener.h"
+#include "nsIThreadRetargetableStreamListener.h"
+#include "nsIPrincipal.h"
+
+#include "nsAutoPtr.h"
+#include "nsCOMPtr.h"
+#include "nsProxyRelease.h"
+#include "nsStringGlue.h"
+#include "nsError.h"
+#include "nsIAsyncVerifyRedirectCallback.h"
+#include "mozilla/Mutex.h"
+#include "mozilla/net/ReferrerPolicy.h"
+#include "ImageCacheKey.h"
+
+class imgCacheValidator;
+class imgLoader;
+class imgRequestProxy;
+class imgCacheEntry;
+class nsIApplicationCache;
+class nsIProperties;
+class nsIRequest;
+class nsITimedChannel;
+class nsIURI;
+
+namespace mozilla {
+namespace image {
+class Image;
+class ImageURL;
+class ProgressTracker;
+} // namespace image
+} // namespace mozilla
+
+struct NewPartResult;
+
+class imgRequest final : public nsIStreamListener,
+                         public nsIThreadRetargetableStreamListener,
+                         public nsIChannelEventSink,
+                         public nsIInterfaceRequestor,
+                         public nsIAsyncVerifyRedirectCallback
+{
+  typedef mozilla::image::Image Image;
+  typedef mozilla::image::ImageCacheKey ImageCacheKey;
+  typedef mozilla::image::ImageURL ImageURL;
+  typedef mozilla::image::ProgressTracker ProgressTracker;
+  typedef mozilla::net::ReferrerPolicy ReferrerPolicy;
+
+public:
+  imgRequest(imgLoader* aLoader, const ImageCacheKey& aCacheKey);
+
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_NSISTREAMLISTENER
+  NS_DECL_NSITHREADRETARGETABLESTREAMLISTENER
+  NS_DECL_NSIREQUESTOBSERVER
+  NS_DECL_NSICHANNELEVENTSINK
+  NS_DECL_NSIINTERFACEREQUESTOR
+  NS_DECL_NSIASYNCVERIFYREDIRECTCALLBACK
+
+  nsresult Init(nsIURI* aURI,
+                nsIURI* aCurrentURI,
+                bool aHadInsecureRedirect,
+                nsIRequest* aRequest,
+                nsIChannel* aChannel,
+                imgCacheEntry* aCacheEntry,
+                nsISupports* aCX,
+                nsIPrincipal* aLoadingPrincipal,
+                int32_t aCORSMode,
+                ReferrerPolicy aReferrerPolicy);
+
+  void ClearLoader();
+
+  // Callers must call imgRequestProxy::Notify later.
+  void AddProxy(imgRequestProxy* proxy);
+
+  nsresult RemoveProxy(imgRequestProxy* proxy, nsresult aStatus);
+
+  // Cancel, but also ensure that all work done in Init() is undone. Call this
+  // only when the channel has failed to open, and so calling Cancel() on it
+  // won't be sufficient.
+  void CancelAndAbort(nsresult aStatus);
+
+  // Called or dispatched by cancel for main thread only execution.
+  void ContinueCancel(nsresult aStatus);
+
+  // Called or dispatched by EvictFromCache for main thread only execution.
+  void ContinueEvict();
+
+  // Request that we start decoding the image as soon as data becomes available.
+  void RequestDecode();
+
+  inline uint64_t InnerWindowID() const {
+    return mInnerWindowId;
+  }
+
+  // Set the cache validation information (expiry time, whether we must
+  // validate, etc) on the cache entry based on the request information.
+  // If this function is called multiple times, the information set earliest
+  // wins.
+  static void SetCacheValidation(imgCacheEntry* aEntry, nsIRequest* aRequest);
+
+  // Check if application cache of the original load is different from
+  // application cache of the new load.  Also lack of application cache
+  // on one of the loads is considered a change of a loading cache since
+  // HTTP cache may contain a different data then app cache.
+  bool CacheChanged(nsIRequest* aNewRequest);
+
+  bool GetMultipart() const;
+
+  // Returns whether we went through an insecure (non-HTTPS) redirect at some
+  // point during loading. This does not consider the current URI.
+  bool HadInsecureRedirect() const;
+
+  // 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
+  {
+    nsCOMPtr<nsIPrincipal> principal = mLoadingPrincipal;
+    return principal.forget();
+  }
+
+  // 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<ProgressTracker> GetProgressTracker() const;
+
+  /// Returns the Image associated with this imgRequest, if it's ready.
+  already_AddRefed<Image> GetImage() const;
+
+  // Get the current principal of the image. No AddRefing.
+  inline nsIPrincipal* GetPrincipal() const { return mPrincipal.get(); }
+
+  /// Get the ImageCacheKey associated with this request.
+  const ImageCacheKey& CacheKey() const { return mCacheKey; }
+
+  // Resize the cache entry to 0 if it exists
+  void ResetCacheEntry();
+
+  // OK to use on any thread.
+  nsresult GetURI(ImageURL** aURI);
+  nsresult GetCurrentURI(nsIURI** aURI);
+  bool IsChrome() const;
+
+  nsresult GetImageErrorCode(void);
+
+  /// Returns true if we've received any data.
+  bool HasTransferredData() const;
+
+  /// Returns a non-owning pointer to this imgRequest's MIME type.
+  const char* GetMimeType() const { return mContentType.get(); }
+
+  /// @return the priority of the underlying network request, or
+  /// PRIORITY_NORMAL if it doesn't support nsISupportsPriority.
+  int32_t Priority() const;
+
+  /// Adjust the priority of the underlying network request by @aDelta on behalf
+  /// of @aProxy.
+  void AdjustPriority(imgRequestProxy* aProxy, int32_t aDelta);
+
+  /// Returns a weak pointer to the underlying request.
+  nsIRequest* GetRequest() const { return mRequest; }
+
+  nsITimedChannel* GetTimedChannel() const { return mTimedChannel; }
+
+  nsresult GetSecurityInfo(nsISupports** aSecurityInfoOut);
+
+  imgCacheValidator* GetValidator() const { return mValidator; }
+  void SetValidator(imgCacheValidator* aValidator) { mValidator = aValidator; }
+
+  void* LoadId() const { return mLoadId; }
+  void SetLoadId(void* aLoadId) { mLoadId = aLoadId; }
+
+  /// Reset the cache entry after we've dropped our reference to it. Used by
+  /// imgLoader when our cache entry is re-requested after we've dropped our
+  /// reference to it.
+  void SetCacheEntry(imgCacheEntry* aEntry);
+
+  /// Returns whether we've got a reference to the cache entry.
+  bool HasCacheEntry() const;
+
+  /// Set whether this request is stored in the cache. If it isn't, regardless
+  /// of whether this request has a non-null mCacheEntry, this imgRequest won't
+  /// try to update or modify the image cache.
+  void SetIsInCache(bool aCacheable);
+
+  void EvictFromCache();
+  void RemoveFromCache();
+
+  // Sets properties for this image; will dispatch to main thread if needed.
+  void SetProperties(const nsACString& aContentType,
+                     const nsACString& aContentDisposition);
+
+  nsIProperties* Properties() const { return mProperties; }
+
+  bool HasConsumers() const;
+
+private:
+  friend class FinishPreparingForNewPartRunnable;
+
+  virtual ~imgRequest();
+
+  void FinishPreparingForNewPart(const NewPartResult& aResult);
+
+  void Cancel(nsresult aStatus);
+
+  // Update the cache entry size based on the image container.
+  void UpdateCacheEntrySize();
+
+  /// Returns true if RequestDecode() was called.
+  bool IsDecodeRequested() const;
+
+  // Weak reference to parent loader; this request cannot outlive its owner.
+  imgLoader* mLoader;
+  nsCOMPtr<nsIRequest> mRequest;
+  // The original URI we were loaded with. This is the same as the URI we are
+  // keyed on in the cache. We store a string here to avoid off main thread
+  // refcounting issues with nsStandardURL.
+  nsRefPtr<ImageURL> mURI;
+  // The URI of the resource we ended up loading after all redirects, etc.
+  nsCOMPtr<nsIURI> mCurrentURI;
+  // The principal of the document which loaded this image. Used when
+  // validating for CORS.
+  nsCOMPtr<nsIPrincipal> mLoadingPrincipal;
+  // The principal of this image.
+  nsCOMPtr<nsIPrincipal> mPrincipal;
+  nsCOMPtr<nsIProperties> mProperties;
+  nsCOMPtr<nsISupports> mSecurityInfo;
+  nsCOMPtr<nsIChannel> mChannel;
+  nsCOMPtr<nsIInterfaceRequestor> mPrevChannelSink;
+  nsCOMPtr<nsIApplicationCache> mApplicationCache;
+
+  nsCOMPtr<nsITimedChannel> mTimedChannel;
+
+  nsCString mContentType;
+
+  /* we hold on to this to this so long as we have observers */
+  nsRefPtr<imgCacheEntry> mCacheEntry;
+
+  /// The key under which this imgRequest is stored in the image cache.
+  ImageCacheKey mCacheKey;
+
+  void* mLoadId;
+
+  imgCacheValidator* mValidator;
+  nsCOMPtr<nsIAsyncVerifyRedirectCallback> mRedirectCallback;
+  nsCOMPtr<nsIChannel> mNewRedirectChannel;
+
+  // The ID of the inner window origin, used for error reporting.
+  uint64_t mInnerWindowId;
+
+  // The CORS mode (defined in imgIRequest) this image was loaded with. By
+  // default, imgIRequest::CORS_NONE.
+  int32_t mCORSMode;
+
+  // The Referrer Policy (defined in ReferrerPolicy.h) used for this image.
+  ReferrerPolicy mReferrerPolicy;
+
+  nsresult mImageErrorCode;
+
+  mutable mozilla::Mutex mMutex;
+
+  // Member variables protected by mMutex. Note that *all* flags in our bitfield
+  // are protected by mMutex; if you're adding a new flag that isn'protected, it
+  // must not be a part of this bitfield.
+  nsRefPtr<ProgressTracker> mProgressTracker;
+  nsRefPtr<Image> mImage;
+  bool mIsMultiPartChannel : 1;
+  bool mGotData : 1;
+  bool mIsInCache : 1;
+  bool mDecodeRequested : 1;
+  bool mNewPartPending : 1;
+  bool mHadInsecureRedirect : 1;
+};
+
+#endif // mozilla_image_imgRequest_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/imgRequestProxy.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/imgRequestProxy.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/imgRequestProxy.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/imgRequestProxy.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,1152 @@
+/* -*- 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 "imgRequestProxy.h"
+#include "imgIOnloadBlocker.h"
+#include "imgLoader.h"
+#include "Image.h"
+#include "ImageOps.h"
+#include "nsError.h"
+#include "nsCRTGlue.h"
+#include "imgINotificationObserver.h"
+#include "nsNetUtil.h"
+
+using namespace mozilla::image;
+
+// The split of imgRequestProxy and imgRequestProxyStatic means that
+// certain overridden functions need to be usable in the destructor.
+// Since virtual functions can't be used in that way, this class
+// provides a behavioural trait for each class to use instead.
+class ProxyBehaviour
+{
+ public:
+  virtual ~ProxyBehaviour() {}
+
+  virtual already_AddRefed<mozilla::image::Image> GetImage() const = 0;
+  virtual bool HasImage() const = 0;
+  virtual already_AddRefed<ProgressTracker> GetProgressTracker() const = 0;
+  virtual imgRequest* GetOwner() const = 0;
+  virtual void SetOwner(imgRequest* aOwner) = 0;
+};
+
+class RequestBehaviour : public ProxyBehaviour
+{
+ public:
+  RequestBehaviour() : mOwner(nullptr), mOwnerHasImage(false) {}
+
+  virtual already_AddRefed<mozilla::image::Image>GetImage() const override;
+  virtual bool HasImage() const override;
+  virtual already_AddRefed<ProgressTracker> GetProgressTracker() const override;
+
+  virtual imgRequest* GetOwner() const override {
+    return mOwner;
+  }
+
+  virtual void SetOwner(imgRequest* aOwner) override {
+    mOwner = aOwner;
+
+    if (mOwner) {
+      nsRefPtr<ProgressTracker> ownerProgressTracker = GetProgressTracker();
+      mOwnerHasImage = ownerProgressTracker && ownerProgressTracker->HasImage();
+    } else {
+      mOwnerHasImage = false;
+    }
+  }
+
+ private:
+  // We maintain the following invariant:
+  // The proxy is registered at most with a single imgRequest as an observer,
+  // and whenever it is, mOwner points to that object. This helps ensure that
+  // imgRequestProxy::~imgRequestProxy unregisters the proxy as an observer
+  // from whatever request it was registered with (if any). This, in turn,
+  // means that imgRequest::mObservers will not have any stale pointers in it.
+  nsRefPtr<imgRequest> mOwner;
+
+  bool mOwnerHasImage;
+};
+
+already_AddRefed<mozilla::image::Image>
+RequestBehaviour::GetImage() const
+{
+  if (!mOwnerHasImage) {
+    return nullptr;
+  }
+  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+  return progressTracker->GetImage();
+}
+
+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->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)
+NS_IMPL_RELEASE(imgRequestProxy)
+
+NS_INTERFACE_MAP_BEGIN(imgRequestProxy)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, imgIRequest)
+  NS_INTERFACE_MAP_ENTRY(imgIRequest)
+  NS_INTERFACE_MAP_ENTRY(nsIRequest)
+  NS_INTERFACE_MAP_ENTRY(nsISupportsPriority)
+  NS_INTERFACE_MAP_ENTRY(nsISecurityInfoProvider)
+  NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsITimedChannel,
+                                     TimedChannel() != nullptr)
+NS_INTERFACE_MAP_END
+
+imgRequestProxy::imgRequestProxy() :
+  mBehaviour(new RequestBehaviour),
+  mURI(nullptr),
+  mListener(nullptr),
+  mLoadFlags(nsIRequest::LOAD_NORMAL),
+  mLockCount(0),
+  mAnimationConsumers(0),
+  mCanceled(false),
+  mIsInLoadGroup(false),
+  mListenerIsStrongRef(false),
+  mDecodeRequested(false),
+  mDeferNotifications(false)
+{
+  /* member initializers and constructor code */
+
+}
+
+imgRequestProxy::~imgRequestProxy()
+{
+  /* destructor code */
+  NS_PRECONDITION(!mListener,
+                  "Someone forgot to properly cancel this request!");
+
+  // Unlock the image the proper number of times if we're holding locks on
+  // it. Note that UnlockImage() decrements mLockCount each time it's called.
+  while (mLockCount) {
+    UnlockImage();
+  }
+
+  ClearAnimationConsumers();
+
+  // Explicitly set mListener to null to ensure that the RemoveProxy
+  // call below can't send |this| to an arbitrary listener while |this|
+  // is being destroyed.  This is all belt-and-suspenders in view of the
+  // above assert.
+  NullOutListener();
+
+  if (GetOwner()) {
+    /* Call RemoveProxy with a successful status.  This will keep the
+       channel, if still downloading data, from being canceled if 'this' is
+       the last observer.  This allows the image to continue to download and
+       be cached even if no one is using it currently.
+    */
+    mCanceled = true;
+    GetOwner()->RemoveProxy(this, NS_OK);
+  }
+}
+
+nsresult
+imgRequestProxy::Init(imgRequest* aOwner,
+                      nsILoadGroup* aLoadGroup,
+                      ImageURL* aURI,
+                      imgINotificationObserver* aObserver)
+{
+  NS_PRECONDITION(!GetOwner() && !mListener,
+                  "imgRequestProxy is already initialized");
+
+  LOG_SCOPE_WITH_PARAM(GetImgLog(), "imgRequestProxy::Init", "request",
+                       aOwner);
+
+  MOZ_ASSERT(mAnimationConsumers == 0, "Cannot have animation before Init");
+
+  mBehaviour->SetOwner(aOwner);
+  mListener = aObserver;
+  // Make sure to addref mListener before the AddProxy call below, since
+  // that call might well want to release it if the imgRequest has
+  // already seen OnStopRequest.
+  if (mListener) {
+    mListenerIsStrongRef = true;
+    NS_ADDREF(mListener);
+  }
+  mLoadGroup = aLoadGroup;
+  mURI = aURI;
+
+  // Note: AddProxy won't send all the On* notifications immediately
+  if (GetOwner()) {
+    GetOwner()->AddProxy(this);
+  }
+
+  return NS_OK;
+}
+
+nsresult
+imgRequestProxy::ChangeOwner(imgRequest* aNewOwner)
+{
+  NS_PRECONDITION(GetOwner(),
+                  "Cannot ChangeOwner on a proxy without an owner!");
+
+  if (mCanceled) {
+    // Ensure that this proxy has received all notifications to date
+    // before we clean it up when removing it from the old owner below.
+    SyncNotifyListener();
+  }
+
+  // If we're holding locks, unlock the old image.
+  // Note that UnlockImage decrements mLockCount each time it's called.
+  uint32_t oldLockCount = mLockCount;
+  while (mLockCount) {
+    UnlockImage();
+  }
+
+  // If we're holding animation requests, undo them.
+  uint32_t oldAnimationConsumers = mAnimationConsumers;
+  ClearAnimationConsumers();
+
+  // Were we decoded before?
+  bool wasDecoded = false;
+  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+  if (progressTracker->HasImage() &&
+      progressTracker->GetImageStatus() &
+        imgIRequest::STATUS_FRAME_COMPLETE) {
+    wasDecoded = true;
+  }
+
+  GetOwner()->RemoveProxy(this, NS_IMAGELIB_CHANGING_OWNER);
+
+  mBehaviour->SetOwner(aNewOwner);
+
+  // If we were locked, apply the locks here
+  for (uint32_t i = 0; i < oldLockCount; i++) {
+    LockImage();
+  }
+
+  // If we had animation requests, restore them here. Note that we
+  // do this *after* RemoveProxy, which clears out animation consumers
+  // (see bug 601723).
+  for (uint32_t i = 0; i < oldAnimationConsumers; i++) {
+    IncrementAnimationConsumers();
+  }
+
+  GetOwner()->AddProxy(this);
+
+  // If we were decoded, or if we'd previously requested a decode, request a
+  // decode on the new image
+  if (wasDecoded || mDecodeRequested) {
+    StartDecoding();
+  }
+
+  return NS_OK;
+}
+
+void
+imgRequestProxy::AddToLoadGroup()
+{
+  NS_ASSERTION(!mIsInLoadGroup, "Whaa, we're already in the loadgroup!");
+
+  if (!mIsInLoadGroup && mLoadGroup) {
+    mLoadGroup->AddRequest(this, nullptr);
+    mIsInLoadGroup = true;
+  }
+}
+
+void
+imgRequestProxy::RemoveFromLoadGroup(bool releaseLoadGroup)
+{
+  if (!mIsInLoadGroup) {
+    return;
+  }
+
+  /* calling RemoveFromLoadGroup may cause the document to finish
+     loading, which could result in our death.  We need to make sure
+     that we stay alive long enough to fight another battle... at
+     least until we exit this function.
+  */
+  nsCOMPtr<imgIRequest> kungFuDeathGrip(this);
+
+  mLoadGroup->RemoveRequest(this, nullptr, NS_OK);
+  mIsInLoadGroup = false;
+
+  if (releaseLoadGroup) {
+    // We're done with the loadgroup, release it.
+    mLoadGroup = nullptr;
+  }
+}
+
+
+/**  nsIRequest / imgIRequest methods **/
+
+/* readonly attribute wstring name; */
+NS_IMETHODIMP
+imgRequestProxy::GetName(nsACString& aName)
+{
+  aName.Truncate();
+
+  if (mURI) {
+    mURI->GetSpec(aName);
+  }
+
+  return NS_OK;
+}
+
+/* boolean isPending (); */
+NS_IMETHODIMP
+imgRequestProxy::IsPending(bool* _retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* readonly attribute nsresult status; */
+NS_IMETHODIMP
+imgRequestProxy::GetStatus(nsresult* aStatus)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void cancel (in nsresult status); */
+NS_IMETHODIMP
+imgRequestProxy::Cancel(nsresult status)
+{
+  if (mCanceled) {
+    return NS_ERROR_FAILURE;
+  }
+
+  LOG_SCOPE(GetImgLog(), "imgRequestProxy::Cancel");
+
+  mCanceled = true;
+
+  nsCOMPtr<nsIRunnable> ev = new imgCancelRunnable(this, status);
+  return NS_DispatchToCurrentThread(ev);
+}
+
+void
+imgRequestProxy::DoCancel(nsresult status)
+{
+  if (GetOwner()) {
+    GetOwner()->RemoveProxy(this, status);
+  }
+
+  NullOutListener();
+}
+
+/* void cancelAndForgetObserver (in nsresult aStatus); */
+NS_IMETHODIMP
+imgRequestProxy::CancelAndForgetObserver(nsresult aStatus)
+{
+  // If mCanceled is true but mListener is non-null, that means
+  // someone called Cancel() on us but the imgCancelRunnable is still
+  // pending.  We still need to null out mListener before returning
+  // from this function in this case.  That means we want to do the
+  // RemoveProxy call right now, because we need to deliver the
+  // onStopRequest.
+  if (mCanceled && !mListener) {
+    return NS_ERROR_FAILURE;
+  }
+
+  LOG_SCOPE(GetImgLog(), "imgRequestProxy::CancelAndForgetObserver");
+
+  mCanceled = true;
+
+  // Now cheat and make sure our removal from loadgroup happens async
+  bool oldIsInLoadGroup = mIsInLoadGroup;
+  mIsInLoadGroup = false;
+
+  if (GetOwner()) {
+    GetOwner()->RemoveProxy(this, aStatus);
+  }
+
+  mIsInLoadGroup = oldIsInLoadGroup;
+
+  if (mIsInLoadGroup) {
+    nsCOMPtr<nsIRunnable> ev =
+      NS_NewRunnableMethod(this, &imgRequestProxy::DoRemoveFromLoadGroup);
+    NS_DispatchToCurrentThread(ev);
+  }
+
+  NullOutListener();
+
+  return NS_OK;
+}
+
+/* void startDecode (); */
+NS_IMETHODIMP
+imgRequestProxy::StartDecoding()
+{
+  // Flag this, so we know to transfer the request if our owner changes
+  mDecodeRequested = true;
+
+  nsRefPtr<Image> image = GetImage();
+  if (image) {
+    return image->StartDecoding();
+  }
+
+  if (GetOwner()) {
+    GetOwner()->RequestDecode();
+  }
+
+  return NS_OK;
+}
+
+/* void requestDecode (); */
+NS_IMETHODIMP
+imgRequestProxy::RequestDecode()
+{
+  // Flag this, so we know to transfer the request if our owner changes
+  mDecodeRequested = true;
+
+  nsRefPtr<Image> image = GetImage();
+  if (image) {
+    return image->RequestDecode();
+  }
+
+  if (GetOwner()) {
+    GetOwner()->RequestDecode();
+  }
+
+  return NS_OK;
+}
+
+
+/* void lockImage (); */
+NS_IMETHODIMP
+imgRequestProxy::LockImage()
+{
+  mLockCount++;
+  nsRefPtr<Image> image = GetImage();
+  if (image) {
+    return image->LockImage();
+  }
+  return NS_OK;
+}
+
+/* void unlockImage (); */
+NS_IMETHODIMP
+imgRequestProxy::UnlockImage()
+{
+  MOZ_ASSERT(mLockCount > 0, "calling unlock but no locks!");
+
+  mLockCount--;
+  nsRefPtr<Image> image = GetImage();
+  if (image) {
+    return image->UnlockImage();
+  }
+  return NS_OK;
+}
+
+/* void requestDiscard (); */
+NS_IMETHODIMP
+imgRequestProxy::RequestDiscard()
+{
+  nsRefPtr<Image> image = GetImage();
+  if (image) {
+    return image->RequestDiscard();
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+imgRequestProxy::IncrementAnimationConsumers()
+{
+  mAnimationConsumers++;
+  nsRefPtr<Image> image = GetImage();
+  if (image) {
+    image->IncrementAnimationConsumers();
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+imgRequestProxy::DecrementAnimationConsumers()
+{
+  // We may get here if some responsible code called Increment,
+  // then called us, but we have meanwhile called ClearAnimationConsumers
+  // because we needed to get rid of them earlier (see
+  // imgRequest::RemoveProxy), and hence have nothing left to
+  // decrement. (In such a case we got rid of the animation consumers
+  // early, but not the observer.)
+  if (mAnimationConsumers > 0) {
+    mAnimationConsumers--;
+    nsRefPtr<Image> image = GetImage();
+    if (image) {
+      image->DecrementAnimationConsumers();
+    }
+  }
+  return NS_OK;
+}
+
+void
+imgRequestProxy::ClearAnimationConsumers()
+{
+  while (mAnimationConsumers > 0) {
+    DecrementAnimationConsumers();
+  }
+}
+
+/* void suspend (); */
+NS_IMETHODIMP
+imgRequestProxy::Suspend()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void resume (); */
+NS_IMETHODIMP
+imgRequestProxy::Resume()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* attribute nsILoadGroup loadGroup */
+NS_IMETHODIMP
+imgRequestProxy::GetLoadGroup(nsILoadGroup** loadGroup)
+{
+  NS_IF_ADDREF(*loadGroup = mLoadGroup.get());
+  return NS_OK;
+}
+NS_IMETHODIMP
+imgRequestProxy::SetLoadGroup(nsILoadGroup* loadGroup)
+{
+  mLoadGroup = loadGroup;
+  return NS_OK;
+}
+
+/* attribute nsLoadFlags loadFlags */
+NS_IMETHODIMP
+imgRequestProxy::GetLoadFlags(nsLoadFlags* flags)
+{
+  *flags = mLoadFlags;
+  return NS_OK;
+}
+NS_IMETHODIMP
+imgRequestProxy::SetLoadFlags(nsLoadFlags flags)
+{
+  mLoadFlags = flags;
+  return NS_OK;
+}
+
+/**  imgIRequest methods **/
+
+/* attribute imgIContainer image; */
+NS_IMETHODIMP
+imgRequestProxy::GetImage(imgIContainer** aImage)
+{
+  NS_ENSURE_TRUE(aImage, NS_ERROR_NULL_POINTER);
+  // It's possible that our owner has an image but hasn't notified us of it -
+  // that'll happen if we get Canceled before the owner instantiates its image
+  // (because Canceling unregisters us as a listener on mOwner). If we're
+  // in that situation, just grab the image off of mOwner.
+  nsRefPtr<Image> image = GetImage();
+  nsCOMPtr<imgIContainer> imageToReturn;
+  if (image) {
+    imageToReturn = do_QueryInterface(image);
+  }
+  if (!imageToReturn && GetOwner()) {
+    imageToReturn = GetOwner()->GetImage();
+  }
+  if (!imageToReturn) {
+    return NS_ERROR_FAILURE;
+  }
+
+  imageToReturn.swap(*aImage);
+
+  return NS_OK;
+}
+
+/* readonly attribute unsigned long imageStatus; */
+NS_IMETHODIMP
+imgRequestProxy::GetImageStatus(uint32_t* aStatus)
+{
+  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+  *aStatus = progressTracker->GetImageStatus();
+
+  return NS_OK;
+}
+
+/* readonly attribute nresult imageErrorCode; */
+NS_IMETHODIMP
+imgRequestProxy::GetImageErrorCode(nsresult* aStatus)
+{
+  if (!GetOwner()) {
+    return NS_ERROR_FAILURE;
+  }
+
+  *aStatus = GetOwner()->GetImageErrorCode();
+
+  return NS_OK;
+}
+
+/* readonly attribute nsIURI URI; */
+NS_IMETHODIMP
+imgRequestProxy::GetURI(nsIURI** aURI)
+{
+  MOZ_ASSERT(NS_IsMainThread(), "Must be on main thread to convert URI");
+  nsCOMPtr<nsIURI> uri = mURI->ToIURI();
+  uri.forget(aURI);
+  return NS_OK;
+}
+
+nsresult
+imgRequestProxy::GetCurrentURI(nsIURI** aURI)
+{
+  if (!GetOwner()) {
+    return NS_ERROR_FAILURE;
+  }
+
+  return GetOwner()->GetCurrentURI(aURI);
+}
+
+nsresult
+imgRequestProxy::GetURI(ImageURL** aURI)
+{
+  if (!mURI) {
+    return NS_ERROR_FAILURE;
+  }
+
+  NS_ADDREF(*aURI = mURI);
+
+  return NS_OK;
+}
+
+/* readonly attribute imgINotificationObserver notificationObserver; */
+NS_IMETHODIMP
+imgRequestProxy::GetNotificationObserver(imgINotificationObserver** aObserver)
+{
+  *aObserver = mListener;
+  NS_IF_ADDREF(*aObserver);
+  return NS_OK;
+}
+
+/* readonly attribute string mimeType; */
+NS_IMETHODIMP
+imgRequestProxy::GetMimeType(char** aMimeType)
+{
+  if (!GetOwner()) {
+    return NS_ERROR_FAILURE;
+  }
+
+  const char* type = GetOwner()->GetMimeType();
+  if (!type) {
+    return NS_ERROR_FAILURE;
+  }
+
+  *aMimeType = NS_strdup(type);
+
+  return NS_OK;
+}
+
+static imgRequestProxy* NewProxy(imgRequestProxy* /*aThis*/)
+{
+  return new imgRequestProxy();
+}
+
+imgRequestProxy* NewStaticProxy(imgRequestProxy* aThis)
+{
+  nsCOMPtr<nsIPrincipal> currentPrincipal;
+  aThis->GetImagePrincipal(getter_AddRefs(currentPrincipal));
+  nsRefPtr<Image> image = aThis->GetImage();
+  return new imgRequestProxyStatic(image, currentPrincipal);
+}
+
+NS_IMETHODIMP
+imgRequestProxy::Clone(imgINotificationObserver* aObserver,
+                       imgIRequest** aClone)
+{
+  nsresult result;
+  imgRequestProxy* proxy;
+  result = Clone(aObserver, &proxy);
+  *aClone = proxy;
+  return result;
+}
+
+nsresult imgRequestProxy::Clone(imgINotificationObserver* aObserver,
+                                imgRequestProxy** aClone)
+{
+  return PerformClone(aObserver, NewProxy, aClone);
+}
+
+nsresult
+imgRequestProxy::PerformClone(imgINotificationObserver* aObserver,
+                              imgRequestProxy* (aAllocFn)(imgRequestProxy*),
+                              imgRequestProxy** aClone)
+{
+  NS_PRECONDITION(aClone, "Null out param");
+
+  LOG_SCOPE(GetImgLog(), "imgRequestProxy::Clone");
+
+  *aClone = nullptr;
+  nsRefPtr<imgRequestProxy> clone = aAllocFn(this);
+
+  // It is important to call |SetLoadFlags()| before calling |Init()| because
+  // |Init()| adds the request to the loadgroup.
+  // When a request is added to a loadgroup, its load flags are merged
+  // with the load flags of the loadgroup.
+  // XXXldb That's not true anymore.  Stuff from imgLoader adds the
+  // request to the loadgroup.
+  clone->SetLoadFlags(mLoadFlags);
+  nsresult rv = clone->Init(mBehaviour->GetOwner(), mLoadGroup,
+                            mURI, aObserver);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  if (GetOwner() && GetOwner()->GetValidator()) {
+    clone->SetNotificationsDeferred(true);
+    GetOwner()->GetValidator()->AddProxy(clone);
+  }
+
+  // Assign to *aClone before calling Notify so that if the caller expects to
+  // only be notified for requests it's already holding pointers to it won't be
+  // surprised.
+  NS_ADDREF(*aClone = clone);
+
+  // This is wrong!!! We need to notify asynchronously, but there's code that
+  // assumes that we don't. This will be fixed in bug 580466.
+  clone->SyncNotifyListener();
+
+  return NS_OK;
+}
+
+/* readonly attribute nsIPrincipal imagePrincipal; */
+NS_IMETHODIMP
+imgRequestProxy::GetImagePrincipal(nsIPrincipal** aPrincipal)
+{
+  if (!GetOwner()) {
+    return NS_ERROR_FAILURE;
+  }
+
+  NS_ADDREF(*aPrincipal = GetOwner()->GetPrincipal());
+  return NS_OK;
+}
+
+/* readonly attribute bool multipart; */
+NS_IMETHODIMP
+imgRequestProxy::GetMultipart(bool* aMultipart)
+{
+  if (!GetOwner()) {
+    return NS_ERROR_FAILURE;
+  }
+
+  *aMultipart = GetOwner()->GetMultipart();
+
+  return NS_OK;
+}
+
+/* readonly attribute int32_t CORSMode; */
+NS_IMETHODIMP
+imgRequestProxy::GetCORSMode(int32_t* aCorsMode)
+{
+  if (!GetOwner()) {
+    return NS_ERROR_FAILURE;
+  }
+
+  *aCorsMode = GetOwner()->GetCORSMode();
+
+  return NS_OK;
+}
+
+/** nsISupportsPriority methods **/
+
+NS_IMETHODIMP
+imgRequestProxy::GetPriority(int32_t* priority)
+{
+  NS_ENSURE_STATE(GetOwner());
+  *priority = GetOwner()->Priority();
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+imgRequestProxy::SetPriority(int32_t priority)
+{
+  NS_ENSURE_STATE(GetOwner() && !mCanceled);
+  GetOwner()->AdjustPriority(this, priority - GetOwner()->Priority());
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+imgRequestProxy::AdjustPriority(int32_t priority)
+{
+  // We don't require |!mCanceled| here. This may be called even if we're
+  // cancelled, because it's invoked as part of the process of removing an image
+  // from the load group.
+  NS_ENSURE_STATE(GetOwner());
+  GetOwner()->AdjustPriority(this, priority);
+  return NS_OK;
+}
+
+/** nsISecurityInfoProvider methods **/
+
+NS_IMETHODIMP
+imgRequestProxy::GetSecurityInfo(nsISupports** _retval)
+{
+  if (GetOwner()) {
+    return GetOwner()->GetSecurityInfo(_retval);
+  }
+
+  *_retval = nullptr;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+imgRequestProxy::GetHasTransferredData(bool* hasData)
+{
+  if (GetOwner()) {
+    *hasData = GetOwner()->HasTransferredData();
+  } else {
+    // The safe thing to do is to claim we have data
+    *hasData = true;
+  }
+  return NS_OK;
+}
+
+void
+imgRequestProxy::OnStartDecode()
+{
+  // This notification is deliberately not propagated since there are no
+  // listeners who care about it.
+  if (GetOwner()) {
+    // 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 ProgressTrackerObserver::OnStopFrame will continue to
+    // increase the data size cumulatively.
+    GetOwner()->ResetCacheEntry();
+  }
+}
+
+static const char*
+NotificationTypeToString(int32_t aType)
+{
+  switch(aType)
+  {
+    case imgINotificationObserver::SIZE_AVAILABLE: return "SIZE_AVAILABLE";
+    case imgINotificationObserver::FRAME_UPDATE: return "FRAME_UPDATE";
+    case imgINotificationObserver::FRAME_COMPLETE: return "FRAME_COMPLETE";
+    case imgINotificationObserver::LOAD_COMPLETE: return "LOAD_COMPLETE";
+    case imgINotificationObserver::DECODE_COMPLETE: return "DECODE_COMPLETE";
+    case imgINotificationObserver::DISCARD: return "DISCARD";
+    case imgINotificationObserver::UNLOCKED_DRAW: return "UNLOCKED_DRAW";
+    case imgINotificationObserver::IS_ANIMATED: return "IS_ANIMATED";
+    case imgINotificationObserver::HAS_TRANSPARENCY: return "HAS_TRANSPARENCY";
+    default:
+      NS_NOTREACHED("Notification list should be exhaustive");
+      return "(unknown notification)";
+  }
+}
+
+void
+imgRequestProxy::Notify(int32_t aType, const mozilla::gfx::IntRect* aRect)
+{
+  MOZ_ASSERT(aType != imgINotificationObserver::LOAD_COMPLETE,
+             "Should call OnLoadComplete");
+
+  LOG_FUNC_WITH_PARAM(GetImgLog(), "imgRequestProxy::Notify", "type",
+                      NotificationTypeToString(aType));
+
+  if (!mListener || mCanceled) {
+    return;
+  }
+
+  // Make sure the listener stays alive while we notify.
+  nsCOMPtr<imgINotificationObserver> listener(mListener);
+
+  mListener->Notify(this, aType, aRect);
+}
+
+void
+imgRequestProxy::OnLoadComplete(bool aLastPart)
+{
+  if (PR_LOG_TEST(GetImgLog(), PR_LOG_DEBUG)) {
+    nsAutoCString name;
+    GetName(name);
+    LOG_FUNC_WITH_PARAM(GetImgLog(), "imgRequestProxy::OnLoadComplete",
+                        "name", name.get());
+  }
+
+  // There's all sorts of stuff here that could kill us (the OnStopRequest call
+  // on the listener, the removal from the loadgroup, the release of the
+  // listener, etc).  Don't let them do it.
+  nsCOMPtr<imgIRequest> kungFuDeathGrip(this);
+
+  if (mListener && !mCanceled) {
+    // Hold a ref to the listener while we call it, just in case.
+    nsCOMPtr<imgINotificationObserver> kungFuDeathGrip(mListener);
+    mListener->Notify(this, imgINotificationObserver::LOAD_COMPLETE, nullptr);
+  }
+
+  // If we're expecting more data from a multipart channel, re-add ourself
+  // 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 (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 (!aLastPart) {
+      mLoadFlags |= nsIRequest::LOAD_BACKGROUND;
+      AddToLoadGroup();
+    }
+  }
+
+  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
+    // like that.  Don't add anything in this method after this point.
+    imgINotificationObserver* obs = mListener;
+    mListenerIsStrongRef = false;
+    NS_RELEASE(obs);
+  }
+}
+
+void
+imgRequestProxy::BlockOnload()
+{
+  if (PR_LOG_TEST(GetImgLog(), PR_LOG_DEBUG)) {
+    nsAutoCString name;
+    GetName(name);
+    LOG_FUNC_WITH_PARAM(GetImgLog(), "imgRequestProxy::BlockOnload",
+                        "name", name.get());
+  }
+
+  nsCOMPtr<imgIOnloadBlocker> blocker = do_QueryInterface(mListener);
+  if (blocker) {
+    blocker->BlockOnload(this);
+  }
+}
+
+void
+imgRequestProxy::UnblockOnload()
+{
+  if (PR_LOG_TEST(GetImgLog(), PR_LOG_DEBUG)) {
+    nsAutoCString name;
+    GetName(name);
+    LOG_FUNC_WITH_PARAM(GetImgLog(), "imgRequestProxy::UnblockOnload",
+                        "name", name.get());
+  }
+
+  nsCOMPtr<imgIOnloadBlocker> blocker = do_QueryInterface(mListener);
+  if (blocker) {
+    blocker->UnblockOnload(this);
+  }
+}
+
+void
+imgRequestProxy::NullOutListener()
+{
+  // If we have animation consumers, then they don't matter anymore
+  if (mListener) {
+    ClearAnimationConsumers();
+  }
+
+  if (mListenerIsStrongRef) {
+    // Releasing could do weird reentery stuff, so just play it super-safe
+    nsCOMPtr<imgINotificationObserver> obs;
+    obs.swap(mListener);
+    mListenerIsStrongRef = false;
+  } else {
+    mListener = nullptr;
+  }
+}
+
+NS_IMETHODIMP
+imgRequestProxy::GetStaticRequest(imgIRequest** aReturn)
+{
+  imgRequestProxy* proxy;
+  nsresult result = GetStaticRequest(&proxy);
+  *aReturn = proxy;
+  return result;
+}
+
+nsresult
+imgRequestProxy::GetStaticRequest(imgRequestProxy** aReturn)
+{
+  *aReturn = nullptr;
+  nsRefPtr<Image> image = GetImage();
+
+  bool animated;
+  if (!image || (NS_SUCCEEDED(image->GetAnimated(&animated)) && !animated)) {
+    // Early exit - we're not animated, so we don't have to do anything.
+    NS_ADDREF(*aReturn = this);
+    return NS_OK;
+  }
+
+  // Check for errors in the image. Callers code rely on GetStaticRequest
+  // failing in this case, though with FrozenImage there's no technical reason
+  // for it anymore.
+  if (image->HasError()) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // We are animated. We need to create a frozen version of this image.
+  nsRefPtr<Image> frozenImage = ImageOps::Freeze(image);
+
+  // Create a static imgRequestProxy with our new extracted frame.
+  nsCOMPtr<nsIPrincipal> currentPrincipal;
+  GetImagePrincipal(getter_AddRefs(currentPrincipal));
+  nsRefPtr<imgRequestProxy> req = new imgRequestProxyStatic(frozenImage,
+                                                            currentPrincipal);
+  req->Init(nullptr, nullptr, mURI, nullptr);
+
+  NS_ADDREF(*aReturn = req);
+
+  return NS_OK;
+}
+
+void
+imgRequestProxy::NotifyListener()
+{
+  // It would be nice to notify the observer directly in the status tracker
+  // instead of through the proxy, but there are several places we do extra
+  // processing when we receive notifications (like OnStopRequest()), and we
+  // need to check mCanceled everywhere too.
+
+  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+  if (GetOwner()) {
+    // Send the notifications to our listener asynchronously.
+    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.
+    MOZ_ASSERT(HasImage(),
+               "if we have no imgRequest, we should have an Image");
+    progressTracker->NotifyCurrentState(this);
+  }
+}
+
+void
+imgRequestProxy::SyncNotifyListener()
+{
+  // It would be nice to notify the observer directly in the status tracker
+  // instead of through the proxy, but there are several places we do extra
+  // processing when we receive notifications (like OnStopRequest()), and we
+  // need to check mCanceled everywhere too.
+
+  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+  progressTracker->SyncNotify(this);
+}
+
+void
+imgRequestProxy::SetHasImage()
+{
+  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
+  // the presence of an image;
+  mBehaviour->SetOwner(mBehaviour->GetOwner());
+
+  // Apply any locks we have
+  for (uint32_t i = 0; i < mLockCount; ++i) {
+    image->LockImage();
+  }
+
+  // Apply any animation consumers we have
+  for (uint32_t i = 0; i < mAnimationConsumers; i++) {
+    image->IncrementAnimationConsumers();
+  }
+}
+
+already_AddRefed<ProgressTracker>
+imgRequestProxy::GetProgressTracker() const
+{
+  return mBehaviour->GetProgressTracker();
+}
+
+already_AddRefed<mozilla::image::Image>
+imgRequestProxy::GetImage() const
+{
+  return mBehaviour->GetImage();
+}
+
+bool
+RequestBehaviour::HasImage() const
+{
+  if (!mOwnerHasImage) {
+    return false;
+  }
+  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+  return progressTracker ? progressTracker->HasImage() : false;
+}
+
+bool
+imgRequestProxy::HasImage() const
+{
+  return mBehaviour->HasImage();
+}
+
+imgRequest*
+imgRequestProxy::GetOwner() const
+{
+  return mBehaviour->GetOwner();
+}
+
+////////////////// imgRequestProxyStatic methods
+
+class StaticBehaviour : public ProxyBehaviour
+{
+public:
+  explicit StaticBehaviour(mozilla::image::Image* aImage) : mImage(aImage) {}
+
+  virtual already_AddRefed<mozilla::image::Image>
+  GetImage() const override {
+    nsRefPtr<mozilla::image::Image> image = mImage;
+    return image.forget();
+  }
+
+  virtual bool HasImage() const override {
+    return mImage;
+  }
+
+  virtual already_AddRefed<ProgressTracker> GetProgressTracker()
+    const override  {
+    return mImage->GetProgressTracker();
+  }
+
+  virtual imgRequest* GetOwner() const override {
+    return nullptr;
+  }
+
+  virtual void SetOwner(imgRequest* aOwner) override {
+    MOZ_ASSERT(!aOwner,
+               "We shouldn't be giving static requests a non-null owner.");
+  }
+
+private:
+  // Our image. We have to hold a strong reference here, because that's normally
+  // the job of the underlying request.
+  nsRefPtr<mozilla::image::Image> mImage;
+};
+
+imgRequestProxyStatic::imgRequestProxyStatic(mozilla::image::Image* aImage,
+                                             nsIPrincipal* aPrincipal)
+: mPrincipal(aPrincipal)
+{
+  mBehaviour = new StaticBehaviour(aImage);
+}
+
+NS_IMETHODIMP
+imgRequestProxyStatic::GetImagePrincipal(nsIPrincipal** aPrincipal)
+{
+  if (!mPrincipal) {
+    return NS_ERROR_FAILURE;
+  }
+
+  NS_ADDREF(*aPrincipal = mPrincipal);
+
+  return NS_OK;
+}
+
+nsresult
+imgRequestProxyStatic::Clone(imgINotificationObserver* aObserver,
+                             imgRequestProxy** aClone)
+{
+  return PerformClone(aObserver, NewStaticProxy, aClone);
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/imgRequestProxy.h firefox-trunk-41.0~a1~hg20150524r245419/image/imgRequestProxy.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/imgRequestProxy.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/imgRequestProxy.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,246 @@
+/* -*- 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_image_imgRequestProxy_h
+#define mozilla_image_imgRequestProxy_h
+
+#include "imgIRequest.h"
+#include "nsISecurityInfoProvider.h"
+
+#include "nsILoadGroup.h"
+#include "nsISupportsPriority.h"
+#include "nsITimedChannel.h"
+#include "nsCOMPtr.h"
+#include "nsAutoPtr.h"
+#include "nsThreadUtils.h"
+#include "mozilla/TimeStamp.h"
+#include "mozilla/gfx/Rect.h"
+
+#include "imgRequest.h"
+#include "IProgressObserver.h"
+
+#define NS_IMGREQUESTPROXY_CID \
+{ /* 20557898-1dd2-11b2-8f65-9c462ee2bc95 */         \
+     0x20557898,                                     \
+     0x1dd2,                                         \
+     0x11b2,                                         \
+    {0x8f, 0x65, 0x9c, 0x46, 0x2e, 0xe2, 0xbc, 0x95} \
+}
+
+class imgINotificationObserver;
+class imgStatusNotifyRunnable;
+class ProxyBehaviour;
+
+namespace mozilla {
+namespace image {
+class Image;
+class ImageURL;
+class ProgressTracker;
+} // namespace image
+} // namespace mozilla
+
+class imgRequestProxy : public imgIRequest,
+                        public mozilla::image::IProgressObserver,
+                        public nsISupportsPriority,
+                        public nsISecurityInfoProvider,
+                        public nsITimedChannel
+{
+protected:
+  virtual ~imgRequestProxy();
+
+public:
+  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
+  NS_DECL_NSISUPPORTSPRIORITY
+  NS_DECL_NSISECURITYINFOPROVIDER
+  // nsITimedChannel declared below
+
+  imgRequestProxy();
+
+  // Callers to Init or ChangeOwner are required to call NotifyListener after
+  // (although not immediately after) doing so.
+  nsresult Init(imgRequest* aOwner,
+                nsILoadGroup* aLoadGroup,
+                ImageURL* aURI,
+                imgINotificationObserver* aObserver);
+
+  nsresult ChangeOwner(imgRequest* aNewOwner); // this will change mOwner.
+                                               // Do not call this if the
+                                               // previous owner has already
+                                               // sent notifications out!
+
+  void AddToLoadGroup();
+  void RemoveFromLoadGroup(bool releaseLoadGroup);
+
+  inline bool HasObserver() const {
+    return mListener != nullptr;
+  }
+
+  // Asynchronously notify this proxy's listener of the current state of the
+  // image, and, if we have an imgRequest mOwner, any status changes that
+  // happen between the time this function is called and the time the
+  // notification is scheduled.
+  void NotifyListener();
+
+  // Synchronously notify this proxy's listener of the current state of the
+  // image. Only use this function if you are currently servicing an
+  // asynchronously-called function.
+  void SyncNotifyListener();
+
+  // imgINotificationObserver methods:
+  virtual void Notify(int32_t aType,
+                      const mozilla::gfx::IntRect* aRect = nullptr) override;
+  virtual void OnLoadComplete(bool aLastPart) override;
+
+  // imgIOnloadBlocker methods:
+  virtual void BlockOnload() override;
+  virtual void UnblockOnload() override;
+
+  // Other, internal-only methods:
+  virtual void SetHasImage() override;
+  virtual void OnStartDecode() override;
+
+  // Whether we want notifications from ProgressTracker to be deferred until
+  // an event it has scheduled has been fired.
+  virtual bool NotificationsDeferred() const override
+  {
+    return mDeferNotifications;
+  }
+  virtual void SetNotificationsDeferred(bool aDeferNotifications) override
+  {
+    mDeferNotifications = aDeferNotifications;
+  }
+
+  // Removes all animation consumers that were created with
+  // IncrementAnimationConsumers. This is necessary since we need
+  // to do it before the proxy itself is destroyed. See
+  // imgRequest::RemoveProxy
+  void ClearAnimationConsumers();
+
+  virtual nsresult Clone(imgINotificationObserver* aObserver,
+                         imgRequestProxy** aClone);
+  nsresult GetStaticRequest(imgRequestProxy** aReturn);
+
+  nsresult GetURI(ImageURL** aURI);
+
+protected:
+  friend class mozilla::image::ProgressTracker;
+  friend class imgStatusNotifyRunnable;
+
+  class imgCancelRunnable;
+  friend class imgCancelRunnable;
+
+  class imgCancelRunnable : public nsRunnable
+  {
+    public:
+      imgCancelRunnable(imgRequestProxy* owner, nsresult status)
+        : mOwner(owner), mStatus(status)
+      { }
+
+      NS_IMETHOD Run() override {
+        mOwner->DoCancel(mStatus);
+        return NS_OK;
+      }
+
+    private:
+      nsRefPtr<imgRequestProxy> mOwner;
+      nsresult mStatus;
+  };
+
+  /* Finish up canceling ourselves */
+  void DoCancel(nsresult status);
+
+  /* Do the proper refcount management to null out mListener */
+  void NullOutListener();
+
+  void DoRemoveFromLoadGroup() {
+    RemoveFromLoadGroup(true);
+  }
+
+  // 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<ProgressTracker> GetProgressTracker() const;
+
+  nsITimedChannel* TimedChannel()
+  {
+    if (!GetOwner()) {
+      return nullptr;
+    }
+    return GetOwner()->GetTimedChannel();
+  }
+
+  already_AddRefed<Image> GetImage() const;
+  bool HasImage() const;
+  imgRequest* GetOwner() const;
+
+  nsresult PerformClone(imgINotificationObserver* aObserver,
+                        imgRequestProxy* (aAllocFn)(imgRequestProxy*),
+                        imgRequestProxy** aClone);
+
+public:
+  NS_FORWARD_SAFE_NSITIMEDCHANNEL(TimedChannel())
+
+protected:
+  nsAutoPtr<ProxyBehaviour> mBehaviour;
+
+private:
+  friend class imgCacheValidator;
+  friend imgRequestProxy* NewStaticProxy(imgRequestProxy* aThis);
+
+  // The URI of our request.
+  nsRefPtr<ImageURL> mURI;
+
+  // mListener is only promised to be a weak ref (see imgILoader.idl),
+  // but we actually keep a strong ref to it until we've seen our
+  // first OnStopRequest.
+  imgINotificationObserver* mListener;
+  nsCOMPtr<nsILoadGroup> mLoadGroup;
+
+  nsLoadFlags mLoadFlags;
+  uint32_t    mLockCount;
+  uint32_t    mAnimationConsumers;
+  bool mCanceled;
+  bool mIsInLoadGroup;
+  bool mListenerIsStrongRef;
+  bool mDecodeRequested;
+
+  // Whether we want to defer our notifications by the non-virtual Observer
+  // interfaces as image loads proceed.
+  bool mDeferNotifications;
+};
+
+// Used for static image proxies for which no requests are available, so
+// certain behaviours must be overridden to compensate.
+class imgRequestProxyStatic : public imgRequestProxy
+{
+
+public:
+  imgRequestProxyStatic(Image* aImage, nsIPrincipal* aPrincipal);
+
+  NS_IMETHOD GetImagePrincipal(nsIPrincipal** aPrincipal) override;
+
+  using imgRequestProxy::Clone;
+
+  virtual nsresult Clone(imgINotificationObserver* aObserver,
+                         imgRequestProxy** aClone) override;
+
+protected:
+  friend imgRequestProxy* NewStaticProxy(imgRequestProxy*);
+
+  // Our principal. We have to cache it, rather than accessing the underlying
+  // request on-demand, because static proxies don't have an underlying request.
+  nsCOMPtr<nsIPrincipal> mPrincipal;
+};
+
+#endif // mozilla_image_imgRequestProxy_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/imgTools.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/imgTools.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/imgTools.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/imgTools.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,349 @@
+/* -*- 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 "imgTools.h"
+
+#include "gfxUtils.h"
+#include "mozilla/gfx/2D.h"
+#include "mozilla/RefPtr.h"
+#include "nsCOMPtr.h"
+#include "nsIDocument.h"
+#include "nsIDOMDocument.h"
+#include "nsError.h"
+#include "imgLoader.h"
+#include "imgICache.h"
+#include "imgIContainer.h"
+#include "imgIEncoder.h"
+#include "nsStreamUtils.h"
+#include "nsContentUtils.h"
+#include "ImageFactory.h"
+#include "Image.h"
+#include "ScriptedNotificationObserver.h"
+#include "imgIScriptedNotificationObserver.h"
+#include "gfxPlatform.h"
+
+using namespace mozilla;
+using namespace mozilla::image;
+using namespace mozilla::gfx;
+
+/* ========== imgITools implementation ========== */
+
+
+
+NS_IMPL_ISUPPORTS(imgTools, imgITools)
+
+imgTools::imgTools()
+{
+  /* member initializers and constructor code */
+}
+
+imgTools::~imgTools()
+{
+  /* destructor code */
+}
+
+NS_IMETHODIMP
+imgTools::DecodeImageData(nsIInputStream* aInStr,
+                          const nsACString& aMimeType,
+                          imgIContainer** aContainer)
+{
+  MOZ_ASSERT(*aContainer == nullptr,
+             "Cannot provide an existing image container to DecodeImageData");
+
+  return DecodeImage(aInStr, aMimeType, aContainer);
+}
+
+NS_IMETHODIMP
+imgTools::DecodeImage(nsIInputStream* aInStr,
+                      const nsACString& aMimeType,
+                      imgIContainer** aContainer)
+{
+  nsresult rv;
+
+  NS_ENSURE_ARG_POINTER(aInStr);
+
+  // Create a new image container to hold the decoded data.
+  nsAutoCString mimeType(aMimeType);
+  nsRefPtr<image::Image> image = ImageFactory::CreateAnonymousImage(mimeType);
+  nsRefPtr<ProgressTracker> tracker = image->GetProgressTracker();
+
+  if (image->HasError()) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // Prepare the input stream.
+  nsCOMPtr<nsIInputStream> inStream = aInStr;
+  if (!NS_InputStreamIsBuffered(aInStr)) {
+    nsCOMPtr<nsIInputStream> bufStream;
+    rv = NS_NewBufferedInputStream(getter_AddRefs(bufStream), aInStr, 1024);
+    if (NS_SUCCEEDED(rv)) {
+      inStream = bufStream;
+    }
+  }
+
+  // Figure out how much data we've been passed.
+  uint64_t length;
+  rv = inStream->Available(&length);
+  NS_ENSURE_SUCCESS(rv, rv);
+  NS_ENSURE_TRUE(length <= UINT32_MAX, NS_ERROR_FILE_TOO_BIG);
+
+  // 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.
+  NS_ADDREF(*aContainer = image.get());
+  return NS_OK;
+}
+
+/**
+ * This takes a DataSourceSurface rather than a SourceSurface because some
+ * of the callers have a DataSourceSurface and we don't want to call
+ * GetDataSurface on such surfaces since that may incure a conversion to
+ * SurfaceType::DATA which we don't need.
+ */
+static nsresult
+EncodeImageData(DataSourceSurface* aDataSurface,
+                const nsACString& aMimeType,
+                const nsAString& aOutputOptions,
+                nsIInputStream** aStream)
+{
+  MOZ_ASSERT(aDataSurface->GetFormat() ==  SurfaceFormat::B8G8R8A8,
+             "We're assuming B8G8R8A8");
+
+  // Get an image encoder for the media type
+  nsAutoCString encoderCID(
+    NS_LITERAL_CSTRING("@mozilla.org/image/encoder;2?type=") + aMimeType);
+
+  nsCOMPtr<imgIEncoder> encoder = do_CreateInstance(encoderCID.get());
+  if (!encoder) {
+    return NS_IMAGELIB_ERROR_NO_ENCODER;
+  }
+
+  DataSourceSurface::MappedSurface map;
+  if (!aDataSurface->Map(DataSourceSurface::MapType::READ, &map)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  IntSize size = aDataSurface->GetSize();
+  uint32_t dataLength = map.mStride * size.height;
+
+  // Encode the bitmap
+  nsresult rv = encoder->InitFromData(map.mData,
+                                      dataLength,
+                                      size.width,
+                                      size.height,
+                                      map.mStride,
+                                      imgIEncoder::INPUT_FORMAT_HOSTARGB,
+                                      aOutputOptions);
+  aDataSurface->Unmap();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  encoder.forget(aStream);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+imgTools::EncodeImage(imgIContainer* aContainer,
+                      const nsACString& aMimeType,
+                      const nsAString& aOutputOptions,
+                      nsIInputStream** aStream)
+{
+  // Use frame 0 from the image container.
+  RefPtr<SourceSurface> frame =
+    aContainer->GetFrame(imgIContainer::FRAME_FIRST,
+                         imgIContainer::FLAG_SYNC_DECODE);
+  NS_ENSURE_TRUE(frame, NS_ERROR_FAILURE);
+
+  RefPtr<DataSourceSurface> dataSurface;
+
+  if (frame->GetFormat() == SurfaceFormat::B8G8R8A8) {
+    dataSurface = frame->GetDataSurface();
+  } else {
+    // Convert format to SurfaceFormat::B8G8R8A8
+    dataSurface = gfxUtils::
+      CopySurfaceToDataSourceSurfaceWithFormat(frame,
+                                               SurfaceFormat::B8G8R8A8);
+  }
+
+  NS_ENSURE_TRUE(dataSurface, NS_ERROR_FAILURE);
+
+  return EncodeImageData(dataSurface, aMimeType, aOutputOptions, aStream);
+}
+
+NS_IMETHODIMP
+imgTools::EncodeScaledImage(imgIContainer* aContainer,
+                            const nsACString& aMimeType,
+                            int32_t aScaledWidth,
+                            int32_t aScaledHeight,
+                            const nsAString& aOutputOptions,
+                            nsIInputStream** aStream)
+{
+  NS_ENSURE_ARG(aScaledWidth >= 0 && aScaledHeight >= 0);
+
+  // If no scaled size is specified, we'll just encode the image at its
+  // original size (no scaling).
+  if (aScaledWidth == 0 && aScaledHeight == 0) {
+    return EncodeImage(aContainer, aMimeType, aOutputOptions, aStream);
+  }
+
+  // Use frame 0 from the image container.
+  RefPtr<SourceSurface> frame =
+    aContainer->GetFrame(imgIContainer::FRAME_FIRST,
+                         imgIContainer::FLAG_SYNC_DECODE);
+  NS_ENSURE_TRUE(frame, NS_ERROR_FAILURE);
+
+  int32_t frameWidth = frame->GetSize().width;
+  int32_t frameHeight = frame->GetSize().height;
+
+  // If the given width or height is zero we'll replace it with the image's
+  // original dimensions.
+  if (aScaledWidth == 0) {
+    aScaledWidth = frameWidth;
+  } else if (aScaledHeight == 0) {
+    aScaledHeight = frameHeight;
+  }
+
+  RefPtr<DataSourceSurface> dataSurface =
+    Factory::CreateDataSourceSurface(IntSize(aScaledWidth, aScaledHeight),
+                                     SurfaceFormat::B8G8R8A8);
+  if (NS_WARN_IF(!dataSurface)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  DataSourceSurface::MappedSurface map;
+  if (!dataSurface->Map(DataSourceSurface::MapType::WRITE, &map)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  RefPtr<DrawTarget> dt =
+    Factory::CreateDrawTargetForData(BackendType::CAIRO,
+                                     map.mData,
+                                     dataSurface->GetSize(),
+                                     map.mStride,
+                                     SurfaceFormat::B8G8R8A8);
+  if (!dt) {
+    gfxWarning() << "imgTools::EncodeImage failed in CreateDrawTargetForData";
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
+  dt->DrawSurface(frame,
+                  Rect(0, 0, aScaledWidth, aScaledHeight),
+                  Rect(0, 0, frameWidth, frameHeight),
+                  DrawSurfaceOptions(),
+                  DrawOptions(1.0f, CompositionOp::OP_SOURCE));
+
+  dataSurface->Unmap();
+
+  return EncodeImageData(dataSurface, aMimeType, aOutputOptions, aStream);
+}
+
+NS_IMETHODIMP
+imgTools::EncodeCroppedImage(imgIContainer* aContainer,
+                             const nsACString& aMimeType,
+                             int32_t aOffsetX,
+                             int32_t aOffsetY,
+                             int32_t aWidth,
+                             int32_t aHeight,
+                             const nsAString& aOutputOptions,
+                             nsIInputStream** aStream)
+{
+  NS_ENSURE_ARG(aOffsetX >= 0 && aOffsetY >= 0 && aWidth >= 0 && aHeight >= 0);
+
+  // Offsets must be zero when no width and height are given or else we're out
+  // of bounds.
+  NS_ENSURE_ARG(aWidth + aHeight > 0 || aOffsetX + aOffsetY == 0);
+
+  // If no size is specified then we'll preserve the image's original dimensions
+  // and don't need to crop.
+  if (aWidth == 0 && aHeight == 0) {
+    return EncodeImage(aContainer, aMimeType, aOutputOptions, aStream);
+  }
+
+  // Use frame 0 from the image container.
+  RefPtr<SourceSurface> frame =
+    aContainer->GetFrame(imgIContainer::FRAME_FIRST,
+                         imgIContainer::FLAG_SYNC_DECODE);
+  NS_ENSURE_TRUE(frame, NS_ERROR_FAILURE);
+
+  int32_t frameWidth = frame->GetSize().width;
+  int32_t frameHeight = frame->GetSize().height;
+
+  // If the given width or height is zero we'll replace it with the image's
+  // original dimensions.
+  if (aWidth == 0) {
+    aWidth = frameWidth;
+  } else if (aHeight == 0) {
+    aHeight = frameHeight;
+  }
+
+  // Check that the given crop rectangle is within image bounds.
+  NS_ENSURE_ARG(frameWidth >= aOffsetX + aWidth &&
+                frameHeight >= aOffsetY + aHeight);
+
+  RefPtr<DataSourceSurface> dataSurface =
+    Factory::CreateDataSourceSurface(IntSize(aWidth, aHeight),
+                                     SurfaceFormat::B8G8R8A8,
+                                     /* aZero = */ true);
+  if (NS_WARN_IF(!dataSurface)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  DataSourceSurface::MappedSurface map;
+  if (!dataSurface->Map(DataSourceSurface::MapType::WRITE, &map)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  RefPtr<DrawTarget> dt =
+    Factory::CreateDrawTargetForData(BackendType::CAIRO,
+                                     map.mData,
+                                     dataSurface->GetSize(),
+                                     map.mStride,
+                                     SurfaceFormat::B8G8R8A8);
+  if (!dt) {
+    gfxWarning() <<
+      "imgTools::EncodeCroppedImage failed in CreateDrawTargetForData";
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+  dt->CopySurface(frame,
+                  IntRect(aOffsetX, aOffsetY, aWidth, aHeight),
+                  IntPoint(0, 0));
+
+  dataSurface->Unmap();
+
+  return EncodeImageData(dataSurface, aMimeType, aOutputOptions, aStream);
+}
+
+NS_IMETHODIMP
+imgTools::CreateScriptedObserver(imgIScriptedNotificationObserver* aInner,
+                                 imgINotificationObserver** aObserver)
+{
+  NS_ADDREF(*aObserver = new ScriptedNotificationObserver(aInner));
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+imgTools::GetImgLoaderForDocument(nsIDOMDocument* aDoc, imgILoader** aLoader)
+{
+  nsCOMPtr<nsIDocument> doc = do_QueryInterface(aDoc);
+  NS_IF_ADDREF(*aLoader = nsContentUtils::GetImgLoaderForDocument(doc));
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+imgTools::GetImgCacheForDocument(nsIDOMDocument* aDoc, imgICache** aCache)
+{
+  nsCOMPtr<imgILoader> loader;
+  nsresult rv = GetImgLoaderForDocument(aDoc, getter_AddRefs(loader));
+  NS_ENSURE_SUCCESS(rv, rv);
+  return CallQueryInterface(loader, aCache);
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/imgTools.h firefox-trunk-41.0~a1~hg20150524r245419/image/imgTools.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/imgTools.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/imgTools.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,31 @@
+/* -*- 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_image_imgITools_h
+#define mozilla_image_imgITools_h
+
+#include "imgITools.h"
+
+#define NS_IMGTOOLS_CID \
+{ /* 3d8fa16d-c9e1-4b50-bdef-2c7ae249967a */         \
+     0x3d8fa16d,                                     \
+     0xc9e1,                                         \
+     0x4b50,                                         \
+    {0xbd, 0xef, 0x2c, 0x7a, 0xe2, 0x49, 0x96, 0x7a} \
+}
+
+class imgTools final : public imgITools
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_IMGITOOLS
+
+  imgTools();
+
+private:
+  virtual ~imgTools();
+};
+#endif // mozilla_image_imgITools_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/IProgressObserver.h firefox-trunk-41.0~a1~hg20150524r245419/image/IProgressObserver.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/IProgressObserver.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/IProgressObserver.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,59 @@
+/* -*- 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_image_IProgressObserver_h
+#define mozilla_image_IProgressObserver_h
+
+#include "mozilla/WeakPtr.h"
+#include "nsISupports.h"
+#include "nsRect.h"
+
+namespace mozilla {
+namespace image {
+
+/**
+ * An interface for observing changes to image state, as reported by
+ * ProgressTracker.
+ *
+ * This is the ImageLib-internal version of imgINotificationObserver,
+ * essentially, with implementation details that code outside of ImageLib
+ * shouldn't see.
+ *
+ * XXX(seth): It's preferable to avoid adding anything to this interface if
+ * possible.  In the long term, it would be ideal to get to a place where we can
+ * just use the imgINotificationObserver interface internally as well.
+ */
+class IProgressObserver : public SupportsWeakPtr<IProgressObserver>
+{
+public:
+  MOZ_DECLARE_WEAKREFERENCE_TYPENAME(IProgressObserver)
+
+  // Subclasses may or may not be XPCOM classes, so we just require that they
+  // implement AddRef and Release.
+  NS_IMETHOD_(MozExternalRefCountType) AddRef(void) = 0;
+  NS_IMETHOD_(MozExternalRefCountType) Release(void) = 0;
+
+  // imgINotificationObserver methods:
+  virtual void Notify(int32_t aType, const nsIntRect* aRect = nullptr) = 0;
+  virtual void OnLoadComplete(bool aLastPart) = 0;
+
+  // imgIOnloadBlocker methods:
+  virtual void BlockOnload() = 0;
+  virtual void UnblockOnload() = 0;
+
+  // Other, internal-only methods:
+  virtual void SetHasImage() = 0;
+  virtual void OnStartDecode() = 0;
+  virtual bool NotificationsDeferred() const = 0;
+  virtual void SetNotificationsDeferred(bool aDeferNotifications) = 0;
+
+protected:
+  virtual ~IProgressObserver() { }
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_IProgressObserver_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/moz.build firefox-trunk-41.0~a1~hg20150524r245419/image/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/image/moz.build	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/moz.build	2015-05-25 20:42:42.000000000 +0000
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['build', 'src', 'decoders', 'encoders']
+DIRS += ['build', 'decoders', 'encoders']
 
 with Files('**'):
     BUG_COMPONENT = ('Core', 'ImageLib')
@@ -34,5 +34,75 @@
 XPIDL_MODULE = 'imglib2'
 
 EXPORTS += [
+    'ImageCacheKey.h',
     'ImageLogging.h',
+    'ImageOps.h',
+    'ImageRegion.h',
+    'imgLoader.h',
+    'imgRequest.h',
+    'imgRequestProxy.h',
+    'IProgressObserver.h',
+    'Orientation.h',
+    'SurfaceCache.h',
 ]
+
+UNIFIED_SOURCES += [
+    'ClippedImage.cpp',
+    'DecodePool.cpp',
+    'Decoder.cpp',
+    'DynamicImage.cpp',
+    'FrameAnimator.cpp',
+    'FrozenImage.cpp',
+    'Image.cpp',
+    'ImageCacheKey.cpp',
+    'ImageFactory.cpp',
+    'ImageMetadata.cpp',
+    'ImageOps.cpp',
+    'ImageWrapper.cpp',
+    'imgFrame.cpp',
+    'imgTools.cpp',
+    'MultipartImage.cpp',
+    'OrientedImage.cpp',
+    'ScriptedNotificationObserver.cpp',
+    'ShutdownTracker.cpp',
+    'SourceBuffer.cpp',
+    'SurfaceCache.cpp',
+    'SVGDocumentWrapper.cpp',
+    'VectorImage.cpp',
+]
+if CONFIG['MOZ_ENABLE_SKIA']:
+    UNIFIED_SOURCES += [ 'Downscaler.cpp']
+
+# These files can't be unified because of ImageLogging.h #include order issues.
+SOURCES += [
+    'imgLoader.cpp',
+    'imgRequest.cpp',
+    'imgRequestProxy.cpp',
+    'ProgressTracker.cpp',
+    'RasterImage.cpp',
+]
+
+FAIL_ON_WARNINGS = True
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'xul'
+
+LOCAL_INCLUDES += [
+    # Because SVGDocumentWrapper.cpp includes "mozilla/dom/SVGSVGElement.h"
+    '/dom/base',
+    '/dom/svg',
+    # Access to Skia headers for Downscaler
+    '/gfx/2d',
+    # We need to instantiate the decoders
+    '/image/decoders',
+    # Because VectorImage.cpp includes nsSVGUtils.h and nsSVGEffects.h
+    '/layout/svg',
+    # For URI-related functionality
+    '/netwerk/base',
+    # DecodePool uses thread-related facilities.
+    '/xpcom/threads',
+]
+
+# Because imgFrame.cpp includes "cairo.h"
+CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/MultipartImage.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/MultipartImage.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/MultipartImage.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/MultipartImage.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,337 @@
+/* -*- 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 "MultipartImage.h"
+
+#include "imgINotificationObserver.h"
+
+namespace mozilla {
+namespace image {
+
+///////////////////////////////////////////////////////////////////////////////
+// Helpers
+///////////////////////////////////////////////////////////////////////////////
+
+class NextPartObserver : public IProgressObserver
+{
+public:
+  MOZ_DECLARE_REFCOUNTED_TYPENAME(NextPartObserver)
+  NS_INLINE_DECL_REFCOUNTING(NextPartObserver, override)
+
+  explicit NextPartObserver(MultipartImage* aOwner)
+    : mOwner(aOwner)
+  {
+    MOZ_ASSERT(mOwner);
+  }
+
+  void BeginObserving(Image* aImage)
+  {
+    MOZ_ASSERT(aImage);
+    mImage = aImage;
+
+    nsRefPtr<ProgressTracker> tracker = mImage->GetProgressTracker();
+    tracker->AddObserver(this);
+  }
+
+  void BlockUntilDecodedAndFinishObserving()
+  {
+    // Use GetFrame() to block until our image finishes decoding.
+    mImage->GetFrame(imgIContainer::FRAME_CURRENT,
+                     imgIContainer::FLAG_SYNC_DECODE);
+
+    FinishObserving();
+  }
+
+  virtual void Notify(int32_t aType,
+                      const nsIntRect* aRect = nullptr) override
+  {
+    if (!mImage) {
+      // We've already finished observing the last image we were given.
+      return;
+    }
+
+    if (aType == imgINotificationObserver::FRAME_COMPLETE) {
+      FinishObserving();
+    }
+  }
+
+  virtual void OnLoadComplete(bool aLastPart) override
+  {
+    if (!mImage) {
+      // We've already finished observing the last image we were given.
+      return;
+    }
+
+    // If there's already an error, we may never get a FRAME_COMPLETE
+    // notification, so go ahead and notify our owner right away.
+    nsRefPtr<ProgressTracker> tracker = mImage->GetProgressTracker();
+    if (tracker->GetProgress() & FLAG_HAS_ERROR) {
+      FinishObserving();
+    }
+  }
+
+  // Other notifications are ignored.
+  virtual void BlockOnload() override { }
+  virtual void UnblockOnload() override { }
+  virtual void SetHasImage() override { }
+  virtual void OnStartDecode() override { }
+  virtual bool NotificationsDeferred() const override { return false; }
+  virtual void SetNotificationsDeferred(bool) override { }
+
+private:
+  virtual ~NextPartObserver() { }
+
+  void FinishObserving()
+  {
+    MOZ_ASSERT(mImage);
+
+    nsRefPtr<ProgressTracker> tracker = mImage->GetProgressTracker();
+    tracker->RemoveObserver(this);
+    mImage = nullptr;
+
+    mOwner->FinishTransition();
+  }
+
+  MultipartImage* mOwner;
+  nsRefPtr<Image> mImage;
+};
+
+
+///////////////////////////////////////////////////////////////////////////////
+// Implementation
+///////////////////////////////////////////////////////////////////////////////
+
+MultipartImage::MultipartImage(Image* aFirstPart)
+  : ImageWrapper(aFirstPart)
+  , mDeferNotifications(false)
+{
+  mNextPartObserver = new NextPartObserver(this);
+}
+
+void
+MultipartImage::Init()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(mTracker, "Should've called SetProgressTracker() by now");
+
+  // Start observing the first part.
+  nsRefPtr<ProgressTracker> firstPartTracker =
+    InnerImage()->GetProgressTracker();
+  firstPartTracker->AddObserver(this);
+  InnerImage()->RequestDecode();
+  InnerImage()->IncrementAnimationConsumers();
+}
+
+MultipartImage::~MultipartImage()
+{
+  // Ask our ProgressTracker to drop its weak reference to us.
+  mTracker->ResetImage();
+}
+
+NS_IMPL_QUERY_INTERFACE_INHERITED0(MultipartImage, ImageWrapper)
+NS_IMPL_ADDREF(MultipartImage)
+NS_IMPL_RELEASE(MultipartImage)
+
+void
+MultipartImage::BeginTransitionToPart(Image* aNextPart)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(aNextPart);
+
+  if (mNextPart) {
+    // Let the decoder catch up so we don't drop frames.
+    mNextPartObserver->BlockUntilDecodedAndFinishObserving();
+    MOZ_ASSERT(!mNextPart);
+  }
+
+  mNextPart = aNextPart;
+
+  // Start observing the next part; we'll complete the transition when
+  // NextPartObserver calls FinishTransition.
+  mNextPartObserver->BeginObserving(mNextPart);
+  mNextPart->RequestDecode();
+  mNextPart->IncrementAnimationConsumers();
+}
+
+static Progress
+FilterProgress(Progress aProgress)
+{
+  // Filter out onload blocking notifications, since we don't want to block
+  // onload for multipart images.
+  return aProgress & ~(FLAG_ONLOAD_BLOCKED | FLAG_ONLOAD_UNBLOCKED);
+}
+
+void
+MultipartImage::FinishTransition()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(mNextPart, "Should have a next part here");
+
+  nsRefPtr<ProgressTracker> newCurrentPartTracker =
+    mNextPart->GetProgressTracker();
+  if (newCurrentPartTracker->GetProgress() & FLAG_HAS_ERROR) {
+    // This frame has an error; drop it.
+    mNextPart = nullptr;
+
+    // We still need to notify, though.
+    mTracker->ResetForNewRequest();
+    nsRefPtr<ProgressTracker> currentPartTracker =
+      InnerImage()->GetProgressTracker();
+    mTracker
+      ->SyncNotifyProgress(FilterProgress(currentPartTracker->GetProgress()));
+
+    return;
+  }
+
+  // Stop observing the current part.
+  {
+    nsRefPtr<ProgressTracker> currentPartTracker =
+      InnerImage()->GetProgressTracker();
+    currentPartTracker->RemoveObserver(this);
+  }
+
+  // Make the next part become the current part.
+  mTracker->ResetForNewRequest();
+  SetInnerImage(mNextPart);
+  mNextPart = nullptr;
+  newCurrentPartTracker->AddObserver(this);
+
+  // Finally, send all the notifications for the new current part and send a
+  // FRAME_UPDATE notification so that observers know to redraw.
+  mTracker
+    ->SyncNotifyProgress(FilterProgress(newCurrentPartTracker->GetProgress()),
+                         GetMaxSizedIntRect());
+}
+
+already_AddRefed<imgIContainer>
+MultipartImage::Unwrap()
+{
+  // Although we wrap another image, we don't allow callers to unwrap as. As far
+  // as external code is concerned, MultipartImage is atomic.
+  nsCOMPtr<imgIContainer> image = this;
+  return image.forget();
+}
+
+already_AddRefed<ProgressTracker>
+MultipartImage::GetProgressTracker()
+{
+  MOZ_ASSERT(mTracker);
+  nsRefPtr<ProgressTracker> tracker = mTracker;
+  return tracker.forget();
+}
+
+void
+MultipartImage::SetProgressTracker(ProgressTracker* aTracker)
+{
+  MOZ_ASSERT(aTracker);
+  MOZ_ASSERT(!mTracker);
+  mTracker = aTracker;
+}
+
+nsresult
+MultipartImage::OnImageDataAvailable(nsIRequest* aRequest,
+                                     nsISupports* aContext,
+                                     nsIInputStream* aInStr,
+                                     uint64_t aSourceOffset,
+                                     uint32_t aCount)
+{
+  // Note that this method is special in that we forward it to the next part if
+  // one exists, and *not* the current part.
+
+  // We may trigger notifications that will free mNextPart, so keep it alive.
+  nsRefPtr<Image> nextPart = mNextPart;
+  if (nextPart) {
+    nextPart->OnImageDataAvailable(aRequest, aContext, aInStr,
+                                   aSourceOffset, aCount);
+  } else {
+    InnerImage()->OnImageDataAvailable(aRequest, aContext, aInStr,
+                                       aSourceOffset, aCount);
+  }
+
+  return NS_OK;
+}
+
+nsresult
+MultipartImage::OnImageDataComplete(nsIRequest* aRequest,
+                                    nsISupports* aContext,
+                                    nsresult aStatus,
+                                    bool aLastPart)
+{
+  // Note that this method is special in that we forward it to the next part if
+  // one exists, and *not* the current part.
+
+  // We may trigger notifications that will free mNextPart, so keep it alive.
+  nsRefPtr<Image> nextPart = mNextPart;
+  if (nextPart) {
+    nextPart->OnImageDataComplete(aRequest, aContext, aStatus, aLastPart);
+  } else {
+    InnerImage()->OnImageDataComplete(aRequest, aContext, aStatus, aLastPart);
+  }
+
+  return NS_OK;
+}
+
+void
+MultipartImage::Notify(int32_t aType, const nsIntRect* aRect /* = nullptr*/)
+{
+  if (aType == imgINotificationObserver::SIZE_AVAILABLE) {
+    mTracker->SyncNotifyProgress(FLAG_SIZE_AVAILABLE);
+  } else if (aType == imgINotificationObserver::FRAME_UPDATE) {
+    mTracker->SyncNotifyProgress(NoProgress, *aRect);
+  } else if (aType == imgINotificationObserver::FRAME_COMPLETE) {
+    mTracker->SyncNotifyProgress(FLAG_FRAME_COMPLETE);
+  } else if (aType == imgINotificationObserver::LOAD_COMPLETE) {
+    mTracker->SyncNotifyProgress(FLAG_LOAD_COMPLETE);
+  } else if (aType == imgINotificationObserver::DECODE_COMPLETE) {
+    mTracker->SyncNotifyProgress(FLAG_DECODE_COMPLETE);
+  } else if (aType == imgINotificationObserver::DISCARD) {
+    mTracker->OnDiscard();
+  } else if (aType == imgINotificationObserver::UNLOCKED_DRAW) {
+    mTracker->OnUnlockedDraw();
+  } else if (aType == imgINotificationObserver::IS_ANIMATED) {
+    mTracker->SyncNotifyProgress(FLAG_IS_ANIMATED);
+  } else if (aType == imgINotificationObserver::HAS_TRANSPARENCY) {
+    mTracker->SyncNotifyProgress(FLAG_HAS_TRANSPARENCY);
+  } else {
+    NS_NOTREACHED("Notification list should be exhaustive");
+  }
+}
+
+void
+MultipartImage::OnLoadComplete(bool aLastPart)
+{
+  Progress progress = FLAG_LOAD_COMPLETE;
+  if (aLastPart) {
+    progress |= FLAG_LAST_PART_COMPLETE;
+  }
+  mTracker->SyncNotifyProgress(progress);
+}
+
+void
+MultipartImage::SetHasImage()
+{
+  mTracker->OnImageAvailable();
+}
+
+void
+MultipartImage::OnStartDecode()
+{
+  mTracker->SyncNotifyProgress(FLAG_DECODE_STARTED);
+}
+
+bool
+MultipartImage::NotificationsDeferred() const
+{
+  return mDeferNotifications;
+}
+
+void
+MultipartImage::SetNotificationsDeferred(bool aDeferNotifications)
+{
+  mDeferNotifications = aDeferNotifications;
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/MultipartImage.h firefox-trunk-41.0~a1~hg20150524r245419/image/MultipartImage.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/MultipartImage.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/MultipartImage.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,91 @@
+/* -*- 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_image_MultipartImage_h
+#define mozilla_image_MultipartImage_h
+
+#include "ImageWrapper.h"
+#include "IProgressObserver.h"
+#include "ProgressTracker.h"
+
+namespace mozilla {
+namespace image {
+
+class NextPartObserver;
+
+/**
+ * An Image wrapper that implements support for multipart/x-mixed-replace
+ * images.
+ */
+class MultipartImage
+  : public ImageWrapper
+  , public IProgressObserver
+{
+public:
+  MOZ_DECLARE_REFCOUNTED_TYPENAME(MultipartImage)
+  NS_DECL_ISUPPORTS
+
+  void BeginTransitionToPart(Image* aNextPart);
+
+  // Overridden ImageWrapper methods:
+  virtual already_AddRefed<imgIContainer> Unwrap() override;
+  virtual already_AddRefed<ProgressTracker> GetProgressTracker() override;
+  virtual void SetProgressTracker(ProgressTracker* aTracker) override;
+  virtual nsresult OnImageDataAvailable(nsIRequest* aRequest,
+                                        nsISupports* aContext,
+                                        nsIInputStream* aInStr,
+                                        uint64_t aSourceOffset,
+                                        uint32_t aCount) override;
+  virtual nsresult OnImageDataComplete(nsIRequest* aRequest,
+                                       nsISupports* aContext,
+                                       nsresult aStatus,
+                                       bool aLastPart) override;
+
+  // We don't support locking or track animation consumers for individual parts,
+  // so we override these methods to do nothing.
+  NS_IMETHOD LockImage() override { return NS_OK; }
+  NS_IMETHOD UnlockImage() override { return NS_OK; }
+  virtual void IncrementAnimationConsumers() override { }
+  virtual void DecrementAnimationConsumers() override { }
+#ifdef DEBUG
+  virtual uint32_t GetAnimationConsumers() override { return 1; }
+#endif
+
+  // Overridden IProgressObserver methods:
+  virtual void Notify(int32_t aType,
+                      const nsIntRect* aRect = nullptr) override;
+  virtual void OnLoadComplete(bool aLastPart) override;
+  virtual void SetHasImage() override;
+  virtual void OnStartDecode() override;
+  virtual bool NotificationsDeferred() const override;
+  virtual void SetNotificationsDeferred(bool aDeferNotifications) override;
+
+  // We don't allow multipart images to block onload, so we override these
+  // methods to do nothing.
+  virtual void BlockOnload() override { }
+  virtual void UnblockOnload() override { }
+
+protected:
+  virtual ~MultipartImage();
+
+private:
+  friend class ImageFactory;
+  friend class NextPartObserver;
+
+  explicit MultipartImage(Image* aFirstPart);
+  void Init();
+
+  void FinishTransition();
+
+  nsRefPtr<ProgressTracker> mTracker;
+  nsRefPtr<NextPartObserver> mNextPartObserver;
+  nsRefPtr<Image> mNextPart;
+  bool mDeferNotifications : 1;
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_MultipartImage_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/Orientation.h firefox-trunk-41.0~a1~hg20150524r245419/image/Orientation.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/Orientation.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/Orientation.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,62 @@
+/* -*- 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_image_Orientation_h
+#define mozilla_image_Orientation_h
+
+#include <stdint.h>
+
+namespace mozilla {
+namespace image {
+
+enum class Angle : uint8_t {
+  D0,
+  D90,
+  D180,
+  D270
+};
+
+enum class Flip : uint8_t {
+  Unflipped,
+  Horizontal
+};
+
+/**
+ * A struct that describes an image's orientation as a rotation optionally
+ * followed by a reflection. This may be used to be indicate an image's inherent
+ * orientation or a desired orientation for the image.
+ */
+struct Orientation
+{
+  explicit Orientation(Angle aRotation = Angle::D0,
+                       Flip mFlip = Flip::Unflipped)
+    : rotation(aRotation)
+    , flip(mFlip)
+  { }
+
+  bool IsIdentity() const {
+    return (rotation == Angle::D0) && (flip == Flip::Unflipped);
+  }
+
+  bool SwapsWidthAndHeight() const {
+    return (rotation == Angle::D90) || (rotation == Angle::D270);
+  }
+
+  bool operator==(const Orientation& aOther) const {
+    return (rotation == aOther.rotation) && (flip == aOther.flip);
+  }
+
+  bool operator!=(const Orientation& aOther) const {
+    return !(*this == aOther);
+  }
+
+  Angle rotation;
+  Flip  flip;
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_Orientation_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/OrientedImage.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/OrientedImage.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/OrientedImage.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/OrientedImage.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,347 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <algorithm>
+
+#include "gfx2DGlue.h"
+#include "gfxDrawable.h"
+#include "gfxPlatform.h"
+#include "gfxUtils.h"
+#include "ImageRegion.h"
+#include "SVGImageContext.h"
+
+#include "OrientedImage.h"
+
+using std::swap;
+
+namespace mozilla {
+
+using namespace gfx;
+using layers::LayerManager;
+using layers::ImageContainer;
+
+namespace image {
+
+NS_IMPL_ISUPPORTS_INHERITED0(OrientedImage, ImageWrapper)
+
+NS_IMETHODIMP
+OrientedImage::GetWidth(int32_t* aWidth)
+{
+  if (mOrientation.SwapsWidthAndHeight()) {
+    return InnerImage()->GetHeight(aWidth);
+  } else {
+    return InnerImage()->GetWidth(aWidth);
+  }
+}
+
+NS_IMETHODIMP
+OrientedImage::GetHeight(int32_t* aHeight)
+{
+  if (mOrientation.SwapsWidthAndHeight()) {
+    return InnerImage()->GetWidth(aHeight);
+  } else {
+    return InnerImage()->GetHeight(aHeight);
+  }
+}
+
+NS_IMETHODIMP
+OrientedImage::GetIntrinsicSize(nsSize* aSize)
+{
+  nsresult rv = InnerImage()->GetIntrinsicSize(aSize);
+
+  if (mOrientation.SwapsWidthAndHeight()) {
+    swap(aSize->width, aSize->height);
+  }
+
+  return rv;
+}
+
+NS_IMETHODIMP
+OrientedImage::GetIntrinsicRatio(nsSize* aRatio)
+{
+  nsresult rv = InnerImage()->GetIntrinsicRatio(aRatio);
+
+  if (mOrientation.SwapsWidthAndHeight()) {
+    swap(aRatio->width, aRatio->height);
+  }
+
+  return rv;
+}
+
+NS_IMETHODIMP_(TemporaryRef<SourceSurface>)
+OrientedImage::GetFrame(uint32_t aWhichFrame,
+                        uint32_t aFlags)
+{
+  nsresult rv;
+
+  if (mOrientation.IsIdentity()) {
+    return InnerImage()->GetFrame(aWhichFrame, aFlags);
+  }
+
+  // Get the underlying dimensions.
+  gfxIntSize size;
+  rv = InnerImage()->GetWidth(&size.width);
+  NS_ENSURE_SUCCESS(rv, nullptr);
+  rv = InnerImage()->GetHeight(&size.height);
+  NS_ENSURE_SUCCESS(rv, nullptr);
+
+  // Determine an appropriate format for the surface.
+  gfx::SurfaceFormat surfaceFormat;
+  if (InnerImage()->IsOpaque()) {
+    surfaceFormat = gfx::SurfaceFormat::B8G8R8X8;
+  } else {
+    surfaceFormat = gfx::SurfaceFormat::B8G8R8A8;
+  }
+
+  // Create a surface to draw into.
+  RefPtr<DrawTarget> target =
+    gfxPlatform::GetPlatform()->
+      CreateOffscreenContentDrawTarget(size, surfaceFormat);
+  if (!target) {
+    NS_ERROR("Could not create a DrawTarget");
+    return nullptr;
+  }
+
+
+  // Create our drawable.
+  RefPtr<SourceSurface> innerSurface =
+    InnerImage()->GetFrame(aWhichFrame, aFlags);
+  NS_ENSURE_TRUE(innerSurface, nullptr);
+  nsRefPtr<gfxDrawable> drawable =
+    new gfxSurfaceDrawable(innerSurface, size);
+
+  // Draw.
+  nsRefPtr<gfxContext> ctx = new gfxContext(target);
+  ctx->Multiply(OrientationMatrix(size));
+  gfxUtils::DrawPixelSnapped(ctx, drawable, size,
+                             ImageRegion::Create(size),
+                             surfaceFormat, GraphicsFilter::FILTER_FAST);
+
+  return target->Snapshot();
+}
+
+NS_IMETHODIMP_(bool)
+OrientedImage::IsImageContainerAvailable(LayerManager* aManager, uint32_t aFlags)
+{
+  if (mOrientation.IsIdentity()) {
+    return InnerImage()->IsImageContainerAvailable(aManager, aFlags);
+  }
+  return false;
+}
+
+NS_IMETHODIMP_(already_AddRefed<ImageContainer>)
+OrientedImage::GetImageContainer(LayerManager* aManager, uint32_t aFlags)
+{
+  // XXX(seth): We currently don't have a way of orienting the result of
+  // GetImageContainer. We work around this by always returning null, but if it
+  // ever turns out that OrientedImage is widely used on codepaths that can
+  // actually benefit from GetImageContainer, it would be a good idea to fix
+  // that method for performance reasons.
+
+  if (mOrientation.IsIdentity()) {
+    return InnerImage()->GetImageContainer(aManager, aFlags);
+  }
+
+  return nullptr;
+}
+
+struct MatrixBuilder
+{
+  explicit MatrixBuilder(bool aInvert) : mInvert(aInvert) { }
+
+  gfxMatrix Build() { return mMatrix; }
+
+  void Scale(gfxFloat aX, gfxFloat aY)
+  {
+    if (mInvert) {
+      mMatrix *= gfxMatrix::Scaling(1.0 / aX, 1.0 / aY);
+    } else {
+      mMatrix.Scale(aX, aY);
+    }
+  }
+
+  void Rotate(gfxFloat aPhi)
+  {
+    if (mInvert) {
+      mMatrix *= gfxMatrix::Rotation(-aPhi);
+    } else {
+      mMatrix.Rotate(aPhi);
+    }
+  }
+
+  void Translate(gfxPoint aDelta)
+  {
+    if (mInvert) {
+      mMatrix *= gfxMatrix::Translation(-aDelta);
+    } else {
+      mMatrix.Translate(aDelta);
+    }
+  }
+
+private:
+  gfxMatrix mMatrix;
+  bool      mInvert;
+};
+
+/*
+ * OrientationMatrix() computes a matrix that applies the rotation and
+ * reflection specified by mOrientation, or that matrix's inverse if aInvert is
+ * true.
+ *
+ * @param aSize The scaled size of the inner image. (When outside code specifies
+ *              the scaled size, as with imgIContainer::Draw and its aSize
+ *              parameter, it's necessary to swap the width and height if
+ *              mOrientation.SwapsWidthAndHeight() is true.)
+ * @param aInvert If true, compute the inverse of the orientation matrix. Prefer
+ *                this approach to OrientationMatrix(..).Invert(), because it's
+ *                more numerically accurate.
+ */
+gfxMatrix
+OrientedImage::OrientationMatrix(const nsIntSize& aSize,
+                                 bool aInvert /* = false */)
+{
+  MatrixBuilder builder(aInvert);
+
+  // Apply reflection, if present. (This logically happens second, but we
+  // apply it first because these transformations are all premultiplied.) A
+  // translation is necessary to place the image back in the first quadrant.
+  switch (mOrientation.flip) {
+    case Flip::Unflipped:
+      break;
+    case Flip::Horizontal:
+      if (mOrientation.SwapsWidthAndHeight()) {
+        builder.Translate(gfxPoint(aSize.height, 0));
+      } else {
+        builder.Translate(gfxPoint(aSize.width, 0));
+      }
+      builder.Scale(-1.0, 1.0);
+      break;
+    default:
+      MOZ_ASSERT(false, "Invalid flip value");
+  }
+
+  // Apply rotation, if present. Again, a translation is used to place the
+  // image back in the first quadrant.
+  switch (mOrientation.rotation) {
+    case Angle::D0:
+      break;
+    case Angle::D90:
+      builder.Translate(gfxPoint(aSize.height, 0));
+      builder.Rotate(-1.5 * M_PI);
+      break;
+    case Angle::D180:
+      builder.Translate(gfxPoint(aSize.width, aSize.height));
+      builder.Rotate(-1.0 * M_PI);
+      break;
+    case Angle::D270:
+      builder.Translate(gfxPoint(0, aSize.width));
+      builder.Rotate(-0.5 * M_PI);
+      break;
+    default:
+      MOZ_ASSERT(false, "Invalid rotation value");
+  }
+
+  return builder.Build();
+}
+
+static SVGImageContext
+OrientViewport(const SVGImageContext& aOldContext,
+               const Orientation& aOrientation)
+{
+  CSSIntSize viewportSize(aOldContext.GetViewportSize());
+  if (aOrientation.SwapsWidthAndHeight()) {
+    swap(viewportSize.width, viewportSize.height);
+  }
+  return SVGImageContext(viewportSize,
+                         aOldContext.GetPreserveAspectRatio());
+}
+
+NS_IMETHODIMP_(DrawResult)
+OrientedImage::Draw(gfxContext* aContext,
+                    const nsIntSize& aSize,
+                    const ImageRegion& aRegion,
+                    uint32_t aWhichFrame,
+                    GraphicsFilter aFilter,
+                    const Maybe<SVGImageContext>& aSVGContext,
+                    uint32_t aFlags)
+{
+  if (mOrientation.IsIdentity()) {
+    return InnerImage()->Draw(aContext, aSize, aRegion,
+                              aWhichFrame, aFilter, aSVGContext, aFlags);
+  }
+
+  // Update the image size to match the image's coordinate system. (This could
+  // be done using TransformBounds but since it's only a size a swap is enough.)
+  nsIntSize size(aSize);
+  if (mOrientation.SwapsWidthAndHeight()) {
+    swap(size.width, size.height);
+  }
+
+  // Update the matrix so that we transform the image into the orientation
+  // expected by the caller before drawing.
+  gfxMatrix matrix(OrientationMatrix(size));
+  gfxContextMatrixAutoSaveRestore saveMatrix(aContext);
+  aContext->Multiply(matrix);
+
+  // The region is already in the orientation expected by the caller, but we
+  // need it to be in the image's coordinate system, so we transform it using
+  // the inverse of the orientation matrix.
+  gfxMatrix inverseMatrix(OrientationMatrix(size, /* aInvert = */ true));
+  ImageRegion region(aRegion);
+  region.TransformBoundsBy(inverseMatrix);
+
+  return InnerImage()->Draw(aContext, size, region, aWhichFrame, aFilter,
+                            aSVGContext.map(OrientViewport, mOrientation),
+                            aFlags);
+}
+
+nsIntSize
+OrientedImage::OptimalImageSizeForDest(const gfxSize& aDest,
+                                       uint32_t aWhichFrame,
+                                       GraphicsFilter aFilter, uint32_t aFlags)
+{
+  if (!mOrientation.SwapsWidthAndHeight()) {
+    return InnerImage()->OptimalImageSizeForDest(aDest, aWhichFrame, aFilter,
+                                                 aFlags);
+  }
+
+  // Swap the size for the calculation, then swap it back for the caller.
+  gfxSize destSize(aDest.height, aDest.width);
+  nsIntSize innerImageSize(InnerImage()->OptimalImageSizeForDest(destSize,
+                                                                 aWhichFrame,
+                                                                 aFilter,
+                                                                 aFlags));
+  return nsIntSize(innerImageSize.height, innerImageSize.width);
+}
+
+NS_IMETHODIMP_(nsIntRect)
+OrientedImage::GetImageSpaceInvalidationRect(const nsIntRect& aRect)
+{
+  nsIntRect rect(InnerImage()->GetImageSpaceInvalidationRect(aRect));
+
+  if (mOrientation.IsIdentity()) {
+    return rect;
+  }
+
+  nsIntSize innerSize;
+  nsresult rv = InnerImage()->GetWidth(&innerSize.width);
+  rv = NS_FAILED(rv) ? rv : InnerImage()->GetHeight(&innerSize.height);
+  if (NS_FAILED(rv)) {
+    // Fall back to identity if the width and height aren't available.
+    return rect;
+  }
+
+  // Transform the invalidation rect into the correct orientation.
+  gfxMatrix matrix(OrientationMatrix(innerSize, /* aInvert = */ true));
+  gfxRect invalidRect(matrix.TransformBounds(gfxRect(rect.x, rect.y,
+                                                     rect.width, rect.height)));
+  invalidRect.RoundOut();
+
+  return nsIntRect(invalidRect.x, invalidRect.y,
+                   invalidRect.width, invalidRect.height);
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/OrientedImage.h firefox-trunk-41.0~a1~hg20150524r245419/image/OrientedImage.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/OrientedImage.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/OrientedImage.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,75 @@
+/* -*- 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_image_OrientedImage_h
+#define mozilla_image_OrientedImage_h
+
+#include "ImageWrapper.h"
+#include "mozilla/gfx/2D.h"
+#include "mozilla/RefPtr.h"
+#include "Orientation.h"
+
+namespace mozilla {
+namespace image {
+
+/**
+ * An Image wrapper that rotates and/or flips an image according to a specified
+ * Orientation.
+ *
+ * XXX(seth): There a known (performance, not correctness) issue with
+ * GetImageContainer. See the comments for that method for more information.
+ */
+class OrientedImage : public ImageWrapper
+{
+  typedef gfx::SourceSurface SourceSurface;
+
+public:
+  NS_DECL_ISUPPORTS_INHERITED
+
+  NS_IMETHOD GetWidth(int32_t* aWidth) override;
+  NS_IMETHOD GetHeight(int32_t* aHeight) override;
+  NS_IMETHOD GetIntrinsicSize(nsSize* aSize) override;
+  NS_IMETHOD GetIntrinsicRatio(nsSize* aRatio) override;
+  NS_IMETHOD_(TemporaryRef<SourceSurface>)
+    GetFrame(uint32_t aWhichFrame, uint32_t aFlags) override;
+  NS_IMETHOD_(bool) IsImageContainerAvailable(layers::LayerManager* aManager,
+                                              uint32_t aFlags) override;
+  NS_IMETHOD_(already_AddRefed<layers::ImageContainer>)
+    GetImageContainer(layers::LayerManager* aManager,
+                      uint32_t aFlags) override;
+  NS_IMETHOD_(DrawResult) Draw(gfxContext* aContext,
+                               const nsIntSize& aSize,
+                               const ImageRegion& aRegion,
+                               uint32_t aWhichFrame,
+                               GraphicsFilter aFilter,
+                               const Maybe<SVGImageContext>& aSVGContext,
+                               uint32_t aFlags) override;
+  NS_IMETHOD_(nsIntRect) GetImageSpaceInvalidationRect(
+                                           const nsIntRect& aRect) override;
+  nsIntSize OptimalImageSizeForDest(const gfxSize& aDest,
+                                    uint32_t aWhichFrame,
+                                    GraphicsFilter aFilter,
+                                    uint32_t aFlags) override;
+
+protected:
+  OrientedImage(Image* aImage, Orientation aOrientation)
+    : ImageWrapper(aImage)
+    , mOrientation(aOrientation)
+  { }
+
+  virtual ~OrientedImage() { }
+
+  gfxMatrix OrientationMatrix(const nsIntSize& aSize, bool aInvert = false);
+
+private:
+  Orientation mOrientation;
+
+  friend class ImageOps;
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_OrientedImage_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/ProgressTracker.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/ProgressTracker.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/ProgressTracker.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/ProgressTracker.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,516 @@
+/* -*- 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 "imgINotificationObserver.h"
+#include "imgIRequest.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 {
+
+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) {
+    MOZ_ASSERT(aProgress & FLAG_DECODE_STARTED);
+  }
+  if (aProgress & FLAG_ONLOAD_UNBLOCKED) {
+    MOZ_ASSERT(aProgress & FLAG_ONLOAD_BLOCKED);
+    MOZ_ASSERT(aProgress & (FLAG_FRAME_COMPLETE | 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_LAST_PART_COMPLETE) {
+    MOZ_ASSERT(aProgress & FLAG_LOAD_COMPLETE);
+  }
+  if (aProgress & FLAG_HAS_ERROR) {
+    // No preconditions.
+  }
+}
+
+void
+ProgressTracker::SetImage(Image* aImage)
+{
+  MutexAutoLock lock(mImageMutex);
+  MOZ_ASSERT(aImage, "Setting null image");
+  MOZ_ASSERT(!mImage, "Setting image when we already have one");
+  mImage = aImage;
+}
+
+void
+ProgressTracker::ResetImage()
+{
+  MutexAutoLock lock(mImageMutex);
+  MOZ_ASSERT(mImage, "Resetting image when it's already null!");
+  mImage = nullptr;
+}
+
+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,
+                        IProgressObserver* aObserver)
+      : mTracker(aTracker)
+    {
+      MOZ_ASSERT(NS_IsMainThread(), "Should be created on the main thread");
+      MOZ_ASSERT(aTracker, "aTracker should not be null");
+      MOZ_ASSERT(aObserver, "aObserver should not be null");
+      mObservers.AppendElement(aObserver);
+    }
+
+    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 < mObservers.Length(); ++i) {
+        mObservers[i]->SetNotificationsDeferred(false);
+        mTracker->SyncNotify(mObservers[i]);
+      }
+
+      mTracker->mRunnable = nullptr;
+      return NS_OK;
+    }
+
+    void AddObserver(IProgressObserver* aObserver)
+    {
+      mObservers.AppendElement(aObserver);
+    }
+
+    void RemoveObserver(IProgressObserver* aObserver)
+    {
+      mObservers.RemoveElement(aObserver);
+    }
+
+  private:
+    friend class ProgressTracker;
+
+    nsRefPtr<ProgressTracker> mTracker;
+    nsTArray<nsRefPtr<IProgressObserver>> mObservers;
+};
+
+void
+ProgressTracker::Notify(IProgressObserver* aObserver)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  if (PR_LOG_TEST(GetImgLog(), PR_LOG_DEBUG)) {
+    nsRefPtr<Image> image = GetImage();
+    if (image && image->GetURI()) {
+      nsRefPtr<ImageURL> uri(image->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>");
+    }
+  }
+
+  aObserver->SetNotificationsDeferred(true);
+
+  // If we have an existing runnable that we can use, we just append this
+  // observer to its list of observers to be notified. This ensures we don't
+  // unnecessarily delay onload.
+  AsyncNotifyRunnable* runnable =
+    static_cast<AsyncNotifyRunnable*>(mRunnable.get());
+
+  if (runnable) {
+    runnable->AddObserver(aObserver);
+  } else {
+    mRunnable = new AsyncNotifyRunnable(this, aObserver);
+    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,
+                                    IProgressObserver* aObserver)
+      : mProgressTracker(aProgressTracker)
+      , mObserver(aObserver)
+    {
+      MOZ_ASSERT(NS_IsMainThread(), "Should be created on the main thread");
+      MOZ_ASSERT(mProgressTracker, "mProgressTracker should not be null");
+      MOZ_ASSERT(mObserver, "mObserver should not be null");
+      mImage = mProgressTracker->GetImage();
+    }
+
+    NS_IMETHOD Run()
+    {
+      MOZ_ASSERT(NS_IsMainThread(), "Should be running on the main thread");
+      mObserver->SetNotificationsDeferred(false);
+
+      mProgressTracker->SyncNotify(mObserver);
+      return NS_OK;
+    }
+
+  private:
+    nsRefPtr<ProgressTracker> mProgressTracker;
+    nsRefPtr<IProgressObserver> mObserver;
+
+    // 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(IProgressObserver* aObserver)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  if (PR_LOG_TEST(GetImgLog(), PR_LOG_DEBUG)) {
+    nsRefPtr<Image> image = GetImage();
+    nsAutoCString spec;
+    if (image && image->GetURI()) {
+      image->GetURI()->GetSpec(spec);
+    }
+    LOG_FUNC_WITH_PARAM(GetImgLog(),
+                        "ProgressTracker::NotifyCurrentState", "uri", spec.get());
+  }
+
+  aObserver->SetNotificationsDeferred(true);
+
+  nsCOMPtr<nsIRunnable> ev = new AsyncNotifyCurrentStateRunnable(this,
+                                                                 aObserver);
+  NS_DispatchToCurrentThread(ev);
+}
+
+#define NOTIFY_IMAGE_OBSERVERS(OBSERVERS, FUNC) \
+  do { \
+    ObserverArray::ForwardIterator iter(OBSERVERS); \
+    while (iter.HasMore()) { \
+      nsRefPtr<IProgressObserver> observer = iter.GetNext().get(); \
+      if (observer && !observer->NotificationsDeferred()) { \
+        observer->FUNC; \
+      } \
+    } \
+  } while (false);
+
+/* static */ void
+ProgressTracker::SyncNotifyInternal(ObserverArray& aObservers,
+                                    bool aHasImage,
+                                    Progress aProgress,
+                                    const nsIntRect& aDirtyRect)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  typedef imgINotificationObserver I;
+
+  if (aProgress & FLAG_SIZE_AVAILABLE) {
+    NOTIFY_IMAGE_OBSERVERS(aObservers, Notify(I::SIZE_AVAILABLE));
+  }
+
+  if (aProgress & FLAG_DECODE_STARTED) {
+    NOTIFY_IMAGE_OBSERVERS(aObservers, OnStartDecode());
+  }
+
+  if (aProgress & FLAG_ONLOAD_BLOCKED) {
+    NOTIFY_IMAGE_OBSERVERS(aObservers, 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(aObservers, Notify(I::FRAME_UPDATE, &aDirtyRect));
+    }
+
+    if (aProgress & FLAG_FRAME_COMPLETE) {
+      NOTIFY_IMAGE_OBSERVERS(aObservers, Notify(I::FRAME_COMPLETE));
+    }
+
+    if (aProgress & FLAG_HAS_TRANSPARENCY) {
+      NOTIFY_IMAGE_OBSERVERS(aObservers, Notify(I::HAS_TRANSPARENCY));
+    }
+
+    if (aProgress & FLAG_IS_ANIMATED) {
+      NOTIFY_IMAGE_OBSERVERS(aObservers, Notify(I::IS_ANIMATED));
+    }
+  }
+
+  // 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(aObservers, UnblockOnload());
+  }
+
+  if (aProgress & FLAG_DECODE_COMPLETE) {
+    MOZ_ASSERT(aHasImage, "Stopped decoding without ever having an image?");
+    NOTIFY_IMAGE_OBSERVERS(aObservers, Notify(I::DECODE_COMPLETE));
+  }
+
+  if (aProgress & FLAG_LOAD_COMPLETE) {
+    NOTIFY_IMAGE_OBSERVERS(aObservers,
+                           OnLoadComplete(aProgress & FLAG_LAST_PART_COMPLETE));
+  }
+}
+
+void
+ProgressTracker::SyncNotifyProgress(Progress aProgress,
+                                    const nsIntRect& aInvalidRect
+                                                  /* = nsIntRect() */)
+{
+  MOZ_ASSERT(NS_IsMainThread(), "Use mObservers 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;
+  }
+
+  // XXX(seth): Hack to work around the fact that some observers have bugs and
+  // need to get onload blocking notifications multiple times. We should fix
+  // those observers and remove this.
+  if ((aProgress & FLAG_DECODE_COMPLETE) &&
+      (mProgress & FLAG_ONLOAD_BLOCKED) &&
+      (mProgress & FLAG_ONLOAD_UNBLOCKED)) {
+    progress |= FLAG_ONLOAD_BLOCKED | FLAG_ONLOAD_UNBLOCKED;
+  }
+
+  // Apply the changes.
+  mProgress |= progress;
+
+  CheckProgressConsistency(mProgress);
+
+  // Send notifications.
+  SyncNotifyInternal(mObservers, HasImage(), progress, aInvalidRect);
+
+  if (progress & FLAG_HAS_ERROR) {
+    FireFailureNotification();
+  }
+}
+
+void
+ProgressTracker::SyncNotify(IProgressObserver* aObserver)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsRefPtr<Image> image = GetImage();
+
+  nsAutoCString spec;
+  if (image && image->GetURI()) {
+    image->GetURI()->GetSpec(spec);
+  }
+  LOG_SCOPE_WITH_PARAM(GetImgLog(),
+                       "ProgressTracker::SyncNotify", "uri", spec.get());
+
+  nsIntRect rect;
+  if (image) {
+    if (NS_FAILED(image->GetWidth(&rect.width)) ||
+        NS_FAILED(image->GetHeight(&rect.height))) {
+      // Either the image has no intrinsic size, or it has an error.
+      rect = GetMaxSizedIntRect();
+    }
+  }
+
+  ObserverArray array;
+  array.AppendElement(aObserver);
+  SyncNotifyInternal(array, !!image, mProgress, rect);
+}
+
+void
+ProgressTracker::EmulateRequestFinished(IProgressObserver* aObserver)
+{
+  MOZ_ASSERT(NS_IsMainThread(),
+             "SyncNotifyState and mObservers are not threadsafe");
+  nsRefPtr<IProgressObserver> kungFuDeathGrip(aObserver);
+
+  if (mProgress & FLAG_ONLOAD_BLOCKED && !(mProgress & FLAG_ONLOAD_UNBLOCKED)) {
+    aObserver->UnblockOnload();
+  }
+
+  if (!(mProgress & FLAG_LOAD_COMPLETE)) {
+    aObserver->OnLoadComplete(true);
+  }
+}
+
+void
+ProgressTracker::AddObserver(IProgressObserver* aObserver)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  mObservers.AppendElementUnlessExists(aObserver);
+}
+
+bool
+ProgressTracker::RemoveObserver(IProgressObserver* aObserver)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  // Remove the observer from the list.
+  bool removed = mObservers.RemoveElement(aObserver);
+
+  // Observers can get confused if they don't get all the proper teardown
+  // notifications. Part ways on good terms.
+  if (removed && !aObserver->NotificationsDeferred()) {
+    EmulateRequestFinished(aObserver);
+  }
+
+  // Make sure we don't give callbacks to an observer that isn't interested in
+  // them any more.
+  AsyncNotifyRunnable* runnable =
+    static_cast<AsyncNotifyRunnable*>(mRunnable.get());
+
+  if (aObserver->NotificationsDeferred() && runnable) {
+    runnable->RemoveObserver(aObserver);
+    aObserver->SetNotificationsDeferred(false);
+  }
+
+  return removed;
+}
+
+bool
+ProgressTracker::FirstObserverIs(IProgressObserver* aObserver)
+{
+  MOZ_ASSERT(NS_IsMainThread(), "Use mObservers on main thread only");
+  ObserverArray::ForwardIterator iter(mObservers);
+  while (iter.HasMore()) {
+    nsRefPtr<IProgressObserver> observer = iter.GetNext().get();
+    if (observer) {
+      return observer.get() == aObserver;
+    }
+  }
+  return false;
+}
+
+void
+ProgressTracker::OnUnlockedDraw()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  NOTIFY_IMAGE_OBSERVERS(mObservers,
+                         Notify(imgINotificationObserver::UNLOCKED_DRAW));
+}
+
+void
+ProgressTracker::ResetForNewRequest()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  mProgress = NoProgress;
+  CheckProgressConsistency(mProgress);
+}
+
+void
+ProgressTracker::OnDiscard()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  NOTIFY_IMAGE_OBSERVERS(mObservers,
+                         Notify(imgINotificationObserver::DISCARD));
+}
+
+void
+ProgressTracker::OnImageAvailable()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  // Notify any imgRequestProxys that are observing us that we have an Image.
+  ObserverArray::ForwardIterator iter(mObservers);
+  while (iter.HasMore()) {
+    nsRefPtr<IProgressObserver> observer = iter.GetNext().get();
+    if (observer) {
+      observer->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.
+  nsRefPtr<Image> image = GetImage();
+  if (image) {
+    // Should be on main thread, so ok to create a new nsIURI.
+    nsCOMPtr<nsIURI> uri;
+    {
+      nsRefPtr<ImageURL> threadsafeUriData = image->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 firefox-trunk-41.0~a1~hg20150513r243603/image/ProgressTracker.h firefox-trunk-41.0~a1~hg20150524r245419/image/ProgressTracker.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/ProgressTracker.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/ProgressTracker.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,211 @@
+/* -*- 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_image_ProgressTracker_h
+#define mozilla_image_ProgressTracker_h
+
+#include "mozilla/Mutex.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/WeakPtr.h"
+#include "nsCOMPtr.h"
+#include "nsTObserverArray.h"
+#include "nsThreadUtils.h"
+#include "nsRect.h"
+#include "IProgressObserver.h"
+
+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_LAST_PART_COMPLETE = 1u << 9,
+  FLAG_HAS_ERROR          = 1u << 10  // 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
+ * IProgressObservers, both synchronously and asynchronously.
+ *
+ * When a new observer needs to be notified of the current progress of an image,
+ * call the Notify() method on this class with the relevant observer as its
+ * argument, and the notifications will be replayed to the observer
+ * asynchronously.
+ */
+class ProgressTracker : public mozilla::SupportsWeakPtr<ProgressTracker>
+{
+  virtual ~ProgressTracker() { }
+
+public:
+  MOZ_DECLARE_WEAKREFERENCE_TYPENAME(ProgressTracker)
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(ProgressTracker)
+
+  ProgressTracker()
+    : mImageMutex("ProgressTracker::mImage")
+    , mImage(nullptr)
+    , mProgress(NoProgress)
+  { }
+
+  bool HasImage() const { MutexAutoLock lock(mImageMutex); return mImage; }
+  already_AddRefed<Image> GetImage() const
+  {
+    MutexAutoLock lock(mImageMutex);
+    nsRefPtr<Image> image = mImage;
+    return image.forget();
+  }
+
+  // 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 |aObserver|, and replay
+  // them as well.
+  // Should be called on the main thread only, since observers and GetURI are
+  // not threadsafe.
+  void Notify(IProgressObserver* aObserver);
+
+  // 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 observers and GetURI are
+  // not threadsafe.
+  void NotifyCurrentState(IProgressObserver* aObserver);
+
+  // "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 observers and GetURI are
+  // not threadsafe.
+  void SyncNotify(IProgressObserver* aObserver);
+
+  // 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 of these notifications 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 observers that are using an image and thus concerned
+  // with its loading progress. Weak pointers.
+  void AddObserver(IProgressObserver* aObserver);
+  bool RemoveObserver(IProgressObserver* aObserver);
+  size_t ObserverCount() const {
+    MOZ_ASSERT(NS_IsMainThread(), "Use mObservers on main thread only");
+    return mObservers.Length();
+  }
+
+  // This is intentionally non-general because its sole purpose is to support
+  // 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 FirstObserverIs(IProgressObserver* aObserver);
+
+  // Resets our weak reference to our image. Image subclasses should call this
+  // in their destructor.
+  void ResetImage();
+
+private:
+  typedef nsTObserverArray<mozilla::WeakPtr<IProgressObserver>> ObserverArray;
+  friend class AsyncNotifyRunnable;
+  friend class AsyncNotifyCurrentStateRunnable;
+  friend class ImageFactory;
+
+  ProgressTracker(const ProgressTracker& aOther) = delete;
+
+  // Sets our weak reference to our image. Only ImageFactory should call this.
+  void SetImage(Image* aImage);
+
+  // Send some notifications that would be necessary to make |aObserver| believe
+  // the request is finished downloading and decoding.  We only send
+  // FLAG_LOAD_COMPLETE and FLAG_ONLOAD_UNBLOCKED, and only if necessary.
+  void EmulateRequestFinished(IProgressObserver* aObserver);
+
+  // Main thread only because it deals with the observer service.
+  void FireFailureNotification();
+
+  // Main thread only, since notifications are expected on the main thread, and
+  // mObservers is not threadsafe.
+  static void SyncNotifyInternal(ObserverArray& aObservers,
+                                 bool aHasImage, Progress aProgress,
+                                 const nsIntRect& aInvalidRect);
+
+  nsCOMPtr<nsIRunnable> mRunnable;
+
+  // mImage is a weak ref; it should be set to null when the image goes out of
+  // scope. mImageMutex protects mImage.
+  mutable Mutex mImageMutex;
+  Image* mImage;
+
+  // List of observers attached to the image. Each observer represents a
+  // consumer using the image. Array and/or individual elements should only be
+  // accessed on the main thread.
+  ObserverArray mObservers;
+
+  Progress mProgress;
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_ProgressTracker_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/RasterImage.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/RasterImage.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/RasterImage.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/RasterImage.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,2184 @@
+/* -*- 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/. */
+
+// Must #include ImageLogging.h before any IPDL-generated files or other files
+// that #include prlog.h
+#include "ImageLogging.h"
+
+#include "RasterImage.h"
+
+#include "base/histogram.h"
+#include "gfxPlatform.h"
+#include "nsComponentManagerUtils.h"
+#include "nsError.h"
+#include "Decoder.h"
+#include "nsAutoPtr.h"
+#include "prenv.h"
+#include "prsystem.h"
+#include "ImageContainer.h"
+#include "ImageRegion.h"
+#include "Layers.h"
+#include "nsPresContext.h"
+#include "SourceBuffer.h"
+#include "SurfaceCache.h"
+#include "FrameAnimator.h"
+
+#include "nsPNGDecoder.h"
+#include "nsGIFDecoder2.h"
+#include "nsJPEGDecoder.h"
+#include "nsBMPDecoder.h"
+#include "nsICODecoder.h"
+#include "nsIconDecoder.h"
+
+#include "gfxContext.h"
+
+#include "mozilla/gfx/2D.h"
+#include "mozilla/DebugOnly.h"
+#include "mozilla/Likely.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/Move.h"
+#include "mozilla/MemoryReporting.h"
+#include "mozilla/Services.h"
+#include <stdint.h>
+#include "mozilla/Telemetry.h"
+#include "mozilla/TimeStamp.h"
+#include "mozilla/ClearOnShutdown.h"
+#include "mozilla/gfx/Scale.h"
+
+#include "GeckoProfiler.h"
+#include "gfx2DGlue.h"
+#include "gfxPrefs.h"
+#include <algorithm>
+
+namespace mozilla {
+
+using namespace gfx;
+using namespace layers;
+
+namespace image {
+
+using std::ceil;
+using std::min;
+
+// The maximum number of times any one RasterImage was decoded.  This is only
+// used for statistics.
+static int32_t sMaxDecodeCount = 0;
+
+/* We define our own error checking macros here for 2 reasons:
+ *
+ * 1) Most of the failures we encounter here will (hopefully) be
+ * the result of decoding failures (ie, bad data) and not code
+ * failures. As such, we don't want to clutter up debug consoles
+ * with spurious messages about NS_ENSURE_SUCCESS failures.
+ *
+ * 2) We want to set the internal error flag, shutdown properly,
+ * and end up in an error state.
+ *
+ * So this macro should be called when the desired failure behavior
+ * is to put the container into an error state and return failure.
+ * It goes without saying that macro won't compile outside of a
+ * non-static RasterImage method.
+ */
+#define LOG_CONTAINER_ERROR                      \
+  PR_BEGIN_MACRO                                 \
+  PR_LOG (GetImgLog(), PR_LOG_ERROR,             \
+          ("RasterImage: [this=%p] Error "      \
+           "detected at line %u for image of "   \
+           "type %s\n", this, __LINE__,          \
+           mSourceDataMimeType.get()));          \
+  PR_END_MACRO
+
+#define CONTAINER_ENSURE_SUCCESS(status)      \
+  PR_BEGIN_MACRO                              \
+  nsresult _status = status; /* eval once */  \
+  if (NS_FAILED(_status)) {                   \
+    LOG_CONTAINER_ERROR;                      \
+    DoError();                                \
+    return _status;                           \
+  }                                           \
+ PR_END_MACRO
+
+#define CONTAINER_ENSURE_TRUE(arg, rv)  \
+  PR_BEGIN_MACRO                        \
+  if (!(arg)) {                         \
+    LOG_CONTAINER_ERROR;                \
+    DoError();                          \
+    return rv;                          \
+  }                                     \
+  PR_END_MACRO
+
+class ScaleRunner : public nsRunnable
+{
+  enum ScaleState
+  {
+    eNew,
+    eReady,
+    eFinish,
+    eFinishWithError
+  };
+
+public:
+  ScaleRunner(RasterImage* aImage,
+              uint32_t aImageFlags,
+              const IntSize& aSize,
+              RawAccessFrameRef&& aSrcRef)
+    : mImage(aImage)
+    , mSrcRef(Move(aSrcRef))
+    , mDstSize(aSize)
+    , mImageFlags(aImageFlags)
+    , mState(eNew)
+  {
+    MOZ_ASSERT(!mSrcRef->GetIsPaletted());
+    MOZ_ASSERT(aSize.width > 0 && aSize.height > 0);
+  }
+
+  bool Init()
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+    MOZ_ASSERT(mState == eNew, "Calling Init() twice?");
+
+    // We'll need a destination frame. It's unconditionally ARGB32 because
+    // that's what the scaler outputs.
+    nsRefPtr<imgFrame> tentativeDstFrame = new imgFrame();
+    nsresult rv =
+      tentativeDstFrame->InitForDecoder(mDstSize, SurfaceFormat::B8G8R8A8);
+    if (NS_FAILED(rv)) {
+      return false;
+    }
+
+    // We need a strong reference to the raw data for the destination frame.
+    // (We already got one for the source frame in the constructor.)
+    RawAccessFrameRef tentativeDstRef = tentativeDstFrame->RawAccessRef();
+    if (!tentativeDstRef) {
+      return false;
+    }
+
+    // Everything worked, so commit to these objects and mark ourselves ready.
+    mDstRef = Move(tentativeDstRef);
+    mState = eReady;
+
+    // Insert the new surface into the cache immediately. We need to do this so
+    // that we won't start multiple scaling jobs for the same size.
+    SurfaceCache::Insert(mDstRef.get(), ImageKey(mImage.get()),
+                         RasterSurfaceKey(mDstSize, mImageFlags, 0),
+                         Lifetime::Transient);
+
+    return true;
+  }
+
+  NS_IMETHOD Run() override
+  {
+    if (mState == eReady) {
+      // Collect information from the frames that we need to scale.
+      ScalingData srcData = mSrcRef->GetScalingData();
+      ScalingData dstData = mDstRef->GetScalingData();
+
+      // Actually do the scaling.
+      bool succeeded =
+        gfx::Scale(srcData.mRawData, srcData.mSize.width, srcData.mSize.height,
+                   srcData.mBytesPerRow, dstData.mRawData, mDstSize.width,
+                   mDstSize.height, dstData.mBytesPerRow, srcData.mFormat);
+
+      if (succeeded) {
+        // Mark the frame as complete and discardable.
+        mDstRef->ImageUpdated(mDstRef->GetRect());
+        MOZ_ASSERT(mDstRef->IsImageComplete(),
+                   "Incomplete, but just updated the entire frame");
+      }
+
+      // We need to send notifications and release our references on the main
+      // thread, so finish up there.
+      mState = succeeded ? eFinish : eFinishWithError;
+      NS_DispatchToMainThread(this);
+    } else if (mState == eFinish) {
+      MOZ_ASSERT(NS_IsMainThread());
+      MOZ_ASSERT(mDstRef, "Should have a valid scaled frame");
+
+      // Notify, so observers can redraw.
+      nsRefPtr<RasterImage> image = mImage.get();
+      if (image) {
+        image->NotifyNewScaledFrame();
+      }
+
+      // We're done, so release everything.
+      mSrcRef.reset();
+      mDstRef.reset();
+    } else if (mState == eFinishWithError) {
+      MOZ_ASSERT(NS_IsMainThread());
+      NS_WARNING("HQ scaling failed");
+
+      // Remove the frame from the cache since we know we don't need it.
+      SurfaceCache::RemoveSurface(ImageKey(mImage.get()),
+                                  RasterSurfaceKey(mDstSize,
+                                                   mImageFlags, 0));
+
+      // Release everything we're holding, too.
+      mSrcRef.reset();
+      mDstRef.reset();
+    } else {
+      // mState must be eNew, which is invalid in Run().
+      MOZ_ASSERT(false, "Need to call Init() before dispatching");
+    }
+
+    return NS_OK;
+  }
+
+private:
+  virtual ~ScaleRunner()
+  {
+    MOZ_ASSERT(!mSrcRef && !mDstRef,
+               "Should have released strong refs in Run()");
+  }
+
+  WeakPtr<RasterImage> mImage;
+  RawAccessFrameRef    mSrcRef;
+  RawAccessFrameRef    mDstRef;
+  const IntSize      mDstSize;
+  uint32_t             mImageFlags;
+  ScaleState           mState;
+};
+
+static nsCOMPtr<nsIThread> sScaleWorkerThread = nullptr;
+
+#ifndef DEBUG
+NS_IMPL_ISUPPORTS(RasterImage, imgIContainer, nsIProperties)
+#else
+NS_IMPL_ISUPPORTS(RasterImage, imgIContainer, nsIProperties,
+                  imgIContainerDebug)
+#endif
+
+//******************************************************************************
+RasterImage::RasterImage(ImageURL* aURI /* = nullptr */) :
+  ImageResource(aURI), // invoke superclass's constructor
+  mSize(0,0),
+  mLockCount(0),
+  mDecodeCount(0),
+  mRequestedSampleSize(0),
+  mLastImageContainerDrawResult(DrawResult::NOT_READY),
+#ifdef DEBUG
+  mFramesNotified(0),
+#endif
+  mSourceBuffer(new SourceBuffer()),
+  mFrameCount(0),
+  mHasSize(false),
+  mDecodeOnlyOnDraw(false),
+  mTransient(false),
+  mDiscardable(false),
+  mHasSourceData(false),
+  mHasBeenDecoded(false),
+  mPendingAnimation(false),
+  mAnimationFinished(false),
+  mWantFullDecode(false)
+{
+  Telemetry::GetHistogramById(Telemetry::IMAGE_DECODE_COUNT)->Add(0);
+}
+
+//******************************************************************************
+RasterImage::~RasterImage()
+{
+  // Make sure our SourceBuffer is marked as complete. This will ensure that any
+  // outstanding decoders terminate.
+  if (!mSourceBuffer->IsComplete()) {
+    mSourceBuffer->Complete(NS_ERROR_ABORT);
+  }
+
+  // Release all frames from the surface cache.
+  SurfaceCache::RemoveImage(ImageKey(this));
+}
+
+nsresult
+RasterImage::Init(const char* aMimeType,
+                  uint32_t aFlags)
+{
+  // We don't support re-initialization
+  if (mInitialized) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+
+  // Not sure an error can happen before init, but be safe
+  if (mError) {
+    return NS_ERROR_FAILURE;
+  }
+
+  NS_ENSURE_ARG_POINTER(aMimeType);
+
+  // We must be non-discardable and non-decode-only-on-draw for
+  // transient images.
+  MOZ_ASSERT(!(aFlags & INIT_FLAG_TRANSIENT) ||
+               (!(aFlags & INIT_FLAG_DISCARDABLE) &&
+                !(aFlags & INIT_FLAG_DECODE_ONLY_ON_DRAW) &&
+                !(aFlags & INIT_FLAG_DOWNSCALE_DURING_DECODE)),
+             "Illegal init flags for transient image");
+
+  // Store initialization data
+  mSourceDataMimeType.Assign(aMimeType);
+  mDiscardable = !!(aFlags & INIT_FLAG_DISCARDABLE);
+  mDecodeOnlyOnDraw = !!(aFlags & INIT_FLAG_DECODE_ONLY_ON_DRAW);
+  mWantFullDecode = !!(aFlags & INIT_FLAG_DECODE_IMMEDIATELY);
+  mTransient = !!(aFlags & INIT_FLAG_TRANSIENT);
+  mDownscaleDuringDecode = !!(aFlags & INIT_FLAG_DOWNSCALE_DURING_DECODE);
+
+#ifndef MOZ_ENABLE_SKIA
+  // Downscale-during-decode requires Skia.
+  mDownscaleDuringDecode = false;
+#endif
+
+  // Lock this image's surfaces in the SurfaceCache if we're not discardable.
+  if (!mDiscardable) {
+    mLockCount++;
+    SurfaceCache::LockImage(ImageKey(this));
+  }
+
+  // Create the initial size decoder.
+  nsresult rv = Decode(Nothing(), DECODE_FLAGS_DEFAULT);
+  if (NS_FAILED(rv)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // Mark us as initialized
+  mInitialized = true;
+
+  return NS_OK;
+}
+
+//******************************************************************************
+// [notxpcom] void requestRefresh ([const] in TimeStamp aTime);
+NS_IMETHODIMP_(void)
+RasterImage::RequestRefresh(const TimeStamp& aTime)
+{
+  if (HadRecentRefresh(aTime)) {
+    return;
+  }
+
+  EvaluateAnimation();
+
+  if (!mAnimating) {
+    return;
+  }
+
+  FrameAnimator::RefreshResult res;
+  if (mAnim) {
+    res = mAnim->RequestRefresh(aTime);
+  }
+
+  if (res.frameAdvanced) {
+    // Notify listeners that our frame has actually changed, but do this only
+    // once for all frames that we've now passed (if AdvanceFrame() was called
+    // more than once).
+    #ifdef DEBUG
+      mFramesNotified++;
+    #endif
+
+    NotifyProgress(NoProgress, res.dirtyRect);
+  }
+
+  if (res.animationFinished) {
+    mAnimationFinished = true;
+    EvaluateAnimation();
+  }
+}
+
+//******************************************************************************
+/* readonly attribute int32_t width; */
+NS_IMETHODIMP
+RasterImage::GetWidth(int32_t* aWidth)
+{
+  NS_ENSURE_ARG_POINTER(aWidth);
+
+  if (mError) {
+    *aWidth = 0;
+    return NS_ERROR_FAILURE;
+  }
+
+  *aWidth = mSize.width;
+  return NS_OK;
+}
+
+//******************************************************************************
+/* readonly attribute int32_t height; */
+NS_IMETHODIMP
+RasterImage::GetHeight(int32_t* aHeight)
+{
+  NS_ENSURE_ARG_POINTER(aHeight);
+
+  if (mError) {
+    *aHeight = 0;
+    return NS_ERROR_FAILURE;
+  }
+
+  *aHeight = mSize.height;
+  return NS_OK;
+}
+
+//******************************************************************************
+/* [noscript] readonly attribute nsSize intrinsicSize; */
+NS_IMETHODIMP
+RasterImage::GetIntrinsicSize(nsSize* aSize)
+{
+  if (mError) {
+    return NS_ERROR_FAILURE;
+  }
+
+  *aSize = nsSize(nsPresContext::CSSPixelsToAppUnits(mSize.width),
+                  nsPresContext::CSSPixelsToAppUnits(mSize.height));
+  return NS_OK;
+}
+
+//******************************************************************************
+/* [noscript] readonly attribute nsSize intrinsicRatio; */
+NS_IMETHODIMP
+RasterImage::GetIntrinsicRatio(nsSize* aRatio)
+{
+  if (mError) {
+    return NS_ERROR_FAILURE;
+  }
+
+  *aRatio = nsSize(mSize.width, mSize.height);
+  return NS_OK;
+}
+
+NS_IMETHODIMP_(Orientation)
+RasterImage::GetOrientation()
+{
+  return mOrientation;
+}
+
+//******************************************************************************
+/* unsigned short GetType(); */
+NS_IMETHODIMP
+RasterImage::GetType(uint16_t* aType)
+{
+  NS_ENSURE_ARG_POINTER(aType);
+
+  *aType = imgIContainer::TYPE_RASTER;
+  return NS_OK;
+}
+
+DrawableFrameRef
+RasterImage::LookupFrameInternal(uint32_t aFrameNum,
+                                 const IntSize& aSize,
+                                 uint32_t aFlags)
+{
+  if (!mAnim) {
+    NS_ASSERTION(aFrameNum == 0,
+                 "Don't ask for a frame > 0 if we're not animated!");
+    aFrameNum = 0;
+  }
+
+  if (mAnim && aFrameNum > 0) {
+    MOZ_ASSERT(DecodeFlags(aFlags) == DECODE_FLAGS_DEFAULT,
+               "Can't composite frames with non-default decode flags");
+    return mAnim->GetCompositedFrame(aFrameNum);
+  }
+
+  Maybe<uint32_t> alternateFlags;
+  if (IsOpaque()) {
+    // If we're opaque, we can always substitute a frame that was decoded with a
+    // different decode flag for premultiplied alpha, because that can only
+    // matter for frames with transparency.
+    alternateFlags = Some(aFlags ^ FLAG_DECODE_NO_PREMULTIPLY_ALPHA);
+  }
+
+  // We don't want any substitution for sync decodes (except the premultiplied
+  // alpha optimization above), so we use SurfaceCache::Lookup in this case.
+  if (aFlags & FLAG_SYNC_DECODE) {
+    return SurfaceCache::Lookup(ImageKey(this),
+                                RasterSurfaceKey(aSize,
+                                                 DecodeFlags(aFlags),
+                                                 aFrameNum),
+                                alternateFlags);
+  }
+
+  // We'll return the best match we can find to the requested frame.
+  return SurfaceCache::LookupBestMatch(ImageKey(this),
+                                       RasterSurfaceKey(aSize,
+                                                        DecodeFlags(aFlags),
+                                                        aFrameNum),
+                                       alternateFlags);
+}
+
+DrawableFrameRef
+RasterImage::LookupFrame(uint32_t aFrameNum,
+                         const IntSize& aSize,
+                         uint32_t aFlags)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  IntSize requestedSize = CanDownscaleDuringDecode(aSize, aFlags)
+                        ? aSize : mSize;
+
+  DrawableFrameRef ref = LookupFrameInternal(aFrameNum, requestedSize, aFlags);
+
+  if (!ref && !mHasSize) {
+    // We can't request a decode without knowing our intrinsic size. Give up.
+    return DrawableFrameRef();
+  }
+
+  if (!ref || ref->GetImageSize() != requestedSize) {
+    // The OS threw this frame away. We need to redecode if we can.
+    MOZ_ASSERT(!mAnim, "Animated frames should be locked");
+
+    Decode(Some(requestedSize), aFlags);
+
+    // If we can sync decode, we should already have the frame.
+    if (aFlags & FLAG_SYNC_DECODE) {
+      ref = LookupFrameInternal(aFrameNum, requestedSize, aFlags);
+    }
+  }
+
+  if (!ref) {
+    // We still weren't able to get a frame. Give up.
+    return DrawableFrameRef();
+  }
+
+  if (ref->GetCompositingFailed()) {
+    return DrawableFrameRef();
+  }
+
+  MOZ_ASSERT(!ref || !ref->GetIsPaletted(), "Should not have paletted frame");
+
+  // Sync decoding guarantees that we got the frame, but if it's owned by an
+  // async decoder that's currently running, the contents of the frame may not
+  // be available yet. Make sure we get everything.
+  if (ref && mHasSourceData && (aFlags & FLAG_SYNC_DECODE)) {
+    ref->WaitUntilComplete();
+  }
+
+  return ref;
+}
+
+uint32_t
+RasterImage::GetCurrentFrameIndex() const
+{
+  if (mAnim) {
+    return mAnim->GetCurrentAnimationFrameIndex();
+  }
+
+  return 0;
+}
+
+uint32_t
+RasterImage::GetRequestedFrameIndex(uint32_t aWhichFrame) const
+{
+  return aWhichFrame == FRAME_FIRST ? 0 : GetCurrentFrameIndex();
+}
+
+IntRect
+RasterImage::GetFirstFrameRect()
+{
+  if (mAnim) {
+    return mAnim->GetFirstFrameRefreshArea();
+  }
+
+  // Fall back to our size. This is implicitly zero-size if !mHasSize.
+  return IntRect(IntPoint(0,0), mSize);
+}
+
+NS_IMETHODIMP_(bool)
+RasterImage::IsOpaque()
+{
+  if (mError) {
+    return false;
+  }
+
+  Progress progress = mProgressTracker->GetProgress();
+
+  // If we haven't yet finished decoding, the safe answer is "not opaque".
+  if (!(progress & FLAG_DECODE_COMPLETE)) {
+    return false;
+  }
+
+  // Other, we're opaque if FLAG_HAS_TRANSPARENCY is not set.
+  return !(progress & FLAG_HAS_TRANSPARENCY);
+}
+
+void
+RasterImage::OnSurfaceDiscarded()
+{
+  MOZ_ASSERT(mProgressTracker);
+
+  nsCOMPtr<nsIRunnable> runnable =
+    NS_NewRunnableMethod(mProgressTracker, &ProgressTracker::OnDiscard);
+  NS_DispatchToMainThread(runnable);
+}
+
+//******************************************************************************
+/* readonly attribute boolean animated; */
+NS_IMETHODIMP
+RasterImage::GetAnimated(bool* aAnimated)
+{
+  if (mError) {
+    return NS_ERROR_FAILURE;
+  }
+
+  NS_ENSURE_ARG_POINTER(aAnimated);
+
+  // If we have mAnim, we can know for sure
+  if (mAnim) {
+    *aAnimated = true;
+    return NS_OK;
+  }
+
+  // Otherwise, we need to have been decoded to know for sure, since if we were
+  // decoded at least once mAnim would have been created for animated images
+  if (!mHasBeenDecoded) {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+
+  // We know for sure
+  *aAnimated = false;
+
+  return NS_OK;
+}
+
+//******************************************************************************
+/* [notxpcom] int32_t getFirstFrameDelay (); */
+NS_IMETHODIMP_(int32_t)
+RasterImage::GetFirstFrameDelay()
+{
+  if (mError) {
+    return -1;
+  }
+
+  bool animated = false;
+  if (NS_FAILED(GetAnimated(&animated)) || !animated) {
+    return -1;
+  }
+
+  MOZ_ASSERT(mAnim, "Animated images should have a FrameAnimator");
+  return mAnim->GetTimeoutForFrame(0);
+}
+
+TemporaryRef<SourceSurface>
+RasterImage::CopyFrame(uint32_t aWhichFrame, uint32_t aFlags)
+{
+  if (aWhichFrame > FRAME_MAX_VALUE) {
+    return nullptr;
+  }
+
+  if (mError) {
+    return nullptr;
+  }
+
+  // Get the frame. If it's not there, it's probably the caller's fault for
+  // not waiting for the data to be loaded from the network or not passing
+  // FLAG_SYNC_DECODE
+  DrawableFrameRef frameRef =
+    LookupFrame(GetRequestedFrameIndex(aWhichFrame), mSize, aFlags);
+  if (!frameRef) {
+    // The OS threw this frame away and we couldn't redecode it right now.
+    return nullptr;
+  }
+
+  // Create a 32-bit image surface of our size, but draw using the frame's
+  // rect, implicitly padding the frame out to the image's size.
+
+  IntSize size(mSize.width, mSize.height);
+  RefPtr<DataSourceSurface> surf =
+    Factory::CreateDataSourceSurface(size,
+                                     SurfaceFormat::B8G8R8A8,
+                                     /* aZero = */ true);
+  if (NS_WARN_IF(!surf)) {
+    return nullptr;
+  }
+
+  DataSourceSurface::MappedSurface mapping;
+  DebugOnly<bool> success =
+    surf->Map(DataSourceSurface::MapType::WRITE, &mapping);
+  NS_ASSERTION(success, "Failed to map surface");
+  RefPtr<DrawTarget> target =
+    Factory::CreateDrawTargetForData(BackendType::CAIRO,
+                                     mapping.mData,
+                                     size,
+                                     mapping.mStride,
+                                     SurfaceFormat::B8G8R8A8);
+  if (!target) {
+    gfxWarning() << "RasterImage::CopyFrame failed in CreateDrawTargetForData";
+    return nullptr;
+  }
+
+  IntRect intFrameRect = frameRef->GetRect();
+  Rect rect(intFrameRect.x, intFrameRect.y,
+            intFrameRect.width, intFrameRect.height);
+  if (frameRef->IsSinglePixel()) {
+    target->FillRect(rect, ColorPattern(frameRef->SinglePixelColor()),
+                     DrawOptions(1.0f, CompositionOp::OP_SOURCE));
+  } else {
+    RefPtr<SourceSurface> srcSurf = frameRef->GetSurface();
+    if (!srcSurf) {
+      RecoverFromLossOfFrames(mSize, aFlags);
+      return nullptr;
+    }
+
+    Rect srcRect(0, 0, intFrameRect.width, intFrameRect.height);
+    target->DrawSurface(srcSurf, srcRect, rect);
+  }
+
+  target->Flush();
+  surf->Unmap();
+
+  return surf.forget();
+}
+
+//******************************************************************************
+/* [noscript] SourceSurface getFrame(in uint32_t aWhichFrame,
+ *                                   in uint32_t aFlags); */
+NS_IMETHODIMP_(TemporaryRef<SourceSurface>)
+RasterImage::GetFrame(uint32_t aWhichFrame,
+                      uint32_t aFlags)
+{
+  return GetFrameInternal(aWhichFrame, aFlags).second().forget();
+}
+
+Pair<DrawResult, RefPtr<SourceSurface>>
+RasterImage::GetFrameInternal(uint32_t aWhichFrame, uint32_t aFlags)
+{
+  MOZ_ASSERT(aWhichFrame <= FRAME_MAX_VALUE);
+
+  if (aWhichFrame > FRAME_MAX_VALUE) {
+    return MakePair(DrawResult::BAD_ARGS, RefPtr<SourceSurface>());
+  }
+
+  if (mError) {
+    return MakePair(DrawResult::BAD_IMAGE, RefPtr<SourceSurface>());
+  }
+
+  // Get the frame. If it's not there, it's probably the caller's fault for
+  // not waiting for the data to be loaded from the network or not passing
+  // FLAG_SYNC_DECODE
+  DrawableFrameRef frameRef =
+    LookupFrame(GetRequestedFrameIndex(aWhichFrame), mSize, aFlags);
+  if (!frameRef) {
+    // The OS threw this frame away and we couldn't redecode it.
+    return MakePair(DrawResult::TEMPORARY_ERROR, RefPtr<SourceSurface>());
+  }
+
+  // If this frame covers the entire image, we can just reuse its existing
+  // surface.
+  RefPtr<SourceSurface> frameSurf;
+  IntRect frameRect = frameRef->GetRect();
+  if (frameRect.x == 0 && frameRect.y == 0 &&
+      frameRect.width == mSize.width &&
+      frameRect.height == mSize.height) {
+    frameSurf = frameRef->GetSurface();
+  }
+
+  // The image doesn't have a usable surface because it's been optimized away or
+  // because it's a partial update frame from an animation. Create one.
+  if (!frameSurf) {
+    frameSurf = CopyFrame(aWhichFrame, aFlags);
+  }
+
+  if (!frameRef->IsImageComplete()) {
+    return MakePair(DrawResult::INCOMPLETE, Move(frameSurf));
+  }
+
+  return MakePair(DrawResult::SUCCESS, Move(frameSurf));
+}
+
+Pair<DrawResult, nsRefPtr<layers::Image>>
+RasterImage::GetCurrentImage(ImageContainer* aContainer, uint32_t aFlags)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(aContainer);
+
+  auto result = GetFrameInternal(FRAME_CURRENT, aFlags | FLAG_ASYNC_NOTIFY);
+  if (!result.second()) {
+    // The OS threw out some or all of our buffer. We'll need to wait for the
+    // redecode (which was automatically triggered by GetFrame) to complete.
+    return MakePair(result.first(), nsRefPtr<layers::Image>());
+  }
+
+  CairoImage::Data cairoData;
+  GetWidth(&cairoData.mSize.width);
+  GetHeight(&cairoData.mSize.height);
+  cairoData.mSourceSurface = result.second();
+
+  nsRefPtr<layers::Image> image =
+    aContainer->CreateImage(ImageFormat::CAIRO_SURFACE);
+  MOZ_ASSERT(image);
+
+  static_cast<CairoImage*>(image.get())->SetData(cairoData);
+
+  return MakePair(result.first(), Move(image));
+}
+
+NS_IMETHODIMP_(bool)
+RasterImage::IsImageContainerAvailable(LayerManager* aManager, uint32_t aFlags)
+{
+  int32_t maxTextureSize = aManager->GetMaxTextureSize();
+  if (!mHasSize ||
+      mSize.width > maxTextureSize ||
+      mSize.height > maxTextureSize) {
+    return false;
+  }
+
+  return true;
+}
+
+NS_IMETHODIMP_(already_AddRefed<ImageContainer>)
+RasterImage::GetImageContainer(LayerManager* aManager, uint32_t aFlags)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(aManager);
+  MOZ_ASSERT((aFlags & ~(FLAG_SYNC_DECODE |
+                         FLAG_SYNC_DECODE_IF_FAST |
+                         FLAG_ASYNC_NOTIFY))
+               == FLAG_NONE,
+             "Unsupported flag passed to GetImageContainer");
+
+  int32_t maxTextureSize = aManager->GetMaxTextureSize();
+  if (!mHasSize ||
+      mSize.width > maxTextureSize ||
+      mSize.height > maxTextureSize) {
+    return nullptr;
+  }
+
+  if (IsUnlocked() && mProgressTracker) {
+    mProgressTracker->OnUnlockedDraw();
+  }
+
+  nsRefPtr<layers::ImageContainer> container = mImageContainer.get();
+
+  bool mustRedecode =
+    (aFlags & (FLAG_SYNC_DECODE | FLAG_SYNC_DECODE_IF_FAST)) &&
+    mLastImageContainerDrawResult != DrawResult::SUCCESS &&
+    mLastImageContainerDrawResult != DrawResult::BAD_IMAGE;
+
+  if (container && !mustRedecode) {
+    return container.forget();
+  }
+
+  // We need a new ImageContainer, so create one.
+  container = LayerManager::CreateImageContainer();
+
+  auto result = GetCurrentImage(container, aFlags);
+  if (!result.second()) {
+    // We couldn't get an Image.
+    return nullptr;
+  }
+
+  // |result.second()| holds a reference to a SourceSurface which in turn holds
+  // a lock on the current frame's VolatileBuffer, ensuring that it doesn't get
+  // freed as long as the layer system keeps this ImageContainer alive.
+  container->SetCurrentImageInTransaction(result.second());
+
+  mLastImageContainerDrawResult = result.first();
+  mImageContainer = container;
+
+  return container.forget();
+}
+
+void
+RasterImage::UpdateImageContainer()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsRefPtr<layers::ImageContainer> container = mImageContainer.get();
+  if (!container) {
+    return;
+  }
+
+  auto result = GetCurrentImage(container, FLAG_NONE);
+  if (!result.second()) {
+    // We couldn't get an Image.
+    return;
+  }
+
+  mLastImageContainerDrawResult = result.first();
+  container->SetCurrentImage(result.second());
+}
+
+size_t
+RasterImage::SizeOfSourceWithComputedFallback(MallocSizeOf aMallocSizeOf) const
+{
+  return mSourceBuffer->SizeOfIncludingThisWithComputedFallback(aMallocSizeOf);
+}
+
+void
+RasterImage::CollectSizeOfSurfaces(nsTArray<SurfaceMemoryCounter>& aCounters,
+                                   MallocSizeOf aMallocSizeOf) const
+{
+  SurfaceCache::CollectSizeOfSurfaces(ImageKey(this), aCounters, aMallocSizeOf);
+  if (mAnim) {
+    mAnim->CollectSizeOfCompositingSurfaces(aCounters, aMallocSizeOf);
+  }
+}
+
+class OnAddedFrameRunnable : public nsRunnable
+{
+public:
+  OnAddedFrameRunnable(RasterImage* aImage,
+                       uint32_t aNewFrameCount,
+                       const IntRect& aNewRefreshArea)
+    : mImage(aImage)
+    , mNewFrameCount(aNewFrameCount)
+    , mNewRefreshArea(aNewRefreshArea)
+  {
+    MOZ_ASSERT(aImage);
+  }
+
+  NS_IMETHOD Run()
+  {
+    mImage->OnAddedFrame(mNewFrameCount, mNewRefreshArea);
+    return NS_OK;
+  }
+
+private:
+  nsRefPtr<RasterImage> mImage;
+  uint32_t mNewFrameCount;
+  IntRect mNewRefreshArea;
+};
+
+void
+RasterImage::OnAddedFrame(uint32_t aNewFrameCount,
+                          const IntRect& aNewRefreshArea)
+{
+  if (!NS_IsMainThread()) {
+    nsCOMPtr<nsIRunnable> runnable =
+      new OnAddedFrameRunnable(this, aNewFrameCount, aNewRefreshArea);
+    NS_DispatchToMainThread(runnable);
+    return;
+  }
+
+  MOZ_ASSERT((mFrameCount == 1 && aNewFrameCount == 1) ||
+             mFrameCount < aNewFrameCount,
+             "Frame count running backwards");
+
+  if (mError) {
+    return;  // We're in an error state, possibly due to OOM. Bail.
+  }
+
+  if (aNewFrameCount > mFrameCount) {
+    mFrameCount = aNewFrameCount;
+
+    if (aNewFrameCount == 2) {
+      // We're becoming animated, so initialize animation stuff.
+      MOZ_ASSERT(!mAnim, "Already have animation state?");
+      mAnim = MakeUnique<FrameAnimator>(this, mSize, mAnimationMode);
+
+      // We don't support discarding animated images (See bug 414259).
+      // Lock the image and throw away the key.
+      //
+      // Note that this is inefficient, since we could get rid of the source
+      // data too. However, doing this is actually hard, because we're probably
+      // mid-decode, and thus we're decoding out of the source buffer. Since
+      // we're going to fix this anyway later, and since we didn't kill the
+      // source data in the old world either, locking is acceptable for the
+      // moment.
+      LockImage();
+
+      if (mPendingAnimation && ShouldAnimate()) {
+        StartAnimation();
+      }
+    }
+    if (aNewFrameCount > 1) {
+      mAnim->UnionFirstFrameRefreshArea(aNewRefreshArea);
+    }
+  }
+}
+
+nsresult
+RasterImage::SetSize(int32_t aWidth, int32_t aHeight, Orientation aOrientation)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  if (mError) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // Ensure that we have positive values
+  // XXX - Why isn't the size unsigned? Should this be changed?
+  if ((aWidth < 0) || (aHeight < 0)) {
+    return NS_ERROR_INVALID_ARG;
+  }
+
+  // if we already have a size, check the new size against the old one
+  if (mHasSize &&
+      ((aWidth != mSize.width) ||
+       (aHeight != mSize.height) ||
+       (aOrientation != mOrientation))) {
+    NS_WARNING("Image changed size on redecode! This should not happen!");
+    DoError();
+    return NS_ERROR_UNEXPECTED;
+  }
+
+  // Set the size and flag that we have it
+  mSize.SizeTo(aWidth, aHeight);
+  mOrientation = aOrientation;
+  mHasSize = true;
+
+  return NS_OK;
+}
+
+void
+RasterImage::OnDecodingComplete()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  if (mError) {
+    return;
+  }
+
+  // Flag that we've been decoded before.
+  mHasBeenDecoded = true;
+
+  // Let our FrameAnimator know not to expect any more frames.
+  if (mAnim) {
+    mAnim->SetDoneDecoding(true);
+  }
+}
+
+NS_IMETHODIMP
+RasterImage::SetAnimationMode(uint16_t aAnimationMode)
+{
+  if (mAnim) {
+    mAnim->SetAnimationMode(aAnimationMode);
+  }
+  return SetAnimationModeInternal(aAnimationMode);
+}
+
+//******************************************************************************
+/* void StartAnimation () */
+nsresult
+RasterImage::StartAnimation()
+{
+  if (mError) {
+    return NS_ERROR_FAILURE;
+  }
+
+  MOZ_ASSERT(ShouldAnimate(), "Should not animate!");
+
+  // If we don't have mAnim yet, then we're not ready to animate.  Setting
+  // mPendingAnimation will cause us to start animating as soon as we have a
+  // second frame, which causes mAnim to be constructed.
+  mPendingAnimation = !mAnim;
+  if (mPendingAnimation) {
+    return NS_OK;
+  }
+
+  // A timeout of -1 means we should display this frame forever.
+  if (mAnim->GetTimeoutForFrame(GetCurrentFrameIndex()) < 0) {
+    mAnimationFinished = true;
+    return NS_ERROR_ABORT;
+  }
+
+  // We need to set the time that this initial frame was first displayed, as
+  // this is used in AdvanceFrame().
+  mAnim->InitAnimationFrameTimeIfNecessary();
+
+  return NS_OK;
+}
+
+//******************************************************************************
+/* void stopAnimation (); */
+nsresult
+RasterImage::StopAnimation()
+{
+  MOZ_ASSERT(mAnimating, "Should be animating!");
+
+  nsresult rv = NS_OK;
+  if (mError) {
+    rv = NS_ERROR_FAILURE;
+  } else {
+    mAnim->SetAnimationFrameTime(TimeStamp());
+  }
+
+  mAnimating = false;
+  return rv;
+}
+
+//******************************************************************************
+/* void resetAnimation (); */
+NS_IMETHODIMP
+RasterImage::ResetAnimation()
+{
+  if (mError) {
+    return NS_ERROR_FAILURE;
+    }
+
+  mPendingAnimation = false;
+
+  if (mAnimationMode == kDontAnimMode || !mAnim ||
+      mAnim->GetCurrentAnimationFrameIndex() == 0) {
+    return NS_OK;
+  }
+
+  mAnimationFinished = false;
+
+  if (mAnimating) {
+    StopAnimation();
+  }
+
+  MOZ_ASSERT(mAnim, "Should have a FrameAnimator");
+  mAnim->ResetAnimation();
+
+  NotifyProgress(NoProgress, mAnim->GetFirstFrameRefreshArea());
+
+  // Start the animation again. It may not have been running before, if
+  // mAnimationFinished was true before entering this function.
+  EvaluateAnimation();
+
+  return NS_OK;
+}
+
+//******************************************************************************
+// [notxpcom] void setAnimationStartTime ([const] in TimeStamp aTime);
+NS_IMETHODIMP_(void)
+RasterImage::SetAnimationStartTime(const TimeStamp& aTime)
+{
+  if (mError || mAnimationMode == kDontAnimMode || mAnimating || !mAnim) {
+    return;
+  }
+
+  mAnim->SetAnimationFrameTime(aTime);
+}
+
+NS_IMETHODIMP_(float)
+RasterImage::GetFrameIndex(uint32_t aWhichFrame)
+{
+  MOZ_ASSERT(aWhichFrame <= FRAME_MAX_VALUE, "Invalid argument");
+  return (aWhichFrame == FRAME_FIRST || !mAnim)
+         ? 0.0f
+         : mAnim->GetCurrentAnimationFrameIndex();
+}
+
+void
+RasterImage::SetLoopCount(int32_t aLoopCount)
+{
+  if (mError) {
+    return;
+  }
+
+  // No need to set this if we're not an animation.
+  if (mAnim) {
+    mAnim->SetLoopCount(aLoopCount);
+  }
+}
+
+NS_IMETHODIMP_(IntRect)
+RasterImage::GetImageSpaceInvalidationRect(const IntRect& aRect)
+{
+  return aRect;
+}
+
+nsresult
+RasterImage::OnImageDataComplete(nsIRequest*, nsISupports*, nsresult aStatus,
+                                 bool aLastPart)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  // Record that we have all the data we're going to get now.
+  mHasSourceData = true;
+
+  // Let decoders know that there won't be any more data coming.
+  mSourceBuffer->Complete(aStatus);
+
+  if (!mHasSize) {
+    // We need to guarantee that we've gotten the image's size, or at least
+    // determined that we won't be able to get it, before we deliver the load
+    // event. That means we have to do a synchronous size decode here.
+    Decode(Nothing(), FLAG_SYNC_DECODE);
+  }
+
+  // Determine our final status, giving precedence to Necko failure codes. We
+  // check after running the size decode above in case it triggered an error.
+  nsresult finalStatus = mError ? NS_ERROR_FAILURE : NS_OK;
+  if (NS_FAILED(aStatus)) {
+    finalStatus = aStatus;
+  }
+
+  // If loading failed, report an error.
+  if (NS_FAILED(finalStatus)) {
+    DoError();
+  }
+
+  MOZ_ASSERT(mHasSize || mError, "Need to know size before firing load event");
+  MOZ_ASSERT(!mHasSize ||
+             (mProgressTracker->GetProgress() & FLAG_SIZE_AVAILABLE),
+             "Should have notified that the size is available if we have it");
+
+  Progress loadProgress = LoadCompleteProgress(aLastPart, mError, finalStatus);
+
+  if (mDecodeOnlyOnDraw) {
+    // For decode-only-on-draw images, we want to send notifications as if we've
+    // already finished decoding. Otherwise some observers will never even try
+    // to draw. (We may have already sent some of these notifications from
+    // NotifyForDecodeOnlyOnDraw(), but ProgressTracker will ensure no duplicate
+    // notifications get sent.)
+    loadProgress |= FLAG_ONLOAD_BLOCKED |
+                    FLAG_DECODE_STARTED |
+                    FLAG_FRAME_COMPLETE |
+                    FLAG_DECODE_COMPLETE |
+                    FLAG_ONLOAD_UNBLOCKED;
+  }
+
+  // Notify our listeners, which will fire this image's load event.
+  NotifyProgress(loadProgress);
+
+  return finalStatus;
+}
+
+void
+RasterImage::NotifyForDecodeOnlyOnDraw()
+{
+  if (!NS_IsMainThread()) {
+    nsCOMPtr<nsIRunnable> runnable =
+      NS_NewRunnableMethod(this, &RasterImage::NotifyForDecodeOnlyOnDraw);
+    NS_DispatchToMainThread(runnable);
+    return;
+  }
+
+  NotifyProgress(FLAG_DECODE_STARTED | FLAG_ONLOAD_BLOCKED);
+}
+
+nsresult
+RasterImage::OnImageDataAvailable(nsIRequest*,
+                                  nsISupports*,
+                                  nsIInputStream* aInStr,
+                                  uint64_t aOffset,
+                                  uint32_t aCount)
+{
+  nsresult rv;
+
+  if (MOZ_UNLIKELY(mDecodeOnlyOnDraw && aOffset == 0)) {
+    // If we're a decode-only-on-draw image, send notifications as if we've just
+    // started decoding.
+    NotifyForDecodeOnlyOnDraw();
+  }
+
+  // WriteToSourceBuffer always consumes everything it gets if it doesn't run
+  // out of memory.
+  uint32_t bytesRead;
+  rv = aInStr->ReadSegments(WriteToSourceBuffer, this, aCount, &bytesRead);
+
+  MOZ_ASSERT(bytesRead == aCount || HasError() || NS_FAILED(rv),
+    "WriteToSourceBuffer should consume everything if ReadSegments succeeds or "
+    "the image must be in error!");
+
+  return rv;
+}
+
+nsresult
+RasterImage::SetSourceSizeHint(uint32_t aSizeHint)
+{
+  return mSourceBuffer->ExpectLength(aSizeHint);
+}
+
+/********* Methods to implement lazy allocation of nsIProperties object *******/
+NS_IMETHODIMP
+RasterImage::Get(const char* prop, const nsIID& iid, void** result)
+{
+  if (!mProperties) {
+    return NS_ERROR_FAILURE;
+  }
+  return mProperties->Get(prop, iid, result);
+}
+
+NS_IMETHODIMP
+RasterImage::Set(const char* prop, nsISupports* value)
+{
+  if (!mProperties) {
+    mProperties = do_CreateInstance("@mozilla.org/properties;1");
+  }
+  if (!mProperties) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+  return mProperties->Set(prop, value);
+}
+
+NS_IMETHODIMP
+RasterImage::Has(const char* prop, bool* _retval)
+{
+  NS_ENSURE_ARG_POINTER(_retval);
+  if (!mProperties) {
+    *_retval = false;
+    return NS_OK;
+  }
+  return mProperties->Has(prop, _retval);
+}
+
+NS_IMETHODIMP
+RasterImage::Undefine(const char* prop)
+{
+  if (!mProperties) {
+    return NS_ERROR_FAILURE;
+  }
+  return mProperties->Undefine(prop);
+}
+
+NS_IMETHODIMP
+RasterImage::GetKeys(uint32_t* count, char*** keys)
+{
+  if (!mProperties) {
+    *count = 0;
+    *keys = nullptr;
+    return NS_OK;
+  }
+  return mProperties->GetKeys(count, keys);
+}
+
+void
+RasterImage::Discard()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(CanDiscard(), "Asked to discard but can't");
+  MOZ_ASSERT(!mAnim, "Asked to discard for animated image");
+
+  // Delete all the decoded frames.
+  SurfaceCache::RemoveImage(ImageKey(this));
+
+  // Notify that we discarded.
+  if (mProgressTracker) {
+    mProgressTracker->OnDiscard();
+  }
+}
+
+bool
+RasterImage::CanDiscard() {
+  return mHasSourceData &&       // ...have the source data...
+         !mAnim;                 // Can never discard animated images
+}
+
+// Sets up a decoder for this image.
+already_AddRefed<Decoder>
+RasterImage::CreateDecoder(const Maybe<IntSize>& aSize, uint32_t aFlags)
+{
+  // Make sure we actually get size before doing a full decode.
+  if (aSize) {
+    MOZ_ASSERT(mHasSize, "Must do a size decode before a full decode!");
+    MOZ_ASSERT(mDownscaleDuringDecode || *aSize == mSize,
+               "Can only decode to our intrinsic size if we're not allowed to "
+               "downscale-during-decode");
+  } else {
+    MOZ_ASSERT(!mHasSize, "Should not do unnecessary size decodes");
+  }
+
+  // Figure out which decoder we want.
+  eDecoderType type = GetDecoderType(mSourceDataMimeType.get());
+  if (type == eDecoderType_unknown) {
+    return nullptr;
+  }
+
+  // Instantiate the appropriate decoder.
+  nsRefPtr<Decoder> decoder;
+  switch (type) {
+    case eDecoderType_png:
+      decoder = new nsPNGDecoder(this);
+      break;
+    case eDecoderType_gif:
+      decoder = new nsGIFDecoder2(this);
+      break;
+    case eDecoderType_jpeg:
+      // If we have all the data we don't want to waste cpu time doing
+      // a progressive decode.
+      decoder = new nsJPEGDecoder(this,
+                                  mHasBeenDecoded ? Decoder::SEQUENTIAL :
+                                                    Decoder::PROGRESSIVE);
+      break;
+    case eDecoderType_bmp:
+      decoder = new nsBMPDecoder(this);
+      break;
+    case eDecoderType_ico:
+      decoder = new nsICODecoder(this);
+      break;
+    case eDecoderType_icon:
+      decoder = new nsIconDecoder(this);
+      break;
+    default:
+      MOZ_ASSERT_UNREACHABLE("Unknown decoder type");
+  }
+
+  MOZ_ASSERT(decoder, "Should have a decoder now");
+
+  // Initialize the decoder.
+  decoder->SetSizeDecode(!aSize);
+  decoder->SetSendPartialInvalidations(!mHasBeenDecoded);
+  decoder->SetImageIsTransient(mTransient);
+  decoder->SetFlags(aFlags);
+
+  if (!mHasBeenDecoded && aSize) {
+    // Lock the image while we're decoding, so that it doesn't get evicted from
+    // the SurfaceCache before we have a chance to realize that it's animated.
+    // The corresponding unlock happens in FinalizeDecoder.
+    LockImage();
+    decoder->SetImageIsLocked();
+  }
+
+  if (aSize) {
+    // We already have the size; tell the decoder so it can preallocate a
+    // frame.  By default, we create an ARGB frame with no offset. If decoders
+    // need a different type, they need to ask for it themselves.
+    // XXX(seth): Note that we call SetSize() and NeedNewFrame() with the
+    // image's intrinsic size, but AllocateFrame with our target size.
+    decoder->SetSize(mSize, mOrientation);
+    decoder->NeedNewFrame(0, 0, 0, aSize->width, aSize->height,
+                          SurfaceFormat::B8G8R8A8);
+    decoder->AllocateFrame(*aSize);
+  }
+  decoder->SetIterator(mSourceBuffer->Iterator());
+
+  // Set a target size for downscale-during-decode if applicable.
+  if (mDownscaleDuringDecode && aSize && *aSize != mSize) {
+    DebugOnly<nsresult> rv = decoder->SetTargetSize(*aSize);
+    MOZ_ASSERT(nsresult(rv) != NS_ERROR_NOT_AVAILABLE,
+               "We're downscale-during-decode but decoder doesn't support it?");
+    MOZ_ASSERT(NS_SUCCEEDED(rv), "Bad downscale-during-decode target size?");
+  }
+
+  decoder->Init();
+
+  if (NS_FAILED(decoder->GetDecoderError())) {
+    return nullptr;
+  }
+
+  if (!aSize) {
+    Telemetry::GetHistogramById(
+      Telemetry::IMAGE_DECODE_COUNT)->Subtract(mDecodeCount);
+    mDecodeCount++;
+    Telemetry::GetHistogramById(
+      Telemetry::IMAGE_DECODE_COUNT)->Add(mDecodeCount);
+
+    if (mDecodeCount > sMaxDecodeCount) {
+      // Don't subtract out 0 from the histogram, because that causes its count
+      // to go negative, which is not kosher.
+      if (sMaxDecodeCount > 0) {
+        Telemetry::GetHistogramById(
+          Telemetry::IMAGE_MAX_DECODE_COUNT)->Subtract(sMaxDecodeCount);
+      }
+      sMaxDecodeCount = mDecodeCount;
+      Telemetry::GetHistogramById(
+        Telemetry::IMAGE_MAX_DECODE_COUNT)->Add(sMaxDecodeCount);
+    }
+  }
+
+  return decoder.forget();
+}
+
+//******************************************************************************
+/* void requestDecode() */
+NS_IMETHODIMP
+RasterImage::RequestDecode()
+{
+  // For decode-only-on-draw images, we only act on RequestDecodeForSize.
+  if (mDecodeOnlyOnDraw) {
+    return NS_OK;
+  }
+
+  return RequestDecodeForSize(mSize, DECODE_FLAGS_DEFAULT);
+}
+
+/* void startDecode() */
+NS_IMETHODIMP
+RasterImage::StartDecoding()
+{
+  // For decode-only-on-draw images, we only act on RequestDecodeForSize.
+  if (mDecodeOnlyOnDraw) {
+    return NS_OK;
+  }
+
+  return RequestDecodeForSize(mSize, FLAG_SYNC_DECODE_IF_FAST);
+}
+
+NS_IMETHODIMP
+RasterImage::RequestDecodeForSize(const IntSize& aSize, uint32_t aFlags)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  if (mError) {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (!mHasSize) {
+    mWantFullDecode = true;
+    return NS_OK;
+  }
+
+  // Fall back to our intrinsic size if we don't support
+  // downscale-during-decode.
+  IntSize targetSize = mDownscaleDuringDecode ? aSize : mSize;
+
+  // Decide whether to sync decode images we can decode quickly. Here we are
+  // explicitly trading off flashing for responsiveness in the case that we're
+  // redecoding an image (see bug 845147).
+  bool shouldSyncDecodeIfFast =
+    !mHasBeenDecoded && (aFlags & FLAG_SYNC_DECODE_IF_FAST);
+
+  uint32_t flags = shouldSyncDecodeIfFast
+                 ? aFlags
+                 : aFlags & ~FLAG_SYNC_DECODE_IF_FAST;
+
+  // Look up the first frame of the image, which will implicitly start decoding
+  // if it's not available right now.
+  LookupFrame(0, targetSize, flags);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+RasterImage::Decode(const Maybe<IntSize>& aSize, uint32_t aFlags)
+{
+  MOZ_ASSERT(!aSize || NS_IsMainThread());
+
+  if (mError) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // If we don't have a size yet, we can't do any other decoding.
+  if (!mHasSize && aSize) {
+    mWantFullDecode = true;
+    return NS_OK;
+  }
+
+  if (mDownscaleDuringDecode && aSize) {
+    // We're about to decode again, which may mean that some of the previous
+    // sizes we've decoded at aren't useful anymore. We can allow them to
+    // expire from the cache by unlocking them here. When the decode finishes,
+    // it will send an invalidation that will cause all instances of this image
+    // to redraw. If this image is locked, any surfaces that are still useful
+    // will become locked again when LookupFrame touches them, and the remainder
+    // will eventually expire.
+    SurfaceCache::UnlockSurfaces(ImageKey(this));
+  }
+
+  // Create a decoder.
+  nsRefPtr<Decoder> decoder = CreateDecoder(aSize, aFlags);
+  if (!decoder) {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (aSize) {
+    // This isn't a size decode (which doesn't send any early notifications), so
+    // send out notifications right away.
+    NotifyProgress(decoder->TakeProgress(),
+                   decoder->TakeInvalidRect(),
+                   decoder->GetDecodeFlags());
+  }
+
+  if (mHasSourceData) {
+    // If we have all the data, we can sync decode if requested.
+    if (aFlags & FLAG_SYNC_DECODE) {
+      PROFILER_LABEL_PRINTF("DecodePool", "SyncDecodeIfPossible",
+        js::ProfileEntry::Category::GRAPHICS, "%s", GetURIString().get());
+      DecodePool::Singleton()->SyncDecodeIfPossible(decoder);
+      return NS_OK;
+    }
+
+    if (aFlags & FLAG_SYNC_DECODE_IF_FAST) {
+      PROFILER_LABEL_PRINTF("DecodePool", "SyncDecodeIfSmall",
+        js::ProfileEntry::Category::GRAPHICS, "%s", GetURIString().get());
+      DecodePool::Singleton()->SyncDecodeIfSmall(decoder);
+      return NS_OK;
+    }
+  }
+
+  // Perform an async decode. We also take this path if we don't have all the
+  // source data yet, since sync decoding is impossible in that situation.
+  DecodePool::Singleton()->AsyncDecode(decoder);
+  return NS_OK;
+}
+
+void
+RasterImage::RecoverFromLossOfFrames(const IntSize& aSize, uint32_t aFlags)
+{
+  if (!mHasSize) {
+    return;
+  }
+
+  NS_WARNING("An imgFrame became invalid. Attempting to recover...");
+
+  // Discard all existing frames, since they're probably all now invalid.
+  SurfaceCache::RemoveImage(ImageKey(this));
+
+  // Animated images require some special handling, because we normally require
+  // that they never be discarded.
+  if (mAnim) {
+    Decode(Some(mSize), aFlags | FLAG_SYNC_DECODE);
+    ResetAnimation();
+    return;
+  }
+
+  // For non-animated images, it's fine to recover using an async decode.
+  Decode(Some(aSize), aFlags);
+}
+
+bool
+RasterImage::CanScale(GraphicsFilter aFilter,
+                      const IntSize& aSize,
+                      uint32_t aFlags)
+{
+#ifndef MOZ_ENABLE_SKIA
+  // The high-quality scaler requires Skia.
+  return false;
+#else
+  // Check basic requirements: HQ downscaling is enabled, we have all the source
+  // data and know our size, the flags allow us to do it, and a 'good' filter is
+  // being used. The flags may ask us not to scale because the caller isn't
+  // drawing to the window. If we're drawing to something else (e.g. a canvas)
+  // we usually have no way of updating what we've drawn, so HQ scaling is
+  // useless.
+  if (!gfxPrefs::ImageHQDownscalingEnabled() || !mHasSize || !mHasSourceData ||
+      !(aFlags & imgIContainer::FLAG_HIGH_QUALITY_SCALING) ||
+      aFilter != GraphicsFilter::FILTER_GOOD) {
+    return false;
+  }
+
+  // We don't HQ scale images that we can downscale during decode.
+  if (mDownscaleDuringDecode) {
+    return false;
+  }
+
+  // We don't use the scaler for animated or transient images to avoid doing a
+  // bunch of work on an image that just gets thrown away.
+  if (mAnim || mTransient) {
+    return false;
+  }
+
+  // If target size is 1:1 with original, don't scale.
+  if (aSize == mSize) {
+    return false;
+  }
+
+  // To save memory, don't quality upscale images bigger than the limit.
+  if (aSize.width > mSize.width || aSize.height > mSize.height) {
+    uint32_t scaledSize = static_cast<uint32_t>(aSize.width * aSize.height);
+    if (scaledSize > gfxPrefs::ImageHQUpscalingMaxSize()) {
+      return false;
+    }
+  }
+
+  // There's no point in scaling if we can't store the result.
+  if (!SurfaceCache::CanHold(aSize)) {
+    return false;
+  }
+
+  // XXX(seth): It's not clear what this check buys us over
+  // gfxPrefs::ImageHQUpscalingMaxSize().
+  // The default value of this pref is 1000, which means that we never upscale.
+  // If that's all it's getting us, I'd rather we just forbid that explicitly.
+  gfx::Size scale(double(aSize.width) / mSize.width,
+                  double(aSize.height) / mSize.height);
+  gfxFloat minFactor = gfxPrefs::ImageHQDownscalingMinFactor() / 1000.0;
+  return (scale.width < minFactor || scale.height < minFactor);
+#endif
+}
+
+bool
+RasterImage::CanDownscaleDuringDecode(const IntSize& aSize, uint32_t aFlags)
+{
+  // Check basic requirements: downscale-during-decode is enabled for this
+  // image, we have all the source data and know our size, the flags allow us to
+  // do it, and a 'good' filter is being used.
+  if (!mDownscaleDuringDecode || !mHasSize ||
+      !(aFlags & imgIContainer::FLAG_HIGH_QUALITY_SCALING)) {
+    return false;
+  }
+
+  // We don't downscale animated images during decode.
+  if (mAnim) {
+    return false;
+  }
+
+  // Never upscale.
+  if (aSize.width >= mSize.width || aSize.height >= mSize.height) {
+    return false;
+  }
+
+  // Zero or negative width or height is unacceptable.
+  if (aSize.width < 1 || aSize.height < 1) {
+    return false;
+  }
+
+  // There's no point in scaling if we can't store the result.
+  if (!SurfaceCache::CanHold(aSize)) {
+    return false;
+  }
+
+  return true;
+}
+
+void
+RasterImage::NotifyNewScaledFrame()
+{
+  // Send an invalidation so observers will repaint and can take advantage of
+  // the new scaled frame if possible.
+  NotifyProgress(NoProgress, IntRect(0, 0, mSize.width, mSize.height));
+}
+
+void
+RasterImage::RequestScale(imgFrame* aFrame,
+                          uint32_t aFlags,
+                          const IntSize& aSize)
+{
+  // We don't scale frames which aren't fully decoded.
+  if (!aFrame->IsImageComplete()) {
+    return;
+  }
+
+  // We can't scale frames that need padding or are single pixel.
+  if (aFrame->NeedsPadding() || aFrame->IsSinglePixel()) {
+    return;
+  }
+
+  // We also can't scale if we can't lock the image data for this frame.
+  RawAccessFrameRef frameRef = aFrame->RawAccessRef();
+  if (!frameRef) {
+    return;
+  }
+
+  nsRefPtr<ScaleRunner> runner =
+    new ScaleRunner(this, DecodeFlags(aFlags), aSize, Move(frameRef));
+  if (runner->Init()) {
+    if (!sScaleWorkerThread) {
+      NS_NewNamedThread("Image Scaler", getter_AddRefs(sScaleWorkerThread));
+      ClearOnShutdown(&sScaleWorkerThread);
+    }
+
+    sScaleWorkerThread->Dispatch(runner, NS_DISPATCH_NORMAL);
+  }
+}
+
+DrawResult
+RasterImage::DrawWithPreDownscaleIfNeeded(DrawableFrameRef&& aFrameRef,
+                                          gfxContext* aContext,
+                                          const IntSize& aSize,
+                                          const ImageRegion& aRegion,
+                                          GraphicsFilter aFilter,
+                                          uint32_t aFlags)
+{
+  DrawableFrameRef frameRef;
+
+  if (CanScale(aFilter, aSize, aFlags)) {
+    frameRef =
+      SurfaceCache::Lookup(ImageKey(this),
+                           RasterSurfaceKey(aSize,
+                                            DecodeFlags(aFlags),
+                                            0));
+    if (!frameRef) {
+      // We either didn't have a matching scaled frame or the OS threw it away.
+      // Request a new one so we'll be ready next time. For now, we'll fall back
+      // to aFrameRef below.
+      RequestScale(aFrameRef.get(), aFlags, aSize);
+    }
+    if (frameRef && !frameRef->IsImageComplete()) {
+      frameRef.reset();  // We're still scaling, so we can't use this yet.
+    }
+  }
+
+  gfxContextMatrixAutoSaveRestore saveMatrix(aContext);
+  ImageRegion region(aRegion);
+  bool frameIsComplete = true;  // We already checked HQ scaled frames.
+  if (!frameRef) {
+    // There's no HQ scaled frame available, so we'll have to use the frame
+    // provided by the caller.
+    frameRef = Move(aFrameRef);
+    frameIsComplete = frameRef->IsImageComplete();
+  }
+
+  // By now we may have a frame with the requested size. If not, we need to
+  // adjust the drawing parameters accordingly.
+  IntSize finalSize = frameRef->GetImageSize();
+  bool couldRedecodeForBetterFrame = false;
+  if (finalSize != aSize) {
+    gfx::Size scale(double(aSize.width) / finalSize.width,
+                    double(aSize.height) / finalSize.height);
+    aContext->Multiply(gfxMatrix::Scaling(scale.width, scale.height));
+    region.Scale(1.0 / scale.width, 1.0 / scale.height);
+
+    couldRedecodeForBetterFrame = mDownscaleDuringDecode &&
+                                  CanDownscaleDuringDecode(aSize, aFlags);
+  }
+
+  if (!frameRef->Draw(aContext, region, aFilter, aFlags)) {
+    RecoverFromLossOfFrames(aSize, aFlags);
+    return DrawResult::TEMPORARY_ERROR;
+  }
+  if (!frameIsComplete) {
+    return DrawResult::INCOMPLETE;
+  }
+  if (couldRedecodeForBetterFrame) {
+    return DrawResult::WRONG_SIZE;
+  }
+  return DrawResult::SUCCESS;
+}
+
+//******************************************************************************
+/* [noscript] void draw(in gfxContext aContext,
+ *                      in gfxGraphicsFilter aFilter,
+ *                      [const] in gfxMatrix aUserSpaceToImageSpace,
+ *                      [const] in gfxRect aFill,
+ *                      [const] in IntRect aSubimage,
+ *                      [const] in IntSize aViewportSize,
+ *                      [const] in SVGImageContext aSVGContext,
+ *                      in uint32_t aWhichFrame,
+ *                      in uint32_t aFlags); */
+NS_IMETHODIMP_(DrawResult)
+RasterImage::Draw(gfxContext* aContext,
+                  const IntSize& aSize,
+                  const ImageRegion& aRegion,
+                  uint32_t aWhichFrame,
+                  GraphicsFilter aFilter,
+                  const Maybe<SVGImageContext>& /*aSVGContext - ignored*/,
+                  uint32_t aFlags)
+{
+  if (aWhichFrame > FRAME_MAX_VALUE) {
+    return DrawResult::BAD_ARGS;
+  }
+
+  if (mError) {
+    return DrawResult::BAD_IMAGE;
+  }
+
+  // Illegal -- you can't draw with non-default decode flags.
+  // (Disabling colorspace conversion might make sense to allow, but
+  // we don't currently.)
+  if (DecodeFlags(aFlags) != DECODE_FLAGS_DEFAULT) {
+    return DrawResult::BAD_ARGS;
+  }
+
+  if (!aContext) {
+    return DrawResult::BAD_ARGS;
+  }
+
+  if (IsUnlocked() && mProgressTracker) {
+    mProgressTracker->OnUnlockedDraw();
+  }
+
+  // If we're not using GraphicsFilter::FILTER_GOOD, we shouldn't high-quality
+  // scale or downscale during decode.
+  uint32_t flags = aFilter == GraphicsFilter::FILTER_GOOD
+                 ? aFlags
+                 : aFlags & ~FLAG_HIGH_QUALITY_SCALING;
+
+  DrawableFrameRef ref =
+    LookupFrame(GetRequestedFrameIndex(aWhichFrame), aSize, flags);
+  if (!ref) {
+    // Getting the frame (above) touches the image and kicks off decoding.
+    if (mDrawStartTime.IsNull()) {
+      mDrawStartTime = TimeStamp::Now();
+    }
+    return DrawResult::NOT_READY;
+  }
+
+  bool shouldRecordTelemetry = !mDrawStartTime.IsNull() &&
+                               ref->IsImageComplete();
+
+  auto result = DrawWithPreDownscaleIfNeeded(Move(ref), aContext, aSize,
+                                             aRegion, aFilter, flags);
+
+  if (shouldRecordTelemetry) {
+      TimeDuration drawLatency = TimeStamp::Now() - mDrawStartTime;
+      Telemetry::Accumulate(Telemetry::IMAGE_DECODE_ON_DRAW_LATENCY,
+                            int32_t(drawLatency.ToMicroseconds()));
+      mDrawStartTime = TimeStamp();
+  }
+
+  return result;
+}
+
+//******************************************************************************
+/* void lockImage() */
+NS_IMETHODIMP
+RasterImage::LockImage()
+{
+  MOZ_ASSERT(NS_IsMainThread(),
+             "Main thread to encourage serialization with UnlockImage");
+  if (mError) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // Increment the lock count
+  mLockCount++;
+
+  // Lock this image's surfaces in the SurfaceCache.
+  if (mLockCount == 1) {
+    SurfaceCache::LockImage(ImageKey(this));
+  }
+
+  return NS_OK;
+}
+
+//******************************************************************************
+/* void unlockImage() */
+NS_IMETHODIMP
+RasterImage::UnlockImage()
+{
+  MOZ_ASSERT(NS_IsMainThread(),
+             "Main thread to encourage serialization with LockImage");
+  if (mError) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // It's an error to call this function if the lock count is 0
+  MOZ_ASSERT(mLockCount > 0,
+             "Calling UnlockImage with mLockCount == 0!");
+  if (mLockCount == 0) {
+    return NS_ERROR_ABORT;
+  }
+
+  // Decrement our lock count
+  mLockCount--;
+
+  // Unlock this image's surfaces in the SurfaceCache.
+  if (mLockCount == 0 ) {
+    SurfaceCache::UnlockImage(ImageKey(this));
+  }
+
+  return NS_OK;
+}
+
+//******************************************************************************
+/* void requestDiscard() */
+NS_IMETHODIMP
+RasterImage::RequestDiscard()
+{
+  if (mDiscardable &&      // Enabled at creation time...
+      mLockCount == 0 &&   // ...not temporarily disabled...
+      CanDiscard()) {
+    Discard();
+  }
+
+  return NS_OK;
+}
+
+// Indempotent error flagging routine. If a decoder is open, shuts it down.
+void
+RasterImage::DoError()
+{
+  // If we've flagged an error before, we have nothing to do
+  if (mError) {
+    return;
+  }
+
+  // We can't safely handle errors off-main-thread, so dispatch a worker to
+  // do it.
+  if (!NS_IsMainThread()) {
+    HandleErrorWorker::DispatchIfNeeded(this);
+    return;
+  }
+
+  // Put the container in an error state.
+  mError = true;
+
+  // Stop animation and release our FrameAnimator.
+  if (mAnimating) {
+    StopAnimation();
+  }
+  mAnim.release();
+
+  // Release all locks.
+  mLockCount = 0;
+  SurfaceCache::UnlockImage(ImageKey(this));
+
+  // Release all frames from the surface cache.
+  SurfaceCache::RemoveImage(ImageKey(this));
+
+  // Invalidate to get rid of any partially-drawn image content.
+  NotifyProgress(NoProgress, IntRect(0, 0, mSize.width, mSize.height));
+
+  // Log our error
+  LOG_CONTAINER_ERROR;
+}
+
+/* static */ void
+RasterImage::HandleErrorWorker::DispatchIfNeeded(RasterImage* aImage)
+{
+  nsRefPtr<HandleErrorWorker> worker = new HandleErrorWorker(aImage);
+  NS_DispatchToMainThread(worker);
+}
+
+RasterImage::HandleErrorWorker::HandleErrorWorker(RasterImage* aImage)
+  : mImage(aImage)
+{
+  MOZ_ASSERT(mImage, "Should have image");
+}
+
+NS_IMETHODIMP
+RasterImage::HandleErrorWorker::Run()
+{
+  mImage->DoError();
+
+  return NS_OK;
+}
+
+// nsIInputStream callback to copy the incoming image data directly to the
+// RasterImage without processing. The RasterImage is passed as the closure.
+// Always reads everything it gets, even if the data is erroneous.
+NS_METHOD
+RasterImage::WriteToSourceBuffer(nsIInputStream* /* unused */,
+                                 void*          aClosure,
+                                 const char*    aFromRawSegment,
+                                 uint32_t       /* unused */,
+                                 uint32_t       aCount,
+                                 uint32_t*      aWriteCount)
+{
+  // Retrieve the RasterImage
+  RasterImage* image = static_cast<RasterImage*>(aClosure);
+
+  // Copy the source data. Unless we hit OOM, we squelch the return value
+  // here, because returning an error means that ReadSegments stops
+  // reading data, violating our invariant that we read everything we get.
+  // If we hit OOM then we fail and the load is aborted.
+  nsresult rv = image->mSourceBuffer->Append(aFromRawSegment, aCount);
+  if (rv == NS_ERROR_OUT_OF_MEMORY) {
+    image->DoError();
+    return rv;
+  }
+
+  // We wrote everything we got
+  *aWriteCount = aCount;
+
+  return NS_OK;
+}
+
+bool
+RasterImage::ShouldAnimate()
+{
+  return ImageResource::ShouldAnimate() && GetNumFrames() >= 2 &&
+         !mAnimationFinished;
+}
+
+/* readonly attribute uint32_t framesNotified; */
+#ifdef DEBUG
+NS_IMETHODIMP
+RasterImage::GetFramesNotified(uint32_t* aFramesNotified)
+{
+  NS_ENSURE_ARG_POINTER(aFramesNotified);
+
+  *aFramesNotified = mFramesNotified;
+
+  return NS_OK;
+}
+#endif
+
+void
+RasterImage::NotifyProgress(Progress aProgress,
+                            const IntRect& aInvalidRect /* = IntRect() */,
+                            uint32_t aFlags /* = DECODE_FLAGS_DEFAULT */)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  // Ensure that we stay alive long enough to finish notifying.
+  nsRefPtr<RasterImage> image(this);
+
+  bool wasDefaultFlags = aFlags == DECODE_FLAGS_DEFAULT;
+
+  if (!aInvalidRect.IsEmpty() && wasDefaultFlags) {
+    // Update our image container since we're invalidating.
+    UpdateImageContainer();
+  }
+
+  // Tell the observers what happened.
+  image->mProgressTracker->SyncNotifyProgress(aProgress, aInvalidRect);
+}
+
+void
+RasterImage::FinalizeDecoder(Decoder* aDecoder)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(aDecoder);
+  MOZ_ASSERT(mError || mHasSize || !aDecoder->HasSize(),
+             "Should have handed off size by now");
+
+  // Send out any final notifications.
+  NotifyProgress(aDecoder->TakeProgress(),
+                 aDecoder->TakeInvalidRect(),
+                 aDecoder->GetDecodeFlags());
+
+  bool wasSize = aDecoder->IsSizeDecode();
+  bool done = aDecoder->GetDecodeDone();
+
+  if (!wasSize && aDecoder->ChunkCount()) {
+    Telemetry::Accumulate(Telemetry::IMAGE_DECODE_CHUNKS,
+                          aDecoder->ChunkCount());
+  }
+
+  if (done) {
+    // Do some telemetry if this isn't a size decode.
+    if (!wasSize) {
+      Telemetry::Accumulate(Telemetry::IMAGE_DECODE_TIME,
+                            int32_t(aDecoder->DecodeTime().ToMicroseconds()));
+
+      // We record the speed for only some decoders. The rest have
+      // SpeedHistogram return HistogramCount.
+      Telemetry::ID id = aDecoder->SpeedHistogram();
+      if (id < Telemetry::HistogramCount) {
+        int32_t KBps = int32_t(aDecoder->BytesDecoded() /
+                               (1024 * aDecoder->DecodeTime().ToSeconds()));
+        Telemetry::Accumulate(id, KBps);
+      }
+    }
+
+    // Detect errors.
+    if (aDecoder->HasError() && !aDecoder->WasAborted()) {
+      DoError();
+    } else if (wasSize && !mHasSize) {
+      DoError();
+    }
+  }
+
+  if (aDecoder->ImageIsLocked()) {
+    // Unlock the image, balancing the LockImage call we made in CreateDecoder.
+    UnlockImage();
+  }
+
+  // If we were a size decode and a full decode was requested, now's the time.
+  if (done && wasSize && mWantFullDecode) {
+    mWantFullDecode = false;
+    RequestDecode();
+  }
+}
+
+already_AddRefed<imgIContainer>
+RasterImage::Unwrap()
+{
+  nsCOMPtr<imgIContainer> self(this);
+  return self.forget();
+}
+
+IntSize
+RasterImage::OptimalImageSizeForDest(const gfxSize& aDest, uint32_t aWhichFrame,
+                                     GraphicsFilter aFilter, uint32_t aFlags)
+{
+  MOZ_ASSERT(aDest.width >= 0 || ceil(aDest.width) <= INT32_MAX ||
+             aDest.height >= 0 || ceil(aDest.height) <= INT32_MAX,
+             "Unexpected destination size");
+
+  if (mSize.IsEmpty() || aDest.IsEmpty()) {
+    return IntSize(0, 0);
+  }
+
+  IntSize destSize(ceil(aDest.width), ceil(aDest.height));
+
+  if (aFilter == GraphicsFilter::FILTER_GOOD &&
+      CanDownscaleDuringDecode(destSize, aFlags)) {
+    return destSize;
+  } else if (CanScale(aFilter, destSize, aFlags)) {
+    DrawableFrameRef frameRef =
+      SurfaceCache::Lookup(ImageKey(this),
+                           RasterSurfaceKey(destSize,
+                                            DecodeFlags(aFlags),
+                                            0));
+
+    if (frameRef && frameRef->IsImageComplete()) {
+        return destSize;  // We have an existing HQ scale for this size.
+    }
+    if (!frameRef) {
+      // We could HQ scale to this size, but we haven't. Request a scale now.
+      frameRef = LookupFrame(GetRequestedFrameIndex(aWhichFrame),
+                             mSize, aFlags);
+      if (frameRef) {
+        RequestScale(frameRef.get(), aFlags, destSize);
+      }
+    }
+  }
+
+  // We either can't HQ scale to this size or the scaled version isn't ready
+  // yet. Use our intrinsic size for now.
+  return mSize;
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/RasterImage.h firefox-trunk-41.0~a1~hg20150524r245419/image/RasterImage.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/RasterImage.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/RasterImage.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,489 @@
+/* -*- 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
+ * This file declares the RasterImage class, which
+ * handles static and animated rasterized images.
+ *
+ * @author  Stuart Parmenter <pavlov@netscape.com>
+ * @author  Chris Saari <saari@netscape.com>
+ * @author  Arron Mogge <paper@animecity.nu>
+ * @author  Andrew Smith <asmith15@learn.senecac.on.ca>
+ */
+
+#ifndef mozilla_image_RasterImage_h
+#define mozilla_image_RasterImage_h
+
+#include "Image.h"
+#include "nsCOMPtr.h"
+#include "imgIContainer.h"
+#include "nsIProperties.h"
+#include "nsTArray.h"
+#include "imgFrame.h"
+#include "nsThreadUtils.h"
+#include "DecodePool.h"
+#include "Orientation.h"
+#include "nsIObserver.h"
+#include "mozilla/Attributes.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/MemoryReporting.h"
+#include "mozilla/Pair.h"
+#include "mozilla/TimeStamp.h"
+#include "mozilla/WeakPtr.h"
+#include "mozilla/UniquePtr.h"
+#ifdef DEBUG
+  #include "imgIContainerDebug.h"
+#endif
+
+class nsIInputStream;
+class nsIRequest;
+
+#define NS_RASTERIMAGE_CID \
+{ /* 376ff2c1-9bf6-418a-b143-3340c00112f7 */         \
+     0x376ff2c1,                                     \
+     0x9bf6,                                         \
+     0x418a,                                         \
+    {0xb1, 0x43, 0x33, 0x40, 0xc0, 0x01, 0x12, 0xf7} \
+}
+
+/**
+ * Handles static and animated image containers.
+ *
+ *
+ * @par A Quick Walk Through
+ * The decoder initializes this class and calls AppendFrame() to add a frame.
+ * Once RasterImage detects more than one frame, it starts the animation
+ * with StartAnimation(). Note that the invalidation events for RasterImage are
+ * generated automatically using nsRefreshDriver.
+ *
+ * @par
+ * StartAnimation() initializes the animation helper object and sets the time
+ * the first frame was displayed to the current clock time.
+ *
+ * @par
+ * When the refresh driver corresponding to the imgIContainer that this image is
+ * a part of notifies the RasterImage that it's time to invalidate,
+ * RequestRefresh() is called with a given TimeStamp to advance to. As long as
+ * the timeout of the given frame (the frame's "delay") plus the time that frame
+ * was first displayed is less than or equal to the TimeStamp given,
+ * RequestRefresh() calls AdvanceFrame().
+ *
+ * @par
+ * AdvanceFrame() is responsible for advancing a single frame of the animation.
+ * It can return true, meaning that the frame advanced, or false, meaning that
+ * the frame failed to advance (usually because the next frame hasn't been
+ * decoded yet). It is also responsible for performing the final animation stop
+ * procedure if the final frame of a non-looping animation is reached.
+ *
+ * @par
+ * Each frame can have a different method of removing itself. These are
+ * listed as imgIContainer::cDispose... constants.  Notify() calls
+ * DoComposite() to handle any special frame destruction.
+ *
+ * @par
+ * The basic path through DoComposite() is:
+ * 1) Calculate Area that needs updating, which is at least the area of
+ *    aNextFrame.
+ * 2) Dispose of previous frame.
+ * 3) Draw new image onto compositingFrame.
+ * See comments in DoComposite() for more information and optimizations.
+ *
+ * @par
+ * The rest of the RasterImage specific functions are used by DoComposite to
+ * destroy the old frame and build the new one.
+ *
+ * @note
+ * <li> "Mask", "Alpha", and "Alpha Level" are interchangeable phrases in
+ * respects to RasterImage.
+ *
+ * @par
+ * <li> GIFs never have more than a 1 bit alpha.
+ * <li> APNGs may have a full alpha channel.
+ *
+ * @par
+ * <li> Background color specified in GIF is ignored by web browsers.
+ *
+ * @par
+ * <li> If Frame 3 wants to dispose by restoring previous, what it wants is to
+ * restore the composition up to and including Frame 2, as well as Frame 2s
+ * disposal.  So, in the middle of DoComposite when composing Frame 3, right
+ * after destroying Frame 2's area, we copy compositingFrame to
+ * prevCompositingFrame.  When DoComposite gets called to do Frame 4, we
+ * copy prevCompositingFrame back, and then draw Frame 4 on top.
+ *
+ * @par
+ * The mAnim structure has members only needed for animated images, so
+ * it's not allocated until the second frame is added.
+ */
+
+namespace mozilla {
+
+namespace layers {
+class ImageContainer;
+class Image;
+}
+
+namespace image {
+
+class Decoder;
+class FrameAnimator;
+class SourceBuffer;
+
+/**
+ * Given a set of imgIContainer FLAG_* flags, returns those flags that can
+ * affect the output of decoders.
+ */
+inline MOZ_CONSTEXPR uint32_t
+DecodeFlags(uint32_t aFlags)
+{
+  return aFlags & (imgIContainer::FLAG_DECODE_NO_PREMULTIPLY_ALPHA |
+                   imgIContainer::FLAG_DECODE_NO_COLORSPACE_CONVERSION);
+}
+
+class RasterImage final : public ImageResource
+                        , public nsIProperties
+                        , public SupportsWeakPtr<RasterImage>
+#ifdef DEBUG
+                        , public imgIContainerDebug
+#endif
+{
+  // (no public constructor - use ImageFactory)
+  virtual ~RasterImage();
+
+public:
+  MOZ_DECLARE_WEAKREFERENCE_TYPENAME(RasterImage)
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_NSIPROPERTIES
+  NS_DECL_IMGICONTAINER
+#ifdef DEBUG
+  NS_DECL_IMGICONTAINERDEBUG
+#endif
+
+  virtual nsresult StartAnimation() override;
+  virtual nsresult StopAnimation() override;
+
+  // Methods inherited from Image
+  virtual void OnSurfaceDiscarded() override;
+
+  // Raster-specific methods
+  static NS_METHOD WriteToSourceBuffer(nsIInputStream* aIn, void* aClosure,
+                                       const char* aFromRawSegment,
+                                       uint32_t aToOffset, uint32_t aCount,
+                                       uint32_t* aWriteCount);
+
+  /* The total number of frames in this image. */
+  uint32_t GetNumFrames() const { return mFrameCount; }
+
+  virtual size_t SizeOfSourceWithComputedFallback(MallocSizeOf aMallocSizeOf)
+    const override;
+  virtual void CollectSizeOfSurfaces(nsTArray<SurfaceMemoryCounter>& aCounters,
+                                     MallocSizeOf aMallocSizeOf) const override;
+
+  /* Triggers discarding. */
+  void Discard();
+
+
+  //////////////////////////////////////////////////////////////////////////////
+  // Decoder callbacks.
+  //////////////////////////////////////////////////////////////////////////////
+
+  void OnAddedFrame(uint32_t aNewFrameCount, const nsIntRect& aNewRefreshArea);
+
+  /** Sets the size and inherent orientation of the container. This should only
+   * be called by the decoder. This function may be called multiple times, but
+   * will throw an error if subsequent calls do not match the first.
+   */
+  nsresult SetSize(int32_t aWidth, int32_t aHeight, Orientation aOrientation);
+
+  /**
+   * Number of times to loop the image.
+   * @note -1 means forever.
+   */
+  void     SetLoopCount(int32_t aLoopCount);
+
+  /// Notification that the entire image has been decoded.
+  void OnDecodingComplete();
+
+  /**
+   * Sends the provided progress notifications to ProgressTracker.
+   *
+   * Main-thread only.
+   *
+   * @param aProgress    The progress notifications to send.
+   * @param aInvalidRect An invalidation rect to send.
+   * @param aFlags       The decode flags used by the decoder that generated
+   *                     these notifications, or DECODE_FLAGS_DEFAULT if the
+   *                     notifications don't come from a decoder.
+   */
+  void NotifyProgress(Progress aProgress,
+                      const nsIntRect& aInvalidRect = nsIntRect(),
+                      uint32_t aFlags = DECODE_FLAGS_DEFAULT);
+
+  /**
+   * Records telemetry and does final teardown of the provided decoder.
+   *
+   * Main-thread only.
+   */
+  void FinalizeDecoder(Decoder* aDecoder);
+
+
+  //////////////////////////////////////////////////////////////////////////////
+  // Network callbacks.
+  //////////////////////////////////////////////////////////////////////////////
+
+  virtual nsresult OnImageDataAvailable(nsIRequest* aRequest,
+                                        nsISupports* aContext,
+                                        nsIInputStream* aInStr,
+                                        uint64_t aSourceOffset,
+                                        uint32_t aCount) override;
+  virtual nsresult OnImageDataComplete(nsIRequest* aRequest,
+                                       nsISupports* aContext,
+                                       nsresult aStatus,
+                                       bool aLastPart) override;
+
+  void NotifyForDecodeOnlyOnDraw();
+
+  /**
+   * A hint of the number of bytes of source data that the image contains. If
+   * called early on, this can help reduce copying and reallocations by
+   * appropriately preallocating the source data buffer.
+   *
+   * We take this approach rather than having the source data management code do
+   * something more complicated (like chunklisting) because HTTP is by far the
+   * dominant source of images, and the Content-Length header is quite reliable.
+   * Thus, pre-allocation simplifies code and reduces the total number of
+   * allocations.
+   */
+  nsresult SetSourceSizeHint(uint32_t aSizeHint);
+
+  /* Provide a hint for the requested resolution of the resulting image. */
+  void SetRequestedResolution(const nsIntSize requestedResolution) {
+    mRequestedResolution = requestedResolution;
+  }
+
+  nsIntSize GetRequestedResolution() {
+    return mRequestedResolution;
+  }
+  /* Provide a hint for the requested dimension of the resulting image. */
+  void SetRequestedSampleSize(int requestedSampleSize) {
+    mRequestedSampleSize = requestedSampleSize;
+  }
+
+  int GetRequestedSampleSize() {
+    return mRequestedSampleSize;
+  }
+
+ nsCString GetURIString() {
+    nsCString spec;
+    if (GetURI()) {
+      GetURI()->GetSpec(spec);
+    }
+    return spec;
+  }
+
+private:
+  nsresult Init(const char* aMimeType, uint32_t aFlags);
+
+  DrawResult DrawWithPreDownscaleIfNeeded(DrawableFrameRef&& aFrameRef,
+                                          gfxContext* aContext,
+                                          const nsIntSize& aSize,
+                                          const ImageRegion& aRegion,
+                                          GraphicsFilter aFilter,
+                                          uint32_t aFlags);
+
+  TemporaryRef<gfx::SourceSurface> CopyFrame(uint32_t aWhichFrame,
+                                             uint32_t aFlags);
+
+  Pair<DrawResult, RefPtr<gfx::SourceSurface>>
+    GetFrameInternal(uint32_t aWhichFrame, uint32_t aFlags);
+
+  DrawableFrameRef LookupFrameInternal(uint32_t aFrameNum,
+                                       const gfx::IntSize& aSize,
+                                       uint32_t aFlags);
+  DrawableFrameRef LookupFrame(uint32_t aFrameNum,
+                               const nsIntSize& aSize,
+                               uint32_t aFlags);
+  uint32_t GetCurrentFrameIndex() const;
+  uint32_t GetRequestedFrameIndex(uint32_t aWhichFrame) const;
+
+  nsIntRect GetFirstFrameRect();
+
+  size_t
+    SizeOfDecodedWithComputedFallbackIfHeap(gfxMemoryLocation aLocation,
+                                            MallocSizeOf aMallocSizeOf) const;
+
+  Pair<DrawResult, nsRefPtr<layers::Image>>
+    GetCurrentImage(layers::ImageContainer* aContainer, uint32_t aFlags);
+
+  void UpdateImageContainer();
+
+  // We would like to just check if we have a zero lock count, but we can't do
+  // that for animated images because in EnsureAnimExists we lock the image and
+  // never unlock so that animated images always have their lock count >= 1. In
+  // that case we use our animation consumers count as a proxy for lock count.
+  bool IsUnlocked() {
+    return (mLockCount == 0 || (mAnim && mAnimationConsumers == 0));
+  }
+
+
+  //////////////////////////////////////////////////////////////////////////////
+  // Decoding.
+  //////////////////////////////////////////////////////////////////////////////
+
+  /**
+   * Creates and runs a decoder, either synchronously or asynchronously
+   * according to @aFlags. Passes the provided target size @aSize and decode
+   * flags @aFlags to CreateDecoder. If a size decode is desired, pass Nothing
+   * for @aSize.
+   */
+  NS_IMETHOD Decode(const Maybe<nsIntSize>& aSize, uint32_t aFlags);
+
+  /**
+   * Creates a new decoder with a target size of @aSize and decode flags
+   * specified by @aFlags. If a size decode is desired, pass Nothing() for
+   * @aSize.
+   */
+  already_AddRefed<Decoder> CreateDecoder(const Maybe<nsIntSize>& aSize,
+                                          uint32_t aFlags);
+
+  /**
+   * In catastrophic circumstances like a GPU driver crash, we may lose our
+   * frames even if they're locked. RecoverFromLossOfFrames discards all
+   * existing frames and redecodes using the provided @aSize and @aFlags.
+   */
+  void RecoverFromLossOfFrames(const nsIntSize& aSize, uint32_t aFlags);
+
+private: // data
+  nsIntSize                  mSize;
+  Orientation                mOrientation;
+
+  nsCOMPtr<nsIProperties>   mProperties;
+
+  /// If this image is animated, a FrameAnimator which manages its animation.
+  UniquePtr<FrameAnimator> mAnim;
+
+  // Image locking.
+  uint32_t                   mLockCount;
+
+  // Source data members
+  nsCString                  mSourceDataMimeType;
+
+  // How many times we've decoded this image.
+  // This is currently only used for statistics
+  int32_t                        mDecodeCount;
+
+  // If the image contains multiple resolutions, a hint as to which one
+  // should be used
+  nsIntSize                  mRequestedResolution;
+
+  // A hint for image decoder that directly scale the image to smaller buffer
+  int                        mRequestedSampleSize;
+
+  // A weak pointer to our ImageContainer, which stays alive only as long as
+  // the layer system needs it.
+  WeakPtr<layers::ImageContainer> mImageContainer;
+
+  // If mImageContainer is non-null, this contains the DrawResult we obtained
+  // the last time we updated it.
+  DrawResult mLastImageContainerDrawResult;
+
+#ifdef DEBUG
+  uint32_t                       mFramesNotified;
+#endif
+
+  // The source data for this image.
+  nsRefPtr<SourceBuffer>     mSourceBuffer;
+
+  // The number of frames this image has.
+  uint32_t                   mFrameCount;
+
+  // Boolean flags (clustered together to conserve space):
+  bool                       mHasSize:1;       // Has SetSize() been called?
+  bool                       mDecodeOnlyOnDraw:1; // Decoding only on draw?
+  bool                       mTransient:1;     // Is the image short-lived?
+  bool                       mDiscardable:1;   // Is container discardable?
+  bool                       mHasSourceData:1; // Do we have source data?
+  bool                       mHasBeenDecoded:1; // Decoded at least once?
+  bool                       mDownscaleDuringDecode:1;
+
+  // Whether we're waiting to start animation. If we get a StartAnimation() call
+  // but we don't yet have more than one frame, mPendingAnimation is set so that
+  // we know to start animation later if/when we have more frames.
+  bool                       mPendingAnimation:1;
+
+  // Whether the animation can stop, due to running out
+  // of frames, or no more owning request
+  bool                       mAnimationFinished:1;
+
+  // Whether, once we are done doing a size decode, we should immediately kick
+  // off a full decode.
+  bool                       mWantFullDecode:1;
+
+  TimeStamp mDrawStartTime;
+
+
+  //////////////////////////////////////////////////////////////////////////////
+  // Scaling.
+  //////////////////////////////////////////////////////////////////////////////
+
+  // Initiates an HQ scale for the given frame, if possible.
+  void RequestScale(imgFrame* aFrame, uint32_t aFlags, const nsIntSize& aSize);
+
+  // Determines whether we can perform an HQ scale with the given parameters.
+  bool CanScale(GraphicsFilter aFilter, const nsIntSize& aSize,
+                uint32_t aFlags);
+
+  // Determines whether we can downscale during decode with the given
+  // parameters.
+  bool CanDownscaleDuringDecode(const nsIntSize& aSize, uint32_t aFlags);
+
+  // Called by the HQ scaler when a new scaled frame is ready.
+  void NotifyNewScaledFrame();
+
+  friend class ScaleRunner;
+
+
+  // Error handling.
+  void DoError();
+
+  class HandleErrorWorker : public nsRunnable
+  {
+  public:
+    /**
+     * Called from decoder threads when DoError() is called, since errors can't
+     * be handled safely off-main-thread. Dispatches an event which reinvokes
+     * DoError on the main thread if there isn't one already pending.
+     */
+    static void DispatchIfNeeded(RasterImage* aImage);
+
+    NS_IMETHOD Run();
+
+  private:
+    explicit HandleErrorWorker(RasterImage* aImage);
+
+    nsRefPtr<RasterImage> mImage;
+  };
+
+  // Helpers
+  bool CanDiscard();
+
+protected:
+  explicit RasterImage(ImageURL* aURI = nullptr);
+
+  bool ShouldAnimate() override;
+
+  friend class ImageFactory;
+};
+
+inline NS_IMETHODIMP
+RasterImage::GetAnimationMode(uint16_t* aAnimationMode) {
+  return GetAnimationModeInternal(aAnimationMode);
+}
+
+} // namespace image
+} // namespace mozilla
+
+#endif /* mozilla_image_RasterImage_h */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/ScriptedNotificationObserver.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/ScriptedNotificationObserver.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/ScriptedNotificationObserver.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/ScriptedNotificationObserver.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,62 @@
+/* -*- 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 "ScriptedNotificationObserver.h"
+#include "imgIScriptedNotificationObserver.h"
+#include "nsCycleCollectionParticipant.h"
+
+namespace mozilla {
+namespace image {
+
+NS_IMPL_CYCLE_COLLECTION(ScriptedNotificationObserver, mInner)
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ScriptedNotificationObserver)
+  NS_INTERFACE_MAP_ENTRY(imgINotificationObserver)
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
+NS_INTERFACE_MAP_END
+
+NS_IMPL_CYCLE_COLLECTING_ADDREF(ScriptedNotificationObserver)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(ScriptedNotificationObserver)
+
+ScriptedNotificationObserver::ScriptedNotificationObserver(
+    imgIScriptedNotificationObserver* aInner)
+: mInner(aInner)
+{ }
+
+NS_IMETHODIMP
+ScriptedNotificationObserver::Notify(imgIRequest* aRequest,
+                                     int32_t aType,
+                                     const nsIntRect* /*aUnused*/)
+{
+  if (aType == imgINotificationObserver::SIZE_AVAILABLE) {
+    return mInner->SizeAvailable(aRequest);
+  }
+  if (aType == imgINotificationObserver::FRAME_UPDATE) {
+    return mInner->FrameUpdate(aRequest);
+  }
+  if (aType == imgINotificationObserver::FRAME_COMPLETE) {
+    return mInner->FrameComplete(aRequest);
+  }
+  if (aType == imgINotificationObserver::DECODE_COMPLETE) {
+    return mInner->DecodeComplete(aRequest);
+  }
+  if (aType == imgINotificationObserver::LOAD_COMPLETE) {
+    return mInner->LoadComplete(aRequest);
+  }
+  if (aType == imgINotificationObserver::DISCARD) {
+    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;
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/ScriptedNotificationObserver.h firefox-trunk-41.0~a1~hg20150524r245419/image/ScriptedNotificationObserver.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/ScriptedNotificationObserver.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/ScriptedNotificationObserver.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,37 @@
+/* -*- 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_image_ScriptedNotificationObserver_h
+#define mozilla_image_ScriptedNotificationObserver_h
+
+#include "imgINotificationObserver.h"
+#include "nsCOMPtr.h"
+#include "nsCycleCollectionParticipant.h"
+
+class imgIScriptedNotificationObserver;
+
+namespace mozilla {
+namespace image {
+
+class ScriptedNotificationObserver : public imgINotificationObserver
+{
+public:
+  explicit
+    ScriptedNotificationObserver(imgIScriptedNotificationObserver* aInner);
+
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_IMGINOTIFICATIONOBSERVER
+  NS_DECL_CYCLE_COLLECTION_CLASS(ScriptedNotificationObserver)
+
+private:
+  virtual ~ScriptedNotificationObserver() { }
+  nsCOMPtr<imgIScriptedNotificationObserver> mInner;
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_ScriptedNotificationObserver_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/ShutdownTracker.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/ShutdownTracker.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/ShutdownTracker.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/ShutdownTracker.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,76 @@
+/* -*- 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 "ShutdownTracker.h"
+
+#include "mozilla/Services.h"
+#include "nsAutoPtr.h"
+#include "nsIObserver.h"
+#include "nsIObserverService.h"
+
+namespace mozilla {
+namespace image {
+
+class ShutdownTrackerImpl;
+
+///////////////////////////////////////////////////////////////////////////////
+// Static Data
+///////////////////////////////////////////////////////////////////////////////
+
+// Whether we've observed shutdown starting yet.
+static bool sShutdownHasStarted = false;
+
+
+///////////////////////////////////////////////////////////////////////////////
+// Implementation
+///////////////////////////////////////////////////////////////////////////////
+
+struct ShutdownObserver : public nsIObserver
+{
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD Observe(nsISupports*, const char* aTopic, const char16_t*) override
+  {
+    if (strcmp(aTopic, "xpcom-shutdown") != 0) {
+      return NS_OK;
+    }
+
+    nsCOMPtr<nsIObserverService> os = services::GetObserverService();
+    if (os) {
+      os->RemoveObserver(this, "xpcom-shutdown");
+    }
+
+    sShutdownHasStarted = true;
+    return NS_OK;
+  }
+
+private:
+  virtual ~ShutdownObserver() { }
+};
+
+NS_IMPL_ISUPPORTS(ShutdownObserver, nsIObserver)
+
+
+///////////////////////////////////////////////////////////////////////////////
+// Public API
+///////////////////////////////////////////////////////////////////////////////
+
+/* static */ void
+ShutdownTracker::Initialize()
+{
+  nsCOMPtr<nsIObserverService> os = services::GetObserverService();
+  if (os) {
+    os->AddObserver(new ShutdownObserver, "xpcom-shutdown", false);
+  }
+}
+
+/* static */ bool
+ShutdownTracker::ShutdownHasStarted()
+{
+  return sShutdownHasStarted;
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/ShutdownTracker.h firefox-trunk-41.0~a1~hg20150524r245419/image/ShutdownTracker.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/ShutdownTracker.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/ShutdownTracker.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,46 @@
+/* -*- 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/. */
+
+/**
+ * ShutdownTracker is an imagelib-global service that allows callers to check
+ * whether shutdown has started.
+ */
+
+#ifndef mozilla_image_ShutdownTracker_h
+#define mozilla_image_ShutdownTracker_h
+
+namespace mozilla {
+namespace image {
+
+/**
+ * ShutdownTracker is an imagelib-global service that allows callers to check
+ * whether shutdown has started. It exists to avoid the need for registering
+ * many 'xpcom-shutdown' notification observers on short-lived objects, which
+ * would have an unnecessary performance cost.
+ */
+struct ShutdownTracker
+{
+  /**
+   * Initialize static data. Called during imagelib module initialization.
+   */
+  static void Initialize();
+
+  /**
+   * Check whether shutdown has started. Callers can use this to check whether
+   * it's safe to access XPCOM services; if shutdown has started, such calls
+   * must be avoided.
+   *
+   * @return true if shutdown has already started.
+   */
+  static bool ShutdownHasStarted();
+
+private:
+  virtual ~ShutdownTracker() = 0;  // Forbid instantiation.
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_ShutdownTracker_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/SourceBuffer.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/SourceBuffer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/SourceBuffer.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/SourceBuffer.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,578 @@
+/* -*- 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 "SourceBuffer.h"
+
+#include <algorithm>
+#include <cmath>
+#include <cstring>
+#include "mozilla/Likely.h"
+#include "MainThreadUtils.h"
+#include "SurfaceCache.h"
+
+using std::max;
+using std::min;
+
+namespace mozilla {
+namespace image {
+
+//////////////////////////////////////////////////////////////////////////////
+// SourceBufferIterator implementation.
+//////////////////////////////////////////////////////////////////////////////
+
+SourceBufferIterator::~SourceBufferIterator()
+{
+  if (mOwner) {
+    mOwner->OnIteratorRelease();
+  }
+}
+
+SourceBufferIterator::State
+SourceBufferIterator::AdvanceOrScheduleResume(IResumable* aConsumer)
+{
+  MOZ_ASSERT(mOwner);
+  return mOwner->AdvanceIteratorOrScheduleResume(*this, aConsumer);
+}
+
+bool
+SourceBufferIterator::RemainingBytesIsNoMoreThan(size_t aBytes) const
+{
+  MOZ_ASSERT(mOwner);
+  return mOwner->RemainingBytesIsNoMoreThan(*this, aBytes);
+}
+
+
+//////////////////////////////////////////////////////////////////////////////
+// SourceBuffer implementation.
+//////////////////////////////////////////////////////////////////////////////
+
+SourceBuffer::SourceBuffer()
+  : mMutex("image::SourceBuffer")
+  , mConsumerCount(0)
+{ }
+
+SourceBuffer::~SourceBuffer()
+{
+  MOZ_ASSERT(mConsumerCount == 0,
+             "SourceBuffer destroyed with active consumers");
+}
+
+nsresult
+SourceBuffer::AppendChunk(Maybe<Chunk>&& aChunk)
+{
+  mMutex.AssertCurrentThreadOwns();
+
+#ifdef DEBUG
+  if (mChunks.Length() > 0) {
+    NS_WARNING("Appending an extra chunk for SourceBuffer");
+  }
+#endif
+
+  if (MOZ_UNLIKELY(!aChunk)) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
+  if (MOZ_UNLIKELY(aChunk->AllocationFailed())) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
+  if (MOZ_UNLIKELY(!mChunks.AppendElement(Move(*aChunk)))) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
+  return NS_OK;
+}
+
+Maybe<SourceBuffer::Chunk>
+SourceBuffer::CreateChunk(size_t aCapacity, bool aRoundUp /* = true */)
+{
+  if (MOZ_UNLIKELY(aCapacity == 0)) {
+    MOZ_ASSERT_UNREACHABLE("Appending a chunk of zero size?");
+    return Nothing();
+  }
+
+  // Round up if requested.
+  size_t finalCapacity = aRoundUp ? RoundedUpCapacity(aCapacity)
+                                  : aCapacity;
+
+  // Use the size of the SurfaceCache as an additional heuristic to avoid
+  // allocating huge buffers. Generally images do not get smaller when decoded,
+  // so if we could store the source data in the SurfaceCache, we assume that
+  // there's no way we'll be able to store the decoded version.
+  if (MOZ_UNLIKELY(!SurfaceCache::CanHold(finalCapacity))) {
+    return Nothing();
+  }
+
+  return Some(Chunk(finalCapacity));
+}
+
+nsresult
+SourceBuffer::Compact()
+{
+  mMutex.AssertCurrentThreadOwns();
+
+  MOZ_ASSERT(mConsumerCount == 0, "Should have no consumers here");
+  MOZ_ASSERT(mWaitingConsumers.Length() == 0, "Shouldn't have waiters");
+  MOZ_ASSERT(mStatus, "Should be complete here");
+
+  // Compact our waiting consumers list, since we're complete and no future
+  // consumer will ever have to wait.
+  mWaitingConsumers.Compact();
+
+  // If we have no chunks, then there's nothing to compact.
+  if (mChunks.Length() < 1) {
+    return NS_OK;
+  }
+
+  // If we have one chunk, then we can compact if it has excess capacity.
+  if (mChunks.Length() == 1 && mChunks[0].Length() == mChunks[0].Capacity()) {
+    return NS_OK;
+  }
+
+  // We can compact our buffer. Determine the total length.
+  size_t length = 0;
+  for (uint32_t i = 0 ; i < mChunks.Length() ; ++i) {
+    length += mChunks[i].Length();
+  }
+
+  Maybe<Chunk> newChunk = CreateChunk(length, /* aRoundUp = */ false);
+  if (MOZ_UNLIKELY(!newChunk || newChunk->AllocationFailed())) {
+    NS_WARNING("Failed to allocate chunk for SourceBuffer compacting - OOM?");
+    return NS_OK;
+  }
+
+  // Copy our old chunks into the new chunk.
+  for (uint32_t i = 0 ; i < mChunks.Length() ; ++i) {
+    size_t offset = newChunk->Length();
+    MOZ_ASSERT(offset < newChunk->Capacity());
+    MOZ_ASSERT(offset + mChunks[i].Length() <= newChunk->Capacity());
+
+    memcpy(newChunk->Data() + offset, mChunks[i].Data(), mChunks[i].Length());
+    newChunk->AddLength(mChunks[i].Length());
+  }
+
+  MOZ_ASSERT(newChunk->Length() == newChunk->Capacity(),
+             "Compacted chunk has slack space");
+
+  // Replace the old chunks with the new, compact chunk.
+  mChunks.Clear();
+  if (MOZ_UNLIKELY(NS_FAILED(AppendChunk(Move(newChunk))))) {
+    return HandleError(NS_ERROR_OUT_OF_MEMORY);
+  }
+  mChunks.Compact();
+
+  return NS_OK;
+}
+
+/* static */ size_t
+SourceBuffer::RoundedUpCapacity(size_t aCapacity)
+{
+  // Protect against overflow.
+  if (MOZ_UNLIKELY(SIZE_MAX - aCapacity < MIN_CHUNK_CAPACITY)) {
+    return aCapacity;
+  }
+
+  // Round up to the next multiple of MIN_CHUNK_CAPACITY (which should be the
+  // size of a page).
+  size_t roundedCapacity =
+    (aCapacity + MIN_CHUNK_CAPACITY - 1) & ~(MIN_CHUNK_CAPACITY - 1);
+  MOZ_ASSERT(roundedCapacity >= aCapacity, "Bad math?");
+  MOZ_ASSERT(roundedCapacity - aCapacity < MIN_CHUNK_CAPACITY, "Bad math?");
+
+  return roundedCapacity;
+}
+
+size_t
+SourceBuffer::FibonacciCapacityWithMinimum(size_t aMinCapacity)
+{
+  mMutex.AssertCurrentThreadOwns();
+
+  // We grow the source buffer using a Fibonacci growth rate.
+
+  size_t length = mChunks.Length();
+
+  if (length == 0) {
+    return aMinCapacity;
+  }
+
+  if (length == 1) {
+    return max(2 * mChunks[0].Capacity(), aMinCapacity);
+  }
+
+  return max(mChunks[length - 1].Capacity() + mChunks[length - 2].Capacity(),
+             aMinCapacity);
+}
+
+void
+SourceBuffer::AddWaitingConsumer(IResumable* aConsumer)
+{
+  mMutex.AssertCurrentThreadOwns();
+
+  MOZ_ASSERT(!mStatus, "Waiting when we're complete?");
+
+  if (MOZ_UNLIKELY(NS_IsMainThread())) {
+    NS_WARNING("SourceBuffer consumer on the main thread needed to wait");
+  }
+
+  mWaitingConsumers.AppendElement(aConsumer);
+}
+
+void
+SourceBuffer::ResumeWaitingConsumers()
+{
+  mMutex.AssertCurrentThreadOwns();
+
+  if (mWaitingConsumers.Length() == 0) {
+    return;
+  }
+
+  for (uint32_t i = 0 ; i < mWaitingConsumers.Length() ; ++i) {
+    mWaitingConsumers[i]->Resume();
+  }
+
+  mWaitingConsumers.Clear();
+}
+
+nsresult
+SourceBuffer::ExpectLength(size_t aExpectedLength)
+{
+  MOZ_ASSERT(aExpectedLength > 0, "Zero expected size?");
+
+  MutexAutoLock lock(mMutex);
+
+  if (MOZ_UNLIKELY(mStatus)) {
+    MOZ_ASSERT_UNREACHABLE("ExpectLength after SourceBuffer is complete");
+    return NS_OK;
+  }
+
+  if (MOZ_UNLIKELY(mChunks.Length() > 0)) {
+    MOZ_ASSERT_UNREACHABLE("Duplicate or post-Append call to ExpectLength");
+    return NS_OK;
+  }
+
+  if (MOZ_UNLIKELY(NS_FAILED(AppendChunk(CreateChunk(aExpectedLength))))) {
+    return HandleError(NS_ERROR_OUT_OF_MEMORY);
+  }
+
+  return NS_OK;
+}
+
+nsresult
+SourceBuffer::Append(const char* aData, size_t aLength)
+{
+  MOZ_ASSERT(aData, "Should have a buffer");
+  MOZ_ASSERT(aLength > 0, "Writing a zero-sized chunk");
+
+  size_t currentChunkCapacity = 0;
+  size_t currentChunkLength = 0;
+  char* currentChunkData = nullptr;
+  size_t currentChunkRemaining = 0;
+  size_t forCurrentChunk = 0;
+  size_t forNextChunk = 0;
+  size_t nextChunkCapacity = 0;
+
+  {
+    MutexAutoLock lock(mMutex);
+
+    if (MOZ_UNLIKELY(mStatus)) {
+      // This SourceBuffer is already complete; ignore further data.
+      return NS_ERROR_FAILURE;
+    }
+
+    if (MOZ_UNLIKELY(mChunks.Length() == 0)) {
+      if (MOZ_UNLIKELY(NS_FAILED(AppendChunk(CreateChunk(aLength))))) {
+        return HandleError(NS_ERROR_OUT_OF_MEMORY);
+      }
+    }
+
+    // Copy out the current chunk's information so we can release the lock.
+    // Note that this wouldn't be safe if multiple producers were allowed!
+    Chunk& currentChunk = mChunks.LastElement();
+    currentChunkCapacity = currentChunk.Capacity();
+    currentChunkLength = currentChunk.Length();
+    currentChunkData = currentChunk.Data();
+
+    // Partition this data between the current chunk and the next chunk.
+    // (Because we always allocate a chunk big enough to fit everything passed
+    // to Append, we'll never need more than those two chunks to store
+    // everything.)
+    currentChunkRemaining = currentChunkCapacity - currentChunkLength;
+    forCurrentChunk = min(aLength, currentChunkRemaining);
+    forNextChunk = aLength - forCurrentChunk;
+
+    // If we'll need another chunk, determine what its capacity should be while
+    // we still hold the lock.
+    nextChunkCapacity = forNextChunk > 0
+                      ? FibonacciCapacityWithMinimum(forNextChunk)
+                      : 0;
+  }
+
+  // Write everything we can fit into the current chunk.
+  MOZ_ASSERT(currentChunkLength + forCurrentChunk <= currentChunkCapacity);
+  memcpy(currentChunkData + currentChunkLength, aData, forCurrentChunk);
+
+  // If there's something left, create a new chunk and write it there.
+  Maybe<Chunk> nextChunk;
+  if (forNextChunk > 0) {
+    MOZ_ASSERT(nextChunkCapacity >= forNextChunk, "Next chunk too small?");
+    nextChunk = CreateChunk(nextChunkCapacity);
+    if (MOZ_LIKELY(nextChunk && !nextChunk->AllocationFailed())) {
+      memcpy(nextChunk->Data(), aData + forCurrentChunk, forNextChunk);
+      nextChunk->AddLength(forNextChunk);
+    }
+  }
+
+  // Update shared data structures.
+  {
+    MutexAutoLock lock(mMutex);
+
+    // Update the length of the current chunk.
+    Chunk& currentChunk = mChunks.LastElement();
+    MOZ_ASSERT(currentChunk.Data() == currentChunkData, "Multiple producers?");
+    MOZ_ASSERT(currentChunk.Length() == currentChunkLength,
+               "Multiple producers?");
+
+    currentChunk.AddLength(forCurrentChunk);
+
+    // If we created a new chunk, add it to the series.
+    if (forNextChunk > 0) {
+      if (MOZ_UNLIKELY(!nextChunk)) {
+        return HandleError(NS_ERROR_OUT_OF_MEMORY);
+      }
+
+      if (MOZ_UNLIKELY(NS_FAILED(AppendChunk(Move(nextChunk))))) {
+        return HandleError(NS_ERROR_OUT_OF_MEMORY);
+      }
+    }
+
+    // Resume any waiting readers now that there's new data.
+    ResumeWaitingConsumers();
+  }
+
+  return NS_OK;
+}
+
+void
+SourceBuffer::Complete(nsresult aStatus)
+{
+  MutexAutoLock lock(mMutex);
+
+  if (MOZ_UNLIKELY(mStatus)) {
+    MOZ_ASSERT_UNREACHABLE("Called Complete more than once");
+    return;
+  }
+
+  if (MOZ_UNLIKELY(NS_SUCCEEDED(aStatus) && IsEmpty())) {
+    // It's illegal to succeed without writing anything.
+    aStatus = NS_ERROR_FAILURE;
+  }
+
+  mStatus = Some(aStatus);
+
+  // Resume any waiting consumers now that we're complete.
+  ResumeWaitingConsumers();
+
+  // If we still have active consumers, just return.
+  if (mConsumerCount > 0) {
+    return;
+  }
+
+  // Attempt to compact our buffer down to a single chunk.
+  Compact();
+}
+
+bool
+SourceBuffer::IsComplete()
+{
+  MutexAutoLock lock(mMutex);
+  return bool(mStatus);
+}
+
+size_t
+SourceBuffer::SizeOfIncludingThisWithComputedFallback(MallocSizeOf
+                                                        aMallocSizeOf) const
+{
+  MutexAutoLock lock(mMutex);
+
+  size_t n = aMallocSizeOf(this);
+  n += mChunks.SizeOfExcludingThis(aMallocSizeOf);
+
+  for (uint32_t i = 0 ; i < mChunks.Length() ; ++i) {
+    size_t chunkSize = aMallocSizeOf(mChunks[i].Data());
+
+    if (chunkSize == 0) {
+      // We're on a platform where moz_malloc_size_of always returns 0.
+      chunkSize = mChunks[i].Capacity();
+    }
+
+    n += chunkSize;
+  }
+
+  return n;
+}
+
+SourceBufferIterator
+SourceBuffer::Iterator()
+{
+  {
+    MutexAutoLock lock(mMutex);
+    mConsumerCount++;
+  }
+
+  return SourceBufferIterator(this);
+}
+
+void
+SourceBuffer::OnIteratorRelease()
+{
+  MutexAutoLock lock(mMutex);
+
+  MOZ_ASSERT(mConsumerCount > 0, "Consumer count doesn't add up");
+  mConsumerCount--;
+
+  // If we still have active consumers, or we're not complete yet, then return.
+  if (mConsumerCount > 0 || !mStatus) {
+    return;
+  }
+
+  // Attempt to compact our buffer down to a single chunk.
+  Compact();
+}
+
+bool
+SourceBuffer::RemainingBytesIsNoMoreThan(const SourceBufferIterator& aIterator,
+                                         size_t aBytes) const
+{
+  MutexAutoLock lock(mMutex);
+
+  // If we're not complete, we always say no.
+  if (!mStatus) {
+    return false;
+  }
+
+  // If the iterator's at the end, the answer is trivial.
+  if (!aIterator.HasMore()) {
+    return true;
+  }
+
+  uint32_t iteratorChunk = aIterator.mData.mIterating.mChunk;
+  size_t iteratorOffset = aIterator.mData.mIterating.mOffset;
+  size_t iteratorLength = aIterator.mData.mIterating.mLength;
+
+  // Include the bytes the iterator is currently pointing to in the limit, so
+  // that the current chunk doesn't have to be a special case.
+  size_t bytes = aBytes + iteratorOffset + iteratorLength;
+
+  // Count the length over all of our chunks, starting with the one that the
+  // iterator is currently pointing to. (This is O(N), but N is expected to be
+  // ~1, so it doesn't seem worth caching the length separately.)
+  size_t lengthSoFar = 0;
+  for (uint32_t i = iteratorChunk ; i < mChunks.Length() ; ++i) {
+    lengthSoFar += mChunks[i].Length();
+    if (lengthSoFar > bytes) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+SourceBufferIterator::State
+SourceBuffer::AdvanceIteratorOrScheduleResume(SourceBufferIterator& aIterator,
+                                              IResumable* aConsumer)
+{
+  MutexAutoLock lock(mMutex);
+
+  if (MOZ_UNLIKELY(!aIterator.HasMore())) {
+    MOZ_ASSERT_UNREACHABLE("Should not advance a completed iterator");
+    return SourceBufferIterator::COMPLETE;
+  }
+
+  if (MOZ_UNLIKELY(mStatus && NS_FAILED(*mStatus))) {
+    // This SourceBuffer is complete due to an error; all reads fail.
+    return aIterator.SetComplete(*mStatus);
+  }
+
+  if (MOZ_UNLIKELY(mChunks.Length() == 0)) {
+    // We haven't gotten an initial chunk yet.
+    AddWaitingConsumer(aConsumer);
+    return aIterator.SetWaiting();
+  }
+
+  uint32_t iteratorChunkIdx = aIterator.mData.mIterating.mChunk;
+  MOZ_ASSERT(iteratorChunkIdx < mChunks.Length());
+
+  const Chunk& currentChunk = mChunks[iteratorChunkIdx];
+  size_t iteratorEnd = aIterator.mData.mIterating.mOffset +
+                       aIterator.mData.mIterating.mLength;
+  MOZ_ASSERT(iteratorEnd <= currentChunk.Length());
+  MOZ_ASSERT(iteratorEnd <= currentChunk.Capacity());
+
+  if (iteratorEnd < currentChunk.Length()) {
+    // There's more data in the current chunk.
+    return aIterator.SetReady(iteratorChunkIdx, currentChunk.Data(),
+                              iteratorEnd, currentChunk.Length() - iteratorEnd);
+  }
+
+  if (iteratorEnd == currentChunk.Capacity() &&
+      !IsLastChunk(iteratorChunkIdx)) {
+    // Advance to the next chunk.
+    const Chunk& nextChunk = mChunks[iteratorChunkIdx + 1];
+    return aIterator.SetReady(iteratorChunkIdx + 1, nextChunk.Data(), 0,
+                              nextChunk.Length());
+  }
+
+  MOZ_ASSERT(IsLastChunk(iteratorChunkIdx), "Should've advanced");
+
+  if (mStatus) {
+    // There's no more data and this SourceBuffer completed successfully.
+    MOZ_ASSERT(NS_SUCCEEDED(*mStatus), "Handled failures earlier");
+    return aIterator.SetComplete(*mStatus);
+  }
+
+  // We're not complete, but there's no more data right now. Arrange to wake up
+  // the consumer when we get more data.
+  AddWaitingConsumer(aConsumer);
+  return aIterator.SetWaiting();
+}
+
+nsresult
+SourceBuffer::HandleError(nsresult aError)
+{
+  MOZ_ASSERT(NS_FAILED(aError), "Should have an error here");
+  MOZ_ASSERT(aError == NS_ERROR_OUT_OF_MEMORY,
+             "Unexpected error; may want to notify waiting readers, which "
+             "HandleError currently doesn't do");
+
+  mMutex.AssertCurrentThreadOwns();
+
+  NS_WARNING("SourceBuffer encountered an unrecoverable error");
+
+  // Record the error.
+  mStatus = Some(aError);
+
+  // Drop our references to waiting readers.
+  mWaitingConsumers.Clear();
+
+  return *mStatus;
+}
+
+bool
+SourceBuffer::IsEmpty()
+{
+  mMutex.AssertCurrentThreadOwns();
+  return mChunks.Length() == 0 ||
+         mChunks[0].Length() == 0;
+}
+
+bool
+SourceBuffer::IsLastChunk(uint32_t aChunk)
+{
+  mMutex.AssertCurrentThreadOwns();
+  return aChunk + 1 == mChunks.Length();
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/SourceBuffer.h firefox-trunk-41.0~a1~hg20150524r245419/image/SourceBuffer.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/SourceBuffer.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/SourceBuffer.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,382 @@
+/* -*- 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/. */
+
+/**
+ * SourceBuffer is a single producer, multiple consumer data structure used for
+ * storing image source (compressed) data.
+ */
+
+#ifndef mozilla_image_sourcebuffer_h
+#define mozilla_image_sourcebuffer_h
+
+#include "mozilla/Maybe.h"
+#include "mozilla/MemoryReporting.h"
+#include "mozilla/Mutex.h"
+#include "mozilla/Move.h"
+#include "mozilla/MemoryReporting.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/UniquePtr.h"
+#include "nsRefPtr.h"
+#include "nsTArray.h"
+
+namespace mozilla {
+namespace image {
+
+class SourceBuffer;
+
+/**
+ * IResumable is an interface for classes that can schedule themselves to resume
+ * their work later. An implementation of IResumable generally should post a
+ * runnable to some event target which continues the work of the task.
+ */
+struct IResumable
+{
+  MOZ_DECLARE_REFCOUNTED_TYPENAME(IResumable)
+
+  // Subclasses may or may not be XPCOM classes, so we just require that they
+  // implement AddRef and Release.
+  NS_IMETHOD_(MozExternalRefCountType) AddRef(void) = 0;
+  NS_IMETHOD_(MozExternalRefCountType) Release(void) = 0;
+
+  virtual void Resume() = 0;
+
+protected:
+  virtual ~IResumable() { }
+};
+
+/**
+ * SourceBufferIterator is a class that allows consumers of image source data to
+ * read the contents of a SourceBuffer sequentially.
+ *
+ * Consumers can advance through the SourceBuffer by calling
+ * AdvanceOrScheduleResume() repeatedly. After every advance, they should call
+ * check the return value, which will tell them the iterator's new state.
+ *
+ * If WAITING is returned, AdvanceOrScheduleResume() has arranged
+ * to call the consumer's Resume() method later, so the consumer should save its
+ * state if needed and stop running.
+ *
+ * If the iterator's new state is READY, then the consumer can call Data() and
+ * Length() to read new data from the SourceBuffer.
+ *
+ * Finally, in the COMPLETE state the consumer can call CompletionStatus() to
+ * get the status passed to SourceBuffer::Complete().
+ */
+class SourceBufferIterator final
+{
+public:
+  enum State {
+    START,    // The iterator is at the beginning of the buffer.
+    READY,    // The iterator is pointing to new data.
+    WAITING,  // The iterator is blocked and the caller must yield.
+    COMPLETE  // The iterator is pointing to the end of the buffer.
+  };
+
+  explicit SourceBufferIterator(SourceBuffer* aOwner)
+    : mOwner(aOwner)
+    , mState(START)
+  {
+    MOZ_ASSERT(aOwner);
+    mData.mIterating.mChunk = 0;
+    mData.mIterating.mData = nullptr;
+    mData.mIterating.mOffset = 0;
+    mData.mIterating.mLength = 0;
+  }
+
+  SourceBufferIterator(SourceBufferIterator&& aOther)
+    : mOwner(Move(aOther.mOwner))
+    , mState(aOther.mState)
+    , mData(aOther.mData)
+  { }
+
+  ~SourceBufferIterator();
+
+  SourceBufferIterator& operator=(SourceBufferIterator&& aOther)
+  {
+    mOwner = Move(aOther.mOwner);
+    mState = aOther.mState;
+    mData = aOther.mData;
+    return *this;
+  }
+
+  /**
+   * Returns true if there are no more than @aBytes remaining in the
+   * SourceBuffer. If the SourceBuffer is not yet complete, returns false.
+   */
+  bool RemainingBytesIsNoMoreThan(size_t aBytes) const;
+
+  /**
+   * Advances the iterator through the SourceBuffer if possible. If not,
+   * arranges to call the @aConsumer's Resume() method when more data is
+   * available.
+   */
+  State AdvanceOrScheduleResume(IResumable* aConsumer);
+
+  /// If at the end, returns the status passed to SourceBuffer::Complete().
+  nsresult CompletionStatus() const
+  {
+    MOZ_ASSERT(mState == COMPLETE,
+               "Calling CompletionStatus() in the wrong state");
+    return mState == COMPLETE ? mData.mAtEnd.mStatus : NS_OK;
+  }
+
+  /// If we're ready to read, returns a pointer to the new data.
+  const char* Data() const
+  {
+    MOZ_ASSERT(mState == READY, "Calling Data() in the wrong state");
+    return mState == READY ? mData.mIterating.mData + mData.mIterating.mOffset
+                           : nullptr;
+  }
+
+  /// If we're ready to read, returns the length of the new data.
+  size_t Length() const
+  {
+    MOZ_ASSERT(mState == READY, "Calling Length() in the wrong state");
+    return mState == READY ? mData.mIterating.mLength : 0;
+  }
+
+private:
+  friend class SourceBuffer;
+
+  SourceBufferIterator(const SourceBufferIterator&) = delete;
+  SourceBufferIterator& operator=(const SourceBufferIterator&) = delete;
+
+  bool HasMore() const { return mState != COMPLETE; }
+
+  State SetReady(uint32_t aChunk, const char* aData,
+                size_t aOffset, size_t aLength)
+  {
+    MOZ_ASSERT(mState != COMPLETE);
+    mData.mIterating.mChunk = aChunk;
+    mData.mIterating.mData = aData;
+    mData.mIterating.mOffset = aOffset;
+    mData.mIterating.mLength = aLength;
+    return mState = READY;
+  }
+
+  State SetWaiting()
+  {
+    MOZ_ASSERT(mState != COMPLETE);
+    MOZ_ASSERT(mState != WAITING, "Did we get a spurious wakeup somehow?");
+    return mState = WAITING;
+  }
+
+  State SetComplete(nsresult aStatus)
+  {
+    mData.mAtEnd.mStatus = aStatus;
+    return mState = COMPLETE;
+  }
+
+  nsRefPtr<SourceBuffer> mOwner;
+
+  State mState;
+
+  /**
+   * This union contains our iteration state if we're still iterating (for
+   * states START, READY, and WAITING) and the status the SourceBuffer was
+   * completed with if we're in state COMPLETE.
+   */
+  union {
+    struct {
+      uint32_t mChunk;
+      const char* mData;
+      size_t mOffset;
+      size_t mLength;
+    } mIterating;
+    struct {
+      nsresult mStatus;
+    } mAtEnd;
+  } mData;
+};
+
+/**
+ * SourceBuffer is a parallel data structure used for storing image source
+ * (compressed) data.
+ *
+ * SourceBuffer is a single producer, multiple consumer data structure. The
+ * single producer calls Append() to append data to the buffer. In parallel,
+ * multiple consumers can call Iterator(), which returns a SourceBufferIterator
+ * that they can use to iterate through the buffer. The SourceBufferIterator
+ * returns a series of pointers which remain stable for lifetime of the
+ * SourceBuffer, and the data they point to is immutable, ensuring that the
+ * producer never interferes with the consumers.
+ *
+ * In order to avoid blocking, SourceBuffer works with SourceBufferIterator to
+ * keep a list of consumers which are waiting for new data, and to resume them
+ * when the producer appends more. All consumers must implement the IResumable
+ * interface to make this possible.
+ *
+ * XXX(seth): We should add support for compacting a SourceBuffer. To do this,
+ * we need to have SourceBuffer keep track of how many live
+ * SourceBufferIterator's point to it. When the SourceBuffer is complete and no
+ * live SourceBufferIterator's for it remain, we can compact its contents into a
+ * single chunk.
+ */
+class SourceBuffer final
+{
+public:
+  MOZ_DECLARE_REFCOUNTED_TYPENAME(image::SourceBuffer)
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(image::SourceBuffer)
+
+  SourceBuffer();
+
+  //////////////////////////////////////////////////////////////////////////////
+  // Producer methods.
+  //////////////////////////////////////////////////////////////////////////////
+
+  /**
+   * If the producer knows how long the source data will be, it should call
+   * ExpectLength, which enables SourceBuffer to preallocate its buffer.
+   */
+  nsresult ExpectLength(size_t aExpectedLength);
+
+  /// Append the provided data to the buffer.
+  nsresult Append(const char* aData, size_t aLength);
+
+  /**
+   * Mark the buffer complete, with a status that will be available to
+   * consumers. Further calls to Append() are forbidden after Complete().
+   */
+  void Complete(nsresult aStatus);
+
+  /// Returns true if the buffer is complete.
+  bool IsComplete();
+
+  /// Memory reporting.
+  size_t SizeOfIncludingThisWithComputedFallback(MallocSizeOf) const;
+
+
+  //////////////////////////////////////////////////////////////////////////////
+  // Consumer methods.
+  //////////////////////////////////////////////////////////////////////////////
+
+  /// Returns an iterator to this SourceBuffer.
+  SourceBufferIterator Iterator();
+
+
+private:
+  friend class SourceBufferIterator;
+
+  ~SourceBuffer();
+
+  //////////////////////////////////////////////////////////////////////////////
+  // Chunk type and chunk-related methods.
+  //////////////////////////////////////////////////////////////////////////////
+
+  class Chunk
+  {
+  public:
+    explicit Chunk(size_t aCapacity)
+      : mCapacity(aCapacity)
+      , mLength(0)
+    {
+      MOZ_ASSERT(aCapacity > 0, "Creating zero-capacity chunk");
+      mData = new (fallible) char[mCapacity];
+    }
+
+    ~Chunk() { delete[] mData; }
+
+    Chunk(Chunk&& aOther)
+      : mCapacity(aOther.mCapacity)
+      , mLength(aOther.mLength)
+      , mData(aOther.mData)
+    {
+      aOther.mCapacity = aOther.mLength = 0;
+      aOther.mData = nullptr;
+    }
+
+    Chunk& operator=(Chunk&& aOther)
+    {
+      mCapacity = aOther.mCapacity;
+      mLength = aOther.mLength;
+      mData = aOther.mData;
+      aOther.mCapacity = aOther.mLength = 0;
+      aOther.mData = nullptr;
+      return *this;
+    }
+
+    bool AllocationFailed() const { return !mData; }
+    size_t Capacity() const { return mCapacity; }
+    size_t Length() const { return mLength; }
+
+    char* Data() const
+    {
+      MOZ_ASSERT(mData, "Allocation failed but nobody checked for it");
+      return mData;
+    }
+
+    void AddLength(size_t aAdditionalLength)
+    {
+      MOZ_ASSERT(mLength + aAdditionalLength <= mCapacity);
+      mLength += aAdditionalLength;
+    }
+
+  private:
+    Chunk(const Chunk&) = delete;
+    Chunk& operator=(const Chunk&) = delete;
+
+    size_t mCapacity;
+    size_t mLength;
+    char* mData;
+  };
+
+  nsresult AppendChunk(Maybe<Chunk>&& aChunk);
+  Maybe<Chunk> CreateChunk(size_t aCapacity, bool aRoundUp = true);
+  nsresult Compact();
+  static size_t RoundedUpCapacity(size_t aCapacity);
+  size_t FibonacciCapacityWithMinimum(size_t aMinCapacity);
+
+
+  //////////////////////////////////////////////////////////////////////////////
+  // Iterator / consumer methods.
+  //////////////////////////////////////////////////////////////////////////////
+
+  void AddWaitingConsumer(IResumable* aConsumer);
+  void ResumeWaitingConsumers();
+
+  typedef SourceBufferIterator::State State;
+
+  State AdvanceIteratorOrScheduleResume(SourceBufferIterator& aIterator,
+                                        IResumable* aConsumer);
+  bool RemainingBytesIsNoMoreThan(const SourceBufferIterator& aIterator,
+                                  size_t aBytes) const;
+
+  void OnIteratorRelease();
+
+  //////////////////////////////////////////////////////////////////////////////
+  // Helper methods.
+  //////////////////////////////////////////////////////////////////////////////
+
+  nsresult HandleError(nsresult aError);
+  bool IsEmpty();
+  bool IsLastChunk(uint32_t aChunk);
+
+
+  //////////////////////////////////////////////////////////////////////////////
+  // Member variables.
+  //////////////////////////////////////////////////////////////////////////////
+
+  static const size_t MIN_CHUNK_CAPACITY = 4096;
+
+  /// All private members are protected by mMutex.
+  mutable Mutex mMutex;
+
+  /// The data in this SourceBuffer, stored as a series of Chunks.
+  FallibleTArray<Chunk> mChunks;
+
+  /// Consumers which are waiting to be notified when new data is available.
+  nsTArray<nsRefPtr<IResumable>> mWaitingConsumers;
+
+  /// If present, marks this SourceBuffer complete with the given final status.
+  Maybe<nsresult> mStatus;
+
+  /// Count of active consumers.
+  uint32_t mConsumerCount;
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_sourcebuffer_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/BMPFileHeaders.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/BMPFileHeaders.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/BMPFileHeaders.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/BMPFileHeaders.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,144 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef mozilla_image_src_BMPFileHeaders_h
-#define mozilla_image_src_BMPFileHeaders_h
-
-namespace mozilla {
-namespace image {
-
-struct BMPFILEHEADER {
-  char signature[2];   // String "BM"
-  uint32_t filesize;
-  int32_t reserved;    // Zero
-  uint32_t dataoffset; // Offset to raster data
-
-  uint32_t bihsize;
-};
-
-// The length of the bitmap file header as defined in the BMP spec.
-#define BFH_LENGTH 14
-// Internally we store the bitmap file header with an additional 4 bytes which
-// is used to store the bitmap information header size.
-#define BFH_INTERNAL_LENGTH 18
-
-#define OS2_INTERNAL_BIH_LENGTH 8
-#define WIN_V3_INTERNAL_BIH_LENGTH 36
-#define WIN_V5_INTERNAL_BIH_LENGTH 120
-
-#define OS2_BIH_LENGTH 12     // This is the real BIH size (as contained in the
-                              // bihsize field of BMPFILEHEADER)
-#define WIN_V3_BIH_LENGTH 40  // This is the real BIH size (as contained in the
-                              // bihsize field of BMPFILEHEADER)
-#define WIN_V5_BIH_LENGTH 124 // This is the real BIH size (as contained in the
-                              // bihsize field of BMPFILEHEADER)
-
-#define OS2_HEADER_LENGTH (BFH_INTERNAL_LENGTH + OS2_INTERNAL_BIH_LENGTH)
-#define WIN_V3_HEADER_LENGTH (BFH_INTERNAL_LENGTH + WIN_V3_INTERNAL_BIH_LENGTH)
-#define WIN_V5_HEADER_LENGTH (BFH_INTERNAL_LENGTH + WIN_V5_INTERNAL_BIH_LENGTH)
-
-#ifndef LCS_sRGB
-#define LCS_sRGB 0x73524742
-#endif
-
-struct xyz {
-  int32_t x, y, z;
-};
-
-struct xyzTriple {
-  xyz r, g, b;
-};
-
-struct BITMAPV5HEADER {
-  int32_t width;             // Uint16 in OS/2 BMPs
-  int32_t height;            // Uint16 in OS/2 BMPs
-  uint16_t planes;           // =1
-  uint16_t bpp;              // Bits per pixel.
-  // The rest of the header is not available in OS/2 BMP Files
-  uint32_t compression;      // 0=no compression 1=8bit RLE 2=4bit RLE
-  uint32_t image_size;       // (compressed) image size. Can be 0 if
-                             // compression==0
-  uint32_t xppm;             // Pixels per meter, horizontal
-  uint32_t yppm;             // Pixels per meter, vertical
-  uint32_t colors;           // Used Colors
-  uint32_t important_colors; // Number of important colors. 0=all
-  uint32_t red_mask;         // Bits used for red component
-  uint32_t green_mask;       // Bits used for green component
-  uint32_t blue_mask;        // Bits used for blue component
-  uint32_t alpha_mask;       // Bits used for alpha component
-  uint32_t color_space;      // 0x73524742=LCS_sRGB ...
-  // These members are unused unless color_space == LCS_CALIBRATED_RGB
-  xyzTriple white_point;     // Logical white point
-  uint32_t gamma_red;        // Red gamma component
-  uint32_t gamma_green;      // Green gamma component
-  uint32_t gamma_blue;       // Blue gamma component
-  uint32_t intent;           // Rendering intent
-  // These members are unused unless color_space == LCS_PROFILE_*
-  uint32_t profile_offset;   // Offset to profile data in bytes
-  uint32_t profile_size;     // Size of profile data in bytes
-  uint32_t reserved;         // =0
-};
-
-struct colorTable {
-  uint8_t red;
-  uint8_t green;
-  uint8_t blue;
-};
-
-struct bitFields {
-  uint32_t red;
-  uint32_t green;
-  uint32_t blue;
-  uint8_t redLeftShift;
-  uint8_t redRightShift;
-  uint8_t greenLeftShift;
-  uint8_t greenRightShift;
-  uint8_t blueLeftShift;
-  uint8_t blueRightShift;
-};
-
-} // namespace image
-} // namespace mozilla
-
-#define BITFIELD_LENGTH 12 // Length of the bitfields structure in the bmp file
-#define USE_RGB
-
-// BMPINFOHEADER.compression defines
-#ifndef BI_RGB
-#define BI_RGB 0
-#endif
-#ifndef BI_RLE8
-#define BI_RLE8 1
-#endif
-#ifndef BI_RLE4
-#define BI_RLE4 2
-#endif
-#ifndef BI_BITFIELDS
-#define BI_BITFIELDS 3
-#endif
-// BI_ALPHABITFIELDS  means no compression and specifies alpha bits
-// valid only for 32bpp and 16bpp
-#ifndef BI_ALPHABITFIELDS
-#define BI_ALPHABITFIELDS 4
-#endif
-
-// RLE Escape codes
-#define RLE_ESCAPE       0
-#define RLE_ESCAPE_EOL   0
-#define RLE_ESCAPE_EOF   1
-#define RLE_ESCAPE_DELTA 2
-
-/// enums for mState
-enum ERLEState {
-  eRLEStateInitial,
-  eRLEStateNeedSecondEscapeByte,
-  eRLEStateNeedXDelta,
-  eRLEStateNeedYDelta,        ///< mStateData will hold x delta
-  eRLEStateAbsoluteMode,      ///< mStateData will hold count of existing data
-                              ///< to read
-  eRLEStateAbsoluteModePadded ///< As above, but another byte of data has to
-                              ///< be read as padding
-};
-
-#endif // mozilla_image_src_BMPFileHeaders_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/ClippedImage.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/ClippedImage.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/ClippedImage.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/ClippedImage.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,476 +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 <new>      // Workaround for bug in VS10; see bug 981264.
-#include <cmath>
-#include <utility>
-
-#include "gfxDrawable.h"
-#include "gfxPlatform.h"
-#include "gfxUtils.h"
-#include "mozilla/gfx/2D.h"
-#include "mozilla/RefPtr.h"
-
-#include "ImageRegion.h"
-#include "Orientation.h"
-#include "SVGImageContext.h"
-
-#include "ClippedImage.h"
-
-namespace mozilla {
-
-using namespace gfx;
-using layers::LayerManager;
-using layers::ImageContainer;
-using std::make_pair;
-using std::modf;
-using std::pair;
-
-namespace image {
-
-class ClippedImageCachedSurface
-{
-public:
-  ClippedImageCachedSurface(TemporaryRef<SourceSurface> aSurface,
-                            const nsIntSize& aSize,
-                            const Maybe<SVGImageContext>& aSVGContext,
-                            float aFrame,
-                            uint32_t aFlags)
-    : mSurface(aSurface)
-    , mSize(aSize)
-    , mFrame(aFrame)
-    , mFlags(aFlags)
-  {
-    MOZ_ASSERT(mSurface, "Must have a valid surface");
-    if (aSVGContext) {
-      mSVGContext.emplace(*aSVGContext);
-    }
-  }
-
-  bool Matches(const nsIntSize& aSize,
-               const Maybe<SVGImageContext>& aSVGContext,
-               float aFrame,
-               uint32_t aFlags)
-  {
-    return mSize == aSize &&
-           mSVGContext == aSVGContext &&
-           mFrame == aFrame &&
-           mFlags == aFlags;
-  }
-
-  TemporaryRef<SourceSurface> Surface() {
-    return mSurface;
-  }
-
-private:
-  RefPtr<SourceSurface>  mSurface;
-  const nsIntSize        mSize;
-  Maybe<SVGImageContext> mSVGContext;
-  const float            mFrame;
-  const uint32_t         mFlags;
-};
-
-class DrawSingleTileCallback : public gfxDrawingCallback
-{
-public:
-  DrawSingleTileCallback(ClippedImage* aImage,
-                         const nsIntSize& aSize,
-                         const Maybe<SVGImageContext>& aSVGContext,
-                         uint32_t aWhichFrame,
-                         uint32_t aFlags)
-    : mImage(aImage)
-    , mSize(aSize)
-    , mSVGContext(aSVGContext)
-    , mWhichFrame(aWhichFrame)
-    , mFlags(aFlags)
-  {
-    MOZ_ASSERT(mImage, "Must have an image to clip");
-  }
-
-  virtual bool operator()(gfxContext* aContext,
-                          const gfxRect& aFillRect,
-                          const GraphicsFilter& aFilter,
-                          const gfxMatrix& aTransform)
-  {
-    MOZ_ASSERT(aTransform.IsIdentity(),
-               "Caller is probably CreateSamplingRestrictedDrawable, "
-               "which should not happen");
-
-    // Draw the image. |gfxCallbackDrawable| always calls this function with
-    // arguments that guarantee we never tile.
-    mImage->DrawSingleTile(aContext, mSize, ImageRegion::Create(aFillRect),
-                           mWhichFrame, aFilter, mSVGContext, mFlags);
-
-    return true;
-  }
-
-private:
-  nsRefPtr<ClippedImage>        mImage;
-  const nsIntSize               mSize;
-  const Maybe<SVGImageContext>& mSVGContext;
-  const uint32_t                mWhichFrame;
-  const uint32_t                mFlags;
-};
-
-ClippedImage::ClippedImage(Image* aImage,
-                           nsIntRect aClip)
-  : ImageWrapper(aImage)
-  , mClip(aClip)
-{
-  MOZ_ASSERT(aImage != nullptr, "ClippedImage requires an existing Image");
-}
-
-ClippedImage::~ClippedImage()
-{ }
-
-bool
-ClippedImage::ShouldClip()
-{
-  // We need to evaluate the clipping region against the image's width and
-  // height once they're available to determine if it's valid and whether we
-  // actually need to do any work. We may fail if the image's width and height
-  // aren't available yet, in which case we'll try again later.
-  if (mShouldClip.isNothing()) {
-    int32_t width, height;
-    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);
-    } else if (NS_SUCCEEDED(InnerImage()->GetWidth(&width)) && width > 0 &&
-               NS_SUCCEEDED(InnerImage()->GetHeight(&height)) && height > 0) {
-      // Clamp the clipping region to the size of the underlying image.
-      mClip = mClip.Intersect(nsIntRect(0, 0, width, height));
-
-      // 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 (progressTracker &&
-               !(progressTracker->GetProgress() & FLAG_LOAD_COMPLETE)) {
-      // 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 memorizing
-      // anything.
-      return false;
-    } else {
-      // We have a fully loaded image without a clearly defined width and
-      // height. This can happen with SVG images.
-      mShouldClip.emplace(false);
-    }
-  }
-
-  MOZ_ASSERT(mShouldClip.isSome(), "Should have computed a result");
-  return *mShouldClip;
-}
-
-NS_IMPL_ISUPPORTS_INHERITED0(ClippedImage, ImageWrapper)
-
-NS_IMETHODIMP
-ClippedImage::GetWidth(int32_t* aWidth)
-{
-  if (!ShouldClip()) {
-    return InnerImage()->GetWidth(aWidth);
-  }
-
-  *aWidth = mClip.width;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-ClippedImage::GetHeight(int32_t* aHeight)
-{
-  if (!ShouldClip()) {
-    return InnerImage()->GetHeight(aHeight);
-  }
-
-  *aHeight = mClip.height;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-ClippedImage::GetIntrinsicSize(nsSize* aSize)
-{
-  if (!ShouldClip()) {
-    return InnerImage()->GetIntrinsicSize(aSize);
-  }
-
-  *aSize = nsSize(mClip.width, mClip.height);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-ClippedImage::GetIntrinsicRatio(nsSize* aRatio)
-{
-  if (!ShouldClip()) {
-    return InnerImage()->GetIntrinsicRatio(aRatio);
-  }
-
-  *aRatio = nsSize(mClip.width, mClip.height);
-  return NS_OK;
-}
-
-NS_IMETHODIMP_(TemporaryRef<SourceSurface>)
-ClippedImage::GetFrame(uint32_t aWhichFrame,
-                       uint32_t aFlags)
-{
-  return GetFrameInternal(mClip.Size(), Nothing(), aWhichFrame, aFlags);
-}
-
-TemporaryRef<SourceSurface>
-ClippedImage::GetFrameInternal(const nsIntSize& aSize,
-                               const Maybe<SVGImageContext>& aSVGContext,
-                               uint32_t aWhichFrame,
-                               uint32_t aFlags)
-{
-  if (!ShouldClip()) {
-    return InnerImage()->GetFrame(aWhichFrame, aFlags);
-  }
-
-  float frameToDraw = InnerImage()->GetFrameIndex(aWhichFrame);
-  if (!mCachedSurface || !mCachedSurface->Matches(aSize,
-                                                  aSVGContext,
-                                                  frameToDraw,
-                                                  aFlags)) {
-    // Create a surface to draw into.
-    RefPtr<DrawTarget> target = gfxPlatform::GetPlatform()->
-      CreateOffscreenContentDrawTarget(IntSize(aSize.width, aSize.height),
-                                       SurfaceFormat::B8G8R8A8);
-    if (!target) {
-      NS_ERROR("Could not create a DrawTarget");
-      return nullptr;
-    }
-
-    nsRefPtr<gfxContext> ctx = new gfxContext(target);
-
-    // Create our callback.
-    nsRefPtr<gfxDrawingCallback> drawTileCallback =
-      new DrawSingleTileCallback(this, aSize, aSVGContext, aWhichFrame, aFlags);
-    nsRefPtr<gfxDrawable> drawable =
-      new gfxCallbackDrawable(drawTileCallback, aSize);
-
-    // Actually draw. The callback will end up invoking DrawSingleTile.
-    gfxUtils::DrawPixelSnapped(ctx, drawable, aSize,
-                               ImageRegion::Create(aSize),
-                               SurfaceFormat::B8G8R8A8,
-                               GraphicsFilter::FILTER_FAST,
-                               imgIContainer::FLAG_CLAMP);
-
-    // Cache the resulting surface.
-    mCachedSurface = new ClippedImageCachedSurface(target->Snapshot(), aSize,
-                                                   aSVGContext, frameToDraw,
-                                                   aFlags);
-  }
-
-  MOZ_ASSERT(mCachedSurface, "Should have a cached surface now");
-  return mCachedSurface->Surface();
-}
-
-NS_IMETHODIMP_(already_AddRefed<ImageContainer>)
-ClippedImage::GetImageContainer(LayerManager* aManager, uint32_t aFlags)
-{
-  // XXX(seth): We currently don't have a way of clipping the result of
-  // GetImageContainer. We work around this by always returning null, but if it
-  // ever turns out that ClippedImage is widely used on codepaths that can
-  // actually benefit from GetImageContainer, it would be a good idea to fix
-  // that method for performance reasons.
-
-  if (!ShouldClip()) {
-    return InnerImage()->GetImageContainer(aManager, aFlags);
-  }
-
-  return (nullptr);
-}
-
-static bool
-MustCreateSurface(gfxContext* aContext,
-                  const nsIntSize& aSize,
-                  const ImageRegion& aRegion,
-                  const uint32_t aFlags)
-{
-  gfxRect imageRect(0, 0, aSize.width, aSize.height);
-  bool willTile = !imageRect.Contains(aRegion.Rect()) &&
-                  !(aFlags & imgIContainer::FLAG_CLAMP);
-  bool willResample = aContext->CurrentMatrix().HasNonIntegerTranslation() &&
-                      (willTile || !aRegion.RestrictionContains(imageRect));
-  return willTile || willResample;
-}
-
-NS_IMETHODIMP_(DrawResult)
-ClippedImage::Draw(gfxContext* aContext,
-                   const nsIntSize& aSize,
-                   const ImageRegion& aRegion,
-                   uint32_t aWhichFrame,
-                   GraphicsFilter aFilter,
-                   const Maybe<SVGImageContext>& aSVGContext,
-                   uint32_t aFlags)
-{
-  if (!ShouldClip()) {
-    return InnerImage()->Draw(aContext, aSize, aRegion, aWhichFrame,
-                              aFilter, aSVGContext, aFlags);
-  }
-
-  // Check for tiling. If we need to tile then we need to create a
-  // gfxCallbackDrawable to handle drawing for us.
-  if (MustCreateSurface(aContext, aSize, aRegion, aFlags)) {
-    // Create a temporary surface containing a single tile of this image.
-    // GetFrame will call DrawSingleTile internally.
-    RefPtr<SourceSurface> surface =
-      GetFrameInternal(aSize, aSVGContext, aWhichFrame, aFlags);
-    if (!surface) {
-      return DrawResult::TEMPORARY_ERROR;
-    }
-
-    // Create a drawable from that surface.
-    nsRefPtr<gfxSurfaceDrawable> drawable =
-      new gfxSurfaceDrawable(surface, aSize);
-
-    // Draw.
-    gfxUtils::DrawPixelSnapped(aContext, drawable, aSize, aRegion,
-                               SurfaceFormat::B8G8R8A8, aFilter);
-
-    return DrawResult::SUCCESS;
-  }
-
-  return DrawSingleTile(aContext, aSize, aRegion, aWhichFrame,
-                        aFilter, aSVGContext, aFlags);
-}
-
-static SVGImageContext
-UnclipViewport(const SVGImageContext& aOldContext,
-               const pair<nsIntSize, nsIntSize>& aInnerAndClipSize)
-{
-  nsIntSize innerSize(aInnerAndClipSize.first);
-  nsIntSize clipSize(aInnerAndClipSize.second);
-
-  // Map the viewport to the inner image. (Note that we don't take the aSize
-  // parameter of Draw into account, just the clipping region.)
-  CSSIntSize vSize(aOldContext.GetViewportSize());
-  vSize.width = ceil(vSize.width * double(innerSize.width) / clipSize.width);
-  vSize.height =
-    ceil(vSize.height * double(innerSize.height) / clipSize.height);
-
-  return SVGImageContext(vSize,
-                         aOldContext.GetPreserveAspectRatio());
-}
-
-DrawResult
-ClippedImage::DrawSingleTile(gfxContext* aContext,
-                             const nsIntSize& aSize,
-                             const ImageRegion& aRegion,
-                             uint32_t aWhichFrame,
-                             GraphicsFilter aFilter,
-                             const Maybe<SVGImageContext>& aSVGContext,
-                             uint32_t aFlags)
-{
-  MOZ_ASSERT(!MustCreateSurface(aContext, aSize, aRegion, aFlags),
-             "Shouldn't need to create a surface");
-
-  gfxRect clip(mClip.x, mClip.y, mClip.width, mClip.height);
-  nsIntSize size(aSize), innerSize(aSize);
-  if (NS_SUCCEEDED(InnerImage()->GetWidth(&innerSize.width)) &&
-      NS_SUCCEEDED(InnerImage()->GetHeight(&innerSize.height))) {
-    double scaleX = aSize.width / clip.width;
-    double scaleY = aSize.height / clip.height;
-
-    // Map the clip and size to the scale requested by the caller.
-    clip.Scale(scaleX, scaleY);
-    size = innerSize;
-    size.Scale(scaleX, scaleY);
-  } else {
-    MOZ_ASSERT(false,
-               "If ShouldClip() led us to draw then we should never get here");
-  }
-
-  // We restrict our drawing to only the clipping region, and translate so that
-  // the clipping region is placed at the position the caller expects.
-  ImageRegion region(aRegion);
-  region.MoveBy(clip.x, clip.y);
-  region = region.Intersect(clip);
-
-  gfxContextMatrixAutoSaveRestore saveMatrix(aContext);
-  aContext->Multiply(gfxMatrix::Translation(-clip.x, -clip.y));
-
-  return InnerImage()->Draw(aContext, size, region,
-                            aWhichFrame, aFilter,
-                            aSVGContext.map(UnclipViewport,
-                                            make_pair(innerSize, mClip.Size())),
-                            aFlags);
-}
-
-NS_IMETHODIMP
-ClippedImage::RequestDiscard()
-{
-  // We're very aggressive about discarding.
-  mCachedSurface = nullptr;
-
-  return InnerImage()->RequestDiscard();
-}
-
-NS_IMETHODIMP_(Orientation)
-ClippedImage::GetOrientation()
-{
-  // XXX(seth): This should not actually be here; this is just to work around a
-  // what appears to be a bug in MSVC's linker.
-  return InnerImage()->GetOrientation();
-}
-
-nsIntSize
-ClippedImage::OptimalImageSizeForDest(const gfxSize& aDest,
-                                      uint32_t aWhichFrame,
-                                      GraphicsFilter aFilter, uint32_t aFlags)
-{
-  if (!ShouldClip()) {
-    return InnerImage()->OptimalImageSizeForDest(aDest, aWhichFrame, aFilter,
-                                                 aFlags);
-  }
-
-  int32_t imgWidth, imgHeight;
-  if (NS_SUCCEEDED(InnerImage()->GetWidth(&imgWidth)) &&
-      NS_SUCCEEDED(InnerImage()->GetHeight(&imgHeight))) {
-    // To avoid ugly sampling artifacts, ClippedImage needs the image size to
-    // be chosen such that the clipping region lies on pixel boundaries.
-
-    // First, we select a scale that's good for ClippedImage. An integer
-    // multiple of the size of the clipping region is always fine.
-    nsIntSize scale(ceil(aDest.width / mClip.width),
-                    ceil(aDest.height / mClip.height));
-
-    // Determine the size we'd prefer to render the inner image at, and ask the
-    // inner image what size we should actually use.
-    gfxSize desiredSize(imgWidth * scale.width, imgHeight * scale.height);
-    nsIntSize innerDesiredSize =
-      InnerImage()->OptimalImageSizeForDest(desiredSize, aWhichFrame,
-                                            aFilter, aFlags);
-
-    // To get our final result, we take the inner image's desired size and
-    // determine how large the clipped region would be at that scale. (Again, we
-    // ensure an integer multiple of the size of the clipping region.)
-    nsIntSize finalScale(ceil(double(innerDesiredSize.width) / imgWidth),
-                         ceil(double(innerDesiredSize.height) / imgHeight));
-    return mClip.Size() * finalScale;
-  } else {
-    MOZ_ASSERT(false,
-               "If ShouldClip() led us to draw then we should never get here");
-    return InnerImage()->OptimalImageSizeForDest(aDest, aWhichFrame, aFilter,
-                                                 aFlags);
-  }
-}
-
-NS_IMETHODIMP_(nsIntRect)
-ClippedImage::GetImageSpaceInvalidationRect(const nsIntRect& aRect)
-{
-  if (!ShouldClip()) {
-    return InnerImage()->GetImageSpaceInvalidationRect(aRect);
-  }
-
-  nsIntRect rect(InnerImage()->GetImageSpaceInvalidationRect(aRect));
-  rect = rect.Intersect(mClip);
-  rect.MoveBy(-mClip.x, -mClip.y);
-  return rect;
-}
-
-} // namespace image
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/ClippedImage.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/ClippedImage.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/ClippedImage.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/ClippedImage.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,92 +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_image_src_ClippedImage_h
-#define mozilla_image_src_ClippedImage_h
-
-#include "ImageWrapper.h"
-#include "mozilla/gfx/2D.h"
-#include "mozilla/Maybe.h"
-#include "mozilla/RefPtr.h"
-
-namespace mozilla {
-namespace image {
-
-class ClippedImageCachedSurface;
-class DrawSingleTileCallback;
-
-/**
- * An Image wrapper that clips an image against a rectangle. Right now only
- * absolute coordinates in pixels are supported.
- *
- * XXX(seth): There a known (performance, not correctness) issue with
- * GetImageContainer. See the comments for that method for more information.
- */
-class ClippedImage : public ImageWrapper
-{
-  typedef gfx::SourceSurface SourceSurface;
-
-public:
-  NS_DECL_ISUPPORTS_INHERITED
-
-  NS_IMETHOD GetWidth(int32_t* aWidth) override;
-  NS_IMETHOD GetHeight(int32_t* aHeight) override;
-  NS_IMETHOD GetIntrinsicSize(nsSize* aSize) override;
-  NS_IMETHOD GetIntrinsicRatio(nsSize* aRatio) override;
-  NS_IMETHOD_(TemporaryRef<SourceSurface>)
-    GetFrame(uint32_t aWhichFrame, uint32_t aFlags) override;
-  NS_IMETHOD_(already_AddRefed<layers::ImageContainer>)
-    GetImageContainer(layers::LayerManager* aManager,
-                      uint32_t aFlags) override;
-  NS_IMETHOD_(DrawResult) Draw(gfxContext* aContext,
-                               const nsIntSize& aSize,
-                               const ImageRegion& aRegion,
-                               uint32_t aWhichFrame,
-                               GraphicsFilter aFilter,
-                               const Maybe<SVGImageContext>& aSVGContext,
-                               uint32_t aFlags) override;
-  NS_IMETHOD RequestDiscard() override;
-  NS_IMETHOD_(Orientation) GetOrientation() override;
-  NS_IMETHOD_(nsIntRect) GetImageSpaceInvalidationRect(const nsIntRect& aRect)
-    override;
-  nsIntSize OptimalImageSizeForDest(const gfxSize& aDest,
-                                    uint32_t aWhichFrame,
-                                    GraphicsFilter aFilter,
-                                    uint32_t aFlags) override;
-
-protected:
-  ClippedImage(Image* aImage, nsIntRect aClip);
-
-  virtual ~ClippedImage();
-
-private:
-  TemporaryRef<SourceSurface>
-    GetFrameInternal(const nsIntSize& aSize,
-                     const Maybe<SVGImageContext>& aSVGContext,
-                     uint32_t aWhichFrame,
-                     uint32_t aFlags);
-  bool ShouldClip();
-  DrawResult DrawSingleTile(gfxContext* aContext,
-                            const nsIntSize& aSize,
-                            const ImageRegion& aRegion,
-                            uint32_t aWhichFrame,
-                            GraphicsFilter aFilter,
-                            const Maybe<SVGImageContext>& aSVGContext,
-                            uint32_t aFlags);
-
-  // If we are forced to draw a temporary surface, we cache it here.
-  nsAutoPtr<ClippedImageCachedSurface> mCachedSurface;
-
-  nsIntRect   mClip;              // The region to clip to.
-  Maybe<bool> mShouldClip;        // Memoized ShouldClip() if present.
-
-  friend class DrawSingleTileCallback;
-  friend class ImageOps;
-};
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_ClippedImage_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/DecodePool.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/DecodePool.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/DecodePool.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/DecodePool.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,379 +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 "DecodePool.h"
-
-#include <algorithm>
-
-#include "mozilla/ClearOnShutdown.h"
-#include "nsAutoPtr.h"
-#include "nsCOMPtr.h"
-#include "nsIObserverService.h"
-#include "nsIThreadPool.h"
-#include "nsThreadUtils.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,
-                       Progress aProgress,
-                       const nsIntRect& aInvalidRect,
-                       uint32_t aFlags)
-  {
-    MOZ_ASSERT(aImage);
-
-    nsCOMPtr<nsIRunnable> worker =
-      new NotifyProgressWorker(aImage, aProgress, aInvalidRect, aFlags);
-    NS_DispatchToMainThread(worker);
-  }
-
-  NS_IMETHOD Run() override
-  {
-    MOZ_ASSERT(NS_IsMainThread());
-    mImage->NotifyProgress(mProgress, mInvalidRect, mFlags);
-    return NS_OK;
-  }
-
-private:
-  NotifyProgressWorker(RasterImage* aImage, Progress aProgress,
-                       const nsIntRect& aInvalidRect, uint32_t aFlags)
-    : mImage(aImage)
-    , mProgress(aProgress)
-    , mInvalidRect(aInvalidRect)
-    , mFlags(aFlags)
-  { }
-
-  nsRefPtr<RasterImage> mImage;
-  const Progress mProgress;
-  const nsIntRect mInvalidRect;
-  const uint32_t mFlags;
-};
-
-class NotifyDecodeCompleteWorker : public nsRunnable
-{
-public:
-  /**
-   * Called by the DecodePool when decoding is complete, so that final cleanup
-   * can be performed.
-   */
-  static void Dispatch(Decoder* aDecoder)
-  {
-    MOZ_ASSERT(aDecoder);
-
-    nsCOMPtr<nsIRunnable> worker = new NotifyDecodeCompleteWorker(aDecoder);
-    NS_DispatchToMainThread(worker);
-  }
-
-  NS_IMETHOD Run() override
-  {
-    MOZ_ASSERT(NS_IsMainThread());
-    mDecoder->Finish();
-    mDecoder->GetImage()->FinalizeDecoder(mDecoder);
-    return NS_OK;
-  }
-
-private:
-  explicit NotifyDecodeCompleteWorker(Decoder* aDecoder)
-    : mDecoder(aDecoder)
-  { }
-
-  nsRefPtr<Decoder> mDecoder;
-};
-
-class DecodeWorker : public nsRunnable
-{
-public:
-  explicit DecodeWorker(Decoder* aDecoder)
-    : mDecoder(aDecoder)
-  {
-    MOZ_ASSERT(mDecoder);
-  }
-
-  NS_IMETHOD Run() override
-  {
-    MOZ_ASSERT(!NS_IsMainThread());
-    DecodePool::Singleton()->Decode(mDecoder);
-    return NS_OK;
-  }
-
-private:
-  nsRefPtr<Decoder> mDecoder;
-};
-
-#ifdef MOZ_NUWA_PROCESS
-
-class DecodePoolNuwaListener final : public nsIThreadPoolListener
-{
-public:
-  NS_DECL_THREADSAFE_ISUPPORTS
-
-  NS_IMETHODIMP OnThreadCreated()
-  {
-    if (IsNuwaProcess()) {
-      NuwaMarkCurrentThread(static_cast<void(*)(void*)>(nullptr), nullptr);
-    }
-    return NS_OK;
-  }
-
-  NS_IMETHODIMP OnThreadShuttingDown() { return NS_OK; }
-
-private:
-  ~DecodePoolNuwaListener() { }
-};
-
-NS_IMPL_ISUPPORTS(DecodePoolNuwaListener, nsIThreadPoolListener)
-
-class RegisterDecodeIOThreadWithNuwaRunnable : public nsRunnable
-{
-public:
-  NS_IMETHOD Run()
-  {
-    NuwaMarkCurrentThread(static_cast<void(*)(void*)>(nullptr), nullptr);
-    return NS_OK;
-  }
-};
-#endif // MOZ_NUWA_PROCESS
-
-
-///////////////////////////////////////////////////////////////////////////////
-// DecodePool implementation.
-///////////////////////////////////////////////////////////////////////////////
-
-/* static */ StaticRefPtr<DecodePool> DecodePool::sSingleton;
-
-NS_IMPL_ISUPPORTS(DecodePool, nsIObserver)
-
-/* static */ void
-DecodePool::Initialize()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  DecodePool::Singleton();
-}
-
-/* static */ DecodePool*
-DecodePool::Singleton()
-{
-  if (!sSingleton) {
-    MOZ_ASSERT(NS_IsMainThread());
-    sSingleton = new DecodePool();
-    ClearOnShutdown(&sSingleton);
-  }
-
-  return sSingleton;
-}
-
-DecodePool::DecodePool()
-  : mMutex("image::DecodePool")
-{
-  // Initialize the thread pool.
-  mThreadPool = do_CreateInstance(NS_THREADPOOL_CONTRACTID);
-  MOZ_RELEASE_ASSERT(mThreadPool,
-                     "Should succeed in creating image decoding thread pool");
-
-  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 DecodePoolNuwaListener());
-  }
-#endif
-
-  // Initialize the I/O thread.
-  nsresult rv = NS_NewNamedThread("ImageIO", getter_AddRefs(mIOThread));
-  MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv) && mIOThread,
-                     "Should successfully create image I/O thread");
-
-#ifdef MOZ_NUWA_PROCESS
-  nsCOMPtr<nsIRunnable> worker = new RegisterDecodeIOThreadWithNuwaRunnable();
-  rv = mIOThread->Dispatch(worker, NS_DISPATCH_NORMAL);
-  MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv),
-                     "Should register decode IO thread with Nuwa process");
-#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;
-  nsCOMPtr<nsIThread> ioThread;
-
-  {
-    MutexAutoLock lock(mMutex);
-    threadPool.swap(mThreadPool);
-    ioThread.swap(mIOThread);
-  }
-
-  if (threadPool) {
-    threadPool->Shutdown();
-  }
-
-  if (ioThread) {
-    ioThread->Shutdown();
-  }
-
-  return NS_OK;
-}
-
-void
-DecodePool::AsyncDecode(Decoder* aDecoder)
-{
-  MOZ_ASSERT(aDecoder);
-
-  nsCOMPtr<nsIRunnable> worker = new DecodeWorker(aDecoder);
-
-  // Dispatch to the thread pool if it exists. If it doesn't, we're currently
-  // shutting down, so it's OK to just drop the job on the floor.
-  MutexAutoLock threadPoolLock(mMutex);
-  if (mThreadPool) {
-    mThreadPool->Dispatch(worker, nsIEventTarget::DISPATCH_NORMAL);
-  }
-}
-
-void
-DecodePool::SyncDecodeIfSmall(Decoder* aDecoder)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(aDecoder);
-
-  if (aDecoder->ShouldSyncDecode(gfxPrefs::ImageMemDecodeBytesAtATime())) {
-    Decode(aDecoder);
-    return;
-  }
-
-  AsyncDecode(aDecoder);
-}
-
-void
-DecodePool::SyncDecodeIfPossible(Decoder* aDecoder)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  Decode(aDecoder);
-}
-
-already_AddRefed<nsIEventTarget>
-DecodePool::GetEventTarget()
-{
-  MutexAutoLock threadPoolLock(mMutex);
-  nsCOMPtr<nsIEventTarget> target = do_QueryInterface(mThreadPool);
-  return target.forget();
-}
-
-already_AddRefed<nsIEventTarget>
-DecodePool::GetIOEventTarget()
-{
-  MutexAutoLock threadPoolLock(mMutex);
-  nsCOMPtr<nsIEventTarget> target = do_QueryInterface(mIOThread);
-  return target.forget();
-}
-
-already_AddRefed<nsIRunnable>
-DecodePool::CreateDecodeWorker(Decoder* aDecoder)
-{
-  MOZ_ASSERT(aDecoder);
-  nsCOMPtr<nsIRunnable> worker = new DecodeWorker(aDecoder);
-  return worker.forget();
-}
-
-void
-DecodePool::Decode(Decoder* aDecoder)
-{
-  MOZ_ASSERT(aDecoder);
-
-  nsresult rv = aDecoder->Decode();
-
-  if (NS_SUCCEEDED(rv) && !aDecoder->GetDecodeDone()) {
-    if (aDecoder->HasProgress()) {
-      NotifyProgress(aDecoder);
-    }
-    // The decoder will ensure that a new worker gets enqueued to continue
-    // decoding when more data is available.
-  } else {
-    NotifyDecodeComplete(aDecoder);
-  }
-}
-
-void
-DecodePool::NotifyProgress(Decoder* aDecoder)
-{
-  MOZ_ASSERT(aDecoder);
-
-  if (!NS_IsMainThread() ||
-      (aDecoder->GetFlags() & imgIContainer::FLAG_ASYNC_NOTIFY)) {
-    NotifyProgressWorker::Dispatch(aDecoder->GetImage(),
-                                   aDecoder->TakeProgress(),
-                                   aDecoder->TakeInvalidRect(),
-                                   aDecoder->GetDecodeFlags());
-    return;
-  }
-
-  aDecoder->GetImage()->NotifyProgress(aDecoder->TakeProgress(),
-                                       aDecoder->TakeInvalidRect(),
-                                       aDecoder->GetDecodeFlags());
-}
-
-void
-DecodePool::NotifyDecodeComplete(Decoder* aDecoder)
-{
-  MOZ_ASSERT(aDecoder);
-
-  if (!NS_IsMainThread() ||
-      (aDecoder->GetFlags() & imgIContainer::FLAG_ASYNC_NOTIFY)) {
-    NotifyDecodeCompleteWorker::Dispatch(aDecoder);
-    return;
-  }
-
-  aDecoder->Finish();
-  aDecoder->GetImage()->FinalizeDecoder(aDecoder);
-}
-
-} // namespace image
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/DecodePool.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/DecodePool.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/DecodePool.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/DecodePool.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,114 +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/. */
-
-/**
- * DecodePool manages the threads used for decoding raster images.
- */
-
-#ifndef mozilla_image_src_DecodePool_h
-#define mozilla_image_src_DecodePool_h
-
-#include "mozilla/Mutex.h"
-#include "mozilla/StaticPtr.h"
-#include "nsCOMPtr.h"
-#include "nsIEventTarget.h"
-#include "nsIObserver.h"
-
-class nsIThread;
-class nsIThreadPool;
-
-namespace mozilla {
-namespace image {
-
-class Decoder;
-
-/**
- * DecodePool is a singleton class that manages decoding of raster images. It
- * owns a pool of image decoding threads that are used for asynchronous
- * decoding.
- *
- * DecodePool allows callers to run a decoder, handling management of the
- * decoder's lifecycle and whether it executes on the main thread,
- * off-main-thread in the image decoding thread pool, or on some combination of
- * the two.
- */
-class DecodePool : public nsIObserver
-{
-public:
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_NSIOBSERVER
-
-  /// Initializes the singleton instance. Should be called from the main thread.
-  static void Initialize();
-
-  /// Returns the singleton instance.
-  static DecodePool* Singleton();
-
-  /// Ask the DecodePool to run @aDecoder asynchronously and return immediately.
-  void AsyncDecode(Decoder* aDecoder);
-
-  /**
-   * Run @aDecoder synchronously if the image it's decoding is small. If the
-   * image is too large, or if the source data isn't complete yet, run @aDecoder
-   * asynchronously instead.
-   */
-  void SyncDecodeIfSmall(Decoder* aDecoder);
-
-  /**
-   * Run aDecoder synchronously if at all possible. If it can't complete
-   * synchronously because the source data isn't complete, asynchronously decode
-   * the rest.
-   */
-  void SyncDecodeIfPossible(Decoder* aDecoder);
-
-  /**
-   * Returns an event target interface to the DecodePool's underlying thread
-   * pool. Callers can use this event target to submit work to the image
-   * decoding thread pool.
-   *
-   * @return An nsIEventTarget interface to the thread pool.
-   */
-  already_AddRefed<nsIEventTarget> GetEventTarget();
-
-  /**
-   * Returns an event target interface to the DecodePool's I/O thread. Callers
-   * who want to deliver data to workers on the DecodePool can use this event
-   * target.
-   *
-   * @return An nsIEventTarget interface to the thread pool's I/O thread.
-   */
-  already_AddRefed<nsIEventTarget> GetIOEventTarget();
-
-  /**
-   * Creates a worker which can be used to attempt further decoding using the
-   * provided decoder.
-   *
-   * @return The new worker, which should be posted to the event target returned
-   *         by GetEventTarget.
-   */
-  already_AddRefed<nsIRunnable> CreateDecodeWorker(Decoder* aDecoder);
-
-private:
-  friend class DecodeWorker;
-
-  DecodePool();
-  virtual ~DecodePool();
-
-  void Decode(Decoder* aDecoder);
-  void NotifyDecodeComplete(Decoder* aDecoder);
-  void NotifyProgress(Decoder* aDecoder);
-
-  static StaticRefPtr<DecodePool> sSingleton;
-
-  // mMutex protects mThreadPool and mIOThread.
-  Mutex                     mMutex;
-  nsCOMPtr<nsIThreadPool>   mThreadPool;
-  nsCOMPtr<nsIThread>       mIOThread;
-};
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_DecodePool_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/Decoder.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/Decoder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/Decoder.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/Decoder.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,721 +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 "Decoder.h"
-
-#include "mozilla/gfx/2D.h"
-#include "DecodePool.h"
-#include "GeckoProfiler.h"
-#include "imgIContainer.h"
-#include "nsIConsoleService.h"
-#include "nsIScriptError.h"
-#include "nsProxyRelease.h"
-#include "nsServiceManagerUtils.h"
-#include "nsComponentManagerUtils.h"
-#include "mozilla/Telemetry.h"
-
-using mozilla::gfx::IntSize;
-using mozilla::gfx::SurfaceFormat;
-
-namespace mozilla {
-namespace image {
-
-Decoder::Decoder(RasterImage* aImage)
-  : mImage(aImage)
-  , mProgress(NoProgress)
-  , mImageData(nullptr)
-  , mColormap(nullptr)
-  , mChunkCount(0)
-  , mFlags(0)
-  , mBytesDecoded(0)
-  , mSendPartialInvalidations(false)
-  , mDataDone(false)
-  , mDecodeDone(false)
-  , mDataError(false)
-  , mDecodeAborted(false)
-  , mShouldReportError(false)
-  , mImageIsTransient(false)
-  , mImageIsLocked(false)
-  , 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;
-
-  if (!NS_IsMainThread()) {
-    // Dispatch mImage to main thread to prevent it from being destructed by the
-    // 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");
-    }
-  }
-}
-
-/*
- * Common implementation of the decoder interface.
- */
-
-void
-Decoder::Init()
-{
-  // No re-initializing
-  MOZ_ASSERT(!mInitialized, "Can't re-initialize a decoder!");
-
-  // Fire OnStartDecode at init time to support bug 512435.
-  if (!IsSizeDecode()) {
-      mProgress |= FLAG_DECODE_STARTED | FLAG_ONLOAD_BLOCKED;
-  }
-
-  // Implementation-specific initialization
-  InitInternal();
-
-  mInitialized = true;
-}
-
-// Initializes a decoder whose image and observer is already being used by a
-// parent decoder
-void
-Decoder::InitSharedDecoder(uint8_t* aImageData, uint32_t aImageDataLength,
-                           uint32_t* aColormap, uint32_t aColormapSize,
-                           RawAccessFrameRef&& aFrameRef)
-{
-  // No re-initializing
-  MOZ_ASSERT(!mInitialized, "Can't re-initialize a decoder!");
-
-  mImageData = aImageData;
-  mImageDataLength = aImageDataLength;
-  mColormap = aColormap;
-  mColormapSize = aColormapSize;
-  mCurrentFrame = Move(aFrameRef);
-
-  // We have all the frame data, so we've started the frame.
-  if (!IsSizeDecode()) {
-    mFrameCount++;
-    PostFrameStart();
-  }
-
-  // Implementation-specific initialization
-  InitInternal();
-  mInitialized = true;
-}
-
-nsresult
-Decoder::Decode()
-{
-  MOZ_ASSERT(mInitialized, "Should be initialized here");
-  MOZ_ASSERT(mIterator, "Should have a SourceBufferIterator");
-
-  // We keep decoding chunks until the decode completes or there are no more
-  // chunks available.
-  while (!GetDecodeDone() && !HasError()) {
-    auto newState = mIterator->AdvanceOrScheduleResume(this);
-
-    if (newState == SourceBufferIterator::WAITING) {
-      // We can't continue because the rest of the data hasn't arrived from the
-      // network yet. We don't have to do anything special; the
-      // SourceBufferIterator will ensure that Decode() gets called again on a
-      // DecodePool thread when more data is available.
-      return NS_OK;
-    }
-
-    if (newState == SourceBufferIterator::COMPLETE) {
-      mDataDone = true;
-
-      nsresult finalStatus = mIterator->CompletionStatus();
-      if (NS_FAILED(finalStatus)) {
-        PostDataError();
-      }
-
-      CompleteDecode();
-      return finalStatus;
-    }
-
-    MOZ_ASSERT(newState == SourceBufferIterator::READY);
-
-    Write(mIterator->Data(), mIterator->Length());
-  }
-
-  CompleteDecode();
-  return HasError() ? NS_ERROR_FAILURE : NS_OK;
-}
-
-void
-Decoder::Resume()
-{
-  DecodePool* decodePool = DecodePool::Singleton();
-  MOZ_ASSERT(decodePool);
-
-  nsCOMPtr<nsIEventTarget> target = decodePool->GetEventTarget();
-  if (MOZ_UNLIKELY(!target)) {
-    // We're shutting down and the DecodePool's thread pool has been destroyed.
-    return;
-  }
-
-  nsCOMPtr<nsIRunnable> worker = decodePool->CreateDecodeWorker(this);
-  target->Dispatch(worker, nsIEventTarget::DISPATCH_NORMAL);
-}
-
-bool
-Decoder::ShouldSyncDecode(size_t aByteLimit)
-{
-  MOZ_ASSERT(aByteLimit > 0);
-  MOZ_ASSERT(mIterator, "Should have a SourceBufferIterator");
-
-  return mIterator->RemainingBytesIsNoMoreThan(aByteLimit);
-}
-
-void
-Decoder::Write(const char* aBuffer, uint32_t aCount)
-{
-  PROFILER_LABEL("ImageDecoder", "Write",
-    js::ProfileEntry::Category::GRAPHICS);
-
-  // 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 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;
-  }
-
-  if (IsSizeDecode() && HasSize()) {
-    // More data came in since we found the size. We have nothing to do here.
-    return;
-  }
-
-  MOZ_ASSERT(!NeedsNewFrame() || HasDataError(),
-             "Should not need a new frame before writing anything");
-  MOZ_ASSERT(!NeedsToFlushData() || HasDataError(),
-             "Should not need to flush data before writing anything");
-
-  // Pass the data along to the implementation.
-  WriteInternal(aBuffer, aCount);
-
-  // If we need a new frame to proceed, let's create one and call it again.
-  while (NeedsNewFrame() && !HasDataError()) {
-    MOZ_ASSERT(!IsSizeDecode(), "Shouldn't need new frame for size decode");
-
-    nsresult rv = AllocateFrame();
-
-    if (NS_SUCCEEDED(rv)) {
-      // Use the data we saved when we asked for a new frame.
-      WriteInternal(nullptr, 0);
-    }
-
-    mNeedsToFlushData = false;
-  }
-
-  // Finish telemetry.
-  mDecodeTime += (TimeStamp::Now() - start);
-}
-
-void
-Decoder::CompleteDecode()
-{
-  // Implementation-specific finalization
-  if (!HasError()) {
-    FinishInternal();
-  }
-
-  // If the implementation left us mid-frame, finish that up.
-  if (mInFrame && !HasError()) {
-    PostFrameStop();
-  }
-
-  // If PostDecodeDone() has not been called, and this decoder wasn't aborted
-  // early because of low-memory conditions or losing a race with another
-  // decoder, we need to send teardown notifications (and report an error to the
-  // console later).
-  if (!IsSizeDecode() && !mDecodeDone && !WasAborted()) {
-    mShouldReportError = true;
-
-    // If we only have a data error, we're usable if we have at least one
-    // complete frame.
-    if (!HasDecoderError() && GetCompleteFrameCount() > 0) {
-      // We're usable, so do exactly what we should have when the decoder
-      // completed.
-
-      // Not writing to the entire frame may have left us transparent.
-      PostHasTransparency();
-
-      if (mInFrame) {
-        PostFrameStop();
-      }
-      PostDecodeDone();
-    } else {
-      // We're not usable. Record some final progress indicating the error.
-      if (!IsSizeDecode()) {
-        mProgress |= FLAG_DECODE_COMPLETE | FLAG_ONLOAD_UNBLOCKED;
-      }
-      mProgress |= FLAG_HAS_ERROR;
-    }
-  }
-}
-
-void
-Decoder::Finish()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  MOZ_ASSERT(HasError() || !mInFrame, "Finishing while we're still in a frame");
-
-  // If we detected an error in CompleteDecode(), log it to the error console.
-  if (mShouldReportError && !WasAborted()) {
-    nsCOMPtr<nsIConsoleService> consoleService =
-      do_GetService(NS_CONSOLESERVICE_CONTRACTID);
-    nsCOMPtr<nsIScriptError> errorObject =
-      do_CreateInstance(NS_SCRIPTERROR_CONTRACTID);
-
-    if (consoleService && errorObject && !HasDecoderError()) {
-      nsAutoString msg(NS_LITERAL_STRING("Image corrupt or truncated: ") +
-                       NS_ConvertUTF8toUTF16(mImage->GetURIString()));
-
-      if (NS_SUCCEEDED(errorObject->InitWithWindowID(
-                         msg,
-                         NS_ConvertUTF8toUTF16(mImage->GetURIString()),
-                         EmptyString(), 0, 0, nsIScriptError::errorFlag,
-                         "Image", mImage->InnerWindowID()
-                       ))) {
-        consoleService->LogMessage(errorObject);
-      }
-    }
-  }
-
-  // Set image metadata before calling DecodingComplete, because
-  // DecodingComplete calls Optimize().
-  mImageMetadata.SetOnImage(mImage);
-
-  if (HasSize()) {
-    SetSizeOnImage();
-  }
-
-  if (mDecodeDone && !IsSizeDecode()) {
-    MOZ_ASSERT(HasError() || mCurrentFrame, "Should have an error or a frame");
-
-    // If this image wasn't animated and isn't a transient image, mark its frame
-    // as optimizable. We don't support optimizing animated images and
-    // optimizing transient images isn't worth it.
-    if (!mIsAnimated && !mImageIsTransient && mCurrentFrame) {
-      mCurrentFrame->SetOptimizable();
-    }
-
-    mImage->OnDecodingComplete();
-  }
-}
-
-void
-Decoder::FinishSharedDecoder()
-{
-  if (!HasError()) {
-    FinishInternal();
-  }
-}
-
-nsresult
-Decoder::AllocateFrame(const nsIntSize& aTargetSize /* = nsIntSize() */)
-{
-  MOZ_ASSERT(mNeedsNewFrame);
-
-  nsIntSize targetSize = aTargetSize;
-  if (targetSize == nsIntSize()) {
-    MOZ_ASSERT(HasSize());
-    targetSize = mImageMetadata.GetSize();
-  }
-
-  mCurrentFrame = EnsureFrame(mNewFrameData.mFrameNum,
-                              targetSize,
-                              mNewFrameData.mFrameRect,
-                              GetDecodeFlags(),
-                              mNewFrameData.mFormat,
-                              mNewFrameData.mPaletteDepth,
-                              mCurrentFrame.get());
-
-  if (mCurrentFrame) {
-    // Gather the raw pointers the decoders will use.
-    mCurrentFrame->GetImageData(&mImageData, &mImageDataLength);
-    mCurrentFrame->GetPaletteData(&mColormap, &mColormapSize);
-
-    if (mNewFrameData.mFrameNum + 1 == mFrameCount) {
-      PostFrameStart();
-    }
-  } else {
-    PostDataError();
-  }
-
-  // Mark ourselves as not needing another frame before talking to anyone else
-  // 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 mCurrentFrame ? NS_OK : NS_ERROR_FAILURE;
-}
-
-RawAccessFrameRef
-Decoder::EnsureFrame(uint32_t aFrameNum,
-                     const nsIntSize& aTargetSize,
-                     const nsIntRect& aFrameRect,
-                     uint32_t aDecodeFlags,
-                     SurfaceFormat aFormat,
-                     uint8_t aPaletteDepth,
-                     imgFrame* aPreviousFrame)
-{
-  if (mDataError || NS_FAILED(mFailCode)) {
-    return RawAccessFrameRef();
-  }
-
-  MOZ_ASSERT(aFrameNum <= mFrameCount, "Invalid frame index!");
-  if (aFrameNum > mFrameCount) {
-    return RawAccessFrameRef();
-  }
-
-  // Adding a frame that doesn't already exist. This is the normal case.
-  if (aFrameNum == mFrameCount) {
-    return InternalAddFrame(aFrameNum, aTargetSize, aFrameRect, aDecodeFlags,
-                            aFormat, aPaletteDepth, aPreviousFrame);
-  }
-
-  // We're replacing a frame. It must be the first frame; there's no reason to
-  // ever replace any other frame, since the first frame is the only one we
-  // speculatively allocate without knowing what the decoder really needs.
-  // XXX(seth): I'm not convinced there's any reason to support this at all. We
-  // should figure out how to avoid triggering this and rip it out.
-  MOZ_ASSERT(aFrameNum == 0, "Replacing a frame other than the first?");
-  MOZ_ASSERT(mFrameCount == 1, "Should have only one frame");
-  MOZ_ASSERT(aPreviousFrame, "Need the previous frame to replace");
-  if (aFrameNum != 0 || !aPreviousFrame || mFrameCount != 1) {
-    return RawAccessFrameRef();
-  }
-
-  MOZ_ASSERT(!aPreviousFrame->GetRect().IsEqualEdges(aFrameRect) ||
-             aPreviousFrame->GetFormat() != aFormat ||
-             aPreviousFrame->GetPaletteDepth() != aPaletteDepth,
-             "Replacing first frame with the same kind of frame?");
-
-  // Reset our state.
-  mInFrame = false;
-  RawAccessFrameRef ref = Move(mCurrentFrame);
-
-  MOZ_ASSERT(ref, "No ref to current frame?");
-
-  // Reinitialize the old frame.
-  nsIntSize oldSize = aPreviousFrame->GetImageSize();
-  bool nonPremult =
-    aDecodeFlags & imgIContainer::FLAG_DECODE_NO_PREMULTIPLY_ALPHA;
-  if (NS_FAILED(aPreviousFrame->ReinitForDecoder(oldSize, aFrameRect, aFormat,
-                                                 aPaletteDepth, nonPremult))) {
-    NS_WARNING("imgFrame::ReinitForDecoder should succeed");
-    mFrameCount = 0;
-    aPreviousFrame->Abort();
-    return RawAccessFrameRef();
-  }
-
-  return ref;
-}
-
-RawAccessFrameRef
-Decoder::InternalAddFrame(uint32_t aFrameNum,
-                          const nsIntSize& aTargetSize,
-                          const nsIntRect& aFrameRect,
-                          uint32_t aDecodeFlags,
-                          SurfaceFormat aFormat,
-                          uint8_t aPaletteDepth,
-                          imgFrame* aPreviousFrame)
-{
-  MOZ_ASSERT(aFrameNum <= mFrameCount, "Invalid frame index!");
-  if (aFrameNum > mFrameCount) {
-    return RawAccessFrameRef();
-  }
-
-  if (aTargetSize.width <= 0 || aTargetSize.height <= 0 ||
-      aFrameRect.width <= 0 || aFrameRect.height <= 0) {
-    NS_WARNING("Trying to add frame with zero or negative size");
-    return RawAccessFrameRef();
-  }
-
-  const uint32_t bytesPerPixel = aPaletteDepth == 0 ? 4 : 1;
-  if (!SurfaceCache::CanHold(aFrameRect.Size(), bytesPerPixel)) {
-    NS_WARNING("Trying to add frame that's too large for the SurfaceCache");
-    return RawAccessFrameRef();
-  }
-
-  nsRefPtr<imgFrame> frame = new imgFrame();
-  bool nonPremult =
-    aDecodeFlags & imgIContainer::FLAG_DECODE_NO_PREMULTIPLY_ALPHA;
-  if (NS_FAILED(frame->InitForDecoder(aTargetSize, aFrameRect, aFormat,
-                                      aPaletteDepth, nonPremult))) {
-    NS_WARNING("imgFrame::Init should succeed");
-    return RawAccessFrameRef();
-  }
-
-  RawAccessFrameRef ref = frame->RawAccessRef();
-  if (!ref) {
-    frame->Abort();
-    return RawAccessFrameRef();
-  }
-
-  InsertOutcome outcome =
-    SurfaceCache::Insert(frame, ImageKey(mImage.get()),
-                         RasterSurfaceKey(aTargetSize,
-                                          aDecodeFlags,
-                                          aFrameNum),
-                         Lifetime::Persistent);
-  if (outcome == InsertOutcome::FAILURE) {
-    // We couldn't insert the surface, almost certainly due to low memory. We
-    // treat this as a permanent error to help the system recover; otherwise, we
-    // might just end up attempting to decode this image again immediately.
-    ref->Abort();
-    return RawAccessFrameRef();
-  } else if (outcome == InsertOutcome::FAILURE_ALREADY_PRESENT) {
-    // Another decoder beat us to decoding this frame. We abort this decoder
-    // rather than treat this as a real error.
-    mDecodeAborted = true;
-    ref->Abort();
-    return RawAccessFrameRef();
-  }
-
-  nsIntRect refreshArea;
-
-  if (aFrameNum == 1) {
-    MOZ_ASSERT(aPreviousFrame, "Must provide a previous frame when animated");
-    aPreviousFrame->SetRawAccessOnly();
-
-    // If we dispose of the first frame by clearing it, then the first frame's
-    // refresh area is all of itself.
-    // RESTORE_PREVIOUS is invalid (assumed to be DISPOSE_CLEAR).
-    AnimationData previousFrameData = aPreviousFrame->GetAnimationData();
-    if (previousFrameData.mDisposalMethod == DisposalMethod::CLEAR ||
-        previousFrameData.mDisposalMethod == DisposalMethod::CLEAR_ALL ||
-        previousFrameData.mDisposalMethod == DisposalMethod::RESTORE_PREVIOUS) {
-      refreshArea = previousFrameData.mRect;
-    }
-  }
-
-  if (aFrameNum > 0) {
-    ref->SetRawAccessOnly();
-
-    // Some GIFs are huge but only have a small area that they animate. We only
-    // need to refresh that small area when frame 0 comes around again.
-    refreshArea.UnionRect(refreshArea, frame->GetRect());
-  }
-
-  mFrameCount++;
-  mImage->OnAddedFrame(mFrameCount, refreshArea);
-
-  return ref;
-}
-
-void
-Decoder::SetSizeOnImage()
-{
-  MOZ_ASSERT(mImageMetadata.HasSize(), "Should have size");
-  MOZ_ASSERT(mImageMetadata.HasOrientation(), "Should have orientation");
-
-  nsresult rv = mImage->SetSize(mImageMetadata.GetWidth(),
-                                mImageMetadata.GetHeight(),
-                                mImageMetadata.GetOrientation());
-  if (NS_FAILED(rv)) {
-    PostResizeError();
-  }
-}
-
-/*
- * Hook stubs. Override these as necessary in decoder implementations.
- */
-
-void Decoder::InitInternal() { }
-void Decoder::WriteInternal(const char* aBuffer, uint32_t aCount) { }
-void Decoder::FinishInternal() { }
-
-/*
- * Progress Notifications
- */
-
-void
-Decoder::PostSize(int32_t aWidth,
-                  int32_t aHeight,
-                  Orientation aOrientation /* = Orientation()*/)
-{
-  // Validate
-  MOZ_ASSERT(aWidth >= 0, "Width can't be negative!");
-  MOZ_ASSERT(aHeight >= 0, "Height can't be negative!");
-
-  // Tell the image
-  mImageMetadata.SetSize(aWidth, aHeight, aOrientation);
-
-  // Record this notification.
-  mProgress |= FLAG_SIZE_AVAILABLE;
-}
-
-void
-Decoder::PostHasTransparency()
-{
-  mProgress |= FLAG_HAS_TRANSPARENCY;
-}
-
-void
-Decoder::PostFrameStart()
-{
-  // We shouldn't already be mid-frame
-  MOZ_ASSERT(!mInFrame, "Starting new frame but not done with old one!");
-
-  // Update our state to reflect the new frame
-  mInFrame = true;
-
-  // If we just became animated, record that fact.
-  if (mFrameCount > 1) {
-    mIsAnimated = true;
-    mProgress |= FLAG_IS_ANIMATED;
-  }
-}
-
-void
-Decoder::PostFrameStop(Opacity aFrameOpacity    /* = Opacity::TRANSPARENT */,
-                       DisposalMethod aDisposalMethod
-                                                /* = DisposalMethod::KEEP */,
-                       int32_t aTimeout         /* = 0 */,
-                       BlendMethod aBlendMethod /* = BlendMethod::OVER */)
-{
-  // We should be mid-frame
-  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;
-
-  mCurrentFrame->Finish(aFrameOpacity, aDisposalMethod, aTimeout, aBlendMethod);
-
-  mProgress |= FLAG_FRAME_COMPLETE | FLAG_ONLOAD_UNBLOCKED;
-
-  // If we're not sending partial invalidations, then we send an invalidation
-  // here when the first frame is complete.
-  if (!mSendPartialInvalidations && !mIsAnimated) {
-    mInvalidRect.UnionRect(mInvalidRect,
-                           gfx::IntRect(gfx::IntPoint(0, 0), GetSize()));
-  }
-}
-
-void
-Decoder::PostInvalidation(const nsIntRect& aRect,
-                          const Maybe<nsIntRect>& aRectAtTargetSize
-                            /* = Nothing() */)
-{
-  // We should be mid-frame
-  MOZ_ASSERT(mInFrame, "Can't invalidate when not mid-frame!");
-  MOZ_ASSERT(mCurrentFrame, "Can't invalidate when not mid-frame!");
-
-  // Record this invalidation, unless we're not sending partial invalidations
-  // or we're past the first frame.
-  if (mSendPartialInvalidations && !mIsAnimated) {
-    mInvalidRect.UnionRect(mInvalidRect, aRect);
-    mCurrentFrame->ImageUpdated(aRectAtTargetSize.valueOr(aRect));
-  }
-}
-
-void
-Decoder::PostDecodeDone(int32_t aLoopCount /* = 0 */)
-{
-  MOZ_ASSERT(!IsSizeDecode(), "Can't be done with decoding with size decode!");
-  MOZ_ASSERT(!mInFrame, "Can't be done decoding if we're mid-frame!");
-  MOZ_ASSERT(!mDecodeDone, "Decode already done!");
-  mDecodeDone = true;
-
-  mImageMetadata.SetLoopCount(aLoopCount);
-
-  mProgress |= FLAG_DECODE_COMPLETE;
-}
-
-void
-Decoder::PostDataError()
-{
-  mDataError = true;
-
-  if (mInFrame && mCurrentFrame) {
-    mCurrentFrame->Abort();
-  }
-}
-
-void
-Decoder::PostDecoderError(nsresult aFailureCode)
-{
-  MOZ_ASSERT(NS_FAILED(aFailureCode), "Not a failure code!");
-
-  mFailCode = aFailureCode;
-
-  // XXXbholley - we should report the image URI here, but imgContainer
-  // needs to know its URI first
-  NS_WARNING("Image decoding error - This is probably a bug!");
-
-  if (mInFrame && mCurrentFrame) {
-    mCurrentFrame->Abort();
-  }
-}
-
-void
-Decoder::NeedNewFrame(uint32_t framenum, uint32_t x_offset, uint32_t y_offset,
-                      uint32_t width, uint32_t height,
-                      gfx::SurfaceFormat format,
-                      uint8_t palette_depth /* = 0 */)
-{
-  // Decoders should never call NeedNewFrame without yielding back to Write().
-  MOZ_ASSERT(!mNeedsNewFrame);
-
-  // We don't want images going back in time or skipping frames.
-  MOZ_ASSERT(framenum == mFrameCount || framenum == (mFrameCount - 1));
-
-  mNewFrameData = NewFrameData(framenum,
-                               nsIntRect(x_offset, y_offset, width, height),
-                               format, palette_depth);
-  mNeedsNewFrame = true;
-}
-
-Telemetry::ID
-Decoder::SpeedHistogram()
-{
-  // Use HistogramCount as an invalid Histogram ID.
-  return Telemetry::HistogramCount;
-}
-
-} // namespace image
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/Decoder.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/Decoder.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/Decoder.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/Decoder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,505 +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_image_src_Decoder_h
-#define mozilla_image_src_Decoder_h
-
-#include "FrameAnimator.h"
-#include "RasterImage.h"
-#include "mozilla/RefPtr.h"
-#include "DecodePool.h"
-#include "ImageMetadata.h"
-#include "Orientation.h"
-#include "SourceBuffer.h"
-
-namespace mozilla {
-
-namespace Telemetry {
-  enum ID : uint32_t;
-}
-
-namespace image {
-
-class Decoder : public IResumable
-{
-public:
-
-  explicit Decoder(RasterImage* aImage);
-
-  /**
-   * Initialize an image decoder. Decoders may not be re-initialized.
-   */
-  void Init();
-
-  /**
-   * Initializes a decoder whose image and observer is already being used by a
-   * parent decoder. Decoders may not be re-initialized.
-   *
-   * Notifications Sent: TODO
-   */
-  void InitSharedDecoder(uint8_t* aImageData, uint32_t aImageDataLength,
-                         uint32_t* aColormap, uint32_t aColormapSize,
-                         RawAccessFrameRef&& aFrameRef);
-
-  /**
-   * Decodes, reading all data currently available in the SourceBuffer. If more
-   * 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.
-   *
-   * data is needed, Decode() automatically ensures that it will be called again
-   * on a DecodePool thread when the data becomes available.
-   *
-   * Any errors are reported by setting the appropriate state on the decoder.
-   */
-  nsresult Decode();
-
-  /**
-   * Cleans up the decoder's state and notifies our image about success or
-   * failure. May only be called on the main thread.
-   */
-  void Finish();
-
-  /**
-   * Given a maximum number of bytes we're willing to decode, @aByteLimit,
-   * returns true if we should attempt to run this decoder synchronously.
-   */
-  bool ShouldSyncDecode(size_t aByteLimit);
-
-  /**
-   * Informs the shared decoder that all the data has been written.
-   * Should only be used if InitSharedDecoder was useed
-   *
-   * Notifications Sent: TODO
-   */
-  void FinishSharedDecoder();
-
-  /**
-   * Gets the invalidation region accumulated by the decoder so far, and clears
-   * the decoder's invalidation region. This means that each call to
-   * TakeInvalidRect() returns only the invalidation region accumulated since
-   * the last call to TakeInvalidRect().
-   */
-  nsIntRect TakeInvalidRect()
-  {
-    nsIntRect invalidRect = mInvalidRect;
-    mInvalidRect.SetEmpty();
-    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;
-  }
-
-  /**
-   * Returns true if there's any progress to report.
-   */
-  bool HasProgress() const
-  {
-    return mProgress != NoProgress || !mInvalidRect.IsEmpty();
-  }
-
-  // We're not COM-y, so we don't get refcounts by default
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(Decoder, override)
-
-  // Implement IResumable.
-  virtual void Resume() override;
-
-  /*
-   * State.
-   */
-
-  // If we're doing a "size decode", we more or less pass through the image
-  // data, stopping only to scoop out the image dimensions. A size decode
-  // must be enabled by SetSizeDecode() _before_calling Init().
-  bool IsSizeDecode() { return mSizeDecode; }
-  void SetSizeDecode(bool aSizeDecode)
-  {
-    MOZ_ASSERT(!mInitialized, "Shouldn't be initialized yet");
-    mSizeDecode = aSizeDecode;
-  }
-
-  /**
-   * If this decoder supports downscale-during-decode, sets the target size that
-   * this image should be decoded to.
-   *
-   * If this decoder *doesn't* support downscale-during-decode, returns
-   * NS_ERROR_NOT_AVAILABLE. If the provided size is unacceptable, returns
-   * another error.
-   *
-   * Returning NS_OK from this method is a promise that the decoder will decode
-   * the image to the requested target size unless it encounters an error.
-   *
-   * This must be called before Init() is called.
-   */
-  virtual nsresult SetTargetSize(const nsIntSize& aSize)
-  {
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-
-  /**
-   * Set whether should send partial invalidations.
-   *
-   * If @aSend is true, we'll send partial invalidations when decoding the first
-   * frame of the image, so image notifications observers will be able to
-   * gradually draw in the image as it downloads.
-   *
-   * If @aSend is false (the default), we'll only send an invalidation when we
-   * complete the first frame.
-   *
-   * This must be called before Init() is called.
-   */
-  void SetSendPartialInvalidations(bool aSend)
-  {
-    MOZ_ASSERT(!mInitialized, "Shouldn't be initialized yet");
-    mSendPartialInvalidations = aSend;
-  }
-
-  /**
-   * Set an iterator to the SourceBuffer which will feed data to this decoder.
-   *
-   * This should be called for almost all decoders; the exceptions are the
-   * contained decoders of an nsICODecoder, which will be fed manually via Write
-   * instead.
-   *
-   * This must be called before Init() is called.
-   */
-  void SetIterator(SourceBufferIterator&& aIterator)
-  {
-    MOZ_ASSERT(!mInitialized, "Shouldn't be initialized yet");
-    mIterator.emplace(Move(aIterator));
-  }
-
-  /**
-   * Set whether this decoder is associated with a transient image. The decoder
-   * may choose to avoid certain optimizations that don't pay off for
-   * short-lived images in this case.
-   */
-  void SetImageIsTransient(bool aIsTransient)
-  {
-    MOZ_ASSERT(!mInitialized, "Shouldn't be initialized yet");
-    mImageIsTransient = aIsTransient;
-  }
-
-  /**
-   * Set whether the image is locked for the lifetime of this decoder. We lock
-   * the image during our initial decode to ensure that we don't evict any
-   * surfaces before we realize that the image is animated.
-   */
-  void SetImageIsLocked()
-  {
-    MOZ_ASSERT(!mInitialized, "Shouldn't be initialized yet");
-    mImageIsLocked = true;
-  }
-
-  bool ImageIsLocked() const { return mImageIsLocked; }
-
-  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; }
-
-  // The number of complete frames we have (ie, not including anything
-  // in-progress).
-  uint32_t GetCompleteFrameCount() {
-    return mInFrame ? mFrameCount - 1 : mFrameCount;
-  }
-
-  // Error tracking
-  bool HasError() const { return HasDataError() || HasDecoderError(); }
-  bool HasDataError() const { return mDataError; }
-  bool HasDecoderError() const { return NS_FAILED(mFailCode); }
-  nsresult GetDecoderError() const { return mFailCode; }
-  void PostResizeError() { PostDataError(); }
-
-  bool GetDecodeDone() const
-  {
-    return mDecodeDone || (mSizeDecode && HasSize()) || HasError() || mDataDone;
-  }
-
-  /**
-   * Returns true if this decoder was aborted.
-   *
-   * This may happen due to a low-memory condition, or because another decoder
-   * was racing with this one to decode the same frames with the same flags and
-   * this decoder lost the race. Either way, this is not a permanent situation
-   * and does not constitute an error, so we don't report any errors when this
-   * happens.
-   */
-  bool WasAborted() const { return mDecodeAborted; }
-
-  enum DecodeStyle {
-      PROGRESSIVE, // produce intermediate frames representing the partial
-                   // state of the image
-      SEQUENTIAL   // decode to final image immediately
-  };
-
-  void SetFlags(uint32_t aFlags) { mFlags = aFlags; }
-  uint32_t GetFlags() const { return mFlags; }
-  uint32_t GetDecodeFlags() const { return DecodeFlags(mFlags); }
-
-  bool HasSize() const { return mImageMetadata.HasSize(); }
-  void SetSizeOnImage();
-
-  void SetSize(const nsIntSize& aSize, const Orientation& aOrientation)
-  {
-    PostSize(aSize.width, aSize.height, aOrientation);
-  }
-
-  nsIntSize GetSize() const
-  {
-    MOZ_ASSERT(HasSize());
-    return mImageMetadata.GetSize();
-  }
-
-  virtual Telemetry::ID SpeedHistogram();
-
-  ImageMetadata& GetImageMetadata() { return mImageMetadata; }
-
-  /**
-   * Returns a weak pointer to the image associated with this decoder.
-   */
-  RasterImage* GetImage() const { MOZ_ASSERT(mImage); return mImage.get(); }
-
-  // Tell the decoder infrastructure to allocate a frame. By default, frame 0
-  // is created as an ARGB frame with no offset and with size width * height.
-  // If decoders need something different, they must ask for it.
-  // This is called by decoders when they need a new frame. These decoders
-  // must then save the data they have been sent but not yet processed and
-  // return from WriteInternal. When the new frame is created, WriteInternal
-  // will be called again with nullptr and 0 as arguments.
-  void NeedNewFrame(uint32_t frameNum, uint32_t x_offset, uint32_t y_offset,
-                    uint32_t width, uint32_t height,
-                    gfx::SurfaceFormat format,
-                    uint8_t palette_depth = 0);
-
-  virtual bool NeedsNewFrame() const { return mNeedsNewFrame; }
-
-  // Try to allocate a frame as described in mNewFrameData and return the
-  // status code from that attempt. Clears mNewFrameData.
-  virtual nsresult AllocateFrame(const nsIntSize& aTargetSize = nsIntSize());
-
-  already_AddRefed<imgFrame> GetCurrentFrame()
-  {
-    nsRefPtr<imgFrame> frame = mCurrentFrame.get();
-    return frame.forget();
-  }
-
-  RawAccessFrameRef GetCurrentFrameRef()
-  {
-    return mCurrentFrame ? mCurrentFrame->RawAccessRef()
-                         : RawAccessFrameRef();
-  }
-
-  /**
-   * Writes data to the decoder. Only public for the benefit of nsICODecoder;
-   * other callers should use Decode().
-   *
-   * @param aBuffer buffer containing the data to be written
-   * @param aCount the number of bytes to write
-   *
-   * Any errors are reported by setting the appropriate state on the decoder.
-   */
-  void Write(const char* aBuffer, uint32_t aCount);
-
-
-protected:
-  virtual ~Decoder();
-
-  /*
-   * Internal hooks. Decoder implementations may override these and
-   * only these methods.
-   */
-  virtual void InitInternal();
-  virtual void WriteInternal(const char* aBuffer, uint32_t aCount);
-  virtual void FinishInternal();
-
-  /*
-   * Progress notifications.
-   */
-
-  // Called by decoders when they determine the size of the image. Informs
-  // the image of its size and sends notifications.
-  void PostSize(int32_t aWidth,
-                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 aFrameOpacity 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();
-
-  // Called by decoders when they end a frame. Informs the image, sends
-  // notifications, and does internal book-keeping.
-  // Specify whether this frame is opaque as an optimization.
-  // For animated images, specify the disposal, blend method and timeout for
-  // this frame.
-  void PostFrameStop(Opacity aFrameOpacity = Opacity::SOME_TRANSPARENCY,
-                     DisposalMethod aDisposalMethod = DisposalMethod::KEEP,
-                     int32_t aTimeout = 0,
-                     BlendMethod aBlendMethod = BlendMethod::OVER);
-
-  /**
-   * Called by the decoders when they have a region to invalidate. We may not
-   * actually pass these invalidations on right away.
-   *
-   * @param aRect The invalidation rect in the coordinate system of the unscaled
-   *              image (that is, the image at its intrinsic size).
-   * @param aRectAtTargetSize If not Nothing(), the invalidation rect in the
-   *                          coordinate system of the scaled image (that is,
-   *                          the image at our target decoding size). This must
-   *                          be supplied if we're downscaling during decode.
-   */
-  void PostInvalidation(const nsIntRect& aRect,
-                        const Maybe<nsIntRect>& aRectAtTargetSize = Nothing());
-
-  // Called by the decoders when they have successfully decoded the image. This
-  // may occur as the result of the decoder getting to the appropriate point in
-  // the stream, or by us calling FinishInternal().
-  //
-  // May not be called mid-frame.
-  //
-  // For animated images, specify the loop count. -1 means loop forever, 0
-  // means a single iteration, stopping on the last frame.
-  void PostDecodeDone(int32_t aLoopCount = 0);
-
-  // Data errors are the fault of the source data, decoder errors are our fault
-  void PostDataError();
-  void PostDecoderError(nsresult aFailCode);
-
-  // 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; }
-
-  /**
-   * CompleteDecode() finishes up the decoding process after Decode() determines
-   * that we're finished. It records final progress and does all the cleanup
-   * that's possible off-main-thread.
-   */
-  void CompleteDecode();
-
-  /**
-   * Ensures that a given frame number exists with the given parameters, and
-   * returns a RawAccessFrameRef for that frame.
-   * It is not possible to create sparse frame arrays; you can only append
-   * frames to the current frame array, or if there is only one frame in the
-   * array, replace that frame.
-   * @aTargetSize specifies the target size we're decoding to. If we're not
-   * downscaling during decode, this will always be the same as the image's
-   * intrinsic size.
-   *
-   * If a non-paletted frame is desired, pass 0 for aPaletteDepth.
-   */
-  RawAccessFrameRef EnsureFrame(uint32_t aFrameNum,
-                                const nsIntSize& aTargetSize,
-                                const nsIntRect& aFrameRect,
-                                uint32_t aDecodeFlags,
-                                gfx::SurfaceFormat aFormat,
-                                uint8_t aPaletteDepth,
-                                imgFrame* aPreviousFrame);
-
-  RawAccessFrameRef InternalAddFrame(uint32_t aFrameNum,
-                                     const nsIntSize& aTargetSize,
-                                     const nsIntRect& aFrameRect,
-                                     uint32_t aDecodeFlags,
-                                     gfx::SurfaceFormat aFormat,
-                                     uint8_t aPaletteDepth,
-                                     imgFrame* aPreviousFrame);
-
-  /*
-   * Member variables.
-   *
-   */
-  nsRefPtr<RasterImage> mImage;
-  Maybe<SourceBufferIterator> mIterator;
-  RawAccessFrameRef mCurrentFrame;
-  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 mFlags;
-  size_t mBytesDecoded;
-  bool mSendPartialInvalidations;
-  bool mDataDone;
-  bool mDecodeDone;
-  bool mDataError;
-  bool mDecodeAborted;
-  bool mShouldReportError;
-  bool mImageIsTransient;
-  bool mImageIsLocked;
-
-private:
-  uint32_t mFrameCount; // Number of frames, including anything in-progress
-
-  nsresult mFailCode;
-
-  struct NewFrameData
-  {
-    NewFrameData() { }
-
-    NewFrameData(uint32_t aFrameNum, const nsIntRect& aFrameRect,
-                 gfx::SurfaceFormat aFormat, uint8_t aPaletteDepth)
-      : mFrameNum(aFrameNum)
-      , mFrameRect(aFrameRect)
-      , mFormat(aFormat)
-      , mPaletteDepth(aPaletteDepth)
-    { }
-
-    uint32_t mFrameNum;
-    nsIntRect mFrameRect;
-    gfx::SurfaceFormat mFormat;
-    uint8_t mPaletteDepth;
-  };
-
-  NewFrameData mNewFrameData;
-  bool mNeedsNewFrame;
-  bool mNeedsToFlushData;
-  bool mInitialized;
-  bool mSizeDecode;
-  bool mInFrame;
-  bool mIsAnimated;
-};
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_Decoder_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/Downscaler.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/Downscaler.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/Downscaler.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/Downscaler.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,255 +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 "Downscaler.h"
-
-#include <algorithm>
-#include <ctime>
-#include "gfxPrefs.h"
-#include "image_operations.h"
-#include "convolver.h"
-#include "skia/SkTypes.h"
-
-using std::max;
-using std::swap;
-
-namespace mozilla {
-namespace image {
-
-Downscaler::Downscaler(const nsIntSize& aTargetSize)
-  : mTargetSize(aTargetSize)
-  , mOutputBuffer(nullptr)
-  , mXFilter(MakeUnique<skia::ConvolutionFilter1D>())
-  , mYFilter(MakeUnique<skia::ConvolutionFilter1D>())
-  , mWindowCapacity(0)
-  , mHasAlpha(true)
-{
-  MOZ_ASSERT(gfxPrefs::ImageDownscaleDuringDecodeEnabled(),
-             "Downscaling even though downscale-during-decode is disabled?");
-  MOZ_ASSERT(mTargetSize.width > 0 && mTargetSize.height > 0,
-             "Invalid target size");
-}
-
-Downscaler::~Downscaler()
-{
-  ReleaseWindow();
-}
-
-void
-Downscaler::ReleaseWindow()
-{
-  if (!mWindow) {
-    return;
-  }
-
-  for (int32_t i = 0; i < mWindowCapacity; ++i) {
-    delete[] mWindow[i];
-  }
-
-  mWindow = nullptr;
-  mWindowCapacity = 0;
-}
-
-nsresult
-Downscaler::BeginFrame(const nsIntSize& aOriginalSize,
-                       uint8_t* aOutputBuffer,
-                       bool aHasAlpha)
-{
-  MOZ_ASSERT(aOutputBuffer);
-  MOZ_ASSERT(mTargetSize != aOriginalSize,
-             "Created a downscaler, but not downscaling?");
-  MOZ_ASSERT(mTargetSize.width <= aOriginalSize.width,
-             "Created a downscaler, but width is larger");
-  MOZ_ASSERT(mTargetSize.height <= aOriginalSize.height,
-             "Created a downscaler, but height is larger");
-  MOZ_ASSERT(aOriginalSize.width > 0 && aOriginalSize.height > 0,
-             "Invalid original size");
-
-  mOriginalSize = aOriginalSize;
-  mScale = gfxSize(double(mOriginalSize.width) / mTargetSize.width,
-                   double(mOriginalSize.height) / mTargetSize.height);
-  mOutputBuffer = aOutputBuffer;
-  mHasAlpha = aHasAlpha;
-
-  ResetForNextProgressivePass();
-  ReleaseWindow();
-
-  auto resizeMethod = skia::ImageOperations::RESIZE_LANCZOS3;
-
-  skia::resize::ComputeFilters(resizeMethod,
-                               mOriginalSize.width, mTargetSize.width,
-                               0, mTargetSize.width,
-                               mXFilter.get());
-
-  skia::resize::ComputeFilters(resizeMethod,
-                               mOriginalSize.height, mTargetSize.height,
-                               0, mTargetSize.height,
-                               mYFilter.get());
-
-  // Allocate the buffer, which contains scanlines of the original image.
-  mRowBuffer = MakeUnique<uint8_t[]>(mOriginalSize.width * sizeof(uint32_t));
-  if (MOZ_UNLIKELY(!mRowBuffer)) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  // Allocate the window, which contains horizontally downscaled scanlines. (We
-  // can store scanlines which are already downscale because our downscaling
-  // filter is separable.)
-  mWindowCapacity = mYFilter->max_filter();
-  mWindow = MakeUnique<uint8_t*[]>(mWindowCapacity);
-  if (MOZ_UNLIKELY(!mWindow)) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  bool anyAllocationFailed = false;
-  const int rowSize = mTargetSize.width * sizeof(uint32_t);
-  for (int32_t i = 0; i < mWindowCapacity; ++i) {
-    mWindow[i] = new uint8_t[rowSize];
-    anyAllocationFailed = anyAllocationFailed || mWindow[i] == nullptr;
-  }
-
-  if (MOZ_UNLIKELY(anyAllocationFailed)) {
-    // We intentionally iterate through the entire array even if an allocation
-    // fails, to ensure that all the pointers in it are either valid or nullptr.
-    // That in turn ensures that ReleaseWindow() can clean up correctly.
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  return NS_OK;
-}
-
-void
-Downscaler::ResetForNextProgressivePass()
-{
-  mPrevInvalidatedLine = 0;
-  mCurrentOutLine = 0;
-  mCurrentInLine = 0;
-  mLinesInBuffer = 0;
-}
-
-static void
-GetFilterOffsetAndLength(UniquePtr<skia::ConvolutionFilter1D>& aFilter,
-                         int32_t aOutputImagePosition,
-                         int32_t* aFilterOffsetOut,
-                         int32_t* aFilterLengthOut)
-{
-  MOZ_ASSERT(aOutputImagePosition < aFilter->num_values());
-  aFilter->FilterForValue(aOutputImagePosition,
-                          aFilterOffsetOut,
-                          aFilterLengthOut);
-}
-
-void
-Downscaler::CommitRow()
-{
-  MOZ_ASSERT(mOutputBuffer, "Should have a current frame");
-  MOZ_ASSERT(mCurrentInLine < mOriginalSize.height, "Past end of input");
-  MOZ_ASSERT(mCurrentOutLine < mTargetSize.height, "Past end of output");
-
-  int32_t filterOffset = 0;
-  int32_t filterLength = 0;
-  GetFilterOffsetAndLength(mYFilter, mCurrentOutLine,
-                           &filterOffset, &filterLength);
-
-  int32_t inLineToRead = filterOffset + mLinesInBuffer;
-  MOZ_ASSERT(mCurrentInLine <= inLineToRead, "Reading past end of input");
-  if (mCurrentInLine == inLineToRead) {
-    skia::ConvolveHorizontally(mRowBuffer.get(), *mXFilter,
-                               mWindow[mLinesInBuffer++], mHasAlpha,
-                               /* use_sse2 = */ true);
-  }
-
-  MOZ_ASSERT(mCurrentOutLine < mTargetSize.height,
-             "Writing past end of output");
-
-  while (mLinesInBuffer == filterLength) {
-    DownscaleInputLine();
-
-    if (mCurrentOutLine == mTargetSize.height) {
-      break;  // We're done.
-    }
-
-    GetFilterOffsetAndLength(mYFilter, mCurrentOutLine,
-                             &filterOffset, &filterLength);
-  }
-
-  mCurrentInLine += 1;
-}
-
-bool
-Downscaler::HasInvalidation() const
-{
-  return mCurrentOutLine > mPrevInvalidatedLine;
-}
-
-DownscalerInvalidRect
-Downscaler::TakeInvalidRect()
-{
-  if (MOZ_UNLIKELY(!HasInvalidation())) {
-    return DownscalerInvalidRect();
-  }
-
-  DownscalerInvalidRect invalidRect;
-
-  // Compute the target size invalid rect.
-  invalidRect.mTargetSizeRect =
-    nsIntRect(0, mPrevInvalidatedLine,
-              mTargetSize.width, mCurrentOutLine - mPrevInvalidatedLine);
-  mPrevInvalidatedLine = mCurrentOutLine;
-
-  // Compute the original size invalid rect.
-  invalidRect.mOriginalSizeRect = invalidRect.mTargetSizeRect;
-  invalidRect.mOriginalSizeRect.ScaleRoundOut(mScale.width, mScale.height);
-
-  return invalidRect;
-}
-
-void
-Downscaler::DownscaleInputLine()
-{
-  typedef skia::ConvolutionFilter1D::Fixed FilterValue;
-
-  MOZ_ASSERT(mOutputBuffer);
-  MOZ_ASSERT(mCurrentOutLine < mTargetSize.height,
-             "Writing past end of output");
-
-  int32_t filterOffset = 0;
-  int32_t filterLength = 0;
-  MOZ_ASSERT(mCurrentOutLine < mYFilter->num_values());
-  auto filterValues =
-    mYFilter->FilterForValue(mCurrentOutLine, &filterOffset, &filterLength);
-
-  uint8_t* outputLine =
-    &mOutputBuffer[mCurrentOutLine * mTargetSize.width * sizeof(uint32_t)];
-  skia::ConvolveVertically(static_cast<const FilterValue*>(filterValues),
-                           filterLength, mWindow.get(), mXFilter->num_values(),
-                           outputLine, mHasAlpha, /* use_sse2 = */ true);
-
-  mCurrentOutLine += 1;
-
-  if (mCurrentOutLine == mTargetSize.height) {
-    // We're done.
-    return;
-  }
-
-  int32_t newFilterOffset = 0;
-  int32_t newFilterLength = 0;
-  GetFilterOffsetAndLength(mYFilter, mCurrentOutLine,
-                           &newFilterOffset, &newFilterLength);
-
-  int diff = newFilterOffset - filterOffset;
-  MOZ_ASSERT(diff >= 0, "Moving backwards in the filter?");
-
-  // Shift the buffer. We're just moving pointers here, so this is cheap.
-  mLinesInBuffer -= diff;
-  mLinesInBuffer = max(mLinesInBuffer, 0);
-  for (int32_t i = 0; i < mLinesInBuffer; ++i) {
-    swap(mWindow[i], mWindow[filterLength - mLinesInBuffer + i]);
-  }
-}
-
-} // namespace image
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/Downscaler.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/Downscaler.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/Downscaler.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/Downscaler.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,159 +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/. */
-
-/**
- * Downscaler is a high-quality, streaming image downscaler based upon Skia's
- * scaling implementation.
- */
-
-#ifndef mozilla_image_src_Downscaler_h
-#define mozilla_image_src_Downscaler_h
-
-#include "mozilla/UniquePtr.h"
-#include "nsRect.h"
-
-
-namespace skia {
-  class ConvolutionFilter1D;
-} // namespace skia
-
-namespace mozilla {
-namespace image {
-
-/**
- * DownscalerInvalidRect wraps two invalidation rects: one in terms of the
- * original image size, and one in terms of the target size.
- */
-struct DownscalerInvalidRect
-{
-  nsIntRect mOriginalSizeRect;
-  nsIntRect mTargetSizeRect;
-};
-
-#ifdef MOZ_ENABLE_SKIA
-
-/**
- * Downscaler is a high-quality, streaming image downscaler based upon Skia's
- * scaling implementation.
- *
- * Decoders can construct a Downscaler once they know their target size, then
- * call BeginFrame() for each frame they decode. They should write a decoded row
- * into the buffer returned by RowBuffer(), and then call CommitRow() to signal
- * that they have finished.
- *
-
- * Because invalidations need to be computed in terms of the scaled version of
- * the image, Downscaler also tracks them. Decoders can call HasInvalidation()
- * and TakeInvalidRect() instead of tracking invalidations themselves.
- */
-class Downscaler
-{
-public:
-  /// Constructs a new Downscaler which to scale to size @aTargetSize.
-  explicit Downscaler(const nsIntSize& aTargetSize);
-  ~Downscaler();
-
-  const nsIntSize& OriginalSize() const { return mOriginalSize; }
-  const nsIntSize& TargetSize() const { return mTargetSize; }
-  const gfxSize& Scale() const { return mScale; }
-
-  /**
-   * Begins a new frame and reinitializes the Downscaler.
-   *
-   * @param aOriginalSize The original size of this frame, before scaling.
-   * @param aOutputBuffer The buffer to which the Downscaler should write its
-   *                      output; this is the same buffer where the Decoder
-   *                      would write its output when not downscaling during
-   *                      decode.
-   * @param aHasAlpha Whether or not this frame has an alpha channel.
-   *                  Performance is a little better if it doesn't have one.
-   */
-  nsresult BeginFrame(const nsIntSize& aOriginalSize,
-                      uint8_t* aOutputBuffer,
-                      bool aHasAlpha);
-
-  /// Retrieves the buffer into which the Decoder should write each row.
-  uint8_t* RowBuffer() { return mRowBuffer.get(); }
-
-  /// Signals that the decoder has finished writing a row into the row buffer.
-  void CommitRow();
-
-  /// Returns true if there is a non-empty invalid rect available.
-  bool HasInvalidation() const;
-
-  /// Takes the Downscaler's current invalid rect and resets it.
-  DownscalerInvalidRect TakeInvalidRect();
-
-  /**
-   * Resets the Downscaler's position in the image, for a new progressive pass
-   * over the same frame. Because the same data structures can be reused, this
-   * is more efficient than calling BeginFrame.
-   */
-  void ResetForNextProgressivePass();
-
-private:
-  void DownscaleInputLine();
-  void ReleaseWindow();
-
-  nsIntSize mOriginalSize;
-  nsIntSize mTargetSize;
-  gfxSize mScale;
-
-  uint8_t* mOutputBuffer;
-
-  UniquePtr<uint8_t[]> mRowBuffer;
-  UniquePtr<uint8_t*[]> mWindow;
-
-  UniquePtr<skia::ConvolutionFilter1D> mXFilter;
-  UniquePtr<skia::ConvolutionFilter1D> mYFilter;
-
-  int32_t mWindowCapacity;
-
-  int32_t mLinesInBuffer;
-  int32_t mPrevInvalidatedLine;
-  int32_t mCurrentOutLine;
-  int32_t mCurrentInLine;
-
-  bool mHasAlpha;
-};
-
-#else
-
-/**
- * Downscaler requires Skia to work, so we provide a dummy implementation if
- * Skia is disabled that asserts if constructed.
- */
-
-class Downscaler
-{
-public:
-  explicit Downscaler(const nsIntSize&)
-  {
-    MOZ_RELEASE_ASSERT(false, "Skia is not enabled");
-  }
-
-  const nsIntSize& OriginalSize() const { return nsIntSize(); }
-  const nsIntSize& TargetSize() const { return nsIntSize(); }
-  const gfxSize& Scale() const { return gfxSize(1.0, 1.0); }
-
-  nsresult BeginFrame(const nsIntSize&, uint8_t*, bool)
-  {
-    return NS_ERROR_FAILURE;
-  }
-
-  uint8_t* RowBuffer() { return nullptr; }
-  void CommitRow() { }
-  bool HasInvalidation() const { return false; }
-  DownscalerInvalidRect TakeInvalidRect() { return DownscalerInvalidRect(); }
-  void ResetForNextProgressivePass() { }
-};
-
-#endif // MOZ_ENABLE_SKIA
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_Downscaler_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/DynamicImage.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/DynamicImage.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/DynamicImage.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/DynamicImage.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,334 +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 "DynamicImage.h"
-#include "gfxPlatform.h"
-#include "gfxUtils.h"
-#include "mozilla/gfx/2D.h"
-#include "mozilla/RefPtr.h"
-#include "ImageRegion.h"
-#include "Orientation.h"
-#include "SVGImageContext.h"
-
-#include "mozilla/MemoryReporting.h"
-
-using namespace mozilla;
-using namespace mozilla::gfx;
-using mozilla::layers::LayerManager;
-using mozilla::layers::ImageContainer;
-
-namespace mozilla {
-namespace image {
-
-// Inherited methods from Image.
-
-already_AddRefed<ProgressTracker>
-DynamicImage::GetProgressTracker()
-{
-  return nullptr;
-}
-
-size_t
-DynamicImage::SizeOfSourceWithComputedFallback(MallocSizeOf aMallocSizeOf) const
-{
-  return 0;
-}
-
-void
-DynamicImage::CollectSizeOfSurfaces(nsTArray<SurfaceMemoryCounter>& aCounters,
-                                    MallocSizeOf aMallocSizeOf) const
-{
-  // We can't report anything useful because gfxDrawable doesn't expose this
-  // information.
-}
-
-void
-DynamicImage::IncrementAnimationConsumers()
-{ }
-
-void
-DynamicImage::DecrementAnimationConsumers()
-{ }
-
-#ifdef DEBUG
-uint32_t
-DynamicImage::GetAnimationConsumers()
-{
-  return 0;
-}
-#endif
-
-nsresult
-DynamicImage::OnImageDataAvailable(nsIRequest* aRequest,
-                                   nsISupports* aContext,
-                                   nsIInputStream* aInStr,
-                                   uint64_t aSourceOffset,
-                                   uint32_t aCount)
-{
-  return NS_OK;
-}
-
-nsresult
-DynamicImage::OnImageDataComplete(nsIRequest* aRequest,
-                                  nsISupports* aContext,
-                                  nsresult aStatus,
-                                  bool aLastPart)
-{
-  return NS_OK;
-}
-
-void
-DynamicImage::OnSurfaceDiscarded()
-{ }
-
-void
-DynamicImage::SetInnerWindowID(uint64_t aInnerWindowId)
-{ }
-
-uint64_t
-DynamicImage::InnerWindowID() const
-{
-  return 0;
-}
-
-bool
-DynamicImage::HasError()
-{
-  return !mDrawable;
-}
-
-void
-DynamicImage::SetHasError()
-{ }
-
-ImageURL*
-DynamicImage::GetURI()
-{
-  return nullptr;
-}
-
-// Methods inherited from XPCOM interfaces.
-
-NS_IMPL_ISUPPORTS(DynamicImage, imgIContainer)
-
-NS_IMETHODIMP
-DynamicImage::GetWidth(int32_t* aWidth)
-{
-  *aWidth = mDrawable->Size().width;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-DynamicImage::GetHeight(int32_t* aHeight)
-{
-  *aHeight = mDrawable->Size().height;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-DynamicImage::GetIntrinsicSize(nsSize* aSize)
-{
-  gfxIntSize intSize(mDrawable->Size());
-  *aSize = nsSize(intSize.width, intSize.height);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-DynamicImage::GetIntrinsicRatio(nsSize* aSize)
-{
-  gfxIntSize intSize(mDrawable->Size());
-  *aSize = nsSize(intSize.width, intSize.height);
-  return NS_OK;
-}
-
-NS_IMETHODIMP_(Orientation)
-DynamicImage::GetOrientation()
-{
-  return Orientation();
-}
-
-NS_IMETHODIMP
-DynamicImage::GetType(uint16_t* aType)
-{
-  *aType = imgIContainer::TYPE_RASTER;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-DynamicImage::GetAnimated(bool* aAnimated)
-{
-  *aAnimated = false;
-  return NS_OK;
-}
-
-NS_IMETHODIMP_(TemporaryRef<SourceSurface>)
-DynamicImage::GetFrame(uint32_t aWhichFrame,
-                       uint32_t aFlags)
-{
-  gfxIntSize size(mDrawable->Size());
-
-  RefPtr<DrawTarget> dt = gfxPlatform::GetPlatform()->
-    CreateOffscreenContentDrawTarget(IntSize(size.width, size.height),
-                                     SurfaceFormat::B8G8R8A8);
-  if (!dt) {
-    gfxWarning() <<
-      "DynamicImage::GetFrame failed in CreateOffscreenContentDrawTarget";
-    return nullptr;
-  }
-  nsRefPtr<gfxContext> context = new gfxContext(dt);
-
-  auto result = Draw(context, size, ImageRegion::Create(size),
-                     aWhichFrame, GraphicsFilter::FILTER_NEAREST,
-                     Nothing(), aFlags);
-
-  return result == DrawResult::SUCCESS ? dt->Snapshot() : nullptr;
-}
-
-NS_IMETHODIMP_(bool)
-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.
-  return false;
-}
-
-NS_IMETHODIMP_(already_AddRefed<ImageContainer>)
-DynamicImage::GetImageContainer(LayerManager* aManager, uint32_t aFlags)
-{
-  return nullptr;
-}
-
-NS_IMETHODIMP_(DrawResult)
-DynamicImage::Draw(gfxContext* aContext,
-                   const nsIntSize& aSize,
-                   const ImageRegion& aRegion,
-                   uint32_t aWhichFrame,
-                   GraphicsFilter aFilter,
-                   const Maybe<SVGImageContext>& aSVGContext,
-                   uint32_t aFlags)
-{
-  MOZ_ASSERT(!aSize.IsEmpty(), "Unexpected empty size");
-
-  gfxIntSize drawableSize(mDrawable->Size());
-
-  if (aSize == drawableSize) {
-    gfxUtils::DrawPixelSnapped(aContext, mDrawable, drawableSize, aRegion,
-                               SurfaceFormat::B8G8R8A8, aFilter);
-    return DrawResult::SUCCESS;
-  }
-
-  gfxSize scale(double(aSize.width) / drawableSize.width,
-                double(aSize.height) / drawableSize.height);
-
-  ImageRegion region(aRegion);
-  region.Scale(1.0 / scale.width, 1.0 / scale.height);
-
-  gfxContextMatrixAutoSaveRestore saveMatrix(aContext);
-  aContext->Multiply(gfxMatrix::Scaling(scale.width, scale.height));
-
-  gfxUtils::DrawPixelSnapped(aContext, mDrawable, drawableSize, region,
-                             SurfaceFormat::B8G8R8A8, aFilter);
-  return DrawResult::SUCCESS;
-}
-
-NS_IMETHODIMP
-DynamicImage::RequestDecode()
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-DynamicImage::StartDecoding()
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-DynamicImage::RequestDecodeForSize(const nsIntSize& aSize, uint32_t aFlags)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-DynamicImage::LockImage()
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-DynamicImage::UnlockImage()
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-DynamicImage::RequestDiscard()
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP_(void)
-DynamicImage::RequestRefresh(const mozilla::TimeStamp& aTime)
-{ }
-
-NS_IMETHODIMP
-DynamicImage::GetAnimationMode(uint16_t* aAnimationMode)
-{
-  *aAnimationMode = kNormalAnimMode;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-DynamicImage::SetAnimationMode(uint16_t aAnimationMode)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-DynamicImage::ResetAnimation()
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP_(float)
-DynamicImage::GetFrameIndex(uint32_t aWhichFrame)
-{
-  return 0;
-}
-
-NS_IMETHODIMP_(int32_t)
-DynamicImage::GetFirstFrameDelay()
-{
-  return 0;
-}
-
-NS_IMETHODIMP_(void)
-DynamicImage::SetAnimationStartTime(const mozilla::TimeStamp& aTime)
-{ }
-
-nsIntSize
-DynamicImage::OptimalImageSizeForDest(const gfxSize& aDest,
-                                      uint32_t aWhichFrame,
-                                      GraphicsFilter aFilter, uint32_t aFlags)
-{
-  gfxIntSize size(mDrawable->Size());
-  return nsIntSize(size.width, size.height);
-}
-
-NS_IMETHODIMP_(nsIntRect)
-DynamicImage::GetImageSpaceInvalidationRect(const nsIntRect& aRect)
-{
-  return aRect;
-}
-
-already_AddRefed<imgIContainer>
-DynamicImage::Unwrap()
-{
-  nsCOMPtr<imgIContainer> self(this);
-  return self.forget();
-}
-
-} // namespace image
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/DynamicImage.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/DynamicImage.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/DynamicImage.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/DynamicImage.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +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_image_src_DynamicImage_h
-#define mozilla_image_src_DynamicImage_h
-
-#include "mozilla/MemoryReporting.h"
-#include "gfxDrawable.h"
-#include "Image.h"
-
-namespace mozilla {
-namespace image {
-
-/**
- * An Image that is dynamically created. The content of the image is provided by
- * a gfxDrawable. It's anticipated that most uses of DynamicImage will be
- * ephemeral.
- */
-class DynamicImage : public Image
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGICONTAINER
-
-  explicit DynamicImage(gfxDrawable* aDrawable)
-    : mDrawable(aDrawable)
-  {
-    MOZ_ASSERT(aDrawable, "Must have a gfxDrawable to wrap");
-  }
-
-  // Inherited methods from Image.
-  virtual already_AddRefed<ProgressTracker> GetProgressTracker() override;
-  virtual size_t SizeOfSourceWithComputedFallback(
-                                 MallocSizeOf aMallocSizeOf) const override;
-  virtual void CollectSizeOfSurfaces(nsTArray<SurfaceMemoryCounter>& aCounters,
-                                     MallocSizeOf aMallocSizeOf) const override;
-
-  virtual void IncrementAnimationConsumers() override;
-  virtual void DecrementAnimationConsumers() override;
-#ifdef DEBUG
-  virtual uint32_t GetAnimationConsumers() override;
-#endif
-
-  virtual nsresult OnImageDataAvailable(nsIRequest* aRequest,
-                                        nsISupports* aContext,
-                                        nsIInputStream* aInStr,
-                                        uint64_t aSourceOffset,
-                                        uint32_t aCount) override;
-  virtual nsresult OnImageDataComplete(nsIRequest* aRequest,
-                                       nsISupports* aContext,
-                                       nsresult aStatus,
-                                       bool aLastPart) override;
-
-  virtual void OnSurfaceDiscarded() override;
-
-  virtual void SetInnerWindowID(uint64_t aInnerWindowId) override;
-  virtual uint64_t InnerWindowID() const override;
-
-  virtual bool HasError() override;
-  virtual void SetHasError() override;
-
-  virtual ImageURL* GetURI() override;
-
-private:
-  virtual ~DynamicImage() { }
-
-  nsRefPtr<gfxDrawable> mDrawable;
-};
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_DynamicImage_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/FrameAnimator.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/FrameAnimator.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/FrameAnimator.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/FrameAnimator.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,810 +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 "FrameAnimator.h"
-
-#include "mozilla/MemoryReporting.h"
-#include "mozilla/Move.h"
-#include "imgIContainer.h"
-#include "MainThreadUtils.h"
-#include "RasterImage.h"
-
-#include "pixman.h"
-
-namespace mozilla {
-
-using namespace gfx;
-
-namespace image {
-
-int32_t
-FrameAnimator::GetSingleLoopTime() const
-{
-  // If we aren't done decoding, we don't know the image's full play time.
-  if (!mDoneDecoding) {
-    return -1;
-  }
-
-  // If we're not looping, a single loop time has no meaning
-  if (mAnimationMode != imgIContainer::kNormalAnimMode) {
-    return -1;
-  }
-
-  uint32_t looptime = 0;
-  for (uint32_t i = 0; i < mImage->GetNumFrames(); ++i) {
-    int32_t timeout = GetTimeoutForFrame(i);
-    if (timeout >= 0) {
-      looptime += static_cast<uint32_t>(timeout);
-    } else {
-      // If we have a frame that never times out, we're probably in an error
-      // case, but let's handle it more gracefully.
-      NS_WARNING("Negative frame timeout - how did this happen?");
-      return -1;
-    }
-  }
-
-  return looptime;
-}
-
-TimeStamp
-FrameAnimator::GetCurrentImgFrameEndTime() const
-{
-  TimeStamp currentFrameTime = mCurrentAnimationFrameTime;
-  int32_t timeout =
-    GetTimeoutForFrame(mCurrentAnimationFrameIndex);
-
-  if (timeout < 0) {
-    // We need to return a sentinel value in this case, because our logic
-    // doesn't work correctly if we have a negative timeout value. We use
-    // one year in the future as the sentinel because it works with the loop
-    // in RequestRefresh() below.
-    // XXX(seth): It'd be preferable to make our logic work correctly with
-    // negative timeouts.
-    return TimeStamp::NowLoRes() +
-           TimeDuration::FromMilliseconds(31536000.0);
-  }
-
-  TimeDuration durationOfTimeout =
-    TimeDuration::FromMilliseconds(static_cast<double>(timeout));
-  TimeStamp currentFrameEndTime = currentFrameTime + durationOfTimeout;
-
-  return currentFrameEndTime;
-}
-
-FrameAnimator::RefreshResult
-FrameAnimator::AdvanceFrame(TimeStamp aTime)
-{
-  NS_ASSERTION(aTime <= TimeStamp::Now(),
-               "Given time appears to be in the future");
-
-  uint32_t currentFrameIndex = mCurrentAnimationFrameIndex;
-  uint32_t nextFrameIndex = currentFrameIndex + 1;
-  int32_t timeout = 0;
-
-  RefreshResult ret;
-  RawAccessFrameRef nextFrame = GetRawFrame(nextFrameIndex);
-
-  // If we're done decoding, we know we've got everything we're going to get.
-  // If we aren't, we only display fully-downloaded frames; everything else
-  // gets delayed.
-  bool canDisplay = mDoneDecoding ||
-                    (nextFrame && nextFrame->IsImageComplete());
-
-  if (!canDisplay) {
-    // Uh oh, the frame we want to show is currently being decoded (partial)
-    // Wait until the next refresh driver tick and try again
-    return ret;
-  }
-
-  // If we're done decoding the next frame, go ahead and display it now and
-  // reinit with the next frame's delay time.
-  if (mImage->GetNumFrames() == nextFrameIndex) {
-    // End of an animation loop...
-
-    // If we are not looping forever, initialize the loop counter
-    if (mLoopRemainingCount < 0 && LoopCount() >= 0) {
-      mLoopRemainingCount = LoopCount();
-    }
-
-    // If animation mode is "loop once", or we're at end of loop counter,
-    // it's time to stop animating.
-    if (mAnimationMode == imgIContainer::kLoopOnceAnimMode ||
-        mLoopRemainingCount == 0) {
-      ret.animationFinished = true;
-    }
-
-    nextFrameIndex = 0;
-
-    if (mLoopRemainingCount > 0) {
-      mLoopRemainingCount--;
-    }
-
-    // If we're done, exit early.
-    if (ret.animationFinished) {
-      return ret;
-    }
-  }
-
-  timeout = GetTimeoutForFrame(nextFrameIndex);
-
-  // Bad data
-  if (timeout < 0) {
-    ret.animationFinished = true;
-    ret.error = true;
-  }
-
-  if (nextFrameIndex == 0) {
-    ret.dirtyRect = mFirstFrameRefreshArea;
-  } else {
-    // Change frame
-    if (nextFrameIndex != currentFrameIndex + 1) {
-      nextFrame = GetRawFrame(nextFrameIndex);
-    }
-
-    if (!DoBlend(&ret.dirtyRect, currentFrameIndex,
-                               nextFrameIndex)) {
-      // something went wrong, move on to next
-      NS_WARNING("FrameAnimator::AdvanceFrame(): Compositing of frame failed");
-      nextFrame->SetCompositingFailed(true);
-      mCurrentAnimationFrameTime = GetCurrentImgFrameEndTime();
-      mCurrentAnimationFrameIndex = nextFrameIndex;
-
-      ret.error = true;
-      return ret;
-    }
-
-    nextFrame->SetCompositingFailed(false);
-  }
-
-  mCurrentAnimationFrameTime = GetCurrentImgFrameEndTime();
-
-  // If we can get closer to the current time by a multiple of the image's loop
-  // time, we should.
-  uint32_t loopTime = GetSingleLoopTime();
-  if (loopTime > 0) {
-    TimeDuration delay = aTime - mCurrentAnimationFrameTime;
-    if (delay.ToMilliseconds() > loopTime) {
-      // Explicitly use integer division to get the floor of the number of
-      // loops.
-      uint32_t loops = static_cast<uint32_t>(delay.ToMilliseconds()) / loopTime;
-      mCurrentAnimationFrameTime +=
-        TimeDuration::FromMilliseconds(loops * loopTime);
-    }
-  }
-
-  // Set currentAnimationFrameIndex at the last possible moment
-  mCurrentAnimationFrameIndex = nextFrameIndex;
-
-  // If we're here, we successfully advanced the frame.
-  ret.frameAdvanced = true;
-
-  return ret;
-}
-
-FrameAnimator::RefreshResult
-FrameAnimator::RequestRefresh(const TimeStamp& aTime)
-{
-  // only advance the frame if the current time is greater than or
-  // equal to the current frame's end time.
-  TimeStamp currentFrameEndTime = GetCurrentImgFrameEndTime();
-
-  // By default, an empty RefreshResult.
-  RefreshResult ret;
-
-  while (currentFrameEndTime <= aTime) {
-    TimeStamp oldFrameEndTime = currentFrameEndTime;
-
-    RefreshResult frameRes = AdvanceFrame(aTime);
-
-    // Accumulate our result for returning to callers.
-    ret.Accumulate(frameRes);
-
-    currentFrameEndTime = GetCurrentImgFrameEndTime();
-
-    // if we didn't advance a frame, and our frame end time didn't change,
-    // then we need to break out of this loop & wait for the frame(s)
-    // to finish downloading
-    if (!frameRes.frameAdvanced && (currentFrameEndTime == oldFrameEndTime)) {
-      break;
-    }
-  }
-
-  return ret;
-}
-
-void
-FrameAnimator::ResetAnimation()
-{
-  mCurrentAnimationFrameIndex = 0;
-  mLastCompositedFrameIndex = -1;
-}
-
-void
-FrameAnimator::SetDoneDecoding(bool aDone)
-{
-  mDoneDecoding = aDone;
-}
-
-void
-FrameAnimator::SetAnimationMode(uint16_t aAnimationMode)
-{
-  mAnimationMode = aAnimationMode;
-}
-
-void
-FrameAnimator::InitAnimationFrameTimeIfNecessary()
-{
-  if (mCurrentAnimationFrameTime.IsNull()) {
-    mCurrentAnimationFrameTime = TimeStamp::Now();
-  }
-}
-
-void
-FrameAnimator::SetAnimationFrameTime(const TimeStamp& aTime)
-{
-  mCurrentAnimationFrameTime = aTime;
-}
-
-void
-FrameAnimator::UnionFirstFrameRefreshArea(const nsIntRect& aRect)
-{
-  mFirstFrameRefreshArea.UnionRect(mFirstFrameRefreshArea, aRect);
-}
-
-uint32_t
-FrameAnimator::GetCurrentAnimationFrameIndex() const
-{
-  return mCurrentAnimationFrameIndex;
-}
-
-nsIntRect
-FrameAnimator::GetFirstFrameRefreshArea() const
-{
-  return mFirstFrameRefreshArea;
-}
-
-DrawableFrameRef
-FrameAnimator::GetCompositedFrame(uint32_t aFrameNum)
-{
-  MOZ_ASSERT(aFrameNum != 0, "First frame is never composited");
-
-  // If we have a composited version of this frame, return that.
-  if (mLastCompositedFrameIndex == int32_t(aFrameNum)) {
-    return mCompositingFrame->DrawableRef();
-  }
-
-  // Otherwise return the raw frame. DoBlend is required to ensure that we only
-  // hit this case if the frame is not paletted and doesn't require compositing.
-  DrawableFrameRef ref =
-    SurfaceCache::Lookup(ImageKey(mImage),
-                         RasterSurfaceKey(mSize,
-                                          0,  // Default decode flags.
-                                          aFrameNum));
-  MOZ_ASSERT(!ref || !ref->GetIsPaletted(), "About to return a paletted frame");
-  return ref;
-}
-
-int32_t
-FrameAnimator::GetTimeoutForFrame(uint32_t aFrameNum) const
-{
-  RawAccessFrameRef frame = GetRawFrame(aFrameNum);
-  if (!frame) {
-    NS_WARNING("No frame; called GetTimeoutForFrame too early?");
-    return 100;
-  }
-
-  AnimationData data = frame->GetAnimationData();
-
-  // Ensure a minimal time between updates so we don't throttle the UI thread.
-  // consider 0 == unspecified and make it fast but not too fast.  Unless we
-  // have a single loop GIF. See bug 890743, bug 125137, bug 139677, and bug
-  // 207059. The behavior of recent IE and Opera versions seems to be:
-  // IE 6/Win:
-  //   10 - 50ms go 100ms
-  //   >50ms go correct speed
-  // Opera 7 final/Win:
-  //   10ms goes 100ms
-  //   >10ms go correct speed
-  // It seems that there are broken tools out there that set a 0ms or 10ms
-  // timeout when they really want a "default" one.  So munge values in that
-  // range.
-  if (data.mRawTimeout >= 0 && data.mRawTimeout <= 10 && mLoopCount != 0) {
-    return 100;
-  }
-
-  return data.mRawTimeout;
-}
-
-static void
-DoCollectSizeOfCompositingSurfaces(const RawAccessFrameRef& aSurface,
-                                   SurfaceMemoryCounterType aType,
-                                   nsTArray<SurfaceMemoryCounter>& aCounters,
-                                   MallocSizeOf aMallocSizeOf)
-{
-  // Concoct a SurfaceKey for this surface.
-  SurfaceKey key = RasterSurfaceKey(aSurface->GetImageSize(),
-                                    imgIContainer::DECODE_FLAGS_DEFAULT,
-                                    /* aFrameNum = */ 0);
-
-  // Create a counter for this surface.
-  SurfaceMemoryCounter counter(key, /* aIsLocked = */ true, aType);
-
-  // Extract the surface's memory usage information.
-  size_t heap = aSurface
-    ->SizeOfExcludingThis(gfxMemoryLocation::IN_PROCESS_HEAP, aMallocSizeOf);
-  counter.Values().SetDecodedHeap(heap);
-
-  size_t nonHeap = aSurface
-    ->SizeOfExcludingThis(gfxMemoryLocation::IN_PROCESS_NONHEAP, nullptr);
-  counter.Values().SetDecodedNonHeap(nonHeap);
-
-  // Record it.
-  aCounters.AppendElement(counter);
-}
-
-void
-FrameAnimator::CollectSizeOfCompositingSurfaces(
-    nsTArray<SurfaceMemoryCounter>& aCounters,
-    MallocSizeOf aMallocSizeOf) const
-{
-  if (mCompositingFrame) {
-    DoCollectSizeOfCompositingSurfaces(mCompositingFrame,
-                                       SurfaceMemoryCounterType::COMPOSITING,
-                                       aCounters,
-                                       aMallocSizeOf);
-  }
-
-  if (mCompositingPrevFrame) {
-    DoCollectSizeOfCompositingSurfaces(mCompositingPrevFrame,
-                                       SurfaceMemoryCounterType::COMPOSITING_PREV,
-                                       aCounters,
-                                       aMallocSizeOf);
-  }
-}
-
-RawAccessFrameRef
-FrameAnimator::GetRawFrame(uint32_t aFrameNum) const
-{
-  DrawableFrameRef ref =
-    SurfaceCache::Lookup(ImageKey(mImage),
-                         RasterSurfaceKey(mSize,
-                                          0,  // Default decode flags.
-                                          aFrameNum));
-  return ref ? ref->RawAccessRef()
-             : RawAccessFrameRef();
-}
-
-//******************************************************************************
-// DoBlend gets called when the timer for animation get fired and we have to
-// update the composited frame of the animation.
-bool
-FrameAnimator::DoBlend(nsIntRect* aDirtyRect,
-                       uint32_t aPrevFrameIndex,
-                       uint32_t aNextFrameIndex)
-{
-  RawAccessFrameRef prevFrame = GetRawFrame(aPrevFrameIndex);
-  RawAccessFrameRef nextFrame = GetRawFrame(aNextFrameIndex);
-
-  MOZ_ASSERT(prevFrame && nextFrame, "Should have frames here");
-
-  AnimationData prevFrameData = prevFrame->GetAnimationData();
-  if (prevFrameData.mDisposalMethod == DisposalMethod::RESTORE_PREVIOUS &&
-      !mCompositingPrevFrame) {
-    prevFrameData.mDisposalMethod = DisposalMethod::CLEAR;
-  }
-
-  bool isFullPrevFrame = prevFrameData.mRect.x == 0 &&
-                         prevFrameData.mRect.y == 0 &&
-                         prevFrameData.mRect.width == mSize.width &&
-                         prevFrameData.mRect.height == mSize.height;
-
-  // Optimization: DisposeClearAll if the previous frame is the same size as
-  //               container and it's clearing itself
-  if (isFullPrevFrame &&
-      (prevFrameData.mDisposalMethod == DisposalMethod::CLEAR)) {
-    prevFrameData.mDisposalMethod = DisposalMethod::CLEAR_ALL;
-  }
-
-  AnimationData nextFrameData = nextFrame->GetAnimationData();
-  bool isFullNextFrame = nextFrameData.mRect.x == 0 &&
-                         nextFrameData.mRect.y == 0 &&
-                         nextFrameData.mRect.width == mSize.width &&
-                         nextFrameData.mRect.height == mSize.height;
-
-  if (!nextFrame->GetIsPaletted()) {
-    // Optimization: Skip compositing if the previous frame wants to clear the
-    //               whole image
-    if (prevFrameData.mDisposalMethod == DisposalMethod::CLEAR_ALL) {
-      aDirtyRect->SetRect(0, 0, mSize.width, mSize.height);
-      return true;
-    }
-
-    // Optimization: Skip compositing if this frame is the same size as the
-    //               container and it's fully drawing over prev frame (no alpha)
-    if (isFullNextFrame &&
-        (nextFrameData.mDisposalMethod != DisposalMethod::RESTORE_PREVIOUS) &&
-        !nextFrameData.mHasAlpha) {
-      aDirtyRect->SetRect(0, 0, mSize.width, mSize.height);
-      return true;
-    }
-  }
-
-  // Calculate area that needs updating
-  switch (prevFrameData.mDisposalMethod) {
-    default:
-      MOZ_ASSERT_UNREACHABLE("Unexpected DisposalMethod");
-    case DisposalMethod::NOT_SPECIFIED:
-    case DisposalMethod::KEEP:
-      *aDirtyRect = nextFrameData.mRect;
-      break;
-
-    case DisposalMethod::CLEAR_ALL:
-      // Whole image container is cleared
-      aDirtyRect->SetRect(0, 0, mSize.width, mSize.height);
-      break;
-
-    case DisposalMethod::CLEAR:
-      // Calc area that needs to be redrawn (the combination of previous and
-      // this frame)
-      // XXX - This could be done with multiple framechanged calls
-      //       Having prevFrame way at the top of the image, and nextFrame
-      //       way at the bottom, and both frames being small, we'd be
-      //       telling framechanged to refresh the whole image when only two
-      //       small areas are needed.
-      aDirtyRect->UnionRect(nextFrameData.mRect, prevFrameData.mRect);
-      break;
-
-    case DisposalMethod::RESTORE_PREVIOUS:
-      aDirtyRect->SetRect(0, 0, mSize.width, mSize.height);
-      break;
-  }
-
-  // Optimization:
-  //   Skip compositing if the last composited frame is this frame
-  //   (Only one composited frame was made for this animation.  Example:
-  //    Only Frame 3 of a 10 frame image required us to build a composite frame
-  //    On the second loop, we do not need to rebuild the frame
-  //    since it's still sitting in compositingFrame)
-  if (mLastCompositedFrameIndex == int32_t(aNextFrameIndex)) {
-    return true;
-  }
-
-  bool needToBlankComposite = false;
-
-  // Create the Compositing Frame
-  if (!mCompositingFrame) {
-    nsRefPtr<imgFrame> newFrame = new imgFrame;
-    nsresult rv = newFrame->InitForDecoder(mSize,
-                                           SurfaceFormat::B8G8R8A8);
-    if (NS_FAILED(rv)) {
-      mCompositingFrame.reset();
-      return false;
-    }
-    mCompositingFrame = newFrame->RawAccessRef();
-    needToBlankComposite = true;
-  } else if (int32_t(aNextFrameIndex) != mLastCompositedFrameIndex+1) {
-
-    // If we are not drawing on top of last composited frame,
-    // then we are building a new composite frame, so let's clear it first.
-    needToBlankComposite = true;
-  }
-
-  AnimationData compositingFrameData = mCompositingFrame->GetAnimationData();
-
-  // More optimizations possible when next frame is not transparent
-  // But if the next frame has DisposalMethod::RESTORE_PREVIOUS,
-  // this "no disposal" optimization is not possible,
-  // because the frame in "after disposal operation" state
-  // needs to be stored in compositingFrame, so it can be
-  // copied into compositingPrevFrame later.
-  bool doDisposal = true;
-  if (!nextFrameData.mHasAlpha &&
-      nextFrameData.mDisposalMethod != DisposalMethod::RESTORE_PREVIOUS) {
-    if (isFullNextFrame) {
-      // Optimization: No need to dispose prev.frame when
-      // next frame is full frame and not transparent.
-      doDisposal = false;
-      // No need to blank the composite frame
-      needToBlankComposite = false;
-    } else {
-      if ((prevFrameData.mRect.x >= nextFrameData.mRect.x) &&
-          (prevFrameData.mRect.y >= nextFrameData.mRect.y) &&
-          (prevFrameData.mRect.x + prevFrameData.mRect.width <=
-              nextFrameData.mRect.x + nextFrameData.mRect.width) &&
-          (prevFrameData.mRect.y + prevFrameData.mRect.height <=
-              nextFrameData.mRect.y + nextFrameData.mRect.height)) {
-        // Optimization: No need to dispose prev.frame when
-        // next frame fully overlaps previous frame.
-        doDisposal = false;
-      }
-    }
-  }
-
-  if (doDisposal) {
-    // Dispose of previous: clear, restore, or keep (copy)
-    switch (prevFrameData.mDisposalMethod) {
-      case DisposalMethod::CLEAR:
-        if (needToBlankComposite) {
-          // If we just created the composite, it could have anything in its
-          // buffer. Clear whole frame
-          ClearFrame(compositingFrameData.mRawData,
-                     compositingFrameData.mRect);
-        } else {
-          // Only blank out previous frame area (both color & Mask/Alpha)
-          ClearFrame(compositingFrameData.mRawData,
-                     compositingFrameData.mRect,
-                     prevFrameData.mRect);
-        }
-        break;
-
-      case DisposalMethod::CLEAR_ALL:
-        ClearFrame(compositingFrameData.mRawData,
-                   compositingFrameData.mRect);
-        break;
-
-      case DisposalMethod::RESTORE_PREVIOUS:
-        // It would be better to copy only the area changed back to
-        // compositingFrame.
-        if (mCompositingPrevFrame) {
-          AnimationData compositingPrevFrameData =
-            mCompositingPrevFrame->GetAnimationData();
-
-          CopyFrameImage(compositingPrevFrameData.mRawData,
-                         compositingPrevFrameData.mRect,
-                         compositingFrameData.mRawData,
-                         compositingFrameData.mRect);
-
-          // destroy only if we don't need it for this frame's disposal
-          if (nextFrameData.mDisposalMethod !=
-              DisposalMethod::RESTORE_PREVIOUS) {
-            mCompositingPrevFrame.reset();
-          }
-        } else {
-          ClearFrame(compositingFrameData.mRawData,
-                     compositingFrameData.mRect);
-        }
-        break;
-
-      default:
-        MOZ_ASSERT_UNREACHABLE("Unexpected DisposalMethod");
-      case DisposalMethod::NOT_SPECIFIED:
-      case DisposalMethod::KEEP:
-        // Copy previous frame into compositingFrame before we put the new
-        // frame on top
-        // Assumes that the previous frame represents a full frame (it could be
-        // smaller in size than the container, as long as the frame before it
-        // erased itself)
-        // Note: Frame 1 never gets into DoBlend(), so (aNextFrameIndex - 1)
-        // will always be a valid frame number.
-        if (mLastCompositedFrameIndex != int32_t(aNextFrameIndex - 1)) {
-          if (isFullPrevFrame && !prevFrame->GetIsPaletted()) {
-            // Just copy the bits
-            CopyFrameImage(prevFrameData.mRawData,
-                           prevFrameData.mRect,
-                           compositingFrameData.mRawData,
-                           compositingFrameData.mRect);
-          } else {
-            if (needToBlankComposite) {
-              // Only blank composite when prev is transparent or not full.
-              if (prevFrameData.mHasAlpha || !isFullPrevFrame) {
-                ClearFrame(compositingFrameData.mRawData,
-                           compositingFrameData.mRect);
-              }
-            }
-            DrawFrameTo(prevFrameData.mRawData, prevFrameData.mRect,
-                        prevFrameData.mPaletteDataLength,
-                        prevFrameData.mHasAlpha,
-                        compositingFrameData.mRawData,
-                        compositingFrameData.mRect,
-                        prevFrameData.mBlendMethod);
-          }
-        }
-    }
-  } else if (needToBlankComposite) {
-    // If we just created the composite, it could have anything in its
-    // buffers. Clear them
-    ClearFrame(compositingFrameData.mRawData,
-               compositingFrameData.mRect);
-  }
-
-  // Check if the frame we are composing wants the previous image restored after
-  // it is done. Don't store it (again) if last frame wanted its image restored
-  // too
-  if ((nextFrameData.mDisposalMethod == DisposalMethod::RESTORE_PREVIOUS) &&
-      (prevFrameData.mDisposalMethod != DisposalMethod::RESTORE_PREVIOUS)) {
-    // We are storing the whole image.
-    // It would be better if we just stored the area that nextFrame is going to
-    // overwrite.
-    if (!mCompositingPrevFrame) {
-      nsRefPtr<imgFrame> newFrame = new imgFrame;
-      nsresult rv = newFrame->InitForDecoder(mSize,
-                                             SurfaceFormat::B8G8R8A8);
-      if (NS_FAILED(rv)) {
-        mCompositingPrevFrame.reset();
-        return false;
-      }
-
-      mCompositingPrevFrame = newFrame->RawAccessRef();
-    }
-
-    AnimationData compositingPrevFrameData =
-      mCompositingPrevFrame->GetAnimationData();
-
-    CopyFrameImage(compositingFrameData.mRawData,
-                   compositingFrameData.mRect,
-                   compositingPrevFrameData.mRawData,
-                   compositingPrevFrameData.mRect);
-
-    mCompositingPrevFrame->Finish();
-  }
-
-  // blit next frame into it's correct spot
-  DrawFrameTo(nextFrameData.mRawData, nextFrameData.mRect,
-              nextFrameData.mPaletteDataLength,
-              nextFrameData.mHasAlpha,
-              compositingFrameData.mRawData,
-              compositingFrameData.mRect,
-              nextFrameData.mBlendMethod);
-
-  // Tell the image that it is fully 'downloaded'.
-  mCompositingFrame->Finish();
-
-  mLastCompositedFrameIndex = int32_t(aNextFrameIndex);
-
-  return true;
-}
-
-//******************************************************************************
-// Fill aFrame with black. Does also clears the mask.
-void
-FrameAnimator::ClearFrame(uint8_t* aFrameData, const nsIntRect& aFrameRect)
-{
-  if (!aFrameData) {
-    return;
-  }
-
-  memset(aFrameData, 0, aFrameRect.width * aFrameRect.height * 4);
-}
-
-//******************************************************************************
-void
-FrameAnimator::ClearFrame(uint8_t* aFrameData, const nsIntRect& aFrameRect,
-                          const nsIntRect& aRectToClear)
-{
-  if (!aFrameData || aFrameRect.width <= 0 || aFrameRect.height <= 0 ||
-      aRectToClear.width <= 0 || aRectToClear.height <= 0) {
-    return;
-  }
-
-  nsIntRect toClear = aFrameRect.Intersect(aRectToClear);
-  if (toClear.IsEmpty()) {
-    return;
-  }
-
-  uint32_t bytesPerRow = aFrameRect.width * 4;
-  for (int row = toClear.y; row < toClear.y + toClear.height; ++row) {
-    memset(aFrameData + toClear.x * 4 + row * bytesPerRow, 0,
-           toClear.width * 4);
-  }
-}
-
-//******************************************************************************
-// Whether we succeed or fail will not cause a crash, and there's not much
-// we can do about a failure, so there we don't return a nsresult
-bool
-FrameAnimator::CopyFrameImage(const uint8_t* aDataSrc,
-                              const nsIntRect& aRectSrc,
-                              uint8_t* aDataDest,
-                              const nsIntRect& aRectDest)
-{
-  uint32_t dataLengthSrc = aRectSrc.width * aRectSrc.height * 4;
-  uint32_t dataLengthDest = aRectDest.width * aRectDest.height * 4;
-
-  if (!aDataDest || !aDataSrc || dataLengthSrc != dataLengthDest) {
-    return false;
-  }
-
-  memcpy(aDataDest, aDataSrc, dataLengthDest);
-
-  return true;
-}
-
-nsresult
-FrameAnimator::DrawFrameTo(const uint8_t* aSrcData, const nsIntRect& aSrcRect,
-                           uint32_t aSrcPaletteLength, bool aSrcHasAlpha,
-                           uint8_t* aDstPixels, const nsIntRect& aDstRect,
-                           BlendMethod aBlendMethod)
-{
-  NS_ENSURE_ARG_POINTER(aSrcData);
-  NS_ENSURE_ARG_POINTER(aDstPixels);
-
-  // According to both AGIF and APNG specs, offsets are unsigned
-  if (aSrcRect.x < 0 || aSrcRect.y < 0) {
-    NS_WARNING("FrameAnimator::DrawFrameTo: negative offsets not allowed");
-    return NS_ERROR_FAILURE;
-  }
-  // Outside the destination frame, skip it
-  if ((aSrcRect.x > aDstRect.width) || (aSrcRect.y > aDstRect.height)) {
-    return NS_OK;
-  }
-
-  if (aSrcPaletteLength) {
-    // Larger than the destination frame, clip it
-    int32_t width = std::min(aSrcRect.width, aDstRect.width - aSrcRect.x);
-    int32_t height = std::min(aSrcRect.height, aDstRect.height - aSrcRect.y);
-
-    // The clipped image must now fully fit within destination image frame
-    NS_ASSERTION((aSrcRect.x >= 0) && (aSrcRect.y >= 0) &&
-                 (aSrcRect.x + width <= aDstRect.width) &&
-                 (aSrcRect.y + height <= aDstRect.height),
-                "FrameAnimator::DrawFrameTo: Invalid aSrcRect");
-
-    // clipped image size may be smaller than source, but not larger
-    NS_ASSERTION((width <= aSrcRect.width) && (height <= aSrcRect.height),
-      "FrameAnimator::DrawFrameTo: source must be smaller than dest");
-
-    // Get pointers to image data
-    const uint8_t* srcPixels = aSrcData + aSrcPaletteLength;
-    uint32_t* dstPixels = reinterpret_cast<uint32_t*>(aDstPixels);
-    const uint32_t* colormap = reinterpret_cast<const uint32_t*>(aSrcData);
-
-    // Skip to the right offset
-    dstPixels += aSrcRect.x + (aSrcRect.y * aDstRect.width);
-    if (!aSrcHasAlpha) {
-      for (int32_t r = height; r > 0; --r) {
-        for (int32_t c = 0; c < width; c++) {
-          dstPixels[c] = colormap[srcPixels[c]];
-        }
-        // Go to the next row in the source resp. destination image
-        srcPixels += aSrcRect.width;
-        dstPixels += aDstRect.width;
-      }
-    } else {
-      for (int32_t r = height; r > 0; --r) {
-        for (int32_t c = 0; c < width; c++) {
-          const uint32_t color = colormap[srcPixels[c]];
-          if (color) {
-            dstPixels[c] = color;
-          }
-        }
-        // Go to the next row in the source resp. destination image
-        srcPixels += aSrcRect.width;
-        dstPixels += aDstRect.width;
-      }
-    }
-  } else {
-    pixman_image_t* src =
-      pixman_image_create_bits(
-          aSrcHasAlpha ? PIXMAN_a8r8g8b8 : PIXMAN_x8r8g8b8,
-          aSrcRect.width, aSrcRect.height,
-          reinterpret_cast<uint32_t*>(const_cast<uint8_t*>(aSrcData)),
-          aSrcRect.width * 4);
-    pixman_image_t* dst =
-      pixman_image_create_bits(PIXMAN_a8r8g8b8,
-                               aDstRect.width,
-                               aDstRect.height,
-                               reinterpret_cast<uint32_t*>(aDstPixels),
-                               aDstRect.width * 4);
-
-    auto op = aBlendMethod == BlendMethod::SOURCE ? PIXMAN_OP_SRC
-                                                  : PIXMAN_OP_OVER;
-    pixman_image_composite32(op,
-                             src,
-                             nullptr,
-                             dst,
-                             0, 0,
-                             0, 0,
-                             aSrcRect.x, aSrcRect.y,
-                             aSrcRect.width, aSrcRect.height);
-
-    pixman_image_unref(src);
-    pixman_image_unref(dst);
-  }
-
-  return NS_OK;
-}
-
-} // namespace image
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/FrameAnimator.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/FrameAnimator.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/FrameAnimator.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/FrameAnimator.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,290 +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_image_src_FrameAnimator_h
-#define mozilla_image_src_FrameAnimator_h
-
-#include "mozilla/MemoryReporting.h"
-#include "mozilla/TimeStamp.h"
-#include "gfx2DGlue.h"
-#include "gfxTypes.h"
-#include "imgFrame.h"
-#include "nsCOMPtr.h"
-#include "nsRect.h"
-#include "SurfaceCache.h"
-
-namespace mozilla {
-namespace image {
-
-class RasterImage;
-
-class FrameAnimator
-{
-public:
-  FrameAnimator(RasterImage* aImage,
-                gfx::IntSize aSize,
-                uint16_t aAnimationMode)
-    : mImage(aImage)
-    , mSize(aSize)
-    , mCurrentAnimationFrameIndex(0)
-    , mLoopRemainingCount(-1)
-    , mLastCompositedFrameIndex(-1)
-    , mLoopCount(-1)
-    , mAnimationMode(aAnimationMode)
-    , mDoneDecoding(false)
-  { }
-
-  /**
-   * Return value from RequestRefresh. Tells callers what happened in that call
-   * to RequestRefresh.
-   */
-  struct RefreshResult
-  {
-    // The dirty rectangle to be re-drawn after this RequestRefresh().
-    nsIntRect dirtyRect;
-
-    // Whether any frame changed, and hence the dirty rect was set.
-    bool frameAdvanced : 1;
-
-    // Whether the animation has finished playing.
-    bool animationFinished : 1;
-
-    // Whether an error has occurred when trying to advance a frame. Note that
-    // errors do not, on their own, end the animation.
-    bool error : 1;
-
-    RefreshResult()
-      : frameAdvanced(false)
-      , animationFinished(false)
-      , error(false)
-    { }
-
-    void Accumulate(const RefreshResult& other)
-    {
-      frameAdvanced = frameAdvanced || other.frameAdvanced;
-      animationFinished = animationFinished || other.animationFinished;
-      error = error || other.error;
-      dirtyRect = dirtyRect.Union(other.dirtyRect);
-    }
-  };
-
-  /**
-   * Re-evaluate what frame we're supposed to be on, and do whatever blending
-   * is necessary to get us to that frame.
-   *
-   * Returns the result of that blending, including whether the current frame
-   * changed and what the resulting dirty rectangle is.
-   */
-  RefreshResult RequestRefresh(const TimeStamp& aTime);
-
-  /**
-   * Call when this image is finished decoding so we know that there aren't any
-   * more frames coming.
-   */
-  void SetDoneDecoding(bool aDone);
-
-  /**
-   * Call when you need to re-start animating. Ensures we start from the first
-   * frame.
-   */
-  void ResetAnimation();
-
-  /**
-   * The animation mode of the image.
-   *
-   * Constants defined in imgIContainer.idl.
-   */
-  void SetAnimationMode(uint16_t aAnimationMode);
-
-  /**
-   * Union the area to refresh when we loop around to the first frame with this
-   * rect.
-   */
-  void UnionFirstFrameRefreshArea(const nsIntRect& aRect);
-
-  /**
-   * If the animation frame time has not yet been set, set it to
-   * TimeStamp::Now().
-   */
-  void InitAnimationFrameTimeIfNecessary();
-
-  /**
-   * Set the animation frame time to @aTime.
-   */
-  void SetAnimationFrameTime(const TimeStamp& aTime);
-
-  /**
-   * The current frame we're on, from 0 to (numFrames - 1).
-   */
-  uint32_t GetCurrentAnimationFrameIndex() const;
-
-  /**
-   * Get the area we refresh when we loop around to the first frame.
-   */
-  nsIntRect GetFirstFrameRefreshArea() const;
-
-  /**
-   * If we have a composited frame for @aFrameNum, returns it. Otherwise,
-   * returns an empty DrawableFrameRef. It is an error to call this method with
-   * aFrameNum == 0, because the first frame is never composited.
-   */
-  DrawableFrameRef GetCompositedFrame(uint32_t aFrameNum);
-
-  /*
-   * Returns the frame's adjusted timeout. If the animation loops and the
-   * timeout falls in between a certain range then the timeout is adjusted so
-   * that it's never 0. If the animation does not loop then no adjustments are
-   * made.
-   */
-  int32_t GetTimeoutForFrame(uint32_t aFrameNum) const;
-
-  /*
-   * Set number of times to loop the image.
-   * @note -1 means loop forever.
-   */
-  void SetLoopCount(int32_t aLoopCount) { mLoopCount = aLoopCount; }
-  int32_t LoopCount() const { return mLoopCount; }
-
-  /**
-   * Collect an accounting of the memory occupied by the compositing surfaces we
-   * use during animation playback. All of the actual animation frames are
-   * stored in the SurfaceCache, so we don't need to report them here.
-   */
-  void CollectSizeOfCompositingSurfaces(nsTArray<SurfaceMemoryCounter>& aCounters,
-                                        MallocSizeOf aMallocSizeOf) const;
-
-private: // methods
-  /**
-   * Gets the length of a single loop of this image, in milliseconds.
-   *
-   * If this image is not finished decoding, is not animated, or it is animated
-   * but does not loop, returns -1. Can return 0 in the case of an animated
-   * image that has a 0ms delay between its frames and does not loop.
-   */
-  int32_t GetSingleLoopTime() const;
-
-  /**
-   * Advances the animation. Typically, this will advance a single frame, but it
-   * may advance multiple frames. This may happen if we have infrequently
-   * "ticking" refresh drivers (e.g. in background tabs), or extremely short-
-   * lived animation frames.
-   *
-   * @param aTime the time that the animation should advance to. This will
-   *              typically be <= TimeStamp::Now().
-   *
-   * @returns a RefreshResult that shows whether the frame was successfully
-   *          advanced, and its resulting dirty rect.
-   */
-  RefreshResult AdvanceFrame(TimeStamp aTime);
-
-  /**
-   * Get the time the frame we're currently displaying is supposed to end.
-   *
-   * In the error case, returns an "infinity" timestamp.
-   */
-  TimeStamp GetCurrentImgFrameEndTime() const;
-
-  bool DoBlend(nsIntRect* aDirtyRect, uint32_t aPrevFrameIndex,
-               uint32_t aNextFrameIndex);
-
-  /**
-   * Get the @aIndex-th frame in the frame index, ignoring results of blending.
-   */
-  RawAccessFrameRef GetRawFrame(uint32_t aFrameNum) const;
-
-  /** Clears an area of <aFrame> with transparent black.
-   *
-   * @param aFrameData Target Frame data
-   * @param aFrameRect The rectangle of the data pointed ot by aFrameData
-   *
-   * @note Does also clears the transparency mask
-   */
-  static void ClearFrame(uint8_t* aFrameData, const nsIntRect& aFrameRect);
-
-  //! @overload
-  static void ClearFrame(uint8_t* aFrameData, const nsIntRect& aFrameRect,
-                         const nsIntRect& aRectToClear);
-
-  //! Copy one frame's image and mask into another
-  static bool CopyFrameImage(const uint8_t* aDataSrc, const nsIntRect& aRectSrc,
-                             uint8_t* aDataDest, const nsIntRect& aRectDest);
-
-  /**
-   * Draws one frame's image to into another, at the position specified by
-   * aSrcRect.
-   *
-   * @aSrcData the raw data of the current frame being drawn
-   * @aSrcRect the size of the source frame, and the position of that frame in
-   *           the composition frame
-   * @aSrcPaletteLength the length (in bytes) of the palette at the beginning
-   *                    of the source data (0 if image is not paletted)
-   * @aSrcHasAlpha whether the source data represents an image with alpha
-   * @aDstPixels the raw data of the composition frame where the current frame
-   *             is drawn into (32-bit ARGB)
-   * @aDstRect the size of the composition frame
-   * @aBlendMethod the blend method for how to blend src on the composition
-   * frame.
-   */
-  static nsresult DrawFrameTo(const uint8_t* aSrcData,
-                              const nsIntRect& aSrcRect,
-                              uint32_t aSrcPaletteLength, bool aSrcHasAlpha,
-                              uint8_t* aDstPixels, const nsIntRect& aDstRect,
-                              BlendMethod aBlendMethod);
-
-private: // data
-  //! A weak pointer to our owning image.
-  RasterImage* mImage;
-
-  //! The intrinsic size of the image.
-  gfx::IntSize mSize;
-
-  /** For managing blending of frames
-   *
-   * Some animations will use the compositingFrame to composite images
-   * and just hand this back to the caller when it is time to draw the frame.
-   * NOTE: When clearing compositingFrame, remember to set
-   *       lastCompositedFrameIndex to -1.  Code assume that if
-   *       lastCompositedFrameIndex >= 0 then compositingFrame exists.
-   */
-  RawAccessFrameRef mCompositingFrame;
-
-  /** the previous composited frame, for DISPOSE_RESTORE_PREVIOUS
-   *
-   * The Previous Frame (all frames composited up to the current) needs to be
-   * stored in cases where the image specifies it wants the last frame back
-   * when it's done with the current frame.
-   */
-  RawAccessFrameRef mCompositingPrevFrame;
-
-  //! Area of the first frame that needs to be redrawn on subsequent loops.
-  nsIntRect mFirstFrameRefreshArea;
-
-  //! the time that the animation advanced to the current frame
-  TimeStamp mCurrentAnimationFrameTime;
-
-  //! The current frame index we're on. 0 to (numFrames - 1).
-  uint32_t mCurrentAnimationFrameIndex;
-
-  //! number of loops remaining before animation stops (-1 no stop)
-  int32_t mLoopRemainingCount;
-
-  //! Track the last composited frame for Optimizations (See DoComposite code)
-  int32_t mLastCompositedFrameIndex;
-
-  //! The total number of loops for the image.
-  int32_t mLoopCount;
-
-  //! The animation mode of this image. Constants defined in imgIContainer.
-  uint16_t mAnimationMode;
-
-  //! Whether this image is done being decoded.
-  bool mDoneDecoding;
-};
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_FrameAnimator_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/FrozenImage.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/FrozenImage.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/FrozenImage.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/FrozenImage.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,106 +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 "FrozenImage.h"
-
-namespace mozilla {
-
-using namespace gfx;
-
-namespace image {
-
-NS_IMPL_ISUPPORTS_INHERITED0(FrozenImage, ImageWrapper)
-
-void
-FrozenImage::IncrementAnimationConsumers()
-{
-  // Do nothing. This will prevent animation from starting if there are no other
-  // instances of this image.
-}
-
-void
-FrozenImage::DecrementAnimationConsumers()
-{
-  // Do nothing.
-}
-
-NS_IMETHODIMP
-FrozenImage::GetAnimated(bool* aAnimated)
-{
-  bool dummy;
-  nsresult rv = InnerImage()->GetAnimated(&dummy);
-  if (NS_SUCCEEDED(rv)) {
-    *aAnimated = false;
-  }
-  return rv;
-}
-
-NS_IMETHODIMP_(TemporaryRef<SourceSurface>)
-FrozenImage::GetFrame(uint32_t aWhichFrame,
-                      uint32_t aFlags)
-{
-  return InnerImage()->GetFrame(FRAME_FIRST, aFlags);
-}
-
-NS_IMETHODIMP_(already_AddRefed<ImageContainer>)
-FrozenImage::GetImageContainer(layers::LayerManager* aManager, uint32_t aFlags)
-{
-  // XXX(seth): GetImageContainer does not currently support anything but the
-  // current frame. We work around this by always returning null, but if it ever
-  // turns out that FrozenImage is widely used on codepaths that can actually
-  // benefit from GetImageContainer, it would be a good idea to fix that method
-  // for performance reasons.
-  return nullptr;
-}
-
-NS_IMETHODIMP_(DrawResult)
-FrozenImage::Draw(gfxContext* aContext,
-                  const nsIntSize& aSize,
-                  const ImageRegion& aRegion,
-                  uint32_t /* aWhichFrame - ignored */,
-                  GraphicsFilter aFilter,
-                  const Maybe<SVGImageContext>& aSVGContext,
-                  uint32_t aFlags)
-{
-  return InnerImage()->Draw(aContext, aSize, aRegion, FRAME_FIRST,
-                            aFilter, aSVGContext, aFlags);
-}
-
-NS_IMETHODIMP_(void)
-FrozenImage::RequestRefresh(const TimeStamp& aTime)
-{
-  // Do nothing.
-}
-
-NS_IMETHODIMP
-FrozenImage::GetAnimationMode(uint16_t* aAnimationMode)
-{
-  *aAnimationMode = kNormalAnimMode;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-FrozenImage::SetAnimationMode(uint16_t aAnimationMode)
-{
-  // Do nothing.
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-FrozenImage::ResetAnimation()
-{
-  // Do nothing.
-  return NS_OK;
-}
-
-NS_IMETHODIMP_(float)
-FrozenImage::GetFrameIndex(uint32_t aWhichFrame)
-{
-  MOZ_ASSERT(aWhichFrame <= FRAME_MAX_VALUE, "Invalid argument");
-  return 0;
-}
-
-} // namespace image
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/FrozenImage.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/FrozenImage.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/FrozenImage.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/FrozenImage.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +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_image_src_FrozenImage_h
-#define mozilla_image_src_FrozenImage_h
-
-#include "ImageWrapper.h"
-#include "mozilla/gfx/2D.h"
-#include "mozilla/RefPtr.h"
-
-namespace mozilla {
-namespace image {
-
-/**
- * An Image wrapper that disables animation, freezing the image at its first
- * frame. It does this using two strategies. If this is the only instance of the
- * image, animation will never start, because IncrementAnimationConsumers is
- * ignored. If there is another instance that is animated, that's still OK,
- * because any imgIContainer method that is affected by animation gets its
- * aWhichFrame argument set to FRAME_FIRST when it passes through FrozenImage.
- *
- * XXX(seth): There a known (performance, not correctness) issue with
- * GetImageContainer. See the comments for that method for more information.
- */
-class FrozenImage : public ImageWrapper
-{
-  typedef gfx::SourceSurface SourceSurface;
-
-public:
-  NS_DECL_ISUPPORTS_INHERITED
-
-  virtual void IncrementAnimationConsumers() override;
-  virtual void DecrementAnimationConsumers() override;
-
-  NS_IMETHOD GetAnimated(bool* aAnimated) override;
-  NS_IMETHOD_(TemporaryRef<SourceSurface>)
-    GetFrame(uint32_t aWhichFrame, uint32_t aFlags) override;
-  NS_IMETHOD_(already_AddRefed<layers::ImageContainer>)
-    GetImageContainer(layers::LayerManager* aManager,
-                      uint32_t aFlags) override;
-  NS_IMETHOD_(DrawResult) Draw(gfxContext* aContext,
-                               const nsIntSize& aSize,
-                               const ImageRegion& aRegion,
-                               uint32_t aWhichFrame,
-                               GraphicsFilter aFilter,
-                               const Maybe<SVGImageContext>& aSVGContext,
-                               uint32_t aFlags) override;
-  NS_IMETHOD_(void) RequestRefresh(const TimeStamp& aTime) override;
-  NS_IMETHOD GetAnimationMode(uint16_t* aAnimationMode) override;
-  NS_IMETHOD SetAnimationMode(uint16_t aAnimationMode) override;
-  NS_IMETHOD ResetAnimation() override;
-  NS_IMETHOD_(float) GetFrameIndex(uint32_t aWhichFrame) override;
-
-protected:
-  explicit FrozenImage(Image* aImage) : ImageWrapper(aImage) { }
-  virtual ~FrozenImage() { }
-
-private:
-  friend class ImageOps;
-};
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_FrozenImage_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/ICOFileHeaders.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/ICOFileHeaders.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/ICOFileHeaders.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/ICOFileHeaders.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-#ifndef mozilla_image_src_ICOFileHeaders_h
-#define mozilla_image_src_ICOFileHeaders_h
-
-namespace mozilla {
-namespace image {
-
-#define ICONFILEHEADERSIZE 6
-#define ICODIRENTRYSIZE 16
-#define PNGSIGNATURESIZE 8
-#define BMPFILEHEADERSIZE 14
-
-/**
- * The header that comes right at the start of an icon file. (This
- * corresponds to the Windows ICONDIR structure.)
- */
-struct IconFileHeader
-{
-  /**
-   * Must be set to 0;
-   */
-  uint16_t   mReserved;
-  /**
-   * 1 for icon (.ICO) image (or 2 for cursor (.CUR) image (icon with the
-   * addition of a hotspot), but we don't support cursor).
-   */
-  uint16_t   mType;
-  /**
-   * The number of BMP/PNG images contained in the icon file.
-   */
-  uint16_t   mCount;
-};
-
-/**
- * For each BMP/PNG image that the icon file contains there must be a
- * corresponding icon dir entry. (This corresponds to the Windows
- * ICONDIRENTRY structure.) These entries are encoded directly after the
- * IconFileHeader.
- */
-struct IconDirEntry
-{
-  uint8_t   mWidth;
-  uint8_t   mHeight;
-  /**
-   * The number of colors in the color palette of the BMP/PNG that this dir
-   * entry corresponds to, or 0 if the image does not use a color palette.
-   */
-  uint8_t   mColorCount;
-  /**
-   * Should be set to 0.
-   */
-  uint8_t   mReserved;
-  union {
-    uint16_t mPlanes;   // ICO
-    uint16_t mXHotspot; // CUR
-  };
-  union {
-    uint16_t mBitCount; // ICO (bits per pixel)
-    uint16_t mYHotspot; // CUR
-  };
-  /**
-   * "bytes in resource" is the length of the encoded BMP/PNG that this dir
-   * entry corresponds to.
-   */
-  uint32_t  mBytesInRes;
-  /**
-   * The offset of the start of the encoded BMP/PNG that this dir entry
-   * corresponds to (from the start of the icon file).
-   */
-  uint32_t  mImageOffset;
-};
-
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_ICOFileHeaders_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/Image.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/Image.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/Image.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/Image.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,198 +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 "nsMimeTypes.h"
-
-#include "Image.h"
-#include "nsRefreshDriver.h"
-#include "mozilla/TimeStamp.h"
-
-namespace mozilla {
-namespace image {
-
-///////////////////////////////////////////////////////////////////////////////
-// Memory Reporting
-///////////////////////////////////////////////////////////////////////////////
-
-ImageMemoryCounter::ImageMemoryCounter(Image* aImage,
-                                       MallocSizeOf aMallocSizeOf,
-                                       bool aIsUsed)
-  : mIsUsed(aIsUsed)
-{
-  MOZ_ASSERT(aImage);
-
-  // Extract metadata about the image.
-  nsRefPtr<ImageURL> imageURL(aImage->GetURI());
-  if (imageURL) {
-    imageURL->GetSpec(mURI);
-  }
-
-  int32_t width = 0;
-  int32_t height = 0;
-  aImage->GetWidth(&width);
-  aImage->GetHeight(&height);
-  mIntrinsicSize.SizeTo(width, height);
-
-  mType = aImage->GetType();
-
-  // Populate memory counters for source and decoded data.
-  mValues.SetSource(aImage->SizeOfSourceWithComputedFallback(aMallocSizeOf));
-  aImage->CollectSizeOfSurfaces(mSurfaces, aMallocSizeOf);
-
-  // Compute totals.
-  for (const SurfaceMemoryCounter& surfaceCounter : mSurfaces) {
-    mValues += surfaceCounter.Values();
-  }
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-// Image Base Types
-///////////////////////////////////////////////////////////////////////////////
-
-// Constructor
-ImageResource::ImageResource(ImageURL* aURI) :
-  mURI(aURI),
-  mInnerWindowId(0),
-  mAnimationConsumers(0),
-  mAnimationMode(kNormalAnimMode),
-  mInitialized(false),
-  mAnimating(false),
-  mError(false)
-{ }
-
-ImageResource::~ImageResource()
-{
-  // Ask our ProgressTracker to drop its weak reference to us.
-  mProgressTracker->ResetImage();
-}
-
-// Translates a mimetype into a concrete decoder
-Image::eDecoderType
-Image::GetDecoderType(const char* aMimeType)
-{
-  // By default we don't know
-  eDecoderType rv = eDecoderType_unknown;
-
-  // PNG
-  if (!strcmp(aMimeType, IMAGE_PNG)) {
-    rv = eDecoderType_png;
-
-  } else if (!strcmp(aMimeType, IMAGE_X_PNG)) {
-    rv = eDecoderType_png;
-
-  // GIF
-  } else if (!strcmp(aMimeType, IMAGE_GIF)) {
-    rv = eDecoderType_gif;
-
-  // JPEG
-  } else if (!strcmp(aMimeType, IMAGE_JPEG)) {
-    rv = eDecoderType_jpeg;
-  } else if (!strcmp(aMimeType, IMAGE_PJPEG)) {
-    rv = eDecoderType_jpeg;
-  } else if (!strcmp(aMimeType, IMAGE_JPG)) {
-    rv = eDecoderType_jpeg;
-
-  // BMP
-  } else if (!strcmp(aMimeType, IMAGE_BMP)) {
-    rv = eDecoderType_bmp;
-  } else if (!strcmp(aMimeType, IMAGE_BMP_MS)) {
-    rv = eDecoderType_bmp;
-
-  // ICO
-  } else if (!strcmp(aMimeType, IMAGE_ICO)) {
-    rv = eDecoderType_ico;
-  } else if (!strcmp(aMimeType, IMAGE_ICO_MS)) {
-    rv = eDecoderType_ico;
-
-  // Icon
-  } else if (!strcmp(aMimeType, IMAGE_ICON_MS)) {
-    rv = eDecoderType_icon;
-  }
-
-  return rv;
-}
-
-void
-ImageResource::IncrementAnimationConsumers()
-{
-  MOZ_ASSERT(NS_IsMainThread(), "Main thread only to encourage serialization "
-                                "with DecrementAnimationConsumers");
-  mAnimationConsumers++;
-}
-
-void
-ImageResource::DecrementAnimationConsumers()
-{
-  MOZ_ASSERT(NS_IsMainThread(), "Main thread only to encourage serialization "
-                                "with IncrementAnimationConsumers");
-  MOZ_ASSERT(mAnimationConsumers >= 1,
-             "Invalid no. of animation consumers!");
-  mAnimationConsumers--;
-}
-
-nsresult
-ImageResource::GetAnimationModeInternal(uint16_t* aAnimationMode)
-{
-  if (mError) {
-    return NS_ERROR_FAILURE;
-  }
-
-  NS_ENSURE_ARG_POINTER(aAnimationMode);
-
-  *aAnimationMode = mAnimationMode;
-  return NS_OK;
-}
-
-nsresult
-ImageResource::SetAnimationModeInternal(uint16_t aAnimationMode)
-{
-  if (mError) {
-    return NS_ERROR_FAILURE;
-  }
-
-  NS_ASSERTION(aAnimationMode == kNormalAnimMode ||
-               aAnimationMode == kDontAnimMode ||
-               aAnimationMode == kLoopOnceAnimMode,
-               "Wrong Animation Mode is being set!");
-
-  mAnimationMode = aAnimationMode;
-
-  return NS_OK;
-}
-
-bool
-ImageResource::HadRecentRefresh(const TimeStamp& aTime)
-{
-  // Our threshold for "recent" is 1/2 of the default refresh-driver interval.
-  // This ensures that we allow for frame rates at least as fast as the
-  // refresh driver's default rate.
-  static TimeDuration recentThreshold =
-      TimeDuration::FromMilliseconds(nsRefreshDriver::DefaultInterval() / 2.0);
-
-  if (!mLastRefreshTime.IsNull() &&
-      aTime - mLastRefreshTime < recentThreshold) {
-    return true;
-  }
-
-  // else, we can proceed with a refresh.
-  // But first, update our last refresh time:
-  mLastRefreshTime = aTime;
-  return false;
-}
-
-void
-ImageResource::EvaluateAnimation()
-{
-  if (!mAnimating && ShouldAnimate()) {
-    nsresult rv = StartAnimation();
-    mAnimating = NS_SUCCEEDED(rv);
-  } else if (mAnimating && !ShouldAnimate()) {
-    StopAnimation();
-  }
-}
-
-} // namespace image
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/ImageFactory.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/ImageFactory.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/ImageFactory.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/ImageFactory.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,316 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include <algorithm>
-
-#include "mozilla/Likely.h"
-
-#include "nsIHttpChannel.h"
-#include "nsIFileChannel.h"
-#include "nsIFile.h"
-#include "nsMimeTypes.h"
-#include "nsIRequest.h"
-
-#include "MultipartImage.h"
-#include "RasterImage.h"
-#include "VectorImage.h"
-#include "Image.h"
-#include "nsMediaFragmentURIParser.h"
-#include "nsContentUtils.h"
-#include "nsIScriptSecurityManager.h"
-
-#include "ImageFactory.h"
-#include "gfxPrefs.h"
-
-namespace mozilla {
-namespace image {
-
-/*static*/ void
-ImageFactory::Initialize()
-{ }
-
-static bool
-ShouldDownscaleDuringDecode(const nsCString& aMimeType)
-{
-  return aMimeType.EqualsLiteral(IMAGE_JPEG) ||
-         aMimeType.EqualsLiteral(IMAGE_JPG) ||
-         aMimeType.EqualsLiteral(IMAGE_PJPEG);
-}
-
-static uint32_t
-ComputeImageFlags(ImageURL* uri, const nsCString& aMimeType, bool isMultiPart)
-{
-  nsresult rv;
-
-  // We default to the static globals.
-  bool isDiscardable = gfxPrefs::ImageMemDiscardable();
-  bool doDecodeOnlyOnDraw = gfxPrefs::ImageDecodeOnlyOnDrawEnabled() &&
-                            gfxPrefs::AsyncPanZoomEnabled();
-  bool doDecodeImmediately = gfxPrefs::ImageDecodeImmediatelyEnabled();
-  bool doDownscaleDuringDecode = gfxPrefs::ImageDownscaleDuringDecodeEnabled();
-
-  // We want UI to be as snappy as possible and not to flicker. Disable
-  // discarding and decode-only-on-draw for chrome URLS.
-  bool isChrome = false;
-  rv = uri->SchemeIs("chrome", &isChrome);
-  if (NS_SUCCEEDED(rv) && isChrome) {
-    isDiscardable = doDecodeOnlyOnDraw = false;
-  }
-
-  // We don't want resources like the "loading" icon to be discardable or
-  // decode-only-on-draw either.
-  bool isResource = false;
-  rv = uri->SchemeIs("resource", &isResource);
-  if (NS_SUCCEEDED(rv) && isResource) {
-    isDiscardable = doDecodeOnlyOnDraw = false;
-  }
-
-  // Downscale-during-decode and decode-only-on-draw are only enabled for
-  // certain content types.
-  if ((doDownscaleDuringDecode || doDecodeOnlyOnDraw) &&
-      !ShouldDownscaleDuringDecode(aMimeType)) {
-    doDownscaleDuringDecode = false;
-    doDecodeOnlyOnDraw = false;
-  }
-
-  // If we're decoding immediately, disable decode-only-on-draw.
-  if (doDecodeImmediately) {
-    doDecodeOnlyOnDraw = false;
-  }
-
-  // For multipart/x-mixed-replace, we basically want a direct channel to the
-  // decoder. Disable everything for this case.
-  if (isMultiPart) {
-    isDiscardable = doDecodeOnlyOnDraw = doDownscaleDuringDecode = false;
-  }
-
-  // We have all the information we need.
-  uint32_t imageFlags = Image::INIT_FLAG_NONE;
-  if (isDiscardable) {
-    imageFlags |= Image::INIT_FLAG_DISCARDABLE;
-  }
-  if (doDecodeOnlyOnDraw) {
-    imageFlags |= Image::INIT_FLAG_DECODE_ONLY_ON_DRAW;
-  }
-  if (doDecodeImmediately) {
-    imageFlags |= Image::INIT_FLAG_DECODE_IMMEDIATELY;
-  }
-  if (isMultiPart) {
-    imageFlags |= Image::INIT_FLAG_TRANSIENT;
-  }
-  if (doDownscaleDuringDecode) {
-    imageFlags |= Image::INIT_FLAG_DOWNSCALE_DURING_DECODE;
-  }
-
-  return imageFlags;
-}
-
-/* static */ already_AddRefed<Image>
-ImageFactory::CreateImage(nsIRequest* aRequest,
-                          ProgressTracker* aProgressTracker,
-                          const nsCString& aMimeType,
-                          ImageURL* aURI,
-                          bool aIsMultiPart,
-                          uint32_t aInnerWindowId)
-{
-  MOZ_ASSERT(gfxPrefs::SingletonExists(),
-             "Pref observers should have been initialized already");
-
-  // Compute the image's initialization flags.
-  uint32_t imageFlags = ComputeImageFlags(aURI, aMimeType, aIsMultiPart);
-
-  // Select the type of image to create based on MIME type.
-  if (aMimeType.EqualsLiteral(IMAGE_SVG_XML)) {
-    return CreateVectorImage(aRequest, aProgressTracker, aMimeType,
-                             aURI, imageFlags, aInnerWindowId);
-  } else {
-    return CreateRasterImage(aRequest, aProgressTracker, aMimeType,
-                             aURI, imageFlags, aInnerWindowId);
-  }
-}
-
-// Marks an image as having an error before returning it. Used with macros like
-// NS_ENSURE_SUCCESS, since we guarantee to always return an image even if an
-// error occurs, but callers need to be able to tell that this happened.
-template <typename T>
-static already_AddRefed<Image>
-BadImage(nsRefPtr<T>& image)
-{
-  image->SetHasError();
-  return image.forget();
-}
-
-/* static */ already_AddRefed<Image>
-ImageFactory::CreateAnonymousImage(const nsCString& aMimeType)
-{
-  nsresult rv;
-
-  nsRefPtr<RasterImage> newImage = new RasterImage();
-
-  nsRefPtr<ProgressTracker> newTracker = new ProgressTracker();
-  newTracker->SetImage(newImage);
-  newImage->SetProgressTracker(newTracker);
-
-  rv = newImage->Init(aMimeType.get(), Image::INIT_FLAG_NONE);
-  NS_ENSURE_SUCCESS(rv, BadImage(newImage));
-
-  return newImage.forget();
-}
-
-/* static */ already_AddRefed<MultipartImage>
-ImageFactory::CreateMultipartImage(Image* aFirstPart,
-                                   ProgressTracker* aProgressTracker)
-{
-  MOZ_ASSERT(aFirstPart);
-  MOZ_ASSERT(aProgressTracker);
-
-  nsRefPtr<MultipartImage> newImage = new MultipartImage(aFirstPart);
-  aProgressTracker->SetImage(newImage);
-  newImage->SetProgressTracker(aProgressTracker);
-
-  newImage->Init();
-
-  return newImage.forget();
-}
-
-int32_t
-SaturateToInt32(int64_t val)
-{
-  if (val > INT_MAX) {
-    return INT_MAX;
-  }
-  if (val < INT_MIN) {
-    return INT_MIN;
-  }
-
-  return static_cast<int32_t>(val);
-}
-
-uint32_t
-GetContentSize(nsIRequest* aRequest)
-{
-  nsCOMPtr<nsIChannel> channel(do_QueryInterface(aRequest));
-  if (channel) {
-    int64_t size;
-    nsresult rv = channel->GetContentLength(&size);
-    if (NS_SUCCEEDED(rv)) {
-      return std::max(SaturateToInt32(size), 0);
-    }
-  }
-
-  // Use the file size as a size hint for file channels.
-  nsCOMPtr<nsIFileChannel> fileChannel(do_QueryInterface(aRequest));
-  if (fileChannel) {
-    nsCOMPtr<nsIFile> file;
-    nsresult rv = fileChannel->GetFile(getter_AddRefs(file));
-    if (NS_SUCCEEDED(rv)) {
-      int64_t filesize;
-      rv = file->GetFileSize(&filesize);
-      if (NS_SUCCEEDED(rv)) {
-        return std::max(SaturateToInt32(filesize), 0);
-      }
-    }
-  }
-
-  // Fallback - neither http nor file. We'll use dynamic allocation.
-  return 0;
-}
-
-/* static */ already_AddRefed<Image>
-ImageFactory::CreateRasterImage(nsIRequest* aRequest,
-                                ProgressTracker* aProgressTracker,
-                                const nsCString& aMimeType,
-                                ImageURL* aURI,
-                                uint32_t aImageFlags,
-                                uint32_t aInnerWindowId)
-{
-  MOZ_ASSERT(aProgressTracker);
-
-  nsresult rv;
-
-  nsRefPtr<RasterImage> newImage = new RasterImage(aURI);
-  aProgressTracker->SetImage(newImage);
-  newImage->SetProgressTracker(aProgressTracker);
-
-  rv = newImage->Init(aMimeType.get(), aImageFlags);
-  NS_ENSURE_SUCCESS(rv, BadImage(newImage));
-
-  newImage->SetInnerWindowID(aInnerWindowId);
-
-  uint32_t len = GetContentSize(aRequest);
-
-  // Pass anything usable on so that the RasterImage can preallocate
-  // its source buffer.
-  if (len > 0) {
-    // Bound by something reasonable
-    uint32_t sizeHint = std::min<uint32_t>(len, 20000000);
-    rv = newImage->SetSourceSizeHint(sizeHint);
-    if (NS_FAILED(rv)) {
-      // Flush memory, try to get some back, and try again.
-      rv = nsMemory::HeapMinimize(true);
-      nsresult rv2 = newImage->SetSourceSizeHint(sizeHint);
-      // If we've still failed at this point, things are going downhill.
-      if (NS_FAILED(rv) || NS_FAILED(rv2)) {
-        NS_WARNING("About to hit OOM in imagelib!");
-      }
-    }
-  }
-
-  nsAutoCString ref;
-  aURI->GetRef(ref);
-  net::nsMediaFragmentURIParser parser(ref);
-  if (parser.HasResolution()) {
-    newImage->SetRequestedResolution(parser.GetResolution());
-  }
-
-  if (parser.HasSampleSize()) {
-      /* Get our principal */
-      nsCOMPtr<nsIChannel> chan(do_QueryInterface(aRequest));
-      nsCOMPtr<nsIPrincipal> principal;
-      if (chan) {
-        nsContentUtils::GetSecurityManager()
-          ->GetChannelResultPrincipal(chan, getter_AddRefs(principal));
-      }
-
-      if ((principal &&
-           principal->GetAppStatus() == nsIPrincipal::APP_STATUS_CERTIFIED) ||
-          gfxPrefs::ImageMozSampleSizeEnabled()) {
-        newImage->SetRequestedSampleSize(parser.GetSampleSize());
-      }
-  }
-
-  return newImage.forget();
-}
-
-/* static */ already_AddRefed<Image>
-ImageFactory::CreateVectorImage(nsIRequest* aRequest,
-                                ProgressTracker* aProgressTracker,
-                                const nsCString& aMimeType,
-                                ImageURL* aURI,
-                                uint32_t aImageFlags,
-                                uint32_t aInnerWindowId)
-{
-  MOZ_ASSERT(aProgressTracker);
-
-  nsresult rv;
-
-  nsRefPtr<VectorImage> newImage = new VectorImage(aURI);
-  aProgressTracker->SetImage(newImage);
-  newImage->SetProgressTracker(aProgressTracker);
-
-  rv = newImage->Init(aMimeType.get(), aImageFlags);
-  NS_ENSURE_SUCCESS(rv, BadImage(newImage));
-
-  newImage->SetInnerWindowID(aInnerWindowId);
-
-  rv = newImage->OnStartRequest(aRequest, nullptr);
-  NS_ENSURE_SUCCESS(rv, BadImage(newImage));
-
-  return newImage.forget();
-}
-
-} // namespace image
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/ImageFactory.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/ImageFactory.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/ImageFactory.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/ImageFactory.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +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_image_src_ImageFactory_h
-#define mozilla_image_src_ImageFactory_h
-
-#include "nsCOMPtr.h"
-#include "nsProxyRelease.h"
-
-class nsCString;
-class nsIRequest;
-
-namespace mozilla {
-namespace image {
-
-class Image;
-class ImageURL;
-class MultipartImage;
-class ProgressTracker;
-
-class ImageFactory
-{
-public:
-  /**
-   * Registers vars with Preferences. Should only be called on the main thread.
-   */
-  static void Initialize();
-
-  /**
-   * Creates a new image with the given properties.
-   * Can be called on or off the main thread.
-   *
-   * @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,
-                                             ProgressTracker* aProgressTracker,
-                                             const nsCString& aMimeType,
-                                             ImageURL* aURI,
-                                             bool aIsMultiPart,
-                                             uint32_t aInnerWindowId);
-  /**
-   * Creates a new image which isn't associated with a URI or loaded through
-   * the usual image loading mechanism.
-   *
-   * @param aMimeType      The mimetype of the image.
-   */
-  static already_AddRefed<Image>
-  CreateAnonymousImage(const nsCString& aMimeType);
-
-  /**
-   * Creates a new multipart/x-mixed-replace image wrapper, and initializes it
-   * with the first part. Subsequent parts should be passed to the existing
-   * MultipartImage via MultipartImage::BeginTransitionToPart().
-   *
-   * @param aFirstPart       An image containing the first part of the multipart
-   *                         stream.
-   * @param aProgressTracker A progress tracker for the multipart image.
-   */
-  static already_AddRefed<MultipartImage>
-  CreateMultipartImage(Image* aFirstPart, ProgressTracker* aProgressTracker);
-
-private:
-  // Factory functions that create specific types of image containers.
-  static already_AddRefed<Image>
-  CreateRasterImage(nsIRequest* aRequest,
-                    ProgressTracker* aProgressTracker,
-                    const nsCString& aMimeType,
-                    ImageURL* aURI,
-                    uint32_t aImageFlags,
-                    uint32_t aInnerWindowId);
-
-  static already_AddRefed<Image>
-  CreateVectorImage(nsIRequest* aRequest,
-                    ProgressTracker* aProgressTracker,
-                    const nsCString& aMimeType,
-                    ImageURL* aURI,
-                    uint32_t aImageFlags,
-                    uint32_t aInnerWindowId);
-
-  // This is a static factory class, so disallow instantiation.
-  virtual ~ImageFactory() = 0;
-};
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_ImageFactory_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/Image.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/Image.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/Image.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/Image.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,342 +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_image_src_Image_h
-#define mozilla_image_src_Image_h
-
-#include "mozilla/MemoryReporting.h"
-#include "mozilla/TimeStamp.h"
-#include "gfx2DGlue.h"                // for gfxMemoryLocation
-#include "imgIContainer.h"
-#include "ImageURL.h"
-#include "nsStringFwd.h"
-#include "ProgressTracker.h"
-#include "SurfaceCache.h"
-
-class nsIRequest;
-class nsIInputStream;
-
-namespace mozilla {
-namespace image {
-
-class Image;
-
-///////////////////////////////////////////////////////////////////////////////
-// Memory Reporting
-///////////////////////////////////////////////////////////////////////////////
-
-struct MemoryCounter
-{
-  MemoryCounter()
-    : mSource(0)
-    , mDecodedHeap(0)
-    , mDecodedNonHeap(0)
-  { }
-
-  void SetSource(size_t aCount) { mSource = aCount; }
-  size_t Source() const { return mSource; }
-  void SetDecodedHeap(size_t aCount) { mDecodedHeap = aCount; }
-  size_t DecodedHeap() const { return mDecodedHeap; }
-  void SetDecodedNonHeap(size_t aCount) { mDecodedNonHeap = aCount; }
-  size_t DecodedNonHeap() const { return mDecodedNonHeap; }
-
-  MemoryCounter& operator+=(const MemoryCounter& aOther)
-  {
-    mSource += aOther.mSource;
-    mDecodedHeap += aOther.mDecodedHeap;
-    mDecodedNonHeap += aOther.mDecodedNonHeap;
-    return *this;
-  }
-
-private:
-  size_t mSource;
-  size_t mDecodedHeap;
-  size_t mDecodedNonHeap;
-};
-
-enum class SurfaceMemoryCounterType
-{
-  NORMAL,
-  COMPOSITING,
-  COMPOSITING_PREV
-};
-
-struct SurfaceMemoryCounter
-{
-  SurfaceMemoryCounter(const SurfaceKey& aKey,
-                       bool aIsLocked,
-                       SurfaceMemoryCounterType aType =
-                         SurfaceMemoryCounterType::NORMAL)
-    : mKey(aKey)
-    , mType(aType)
-    , mIsLocked(aIsLocked)
-  { }
-
-  const SurfaceKey& Key() const { return mKey; }
-  Maybe<gfx::IntSize>& SubframeSize() { return mSubframeSize; }
-  const Maybe<gfx::IntSize>& SubframeSize() const { return mSubframeSize; }
-  MemoryCounter& Values() { return mValues; }
-  const MemoryCounter& Values() const { return mValues; }
-  SurfaceMemoryCounterType Type() const { return mType; }
-  bool IsLocked() const { return mIsLocked; }
-
-private:
-  const SurfaceKey mKey;
-  Maybe<gfx::IntSize> mSubframeSize;
-  MemoryCounter mValues;
-  const SurfaceMemoryCounterType mType;
-  const bool mIsLocked;
-};
-
-struct ImageMemoryCounter
-{
-  ImageMemoryCounter(Image* aImage,
-                     MallocSizeOf aMallocSizeOf,
-                     bool aIsUsed);
-
-  nsCString& URI() { return mURI; }
-  const nsCString& URI() const { return mURI; }
-  const nsTArray<SurfaceMemoryCounter>& Surfaces() const { return mSurfaces; }
-  const gfx::IntSize IntrinsicSize() const { return mIntrinsicSize; }
-  const MemoryCounter& Values() const { return mValues; }
-  uint16_t Type() const { return mType; }
-  bool IsUsed() const { return mIsUsed; }
-
-  bool IsNotable() const
-  {
-    const size_t NotableThreshold = 16 * 1024;
-    size_t total = mValues.Source() + mValues.DecodedHeap()
-                                    + mValues.DecodedNonHeap();
-    return total >= NotableThreshold;
-  }
-
-private:
-  nsCString mURI;
-  nsTArray<SurfaceMemoryCounter> mSurfaces;
-  gfx::IntSize mIntrinsicSize;
-  MemoryCounter mValues;
-  uint16_t mType;
-  const bool mIsUsed;
-};
-
-
-///////////////////////////////////////////////////////////////////////////////
-// Image Base Types
-///////////////////////////////////////////////////////////////////////////////
-
-class Image : public imgIContainer
-{
-public:
-  // Mimetype translation
-  enum eDecoderType {
-    eDecoderType_png     = 0,
-    eDecoderType_gif     = 1,
-    eDecoderType_jpeg    = 2,
-    eDecoderType_bmp     = 3,
-    eDecoderType_ico     = 4,
-    eDecoderType_icon    = 5,
-    eDecoderType_unknown = 6
-  };
-  static eDecoderType GetDecoderType(const char* aMimeType);
-
-  /**
-   * Flags for Image initialization.
-   *
-   * Meanings:
-   *
-   * INIT_FLAG_NONE: Lack of flags
-   *
-   * INIT_FLAG_DISCARDABLE: The container should be discardable
-   *
-   * INIT_FLAG_DECODE_ONLY_ON_DRAW: The container should decode on draw rather
-   * than possibly being speculatively decoded earlier.
-   *
-   * INIT_FLAG_DECODE_IMMEDIATELY: The container should decode as soon as
-   * possible, regardless of what our heuristics say.
-   *
-   * INIT_FLAG_TRANSIENT: The container is likely to exist for only a short time
-   * before being destroyed. (For example, containers for
-   * multipart/x-mixed-replace image parts fall into this category.) If this
-   * flag is set, INIT_FLAG_DISCARDABLE and INIT_FLAG_DECODE_ONLY_ON_DRAW must
-   * not be set.
-   *
-   * INIT_FLAG_DOWNSCALE_DURING_DECODE: The container should attempt to
-   * downscale images during decoding instead of decoding them to their
-   * intrinsic size.
-   */
-  static const uint32_t INIT_FLAG_NONE                     = 0x0;
-  static const uint32_t INIT_FLAG_DISCARDABLE              = 0x1;
-  static const uint32_t INIT_FLAG_DECODE_ONLY_ON_DRAW      = 0x2;
-  static const uint32_t INIT_FLAG_DECODE_IMMEDIATELY       = 0x4;
-  static const uint32_t INIT_FLAG_TRANSIENT                = 0x8;
-  static const uint32_t INIT_FLAG_DOWNSCALE_DURING_DECODE  = 0x10;
-
-  virtual already_AddRefed<ProgressTracker> GetProgressTracker() = 0;
-  virtual void SetProgressTracker(ProgressTracker* aProgressTracker) {}
-
-  /**
-   * The size, in bytes, occupied by the compressed source data of the image.
-   * If MallocSizeOf does not work on this platform, uses a fallback approach to
-   * ensure that something reasonable is always returned.
-   */
-  virtual size_t
-    SizeOfSourceWithComputedFallback(MallocSizeOf aMallocSizeOf) const = 0;
-
-  /**
-   * Collect an accounting of the memory occupied by the image's surfaces (which
-   * together make up its decoded data). Each surface is recorded as a separate
-   * SurfaceMemoryCounter, stored in @aCounters.
-   */
-  virtual void CollectSizeOfSurfaces(nsTArray<SurfaceMemoryCounter>& aCounters,
-                                     MallocSizeOf aMallocSizeOf) const = 0;
-
-  virtual void IncrementAnimationConsumers() = 0;
-  virtual void DecrementAnimationConsumers() = 0;
-#ifdef DEBUG
-  virtual uint32_t GetAnimationConsumers() = 0;
-#endif
-
-  /**
-   * Called from OnDataAvailable when the stream associated with the image has
-   * received new image data. The arguments are the same as OnDataAvailable's,
-   * but by separating this functionality into a different method we don't
-   * interfere with subclasses which wish to implement nsIStreamListener.
-   *
-   * Images should not do anything that could send out notifications until they
-   * have received their first OnImageDataAvailable notification; in
-   * particular, this means that instantiating decoders should be deferred
-   * until OnImageDataAvailable is called.
-   */
-  virtual nsresult OnImageDataAvailable(nsIRequest* aRequest,
-                                        nsISupports* aContext,
-                                        nsIInputStream* aInStr,
-                                        uint64_t aSourceOffset,
-                                        uint32_t aCount) = 0;
-
-  /**
-   * Called from OnStopRequest when the image's underlying request completes.
-   *
-   * @param aRequest  The completed request.
-   * @param aContext  Context from Necko's OnStopRequest.
-   * @param aStatus   A success or failure code.
-   * @param aLastPart Whether this is the final part of the underlying request.
-   */
-  virtual nsresult OnImageDataComplete(nsIRequest* aRequest,
-                                       nsISupports* aContext,
-                                       nsresult aStatus,
-                                       bool aLastPart) = 0;
-
-  /**
-   * Called when the SurfaceCache discards a persistent surface belonging to
-   * this image.
-   */
-  virtual void OnSurfaceDiscarded() = 0;
-
-  virtual void SetInnerWindowID(uint64_t aInnerWindowId) = 0;
-  virtual uint64_t InnerWindowID() const = 0;
-
-  virtual bool HasError() = 0;
-  virtual void SetHasError() = 0;
-
-  virtual ImageURL* GetURI() = 0;
-};
-
-class ImageResource : public Image
-{
-public:
-  already_AddRefed<ProgressTracker> GetProgressTracker() override
-  {
-    nsRefPtr<ProgressTracker> progressTracker = mProgressTracker;
-    MOZ_ASSERT(progressTracker);
-    return progressTracker.forget();
-  }
-
-  void SetProgressTracker(
-                       ProgressTracker* aProgressTracker) override final
-  {
-    MOZ_ASSERT(aProgressTracker);
-    MOZ_ASSERT(!mProgressTracker);
-    mProgressTracker = aProgressTracker;
-  }
-
-  virtual void IncrementAnimationConsumers() override;
-  virtual void DecrementAnimationConsumers() override;
-#ifdef DEBUG
-  virtual uint32_t GetAnimationConsumers() override
-  {
-    return mAnimationConsumers;
-  }
-#endif
-
-  virtual void OnSurfaceDiscarded() override { }
-
-  virtual void SetInnerWindowID(uint64_t aInnerWindowId) override
-  {
-    mInnerWindowId = aInnerWindowId;
-  }
-  virtual uint64_t InnerWindowID() const override { return mInnerWindowId; }
-
-  virtual bool HasError() override    { return mError; }
-  virtual void SetHasError() override { mError = true; }
-
-  /*
-   * Returns a non-AddRefed pointer to the URI associated with this image.
-   * Illegal to use off-main-thread.
-   */
-  virtual ImageURL* GetURI() override { return mURI.get(); }
-
-protected:
-  explicit ImageResource(ImageURL* aURI);
-  ~ImageResource();
-
-  // Shared functionality for implementors of imgIContainer. Every
-  // implementation of attribute animationMode should forward here.
-  nsresult GetAnimationModeInternal(uint16_t* aAnimationMode);
-  nsresult SetAnimationModeInternal(uint16_t aAnimationMode);
-
-  /**
-   * Helper for RequestRefresh.
-   *
-   * If we've had a "recent" refresh (i.e. if this image is being used in
-   * multiple documents & some other document *just* called RequestRefresh() on
-   * this image with a timestamp close to aTime), this method returns true.
-   *
-   * Otherwise, this method updates mLastRefreshTime to aTime & returns false.
-   */
-  bool HadRecentRefresh(const TimeStamp& aTime);
-
-  /**
-   * Decides whether animation should or should not be happening,
-   * and makes sure the right thing is being done.
-   */
-  virtual void EvaluateAnimation();
-
-  /**
-   * Extended by child classes, if they have additional
-   * conditions for being able to animate.
-   */
-  virtual bool ShouldAnimate() {
-    return mAnimationConsumers > 0 && mAnimationMode != kDontAnimMode;
-  }
-
-  virtual nsresult StartAnimation() = 0;
-  virtual nsresult StopAnimation() = 0;
-
-  // Member data shared by all implementations of this abstract class
-  nsRefPtr<ProgressTracker>     mProgressTracker;
-  nsRefPtr<ImageURL>            mURI;
-  TimeStamp                     mLastRefreshTime;
-  uint64_t                      mInnerWindowId;
-  uint32_t                      mAnimationConsumers;
-  uint16_t                      mAnimationMode; // Enum values in imgIContainer
-  bool                          mInitialized:1; // Have we been initalized?
-  bool                          mAnimating:1;   // Are we currently animating?
-  bool                          mError:1;       // Error handling
-};
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_Image_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/ImageMetadata.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/ImageMetadata.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/ImageMetadata.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/ImageMetadata.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +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 "ImageMetadata.h"
-
-#include "RasterImage.h"
-#include "nsComponentManagerUtils.h"
-#include "nsISupportsPrimitives.h"
-#include "nsXPCOMCID.h"
-
-namespace mozilla {
-namespace image {
-
-void
-ImageMetadata::SetOnImage(RasterImage* image)
-{
-  if (mHotspotX != -1 && mHotspotY != -1) {
-    nsCOMPtr<nsISupportsPRUint32> intwrapx =
-      do_CreateInstance(NS_SUPPORTS_PRUINT32_CONTRACTID);
-    nsCOMPtr<nsISupportsPRUint32> intwrapy =
-      do_CreateInstance(NS_SUPPORTS_PRUINT32_CONTRACTID);
-    intwrapx->SetData(mHotspotX);
-    intwrapy->SetData(mHotspotY);
-    image->Set("hotspotX", intwrapx);
-    image->Set("hotspotY", intwrapy);
-  }
-
-  image->SetLoopCount(mLoopCount);
-}
-
-} // namespace image
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/ImageMetadata.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/ImageMetadata.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/ImageMetadata.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/ImageMetadata.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +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_image_src_ImageMetadata_h
-#define mozilla_image_src_ImageMetadata_h
-
-#include <stdint.h>
-#include "mozilla/Maybe.h"
-#include "nsSize.h"
-#include "Orientation.h"
-
-namespace mozilla {
-namespace image {
-
-class RasterImage;
-
-// The metadata about an image that decoders accumulate as they decode.
-class ImageMetadata
-{
-public:
-  ImageMetadata()
-    : mHotspotX(-1)
-    , mHotspotY(-1)
-    , mLoopCount(-1)
-  { }
-
-  // Set the metadata this object represents on an image.
-  void SetOnImage(RasterImage* image);
-
-  void SetHotspot(uint16_t hotspotx, uint16_t hotspoty)
-  {
-    mHotspotX = hotspotx;
-    mHotspotY = hotspoty;
-  }
-  void SetLoopCount(int32_t loopcount)
-  {
-    mLoopCount = loopcount;
-  }
-
-  void SetSize(int32_t width, int32_t height, Orientation orientation)
-  {
-    if (!HasSize()) {
-      mSize.emplace(nsIntSize(width, height));
-      mOrientation.emplace(orientation);
-    }
-  }
-
-  bool HasSize() const { return mSize.isSome(); }
-  bool HasOrientation() const { return mOrientation.isSome(); }
-
-  int32_t GetWidth() const { return mSize->width; }
-  int32_t GetHeight() const { return mSize->height; }
-  nsIntSize GetSize() const { return *mSize; }
-  Orientation GetOrientation() const { return *mOrientation; }
-
-private:
-  // The hotspot found on cursors, or -1 if none was found.
-  int32_t mHotspotX;
-  int32_t mHotspotY;
-
-  // The loop count for animated images, or -1 for infinite loop.
-  int32_t mLoopCount;
-
-  Maybe<nsIntSize> mSize;
-  Maybe<Orientation> mOrientation;
-};
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_ImageMetadata_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/ImageOps.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/ImageOps.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/ImageOps.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/ImageOps.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +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 "imgIContainer.h"
-#include "ClippedImage.h"
-#include "DynamicImage.h"
-#include "FrozenImage.h"
-#include "OrientedImage.h"
-#include "Image.h"
-
-#include "ImageOps.h"
-
-namespace mozilla {
-namespace image {
-
-/* static */ already_AddRefed<Image>
-ImageOps::Freeze(Image* aImage)
-{
-  nsRefPtr<Image> frozenImage = new FrozenImage(aImage);
-  return frozenImage.forget();
-}
-
-/* static */ already_AddRefed<imgIContainer>
-ImageOps::Freeze(imgIContainer* aImage)
-{
-  nsCOMPtr<imgIContainer> frozenImage =
-    new FrozenImage(static_cast<Image*>(aImage));
-  return frozenImage.forget();
-}
-
-/* static */ already_AddRefed<Image>
-ImageOps::Clip(Image* aImage, nsIntRect aClip)
-{
-  nsRefPtr<Image> clippedImage = new ClippedImage(aImage, aClip);
-  return clippedImage.forget();
-}
-
-/* static */ already_AddRefed<imgIContainer>
-ImageOps::Clip(imgIContainer* aImage, nsIntRect aClip)
-{
-  nsCOMPtr<imgIContainer> clippedImage =
-    new ClippedImage(static_cast<Image*>(aImage), aClip);
-  return clippedImage.forget();
-}
-
-/* static */ already_AddRefed<Image>
-ImageOps::Orient(Image* aImage, Orientation aOrientation)
-{
-  nsRefPtr<Image> orientedImage = new OrientedImage(aImage, aOrientation);
-  return orientedImage.forget();
-}
-
-/* static */ already_AddRefed<imgIContainer>
-ImageOps::Orient(imgIContainer* aImage, Orientation aOrientation)
-{
-  nsCOMPtr<imgIContainer> orientedImage =
-    new OrientedImage(static_cast<Image*>(aImage), aOrientation);
-  return orientedImage.forget();
-}
-
-/* static */ already_AddRefed<imgIContainer>
-ImageOps::CreateFromDrawable(gfxDrawable* aDrawable)
-{
-  nsCOMPtr<imgIContainer> drawableImage = new DynamicImage(aDrawable);
-  return drawableImage.forget();
-}
-
-} // namespace image
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/ImageOps.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/ImageOps.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/ImageOps.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/ImageOps.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +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_image_src_ImageOps_h
-#define mozilla_image_src_ImageOps_h
-
-#include "nsCOMPtr.h"
-#include "nsRect.h"
-
-class gfxDrawable;
-class imgIContainer;
-
-namespace mozilla {
-namespace image {
-
-class Image;
-struct Orientation;
-
-class ImageOps
-{
-public:
-  /**
-   * Creates a version of an existing image which does not animate and is frozen
-   * at the first frame.
-   *
-   * @param aImage         The existing image.
-   */
-  static already_AddRefed<Image> Freeze(Image* aImage);
-  static already_AddRefed<imgIContainer> Freeze(imgIContainer* aImage);
-
-  /**
-   * Creates a clipped version of an existing image. Animation is unaffected.
-   *
-   * @param aImage         The existing image.
-   * @param aClip          The rectangle to clip the image against.
-   */
-  static already_AddRefed<Image> Clip(Image* aImage, nsIntRect aClip);
-  static already_AddRefed<imgIContainer> Clip(imgIContainer* aImage,
-                                              nsIntRect aClip);
-
-  /**
-   * Creates a version of an existing image which is rotated and/or flipped to
-   * the specified orientation.
-   *
-   * @param aImage         The existing image.
-   * @param aOrientation   The desired orientation.
-   */
-  static already_AddRefed<Image> Orient(Image* aImage,
-                                        Orientation aOrientation);
-  static already_AddRefed<imgIContainer> Orient(imgIContainer* aImage,
-                                                Orientation aOrientation);
-
-  /**
-   * Creates an image from a gfxDrawable.
-   *
-   * @param aDrawable      The gfxDrawable.
-   */
-  static already_AddRefed<imgIContainer>
-  CreateFromDrawable(gfxDrawable* aDrawable);
-
-private:
-  // This is a static utility class, so disallow instantiation.
-  virtual ~ImageOps() = 0;
-};
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_ImageOps_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/ImageRegion.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/ImageRegion.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/ImageRegion.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/ImageRegion.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,158 +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_image_src_ImageRegion_h
-#define mozilla_image_src_ImageRegion_h
-
-#include "gfxRect.h"
-
-namespace mozilla {
-namespace image {
-
-/**
- * An axis-aligned rectangle in tiled image space, with an optional sampling
- * restriction rect. The drawing code ensures that if a sampling restriction
- * rect is present, any pixels sampled during the drawing process are found
- * within that rect.
- *
- * The sampling restriction rect exists primarily for callers which perform
- * pixel snapping. Other callers should generally use one of the Create()
- * overloads.
- */
-class ImageRegion
-{
-public:
-  static ImageRegion Empty()
-  {
-    return ImageRegion(gfxRect());
-  }
-
-  static ImageRegion Create(const gfxRect& aRect)
-  {
-    return ImageRegion(aRect);
-  }
-
-  static ImageRegion Create(const gfxSize& aSize)
-  {
-    return ImageRegion(gfxRect(0, 0, aSize.width, aSize.height));
-  }
-
-  static ImageRegion Create(const nsIntSize& aSize)
-  {
-    return ImageRegion(gfxRect(0, 0, aSize.width, aSize.height));
-  }
-
-  static ImageRegion CreateWithSamplingRestriction(const gfxRect& aRect,
-                                                   const gfxRect& aRestriction)
-  {
-    return ImageRegion(aRect, aRestriction);
-  }
-
-  bool IsRestricted() const { return mIsRestricted; }
-  const gfxRect& Rect() const { return mRect; }
-
-  const gfxRect& Restriction() const
-  {
-    MOZ_ASSERT(mIsRestricted);
-    return mRestriction;
-  }
-
-  bool RestrictionContains(const gfxRect& aRect) const
-  {
-    if (!mIsRestricted) {
-      return true;
-    }
-    return mRestriction.Contains(aRect);
-  }
-
-  ImageRegion Intersect(const gfxRect& aRect) const
-  {
-    if (mIsRestricted) {
-      return CreateWithSamplingRestriction(aRect.Intersect(mRect),
-                                           aRect.Intersect(mRestriction));
-    }
-    return Create(aRect.Intersect(mRect));
-  }
-
-  gfxRect IntersectAndRestrict(const gfxRect& aRect) const
-  {
-    gfxRect intersection = mRect.Intersect(aRect);
-    if (mIsRestricted) {
-      intersection = mRestriction.Intersect(intersection);
-    }
-    return intersection;
-  }
-
-  void MoveBy(gfxFloat dx, gfxFloat dy)
-  {
-    mRect.MoveBy(dx, dy);
-    if (mIsRestricted) {
-      mRestriction.MoveBy(dx, dy);
-    }
-  }
-
-  void Scale(gfxFloat sx, gfxFloat sy)
-  {
-    mRect.Scale(sx, sy);
-    if (mIsRestricted) {
-      mRestriction.Scale(sx, sy);
-    }
-  }
-
-  void TransformBy(const gfxMatrix& aMatrix)
-  {
-    mRect = aMatrix.Transform(mRect);
-    if (mIsRestricted) {
-      mRestriction = aMatrix.Transform(mRestriction);
-    }
-  }
-
-  void TransformBoundsBy(const gfxMatrix& aMatrix)
-  {
-    mRect = aMatrix.TransformBounds(mRect);
-    if (mIsRestricted) {
-      mRestriction = aMatrix.TransformBounds(mRestriction);
-    }
-  }
-
-  ImageRegion operator-(const gfxPoint& aPt) const
-  {
-    if (mIsRestricted) {
-      return CreateWithSamplingRestriction(mRect - aPt, mRestriction - aPt);
-    }
-    return Create(mRect - aPt);
-  }
-
-  ImageRegion operator+(const gfxPoint& aPt) const
-  {
-    if (mIsRestricted) {
-      return CreateWithSamplingRestriction(mRect + aPt, mRestriction + aPt);
-    }
-    return Create(mRect + aPt);
-  }
-
-  /* ImageRegion() : mIsRestricted(false) { } */
-
-private:
-  explicit ImageRegion(const gfxRect& aRect)
-    : mRect(aRect)
-    , mIsRestricted(false)
-  { }
-
-  ImageRegion(const gfxRect& aRect, const gfxRect& aRestriction)
-    : mRect(aRect)
-    , mRestriction(aRestriction)
-    , mIsRestricted(true)
-  { }
-
-  gfxRect mRect;
-  gfxRect mRestriction;
-  bool    mIsRestricted;
-};
-
-}  // namespace image
-}  // namespace mozilla
-
-#endif // mozilla_image_src_ImageRegion_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/ImageURL.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/ImageURL.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/ImageURL.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/ImageURL.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,93 +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_image_src_ImageURL_h
-#define mozilla_image_src_ImageURL_h
-
-#include "nsIURI.h"
-#include "MainThreadUtils.h"
-#include "nsNetUtil.h"
-
-namespace mozilla {
-namespace image {
-
-/** ImageURL
- *
- * nsStandardURL is not threadsafe, so this class is created to hold only the
- * necessary URL data required for image loading and decoding.
- *
- * Note: Although several APIs have the same or similar prototypes as those
- * found in nsIURI/nsStandardURL, the class does not implement nsIURI. This is
- * intentional; functionality is limited, and is only useful for imagelib code.
- * By not implementing nsIURI, external code cannot unintentionally be given an
- * nsIURI pointer with this limited class behind it; instead, conversion to a
- * fully implemented nsIURI is required (e.g. through NS_NewURI).
- */
-class ImageURL
-{
-public:
-  explicit ImageURL(nsIURI* aURI)
-  {
-    MOZ_ASSERT(NS_IsMainThread(), "Cannot use nsIURI off main thread!");
-    aURI->GetSpec(mSpec);
-    aURI->GetScheme(mScheme);
-    aURI->GetRef(mRef);
-  }
-
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(ImageURL)
-
-  nsresult GetSpec(nsACString& result)
-  {
-    result = mSpec;
-    return NS_OK;
-  }
-
-  nsresult GetScheme(nsACString& result)
-  {
-    result = mScheme;
-    return NS_OK;
-  }
-
-  nsresult SchemeIs(const char* scheme, bool* result)
-  {
-    NS_PRECONDITION(scheme, "scheme is null");
-    NS_PRECONDITION(result, "result is null");
-
-    *result = mScheme.Equals(scheme);
-    return NS_OK;
-  }
-
-  nsresult GetRef(nsACString& result)
-  {
-    result = mRef;
-    return NS_OK;
-  }
-
-  already_AddRefed<nsIURI> ToIURI()
-  {
-    MOZ_ASSERT(NS_IsMainThread(),
-               "Convert to nsIURI on main thread only; it is not threadsafe.");
-    nsCOMPtr<nsIURI> newURI;
-    NS_NewURI(getter_AddRefs(newURI), mSpec);
-    return newURI.forget();
-  }
-
-private:
-  // Since this is a basic storage class, no duplication of spec parsing is
-  // included in the functionality. Instead, the class depends upon the
-  // parsing implementation in the nsIURI class used in object construction.
-  // This means each field is stored separately, but since only a few are
-  // required, this small memory tradeoff for threadsafe usage should be ok.
-  nsAutoCString mSpec;
-  nsAutoCString mScheme;
-  nsAutoCString mRef;
-
-  ~ImageURL() { }
-};
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_ImageURL_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/ImageWrapper.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/ImageWrapper.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/ImageWrapper.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/ImageWrapper.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,306 +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 "ImageWrapper.h"
-#include "mozilla/gfx/2D.h"
-#include "mozilla/RefPtr.h"
-#include "Orientation.h"
-
-#include "mozilla/MemoryReporting.h"
-
-namespace mozilla {
-
-using gfx::DataSourceSurface;
-using gfx::SourceSurface;
-using layers::LayerManager;
-using layers::ImageContainer;
-
-namespace image {
-
-// Inherited methods from Image.
-
-already_AddRefed<ProgressTracker>
-ImageWrapper::GetProgressTracker()
-{
-  return mInnerImage->GetProgressTracker();
-}
-
-size_t
-ImageWrapper::SizeOfSourceWithComputedFallback(MallocSizeOf aMallocSizeOf) const
-{
-  return mInnerImage->SizeOfSourceWithComputedFallback(aMallocSizeOf);
-}
-
-void
-ImageWrapper::CollectSizeOfSurfaces(nsTArray<SurfaceMemoryCounter>& aCounters,
-                                    MallocSizeOf aMallocSizeOf) const
-{
-  mInnerImage->CollectSizeOfSurfaces(aCounters, aMallocSizeOf);
-}
-
-void
-ImageWrapper::IncrementAnimationConsumers()
-{
-  MOZ_ASSERT(NS_IsMainThread(), "Main thread only to encourage serialization "
-                                "with DecrementAnimationConsumers");
-  mInnerImage->IncrementAnimationConsumers();
-}
-
-void
-ImageWrapper::DecrementAnimationConsumers()
-{
-  MOZ_ASSERT(NS_IsMainThread(), "Main thread only to encourage serialization "
-                                "with IncrementAnimationConsumers");
-  mInnerImage->DecrementAnimationConsumers();
-}
-
-#ifdef DEBUG
-uint32_t
-ImageWrapper::GetAnimationConsumers()
-{
-  return mInnerImage->GetAnimationConsumers();
-}
-#endif
-
-nsresult
-ImageWrapper::OnImageDataAvailable(nsIRequest* aRequest,
-                                   nsISupports* aContext,
-                                   nsIInputStream* aInStr,
-                                   uint64_t aSourceOffset,
-                                   uint32_t aCount)
-{
-  return mInnerImage->OnImageDataAvailable(aRequest, aContext, aInStr,
-                                           aSourceOffset, aCount);
-}
-
-nsresult
-ImageWrapper::OnImageDataComplete(nsIRequest* aRequest,
-                                  nsISupports* aContext,
-                                  nsresult aStatus,
-                                  bool aLastPart)
-{
-  return mInnerImage->OnImageDataComplete(aRequest, aContext, aStatus,
-                                          aLastPart);
-}
-
-void
-ImageWrapper::OnSurfaceDiscarded()
-{
-  return mInnerImage->OnSurfaceDiscarded();
-}
-
-void
-ImageWrapper::SetInnerWindowID(uint64_t aInnerWindowId)
-{
-  mInnerImage->SetInnerWindowID(aInnerWindowId);
-}
-
-uint64_t
-ImageWrapper::InnerWindowID() const
-{
-  return mInnerImage->InnerWindowID();
-}
-
-bool
-ImageWrapper::HasError()
-{
-  return mInnerImage->HasError();
-}
-
-void
-ImageWrapper::SetHasError()
-{
-  mInnerImage->SetHasError();
-}
-
-ImageURL*
-ImageWrapper::GetURI()
-{
-  return mInnerImage->GetURI();
-}
-
-// Methods inherited from XPCOM interfaces.
-
-NS_IMPL_ISUPPORTS(ImageWrapper, imgIContainer)
-
-NS_IMETHODIMP
-ImageWrapper::GetWidth(int32_t* aWidth)
-{
-  return mInnerImage->GetWidth(aWidth);
-}
-
-NS_IMETHODIMP
-ImageWrapper::GetHeight(int32_t* aHeight)
-{
-  return mInnerImage->GetHeight(aHeight);
-}
-
-NS_IMETHODIMP
-ImageWrapper::GetIntrinsicSize(nsSize* aSize)
-{
-  return mInnerImage->GetIntrinsicSize(aSize);
-}
-
-NS_IMETHODIMP
-ImageWrapper::GetIntrinsicRatio(nsSize* aSize)
-{
-  return mInnerImage->GetIntrinsicRatio(aSize);
-}
-
-NS_IMETHODIMP_(Orientation)
-ImageWrapper::GetOrientation()
-{
-  return mInnerImage->GetOrientation();
-}
-
-NS_IMETHODIMP
-ImageWrapper::GetType(uint16_t* aType)
-{
-  return mInnerImage->GetType(aType);
-}
-
-NS_IMETHODIMP
-ImageWrapper::GetAnimated(bool* aAnimated)
-{
-  return mInnerImage->GetAnimated(aAnimated);
-}
-
-NS_IMETHODIMP_(TemporaryRef<SourceSurface>)
-ImageWrapper::GetFrame(uint32_t aWhichFrame,
-                       uint32_t aFlags)
-{
-  return mInnerImage->GetFrame(aWhichFrame, aFlags);
-}
-
-NS_IMETHODIMP_(bool)
-ImageWrapper::IsOpaque()
-{
-  return mInnerImage->IsOpaque();
-}
-
-NS_IMETHODIMP_(already_AddRefed<ImageContainer>)
-ImageWrapper::GetImageContainer(LayerManager* aManager, uint32_t aFlags)
-{
-  return mInnerImage->GetImageContainer(aManager, aFlags);
-}
-
-NS_IMETHODIMP_(DrawResult)
-ImageWrapper::Draw(gfxContext* aContext,
-                   const nsIntSize& aSize,
-                   const ImageRegion& aRegion,
-                   uint32_t aWhichFrame,
-                   GraphicsFilter aFilter,
-                   const Maybe<SVGImageContext>& aSVGContext,
-                   uint32_t aFlags)
-{
-  return mInnerImage->Draw(aContext, aSize, aRegion, aWhichFrame,
-                           aFilter, aSVGContext, aFlags);
-}
-
-NS_IMETHODIMP
-ImageWrapper::RequestDecode()
-{
-  return mInnerImage->RequestDecode();
-}
-
-NS_IMETHODIMP
-ImageWrapper::StartDecoding()
-{
-  return mInnerImage->StartDecoding();
-}
-
-NS_IMETHODIMP
-ImageWrapper::RequestDecodeForSize(const nsIntSize& aSize, uint32_t aFlags)
-{
-  return mInnerImage->RequestDecodeForSize(aSize, aFlags);
-}
-
-NS_IMETHODIMP
-ImageWrapper::LockImage()
-{
-  MOZ_ASSERT(NS_IsMainThread(),
-             "Main thread to encourage serialization with UnlockImage");
-  return mInnerImage->LockImage();
-}
-
-NS_IMETHODIMP
-ImageWrapper::UnlockImage()
-{
-  MOZ_ASSERT(NS_IsMainThread(),
-             "Main thread to encourage serialization with LockImage");
-  return mInnerImage->UnlockImage();
-}
-
-NS_IMETHODIMP
-ImageWrapper::RequestDiscard()
-{
-  return mInnerImage->RequestDiscard();
-}
-
-NS_IMETHODIMP_(void)
-ImageWrapper::RequestRefresh(const TimeStamp& aTime)
-{
-  return mInnerImage->RequestRefresh(aTime);
-}
-
-NS_IMETHODIMP
-ImageWrapper::GetAnimationMode(uint16_t* aAnimationMode)
-{
-  return mInnerImage->GetAnimationMode(aAnimationMode);
-}
-
-NS_IMETHODIMP
-ImageWrapper::SetAnimationMode(uint16_t aAnimationMode)
-{
-  return mInnerImage->SetAnimationMode(aAnimationMode);
-}
-
-NS_IMETHODIMP
-ImageWrapper::ResetAnimation()
-{
-  return mInnerImage->ResetAnimation();
-}
-
-NS_IMETHODIMP_(float)
-ImageWrapper::GetFrameIndex(uint32_t aWhichFrame)
-{
-  return mInnerImage->GetFrameIndex(aWhichFrame);
-}
-
-NS_IMETHODIMP_(int32_t)
-ImageWrapper::GetFirstFrameDelay()
-{
-  return mInnerImage->GetFirstFrameDelay();
-}
-
-NS_IMETHODIMP_(void)
-ImageWrapper::SetAnimationStartTime(const TimeStamp& aTime)
-{
-  mInnerImage->SetAnimationStartTime(aTime);
-}
-
-nsIntSize
-ImageWrapper::OptimalImageSizeForDest(const gfxSize& aDest,
-                                      uint32_t aWhichFrame,
-                                      GraphicsFilter aFilter, uint32_t aFlags)
-{
-  return mInnerImage->OptimalImageSizeForDest(aDest, aWhichFrame, aFilter,
-                                              aFlags);
-}
-
-NS_IMETHODIMP_(nsIntRect)
-ImageWrapper::GetImageSpaceInvalidationRect(const nsIntRect& aRect)
-{
-  return mInnerImage->GetImageSpaceInvalidationRect(aRect);
-}
-
-already_AddRefed<imgIContainer>
-ImageWrapper::Unwrap()
-{
-  return mInnerImage->Unwrap();
-}
-
-} // namespace image
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/ImageWrapper.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/ImageWrapper.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/ImageWrapper.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/ImageWrapper.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,85 +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_image_src_ImageWrapper_h
-#define mozilla_image_src_ImageWrapper_h
-
-#include "mozilla/MemoryReporting.h"
-#include "Image.h"
-
-namespace mozilla {
-namespace image {
-
-/**
- * Abstract superclass for Images that wrap other Images.
- */
-class ImageWrapper : public Image
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGICONTAINER
-
-  // Inherited methods from Image.
-  virtual already_AddRefed<ProgressTracker> GetProgressTracker() override;
-
-  virtual size_t
-    SizeOfSourceWithComputedFallback(MallocSizeOf aMallocSizeOf) const override;
-  virtual void CollectSizeOfSurfaces(nsTArray<SurfaceMemoryCounter>& aCounters,
-                                     MallocSizeOf aMallocSizeOf) const override;
-
-  virtual void IncrementAnimationConsumers() override;
-  virtual void DecrementAnimationConsumers() override;
-#ifdef DEBUG
-  virtual uint32_t GetAnimationConsumers() override;
-#endif
-
-  virtual nsresult OnImageDataAvailable(nsIRequest* aRequest,
-                                        nsISupports* aContext,
-                                        nsIInputStream* aInStr,
-                                        uint64_t aSourceOffset,
-                                        uint32_t aCount) override;
-  virtual nsresult OnImageDataComplete(nsIRequest* aRequest,
-                                       nsISupports* aContext,
-                                       nsresult aStatus,
-                                       bool aLastPart) override;
-
-  virtual void OnSurfaceDiscarded() override;
-
-  virtual void SetInnerWindowID(uint64_t aInnerWindowId) override;
-  virtual uint64_t InnerWindowID() const override;
-
-  virtual bool HasError() override;
-  virtual void SetHasError() override;
-
-  virtual ImageURL* GetURI() override;
-
-protected:
-  explicit ImageWrapper(Image* aInnerImage)
-    : mInnerImage(aInnerImage)
-  {
-    MOZ_ASSERT(aInnerImage, "Need an image to wrap");
-  }
-
-  virtual ~ImageWrapper() { }
-
-  /**
-   * Returns a weak reference to the inner image wrapped by this ImageWrapper.
-   */
-  Image* InnerImage() const { return mInnerImage.get(); }
-
-  void SetInnerImage(Image* aInnerImage)
-  {
-    MOZ_ASSERT(aInnerImage, "Need an image to wrap");
-    mInnerImage = aInnerImage;
-  }
-
-private:
-  nsRefPtr<Image> mInnerImage;
-};
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_ImageWrapper_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/imgFrame.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/imgFrame.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/imgFrame.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/imgFrame.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,1225 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "imgFrame.h"
-#include "ImageRegion.h"
-#include "ShutdownTracker.h"
-
-#include "prenv.h"
-
-#include "gfx2DGlue.h"
-#include "gfxPlatform.h"
-#include "gfxUtils.h"
-#include "gfxAlphaRecovery.h"
-
-static bool gDisableOptimize = false;
-
-#include "GeckoProfiler.h"
-#include "mozilla/Likely.h"
-#include "MainThreadUtils.h"
-#include "mozilla/MemoryReporting.h"
-#include "nsMargin.h"
-#include "nsThreadUtils.h"
-#include "mozilla/CheckedInt.h"
-#include "mozilla/gfx/Tools.h"
-
-
-namespace mozilla {
-
-using namespace gfx;
-
-namespace image {
-
-static UserDataKey kVolatileBuffer;
-
-static void
-VolatileBufferRelease(void* vbuf)
-{
-  delete static_cast<VolatileBufferPtr<unsigned char>*>(vbuf);
-}
-
-static int32_t
-VolatileSurfaceStride(const IntSize& size, SurfaceFormat format)
-{
-  // Stride must be a multiple of four or cairo will complain.
-  return (size.width * BytesPerPixel(format) + 0x3) & ~0x3;
-}
-
-static TemporaryRef<DataSourceSurface>
-CreateLockedSurface(VolatileBuffer* vbuf,
-                    const IntSize& size,
-                    SurfaceFormat format)
-{
-  VolatileBufferPtr<unsigned char>* vbufptr =
-    new VolatileBufferPtr<unsigned char>(vbuf);
-  MOZ_ASSERT(!vbufptr->WasBufferPurged(), "Expected image data!");
-
-  int32_t stride = VolatileSurfaceStride(size, format);
-  RefPtr<DataSourceSurface> surf =
-    Factory::CreateWrappingDataSourceSurface(*vbufptr, stride, size, format);
-  if (!surf) {
-    delete vbufptr;
-    return nullptr;
-  }
-
-  surf->AddUserData(&kVolatileBuffer, vbufptr, VolatileBufferRelease);
-  return surf;
-}
-
-static TemporaryRef<VolatileBuffer>
-AllocateBufferForImage(const IntSize& size, SurfaceFormat format)
-{
-  int32_t stride = VolatileSurfaceStride(size, format);
-  RefPtr<VolatileBuffer> buf = new VolatileBuffer();
-  if (buf->Init(stride * size.height,
-                1 << gfxAlphaRecovery::GoodAlignmentLog2())) {
-    return buf;
-  }
-
-  return nullptr;
-}
-
-// Returns true if an image of aWidth x aHeight is allowed and legal.
-static bool
-AllowedImageSize(int32_t aWidth, int32_t aHeight)
-{
-  // reject over-wide or over-tall images
-  const int32_t k64KLimit = 0x0000FFFF;
-  if (MOZ_UNLIKELY(aWidth > k64KLimit || aHeight > k64KLimit )) {
-    NS_WARNING("image too big");
-    return false;
-  }
-
-  // protect against invalid sizes
-  if (MOZ_UNLIKELY(aHeight <= 0 || aWidth <= 0)) {
-    return false;
-  }
-
-  // check to make sure we don't overflow a 32-bit
-  CheckedInt32 requiredBytes = CheckedInt32(aWidth) * CheckedInt32(aHeight) * 4;
-  if (MOZ_UNLIKELY(!requiredBytes.isValid())) {
-    NS_WARNING("width or height too large");
-    return false;
-  }
-#if defined(XP_MACOSX)
-  // CoreGraphics is limited to images < 32K in *height*, so clamp all surfaces
-  // on the Mac to that height
-  if (MOZ_UNLIKELY(aHeight > SHRT_MAX)) {
-    NS_WARNING("image too big");
-    return false;
-  }
-#endif
-  return true;
-}
-
-static bool AllowedImageAndFrameDimensions(const nsIntSize& aImageSize,
-                                           const nsIntRect& aFrameRect)
-{
-  if (!AllowedImageSize(aImageSize.width, aImageSize.height)) {
-    return false;
-  }
-  if (!AllowedImageSize(aFrameRect.width, aFrameRect.height)) {
-    return false;
-  }
-  nsIntRect imageRect(0, 0, aImageSize.width, aImageSize.height);
-  if (!imageRect.Contains(aFrameRect)) {
-    NS_WARNING("Animated image frame does not fit inside bounds of image");
-  }
-  return true;
-}
-
-imgFrame::imgFrame()
-  : mMonitor("imgFrame")
-  , mDecoded(0, 0, 0, 0)
-  , mLockCount(0)
-  , mTimeout(100)
-  , mDisposalMethod(DisposalMethod::NOT_SPECIFIED)
-  , mBlendMethod(BlendMethod::OVER)
-  , mHasNoAlpha(false)
-  , mAborted(false)
-  , mPalettedImageData(nullptr)
-  , mPaletteDepth(0)
-  , mNonPremult(false)
-  , mSinglePixel(false)
-  , mCompositingFailed(false)
-  , mOptimizable(false)
-{
-  static bool hasCheckedOptimize = false;
-  if (!hasCheckedOptimize) {
-    if (PR_GetEnv("MOZ_DISABLE_IMAGE_OPTIMIZE")) {
-      gDisableOptimize = true;
-    }
-    hasCheckedOptimize = true;
-  }
-}
-
-imgFrame::~imgFrame()
-{
-#ifdef DEBUG
-  MonitorAutoLock lock(mMonitor);
-  MOZ_ASSERT(mAborted || IsImageCompleteInternal());
-#endif
-
-  free(mPalettedImageData);
-  mPalettedImageData = nullptr;
-}
-
-nsresult
-imgFrame::ReinitForDecoder(const nsIntSize& aImageSize,
-                           const nsIntRect& aRect,
-                           SurfaceFormat aFormat,
-                           uint8_t aPaletteDepth /* = 0 */,
-                           bool aNonPremult /* = false */)
-{
-  MonitorAutoLock lock(mMonitor);
-
-  if (mDecoded.x != 0 || mDecoded.y != 0 ||
-      mDecoded.width != 0 || mDecoded.height != 0) {
-    MOZ_ASSERT_UNREACHABLE("Shouldn't reinit after write");
-    return NS_ERROR_FAILURE;
-  }
-  if (mAborted) {
-    MOZ_ASSERT_UNREACHABLE("Shouldn't reinit if aborted");
-    return NS_ERROR_FAILURE;
-  }
-  if (mLockCount < 1) {
-    MOZ_ASSERT_UNREACHABLE("Shouldn't reinit unless locked");
-    return NS_ERROR_FAILURE;
-  }
-
-  // Restore everything (except mLockCount, which we need to keep) to how it was
-  // when we were first created.
-  // XXX(seth): This is probably a little excessive, but I want to be *really*
-  // sure that nothing got missed.
-  mDecoded = nsIntRect(0, 0, 0, 0);
-  mTimeout = 100;
-  mDisposalMethod = DisposalMethod::NOT_SPECIFIED;
-  mBlendMethod = BlendMethod::OVER;
-  mHasNoAlpha = false;
-  mAborted = false;
-  mPaletteDepth = 0;
-  mNonPremult = false;
-  mSinglePixel = false;
-  mCompositingFailed = false;
-  mOptimizable = false;
-  mImageSize = IntSize();
-  mSize = IntSize();
-  mOffset = nsIntPoint();
-  mSinglePixelColor = Color();
-
-  // Release all surfaces.
-  mImageSurface = nullptr;
-  mOptSurface = nullptr;
-  mVBuf = nullptr;
-  mVBufPtr = nullptr;
-  free(mPalettedImageData);
-  mPalettedImageData = nullptr;
-
-  // Reinitialize.
-  nsresult rv = InitForDecoder(aImageSize, aRect, aFormat,
-                               aPaletteDepth, aNonPremult);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  // We were locked before; perform the same actions we would've performed when
-  // we originally got locked.
-  if (mImageSurface) {
-    mVBufPtr = mVBuf;
-    return NS_OK;
-  }
-
-  if (!mPalettedImageData) {
-    MOZ_ASSERT_UNREACHABLE("We got optimized somehow during reinit");
-    return NS_ERROR_FAILURE;
-  }
-
-  // Paletted images don't have surfaces, so there's nothing to do.
-  return NS_OK;
-}
-
-nsresult
-imgFrame::InitForDecoder(const nsIntSize& aImageSize,
-                         const nsIntRect& aRect,
-                         SurfaceFormat aFormat,
-                         uint8_t aPaletteDepth /* = 0 */,
-                         bool aNonPremult /* = false */)
-{
-  // Assert for properties that should be verified by decoders,
-  // warn for properties related to bad content.
-  if (!AllowedImageAndFrameDimensions(aImageSize, aRect)) {
-    NS_WARNING("Should have legal image size");
-    mAborted = true;
-    return NS_ERROR_FAILURE;
-  }
-
-  mImageSize = aImageSize;
-  mOffset.MoveTo(aRect.x, aRect.y);
-  mSize.SizeTo(aRect.width, aRect.height);
-
-  mFormat = aFormat;
-  mPaletteDepth = aPaletteDepth;
-  mNonPremult = aNonPremult;
-
-  if (aPaletteDepth != 0) {
-    // We're creating for a paletted image.
-    if (aPaletteDepth > 8) {
-      NS_WARNING("Should have legal palette depth");
-      NS_ERROR("This Depth is not supported");
-      mAborted = true;
-      return NS_ERROR_FAILURE;
-    }
-
-    // Use the fallible allocator here. Paletted images always use 1 byte per
-    // pixel, so calculating the amount of memory we need is straightforward.
-    mPalettedImageData =
-      static_cast<uint8_t*>(malloc(PaletteDataLength() +
-                                   (mSize.width * mSize.height)));
-    if (!mPalettedImageData) {
-      NS_WARNING("malloc for paletted image data should succeed");
-    }
-    NS_ENSURE_TRUE(mPalettedImageData, NS_ERROR_OUT_OF_MEMORY);
-  } else {
-    MOZ_ASSERT(!mImageSurface, "Called imgFrame::InitForDecoder() twice?");
-
-    mVBuf = AllocateBufferForImage(mSize, mFormat);
-    if (!mVBuf) {
-      mAborted = true;
-      return NS_ERROR_OUT_OF_MEMORY;
-    }
-    if (mVBuf->OnHeap()) {
-      int32_t stride = VolatileSurfaceStride(mSize, mFormat);
-      VolatileBufferPtr<uint8_t> ptr(mVBuf);
-      memset(ptr, 0, stride * mSize.height);
-    }
-    mImageSurface = CreateLockedSurface(mVBuf, mSize, mFormat);
-
-    if (!mImageSurface) {
-      NS_WARNING("Failed to create VolatileDataSourceSurface");
-      mAborted = true;
-      return NS_ERROR_OUT_OF_MEMORY;
-    }
-  }
-
-  return NS_OK;
-}
-
-nsresult
-imgFrame::InitWithDrawable(gfxDrawable* aDrawable,
-                           const nsIntSize& aSize,
-                           const SurfaceFormat aFormat,
-                           GraphicsFilter aFilter,
-                           uint32_t aImageFlags)
-{
-  // Assert for properties that should be verified by decoders,
-  // warn for properties related to bad content.
-  if (!AllowedImageSize(aSize.width, aSize.height)) {
-    NS_WARNING("Should have legal image size");
-    mAborted = true;
-    return NS_ERROR_FAILURE;
-  }
-
-  mImageSize = aSize;
-  mOffset.MoveTo(0, 0);
-  mSize.SizeTo(aSize.width, aSize.height);
-
-  mFormat = aFormat;
-  mPaletteDepth = 0;
-
-  RefPtr<DrawTarget> target;
-
-  bool canUseDataSurface =
-    gfxPlatform::GetPlatform()->CanRenderContentToDataSurface();
-
-  if (canUseDataSurface) {
-    // It's safe to use data surfaces for content on this platform, so we can
-    // get away with using volatile buffers.
-    MOZ_ASSERT(!mImageSurface, "Called imgFrame::InitWithDrawable() twice?");
-
-    mVBuf = AllocateBufferForImage(mSize, mFormat);
-    if (!mVBuf) {
-      mAborted = true;
-      return NS_ERROR_OUT_OF_MEMORY;
-    }
-
-    int32_t stride = VolatileSurfaceStride(mSize, mFormat);
-    VolatileBufferPtr<uint8_t> ptr(mVBuf);
-    if (!ptr) {
-      mAborted = true;
-      return NS_ERROR_OUT_OF_MEMORY;
-    }
-    if (mVBuf->OnHeap()) {
-      memset(ptr, 0, stride * mSize.height);
-    }
-    mImageSurface = CreateLockedSurface(mVBuf, mSize, mFormat);
-
-    target = gfxPlatform::GetPlatform()->
-      CreateDrawTargetForData(ptr, mSize, stride, mFormat);
-  } else {
-    // We can't use data surfaces for content, so we'll create an offscreen
-    // surface instead.  This means if someone later calls RawAccessRef(), we
-    // may have to do an expensive readback, but we warned callers about that in
-    // the documentation for this method.
-    MOZ_ASSERT(!mOptSurface, "Called imgFrame::InitWithDrawable() twice?");
-
-    target = gfxPlatform::GetPlatform()->
-      CreateOffscreenContentDrawTarget(mSize, mFormat);
-  }
-
-  if (!target) {
-    mAborted = true;
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  // Draw using the drawable the caller provided.
-  nsIntRect imageRect(0, 0, mSize.width, mSize.height);
-  nsRefPtr<gfxContext> ctx = new gfxContext(target);
-  gfxUtils::DrawPixelSnapped(ctx, aDrawable, mSize,
-                             ImageRegion::Create(imageRect),
-                             mFormat, aFilter, aImageFlags);
-
-  if (canUseDataSurface && !mImageSurface) {
-    NS_WARNING("Failed to create VolatileDataSourceSurface");
-    mAborted = true;
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  if (!canUseDataSurface) {
-    // We used an offscreen surface, which is an "optimized" surface from
-    // imgFrame's perspective.
-    mOptSurface = target->Snapshot();
-  }
-
-  // If we reach this point, we should regard ourselves as complete.
-  mDecoded = GetRect();
-  MOZ_ASSERT(IsImageComplete());
-
-  return NS_OK;
-}
-
-nsresult
-imgFrame::Optimize()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  mMonitor.AssertCurrentThreadOwns();
-  MOZ_ASSERT(mLockCount == 1,
-             "Should only optimize when holding the lock exclusively");
-
-  // Don't optimize during shutdown because gfxPlatform may not be available.
-  if (ShutdownTracker::ShutdownHasStarted()) {
-    return NS_OK;
-  }
-
-  if (!mOptimizable || gDisableOptimize) {
-    return NS_OK;
-  }
-
-  if (mPalettedImageData || mOptSurface || mSinglePixel) {
-    return NS_OK;
-  }
-
-  // Don't do single-color opts on non-premult data.
-  // Cairo doesn't support non-premult single-colors.
-  if (mNonPremult) {
-    return NS_OK;
-  }
-
-  /* Figure out if the entire image is a constant color */
-
-  if (gfxPrefs::ImageSingleColorOptimizationEnabled() &&
-      mImageSurface->Stride() == mSize.width * 4) {
-    uint32_t* imgData = (uint32_t*) ((uint8_t*) mVBufPtr);
-    uint32_t firstPixel = * (uint32_t*) imgData;
-    uint32_t pixelCount = mSize.width * mSize.height + 1;
-
-    while (--pixelCount && *imgData++ == firstPixel)
-      ;
-
-    if (pixelCount == 0) {
-      // all pixels were the same
-      if (mFormat == SurfaceFormat::B8G8R8A8 ||
-          mFormat == SurfaceFormat::B8G8R8X8) {
-        mSinglePixel = true;
-        mSinglePixelColor.a = ((firstPixel >> 24) & 0xFF) * (1.0f / 255.0f);
-        mSinglePixelColor.r = ((firstPixel >> 16) & 0xFF) * (1.0f / 255.0f);
-        mSinglePixelColor.g = ((firstPixel >>  8) & 0xFF) * (1.0f / 255.0f);
-        mSinglePixelColor.b = ((firstPixel >>  0) & 0xFF) * (1.0f / 255.0f);
-        mSinglePixelColor.r /= mSinglePixelColor.a;
-        mSinglePixelColor.g /= mSinglePixelColor.a;
-        mSinglePixelColor.b /= mSinglePixelColor.a;
-
-        // blow away the older surfaces (if they exist), to release their memory
-        mVBuf = nullptr;
-        mVBufPtr = nullptr;
-        mImageSurface = nullptr;
-        mOptSurface = nullptr;
-
-        return NS_OK;
-      }
-    }
-
-    // if it's not RGB24/ARGB32, don't optimize, but we never hit this at the
-    // moment
-  }
-
-#ifdef ANDROID
-  SurfaceFormat optFormat = gfxPlatform::GetPlatform()
-    ->Optimal2DFormatForContent(gfxContentType::COLOR);
-
-  if (mFormat != SurfaceFormat::B8G8R8A8 &&
-      optFormat == SurfaceFormat::R5G6B5) {
-    RefPtr<VolatileBuffer> buf =
-      AllocateBufferForImage(mSize, optFormat);
-    if (!buf) {
-      return NS_OK;
-    }
-
-    RefPtr<DataSourceSurface> surf =
-      CreateLockedSurface(buf, mSize, optFormat);
-    if (!surf) {
-      return NS_ERROR_OUT_OF_MEMORY;
-    }
-
-    DataSourceSurface::MappedSurface mapping;
-    DebugOnly<bool> success =
-      surf->Map(DataSourceSurface::MapType::WRITE, &mapping);
-    NS_ASSERTION(success, "Failed to map surface");
-    RefPtr<DrawTarget> target =
-      Factory::CreateDrawTargetForData(BackendType::CAIRO,
-                                       mapping.mData,
-                                       mSize,
-                                       mapping.mStride,
-                                       optFormat);
-
-    if (!target) {
-      gfxWarning() << "imgFrame::Optimize failed in CreateDrawTargetForData";
-      return NS_ERROR_OUT_OF_MEMORY;
-    }
-    Rect rect(0, 0, mSize.width, mSize.height);
-    target->DrawSurface(mImageSurface, rect, rect);
-    target->Flush();
-    surf->Unmap();
-
-    mImageSurface = surf;
-    mVBuf = buf;
-    mFormat = optFormat;
-  }
-#else
-  mOptSurface = gfxPlatform::GetPlatform()
-    ->ScreenReferenceDrawTarget()->OptimizeSourceSurface(mImageSurface);
-  if (mOptSurface == mImageSurface) {
-    mOptSurface = nullptr;
-  }
-#endif
-
-  if (mOptSurface) {
-    mVBuf = nullptr;
-    mVBufPtr = nullptr;
-    mImageSurface = nullptr;
-  }
-
-#ifdef MOZ_WIDGET_ANDROID
-  // On Android, free mImageSurface unconditionally if we're discardable. This
-  // allows the operating system to free our volatile buffer.
-  // XXX(seth): We'd eventually like to do this on all platforms, but right now
-  // converting raw memory to a SourceSurface is expensive on some backends.
-  mImageSurface = nullptr;
-#endif
-
-  return NS_OK;
-}
-
-DrawableFrameRef
-imgFrame::DrawableRef()
-{
-  return DrawableFrameRef(this);
-}
-
-RawAccessFrameRef
-imgFrame::RawAccessRef()
-{
-  return RawAccessFrameRef(this);
-}
-
-void
-imgFrame::SetRawAccessOnly()
-{
-  AssertImageDataLocked();
-
-  // Lock our data and throw away the key.
-  LockImageData();
-}
-
-
-imgFrame::SurfaceWithFormat
-imgFrame::SurfaceForDrawing(bool               aDoPadding,
-                            bool               aDoPartialDecode,
-                            bool               aDoTile,
-                            gfxContext*        aContext,
-                            const nsIntMargin& aPadding,
-                            gfxRect&           aImageRect,
-                            ImageRegion&       aRegion,
-                            SourceSurface*     aSurface)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  mMonitor.AssertCurrentThreadOwns();
-
-  IntSize size(int32_t(aImageRect.Width()), int32_t(aImageRect.Height()));
-  if (!aDoPadding && !aDoPartialDecode) {
-    NS_ASSERTION(!mSinglePixel, "This should already have been handled");
-    return SurfaceWithFormat(new gfxSurfaceDrawable(aSurface, size), mFormat);
-  }
-
-  gfxRect available = gfxRect(mDecoded.x, mDecoded.y, mDecoded.width,
-                              mDecoded.height);
-
-  if (aDoTile || mSinglePixel) {
-    // Create a temporary surface.
-    // Give this surface an alpha channel because there are
-    // transparent pixels in the padding or undecoded area
-    RefPtr<DrawTarget> target =
-      gfxPlatform::GetPlatform()->
-        CreateOffscreenContentDrawTarget(size, SurfaceFormat::B8G8R8A8);
-    if (!target) {
-      return SurfaceWithFormat();
-    }
-
-    // Fill 'available' with whatever we've got
-    if (mSinglePixel) {
-      target->FillRect(ToRect(aRegion.Intersect(available).Rect()),
-                       ColorPattern(mSinglePixelColor),
-                       DrawOptions(1.0f, CompositionOp::OP_SOURCE));
-    } else {
-      SurfacePattern pattern(aSurface,
-                             ExtendMode::REPEAT,
-                             Matrix::Translation(mDecoded.x, mDecoded.y));
-      target->FillRect(ToRect(aRegion.Intersect(available).Rect()), pattern);
-    }
-
-    RefPtr<SourceSurface> newsurf = target->Snapshot();
-    return SurfaceWithFormat(new gfxSurfaceDrawable(newsurf, size),
-                             target->GetFormat());
-  }
-
-  // Not tiling, and we have a surface, so we can account for
-  // padding and/or a partial decode just by twiddling parameters.
-  gfxPoint paddingTopLeft(aPadding.left, aPadding.top);
-  aRegion = aRegion.Intersect(available) - paddingTopLeft;
-  aContext->Multiply(gfxMatrix::Translation(paddingTopLeft));
-  aImageRect = gfxRect(0, 0, mSize.width, mSize.height);
-
-  gfxIntSize availableSize(mDecoded.width, mDecoded.height);
-  return SurfaceWithFormat(new gfxSurfaceDrawable(aSurface, availableSize),
-                           mFormat);
-}
-
-bool imgFrame::Draw(gfxContext* aContext, const ImageRegion& aRegion,
-                    GraphicsFilter aFilter, uint32_t aImageFlags)
-{
-  PROFILER_LABEL("imgFrame", "Draw",
-    js::ProfileEntry::Category::GRAPHICS);
-
-  MOZ_ASSERT(NS_IsMainThread());
-  NS_ASSERTION(!aRegion.Rect().IsEmpty(), "Drawing empty region!");
-  NS_ASSERTION(!aRegion.IsRestricted() ||
-               !aRegion.Rect().Intersect(aRegion.Restriction()).IsEmpty(),
-               "We must be allowed to sample *some* source pixels!");
-  NS_ASSERTION(!mPalettedImageData, "Directly drawing a paletted image!");
-
-  MonitorAutoLock lock(mMonitor);
-
-  nsIntMargin padding(mOffset.y,
-                      mImageSize.width - (mOffset.x + mSize.width),
-                      mImageSize.height - (mOffset.y + mSize.height),
-                      mOffset.x);
-
-  bool doPadding = padding != nsIntMargin(0,0,0,0);
-  bool doPartialDecode = !IsImageCompleteInternal();
-
-  if (mSinglePixel && !doPadding && !doPartialDecode) {
-    if (mSinglePixelColor.a == 0.0) {
-      return true;
-    }
-    RefPtr<DrawTarget> dt = aContext->GetDrawTarget();
-    dt->FillRect(ToRect(aRegion.Rect()),
-                 ColorPattern(mSinglePixelColor),
-                 DrawOptions(1.0f,
-                             CompositionOpForOp(aContext->CurrentOperator())));
-    return true;
-  }
-
-  RefPtr<SourceSurface> surf = GetSurfaceInternal();
-  if (!surf && !mSinglePixel) {
-    return false;
-  }
-
-  gfxRect imageRect(0, 0, mImageSize.width, mImageSize.height);
-  bool doTile = !imageRect.Contains(aRegion.Rect()) &&
-                !(aImageFlags & imgIContainer::FLAG_CLAMP);
-  ImageRegion region(aRegion);
-  // SurfaceForDrawing changes the current transform, and we need it to still
-  // be changed when we call gfxUtils::DrawPixelSnapped. We still need to
-  // restore it before returning though.
-  // XXXjwatt In general having functions require someone further up the stack
-  // to undo transform changes that they make is bad practice. We should
-  // change how this code works.
-  gfxContextMatrixAutoSaveRestore autoSR(aContext);
-  SurfaceWithFormat surfaceResult =
-    SurfaceForDrawing(doPadding, doPartialDecode, doTile, aContext,
-                      padding, imageRect, region, surf);
-
-  if (surfaceResult.IsValid()) {
-    gfxUtils::DrawPixelSnapped(aContext, surfaceResult.mDrawable,
-                               imageRect.Size(), region, surfaceResult.mFormat,
-                               aFilter, aImageFlags);
-  }
-  return true;
-}
-
-nsresult
-imgFrame::ImageUpdated(const nsIntRect& aUpdateRect)
-{
-  MonitorAutoLock lock(mMonitor);
-  return ImageUpdatedInternal(aUpdateRect);
-}
-
-nsresult
-imgFrame::ImageUpdatedInternal(const nsIntRect& aUpdateRect)
-{
-  mMonitor.AssertCurrentThreadOwns();
-
-  mDecoded.UnionRect(mDecoded, aUpdateRect);
-
-  // clamp to bounds, in case someone sends a bogus updateRect (I'm looking at
-  // you, gif decoder)
-  nsIntRect boundsRect(mOffset, mSize);
-  mDecoded.IntersectRect(mDecoded, boundsRect);
-
-  // If the image is now complete, wake up anyone who's waiting.
-  if (IsImageCompleteInternal()) {
-    mMonitor.NotifyAll();
-  }
-
-  return NS_OK;
-}
-
-void
-imgFrame::Finish(Opacity aFrameOpacity /* = Opacity::SOME_TRANSPARENCY */,
-                 DisposalMethod aDisposalMethod /* = DisposalMethod::KEEP */,
-                 int32_t aRawTimeout /* = 0 */,
-                 BlendMethod aBlendMethod /* = BlendMethod::OVER */)
-{
-  MonitorAutoLock lock(mMonitor);
-  MOZ_ASSERT(mLockCount > 0, "Image data should be locked");
-
-  if (aFrameOpacity == Opacity::OPAQUE) {
-    mHasNoAlpha = true;
-  }
-
-  mDisposalMethod = aDisposalMethod;
-  mTimeout = aRawTimeout;
-  mBlendMethod = aBlendMethod;
-  ImageUpdatedInternal(GetRect());
-}
-
-nsIntRect
-imgFrame::GetRect() const
-{
-  return gfx::IntRect(mOffset, mSize);
-}
-
-int32_t
-imgFrame::GetStride() const
-{
-  mMonitor.AssertCurrentThreadOwns();
-
-  if (mImageSurface) {
-    return mImageSurface->Stride();
-  }
-
-  return VolatileSurfaceStride(mSize, mFormat);
-}
-
-SurfaceFormat
-imgFrame::GetFormat() const
-{
-  MonitorAutoLock lock(mMonitor);
-  return mFormat;
-}
-
-uint32_t
-imgFrame::GetImageBytesPerRow() const
-{
-  mMonitor.AssertCurrentThreadOwns();
-
-  if (mVBuf) {
-    return mSize.width * BytesPerPixel(mFormat);
-  }
-
-  if (mPaletteDepth) {
-    return mSize.width;
-  }
-
-  return 0;
-}
-
-uint32_t
-imgFrame::GetImageDataLength() const
-{
-  return GetImageBytesPerRow() * mSize.height;
-}
-
-void
-imgFrame::GetImageData(uint8_t** aData, uint32_t* aLength) const
-{
-  MonitorAutoLock lock(mMonitor);
-  GetImageDataInternal(aData, aLength);
-}
-
-void
-imgFrame::GetImageDataInternal(uint8_t** aData, uint32_t* aLength) const
-{
-  mMonitor.AssertCurrentThreadOwns();
-  MOZ_ASSERT(mLockCount > 0, "Image data should be locked");
-
-  if (mImageSurface) {
-    *aData = mVBufPtr;
-    MOZ_ASSERT(*aData,
-      "mImageSurface is non-null, but mVBufPtr is null in GetImageData");
-  } else if (mPalettedImageData) {
-    *aData = mPalettedImageData + PaletteDataLength();
-    MOZ_ASSERT(*aData,
-      "mPalettedImageData is non-null, but result is null in GetImageData");
-  } else {
-    MOZ_ASSERT(false,
-      "Have neither mImageSurface nor mPalettedImageData in GetImageData");
-    *aData = nullptr;
-  }
-
-  *aLength = GetImageDataLength();
-}
-
-uint8_t*
-imgFrame::GetImageData() const
-{
-  uint8_t* data;
-  uint32_t length;
-  GetImageData(&data, &length);
-  return data;
-}
-
-bool
-imgFrame::GetIsPaletted() const
-{
-  return mPalettedImageData != nullptr;
-}
-
-void
-imgFrame::GetPaletteData(uint32_t** aPalette, uint32_t* length) const
-{
-  AssertImageDataLocked();
-
-  if (!mPalettedImageData) {
-    *aPalette = nullptr;
-    *length = 0;
-  } else {
-    *aPalette = (uint32_t*) mPalettedImageData;
-    *length = PaletteDataLength();
-  }
-}
-
-uint32_t*
-imgFrame::GetPaletteData() const
-{
-  uint32_t* data;
-  uint32_t length;
-  GetPaletteData(&data, &length);
-  return data;
-}
-
-nsresult
-imgFrame::LockImageData()
-{
-  MonitorAutoLock lock(mMonitor);
-
-  MOZ_ASSERT(mLockCount >= 0, "Unbalanced locks and unlocks");
-  if (mLockCount < 0) {
-    return NS_ERROR_FAILURE;
-  }
-
-  mLockCount++;
-
-  // If we are not the first lock, there's nothing to do.
-  if (mLockCount != 1) {
-    return NS_OK;
-  }
-
-  // If we're the first lock, but have an image surface, we're OK.
-  if (mImageSurface) {
-    mVBufPtr = mVBuf;
-    return NS_OK;
-  }
-
-  // Paletted images don't have surfaces, so there's nothing to do.
-  if (mPalettedImageData) {
-    return NS_OK;
-  }
-
-  return Deoptimize();
-}
-
-nsresult
-imgFrame::Deoptimize()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  mMonitor.AssertCurrentThreadOwns();
-  MOZ_ASSERT(!mImageSurface);
-
-  if (!mImageSurface) {
-    if (mVBuf) {
-      VolatileBufferPtr<uint8_t> ref(mVBuf);
-      if (ref.WasBufferPurged()) {
-        return NS_ERROR_FAILURE;
-      }
-
-      mImageSurface = CreateLockedSurface(mVBuf, mSize, mFormat);
-      if (!mImageSurface) {
-        return NS_ERROR_OUT_OF_MEMORY;
-      }
-    }
-    if (mOptSurface || mSinglePixel || mFormat == SurfaceFormat::R5G6B5) {
-      SurfaceFormat format = mFormat;
-      if (mFormat == SurfaceFormat::R5G6B5) {
-        format = SurfaceFormat::B8G8R8A8;
-      }
-
-      // Recover the pixels
-      RefPtr<VolatileBuffer> buf =
-        AllocateBufferForImage(mSize, format);
-      if (!buf) {
-        return NS_ERROR_OUT_OF_MEMORY;
-      }
-
-      RefPtr<DataSourceSurface> surf =
-        CreateLockedSurface(buf, mSize, format);
-      if (!surf) {
-        return NS_ERROR_OUT_OF_MEMORY;
-      }
-
-      DataSourceSurface::MappedSurface mapping;
-      DebugOnly<bool> success =
-        surf->Map(DataSourceSurface::MapType::WRITE, &mapping);
-      NS_ASSERTION(success, "Failed to map surface");
-      RefPtr<DrawTarget> target =
-        Factory::CreateDrawTargetForData(BackendType::CAIRO,
-                                         mapping.mData,
-                                         mSize,
-                                         mapping.mStride,
-                                         format);
-      if (!target) {
-        gfxWarning() <<
-          "imgFrame::Deoptimize failed in CreateDrawTargetForData";
-        return NS_ERROR_OUT_OF_MEMORY;
-      }
-
-      Rect rect(0, 0, mSize.width, mSize.height);
-      if (mSinglePixel) {
-        target->FillRect(rect, ColorPattern(mSinglePixelColor),
-                         DrawOptions(1.0f, CompositionOp::OP_SOURCE));
-      } else if (mFormat == SurfaceFormat::R5G6B5) {
-        target->DrawSurface(mImageSurface, rect, rect);
-      } else {
-        target->DrawSurface(mOptSurface, rect, rect,
-                            DrawSurfaceOptions(),
-                            DrawOptions(1.0f, CompositionOp::OP_SOURCE));
-      }
-      target->Flush();
-      surf->Unmap();
-
-      mFormat = format;
-      mVBuf = buf;
-      mImageSurface = surf;
-      mOptSurface = nullptr;
-    }
-  }
-
-  mVBufPtr = mVBuf;
-  return NS_OK;
-}
-
-void
-imgFrame::AssertImageDataLocked() const
-{
-#ifdef DEBUG
-  MonitorAutoLock lock(mMonitor);
-  MOZ_ASSERT(mLockCount > 0, "Image data should be locked");
-#endif
-}
-
-class UnlockImageDataRunnable : public nsRunnable
-{
-public:
-  explicit UnlockImageDataRunnable(imgFrame* aTarget)
-    : mTarget(aTarget)
-  {
-    MOZ_ASSERT(mTarget);
-  }
-
-  NS_IMETHOD Run() { return mTarget->UnlockImageData(); }
-
-private:
-  nsRefPtr<imgFrame> mTarget;
-};
-
-nsresult
-imgFrame::UnlockImageData()
-{
-  MonitorAutoLock lock(mMonitor);
-
-  MOZ_ASSERT(mLockCount > 0, "Unlocking an unlocked image!");
-  if (mLockCount <= 0) {
-    return NS_ERROR_FAILURE;
-  }
-
-  MOZ_ASSERT(mLockCount > 1 || IsImageCompleteInternal() || mAborted,
-             "Should have marked complete or aborted before unlocking");
-
-  // If we're about to become unlocked, we don't need to hold on to our data
-  // surface anymore. (But we don't need to do anything for paletted images,
-  // which don't have surfaces.)
-  if (mLockCount == 1 && !mPalettedImageData) {
-    // We can't safely optimize off-main-thread, so create a runnable to do it.
-    if (!NS_IsMainThread()) {
-      nsCOMPtr<nsIRunnable> runnable = new UnlockImageDataRunnable(this);
-      NS_DispatchToMainThread(runnable);
-      return NS_OK;
-    }
-
-    // If we're using a surface format with alpha but the image has no alpha,
-    // change the format. This doesn't change the underlying data at all, but
-    // allows DrawTargets to avoid blending when drawing known opaque images.
-    if (mHasNoAlpha && mFormat == SurfaceFormat::B8G8R8A8 && mImageSurface) {
-      mFormat = SurfaceFormat::B8G8R8X8;
-      mImageSurface = CreateLockedSurface(mVBuf, mSize, mFormat);
-    }
-
-    // Convert the data surface to a GPU surface or a single color if possible.
-    // This will also release mImageSurface if possible.
-    Optimize();
-
-    // Allow the OS to release our data surface.
-    mVBufPtr = nullptr;
-  }
-
-  mLockCount--;
-
-  return NS_OK;
-}
-
-void
-imgFrame::SetOptimizable()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  AssertImageDataLocked();
-  mOptimizable = true;
-}
-
-Color
-imgFrame::SinglePixelColor() const
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  return mSinglePixelColor;
-}
-
-bool
-imgFrame::IsSinglePixel() const
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  return mSinglePixel;
-}
-
-TemporaryRef<SourceSurface>
-imgFrame::GetSurface()
-{
-  MonitorAutoLock lock(mMonitor);
-  return GetSurfaceInternal();
-}
-
-TemporaryRef<SourceSurface>
-imgFrame::GetSurfaceInternal()
-{
-  mMonitor.AssertCurrentThreadOwns();
-
-  if (mOptSurface) {
-    if (mOptSurface->IsValid()) {
-      return mOptSurface;
-    } else {
-      mOptSurface = nullptr;
-    }
-  }
-
-  if (mImageSurface) {
-    return mImageSurface;
-  }
-
-  if (!mVBuf) {
-    return nullptr;
-  }
-
-  VolatileBufferPtr<char> buf(mVBuf);
-  if (buf.WasBufferPurged()) {
-    return nullptr;
-  }
-
-  return CreateLockedSurface(mVBuf, mSize, mFormat);
-}
-
-TemporaryRef<DrawTarget>
-imgFrame::GetDrawTarget()
-{
-  MonitorAutoLock lock(mMonitor);
-
-  uint8_t* data;
-  uint32_t length;
-  GetImageDataInternal(&data, &length);
-  if (!data) {
-    return nullptr;
-  }
-
-  int32_t stride = GetStride();
-  return gfxPlatform::GetPlatform()->
-    CreateDrawTargetForData(data, mSize, stride, mFormat);
-}
-
-AnimationData
-imgFrame::GetAnimationData() const
-{
-  MonitorAutoLock lock(mMonitor);
-  MOZ_ASSERT(mLockCount > 0, "Image data should be locked");
-
-  uint8_t* data;
-  if (mPalettedImageData) {
-    data = mPalettedImageData;
-  } else {
-    uint32_t length;
-    GetImageDataInternal(&data, &length);
-  }
-
-  bool hasAlpha = mFormat == SurfaceFormat::B8G8R8A8;
-
-  return AnimationData(data, PaletteDataLength(), mTimeout, GetRect(),
-                       mBlendMethod, mDisposalMethod, hasAlpha);
-}
-
-ScalingData
-imgFrame::GetScalingData() const
-{
-  MonitorAutoLock lock(mMonitor);
-  MOZ_ASSERT(mLockCount > 0, "Image data should be locked");
-  MOZ_ASSERT(!GetIsPaletted(), "GetScalingData can't handle paletted images");
-
-  uint8_t* data;
-  uint32_t length;
-  GetImageDataInternal(&data, &length);
-
-  return ScalingData(data, mSize, GetImageBytesPerRow(), mFormat);
-}
-
-void
-imgFrame::Abort()
-{
-  MonitorAutoLock lock(mMonitor);
-
-  mAborted = true;
-
-  // Wake up anyone who's waiting.
-  mMonitor.NotifyAll();
-}
-
-bool
-imgFrame::IsImageComplete() const
-{
-  MonitorAutoLock lock(mMonitor);
-  return IsImageCompleteInternal();
-}
-
-void
-imgFrame::WaitUntilComplete() const
-{
-  MonitorAutoLock lock(mMonitor);
-
-  while (true) {
-    // Return if we're aborted or complete.
-    if (mAborted || IsImageCompleteInternal()) {
-      return;
-    }
-
-    // Not complete yet, so we'll have to wait.
-    mMonitor.Wait();
-  }
-}
-
-bool
-imgFrame::IsImageCompleteInternal() const
-{
-  mMonitor.AssertCurrentThreadOwns();
-  return mDecoded.IsEqualInterior(nsIntRect(mOffset.x, mOffset.y,
-                                            mSize.width, mSize.height));
-}
-
-bool imgFrame::GetCompositingFailed() const
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  return mCompositingFailed;
-}
-
-void
-imgFrame::SetCompositingFailed(bool val)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  mCompositingFailed = val;
-}
-
-size_t
-imgFrame::SizeOfExcludingThis(gfxMemoryLocation aLocation,
-                              MallocSizeOf aMallocSizeOf) const
-{
-  MonitorAutoLock lock(mMonitor);
-
-  // aMallocSizeOf is only used if aLocation is
-  // gfxMemoryLocation::IN_PROCESS_HEAP.  It
-  // should be nullptr otherwise.
-  MOZ_ASSERT(
-    (aLocation == gfxMemoryLocation::IN_PROCESS_HEAP &&  aMallocSizeOf) ||
-    (aLocation != gfxMemoryLocation::IN_PROCESS_HEAP && !aMallocSizeOf),
-    "mismatch between aLocation and aMallocSizeOf");
-
-  size_t n = 0;
-
-  if (mPalettedImageData && aLocation == gfxMemoryLocation::IN_PROCESS_HEAP) {
-    n += aMallocSizeOf(mPalettedImageData);
-  }
-  if (mImageSurface && aLocation == gfxMemoryLocation::IN_PROCESS_HEAP) {
-    n += aMallocSizeOf(mImageSurface);
-  }
-  if (mOptSurface && aLocation == gfxMemoryLocation::IN_PROCESS_HEAP) {
-    n += aMallocSizeOf(mOptSurface);
-  }
-
-  if (mVBuf && aLocation == gfxMemoryLocation::IN_PROCESS_HEAP) {
-    n += aMallocSizeOf(mVBuf);
-    n += mVBuf->HeapSizeOfExcludingThis(aMallocSizeOf);
-  }
-
-  if (mVBuf && aLocation == gfxMemoryLocation::IN_PROCESS_NONHEAP) {
-    n += mVBuf->NonHeapSizeOfExcludingThis();
-  }
-
-  return n;
-}
-
-} // namespace image
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/imgFrame.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/imgFrame.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/imgFrame.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/imgFrame.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,535 +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_image_src_imgFrame_h
-#define mozilla_image_src_imgFrame_h
-
-#include "mozilla/MemoryReporting.h"
-#include "mozilla/Monitor.h"
-#include "mozilla/Move.h"
-#include "mozilla/VolatileBuffer.h"
-#include "gfxDrawable.h"
-#include "imgIContainer.h"
-#include "MainThreadUtils.h"
-
-namespace mozilla {
-namespace image {
-
-class ImageRegion;
-class DrawableFrameRef;
-class RawAccessFrameRef;
-
-enum class BlendMethod : int8_t {
-  // All color components of the frame, including alpha, overwrite the current
-  // contents of the frame's output buffer region.
-  SOURCE,
-
-  // The frame should be composited onto the output buffer based on its alpha,
-  // using a simple OVER operation.
-  OVER
-};
-
-enum class DisposalMethod : int8_t {
-  CLEAR_ALL = -1,  // Clear the whole image, revealing what's underneath.
-  NOT_SPECIFIED,   // Leave the frame and let the new frame draw on top.
-  KEEP,            // Leave the frame and let the new frame draw on top.
-  CLEAR,           // Clear the frame's area, revealing what's underneath.
-  RESTORE_PREVIOUS // Restore the previous (composited) frame.
-};
-
-enum class Opacity : uint8_t {
-  OPAQUE,
-  SOME_TRANSPARENCY
-};
-
-/**
- * AnimationData contains all of the information necessary for using an imgFrame
- * as part of an animation.
- *
- * It includes pointers to the raw image data of the underlying imgFrame, but
- * does not own that data. A RawAccessFrameRef for the underlying imgFrame must
- * outlive the AnimationData for it to remain valid.
- */
-struct AnimationData
-{
-  AnimationData(uint8_t* aRawData, uint32_t aPaletteDataLength,
-                int32_t aRawTimeout, const nsIntRect& aRect,
-                BlendMethod aBlendMethod, DisposalMethod aDisposalMethod,
-                bool aHasAlpha)
-    : mRawData(aRawData)
-    , mPaletteDataLength(aPaletteDataLength)
-    , mRawTimeout(aRawTimeout)
-    , mRect(aRect)
-    , mBlendMethod(aBlendMethod)
-    , mDisposalMethod(aDisposalMethod)
-    , mHasAlpha(aHasAlpha)
-  { }
-
-  uint8_t* mRawData;
-  uint32_t mPaletteDataLength;
-  int32_t mRawTimeout;
-  nsIntRect mRect;
-  BlendMethod mBlendMethod;
-  DisposalMethod mDisposalMethod;
-  bool mHasAlpha;
-};
-
-/**
- * ScalingData contains all of the information necessary for performing
- * high-quality (CPU-based) scaling an imgFrame.
- *
- * It includes pointers to the raw image data of the underlying imgFrame, but
- * does not own that data. A RawAccessFrameRef for the underlying imgFrame must
- * outlive the ScalingData for it to remain valid.
- */
-struct ScalingData
-{
-  ScalingData(uint8_t* aRawData,
-              gfx::IntSize aSize,
-              uint32_t aBytesPerRow,
-              gfx::SurfaceFormat aFormat)
-    : mRawData(aRawData)
-    , mSize(aSize)
-    , mBytesPerRow(aBytesPerRow)
-    , mFormat(aFormat)
-  { }
-
-  uint8_t* mRawData;
-  gfx::IntSize mSize;
-  uint32_t mBytesPerRow;
-  gfx::SurfaceFormat mFormat;
-};
-
-class imgFrame
-{
-  typedef gfx::Color Color;
-  typedef gfx::DataSourceSurface DataSourceSurface;
-  typedef gfx::DrawTarget DrawTarget;
-  typedef gfx::IntSize IntSize;
-  typedef gfx::SourceSurface SourceSurface;
-  typedef gfx::SurfaceFormat SurfaceFormat;
-
-public:
-  MOZ_DECLARE_REFCOUNTED_TYPENAME(imgFrame)
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(imgFrame)
-
-  imgFrame();
-
-  /**
-   * Initialize this imgFrame with an empty surface and prepare it for being
-   * written to by a decoder.
-   *
-   * This is appropriate for use with decoded images, but it should not be used
-   * when drawing content into an imgFrame, as it may use a different graphics
-   * backend than normal content drawing.
-   */
-  nsresult InitForDecoder(const nsIntSize& aImageSize,
-                          const nsIntRect& aRect,
-                          SurfaceFormat aFormat,
-                          uint8_t aPaletteDepth = 0,
-                          bool aNonPremult = false);
-
-  nsresult InitForDecoder(const nsIntSize& aSize,
-                          SurfaceFormat aFormat,
-                          uint8_t aPaletteDepth = 0)
-  {
-    return InitForDecoder(aSize, nsIntRect(0, 0, aSize.width, aSize.height),
-                          aFormat, aPaletteDepth);
-  }
-
-
-  /**
-   * Initialize this imgFrame with a new surface and draw the provided
-   * gfxDrawable into it.
-   *
-   * This is appropriate to use when drawing content into an imgFrame, as it
-   * uses the same graphics backend as normal content drawing. The downside is
-   * that the underlying surface may not be stored in a volatile buffer on all
-   * platforms, and raw access to the surface (using RawAccessRef()) may be much
-   * more expensive than in the InitForDecoder() case.
-   */
-  nsresult InitWithDrawable(gfxDrawable* aDrawable,
-                            const nsIntSize& aSize,
-                            const SurfaceFormat aFormat,
-                            GraphicsFilter aFilter,
-                            uint32_t aImageFlags);
-
-  /**
-   * Reinitializes an existing imgFrame with new parameters. You must be holding
-   * a RawAccessFrameRef to the imgFrame, and it must never have been written
-   * to, marked finished, or aborted.
-   *
-   * XXX(seth): We will remove this in bug 1117607.
-   */
-  nsresult ReinitForDecoder(const nsIntSize& aImageSize,
-                            const nsIntRect& aRect,
-                            SurfaceFormat aFormat,
-                            uint8_t aPaletteDepth = 0,
-                            bool aNonPremult = false);
-
-  DrawableFrameRef DrawableRef();
-  RawAccessFrameRef RawAccessRef();
-
-  /**
-   * Make this imgFrame permanently available for raw access.
-   *
-   * This is irrevocable, and should be avoided whenever possible, since it
-   * prevents this imgFrame from being optimized and makes it impossible for its
-   * volatile buffer to be freed.
-   *
-   * It is an error to call this without already holding a RawAccessFrameRef to
-   * this imgFrame.
-   */
-  void SetRawAccessOnly();
-
-  bool Draw(gfxContext* aContext, const ImageRegion& aRegion,
-            GraphicsFilter aFilter, uint32_t aImageFlags);
-
-  nsresult ImageUpdated(const nsIntRect& aUpdateRect);
-
-  /**
-   * Mark this imgFrame as completely decoded, and set final options.
-   *
-   * You must always call either Finish() or Abort() before releasing the last
-   * RawAccessFrameRef pointing to an imgFrame.
-   *
-   * @param aFrameOpacity    Whether this imgFrame is opaque.
-   * @param aDisposalMethod  For animation frames, how this imgFrame is cleared
-   *                         from the compositing frame before the next frame is
-   *                         displayed.
-   * @param aRawTimeout      For animation frames, the timeout in milliseconds
-   *                         before the next frame is displayed. This timeout is
-   *                         not necessarily the timeout that will actually be
-   *                         used; see FrameAnimator::GetTimeoutForFrame.
-   * @param aBlendMethod     For animation frames, a blending method to be used
-   *                         when compositing this frame.
-   */
-  void Finish(Opacity aFrameOpacity = Opacity::SOME_TRANSPARENCY,
-              DisposalMethod aDisposalMethod = DisposalMethod::KEEP,
-              int32_t aRawTimeout = 0,
-              BlendMethod aBlendMethod = BlendMethod::OVER);
-
-  /**
-   * Mark this imgFrame as aborted. This informs the imgFrame that if it isn't
-   * completely decoded now, it never will be.
-   *
-   * You must always call either Finish() or Abort() before releasing the last
-   * RawAccessFrameRef pointing to an imgFrame.
-   */
-  void Abort();
-
-  /**
-   * Returns true if this imgFrame is completely decoded.
-   */
-  bool IsImageComplete() const;
-
-  /**
-   * Blocks until this imgFrame is either completely decoded, or is marked as
-   * aborted.
-   *
-   * Note that calling this on the main thread _blocks the main thread_. Be very
-   * careful in your use of this method to avoid excessive main thread jank or
-   * deadlock.
-   */
-  void WaitUntilComplete() const;
-
-  /**
-   * Returns the number of bytes per pixel this imgFrame requires.  This is a
-   * worst-case value that does not take into account the effects of format
-   * changes caused by Optimize(), since an imgFrame is not optimized throughout
-   * its lifetime.
-   */
-  uint32_t GetBytesPerPixel() const { return GetIsPaletted() ? 1 : 4; }
-
-  IntSize GetImageSize() const { return mImageSize; }
-  nsIntRect GetRect() const;
-  IntSize GetSize() const { return mSize; }
-  bool NeedsPadding() const { return mOffset != nsIntPoint(0, 0); }
-  void GetImageData(uint8_t** aData, uint32_t* length) const;
-  uint8_t* GetImageData() const;
-
-  bool GetIsPaletted() const;
-  void GetPaletteData(uint32_t** aPalette, uint32_t* length) const;
-  uint32_t* GetPaletteData() const;
-  uint8_t GetPaletteDepth() const { return mPaletteDepth; }
-
-  /**
-   * Get the SurfaceFormat for this imgFrame.
-   *
-   * This should only be used for assertions.
-   */
-  SurfaceFormat GetFormat() const;
-
-  AnimationData GetAnimationData() const;
-  ScalingData GetScalingData() const;
-
-  bool GetCompositingFailed() const;
-  void SetCompositingFailed(bool val);
-
-  void SetOptimizable();
-
-  Color SinglePixelColor() const;
-  bool IsSinglePixel() const;
-
-  TemporaryRef<SourceSurface> GetSurface();
-  TemporaryRef<DrawTarget> GetDrawTarget();
-
-  size_t SizeOfExcludingThis(gfxMemoryLocation aLocation,
-                             MallocSizeOf aMallocSizeOf) const;
-
-private: // methods
-
-  ~imgFrame();
-
-  nsresult LockImageData();
-  nsresult UnlockImageData();
-  nsresult Optimize();
-  nsresult Deoptimize();
-
-  void AssertImageDataLocked() const;
-
-  bool IsImageCompleteInternal() const;
-  nsresult ImageUpdatedInternal(const nsIntRect& aUpdateRect);
-  void GetImageDataInternal(uint8_t** aData, uint32_t* length) const;
-  uint32_t GetImageBytesPerRow() const;
-  uint32_t GetImageDataLength() const;
-  int32_t GetStride() const;
-  TemporaryRef<SourceSurface> GetSurfaceInternal();
-
-  uint32_t PaletteDataLength() const
-  {
-    return mPaletteDepth ? (size_t(1) << mPaletteDepth) * sizeof(uint32_t)
-                         : 0;
-  }
-
-  struct SurfaceWithFormat {
-    nsRefPtr<gfxDrawable> mDrawable;
-    SurfaceFormat mFormat;
-    SurfaceWithFormat() { }
-    SurfaceWithFormat(gfxDrawable* aDrawable, SurfaceFormat aFormat)
-      : mDrawable(aDrawable), mFormat(aFormat)
-    { }
-    bool IsValid() { return !!mDrawable; }
-  };
-
-  SurfaceWithFormat SurfaceForDrawing(bool               aDoPadding,
-                                      bool               aDoPartialDecode,
-                                      bool               aDoTile,
-                                      gfxContext*        aContext,
-                                      const nsIntMargin& aPadding,
-                                      gfxRect&           aImageRect,
-                                      ImageRegion&       aRegion,
-                                      SourceSurface*     aSurface);
-
-private: // data
-  friend class DrawableFrameRef;
-  friend class RawAccessFrameRef;
-  friend class UnlockImageDataRunnable;
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Thread-safe mutable data, protected by mMonitor.
-  //////////////////////////////////////////////////////////////////////////////
-
-  mutable Monitor mMonitor;
-
-  RefPtr<DataSourceSurface> mImageSurface;
-  RefPtr<SourceSurface> mOptSurface;
-
-  RefPtr<VolatileBuffer> mVBuf;
-  VolatileBufferPtr<uint8_t> mVBufPtr;
-
-  nsIntRect mDecoded;
-
-  //! Number of RawAccessFrameRefs currently alive for this imgFrame.
-  int32_t mLockCount;
-
-  //! Raw timeout for this frame. (See FrameAnimator::GetTimeoutForFrame.)
-  int32_t mTimeout; // -1 means display forever.
-
-  DisposalMethod mDisposalMethod;
-  BlendMethod    mBlendMethod;
-  SurfaceFormat  mFormat;
-
-  bool mHasNoAlpha;
-  bool mAborted;
-
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Effectively const data, only mutated in the Init methods.
-  //////////////////////////////////////////////////////////////////////////////
-
-  IntSize      mImageSize;
-  IntSize      mSize;
-  nsIntPoint   mOffset;
-
-  // The palette and image data for images that are paletted, since Cairo
-  // doesn't support these images.
-  // The paletted data comes first, then the image data itself.
-  // Total length is PaletteDataLength() + GetImageDataLength().
-  uint8_t*     mPalettedImageData;
-  uint8_t      mPaletteDepth;
-
-  bool mNonPremult;
-
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Main-thread-only mutable data.
-  //////////////////////////////////////////////////////////////////////////////
-
-  // Note that the data stored in gfx::Color is *non-alpha-premultiplied*.
-  Color        mSinglePixelColor;
-
-  bool mSinglePixel;
-  bool mCompositingFailed;
-  bool mOptimizable;
-};
-
-/**
- * A reference to an imgFrame that holds the imgFrame's surface in memory,
- * allowing drawing. If you have a DrawableFrameRef |ref| and |if (ref)| returns
- * true, then calls to Draw() and GetSurface() are guaranteed to succeed.
- */
-class DrawableFrameRef final
-{
-public:
-  DrawableFrameRef() { }
-
-  explicit DrawableFrameRef(imgFrame* aFrame)
-    : mFrame(aFrame)
-    , mRef(aFrame->mVBuf)
-  {
-    if (mRef.WasBufferPurged()) {
-      mFrame = nullptr;
-      mRef = nullptr;
-    }
-  }
-
-  DrawableFrameRef(DrawableFrameRef&& aOther)
-    : mFrame(aOther.mFrame.forget())
-    , mRef(Move(aOther.mRef))
-  { }
-
-  DrawableFrameRef& operator=(DrawableFrameRef&& aOther)
-  {
-    MOZ_ASSERT(this != &aOther, "Self-moves are prohibited");
-    mFrame = aOther.mFrame.forget();
-    mRef = Move(aOther.mRef);
-    return *this;
-  }
-
-  explicit operator bool() const { return bool(mFrame); }
-
-  imgFrame* operator->()
-  {
-    MOZ_ASSERT(mFrame);
-    return mFrame;
-  }
-
-  const imgFrame* operator->() const
-  {
-    MOZ_ASSERT(mFrame);
-    return mFrame;
-  }
-
-  imgFrame* get() { return mFrame; }
-  const imgFrame* get() const { return mFrame; }
-
-  void reset()
-  {
-    mFrame = nullptr;
-    mRef = nullptr;
-  }
-
-private:
-  nsRefPtr<imgFrame> mFrame;
-  VolatileBufferPtr<uint8_t> mRef;
-};
-
-/**
- * A reference to an imgFrame that holds the imgFrame's surface in memory in a
- * format appropriate for access as raw data. If you have a RawAccessFrameRef
- * |ref| and |if (ref)| is true, then calls to GetImageData(), GetPaletteData(),
- * and GetDrawTarget() are guaranteed to succeed. This guarantee is stronger
- * than DrawableFrameRef, so everything that a valid DrawableFrameRef guarantees
- * is also guaranteed by a valid RawAccessFrameRef.
- *
- * This may be considerably more expensive than is necessary just for drawing,
- * so only use this when you need to read or write the raw underlying image data
- * that the imgFrame holds.
- */
-class RawAccessFrameRef final
-{
-public:
-  RawAccessFrameRef() { }
-
-  explicit RawAccessFrameRef(imgFrame* aFrame)
-    : mFrame(aFrame)
-  {
-    MOZ_ASSERT(mFrame, "Need a frame");
-
-    if (NS_FAILED(mFrame->LockImageData())) {
-      mFrame->UnlockImageData();
-      mFrame = nullptr;
-    }
-  }
-
-  RawAccessFrameRef(RawAccessFrameRef&& aOther)
-    : mFrame(aOther.mFrame.forget())
-  { }
-
-  ~RawAccessFrameRef()
-  {
-    if (mFrame) {
-      mFrame->UnlockImageData();
-    }
-  }
-
-  RawAccessFrameRef& operator=(RawAccessFrameRef&& aOther)
-  {
-    MOZ_ASSERT(this != &aOther, "Self-moves are prohibited");
-
-    if (mFrame) {
-      mFrame->UnlockImageData();
-    }
-
-    mFrame = aOther.mFrame.forget();
-
-    return *this;
-  }
-
-  explicit operator bool() const { return bool(mFrame); }
-
-  imgFrame* operator->()
-  {
-    MOZ_ASSERT(mFrame);
-    return mFrame.get();
-  }
-
-  const imgFrame* operator->() const
-  {
-    MOZ_ASSERT(mFrame);
-    return mFrame;
-  }
-
-  imgFrame* get() { return mFrame; }
-  const imgFrame* get() const { return mFrame; }
-
-  void reset()
-  {
-    if (mFrame) {
-      mFrame->UnlockImageData();
-    }
-    mFrame = nullptr;
-  }
-
-private:
-  nsRefPtr<imgFrame> mFrame;
-};
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_imgFrame_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/imgLoader.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/imgLoader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/imgLoader.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/imgLoader.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,3062 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "mozilla/Attributes.h"
-#include "mozilla/ClearOnShutdown.h"
-#include "mozilla/Move.h"
-#include "mozilla/Preferences.h"
-
-#include "ImageLogging.h"
-#include "nsPrintfCString.h"
-#include "imgLoader.h"
-#include "imgRequestProxy.h"
-
-#include "nsCOMPtr.h"
-
-#include "nsContentPolicyUtils.h"
-#include "nsContentUtils.h"
-#include "nsCORSListenerProxy.h"
-#include "nsNetUtil.h"
-#include "nsMimeTypes.h"
-#include "nsStreamUtils.h"
-#include "nsIHttpChannel.h"
-#include "nsICachingChannel.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIProgressEventSink.h"
-#include "nsIChannelEventSink.h"
-#include "nsIAsyncVerifyRedirectCallback.h"
-#include "nsIFileURL.h"
-#include "nsCRT.h"
-#include "nsINetworkPredictor.h"
-#include "mozilla/dom/nsMixedContentBlocker.h"
-
-#include "nsIApplicationCache.h"
-#include "nsIApplicationCacheContainer.h"
-
-#include "nsIMemoryReporter.h"
-#include "Image.h"
-#include "gfxPrefs.h"
-
-// we want to explore making the document own the load group
-// so we can associate the document URI with the load group.
-// until this point, we have an evil hack:
-#include "nsIHttpChannelInternal.h"
-#include "nsILoadContext.h"
-#include "nsILoadGroupChild.h"
-
-using namespace mozilla;
-using namespace mozilla::image;
-using namespace mozilla::net;
-
-MOZ_DEFINE_MALLOC_SIZE_OF(ImagesMallocSizeOf)
-
-class imgMemoryReporter final : public nsIMemoryReporter
-{
-  ~imgMemoryReporter() { }
-
-public:
-  NS_DECL_ISUPPORTS
-
-  NS_IMETHOD CollectReports(nsIHandleReportCallback* aHandleReport,
-                            nsISupports* aData, bool aAnonymize) override
-  {
-    nsresult rv;
-    nsTArray<ImageMemoryCounter> chrome;
-    nsTArray<ImageMemoryCounter> content;
-    nsTArray<ImageMemoryCounter> uncached;
-
-    for (uint32_t i = 0; i < mKnownLoaders.Length(); i++) {
-      mKnownLoaders[i]->mChromeCache.EnumerateRead(DoRecordCounter, &chrome);
-      mKnownLoaders[i]->mCache.EnumerateRead(DoRecordCounter, &content);
-      MutexAutoLock lock(mKnownLoaders[i]->mUncachedImagesMutex);
-      mKnownLoaders[i]->
-        mUncachedImages.EnumerateEntries(DoRecordCounterUncached, &uncached);
-    }
-
-    // Note that we only need to anonymize content image URIs.
-
-    rv = ReportCounterArray(aHandleReport, aData, chrome, "images/chrome");
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    rv = ReportCounterArray(aHandleReport, aData, content,
-                            "images/content", aAnonymize);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    // Uncached images may be content or chrome, so anonymize them.
-    rv = ReportCounterArray(aHandleReport, aData, uncached,
-                            "images/uncached", aAnonymize);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    return NS_OK;
-  }
-
-  static int64_t ImagesContentUsedUncompressedDistinguishedAmount()
-  {
-    size_t n = 0;
-    for (uint32_t i = 0; i < imgLoader::sMemReporter->mKnownLoaders.Length();
-         i++) {
-      imgLoader::sMemReporter->mKnownLoaders[i]->
-        mCache.EnumerateRead(DoRecordCounterUsedDecoded, &n);
-    }
-    return n;
-  }
-
-  void RegisterLoader(imgLoader* aLoader)
-  {
-    mKnownLoaders.AppendElement(aLoader);
-  }
-
-  void UnregisterLoader(imgLoader* aLoader)
-  {
-    mKnownLoaders.RemoveElement(aLoader);
-  }
-
-private:
-  nsTArray<imgLoader*> mKnownLoaders;
-
-  struct MemoryTotal
-  {
-    MemoryTotal& operator+=(const ImageMemoryCounter& aImageCounter)
-    {
-      if (aImageCounter.Type() == imgIContainer::TYPE_RASTER) {
-        if (aImageCounter.IsUsed()) {
-          mUsedRasterCounter += aImageCounter.Values();
-        } else {
-          mUnusedRasterCounter += aImageCounter.Values();
-        }
-      } else if (aImageCounter.Type() == imgIContainer::TYPE_VECTOR) {
-        if (aImageCounter.IsUsed()) {
-          mUsedVectorCounter += aImageCounter.Values();
-        } else {
-          mUnusedVectorCounter += aImageCounter.Values();
-        }
-      } else {
-        MOZ_CRASH("Unexpected image type");
-      }
-
-      return *this;
-    }
-
-    const MemoryCounter& UsedRaster() const { return mUsedRasterCounter; }
-    const MemoryCounter& UnusedRaster() const { return mUnusedRasterCounter; }
-    const MemoryCounter& UsedVector() const { return mUsedVectorCounter; }
-    const MemoryCounter& UnusedVector() const { return mUnusedVectorCounter; }
-
-  private:
-    MemoryCounter mUsedRasterCounter;
-    MemoryCounter mUnusedRasterCounter;
-    MemoryCounter mUsedVectorCounter;
-    MemoryCounter mUnusedVectorCounter;
-  };
-
-  // Reports all images of a single kind, e.g. all used chrome images.
-  nsresult ReportCounterArray(nsIHandleReportCallback* aHandleReport,
-                              nsISupports* aData,
-                              nsTArray<ImageMemoryCounter>& aCounterArray,
-                              const char* aPathPrefix,
-                              bool aAnonymize = false)
-  {
-    nsresult rv;
-    MemoryTotal summaryTotal;
-    MemoryTotal nonNotableTotal;
-
-    // Report notable images, and compute total and non-notable aggregate sizes.
-    for (uint32_t i = 0; i < aCounterArray.Length(); i++) {
-      ImageMemoryCounter& counter = aCounterArray[i];
-
-      if (aAnonymize) {
-        counter.URI().Truncate();
-        counter.URI().AppendPrintf("<anonymized-%u>", i);
-      } else {
-        // The URI could be an extremely long data: URI. Truncate if needed.
-        static const size_t max = 256;
-        if (counter.URI().Length() > max) {
-          counter.URI().Truncate(max);
-          counter.URI().AppendLiteral(" (truncated)");
-        }
-        counter.URI().ReplaceChar('/', '\\');
-      }
-
-      summaryTotal += counter;
-
-      if (counter.IsNotable()) {
-        rv = ReportImage(aHandleReport, aData, aPathPrefix, counter);
-        NS_ENSURE_SUCCESS(rv, rv);
-      } else {
-        nonNotableTotal += counter;
-      }
-    }
-
-    // Report non-notable images in aggregate.
-    rv = ReportTotal(aHandleReport, aData, /* aExplicit = */ true,
-                     aPathPrefix, "<non-notable images>/", nonNotableTotal);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    // Report a summary in aggregate, outside of the explicit tree.
-    rv = ReportTotal(aHandleReport, aData, /* aExplicit = */ false,
-                     aPathPrefix, "", summaryTotal);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    return NS_OK;
-  }
-
-  static nsresult ReportImage(nsIHandleReportCallback* aHandleReport,
-                              nsISupports* aData,
-                              const char* aPathPrefix,
-                              const ImageMemoryCounter& aCounter)
-  {
-    nsresult rv;
-
-    nsAutoCString pathPrefix(NS_LITERAL_CSTRING("explicit/"));
-    pathPrefix.Append(aPathPrefix);
-    pathPrefix.Append(aCounter.Type() == imgIContainer::TYPE_RASTER
-                        ? "/raster/"
-                        : "/vector/");
-    pathPrefix.Append(aCounter.IsUsed() ? "used/" : "unused/");
-    pathPrefix.Append("image(");
-    pathPrefix.AppendInt(aCounter.IntrinsicSize().width);
-    pathPrefix.Append("x");
-    pathPrefix.AppendInt(aCounter.IntrinsicSize().height);
-    pathPrefix.Append(", ");
-
-    if (aCounter.URI().IsEmpty()) {
-      pathPrefix.Append("<unknown URI>");
-    } else {
-      pathPrefix.Append(aCounter.URI());
-    }
-
-    pathPrefix.Append(")/");
-
-    rv = ReportSurfaces(aHandleReport, aData, pathPrefix, aCounter);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    rv = ReportSourceValue(aHandleReport, aData, pathPrefix, aCounter.Values());
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    return NS_OK;
-  }
-
-  static nsresult ReportSurfaces(nsIHandleReportCallback* aHandleReport,
-                                 nsISupports* aData,
-                                 const nsACString& aPathPrefix,
-                                 const ImageMemoryCounter& aCounter)
-  {
-    for (const SurfaceMemoryCounter& counter : aCounter.Surfaces()) {
-      nsAutoCString surfacePathPrefix(aPathPrefix);
-      surfacePathPrefix.Append(counter.IsLocked() ? "locked/" : "unlocked/");
-      surfacePathPrefix.Append("surface(");
-
-      if (counter.SubframeSize() &&
-          *counter.SubframeSize() != counter.Key().Size()) {
-        surfacePathPrefix.AppendInt(counter.SubframeSize()->width);
-        surfacePathPrefix.Append("x");
-        surfacePathPrefix.AppendInt(counter.SubframeSize()->height);
-        surfacePathPrefix.Append(" subframe of ");
-      }
-
-      surfacePathPrefix.AppendInt(counter.Key().Size().width);
-      surfacePathPrefix.Append("x");
-      surfacePathPrefix.AppendInt(counter.Key().Size().height);
-
-      if (counter.Type() == SurfaceMemoryCounterType::NORMAL) {
-        surfacePathPrefix.Append("@");
-        surfacePathPrefix.AppendFloat(counter.Key().AnimationTime());
-
-        if (counter.Key().Flags() != imgIContainer::DECODE_FLAGS_DEFAULT) {
-          surfacePathPrefix.Append(", flags:");
-          surfacePathPrefix.AppendInt(counter.Key().Flags(), /* aRadix = */ 16);
-        }
-      } else if (counter.Type() == SurfaceMemoryCounterType::COMPOSITING) {
-        surfacePathPrefix.Append(", compositing frame");
-      } else if (counter.Type() == SurfaceMemoryCounterType::COMPOSITING_PREV) {
-        surfacePathPrefix.Append(", compositing prev frame");
-      } else {
-        MOZ_ASSERT_UNREACHABLE("Unknown counter type");
-      }
-
-      surfacePathPrefix.Append(")/");
-
-      nsresult rv = ReportValues(aHandleReport, aData, surfacePathPrefix,
-                                 counter.Values());
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
-
-    return NS_OK;
-  }
-
-  static nsresult ReportTotal(nsIHandleReportCallback* aHandleReport,
-                              nsISupports* aData,
-                              bool aExplicit,
-                              const char* aPathPrefix,
-                              const char* aPathInfix,
-                              const MemoryTotal& aTotal)
-  {
-    nsresult rv;
-
-    nsAutoCString pathPrefix;
-    if (aExplicit) {
-      pathPrefix.Append("explicit/");
-    }
-    pathPrefix.Append(aPathPrefix);
-
-    nsAutoCString rasterUsedPrefix(pathPrefix);
-    rasterUsedPrefix.Append("/raster/used/");
-    rasterUsedPrefix.Append(aPathInfix);
-    rv = ReportValues(aHandleReport, aData, rasterUsedPrefix,
-                      aTotal.UsedRaster());
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    nsAutoCString rasterUnusedPrefix(pathPrefix);
-    rasterUnusedPrefix.Append("/raster/unused/");
-    rasterUnusedPrefix.Append(aPathInfix);
-    rv = ReportValues(aHandleReport, aData, rasterUnusedPrefix,
-                      aTotal.UnusedRaster());
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    nsAutoCString vectorUsedPrefix(pathPrefix);
-    vectorUsedPrefix.Append("/vector/used/");
-    vectorUsedPrefix.Append(aPathInfix);
-    rv = ReportValues(aHandleReport, aData, vectorUsedPrefix,
-                      aTotal.UsedVector());
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    nsAutoCString vectorUnusedPrefix(pathPrefix);
-    vectorUnusedPrefix.Append("/vector/unused/");
-    vectorUnusedPrefix.Append(aPathInfix);
-    rv = ReportValues(aHandleReport, aData, vectorUnusedPrefix,
-                      aTotal.UnusedVector());
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    return NS_OK;
-  }
-
-  static nsresult ReportValues(nsIHandleReportCallback* aHandleReport,
-                               nsISupports* aData,
-                               const nsACString& aPathPrefix,
-                               const MemoryCounter& aCounter)
-  {
-    nsresult rv;
-
-    rv = ReportSourceValue(aHandleReport, aData, aPathPrefix, aCounter);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    rv = ReportValue(aHandleReport, aData, KIND_HEAP, aPathPrefix,
-                     "decoded-heap",
-                     "Decoded image data which is stored on the heap.",
-                     aCounter.DecodedHeap());
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    rv = ReportValue(aHandleReport, aData, KIND_NONHEAP, aPathPrefix,
-                     "decoded-nonheap",
-                     "Decoded image data which isn't stored on the heap.",
-                     aCounter.DecodedNonHeap());
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    return NS_OK;
-  }
-
-  static nsresult ReportSourceValue(nsIHandleReportCallback* aHandleReport,
-                                    nsISupports* aData,
-                                    const nsACString& aPathPrefix,
-                                    const MemoryCounter& aCounter)
-  {
-    nsresult rv;
-
-    rv = ReportValue(aHandleReport, aData, KIND_HEAP, aPathPrefix,
-                     "source",
-                     "Raster image source data and vector image documents.",
-                     aCounter.Source());
-
-    return rv;
-  }
-
-  static nsresult ReportValue(nsIHandleReportCallback* aHandleReport,
-                              nsISupports* aData,
-                              int32_t aKind,
-                              const nsACString& aPathPrefix,
-                              const char* aPathSuffix,
-                              const char* aDescription,
-                              size_t aValue)
-  {
-    if (aValue == 0) {
-      return NS_OK;
-    }
-
-    nsAutoCString desc(aDescription);
-    nsAutoCString path(aPathPrefix);
-    path.Append(aPathSuffix);
-
-    return aHandleReport->Callback(EmptyCString(), path, aKind, UNITS_BYTES,
-                                   aValue, desc, aData);
-  }
-
-  static PLDHashOperator DoRecordCounter(const ImageCacheKey&,
-                                         imgCacheEntry* aEntry,
-                                         void* aUserArg)
-  {
-    nsRefPtr<imgRequest> req = aEntry->GetRequest();
-    RecordCounterForRequest(req,
-                           static_cast<nsTArray<ImageMemoryCounter>*>(aUserArg),
-                           !aEntry->HasNoProxies());
-    return PL_DHASH_NEXT;
-  }
-
-  static PLDHashOperator
-  DoRecordCounterUncached(nsPtrHashKey<imgRequest>* aEntry, void* aUserArg)
-  {
-    nsRefPtr<imgRequest> req = aEntry->GetKey();
-    RecordCounterForRequest(req,
-                           static_cast<nsTArray<ImageMemoryCounter>*>(aUserArg),
-                           req->HasConsumers());
-    return PL_DHASH_NEXT;
-  }
-
-  static void RecordCounterForRequest(imgRequest* aRequest,
-                                      nsTArray<ImageMemoryCounter>* aArray,
-                                      bool aIsUsed)
-  {
-    nsRefPtr<Image> image = aRequest->GetImage();
-    if (!image) {
-      return;
-    }
-
-    ImageMemoryCounter counter(image, ImagesMallocSizeOf, aIsUsed);
-
-    aArray->AppendElement(Move(counter));
-  }
-
-  static PLDHashOperator DoRecordCounterUsedDecoded(const ImageCacheKey&,
-                                                    imgCacheEntry* aEntry,
-                                                    void* aUserArg)
-  {
-    if (aEntry->HasNoProxies()) {
-      return PL_DHASH_NEXT;
-    }
-
-    nsRefPtr<imgRequest> req = aEntry->GetRequest();
-    nsRefPtr<Image> image = req->GetImage();
-    if (!image) {
-      return PL_DHASH_NEXT;
-    }
-
-    // Both this and EntryImageSizes measure images/content/raster/used/decoded
-    // memory.  This function's measurement is secondary -- the result doesn't
-    // go in the "explicit" tree -- so we use moz_malloc_size_of instead of
-    // ImagesMallocSizeOf to prevent DMD from seeing it reported twice.
-    ImageMemoryCounter counter(image, moz_malloc_size_of, /* aIsUsed = */ true);
-
-    auto n = static_cast<size_t*>(aUserArg);
-    *n += counter.Values().DecodedHeap();
-    *n += counter.Values().DecodedNonHeap();
-
-    return PL_DHASH_NEXT;
-  }
-};
-
-NS_IMPL_ISUPPORTS(imgMemoryReporter, nsIMemoryReporter)
-
-NS_IMPL_ISUPPORTS(nsProgressNotificationProxy,
-                  nsIProgressEventSink,
-                  nsIChannelEventSink,
-                  nsIInterfaceRequestor)
-
-NS_IMETHODIMP
-nsProgressNotificationProxy::OnProgress(nsIRequest* request,
-                                        nsISupports* ctxt,
-                                        int64_t progress,
-                                        int64_t progressMax)
-{
-  nsCOMPtr<nsILoadGroup> loadGroup;
-  request->GetLoadGroup(getter_AddRefs(loadGroup));
-
-  nsCOMPtr<nsIProgressEventSink> target;
-  NS_QueryNotificationCallbacks(mOriginalCallbacks,
-                                loadGroup,
-                                NS_GET_IID(nsIProgressEventSink),
-                                getter_AddRefs(target));
-  if (!target) {
-    return NS_OK;
-  }
-  return target->OnProgress(mImageRequest, ctxt, progress, progressMax);
-}
-
-NS_IMETHODIMP
-nsProgressNotificationProxy::OnStatus(nsIRequest* request,
-                                      nsISupports* ctxt,
-                                      nsresult status,
-                                      const char16_t* statusArg)
-{
-  nsCOMPtr<nsILoadGroup> loadGroup;
-  request->GetLoadGroup(getter_AddRefs(loadGroup));
-
-  nsCOMPtr<nsIProgressEventSink> target;
-  NS_QueryNotificationCallbacks(mOriginalCallbacks,
-                                loadGroup,
-                                NS_GET_IID(nsIProgressEventSink),
-                                getter_AddRefs(target));
-  if (!target) {
-    return NS_OK;
-  }
-  return target->OnStatus(mImageRequest, ctxt, status, statusArg);
-}
-
-NS_IMETHODIMP
-nsProgressNotificationProxy::
-  AsyncOnChannelRedirect(nsIChannel* oldChannel,
-                         nsIChannel* newChannel,
-                         uint32_t flags,
-                         nsIAsyncVerifyRedirectCallback* cb)
-{
-  // Tell the original original callbacks about it too
-  nsCOMPtr<nsILoadGroup> loadGroup;
-  newChannel->GetLoadGroup(getter_AddRefs(loadGroup));
-  nsCOMPtr<nsIChannelEventSink> target;
-  NS_QueryNotificationCallbacks(mOriginalCallbacks,
-                                loadGroup,
-                                NS_GET_IID(nsIChannelEventSink),
-                                getter_AddRefs(target));
-  if (!target) {
-      cb->OnRedirectVerifyCallback(NS_OK);
-      return NS_OK;
-  }
-
-  // Delegate to |target| if set, reusing |cb|
-  return target->AsyncOnChannelRedirect(oldChannel, newChannel, flags, cb);
-}
-
-NS_IMETHODIMP
-nsProgressNotificationProxy::GetInterface(const nsIID& iid,
-                                          void** result)
-{
-  if (iid.Equals(NS_GET_IID(nsIProgressEventSink))) {
-    *result = static_cast<nsIProgressEventSink*>(this);
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  if (iid.Equals(NS_GET_IID(nsIChannelEventSink))) {
-    *result = static_cast<nsIChannelEventSink*>(this);
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  if (mOriginalCallbacks) {
-    return mOriginalCallbacks->GetInterface(iid, result);
-  }
-  return NS_NOINTERFACE;
-}
-
-static void
-NewRequestAndEntry(bool aForcePrincipalCheckForCacheEntry, imgLoader* aLoader,
-                   imgRequest** aRequest, imgCacheEntry** aEntry)
-{
-  nsRefPtr<imgRequest> request = new imgRequest(aLoader);
-  nsRefPtr<imgCacheEntry> entry =
-    new imgCacheEntry(aLoader, request, aForcePrincipalCheckForCacheEntry);
-  aLoader->AddToUncachedImages(request);
-  request.forget(aRequest);
-  entry.forget(aEntry);
-}
-
-static bool
-ShouldRevalidateEntry(imgCacheEntry* aEntry,
-                      nsLoadFlags aFlags,
-                      bool aHasExpired)
-{
-  bool bValidateEntry = false;
-
-  if (aFlags & nsIRequest::LOAD_BYPASS_CACHE) {
-    return false;
-  }
-
-  if (aFlags & nsIRequest::VALIDATE_ALWAYS) {
-    bValidateEntry = true;
-  } else if (aEntry->GetMustValidate()) {
-    bValidateEntry = true;
-  } else if (aHasExpired) {
-    // The cache entry has expired...  Determine whether the stale cache
-    // entry can be used without validation...
-    if (aFlags & (nsIRequest::VALIDATE_NEVER |
-                  nsIRequest::VALIDATE_ONCE_PER_SESSION)) {
-      // VALIDATE_NEVER and VALIDATE_ONCE_PER_SESSION allow stale cache
-      // entries to be used unless they have been explicitly marked to
-      // indicate that revalidation is necessary.
-      bValidateEntry = false;
-
-    } else if (!(aFlags & nsIRequest::LOAD_FROM_CACHE)) {
-      // LOAD_FROM_CACHE allows a stale cache entry to be used... Otherwise,
-      // the entry must be revalidated.
-      bValidateEntry = true;
-    }
-  }
-
-  return bValidateEntry;
-}
-
-/* Call content policies on cached images that went through a redirect */
-static bool
-ShouldLoadCachedImage(imgRequest* aImgRequest,
-                      nsISupports* aLoadingContext,
-                      nsIPrincipal* aLoadingPrincipal)
-{
-  /* Call content policies on cached images - Bug 1082837
-   * Cached images are keyed off of the first uri in a redirect chain.
-   * Hence content policies don't get a chance to test the intermediate hops
-   * or the final desitnation.  Here we test the final destination using
-   * mCurrentURI off of the imgRequest and passing it into content policies.
-   * For Mixed Content Blocker, we do an additional check to determine if any
-   * of the intermediary hops went through an insecure redirect with the
-   * mHadInsecureRedirect flag
-   */
-  bool insecureRedirect = aImgRequest->HadInsecureRedirect();
-  nsCOMPtr<nsIURI> contentLocation;
-  aImgRequest->GetCurrentURI(getter_AddRefs(contentLocation));
-  nsresult rv;
-
-  int16_t decision = nsIContentPolicy::REJECT_REQUEST;
-  rv = NS_CheckContentLoadPolicy(nsIContentPolicy::TYPE_IMAGE,
-                                 contentLocation,
-                                 aLoadingPrincipal,
-                                 aLoadingContext,
-                                 EmptyCString(), //mime guess
-                                 nullptr, //aExtra
-                                 &decision,
-                                 nsContentUtils::GetContentPolicy(),
-                                 nsContentUtils::GetSecurityManager());
-  if (NS_FAILED(rv) || !NS_CP_ACCEPTED(decision)) {
-    return false;
-  }
-
-  // We call all Content Policies above, but we also have to call mcb
-  // individually to check the intermediary redirect hops are secure.
-  if (insecureRedirect) {
-    if (!nsContentUtils::IsSystemPrincipal(aLoadingPrincipal)) {
-      // Set the requestingLocation from the aLoadingPrincipal.
-      nsCOMPtr<nsIURI> requestingLocation;
-      if (aLoadingPrincipal) {
-        rv = aLoadingPrincipal->GetURI(getter_AddRefs(requestingLocation));
-        NS_ENSURE_SUCCESS(rv, false);
-      }
-
-      // reset the decision for mixed content blocker check
-      decision = nsIContentPolicy::REJECT_REQUEST;
-      rv = nsMixedContentBlocker::ShouldLoad(insecureRedirect,
-                                             nsIContentPolicy::TYPE_IMAGE,
-                                             contentLocation,
-                                             requestingLocation,
-                                             aLoadingContext,
-                                             EmptyCString(), //mime guess
-                                             nullptr,
-                                             aLoadingPrincipal,
-                                             &decision);
-      if (NS_FAILED(rv) || !NS_CP_ACCEPTED(decision)) {
-        return false;
-      }
-    }
-  }
-
-  return true;
-}
-
-// 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.  Also checks the Referrer Policy, since requests with different
-// referrers/policies may generate different responses.
-static bool
-ValidateSecurityInfo(imgRequest* request, bool forcePrincipalCheck,
-                     int32_t corsmode, nsIPrincipal* loadingPrincipal,
-                     nsISupports* aCX, 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) {
-    return false;
-  } else if (request->GetCORSMode() != imgIRequest::CORS_NONE ||
-             forcePrincipalCheck) {
-    nsCOMPtr<nsIPrincipal> otherprincipal = request->GetLoadingPrincipal();
-
-    // If we previously had a principal, but we don't now, we can't use this
-    // request.
-    if (otherprincipal && !loadingPrincipal) {
-      return false;
-    }
-
-    if (otherprincipal && loadingPrincipal) {
-      bool equals = false;
-      otherprincipal->Equals(loadingPrincipal, &equals);
-      if (!equals) {
-        return false;
-      }
-    }
-  }
-
-  // Content Policy Check on Cached Images
-  return ShouldLoadCachedImage(request, aCX, loadingPrincipal);
-}
-
-static nsresult
-NewImageChannel(nsIChannel** aResult,
-                // If aForcePrincipalCheckForCacheEntry is true, then we will
-                // force a principal check even when not using CORS before
-                // assuming we have a cache hit on a cache entry that we
-                // create for this channel.  This is an out param that should
-                // be set to true if this channel ends up depending on
-                // aLoadingPrincipal and false otherwise.
-                bool* aForcePrincipalCheckForCacheEntry,
-                nsIURI* aURI,
-                nsIURI* aInitialDocumentURI,
-                nsIURI* aReferringURI,
-                ReferrerPolicy aReferrerPolicy,
-                nsILoadGroup* aLoadGroup,
-                const nsCString& aAcceptHeader,
-                nsLoadFlags aLoadFlags,
-                nsContentPolicyType aPolicyType,
-                nsIPrincipal* aLoadingPrincipal,
-                nsISupports* aRequestingContext)
-{
-  MOZ_ASSERT(aResult);
-
-  nsresult rv;
-  nsCOMPtr<nsIHttpChannel> newHttpChannel;
-
-  nsCOMPtr<nsIInterfaceRequestor> callbacks;
-
-  if (aLoadGroup) {
-    // Get the notification callbacks from the load group for the new channel.
-    //
-    // XXX: This is not exactly correct, because the network request could be
-    //      referenced by multiple windows...  However, the new channel needs
-    //      something.  So, using the 'first' notification callbacks is better
-    //      than nothing...
-    //
-    aLoadGroup->GetNotificationCallbacks(getter_AddRefs(callbacks));
-  }
-
-  // Pass in a nullptr loadgroup because this is the underlying network
-  // request. This request may be referenced by several proxy image requests
-  // (possibly in different documents).
-  // If all of the proxy requests are canceled then this request should be
-  // canceled too.
-  //
-  aLoadFlags |= nsIChannel::LOAD_CLASSIFY_URI;
-
-  nsCOMPtr<nsIPrincipal> triggeringPrincipal = aLoadingPrincipal;
-  bool isSandBoxed = false;
-  // only inherit if we have a principal
-  bool inherit = false;
-  if (triggeringPrincipal) {
-    inherit = nsContentUtils::
-      ChannelShouldInheritPrincipal(triggeringPrincipal,
-                                    aURI,
-                                    false,  // aInheritForAboutBlank
-                                    false); // aForceInherit
-  } else {
-    triggeringPrincipal = nsContentUtils::GetSystemPrincipal();
-  }
-  nsCOMPtr<nsINode> requestingNode = do_QueryInterface(aRequestingContext);
-  nsSecurityFlags securityFlags = nsILoadInfo::SEC_NORMAL;
-  if (inherit) {
-    securityFlags |= nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL;
-  }
-
-  // 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,
-                                              aPolicyType,
-                                              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,
-                       aPolicyType,
-                       nullptr,   // loadGroup
-                       callbacks,
-                       aLoadFlags);
-  }
-
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  *aForcePrincipalCheckForCacheEntry = inherit && !isSandBoxed;
-
-  // Initialize HTTP-specific attributes
-  newHttpChannel = do_QueryInterface(*aResult);
-  if (newHttpChannel) {
-    newHttpChannel->SetRequestHeader(NS_LITERAL_CSTRING("Accept"),
-                                     aAcceptHeader,
-                                     false);
-
-    nsCOMPtr<nsIHttpChannelInternal> httpChannelInternal =
-      do_QueryInterface(newHttpChannel);
-    NS_ENSURE_TRUE(httpChannelInternal, NS_ERROR_UNEXPECTED);
-    httpChannelInternal->SetDocumentURI(aInitialDocumentURI);
-    newHttpChannel->SetReferrerWithPolicy(aReferringURI, aReferrerPolicy);
-  }
-
-  // Image channels are loaded by default with reduced priority.
-  nsCOMPtr<nsISupportsPriority> p = do_QueryInterface(*aResult);
-  if (p) {
-    uint32_t priority = nsISupportsPriority::PRIORITY_LOW;
-
-    if (aLoadFlags & nsIRequest::LOAD_BACKGROUND) {
-      ++priority; // further reduce priority for background loads
-    }
-
-    p->AdjustPriority(priority);
-  }
-
-  // Create a new loadgroup for this new channel, using the old group as
-  // the parent. The indirection keeps the channel insulated from cancels,
-  // but does allow a way for this revalidation to be associated with at
-  // least one base load group for scheduling/caching purposes.
-
-  nsCOMPtr<nsILoadGroup> loadGroup = do_CreateInstance(NS_LOADGROUP_CONTRACTID);
-  nsCOMPtr<nsILoadGroupChild> childLoadGroup = do_QueryInterface(loadGroup);
-  if (childLoadGroup) {
-    childLoadGroup->SetParentLoadGroup(aLoadGroup);
-  }
-  (*aResult)->SetLoadGroup(loadGroup);
-
-  return NS_OK;
-}
-
-static uint32_t
-SecondsFromPRTime(PRTime prTime)
-{
-  return uint32_t(int64_t(prTime) / int64_t(PR_USEC_PER_SEC));
-}
-
-imgCacheEntry::imgCacheEntry(imgLoader* loader, imgRequest* request,
-                             bool forcePrincipalCheck)
- : mLoader(loader),
-   mRequest(request),
-   mDataSize(0),
-   mTouchedTime(SecondsFromPRTime(PR_Now())),
-   mExpiryTime(0),
-   mMustValidate(false),
-   // We start off as evicted so we don't try to update the cache. PutIntoCache
-   // will set this to false.
-   mEvicted(true),
-   mHasNoProxies(true),
-   mForcePrincipalCheck(forcePrincipalCheck)
-{ }
-
-imgCacheEntry::~imgCacheEntry()
-{
-  LOG_FUNC(GetImgLog(), "imgCacheEntry::~imgCacheEntry()");
-}
-
-void
-imgCacheEntry::Touch(bool updateTime /* = true */)
-{
-  LOG_SCOPE(GetImgLog(), "imgCacheEntry::Touch");
-
-  if (updateTime) {
-    mTouchedTime = SecondsFromPRTime(PR_Now());
-  }
-
-  UpdateCache();
-}
-
-void
-imgCacheEntry::UpdateCache(int32_t diff /* = 0 */)
-{
-  // Don't update the cache if we've been removed from it or it doesn't care
-  // about our size or usage.
-  if (!Evicted() && HasNoProxies()) {
-    mLoader->CacheEntriesChanged(mRequest->IsChrome(), diff);
-  }
-}
-
-void
-imgCacheEntry::SetHasNoProxies(bool hasNoProxies)
-{
-  if (PR_LOG_TEST(GetImgLog(), PR_LOG_DEBUG)) {
-    nsRefPtr<ImageURL> uri;
-    mRequest->GetURI(getter_AddRefs(uri));
-    nsAutoCString spec;
-    if (uri) {
-      uri->GetSpec(spec);
-    }
-    if (hasNoProxies) {
-      LOG_FUNC_WITH_PARAM(GetImgLog(), "imgCacheEntry::SetHasNoProxies true",
-                          "uri", spec.get());
-    } else {
-      LOG_FUNC_WITH_PARAM(GetImgLog(), "imgCacheEntry::SetHasNoProxies false",
-                          "uri", spec.get());
-    }
-  }
-
-  mHasNoProxies = hasNoProxies;
-}
-
-imgCacheQueue::imgCacheQueue()
- : mDirty(false),
-   mSize(0)
-{ }
-
-void
-imgCacheQueue::UpdateSize(int32_t diff)
-{
-  mSize += diff;
-}
-
-uint32_t
-imgCacheQueue::GetSize() const
-{
-  return mSize;
-}
-
-#include <algorithm>
-using namespace std;
-
-void
-imgCacheQueue::Remove(imgCacheEntry* entry)
-{
-  queueContainer::iterator it = find(mQueue.begin(), mQueue.end(), entry);
-  if (it != mQueue.end()) {
-    mSize -= (*it)->GetDataSize();
-    mQueue.erase(it);
-    MarkDirty();
-  }
-}
-
-void
-imgCacheQueue::Push(imgCacheEntry* entry)
-{
-  mSize += entry->GetDataSize();
-
-  nsRefPtr<imgCacheEntry> refptr(entry);
-  mQueue.push_back(refptr);
-  MarkDirty();
-}
-
-already_AddRefed<imgCacheEntry>
-imgCacheQueue::Pop()
-{
-  if (mQueue.empty()) {
-    return nullptr;
-  }
-  if (IsDirty()) {
-    Refresh();
-  }
-
-  nsRefPtr<imgCacheEntry> entry = mQueue[0];
-  std::pop_heap(mQueue.begin(), mQueue.end(), imgLoader::CompareCacheEntries);
-  mQueue.pop_back();
-
-  mSize -= entry->GetDataSize();
-  return entry.forget();
-}
-
-void
-imgCacheQueue::Refresh()
-{
-  std::make_heap(mQueue.begin(), mQueue.end(), imgLoader::CompareCacheEntries);
-  mDirty = false;
-}
-
-void
-imgCacheQueue::MarkDirty()
-{
-  mDirty = true;
-}
-
-bool
-imgCacheQueue::IsDirty()
-{
-  return mDirty;
-}
-
-uint32_t
-imgCacheQueue::GetNumElements() const
-{
-  return mQueue.size();
-}
-
-imgCacheQueue::iterator
-imgCacheQueue::begin()
-{
-  return mQueue.begin();
-}
-
-imgCacheQueue::const_iterator
-imgCacheQueue::begin() const
-{
-  return mQueue.begin();
-}
-
-imgCacheQueue::iterator
-imgCacheQueue::end()
-{
-  return mQueue.end();
-}
-
-imgCacheQueue::const_iterator
-imgCacheQueue::end() const
-{
-  return mQueue.end();
-}
-
-nsresult
-imgLoader::CreateNewProxyForRequest(imgRequest* aRequest,
-                                    nsILoadGroup* aLoadGroup,
-                                    imgINotificationObserver* aObserver,
-                                    nsLoadFlags aLoadFlags,
-                                    imgRequestProxy** _retval)
-{
-  LOG_SCOPE_WITH_PARAM(GetImgLog(), "imgLoader::CreateNewProxyForRequest",
-                       "imgRequest", aRequest);
-
-  /* XXX If we move decoding onto separate threads, we should save off the
-     calling thread here and pass it off to |proxyRequest| so that it call
-     proxy calls to |aObserver|.
-   */
-
-  nsRefPtr<imgRequestProxy> proxyRequest = new imgRequestProxy();
-
-  /* It is important to call |SetLoadFlags()| before calling |Init()| because
-     |Init()| adds the request to the loadgroup.
-   */
-  proxyRequest->SetLoadFlags(aLoadFlags);
-
-  nsRefPtr<ImageURL> uri;
-  aRequest->GetURI(getter_AddRefs(uri));
-
-  // init adds itself to imgRequest's list of observers
-  nsresult rv = proxyRequest->Init(aRequest, aLoadGroup, uri, aObserver);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  proxyRequest.forget(_retval);
-  return NS_OK;
-}
-
-class imgCacheExpirationTracker final
-  : public nsExpirationTracker<imgCacheEntry, 3>
-{
-  enum { TIMEOUT_SECONDS = 10 };
-public:
-  imgCacheExpirationTracker();
-
-protected:
-  void NotifyExpired(imgCacheEntry* entry);
-};
-
-imgCacheExpirationTracker::imgCacheExpirationTracker()
- : nsExpirationTracker<imgCacheEntry, 3>(TIMEOUT_SECONDS * 1000)
-{ }
-
-void
-imgCacheExpirationTracker::NotifyExpired(imgCacheEntry* entry)
-{
-  // Hold on to a reference to this entry, because the expiration tracker
-  // mechanism doesn't.
-  nsRefPtr<imgCacheEntry> kungFuDeathGrip(entry);
-
-  if (PR_LOG_TEST(GetImgLog(), PR_LOG_DEBUG)) {
-    nsRefPtr<imgRequest> req(entry->GetRequest());
-    if (req) {
-      nsRefPtr<ImageURL> uri;
-      req->GetURI(getter_AddRefs(uri));
-      nsAutoCString spec;
-      uri->GetSpec(spec);
-      LOG_FUNC_WITH_PARAM(GetImgLog(),
-                         "imgCacheExpirationTracker::NotifyExpired",
-                         "entry", spec.get());
-    }
-  }
-
-  // We can be called multiple times on the same entry. Don't do work multiple
-  // times.
-  if (!entry->Evicted()) {
-    entry->Loader()->RemoveFromCache(entry);
-  }
-
-  entry->Loader()->VerifyCacheSizes();
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-// ImageCacheKey
-///////////////////////////////////////////////////////////////////////////////
-
-ImageCacheKey::ImageCacheKey(nsIURI* aURI)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(aURI);
-
-  bool isChrome;
-  mIsChrome = NS_SUCCEEDED(aURI->SchemeIs("chrome", &isChrome)) && isChrome;
-
-  aURI->GetSpec(mSpec);
-  mHash = ComputeHash(mSpec);
-}
-
-ImageCacheKey::ImageCacheKey(ImageURL* aURI)
-{
-  MOZ_ASSERT(aURI);
-
-  bool isChrome;
-  mIsChrome = NS_SUCCEEDED(aURI->SchemeIs("chrome", &isChrome)) && isChrome;
-
-  aURI->GetSpec(mSpec);
-  mHash = ComputeHash(mSpec);
-}
-
-ImageCacheKey::ImageCacheKey(const ImageCacheKey& aOther)
-  : mSpec(aOther.mSpec)
-  , mHash(aOther.mHash)
-  , mIsChrome(aOther.mIsChrome)
-{ }
-
-ImageCacheKey::ImageCacheKey(ImageCacheKey&& aOther)
-  : mSpec(Move(aOther.mSpec))
-  , mHash(aOther.mHash)
-  , mIsChrome(aOther.mIsChrome)
-{ }
-
-bool
-ImageCacheKey::operator==(const ImageCacheKey& aOther) const
-{
-  return mSpec == aOther.mSpec;
-}
-
-/* static */ uint32_t
-ImageCacheKey::ComputeHash(const nsACString& aSpec)
-{
-  // Since we frequently call Hash() several times in a row on the same
-  // ImageCacheKey, as an optimization we compute our hash once and store it.
-  return HashString(aSpec);
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-// imgLoader
-///////////////////////////////////////////////////////////////////////////////
-
-double imgLoader::sCacheTimeWeight;
-uint32_t imgLoader::sCacheMaxSize;
-imgMemoryReporter* imgLoader::sMemReporter;
-
-NS_IMPL_ISUPPORTS(imgLoader, imgILoader, nsIContentSniffer, imgICache,
-                  nsISupportsWeakReference, nsIObserver)
-
-static imgLoader* gSingleton = nullptr;
-static imgLoader* gPBSingleton = nullptr;
-
-imgLoader*
-imgLoader::Singleton()
-{
-  if (!gSingleton) {
-    gSingleton = imgLoader::Create();
-  }
-  return gSingleton;
-}
-
-imgLoader*
-imgLoader::PBSingleton()
-{
-  if (!gPBSingleton) {
-    gPBSingleton = imgLoader::Create();
-    gPBSingleton->RespectPrivacyNotifications();
-  }
-  return gPBSingleton;
-}
-
-imgLoader::imgLoader()
-: mUncachedImagesMutex("imgLoader::UncachedImages"), mRespectPrivacy(false)
-{
-  sMemReporter->AddRef();
-  sMemReporter->RegisterLoader(this);
-}
-
-already_AddRefed<imgLoader>
-imgLoader::GetInstance()
-{
-  static nsRefPtr<imgLoader> singleton;
-  if (!singleton) {
-    singleton = imgLoader::Create();
-    if (!singleton) {
-        return nullptr;
-    }
-    ClearOnShutdown(&singleton);
-  }
-  nsRefPtr<imgLoader> loader = singleton.get();
-  return loader.forget();
-}
-
-static PLDHashOperator
-ClearLoaderPointer(nsPtrHashKey<imgRequest>* aEntry, void* aUserArg)
-{
-  nsRefPtr<imgRequest> req = aEntry->GetKey();
-  req->ClearLoader();
-
-  return PL_DHASH_NEXT;
-}
-
-imgLoader::~imgLoader()
-{
-  ClearChromeImageCache();
-  ClearImageCache();
-  {
-    // If there are any of our imgRequest's left they are in the uncached
-    // images set, so clear their pointer to us.
-    MutexAutoLock lock(mUncachedImagesMutex);
-    mUncachedImages.EnumerateEntries(ClearLoaderPointer, nullptr);
-  }
-  sMemReporter->UnregisterLoader(this);
-  sMemReporter->Release();
-}
-
-void
-imgLoader::VerifyCacheSizes()
-{
-#ifdef DEBUG
-  if (!mCacheTracker) {
-    return;
-  }
-
-  uint32_t cachesize = mCache.Count() + mChromeCache.Count();
-  uint32_t queuesize =
-    mCacheQueue.GetNumElements() + mChromeCacheQueue.GetNumElements();
-  uint32_t trackersize = 0;
-  for (nsExpirationTracker<imgCacheEntry, 3>::Iterator it(mCacheTracker);
-       it.Next(); ){
-    trackersize++;
-  }
-  MOZ_ASSERT(queuesize == trackersize, "Queue and tracker sizes out of sync!");
-  MOZ_ASSERT(queuesize <= cachesize, "Queue has more elements than cache!");
-#endif
-}
-
-imgLoader::imgCacheTable&
-imgLoader::GetCache(bool aForChrome)
-{
-  return aForChrome ? mChromeCache : mCache;
-}
-
-imgLoader::imgCacheTable&
-imgLoader::GetCache(const ImageCacheKey& aKey)
-{
-  return GetCache(aKey.IsChrome());
-}
-
-imgCacheQueue&
-imgLoader::GetCacheQueue(bool aForChrome)
-{
-  return aForChrome ? mChromeCacheQueue : mCacheQueue;
-
-}
-
-imgCacheQueue&
-imgLoader::GetCacheQueue(const ImageCacheKey& aKey)
-{
-  return GetCacheQueue(aKey.IsChrome());
-
-}
-
-void imgLoader::GlobalInit()
-{
-  sCacheTimeWeight = gfxPrefs::ImageCacheTimeWeight() / 1000.0;
-  int32_t cachesize = gfxPrefs::ImageCacheSize();
-  sCacheMaxSize = cachesize > 0 ? cachesize : 0;
-
-  sMemReporter = new imgMemoryReporter();
-  RegisterStrongMemoryReporter(sMemReporter);
-  RegisterImagesContentUsedUncompressedDistinguishedAmount(
-    imgMemoryReporter::ImagesContentUsedUncompressedDistinguishedAmount);
-}
-
-nsresult
-imgLoader::InitCache()
-{
-  nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
-  if (!os) {
-    return NS_ERROR_FAILURE;
-  }
-
-  os->AddObserver(this, "memory-pressure", false);
-  os->AddObserver(this, "app-theme-changed", false);
-  os->AddObserver(this, "chrome-flush-skin-caches", false);
-  os->AddObserver(this, "chrome-flush-caches", false);
-  os->AddObserver(this, "last-pb-context-exited", false);
-  os->AddObserver(this, "profile-before-change", false);
-  os->AddObserver(this, "xpcom-shutdown", false);
-
-  mCacheTracker = new imgCacheExpirationTracker();
-
-  return NS_OK;
-}
-
-nsresult
-imgLoader::Init()
-{
-  InitCache();
-
-  ReadAcceptHeaderPref();
-
-  Preferences::AddWeakObserver(this, "image.http.accept");
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-imgLoader::RespectPrivacyNotifications()
-{
-  mRespectPrivacy = true;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-imgLoader::Observe(nsISupports* aSubject, const char* aTopic,
-                   const char16_t* aData)
-{
-  // We listen for pref change notifications...
-  if (!strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID)) {
-    if (!NS_strcmp(aData, MOZ_UTF16("image.http.accept"))) {
-      ReadAcceptHeaderPref();
-    }
-
-  } else if (strcmp(aTopic, "memory-pressure") == 0) {
-    MinimizeCaches();
-  } else if (strcmp(aTopic, "app-theme-changed") == 0) {
-    ClearImageCache();
-    MinimizeCaches();
-  } else if (strcmp(aTopic, "chrome-flush-skin-caches") == 0 ||
-             strcmp(aTopic, "chrome-flush-caches") == 0) {
-    MinimizeCaches();
-    ClearChromeImageCache();
-  } else if (strcmp(aTopic, "last-pb-context-exited") == 0) {
-    if (mRespectPrivacy) {
-      ClearImageCache();
-      ClearChromeImageCache();
-    }
-  } else if (strcmp(aTopic, "profile-before-change") == 0 ||
-             strcmp(aTopic, "xpcom-shutdown") == 0) {
-    mCacheTracker = nullptr;
-
-  } else {
-  // (Nothing else should bring us here)
-    MOZ_ASSERT(0, "Invalid topic received");
-  }
-
-  return NS_OK;
-}
-
-void imgLoader::ReadAcceptHeaderPref()
-{
-  nsAdoptingCString accept = Preferences::GetCString("image.http.accept");
-  if (accept) {
-    mAcceptHeader = accept;
-  } else {
-    mAcceptHeader =
-        IMAGE_PNG "," IMAGE_WILDCARD ";q=0.8," ANY_WILDCARD ";q=0.5";
-  }
-}
-
-/* void clearCache (in boolean chrome); */
-NS_IMETHODIMP
-imgLoader::ClearCache(bool chrome)
-{
-  if (chrome) {
-    return ClearChromeImageCache();
-  } else {
-    return ClearImageCache();
-  }
-}
-
-/* void removeEntry(in nsIURI uri); */
-NS_IMETHODIMP
-imgLoader::RemoveEntry(nsIURI* aURI)
-{
-  if (aURI && RemoveFromCache(ImageCacheKey(aURI))) {
-    return NS_OK;
-  }
-
-  return NS_ERROR_NOT_AVAILABLE;
-}
-
-/* imgIRequest findEntry(in nsIURI uri); */
-NS_IMETHODIMP
-imgLoader::FindEntryProperties(nsIURI* uri, nsIProperties** _retval)
-{
-  *_retval = nullptr;
-
-  ImageCacheKey key(uri);
-  imgCacheTable& cache = GetCache(key);
-
-  nsRefPtr<imgCacheEntry> entry;
-  if (cache.Get(key, getter_AddRefs(entry)) && entry) {
-    if (mCacheTracker && entry->HasNoProxies()) {
-      mCacheTracker->MarkUsed(entry);
-    }
-
-    nsRefPtr<imgRequest> request = entry->GetRequest();
-    if (request) {
-      nsCOMPtr<nsIProperties> properties = request->Properties();
-      properties.forget(_retval);
-    }
-  }
-
-  return NS_OK;
-}
-
-void
-imgLoader::Shutdown()
-{
-  NS_IF_RELEASE(gSingleton);
-  NS_IF_RELEASE(gPBSingleton);
-}
-
-nsresult
-imgLoader::ClearChromeImageCache()
-{
-  return EvictEntries(mChromeCache);
-}
-
-nsresult
-imgLoader::ClearImageCache()
-{
-  return EvictEntries(mCache);
-}
-
-void
-imgLoader::MinimizeCaches()
-{
-  EvictEntries(mCacheQueue);
-  EvictEntries(mChromeCacheQueue);
-}
-
-bool
-imgLoader::PutIntoCache(const ImageCacheKey& aKey, imgCacheEntry* entry)
-{
-  imgCacheTable& cache = GetCache(aKey);
-
-  LOG_STATIC_FUNC_WITH_PARAM(GetImgLog(),
-                             "imgLoader::PutIntoCache", "uri", aKey.Spec());
-
-  // Check to see if this request already exists in the cache. If so, we'll
-  // replace the old version.
-  nsRefPtr<imgCacheEntry> tmpCacheEntry;
-  if (cache.Get(aKey, getter_AddRefs(tmpCacheEntry)) && tmpCacheEntry) {
-    PR_LOG(GetImgLog(), PR_LOG_DEBUG,
-           ("[this=%p] imgLoader::PutIntoCache -- Element already in the cache",
-            nullptr));
-    nsRefPtr<imgRequest> tmpRequest = tmpCacheEntry->GetRequest();
-
-    // If it already exists, and we're putting the same key into the cache, we
-    // should remove the old version.
-    PR_LOG(GetImgLog(), PR_LOG_DEBUG,
-           ("[this=%p] imgLoader::PutIntoCache -- Replacing cached element",
-            nullptr));
-
-    RemoveFromCache(aKey);
-  } else {
-    PR_LOG(GetImgLog(), PR_LOG_DEBUG,
-           ("[this=%p] imgLoader::PutIntoCache --"
-            " Element NOT already in the cache", nullptr));
-  }
-
-  cache.Put(aKey, entry);
-
-  // We can be called to resurrect an evicted entry.
-  if (entry->Evicted()) {
-    entry->SetEvicted(false);
-  }
-
-  // If we're resurrecting an entry with no proxies, put it back in the
-  // tracker and queue.
-  if (entry->HasNoProxies()) {
-    nsresult addrv = NS_OK;
-
-    if (mCacheTracker) {
-      addrv = mCacheTracker->AddObject(entry);
-    }
-
-    if (NS_SUCCEEDED(addrv)) {
-      imgCacheQueue& queue = GetCacheQueue(aKey);
-      queue.Push(entry);
-    }
-  }
-
-  nsRefPtr<imgRequest> request = entry->GetRequest();
-  request->SetIsInCache(true);
-  RemoveFromUncachedImages(request);
-
-  return true;
-}
-
-bool
-imgLoader::SetHasNoProxies(imgRequest* aRequest, imgCacheEntry* aEntry)
-{
-  if (PR_LOG_TEST(GetImgLog(), PR_LOG_DEBUG)) {
-    nsRefPtr<ImageURL> uri;
-    aRequest->GetURI(getter_AddRefs(uri));
-    nsAutoCString spec;
-    uri->GetSpec(spec);
-
-    LOG_STATIC_FUNC_WITH_PARAM(GetImgLog(),
-                               "imgLoader::SetHasNoProxies", "uri", spec.get());
-  }
-
-  aEntry->SetHasNoProxies(true);
-
-  if (aEntry->Evicted()) {
-    return false;
-  }
-
-  imgCacheQueue& queue = GetCacheQueue(aRequest->IsChrome());
-
-  nsresult addrv = NS_OK;
-
-  if (mCacheTracker) {
-    addrv = mCacheTracker->AddObject(aEntry);
-  }
-
-  if (NS_SUCCEEDED(addrv)) {
-    queue.Push(aEntry);
-  }
-
-  imgCacheTable& cache = GetCache(aRequest->IsChrome());
-  CheckCacheLimits(cache, queue);
-
-  return true;
-}
-
-bool
-imgLoader::SetHasProxies(imgRequest* aRequest)
-{
-  VerifyCacheSizes();
-
-  nsRefPtr<ImageURL> uri;
-  aRequest->GetURI(getter_AddRefs(uri));
-  ImageCacheKey key(uri);
-
-  imgCacheTable& cache = GetCache(key);
-
-  LOG_STATIC_FUNC_WITH_PARAM(GetImgLog(),
-                             "imgLoader::SetHasProxies", "uri", key.Spec());
-
-  nsRefPtr<imgCacheEntry> entry;
-  if (cache.Get(key, getter_AddRefs(entry)) && entry) {
-    // Make sure the cache entry is for the right request
-    nsRefPtr<imgRequest> entryRequest = entry->GetRequest();
-    if (entryRequest == aRequest && entry->HasNoProxies()) {
-      imgCacheQueue& queue = GetCacheQueue(key);
-      queue.Remove(entry);
-
-      if (mCacheTracker) {
-        mCacheTracker->RemoveObject(entry);
-      }
-
-      entry->SetHasNoProxies(false);
-
-      return true;
-    }
-  }
-
-  return false;
-}
-
-void
-imgLoader::CacheEntriesChanged(bool aForChrome, int32_t aSizeDiff /* = 0 */)
-{
-  imgCacheQueue& queue = GetCacheQueue(aForChrome);
-  queue.MarkDirty();
-  queue.UpdateSize(aSizeDiff);
-}
-
-void
-imgLoader::CheckCacheLimits(imgCacheTable& cache, imgCacheQueue& queue)
-{
-  if (queue.GetNumElements() == 0) {
-    NS_ASSERTION(queue.GetSize() == 0,
-                 "imgLoader::CheckCacheLimits -- incorrect cache size");
-  }
-
-  // Remove entries from the cache until we're back at our desired max size.
-  while (queue.GetSize() > sCacheMaxSize) {
-    // Remove the first entry in the queue.
-    nsRefPtr<imgCacheEntry> entry(queue.Pop());
-
-    NS_ASSERTION(entry, "imgLoader::CheckCacheLimits -- NULL entry pointer");
-
-    if (PR_LOG_TEST(GetImgLog(), PR_LOG_DEBUG)) {
-      nsRefPtr<imgRequest> req(entry->GetRequest());
-      if (req) {
-        nsRefPtr<ImageURL> uri;
-        req->GetURI(getter_AddRefs(uri));
-        nsAutoCString spec;
-        uri->GetSpec(spec);
-        LOG_STATIC_FUNC_WITH_PARAM(GetImgLog(),
-                                   "imgLoader::CheckCacheLimits",
-                                   "entry", spec.get());
-      }
-    }
-
-    if (entry) {
-      RemoveFromCache(entry);
-    }
-  }
-}
-
-bool
-imgLoader::ValidateRequestWithNewChannel(imgRequest* request,
-                                         nsIURI* aURI,
-                                         nsIURI* aInitialDocumentURI,
-                                         nsIURI* aReferrerURI,
-                                         ReferrerPolicy aReferrerPolicy,
-                                         nsILoadGroup* aLoadGroup,
-                                         imgINotificationObserver* aObserver,
-                                         nsISupports* aCX,
-                                         nsLoadFlags aLoadFlags,
-                                         nsContentPolicyType aLoadPolicyType,
-                                         imgRequestProxy** aProxyRequest,
-                                         nsIPrincipal* aLoadingPrincipal,
-                                         int32_t aCORSMode)
-{
-  // now we need to insert a new channel request object inbetween the real
-  // request and the proxy that basically delays loading the image until it
-  // gets a 304 or figures out that this needs to be a new request
-
-  nsresult rv;
-
-  // If we're currently in the middle of validating this request, just hand
-  // back a proxy to it; the required work will be done for us.
-  if (request->GetValidator()) {
-    rv = CreateNewProxyForRequest(request, aLoadGroup, aObserver,
-                                  aLoadFlags, aProxyRequest);
-    if (NS_FAILED(rv)) {
-      return false;
-    }
-
-    if (*aProxyRequest) {
-      imgRequestProxy* proxy = static_cast<imgRequestProxy*>(*aProxyRequest);
-
-      // We will send notifications from imgCacheValidator::OnStartRequest().
-      // In the mean time, we must defer notifications because we are added to
-      // the imgRequest's proxy list, and we can get extra notifications
-      // resulting from methods such as RequestDecode(). See bug 579122.
-      proxy->SetNotificationsDeferred(true);
-
-      // Attach the proxy without notifying
-      request->GetValidator()->AddProxy(proxy);
-    }
-
-    return NS_SUCCEEDED(rv);
-
-  } else {
-    // We will rely on Necko to cache this request when it's possible, and to
-    // tell imgCacheValidator::OnStartRequest whether the request came from its
-    // cache.
-    nsCOMPtr<nsIChannel> newChannel;
-    bool forcePrincipalCheck;
-    rv = NewImageChannel(getter_AddRefs(newChannel),
-                         &forcePrincipalCheck,
-                         aURI,
-                         aInitialDocumentURI,
-                         aReferrerURI,
-                         aReferrerPolicy,
-                         aLoadGroup,
-                         mAcceptHeader,
-                         aLoadFlags,
-                         aLoadPolicyType,
-                         aLoadingPrincipal,
-                         aCX);
-    if (NS_FAILED(rv)) {
-      return false;
-    }
-
-    nsRefPtr<imgRequestProxy> req;
-    rv = CreateNewProxyForRequest(request, aLoadGroup, aObserver,
-                                  aLoadFlags, getter_AddRefs(req));
-    if (NS_FAILED(rv)) {
-      return false;
-    }
-
-    // Make sure that OnStatus/OnProgress calls have the right request set...
-    nsRefPtr<nsProgressNotificationProxy> progressproxy =
-        new nsProgressNotificationProxy(newChannel, req);
-    if (!progressproxy) {
-      return false;
-    }
-
-    nsRefPtr<imgCacheValidator> hvc =
-      new imgCacheValidator(progressproxy, this, request, aCX,
-                            forcePrincipalCheck);
-
-    // Casting needed here to get past multiple inheritance.
-    nsCOMPtr<nsIStreamListener> listener =
-      do_QueryInterface(static_cast<nsIThreadRetargetableStreamListener*>(hvc));
-    NS_ENSURE_TRUE(listener, false);
-
-    // We must set the notification callbacks before setting up the
-    // CORS listener, because that's also interested inthe
-    // notification callbacks.
-    newChannel->SetNotificationCallbacks(hvc);
-
-    if (aCORSMode != imgIRequest::CORS_NONE) {
-      bool withCredentials = aCORSMode == imgIRequest::CORS_USE_CREDENTIALS;
-      nsRefPtr<nsCORSListenerProxy> corsproxy =
-        new nsCORSListenerProxy(listener, aLoadingPrincipal, withCredentials);
-      rv = corsproxy->Init(newChannel, DataURIHandling::Allow);
-      if (NS_FAILED(rv)) {
-        return false;
-      }
-
-      listener = corsproxy;
-    }
-
-    request->SetValidator(hvc);
-
-    // We will send notifications from imgCacheValidator::OnStartRequest().
-    // In the mean time, we must defer notifications because we are added to
-    // the imgRequest's proxy list, and we can get extra notifications
-    // resulting from methods such as RequestDecode(). See bug 579122.
-    req->SetNotificationsDeferred(true);
-
-    // Add the proxy without notifying
-    hvc->AddProxy(req);
-
-    mozilla::net::PredictorLearn(aURI, aInitialDocumentURI,
-        nsINetworkPredictor::LEARN_LOAD_SUBRESOURCE, aLoadGroup);
-
-    rv = newChannel->AsyncOpen(listener, nullptr);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return false;
-    }
-
-    req.forget(aProxyRequest);
-    return true;
-  }
-}
-
-bool
-imgLoader::ValidateEntry(imgCacheEntry* aEntry,
-                         nsIURI* aURI,
-                         nsIURI* aInitialDocumentURI,
-                         nsIURI* aReferrerURI,
-                         ReferrerPolicy aReferrerPolicy,
-                         nsILoadGroup* aLoadGroup,
-                         imgINotificationObserver* aObserver,
-                         nsISupports* aCX,
-                         nsLoadFlags aLoadFlags,
-                         nsContentPolicyType aLoadPolicyType,
-                         bool aCanMakeNewChannel,
-                         imgRequestProxy** aProxyRequest,
-                         nsIPrincipal* aLoadingPrincipal,
-                         int32_t aCORSMode)
-{
-  LOG_SCOPE(GetImgLog(), "imgLoader::ValidateEntry");
-
-  bool hasExpired;
-  uint32_t expirationTime = aEntry->GetExpiryTime();
-  if (expirationTime <= SecondsFromPRTime(PR_Now())) {
-    hasExpired = true;
-  } else {
-    hasExpired = false;
-  }
-
-  nsresult rv;
-
-  // Special treatment for file URLs - aEntry has expired if file has changed
-  nsCOMPtr<nsIFileURL> fileUrl(do_QueryInterface(aURI));
-  if (fileUrl) {
-    uint32_t lastModTime = aEntry->GetTouchedTime();
-
-    nsCOMPtr<nsIFile> theFile;
-    rv = fileUrl->GetFile(getter_AddRefs(theFile));
-    if (NS_SUCCEEDED(rv)) {
-      PRTime fileLastMod;
-      rv = theFile->GetLastModifiedTime(&fileLastMod);
-      if (NS_SUCCEEDED(rv)) {
-        // nsIFile uses millisec, NSPR usec
-        fileLastMod *= 1000;
-        hasExpired = SecondsFromPRTime((PRTime)fileLastMod) > lastModTime;
-      }
-    }
-  }
-
-  nsRefPtr<imgRequest> request(aEntry->GetRequest());
-
-  if (!request) {
-    return false;
-  }
-
-  if (!ValidateSecurityInfo(request, aEntry->ForcePrincipalCheck(),
-                            aCORSMode, aLoadingPrincipal,
-                            aCX, aReferrerPolicy))
-    return false;
-
-  // data URIs are immutable and by their nature can't leak data, so we can
-  // just return true in that case.  Doing so would mean that shift-reload
-  // doesn't reload data URI documents/images though (which is handy for
-  // debugging during gecko development) so we make an exception in that case.
-  nsAutoCString scheme;
-  aURI->GetScheme(scheme);
-  if (scheme.EqualsLiteral("data") &&
-      !(aLoadFlags & nsIRequest::LOAD_BYPASS_CACHE)) {
-    return true;
-  }
-
-  bool validateRequest = false;
-
-  // If the request's loadId is the same as the aCX, then it is ok to use
-  // this one because it has already been validated for this context.
-  //
-  // XXX: nullptr seems to be a 'special' key value that indicates that NO
-  //      validation is required.
-  //
-  void *key = (void*) aCX;
-  if (request->LoadId() != key) {
-    // If we would need to revalidate this entry, but we're being told to
-    // bypass the cache, we don't allow this entry to be used.
-    if (aLoadFlags & nsIRequest::LOAD_BYPASS_CACHE) {
-      return false;
-    }
-
-    // Determine whether the cache aEntry must be revalidated...
-    validateRequest = ShouldRevalidateEntry(aEntry, aLoadFlags, hasExpired);
-
-    PR_LOG(GetImgLog(), PR_LOG_DEBUG,
-           ("imgLoader::ValidateEntry validating cache entry. "
-            "validateRequest = %d", validateRequest));
-  } else if (!key && PR_LOG_TEST(GetImgLog(), PR_LOG_DEBUG)) {
-    nsAutoCString spec;
-    aURI->GetSpec(spec);
-
-    PR_LOG(GetImgLog(), PR_LOG_DEBUG,
-           ("imgLoader::ValidateEntry BYPASSING cache validation for %s "
-            "because of NULL LoadID", spec.get()));
-  }
-
-  // We can't use a cached request if it comes from a different
-  // application cache than this load is expecting.
-  nsCOMPtr<nsIApplicationCacheContainer> appCacheContainer;
-  nsCOMPtr<nsIApplicationCache> requestAppCache;
-  nsCOMPtr<nsIApplicationCache> groupAppCache;
-  if ((appCacheContainer = do_GetInterface(request->GetRequest()))) {
-    appCacheContainer->GetApplicationCache(getter_AddRefs(requestAppCache));
-  }
-  if ((appCacheContainer = do_QueryInterface(aLoadGroup))) {
-    appCacheContainer->GetApplicationCache(getter_AddRefs(groupAppCache));
-  }
-
-  if (requestAppCache != groupAppCache) {
-    PR_LOG(GetImgLog(), PR_LOG_DEBUG,
-           ("imgLoader::ValidateEntry - Unable to use cached imgRequest "
-            "[request=%p] because of mismatched application caches\n",
-            address_of(request)));
-    return false;
-  }
-
-  if (validateRequest && aCanMakeNewChannel) {
-    LOG_SCOPE(GetImgLog(),
-              "imgLoader::ValidateRequest |cache hit| must validate");
-
-    return ValidateRequestWithNewChannel(request, aURI, aInitialDocumentURI,
-                                         aReferrerURI, aReferrerPolicy,
-                                         aLoadGroup, aObserver,
-                                         aCX, aLoadFlags, aLoadPolicyType,
-                                         aProxyRequest, aLoadingPrincipal,
-                                         aCORSMode);
-  }
-
-  return !validateRequest;
-}
-
-bool
-imgLoader::RemoveFromCache(const ImageCacheKey& aKey)
-{
-  LOG_STATIC_FUNC_WITH_PARAM(GetImgLog(),
-                             "imgLoader::RemoveFromCache", "uri", aKey.Spec());
-
-  imgCacheTable& cache = GetCache(aKey);
-  imgCacheQueue& queue = GetCacheQueue(aKey);
-
-  nsRefPtr<imgCacheEntry> entry;
-  if (cache.Get(aKey, getter_AddRefs(entry)) && entry) {
-    cache.Remove(aKey);
-
-    MOZ_ASSERT(!entry->Evicted(), "Evicting an already-evicted cache entry!");
-
-    // Entries with no proxies are in the tracker.
-    if (entry->HasNoProxies()) {
-      if (mCacheTracker) {
-        mCacheTracker->RemoveObject(entry);
-      }
-      queue.Remove(entry);
-    }
-
-    entry->SetEvicted(true);
-
-    nsRefPtr<imgRequest> request = entry->GetRequest();
-    request->SetIsInCache(false);
-    AddToUncachedImages(request);
-
-    return true;
-
-  } else {
-    return false;
-  }
-}
-
-bool
-imgLoader::RemoveFromCache(imgCacheEntry* entry)
-{
-  LOG_STATIC_FUNC(GetImgLog(), "imgLoader::RemoveFromCache entry");
-
-  nsRefPtr<imgRequest> request = entry->GetRequest();
-  if (request) {
-    nsRefPtr<ImageURL> uri;
-    if (NS_SUCCEEDED(request->GetURI(getter_AddRefs(uri))) && uri) {
-      ImageCacheKey key(uri);
-
-      imgCacheTable& cache = GetCache(key);
-      imgCacheQueue& queue = GetCacheQueue(key);
-
-#ifdef DEBUG
-      LOG_STATIC_FUNC_WITH_PARAM(GetImgLog(),
-                                 "imgLoader::RemoveFromCache", "entry's uri",
-                                 key.Spec());
-#endif
-
-      cache.Remove(key);
-
-      if (entry->HasNoProxies()) {
-        LOG_STATIC_FUNC(GetImgLog(),
-                        "imgLoader::RemoveFromCache removing from tracker");
-        if (mCacheTracker) {
-          mCacheTracker->RemoveObject(entry);
-        }
-        queue.Remove(entry);
-      }
-
-      entry->SetEvicted(true);
-      request->SetIsInCache(false);
-      AddToUncachedImages(request);
-
-      return true;
-    }
-  }
-
-  return false;
-}
-
-static PLDHashOperator
-EnumEvictEntries(const ImageCacheKey&,
-                 nsRefPtr<imgCacheEntry>& aData,
-                 void* data)
-{
-  nsTArray<nsRefPtr<imgCacheEntry> >* entries =
-    reinterpret_cast<nsTArray<nsRefPtr<imgCacheEntry> > *>(data);
-
-  entries->AppendElement(aData);
-
-  return PL_DHASH_NEXT;
-}
-
-nsresult
-imgLoader::EvictEntries(imgCacheTable& aCacheToClear)
-{
-  LOG_STATIC_FUNC(GetImgLog(), "imgLoader::EvictEntries table");
-
-  // We have to make a temporary, since RemoveFromCache removes the element
-  // from the queue, invalidating iterators.
-  nsTArray<nsRefPtr<imgCacheEntry> > entries;
-  aCacheToClear.Enumerate(EnumEvictEntries, &entries);
-
-  for (uint32_t i = 0; i < entries.Length(); ++i) {
-    if (!RemoveFromCache(entries[i])) {
-      return NS_ERROR_FAILURE;
-    }
-  }
-
-  MOZ_ASSERT(aCacheToClear.Count() == 0);
-
-  return NS_OK;
-}
-
-nsresult
-imgLoader::EvictEntries(imgCacheQueue& aQueueToClear)
-{
-  LOG_STATIC_FUNC(GetImgLog(), "imgLoader::EvictEntries queue");
-
-  // We have to make a temporary, since RemoveFromCache removes the element
-  // from the queue, invalidating iterators.
-  nsTArray<nsRefPtr<imgCacheEntry> > entries(aQueueToClear.GetNumElements());
-  for (imgCacheQueue::const_iterator i = aQueueToClear.begin();
-       i != aQueueToClear.end(); ++i) {
-    entries.AppendElement(*i);
-  }
-
-  for (uint32_t i = 0; i < entries.Length(); ++i) {
-    if (!RemoveFromCache(entries[i])) {
-      return NS_ERROR_FAILURE;
-    }
-  }
-
-  MOZ_ASSERT(aQueueToClear.GetNumElements() == 0);
-
-  return NS_OK;
-}
-
-void
-imgLoader::AddToUncachedImages(imgRequest* aRequest)
-{
-  MutexAutoLock lock(mUncachedImagesMutex);
-  mUncachedImages.PutEntry(aRequest);
-}
-
-void
-imgLoader::RemoveFromUncachedImages(imgRequest* aRequest)
-{
-  MutexAutoLock lock(mUncachedImagesMutex);
-  mUncachedImages.RemoveEntry(aRequest);
-}
-
-
-#define LOAD_FLAGS_CACHE_MASK    (nsIRequest::LOAD_BYPASS_CACHE | \
-                                  nsIRequest::LOAD_FROM_CACHE)
-
-#define LOAD_FLAGS_VALIDATE_MASK (nsIRequest::VALIDATE_ALWAYS |   \
-                                  nsIRequest::VALIDATE_NEVER |    \
-                                  nsIRequest::VALIDATE_ONCE_PER_SESSION)
-
-NS_IMETHODIMP
-imgLoader::LoadImageXPCOM(nsIURI* aURI,
-                          nsIURI* aInitialDocumentURI,
-                          nsIURI* aReferrerURI,
-                          const nsAString& aReferrerPolicy,
-                          nsIPrincipal* aLoadingPrincipal,
-                          nsILoadGroup* aLoadGroup,
-                          imgINotificationObserver* aObserver,
-                          nsISupports* aCX,
-                          nsLoadFlags aLoadFlags,
-                          nsISupports* aCacheKey,
-                          nsContentPolicyType aContentPolicyType,
-                          imgIRequest** _retval)
-{
-    // Optional parameter, so defaults to 0 (== TYPE_INVALID)
-    if (!aContentPolicyType) {
-      aContentPolicyType = nsIContentPolicy::TYPE_IMAGE;
-    }
-    imgRequestProxy* proxy;
-    ReferrerPolicy refpol = ReferrerPolicyFromString(aReferrerPolicy);
-    nsresult rv = LoadImage(aURI,
-                            aInitialDocumentURI,
-                            aReferrerURI,
-                            refpol,
-                            aLoadingPrincipal,
-                            aLoadGroup,
-                            aObserver,
-                            aCX,
-                            aLoadFlags,
-                            aCacheKey,
-                            aContentPolicyType,
-                            EmptyString(),
-                            &proxy);
-    *_retval = proxy;
-    return rv;
-}
-
-// imgIRequest loadImage(in nsIURI aURI,
-//                       in nsIURI aInitialDocumentURL,
-//                       in nsIURI aReferrerURI,
-//                       in nsIPrincipal aLoadingPrincipal,
-//                       in nsILoadGroup aLoadGroup,
-//                       in imgINotificationObserver aObserver,
-//                       in nsISupports aCX,
-//                       in nsLoadFlags aLoadFlags,
-//                       in nsISupports cacheKey);
-nsresult
-imgLoader::LoadImage(nsIURI* aURI,
-                     nsIURI* aInitialDocumentURI,
-                     nsIURI* aReferrerURI,
-                     ReferrerPolicy aReferrerPolicy,
-                     nsIPrincipal* aLoadingPrincipal,
-                     nsILoadGroup* aLoadGroup,
-                     imgINotificationObserver* aObserver,
-                     nsISupports* aCX,
-                     nsLoadFlags aLoadFlags,
-                     nsISupports* aCacheKey,
-                     nsContentPolicyType aContentPolicyType,
-                     const nsAString& initiatorType,
-                     imgRequestProxy** _retval)
-{
-  VerifyCacheSizes();
-
-  NS_ASSERTION(aURI, "imgLoader::LoadImage -- NULL URI pointer");
-
-  if (!aURI) {
-    return NS_ERROR_NULL_POINTER;
-  }
-
-  nsAutoCString spec;
-  aURI->GetSpec(spec);
-  LOG_SCOPE_WITH_PARAM(GetImgLog(), "imgLoader::LoadImage", "aURI", spec.get());
-
-  *_retval = nullptr;
-
-  nsRefPtr<imgRequest> request;
-
-  nsresult rv;
-  nsLoadFlags requestFlags = nsIRequest::LOAD_NORMAL;
-
-#ifdef DEBUG
-  bool isPrivate = false;
-
-  if (aLoadGroup) {
-    nsCOMPtr<nsIInterfaceRequestor> callbacks;
-    aLoadGroup->GetNotificationCallbacks(getter_AddRefs(callbacks));
-    if (callbacks) {
-      nsCOMPtr<nsILoadContext> loadContext = do_GetInterface(callbacks);
-      isPrivate = loadContext && loadContext->UsePrivateBrowsing();
-    }
-  }
-  MOZ_ASSERT(isPrivate == mRespectPrivacy);
-#endif
-
-  // Get the default load flags from the loadgroup (if possible)...
-  if (aLoadGroup) {
-    aLoadGroup->GetLoadFlags(&requestFlags);
-  }
-  //
-  // Merge the default load flags with those passed in via aLoadFlags.
-  // Currently, *only* the caching, validation and background load flags
-  // are merged...
-  //
-  // The flags in aLoadFlags take precedence over the default flags!
-  //
-  if (aLoadFlags & LOAD_FLAGS_CACHE_MASK) {
-    // Override the default caching flags...
-    requestFlags = (requestFlags & ~LOAD_FLAGS_CACHE_MASK) |
-                   (aLoadFlags & LOAD_FLAGS_CACHE_MASK);
-  }
-  if (aLoadFlags & LOAD_FLAGS_VALIDATE_MASK) {
-    // Override the default validation flags...
-    requestFlags = (requestFlags & ~LOAD_FLAGS_VALIDATE_MASK) |
-                   (aLoadFlags & LOAD_FLAGS_VALIDATE_MASK);
-  }
-  if (aLoadFlags & nsIRequest::LOAD_BACKGROUND) {
-    // Propagate background loading...
-    requestFlags |= nsIRequest::LOAD_BACKGROUND;
-  }
-
-  int32_t corsmode = imgIRequest::CORS_NONE;
-  if (aLoadFlags & imgILoader::LOAD_CORS_ANONYMOUS) {
-    corsmode = imgIRequest::CORS_ANONYMOUS;
-  } else if (aLoadFlags & imgILoader::LOAD_CORS_USE_CREDENTIALS) {
-    corsmode = imgIRequest::CORS_USE_CREDENTIALS;
-  }
-
-  nsRefPtr<imgCacheEntry> entry;
-
-  // Look in the cache for our URI, and then validate it.
-  // XXX For now ignore aCacheKey. We will need it in the future
-  // for correctly dealing with image load requests that are a result
-  // of post data.
-  ImageCacheKey key(aURI);
-  imgCacheTable& cache = GetCache(key);
-
-  if (cache.Get(key, getter_AddRefs(entry)) && entry) {
-    if (ValidateEntry(entry, aURI, aInitialDocumentURI, aReferrerURI,
-                      aReferrerPolicy, aLoadGroup, aObserver, aCX,
-                      requestFlags, aContentPolicyType, true, _retval,
-                      aLoadingPrincipal, corsmode)) {
-      request = entry->GetRequest();
-
-      // If this entry has no proxies, its request has no reference to the
-      // entry.
-      if (entry->HasNoProxies()) {
-        LOG_FUNC_WITH_PARAM(GetImgLog(),
-          "imgLoader::LoadImage() adding proxyless entry", "uri", key.Spec());
-        MOZ_ASSERT(!request->HasCacheEntry(),
-          "Proxyless entry's request has cache entry!");
-        request->SetCacheEntry(entry);
-
-        if (mCacheTracker) {
-          mCacheTracker->MarkUsed(entry);
-        }
-      }
-
-      entry->Touch();
-
-#ifdef DEBUG_joe
-      printf("CACHEGET: %d %s %d\n", time(nullptr), spec.get(),
-             entry->SizeOfData());
-#endif
-    } else {
-      // We can't use this entry. We'll try to load it off the network, and if
-      // successful, overwrite the old entry in the cache with a new one.
-      entry = nullptr;
-    }
-  }
-
-  // Keep the channel in this scope, so we can adjust its notificationCallbacks
-  // later when we create the proxy.
-  nsCOMPtr<nsIChannel> newChannel;
-  // If we didn't get a cache hit, we need to load from the network.
-  if (!request) {
-    LOG_SCOPE(GetImgLog(), "imgLoader::LoadImage |cache miss|");
-
-    bool forcePrincipalCheck;
-    rv = NewImageChannel(getter_AddRefs(newChannel),
-                         &forcePrincipalCheck,
-                         aURI,
-                         aInitialDocumentURI,
-                         aReferrerURI,
-                         aReferrerPolicy,
-                         aLoadGroup,
-                         mAcceptHeader,
-                         requestFlags,
-                         aContentPolicyType,
-                         aLoadingPrincipal,
-                         aCX);
-    if (NS_FAILED(rv)) {
-      return NS_ERROR_FAILURE;
-    }
-
-    MOZ_ASSERT(NS_UsePrivateBrowsing(newChannel) == mRespectPrivacy);
-
-    NewRequestAndEntry(forcePrincipalCheck, this, getter_AddRefs(request),
-                       getter_AddRefs(entry));
-
-    PR_LOG(GetImgLog(), PR_LOG_DEBUG,
-           ("[this=%p] imgLoader::LoadImage -- Created new imgRequest"
-            " [request=%p]\n", this, request.get()));
-
-    nsCOMPtr<nsILoadGroup> channelLoadGroup;
-    newChannel->GetLoadGroup(getter_AddRefs(channelLoadGroup));
-    request->Init(aURI, aURI, /* aHadInsecureRedirect = */ false,
-                  channelLoadGroup, newChannel, entry, aCX,
-                  aLoadingPrincipal, corsmode, aReferrerPolicy);
-
-    // Add the initiator type for this image load
-    nsCOMPtr<nsITimedChannel> timedChannel = do_QueryInterface(newChannel);
-    if (timedChannel) {
-      timedChannel->SetInitiatorType(initiatorType);
-    }
-
-    // create the proxy listener
-    nsCOMPtr<nsIStreamListener> pl = new ProxyListener(request.get());
-
-    // See if we need to insert a CORS proxy between the proxy listener and the
-    // request.
-    nsCOMPtr<nsIStreamListener> listener = pl;
-    if (corsmode != imgIRequest::CORS_NONE) {
-      PR_LOG(GetImgLog(), PR_LOG_DEBUG,
-             ("[this=%p] imgLoader::LoadImage -- Setting up a CORS load",
-              this));
-      bool withCredentials = corsmode == imgIRequest::CORS_USE_CREDENTIALS;
-
-      nsRefPtr<nsCORSListenerProxy> corsproxy =
-        new nsCORSListenerProxy(pl, aLoadingPrincipal, withCredentials);
-      rv = corsproxy->Init(newChannel, DataURIHandling::Allow);
-      if (NS_FAILED(rv)) {
-        PR_LOG(GetImgLog(), PR_LOG_DEBUG,
-               ("[this=%p] imgLoader::LoadImage -- nsCORSListenerProxy "
-                "creation failed: 0x%x\n", this, rv));
-        request->CancelAndAbort(rv);
-        return NS_ERROR_FAILURE;
-      }
-
-      listener = corsproxy;
-    }
-
-    PR_LOG(GetImgLog(), PR_LOG_DEBUG,
-           ("[this=%p] imgLoader::LoadImage -- Calling channel->AsyncOpen()\n",
-            this));
-
-    mozilla::net::PredictorLearn(aURI, aInitialDocumentURI,
-        nsINetworkPredictor::LEARN_LOAD_SUBRESOURCE, aLoadGroup);
-
-    nsresult openRes = newChannel->AsyncOpen(listener, nullptr);
-
-    if (NS_FAILED(openRes)) {
-      PR_LOG(GetImgLog(), PR_LOG_DEBUG,
-             ("[this=%p] imgLoader::LoadImage -- AsyncOpen() failed: 0x%x\n",
-              this, openRes));
-      request->CancelAndAbort(openRes);
-      return openRes;
-    }
-
-    // Try to add the new request into the cache.
-    PutIntoCache(key, entry);
-  } else {
-    LOG_MSG_WITH_PARAM(GetImgLog(),
-                       "imgLoader::LoadImage |cache hit|", "request", request);
-  }
-
-
-  // If we didn't get a proxy when validating the cache entry, we need to
-  // create one.
-  if (!*_retval) {
-    // ValidateEntry() has three return values: "Is valid," "might be valid --
-    // validating over network", and "not valid." If we don't have a _retval,
-    // we know ValidateEntry is not validating over the network, so it's safe
-    // to SetLoadId here because we know this request is valid for this context.
-    //
-    // Note, however, that this doesn't guarantee the behaviour we want (one
-    // URL maps to the same image on a page) if we load the same image in a
-    // different tab (see bug 528003), because its load id will get re-set, and
-    // that'll cause us to validate over the network.
-    request->SetLoadId(aCX);
-
-    LOG_MSG(GetImgLog(), "imgLoader::LoadImage", "creating proxy request.");
-    rv = CreateNewProxyForRequest(request, aLoadGroup, aObserver,
-                                  requestFlags, _retval);
-    if (NS_FAILED(rv)) {
-      return rv;
-    }
-
-    imgRequestProxy* proxy = *_retval;
-
-    // Make sure that OnStatus/OnProgress calls have the right request set, if
-    // we did create a channel here.
-    if (newChannel) {
-      nsCOMPtr<nsIInterfaceRequestor> requestor(
-          new nsProgressNotificationProxy(newChannel, proxy));
-      if (!requestor) {
-        return NS_ERROR_OUT_OF_MEMORY;
-      }
-      newChannel->SetNotificationCallbacks(requestor);
-    }
-
-    // Note that it's OK to add here even if the request is done.  If it is,
-    // it'll send a OnStopRequest() to the proxy in imgRequestProxy::Notify and
-    // the proxy will be removed from the loadgroup.
-    proxy->AddToLoadGroup();
-
-    // If we're loading off the network, explicitly don't notify our proxy,
-    // because necko (or things called from necko, such as imgCacheValidator)
-    // are going to call our notifications asynchronously, and we can't make it
-    // further asynchronous because observers might rely on imagelib completing
-    // its work between the channel's OnStartRequest and OnStopRequest.
-    if (!newChannel) {
-      proxy->NotifyListener();
-    }
-
-    return rv;
-  }
-
-  NS_ASSERTION(*_retval, "imgLoader::LoadImage -- no return value");
-
-  return NS_OK;
-}
-
-/* imgIRequest
-loadImageWithChannelXPCOM(in nsIChannel channel,
-                          in imgINotificationObserver aObserver,
-                          in nsISupports cx,
-                          out nsIStreamListener); */
-NS_IMETHODIMP
-imgLoader::LoadImageWithChannelXPCOM(nsIChannel* channel,
-                                     imgINotificationObserver* aObserver,
-                                     nsISupports* aCX,
-                                     nsIStreamListener** listener,
-                                     imgIRequest** _retval)
-{
-    nsresult result;
-    imgRequestProxy* proxy;
-    result = LoadImageWithChannel(channel,
-                                  aObserver,
-                                  aCX,
-                                  listener,
-                                  &proxy);
-    *_retval = proxy;
-    return result;
-}
-
-nsresult
-imgLoader::LoadImageWithChannel(nsIChannel* channel,
-                                imgINotificationObserver* aObserver,
-                                nsISupports* aCX,
-                                nsIStreamListener** listener,
-                                imgRequestProxy** _retval)
-{
-  NS_ASSERTION(channel,
-               "imgLoader::LoadImageWithChannel -- NULL channel pointer");
-
-  MOZ_ASSERT(NS_UsePrivateBrowsing(channel) == mRespectPrivacy);
-
-  nsRefPtr<imgRequest> request;
-
-  nsCOMPtr<nsIURI> uri;
-  channel->GetURI(getter_AddRefs(uri));
-  ImageCacheKey key(uri);
-
-  nsLoadFlags requestFlags = nsIRequest::LOAD_NORMAL;
-  channel->GetLoadFlags(&requestFlags);
-
-  nsRefPtr<imgCacheEntry> entry;
-
-  if (requestFlags & nsIRequest::LOAD_BYPASS_CACHE) {
-    RemoveFromCache(key);
-  } else {
-    // Look in the cache for our URI, and then validate it.
-    // XXX For now ignore aCacheKey. We will need it in the future
-    // for correctly dealing with image load requests that are a result
-    // of post data.
-    imgCacheTable& cache = GetCache(key);
-    if (cache.Get(key, getter_AddRefs(entry)) && entry) {
-      // We don't want to kick off another network load. So we ask
-      // ValidateEntry to only do validation without creating a new proxy. If
-      // it says that the entry isn't valid any more, we'll only use the entry
-      // we're getting if the channel is loading from the cache anyways.
-      //
-      // XXX -- should this be changed? it's pretty much verbatim from the old
-      // code, but seems nonsensical.
-      //
-      // Since aCanMakeNewChannel == false, we don't need to pass content policy
-      // type/principal/etc
-      if (ValidateEntry(entry, uri, nullptr, nullptr, RP_Default,
-                        nullptr, aObserver, aCX, requestFlags,
-                        nsIContentPolicy::TYPE_INVALID, false, nullptr,
-                        nullptr, imgIRequest::CORS_NONE)) {
-        request = entry->GetRequest();
-      } else {
-        nsCOMPtr<nsICachingChannel> cacheChan(do_QueryInterface(channel));
-        bool bUseCacheCopy;
-
-        if (cacheChan) {
-          cacheChan->IsFromCache(&bUseCacheCopy);
-        } else {
-          bUseCacheCopy = false;
-        }
-
-        if (!bUseCacheCopy) {
-          entry = nullptr;
-        } else {
-          request = entry->GetRequest();
-        }
-      }
-
-      if (request && entry) {
-        // If this entry has no proxies, its request has no reference to
-        // the entry.
-        if (entry->HasNoProxies()) {
-          LOG_FUNC_WITH_PARAM(GetImgLog(),
-            "imgLoader::LoadImageWithChannel() adding proxyless entry",
-            "uri", key.Spec());
-          MOZ_ASSERT(!request->HasCacheEntry(),
-            "Proxyless entry's request has cache entry!");
-          request->SetCacheEntry(entry);
-
-          if (mCacheTracker) {
-            mCacheTracker->MarkUsed(entry);
-          }
-        }
-      }
-    }
-  }
-
-  nsCOMPtr<nsILoadGroup> loadGroup;
-  channel->GetLoadGroup(getter_AddRefs(loadGroup));
-
-  // Filter out any load flags not from nsIRequest
-  requestFlags &= nsIRequest::LOAD_REQUESTMASK;
-
-  nsresult rv = NS_OK;
-  if (request) {
-    // we have this in our cache already.. cancel the current (document) load
-
-    // this should fire an OnStopRequest
-    channel->Cancel(NS_ERROR_PARSED_DATA_CACHED);
-
-    *listener = nullptr; // give them back a null nsIStreamListener
-
-    rv = CreateNewProxyForRequest(request, loadGroup, aObserver,
-                                  requestFlags, _retval);
-    static_cast<imgRequestProxy*>(*_retval)->NotifyListener();
-  } else {
-    // Default to doing a principal check because we don't know who
-    // started that load and whether their principal ended up being
-    // inherited on the channel.
-    NewRequestAndEntry(true, this, getter_AddRefs(request),
-                       getter_AddRefs(entry));
-
-    // We use originalURI here to fulfil the imgIRequest contract on GetURI.
-    nsCOMPtr<nsIURI> originalURI;
-    channel->GetOriginalURI(getter_AddRefs(originalURI));
-
-    // No principal specified here, because we're not passed one.
-    // In LoadImageWithChannel, the redirects that may have been
-    // assoicated with this load would have gone through necko.
-    // We only have the final URI in ImageLib and hence don't know
-    // if the request went through insecure redirects.  But if it did,
-    // the necko cache should have handled that (since all necko cache hits
-    // including the redirects will go through content policy).  Hence, we
-    // can set aHadInsecureRedirect to false here.
-    request->Init(originalURI, uri, /* aHadInsecureRedirect = */ false,
-                  channel, channel, entry, aCX, nullptr,
-                  imgIRequest::CORS_NONE, RP_Default);
-
-    nsRefPtr<ProxyListener> pl =
-      new ProxyListener(static_cast<nsIStreamListener*>(request.get()));
-    pl.forget(listener);
-
-    // Try to add the new request into the cache.
-    PutIntoCache(ImageCacheKey(originalURI), entry);
-
-    rv = CreateNewProxyForRequest(request, loadGroup, aObserver,
-                                  requestFlags, _retval);
-
-    // Explicitly don't notify our proxy, because we're loading off the
-    // network, and necko (or things called from necko, such as
-    // imgCacheValidator) are going to call our notifications asynchronously,
-    // and we can't make it further asynchronous because observers might rely
-    // on imagelib completing its work between the channel's OnStartRequest and
-    // OnStopRequest.
-  }
-
-  return rv;
-}
-
-bool
-imgLoader::SupportImageWithMimeType(const char* aMimeType,
-                                    AcceptedMimeTypes aAccept
-                                      /* = AcceptedMimeTypes::IMAGES */)
-{
-  nsAutoCString mimeType(aMimeType);
-  ToLowerCase(mimeType);
-
-  if (aAccept == AcceptedMimeTypes::IMAGES_AND_DOCUMENTS &&
-      mimeType.EqualsLiteral("image/svg+xml")) {
-    return true;
-  }
-
-  return Image::GetDecoderType(mimeType.get()) != Image::eDecoderType_unknown;
-}
-
-NS_IMETHODIMP
-imgLoader::GetMIMETypeFromContent(nsIRequest* aRequest,
-                                  const uint8_t* aContents,
-                                  uint32_t aLength,
-                                  nsACString& aContentType)
-{
-  return GetMimeTypeFromContent((const char*)aContents, aLength, aContentType);
-}
-
-/* static */
-nsresult
-imgLoader::GetMimeTypeFromContent(const char* aContents,
-                                  uint32_t aLength,
-                                  nsACString& aContentType)
-{
-  /* Is it a GIF? */
-  if (aLength >= 6 && (!nsCRT::strncmp(aContents, "GIF87a", 6) ||
-                       !nsCRT::strncmp(aContents, "GIF89a", 6))) {
-    aContentType.AssignLiteral(IMAGE_GIF);
-
-  /* or a PNG? */
-  } else if (aLength >= 8 && ((unsigned char)aContents[0]==0x89 &&
-                              (unsigned char)aContents[1]==0x50 &&
-                              (unsigned char)aContents[2]==0x4E &&
-                              (unsigned char)aContents[3]==0x47 &&
-                              (unsigned char)aContents[4]==0x0D &&
-                              (unsigned char)aContents[5]==0x0A &&
-                              (unsigned char)aContents[6]==0x1A &&
-                              (unsigned char)aContents[7]==0x0A)) {
-    aContentType.AssignLiteral(IMAGE_PNG);
-
-  /* maybe a JPEG (JFIF)? */
-  /* JFIF files start with SOI APP0 but older files can start with SOI DQT
-   * so we test for SOI followed by any marker, i.e. FF D8 FF
-   * this will also work for SPIFF JPEG files if they appear in the future.
-   *
-   * (JFIF is 0XFF 0XD8 0XFF 0XE0 <skip 2> 0X4A 0X46 0X49 0X46 0X00)
-   */
-  } else if (aLength >= 3 &&
-             ((unsigned char)aContents[0])==0xFF &&
-             ((unsigned char)aContents[1])==0xD8 &&
-             ((unsigned char)aContents[2])==0xFF) {
-    aContentType.AssignLiteral(IMAGE_JPEG);
-
-  /* or how about ART? */
-  /* ART begins with JG (4A 47). Major version offset 2.
-   * Minor version offset 3. Offset 4 must be nullptr.
-   */
-  } else if (aLength >= 5 &&
-             ((unsigned char) aContents[0])==0x4a &&
-             ((unsigned char) aContents[1])==0x47 &&
-             ((unsigned char) aContents[4])==0x00 ) {
-    aContentType.AssignLiteral(IMAGE_ART);
-
-  } else if (aLength >= 2 && !nsCRT::strncmp(aContents, "BM", 2)) {
-    aContentType.AssignLiteral(IMAGE_BMP);
-
-  // ICOs always begin with a 2-byte 0 followed by a 2-byte 1.
-  // CURs begin with 2-byte 0 followed by 2-byte 2.
-  } else if (aLength >= 4 && (!memcmp(aContents, "\000\000\001\000", 4) ||
-                              !memcmp(aContents, "\000\000\002\000", 4))) {
-    aContentType.AssignLiteral(IMAGE_ICO);
-
-  } else {
-    /* none of the above?  I give up */
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-
-  return NS_OK;
-}
-
-/**
- * proxy stream listener class used to handle multipart/x-mixed-replace
- */
-
-#include "nsIRequest.h"
-#include "nsIStreamConverterService.h"
-
-NS_IMPL_ISUPPORTS(ProxyListener,
-                  nsIStreamListener,
-                  nsIThreadRetargetableStreamListener,
-                  nsIRequestObserver)
-
-ProxyListener::ProxyListener(nsIStreamListener* dest) :
-  mDestListener(dest)
-{
-  /* member initializers and constructor code */
-}
-
-ProxyListener::~ProxyListener()
-{
-  /* destructor code */
-}
-
-
-/** nsIRequestObserver methods **/
-
-/* void onStartRequest (in nsIRequest request, in nsISupports ctxt); */
-NS_IMETHODIMP
-ProxyListener::OnStartRequest(nsIRequest* aRequest, nsISupports* ctxt)
-{
-  if (!mDestListener) {
-    return NS_ERROR_FAILURE;
-  }
-
-  nsCOMPtr<nsIChannel> channel(do_QueryInterface(aRequest));
-  if (channel) {
-    // We need to set the initiator type for the image load
-    nsCOMPtr<nsITimedChannel> timedChannel = do_QueryInterface(channel);
-    if (timedChannel) {
-      nsAutoString type;
-      timedChannel->GetInitiatorType(type);
-      if (type.IsEmpty()) {
-        timedChannel->SetInitiatorType(NS_LITERAL_STRING("img"));
-      }
-    }
-
-    nsAutoCString contentType;
-    nsresult rv = channel->GetContentType(contentType);
-
-    if (!contentType.IsEmpty()) {
-     /* If multipart/x-mixed-replace content, we'll insert a MIME decoder
-        in the pipeline to handle the content and pass it along to our
-        original listener.
-      */
-      if (NS_LITERAL_CSTRING("multipart/x-mixed-replace").Equals(contentType)) {
-
-        nsCOMPtr<nsIStreamConverterService> convServ(
-          do_GetService("@mozilla.org/streamConverters;1", &rv));
-        if (NS_SUCCEEDED(rv)) {
-          nsCOMPtr<nsIStreamListener> toListener(mDestListener);
-          nsCOMPtr<nsIStreamListener> fromListener;
-
-          rv = convServ->AsyncConvertData("multipart/x-mixed-replace",
-                                          "*/*",
-                                          toListener,
-                                          nullptr,
-                                          getter_AddRefs(fromListener));
-          if (NS_SUCCEEDED(rv)) {
-            mDestListener = fromListener;
-          }
-        }
-      }
-    }
-  }
-
-  return mDestListener->OnStartRequest(aRequest, ctxt);
-}
-
-/* void onStopRequest (in nsIRequest request, in nsISupports ctxt,
-                       in nsresult status); */
-NS_IMETHODIMP
-ProxyListener::OnStopRequest(nsIRequest* aRequest,
-                             nsISupports* ctxt,
-                             nsresult status)
-{
-  if (!mDestListener) {
-    return NS_ERROR_FAILURE;
-  }
-
-  return mDestListener->OnStopRequest(aRequest, ctxt, status);
-}
-
-/** nsIStreamListener methods **/
-
-/* void onDataAvailable (in nsIRequest request, in nsISupports ctxt,
-                         in nsIInputStream inStr,
-                         in unsigned long long sourceOffset,
-                         in unsigned long count); */
-NS_IMETHODIMP
-ProxyListener::OnDataAvailable(nsIRequest* aRequest, nsISupports* ctxt,
-                               nsIInputStream* inStr, uint64_t sourceOffset,
-                               uint32_t count)
-{
-  if (!mDestListener) {
-    return NS_ERROR_FAILURE;
-  }
-
-  return mDestListener->OnDataAvailable(aRequest, ctxt, inStr,
-                                        sourceOffset, count);
-}
-
-/** nsThreadRetargetableStreamListener methods **/
-NS_IMETHODIMP
-ProxyListener::CheckListenerChain()
-{
-  NS_ASSERTION(NS_IsMainThread(), "Should be on the main thread!");
-  nsresult rv = NS_OK;
-  nsCOMPtr<nsIThreadRetargetableStreamListener> retargetableListener =
-    do_QueryInterface(mDestListener, &rv);
-  if (retargetableListener) {
-    rv = retargetableListener->CheckListenerChain();
-  }
-  PR_LOG(GetImgLog(), PR_LOG_DEBUG,
-         ("ProxyListener::CheckListenerChain %s [this=%p listener=%p rv=%x]",
-          (NS_SUCCEEDED(rv) ? "success" : "failure"),
-          this, (nsIStreamListener*)mDestListener, rv));
-  return rv;
-}
-
-/**
- * http validate class.  check a channel for a 304
- */
-
-NS_IMPL_ISUPPORTS(imgCacheValidator, nsIStreamListener, nsIRequestObserver,
-                  nsIThreadRetargetableStreamListener,
-                  nsIChannelEventSink, nsIInterfaceRequestor,
-                  nsIAsyncVerifyRedirectCallback)
-
-imgCacheValidator::imgCacheValidator(nsProgressNotificationProxy* progress,
-                                     imgLoader* loader, imgRequest* request,
-                                     nsISupports* aContext,
-                                     bool forcePrincipalCheckForCacheEntry)
- : mProgressProxy(progress),
-   mRequest(request),
-   mContext(aContext),
-   mImgLoader(loader),
-   mHadInsecureRedirect(false)
-{
-  NewRequestAndEntry(forcePrincipalCheckForCacheEntry, loader,
-                     getter_AddRefs(mNewRequest),
-                     getter_AddRefs(mNewEntry));
-}
-
-imgCacheValidator::~imgCacheValidator()
-{
-  if (mRequest) {
-    mRequest->SetValidator(nullptr);
-  }
-}
-
-void
-imgCacheValidator::AddProxy(imgRequestProxy* aProxy)
-{
-  // aProxy needs to be in the loadgroup since we're validating from
-  // the network.
-  aProxy->AddToLoadGroup();
-
-  mProxies.AppendObject(aProxy);
-}
-
-/** nsIRequestObserver methods **/
-
-/* void onStartRequest (in nsIRequest request, in nsISupports ctxt); */
-NS_IMETHODIMP
-imgCacheValidator::OnStartRequest(nsIRequest* aRequest, nsISupports* ctxt)
-{
-  // We may be holding on to a document, so ensure that it's released.
-  nsCOMPtr<nsISupports> context = mContext.forget();
-
-  // If for some reason we don't still have an existing request (probably
-  // because OnStartRequest got delivered more than once), just bail.
-  if (!mRequest) {
-    MOZ_ASSERT_UNREACHABLE("OnStartRequest delivered more than once?");
-    aRequest->Cancel(NS_BINDING_ABORTED);
-    return NS_ERROR_FAILURE;
-  }
-
-  // If this request is coming from cache and has the same URI as our
-  // imgRequest, the request all our proxies are pointing at is valid, and all
-  // we have to do is tell them to notify their listeners.
-  nsCOMPtr<nsICachingChannel> cacheChan(do_QueryInterface(aRequest));
-  nsCOMPtr<nsIChannel> channel(do_QueryInterface(aRequest));
-  if (cacheChan && channel && !mRequest->CacheChanged(aRequest)) {
-    bool isFromCache = false;
-    cacheChan->IsFromCache(&isFromCache);
-
-    nsCOMPtr<nsIURI> channelURI;
-    channel->GetURI(getter_AddRefs(channelURI));
-
-    nsCOMPtr<nsIURI> currentURI;
-    mRequest->GetCurrentURI(getter_AddRefs(currentURI));
-
-    bool sameURI = false;
-    if (channelURI && currentURI) {
-      channelURI->Equals(currentURI, &sameURI);
-    }
-
-    if (isFromCache && sameURI) {
-      uint32_t count = mProxies.Count();
-      for (int32_t i = count-1; i>=0; i--) {
-        imgRequestProxy* proxy = static_cast<imgRequestProxy*>(mProxies[i]);
-
-        // Proxies waiting on cache validation should be deferring
-        // notifications. Undefer them.
-        MOZ_ASSERT(proxy->NotificationsDeferred(),
-                   "Proxies waiting on cache validation should be "
-                   "deferring notifications!");
-        proxy->SetNotificationsDeferred(false);
-
-        // Notify synchronously, because we're already in OnStartRequest, an
-        // asynchronously-called function.
-        proxy->SyncNotifyListener();
-      }
-
-      // We don't need to load this any more.
-      aRequest->Cancel(NS_BINDING_ABORTED);
-
-      mRequest->SetLoadId(context);
-      mRequest->SetValidator(nullptr);
-
-      mRequest = nullptr;
-
-      mNewRequest = nullptr;
-      mNewEntry = nullptr;
-
-      return NS_OK;
-    }
-  }
-
-  // We can't load out of cache. We have to create a whole new request for the
-  // data that's coming in off the channel.
-  nsCOMPtr<nsIURI> uri;
-  {
-    nsRefPtr<ImageURL> imageURL;
-    mRequest->GetURI(getter_AddRefs(imageURL));
-    uri = imageURL->ToIURI();
-  }
-
-  if (PR_LOG_TEST(GetImgLog(), PR_LOG_DEBUG)) {
-    nsAutoCString spec;
-    uri->GetSpec(spec);
-    LOG_MSG_WITH_PARAM(GetImgLog(),
-                       "imgCacheValidator::OnStartRequest creating new request",
-                       "uri", spec.get());
-  }
-
-  int32_t corsmode = mRequest->GetCORSMode();
-  ReferrerPolicy refpol = mRequest->GetReferrerPolicy();
-  nsCOMPtr<nsIPrincipal> loadingPrincipal = mRequest->GetLoadingPrincipal();
-
-  // Doom the old request's cache entry
-  mRequest->RemoveFromCache();
-
-  mRequest->SetValidator(nullptr);
-  mRequest = nullptr;
-
-  // We use originalURI here to fulfil the imgIRequest contract on GetURI.
-  nsCOMPtr<nsIURI> originalURI;
-  channel->GetOriginalURI(getter_AddRefs(originalURI));
-  mNewRequest->Init(originalURI, uri, mHadInsecureRedirect, aRequest, channel,
-                    mNewEntry, context, loadingPrincipal, corsmode, refpol);
-
-  mDestListener = new ProxyListener(mNewRequest);
-
-  // Try to add the new request into the cache. Note that the entry must be in
-  // the cache before the proxies' ownership changes, because adding a proxy
-  // changes the caching behaviour for imgRequests.
-  mImgLoader->PutIntoCache(ImageCacheKey(originalURI), mNewEntry);
-
-  uint32_t count = mProxies.Count();
-  for (int32_t i = count-1; i>=0; i--) {
-    imgRequestProxy* proxy = static_cast<imgRequestProxy*>(mProxies[i]);
-    proxy->ChangeOwner(mNewRequest);
-
-    // Notify synchronously, because we're already in OnStartRequest, an
-    // asynchronously-called function.
-    proxy->SetNotificationsDeferred(false);
-    proxy->SyncNotifyListener();
-  }
-
-  mNewRequest = nullptr;
-  mNewEntry = nullptr;
-
-  return mDestListener->OnStartRequest(aRequest, ctxt);
-}
-
-/* void onStopRequest (in nsIRequest request, in nsISupports ctxt,
-                       in nsresult status); */
-NS_IMETHODIMP
-imgCacheValidator::OnStopRequest(nsIRequest* aRequest,
-                                 nsISupports* ctxt,
-                                 nsresult status)
-{
-  // Be sure we've released the document that we may have been holding on to.
-  mContext = nullptr;
-
-  if (!mDestListener) {
-    return NS_OK;
-  }
-
-  return mDestListener->OnStopRequest(aRequest, ctxt, status);
-}
-
-/** nsIStreamListener methods **/
-
-
-/* void
-   onDataAvailable (in nsIRequest request, in nsISupports ctxt,
-   in nsIInputStream inStr, in unsigned long long sourceOffset,
-   in unsigned long count); */
-NS_IMETHODIMP
-imgCacheValidator::OnDataAvailable(nsIRequest* aRequest, nsISupports* ctxt,
-                                   nsIInputStream* inStr,
-                                   uint64_t sourceOffset, uint32_t count)
-{
-  if (!mDestListener) {
-    // XXX see bug 113959
-    uint32_t _retval;
-    inStr->ReadSegments(NS_DiscardSegment, nullptr, count, &_retval);
-    return NS_OK;
-  }
-
-  return mDestListener->OnDataAvailable(aRequest, ctxt, inStr, sourceOffset,
-                                        count);
-}
-
-/** nsIThreadRetargetableStreamListener methods **/
-
-NS_IMETHODIMP
-imgCacheValidator::CheckListenerChain()
-{
-  NS_ASSERTION(NS_IsMainThread(), "Should be on the main thread!");
-  nsresult rv = NS_OK;
-  nsCOMPtr<nsIThreadRetargetableStreamListener> retargetableListener =
-    do_QueryInterface(mDestListener, &rv);
-  if (retargetableListener) {
-    rv = retargetableListener->CheckListenerChain();
-  }
-  PR_LOG(GetImgLog(), PR_LOG_DEBUG,
-         ("[this=%p] imgCacheValidator::CheckListenerChain -- rv %d=%s",
-          this, NS_SUCCEEDED(rv) ? "succeeded" : "failed", rv));
-  return rv;
-}
-
-/** nsIInterfaceRequestor methods **/
-
-NS_IMETHODIMP
-imgCacheValidator::GetInterface(const nsIID& aIID, void** aResult)
-{
-  if (aIID.Equals(NS_GET_IID(nsIChannelEventSink))) {
-    return QueryInterface(aIID, aResult);
-  }
-
-  return mProgressProxy->GetInterface(aIID, aResult);
-}
-
-// These functions are materially the same as the same functions in imgRequest.
-// We duplicate them because we're verifying whether cache loads are necessary,
-// not unconditionally loading.
-
-/** nsIChannelEventSink methods **/
-NS_IMETHODIMP
-imgCacheValidator::
-  AsyncOnChannelRedirect(nsIChannel* oldChannel,
-                         nsIChannel* newChannel,
-                         uint32_t flags,
-                         nsIAsyncVerifyRedirectCallback* callback)
-{
-  // Note all cache information we get from the old channel.
-  mNewRequest->SetCacheValidation(mNewEntry, oldChannel);
-
-  // If the previous URI is a non-HTTPS URI, record that fact for later use by
-  // security code, which needs to know whether there is an insecure load at any
-  // point in the redirect chain.
-  nsCOMPtr<nsIURI> oldURI;
-  bool isHttps = false;
-  bool isChrome = false;
-  bool schemeLocal = false;
-  if (NS_FAILED(oldChannel->GetURI(getter_AddRefs(oldURI))) ||
-      NS_FAILED(oldURI->SchemeIs("https", &isHttps)) ||
-      NS_FAILED(oldURI->SchemeIs("chrome", &isChrome)) ||
-      NS_FAILED(NS_URIChainHasFlags(oldURI,
-                                    nsIProtocolHandler::URI_IS_LOCAL_RESOURCE,
-                                    &schemeLocal))  ||
-      (!isHttps && !isChrome && !schemeLocal)) {
-    mHadInsecureRedirect = true;
-  }
-
-  // Prepare for callback
-  mRedirectCallback = callback;
-  mRedirectChannel = newChannel;
-
-  return mProgressProxy->AsyncOnChannelRedirect(oldChannel, newChannel, flags,
-                                                this);
-}
-
-NS_IMETHODIMP
-imgCacheValidator::OnRedirectVerifyCallback(nsresult aResult)
-{
-  // If we've already been told to abort, just do so.
-  if (NS_FAILED(aResult)) {
-      mRedirectCallback->OnRedirectVerifyCallback(aResult);
-      mRedirectCallback = nullptr;
-      mRedirectChannel = nullptr;
-      return NS_OK;
-  }
-
-  // make sure we have a protocol that returns data rather than opens
-  // an external application, e.g. mailto:
-  nsCOMPtr<nsIURI> uri;
-  mRedirectChannel->GetURI(getter_AddRefs(uri));
-  bool doesNotReturnData = false;
-  NS_URIChainHasFlags(uri, nsIProtocolHandler::URI_DOES_NOT_RETURN_DATA,
-                      &doesNotReturnData);
-
-  nsresult result = NS_OK;
-
-  if (doesNotReturnData) {
-    result = NS_ERROR_ABORT;
-  }
-
-  mRedirectCallback->OnRedirectVerifyCallback(result);
-  mRedirectCallback = nullptr;
-  mRedirectChannel = nullptr;
-  return NS_OK;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/imgLoader.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/imgLoader.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/imgLoader.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/imgLoader.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,574 +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_image_src_imgLoader_h
-#define mozilla_image_src_imgLoader_h
-
-#include "mozilla/Attributes.h"
-#include "mozilla/Mutex.h"
-
-#include "imgILoader.h"
-#include "imgICache.h"
-#include "nsWeakReference.h"
-#include "nsIContentSniffer.h"
-#include "nsRefPtrHashtable.h"
-#include "nsExpirationTracker.h"
-#include "nsAutoPtr.h"
-#include "imgRequest.h"
-#include "nsIProgressEventSink.h"
-#include "nsIChannel.h"
-#include "nsIThreadRetargetableStreamListener.h"
-#include "imgIRequest.h"
-#include "mozilla/net/ReferrerPolicy.h"
-
-class imgLoader;
-class imgRequestProxy;
-class imgINotificationObserver;
-class nsILoadGroup;
-class imgCacheExpirationTracker;
-class imgMemoryReporter;
-
-namespace mozilla {
-namespace image {
-class ImageURL;
-}
-}
-
-class imgCacheEntry
-{
-public:
-  imgCacheEntry(imgLoader* loader, imgRequest* request,
-                bool aForcePrincipalCheck);
-  ~imgCacheEntry();
-
-  nsrefcnt AddRef()
-  {
-    NS_PRECONDITION(int32_t(mRefCnt) >= 0, "illegal refcnt");
-    MOZ_ASSERT(_mOwningThread.GetThread() == PR_GetCurrentThread(),
-      "imgCacheEntry addref isn't thread-safe!");
-    ++mRefCnt;
-    NS_LOG_ADDREF(this, mRefCnt, "imgCacheEntry", sizeof(*this));
-    return mRefCnt;
-  }
-
-  nsrefcnt Release()
-  {
-    NS_PRECONDITION(0 != mRefCnt, "dup release");
-    MOZ_ASSERT(_mOwningThread.GetThread() == PR_GetCurrentThread(),
-      "imgCacheEntry release isn't thread-safe!");
-    --mRefCnt;
-    NS_LOG_RELEASE(this, mRefCnt, "imgCacheEntry");
-    if (mRefCnt == 0) {
-      mRefCnt = 1; /* stabilize */
-      delete this;
-      return 0;
-    }
-    return mRefCnt;
-  }
-
-  uint32_t GetDataSize() const
-  {
-    return mDataSize;
-  }
-  void SetDataSize(uint32_t aDataSize)
-  {
-    int32_t oldsize = mDataSize;
-    mDataSize = aDataSize;
-    UpdateCache(mDataSize - oldsize);
-  }
-
-  int32_t GetTouchedTime() const
-  {
-    return mTouchedTime;
-  }
-  void SetTouchedTime(int32_t time)
-  {
-    mTouchedTime = time;
-    Touch(/* updateTime = */ false);
-  }
-
-  int32_t GetExpiryTime() const
-  {
-    return mExpiryTime;
-  }
-  void SetExpiryTime(int32_t aExpiryTime)
-  {
-    mExpiryTime = aExpiryTime;
-    Touch();
-  }
-
-  bool GetMustValidate() const
-  {
-    return mMustValidate;
-  }
-  void SetMustValidate(bool aValidate)
-  {
-    mMustValidate = aValidate;
-    Touch();
-  }
-
-  already_AddRefed<imgRequest> GetRequest() const
-  {
-    nsRefPtr<imgRequest> req = mRequest;
-    return req.forget();
-  }
-
-  bool Evicted() const
-  {
-    return mEvicted;
-  }
-
-  nsExpirationState* GetExpirationState()
-  {
-    return &mExpirationState;
-  }
-
-  bool HasNoProxies() const
-  {
-    return mHasNoProxies;
-  }
-
-  bool ForcePrincipalCheck() const
-  {
-    return mForcePrincipalCheck;
-  }
-
-  imgLoader* Loader() const
-  {
-    return mLoader;
-  }
-
-private: // methods
-  friend class imgLoader;
-  friend class imgCacheQueue;
-  void Touch(bool updateTime = true);
-  void UpdateCache(int32_t diff = 0);
-  void SetEvicted(bool evict)
-  {
-    mEvicted = evict;
-  }
-  void SetHasNoProxies(bool hasNoProxies);
-
-  // Private, unimplemented copy constructor.
-  imgCacheEntry(const imgCacheEntry&);
-
-private: // data
-  nsAutoRefCnt mRefCnt;
-  NS_DECL_OWNINGTHREAD
-
-  imgLoader* mLoader;
-  nsRefPtr<imgRequest> mRequest;
-  uint32_t mDataSize;
-  int32_t mTouchedTime;
-  int32_t mExpiryTime;
-  nsExpirationState mExpirationState;
-  bool mMustValidate : 1;
-  bool mEvicted : 1;
-  bool mHasNoProxies : 1;
-  bool mForcePrincipalCheck : 1;
-};
-
-#include <vector>
-
-#define NS_IMGLOADER_CID \
-{ /* c1354898-e3fe-4602-88a7-c4520c21cb4e */         \
-     0xc1354898,                                     \
-     0xe3fe,                                         \
-     0x4602,                                         \
-    {0x88, 0xa7, 0xc4, 0x52, 0x0c, 0x21, 0xcb, 0x4e} \
-}
-
-class imgCacheQueue
-{
-public:
-  imgCacheQueue();
-  void Remove(imgCacheEntry*);
-  void Push(imgCacheEntry*);
-  void MarkDirty();
-  bool IsDirty();
-  already_AddRefed<imgCacheEntry> Pop();
-  void Refresh();
-  uint32_t GetSize() const;
-  void UpdateSize(int32_t diff);
-  uint32_t GetNumElements() const;
-  typedef std::vector<nsRefPtr<imgCacheEntry> > queueContainer;
-  typedef queueContainer::iterator iterator;
-  typedef queueContainer::const_iterator const_iterator;
-
-  iterator begin();
-  const_iterator begin() const;
-  iterator end();
-  const_iterator end() const;
-
-private:
-  queueContainer mQueue;
-  bool mDirty;
-  uint32_t mSize;
-};
-
-enum class AcceptedMimeTypes : uint8_t {
-  IMAGES,
-  IMAGES_AND_DOCUMENTS,
-};
-
-/**
- * An ImageLib cache entry key.
- *
- * We key the cache on the initial URI (before any redirects), with some
- * canonicalization applied. See ComputeHash() for the details.
- */
-class ImageCacheKey final
-{
-public:
-  explicit ImageCacheKey(nsIURI* aURI);
-  explicit ImageCacheKey(mozilla::image::ImageURL* aURI);
-
-  ImageCacheKey(const ImageCacheKey& aOther);
-  ImageCacheKey(ImageCacheKey&& aOther);
-
-  bool operator==(const ImageCacheKey& aOther) const;
-  uint32_t Hash() const { return mHash; }
-
-  /// A weak pointer to the URI spec for this cache entry. For logging only.
-  const char* Spec() const { return mSpec.get(); }
-
-  /// Is this cache entry for a chrome image?
-  bool IsChrome() const { return mIsChrome; }
-
-private:
-  static uint32_t ComputeHash(const nsACString& aSpec);
-
-  nsCString mSpec;
-  uint32_t mHash;
-  bool mIsChrome;
-};
-
-class imgLoader final : public imgILoader,
-                        public nsIContentSniffer,
-                        public imgICache,
-                        public nsSupportsWeakReference,
-                        public nsIObserver
-{
-  virtual ~imgLoader();
-
-public:
-  typedef mozilla::image::ImageURL ImageURL;
-  typedef nsRefPtrHashtable<nsGenericHashKey<ImageCacheKey>,
-                            imgCacheEntry> imgCacheTable;
-  typedef nsTHashtable<nsPtrHashKey<imgRequest>> imgSet;
-  typedef mozilla::net::ReferrerPolicy ReferrerPolicy;
-  typedef mozilla::Mutex Mutex;
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGILOADER
-  NS_DECL_NSICONTENTSNIFFER
-  NS_DECL_IMGICACHE
-  NS_DECL_NSIOBSERVER
-
-  static imgLoader* Singleton();
-  static imgLoader* PBSingleton();
-
-  imgLoader();
-
-  nsresult Init();
-
-  static imgLoader* Create()
-  {
-      // Unfortunately, we rely on XPCOM module init happening
-      // before imgLoader creation. For now, it's easier
-      // to just call CallCreateInstance() which will init
-      // the image module instead of calling new imgLoader
-      // directly.
-      imgILoader* loader;
-      CallCreateInstance("@mozilla.org/image/loader;1", &loader);
-      // There's only one imgLoader implementation so we
-      // can safely cast to it.
-      return static_cast<imgLoader*>(loader);
-  }
-
-  static already_AddRefed<imgLoader>
-  GetInstance();
-
-  nsresult LoadImage(nsIURI* aURI,
-                     nsIURI* aInitialDocumentURI,
-                     nsIURI* aReferrerURI,
-                     ReferrerPolicy aReferrerPolicy,
-                     nsIPrincipal* aLoadingPrincipal,
-                     nsILoadGroup* aLoadGroup,
-                     imgINotificationObserver* aObserver,
-                     nsISupports* aCX,
-                     nsLoadFlags aLoadFlags,
-                     nsISupports* aCacheKey,
-                     nsContentPolicyType aContentPolicyType,
-                     const nsAString& initiatorType,
-                     imgRequestProxy** _retval);
-
-  nsresult LoadImageWithChannel(nsIChannel* channel,
-                                imgINotificationObserver* aObserver,
-                                nsISupports* aCX,
-                                nsIStreamListener** listener,
-                                imgRequestProxy** _retval);
-
-  static nsresult GetMimeTypeFromContent(const char* aContents,
-                                         uint32_t aLength,
-                                         nsACString& aContentType);
-
-  /**
-   * Returns true if the given mime type may be interpreted as an image.
-   *
-   * Some MIME types may be interpreted as both images and documents. (At the
-   * moment only "image/svg+xml" falls into this category, but there may be more
-   * in the future.) Callers which want this function to return true for such
-   * MIME types should pass AcceptedMimeTypes::IMAGES_AND_DOCUMENTS for
-   * @aAccept.
-   *
-   * @param aMimeType The MIME type to evaluate.
-   * @param aAcceptedMimeTypes Which kinds of MIME types to treat as images.
-   */
-  static NS_EXPORT_(bool)
-  SupportImageWithMimeType(const char* aMimeType,
-                           AcceptedMimeTypes aAccept =
-                             AcceptedMimeTypes::IMAGES);
-
-  static void GlobalInit(); // for use by the factory
-  static void Shutdown(); // for use by the factory
-
-  nsresult ClearChromeImageCache();
-  nsresult ClearImageCache();
-  void MinimizeCaches();
-
-  nsresult InitCache();
-
-  bool RemoveFromCache(const ImageCacheKey& aKey);
-  bool RemoveFromCache(imgCacheEntry* entry);
-
-  bool PutIntoCache(const ImageCacheKey& aKey, imgCacheEntry* aEntry);
-
-  void AddToUncachedImages(imgRequest* aRequest);
-  void RemoveFromUncachedImages(imgRequest* aRequest);
-
-  // Returns true if we should prefer evicting cache entry |two| over cache
-  // entry |one|.
-  // This mixes units in the worst way, but provides reasonable results.
-  inline static bool CompareCacheEntries(const nsRefPtr<imgCacheEntry>& one,
-                                         const nsRefPtr<imgCacheEntry>& two)
-  {
-    if (!one) {
-      return false;
-    }
-    if (!two) {
-      return true;
-    }
-
-    const double sizeweight = 1.0 - sCacheTimeWeight;
-
-    // We want large, old images to be evicted first (depending on their
-    // relative weights). Since a larger time is actually newer, we subtract
-    // time's weight, so an older image has a larger weight.
-    double oneweight = double(one->GetDataSize()) * sizeweight -
-                       double(one->GetTouchedTime()) * sCacheTimeWeight;
-    double twoweight = double(two->GetDataSize()) * sizeweight -
-                       double(two->GetTouchedTime()) * sCacheTimeWeight;
-
-    return oneweight < twoweight;
-  }
-
-  void VerifyCacheSizes();
-
-  // The image loader maintains a hash table of all imgCacheEntries. However,
-  // only some of them will be evicted from the cache: those who have no
-  // imgRequestProxies watching their imgRequests.
-  //
-  // Once an imgRequest has no imgRequestProxies, it should notify us by
-  // calling HasNoObservers(), and null out its cache entry pointer.
-  //
-  // Upon having a proxy start observing again, it should notify us by calling
-  // HasObservers(). The request's cache entry will be re-set before this
-  // happens, by calling imgRequest::SetCacheEntry() when an entry with no
-  // observers is re-requested.
-  bool SetHasNoProxies(imgRequest* aRequest, imgCacheEntry* aEntry);
-  bool SetHasProxies(imgRequest* aRequest);
-
-private: // methods
-
-  bool ValidateEntry(imgCacheEntry* aEntry, nsIURI* aKey,
-                     nsIURI* aInitialDocumentURI, nsIURI* aReferrerURI,
-                     ReferrerPolicy aReferrerPolicy,
-                     nsILoadGroup* aLoadGroup,
-                     imgINotificationObserver* aObserver, nsISupports* aCX,
-                     nsLoadFlags aLoadFlags,
-                     nsContentPolicyType aContentPolicyType,
-                     bool aCanMakeNewChannel,
-                     imgRequestProxy** aProxyRequest,
-                     nsIPrincipal* aLoadingPrincipal,
-                     int32_t aCORSMode);
-
-  bool ValidateRequestWithNewChannel(imgRequest* request, nsIURI* aURI,
-                                     nsIURI* aInitialDocumentURI,
-                                     nsIURI* aReferrerURI,
-                                     ReferrerPolicy aReferrerPolicy,
-                                     nsILoadGroup* aLoadGroup,
-                                     imgINotificationObserver* aObserver,
-                                     nsISupports* aCX, nsLoadFlags aLoadFlags,
-                                     nsContentPolicyType aContentPolicyType,
-                                     imgRequestProxy** aProxyRequest,
-                                     nsIPrincipal* aLoadingPrincipal,
-                                     int32_t aCORSMode);
-
-  nsresult CreateNewProxyForRequest(imgRequest* aRequest,
-                                    nsILoadGroup* aLoadGroup,
-                                    imgINotificationObserver* aObserver,
-                                    nsLoadFlags aLoadFlags,
-                                    imgRequestProxy** _retval);
-
-  void ReadAcceptHeaderPref();
-
-  nsresult EvictEntries(imgCacheTable& aCacheToClear);
-  nsresult EvictEntries(imgCacheQueue& aQueueToClear);
-
-  imgCacheTable& GetCache(bool aForChrome);
-  imgCacheTable& GetCache(const ImageCacheKey& aKey);
-  imgCacheQueue& GetCacheQueue(bool aForChrome);
-  imgCacheQueue& GetCacheQueue(const ImageCacheKey& aKey);
-  void CacheEntriesChanged(bool aForChrome, int32_t aSizeDiff = 0);
-  void CheckCacheLimits(imgCacheTable& cache, imgCacheQueue& queue);
-
-private: // data
-  friend class imgCacheEntry;
-  friend class imgMemoryReporter;
-
-  imgCacheTable mCache;
-  imgCacheQueue mCacheQueue;
-
-  imgCacheTable mChromeCache;
-  imgCacheQueue mChromeCacheQueue;
-
-  // Hash set of every imgRequest for this loader that isn't in mCache or
-  // mChromeCache. The union over all imgLoader's of mCache, mChromeCache, and
-  // mUncachedImages should be every imgRequest that is alive. These are weak
-  // pointers so we rely on the imgRequest destructor to remove itself.
-  imgSet mUncachedImages;
-  // The imgRequest can have refs to them held on non-main thread, so we need
-  // a mutex because we modify the uncached images set from the imgRequest
-  // destructor.
-  Mutex mUncachedImagesMutex;
-
-  static double sCacheTimeWeight;
-  static uint32_t sCacheMaxSize;
-  static imgMemoryReporter* sMemReporter;
-
-  nsCString mAcceptHeader;
-
-  nsAutoPtr<imgCacheExpirationTracker> mCacheTracker;
-  bool mRespectPrivacy;
-};
-
-
-
-/**
- * proxy stream listener class used to handle multipart/x-mixed-replace
- */
-
-#include "nsCOMPtr.h"
-#include "nsIStreamListener.h"
-#include "nsIThreadRetargetableStreamListener.h"
-
-class ProxyListener : public nsIStreamListener
-                    , public nsIThreadRetargetableStreamListener
-{
-public:
-  explicit ProxyListener(nsIStreamListener* dest);
-
-  /* additional members */
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_NSISTREAMLISTENER
-  NS_DECL_NSITHREADRETARGETABLESTREAMLISTENER
-  NS_DECL_NSIREQUESTOBSERVER
-
-private:
-  virtual ~ProxyListener();
-
-  nsCOMPtr<nsIStreamListener> mDestListener;
-};
-
-/**
- * A class that implements nsIProgressEventSink and forwards all calls to it to
- * the original notification callbacks of the channel. Also implements
- * nsIInterfaceRequestor and gives out itself for nsIProgressEventSink calls,
- * and forwards everything else to the channel's notification callbacks.
- */
-class nsProgressNotificationProxy final
-  : public nsIProgressEventSink
-  , public nsIChannelEventSink
-  , public nsIInterfaceRequestor
-{
-  public:
-    nsProgressNotificationProxy(nsIChannel* channel,
-                                imgIRequest* proxy)
-        : mImageRequest(proxy) {
-      channel->GetNotificationCallbacks(getter_AddRefs(mOriginalCallbacks));
-    }
-
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIPROGRESSEVENTSINK
-    NS_DECL_NSICHANNELEVENTSINK
-    NS_DECL_NSIINTERFACEREQUESTOR
-  private:
-    ~nsProgressNotificationProxy() { }
-
-    nsCOMPtr<nsIInterfaceRequestor> mOriginalCallbacks;
-    nsCOMPtr<nsIRequest> mImageRequest;
-};
-
-/**
- * validate checker
- */
-
-#include "nsCOMArray.h"
-
-class imgCacheValidator : public nsIStreamListener,
-                          public nsIThreadRetargetableStreamListener,
-                          public nsIChannelEventSink,
-                          public nsIInterfaceRequestor,
-                          public nsIAsyncVerifyRedirectCallback
-{
-public:
-  imgCacheValidator(nsProgressNotificationProxy* progress, imgLoader* loader,
-                    imgRequest* aRequest, nsISupports* aContext,
-                    bool forcePrincipalCheckForCacheEntry);
-
-  void AddProxy(imgRequestProxy* aProxy);
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSITHREADRETARGETABLESTREAMLISTENER
-  NS_DECL_NSISTREAMLISTENER
-  NS_DECL_NSIREQUESTOBSERVER
-  NS_DECL_NSICHANNELEVENTSINK
-  NS_DECL_NSIINTERFACEREQUESTOR
-  NS_DECL_NSIASYNCVERIFYREDIRECTCALLBACK
-
-private:
-  virtual ~imgCacheValidator();
-
-  nsCOMPtr<nsIStreamListener> mDestListener;
-  nsRefPtr<nsProgressNotificationProxy> mProgressProxy;
-  nsCOMPtr<nsIAsyncVerifyRedirectCallback> mRedirectCallback;
-  nsCOMPtr<nsIChannel> mRedirectChannel;
-
-  nsRefPtr<imgRequest> mRequest;
-  nsCOMArray<imgIRequest> mProxies;
-
-  nsRefPtr<imgRequest> mNewRequest;
-  nsRefPtr<imgCacheEntry> mNewEntry;
-
-  nsCOMPtr<nsISupports> mContext;
-
-  imgLoader* mImgLoader;
-
-  bool mHadInsecureRedirect;
-};
-
-#endif // mozilla_image_src_imgLoader_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/imgRequest.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/imgRequest.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/imgRequest.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/imgRequest.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,1288 +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 "imgRequest.h"
-#include "ImageLogging.h"
-
-#include "imgLoader.h"
-#include "imgRequestProxy.h"
-#include "DecodePool.h"
-#include "ProgressTracker.h"
-#include "ImageFactory.h"
-#include "Image.h"
-#include "MultipartImage.h"
-#include "RasterImage.h"
-
-#include "nsIChannel.h"
-#include "nsICachingChannel.h"
-#include "nsIDocument.h"
-#include "nsIThreadRetargetableRequest.h"
-#include "nsIInputStream.h"
-#include "nsIMultiPartChannel.h"
-#include "nsIHttpChannel.h"
-#include "nsIApplicationCache.h"
-#include "nsIApplicationCacheChannel.h"
-#include "nsMimeTypes.h"
-
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsISupportsPrimitives.h"
-#include "nsIScriptSecurityManager.h"
-#include "nsContentUtils.h"
-
-#include "nsICacheEntry.h"
-
-#include "plstr.h" // PL_strcasestr(...)
-#include "nsNetUtil.h"
-#include "nsIProtocolHandler.h"
-#include "imgIRequest.h"
-
-using namespace mozilla;
-using namespace mozilla::image;
-
-PRLogModuleInfo*
-GetImgLog()
-{
-  static PRLogModuleInfo* sImgLog;
-  if (!sImgLog) {
-    sImgLog = PR_NewLogModule("imgRequest");
-  }
-  return sImgLog;
-}
-#define LOG_TEST(level) (GetImgLog() && PR_LOG_TEST(GetImgLog(), (level)))
-
-NS_IMPL_ISUPPORTS(imgRequest,
-                  nsIStreamListener, nsIRequestObserver,
-                  nsIThreadRetargetableStreamListener,
-                  nsIChannelEventSink,
-                  nsIInterfaceRequestor,
-                  nsIAsyncVerifyRedirectCallback)
-
-imgRequest::imgRequest(imgLoader* aLoader)
- : mLoader(aLoader)
- , mValidator(nullptr)
- , mInnerWindowId(0)
- , mCORSMode(imgIRequest::CORS_NONE)
- , mReferrerPolicy(mozilla::net::RP_Default)
- , mImageErrorCode(NS_OK)
- , mMutex("imgRequest")
- , mProgressTracker(new ProgressTracker())
- , mIsMultiPartChannel(false)
- , mGotData(false)
- , mIsInCache(false)
- , mDecodeRequested(false)
- , mNewPartPending(false)
- , mHadInsecureRedirect(false)
-{ }
-
-imgRequest::~imgRequest()
-{
-  if (mLoader) {
-    mLoader->RemoveFromUncachedImages(this);
-  }
-  if (mURI) {
-    nsAutoCString spec;
-    mURI->GetSpec(spec);
-    LOG_FUNC_WITH_PARAM(GetImgLog(), "imgRequest::~imgRequest()",
-                        "keyuri", spec.get());
-  } else
-    LOG_FUNC(GetImgLog(), "imgRequest::~imgRequest()");
-}
-
-nsresult
-imgRequest::Init(nsIURI *aURI,
-                 nsIURI *aCurrentURI,
-                 bool aHadInsecureRedirect,
-                 nsIRequest *aRequest,
-                 nsIChannel *aChannel,
-                 imgCacheEntry *aCacheEntry,
-                 nsISupports* aCX,
-                 nsIPrincipal* aLoadingPrincipal,
-                 int32_t aCORSMode,
-                 ReferrerPolicy aReferrerPolicy)
-{
-  MOZ_ASSERT(NS_IsMainThread(), "Cannot use nsIURI off main thread!");
-
-  LOG_FUNC(GetImgLog(), "imgRequest::Init");
-
-  MOZ_ASSERT(!mImage, "Multiple calls to init");
-  MOZ_ASSERT(aURI, "No uri");
-  MOZ_ASSERT(aCurrentURI, "No current uri");
-  MOZ_ASSERT(aRequest, "No request");
-  MOZ_ASSERT(aChannel, "No channel");
-
-  mProperties = do_CreateInstance("@mozilla.org/properties;1");
-
-  // Use ImageURL to ensure access to URI data off main thread.
-  mURI = new ImageURL(aURI);
-  mCurrentURI = aCurrentURI;
-  mRequest = aRequest;
-  mChannel = aChannel;
-  mTimedChannel = do_QueryInterface(mChannel);
-
-  mLoadingPrincipal = aLoadingPrincipal;
-  mCORSMode = aCORSMode;
-  mReferrerPolicy = aReferrerPolicy;
-
-  // If the original URI and the current URI are different, check whether the
-  // original URI is secure. We deliberately don't take the current URI into
-  // account, as it needs to be handled using more complicated rules than
-  // earlier elements of the redirect chain.
-  if (aURI != aCurrentURI) {
-    bool isHttps = false;
-    bool isChrome = false;
-    bool schemeLocal = false;
-    if (NS_FAILED(aURI->SchemeIs("https", &isHttps)) ||
-        NS_FAILED(aURI->SchemeIs("chrome", &isChrome)) ||
-        NS_FAILED(NS_URIChainHasFlags(
-                  aURI,
-                  nsIProtocolHandler::URI_IS_LOCAL_RESOURCE , &schemeLocal))  ||
-        (!isHttps && !isChrome && !schemeLocal)) {
-      mHadInsecureRedirect = true;
-    }
-  }
-
-  // imgCacheValidator may have handled redirects before we were created, so we
-  // allow the caller to let us know if any redirects were insecure.
-  mHadInsecureRedirect = mHadInsecureRedirect || aHadInsecureRedirect;
-
-  mChannel->GetNotificationCallbacks(getter_AddRefs(mPrevChannelSink));
-
-  NS_ASSERTION(mPrevChannelSink != this,
-               "Initializing with a channel that already calls back to us!");
-
-  mChannel->SetNotificationCallbacks(this);
-
-  mCacheEntry = aCacheEntry;
-
-  SetLoadId(aCX);
-
-  // Grab the inner window ID of the loading document, if possible.
-  nsCOMPtr<nsIDocument> doc = do_QueryInterface(aCX);
-  if (doc) {
-    mInnerWindowId = doc->InnerWindowID();
-  }
-
-  return NS_OK;
-}
-
-void
-imgRequest::ClearLoader() {
-  mLoader = nullptr;
-}
-
-already_AddRefed<ProgressTracker>
-imgRequest::GetProgressTracker() const
-{
-  MutexAutoLock lock(mMutex);
-
-  if (mImage) {
-    MOZ_ASSERT(!mProgressTracker,
-               "Should have given mProgressTracker to mImage");
-    return mImage->GetProgressTracker();
-  } else {
-    MOZ_ASSERT(mProgressTracker,
-               "Should have mProgressTracker until we create mImage");
-    nsRefPtr<ProgressTracker> progressTracker = mProgressTracker;
-    MOZ_ASSERT(progressTracker);
-    return progressTracker.forget();
-  }
-}
-
-void imgRequest::SetCacheEntry(imgCacheEntry* entry)
-{
-  mCacheEntry = entry;
-}
-
-bool
-imgRequest::HasCacheEntry() const
-{
-  return mCacheEntry != nullptr;
-}
-
-void
-imgRequest::ResetCacheEntry()
-{
-  if (HasCacheEntry()) {
-    mCacheEntry->SetDataSize(0);
-  }
-}
-
-void
-imgRequest::AddProxy(imgRequestProxy* proxy)
-{
-  NS_PRECONDITION(proxy, "null imgRequestProxy passed in");
-  LOG_SCOPE_WITH_PARAM(GetImgLog(), "imgRequest::AddProxy", "proxy", proxy);
-
-  // If we're empty before adding, we have to tell the loader we now have
-  // proxies.
-  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
-  if (progressTracker->ObserverCount() == 0) {
-    MOZ_ASSERT(mURI, "Trying to SetHasProxies without key uri.");
-    if (mLoader) {
-      mLoader->SetHasProxies(this);
-    }
-  }
-
-  progressTracker->AddObserver(proxy);
-}
-
-nsresult
-imgRequest::RemoveProxy(imgRequestProxy* proxy, nsresult aStatus)
-{
-  LOG_SCOPE_WITH_PARAM(GetImgLog(), "imgRequest::RemoveProxy", "proxy", proxy);
-
-  // This will remove our animation consumers, so after removing
-  // this proxy, we don't end up without proxies with observers, but still
-  // have animation consumers.
-  proxy->ClearAnimationConsumers();
-
-  // Let the status tracker do its thing before we potentially call Cancel()
-  // 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<ProgressTracker> progressTracker = GetProgressTracker();
-  if (!progressTracker->RemoveObserver(proxy)) {
-    return NS_OK;
-  }
-
-  if (progressTracker->ObserverCount() == 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.
-    if (mCacheEntry) {
-      MOZ_ASSERT(mURI, "Removing last observer without key uri.");
-
-      if (mLoader) {
-        mLoader->SetHasNoProxies(this, mCacheEntry);
-      }
-    } else if (PR_LOG_TEST(GetImgLog(), PR_LOG_DEBUG)) {
-      nsAutoCString spec;
-      mURI->GetSpec(spec);
-      LOG_MSG_WITH_PARAM(GetImgLog(),
-                         "imgRequest::RemoveProxy no cache entry",
-                         "uri", spec.get());
-    }
-
-    /* If |aStatus| is a failure code, then cancel the load if it is still in
-       progress.  Otherwise, let the load continue, keeping 'this' in the cache
-       with no observers.  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 (!(progressTracker->GetProgress() & FLAG_LAST_PART_COMPLETE) &&
-        NS_FAILED(aStatus)) {
-      LOG_MSG(GetImgLog(), "imgRequest::RemoveProxy",
-              "load in progress.  canceling");
-
-      this->Cancel(NS_BINDING_ABORTED);
-    }
-
-    /* break the cycle from the cache entry. */
-    mCacheEntry = nullptr;
-  }
-
-  // If a proxy is removed for a reason other than its owner being
-  // changed, remove the proxy from the loadgroup.
-  if (aStatus != NS_IMAGELIB_CHANGING_OWNER) {
-    proxy->RemoveFromLoadGroup(true);
-  }
-
-  return NS_OK;
-}
-
-void
-imgRequest::CancelAndAbort(nsresult aStatus)
-{
-  LOG_SCOPE(GetImgLog(), "imgRequest::CancelAndAbort");
-
-  Cancel(aStatus);
-
-  // It's possible for the channel to fail to open after we've set our
-  // notification callbacks. In that case, make sure to break the cycle between
-  // the channel and us, because it won't.
-  if (mChannel) {
-    mChannel->SetNotificationCallbacks(mPrevChannelSink);
-    mPrevChannelSink = nullptr;
-  }
-}
-
-class imgRequestMainThreadCancel : public nsRunnable
-{
-public:
-  imgRequestMainThreadCancel(imgRequest* aImgRequest, nsresult aStatus)
-    : mImgRequest(aImgRequest)
-    , mStatus(aStatus)
-  {
-    MOZ_ASSERT(!NS_IsMainThread(), "Create me off main thread only!");
-    MOZ_ASSERT(aImgRequest);
-  }
-
-  NS_IMETHOD Run()
-  {
-    MOZ_ASSERT(NS_IsMainThread(), "I should be running on the main thread!");
-    mImgRequest->ContinueCancel(mStatus);
-    return NS_OK;
-  }
-private:
-  nsRefPtr<imgRequest> mImgRequest;
-  nsresult mStatus;
-};
-
-void
-imgRequest::Cancel(nsresult aStatus)
-{
-  /* The Cancel() method here should only be called by this class. */
-  LOG_SCOPE(GetImgLog(), "imgRequest::Cancel");
-
-  if (NS_IsMainThread()) {
-    ContinueCancel(aStatus);
-  } else {
-    NS_DispatchToMainThread(new imgRequestMainThreadCancel(this, aStatus));
-  }
-}
-
-void
-imgRequest::ContinueCancel(nsresult aStatus)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
-  progressTracker->SyncNotifyProgress(FLAG_HAS_ERROR | FLAG_ONLOAD_UNBLOCKED);
-
-  RemoveFromCache();
-
-  if (mRequest && !(progressTracker->GetProgress() & FLAG_LAST_PART_COMPLETE)) {
-     mRequest->Cancel(aStatus);
-  }
-}
-
-class imgRequestMainThreadEvict : public nsRunnable
-{
-public:
-  explicit imgRequestMainThreadEvict(imgRequest* aImgRequest)
-    : mImgRequest(aImgRequest)
-  {
-    MOZ_ASSERT(!NS_IsMainThread(), "Create me off main thread only!");
-    MOZ_ASSERT(aImgRequest);
-  }
-
-  NS_IMETHOD Run()
-  {
-    MOZ_ASSERT(NS_IsMainThread(), "I should be running on the main thread!");
-    mImgRequest->ContinueEvict();
-    return NS_OK;
-  }
-private:
-  nsRefPtr<imgRequest> mImgRequest;
-};
-
-// EvictFromCache() is written to allowed to get called from any thread
-void
-imgRequest::EvictFromCache()
-{
-  /* The EvictFromCache() method here should only be called by this class. */
-  LOG_SCOPE(GetImgLog(), "imgRequest::EvictFromCache");
-
-  if (NS_IsMainThread()) {
-    ContinueEvict();
-  } else {
-    NS_DispatchToMainThread(new imgRequestMainThreadEvict(this));
-  }
-}
-
-// Helper-method used by EvictFromCache()
-void
-imgRequest::ContinueEvict()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  RemoveFromCache();
-}
-
-void
-imgRequest::RequestDecode()
-{
-  MutexAutoLock lock(mMutex);
-  mDecodeRequested = true;
-}
-
-bool
-imgRequest::IsDecodeRequested() const
-{
-  MutexAutoLock lock(mMutex);
-  return mDecodeRequested;
-}
-
-nsresult imgRequest::GetURI(ImageURL** aURI)
-{
-  MOZ_ASSERT(aURI);
-
-  LOG_FUNC(GetImgLog(), "imgRequest::GetURI");
-
-  if (mURI) {
-    *aURI = mURI;
-    NS_ADDREF(*aURI);
-    return NS_OK;
-  }
-
-  return NS_ERROR_FAILURE;
-}
-
-nsresult
-imgRequest::GetCurrentURI(nsIURI** aURI)
-{
-  MOZ_ASSERT(aURI);
-
-  LOG_FUNC(GetImgLog(), "imgRequest::GetCurrentURI");
-
-  if (mCurrentURI) {
-    *aURI = mCurrentURI;
-    NS_ADDREF(*aURI);
-    return NS_OK;
-  }
-
-  return NS_ERROR_FAILURE;
-}
-
-bool
-imgRequest::IsChrome() const
-{
-  bool isChrome = false;
-  if (NS_WARN_IF(NS_FAILED(mURI->SchemeIs("chrome", &isChrome)))) {
-    return false;
-  }
-  return isChrome;
-}
-
-nsresult
-imgRequest::GetImageErrorCode()
-{
-  return mImageErrorCode;
-}
-
-nsresult
-imgRequest::GetSecurityInfo(nsISupports** aSecurityInfo)
-{
-  LOG_FUNC(GetImgLog(), "imgRequest::GetSecurityInfo");
-
-  // Missing security info means this is not a security load
-  // i.e. it is not an error when security info is missing
-  NS_IF_ADDREF(*aSecurityInfo = mSecurityInfo);
-  return NS_OK;
-}
-
-void
-imgRequest::RemoveFromCache()
-{
-  LOG_SCOPE(GetImgLog(), "imgRequest::RemoveFromCache");
-
-  bool isInCache = false;
-
-  {
-    MutexAutoLock lock(mMutex);
-    isInCache = mIsInCache;
-  }
-
-  if (isInCache && mLoader) {
-    // mCacheEntry is nulled out when we have no more observers.
-    if (mCacheEntry) {
-      mLoader->RemoveFromCache(mCacheEntry);
-    } else {
-      mLoader->RemoveFromCache(ImageCacheKey(mURI));
-    }
-  }
-
-  mCacheEntry = nullptr;
-}
-
-bool
-imgRequest::HasConsumers() const
-{
-  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
-  return progressTracker && progressTracker->ObserverCount() > 0;
-}
-
-already_AddRefed<Image>
-imgRequest::GetImage() const
-{
-  MutexAutoLock lock(mMutex);
-  nsRefPtr<Image> image = mImage;
-  return image.forget();
-}
-
-int32_t imgRequest::Priority() const
-{
-  int32_t priority = nsISupportsPriority::PRIORITY_NORMAL;
-  nsCOMPtr<nsISupportsPriority> p = do_QueryInterface(mRequest);
-  if (p) {
-    p->GetPriority(&priority);
-  }
-  return priority;
-}
-
-void
-imgRequest::AdjustPriority(imgRequestProxy* proxy, int32_t delta)
-{
-  // only the first proxy is allowed to modify the priority of this image load.
-  //
-  // XXX(darin): this is probably not the most optimal algorithm as we may want
-  // to increase the priority of requests that have a lot of proxies.  the key
-  // concern though is that image loads remain lower priority than other pieces
-  // of content such as link clicks, CSS, and JS.
-  //
-  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
-  if (!progressTracker->FirstObserverIs(proxy)) {
-    return;
-  }
-
-  nsCOMPtr<nsISupportsPriority> p = do_QueryInterface(mChannel);
-  if (p) {
-    p->AdjustPriority(delta);
-  }
-}
-
-bool
-imgRequest::HasTransferredData() const
-{
-  MutexAutoLock lock(mMutex);
-  return mGotData;
-}
-
-void
-imgRequest::SetIsInCache(bool aInCache)
-{
-  LOG_FUNC_WITH_PARAM(GetImgLog(),
-                      "imgRequest::SetIsCacheable", "aInCache", aInCache);
-  MutexAutoLock lock(mMutex);
-  mIsInCache = aInCache;
-}
-
-void
-imgRequest::UpdateCacheEntrySize()
-{
-  if (!mCacheEntry) {
-    return;
-  }
-
-  nsRefPtr<Image> image = GetImage();
-  size_t size = image->SizeOfSourceWithComputedFallback(moz_malloc_size_of);
-  mCacheEntry->SetDataSize(size);
-}
-
-void
-imgRequest::SetCacheValidation(imgCacheEntry* aCacheEntry, nsIRequest* aRequest)
-{
-  /* get the expires info */
-  if (aCacheEntry) {
-    nsCOMPtr<nsICachingChannel> cacheChannel(do_QueryInterface(aRequest));
-    if (cacheChannel) {
-      nsCOMPtr<nsISupports> cacheToken;
-      cacheChannel->GetCacheToken(getter_AddRefs(cacheToken));
-      if (cacheToken) {
-        nsCOMPtr<nsICacheEntry> entryDesc(do_QueryInterface(cacheToken));
-        if (entryDesc) {
-          uint32_t expiration;
-          /* get the expiration time from the caching channel's token */
-          entryDesc->GetExpirationTime(&expiration);
-
-          // Expiration time defaults to 0. We set the expiration time on our
-          // entry if it hasn't been set yet.
-          if (aCacheEntry->GetExpiryTime() == 0) {
-            aCacheEntry->SetExpiryTime(expiration);
-          }
-        }
-      }
-    }
-
-    // Determine whether the cache entry must be revalidated when we try to use
-    // it. Currently, only HTTP specifies this information...
-    nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(aRequest));
-    if (httpChannel) {
-      bool bMustRevalidate = false;
-
-      httpChannel->IsNoStoreResponse(&bMustRevalidate);
-
-      if (!bMustRevalidate) {
-        httpChannel->IsNoCacheResponse(&bMustRevalidate);
-      }
-
-      if (!bMustRevalidate) {
-        nsAutoCString cacheHeader;
-
-        httpChannel->GetResponseHeader(NS_LITERAL_CSTRING("Cache-Control"),
-                                            cacheHeader);
-        if (PL_strcasestr(cacheHeader.get(), "must-revalidate")) {
-          bMustRevalidate = true;
-        }
-      }
-
-      // Cache entries default to not needing to validate. We ensure that
-      // multiple calls to this function don't override an earlier decision to
-      // validate by making validation a one-way decision.
-      if (bMustRevalidate) {
-        aCacheEntry->SetMustValidate(bMustRevalidate);
-      }
-    }
-  }
-}
-
-namespace { // anon
-
-already_AddRefed<nsIApplicationCache>
-GetApplicationCache(nsIRequest* aRequest)
-{
-  nsresult rv;
-
-  nsCOMPtr<nsIApplicationCacheChannel> appCacheChan =
-    do_QueryInterface(aRequest);
-  if (!appCacheChan) {
-    return nullptr;
-  }
-
-  bool fromAppCache;
-  rv = appCacheChan->GetLoadedFromApplicationCache(&fromAppCache);
-  NS_ENSURE_SUCCESS(rv, nullptr);
-
-  if (!fromAppCache) {
-    return nullptr;
-  }
-
-  nsCOMPtr<nsIApplicationCache> appCache;
-  rv = appCacheChan->GetApplicationCache(getter_AddRefs(appCache));
-  NS_ENSURE_SUCCESS(rv, nullptr);
-
-  return appCache.forget();
-}
-
-} // anon
-
-bool
-imgRequest::CacheChanged(nsIRequest* aNewRequest)
-{
-  nsCOMPtr<nsIApplicationCache> newAppCache = GetApplicationCache(aNewRequest);
-
-  // Application cache not involved at all or the same app cache involved
-  // in both of the loads (original and new).
-  if (newAppCache == mApplicationCache) {
-    return false;
-  }
-
-  // In a rare case it may happen that two objects still refer
-  // the same application cache version.
-  if (newAppCache && mApplicationCache) {
-    nsresult rv;
-
-    nsAutoCString oldAppCacheClientId, newAppCacheClientId;
-    rv = mApplicationCache->GetClientID(oldAppCacheClientId);
-    NS_ENSURE_SUCCESS(rv, true);
-    rv = newAppCache->GetClientID(newAppCacheClientId);
-    NS_ENSURE_SUCCESS(rv, true);
-
-    if (oldAppCacheClientId == newAppCacheClientId) {
-      return false;
-    }
-  }
-
-  // When we get here, app caches differ or app cache is involved
-  // just in one of the loads what we also consider as a change
-  // in a loading cache.
-  return true;
-}
-
-bool
-imgRequest::GetMultipart() const
-{
-  MutexAutoLock lock(mMutex);
-  return mIsMultiPartChannel;
-}
-
-bool
-imgRequest::HadInsecureRedirect() const
-{
-  MutexAutoLock lock(mMutex);
-  return mHadInsecureRedirect;
-}
-
-/** nsIRequestObserver methods **/
-
-/* void onStartRequest (in nsIRequest request, in nsISupports ctxt); */
-NS_IMETHODIMP
-imgRequest::OnStartRequest(nsIRequest* aRequest, nsISupports* ctxt)
-{
-  LOG_SCOPE(GetImgLog(), "imgRequest::OnStartRequest");
-
-  nsRefPtr<Image> image;
-
-  // Figure out if we're multipart.
-  nsCOMPtr<nsIMultiPartChannel> multiPartChannel = do_QueryInterface(aRequest);
-  MOZ_ASSERT(multiPartChannel || !mIsMultiPartChannel,
-             "Stopped being multipart?"); {
-    MutexAutoLock lock(mMutex);
-    mNewPartPending = true;
-    image = mImage;
-    mIsMultiPartChannel = bool(multiPartChannel);
-  }
-
-  // If we're not multipart, we shouldn't have an image yet.
-  if (image && !multiPartChannel) {
-    MOZ_ASSERT_UNREACHABLE("Already have an image for a non-multipart request");
-    Cancel(NS_IMAGELIB_ERROR_FAILURE);
-    return NS_ERROR_FAILURE;
-  }
-
-  /*
-   * If mRequest is null here, then we need to set it so that we'll be able to
-   * cancel it if our Cancel() method is called.  Note that this can only
-   * happen for multipart channels.  We could simply not null out mRequest for
-   * non-last parts, if GetIsLastPart() were reliable, but it's not.  See
-   * https://bugzilla.mozilla.org/show_bug.cgi?id=339610
-   */
-  if (!mRequest) {
-    MOZ_ASSERT(multiPartChannel, "Should have mRequest unless we're multipart");
-    nsCOMPtr<nsIChannel> baseChannel;
-    multiPartChannel->GetBaseChannel(getter_AddRefs(baseChannel));
-    mRequest = baseChannel;
-  }
-
-  nsCOMPtr<nsIChannel> channel(do_QueryInterface(aRequest));
-  if (channel) {
-    channel->GetSecurityInfo(getter_AddRefs(mSecurityInfo));
-
-    /* Get our principal */
-    nsCOMPtr<nsIScriptSecurityManager>
-      secMan = nsContentUtils::GetSecurityManager();
-    if (secMan) {
-      nsresult rv =
-        secMan->GetChannelResultPrincipal(channel, getter_AddRefs(mPrincipal));
-      if (NS_FAILED(rv)) {
-        return rv;
-      }
-    }
-  }
-
-  SetCacheValidation(mCacheEntry, aRequest);
-
-  mApplicationCache = GetApplicationCache(aRequest);
-
-  // Shouldn't we be dead already if this gets hit?
-  // Probably multipart/x-mixed-replace...
-  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
-  if (progressTracker->ObserverCount() == 0) {
-    this->Cancel(NS_IMAGELIB_ERROR_FAILURE);
-  }
-
-  // Try to retarget OnDataAvailable to a decode thread.
-  nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(aRequest);
-  nsCOMPtr<nsIThreadRetargetableRequest> retargetable =
-    do_QueryInterface(aRequest);
-  if (httpChannel && retargetable) {
-    nsAutoCString mimeType;
-    nsresult rv = httpChannel->GetContentType(mimeType);
-    if (NS_SUCCEEDED(rv) && !mimeType.EqualsLiteral(IMAGE_SVG_XML)) {
-      // Retarget OnDataAvailable to the DecodePool's IO thread.
-      nsCOMPtr<nsIEventTarget> target =
-        DecodePool::Singleton()->GetIOEventTarget();
-      rv = retargetable->RetargetDeliveryTo(target);
-    }
-    PR_LOG(GetImgLog(), PR_LOG_WARNING,
-           ("[this=%p] imgRequest::OnStartRequest -- "
-            "RetargetDeliveryTo rv %d=%s\n",
-            this, rv, NS_SUCCEEDED(rv) ? "succeeded" : "failed"));
-  }
-
-  return NS_OK;
-}
-
-/* void onStopRequest (in nsIRequest request, in nsISupports ctxt,
-                       nsresult status); */
-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");
-
-  nsRefPtr<Image> image = GetImage();
-
-  // XXXldb What if this is a non-last part of a multipart request?
-  // xxx before we release our reference to mRequest, lets
-  // save the last status that we saw so that the
-  // imgRequestProxy will have access to it.
-  if (mRequest) {
-    mRequest = nullptr;  // we no longer need the request
-  }
-
-  // stop holding a ref to the channel, since we don't need it anymore
-  if (mChannel) {
-    mChannel->SetNotificationCallbacks(mPrevChannelSink);
-    mPrevChannelSink = nullptr;
-    mChannel = nullptr;
-  }
-
-  bool lastPart = true;
-  nsCOMPtr<nsIMultiPartChannel> mpchan(do_QueryInterface(aRequest));
-  if (mpchan) {
-    mpchan->GetIsLastPart(&lastPart);
-  }
-
-  bool isPartial = false;
-  if (image && (status == NS_ERROR_NET_PARTIAL_TRANSFER)) {
-    isPartial = true;
-    status = NS_OK; // fake happy face
-  }
-
-  // Tell the image that it has all of the source data. Note that this can
-  // trigger a failure, since the image might be waiting for more non-optional
-  // data and this is the point where we break the news that it's not coming.
-  if (image) {
-    nsresult rv = image->OnImageDataComplete(aRequest, ctxt, status, lastPart);
-
-    // If we got an error in the OnImageDataComplete() call, we don't want to
-    // proceed as if nothing bad happened. However, we also want to give
-    // precedence to failure status codes from necko, since presumably they're
-    // more meaningful.
-    if (NS_FAILED(rv) && NS_SUCCEEDED(status)) {
-      status = rv;
-    }
-  }
-
-  // If the request went through, update the cache entry size. Otherwise,
-  // cancel the request, which removes us from the cache.
-  if (image && NS_SUCCEEDED(status) && !isPartial) {
-    // We update the cache entry size here because this is where we finish
-    // loading compressed source data, which is part of our size calculus.
-    UpdateCacheEntrySize();
-
-  } else if (isPartial) {
-    // Remove the partial image from the cache.
-    this->EvictFromCache();
-
-  } else {
-    mImageErrorCode = status;
-
-    // if the error isn't "just" a partial transfer
-    // stops animations, removes from cache
-    this->Cancel(status);
-  }
-
-  if (!image) {
-    // We have to fire the OnStopRequest notifications ourselves because there's
-    // no image capable of doing so.
-    Progress progress =
-      LoadCompleteProgress(lastPart, /* aError = */ false, status);
-
-    nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
-    progressTracker->SyncNotifyProgress(progress);
-  }
-
-  mTimedChannel = nullptr;
-  return NS_OK;
-}
-
-struct mimetype_closure
-{
-  nsACString* newType;
-};
-
-/* prototype for these defined below */
-static NS_METHOD
-sniff_mimetype_callback(nsIInputStream* in, void* closure,
-                        const char* fromRawSegment, uint32_t toOffset,
-                        uint32_t count, uint32_t* writeCount);
-
-/** nsThreadRetargetableStreamListener methods **/
-NS_IMETHODIMP
-imgRequest::CheckListenerChain()
-{
-  // TODO Might need more checking here.
-  NS_ASSERTION(NS_IsMainThread(), "Should be on the main thread!");
-  return NS_OK;
-}
-
-/** nsIStreamListener methods **/
-
-struct NewPartResult final
-{
-  explicit NewPartResult(Image* aExistingImage)
-    : mImage(aExistingImage)
-    , mIsFirstPart(!aExistingImage)
-    , mSucceeded(false)
-  { }
-
-  nsAutoCString mContentType;
-  nsAutoCString mContentDisposition;
-  nsRefPtr<Image> mImage;
-  const bool mIsFirstPart;
-  bool mSucceeded;
-};
-
-static NewPartResult
-PrepareForNewPart(nsIRequest* aRequest, nsIInputStream* aInStr, uint32_t aCount,
-                  ImageURL* aURI, bool aIsMultipart, Image* aExistingImage,
-                  ProgressTracker* aProgressTracker, uint32_t aInnerWindowId)
-{
-  NewPartResult result(aExistingImage);
-
-  mimetype_closure closure;
-  closure.newType = &result.mContentType;
-
-  // Look at the first few bytes and see if we can tell what the data is from
-  // that since servers tend to lie. :(
-  uint32_t out;
-  aInStr->ReadSegments(sniff_mimetype_callback, &closure, aCount, &out);
-
-  nsCOMPtr<nsIChannel> chan(do_QueryInterface(aRequest));
-  if (result.mContentType.IsEmpty()) {
-    nsresult rv = NS_ERROR_FAILURE;
-    if (chan) {
-      rv = chan->GetContentType(result.mContentType);
-      chan->GetContentDispositionHeader(result.mContentDisposition);
-    }
-
-    if (NS_FAILED(rv)) {
-      PR_LOG(GetImgLog(),
-             PR_LOG_ERROR, ("imgRequest::PrepareForNewPart "
-                            "-- Content type unavailable from the channel\n"));
-      return result;
-    }
-  }
-
-  PR_LOG(GetImgLog(), PR_LOG_DEBUG,
-         ("imgRequest::PrepareForNewPart -- Got content type %s\n",
-          result.mContentType.get()));
-
-  // XXX If server lied about mimetype and it's SVG, we may need to copy
-  // the data and dispatch back to the main thread, AND tell the channel to
-  // dispatch there in the future.
-
-  // Create the new image and give it ownership of our ProgressTracker.
-  if (aIsMultipart) {
-    // Create the ProgressTracker and image for this part.
-    nsRefPtr<ProgressTracker> progressTracker = new ProgressTracker();
-    nsRefPtr<Image> partImage =
-      ImageFactory::CreateImage(aRequest, progressTracker, result.mContentType,
-                                aURI, /* aIsMultipart = */ true,
-                                aInnerWindowId);
-
-    if (result.mIsFirstPart) {
-      // First part for a multipart channel. Create the MultipartImage wrapper.
-      MOZ_ASSERT(aProgressTracker, "Shouldn't have given away tracker yet");
-      result.mImage =
-        ImageFactory::CreateMultipartImage(partImage, aProgressTracker);
-    } else {
-      // Transition to the new part.
-      auto multipartImage = static_cast<MultipartImage*>(aExistingImage);
-      multipartImage->BeginTransitionToPart(partImage);
-    }
-  } else {
-    MOZ_ASSERT(!aExistingImage, "New part for non-multipart channel?");
-    MOZ_ASSERT(aProgressTracker, "Shouldn't have given away tracker yet");
-
-    // Create an image using our progress tracker.
-    result.mImage =
-      ImageFactory::CreateImage(aRequest, aProgressTracker, result.mContentType,
-                                aURI, /* aIsMultipart = */ false,
-                                aInnerWindowId);
-  }
-
-  MOZ_ASSERT(result.mImage);
-  if (!result.mImage->HasError() || aIsMultipart) {
-    // We allow multipart images to fail to initialize (which generally
-    // indicates a bad content type) without cancelling the load, because
-    // subsequent parts might be fine.
-    result.mSucceeded = true;
-  }
-
-  return result;
-}
-
-class FinishPreparingForNewPartRunnable final : public nsRunnable
-{
-public:
-  FinishPreparingForNewPartRunnable(imgRequest* aImgRequest,
-                                    NewPartResult&& aResult)
-    : mImgRequest(aImgRequest)
-    , mResult(aResult)
-  {
-    MOZ_ASSERT(aImgRequest);
-  }
-
-  NS_IMETHOD Run() override
-  {
-    mImgRequest->FinishPreparingForNewPart(mResult);
-    return NS_OK;
-  }
-
-private:
-  nsRefPtr<imgRequest> mImgRequest;
-  NewPartResult mResult;
-};
-
-void
-imgRequest::FinishPreparingForNewPart(const NewPartResult& aResult)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  mContentType = aResult.mContentType;
-
-  SetProperties(aResult.mContentType, aResult.mContentDisposition);
-
-  if (aResult.mIsFirstPart) {
-    // Notify listeners that we have an image.
-    nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
-    progressTracker->OnImageAvailable();
-    MOZ_ASSERT(progressTracker->HasImage());
-  }
-
-  if (IsDecodeRequested()) {
-    aResult.mImage->RequestDecode();
-  }
-}
-
-NS_IMETHODIMP
-imgRequest::OnDataAvailable(nsIRequest* aRequest, nsISupports* aContext,
-                            nsIInputStream* aInStr, uint64_t aOffset,
-                            uint32_t aCount)
-{
-  LOG_SCOPE_WITH_PARAM(GetImgLog(), "imgRequest::OnDataAvailable",
-                       "count", aCount);
-
-  NS_ASSERTION(aRequest, "imgRequest::OnDataAvailable -- no request!");
-
-  nsRefPtr<Image> image;
-  nsRefPtr<ProgressTracker> progressTracker;
-  bool isMultipart = false;
-  bool newPartPending = false;
-
-  // Retrieve and update our state.
-  {
-    MutexAutoLock lock(mMutex);
-    mGotData = true;
-    image = mImage;
-    progressTracker = mProgressTracker;
-    isMultipart = mIsMultiPartChannel;
-    newPartPending = mNewPartPending;
-    mNewPartPending = false;
-  }
-
-  // If this is a new part, we need to sniff its content type and create an
-  // appropriate image.
-  if (newPartPending) {
-    NewPartResult result = PrepareForNewPart(aRequest, aInStr, aCount, mURI,
-                                             isMultipart, image,
-                                             progressTracker, mInnerWindowId);
-    bool succeeded = result.mSucceeded;
-
-    if (result.mImage) {
-      image = result.mImage;
-
-      // Update our state to reflect this new part.
-      {
-        MutexAutoLock lock(mMutex);
-        mImage = image;
-        mProgressTracker = nullptr;
-      }
-
-      // Some property objects are not threadsafe, and we need to send
-      // OnImageAvailable on the main thread, so finish on the main thread.
-      if (NS_IsMainThread()) {
-        FinishPreparingForNewPart(result);
-      } else {
-        nsCOMPtr<nsIRunnable> runnable =
-          new FinishPreparingForNewPartRunnable(this, Move(result));
-        NS_DispatchToMainThread(runnable);
-      }
-    }
-
-    if (!succeeded) {
-      // Something went wrong; probably a content type issue.
-      Cancel(NS_IMAGELIB_ERROR_FAILURE);
-      return NS_BINDING_ABORTED;
-    }
-  }
-
-  // Notify the image that it has new data.
-  nsresult rv =
-    image->OnImageDataAvailable(aRequest, aContext, aInStr, aOffset, aCount);
-
-  if (NS_FAILED(rv)) {
-    PR_LOG(GetImgLog(), PR_LOG_WARNING,
-           ("[this=%p] imgRequest::OnDataAvailable -- "
-            "copy to RasterImage failed\n", this));
-    Cancel(NS_IMAGELIB_ERROR_FAILURE);
-    return NS_BINDING_ABORTED;
-  }
-
-  return NS_OK;
-}
-
-void
-imgRequest::SetProperties(const nsACString& aContentType,
-                          const nsACString& aContentDisposition)
-{
-  /* set our mimetype as a property */
-  nsCOMPtr<nsISupportsCString> contentType =
-    do_CreateInstance("@mozilla.org/supports-cstring;1");
-  if (contentType) {
-    contentType->SetData(aContentType);
-    mProperties->Set("type", contentType);
-  }
-
-  /* set our content disposition as a property */
-  if (!aContentDisposition.IsEmpty()) {
-    nsCOMPtr<nsISupportsCString> contentDisposition =
-      do_CreateInstance("@mozilla.org/supports-cstring;1");
-    if (contentDisposition) {
-      contentDisposition->SetData(aContentDisposition);
-      mProperties->Set("content-disposition", contentDisposition);
-    }
-  }
-}
-
-static NS_METHOD
-sniff_mimetype_callback(nsIInputStream* in,
-                        void* data,
-                        const char* fromRawSegment,
-                        uint32_t toOffset,
-                        uint32_t count,
-                        uint32_t* writeCount)
-{
-  mimetype_closure* closure = static_cast<mimetype_closure*>(data);
-
-  NS_ASSERTION(closure, "closure is null!");
-
-  if (count > 0) {
-    imgLoader::GetMimeTypeFromContent(fromRawSegment, count, *closure->newType);
-  }
-
-  *writeCount = 0;
-  return NS_ERROR_FAILURE;
-}
-
-
-/** nsIInterfaceRequestor methods **/
-
-NS_IMETHODIMP
-imgRequest::GetInterface(const nsIID & aIID, void** aResult)
-{
-  if (!mPrevChannelSink || aIID.Equals(NS_GET_IID(nsIChannelEventSink))) {
-    return QueryInterface(aIID, aResult);
-  }
-
-  NS_ASSERTION(mPrevChannelSink != this,
-    "Infinite recursion - don't keep track of channel sinks that are us!");
-  return mPrevChannelSink->GetInterface(aIID, aResult);
-}
-
-/** nsIChannelEventSink methods **/
-NS_IMETHODIMP
-imgRequest::AsyncOnChannelRedirect(nsIChannel* oldChannel,
-                                   nsIChannel* newChannel, uint32_t flags,
-                                   nsIAsyncVerifyRedirectCallback* callback)
-{
-  NS_ASSERTION(mRequest && mChannel,
-               "Got a channel redirect after we nulled out mRequest!");
-  NS_ASSERTION(mChannel == oldChannel,
-               "Got a channel redirect for an unknown channel!");
-  NS_ASSERTION(newChannel, "Got a redirect to a NULL channel!");
-
-  SetCacheValidation(mCacheEntry, oldChannel);
-
-  // Prepare for callback
-  mRedirectCallback = callback;
-  mNewRedirectChannel = newChannel;
-
-  nsCOMPtr<nsIChannelEventSink> sink(do_GetInterface(mPrevChannelSink));
-  if (sink) {
-    nsresult rv = sink->AsyncOnChannelRedirect(oldChannel, newChannel, flags,
-                                               this);
-    if (NS_FAILED(rv)) {
-        mRedirectCallback = nullptr;
-        mNewRedirectChannel = nullptr;
-    }
-    return rv;
-  }
-
-  (void) OnRedirectVerifyCallback(NS_OK);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-imgRequest::OnRedirectVerifyCallback(nsresult result)
-{
-  NS_ASSERTION(mRedirectCallback, "mRedirectCallback not set in callback");
-  NS_ASSERTION(mNewRedirectChannel, "mNewRedirectChannel not set in callback");
-
-  if (NS_FAILED(result)) {
-      mRedirectCallback->OnRedirectVerifyCallback(result);
-      mRedirectCallback = nullptr;
-      mNewRedirectChannel = nullptr;
-      return NS_OK;
-  }
-
-  mChannel = mNewRedirectChannel;
-  mTimedChannel = do_QueryInterface(mChannel);
-  mNewRedirectChannel = nullptr;
-
-  if (LOG_TEST(PR_LOG_DEBUG)) {
-    nsAutoCString spec;
-    if (mCurrentURI) {
-      mCurrentURI->GetSpec(spec);
-    }
-    LOG_MSG_WITH_PARAM(GetImgLog(),
-                       "imgRequest::OnChannelRedirect", "old", spec.get());
-  }
-
-  // If the previous URI is a non-HTTPS URI, record that fact for later use by
-  // security code, which needs to know whether there is an insecure load at any
-  // point in the redirect chain.
-  bool isHttps = false;
-  bool isChrome = false;
-  bool schemeLocal = false;
-  if (NS_FAILED(mCurrentURI->SchemeIs("https", &isHttps)) ||
-      NS_FAILED(mCurrentURI->SchemeIs("chrome", &isChrome)) ||
-      NS_FAILED(NS_URIChainHasFlags(mCurrentURI,
-                                    nsIProtocolHandler::URI_IS_LOCAL_RESOURCE,
-                                    &schemeLocal))  ||
-      (!isHttps && !isChrome && !schemeLocal)) {
-    MutexAutoLock lock(mMutex);
-    mHadInsecureRedirect = true;
-  }
-
-  // Update the current URI.
-  mChannel->GetURI(getter_AddRefs(mCurrentURI));
-
-  if (LOG_TEST(PR_LOG_DEBUG)) {
-    nsAutoCString spec;
-    if (mCurrentURI) {
-      mCurrentURI->GetSpec(spec);
-    }
-    LOG_MSG_WITH_PARAM(GetImgLog(), "imgRequest::OnChannelRedirect",
-                       "new", spec.get());
-  }
-
-  // Make sure we have a protocol that returns data rather than opens an
-  // external application, e.g. 'mailto:'.
-  bool doesNotReturnData = false;
-  nsresult rv =
-    NS_URIChainHasFlags(mCurrentURI,
-                        nsIProtocolHandler::URI_DOES_NOT_RETURN_DATA,
-                        &doesNotReturnData);
-
-  if (NS_SUCCEEDED(rv) && doesNotReturnData) {
-    rv = NS_ERROR_ABORT;
-  }
-
-  if (NS_FAILED(rv)) {
-    mRedirectCallback->OnRedirectVerifyCallback(rv);
-    mRedirectCallback = nullptr;
-    return NS_OK;
-  }
-
-  mRedirectCallback->OnRedirectVerifyCallback(NS_OK);
-  mRedirectCallback = nullptr;
-  return NS_OK;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/imgRequest.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/imgRequest.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/imgRequest.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/imgRequest.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,282 +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_image_src_imgRequest_h
-#define mozilla_image_src_imgRequest_h
-
-#include "nsIChannelEventSink.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIStreamListener.h"
-#include "nsIThreadRetargetableStreamListener.h"
-#include "nsIPrincipal.h"
-
-#include "nsAutoPtr.h"
-#include "nsCOMPtr.h"
-#include "nsProxyRelease.h"
-#include "nsStringGlue.h"
-#include "nsError.h"
-#include "nsIAsyncVerifyRedirectCallback.h"
-#include "mozilla/Mutex.h"
-#include "mozilla/net/ReferrerPolicy.h"
-
-class imgCacheValidator;
-class imgLoader;
-class imgRequestProxy;
-class imgCacheEntry;
-class nsIApplicationCache;
-class nsIProperties;
-class nsIRequest;
-class nsITimedChannel;
-class nsIURI;
-
-namespace mozilla {
-namespace image {
-class Image;
-class ImageURL;
-class ProgressTracker;
-} // namespace image
-} // namespace mozilla
-
-struct NewPartResult;
-
-class imgRequest final : public nsIStreamListener,
-                         public nsIThreadRetargetableStreamListener,
-                         public nsIChannelEventSink,
-                         public nsIInterfaceRequestor,
-                         public nsIAsyncVerifyRedirectCallback
-{
-  typedef mozilla::image::Image Image;
-  typedef mozilla::image::ImageURL ImageURL;
-  typedef mozilla::image::ProgressTracker ProgressTracker;
-  typedef mozilla::net::ReferrerPolicy ReferrerPolicy;
-
-public:
-  explicit imgRequest(imgLoader* aLoader);
-
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_NSISTREAMLISTENER
-  NS_DECL_NSITHREADRETARGETABLESTREAMLISTENER
-  NS_DECL_NSIREQUESTOBSERVER
-  NS_DECL_NSICHANNELEVENTSINK
-  NS_DECL_NSIINTERFACEREQUESTOR
-  NS_DECL_NSIASYNCVERIFYREDIRECTCALLBACK
-
-  nsresult Init(nsIURI* aURI,
-                nsIURI* aCurrentURI,
-                bool aHadInsecureRedirect,
-                nsIRequest* aRequest,
-                nsIChannel* aChannel,
-                imgCacheEntry* aCacheEntry,
-                nsISupports* aCX,
-                nsIPrincipal* aLoadingPrincipal,
-                int32_t aCORSMode,
-                ReferrerPolicy aReferrerPolicy);
-
-  void ClearLoader();
-
-  // Callers must call imgRequestProxy::Notify later.
-  void AddProxy(imgRequestProxy* proxy);
-
-  nsresult RemoveProxy(imgRequestProxy* proxy, nsresult aStatus);
-
-  // Cancel, but also ensure that all work done in Init() is undone. Call this
-  // only when the channel has failed to open, and so calling Cancel() on it
-  // won't be sufficient.
-  void CancelAndAbort(nsresult aStatus);
-
-  // Called or dispatched by cancel for main thread only execution.
-  void ContinueCancel(nsresult aStatus);
-
-  // Called or dispatched by EvictFromCache for main thread only execution.
-  void ContinueEvict();
-
-  // Request that we start decoding the image as soon as data becomes available.
-  void RequestDecode();
-
-  inline uint64_t InnerWindowID() const {
-    return mInnerWindowId;
-  }
-
-  // Set the cache validation information (expiry time, whether we must
-  // validate, etc) on the cache entry based on the request information.
-  // If this function is called multiple times, the information set earliest
-  // wins.
-  static void SetCacheValidation(imgCacheEntry* aEntry, nsIRequest* aRequest);
-
-  // Check if application cache of the original load is different from
-  // application cache of the new load.  Also lack of application cache
-  // on one of the loads is considered a change of a loading cache since
-  // HTTP cache may contain a different data then app cache.
-  bool CacheChanged(nsIRequest* aNewRequest);
-
-  bool GetMultipart() const;
-
-  // Returns whether we went through an insecure (non-HTTPS) redirect at some
-  // point during loading. This does not consider the current URI.
-  bool HadInsecureRedirect() const;
-
-  // 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
-  {
-    nsCOMPtr<nsIPrincipal> principal = mLoadingPrincipal;
-    return principal.forget();
-  }
-
-  // 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<ProgressTracker> GetProgressTracker() const;
-
-  /// Returns the Image associated with this imgRequest, if it's ready.
-  already_AddRefed<Image> GetImage() const;
-
-  // Get the current principal of the image. No AddRefing.
-  inline nsIPrincipal* GetPrincipal() const { return mPrincipal.get(); }
-
-  // Resize the cache entry to 0 if it exists
-  void ResetCacheEntry();
-
-  // OK to use on any thread.
-  nsresult GetURI(ImageURL** aURI);
-  nsresult GetCurrentURI(nsIURI** aURI);
-  bool IsChrome() const;
-
-  nsresult GetImageErrorCode(void);
-
-  /// Returns true if we've received any data.
-  bool HasTransferredData() const;
-
-  /// Returns a non-owning pointer to this imgRequest's MIME type.
-  const char* GetMimeType() const { return mContentType.get(); }
-
-  /// @return the priority of the underlying network request, or
-  /// PRIORITY_NORMAL if it doesn't support nsISupportsPriority.
-  int32_t Priority() const;
-
-  /// Adjust the priority of the underlying network request by @aDelta on behalf
-  /// of @aProxy.
-  void AdjustPriority(imgRequestProxy* aProxy, int32_t aDelta);
-
-  /// Returns a weak pointer to the underlying request.
-  nsIRequest* GetRequest() const { return mRequest; }
-
-  nsITimedChannel* GetTimedChannel() const { return mTimedChannel; }
-
-  nsresult GetSecurityInfo(nsISupports** aSecurityInfoOut);
-
-  imgCacheValidator* GetValidator() const { return mValidator; }
-  void SetValidator(imgCacheValidator* aValidator) { mValidator = aValidator; }
-
-  void* LoadId() const { return mLoadId; }
-  void SetLoadId(void* aLoadId) { mLoadId = aLoadId; }
-
-  /// Reset the cache entry after we've dropped our reference to it. Used by
-  /// imgLoader when our cache entry is re-requested after we've dropped our
-  /// reference to it.
-  void SetCacheEntry(imgCacheEntry* aEntry);
-
-  /// Returns whether we've got a reference to the cache entry.
-  bool HasCacheEntry() const;
-
-  /// Set whether this request is stored in the cache. If it isn't, regardless
-  /// of whether this request has a non-null mCacheEntry, this imgRequest won't
-  /// try to update or modify the image cache.
-  void SetIsInCache(bool aCacheable);
-
-  void EvictFromCache();
-  void RemoveFromCache();
-
-  // Sets properties for this image; will dispatch to main thread if needed.
-  void SetProperties(const nsACString& aContentType,
-                     const nsACString& aContentDisposition);
-
-  nsIProperties* Properties() const { return mProperties; }
-
-  bool HasConsumers() const;
-
-private:
-  friend class FinishPreparingForNewPartRunnable;
-
-  virtual ~imgRequest();
-
-  void FinishPreparingForNewPart(const NewPartResult& aResult);
-
-  void Cancel(nsresult aStatus);
-
-  // Update the cache entry size based on the image container.
-  void UpdateCacheEntrySize();
-
-  /// Returns true if RequestDecode() was called.
-  bool IsDecodeRequested() const;
-
-  // Weak reference to parent loader; this request cannot outlive its owner.
-  imgLoader* mLoader;
-  nsCOMPtr<nsIRequest> mRequest;
-  // The original URI we were loaded with. This is the same as the URI we are
-  // keyed on in the cache. We store a string here to avoid off main thread
-  // refcounting issues with nsStandardURL.
-  nsRefPtr<ImageURL> mURI;
-  // The URI of the resource we ended up loading after all redirects, etc.
-  nsCOMPtr<nsIURI> mCurrentURI;
-  // The principal of the document which loaded this image. Used when
-  // validating for CORS.
-  nsCOMPtr<nsIPrincipal> mLoadingPrincipal;
-  // The principal of this image.
-  nsCOMPtr<nsIPrincipal> mPrincipal;
-  nsCOMPtr<nsIProperties> mProperties;
-  nsCOMPtr<nsISupports> mSecurityInfo;
-  nsCOMPtr<nsIChannel> mChannel;
-  nsCOMPtr<nsIInterfaceRequestor> mPrevChannelSink;
-  nsCOMPtr<nsIApplicationCache> mApplicationCache;
-
-  nsCOMPtr<nsITimedChannel> mTimedChannel;
-
-  nsCString mContentType;
-
-  /* we hold on to this to this so long as we have observers */
-  nsRefPtr<imgCacheEntry> mCacheEntry;
-
-  void* mLoadId;
-
-  imgCacheValidator* mValidator;
-  nsCOMPtr<nsIAsyncVerifyRedirectCallback> mRedirectCallback;
-  nsCOMPtr<nsIChannel> mNewRedirectChannel;
-
-  // The ID of the inner window origin, used for error reporting.
-  uint64_t mInnerWindowId;
-
-  // The CORS mode (defined in imgIRequest) this image was loaded with. By
-  // default, imgIRequest::CORS_NONE.
-  int32_t mCORSMode;
-
-  // The Referrer Policy (defined in ReferrerPolicy.h) used for this image.
-  ReferrerPolicy mReferrerPolicy;
-
-  nsresult mImageErrorCode;
-
-  mutable mozilla::Mutex mMutex;
-
-  // Member variables protected by mMutex. Note that *all* flags in our bitfield
-  // are protected by mMutex; if you're adding a new flag that isn'protected, it
-  // must not be a part of this bitfield.
-  nsRefPtr<ProgressTracker> mProgressTracker;
-  nsRefPtr<Image> mImage;
-  bool mIsMultiPartChannel : 1;
-  bool mGotData : 1;
-  bool mIsInCache : 1;
-  bool mDecodeRequested : 1;
-  bool mNewPartPending : 1;
-  bool mHadInsecureRedirect : 1;
-};
-
-#endif // mozilla_image_src_imgRequest_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/imgRequestProxy.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/imgRequestProxy.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/imgRequestProxy.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/imgRequestProxy.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,1152 +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 "imgRequestProxy.h"
-#include "imgIOnloadBlocker.h"
-#include "imgLoader.h"
-#include "Image.h"
-#include "ImageOps.h"
-#include "nsError.h"
-#include "nsCRTGlue.h"
-#include "imgINotificationObserver.h"
-#include "nsNetUtil.h"
-
-using namespace mozilla::image;
-
-// The split of imgRequestProxy and imgRequestProxyStatic means that
-// certain overridden functions need to be usable in the destructor.
-// Since virtual functions can't be used in that way, this class
-// provides a behavioural trait for each class to use instead.
-class ProxyBehaviour
-{
- public:
-  virtual ~ProxyBehaviour() {}
-
-  virtual already_AddRefed<mozilla::image::Image> GetImage() const = 0;
-  virtual bool HasImage() const = 0;
-  virtual already_AddRefed<ProgressTracker> GetProgressTracker() const = 0;
-  virtual imgRequest* GetOwner() const = 0;
-  virtual void SetOwner(imgRequest* aOwner) = 0;
-};
-
-class RequestBehaviour : public ProxyBehaviour
-{
- public:
-  RequestBehaviour() : mOwner(nullptr), mOwnerHasImage(false) {}
-
-  virtual already_AddRefed<mozilla::image::Image>GetImage() const override;
-  virtual bool HasImage() const override;
-  virtual already_AddRefed<ProgressTracker> GetProgressTracker() const override;
-
-  virtual imgRequest* GetOwner() const override {
-    return mOwner;
-  }
-
-  virtual void SetOwner(imgRequest* aOwner) override {
-    mOwner = aOwner;
-
-    if (mOwner) {
-      nsRefPtr<ProgressTracker> ownerProgressTracker = GetProgressTracker();
-      mOwnerHasImage = ownerProgressTracker && ownerProgressTracker->HasImage();
-    } else {
-      mOwnerHasImage = false;
-    }
-  }
-
- private:
-  // We maintain the following invariant:
-  // The proxy is registered at most with a single imgRequest as an observer,
-  // and whenever it is, mOwner points to that object. This helps ensure that
-  // imgRequestProxy::~imgRequestProxy unregisters the proxy as an observer
-  // from whatever request it was registered with (if any). This, in turn,
-  // means that imgRequest::mObservers will not have any stale pointers in it.
-  nsRefPtr<imgRequest> mOwner;
-
-  bool mOwnerHasImage;
-};
-
-already_AddRefed<mozilla::image::Image>
-RequestBehaviour::GetImage() const
-{
-  if (!mOwnerHasImage) {
-    return nullptr;
-  }
-  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
-  return progressTracker->GetImage();
-}
-
-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->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)
-NS_IMPL_RELEASE(imgRequestProxy)
-
-NS_INTERFACE_MAP_BEGIN(imgRequestProxy)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, imgIRequest)
-  NS_INTERFACE_MAP_ENTRY(imgIRequest)
-  NS_INTERFACE_MAP_ENTRY(nsIRequest)
-  NS_INTERFACE_MAP_ENTRY(nsISupportsPriority)
-  NS_INTERFACE_MAP_ENTRY(nsISecurityInfoProvider)
-  NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsITimedChannel,
-                                     TimedChannel() != nullptr)
-NS_INTERFACE_MAP_END
-
-imgRequestProxy::imgRequestProxy() :
-  mBehaviour(new RequestBehaviour),
-  mURI(nullptr),
-  mListener(nullptr),
-  mLoadFlags(nsIRequest::LOAD_NORMAL),
-  mLockCount(0),
-  mAnimationConsumers(0),
-  mCanceled(false),
-  mIsInLoadGroup(false),
-  mListenerIsStrongRef(false),
-  mDecodeRequested(false),
-  mDeferNotifications(false)
-{
-  /* member initializers and constructor code */
-
-}
-
-imgRequestProxy::~imgRequestProxy()
-{
-  /* destructor code */
-  NS_PRECONDITION(!mListener,
-                  "Someone forgot to properly cancel this request!");
-
-  // Unlock the image the proper number of times if we're holding locks on
-  // it. Note that UnlockImage() decrements mLockCount each time it's called.
-  while (mLockCount) {
-    UnlockImage();
-  }
-
-  ClearAnimationConsumers();
-
-  // Explicitly set mListener to null to ensure that the RemoveProxy
-  // call below can't send |this| to an arbitrary listener while |this|
-  // is being destroyed.  This is all belt-and-suspenders in view of the
-  // above assert.
-  NullOutListener();
-
-  if (GetOwner()) {
-    /* Call RemoveProxy with a successful status.  This will keep the
-       channel, if still downloading data, from being canceled if 'this' is
-       the last observer.  This allows the image to continue to download and
-       be cached even if no one is using it currently.
-    */
-    mCanceled = true;
-    GetOwner()->RemoveProxy(this, NS_OK);
-  }
-}
-
-nsresult
-imgRequestProxy::Init(imgRequest* aOwner,
-                      nsILoadGroup* aLoadGroup,
-                      ImageURL* aURI,
-                      imgINotificationObserver* aObserver)
-{
-  NS_PRECONDITION(!GetOwner() && !mListener,
-                  "imgRequestProxy is already initialized");
-
-  LOG_SCOPE_WITH_PARAM(GetImgLog(), "imgRequestProxy::Init", "request",
-                       aOwner);
-
-  MOZ_ASSERT(mAnimationConsumers == 0, "Cannot have animation before Init");
-
-  mBehaviour->SetOwner(aOwner);
-  mListener = aObserver;
-  // Make sure to addref mListener before the AddProxy call below, since
-  // that call might well want to release it if the imgRequest has
-  // already seen OnStopRequest.
-  if (mListener) {
-    mListenerIsStrongRef = true;
-    NS_ADDREF(mListener);
-  }
-  mLoadGroup = aLoadGroup;
-  mURI = aURI;
-
-  // Note: AddProxy won't send all the On* notifications immediately
-  if (GetOwner()) {
-    GetOwner()->AddProxy(this);
-  }
-
-  return NS_OK;
-}
-
-nsresult
-imgRequestProxy::ChangeOwner(imgRequest* aNewOwner)
-{
-  NS_PRECONDITION(GetOwner(),
-                  "Cannot ChangeOwner on a proxy without an owner!");
-
-  if (mCanceled) {
-    // Ensure that this proxy has received all notifications to date
-    // before we clean it up when removing it from the old owner below.
-    SyncNotifyListener();
-  }
-
-  // If we're holding locks, unlock the old image.
-  // Note that UnlockImage decrements mLockCount each time it's called.
-  uint32_t oldLockCount = mLockCount;
-  while (mLockCount) {
-    UnlockImage();
-  }
-
-  // If we're holding animation requests, undo them.
-  uint32_t oldAnimationConsumers = mAnimationConsumers;
-  ClearAnimationConsumers();
-
-  // Were we decoded before?
-  bool wasDecoded = false;
-  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
-  if (progressTracker->HasImage() &&
-      progressTracker->GetImageStatus() &
-        imgIRequest::STATUS_FRAME_COMPLETE) {
-    wasDecoded = true;
-  }
-
-  GetOwner()->RemoveProxy(this, NS_IMAGELIB_CHANGING_OWNER);
-
-  mBehaviour->SetOwner(aNewOwner);
-
-  // If we were locked, apply the locks here
-  for (uint32_t i = 0; i < oldLockCount; i++) {
-    LockImage();
-  }
-
-  // If we had animation requests, restore them here. Note that we
-  // do this *after* RemoveProxy, which clears out animation consumers
-  // (see bug 601723).
-  for (uint32_t i = 0; i < oldAnimationConsumers; i++) {
-    IncrementAnimationConsumers();
-  }
-
-  GetOwner()->AddProxy(this);
-
-  // If we were decoded, or if we'd previously requested a decode, request a
-  // decode on the new image
-  if (wasDecoded || mDecodeRequested) {
-    StartDecoding();
-  }
-
-  return NS_OK;
-}
-
-void
-imgRequestProxy::AddToLoadGroup()
-{
-  NS_ASSERTION(!mIsInLoadGroup, "Whaa, we're already in the loadgroup!");
-
-  if (!mIsInLoadGroup && mLoadGroup) {
-    mLoadGroup->AddRequest(this, nullptr);
-    mIsInLoadGroup = true;
-  }
-}
-
-void
-imgRequestProxy::RemoveFromLoadGroup(bool releaseLoadGroup)
-{
-  if (!mIsInLoadGroup) {
-    return;
-  }
-
-  /* calling RemoveFromLoadGroup may cause the document to finish
-     loading, which could result in our death.  We need to make sure
-     that we stay alive long enough to fight another battle... at
-     least until we exit this function.
-  */
-  nsCOMPtr<imgIRequest> kungFuDeathGrip(this);
-
-  mLoadGroup->RemoveRequest(this, nullptr, NS_OK);
-  mIsInLoadGroup = false;
-
-  if (releaseLoadGroup) {
-    // We're done with the loadgroup, release it.
-    mLoadGroup = nullptr;
-  }
-}
-
-
-/**  nsIRequest / imgIRequest methods **/
-
-/* readonly attribute wstring name; */
-NS_IMETHODIMP
-imgRequestProxy::GetName(nsACString& aName)
-{
-  aName.Truncate();
-
-  if (mURI) {
-    mURI->GetSpec(aName);
-  }
-
-  return NS_OK;
-}
-
-/* boolean isPending (); */
-NS_IMETHODIMP
-imgRequestProxy::IsPending(bool* _retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* readonly attribute nsresult status; */
-NS_IMETHODIMP
-imgRequestProxy::GetStatus(nsresult* aStatus)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void cancel (in nsresult status); */
-NS_IMETHODIMP
-imgRequestProxy::Cancel(nsresult status)
-{
-  if (mCanceled) {
-    return NS_ERROR_FAILURE;
-  }
-
-  LOG_SCOPE(GetImgLog(), "imgRequestProxy::Cancel");
-
-  mCanceled = true;
-
-  nsCOMPtr<nsIRunnable> ev = new imgCancelRunnable(this, status);
-  return NS_DispatchToCurrentThread(ev);
-}
-
-void
-imgRequestProxy::DoCancel(nsresult status)
-{
-  if (GetOwner()) {
-    GetOwner()->RemoveProxy(this, status);
-  }
-
-  NullOutListener();
-}
-
-/* void cancelAndForgetObserver (in nsresult aStatus); */
-NS_IMETHODIMP
-imgRequestProxy::CancelAndForgetObserver(nsresult aStatus)
-{
-  // If mCanceled is true but mListener is non-null, that means
-  // someone called Cancel() on us but the imgCancelRunnable is still
-  // pending.  We still need to null out mListener before returning
-  // from this function in this case.  That means we want to do the
-  // RemoveProxy call right now, because we need to deliver the
-  // onStopRequest.
-  if (mCanceled && !mListener) {
-    return NS_ERROR_FAILURE;
-  }
-
-  LOG_SCOPE(GetImgLog(), "imgRequestProxy::CancelAndForgetObserver");
-
-  mCanceled = true;
-
-  // Now cheat and make sure our removal from loadgroup happens async
-  bool oldIsInLoadGroup = mIsInLoadGroup;
-  mIsInLoadGroup = false;
-
-  if (GetOwner()) {
-    GetOwner()->RemoveProxy(this, aStatus);
-  }
-
-  mIsInLoadGroup = oldIsInLoadGroup;
-
-  if (mIsInLoadGroup) {
-    nsCOMPtr<nsIRunnable> ev =
-      NS_NewRunnableMethod(this, &imgRequestProxy::DoRemoveFromLoadGroup);
-    NS_DispatchToCurrentThread(ev);
-  }
-
-  NullOutListener();
-
-  return NS_OK;
-}
-
-/* void startDecode (); */
-NS_IMETHODIMP
-imgRequestProxy::StartDecoding()
-{
-  // Flag this, so we know to transfer the request if our owner changes
-  mDecodeRequested = true;
-
-  nsRefPtr<Image> image = GetImage();
-  if (image) {
-    return image->StartDecoding();
-  }
-
-  if (GetOwner()) {
-    GetOwner()->RequestDecode();
-  }
-
-  return NS_OK;
-}
-
-/* void requestDecode (); */
-NS_IMETHODIMP
-imgRequestProxy::RequestDecode()
-{
-  // Flag this, so we know to transfer the request if our owner changes
-  mDecodeRequested = true;
-
-  nsRefPtr<Image> image = GetImage();
-  if (image) {
-    return image->RequestDecode();
-  }
-
-  if (GetOwner()) {
-    GetOwner()->RequestDecode();
-  }
-
-  return NS_OK;
-}
-
-
-/* void lockImage (); */
-NS_IMETHODIMP
-imgRequestProxy::LockImage()
-{
-  mLockCount++;
-  nsRefPtr<Image> image = GetImage();
-  if (image) {
-    return image->LockImage();
-  }
-  return NS_OK;
-}
-
-/* void unlockImage (); */
-NS_IMETHODIMP
-imgRequestProxy::UnlockImage()
-{
-  MOZ_ASSERT(mLockCount > 0, "calling unlock but no locks!");
-
-  mLockCount--;
-  nsRefPtr<Image> image = GetImage();
-  if (image) {
-    return image->UnlockImage();
-  }
-  return NS_OK;
-}
-
-/* void requestDiscard (); */
-NS_IMETHODIMP
-imgRequestProxy::RequestDiscard()
-{
-  nsRefPtr<Image> image = GetImage();
-  if (image) {
-    return image->RequestDiscard();
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-imgRequestProxy::IncrementAnimationConsumers()
-{
-  mAnimationConsumers++;
-  nsRefPtr<Image> image = GetImage();
-  if (image) {
-    image->IncrementAnimationConsumers();
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-imgRequestProxy::DecrementAnimationConsumers()
-{
-  // We may get here if some responsible code called Increment,
-  // then called us, but we have meanwhile called ClearAnimationConsumers
-  // because we needed to get rid of them earlier (see
-  // imgRequest::RemoveProxy), and hence have nothing left to
-  // decrement. (In such a case we got rid of the animation consumers
-  // early, but not the observer.)
-  if (mAnimationConsumers > 0) {
-    mAnimationConsumers--;
-    nsRefPtr<Image> image = GetImage();
-    if (image) {
-      image->DecrementAnimationConsumers();
-    }
-  }
-  return NS_OK;
-}
-
-void
-imgRequestProxy::ClearAnimationConsumers()
-{
-  while (mAnimationConsumers > 0) {
-    DecrementAnimationConsumers();
-  }
-}
-
-/* void suspend (); */
-NS_IMETHODIMP
-imgRequestProxy::Suspend()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void resume (); */
-NS_IMETHODIMP
-imgRequestProxy::Resume()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* attribute nsILoadGroup loadGroup */
-NS_IMETHODIMP
-imgRequestProxy::GetLoadGroup(nsILoadGroup** loadGroup)
-{
-  NS_IF_ADDREF(*loadGroup = mLoadGroup.get());
-  return NS_OK;
-}
-NS_IMETHODIMP
-imgRequestProxy::SetLoadGroup(nsILoadGroup* loadGroup)
-{
-  mLoadGroup = loadGroup;
-  return NS_OK;
-}
-
-/* attribute nsLoadFlags loadFlags */
-NS_IMETHODIMP
-imgRequestProxy::GetLoadFlags(nsLoadFlags* flags)
-{
-  *flags = mLoadFlags;
-  return NS_OK;
-}
-NS_IMETHODIMP
-imgRequestProxy::SetLoadFlags(nsLoadFlags flags)
-{
-  mLoadFlags = flags;
-  return NS_OK;
-}
-
-/**  imgIRequest methods **/
-
-/* attribute imgIContainer image; */
-NS_IMETHODIMP
-imgRequestProxy::GetImage(imgIContainer** aImage)
-{
-  NS_ENSURE_TRUE(aImage, NS_ERROR_NULL_POINTER);
-  // It's possible that our owner has an image but hasn't notified us of it -
-  // that'll happen if we get Canceled before the owner instantiates its image
-  // (because Canceling unregisters us as a listener on mOwner). If we're
-  // in that situation, just grab the image off of mOwner.
-  nsRefPtr<Image> image = GetImage();
-  nsCOMPtr<imgIContainer> imageToReturn;
-  if (image) {
-    imageToReturn = do_QueryInterface(image);
-  }
-  if (!imageToReturn && GetOwner()) {
-    imageToReturn = GetOwner()->GetImage();
-  }
-  if (!imageToReturn) {
-    return NS_ERROR_FAILURE;
-  }
-
-  imageToReturn.swap(*aImage);
-
-  return NS_OK;
-}
-
-/* readonly attribute unsigned long imageStatus; */
-NS_IMETHODIMP
-imgRequestProxy::GetImageStatus(uint32_t* aStatus)
-{
-  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
-  *aStatus = progressTracker->GetImageStatus();
-
-  return NS_OK;
-}
-
-/* readonly attribute nresult imageErrorCode; */
-NS_IMETHODIMP
-imgRequestProxy::GetImageErrorCode(nsresult* aStatus)
-{
-  if (!GetOwner()) {
-    return NS_ERROR_FAILURE;
-  }
-
-  *aStatus = GetOwner()->GetImageErrorCode();
-
-  return NS_OK;
-}
-
-/* readonly attribute nsIURI URI; */
-NS_IMETHODIMP
-imgRequestProxy::GetURI(nsIURI** aURI)
-{
-  MOZ_ASSERT(NS_IsMainThread(), "Must be on main thread to convert URI");
-  nsCOMPtr<nsIURI> uri = mURI->ToIURI();
-  uri.forget(aURI);
-  return NS_OK;
-}
-
-nsresult
-imgRequestProxy::GetCurrentURI(nsIURI** aURI)
-{
-  if (!GetOwner()) {
-    return NS_ERROR_FAILURE;
-  }
-
-  return GetOwner()->GetCurrentURI(aURI);
-}
-
-nsresult
-imgRequestProxy::GetURI(ImageURL** aURI)
-{
-  if (!mURI) {
-    return NS_ERROR_FAILURE;
-  }
-
-  NS_ADDREF(*aURI = mURI);
-
-  return NS_OK;
-}
-
-/* readonly attribute imgINotificationObserver notificationObserver; */
-NS_IMETHODIMP
-imgRequestProxy::GetNotificationObserver(imgINotificationObserver** aObserver)
-{
-  *aObserver = mListener;
-  NS_IF_ADDREF(*aObserver);
-  return NS_OK;
-}
-
-/* readonly attribute string mimeType; */
-NS_IMETHODIMP
-imgRequestProxy::GetMimeType(char** aMimeType)
-{
-  if (!GetOwner()) {
-    return NS_ERROR_FAILURE;
-  }
-
-  const char* type = GetOwner()->GetMimeType();
-  if (!type) {
-    return NS_ERROR_FAILURE;
-  }
-
-  *aMimeType = NS_strdup(type);
-
-  return NS_OK;
-}
-
-static imgRequestProxy* NewProxy(imgRequestProxy* /*aThis*/)
-{
-  return new imgRequestProxy();
-}
-
-imgRequestProxy* NewStaticProxy(imgRequestProxy* aThis)
-{
-  nsCOMPtr<nsIPrincipal> currentPrincipal;
-  aThis->GetImagePrincipal(getter_AddRefs(currentPrincipal));
-  nsRefPtr<Image> image = aThis->GetImage();
-  return new imgRequestProxyStatic(image, currentPrincipal);
-}
-
-NS_IMETHODIMP
-imgRequestProxy::Clone(imgINotificationObserver* aObserver,
-                       imgIRequest** aClone)
-{
-  nsresult result;
-  imgRequestProxy* proxy;
-  result = Clone(aObserver, &proxy);
-  *aClone = proxy;
-  return result;
-}
-
-nsresult imgRequestProxy::Clone(imgINotificationObserver* aObserver,
-                                imgRequestProxy** aClone)
-{
-  return PerformClone(aObserver, NewProxy, aClone);
-}
-
-nsresult
-imgRequestProxy::PerformClone(imgINotificationObserver* aObserver,
-                              imgRequestProxy* (aAllocFn)(imgRequestProxy*),
-                              imgRequestProxy** aClone)
-{
-  NS_PRECONDITION(aClone, "Null out param");
-
-  LOG_SCOPE(GetImgLog(), "imgRequestProxy::Clone");
-
-  *aClone = nullptr;
-  nsRefPtr<imgRequestProxy> clone = aAllocFn(this);
-
-  // It is important to call |SetLoadFlags()| before calling |Init()| because
-  // |Init()| adds the request to the loadgroup.
-  // When a request is added to a loadgroup, its load flags are merged
-  // with the load flags of the loadgroup.
-  // XXXldb That's not true anymore.  Stuff from imgLoader adds the
-  // request to the loadgroup.
-  clone->SetLoadFlags(mLoadFlags);
-  nsresult rv = clone->Init(mBehaviour->GetOwner(), mLoadGroup,
-                            mURI, aObserver);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  if (GetOwner() && GetOwner()->GetValidator()) {
-    clone->SetNotificationsDeferred(true);
-    GetOwner()->GetValidator()->AddProxy(clone);
-  }
-
-  // Assign to *aClone before calling Notify so that if the caller expects to
-  // only be notified for requests it's already holding pointers to it won't be
-  // surprised.
-  NS_ADDREF(*aClone = clone);
-
-  // This is wrong!!! We need to notify asynchronously, but there's code that
-  // assumes that we don't. This will be fixed in bug 580466.
-  clone->SyncNotifyListener();
-
-  return NS_OK;
-}
-
-/* readonly attribute nsIPrincipal imagePrincipal; */
-NS_IMETHODIMP
-imgRequestProxy::GetImagePrincipal(nsIPrincipal** aPrincipal)
-{
-  if (!GetOwner()) {
-    return NS_ERROR_FAILURE;
-  }
-
-  NS_ADDREF(*aPrincipal = GetOwner()->GetPrincipal());
-  return NS_OK;
-}
-
-/* readonly attribute bool multipart; */
-NS_IMETHODIMP
-imgRequestProxy::GetMultipart(bool* aMultipart)
-{
-  if (!GetOwner()) {
-    return NS_ERROR_FAILURE;
-  }
-
-  *aMultipart = GetOwner()->GetMultipart();
-
-  return NS_OK;
-}
-
-/* readonly attribute int32_t CORSMode; */
-NS_IMETHODIMP
-imgRequestProxy::GetCORSMode(int32_t* aCorsMode)
-{
-  if (!GetOwner()) {
-    return NS_ERROR_FAILURE;
-  }
-
-  *aCorsMode = GetOwner()->GetCORSMode();
-
-  return NS_OK;
-}
-
-/** nsISupportsPriority methods **/
-
-NS_IMETHODIMP
-imgRequestProxy::GetPriority(int32_t* priority)
-{
-  NS_ENSURE_STATE(GetOwner());
-  *priority = GetOwner()->Priority();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-imgRequestProxy::SetPriority(int32_t priority)
-{
-  NS_ENSURE_STATE(GetOwner() && !mCanceled);
-  GetOwner()->AdjustPriority(this, priority - GetOwner()->Priority());
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-imgRequestProxy::AdjustPriority(int32_t priority)
-{
-  // We don't require |!mCanceled| here. This may be called even if we're
-  // cancelled, because it's invoked as part of the process of removing an image
-  // from the load group.
-  NS_ENSURE_STATE(GetOwner());
-  GetOwner()->AdjustPriority(this, priority);
-  return NS_OK;
-}
-
-/** nsISecurityInfoProvider methods **/
-
-NS_IMETHODIMP
-imgRequestProxy::GetSecurityInfo(nsISupports** _retval)
-{
-  if (GetOwner()) {
-    return GetOwner()->GetSecurityInfo(_retval);
-  }
-
-  *_retval = nullptr;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-imgRequestProxy::GetHasTransferredData(bool* hasData)
-{
-  if (GetOwner()) {
-    *hasData = GetOwner()->HasTransferredData();
-  } else {
-    // The safe thing to do is to claim we have data
-    *hasData = true;
-  }
-  return NS_OK;
-}
-
-void
-imgRequestProxy::OnStartDecode()
-{
-  // This notification is deliberately not propagated since there are no
-  // listeners who care about it.
-  if (GetOwner()) {
-    // 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 ProgressTrackerObserver::OnStopFrame will continue to
-    // increase the data size cumulatively.
-    GetOwner()->ResetCacheEntry();
-  }
-}
-
-static const char*
-NotificationTypeToString(int32_t aType)
-{
-  switch(aType)
-  {
-    case imgINotificationObserver::SIZE_AVAILABLE: return "SIZE_AVAILABLE";
-    case imgINotificationObserver::FRAME_UPDATE: return "FRAME_UPDATE";
-    case imgINotificationObserver::FRAME_COMPLETE: return "FRAME_COMPLETE";
-    case imgINotificationObserver::LOAD_COMPLETE: return "LOAD_COMPLETE";
-    case imgINotificationObserver::DECODE_COMPLETE: return "DECODE_COMPLETE";
-    case imgINotificationObserver::DISCARD: return "DISCARD";
-    case imgINotificationObserver::UNLOCKED_DRAW: return "UNLOCKED_DRAW";
-    case imgINotificationObserver::IS_ANIMATED: return "IS_ANIMATED";
-    case imgINotificationObserver::HAS_TRANSPARENCY: return "HAS_TRANSPARENCY";
-    default:
-      NS_NOTREACHED("Notification list should be exhaustive");
-      return "(unknown notification)";
-  }
-}
-
-void
-imgRequestProxy::Notify(int32_t aType, const mozilla::gfx::IntRect* aRect)
-{
-  MOZ_ASSERT(aType != imgINotificationObserver::LOAD_COMPLETE,
-             "Should call OnLoadComplete");
-
-  LOG_FUNC_WITH_PARAM(GetImgLog(), "imgRequestProxy::Notify", "type",
-                      NotificationTypeToString(aType));
-
-  if (!mListener || mCanceled) {
-    return;
-  }
-
-  // Make sure the listener stays alive while we notify.
-  nsCOMPtr<imgINotificationObserver> listener(mListener);
-
-  mListener->Notify(this, aType, aRect);
-}
-
-void
-imgRequestProxy::OnLoadComplete(bool aLastPart)
-{
-  if (PR_LOG_TEST(GetImgLog(), PR_LOG_DEBUG)) {
-    nsAutoCString name;
-    GetName(name);
-    LOG_FUNC_WITH_PARAM(GetImgLog(), "imgRequestProxy::OnLoadComplete",
-                        "name", name.get());
-  }
-
-  // There's all sorts of stuff here that could kill us (the OnStopRequest call
-  // on the listener, the removal from the loadgroup, the release of the
-  // listener, etc).  Don't let them do it.
-  nsCOMPtr<imgIRequest> kungFuDeathGrip(this);
-
-  if (mListener && !mCanceled) {
-    // Hold a ref to the listener while we call it, just in case.
-    nsCOMPtr<imgINotificationObserver> kungFuDeathGrip(mListener);
-    mListener->Notify(this, imgINotificationObserver::LOAD_COMPLETE, nullptr);
-  }
-
-  // If we're expecting more data from a multipart channel, re-add ourself
-  // 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 (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 (!aLastPart) {
-      mLoadFlags |= nsIRequest::LOAD_BACKGROUND;
-      AddToLoadGroup();
-    }
-  }
-
-  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
-    // like that.  Don't add anything in this method after this point.
-    imgINotificationObserver* obs = mListener;
-    mListenerIsStrongRef = false;
-    NS_RELEASE(obs);
-  }
-}
-
-void
-imgRequestProxy::BlockOnload()
-{
-  if (PR_LOG_TEST(GetImgLog(), PR_LOG_DEBUG)) {
-    nsAutoCString name;
-    GetName(name);
-    LOG_FUNC_WITH_PARAM(GetImgLog(), "imgRequestProxy::BlockOnload",
-                        "name", name.get());
-  }
-
-  nsCOMPtr<imgIOnloadBlocker> blocker = do_QueryInterface(mListener);
-  if (blocker) {
-    blocker->BlockOnload(this);
-  }
-}
-
-void
-imgRequestProxy::UnblockOnload()
-{
-  if (PR_LOG_TEST(GetImgLog(), PR_LOG_DEBUG)) {
-    nsAutoCString name;
-    GetName(name);
-    LOG_FUNC_WITH_PARAM(GetImgLog(), "imgRequestProxy::UnblockOnload",
-                        "name", name.get());
-  }
-
-  nsCOMPtr<imgIOnloadBlocker> blocker = do_QueryInterface(mListener);
-  if (blocker) {
-    blocker->UnblockOnload(this);
-  }
-}
-
-void
-imgRequestProxy::NullOutListener()
-{
-  // If we have animation consumers, then they don't matter anymore
-  if (mListener) {
-    ClearAnimationConsumers();
-  }
-
-  if (mListenerIsStrongRef) {
-    // Releasing could do weird reentery stuff, so just play it super-safe
-    nsCOMPtr<imgINotificationObserver> obs;
-    obs.swap(mListener);
-    mListenerIsStrongRef = false;
-  } else {
-    mListener = nullptr;
-  }
-}
-
-NS_IMETHODIMP
-imgRequestProxy::GetStaticRequest(imgIRequest** aReturn)
-{
-  imgRequestProxy* proxy;
-  nsresult result = GetStaticRequest(&proxy);
-  *aReturn = proxy;
-  return result;
-}
-
-nsresult
-imgRequestProxy::GetStaticRequest(imgRequestProxy** aReturn)
-{
-  *aReturn = nullptr;
-  nsRefPtr<Image> image = GetImage();
-
-  bool animated;
-  if (!image || (NS_SUCCEEDED(image->GetAnimated(&animated)) && !animated)) {
-    // Early exit - we're not animated, so we don't have to do anything.
-    NS_ADDREF(*aReturn = this);
-    return NS_OK;
-  }
-
-  // Check for errors in the image. Callers code rely on GetStaticRequest
-  // failing in this case, though with FrozenImage there's no technical reason
-  // for it anymore.
-  if (image->HasError()) {
-    return NS_ERROR_FAILURE;
-  }
-
-  // We are animated. We need to create a frozen version of this image.
-  nsRefPtr<Image> frozenImage = ImageOps::Freeze(image);
-
-  // Create a static imgRequestProxy with our new extracted frame.
-  nsCOMPtr<nsIPrincipal> currentPrincipal;
-  GetImagePrincipal(getter_AddRefs(currentPrincipal));
-  nsRefPtr<imgRequestProxy> req = new imgRequestProxyStatic(frozenImage,
-                                                            currentPrincipal);
-  req->Init(nullptr, nullptr, mURI, nullptr);
-
-  NS_ADDREF(*aReturn = req);
-
-  return NS_OK;
-}
-
-void
-imgRequestProxy::NotifyListener()
-{
-  // It would be nice to notify the observer directly in the status tracker
-  // instead of through the proxy, but there are several places we do extra
-  // processing when we receive notifications (like OnStopRequest()), and we
-  // need to check mCanceled everywhere too.
-
-  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
-  if (GetOwner()) {
-    // Send the notifications to our listener asynchronously.
-    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.
-    MOZ_ASSERT(HasImage(),
-               "if we have no imgRequest, we should have an Image");
-    progressTracker->NotifyCurrentState(this);
-  }
-}
-
-void
-imgRequestProxy::SyncNotifyListener()
-{
-  // It would be nice to notify the observer directly in the status tracker
-  // instead of through the proxy, but there are several places we do extra
-  // processing when we receive notifications (like OnStopRequest()), and we
-  // need to check mCanceled everywhere too.
-
-  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
-  progressTracker->SyncNotify(this);
-}
-
-void
-imgRequestProxy::SetHasImage()
-{
-  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
-  // the presence of an image;
-  mBehaviour->SetOwner(mBehaviour->GetOwner());
-
-  // Apply any locks we have
-  for (uint32_t i = 0; i < mLockCount; ++i) {
-    image->LockImage();
-  }
-
-  // Apply any animation consumers we have
-  for (uint32_t i = 0; i < mAnimationConsumers; i++) {
-    image->IncrementAnimationConsumers();
-  }
-}
-
-already_AddRefed<ProgressTracker>
-imgRequestProxy::GetProgressTracker() const
-{
-  return mBehaviour->GetProgressTracker();
-}
-
-already_AddRefed<mozilla::image::Image>
-imgRequestProxy::GetImage() const
-{
-  return mBehaviour->GetImage();
-}
-
-bool
-RequestBehaviour::HasImage() const
-{
-  if (!mOwnerHasImage) {
-    return false;
-  }
-  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
-  return progressTracker ? progressTracker->HasImage() : false;
-}
-
-bool
-imgRequestProxy::HasImage() const
-{
-  return mBehaviour->HasImage();
-}
-
-imgRequest*
-imgRequestProxy::GetOwner() const
-{
-  return mBehaviour->GetOwner();
-}
-
-////////////////// imgRequestProxyStatic methods
-
-class StaticBehaviour : public ProxyBehaviour
-{
-public:
-  explicit StaticBehaviour(mozilla::image::Image* aImage) : mImage(aImage) {}
-
-  virtual already_AddRefed<mozilla::image::Image>
-  GetImage() const override {
-    nsRefPtr<mozilla::image::Image> image = mImage;
-    return image.forget();
-  }
-
-  virtual bool HasImage() const override {
-    return mImage;
-  }
-
-  virtual already_AddRefed<ProgressTracker> GetProgressTracker()
-    const override  {
-    return mImage->GetProgressTracker();
-  }
-
-  virtual imgRequest* GetOwner() const override {
-    return nullptr;
-  }
-
-  virtual void SetOwner(imgRequest* aOwner) override {
-    MOZ_ASSERT(!aOwner,
-               "We shouldn't be giving static requests a non-null owner.");
-  }
-
-private:
-  // Our image. We have to hold a strong reference here, because that's normally
-  // the job of the underlying request.
-  nsRefPtr<mozilla::image::Image> mImage;
-};
-
-imgRequestProxyStatic::imgRequestProxyStatic(mozilla::image::Image* aImage,
-                                             nsIPrincipal* aPrincipal)
-: mPrincipal(aPrincipal)
-{
-  mBehaviour = new StaticBehaviour(aImage);
-}
-
-NS_IMETHODIMP
-imgRequestProxyStatic::GetImagePrincipal(nsIPrincipal** aPrincipal)
-{
-  if (!mPrincipal) {
-    return NS_ERROR_FAILURE;
-  }
-
-  NS_ADDREF(*aPrincipal = mPrincipal);
-
-  return NS_OK;
-}
-
-nsresult
-imgRequestProxyStatic::Clone(imgINotificationObserver* aObserver,
-                             imgRequestProxy** aClone)
-{
-  return PerformClone(aObserver, NewStaticProxy, aClone);
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/imgRequestProxy.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/imgRequestProxy.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/imgRequestProxy.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/imgRequestProxy.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,246 +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_image_src_imgRequestProxy_h
-#define mozilla_image_src_imgRequestProxy_h
-
-#include "imgIRequest.h"
-#include "nsISecurityInfoProvider.h"
-
-#include "nsILoadGroup.h"
-#include "nsISupportsPriority.h"
-#include "nsITimedChannel.h"
-#include "nsCOMPtr.h"
-#include "nsAutoPtr.h"
-#include "nsThreadUtils.h"
-#include "mozilla/TimeStamp.h"
-#include "mozilla/gfx/Rect.h"
-
-#include "imgRequest.h"
-#include "IProgressObserver.h"
-
-#define NS_IMGREQUESTPROXY_CID \
-{ /* 20557898-1dd2-11b2-8f65-9c462ee2bc95 */         \
-     0x20557898,                                     \
-     0x1dd2,                                         \
-     0x11b2,                                         \
-    {0x8f, 0x65, 0x9c, 0x46, 0x2e, 0xe2, 0xbc, 0x95} \
-}
-
-class imgINotificationObserver;
-class imgStatusNotifyRunnable;
-class ProxyBehaviour;
-
-namespace mozilla {
-namespace image {
-class Image;
-class ImageURL;
-class ProgressTracker;
-} // namespace image
-} // namespace mozilla
-
-class imgRequestProxy : public imgIRequest,
-                        public mozilla::image::IProgressObserver,
-                        public nsISupportsPriority,
-                        public nsISecurityInfoProvider,
-                        public nsITimedChannel
-{
-protected:
-  virtual ~imgRequestProxy();
-
-public:
-  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
-  NS_DECL_NSISUPPORTSPRIORITY
-  NS_DECL_NSISECURITYINFOPROVIDER
-  // nsITimedChannel declared below
-
-  imgRequestProxy();
-
-  // Callers to Init or ChangeOwner are required to call NotifyListener after
-  // (although not immediately after) doing so.
-  nsresult Init(imgRequest* aOwner,
-                nsILoadGroup* aLoadGroup,
-                ImageURL* aURI,
-                imgINotificationObserver* aObserver);
-
-  nsresult ChangeOwner(imgRequest* aNewOwner); // this will change mOwner.
-                                               // Do not call this if the
-                                               // previous owner has already
-                                               // sent notifications out!
-
-  void AddToLoadGroup();
-  void RemoveFromLoadGroup(bool releaseLoadGroup);
-
-  inline bool HasObserver() const {
-    return mListener != nullptr;
-  }
-
-  // Asynchronously notify this proxy's listener of the current state of the
-  // image, and, if we have an imgRequest mOwner, any status changes that
-  // happen between the time this function is called and the time the
-  // notification is scheduled.
-  void NotifyListener();
-
-  // Synchronously notify this proxy's listener of the current state of the
-  // image. Only use this function if you are currently servicing an
-  // asynchronously-called function.
-  void SyncNotifyListener();
-
-  // imgINotificationObserver methods:
-  virtual void Notify(int32_t aType,
-                      const mozilla::gfx::IntRect* aRect = nullptr) override;
-  virtual void OnLoadComplete(bool aLastPart) override;
-
-  // imgIOnloadBlocker methods:
-  virtual void BlockOnload() override;
-  virtual void UnblockOnload() override;
-
-  // Other, internal-only methods:
-  virtual void SetHasImage() override;
-  virtual void OnStartDecode() override;
-
-  // Whether we want notifications from ProgressTracker to be deferred until
-  // an event it has scheduled has been fired.
-  virtual bool NotificationsDeferred() const override
-  {
-    return mDeferNotifications;
-  }
-  virtual void SetNotificationsDeferred(bool aDeferNotifications) override
-  {
-    mDeferNotifications = aDeferNotifications;
-  }
-
-  // Removes all animation consumers that were created with
-  // IncrementAnimationConsumers. This is necessary since we need
-  // to do it before the proxy itself is destroyed. See
-  // imgRequest::RemoveProxy
-  void ClearAnimationConsumers();
-
-  virtual nsresult Clone(imgINotificationObserver* aObserver,
-                         imgRequestProxy** aClone);
-  nsresult GetStaticRequest(imgRequestProxy** aReturn);
-
-  nsresult GetURI(ImageURL** aURI);
-
-protected:
-  friend class mozilla::image::ProgressTracker;
-  friend class imgStatusNotifyRunnable;
-
-  class imgCancelRunnable;
-  friend class imgCancelRunnable;
-
-  class imgCancelRunnable : public nsRunnable
-  {
-    public:
-      imgCancelRunnable(imgRequestProxy* owner, nsresult status)
-        : mOwner(owner), mStatus(status)
-      { }
-
-      NS_IMETHOD Run() override {
-        mOwner->DoCancel(mStatus);
-        return NS_OK;
-      }
-
-    private:
-      nsRefPtr<imgRequestProxy> mOwner;
-      nsresult mStatus;
-  };
-
-  /* Finish up canceling ourselves */
-  void DoCancel(nsresult status);
-
-  /* Do the proper refcount management to null out mListener */
-  void NullOutListener();
-
-  void DoRemoveFromLoadGroup() {
-    RemoveFromLoadGroup(true);
-  }
-
-  // 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<ProgressTracker> GetProgressTracker() const;
-
-  nsITimedChannel* TimedChannel()
-  {
-    if (!GetOwner()) {
-      return nullptr;
-    }
-    return GetOwner()->GetTimedChannel();
-  }
-
-  already_AddRefed<Image> GetImage() const;
-  bool HasImage() const;
-  imgRequest* GetOwner() const;
-
-  nsresult PerformClone(imgINotificationObserver* aObserver,
-                        imgRequestProxy* (aAllocFn)(imgRequestProxy*),
-                        imgRequestProxy** aClone);
-
-public:
-  NS_FORWARD_SAFE_NSITIMEDCHANNEL(TimedChannel())
-
-protected:
-  nsAutoPtr<ProxyBehaviour> mBehaviour;
-
-private:
-  friend class imgCacheValidator;
-  friend imgRequestProxy* NewStaticProxy(imgRequestProxy* aThis);
-
-  // The URI of our request.
-  nsRefPtr<ImageURL> mURI;
-
-  // mListener is only promised to be a weak ref (see imgILoader.idl),
-  // but we actually keep a strong ref to it until we've seen our
-  // first OnStopRequest.
-  imgINotificationObserver* mListener;
-  nsCOMPtr<nsILoadGroup> mLoadGroup;
-
-  nsLoadFlags mLoadFlags;
-  uint32_t    mLockCount;
-  uint32_t    mAnimationConsumers;
-  bool mCanceled;
-  bool mIsInLoadGroup;
-  bool mListenerIsStrongRef;
-  bool mDecodeRequested;
-
-  // Whether we want to defer our notifications by the non-virtual Observer
-  // interfaces as image loads proceed.
-  bool mDeferNotifications;
-};
-
-// Used for static image proxies for which no requests are available, so
-// certain behaviours must be overridden to compensate.
-class imgRequestProxyStatic : public imgRequestProxy
-{
-
-public:
-  imgRequestProxyStatic(Image* aImage, nsIPrincipal* aPrincipal);
-
-  NS_IMETHOD GetImagePrincipal(nsIPrincipal** aPrincipal) override;
-
-  using imgRequestProxy::Clone;
-
-  virtual nsresult Clone(imgINotificationObserver* aObserver,
-                         imgRequestProxy** aClone) override;
-
-protected:
-  friend imgRequestProxy* NewStaticProxy(imgRequestProxy*);
-
-  // Our principal. We have to cache it, rather than accessing the underlying
-  // request on-demand, because static proxies don't have an underlying request.
-  nsCOMPtr<nsIPrincipal> mPrincipal;
-};
-
-#endif // mozilla_image_src_imgRequestProxy_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/imgTools.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/imgTools.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/imgTools.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/imgTools.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,349 +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 "imgTools.h"
-
-#include "gfxUtils.h"
-#include "mozilla/gfx/2D.h"
-#include "mozilla/RefPtr.h"
-#include "nsCOMPtr.h"
-#include "nsIDocument.h"
-#include "nsIDOMDocument.h"
-#include "nsError.h"
-#include "imgLoader.h"
-#include "imgICache.h"
-#include "imgIContainer.h"
-#include "imgIEncoder.h"
-#include "nsStreamUtils.h"
-#include "nsContentUtils.h"
-#include "ImageFactory.h"
-#include "Image.h"
-#include "ScriptedNotificationObserver.h"
-#include "imgIScriptedNotificationObserver.h"
-#include "gfxPlatform.h"
-
-using namespace mozilla;
-using namespace mozilla::image;
-using namespace mozilla::gfx;
-
-/* ========== imgITools implementation ========== */
-
-
-
-NS_IMPL_ISUPPORTS(imgTools, imgITools)
-
-imgTools::imgTools()
-{
-  /* member initializers and constructor code */
-}
-
-imgTools::~imgTools()
-{
-  /* destructor code */
-}
-
-NS_IMETHODIMP
-imgTools::DecodeImageData(nsIInputStream* aInStr,
-                          const nsACString& aMimeType,
-                          imgIContainer** aContainer)
-{
-  MOZ_ASSERT(*aContainer == nullptr,
-             "Cannot provide an existing image container to DecodeImageData");
-
-  return DecodeImage(aInStr, aMimeType, aContainer);
-}
-
-NS_IMETHODIMP
-imgTools::DecodeImage(nsIInputStream* aInStr,
-                      const nsACString& aMimeType,
-                      imgIContainer** aContainer)
-{
-  nsresult rv;
-
-  NS_ENSURE_ARG_POINTER(aInStr);
-
-  // Create a new image container to hold the decoded data.
-  nsAutoCString mimeType(aMimeType);
-  nsRefPtr<image::Image> image = ImageFactory::CreateAnonymousImage(mimeType);
-  nsRefPtr<ProgressTracker> tracker = image->GetProgressTracker();
-
-  if (image->HasError()) {
-    return NS_ERROR_FAILURE;
-  }
-
-  // Prepare the input stream.
-  nsCOMPtr<nsIInputStream> inStream = aInStr;
-  if (!NS_InputStreamIsBuffered(aInStr)) {
-    nsCOMPtr<nsIInputStream> bufStream;
-    rv = NS_NewBufferedInputStream(getter_AddRefs(bufStream), aInStr, 1024);
-    if (NS_SUCCEEDED(rv)) {
-      inStream = bufStream;
-    }
-  }
-
-  // Figure out how much data we've been passed.
-  uint64_t length;
-  rv = inStream->Available(&length);
-  NS_ENSURE_SUCCESS(rv, rv);
-  NS_ENSURE_TRUE(length <= UINT32_MAX, NS_ERROR_FILE_TOO_BIG);
-
-  // 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.
-  NS_ADDREF(*aContainer = image.get());
-  return NS_OK;
-}
-
-/**
- * This takes a DataSourceSurface rather than a SourceSurface because some
- * of the callers have a DataSourceSurface and we don't want to call
- * GetDataSurface on such surfaces since that may incure a conversion to
- * SurfaceType::DATA which we don't need.
- */
-static nsresult
-EncodeImageData(DataSourceSurface* aDataSurface,
-                const nsACString& aMimeType,
-                const nsAString& aOutputOptions,
-                nsIInputStream** aStream)
-{
-  MOZ_ASSERT(aDataSurface->GetFormat() ==  SurfaceFormat::B8G8R8A8,
-             "We're assuming B8G8R8A8");
-
-  // Get an image encoder for the media type
-  nsAutoCString encoderCID(
-    NS_LITERAL_CSTRING("@mozilla.org/image/encoder;2?type=") + aMimeType);
-
-  nsCOMPtr<imgIEncoder> encoder = do_CreateInstance(encoderCID.get());
-  if (!encoder) {
-    return NS_IMAGELIB_ERROR_NO_ENCODER;
-  }
-
-  DataSourceSurface::MappedSurface map;
-  if (!aDataSurface->Map(DataSourceSurface::MapType::READ, &map)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  IntSize size = aDataSurface->GetSize();
-  uint32_t dataLength = map.mStride * size.height;
-
-  // Encode the bitmap
-  nsresult rv = encoder->InitFromData(map.mData,
-                                      dataLength,
-                                      size.width,
-                                      size.height,
-                                      map.mStride,
-                                      imgIEncoder::INPUT_FORMAT_HOSTARGB,
-                                      aOutputOptions);
-  aDataSurface->Unmap();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  encoder.forget(aStream);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-imgTools::EncodeImage(imgIContainer* aContainer,
-                      const nsACString& aMimeType,
-                      const nsAString& aOutputOptions,
-                      nsIInputStream** aStream)
-{
-  // Use frame 0 from the image container.
-  RefPtr<SourceSurface> frame =
-    aContainer->GetFrame(imgIContainer::FRAME_FIRST,
-                         imgIContainer::FLAG_SYNC_DECODE);
-  NS_ENSURE_TRUE(frame, NS_ERROR_FAILURE);
-
-  RefPtr<DataSourceSurface> dataSurface;
-
-  if (frame->GetFormat() == SurfaceFormat::B8G8R8A8) {
-    dataSurface = frame->GetDataSurface();
-  } else {
-    // Convert format to SurfaceFormat::B8G8R8A8
-    dataSurface = gfxUtils::
-      CopySurfaceToDataSourceSurfaceWithFormat(frame,
-                                               SurfaceFormat::B8G8R8A8);
-  }
-
-  NS_ENSURE_TRUE(dataSurface, NS_ERROR_FAILURE);
-
-  return EncodeImageData(dataSurface, aMimeType, aOutputOptions, aStream);
-}
-
-NS_IMETHODIMP
-imgTools::EncodeScaledImage(imgIContainer* aContainer,
-                            const nsACString& aMimeType,
-                            int32_t aScaledWidth,
-                            int32_t aScaledHeight,
-                            const nsAString& aOutputOptions,
-                            nsIInputStream** aStream)
-{
-  NS_ENSURE_ARG(aScaledWidth >= 0 && aScaledHeight >= 0);
-
-  // If no scaled size is specified, we'll just encode the image at its
-  // original size (no scaling).
-  if (aScaledWidth == 0 && aScaledHeight == 0) {
-    return EncodeImage(aContainer, aMimeType, aOutputOptions, aStream);
-  }
-
-  // Use frame 0 from the image container.
-  RefPtr<SourceSurface> frame =
-    aContainer->GetFrame(imgIContainer::FRAME_FIRST,
-                         imgIContainer::FLAG_SYNC_DECODE);
-  NS_ENSURE_TRUE(frame, NS_ERROR_FAILURE);
-
-  int32_t frameWidth = frame->GetSize().width;
-  int32_t frameHeight = frame->GetSize().height;
-
-  // If the given width or height is zero we'll replace it with the image's
-  // original dimensions.
-  if (aScaledWidth == 0) {
-    aScaledWidth = frameWidth;
-  } else if (aScaledHeight == 0) {
-    aScaledHeight = frameHeight;
-  }
-
-  RefPtr<DataSourceSurface> dataSurface =
-    Factory::CreateDataSourceSurface(IntSize(aScaledWidth, aScaledHeight),
-                                     SurfaceFormat::B8G8R8A8);
-  if (NS_WARN_IF(!dataSurface)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  DataSourceSurface::MappedSurface map;
-  if (!dataSurface->Map(DataSourceSurface::MapType::WRITE, &map)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  RefPtr<DrawTarget> dt =
-    Factory::CreateDrawTargetForData(BackendType::CAIRO,
-                                     map.mData,
-                                     dataSurface->GetSize(),
-                                     map.mStride,
-                                     SurfaceFormat::B8G8R8A8);
-  if (!dt) {
-    gfxWarning() << "imgTools::EncodeImage failed in CreateDrawTargetForData";
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  dt->DrawSurface(frame,
-                  Rect(0, 0, aScaledWidth, aScaledHeight),
-                  Rect(0, 0, frameWidth, frameHeight),
-                  DrawSurfaceOptions(),
-                  DrawOptions(1.0f, CompositionOp::OP_SOURCE));
-
-  dataSurface->Unmap();
-
-  return EncodeImageData(dataSurface, aMimeType, aOutputOptions, aStream);
-}
-
-NS_IMETHODIMP
-imgTools::EncodeCroppedImage(imgIContainer* aContainer,
-                             const nsACString& aMimeType,
-                             int32_t aOffsetX,
-                             int32_t aOffsetY,
-                             int32_t aWidth,
-                             int32_t aHeight,
-                             const nsAString& aOutputOptions,
-                             nsIInputStream** aStream)
-{
-  NS_ENSURE_ARG(aOffsetX >= 0 && aOffsetY >= 0 && aWidth >= 0 && aHeight >= 0);
-
-  // Offsets must be zero when no width and height are given or else we're out
-  // of bounds.
-  NS_ENSURE_ARG(aWidth + aHeight > 0 || aOffsetX + aOffsetY == 0);
-
-  // If no size is specified then we'll preserve the image's original dimensions
-  // and don't need to crop.
-  if (aWidth == 0 && aHeight == 0) {
-    return EncodeImage(aContainer, aMimeType, aOutputOptions, aStream);
-  }
-
-  // Use frame 0 from the image container.
-  RefPtr<SourceSurface> frame =
-    aContainer->GetFrame(imgIContainer::FRAME_FIRST,
-                         imgIContainer::FLAG_SYNC_DECODE);
-  NS_ENSURE_TRUE(frame, NS_ERROR_FAILURE);
-
-  int32_t frameWidth = frame->GetSize().width;
-  int32_t frameHeight = frame->GetSize().height;
-
-  // If the given width or height is zero we'll replace it with the image's
-  // original dimensions.
-  if (aWidth == 0) {
-    aWidth = frameWidth;
-  } else if (aHeight == 0) {
-    aHeight = frameHeight;
-  }
-
-  // Check that the given crop rectangle is within image bounds.
-  NS_ENSURE_ARG(frameWidth >= aOffsetX + aWidth &&
-                frameHeight >= aOffsetY + aHeight);
-
-  RefPtr<DataSourceSurface> dataSurface =
-    Factory::CreateDataSourceSurface(IntSize(aWidth, aHeight),
-                                     SurfaceFormat::B8G8R8A8,
-                                     /* aZero = */ true);
-  if (NS_WARN_IF(!dataSurface)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  DataSourceSurface::MappedSurface map;
-  if (!dataSurface->Map(DataSourceSurface::MapType::WRITE, &map)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  RefPtr<DrawTarget> dt =
-    Factory::CreateDrawTargetForData(BackendType::CAIRO,
-                                     map.mData,
-                                     dataSurface->GetSize(),
-                                     map.mStride,
-                                     SurfaceFormat::B8G8R8A8);
-  if (!dt) {
-    gfxWarning() <<
-      "imgTools::EncodeCroppedImage failed in CreateDrawTargetForData";
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-  dt->CopySurface(frame,
-                  IntRect(aOffsetX, aOffsetY, aWidth, aHeight),
-                  IntPoint(0, 0));
-
-  dataSurface->Unmap();
-
-  return EncodeImageData(dataSurface, aMimeType, aOutputOptions, aStream);
-}
-
-NS_IMETHODIMP
-imgTools::CreateScriptedObserver(imgIScriptedNotificationObserver* aInner,
-                                 imgINotificationObserver** aObserver)
-{
-  NS_ADDREF(*aObserver = new ScriptedNotificationObserver(aInner));
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-imgTools::GetImgLoaderForDocument(nsIDOMDocument* aDoc, imgILoader** aLoader)
-{
-  nsCOMPtr<nsIDocument> doc = do_QueryInterface(aDoc);
-  NS_IF_ADDREF(*aLoader = nsContentUtils::GetImgLoaderForDocument(doc));
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-imgTools::GetImgCacheForDocument(nsIDOMDocument* aDoc, imgICache** aCache)
-{
-  nsCOMPtr<imgILoader> loader;
-  nsresult rv = GetImgLoaderForDocument(aDoc, getter_AddRefs(loader));
-  NS_ENSURE_SUCCESS(rv, rv);
-  return CallQueryInterface(loader, aCache);
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/imgTools.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/imgTools.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/imgTools.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/imgTools.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef mozilla_image_src_imgITools_h
-#define mozilla_image_src_imgITools_h
-
-#include "imgITools.h"
-
-#define NS_IMGTOOLS_CID \
-{ /* 3d8fa16d-c9e1-4b50-bdef-2c7ae249967a */         \
-     0x3d8fa16d,                                     \
-     0xc9e1,                                         \
-     0x4b50,                                         \
-    {0xbd, 0xef, 0x2c, 0x7a, 0xe2, 0x49, 0x96, 0x7a} \
-}
-
-class imgTools final : public imgITools
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGITOOLS
-
-  imgTools();
-
-private:
-  virtual ~imgTools();
-};
-#endif // mozilla_image_src_imgITools_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/IProgressObserver.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/IProgressObserver.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/IProgressObserver.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/IProgressObserver.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +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_image_src_IProgressObserver_h
-#define mozilla_image_src_IProgressObserver_h
-
-#include "mozilla/WeakPtr.h"
-#include "nsISupports.h"
-#include "nsRect.h"
-
-namespace mozilla {
-namespace image {
-
-/**
- * An interface for observing changes to image state, as reported by
- * ProgressTracker.
- *
- * This is the ImageLib-internal version of imgINotificationObserver,
- * essentially, with implementation details that code outside of ImageLib
- * shouldn't see.
- *
- * XXX(seth): It's preferable to avoid adding anything to this interface if
- * possible.  In the long term, it would be ideal to get to a place where we can
- * just use the imgINotificationObserver interface internally as well.
- */
-class IProgressObserver : public SupportsWeakPtr<IProgressObserver>
-{
-public:
-  MOZ_DECLARE_WEAKREFERENCE_TYPENAME(IProgressObserver)
-
-  // Subclasses may or may not be XPCOM classes, so we just require that they
-  // implement AddRef and Release.
-  NS_IMETHOD_(MozExternalRefCountType) AddRef(void) = 0;
-  NS_IMETHOD_(MozExternalRefCountType) Release(void) = 0;
-
-  // imgINotificationObserver methods:
-  virtual void Notify(int32_t aType, const nsIntRect* aRect = nullptr) = 0;
-  virtual void OnLoadComplete(bool aLastPart) = 0;
-
-  // imgIOnloadBlocker methods:
-  virtual void BlockOnload() = 0;
-  virtual void UnblockOnload() = 0;
-
-  // Other, internal-only methods:
-  virtual void SetHasImage() = 0;
-  virtual void OnStartDecode() = 0;
-  virtual bool NotificationsDeferred() const = 0;
-  virtual void SetNotificationsDeferred(bool aDeferNotifications) = 0;
-
-protected:
-  virtual ~IProgressObserver() { }
-};
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_IProgressObserver_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/moz.build firefox-trunk-41.0~a1~hg20150524r245419/image/src/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/moz.build	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +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 += [
-    'ImageOps.h',
-    'ImageRegion.h',
-    'imgLoader.h',
-    'imgRequest.h',
-    'imgRequestProxy.h',
-    'IProgressObserver.h',
-    'Orientation.h',
-    'SurfaceCache.h',
-]
-
-UNIFIED_SOURCES += [
-    'ClippedImage.cpp',
-    'DecodePool.cpp',
-    'Decoder.cpp',
-    'DynamicImage.cpp',
-    'FrameAnimator.cpp',
-    'FrozenImage.cpp',
-    'Image.cpp',
-    'ImageFactory.cpp',
-    'ImageMetadata.cpp',
-    'ImageOps.cpp',
-    'ImageWrapper.cpp',
-    'imgFrame.cpp',
-    'imgTools.cpp',
-    'MultipartImage.cpp',
-    'OrientedImage.cpp',
-    'ScriptedNotificationObserver.cpp',
-    'ShutdownTracker.cpp',
-    'SourceBuffer.cpp',
-    'SurfaceCache.cpp',
-    'SVGDocumentWrapper.cpp',
-    'VectorImage.cpp',
-]
-if CONFIG['MOZ_ENABLE_SKIA']:
-    UNIFIED_SOURCES += [ 'Downscaler.cpp']
-
-# These files can't be unified because of ImageLogging.h #include order issues.
-SOURCES += [
-    'imgLoader.cpp',
-    'imgRequest.cpp',
-    'imgRequestProxy.cpp',
-    'ProgressTracker.cpp',
-    'RasterImage.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-include('/ipc/chromium/chromium-config.mozbuild')
-
-FINAL_LIBRARY = 'xul'
-
-LOCAL_INCLUDES += [
-    # Because SVGDocumentWrapper.cpp includes "mozilla/dom/SVGSVGElement.h"
-    '/dom/base',
-    '/dom/svg',
-    # Access to Skia headers for Downscaler
-    '/gfx/2d',
-    # We need to instantiate the decoders
-    '/image/decoders',
-    # Because VectorImage.cpp includes nsSVGUtils.h and nsSVGEffects.h
-    '/layout/svg',
-    # For URI-related functionality
-    '/netwerk/base',
-]
-
-# Because imgFrame.cpp includes "cairo.h"
-CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/MultipartImage.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/MultipartImage.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/MultipartImage.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/MultipartImage.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,337 +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 "MultipartImage.h"
-
-#include "imgINotificationObserver.h"
-
-namespace mozilla {
-namespace image {
-
-///////////////////////////////////////////////////////////////////////////////
-// Helpers
-///////////////////////////////////////////////////////////////////////////////
-
-class NextPartObserver : public IProgressObserver
-{
-public:
-  MOZ_DECLARE_REFCOUNTED_TYPENAME(NextPartObserver)
-  NS_INLINE_DECL_REFCOUNTING(NextPartObserver, override)
-
-  explicit NextPartObserver(MultipartImage* aOwner)
-    : mOwner(aOwner)
-  {
-    MOZ_ASSERT(mOwner);
-  }
-
-  void BeginObserving(Image* aImage)
-  {
-    MOZ_ASSERT(aImage);
-    mImage = aImage;
-
-    nsRefPtr<ProgressTracker> tracker = mImage->GetProgressTracker();
-    tracker->AddObserver(this);
-  }
-
-  void BlockUntilDecodedAndFinishObserving()
-  {
-    // Use GetFrame() to block until our image finishes decoding.
-    mImage->GetFrame(imgIContainer::FRAME_CURRENT,
-                     imgIContainer::FLAG_SYNC_DECODE);
-
-    FinishObserving();
-  }
-
-  virtual void Notify(int32_t aType,
-                      const nsIntRect* aRect = nullptr) override
-  {
-    if (!mImage) {
-      // We've already finished observing the last image we were given.
-      return;
-    }
-
-    if (aType == imgINotificationObserver::FRAME_COMPLETE) {
-      FinishObserving();
-    }
-  }
-
-  virtual void OnLoadComplete(bool aLastPart) override
-  {
-    if (!mImage) {
-      // We've already finished observing the last image we were given.
-      return;
-    }
-
-    // If there's already an error, we may never get a FRAME_COMPLETE
-    // notification, so go ahead and notify our owner right away.
-    nsRefPtr<ProgressTracker> tracker = mImage->GetProgressTracker();
-    if (tracker->GetProgress() & FLAG_HAS_ERROR) {
-      FinishObserving();
-    }
-  }
-
-  // Other notifications are ignored.
-  virtual void BlockOnload() override { }
-  virtual void UnblockOnload() override { }
-  virtual void SetHasImage() override { }
-  virtual void OnStartDecode() override { }
-  virtual bool NotificationsDeferred() const override { return false; }
-  virtual void SetNotificationsDeferred(bool) override { }
-
-private:
-  virtual ~NextPartObserver() { }
-
-  void FinishObserving()
-  {
-    MOZ_ASSERT(mImage);
-
-    nsRefPtr<ProgressTracker> tracker = mImage->GetProgressTracker();
-    tracker->RemoveObserver(this);
-    mImage = nullptr;
-
-    mOwner->FinishTransition();
-  }
-
-  MultipartImage* mOwner;
-  nsRefPtr<Image> mImage;
-};
-
-
-///////////////////////////////////////////////////////////////////////////////
-// Implementation
-///////////////////////////////////////////////////////////////////////////////
-
-MultipartImage::MultipartImage(Image* aFirstPart)
-  : ImageWrapper(aFirstPart)
-  , mDeferNotifications(false)
-{
-  mNextPartObserver = new NextPartObserver(this);
-}
-
-void
-MultipartImage::Init()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(mTracker, "Should've called SetProgressTracker() by now");
-
-  // Start observing the first part.
-  nsRefPtr<ProgressTracker> firstPartTracker =
-    InnerImage()->GetProgressTracker();
-  firstPartTracker->AddObserver(this);
-  InnerImage()->RequestDecode();
-  InnerImage()->IncrementAnimationConsumers();
-}
-
-MultipartImage::~MultipartImage()
-{
-  // Ask our ProgressTracker to drop its weak reference to us.
-  mTracker->ResetImage();
-}
-
-NS_IMPL_QUERY_INTERFACE_INHERITED0(MultipartImage, ImageWrapper)
-NS_IMPL_ADDREF(MultipartImage)
-NS_IMPL_RELEASE(MultipartImage)
-
-void
-MultipartImage::BeginTransitionToPart(Image* aNextPart)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(aNextPart);
-
-  if (mNextPart) {
-    // Let the decoder catch up so we don't drop frames.
-    mNextPartObserver->BlockUntilDecodedAndFinishObserving();
-    MOZ_ASSERT(!mNextPart);
-  }
-
-  mNextPart = aNextPart;
-
-  // Start observing the next part; we'll complete the transition when
-  // NextPartObserver calls FinishTransition.
-  mNextPartObserver->BeginObserving(mNextPart);
-  mNextPart->RequestDecode();
-  mNextPart->IncrementAnimationConsumers();
-}
-
-static Progress
-FilterProgress(Progress aProgress)
-{
-  // Filter out onload blocking notifications, since we don't want to block
-  // onload for multipart images.
-  return aProgress & ~(FLAG_ONLOAD_BLOCKED | FLAG_ONLOAD_UNBLOCKED);
-}
-
-void
-MultipartImage::FinishTransition()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(mNextPart, "Should have a next part here");
-
-  nsRefPtr<ProgressTracker> newCurrentPartTracker =
-    mNextPart->GetProgressTracker();
-  if (newCurrentPartTracker->GetProgress() & FLAG_HAS_ERROR) {
-    // This frame has an error; drop it.
-    mNextPart = nullptr;
-
-    // We still need to notify, though.
-    mTracker->ResetForNewRequest();
-    nsRefPtr<ProgressTracker> currentPartTracker =
-      InnerImage()->GetProgressTracker();
-    mTracker
-      ->SyncNotifyProgress(FilterProgress(currentPartTracker->GetProgress()));
-
-    return;
-  }
-
-  // Stop observing the current part.
-  {
-    nsRefPtr<ProgressTracker> currentPartTracker =
-      InnerImage()->GetProgressTracker();
-    currentPartTracker->RemoveObserver(this);
-  }
-
-  // Make the next part become the current part.
-  mTracker->ResetForNewRequest();
-  SetInnerImage(mNextPart);
-  mNextPart = nullptr;
-  newCurrentPartTracker->AddObserver(this);
-
-  // Finally, send all the notifications for the new current part and send a
-  // FRAME_UPDATE notification so that observers know to redraw.
-  mTracker
-    ->SyncNotifyProgress(FilterProgress(newCurrentPartTracker->GetProgress()),
-                         GetMaxSizedIntRect());
-}
-
-already_AddRefed<imgIContainer>
-MultipartImage::Unwrap()
-{
-  // Although we wrap another image, we don't allow callers to unwrap as. As far
-  // as external code is concerned, MultipartImage is atomic.
-  nsCOMPtr<imgIContainer> image = this;
-  return image.forget();
-}
-
-already_AddRefed<ProgressTracker>
-MultipartImage::GetProgressTracker()
-{
-  MOZ_ASSERT(mTracker);
-  nsRefPtr<ProgressTracker> tracker = mTracker;
-  return tracker.forget();
-}
-
-void
-MultipartImage::SetProgressTracker(ProgressTracker* aTracker)
-{
-  MOZ_ASSERT(aTracker);
-  MOZ_ASSERT(!mTracker);
-  mTracker = aTracker;
-}
-
-nsresult
-MultipartImage::OnImageDataAvailable(nsIRequest* aRequest,
-                                     nsISupports* aContext,
-                                     nsIInputStream* aInStr,
-                                     uint64_t aSourceOffset,
-                                     uint32_t aCount)
-{
-  // Note that this method is special in that we forward it to the next part if
-  // one exists, and *not* the current part.
-
-  // We may trigger notifications that will free mNextPart, so keep it alive.
-  nsRefPtr<Image> nextPart = mNextPart;
-  if (nextPart) {
-    nextPart->OnImageDataAvailable(aRequest, aContext, aInStr,
-                                   aSourceOffset, aCount);
-  } else {
-    InnerImage()->OnImageDataAvailable(aRequest, aContext, aInStr,
-                                       aSourceOffset, aCount);
-  }
-
-  return NS_OK;
-}
-
-nsresult
-MultipartImage::OnImageDataComplete(nsIRequest* aRequest,
-                                    nsISupports* aContext,
-                                    nsresult aStatus,
-                                    bool aLastPart)
-{
-  // Note that this method is special in that we forward it to the next part if
-  // one exists, and *not* the current part.
-
-  // We may trigger notifications that will free mNextPart, so keep it alive.
-  nsRefPtr<Image> nextPart = mNextPart;
-  if (nextPart) {
-    nextPart->OnImageDataComplete(aRequest, aContext, aStatus, aLastPart);
-  } else {
-    InnerImage()->OnImageDataComplete(aRequest, aContext, aStatus, aLastPart);
-  }
-
-  return NS_OK;
-}
-
-void
-MultipartImage::Notify(int32_t aType, const nsIntRect* aRect /* = nullptr*/)
-{
-  if (aType == imgINotificationObserver::SIZE_AVAILABLE) {
-    mTracker->SyncNotifyProgress(FLAG_SIZE_AVAILABLE);
-  } else if (aType == imgINotificationObserver::FRAME_UPDATE) {
-    mTracker->SyncNotifyProgress(NoProgress, *aRect);
-  } else if (aType == imgINotificationObserver::FRAME_COMPLETE) {
-    mTracker->SyncNotifyProgress(FLAG_FRAME_COMPLETE);
-  } else if (aType == imgINotificationObserver::LOAD_COMPLETE) {
-    mTracker->SyncNotifyProgress(FLAG_LOAD_COMPLETE);
-  } else if (aType == imgINotificationObserver::DECODE_COMPLETE) {
-    mTracker->SyncNotifyProgress(FLAG_DECODE_COMPLETE);
-  } else if (aType == imgINotificationObserver::DISCARD) {
-    mTracker->OnDiscard();
-  } else if (aType == imgINotificationObserver::UNLOCKED_DRAW) {
-    mTracker->OnUnlockedDraw();
-  } else if (aType == imgINotificationObserver::IS_ANIMATED) {
-    mTracker->SyncNotifyProgress(FLAG_IS_ANIMATED);
-  } else if (aType == imgINotificationObserver::HAS_TRANSPARENCY) {
-    mTracker->SyncNotifyProgress(FLAG_HAS_TRANSPARENCY);
-  } else {
-    NS_NOTREACHED("Notification list should be exhaustive");
-  }
-}
-
-void
-MultipartImage::OnLoadComplete(bool aLastPart)
-{
-  Progress progress = FLAG_LOAD_COMPLETE;
-  if (aLastPart) {
-    progress |= FLAG_LAST_PART_COMPLETE;
-  }
-  mTracker->SyncNotifyProgress(progress);
-}
-
-void
-MultipartImage::SetHasImage()
-{
-  mTracker->OnImageAvailable();
-}
-
-void
-MultipartImage::OnStartDecode()
-{
-  mTracker->SyncNotifyProgress(FLAG_DECODE_STARTED);
-}
-
-bool
-MultipartImage::NotificationsDeferred() const
-{
-  return mDeferNotifications;
-}
-
-void
-MultipartImage::SetNotificationsDeferred(bool aDeferNotifications)
-{
-  mDeferNotifications = aDeferNotifications;
-}
-
-} // namespace image
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/MultipartImage.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/MultipartImage.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/MultipartImage.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/MultipartImage.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +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_image_src_MultipartImage_h
-#define mozilla_image_src_MultipartImage_h
-
-#include "ImageWrapper.h"
-#include "IProgressObserver.h"
-#include "ProgressTracker.h"
-
-namespace mozilla {
-namespace image {
-
-class NextPartObserver;
-
-/**
- * An Image wrapper that implements support for multipart/x-mixed-replace
- * images.
- */
-class MultipartImage
-  : public ImageWrapper
-  , public IProgressObserver
-{
-public:
-  MOZ_DECLARE_REFCOUNTED_TYPENAME(MultipartImage)
-  NS_DECL_ISUPPORTS
-
-  void BeginTransitionToPart(Image* aNextPart);
-
-  // Overridden ImageWrapper methods:
-  virtual already_AddRefed<imgIContainer> Unwrap() override;
-  virtual already_AddRefed<ProgressTracker> GetProgressTracker() override;
-  virtual void SetProgressTracker(ProgressTracker* aTracker) override;
-  virtual nsresult OnImageDataAvailable(nsIRequest* aRequest,
-                                        nsISupports* aContext,
-                                        nsIInputStream* aInStr,
-                                        uint64_t aSourceOffset,
-                                        uint32_t aCount) override;
-  virtual nsresult OnImageDataComplete(nsIRequest* aRequest,
-                                       nsISupports* aContext,
-                                       nsresult aStatus,
-                                       bool aLastPart) override;
-
-  // We don't support locking or track animation consumers for individual parts,
-  // so we override these methods to do nothing.
-  NS_IMETHOD LockImage() override { return NS_OK; }
-  NS_IMETHOD UnlockImage() override { return NS_OK; }
-  virtual void IncrementAnimationConsumers() override { }
-  virtual void DecrementAnimationConsumers() override { }
-#ifdef DEBUG
-  virtual uint32_t GetAnimationConsumers() override { return 1; }
-#endif
-
-  // Overridden IProgressObserver methods:
-  virtual void Notify(int32_t aType,
-                      const nsIntRect* aRect = nullptr) override;
-  virtual void OnLoadComplete(bool aLastPart) override;
-  virtual void SetHasImage() override;
-  virtual void OnStartDecode() override;
-  virtual bool NotificationsDeferred() const override;
-  virtual void SetNotificationsDeferred(bool aDeferNotifications) override;
-
-  // We don't allow multipart images to block onload, so we override these
-  // methods to do nothing.
-  virtual void BlockOnload() override { }
-  virtual void UnblockOnload() override { }
-
-protected:
-  virtual ~MultipartImage();
-
-private:
-  friend class ImageFactory;
-  friend class NextPartObserver;
-
-  explicit MultipartImage(Image* aFirstPart);
-  void Init();
-
-  void FinishTransition();
-
-  nsRefPtr<ProgressTracker> mTracker;
-  nsRefPtr<NextPartObserver> mNextPartObserver;
-  nsRefPtr<Image> mNextPart;
-  bool mDeferNotifications : 1;
-};
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_MultipartImage_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/Orientation.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/Orientation.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/Orientation.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/Orientation.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +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_image_src_Orientation_h
-#define mozilla_image_src_Orientation_h
-
-#include <stdint.h>
-
-namespace mozilla {
-namespace image {
-
-enum class Angle : uint8_t {
-  D0,
-  D90,
-  D180,
-  D270
-};
-
-enum class Flip : uint8_t {
-  Unflipped,
-  Horizontal
-};
-
-/**
- * A struct that describes an image's orientation as a rotation optionally
- * followed by a reflection. This may be used to be indicate an image's inherent
- * orientation or a desired orientation for the image.
- */
-struct Orientation
-{
-  explicit Orientation(Angle aRotation = Angle::D0,
-                       Flip mFlip = Flip::Unflipped)
-    : rotation(aRotation)
-    , flip(mFlip)
-  { }
-
-  bool IsIdentity() const {
-    return (rotation == Angle::D0) && (flip == Flip::Unflipped);
-  }
-
-  bool SwapsWidthAndHeight() const {
-    return (rotation == Angle::D90) || (rotation == Angle::D270);
-  }
-
-  bool operator==(const Orientation& aOther) const {
-    return (rotation == aOther.rotation) && (flip == aOther.flip);
-  }
-
-  bool operator!=(const Orientation& aOther) const {
-    return !(*this == aOther);
-  }
-
-  Angle rotation;
-  Flip  flip;
-};
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_Orientation_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/OrientedImage.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/OrientedImage.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/OrientedImage.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/OrientedImage.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,338 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include <algorithm>
-
-#include "gfx2DGlue.h"
-#include "gfxDrawable.h"
-#include "gfxPlatform.h"
-#include "gfxUtils.h"
-#include "ImageRegion.h"
-#include "SVGImageContext.h"
-
-#include "OrientedImage.h"
-
-using std::swap;
-
-namespace mozilla {
-
-using namespace gfx;
-using layers::LayerManager;
-using layers::ImageContainer;
-
-namespace image {
-
-NS_IMPL_ISUPPORTS_INHERITED0(OrientedImage, ImageWrapper)
-
-NS_IMETHODIMP
-OrientedImage::GetWidth(int32_t* aWidth)
-{
-  if (mOrientation.SwapsWidthAndHeight()) {
-    return InnerImage()->GetHeight(aWidth);
-  } else {
-    return InnerImage()->GetWidth(aWidth);
-  }
-}
-
-NS_IMETHODIMP
-OrientedImage::GetHeight(int32_t* aHeight)
-{
-  if (mOrientation.SwapsWidthAndHeight()) {
-    return InnerImage()->GetWidth(aHeight);
-  } else {
-    return InnerImage()->GetHeight(aHeight);
-  }
-}
-
-NS_IMETHODIMP
-OrientedImage::GetIntrinsicSize(nsSize* aSize)
-{
-  nsresult rv = InnerImage()->GetIntrinsicSize(aSize);
-
-  if (mOrientation.SwapsWidthAndHeight()) {
-    swap(aSize->width, aSize->height);
-  }
-
-  return rv;
-}
-
-NS_IMETHODIMP
-OrientedImage::GetIntrinsicRatio(nsSize* aRatio)
-{
-  nsresult rv = InnerImage()->GetIntrinsicRatio(aRatio);
-
-  if (mOrientation.SwapsWidthAndHeight()) {
-    swap(aRatio->width, aRatio->height);
-  }
-
-  return rv;
-}
-
-NS_IMETHODIMP_(TemporaryRef<SourceSurface>)
-OrientedImage::GetFrame(uint32_t aWhichFrame,
-                        uint32_t aFlags)
-{
-  nsresult rv;
-
-  if (mOrientation.IsIdentity()) {
-    return InnerImage()->GetFrame(aWhichFrame, aFlags);
-  }
-
-  // Get the underlying dimensions.
-  gfxIntSize size;
-  rv = InnerImage()->GetWidth(&size.width);
-  NS_ENSURE_SUCCESS(rv, nullptr);
-  rv = InnerImage()->GetHeight(&size.height);
-  NS_ENSURE_SUCCESS(rv, nullptr);
-
-  // Determine an appropriate format for the surface.
-  gfx::SurfaceFormat surfaceFormat;
-  if (InnerImage()->IsOpaque()) {
-    surfaceFormat = gfx::SurfaceFormat::B8G8R8X8;
-  } else {
-    surfaceFormat = gfx::SurfaceFormat::B8G8R8A8;
-  }
-
-  // Create a surface to draw into.
-  RefPtr<DrawTarget> target =
-    gfxPlatform::GetPlatform()->
-      CreateOffscreenContentDrawTarget(size, surfaceFormat);
-  if (!target) {
-    NS_ERROR("Could not create a DrawTarget");
-    return nullptr;
-  }
-
-
-  // Create our drawable.
-  RefPtr<SourceSurface> innerSurface =
-    InnerImage()->GetFrame(aWhichFrame, aFlags);
-  NS_ENSURE_TRUE(innerSurface, nullptr);
-  nsRefPtr<gfxDrawable> drawable =
-    new gfxSurfaceDrawable(innerSurface, size);
-
-  // Draw.
-  nsRefPtr<gfxContext> ctx = new gfxContext(target);
-  ctx->Multiply(OrientationMatrix(size));
-  gfxUtils::DrawPixelSnapped(ctx, drawable, size,
-                             ImageRegion::Create(size),
-                             surfaceFormat, GraphicsFilter::FILTER_FAST);
-
-  return target->Snapshot();
-}
-
-NS_IMETHODIMP_(already_AddRefed<ImageContainer>)
-OrientedImage::GetImageContainer(LayerManager* aManager, uint32_t aFlags)
-{
-  // XXX(seth): We currently don't have a way of orienting the result of
-  // GetImageContainer. We work around this by always returning null, but if it
-  // ever turns out that OrientedImage is widely used on codepaths that can
-  // actually benefit from GetImageContainer, it would be a good idea to fix
-  // that method for performance reasons.
-
-  if (mOrientation.IsIdentity()) {
-    return InnerImage()->GetImageContainer(aManager, aFlags);
-  }
-
-  return nullptr;
-}
-
-struct MatrixBuilder
-{
-  explicit MatrixBuilder(bool aInvert) : mInvert(aInvert) { }
-
-  gfxMatrix Build() { return mMatrix; }
-
-  void Scale(gfxFloat aX, gfxFloat aY)
-  {
-    if (mInvert) {
-      mMatrix *= gfxMatrix::Scaling(1.0 / aX, 1.0 / aY);
-    } else {
-      mMatrix.Scale(aX, aY);
-    }
-  }
-
-  void Rotate(gfxFloat aPhi)
-  {
-    if (mInvert) {
-      mMatrix *= gfxMatrix::Rotation(-aPhi);
-    } else {
-      mMatrix.Rotate(aPhi);
-    }
-  }
-
-  void Translate(gfxPoint aDelta)
-  {
-    if (mInvert) {
-      mMatrix *= gfxMatrix::Translation(-aDelta);
-    } else {
-      mMatrix.Translate(aDelta);
-    }
-  }
-
-private:
-  gfxMatrix mMatrix;
-  bool      mInvert;
-};
-
-/*
- * OrientationMatrix() computes a matrix that applies the rotation and
- * reflection specified by mOrientation, or that matrix's inverse if aInvert is
- * true.
- *
- * @param aSize The scaled size of the inner image. (When outside code specifies
- *              the scaled size, as with imgIContainer::Draw and its aSize
- *              parameter, it's necessary to swap the width and height if
- *              mOrientation.SwapsWidthAndHeight() is true.)
- * @param aInvert If true, compute the inverse of the orientation matrix. Prefer
- *                this approach to OrientationMatrix(..).Invert(), because it's
- *                more numerically accurate.
- */
-gfxMatrix
-OrientedImage::OrientationMatrix(const nsIntSize& aSize,
-                                 bool aInvert /* = false */)
-{
-  MatrixBuilder builder(aInvert);
-
-  // Apply reflection, if present. (This logically happens second, but we
-  // apply it first because these transformations are all premultiplied.) A
-  // translation is necessary to place the image back in the first quadrant.
-  switch (mOrientation.flip) {
-    case Flip::Unflipped:
-      break;
-    case Flip::Horizontal:
-      if (mOrientation.SwapsWidthAndHeight()) {
-        builder.Translate(gfxPoint(aSize.height, 0));
-      } else {
-        builder.Translate(gfxPoint(aSize.width, 0));
-      }
-      builder.Scale(-1.0, 1.0);
-      break;
-    default:
-      MOZ_ASSERT(false, "Invalid flip value");
-  }
-
-  // Apply rotation, if present. Again, a translation is used to place the
-  // image back in the first quadrant.
-  switch (mOrientation.rotation) {
-    case Angle::D0:
-      break;
-    case Angle::D90:
-      builder.Translate(gfxPoint(aSize.height, 0));
-      builder.Rotate(-1.5 * M_PI);
-      break;
-    case Angle::D180:
-      builder.Translate(gfxPoint(aSize.width, aSize.height));
-      builder.Rotate(-1.0 * M_PI);
-      break;
-    case Angle::D270:
-      builder.Translate(gfxPoint(0, aSize.width));
-      builder.Rotate(-0.5 * M_PI);
-      break;
-    default:
-      MOZ_ASSERT(false, "Invalid rotation value");
-  }
-
-  return builder.Build();
-}
-
-static SVGImageContext
-OrientViewport(const SVGImageContext& aOldContext,
-               const Orientation& aOrientation)
-{
-  CSSIntSize viewportSize(aOldContext.GetViewportSize());
-  if (aOrientation.SwapsWidthAndHeight()) {
-    swap(viewportSize.width, viewportSize.height);
-  }
-  return SVGImageContext(viewportSize,
-                         aOldContext.GetPreserveAspectRatio());
-}
-
-NS_IMETHODIMP_(DrawResult)
-OrientedImage::Draw(gfxContext* aContext,
-                    const nsIntSize& aSize,
-                    const ImageRegion& aRegion,
-                    uint32_t aWhichFrame,
-                    GraphicsFilter aFilter,
-                    const Maybe<SVGImageContext>& aSVGContext,
-                    uint32_t aFlags)
-{
-  if (mOrientation.IsIdentity()) {
-    return InnerImage()->Draw(aContext, aSize, aRegion,
-                              aWhichFrame, aFilter, aSVGContext, aFlags);
-  }
-
-  // Update the image size to match the image's coordinate system. (This could
-  // be done using TransformBounds but since it's only a size a swap is enough.)
-  nsIntSize size(aSize);
-  if (mOrientation.SwapsWidthAndHeight()) {
-    swap(size.width, size.height);
-  }
-
-  // Update the matrix so that we transform the image into the orientation
-  // expected by the caller before drawing.
-  gfxMatrix matrix(OrientationMatrix(size));
-  gfxContextMatrixAutoSaveRestore saveMatrix(aContext);
-  aContext->Multiply(matrix);
-
-  // The region is already in the orientation expected by the caller, but we
-  // need it to be in the image's coordinate system, so we transform it using
-  // the inverse of the orientation matrix.
-  gfxMatrix inverseMatrix(OrientationMatrix(size, /* aInvert = */ true));
-  ImageRegion region(aRegion);
-  region.TransformBoundsBy(inverseMatrix);
-
-  return InnerImage()->Draw(aContext, size, region, aWhichFrame, aFilter,
-                            aSVGContext.map(OrientViewport, mOrientation),
-                            aFlags);
-}
-
-nsIntSize
-OrientedImage::OptimalImageSizeForDest(const gfxSize& aDest,
-                                       uint32_t aWhichFrame,
-                                       GraphicsFilter aFilter, uint32_t aFlags)
-{
-  if (!mOrientation.SwapsWidthAndHeight()) {
-    return InnerImage()->OptimalImageSizeForDest(aDest, aWhichFrame, aFilter,
-                                                 aFlags);
-  }
-
-  // Swap the size for the calculation, then swap it back for the caller.
-  gfxSize destSize(aDest.height, aDest.width);
-  nsIntSize innerImageSize(InnerImage()->OptimalImageSizeForDest(destSize,
-                                                                 aWhichFrame,
-                                                                 aFilter,
-                                                                 aFlags));
-  return nsIntSize(innerImageSize.height, innerImageSize.width);
-}
-
-NS_IMETHODIMP_(nsIntRect)
-OrientedImage::GetImageSpaceInvalidationRect(const nsIntRect& aRect)
-{
-  nsIntRect rect(InnerImage()->GetImageSpaceInvalidationRect(aRect));
-
-  if (mOrientation.IsIdentity()) {
-    return rect;
-  }
-
-  nsIntSize innerSize;
-  nsresult rv = InnerImage()->GetWidth(&innerSize.width);
-  rv = NS_FAILED(rv) ? rv : InnerImage()->GetHeight(&innerSize.height);
-  if (NS_FAILED(rv)) {
-    // Fall back to identity if the width and height aren't available.
-    return rect;
-  }
-
-  // Transform the invalidation rect into the correct orientation.
-  gfxMatrix matrix(OrientationMatrix(innerSize, /* aInvert = */ true));
-  gfxRect invalidRect(matrix.TransformBounds(gfxRect(rect.x, rect.y,
-                                                     rect.width, rect.height)));
-  invalidRect.RoundOut();
-
-  return nsIntRect(invalidRect.x, invalidRect.y,
-                   invalidRect.width, invalidRect.height);
-}
-
-} // namespace image
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/OrientedImage.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/OrientedImage.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/OrientedImage.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/OrientedImage.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +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_image_src_OrientedImage_h
-#define mozilla_image_src_OrientedImage_h
-
-#include "ImageWrapper.h"
-#include "mozilla/gfx/2D.h"
-#include "mozilla/RefPtr.h"
-#include "Orientation.h"
-
-namespace mozilla {
-namespace image {
-
-/**
- * An Image wrapper that rotates and/or flips an image according to a specified
- * Orientation.
- *
- * XXX(seth): There a known (performance, not correctness) issue with
- * GetImageContainer. See the comments for that method for more information.
- */
-class OrientedImage : public ImageWrapper
-{
-  typedef gfx::SourceSurface SourceSurface;
-
-public:
-  NS_DECL_ISUPPORTS_INHERITED
-
-  NS_IMETHOD GetWidth(int32_t* aWidth) override;
-  NS_IMETHOD GetHeight(int32_t* aHeight) override;
-  NS_IMETHOD GetIntrinsicSize(nsSize* aSize) override;
-  NS_IMETHOD GetIntrinsicRatio(nsSize* aRatio) override;
-  NS_IMETHOD_(TemporaryRef<SourceSurface>)
-    GetFrame(uint32_t aWhichFrame, uint32_t aFlags) override;
-  NS_IMETHOD_(already_AddRefed<layers::ImageContainer>)
-    GetImageContainer(layers::LayerManager* aManager,
-                      uint32_t aFlags) override;
-  NS_IMETHOD_(DrawResult) Draw(gfxContext* aContext,
-                               const nsIntSize& aSize,
-                               const ImageRegion& aRegion,
-                               uint32_t aWhichFrame,
-                               GraphicsFilter aFilter,
-                               const Maybe<SVGImageContext>& aSVGContext,
-                               uint32_t aFlags) override;
-  NS_IMETHOD_(nsIntRect) GetImageSpaceInvalidationRect(
-                                           const nsIntRect& aRect) override;
-  nsIntSize OptimalImageSizeForDest(const gfxSize& aDest,
-                                    uint32_t aWhichFrame,
-                                    GraphicsFilter aFilter,
-                                    uint32_t aFlags) override;
-
-protected:
-  OrientedImage(Image* aImage, Orientation aOrientation)
-    : ImageWrapper(aImage)
-    , mOrientation(aOrientation)
-  { }
-
-  virtual ~OrientedImage() { }
-
-  gfxMatrix OrientationMatrix(const nsIntSize& aSize, bool aInvert = false);
-
-private:
-  Orientation mOrientation;
-
-  friend class ImageOps;
-};
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_OrientedImage_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/ProgressTracker.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/ProgressTracker.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/ProgressTracker.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/ProgressTracker.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,516 +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 "ProgressTracker.h"
-
-#include "imgIContainer.h"
-#include "imgINotificationObserver.h"
-#include "imgIRequest.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 {
-
-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) {
-    MOZ_ASSERT(aProgress & FLAG_DECODE_STARTED);
-  }
-  if (aProgress & FLAG_ONLOAD_UNBLOCKED) {
-    MOZ_ASSERT(aProgress & FLAG_ONLOAD_BLOCKED);
-    MOZ_ASSERT(aProgress & (FLAG_FRAME_COMPLETE | 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_LAST_PART_COMPLETE) {
-    MOZ_ASSERT(aProgress & FLAG_LOAD_COMPLETE);
-  }
-  if (aProgress & FLAG_HAS_ERROR) {
-    // No preconditions.
-  }
-}
-
-void
-ProgressTracker::SetImage(Image* aImage)
-{
-  MutexAutoLock lock(mImageMutex);
-  MOZ_ASSERT(aImage, "Setting null image");
-  MOZ_ASSERT(!mImage, "Setting image when we already have one");
-  mImage = aImage;
-}
-
-void
-ProgressTracker::ResetImage()
-{
-  MutexAutoLock lock(mImageMutex);
-  MOZ_ASSERT(mImage, "Resetting image when it's already null!");
-  mImage = nullptr;
-}
-
-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,
-                        IProgressObserver* aObserver)
-      : mTracker(aTracker)
-    {
-      MOZ_ASSERT(NS_IsMainThread(), "Should be created on the main thread");
-      MOZ_ASSERT(aTracker, "aTracker should not be null");
-      MOZ_ASSERT(aObserver, "aObserver should not be null");
-      mObservers.AppendElement(aObserver);
-    }
-
-    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 < mObservers.Length(); ++i) {
-        mObservers[i]->SetNotificationsDeferred(false);
-        mTracker->SyncNotify(mObservers[i]);
-      }
-
-      mTracker->mRunnable = nullptr;
-      return NS_OK;
-    }
-
-    void AddObserver(IProgressObserver* aObserver)
-    {
-      mObservers.AppendElement(aObserver);
-    }
-
-    void RemoveObserver(IProgressObserver* aObserver)
-    {
-      mObservers.RemoveElement(aObserver);
-    }
-
-  private:
-    friend class ProgressTracker;
-
-    nsRefPtr<ProgressTracker> mTracker;
-    nsTArray<nsRefPtr<IProgressObserver>> mObservers;
-};
-
-void
-ProgressTracker::Notify(IProgressObserver* aObserver)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  if (PR_LOG_TEST(GetImgLog(), PR_LOG_DEBUG)) {
-    nsRefPtr<Image> image = GetImage();
-    if (image && image->GetURI()) {
-      nsRefPtr<ImageURL> uri(image->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>");
-    }
-  }
-
-  aObserver->SetNotificationsDeferred(true);
-
-  // If we have an existing runnable that we can use, we just append this
-  // observer to its list of observers to be notified. This ensures we don't
-  // unnecessarily delay onload.
-  AsyncNotifyRunnable* runnable =
-    static_cast<AsyncNotifyRunnable*>(mRunnable.get());
-
-  if (runnable) {
-    runnable->AddObserver(aObserver);
-  } else {
-    mRunnable = new AsyncNotifyRunnable(this, aObserver);
-    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,
-                                    IProgressObserver* aObserver)
-      : mProgressTracker(aProgressTracker)
-      , mObserver(aObserver)
-    {
-      MOZ_ASSERT(NS_IsMainThread(), "Should be created on the main thread");
-      MOZ_ASSERT(mProgressTracker, "mProgressTracker should not be null");
-      MOZ_ASSERT(mObserver, "mObserver should not be null");
-      mImage = mProgressTracker->GetImage();
-    }
-
-    NS_IMETHOD Run()
-    {
-      MOZ_ASSERT(NS_IsMainThread(), "Should be running on the main thread");
-      mObserver->SetNotificationsDeferred(false);
-
-      mProgressTracker->SyncNotify(mObserver);
-      return NS_OK;
-    }
-
-  private:
-    nsRefPtr<ProgressTracker> mProgressTracker;
-    nsRefPtr<IProgressObserver> mObserver;
-
-    // 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(IProgressObserver* aObserver)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  if (PR_LOG_TEST(GetImgLog(), PR_LOG_DEBUG)) {
-    nsRefPtr<Image> image = GetImage();
-    nsAutoCString spec;
-    if (image && image->GetURI()) {
-      image->GetURI()->GetSpec(spec);
-    }
-    LOG_FUNC_WITH_PARAM(GetImgLog(),
-                        "ProgressTracker::NotifyCurrentState", "uri", spec.get());
-  }
-
-  aObserver->SetNotificationsDeferred(true);
-
-  nsCOMPtr<nsIRunnable> ev = new AsyncNotifyCurrentStateRunnable(this,
-                                                                 aObserver);
-  NS_DispatchToCurrentThread(ev);
-}
-
-#define NOTIFY_IMAGE_OBSERVERS(OBSERVERS, FUNC) \
-  do { \
-    ObserverArray::ForwardIterator iter(OBSERVERS); \
-    while (iter.HasMore()) { \
-      nsRefPtr<IProgressObserver> observer = iter.GetNext().get(); \
-      if (observer && !observer->NotificationsDeferred()) { \
-        observer->FUNC; \
-      } \
-    } \
-  } while (false);
-
-/* static */ void
-ProgressTracker::SyncNotifyInternal(ObserverArray& aObservers,
-                                    bool aHasImage,
-                                    Progress aProgress,
-                                    const nsIntRect& aDirtyRect)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  typedef imgINotificationObserver I;
-
-  if (aProgress & FLAG_SIZE_AVAILABLE) {
-    NOTIFY_IMAGE_OBSERVERS(aObservers, Notify(I::SIZE_AVAILABLE));
-  }
-
-  if (aProgress & FLAG_DECODE_STARTED) {
-    NOTIFY_IMAGE_OBSERVERS(aObservers, OnStartDecode());
-  }
-
-  if (aProgress & FLAG_ONLOAD_BLOCKED) {
-    NOTIFY_IMAGE_OBSERVERS(aObservers, 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(aObservers, Notify(I::FRAME_UPDATE, &aDirtyRect));
-    }
-
-    if (aProgress & FLAG_FRAME_COMPLETE) {
-      NOTIFY_IMAGE_OBSERVERS(aObservers, Notify(I::FRAME_COMPLETE));
-    }
-
-    if (aProgress & FLAG_HAS_TRANSPARENCY) {
-      NOTIFY_IMAGE_OBSERVERS(aObservers, Notify(I::HAS_TRANSPARENCY));
-    }
-
-    if (aProgress & FLAG_IS_ANIMATED) {
-      NOTIFY_IMAGE_OBSERVERS(aObservers, Notify(I::IS_ANIMATED));
-    }
-  }
-
-  // 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(aObservers, UnblockOnload());
-  }
-
-  if (aProgress & FLAG_DECODE_COMPLETE) {
-    MOZ_ASSERT(aHasImage, "Stopped decoding without ever having an image?");
-    NOTIFY_IMAGE_OBSERVERS(aObservers, Notify(I::DECODE_COMPLETE));
-  }
-
-  if (aProgress & FLAG_LOAD_COMPLETE) {
-    NOTIFY_IMAGE_OBSERVERS(aObservers,
-                           OnLoadComplete(aProgress & FLAG_LAST_PART_COMPLETE));
-  }
-}
-
-void
-ProgressTracker::SyncNotifyProgress(Progress aProgress,
-                                    const nsIntRect& aInvalidRect
-                                                  /* = nsIntRect() */)
-{
-  MOZ_ASSERT(NS_IsMainThread(), "Use mObservers 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;
-  }
-
-  // XXX(seth): Hack to work around the fact that some observers have bugs and
-  // need to get onload blocking notifications multiple times. We should fix
-  // those observers and remove this.
-  if ((aProgress & FLAG_DECODE_COMPLETE) &&
-      (mProgress & FLAG_ONLOAD_BLOCKED) &&
-      (mProgress & FLAG_ONLOAD_UNBLOCKED)) {
-    progress |= FLAG_ONLOAD_BLOCKED | FLAG_ONLOAD_UNBLOCKED;
-  }
-
-  // Apply the changes.
-  mProgress |= progress;
-
-  CheckProgressConsistency(mProgress);
-
-  // Send notifications.
-  SyncNotifyInternal(mObservers, HasImage(), progress, aInvalidRect);
-
-  if (progress & FLAG_HAS_ERROR) {
-    FireFailureNotification();
-  }
-}
-
-void
-ProgressTracker::SyncNotify(IProgressObserver* aObserver)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  nsRefPtr<Image> image = GetImage();
-
-  nsAutoCString spec;
-  if (image && image->GetURI()) {
-    image->GetURI()->GetSpec(spec);
-  }
-  LOG_SCOPE_WITH_PARAM(GetImgLog(),
-                       "ProgressTracker::SyncNotify", "uri", spec.get());
-
-  nsIntRect rect;
-  if (image) {
-    if (NS_FAILED(image->GetWidth(&rect.width)) ||
-        NS_FAILED(image->GetHeight(&rect.height))) {
-      // Either the image has no intrinsic size, or it has an error.
-      rect = GetMaxSizedIntRect();
-    }
-  }
-
-  ObserverArray array;
-  array.AppendElement(aObserver);
-  SyncNotifyInternal(array, !!image, mProgress, rect);
-}
-
-void
-ProgressTracker::EmulateRequestFinished(IProgressObserver* aObserver)
-{
-  MOZ_ASSERT(NS_IsMainThread(),
-             "SyncNotifyState and mObservers are not threadsafe");
-  nsRefPtr<IProgressObserver> kungFuDeathGrip(aObserver);
-
-  if (mProgress & FLAG_ONLOAD_BLOCKED && !(mProgress & FLAG_ONLOAD_UNBLOCKED)) {
-    aObserver->UnblockOnload();
-  }
-
-  if (!(mProgress & FLAG_LOAD_COMPLETE)) {
-    aObserver->OnLoadComplete(true);
-  }
-}
-
-void
-ProgressTracker::AddObserver(IProgressObserver* aObserver)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  mObservers.AppendElementUnlessExists(aObserver);
-}
-
-bool
-ProgressTracker::RemoveObserver(IProgressObserver* aObserver)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  // Remove the observer from the list.
-  bool removed = mObservers.RemoveElement(aObserver);
-
-  // Observers can get confused if they don't get all the proper teardown
-  // notifications. Part ways on good terms.
-  if (removed && !aObserver->NotificationsDeferred()) {
-    EmulateRequestFinished(aObserver);
-  }
-
-  // Make sure we don't give callbacks to an observer that isn't interested in
-  // them any more.
-  AsyncNotifyRunnable* runnable =
-    static_cast<AsyncNotifyRunnable*>(mRunnable.get());
-
-  if (aObserver->NotificationsDeferred() && runnable) {
-    runnable->RemoveObserver(aObserver);
-    aObserver->SetNotificationsDeferred(false);
-  }
-
-  return removed;
-}
-
-bool
-ProgressTracker::FirstObserverIs(IProgressObserver* aObserver)
-{
-  MOZ_ASSERT(NS_IsMainThread(), "Use mObservers on main thread only");
-  ObserverArray::ForwardIterator iter(mObservers);
-  while (iter.HasMore()) {
-    nsRefPtr<IProgressObserver> observer = iter.GetNext().get();
-    if (observer) {
-      return observer.get() == aObserver;
-    }
-  }
-  return false;
-}
-
-void
-ProgressTracker::OnUnlockedDraw()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  NOTIFY_IMAGE_OBSERVERS(mObservers,
-                         Notify(imgINotificationObserver::UNLOCKED_DRAW));
-}
-
-void
-ProgressTracker::ResetForNewRequest()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  mProgress = NoProgress;
-  CheckProgressConsistency(mProgress);
-}
-
-void
-ProgressTracker::OnDiscard()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  NOTIFY_IMAGE_OBSERVERS(mObservers,
-                         Notify(imgINotificationObserver::DISCARD));
-}
-
-void
-ProgressTracker::OnImageAvailable()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  // Notify any imgRequestProxys that are observing us that we have an Image.
-  ObserverArray::ForwardIterator iter(mObservers);
-  while (iter.HasMore()) {
-    nsRefPtr<IProgressObserver> observer = iter.GetNext().get();
-    if (observer) {
-      observer->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.
-  nsRefPtr<Image> image = GetImage();
-  if (image) {
-    // Should be on main thread, so ok to create a new nsIURI.
-    nsCOMPtr<nsIURI> uri;
-    {
-      nsRefPtr<ImageURL> threadsafeUriData = image->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 firefox-trunk-41.0~a1~hg20150513r243603/image/src/ProgressTracker.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/ProgressTracker.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/ProgressTracker.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/ProgressTracker.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,211 +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_image_src_ProgressTracker_h
-#define mozilla_image_src_ProgressTracker_h
-
-#include "mozilla/Mutex.h"
-#include "mozilla/RefPtr.h"
-#include "mozilla/WeakPtr.h"
-#include "nsCOMPtr.h"
-#include "nsTObserverArray.h"
-#include "nsThreadUtils.h"
-#include "nsRect.h"
-#include "IProgressObserver.h"
-
-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_LAST_PART_COMPLETE = 1u << 9,
-  FLAG_HAS_ERROR          = 1u << 10  // 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
- * IProgressObservers, both synchronously and asynchronously.
- *
- * When a new observer needs to be notified of the current progress of an image,
- * call the Notify() method on this class with the relevant observer as its
- * argument, and the notifications will be replayed to the observer
- * asynchronously.
- */
-class ProgressTracker : public mozilla::SupportsWeakPtr<ProgressTracker>
-{
-  virtual ~ProgressTracker() { }
-
-public:
-  MOZ_DECLARE_WEAKREFERENCE_TYPENAME(ProgressTracker)
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(ProgressTracker)
-
-  ProgressTracker()
-    : mImageMutex("ProgressTracker::mImage")
-    , mImage(nullptr)
-    , mProgress(NoProgress)
-  { }
-
-  bool HasImage() const { MutexAutoLock lock(mImageMutex); return mImage; }
-  already_AddRefed<Image> GetImage() const
-  {
-    MutexAutoLock lock(mImageMutex);
-    nsRefPtr<Image> image = mImage;
-    return image.forget();
-  }
-
-  // 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 |aObserver|, and replay
-  // them as well.
-  // Should be called on the main thread only, since observers and GetURI are
-  // not threadsafe.
-  void Notify(IProgressObserver* aObserver);
-
-  // 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 observers and GetURI are
-  // not threadsafe.
-  void NotifyCurrentState(IProgressObserver* aObserver);
-
-  // "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 observers and GetURI are
-  // not threadsafe.
-  void SyncNotify(IProgressObserver* aObserver);
-
-  // 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 of these notifications 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 observers that are using an image and thus concerned
-  // with its loading progress. Weak pointers.
-  void AddObserver(IProgressObserver* aObserver);
-  bool RemoveObserver(IProgressObserver* aObserver);
-  size_t ObserverCount() const {
-    MOZ_ASSERT(NS_IsMainThread(), "Use mObservers on main thread only");
-    return mObservers.Length();
-  }
-
-  // This is intentionally non-general because its sole purpose is to support
-  // 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 FirstObserverIs(IProgressObserver* aObserver);
-
-  // Resets our weak reference to our image. Image subclasses should call this
-  // in their destructor.
-  void ResetImage();
-
-private:
-  typedef nsTObserverArray<mozilla::WeakPtr<IProgressObserver>> ObserverArray;
-  friend class AsyncNotifyRunnable;
-  friend class AsyncNotifyCurrentStateRunnable;
-  friend class ImageFactory;
-
-  ProgressTracker(const ProgressTracker& aOther) = delete;
-
-  // Sets our weak reference to our image. Only ImageFactory should call this.
-  void SetImage(Image* aImage);
-
-  // Send some notifications that would be necessary to make |aObserver| believe
-  // the request is finished downloading and decoding.  We only send
-  // FLAG_LOAD_COMPLETE and FLAG_ONLOAD_UNBLOCKED, and only if necessary.
-  void EmulateRequestFinished(IProgressObserver* aObserver);
-
-  // Main thread only because it deals with the observer service.
-  void FireFailureNotification();
-
-  // Main thread only, since notifications are expected on the main thread, and
-  // mObservers is not threadsafe.
-  static void SyncNotifyInternal(ObserverArray& aObservers,
-                                 bool aHasImage, Progress aProgress,
-                                 const nsIntRect& aInvalidRect);
-
-  nsCOMPtr<nsIRunnable> mRunnable;
-
-  // mImage is a weak ref; it should be set to null when the image goes out of
-  // scope. mImageMutex protects mImage.
-  mutable Mutex mImageMutex;
-  Image* mImage;
-
-  // List of observers attached to the image. Each observer represents a
-  // consumer using the image. Array and/or individual elements should only be
-  // accessed on the main thread.
-  ObserverArray mObservers;
-
-  Progress mProgress;
-};
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_ProgressTracker_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/RasterImage.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/RasterImage.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/RasterImage.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/RasterImage.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,2168 +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/. */
-
-// Must #include ImageLogging.h before any IPDL-generated files or other files
-// that #include prlog.h
-#include "ImageLogging.h"
-
-#include "RasterImage.h"
-
-#include "base/histogram.h"
-#include "gfxPlatform.h"
-#include "nsComponentManagerUtils.h"
-#include "nsError.h"
-#include "Decoder.h"
-#include "nsAutoPtr.h"
-#include "prenv.h"
-#include "prsystem.h"
-#include "ImageContainer.h"
-#include "ImageRegion.h"
-#include "Layers.h"
-#include "nsPresContext.h"
-#include "SourceBuffer.h"
-#include "SurfaceCache.h"
-#include "FrameAnimator.h"
-
-#include "nsPNGDecoder.h"
-#include "nsGIFDecoder2.h"
-#include "nsJPEGDecoder.h"
-#include "nsBMPDecoder.h"
-#include "nsICODecoder.h"
-#include "nsIconDecoder.h"
-
-#include "gfxContext.h"
-
-#include "mozilla/gfx/2D.h"
-#include "mozilla/DebugOnly.h"
-#include "mozilla/Likely.h"
-#include "mozilla/RefPtr.h"
-#include "mozilla/Move.h"
-#include "mozilla/MemoryReporting.h"
-#include "mozilla/Services.h"
-#include <stdint.h>
-#include "mozilla/Telemetry.h"
-#include "mozilla/TimeStamp.h"
-#include "mozilla/ClearOnShutdown.h"
-#include "mozilla/gfx/Scale.h"
-
-#include "GeckoProfiler.h"
-#include "gfx2DGlue.h"
-#include "gfxPrefs.h"
-#include <algorithm>
-
-namespace mozilla {
-
-using namespace gfx;
-using namespace layers;
-
-namespace image {
-
-using std::ceil;
-using std::min;
-
-// The maximum number of times any one RasterImage was decoded.  This is only
-// used for statistics.
-static int32_t sMaxDecodeCount = 0;
-
-/* We define our own error checking macros here for 2 reasons:
- *
- * 1) Most of the failures we encounter here will (hopefully) be
- * the result of decoding failures (ie, bad data) and not code
- * failures. As such, we don't want to clutter up debug consoles
- * with spurious messages about NS_ENSURE_SUCCESS failures.
- *
- * 2) We want to set the internal error flag, shutdown properly,
- * and end up in an error state.
- *
- * So this macro should be called when the desired failure behavior
- * is to put the container into an error state and return failure.
- * It goes without saying that macro won't compile outside of a
- * non-static RasterImage method.
- */
-#define LOG_CONTAINER_ERROR                      \
-  PR_BEGIN_MACRO                                 \
-  PR_LOG (GetImgLog(), PR_LOG_ERROR,             \
-          ("RasterImage: [this=%p] Error "      \
-           "detected at line %u for image of "   \
-           "type %s\n", this, __LINE__,          \
-           mSourceDataMimeType.get()));          \
-  PR_END_MACRO
-
-#define CONTAINER_ENSURE_SUCCESS(status)      \
-  PR_BEGIN_MACRO                              \
-  nsresult _status = status; /* eval once */  \
-  if (NS_FAILED(_status)) {                   \
-    LOG_CONTAINER_ERROR;                      \
-    DoError();                                \
-    return _status;                           \
-  }                                           \
- PR_END_MACRO
-
-#define CONTAINER_ENSURE_TRUE(arg, rv)  \
-  PR_BEGIN_MACRO                        \
-  if (!(arg)) {                         \
-    LOG_CONTAINER_ERROR;                \
-    DoError();                          \
-    return rv;                          \
-  }                                     \
-  PR_END_MACRO
-
-class ScaleRunner : public nsRunnable
-{
-  enum ScaleState
-  {
-    eNew,
-    eReady,
-    eFinish,
-    eFinishWithError
-  };
-
-public:
-  ScaleRunner(RasterImage* aImage,
-              uint32_t aImageFlags,
-              const IntSize& aSize,
-              RawAccessFrameRef&& aSrcRef)
-    : mImage(aImage)
-    , mSrcRef(Move(aSrcRef))
-    , mDstSize(aSize)
-    , mImageFlags(aImageFlags)
-    , mState(eNew)
-  {
-    MOZ_ASSERT(!mSrcRef->GetIsPaletted());
-    MOZ_ASSERT(aSize.width > 0 && aSize.height > 0);
-  }
-
-  bool Init()
-  {
-    MOZ_ASSERT(NS_IsMainThread());
-    MOZ_ASSERT(mState == eNew, "Calling Init() twice?");
-
-    // We'll need a destination frame. It's unconditionally ARGB32 because
-    // that's what the scaler outputs.
-    nsRefPtr<imgFrame> tentativeDstFrame = new imgFrame();
-    nsresult rv =
-      tentativeDstFrame->InitForDecoder(mDstSize, SurfaceFormat::B8G8R8A8);
-    if (NS_FAILED(rv)) {
-      return false;
-    }
-
-    // We need a strong reference to the raw data for the destination frame.
-    // (We already got one for the source frame in the constructor.)
-    RawAccessFrameRef tentativeDstRef = tentativeDstFrame->RawAccessRef();
-    if (!tentativeDstRef) {
-      return false;
-    }
-
-    // Everything worked, so commit to these objects and mark ourselves ready.
-    mDstRef = Move(tentativeDstRef);
-    mState = eReady;
-
-    // Insert the new surface into the cache immediately. We need to do this so
-    // that we won't start multiple scaling jobs for the same size.
-    SurfaceCache::Insert(mDstRef.get(), ImageKey(mImage.get()),
-                         RasterSurfaceKey(mDstSize, mImageFlags, 0),
-                         Lifetime::Transient);
-
-    return true;
-  }
-
-  NS_IMETHOD Run() override
-  {
-    if (mState == eReady) {
-      // Collect information from the frames that we need to scale.
-      ScalingData srcData = mSrcRef->GetScalingData();
-      ScalingData dstData = mDstRef->GetScalingData();
-
-      // Actually do the scaling.
-      bool succeeded =
-        gfx::Scale(srcData.mRawData, srcData.mSize.width, srcData.mSize.height,
-                   srcData.mBytesPerRow, dstData.mRawData, mDstSize.width,
-                   mDstSize.height, dstData.mBytesPerRow, srcData.mFormat);
-
-      if (succeeded) {
-        // Mark the frame as complete and discardable.
-        mDstRef->ImageUpdated(mDstRef->GetRect());
-        MOZ_ASSERT(mDstRef->IsImageComplete(),
-                   "Incomplete, but just updated the entire frame");
-      }
-
-      // We need to send notifications and release our references on the main
-      // thread, so finish up there.
-      mState = succeeded ? eFinish : eFinishWithError;
-      NS_DispatchToMainThread(this);
-    } else if (mState == eFinish) {
-      MOZ_ASSERT(NS_IsMainThread());
-      MOZ_ASSERT(mDstRef, "Should have a valid scaled frame");
-
-      // Notify, so observers can redraw.
-      nsRefPtr<RasterImage> image = mImage.get();
-      if (image) {
-        image->NotifyNewScaledFrame();
-      }
-
-      // We're done, so release everything.
-      mSrcRef.reset();
-      mDstRef.reset();
-    } else if (mState == eFinishWithError) {
-      MOZ_ASSERT(NS_IsMainThread());
-      NS_WARNING("HQ scaling failed");
-
-      // Remove the frame from the cache since we know we don't need it.
-      SurfaceCache::RemoveSurface(ImageKey(mImage.get()),
-                                  RasterSurfaceKey(mDstSize,
-                                                   mImageFlags, 0));
-
-      // Release everything we're holding, too.
-      mSrcRef.reset();
-      mDstRef.reset();
-    } else {
-      // mState must be eNew, which is invalid in Run().
-      MOZ_ASSERT(false, "Need to call Init() before dispatching");
-    }
-
-    return NS_OK;
-  }
-
-private:
-  virtual ~ScaleRunner()
-  {
-    MOZ_ASSERT(!mSrcRef && !mDstRef,
-               "Should have released strong refs in Run()");
-  }
-
-  WeakPtr<RasterImage> mImage;
-  RawAccessFrameRef    mSrcRef;
-  RawAccessFrameRef    mDstRef;
-  const IntSize      mDstSize;
-  uint32_t             mImageFlags;
-  ScaleState           mState;
-};
-
-static nsCOMPtr<nsIThread> sScaleWorkerThread = nullptr;
-
-#ifndef DEBUG
-NS_IMPL_ISUPPORTS(RasterImage, imgIContainer, nsIProperties)
-#else
-NS_IMPL_ISUPPORTS(RasterImage, imgIContainer, nsIProperties,
-                  imgIContainerDebug)
-#endif
-
-//******************************************************************************
-RasterImage::RasterImage(ImageURL* aURI /* = nullptr */) :
-  ImageResource(aURI), // invoke superclass's constructor
-  mSize(0,0),
-  mLockCount(0),
-  mDecodeCount(0),
-  mRequestedSampleSize(0),
-  mLastImageContainerDrawResult(DrawResult::NOT_READY),
-#ifdef DEBUG
-  mFramesNotified(0),
-#endif
-  mSourceBuffer(new SourceBuffer()),
-  mFrameCount(0),
-  mHasSize(false),
-  mDecodeOnlyOnDraw(false),
-  mTransient(false),
-  mDiscardable(false),
-  mHasSourceData(false),
-  mHasBeenDecoded(false),
-  mPendingAnimation(false),
-  mAnimationFinished(false),
-  mWantFullDecode(false)
-{
-  Telemetry::GetHistogramById(Telemetry::IMAGE_DECODE_COUNT)->Add(0);
-}
-
-//******************************************************************************
-RasterImage::~RasterImage()
-{
-  // Make sure our SourceBuffer is marked as complete. This will ensure that any
-  // outstanding decoders terminate.
-  if (!mSourceBuffer->IsComplete()) {
-    mSourceBuffer->Complete(NS_ERROR_ABORT);
-  }
-
-  // Release all frames from the surface cache.
-  SurfaceCache::RemoveImage(ImageKey(this));
-}
-
-nsresult
-RasterImage::Init(const char* aMimeType,
-                  uint32_t aFlags)
-{
-  // We don't support re-initialization
-  if (mInitialized) {
-    return NS_ERROR_ILLEGAL_VALUE;
-  }
-
-  // Not sure an error can happen before init, but be safe
-  if (mError) {
-    return NS_ERROR_FAILURE;
-  }
-
-  NS_ENSURE_ARG_POINTER(aMimeType);
-
-  // We must be non-discardable and non-decode-only-on-draw for
-  // transient images.
-  MOZ_ASSERT(!(aFlags & INIT_FLAG_TRANSIENT) ||
-               (!(aFlags & INIT_FLAG_DISCARDABLE) &&
-                !(aFlags & INIT_FLAG_DECODE_ONLY_ON_DRAW) &&
-                !(aFlags & INIT_FLAG_DOWNSCALE_DURING_DECODE)),
-             "Illegal init flags for transient image");
-
-  // Store initialization data
-  mSourceDataMimeType.Assign(aMimeType);
-  mDiscardable = !!(aFlags & INIT_FLAG_DISCARDABLE);
-  mDecodeOnlyOnDraw = !!(aFlags & INIT_FLAG_DECODE_ONLY_ON_DRAW);
-  mWantFullDecode = !!(aFlags & INIT_FLAG_DECODE_IMMEDIATELY);
-  mTransient = !!(aFlags & INIT_FLAG_TRANSIENT);
-  mDownscaleDuringDecode = !!(aFlags & INIT_FLAG_DOWNSCALE_DURING_DECODE);
-
-#ifndef MOZ_ENABLE_SKIA
-  // Downscale-during-decode requires Skia.
-  mDownscaleDuringDecode = false;
-#endif
-
-  // Lock this image's surfaces in the SurfaceCache if we're not discardable.
-  if (!mDiscardable) {
-    mLockCount++;
-    SurfaceCache::LockImage(ImageKey(this));
-  }
-
-  // Create the initial size decoder.
-  nsresult rv = Decode(Nothing(), DECODE_FLAGS_DEFAULT);
-  if (NS_FAILED(rv)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  // Mark us as initialized
-  mInitialized = true;
-
-  return NS_OK;
-}
-
-//******************************************************************************
-// [notxpcom] void requestRefresh ([const] in TimeStamp aTime);
-NS_IMETHODIMP_(void)
-RasterImage::RequestRefresh(const TimeStamp& aTime)
-{
-  if (HadRecentRefresh(aTime)) {
-    return;
-  }
-
-  EvaluateAnimation();
-
-  if (!mAnimating) {
-    return;
-  }
-
-  FrameAnimator::RefreshResult res;
-  if (mAnim) {
-    res = mAnim->RequestRefresh(aTime);
-  }
-
-  if (res.frameAdvanced) {
-    // Notify listeners that our frame has actually changed, but do this only
-    // once for all frames that we've now passed (if AdvanceFrame() was called
-    // more than once).
-    #ifdef DEBUG
-      mFramesNotified++;
-    #endif
-
-    NotifyProgress(NoProgress, res.dirtyRect);
-  }
-
-  if (res.animationFinished) {
-    mAnimationFinished = true;
-    EvaluateAnimation();
-  }
-}
-
-//******************************************************************************
-/* readonly attribute int32_t width; */
-NS_IMETHODIMP
-RasterImage::GetWidth(int32_t* aWidth)
-{
-  NS_ENSURE_ARG_POINTER(aWidth);
-
-  if (mError) {
-    *aWidth = 0;
-    return NS_ERROR_FAILURE;
-  }
-
-  *aWidth = mSize.width;
-  return NS_OK;
-}
-
-//******************************************************************************
-/* readonly attribute int32_t height; */
-NS_IMETHODIMP
-RasterImage::GetHeight(int32_t* aHeight)
-{
-  NS_ENSURE_ARG_POINTER(aHeight);
-
-  if (mError) {
-    *aHeight = 0;
-    return NS_ERROR_FAILURE;
-  }
-
-  *aHeight = mSize.height;
-  return NS_OK;
-}
-
-//******************************************************************************
-/* [noscript] readonly attribute nsSize intrinsicSize; */
-NS_IMETHODIMP
-RasterImage::GetIntrinsicSize(nsSize* aSize)
-{
-  if (mError) {
-    return NS_ERROR_FAILURE;
-  }
-
-  *aSize = nsSize(nsPresContext::CSSPixelsToAppUnits(mSize.width),
-                  nsPresContext::CSSPixelsToAppUnits(mSize.height));
-  return NS_OK;
-}
-
-//******************************************************************************
-/* [noscript] readonly attribute nsSize intrinsicRatio; */
-NS_IMETHODIMP
-RasterImage::GetIntrinsicRatio(nsSize* aRatio)
-{
-  if (mError) {
-    return NS_ERROR_FAILURE;
-  }
-
-  *aRatio = nsSize(mSize.width, mSize.height);
-  return NS_OK;
-}
-
-NS_IMETHODIMP_(Orientation)
-RasterImage::GetOrientation()
-{
-  return mOrientation;
-}
-
-//******************************************************************************
-/* unsigned short GetType(); */
-NS_IMETHODIMP
-RasterImage::GetType(uint16_t* aType)
-{
-  NS_ENSURE_ARG_POINTER(aType);
-
-  *aType = imgIContainer::TYPE_RASTER;
-  return NS_OK;
-}
-
-DrawableFrameRef
-RasterImage::LookupFrameInternal(uint32_t aFrameNum,
-                                 const IntSize& aSize,
-                                 uint32_t aFlags)
-{
-  if (!mAnim) {
-    NS_ASSERTION(aFrameNum == 0,
-                 "Don't ask for a frame > 0 if we're not animated!");
-    aFrameNum = 0;
-  }
-
-  if (mAnim && aFrameNum > 0) {
-    MOZ_ASSERT(DecodeFlags(aFlags) == DECODE_FLAGS_DEFAULT,
-               "Can't composite frames with non-default decode flags");
-    return mAnim->GetCompositedFrame(aFrameNum);
-  }
-
-  Maybe<uint32_t> alternateFlags;
-  if (IsOpaque()) {
-    // If we're opaque, we can always substitute a frame that was decoded with a
-    // different decode flag for premultiplied alpha, because that can only
-    // matter for frames with transparency.
-    alternateFlags = Some(aFlags ^ FLAG_DECODE_NO_PREMULTIPLY_ALPHA);
-  }
-
-  // We don't want any substitution for sync decodes (except the premultiplied
-  // alpha optimization above), so we use SurfaceCache::Lookup in this case.
-  if (aFlags & FLAG_SYNC_DECODE) {
-    return SurfaceCache::Lookup(ImageKey(this),
-                                RasterSurfaceKey(aSize,
-                                                 DecodeFlags(aFlags),
-                                                 aFrameNum),
-                                alternateFlags);
-  }
-
-  // We'll return the best match we can find to the requested frame.
-  return SurfaceCache::LookupBestMatch(ImageKey(this),
-                                       RasterSurfaceKey(aSize,
-                                                        DecodeFlags(aFlags),
-                                                        aFrameNum),
-                                       alternateFlags);
-}
-
-DrawableFrameRef
-RasterImage::LookupFrame(uint32_t aFrameNum,
-                         const IntSize& aSize,
-                         uint32_t aFlags)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  IntSize requestedSize = CanDownscaleDuringDecode(aSize, aFlags)
-                        ? aSize : mSize;
-
-  DrawableFrameRef ref = LookupFrameInternal(aFrameNum, requestedSize, aFlags);
-
-  if (!ref && !mHasSize) {
-    // We can't request a decode without knowing our intrinsic size. Give up.
-    return DrawableFrameRef();
-  }
-
-  if (!ref || ref->GetImageSize() != requestedSize) {
-    // The OS threw this frame away. We need to redecode if we can.
-    MOZ_ASSERT(!mAnim, "Animated frames should be locked");
-
-    Decode(Some(requestedSize), aFlags);
-
-    // If we can sync decode, we should already have the frame.
-    if (aFlags & FLAG_SYNC_DECODE) {
-      ref = LookupFrameInternal(aFrameNum, requestedSize, aFlags);
-    }
-  }
-
-  if (!ref) {
-    // We still weren't able to get a frame. Give up.
-    return DrawableFrameRef();
-  }
-
-  if (ref->GetCompositingFailed()) {
-    return DrawableFrameRef();
-  }
-
-  MOZ_ASSERT(!ref || !ref->GetIsPaletted(), "Should not have paletted frame");
-
-  // Sync decoding guarantees that we got the frame, but if it's owned by an
-  // async decoder that's currently running, the contents of the frame may not
-  // be available yet. Make sure we get everything.
-  if (ref && mHasSourceData && (aFlags & FLAG_SYNC_DECODE)) {
-    ref->WaitUntilComplete();
-  }
-
-  return ref;
-}
-
-uint32_t
-RasterImage::GetCurrentFrameIndex() const
-{
-  if (mAnim) {
-    return mAnim->GetCurrentAnimationFrameIndex();
-  }
-
-  return 0;
-}
-
-uint32_t
-RasterImage::GetRequestedFrameIndex(uint32_t aWhichFrame) const
-{
-  return aWhichFrame == FRAME_FIRST ? 0 : GetCurrentFrameIndex();
-}
-
-IntRect
-RasterImage::GetFirstFrameRect()
-{
-  if (mAnim) {
-    return mAnim->GetFirstFrameRefreshArea();
-  }
-
-  // Fall back to our size. This is implicitly zero-size if !mHasSize.
-  return IntRect(IntPoint(0,0), mSize);
-}
-
-NS_IMETHODIMP_(bool)
-RasterImage::IsOpaque()
-{
-  if (mError) {
-    return false;
-  }
-
-  Progress progress = mProgressTracker->GetProgress();
-
-  // If we haven't yet finished decoding, the safe answer is "not opaque".
-  if (!(progress & FLAG_DECODE_COMPLETE)) {
-    return false;
-  }
-
-  // Other, we're opaque if FLAG_HAS_TRANSPARENCY is not set.
-  return !(progress & FLAG_HAS_TRANSPARENCY);
-}
-
-void
-RasterImage::OnSurfaceDiscarded()
-{
-  MOZ_ASSERT(mProgressTracker);
-
-  nsCOMPtr<nsIRunnable> runnable =
-    NS_NewRunnableMethod(mProgressTracker, &ProgressTracker::OnDiscard);
-  NS_DispatchToMainThread(runnable);
-}
-
-//******************************************************************************
-/* readonly attribute boolean animated; */
-NS_IMETHODIMP
-RasterImage::GetAnimated(bool* aAnimated)
-{
-  if (mError) {
-    return NS_ERROR_FAILURE;
-  }
-
-  NS_ENSURE_ARG_POINTER(aAnimated);
-
-  // If we have mAnim, we can know for sure
-  if (mAnim) {
-    *aAnimated = true;
-    return NS_OK;
-  }
-
-  // Otherwise, we need to have been decoded to know for sure, since if we were
-  // decoded at least once mAnim would have been created for animated images
-  if (!mHasBeenDecoded) {
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-
-  // We know for sure
-  *aAnimated = false;
-
-  return NS_OK;
-}
-
-//******************************************************************************
-/* [notxpcom] int32_t getFirstFrameDelay (); */
-NS_IMETHODIMP_(int32_t)
-RasterImage::GetFirstFrameDelay()
-{
-  if (mError) {
-    return -1;
-  }
-
-  bool animated = false;
-  if (NS_FAILED(GetAnimated(&animated)) || !animated) {
-    return -1;
-  }
-
-  MOZ_ASSERT(mAnim, "Animated images should have a FrameAnimator");
-  return mAnim->GetTimeoutForFrame(0);
-}
-
-TemporaryRef<SourceSurface>
-RasterImage::CopyFrame(uint32_t aWhichFrame, uint32_t aFlags)
-{
-  if (aWhichFrame > FRAME_MAX_VALUE) {
-    return nullptr;
-  }
-
-  if (mError) {
-    return nullptr;
-  }
-
-  // Get the frame. If it's not there, it's probably the caller's fault for
-  // not waiting for the data to be loaded from the network or not passing
-  // FLAG_SYNC_DECODE
-  DrawableFrameRef frameRef =
-    LookupFrame(GetRequestedFrameIndex(aWhichFrame), mSize, aFlags);
-  if (!frameRef) {
-    // The OS threw this frame away and we couldn't redecode it right now.
-    return nullptr;
-  }
-
-  // Create a 32-bit image surface of our size, but draw using the frame's
-  // rect, implicitly padding the frame out to the image's size.
-
-  IntSize size(mSize.width, mSize.height);
-  RefPtr<DataSourceSurface> surf =
-    Factory::CreateDataSourceSurface(size,
-                                     SurfaceFormat::B8G8R8A8,
-                                     /* aZero = */ true);
-  if (NS_WARN_IF(!surf)) {
-    return nullptr;
-  }
-
-  DataSourceSurface::MappedSurface mapping;
-  DebugOnly<bool> success =
-    surf->Map(DataSourceSurface::MapType::WRITE, &mapping);
-  NS_ASSERTION(success, "Failed to map surface");
-  RefPtr<DrawTarget> target =
-    Factory::CreateDrawTargetForData(BackendType::CAIRO,
-                                     mapping.mData,
-                                     size,
-                                     mapping.mStride,
-                                     SurfaceFormat::B8G8R8A8);
-  if (!target) {
-    gfxWarning() << "RasterImage::CopyFrame failed in CreateDrawTargetForData";
-    return nullptr;
-  }
-
-  IntRect intFrameRect = frameRef->GetRect();
-  Rect rect(intFrameRect.x, intFrameRect.y,
-            intFrameRect.width, intFrameRect.height);
-  if (frameRef->IsSinglePixel()) {
-    target->FillRect(rect, ColorPattern(frameRef->SinglePixelColor()),
-                     DrawOptions(1.0f, CompositionOp::OP_SOURCE));
-  } else {
-    RefPtr<SourceSurface> srcSurf = frameRef->GetSurface();
-    if (!srcSurf) {
-      RecoverFromLossOfFrames(mSize, aFlags);
-      return nullptr;
-    }
-
-    Rect srcRect(0, 0, intFrameRect.width, intFrameRect.height);
-    target->DrawSurface(srcSurf, srcRect, rect);
-  }
-
-  target->Flush();
-  surf->Unmap();
-
-  return surf;
-}
-
-//******************************************************************************
-/* [noscript] SourceSurface getFrame(in uint32_t aWhichFrame,
- *                                   in uint32_t aFlags); */
-NS_IMETHODIMP_(TemporaryRef<SourceSurface>)
-RasterImage::GetFrame(uint32_t aWhichFrame,
-                      uint32_t aFlags)
-{
-  return GetFrameInternal(aWhichFrame, aFlags).second().forget();
-}
-
-Pair<DrawResult, RefPtr<SourceSurface>>
-RasterImage::GetFrameInternal(uint32_t aWhichFrame, uint32_t aFlags)
-{
-  MOZ_ASSERT(aWhichFrame <= FRAME_MAX_VALUE);
-
-  if (aWhichFrame > FRAME_MAX_VALUE) {
-    return MakePair(DrawResult::BAD_ARGS, RefPtr<SourceSurface>());
-  }
-
-  if (mError) {
-    return MakePair(DrawResult::BAD_IMAGE, RefPtr<SourceSurface>());
-  }
-
-  // Get the frame. If it's not there, it's probably the caller's fault for
-  // not waiting for the data to be loaded from the network or not passing
-  // FLAG_SYNC_DECODE
-  DrawableFrameRef frameRef =
-    LookupFrame(GetRequestedFrameIndex(aWhichFrame), mSize, aFlags);
-  if (!frameRef) {
-    // The OS threw this frame away and we couldn't redecode it.
-    return MakePair(DrawResult::TEMPORARY_ERROR, RefPtr<SourceSurface>());
-  }
-
-  // If this frame covers the entire image, we can just reuse its existing
-  // surface.
-  RefPtr<SourceSurface> frameSurf;
-  IntRect frameRect = frameRef->GetRect();
-  if (frameRect.x == 0 && frameRect.y == 0 &&
-      frameRect.width == mSize.width &&
-      frameRect.height == mSize.height) {
-    frameSurf = frameRef->GetSurface();
-  }
-
-  // The image doesn't have a usable surface because it's been optimized away or
-  // because it's a partial update frame from an animation. Create one.
-  if (!frameSurf) {
-    frameSurf = CopyFrame(aWhichFrame, aFlags);
-  }
-
-  if (!frameRef->IsImageComplete()) {
-    return MakePair(DrawResult::INCOMPLETE, Move(frameSurf));
-  }
-
-  return MakePair(DrawResult::SUCCESS, Move(frameSurf));
-}
-
-Pair<DrawResult, nsRefPtr<layers::Image>>
-RasterImage::GetCurrentImage(ImageContainer* aContainer, uint32_t aFlags)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(aContainer);
-
-  auto result = GetFrameInternal(FRAME_CURRENT, aFlags | FLAG_ASYNC_NOTIFY);
-  if (!result.second()) {
-    // The OS threw out some or all of our buffer. We'll need to wait for the
-    // redecode (which was automatically triggered by GetFrame) to complete.
-    return MakePair(result.first(), nsRefPtr<layers::Image>());
-  }
-
-  CairoImage::Data cairoData;
-  GetWidth(&cairoData.mSize.width);
-  GetHeight(&cairoData.mSize.height);
-  cairoData.mSourceSurface = result.second();
-
-  nsRefPtr<layers::Image> image =
-    aContainer->CreateImage(ImageFormat::CAIRO_SURFACE);
-  MOZ_ASSERT(image);
-
-  static_cast<CairoImage*>(image.get())->SetData(cairoData);
-
-  return MakePair(result.first(), Move(image));
-}
-
-
-NS_IMETHODIMP_(already_AddRefed<ImageContainer>)
-RasterImage::GetImageContainer(LayerManager* aManager, uint32_t aFlags)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(aManager);
-  MOZ_ASSERT((aFlags & ~(FLAG_SYNC_DECODE |
-                         FLAG_SYNC_DECODE_IF_FAST |
-                         FLAG_ASYNC_NOTIFY))
-               == FLAG_NONE,
-             "Unsupported flag passed to GetImageContainer");
-
-  int32_t maxTextureSize = aManager->GetMaxTextureSize();
-  if (!mHasSize ||
-      mSize.width > maxTextureSize ||
-      mSize.height > maxTextureSize) {
-    return nullptr;
-  }
-
-  if (IsUnlocked() && mProgressTracker) {
-    mProgressTracker->OnUnlockedDraw();
-  }
-
-  nsRefPtr<layers::ImageContainer> container = mImageContainer.get();
-
-  bool mustRedecode =
-    (aFlags & (FLAG_SYNC_DECODE | FLAG_SYNC_DECODE_IF_FAST)) &&
-    mLastImageContainerDrawResult != DrawResult::SUCCESS &&
-    mLastImageContainerDrawResult != DrawResult::BAD_IMAGE;
-
-  if (container && !mustRedecode) {
-    return container.forget();
-  }
-
-  // We need a new ImageContainer, so create one.
-  container = LayerManager::CreateImageContainer();
-
-  auto result = GetCurrentImage(container, aFlags);
-  if (!result.second()) {
-    // We couldn't get an Image.
-    return nullptr;
-  }
-
-  // |result.second()| holds a reference to a SourceSurface which in turn holds
-  // a lock on the current frame's VolatileBuffer, ensuring that it doesn't get
-  // freed as long as the layer system keeps this ImageContainer alive.
-  container->SetCurrentImageInTransaction(result.second());
-
-  mLastImageContainerDrawResult = result.first();
-  mImageContainer = container;
-
-  return container.forget();
-}
-
-void
-RasterImage::UpdateImageContainer()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  nsRefPtr<layers::ImageContainer> container = mImageContainer.get();
-  if (!container) {
-    return;
-  }
-
-  auto result = GetCurrentImage(container, FLAG_NONE);
-  if (!result.second()) {
-    // We couldn't get an Image.
-    return;
-  }
-
-  mLastImageContainerDrawResult = result.first();
-  container->SetCurrentImage(result.second());
-}
-
-size_t
-RasterImage::SizeOfSourceWithComputedFallback(MallocSizeOf aMallocSizeOf) const
-{
-  return mSourceBuffer->SizeOfIncludingThisWithComputedFallback(aMallocSizeOf);
-}
-
-void
-RasterImage::CollectSizeOfSurfaces(nsTArray<SurfaceMemoryCounter>& aCounters,
-                                   MallocSizeOf aMallocSizeOf) const
-{
-  SurfaceCache::CollectSizeOfSurfaces(ImageKey(this), aCounters, aMallocSizeOf);
-  if (mAnim) {
-    mAnim->CollectSizeOfCompositingSurfaces(aCounters, aMallocSizeOf);
-  }
-}
-
-class OnAddedFrameRunnable : public nsRunnable
-{
-public:
-  OnAddedFrameRunnable(RasterImage* aImage,
-                       uint32_t aNewFrameCount,
-                       const IntRect& aNewRefreshArea)
-    : mImage(aImage)
-    , mNewFrameCount(aNewFrameCount)
-    , mNewRefreshArea(aNewRefreshArea)
-  {
-    MOZ_ASSERT(aImage);
-  }
-
-  NS_IMETHOD Run()
-  {
-    mImage->OnAddedFrame(mNewFrameCount, mNewRefreshArea);
-    return NS_OK;
-  }
-
-private:
-  nsRefPtr<RasterImage> mImage;
-  uint32_t mNewFrameCount;
-  IntRect mNewRefreshArea;
-};
-
-void
-RasterImage::OnAddedFrame(uint32_t aNewFrameCount,
-                          const IntRect& aNewRefreshArea)
-{
-  if (!NS_IsMainThread()) {
-    nsCOMPtr<nsIRunnable> runnable =
-      new OnAddedFrameRunnable(this, aNewFrameCount, aNewRefreshArea);
-    NS_DispatchToMainThread(runnable);
-    return;
-  }
-
-  MOZ_ASSERT((mFrameCount == 1 && aNewFrameCount == 1) ||
-             mFrameCount < aNewFrameCount,
-             "Frame count running backwards");
-
-  if (aNewFrameCount > mFrameCount) {
-    mFrameCount = aNewFrameCount;
-
-    if (aNewFrameCount == 2) {
-      // We're becoming animated, so initialize animation stuff.
-      MOZ_ASSERT(!mAnim, "Already have animation state?");
-      mAnim = MakeUnique<FrameAnimator>(this, mSize, mAnimationMode);
-
-      // We don't support discarding animated images (See bug 414259).
-      // Lock the image and throw away the key.
-      //
-      // Note that this is inefficient, since we could get rid of the source
-      // data too. However, doing this is actually hard, because we're probably
-      // mid-decode, and thus we're decoding out of the source buffer. Since
-      // we're going to fix this anyway later, and since we didn't kill the
-      // source data in the old world either, locking is acceptable for the
-      // moment.
-      LockImage();
-
-      if (mPendingAnimation && ShouldAnimate()) {
-        StartAnimation();
-      }
-    }
-    if (aNewFrameCount > 1) {
-      mAnim->UnionFirstFrameRefreshArea(aNewRefreshArea);
-    }
-  }
-}
-
-nsresult
-RasterImage::SetSize(int32_t aWidth, int32_t aHeight, Orientation aOrientation)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  if (mError) {
-    return NS_ERROR_FAILURE;
-  }
-
-  // Ensure that we have positive values
-  // XXX - Why isn't the size unsigned? Should this be changed?
-  if ((aWidth < 0) || (aHeight < 0)) {
-    return NS_ERROR_INVALID_ARG;
-  }
-
-  // if we already have a size, check the new size against the old one
-  if (mHasSize &&
-      ((aWidth != mSize.width) ||
-       (aHeight != mSize.height) ||
-       (aOrientation != mOrientation))) {
-    NS_WARNING("Image changed size on redecode! This should not happen!");
-    DoError();
-    return NS_ERROR_UNEXPECTED;
-  }
-
-  // Set the size and flag that we have it
-  mSize.SizeTo(aWidth, aHeight);
-  mOrientation = aOrientation;
-  mHasSize = true;
-
-  return NS_OK;
-}
-
-void
-RasterImage::OnDecodingComplete()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  if (mError) {
-    return;
-  }
-
-  // Flag that we've been decoded before.
-  mHasBeenDecoded = true;
-
-  // Let our FrameAnimator know not to expect any more frames.
-  if (mAnim) {
-    mAnim->SetDoneDecoding(true);
-  }
-}
-
-NS_IMETHODIMP
-RasterImage::SetAnimationMode(uint16_t aAnimationMode)
-{
-  if (mAnim) {
-    mAnim->SetAnimationMode(aAnimationMode);
-  }
-  return SetAnimationModeInternal(aAnimationMode);
-}
-
-//******************************************************************************
-/* void StartAnimation () */
-nsresult
-RasterImage::StartAnimation()
-{
-  if (mError) {
-    return NS_ERROR_FAILURE;
-  }
-
-  MOZ_ASSERT(ShouldAnimate(), "Should not animate!");
-
-  // If we don't have mAnim yet, then we're not ready to animate.  Setting
-  // mPendingAnimation will cause us to start animating as soon as we have a
-  // second frame, which causes mAnim to be constructed.
-  mPendingAnimation = !mAnim;
-  if (mPendingAnimation) {
-    return NS_OK;
-  }
-
-  // A timeout of -1 means we should display this frame forever.
-  if (mAnim->GetTimeoutForFrame(GetCurrentFrameIndex()) < 0) {
-    mAnimationFinished = true;
-    return NS_ERROR_ABORT;
-  }
-
-  // We need to set the time that this initial frame was first displayed, as
-  // this is used in AdvanceFrame().
-  mAnim->InitAnimationFrameTimeIfNecessary();
-
-  return NS_OK;
-}
-
-//******************************************************************************
-/* void stopAnimation (); */
-nsresult
-RasterImage::StopAnimation()
-{
-  MOZ_ASSERT(mAnimating, "Should be animating!");
-
-  nsresult rv = NS_OK;
-  if (mError) {
-    rv = NS_ERROR_FAILURE;
-  } else {
-    mAnim->SetAnimationFrameTime(TimeStamp());
-  }
-
-  mAnimating = false;
-  return rv;
-}
-
-//******************************************************************************
-/* void resetAnimation (); */
-NS_IMETHODIMP
-RasterImage::ResetAnimation()
-{
-  if (mError) {
-    return NS_ERROR_FAILURE;
-    }
-
-  mPendingAnimation = false;
-
-  if (mAnimationMode == kDontAnimMode || !mAnim ||
-      mAnim->GetCurrentAnimationFrameIndex() == 0) {
-    return NS_OK;
-  }
-
-  mAnimationFinished = false;
-
-  if (mAnimating) {
-    StopAnimation();
-  }
-
-  MOZ_ASSERT(mAnim, "Should have a FrameAnimator");
-  mAnim->ResetAnimation();
-
-  NotifyProgress(NoProgress, mAnim->GetFirstFrameRefreshArea());
-
-  // Start the animation again. It may not have been running before, if
-  // mAnimationFinished was true before entering this function.
-  EvaluateAnimation();
-
-  return NS_OK;
-}
-
-//******************************************************************************
-// [notxpcom] void setAnimationStartTime ([const] in TimeStamp aTime);
-NS_IMETHODIMP_(void)
-RasterImage::SetAnimationStartTime(const TimeStamp& aTime)
-{
-  if (mError || mAnimationMode == kDontAnimMode || mAnimating || !mAnim) {
-    return;
-  }
-
-  mAnim->SetAnimationFrameTime(aTime);
-}
-
-NS_IMETHODIMP_(float)
-RasterImage::GetFrameIndex(uint32_t aWhichFrame)
-{
-  MOZ_ASSERT(aWhichFrame <= FRAME_MAX_VALUE, "Invalid argument");
-  return (aWhichFrame == FRAME_FIRST || !mAnim)
-         ? 0.0f
-         : mAnim->GetCurrentAnimationFrameIndex();
-}
-
-void
-RasterImage::SetLoopCount(int32_t aLoopCount)
-{
-  if (mError) {
-    return;
-  }
-
-  // No need to set this if we're not an animation.
-  if (mAnim) {
-    mAnim->SetLoopCount(aLoopCount);
-  }
-}
-
-NS_IMETHODIMP_(IntRect)
-RasterImage::GetImageSpaceInvalidationRect(const IntRect& aRect)
-{
-  return aRect;
-}
-
-nsresult
-RasterImage::OnImageDataComplete(nsIRequest*, nsISupports*, nsresult aStatus,
-                                 bool aLastPart)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  // Record that we have all the data we're going to get now.
-  mHasSourceData = true;
-
-  // Let decoders know that there won't be any more data coming.
-  mSourceBuffer->Complete(aStatus);
-
-  if (!mHasSize) {
-    // We need to guarantee that we've gotten the image's size, or at least
-    // determined that we won't be able to get it, before we deliver the load
-    // event. That means we have to do a synchronous size decode here.
-    Decode(Nothing(), FLAG_SYNC_DECODE);
-  }
-
-  // Determine our final status, giving precedence to Necko failure codes. We
-  // check after running the size decode above in case it triggered an error.
-  nsresult finalStatus = mError ? NS_ERROR_FAILURE : NS_OK;
-  if (NS_FAILED(aStatus)) {
-    finalStatus = aStatus;
-  }
-
-  // If loading failed, report an error.
-  if (NS_FAILED(finalStatus)) {
-    DoError();
-  }
-
-  MOZ_ASSERT(mHasSize || mError, "Need to know size before firing load event");
-  MOZ_ASSERT(!mHasSize ||
-             (mProgressTracker->GetProgress() & FLAG_SIZE_AVAILABLE),
-             "Should have notified that the size is available if we have it");
-
-  Progress loadProgress = LoadCompleteProgress(aLastPart, mError, finalStatus);
-
-  if (mDecodeOnlyOnDraw) {
-    // For decode-only-on-draw images, we want to send notifications as if we've
-    // already finished decoding. Otherwise some observers will never even try
-    // to draw. (We may have already sent some of these notifications from
-    // NotifyForDecodeOnlyOnDraw(), but ProgressTracker will ensure no duplicate
-    // notifications get sent.)
-    loadProgress |= FLAG_ONLOAD_BLOCKED |
-                    FLAG_DECODE_STARTED |
-                    FLAG_FRAME_COMPLETE |
-                    FLAG_DECODE_COMPLETE |
-                    FLAG_ONLOAD_UNBLOCKED;
-  }
-
-  // Notify our listeners, which will fire this image's load event.
-  NotifyProgress(loadProgress);
-
-  return finalStatus;
-}
-
-void
-RasterImage::NotifyForDecodeOnlyOnDraw()
-{
-  if (!NS_IsMainThread()) {
-    nsCOMPtr<nsIRunnable> runnable =
-      NS_NewRunnableMethod(this, &RasterImage::NotifyForDecodeOnlyOnDraw);
-    NS_DispatchToMainThread(runnable);
-    return;
-  }
-
-  NotifyProgress(FLAG_DECODE_STARTED | FLAG_ONLOAD_BLOCKED);
-}
-
-nsresult
-RasterImage::OnImageDataAvailable(nsIRequest*,
-                                  nsISupports*,
-                                  nsIInputStream* aInStr,
-                                  uint64_t aOffset,
-                                  uint32_t aCount)
-{
-  nsresult rv;
-
-  if (MOZ_UNLIKELY(mDecodeOnlyOnDraw && aOffset == 0)) {
-    // If we're a decode-only-on-draw image, send notifications as if we've just
-    // started decoding.
-    NotifyForDecodeOnlyOnDraw();
-  }
-
-  // WriteToSourceBuffer always consumes everything it gets if it doesn't run
-  // out of memory.
-  uint32_t bytesRead;
-  rv = aInStr->ReadSegments(WriteToSourceBuffer, this, aCount, &bytesRead);
-
-  MOZ_ASSERT(bytesRead == aCount || HasError() || NS_FAILED(rv),
-    "WriteToSourceBuffer should consume everything if ReadSegments succeeds or "
-    "the image must be in error!");
-
-  return rv;
-}
-
-nsresult
-RasterImage::SetSourceSizeHint(uint32_t aSizeHint)
-{
-  return mSourceBuffer->ExpectLength(aSizeHint);
-}
-
-/********* Methods to implement lazy allocation of nsIProperties object *******/
-NS_IMETHODIMP
-RasterImage::Get(const char* prop, const nsIID& iid, void** result)
-{
-  if (!mProperties) {
-    return NS_ERROR_FAILURE;
-  }
-  return mProperties->Get(prop, iid, result);
-}
-
-NS_IMETHODIMP
-RasterImage::Set(const char* prop, nsISupports* value)
-{
-  if (!mProperties) {
-    mProperties = do_CreateInstance("@mozilla.org/properties;1");
-  }
-  if (!mProperties) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-  return mProperties->Set(prop, value);
-}
-
-NS_IMETHODIMP
-RasterImage::Has(const char* prop, bool* _retval)
-{
-  NS_ENSURE_ARG_POINTER(_retval);
-  if (!mProperties) {
-    *_retval = false;
-    return NS_OK;
-  }
-  return mProperties->Has(prop, _retval);
-}
-
-NS_IMETHODIMP
-RasterImage::Undefine(const char* prop)
-{
-  if (!mProperties) {
-    return NS_ERROR_FAILURE;
-  }
-  return mProperties->Undefine(prop);
-}
-
-NS_IMETHODIMP
-RasterImage::GetKeys(uint32_t* count, char*** keys)
-{
-  if (!mProperties) {
-    *count = 0;
-    *keys = nullptr;
-    return NS_OK;
-  }
-  return mProperties->GetKeys(count, keys);
-}
-
-void
-RasterImage::Discard()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(CanDiscard(), "Asked to discard but can't");
-  MOZ_ASSERT(!mAnim, "Asked to discard for animated image");
-
-  // Delete all the decoded frames.
-  SurfaceCache::RemoveImage(ImageKey(this));
-
-  // Notify that we discarded.
-  if (mProgressTracker) {
-    mProgressTracker->OnDiscard();
-  }
-}
-
-bool
-RasterImage::CanDiscard() {
-  return mHasSourceData &&       // ...have the source data...
-         !mAnim;                 // Can never discard animated images
-}
-
-// Sets up a decoder for this image.
-already_AddRefed<Decoder>
-RasterImage::CreateDecoder(const Maybe<IntSize>& aSize, uint32_t aFlags)
-{
-  // Make sure we actually get size before doing a full decode.
-  if (aSize) {
-    MOZ_ASSERT(mHasSize, "Must do a size decode before a full decode!");
-    MOZ_ASSERT(mDownscaleDuringDecode || *aSize == mSize,
-               "Can only decode to our intrinsic size if we're not allowed to "
-               "downscale-during-decode");
-  } else {
-    MOZ_ASSERT(!mHasSize, "Should not do unnecessary size decodes");
-  }
-
-  // Figure out which decoder we want.
-  eDecoderType type = GetDecoderType(mSourceDataMimeType.get());
-  if (type == eDecoderType_unknown) {
-    return nullptr;
-  }
-
-  // Instantiate the appropriate decoder.
-  nsRefPtr<Decoder> decoder;
-  switch (type) {
-    case eDecoderType_png:
-      decoder = new nsPNGDecoder(this);
-      break;
-    case eDecoderType_gif:
-      decoder = new nsGIFDecoder2(this);
-      break;
-    case eDecoderType_jpeg:
-      // If we have all the data we don't want to waste cpu time doing
-      // a progressive decode.
-      decoder = new nsJPEGDecoder(this,
-                                  mHasBeenDecoded ? Decoder::SEQUENTIAL :
-                                                    Decoder::PROGRESSIVE);
-      break;
-    case eDecoderType_bmp:
-      decoder = new nsBMPDecoder(this);
-      break;
-    case eDecoderType_ico:
-      decoder = new nsICODecoder(this);
-      break;
-    case eDecoderType_icon:
-      decoder = new nsIconDecoder(this);
-      break;
-    default:
-      MOZ_ASSERT_UNREACHABLE("Unknown decoder type");
-  }
-
-  MOZ_ASSERT(decoder, "Should have a decoder now");
-
-  // Initialize the decoder.
-  decoder->SetSizeDecode(!aSize);
-  decoder->SetSendPartialInvalidations(!mHasBeenDecoded);
-  decoder->SetImageIsTransient(mTransient);
-  decoder->SetFlags(aFlags);
-
-  if (!mHasBeenDecoded && aSize) {
-    // Lock the image while we're decoding, so that it doesn't get evicted from
-    // the SurfaceCache before we have a chance to realize that it's animated.
-    // The corresponding unlock happens in FinalizeDecoder.
-    LockImage();
-    decoder->SetImageIsLocked();
-  }
-
-  if (aSize) {
-    // We already have the size; tell the decoder so it can preallocate a
-    // frame.  By default, we create an ARGB frame with no offset. If decoders
-    // need a different type, they need to ask for it themselves.
-    // XXX(seth): Note that we call SetSize() and NeedNewFrame() with the
-    // image's intrinsic size, but AllocateFrame with our target size.
-    decoder->SetSize(mSize, mOrientation);
-    decoder->NeedNewFrame(0, 0, 0, aSize->width, aSize->height,
-                          SurfaceFormat::B8G8R8A8);
-    decoder->AllocateFrame(*aSize);
-  }
-  decoder->SetIterator(mSourceBuffer->Iterator());
-
-  // Set a target size for downscale-during-decode if applicable.
-  if (mDownscaleDuringDecode && aSize && *aSize != mSize) {
-    DebugOnly<nsresult> rv = decoder->SetTargetSize(*aSize);
-    MOZ_ASSERT(nsresult(rv) != NS_ERROR_NOT_AVAILABLE,
-               "We're downscale-during-decode but decoder doesn't support it?");
-    MOZ_ASSERT(NS_SUCCEEDED(rv), "Bad downscale-during-decode target size?");
-  }
-
-  decoder->Init();
-
-  if (NS_FAILED(decoder->GetDecoderError())) {
-    return nullptr;
-  }
-
-  if (!aSize) {
-    Telemetry::GetHistogramById(
-      Telemetry::IMAGE_DECODE_COUNT)->Subtract(mDecodeCount);
-    mDecodeCount++;
-    Telemetry::GetHistogramById(
-      Telemetry::IMAGE_DECODE_COUNT)->Add(mDecodeCount);
-
-    if (mDecodeCount > sMaxDecodeCount) {
-      // Don't subtract out 0 from the histogram, because that causes its count
-      // to go negative, which is not kosher.
-      if (sMaxDecodeCount > 0) {
-        Telemetry::GetHistogramById(
-          Telemetry::IMAGE_MAX_DECODE_COUNT)->Subtract(sMaxDecodeCount);
-      }
-      sMaxDecodeCount = mDecodeCount;
-      Telemetry::GetHistogramById(
-        Telemetry::IMAGE_MAX_DECODE_COUNT)->Add(sMaxDecodeCount);
-    }
-  }
-
-  return decoder.forget();
-}
-
-//******************************************************************************
-/* void requestDecode() */
-NS_IMETHODIMP
-RasterImage::RequestDecode()
-{
-  // For decode-only-on-draw images, we only act on RequestDecodeForSize.
-  if (mDecodeOnlyOnDraw) {
-    return NS_OK;
-  }
-
-  return RequestDecodeForSize(mSize, DECODE_FLAGS_DEFAULT);
-}
-
-/* void startDecode() */
-NS_IMETHODIMP
-RasterImage::StartDecoding()
-{
-  // For decode-only-on-draw images, we only act on RequestDecodeForSize.
-  if (mDecodeOnlyOnDraw) {
-    return NS_OK;
-  }
-
-  return RequestDecodeForSize(mSize, FLAG_SYNC_DECODE_IF_FAST);
-}
-
-NS_IMETHODIMP
-RasterImage::RequestDecodeForSize(const IntSize& aSize, uint32_t aFlags)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  if (mError) {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (!mHasSize) {
-    mWantFullDecode = true;
-    return NS_OK;
-  }
-
-  // Fall back to our intrinsic size if we don't support
-  // downscale-during-decode.
-  IntSize targetSize = mDownscaleDuringDecode ? aSize : mSize;
-
-  // Decide whether to sync decode images we can decode quickly. Here we are
-  // explicitly trading off flashing for responsiveness in the case that we're
-  // redecoding an image (see bug 845147).
-  bool shouldSyncDecodeIfFast =
-    !mHasBeenDecoded && (aFlags & FLAG_SYNC_DECODE_IF_FAST);
-
-  uint32_t flags = shouldSyncDecodeIfFast
-                 ? aFlags
-                 : aFlags & ~FLAG_SYNC_DECODE_IF_FAST;
-
-  // Look up the first frame of the image, which will implicitly start decoding
-  // if it's not available right now.
-  LookupFrame(0, targetSize, flags);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-RasterImage::Decode(const Maybe<IntSize>& aSize, uint32_t aFlags)
-{
-  MOZ_ASSERT(!aSize || NS_IsMainThread());
-
-  if (mError) {
-    return NS_ERROR_FAILURE;
-  }
-
-  // If we don't have a size yet, we can't do any other decoding.
-  if (!mHasSize && aSize) {
-    mWantFullDecode = true;
-    return NS_OK;
-  }
-
-  if (mDownscaleDuringDecode && aSize) {
-    // We're about to decode again, which may mean that some of the previous
-    // sizes we've decoded at aren't useful anymore. We can allow them to
-    // expire from the cache by unlocking them here. When the decode finishes,
-    // it will send an invalidation that will cause all instances of this image
-    // to redraw. If this image is locked, any surfaces that are still useful
-    // will become locked again when LookupFrame touches them, and the remainder
-    // will eventually expire.
-    SurfaceCache::UnlockSurfaces(ImageKey(this));
-  }
-
-  // Create a decoder.
-  nsRefPtr<Decoder> decoder = CreateDecoder(aSize, aFlags);
-  if (!decoder) {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (aSize) {
-    // This isn't a size decode (which doesn't send any early notifications), so
-    // send out notifications right away.
-    NotifyProgress(decoder->TakeProgress(),
-                   decoder->TakeInvalidRect(),
-                   decoder->GetDecodeFlags());
-  }
-
-  if (mHasSourceData) {
-    // If we have all the data, we can sync decode if requested.
-    if (aFlags & FLAG_SYNC_DECODE) {
-      PROFILER_LABEL_PRINTF("DecodePool", "SyncDecodeIfPossible",
-        js::ProfileEntry::Category::GRAPHICS, "%s", GetURIString().get());
-      DecodePool::Singleton()->SyncDecodeIfPossible(decoder);
-      return NS_OK;
-    }
-
-    if (aFlags & FLAG_SYNC_DECODE_IF_FAST) {
-      PROFILER_LABEL_PRINTF("DecodePool", "SyncDecodeIfSmall",
-        js::ProfileEntry::Category::GRAPHICS, "%s", GetURIString().get());
-      DecodePool::Singleton()->SyncDecodeIfSmall(decoder);
-      return NS_OK;
-    }
-  }
-
-  // Perform an async decode. We also take this path if we don't have all the
-  // source data yet, since sync decoding is impossible in that situation.
-  DecodePool::Singleton()->AsyncDecode(decoder);
-  return NS_OK;
-}
-
-void
-RasterImage::RecoverFromLossOfFrames(const IntSize& aSize, uint32_t aFlags)
-{
-  if (!mHasSize) {
-    return;
-  }
-
-  NS_WARNING("An imgFrame became invalid. Attempting to recover...");
-
-  // Discard all existing frames, since they're probably all now invalid.
-  SurfaceCache::RemoveImage(ImageKey(this));
-
-  // Animated images require some special handling, because we normally require
-  // that they never be discarded.
-  if (mAnim) {
-    Decode(Some(mSize), aFlags | FLAG_SYNC_DECODE);
-    ResetAnimation();
-    return;
-  }
-
-  // For non-animated images, it's fine to recover using an async decode.
-  Decode(Some(aSize), aFlags);
-}
-
-bool
-RasterImage::CanScale(GraphicsFilter aFilter,
-                      const IntSize& aSize,
-                      uint32_t aFlags)
-{
-#ifndef MOZ_ENABLE_SKIA
-  // The high-quality scaler requires Skia.
-  return false;
-#else
-  // Check basic requirements: HQ downscaling is enabled, we have all the source
-  // data and know our size, the flags allow us to do it, and a 'good' filter is
-  // being used. The flags may ask us not to scale because the caller isn't
-  // drawing to the window. If we're drawing to something else (e.g. a canvas)
-  // we usually have no way of updating what we've drawn, so HQ scaling is
-  // useless.
-  if (!gfxPrefs::ImageHQDownscalingEnabled() || !mHasSize || !mHasSourceData ||
-      !(aFlags & imgIContainer::FLAG_HIGH_QUALITY_SCALING) ||
-      aFilter != GraphicsFilter::FILTER_GOOD) {
-    return false;
-  }
-
-  // We don't HQ scale images that we can downscale during decode.
-  if (mDownscaleDuringDecode) {
-    return false;
-  }
-
-  // We don't use the scaler for animated or transient images to avoid doing a
-  // bunch of work on an image that just gets thrown away.
-  if (mAnim || mTransient) {
-    return false;
-  }
-
-  // If target size is 1:1 with original, don't scale.
-  if (aSize == mSize) {
-    return false;
-  }
-
-  // To save memory, don't quality upscale images bigger than the limit.
-  if (aSize.width > mSize.width || aSize.height > mSize.height) {
-    uint32_t scaledSize = static_cast<uint32_t>(aSize.width * aSize.height);
-    if (scaledSize > gfxPrefs::ImageHQUpscalingMaxSize()) {
-      return false;
-    }
-  }
-
-  // There's no point in scaling if we can't store the result.
-  if (!SurfaceCache::CanHold(aSize)) {
-    return false;
-  }
-
-  // XXX(seth): It's not clear what this check buys us over
-  // gfxPrefs::ImageHQUpscalingMaxSize().
-  // The default value of this pref is 1000, which means that we never upscale.
-  // If that's all it's getting us, I'd rather we just forbid that explicitly.
-  gfx::Size scale(double(aSize.width) / mSize.width,
-                  double(aSize.height) / mSize.height);
-  gfxFloat minFactor = gfxPrefs::ImageHQDownscalingMinFactor() / 1000.0;
-  return (scale.width < minFactor || scale.height < minFactor);
-#endif
-}
-
-bool
-RasterImage::CanDownscaleDuringDecode(const IntSize& aSize, uint32_t aFlags)
-{
-  // Check basic requirements: downscale-during-decode is enabled for this
-  // image, we have all the source data and know our size, the flags allow us to
-  // do it, and a 'good' filter is being used.
-  if (!mDownscaleDuringDecode || !mHasSize ||
-      !(aFlags & imgIContainer::FLAG_HIGH_QUALITY_SCALING)) {
-    return false;
-  }
-
-  // We don't downscale animated images during decode.
-  if (mAnim) {
-    return false;
-  }
-
-  // Never upscale.
-  if (aSize.width >= mSize.width || aSize.height >= mSize.height) {
-    return false;
-  }
-
-  // Zero or negative width or height is unacceptable.
-  if (aSize.width < 1 || aSize.height < 1) {
-    return false;
-  }
-
-  // There's no point in scaling if we can't store the result.
-  if (!SurfaceCache::CanHold(aSize)) {
-    return false;
-  }
-
-  return true;
-}
-
-void
-RasterImage::NotifyNewScaledFrame()
-{
-  // Send an invalidation so observers will repaint and can take advantage of
-  // the new scaled frame if possible.
-  NotifyProgress(NoProgress, IntRect(0, 0, mSize.width, mSize.height));
-}
-
-void
-RasterImage::RequestScale(imgFrame* aFrame,
-                          uint32_t aFlags,
-                          const IntSize& aSize)
-{
-  // We don't scale frames which aren't fully decoded.
-  if (!aFrame->IsImageComplete()) {
-    return;
-  }
-
-  // We can't scale frames that need padding or are single pixel.
-  if (aFrame->NeedsPadding() || aFrame->IsSinglePixel()) {
-    return;
-  }
-
-  // We also can't scale if we can't lock the image data for this frame.
-  RawAccessFrameRef frameRef = aFrame->RawAccessRef();
-  if (!frameRef) {
-    return;
-  }
-
-  nsRefPtr<ScaleRunner> runner =
-    new ScaleRunner(this, DecodeFlags(aFlags), aSize, Move(frameRef));
-  if (runner->Init()) {
-    if (!sScaleWorkerThread) {
-      NS_NewNamedThread("Image Scaler", getter_AddRefs(sScaleWorkerThread));
-      ClearOnShutdown(&sScaleWorkerThread);
-    }
-
-    sScaleWorkerThread->Dispatch(runner, NS_DISPATCH_NORMAL);
-  }
-}
-
-DrawResult
-RasterImage::DrawWithPreDownscaleIfNeeded(DrawableFrameRef&& aFrameRef,
-                                          gfxContext* aContext,
-                                          const IntSize& aSize,
-                                          const ImageRegion& aRegion,
-                                          GraphicsFilter aFilter,
-                                          uint32_t aFlags)
-{
-  DrawableFrameRef frameRef;
-
-  if (CanScale(aFilter, aSize, aFlags)) {
-    frameRef =
-      SurfaceCache::Lookup(ImageKey(this),
-                           RasterSurfaceKey(aSize,
-                                            DecodeFlags(aFlags),
-                                            0));
-    if (!frameRef) {
-      // We either didn't have a matching scaled frame or the OS threw it away.
-      // Request a new one so we'll be ready next time. For now, we'll fall back
-      // to aFrameRef below.
-      RequestScale(aFrameRef.get(), aFlags, aSize);
-    }
-    if (frameRef && !frameRef->IsImageComplete()) {
-      frameRef.reset();  // We're still scaling, so we can't use this yet.
-    }
-  }
-
-  gfxContextMatrixAutoSaveRestore saveMatrix(aContext);
-  ImageRegion region(aRegion);
-  bool frameIsComplete = true;  // We already checked HQ scaled frames.
-  if (!frameRef) {
-    // There's no HQ scaled frame available, so we'll have to use the frame
-    // provided by the caller.
-    frameRef = Move(aFrameRef);
-    frameIsComplete = frameRef->IsImageComplete();
-  }
-
-  // By now we may have a frame with the requested size. If not, we need to
-  // adjust the drawing parameters accordingly.
-  IntSize finalSize = frameRef->GetImageSize();
-  bool couldRedecodeForBetterFrame = false;
-  if (finalSize != aSize) {
-    gfx::Size scale(double(aSize.width) / finalSize.width,
-                    double(aSize.height) / finalSize.height);
-    aContext->Multiply(gfxMatrix::Scaling(scale.width, scale.height));
-    region.Scale(1.0 / scale.width, 1.0 / scale.height);
-
-    couldRedecodeForBetterFrame = mDownscaleDuringDecode &&
-                                  CanDownscaleDuringDecode(aSize, aFlags);
-  }
-
-  if (!frameRef->Draw(aContext, region, aFilter, aFlags)) {
-    RecoverFromLossOfFrames(aSize, aFlags);
-    return DrawResult::TEMPORARY_ERROR;
-  }
-  if (!frameIsComplete) {
-    return DrawResult::INCOMPLETE;
-  }
-  if (couldRedecodeForBetterFrame) {
-    return DrawResult::WRONG_SIZE;
-  }
-  return DrawResult::SUCCESS;
-}
-
-//******************************************************************************
-/* [noscript] void draw(in gfxContext aContext,
- *                      in gfxGraphicsFilter aFilter,
- *                      [const] in gfxMatrix aUserSpaceToImageSpace,
- *                      [const] in gfxRect aFill,
- *                      [const] in IntRect aSubimage,
- *                      [const] in IntSize aViewportSize,
- *                      [const] in SVGImageContext aSVGContext,
- *                      in uint32_t aWhichFrame,
- *                      in uint32_t aFlags); */
-NS_IMETHODIMP_(DrawResult)
-RasterImage::Draw(gfxContext* aContext,
-                  const IntSize& aSize,
-                  const ImageRegion& aRegion,
-                  uint32_t aWhichFrame,
-                  GraphicsFilter aFilter,
-                  const Maybe<SVGImageContext>& /*aSVGContext - ignored*/,
-                  uint32_t aFlags)
-{
-  if (aWhichFrame > FRAME_MAX_VALUE) {
-    return DrawResult::BAD_ARGS;
-  }
-
-  if (mError) {
-    return DrawResult::BAD_IMAGE;
-  }
-
-  // Illegal -- you can't draw with non-default decode flags.
-  // (Disabling colorspace conversion might make sense to allow, but
-  // we don't currently.)
-  if (DecodeFlags(aFlags) != DECODE_FLAGS_DEFAULT) {
-    return DrawResult::BAD_ARGS;
-  }
-
-  if (!aContext) {
-    return DrawResult::BAD_ARGS;
-  }
-
-  if (IsUnlocked() && mProgressTracker) {
-    mProgressTracker->OnUnlockedDraw();
-  }
-
-  // If we're not using GraphicsFilter::FILTER_GOOD, we shouldn't high-quality
-  // scale or downscale during decode.
-  uint32_t flags = aFilter == GraphicsFilter::FILTER_GOOD
-                 ? aFlags
-                 : aFlags & ~FLAG_HIGH_QUALITY_SCALING;
-
-  DrawableFrameRef ref =
-    LookupFrame(GetRequestedFrameIndex(aWhichFrame), aSize, flags);
-  if (!ref) {
-    // Getting the frame (above) touches the image and kicks off decoding.
-    if (mDrawStartTime.IsNull()) {
-      mDrawStartTime = TimeStamp::Now();
-    }
-    return DrawResult::NOT_READY;
-  }
-
-  bool shouldRecordTelemetry = !mDrawStartTime.IsNull() &&
-                               ref->IsImageComplete();
-
-  auto result = DrawWithPreDownscaleIfNeeded(Move(ref), aContext, aSize,
-                                             aRegion, aFilter, flags);
-
-  if (shouldRecordTelemetry) {
-      TimeDuration drawLatency = TimeStamp::Now() - mDrawStartTime;
-      Telemetry::Accumulate(Telemetry::IMAGE_DECODE_ON_DRAW_LATENCY,
-                            int32_t(drawLatency.ToMicroseconds()));
-      mDrawStartTime = TimeStamp();
-  }
-
-  return result;
-}
-
-//******************************************************************************
-/* void lockImage() */
-NS_IMETHODIMP
-RasterImage::LockImage()
-{
-  MOZ_ASSERT(NS_IsMainThread(),
-             "Main thread to encourage serialization with UnlockImage");
-  if (mError) {
-    return NS_ERROR_FAILURE;
-  }
-
-  // Increment the lock count
-  mLockCount++;
-
-  // Lock this image's surfaces in the SurfaceCache.
-  if (mLockCount == 1) {
-    SurfaceCache::LockImage(ImageKey(this));
-  }
-
-  return NS_OK;
-}
-
-//******************************************************************************
-/* void unlockImage() */
-NS_IMETHODIMP
-RasterImage::UnlockImage()
-{
-  MOZ_ASSERT(NS_IsMainThread(),
-             "Main thread to encourage serialization with LockImage");
-  if (mError) {
-    return NS_ERROR_FAILURE;
-  }
-
-  // It's an error to call this function if the lock count is 0
-  MOZ_ASSERT(mLockCount > 0,
-             "Calling UnlockImage with mLockCount == 0!");
-  if (mLockCount == 0) {
-    return NS_ERROR_ABORT;
-  }
-
-  // Decrement our lock count
-  mLockCount--;
-
-  // Unlock this image's surfaces in the SurfaceCache.
-  if (mLockCount == 0 ) {
-    SurfaceCache::UnlockImage(ImageKey(this));
-  }
-
-  return NS_OK;
-}
-
-//******************************************************************************
-/* void requestDiscard() */
-NS_IMETHODIMP
-RasterImage::RequestDiscard()
-{
-  if (mDiscardable &&      // Enabled at creation time...
-      mLockCount == 0 &&   // ...not temporarily disabled...
-      CanDiscard()) {
-    Discard();
-  }
-
-  return NS_OK;
-}
-
-// Indempotent error flagging routine. If a decoder is open, shuts it down.
-void
-RasterImage::DoError()
-{
-  // If we've flagged an error before, we have nothing to do
-  if (mError) {
-    return;
-  }
-
-  // We can't safely handle errors off-main-thread, so dispatch a worker to
-  // do it.
-  if (!NS_IsMainThread()) {
-    HandleErrorWorker::DispatchIfNeeded(this);
-    return;
-  }
-
-  // Put the container in an error state.
-  mError = true;
-
-  // Stop animation and release our FrameAnimator.
-  if (mAnimating) {
-    StopAnimation();
-  }
-  mAnim.release();
-
-  // Release all locks.
-  mLockCount = 0;
-  SurfaceCache::UnlockImage(ImageKey(this));
-
-  // Release all frames from the surface cache.
-  SurfaceCache::RemoveImage(ImageKey(this));
-
-  // Invalidate to get rid of any partially-drawn image content.
-  NotifyProgress(NoProgress, IntRect(0, 0, mSize.width, mSize.height));
-
-  // Log our error
-  LOG_CONTAINER_ERROR;
-}
-
-/* static */ void
-RasterImage::HandleErrorWorker::DispatchIfNeeded(RasterImage* aImage)
-{
-  nsRefPtr<HandleErrorWorker> worker = new HandleErrorWorker(aImage);
-  NS_DispatchToMainThread(worker);
-}
-
-RasterImage::HandleErrorWorker::HandleErrorWorker(RasterImage* aImage)
-  : mImage(aImage)
-{
-  MOZ_ASSERT(mImage, "Should have image");
-}
-
-NS_IMETHODIMP
-RasterImage::HandleErrorWorker::Run()
-{
-  mImage->DoError();
-
-  return NS_OK;
-}
-
-// nsIInputStream callback to copy the incoming image data directly to the
-// RasterImage without processing. The RasterImage is passed as the closure.
-// Always reads everything it gets, even if the data is erroneous.
-NS_METHOD
-RasterImage::WriteToSourceBuffer(nsIInputStream* /* unused */,
-                                 void*          aClosure,
-                                 const char*    aFromRawSegment,
-                                 uint32_t       /* unused */,
-                                 uint32_t       aCount,
-                                 uint32_t*      aWriteCount)
-{
-  // Retrieve the RasterImage
-  RasterImage* image = static_cast<RasterImage*>(aClosure);
-
-  // Copy the source data. Unless we hit OOM, we squelch the return value
-  // here, because returning an error means that ReadSegments stops
-  // reading data, violating our invariant that we read everything we get.
-  // If we hit OOM then we fail and the load is aborted.
-  nsresult rv = image->mSourceBuffer->Append(aFromRawSegment, aCount);
-  if (rv == NS_ERROR_OUT_OF_MEMORY) {
-    image->DoError();
-    return rv;
-  }
-
-  // We wrote everything we got
-  *aWriteCount = aCount;
-
-  return NS_OK;
-}
-
-bool
-RasterImage::ShouldAnimate()
-{
-  return ImageResource::ShouldAnimate() && GetNumFrames() >= 2 &&
-         !mAnimationFinished;
-}
-
-/* readonly attribute uint32_t framesNotified; */
-#ifdef DEBUG
-NS_IMETHODIMP
-RasterImage::GetFramesNotified(uint32_t* aFramesNotified)
-{
-  NS_ENSURE_ARG_POINTER(aFramesNotified);
-
-  *aFramesNotified = mFramesNotified;
-
-  return NS_OK;
-}
-#endif
-
-void
-RasterImage::NotifyProgress(Progress aProgress,
-                            const IntRect& aInvalidRect /* = IntRect() */,
-                            uint32_t aFlags /* = DECODE_FLAGS_DEFAULT */)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  // Ensure that we stay alive long enough to finish notifying.
-  nsRefPtr<RasterImage> image(this);
-
-  bool wasDefaultFlags = aFlags == DECODE_FLAGS_DEFAULT;
-
-  if (!aInvalidRect.IsEmpty() && wasDefaultFlags) {
-    // Update our image container since we're invalidating.
-    UpdateImageContainer();
-  }
-
-  // Tell the observers what happened.
-  image->mProgressTracker->SyncNotifyProgress(aProgress, aInvalidRect);
-}
-
-void
-RasterImage::FinalizeDecoder(Decoder* aDecoder)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(aDecoder);
-  MOZ_ASSERT(mError || mHasSize || !aDecoder->HasSize(),
-             "Should have handed off size by now");
-
-  // Send out any final notifications.
-  NotifyProgress(aDecoder->TakeProgress(),
-                 aDecoder->TakeInvalidRect(),
-                 aDecoder->GetDecodeFlags());
-
-  bool wasSize = aDecoder->IsSizeDecode();
-  bool done = aDecoder->GetDecodeDone();
-
-  if (!wasSize && aDecoder->ChunkCount()) {
-    Telemetry::Accumulate(Telemetry::IMAGE_DECODE_CHUNKS,
-                          aDecoder->ChunkCount());
-  }
-
-  if (done) {
-    // Do some telemetry if this isn't a size decode.
-    if (!wasSize) {
-      Telemetry::Accumulate(Telemetry::IMAGE_DECODE_TIME,
-                            int32_t(aDecoder->DecodeTime().ToMicroseconds()));
-
-      // We record the speed for only some decoders. The rest have
-      // SpeedHistogram return HistogramCount.
-      Telemetry::ID id = aDecoder->SpeedHistogram();
-      if (id < Telemetry::HistogramCount) {
-        int32_t KBps = int32_t(aDecoder->BytesDecoded() /
-                               (1024 * aDecoder->DecodeTime().ToSeconds()));
-        Telemetry::Accumulate(id, KBps);
-      }
-    }
-
-    // Detect errors.
-    if (aDecoder->HasError() && !aDecoder->WasAborted()) {
-      DoError();
-    } else if (wasSize && !mHasSize) {
-      DoError();
-    }
-  }
-
-  if (aDecoder->ImageIsLocked()) {
-    // Unlock the image, balancing the LockImage call we made in CreateDecoder.
-    UnlockImage();
-  }
-
-  // If we were a size decode and a full decode was requested, now's the time.
-  if (done && wasSize && mWantFullDecode) {
-    mWantFullDecode = false;
-    RequestDecode();
-  }
-}
-
-already_AddRefed<imgIContainer>
-RasterImage::Unwrap()
-{
-  nsCOMPtr<imgIContainer> self(this);
-  return self.forget();
-}
-
-IntSize
-RasterImage::OptimalImageSizeForDest(const gfxSize& aDest, uint32_t aWhichFrame,
-                                     GraphicsFilter aFilter, uint32_t aFlags)
-{
-  MOZ_ASSERT(aDest.width >= 0 || ceil(aDest.width) <= INT32_MAX ||
-             aDest.height >= 0 || ceil(aDest.height) <= INT32_MAX,
-             "Unexpected destination size");
-
-  if (mSize.IsEmpty() || aDest.IsEmpty()) {
-    return IntSize(0, 0);
-  }
-
-  IntSize destSize(ceil(aDest.width), ceil(aDest.height));
-
-  if (aFilter == GraphicsFilter::FILTER_GOOD &&
-      CanDownscaleDuringDecode(destSize, aFlags)) {
-    return destSize;
-  } else if (CanScale(aFilter, destSize, aFlags)) {
-    DrawableFrameRef frameRef =
-      SurfaceCache::Lookup(ImageKey(this),
-                           RasterSurfaceKey(destSize,
-                                            DecodeFlags(aFlags),
-                                            0));
-
-    if (frameRef && frameRef->IsImageComplete()) {
-        return destSize;  // We have an existing HQ scale for this size.
-    }
-    if (!frameRef) {
-      // We could HQ scale to this size, but we haven't. Request a scale now.
-      frameRef = LookupFrame(GetRequestedFrameIndex(aWhichFrame),
-                             mSize, aFlags);
-      if (frameRef) {
-        RequestScale(frameRef.get(), aFlags, destSize);
-      }
-    }
-  }
-
-  // We either can't HQ scale to this size or the scaled version isn't ready
-  // yet. Use our intrinsic size for now.
-  return mSize;
-}
-
-} // namespace image
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/RasterImage.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/RasterImage.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/RasterImage.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/RasterImage.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,489 +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
- * This file declares the RasterImage class, which
- * handles static and animated rasterized images.
- *
- * @author  Stuart Parmenter <pavlov@netscape.com>
- * @author  Chris Saari <saari@netscape.com>
- * @author  Arron Mogge <paper@animecity.nu>
- * @author  Andrew Smith <asmith15@learn.senecac.on.ca>
- */
-
-#ifndef mozilla_image_src_RasterImage_h
-#define mozilla_image_src_RasterImage_h
-
-#include "Image.h"
-#include "nsCOMPtr.h"
-#include "imgIContainer.h"
-#include "nsIProperties.h"
-#include "nsTArray.h"
-#include "imgFrame.h"
-#include "nsThreadUtils.h"
-#include "DecodePool.h"
-#include "Orientation.h"
-#include "nsIObserver.h"
-#include "mozilla/Attributes.h"
-#include "mozilla/Maybe.h"
-#include "mozilla/MemoryReporting.h"
-#include "mozilla/Pair.h"
-#include "mozilla/TimeStamp.h"
-#include "mozilla/WeakPtr.h"
-#include "mozilla/UniquePtr.h"
-#ifdef DEBUG
-  #include "imgIContainerDebug.h"
-#endif
-
-class nsIInputStream;
-class nsIRequest;
-
-#define NS_RASTERIMAGE_CID \
-{ /* 376ff2c1-9bf6-418a-b143-3340c00112f7 */         \
-     0x376ff2c1,                                     \
-     0x9bf6,                                         \
-     0x418a,                                         \
-    {0xb1, 0x43, 0x33, 0x40, 0xc0, 0x01, 0x12, 0xf7} \
-}
-
-/**
- * Handles static and animated image containers.
- *
- *
- * @par A Quick Walk Through
- * The decoder initializes this class and calls AppendFrame() to add a frame.
- * Once RasterImage detects more than one frame, it starts the animation
- * with StartAnimation(). Note that the invalidation events for RasterImage are
- * generated automatically using nsRefreshDriver.
- *
- * @par
- * StartAnimation() initializes the animation helper object and sets the time
- * the first frame was displayed to the current clock time.
- *
- * @par
- * When the refresh driver corresponding to the imgIContainer that this image is
- * a part of notifies the RasterImage that it's time to invalidate,
- * RequestRefresh() is called with a given TimeStamp to advance to. As long as
- * the timeout of the given frame (the frame's "delay") plus the time that frame
- * was first displayed is less than or equal to the TimeStamp given,
- * RequestRefresh() calls AdvanceFrame().
- *
- * @par
- * AdvanceFrame() is responsible for advancing a single frame of the animation.
- * It can return true, meaning that the frame advanced, or false, meaning that
- * the frame failed to advance (usually because the next frame hasn't been
- * decoded yet). It is also responsible for performing the final animation stop
- * procedure if the final frame of a non-looping animation is reached.
- *
- * @par
- * Each frame can have a different method of removing itself. These are
- * listed as imgIContainer::cDispose... constants.  Notify() calls
- * DoComposite() to handle any special frame destruction.
- *
- * @par
- * The basic path through DoComposite() is:
- * 1) Calculate Area that needs updating, which is at least the area of
- *    aNextFrame.
- * 2) Dispose of previous frame.
- * 3) Draw new image onto compositingFrame.
- * See comments in DoComposite() for more information and optimizations.
- *
- * @par
- * The rest of the RasterImage specific functions are used by DoComposite to
- * destroy the old frame and build the new one.
- *
- * @note
- * <li> "Mask", "Alpha", and "Alpha Level" are interchangeable phrases in
- * respects to RasterImage.
- *
- * @par
- * <li> GIFs never have more than a 1 bit alpha.
- * <li> APNGs may have a full alpha channel.
- *
- * @par
- * <li> Background color specified in GIF is ignored by web browsers.
- *
- * @par
- * <li> If Frame 3 wants to dispose by restoring previous, what it wants is to
- * restore the composition up to and including Frame 2, as well as Frame 2s
- * disposal.  So, in the middle of DoComposite when composing Frame 3, right
- * after destroying Frame 2's area, we copy compositingFrame to
- * prevCompositingFrame.  When DoComposite gets called to do Frame 4, we
- * copy prevCompositingFrame back, and then draw Frame 4 on top.
- *
- * @par
- * The mAnim structure has members only needed for animated images, so
- * it's not allocated until the second frame is added.
- */
-
-namespace mozilla {
-
-namespace layers {
-class ImageContainer;
-class Image;
-}
-
-namespace image {
-
-class Decoder;
-class FrameAnimator;
-class SourceBuffer;
-
-/**
- * Given a set of imgIContainer FLAG_* flags, returns those flags that can
- * affect the output of decoders.
- */
-inline MOZ_CONSTEXPR uint32_t
-DecodeFlags(uint32_t aFlags)
-{
-  return aFlags & (imgIContainer::FLAG_DECODE_NO_PREMULTIPLY_ALPHA |
-                   imgIContainer::FLAG_DECODE_NO_COLORSPACE_CONVERSION);
-}
-
-class RasterImage final : public ImageResource
-                        , public nsIProperties
-                        , public SupportsWeakPtr<RasterImage>
-#ifdef DEBUG
-                        , public imgIContainerDebug
-#endif
-{
-  // (no public constructor - use ImageFactory)
-  virtual ~RasterImage();
-
-public:
-  MOZ_DECLARE_WEAKREFERENCE_TYPENAME(RasterImage)
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_NSIPROPERTIES
-  NS_DECL_IMGICONTAINER
-#ifdef DEBUG
-  NS_DECL_IMGICONTAINERDEBUG
-#endif
-
-  virtual nsresult StartAnimation() override;
-  virtual nsresult StopAnimation() override;
-
-  // Methods inherited from Image
-  virtual void OnSurfaceDiscarded() override;
-
-  // Raster-specific methods
-  static NS_METHOD WriteToSourceBuffer(nsIInputStream* aIn, void* aClosure,
-                                       const char* aFromRawSegment,
-                                       uint32_t aToOffset, uint32_t aCount,
-                                       uint32_t* aWriteCount);
-
-  /* The total number of frames in this image. */
-  uint32_t GetNumFrames() const { return mFrameCount; }
-
-  virtual size_t SizeOfSourceWithComputedFallback(MallocSizeOf aMallocSizeOf)
-    const override;
-  virtual void CollectSizeOfSurfaces(nsTArray<SurfaceMemoryCounter>& aCounters,
-                                     MallocSizeOf aMallocSizeOf) const override;
-
-  /* Triggers discarding. */
-  void Discard();
-
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Decoder callbacks.
-  //////////////////////////////////////////////////////////////////////////////
-
-  void OnAddedFrame(uint32_t aNewFrameCount, const nsIntRect& aNewRefreshArea);
-
-  /** Sets the size and inherent orientation of the container. This should only
-   * be called by the decoder. This function may be called multiple times, but
-   * will throw an error if subsequent calls do not match the first.
-   */
-  nsresult SetSize(int32_t aWidth, int32_t aHeight, Orientation aOrientation);
-
-  /**
-   * Number of times to loop the image.
-   * @note -1 means forever.
-   */
-  void     SetLoopCount(int32_t aLoopCount);
-
-  /// Notification that the entire image has been decoded.
-  void OnDecodingComplete();
-
-  /**
-   * Sends the provided progress notifications to ProgressTracker.
-   *
-   * Main-thread only.
-   *
-   * @param aProgress    The progress notifications to send.
-   * @param aInvalidRect An invalidation rect to send.
-   * @param aFlags       The decode flags used by the decoder that generated
-   *                     these notifications, or DECODE_FLAGS_DEFAULT if the
-   *                     notifications don't come from a decoder.
-   */
-  void NotifyProgress(Progress aProgress,
-                      const nsIntRect& aInvalidRect = nsIntRect(),
-                      uint32_t aFlags = DECODE_FLAGS_DEFAULT);
-
-  /**
-   * Records telemetry and does final teardown of the provided decoder.
-   *
-   * Main-thread only.
-   */
-  void FinalizeDecoder(Decoder* aDecoder);
-
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Network callbacks.
-  //////////////////////////////////////////////////////////////////////////////
-
-  virtual nsresult OnImageDataAvailable(nsIRequest* aRequest,
-                                        nsISupports* aContext,
-                                        nsIInputStream* aInStr,
-                                        uint64_t aSourceOffset,
-                                        uint32_t aCount) override;
-  virtual nsresult OnImageDataComplete(nsIRequest* aRequest,
-                                       nsISupports* aContext,
-                                       nsresult aStatus,
-                                       bool aLastPart) override;
-
-  void NotifyForDecodeOnlyOnDraw();
-
-  /**
-   * A hint of the number of bytes of source data that the image contains. If
-   * called early on, this can help reduce copying and reallocations by
-   * appropriately preallocating the source data buffer.
-   *
-   * We take this approach rather than having the source data management code do
-   * something more complicated (like chunklisting) because HTTP is by far the
-   * dominant source of images, and the Content-Length header is quite reliable.
-   * Thus, pre-allocation simplifies code and reduces the total number of
-   * allocations.
-   */
-  nsresult SetSourceSizeHint(uint32_t aSizeHint);
-
-  /* Provide a hint for the requested resolution of the resulting image. */
-  void SetRequestedResolution(const nsIntSize requestedResolution) {
-    mRequestedResolution = requestedResolution;
-  }
-
-  nsIntSize GetRequestedResolution() {
-    return mRequestedResolution;
-  }
-  /* Provide a hint for the requested dimension of the resulting image. */
-  void SetRequestedSampleSize(int requestedSampleSize) {
-    mRequestedSampleSize = requestedSampleSize;
-  }
-
-  int GetRequestedSampleSize() {
-    return mRequestedSampleSize;
-  }
-
- nsCString GetURIString() {
-    nsCString spec;
-    if (GetURI()) {
-      GetURI()->GetSpec(spec);
-    }
-    return spec;
-  }
-
-private:
-  nsresult Init(const char* aMimeType, uint32_t aFlags);
-
-  DrawResult DrawWithPreDownscaleIfNeeded(DrawableFrameRef&& aFrameRef,
-                                          gfxContext* aContext,
-                                          const nsIntSize& aSize,
-                                          const ImageRegion& aRegion,
-                                          GraphicsFilter aFilter,
-                                          uint32_t aFlags);
-
-  TemporaryRef<gfx::SourceSurface> CopyFrame(uint32_t aWhichFrame,
-                                             uint32_t aFlags);
-
-  Pair<DrawResult, RefPtr<gfx::SourceSurface>>
-    GetFrameInternal(uint32_t aWhichFrame, uint32_t aFlags);
-
-  DrawableFrameRef LookupFrameInternal(uint32_t aFrameNum,
-                                       const gfx::IntSize& aSize,
-                                       uint32_t aFlags);
-  DrawableFrameRef LookupFrame(uint32_t aFrameNum,
-                               const nsIntSize& aSize,
-                               uint32_t aFlags);
-  uint32_t GetCurrentFrameIndex() const;
-  uint32_t GetRequestedFrameIndex(uint32_t aWhichFrame) const;
-
-  nsIntRect GetFirstFrameRect();
-
-  size_t
-    SizeOfDecodedWithComputedFallbackIfHeap(gfxMemoryLocation aLocation,
-                                            MallocSizeOf aMallocSizeOf) const;
-
-  Pair<DrawResult, nsRefPtr<layers::Image>>
-    GetCurrentImage(layers::ImageContainer* aContainer, uint32_t aFlags);
-
-  void UpdateImageContainer();
-
-  // We would like to just check if we have a zero lock count, but we can't do
-  // that for animated images because in EnsureAnimExists we lock the image and
-  // never unlock so that animated images always have their lock count >= 1. In
-  // that case we use our animation consumers count as a proxy for lock count.
-  bool IsUnlocked() {
-    return (mLockCount == 0 || (mAnim && mAnimationConsumers == 0));
-  }
-
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Decoding.
-  //////////////////////////////////////////////////////////////////////////////
-
-  /**
-   * Creates and runs a decoder, either synchronously or asynchronously
-   * according to @aFlags. Passes the provided target size @aSize and decode
-   * flags @aFlags to CreateDecoder. If a size decode is desired, pass Nothing
-   * for @aSize.
-   */
-  NS_IMETHOD Decode(const Maybe<nsIntSize>& aSize, uint32_t aFlags);
-
-  /**
-   * Creates a new decoder with a target size of @aSize and decode flags
-   * specified by @aFlags. If a size decode is desired, pass Nothing() for
-   * @aSize.
-   */
-  already_AddRefed<Decoder> CreateDecoder(const Maybe<nsIntSize>& aSize,
-                                          uint32_t aFlags);
-
-  /**
-   * In catastrophic circumstances like a GPU driver crash, we may lose our
-   * frames even if they're locked. RecoverFromLossOfFrames discards all
-   * existing frames and redecodes using the provided @aSize and @aFlags.
-   */
-  void RecoverFromLossOfFrames(const nsIntSize& aSize, uint32_t aFlags);
-
-private: // data
-  nsIntSize                  mSize;
-  Orientation                mOrientation;
-
-  nsCOMPtr<nsIProperties>   mProperties;
-
-  /// If this image is animated, a FrameAnimator which manages its animation.
-  UniquePtr<FrameAnimator> mAnim;
-
-  // Image locking.
-  uint32_t                   mLockCount;
-
-  // Source data members
-  nsCString                  mSourceDataMimeType;
-
-  // How many times we've decoded this image.
-  // This is currently only used for statistics
-  int32_t                        mDecodeCount;
-
-  // If the image contains multiple resolutions, a hint as to which one
-  // should be used
-  nsIntSize                  mRequestedResolution;
-
-  // A hint for image decoder that directly scale the image to smaller buffer
-  int                        mRequestedSampleSize;
-
-  // A weak pointer to our ImageContainer, which stays alive only as long as
-  // the layer system needs it.
-  WeakPtr<layers::ImageContainer> mImageContainer;
-
-  // If mImageContainer is non-null, this contains the DrawResult we obtained
-  // the last time we updated it.
-  DrawResult mLastImageContainerDrawResult;
-
-#ifdef DEBUG
-  uint32_t                       mFramesNotified;
-#endif
-
-  // The source data for this image.
-  nsRefPtr<SourceBuffer>     mSourceBuffer;
-
-  // The number of frames this image has.
-  uint32_t                   mFrameCount;
-
-  // Boolean flags (clustered together to conserve space):
-  bool                       mHasSize:1;       // Has SetSize() been called?
-  bool                       mDecodeOnlyOnDraw:1; // Decoding only on draw?
-  bool                       mTransient:1;     // Is the image short-lived?
-  bool                       mDiscardable:1;   // Is container discardable?
-  bool                       mHasSourceData:1; // Do we have source data?
-  bool                       mHasBeenDecoded:1; // Decoded at least once?
-  bool                       mDownscaleDuringDecode:1;
-
-  // Whether we're waiting to start animation. If we get a StartAnimation() call
-  // but we don't yet have more than one frame, mPendingAnimation is set so that
-  // we know to start animation later if/when we have more frames.
-  bool                       mPendingAnimation:1;
-
-  // Whether the animation can stop, due to running out
-  // of frames, or no more owning request
-  bool                       mAnimationFinished:1;
-
-  // Whether, once we are done doing a size decode, we should immediately kick
-  // off a full decode.
-  bool                       mWantFullDecode:1;
-
-  TimeStamp mDrawStartTime;
-
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Scaling.
-  //////////////////////////////////////////////////////////////////////////////
-
-  // Initiates an HQ scale for the given frame, if possible.
-  void RequestScale(imgFrame* aFrame, uint32_t aFlags, const nsIntSize& aSize);
-
-  // Determines whether we can perform an HQ scale with the given parameters.
-  bool CanScale(GraphicsFilter aFilter, const nsIntSize& aSize,
-                uint32_t aFlags);
-
-  // Determines whether we can downscale during decode with the given
-  // parameters.
-  bool CanDownscaleDuringDecode(const nsIntSize& aSize, uint32_t aFlags);
-
-  // Called by the HQ scaler when a new scaled frame is ready.
-  void NotifyNewScaledFrame();
-
-  friend class ScaleRunner;
-
-
-  // Error handling.
-  void DoError();
-
-  class HandleErrorWorker : public nsRunnable
-  {
-  public:
-    /**
-     * Called from decoder threads when DoError() is called, since errors can't
-     * be handled safely off-main-thread. Dispatches an event which reinvokes
-     * DoError on the main thread if there isn't one already pending.
-     */
-    static void DispatchIfNeeded(RasterImage* aImage);
-
-    NS_IMETHOD Run();
-
-  private:
-    explicit HandleErrorWorker(RasterImage* aImage);
-
-    nsRefPtr<RasterImage> mImage;
-  };
-
-  // Helpers
-  bool CanDiscard();
-
-protected:
-  explicit RasterImage(ImageURL* aURI = nullptr);
-
-  bool ShouldAnimate() override;
-
-  friend class ImageFactory;
-};
-
-inline NS_IMETHODIMP
-RasterImage::GetAnimationMode(uint16_t* aAnimationMode) {
-  return GetAnimationModeInternal(aAnimationMode);
-}
-
-} // namespace image
-} // namespace mozilla
-
-#endif /* mozilla_image_src_RasterImage_h */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/ScriptedNotificationObserver.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/ScriptedNotificationObserver.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/ScriptedNotificationObserver.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/ScriptedNotificationObserver.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +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 "ScriptedNotificationObserver.h"
-#include "imgIScriptedNotificationObserver.h"
-#include "nsCycleCollectionParticipant.h"
-
-namespace mozilla {
-namespace image {
-
-NS_IMPL_CYCLE_COLLECTION(ScriptedNotificationObserver, mInner)
-
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ScriptedNotificationObserver)
-  NS_INTERFACE_MAP_ENTRY(imgINotificationObserver)
-  NS_INTERFACE_MAP_ENTRY(nsISupports)
-NS_INTERFACE_MAP_END
-
-NS_IMPL_CYCLE_COLLECTING_ADDREF(ScriptedNotificationObserver)
-NS_IMPL_CYCLE_COLLECTING_RELEASE(ScriptedNotificationObserver)
-
-ScriptedNotificationObserver::ScriptedNotificationObserver(
-    imgIScriptedNotificationObserver* aInner)
-: mInner(aInner)
-{ }
-
-NS_IMETHODIMP
-ScriptedNotificationObserver::Notify(imgIRequest* aRequest,
-                                     int32_t aType,
-                                     const nsIntRect* /*aUnused*/)
-{
-  if (aType == imgINotificationObserver::SIZE_AVAILABLE) {
-    return mInner->SizeAvailable(aRequest);
-  }
-  if (aType == imgINotificationObserver::FRAME_UPDATE) {
-    return mInner->FrameUpdate(aRequest);
-  }
-  if (aType == imgINotificationObserver::FRAME_COMPLETE) {
-    return mInner->FrameComplete(aRequest);
-  }
-  if (aType == imgINotificationObserver::DECODE_COMPLETE) {
-    return mInner->DecodeComplete(aRequest);
-  }
-  if (aType == imgINotificationObserver::LOAD_COMPLETE) {
-    return mInner->LoadComplete(aRequest);
-  }
-  if (aType == imgINotificationObserver::DISCARD) {
-    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;
-}
-
-} // namespace image
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/ScriptedNotificationObserver.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/ScriptedNotificationObserver.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/ScriptedNotificationObserver.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/ScriptedNotificationObserver.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +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_image_src_ScriptedNotificationObserver_h
-#define mozilla_image_src_ScriptedNotificationObserver_h
-
-#include "imgINotificationObserver.h"
-#include "nsCOMPtr.h"
-#include "nsCycleCollectionParticipant.h"
-
-class imgIScriptedNotificationObserver;
-
-namespace mozilla {
-namespace image {
-
-class ScriptedNotificationObserver : public imgINotificationObserver
-{
-public:
-  explicit
-    ScriptedNotificationObserver(imgIScriptedNotificationObserver* aInner);
-
-  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-  NS_DECL_IMGINOTIFICATIONOBSERVER
-  NS_DECL_CYCLE_COLLECTION_CLASS(ScriptedNotificationObserver)
-
-private:
-  virtual ~ScriptedNotificationObserver() { }
-  nsCOMPtr<imgIScriptedNotificationObserver> mInner;
-};
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_ScriptedNotificationObserver_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/ShutdownTracker.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/ShutdownTracker.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/ShutdownTracker.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/ShutdownTracker.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +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 "ShutdownTracker.h"
-
-#include "mozilla/Services.h"
-#include "nsAutoPtr.h"
-#include "nsIObserver.h"
-#include "nsIObserverService.h"
-
-namespace mozilla {
-namespace image {
-
-class ShutdownTrackerImpl;
-
-///////////////////////////////////////////////////////////////////////////////
-// Static Data
-///////////////////////////////////////////////////////////////////////////////
-
-// Whether we've observed shutdown starting yet.
-static bool sShutdownHasStarted = false;
-
-
-///////////////////////////////////////////////////////////////////////////////
-// Implementation
-///////////////////////////////////////////////////////////////////////////////
-
-struct ShutdownObserver : public nsIObserver
-{
-  NS_DECL_ISUPPORTS
-
-  NS_IMETHOD Observe(nsISupports*, const char* aTopic, const char16_t*) override
-  {
-    if (strcmp(aTopic, "xpcom-shutdown") != 0) {
-      return NS_OK;
-    }
-
-    nsCOMPtr<nsIObserverService> os = services::GetObserverService();
-    if (os) {
-      os->RemoveObserver(this, "xpcom-shutdown");
-    }
-
-    sShutdownHasStarted = true;
-    return NS_OK;
-  }
-
-private:
-  virtual ~ShutdownObserver() { }
-};
-
-NS_IMPL_ISUPPORTS(ShutdownObserver, nsIObserver)
-
-
-///////////////////////////////////////////////////////////////////////////////
-// Public API
-///////////////////////////////////////////////////////////////////////////////
-
-/* static */ void
-ShutdownTracker::Initialize()
-{
-  nsCOMPtr<nsIObserverService> os = services::GetObserverService();
-  if (os) {
-    os->AddObserver(new ShutdownObserver, "xpcom-shutdown", false);
-  }
-}
-
-/* static */ bool
-ShutdownTracker::ShutdownHasStarted()
-{
-  return sShutdownHasStarted;
-}
-
-} // namespace image
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/ShutdownTracker.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/ShutdownTracker.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/ShutdownTracker.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/ShutdownTracker.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +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/. */
-
-/**
- * ShutdownTracker is an imagelib-global service that allows callers to check
- * whether shutdown has started.
- */
-
-#ifndef mozilla_image_src_ShutdownTracker_h
-#define mozilla_image_src_ShutdownTracker_h
-
-namespace mozilla {
-namespace image {
-
-/**
- * ShutdownTracker is an imagelib-global service that allows callers to check
- * whether shutdown has started. It exists to avoid the need for registering
- * many 'xpcom-shutdown' notification observers on short-lived objects, which
- * would have an unnecessary performance cost.
- */
-struct ShutdownTracker
-{
-  /**
-   * Initialize static data. Called during imagelib module initialization.
-   */
-  static void Initialize();
-
-  /**
-   * Check whether shutdown has started. Callers can use this to check whether
-   * it's safe to access XPCOM services; if shutdown has started, such calls
-   * must be avoided.
-   *
-   * @return true if shutdown has already started.
-   */
-  static bool ShutdownHasStarted();
-
-private:
-  virtual ~ShutdownTracker() = 0;  // Forbid instantiation.
-};
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_ShutdownTracker_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/SourceBuffer.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/SourceBuffer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/SourceBuffer.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/SourceBuffer.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,578 +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 "SourceBuffer.h"
-
-#include <algorithm>
-#include <cmath>
-#include <cstring>
-#include "mozilla/Likely.h"
-#include "MainThreadUtils.h"
-#include "SurfaceCache.h"
-
-using std::max;
-using std::min;
-
-namespace mozilla {
-namespace image {
-
-//////////////////////////////////////////////////////////////////////////////
-// SourceBufferIterator implementation.
-//////////////////////////////////////////////////////////////////////////////
-
-SourceBufferIterator::~SourceBufferIterator()
-{
-  if (mOwner) {
-    mOwner->OnIteratorRelease();
-  }
-}
-
-SourceBufferIterator::State
-SourceBufferIterator::AdvanceOrScheduleResume(IResumable* aConsumer)
-{
-  MOZ_ASSERT(mOwner);
-  return mOwner->AdvanceIteratorOrScheduleResume(*this, aConsumer);
-}
-
-bool
-SourceBufferIterator::RemainingBytesIsNoMoreThan(size_t aBytes) const
-{
-  MOZ_ASSERT(mOwner);
-  return mOwner->RemainingBytesIsNoMoreThan(*this, aBytes);
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
-// SourceBuffer implementation.
-//////////////////////////////////////////////////////////////////////////////
-
-SourceBuffer::SourceBuffer()
-  : mMutex("image::SourceBuffer")
-  , mConsumerCount(0)
-{ }
-
-SourceBuffer::~SourceBuffer()
-{
-  MOZ_ASSERT(mConsumerCount == 0,
-             "SourceBuffer destroyed with active consumers");
-}
-
-nsresult
-SourceBuffer::AppendChunk(Maybe<Chunk>&& aChunk)
-{
-  mMutex.AssertCurrentThreadOwns();
-
-#ifdef DEBUG
-  if (mChunks.Length() > 0) {
-    NS_WARNING("Appending an extra chunk for SourceBuffer");
-  }
-#endif
-
-  if (MOZ_UNLIKELY(!aChunk)) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  if (MOZ_UNLIKELY(aChunk->AllocationFailed())) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  if (MOZ_UNLIKELY(!mChunks.AppendElement(Move(*aChunk)))) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  return NS_OK;
-}
-
-Maybe<SourceBuffer::Chunk>
-SourceBuffer::CreateChunk(size_t aCapacity, bool aRoundUp /* = true */)
-{
-  if (MOZ_UNLIKELY(aCapacity == 0)) {
-    MOZ_ASSERT_UNREACHABLE("Appending a chunk of zero size?");
-    return Nothing();
-  }
-
-  // Round up if requested.
-  size_t finalCapacity = aRoundUp ? RoundedUpCapacity(aCapacity)
-                                  : aCapacity;
-
-  // Use the size of the SurfaceCache as an additional heuristic to avoid
-  // allocating huge buffers. Generally images do not get smaller when decoded,
-  // so if we could store the source data in the SurfaceCache, we assume that
-  // there's no way we'll be able to store the decoded version.
-  if (MOZ_UNLIKELY(!SurfaceCache::CanHold(finalCapacity))) {
-    return Nothing();
-  }
-
-  return Some(Chunk(finalCapacity));
-}
-
-nsresult
-SourceBuffer::Compact()
-{
-  mMutex.AssertCurrentThreadOwns();
-
-  MOZ_ASSERT(mConsumerCount == 0, "Should have no consumers here");
-  MOZ_ASSERT(mWaitingConsumers.Length() == 0, "Shouldn't have waiters");
-  MOZ_ASSERT(mStatus, "Should be complete here");
-
-  // Compact our waiting consumers list, since we're complete and no future
-  // consumer will ever have to wait.
-  mWaitingConsumers.Compact();
-
-  // If we have no chunks, then there's nothing to compact.
-  if (mChunks.Length() < 1) {
-    return NS_OK;
-  }
-
-  // If we have one chunk, then we can compact if it has excess capacity.
-  if (mChunks.Length() == 1 && mChunks[0].Length() == mChunks[0].Capacity()) {
-    return NS_OK;
-  }
-
-  // We can compact our buffer. Determine the total length.
-  size_t length = 0;
-  for (uint32_t i = 0 ; i < mChunks.Length() ; ++i) {
-    length += mChunks[i].Length();
-  }
-
-  Maybe<Chunk> newChunk = CreateChunk(length, /* aRoundUp = */ false);
-  if (MOZ_UNLIKELY(!newChunk || newChunk->AllocationFailed())) {
-    NS_WARNING("Failed to allocate chunk for SourceBuffer compacting - OOM?");
-    return NS_OK;
-  }
-
-  // Copy our old chunks into the new chunk.
-  for (uint32_t i = 0 ; i < mChunks.Length() ; ++i) {
-    size_t offset = newChunk->Length();
-    MOZ_ASSERT(offset < newChunk->Capacity());
-    MOZ_ASSERT(offset + mChunks[i].Length() <= newChunk->Capacity());
-
-    memcpy(newChunk->Data() + offset, mChunks[i].Data(), mChunks[i].Length());
-    newChunk->AddLength(mChunks[i].Length());
-  }
-
-  MOZ_ASSERT(newChunk->Length() == newChunk->Capacity(),
-             "Compacted chunk has slack space");
-
-  // Replace the old chunks with the new, compact chunk.
-  mChunks.Clear();
-  if (MOZ_UNLIKELY(NS_FAILED(AppendChunk(Move(newChunk))))) {
-    return HandleError(NS_ERROR_OUT_OF_MEMORY);
-  }
-  mChunks.Compact();
-
-  return NS_OK;
-}
-
-/* static */ size_t
-SourceBuffer::RoundedUpCapacity(size_t aCapacity)
-{
-  // Protect against overflow.
-  if (MOZ_UNLIKELY(SIZE_MAX - aCapacity < MIN_CHUNK_CAPACITY)) {
-    return aCapacity;
-  }
-
-  // Round up to the next multiple of MIN_CHUNK_CAPACITY (which should be the
-  // size of a page).
-  size_t roundedCapacity =
-    (aCapacity + MIN_CHUNK_CAPACITY - 1) & ~(MIN_CHUNK_CAPACITY - 1);
-  MOZ_ASSERT(roundedCapacity >= aCapacity, "Bad math?");
-  MOZ_ASSERT(roundedCapacity - aCapacity < MIN_CHUNK_CAPACITY, "Bad math?");
-
-  return roundedCapacity;
-}
-
-size_t
-SourceBuffer::FibonacciCapacityWithMinimum(size_t aMinCapacity)
-{
-  mMutex.AssertCurrentThreadOwns();
-
-  // We grow the source buffer using a Fibonacci growth rate.
-
-  size_t length = mChunks.Length();
-
-  if (length == 0) {
-    return aMinCapacity;
-  }
-
-  if (length == 1) {
-    return max(2 * mChunks[0].Capacity(), aMinCapacity);
-  }
-
-  return max(mChunks[length - 1].Capacity() + mChunks[length - 2].Capacity(),
-             aMinCapacity);
-}
-
-void
-SourceBuffer::AddWaitingConsumer(IResumable* aConsumer)
-{
-  mMutex.AssertCurrentThreadOwns();
-
-  MOZ_ASSERT(!mStatus, "Waiting when we're complete?");
-
-  if (MOZ_UNLIKELY(NS_IsMainThread())) {
-    NS_WARNING("SourceBuffer consumer on the main thread needed to wait");
-  }
-
-  mWaitingConsumers.AppendElement(aConsumer);
-}
-
-void
-SourceBuffer::ResumeWaitingConsumers()
-{
-  mMutex.AssertCurrentThreadOwns();
-
-  if (mWaitingConsumers.Length() == 0) {
-    return;
-  }
-
-  for (uint32_t i = 0 ; i < mWaitingConsumers.Length() ; ++i) {
-    mWaitingConsumers[i]->Resume();
-  }
-
-  mWaitingConsumers.Clear();
-}
-
-nsresult
-SourceBuffer::ExpectLength(size_t aExpectedLength)
-{
-  MOZ_ASSERT(aExpectedLength > 0, "Zero expected size?");
-
-  MutexAutoLock lock(mMutex);
-
-  if (MOZ_UNLIKELY(mStatus)) {
-    MOZ_ASSERT_UNREACHABLE("ExpectLength after SourceBuffer is complete");
-    return NS_OK;
-  }
-
-  if (MOZ_UNLIKELY(mChunks.Length() > 0)) {
-    MOZ_ASSERT_UNREACHABLE("Duplicate or post-Append call to ExpectLength");
-    return NS_OK;
-  }
-
-  if (MOZ_UNLIKELY(NS_FAILED(AppendChunk(CreateChunk(aExpectedLength))))) {
-    return HandleError(NS_ERROR_OUT_OF_MEMORY);
-  }
-
-  return NS_OK;
-}
-
-nsresult
-SourceBuffer::Append(const char* aData, size_t aLength)
-{
-  MOZ_ASSERT(aData, "Should have a buffer");
-  MOZ_ASSERT(aLength > 0, "Writing a zero-sized chunk");
-
-  size_t currentChunkCapacity = 0;
-  size_t currentChunkLength = 0;
-  char* currentChunkData = nullptr;
-  size_t currentChunkRemaining = 0;
-  size_t forCurrentChunk = 0;
-  size_t forNextChunk = 0;
-  size_t nextChunkCapacity = 0;
-
-  {
-    MutexAutoLock lock(mMutex);
-
-    if (MOZ_UNLIKELY(mStatus)) {
-      // This SourceBuffer is already complete; ignore further data.
-      return NS_ERROR_FAILURE;
-    }
-
-    if (MOZ_UNLIKELY(mChunks.Length() == 0)) {
-      if (MOZ_UNLIKELY(NS_FAILED(AppendChunk(CreateChunk(aLength))))) {
-        return HandleError(NS_ERROR_OUT_OF_MEMORY);
-      }
-    }
-
-    // Copy out the current chunk's information so we can release the lock.
-    // Note that this wouldn't be safe if multiple producers were allowed!
-    Chunk& currentChunk = mChunks.LastElement();
-    currentChunkCapacity = currentChunk.Capacity();
-    currentChunkLength = currentChunk.Length();
-    currentChunkData = currentChunk.Data();
-
-    // Partition this data between the current chunk and the next chunk.
-    // (Because we always allocate a chunk big enough to fit everything passed
-    // to Append, we'll never need more than those two chunks to store
-    // everything.)
-    currentChunkRemaining = currentChunkCapacity - currentChunkLength;
-    forCurrentChunk = min(aLength, currentChunkRemaining);
-    forNextChunk = aLength - forCurrentChunk;
-
-    // If we'll need another chunk, determine what its capacity should be while
-    // we still hold the lock.
-    nextChunkCapacity = forNextChunk > 0
-                      ? FibonacciCapacityWithMinimum(forNextChunk)
-                      : 0;
-  }
-
-  // Write everything we can fit into the current chunk.
-  MOZ_ASSERT(currentChunkLength + forCurrentChunk <= currentChunkCapacity);
-  memcpy(currentChunkData + currentChunkLength, aData, forCurrentChunk);
-
-  // If there's something left, create a new chunk and write it there.
-  Maybe<Chunk> nextChunk;
-  if (forNextChunk > 0) {
-    MOZ_ASSERT(nextChunkCapacity >= forNextChunk, "Next chunk too small?");
-    nextChunk = CreateChunk(nextChunkCapacity);
-    if (MOZ_LIKELY(nextChunk && !nextChunk->AllocationFailed())) {
-      memcpy(nextChunk->Data(), aData + forCurrentChunk, forNextChunk);
-      nextChunk->AddLength(forNextChunk);
-    }
-  }
-
-  // Update shared data structures.
-  {
-    MutexAutoLock lock(mMutex);
-
-    // Update the length of the current chunk.
-    Chunk& currentChunk = mChunks.LastElement();
-    MOZ_ASSERT(currentChunk.Data() == currentChunkData, "Multiple producers?");
-    MOZ_ASSERT(currentChunk.Length() == currentChunkLength,
-               "Multiple producers?");
-
-    currentChunk.AddLength(forCurrentChunk);
-
-    // If we created a new chunk, add it to the series.
-    if (forNextChunk > 0) {
-      if (MOZ_UNLIKELY(!nextChunk)) {
-        return HandleError(NS_ERROR_OUT_OF_MEMORY);
-      }
-
-      if (MOZ_UNLIKELY(NS_FAILED(AppendChunk(Move(nextChunk))))) {
-        return HandleError(NS_ERROR_OUT_OF_MEMORY);
-      }
-    }
-
-    // Resume any waiting readers now that there's new data.
-    ResumeWaitingConsumers();
-  }
-
-  return NS_OK;
-}
-
-void
-SourceBuffer::Complete(nsresult aStatus)
-{
-  MutexAutoLock lock(mMutex);
-
-  if (MOZ_UNLIKELY(mStatus)) {
-    MOZ_ASSERT_UNREACHABLE("Called Complete more than once");
-    return;
-  }
-
-  if (MOZ_UNLIKELY(NS_SUCCEEDED(aStatus) && IsEmpty())) {
-    // It's illegal to succeed without writing anything.
-    aStatus = NS_ERROR_FAILURE;
-  }
-
-  mStatus = Some(aStatus);
-
-  // Resume any waiting consumers now that we're complete.
-  ResumeWaitingConsumers();
-
-  // If we still have active consumers, just return.
-  if (mConsumerCount > 0) {
-    return;
-  }
-
-  // Attempt to compact our buffer down to a single chunk.
-  Compact();
-}
-
-bool
-SourceBuffer::IsComplete()
-{
-  MutexAutoLock lock(mMutex);
-  return bool(mStatus);
-}
-
-size_t
-SourceBuffer::SizeOfIncludingThisWithComputedFallback(MallocSizeOf
-                                                        aMallocSizeOf) const
-{
-  MutexAutoLock lock(mMutex);
-
-  size_t n = aMallocSizeOf(this);
-  n += mChunks.SizeOfExcludingThis(aMallocSizeOf);
-
-  for (uint32_t i = 0 ; i < mChunks.Length() ; ++i) {
-    size_t chunkSize = aMallocSizeOf(mChunks[i].Data());
-
-    if (chunkSize == 0) {
-      // We're on a platform where moz_malloc_size_of always returns 0.
-      chunkSize = mChunks[i].Capacity();
-    }
-
-    n += chunkSize;
-  }
-
-  return n;
-}
-
-SourceBufferIterator
-SourceBuffer::Iterator()
-{
-  {
-    MutexAutoLock lock(mMutex);
-    mConsumerCount++;
-  }
-
-  return SourceBufferIterator(this);
-}
-
-void
-SourceBuffer::OnIteratorRelease()
-{
-  MutexAutoLock lock(mMutex);
-
-  MOZ_ASSERT(mConsumerCount > 0, "Consumer count doesn't add up");
-  mConsumerCount--;
-
-  // If we still have active consumers, or we're not complete yet, then return.
-  if (mConsumerCount > 0 || !mStatus) {
-    return;
-  }
-
-  // Attempt to compact our buffer down to a single chunk.
-  Compact();
-}
-
-bool
-SourceBuffer::RemainingBytesIsNoMoreThan(const SourceBufferIterator& aIterator,
-                                         size_t aBytes) const
-{
-  MutexAutoLock lock(mMutex);
-
-  // If we're not complete, we always say no.
-  if (!mStatus) {
-    return false;
-  }
-
-  // If the iterator's at the end, the answer is trivial.
-  if (!aIterator.HasMore()) {
-    return true;
-  }
-
-  uint32_t iteratorChunk = aIterator.mData.mIterating.mChunk;
-  size_t iteratorOffset = aIterator.mData.mIterating.mOffset;
-  size_t iteratorLength = aIterator.mData.mIterating.mLength;
-
-  // Include the bytes the iterator is currently pointing to in the limit, so
-  // that the current chunk doesn't have to be a special case.
-  size_t bytes = aBytes + iteratorOffset + iteratorLength;
-
-  // Count the length over all of our chunks, starting with the one that the
-  // iterator is currently pointing to. (This is O(N), but N is expected to be
-  // ~1, so it doesn't seem worth caching the length separately.)
-  size_t lengthSoFar = 0;
-  for (uint32_t i = iteratorChunk ; i < mChunks.Length() ; ++i) {
-    lengthSoFar += mChunks[i].Length();
-    if (lengthSoFar > bytes) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-SourceBufferIterator::State
-SourceBuffer::AdvanceIteratorOrScheduleResume(SourceBufferIterator& aIterator,
-                                              IResumable* aConsumer)
-{
-  MutexAutoLock lock(mMutex);
-
-  if (MOZ_UNLIKELY(!aIterator.HasMore())) {
-    MOZ_ASSERT_UNREACHABLE("Should not advance a completed iterator");
-    return SourceBufferIterator::COMPLETE;
-  }
-
-  if (MOZ_UNLIKELY(mStatus && NS_FAILED(*mStatus))) {
-    // This SourceBuffer is complete due to an error; all reads fail.
-    return aIterator.SetComplete(*mStatus);
-  }
-
-  if (MOZ_UNLIKELY(mChunks.Length() == 0)) {
-    // We haven't gotten an initial chunk yet.
-    AddWaitingConsumer(aConsumer);
-    return aIterator.SetWaiting();
-  }
-
-  uint32_t iteratorChunkIdx = aIterator.mData.mIterating.mChunk;
-  MOZ_ASSERT(iteratorChunkIdx < mChunks.Length());
-
-  const Chunk& currentChunk = mChunks[iteratorChunkIdx];
-  size_t iteratorEnd = aIterator.mData.mIterating.mOffset +
-                       aIterator.mData.mIterating.mLength;
-  MOZ_ASSERT(iteratorEnd <= currentChunk.Length());
-  MOZ_ASSERT(iteratorEnd <= currentChunk.Capacity());
-
-  if (iteratorEnd < currentChunk.Length()) {
-    // There's more data in the current chunk.
-    return aIterator.SetReady(iteratorChunkIdx, currentChunk.Data(),
-                              iteratorEnd, currentChunk.Length() - iteratorEnd);
-  }
-
-  if (iteratorEnd == currentChunk.Capacity() &&
-      !IsLastChunk(iteratorChunkIdx)) {
-    // Advance to the next chunk.
-    const Chunk& nextChunk = mChunks[iteratorChunkIdx + 1];
-    return aIterator.SetReady(iteratorChunkIdx + 1, nextChunk.Data(), 0,
-                              nextChunk.Length());
-  }
-
-  MOZ_ASSERT(IsLastChunk(iteratorChunkIdx), "Should've advanced");
-
-  if (mStatus) {
-    // There's no more data and this SourceBuffer completed successfully.
-    MOZ_ASSERT(NS_SUCCEEDED(*mStatus), "Handled failures earlier");
-    return aIterator.SetComplete(*mStatus);
-  }
-
-  // We're not complete, but there's no more data right now. Arrange to wake up
-  // the consumer when we get more data.
-  AddWaitingConsumer(aConsumer);
-  return aIterator.SetWaiting();
-}
-
-nsresult
-SourceBuffer::HandleError(nsresult aError)
-{
-  MOZ_ASSERT(NS_FAILED(aError), "Should have an error here");
-  MOZ_ASSERT(aError == NS_ERROR_OUT_OF_MEMORY,
-             "Unexpected error; may want to notify waiting readers, which "
-             "HandleError currently doesn't do");
-
-  mMutex.AssertCurrentThreadOwns();
-
-  NS_WARNING("SourceBuffer encountered an unrecoverable error");
-
-  // Record the error.
-  mStatus = Some(aError);
-
-  // Drop our references to waiting readers.
-  mWaitingConsumers.Clear();
-
-  return *mStatus;
-}
-
-bool
-SourceBuffer::IsEmpty()
-{
-  mMutex.AssertCurrentThreadOwns();
-  return mChunks.Length() == 0 ||
-         mChunks[0].Length() == 0;
-}
-
-bool
-SourceBuffer::IsLastChunk(uint32_t aChunk)
-{
-  mMutex.AssertCurrentThreadOwns();
-  return aChunk + 1 == mChunks.Length();
-}
-
-} // namespace image
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/SourceBuffer.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/SourceBuffer.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/SourceBuffer.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/SourceBuffer.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,382 +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/. */
-
-/**
- * SourceBuffer is a single producer, multiple consumer data structure used for
- * storing image source (compressed) data.
- */
-
-#ifndef mozilla_image_src_sourcebuffer_h
-#define mozilla_image_src_sourcebuffer_h
-
-#include "mozilla/Maybe.h"
-#include "mozilla/MemoryReporting.h"
-#include "mozilla/Mutex.h"
-#include "mozilla/Move.h"
-#include "mozilla/MemoryReporting.h"
-#include "mozilla/RefPtr.h"
-#include "mozilla/UniquePtr.h"
-#include "nsRefPtr.h"
-#include "nsTArray.h"
-
-namespace mozilla {
-namespace image {
-
-class SourceBuffer;
-
-/**
- * IResumable is an interface for classes that can schedule themselves to resume
- * their work later. An implementation of IResumable generally should post a
- * runnable to some event target which continues the work of the task.
- */
-struct IResumable
-{
-  MOZ_DECLARE_REFCOUNTED_TYPENAME(IResumable)
-
-  // Subclasses may or may not be XPCOM classes, so we just require that they
-  // implement AddRef and Release.
-  NS_IMETHOD_(MozExternalRefCountType) AddRef(void) = 0;
-  NS_IMETHOD_(MozExternalRefCountType) Release(void) = 0;
-
-  virtual void Resume() = 0;
-
-protected:
-  virtual ~IResumable() { }
-};
-
-/**
- * SourceBufferIterator is a class that allows consumers of image source data to
- * read the contents of a SourceBuffer sequentially.
- *
- * Consumers can advance through the SourceBuffer by calling
- * AdvanceOrScheduleResume() repeatedly. After every advance, they should call
- * check the return value, which will tell them the iterator's new state.
- *
- * If WAITING is returned, AdvanceOrScheduleResume() has arranged
- * to call the consumer's Resume() method later, so the consumer should save its
- * state if needed and stop running.
- *
- * If the iterator's new state is READY, then the consumer can call Data() and
- * Length() to read new data from the SourceBuffer.
- *
- * Finally, in the COMPLETE state the consumer can call CompletionStatus() to
- * get the status passed to SourceBuffer::Complete().
- */
-class SourceBufferIterator final
-{
-public:
-  enum State {
-    START,    // The iterator is at the beginning of the buffer.
-    READY,    // The iterator is pointing to new data.
-    WAITING,  // The iterator is blocked and the caller must yield.
-    COMPLETE  // The iterator is pointing to the end of the buffer.
-  };
-
-  explicit SourceBufferIterator(SourceBuffer* aOwner)
-    : mOwner(aOwner)
-    , mState(START)
-  {
-    MOZ_ASSERT(aOwner);
-    mData.mIterating.mChunk = 0;
-    mData.mIterating.mData = nullptr;
-    mData.mIterating.mOffset = 0;
-    mData.mIterating.mLength = 0;
-  }
-
-  SourceBufferIterator(SourceBufferIterator&& aOther)
-    : mOwner(Move(aOther.mOwner))
-    , mState(aOther.mState)
-    , mData(aOther.mData)
-  { }
-
-  ~SourceBufferIterator();
-
-  SourceBufferIterator& operator=(SourceBufferIterator&& aOther)
-  {
-    mOwner = Move(aOther.mOwner);
-    mState = aOther.mState;
-    mData = aOther.mData;
-    return *this;
-  }
-
-  /**
-   * Returns true if there are no more than @aBytes remaining in the
-   * SourceBuffer. If the SourceBuffer is not yet complete, returns false.
-   */
-  bool RemainingBytesIsNoMoreThan(size_t aBytes) const;
-
-  /**
-   * Advances the iterator through the SourceBuffer if possible. If not,
-   * arranges to call the @aConsumer's Resume() method when more data is
-   * available.
-   */
-  State AdvanceOrScheduleResume(IResumable* aConsumer);
-
-  /// If at the end, returns the status passed to SourceBuffer::Complete().
-  nsresult CompletionStatus() const
-  {
-    MOZ_ASSERT(mState == COMPLETE,
-               "Calling CompletionStatus() in the wrong state");
-    return mState == COMPLETE ? mData.mAtEnd.mStatus : NS_OK;
-  }
-
-  /// If we're ready to read, returns a pointer to the new data.
-  const char* Data() const
-  {
-    MOZ_ASSERT(mState == READY, "Calling Data() in the wrong state");
-    return mState == READY ? mData.mIterating.mData + mData.mIterating.mOffset
-                           : nullptr;
-  }
-
-  /// If we're ready to read, returns the length of the new data.
-  size_t Length() const
-  {
-    MOZ_ASSERT(mState == READY, "Calling Length() in the wrong state");
-    return mState == READY ? mData.mIterating.mLength : 0;
-  }
-
-private:
-  friend class SourceBuffer;
-
-  SourceBufferIterator(const SourceBufferIterator&) = delete;
-  SourceBufferIterator& operator=(const SourceBufferIterator&) = delete;
-
-  bool HasMore() const { return mState != COMPLETE; }
-
-  State SetReady(uint32_t aChunk, const char* aData,
-                size_t aOffset, size_t aLength)
-  {
-    MOZ_ASSERT(mState != COMPLETE);
-    mData.mIterating.mChunk = aChunk;
-    mData.mIterating.mData = aData;
-    mData.mIterating.mOffset = aOffset;
-    mData.mIterating.mLength = aLength;
-    return mState = READY;
-  }
-
-  State SetWaiting()
-  {
-    MOZ_ASSERT(mState != COMPLETE);
-    MOZ_ASSERT(mState != WAITING, "Did we get a spurious wakeup somehow?");
-    return mState = WAITING;
-  }
-
-  State SetComplete(nsresult aStatus)
-  {
-    mData.mAtEnd.mStatus = aStatus;
-    return mState = COMPLETE;
-  }
-
-  nsRefPtr<SourceBuffer> mOwner;
-
-  State mState;
-
-  /**
-   * This union contains our iteration state if we're still iterating (for
-   * states START, READY, and WAITING) and the status the SourceBuffer was
-   * completed with if we're in state COMPLETE.
-   */
-  union {
-    struct {
-      uint32_t mChunk;
-      const char* mData;
-      size_t mOffset;
-      size_t mLength;
-    } mIterating;
-    struct {
-      nsresult mStatus;
-    } mAtEnd;
-  } mData;
-};
-
-/**
- * SourceBuffer is a parallel data structure used for storing image source
- * (compressed) data.
- *
- * SourceBuffer is a single producer, multiple consumer data structure. The
- * single producer calls Append() to append data to the buffer. In parallel,
- * multiple consumers can call Iterator(), which returns a SourceBufferIterator
- * that they can use to iterate through the buffer. The SourceBufferIterator
- * returns a series of pointers which remain stable for lifetime of the
- * SourceBuffer, and the data they point to is immutable, ensuring that the
- * producer never interferes with the consumers.
- *
- * In order to avoid blocking, SourceBuffer works with SourceBufferIterator to
- * keep a list of consumers which are waiting for new data, and to resume them
- * when the producer appends more. All consumers must implement the IResumable
- * interface to make this possible.
- *
- * XXX(seth): We should add support for compacting a SourceBuffer. To do this,
- * we need to have SourceBuffer keep track of how many live
- * SourceBufferIterator's point to it. When the SourceBuffer is complete and no
- * live SourceBufferIterator's for it remain, we can compact its contents into a
- * single chunk.
- */
-class SourceBuffer final
-{
-public:
-  MOZ_DECLARE_REFCOUNTED_TYPENAME(image::SourceBuffer)
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(image::SourceBuffer)
-
-  SourceBuffer();
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Producer methods.
-  //////////////////////////////////////////////////////////////////////////////
-
-  /**
-   * If the producer knows how long the source data will be, it should call
-   * ExpectLength, which enables SourceBuffer to preallocate its buffer.
-   */
-  nsresult ExpectLength(size_t aExpectedLength);
-
-  /// Append the provided data to the buffer.
-  nsresult Append(const char* aData, size_t aLength);
-
-  /**
-   * Mark the buffer complete, with a status that will be available to
-   * consumers. Further calls to Append() are forbidden after Complete().
-   */
-  void Complete(nsresult aStatus);
-
-  /// Returns true if the buffer is complete.
-  bool IsComplete();
-
-  /// Memory reporting.
-  size_t SizeOfIncludingThisWithComputedFallback(MallocSizeOf) const;
-
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Consumer methods.
-  //////////////////////////////////////////////////////////////////////////////
-
-  /// Returns an iterator to this SourceBuffer.
-  SourceBufferIterator Iterator();
-
-
-private:
-  friend class SourceBufferIterator;
-
-  ~SourceBuffer();
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Chunk type and chunk-related methods.
-  //////////////////////////////////////////////////////////////////////////////
-
-  class Chunk
-  {
-  public:
-    explicit Chunk(size_t aCapacity)
-      : mCapacity(aCapacity)
-      , mLength(0)
-    {
-      MOZ_ASSERT(aCapacity > 0, "Creating zero-capacity chunk");
-      mData = new (fallible) char[mCapacity];
-    }
-
-    ~Chunk() { delete[] mData; }
-
-    Chunk(Chunk&& aOther)
-      : mCapacity(aOther.mCapacity)
-      , mLength(aOther.mLength)
-      , mData(aOther.mData)
-    {
-      aOther.mCapacity = aOther.mLength = 0;
-      aOther.mData = nullptr;
-    }
-
-    Chunk& operator=(Chunk&& aOther)
-    {
-      mCapacity = aOther.mCapacity;
-      mLength = aOther.mLength;
-      mData = aOther.mData;
-      aOther.mCapacity = aOther.mLength = 0;
-      aOther.mData = nullptr;
-      return *this;
-    }
-
-    bool AllocationFailed() const { return !mData; }
-    size_t Capacity() const { return mCapacity; }
-    size_t Length() const { return mLength; }
-
-    char* Data() const
-    {
-      MOZ_ASSERT(mData, "Allocation failed but nobody checked for it");
-      return mData;
-    }
-
-    void AddLength(size_t aAdditionalLength)
-    {
-      MOZ_ASSERT(mLength + aAdditionalLength <= mCapacity);
-      mLength += aAdditionalLength;
-    }
-
-  private:
-    Chunk(const Chunk&) = delete;
-    Chunk& operator=(const Chunk&) = delete;
-
-    size_t mCapacity;
-    size_t mLength;
-    char* mData;
-  };
-
-  nsresult AppendChunk(Maybe<Chunk>&& aChunk);
-  Maybe<Chunk> CreateChunk(size_t aCapacity, bool aRoundUp = true);
-  nsresult Compact();
-  static size_t RoundedUpCapacity(size_t aCapacity);
-  size_t FibonacciCapacityWithMinimum(size_t aMinCapacity);
-
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Iterator / consumer methods.
-  //////////////////////////////////////////////////////////////////////////////
-
-  void AddWaitingConsumer(IResumable* aConsumer);
-  void ResumeWaitingConsumers();
-
-  typedef SourceBufferIterator::State State;
-
-  State AdvanceIteratorOrScheduleResume(SourceBufferIterator& aIterator,
-                                        IResumable* aConsumer);
-  bool RemainingBytesIsNoMoreThan(const SourceBufferIterator& aIterator,
-                                  size_t aBytes) const;
-
-  void OnIteratorRelease();
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Helper methods.
-  //////////////////////////////////////////////////////////////////////////////
-
-  nsresult HandleError(nsresult aError);
-  bool IsEmpty();
-  bool IsLastChunk(uint32_t aChunk);
-
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Member variables.
-  //////////////////////////////////////////////////////////////////////////////
-
-  static const size_t MIN_CHUNK_CAPACITY = 4096;
-
-  /// All private members are protected by mMutex.
-  mutable Mutex mMutex;
-
-  /// The data in this SourceBuffer, stored as a series of Chunks.
-  FallibleTArray<Chunk> mChunks;
-
-  /// Consumers which are waiting to be notified when new data is available.
-  nsTArray<nsRefPtr<IResumable>> mWaitingConsumers;
-
-  /// If present, marks this SourceBuffer complete with the given final status.
-  Maybe<nsresult> mStatus;
-
-  /// Count of active consumers.
-  uint32_t mConsumerCount;
-};
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_sourcebuffer_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/SurfaceCache.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/SurfaceCache.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/SurfaceCache.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/SurfaceCache.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,1101 +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/. */
-
-/**
- * SurfaceCache is a service for caching temporary surfaces in imagelib.
- */
-
-#include "SurfaceCache.h"
-
-#include <algorithm>
-#include "mozilla/Assertions.h"
-#include "mozilla/Attributes.h"
-#include "mozilla/DebugOnly.h"
-#include "mozilla/Likely.h"
-#include "mozilla/Move.h"
-#include "mozilla/Mutex.h"
-#include "mozilla/RefPtr.h"
-#include "mozilla/StaticPtr.h"
-#include "nsIMemoryReporter.h"
-#include "gfx2DGlue.h"
-#include "gfxPattern.h"  // Workaround for flaw in bug 921753 part 2.
-#include "gfxPlatform.h"
-#include "gfxPrefs.h"
-#include "imgFrame.h"
-#include "Image.h"
-#include "nsAutoPtr.h"
-#include "nsExpirationTracker.h"
-#include "nsHashKeys.h"
-#include "nsRefPtrHashtable.h"
-#include "nsSize.h"
-#include "nsTArray.h"
-#include "prsystem.h"
-#include "ShutdownTracker.h"
-#include "SVGImageContext.h"
-
-using std::max;
-using std::min;
-
-namespace mozilla {
-
-using namespace gfx;
-
-namespace image {
-
-class CachedSurface;
-class SurfaceCacheImpl;
-
-///////////////////////////////////////////////////////////////////////////////
-// Static Data
-///////////////////////////////////////////////////////////////////////////////
-
-// The single surface cache instance.
-static StaticRefPtr<SurfaceCacheImpl> sInstance;
-
-///////////////////////////////////////////////////////////////////////////////
-// SurfaceCache Implementation
-///////////////////////////////////////////////////////////////////////////////
-
-/**
- * Cost models the cost of storing a surface in the cache. Right now, this is
- * simply an estimate of the size of the surface in bytes, but in the future it
- * may be worth taking into account the cost of rematerializing the surface as
- * well.
- */
-typedef size_t Cost;
-
-static Cost
-ComputeCost(const IntSize& aSize, uint32_t aBytesPerPixel)
-{
-  MOZ_ASSERT(aBytesPerPixel == 1 || aBytesPerPixel == 4);
-  return aSize.width * aSize.height * aBytesPerPixel;
-}
-
-/**
- * Since we want to be able to make eviction decisions based on cost, we need to
- * be able to look up the CachedSurface which has a certain cost as well as the
- * cost associated with a certain CachedSurface. To make this possible, in data
- * structures we actually store a CostEntry, which contains a weak pointer to
- * its associated surface.
- *
- * To make usage of the weak pointer safe, SurfaceCacheImpl always calls
- * StartTracking after a surface is stored in the cache and StopTracking before
- * it is removed.
- */
-class CostEntry
-{
-public:
-  CostEntry(CachedSurface* aSurface, Cost aCost)
-    : mSurface(aSurface)
-    , mCost(aCost)
-  {
-    MOZ_ASSERT(aSurface, "Must have a surface");
-  }
-
-  CachedSurface* GetSurface() const { return mSurface; }
-  Cost GetCost() const { return mCost; }
-
-  bool operator==(const CostEntry& aOther) const
-  {
-    return mSurface == aOther.mSurface &&
-           mCost == aOther.mCost;
-  }
-
-  bool operator<(const CostEntry& aOther) const
-  {
-    return mCost < aOther.mCost ||
-           (mCost == aOther.mCost && mSurface < aOther.mSurface);
-  }
-
-private:
-  CachedSurface* mSurface;
-  Cost           mCost;
-};
-
-/**
- * A CachedSurface associates a surface with a key that uniquely identifies that
- * surface.
- */
-class CachedSurface
-{
-  ~CachedSurface() { }
-public:
-  MOZ_DECLARE_REFCOUNTED_TYPENAME(CachedSurface)
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(CachedSurface)
-
-  CachedSurface(imgFrame*          aSurface,
-                const Cost         aCost,
-                const ImageKey     aImageKey,
-                const SurfaceKey&  aSurfaceKey,
-                const Lifetime     aLifetime)
-    : mSurface(aSurface)
-    , mCost(aCost)
-    , mImageKey(aImageKey)
-    , mSurfaceKey(aSurfaceKey)
-    , mLifetime(aLifetime)
-  {
-    MOZ_ASSERT(mSurface, "Must have a valid surface");
-    MOZ_ASSERT(mImageKey, "Must have a valid image key");
-  }
-
-  DrawableFrameRef DrawableRef() const
-  {
-    return mSurface->DrawableRef();
-  }
-
-  void SetLocked(bool aLocked)
-  {
-    if (aLocked && mLifetime == Lifetime::Persistent) {
-      // This may fail, and that's OK. We make no guarantees about whether
-      // locking is successful if you call SurfaceCache::LockImage() after
-      // SurfaceCache::Insert().
-      mDrawableRef = mSurface->DrawableRef();
-    } else {
-      mDrawableRef.reset();
-    }
-  }
-
-  bool IsLocked() const { return bool(mDrawableRef); }
-
-  ImageKey GetImageKey() const { return mImageKey; }
-  SurfaceKey GetSurfaceKey() const { return mSurfaceKey; }
-  CostEntry GetCostEntry() { return image::CostEntry(this, mCost); }
-  nsExpirationState* GetExpirationState() { return &mExpirationState; }
-  Lifetime GetLifetime() const { return mLifetime; }
-  bool IsDecoded() const { return mSurface->IsImageComplete(); }
-
-  // A helper type used by SurfaceCacheImpl::CollectSizeOfSurfaces.
-  struct MOZ_STACK_CLASS SurfaceMemoryReport
-  {
-    SurfaceMemoryReport(nsTArray<SurfaceMemoryCounter>& aCounters,
-                        MallocSizeOf                    aMallocSizeOf)
-      : mCounters(aCounters)
-      , mMallocSizeOf(aMallocSizeOf)
-    { }
-
-    void Add(CachedSurface* aCachedSurface)
-    {
-      MOZ_ASSERT(aCachedSurface, "Should have a CachedSurface");
-
-      SurfaceMemoryCounter counter(aCachedSurface->GetSurfaceKey(),
-                                   aCachedSurface->IsLocked());
-
-      if (aCachedSurface->mSurface) {
-        counter.SubframeSize() = Some(aCachedSurface->mSurface->GetSize());
-
-        size_t heap = aCachedSurface->mSurface
-          ->SizeOfExcludingThis(gfxMemoryLocation::IN_PROCESS_HEAP,
-                                mMallocSizeOf);
-        counter.Values().SetDecodedHeap(heap);
-
-        size_t nonHeap = aCachedSurface->mSurface
-          ->SizeOfExcludingThis(gfxMemoryLocation::IN_PROCESS_NONHEAP, nullptr);
-        counter.Values().SetDecodedNonHeap(nonHeap);
-      }
-
-      mCounters.AppendElement(counter);
-    }
-
-  private:
-    nsTArray<SurfaceMemoryCounter>& mCounters;
-    MallocSizeOf                    mMallocSizeOf;
-  };
-
-private:
-  nsExpirationState  mExpirationState;
-  nsRefPtr<imgFrame> mSurface;
-  DrawableFrameRef   mDrawableRef;
-  const Cost         mCost;
-  const ImageKey     mImageKey;
-  const SurfaceKey   mSurfaceKey;
-  const Lifetime     mLifetime;
-};
-
-/**
- * An ImageSurfaceCache is a per-image surface cache. For correctness we must be
- * able to remove all surfaces associated with an image when the image is
- * destroyed or invalidated. Since this will happen frequently, it makes sense
- * to make it cheap by storing the surfaces for each image separately.
- *
- * ImageSurfaceCache also keeps track of whether its associated image is locked
- * or unlocked.
- */
-class ImageSurfaceCache
-{
-  ~ImageSurfaceCache() { }
-public:
-  ImageSurfaceCache() : mLocked(false) { }
-
-  MOZ_DECLARE_REFCOUNTED_TYPENAME(ImageSurfaceCache)
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(ImageSurfaceCache)
-
-  typedef
-    nsRefPtrHashtable<nsGenericHashKey<SurfaceKey>, CachedSurface> SurfaceTable;
-
-  bool IsEmpty() const { return mSurfaces.Count() == 0; }
-
-  void Insert(const SurfaceKey& aKey, CachedSurface* aSurface)
-  {
-    MOZ_ASSERT(aSurface, "Should have a surface");
-    MOZ_ASSERT(!mLocked || aSurface->GetLifetime() != Lifetime::Persistent ||
-               aSurface->IsLocked(),
-               "Inserting an unlocked persistent surface for a locked image");
-    mSurfaces.Put(aKey, aSurface);
-  }
-
-  void Remove(CachedSurface* aSurface)
-  {
-    MOZ_ASSERT(aSurface, "Should have a surface");
-    MOZ_ASSERT(mSurfaces.GetWeak(aSurface->GetSurfaceKey()),
-        "Should not be removing a surface we don't have");
-
-    mSurfaces.Remove(aSurface->GetSurfaceKey());
-  }
-
-  already_AddRefed<CachedSurface> Lookup(const SurfaceKey& aSurfaceKey)
-  {
-    nsRefPtr<CachedSurface> surface;
-    mSurfaces.Get(aSurfaceKey, getter_AddRefs(surface));
-    return surface.forget();
-  }
-
-  already_AddRefed<CachedSurface>
-  LookupBestMatch(const SurfaceKey&      aSurfaceKey,
-                  const Maybe<uint32_t>& aAlternateFlags)
-  {
-    // Try for a perfect match first.
-    nsRefPtr<CachedSurface> surface;
-    mSurfaces.Get(aSurfaceKey, getter_AddRefs(surface));
-    if (surface && surface->IsDecoded()) {
-      return surface.forget();
-    }
-
-    // There's no perfect match, so find the best match we can.
-    MatchContext matchContext(aSurfaceKey, aAlternateFlags);
-    ForEach(TryToImproveMatch, &matchContext);
-    return matchContext.mBestMatch.forget();
-  }
-
-  void ForEach(SurfaceTable::EnumReadFunction aFunction, void* aData)
-  {
-    mSurfaces.EnumerateRead(aFunction, aData);
-  }
-
-  void SetLocked(bool aLocked) { mLocked = aLocked; }
-  bool IsLocked() const { return mLocked; }
-
-private:
-  struct MatchContext
-  {
-    MatchContext(const SurfaceKey& aIdealKey,
-                 const Maybe<uint32_t>& aAlternateFlags)
-      : mIdealKey(aIdealKey)
-      , mAlternateFlags(aAlternateFlags)
-    { }
-
-    const SurfaceKey& mIdealKey;
-    const Maybe<uint32_t> mAlternateFlags;
-    nsRefPtr<CachedSurface> mBestMatch;
-  };
-
-  static PLDHashOperator TryToImproveMatch(const SurfaceKey& aSurfaceKey,
-                                           CachedSurface*    aSurface,
-                                           void*             aContext)
-  {
-    auto context = static_cast<MatchContext*>(aContext);
-    const SurfaceKey& idealKey = context->mIdealKey;
-
-    // Matching the animation time and SVG context is required.
-    if (aSurfaceKey.AnimationTime() != idealKey.AnimationTime() ||
-        aSurfaceKey.SVGContext() != idealKey.SVGContext()) {
-      return PL_DHASH_NEXT;
-    }
-
-    // Matching the flags is required, but we can match the alternate flags as
-    // well if some were provided.
-    if (aSurfaceKey.Flags() != idealKey.Flags() &&
-        Some(aSurfaceKey.Flags()) != context->mAlternateFlags) {
-      return PL_DHASH_NEXT;
-    }
-
-    // Anything is better than nothing! (Within the constraints we just
-    // checked, of course.)
-    if (!context->mBestMatch) {
-      context->mBestMatch = aSurface;
-      return PL_DHASH_NEXT;
-    }
-
-    MOZ_ASSERT(context->mBestMatch, "Should have a current best match");
-
-    // Always prefer completely decoded surfaces.
-    bool bestMatchIsDecoded = context->mBestMatch->IsDecoded();
-    if (bestMatchIsDecoded && !aSurface->IsDecoded()) {
-      return PL_DHASH_NEXT;
-    }
-    if (!bestMatchIsDecoded && aSurface->IsDecoded()) {
-      context->mBestMatch = aSurface;
-      return PL_DHASH_NEXT;
-    }
-
-    SurfaceKey bestMatchKey = context->mBestMatch->GetSurfaceKey();
-
-    // Compare sizes. We use an area-based heuristic here instead of computing a
-    // truly optimal answer, since it seems very unlikely to make a difference
-    // for realistic sizes.
-    int64_t idealArea = idealKey.Size().width * idealKey.Size().height;
-    int64_t surfaceArea = aSurfaceKey.Size().width * aSurfaceKey.Size().height;
-    int64_t bestMatchArea =
-      bestMatchKey.Size().width * bestMatchKey.Size().height;
-
-    // If the best match is smaller than the ideal size, prefer bigger sizes.
-    if (bestMatchArea < idealArea) {
-      if (surfaceArea > bestMatchArea) {
-        context->mBestMatch = aSurface;
-      }
-      return PL_DHASH_NEXT;
-    }
-
-    // Other, prefer sizes closer to the ideal size, but still not smaller.
-    if (idealArea <= surfaceArea && surfaceArea < bestMatchArea) {
-      context->mBestMatch = aSurface;
-      return PL_DHASH_NEXT;
-    }
-
-    // This surface isn't an improvement over the current best match.
-    return PL_DHASH_NEXT;
-  }
-
-  SurfaceTable mSurfaces;
-  bool         mLocked;
-};
-
-/**
- * SurfaceCacheImpl is responsible for determining which surfaces will be cached
- * and managing the surface cache data structures. Rather than interact with
- * SurfaceCacheImpl directly, client code interacts with SurfaceCache, which
- * maintains high-level invariants and encapsulates the details of the surface
- * cache's implementation.
- */
-class SurfaceCacheImpl final : public nsIMemoryReporter
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  SurfaceCacheImpl(uint32_t aSurfaceCacheExpirationTimeMS,
-                   uint32_t aSurfaceCacheDiscardFactor,
-                   uint32_t aSurfaceCacheSize)
-    : mExpirationTracker(aSurfaceCacheExpirationTimeMS)
-    , mMemoryPressureObserver(new MemoryPressureObserver)
-    , mMutex("SurfaceCache")
-    , mDiscardFactor(aSurfaceCacheDiscardFactor)
-    , mMaxCost(aSurfaceCacheSize)
-    , mAvailableCost(aSurfaceCacheSize)
-    , mLockedCost(0)
-  {
-    nsCOMPtr<nsIObserverService> os = services::GetObserverService();
-    if (os) {
-      os->AddObserver(mMemoryPressureObserver, "memory-pressure", false);
-    }
-  }
-
-private:
-  virtual ~SurfaceCacheImpl()
-  {
-    nsCOMPtr<nsIObserverService> os = services::GetObserverService();
-    if (os) {
-      os->RemoveObserver(mMemoryPressureObserver, "memory-pressure");
-    }
-
-    UnregisterWeakMemoryReporter(this);
-  }
-
-public:
-  void InitMemoryReporter() { RegisterWeakMemoryReporter(this); }
-
-  Mutex& GetMutex() { return mMutex; }
-
-  InsertOutcome Insert(imgFrame*         aSurface,
-                       const Cost        aCost,
-                       const ImageKey    aImageKey,
-                       const SurfaceKey& aSurfaceKey,
-                       Lifetime          aLifetime)
-  {
-    // If this is a duplicate surface, refuse to replace the original.
-    if (MOZ_UNLIKELY(Lookup(aImageKey, aSurfaceKey))) {
-      return InsertOutcome::FAILURE_ALREADY_PRESENT;
-    }
-
-    // If this is bigger than we can hold after discarding everything we can,
-    // refuse to cache it.
-    if (MOZ_UNLIKELY(!CanHoldAfterDiscarding(aCost))) {
-      return InsertOutcome::FAILURE;
-    }
-
-    // Remove elements in order of cost until we can fit this in the cache. Note
-    // that locked surfaces aren't in mCosts, so we never remove them here.
-    while (aCost > mAvailableCost) {
-      MOZ_ASSERT(!mCosts.IsEmpty(),
-                 "Removed everything and it still won't fit");
-      Remove(mCosts.LastElement().GetSurface());
-    }
-
-    // Locate the appropriate per-image cache. If there's not an existing cache
-    // for this image, create it.
-    nsRefPtr<ImageSurfaceCache> cache = GetImageCache(aImageKey);
-    if (!cache) {
-      cache = new ImageSurfaceCache;
-      mImageCaches.Put(aImageKey, cache);
-    }
-
-    nsRefPtr<CachedSurface> surface =
-      new CachedSurface(aSurface, aCost, aImageKey, aSurfaceKey, aLifetime);
-
-    // We require that locking succeed if the image is locked and the surface is
-    // persistent; the caller may need to know this to handle errors correctly.
-    if (cache->IsLocked() && aLifetime == Lifetime::Persistent) {
-      surface->SetLocked(true);
-      if (!surface->IsLocked()) {
-        return InsertOutcome::FAILURE;
-      }
-    }
-
-    // Insert.
-    MOZ_ASSERT(aCost <= mAvailableCost, "Inserting despite too large a cost");
-    cache->Insert(aSurfaceKey, surface);
-    StartTracking(surface);
-
-    return InsertOutcome::SUCCESS;
-  }
-
-  void Remove(CachedSurface* aSurface)
-  {
-    MOZ_ASSERT(aSurface, "Should have a surface");
-    ImageKey imageKey = aSurface->GetImageKey();
-
-    nsRefPtr<ImageSurfaceCache> cache = GetImageCache(imageKey);
-    MOZ_ASSERT(cache, "Shouldn't try to remove a surface with no image cache");
-
-    // If the surface was persistent, tell its image that we discarded it.
-    if (aSurface->GetLifetime() == Lifetime::Persistent) {
-      static_cast<Image*>(imageKey)->OnSurfaceDiscarded();
-    }
-
-    StopTracking(aSurface);
-    cache->Remove(aSurface);
-
-    // Remove the per-image cache if it's unneeded now. (Keep it if the image is
-    // locked, since the per-image cache is where we store that state.)
-    if (cache->IsEmpty() && !cache->IsLocked()) {
-      mImageCaches.Remove(imageKey);
-    }
-  }
-
-  void StartTracking(CachedSurface* aSurface)
-  {
-    CostEntry costEntry = aSurface->GetCostEntry();
-    MOZ_ASSERT(costEntry.GetCost() <= mAvailableCost,
-               "Cost too large and the caller didn't catch it");
-
-    mAvailableCost -= costEntry.GetCost();
-
-    if (aSurface->IsLocked()) {
-      mLockedCost += costEntry.GetCost();
-      MOZ_ASSERT(mLockedCost <= mMaxCost, "Locked more than we can hold?");
-    } else {
-      mCosts.InsertElementSorted(costEntry);
-      // This may fail during XPCOM shutdown, so we need to ensure the object is
-      // tracked before calling RemoveObject in StopTracking.
-      mExpirationTracker.AddObject(aSurface);
-    }
-  }
-
-  void StopTracking(CachedSurface* aSurface)
-  {
-    MOZ_ASSERT(aSurface, "Should have a surface");
-    CostEntry costEntry = aSurface->GetCostEntry();
-
-    if (aSurface->IsLocked()) {
-      MOZ_ASSERT(mLockedCost >= costEntry.GetCost(), "Costs don't balance");
-      mLockedCost -= costEntry.GetCost();
-      // XXX(seth): It'd be nice to use an O(log n) lookup here. This is O(n).
-      MOZ_ASSERT(!mCosts.Contains(costEntry),
-                 "Shouldn't have a cost entry for a locked surface");
-    } else {
-      if (MOZ_LIKELY(aSurface->GetExpirationState()->IsTracked())) {
-        mExpirationTracker.RemoveObject(aSurface);
-      } else {
-        // Our call to AddObject must have failed in StartTracking; most likely
-        // we're in XPCOM shutdown right now.
-        NS_ASSERTION(ShutdownTracker::ShutdownHasStarted(),
-                     "Not expiration-tracking an unlocked surface!");
-      }
-
-      DebugOnly<bool> foundInCosts = mCosts.RemoveElementSorted(costEntry);
-      MOZ_ASSERT(foundInCosts, "Lost track of costs for this surface");
-    }
-
-    mAvailableCost += costEntry.GetCost();
-    MOZ_ASSERT(mAvailableCost <= mMaxCost,
-               "More available cost than we started with");
-  }
-
-  DrawableFrameRef Lookup(const ImageKey    aImageKey,
-                          const SurfaceKey& aSurfaceKey)
-  {
-    nsRefPtr<ImageSurfaceCache> cache = GetImageCache(aImageKey);
-    if (!cache) {
-      return DrawableFrameRef();  // No cached surfaces for this image.
-    }
-
-    nsRefPtr<CachedSurface> surface = cache->Lookup(aSurfaceKey);
-    if (!surface) {
-      return DrawableFrameRef();  // Lookup in the per-image cache missed.
-    }
-
-    DrawableFrameRef ref = surface->DrawableRef();
-    if (!ref) {
-      // The surface was released by the operating system. Remove the cache
-      // entry as well.
-      Remove(surface);
-      return DrawableFrameRef();
-    }
-
-    if (cache->IsLocked()) {
-      LockSurface(surface);
-    } else {
-      mExpirationTracker.MarkUsed(surface);
-    }
-
-    return ref;
-  }
-
-  DrawableFrameRef LookupBestMatch(const ImageKey         aImageKey,
-                                   const SurfaceKey&      aSurfaceKey,
-                                   const Maybe<uint32_t>& aAlternateFlags)
-  {
-    nsRefPtr<ImageSurfaceCache> cache = GetImageCache(aImageKey);
-    if (!cache) {
-      return DrawableFrameRef();  // No cached surfaces for this image.
-    }
-
-    // Repeatedly look up the best match, trying again if the resulting surface
-    // has been freed by the operating system, until we can either lock a
-    // surface for drawing or there are no matching surfaces left.
-    // XXX(seth): This is O(N^2), but N is expected to be very small. If we
-    // encounter a performance problem here we can revisit this.
-
-    nsRefPtr<CachedSurface> surface;
-    DrawableFrameRef ref;
-    while (true) {
-      surface = cache->LookupBestMatch(aSurfaceKey, aAlternateFlags);
-      if (!surface) {
-        return DrawableFrameRef();  // Lookup in the per-image cache missed.
-      }
-
-      ref = surface->DrawableRef();
-      if (ref) {
-        break;
-      }
-
-      // The surface was released by the operating system. Remove the cache
-      // entry as well.
-      Remove(surface);
-    }
-
-    if (cache->IsLocked()) {
-      LockSurface(surface);
-    } else {
-      mExpirationTracker.MarkUsed(surface);
-    }
-
-    return ref;
-  }
-
-  void RemoveSurface(const ImageKey    aImageKey,
-                     const SurfaceKey& aSurfaceKey)
-  {
-    nsRefPtr<ImageSurfaceCache> cache = GetImageCache(aImageKey);
-    if (!cache) {
-      return;  // No cached surfaces for this image.
-    }
-
-    nsRefPtr<CachedSurface> surface = cache->Lookup(aSurfaceKey);
-    if (!surface) {
-      return;  // Lookup in the per-image cache missed.
-    }
-
-    Remove(surface);
-  }
-
-  bool CanHold(const Cost aCost) const
-  {
-    return aCost <= mMaxCost;
-  }
-
-  void LockImage(const ImageKey aImageKey)
-  {
-    nsRefPtr<ImageSurfaceCache> cache = GetImageCache(aImageKey);
-    if (!cache) {
-      cache = new ImageSurfaceCache;
-      mImageCaches.Put(aImageKey, cache);
-    }
-
-    cache->SetLocked(true);
-
-    // We don't relock this image's existing surfaces right away; instead, the
-    // image should arrange for Lookup() to touch them if they are still useful.
-  }
-
-  void UnlockImage(const ImageKey aImageKey)
-  {
-    nsRefPtr<ImageSurfaceCache> cache = GetImageCache(aImageKey);
-    if (!cache || !cache->IsLocked()) {
-      return;  // Already unlocked.
-    }
-
-    cache->SetLocked(false);
-
-    // Unlock all the surfaces the per-image cache is holding.
-    cache->ForEach(DoUnlockSurface, this);
-  }
-
-  void UnlockSurfaces(const ImageKey aImageKey)
-  {
-    nsRefPtr<ImageSurfaceCache> cache = GetImageCache(aImageKey);
-    if (!cache || !cache->IsLocked()) {
-      return;  // Already unlocked.
-    }
-
-    // (Note that we *don't* unlock the per-image cache here; that's the
-    // difference between this and UnlockImage.)
-
-    // Unlock all the surfaces the per-image cache is holding.
-    cache->ForEach(DoUnlockSurface, this);
-  }
-
-  void RemoveImage(const ImageKey aImageKey)
-  {
-    nsRefPtr<ImageSurfaceCache> cache = GetImageCache(aImageKey);
-    if (!cache) {
-      return;  // No cached surfaces for this image, so nothing to do.
-    }
-
-    // Discard all of the cached surfaces for this image.
-    // XXX(seth): This is O(n^2) since for each item in the cache we are
-    // removing an element from the costs array. Since n is expected to be
-    // small, performance should be good, but if usage patterns change we should
-    // change the data structure used for mCosts.
-    cache->ForEach(DoStopTracking, this);
-
-    // The per-image cache isn't needed anymore, so remove it as well.
-    // This implicitly unlocks the image if it was locked.
-    mImageCaches.Remove(aImageKey);
-  }
-
-  void DiscardAll()
-  {
-    // Remove in order of cost because mCosts is an array and the other data
-    // structures are all hash tables. Note that locked surfaces (persistent
-    // surfaces belonging to locked images) are not removed, since they aren't
-    // present in mCosts.
-    while (!mCosts.IsEmpty()) {
-      Remove(mCosts.LastElement().GetSurface());
-    }
-  }
-
-  void DiscardForMemoryPressure()
-  {
-    // Compute our discardable cost. Since locked surfaces aren't discardable,
-    // we exclude them.
-    const Cost discardableCost = (mMaxCost - mAvailableCost) - mLockedCost;
-    MOZ_ASSERT(discardableCost <= mMaxCost, "Discardable cost doesn't add up");
-
-    // Our target is to raise our available cost by (1 / mDiscardFactor) of our
-    // discardable cost - in other words, we want to end up with about
-    // (discardableCost / mDiscardFactor) fewer bytes stored in the surface
-    // cache after we're done.
-    const Cost targetCost = mAvailableCost + (discardableCost / mDiscardFactor);
-
-    if (targetCost > mMaxCost - mLockedCost) {
-      MOZ_ASSERT_UNREACHABLE("Target cost is more than we can discard");
-      DiscardAll();
-      return;
-    }
-
-    // Discard surfaces until we've reduced our cost to our target cost.
-    while (mAvailableCost < targetCost) {
-      MOZ_ASSERT(!mCosts.IsEmpty(), "Removed everything and still not done");
-      Remove(mCosts.LastElement().GetSurface());
-    }
-  }
-
-  void LockSurface(CachedSurface* aSurface)
-  {
-    if (aSurface->GetLifetime() == Lifetime::Transient ||
-        aSurface->IsLocked()) {
-      return;
-    }
-
-    StopTracking(aSurface);
-
-    // Lock the surface. This can fail.
-    aSurface->SetLocked(true);
-    StartTracking(aSurface);
-  }
-
-  static PLDHashOperator DoStopTracking(const SurfaceKey&,
-                                        CachedSurface*    aSurface,
-                                        void*             aCache)
-  {
-    static_cast<SurfaceCacheImpl*>(aCache)->StopTracking(aSurface);
-    return PL_DHASH_NEXT;
-  }
-
-  static PLDHashOperator DoUnlockSurface(const SurfaceKey&,
-                                         CachedSurface*    aSurface,
-                                         void*             aCache)
-  {
-    if (aSurface->GetLifetime() == Lifetime::Transient ||
-        !aSurface->IsLocked()) {
-      return PL_DHASH_NEXT;
-    }
-
-    auto cache = static_cast<SurfaceCacheImpl*>(aCache);
-    cache->StopTracking(aSurface);
-
-    aSurface->SetLocked(false);
-    cache->StartTracking(aSurface);
-
-    return PL_DHASH_NEXT;
-  }
-
-  NS_IMETHOD
-  CollectReports(nsIHandleReportCallback* aHandleReport,
-                 nsISupports*             aData,
-                 bool                     aAnonymize) override
-  {
-    MutexAutoLock lock(mMutex);
-
-    // We have explicit memory reporting for the surface cache which is more
-    // accurate than the cost metrics we report here, but these metrics are
-    // still useful to report, since they control the cache's behavior.
-    nsresult rv;
-
-    rv = MOZ_COLLECT_REPORT("imagelib-surface-cache-estimated-total",
-                            KIND_OTHER, UNITS_BYTES,
-                            (mMaxCost - mAvailableCost),
-                            "Estimated total memory used by the imagelib "
-                            "surface cache.");
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    rv = MOZ_COLLECT_REPORT("imagelib-surface-cache-estimated-locked",
-                            KIND_OTHER, UNITS_BYTES,
-                            mLockedCost,
-                            "Estimated memory used by locked surfaces in the "
-                            "imagelib surface cache.");
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    return NS_OK;
-  }
-
-  void CollectSizeOfSurfaces(const ImageKey                  aImageKey,
-                             nsTArray<SurfaceMemoryCounter>& aCounters,
-                             MallocSizeOf                    aMallocSizeOf)
-  {
-    nsRefPtr<ImageSurfaceCache> cache = GetImageCache(aImageKey);
-    if (!cache) {
-      return;  // No surfaces for this image.
-    }
-
-    // Report all surfaces in the per-image cache.
-    CachedSurface::SurfaceMemoryReport report(aCounters, aMallocSizeOf);
-    cache->ForEach(DoCollectSizeOfSurface, &report);
-  }
-
-  static PLDHashOperator DoCollectSizeOfSurface(const SurfaceKey&,
-                                                CachedSurface*    aSurface,
-                                                void*             aReport)
-  {
-    auto report = static_cast<CachedSurface::SurfaceMemoryReport*>(aReport);
-    report->Add(aSurface);
-    return PL_DHASH_NEXT;
-  }
-
-private:
-  already_AddRefed<ImageSurfaceCache> GetImageCache(const ImageKey aImageKey)
-  {
-    nsRefPtr<ImageSurfaceCache> imageCache;
-    mImageCaches.Get(aImageKey, getter_AddRefs(imageCache));
-    return imageCache.forget();
-  }
-
-  // This is similar to CanHold() except that it takes into account the costs of
-  // locked surfaces. It's used internally in Insert(), but it's not exposed
-  // publicly because if we start permitting multithreaded access to the surface
-  // cache, which seems likely, then the result would be meaningless: another
-  // thread could insert a persistent surface or lock an image at any time.
-  bool CanHoldAfterDiscarding(const Cost aCost) const
-  {
-    return aCost <= mMaxCost - mLockedCost;
-  }
-
-  struct SurfaceTracker : public nsExpirationTracker<CachedSurface, 2>
-  {
-    explicit SurfaceTracker(uint32_t aSurfaceCacheExpirationTimeMS)
-      : nsExpirationTracker<CachedSurface, 2>(aSurfaceCacheExpirationTimeMS)
-    { }
-
-  protected:
-    virtual void NotifyExpired(CachedSurface* aSurface) override
-    {
-      if (sInstance) {
-        MutexAutoLock lock(sInstance->GetMutex());
-        sInstance->Remove(aSurface);
-      }
-    }
-  };
-
-  struct MemoryPressureObserver : public nsIObserver
-  {
-    NS_DECL_ISUPPORTS
-
-    NS_IMETHOD Observe(nsISupports*,
-                       const char* aTopic,
-                       const char16_t*) override
-    {
-      if (sInstance && strcmp(aTopic, "memory-pressure") == 0) {
-        MutexAutoLock lock(sInstance->GetMutex());
-        sInstance->DiscardForMemoryPressure();
-      }
-      return NS_OK;
-    }
-
-  private:
-    virtual ~MemoryPressureObserver() { }
-  };
-
-  nsTArray<CostEntry>                     mCosts;
-  nsRefPtrHashtable<nsPtrHashKey<Image>,
-    ImageSurfaceCache> mImageCaches;
-  SurfaceTracker                          mExpirationTracker;
-  nsRefPtr<MemoryPressureObserver>        mMemoryPressureObserver;
-  Mutex                                   mMutex;
-  const uint32_t                          mDiscardFactor;
-  const Cost                              mMaxCost;
-  Cost                                    mAvailableCost;
-  Cost                                    mLockedCost;
-};
-
-NS_IMPL_ISUPPORTS(SurfaceCacheImpl, nsIMemoryReporter)
-NS_IMPL_ISUPPORTS(SurfaceCacheImpl::MemoryPressureObserver, nsIObserver)
-
-///////////////////////////////////////////////////////////////////////////////
-// Public API
-///////////////////////////////////////////////////////////////////////////////
-
-/* static */ void
-SurfaceCache::Initialize()
-{
-  // Initialize preferences.
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(!sInstance, "Shouldn't initialize more than once");
-
-  // See gfxPrefs for the default values of these preferences.
-
-  // Length of time before an unused surface is removed from the cache, in
-  // milliseconds.
-  uint32_t surfaceCacheExpirationTimeMS =
-    gfxPrefs::ImageMemSurfaceCacheMinExpirationMS();
-
-  // What fraction of the memory used by the surface cache we should discard
-  // when we get a memory pressure notification. This value is interpreted as
-  // 1/N, so 1 means to discard everything, 2 means to discard about half of the
-  // memory we're using, and so forth. We clamp it to avoid division by zero.
-  uint32_t surfaceCacheDiscardFactor =
-    max(gfxPrefs::ImageMemSurfaceCacheDiscardFactor(), 1u);
-
-  // Maximum size of the surface cache, in kilobytes.
-  uint64_t surfaceCacheMaxSizeKB = gfxPrefs::ImageMemSurfaceCacheMaxSizeKB();
-
-  // A knob determining the actual size of the surface cache. Currently the
-  // cache is (size of main memory) / (surface cache size factor) KB
-  // or (surface cache max size) KB, whichever is smaller. The formula
-  // may change in the future, though.
-  // For example, a value of 4 would yield a 256MB cache on a 1GB machine.
-  // The smallest machines we are likely to run this code on have 256MB
-  // of memory, which would yield a 64MB cache on this setting.
-  // We clamp this value to avoid division by zero.
-  uint32_t surfaceCacheSizeFactor =
-    max(gfxPrefs::ImageMemSurfaceCacheSizeFactor(), 1u);
-
-  // Compute the size of the surface cache.
-  uint64_t memorySize = PR_GetPhysicalMemorySize();
-  if (memorySize == 0) {
-    MOZ_ASSERT_UNREACHABLE("PR_GetPhysicalMemorySize not implemented here");
-    memorySize = 256 * 1024 * 1024;  // Fall back to 256MB.
-  }
-  uint64_t proposedSize = memorySize / surfaceCacheSizeFactor;
-  uint64_t surfaceCacheSizeBytes = min(proposedSize,
-                                       surfaceCacheMaxSizeKB * 1024);
-  uint32_t finalSurfaceCacheSizeBytes =
-    min(surfaceCacheSizeBytes, uint64_t(UINT32_MAX));
-
-  // Create the surface cache singleton with the requested settings.  Note that
-  // the size is a limit that the cache may not grow beyond, but we do not
-  // actually allocate any storage for surfaces at this time.
-  sInstance = new SurfaceCacheImpl(surfaceCacheExpirationTimeMS,
-                                   surfaceCacheDiscardFactor,
-                                   finalSurfaceCacheSizeBytes);
-  sInstance->InitMemoryReporter();
-}
-
-/* static */ void
-SurfaceCache::Shutdown()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(sInstance, "No singleton - was Shutdown() called twice?");
-  sInstance = nullptr;
-}
-
-/* static */ DrawableFrameRef
-SurfaceCache::Lookup(const ImageKey         aImageKey,
-                     const SurfaceKey&      aSurfaceKey,
-                     const Maybe<uint32_t>& aAlternateFlags /* = Nothing() */)
-{
-  if (!sInstance) {
-    return DrawableFrameRef();
-  }
-
-  MutexAutoLock lock(sInstance->GetMutex());
-
-  DrawableFrameRef ref = sInstance->Lookup(aImageKey, aSurfaceKey);
-  if (!ref && aAlternateFlags) {
-    ref = sInstance->Lookup(aImageKey,
-                            aSurfaceKey.WithNewFlags(*aAlternateFlags));
-  }
-
-  return ref;
-}
-
-/* static */ DrawableFrameRef
-SurfaceCache::LookupBestMatch(const ImageKey         aImageKey,
-                              const SurfaceKey&      aSurfaceKey,
-                              const Maybe<uint32_t>& aAlternateFlags
-                                /* = Nothing() */)
-{
-  if (!sInstance) {
-    return DrawableFrameRef();
-  }
-
-  MutexAutoLock lock(sInstance->GetMutex());
-  return sInstance->LookupBestMatch(aImageKey, aSurfaceKey, aAlternateFlags);
-}
-
-/* static */ InsertOutcome
-SurfaceCache::Insert(imgFrame*         aSurface,
-                     const ImageKey    aImageKey,
-                     const SurfaceKey& aSurfaceKey,
-                     Lifetime          aLifetime)
-{
-  if (!sInstance) {
-    return InsertOutcome::FAILURE;
-  }
-
-  MutexAutoLock lock(sInstance->GetMutex());
-  Cost cost = ComputeCost(aSurface->GetSize(), aSurface->GetBytesPerPixel());
-  return sInstance->Insert(aSurface, cost, aImageKey, aSurfaceKey, aLifetime);
-}
-
-/* static */ bool
-SurfaceCache::CanHold(const IntSize& aSize, uint32_t aBytesPerPixel /* = 4 */)
-{
-  if (!sInstance) {
-    return false;
-  }
-
-  Cost cost = ComputeCost(aSize, aBytesPerPixel);
-  return sInstance->CanHold(cost);
-}
-
-/* static */ bool
-SurfaceCache::CanHold(size_t aSize)
-{
-  if (!sInstance) {
-    return false;
-  }
-
-  return sInstance->CanHold(aSize);
-}
-
-/* static */ void
-SurfaceCache::LockImage(Image* aImageKey)
-{
-  if (sInstance) {
-    MutexAutoLock lock(sInstance->GetMutex());
-    return sInstance->LockImage(aImageKey);
-  }
-}
-
-/* static */ void
-SurfaceCache::UnlockImage(Image* aImageKey)
-{
-  if (sInstance) {
-    MutexAutoLock lock(sInstance->GetMutex());
-    return sInstance->UnlockImage(aImageKey);
-  }
-}
-
-/* static */ void
-SurfaceCache::UnlockSurfaces(const ImageKey aImageKey)
-{
-  if (sInstance) {
-    MutexAutoLock lock(sInstance->GetMutex());
-    return sInstance->UnlockSurfaces(aImageKey);
-  }
-}
-
-/* static */ void
-SurfaceCache::RemoveSurface(const ImageKey    aImageKey,
-                            const SurfaceKey& aSurfaceKey)
-{
-  if (sInstance) {
-    MutexAutoLock lock(sInstance->GetMutex());
-    sInstance->RemoveSurface(aImageKey, aSurfaceKey);
-  }
-}
-
-/* static */ void
-SurfaceCache::RemoveImage(Image* aImageKey)
-{
-  if (sInstance) {
-    MutexAutoLock lock(sInstance->GetMutex());
-    sInstance->RemoveImage(aImageKey);
-  }
-}
-
-/* static */ void
-SurfaceCache::DiscardAll()
-{
-  if (sInstance) {
-    MutexAutoLock lock(sInstance->GetMutex());
-    sInstance->DiscardAll();
-  }
-}
-
-/* static */ void
-SurfaceCache::CollectSizeOfSurfaces(const ImageKey                  aImageKey,
-                                    nsTArray<SurfaceMemoryCounter>& aCounters,
-                                    MallocSizeOf                    aMallocSizeOf)
-{
-  if (!sInstance) {
-    return;
-  }
-
-  MutexAutoLock lock(sInstance->GetMutex());
-  return sInstance->CollectSizeOfSurfaces(aImageKey, aCounters, aMallocSizeOf);
-}
-
-} // namespace image
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/SurfaceCache.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/SurfaceCache.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/SurfaceCache.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/SurfaceCache.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,420 +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/. */
-
-/**
- * SurfaceCache is a service for caching temporary surfaces and decoded image
- * data in imagelib.
- */
-
-#ifndef mozilla_image_src_SurfaceCache_h
-#define mozilla_image_src_SurfaceCache_h
-
-#include "mozilla/Maybe.h"           // for Maybe
-#include "mozilla/MemoryReporting.h" // for MallocSizeOf
-#include "mozilla/HashFunctions.h"   // for HashGeneric and AddToHash
-#include "gfx2DGlue.h"               // for gfxMemoryLocation
-#include "gfxPoint.h"                // for gfxSize
-#include "nsCOMPtr.h"                // for already_AddRefed
-#include "mozilla/gfx/Point.h"       // for mozilla::gfx::IntSize
-#include "mozilla/gfx/2D.h"          // for SourceSurface
-#include "SVGImageContext.h"         // for SVGImageContext
-
-namespace mozilla {
-namespace image {
-
-class DrawableFrameRef;
-class Image;
-class imgFrame;
-struct SurfaceMemoryCounter;
-
-/*
- * ImageKey contains the information we need to look up all cached surfaces for
- * a particular image.
- */
-typedef Image* ImageKey;
-
-/*
- * SurfaceKey contains the information we need to look up a specific cached
- * surface. Together with an ImageKey, this uniquely identifies the surface.
- *
- * Callers should construct a SurfaceKey using the appropriate helper function
- * for their image type - either RasterSurfaceKey or VectorSurfaceKey.
- */
-class SurfaceKey
-{
-  typedef gfx::IntSize IntSize;
-
-public:
-  bool operator==(const SurfaceKey& aOther) const
-  {
-    return aOther.mSize == mSize &&
-           aOther.mSVGContext == mSVGContext &&
-           aOther.mAnimationTime == mAnimationTime &&
-           aOther.mFlags == mFlags;
-  }
-
-  uint32_t Hash() const
-  {
-    uint32_t hash = HashGeneric(mSize.width, mSize.height);
-    hash = AddToHash(hash, mSVGContext.map(HashSIC).valueOr(0));
-    hash = AddToHash(hash, mAnimationTime, mFlags);
-    return hash;
-  }
-
-  IntSize Size() const { return mSize; }
-  Maybe<SVGImageContext> SVGContext() const { return mSVGContext; }
-  float AnimationTime() const { return mAnimationTime; }
-  uint32_t Flags() const { return mFlags; }
-
-  SurfaceKey WithNewFlags(uint32_t aFlags) const
-  {
-    return SurfaceKey(mSize, mSVGContext, mAnimationTime, aFlags);
-  }
-
-private:
-  SurfaceKey(const IntSize& aSize,
-             const Maybe<SVGImageContext>& aSVGContext,
-             const float aAnimationTime,
-             const uint32_t aFlags)
-    : mSize(aSize)
-    , mSVGContext(aSVGContext)
-    , mAnimationTime(aAnimationTime)
-    , mFlags(aFlags)
-  { }
-
-  static uint32_t HashSIC(const SVGImageContext& aSIC) {
-    return aSIC.Hash();
-  }
-
-  friend SurfaceKey RasterSurfaceKey(const IntSize&, uint32_t, uint32_t);
-  friend SurfaceKey VectorSurfaceKey(const IntSize&,
-                                     const Maybe<SVGImageContext>&,
-                                     float);
-
-  IntSize                mSize;
-  Maybe<SVGImageContext> mSVGContext;
-  float                  mAnimationTime;
-  uint32_t               mFlags;
-};
-
-inline SurfaceKey
-RasterSurfaceKey(const gfx::IntSize& aSize,
-                 uint32_t aFlags,
-                 uint32_t aFrameNum)
-{
-  return SurfaceKey(aSize, Nothing(), float(aFrameNum), aFlags);
-}
-
-inline SurfaceKey
-VectorSurfaceKey(const gfx::IntSize& aSize,
-                 const Maybe<SVGImageContext>& aSVGContext,
-                 float aAnimationTime)
-{
-  // We don't care about aFlags for VectorImage because none of the flags we
-  // have right now influence VectorImage's rendering. If we add a new flag that
-  // *does* affect how a VectorImage renders, we'll have to change this.
-  return SurfaceKey(aSize, aSVGContext, aAnimationTime, 0);
-}
-
-enum class Lifetime : uint8_t {
-  Transient,
-  Persistent
-};
-
-enum class InsertOutcome : uint8_t {
-  SUCCESS,                 // Success (but see Insert documentation).
-  FAILURE,                 // Couldn't insert (e.g., for capacity reasons).
-  FAILURE_ALREADY_PRESENT  // A surface with the same key is already present.
-};
-
-/**
- * SurfaceCache is an imagelib-global service that allows caching of temporary
- * surfaces. Surfaces normally expire from the cache automatically if they go
- * too long without being accessed.
- *
- * SurfaceCache does not hold surfaces directly; instead, it holds imgFrame
- * objects, which hold surfaces but also layer on additional features specific
- * to imagelib's needs like animation, padding support, and transparent support
- * for volatile buffers.
- *
- * Sometime it's useful to temporarily prevent surfaces from expiring from the
- * cache. This is most often because losing the data could harm the user
- * experience (for example, we often don't want to allow surfaces that are
- * currently visible to expire) or because it's not possible to rematerialize
- * the surface. SurfaceCache supports this through the use of image locking and
- * surface lifetimes; see the comments for Insert() and LockImage() for more
- * details.
- *
- * Any image which stores surfaces in the SurfaceCache *must* ensure that it
- * calls RemoveImage() before it is destroyed. See the comments for
- * RemoveImage() for more details.
- */
-struct SurfaceCache
-{
-  typedef gfx::IntSize IntSize;
-
-  /**
-   * Initialize static data. Called during imagelib module initialization.
-   */
-  static void Initialize();
-
-  /**
-   * Release static data. Called during imagelib module shutdown.
-   */
-  static void Shutdown();
-
-  /**
-   * Look up the imgFrame containing a surface in the cache and returns a
-   * drawable reference to that imgFrame.
-   *
-   * If the image associated with the surface is locked, then the surface will
-   * be locked before it is returned.
-   *
-   * If the imgFrame was found in the cache, but had stored its surface in a
-   * volatile buffer which was discarded by the OS, then it is automatically
-   * removed from the cache and an empty DrawableFrameRef is returned. Note that
-   * this will never happen to persistent surfaces associated with a locked
-   * image; the cache keeps a strong reference to such surfaces internally.
-   *
-   * @param aImageKey       Key data identifying which image the surface belongs
-   *                        to.
-   *
-   * @param aSurfaceKey     Key data which uniquely identifies the requested
-   *                        surface.
-   *
-   * @param aAlternateFlags If not Nothing(), a different set of flags than the
-   *                        ones specified in @aSurfaceKey which are also
-   *                        acceptable to the caller. This is more efficient
-   *                        than calling Lookup() twice, which requires taking a
-   *                        lock each time.
-   *
-   * @return                a DrawableFrameRef to the imgFrame wrapping the
-   *                        requested surface, or an empty DrawableFrameRef if
-   *                        not found.
-   */
-  static DrawableFrameRef Lookup(const ImageKey    aImageKey,
-                                 const SurfaceKey& aSurfaceKey,
-                                 const Maybe<uint32_t>& aAlternateFlags
-                                   = Nothing());
-
-  /**
-   * Looks up the best matching surface in the cache and returns a drawable
-   * reference to the imgFrame containing it.
-   *
-   * Returned surfaces may vary from the requested surface only in terms of
-   * size, unless @aAlternateFlags is specified.
-   *
-   * @param aImageKey    Key data identifying which image the surface belongs
-   *                     to.
-   *
-   * @param aSurfaceKey  Key data which identifies the ideal surface to return.
-   *
-   * @param aAlternateFlags If not Nothing(), a different set of flags than the
-   *                        ones specified in @aSurfaceKey which are also
-   *                        acceptable to the caller. This is much more
-   *                        efficient than calling LookupBestMatch() twice.
-   *
-   * @return a DrawableFrameRef to the imgFrame wrapping a surface similar to
-   *         the requested surface, or an empty DrawableFrameRef if not found.
-   */
-  static DrawableFrameRef LookupBestMatch(const ImageKey    aImageKey,
-                                          const SurfaceKey& aSurfaceKey,
-                                          const Maybe<uint32_t>& aAlternateFlags
-                                            = Nothing());
-
-  /**
-   * Insert a surface into the cache. If a surface with the same ImageKey and
-   * SurfaceKey is already in the cache, Insert returns FAILURE_ALREADY_PRESENT.
-   *
-   * Each surface in the cache has a lifetime, either Transient or Persistent.
-   * Transient surfaces can expire from the cache at any time. Persistent
-   * surfaces, on the other hand, will never expire as long as they remain
-   * locked, but if they become unlocked, can expire just like transient
-   * surfaces. When it is first inserted, a persistent surface is locked if its
-   * associated image is locked. When that image is later unlocked, the surface
-   * becomes unlocked too. To become locked again at that point, two things must
-   * happen: the image must become locked again (via LockImage()), and the
-   * surface must be touched again (via one of the Lookup() functions).
-   *
-   * All of this means that a very particular procedure has to be followed for
-   * surfaces which cannot be rematerialized. First, they must be inserted
-   * with a persistent lifetime *after* the image is locked with LockImage(); if
-   * you use the other order, the surfaces might expire before LockImage() gets
-   * called or before the surface is touched again by Lookup(). Second, the
-   * image they are associated with must never be unlocked.
-   *
-   * If a surface cannot be rematerialized, it may be important to know whether
-   * it was inserted into the cache successfully. Insert() returns FAILURE if it
-   * failed to insert the surface, which could happen because of capacity
-   * reasons, or because it was already freed by the OS. If you aren't inserting
-   * a surface with persistent lifetime, or if the surface isn't associated with
-   * a locked image, checking for SUCCESS or FAILURE is useless: the surface
-   * might expire immediately after being inserted, even though Insert()
-   * returned SUCCESS. Thus, many callers do not need to check the result of
-   * Insert() at all.
-   *
-   * @param aTarget      The new surface (wrapped in an imgFrame) to insert into
-   *                     the cache.
-   * @param aImageKey    Key data identifying which image the surface belongs
-   *                     to.
-   * @param aSurfaceKey  Key data which uniquely identifies the requested
-   *                     surface.
-   * @param aLifetime    Whether this is a transient surface that can always be
-   *                     allowed to expire, or a persistent surface that
-   *                     shouldn't expire if the image is locked.
-   * @return SUCCESS if the surface was inserted successfully. (But see above
-   *           for more information about when you should check this.)
-   *         FAILURE if the surface could not be inserted, e.g. for capacity
-   *           reasons. (But see above for more information about when you
-   *           should check this.)
-   *         FAILURE_ALREADY_PRESENT if a surface with the same ImageKey and
-   *           SurfaceKey already exists in the cache.
-   */
-  static InsertOutcome Insert(imgFrame*         aSurface,
-                              const ImageKey    aImageKey,
-                              const SurfaceKey& aSurfaceKey,
-                              Lifetime          aLifetime);
-
-  /**
-   * Checks if a surface of a given size could possibly be stored in the cache.
-   * If CanHold() returns false, Insert() will always fail to insert the
-   * surface, but the inverse is not true: Insert() may take more information
-   * into account than just image size when deciding whether to cache the
-   * surface, so Insert() may still fail even if CanHold() returns true.
-   *
-   * Use CanHold() to avoid the need to create a temporary surface when we know
-   * for sure the cache can't hold it.
-   *
-   * @param aSize  The dimensions of a surface in pixels.
-   * @param aBytesPerPixel  How many bytes each pixel of the surface requires.
-   *                        Defaults to 4, which is appropriate for RGBA or RGBX
-   *                        images.
-   *
-   * @return false if the surface cache can't hold a surface of that size.
-   */
-  static bool CanHold(const IntSize& aSize, uint32_t aBytesPerPixel = 4);
-  static bool CanHold(size_t aSize);
-
-  /**
-   * Locks an image. Any of the image's persistent surfaces which are either
-   * inserted or accessed while the image is locked will not expire.
-   *
-   * Locking an image does not automatically lock that image's existing
-   * surfaces. A call to LockImage() guarantees that persistent surfaces which
-   * are inserted afterward will not expire before the next call to
-   * UnlockImage() or UnlockSurfaces() for that image. Surfaces that are
-   * accessed via Lookup() or LookupBestMatch() after a LockImage() call will
-   * also not expire until the next UnlockImage() or UnlockSurfaces() call for
-   * that image. Any other surfaces owned by the image may expire at any time,
-   * whether they are persistent or transient.
-   *
-   * Regardless of locking, any of an image's surfaces may be removed using
-   * RemoveSurface(), and all of an image's surfaces are removed by
-   * RemoveImage(), whether the image is locked or not.
-   *
-   * It's safe to call LockImage() on an image that's already locked; this has
-   * no effect.
-   *
-   * You must always unlock any image you lock. You may do this explicitly by
-   * calling UnlockImage(), or implicitly by calling RemoveImage(). Since you're
-   * required to call RemoveImage() when you destroy an image, this doesn't
-   * impose any additional requirements, but it's preferable to call
-   * UnlockImage() earlier if it's possible.
-   *
-   * @param aImageKey    The image to lock.
-   */
-  static void LockImage(const ImageKey aImageKey);
-
-  /**
-   * Unlocks an image, allowing any of its surfaces to expire at any time.
-   *
-   * It's OK to call UnlockImage() on an image that's already unlocked; this has
-   * no effect.
-   *
-   * @param aImageKey    The image to unlock.
-   */
-  static void UnlockImage(const ImageKey aImageKey);
-
-  /**
-   * Unlocks the existing surfaces of an image, allowing them to expire at any
-   * time.
-   *
-   * This does not unlock the image itself, so accessing the surfaces via
-   * Lookup() or LookupBestMatch() will lock them again, and prevent them from
-   * expiring.
-   *
-   * This is intended to be used in situations where it's no longer clear that
-   * all of the persistent surfaces owned by an image are needed. Calling
-   * UnlockSurfaces() and then taking some action that will cause Lookup() to
-   * touch any surfaces that are still useful will permit the remaining surfaces
-   * to expire from the cache.
-   *
-   * If the image is unlocked, this has no effect.
-   *
-   * @param aImageKey    The image which should have its existing surfaces
-   *                     unlocked.
-   */
-  static void UnlockSurfaces(const ImageKey aImageKey);
-
-  /**
-   * Removes a surface from the cache, if it's present. If it's not present,
-   * RemoveSurface() has no effect.
-   *
-   * Use this function to remove individual surfaces that have become invalid.
-   * Prefer RemoveImage() or DiscardAll() when they're applicable, as they have
-   * much better performance than calling this function repeatedly.
-   *
-   * @param aImageKey    Key data identifying which image the surface belongs
-                         to.
-   * @param aSurfaceKey  Key data which uniquely identifies the requested
-                         surface.
-   */
-  static void RemoveSurface(const ImageKey    aImageKey,
-                            const SurfaceKey& aSurfaceKey);
-
-  /**
-   * Removes all cached surfaces associated with the given image from the cache.
-   * If the image is locked, it is automatically unlocked.
-   *
-   * This MUST be called, at a minimum, when an Image which could be storing
-   * surfaces in the surface cache is destroyed. If another image were allocated
-   * at the same address it could result in subtle, difficult-to-reproduce bugs.
-   *
-   * @param aImageKey  The image which should be removed from the cache.
-   */
-  static void RemoveImage(const ImageKey aImageKey);
-
-  /**
-   * Evicts all evictable surfaces from the cache.
-   *
-   * All surfaces are evictable except for persistent surfaces associated with
-   * locked images. Non-evictable surfaces can only be removed by
-   * RemoveSurface() or RemoveImage().
-   */
-  static void DiscardAll();
-
-  /**
-   * Collects an accounting of the surfaces contained in the SurfaceCache for
-   * the given image, along with their size and various other metadata.
-   *
-   * This is intended for use with memory reporting.
-   *
-   * @param aImageKey     The image to report memory usage for.
-   * @param aCounters     An array into which the report for each surface will
-   *                      be written.
-   * @param aMallocSizeOf A fallback malloc memory reporting function.
-   */
-  static void CollectSizeOfSurfaces(const ImageKey    aImageKey,
-                                    nsTArray<SurfaceMemoryCounter>& aCounters,
-                                    MallocSizeOf      aMallocSizeOf);
-
-private:
-  virtual ~SurfaceCache() = 0;  // Forbid instantiation.
-};
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_SurfaceCache_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/SVGDocumentWrapper.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/SVGDocumentWrapper.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/SVGDocumentWrapper.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/SVGDocumentWrapper.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,429 +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 "SVGDocumentWrapper.h"
-
-#include "mozilla/dom/Element.h"
-#include "nsICategoryManager.h"
-#include "nsIChannel.h"
-#include "nsIContentViewer.h"
-#include "nsIDocument.h"
-#include "nsIDocumentLoaderFactory.h"
-#include "nsIDOMSVGLength.h"
-#include "nsIHttpChannel.h"
-#include "nsIObserverService.h"
-#include "nsIParser.h"
-#include "nsIPresShell.h"
-#include "nsIRequest.h"
-#include "nsIStreamListener.h"
-#include "nsIXMLContentSink.h"
-#include "nsNetCID.h"
-#include "nsComponentManagerUtils.h"
-#include "nsSMILAnimationController.h"
-#include "nsServiceManagerUtils.h"
-#include "mozilla/dom/SVGSVGElement.h"
-#include "nsSVGEffects.h"
-#include "mozilla/dom/SVGAnimatedLength.h"
-#include "nsMimeTypes.h"
-#include "DOMSVGLength.h"
-
-// undef the GetCurrentTime macro defined in WinBase.h from the MS Platform SDK
-#undef GetCurrentTime
-
-using namespace mozilla::dom;
-
-namespace mozilla {
-namespace image {
-
-NS_IMPL_ISUPPORTS(SVGDocumentWrapper,
-                  nsIStreamListener,
-                  nsIRequestObserver,
-                  nsIObserver,
-                  nsISupportsWeakReference)
-
-SVGDocumentWrapper::SVGDocumentWrapper()
-  : mIgnoreInvalidation(false),
-    mRegisteredForXPCOMShutdown(false)
-{ }
-
-SVGDocumentWrapper::~SVGDocumentWrapper()
-{
-  DestroyViewer();
-  if (mRegisteredForXPCOMShutdown) {
-    UnregisterForXPCOMShutdown();
-  }
-}
-
-void
-SVGDocumentWrapper::DestroyViewer()
-{
-  if (mViewer) {
-    mViewer->GetDocument()->OnPageHide(false, nullptr);
-    mViewer->Close(nullptr);
-    mViewer->Destroy();
-    mViewer = nullptr;
-  }
-}
-
-nsIFrame*
-SVGDocumentWrapper::GetRootLayoutFrame()
-{
-  Element* rootElem = GetRootSVGElem();
-  return rootElem ? rootElem->GetPrimaryFrame() : nullptr;
-}
-
-void
-SVGDocumentWrapper::UpdateViewportBounds(const nsIntSize& aViewportSize)
-{
-  MOZ_ASSERT(!mIgnoreInvalidation, "shouldn't be reentrant");
-  mIgnoreInvalidation = true;
-
-  nsIntRect currentBounds;
-  mViewer->GetBounds(currentBounds);
-
-  // If the bounds have changed, we need to do a layout flush.
-  if (currentBounds.Size() != aViewportSize) {
-    mViewer->SetBounds(IntRect(IntPoint(0, 0), aViewportSize));
-    FlushLayout();
-  }
-
-  mIgnoreInvalidation = false;
-}
-
-void
-SVGDocumentWrapper::FlushImageTransformInvalidation()
-{
-  MOZ_ASSERT(!mIgnoreInvalidation, "shouldn't be reentrant");
-
-  SVGSVGElement* svgElem = GetRootSVGElem();
-  if (!svgElem) {
-    return;
-  }
-
-  mIgnoreInvalidation = true;
-  svgElem->FlushImageTransformInvalidation();
-  FlushLayout();
-  mIgnoreInvalidation = false;
-}
-
-bool
-SVGDocumentWrapper::IsAnimated()
-{
-  nsIDocument* doc = mViewer->GetDocument();
-  return doc && doc->HasAnimationController() &&
-    doc->GetAnimationController()->HasRegisteredAnimations();
-}
-
-void
-SVGDocumentWrapper::StartAnimation()
-{
-  // Can be called for animated images during shutdown, after we've
-  // already Observe()'d XPCOM shutdown and cleared out our mViewer pointer.
-  if (!mViewer) {
-    return;
-  }
-
-  nsIDocument* doc = mViewer->GetDocument();
-  if (doc) {
-    nsSMILAnimationController* controller = doc->GetAnimationController();
-    if (controller) {
-      controller->Resume(nsSMILTimeContainer::PAUSE_IMAGE);
-    }
-    doc->SetImagesNeedAnimating(true);
-  }
-}
-
-void
-SVGDocumentWrapper::StopAnimation()
-{
-  // Can be called for animated images during shutdown, after we've
-  // already Observe()'d XPCOM shutdown and cleared out our mViewer pointer.
-  if (!mViewer) {
-    return;
-  }
-
-  nsIDocument* doc = mViewer->GetDocument();
-  if (doc) {
-    nsSMILAnimationController* controller = doc->GetAnimationController();
-    if (controller) {
-      controller->Pause(nsSMILTimeContainer::PAUSE_IMAGE);
-    }
-    doc->SetImagesNeedAnimating(false);
-  }
-}
-
-void
-SVGDocumentWrapper::ResetAnimation()
-{
-  SVGSVGElement* svgElem = GetRootSVGElem();
-  if (!svgElem) {
-    return;
-  }
-
-  svgElem->SetCurrentTime(0.0f);
-}
-
-float
-SVGDocumentWrapper::GetCurrentTime()
-{
-  SVGSVGElement* svgElem = GetRootSVGElem();
-  return svgElem ? svgElem->GetCurrentTime()
-                 : 0.0f;
-}
-
-void
-SVGDocumentWrapper::SetCurrentTime(float aTime)
-{
-  SVGSVGElement* svgElem = GetRootSVGElem();
-  if (svgElem && svgElem->GetCurrentTime() != aTime) {
-    svgElem->SetCurrentTime(aTime);
-  }
-}
-
-void
-SVGDocumentWrapper::TickRefreshDriver()
-{
-  nsCOMPtr<nsIPresShell> presShell;
-  mViewer->GetPresShell(getter_AddRefs(presShell));
-  if (presShell) {
-    nsPresContext* presContext = presShell->GetPresContext();
-    if (presContext) {
-      presContext->RefreshDriver()->DoTick();
-    }
-  }
-}
-
-/** nsIStreamListener methods **/
-
-/* void onDataAvailable (in nsIRequest request, in nsISupports ctxt,
-                         in nsIInputStream inStr, in unsigned long sourceOffset,
-                         in unsigned long count); */
-NS_IMETHODIMP
-SVGDocumentWrapper::OnDataAvailable(nsIRequest* aRequest, nsISupports* ctxt,
-                                    nsIInputStream* inStr,
-                                    uint64_t sourceOffset,
-                                    uint32_t count)
-{
-  return mListener->OnDataAvailable(aRequest, ctxt, inStr,
-                                    sourceOffset, count);
-}
-
-/** nsIRequestObserver methods **/
-
-/* void onStartRequest (in nsIRequest request, in nsISupports ctxt); */
-NS_IMETHODIMP
-SVGDocumentWrapper::OnStartRequest(nsIRequest* aRequest, nsISupports* ctxt)
-{
-  nsresult rv = SetupViewer(aRequest,
-                            getter_AddRefs(mViewer),
-                            getter_AddRefs(mLoadGroup));
-
-  if (NS_SUCCEEDED(rv) &&
-      NS_SUCCEEDED(mListener->OnStartRequest(aRequest, nullptr))) {
-    mViewer->GetDocument()->SetIsBeingUsedAsImage();
-    StopAnimation(); // otherwise animations start automatically in helper doc
-
-    rv = mViewer->Init(nullptr, nsIntRect(0, 0, 0, 0));
-    if (NS_SUCCEEDED(rv)) {
-      rv = mViewer->Open(nullptr, nullptr);
-    }
-  }
-  return rv;
-}
-
-
-/* void onStopRequest (in nsIRequest request, in nsISupports ctxt,
-                       in nsresult status); */
-NS_IMETHODIMP
-SVGDocumentWrapper::OnStopRequest(nsIRequest* aRequest, nsISupports* ctxt,
-                                  nsresult status)
-{
-  if (mListener) {
-    mListener->OnStopRequest(aRequest, ctxt, status);
-    mListener = nullptr;
-  }
-
-  return NS_OK;
-}
-
-/** nsIObserver Methods **/
-NS_IMETHODIMP
-SVGDocumentWrapper::Observe(nsISupports* aSubject,
-                            const char* aTopic,
-                            const char16_t* aData)
-{
-  if (!strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) {
-    // Sever ties from rendering observers to helper-doc's root SVG node
-    SVGSVGElement* svgElem = GetRootSVGElem();
-    if (svgElem) {
-      nsSVGEffects::RemoveAllRenderingObservers(svgElem);
-    }
-
-    // Clean up at XPCOM shutdown time.
-    DestroyViewer();
-    if (mListener) {
-      mListener = nullptr;
-    }
-    if (mLoadGroup) {
-      mLoadGroup = nullptr;
-    }
-
-    // Turn off "registered" flag, or else we'll try to unregister when we die.
-    // (No need for that now, and the try would fail anyway -- it's too late.)
-    mRegisteredForXPCOMShutdown = false;
-  } else {
-    NS_ERROR("Unexpected observer topic.");
-  }
-  return NS_OK;
-}
-
-/** Private helper methods **/
-
-// This method is largely cribbed from
-// nsExternalResourceMap::PendingLoad::SetupViewer.
-nsresult
-SVGDocumentWrapper::SetupViewer(nsIRequest* aRequest,
-                                nsIContentViewer** aViewer,
-                                nsILoadGroup** aLoadGroup)
-{
-  nsCOMPtr<nsIChannel> chan(do_QueryInterface(aRequest));
-  NS_ENSURE_TRUE(chan, NS_ERROR_UNEXPECTED);
-
-  // Check for HTTP error page
-  nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(aRequest));
-  if (httpChannel) {
-    bool requestSucceeded;
-    if (NS_FAILED(httpChannel->GetRequestSucceeded(&requestSucceeded)) ||
-        !requestSucceeded) {
-      return NS_ERROR_FAILURE;
-    }
-  }
-
-  // Give this document its own loadgroup
-  nsCOMPtr<nsILoadGroup> loadGroup;
-  chan->GetLoadGroup(getter_AddRefs(loadGroup));
-
-  nsCOMPtr<nsILoadGroup> newLoadGroup =
-        do_CreateInstance(NS_LOADGROUP_CONTRACTID);
-  NS_ENSURE_TRUE(newLoadGroup, NS_ERROR_OUT_OF_MEMORY);
-  newLoadGroup->SetLoadGroup(loadGroup);
-
-  nsCOMPtr<nsICategoryManager> catMan =
-    do_GetService(NS_CATEGORYMANAGER_CONTRACTID);
-  NS_ENSURE_TRUE(catMan, NS_ERROR_NOT_AVAILABLE);
-  nsXPIDLCString contractId;
-  nsresult rv = catMan->GetCategoryEntry("Gecko-Content-Viewers", IMAGE_SVG_XML,
-                                         getter_Copies(contractId));
-  NS_ENSURE_SUCCESS(rv, rv);
-  nsCOMPtr<nsIDocumentLoaderFactory> docLoaderFactory =
-    do_GetService(contractId);
-  NS_ENSURE_TRUE(docLoaderFactory, NS_ERROR_NOT_AVAILABLE);
-
-  nsCOMPtr<nsIContentViewer> viewer;
-  nsCOMPtr<nsIStreamListener> listener;
-  rv = docLoaderFactory->CreateInstance("external-resource", chan,
-                                        newLoadGroup,
-                                        NS_LITERAL_CSTRING(IMAGE_SVG_XML),
-                                        nullptr, nullptr,
-                                        getter_AddRefs(listener),
-                                        getter_AddRefs(viewer));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  NS_ENSURE_TRUE(viewer, NS_ERROR_UNEXPECTED);
-
-  nsCOMPtr<nsIParser> parser = do_QueryInterface(listener);
-  NS_ENSURE_TRUE(parser, NS_ERROR_UNEXPECTED);
-
-  // XML-only, because this is for SVG content
-  nsIContentSink* sink = parser->GetContentSink();
-  nsCOMPtr<nsIXMLContentSink> xmlSink = do_QueryInterface(sink);
-  NS_ENSURE_TRUE(sink, NS_ERROR_UNEXPECTED);
-
-  listener.swap(mListener);
-  viewer.forget(aViewer);
-  newLoadGroup.forget(aLoadGroup);
-
-  RegisterForXPCOMShutdown();
-  return NS_OK;
-}
-
-void
-SVGDocumentWrapper::RegisterForXPCOMShutdown()
-{
-  MOZ_ASSERT(!mRegisteredForXPCOMShutdown,
-             "re-registering for XPCOM shutdown");
-  // Listen for xpcom-shutdown so that we can drop references to our
-  // helper-document at that point. (Otherwise, we won't get cleaned up
-  // until imgLoader::Shutdown, which can happen after the JAR service
-  // and RDF service have been unregistered.)
-  nsresult rv;
-  nsCOMPtr<nsIObserverService> obsSvc = do_GetService(OBSERVER_SVC_CID, &rv);
-  if (NS_FAILED(rv) ||
-      NS_FAILED(obsSvc->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID,
-                                    true))) {
-    NS_WARNING("Failed to register as observer of XPCOM shutdown");
-  } else {
-    mRegisteredForXPCOMShutdown = true;
-  }
-}
-
-void
-SVGDocumentWrapper::UnregisterForXPCOMShutdown()
-{
-  MOZ_ASSERT(mRegisteredForXPCOMShutdown,
-             "unregistering for XPCOM shutdown w/out being registered");
-
-  nsresult rv;
-  nsCOMPtr<nsIObserverService> obsSvc = do_GetService(OBSERVER_SVC_CID, &rv);
-  if (NS_FAILED(rv) ||
-      NS_FAILED(obsSvc->RemoveObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID))) {
-    NS_WARNING("Failed to unregister as observer of XPCOM shutdown");
-  } else {
-    mRegisteredForXPCOMShutdown = false;
-  }
-}
-
-void
-SVGDocumentWrapper::FlushLayout()
-{
-  nsCOMPtr<nsIPresShell> presShell;
-  mViewer->GetPresShell(getter_AddRefs(presShell));
-  if (presShell) {
-    presShell->FlushPendingNotifications(Flush_Layout);
-  }
-}
-
-nsIDocument*
-SVGDocumentWrapper::GetDocument()
-{
-  if (!mViewer) {
-    return nullptr;
-  }
-
-  return mViewer->GetDocument(); // May be nullptr.
-}
-
-SVGSVGElement*
-SVGDocumentWrapper::GetRootSVGElem()
-{
-  if (!mViewer) {
-    return nullptr; // Can happen during destruction
-  }
-
-  nsIDocument* doc = mViewer->GetDocument();
-  if (!doc) {
-    return nullptr; // Can happen during destruction
-  }
-
-  Element* rootElem = mViewer->GetDocument()->GetRootElement();
-  if (!rootElem || !rootElem->IsSVGElement(nsGkAtoms::svg)) {
-    return nullptr;
-  }
-
-  return static_cast<SVGSVGElement*>(rootElem);
-}
-
-} // namespace image
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/SVGDocumentWrapper.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/SVGDocumentWrapper.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/SVGDocumentWrapper.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/SVGDocumentWrapper.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,151 +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/. */
-
-/* This class wraps an SVG document, for use by VectorImage objects. */
-
-#ifndef mozilla_image_src_SVGDocumentWrapper_h
-#define mozilla_image_src_SVGDocumentWrapper_h
-
-#include "mozilla/Attributes.h"
-
-#include "nsCOMPtr.h"
-#include "nsIStreamListener.h"
-#include "nsIObserver.h"
-#include "nsIContentViewer.h"
-#include "nsWeakReference.h"
-#include "nsSize.h"
-
-class nsIPresShell;
-class nsIRequest;
-class nsILoadGroup;
-class nsIFrame;
-
-#define OBSERVER_SVC_CID "@mozilla.org/observer-service;1"
-
-// undef the GetCurrentTime macro defined in WinBase.h from the MS Platform SDK
-#undef GetCurrentTime
-
-namespace mozilla {
-namespace dom {
-class SVGSVGElement;
-}
-
-namespace image {
-
-class SVGDocumentWrapper final : public nsIStreamListener,
-                                 public nsIObserver,
-                                 nsSupportsWeakReference
-{
-public:
-  SVGDocumentWrapper();
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSISTREAMLISTENER
-  NS_DECL_NSIREQUESTOBSERVER
-  NS_DECL_NSIOBSERVER
-
-  enum Dimension {
-    eWidth,
-    eHeight
-  };
-
-  /**
-   * Returns the wrapped document, or nullptr on failure. (No AddRef.)
-   */
-  nsIDocument* GetDocument();
-
-  /**
-   * Returns the root <svg> element for the wrapped document, or nullptr on
-   * failure.
-   */
-  mozilla::dom::SVGSVGElement* GetRootSVGElem();
-
-  /**
-   * Returns the root nsIFrame* for the wrapped document, or nullptr on failure.
-   *
-   * @return the root nsIFrame* for the wrapped document, or nullptr on failure.
-   */
-  nsIFrame* GetRootLayoutFrame();
-
-  /**
-   * Returns (by reference) the nsIPresShell for the wrapped document.
-   *
-   * @param[out] aPresShell On success, this will be populated with a pointer
-   *                        to the wrapped document's nsIPresShell.
-   *
-   * @return NS_OK on success, or an error code on failure.
-   */
-  inline nsresult  GetPresShell(nsIPresShell** aPresShell)
-    { return mViewer->GetPresShell(aPresShell); }
-
-  /**
-   * Modifier to update the viewport dimensions of the wrapped document. This
-   * method performs a synchronous "Flush_Layout" on the wrapped document,
-   * since a viewport-change affects layout.
-   *
-   * @param aViewportSize The new viewport dimensions.
-   */
-  void UpdateViewportBounds(const nsIntSize& aViewportSize);
-
-  /**
-   * If an SVG image's helper document has a pending notification for an
-   * override on the root node's "preserveAspectRatio" attribute, then this
-   * method will flush that notification so that the image can paint correctly.
-   * (First, though, it sets the mIgnoreInvalidation flag so that we won't
-   * notify the image's observers and trigger unwanted repaint-requests.)
-   */
-  void FlushImageTransformInvalidation();
-
-  /**
-   * Returns a bool indicating whether the document has any SMIL animations.
-   *
-   * @return true if the document has any SMIL animations. Else, false.
-   */
-  bool      IsAnimated();
-
-  /**
-   * Indicates whether we should currently ignore rendering invalidations sent
-   * from the wrapped SVG doc.
-   *
-   * @return true if we should ignore invalidations sent from this SVG doc.
-   */
-  bool ShouldIgnoreInvalidation() { return mIgnoreInvalidation; }
-
-  /**
-   * Methods to control animation.
-   */
-  void StartAnimation();
-  void StopAnimation();
-  void ResetAnimation();
-  float GetCurrentTime();
-  void SetCurrentTime(float aTime);
-  void TickRefreshDriver();
-
-  /**
-   * Force a layout flush of the underlying SVG document.
-   */
-  void FlushLayout();
-
-private:
-  ~SVGDocumentWrapper();
-
-  nsresult SetupViewer(nsIRequest* aRequest,
-                       nsIContentViewer** aViewer,
-                       nsILoadGroup** aLoadGroup);
-  void     DestroyViewer();
-  void     RegisterForXPCOMShutdown();
-  void     UnregisterForXPCOMShutdown();
-
-  nsCOMPtr<nsIContentViewer>  mViewer;
-  nsCOMPtr<nsILoadGroup>      mLoadGroup;
-  nsCOMPtr<nsIStreamListener> mListener;
-  bool                        mIgnoreInvalidation;
-  bool                        mRegisteredForXPCOMShutdown;
-};
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_SVGDocumentWrapper_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/VectorImage.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/src/VectorImage.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/VectorImage.cpp	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/VectorImage.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,1256 +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 "VectorImage.h"
-
-#include "gfx2DGlue.h"
-#include "gfxContext.h"
-#include "gfxDrawable.h"
-#include "gfxPlatform.h"
-#include "gfxUtils.h"
-#include "imgFrame.h"
-#include "mozilla/AutoRestore.h"
-#include "mozilla/MemoryReporting.h"
-#include "mozilla/dom/SVGSVGElement.h"
-#include "mozilla/gfx/2D.h"
-#include "mozilla/RefPtr.h"
-#include "nsIDOMEvent.h"
-#include "nsIPresShell.h"
-#include "nsIStreamListener.h"
-#include "nsMimeTypes.h"
-#include "nsPresContext.h"
-#include "nsRect.h"
-#include "nsString.h"
-#include "nsStubDocumentObserver.h"
-#include "nsSVGEffects.h" // for nsSVGRenderingObserver
-#include "nsWindowMemoryReporter.h"
-#include "ImageRegion.h"
-#include "Orientation.h"
-#include "SVGDocumentWrapper.h"
-#include "nsIDOMEventListener.h"
-#include "SurfaceCache.h"
-
-// undef the GetCurrentTime macro defined in WinBase.h from the MS Platform SDK
-#undef GetCurrentTime
-
-namespace mozilla {
-
-using namespace dom;
-using namespace gfx;
-using namespace layers;
-
-namespace image {
-
-// Helper-class: SVGRootRenderingObserver
-class SVGRootRenderingObserver final : public nsSVGRenderingObserver {
-public:
-  SVGRootRenderingObserver(SVGDocumentWrapper* aDocWrapper,
-                           VectorImage*        aVectorImage)
-    : nsSVGRenderingObserver()
-    , mDocWrapper(aDocWrapper)
-    , mVectorImage(aVectorImage)
-    , mHonoringInvalidations(true)
-  {
-    MOZ_ASSERT(mDocWrapper, "Need a non-null SVG document wrapper");
-    MOZ_ASSERT(mVectorImage, "Need a non-null VectorImage");
-
-    StartListening();
-    Element* elem = GetTarget();
-    MOZ_ASSERT(elem, "no root SVG node for us to observe");
-
-    nsSVGEffects::AddRenderingObserver(elem, this);
-    mInObserverList = true;
-  }
-
-  virtual ~SVGRootRenderingObserver()
-  {
-    StopListening();
-  }
-
-  void ResumeHonoringInvalidations()
-  {
-    mHonoringInvalidations = true;
-  }
-
-protected:
-  virtual Element* GetTarget() override
-  {
-    return mDocWrapper->GetRootSVGElem();
-  }
-
-  virtual void DoUpdate() override
-  {
-    Element* elem = GetTarget();
-    MOZ_ASSERT(elem, "missing root SVG node");
-
-    if (mHonoringInvalidations && !mDocWrapper->ShouldIgnoreInvalidation()) {
-      nsIFrame* frame = elem->GetPrimaryFrame();
-      if (!frame || frame->PresContext()->PresShell()->IsDestroying()) {
-        // We're being destroyed. Bail out.
-        return;
-      }
-
-      // Ignore further invalidations until we draw.
-      mHonoringInvalidations = false;
-
-      mVectorImage->InvalidateObserversOnNextRefreshDriverTick();
-    }
-
-    // Our caller might've removed us from rendering-observer list.
-    // Add ourselves back!
-    if (!mInObserverList) {
-      nsSVGEffects::AddRenderingObserver(elem, this);
-      mInObserverList = true;
-    }
-  }
-
-  // Private data
-  const nsRefPtr<SVGDocumentWrapper> mDocWrapper;
-  VectorImage* const mVectorImage;   // Raw pointer because it owns me.
-  bool mHonoringInvalidations;
-};
-
-class SVGParseCompleteListener final : public nsStubDocumentObserver {
-public:
-  NS_DECL_ISUPPORTS
-
-  SVGParseCompleteListener(nsIDocument* aDocument,
-                           VectorImage* aImage)
-    : mDocument(aDocument)
-    , mImage(aImage)
-  {
-    MOZ_ASSERT(mDocument, "Need an SVG document");
-    MOZ_ASSERT(mImage, "Need an image");
-
-    mDocument->AddObserver(this);
-  }
-
-private:
-  ~SVGParseCompleteListener()
-  {
-    if (mDocument) {
-      // The document must have been destroyed before we got our event.
-      // Otherwise this can't happen, since documents hold strong references to
-      // their observers.
-      Cancel();
-    }
-  }
-
-public:
-  void EndLoad(nsIDocument* aDocument) override
-  {
-    MOZ_ASSERT(aDocument == mDocument, "Got EndLoad for wrong document?");
-
-    // OnSVGDocumentParsed will release our owner's reference to us, so ensure
-    // we stick around long enough to complete our work.
-    nsRefPtr<SVGParseCompleteListener> kungFuDeathGroup(this);
-
-    mImage->OnSVGDocumentParsed();
-  }
-
-  void Cancel()
-  {
-    MOZ_ASSERT(mDocument, "Duplicate call to Cancel");
-    if (mDocument) {
-      mDocument->RemoveObserver(this);
-      mDocument = nullptr;
-    }
-  }
-
-private:
-  nsCOMPtr<nsIDocument> mDocument;
-  VectorImage* const mImage; // Raw pointer to owner.
-};
-
-NS_IMPL_ISUPPORTS(SVGParseCompleteListener, nsIDocumentObserver)
-
-class SVGLoadEventListener final : public nsIDOMEventListener {
-public:
-  NS_DECL_ISUPPORTS
-
-  SVGLoadEventListener(nsIDocument* aDocument,
-                       VectorImage* aImage)
-    : mDocument(aDocument)
-    , mImage(aImage)
-  {
-    MOZ_ASSERT(mDocument, "Need an SVG document");
-    MOZ_ASSERT(mImage, "Need an image");
-
-    mDocument->AddEventListener(NS_LITERAL_STRING("MozSVGAsImageDocumentLoad"),
-                                this, true, false);
-    mDocument->AddEventListener(NS_LITERAL_STRING("SVGAbort"), this, true,
-                                false);
-    mDocument->AddEventListener(NS_LITERAL_STRING("SVGError"), this, true,
-                                false);
-  }
-
-private:
-  ~SVGLoadEventListener()
-  {
-    if (mDocument) {
-      // The document must have been destroyed before we got our event.
-      // Otherwise this can't happen, since documents hold strong references to
-      // their observers.
-      Cancel();
-    }
-  }
-
-public:
-  NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) override
-  {
-    MOZ_ASSERT(mDocument, "Need an SVG document. Received multiple events?");
-
-    // OnSVGDocumentLoaded/OnSVGDocumentError will release our owner's reference
-    // to us, so ensure we stick around long enough to complete our work.
-    nsRefPtr<SVGLoadEventListener> kungFuDeathGroup(this);
-
-    nsAutoString eventType;
-    aEvent->GetType(eventType);
-    MOZ_ASSERT(eventType.EqualsLiteral("MozSVGAsImageDocumentLoad")  ||
-               eventType.EqualsLiteral("SVGAbort")                   ||
-               eventType.EqualsLiteral("SVGError"),
-               "Received unexpected event");
-
-    if (eventType.EqualsLiteral("MozSVGAsImageDocumentLoad")) {
-      mImage->OnSVGDocumentLoaded();
-    } else {
-      mImage->OnSVGDocumentError();
-    }
-
-    return NS_OK;
-  }
-
-  void Cancel()
-  {
-    MOZ_ASSERT(mDocument, "Duplicate call to Cancel");
-    if (mDocument) {
-      mDocument
-        ->RemoveEventListener(NS_LITERAL_STRING("MozSVGAsImageDocumentLoad"),
-                              this, true);
-      mDocument->RemoveEventListener(NS_LITERAL_STRING("SVGAbort"), this, true);
-      mDocument->RemoveEventListener(NS_LITERAL_STRING("SVGError"), this, true);
-      mDocument = nullptr;
-    }
-  }
-
-private:
-  nsCOMPtr<nsIDocument> mDocument;
-  VectorImage* const mImage; // Raw pointer to owner.
-};
-
-NS_IMPL_ISUPPORTS(SVGLoadEventListener, nsIDOMEventListener)
-
-// Helper-class: SVGDrawingCallback
-class SVGDrawingCallback : public gfxDrawingCallback {
-public:
-  SVGDrawingCallback(SVGDocumentWrapper* aSVGDocumentWrapper,
-                     const IntRect& aViewport,
-                     const IntSize& aSize,
-                     uint32_t aImageFlags)
-    : mSVGDocumentWrapper(aSVGDocumentWrapper)
-    , mViewport(aViewport)
-    , mSize(aSize)
-    , mImageFlags(aImageFlags)
-  { }
-  virtual bool operator()(gfxContext* aContext,
-                          const gfxRect& aFillRect,
-                          const GraphicsFilter& aFilter,
-                          const gfxMatrix& aTransform);
-private:
-  nsRefPtr<SVGDocumentWrapper> mSVGDocumentWrapper;
-  const IntRect              mViewport;
-  const IntSize                mSize;
-  uint32_t                     mImageFlags;
-};
-
-// Based loosely on nsSVGIntegrationUtils' PaintFrameCallback::operator()
-bool
-SVGDrawingCallback::operator()(gfxContext* aContext,
-                               const gfxRect& aFillRect,
-                               const GraphicsFilter& aFilter,
-                               const gfxMatrix& aTransform)
-{
-  MOZ_ASSERT(mSVGDocumentWrapper, "need an SVGDocumentWrapper");
-
-  // Get (& sanity-check) the helper-doc's presShell
-  nsCOMPtr<nsIPresShell> presShell;
-  if (NS_FAILED(mSVGDocumentWrapper->GetPresShell(getter_AddRefs(presShell)))) {
-    NS_WARNING("Unable to draw -- presShell lookup failed");
-    return false;
-  }
-  MOZ_ASSERT(presShell, "GetPresShell succeeded but returned null");
-
-  gfxContextAutoSaveRestore contextRestorer(aContext);
-
-  // Clip to aFillRect so that we don't paint outside.
-  aContext->NewPath();
-  aContext->Rectangle(aFillRect);
-  aContext->Clip();
-
-  gfxMatrix matrix = aTransform;
-  if (!matrix.Invert()) {
-    return false;
-  }
-  aContext->SetMatrix(
-    aContext->CurrentMatrix().PreMultiply(matrix).
-                              Scale(double(mSize.width) / mViewport.width,
-                                    double(mSize.height) / mViewport.height));
-
-  nsPresContext* presContext = presShell->GetPresContext();
-  MOZ_ASSERT(presContext, "pres shell w/out pres context");
-
-  nsRect svgRect(presContext->DevPixelsToAppUnits(mViewport.x),
-                 presContext->DevPixelsToAppUnits(mViewport.y),
-                 presContext->DevPixelsToAppUnits(mViewport.width),
-                 presContext->DevPixelsToAppUnits(mViewport.height));
-
-  uint32_t renderDocFlags = nsIPresShell::RENDER_IGNORE_VIEWPORT_SCROLLING;
-  if (!(mImageFlags & imgIContainer::FLAG_SYNC_DECODE)) {
-    renderDocFlags |= nsIPresShell::RENDER_ASYNC_DECODE_IMAGES;
-  }
-
-  presShell->RenderDocument(svgRect, renderDocFlags,
-                            NS_RGBA(0, 0, 0, 0), // transparent
-                            aContext);
-
-  return true;
-}
-
-// Implement VectorImage's nsISupports-inherited methods
-NS_IMPL_ISUPPORTS(VectorImage,
-                  imgIContainer,
-                  nsIStreamListener,
-                  nsIRequestObserver)
-
-//------------------------------------------------------------------------------
-// Constructor / Destructor
-
-VectorImage::VectorImage(ImageURL* aURI /* = nullptr */) :
-  ImageResource(aURI), // invoke superclass's constructor
-  mLockCount(0),
-  mIsInitialized(false),
-  mIsFullyLoaded(false),
-  mIsDrawing(false),
-  mHaveAnimations(false),
-  mHasPendingInvalidation(false)
-{ }
-
-VectorImage::~VectorImage()
-{
-  CancelAllListeners();
-  SurfaceCache::RemoveImage(ImageKey(this));
-}
-
-//------------------------------------------------------------------------------
-// Methods inherited from Image.h
-
-nsresult
-VectorImage::Init(const char* aMimeType,
-                  uint32_t aFlags)
-{
-  // We don't support re-initialization
-  if (mIsInitialized) {
-    return NS_ERROR_ILLEGAL_VALUE;
-  }
-
-  MOZ_ASSERT(!mIsFullyLoaded && !mHaveAnimations && !mError,
-             "Flags unexpectedly set before initialization");
-  MOZ_ASSERT(!strcmp(aMimeType, IMAGE_SVG_XML), "Unexpected mimetype");
-
-  mDiscardable = !!(aFlags & INIT_FLAG_DISCARDABLE);
-
-  // Lock this image's surfaces in the SurfaceCache if we're not discardable.
-  if (!mDiscardable) {
-    mLockCount++;
-    SurfaceCache::LockImage(ImageKey(this));
-  }
-
-  mIsInitialized = true;
-  return NS_OK;
-}
-
-size_t
-VectorImage::SizeOfSourceWithComputedFallback(MallocSizeOf aMallocSizeOf) const
-{
-  nsIDocument* doc = mSVGDocumentWrapper->GetDocument();
-  if (!doc) {
-    return 0; // No document, so no memory used for the document.
-  }
-
-  nsWindowSizes windowSizes(aMallocSizeOf);
-  doc->DocAddSizeOfIncludingThis(&windowSizes);
-
-  if (windowSizes.getTotalSize() == 0) {
-    // MallocSizeOf fails on this platform. Because we also use this method for
-    // determining the size of cache entries, we need to return something
-    // reasonable here. Unfortunately, there's no way to estimate the document's
-    // size accurately, so we just use a constant value of 100KB, which will
-    // generally underestimate the true size.
-    return 100 * 1024;
-  }
-
-  return windowSizes.getTotalSize();
-}
-
-void
-VectorImage::CollectSizeOfSurfaces(nsTArray<SurfaceMemoryCounter>& aCounters,
-                                   MallocSizeOf aMallocSizeOf) const
-{
-  SurfaceCache::CollectSizeOfSurfaces(ImageKey(this), aCounters, aMallocSizeOf);
-}
-
-nsresult
-VectorImage::OnImageDataComplete(nsIRequest* aRequest,
-                                 nsISupports* aContext,
-                                 nsresult aStatus,
-                                 bool aLastPart)
-{
-  // Call our internal OnStopRequest method, which only talks to our embedded
-  // SVG document. This won't have any effect on our ProgressTracker.
-  nsresult finalStatus = OnStopRequest(aRequest, aContext, aStatus);
-
-  // Give precedence to Necko failure codes.
-  if (NS_FAILED(aStatus)) {
-    finalStatus = aStatus;
-  }
-
-  // Actually fire OnStopRequest.
-  if (mProgressTracker) {
-    mProgressTracker->SyncNotifyProgress(LoadCompleteProgress(aLastPart,
-                                                              mError,
-                                                              finalStatus));
-  }
-  return finalStatus;
-}
-
-nsresult
-VectorImage::OnImageDataAvailable(nsIRequest* aRequest,
-                                  nsISupports* aContext,
-                                  nsIInputStream* aInStr,
-                                  uint64_t aSourceOffset,
-                                  uint32_t aCount)
-{
-  return OnDataAvailable(aRequest, aContext, aInStr, aSourceOffset, aCount);
-}
-
-nsresult
-VectorImage::StartAnimation()
-{
-  if (mError) {
-    return NS_ERROR_FAILURE;
-  }
-
-  MOZ_ASSERT(ShouldAnimate(), "Should not animate!");
-
-  mSVGDocumentWrapper->StartAnimation();
-  return NS_OK;
-}
-
-nsresult
-VectorImage::StopAnimation()
-{
-  nsresult rv = NS_OK;
-  if (mError) {
-    rv = NS_ERROR_FAILURE;
-  } else {
-    MOZ_ASSERT(mIsFullyLoaded && mHaveAnimations,
-               "Should not have been animating!");
-
-    mSVGDocumentWrapper->StopAnimation();
-  }
-
-  mAnimating = false;
-  return rv;
-}
-
-bool
-VectorImage::ShouldAnimate()
-{
-  return ImageResource::ShouldAnimate() && mIsFullyLoaded && mHaveAnimations;
-}
-
-NS_IMETHODIMP_(void)
-VectorImage::SetAnimationStartTime(const TimeStamp& aTime)
-{
-  // We don't care about animation start time.
-}
-
-//------------------------------------------------------------------------------
-// imgIContainer methods
-
-//******************************************************************************
-/* readonly attribute int32_t width; */
-NS_IMETHODIMP
-VectorImage::GetWidth(int32_t* aWidth)
-{
-  if (mError || !mIsFullyLoaded) {
-    *aWidth = -1;
-  } else {
-    SVGSVGElement* rootElem = mSVGDocumentWrapper->GetRootSVGElem();
-    MOZ_ASSERT(rootElem, "Should have a root SVG elem, since we finished "
-                         "loading without errors");
-    *aWidth = rootElem->GetIntrinsicWidth();
-  }
-  return *aWidth >= 0 ? NS_OK : NS_ERROR_FAILURE;
-}
-
-//******************************************************************************
-/* [notxpcom] void requestRefresh ([const] in TimeStamp aTime); */
-NS_IMETHODIMP_(void)
-VectorImage::RequestRefresh(const TimeStamp& aTime)
-{
-  if (HadRecentRefresh(aTime)) {
-    return;
-  }
-
-  EvaluateAnimation();
-
-  mSVGDocumentWrapper->TickRefreshDriver();
-
-  if (mHasPendingInvalidation) {
-    SendInvalidationNotifications();
-    mHasPendingInvalidation = false;
-  }
-}
-
-void
-VectorImage::SendInvalidationNotifications()
-{
-  // Animated images don't send out invalidation notifications as soon as
-  // they're generated. Instead, InvalidateObserversOnNextRefreshDriverTick
-  // records that there are pending invalidations and then returns immediately.
-  // The notifications are actually sent from RequestRefresh(). We send these
-  // notifications there to ensure that there is actually a document observing
-  // us. Otherwise, the notifications are just wasted effort.
-  //
-  // Non-animated images call this method directly from
-  // InvalidateObserversOnNextRefreshDriverTick, because RequestRefresh is never
-  // called for them. Ordinarily this isn't needed, since we send out
-  // invalidation notifications in OnSVGDocumentLoaded, but in rare cases the
-  // SVG document may not be 100% ready to render at that time. In those cases
-  // we would miss the subsequent invalidations if we didn't send out the
-  // notifications directly in |InvalidateObservers...|.
-
-  if (mProgressTracker) {
-    SurfaceCache::RemoveImage(ImageKey(this));
-    mProgressTracker->SyncNotifyProgress(FLAG_FRAME_COMPLETE,
-                                         GetMaxSizedIntRect());
-  }
-}
-
-NS_IMETHODIMP_(IntRect)
-VectorImage::GetImageSpaceInvalidationRect(const IntRect& aRect)
-{
-  return aRect;
-}
-
-//******************************************************************************
-/* readonly attribute int32_t height; */
-NS_IMETHODIMP
-VectorImage::GetHeight(int32_t* aHeight)
-{
-  if (mError || !mIsFullyLoaded) {
-    *aHeight = -1;
-  } else {
-    SVGSVGElement* rootElem = mSVGDocumentWrapper->GetRootSVGElem();
-    MOZ_ASSERT(rootElem, "Should have a root SVG elem, since we finished "
-                         "loading without errors");
-    *aHeight = rootElem->GetIntrinsicHeight();
-  }
-  return *aHeight >= 0 ? NS_OK : NS_ERROR_FAILURE;
-}
-
-//******************************************************************************
-/* [noscript] readonly attribute nsSize intrinsicSize; */
-NS_IMETHODIMP
-VectorImage::GetIntrinsicSize(nsSize* aSize)
-{
-  if (mError || !mIsFullyLoaded) {
-    return NS_ERROR_FAILURE;
-  }
-
-  nsIFrame* rootFrame = mSVGDocumentWrapper->GetRootLayoutFrame();
-  if (!rootFrame) {
-    return NS_ERROR_FAILURE;
-  }
-
-  *aSize = nsSize(-1, -1);
-  IntrinsicSize rfSize = rootFrame->GetIntrinsicSize();
-  if (rfSize.width.GetUnit() == eStyleUnit_Coord) {
-    aSize->width = rfSize.width.GetCoordValue();
-  }
-  if (rfSize.height.GetUnit() == eStyleUnit_Coord) {
-    aSize->height = rfSize.height.GetCoordValue();
-  }
-
-  return NS_OK;
-}
-
-//******************************************************************************
-/* [noscript] readonly attribute nsSize intrinsicRatio; */
-NS_IMETHODIMP
-VectorImage::GetIntrinsicRatio(nsSize* aRatio)
-{
-  if (mError || !mIsFullyLoaded) {
-    return NS_ERROR_FAILURE;
-  }
-
-  nsIFrame* rootFrame = mSVGDocumentWrapper->GetRootLayoutFrame();
-  if (!rootFrame) {
-    return NS_ERROR_FAILURE;
-  }
-
-  *aRatio = rootFrame->GetIntrinsicRatio();
-  return NS_OK;
-}
-
-NS_IMETHODIMP_(Orientation)
-VectorImage::GetOrientation()
-{
-  return Orientation();
-}
-
-//******************************************************************************
-/* readonly attribute unsigned short type; */
-NS_IMETHODIMP
-VectorImage::GetType(uint16_t* aType)
-{
-  NS_ENSURE_ARG_POINTER(aType);
-
-  *aType = imgIContainer::TYPE_VECTOR;
-  return NS_OK;
-}
-
-//******************************************************************************
-/* readonly attribute boolean animated; */
-NS_IMETHODIMP
-VectorImage::GetAnimated(bool* aAnimated)
-{
-  if (mError || !mIsFullyLoaded) {
-    return NS_ERROR_FAILURE;
-  }
-
-  *aAnimated = mSVGDocumentWrapper->IsAnimated();
-  return NS_OK;
-}
-
-//******************************************************************************
-/* [notxpcom] int32_t getFirstFrameDelay (); */
-int32_t
-VectorImage::GetFirstFrameDelay()
-{
-  if (mError) {
-    return -1;
-  }
-
-  if (!mSVGDocumentWrapper->IsAnimated()) {
-    return -1;
-  }
-
-  // We don't really have a frame delay, so just pretend that we constantly
-  // need updates.
-  return 0;
-}
-
-NS_IMETHODIMP_(bool)
-VectorImage::IsOpaque()
-{
-  return false; // In general, SVG content is not opaque.
-}
-
-//******************************************************************************
-/* [noscript] SourceSurface getFrame(in uint32_t aWhichFrame,
- *                                   in uint32_t aFlags; */
-NS_IMETHODIMP_(TemporaryRef<SourceSurface>)
-VectorImage::GetFrame(uint32_t aWhichFrame,
-                      uint32_t aFlags)
-{
-  MOZ_ASSERT(aWhichFrame <= FRAME_MAX_VALUE);
-
-  if (aWhichFrame > FRAME_MAX_VALUE) {
-    return nullptr;
-  }
-
-  if (mError || !mIsFullyLoaded) {
-    return nullptr;
-  }
-
-  // Look up height & width
-  // ----------------------
-  SVGSVGElement* svgElem = mSVGDocumentWrapper->GetRootSVGElem();
-  MOZ_ASSERT(svgElem, "Should have a root SVG elem, since we finished "
-                      "loading without errors");
-  nsIntSize imageIntSize(svgElem->GetIntrinsicWidth(),
-                         svgElem->GetIntrinsicHeight());
-
-  if (imageIntSize.IsEmpty()) {
-    // We'll get here if our SVG doc has a percent-valued or negative width or
-    // height.
-    return nullptr;
-  }
-
-  // Make our surface the size of what will ultimately be drawn to it.
-  // (either the full image size, or the restricted region)
-  RefPtr<DrawTarget> dt = gfxPlatform::GetPlatform()->
-    CreateOffscreenContentDrawTarget(IntSize(imageIntSize.width,
-                                             imageIntSize.height),
-                                     SurfaceFormat::B8G8R8A8);
-  if (!dt) {
-    NS_ERROR("Could not create a DrawTarget");
-    return nullptr;
-  }
-
-  nsRefPtr<gfxContext> context = new gfxContext(dt);
-
-  auto result = Draw(context, imageIntSize,
-                     ImageRegion::Create(imageIntSize),
-                     aWhichFrame, GraphicsFilter::FILTER_NEAREST,
-                     Nothing(), aFlags);
-
-  return result == DrawResult::SUCCESS ? dt->Snapshot() : nullptr;
-}
-
-//******************************************************************************
-/* [noscript] ImageContainer getImageContainer(); */
-NS_IMETHODIMP_(already_AddRefed<ImageContainer>)
-VectorImage::GetImageContainer(LayerManager* aManager, uint32_t aFlags)
-{
-  return nullptr;
-}
-
-struct SVGDrawingParameters
-{
-  SVGDrawingParameters(gfxContext* aContext,
-                       const nsIntSize& aSize,
-                       const ImageRegion& aRegion,
-                       GraphicsFilter aFilter,
-                       const Maybe<SVGImageContext>& aSVGContext,
-                       float aAnimationTime,
-                       uint32_t aFlags)
-    : context(aContext)
-    , size(aSize.width, aSize.height)
-    , imageRect(0, 0, aSize.width, aSize.height)
-    , region(aRegion)
-    , filter(aFilter)
-    , svgContext(aSVGContext)
-    , viewportSize(aSize)
-    , animationTime(aAnimationTime)
-    , flags(aFlags)
-    , opacity(aSVGContext ? aSVGContext->GetGlobalOpacity() : 1.0)
-  {
-    if (aSVGContext) {
-      CSSIntSize sz = aSVGContext->GetViewportSize();
-      viewportSize = nsIntSize(sz.width, sz.height); // XXX losing unit
-    }
-  }
-
-  gfxContext*                   context;
-  IntSize                       size;
-  IntRect                       imageRect;
-  ImageRegion                   region;
-  GraphicsFilter                filter;
-  const Maybe<SVGImageContext>& svgContext;
-  nsIntSize                     viewportSize;
-  float                         animationTime;
-  uint32_t                      flags;
-  gfxFloat                      opacity;
-};
-
-//******************************************************************************
-/* [noscript] void draw(in gfxContext aContext,
- *                      [const] in nsIntSize aSize,
- *                      [const] in ImageRegion aRegion,
- *                      in uint32_t aWhichFrame,
- *                      in gfxGraphicsFilter aFilter,
- *                      [const] in MaybeSVGImageContext aSVGContext,
- *                      in uint32_t aFlags); */
-NS_IMETHODIMP_(DrawResult)
-VectorImage::Draw(gfxContext* aContext,
-                  const nsIntSize& aSize,
-                  const ImageRegion& aRegion,
-                  uint32_t aWhichFrame,
-                  GraphicsFilter aFilter,
-                  const Maybe<SVGImageContext>& aSVGContext,
-                  uint32_t aFlags)
-{
-  if (aWhichFrame > FRAME_MAX_VALUE) {
-    return DrawResult::BAD_ARGS;
-  }
-
-  if (!aContext) {
-    return DrawResult::BAD_ARGS;
-  }
-
-  if (mError) {
-    return DrawResult::BAD_IMAGE;
-  }
-
-  if (!mIsFullyLoaded) {
-    return DrawResult::NOT_READY;
-  }
-
-  if (mIsDrawing) {
-    NS_WARNING("Refusing to make re-entrant call to VectorImage::Draw");
-    return DrawResult::TEMPORARY_ERROR;
-  }
-
-  if (mAnimationConsumers == 0 && mProgressTracker) {
-    mProgressTracker->OnUnlockedDraw();
-  }
-
-  AutoRestore<bool> autoRestoreIsDrawing(mIsDrawing);
-  mIsDrawing = true;
-
-  float animTime =
-    (aWhichFrame == FRAME_FIRST) ? 0.0f
-                                 : mSVGDocumentWrapper->GetCurrentTime();
-  AutoSVGRenderingState autoSVGState(aSVGContext, animTime,
-                                     mSVGDocumentWrapper->GetRootSVGElem());
-
-  // Pack up the drawing parameters.
-  SVGDrawingParameters params(aContext, aSize, aRegion, aFilter,
-                              aSVGContext, animTime, aFlags);
-
-  if (aFlags & FLAG_BYPASS_SURFACE_CACHE) {
-    CreateSurfaceAndShow(params);
-    return DrawResult::SUCCESS;
-  }
-
-  DrawableFrameRef frameRef =
-    SurfaceCache::Lookup(ImageKey(this),
-                         VectorSurfaceKey(params.size,
-                                          params.svgContext,
-                                          params.animationTime));
-
-  // Draw.
-  if (frameRef) {
-    RefPtr<SourceSurface> surface = frameRef->GetSurface();
-    if (surface) {
-      nsRefPtr<gfxDrawable> svgDrawable =
-        new gfxSurfaceDrawable(surface, frameRef->GetSize());
-      Show(svgDrawable, params);
-      return DrawResult::SUCCESS;
-    }
-
-    // We lost our surface due to some catastrophic event.
-    RecoverFromLossOfSurfaces();
-  }
-
-  CreateSurfaceAndShow(params);
-
-  return DrawResult::SUCCESS;
-}
-
-void
-VectorImage::CreateSurfaceAndShow(const SVGDrawingParameters& aParams)
-{
-  mSVGDocumentWrapper->UpdateViewportBounds(aParams.viewportSize);
-  mSVGDocumentWrapper->FlushImageTransformInvalidation();
-
-  nsRefPtr<gfxDrawingCallback> cb =
-    new SVGDrawingCallback(mSVGDocumentWrapper,
-                           IntRect(IntPoint(0, 0), aParams.viewportSize),
-                           aParams.size,
-                           aParams.flags);
-
-  nsRefPtr<gfxDrawable> svgDrawable =
-    new gfxCallbackDrawable(cb, aParams.size);
-
-  bool bypassCache = bool(aParams.flags & FLAG_BYPASS_SURFACE_CACHE) ||
-                     // Refuse to cache animated images:
-                     // XXX(seth): We may remove this restriction in bug 922893.
-                     mHaveAnimations ||
-                     // The image is too big to fit in the cache:
-                     !SurfaceCache::CanHold(aParams.size);
-  if (bypassCache) {
-    return Show(svgDrawable, aParams);
-  }
-
-  // We're about to rerasterize, which may mean that some of the previous
-  // surfaces we've rasterized aren't useful anymore. We can allow them to
-  // expire from the cache by unlocking them here, and then sending out an
-  // invalidation. If this image is locked, any surfaces that are still useful
-  // will become locked again when Draw touches them, and the remainder will
-  // eventually expire.
-  SurfaceCache::UnlockSurfaces(ImageKey(this));
-
-  // Try to create an imgFrame, initializing the surface it contains by drawing
-  // our gfxDrawable into it. (We use FILTER_NEAREST since we never scale here.)
-  nsRefPtr<imgFrame> frame = new imgFrame;
-  nsresult rv =
-    frame->InitWithDrawable(svgDrawable, aParams.size,
-                            SurfaceFormat::B8G8R8A8,
-                            GraphicsFilter::FILTER_NEAREST, aParams.flags);
-
-  // If we couldn't create the frame, it was probably because it would end
-  // up way too big. Generally it also wouldn't fit in the cache, but the prefs
-  // could be set such that the cache isn't the limiting factor.
-  if (NS_FAILED(rv)) {
-    return Show(svgDrawable, aParams);
-  }
-
-  // Take a strong reference to the frame's surface and make sure it hasn't
-  // already been purged by the operating system.
-  RefPtr<SourceSurface> surface = frame->GetSurface();
-  if (!surface) {
-    return Show(svgDrawable, aParams);
-  }
-
-  // Attempt to cache the frame.
-  SurfaceCache::Insert(frame, ImageKey(this),
-                       VectorSurfaceKey(aParams.size,
-                                        aParams.svgContext,
-                                        aParams.animationTime),
-                       Lifetime::Persistent);
-
-  // Draw.
-  nsRefPtr<gfxDrawable> drawable =
-    new gfxSurfaceDrawable(surface, aParams.size);
-  Show(drawable, aParams);
-
-  // Send out an invalidation so that surfaces that are still in use get
-  // re-locked. See the discussion of the UnlockSurfaces call above.
-  mProgressTracker->SyncNotifyProgress(FLAG_FRAME_COMPLETE,
-                                       GetMaxSizedIntRect());
-}
-
-
-void
-VectorImage::Show(gfxDrawable* aDrawable, const SVGDrawingParameters& aParams)
-{
-  MOZ_ASSERT(aDrawable, "Should have a gfxDrawable by now");
-  gfxUtils::DrawPixelSnapped(aParams.context, aDrawable,
-                             aParams.size,
-                             aParams.region,
-                             SurfaceFormat::B8G8R8A8,
-                             aParams.filter, aParams.flags, aParams.opacity);
-
-  MOZ_ASSERT(mRenderingObserver, "Should have a rendering observer by now");
-  mRenderingObserver->ResumeHonoringInvalidations();
-}
-
-void
-VectorImage::RecoverFromLossOfSurfaces()
-{
-  NS_WARNING("An imgFrame became invalid. Attempting to recover...");
-
-  // Discard all existing frames, since they're probably all now invalid.
-  SurfaceCache::RemoveImage(ImageKey(this));
-}
-
-//******************************************************************************
-/* void requestDecode() */
-NS_IMETHODIMP
-VectorImage::RequestDecode()
-{
-  // Nothing to do for SVG images
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-VectorImage::StartDecoding()
-{
-  // Nothing to do for SVG images
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-VectorImage::RequestDecodeForSize(const nsIntSize& aSize, uint32_t aFlags)
-{
-  // Nothing to do for SVG images, though in theory we could rasterize to the
-  // provided size ahead of time if we supported off-main-thread SVG
-  // rasterization...
-  return NS_OK;
-}
-
-//******************************************************************************
-/* void lockImage() */
-NS_IMETHODIMP
-VectorImage::LockImage()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  if (mError) {
-    return NS_ERROR_FAILURE;
-  }
-
-  mLockCount++;
-
-  if (mLockCount == 1) {
-    // Lock this image's surfaces in the SurfaceCache.
-    SurfaceCache::LockImage(ImageKey(this));
-  }
-
-  return NS_OK;
-}
-
-//******************************************************************************
-/* void unlockImage() */
-NS_IMETHODIMP
-VectorImage::UnlockImage()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  if (mError) {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (mLockCount == 0) {
-    MOZ_ASSERT_UNREACHABLE("Calling UnlockImage with a zero lock count");
-    return NS_ERROR_ABORT;
-  }
-
-  mLockCount--;
-
-  if (mLockCount == 0) {
-    // Unlock this image's surfaces in the SurfaceCache.
-    SurfaceCache::UnlockImage(ImageKey(this));
-  }
-
-  return NS_OK;
-}
-
-//******************************************************************************
-/* void requestDiscard() */
-NS_IMETHODIMP
-VectorImage::RequestDiscard()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  if (mDiscardable && mLockCount == 0) {
-    SurfaceCache::RemoveImage(ImageKey(this));
-    mProgressTracker->OnDiscard();
-  }
-
-  return NS_OK;
-}
-
-void
-VectorImage::OnSurfaceDiscarded()
-{
-  MOZ_ASSERT(mProgressTracker);
-
-  nsCOMPtr<nsIRunnable> runnable =
-    NS_NewRunnableMethod(mProgressTracker, &ProgressTracker::OnDiscard);
-  NS_DispatchToMainThread(runnable);
-}
-
-//******************************************************************************
-/* void resetAnimation (); */
-NS_IMETHODIMP
-VectorImage::ResetAnimation()
-{
-  if (mError) {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (!mIsFullyLoaded || !mHaveAnimations) {
-    return NS_OK; // There are no animations to be reset.
-  }
-
-  mSVGDocumentWrapper->ResetAnimation();
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP_(float)
-VectorImage::GetFrameIndex(uint32_t aWhichFrame)
-{
-  MOZ_ASSERT(aWhichFrame <= FRAME_MAX_VALUE, "Invalid argument");
-  return aWhichFrame == FRAME_FIRST
-         ? 0.0f
-         : mSVGDocumentWrapper->GetCurrentTime();
-}
-
-//------------------------------------------------------------------------------
-// nsIRequestObserver methods
-
-//******************************************************************************
-/* void onStartRequest(in nsIRequest request, in nsISupports ctxt); */
-NS_IMETHODIMP
-VectorImage::OnStartRequest(nsIRequest* aRequest, nsISupports* aCtxt)
-{
-  MOZ_ASSERT(!mSVGDocumentWrapper,
-             "Repeated call to OnStartRequest -- can this happen?");
-
-  mSVGDocumentWrapper = new SVGDocumentWrapper();
-  nsresult rv = mSVGDocumentWrapper->OnStartRequest(aRequest, aCtxt);
-  if (NS_FAILED(rv)) {
-    mSVGDocumentWrapper = nullptr;
-    mError = true;
-    return rv;
-  }
-
-  // Sending StartDecode will block page load until the document's ready.  (We
-  // unblock it by sending StopDecode in OnSVGDocumentLoaded or
-  // OnSVGDocumentError.)
-  if (mProgressTracker) {
-    mProgressTracker->SyncNotifyProgress(FLAG_DECODE_STARTED |
-                                         FLAG_ONLOAD_BLOCKED);
-  }
-
-  // Create a listener to wait until the SVG document is fully loaded, which
-  // will signal that this image is ready to render. Certain error conditions
-  // will prevent us from ever getting this notification, so we also create a
-  // listener that waits for parsing to complete and cancels the
-  // SVGLoadEventListener if needed. The listeners are automatically attached
-  // to the document by their constructors.
-  nsIDocument* document = mSVGDocumentWrapper->GetDocument();
-  mLoadEventListener = new SVGLoadEventListener(document, this);
-  mParseCompleteListener = new SVGParseCompleteListener(document, this);
-
-  return NS_OK;
-}
-
-//******************************************************************************
-/* void onStopRequest(in nsIRequest request, in nsISupports ctxt,
-                      in nsresult status); */
-NS_IMETHODIMP
-VectorImage::OnStopRequest(nsIRequest* aRequest, nsISupports* aCtxt,
-                           nsresult aStatus)
-{
-  if (mError) {
-    return NS_ERROR_FAILURE;
-  }
-
-  return mSVGDocumentWrapper->OnStopRequest(aRequest, aCtxt, aStatus);
-}
-
-void
-VectorImage::OnSVGDocumentParsed()
-{
-  MOZ_ASSERT(mParseCompleteListener, "Should have the parse complete listener");
-  MOZ_ASSERT(mLoadEventListener, "Should have the load event listener");
-
-  if (!mSVGDocumentWrapper->GetRootSVGElem()) {
-    // This is an invalid SVG document. It may have failed to parse, or it may
-    // be missing the <svg> root element, or the <svg> root element may not
-    // declare the correct namespace. In any of these cases, we'll never be
-    // notified that the SVG finished loading, so we need to treat this as an
-    // error.
-    OnSVGDocumentError();
-  }
-}
-
-void
-VectorImage::CancelAllListeners()
-{
-  if (mParseCompleteListener) {
-    mParseCompleteListener->Cancel();
-    mParseCompleteListener = nullptr;
-  }
-  if (mLoadEventListener) {
-    mLoadEventListener->Cancel();
-    mLoadEventListener = nullptr;
-  }
-}
-
-void
-VectorImage::OnSVGDocumentLoaded()
-{
-  MOZ_ASSERT(mSVGDocumentWrapper->GetRootSVGElem(),
-             "Should have parsed successfully");
-  MOZ_ASSERT(!mIsFullyLoaded && !mHaveAnimations,
-             "These flags shouldn't get set until OnSVGDocumentLoaded. "
-             "Duplicate calls to OnSVGDocumentLoaded?");
-
-  CancelAllListeners();
-
-  // XXX Flushing is wasteful if embedding frame hasn't had initial reflow.
-  mSVGDocumentWrapper->FlushLayout();
-
-  mIsFullyLoaded = true;
-  mHaveAnimations = mSVGDocumentWrapper->IsAnimated();
-
-  // Start listening to our image for rendering updates.
-  mRenderingObserver = new SVGRootRenderingObserver(mSVGDocumentWrapper, this);
-
-  // Tell *our* observers that we're done loading.
-  if (mProgressTracker) {
-    mProgressTracker->SyncNotifyProgress(FLAG_SIZE_AVAILABLE |
-                                         FLAG_HAS_TRANSPARENCY |
-                                         FLAG_FRAME_COMPLETE |
-                                         FLAG_DECODE_COMPLETE |
-                                         FLAG_ONLOAD_UNBLOCKED,
-                                         GetMaxSizedIntRect());
-  }
-
-  EvaluateAnimation();
-}
-
-void
-VectorImage::OnSVGDocumentError()
-{
-  CancelAllListeners();
-
-  // XXXdholbert Need to do something more for the parsing failed case -- right
-  // now, this just makes us draw the "object" icon, rather than the (jagged)
-  // "broken image" icon.  See bug 594505.
-  mError = true;
-
-  if (mProgressTracker) {
-    // Unblock page load.
-    mProgressTracker->SyncNotifyProgress(FLAG_DECODE_COMPLETE |
-                                         FLAG_ONLOAD_UNBLOCKED |
-                                         FLAG_HAS_ERROR);
-  }
-}
-
-//------------------------------------------------------------------------------
-// nsIStreamListener method
-
-//******************************************************************************
-/* void onDataAvailable(in nsIRequest request, in nsISupports ctxt,
-                        in nsIInputStream inStr, in unsigned long sourceOffset,
-                        in unsigned long count); */
-NS_IMETHODIMP
-VectorImage::OnDataAvailable(nsIRequest* aRequest, nsISupports* aCtxt,
-                             nsIInputStream* aInStr, uint64_t aSourceOffset,
-                             uint32_t aCount)
-{
-  if (mError) {
-    return NS_ERROR_FAILURE;
-  }
-
-  return mSVGDocumentWrapper->OnDataAvailable(aRequest, aCtxt, aInStr,
-                                              aSourceOffset, aCount);
-}
-
-// --------------------------
-// Invalidation helper method
-
-void
-VectorImage::InvalidateObserversOnNextRefreshDriverTick()
-{
-  if (mHaveAnimations) {
-    mHasPendingInvalidation = true;
-  } else {
-    SendInvalidationNotifications();
-  }
-}
-
-nsIntSize
-VectorImage::OptimalImageSizeForDest(const gfxSize& aDest,
-                                     uint32_t aWhichFrame,
-                                     GraphicsFilter aFilter,
-                                     uint32_t aFlags)
-{
-  MOZ_ASSERT(aDest.width >= 0 || ceil(aDest.width) <= INT32_MAX ||
-             aDest.height >= 0 || ceil(aDest.height) <= INT32_MAX,
-             "Unexpected destination size");
-
-  // We can rescale SVGs freely, so just return the provided destination size.
-  return nsIntSize(ceil(aDest.width), ceil(aDest.height));
-}
-
-already_AddRefed<imgIContainer>
-VectorImage::Unwrap()
-{
-  nsCOMPtr<imgIContainer> self(this);
-  return self.forget();
-}
-
-} // namespace image
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/src/VectorImage.h firefox-trunk-41.0~a1~hg20150524r245419/image/src/VectorImage.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/src/VectorImage.h	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/src/VectorImage.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,127 +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_image_src_VectorImage_h
-#define mozilla_image_src_VectorImage_h
-
-#include "Image.h"
-#include "nsIStreamListener.h"
-#include "mozilla/MemoryReporting.h"
-
-class nsIRequest;
-class gfxDrawable;
-
-namespace mozilla {
-namespace image {
-
-struct SVGDrawingParameters;
-class  SVGDocumentWrapper;
-class  SVGRootRenderingObserver;
-class  SVGLoadEventListener;
-class  SVGParseCompleteListener;
-
-class VectorImage final : public ImageResource,
-                          public nsIStreamListener
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIREQUESTOBSERVER
-  NS_DECL_NSISTREAMLISTENER
-  NS_DECL_IMGICONTAINER
-
-  // (no public constructor - use ImageFactory)
-
-  // Methods inherited from Image
-  virtual size_t SizeOfSourceWithComputedFallback(MallocSizeOf aMallocSizeOf)
-    const override;
-  virtual void CollectSizeOfSurfaces(nsTArray<SurfaceMemoryCounter>& aCounters,
-                                     MallocSizeOf aMallocSizeOf) const override;
-
-  virtual nsresult OnImageDataAvailable(nsIRequest* aRequest,
-                                        nsISupports* aContext,
-                                        nsIInputStream* aInStr,
-                                        uint64_t aSourceOffset,
-                                        uint32_t aCount) override;
-  virtual nsresult OnImageDataComplete(nsIRequest* aRequest,
-                                       nsISupports* aContext,
-                                       nsresult aResult,
-                                       bool aLastPart) override;
-
-  void OnSurfaceDiscarded() override;
-
-  /**
-   * Callback for SVGRootRenderingObserver.
-   *
-   * This just sets a dirty flag that we check in VectorImage::RequestRefresh,
-   * which is called under the ticks of the refresh driver of any observing
-   * documents that we may have. Only then (after all animations in this image
-   * have been updated) do we send out "frame changed" notifications,
-   */
-  void InvalidateObserversOnNextRefreshDriverTick();
-
-  // Callback for SVGParseCompleteListener.
-  void OnSVGDocumentParsed();
-
-  // Callbacks for SVGLoadEventListener.
-  void OnSVGDocumentLoaded();
-  void OnSVGDocumentError();
-
-protected:
-  explicit VectorImage(ImageURL* aURI = nullptr);
-  virtual ~VectorImage();
-
-  virtual nsresult StartAnimation() override;
-  virtual nsresult StopAnimation() override;
-  virtual bool     ShouldAnimate() override;
-
-  void CreateSurfaceAndShow(const SVGDrawingParameters& aParams);
-  void Show(gfxDrawable* aDrawable, const SVGDrawingParameters& aParams);
-
-private:
-  nsresult Init(const char* aMimeType, uint32_t aFlags);
-
-  /**
-   * In catastrophic circumstances like a GPU driver crash, we may lose our
-   * surfaces even if they're locked. RecoverFromLossOfSurfaces discards all
-   * existing surfaces, allowing us to recover.
-   */
-  void RecoverFromLossOfSurfaces();
-
-  void CancelAllListeners();
-  void SendInvalidationNotifications();
-
-  nsRefPtr<SVGDocumentWrapper>       mSVGDocumentWrapper;
-  nsRefPtr<SVGRootRenderingObserver> mRenderingObserver;
-  nsRefPtr<SVGLoadEventListener>     mLoadEventListener;
-  nsRefPtr<SVGParseCompleteListener> mParseCompleteListener;
-
-  /// Count of locks on this image (roughly correlated to visible instances).
-  uint32_t mLockCount;
-
-  bool           mIsInitialized;          // Have we been initialized?
-  bool           mDiscardable;            // Are we discardable?
-  bool           mIsFullyLoaded;          // Has the SVG document finished
-                                          // loading?
-  bool           mIsDrawing;              // Are we currently drawing?
-  bool           mHaveAnimations;         // Is our SVG content SMIL-animated?
-                                          // (Only set after mIsFullyLoaded.)
-  bool           mHasPendingInvalidation; // Invalidate observers next refresh
-                                          // driver tick.
-
-  friend class ImageFactory;
-};
-
-inline NS_IMETHODIMP VectorImage::GetAnimationMode(uint16_t* aAnimationMode) {
-  return GetAnimationModeInternal(aAnimationMode);
-}
-
-inline NS_IMETHODIMP VectorImage::SetAnimationMode(uint16_t aAnimationMode) {
-  return SetAnimationModeInternal(aAnimationMode);
-}
-
-} // namespace image
-} // namespace mozilla
-
-#endif // mozilla_image_src_VectorImage_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/SurfaceCache.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/SurfaceCache.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/SurfaceCache.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/SurfaceCache.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,1101 @@
+/* -*- 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/. */
+
+/**
+ * SurfaceCache is a service for caching temporary surfaces in imagelib.
+ */
+
+#include "SurfaceCache.h"
+
+#include <algorithm>
+#include "mozilla/Assertions.h"
+#include "mozilla/Attributes.h"
+#include "mozilla/DebugOnly.h"
+#include "mozilla/Likely.h"
+#include "mozilla/Move.h"
+#include "mozilla/Mutex.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/StaticPtr.h"
+#include "nsIMemoryReporter.h"
+#include "gfx2DGlue.h"
+#include "gfxPattern.h"  // Workaround for flaw in bug 921753 part 2.
+#include "gfxPlatform.h"
+#include "gfxPrefs.h"
+#include "imgFrame.h"
+#include "Image.h"
+#include "nsAutoPtr.h"
+#include "nsExpirationTracker.h"
+#include "nsHashKeys.h"
+#include "nsRefPtrHashtable.h"
+#include "nsSize.h"
+#include "nsTArray.h"
+#include "prsystem.h"
+#include "ShutdownTracker.h"
+#include "SVGImageContext.h"
+
+using std::max;
+using std::min;
+
+namespace mozilla {
+
+using namespace gfx;
+
+namespace image {
+
+class CachedSurface;
+class SurfaceCacheImpl;
+
+///////////////////////////////////////////////////////////////////////////////
+// Static Data
+///////////////////////////////////////////////////////////////////////////////
+
+// The single surface cache instance.
+static StaticRefPtr<SurfaceCacheImpl> sInstance;
+
+///////////////////////////////////////////////////////////////////////////////
+// SurfaceCache Implementation
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Cost models the cost of storing a surface in the cache. Right now, this is
+ * simply an estimate of the size of the surface in bytes, but in the future it
+ * may be worth taking into account the cost of rematerializing the surface as
+ * well.
+ */
+typedef size_t Cost;
+
+static Cost
+ComputeCost(const IntSize& aSize, uint32_t aBytesPerPixel)
+{
+  MOZ_ASSERT(aBytesPerPixel == 1 || aBytesPerPixel == 4);
+  return aSize.width * aSize.height * aBytesPerPixel;
+}
+
+/**
+ * Since we want to be able to make eviction decisions based on cost, we need to
+ * be able to look up the CachedSurface which has a certain cost as well as the
+ * cost associated with a certain CachedSurface. To make this possible, in data
+ * structures we actually store a CostEntry, which contains a weak pointer to
+ * its associated surface.
+ *
+ * To make usage of the weak pointer safe, SurfaceCacheImpl always calls
+ * StartTracking after a surface is stored in the cache and StopTracking before
+ * it is removed.
+ */
+class CostEntry
+{
+public:
+  CostEntry(CachedSurface* aSurface, Cost aCost)
+    : mSurface(aSurface)
+    , mCost(aCost)
+  {
+    MOZ_ASSERT(aSurface, "Must have a surface");
+  }
+
+  CachedSurface* GetSurface() const { return mSurface; }
+  Cost GetCost() const { return mCost; }
+
+  bool operator==(const CostEntry& aOther) const
+  {
+    return mSurface == aOther.mSurface &&
+           mCost == aOther.mCost;
+  }
+
+  bool operator<(const CostEntry& aOther) const
+  {
+    return mCost < aOther.mCost ||
+           (mCost == aOther.mCost && mSurface < aOther.mSurface);
+  }
+
+private:
+  CachedSurface* mSurface;
+  Cost           mCost;
+};
+
+/**
+ * A CachedSurface associates a surface with a key that uniquely identifies that
+ * surface.
+ */
+class CachedSurface
+{
+  ~CachedSurface() { }
+public:
+  MOZ_DECLARE_REFCOUNTED_TYPENAME(CachedSurface)
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(CachedSurface)
+
+  CachedSurface(imgFrame*          aSurface,
+                const Cost         aCost,
+                const ImageKey     aImageKey,
+                const SurfaceKey&  aSurfaceKey,
+                const Lifetime     aLifetime)
+    : mSurface(aSurface)
+    , mCost(aCost)
+    , mImageKey(aImageKey)
+    , mSurfaceKey(aSurfaceKey)
+    , mLifetime(aLifetime)
+  {
+    MOZ_ASSERT(mSurface, "Must have a valid surface");
+    MOZ_ASSERT(mImageKey, "Must have a valid image key");
+  }
+
+  DrawableFrameRef DrawableRef() const
+  {
+    return mSurface->DrawableRef();
+  }
+
+  void SetLocked(bool aLocked)
+  {
+    if (aLocked && mLifetime == Lifetime::Persistent) {
+      // This may fail, and that's OK. We make no guarantees about whether
+      // locking is successful if you call SurfaceCache::LockImage() after
+      // SurfaceCache::Insert().
+      mDrawableRef = mSurface->DrawableRef();
+    } else {
+      mDrawableRef.reset();
+    }
+  }
+
+  bool IsLocked() const { return bool(mDrawableRef); }
+
+  ImageKey GetImageKey() const { return mImageKey; }
+  SurfaceKey GetSurfaceKey() const { return mSurfaceKey; }
+  CostEntry GetCostEntry() { return image::CostEntry(this, mCost); }
+  nsExpirationState* GetExpirationState() { return &mExpirationState; }
+  Lifetime GetLifetime() const { return mLifetime; }
+  bool IsDecoded() const { return mSurface->IsImageComplete(); }
+
+  // A helper type used by SurfaceCacheImpl::CollectSizeOfSurfaces.
+  struct MOZ_STACK_CLASS SurfaceMemoryReport
+  {
+    SurfaceMemoryReport(nsTArray<SurfaceMemoryCounter>& aCounters,
+                        MallocSizeOf                    aMallocSizeOf)
+      : mCounters(aCounters)
+      , mMallocSizeOf(aMallocSizeOf)
+    { }
+
+    void Add(CachedSurface* aCachedSurface)
+    {
+      MOZ_ASSERT(aCachedSurface, "Should have a CachedSurface");
+
+      SurfaceMemoryCounter counter(aCachedSurface->GetSurfaceKey(),
+                                   aCachedSurface->IsLocked());
+
+      if (aCachedSurface->mSurface) {
+        counter.SubframeSize() = Some(aCachedSurface->mSurface->GetSize());
+
+        size_t heap = aCachedSurface->mSurface
+          ->SizeOfExcludingThis(gfxMemoryLocation::IN_PROCESS_HEAP,
+                                mMallocSizeOf);
+        counter.Values().SetDecodedHeap(heap);
+
+        size_t nonHeap = aCachedSurface->mSurface
+          ->SizeOfExcludingThis(gfxMemoryLocation::IN_PROCESS_NONHEAP, nullptr);
+        counter.Values().SetDecodedNonHeap(nonHeap);
+      }
+
+      mCounters.AppendElement(counter);
+    }
+
+  private:
+    nsTArray<SurfaceMemoryCounter>& mCounters;
+    MallocSizeOf                    mMallocSizeOf;
+  };
+
+private:
+  nsExpirationState  mExpirationState;
+  nsRefPtr<imgFrame> mSurface;
+  DrawableFrameRef   mDrawableRef;
+  const Cost         mCost;
+  const ImageKey     mImageKey;
+  const SurfaceKey   mSurfaceKey;
+  const Lifetime     mLifetime;
+};
+
+/**
+ * An ImageSurfaceCache is a per-image surface cache. For correctness we must be
+ * able to remove all surfaces associated with an image when the image is
+ * destroyed or invalidated. Since this will happen frequently, it makes sense
+ * to make it cheap by storing the surfaces for each image separately.
+ *
+ * ImageSurfaceCache also keeps track of whether its associated image is locked
+ * or unlocked.
+ */
+class ImageSurfaceCache
+{
+  ~ImageSurfaceCache() { }
+public:
+  ImageSurfaceCache() : mLocked(false) { }
+
+  MOZ_DECLARE_REFCOUNTED_TYPENAME(ImageSurfaceCache)
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(ImageSurfaceCache)
+
+  typedef
+    nsRefPtrHashtable<nsGenericHashKey<SurfaceKey>, CachedSurface> SurfaceTable;
+
+  bool IsEmpty() const { return mSurfaces.Count() == 0; }
+
+  void Insert(const SurfaceKey& aKey, CachedSurface* aSurface)
+  {
+    MOZ_ASSERT(aSurface, "Should have a surface");
+    MOZ_ASSERT(!mLocked || aSurface->GetLifetime() != Lifetime::Persistent ||
+               aSurface->IsLocked(),
+               "Inserting an unlocked persistent surface for a locked image");
+    mSurfaces.Put(aKey, aSurface);
+  }
+
+  void Remove(CachedSurface* aSurface)
+  {
+    MOZ_ASSERT(aSurface, "Should have a surface");
+    MOZ_ASSERT(mSurfaces.GetWeak(aSurface->GetSurfaceKey()),
+        "Should not be removing a surface we don't have");
+
+    mSurfaces.Remove(aSurface->GetSurfaceKey());
+  }
+
+  already_AddRefed<CachedSurface> Lookup(const SurfaceKey& aSurfaceKey)
+  {
+    nsRefPtr<CachedSurface> surface;
+    mSurfaces.Get(aSurfaceKey, getter_AddRefs(surface));
+    return surface.forget();
+  }
+
+  already_AddRefed<CachedSurface>
+  LookupBestMatch(const SurfaceKey&      aSurfaceKey,
+                  const Maybe<uint32_t>& aAlternateFlags)
+  {
+    // Try for a perfect match first.
+    nsRefPtr<CachedSurface> surface;
+    mSurfaces.Get(aSurfaceKey, getter_AddRefs(surface));
+    if (surface && surface->IsDecoded()) {
+      return surface.forget();
+    }
+
+    // There's no perfect match, so find the best match we can.
+    MatchContext matchContext(aSurfaceKey, aAlternateFlags);
+    ForEach(TryToImproveMatch, &matchContext);
+    return matchContext.mBestMatch.forget();
+  }
+
+  void ForEach(SurfaceTable::EnumReadFunction aFunction, void* aData)
+  {
+    mSurfaces.EnumerateRead(aFunction, aData);
+  }
+
+  void SetLocked(bool aLocked) { mLocked = aLocked; }
+  bool IsLocked() const { return mLocked; }
+
+private:
+  struct MatchContext
+  {
+    MatchContext(const SurfaceKey& aIdealKey,
+                 const Maybe<uint32_t>& aAlternateFlags)
+      : mIdealKey(aIdealKey)
+      , mAlternateFlags(aAlternateFlags)
+    { }
+
+    const SurfaceKey& mIdealKey;
+    const Maybe<uint32_t> mAlternateFlags;
+    nsRefPtr<CachedSurface> mBestMatch;
+  };
+
+  static PLDHashOperator TryToImproveMatch(const SurfaceKey& aSurfaceKey,
+                                           CachedSurface*    aSurface,
+                                           void*             aContext)
+  {
+    auto context = static_cast<MatchContext*>(aContext);
+    const SurfaceKey& idealKey = context->mIdealKey;
+
+    // Matching the animation time and SVG context is required.
+    if (aSurfaceKey.AnimationTime() != idealKey.AnimationTime() ||
+        aSurfaceKey.SVGContext() != idealKey.SVGContext()) {
+      return PL_DHASH_NEXT;
+    }
+
+    // Matching the flags is required, but we can match the alternate flags as
+    // well if some were provided.
+    if (aSurfaceKey.Flags() != idealKey.Flags() &&
+        Some(aSurfaceKey.Flags()) != context->mAlternateFlags) {
+      return PL_DHASH_NEXT;
+    }
+
+    // Anything is better than nothing! (Within the constraints we just
+    // checked, of course.)
+    if (!context->mBestMatch) {
+      context->mBestMatch = aSurface;
+      return PL_DHASH_NEXT;
+    }
+
+    MOZ_ASSERT(context->mBestMatch, "Should have a current best match");
+
+    // Always prefer completely decoded surfaces.
+    bool bestMatchIsDecoded = context->mBestMatch->IsDecoded();
+    if (bestMatchIsDecoded && !aSurface->IsDecoded()) {
+      return PL_DHASH_NEXT;
+    }
+    if (!bestMatchIsDecoded && aSurface->IsDecoded()) {
+      context->mBestMatch = aSurface;
+      return PL_DHASH_NEXT;
+    }
+
+    SurfaceKey bestMatchKey = context->mBestMatch->GetSurfaceKey();
+
+    // Compare sizes. We use an area-based heuristic here instead of computing a
+    // truly optimal answer, since it seems very unlikely to make a difference
+    // for realistic sizes.
+    int64_t idealArea = idealKey.Size().width * idealKey.Size().height;
+    int64_t surfaceArea = aSurfaceKey.Size().width * aSurfaceKey.Size().height;
+    int64_t bestMatchArea =
+      bestMatchKey.Size().width * bestMatchKey.Size().height;
+
+    // If the best match is smaller than the ideal size, prefer bigger sizes.
+    if (bestMatchArea < idealArea) {
+      if (surfaceArea > bestMatchArea) {
+        context->mBestMatch = aSurface;
+      }
+      return PL_DHASH_NEXT;
+    }
+
+    // Other, prefer sizes closer to the ideal size, but still not smaller.
+    if (idealArea <= surfaceArea && surfaceArea < bestMatchArea) {
+      context->mBestMatch = aSurface;
+      return PL_DHASH_NEXT;
+    }
+
+    // This surface isn't an improvement over the current best match.
+    return PL_DHASH_NEXT;
+  }
+
+  SurfaceTable mSurfaces;
+  bool         mLocked;
+};
+
+/**
+ * SurfaceCacheImpl is responsible for determining which surfaces will be cached
+ * and managing the surface cache data structures. Rather than interact with
+ * SurfaceCacheImpl directly, client code interacts with SurfaceCache, which
+ * maintains high-level invariants and encapsulates the details of the surface
+ * cache's implementation.
+ */
+class SurfaceCacheImpl final : public nsIMemoryReporter
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  SurfaceCacheImpl(uint32_t aSurfaceCacheExpirationTimeMS,
+                   uint32_t aSurfaceCacheDiscardFactor,
+                   uint32_t aSurfaceCacheSize)
+    : mExpirationTracker(aSurfaceCacheExpirationTimeMS)
+    , mMemoryPressureObserver(new MemoryPressureObserver)
+    , mMutex("SurfaceCache")
+    , mDiscardFactor(aSurfaceCacheDiscardFactor)
+    , mMaxCost(aSurfaceCacheSize)
+    , mAvailableCost(aSurfaceCacheSize)
+    , mLockedCost(0)
+  {
+    nsCOMPtr<nsIObserverService> os = services::GetObserverService();
+    if (os) {
+      os->AddObserver(mMemoryPressureObserver, "memory-pressure", false);
+    }
+  }
+
+private:
+  virtual ~SurfaceCacheImpl()
+  {
+    nsCOMPtr<nsIObserverService> os = services::GetObserverService();
+    if (os) {
+      os->RemoveObserver(mMemoryPressureObserver, "memory-pressure");
+    }
+
+    UnregisterWeakMemoryReporter(this);
+  }
+
+public:
+  void InitMemoryReporter() { RegisterWeakMemoryReporter(this); }
+
+  Mutex& GetMutex() { return mMutex; }
+
+  InsertOutcome Insert(imgFrame*         aSurface,
+                       const Cost        aCost,
+                       const ImageKey    aImageKey,
+                       const SurfaceKey& aSurfaceKey,
+                       Lifetime          aLifetime)
+  {
+    // If this is a duplicate surface, refuse to replace the original.
+    if (MOZ_UNLIKELY(Lookup(aImageKey, aSurfaceKey))) {
+      return InsertOutcome::FAILURE_ALREADY_PRESENT;
+    }
+
+    // If this is bigger than we can hold after discarding everything we can,
+    // refuse to cache it.
+    if (MOZ_UNLIKELY(!CanHoldAfterDiscarding(aCost))) {
+      return InsertOutcome::FAILURE;
+    }
+
+    // Remove elements in order of cost until we can fit this in the cache. Note
+    // that locked surfaces aren't in mCosts, so we never remove them here.
+    while (aCost > mAvailableCost) {
+      MOZ_ASSERT(!mCosts.IsEmpty(),
+                 "Removed everything and it still won't fit");
+      Remove(mCosts.LastElement().GetSurface());
+    }
+
+    // Locate the appropriate per-image cache. If there's not an existing cache
+    // for this image, create it.
+    nsRefPtr<ImageSurfaceCache> cache = GetImageCache(aImageKey);
+    if (!cache) {
+      cache = new ImageSurfaceCache;
+      mImageCaches.Put(aImageKey, cache);
+    }
+
+    nsRefPtr<CachedSurface> surface =
+      new CachedSurface(aSurface, aCost, aImageKey, aSurfaceKey, aLifetime);
+
+    // We require that locking succeed if the image is locked and the surface is
+    // persistent; the caller may need to know this to handle errors correctly.
+    if (cache->IsLocked() && aLifetime == Lifetime::Persistent) {
+      surface->SetLocked(true);
+      if (!surface->IsLocked()) {
+        return InsertOutcome::FAILURE;
+      }
+    }
+
+    // Insert.
+    MOZ_ASSERT(aCost <= mAvailableCost, "Inserting despite too large a cost");
+    cache->Insert(aSurfaceKey, surface);
+    StartTracking(surface);
+
+    return InsertOutcome::SUCCESS;
+  }
+
+  void Remove(CachedSurface* aSurface)
+  {
+    MOZ_ASSERT(aSurface, "Should have a surface");
+    ImageKey imageKey = aSurface->GetImageKey();
+
+    nsRefPtr<ImageSurfaceCache> cache = GetImageCache(imageKey);
+    MOZ_ASSERT(cache, "Shouldn't try to remove a surface with no image cache");
+
+    // If the surface was persistent, tell its image that we discarded it.
+    if (aSurface->GetLifetime() == Lifetime::Persistent) {
+      static_cast<Image*>(imageKey)->OnSurfaceDiscarded();
+    }
+
+    StopTracking(aSurface);
+    cache->Remove(aSurface);
+
+    // Remove the per-image cache if it's unneeded now. (Keep it if the image is
+    // locked, since the per-image cache is where we store that state.)
+    if (cache->IsEmpty() && !cache->IsLocked()) {
+      mImageCaches.Remove(imageKey);
+    }
+  }
+
+  void StartTracking(CachedSurface* aSurface)
+  {
+    CostEntry costEntry = aSurface->GetCostEntry();
+    MOZ_ASSERT(costEntry.GetCost() <= mAvailableCost,
+               "Cost too large and the caller didn't catch it");
+
+    mAvailableCost -= costEntry.GetCost();
+
+    if (aSurface->IsLocked()) {
+      mLockedCost += costEntry.GetCost();
+      MOZ_ASSERT(mLockedCost <= mMaxCost, "Locked more than we can hold?");
+    } else {
+      mCosts.InsertElementSorted(costEntry);
+      // This may fail during XPCOM shutdown, so we need to ensure the object is
+      // tracked before calling RemoveObject in StopTracking.
+      mExpirationTracker.AddObject(aSurface);
+    }
+  }
+
+  void StopTracking(CachedSurface* aSurface)
+  {
+    MOZ_ASSERT(aSurface, "Should have a surface");
+    CostEntry costEntry = aSurface->GetCostEntry();
+
+    if (aSurface->IsLocked()) {
+      MOZ_ASSERT(mLockedCost >= costEntry.GetCost(), "Costs don't balance");
+      mLockedCost -= costEntry.GetCost();
+      // XXX(seth): It'd be nice to use an O(log n) lookup here. This is O(n).
+      MOZ_ASSERT(!mCosts.Contains(costEntry),
+                 "Shouldn't have a cost entry for a locked surface");
+    } else {
+      if (MOZ_LIKELY(aSurface->GetExpirationState()->IsTracked())) {
+        mExpirationTracker.RemoveObject(aSurface);
+      } else {
+        // Our call to AddObject must have failed in StartTracking; most likely
+        // we're in XPCOM shutdown right now.
+        NS_ASSERTION(ShutdownTracker::ShutdownHasStarted(),
+                     "Not expiration-tracking an unlocked surface!");
+      }
+
+      DebugOnly<bool> foundInCosts = mCosts.RemoveElementSorted(costEntry);
+      MOZ_ASSERT(foundInCosts, "Lost track of costs for this surface");
+    }
+
+    mAvailableCost += costEntry.GetCost();
+    MOZ_ASSERT(mAvailableCost <= mMaxCost,
+               "More available cost than we started with");
+  }
+
+  DrawableFrameRef Lookup(const ImageKey    aImageKey,
+                          const SurfaceKey& aSurfaceKey)
+  {
+    nsRefPtr<ImageSurfaceCache> cache = GetImageCache(aImageKey);
+    if (!cache) {
+      return DrawableFrameRef();  // No cached surfaces for this image.
+    }
+
+    nsRefPtr<CachedSurface> surface = cache->Lookup(aSurfaceKey);
+    if (!surface) {
+      return DrawableFrameRef();  // Lookup in the per-image cache missed.
+    }
+
+    DrawableFrameRef ref = surface->DrawableRef();
+    if (!ref) {
+      // The surface was released by the operating system. Remove the cache
+      // entry as well.
+      Remove(surface);
+      return DrawableFrameRef();
+    }
+
+    if (cache->IsLocked()) {
+      LockSurface(surface);
+    } else {
+      mExpirationTracker.MarkUsed(surface);
+    }
+
+    return ref;
+  }
+
+  DrawableFrameRef LookupBestMatch(const ImageKey         aImageKey,
+                                   const SurfaceKey&      aSurfaceKey,
+                                   const Maybe<uint32_t>& aAlternateFlags)
+  {
+    nsRefPtr<ImageSurfaceCache> cache = GetImageCache(aImageKey);
+    if (!cache) {
+      return DrawableFrameRef();  // No cached surfaces for this image.
+    }
+
+    // Repeatedly look up the best match, trying again if the resulting surface
+    // has been freed by the operating system, until we can either lock a
+    // surface for drawing or there are no matching surfaces left.
+    // XXX(seth): This is O(N^2), but N is expected to be very small. If we
+    // encounter a performance problem here we can revisit this.
+
+    nsRefPtr<CachedSurface> surface;
+    DrawableFrameRef ref;
+    while (true) {
+      surface = cache->LookupBestMatch(aSurfaceKey, aAlternateFlags);
+      if (!surface) {
+        return DrawableFrameRef();  // Lookup in the per-image cache missed.
+      }
+
+      ref = surface->DrawableRef();
+      if (ref) {
+        break;
+      }
+
+      // The surface was released by the operating system. Remove the cache
+      // entry as well.
+      Remove(surface);
+    }
+
+    if (cache->IsLocked()) {
+      LockSurface(surface);
+    } else {
+      mExpirationTracker.MarkUsed(surface);
+    }
+
+    return ref;
+  }
+
+  void RemoveSurface(const ImageKey    aImageKey,
+                     const SurfaceKey& aSurfaceKey)
+  {
+    nsRefPtr<ImageSurfaceCache> cache = GetImageCache(aImageKey);
+    if (!cache) {
+      return;  // No cached surfaces for this image.
+    }
+
+    nsRefPtr<CachedSurface> surface = cache->Lookup(aSurfaceKey);
+    if (!surface) {
+      return;  // Lookup in the per-image cache missed.
+    }
+
+    Remove(surface);
+  }
+
+  bool CanHold(const Cost aCost) const
+  {
+    return aCost <= mMaxCost;
+  }
+
+  void LockImage(const ImageKey aImageKey)
+  {
+    nsRefPtr<ImageSurfaceCache> cache = GetImageCache(aImageKey);
+    if (!cache) {
+      cache = new ImageSurfaceCache;
+      mImageCaches.Put(aImageKey, cache);
+    }
+
+    cache->SetLocked(true);
+
+    // We don't relock this image's existing surfaces right away; instead, the
+    // image should arrange for Lookup() to touch them if they are still useful.
+  }
+
+  void UnlockImage(const ImageKey aImageKey)
+  {
+    nsRefPtr<ImageSurfaceCache> cache = GetImageCache(aImageKey);
+    if (!cache || !cache->IsLocked()) {
+      return;  // Already unlocked.
+    }
+
+    cache->SetLocked(false);
+
+    // Unlock all the surfaces the per-image cache is holding.
+    cache->ForEach(DoUnlockSurface, this);
+  }
+
+  void UnlockSurfaces(const ImageKey aImageKey)
+  {
+    nsRefPtr<ImageSurfaceCache> cache = GetImageCache(aImageKey);
+    if (!cache || !cache->IsLocked()) {
+      return;  // Already unlocked.
+    }
+
+    // (Note that we *don't* unlock the per-image cache here; that's the
+    // difference between this and UnlockImage.)
+
+    // Unlock all the surfaces the per-image cache is holding.
+    cache->ForEach(DoUnlockSurface, this);
+  }
+
+  void RemoveImage(const ImageKey aImageKey)
+  {
+    nsRefPtr<ImageSurfaceCache> cache = GetImageCache(aImageKey);
+    if (!cache) {
+      return;  // No cached surfaces for this image, so nothing to do.
+    }
+
+    // Discard all of the cached surfaces for this image.
+    // XXX(seth): This is O(n^2) since for each item in the cache we are
+    // removing an element from the costs array. Since n is expected to be
+    // small, performance should be good, but if usage patterns change we should
+    // change the data structure used for mCosts.
+    cache->ForEach(DoStopTracking, this);
+
+    // The per-image cache isn't needed anymore, so remove it as well.
+    // This implicitly unlocks the image if it was locked.
+    mImageCaches.Remove(aImageKey);
+  }
+
+  void DiscardAll()
+  {
+    // Remove in order of cost because mCosts is an array and the other data
+    // structures are all hash tables. Note that locked surfaces (persistent
+    // surfaces belonging to locked images) are not removed, since they aren't
+    // present in mCosts.
+    while (!mCosts.IsEmpty()) {
+      Remove(mCosts.LastElement().GetSurface());
+    }
+  }
+
+  void DiscardForMemoryPressure()
+  {
+    // Compute our discardable cost. Since locked surfaces aren't discardable,
+    // we exclude them.
+    const Cost discardableCost = (mMaxCost - mAvailableCost) - mLockedCost;
+    MOZ_ASSERT(discardableCost <= mMaxCost, "Discardable cost doesn't add up");
+
+    // Our target is to raise our available cost by (1 / mDiscardFactor) of our
+    // discardable cost - in other words, we want to end up with about
+    // (discardableCost / mDiscardFactor) fewer bytes stored in the surface
+    // cache after we're done.
+    const Cost targetCost = mAvailableCost + (discardableCost / mDiscardFactor);
+
+    if (targetCost > mMaxCost - mLockedCost) {
+      MOZ_ASSERT_UNREACHABLE("Target cost is more than we can discard");
+      DiscardAll();
+      return;
+    }
+
+    // Discard surfaces until we've reduced our cost to our target cost.
+    while (mAvailableCost < targetCost) {
+      MOZ_ASSERT(!mCosts.IsEmpty(), "Removed everything and still not done");
+      Remove(mCosts.LastElement().GetSurface());
+    }
+  }
+
+  void LockSurface(CachedSurface* aSurface)
+  {
+    if (aSurface->GetLifetime() == Lifetime::Transient ||
+        aSurface->IsLocked()) {
+      return;
+    }
+
+    StopTracking(aSurface);
+
+    // Lock the surface. This can fail.
+    aSurface->SetLocked(true);
+    StartTracking(aSurface);
+  }
+
+  static PLDHashOperator DoStopTracking(const SurfaceKey&,
+                                        CachedSurface*    aSurface,
+                                        void*             aCache)
+  {
+    static_cast<SurfaceCacheImpl*>(aCache)->StopTracking(aSurface);
+    return PL_DHASH_NEXT;
+  }
+
+  static PLDHashOperator DoUnlockSurface(const SurfaceKey&,
+                                         CachedSurface*    aSurface,
+                                         void*             aCache)
+  {
+    if (aSurface->GetLifetime() == Lifetime::Transient ||
+        !aSurface->IsLocked()) {
+      return PL_DHASH_NEXT;
+    }
+
+    auto cache = static_cast<SurfaceCacheImpl*>(aCache);
+    cache->StopTracking(aSurface);
+
+    aSurface->SetLocked(false);
+    cache->StartTracking(aSurface);
+
+    return PL_DHASH_NEXT;
+  }
+
+  NS_IMETHOD
+  CollectReports(nsIHandleReportCallback* aHandleReport,
+                 nsISupports*             aData,
+                 bool                     aAnonymize) override
+  {
+    MutexAutoLock lock(mMutex);
+
+    // We have explicit memory reporting for the surface cache which is more
+    // accurate than the cost metrics we report here, but these metrics are
+    // still useful to report, since they control the cache's behavior.
+    nsresult rv;
+
+    rv = MOZ_COLLECT_REPORT("imagelib-surface-cache-estimated-total",
+                            KIND_OTHER, UNITS_BYTES,
+                            (mMaxCost - mAvailableCost),
+                            "Estimated total memory used by the imagelib "
+                            "surface cache.");
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = MOZ_COLLECT_REPORT("imagelib-surface-cache-estimated-locked",
+                            KIND_OTHER, UNITS_BYTES,
+                            mLockedCost,
+                            "Estimated memory used by locked surfaces in the "
+                            "imagelib surface cache.");
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    return NS_OK;
+  }
+
+  void CollectSizeOfSurfaces(const ImageKey                  aImageKey,
+                             nsTArray<SurfaceMemoryCounter>& aCounters,
+                             MallocSizeOf                    aMallocSizeOf)
+  {
+    nsRefPtr<ImageSurfaceCache> cache = GetImageCache(aImageKey);
+    if (!cache) {
+      return;  // No surfaces for this image.
+    }
+
+    // Report all surfaces in the per-image cache.
+    CachedSurface::SurfaceMemoryReport report(aCounters, aMallocSizeOf);
+    cache->ForEach(DoCollectSizeOfSurface, &report);
+  }
+
+  static PLDHashOperator DoCollectSizeOfSurface(const SurfaceKey&,
+                                                CachedSurface*    aSurface,
+                                                void*             aReport)
+  {
+    auto report = static_cast<CachedSurface::SurfaceMemoryReport*>(aReport);
+    report->Add(aSurface);
+    return PL_DHASH_NEXT;
+  }
+
+private:
+  already_AddRefed<ImageSurfaceCache> GetImageCache(const ImageKey aImageKey)
+  {
+    nsRefPtr<ImageSurfaceCache> imageCache;
+    mImageCaches.Get(aImageKey, getter_AddRefs(imageCache));
+    return imageCache.forget();
+  }
+
+  // This is similar to CanHold() except that it takes into account the costs of
+  // locked surfaces. It's used internally in Insert(), but it's not exposed
+  // publicly because if we start permitting multithreaded access to the surface
+  // cache, which seems likely, then the result would be meaningless: another
+  // thread could insert a persistent surface or lock an image at any time.
+  bool CanHoldAfterDiscarding(const Cost aCost) const
+  {
+    return aCost <= mMaxCost - mLockedCost;
+  }
+
+  struct SurfaceTracker : public nsExpirationTracker<CachedSurface, 2>
+  {
+    explicit SurfaceTracker(uint32_t aSurfaceCacheExpirationTimeMS)
+      : nsExpirationTracker<CachedSurface, 2>(aSurfaceCacheExpirationTimeMS)
+    { }
+
+  protected:
+    virtual void NotifyExpired(CachedSurface* aSurface) override
+    {
+      if (sInstance) {
+        MutexAutoLock lock(sInstance->GetMutex());
+        sInstance->Remove(aSurface);
+      }
+    }
+  };
+
+  struct MemoryPressureObserver : public nsIObserver
+  {
+    NS_DECL_ISUPPORTS
+
+    NS_IMETHOD Observe(nsISupports*,
+                       const char* aTopic,
+                       const char16_t*) override
+    {
+      if (sInstance && strcmp(aTopic, "memory-pressure") == 0) {
+        MutexAutoLock lock(sInstance->GetMutex());
+        sInstance->DiscardForMemoryPressure();
+      }
+      return NS_OK;
+    }
+
+  private:
+    virtual ~MemoryPressureObserver() { }
+  };
+
+  nsTArray<CostEntry>                     mCosts;
+  nsRefPtrHashtable<nsPtrHashKey<Image>,
+    ImageSurfaceCache> mImageCaches;
+  SurfaceTracker                          mExpirationTracker;
+  nsRefPtr<MemoryPressureObserver>        mMemoryPressureObserver;
+  Mutex                                   mMutex;
+  const uint32_t                          mDiscardFactor;
+  const Cost                              mMaxCost;
+  Cost                                    mAvailableCost;
+  Cost                                    mLockedCost;
+};
+
+NS_IMPL_ISUPPORTS(SurfaceCacheImpl, nsIMemoryReporter)
+NS_IMPL_ISUPPORTS(SurfaceCacheImpl::MemoryPressureObserver, nsIObserver)
+
+///////////////////////////////////////////////////////////////////////////////
+// Public API
+///////////////////////////////////////////////////////////////////////////////
+
+/* static */ void
+SurfaceCache::Initialize()
+{
+  // Initialize preferences.
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(!sInstance, "Shouldn't initialize more than once");
+
+  // See gfxPrefs for the default values of these preferences.
+
+  // Length of time before an unused surface is removed from the cache, in
+  // milliseconds.
+  uint32_t surfaceCacheExpirationTimeMS =
+    gfxPrefs::ImageMemSurfaceCacheMinExpirationMS();
+
+  // What fraction of the memory used by the surface cache we should discard
+  // when we get a memory pressure notification. This value is interpreted as
+  // 1/N, so 1 means to discard everything, 2 means to discard about half of the
+  // memory we're using, and so forth. We clamp it to avoid division by zero.
+  uint32_t surfaceCacheDiscardFactor =
+    max(gfxPrefs::ImageMemSurfaceCacheDiscardFactor(), 1u);
+
+  // Maximum size of the surface cache, in kilobytes.
+  uint64_t surfaceCacheMaxSizeKB = gfxPrefs::ImageMemSurfaceCacheMaxSizeKB();
+
+  // A knob determining the actual size of the surface cache. Currently the
+  // cache is (size of main memory) / (surface cache size factor) KB
+  // or (surface cache max size) KB, whichever is smaller. The formula
+  // may change in the future, though.
+  // For example, a value of 4 would yield a 256MB cache on a 1GB machine.
+  // The smallest machines we are likely to run this code on have 256MB
+  // of memory, which would yield a 64MB cache on this setting.
+  // We clamp this value to avoid division by zero.
+  uint32_t surfaceCacheSizeFactor =
+    max(gfxPrefs::ImageMemSurfaceCacheSizeFactor(), 1u);
+
+  // Compute the size of the surface cache.
+  uint64_t memorySize = PR_GetPhysicalMemorySize();
+  if (memorySize == 0) {
+    MOZ_ASSERT_UNREACHABLE("PR_GetPhysicalMemorySize not implemented here");
+    memorySize = 256 * 1024 * 1024;  // Fall back to 256MB.
+  }
+  uint64_t proposedSize = memorySize / surfaceCacheSizeFactor;
+  uint64_t surfaceCacheSizeBytes = min(proposedSize,
+                                       surfaceCacheMaxSizeKB * 1024);
+  uint32_t finalSurfaceCacheSizeBytes =
+    min(surfaceCacheSizeBytes, uint64_t(UINT32_MAX));
+
+  // Create the surface cache singleton with the requested settings.  Note that
+  // the size is a limit that the cache may not grow beyond, but we do not
+  // actually allocate any storage for surfaces at this time.
+  sInstance = new SurfaceCacheImpl(surfaceCacheExpirationTimeMS,
+                                   surfaceCacheDiscardFactor,
+                                   finalSurfaceCacheSizeBytes);
+  sInstance->InitMemoryReporter();
+}
+
+/* static */ void
+SurfaceCache::Shutdown()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(sInstance, "No singleton - was Shutdown() called twice?");
+  sInstance = nullptr;
+}
+
+/* static */ DrawableFrameRef
+SurfaceCache::Lookup(const ImageKey         aImageKey,
+                     const SurfaceKey&      aSurfaceKey,
+                     const Maybe<uint32_t>& aAlternateFlags /* = Nothing() */)
+{
+  if (!sInstance) {
+    return DrawableFrameRef();
+  }
+
+  MutexAutoLock lock(sInstance->GetMutex());
+
+  DrawableFrameRef ref = sInstance->Lookup(aImageKey, aSurfaceKey);
+  if (!ref && aAlternateFlags) {
+    ref = sInstance->Lookup(aImageKey,
+                            aSurfaceKey.WithNewFlags(*aAlternateFlags));
+  }
+
+  return ref;
+}
+
+/* static */ DrawableFrameRef
+SurfaceCache::LookupBestMatch(const ImageKey         aImageKey,
+                              const SurfaceKey&      aSurfaceKey,
+                              const Maybe<uint32_t>& aAlternateFlags
+                                /* = Nothing() */)
+{
+  if (!sInstance) {
+    return DrawableFrameRef();
+  }
+
+  MutexAutoLock lock(sInstance->GetMutex());
+  return sInstance->LookupBestMatch(aImageKey, aSurfaceKey, aAlternateFlags);
+}
+
+/* static */ InsertOutcome
+SurfaceCache::Insert(imgFrame*         aSurface,
+                     const ImageKey    aImageKey,
+                     const SurfaceKey& aSurfaceKey,
+                     Lifetime          aLifetime)
+{
+  if (!sInstance) {
+    return InsertOutcome::FAILURE;
+  }
+
+  MutexAutoLock lock(sInstance->GetMutex());
+  Cost cost = ComputeCost(aSurface->GetSize(), aSurface->GetBytesPerPixel());
+  return sInstance->Insert(aSurface, cost, aImageKey, aSurfaceKey, aLifetime);
+}
+
+/* static */ bool
+SurfaceCache::CanHold(const IntSize& aSize, uint32_t aBytesPerPixel /* = 4 */)
+{
+  if (!sInstance) {
+    return false;
+  }
+
+  Cost cost = ComputeCost(aSize, aBytesPerPixel);
+  return sInstance->CanHold(cost);
+}
+
+/* static */ bool
+SurfaceCache::CanHold(size_t aSize)
+{
+  if (!sInstance) {
+    return false;
+  }
+
+  return sInstance->CanHold(aSize);
+}
+
+/* static */ void
+SurfaceCache::LockImage(Image* aImageKey)
+{
+  if (sInstance) {
+    MutexAutoLock lock(sInstance->GetMutex());
+    return sInstance->LockImage(aImageKey);
+  }
+}
+
+/* static */ void
+SurfaceCache::UnlockImage(Image* aImageKey)
+{
+  if (sInstance) {
+    MutexAutoLock lock(sInstance->GetMutex());
+    return sInstance->UnlockImage(aImageKey);
+  }
+}
+
+/* static */ void
+SurfaceCache::UnlockSurfaces(const ImageKey aImageKey)
+{
+  if (sInstance) {
+    MutexAutoLock lock(sInstance->GetMutex());
+    return sInstance->UnlockSurfaces(aImageKey);
+  }
+}
+
+/* static */ void
+SurfaceCache::RemoveSurface(const ImageKey    aImageKey,
+                            const SurfaceKey& aSurfaceKey)
+{
+  if (sInstance) {
+    MutexAutoLock lock(sInstance->GetMutex());
+    sInstance->RemoveSurface(aImageKey, aSurfaceKey);
+  }
+}
+
+/* static */ void
+SurfaceCache::RemoveImage(Image* aImageKey)
+{
+  if (sInstance) {
+    MutexAutoLock lock(sInstance->GetMutex());
+    sInstance->RemoveImage(aImageKey);
+  }
+}
+
+/* static */ void
+SurfaceCache::DiscardAll()
+{
+  if (sInstance) {
+    MutexAutoLock lock(sInstance->GetMutex());
+    sInstance->DiscardAll();
+  }
+}
+
+/* static */ void
+SurfaceCache::CollectSizeOfSurfaces(const ImageKey                  aImageKey,
+                                    nsTArray<SurfaceMemoryCounter>& aCounters,
+                                    MallocSizeOf                    aMallocSizeOf)
+{
+  if (!sInstance) {
+    return;
+  }
+
+  MutexAutoLock lock(sInstance->GetMutex());
+  return sInstance->CollectSizeOfSurfaces(aImageKey, aCounters, aMallocSizeOf);
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/SurfaceCache.h firefox-trunk-41.0~a1~hg20150524r245419/image/SurfaceCache.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/SurfaceCache.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/SurfaceCache.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,420 @@
+/* -*- 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/. */
+
+/**
+ * SurfaceCache is a service for caching temporary surfaces and decoded image
+ * data in imagelib.
+ */
+
+#ifndef mozilla_image_SurfaceCache_h
+#define mozilla_image_SurfaceCache_h
+
+#include "mozilla/Maybe.h"           // for Maybe
+#include "mozilla/MemoryReporting.h" // for MallocSizeOf
+#include "mozilla/HashFunctions.h"   // for HashGeneric and AddToHash
+#include "gfx2DGlue.h"               // for gfxMemoryLocation
+#include "gfxPoint.h"                // for gfxSize
+#include "nsCOMPtr.h"                // for already_AddRefed
+#include "mozilla/gfx/Point.h"       // for mozilla::gfx::IntSize
+#include "mozilla/gfx/2D.h"          // for SourceSurface
+#include "SVGImageContext.h"         // for SVGImageContext
+
+namespace mozilla {
+namespace image {
+
+class DrawableFrameRef;
+class Image;
+class imgFrame;
+struct SurfaceMemoryCounter;
+
+/*
+ * ImageKey contains the information we need to look up all cached surfaces for
+ * a particular image.
+ */
+typedef Image* ImageKey;
+
+/*
+ * SurfaceKey contains the information we need to look up a specific cached
+ * surface. Together with an ImageKey, this uniquely identifies the surface.
+ *
+ * Callers should construct a SurfaceKey using the appropriate helper function
+ * for their image type - either RasterSurfaceKey or VectorSurfaceKey.
+ */
+class SurfaceKey
+{
+  typedef gfx::IntSize IntSize;
+
+public:
+  bool operator==(const SurfaceKey& aOther) const
+  {
+    return aOther.mSize == mSize &&
+           aOther.mSVGContext == mSVGContext &&
+           aOther.mAnimationTime == mAnimationTime &&
+           aOther.mFlags == mFlags;
+  }
+
+  uint32_t Hash() const
+  {
+    uint32_t hash = HashGeneric(mSize.width, mSize.height);
+    hash = AddToHash(hash, mSVGContext.map(HashSIC).valueOr(0));
+    hash = AddToHash(hash, mAnimationTime, mFlags);
+    return hash;
+  }
+
+  IntSize Size() const { return mSize; }
+  Maybe<SVGImageContext> SVGContext() const { return mSVGContext; }
+  float AnimationTime() const { return mAnimationTime; }
+  uint32_t Flags() const { return mFlags; }
+
+  SurfaceKey WithNewFlags(uint32_t aFlags) const
+  {
+    return SurfaceKey(mSize, mSVGContext, mAnimationTime, aFlags);
+  }
+
+private:
+  SurfaceKey(const IntSize& aSize,
+             const Maybe<SVGImageContext>& aSVGContext,
+             const float aAnimationTime,
+             const uint32_t aFlags)
+    : mSize(aSize)
+    , mSVGContext(aSVGContext)
+    , mAnimationTime(aAnimationTime)
+    , mFlags(aFlags)
+  { }
+
+  static uint32_t HashSIC(const SVGImageContext& aSIC) {
+    return aSIC.Hash();
+  }
+
+  friend SurfaceKey RasterSurfaceKey(const IntSize&, uint32_t, uint32_t);
+  friend SurfaceKey VectorSurfaceKey(const IntSize&,
+                                     const Maybe<SVGImageContext>&,
+                                     float);
+
+  IntSize                mSize;
+  Maybe<SVGImageContext> mSVGContext;
+  float                  mAnimationTime;
+  uint32_t               mFlags;
+};
+
+inline SurfaceKey
+RasterSurfaceKey(const gfx::IntSize& aSize,
+                 uint32_t aFlags,
+                 uint32_t aFrameNum)
+{
+  return SurfaceKey(aSize, Nothing(), float(aFrameNum), aFlags);
+}
+
+inline SurfaceKey
+VectorSurfaceKey(const gfx::IntSize& aSize,
+                 const Maybe<SVGImageContext>& aSVGContext,
+                 float aAnimationTime)
+{
+  // We don't care about aFlags for VectorImage because none of the flags we
+  // have right now influence VectorImage's rendering. If we add a new flag that
+  // *does* affect how a VectorImage renders, we'll have to change this.
+  return SurfaceKey(aSize, aSVGContext, aAnimationTime, 0);
+}
+
+enum class Lifetime : uint8_t {
+  Transient,
+  Persistent
+};
+
+enum class InsertOutcome : uint8_t {
+  SUCCESS,                 // Success (but see Insert documentation).
+  FAILURE,                 // Couldn't insert (e.g., for capacity reasons).
+  FAILURE_ALREADY_PRESENT  // A surface with the same key is already present.
+};
+
+/**
+ * SurfaceCache is an imagelib-global service that allows caching of temporary
+ * surfaces. Surfaces normally expire from the cache automatically if they go
+ * too long without being accessed.
+ *
+ * SurfaceCache does not hold surfaces directly; instead, it holds imgFrame
+ * objects, which hold surfaces but also layer on additional features specific
+ * to imagelib's needs like animation, padding support, and transparent support
+ * for volatile buffers.
+ *
+ * Sometime it's useful to temporarily prevent surfaces from expiring from the
+ * cache. This is most often because losing the data could harm the user
+ * experience (for example, we often don't want to allow surfaces that are
+ * currently visible to expire) or because it's not possible to rematerialize
+ * the surface. SurfaceCache supports this through the use of image locking and
+ * surface lifetimes; see the comments for Insert() and LockImage() for more
+ * details.
+ *
+ * Any image which stores surfaces in the SurfaceCache *must* ensure that it
+ * calls RemoveImage() before it is destroyed. See the comments for
+ * RemoveImage() for more details.
+ */
+struct SurfaceCache
+{
+  typedef gfx::IntSize IntSize;
+
+  /**
+   * Initialize static data. Called during imagelib module initialization.
+   */
+  static void Initialize();
+
+  /**
+   * Release static data. Called during imagelib module shutdown.
+   */
+  static void Shutdown();
+
+  /**
+   * Look up the imgFrame containing a surface in the cache and returns a
+   * drawable reference to that imgFrame.
+   *
+   * If the image associated with the surface is locked, then the surface will
+   * be locked before it is returned.
+   *
+   * If the imgFrame was found in the cache, but had stored its surface in a
+   * volatile buffer which was discarded by the OS, then it is automatically
+   * removed from the cache and an empty DrawableFrameRef is returned. Note that
+   * this will never happen to persistent surfaces associated with a locked
+   * image; the cache keeps a strong reference to such surfaces internally.
+   *
+   * @param aImageKey       Key data identifying which image the surface belongs
+   *                        to.
+   *
+   * @param aSurfaceKey     Key data which uniquely identifies the requested
+   *                        surface.
+   *
+   * @param aAlternateFlags If not Nothing(), a different set of flags than the
+   *                        ones specified in @aSurfaceKey which are also
+   *                        acceptable to the caller. This is more efficient
+   *                        than calling Lookup() twice, which requires taking a
+   *                        lock each time.
+   *
+   * @return                a DrawableFrameRef to the imgFrame wrapping the
+   *                        requested surface, or an empty DrawableFrameRef if
+   *                        not found.
+   */
+  static DrawableFrameRef Lookup(const ImageKey    aImageKey,
+                                 const SurfaceKey& aSurfaceKey,
+                                 const Maybe<uint32_t>& aAlternateFlags
+                                   = Nothing());
+
+  /**
+   * Looks up the best matching surface in the cache and returns a drawable
+   * reference to the imgFrame containing it.
+   *
+   * Returned surfaces may vary from the requested surface only in terms of
+   * size, unless @aAlternateFlags is specified.
+   *
+   * @param aImageKey    Key data identifying which image the surface belongs
+   *                     to.
+   *
+   * @param aSurfaceKey  Key data which identifies the ideal surface to return.
+   *
+   * @param aAlternateFlags If not Nothing(), a different set of flags than the
+   *                        ones specified in @aSurfaceKey which are also
+   *                        acceptable to the caller. This is much more
+   *                        efficient than calling LookupBestMatch() twice.
+   *
+   * @return a DrawableFrameRef to the imgFrame wrapping a surface similar to
+   *         the requested surface, or an empty DrawableFrameRef if not found.
+   */
+  static DrawableFrameRef LookupBestMatch(const ImageKey    aImageKey,
+                                          const SurfaceKey& aSurfaceKey,
+                                          const Maybe<uint32_t>& aAlternateFlags
+                                            = Nothing());
+
+  /**
+   * Insert a surface into the cache. If a surface with the same ImageKey and
+   * SurfaceKey is already in the cache, Insert returns FAILURE_ALREADY_PRESENT.
+   *
+   * Each surface in the cache has a lifetime, either Transient or Persistent.
+   * Transient surfaces can expire from the cache at any time. Persistent
+   * surfaces, on the other hand, will never expire as long as they remain
+   * locked, but if they become unlocked, can expire just like transient
+   * surfaces. When it is first inserted, a persistent surface is locked if its
+   * associated image is locked. When that image is later unlocked, the surface
+   * becomes unlocked too. To become locked again at that point, two things must
+   * happen: the image must become locked again (via LockImage()), and the
+   * surface must be touched again (via one of the Lookup() functions).
+   *
+   * All of this means that a very particular procedure has to be followed for
+   * surfaces which cannot be rematerialized. First, they must be inserted
+   * with a persistent lifetime *after* the image is locked with LockImage(); if
+   * you use the other order, the surfaces might expire before LockImage() gets
+   * called or before the surface is touched again by Lookup(). Second, the
+   * image they are associated with must never be unlocked.
+   *
+   * If a surface cannot be rematerialized, it may be important to know whether
+   * it was inserted into the cache successfully. Insert() returns FAILURE if it
+   * failed to insert the surface, which could happen because of capacity
+   * reasons, or because it was already freed by the OS. If you aren't inserting
+   * a surface with persistent lifetime, or if the surface isn't associated with
+   * a locked image, checking for SUCCESS or FAILURE is useless: the surface
+   * might expire immediately after being inserted, even though Insert()
+   * returned SUCCESS. Thus, many callers do not need to check the result of
+   * Insert() at all.
+   *
+   * @param aTarget      The new surface (wrapped in an imgFrame) to insert into
+   *                     the cache.
+   * @param aImageKey    Key data identifying which image the surface belongs
+   *                     to.
+   * @param aSurfaceKey  Key data which uniquely identifies the requested
+   *                     surface.
+   * @param aLifetime    Whether this is a transient surface that can always be
+   *                     allowed to expire, or a persistent surface that
+   *                     shouldn't expire if the image is locked.
+   * @return SUCCESS if the surface was inserted successfully. (But see above
+   *           for more information about when you should check this.)
+   *         FAILURE if the surface could not be inserted, e.g. for capacity
+   *           reasons. (But see above for more information about when you
+   *           should check this.)
+   *         FAILURE_ALREADY_PRESENT if a surface with the same ImageKey and
+   *           SurfaceKey already exists in the cache.
+   */
+  static InsertOutcome Insert(imgFrame*         aSurface,
+                              const ImageKey    aImageKey,
+                              const SurfaceKey& aSurfaceKey,
+                              Lifetime          aLifetime);
+
+  /**
+   * Checks if a surface of a given size could possibly be stored in the cache.
+   * If CanHold() returns false, Insert() will always fail to insert the
+   * surface, but the inverse is not true: Insert() may take more information
+   * into account than just image size when deciding whether to cache the
+   * surface, so Insert() may still fail even if CanHold() returns true.
+   *
+   * Use CanHold() to avoid the need to create a temporary surface when we know
+   * for sure the cache can't hold it.
+   *
+   * @param aSize  The dimensions of a surface in pixels.
+   * @param aBytesPerPixel  How many bytes each pixel of the surface requires.
+   *                        Defaults to 4, which is appropriate for RGBA or RGBX
+   *                        images.
+   *
+   * @return false if the surface cache can't hold a surface of that size.
+   */
+  static bool CanHold(const IntSize& aSize, uint32_t aBytesPerPixel = 4);
+  static bool CanHold(size_t aSize);
+
+  /**
+   * Locks an image. Any of the image's persistent surfaces which are either
+   * inserted or accessed while the image is locked will not expire.
+   *
+   * Locking an image does not automatically lock that image's existing
+   * surfaces. A call to LockImage() guarantees that persistent surfaces which
+   * are inserted afterward will not expire before the next call to
+   * UnlockImage() or UnlockSurfaces() for that image. Surfaces that are
+   * accessed via Lookup() or LookupBestMatch() after a LockImage() call will
+   * also not expire until the next UnlockImage() or UnlockSurfaces() call for
+   * that image. Any other surfaces owned by the image may expire at any time,
+   * whether they are persistent or transient.
+   *
+   * Regardless of locking, any of an image's surfaces may be removed using
+   * RemoveSurface(), and all of an image's surfaces are removed by
+   * RemoveImage(), whether the image is locked or not.
+   *
+   * It's safe to call LockImage() on an image that's already locked; this has
+   * no effect.
+   *
+   * You must always unlock any image you lock. You may do this explicitly by
+   * calling UnlockImage(), or implicitly by calling RemoveImage(). Since you're
+   * required to call RemoveImage() when you destroy an image, this doesn't
+   * impose any additional requirements, but it's preferable to call
+   * UnlockImage() earlier if it's possible.
+   *
+   * @param aImageKey    The image to lock.
+   */
+  static void LockImage(const ImageKey aImageKey);
+
+  /**
+   * Unlocks an image, allowing any of its surfaces to expire at any time.
+   *
+   * It's OK to call UnlockImage() on an image that's already unlocked; this has
+   * no effect.
+   *
+   * @param aImageKey    The image to unlock.
+   */
+  static void UnlockImage(const ImageKey aImageKey);
+
+  /**
+   * Unlocks the existing surfaces of an image, allowing them to expire at any
+   * time.
+   *
+   * This does not unlock the image itself, so accessing the surfaces via
+   * Lookup() or LookupBestMatch() will lock them again, and prevent them from
+   * expiring.
+   *
+   * This is intended to be used in situations where it's no longer clear that
+   * all of the persistent surfaces owned by an image are needed. Calling
+   * UnlockSurfaces() and then taking some action that will cause Lookup() to
+   * touch any surfaces that are still useful will permit the remaining surfaces
+   * to expire from the cache.
+   *
+   * If the image is unlocked, this has no effect.
+   *
+   * @param aImageKey    The image which should have its existing surfaces
+   *                     unlocked.
+   */
+  static void UnlockSurfaces(const ImageKey aImageKey);
+
+  /**
+   * Removes a surface from the cache, if it's present. If it's not present,
+   * RemoveSurface() has no effect.
+   *
+   * Use this function to remove individual surfaces that have become invalid.
+   * Prefer RemoveImage() or DiscardAll() when they're applicable, as they have
+   * much better performance than calling this function repeatedly.
+   *
+   * @param aImageKey    Key data identifying which image the surface belongs
+                         to.
+   * @param aSurfaceKey  Key data which uniquely identifies the requested
+                         surface.
+   */
+  static void RemoveSurface(const ImageKey    aImageKey,
+                            const SurfaceKey& aSurfaceKey);
+
+  /**
+   * Removes all cached surfaces associated with the given image from the cache.
+   * If the image is locked, it is automatically unlocked.
+   *
+   * This MUST be called, at a minimum, when an Image which could be storing
+   * surfaces in the surface cache is destroyed. If another image were allocated
+   * at the same address it could result in subtle, difficult-to-reproduce bugs.
+   *
+   * @param aImageKey  The image which should be removed from the cache.
+   */
+  static void RemoveImage(const ImageKey aImageKey);
+
+  /**
+   * Evicts all evictable surfaces from the cache.
+   *
+   * All surfaces are evictable except for persistent surfaces associated with
+   * locked images. Non-evictable surfaces can only be removed by
+   * RemoveSurface() or RemoveImage().
+   */
+  static void DiscardAll();
+
+  /**
+   * Collects an accounting of the surfaces contained in the SurfaceCache for
+   * the given image, along with their size and various other metadata.
+   *
+   * This is intended for use with memory reporting.
+   *
+   * @param aImageKey     The image to report memory usage for.
+   * @param aCounters     An array into which the report for each surface will
+   *                      be written.
+   * @param aMallocSizeOf A fallback malloc memory reporting function.
+   */
+  static void CollectSizeOfSurfaces(const ImageKey    aImageKey,
+                                    nsTArray<SurfaceMemoryCounter>& aCounters,
+                                    MallocSizeOf      aMallocSizeOf);
+
+private:
+  virtual ~SurfaceCache() = 0;  // Forbid instantiation.
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_SurfaceCache_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/SVGDocumentWrapper.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/SVGDocumentWrapper.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/SVGDocumentWrapper.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/SVGDocumentWrapper.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,429 @@
+/* -*- 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 "SVGDocumentWrapper.h"
+
+#include "mozilla/dom/Element.h"
+#include "nsICategoryManager.h"
+#include "nsIChannel.h"
+#include "nsIContentViewer.h"
+#include "nsIDocument.h"
+#include "nsIDocumentLoaderFactory.h"
+#include "nsIDOMSVGLength.h"
+#include "nsIHttpChannel.h"
+#include "nsIObserverService.h"
+#include "nsIParser.h"
+#include "nsIPresShell.h"
+#include "nsIRequest.h"
+#include "nsIStreamListener.h"
+#include "nsIXMLContentSink.h"
+#include "nsNetCID.h"
+#include "nsComponentManagerUtils.h"
+#include "nsSMILAnimationController.h"
+#include "nsServiceManagerUtils.h"
+#include "mozilla/dom/SVGSVGElement.h"
+#include "nsSVGEffects.h"
+#include "mozilla/dom/SVGAnimatedLength.h"
+#include "nsMimeTypes.h"
+#include "DOMSVGLength.h"
+
+// undef the GetCurrentTime macro defined in WinBase.h from the MS Platform SDK
+#undef GetCurrentTime
+
+using namespace mozilla::dom;
+
+namespace mozilla {
+namespace image {
+
+NS_IMPL_ISUPPORTS(SVGDocumentWrapper,
+                  nsIStreamListener,
+                  nsIRequestObserver,
+                  nsIObserver,
+                  nsISupportsWeakReference)
+
+SVGDocumentWrapper::SVGDocumentWrapper()
+  : mIgnoreInvalidation(false),
+    mRegisteredForXPCOMShutdown(false)
+{ }
+
+SVGDocumentWrapper::~SVGDocumentWrapper()
+{
+  DestroyViewer();
+  if (mRegisteredForXPCOMShutdown) {
+    UnregisterForXPCOMShutdown();
+  }
+}
+
+void
+SVGDocumentWrapper::DestroyViewer()
+{
+  if (mViewer) {
+    mViewer->GetDocument()->OnPageHide(false, nullptr);
+    mViewer->Close(nullptr);
+    mViewer->Destroy();
+    mViewer = nullptr;
+  }
+}
+
+nsIFrame*
+SVGDocumentWrapper::GetRootLayoutFrame()
+{
+  Element* rootElem = GetRootSVGElem();
+  return rootElem ? rootElem->GetPrimaryFrame() : nullptr;
+}
+
+void
+SVGDocumentWrapper::UpdateViewportBounds(const nsIntSize& aViewportSize)
+{
+  MOZ_ASSERT(!mIgnoreInvalidation, "shouldn't be reentrant");
+  mIgnoreInvalidation = true;
+
+  nsIntRect currentBounds;
+  mViewer->GetBounds(currentBounds);
+
+  // If the bounds have changed, we need to do a layout flush.
+  if (currentBounds.Size() != aViewportSize) {
+    mViewer->SetBounds(IntRect(IntPoint(0, 0), aViewportSize));
+    FlushLayout();
+  }
+
+  mIgnoreInvalidation = false;
+}
+
+void
+SVGDocumentWrapper::FlushImageTransformInvalidation()
+{
+  MOZ_ASSERT(!mIgnoreInvalidation, "shouldn't be reentrant");
+
+  SVGSVGElement* svgElem = GetRootSVGElem();
+  if (!svgElem) {
+    return;
+  }
+
+  mIgnoreInvalidation = true;
+  svgElem->FlushImageTransformInvalidation();
+  FlushLayout();
+  mIgnoreInvalidation = false;
+}
+
+bool
+SVGDocumentWrapper::IsAnimated()
+{
+  nsIDocument* doc = mViewer->GetDocument();
+  return doc && doc->HasAnimationController() &&
+    doc->GetAnimationController()->HasRegisteredAnimations();
+}
+
+void
+SVGDocumentWrapper::StartAnimation()
+{
+  // Can be called for animated images during shutdown, after we've
+  // already Observe()'d XPCOM shutdown and cleared out our mViewer pointer.
+  if (!mViewer) {
+    return;
+  }
+
+  nsIDocument* doc = mViewer->GetDocument();
+  if (doc) {
+    nsSMILAnimationController* controller = doc->GetAnimationController();
+    if (controller) {
+      controller->Resume(nsSMILTimeContainer::PAUSE_IMAGE);
+    }
+    doc->SetImagesNeedAnimating(true);
+  }
+}
+
+void
+SVGDocumentWrapper::StopAnimation()
+{
+  // Can be called for animated images during shutdown, after we've
+  // already Observe()'d XPCOM shutdown and cleared out our mViewer pointer.
+  if (!mViewer) {
+    return;
+  }
+
+  nsIDocument* doc = mViewer->GetDocument();
+  if (doc) {
+    nsSMILAnimationController* controller = doc->GetAnimationController();
+    if (controller) {
+      controller->Pause(nsSMILTimeContainer::PAUSE_IMAGE);
+    }
+    doc->SetImagesNeedAnimating(false);
+  }
+}
+
+void
+SVGDocumentWrapper::ResetAnimation()
+{
+  SVGSVGElement* svgElem = GetRootSVGElem();
+  if (!svgElem) {
+    return;
+  }
+
+  svgElem->SetCurrentTime(0.0f);
+}
+
+float
+SVGDocumentWrapper::GetCurrentTime()
+{
+  SVGSVGElement* svgElem = GetRootSVGElem();
+  return svgElem ? svgElem->GetCurrentTime()
+                 : 0.0f;
+}
+
+void
+SVGDocumentWrapper::SetCurrentTime(float aTime)
+{
+  SVGSVGElement* svgElem = GetRootSVGElem();
+  if (svgElem && svgElem->GetCurrentTime() != aTime) {
+    svgElem->SetCurrentTime(aTime);
+  }
+}
+
+void
+SVGDocumentWrapper::TickRefreshDriver()
+{
+  nsCOMPtr<nsIPresShell> presShell;
+  mViewer->GetPresShell(getter_AddRefs(presShell));
+  if (presShell) {
+    nsPresContext* presContext = presShell->GetPresContext();
+    if (presContext) {
+      presContext->RefreshDriver()->DoTick();
+    }
+  }
+}
+
+/** nsIStreamListener methods **/
+
+/* void onDataAvailable (in nsIRequest request, in nsISupports ctxt,
+                         in nsIInputStream inStr, in unsigned long sourceOffset,
+                         in unsigned long count); */
+NS_IMETHODIMP
+SVGDocumentWrapper::OnDataAvailable(nsIRequest* aRequest, nsISupports* ctxt,
+                                    nsIInputStream* inStr,
+                                    uint64_t sourceOffset,
+                                    uint32_t count)
+{
+  return mListener->OnDataAvailable(aRequest, ctxt, inStr,
+                                    sourceOffset, count);
+}
+
+/** nsIRequestObserver methods **/
+
+/* void onStartRequest (in nsIRequest request, in nsISupports ctxt); */
+NS_IMETHODIMP
+SVGDocumentWrapper::OnStartRequest(nsIRequest* aRequest, nsISupports* ctxt)
+{
+  nsresult rv = SetupViewer(aRequest,
+                            getter_AddRefs(mViewer),
+                            getter_AddRefs(mLoadGroup));
+
+  if (NS_SUCCEEDED(rv) &&
+      NS_SUCCEEDED(mListener->OnStartRequest(aRequest, nullptr))) {
+    mViewer->GetDocument()->SetIsBeingUsedAsImage();
+    StopAnimation(); // otherwise animations start automatically in helper doc
+
+    rv = mViewer->Init(nullptr, nsIntRect(0, 0, 0, 0));
+    if (NS_SUCCEEDED(rv)) {
+      rv = mViewer->Open(nullptr, nullptr);
+    }
+  }
+  return rv;
+}
+
+
+/* void onStopRequest (in nsIRequest request, in nsISupports ctxt,
+                       in nsresult status); */
+NS_IMETHODIMP
+SVGDocumentWrapper::OnStopRequest(nsIRequest* aRequest, nsISupports* ctxt,
+                                  nsresult status)
+{
+  if (mListener) {
+    mListener->OnStopRequest(aRequest, ctxt, status);
+    mListener = nullptr;
+  }
+
+  return NS_OK;
+}
+
+/** nsIObserver Methods **/
+NS_IMETHODIMP
+SVGDocumentWrapper::Observe(nsISupports* aSubject,
+                            const char* aTopic,
+                            const char16_t* aData)
+{
+  if (!strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) {
+    // Sever ties from rendering observers to helper-doc's root SVG node
+    SVGSVGElement* svgElem = GetRootSVGElem();
+    if (svgElem) {
+      nsSVGEffects::RemoveAllRenderingObservers(svgElem);
+    }
+
+    // Clean up at XPCOM shutdown time.
+    DestroyViewer();
+    if (mListener) {
+      mListener = nullptr;
+    }
+    if (mLoadGroup) {
+      mLoadGroup = nullptr;
+    }
+
+    // Turn off "registered" flag, or else we'll try to unregister when we die.
+    // (No need for that now, and the try would fail anyway -- it's too late.)
+    mRegisteredForXPCOMShutdown = false;
+  } else {
+    NS_ERROR("Unexpected observer topic.");
+  }
+  return NS_OK;
+}
+
+/** Private helper methods **/
+
+// This method is largely cribbed from
+// nsExternalResourceMap::PendingLoad::SetupViewer.
+nsresult
+SVGDocumentWrapper::SetupViewer(nsIRequest* aRequest,
+                                nsIContentViewer** aViewer,
+                                nsILoadGroup** aLoadGroup)
+{
+  nsCOMPtr<nsIChannel> chan(do_QueryInterface(aRequest));
+  NS_ENSURE_TRUE(chan, NS_ERROR_UNEXPECTED);
+
+  // Check for HTTP error page
+  nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(aRequest));
+  if (httpChannel) {
+    bool requestSucceeded;
+    if (NS_FAILED(httpChannel->GetRequestSucceeded(&requestSucceeded)) ||
+        !requestSucceeded) {
+      return NS_ERROR_FAILURE;
+    }
+  }
+
+  // Give this document its own loadgroup
+  nsCOMPtr<nsILoadGroup> loadGroup;
+  chan->GetLoadGroup(getter_AddRefs(loadGroup));
+
+  nsCOMPtr<nsILoadGroup> newLoadGroup =
+        do_CreateInstance(NS_LOADGROUP_CONTRACTID);
+  NS_ENSURE_TRUE(newLoadGroup, NS_ERROR_OUT_OF_MEMORY);
+  newLoadGroup->SetLoadGroup(loadGroup);
+
+  nsCOMPtr<nsICategoryManager> catMan =
+    do_GetService(NS_CATEGORYMANAGER_CONTRACTID);
+  NS_ENSURE_TRUE(catMan, NS_ERROR_NOT_AVAILABLE);
+  nsXPIDLCString contractId;
+  nsresult rv = catMan->GetCategoryEntry("Gecko-Content-Viewers", IMAGE_SVG_XML,
+                                         getter_Copies(contractId));
+  NS_ENSURE_SUCCESS(rv, rv);
+  nsCOMPtr<nsIDocumentLoaderFactory> docLoaderFactory =
+    do_GetService(contractId);
+  NS_ENSURE_TRUE(docLoaderFactory, NS_ERROR_NOT_AVAILABLE);
+
+  nsCOMPtr<nsIContentViewer> viewer;
+  nsCOMPtr<nsIStreamListener> listener;
+  rv = docLoaderFactory->CreateInstance("external-resource", chan,
+                                        newLoadGroup,
+                                        NS_LITERAL_CSTRING(IMAGE_SVG_XML),
+                                        nullptr, nullptr,
+                                        getter_AddRefs(listener),
+                                        getter_AddRefs(viewer));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  NS_ENSURE_TRUE(viewer, NS_ERROR_UNEXPECTED);
+
+  nsCOMPtr<nsIParser> parser = do_QueryInterface(listener);
+  NS_ENSURE_TRUE(parser, NS_ERROR_UNEXPECTED);
+
+  // XML-only, because this is for SVG content
+  nsIContentSink* sink = parser->GetContentSink();
+  nsCOMPtr<nsIXMLContentSink> xmlSink = do_QueryInterface(sink);
+  NS_ENSURE_TRUE(sink, NS_ERROR_UNEXPECTED);
+
+  listener.swap(mListener);
+  viewer.forget(aViewer);
+  newLoadGroup.forget(aLoadGroup);
+
+  RegisterForXPCOMShutdown();
+  return NS_OK;
+}
+
+void
+SVGDocumentWrapper::RegisterForXPCOMShutdown()
+{
+  MOZ_ASSERT(!mRegisteredForXPCOMShutdown,
+             "re-registering for XPCOM shutdown");
+  // Listen for xpcom-shutdown so that we can drop references to our
+  // helper-document at that point. (Otherwise, we won't get cleaned up
+  // until imgLoader::Shutdown, which can happen after the JAR service
+  // and RDF service have been unregistered.)
+  nsresult rv;
+  nsCOMPtr<nsIObserverService> obsSvc = do_GetService(OBSERVER_SVC_CID, &rv);
+  if (NS_FAILED(rv) ||
+      NS_FAILED(obsSvc->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID,
+                                    true))) {
+    NS_WARNING("Failed to register as observer of XPCOM shutdown");
+  } else {
+    mRegisteredForXPCOMShutdown = true;
+  }
+}
+
+void
+SVGDocumentWrapper::UnregisterForXPCOMShutdown()
+{
+  MOZ_ASSERT(mRegisteredForXPCOMShutdown,
+             "unregistering for XPCOM shutdown w/out being registered");
+
+  nsresult rv;
+  nsCOMPtr<nsIObserverService> obsSvc = do_GetService(OBSERVER_SVC_CID, &rv);
+  if (NS_FAILED(rv) ||
+      NS_FAILED(obsSvc->RemoveObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID))) {
+    NS_WARNING("Failed to unregister as observer of XPCOM shutdown");
+  } else {
+    mRegisteredForXPCOMShutdown = false;
+  }
+}
+
+void
+SVGDocumentWrapper::FlushLayout()
+{
+  nsCOMPtr<nsIPresShell> presShell;
+  mViewer->GetPresShell(getter_AddRefs(presShell));
+  if (presShell) {
+    presShell->FlushPendingNotifications(Flush_Layout);
+  }
+}
+
+nsIDocument*
+SVGDocumentWrapper::GetDocument()
+{
+  if (!mViewer) {
+    return nullptr;
+  }
+
+  return mViewer->GetDocument(); // May be nullptr.
+}
+
+SVGSVGElement*
+SVGDocumentWrapper::GetRootSVGElem()
+{
+  if (!mViewer) {
+    return nullptr; // Can happen during destruction
+  }
+
+  nsIDocument* doc = mViewer->GetDocument();
+  if (!doc) {
+    return nullptr; // Can happen during destruction
+  }
+
+  Element* rootElem = mViewer->GetDocument()->GetRootElement();
+  if (!rootElem || !rootElem->IsSVGElement(nsGkAtoms::svg)) {
+    return nullptr;
+  }
+
+  return static_cast<SVGSVGElement*>(rootElem);
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/SVGDocumentWrapper.h firefox-trunk-41.0~a1~hg20150524r245419/image/SVGDocumentWrapper.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/SVGDocumentWrapper.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/SVGDocumentWrapper.h	2015-05-25 20:42:42.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/. */
+
+/* This class wraps an SVG document, for use by VectorImage objects. */
+
+#ifndef mozilla_image_SVGDocumentWrapper_h
+#define mozilla_image_SVGDocumentWrapper_h
+
+#include "mozilla/Attributes.h"
+
+#include "nsCOMPtr.h"
+#include "nsIStreamListener.h"
+#include "nsIObserver.h"
+#include "nsIContentViewer.h"
+#include "nsWeakReference.h"
+#include "nsSize.h"
+
+class nsIPresShell;
+class nsIRequest;
+class nsILoadGroup;
+class nsIFrame;
+
+#define OBSERVER_SVC_CID "@mozilla.org/observer-service;1"
+
+// undef the GetCurrentTime macro defined in WinBase.h from the MS Platform SDK
+#undef GetCurrentTime
+
+namespace mozilla {
+namespace dom {
+class SVGSVGElement;
+}
+
+namespace image {
+
+class SVGDocumentWrapper final : public nsIStreamListener,
+                                 public nsIObserver,
+                                 nsSupportsWeakReference
+{
+public:
+  SVGDocumentWrapper();
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSISTREAMLISTENER
+  NS_DECL_NSIREQUESTOBSERVER
+  NS_DECL_NSIOBSERVER
+
+  enum Dimension {
+    eWidth,
+    eHeight
+  };
+
+  /**
+   * Returns the wrapped document, or nullptr on failure. (No AddRef.)
+   */
+  nsIDocument* GetDocument();
+
+  /**
+   * Returns the root <svg> element for the wrapped document, or nullptr on
+   * failure.
+   */
+  mozilla::dom::SVGSVGElement* GetRootSVGElem();
+
+  /**
+   * Returns the root nsIFrame* for the wrapped document, or nullptr on failure.
+   *
+   * @return the root nsIFrame* for the wrapped document, or nullptr on failure.
+   */
+  nsIFrame* GetRootLayoutFrame();
+
+  /**
+   * Returns (by reference) the nsIPresShell for the wrapped document.
+   *
+   * @param[out] aPresShell On success, this will be populated with a pointer
+   *                        to the wrapped document's nsIPresShell.
+   *
+   * @return NS_OK on success, or an error code on failure.
+   */
+  inline nsresult  GetPresShell(nsIPresShell** aPresShell)
+    { return mViewer->GetPresShell(aPresShell); }
+
+  /**
+   * Modifier to update the viewport dimensions of the wrapped document. This
+   * method performs a synchronous "Flush_Layout" on the wrapped document,
+   * since a viewport-change affects layout.
+   *
+   * @param aViewportSize The new viewport dimensions.
+   */
+  void UpdateViewportBounds(const nsIntSize& aViewportSize);
+
+  /**
+   * If an SVG image's helper document has a pending notification for an
+   * override on the root node's "preserveAspectRatio" attribute, then this
+   * method will flush that notification so that the image can paint correctly.
+   * (First, though, it sets the mIgnoreInvalidation flag so that we won't
+   * notify the image's observers and trigger unwanted repaint-requests.)
+   */
+  void FlushImageTransformInvalidation();
+
+  /**
+   * Returns a bool indicating whether the document has any SMIL animations.
+   *
+   * @return true if the document has any SMIL animations. Else, false.
+   */
+  bool      IsAnimated();
+
+  /**
+   * Indicates whether we should currently ignore rendering invalidations sent
+   * from the wrapped SVG doc.
+   *
+   * @return true if we should ignore invalidations sent from this SVG doc.
+   */
+  bool ShouldIgnoreInvalidation() { return mIgnoreInvalidation; }
+
+  /**
+   * Methods to control animation.
+   */
+  void StartAnimation();
+  void StopAnimation();
+  void ResetAnimation();
+  float GetCurrentTime();
+  void SetCurrentTime(float aTime);
+  void TickRefreshDriver();
+
+  /**
+   * Force a layout flush of the underlying SVG document.
+   */
+  void FlushLayout();
+
+private:
+  ~SVGDocumentWrapper();
+
+  nsresult SetupViewer(nsIRequest* aRequest,
+                       nsIContentViewer** aViewer,
+                       nsILoadGroup** aLoadGroup);
+  void     DestroyViewer();
+  void     RegisterForXPCOMShutdown();
+  void     UnregisterForXPCOMShutdown();
+
+  nsCOMPtr<nsIContentViewer>  mViewer;
+  nsCOMPtr<nsILoadGroup>      mLoadGroup;
+  nsCOMPtr<nsIStreamListener> mListener;
+  bool                        mIgnoreInvalidation;
+  bool                        mRegisteredForXPCOMShutdown;
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_SVGDocumentWrapper_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/test/crashtests/crashtests.list firefox-trunk-41.0~a1~hg20150524r245419/image/test/crashtests/crashtests.list
--- firefox-trunk-41.0~a1~hg20150513r243603/image/test/crashtests/crashtests.list	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/test/crashtests/crashtests.list	2015-05-25 20:42:42.000000000 +0000
@@ -47,3 +47,8 @@
 load 856616.gif
 
 skip-if(AddressSanitizer) skip-if(B2G) load 944353.jpg
+
+# Bug 1160801: Ensure that we handle invalid disposal types.
+load invalid-disposal-method-1.gif
+load invalid-disposal-method-2.gif
+load invalid-disposal-method-3.gif
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/image/test/crashtests/invalid-disposal-method-1.gif and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/image/test/crashtests/invalid-disposal-method-1.gif differ
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/image/test/crashtests/invalid-disposal-method-2.gif and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/image/test/crashtests/invalid-disposal-method-2.gif differ
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/image/test/crashtests/invalid-disposal-method-3.gif and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/image/test/crashtests/invalid-disposal-method-3.gif differ
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/VectorImage.cpp firefox-trunk-41.0~a1~hg20150524r245419/image/VectorImage.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/image/VectorImage.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/VectorImage.cpp	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,1262 @@
+/* -*- 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 "VectorImage.h"
+
+#include "gfx2DGlue.h"
+#include "gfxContext.h"
+#include "gfxDrawable.h"
+#include "gfxPlatform.h"
+#include "gfxUtils.h"
+#include "imgFrame.h"
+#include "mozilla/AutoRestore.h"
+#include "mozilla/MemoryReporting.h"
+#include "mozilla/dom/SVGSVGElement.h"
+#include "mozilla/gfx/2D.h"
+#include "mozilla/RefPtr.h"
+#include "nsIDOMEvent.h"
+#include "nsIPresShell.h"
+#include "nsIStreamListener.h"
+#include "nsMimeTypes.h"
+#include "nsPresContext.h"
+#include "nsRect.h"
+#include "nsString.h"
+#include "nsStubDocumentObserver.h"
+#include "nsSVGEffects.h" // for nsSVGRenderingObserver
+#include "nsWindowMemoryReporter.h"
+#include "ImageRegion.h"
+#include "Orientation.h"
+#include "SVGDocumentWrapper.h"
+#include "nsIDOMEventListener.h"
+#include "SurfaceCache.h"
+
+// undef the GetCurrentTime macro defined in WinBase.h from the MS Platform SDK
+#undef GetCurrentTime
+
+namespace mozilla {
+
+using namespace dom;
+using namespace gfx;
+using namespace layers;
+
+namespace image {
+
+// Helper-class: SVGRootRenderingObserver
+class SVGRootRenderingObserver final : public nsSVGRenderingObserver {
+public:
+  SVGRootRenderingObserver(SVGDocumentWrapper* aDocWrapper,
+                           VectorImage*        aVectorImage)
+    : nsSVGRenderingObserver()
+    , mDocWrapper(aDocWrapper)
+    , mVectorImage(aVectorImage)
+    , mHonoringInvalidations(true)
+  {
+    MOZ_ASSERT(mDocWrapper, "Need a non-null SVG document wrapper");
+    MOZ_ASSERT(mVectorImage, "Need a non-null VectorImage");
+
+    StartListening();
+    Element* elem = GetTarget();
+    MOZ_ASSERT(elem, "no root SVG node for us to observe");
+
+    nsSVGEffects::AddRenderingObserver(elem, this);
+    mInObserverList = true;
+  }
+
+  virtual ~SVGRootRenderingObserver()
+  {
+    StopListening();
+  }
+
+  void ResumeHonoringInvalidations()
+  {
+    mHonoringInvalidations = true;
+  }
+
+protected:
+  virtual Element* GetTarget() override
+  {
+    return mDocWrapper->GetRootSVGElem();
+  }
+
+  virtual void DoUpdate() override
+  {
+    Element* elem = GetTarget();
+    MOZ_ASSERT(elem, "missing root SVG node");
+
+    if (mHonoringInvalidations && !mDocWrapper->ShouldIgnoreInvalidation()) {
+      nsIFrame* frame = elem->GetPrimaryFrame();
+      if (!frame || frame->PresContext()->PresShell()->IsDestroying()) {
+        // We're being destroyed. Bail out.
+        return;
+      }
+
+      // Ignore further invalidations until we draw.
+      mHonoringInvalidations = false;
+
+      mVectorImage->InvalidateObserversOnNextRefreshDriverTick();
+    }
+
+    // Our caller might've removed us from rendering-observer list.
+    // Add ourselves back!
+    if (!mInObserverList) {
+      nsSVGEffects::AddRenderingObserver(elem, this);
+      mInObserverList = true;
+    }
+  }
+
+  // Private data
+  const nsRefPtr<SVGDocumentWrapper> mDocWrapper;
+  VectorImage* const mVectorImage;   // Raw pointer because it owns me.
+  bool mHonoringInvalidations;
+};
+
+class SVGParseCompleteListener final : public nsStubDocumentObserver {
+public:
+  NS_DECL_ISUPPORTS
+
+  SVGParseCompleteListener(nsIDocument* aDocument,
+                           VectorImage* aImage)
+    : mDocument(aDocument)
+    , mImage(aImage)
+  {
+    MOZ_ASSERT(mDocument, "Need an SVG document");
+    MOZ_ASSERT(mImage, "Need an image");
+
+    mDocument->AddObserver(this);
+  }
+
+private:
+  ~SVGParseCompleteListener()
+  {
+    if (mDocument) {
+      // The document must have been destroyed before we got our event.
+      // Otherwise this can't happen, since documents hold strong references to
+      // their observers.
+      Cancel();
+    }
+  }
+
+public:
+  void EndLoad(nsIDocument* aDocument) override
+  {
+    MOZ_ASSERT(aDocument == mDocument, "Got EndLoad for wrong document?");
+
+    // OnSVGDocumentParsed will release our owner's reference to us, so ensure
+    // we stick around long enough to complete our work.
+    nsRefPtr<SVGParseCompleteListener> kungFuDeathGroup(this);
+
+    mImage->OnSVGDocumentParsed();
+  }
+
+  void Cancel()
+  {
+    MOZ_ASSERT(mDocument, "Duplicate call to Cancel");
+    if (mDocument) {
+      mDocument->RemoveObserver(this);
+      mDocument = nullptr;
+    }
+  }
+
+private:
+  nsCOMPtr<nsIDocument> mDocument;
+  VectorImage* const mImage; // Raw pointer to owner.
+};
+
+NS_IMPL_ISUPPORTS(SVGParseCompleteListener, nsIDocumentObserver)
+
+class SVGLoadEventListener final : public nsIDOMEventListener {
+public:
+  NS_DECL_ISUPPORTS
+
+  SVGLoadEventListener(nsIDocument* aDocument,
+                       VectorImage* aImage)
+    : mDocument(aDocument)
+    , mImage(aImage)
+  {
+    MOZ_ASSERT(mDocument, "Need an SVG document");
+    MOZ_ASSERT(mImage, "Need an image");
+
+    mDocument->AddEventListener(NS_LITERAL_STRING("MozSVGAsImageDocumentLoad"),
+                                this, true, false);
+    mDocument->AddEventListener(NS_LITERAL_STRING("SVGAbort"), this, true,
+                                false);
+    mDocument->AddEventListener(NS_LITERAL_STRING("SVGError"), this, true,
+                                false);
+  }
+
+private:
+  ~SVGLoadEventListener()
+  {
+    if (mDocument) {
+      // The document must have been destroyed before we got our event.
+      // Otherwise this can't happen, since documents hold strong references to
+      // their observers.
+      Cancel();
+    }
+  }
+
+public:
+  NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) override
+  {
+    MOZ_ASSERT(mDocument, "Need an SVG document. Received multiple events?");
+
+    // OnSVGDocumentLoaded/OnSVGDocumentError will release our owner's reference
+    // to us, so ensure we stick around long enough to complete our work.
+    nsRefPtr<SVGLoadEventListener> kungFuDeathGroup(this);
+
+    nsAutoString eventType;
+    aEvent->GetType(eventType);
+    MOZ_ASSERT(eventType.EqualsLiteral("MozSVGAsImageDocumentLoad")  ||
+               eventType.EqualsLiteral("SVGAbort")                   ||
+               eventType.EqualsLiteral("SVGError"),
+               "Received unexpected event");
+
+    if (eventType.EqualsLiteral("MozSVGAsImageDocumentLoad")) {
+      mImage->OnSVGDocumentLoaded();
+    } else {
+      mImage->OnSVGDocumentError();
+    }
+
+    return NS_OK;
+  }
+
+  void Cancel()
+  {
+    MOZ_ASSERT(mDocument, "Duplicate call to Cancel");
+    if (mDocument) {
+      mDocument
+        ->RemoveEventListener(NS_LITERAL_STRING("MozSVGAsImageDocumentLoad"),
+                              this, true);
+      mDocument->RemoveEventListener(NS_LITERAL_STRING("SVGAbort"), this, true);
+      mDocument->RemoveEventListener(NS_LITERAL_STRING("SVGError"), this, true);
+      mDocument = nullptr;
+    }
+  }
+
+private:
+  nsCOMPtr<nsIDocument> mDocument;
+  VectorImage* const mImage; // Raw pointer to owner.
+};
+
+NS_IMPL_ISUPPORTS(SVGLoadEventListener, nsIDOMEventListener)
+
+// Helper-class: SVGDrawingCallback
+class SVGDrawingCallback : public gfxDrawingCallback {
+public:
+  SVGDrawingCallback(SVGDocumentWrapper* aSVGDocumentWrapper,
+                     const IntRect& aViewport,
+                     const IntSize& aSize,
+                     uint32_t aImageFlags)
+    : mSVGDocumentWrapper(aSVGDocumentWrapper)
+    , mViewport(aViewport)
+    , mSize(aSize)
+    , mImageFlags(aImageFlags)
+  { }
+  virtual bool operator()(gfxContext* aContext,
+                          const gfxRect& aFillRect,
+                          const GraphicsFilter& aFilter,
+                          const gfxMatrix& aTransform);
+private:
+  nsRefPtr<SVGDocumentWrapper> mSVGDocumentWrapper;
+  const IntRect              mViewport;
+  const IntSize                mSize;
+  uint32_t                     mImageFlags;
+};
+
+// Based loosely on nsSVGIntegrationUtils' PaintFrameCallback::operator()
+bool
+SVGDrawingCallback::operator()(gfxContext* aContext,
+                               const gfxRect& aFillRect,
+                               const GraphicsFilter& aFilter,
+                               const gfxMatrix& aTransform)
+{
+  MOZ_ASSERT(mSVGDocumentWrapper, "need an SVGDocumentWrapper");
+
+  // Get (& sanity-check) the helper-doc's presShell
+  nsCOMPtr<nsIPresShell> presShell;
+  if (NS_FAILED(mSVGDocumentWrapper->GetPresShell(getter_AddRefs(presShell)))) {
+    NS_WARNING("Unable to draw -- presShell lookup failed");
+    return false;
+  }
+  MOZ_ASSERT(presShell, "GetPresShell succeeded but returned null");
+
+  gfxContextAutoSaveRestore contextRestorer(aContext);
+
+  // Clip to aFillRect so that we don't paint outside.
+  aContext->NewPath();
+  aContext->Rectangle(aFillRect);
+  aContext->Clip();
+
+  gfxMatrix matrix = aTransform;
+  if (!matrix.Invert()) {
+    return false;
+  }
+  aContext->SetMatrix(
+    aContext->CurrentMatrix().PreMultiply(matrix).
+                              Scale(double(mSize.width) / mViewport.width,
+                                    double(mSize.height) / mViewport.height));
+
+  nsPresContext* presContext = presShell->GetPresContext();
+  MOZ_ASSERT(presContext, "pres shell w/out pres context");
+
+  nsRect svgRect(presContext->DevPixelsToAppUnits(mViewport.x),
+                 presContext->DevPixelsToAppUnits(mViewport.y),
+                 presContext->DevPixelsToAppUnits(mViewport.width),
+                 presContext->DevPixelsToAppUnits(mViewport.height));
+
+  uint32_t renderDocFlags = nsIPresShell::RENDER_IGNORE_VIEWPORT_SCROLLING;
+  if (!(mImageFlags & imgIContainer::FLAG_SYNC_DECODE)) {
+    renderDocFlags |= nsIPresShell::RENDER_ASYNC_DECODE_IMAGES;
+  }
+
+  presShell->RenderDocument(svgRect, renderDocFlags,
+                            NS_RGBA(0, 0, 0, 0), // transparent
+                            aContext);
+
+  return true;
+}
+
+// Implement VectorImage's nsISupports-inherited methods
+NS_IMPL_ISUPPORTS(VectorImage,
+                  imgIContainer,
+                  nsIStreamListener,
+                  nsIRequestObserver)
+
+//------------------------------------------------------------------------------
+// Constructor / Destructor
+
+VectorImage::VectorImage(ImageURL* aURI /* = nullptr */) :
+  ImageResource(aURI), // invoke superclass's constructor
+  mLockCount(0),
+  mIsInitialized(false),
+  mIsFullyLoaded(false),
+  mIsDrawing(false),
+  mHaveAnimations(false),
+  mHasPendingInvalidation(false)
+{ }
+
+VectorImage::~VectorImage()
+{
+  CancelAllListeners();
+  SurfaceCache::RemoveImage(ImageKey(this));
+}
+
+//------------------------------------------------------------------------------
+// Methods inherited from Image.h
+
+nsresult
+VectorImage::Init(const char* aMimeType,
+                  uint32_t aFlags)
+{
+  // We don't support re-initialization
+  if (mIsInitialized) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+
+  MOZ_ASSERT(!mIsFullyLoaded && !mHaveAnimations && !mError,
+             "Flags unexpectedly set before initialization");
+  MOZ_ASSERT(!strcmp(aMimeType, IMAGE_SVG_XML), "Unexpected mimetype");
+
+  mDiscardable = !!(aFlags & INIT_FLAG_DISCARDABLE);
+
+  // Lock this image's surfaces in the SurfaceCache if we're not discardable.
+  if (!mDiscardable) {
+    mLockCount++;
+    SurfaceCache::LockImage(ImageKey(this));
+  }
+
+  mIsInitialized = true;
+  return NS_OK;
+}
+
+size_t
+VectorImage::SizeOfSourceWithComputedFallback(MallocSizeOf aMallocSizeOf) const
+{
+  nsIDocument* doc = mSVGDocumentWrapper->GetDocument();
+  if (!doc) {
+    return 0; // No document, so no memory used for the document.
+  }
+
+  nsWindowSizes windowSizes(aMallocSizeOf);
+  doc->DocAddSizeOfIncludingThis(&windowSizes);
+
+  if (windowSizes.getTotalSize() == 0) {
+    // MallocSizeOf fails on this platform. Because we also use this method for
+    // determining the size of cache entries, we need to return something
+    // reasonable here. Unfortunately, there's no way to estimate the document's
+    // size accurately, so we just use a constant value of 100KB, which will
+    // generally underestimate the true size.
+    return 100 * 1024;
+  }
+
+  return windowSizes.getTotalSize();
+}
+
+void
+VectorImage::CollectSizeOfSurfaces(nsTArray<SurfaceMemoryCounter>& aCounters,
+                                   MallocSizeOf aMallocSizeOf) const
+{
+  SurfaceCache::CollectSizeOfSurfaces(ImageKey(this), aCounters, aMallocSizeOf);
+}
+
+nsresult
+VectorImage::OnImageDataComplete(nsIRequest* aRequest,
+                                 nsISupports* aContext,
+                                 nsresult aStatus,
+                                 bool aLastPart)
+{
+  // Call our internal OnStopRequest method, which only talks to our embedded
+  // SVG document. This won't have any effect on our ProgressTracker.
+  nsresult finalStatus = OnStopRequest(aRequest, aContext, aStatus);
+
+  // Give precedence to Necko failure codes.
+  if (NS_FAILED(aStatus)) {
+    finalStatus = aStatus;
+  }
+
+  // Actually fire OnStopRequest.
+  if (mProgressTracker) {
+    mProgressTracker->SyncNotifyProgress(LoadCompleteProgress(aLastPart,
+                                                              mError,
+                                                              finalStatus));
+  }
+  return finalStatus;
+}
+
+nsresult
+VectorImage::OnImageDataAvailable(nsIRequest* aRequest,
+                                  nsISupports* aContext,
+                                  nsIInputStream* aInStr,
+                                  uint64_t aSourceOffset,
+                                  uint32_t aCount)
+{
+  return OnDataAvailable(aRequest, aContext, aInStr, aSourceOffset, aCount);
+}
+
+nsresult
+VectorImage::StartAnimation()
+{
+  if (mError) {
+    return NS_ERROR_FAILURE;
+  }
+
+  MOZ_ASSERT(ShouldAnimate(), "Should not animate!");
+
+  mSVGDocumentWrapper->StartAnimation();
+  return NS_OK;
+}
+
+nsresult
+VectorImage::StopAnimation()
+{
+  nsresult rv = NS_OK;
+  if (mError) {
+    rv = NS_ERROR_FAILURE;
+  } else {
+    MOZ_ASSERT(mIsFullyLoaded && mHaveAnimations,
+               "Should not have been animating!");
+
+    mSVGDocumentWrapper->StopAnimation();
+  }
+
+  mAnimating = false;
+  return rv;
+}
+
+bool
+VectorImage::ShouldAnimate()
+{
+  return ImageResource::ShouldAnimate() && mIsFullyLoaded && mHaveAnimations;
+}
+
+NS_IMETHODIMP_(void)
+VectorImage::SetAnimationStartTime(const TimeStamp& aTime)
+{
+  // We don't care about animation start time.
+}
+
+//------------------------------------------------------------------------------
+// imgIContainer methods
+
+//******************************************************************************
+/* readonly attribute int32_t width; */
+NS_IMETHODIMP
+VectorImage::GetWidth(int32_t* aWidth)
+{
+  if (mError || !mIsFullyLoaded) {
+    *aWidth = -1;
+  } else {
+    SVGSVGElement* rootElem = mSVGDocumentWrapper->GetRootSVGElem();
+    MOZ_ASSERT(rootElem, "Should have a root SVG elem, since we finished "
+                         "loading without errors");
+    *aWidth = rootElem->GetIntrinsicWidth();
+  }
+  return *aWidth >= 0 ? NS_OK : NS_ERROR_FAILURE;
+}
+
+//******************************************************************************
+/* [notxpcom] void requestRefresh ([const] in TimeStamp aTime); */
+NS_IMETHODIMP_(void)
+VectorImage::RequestRefresh(const TimeStamp& aTime)
+{
+  if (HadRecentRefresh(aTime)) {
+    return;
+  }
+
+  EvaluateAnimation();
+
+  mSVGDocumentWrapper->TickRefreshDriver();
+
+  if (mHasPendingInvalidation) {
+    SendInvalidationNotifications();
+    mHasPendingInvalidation = false;
+  }
+}
+
+void
+VectorImage::SendInvalidationNotifications()
+{
+  // Animated images don't send out invalidation notifications as soon as
+  // they're generated. Instead, InvalidateObserversOnNextRefreshDriverTick
+  // records that there are pending invalidations and then returns immediately.
+  // The notifications are actually sent from RequestRefresh(). We send these
+  // notifications there to ensure that there is actually a document observing
+  // us. Otherwise, the notifications are just wasted effort.
+  //
+  // Non-animated images call this method directly from
+  // InvalidateObserversOnNextRefreshDriverTick, because RequestRefresh is never
+  // called for them. Ordinarily this isn't needed, since we send out
+  // invalidation notifications in OnSVGDocumentLoaded, but in rare cases the
+  // SVG document may not be 100% ready to render at that time. In those cases
+  // we would miss the subsequent invalidations if we didn't send out the
+  // notifications directly in |InvalidateObservers...|.
+
+  if (mProgressTracker) {
+    SurfaceCache::RemoveImage(ImageKey(this));
+    mProgressTracker->SyncNotifyProgress(FLAG_FRAME_COMPLETE,
+                                         GetMaxSizedIntRect());
+  }
+}
+
+NS_IMETHODIMP_(IntRect)
+VectorImage::GetImageSpaceInvalidationRect(const IntRect& aRect)
+{
+  return aRect;
+}
+
+//******************************************************************************
+/* readonly attribute int32_t height; */
+NS_IMETHODIMP
+VectorImage::GetHeight(int32_t* aHeight)
+{
+  if (mError || !mIsFullyLoaded) {
+    *aHeight = -1;
+  } else {
+    SVGSVGElement* rootElem = mSVGDocumentWrapper->GetRootSVGElem();
+    MOZ_ASSERT(rootElem, "Should have a root SVG elem, since we finished "
+                         "loading without errors");
+    *aHeight = rootElem->GetIntrinsicHeight();
+  }
+  return *aHeight >= 0 ? NS_OK : NS_ERROR_FAILURE;
+}
+
+//******************************************************************************
+/* [noscript] readonly attribute nsSize intrinsicSize; */
+NS_IMETHODIMP
+VectorImage::GetIntrinsicSize(nsSize* aSize)
+{
+  if (mError || !mIsFullyLoaded) {
+    return NS_ERROR_FAILURE;
+  }
+
+  nsIFrame* rootFrame = mSVGDocumentWrapper->GetRootLayoutFrame();
+  if (!rootFrame) {
+    return NS_ERROR_FAILURE;
+  }
+
+  *aSize = nsSize(-1, -1);
+  IntrinsicSize rfSize = rootFrame->GetIntrinsicSize();
+  if (rfSize.width.GetUnit() == eStyleUnit_Coord) {
+    aSize->width = rfSize.width.GetCoordValue();
+  }
+  if (rfSize.height.GetUnit() == eStyleUnit_Coord) {
+    aSize->height = rfSize.height.GetCoordValue();
+  }
+
+  return NS_OK;
+}
+
+//******************************************************************************
+/* [noscript] readonly attribute nsSize intrinsicRatio; */
+NS_IMETHODIMP
+VectorImage::GetIntrinsicRatio(nsSize* aRatio)
+{
+  if (mError || !mIsFullyLoaded) {
+    return NS_ERROR_FAILURE;
+  }
+
+  nsIFrame* rootFrame = mSVGDocumentWrapper->GetRootLayoutFrame();
+  if (!rootFrame) {
+    return NS_ERROR_FAILURE;
+  }
+
+  *aRatio = rootFrame->GetIntrinsicRatio();
+  return NS_OK;
+}
+
+NS_IMETHODIMP_(Orientation)
+VectorImage::GetOrientation()
+{
+  return Orientation();
+}
+
+//******************************************************************************
+/* readonly attribute unsigned short type; */
+NS_IMETHODIMP
+VectorImage::GetType(uint16_t* aType)
+{
+  NS_ENSURE_ARG_POINTER(aType);
+
+  *aType = imgIContainer::TYPE_VECTOR;
+  return NS_OK;
+}
+
+//******************************************************************************
+/* readonly attribute boolean animated; */
+NS_IMETHODIMP
+VectorImage::GetAnimated(bool* aAnimated)
+{
+  if (mError || !mIsFullyLoaded) {
+    return NS_ERROR_FAILURE;
+  }
+
+  *aAnimated = mSVGDocumentWrapper->IsAnimated();
+  return NS_OK;
+}
+
+//******************************************************************************
+/* [notxpcom] int32_t getFirstFrameDelay (); */
+int32_t
+VectorImage::GetFirstFrameDelay()
+{
+  if (mError) {
+    return -1;
+  }
+
+  if (!mSVGDocumentWrapper->IsAnimated()) {
+    return -1;
+  }
+
+  // We don't really have a frame delay, so just pretend that we constantly
+  // need updates.
+  return 0;
+}
+
+NS_IMETHODIMP_(bool)
+VectorImage::IsOpaque()
+{
+  return false; // In general, SVG content is not opaque.
+}
+
+//******************************************************************************
+/* [noscript] SourceSurface getFrame(in uint32_t aWhichFrame,
+ *                                   in uint32_t aFlags; */
+NS_IMETHODIMP_(TemporaryRef<SourceSurface>)
+VectorImage::GetFrame(uint32_t aWhichFrame,
+                      uint32_t aFlags)
+{
+  MOZ_ASSERT(aWhichFrame <= FRAME_MAX_VALUE);
+
+  if (aWhichFrame > FRAME_MAX_VALUE) {
+    return nullptr;
+  }
+
+  if (mError || !mIsFullyLoaded) {
+    return nullptr;
+  }
+
+  // Look up height & width
+  // ----------------------
+  SVGSVGElement* svgElem = mSVGDocumentWrapper->GetRootSVGElem();
+  MOZ_ASSERT(svgElem, "Should have a root SVG elem, since we finished "
+                      "loading without errors");
+  nsIntSize imageIntSize(svgElem->GetIntrinsicWidth(),
+                         svgElem->GetIntrinsicHeight());
+
+  if (imageIntSize.IsEmpty()) {
+    // We'll get here if our SVG doc has a percent-valued or negative width or
+    // height.
+    return nullptr;
+  }
+
+  // Make our surface the size of what will ultimately be drawn to it.
+  // (either the full image size, or the restricted region)
+  RefPtr<DrawTarget> dt = gfxPlatform::GetPlatform()->
+    CreateOffscreenContentDrawTarget(IntSize(imageIntSize.width,
+                                             imageIntSize.height),
+                                     SurfaceFormat::B8G8R8A8);
+  if (!dt) {
+    NS_ERROR("Could not create a DrawTarget");
+    return nullptr;
+  }
+
+  nsRefPtr<gfxContext> context = new gfxContext(dt);
+
+  auto result = Draw(context, imageIntSize,
+                     ImageRegion::Create(imageIntSize),
+                     aWhichFrame, GraphicsFilter::FILTER_NEAREST,
+                     Nothing(), aFlags);
+
+  return result == DrawResult::SUCCESS ? dt->Snapshot() : nullptr;
+}
+
+NS_IMETHODIMP_(bool)
+VectorImage::IsImageContainerAvailable(LayerManager* aManager, uint32_t aFlags)
+{
+  return false;
+}
+
+//******************************************************************************
+/* [noscript] ImageContainer getImageContainer(); */
+NS_IMETHODIMP_(already_AddRefed<ImageContainer>)
+VectorImage::GetImageContainer(LayerManager* aManager, uint32_t aFlags)
+{
+  return nullptr;
+}
+
+struct SVGDrawingParameters
+{
+  SVGDrawingParameters(gfxContext* aContext,
+                       const nsIntSize& aSize,
+                       const ImageRegion& aRegion,
+                       GraphicsFilter aFilter,
+                       const Maybe<SVGImageContext>& aSVGContext,
+                       float aAnimationTime,
+                       uint32_t aFlags)
+    : context(aContext)
+    , size(aSize.width, aSize.height)
+    , imageRect(0, 0, aSize.width, aSize.height)
+    , region(aRegion)
+    , filter(aFilter)
+    , svgContext(aSVGContext)
+    , viewportSize(aSize)
+    , animationTime(aAnimationTime)
+    , flags(aFlags)
+    , opacity(aSVGContext ? aSVGContext->GetGlobalOpacity() : 1.0)
+  {
+    if (aSVGContext) {
+      CSSIntSize sz = aSVGContext->GetViewportSize();
+      viewportSize = nsIntSize(sz.width, sz.height); // XXX losing unit
+    }
+  }
+
+  gfxContext*                   context;
+  IntSize                       size;
+  IntRect                       imageRect;
+  ImageRegion                   region;
+  GraphicsFilter                filter;
+  const Maybe<SVGImageContext>& svgContext;
+  nsIntSize                     viewportSize;
+  float                         animationTime;
+  uint32_t                      flags;
+  gfxFloat                      opacity;
+};
+
+//******************************************************************************
+/* [noscript] void draw(in gfxContext aContext,
+ *                      [const] in nsIntSize aSize,
+ *                      [const] in ImageRegion aRegion,
+ *                      in uint32_t aWhichFrame,
+ *                      in gfxGraphicsFilter aFilter,
+ *                      [const] in MaybeSVGImageContext aSVGContext,
+ *                      in uint32_t aFlags); */
+NS_IMETHODIMP_(DrawResult)
+VectorImage::Draw(gfxContext* aContext,
+                  const nsIntSize& aSize,
+                  const ImageRegion& aRegion,
+                  uint32_t aWhichFrame,
+                  GraphicsFilter aFilter,
+                  const Maybe<SVGImageContext>& aSVGContext,
+                  uint32_t aFlags)
+{
+  if (aWhichFrame > FRAME_MAX_VALUE) {
+    return DrawResult::BAD_ARGS;
+  }
+
+  if (!aContext) {
+    return DrawResult::BAD_ARGS;
+  }
+
+  if (mError) {
+    return DrawResult::BAD_IMAGE;
+  }
+
+  if (!mIsFullyLoaded) {
+    return DrawResult::NOT_READY;
+  }
+
+  if (mIsDrawing) {
+    NS_WARNING("Refusing to make re-entrant call to VectorImage::Draw");
+    return DrawResult::TEMPORARY_ERROR;
+  }
+
+  if (mAnimationConsumers == 0 && mProgressTracker) {
+    mProgressTracker->OnUnlockedDraw();
+  }
+
+  AutoRestore<bool> autoRestoreIsDrawing(mIsDrawing);
+  mIsDrawing = true;
+
+  float animTime =
+    (aWhichFrame == FRAME_FIRST) ? 0.0f
+                                 : mSVGDocumentWrapper->GetCurrentTime();
+  AutoSVGRenderingState autoSVGState(aSVGContext, animTime,
+                                     mSVGDocumentWrapper->GetRootSVGElem());
+
+  // Pack up the drawing parameters.
+  SVGDrawingParameters params(aContext, aSize, aRegion, aFilter,
+                              aSVGContext, animTime, aFlags);
+
+  if (aFlags & FLAG_BYPASS_SURFACE_CACHE) {
+    CreateSurfaceAndShow(params);
+    return DrawResult::SUCCESS;
+  }
+
+  DrawableFrameRef frameRef =
+    SurfaceCache::Lookup(ImageKey(this),
+                         VectorSurfaceKey(params.size,
+                                          params.svgContext,
+                                          params.animationTime));
+
+  // Draw.
+  if (frameRef) {
+    RefPtr<SourceSurface> surface = frameRef->GetSurface();
+    if (surface) {
+      nsRefPtr<gfxDrawable> svgDrawable =
+        new gfxSurfaceDrawable(surface, frameRef->GetSize());
+      Show(svgDrawable, params);
+      return DrawResult::SUCCESS;
+    }
+
+    // We lost our surface due to some catastrophic event.
+    RecoverFromLossOfSurfaces();
+  }
+
+  CreateSurfaceAndShow(params);
+
+  return DrawResult::SUCCESS;
+}
+
+void
+VectorImage::CreateSurfaceAndShow(const SVGDrawingParameters& aParams)
+{
+  mSVGDocumentWrapper->UpdateViewportBounds(aParams.viewportSize);
+  mSVGDocumentWrapper->FlushImageTransformInvalidation();
+
+  nsRefPtr<gfxDrawingCallback> cb =
+    new SVGDrawingCallback(mSVGDocumentWrapper,
+                           IntRect(IntPoint(0, 0), aParams.viewportSize),
+                           aParams.size,
+                           aParams.flags);
+
+  nsRefPtr<gfxDrawable> svgDrawable =
+    new gfxCallbackDrawable(cb, aParams.size);
+
+  bool bypassCache = bool(aParams.flags & FLAG_BYPASS_SURFACE_CACHE) ||
+                     // Refuse to cache animated images:
+                     // XXX(seth): We may remove this restriction in bug 922893.
+                     mHaveAnimations ||
+                     // The image is too big to fit in the cache:
+                     !SurfaceCache::CanHold(aParams.size);
+  if (bypassCache) {
+    return Show(svgDrawable, aParams);
+  }
+
+  // We're about to rerasterize, which may mean that some of the previous
+  // surfaces we've rasterized aren't useful anymore. We can allow them to
+  // expire from the cache by unlocking them here, and then sending out an
+  // invalidation. If this image is locked, any surfaces that are still useful
+  // will become locked again when Draw touches them, and the remainder will
+  // eventually expire.
+  SurfaceCache::UnlockSurfaces(ImageKey(this));
+
+  // Try to create an imgFrame, initializing the surface it contains by drawing
+  // our gfxDrawable into it. (We use FILTER_NEAREST since we never scale here.)
+  nsRefPtr<imgFrame> frame = new imgFrame;
+  nsresult rv =
+    frame->InitWithDrawable(svgDrawable, aParams.size,
+                            SurfaceFormat::B8G8R8A8,
+                            GraphicsFilter::FILTER_NEAREST, aParams.flags);
+
+  // If we couldn't create the frame, it was probably because it would end
+  // up way too big. Generally it also wouldn't fit in the cache, but the prefs
+  // could be set such that the cache isn't the limiting factor.
+  if (NS_FAILED(rv)) {
+    return Show(svgDrawable, aParams);
+  }
+
+  // Take a strong reference to the frame's surface and make sure it hasn't
+  // already been purged by the operating system.
+  RefPtr<SourceSurface> surface = frame->GetSurface();
+  if (!surface) {
+    return Show(svgDrawable, aParams);
+  }
+
+  // Attempt to cache the frame.
+  SurfaceCache::Insert(frame, ImageKey(this),
+                       VectorSurfaceKey(aParams.size,
+                                        aParams.svgContext,
+                                        aParams.animationTime),
+                       Lifetime::Persistent);
+
+  // Draw.
+  nsRefPtr<gfxDrawable> drawable =
+    new gfxSurfaceDrawable(surface, aParams.size);
+  Show(drawable, aParams);
+
+  // Send out an invalidation so that surfaces that are still in use get
+  // re-locked. See the discussion of the UnlockSurfaces call above.
+  mProgressTracker->SyncNotifyProgress(FLAG_FRAME_COMPLETE,
+                                       GetMaxSizedIntRect());
+}
+
+
+void
+VectorImage::Show(gfxDrawable* aDrawable, const SVGDrawingParameters& aParams)
+{
+  MOZ_ASSERT(aDrawable, "Should have a gfxDrawable by now");
+  gfxUtils::DrawPixelSnapped(aParams.context, aDrawable,
+                             aParams.size,
+                             aParams.region,
+                             SurfaceFormat::B8G8R8A8,
+                             aParams.filter, aParams.flags, aParams.opacity);
+
+  MOZ_ASSERT(mRenderingObserver, "Should have a rendering observer by now");
+  mRenderingObserver->ResumeHonoringInvalidations();
+}
+
+void
+VectorImage::RecoverFromLossOfSurfaces()
+{
+  NS_WARNING("An imgFrame became invalid. Attempting to recover...");
+
+  // Discard all existing frames, since they're probably all now invalid.
+  SurfaceCache::RemoveImage(ImageKey(this));
+}
+
+//******************************************************************************
+/* void requestDecode() */
+NS_IMETHODIMP
+VectorImage::RequestDecode()
+{
+  // Nothing to do for SVG images
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+VectorImage::StartDecoding()
+{
+  // Nothing to do for SVG images
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+VectorImage::RequestDecodeForSize(const nsIntSize& aSize, uint32_t aFlags)
+{
+  // Nothing to do for SVG images, though in theory we could rasterize to the
+  // provided size ahead of time if we supported off-main-thread SVG
+  // rasterization...
+  return NS_OK;
+}
+
+//******************************************************************************
+/* void lockImage() */
+NS_IMETHODIMP
+VectorImage::LockImage()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  if (mError) {
+    return NS_ERROR_FAILURE;
+  }
+
+  mLockCount++;
+
+  if (mLockCount == 1) {
+    // Lock this image's surfaces in the SurfaceCache.
+    SurfaceCache::LockImage(ImageKey(this));
+  }
+
+  return NS_OK;
+}
+
+//******************************************************************************
+/* void unlockImage() */
+NS_IMETHODIMP
+VectorImage::UnlockImage()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  if (mError) {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (mLockCount == 0) {
+    MOZ_ASSERT_UNREACHABLE("Calling UnlockImage with a zero lock count");
+    return NS_ERROR_ABORT;
+  }
+
+  mLockCount--;
+
+  if (mLockCount == 0) {
+    // Unlock this image's surfaces in the SurfaceCache.
+    SurfaceCache::UnlockImage(ImageKey(this));
+  }
+
+  return NS_OK;
+}
+
+//******************************************************************************
+/* void requestDiscard() */
+NS_IMETHODIMP
+VectorImage::RequestDiscard()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  if (mDiscardable && mLockCount == 0) {
+    SurfaceCache::RemoveImage(ImageKey(this));
+    mProgressTracker->OnDiscard();
+  }
+
+  return NS_OK;
+}
+
+void
+VectorImage::OnSurfaceDiscarded()
+{
+  MOZ_ASSERT(mProgressTracker);
+
+  nsCOMPtr<nsIRunnable> runnable =
+    NS_NewRunnableMethod(mProgressTracker, &ProgressTracker::OnDiscard);
+  NS_DispatchToMainThread(runnable);
+}
+
+//******************************************************************************
+/* void resetAnimation (); */
+NS_IMETHODIMP
+VectorImage::ResetAnimation()
+{
+  if (mError) {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (!mIsFullyLoaded || !mHaveAnimations) {
+    return NS_OK; // There are no animations to be reset.
+  }
+
+  mSVGDocumentWrapper->ResetAnimation();
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP_(float)
+VectorImage::GetFrameIndex(uint32_t aWhichFrame)
+{
+  MOZ_ASSERT(aWhichFrame <= FRAME_MAX_VALUE, "Invalid argument");
+  return aWhichFrame == FRAME_FIRST
+         ? 0.0f
+         : mSVGDocumentWrapper->GetCurrentTime();
+}
+
+//------------------------------------------------------------------------------
+// nsIRequestObserver methods
+
+//******************************************************************************
+/* void onStartRequest(in nsIRequest request, in nsISupports ctxt); */
+NS_IMETHODIMP
+VectorImage::OnStartRequest(nsIRequest* aRequest, nsISupports* aCtxt)
+{
+  MOZ_ASSERT(!mSVGDocumentWrapper,
+             "Repeated call to OnStartRequest -- can this happen?");
+
+  mSVGDocumentWrapper = new SVGDocumentWrapper();
+  nsresult rv = mSVGDocumentWrapper->OnStartRequest(aRequest, aCtxt);
+  if (NS_FAILED(rv)) {
+    mSVGDocumentWrapper = nullptr;
+    mError = true;
+    return rv;
+  }
+
+  // Sending StartDecode will block page load until the document's ready.  (We
+  // unblock it by sending StopDecode in OnSVGDocumentLoaded or
+  // OnSVGDocumentError.)
+  if (mProgressTracker) {
+    mProgressTracker->SyncNotifyProgress(FLAG_DECODE_STARTED |
+                                         FLAG_ONLOAD_BLOCKED);
+  }
+
+  // Create a listener to wait until the SVG document is fully loaded, which
+  // will signal that this image is ready to render. Certain error conditions
+  // will prevent us from ever getting this notification, so we also create a
+  // listener that waits for parsing to complete and cancels the
+  // SVGLoadEventListener if needed. The listeners are automatically attached
+  // to the document by their constructors.
+  nsIDocument* document = mSVGDocumentWrapper->GetDocument();
+  mLoadEventListener = new SVGLoadEventListener(document, this);
+  mParseCompleteListener = new SVGParseCompleteListener(document, this);
+
+  return NS_OK;
+}
+
+//******************************************************************************
+/* void onStopRequest(in nsIRequest request, in nsISupports ctxt,
+                      in nsresult status); */
+NS_IMETHODIMP
+VectorImage::OnStopRequest(nsIRequest* aRequest, nsISupports* aCtxt,
+                           nsresult aStatus)
+{
+  if (mError) {
+    return NS_ERROR_FAILURE;
+  }
+
+  return mSVGDocumentWrapper->OnStopRequest(aRequest, aCtxt, aStatus);
+}
+
+void
+VectorImage::OnSVGDocumentParsed()
+{
+  MOZ_ASSERT(mParseCompleteListener, "Should have the parse complete listener");
+  MOZ_ASSERT(mLoadEventListener, "Should have the load event listener");
+
+  if (!mSVGDocumentWrapper->GetRootSVGElem()) {
+    // This is an invalid SVG document. It may have failed to parse, or it may
+    // be missing the <svg> root element, or the <svg> root element may not
+    // declare the correct namespace. In any of these cases, we'll never be
+    // notified that the SVG finished loading, so we need to treat this as an
+    // error.
+    OnSVGDocumentError();
+  }
+}
+
+void
+VectorImage::CancelAllListeners()
+{
+  if (mParseCompleteListener) {
+    mParseCompleteListener->Cancel();
+    mParseCompleteListener = nullptr;
+  }
+  if (mLoadEventListener) {
+    mLoadEventListener->Cancel();
+    mLoadEventListener = nullptr;
+  }
+}
+
+void
+VectorImage::OnSVGDocumentLoaded()
+{
+  MOZ_ASSERT(mSVGDocumentWrapper->GetRootSVGElem(),
+             "Should have parsed successfully");
+  MOZ_ASSERT(!mIsFullyLoaded && !mHaveAnimations,
+             "These flags shouldn't get set until OnSVGDocumentLoaded. "
+             "Duplicate calls to OnSVGDocumentLoaded?");
+
+  CancelAllListeners();
+
+  // XXX Flushing is wasteful if embedding frame hasn't had initial reflow.
+  mSVGDocumentWrapper->FlushLayout();
+
+  mIsFullyLoaded = true;
+  mHaveAnimations = mSVGDocumentWrapper->IsAnimated();
+
+  // Start listening to our image for rendering updates.
+  mRenderingObserver = new SVGRootRenderingObserver(mSVGDocumentWrapper, this);
+
+  // Tell *our* observers that we're done loading.
+  if (mProgressTracker) {
+    mProgressTracker->SyncNotifyProgress(FLAG_SIZE_AVAILABLE |
+                                         FLAG_HAS_TRANSPARENCY |
+                                         FLAG_FRAME_COMPLETE |
+                                         FLAG_DECODE_COMPLETE |
+                                         FLAG_ONLOAD_UNBLOCKED,
+                                         GetMaxSizedIntRect());
+  }
+
+  EvaluateAnimation();
+}
+
+void
+VectorImage::OnSVGDocumentError()
+{
+  CancelAllListeners();
+
+  // XXXdholbert Need to do something more for the parsing failed case -- right
+  // now, this just makes us draw the "object" icon, rather than the (jagged)
+  // "broken image" icon.  See bug 594505.
+  mError = true;
+
+  if (mProgressTracker) {
+    // Unblock page load.
+    mProgressTracker->SyncNotifyProgress(FLAG_DECODE_COMPLETE |
+                                         FLAG_ONLOAD_UNBLOCKED |
+                                         FLAG_HAS_ERROR);
+  }
+}
+
+//------------------------------------------------------------------------------
+// nsIStreamListener method
+
+//******************************************************************************
+/* void onDataAvailable(in nsIRequest request, in nsISupports ctxt,
+                        in nsIInputStream inStr, in unsigned long sourceOffset,
+                        in unsigned long count); */
+NS_IMETHODIMP
+VectorImage::OnDataAvailable(nsIRequest* aRequest, nsISupports* aCtxt,
+                             nsIInputStream* aInStr, uint64_t aSourceOffset,
+                             uint32_t aCount)
+{
+  if (mError) {
+    return NS_ERROR_FAILURE;
+  }
+
+  return mSVGDocumentWrapper->OnDataAvailable(aRequest, aCtxt, aInStr,
+                                              aSourceOffset, aCount);
+}
+
+// --------------------------
+// Invalidation helper method
+
+void
+VectorImage::InvalidateObserversOnNextRefreshDriverTick()
+{
+  if (mHaveAnimations) {
+    mHasPendingInvalidation = true;
+  } else {
+    SendInvalidationNotifications();
+  }
+}
+
+nsIntSize
+VectorImage::OptimalImageSizeForDest(const gfxSize& aDest,
+                                     uint32_t aWhichFrame,
+                                     GraphicsFilter aFilter,
+                                     uint32_t aFlags)
+{
+  MOZ_ASSERT(aDest.width >= 0 || ceil(aDest.width) <= INT32_MAX ||
+             aDest.height >= 0 || ceil(aDest.height) <= INT32_MAX,
+             "Unexpected destination size");
+
+  // We can rescale SVGs freely, so just return the provided destination size.
+  return nsIntSize(ceil(aDest.width), ceil(aDest.height));
+}
+
+already_AddRefed<imgIContainer>
+VectorImage::Unwrap()
+{
+  nsCOMPtr<imgIContainer> self(this);
+  return self.forget();
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/image/VectorImage.h firefox-trunk-41.0~a1~hg20150524r245419/image/VectorImage.h
--- firefox-trunk-41.0~a1~hg20150513r243603/image/VectorImage.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/image/VectorImage.h	2015-05-25 20:42:42.000000000 +0000
@@ -0,0 +1,127 @@
+/* -*- 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_image_VectorImage_h
+#define mozilla_image_VectorImage_h
+
+#include "Image.h"
+#include "nsIStreamListener.h"
+#include "mozilla/MemoryReporting.h"
+
+class nsIRequest;
+class gfxDrawable;
+
+namespace mozilla {
+namespace image {
+
+struct SVGDrawingParameters;
+class  SVGDocumentWrapper;
+class  SVGRootRenderingObserver;
+class  SVGLoadEventListener;
+class  SVGParseCompleteListener;
+
+class VectorImage final : public ImageResource,
+                          public nsIStreamListener
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIREQUESTOBSERVER
+  NS_DECL_NSISTREAMLISTENER
+  NS_DECL_IMGICONTAINER
+
+  // (no public constructor - use ImageFactory)
+
+  // Methods inherited from Image
+  virtual size_t SizeOfSourceWithComputedFallback(MallocSizeOf aMallocSizeOf)
+    const override;
+  virtual void CollectSizeOfSurfaces(nsTArray<SurfaceMemoryCounter>& aCounters,
+                                     MallocSizeOf aMallocSizeOf) const override;
+
+  virtual nsresult OnImageDataAvailable(nsIRequest* aRequest,
+                                        nsISupports* aContext,
+                                        nsIInputStream* aInStr,
+                                        uint64_t aSourceOffset,
+                                        uint32_t aCount) override;
+  virtual nsresult OnImageDataComplete(nsIRequest* aRequest,
+                                       nsISupports* aContext,
+                                       nsresult aResult,
+                                       bool aLastPart) override;
+
+  void OnSurfaceDiscarded() override;
+
+  /**
+   * Callback for SVGRootRenderingObserver.
+   *
+   * This just sets a dirty flag that we check in VectorImage::RequestRefresh,
+   * which is called under the ticks of the refresh driver of any observing
+   * documents that we may have. Only then (after all animations in this image
+   * have been updated) do we send out "frame changed" notifications,
+   */
+  void InvalidateObserversOnNextRefreshDriverTick();
+
+  // Callback for SVGParseCompleteListener.
+  void OnSVGDocumentParsed();
+
+  // Callbacks for SVGLoadEventListener.
+  void OnSVGDocumentLoaded();
+  void OnSVGDocumentError();
+
+protected:
+  explicit VectorImage(ImageURL* aURI = nullptr);
+  virtual ~VectorImage();
+
+  virtual nsresult StartAnimation() override;
+  virtual nsresult StopAnimation() override;
+  virtual bool     ShouldAnimate() override;
+
+  void CreateSurfaceAndShow(const SVGDrawingParameters& aParams);
+  void Show(gfxDrawable* aDrawable, const SVGDrawingParameters& aParams);
+
+private:
+  nsresult Init(const char* aMimeType, uint32_t aFlags);
+
+  /**
+   * In catastrophic circumstances like a GPU driver crash, we may lose our
+   * surfaces even if they're locked. RecoverFromLossOfSurfaces discards all
+   * existing surfaces, allowing us to recover.
+   */
+  void RecoverFromLossOfSurfaces();
+
+  void CancelAllListeners();
+  void SendInvalidationNotifications();
+
+  nsRefPtr<SVGDocumentWrapper>       mSVGDocumentWrapper;
+  nsRefPtr<SVGRootRenderingObserver> mRenderingObserver;
+  nsRefPtr<SVGLoadEventListener>     mLoadEventListener;
+  nsRefPtr<SVGParseCompleteListener> mParseCompleteListener;
+
+  /// Count of locks on this image (roughly correlated to visible instances).
+  uint32_t mLockCount;
+
+  bool           mIsInitialized;          // Have we been initialized?
+  bool           mDiscardable;            // Are we discardable?
+  bool           mIsFullyLoaded;          // Has the SVG document finished
+                                          // loading?
+  bool           mIsDrawing;              // Are we currently drawing?
+  bool           mHaveAnimations;         // Is our SVG content SMIL-animated?
+                                          // (Only set after mIsFullyLoaded.)
+  bool           mHasPendingInvalidation; // Invalidate observers next refresh
+                                          // driver tick.
+
+  friend class ImageFactory;
+};
+
+inline NS_IMETHODIMP VectorImage::GetAnimationMode(uint16_t* aAnimationMode) {
+  return GetAnimationModeInternal(aAnimationMode);
+}
+
+inline NS_IMETHODIMP VectorImage::SetAnimationMode(uint16_t aAnimationMode) {
+  return SetAnimationModeInternal(aAnimationMode);
+}
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_VectorImage_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/intl/hyphenation/nsHyphenator.cpp firefox-trunk-41.0~a1~hg20150524r245419/intl/hyphenation/nsHyphenator.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/intl/hyphenation/nsHyphenator.cpp	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/intl/hyphenation/nsHyphenator.cpp	2015-05-25 20:42:46.000000000 +0000
@@ -46,7 +46,7 @@
 nsHyphenator::Hyphenate(const nsAString& aString,
                         FallibleTArray<bool>& aHyphens)
 {
-  if (!aHyphens.SetLength(aString.Length())) {
+  if (!aHyphens.SetLength(aString.Length(), mozilla::fallible)) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
   memset(aHyphens.Elements(), false, aHyphens.Length() * sizeof(bool));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/intl/lwbrk/nsPangoBreaker.cpp firefox-trunk-41.0~a1~hg20150524r245419/intl/lwbrk/nsPangoBreaker.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/intl/lwbrk/nsPangoBreaker.cpp	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/intl/lwbrk/nsPangoBreaker.cpp	2015-05-25 20:42:59.000000000 +0000
@@ -50,7 +50,7 @@
         // pango_break (pango 1.16.2) only analyses text before the
         // first NUL (but sets one extra attr). Workaround loop to call
         // pango_break again to analyse after the NUL is done somewhere else
-        // (gfx/thebes/gfxPangoFonts.cpp: SetupClusterBoundaries()).
+        // (gfx/thebes/gfxFontconfigFonts.cpp: SetupClusterBoundaries()).
         // So, we do the same here for pango_get_log_attrs.
         break;
       }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/intl/uconv/nsConverterInputStream.cpp firefox-trunk-41.0~a1~hg20150524r245419/intl/uconv/nsConverterInputStream.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/intl/uconv/nsConverterInputStream.cpp	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/intl/uconv/nsConverterInputStream.cpp	2015-05-25 20:42:59.000000000 +0000
@@ -45,8 +45,8 @@
     mConverter = EncodingUtils::DecoderForEncoding(encoding);
  
     // set up our buffers
-    if (!mByteData.SetCapacity(aBufferSize) ||
-        !mUnicharData.SetCapacity(aBufferSize)) {
+    if (!mByteData.SetCapacity(aBufferSize, mozilla::fallible) ||
+        !mUnicharData.SetCapacity(aBufferSize, mozilla::fallible)) {
       return NS_ERROR_OUT_OF_MEMORY;
     }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/bluetooth/BluetoothDaemonConnection.cpp firefox-trunk-41.0~a1~hg20150524r245419/ipc/bluetooth/BluetoothDaemonConnection.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/bluetooth/BluetoothDaemonConnection.cpp	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/bluetooth/BluetoothDaemonConnection.cpp	2015-05-25 20:43:01.000000000 +0000
@@ -11,6 +11,7 @@
 #include <sys/un.h>
 #include <unistd.h>
 #include "mozilla/ipc/DataSocket.h"
+#include "mozilla/ipc/UnixSocketConnector.h"
 #include "mozilla/ipc/UnixSocketWatcher.h"
 #include "nsTArray.h"
 #include "nsXULAppAPI.h"
@@ -212,8 +213,6 @@
   // Task callback methods
   //
 
-  void Connect(const char* aSocketName);
-
   void Send(UnixSocketIOBuffer* aBuffer);
 
   void OnSocketCanReceiveWithoutBlocking() override;
@@ -269,50 +268,6 @@
 }
 
 void
-BluetoothDaemonConnectionIO::Connect(const char* aSocketName)
-{
-  static const size_t sNameOffset = 1;
-
-  MOZ_ASSERT(aSocketName);
-
-  // Create socket address
-
-  struct sockaddr_un addr;
-  size_t namesiz = strlen(aSocketName) + 1;
-
-  if((sNameOffset + namesiz) > sizeof(addr.sun_path)) {
-    CHROMIUM_LOG("Address too long for socket struct!");
-    return;
-  }
-  memset(addr.sun_path, '\0', sNameOffset); // abstract socket
-  memcpy(addr.sun_path + sNameOffset, aSocketName, namesiz);
-  addr.sun_family = AF_UNIX;
-
-  socklen_t socklen = offsetof(struct sockaddr_un, sun_path) + 1 + namesiz;
-
-  // Create socket
-
-  int fd = socket(AF_UNIX, SOCK_SEQPACKET, 0);
-  if (fd < 0) {
-    OnError("socket", errno);
-    return;
-  }
-  if (TEMP_FAILURE_RETRY(fcntl(fd, F_SETFL, O_NONBLOCK)) < 0) {
-    OnError("fcntl", errno);
-    ScopedClose cleanupFd(fd);
-    return;
-  }
-
-  SetFd(fd);
-
-  // Connect socket to address; calls OnConnected()
-  // on success, or OnError() otherwise
-  nsresult rv = UnixSocketWatcher::Connect(
-    reinterpret_cast<struct sockaddr*>(&addr), socklen);
-  NS_WARN_IF(NS_FAILED(rv));
-}
-
-void
 BluetoothDaemonConnectionIO::Send(UnixSocketIOBuffer* aBuffer)
 {
   MOZ_ASSERT(aBuffer);
@@ -474,82 +429,42 @@
 }
 
 //
-// I/O helper tasks
-//
-
-class BluetoothDaemonConnectTask final
-  : public SocketIOTask<BluetoothDaemonConnectionIO>
-{
-public:
-  BluetoothDaemonConnectTask(BluetoothDaemonConnectionIO* aIO)
-  : SocketIOTask<BluetoothDaemonConnectionIO>(aIO)
-  { }
-
-  void Run() override
-  {
-    if (IsCanceled()) {
-      return;
-    }
-    GetIO()->Connect(sBluetoothdSocketName);
-  }
-};
-
-//
 // BluetoothDaemonConnection
 //
 
-BluetoothDaemonConnection::BluetoothDaemonConnection()
-  : mIO(nullptr)
-{ }
+BluetoothDaemonConnection::BluetoothDaemonConnection(
+  BluetoothDaemonPDUConsumer* aConsumer)
+  : mConsumer(aConsumer)
+  , mIO(nullptr)
+{
+  MOZ_ASSERT(mConsumer);
+}
 
 BluetoothDaemonConnection::~BluetoothDaemonConnection()
 { }
 
-nsresult
-BluetoothDaemonConnection::ConnectSocket(BluetoothDaemonPDUConsumer* aConsumer)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  if (mIO) {
-    CHROMIUM_LOG("Bluetooth daemon already connecting/connected!");
-    return NS_ERROR_FAILURE;
-  }
-
-  SetConnectionStatus(SOCKET_CONNECTING);
-
-  MessageLoop* ioLoop = XRE_GetIOMessageLoop();
-  mIO = new BluetoothDaemonConnectionIO(
-    ioLoop, -1, UnixSocketWatcher::SOCKET_IS_CONNECTING, this, aConsumer);
-  ioLoop->PostTask(FROM_HERE, new BluetoothDaemonConnectTask(mIO));
-
-  return NS_OK;
-}
+// |ConnectionOrientedSocket|
 
-ConnectionOrientedSocketIO*
-BluetoothDaemonConnection::PrepareAccept(BluetoothDaemonPDUConsumer* aConsumer)
+nsresult
+BluetoothDaemonConnection::PrepareAccept(UnixSocketConnector* aConnector,
+                                         ConnectionOrientedSocketIO*& aIO)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(!mIO);
-  MOZ_ASSERT(aConsumer);
+
+  // |BluetoothDaemonConnection| now owns the connector, but doesn't
+  // actually use it. So the connector is stored in an auto pointer
+  // to be deleted at the end of the method.
+  nsAutoPtr<UnixSocketConnector> connector(aConnector);
 
   SetConnectionStatus(SOCKET_CONNECTING);
 
   mIO = new BluetoothDaemonConnectionIO(
     XRE_GetIOMessageLoop(), -1, UnixSocketWatcher::SOCKET_IS_CONNECTING,
-    this, aConsumer);
-
-  return mIO;
-}
-
-// |ConnectionOrientedSocket|
+    this, mConsumer);
+  aIO = mIO;
 
-ConnectionOrientedSocketIO*
-BluetoothDaemonConnection::GetIO()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(mIO); // Call |PrepareAccept| before listening for connections
-
-  return mIO;
+  return NS_OK;
 }
 
 // |DataSocket|
@@ -569,7 +484,7 @@
 // |SocketBase|
 
 void
-BluetoothDaemonConnection::CloseSocket()
+BluetoothDaemonConnection::Close()
 {
   MOZ_ASSERT(NS_IsMainThread());
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/bluetooth/BluetoothDaemonConnection.h firefox-trunk-41.0~a1~hg20150524r245419/ipc/bluetooth/BluetoothDaemonConnection.h
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/bluetooth/BluetoothDaemonConnection.h	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/bluetooth/BluetoothDaemonConnection.h	2015-05-25 20:43:01.000000000 +0000
@@ -113,15 +113,14 @@
 class BluetoothDaemonConnection : public ConnectionOrientedSocket
 {
 public:
-  BluetoothDaemonConnection();
+  BluetoothDaemonConnection(BluetoothDaemonPDUConsumer* aConsumer);
   virtual ~BluetoothDaemonConnection();
 
-  nsresult ConnectSocket(BluetoothDaemonPDUConsumer* aConsumer);
-
   // Methods for |ConnectionOrientedSocket|
   //
 
-  virtual ConnectionOrientedSocketIO* GetIO() override;
+  nsresult PrepareAccept(UnixSocketConnector* aConnector,
+                         ConnectionOrientedSocketIO*& aIO) override;
 
   // Methods for |DataSocket|
   //
@@ -131,17 +130,10 @@
   // Methods for |SocketBase|
   //
 
-  void CloseSocket() override;
-
-protected:
-
-  // Prepares an instance of |BluetoothDaemonConnection| in DISCONNECTED
-  // state for accepting a connection. Subclasses implementing |GetIO|
-  // need to call this method.
-  ConnectionOrientedSocketIO*
-    PrepareAccept(BluetoothDaemonPDUConsumer* aConsumer);
+  void Close() override;
 
 private:
+  BluetoothDaemonPDUConsumer* mConsumer;
   BluetoothDaemonConnectionIO* mIO;
 };
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/chromium/src/base/logging.h firefox-trunk-41.0~a1~hg20150524r245419/ipc/chromium/src/base/logging.h
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/chromium/src/base/logging.h	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/chromium/src/base/logging.h	2015-05-25 20:43:01.000000000 +0000
@@ -9,7 +9,7 @@
 #include <cstring>
 
 #include "base/basictypes.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #ifdef NO_CHROMIUM_LOGGING
 #include <sstream>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/glue/InputStreamUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/ipc/glue/InputStreamUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/glue/InputStreamUtils.cpp	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/glue/InputStreamUtils.cpp	2015-05-25 20:43:02.000000000 +0000
@@ -118,10 +118,12 @@
 
       // If fetching the internal stream fails, we ignore it and return a
       // null stream.
+      ErrorResult rv;
       nsCOMPtr<nsIInputStream> stream;
-      nsresult rv = blobImpl->GetInternalStream(getter_AddRefs(stream));
-      if (NS_FAILED(rv) || !stream) {
+      blobImpl->GetInternalStream(getter_AddRefs(stream), rv);
+      if (NS_WARN_IF(rv.Failed()) || !stream) {
         NS_WARNING("Couldn't obtain a valid stream from the blob");
+        rv.SuppressException();
       }
       return stream.forget();
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/glue/IPCMessageUtils.h firefox-trunk-41.0~a1~hg20150524r245419/ipc/glue/IPCMessageUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/glue/IPCMessageUtils.h	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/glue/IPCMessageUtils.h	2015-05-25 20:43:02.000000000 +0000
@@ -520,7 +520,7 @@
 
       memcpy(elements, outdata, pickledLength);
     } else {
-      if (!aResult->SetCapacity(length)) {
+      if (!aResult->SetCapacity(length, mozilla::fallible)) {
         return false;
       }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/glue/MessageLink.cpp firefox-trunk-41.0~a1~hg20150524r245419/ipc/glue/MessageLink.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/glue/MessageLink.cpp	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/glue/MessageLink.cpp	2015-05-25 20:43:02.000000000 +0000
@@ -14,6 +14,7 @@
 #include "ipc/Nuwa.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/ContentParent.h"
+#include "mozilla/hal_sandbox/PHalParent.h"
 #endif
 
 #include "mozilla/Assertions.h"
@@ -178,6 +179,7 @@
         case mozilla::dom::PContent::Msg_NuwaFork__ID:
         case mozilla::dom::PContent::Reply_AddNewProcess__ID:
         case mozilla::dom::PContent::Msg_NotifyPhoneStateChange__ID:
+        case mozilla::hal_sandbox::PHal::Msg_NotifyNetworkChange__ID:
         case GOODBYE_MESSAGE_TYPE:
             break;
         default:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/glue/ProcessUtils.h firefox-trunk-41.0~a1~hg20150524r245419/ipc/glue/ProcessUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/glue/ProcessUtils.h	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/glue/ProcessUtils.h	2015-05-25 20:43:02.000000000 +0000
@@ -21,7 +21,7 @@
 #ifdef MOZ_B2G_LOADER
 // see ProcessUtils_linux.cpp for explaination.
 void ProcLoaderClientGeckoInit();
-
+bool ProcLoaderIsInitialized();
 bool ProcLoaderLoad(const char *aArgv[],
                     const char *aEnvp[],
                     const base::file_handle_mapping_vector &aFdsRemap,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/glue/ProcessUtils_linux.cpp firefox-trunk-41.0~a1~hg20150524r245419/ipc/glue/ProcessUtils_linux.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/glue/ProcessUtils_linux.cpp	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/glue/ProcessUtils_linux.cpp	2015-05-25 20:43:02.000000000 +0000
@@ -31,6 +31,7 @@
 #include "mozilla/unused.h"
 #include "base/process_util.h"
 #include "base/eintr_wrapper.h"
+#include "mozilla/Preferences.h"
 
 #include "prenv.h"
 
@@ -204,6 +205,14 @@
   MOZ_ASSERT(!sProcLoaderClientGeckoInitialized,
              "call ProcLoaderClientGeckoInit() more than once");
 
+  if (!Preferences::GetBool("dom.ipc.processPrelaunch.enabled", false)) {
+    kill(sProcLoaderPid, SIGKILL);
+    sProcLoaderPid = 0;
+    close(sProcLoaderChannelFd);
+    sProcLoaderChannelFd = -1;
+    return;
+  }
+
   sProcLoaderClientGeckoInitialized = true;
 
   TransportDescriptor fd;
@@ -218,6 +227,11 @@
   sProcLoaderLoop = MessageLoop::current();
 }
 
+bool ProcLoaderIsInitialized()
+{
+  return sProcLoaderPid != 0;
+}
+
 /**
  * Shutdown and destroy the client of B2G loader service.
  */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/ipdl/ipdl/lower.py firefox-trunk-41.0~a1~hg20150524r245419/ipc/ipdl/ipdl/lower.py
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/ipdl/ipdl/lower.py	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/ipdl/ipdl/lower.py	2015-05-25 20:43:03.000000000 +0000
@@ -343,7 +343,7 @@
 
 def _callCxxCheckedArraySetLength(arr, lenexpr, sel='.'):
     ifbad = StmtIf(ExprNot(ExprCall(ExprSelect(arr, sel, 'SetLength'),
-                                    args=[ lenexpr ])))
+                                    args=[ lenexpr, ExprVar('mozilla::fallible') ])))
     ifbad.addifstmt(_fatalError('Error setting the array length'))
     ifbad.addifstmt(StmtReturn.FALSE)
     return ifbad
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/keystore/KeyStoreConnector.cpp firefox-trunk-41.0~a1~hg20150524r245419/ipc/keystore/KeyStoreConnector.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/keystore/KeyStoreConnector.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/keystore/KeyStoreConnector.cpp	2015-05-25 20:43:03.000000000 +0000
@@ -0,0 +1,234 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set sw=2 ts=2 et ft=cpp: 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 "KeyStoreConnector.h"
+#include <fcntl.h>
+#include <pwd.h>
+#include <sys/stat.h>
+#include <sys/un.h>
+#include "nsThreadUtils.h" // For NS_IsMainThread.
+
+#ifdef MOZ_WIDGET_GONK
+#include <android/log.h>
+#define KEYSTORE_LOG(args...)  __android_log_print(ANDROID_LOG_INFO, "Gonk", args)
+#else
+#define KEYSTORE_LOG(args...)  printf(args);
+#endif
+
+namespace mozilla {
+namespace ipc {
+
+static const char KEYSTORE_SOCKET_PATH[] = "/dev/socket/keystore";
+
+KeyStoreConnector::KeyStoreConnector(const char** const aAllowedUsers)
+  : mAllowedUsers(aAllowedUsers)
+{ }
+
+KeyStoreConnector::~KeyStoreConnector()
+{ }
+
+nsresult
+KeyStoreConnector::CreateSocket(int& aFd) const
+{
+  unlink(KEYSTORE_SOCKET_PATH);
+
+  aFd = socket(AF_LOCAL, SOCK_STREAM, 0);
+  if (aFd < 0) {
+    KEYSTORE_LOG("Could not open KeyStore socket!");
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+nsresult
+KeyStoreConnector::SetSocketFlags(int aFd) const
+{
+  static const int sReuseAddress = 1;
+
+  // Set close-on-exec bit.
+  int flags = TEMP_FAILURE_RETRY(fcntl(aFd, F_GETFD));
+  if (flags < 0) {
+    return NS_ERROR_FAILURE;
+  }
+  flags |= FD_CLOEXEC;
+  int res = TEMP_FAILURE_RETRY(fcntl(aFd, F_SETFD, flags));
+  if (res < 0) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // Set non-blocking status flag.
+  flags = TEMP_FAILURE_RETRY(fcntl(aFd, F_GETFL));
+  if (flags < 0) {
+    return NS_ERROR_FAILURE;
+  }
+  flags |= O_NONBLOCK;
+  res = TEMP_FAILURE_RETRY(fcntl(aFd, F_SETFL, flags));
+  if (res < 0) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // Set socket addr to be reused even if kernel is still waiting to close.
+  res = setsockopt(aFd, SOL_SOCKET, SO_REUSEADDR, &sReuseAddress,
+                   sizeof(sReuseAddress));
+  if (res < 0) {
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+nsresult
+KeyStoreConnector::CheckPermission(int aFd) const
+{
+  struct ucred userCred;
+  socklen_t len = sizeof(userCred);
+
+  if (getsockopt(aFd, SOL_SOCKET, SO_PEERCRED, &userCred, &len)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  const struct passwd* userInfo = getpwuid(userCred.uid);
+  if (!userInfo) {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (!mAllowedUsers) {
+    return NS_ERROR_FAILURE;
+  }
+
+  for (const char** user = mAllowedUsers; *user; ++user) {
+    if (!strcmp(*user, userInfo->pw_name)) {
+      return NS_OK;
+    }
+  }
+
+  return NS_ERROR_FAILURE;
+}
+
+nsresult
+KeyStoreConnector::CreateAddress(struct sockaddr& aAddress,
+                                 socklen_t& aAddressLength) const
+{
+  struct sockaddr_un* address =
+    reinterpret_cast<struct sockaddr_un*>(&aAddress);
+
+  size_t namesiz = strlen(KEYSTORE_SOCKET_PATH) + 1; // include trailing '\0'
+
+  if (namesiz > sizeof(address->sun_path)) {
+      KEYSTORE_LOG("Address too long for socket struct!");
+      return NS_ERROR_FAILURE;
+  }
+
+  address->sun_family = AF_UNIX;
+  memcpy(address->sun_path, KEYSTORE_SOCKET_PATH, namesiz);
+
+  aAddressLength = offsetof(struct sockaddr_un, sun_path) + namesiz;
+
+  return NS_OK;
+}
+
+// |UnixSocketConnector|
+
+nsresult
+KeyStoreConnector::ConvertAddressToString(const struct sockaddr& aAddress,
+                                          socklen_t aAddressLength,
+                                          nsACString& aAddressString)
+{
+  MOZ_ASSERT(aAddress.sa_family == AF_UNIX);
+
+  const struct sockaddr_un* un =
+    reinterpret_cast<const struct sockaddr_un*>(&aAddress);
+
+  size_t len = aAddressLength - offsetof(struct sockaddr_un, sun_path);
+
+  aAddressString.Assign(un->sun_path, len);
+
+  return NS_OK;
+}
+
+nsresult
+KeyStoreConnector::CreateListenSocket(struct sockaddr* aAddress,
+                                      socklen_t* aAddressLength,
+                                      int& aListenFd)
+{
+  ScopedClose fd;
+
+  nsresult rv = CreateSocket(fd.rwget());
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = SetSocketFlags(fd);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  if (aAddress && aAddressLength) {
+    rv = CreateAddress(*aAddress, *aAddressLength);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+  }
+
+  // Allow access for wpa_supplicant (different user, different group)
+  //
+  // TODO: Improve this by setting specific user/group for
+  //       wpa_supplicant by calling |fchmod| and |fchown|.
+  //
+  chmod(KEYSTORE_SOCKET_PATH, S_IRUSR|S_IWUSR|
+                              S_IRGRP|S_IWGRP|
+                              S_IROTH|S_IWOTH);
+
+  aListenFd = fd.forget();
+
+  return NS_OK;
+}
+
+nsresult
+KeyStoreConnector::AcceptStreamSocket(int aListenFd,
+                                      struct sockaddr* aAddress,
+                                      socklen_t* aAddressLength,
+                                      int& aStreamFd)
+{
+  ScopedClose fd(
+    TEMP_FAILURE_RETRY(accept(aListenFd, aAddress, aAddressLength)));
+  if (fd < 0) {
+    NS_WARNING("Cannot accept file descriptor!");
+    return NS_ERROR_FAILURE;
+  }
+  nsresult rv = SetSocketFlags(fd);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = CheckPermission(fd);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  aStreamFd = fd.forget();
+
+  return NS_OK;
+}
+
+nsresult
+KeyStoreConnector::CreateStreamSocket(struct sockaddr* aAddress,
+                                      socklen_t* aAddressLength,
+                                      int& aStreamFd)
+{
+  MOZ_CRASH("|KeyStoreConnector| does not support creating stream sockets.");
+  return NS_ERROR_FAILURE;
+}
+
+nsresult
+KeyStoreConnector::Duplicate(UnixSocketConnector*& aConnector)
+{
+  aConnector = new KeyStoreConnector(*this);
+
+  return NS_OK;
+}
+
+}
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/keystore/KeyStoreConnector.h firefox-trunk-41.0~a1~hg20150524r245419/ipc/keystore/KeyStoreConnector.h
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/keystore/KeyStoreConnector.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/keystore/KeyStoreConnector.h	2015-05-25 20:43:03.000000000 +0000
@@ -0,0 +1,57 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set sw=2 ts=2 et ft=cpp: 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_ipc_KeyStoreConnector_h
+#define mozilla_ipc_KeyStoreConnector_h
+
+#include "mozilla/ipc/UnixSocketConnector.h"
+
+namespace mozilla {
+namespace ipc {
+
+class KeyStoreConnector final : public UnixSocketConnector
+{
+public:
+  KeyStoreConnector(const char** const aAllowedUsers);
+  ~KeyStoreConnector();
+
+  // Methods for |UnixSocketConnector|
+  //
+
+  nsresult ConvertAddressToString(const struct sockaddr& aAddress,
+                                  socklen_t aAddressLength,
+                                  nsACString& aAddressString) override;
+
+  nsresult CreateListenSocket(struct sockaddr* aAddress,
+                              socklen_t* aAddressLength,
+                              int& aListenFd) override;
+
+  nsresult AcceptStreamSocket(int aListenFd,
+                              struct sockaddr* aAddress,
+                              socklen_t* aAddressLength,
+                              int& aStreamFd) override;
+
+  nsresult CreateStreamSocket(struct sockaddr* aAddress,
+                              socklen_t* aAddressLength,
+                              int& aStreamFd) override;
+
+  nsresult Duplicate(UnixSocketConnector*& aConnector) override;
+
+private:
+  nsresult CreateSocket(int& aFd) const;
+  nsresult SetSocketFlags(int aFd) const;
+  nsresult CheckPermission(int aFd) const;
+  nsresult CreateAddress(struct sockaddr& aAddress,
+                         socklen_t& aAddressLength) const;
+
+  const char** const mAllowedUsers;
+};
+
+}
+}
+
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/keystore/KeyStore.cpp firefox-trunk-41.0~a1~hg20150524r245419/ipc/keystore/KeyStore.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/keystore/KeyStore.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/keystore/KeyStore.cpp	2015-05-25 20:43:03.000000000 +0000
@@ -19,6 +19,7 @@
 
 #include "KeyStore.h"
 #include "jsfriendapi.h"
+#include "KeyStoreConnector.h"
 #include "MainThreadUtils.h" // For NS_IsMainThread.
 #include "nsICryptoHash.h"
 
@@ -304,7 +305,6 @@
 namespace mozilla {
 namespace ipc {
 
-static const char* KEYSTORE_SOCKET_PATH = "/dev/socket/keystore";
 static const char* KEYSTORE_ALLOWED_USERS[] = {
   "root",
   "wifi",
@@ -672,76 +672,6 @@
   return false;
 }
 
-int
-KeyStoreConnector::Create()
-{
-  MOZ_ASSERT(!NS_IsMainThread());
-
-  int fd;
-
-  unlink(KEYSTORE_SOCKET_PATH);
-
-  fd = socket(AF_LOCAL, SOCK_STREAM, 0);
-
-  if (fd < 0) {
-    NS_WARNING("Could not open keystore socket!");
-    return -1;
-  }
-
-  return fd;
-}
-
-bool
-KeyStoreConnector::CreateAddr(bool aIsServer,
-                              socklen_t& aAddrSize,
-                              sockaddr_any& aAddr,
-                              const char* aAddress)
-{
-  // Keystore socket must be server
-  MOZ_ASSERT(aIsServer);
-
-  aAddr.un.sun_family = AF_LOCAL;
-  if(strlen(KEYSTORE_SOCKET_PATH) > sizeof(aAddr.un.sun_path)) {
-      NS_WARNING("Address too long for socket struct!");
-      return false;
-  }
-  strcpy((char*)&aAddr.un.sun_path, KEYSTORE_SOCKET_PATH);
-  aAddrSize = strlen(KEYSTORE_SOCKET_PATH) + offsetof(struct sockaddr_un, sun_path) + 1;
-
-  return true;
-}
-
-bool
-KeyStoreConnector::SetUp(int aFd)
-{
-  // Socket permission check.
-  struct ucred userCred;
-  socklen_t len = sizeof(struct ucred);
-
-  if (getsockopt(aFd, SOL_SOCKET, SO_PEERCRED, &userCred, &len)) {
-    return false;
-  }
-
-  return ::checkPermission(userCred.uid);
-}
-
-bool
-KeyStoreConnector::SetUpListenSocket(int aFd)
-{
-  // Allow access of wpa_supplicant(different user, differnt group)
-  chmod(KEYSTORE_SOCKET_PATH, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH);
-
-  return true;
-}
-
-void
-KeyStoreConnector::GetSocketAddr(const sockaddr_any& aAddr,
-                                 nsAString& aAddrStr)
-{
-  // Unused.
-  MOZ_CRASH("This should never be called!");
-}
-
 //
 // KeyStore::ListenSocket
 //
@@ -815,12 +745,6 @@
   mKeyStore->ReceiveSocketData(aBuffer);
 }
 
-ConnectionOrientedSocketIO*
-KeyStore::StreamSocket::GetIO()
-{
-  return PrepareAccept(new KeyStoreConnector());
-}
-
 //
 // KeyStore
 //
@@ -877,7 +801,8 @@
   if (!mListenSocket) {
     // We only ever allocate one |ListenSocket|...
     mListenSocket = new ListenSocket(this);
-    mListenSocket->Listen(new KeyStoreConnector(), mStreamSocket);
+    mListenSocket->Listen(new KeyStoreConnector(KEYSTORE_ALLOWED_USERS),
+                          mStreamSocket);
   } else {
     // ... but keep it open.
     mListenSocket->Listen(mStreamSocket);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/keystore/KeyStore.h firefox-trunk-41.0~a1~hg20150524r245419/ipc/keystore/KeyStore.h
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/keystore/KeyStore.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/keystore/KeyStore.h	2015-05-25 20:43:03.000000000 +0000
@@ -12,7 +12,6 @@
 #include "cert.h"
 #include "mozilla/ipc/ListenSocket.h"
 #include "mozilla/ipc/StreamSocket.h"
-#include "mozilla/ipc/UnixSocketConnector.h"
 #include "nsNSSShutDown.h"
 
 namespace mozilla {
@@ -79,26 +78,6 @@
   STATE_PROCESSING
 } ProtocolHandlerState;
 
-class KeyStoreConnector : public mozilla::ipc::UnixSocketConnector
-{
-public:
-  KeyStoreConnector()
-  {}
-
-  virtual ~KeyStoreConnector()
-  {}
-
-  virtual int Create();
-  virtual bool CreateAddr(bool aIsServer,
-                          socklen_t& aAddrSize,
-                          sockaddr_any& aAddr,
-                          const char* aAddress);
-  virtual bool SetUp(int aFd);
-  virtual bool SetUpListenSocket(int aFd);
-  virtual void GetSocketAddr(const sockaddr_any& aAddr,
-                             nsAString& aAddrStr);
-};
-
 class KeyStore final : public nsNSSShutDownObject
 {
 public:
@@ -149,11 +128,6 @@
 
     void ReceiveSocketData(nsAutoPtr<UnixSocketBuffer>& aBuffer) override;
 
-    // ConnectionOrientedSocket
-    //
-
-    ConnectionOrientedSocketIO* GetIO() override;
-
   private:
     KeyStore* mKeyStore;
   };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/keystore/moz.build firefox-trunk-41.0~a1~hg20150524r245419/ipc/keystore/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/keystore/moz.build	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/keystore/moz.build	2015-05-25 20:43:03.000000000 +0000
@@ -9,7 +9,8 @@
 ]
 
 SOURCES += [
-  'KeyStore.cpp'
+  'KeyStore.cpp',
+  'KeyStoreConnector.cpp'
 ]
 
 FAIL_ON_WARNINGS = True
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/nfc/moz.build firefox-trunk-41.0~a1~hg20150524r245419/ipc/nfc/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/nfc/moz.build	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/nfc/moz.build	2015-05-25 20:43:03.000000000 +0000
@@ -6,9 +6,11 @@
 if CONFIG['MOZ_NFC']:
     EXPORTS.mozilla.ipc += [
         'Nfc.h',
+        'NfcConnector.h',
     ]
     SOURCES += [
         'Nfc.cpp',
+        'NfcConnector.cpp',
     ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/nfc/NfcConnector.cpp firefox-trunk-41.0~a1~hg20150524r245419/ipc/nfc/NfcConnector.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/nfc/NfcConnector.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/nfc/NfcConnector.cpp	2015-05-25 20:43:03.000000000 +0000
@@ -0,0 +1,202 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim: set sw=2 ts=8 et ft=cpp: */
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "NfcConnector.h"
+#include <fcntl.h>
+#include <sys/un.h>
+#include "nsThreadUtils.h" // For NS_IsMainThread.
+
+namespace mozilla {
+namespace ipc {
+
+NfcConnector::NfcConnector(const nsACString& aAddressString)
+  : mAddressString(aAddressString)
+{ }
+
+NfcConnector::~NfcConnector()
+{ }
+
+nsresult
+NfcConnector::CreateSocket(int& aFd) const
+{
+  aFd = socket(AF_LOCAL, SOCK_STREAM, 0);
+  if (aFd < 0) {
+    NS_WARNING("Could not open NFC socket!");
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+nsresult
+NfcConnector::SetSocketFlags(int aFd) const
+{
+  static const int sReuseAddress = 1;
+
+  // Set close-on-exec bit.
+  int flags = TEMP_FAILURE_RETRY(fcntl(aFd, F_GETFD));
+  if (flags < 0) {
+    return NS_ERROR_FAILURE;
+  }
+  flags |= FD_CLOEXEC;
+  int res = TEMP_FAILURE_RETRY(fcntl(aFd, F_SETFD, flags));
+  if (res < 0) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // Set non-blocking status flag.
+  flags = TEMP_FAILURE_RETRY(fcntl(aFd, F_GETFL));
+  if (flags < 0) {
+    return NS_ERROR_FAILURE;
+  }
+  flags |= O_NONBLOCK;
+  res = TEMP_FAILURE_RETRY(fcntl(aFd, F_SETFL, flags));
+  if (res < 0) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // Set socket addr to be reused even if kernel is still waiting to close.
+  res = setsockopt(aFd, SOL_SOCKET, SO_REUSEADDR, &sReuseAddress,
+                   sizeof(sReuseAddress));
+  if (res < 0) {
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+nsresult
+NfcConnector::CreateAddress(struct sockaddr& aAddress,
+                            socklen_t& aAddressLength) const
+{
+  static const size_t sNameOffset = 1;
+
+  struct sockaddr_un* address =
+    reinterpret_cast<struct sockaddr_un*>(&aAddress);
+
+  size_t namesiz = mAddressString.Length() + 1; // include trailing '\0'
+
+  if (NS_WARN_IF((sNameOffset + namesiz) > sizeof(address->sun_path))) {
+    return NS_ERROR_FAILURE;
+  }
+
+  address->sun_family = AF_UNIX;
+  memset(address->sun_path, '\0', sNameOffset); // abstract socket
+  memcpy(address->sun_path + sNameOffset, mAddressString.get(), namesiz);
+
+  aAddressLength =
+    offsetof(struct sockaddr_un, sun_path) + sNameOffset + namesiz;
+
+  return NS_OK;
+}
+
+// |UnixSocketConnector|
+//
+
+nsresult
+NfcConnector::ConvertAddressToString(const struct sockaddr& aAddress,
+                                     socklen_t aAddressLength,
+                                     nsACString& aAddressString)
+{
+  MOZ_ASSERT(aAddress.sa_family == AF_UNIX);
+
+  const struct sockaddr_un* un =
+    reinterpret_cast<const struct sockaddr_un*>(&aAddress);
+
+  size_t len = aAddressLength - offsetof(struct sockaddr_un, sun_path);
+
+  aAddressString.Assign(un->sun_path, len);
+
+  return NS_OK;
+}
+
+nsresult
+NfcConnector::CreateListenSocket(struct sockaddr* aAddress,
+                                 socklen_t* aAddressLength,
+                                 int& aListenFd)
+{
+  ScopedClose fd;
+
+  nsresult rv = CreateSocket(fd.rwget());
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = SetSocketFlags(fd);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  if (aAddress && aAddressLength) {
+    rv = CreateAddress(*aAddress, *aAddressLength);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+  }
+
+  aListenFd = fd.forget();
+
+  return NS_OK;
+}
+
+nsresult
+NfcConnector::AcceptStreamSocket(int aListenFd,
+                                 struct sockaddr* aAddress,
+                                 socklen_t* aAddressLength,
+                                 int& aStreamFd)
+{
+  ScopedClose fd(
+    TEMP_FAILURE_RETRY(accept(aListenFd, aAddress, aAddressLength)));
+  if (fd < 0) {
+    NS_WARNING("Cannot accept file descriptor!");
+    return NS_ERROR_FAILURE;
+  }
+  nsresult rv = SetSocketFlags(fd);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  aStreamFd = fd.forget();
+
+  return NS_OK;
+}
+
+nsresult
+NfcConnector::CreateStreamSocket(struct sockaddr* aAddress,
+                                 socklen_t* aAddressLength,
+                                 int& aStreamFd)
+{
+  ScopedClose fd;
+
+  nsresult rv = CreateSocket(fd.rwget());
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = SetSocketFlags(fd);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  if (aAddress && aAddressLength) {
+    rv = CreateAddress(*aAddress, *aAddressLength);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+  }
+
+  aStreamFd = fd.forget();
+
+  return NS_OK;
+}
+
+nsresult
+NfcConnector::Duplicate(UnixSocketConnector*& aConnector)
+{
+  aConnector = new NfcConnector(*this);
+
+  return NS_OK;
+}
+
+}
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/nfc/NfcConnector.h firefox-trunk-41.0~a1~hg20150524r245419/ipc/nfc/NfcConnector.h
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/nfc/NfcConnector.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/nfc/NfcConnector.h	2015-05-25 20:43:03.000000000 +0000
@@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim: set sw=2 ts=8 et ft=cpp: */
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_ipc_NfcConnector_h
+#define mozilla_ipc_NfcConnector_h
+
+#include "mozilla/ipc/UnixSocketConnector.h"
+
+namespace mozilla {
+namespace ipc {
+
+/**
+ * |NfcConnector| creates sockets for communicating with
+ * the NFC daemon.
+ */
+class NfcConnector final : public UnixSocketConnector
+{
+public:
+  NfcConnector(const nsACString& aAddressString);
+  ~NfcConnector();
+
+  // Methods for |UnixSocketConnector|
+  //
+
+  nsresult ConvertAddressToString(const struct sockaddr& aAddress,
+                                  socklen_t aAddressLength,
+                                  nsACString& aAddressString) override;
+
+  nsresult CreateListenSocket(struct sockaddr* aAddress,
+                              socklen_t* aAddressLength,
+                              int& aListenFd) override;
+
+  nsresult AcceptStreamSocket(int aListenFd,
+                              struct sockaddr* aAddress,
+                              socklen_t* aAddressLen,
+                              int& aStreamFd) override;
+
+  nsresult CreateStreamSocket(struct sockaddr* aAddress,
+                              socklen_t* aAddressLength,
+                              int& aStreamFd) override;
+
+  nsresult Duplicate(UnixSocketConnector*& aConnector) override;
+
+private:
+  nsresult CreateSocket(int& aFd) const;
+  nsresult SetSocketFlags(int aFd) const;
+  nsresult CreateAddress(struct sockaddr& aAddress,
+                         socklen_t& aAddressLength) const;
+
+  nsCString mAddressString;
+};
+
+}
+}
+
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/nfc/Nfc.cpp firefox-trunk-41.0~a1~hg20150524r245419/ipc/nfc/Nfc.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/nfc/Nfc.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/nfc/Nfc.cpp	2015-05-25 20:43:03.000000000 +0000
@@ -22,6 +22,7 @@
 
 #include "jsfriendapi.h"
 #include "mozilla/ArrayUtils.h"
+#include "mozilla/ipc/NfcConnector.h"
 #include "nsThreadUtils.h" // For NS_IsMainThread.
 
 using namespace mozilla::ipc;
@@ -61,74 +62,6 @@
 namespace ipc {
 
 //
-// NfcConnector
-//
-
-int
-NfcConnector::Create()
-{
-  MOZ_ASSERT(!NS_IsMainThread());
-
-  int fd = socket(AF_LOCAL, SOCK_STREAM, 0);
-  if (fd < 0) {
-    NS_WARNING("Could not open nfc socket!");
-    return -1;
-  }
-
-  if (!SetUp(fd)) {
-    NS_WARNING("Could not set up socket!");
-  }
-  return fd;
-}
-
-bool
-NfcConnector::CreateAddr(bool aIsServer,
-                         socklen_t& aAddrSize,
-                         sockaddr_any& aAddr,
-                         const char* aAddress)
-{
-  static const size_t sNameOffset = 1;
-
-  nsDependentCString socketName("nfcd");
-
-  size_t namesiz = socketName.Length() + 1; /* include trailing '\0' */
-
-  if ((sNameOffset + namesiz) > sizeof(aAddr.un.sun_path)) {
-    NS_WARNING("Address too long for socket struct!");
-    return false;
-  }
-
-  memset(aAddr.un.sun_path, '\0', sNameOffset); // abstract socket
-  memcpy(aAddr.un.sun_path + sNameOffset, socketName.get(), namesiz);
-  aAddr.un.sun_family = AF_UNIX;
-
-  aAddrSize = offsetof(struct sockaddr_un, sun_path) + sNameOffset + namesiz;
-
-  return true;
-}
-
-bool
-NfcConnector::SetUp(int aFd)
-{
-  // Nothing to do here.
-  return true;
-}
-
-bool
-NfcConnector::SetUpListenSocket(int aFd)
-{
-  // Nothing to do here.
-  return true;
-}
-
-void
-NfcConnector::GetSocketAddr(const sockaddr_any& aAddr,
-                            nsAString& aAddrStr)
-{
-  MOZ_CRASH("This should never be called!");
-}
-
-//
 // NfcListenSocket
 //
 
@@ -228,11 +161,5 @@
   }
 }
 
-ConnectionOrientedSocketIO*
-NfcConsumer::GetIO()
-{
-  return PrepareAccept(new NfcConnector());
-}
-
 } // namespace ipc
 } // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/nfc/Nfc.h firefox-trunk-41.0~a1~hg20150524r245419/ipc/nfc/Nfc.h
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/nfc/Nfc.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/nfc/Nfc.h	2015-05-25 20:43:03.000000000 +0000
@@ -11,7 +11,6 @@
 
 #include <mozilla/ipc/ListenSocket.h>
 #include <mozilla/ipc/StreamSocket.h>
-#include <mozilla/ipc/UnixSocketConnector.h>
 
 namespace mozilla {
 namespace ipc {
@@ -44,23 +43,6 @@
   NfcSocketListener* mListener;
 };
 
-class NfcConnector final : public mozilla::ipc::UnixSocketConnector
-{
-public:
-  NfcConnector()
-  { }
-
-  int Create() override;
-  bool CreateAddr(bool aIsServer,
-                  socklen_t& aAddrSize,
-                  sockaddr_any& aAddr,
-                  const char* aAddress) override;
-  bool SetUp(int aFd) override;
-  bool SetUpListenSocket(int aFd) override;
-  void GetSocketAddr(const sockaddr_any& aAddr,
-                     nsAString& aAddrStr) override;
-};
-
 class NfcConsumer final : public mozilla::ipc::StreamSocket
 {
 public:
@@ -69,8 +51,6 @@
   void Shutdown();
   bool PostToNfcDaemon(const uint8_t* aData, size_t aSize);
 
-  ConnectionOrientedSocketIO* GetIO() override;
-
 private:
   void ReceiveSocketData(nsAutoPtr<UnixSocketBuffer>& aBuffer) override;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/ril/moz.build firefox-trunk-41.0~a1~hg20150524r245419/ipc/ril/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/ril/moz.build	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/ril/moz.build	2015-05-25 20:43:03.000000000 +0000
@@ -10,6 +10,7 @@
 
 SOURCES += [
     'Ril.cpp',
+    'RilConnector.cpp'
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/ril/RilConnector.cpp firefox-trunk-41.0~a1~hg20150524r245419/ipc/ril/RilConnector.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/ril/RilConnector.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/ril/RilConnector.cpp	2015-05-25 20:43:03.000000000 +0000
@@ -0,0 +1,216 @@
+/* -*- 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 "RilConnector.h"
+#include <fcntl.h>
+#include <sys/socket.h>
+#include "nsThreadUtils.h" // For NS_IsMainThread.
+
+#ifdef AF_INET
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#endif
+#ifdef AF_UNIX
+#include <sys/un.h>
+#endif
+
+namespace mozilla {
+namespace ipc {
+
+static const uint16_t RIL_TEST_PORT = 6200;
+
+RilConnector::RilConnector(const nsACString& aAddressString,
+                           unsigned long aClientId)
+  : mAddressString(aAddressString)
+  , mClientId(aClientId)
+{ }
+
+RilConnector::~RilConnector()
+{ }
+
+nsresult
+RilConnector::CreateSocket(int aDomain, int& aFd) const
+{
+  aFd = socket(aDomain, SOCK_STREAM, 0);
+  if (aFd < 0) {
+    NS_WARNING("Could not open RIL socket!");
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+nsresult
+RilConnector::SetSocketFlags(int aFd) const
+{
+  static const int sReuseAddress = 1;
+
+  // Set close-on-exec bit.
+  int flags = TEMP_FAILURE_RETRY(fcntl(aFd, F_GETFD));
+  if (flags < 0) {
+    return NS_ERROR_FAILURE;
+  }
+  flags |= FD_CLOEXEC;
+  int res = TEMP_FAILURE_RETRY(fcntl(aFd, F_SETFD, flags));
+  if (res < 0) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // Set non-blocking status flag.
+  flags = TEMP_FAILURE_RETRY(fcntl(aFd, F_GETFL));
+  if (flags < 0) {
+    return NS_ERROR_FAILURE;
+  }
+  flags |= O_NONBLOCK;
+  res = TEMP_FAILURE_RETRY(fcntl(aFd, F_SETFL, flags));
+  if (res < 0) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // Set socket addr to be reused even if kernel is still waiting to close.
+  res = setsockopt(aFd, SOL_SOCKET, SO_REUSEADDR, &sReuseAddress,
+                   sizeof(sReuseAddress));
+  if (res < 0) {
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+nsresult
+RilConnector::CreateAddress(int aDomain,
+                            struct sockaddr& aAddress,
+                            socklen_t& aAddressLength) const
+{
+  switch (aDomain) {
+#ifdef AF_UNIX
+    case AF_UNIX: {
+        struct sockaddr_un* address =
+          reinterpret_cast<struct sockaddr_un*>(&aAddress);
+        address->sun_family = aDomain;
+        size_t siz = mAddressString.Length() + 1;
+        if (siz > sizeof(address->sun_path)) {
+          NS_WARNING("Address too long for socket struct!");
+          return NS_ERROR_FAILURE;
+        }
+        memcpy(address->sun_path, mAddressString.get(), siz);
+        aAddressLength = offsetof(struct sockaddr_un, sun_path) + siz;
+      }
+      break;
+#endif
+#ifdef AF_INET
+    case AF_INET: {
+        struct sockaddr_in* address =
+          reinterpret_cast<struct sockaddr_in*>(&aAddress);
+        address->sin_family = aDomain;
+        address->sin_port = htons(RIL_TEST_PORT + mClientId);
+        address->sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+        aAddressLength = sizeof(*address);
+      }
+      break;
+#endif
+    default:
+      NS_WARNING("Address family not handled by connector!");
+      return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+// |UnixSocketConnector|
+
+nsresult
+RilConnector::ConvertAddressToString(const struct sockaddr& aAddress,
+                                     socklen_t aAddressLength,
+                                     nsACString& aAddressString)
+{
+#ifdef AF_UNIX
+  if (aAddress.sa_family == AF_UNIX) {
+    const struct sockaddr_un* un =
+      reinterpret_cast<const struct sockaddr_un*>(&aAddress);
+
+    size_t len = aAddressLength - offsetof(struct sockaddr_un, sun_path);
+
+    aAddressString.Assign(un->sun_path, len);
+  } else
+#endif
+#ifdef AF_INET
+  if (aAddress.sa_family == AF_INET) {
+    const struct sockaddr_in* in =
+      reinterpret_cast<const struct sockaddr_in*>(&aAddress);
+
+    aAddressString.Assign(nsDependentCString(inet_ntoa(in->sin_addr)));
+  } else
+#endif
+  {
+    NS_WARNING("Address family not handled by connector!");
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+nsresult
+RilConnector::CreateListenSocket(struct sockaddr* aAddress,
+                                 socklen_t* aAddressLength,
+                                 int& aListenFd)
+{
+  MOZ_CRASH("|RilConnector| does not support listening sockets.");
+}
+
+nsresult
+RilConnector::AcceptStreamSocket(int aListenFd,
+                                 struct sockaddr* aAddress,
+                                 socklen_t* aAddressLen,
+                                 int& aStreamFd)
+{
+  MOZ_CRASH("|RilConnector| does not support accepting sockets.");
+}
+
+nsresult
+RilConnector::CreateStreamSocket(struct sockaddr* aAddress,
+                                 socklen_t* aAddressLength,
+                                 int& aStreamFd)
+{
+#ifdef MOZ_WIDGET_GONK
+  static const int sDomain = AF_UNIX;
+#else
+  static const int sDomain = AF_INET;
+#endif
+
+  ScopedClose fd;
+
+  nsresult rv = CreateSocket(sDomain, fd.rwget());
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = SetSocketFlags(fd);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  if (aAddress && aAddressLength) {
+    rv = CreateAddress(sDomain, *aAddress, *aAddressLength);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+  }
+
+  aStreamFd = fd.forget();
+
+  return NS_OK;
+}
+
+nsresult
+RilConnector::Duplicate(UnixSocketConnector*& aConnector)
+{
+  aConnector = new RilConnector(*this);
+
+  return NS_OK;
+}
+
+}
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/ril/RilConnector.h firefox-trunk-41.0~a1~hg20150524r245419/ipc/ril/RilConnector.h
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/ril/RilConnector.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/ril/RilConnector.h	2015-05-25 20:43:03.000000000 +0000
@@ -0,0 +1,63 @@
+/* -*- 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_ipc_RilConnector_h
+#define mozilla_ipc_RilConnector_h
+
+#include "mozilla/ipc/UnixSocketConnector.h"
+
+namespace mozilla {
+namespace ipc {
+
+/**
+ * |RilConnector| creates sockets for connecting to rild.
+ */
+class RilConnector final : public UnixSocketConnector
+{
+public:
+  RilConnector(const nsACString& aAddressString,
+               unsigned long aClientId);
+  ~RilConnector();
+
+  // Methods for |UnixSocketConnector|
+  //
+
+  nsresult ConvertAddressToString(const struct sockaddr& aAddress,
+                                  socklen_t aAddressLength,
+                                  nsACString& aAddressString) override;
+
+  nsresult CreateListenSocket(struct sockaddr* aAddress,
+                              socklen_t* aAddressLength,
+                              int& aListenFd) override;
+
+  nsresult AcceptStreamSocket(int aListenFd,
+                              struct sockaddr* aAddress,
+                              socklen_t* aAddressLen,
+                              int& aStreamFd) override;
+
+  nsresult CreateStreamSocket(struct sockaddr* aAddress,
+                              socklen_t* aAddressLength,
+                              int& aStreamFd) override;
+
+  nsresult Duplicate(UnixSocketConnector*& aConnector) override;
+
+
+private:
+  nsresult CreateSocket(int aDomain, int& aFd) const;
+  nsresult SetSocketFlags(int aFd) const;
+  nsresult CreateAddress(int aDomain,
+                         struct sockaddr& aAddress,
+                         socklen_t& aAddressLength) const;
+
+  nsCString mAddressString;
+  unsigned long mClientId;
+};
+
+}
+}
+
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/ril/Ril.cpp firefox-trunk-41.0~a1~hg20150524r245419/ipc/ril/Ril.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/ril/Ril.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/ril/Ril.cpp	2015-05-25 20:43:03.000000000 +0000
@@ -21,9 +21,9 @@
 
 #include "jsfriendapi.h"
 #include "mozilla/ArrayUtils.h"
-#include "mozilla/ipc/UnixSocketConnector.h"
 #include "nsTArray.h"
 #include "nsThreadUtils.h" // For NS_IsMainThread.
+#include "RilConnector.h"
 
 USING_WORKERS_NAMESPACE
 using namespace mozilla::ipc;
@@ -32,10 +32,6 @@
 
 static const char RIL_SOCKET_NAME[] = "/dev/socket/rilproxy";
 
-// Network port to connect to for adb forwarded sockets when doing
-// desktop development.
-static const uint32_t RIL_TEST_PORT = 6200;
-
 static nsTArray<nsRefPtr<mozilla::ipc::RilConsumer> > sRilConsumers;
 
 class ConnectWorkerToRIL final : public WorkerTask
@@ -199,109 +195,6 @@
   return JS_CallFunctionName(aCx, obj, "onRILMessage", args, &rval);
 }
 
-class RilConnector final : public mozilla::ipc::UnixSocketConnector
-{
-public:
-  RilConnector(unsigned long aClientId)
-    : mClientId(aClientId)
-  { }
-
-  int Create() override;
-  bool CreateAddr(bool aIsServer,
-                  socklen_t& aAddrSize,
-                  sockaddr_any& aAddr,
-                  const char* aAddress) override;
-  bool SetUp(int aFd) override;
-  bool SetUpListenSocket(int aFd) override;
-  void GetSocketAddr(const sockaddr_any& aAddr,
-                     nsAString& aAddrStr) override;
-
-private:
-  unsigned long mClientId;
-};
-
-int
-RilConnector::Create()
-{
-  MOZ_ASSERT(!NS_IsMainThread());
-
-  int fd = -1;
-
-#if defined(MOZ_WIDGET_GONK)
-  fd = socket(AF_LOCAL, SOCK_STREAM, 0);
-#else
-  // If we can't hit a local loopback, fail later in connect.
-  fd = socket(AF_INET, SOCK_STREAM, 0);
-#endif
-
-  if (fd < 0) {
-    NS_WARNING("Could not open ril socket!");
-    return -1;
-  }
-
-  if (!SetUp(fd)) {
-    NS_WARNING("Could not set up socket!");
-  }
-  return fd;
-}
-
-bool
-RilConnector::CreateAddr(bool aIsServer,
-                         socklen_t& aAddrSize,
-                         sockaddr_any& aAddr,
-                         const char* aAddress)
-{
-  // We never open ril socket as server.
-  MOZ_ASSERT(!aIsServer);
-  uint32_t af;
-#if defined(MOZ_WIDGET_GONK)
-  af = AF_LOCAL;
-#else
-  af = AF_INET;
-#endif
-  switch (af) {
-  case AF_LOCAL:
-    aAddr.un.sun_family = af;
-    if(strlen(aAddress) > sizeof(aAddr.un.sun_path)) {
-      NS_WARNING("Address too long for socket struct!");
-      return false;
-    }
-    strcpy((char*)&aAddr.un.sun_path, aAddress);
-    aAddrSize = strlen(aAddress) + offsetof(struct sockaddr_un, sun_path) + 1;
-    break;
-  case AF_INET:
-    aAddr.in.sin_family = af;
-    aAddr.in.sin_port = htons(RIL_TEST_PORT + mClientId);
-    aAddr.in.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-    aAddrSize = sizeof(sockaddr_in);
-    break;
-  default:
-    NS_WARNING("Socket type not handled by connector!");
-    return false;
-  }
-  return true;
-}
-
-bool
-RilConnector::SetUp(int aFd)
-{
-  // Nothing to do here.
-  return true;
-}
-
-bool
-RilConnector::SetUpListenSocket(int aFd)
-{
-  // Nothing to do here.
-  return true;
-}
-
-void
-RilConnector::GetSocketAddr(const sockaddr_any& aAddr, nsAString& aAddrStr)
-{
-  MOZ_CRASH("This should never be called!");
-}
-
 } // anonymous namespace
 
 namespace mozilla {
@@ -324,7 +217,7 @@
     mAddress = addr_un.sun_path;
   }
 
-  Connect(new RilConnector(mClientId), mAddress.get());
+  Connect(new RilConnector(mAddress, mClientId));
 }
 
 nsresult
@@ -395,16 +288,10 @@
 RilConsumer::OnDisconnect()
 {
   CHROMIUM_LOG("RIL[%lu]: %s\n", mClientId, __FUNCTION__);
-  if (!mShutdown) {
-    Connect(new RilConnector(mClientId), mAddress.get(),
-            GetSuggestedConnectDelayMs());
+  if (mShutdown) {
+    return;
   }
-}
-
-ConnectionOrientedSocketIO*
-RilConsumer::GetIO()
-{
-  return PrepareAccept(new RilConnector(mClientId));
+  Connect(new RilConnector(mAddress, mClientId), GetSuggestedConnectDelayMs());
 }
 
 } // namespace ipc
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/ril/Ril.h firefox-trunk-41.0~a1~hg20150524r245419/ipc/ril/Ril.h
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/ril/Ril.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/ril/Ril.h	2015-05-25 20:43:03.000000000 +0000
@@ -21,8 +21,6 @@
     mozilla::dom::workers::WorkerCrossThreadDispatcher* aDispatcher);
   static void Shutdown();
 
-  ConnectionOrientedSocketIO* GetIO() override;
-
 private:
   RilConsumer(unsigned long aClientId,
               mozilla::dom::workers::WorkerCrossThreadDispatcher* aDispatcher);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/unixsocket/ConnectionOrientedSocket.h firefox-trunk-41.0~a1~hg20150524r245419/ipc/unixsocket/ConnectionOrientedSocket.h
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/unixsocket/ConnectionOrientedSocket.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/unixsocket/ConnectionOrientedSocket.h	2015-05-25 20:43:03.000000000 +0000
@@ -13,6 +13,7 @@
 namespace mozilla {
 namespace ipc {
 
+class UnixSocketConnector;
 union sockaddr_any;
 
 /*
@@ -24,18 +25,27 @@
 class ConnectionOrientedSocketIO : public DataSocketIO
 {
 public:
+  virtual ~ConnectionOrientedSocketIO();
+
   virtual nsresult Accept(int aFd,
                           const union sockaddr_any* aAddr,
                           socklen_t aAddrLen) = 0;
-
-protected:
-  virtual ~ConnectionOrientedSocketIO();
 };
 
 class ConnectionOrientedSocket : public DataSocket
 {
 public:
-  virtual ConnectionOrientedSocketIO* GetIO() = 0;
+  /**
+   * Prepares an instance of |ConnectionOrientedSocket| in DISCONNECTED
+   * state for accepting a connection. Main-thread only.
+   *
+   * @param aConnector The new connector object, owned by the
+   *                   connection-oriented socket.
+   * @param[out] aIO, Returns an instance of |ConnectionOrientedSocketIO|.
+   * @return NS_OK on success, or an XPCOM error code otherwise.
+   */
+  virtual nsresult PrepareAccept(UnixSocketConnector* aConnector,
+                                 ConnectionOrientedSocketIO*& aIO) = 0;
 
 protected:
   virtual ~ConnectionOrientedSocket();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/unixsocket/ListenSocket.cpp firefox-trunk-41.0~a1~hg20150524r245419/ipc/unixsocket/ListenSocket.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/unixsocket/ListenSocket.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/unixsocket/ListenSocket.cpp	2015-05-25 20:43:03.000000000 +0000
@@ -28,11 +28,10 @@
 
   ListenSocketIO(MessageLoop* mIOLoop,
                  ListenSocket* aListenSocket,
-                 UnixSocketConnector* aConnector,
-                 const nsACString& aAddress);
+                 UnixSocketConnector* aConnector);
   ~ListenSocketIO();
 
-  void GetSocketAddr(nsAString& aAddrStr) const;
+  UnixSocketConnector* GetConnector() const;
 
   // Task callback methods
   //
@@ -64,9 +63,6 @@
 private:
   void FireSocketError();
 
-  // Set up flags on file descriptor.
-  static bool SetSocketFlags(int aFd);
-
   /**
    * Consumer pointer. Non-thread safe RefPtr, so should only be manipulated
    * directly from main thread. All non-main-thread accesses should happen with
@@ -85,33 +81,27 @@
   bool mShuttingDownOnIOThread;
 
   /**
-   * Address we are connecting to, assuming we are creating a client connection.
-   */
-  nsCString mAddress;
-
-  /**
-   * Size of the socket address struct
+   * Number of valid bytes in |mAddress|
    */
-  socklen_t mAddrSize;
+  socklen_t mAddressLength;
 
   /**
-   * Address struct of the socket currently in use
+   * Address structure of the socket currently in use
    */
-  sockaddr_any mAddr;
+  struct sockaddr_storage mAddress;
 
   ConnectionOrientedSocketIO* mCOSocketIO;
 };
 
 ListenSocketIO::ListenSocketIO(MessageLoop* mIOLoop,
                                ListenSocket* aListenSocket,
-                               UnixSocketConnector* aConnector,
-                               const nsACString& aAddress)
+                               UnixSocketConnector* aConnector)
   : UnixSocketWatcher(mIOLoop)
   , SocketIOBase()
   , mListenSocket(aListenSocket)
   , mConnector(aConnector)
   , mShuttingDownOnIOThread(false)
-  , mAddress(aAddress)
+  , mAddressLength(0)
   , mCOSocketIO(nullptr)
 {
   MOZ_ASSERT(mListenSocket);
@@ -124,15 +114,10 @@
   MOZ_ASSERT(IsShutdownOnMainThread());
 }
 
-void
-ListenSocketIO::GetSocketAddr(nsAString& aAddrStr) const
+UnixSocketConnector*
+ListenSocketIO::GetConnector() const
 {
-  if (!mConnector) {
-    NS_WARNING("No connector to get socket address from!");
-    aAddrStr.Truncate();
-    return;
-  }
-  mConnector->GetSocketAddr(mAddr, aAddrStr);
+  return mConnector;
 }
 
 void
@@ -142,28 +127,14 @@
   MOZ_ASSERT(mConnector);
   MOZ_ASSERT(aCOSocketIO);
 
+  struct sockaddr* address = reinterpret_cast<struct sockaddr*>(&mAddress);
+  mAddressLength = sizeof(mAddress);
+
   if (!IsOpen()) {
-    int fd = mConnector->Create();
-    if (fd < 0) {
-      NS_WARNING("Cannot create socket fd!");
-      FireSocketError();
-      return;
-    }
-    if (!SetSocketFlags(fd)) {
-      NS_WARNING("Cannot set socket flags!");
-      FireSocketError();
-      return;
-    }
-    if (!mConnector->SetUpListenSocket(GetFd())) {
-      NS_WARNING("Could not set up listen socket!");
-      FireSocketError();
-      return;
-    }
-    // This will set things we don't particularly care about, but
-    // it will hand back the correct structure size which is what
-    // we do care about.
-    if (!mConnector->CreateAddr(true, mAddrSize, mAddr, nullptr)) {
-      NS_WARNING("Cannot create socket address!");
+    int fd;
+    nsresult rv = mConnector->CreateListenSocket(address, &mAddressLength,
+                                                 fd);
+    if (NS_FAILED(rv)) {
       FireSocketError();
       return;
     }
@@ -173,8 +144,7 @@
   mCOSocketIO = aCOSocketIO;
 
   // calls OnListening on success, or OnError otherwise
-  nsresult rv = UnixSocketWatcher::Listen(
-    reinterpret_cast<struct sockaddr*>(&mAddr), mAddrSize);
+  nsresult rv = UnixSocketWatcher::Listen(address, mAddressLength);
   NS_WARN_IF(NS_FAILED(rv));
 }
 
@@ -221,41 +191,6 @@
     new SocketIOEventRunnable(this, SocketIOEventRunnable::CONNECT_ERROR));
 }
 
-bool
-ListenSocketIO::SetSocketFlags(int aFd)
-{
-  static const int reuseaddr = 1;
-
-  // Set socket addr to be reused even if kernel is still waiting to close
-  int res = setsockopt(aFd, SOL_SOCKET, SO_REUSEADDR,
-                       &reuseaddr, sizeof(reuseaddr));
-  if (res < 0) {
-    return false;
-  }
-
-  // Set close-on-exec bit.
-  int flags = TEMP_FAILURE_RETRY(fcntl(aFd, F_GETFD));
-  if (-1 == flags) {
-    return false;
-  }
-  flags |= FD_CLOEXEC;
-  if (-1 == TEMP_FAILURE_RETRY(fcntl(aFd, F_SETFD, flags))) {
-    return false;
-  }
-
-  // Set non-blocking status flag.
-  flags = TEMP_FAILURE_RETRY(fcntl(aFd, F_GETFL));
-  if (-1 == flags) {
-    return false;
-  }
-  flags |= O_NONBLOCK;
-  if (-1 == TEMP_FAILURE_RETRY(fcntl(aFd, F_SETFL, flags))) {
-    return false;
-  }
-
-  return true;
-}
-
 void
 ListenSocketIO::OnSocketCanAcceptWithoutBlocking()
 {
@@ -263,20 +198,24 @@
   MOZ_ASSERT(GetConnectionStatus() == SOCKET_IS_LISTENING);
   MOZ_ASSERT(mCOSocketIO);
 
-  struct sockaddr_storage addr;
-  socklen_t addrLen = sizeof(addr);
-  int fd = TEMP_FAILURE_RETRY(accept(GetFd(),
-    reinterpret_cast<struct sockaddr*>(&addr), &addrLen));
-  if (fd < 0) {
-    OnError("accept", errno);
+  RemoveWatchers(READ_WATCHER|WRITE_WATCHER);
+
+  struct sockaddr_storage storage;
+  socklen_t addressLength = sizeof(storage);
+
+  int fd;
+  nsresult rv = mConnector->AcceptStreamSocket(
+    GetFd(),
+    reinterpret_cast<struct sockaddr*>(&storage), &addressLength,
+    fd);
+  if (NS_FAILED(rv)) {
+    FireSocketError();
     return;
   }
 
-  RemoveWatchers(READ_WATCHER|WRITE_WATCHER);
-
   mCOSocketIO->Accept(fd,
-                      reinterpret_cast<union sockaddr_any*>(&addr),
-                      addrLen);
+                      reinterpret_cast<union sockaddr_any*>(&storage),
+                      addressLength);
 }
 
 // |SocketIOBase|
@@ -361,81 +300,80 @@
   MOZ_ASSERT(!mIO);
 }
 
-void
-ListenSocket::Close()
+nsresult
+ListenSocket::Listen(UnixSocketConnector* aConnector,
+                     ConnectionOrientedSocket* aCOSocket)
 {
   MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(!mIO);
 
-  if (!mIO) {
-    return;
-  }
-
-  // From this point on, we consider mIO as being deleted. We sever
-  // the relationship here so any future calls to listen or connect
-  // will create a new implementation.
-  mIO->ShutdownOnMainThread();
-
-  XRE_GetIOMessageLoop()->PostTask(FROM_HERE, new SocketIOShutdownTask(mIO));
+  mIO = new ListenSocketIO(XRE_GetIOMessageLoop(), this, aConnector);
 
-  mIO = nullptr;
+  // Prepared I/O object, now start listening.
+  nsresult rv = Listen(aCOSocket);
+  if (NS_FAILED(rv)) {
+    delete mIO;
+    mIO = nullptr;
+    return rv;
+  }
 
-  NotifyDisconnect();
+  return NS_OK;
 }
 
-bool
-ListenSocket::Listen(UnixSocketConnector* aConnector,
-                     ConnectionOrientedSocket* aCOSocket)
+nsresult
+ListenSocket::Listen(ConnectionOrientedSocket* aCOSocket)
 {
   MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(aConnector);
   MOZ_ASSERT(aCOSocket);
+  MOZ_ASSERT(mIO);
 
-  nsAutoPtr<UnixSocketConnector> connector(aConnector);
+  // We first prepare the connection-oriented socket with a
+  // socket connector and a socket I/O class.
 
-  if (mIO) {
-    NS_WARNING("Socket already connecting/connected!");
-    return false;
+  nsAutoPtr<UnixSocketConnector> connector;
+  nsresult rv = mIO->GetConnector()->Duplicate(*connector.StartAssignment());
+  if (NS_FAILED(rv)) {
+    return rv;
   }
 
-  mIO = new ListenSocketIO(
-    XRE_GetIOMessageLoop(), this, connector.forget(), EmptyCString());
-
-  // Prepared I/O object, now start listening.
-  return Listen(aCOSocket);
-}
+  nsAutoPtr<ConnectionOrientedSocketIO> io;
+  rv = aCOSocket->PrepareAccept(connector, *io.StartAssignment());
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  connector.forget(); // now owned by |io|
 
-bool
-ListenSocket::Listen(ConnectionOrientedSocket* aCOSocket)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(mIO);
-  MOZ_ASSERT(aCOSocket);
+  // Then we start listening for connection requests.
 
   SetConnectionStatus(SOCKET_LISTENING);
 
   XRE_GetIOMessageLoop()->PostTask(
-    FROM_HERE, new ListenSocketIO::ListenTask(mIO, aCOSocket->GetIO()));
+    FROM_HERE, new ListenSocketIO::ListenTask(mIO, io.forget()));
 
-  return true;
+  return NS_OK;
 }
 
+// |SocketBase|
+
 void
-ListenSocket::GetSocketAddr(nsAString& aAddrStr)
+ListenSocket::Close()
 {
-  aAddrStr.Truncate();
-  if (!mIO || GetConnectionStatus() != SOCKET_CONNECTED) {
-    NS_WARNING("No socket currently open!");
+  MOZ_ASSERT(NS_IsMainThread());
+
+  if (!mIO) {
     return;
   }
-  mIO->GetSocketAddr(aAddrStr);
-}
 
-// |SocketBase|
+  // From this point on, we consider mIO as being deleted. We sever
+  // the relationship here so any future calls to listen or connect
+  // will create a new implementation.
+  mIO->ShutdownOnMainThread();
 
-void
-ListenSocket::CloseSocket()
-{
-  Close();
+  XRE_GetIOMessageLoop()->PostTask(FROM_HERE, new SocketIOShutdownTask(mIO));
+
+  mIO = nullptr;
+
+  NotifyDisconnect();
 }
 
 } // namespace ipc
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/unixsocket/ListenSocket.h firefox-trunk-41.0~a1~hg20150524r245419/ipc/unixsocket/ListenSocket.h
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/unixsocket/ListenSocket.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/unixsocket/ListenSocket.h	2015-05-25 20:43:03.000000000 +0000
@@ -32,11 +32,10 @@
    * @param aConnector Connector object for socket-type-specific functions
    * @param aCOSocket The connection-oriented socket for handling the
    *                  accepted connection.
-   *
-   * @return true on listen started, false otherwise
+   * @return NS_OK on success, or an XPCOM error code otherwise.
    */
-  bool Listen(UnixSocketConnector* aConnector,
-              ConnectionOrientedSocket* aCOSocket);
+  nsresult Listen(UnixSocketConnector* aConnector,
+                  ConnectionOrientedSocket* aCOSocket);
 
   /**
    * Starts a task on the socket that will try to accept a new connection
@@ -45,26 +44,14 @@
    *
    * @param aCOSocket The connection-oriented socket for handling the
    *                  accepted connection.
-   *
-   * @return true on listen started, false otherwise
-   */
-  bool Listen(ConnectionOrientedSocket* aCOSocket);
-
-  /**
-   * Queues the internal representation of socket for deletion. Can be called
-   * from main thread.
-   */
-  void Close();
-
-  /**
-   * Get the current sockaddr for the socket
+   * @return NS_OK on success, or an XPCOM error code otherwise.
    */
-  void GetSocketAddr(nsAString& aAddrStr);
+  nsresult Listen(ConnectionOrientedSocket* aCOSocket);
 
   // Methods for |SocketBase|
   //
 
-  void CloseSocket() override;
+  void Close() override;
 
 private:
   ListenSocketIO* mIO;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/unixsocket/SocketBase.cpp firefox-trunk-41.0~a1~hg20150524r245419/ipc/unixsocket/SocketBase.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/unixsocket/SocketBase.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/unixsocket/SocketBase.cpp	2015-05-25 20:43:03.000000000 +0000
@@ -340,7 +340,7 @@
   SocketBase* socketBase = io->GetSocketBase();
   MOZ_ASSERT(socketBase);
 
-  socketBase->CloseSocket();
+  socketBase->Close();
 
   return NS_OK;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/unixsocket/SocketBase.h firefox-trunk-41.0~a1~hg20150524r245419/ipc/unixsocket/SocketBase.h
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/unixsocket/SocketBase.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/unixsocket/SocketBase.h	2015-05-25 20:43:03.000000000 +0000
@@ -258,7 +258,7 @@
    * Queues the internal representation of socket for deletion. Can be called
    * from main thread.
    */
-  virtual void CloseSocket() = 0;
+  virtual void Close() = 0;
 
   /**
    * Callback for socket connect/accept success. Called after connect/accept has
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/unixsocket/StreamSocket.cpp firefox-trunk-41.0~a1~hg20150524r245419/ipc/unixsocket/StreamSocket.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/unixsocket/StreamSocket.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/unixsocket/StreamSocket.cpp	2015-05-25 20:43:03.000000000 +0000
@@ -30,17 +30,13 @@
 
   StreamSocketIO(MessageLoop* mIOLoop,
                  StreamSocket* aStreamSocket,
-                 UnixSocketConnector* aConnector,
-                 const nsACString& aAddress);
+                 UnixSocketConnector* aConnector);
   StreamSocketIO(MessageLoop* mIOLoop, int aFd,
                  ConnectionStatus aConnectionStatus,
                  StreamSocket* aStreamSocket,
-                 UnixSocketConnector* aConnector,
-                 const nsACString& aAddress);
+                 UnixSocketConnector* aConnector);
   ~StreamSocketIO();
 
-  void GetSocketAddr(nsAString& aAddrStr) const;
-
   StreamSocket* GetStreamSocket();
   DataSocket* GetDataSocket();
 
@@ -98,9 +94,6 @@
 private:
   void FireSocketError();
 
-  // Set up flags on file descriptor.
-  static bool SetSocketFlags(int aFd);
-
   /**
    * Consumer pointer. Non-thread safe RefPtr, so should only be manipulated
    * directly from main thread. All non-main-thread accesses should happen with
@@ -119,19 +112,14 @@
   bool mShuttingDownOnIOThread;
 
   /**
-   * Address we are connecting to, assuming we are creating a client connection.
+   * Number of valid bytes in |mAddress|
    */
-  nsCString mAddress;
+  socklen_t mAddressLength;
 
   /**
-   * Size of the socket address struct
+   * Address structure of the socket currently in use
    */
-  socklen_t mAddrSize;
-
-  /**
-   * Address struct of the socket currently in use
-   */
-  sockaddr_any mAddr;
+  struct sockaddr_storage mAddress;
 
   /**
    * Task member for delayed connect task. Should only be access on main thread.
@@ -146,13 +134,12 @@
 
 StreamSocketIO::StreamSocketIO(MessageLoop* mIOLoop,
                                StreamSocket* aStreamSocket,
-                               UnixSocketConnector* aConnector,
-                               const nsACString& aAddress)
+                               UnixSocketConnector* aConnector)
   : UnixSocketWatcher(mIOLoop)
   , mStreamSocket(aStreamSocket)
   , mConnector(aConnector)
   , mShuttingDownOnIOThread(false)
-  , mAddress(aAddress)
+  , mAddressLength(0)
   , mDelayedConnectTask(nullptr)
 {
   MOZ_ASSERT(mStreamSocket);
@@ -162,13 +149,12 @@
 StreamSocketIO::StreamSocketIO(MessageLoop* mIOLoop, int aFd,
                                ConnectionStatus aConnectionStatus,
                                StreamSocket* aStreamSocket,
-                               UnixSocketConnector* aConnector,
-                               const nsACString& aAddress)
+                               UnixSocketConnector* aConnector)
   : UnixSocketWatcher(mIOLoop, aFd, aConnectionStatus)
   , mStreamSocket(aStreamSocket)
   , mConnector(aConnector)
   , mShuttingDownOnIOThread(false)
-  , mAddress(aAddress)
+  , mAddressLength(0)
   , mDelayedConnectTask(nullptr)
 {
   MOZ_ASSERT(mStreamSocket);
@@ -181,17 +167,6 @@
   MOZ_ASSERT(IsShutdownOnMainThread());
 }
 
-void
-StreamSocketIO::GetSocketAddr(nsAString& aAddrStr) const
-{
-  if (!mConnector) {
-    NS_WARNING("No connector to get socket address from!");
-    aAddrStr.Truncate();
-    return;
-  }
-  mConnector->GetSocketAddr(mAddr, aAddrStr);
-}
-
 StreamSocket*
 StreamSocketIO::GetStreamSocket()
 {
@@ -239,34 +214,21 @@
   MOZ_ASSERT(MessageLoopForIO::current() == GetIOLoop());
   MOZ_ASSERT(mConnector);
 
-  if (!IsOpen()) {
-    int fd = mConnector->Create();
-    if (fd < 0) {
-      NS_WARNING("Cannot create socket fd!");
-      FireSocketError();
-      return;
-    }
-    if (!SetSocketFlags(fd)) {
-      NS_WARNING("Cannot set socket flags!");
-      FireSocketError();
-      return;
-    }
-    if (!mConnector->SetUp(GetFd())) {
-      NS_WARNING("Could not set up socket!");
-      FireSocketError();
-      return;
-    }
-    if (!mConnector->CreateAddr(false, mAddrSize, mAddr, mAddress.get())) {
-      NS_WARNING("Cannot create socket address!");
-      FireSocketError();
-      return;
-    }
-    SetFd(fd);
+  MOZ_ASSERT(!IsOpen());
+
+  struct sockaddr* address = reinterpret_cast<struct sockaddr*>(&mAddress);
+  mAddressLength = sizeof(mAddress);
+
+  int fd;
+  nsresult rv = mConnector->CreateStreamSocket(address, &mAddressLength, fd);
+  if (NS_FAILED(rv)) {
+    FireSocketError();
+    return;
   }
+  SetFd(fd);
 
   // calls OnConnected() on success, or OnError() otherwise
-  nsresult rv = UnixSocketWatcher::Connect(
-    reinterpret_cast<struct sockaddr*>(&mAddr), mAddrSize);
+  rv = UnixSocketWatcher::Connect(address, mAddressLength);
   NS_WARN_IF(NS_FAILED(rv));
 }
 
@@ -354,41 +316,6 @@
     new SocketIOEventRunnable(this, SocketIOEventRunnable::CONNECT_ERROR));
 }
 
-bool
-StreamSocketIO::SetSocketFlags(int aFd)
-{
-  static const int reuseaddr = 1;
-
-  // Set socket addr to be reused even if kernel is still waiting to close
-  int res = setsockopt(aFd, SOL_SOCKET, SO_REUSEADDR,
-                       &reuseaddr, sizeof(reuseaddr));
-  if (res < 0) {
-    return false;
-  }
-
-  // Set close-on-exec bit.
-  int flags = TEMP_FAILURE_RETRY(fcntl(aFd, F_GETFD));
-  if (-1 == flags) {
-    return false;
-  }
-  flags |= FD_CLOEXEC;
-  if (-1 == TEMP_FAILURE_RETRY(fcntl(aFd, F_SETFD, flags))) {
-    return false;
-  }
-
-  // Set non-blocking status flag.
-  flags = TEMP_FAILURE_RETRY(fcntl(aFd, F_GETFL));
-  if (-1 == flags) {
-    return false;
-  }
-  flags |= O_NONBLOCK;
-  if (-1 == TEMP_FAILURE_RETRY(fcntl(aFd, F_SETFL, flags))) {
-    return false;
-  }
-
-  return true;
-}
-
 // |ConnectionOrientedSocketIO|
 
 nsresult
@@ -398,21 +325,11 @@
   MOZ_ASSERT(MessageLoopForIO::current() == GetIOLoop());
   MOZ_ASSERT(GetConnectionStatus() == SOCKET_IS_CONNECTING);
 
-  // File-descriptor setup
-
-  if (!SetSocketFlags(aFd)) {
-    return NS_ERROR_FAILURE;
-  }
-  if (!mConnector->SetUp(aFd)) {
-    NS_WARNING("Could not set up socket!");
-    return NS_ERROR_FAILURE;
-  }
-
   SetSocket(aFd, SOCKET_IS_CONNECTED);
 
   // Address setup
-  memcpy(&mAddr, aAddr, aAddrLen);
-  mAddrSize = aAddrLen;
+  mAddressLength = aAddrLen;
+  memcpy(&mAddress, aAddr, mAddressLength);
 
   // Signal success
   NS_DispatchToMainThread(
@@ -591,71 +508,17 @@
   MOZ_ASSERT(!mIO);
 }
 
-bool
-StreamSocket::SendSocketData(const nsACString& aStr)
-{
-  if (aStr.Length() > MAX_READ_SIZE) {
-    return false;
-  }
-
-  SendSocketData(new UnixSocketRawData(aStr.BeginReading(), aStr.Length()));
-
-  return true;
-}
-
-void
-StreamSocket::Close()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  if (!mIO) {
-    return;
-  }
-
-  mIO->CancelDelayedConnectTask();
-
-  // From this point on, we consider mIO as being deleted.
-  // We sever the relationship here so any future calls to listen or connect
-  // will create a new implementation.
-  mIO->ShutdownOnMainThread();
-
-  XRE_GetIOMessageLoop()->PostTask(FROM_HERE, new SocketIOShutdownTask(mIO));
-
-  mIO = nullptr;
-
-  NotifyDisconnect();
-}
-
-void
-StreamSocket::GetSocketAddr(nsAString& aAddrStr)
-{
-  aAddrStr.Truncate();
-  if (!mIO || GetConnectionStatus() != SOCKET_CONNECTED) {
-    NS_WARNING("No socket currently open!");
-    return;
-  }
-  mIO->GetSocketAddr(aAddrStr);
-}
-
-bool
+nsresult
 StreamSocket::Connect(UnixSocketConnector* aConnector,
-                      const char* aAddress,
                       int aDelayMs)
 {
-  MOZ_ASSERT(aConnector);
   MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(!mIO);
 
-  nsAutoPtr<UnixSocketConnector> connector(aConnector);
-
-  if (mIO) {
-    NS_WARNING("Socket already connecting/connected!");
-    return false;
-  }
-
-  nsCString addr(aAddress);
   MessageLoop* ioLoop = XRE_GetIOMessageLoop();
-  mIO = new StreamSocketIO(ioLoop, this, connector.forget(), addr);
+  mIO = new StreamSocketIO(ioLoop, this, aConnector);
   SetConnectionStatus(SOCKET_CONNECTING);
+
   if (aDelayMs > 0) {
     StreamSocketIO::DelayedConnectTask* connectTask =
       new StreamSocketIO::DelayedConnectTask(mIO);
@@ -664,25 +527,27 @@
   } else {
     ioLoop->PostTask(FROM_HERE, new StreamSocketIO::ConnectTask(mIO));
   }
-
-  return true;
+  return NS_OK;
 }
 
-ConnectionOrientedSocketIO*
-StreamSocket::PrepareAccept(UnixSocketConnector* aConnector)
+// |ConnectionOrientedSocket|
+
+nsresult
+StreamSocket::PrepareAccept(UnixSocketConnector* aConnector,
+                            ConnectionOrientedSocketIO*& aIO)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(!mIO);
   MOZ_ASSERT(aConnector);
 
-  nsAutoPtr<UnixSocketConnector> connector(aConnector);
-
   SetConnectionStatus(SOCKET_CONNECTING);
 
   mIO = new StreamSocketIO(XRE_GetIOMessageLoop(),
                            -1, UnixSocketWatcher::SOCKET_IS_CONNECTING,
-                           this, connector.forget(), EmptyCString());
-  return mIO;
+                           this, aConnector);
+  aIO = mIO;
+
+  return NS_OK;
 }
 
 // |DataSocket|
@@ -702,9 +567,23 @@
 // |SocketBase|
 
 void
-StreamSocket::CloseSocket()
+StreamSocket::Close()
 {
-  Close();
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(mIO);
+
+  mIO->CancelDelayedConnectTask();
+
+  // From this point on, we consider |mIO| as being deleted. We sever
+  // the relationship here so any future calls to |Connect| will create
+  // a new I/O object.
+  mIO->ShutdownOnMainThread();
+
+  XRE_GetIOMessageLoop()->PostTask(FROM_HERE, new SocketIOShutdownTask(mIO));
+
+  mIO = nullptr;
+
+  NotifyDisconnect();
 }
 
 } // namespace ipc
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/unixsocket/StreamSocket.h firefox-trunk-41.0~a1~hg20150524r245419/ipc/unixsocket/StreamSocket.h
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/unixsocket/StreamSocket.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/unixsocket/StreamSocket.h	2015-05-25 20:43:03.000000000 +0000
@@ -29,42 +29,20 @@
   virtual void ReceiveSocketData(nsAutoPtr<UnixSocketBuffer>& aBuffer) = 0;
 
   /**
-   * Convenience function for sending strings to the socket (common in bluetooth
-   * profile usage). Converts to a UnixSocketRawData struct. Can only be called
-   * on originating thread.
-   *
-   * TODO: Move this method into Bluetooth module.
-   *
-   * @param aMessage String to be sent to socket
-   *
-   * @return true if data is queued, false otherwise (i.e. not connected)
-   */
-  bool SendSocketData(const nsACString& aMessage);
-
-  /**
    * Starts a task on the socket that will try to connect to a socket in a
    * non-blocking manner.
    *
    * @param aConnector Connector object for socket type specific functions
-   * @param aAddress Address to connect to.
-   * @param aDelayMs Time delay in milli-seconds.
-   *
-   * @return true on connect task started, false otherwise.
+   * @param aDelayMs Time delay in milliseconds.
+   * @return NS_OK on success, or an XPCOM error code otherwise.
    */
-  bool Connect(UnixSocketConnector* aConnector,
-               const char* aAddress,
-               int aDelayMs = 0);
+  nsresult Connect(UnixSocketConnector* aConnector, int aDelayMs = 0);
 
-  /**
-   * Queues the internal representation of socket for deletion. Can be called
-   * from main thread.
-   */
-  void Close();
+  // Methods for |ConnectionOrientedSocket|
+  //
 
-  /**
-   * Get the current sockaddr for the socket
-   */
-  void GetSocketAddr(nsAString& aAddrStr);
+  nsresult PrepareAccept(UnixSocketConnector* aConnector,
+                         ConnectionOrientedSocketIO*& aIO) override;
 
   // Methods for |DataSocket|
   //
@@ -74,16 +52,11 @@
   // Methods for |SocketBase|
   //
 
-  void CloseSocket() override;
+  void Close() override;
 
 protected:
   virtual ~StreamSocket();
 
-  // Prepares an instance of |StreamSocket| in DISCONNECTED state
-  // for accepting a connection. Subclasses implementing |GetIO|
-  // need to call this method.
-  ConnectionOrientedSocketIO* PrepareAccept(UnixSocketConnector* aConnector);
-
 private:
   StreamSocketIO* mIO;
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/unixsocket/UnixSocketConnector.cpp firefox-trunk-41.0~a1~hg20150524r245419/ipc/unixsocket/UnixSocketConnector.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/unixsocket/UnixSocketConnector.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/unixsocket/UnixSocketConnector.cpp	2015-05-25 20:43:03.000000000 +0000
@@ -9,6 +9,9 @@
 namespace mozilla {
 namespace ipc {
 
+UnixSocketConnector::UnixSocketConnector()
+{ }
+
 UnixSocketConnector::~UnixSocketConnector()
 { }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/ipc/unixsocket/UnixSocketConnector.h firefox-trunk-41.0~a1~hg20150524r245419/ipc/unixsocket/UnixSocketConnector.h
--- firefox-trunk-41.0~a1~hg20150513r243603/ipc/unixsocket/UnixSocketConnector.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/ipc/unixsocket/UnixSocketConnector.h	2015-05-25 20:43:03.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef mozilla_ipc_unixsocketconnector_h
 #define mozilla_ipc_unixsocketconnector_h
 
+#include <sys/socket.h>
 #include "mozilla/ipc/UnixSocketWatcher.h"
 #include "nsString.h"
 
@@ -16,7 +17,7 @@
 /**
  * |UnixSocketConnector| defines the socket creation and connection/listening
  * functions for |UnixSocketConsumer|, et al. Due to the fact that socket setup
- * can vary between protocols (unix sockets, tcp sockets, bluetooth sockets, etc),
+ * can vary between protocols (Unix sockets, TCP sockets, Bluetooth sockets, etc),
  * this allows the user to create whatever connection mechanism they need while
  * still depending on libevent for non-blocking communication handling.
  */
@@ -26,57 +27,65 @@
   virtual ~UnixSocketConnector();
 
   /**
-   * Establishs a file descriptor for a socket.
+   * Converts an address to a human-readable string.
    *
-   * @return File descriptor for socket
+   * @param aAddress A socket address
+   * @param aAddressLength The number of valid bytes in |aAddress|
+   * @param[out] aAddressString The resulting string
+   * @return NS_OK on success, or an XPCOM error code otherwise.
    */
-  virtual int Create() = 0;
+  virtual nsresult ConvertAddressToString(const struct sockaddr& aAddress,
+                                          socklen_t aAddressLength,
+                                          nsACString& aAddressString) = 0;
 
   /**
-   * Since most socket specifics are related to address formation into a
-   * sockaddr struct, this function is defined by subclasses and fills in the
-   * structure as needed for whatever connection it is trying to build
+   * Creates a listening socket. I/O thread only.
    *
-   * @param aIsServer True is we are acting as a server socket
-   * @param aAddrSize Size of the struct
-   * @param aAddr Struct to fill
-   * @param aAddress If aIsServer is false, Address to connect to. nullptr otherwise.
-   *
-   * @return True if address is filled correctly, false otherwise
+   * @param[out] aAddress The listening socket's address
+   * @param[out] aAddressLength The number of valid bytes in |aAddress|
+   * @param[out] aListenFd The socket's file descriptor
+   * @return NS_OK on success, or an XPCOM error code otherwise.
    */
-  virtual bool CreateAddr(bool aIsServer,
-                          socklen_t& aAddrSize,
-                          sockaddr_any& aAddr,
-                          const char* aAddress) = 0;
+  virtual nsresult CreateListenSocket(struct sockaddr* aAddress,
+                                      socklen_t* aAddressLength,
+                                      int& aListenFd) = 0;
 
   /**
-   * Does any socket type specific setup that may be needed, only for socket
-   * created by ConnectSocket()
-   *
-   * @param aFd File descriptor for opened socket
+   * Accepts a stream socket from a listening socket. I/O thread only.
    *
-   * @return true is successful, false otherwise
+   * @param aListenFd The listening socket
+   * @param[out] aAddress Returns the stream socket's address
+   * @param[out] aAddressLength Returns the number of valid bytes in |aAddress|
+   * @param[out] aStreamFd The stream socket's file descriptor
+   * @return NS_OK on success, or an XPCOM error code otherwise.
    */
-  virtual bool SetUp(int aFd) = 0;
+  virtual nsresult AcceptStreamSocket(int aListenFd,
+                                      struct sockaddr* aAddress,
+                                      socklen_t* aAddressLen,
+                                      int& aStreamFd) = 0;
 
   /**
-   * Perform socket setup for socket created by ListenSocket(), after listen().
+   * Creates a stream socket. I/O thread only.
    *
-   * @param aFd File descriptor for opened socket
-   *
-   * @return true is successful, false otherwise
+   * @param[in|out] aAddress The stream socket's address
+   * @param[in|out] aAddressLength The number of valid bytes in |aAddress|
+   * @param[out] aStreamFd The socket's file descriptor
+   * @return NS_OK on success, or an XPCOM error code otherwise.
    */
-  virtual bool SetUpListenSocket(int aFd) = 0;
+  virtual nsresult CreateStreamSocket(struct sockaddr* aAddress,
+                                      socklen_t* aAddressLength,
+                                      int& aStreamFd) = 0;
 
   /**
-   * Get address of socket we're currently connected to. Return null string if
-   * not connected.
+   * Copies the instance of |UnixSocketConnector|. I/O thread only.
    *
-   * @param aAddr Address struct
-   * @param aAddrStr String to store address to
+   * @param[in] aConnector Returns a new instance of the connector class
+   * @return NS_OK on success, or an XPCOM error code otherwise
    */
-  virtual void GetSocketAddr(const sockaddr_any& aAddr,
-                             nsAString& aAddrStr) = 0;
+  virtual nsresult Duplicate(UnixSocketConnector*& aConnector) = 0;
+
+protected:
+  UnixSocketConnector();
 };
 
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/ipc/WrapperAnswer.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/ipc/WrapperAnswer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/ipc/WrapperAnswer.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/ipc/WrapperAnswer.cpp	2015-05-25 20:43:03.000000000 +0000
@@ -220,14 +220,15 @@
 }
 
 bool
-WrapperAnswer::RecvHas(const ObjectId& objId, const JSIDVariant& idVar, ReturnStatus* rs, bool* bp)
+WrapperAnswer::RecvHas(const ObjectId& objId, const JSIDVariant& idVar, ReturnStatus* rs,
+                       bool* foundp)
 {
     AutoJSAPI jsapi;
     if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
         return false;
     jsapi.TakeOwnershipOfErrorReporting();
     JSContext* cx = jsapi.cx();
-    *bp = false;
+    *foundp = false;
 
     RootedObject obj(cx, findObjectById(cx, objId));
     if (!obj)
@@ -239,24 +240,21 @@
     if (!fromJSIDVariant(cx, idVar, &id))
         return fail(jsapi, rs);
 
-    bool found;
-    if (!JS_HasPropertyById(cx, obj, id, &found))
+    if (!JS_HasPropertyById(cx, obj, id, foundp))
         return fail(jsapi, rs);
-    *bp = !!found;
-
     return ok(rs);
 }
 
 bool
 WrapperAnswer::RecvHasOwn(const ObjectId& objId, const JSIDVariant& idVar, ReturnStatus* rs,
-                          bool* bp)
+                          bool* foundp)
 {
     AutoJSAPI jsapi;
     if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
         return false;
     jsapi.TakeOwnershipOfErrorReporting();
     JSContext* cx = jsapi.cx();
-    *bp = false;
+    *foundp = false;
 
     RootedObject obj(cx, findObjectById(cx, objId));
     if (!obj)
@@ -268,11 +266,8 @@
     if (!fromJSIDVariant(cx, idVar, &id))
         return fail(jsapi, rs);
 
-    Rooted<JSPropertyDescriptor> desc(cx);
-    if (!JS_GetPropertyDescriptorById(cx, obj, id, &desc))
+    if (!JS_HasOwnPropertyById(cx, obj, id, foundp))
         return fail(jsapi, rs);
-    *bp = (desc.object() == obj);
-
     return ok(rs);
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/ipc/WrapperAnswer.h firefox-trunk-41.0~a1~hg20150524r245419/js/ipc/WrapperAnswer.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/ipc/WrapperAnswer.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/ipc/WrapperAnswer.h	2015-05-25 20:43:04.000000000 +0000
@@ -36,9 +36,9 @@
     bool RecvDelete(const ObjectId& objId, const JSIDVariant& id, ReturnStatus* rs);
 
     bool RecvHas(const ObjectId& objId, const JSIDVariant& id,
-                 ReturnStatus* rs, bool* bp);
+                 ReturnStatus* rs, bool* foundp);
     bool RecvHasOwn(const ObjectId& objId, const JSIDVariant& id,
-                    ReturnStatus* rs, bool* bp);
+                    ReturnStatus* rs, bool* foundp);
     bool RecvGet(const ObjectId& objId, const ObjectVariant& receiverVar,
                  const JSIDVariant& id,
                  ReturnStatus* rs, JSVariant* result);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/public/Class.h firefox-trunk-41.0~a1~hg20150524r245419/js/public/Class.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/public/Class.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/public/Class.h	2015-05-25 20:43:04.000000000 +0000
@@ -454,21 +454,27 @@
 
 struct ClassSpec
 {
-    ClassObjectCreationOp createConstructor;
-    ClassObjectCreationOp createPrototype;
-    const JSFunctionSpec* constructorFunctions;
-    const JSPropertySpec* constructorProperties;
-    const JSFunctionSpec* prototypeFunctions;
-    const JSPropertySpec* prototypeProperties;
-    FinishClassInitOp finishInit;
+    // All properties except flags should be accessed through accessor.
+    ClassObjectCreationOp createConstructor_;
+    ClassObjectCreationOp createPrototype_;
+    const JSFunctionSpec* constructorFunctions_;
+    const JSPropertySpec* constructorProperties_;
+    const JSFunctionSpec* prototypeFunctions_;
+    const JSPropertySpec* prototypeProperties_;
+    FinishClassInitOp finishInit_;
     uintptr_t flags;
 
     static const size_t ParentKeyWidth = JSCLASS_CACHED_PROTO_WIDTH;
 
     static const uintptr_t ParentKeyMask = (1 << ParentKeyWidth) - 1;
     static const uintptr_t DontDefineConstructor = 1 << ParentKeyWidth;
+    static const uintptr_t IsDelegated = 1 << (ParentKeyWidth + 1);
 
-    bool defined() const { return !!createConstructor; }
+    bool defined() const { return !!createConstructor_; }
+
+    bool delegated() const {
+        return (flags & IsDelegated);
+    }
 
     bool dependent() const {
         MOZ_ASSERT(defined());
@@ -484,6 +490,47 @@
         MOZ_ASSERT(defined());
         return !(flags & DontDefineConstructor);
     }
+
+    const ClassSpec* delegatedClassSpec() const {
+        MOZ_ASSERT(delegated());
+        return reinterpret_cast<ClassSpec*>(createConstructor_);
+    }
+
+    ClassObjectCreationOp createConstructorHook() const {
+        if (delegated())
+            return delegatedClassSpec()->createConstructorHook();
+        return createConstructor_;
+    }
+    ClassObjectCreationOp createPrototypeHook() const {
+        if (delegated())
+            return delegatedClassSpec()->createPrototypeHook();
+        return createPrototype_;
+    }
+    const JSFunctionSpec* constructorFunctions() const {
+        if (delegated())
+            return delegatedClassSpec()->constructorFunctions();
+        return constructorFunctions_;
+    }
+    const JSPropertySpec* constructorProperties() const {
+        if (delegated())
+            return delegatedClassSpec()->constructorProperties();
+        return constructorProperties_;
+    }
+    const JSFunctionSpec* prototypeFunctions() const {
+        if (delegated())
+            return delegatedClassSpec()->prototypeFunctions();
+        return prototypeFunctions_;
+    }
+    const JSPropertySpec* prototypeProperties() const {
+        if (delegated())
+            return delegatedClassSpec()->prototypeProperties();
+        return prototypeProperties_;
+    }
+    FinishClassInitOp finishInitHook() const {
+        if (delegated())
+            return delegatedClassSpec()->finishInitHook();
+        return finishInit_;
+    }
 };
 
 struct ClassExtension
@@ -524,6 +571,10 @@
     JSObjectMovedOp objectMovedOp;
 };
 
+inline ClassObjectCreationOp DELEGATED_CLASSSPEC(const ClassSpec* spec) {
+    return reinterpret_cast<ClassObjectCreationOp>(const_cast<ClassSpec*>(spec));
+}
+
 #define JS_NULL_CLASS_SPEC  {nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr}
 #define JS_NULL_CLASS_EXT   {nullptr,nullptr,false,nullptr,nullptr}
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/public/Debug.h firefox-trunk-41.0~a1~hg20150524r245419/js/public/Debug.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/public/Debug.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/public/Debug.h	2015-05-25 20:43:04.000000000 +0000
@@ -318,6 +318,48 @@
 JS_PUBLIC_API(bool)
 IsDebugger(JS::Value val);
 
+
+// Hooks for reporting where JavaScript execution began.
+//
+// Our performance tools would like to be able to label blocks of JavaScript
+// execution with the function name and source location where execution began:
+// the event handler, the callback, etc.
+//
+// Construct an instance of this class on the stack, providing a JSContext
+// belonging to the runtime in which execution will occur. Each time we enter
+// JavaScript --- specifically, each time we push a JavaScript stack frame that
+// has no older JS frames younger than this AutoEntryMonitor --- we will
+// call the appropriate |Entry| member function to indicate where we've begun
+// execution.
+
+class MOZ_STACK_CLASS AutoEntryMonitor {
+    JSRuntime* runtime_;
+    AutoEntryMonitor* savedMonitor_;
+
+  public:
+    explicit AutoEntryMonitor(JSContext* cx);
+    ~AutoEntryMonitor();
+
+    // SpiderMonkey reports the JavaScript entry points occuring within this
+    // AutoEntryMonitor's scope to the following member functions, which the
+    // embedding is expected to override.
+
+    // We have begun executing |function|. Note that |function| may not be the
+    // actual closure we are running, but only the canonical function object to
+    // which the script refers.
+    virtual void Entry(JSContext* cx, JSFunction* function) = 0;
+
+    // Execution has begun at the entry point of |script|, which is not a
+    // function body. (This is probably being executed by 'eval' or some
+    // JSAPI equivalent.)
+    virtual void Entry(JSContext* cx, JSScript* script) = 0;
+
+    // Execution of the function or script has ended.
+    virtual void Exit(JSContext* cx) { }
+};
+
+
+
 } // namespace dbg
 } // namespace JS
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/public/GCAPI.h firefox-trunk-41.0~a1~hg20150524r245419/js/public/GCAPI.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/public/GCAPI.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/public/GCAPI.h	2015-05-25 20:43:04.000000000 +0000
@@ -553,7 +553,7 @@
 
 /*
  * Unsets the gray bit for anything reachable from |thing|. |kind| should not be
- * JSTRACE_SHAPE. |thing| should be non-null.
+ * JS::TraceKind::Shape. |thing| should be non-null.
  */
 extern JS_FRIEND_API(bool)
 UnmarkGrayGCThingRecursively(GCCellPtr thing);
@@ -566,7 +566,7 @@
 static MOZ_ALWAYS_INLINE void
 ExposeGCThingToActiveJS(JS::GCCellPtr thing)
 {
-    MOZ_ASSERT(thing.kind() != JSTRACE_SHAPE);
+    MOZ_ASSERT(thing.kind() != JS::TraceKind::Shape);
 
     /*
      * GC things residing in the nursery cannot be gray: they have no mark bits.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/public/HeapAPI.h firefox-trunk-41.0~a1~hg20150524r245419/js/public/HeapAPI.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/public/HeapAPI.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/public/HeapAPI.h	2015-05-25 20:43:04.000000000 +0000
@@ -81,10 +81,10 @@
 #ifdef JS_DEBUG
 /* When downcasting, ensure we are actually the right type. */
 extern JS_FRIEND_API(void)
-AssertGCThingHasType(js::gc::Cell* cell, JSGCTraceKind kind);
+AssertGCThingHasType(js::gc::Cell* cell, JS::TraceKind kind);
 #else
 inline void
-AssertGCThingHasType(js::gc::Cell* cell, JSGCTraceKind kind) {}
+AssertGCThingHasType(js::gc::Cell* cell, JS::TraceKind kind) {}
 #endif
 
 MOZ_ALWAYS_INLINE bool IsInsideNursery(const js::gc::Cell* cell);
@@ -155,60 +155,60 @@
 {
   public:
     // Construction from a void* and trace kind.
-    GCCellPtr(void* gcthing, JSGCTraceKind traceKind) : ptr(checkedCast(gcthing, traceKind)) {}
+    GCCellPtr(void* gcthing, JS::TraceKind traceKind) : ptr(checkedCast(gcthing, traceKind)) {}
+
+    // Automatically construct a null GCCellPtr from nullptr.
+    MOZ_IMPLICIT GCCellPtr(decltype(nullptr)) : ptr(checkedCast(nullptr, JS::TraceKind::Null)) {}
 
     // Construction from an explicit type.
-    explicit GCCellPtr(JSObject* obj) : ptr(checkedCast(obj, JSTRACE_OBJECT)) { }
-    explicit GCCellPtr(JSFunction* fun) : ptr(checkedCast(fun, JSTRACE_OBJECT)) { }
-    explicit GCCellPtr(JSString* str) : ptr(checkedCast(str, JSTRACE_STRING)) { }
-    explicit GCCellPtr(JSFlatString* str) : ptr(checkedCast(str, JSTRACE_STRING)) { }
-    explicit GCCellPtr(JSScript* script) : ptr(checkedCast(script, JSTRACE_SCRIPT)) { }
+    explicit GCCellPtr(JSObject* obj) : ptr(checkedCast(obj, JS::TraceKind::Object)) { }
+    explicit GCCellPtr(JSFunction* fun) : ptr(checkedCast(fun, JS::TraceKind::Object)) { }
+    explicit GCCellPtr(JSString* str) : ptr(checkedCast(str, JS::TraceKind::String)) { }
+    explicit GCCellPtr(JSFlatString* str) : ptr(checkedCast(str, JS::TraceKind::String)) { }
+    explicit GCCellPtr(JSScript* script) : ptr(checkedCast(script, JS::TraceKind::Script)) { }
     explicit GCCellPtr(const Value& v);
 
-    // Not all compilers have nullptr_t yet, so use this instead of GCCellPtr(nullptr).
-    static GCCellPtr NullPtr() { return GCCellPtr(nullptr, JSTRACE_NULL); }
-
-    JSGCTraceKind kind() const {
-        JSGCTraceKind traceKind = JSGCTraceKind(ptr & JSTRACE_OUTOFLINE);
-        if (traceKind != JSTRACE_OUTOFLINE)
+    JS::TraceKind kind() const {
+        JS::TraceKind traceKind = JS::TraceKind(ptr & OutOfLineTraceKindMask);
+        if (uintptr_t(traceKind) != OutOfLineTraceKindMask)
             return traceKind;
         return outOfLineKind();
     }
 
     // Allow GCCellPtr to be used in a boolean context.
     explicit operator bool() const {
-        MOZ_ASSERT(bool(asCell()) == (kind() != JSTRACE_NULL));
+        MOZ_ASSERT(bool(asCell()) == (kind() != JS::TraceKind::Null));
         return asCell();
     }
 
     // Simplify checks to the kind.
-    bool isObject() const { return kind() == JSTRACE_OBJECT; }
-    bool isScript() const { return kind() == JSTRACE_SCRIPT; }
-    bool isString() const { return kind() == JSTRACE_STRING; }
-    bool isSymbol() const { return kind() == JSTRACE_SYMBOL; }
-    bool isShape() const { return kind() == JSTRACE_SHAPE; }
-    bool isObjectGroup() const { return kind() == JSTRACE_OBJECT_GROUP; }
+    bool isObject() const { return kind() == JS::TraceKind::Object; }
+    bool isScript() const { return kind() == JS::TraceKind::Script; }
+    bool isString() const { return kind() == JS::TraceKind::String; }
+    bool isSymbol() const { return kind() == JS::TraceKind::Symbol; }
+    bool isShape() const { return kind() == JS::TraceKind::Shape; }
+    bool isObjectGroup() const { return kind() == JS::TraceKind::ObjectGroup; }
 
     // Conversions to more specific types must match the kind. Access to
     // further refined types is not allowed directly from a GCCellPtr.
     JSObject* toObject() const {
-        MOZ_ASSERT(kind() == JSTRACE_OBJECT);
+        MOZ_ASSERT(kind() == JS::TraceKind::Object);
         return reinterpret_cast<JSObject*>(asCell());
     }
     JSString* toString() const {
-        MOZ_ASSERT(kind() == JSTRACE_STRING);
+        MOZ_ASSERT(kind() == JS::TraceKind::String);
         return reinterpret_cast<JSString*>(asCell());
     }
     JSScript* toScript() const {
-        MOZ_ASSERT(kind() == JSTRACE_SCRIPT);
+        MOZ_ASSERT(kind() == JS::TraceKind::Script);
         return reinterpret_cast<JSScript*>(asCell());
     }
     Symbol* toSymbol() const {
-        MOZ_ASSERT(kind() == JSTRACE_SYMBOL);
+        MOZ_ASSERT(kind() == JS::TraceKind::Symbol);
         return reinterpret_cast<Symbol*>(asCell());
     }
     js::gc::Cell* asCell() const {
-        return reinterpret_cast<js::gc::Cell*>(ptr & ~JSTRACE_OUTOFLINE);
+        return reinterpret_cast<js::gc::Cell*>(ptr & ~OutOfLineTraceKindMask);
     }
 
     // The CC's trace logger needs an identity that is XPIDL serializable.
@@ -225,18 +225,18 @@
     bool mayBeOwnedByOtherRuntime() const;
 
   private:
-    uintptr_t checkedCast(void* p, JSGCTraceKind traceKind) {
+    static uintptr_t checkedCast(void* p, JS::TraceKind traceKind) {
         js::gc::Cell* cell = static_cast<js::gc::Cell*>(p);
-        MOZ_ASSERT((uintptr_t(p) & JSTRACE_OUTOFLINE) == 0);
+        MOZ_ASSERT((uintptr_t(p) & OutOfLineTraceKindMask) == 0);
         AssertGCThingHasType(cell, traceKind);
-        // Note: the JSTRACE_OUTOFLINE bits are set on all out-of-line kinds
+        // Note: the OutOfLineTraceKindMask bits are set on all out-of-line kinds
         // so that we can mask instead of branching.
-        MOZ_ASSERT_IF(traceKind >= JSTRACE_OUTOFLINE,
-                      (traceKind & JSTRACE_OUTOFLINE) == JSTRACE_OUTOFLINE);
-        return uintptr_t(p) | (traceKind & JSTRACE_OUTOFLINE);
+        MOZ_ASSERT_IF(uintptr_t(traceKind) >= OutOfLineTraceKindMask,
+                      (uintptr_t(traceKind) & OutOfLineTraceKindMask) == OutOfLineTraceKindMask);
+        return uintptr_t(p) | (uintptr_t(traceKind) & OutOfLineTraceKindMask);
     }
 
-    JSGCTraceKind outOfLineKind() const;
+    JS::TraceKind outOfLineKind() const;
 
     uintptr_t ptr;
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/public/Id.h firefox-trunk-41.0~a1~hg20150524r245419/js/public/Id.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/public/Id.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/public/Id.h	2015-05-25 20:43:04.000000000 +0000
@@ -141,9 +141,9 @@
 {
     void* thing = (void*)(JSID_BITS(id) & ~(size_t)JSID_TYPE_MASK);
     if (JSID_IS_STRING(id))
-        return JS::GCCellPtr(thing, JSTRACE_STRING);
+        return JS::GCCellPtr(thing, JS::TraceKind::String);
     MOZ_ASSERT(JSID_IS_SYMBOL(id));
-    return JS::GCCellPtr(thing, JSTRACE_SYMBOL);
+    return JS::GCCellPtr(thing, JS::TraceKind::Symbol);
 }
 
 static MOZ_ALWAYS_INLINE bool
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/public/MemoryMetrics.h firefox-trunk-41.0~a1~hg20150524r245419/js/public/MemoryMetrics.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/public/MemoryMetrics.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/public/MemoryMetrics.h	2015-05-25 20:43:04.000000000 +0000
@@ -463,17 +463,17 @@
         dummy()
     {}
 
-    void addToKind(JSGCTraceKind kind, intptr_t n) {
+    void addToKind(JS::TraceKind kind, intptr_t n) {
         switch (kind) {
-          case JSTRACE_OBJECT:       object += n;      break;
-          case JSTRACE_STRING:       string += n;      break;
-          case JSTRACE_SYMBOL:       symbol += n;      break;
-          case JSTRACE_SCRIPT:       script += n;      break;
-          case JSTRACE_SHAPE:        shape += n;       break;
-          case JSTRACE_BASE_SHAPE:   baseShape += n;   break;
-          case JSTRACE_JITCODE:      jitcode += n;     break;
-          case JSTRACE_LAZY_SCRIPT:  lazyScript += n;  break;
-          case JSTRACE_OBJECT_GROUP: objectGroup += n; break;
+          case JS::TraceKind::Object:       object += n;      break;
+          case JS::TraceKind::String:       string += n;      break;
+          case JS::TraceKind::Symbol:       symbol += n;      break;
+          case JS::TraceKind::Script:       script += n;      break;
+          case JS::TraceKind::Shape:        shape += n;       break;
+          case JS::TraceKind::BaseShape:    baseShape += n;   break;
+          case JS::TraceKind::JitCode:      jitcode += n;     break;
+          case JS::TraceKind::LazyScript:   lazyScript += n;  break;
+          case JS::TraceKind::ObjectGroup:  objectGroup += n; break;
           default:
             MOZ_CRASH("Bad trace kind for GCThingSizes");
         }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/public/ProfilingStack.h firefox-trunk-41.0~a1~hg20150524r245419/js/public/ProfilingStack.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/public/ProfilingStack.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/public/ProfilingStack.h	2015-05-25 20:43:04.000000000 +0000
@@ -70,7 +70,7 @@
         CATEGORY_MASK = ~IS_CPP_ENTRY & ~FRAME_LABEL_COPY & ~BEGIN_PSEUDO_JS & ~OSR
     };
 
-    // Keep these in sync with browser/devtools/profiler/utils/global.js
+    // Keep these in sync with browser/devtools/performance/modules/global.js
     enum class Category : uint32_t {
         OTHER    = 0x10,
         CSS      = 0x20,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/public/RootingAPI.h firefox-trunk-41.0~a1~hg20150524r245419/js/public/RootingAPI.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/public/RootingAPI.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/public/RootingAPI.h	2015-05-25 20:43:04.000000000 +0000
@@ -121,23 +121,7 @@
 template <typename T>
 class PersistentRootedBase {};
 
-/*
- * js::NullPtr acts like a nullptr pointer in contexts that require a Handle.
- *
- * Handle provides an implicit constructor for js::NullPtr so that, given:
- *   foo(Handle<JSObject*> h);
- * callers can simply write:
- *   foo(js::NullPtr());
- * which avoids creating a Rooted<JSObject*> just to pass nullptr.
- *
- * This is the SpiderMonkey internal variant. js::NullPtr should be used in
- * preference to JS::NullPtr to avoid the GOT access required for JS_PUBLIC_API
- * symbols.
- */
-struct NullPtr
-{
-    static void * const constNullValue;
-};
+static void* const ConstNullValue = nullptr;
 
 namespace gc {
 struct Cell;
@@ -190,20 +174,6 @@
 /* This is exposing internal state of the GC for inlining purposes. */
 JS_FRIEND_API(bool) isGCEnabled();
 
-/*
- * JS::NullPtr acts like a nullptr pointer in contexts that require a Handle.
- *
- * Handle provides an implicit constructor for JS::NullPtr so that, given:
- *   foo(Handle<JSObject*> h);
- * callers can simply write:
- *   foo(JS::NullPtr());
- * which avoids creating a Rooted<JSObject*> just to pass nullptr.
- */
-struct JS_PUBLIC_API(NullPtr)
-{
-    static void * const constNullValue;
-};
-
 JS_FRIEND_API(void) HeapObjectPostBarrier(JSObject** objp);
 JS_FRIEND_API(void) HeapObjectRelocate(JSObject** objp);
 
@@ -433,18 +403,10 @@
         ptr = reinterpret_cast<const T*>(handle.address());
     }
 
-    /* Create a handle for a nullptr pointer. */
-    MOZ_IMPLICIT Handle(js::NullPtr) {
-        static_assert(mozilla::IsPointer<T>::value,
-                      "js::NullPtr overload not valid for non-pointer types");
-        ptr = reinterpret_cast<const T*>(&js::NullPtr::constNullValue);
-    }
-
-    /* Create a handle for a nullptr pointer. */
-    MOZ_IMPLICIT Handle(JS::NullPtr) {
+    MOZ_IMPLICIT Handle(decltype(nullptr)) {
         static_assert(mozilla::IsPointer<T>::value,
-                      "JS::NullPtr overload not valid for non-pointer types");
-        ptr = reinterpret_cast<const T*>(&JS::NullPtr::constNullValue);
+                      "nullptr_t overload not valid for non-pointer types");
+        ptr = reinterpret_cast<const T*>(&js::ConstNullValue);
     }
 
     MOZ_IMPLICIT Handle(MutableHandle<T> handle) {
@@ -614,7 +576,7 @@
      * fromMarkedLocation().
      */
     explicit InternalHandle(T* field)
-      : holder(reinterpret_cast<void * const*>(&js::NullPtr::constNullValue)),
+      : holder(&js::ConstNullValue),
         offset(uintptr_t(field))
     {}
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/public/TracingAPI.h firefox-trunk-41.0~a1~hg20150524r245419/js/public/TracingAPI.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/public/TracingAPI.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/public/TracingAPI.h	2015-05-25 20:43:04.000000000 +0000
@@ -18,7 +18,6 @@
 class JS_PUBLIC_API(CallbackTracer);
 template <typename T> class Heap;
 template <typename T> class TenuredHeap;
-}
 
 // When tracing a thing, the GC needs to know about the layout of the object it
 // is looking at. There are a fixed number of different layouts that the GC
@@ -29,41 +28,40 @@
 // the matching C++ types are exposed, and those that are, are opaque.
 //
 // See Value::gcKind() and JSTraceCallback in Tracer.h for more details.
-enum JSGCTraceKind
+enum class TraceKind
 {
     // These trace kinds have a publicly exposed, although opaque, C++ type.
     // Note: The order here is determined by our Value packing. Other users
     //       should sort alphabetically, for consistency.
-    JSTRACE_OBJECT = 0x00,
-    JSTRACE_STRING = 0x01,
-    JSTRACE_SYMBOL = 0x02,
-    JSTRACE_SCRIPT = 0x03,
+    Object = 0x00,
+    String = 0x01,
+    Symbol = 0x02,
+    Script = 0x03,
 
     // Shape details are exposed through JS_TraceShapeCycleCollectorChildren.
-    JSTRACE_SHAPE = 0x04,
+    Shape = 0x04,
 
     // ObjectGroup details are exposed through JS_TraceObjectGroupCycleCollectorChildren.
-    JSTRACE_OBJECT_GROUP = 0x05,
+    ObjectGroup = 0x05,
 
     // The kind associated with a nullptr.
-    JSTRACE_NULL = 0x06,
-
-    // A kind that indicates the real kind should be looked up in the arena.
-    JSTRACE_OUTOFLINE = 0x07,
+    Null = 0x06,
 
     // The following kinds do not have an exposed C++ idiom.
-    JSTRACE_BASE_SHAPE = 0x0F,
-    JSTRACE_JITCODE = 0x1F,
-    JSTRACE_LAZY_SCRIPT = 0x2F,
-
-    JSTRACE_LAST = JSTRACE_OBJECT_GROUP
+    BaseShape = 0x0F,
+    JitCode = 0x1F,
+    LazyScript = 0x2F
 };
+const static uintptr_t OutOfLineTraceKindMask = 0x07;
+static_assert(uintptr_t(JS::TraceKind::BaseShape) & OutOfLineTraceKindMask, "mask bits are set");
+static_assert(uintptr_t(JS::TraceKind::JitCode) & OutOfLineTraceKindMask, "mask bits are set");
+static_assert(uintptr_t(JS::TraceKind::LazyScript) & OutOfLineTraceKindMask, "mask bits are set");
 
-namespace JS {
 // Returns a static string equivalent of |kind|.
 JS_FRIEND_API(const char*)
-GCTraceKindToAscii(JSGCTraceKind kind);
-}
+GCTraceKindToAscii(JS::TraceKind kind);
+
+} // namespace JS
 
 // Tracer callback, called for each traceable thing directly referenced by a
 // particular object or runtime structure. It is the callback responsibility
@@ -71,16 +69,16 @@
 // JS_TraceChildren on the passed thing. In this case the callback must be
 // prepared to deal with cycles in the traversal graph.
 //
-// kind argument is one of JSTRACE_OBJECT, JSTRACE_STRING or a tag denoting
-// internal implementation-specific traversal kind. In the latter case the only
-// operations on thing that the callback can do is to call JS_TraceChildren or
-// JS_GetTraceThingInfo.
+// kind argument is one of JS::TraceKind::Object, JS::TraceKind::String or a
+// tag denoting internal implementation-specific traversal kind. In the latter
+// case the only operations on thing that the callback can do is to call
+// JS_TraceChildren or JS_GetTraceThingInfo.
 //
 // If eagerlyTraceWeakMaps is true, when we trace a WeakMap visit all
 // of its mappings. This should be used in cases where the tracer
 // wants to use the existing liveness of entries.
 typedef void
-(* JSTraceCallback)(JS::CallbackTracer* trc, void** thingp, JSGCTraceKind kind);
+(* JSTraceCallback)(JS::CallbackTracer* trc, void** thingp, JS::TraceKind kind);
 
 enum WeakMapTraceKind {
     DoNotTraceWeakMaps = 0,
@@ -146,7 +144,7 @@
     }
 
     // Call the callback.
-    void invoke(void** thing, JSGCTraceKind kind) {
+    void invoke(void** thing, JS::TraceKind kind) {
         callback(this, thing, kind);
     }
 
@@ -350,7 +348,7 @@
 JS_CallTenuredObjectTracer(JSTracer* trc, JS::TenuredHeap<JSObject*>* objp, const char* name);
 
 extern JS_PUBLIC_API(void)
-JS_TraceChildren(JSTracer* trc, void* thing, JSGCTraceKind kind);
+JS_TraceChildren(JSTracer* trc, void* thing, JS::TraceKind kind);
 
 extern JS_PUBLIC_API(void)
 JS_TraceRuntime(JSTracer* trc);
@@ -366,6 +364,6 @@
 
 extern JS_PUBLIC_API(void)
 JS_GetTraceThingInfo(char* buf, size_t bufsize, JSTracer* trc,
-                     void* thing, JSGCTraceKind kind, bool includeDetails);
+                     void* thing, JS::TraceKind kind, bool includeDetails);
 
 #endif /* js_TracingAPI_h */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/public/UbiNode.h firefox-trunk-41.0~a1~hg20150524r245419/js/public/UbiNode.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/public/UbiNode.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/public/UbiNode.h	2015-05-25 20:43:04.000000000 +0000
@@ -271,6 +271,7 @@
                       "ubi::Base specializations must be the same size as ubi::Base");
         Concrete<T>::construct(base(), ptr);
     }
+    struct ConstructFunctor;
 
   public:
     Node() { construct<void>(nullptr); }
@@ -301,7 +302,7 @@
     // JS::ubi::Node are both essentially tagged references to other sorts of
     // objects, so letting conversions happen automatically is appropriate.
     MOZ_IMPLICIT Node(JS::HandleValue value);
-    Node(JSGCTraceKind kind, void* ptr);
+    Node(JS::TraceKind kind, void* ptr);
 
     // copy construction and copy assignment just use memcpy, since we know
     // instances contain nothing but a vtable pointer and a data pointer.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/public/Utility.h firefox-trunk-41.0~a1~hg20150524r245419/js/public/Utility.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/public/Utility.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/public/Utility.h	2015-05-25 20:43:04.000000000 +0000
@@ -63,6 +63,7 @@
 # include "jscustomallocator.h"
 #else
 # if defined(DEBUG) || defined(JS_OOM_BREAKPOINT)
+
 /*
  * In order to test OOM conditions, when the testing function
  * oomAfterAllocations COUNT is passed, we fail continuously after the NUM'th
@@ -70,6 +71,7 @@
  */
 extern JS_PUBLIC_DATA(uint32_t) OOM_maxAllocations; /* set in builtin/TestingFunctions.cpp */
 extern JS_PUBLIC_DATA(uint32_t) OOM_counter; /* data race, who cares. */
+extern JS_PUBLIC_DATA(bool) OOM_failAlways;
 
 #ifdef JS_OOM_BREAKPOINT
 static MOZ_NEVER_INLINE void js_failedAllocBreakpoint() { asm(""); }
@@ -78,39 +80,44 @@
 #define JS_OOM_CALL_BP_FUNC() do {} while(0)
 #endif
 
-#  define JS_OOM_POSSIBLY_FAIL() \
-    do \
-    { \
-        if (++OOM_counter > OOM_maxAllocations) { \
-            JS_OOM_CALL_BP_FUNC();\
-            return nullptr; \
-        } \
-    } while (0)
-#  define JS_OOM_POSSIBLY_FAIL_BOOL() \
-    do \
-    { \
-        if (++OOM_counter > OOM_maxAllocations) { \
-            JS_OOM_CALL_BP_FUNC();\
-            return false; \
-        } \
-    } while (0)
-
 namespace js {
 namespace oom {
 static inline bool ShouldFailWithOOM()
 {
-    if (++OOM_counter > OOM_maxAllocations) {
+    OOM_counter++;
+    if (OOM_counter == OOM_maxAllocations ||
+        (OOM_counter > OOM_maxAllocations && OOM_failAlways))
+    {
         JS_OOM_CALL_BP_FUNC();
         return true;
     }
     return false;
 }
-}
-}
+} /* namespace oom */
+} /* namespace js */
+
+#  define JS_OOM_POSSIBLY_FAIL()                                              \
+    do {                                                                      \
+        if (js::oom::ShouldFailWithOOM())                                     \
+            return nullptr;                                                   \
+    } while (0)
+
+#  define JS_OOM_POSSIBLY_FAIL_BOOL()                                         \
+    do {                                                                      \
+        if (js::oom::ShouldFailWithOOM())                                     \
+            return false;                                                     \
+    } while (0)
+
 # else
+
 #  define JS_OOM_POSSIBLY_FAIL() do {} while(0)
 #  define JS_OOM_POSSIBLY_FAIL_BOOL() do {} while(0)
-namespace js { namespace oom { static inline bool ShouldFailWithOOM() { return false; } } }
+namespace js {
+namespace oom {
+static inline bool ShouldFailWithOOM() { return false; }
+} /* namespace oom */
+} /* namespace js */
+
 # endif /* DEBUG || JS_OOM_BREAKPOINT */
 
 static inline void* js_malloc(size_t bytes)
@@ -381,7 +388,7 @@
      *
      * So we use Fibonacci hashing, as described in Knuth, The Art of Computer
      * Programming, 6.4. This mixes all the bits of the input hash code h.
-     * 
+     *
      * The value of goldenRatio is taken from the hex
      * expansion of the golden ratio, which starts 1.9E3779B9....
      * This value is especially good if values with consecutive hash codes
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/public/Value.h firefox-trunk-41.0~a1~hg20150524r245419/js/public/Value.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/public/Value.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/public/Value.h	2015-05-25 20:43:04.000000000 +0000
@@ -613,12 +613,12 @@
 static inline uint32_t
 JSVAL_TRACE_KIND_IMPL(jsval_layout l)
 {
-    static_assert((JSVAL_TAG_STRING & 0x03) == JSTRACE_STRING,
-                  "Value type tags must correspond with JSGCTraceKinds.");
-    static_assert((JSVAL_TAG_SYMBOL & 0x03) == JSTRACE_SYMBOL,
-                  "Value type tags must correspond with JSGCTraceKinds.");
-    static_assert((JSVAL_TAG_OBJECT & 0x03) == JSTRACE_OBJECT,
-                  "Value type tags must correspond with JSGCTraceKinds.");
+    static_assert((JSVAL_TAG_STRING & 0x03) == size_t(JS::TraceKind::String),
+                  "Value type tags must correspond with JS::TraceKinds.");
+    static_assert((JSVAL_TAG_SYMBOL & 0x03) == size_t(JS::TraceKind::Symbol),
+                  "Value type tags must correspond with JS::TraceKinds.");
+    static_assert((JSVAL_TAG_OBJECT & 0x03) == size_t(JS::TraceKind::Object),
+                  "Value type tags must correspond with JS::TraceKinds.");
     return l.s.tag & 0x03;
 }
 
@@ -854,12 +854,12 @@
 static inline uint32_t
 JSVAL_TRACE_KIND_IMPL(jsval_layout l)
 {
-    static_assert((JSVAL_TAG_STRING & 0x03) == JSTRACE_STRING,
-                  "Value type tags must correspond with JSGCTraceKinds.");
-    static_assert((JSVAL_TAG_SYMBOL & 0x03) == JSTRACE_SYMBOL,
-                  "Value type tags must correspond with JSGCTraceKinds.");
-    static_assert((JSVAL_TAG_OBJECT & 0x03) == JSTRACE_OBJECT,
-                  "Value type tags must correspond with JSGCTraceKinds.");
+    static_assert((JSVAL_TAG_STRING & 0x03) == size_t(JS::TraceKind::String),
+                  "Value type tags must correspond with JS::TraceKinds.");
+    static_assert((JSVAL_TAG_SYMBOL & 0x03) == size_t(JS::TraceKind::Symbol),
+                  "Value type tags must correspond with JS::TraceKinds.");
+    static_assert((JSVAL_TAG_OBJECT & 0x03) == size_t(JS::TraceKind::Object),
+                  "Value type tags must correspond with JS::TraceKinds.");
     return (uint32_t)(l.asBits >> JSVAL_TAG_SHIFT) & 0x03;
 }
 
@@ -1179,9 +1179,9 @@
         return JSVAL_IS_TRACEABLE_IMPL(data);
     }
 
-    JSGCTraceKind gcKind() const {
+    JS::TraceKind traceKind() const {
         MOZ_ASSERT(isMarkable());
-        return JSGCTraceKind(JSVAL_TRACE_KIND_IMPL(data));
+        return JS::TraceKind(JSVAL_TRACE_KIND_IMPL(data));
     }
 
     JSWhyMagic whyMagic() const {
@@ -1249,7 +1249,7 @@
     }
 
     GCCellPtr toGCCellPtr() const {
-        return GCCellPtr(toGCThing(), gcKind());
+        return GCCellPtr(toGCThing(), traceKind());
     }
 
     bool toBoolean() const {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/asmjs/AsmJSLink.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/asmjs/AsmJSLink.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/asmjs/AsmJSLink.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/asmjs/AsmJSLink.cpp	2015-05-25 20:43:04.000000000 +0000
@@ -744,8 +744,12 @@
         // that the optimized asm.js-to-Ion FFI call path (which we want to be
         // very fast) can avoid doing so. The JitActivation is marked as
         // inactive so stack iteration will skip over it.
+        //
+        // We needn't provide an entry script pointer; that's only used for
+        // reporting entry points to performance-monitoring tools, and asm.js ->
+        // Ion calls will never be entry points.
         AsmJSActivation activation(cx, module);
-        JitActivation jitActivation(cx, /* active */ false);
+        JitActivation jitActivation(cx, /* entryScript */ nullptr, /* active */ false);
 
         // Call the per-exported-function trampoline created by GenerateEntry.
         AsmJSModule::CodePtr enter = module.entryTrampoline(func);
@@ -831,7 +835,7 @@
     if (!src)
         return false;
 
-    RootedFunction fun(cx, NewScriptedFunction(cx, 0, JSFunction::INTERPRETED,
+    RootedFunction fun(cx, NewScriptedFunction(cx, 0, JSFunction::INTERPRETED_NORMAL,
                                                name, gc::AllocKind::FUNCTION,
                                                TenuredObject));
     if (!fun)
@@ -868,7 +872,7 @@
                                               : SourceBufferHolder::NoOwnership;
     SourceBufferHolder srcBuf(chars, end - begin, ownership);
     if (!frontend::CompileFunctionBody(cx, &fun, options, formals, srcBuf,
-                                       /* enclosingScope = */ NullPtr()))
+                                       /* enclosingScope = */ nullptr))
         return false;
 
     // Call the function we just recompiled.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/asmjs/AsmJSModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/asmjs/AsmJSModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/asmjs/AsmJSModule.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/asmjs/AsmJSModule.cpp	2015-05-25 20:43:04.000000000 +0000
@@ -1019,7 +1019,7 @@
 AsmJSModuleObject*
 AsmJSModuleObject::create(ExclusiveContext* cx, ScopedJSDeletePtr<AsmJSModule>* module)
 {
-    JSObject* obj = NewObjectWithGivenProto(cx, &AsmJSModuleObject::class_, NullPtr());
+    JSObject* obj = NewObjectWithGivenProto(cx, &AsmJSModuleObject::class_, nullptr);
     if (!obj)
         return nullptr;
     AsmJSModuleObject* nobj = &obj->as<AsmJSModuleObject>();
@@ -2289,7 +2289,8 @@
     if (!atEnd)
         return true;
 
-    parser.tokenStream.advance(module->srcEndBeforeCurly());
+    if (!parser.tokenStream.advance(module->srcEndBeforeCurly()))
+        return false;
 
     {
         // Delay flushing until dynamic linking.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/asmjs/AsmJSValidate.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/asmjs/AsmJSValidate.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/asmjs/AsmJSValidate.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/asmjs/AsmJSValidate.cpp	2015-05-25 20:43:04.000000000 +0000
@@ -7604,9 +7604,7 @@
     if (!funpc.init(tokenStream))
         return false;
 
-    if (!m.parser().functionArgsAndBodyGeneric(InAllowed, YieldIsName, fn, fun, Normal,
-                                               Statement))
-    {
+    if (!m.parser().functionArgsAndBodyGeneric(InAllowed, YieldIsName, fn, fun, Statement)) {
         if (tokenStream.hadError() || directives == newDirectives)
             return false;
 
@@ -7771,7 +7769,7 @@
 
         JitContext jcx(m.cx(), &mir->alloc());
 
-        IonSpewNewFunction(&mir->graph(), NullPtr());
+        IonSpewNewFunction(&mir->graph(), nullptr);
 
         if (!OptimizeMIR(mir))
             return m.failOffset(func->srcBegin(), "internal compiler failure (probably out of memory)");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/AtomicsObject.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/AtomicsObject.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/AtomicsObject.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/AtomicsObject.cpp	2015-05-25 20:43:04.000000000 +0000
@@ -1032,7 +1032,13 @@
 bool
 js::FutexRuntime::isWaiting()
 {
-    return state_ == Waiting || state_ == WaitingInterrupted;
+    // When a worker is awoken for an interrupt it goes into state
+    // WaitingNotifiedForInterrupt for a short time before it actually
+    // wakes up and goes into WaitingInterrupted.  In those states the
+    // worker is still waiting, and if an explicit wake arrives the
+    // worker transitions to Woken.  See further comments in
+    // FutexRuntime::wait().
+    return state_ == Waiting || state_ == WaitingInterrupted || state_ == WaitingNotifiedForInterrupt;
 }
 
 bool
@@ -1102,7 +1108,7 @@
             *result = AtomicsObject::FutexOK;
             goto finished;
 
-          case FutexRuntime::WokenForJSInterrupt:
+          case FutexRuntime::WaitingNotifiedForInterrupt:
             // The interrupt handler may reenter the engine.  In that case
             // there are two complications:
             //
@@ -1112,7 +1118,7 @@
             //   To that end, we flag the thread as interrupted around
             //   the interrupt and check state_ when the interrupt
             //   handler returns.  A futexWake() call that reaches the
-            //   runtime during the interrupt sets state_ to woken.
+            //   runtime during the interrupt sets state_ to Woken.
             //
             // - It is in principle possible for futexWait() to be
             //   reentered on the same thread/runtime and waiting on the
@@ -1160,7 +1166,7 @@
     MOZ_ASSERT(lockHolder_ == PR_GetCurrentThread());
     MOZ_ASSERT(isWaiting());
 
-    if (state_ == WaitingInterrupted && reason == WakeExplicit) {
+    if ((state_ == WaitingInterrupted || state_ == WaitingNotifiedForInterrupt) && reason == WakeExplicit) {
         state_ = Woken;
         return;
     }
@@ -1169,7 +1175,9 @@
         state_ = Woken;
         break;
       case WakeForJSInterrupt:
-        state_ = WokenForJSInterrupt;
+        if (state_ == WaitingNotifiedForInterrupt)
+            return;
+        state_ = WaitingNotifiedForInterrupt;
         break;
       default:
         MOZ_CRASH();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/AtomicsObject.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/AtomicsObject.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/AtomicsObject.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/AtomicsObject.h	2015-05-25 20:43:04.000000000 +0000
@@ -97,19 +97,22 @@
     //
     // If the thread is waiting in a call to futexWait() and the
     // reason is WakeForJSInterrupt then the futexWait() will return
-    // with WokenForJSInterrupt; in the latter case the caller of
-    // futexWait() must handle the interrupt.
+    // with WaitingNotifiedForInterrupt; in the latter case the caller
+    // of futexWait() must handle the interrupt.
     void wake(WakeReason reason);
 
     bool isWaiting();
 
   private:
     enum FutexState {
-        Idle,                   // We are not waiting or woken
-        Waiting,                // We are waiting, nothing has happened yet
-        WaitingInterrupted,     // We are waiting, but have been interrupted
-        Woken,                  // Woken by a script call to futexWake
-        WokenForJSInterrupt     // Woken by an interrupt handler
+        Idle,                        // We are not waiting or woken
+        Waiting,                     // We are waiting, nothing has happened yet
+        WaitingNotifiedForInterrupt, // We are waiting, but have been interrupted,
+                                     //   and have not yet started running the
+                                     //   interrupt handler
+        WaitingInterrupted,          // We are waiting, but have been interrupted
+                                     //   and are running the interrupt handler
+        Woken                        // Woken by a script call to futexWake
     };
 
     // Condition variable that this runtime will wait on.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/Eval.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/Eval.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/Eval.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/Eval.cpp	2015-05-25 20:43:04.000000000 +0000
@@ -525,7 +525,7 @@
 
     RootedScript script(cx, scriptArg);
     if (script->compartment() != cx->compartment()) {
-        script = CloneScript(cx, NullPtr(), NullPtr(), script);
+        script = CloneScript(cx, nullptr, nullptr, script);
         if (!script)
             return false;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/Intl.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/Intl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/Intl.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/Intl.cpp	2015-05-25 20:43:04.000000000 +0000
@@ -420,7 +420,7 @@
 static bool
 CreateDefaultOptions(JSContext* cx, MutableHandleValue defaultOptions)
 {
-    RootedObject options(cx, NewObjectWithGivenProto<PlainObject>(cx, NullPtr()));
+    RootedObject options(cx, NewObjectWithGivenProto<PlainObject>(cx, nullptr));
     if (!options)
         return false;
     defaultOptions.setObject(*options);
@@ -439,7 +439,7 @@
 intl_availableLocales(JSContext* cx, CountAvailable countAvailable,
                       GetAvailable getAvailable, MutableHandleValue result)
 {
-    RootedObject locales(cx, NewObjectWithGivenProto<PlainObject>(cx, NullPtr()));
+    RootedObject locales(cx, NewObjectWithGivenProto<PlainObject>(cx, nullptr));
     if (!locales)
         return false;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/Map.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/Map.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/Map.js	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/Map.js	2015-05-25 20:43:04.000000000 +0000
@@ -32,3 +32,9 @@
         callFunction(callbackfn, thisArg, entry[1], entry[0], M);
     }
 }
+
+// ES6 final draft 23.1.2.2.
+function MapSpecies() {
+    // Step 1.
+    return this;
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/MapObject.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/MapObject.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/MapObject.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/MapObject.cpp	2015-05-25 20:43:04.000000000 +0000
@@ -1050,9 +1050,15 @@
     JS_FS_END
 };
 
+const JSPropertySpec MapObject::staticProperties[] = {
+    JS_SELF_HOSTED_SYM_GET(species, "MapSpecies", 0),
+    JS_PS_END
+};
+
 static JSObject*
 InitClass(JSContext* cx, Handle<GlobalObject*> global, const Class* clasp, JSProtoKey key, Native construct,
-          const JSPropertySpec* properties, const JSFunctionSpec* methods)
+          const JSPropertySpec* properties, const JSFunctionSpec* methods,
+          const JSPropertySpec* staticProperties)
 {
     RootedNativeObject proto(cx, global->createBlankPrototype(cx, clasp));
     if (!proto)
@@ -1061,6 +1067,7 @@
 
     Rooted<JSFunction*> ctor(cx, global->createConstructor(cx, construct, ClassName(key, cx), 0));
     if (!ctor ||
+        !JS_DefineProperties(cx, ctor, staticProperties) ||
         !LinkConstructorAndPrototype(cx, ctor, proto) ||
         !DefinePropertiesAndFunctions(cx, proto, properties, methods) ||
         !GlobalObject::initBuiltinConstructor(cx, global, key, ctor, proto))
@@ -1075,7 +1082,8 @@
 {
     Rooted<GlobalObject*> global(cx, &obj->as<GlobalObject>());
     RootedObject proto(cx,
-        InitClass(cx, global, &class_, JSProto_Map, construct, properties, methods));
+        InitClass(cx, global, &class_, JSProto_Map, construct, properties, methods,
+                  staticProperties));
     if (proto) {
         // Define the "entries" method.
         JSFunction* fun = JS_DefineFunction(cx, proto, "entries", entries, 0, 0);
@@ -1782,12 +1790,18 @@
     JS_FS_END
 };
 
+const JSPropertySpec SetObject::staticProperties[] = {
+    JS_SELF_HOSTED_SYM_GET(species, "SetSpecies", 0),
+    JS_PS_END
+};
+
 JSObject*
 SetObject::initClass(JSContext* cx, JSObject* obj)
 {
     Rooted<GlobalObject*> global(cx, &obj->as<GlobalObject>());
     RootedObject proto(cx,
-        InitClass(cx, global, &class_, JSProto_Set, construct, properties, methods));
+        InitClass(cx, global, &class_, JSProto_Set, construct, properties, methods,
+                  staticProperties));
     if (proto) {
         // Define the "values" method.
         JSFunction* fun = JS_DefineFunction(cx, proto, "values", values, 0, 0);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/MapObject.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/MapObject.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/MapObject.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/MapObject.h	2015-05-25 20:43:04.000000000 +0000
@@ -108,6 +108,7 @@
   private:
     static const JSPropertySpec properties[];
     static const JSFunctionSpec methods[];
+    static const JSPropertySpec staticProperties[];
     ValueMap* getData() { return static_cast<ValueMap*>(getPrivate()); }
     static ValueMap & extract(HandleObject o);
     static ValueMap & extract(CallReceiver call);
@@ -153,6 +154,7 @@
   private:
     static const JSPropertySpec properties[];
     static const JSFunctionSpec methods[];
+    static const JSPropertySpec staticProperties[];
     ValueSet* getData() { return static_cast<ValueSet*>(getPrivate()); }
     static ValueSet & extract(CallReceiver call);
     static void mark(JSTracer* trc, JSObject* obj);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/Object.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/Object.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/Object.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/Object.cpp	2015-05-25 20:43:04.000000000 +0000
@@ -671,7 +671,7 @@
     if (!args[0].isObjectOrNull()) {
         RootedValue v(cx, args[0]);
         UniquePtr<char[], JS::FreePolicy> bytes =
-            DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, v, NullPtr());
+            DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, v, nullptr);
         if (!bytes)
             return false;
         JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
@@ -1109,7 +1109,7 @@
      * Create |Object.prototype| first, mirroring CreateBlankProto but for the
      * prototype of the created object.
      */
-    RootedPlainObject objectProto(cx, NewObjectWithGivenProto<PlainObject>(cx, NullPtr(),
+    RootedPlainObject objectProto(cx, NewObjectWithGivenProto<PlainObject>(cx, nullptr,
                                                                            SingletonObject));
     if (!objectProto)
         return nullptr;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/Object.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/Object.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/Object.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/Object.h	2015-05-25 20:43:04.000000000 +0000
@@ -30,7 +30,7 @@
 
 PlainObject*
 ObjectCreateImpl(JSContext* cx, HandleObject proto, NewObjectKind newKind = GenericObject,
-                 HandleObjectGroup group = js::NullPtr());
+                 HandleObjectGroup group = nullptr);
 
 PlainObject*
 ObjectCreateWithTemplate(JSContext* cx, HandlePlainObject templateObj);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/Set.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/Set.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/Set.js	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/Set.js	2015-05-25 20:43:04.000000000 +0000
@@ -32,3 +32,9 @@
         callFunction(callbackfn, thisArg, value, value, S);
     }
 }
+
+// ES6 final draft 23.2.2.2.
+function SetSpecies() {
+    // Step 1.
+    return this;
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/SIMD.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/SIMD.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/SIMD.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/SIMD.cpp	2015-05-25 20:43:04.000000000 +0000
@@ -17,6 +17,7 @@
 
 #include "jsapi.h"
 #include "jsfriendapi.h"
+#include "jsprf.h"
 
 #include "builtin/TypedObject.h"
 #include "js/Value.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/String.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/String.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/String.js	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/String.js	2015-05-25 20:43:04.000000000 +0000
@@ -7,7 +7,7 @@
 /* ES6 Draft Oct 14, 2014 21.1.3.19 */
 function String_substring(start, end) {
     // Steps 1-3.
-    CheckObjectCoercible(this);
+    RequireObjectCoercible(this);
     var str = ToString(this);
 
     // Step 4.
@@ -51,7 +51,7 @@
 /* ES6 Draft Oct 14, 2014 B.2.3.1 */
 function String_substr(start, length) {
     // Steps 1-2.
-    CheckObjectCoercible(this);
+    RequireObjectCoercible(this);
     var str = ToString(this);
 
     // Steps 3-4.
@@ -90,7 +90,7 @@
 /* ES6 Draft Oct 14, 2014 21.1.3.16 */
 function String_slice(start, end) {
     // Steps 1-3.
-    CheckObjectCoercible(this);
+    RequireObjectCoercible(this);
     var str = ToString(this);
 
     // Step 4.
@@ -127,7 +127,7 @@
 /* ES6 Draft September 5, 2013 21.1.3.3 */
 function String_codePointAt(pos) {
     // Steps 1-3.
-    CheckObjectCoercible(this);
+    RequireObjectCoercible(this);
     var S = ToString(this);
 
     // Steps 4-5.
@@ -159,7 +159,7 @@
 /* ES6 20121122 draft 15.5.4.21. */
 function String_repeat(count) {
     // Steps 1-3.
-    CheckObjectCoercible(this);
+    RequireObjectCoercible(this);
     var S = ToString(this);
 
     // Steps 4-5.
@@ -194,7 +194,7 @@
 
 // ES6 draft specification, section 21.1.3.27, version 2013-09-27.
 function String_iterator() {
-    CheckObjectCoercible(this);
+    RequireObjectCoercible(this);
     var S = ToString(this);
     var iterator = NewStringIterator();
     UnsafeSetReservedSlot(iterator, STRING_ITERATOR_SLOT_ITERATED_STRING, S);
@@ -248,7 +248,7 @@
  */
 function String_localeCompare(that) {
     // Steps 1-3.
-    CheckObjectCoercible(this);
+    RequireObjectCoercible(this);
     var S = ToString(this);
     var That = ToString(that);
 
@@ -381,55 +381,55 @@
 
 // ES6 draft 2014-04-27 B.2.3.3
 function String_big() {
-    CheckObjectCoercible(this);
+    RequireObjectCoercible(this);
     return "<big>" + ToString(this) + "</big>";
 }
 
 // ES6 draft 2014-04-27 B.2.3.4
 function String_blink() {
-    CheckObjectCoercible(this);
+    RequireObjectCoercible(this);
     return "<blink>" + ToString(this) + "</blink>";
 }
 
 // ES6 draft 2014-04-27 B.2.3.5
 function String_bold() {
-    CheckObjectCoercible(this);
+    RequireObjectCoercible(this);
     return "<b>" + ToString(this) + "</b>";
 }
 
 // ES6 draft 2014-04-27 B.2.3.6
 function String_fixed() {
-    CheckObjectCoercible(this);
+    RequireObjectCoercible(this);
     return "<tt>" + ToString(this) + "</tt>";
 }
 
 // ES6 draft 2014-04-27 B.2.3.9
 function String_italics() {
-    CheckObjectCoercible(this);
+    RequireObjectCoercible(this);
     return "<i>" + ToString(this) + "</i>";
 }
 
 // ES6 draft 2014-04-27 B.2.3.11
 function String_small() {
-    CheckObjectCoercible(this);
+    RequireObjectCoercible(this);
     return "<small>" + ToString(this) + "</small>";
 }
 
 // ES6 draft 2014-04-27 B.2.3.12
 function String_strike() {
-    CheckObjectCoercible(this);
+    RequireObjectCoercible(this);
     return "<strike>" + ToString(this) + "</strike>";
 }
 
 // ES6 draft 2014-04-27 B.2.3.13
 function String_sub() {
-    CheckObjectCoercible(this);
+    RequireObjectCoercible(this);
     return "<sub>" + ToString(this) + "</sub>";
 }
 
 // ES6 draft 2014-04-27 B.2.3.14
 function String_sup() {
-    CheckObjectCoercible(this);
+    RequireObjectCoercible(this);
     return "<sup>" + ToString(this) + "</sup>";
 }
 
@@ -453,28 +453,28 @@
 
 // ES6 draft 2014-04-27 B.2.3.2
 function String_anchor(name) {
-    CheckObjectCoercible(this);
+    RequireObjectCoercible(this);
     var S = ToString(this);
     return '<a name="' + EscapeAttributeValue(name) + '">' + S + "</a>";
 }
 
 // ES6 draft 2014-04-27 B.2.3.7
 function String_fontcolor(color) {
-    CheckObjectCoercible(this);
+    RequireObjectCoercible(this);
     var S = ToString(this);
     return '<font color="' + EscapeAttributeValue(color) + '">' + S + "</font>";
 }
 
 // ES6 draft 2014-04-27 B.2.3.8
 function String_fontsize(size) {
-    CheckObjectCoercible(this);
+    RequireObjectCoercible(this);
     var S = ToString(this);
     return '<font size="' + EscapeAttributeValue(size) + '">' + S + "</font>";
 }
 
 // ES6 draft 2014-04-27 B.2.3.10
 function String_link(url) {
-    CheckObjectCoercible(this);
+    RequireObjectCoercible(this);
     var S = ToString(this);
     return '<a href="' + EscapeAttributeValue(url) + '">' + S + "</a>";
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/SymbolObject.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/SymbolObject.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/SymbolObject.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/SymbolObject.cpp	2015-05-25 20:43:04.000000000 +0000
@@ -161,7 +161,7 @@
     HandleValue arg = args.get(0);
     if (!arg.isSymbol()) {
         ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_UNEXPECTED_TYPE, JSDVG_SEARCH_STACK,
-                              arg, js::NullPtr(), "not a symbol", nullptr);
+                              arg, nullptr, "not a symbol", nullptr);
         return false;
     }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/TestingFunctions.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/TestingFunctions.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/TestingFunctions.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/TestingFunctions.cpp	2015-05-25 20:43:04.000000000 +0000
@@ -423,7 +423,7 @@
     }
     if (!args[0].isObject() || !args[0].toObject().is<JSFunction>()) {
         JS_ReportError(cx, "The first argument should be a function.");
-        return true;
+        return false;
     }
     args.rval().setBoolean(args[0].toObject().as<JSFunction>().isInterpretedLazy());
     return true;
@@ -804,7 +804,7 @@
 
 struct JSCountHeapNode {
     void*               thing;
-    JSGCTraceKind       kind;
+    JS::TraceKind       kind;
     JSCountHeapNode*    next;
 };
 
@@ -822,7 +822,7 @@
 };
 
 static void
-CountHeapNotify(JS::CallbackTracer* trc, void** thingp, JSGCTraceKind kind)
+CountHeapNotify(JS::CallbackTracer* trc, void** thingp, JS::TraceKind kind)
 {
     CountHeapTracer* countTracer = (CountHeapTracer*)trc;
     void* thing = *thingp;
@@ -857,12 +857,12 @@
 
 static const struct TraceKindPair {
     const char*      name;
-    int32_t           kind;
+    int32_t          kind;
 } traceKindNames[] = {
-    { "all",        -1                  },
-    { "object",     JSTRACE_OBJECT      },
-    { "string",     JSTRACE_STRING      },
-    { "symbol",     JSTRACE_SYMBOL      },
+    { "all",        -1                             },
+    { "object",     int32_t(JS::TraceKind::Object) },
+    { "string",     int32_t(JS::TraceKind::String) },
+    { "symbol",     int32_t(JS::TraceKind::Symbol) },
 };
 
 static bool
@@ -941,7 +941,7 @@
     while ((node = countTracer.traceList) != nullptr) {
         if (traceThing == nullptr) {
             // We are looking for all nodes with a specific kind
-            if (traceKind == -1 || node->kind == traceKind)
+            if (traceKind == -1 || int32_t(node->kind) == traceKind)
                 counter++;
         } else {
             // We are looking for some specific thing
@@ -1005,7 +1005,7 @@
             return false;
         if (d < 0) {
             ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_UNEXPECTED_TYPE,
-                                  JSDVG_SEARCH_STACK, args[0], JS::NullPtr(),
+                                  JSDVG_SEARCH_STACK, args[0], nullptr,
                                   "not a valid maximum frame count", NULL);
             return false;
         }
@@ -1016,7 +1016,7 @@
     if (args.length() >= 2) {
         if (!args[1].isObject()) {
             ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_UNEXPECTED_TYPE,
-                                  JSDVG_SEARCH_STACK, args[0], JS::NullPtr(),
+                                  JSDVG_SEARCH_STACK, args[0], nullptr,
                                   "not an object", NULL);
             return false;
         }
@@ -1100,6 +1100,34 @@
         return false;
 
     OOM_maxAllocations = OOM_counter + count;
+    OOM_failAlways = true;
+    return true;
+}
+
+static bool
+OOMAtAllocation(JSContext* cx, unsigned argc, jsval* vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+    if (args.length() != 1) {
+        JS_ReportError(cx, "count argument required");
+        return false;
+    }
+
+    uint32_t count;
+    if (!JS::ToUint32(cx, args[0], &count))
+        return false;
+
+    OOM_maxAllocations = OOM_counter + count;
+    OOM_failAlways = false;
+    return true;
+}
+
+static bool
+ResetOOMFailure(JSContext* cx, unsigned argc, jsval* vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+    args.rval().setBoolean(OOM_counter >= OOM_maxAllocations);
+    OOM_maxAllocations = UINT32_MAX;
     return true;
 }
 #endif
@@ -1113,7 +1141,7 @@
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
-    RootedObject obj(cx, NewObjectWithGivenProto(cx, &FakePromiseClass, NullPtr()));
+    RootedObject obj(cx, NewObjectWithGivenProto(cx, &FakePromiseClass, nullptr));
     if (!obj)
         return false;
 
@@ -1164,7 +1192,7 @@
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
-    JSObject* obj = JS_NewObjectWithGivenProto(cx, &FinalizeCounterClass, JS::NullPtr());
+    JSObject* obj = JS_NewObjectWithGivenProto(cx, &FinalizeCounterClass, nullptr);
     if (!obj)
         return false;
 
@@ -2246,14 +2274,14 @@
     // Non-GCThing endpoints don't make much sense.
     if (!args[0].isObject() && !args[0].isString() && !args[0].isSymbol()) {
         ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_UNEXPECTED_TYPE,
-                              JSDVG_SEARCH_STACK, args[0], JS::NullPtr(),
+                              JSDVG_SEARCH_STACK, args[0], nullptr,
                               "not an object, string, or symbol", NULL);
         return false;
     }
 
     if (!args[1].isObject() && !args[1].isString() && !args[1].isSymbol()) {
         ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_UNEXPECTED_TYPE,
-                              JSDVG_SEARCH_STACK, args[0], JS::NullPtr(),
+                              JSDVG_SEARCH_STACK, args[0], nullptr,
                               "not an object, string, or symbol", NULL);
         return false;
     }
@@ -2654,6 +2682,16 @@
 "oomAfterAllocations(count)",
 "  After 'count' js_malloc memory allocations, fail every following allocation\n"
 "  (return NULL)."),
+
+    JS_FN_HELP("oomAtAllocation", OOMAtAllocation, 1, 0,
+"oomAtAllocation(count)",
+"  After 'count' js_malloc memory allocations, fail the next allocation\n"
+"  (return NULL)."),
+
+    JS_FN_HELP("resetOOMFailure", ResetOOMFailure, 0, 0,
+"resetOOMFailure()",
+"  Remove the allocation failure scheduled by either oomAfterAllocations() or\n"
+"  oomAtAllocation() and return whether any allocation had been caused to fail."),
 #endif
 
     JS_FN_HELP("makeFakePromise", MakeFakePromise, 0, 0,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/TypedObject.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/TypedObject.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/TypedObject.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/TypedObject.cpp	2015-05-25 20:43:04.000000000 +0000
@@ -140,7 +140,7 @@
 ConvertAndCopyTo(JSContext* cx, HandleTypedObject typedObj, HandleValue val)
 {
     Rooted<TypeDescr*> type(cx, &typedObj->typeDescr());
-    return ConvertAndCopyTo(cx, type, typedObj, 0, NullPtr(), val);
+    return ConvertAndCopyTo(cx, type, typedObj, 0, nullptr, val);
 }
 
 /*
@@ -780,11 +780,11 @@
     int32_t alignment = 1;             // Alignment of struct.
     bool opaque = false;               // Opacity of struct.
 
-    userFieldOffsets = NewObjectWithProto<PlainObject>(cx, NullPtr(), TenuredObject);
+    userFieldOffsets = NewObjectWithProto<PlainObject>(cx, nullptr, TenuredObject);
     if (!userFieldOffsets)
         return nullptr;
 
-    userFieldTypes = NewObjectWithProto<PlainObject>(cx, NullPtr(), TenuredObject);
+    userFieldTypes = NewObjectWithProto<PlainObject>(cx, nullptr, TenuredObject);
     if (!userFieldTypes)
         return nullptr;
 
@@ -929,7 +929,7 @@
     {
         RootedObject fieldNamesVec(cx);
         fieldNamesVec = NewDenseCopiedArray(cx, fieldNames.length(),
-                                            fieldNames.begin(), NullPtr(),
+                                            fieldNames.begin(), nullptr,
                                             TenuredObject);
         if (!fieldNamesVec)
             return nullptr;
@@ -941,7 +941,7 @@
     {
         RootedObject fieldTypeVec(cx);
         fieldTypeVec = NewDenseCopiedArray(cx, fieldTypeObjs.length(),
-                                           fieldTypeObjs.begin(), NullPtr(),
+                                           fieldTypeObjs.begin(), nullptr,
                                            TenuredObject);
         if (!fieldTypeVec)
             return nullptr;
@@ -953,7 +953,7 @@
     {
         RootedObject fieldOffsetsVec(cx);
         fieldOffsetsVec = NewDenseCopiedArray(cx, fieldOffsets.length(),
-                                              fieldOffsets.begin(), NullPtr(),
+                                              fieldOffsets.begin(), nullptr,
                                               TenuredObject);
         if (!fieldOffsetsVec)
             return nullptr;
@@ -1930,7 +1930,7 @@
             Rooted<TypeDescr*> elementType(cx);
             elementType = &typedObj->typeDescr().as<ArrayTypeDescr>().elementType();
             size_t offset = elementType->size() * index;
-            if (!ConvertAndCopyTo(cx, elementType, typedObj, offset, NullPtr(), v))
+            if (!ConvertAndCopyTo(cx, elementType, typedObj, offset, nullptr, v))
                 return false;
             return result.succeed();
         }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/TypedObject.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/TypedObject.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/TypedObject.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/TypedObject.h	2015-05-25 20:43:04.000000000 +0000
@@ -605,7 +605,7 @@
     static bool GetBuffer(JSContext* cx, unsigned argc, Value* vp);
     static bool GetByteOffset(JSContext* cx, unsigned argc, Value* vp);
 
-    Shape* shapeFromGC() { return shape_; }
+    Shape** addressOfShapeFromGC() { return shape_.unsafeGet(); }
 };
 
 typedef Handle<TypedObject*> HandleTypedObject;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/Utilities.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/Utilities.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/Utilities.js	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/Utilities.js	2015-05-25 20:43:04.000000000 +0000
@@ -98,8 +98,8 @@
 }
 
 
-/* Spec: ECMAScript Language Specification, 5.1 edition, 9.10 */
-function CheckObjectCoercible(v) {
+// ES6 7.2.1 (previously, ES5 9.10 under the name "CheckObjectCoercible").
+function RequireObjectCoercible(v) {
     if (v === undefined || v === null)
         ThrowTypeError(JSMSG_CANT_CONVERT_TO, ToString(v), "object");
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/WeakSetObject.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/WeakSetObject.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/builtin/WeakSetObject.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/builtin/WeakSetObject.cpp	2015-05-25 20:43:04.000000000 +0000
@@ -124,7 +124,7 @@
             if (isOriginalAdder) {
                 if (keyVal.isPrimitive()) {
                     UniquePtr<char[], JS::FreePolicy> bytes =
-                        DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, keyVal, NullPtr());
+                        DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, keyVal, nullptr);
                     if (!bytes)
                         return false;
                     JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT, bytes.get());
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/configure.in firefox-trunk-41.0~a1~hg20150524r245419/js/src/configure.in
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/configure.in	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/configure.in	2015-05-25 20:43:04.000000000 +0000
@@ -384,6 +384,9 @@
             # See http://blogs.msdn.com/b/vcblog/archive/2014/11/12/improvements-to-warnings-in-the-c-compiler.aspx
             CFLAGS="$CFLAGS -Wv:18"
             CXXFLAGS="$CXXFLAGS -Wv:18"
+
+            # -Zc:sizedDealloc- disables C++14 global sized deallocation (see bug 1160146)
+            CXXFLAGS="$CXXFLAGS -Zc:sizedDealloc-"
         else
             AC_MSG_ERROR([This version ($CC_VERSION) of the MSVC compiler is unsupported. See https://developer.mozilla.org/en/Windows_Build_Prerequisites.])
         fi
@@ -2189,7 +2192,7 @@
   AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE)
   case "$OS_TARGET" in
   Darwin)
-    VISIBILITY_FLAGS='-fvisibility=hidden'
+    VISIBILITY_FLAGS='-fvisibility=hidden -fvisibility-inlines-hidden'
     ;;
   *)
     case $GCC_VERSION in
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/ctypes/CTypes.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/ctypes/CTypes.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/ctypes/CTypes.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/ctypes/CTypes.cpp	2015-05-25 20:43:04.000000000 +0000
@@ -928,7 +928,7 @@
       type = CType::GetTypeCode(baseTypeObj);
     } while (type == TYPE_pointer || type == TYPE_array);
     if (type == TYPE_function) {
-      BuildCStyleFunctionTypeSource(cx, baseTypeObj, NullPtr(), ptrCount,
+      BuildCStyleFunctionTypeSource(cx, baseTypeObj, nullptr, ptrCount,
                                     source);
       break;
     }
@@ -943,7 +943,7 @@
     break;
   }
   case TYPE_function:
-    BuildCStyleFunctionTypeSource(cx, typeObj, NullPtr(), 0, source);
+    BuildCStyleFunctionTypeSource(cx, typeObj, nullptr, 0, source);
     break;
   case TYPE_array:
     MOZ_CRASH("TYPE_array shouldn't appear in function type");
@@ -1071,8 +1071,8 @@
 static bool
 ConvError(JSContext* cx, const char* expectedStr, HandleValue actual,
           ConversionType convType,
-          HandleObject funObj = NullPtr(), unsigned argIndex = 0,
-          HandleObject arrObj = NullPtr(), unsigned arrIndex = 0)
+          HandleObject funObj = nullptr, unsigned argIndex = 0,
+          HandleObject arrObj = nullptr, unsigned arrIndex = 0)
 {
   JSAutoByteString valBytes;
   const char* valStr = CTypesToSourceForError(cx, actual, valBytes);
@@ -1201,8 +1201,8 @@
 static bool
 ConvError(JSContext* cx, HandleObject expectedType, HandleValue actual,
           ConversionType convType,
-          HandleObject funObj = NullPtr(), unsigned argIndex = 0,
-          HandleObject arrObj = NullPtr(), unsigned arrIndex = 0)
+          HandleObject funObj = nullptr, unsigned argIndex = 0,
+          HandleObject arrObj = nullptr, unsigned arrIndex = 0)
 {
   MOZ_ASSERT(CType::IsCType(expectedType));
 
@@ -1323,7 +1323,7 @@
 
 static bool
 EmptyFinalizerError(JSContext* cx, ConversionType convType,
-                    HandleObject funObj = NullPtr(), unsigned argIndex = 0)
+                    HandleObject funObj = nullptr, unsigned argIndex = 0)
 {
   JSAutoByteString posBytes;
   const char* posStr;
@@ -1347,7 +1347,7 @@
                    unsigned expectedCount, HandleObject structObj,
                    unsigned actualCount, HandleValue actual,
                    ConversionType convType,
-                   HandleObject funObj = NullPtr(), unsigned argIndex = 0)
+                   HandleObject funObj = nullptr, unsigned argIndex = 0)
 {
   MOZ_ASSERT(structObj && CType::IsCType(structObj));
 
@@ -1429,7 +1429,7 @@
 static bool
 PropNameNonStringError(JSContext* cx, HandleId id, HandleValue actual,
                        ConversionType convType,
-                       HandleObject funObj = NullPtr(), unsigned argIndex = 0)
+                       HandleObject funObj = nullptr, unsigned argIndex = 0)
 {
   JSAutoByteString valBytes;
   const char* valStr = CTypesToSourceForError(cx, actual, valBytes);
@@ -1672,7 +1672,7 @@
                const JSFunctionSpec* static_fs)
 {
   // Init type class and constructor
-  RootedObject prototype(cx, JS_InitClass(cx, parent, js::NullPtr(), clasp, construct,
+  RootedObject prototype(cx, JS_InitClass(cx, parent, nullptr, clasp, construct,
                                           0, nullptr, fs, nullptr, static_fs));
   if (!prototype)
     return nullptr;
@@ -2863,8 +2863,8 @@
                 void* buffer,
                 ConversionType convType,
                 bool* freePointer,
-                HandleObject funObj = NullPtr(), unsigned argIndex = 0,
-                HandleObject arrObj = NullPtr(), unsigned arrIndex = 0)
+                HandleObject funObj = nullptr, unsigned argIndex = 0,
+                HandleObject arrObj = nullptr, unsigned arrIndex = 0)
 {
   RootedObject targetType(cx, targetType_);
   MOZ_ASSERT(CType::IsSizeDefined(targetType));
@@ -3865,7 +3865,7 @@
   }
 
   // construct a CData object
-  RootedObject result(cx, CData::Create(cx, obj, NullPtr(), nullptr, true));
+  RootedObject result(cx, CData::Create(cx, obj, nullptr, nullptr, true));
   if (!result)
     return false;
 
@@ -4639,7 +4639,7 @@
                                "s");
   }
 
-  RootedObject result(cx, CData::Create(cx, obj, NullPtr(), nullptr, true));
+  RootedObject result(cx, CData::Create(cx, obj, nullptr, nullptr, true));
   if (!result)
     return false;
 
@@ -4794,7 +4794,7 @@
   void* address = data + offset * elementSize;
 
   // Create a PointerType CData object containing the new address.
-  JSObject* result = CData::Create(cx, typeObj, NullPtr(), &address, true);
+  JSObject* result = CData::Create(cx, typeObj, nullptr, &address, true);
   if (!result)
     return false;
 
@@ -4833,7 +4833,7 @@
   }
 
   RootedValue result(cx);
-  if (!ConvertToJS(cx, baseType, NullPtr(), data, false, false, &result))
+  if (!ConvertToJS(cx, baseType, nullptr, data, false, false, &result))
     return false;
 
   args.rval().set(result);
@@ -5038,7 +5038,7 @@
       return false;
   }
 
-  JSObject* result = CData::Create(cx, obj, NullPtr(), nullptr, true);
+  JSObject* result = CData::Create(cx, obj, nullptr, nullptr, true);
   if (!result)
     return false;
 
@@ -5269,7 +5269,7 @@
   size_t elementSize = CType::GetSize(baseType);
   char* data = static_cast<char*>(CData::GetData(obj)) + elementSize * index;
   if (!ImplicitConvert(cx, vp, baseType, data, ConversionType::Setter,
-                       nullptr, NullPtr(), 0, typeObj, index))
+                       nullptr, nullptr, 0, typeObj, index))
     return false;
   return result.succeed();
 }
@@ -5303,7 +5303,7 @@
     return false;
 
   // Create a PointerType CData object containing null.
-  RootedObject result(cx, CData::Create(cx, pointerType, NullPtr(), nullptr, true));
+  RootedObject result(cx, CData::Create(cx, pointerType, nullptr, nullptr, true));
   if (!result)
     return false;
 
@@ -5428,7 +5428,7 @@
   // Create a simple StructType with no defined fields. The result will be
   // non-instantiable as CData, will have no 'prototype' property, and will
   // have undefined size and alignment and no ffi_type.
-  RootedObject result(cx, CType::Create(cx, typeProto, NullPtr(), TYPE_struct,
+  RootedObject result(cx, CType::Create(cx, typeProto, nullptr, TYPE_struct,
                                         name.toString(), JSVAL_VOID, JSVAL_VOID, nullptr));
   if (!result)
     return false;
@@ -5751,7 +5751,7 @@
     return false;
   }
 
-  JSObject* result = CData::Create(cx, obj, NullPtr(), nullptr, true);
+  JSObject* result = CData::Create(cx, obj, nullptr, nullptr, true);
   if (!result)
     return false;
 
@@ -5799,7 +5799,7 @@
       MOZ_ASSERT(field.mIndex < fields->count());  /* Quantified invariant */
       if (!ImplicitConvert(cx, args[field.mIndex], field.mType,
                            buffer + field.mOffset, ConversionType::Construct,
-                           nullptr, NullPtr(), 0, obj, field.mIndex))
+                           nullptr, nullptr, 0, obj, field.mIndex))
         return false;
     }
 
@@ -5987,7 +5987,7 @@
 
   char* data = static_cast<char*>(CData::GetData(obj)) + field->mOffset;
   return ImplicitConvert(cx, args.get(0), field->mType, data, ConversionType::Setter, nullptr,
-                         NullPtr(), 0, typeObj, field->mIndex);
+                         nullptr, 0, typeObj, field->mIndex);
 }
 
 bool
@@ -6032,7 +6032,7 @@
     return false;
 
   // Create a PointerType CData object containing null.
-  JSObject* result = CData::Create(cx, pointerType, NullPtr(), nullptr, true);
+  JSObject* result = CData::Create(cx, pointerType, nullptr, nullptr, true);
   if (!result)
     return false;
 
@@ -6665,7 +6665,7 @@
 
   // prepare a JS object from the result
   RootedObject returnType(cx, fninfo->mReturnType);
-  return ConvertToJS(cx, returnType, NullPtr(), returnValue.mData, false, true, args.rval());
+  return ConvertToJS(cx, returnType, nullptr, returnValue.mData, false, true, args.rval());
 }
 
 FunctionInfo*
@@ -6946,7 +6946,7 @@
     // Convert each argument, and have any CData objects created depend on
     // the existing buffers.
     RootedObject argType(cx, fninfo->mArgTypes[i]);
-    if (!ConvertToJS(cx, argType, NullPtr(), args[i], false, false, argv[i]))
+    if (!ConvertToJS(cx, argType, nullptr, args[i], false, false, argv[i]))
       return;
   }
 
@@ -7181,7 +7181,7 @@
 
   // Convert the value to a primitive; do not create a new CData object.
   RootedObject ctype(cx, GetCType(obj));
-  return ConvertToJS(cx, ctype, NullPtr(), GetData(obj), true, false, args.rval());
+  return ConvertToJS(cx, ctype, nullptr, GetData(obj), true, false, args.rval());
 }
 
 bool
@@ -7215,7 +7215,7 @@
     return false;
 
   // Create a PointerType CData object containing null.
-  JSObject* result = CData::Create(cx, pointerType, NullPtr(), nullptr, true);
+  JSObject* result = CData::Create(cx, pointerType, nullptr, nullptr, true);
   if (!result)
     return false;
 
@@ -7286,7 +7286,7 @@
   }
 
   void* data = static_cast<void*>(cx->runtime());
-  JSObject* result = CData::Create(cx, targetType, NullPtr(), &data, true);
+  JSObject* result = CData::Create(cx, targetType, nullptr, &data, true);
   if (!result)
     return false;
 
@@ -7613,7 +7613,7 @@
   }
 
   RootedObject ctype(cx, GetCType(cx, obj));
-  return ConvertToJS(cx, ctype, /*parent*/NullPtr(), p->cargs, false, true, aResult);
+  return ConvertToJS(cx, ctype, /*parent*/nullptr, p->cargs, false, true, aResult);
 }
 
 /*
@@ -7884,7 +7884,7 @@
 
   RootedValue valJSData(cx);
   RootedObject ctype(cx, GetCType(cx, obj));
-  if (!ConvertToJS(cx, ctype, NullPtr(), p->cargs, false, true, &valJSData)) {
+  if (!ConvertToJS(cx, ctype, nullptr, p->cargs, false, true, &valJSData)) {
     JS_ReportError(cx, "CDataFinalizer value cannot be represented");
     return false;
   }
@@ -7961,7 +7961,7 @@
   JS_SetReservedSlot(objCTypes, SLOT_LASTERROR, INT_TO_JSVAL(lastErrorStatus));
 #endif // defined(XP_WIN)
 
-  if (ConvertToJS(cx, resultType, NullPtr(), p->rvalue, false, true, &result)) {
+  if (ConvertToJS(cx, resultType, nullptr, p->rvalue, false, true, &result)) {
     CDataFinalizer::Cleanup(p, obj);
     args.rval().set(result);
     return true;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/devtools/automation/cgc-jstests-slow.txt firefox-trunk-41.0~a1~hg20150524r245419/js/src/devtools/automation/cgc-jstests-slow.txt
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/devtools/automation/cgc-jstests-slow.txt	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/devtools/automation/cgc-jstests-slow.txt	2015-05-25 20:43:06.000000000 +0000
@@ -48,6 +48,7 @@
 ecma_6/String/normalize-generateddata-part2.js
 ecma_6/String/normalize-generateddata-part3.js
 js1_5/GC/regress-203278-2.js
+js1_5/GC/regress-203278-3.js
 js1_5/GC/regress-278725.js
 js1_5/Regress/regress-360969-01.js
 js1_5/Regress/regress-360969-02.js
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/devtools/rootAnalysis/annotations.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/devtools/rootAnalysis/annotations.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/devtools/rootAnalysis/annotations.js	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/devtools/rootAnalysis/annotations.js	2015-05-25 20:43:06.000000000 +0000
@@ -295,11 +295,16 @@
     return [
         'JSObject',
         'JSString',
+        'JSFatInlineString',
+        'JSExternalString',
         'js::Shape',
+        'js::AccessorShape',
         'js::BaseShape',
         'JSScript',
+        'js::ObjectGroup',
         'js::LazyScript',
-        'js::ion::IonCode',
+        'js::jit::JitCode',
+        'JS::Symbol',
     ];
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/BytecodeCompiler.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/BytecodeCompiler.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/BytecodeCompiler.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/BytecodeCompiler.cpp	2015-05-25 20:43:06.000000000 +0000
@@ -21,6 +21,7 @@
 #include "jsscriptinlines.h"
 
 #include "frontend/Parser-inl.h"
+#include "vm/ScopeObject-inl.h"
 
 using namespace js;
 using namespace js::frontend;
@@ -282,10 +283,8 @@
         return nullptr;
 
     bool savedCallerFun = evalCaller && evalCaller->functionOrCallerFunction();
-    bool allowSuperProperty = savedCallerFun && evalCaller->functionOrCallerFunction()->isMethod();
-
     Directives directives(options.strictOption);
-    GlobalSharedContext globalsc(cx, directives, options.extraWarningsOption, allowSuperProperty);
+    GlobalSharedContext globalsc(cx, directives, evalStaticScope, options.extraWarningsOption);
 
     Rooted<JSScript*> script(cx, JSScript::Create(cx, evalStaticScope, savedCallerFun,
                                                   options, staticLevel, sourceObject, 0,
@@ -298,8 +297,8 @@
     BytecodeEmitter::EmitterMode emitterMode =
         options.selfHostingMode ? BytecodeEmitter::SelfHosting : BytecodeEmitter::Normal;
     BytecodeEmitter bce(/* parent = */ nullptr, &parser, &globalsc, script,
-                        /* lazyScript = */ js::NullPtr(), options.forEval,
-                        evalCaller, evalStaticScope, insideNonGlobalEval,
+                        /* lazyScript = */ nullptr, options.forEval,
+                        evalCaller, insideNonGlobalEval,
                         options.lineno, emitterMode);
     if (!bce.init())
         return nullptr;
@@ -521,8 +520,7 @@
      */
     MOZ_ASSERT(!options.forEval);
     BytecodeEmitter bce(/* parent = */ nullptr, &parser, pn->pn_funbox, script, lazy,
-                        /* insideEval = */ false, /* evalCaller = */ js::NullPtr(),
-                        /* evalStaticScope = */ js::NullPtr(),
+                        /* insideEval = */ false, /* evalCaller = */ nullptr,
                         /* insideNonGlobalEval = */ false, options.lineno,
                         BytecodeEmitter::LazyFunction);
     if (!bce.init())
@@ -648,9 +646,8 @@
         script->bindings = fn->pn_funbox->bindings;
 
         BytecodeEmitter funbce(/* parent = */ nullptr, &parser, fn->pn_funbox, script,
-                               /* lazyScript = */ js::NullPtr(), /* insideEval = */ false,
-                               /* evalCaller = */ js::NullPtr(),
-                               /* evalStaticScope = */ js::NullPtr(),
+                               /* lazyScript = */ nullptr, /* insideEval = */ false,
+                               /* evalCaller = */ nullptr,
                                /* insideNonGlobalEval = */ false, options.lineno);
         if (!funbce.init())
             return false;
@@ -683,5 +680,5 @@
                                    const ReadOnlyCompileOptions& options, const AutoNameVector& formals,
                                    JS::SourceBufferHolder& srcBuf)
 {
-    return CompileFunctionBody(cx, fun, options, formals, srcBuf, NullPtr(), StarGenerator);
+    return CompileFunctionBody(cx, fun, options, formals, srcBuf, nullptr, StarGenerator);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/BytecodeEmitter.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/BytecodeEmitter.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/BytecodeEmitter.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/BytecodeEmitter.cpp	2015-05-25 20:43:06.000000000 +0000
@@ -105,7 +105,6 @@
                                  Parser<FullParseHandler>* parser, SharedContext* sc,
                                  HandleScript script, Handle<LazyScript*> lazyScript,
                                  bool insideEval, HandleScript evalCaller,
-                                 Handle<StaticEvalObject*> staticEvalScope,
                                  bool insideNonGlobalEval, uint32_t lineNum,
                                  EmitterMode emitterMode)
   : sc(sc),
@@ -118,7 +117,6 @@
     current(&main),
     parser(parser),
     evalCaller(evalCaller),
-    evalStaticScope(staticEvalScope),
     topStmt(nullptr),
     topScopeStmt(nullptr),
     staticScope(cx),
@@ -143,8 +141,6 @@
 {
     MOZ_ASSERT_IF(evalCaller, insideEval);
     MOZ_ASSERT_IF(emitterMode == LazyFunction, lazyScript);
-    // Function scripts are never eval scripts.
-    MOZ_ASSERT_IF(evalStaticScope, !sc->isFunctionBox());
 }
 
 bool
@@ -421,7 +417,10 @@
 BytecodeEmitter::updateLineNumberNotes(uint32_t offset)
 {
     TokenStream* ts = &parser->tokenStream;
-    if (!ts->srcCoords.isOnThisLine(offset, currentLine())) {
+    bool onThisLine;
+    if (!ts->srcCoords.isOnThisLine(offset, currentLine(), &onThisLine))
+        return ts->reportError(JSMSG_OUT_OF_MEMORY);
+    if (!onThisLine) {
         unsigned line = ts->srcCoords.lineNum(offset);
         unsigned delta = line - currentLine();
 
@@ -770,7 +769,7 @@
 
         // Top-level eval scripts have a placeholder static scope so that
         // StaticScopeIter may iterate through evals.
-        return evalStaticScope;
+        return sc->asGlobalSharedContext()->evalStaticScope();
     }
 
     return sc->asFunctionBox()->function();
@@ -3726,11 +3725,14 @@
     MOZ_ASSERT(pattern->isKind(PNK_OBJECT));
     MOZ_ASSERT(pattern->isArity(PN_LIST));
 
-    MOZ_ASSERT(this->stackDepth != 0);                            // ... OBJ
+    MOZ_ASSERT(this->stackDepth > 0);                             // ... RHS
+
+    if (!emitRequireObjectCoercible())                            // ... RHS
+        return false;
 
     for (ParseNode* member = pattern->pn_head; member; member = member->pn_next) {
         // Duplicate the value being destructured to use as a reference base.
-        if (!emit1(JSOP_DUP))                                     // ... OBJ OBJ
+        if (!emit1(JSOP_DUP))                                     // ... RHS RHS
             return false;
 
         // Now push the property name currently being matched, which is the
@@ -3740,7 +3742,7 @@
 
         ParseNode* subpattern;
         if (member->isKind(PNK_MUTATEPROTO)) {
-            if (!emitAtomOp(cx->names().proto, JSOP_GETPROP))     // ... OBJ PROP
+            if (!emitAtomOp(cx->names().proto, JSOP_GETPROP))     // ... RHS PROP
                 return false;
             needsGetElem = false;
             subpattern = member->pn_kid;
@@ -3749,7 +3751,7 @@
 
             ParseNode* key = member->pn_left;
             if (key->isKind(PNK_NUMBER)) {
-                if (!emitNumberOp(key->pn_dval))                  // ... OBJ OBJ KEY
+                if (!emitNumberOp(key->pn_dval))                  // ... RHS RHS KEY
                     return false;
             } else if (key->isKind(PNK_OBJECT_PROPERTY_NAME) || key->isKind(PNK_STRING)) {
                 PropertyName* name = key->pn_atom->asPropertyName();
@@ -3759,16 +3761,16 @@
                 // as indexes for simplification of downstream analysis.
                 jsid id = NameToId(name);
                 if (id != IdToTypeId(id)) {
-                    if (!emitTree(key))                           // ... OBJ OBJ KEY
+                    if (!emitTree(key))                           // ... RHS RHS KEY
                         return false;
                 } else {
-                    if (!emitAtomOp(name, JSOP_GETPROP))          // ...OBJ PROP
+                    if (!emitAtomOp(name, JSOP_GETPROP))          // ...RHS PROP
                         return false;
                     needsGetElem = false;
                 }
             } else {
                 MOZ_ASSERT(key->isKind(PNK_COMPUTED_NAME));
-                if (!emitTree(key->pn_kid))                       // ... OBJ OBJ KEY
+                if (!emitTree(key->pn_kid))                       // ... RHS RHS KEY
                     return false;
             }
 
@@ -3776,7 +3778,7 @@
         }
 
         // Get the property value if not done already.
-        if (needsGetElem && !emitElemOpBase(JSOP_GETELEM))        // ... OBJ PROP
+        if (needsGetElem && !emitElemOpBase(JSOP_GETELEM))        // ... RHS PROP
             return false;
 
         if (subpattern->isKind(PNK_ASSIGN)) {
@@ -3794,7 +3796,7 @@
         // target in the subpattern's LHS as it went, then popped PROP.  We've
         // correctly returned to the loop-entry stack, and we continue to the
         // next member.
-        if (emitOption == InitializeVars)                         // ... OBJ
+        if (emitOption == InitializeVars)                         // ... RHS
             continue;
 
         MOZ_ASSERT(emitOption == PushInitialValues);
@@ -4372,7 +4374,7 @@
             pn = pn_head;
         }
 
-        RootedArrayObject obj(cx, NewDenseFullyAllocatedArray(cx, count, NullPtr(), newKind));
+        RootedArrayObject obj(cx, NewDenseFullyAllocatedArray(cx, count, nullptr, newKind));
         if (!obj)
             return false;
 
@@ -4855,41 +4857,15 @@
 }
 
 /*
- * pnLet represents one of:
- *
- *   let-expression:   (let (x = y) EXPR)
- *   let-statement:    let (x = y) { ... }
+ * pnLet represents a let-statement: let (x = y) { ... }
  *
- * For a let-expression 'let (x = a, [y,z] = b) e', EmitLet produces:
- *
- *  bytecode          stackDepth  srcnotes
- *  evaluate a        +1
- *  evaluate b        +1
- *  dup               +1
- *  destructure y
- *  pick 1
- *  dup               +1
- *  destructure z
- *  pick 1
- *  pop               -1
- *  setlocal 2        -1
- *  setlocal 1        -1
- *  setlocal 0        -1
- *  pushblockscope (if needed)
- *  evaluate e        +1
- *  debugleaveblock
- *  popblockscope (if needed)
- *
- * Note that, since pushblockscope simply changes fp->scopeChain and does not
- * otherwise touch the stack, evaluation of the let-var initializers must leave
- * the initial value in the let-var's future slot.
  */
 /*
  * Using MOZ_NEVER_INLINE in here is a workaround for llvm.org/pr14047. See
  * the comment on emitSwitch.
  */
 MOZ_NEVER_INLINE bool
-BytecodeEmitter::emitLet(ParseNode* pnLet)
+BytecodeEmitter::emitLetBlock(ParseNode* pnLet)
 {
     MOZ_ASSERT(pnLet->isArity(PN_BINARY));
     ParseNode* varList = pnLet->pn_left;
@@ -4953,6 +4929,42 @@
 }
 
 bool
+BytecodeEmitter::emitRequireObjectCoercible()
+{
+    // For simplicity, handle this in self-hosted code, at cost of 13 bytes of
+    // bytecode versus 1 byte for a dedicated opcode.  As more places need this
+    // behavior, we may want to reconsider this tradeoff.
+
+#ifdef DEBUG
+    auto depth = this->stackDepth;
+#endif
+    MOZ_ASSERT(depth > 0);                 // VAL
+    if (!emit1(JSOP_DUP))                  // VAL VAL
+        return false;
+
+    // Note that "intrinsic" is a misnomer: we're calling a *self-hosted*
+    // function that's not an intrinsic!  But it nonetheless works as desired.
+    if (!emitAtomOp(cx->names().RequireObjectCoercible,
+                    JSOP_GETINTRINSIC))    // VAL VAL REQUIREOBJECTCOERCIBLE
+    {
+        return false;
+    }
+    if (!emit1(JSOP_UNDEFINED))            // VAL VAL REQUIREOBJECTCOERCIBLE UNDEFINED
+        return false;
+    if (!emit2(JSOP_PICK, jsbytecode(2)))  // VAL REQUIREOBJECTCOERCIBLE UNDEFINED VAL
+        return false;
+    if (!emitCall(JSOP_CALL, 1))           // VAL IGNORED
+        return false;
+    checkTypeSet(JSOP_CALL);
+
+    if (!emit1(JSOP_POP))                  // VAL
+        return false;
+
+    MOZ_ASSERT(depth == this->stackDepth);
+    return true;
+}
+
+bool
 BytecodeEmitter::emitIterator()
 {
     // Convert iterable to iterator.
@@ -5513,9 +5525,8 @@
             script->bindings = funbox->bindings;
 
             uint32_t lineNum = parser->tokenStream.srcCoords.lineNum(pn->pn_pos.begin);
-            BytecodeEmitter bce2(this, parser, funbox, script, /* lazyScript = */ js::NullPtr(),
+            BytecodeEmitter bce2(this, parser, funbox, script, /* lazyScript = */ nullptr,
                                  insideEval, evalCaller,
-                                 /* evalStaticScope = */ js::NullPtr(),
                                  insideNonGlobalEval, lineNum, emitterMode);
             if (!bce2.init())
                 return false;
@@ -6683,9 +6694,8 @@
      * ignore the value pushed by the first branch.  Execution will follow
      * only one path, so we must decrement this->stackDepth.
      *
-     * Failing to do this will foil code, such as let expression and block
-     * code generation, which must use the stack depth to compute local
-     * stack indexes correctly.
+     * Failing to do this will foil code, such as let block code generation,
+     * which must use the stack depth to compute local stack indexes correctly.
      */
     MOZ_ASSERT(stackDepth > 0);
     stackDepth--;
@@ -6766,7 +6776,7 @@
         if (propdef->pn_right->isKind(PNK_FUNCTION) &&
             propdef->pn_right->pn_funbox->needsHomeObject())
         {
-            MOZ_ASSERT(propdef->pn_right->pn_funbox->function()->isMethod());
+            MOZ_ASSERT(propdef->pn_right->pn_funbox->function()->allowSuperProperty());
             if (!emit2(JSOP_INITHOMEOBJECT, isIndex))
                 return false;
         }
@@ -7503,8 +7513,7 @@
         break;
 
       case PNK_LETBLOCK:
-      case PNK_LETEXPR:
-        ok = emitLet(pn);
+        ok = emitLetBlock(pn);
         break;
 
       case PNK_CONST:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/BytecodeEmitter.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/BytecodeEmitter.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/BytecodeEmitter.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/BytecodeEmitter.h	2015-05-25 20:43:06.000000000 +0000
@@ -136,8 +136,6 @@
     Parser<FullParseHandler>* const parser;
 
     HandleScript    evalCaller;     /* scripted caller info for eval and dbgapi */
-    Handle<StaticEvalObject*> evalStaticScope;
-                                   /* compile time scope for eval; does not imply stmt stack */
 
     StmtInfoBCE*    topStmt;       /* top of statement info stack */
     StmtInfoBCE*    topScopeStmt;  /* top lexical scope statement */
@@ -222,8 +220,7 @@
     BytecodeEmitter(BytecodeEmitter* parent, Parser<FullParseHandler>* parser, SharedContext* sc,
                     HandleScript script, Handle<LazyScript*> lazyScript,
                     bool insideEval, HandleScript evalCaller,
-                    Handle<StaticEvalObject*> evalStaticScope, bool insideNonGlobalEval,
-                    uint32_t lineNum, EmitterMode emitterMode = Normal);
+                    bool insideNonGlobalEval, uint32_t lineNum, EmitterMode emitterMode = Normal);
     bool init();
     bool updateLocalsToFrameSlots();
 
@@ -490,7 +487,7 @@
     bool emitWith(ParseNode* pn);
 
     MOZ_NEVER_INLINE bool emitLabeledStatement(const LabeledStatement* pn);
-    MOZ_NEVER_INLINE bool emitLet(ParseNode* pnLet);
+    MOZ_NEVER_INLINE bool emitLetBlock(ParseNode* pnLet);
     MOZ_NEVER_INLINE bool emitLexicalScope(ParseNode* pn);
     MOZ_NEVER_INLINE bool emitSwitch(ParseNode* pn);
     MOZ_NEVER_INLINE bool emitTry(ParseNode* pn);
@@ -524,6 +521,10 @@
     // the stack.
     bool emitInitializeDestructuringDecls(JSOp prologueOp, ParseNode* pattern);
 
+    // Throw a TypeError if the value atop the stack isn't convertible to an
+    // object, with no overall effect on the stack.
+    bool emitRequireObjectCoercible();
+
     // emitIterator expects the iterable to already be on the stack.
     // It will replace that stack value with the corresponding iterator
     bool emitIterator();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/FoldConstants.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/FoldConstants.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/FoldConstants.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/FoldConstants.cpp	2015-05-25 20:43:06.000000000 +0000
@@ -402,7 +402,6 @@
       case PNK_FALSE:
       case PNK_NULL:
       case PNK_THIS:
-      case PNK_LETEXPR:
       case PNK_ELISION:
       case PNK_NUMBER:
       case PNK_NEW:
@@ -886,131 +885,101 @@
         }
         break;
 
-      case PNK_ADD:
-        if (pn->isArity(PN_LIST)) {
-            bool folded = false;
-
-            pn2 = pn1->pn_next;
-            if (pn1->isKind(PNK_NUMBER)) {
-                // Fold addition of numeric literals: (1 + 2 + x === 3 + x).
-                // Note that we can only do this the front of the list:
-                // (x + 1 + 2 !== x + 3) when x is a string.
-                while (pn2 && pn2->isKind(PNK_NUMBER)) {
-                    pn1->pn_dval += pn2->pn_dval;
-                    pn1->pn_next = pn2->pn_next;
-                    handler.freeTree(pn2);
-                    pn2 = pn1->pn_next;
-                    pn->pn_count--;
-                    folded = true;
-                }
-            }
+      case PNK_ADD: {
+        MOZ_ASSERT(pn->isArity(PN_LIST));
 
-            // Now search for adjacent pairs of literals to fold for string
-            // concatenation.
-            //
-            // isStringConcat is true if we know the operation we're looking at
-            // will be string concatenation at runtime.  As soon as we see a
-            // string, we know that every addition to the right of it will be
-            // string concatenation, even if both operands are numbers:
-            // ("s" + x + 1 + 2 === "s" + x + "12").
-            //
-            bool isStringConcat = false;
-            RootedString foldedStr(cx);
-
-            // (number + string) is definitely concatenation, but only at the
-            // front of the list: (x + 1 + "2" !== x + "12") when x is a
-            // number.
-            if (pn1->isKind(PNK_NUMBER) && pn2 && pn2->isKind(PNK_STRING))
-                isStringConcat = true;
-
-            while (pn2) {
-                isStringConcat = isStringConcat || pn1->isKind(PNK_STRING);
-
-                if (isStringConcat &&
-                    (pn1->isKind(PNK_STRING) || pn1->isKind(PNK_NUMBER)) &&
-                    (pn2->isKind(PNK_STRING) || pn2->isKind(PNK_NUMBER)))
-                {
-                    // Fold string concatenation of literals.
-                    if (pn1->isKind(PNK_NUMBER) && !FoldType(cx, pn1, PNK_STRING))
-                        return false;
-                    if (pn2->isKind(PNK_NUMBER) && !FoldType(cx, pn2, PNK_STRING))
-                        return false;
-                    if (!foldedStr)
-                        foldedStr = pn1->pn_atom;
-                    RootedString right(cx, pn2->pn_atom);
-                    foldedStr = ConcatStrings<CanGC>(cx, foldedStr, right);
-                    if (!foldedStr)
-                        return false;
-                    pn1->pn_next = pn2->pn_next;
-                    handler.freeTree(pn2);
-                    pn2 = pn1->pn_next;
-                    pn->pn_count--;
-                    folded = true;
-                } else {
-                    if (foldedStr) {
-                        // Convert the rope of folded strings into an Atom.
-                        pn1->pn_atom = AtomizeString(cx, foldedStr);
-                        if (!pn1->pn_atom)
-                            return false;
-                        foldedStr = nullptr;
-                    }
-                    pn1 = pn2;
-                    pn2 = pn2->pn_next;
-                }
-            }
+        bool folded = false;
 
-            if (foldedStr) {
-                // Convert the rope of folded strings into an Atom.
-                pn1->pn_atom = AtomizeString(cx, foldedStr);
-                if (!pn1->pn_atom)
-                    return false;
+        pn2 = pn1->pn_next;
+        if (pn1->isKind(PNK_NUMBER)) {
+            // Fold addition of numeric literals: (1 + 2 + x === 3 + x).
+            // Note that we can only do this the front of the list:
+            // (x + 1 + 2 !== x + 3) when x is a string.
+            while (pn2 && pn2->isKind(PNK_NUMBER)) {
+                pn1->pn_dval += pn2->pn_dval;
+                pn1->pn_next = pn2->pn_next;
+                handler.freeTree(pn2);
+                pn2 = pn1->pn_next;
+                pn->pn_count--;
+                folded = true;
             }
+        }
 
-            if (folded) {
-                if (pn->pn_count == 1) {
-                    // We reduced the list to one constant. There is no
-                    // addition anymore. Replace the PNK_ADD node with the
-                    // single PNK_STRING or PNK_NUMBER node.
-                    ReplaceNode(pnp, pn1);
-                    pn = pn1;
-                } else if (!pn2) {
-                    pn->pn_tail = &pn1->pn_next;
+        // Now search for adjacent pairs of literals to fold for string
+        // concatenation.
+        //
+        // isStringConcat is true if we know the operation we're looking at
+        // will be string concatenation at runtime.  As soon as we see a
+        // string, we know that every addition to the right of it will be
+        // string concatenation, even if both operands are numbers:
+        // ("s" + x + 1 + 2 === "s" + x + "12").
+        //
+        bool isStringConcat = false;
+        RootedString foldedStr(cx);
+
+        // (number + string) is definitely concatenation, but only at the
+        // front of the list: (x + 1 + "2" !== x + "12") when x is a
+        // number.
+        if (pn1->isKind(PNK_NUMBER) && pn2 && pn2->isKind(PNK_STRING))
+            isStringConcat = true;
+
+        while (pn2) {
+            isStringConcat = isStringConcat || pn1->isKind(PNK_STRING);
+
+            if (isStringConcat &&
+                (pn1->isKind(PNK_STRING) || pn1->isKind(PNK_NUMBER)) &&
+                (pn2->isKind(PNK_STRING) || pn2->isKind(PNK_NUMBER)))
+            {
+                // Fold string concatenation of literals.
+                if (pn1->isKind(PNK_NUMBER) && !FoldType(cx, pn1, PNK_STRING))
+                    return false;
+                if (pn2->isKind(PNK_NUMBER) && !FoldType(cx, pn2, PNK_STRING))
+                    return false;
+                if (!foldedStr)
+                    foldedStr = pn1->pn_atom;
+                RootedString right(cx, pn2->pn_atom);
+                foldedStr = ConcatStrings<CanGC>(cx, foldedStr, right);
+                if (!foldedStr)
+                    return false;
+                pn1->pn_next = pn2->pn_next;
+                handler.freeTree(pn2);
+                pn2 = pn1->pn_next;
+                pn->pn_count--;
+                folded = true;
+            } else {
+                if (foldedStr) {
+                    // Convert the rope of folded strings into an Atom.
+                    pn1->pn_atom = AtomizeString(cx, foldedStr);
+                    if (!pn1->pn_atom)
+                        return false;
+                    foldedStr = nullptr;
                 }
+                pn1 = pn2;
+                pn2 = pn2->pn_next;
             }
-            break;
         }
 
-        /* Handle a binary string concatenation. */
-        MOZ_ASSERT(pn->isArity(PN_BINARY));
-        if (pn1->isKind(PNK_STRING) || pn2->isKind(PNK_STRING)) {
-            if (!FoldType(cx, !pn1->isKind(PNK_STRING) ? pn1 : pn2, PNK_STRING))
-                return false;
-            if (!pn1->isKind(PNK_STRING) || !pn2->isKind(PNK_STRING))
-                return true;
-            RootedString left(cx, pn1->pn_atom);
-            RootedString right(cx, pn2->pn_atom);
-            RootedString str(cx, ConcatStrings<CanGC>(cx, left, right));
-            if (!str)
+        if (foldedStr) {
+            // Convert the rope of folded strings into an Atom.
+            pn1->pn_atom = AtomizeString(cx, foldedStr);
+            if (!pn1->pn_atom)
                 return false;
-            pn->pn_atom = AtomizeString(cx, str);
-            if (!pn->pn_atom)
-                return false;
-            pn->setKind(PNK_STRING);
-            pn->setOp(JSOP_STRING);
-            pn->setArity(PN_NULLARY);
-            handler.freeTree(pn1);
-            handler.freeTree(pn2);
-            break;
         }
 
-        /* Can't concatenate string literals, let's try numbers. */
-        if (!FoldType(cx, pn1, PNK_NUMBER) || !FoldType(cx, pn2, PNK_NUMBER))
-            return false;
-        if (pn1->isKind(PNK_NUMBER) && pn2->isKind(PNK_NUMBER)) {
-            if (!FoldBinaryNumeric(cx, pn->getOp(), pn1, pn2, pn))
-                return false;
+        if (folded) {
+            if (pn->pn_count == 1) {
+                // We reduced the list to one constant. There is no
+                // addition anymore. Replace the PNK_ADD node with the
+                // single PNK_STRING or PNK_NUMBER node.
+                ReplaceNode(pnp, pn1);
+                pn = pn1;
+            } else if (!pn2) {
+                pn->pn_tail = &pn1->pn_next;
+            }
         }
+
         break;
+      }
 
       case PNK_SUB:
       case PNK_STAR:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/FullParseHandler.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/FullParseHandler.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/FullParseHandler.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/FullParseHandler.h	2015-05-25 20:43:06.000000000 +0000
@@ -253,7 +253,7 @@
         if (!elision)
             return false;
         literal->append(elision);
-        literal->pn_xflags |= PNX_SPECIALARRAYINIT | PNX_NONCONST;
+        literal->pn_xflags |= PNX_ARRAYHOLESPREAD | PNX_NONCONST;
         return true;
     }
 
@@ -263,7 +263,7 @@
         if (!spread)
             return null();
         literal->append(spread);
-        literal->pn_xflags |= PNX_SPECIALARRAYINIT | PNX_NONCONST;
+        literal->pn_xflags |= PNX_ARRAYHOLESPREAD | PNX_NONCONST;
         return true;
     }
 
@@ -591,14 +591,6 @@
         block->pn_expr = body;
     }
 
-    ParseNode* newLetExpression(ParseNode* vars, ParseNode* block, const TokenPos& pos) {
-        ParseNode* letExpr = newBinary(PNK_LETEXPR, vars, block);
-        if (!letExpr)
-            return nullptr;
-        letExpr->pn_pos = pos;
-        return letExpr;
-    }
-
     ParseNode* newLetBlock(ParseNode* vars, ParseNode* block, const TokenPos& pos) {
         ParseNode* letBlock = newBinary(PNK_LETBLOCK, vars, block);
         if (!letBlock)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/NameFunctions.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/NameFunctions.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/NameFunctions.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/NameFunctions.cpp	2015-05-25 20:43:06.000000000 +0000
@@ -270,6 +270,58 @@
         return pos >= 0 && call(parents[pos]) && parents[pos]->pn_head == cur;
     }
 
+    bool resolveTemplateLiteral(ParseNode* node, HandleAtom prefix) {
+        MOZ_ASSERT(node->isKind(PNK_TEMPLATE_STRING_LIST));
+        ParseNode* element = node->pn_head;
+        while (true) {
+            MOZ_ASSERT(element->isKind(PNK_TEMPLATE_STRING));
+
+            element = element->pn_next;
+            if (!element)
+                return true;
+
+            if (!resolve(element, prefix))
+                return false;
+
+            element = element->pn_next;
+        }
+    }
+
+    bool resolveTaggedTemplate(ParseNode* node, HandleAtom prefix) {
+        MOZ_ASSERT(node->isKind(PNK_TAGGED_TEMPLATE));
+
+        ParseNode* element = node->pn_head;
+
+        // The list head is a leading expression, e.g. |tag| in |tag`foo`|,
+        // that might contain functions.
+        if (!resolve(element, prefix))
+            return false;
+
+        // Next is the callsite object node.  This node only contains
+        // internal strings and an array -- no user-controlled expressions.
+        element = element->pn_next;
+#ifdef DEBUG
+        {
+            MOZ_ASSERT(element->isKind(PNK_CALLSITEOBJ));
+            ParseNode* array = element->pn_head;
+            MOZ_ASSERT(array->isKind(PNK_ARRAY));
+            for (ParseNode* kid = array->pn_head; kid; kid = kid->pn_next)
+                MOZ_ASSERT(kid->isKind(PNK_TEMPLATE_STRING));
+            for (ParseNode* next = array->pn_next; next; next = next->pn_next)
+                MOZ_ASSERT(next->isKind(PNK_TEMPLATE_STRING));
+        }
+#endif
+
+        // Next come any interpolated expressions in the tagged template.
+        ParseNode* interpolated = element->pn_next;
+        for (; interpolated; interpolated = interpolated->pn_next) {
+            if (!resolve(interpolated, prefix))
+                return false;
+        }
+
+        return true;
+    }
+
   public:
     explicit NameResolver(ExclusiveContext* cx) : cx(cx), nparents(0), buf(nullptr) {}
 
@@ -278,7 +330,7 @@
      * ParseNode instance given. The prefix is for each subsequent name, and
      * should initially be nullptr.
      */
-    bool resolve(ParseNode* cur, HandleAtom prefixArg = js::NullPtr()) {
+    bool resolve(ParseNode* cur, HandleAtom prefixArg = nullptr) {
         RootedAtom prefix(cx, prefixArg);
         if (cur == nullptr)
             return true;
@@ -301,33 +353,157 @@
             return true;
         parents[nparents++] = cur;
 
-        switch (cur->getArity()) {
-          case PN_NULLARY:
+        switch (cur->getKind()) {
+          // Nodes with no children that might require name resolution need no
+          // further work.
+          case PNK_NOP:
+          case PNK_STRING:
+          case PNK_TEMPLATE_STRING:
+          case PNK_REGEXP:
+          case PNK_TRUE:
+          case PNK_FALSE:
+          case PNK_NULL:
+          case PNK_THIS:
+          case PNK_ELISION:
+          case PNK_GENERATOR:
+          case PNK_NUMBER:
+          case PNK_BREAK:
+          case PNK_CONTINUE:
+          case PNK_DEBUGGER:
+          case PNK_EXPORT_BATCH_SPEC:
+          case PNK_FRESHENBLOCK:
+          case PNK_SUPERPROP:
+          case PNK_OBJECT_PROPERTY_NAME:
+            MOZ_ASSERT(cur->isArity(PN_NULLARY));
             break;
-          case PN_NAME:
-            if (!resolve(cur->maybeExpr(), prefix))
+
+          // Nodes with a single non-null child requiring name resolution.
+          case PNK_TYPEOF:
+          case PNK_VOID:
+          case PNK_NOT:
+          case PNK_BITNOT:
+          case PNK_THROW:
+          case PNK_DELETE:
+          case PNK_NEG:
+          case PNK_POS:
+          case PNK_PREINCREMENT:
+          case PNK_POSTINCREMENT:
+          case PNK_PREDECREMENT:
+          case PNK_POSTDECREMENT:
+          case PNK_COMPUTED_NAME:
+          case PNK_ARRAYPUSH:
+          case PNK_SPREAD:
+          case PNK_MUTATEPROTO:
+          case PNK_SUPERELEM:
+          case PNK_EXPORT:
+            MOZ_ASSERT(cur->isArity(PN_UNARY));
+            if (!resolve(cur->pn_kid, prefix))
                 return false;
             break;
-          case PN_UNARY:
-            if (!resolve(cur->pn_kid, prefix))
+
+          // Nodes with a single nullable child.
+          case PNK_SEMI:
+            MOZ_ASSERT(cur->isArity(PN_UNARY));
+            if (ParseNode* expr = cur->pn_kid) {
+                if (!resolve(expr, prefix))
+                    return false;
+            }
+            break;
+
+          // Binary nodes with two non-null children.
+          case PNK_ASSIGN:
+          case PNK_ADDASSIGN:
+          case PNK_SUBASSIGN:
+          case PNK_BITORASSIGN:
+          case PNK_BITXORASSIGN:
+          case PNK_BITANDASSIGN:
+          case PNK_LSHASSIGN:
+          case PNK_RSHASSIGN:
+          case PNK_URSHASSIGN:
+          case PNK_MULASSIGN:
+          case PNK_DIVASSIGN:
+          case PNK_MODASSIGN:
+          case PNK_ELEM:
+          case PNK_COLON:
+          case PNK_CASE:
+          case PNK_SHORTHAND:
+          case PNK_DOWHILE:
+          case PNK_WHILE:
+          case PNK_SWITCH:
+          case PNK_LETBLOCK:
+          case PNK_FOR:
+          case PNK_CLASSMETHOD:
+            MOZ_ASSERT(cur->isArity(PN_BINARY));
+            if (!resolve(cur->pn_left, prefix))
+                return false;
+            if (!resolve(cur->pn_right, prefix))
                 return false;
             break;
-          case PN_BINARY:
-          case PN_BINARY_OBJ:
+
+          case PNK_WITH:
+            MOZ_ASSERT(cur->isArity(PN_BINARY_OBJ));
             if (!resolve(cur->pn_left, prefix))
                 return false;
+            if (!resolve(cur->pn_right, prefix))
+                return false;
+            break;
 
-            /*
-             * FIXME? Occasionally pn_left == pn_right for something like
-             * destructuring assignment in (function({foo}){}), so skip the
-             * duplicate here if this is the case because we want to traverse
-             * everything at most once.
-             */
-            if (cur->pn_left != cur->pn_right)
-                if (!resolve(cur->pn_right, prefix))
+          case PNK_DEFAULT:
+            MOZ_ASSERT(cur->isArity(PN_BINARY));
+            MOZ_ASSERT(!cur->pn_left);
+            if (!resolve(cur->pn_right, prefix))
+                return false;
+            break;
+
+          case PNK_YIELD_STAR:
+            MOZ_ASSERT(cur->isArity(PN_BINARY));
+            MOZ_ASSERT(cur->pn_right->isKind(PNK_NAME));
+            MOZ_ASSERT(!cur->pn_right->isAssigned());
+            if (!resolve(cur->pn_left, prefix))
+                return false;
+            break;
+
+          case PNK_YIELD:
+            MOZ_ASSERT(cur->isArity(PN_BINARY));
+            if (cur->pn_left) {
+                if (!resolve(cur->pn_left, prefix))
                     return false;
+            }
+            MOZ_ASSERT((cur->pn_right->isKind(PNK_NAME) && !cur->pn_right->isAssigned()) ||
+                       (cur->pn_right->isKind(PNK_ASSIGN) &&
+                        cur->pn_right->pn_left->isKind(PNK_NAME) &&
+                        cur->pn_right->pn_right->isKind(PNK_GENERATOR)));
             break;
-          case PN_TERNARY:
+
+          case PNK_RETURN:
+            MOZ_ASSERT(cur->isArity(PN_BINARY));
+            if (ParseNode* returnValue = cur->pn_left) {
+                if (!resolve(returnValue, prefix))
+                    return false;
+            }
+#ifdef DEBUG
+            if (ParseNode* internalAssignForGenerators = cur->pn_right) {
+                MOZ_ASSERT(internalAssignForGenerators->isKind(PNK_NAME));
+                MOZ_ASSERT(internalAssignForGenerators->pn_atom == cx->names().dotGenRVal);
+                MOZ_ASSERT(internalAssignForGenerators->isAssigned());
+            }
+#endif
+            break;
+
+          case PNK_IMPORT:
+          case PNK_EXPORT_FROM:
+            MOZ_ASSERT(cur->isArity(PN_BINARY));
+            // The left halves of these nodes don't contain any unconstrained
+            // expressions, but it's very hard to assert this to safely rely on
+            // it.  So recur anyway.
+            if (!resolve(cur->pn_left, prefix))
+                return false;
+            MOZ_ASSERT(cur->pn_right->isKind(PNK_STRING));
+            break;
+
+          // Ternary nodes with three expression children.
+          case PNK_CONDITIONAL:
+            MOZ_ASSERT(cur->isArity(PN_TERNARY));
             if (!resolve(cur->pn_kid1, prefix))
                 return false;
             if (!resolve(cur->pn_kid2, prefix))
@@ -335,17 +511,256 @@
             if (!resolve(cur->pn_kid3, prefix))
                 return false;
             break;
-          case PN_CODE:
-            MOZ_ASSERT(cur->isKind(PNK_FUNCTION));
-            if (!resolve(cur->pn_body, prefix))
+
+          // The first part of a for-in/of is the declaration in the loop (or
+          // null if no declaration).  The latter two parts are the location
+          // assigned each loop and the value being looped over; obviously,
+          // either might contain functions to name.  Declarations may (through
+          // computed property names, and possibly through [deprecated!]
+          // initializers) also contain functions to name.
+          case PNK_FORIN:
+          case PNK_FOROF:
+            MOZ_ASSERT(cur->isArity(PN_TERNARY));
+            if (ParseNode* decl = cur->pn_kid1) {
+                if (!resolve(decl, prefix))
+                    return false;
+            }
+            if (!resolve(cur->pn_kid2, prefix))
+                return false;
+            if (!resolve(cur->pn_kid3, prefix))
                 return false;
             break;
-          case PN_LIST:
-            for (ParseNode* nxt = cur->pn_head; nxt; nxt = nxt->pn_next)
-                if (!resolve(nxt, prefix))
+
+          // Every part of a for(;;) head may contain a function needing name
+          // resolution.
+          case PNK_FORHEAD:
+            MOZ_ASSERT(cur->isArity(PN_TERNARY));
+            if (ParseNode* init = cur->pn_kid1) {
+                if (!resolve(init, prefix))
+                    return false;
+            }
+            if (ParseNode* cond = cur->pn_kid2) {
+                if (!resolve(cond, prefix))
                     return false;
+            }
+            if (ParseNode* step = cur->pn_kid3) {
+                if (!resolve(step, prefix))
+                    return false;
+            }
             break;
+
+          // The first child of a class is a pair of names referring to it,
+          // inside and outside the class.  The second is the class's heritage,
+          // if any.  The third is the class body.
+          case PNK_CLASS:
+            MOZ_ASSERT(cur->isArity(PN_TERNARY));
+            MOZ_ASSERT_IF(cur->pn_kid1, cur->pn_kid1->isKind(PNK_CLASSNAMES));
+            MOZ_ASSERT_IF(cur->pn_kid1, cur->pn_kid1->isArity(PN_BINARY));
+            MOZ_ASSERT_IF(cur->pn_kid1 && cur->pn_kid1->pn_left,
+                          cur->pn_kid1->pn_left->isKind(PNK_NAME));
+            MOZ_ASSERT_IF(cur->pn_kid1 && cur->pn_kid1->pn_left,
+                          !cur->pn_kid1->pn_left->maybeExpr());
+            MOZ_ASSERT_IF(cur->pn_kid1, cur->pn_kid1->pn_right->isKind(PNK_NAME));
+            MOZ_ASSERT_IF(cur->pn_kid1, !cur->pn_kid1->pn_right->maybeExpr());
+            if (cur->pn_kid2) {
+                if (!resolve(cur->pn_kid2, prefix))
+                    return false;
+            }
+            if (!resolve(cur->pn_kid3, prefix))
+                return false;
+            break;
+
+          // The condition and consequent are non-optional, but the alternative
+          // might be omitted.
+          case PNK_IF:
+            MOZ_ASSERT(cur->isArity(PN_TERNARY));
+            if (!resolve(cur->pn_kid1, prefix))
+                return false;
+            if (!resolve(cur->pn_kid2, prefix))
+                return false;
+            if (cur->pn_kid3) {
+                if (!resolve(cur->pn_kid3, prefix))
+                    return false;
+            }
+            break;
+
+          // The statements in the try-block are mandatory.  The catch-blocks
+          // and finally block are optional (but at least one or the other must
+          // be present).
+          case PNK_TRY:
+            MOZ_ASSERT(cur->isArity(PN_TERNARY));
+            if (!resolve(cur->pn_kid1, prefix))
+                return false;
+            MOZ_ASSERT(cur->pn_kid2 || cur->pn_kid3);
+            if (ParseNode* catchList = cur->pn_kid2) {
+                MOZ_ASSERT(catchList->isKind(PNK_CATCHLIST));
+                if (!resolve(catchList, prefix))
+                    return false;
+            }
+            if (ParseNode* finallyBlock = cur->pn_kid3) {
+                if (!resolve(finallyBlock, prefix))
+                    return false;
+            }
+            break;
+
+          // The first child, the catch-pattern, may contain functions via
+          // computed property names.  The optional catch-conditions may
+          // contain any expression.  The catch statements, of course, may
+          // contain arbitrary expressions.
+          case PNK_CATCH:
+            MOZ_ASSERT(cur->isArity(PN_TERNARY));
+            if (!resolve(cur->pn_kid1, prefix))
+                return false;
+            if (cur->pn_kid2) {
+                if (!resolve(cur->pn_kid2, prefix))
+                    return false;
+            }
+            if (!resolve(cur->pn_kid3, prefix))
+                return false;
+            break;
+
+          // Nodes with arbitrary-expression children.
+          case PNK_OR:
+          case PNK_AND:
+          case PNK_BITOR:
+          case PNK_BITXOR:
+          case PNK_BITAND:
+          case PNK_STRICTEQ:
+          case PNK_EQ:
+          case PNK_STRICTNE:
+          case PNK_NE:
+          case PNK_LT:
+          case PNK_LE:
+          case PNK_GT:
+          case PNK_GE:
+          case PNK_INSTANCEOF:
+          case PNK_IN:
+          case PNK_LSH:
+          case PNK_RSH:
+          case PNK_URSH:
+          case PNK_ADD:
+          case PNK_SUB:
+          case PNK_STAR:
+          case PNK_DIV:
+          case PNK_MOD:
+          case PNK_COMMA:
+          case PNK_NEW:
+          case PNK_CALL:
+          case PNK_GENEXP:
+          case PNK_ARRAY:
+          case PNK_STATEMENTLIST:
+          case PNK_SEQ:
+          case PNK_ARGSBODY:
+          // Initializers for individual variables, and computed property names
+          // within destructuring patterns, may contain unnamed functions.
+          case PNK_VAR:
+          case PNK_CONST:
+          case PNK_LET:
+          case PNK_GLOBALCONST:
+            MOZ_ASSERT(cur->isArity(PN_LIST));
+            for (ParseNode* element = cur->pn_head; element; element = element->pn_next) {
+                if (!resolve(element, prefix))
+                    return false;
+            }
+            break;
+
+          // Array comprehension nodes are lists with a single child -- PNK_FOR for
+          // comprehensions, PNK_LEXICALSCOPE for legacy comprehensions.  Probably
+          // this should be a non-list eventually.
+          case PNK_ARRAYCOMP:
+            MOZ_ASSERT(cur->isArity(PN_LIST));
+            MOZ_ASSERT(cur->pn_count == 1);
+            MOZ_ASSERT(cur->pn_head->isKind(PNK_LEXICALSCOPE) || cur->pn_head->isKind(PNK_FOR));
+            if (!resolve(cur->pn_head, prefix))
+                return false;
+            break;
+
+          case PNK_OBJECT:
+          case PNK_CLASSMETHODLIST:
+            MOZ_ASSERT(cur->isArity(PN_LIST));
+            for (ParseNode* element = cur->pn_head; element; element = element->pn_next) {
+                if (!resolve(element, prefix))
+                    return false;
+            }
+            break;
+
+          // A template string list's contents alternate raw template string
+          // contents with expressions interpolated into the overall literal.
+          case PNK_TEMPLATE_STRING_LIST:
+            MOZ_ASSERT(cur->isArity(PN_LIST));
+            if (!resolveTemplateLiteral(cur, prefix))
+                return false;
+            break;
+
+          case PNK_TAGGED_TEMPLATE:
+            MOZ_ASSERT(cur->isArity(PN_LIST));
+            if (!resolveTaggedTemplate(cur, prefix))
+                return false;
+            break;
+
+          // Import/export spec lists contain only import/export specs
+          // containing only pairs of names.
+          case PNK_IMPORT_SPEC_LIST: {
+          case PNK_EXPORT_SPEC_LIST:
+            MOZ_ASSERT(cur->isArity(PN_LIST));
+#ifdef DEBUG
+            bool isImport = cur->isKind(PNK_IMPORT_SPEC_LIST);
+            for (ParseNode* item = cur->pn_head; item; item = item->pn_next) {
+                MOZ_ASSERT(item->isKind(isImport ? PNK_IMPORT_SPEC : PNK_EXPORT_SPEC));
+                MOZ_ASSERT(item->isArity(PN_BINARY));
+                MOZ_ASSERT(item->pn_left->isKind(PNK_NAME));
+                MOZ_ASSERT(!item->pn_left->maybeExpr());
+                MOZ_ASSERT(item->pn_right->isKind(PNK_NAME));
+                MOZ_ASSERT(!item->pn_right->maybeExpr());
+            }
+#endif
+            break;
+          }
+
+          case PNK_CATCHLIST: {
+            MOZ_ASSERT(cur->isArity(PN_LIST));
+            for (ParseNode* catchNode = cur->pn_head; catchNode; catchNode = catchNode->pn_next) {
+                MOZ_ASSERT(catchNode->isKind(PNK_LEXICALSCOPE));
+                MOZ_ASSERT(catchNode->expr()->isKind(PNK_CATCH));
+                MOZ_ASSERT(catchNode->expr()->isArity(PN_TERNARY));
+                if (!resolve(catchNode->expr(), prefix))
+                    return false;
+            }
+            break;
+          }
+
+          case PNK_LABEL:
+          case PNK_DOT:
+            MOZ_ASSERT(cur->isArity(PN_NAME));
+            if (!resolve(cur->expr(), prefix))
+                return false;
+            break;
+
+          case PNK_LEXICALSCOPE:
+          case PNK_NAME:
+            MOZ_ASSERT(cur->isArity(PN_NAME));
+            if (!resolve(cur->maybeExpr(), prefix))
+                return false;
+            break;
+
+          case PNK_FUNCTION:
+            MOZ_ASSERT(cur->isArity(PN_CODE));
+            if (!resolve(cur->pn_body, prefix))
+                return false;
+            break;
+
+          // Kinds that should be handled by parent node resolution.
+
+          case PNK_IMPORT_SPEC: // by PNK_IMPORT_SPEC_LIST
+          case PNK_EXPORT_SPEC: // by PNK_EXPORT_SPEC_LIST
+          case PNK_CALLSITEOBJ: // by PNK_TAGGED_TEMPLATE
+          case PNK_CLASSNAMES:  // by PNK_CLASS
+            MOZ_CRASH("should have been handled by a parent node");
+
+          case PNK_LIMIT: // invalid sentinel value
+            MOZ_CRASH("invalid node kind");
         }
+
         nparents--;
         return true;
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/ParseNode.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/ParseNode.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/ParseNode.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/ParseNode.cpp	2015-05-25 20:43:06.000000000 +0000
@@ -266,7 +266,6 @@
       case PNK_MODASSIGN:
       // ...and a few others.
       case PNK_ELEM:
-      case PNK_LETEXPR:
       case PNK_IMPORT_SPEC:
       case PNK_EXPORT_SPEC:
       case PNK_COLON:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/ParseNode.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/ParseNode.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/ParseNode.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/ParseNode.h	2015-05-25 20:43:06.000000000 +0000
@@ -133,7 +133,6 @@
     F(LEXICALSCOPE) \
     F(LET) \
     F(LETBLOCK) \
-    F(LETEXPR) \
     F(IMPORT) \
     F(IMPORT_SPEC_LIST) \
     F(IMPORT_SPEC) \
@@ -277,15 +276,13 @@
  *                            PNK_FOROF (for-of) or PNK_FORHEAD (for(;;))
  *                          pn_right: body
  * PNK_FORIN    ternary     pn_kid1:  PNK_VAR to left of 'in', or nullptr
- *                            its pn_xflags may have PNX_POPVAR
- *                            bit set
+ *                            its pn_xflags may have PNX_POPVAR bit set
  *                          pn_kid2: PNK_NAME or destructuring expr
  *                            to left of 'in'; if pn_kid1, then this
  *                            is a clone of pn_kid1->pn_head
  *                          pn_kid3: object expr to right of 'in'
  * PNK_FOROF    ternary     pn_kid1:  PNK_VAR to left of 'of', or nullptr
- *                            its pn_xflags may have PNX_POPVAR
- *                            bit set
+ *                            its pn_xflags may have PNX_POPVAR bit set
  *                          pn_kid2: PNK_NAME or destructuring expr
  *                            to left of 'of'; if pn_kid1, then this
  *                            is a clone of pn_kid1->pn_head
@@ -363,15 +360,8 @@
  * PNK_LSH,     binary      pn_left: left-assoc SH expr, pn_right: ADD expr
  * PNK_RSH,
  * PNK_URSH
- * PNK_ADD      binary      pn_left: left-assoc ADD expr, pn_right: MUL expr
- *                          pn_xflags: if a left-associated binary PNK_ADD
- *                            tree has been flattened into a list (see above
- *                            under <Expressions>), pn_xflags will contain
- *                            PNX_STRCAT if at least one list element is a
- *                            string literal (PNK_STRING); if such a list has
- *                            any non-string, non-number term, pn_xflags will
- *                            contain PNX_CANTFOLD.
- * PNK_SUB      binary      pn_left: left-assoc SH expr, pn_right: ADD expr
+ * PNK_ADD,     binary      pn_left: left-assoc ADD expr, pn_right: MUL expr
+ * PNK_SUB
  * PNK_STAR,    binary      pn_left: left-assoc MUL expr, pn_right: UNARY expr
  * PNK_DIV,                 pn_op: JSOP_MUL, JSOP_DIV, JSOP_MOD
  * PNK_MOD
@@ -714,15 +704,14 @@
 /* PN_LIST pn_xflags bits. */
 #define PNX_POPVAR      0x01            /* PNK_VAR or PNK_CONST last result
                                            needs popping */
-#define PNX_GROUPINIT   0x02            /* var [a, b] = [c, d]; unit list */
-#define PNX_FUNCDEFS    0x04            /* contains top-level function statements */
-#define PNX_SETCALL     0x08            /* call expression in lvalue context */
-#define PNX_DESTRUCT    0x10            /* code evaluating destructuring
+#define PNX_FUNCDEFS    0x02            /* contains top-level function statements */
+#define PNX_SETCALL     0x04            /* call expression in lvalue context */
+#define PNX_DESTRUCT    0x08            /* code evaluating destructuring
                                            arguments occurs before function body */
-#define PNX_SPECIALARRAYINIT 0x20       /* one or more of
+#define PNX_ARRAYHOLESPREAD 0x10        /* one or more of
                                            1. array initialiser has holes
                                            2. array initializer has spread node */
-#define PNX_NONCONST    0x40            /* initialiser has non-constants */
+#define PNX_NONCONST    0x20            /* initialiser has non-constants */
 
     static_assert(PNX_NONCONST < (1 << NumListFlagBits), "Not enough bits");
 
@@ -1693,7 +1682,16 @@
     ParseStrictError
 };
 
-enum FunctionSyntaxKind { Expression, Statement, Arrow, Method };
+enum FunctionSyntaxKind
+{
+    Expression,
+    Statement,
+    Arrow,
+    Method,
+    ClassConstructor,
+    Getter,
+    Setter
+};
 
 static inline ParseNode*
 FunctionArgsList(ParseNode* fn, unsigned* numFormals)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/Parser.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/Parser.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/Parser.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/Parser.cpp	2015-05-25 20:43:06.000000000 +0000
@@ -698,8 +698,9 @@
      *   protected from the GC by a root or a stack frame reference.
      */
     Directives directives(options().strictOption);
-    GlobalSharedContext globalsc(context, directives, options().extraWarningsOption,
-                                 /* allowSuperProperty = */ false);
+    GlobalSharedContext globalsc(context, directives,
+                                 /* staticEvalScope = */ nullptr,
+                                 options().extraWarningsOption);
     ParseContext<ParseHandler> globalpc(this, /* parent = */ nullptr, ParseHandler::null(),
                                         &globalsc, /* newDirectives = */ nullptr,
                                         /* staticLevel = */ 0, /* bodyid = */ 0,
@@ -1214,27 +1215,39 @@
     MOZ_ASSERT_IF(kind == Statement, atom != nullptr);
 
     RootedFunction fun(context);
-    
+
+    gc::AllocKind allocKind = gc::AllocKind::FUNCTION;
     JSFunction::Flags flags;
-    switch(kind) {
+    switch (kind) {
       case Expression:
         flags = JSFunction::INTERPRETED_LAMBDA;
         break;
       case Arrow:
         flags = JSFunction::INTERPRETED_LAMBDA_ARROW;
+        allocKind = gc::AllocKind::FUNCTION_EXTENDED;
         break;
       case Method:
         flags = JSFunction::INTERPRETED_METHOD;
+        allocKind = gc::AllocKind::FUNCTION_EXTENDED;
+        break;
+      case ClassConstructor:
+        flags = JSFunction::INTERPRETED_CLASS_CONSTRUCTOR;
+        allocKind = gc::AllocKind::FUNCTION_EXTENDED;
+        break;
+      case Getter:
+        flags = JSFunction::INTERPRETED_GETTER;
+        allocKind = gc::AllocKind::FUNCTION_EXTENDED;
+        break;
+      case Setter:
+        flags = JSFunction::INTERPRETED_SETTER;
+        allocKind = gc::AllocKind::FUNCTION_EXTENDED;
         break;
       default:
-        flags = JSFunction::INTERPRETED;
+        flags = JSFunction::INTERPRETED_NORMAL;
         break;
     }
 
-    gc::AllocKind allocKind = gc::AllocKind::FUNCTION;
-    if (kind == Arrow || kind == Method)
-        allocKind = gc::AllocKind::FUNCTION_EXTENDED;
-    fun = NewFunctionWithProto(context, nullptr, 0, flags, NullPtr(), atom, proto,
+    fun = NewFunctionWithProto(context, nullptr, 0, flags, nullptr, atom, proto,
                                allocKind, TenuredObject);
     if (!fun)
         return nullptr;
@@ -1556,7 +1569,7 @@
 template <typename ParseHandler>
 bool
 Parser<ParseHandler>::functionArguments(YieldHandling yieldHandling, FunctionSyntaxKind kind,
-                                        FunctionType type, Node* listp, Node funcpn, bool* hasRest)
+                                        Node* listp, Node funcpn, bool* hasRest)
 {
     FunctionBox* funbox = pc->sc->asFunctionBox();
 
@@ -1604,9 +1617,9 @@
         bool hasDefaults = false;
         Node duplicatedArg = null();
         Node list = null();
-        bool disallowDuplicateArgs = kind == Arrow || kind == Method;
+        bool disallowDuplicateArgs = kind == Arrow || kind == Method || kind == ClassConstructor;
 
-        if (type == Getter) {
+        if (kind == Getter) {
             report(ParseError, false, null(), JSMSG_ACCESSOR_WRONG_ARGS, "getter", "no", "s");
             return false;
         }
@@ -1689,7 +1702,7 @@
 
               case TOK_TRIPLEDOT:
               {
-                if (type == Setter) {
+                if (kind == Setter) {
                     report(ParseError, false, null(),
                            JSMSG_ACCESSOR_WRONG_ARGS, "setter", "one", "");
                     return false;
@@ -1766,7 +1779,7 @@
                 return false;
             }
 
-            if (parenFreeArrow || type == Setter)
+            if (parenFreeArrow || kind == Setter)
                 break;
 
             bool matched;
@@ -1781,7 +1794,7 @@
             if (!tokenStream.getToken(&tt))
                 return false;
             if (tt != TOK_RP) {
-                if (type == Setter) {
+                if (kind == Setter) {
                     report(ParseError, false, null(),
                            JSMSG_ACCESSOR_WRONG_ARGS, "setter", "one", "");
                     return false;
@@ -1794,7 +1807,7 @@
 
         if (!hasDefaults)
             funbox->length = pc->numArgs() - *hasRest;
-    } else if (type == Setter) {
+    } else if (kind == Setter) {
         report(ParseError, false, null(), JSMSG_ACCESSOR_WRONG_ARGS, "setter", "one", "");
         return false;
     }
@@ -1958,7 +1971,8 @@
         // while LazyScript::{begin,end} offsets are relative to the outermost
         // script source.
         uint32_t userbufBase = lazyOuter->begin() - lazyOuter->column();
-        tokenStream.advance(fun->lazyScript()->end() - userbufBase);
+        if (!tokenStream.advance(fun->lazyScript()->end() - userbufBase))
+            return false;
 
         *pbodyProcessed = true;
         return true;
@@ -2149,9 +2163,8 @@
 template <typename ParseHandler>
 typename ParseHandler::Node
 Parser<ParseHandler>::functionDef(InHandling inHandling, YieldHandling yieldHandling,
-                                  HandlePropertyName funName, FunctionType type,
-                                  FunctionSyntaxKind kind, GeneratorKind generatorKind,
-                                  InvokedPrediction invoked)
+                                  HandlePropertyName funName, FunctionSyntaxKind kind,
+                                  GeneratorKind generatorKind, InvokedPrediction invoked)
 {
     MOZ_ASSERT_IF(kind == Statement, funName);
 
@@ -2195,7 +2208,7 @@
     tokenStream.tell(&start);
 
     while (true) {
-        if (functionArgsAndBody(inHandling, pn, fun, type, kind, generatorKind, directives,
+        if (functionArgsAndBody(inHandling, pn, fun, kind, generatorKind, directives,
                                 &newDirectives))
         {
             break;
@@ -2303,8 +2316,8 @@
 template <>
 bool
 Parser<FullParseHandler>::functionArgsAndBody(InHandling inHandling, ParseNode* pn,
-                                              HandleFunction fun, FunctionType type,
-                                              FunctionSyntaxKind kind, GeneratorKind generatorKind,
+                                              HandleFunction fun, FunctionSyntaxKind kind,
+                                              GeneratorKind generatorKind,
                                               Directives inheritedDirectives,
                                               Directives* newDirectives)
 {
@@ -2344,8 +2357,7 @@
                 return false;
 
             if (!parser->functionArgsAndBodyGeneric(inHandling, yieldHandling,
-                                                    SyntaxParseHandler::NodeGeneric, fun, type,
-                                                    kind))
+                                                    SyntaxParseHandler::NodeGeneric, fun, kind))
             {
                 if (parser->hadAbortedSyntaxParse()) {
                     // Try again with a full parse.
@@ -2383,7 +2395,7 @@
     if (!funpc.init(tokenStream))
         return false;
 
-    if (!functionArgsAndBodyGeneric(inHandling, yieldHandling, pn, fun, type, kind))
+    if (!functionArgsAndBodyGeneric(inHandling, yieldHandling, pn, fun, kind))
         return false;
 
     if (!leaveFunction(pn, outerpc, kind))
@@ -2404,7 +2416,7 @@
 template <>
 bool
 Parser<SyntaxParseHandler>::functionArgsAndBody(InHandling inHandling, Node pn, HandleFunction fun,
-                                                FunctionType type, FunctionSyntaxKind kind,
+                                                FunctionSyntaxKind kind,
                                                 GeneratorKind generatorKind,
                                                 Directives inheritedDirectives,
                                                 Directives* newDirectives)
@@ -2424,7 +2436,7 @@
         return false;
 
     YieldHandling yieldHandling = generatorKind != NotGenerator ? YieldIsKeyword : YieldIsName;
-    if (!functionArgsAndBodyGeneric(inHandling, yieldHandling, pn, fun, type, kind))
+    if (!functionArgsAndBodyGeneric(inHandling, yieldHandling, pn, fun, kind))
         return false;
 
     if (!leaveFunction(pn, outerpc, kind))
@@ -2486,8 +2498,16 @@
         return null();
 
     YieldHandling yieldHandling = generatorKind != NotGenerator ? YieldIsKeyword : YieldIsName;
-    FunctionSyntaxKind syntaxKind = fun->isMethod() ? Method : Statement;
-    if (!functionArgsAndBodyGeneric(InAllowed, yieldHandling, pn, fun, Normal, syntaxKind)) {
+    FunctionSyntaxKind syntaxKind = Statement;
+    if (fun->isClassConstructor())
+        syntaxKind = ClassConstructor;
+    else if (fun->isMethod())
+        syntaxKind = Method;
+    else if (fun->isGetter())
+        syntaxKind = Getter;
+    else if (fun->isSetter())
+        syntaxKind = Setter;
+    if (!functionArgsAndBodyGeneric(InAllowed, yieldHandling, pn, fun, syntaxKind)) {
         MOZ_ASSERT(directives == newDirectives);
         return null();
     }
@@ -2515,8 +2535,7 @@
 bool
 Parser<ParseHandler>::functionArgsAndBodyGeneric(InHandling inHandling,
                                                  YieldHandling yieldHandling, Node pn,
-                                                 HandleFunction fun, FunctionType type,
-                                                 FunctionSyntaxKind kind)
+                                                 HandleFunction fun, FunctionSyntaxKind kind)
 {
     // Given a properly initialized parse context, try to parse an actual
     // function without concern for conversion to strict mode, use of lazy
@@ -2524,7 +2543,7 @@
 
     Node prelude = null();
     bool hasRest;
-    if (!functionArguments(yieldHandling, kind, type, &prelude, pn, &hasRest))
+    if (!functionArguments(yieldHandling, kind, &prelude, pn, &hasRest))
         return false;
 
     FunctionBox* funbox = pc->sc->asFunctionBox();
@@ -2549,7 +2568,7 @@
     if (!tokenStream.getToken(&tt, TokenStream::Operand))
         return false;
     if (tt != TOK_LC) {
-        if (funbox->isStarGenerator()) {
+        if (funbox->isStarGenerator() || kind == Method || kind == ClassConstructor) {
             report(ParseError, false, null(), JSMSG_CURLY_BEFORE_BODY);
             return false;
         }
@@ -2574,8 +2593,11 @@
     if (!body)
         return false;
 
-    if (kind != Method && fun->name() && !checkStrictBinding(fun->name(), pn))
+    if ((kind != Method && kind != ClassConstructor) && fun->name() &&
+        !checkStrictBinding(fun->name(), pn))
+    {
         return false;
+    }
 
     if (bodyType == StatementListBody) {
         bool matched;
@@ -2648,7 +2670,7 @@
         !report(ParseStrictError, pc->sc->strict(), null(), JSMSG_STRICT_FUNCTION_STATEMENT))
         return null();
 
-    return functionDef(InAllowed, yieldHandling, name, Normal, Statement, generatorKind);
+    return functionDef(InAllowed, yieldHandling, name, Statement, generatorKind);
 }
 
 template <typename ParseHandler>
@@ -2680,7 +2702,7 @@
     }
 
     YieldHandling yieldHandling = generatorKind != NotGenerator ? YieldIsKeyword : YieldIsName;
-    return functionDef(InAllowed, yieldHandling, name, Normal, Expression, generatorKind, invoked);
+    return functionDef(InAllowed, yieldHandling, name, Expression, generatorKind, invoked);
 }
 
 /*
@@ -2969,8 +2991,8 @@
 }
 
 /*
- * Define a lexical binding in a block, let-expression, or comprehension scope. pc
- * must already be in such a scope.
+ * Define a lexical binding in a block, or comprehension scope. pc must
+ * already be in such a scope.
  *
  * Throw a SyntaxError if 'atom' is an invalid name. Otherwise create a
  * property for the new variable on the block object, pc->staticScope;
@@ -3660,14 +3682,13 @@
 }
 
 /*
- * Parse a let block statement or let expression (determined by 'letContext').
+ * Parse a let block statement.
  * In both cases, bindings are not hoisted to the top of the enclosing block
  * and thus must be carefully injected between variables() and the let body.
  */
 template <typename ParseHandler>
 typename ParseHandler::Node
-Parser<ParseHandler>::deprecatedLetBlockOrExpression(YieldHandling yieldHandling,
-                                                     LetContext letContext)
+Parser<ParseHandler>::deprecatedLetBlock(YieldHandling yieldHandling)
 {
     MOZ_ASSERT(tokenStream.isCurrentTokenType(TOK_LET));
 
@@ -3690,82 +3711,22 @@
     if (!block)
         return null();
 
-    bool needExprStmt = false;
-    if (letContext == LetStatement) {
-        bool matched;
-        if (!tokenStream.matchToken(&matched, TOK_LC, TokenStream::Operand))
-            return null();
-        if (!matched) {
-            /*
-             * Strict mode eliminates a grammar ambiguity with unparenthesized
-             * LetExpressions in an ExpressionStatement. If followed immediately
-             * by an arguments list, it's ambiguous whether the let expression
-             * is the callee or the call is inside the let expression body.
-             *
-             *   function id(x) { return x; }
-             *   var x = "outer";
-             *   // Does this parse as
-             *   //   (let (loc = "inner") id)(loc) // "outer"
-             *   // or as
-             *   //   let (loc = "inner") (id(loc)) // "inner"
-             *   let (loc = "inner") id(loc);
-             *
-             * See bug 569464.
-             */
-            if (!reportWithOffset(ParseStrictError, pc->sc->strict(), begin,
-                                  JSMSG_STRICT_CODE_LET_EXPR_STMT))
-            {
-                return null();
-            }
+    MUST_MATCH_TOKEN(TOK_LC, JSMSG_CURLY_BEFORE_LET);
 
-            /*
-             * If this is really an expression in let statement guise, then we
-             * need to wrap the PNK_LETEXPR node in a PNK_SEMI node so that we
-             * pop the return value of the expression.
-             */
-            needExprStmt = true;
-            letContext = LetExpression;
-        }
-    }
-
-    Node expr;
-    if (letContext == LetStatement) {
-        expr = statements(yieldHandling);
-        if (!expr)
-            return null();
-        MUST_MATCH_TOKEN(TOK_RC, JSMSG_CURLY_AFTER_LET);
+    Node expr = statements(yieldHandling);
+    if (!expr)
+        return null();
+    MUST_MATCH_TOKEN(TOK_RC, JSMSG_CURLY_AFTER_LET);
 
-        addTelemetry(JSCompartment::DeprecatedLetBlock);
-        if (!report(ParseWarning, pc->sc->strict(), expr, JSMSG_DEPRECATED_LET_BLOCK))
-            return null();
-    } else {
-        MOZ_ASSERT(letContext == LetExpression);
-        expr = assignExpr(InAllowed, yieldHandling);
-        if (!expr)
-            return null();
+    addTelemetry(JSCompartment::DeprecatedLetBlock);
+    if (!report(ParseWarning, pc->sc->strict(), expr, JSMSG_DEPRECATED_LET_BLOCK))
+        return null();
 
-        addTelemetry(JSCompartment::DeprecatedLetExpression);
-        if (!report(ParseWarning, pc->sc->strict(), expr, JSMSG_DEPRECATED_LET_EXPRESSION))
-            return null();
-    }
     handler.setLexicalScopeBody(block, expr);
     PopStatementPC(tokenStream, pc);
 
     TokenPos letPos(begin, pos().end);
 
-    if (letContext == LetExpression) {
-        if (needExprStmt) {
-            if (!MatchOrInsertSemicolon(tokenStream))
-                return null();
-        }
-
-        Node letExpr = handler.newLetExpression(vars, block, letPos);
-        if (!letExpr)
-            return null();
-
-        return needExprStmt ? handler.newExprStatement(letExpr, pos().end) : letExpr;
-    }
-
     return handler.newLetBlock(vars, block, letPos);
 }
 
@@ -3924,12 +3885,26 @@
                 if (!init)
                     return null();
 
+                // Ban the nonsensical |for (var V = E1 in E2);| where V is a
+                // destructuring pattern.  See bug 1164741 for background.
+                if (pc->parsingForInit && kind == PNK_VAR) {
+                    TokenKind afterInit;
+                    if (!tokenStream.peekToken(&afterInit))
+                        return null();
+                    if (afterInit == TOK_IN) {
+                        report(ParseError, false, init, JSMSG_INVALID_FOR_INOF_DECL_WITH_INIT,
+                               "in");
+                        return null();
+                    }
+                }
+
                 if (!bindBeforeInitializer && !checkDestructuring(&data, pn2))
                     return null();
 
                 pn2 = handler.newBinary(PNK_ASSIGN, pn2, init);
                 if (!pn2)
                     return null();
+
                 handler.addList(pn, pn2);
                 break;
             }
@@ -3977,11 +3952,34 @@
                 if (!init)
                     return null();
 
-                if (!bindBeforeInitializer && !data.binder(&data, name, this))
-                    return null();
+                // Ignore an initializer if we have a for-in loop declaring a
+                // |var| with an initializer: |for (var v = ... in ...);|.
+                // Warn that this syntax is invalid so that developers looking
+                // in the console know to fix this.  ES<6 permitted the
+                // initializer while ES6 doesn't; ignoring it seems the best
+                // way to incrementally move to ES6 semantics.
+                bool performAssignment = true;
+                if (pc->parsingForInit && kind == PNK_VAR) {
+                    TokenKind afterInit;
+                    if (!tokenStream.peekToken(&afterInit))
+                        return null();
+                    if (afterInit == TOK_IN) {
+                        performAssignment = false;
+                        if (!report(ParseWarning, pc->sc->strict(), init,
+                                    JSMSG_INVALID_FOR_INOF_DECL_WITH_INIT, "in"))
+                        {
+                            return null();
+                        }
+                    }
+                }
 
-                if (!handler.finishInitializerAssignment(pn2, init, data.op))
-                    return null();
+                if (performAssignment) {
+                    if (!bindBeforeInitializer && !data.binder(&data, name, this))
+                        return null();
+
+                    if (!handler.finishInitializerAssignment(pn2, init, data.op))
+                        return null();
+                }
             } else {
                 if (data.isConst && !pc->parsingForInit) {
                     report(ParseError, false, null(), JSMSG_BAD_CONST_DECL);
@@ -4185,24 +4183,17 @@
 {
     handler.disableSyntaxParser();
 
-    /* Check for a let statement or let expression. */
+    /* Check for a let statement. */
     TokenKind tt;
     if (!tokenStream.peekToken(&tt))
         return null();
     if (tt == TOK_LP) {
-        ParseNode* node =
-            deprecatedLetBlockOrExpression(yieldHandling, LetStatement);
+        ParseNode* node = deprecatedLetBlock(yieldHandling);
         if (!node)
             return nullptr;
 
-        if (node->isKind(PNK_LETBLOCK)) {
-            MOZ_ASSERT(node->isArity(PN_BINARY));
-        } else {
-            MOZ_ASSERT(node->isKind(PNK_SEMI));
-            MOZ_ASSERT(node->pn_kid->isKind(PNK_LETEXPR));
-            MOZ_ASSERT(node->pn_kid->isArity(PN_BINARY));
-        }
-
+        MOZ_ASSERT(node->isKind(PNK_LETBLOCK));
+        MOZ_ASSERT(node->isArity(PN_BINARY));
         return node;
     }
 
@@ -4693,8 +4684,7 @@
     MUST_MATCH_TOKEN(TOK_LP, JSMSG_PAREN_AFTER_FOR);
 
     /*
-     * True if we have 'for (var/let/const ...)', except in the oddball case
-     * where 'let' begins a let-expression in 'for (let (...) ...)'.
+     * True if we have 'for (var/let/const ...)'.
      */
     bool isForDecl = false;
 
@@ -4733,19 +4723,13 @@
                 handler.disableSyntaxParser();
                 bool constDecl = tt == TOK_CONST;
                 tokenStream.consumeKnownToken(tt);
-                if (!tokenStream.peekToken(&tt))
+                isForDecl = true;
+                blockObj = StaticBlockObject::create(context);
+                if (!blockObj)
                     return null();
-                if (tt == TOK_LP) {
-                    pn1 = deprecatedLetBlockOrExpression(yieldHandling, LetExpression);
-                } else {
-                    isForDecl = true;
-                    blockObj = StaticBlockObject::create(context);
-                    if (!blockObj)
-                        return null();
-                    pn1 = variables(yieldHandling,
-                                    constDecl ? PNK_CONST : PNK_LET, nullptr, blockObj,
-                                    DontHoistVars);
-                }
+                pn1 = variables(yieldHandling,
+                                constDecl ? PNK_CONST : PNK_LET, nullptr, blockObj,
+                                DontHoistVars);
             } else {
                 pn1 = expr(InProhibited, yieldHandling);
             }
@@ -4865,8 +4849,14 @@
         if (isForDecl) {
             pn2 = pn1->pn_head;
             if ((pn2->isKind(PNK_NAME) && pn2->maybeExpr()) || pn2->isKind(PNK_ASSIGN)) {
-                // We have a bizarre |for (var/const/let x = ... in/of ...)|
-                // loop erroneously permitted by ES1-5 but removed in ES6.
+                MOZ_ASSERT(!(headKind == PNK_FORIN && pn1->isKind(PNK_VAR)),
+                           "Parser::variables should have ignored the "
+                           "initializer in the ES5-sanctioned, ES6-prohibited "
+                           "|for (var ... = ... in ...)| syntax");
+
+                // Otherwise, this bizarre |for (const/let x = ... in/of ...)|
+                // loop isn't valid ES6 and has never been permitted in
+                // SpiderMonkey.
                 report(ParseError, false, pn2, JSMSG_INVALID_FOR_INOF_DECL_WITH_INIT,
                        headKind == PNK_FOROF ? "of" : "in");
                 return null();
@@ -6575,7 +6565,7 @@
         if (!tokenStream.peekToken(&ignored))
             return null();
 
-        return functionDef(inHandling, yieldHandling, NullPtr(), Normal, Arrow, NotGenerator);
+        return functionDef(inHandling, yieldHandling, nullptr, Arrow, NotGenerator);
       }
 
       default:
@@ -6990,9 +6980,7 @@
 // The one remaining thing to patch up is the block scope depth.  We need to
 // compute the maximum block scope depth of a function, so we know how much
 // space to reserve in the fixed part of a stack frame.  Normally this is done
-// whenever we leave a statement, via AccumulateBlockScopeDepth.  However if the
-// head has a let expression, we need to re-assign that depth to the tail of the
-// comprehension.
+// whenever we leave a statement, via AccumulateBlockScopeDepth.
 //
 // Thing is, we don't actually know what that depth is, because the only
 // information we keep is the maximum nested depth within a statement, so we
@@ -7065,10 +7053,9 @@
          * the comprehension's block scope. We allocate that id or one above it
          * here, by calling PushLexicalScope.
          *
-         * In the case of a comprehension expression that has nested blocks
-         * (e.g., let expressions), we will allocate a higher blockid but then
-         * slide all blocks "to the right" to make room for the comprehension's
-         * block scope.
+         * In the case of a comprehension expression that has nested blocks,
+         * we will allocate a higher blockid but then slide all blocks "to the
+         * right" to make room for the comprehension's block scope.
          */
         adjust = pc->blockid();
         pn = pushLexicalScope(&stmtInfo);
@@ -7353,7 +7340,7 @@
             return null();
     }
 
-    RootedFunction fun(context, newFunction(/* atom = */ NullPtr(), Expression, proto));
+    RootedFunction fun(context, newFunction(/* atom = */ nullptr, Expression, proto));
     if (!fun)
         return null();
 
@@ -7806,7 +7793,7 @@
                 sc->asFunctionBox()->setNeedsHomeObject();
             return true;
         } else if (sc->isFunctionBox() && !sc->asFunctionBox()->function()->isArrow()) {
-            // super is not legal is normal functions.
+            // super is not legal in normal functions.
             break;
         }
     }
@@ -7938,7 +7925,7 @@
 
                     // If we're in a method, mark the method as requiring
                     // support for 'super', since direct eval code can use it.
-                    // (If we're not in a method, that's fine, so ignore the 
+                    // (If we're not in a method, that's fine, so ignore the
                     // return value.)
                     checkAndMarkSuperScope();
                 }
@@ -8156,9 +8143,10 @@
          *
          *   [i * j for (i in o) for (j in p) if (i != j)]
          *
-         * translates to roughly the following let expression:
+         * translates to roughly the following code:
          *
-         *   let (array = new Array, i, j) {
+         *   {
+         *     let array = new Array, i, j;
          *     for (i in o) let {
          *       for (j in p)
          *         if (i != j)
@@ -8297,6 +8285,7 @@
 
         JSOp op = JSOP_INITPROP;
         Node propname;
+        bool isConstructor = false;
         switch (ltok) {
           case TOK_NUMBER:
             atom = DoubleToAtom(context, tokenStream.currentToken().number());
@@ -8423,6 +8412,7 @@
                     return null();
                 }
                 seenConstructor = true;
+                isConstructor = true;
             } else if (isStatic && atom == context->names().prototype) {
                 report(ParseError, false, propname, JSMSG_BAD_METHOD_DEF);
                 return null();
@@ -8498,7 +8488,8 @@
                     return null();
             } else if (tt == TOK_LP) {
                 tokenStream.ungetToken();
-                if (!methodDefinition(yieldHandling, type, propList, propname, Normal,
+                if (!methodDefinition(yieldHandling, type, propList, propname,
+                                      isConstructor ? ClassConstructor : Method,
                                       isGenerator ? StarGenerator : NotGenerator, isStatic, op))
                 {
                     return null();
@@ -8542,17 +8533,18 @@
 template <typename ParseHandler>
 bool
 Parser<ParseHandler>::methodDefinition(YieldHandling yieldHandling, PropListType listType,
-                                       Node propList, Node propname, FunctionType type,
+                                       Node propList, Node propname, FunctionSyntaxKind kind,
                                        GeneratorKind generatorKind, bool isStatic, JSOp op)
 {
+    MOZ_ASSERT(kind == Method || kind == ClassConstructor || kind == Getter || kind == Setter);
     /* NB: Getter function in { get x(){} } is unnamed. */
     RootedPropertyName funName(context);
-    if (type == Normal && tokenStream.isCurrentTokenType(TOK_NAME))
+    if ((kind == Method || kind == ClassConstructor) && tokenStream.isCurrentTokenType(TOK_NAME))
         funName = tokenStream.currentName();
     else
         funName = nullptr;
 
-    Node fn = functionDef(InAllowed, yieldHandling, funName, type, Method, generatorKind);
+    Node fn = functionDef(InAllowed, yieldHandling, funName, kind, generatorKind);
     if (!fn)
         return false;
 
@@ -8584,9 +8576,6 @@
       case TOK_LC:
         return propertyList(yieldHandling, ObjectLiteral);
 
-      case TOK_LET:
-        return deprecatedLetBlockOrExpression(yieldHandling, LetExpression);
-
       case TOK_LP: {
         TokenKind next;
         if (!tokenStream.peekToken(&next, TokenStream::Operand))
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/Parser.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/Parser.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/Parser.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/Parser.h	2015-05-25 20:43:06.000000000 +0000
@@ -326,9 +326,7 @@
 
 class CompExprTransplanter;
 
-enum LetContext { LetExpression, LetStatement };
 enum VarContext { HoistVars, DontHoistVars };
-enum FunctionType { Getter, Setter, Normal };
 enum PropListType { ObjectLiteral, ClassBody };
 
 // Specify a value for an ES6 grammar parametrization.  We have no enum for
@@ -504,8 +502,7 @@
                       FunctionBodyType type);
 
     bool functionArgsAndBodyGeneric(InHandling inHandling, YieldHandling yieldHandling, Node pn,
-                                    HandleFunction fun, FunctionType type,
-                                    FunctionSyntaxKind kind);
+                                    HandleFunction fun, FunctionSyntaxKind kind);
 
     // Determine whether |yield| is a valid name in the current context, or
     // whether it's prohibited due to strictness, JS version, or occurrence
@@ -594,19 +591,19 @@
     bool checkAndMarkSuperScope();
 
     bool methodDefinition(YieldHandling yieldHandling, PropListType listType, Node propList,
-                          Node propname, FunctionType type, GeneratorKind generatorKind,
+                          Node propname, FunctionSyntaxKind kind, GeneratorKind generatorKind,
                           bool isStatic, JSOp Op);
 
     /*
      * Additional JS parsers.
      */
-    bool functionArguments(YieldHandling yieldHandling, FunctionSyntaxKind kind, FunctionType type,
-                           Node* list, Node funcpn, bool* hasRest);
+    bool functionArguments(YieldHandling yieldHandling, FunctionSyntaxKind kind, Node* list,
+                           Node funcpn, bool* hasRest);
 
     Node functionDef(InHandling inHandling, YieldHandling uieldHandling, HandlePropertyName name,
-                     FunctionType type, FunctionSyntaxKind kind, GeneratorKind generatorKind,
+                     FunctionSyntaxKind kind, GeneratorKind generatorKind,
                      InvokedPrediction invoked = PredictUninvoked);
-    bool functionArgsAndBody(InHandling inHandling, Node pn, HandleFunction fun, FunctionType type,
+    bool functionArgsAndBody(InHandling inHandling, Node pn, HandleFunction fun,
                              FunctionSyntaxKind kind, GeneratorKind generatorKind,
                              Directives inheritedDirectives, Directives* newDirectives);
 
@@ -631,7 +628,7 @@
     Node generatorComprehension(uint32_t begin);
 
     bool argumentList(YieldHandling yieldHandling, Node listNode, bool* isSpread);
-    Node deprecatedLetBlockOrExpression(YieldHandling yieldHandling, LetContext letContext);
+    Node deprecatedLetBlock(YieldHandling yieldHandling);
     Node destructuringExpr(YieldHandling yieldHandling, BindData<ParseHandler>* data,
                            TokenKind tt);
     Node destructuringExprWithoutYield(YieldHandling yieldHandling, BindData<ParseHandler>* data,
@@ -696,7 +693,6 @@
     bool checkDestructuringObject(BindData<ParseHandler>* data, Node objectPattern);
     bool checkDestructuringArray(BindData<ParseHandler>* data, Node arrayPattern);
     bool bindInitialized(BindData<ParseHandler>* data, Node pn);
-    bool bindDestructuringLHS(Node pn);
     bool makeSetCall(Node pn, unsigned msg);
     Node cloneDestructuringDefault(Node opn);
     Node cloneLeftHandSide(Node opn);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/Parser-inl.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/Parser-inl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/Parser-inl.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/Parser-inl.h	2015-05-25 20:43:06.000000000 +0000
@@ -21,7 +21,12 @@
     if (!frontend::GenerateBlockId(ts, this, this->bodyid))
         return false;
 
-    return decls_.init() && lexdeps.ensureMap(sc->context);
+    if (!decls_.init() || !lexdeps.ensureMap(sc->context)) {
+        ReportOutOfMemory(sc->context);
+        return false;
+    }
+
+    return true;
 }
 
 template <typename ParseHandler>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/SharedContext.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/SharedContext.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/SharedContext.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/SharedContext.h	2015-05-25 20:43:06.000000000 +0000
@@ -198,6 +198,7 @@
     virtual ObjectBox* toObjectBox() = 0;
     inline bool isFunctionBox() { return toObjectBox() && toObjectBox()->isFunctionBox(); }
     inline FunctionBox* asFunctionBox();
+    inline GlobalSharedContext* asGlobalSharedContext();
 
     bool hasExplicitUseStrict()        const { return anyCxFlags.hasExplicitUseStrict; }
     bool bindingsAccessedDynamically() const { return anyCxFlags.bindingsAccessedDynamically; }
@@ -235,17 +236,30 @@
 class GlobalSharedContext : public SharedContext
 {
   private:
-    bool allowSuperProperty_;
+    Handle<StaticEvalObject*> staticEvalScope_;
 
   public:
     GlobalSharedContext(ExclusiveContext* cx,
-                        Directives directives, bool extraWarnings, bool allowSuperProperty)
+                        Directives directives, Handle<StaticEvalObject*> staticEvalScope,
+                        bool extraWarnings)
       : SharedContext(cx, directives, extraWarnings),
-        allowSuperProperty_(allowSuperProperty)
+        staticEvalScope_(staticEvalScope)
     {}
 
     ObjectBox* toObjectBox() { return nullptr; }
-    bool allowSuperProperty() const { return allowSuperProperty_; }
+    HandleObject evalStaticScope() const { return staticEvalScope_; }
+
+    bool allowSuperProperty() const {
+        StaticScopeIter<CanGC> it(context, staticEvalScope_);
+        for (; !it.done(); it++) {
+            if (it.type() == StaticScopeIter<CanGC>::Function &&
+                !it.fun().isArrow())
+            {
+                return it.fun().allowSuperProperty();
+            }
+        }
+        return false;
+    }
 };
 
 class FunctionBox : public ObjectBox, public SharedContext
@@ -306,7 +320,7 @@
     void setArgumentsHasLocalBinding()     { funCxFlags.argumentsHasLocalBinding = true; }
     void setDefinitelyNeedsArgsObj()       { MOZ_ASSERT(funCxFlags.argumentsHasLocalBinding);
                                              funCxFlags.definitelyNeedsArgsObj   = true; }
-    void setNeedsHomeObject()              { MOZ_ASSERT(function()->isMethod());
+    void setNeedsHomeObject()              { MOZ_ASSERT(allowSuperProperty());
                                              funCxFlags.needsHomeObject          = true; }
 
     bool hasDefaults() const {
@@ -339,7 +353,7 @@
     }
 
     bool allowSuperProperty() const {
-        return function()->isMethod();
+        return function()->allowSuperProperty();
     }
 };
 
@@ -350,6 +364,13 @@
     return static_cast<FunctionBox*>(this);
 }
 
+inline GlobalSharedContext*
+SharedContext::asGlobalSharedContext()
+{
+    MOZ_ASSERT(!isFunctionBox());
+    return static_cast<GlobalSharedContext*>(this);
+}
+
 // In generators, we treat all locals as aliased so that they get stored on the
 // heap.  This way there is less information to copy off the stack when
 // suspending, and back on when resuming.  It also avoids the need to create and
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/SyntaxParseHandler.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/SyntaxParseHandler.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/SyntaxParseHandler.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/SyntaxParseHandler.h	2015-05-25 20:43:06.000000000 +0000
@@ -258,10 +258,6 @@
     Node newLexicalScope(ObjectBox* blockbox) { return NodeGeneric; }
     void setLexicalScopeBody(Node block, Node body) {}
 
-    Node newLetExpression(Node vars, Node block, const TokenPos& pos) {
-        return NodeGeneric;
-    }
-
     Node newLetBlock(Node vars, Node block, const TokenPos& pos) {
         return NodeGeneric;
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/TokenStream.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/TokenStream.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/TokenStream.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/TokenStream.cpp	2015-05-25 20:43:06.000000000 +0000
@@ -162,7 +162,7 @@
     lineStartOffsets_.infallibleAppend(maxPtr);
 }
 
-MOZ_ALWAYS_INLINE void
+MOZ_ALWAYS_INLINE bool
 TokenStream::SourceCoords::add(uint32_t lineNum, uint32_t lineStartOffset)
 {
     uint32_t lineIndex = lineNumToIndex(lineNum);
@@ -171,21 +171,21 @@
     MOZ_ASSERT(lineStartOffsets_[0] == 0 && lineStartOffsets_[sentinelIndex] == MAX_PTR);
 
     if (lineIndex == sentinelIndex) {
-        // We haven't seen this newline before.  Update lineStartOffsets_.
-        // We ignore any failures due to OOM -- because we always have a
-        // sentinel node, it'll just be like the newline wasn't present.  I.e.
-        // the line numbers will be wrong, but the code won't crash or anything
-        // like that.
-        lineStartOffsets_[lineIndex] = lineStartOffset;
-
+        // We haven't seen this newline before.  Update lineStartOffsets_
+        // only if lineStartOffsets_.append succeeds, to keep sentinel.
+        // Otherwise return false to tell TokenStream about OOM.
         uint32_t maxPtr = MAX_PTR;
-        (void)lineStartOffsets_.append(maxPtr);
+        if (!lineStartOffsets_.append(maxPtr))
+            return false;
 
+        lineStartOffsets_[lineIndex] = lineStartOffset;
     } else {
         // We have seen this newline before (and ungot it).  Do nothing (other
         // than checking it hasn't mysteriously changed).
-        MOZ_ASSERT(lineStartOffsets_[lineIndex] == lineStartOffset);
+        // This path can be executed after hitting OOM, so check lineIndex.
+        MOZ_ASSERT_IF(lineIndex < sentinelIndex, lineStartOffsets_[lineIndex] == lineStartOffset);
     }
+    return true;
 }
 
 MOZ_ALWAYS_INLINE bool
@@ -360,7 +360,8 @@
     prevLinebase = linebase;
     linebase = userbuf.offset();
     lineno++;
-    srcCoords.add(lineno, linebase);
+    if (!srcCoords.add(lineno, linebase))
+        flags.hitOOM = true;
 }
 
 MOZ_ALWAYS_INLINE void
@@ -493,7 +494,7 @@
     return start + n;
 }
 
-void
+bool
 TokenStream::advance(size_t position)
 {
     const char16_t* end = userbuf.rawCharPtrAt(position);
@@ -504,6 +505,11 @@
     cur->pos.begin = userbuf.offset();
     MOZ_MAKE_MEM_UNDEFINED(&cur->type, sizeof(cur->type));
     lookahead = 0;
+
+    if (flags.hitOOM)
+        return reportError(JSMSG_OUT_OF_MEMORY);
+
+    return true;
 }
 
 void
@@ -1631,6 +1637,9 @@
     MOZ_CRASH("should have jumped to |out| or |error|");
 
   out:
+    if (flags.hitOOM)
+        return reportError(JSMSG_OUT_OF_MEMORY);
+
     flags.isDirtyLine = true;
     tp->pos.end = userbuf.offset();
     MOZ_ASSERT(IsTokenSane(tp));
@@ -1638,6 +1647,9 @@
     return true;
 
   error:
+    if (flags.hitOOM)
+        return reportError(JSMSG_OUT_OF_MEMORY);
+
     flags.isDirtyLine = true;
     tp->pos.end = userbuf.offset();
     MOZ_MAKE_MEM_UNDEFINED(&tp->type, sizeof(tp->type));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/TokenStream.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/TokenStream.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/frontend/TokenStream.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/frontend/TokenStream.h	2015-05-25 20:43:06.000000000 +0000
@@ -351,9 +351,10 @@
         bool sawOctalEscape:1;  // Saw an octal character escape.
         bool hadError:1;        // Hit a syntax error, at start or during a
                                 // token.
+        bool hitOOM:1;          // Hit OOM.
 
         Flags()
-          : isEOF(), isDirtyLine(), sawOctalEscape(), hadError()
+          : isEOF(), isDirtyLine(), sawOctalEscape(), hadError(), hitOOM()
         {}
     };
 
@@ -435,10 +436,15 @@
         // it's the same as the line that the current token ends on, that's a
         // stronger condition than what we are looking for, and we don't need
         // to return TOK_EOL.
-        if (lookahead != 0 && srcCoords.isOnThisLine(curr.pos.end, lineno)) {
-            MOZ_ASSERT(!flags.hadError);
-            *ttp = tokens[(cursor + 1) & ntokensMask].type;
-            return true;
+        if (lookahead != 0) {
+            bool onThisLine;
+            if (!srcCoords.isOnThisLine(curr.pos.end, lineno, &onThisLine))
+                return reportError(JSMSG_OUT_OF_MEMORY);
+            if (onThisLine) {
+                MOZ_ASSERT(!flags.hadError);
+                *ttp = tokens[(cursor + 1) & ntokensMask].type;
+                return true;
+            }
         }
 
         // The above check misses two cases where we don't have to return
@@ -525,7 +531,7 @@
         Token lookaheadTokens[maxLookahead];
     };
 
-    void advance(size_t position);
+    bool advance(size_t position);
     void tell(Position*);
     void seek(const Position& pos);
     bool seek(const Position& pos, const TokenStream& other);
@@ -626,14 +632,16 @@
       public:
         SourceCoords(ExclusiveContext* cx, uint32_t ln);
 
-        void add(uint32_t lineNum, uint32_t lineStartOffset);
+        bool add(uint32_t lineNum, uint32_t lineStartOffset);
         bool fill(const SourceCoords& other);
 
-        bool isOnThisLine(uint32_t offset, uint32_t lineNum) const {
+        bool isOnThisLine(uint32_t offset, uint32_t lineNum, bool* onThisLine) const {
             uint32_t lineIndex = lineNumToIndex(lineNum);
-            MOZ_ASSERT(lineIndex + 1 < lineStartOffsets_.length());  // +1 due to sentinel
-            return lineStartOffsets_[lineIndex] <= offset &&
-                   offset < lineStartOffsets_[lineIndex + 1];
+            if (lineIndex + 1 >= lineStartOffsets_.length()) // +1 due to sentinel
+                return false;
+            *onThisLine = lineStartOffsets_[lineIndex] <= offset &&
+                          offset < lineStartOffsets_[lineIndex + 1];
+            return true;
         }
 
         uint32_t lineNum(uint32_t offset) const;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Barrier.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Barrier.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Barrier.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Barrier.cpp	2015-05-25 20:43:06.000000000 +0000
@@ -50,6 +50,13 @@
     return js::TlsPerThreadData.get()->gcSweeping;
 }
 
+bool
+js::CurrentThreadIsHandlingInitFailure()
+{
+    JSRuntime* rt = js::TlsPerThreadData.get()->runtimeIfOnOwnerThread();
+    return rt && rt->handlingInitFailure;
+}
+
 #endif // DEBUG
 
 template <typename S>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Barrier.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Barrier.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Barrier.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Barrier.h	2015-05-25 20:43:06.000000000 +0000
@@ -104,7 +104,7 @@
  * reference them. The solution is to maintain information about these pointers,
  * and mark their targets when we start a minor collection.
  *
- * The pointers can be thoughs of as edges in object graph, and the set of edges
+ * The pointers can be thought of as edges in object graph, and the set of edges
  * from the tenured generation into the nursery is know as the remembered set.
  * Post barriers are used to track this remembered set.
  *
@@ -212,42 +212,13 @@
 
 bool
 CurrentThreadIsGCSweeping();
+
+bool
+CurrentThreadIsHandlingInitFailure();
 #endif
 
 namespace gc {
 
-template <typename T> struct MapTypeToTraceKind {};
-template <> struct MapTypeToTraceKind<NativeObject>     { static const JSGCTraceKind kind = JSTRACE_OBJECT; };
-template <> struct MapTypeToTraceKind<ArrayObject>      { static const JSGCTraceKind kind = JSTRACE_OBJECT; };
-template <> struct MapTypeToTraceKind<ArgumentsObject>  { static const JSGCTraceKind kind = JSTRACE_OBJECT; };
-template <> struct MapTypeToTraceKind<ArrayBufferObject>{ static const JSGCTraceKind kind = JSTRACE_OBJECT; };
-template <> struct MapTypeToTraceKind<ArrayBufferObjectMaybeShared>{ static const JSGCTraceKind kind = JSTRACE_OBJECT; };
-template <> struct MapTypeToTraceKind<ArrayBufferViewObject>{ static const JSGCTraceKind kind = JSTRACE_OBJECT; };
-template <> struct MapTypeToTraceKind<BaseShape>        { static const JSGCTraceKind kind = JSTRACE_BASE_SHAPE; };
-template <> struct MapTypeToTraceKind<DebugScopeObject> { static const JSGCTraceKind kind = JSTRACE_OBJECT; };
-template <> struct MapTypeToTraceKind<GlobalObject>     { static const JSGCTraceKind kind = JSTRACE_OBJECT; };
-template <> struct MapTypeToTraceKind<JS::Symbol>       { static const JSGCTraceKind kind = JSTRACE_SYMBOL; };
-template <> struct MapTypeToTraceKind<JSAtom>           { static const JSGCTraceKind kind = JSTRACE_STRING; };
-template <> struct MapTypeToTraceKind<JSFlatString>     { static const JSGCTraceKind kind = JSTRACE_STRING; };
-template <> struct MapTypeToTraceKind<JSFunction>       { static const JSGCTraceKind kind = JSTRACE_OBJECT; };
-template <> struct MapTypeToTraceKind<JSLinearString>   { static const JSGCTraceKind kind = JSTRACE_STRING; };
-template <> struct MapTypeToTraceKind<JSObject>         { static const JSGCTraceKind kind = JSTRACE_OBJECT; };
-template <> struct MapTypeToTraceKind<JSScript>         { static const JSGCTraceKind kind = JSTRACE_SCRIPT; };
-template <> struct MapTypeToTraceKind<JSString>         { static const JSGCTraceKind kind = JSTRACE_STRING; };
-template <> struct MapTypeToTraceKind<LazyScript>       { static const JSGCTraceKind kind = JSTRACE_LAZY_SCRIPT; };
-template <> struct MapTypeToTraceKind<NestedScopeObject>{ static const JSGCTraceKind kind = JSTRACE_OBJECT; };
-template <> struct MapTypeToTraceKind<PlainObject>      { static const JSGCTraceKind kind = JSTRACE_OBJECT; };
-template <> struct MapTypeToTraceKind<PropertyName>     { static const JSGCTraceKind kind = JSTRACE_STRING; };
-template <> struct MapTypeToTraceKind<SavedFrame>       { static const JSGCTraceKind kind = JSTRACE_OBJECT; };
-template <> struct MapTypeToTraceKind<ScopeObject>      { static const JSGCTraceKind kind = JSTRACE_OBJECT; };
-template <> struct MapTypeToTraceKind<Shape>            { static const JSGCTraceKind kind = JSTRACE_SHAPE; };
-template <> struct MapTypeToTraceKind<AccessorShape>    { static const JSGCTraceKind kind = JSTRACE_SHAPE; };
-template <> struct MapTypeToTraceKind<SharedArrayBufferObject>{ static const JSGCTraceKind kind = JSTRACE_OBJECT; };
-template <> struct MapTypeToTraceKind<SharedTypedArrayObject>{ static const JSGCTraceKind kind = JSTRACE_OBJECT; };
-template <> struct MapTypeToTraceKind<UnownedBaseShape> { static const JSGCTraceKind kind = JSTRACE_BASE_SHAPE; };
-template <> struct MapTypeToTraceKind<jit::JitCode>     { static const JSGCTraceKind kind = JSTRACE_JITCODE; };
-template <> struct MapTypeToTraceKind<ObjectGroup>      { static const JSGCTraceKind kind = JSTRACE_OBJECT_GROUP; };
-
 // Marking.h depends on these barrier definitions, so we need a separate
 // entry point for marking to implement the pre-barrier.
 void MarkValueForBarrier(JSTracer* trc, Value* v, const char* name);
@@ -345,7 +316,6 @@
     T value;
 
     explicit BarrieredBase(T v) : value(v) {}
-    ~BarrieredBase() { pre(); }
 
   public:
     void init(T v) {
@@ -400,6 +370,7 @@
     MOZ_IMPLICIT PreBarriered(T v) : BarrieredBase<T>(v) {}
     explicit PreBarriered(const PreBarriered<T>& v)
       : BarrieredBase<T>(v.value) {}
+    ~PreBarriered() { this->pre(); }
 
     /* Use to set the pointer to nullptr. */
     void clear() {
@@ -439,7 +410,9 @@
     explicit HeapPtr(const HeapPtr<T>& v) : BarrieredBase<T>(v) { post(); }
 #ifdef DEBUG
     ~HeapPtr() {
-        MOZ_ASSERT(CurrentThreadIsGCSweeping());
+        // No prebarrier necessary as this only happens when we are sweeping or
+        // before the containing obect becomes part of the GC graph.
+        MOZ_ASSERT(CurrentThreadIsGCSweeping() || CurrentThreadIsHandlingInitFailure());
     }
 #endif
 
@@ -534,6 +507,7 @@
     }
 
     ~RelocatablePtr() {
+        this->pre();
         if (GCMethods<T>::needsPostBarrier(this->value))
             relocate();
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/GCInternals.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/GCInternals.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/GCInternals.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/GCInternals.h	2015-05-25 20:43:06.000000000 +0000
@@ -141,7 +141,7 @@
 struct MovingTracer : JS::CallbackTracer {
     explicit MovingTracer(JSRuntime* rt) : CallbackTracer(rt, Visit, TraceWeakMapKeysValues) {}
 
-    static void Visit(JS::CallbackTracer* jstrc, void** thingp, JSGCTraceKind kind);
+    static void Visit(JS::CallbackTracer* jstrc, void** thingp, JS::TraceKind kind);
     static bool IsMovingTracer(JSTracer* trc) {
         return trc->isCallbackTracer() && trc->asCallbackTracer()->hasCallback(Visit);
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Heap.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Heap.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Heap.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Heap.h	2015-05-25 20:43:06.000000000 +0000
@@ -51,7 +51,7 @@
 #endif
 
 extern bool
-UnmarkGrayCellRecursively(gc::Cell* cell, JSGCTraceKind kind);
+UnmarkGrayCellRecursively(gc::Cell* cell, JS::TraceKind kind);
 
 extern void
 TraceManuallyBarrieredGenericPointerEdge(JSTracer* trc, gc::Cell** thingp, const char* name);
@@ -169,35 +169,35 @@
 template<typename ValueType> using ObjectAllocKindArray =
     mozilla::EnumeratedArray<AllocKind, AllocKind::OBJECT_LIMIT, ValueType>;
 
-static inline JSGCTraceKind
+static inline JS::TraceKind
 MapAllocToTraceKind(AllocKind kind)
 {
-    static const JSGCTraceKind map[] = {
-        JSTRACE_OBJECT,       /* AllocKind::FUNCTION */
-        JSTRACE_OBJECT,       /* AllocKind::FUNCTION_EXTENDED */
-        JSTRACE_OBJECT,       /* AllocKind::OBJECT0 */
-        JSTRACE_OBJECT,       /* AllocKind::OBJECT0_BACKGROUND */
-        JSTRACE_OBJECT,       /* AllocKind::OBJECT2 */
-        JSTRACE_OBJECT,       /* AllocKind::OBJECT2_BACKGROUND */
-        JSTRACE_OBJECT,       /* AllocKind::OBJECT4 */
-        JSTRACE_OBJECT,       /* AllocKind::OBJECT4_BACKGROUND */
-        JSTRACE_OBJECT,       /* AllocKind::OBJECT8 */
-        JSTRACE_OBJECT,       /* AllocKind::OBJECT8_BACKGROUND */
-        JSTRACE_OBJECT,       /* AllocKind::OBJECT12 */
-        JSTRACE_OBJECT,       /* AllocKind::OBJECT12_BACKGROUND */
-        JSTRACE_OBJECT,       /* AllocKind::OBJECT16 */
-        JSTRACE_OBJECT,       /* AllocKind::OBJECT16_BACKGROUND */
-        JSTRACE_SCRIPT,       /* AllocKind::SCRIPT */
-        JSTRACE_LAZY_SCRIPT,  /* AllocKind::LAZY_SCRIPT */
-        JSTRACE_SHAPE,        /* AllocKind::SHAPE */
-        JSTRACE_SHAPE,        /* AllocKind::ACCESSOR_SHAPE */
-        JSTRACE_BASE_SHAPE,   /* AllocKind::BASE_SHAPE */
-        JSTRACE_OBJECT_GROUP, /* AllocKind::OBJECT_GROUP */
-        JSTRACE_STRING,       /* AllocKind::FAT_INLINE_STRING */
-        JSTRACE_STRING,       /* AllocKind::STRING */
-        JSTRACE_STRING,       /* AllocKind::EXTERNAL_STRING */
-        JSTRACE_SYMBOL,       /* AllocKind::SYMBOL */
-        JSTRACE_JITCODE,      /* AllocKind::JITCODE */
+    static const JS::TraceKind map[] = {
+        JS::TraceKind::Object,       /* AllocKind::FUNCTION */
+        JS::TraceKind::Object,       /* AllocKind::FUNCTION_EXTENDED */
+        JS::TraceKind::Object,       /* AllocKind::OBJECT0 */
+        JS::TraceKind::Object,       /* AllocKind::OBJECT0_BACKGROUND */
+        JS::TraceKind::Object,       /* AllocKind::OBJECT2 */
+        JS::TraceKind::Object,       /* AllocKind::OBJECT2_BACKGROUND */
+        JS::TraceKind::Object,       /* AllocKind::OBJECT4 */
+        JS::TraceKind::Object,       /* AllocKind::OBJECT4_BACKGROUND */
+        JS::TraceKind::Object,       /* AllocKind::OBJECT8 */
+        JS::TraceKind::Object,       /* AllocKind::OBJECT8_BACKGROUND */
+        JS::TraceKind::Object,       /* AllocKind::OBJECT12 */
+        JS::TraceKind::Object,       /* AllocKind::OBJECT12_BACKGROUND */
+        JS::TraceKind::Object,       /* AllocKind::OBJECT16 */
+        JS::TraceKind::Object,       /* AllocKind::OBJECT16_BACKGROUND */
+        JS::TraceKind::Script,       /* AllocKind::SCRIPT */
+        JS::TraceKind::LazyScript,   /* AllocKind::LAZY_SCRIPT */
+        JS::TraceKind::Shape,        /* AllocKind::SHAPE */
+        JS::TraceKind::Shape,        /* AllocKind::ACCESSOR_SHAPE */
+        JS::TraceKind::BaseShape,    /* AllocKind::BASE_SHAPE */
+        JS::TraceKind::ObjectGroup,  /* AllocKind::OBJECT_GROUP */
+        JS::TraceKind::String,       /* AllocKind::FAT_INLINE_STRING */
+        JS::TraceKind::String,       /* AllocKind::STRING */
+        JS::TraceKind::String,       /* AllocKind::EXTERNAL_STRING */
+        JS::TraceKind::Symbol,       /* AllocKind::SYMBOL */
+        JS::TraceKind::JitCode,      /* AllocKind::JITCODE */
     };
 
     static_assert(MOZ_ARRAY_LENGTH(map) == size_t(AllocKind::LIMIT),
@@ -230,9 +230,12 @@
     inline JSRuntime* runtimeFromAnyThread() const;
     inline JS::shadow::Runtime* shadowRuntimeFromAnyThread() const;
 
+    // May be overridden by GC thing kinds that have a compartment pointer.
+    inline JSCompartment* maybeCompartment() const { return nullptr; }
+
     inline StoreBuffer* storeBuffer() const;
 
-    inline JSGCTraceKind getTraceKind() const;
+    inline JS::TraceKind getTraceKind() const;
 
     static MOZ_ALWAYS_INLINE bool needWriteBarrierPre(JS::Zone* zone);
 
@@ -267,7 +270,7 @@
     // Access to the arena header.
     inline ArenaHeader* arenaHeader() const;
     inline AllocKind getAllocKind() const;
-    inline JSGCTraceKind getTraceKind() const;
+    inline JS::TraceKind getTraceKind() const;
     inline JS::Zone* zone() const;
     inline JS::Zone* zoneFromAnyThread() const;
     inline bool isInsideZone(JS::Zone* zone) const;
@@ -1123,6 +1126,7 @@
 ArenaHeader::address() const
 {
     uintptr_t addr = reinterpret_cast<uintptr_t>(this);
+    MOZ_ASSERT(addr);
     MOZ_ASSERT(!(addr & ArenaMask));
     MOZ_ASSERT(Chunk::withinArenasRange(addr));
     return addr;
@@ -1186,7 +1190,8 @@
     MOZ_ASSERT(!(uintptr_t(aheader) & ArenaMask));
     MOZ_ASSERT(!auxNextLink && !hasDelayedMarking);
     hasDelayedMarking = 1;
-    auxNextLink = aheader->arenaAddress() >> ArenaShift;
+    if (aheader)
+        auxNextLink = aheader->arenaAddress() >> ArenaShift;
 }
 
 inline void
@@ -1209,7 +1214,8 @@
 {
     MOZ_ASSERT(!auxNextLink && !allocatedDuringIncremental);
     allocatedDuringIncremental = 1;
-    auxNextLink = aheader->arenaAddress() >> ArenaShift;
+    if (aheader)
+        auxNextLink = aheader->arenaAddress() >> ArenaShift;
 }
 
 inline void
@@ -1310,10 +1316,10 @@
     return chunk()->info.trailer.storeBuffer;
 }
 
-inline JSGCTraceKind
+inline JS::TraceKind
 Cell::getTraceKind() const
 {
-    return isTenured() ? asTenured().getTraceKind() : JSTRACE_OBJECT;
+    return isTenured() ? asTenured().getTraceKind() : JS::TraceKind::Object;
 }
 
 inline bool
@@ -1395,7 +1401,7 @@
     return arenaHeader()->getAllocKind();
 }
 
-JSGCTraceKind
+JS::TraceKind
 TenuredCell::getTraceKind() const
 {
     return MapAllocToTraceKind(getAllocKind());
@@ -1457,7 +1463,7 @@
 AssertValidToSkipBarrier(TenuredCell* thing)
 {
     MOZ_ASSERT(!IsInsideNursery(thing));
-    MOZ_ASSERT_IF(thing, MapAllocToTraceKind(thing->getAllocKind()) != JSTRACE_OBJECT);
+    MOZ_ASSERT_IF(thing, MapAllocToTraceKind(thing->getAllocKind()) != JS::TraceKind::Object);
 }
 
 /* static */ MOZ_ALWAYS_INLINE void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Iteration.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Iteration.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Iteration.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Iteration.cpp	2015-05-25 20:43:06.000000000 +0000
@@ -39,7 +39,7 @@
         (*compartmentCallback)(rt, data, comp);
 
     for (auto thingKind : AllAllocKinds()) {
-        JSGCTraceKind traceKind = MapAllocToTraceKind(thingKind);
+        JS::TraceKind traceKind = MapAllocToTraceKind(thingKind);
         size_t thingSize = Arena::thingSize(thingKind);
 
         for (ArenaIter aiter(zone, thingKind); !aiter.done(); aiter.next()) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Marking.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Marking.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Marking.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Marking.cpp	2015-05-25 20:43:06.000000000 +0000
@@ -39,6 +39,7 @@
 using mozilla::IsBaseOf;
 using mozilla::IsSame;
 using mozilla::MakeRange;
+using mozilla::PodCopy;
 
 // Tracing Overview
 // ================
@@ -103,9 +104,6 @@
 //     . . .   Static dispatch                                                                  //
 //     ======  Dispatch through a manual stack.                                                 //
 //                                                                                              //
-void * const js::NullPtr::constNullValue = nullptr;
-
-JS_PUBLIC_DATA(void * const) JS::NullPtr::constNullValue = nullptr;
 
 
 /*** Tracing Invariants **************************************************************************/
@@ -194,7 +192,7 @@
 
     MOZ_ASSERT(thing->isAligned());
     MOZ_ASSERT(MapTypeToTraceKind<typename mozilla::RemovePointer<T>::Type>::kind ==
-               GetGCThingTraceKind(thing));
+               thing->getTraceKind());
 
     /*
      * Do not check IsMarkingTracer directly -- it should only be used in paths
@@ -339,14 +337,8 @@
 
 /*** Tracing Interface ***************************************************************************/
 
-// A C++ version of JSGCTraceKind
-enum class TraceKind {
-#define NAMES(name, _, __) name,
-FOR_EACH_GC_LAYOUT(NAMES)
-#undef NAMES
-};
-
 #define FOR_EACH_GC_POINTER_TYPE(D) \
+    D(AccessorShape*) \
     D(BaseShape*) \
     D(UnownedBaseShape*) \
     D(jit::JitCode*) \
@@ -393,18 +385,18 @@
 //   BaseGCType<UnownedBaseShape>::type => BaseShape
 //   etc.
 template <typename T,
-          TraceKind = IsBaseOf<JSObject, T>::value     ? TraceKind::Object
-                    : IsBaseOf<JSString, T>::value     ? TraceKind::String
-                    : IsBaseOf<JS::Symbol, T>::value   ? TraceKind::Symbol
-                    : IsBaseOf<JSScript, T>::value     ? TraceKind::Script
-                    : IsBaseOf<Shape, T>::value        ? TraceKind::Shape
-                    : IsBaseOf<BaseShape, T>::value    ? TraceKind::BaseShape
-                    : IsBaseOf<jit::JitCode, T>::value ? TraceKind::JitCode
-                    : IsBaseOf<LazyScript, T>::value   ? TraceKind::LazyScript
-                    :                                    TraceKind::ObjectGroup>
+          JS::TraceKind = IsBaseOf<JSObject, T>::value     ? JS::TraceKind::Object
+                        : IsBaseOf<JSString, T>::value     ? JS::TraceKind::String
+                        : IsBaseOf<JS::Symbol, T>::value   ? JS::TraceKind::Symbol
+                        : IsBaseOf<JSScript, T>::value     ? JS::TraceKind::Script
+                        : IsBaseOf<Shape, T>::value        ? JS::TraceKind::Shape
+                        : IsBaseOf<BaseShape, T>::value    ? JS::TraceKind::BaseShape
+                        : IsBaseOf<jit::JitCode, T>::value ? JS::TraceKind::JitCode
+                        : IsBaseOf<LazyScript, T>::value   ? JS::TraceKind::LazyScript
+                        :                                    JS::TraceKind::ObjectGroup>
 struct BaseGCType;
 #define IMPL_BASE_GC_TYPE(name, type_, _) \
-    template <typename T> struct BaseGCType<T, TraceKind:: name> { typedef type_ type; };
+    template <typename T> struct BaseGCType<T, JS::TraceKind:: name> { typedef type_ type; };
 FOR_EACH_GC_LAYOUT(IMPL_BASE_GC_TYPE);
 #undef IMPL_BASE_GC_TYPE
 
@@ -521,7 +513,7 @@
     // things so they do not need to go through the mark stack and may simply
     // be marked directly.  Moreover, well-known symbols can refer only to
     // permanent atoms, so likewise require no subsquent marking.
-    CheckTracedThing(trc, thing);
+    CheckTracedThing(trc, *ConvertToBase(&thing));
     if (trc->isMarkingTracer())
         thing->markIfUnmarked(gc::BLACK);
     else
@@ -530,18 +522,6 @@
 template void js::TraceProcessGlobalRoot<JSAtom>(JSTracer*, JSAtom*, const char*);
 template void js::TraceProcessGlobalRoot<JS::Symbol>(JSTracer*, JS::Symbol*, const char*);
 
-void
-js::TraceObjectSlots(JSTracer* trc, NativeObject* obj, uint32_t start, uint32_t nslots)
-{
-    JS::AutoTracingIndex index(trc, start);
-    for (uint32_t i = start; i < (start + nslots); ++i) {
-        HeapSlot& slot = obj->getSlotRef(i);
-        if (InternalGCMethods<Value>::isMarkable(slot))
-            DispatchToTracer(trc, slot.unsafeGet(), "object slot");
-        ++index;
-    }
-}
-
 // A typed functor adaptor for TraceRoot.
 struct TraceRootFunctor {
     template <typename T>
@@ -658,6 +638,7 @@
     if (MustSkipMarking(thing))
         return;
 
+    CheckTracedThing(gcmarker, thing);
     gcmarker->traverse(thing);
 
     // Mark the compartment as live.
@@ -750,21 +731,23 @@
 void
 js::GCMarker::traverseEdge(S source, T target)
 {
+    // Atoms and Symbols do not have or mark their internal pointers, respectively.
+    MOZ_ASSERT(!ThingIsPermanentAtomOrWellKnownSymbol(source));
+
+    // The Zones must match, unless the target is an atom.
     MOZ_ASSERT_IF(!ThingIsPermanentAtomOrWellKnownSymbol(target),
                   target->zone()->isAtomsZone() || target->zone() == source->zone());
-    traverse(target);
-}
 
-namespace js {
-// Special-case JSObject->JSObject edges to check the compartment too.
-template <>
-void
-GCMarker::traverseEdge(JSObject* source, JSObject* target)
-{
-    MOZ_ASSERT(target->compartment() == source->compartment());
+    // Atoms and Symbols do not have access to a compartment pointer, or we'd need
+    // to adjust the subsequent check to catch that case.
+    MOZ_ASSERT_IF(ThingIsPermanentAtomOrWellKnownSymbol(target), !target->maybeCompartment());
+    MOZ_ASSERT_IF(target->zoneFromAnyThread()->isAtomsZone(), !target->maybeCompartment());
+    // If we have access to a compartment pointer for both things, they must match.
+    MOZ_ASSERT_IF(source->maybeCompartment() && target->maybeCompartment(),
+                  source->maybeCompartment() == target->maybeCompartment());
+
     traverse(target);
 }
-} // namespace js
 
 template <typename V, typename S> struct TraverseEdgeFunctor : public VoidDefaultAdaptor<V> {
     template <typename T> void operator()(T t, GCMarker* gcmarker, S s) {
@@ -790,7 +773,6 @@
 bool
 js::GCMarker::mark(T* thing)
 {
-    CheckTracedThing(this, thing);
     AssertZoneIsMarking(thing);
     MOZ_ASSERT(!IsInsideNursery(gc::TenuredCell::fromPointer(thing)));
     return gc::ParticipatesInCC<T>::value
@@ -942,9 +924,9 @@
     // other ropes or linear strings, it cannot refer to GC things of other
     // types.
     ptrdiff_t savedPos = stack.position();
-    JS_DIAGNOSTICS_ASSERT(GetGCThingTraceKind(rope) == JSTRACE_STRING);
+    JS_DIAGNOSTICS_ASSERT(rope->getTraceKind() == JS::TraceKind::String);
     while (true) {
-        JS_DIAGNOSTICS_ASSERT(GetGCThingTraceKind(rope) == JSTRACE_STRING);
+        JS_DIAGNOSTICS_ASSERT(rope->getTraceKind() == JS::TraceKind::String);
         JS_DIAGNOSTICS_ASSERT(rope->JSString::isRope());
         AssertZoneIsMarking(rope);
         MOZ_ASSERT(rope->isMarked());
@@ -1058,6 +1040,94 @@
         traverseEdge(group, static_cast<JSObject*>(fun));
 }
 
+struct TraverseObjectFunctor
+{
+    template <typename T>
+    void operator()(T* thing, GCMarker* gcmarker, JSObject* src) {
+        gcmarker->traverseEdge(src, *thing);
+    }
+};
+
+// Call the trace hook set on the object, if present. If further tracing of
+// NativeObject fields is required, this will return the native object.
+enum class CheckGeneration { DoChecks, NoChecks};
+template <typename Functor, typename... Args>
+static inline NativeObject*
+CallTraceHook(Functor f, JSTracer* trc, JSObject* obj, CheckGeneration check, Args&&... args)
+{
+    const Class* clasp = obj->getClass();
+    MOZ_ASSERT(clasp);
+    MOZ_ASSERT(obj->isNative() == clasp->isNative());
+
+    if (!clasp->trace)
+        return &obj->as<NativeObject>();
+
+    // Global objects all have the same trace hook. That hook is safe without barriers
+    // if the global has no custom trace hook of its own, or has been moved to a different
+    // compartment, and so can't have one.
+    MOZ_ASSERT_IF(!(clasp->trace == JS_GlobalObjectTraceHook &&
+                    (!obj->compartment()->options().getTrace() || !obj->isOwnGlobal())),
+                  clasp->flags & JSCLASS_IMPLEMENTS_BARRIERS);
+
+    if (clasp->trace == InlineTypedObject::obj_trace) {
+        Shape** pshape = obj->as<InlineTypedObject>().addressOfShapeFromGC();
+        f(pshape, mozilla::Forward<Args>(args)...);
+
+        InlineTypedObject& tobj = obj->as<InlineTypedObject>();
+        if (tobj.typeDescr().hasTraceList()) {
+            VisitTraceList(f, tobj.typeDescr().traceList(), tobj.inlineTypedMem(),
+                           mozilla::Forward<Args>(args)...);
+        }
+
+        return nullptr;
+    }
+
+    if (clasp == &UnboxedPlainObject::class_) {
+        JSObject** pexpando = obj->as<UnboxedPlainObject>().addressOfExpando();
+        if (*pexpando)
+            f(pexpando, mozilla::Forward<Args>(args)...);
+
+        UnboxedPlainObject& unboxed = obj->as<UnboxedPlainObject>();
+        const UnboxedLayout& layout = check == CheckGeneration::DoChecks
+                                      ? unboxed.layout()
+                                      : unboxed.layoutDontCheckGeneration();
+        if (layout.traceList()) {
+            VisitTraceList(f, layout.traceList(), unboxed.data(),
+                           mozilla::Forward<Args>(args)...);
+        }
+
+        return nullptr;
+    }
+
+    clasp->trace(trc, obj);
+
+    if (!clasp->isNative())
+        return nullptr;
+    return &obj->as<NativeObject>();
+}
+
+template <typename F, typename... Args>
+static void
+VisitTraceList(F f, const int32_t* traceList, uint8_t* memory, Args&&... args)
+{
+    while (*traceList != -1) {
+        f(reinterpret_cast<JSString**>(memory + *traceList), mozilla::Forward<Args>(args)...);
+        traceList++;
+    }
+    traceList++;
+    while (*traceList != -1) {
+        JSObject** objp = reinterpret_cast<JSObject**>(memory + *traceList);
+        if (*objp)
+            f(objp, mozilla::Forward<Args>(args)...);
+        traceList++;
+    }
+    traceList++;
+    while (*traceList != -1) {
+        f(reinterpret_cast<Value*>(memory + *traceList), mozilla::Forward<Args>(args)...);
+        traceList++;
+    }
+}
+
 
 /*** Mark-stack Marking ***************************************************************************/
 
@@ -1116,9 +1186,6 @@
     HeapSlot* end;
     JSObject* obj;
 
-    const int32_t* unboxedTraceList;
-    uint8_t* unboxedMemory;
-
     // Decode
     uintptr_t addr = stack.pop();
     uintptr_t tag = addr & StackTagMask;
@@ -1185,7 +1252,7 @@
             JSObject* obj2 = &v.toObject();
             MOZ_ASSERT(obj->compartment() == obj2->compartment());
             if (mark(obj2)) {
-                // Save the rest of this value array for later and start scanning obj2's children.N
+                // Save the rest of this value array for later and start scanning obj2's children.
                 pushValueArray(obj, vp, end);
                 obj = obj2;
                 goto scan_obj;
@@ -1196,29 +1263,6 @@
     }
     return;
 
-  scan_unboxed:
-    {
-        while (*unboxedTraceList != -1) {
-            JSString* str = *reinterpret_cast<JSString**>(unboxedMemory + *unboxedTraceList);
-            traverseEdge(obj, str);
-            unboxedTraceList++;
-        }
-        unboxedTraceList++;
-        while (*unboxedTraceList != -1) {
-            JSObject* obj2 = *reinterpret_cast<JSObject**>(unboxedMemory + *unboxedTraceList);
-            if (obj2)
-                traverseEdge(obj, obj2);
-            unboxedTraceList++;
-        }
-        unboxedTraceList++;
-        while (*unboxedTraceList != -1) {
-            const Value& v = *reinterpret_cast<Value*>(unboxedMemory + *unboxedTraceList);
-            traverseEdge(obj, v);
-            unboxedTraceList++;
-        }
-        return;
-    }
-
   scan_obj:
     {
         AssertZoneIsMarking(obj);
@@ -1232,44 +1276,11 @@
         ObjectGroup* group = obj->groupFromGC();
         traverseEdge(obj, group);
 
-        /* Call the trace hook if necessary. */
-        const Class* clasp = group->clasp();
-        if (clasp->trace) {
-            // Global objects all have the same trace hook. That hook is safe without barriers
-            // if the global has no custom trace hook of its own, or has been moved to a different
-            // compartment, and so can't have one.
-            MOZ_ASSERT_IF(!(clasp->trace == JS_GlobalObjectTraceHook &&
-                            (!obj->compartment()->options().getTrace() || !obj->isOwnGlobal())),
-                          clasp->flags & JSCLASS_IMPLEMENTS_BARRIERS);
-            if (clasp->trace == InlineTypedObject::obj_trace) {
-                Shape* shape = obj->as<InlineTypedObject>().shapeFromGC();
-                traverseEdge(obj, shape);
-                TypeDescr* descr = &obj->as<InlineTypedObject>().typeDescr();
-                if (!descr->hasTraceList())
-                    return;
-                unboxedTraceList = descr->traceList();
-                unboxedMemory = obj->as<InlineTypedObject>().inlineTypedMem();
-                goto scan_unboxed;
-            }
-            if (clasp == &UnboxedPlainObject::class_) {
-                JSObject* expando = obj->as<UnboxedPlainObject>().maybeExpando();
-                if (expando)
-                    traverseEdge(obj, expando);
-                const UnboxedLayout& layout = obj->as<UnboxedPlainObject>().layout();
-                unboxedTraceList = layout.traceList();
-                if (!unboxedTraceList)
-                    return;
-                unboxedMemory = obj->as<UnboxedPlainObject>().data();
-                goto scan_unboxed;
-            }
-            clasp->trace(this, obj);
-        }
-
-        if (!clasp->isNative())
+        NativeObject *nobj = CallTraceHook(TraverseObjectFunctor(), this, obj,
+                                           CheckGeneration::DoChecks, this, obj);
+        if (!nobj)
             return;
 
-        NativeObject* nobj = &obj->as<NativeObject>();
-
         Shape* shape = nobj->lastProperty();
         traverseEdge(obj, shape);
 
@@ -1655,49 +1666,16 @@
         gcmarker->traverse(i.get<T>());
 }
 
+struct PushArenaFunctor {
+    template <typename T> void operator()(GCMarker* gcmarker, ArenaHeader* aheader) {
+        PushArenaTyped<T>(gcmarker, aheader);
+    }
+};
+
 void
 gc::PushArena(GCMarker* gcmarker, ArenaHeader* aheader)
 {
-    switch (MapAllocToTraceKind(aheader->getAllocKind())) {
-      case JSTRACE_OBJECT:
-        PushArenaTyped<JSObject>(gcmarker, aheader);
-        break;
-
-      case JSTRACE_SCRIPT:
-        PushArenaTyped<JSScript>(gcmarker, aheader);
-        break;
-
-      case JSTRACE_STRING:
-        PushArenaTyped<JSString>(gcmarker, aheader);
-        break;
-
-      case JSTRACE_SYMBOL:
-        PushArenaTyped<JS::Symbol>(gcmarker, aheader);
-        break;
-
-      case JSTRACE_BASE_SHAPE:
-        PushArenaTyped<js::BaseShape>(gcmarker, aheader);
-        break;
-
-      case JSTRACE_JITCODE:
-        PushArenaTyped<js::jit::JitCode>(gcmarker, aheader);
-        break;
-
-      case JSTRACE_LAZY_SCRIPT:
-        PushArenaTyped<LazyScript>(gcmarker, aheader);
-        break;
-
-      case JSTRACE_SHAPE:
-        PushArenaTyped<js::Shape>(gcmarker, aheader);
-        break;
-
-      case JSTRACE_OBJECT_GROUP:
-        PushArenaTyped<js::ObjectGroup>(gcmarker, aheader);
-        break;
-
-      default:
-        MOZ_CRASH("Invalid trace kind in PushArena.");
-    }
+    CallTyped(PushArenaFunctor(), MapAllocToTraceKind(aheader->getAllocKind()), gcmarker, aheader);
 }
 
 #ifdef DEBUG
@@ -1798,13 +1776,13 @@
         int32_t initLen = obj->getDenseInitializedLength();
         int32_t clampedStart = Min(start_, initLen);
         int32_t clampedEnd = Min(start_ + count_, initLen);
-        TraceRange(&mover, clampedEnd - clampedStart,
-                   static_cast<HeapSlot*>(obj->getDenseElements() + clampedStart), "element");
+        mover.traceSlots(static_cast<HeapSlot*>(obj->getDenseElements() + clampedStart)->unsafeGet(),
+                         clampedEnd - clampedStart);
     } else {
         int32_t start = Min(uint32_t(start_), obj->slotSpan());
         int32_t end = Min(uint32_t(start_) + count_, obj->slotSpan());
         MOZ_ASSERT(end >= start);
-        TraceObjectSlots(&mover, obj, start, end - start);
+        mover.traceObjectSlots(obj, start, end - start);
     }
 }
 
@@ -1812,12 +1790,10 @@
 js::gc::StoreBuffer::WholeCellEdges::trace(TenuringTracer& mover) const
 {
     MOZ_ASSERT(edge->isTenured());
-    JSGCTraceKind kind = GetGCThingTraceKind(edge);
-    if (kind <= JSTRACE_OBJECT) {
-        JSObject* object = static_cast<JSObject*>(edge);
-
-        // FIXME: bug 1161664 -- call the inline path below, now that it is accessable.
-        object->traceChildren(&mover);
+    JS::TraceKind kind = edge->getTraceKind();
+    if (kind == JS::TraceKind::Object) {
+        JSObject *object = static_cast<JSObject*>(edge);
+        mover.traceObject(object);
 
         // Additionally trace the expando object attached to any unboxed plain
         // objects. Baseline and Ion can write properties to the expando while
@@ -1832,7 +1808,7 @@
 
         return;
     }
-    MOZ_ASSERT(kind == JSTRACE_JITCODE);
+    MOZ_ASSERT(kind == JS::TraceKind::JitCode);
     static_cast<jit::JitCode*>(edge)->traceChildren(&mover);
 }
 
@@ -1842,7 +1818,7 @@
     if (!*edge)
         return;
 
-    MOZ_ASSERT(GetGCThingTraceKind(*edge) == JSTRACE_OBJECT);
+    MOZ_ASSERT((*edge)->getTraceKind() == JS::TraceKind::Object);
     mover.traverse(reinterpret_cast<JSObject**>(edge));
 }
 
@@ -1905,79 +1881,54 @@
     }
 }
 
+struct TenuringFunctor
+{
+    template <typename T>
+    void operator()(T* thing, TenuringTracer& mover) {
+        mover.traverse(thing);
+    }
+};
+
 // Visit all object children of the object and trace them.
 void
 js::TenuringTracer::traceObject(JSObject* obj)
 {
-    const Class* clasp = obj->getClass();
-    if (clasp->trace) {
-        if (clasp->trace == InlineTypedObject::obj_trace) {
-            TypeDescr* descr = &obj->as<InlineTypedObject>().typeDescr();
-            if (descr->hasTraceList())
-                markTraceList(descr->traceList(), obj->as<InlineTypedObject>().inlineTypedMem());
-            return;
-        }
-        if (clasp == &UnboxedPlainObject::class_) {
-            JSObject** pexpando = obj->as<UnboxedPlainObject>().addressOfExpando();
-            if (*pexpando)
-                traverse(pexpando);
-            const UnboxedLayout& layout = obj->as<UnboxedPlainObject>().layoutDontCheckGeneration();
-            if (layout.traceList())
-                markTraceList(layout.traceList(), obj->as<UnboxedPlainObject>().data());
-            return;
-        }
-        clasp->trace(this, obj);
-    }
-
-    MOZ_ASSERT(obj->isNative() == clasp->isNative());
-    if (!clasp->isNative())
+    NativeObject *nobj = CallTraceHook(TenuringFunctor(), this, obj,
+                                       CheckGeneration::NoChecks, *this);
+    if (!nobj)
         return;
-    NativeObject* nobj = &obj->as<NativeObject>();
 
     // Note: the contents of copy on write elements pointers are filled in
     // during parsing and cannot contain nursery pointers.
     if (!nobj->hasEmptyElements() && !nobj->denseElementsAreCopyOnWrite()) {
         Value* elems = static_cast<HeapSlot*>(nobj->getDenseElements())->unsafeGet();
-        markSlots(elems, elems + nobj->getDenseInitializedLength());
+        traceSlots(elems, elems + nobj->getDenseInitializedLength());
     }
 
+    traceObjectSlots(nobj, 0, nobj->slotSpan());
+}
+
+void
+js::TenuringTracer::traceObjectSlots(NativeObject* nobj, uint32_t start, uint32_t length)
+{
     HeapSlot* fixedStart;
     HeapSlot* fixedEnd;
     HeapSlot* dynStart;
     HeapSlot* dynEnd;
-    nobj->getSlotRange(0, nobj->slotSpan(), &fixedStart, &fixedEnd, &dynStart, &dynEnd);
-    markSlots(fixedStart->unsafeGet(), fixedEnd->unsafeGet());
-    markSlots(dynStart->unsafeGet(), dynEnd->unsafeGet());
+    nobj->getSlotRange(start, length, &fixedStart, &fixedEnd, &dynStart, &dynEnd);
+    if (fixedStart)
+        traceSlots(fixedStart->unsafeGet(), fixedEnd->unsafeGet());
+    if (dynStart)
+        traceSlots(dynStart->unsafeGet(), dynEnd->unsafeGet());
 }
 
 void
-js::TenuringTracer::markSlots(Value* vp, Value* end)
+js::TenuringTracer::traceSlots(Value* vp, Value* end)
 {
     for (; vp != end; ++vp)
         traverse(vp);
 }
 
-void
-js::TenuringTracer::markTraceList(const int32_t* traceList, uint8_t* memory)
-{
-    while (*traceList != -1) {
-        // Strings are not in the nursery and do not need tracing.
-        traceList++;
-    }
-    traceList++;
-    while (*traceList != -1) {
-        JSObject** pobj = reinterpret_cast<JSObject**>(memory + *traceList);
-        traverse(pobj);
-        traceList++;
-    }
-    traceList++;
-    while (*traceList != -1) {
-        Value* pslot = reinterpret_cast<Value*>(memory + *traceList);
-        traverse(pslot);
-        traceList++;
-    }
-}
-
 size_t
 js::TenuringTracer::moveObjectToTenured(JSObject* dst, JSObject* src, AllocKind dstKind)
 {
@@ -2311,134 +2262,11 @@
 }
 
 
-/*** Cycle Collector Helpers **********************************************************************/
-
-// This function is used by the cycle collector to trace through a shape. The
-// cycle collector does not care about shapes or base shapes, so those are not
-// marked. Instead, any shapes or base shapes that are encountered have their
-// children marked. Stack space is bounded.
-//
-// Note: The canonical way for an embedding to implement this functionality
-// would be through a custom CallbackTracer that ignores unrequired children
-// and pushes to a separate mark stack in order to bound the call stack usage.
-// We've implemented like this purely for performance.
-void
-gc::MarkCycleCollectorChildren(JSTracer* trc, Shape* shape)
-{
-    // We need to mark the global, but it's OK to only do this once instead of
-    // doing it for every Shape in our lineage, since it's always the same
-    // global.
-    JSObject* global = shape->compartment()->unsafeUnbarrieredMaybeGlobal();
-    MOZ_ASSERT(global);
-    TraceManuallyBarrieredEdge(trc, &global, "global");
-
-    do {
-        MOZ_ASSERT(global == shape->compartment()->unsafeUnbarrieredMaybeGlobal());
-
-        MOZ_ASSERT(shape->base());
-        shape->base()->assertConsistency();
-
-        TraceEdge(trc, &shape->propidRef(), "propid");
-
-        if (shape->hasGetterObject()) {
-            JSObject* tmp = shape->getterObject();
-            TraceManuallyBarrieredEdge(trc, &tmp, "getter");
-            MOZ_ASSERT(tmp == shape->getterObject());
-        }
-
-        if (shape->hasSetterObject()) {
-            JSObject* tmp = shape->setterObject();
-            TraceManuallyBarrieredEdge(trc, &tmp, "setter");
-            MOZ_ASSERT(tmp == shape->setterObject());
-        }
-
-        shape = shape->previous();
-    } while (shape);
-}
-
-void
-TraceObjectGroupCycleCollectorChildrenCallback(JS::CallbackTracer* trc,
-                                               void** thingp, JSGCTraceKind kind);
-
-// Object groups can point to other object groups via an UnboxedLayout or the
-// the original unboxed group link. There can potentially be deep or cyclic
-// chains of such groups to trace through without going through a thing that
-// participates in cycle collection. These need to be handled iteratively to
-// avoid blowing the stack when running the cycle collector's callback tracer.
-struct ObjectGroupCycleCollectorTracer : public JS::CallbackTracer
-{
-    explicit ObjectGroupCycleCollectorTracer(JS::CallbackTracer* innerTracer)
-        : JS::CallbackTracer(innerTracer->runtime(),
-                             TraceObjectGroupCycleCollectorChildrenCallback,
-                             DoNotTraceWeakMaps),
-          innerTracer(innerTracer)
-    {}
-
-    JS::CallbackTracer* innerTracer;
-    Vector<ObjectGroup*, 4, SystemAllocPolicy> seen, worklist;
-};
-
-void
-TraceObjectGroupCycleCollectorChildrenCallback(JS::CallbackTracer* trcArg,
-                                               void** thingp, JSGCTraceKind kind)
-{
-    ObjectGroupCycleCollectorTracer* trc = static_cast<ObjectGroupCycleCollectorTracer*>(trcArg);
-    JS::GCCellPtr thing(*thingp, kind);
-
-    if (thing.isObject() || thing.isScript()) {
-        // Invoke the inner cycle collector callback on this child. It will not
-        // recurse back into TraceChildren.
-        trc->innerTracer->invoke(thingp, kind);
-        return;
-    }
-
-    if (thing.isObjectGroup()) {
-        // If this group is required to be in an ObjectGroup chain, trace it
-        // via the provided worklist rather than continuing to recurse.
-        ObjectGroup* group = static_cast<ObjectGroup*>(thing.asCell());
-        if (group->maybeUnboxedLayout()) {
-            for (size_t i = 0; i < trc->seen.length(); i++) {
-                if (trc->seen[i] == group)
-                    return;
-            }
-            if (trc->seen.append(group) && trc->worklist.append(group)) {
-                return;
-            } else {
-                // If append fails, keep tracing normally. The worst that will
-                // happen is we end up overrecursing.
-            }
-        }
-    }
-
-    TraceChildren(trc, thing.asCell(), thing.kind());
-}
-
-void
-gc::MarkCycleCollectorChildren(JSTracer* trc, ObjectGroup* group)
-{
-    MOZ_ASSERT(trc->isCallbackTracer());
-
-    // Early return if this group is not required to be in an ObjectGroup chain.
-    if (!group->maybeUnboxedLayout()) {
-        TraceChildren(trc, group, JSTRACE_OBJECT_GROUP);
-        return;
-    }
-
-    ObjectGroupCycleCollectorTracer groupTracer(trc->asCallbackTracer());
-    TraceChildren(&groupTracer, group, JSTRACE_OBJECT_GROUP);
-
-    while (!groupTracer.worklist.empty()) {
-        ObjectGroup* innerGroup = groupTracer.worklist.popCopy();
-        TraceChildren(&groupTracer, innerGroup, JSTRACE_OBJECT_GROUP);
-    }
-}
-
-
 /*** Cycle Collector Barrier Implementation *******************************************************/
 
 #ifdef DEBUG
 static void
-AssertNonGrayGCThing(JS::CallbackTracer* trc, void** thingp, JSGCTraceKind kind)
+AssertNonGrayGCThing(JS::CallbackTracer* trc, void** thingp, JS::TraceKind kind)
 {
     DebugOnly<Cell*> thing(static_cast<Cell*>(*thingp));
     MOZ_ASSERT_IF(thing->isTenured(), !thing->asTenured().isMarked(js::gc::GRAY));
@@ -2446,7 +2274,7 @@
 #endif
 
 static void
-UnmarkGrayChildren(JS::CallbackTracer* trc, void** thingp, JSGCTraceKind kind);
+UnmarkGrayChildren(JS::CallbackTracer* trc, void** thingp, JS::TraceKind kind);
 
 struct UnmarkGrayTracer : public JS::CallbackTracer
 {
@@ -2509,7 +2337,7 @@
  *   containers.
  */
 static void
-UnmarkGrayChildren(JS::CallbackTracer* trc, void** thingp, JSGCTraceKind kind)
+UnmarkGrayChildren(JS::CallbackTracer* trc, void** thingp, JS::TraceKind kind)
 {
     int stackDummy;
     if (!JS_CHECK_STACK_SIZE(trc->runtime()->mainThread.nativeStackLimit[StackForSystemCode],
@@ -2548,16 +2376,16 @@
     // The parent will later trace |tenured|. This is done to avoid increasing
     // the stack depth during shape tracing. It is safe to do because a shape
     // can only have one child that is a shape.
-    UnmarkGrayTracer childTracer(tracer, kind == JSTRACE_SHAPE);
+    UnmarkGrayTracer childTracer(tracer, kind == JS::TraceKind::Shape);
 
-    if (kind != JSTRACE_SHAPE) {
+    if (kind != JS::TraceKind::Shape) {
         TraceChildren(&childTracer, &tenured, kind);
         MOZ_ASSERT(!childTracer.previousShape);
         tracer->unmarkedAny |= childTracer.unmarkedAny;
         return;
     }
 
-    MOZ_ASSERT(kind == JSTRACE_SHAPE);
+    MOZ_ASSERT(kind == JS::TraceKind::Shape);
     Shape* shape = static_cast<Shape*>(&tenured);
     if (tracer->tracingShape) {
         MOZ_ASSERT(!tracer->previousShape);
@@ -2567,7 +2395,7 @@
 
     do {
         MOZ_ASSERT(!shape->isMarked(js::gc::GRAY));
-        TraceChildren(&childTracer, shape, JSTRACE_SHAPE);
+        TraceChildren(&childTracer, shape, JS::TraceKind::Shape);
         shape = childTracer.previousShape;
         childTracer.previousShape = nullptr;
     } while (shape);
@@ -2575,7 +2403,7 @@
 }
 
 bool
-js::UnmarkGrayCellRecursively(gc::Cell* cell, JSGCTraceKind kind)
+js::UnmarkGrayCellRecursively(gc::Cell* cell, JS::TraceKind kind)
 {
     MOZ_ASSERT(cell);
 
@@ -2604,7 +2432,7 @@
 bool
 js::UnmarkGrayShapeRecursively(Shape* shape)
 {
-    return js::UnmarkGrayCellRecursively(shape, JSTRACE_SHAPE);
+    return js::UnmarkGrayCellRecursively(shape, JS::TraceKind::Shape);
 }
 
 JS_FRIEND_API(bool)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Marking.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Marking.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Marking.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Marking.h	2015-05-25 20:43:06.000000000 +0000
@@ -307,15 +307,6 @@
 
 /*** Special Cases ***/
 
-/*
- * Trace through a shape or group iteratively during cycle collection to avoid
- * deep or infinite recursion.
- */
-void
-MarkCycleCollectorChildren(JSTracer* trc, Shape* shape);
-void
-MarkCycleCollectorChildren(JSTracer* trc, ObjectGroup* group);
-
 void
 PushArena(GCMarker* gcmarker, ArenaHeader* aheader);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Nursery.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Nursery.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Nursery.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Nursery.cpp	2015-05-25 20:43:06.000000000 +0000
@@ -397,9 +397,9 @@
     runtime()->setNeedsIncrementalBarrier(savedRuntimeNeedBarrier);
 }
 
-#define TIME_START(name) int64_t timstampStart_##name = enableProfiling_ ? PRMJ_Now() : 0
-#define TIME_END(name) int64_t timstampEnd_##name = enableProfiling_ ? PRMJ_Now() : 0
-#define TIME_TOTAL(name) (timstampEnd_##name - timstampStart_##name)
+#define TIME_START(name) int64_t timestampStart_##name = enableProfiling_ ? PRMJ_Now() : 0
+#define TIME_END(name) int64_t timestampEnd_##name = enableProfiling_ ? PRMJ_Now() : 0
+#define TIME_TOTAL(name) (timestampEnd_##name - timestampStart_##name)
 
 void
 js::Nursery::collect(JSRuntime* rt, JS::gcreason::Reason reason, ObjectGroupList* pretenureGroups)
@@ -427,7 +427,7 @@
 
     TraceMinorGCStart();
 
-    TIME_START(total);
+    int64_t timestampStart_total = PRMJ_Now();
 
     AutoTraceSession session(rt, MinorCollecting);
     AutoStopVerifyingBarriers av(rt, false);
@@ -554,11 +554,14 @@
     if (rt->gc.usage.gcBytes() >= rt->gc.tunables.gcMaxBytes())
         disable();
 
-    TIME_END(total);
+    int64_t totalTime = PRMJ_Now() - timestampStart_total;
+    rt->addTelemetry(JS_TELEMETRY_GC_MINOR_US, totalTime);
+    rt->addTelemetry(JS_TELEMETRY_GC_MINOR_REASON, reason);
+    if (totalTime > 1000)
+        rt->addTelemetry(JS_TELEMETRY_GC_MINOR_REASON_LONG, reason);
 
     TraceMinorGCEnd();
 
-    int64_t totalTime = TIME_TOTAL(total);
     if (enableProfiling_ && totalTime >= profileThreshold_) {
         static bool printedHeader = false;
         if (!printedHeader) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Nursery.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Nursery.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Nursery.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Nursery.h	2015-05-25 20:43:06.000000000 +0000
@@ -74,6 +74,11 @@
 
     void insertIntoFixupList(gc::RelocationOverlay* entry);
 
+    // The store buffers need to be able to call these directly.
+    void traceObject(JSObject* src);
+    void traceObjectSlots(NativeObject* nobj, uint32_t start, uint32_t length);
+    void traceSlots(JS::Value* vp, uint32_t nslots) { traceSlots(vp, vp + nslots); }
+
   private:
     Nursery& nursery() { return nursery_; }
 
@@ -82,10 +87,7 @@
     size_t moveElementsToTenured(NativeObject* dst, NativeObject* src, gc::AllocKind dstKind);
     size_t moveSlotsToTenured(NativeObject* dst, NativeObject* src, gc::AllocKind dstKind);
 
-    void traceObject(JSObject* src);
-    void markSlots(JS::Value* vp, uint32_t nslots) { markSlots(vp, vp + nslots); }
-    void markSlots(JS::Value* vp, JS::Value* end);
-    void markTraceList(const int32_t* traceList, uint8_t* memory);
+    void traceSlots(JS::Value* vp, JS::Value* end);
 };
 
 class Nursery
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/RootMarking.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/RootMarking.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/RootMarking.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/RootMarking.cpp	2015-05-25 20:43:06.000000000 +0000
@@ -552,14 +552,14 @@
     // Set to false if we OOM while buffering gray roots.
     bool bufferingGrayRootsFailed;
 
-    void appendGrayRoot(gc::TenuredCell* thing, JSGCTraceKind kind);
+    void appendGrayRoot(gc::TenuredCell* thing, JS::TraceKind kind);
 
   public:
     explicit BufferGrayRootsTracer(JSRuntime* rt)
       : JS::CallbackTracer(rt, grayTraceCallback), bufferingGrayRootsFailed(false)
     {}
 
-    static void grayTraceCallback(JS::CallbackTracer* trc, void** thingp, JSGCTraceKind kind) {
+    static void grayTraceCallback(JS::CallbackTracer* trc, void** thingp, JS::TraceKind kind) {
         auto tracer = static_cast<BufferGrayRootsTracer*>(trc);
         tracer->appendGrayRoot(gc::TenuredCell::fromPointer(*thingp), kind);
     }
@@ -591,14 +591,11 @@
 }
 
 struct SetMaybeAliveFunctor {
-    template <typename T>
-    void operator()(Cell* cell) {
-        SetMaybeAliveFlag<T>(static_cast<T*>(cell));
-    }
+    template <typename T> void operator()(T* t) { SetMaybeAliveFlag(t); }
 };
 
 void
-BufferGrayRootsTracer::appendGrayRoot(TenuredCell* thing, JSGCTraceKind kind)
+BufferGrayRootsTracer::appendGrayRoot(TenuredCell* thing, JS::TraceKind kind)
 {
     MOZ_ASSERT(runtime()->isHeapBusy());
 
@@ -611,7 +608,7 @@
         // objects and scripts. We rely on gray root buffering for this to work,
         // but we only need to worry about uncollected dead compartments during
         // incremental GCs (when we do gray root buffering).
-        CallTyped(SetMaybeAliveFunctor(), kind, thing);
+        CallTyped(SetMaybeAliveFunctor(), thing, kind);
 
         if (!zone->gcGrayRoots.append(thing))
             bufferingGrayRootsFailed = true;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Statistics.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Statistics.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Statistics.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Statistics.cpp	2015-05-25 20:43:06.000000000 +0000
@@ -397,7 +397,7 @@
     size_t activeSlot;
     mozilla::Vector<Phase>::Range descendants;
 
-    explicit AllPhaseIterator(int64_t (*table)[PHASE_LIMIT])
+    explicit AllPhaseIterator(Statistics::PhaseTimeTable table)
       : current(0)
       , baseLevel(0)
       , activeSlot(PHASE_DAG_NONE)
@@ -444,7 +444,7 @@
 };
 
 static void
-FormatPhaseTimes(StatisticsSerializer& ss, const char* name, int64_t (*times)[PHASE_LIMIT])
+FormatPhaseTimes(StatisticsSerializer& ss, const char* name, Statistics::PhaseTimeTable times)
 {
     ss.beginObject(name);
 
@@ -585,8 +585,55 @@
     return UniqueChars(joined);
 }
 
+static int64_t
+SumChildTimes(size_t phaseSlot, Phase phase, Statistics::PhaseTimeTable phaseTimes)
+{
+    // Sum the contributions from single-parented children.
+    int64_t total = 0;
+    for (unsigned i = 0; i < PHASE_LIMIT; i++) {
+        if (phases[i].parent == phase)
+            total += phaseTimes[phaseSlot][i];
+    }
+
+    // Sum the contributions from multi-parented children.
+    size_t dagSlot = phaseExtra[phase].dagSlot;
+    if (dagSlot != PHASE_DAG_NONE) {
+        for (size_t i = 0; i < mozilla::ArrayLength(dagChildEdges); i++) {
+            if (dagChildEdges[i].parent == phase) {
+                Phase child = dagChildEdges[i].child;
+                total += phaseTimes[dagSlot][child];
+            }
+        }
+    }
+    return total;
+}
+
 UniqueChars
-Statistics::formatDescription()
+Statistics::formatDetailedMessage()
+{
+    FragmentVector fragments;
+
+    if (!fragments.append(formatDetailedDescription()))
+        return UniqueChars(nullptr);
+
+    if (slices.length() > 1) {
+        for (unsigned i = 0; i < slices.length(); i++) {
+            if (!fragments.append(formatDetailedSliceDescription(i, slices[i])))
+                return UniqueChars(nullptr);
+            if (!fragments.append(formatDetailedPhaseTimes(slices[i].phaseTimes)))
+                return UniqueChars(nullptr);
+        }
+    }
+    if (!fragments.append(formatDetailedTotals()))
+        return UniqueChars(nullptr);
+    if (!fragments.append(formatDetailedPhaseTimes(phaseTimes)))
+        return UniqueChars(nullptr);
+
+    return Join(fragments);
+}
+
+UniqueChars
+Statistics::formatDetailedDescription()
 {
     const double bytesPerMiB = 1024 * 1024;
 
@@ -632,7 +679,7 @@
 }
 
 UniqueChars
-Statistics::formatSliceDescription(unsigned i, const SliceData& slice)
+Statistics::formatDetailedSliceDescription(unsigned i, const SliceData& slice)
 {
     char budgetDescription[200];
     slice.budget.describe(budgetDescription, sizeof(budgetDescription) - 1);
@@ -656,48 +703,7 @@
 }
 
 UniqueChars
-Statistics::formatTotals()
-{
-    int64_t total, longest;
-    gcDuration(&total, &longest);
-
-    const char* format =
-"\
-  ---- Totals ----\n\
-    Total Time: %.3fms\n\
-    Max Pause: %.3fms\n\
-";
-    char buffer[1024];
-    memset(buffer, 0, sizeof(buffer));
-    JS_snprintf(buffer, sizeof(buffer), format, t(total), t(longest));
-    return make_string_copy(buffer);
-}
-
-static int64_t
-SumChildTimes(size_t phaseSlot, Phase phase, int64_t (*phaseTimes)[PHASE_LIMIT])
-{
-    // Sum the contributions from single-parented children.
-    int64_t total = 0;
-    for (unsigned i = 0; i < PHASE_LIMIT; i++) {
-        if (phases[i].parent == phase)
-            total += phaseTimes[phaseSlot][i];
-    }
-
-    // Sum the contributions from multi-parented children.
-    size_t dagSlot = phaseExtra[phase].dagSlot;
-    if (dagSlot != PHASE_DAG_NONE) {
-        for (size_t i = 0; i < mozilla::ArrayLength(dagChildEdges); i++) {
-            if (dagChildEdges[i].parent == phase) {
-                Phase child = dagChildEdges[i].child;
-                total += phaseTimes[dagSlot][child];
-            }
-        }
-    }
-    return total;
-}
-
-UniqueChars
-Statistics::formatPhaseTimes(int64_t (*phaseTimes)[PHASE_LIMIT])
+Statistics::formatDetailedPhaseTimes(PhaseTimeTable phaseTimes)
 {
     static const char* LevelToIndent[] = { "", "  ", "    ", "      " };
     static const int64_t MaxUnaccountedChildTimeUS = 50;
@@ -732,27 +738,21 @@
 }
 
 UniqueChars
-Statistics::formatDetailedMessage()
+Statistics::formatDetailedTotals()
 {
-    FragmentVector fragments;
-
-    if (!fragments.append(formatDescription()))
-        return UniqueChars(nullptr);
-
-    if (slices.length() > 1) {
-        for (unsigned i = 0; i < slices.length(); i++) {
-            if (!fragments.append(formatSliceDescription(i, slices[i])))
-                return UniqueChars(nullptr);
-            if (!fragments.append(formatPhaseTimes(slices[i].phaseTimes)))
-                return UniqueChars(nullptr);
-        }
-    }
-    if (!fragments.append(formatTotals()))
-        return UniqueChars(nullptr);
-    if (!fragments.append(formatPhaseTimes(phaseTimes)))
-        return UniqueChars(nullptr);
+    int64_t total, longest;
+    gcDuration(&total, &longest);
 
-    return Join(fragments);
+    const char* format =
+"\
+  ---- Totals ----\n\
+    Total Time: %.3fms\n\
+    Max Pause: %.3fms\n\
+";
+    char buffer[1024];
+    memset(buffer, 0, sizeof(buffer));
+    JS_snprintf(buffer, sizeof(buffer), format, t(total), t(longest));
+    return make_string_copy(buffer);
 }
 
 char16_t*
@@ -775,7 +775,6 @@
   : runtime(rt),
     startupTime(PRMJ_Now()),
     fp(nullptr),
-    fullFormat(false),
     gcDepth(0),
     nonincrementalReason_(nullptr),
     timedGCStart(0),
@@ -840,36 +839,30 @@
     }
 
     char* env = getenv("MOZ_GCTIMER");
-    if (!env || strcmp(env, "none") == 0) {
-        fp = nullptr;
-        return;
-    }
-
-    if (strcmp(env, "stdout") == 0) {
-        fullFormat = false;
-        fp = stdout;
-    } else if (strcmp(env, "stderr") == 0) {
-        fullFormat = false;
-        fp = stderr;
-    } else {
-        fullFormat = true;
-
-        fp = fopen(env, "a");
-        MOZ_ASSERT(fp);
+    if (env) {
+        if (strcmp(env, "none") == 0) {
+            fp = nullptr;
+        } else if (strcmp(env, "stdout") == 0) {
+            fp = stdout;
+        } else if (strcmp(env, "stderr") == 0) {
+            fp = stderr;
+        } else {
+            fp = fopen(env, "a");
+            if (!fp)
+                MOZ_CRASH("Failed to open MOZ_GCTIMER log file.");
+        }
     }
 }
 
 Statistics::~Statistics()
 {
     if (fp) {
-        if (fullFormat) {
-            StatisticsSerializer ss(StatisticsSerializer::AsText);
-            FormatPhaseTimes(ss, "", phaseTotals);
-            char* msg = ss.finishCString();
-            if (msg) {
-                fprintf(fp, "TOTALS\n%s\n\n-------\n", msg);
-                js_free(msg);
-            }
+        StatisticsSerializer ss(StatisticsSerializer::AsText);
+        FormatPhaseTimes(ss, "", phaseTotals);
+        char* msg = ss.finishCString();
+        if (msg) {
+            fprintf(fp, "TOTALS\n%s\n\n-------\n", msg);
+            js_free(msg);
         }
 
         if (fp != stdout && fp != stderr)
@@ -900,7 +893,7 @@
 }
 
 static int64_t
-SumPhase(Phase phase, int64_t (*times)[PHASE_LIMIT])
+SumPhase(Phase phase, Statistics::PhaseTimeTable times)
 {
     int64_t sum = 0;
     for (size_t i = 0; i < Statistics::MAX_MULTIPARENT_PHASES + 1; i++)
@@ -912,26 +905,11 @@
 Statistics::printStats()
 {
     if (aborted) {
-        if (fullFormat)
-            fprintf(fp, "OOM during GC statistics collection. The report is unavailable for this GC.\n");
-        fflush(fp);
-        return;
-    }
-
-    if (fullFormat) {
+        fprintf(fp, "OOM during GC statistics collection. The report is unavailable for this GC.\n");
+    } else {
         UniqueChars msg = formatDetailedMessage();
         if (msg)
             fprintf(fp, "GC(T+%.3fs) %s\n", t(slices[0].start - startupTime) / 1000.0, msg.get());
-    } else {
-        int64_t total, longest;
-        gcDuration(&total, &longest);
-
-        int64_t markTotal = SumPhase(PHASE_MARK, phaseTimes);
-        fprintf(fp, "%f %f %f\n",
-                t(total),
-                t(markTotal),
-                t(phaseTimes[PHASE_DAG_NONE][PHASE_SWEEP]));
-        MOZ_ASSERT(phaseExtra[PHASE_SWEEP].dagSlot == PHASE_DAG_NONE);
     }
     fflush(fp);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Statistics.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Statistics.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Statistics.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Statistics.h	2015-05-25 20:43:06.000000000 +0000
@@ -232,13 +232,16 @@
     SliceRange sliceRange() const { return slices.all(); }
     size_t slicesLength() const { return slices.length(); }
 
+    /* Create a convenient typedef for referring tables of phase times. */
+    typedef int64_t (*PhaseTimeTable)[PHASE_LIMIT];
+
   private:
     JSRuntime* runtime;
 
     int64_t startupTime;
 
+    /* File pointer used for MOZ_GCTIMER output. */
     FILE* fp;
-    bool fullFormat;
 
     /*
      * GCs can't really nest, but a second GC can be triggered from within the
@@ -311,10 +314,10 @@
     void printStats();
     bool formatData(StatisticsSerializer& ss, uint64_t timestamp);
 
-    UniqueChars formatDescription();
-    UniqueChars formatSliceDescription(unsigned i, const SliceData& slice);
-    UniqueChars formatTotals();
-    UniqueChars formatPhaseTimes(int64_t (*phaseTimes)[PHASE_LIMIT]);
+    UniqueChars formatDetailedDescription();
+    UniqueChars formatDetailedSliceDescription(unsigned i, const SliceData& slice);
+    UniqueChars formatDetailedPhaseTimes(PhaseTimeTable phaseTimes);
+    UniqueChars formatDetailedTotals();
 
     double computeMMU(int64_t resolution);
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Tracer.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Tracer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Tracer.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Tracer.cpp	2015-05-25 20:43:06.000000000 +0000
@@ -44,7 +44,7 @@
 DoCallback(JS::CallbackTracer* trc, T* thingp, const char* name)
 {
     CheckTracedThing(trc, *thingp);
-    JSGCTraceKind kind = MapTypeToTraceKind<typename mozilla::RemovePointer<T>::Type>::kind;
+    JS::TraceKind kind = MapTypeToTraceKind<typename mozilla::RemovePointer<T>::Type>::kind;
     JS::AutoTracingName ctx(trc, name);
     trc->invoke((void**)thingp, kind);
     return *thingp;
@@ -174,7 +174,7 @@
 }
 
 JS_PUBLIC_API(void)
-JS_TraceChildren(JSTracer* trc, void* thing, JSGCTraceKind kind)
+JS_TraceChildren(JSTracer* trc, void* thing, JS::TraceKind kind)
 {
     js::TraceChildren(trc, thing, kind);
 }
@@ -187,7 +187,7 @@
 };
 
 void
-js::TraceChildren(JSTracer* trc, void* thing, JSGCTraceKind kind)
+js::TraceChildren(JSTracer* trc, void* thing, JS::TraceKind kind)
 {
     MOZ_ASSERT(thing);
     TraceChildrenFunctor f;
@@ -256,6 +256,130 @@
 }
 
 
+/*** Cycle Collector Helpers **********************************************************************/
+
+// This function is used by the Cycle Collector (CC) to trace through -- or in
+// CC parlance, traverse -- a Shape tree. The CC does not care about Shapes or
+// BaseShapes, only the JSObjects held live by them. Thus, we walk the Shape
+// lineage, but only report non-Shape things. This effectively makes the entire
+// shape lineage into a single node in the CC, saving tremendous amounts of
+// space and time in its algorithms.
+//
+// The algorithm implemented here uses only bounded stack space. This would be
+// possible to implement outside the engine, but would require much extra
+// infrastructure and many, many more slow GOT lookups. We have implemented it
+// inside SpiderMonkey, despite the lack of general applicability, for the
+// simplicity and performance of FireFox's embedding of this engine.
+void
+gc::TraceCycleCollectorChildren(JS::CallbackTracer* trc, Shape* shape)
+{
+    // We need to mark the global, but it's OK to only do this once instead of
+    // doing it for every Shape in our lineage, since it's always the same
+    // global.
+    JSObject* global = shape->compartment()->unsafeUnbarrieredMaybeGlobal();
+    MOZ_ASSERT(global);
+    DoCallback(trc, &global, "global");
+
+    do {
+        MOZ_ASSERT(global == shape->compartment()->unsafeUnbarrieredMaybeGlobal());
+
+        MOZ_ASSERT(shape->base());
+        shape->base()->assertConsistency();
+
+        TraceEdge(trc, &shape->propidRef(), "propid");
+
+        if (shape->hasGetterObject()) {
+            JSObject* tmp = shape->getterObject();
+            DoCallback(trc, &tmp, "getter");
+            MOZ_ASSERT(tmp == shape->getterObject());
+        }
+
+        if (shape->hasSetterObject()) {
+            JSObject* tmp = shape->setterObject();
+            DoCallback(trc, &tmp, "setter");
+            MOZ_ASSERT(tmp == shape->setterObject());
+        }
+
+        shape = shape->previous();
+    } while (shape);
+}
+
+void
+TraceObjectGroupCycleCollectorChildrenCallback(JS::CallbackTracer* trc,
+                                               void** thingp, JS::TraceKind kind);
+
+// Object groups can point to other object groups via an UnboxedLayout or the
+// the original unboxed group link. There can potentially be deep or cyclic
+// chains of such groups to trace through without going through a thing that
+// participates in cycle collection. These need to be handled iteratively to
+// avoid blowing the stack when running the cycle collector's callback tracer.
+struct ObjectGroupCycleCollectorTracer : public JS::CallbackTracer
+{
+    explicit ObjectGroupCycleCollectorTracer(JS::CallbackTracer* innerTracer)
+        : JS::CallbackTracer(innerTracer->runtime(),
+                             TraceObjectGroupCycleCollectorChildrenCallback,
+                             DoNotTraceWeakMaps),
+          innerTracer(innerTracer)
+    {}
+
+    JS::CallbackTracer* innerTracer;
+    Vector<ObjectGroup*, 4, SystemAllocPolicy> seen, worklist;
+};
+
+void
+TraceObjectGroupCycleCollectorChildrenCallback(JS::CallbackTracer* trcArg,
+                                               void** thingp, JS::TraceKind kind)
+{
+    ObjectGroupCycleCollectorTracer* trc = static_cast<ObjectGroupCycleCollectorTracer*>(trcArg);
+    JS::GCCellPtr thing(*thingp, kind);
+
+    if (thing.isObject() || thing.isScript()) {
+        // Invoke the inner cycle collector callback on this child. It will not
+        // recurse back into TraceChildren.
+        trc->innerTracer->invoke(thingp, kind);
+        return;
+    }
+
+    if (thing.isObjectGroup()) {
+        // If this group is required to be in an ObjectGroup chain, trace it
+        // via the provided worklist rather than continuing to recurse.
+        ObjectGroup* group = static_cast<ObjectGroup*>(thing.asCell());
+        if (group->maybeUnboxedLayout()) {
+            for (size_t i = 0; i < trc->seen.length(); i++) {
+                if (trc->seen[i] == group)
+                    return;
+            }
+            if (trc->seen.append(group) && trc->worklist.append(group)) {
+                return;
+            } else {
+                // If append fails, keep tracing normally. The worst that will
+                // happen is we end up overrecursing.
+            }
+        }
+    }
+
+    TraceChildren(trc, thing.asCell(), thing.kind());
+}
+
+void
+gc::TraceCycleCollectorChildren(JS::CallbackTracer* trc, ObjectGroup* group)
+{
+    MOZ_ASSERT(trc->isCallbackTracer());
+
+    // Early return if this group is not required to be in an ObjectGroup chain.
+    if (!group->maybeUnboxedLayout())
+        return group->traceChildren(trc);
+
+    ObjectGroupCycleCollectorTracer groupTracer(trc->asCallbackTracer());
+    group->traceChildren(&groupTracer);
+
+    while (!groupTracer.worklist.empty()) {
+        ObjectGroup* innerGroup = groupTracer.worklist.popCopy();
+        innerGroup->traceChildren(&groupTracer);
+    }
+}
+
+
 /*** Traced Edge Printer *************************************************************************/
 
 static size_t
@@ -272,7 +396,7 @@
 
 JS_PUBLIC_API(void)
 JS_GetTraceThingInfo(char* buf, size_t bufsize, JSTracer* trc, void* thing,
-                     JSGCTraceKind kind, bool details)
+                     JS::TraceKind kind, bool details)
 {
     const char* name = nullptr; /* silence uninitialized warning */
     size_t n;
@@ -281,43 +405,43 @@
         return;
 
     switch (kind) {
-      case JSTRACE_OBJECT:
+      case JS::TraceKind::Object:
       {
         name = static_cast<JSObject*>(thing)->getClass()->name;
         break;
       }
 
-      case JSTRACE_SCRIPT:
+      case JS::TraceKind::Script:
         name = "script";
         break;
 
-      case JSTRACE_STRING:
+      case JS::TraceKind::String:
         name = ((JSString*)thing)->isDependent()
                ? "substring"
                : "string";
         break;
 
-      case JSTRACE_SYMBOL:
+      case JS::TraceKind::Symbol:
         name = "symbol";
         break;
 
-      case JSTRACE_BASE_SHAPE:
+      case JS::TraceKind::BaseShape:
         name = "base_shape";
         break;
 
-      case JSTRACE_JITCODE:
+      case JS::TraceKind::JitCode:
         name = "jitcode";
         break;
 
-      case JSTRACE_LAZY_SCRIPT:
+      case JS::TraceKind::LazyScript:
         name = "lazyscript";
         break;
 
-      case JSTRACE_SHAPE:
+      case JS::TraceKind::Shape:
         name = "shape";
         break;
 
-      case JSTRACE_OBJECT_GROUP:
+      case JS::TraceKind::ObjectGroup:
         name = "object_group";
         break;
 
@@ -336,7 +460,7 @@
 
     if (details && bufsize > 2) {
         switch (kind) {
-          case JSTRACE_OBJECT:
+          case JS::TraceKind::Object:
           {
             JSObject* obj = (JSObject*)thing;
             if (obj->is<JSFunction>()) {
@@ -354,14 +478,14 @@
             break;
           }
 
-          case JSTRACE_SCRIPT:
+          case JS::TraceKind::Script:
           {
             JSScript* script = static_cast<JSScript*>(thing);
             JS_snprintf(buf, bufsize, " %s:%" PRIuSIZE, script->filename(), script->lineno());
             break;
           }
 
-          case JSTRACE_STRING:
+          case JS::TraceKind::String:
           {
             *buf++ = ' ';
             bufsize--;
@@ -384,7 +508,7 @@
             break;
           }
 
-          case JSTRACE_SYMBOL:
+          case JS::TraceKind::Symbol:
           {
             JS::Symbol* sym = static_cast<JS::Symbol*>(thing);
             if (JSString* desc = sym->description()) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Tracer.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Tracer.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Tracer.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Tracer.h	2015-05-25 20:43:06.000000000 +0000
@@ -109,14 +109,20 @@
 void
 TraceManuallyBarrieredGenericPointerEdge(JSTracer* trc, gc::Cell** thingp, const char* name);
 
-// Object slots are not stored as a contiguous vector, so marking them as such
-// will lead to the wrong indicies, if such are requested when tracing.
+// Depricated. Please use one of the strongly typed variants above.
 void
-TraceObjectSlots(JSTracer* trc, NativeObject* obj, uint32_t start, uint32_t nslots);
+TraceChildren(JSTracer* trc, void* thing, JS::TraceKind kind);
 
-// Depricated. Please use one of the strongly typed variants above.
+namespace gc {
+
+// Trace through a shape or group iteratively during cycle collection to avoid
+// deep or infinite recursion.
 void
-TraceChildren(JSTracer* trc, void* thing, JSGCTraceKind kind);
+TraceCycleCollectorChildren(JS::CallbackTracer* trc, Shape* shape);
+void
+TraceCycleCollectorChildren(JS::CallbackTracer* trc, ObjectGroup* group);
+
+} // namespace gc
 
 } // namespace js
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Verifier.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Verifier.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Verifier.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Verifier.cpp	2015-05-25 20:43:06.000000000 +0000
@@ -50,14 +50,14 @@
 struct EdgeValue
 {
     void* thing;
-    JSGCTraceKind kind;
+    JS::TraceKind kind;
     const char* label;
 };
 
 struct VerifyNode
 {
     void* thing;
-    JSGCTraceKind kind;
+    JS::TraceKind kind;
     uint32_t count;
     EdgeValue edges[1];
 };
@@ -109,7 +109,7 @@
  * node.
  */
 static void
-AccumulateEdge(JS::CallbackTracer* jstrc, void** thingp, JSGCTraceKind kind)
+AccumulateEdge(JS::CallbackTracer* jstrc, void** thingp, JS::TraceKind kind)
 {
     VerifyPreTracer* trc = (VerifyPreTracer*)jstrc;
 
@@ -131,7 +131,7 @@
 }
 
 static VerifyNode*
-MakeNode(VerifyPreTracer* trc, void* thing, JSGCTraceKind kind)
+MakeNode(VerifyPreTracer* trc, void* thing, JS::TraceKind kind)
 {
     NodeMap::AddPtr p = trc->nodemap.lookupForAdd(thing);
     if (!p) {
@@ -202,7 +202,7 @@
         goto oom;
 
     /* Create the root node. */
-    trc->curnode = MakeNode(trc, nullptr, JSGCTraceKind(0));
+    trc->curnode = MakeNode(trc, nullptr, JS::TraceKind(0));
 
     incrementalState = MARK_ROOTS;
 
@@ -265,7 +265,7 @@
  * been modified) must point to marked objects.
  */
 static void
-CheckEdge(JS::CallbackTracer* jstrc, void** thingp, JSGCTraceKind kind)
+CheckEdge(JS::CallbackTracer* jstrc, void** thingp, JS::TraceKind kind)
 {
     VerifyPreTracer* trc = (VerifyPreTracer*)jstrc;
     VerifyNode* node = trc->curnode;
@@ -290,9 +290,9 @@
         return;
 
     // Permanent atoms and well-known symbols aren't marked during graph traversal.
-    if (edge.kind == JSTRACE_STRING && static_cast<JSString*>(edge.thing)->isPermanentAtom())
+    if (edge.kind == JS::TraceKind::String && static_cast<JSString*>(edge.thing)->isPermanentAtom())
         return;
-    if (edge.kind == JSTRACE_SYMBOL && static_cast<JS::Symbol*>(edge.thing)->isWellKnownSymbol())
+    if (edge.kind == JS::TraceKind::Symbol && static_cast<JS::Symbol*>(edge.thing)->isWellKnownSymbol())
         return;
 
     char msgbuf[1024];
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Zone.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Zone.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/gc/Zone.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/gc/Zone.cpp	2015-05-25 20:43:06.000000000 +0000
@@ -14,6 +14,7 @@
 #include "vm/Debugger.h"
 #include "vm/Runtime.h"
 
+#include "jscompartmentinlines.h"
 #include "jsgcinlines.h"
 
 using namespace js;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/gdb/tests/test-JSSymbol.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/gdb/tests/test-JSSymbol.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/gdb/tests/test-JSSymbol.cpp	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/gdb/tests/test-JSSymbol.cpp	2015-05-25 20:43:07.000000000 +0000
@@ -6,7 +6,7 @@
 
   RootedString hello(cx, JS_NewStringCopyZ(cx, "Hello!"));
 
-  Rooted<Symbol*> unique(cx, NewSymbol(cx, NullPtr()));
+  Rooted<Symbol*> unique(cx, NewSymbol(cx, nullptr));
   Rooted<Symbol*> unique_with_desc(cx, NewSymbol(cx, hello));
   Rooted<Symbol*> registry(cx, GetSymbolFor(cx, hello));
   Rooted<Symbol*> well_known(cx, GetWellKnownSymbol(cx, SymbolCode::iterator));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/irregexp/RegExpParser.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/irregexp/RegExpParser.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/irregexp/RegExpParser.h	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/irregexp/RegExpParser.h	2015-05-25 20:43:07.000000000 +0000
@@ -178,7 +178,6 @@
 
     RegExpTree* ParsePattern();
     RegExpTree* ParseDisjunction();
-    RegExpTree* ParseGroup();
     RegExpTree* ParseCharacterClass();
 
     // Parses a {...,...} quantifier and stores the range in the given
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm/CodeGenerator-arm.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm/CodeGenerator-arm.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm/CodeGenerator-arm.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm/CodeGenerator-arm.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -1009,11 +1009,11 @@
 }
 
 MoveOperand
-CodeGeneratorARM::toMoveOperand(const LAllocation* a) const
+CodeGeneratorARM::toMoveOperand(LAllocation a) const
 {
-    if (a->isGeneralReg())
+    if (a.isGeneralReg())
         return MoveOperand(ToRegister(a));
-    if (a->isFloatReg())
+    if (a.isFloatReg())
         return MoveOperand(ToFloatRegister(a));
     int32_t offset = ToStackOffset(a);
     MOZ_ASSERT((offset & 3) == 0);
@@ -1708,13 +1708,6 @@
 }
 
 void
-DispatchIonCache::initializeAddCacheState(LInstruction* ins, AddCacheState* addState)
-{
-    // Can always use the scratch register on ARM.
-    addState->dispatchScratch = ScratchRegister;
-}
-
-void
 CodeGeneratorARM::visitLoadTypedArrayElementStatic(LLoadTypedArrayElementStatic* ins)
 {
     MOZ_CRASH("NYI");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm/CodeGenerator-arm.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm/CodeGenerator-arm.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm/CodeGenerator-arm.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm/CodeGenerator-arm.h	2015-05-25 20:43:22.000000000 +0000
@@ -43,7 +43,7 @@
         return ToOperand(def->output());
     }
 
-    MoveOperand toMoveOperand(const LAllocation* a) const;
+    MoveOperand toMoveOperand(LAllocation a) const;
 
     void bailoutIf(Assembler::Condition condition, LSnapshot* snapshot);
     void bailoutFrom(Label* label, LSnapshot* snapshot);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm/MacroAssembler-arm.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm/MacroAssembler-arm.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm/MacroAssembler-arm.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm/MacroAssembler-arm.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -3562,10 +3562,9 @@
 void
 MacroAssemblerARMCompat::pushValue(const Address& addr)
 {
-    MOZ_ASSERT(addr.base != StackPointer);
     Operand srcOp = Operand(addr);
-    Operand payload = ToPayload(srcOp);
     Operand type = ToType(srcOp);
+    Operand payload = ToPayloadAfterStackPush(srcOp);
 
     ma_ldr(type, ScratchRegister);
     ma_push(ScratchRegister);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm/MacroAssembler-arm.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm/MacroAssembler-arm.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm/MacroAssembler-arm.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm/MacroAssembler-arm.h	2015-05-25 20:43:22.000000000 +0000
@@ -55,6 +55,15 @@
         return ToType(Operand(base)).toAddress();
     }
 
+    Operand ToPayloadAfterStackPush(Operand base) {
+        Register baseReg = Register::FromCode(base.base());
+        // If we are based on StackPointer, pass over the type tag just pushed.
+        if (baseReg == StackPointer)
+            return Operand(Register::FromCode(base.base()), base.disp() + sizeof(void*));
+        else
+            return ToPayload(base);
+    }
+
   public:
     MacroAssemblerARM()
       : secondScratchReg_(lr)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm/Simulator-arm.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm/Simulator-arm.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm/Simulator-arm.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm/Simulator-arm.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -957,8 +957,9 @@
         return p->value();
 
     CachePage* new_page = js_new<CachePage>();
-    if (!i_cache.add(p, page, new_page))
-        return nullptr;
+    if (!new_page || !i_cache.add(p, page, new_page))
+        CrashAtUnhandlableOOM("Simulator CachePage");
+
     return new_page;
 }
 
@@ -1186,11 +1187,8 @@
         }
 
         Redirection* redir = (Redirection*)js_malloc(sizeof(Redirection));
-        if (!redir) {
-            MOZ_ReportAssertionFailure("[unhandlable oom] Simulator redirection",
-                                       __FILE__, __LINE__);
-            MOZ_CRASH();
-        }
+        if (!redir)
+            CrashAtUnhandlableOOM("Simulator redirection");
         new(redir) Redirection(nativeFunction, type, sim);
         return redir;
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Assembler-vixl.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Assembler-vixl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Assembler-vixl.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Assembler-vixl.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,2171 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#include "jit/arm64/vixl/Assembler-vixl.h"
+
+#include <cmath>
+
+#include "jsutil.h"
+
+#include "jit/Label.h"
+
+namespace vixl {
+
+
+// CPURegList utilities.
+CPURegister CPURegList::PopLowestIndex() {
+  if (IsEmpty())
+    return NoCPUReg;
+
+  int index = CountTrailingZeros(list_, kRegListSizeInBits);
+  VIXL_ASSERT((1 << index) & list_);
+  Remove(index);
+  return CPURegister(index, size_, type_);
+}
+
+
+CPURegister CPURegList::PopHighestIndex() {
+  VIXL_ASSERT(IsValid());
+  if (IsEmpty())
+    return NoCPUReg;
+
+  int index = CountLeadingZeros(list_, kRegListSizeInBits);
+  index = kRegListSizeInBits - 1 - index;
+  VIXL_ASSERT((1 << index) & list_);
+  Remove(index);
+  return CPURegister(index, size_, type_);
+}
+
+
+bool CPURegList::IsValid() const {
+  if ((type_ == CPURegister::kRegister) || (type_ == CPURegister::kFPRegister)) {
+    bool is_valid = true;
+    // Try to create a CPURegister for each element in the list.
+    for (int i = 0; i < kRegListSizeInBits; i++) {
+      if (((list_ >> i) & 1) != 0)
+        is_valid &= CPURegister(i, size_, type_).IsValid();
+    }
+    return is_valid;
+  }
+
+  if (type_ == CPURegister::kNoRegister) {
+    // We can't use IsEmpty here because that asserts IsValid().
+    return list_ == 0;
+  }
+
+  return false;
+}
+
+
+void CPURegList::RemoveCalleeSaved() {
+  if (type() == CPURegister::kRegister) {
+    Remove(GetCalleeSaved(RegisterSizeInBits()));
+  } else if (type() == CPURegister::kFPRegister) {
+    Remove(GetCalleeSavedFP(RegisterSizeInBits()));
+  } else {
+    VIXL_ASSERT(type() == CPURegister::kNoRegister);
+    VIXL_ASSERT(IsEmpty());
+    // The list must already be empty, so do nothing.
+  }
+}
+
+
+CPURegList CPURegList::GetCalleeSaved(unsigned size) {
+  return CPURegList(CPURegister::kRegister, size, 19, 29);
+}
+
+
+CPURegList CPURegList::GetCalleeSavedFP(unsigned size) {
+  return CPURegList(CPURegister::kFPRegister, size, 8, 15);
+}
+
+
+CPURegList CPURegList::GetCallerSaved(unsigned size) {
+  // Registers x0-x18 and lr (x30) are caller-saved.
+  CPURegList list = CPURegList(CPURegister::kRegister, size, 0, 18);
+  list.Combine(vixl::lr);
+  return list;
+}
+
+
+CPURegList CPURegList::GetCallerSavedFP(unsigned size) {
+  // Registers d0-d7 and d16-d31 are caller-saved.
+  CPURegList list = CPURegList(CPURegister::kFPRegister, size, 0, 7);
+  list.Combine(CPURegList(CPURegister::kFPRegister, size, 16, 31));
+  return list;
+}
+
+
+const CPURegList kCalleeSaved = CPURegList::GetCalleeSaved();
+const CPURegList kCalleeSavedFP = CPURegList::GetCalleeSavedFP();
+const CPURegList kCallerSaved = CPURegList::GetCallerSaved();
+const CPURegList kCallerSavedFP = CPURegList::GetCallerSavedFP();
+
+
+// Registers.
+#define WREG(n) w##n,
+const Register Register::wregisters[] = {
+  REGISTER_CODE_LIST(WREG)
+};
+#undef WREG
+
+
+#define XREG(n) x##n,
+const Register Register::xregisters[] = {
+  REGISTER_CODE_LIST(XREG)
+};
+#undef XREG
+
+
+#define SREG(n) s##n,
+const FPRegister FPRegister::sregisters[] = {
+  REGISTER_CODE_LIST(SREG)
+};
+#undef SREG
+
+
+#define DREG(n) d##n,
+const FPRegister FPRegister::dregisters[] = {
+  REGISTER_CODE_LIST(DREG)
+};
+#undef DREG
+
+
+const Register& Register::WRegFromCode(unsigned code) {
+  if (code == kSPRegInternalCode)
+    return wsp;
+  VIXL_ASSERT(code < kNumberOfRegisters);
+  return wregisters[code];
+}
+
+
+const Register& Register::XRegFromCode(unsigned code) {
+  if (code == kSPRegInternalCode)
+    return sp;
+  VIXL_ASSERT(code < kNumberOfRegisters);
+  return xregisters[code];
+}
+
+
+const FPRegister& FPRegister::SRegFromCode(unsigned code) {
+  VIXL_ASSERT(code < kNumberOfFPRegisters);
+  return sregisters[code];
+}
+
+
+const FPRegister& FPRegister::DRegFromCode(unsigned code) {
+  VIXL_ASSERT(code < kNumberOfFPRegisters);
+  return dregisters[code];
+}
+
+
+const Register& CPURegister::W() const {
+  VIXL_ASSERT(IsValidRegister());
+  return Register::WRegFromCode(code_);
+}
+
+
+const Register& CPURegister::X() const {
+  VIXL_ASSERT(IsValidRegister());
+  return Register::XRegFromCode(code_);
+}
+
+
+const FPRegister& CPURegister::S() const {
+  VIXL_ASSERT(IsValidFPRegister());
+  return FPRegister::SRegFromCode(code_);
+}
+
+
+const FPRegister& CPURegister::D() const {
+  VIXL_ASSERT(IsValidFPRegister());
+  return FPRegister::DRegFromCode(code_);
+
+}
+
+
+// Operand.
+Operand::Operand(int64_t immediate)
+  : immediate_(immediate),
+    reg_(NoReg),
+    shift_(NO_SHIFT),
+    extend_(NO_EXTEND),
+    shift_amount_(0) {
+}
+
+
+Operand::Operand(Register reg, Shift shift, unsigned shift_amount)
+  : reg_(reg),
+    shift_(shift),
+    extend_(NO_EXTEND),
+    shift_amount_(shift_amount) {
+  VIXL_ASSERT(reg.Is64Bits() || (shift_amount < kWRegSize));
+  VIXL_ASSERT(reg.Is32Bits() || (shift_amount < kXRegSize));
+  VIXL_ASSERT(!reg.IsSP());
+}
+
+
+Operand::Operand(Register reg, Extend extend, unsigned shift_amount)
+  : reg_(reg),
+    shift_(NO_SHIFT),
+    extend_(extend),
+    shift_amount_(shift_amount) {
+  VIXL_ASSERT(reg.IsValid());
+  VIXL_ASSERT(shift_amount <= 4);
+  VIXL_ASSERT(!reg.IsSP());
+
+  // Extend modes SXTX and UXTX require a 64-bit register.
+  VIXL_ASSERT(reg.Is64Bits() || ((extend != SXTX) && (extend != UXTX)));
+}
+
+
+bool Operand::IsImmediate() const {
+  return reg_.Is(NoReg);
+}
+
+
+bool Operand::IsShiftedRegister() const {
+  return reg_.IsValid() && (shift_ != NO_SHIFT);
+}
+
+
+bool Operand::IsExtendedRegister() const {
+  return reg_.IsValid() && (extend_ != NO_EXTEND);
+}
+
+
+bool Operand::IsZero() const {
+  if (IsImmediate())
+    return immediate() == 0;
+  return reg().IsZero();
+}
+
+
+Operand Operand::ToExtendedRegister() const {
+  VIXL_ASSERT(IsShiftedRegister());
+  VIXL_ASSERT((shift_ == LSL) && (shift_amount_ <= 4));
+  return Operand(reg_, reg_.Is64Bits() ? UXTX : UXTW, shift_amount_);
+}
+
+
+// MemOperand
+MemOperand::MemOperand(Register base, ptrdiff_t offset, AddrMode addrmode)
+  : base_(base), regoffset_(NoReg), offset_(offset), addrmode_(addrmode) {
+  VIXL_ASSERT(base.Is64Bits() && !base.IsZero());
+}
+
+
+MemOperand::MemOperand(Register base, Register regoffset,
+                       Extend extend, unsigned shift_amount)
+  : base_(base), regoffset_(regoffset), offset_(0), addrmode_(Offset),
+    shift_(NO_SHIFT), extend_(extend), shift_amount_(shift_amount) {
+  VIXL_ASSERT(base.Is64Bits() && !base.IsZero());
+  VIXL_ASSERT(!regoffset.IsSP());
+  VIXL_ASSERT((extend == UXTW) || (extend == SXTW) || (extend == SXTX));
+
+  // SXTX extend mode requires a 64-bit offset register.
+  VIXL_ASSERT(regoffset.Is64Bits() || (extend != SXTX));
+}
+
+
+MemOperand::MemOperand(Register base, Register regoffset,
+                       Shift shift, unsigned shift_amount)
+  : base_(base), regoffset_(regoffset), offset_(0), addrmode_(Offset),
+    shift_(shift), extend_(NO_EXTEND), shift_amount_(shift_amount) {
+  VIXL_ASSERT(base.Is64Bits() && !base.IsZero());
+  VIXL_ASSERT(regoffset.Is64Bits() && !regoffset.IsSP());
+  VIXL_ASSERT(shift == LSL);
+}
+
+
+MemOperand::MemOperand(Register base, const Operand& offset, AddrMode addrmode)
+  : base_(base), regoffset_(NoReg), addrmode_(addrmode) {
+  VIXL_ASSERT(base.Is64Bits() && !base.IsZero());
+
+  if (offset.IsImmediate()) {
+    offset_ = offset.immediate();
+  } else if (offset.IsShiftedRegister()) {
+    VIXL_ASSERT(addrmode == Offset);
+
+    regoffset_ = offset.reg();
+    shift_= offset.shift();
+    shift_amount_ = offset.shift_amount();
+
+    extend_ = NO_EXTEND;
+    offset_ = 0;
+
+    // These assertions match those in the shifted-register constructor.
+    VIXL_ASSERT(regoffset_.Is64Bits() && !regoffset_.IsSP());
+    VIXL_ASSERT(shift_ == LSL);
+  } else {
+    VIXL_ASSERT(offset.IsExtendedRegister());
+    VIXL_ASSERT(addrmode == Offset);
+
+    regoffset_ = offset.reg();
+    extend_ = offset.extend();
+    shift_amount_ = offset.shift_amount();
+
+    shift_= NO_SHIFT;
+    offset_ = 0;
+
+    // These assertions match those in the extended-register constructor.
+    VIXL_ASSERT(!regoffset_.IsSP());
+    VIXL_ASSERT((extend_ == UXTW) || (extend_ == SXTW) || (extend_ == SXTX));
+    VIXL_ASSERT((regoffset_.Is64Bits() || (extend_ != SXTX)));
+  }
+}
+
+
+bool MemOperand::IsImmediateOffset() const {
+  return (addrmode_ == Offset) && regoffset_.Is(NoReg);
+}
+
+
+bool MemOperand::IsRegisterOffset() const {
+  return (addrmode_ == Offset) && !regoffset_.Is(NoReg);
+}
+
+
+bool MemOperand::IsPreIndex() const {
+  return addrmode_ == PreIndex;
+}
+
+
+bool MemOperand::IsPostIndex() const {
+  return addrmode_ == PostIndex;
+}
+
+
+
+
+
+
+
+// Code generation.
+void Assembler::br(const Register& xn) {
+  VIXL_ASSERT(xn.Is64Bits());
+  // No need for EmitBranch(): no immediate offset needs fixing.
+  Emit(BR | Rn(xn));
+}
+
+
+void Assembler::br(Instruction * at, const Register& xn) {
+  VIXL_ASSERT(xn.Is64Bits());
+  // No need for EmitBranch(): no immediate offset needs fixing.
+  Emit(at, BR | Rn(xn));
+}
+
+
+void Assembler::blr(const Register& xn) {
+  VIXL_ASSERT(xn.Is64Bits());
+  // No need for EmitBranch(): no immediate offset needs fixing.
+  Emit(BLR | Rn(xn));
+}
+
+
+void Assembler::blr(Instruction* at, const Register& xn) {
+  VIXL_ASSERT(xn.Is64Bits());
+  // No need for EmitBranch(): no immediate offset needs fixing.
+  Emit(at, BLR | Rn(xn));
+}
+
+
+void Assembler::ret(const Register& xn) {
+  VIXL_ASSERT(xn.Is64Bits());
+  // No need for EmitBranch(): no immediate offset needs fixing.
+  Emit(RET | Rn(xn));
+}
+
+
+
+
+
+
+
+
+
+
+void Assembler::add(const Register& rd, const Register& rn, const Operand& operand) {
+  AddSub(rd, rn, operand, LeaveFlags, ADD);
+}
+
+
+void Assembler::adds(const Register& rd, const Register& rn, const Operand& operand) {
+  AddSub(rd, rn, operand, SetFlags, ADD);
+}
+
+
+void Assembler::cmn(const Register& rn, const Operand& operand) {
+  Register zr = AppropriateZeroRegFor(rn);
+  adds(zr, rn, operand);
+}
+
+
+void Assembler::sub(const Register& rd, const Register& rn, const Operand& operand) {
+  AddSub(rd, rn, operand, LeaveFlags, SUB);
+}
+
+
+void Assembler::subs(const Register& rd, const Register& rn, const Operand& operand) {
+  AddSub(rd, rn, operand, SetFlags, SUB);
+}
+
+
+void Assembler::cmp(const Register& rn, const Operand& operand) {
+  Register zr = AppropriateZeroRegFor(rn);
+  subs(zr, rn, operand);
+}
+
+
+void Assembler::neg(const Register& rd, const Operand& operand) {
+  Register zr = AppropriateZeroRegFor(rd);
+  sub(rd, zr, operand);
+}
+
+
+void Assembler::negs(const Register& rd, const Operand& operand) {
+  Register zr = AppropriateZeroRegFor(rd);
+  subs(rd, zr, operand);
+}
+
+
+void Assembler::adc(const Register& rd, const Register& rn, const Operand& operand) {
+  AddSubWithCarry(rd, rn, operand, LeaveFlags, ADC);
+}
+
+
+void Assembler::adcs(const Register& rd, const Register& rn, const Operand& operand) {
+  AddSubWithCarry(rd, rn, operand, SetFlags, ADC);
+}
+
+
+void Assembler::sbc(const Register& rd, const Register& rn, const Operand& operand) {
+  AddSubWithCarry(rd, rn, operand, LeaveFlags, SBC);
+}
+
+
+void Assembler::sbcs(const Register& rd, const Register& rn, const Operand& operand) {
+  AddSubWithCarry(rd, rn, operand, SetFlags, SBC);
+}
+
+
+void Assembler::ngc(const Register& rd, const Operand& operand) {
+  Register zr = AppropriateZeroRegFor(rd);
+  sbc(rd, zr, operand);
+}
+
+
+void Assembler::ngcs(const Register& rd, const Operand& operand) {
+  Register zr = AppropriateZeroRegFor(rd);
+  sbcs(rd, zr, operand);
+}
+
+
+// Logical instructions.
+void Assembler::and_(const Register& rd, const Register& rn, const Operand& operand) {
+  Logical(rd, rn, operand, AND);
+}
+
+
+void Assembler::bic(const Register& rd, const Register& rn, const Operand& operand) {
+  Logical(rd, rn, operand, BIC);
+}
+
+
+void Assembler::bics(const Register& rd, const Register& rn, const Operand& operand) {
+  Logical(rd, rn, operand, BICS);
+}
+
+
+void Assembler::orr(const Register& rd, const Register& rn, const Operand& operand) {
+  Logical(rd, rn, operand, ORR);
+}
+
+
+void Assembler::orn(const Register& rd, const Register& rn, const Operand& operand) {
+  Logical(rd, rn, operand, ORN);
+}
+
+
+void Assembler::eor(const Register& rd, const Register& rn, const Operand& operand) {
+  Logical(rd, rn, operand, EOR);
+}
+
+
+void Assembler::eon(const Register& rd, const Register& rn, const Operand& operand) {
+  Logical(rd, rn, operand, EON);
+}
+
+
+void Assembler::lslv(const Register& rd, const Register& rn, const Register& rm) {
+  VIXL_ASSERT(rd.size() == rn.size());
+  VIXL_ASSERT(rd.size() == rm.size());
+  Emit(SF(rd) | LSLV | Rm(rm) | Rn(rn) | Rd(rd));
+}
+
+
+void Assembler::lsrv(const Register& rd, const Register& rn, const Register& rm) {
+  VIXL_ASSERT(rd.size() == rn.size());
+  VIXL_ASSERT(rd.size() == rm.size());
+  Emit(SF(rd) | LSRV | Rm(rm) | Rn(rn) | Rd(rd));
+}
+
+
+void Assembler::asrv(const Register& rd, const Register& rn, const Register& rm) {
+  VIXL_ASSERT(rd.size() == rn.size());
+  VIXL_ASSERT(rd.size() == rm.size());
+  Emit(SF(rd) | ASRV | Rm(rm) | Rn(rn) | Rd(rd));
+}
+
+
+void Assembler::rorv(const Register& rd, const Register& rn, const Register& rm) {
+  VIXL_ASSERT(rd.size() == rn.size());
+  VIXL_ASSERT(rd.size() == rm.size());
+  Emit(SF(rd) | RORV | Rm(rm) | Rn(rn) | Rd(rd));
+}
+
+
+// Bitfield operations.
+void Assembler::bfm(const Register& rd, const Register& rn, unsigned immr, unsigned imms) {
+  VIXL_ASSERT(rd.size() == rn.size());
+  Instr N = SF(rd) >> (kSFOffset - kBitfieldNOffset);
+  Emit(SF(rd) | BFM | N |
+       ImmR(immr, rd.size()) | ImmS(imms, rn.size()) | Rn(rn) | Rd(rd));
+}
+
+
+void Assembler::sbfm(const Register& rd, const Register& rn, unsigned immr, unsigned imms) {
+  VIXL_ASSERT(rd.Is64Bits() || rn.Is32Bits());
+  Instr N = SF(rd) >> (kSFOffset - kBitfieldNOffset);
+  Emit(SF(rd) | SBFM | N |
+       ImmR(immr, rd.size()) | ImmS(imms, rn.size()) | Rn(rn) | Rd(rd));
+}
+
+
+void Assembler::ubfm(const Register& rd, const Register& rn, unsigned immr, unsigned imms) {
+  VIXL_ASSERT(rd.size() == rn.size());
+  Instr N = SF(rd) >> (kSFOffset - kBitfieldNOffset);
+  Emit(SF(rd) | UBFM | N |
+       ImmR(immr, rd.size()) | ImmS(imms, rn.size()) | Rn(rn) | Rd(rd));
+}
+
+
+void Assembler::extr(const Register& rd, const Register& rn,
+                     const Register& rm, unsigned lsb) {
+  VIXL_ASSERT(rd.size() == rn.size());
+  VIXL_ASSERT(rd.size() == rm.size());
+  Instr N = SF(rd) >> (kSFOffset - kBitfieldNOffset);
+  Emit(SF(rd) | EXTR | N | Rm(rm) | ImmS(lsb, rn.size()) | Rn(rn) | Rd(rd));
+}
+
+
+void Assembler::csel(const Register& rd, const Register& rn,
+                     const Register& rm, Condition cond) {
+  ConditionalSelect(rd, rn, rm, cond, CSEL);
+}
+
+
+void Assembler::csinc(const Register& rd, const Register& rn,
+                      const Register& rm, Condition cond) {
+  ConditionalSelect(rd, rn, rm, cond, CSINC);
+}
+
+
+void Assembler::csinv(const Register& rd, const Register& rn,
+                      const Register& rm, Condition cond) {
+  ConditionalSelect(rd, rn, rm, cond, CSINV);
+}
+
+
+void Assembler::csneg(const Register& rd, const Register& rn,
+                      const Register& rm, Condition cond) {
+  ConditionalSelect(rd, rn, rm, cond, CSNEG);
+}
+
+
+void Assembler::cset(const Register& rd, Condition cond) {
+  VIXL_ASSERT((cond != al) && (cond != nv));
+  Register zr = AppropriateZeroRegFor(rd);
+  csinc(rd, zr, zr, InvertCondition(cond));
+}
+
+
+void Assembler::csetm(const Register& rd, Condition cond) {
+  VIXL_ASSERT((cond != al) && (cond != nv));
+  Register zr = AppropriateZeroRegFor(rd);
+  csinv(rd, zr, zr, InvertCondition(cond));
+}
+
+
+void Assembler::cinc(const Register& rd, const Register& rn, Condition cond) {
+  VIXL_ASSERT((cond != al) && (cond != nv));
+  csinc(rd, rn, rn, InvertCondition(cond));
+}
+
+
+void Assembler::cinv(const Register& rd, const Register& rn, Condition cond) {
+  VIXL_ASSERT((cond != al) && (cond != nv));
+  csinv(rd, rn, rn, InvertCondition(cond));
+}
+
+
+void Assembler::cneg(const Register& rd, const Register& rn, Condition cond) {
+  VIXL_ASSERT((cond != al) && (cond != nv));
+  csneg(rd, rn, rn, InvertCondition(cond));
+}
+
+
+void Assembler::ConditionalSelect(const Register& rd, const Register& rn,
+                                  const Register& rm, Condition cond,
+                                  ConditionalSelectOp op) {
+  VIXL_ASSERT(rd.size() == rn.size());
+  VIXL_ASSERT(rd.size() == rm.size());
+  Emit(SF(rd) | op | Rm(rm) | Cond(cond) | Rn(rn) | Rd(rd));
+}
+
+
+void Assembler::ccmn(const Register& rn, const Operand& operand, StatusFlags nzcv, Condition cond) {
+  ConditionalCompare(rn, operand, nzcv, cond, CCMN);
+}
+
+
+void Assembler::ccmp(const Register& rn, const Operand& operand, StatusFlags nzcv, Condition cond) {
+  ConditionalCompare(rn, operand, nzcv, cond, CCMP);
+}
+
+
+void Assembler::DataProcessing3Source(const Register& rd, const Register& rn,
+                                      const Register& rm, const Register& ra,
+                                      DataProcessing3SourceOp op) {
+  Emit(SF(rd) | op | Rm(rm) | Ra(ra) | Rn(rn) | Rd(rd));
+}
+
+
+void Assembler::mul(const Register& rd, const Register& rn, const Register& rm) {
+  VIXL_ASSERT(AreSameSizeAndType(rd, rn, rm));
+  DataProcessing3Source(rd, rn, rm, AppropriateZeroRegFor(rd), MADD);
+}
+
+
+void Assembler::madd(const Register& rd, const Register& rn,
+                     const Register& rm, const Register& ra) {
+  DataProcessing3Source(rd, rn, rm, ra, MADD);
+}
+
+
+void Assembler::mneg(const Register& rd, const Register& rn, const Register& rm) {
+  VIXL_ASSERT(AreSameSizeAndType(rd, rn, rm));
+  DataProcessing3Source(rd, rn, rm, AppropriateZeroRegFor(rd), MSUB);
+}
+
+
+void Assembler::msub(const Register& rd, const Register& rn,
+                     const Register& rm, const Register& ra) {
+  DataProcessing3Source(rd, rn, rm, ra, MSUB);
+}
+
+
+void Assembler::umaddl(const Register& rd, const Register& rn,
+                       const Register& rm, const Register& ra) {
+  VIXL_ASSERT(rd.Is64Bits() && ra.Is64Bits());
+  VIXL_ASSERT(rn.Is32Bits() && rm.Is32Bits());
+  DataProcessing3Source(rd, rn, rm, ra, UMADDL_x);
+}
+
+
+void Assembler::smaddl(const Register& rd, const Register& rn,
+                       const Register& rm, const Register& ra) {
+  VIXL_ASSERT(rd.Is64Bits() && ra.Is64Bits());
+  VIXL_ASSERT(rn.Is32Bits() && rm.Is32Bits());
+  DataProcessing3Source(rd, rn, rm, ra, SMADDL_x);
+}
+
+
+void Assembler::umsubl(const Register& rd, const Register& rn,
+                       const Register& rm, const Register& ra) {
+  VIXL_ASSERT(rd.Is64Bits() && ra.Is64Bits());
+  VIXL_ASSERT(rn.Is32Bits() && rm.Is32Bits());
+  DataProcessing3Source(rd, rn, rm, ra, UMSUBL_x);
+}
+
+
+void Assembler::smsubl(const Register& rd, const Register& rn,
+                       const Register& rm, const Register& ra) {
+  VIXL_ASSERT(rd.Is64Bits() && ra.Is64Bits());
+  VIXL_ASSERT(rn.Is32Bits() && rm.Is32Bits());
+  DataProcessing3Source(rd, rn, rm, ra, SMSUBL_x);
+}
+
+
+void Assembler::smull(const Register& rd, const Register& rn, const Register& rm) {
+  VIXL_ASSERT(rd.Is64Bits());
+  VIXL_ASSERT(rn.Is32Bits() && rm.Is32Bits());
+  DataProcessing3Source(rd, rn, rm, xzr, SMADDL_x);
+}
+
+
+void Assembler::sdiv(const Register& rd, const Register& rn, const Register& rm) {
+  VIXL_ASSERT(rd.size() == rn.size());
+  VIXL_ASSERT(rd.size() == rm.size());
+  Emit(SF(rd) | SDIV | Rm(rm) | Rn(rn) | Rd(rd));
+}
+
+
+void Assembler::smulh(const Register& xd, const Register& xn, const Register& xm) {
+  VIXL_ASSERT(xd.Is64Bits() && xn.Is64Bits() && xm.Is64Bits());
+  DataProcessing3Source(xd, xn, xm, xzr, SMULH_x);
+}
+
+
+void Assembler::udiv(const Register& rd, const Register& rn, const Register& rm) {
+  VIXL_ASSERT(rd.size() == rn.size());
+  VIXL_ASSERT(rd.size() == rm.size());
+  Emit(SF(rd) | UDIV | Rm(rm) | Rn(rn) | Rd(rd));
+}
+
+
+void Assembler::rbit(const Register& rd, const Register& rn) {
+  DataProcessing1Source(rd, rn, RBIT);
+}
+
+
+void Assembler::rev16(const Register& rd, const Register& rn) {
+  DataProcessing1Source(rd, rn, REV16);
+}
+
+
+void Assembler::rev32(const Register& rd, const Register& rn) {
+  VIXL_ASSERT(rd.Is64Bits());
+  DataProcessing1Source(rd, rn, REV);
+}
+
+
+void Assembler::rev(const Register& rd, const Register& rn) {
+  DataProcessing1Source(rd, rn, rd.Is64Bits() ? REV_x : REV_w);
+}
+
+
+void Assembler::clz(const Register& rd, const Register& rn) {
+  DataProcessing1Source(rd, rn, CLZ);
+}
+
+
+void Assembler::cls(const Register& rd, const Register& rn) {
+  DataProcessing1Source(rd, rn, CLS);
+}
+
+
+void Assembler::ldp(const CPURegister& rt, const CPURegister& rt2, const MemOperand& src) {
+  LoadStorePair(rt, rt2, src, LoadPairOpFor(rt, rt2));
+}
+
+
+void Assembler::stp(const CPURegister& rt, const CPURegister& rt2, const MemOperand& dst) {
+  LoadStorePair(rt, rt2, dst, StorePairOpFor(rt, rt2));
+}
+
+
+void Assembler::ldpsw(const Register& rt, const Register& rt2, const MemOperand& src) {
+  VIXL_ASSERT(rt.Is64Bits());
+  LoadStorePair(rt, rt2, src, LDPSW_x);
+}
+
+
+void Assembler::LoadStorePair(const CPURegister& rt, const CPURegister& rt2,
+                              const MemOperand& addr, LoadStorePairOp op) {
+  // 'rt' and 'rt2' can only be aliased for stores.
+  VIXL_ASSERT(((op & LoadStorePairLBit) == 0) || !rt.Is(rt2));
+  VIXL_ASSERT(AreSameSizeAndType(rt, rt2));
+
+  Instr memop = op | Rt(rt) | Rt2(rt2) | RnSP(addr.base()) |
+                ImmLSPair(addr.offset(), CalcLSPairDataSize(op));
+
+  Instr addrmodeop;
+  if (addr.IsImmediateOffset()) {
+    addrmodeop = LoadStorePairOffsetFixed;
+  } else {
+    VIXL_ASSERT(addr.offset() != 0);
+    if (addr.IsPreIndex()) {
+      addrmodeop = LoadStorePairPreIndexFixed;
+    } else {
+      VIXL_ASSERT(addr.IsPostIndex());
+      addrmodeop = LoadStorePairPostIndexFixed;
+    }
+  }
+  Emit(addrmodeop | memop);
+}
+
+
+void Assembler::ldnp(const CPURegister& rt, const CPURegister& rt2, const MemOperand& src) {
+  LoadStorePairNonTemporal(rt, rt2, src, LoadPairNonTemporalOpFor(rt, rt2));
+}
+
+
+void Assembler::stnp(const CPURegister& rt, const CPURegister& rt2, const MemOperand& dst) {
+  LoadStorePairNonTemporal(rt, rt2, dst, StorePairNonTemporalOpFor(rt, rt2));
+}
+
+
+void Assembler::LoadStorePairNonTemporal(const CPURegister& rt, const CPURegister& rt2,
+                                         const MemOperand& addr, LoadStorePairNonTemporalOp op) {
+  VIXL_ASSERT(!rt.Is(rt2));
+  VIXL_ASSERT(AreSameSizeAndType(rt, rt2));
+  VIXL_ASSERT(addr.IsImmediateOffset());
+
+  LSDataSize size = CalcLSPairDataSize(static_cast<LoadStorePairOp>(op & LoadStorePairMask));
+  Emit(op | Rt(rt) | Rt2(rt2) | RnSP(addr.base()) | ImmLSPair(addr.offset(), size));
+}
+
+
+// Memory instructions.
+void Assembler::ldrb(const Register& rt, const MemOperand& src, LoadStoreScalingOption option) {
+  VIXL_ASSERT(option != RequireUnscaledOffset);
+  VIXL_ASSERT(option != PreferUnscaledOffset);
+  LoadStore(rt, src, LDRB_w, option);
+}
+
+
+void Assembler::strb(const Register& rt, const MemOperand& dst, LoadStoreScalingOption option) {
+  VIXL_ASSERT(option != RequireUnscaledOffset);
+  VIXL_ASSERT(option != PreferUnscaledOffset);
+  LoadStore(rt, dst, STRB_w, option);
+}
+
+
+void Assembler::ldrsb(const Register& rt, const MemOperand& src, LoadStoreScalingOption option) {
+  VIXL_ASSERT(option != RequireUnscaledOffset);
+  VIXL_ASSERT(option != PreferUnscaledOffset);
+  LoadStore(rt, src, rt.Is64Bits() ? LDRSB_x : LDRSB_w, option);
+}
+
+
+void Assembler::ldrh(const Register& rt, const MemOperand& src, LoadStoreScalingOption option) {
+  VIXL_ASSERT(option != RequireUnscaledOffset);
+  VIXL_ASSERT(option != PreferUnscaledOffset);
+  LoadStore(rt, src, LDRH_w, option);
+}
+
+
+void Assembler::strh(const Register& rt, const MemOperand& dst, LoadStoreScalingOption option) {
+  VIXL_ASSERT(option != RequireUnscaledOffset);
+  VIXL_ASSERT(option != PreferUnscaledOffset);
+  LoadStore(rt, dst, STRH_w, option);
+}
+
+
+void Assembler::ldrsh(const Register& rt, const MemOperand& src, LoadStoreScalingOption option) {
+  VIXL_ASSERT(option != RequireUnscaledOffset);
+  VIXL_ASSERT(option != PreferUnscaledOffset);
+  LoadStore(rt, src, rt.Is64Bits() ? LDRSH_x : LDRSH_w, option);
+}
+
+
+void Assembler::ldr(const CPURegister& rt, const MemOperand& src, LoadStoreScalingOption option) {
+  VIXL_ASSERT(option != RequireUnscaledOffset);
+  VIXL_ASSERT(option != PreferUnscaledOffset);
+  LoadStore(rt, src, LoadOpFor(rt), option);
+}
+
+
+void Assembler::str(const CPURegister& rt, const MemOperand& src, LoadStoreScalingOption option) {
+  VIXL_ASSERT(option != RequireUnscaledOffset);
+  VIXL_ASSERT(option != PreferUnscaledOffset);
+  LoadStore(rt, src, StoreOpFor(rt), option);
+}
+
+
+void Assembler::ldrsw(const Register& rt, const MemOperand& src, LoadStoreScalingOption option) {
+  VIXL_ASSERT(option != RequireUnscaledOffset);
+  VIXL_ASSERT(option != PreferUnscaledOffset);
+  VIXL_ASSERT(rt.Is64Bits());
+  LoadStore(rt, src, LDRSW_x, option);
+}
+
+
+void Assembler::ldurb(const Register& rt, const MemOperand& src, LoadStoreScalingOption option) {
+  VIXL_ASSERT(option != RequireScaledOffset);
+  VIXL_ASSERT(option != PreferScaledOffset);
+  LoadStore(rt, src, LDRB_w, option);
+}
+
+
+void Assembler::sturb(const Register& rt, const MemOperand& dst, LoadStoreScalingOption option) {
+  VIXL_ASSERT(option != RequireScaledOffset);
+  VIXL_ASSERT(option != PreferScaledOffset);
+  LoadStore(rt, dst, STRB_w, option);
+}
+
+
+void Assembler::ldursb(const Register& rt, const MemOperand& src, LoadStoreScalingOption option) {
+  VIXL_ASSERT(option != RequireScaledOffset);
+  VIXL_ASSERT(option != PreferScaledOffset);
+  LoadStore(rt, src, rt.Is64Bits() ? LDRSB_x : LDRSB_w, option);
+}
+
+
+void Assembler::ldurh(const Register& rt, const MemOperand& src, LoadStoreScalingOption option) {
+  VIXL_ASSERT(option != RequireScaledOffset);
+  VIXL_ASSERT(option != PreferScaledOffset);
+  LoadStore(rt, src, LDRH_w, option);
+}
+
+
+void Assembler::sturh(const Register& rt, const MemOperand& dst, LoadStoreScalingOption option) {
+  VIXL_ASSERT(option != RequireScaledOffset);
+  VIXL_ASSERT(option != PreferScaledOffset);
+  LoadStore(rt, dst, STRH_w, option);
+}
+
+
+void Assembler::ldursh(const Register& rt, const MemOperand& src, LoadStoreScalingOption option) {
+  VIXL_ASSERT(option != RequireScaledOffset);
+  VIXL_ASSERT(option != PreferScaledOffset);
+  LoadStore(rt, src, rt.Is64Bits() ? LDRSH_x : LDRSH_w, option);
+}
+
+
+void Assembler::ldur(const CPURegister& rt, const MemOperand& src, LoadStoreScalingOption option) {
+  VIXL_ASSERT(option != RequireScaledOffset);
+  VIXL_ASSERT(option != PreferScaledOffset);
+  LoadStore(rt, src, LoadOpFor(rt), option);
+}
+
+
+void Assembler::stur(const CPURegister& rt, const MemOperand& dst, LoadStoreScalingOption option) {
+  VIXL_ASSERT(option != RequireScaledOffset);
+  VIXL_ASSERT(option != PreferScaledOffset);
+  LoadStore(rt, dst, StoreOpFor(rt), option);
+}
+
+
+void Assembler::ldursw(const Register& rt, const MemOperand& src, LoadStoreScalingOption option) {
+  VIXL_ASSERT(rt.Is64Bits());
+  VIXL_ASSERT(option != RequireScaledOffset);
+  VIXL_ASSERT(option != PreferScaledOffset);
+  LoadStore(rt, src, LDRSW_x, option);
+}
+
+
+void Assembler::ldr(const CPURegister& rt, int imm19) {
+  LoadLiteralOp op = LoadLiteralOpFor(rt);
+  Emit(op | ImmLLiteral(imm19) | Rt(rt));
+}
+
+
+void Assembler::ldrsw(const Register& rt, int imm19) {
+  Emit(LDRSW_x_lit | ImmLLiteral(imm19) | Rt(rt));
+}
+
+
+// Exclusive-access instructions.
+void Assembler::stxrb(const Register& rs, const Register& rt, const MemOperand& dst) {
+  VIXL_ASSERT(dst.IsImmediateOffset() && (dst.offset() == 0));
+  Emit(STXRB_w | Rs(rs) | Rt(rt) | Rt2_mask | RnSP(dst.base()));
+}
+
+
+void Assembler::stxrh(const Register& rs, const Register& rt, const MemOperand& dst) {
+  VIXL_ASSERT(dst.IsImmediateOffset() && (dst.offset() == 0));
+  Emit(STXRH_w | Rs(rs) | Rt(rt) | Rt2_mask | RnSP(dst.base()));
+}
+
+
+void Assembler::stxr(const Register& rs, const Register& rt, const MemOperand& dst) {
+  VIXL_ASSERT(dst.IsImmediateOffset() && (dst.offset() == 0));
+  LoadStoreExclusive op = rt.Is64Bits() ? STXR_x : STXR_w;
+  Emit(op | Rs(rs) | Rt(rt) | Rt2_mask | RnSP(dst.base()));
+}
+
+
+void Assembler::ldxrb(const Register& rt, const MemOperand& src) {
+  VIXL_ASSERT(src.IsImmediateOffset() && (src.offset() == 0));
+  Emit(LDXRB_w | Rs_mask | Rt(rt) | Rt2_mask | RnSP(src.base()));
+}
+
+
+void Assembler::ldxrh(const Register& rt, const MemOperand& src) {
+  VIXL_ASSERT(src.IsImmediateOffset() && (src.offset() == 0));
+  Emit(LDXRH_w | Rs_mask | Rt(rt) | Rt2_mask | RnSP(src.base()));
+}
+
+
+void Assembler::ldxr(const Register& rt, const MemOperand& src) {
+  VIXL_ASSERT(src.IsImmediateOffset() && (src.offset() == 0));
+  LoadStoreExclusive op = rt.Is64Bits() ? LDXR_x : LDXR_w;
+  Emit(op | Rs_mask | Rt(rt) | Rt2_mask | RnSP(src.base()));
+}
+
+
+void Assembler::stxp(const Register& rs, const Register& rt, const Register& rt2, const MemOperand& dst) {
+  VIXL_ASSERT(rt.size() == rt2.size());
+  VIXL_ASSERT(dst.IsImmediateOffset() && (dst.offset() == 0));
+  LoadStoreExclusive op = rt.Is64Bits() ? STXP_x : STXP_w;
+  Emit(op | Rs(rs) | Rt(rt) | Rt2(rt2) | RnSP(dst.base()));
+}
+
+
+void Assembler::ldxp(const Register& rt, const Register& rt2, const MemOperand& src) {
+  VIXL_ASSERT(rt.size() == rt2.size());
+  VIXL_ASSERT(src.IsImmediateOffset() && (src.offset() == 0));
+  LoadStoreExclusive op = rt.Is64Bits() ? LDXP_x : LDXP_w;
+  Emit(op | Rs_mask | Rt(rt) | Rt2(rt2) | RnSP(src.base()));
+}
+
+
+void Assembler::stlxrb(const Register& rs, const Register& rt, const MemOperand& dst) {
+  VIXL_ASSERT(dst.IsImmediateOffset() && (dst.offset() == 0));
+  Emit(STLXRB_w | Rs(rs) | Rt(rt) | Rt2_mask | RnSP(dst.base()));
+}
+
+
+void Assembler::stlxrh(const Register& rs, const Register& rt, const MemOperand& dst) {
+  VIXL_ASSERT(dst.IsImmediateOffset() && (dst.offset() == 0));
+  Emit(STLXRH_w | Rs(rs) | Rt(rt) | Rt2_mask | RnSP(dst.base()));
+}
+
+
+void Assembler::stlxr(const Register& rs, const Register& rt, const MemOperand& dst) {
+  VIXL_ASSERT(dst.IsImmediateOffset() && (dst.offset() == 0));
+  LoadStoreExclusive op = rt.Is64Bits() ? STLXR_x : STLXR_w;
+  Emit(op | Rs(rs) | Rt(rt) | Rt2_mask | RnSP(dst.base()));
+}
+
+
+void Assembler::ldaxrb(const Register& rt, const MemOperand& src) {
+  VIXL_ASSERT(src.IsImmediateOffset() && (src.offset() == 0));
+  Emit(LDAXRB_w | Rs_mask | Rt(rt) | Rt2_mask | RnSP(src.base()));
+}
+
+
+void Assembler::ldaxrh(const Register& rt, const MemOperand& src) {
+  VIXL_ASSERT(src.IsImmediateOffset() && (src.offset() == 0));
+  Emit(LDAXRH_w | Rs_mask | Rt(rt) | Rt2_mask | RnSP(src.base()));
+}
+
+
+void Assembler::ldaxr(const Register& rt, const MemOperand& src) {
+  VIXL_ASSERT(src.IsImmediateOffset() && (src.offset() == 0));
+  LoadStoreExclusive op = rt.Is64Bits() ? LDAXR_x : LDAXR_w;
+  Emit(op | Rs_mask | Rt(rt) | Rt2_mask | RnSP(src.base()));
+}
+
+
+void Assembler::stlxp(const Register& rs, const Register& rt,
+                      const Register& rt2, const MemOperand& dst) {
+  VIXL_ASSERT(rt.size() == rt2.size());
+  VIXL_ASSERT(dst.IsImmediateOffset() && (dst.offset() == 0));
+  LoadStoreExclusive op = rt.Is64Bits() ? STLXP_x : STLXP_w;
+  Emit(op | Rs(rs) | Rt(rt) | Rt2(rt2) | RnSP(dst.base()));
+}
+
+
+void Assembler::ldaxp(const Register& rt, const Register& rt2, const MemOperand& src) {
+  VIXL_ASSERT(rt.size() == rt2.size());
+  VIXL_ASSERT(src.IsImmediateOffset() && (src.offset() == 0));
+  LoadStoreExclusive op = rt.Is64Bits() ? LDAXP_x : LDAXP_w;
+  Emit(op | Rs_mask | Rt(rt) | Rt2(rt2) | RnSP(src.base()));
+}
+
+
+void Assembler::stlrb(const Register& rt, const MemOperand& dst) {
+  VIXL_ASSERT(dst.IsImmediateOffset() && (dst.offset() == 0));
+  Emit(STLRB_w | Rs_mask | Rt(rt) | Rt2_mask | RnSP(dst.base()));
+}
+
+
+void Assembler::stlrh(const Register& rt, const MemOperand& dst) {
+  VIXL_ASSERT(dst.IsImmediateOffset() && (dst.offset() == 0));
+  Emit(STLRH_w | Rs_mask | Rt(rt) | Rt2_mask | RnSP(dst.base()));
+}
+
+
+void Assembler::stlr(const Register& rt, const MemOperand& dst) {
+  VIXL_ASSERT(dst.IsImmediateOffset() && (dst.offset() == 0));
+  LoadStoreExclusive op = rt.Is64Bits() ? STLR_x : STLR_w;
+  Emit(op | Rs_mask | Rt(rt) | Rt2_mask | RnSP(dst.base()));
+}
+
+
+void Assembler::ldarb(const Register& rt, const MemOperand& src) {
+  VIXL_ASSERT(src.IsImmediateOffset() && (src.offset() == 0));
+  Emit(LDARB_w | Rs_mask | Rt(rt) | Rt2_mask | RnSP(src.base()));
+}
+
+
+void Assembler::ldarh(const Register& rt, const MemOperand& src) {
+  VIXL_ASSERT(src.IsImmediateOffset() && (src.offset() == 0));
+  Emit(LDARH_w | Rs_mask | Rt(rt) | Rt2_mask | RnSP(src.base()));
+}
+
+
+void Assembler::ldar(const Register& rt, const MemOperand& src) {
+  VIXL_ASSERT(src.IsImmediateOffset() && (src.offset() == 0));
+  LoadStoreExclusive op = rt.Is64Bits() ? LDAR_x : LDAR_w;
+  Emit(op | Rs_mask | Rt(rt) | Rt2_mask | RnSP(src.base()));
+}
+
+
+void Assembler::mov(const Register& rd, const Register& rm) {
+  // Moves involving the stack pointer are encoded as add immediate with
+  // second operand of zero. Otherwise, orr with first operand zr is
+  // used.
+  if (rd.IsSP() || rm.IsSP()) {
+    add(rd, rm, 0);
+  } else {
+    orr(rd, AppropriateZeroRegFor(rd), rm);
+  }
+}
+
+
+void Assembler::mvn(const Register& rd, const Operand& operand) {
+  orn(rd, AppropriateZeroRegFor(rd), operand);
+}
+
+
+void Assembler::mrs(const Register& rt, SystemRegister sysreg) {
+  VIXL_ASSERT(rt.Is64Bits());
+  Emit(MRS | ImmSystemRegister(sysreg) | Rt(rt));
+}
+
+
+void Assembler::msr(SystemRegister sysreg, const Register& rt) {
+  VIXL_ASSERT(rt.Is64Bits());
+  Emit(MSR | Rt(rt) | ImmSystemRegister(sysreg));
+}
+
+
+
+
+void Assembler::clrex(int imm4) {
+  Emit(CLREX | CRm(imm4));
+}
+
+
+void Assembler::dmb(BarrierDomain domain, BarrierType type) {
+  Emit(DMB | ImmBarrierDomain(domain) | ImmBarrierType(type));
+}
+
+
+void Assembler::dsb(BarrierDomain domain, BarrierType type) {
+  Emit(DSB | ImmBarrierDomain(domain) | ImmBarrierType(type));
+}
+
+
+void Assembler::isb() {
+  Emit(ISB | ImmBarrierDomain(FullSystem) | ImmBarrierType(BarrierAll));
+}
+
+
+void Assembler::fmov(const FPRegister& fd, double imm) {
+  VIXL_ASSERT(fd.Is64Bits());
+  VIXL_ASSERT(IsImmFP64(imm));
+  Emit(FMOV_d_imm | Rd(fd) | ImmFP64(imm));
+}
+
+
+void Assembler::fmov(const FPRegister& fd, float imm) {
+  VIXL_ASSERT(fd.Is32Bits());
+  VIXL_ASSERT(IsImmFP32(imm));
+  Emit(FMOV_s_imm | Rd(fd) | ImmFP32(imm));
+}
+
+
+void Assembler::fmov(const Register& rd, const FPRegister& fn) {
+  VIXL_ASSERT(rd.size() == fn.size());
+  FPIntegerConvertOp op = rd.Is32Bits() ? FMOV_ws : FMOV_xd;
+  Emit(op | Rd(rd) | Rn(fn));
+}
+
+
+void Assembler::fmov(const FPRegister& fd, const Register& rn) {
+  VIXL_ASSERT(fd.size() == rn.size());
+  FPIntegerConvertOp op = fd.Is32Bits() ? FMOV_sw : FMOV_dx;
+  Emit(op | Rd(fd) | Rn(rn));
+}
+
+
+void Assembler::fmov(const FPRegister& fd, const FPRegister& fn) {
+  VIXL_ASSERT(fd.size() == fn.size());
+  Emit(FPType(fd) | FMOV | Rd(fd) | Rn(fn));
+}
+
+
+void Assembler::fadd(const FPRegister& fd, const FPRegister& fn, const FPRegister& fm) {
+  FPDataProcessing2Source(fd, fn, fm, FADD);
+}
+
+
+void Assembler::fsub(const FPRegister& fd, const FPRegister& fn, const FPRegister& fm) {
+  FPDataProcessing2Source(fd, fn, fm, FSUB);
+}
+
+
+void Assembler::fmul(const FPRegister& fd, const FPRegister& fn, const FPRegister& fm) {
+  FPDataProcessing2Source(fd, fn, fm, FMUL);
+}
+
+
+void Assembler::fmadd(const FPRegister& fd, const FPRegister& fn,
+                      const FPRegister& fm, const FPRegister& fa) {
+  FPDataProcessing3Source(fd, fn, fm, fa, fd.Is32Bits() ? FMADD_s : FMADD_d);
+}
+
+
+void Assembler::fmsub(const FPRegister& fd, const FPRegister& fn,
+                      const FPRegister& fm, const FPRegister& fa) {
+  FPDataProcessing3Source(fd, fn, fm, fa, fd.Is32Bits() ? FMSUB_s : FMSUB_d);
+}
+
+
+void Assembler::fnmadd(const FPRegister& fd, const FPRegister& fn,
+                       const FPRegister& fm, const FPRegister& fa) {
+  FPDataProcessing3Source(fd, fn, fm, fa, fd.Is32Bits() ? FNMADD_s : FNMADD_d);
+}
+
+
+void Assembler::fnmsub(const FPRegister& fd, const FPRegister& fn,
+                       const FPRegister& fm, const FPRegister& fa) {
+  FPDataProcessing3Source(fd, fn, fm, fa, fd.Is32Bits() ? FNMSUB_s : FNMSUB_d);
+}
+
+
+void Assembler::fdiv(const FPRegister& fd, const FPRegister& fn, const FPRegister& fm) {
+  FPDataProcessing2Source(fd, fn, fm, FDIV);
+}
+
+
+void Assembler::fmax(const FPRegister& fd, const FPRegister& fn, const FPRegister& fm) {
+  FPDataProcessing2Source(fd, fn, fm, FMAX);
+}
+
+
+void Assembler::fmaxnm(const FPRegister& fd, const FPRegister& fn, const FPRegister& fm) {
+  FPDataProcessing2Source(fd, fn, fm, FMAXNM);
+}
+
+
+void Assembler::fmin(const FPRegister& fd, const FPRegister& fn, const FPRegister& fm) {
+  FPDataProcessing2Source(fd, fn, fm, FMIN);
+}
+
+
+void Assembler::fminnm(const FPRegister& fd, const FPRegister& fn, const FPRegister& fm) {
+  FPDataProcessing2Source(fd, fn, fm, FMINNM);
+}
+
+
+void Assembler::fabs(const FPRegister& fd, const FPRegister& fn) {
+  VIXL_ASSERT(fd.size() == fn.size());
+  FPDataProcessing1Source(fd, fn, FABS);
+}
+
+
+void Assembler::fneg(const FPRegister& fd, const FPRegister& fn) {
+  VIXL_ASSERT(fd.size() == fn.size());
+  FPDataProcessing1Source(fd, fn, FNEG);
+}
+
+
+void Assembler::fsqrt(const FPRegister& fd, const FPRegister& fn) {
+  VIXL_ASSERT(fd.size() == fn.size());
+  FPDataProcessing1Source(fd, fn, FSQRT);
+}
+
+
+void Assembler::frinta(const FPRegister& fd, const FPRegister& fn) {
+  VIXL_ASSERT(fd.size() == fn.size());
+  FPDataProcessing1Source(fd, fn, FRINTA);
+}
+
+
+void Assembler::frintm(const FPRegister& fd, const FPRegister& fn) {
+  VIXL_ASSERT(fd.size() == fn.size());
+  FPDataProcessing1Source(fd, fn, FRINTM);
+}
+
+
+void Assembler::frintn(const FPRegister& fd, const FPRegister& fn) {
+  VIXL_ASSERT(fd.size() == fn.size());
+  FPDataProcessing1Source(fd, fn, FRINTN);
+}
+
+
+void Assembler::frintz(const FPRegister& fd, const FPRegister& fn) {
+  VIXL_ASSERT(fd.size() == fn.size());
+  FPDataProcessing1Source(fd, fn, FRINTZ);
+}
+
+
+void Assembler::fcmp(const FPRegister& fn, const FPRegister& fm) {
+  VIXL_ASSERT(fn.size() == fm.size());
+  Emit(FPType(fn) | FCMP | Rm(fm) | Rn(fn));
+}
+
+
+void Assembler::fcmp(const FPRegister& fn, double value) {
+  USE(value);
+  // Although the fcmp instruction can strictly only take an immediate value of
+  // +0.0, we don't need to check for -0.0 because the sign of 0.0 doesn't
+  // affect the result of the comparison.
+  VIXL_ASSERT(value == 0.0);
+  Emit(FPType(fn) | FCMP_zero | Rn(fn));
+}
+
+
+void Assembler::fccmp(const FPRegister& fn, const FPRegister& fm,
+                      StatusFlags nzcv, Condition cond) {
+  VIXL_ASSERT(fn.size() == fm.size());
+  Emit(FPType(fn) | FCCMP | Rm(fm) | Cond(cond) | Rn(fn) | Nzcv(nzcv));
+}
+
+
+void Assembler::fcsel(const FPRegister& fd, const FPRegister& fn,
+                      const FPRegister& fm, Condition cond) {
+  VIXL_ASSERT(fd.size() == fn.size());
+  VIXL_ASSERT(fd.size() == fm.size());
+  Emit(FPType(fd) | FCSEL | Rm(fm) | Cond(cond) | Rn(fn) | Rd(fd));
+}
+
+
+void Assembler::FPConvertToInt(const Register& rd, const FPRegister& fn, FPIntegerConvertOp op) {
+  Emit(SF(rd) | FPType(fn) | op | Rn(fn) | Rd(rd));
+}
+
+
+void Assembler::fcvt(const FPRegister& fd, const FPRegister& fn) {
+  if (fd.Is64Bits()) {
+    // Convert float to double.
+    VIXL_ASSERT(fn.Is32Bits());
+    FPDataProcessing1Source(fd, fn, FCVT_ds);
+  } else {
+    // Convert double to float.
+    VIXL_ASSERT(fn.Is64Bits());
+    FPDataProcessing1Source(fd, fn, FCVT_sd);
+  }
+}
+
+
+void Assembler::fcvtau(const Register& rd, const FPRegister& fn) {
+  FPConvertToInt(rd, fn, FCVTAU);
+}
+
+
+void Assembler::fcvtas(const Register& rd, const FPRegister& fn) {
+  FPConvertToInt(rd, fn, FCVTAS);
+}
+
+
+void Assembler::fcvtmu(const Register& rd, const FPRegister& fn) {
+  FPConvertToInt(rd, fn, FCVTMU);
+}
+
+
+void Assembler::fcvtms(const Register& rd, const FPRegister& fn) {
+  FPConvertToInt(rd, fn, FCVTMS);
+}
+
+
+void Assembler::fcvtpu(const Register& rd, const FPRegister& fn) {
+  FPConvertToInt(rd, fn, FCVTPU);
+}
+
+
+void Assembler::fcvtps(const Register& rd, const FPRegister& fn) {
+  FPConvertToInt(rd, fn, FCVTPS);
+}
+
+
+void Assembler::fcvtnu(const Register& rd, const FPRegister& fn) {
+  FPConvertToInt(rd, fn, FCVTNU);
+}
+
+
+void Assembler::fcvtns(const Register& rd, const FPRegister& fn) {
+  FPConvertToInt(rd, fn, FCVTNS);
+}
+
+
+void Assembler::fcvtzu(const Register& rd, const FPRegister& fn) {
+  FPConvertToInt(rd, fn, FCVTZU);
+}
+
+
+void Assembler::fcvtzs(const Register& rd, const FPRegister& fn) {
+
+  FPConvertToInt(rd, fn, FCVTZS);
+}
+
+
+void Assembler::scvtf(const FPRegister& fd, const Register& rn, unsigned fbits) {
+  if (fbits == 0)
+    Emit(SF(rn) | FPType(fd) | SCVTF | Rn(rn) | Rd(fd));
+  else
+    Emit(SF(rn) | FPType(fd) | SCVTF_fixed | FPScale(64 - fbits) | Rn(rn) | Rd(fd));
+}
+
+
+void Assembler::ucvtf(const FPRegister& fd, const Register& rn, unsigned fbits) {
+  if (fbits == 0)
+    Emit(SF(rn) | FPType(fd) | UCVTF | Rn(rn) | Rd(fd));
+  else
+    Emit(SF(rn) | FPType(fd) | UCVTF_fixed | FPScale(64 - fbits) | Rn(rn) | Rd(fd));
+}
+
+
+// Note:
+// Below, a difference in case for the same letter indicates a
+// negated bit.
+// If b is 1, then B is 0.
+Instr Assembler::ImmFP32(float imm) {
+  VIXL_ASSERT(IsImmFP32(imm));
+  // bits: aBbb.bbbc.defg.h000.0000.0000.0000.0000
+  uint32_t bits = float_to_rawbits(imm);
+  // bit7: a000.0000
+  uint32_t bit7 = ((bits >> 31) & 0x1) << 7;
+  // bit6: 0b00.0000
+  uint32_t bit6 = ((bits >> 29) & 0x1) << 6;
+  // bit5_to_0: 00cd.efgh
+  uint32_t bit5_to_0 = (bits >> 19) & 0x3f;
+
+  return (bit7 | bit6 | bit5_to_0) << ImmFP_offset;
+}
+
+
+Instr Assembler::ImmFP64(double imm) {
+  VIXL_ASSERT(IsImmFP64(imm));
+  // bits: aBbb.bbbb.bbcd.efgh.0000.0000.0000.0000
+  //       0000.0000.0000.0000.0000.0000.0000.0000
+  uint64_t bits = double_to_rawbits(imm);
+  // bit7: a000.0000
+  uint32_t bit7 = ((bits >> 63) & 0x1) << 7;
+  // bit6: 0b00.0000
+  uint32_t bit6 = ((bits >> 61) & 0x1) << 6;
+  // bit5_to_0: 00cd.efgh
+  uint32_t bit5_to_0 = (bits >> 48) & 0x3f;
+
+  return (bit7 | bit6 | bit5_to_0) << ImmFP_offset;
+}
+
+
+// Code generation helpers.
+void Assembler::MoveWide(const Register& rd, uint64_t imm, int shift, MoveWideImmediateOp mov_op) {
+  // Ignore the top 32 bits of an immediate if we're moving to a W register.
+  if (rd.Is32Bits()) {
+    // Check that the top 32 bits are zero (a positive 32-bit number) or top
+    // 33 bits are one (a negative 32-bit number, sign extended to 64 bits).
+    VIXL_ASSERT(((imm >> kWRegSize) == 0) ||
+               ((imm >> (kWRegSize - 1)) == 0x1ffffffff));
+    imm &= kWRegMask;
+  }
+
+  if (shift >= 0) {
+    // Explicit shift specified.
+    VIXL_ASSERT((shift == 0) || (shift == 16) ||
+               (shift == 32) || (shift == 48));
+    VIXL_ASSERT(rd.Is64Bits() || (shift == 0) || (shift == 16));
+    shift /= 16;
+  } else {
+    // Calculate a new immediate and shift combination to encode the immediate
+    // argument.
+    shift = 0;
+    if ((imm & 0xffffffffffff0000) == 0) {
+      // Nothing to do.
+    } else if ((imm & 0xffffffff0000ffff) == 0) {
+      imm >>= 16;
+      shift = 1;
+    } else if ((imm & 0xffff0000ffffffff) == 0) {
+      VIXL_ASSERT(rd.Is64Bits());
+      imm >>= 32;
+      shift = 2;
+    } else if ((imm & 0x0000ffffffffffff) == 0) {
+      VIXL_ASSERT(rd.Is64Bits());
+      imm >>= 48;
+      shift = 3;
+    }
+  }
+
+  VIXL_ASSERT(is_uint16(imm));
+
+  Emit(SF(rd) | MoveWideImmediateFixed | mov_op |
+       Rd(rd) | ImmMoveWide(imm) | ShiftMoveWide(shift));
+}
+
+
+void Assembler::AddSub(const Register& rd, const Register& rn, const Operand& operand,
+                       FlagsUpdate S, AddSubOp op) {
+  VIXL_ASSERT(rd.size() == rn.size());
+
+  if (operand.IsImmediate()) {
+    int64_t immediate = operand.immediate();
+    VIXL_ASSERT(IsImmAddSub(immediate));
+    Instr dest_reg = (S == SetFlags) ? Rd(rd) : RdSP(rd);
+    Emit(SF(rd) | AddSubImmediateFixed | op | Flags(S) |
+         ImmAddSub(immediate) | dest_reg | RnSP(rn));
+  } else if (operand.IsShiftedRegister()) {
+    VIXL_ASSERT(operand.reg().size() == rd.size());
+    VIXL_ASSERT(operand.shift() != ROR);
+
+    // For instructions of the form:
+    //   add/sub   wsp, <Wn>, <Wm> [, LSL #0-3 ]
+    //   add/sub   <Wd>, wsp, <Wm> [, LSL #0-3 ]
+    //   add/sub   wsp, wsp, <Wm> [, LSL #0-3 ]
+    //   adds/subs <Wd>, wsp, <Wm> [, LSL #0-3 ]
+    // or their 64-bit register equivalents, convert the operand from shifted to
+    // extended register mode, and emit an add/sub extended instruction.
+    if (rn.IsSP() || rd.IsSP()) {
+      VIXL_ASSERT(!(rd.IsSP() && (S == SetFlags)));
+      DataProcExtendedRegister(rd, rn, operand.ToExtendedRegister(), S,
+                               AddSubExtendedFixed | op);
+    } else {
+      DataProcShiftedRegister(rd, rn, operand, S, AddSubShiftedFixed | op);
+    }
+  } else {
+    VIXL_ASSERT(operand.IsExtendedRegister());
+    DataProcExtendedRegister(rd, rn, operand, S, AddSubExtendedFixed | op);
+  }
+}
+
+
+void Assembler::AddSubWithCarry(const Register& rd, const Register& rn,
+                                const Operand& operand, FlagsUpdate S, AddSubWithCarryOp op) {
+  VIXL_ASSERT(rd.size() == rn.size());
+  VIXL_ASSERT(rd.size() == operand.reg().size());
+  VIXL_ASSERT(operand.IsShiftedRegister() && (operand.shift_amount() == 0));
+  Emit(SF(rd) | op | Flags(S) | Rm(operand.reg()) | Rn(rn) | Rd(rd));
+}
+
+
+void Assembler::hlt(int code) {
+  VIXL_ASSERT(is_uint16(code));
+  Emit(HLT | ImmException(code));
+}
+
+
+void Assembler::brk(int code) {
+  VIXL_ASSERT(is_uint16(code));
+  Emit(BRK | ImmException(code));
+}
+
+
+void Assembler::svc(int code) {
+  VIXL_ASSERT(is_uint16(code));
+  Emit(SVC | ImmException(code));
+}
+
+
+
+void Assembler::ConditionalCompare(const Register& rn, const Operand& operand,
+                                   StatusFlags nzcv, Condition cond, ConditionalCompareOp op) {
+  Instr ccmpop;
+  if (operand.IsImmediate()) {
+    int64_t immediate = operand.immediate();
+    VIXL_ASSERT(IsImmConditionalCompare(immediate));
+    ccmpop = ConditionalCompareImmediateFixed | op | ImmCondCmp(immediate);
+  } else {
+    VIXL_ASSERT(operand.IsShiftedRegister() && (operand.shift_amount() == 0));
+    ccmpop = ConditionalCompareRegisterFixed | op | Rm(operand.reg());
+  }
+  Emit(SF(rn) | ccmpop | Cond(cond) | Rn(rn) | Nzcv(nzcv));
+}
+
+
+void Assembler::DataProcessing1Source(const Register& rd, const Register& rn,
+                                      DataProcessing1SourceOp op) {
+  VIXL_ASSERT(rd.size() == rn.size());
+  Emit(SF(rn) | op | Rn(rn) | Rd(rd));
+}
+
+
+void Assembler::FPDataProcessing1Source(const FPRegister& fd, const FPRegister& fn,
+                                        FPDataProcessing1SourceOp op) {
+  Emit(FPType(fn) | op | Rn(fn) | Rd(fd));
+}
+
+
+void Assembler::FPDataProcessing2Source(const FPRegister& fd, const FPRegister& fn,
+                                        const FPRegister& fm, FPDataProcessing2SourceOp op) {
+  VIXL_ASSERT(fd.size() == fn.size());
+  VIXL_ASSERT(fd.size() == fm.size());
+  Emit(FPType(fd) | op | Rm(fm) | Rn(fn) | Rd(fd));
+}
+
+
+void Assembler::FPDataProcessing3Source(const FPRegister& fd, const FPRegister& fn,
+                                        const FPRegister& fm, const FPRegister& fa,
+                                        FPDataProcessing3SourceOp op) {
+  VIXL_ASSERT(AreSameSizeAndType(fd, fn, fm, fa));
+  Emit(FPType(fd) | op | Rm(fm) | Rn(fn) | Rd(fd) | Ra(fa));
+}
+
+
+void Assembler::EmitShift(const Register& rd, const Register& rn,
+                          Shift shift, unsigned shift_amount) {
+  switch (shift) {
+  case LSL:
+    lsl(rd, rn, shift_amount);
+    break;
+  case LSR:
+    lsr(rd, rn, shift_amount);
+    break;
+  case ASR:
+    asr(rd, rn, shift_amount);
+    break;
+  case ROR:
+    ror(rd, rn, shift_amount);
+    break;
+  default:
+    VIXL_UNREACHABLE();
+  }
+}
+
+
+void Assembler::EmitExtendShift(const Register& rd, const Register& rn,
+                                Extend extend, unsigned left_shift) {
+  VIXL_ASSERT(rd.size() >= rn.size());
+  unsigned reg_size = rd.size();
+  // Use the correct size of register.
+  Register rn_ = Register(rn.code(), rd.size());
+  // Bits extracted are high_bit:0.
+  unsigned high_bit = (8 << (extend & 0x3)) - 1;
+  // Number of bits left in the result that are not introduced by the shift.
+  unsigned non_shift_bits = (reg_size - left_shift) & (reg_size - 1);
+
+  if ((non_shift_bits > high_bit) || (non_shift_bits == 0)) {
+    switch (extend) {
+    case UXTB:
+    case UXTH:
+    case UXTW:
+      ubfm(rd, rn_, non_shift_bits, high_bit);
+      break;
+    case SXTB:
+    case SXTH:
+    case SXTW:
+      sbfm(rd, rn_, non_shift_bits, high_bit);
+      break;
+    case UXTX:
+    case SXTX: {
+        VIXL_ASSERT(rn.size() == kXRegSize);
+        // Nothing to extend. Just shift.
+        lsl(rd, rn_, left_shift);
+        break;
+      }
+    default:
+      VIXL_UNREACHABLE();
+    }
+  } else {
+    // No need to extend as the extended bits would be shifted away.
+    lsl(rd, rn_, left_shift);
+  }
+}
+
+
+void Assembler::DataProcExtendedRegister(const Register& rd, const Register& rn,
+                                         const Operand& operand, FlagsUpdate S, Instr op) {
+  Instr dest_reg = (S == SetFlags) ? Rd(rd) : RdSP(rd);
+  Emit(SF(rd) | op | Flags(S) | Rm(operand.reg()) |
+       ExtendMode(operand.extend()) | ImmExtendShift(operand.shift_amount()) |
+       dest_reg | RnSP(rn));
+}
+
+
+bool Assembler::IsImmAddSub(int64_t immediate) {
+  return is_uint12(immediate) || (is_uint12(immediate >> 12) && ((immediate & 0xfff) == 0));
+}
+
+
+BufferOffset Assembler::LoadStore(const CPURegister& rt, const MemOperand& addr,
+                                  LoadStoreOp op, LoadStoreScalingOption option) {
+  Instr memop = op | Rt(rt) | RnSP(addr.base());
+  ptrdiff_t offset = addr.offset();
+  LSDataSize size = CalcLSDataSize(op);
+
+  if (addr.IsImmediateOffset()) {
+    bool prefer_unscaled = (option == PreferUnscaledOffset) ||
+                           (option == RequireUnscaledOffset);
+    if (prefer_unscaled && IsImmLSUnscaled(offset)) {
+      // Use the unscaled addressing mode.
+      return Emit(LoadStoreUnscaledOffsetFixed | memop | ImmLS(offset));
+    }
+
+    if ((option != RequireUnscaledOffset) && IsImmLSScaled(offset, size)) {
+      // Use the scaled addressing mode.
+      return Emit(LoadStoreUnsignedOffsetFixed | memop |
+                  ImmLSUnsigned(offset >> size));
+    }
+
+    if ((option != RequireScaledOffset) && IsImmLSUnscaled(offset)) {
+      // Use the unscaled addressing mode.
+      return Emit(LoadStoreUnscaledOffsetFixed | memop | ImmLS(offset));
+    }
+  }
+
+  // All remaining addressing modes are register-offset, pre-indexed or
+  // post-indexed modes.
+  VIXL_ASSERT((option != RequireUnscaledOffset) &&
+             (option != RequireScaledOffset));
+
+  if (addr.IsRegisterOffset()) {
+    Extend ext = addr.extend();
+    Shift shift = addr.shift();
+    unsigned shift_amount = addr.shift_amount();
+
+    // LSL is encoded in the option field as UXTX.
+    if (shift == LSL) {
+      ext = UXTX;
+    }
+
+    // Shifts are encoded in one bit, indicating a left shift by the memory
+    // access size.
+    VIXL_ASSERT((shift_amount == 0) ||
+               (shift_amount == static_cast<unsigned>(CalcLSDataSize(op))));
+    return Emit(LoadStoreRegisterOffsetFixed | memop | Rm(addr.regoffset()) |
+                ExtendMode(ext) | ImmShiftLS((shift_amount > 0) ? 1 : 0));
+  }
+
+  if (addr.IsPreIndex() && IsImmLSUnscaled(offset)) {
+    return Emit(LoadStorePreIndexFixed | memop | ImmLS(offset));
+  }
+
+  if (addr.IsPostIndex() && IsImmLSUnscaled(offset)) {
+    return Emit(LoadStorePostIndexFixed | memop | ImmLS(offset));
+  }
+
+  // If this point is reached, the MemOperand (addr) cannot be encoded.
+  VIXL_UNREACHABLE();
+}
+
+
+bool Assembler::IsImmLSUnscaled(ptrdiff_t offset) {
+  return is_int9(offset);
+}
+
+
+bool Assembler::IsImmLSScaled(ptrdiff_t offset, LSDataSize size) {
+  bool offset_is_size_multiple = (((offset >> size) << size) == offset);
+  return offset_is_size_multiple && is_uint12(offset >> size);
+}
+
+
+void Assembler::LoadLiteral(const CPURegister& rt, uint64_t imm, LoadLiteralOp op) {
+  VIXL_ASSERT(is_int32(imm) || is_uint32(imm) || (rt.Is64Bits()));
+
+  //FIXME: BlockLiteralPoolScope scope(this);
+  MOZ_CRASH("LoadLiteral");
+  RecordLiteral(imm, rt.SizeInBytes());
+  Emit(op | ImmLLiteral(0) | Rt(rt));
+}
+
+
+void Assembler::LoadPCLiteral(const CPURegister& rt, ptrdiff_t pcInsOffset, LoadLiteralOp op) {
+  VIXL_ASSERT(is_int19(pcInsOffset));
+
+  // The PCInsOffset is in units of Instruction.
+  Emit(op | ImmLLiteral(pcInsOffset) | Rt(rt));
+}
+
+
+// Test if a given value can be encoded in the immediate field of a logical
+// instruction.
+// If it can be encoded, the function returns true, and values pointed to by n,
+// imm_s and imm_r are updated with immediates encoded in the format required
+// by the corresponding fields in the logical instruction.
+// If it can not be encoded, the function returns false, and the values pointed
+// to by n, imm_s and imm_r are undefined.
+bool Assembler::IsImmLogical(uint64_t value, unsigned width, unsigned* n,
+                             unsigned* imm_s, unsigned* imm_r) {
+  VIXL_ASSERT((width == kWRegSize) || (width == kXRegSize));
+
+  bool negate = false;
+
+  // Logical immediates are encoded using parameters n, imm_s and imm_r using
+  // the following table:
+  //
+  //    N   imms    immr    size        S             R
+  //    1  ssssss  rrrrrr    64    UInt(ssssss)  UInt(rrrrrr)
+  //    0  0sssss  xrrrrr    32    UInt(sssss)   UInt(rrrrr)
+  //    0  10ssss  xxrrrr    16    UInt(ssss)    UInt(rrrr)
+  //    0  110sss  xxxrrr     8    UInt(sss)     UInt(rrr)
+  //    0  1110ss  xxxxrr     4    UInt(ss)      UInt(rr)
+  //    0  11110s  xxxxxr     2    UInt(s)       UInt(r)
+  // (s bits must not be all set)
+  //
+  // A pattern is constructed of size bits, where the least significant S+1 bits
+  // are set. The pattern is rotated right by R, and repeated across a 32 or
+  // 64-bit value, depending on destination register width.
+  //
+  // Put another way: the basic format of a logical immediate is a single
+  // contiguous stretch of 1 bits, repeated across the whole word at intervals
+  // given by a power of 2. To identify them quickly, we first locate the
+  // lowest stretch of 1 bits, then the next 1 bit above that; that combination
+  // is different for every logical immediate, so it gives us all the
+  // information we need to identify the only logical immediate that our input
+  // could be, and then we simply check if that's the value we actually have.
+  //
+  // (The rotation parameter does give the possibility of the stretch of 1 bits
+  // going 'round the end' of the word. To deal with that, we observe that in
+  // any situation where that happens the bitwise NOT of the value is also a
+  // valid logical immediate. So we simply invert the input whenever its low bit
+  // is set, and then we know that the rotated case can't arise.)
+
+  if (value & 1) {
+    // If the low bit is 1, negate the value, and set a flag to remember that we
+    // did (so that we can adjust the return values appropriately).
+    negate = true;
+    value = ~value;
+  }
+
+  if (width == kWRegSize) {
+    // To handle 32-bit logical immediates, the very easiest thing is to repeat
+    // the input value twice to make a 64-bit word. The correct encoding of that
+    // as a logical immediate will also be the correct encoding of the 32-bit
+    // value.
+
+    // Avoid making the assumption that the most-significant 32 bits are zero by
+    // shifting the value left and duplicating it.
+    value <<= kWRegSize;
+    value |= value >> kWRegSize;
+  }
+
+  // The basic analysis idea: imagine our input word looks like this.
+  //
+  //    0011111000111110001111100011111000111110001111100011111000111110
+  //                                                          c  b    a
+  //                                                          |<--d-->|
+  //
+  // We find the lowest set bit (as an actual power-of-2 value, not its index)
+  // and call it a. Then we add a to our original number, which wipes out the
+  // bottommost stretch of set bits and replaces it with a 1 carried into the
+  // next zero bit. Then we look for the new lowest set bit, which is in
+  // position b, and subtract it, so now our number is just like the original
+  // but with the lowest stretch of set bits completely gone. Now we find the
+  // lowest set bit again, which is position c in the diagram above. Then we'll
+  // measure the distance d between bit positions a and c (using CLZ), and that
+  // tells us that the only valid logical immediate that could possibly be equal
+  // to this number is the one in which a stretch of bits running from a to just
+  // below b is replicated every d bits.
+  uint64_t a = LowestSetBit(value);
+  uint64_t value_plus_a = value + a;
+  uint64_t b = LowestSetBit(value_plus_a);
+  uint64_t value_plus_a_minus_b = value_plus_a - b;
+  uint64_t c = LowestSetBit(value_plus_a_minus_b);
+
+  int d, clz_a, out_n;
+  uint64_t mask;
+
+  if (c != 0) {
+    // The general case, in which there is more than one stretch of set bits.
+    // Compute the repeat distance d, and set up a bitmask covering the basic
+    // unit of repetition (i.e. a word with the bottom d bits set). Also, in all
+    // of these cases the N bit of the output will be zero.
+    clz_a = CountLeadingZeros(a, kXRegSize);
+    int clz_c = CountLeadingZeros(c, kXRegSize);
+    d = clz_a - clz_c;
+    mask = ((UINT64_C(1) << d) - 1);
+    out_n = 0;
+  } else {
+    // Handle degenerate cases.
+    //
+    // If any of those 'find lowest set bit' operations didn't find a set bit at
+    // all, then the word will have been zero thereafter, so in particular the
+    // last lowest_set_bit operation will have returned zero. So we can test for
+    // all the special case conditions in one go by seeing if c is zero.
+    if (a == 0) {
+      // The input was zero (or all 1 bits, which will come to here too after we
+      // inverted it at the start of the function), for which we just return
+      // false.
+      return false;
+    } else {
+      // Otherwise, if c was zero but a was not, then there's just one stretch
+      // of set bits in our word, meaning that we have the trivial case of
+      // d == 64 and only one 'repetition'. Set up all the same variables as in
+      // the general case above, and set the N bit in the output.
+      clz_a = CountLeadingZeros(a, kXRegSize);
+      d = 64;
+      mask = ~UINT64_C(0);
+      out_n = 1;
+    }
+  }
+
+  // If the repeat period d is not a power of two, it can't be encoded.
+  if (!js::IsPowerOfTwo(d)) {
+    return false;
+  }
+
+  if (((b - a) & ~mask) != 0) {
+    // If the bit stretch (b - a) does not fit within the mask derived from the
+    // repeat period, then fail.
+    return false;
+  }
+
+  // The only possible option is b - a repeated every d bits. Now we're going to
+  // actually construct the valid logical immediate derived from that
+  // specification, and see if it equals our original input.
+  //
+  // To repeat a value every d bits, we multiply it by a number of the form
+  // (1 + 2^d + 2^(2d) + ...), i.e. 0x0001000100010001 or similar. These can
+  // be derived using a table lookup on CLZ(d).
+  static const uint64_t multipliers[] = {
+    0x0000000000000001UL,
+    0x0000000100000001UL,
+    0x0001000100010001UL,
+    0x0101010101010101UL,
+    0x1111111111111111UL,
+    0x5555555555555555UL,
+  };
+  uint64_t multiplier = multipliers[CountLeadingZeros(d, kXRegSize) - 57];
+  uint64_t candidate = (b - a) * multiplier;
+
+  if (value != candidate) {
+    // The candidate pattern doesn't match our input value, so fail.
+    return false;
+  }
+
+  // We have a match! This is a valid logical immediate, so now we have to
+  // construct the bits and pieces of the instruction encoding that generates
+  // it.
+
+  // Count the set bits in our basic stretch. The special case of clz(0) == -1
+  // makes the answer come out right for stretches that reach the very top of
+  // the word (e.g. numbers like 0xffffc00000000000).
+  int clz_b = (b == 0) ? -1 : CountLeadingZeros(b, kXRegSize);
+  int s = clz_a - clz_b;
+
+  // Decide how many bits to rotate right by, to put the low bit of that basic
+  // stretch in position a.
+  int r;
+  if (negate) {
+    // If we inverted the input right at the start of this function, here's
+    // where we compensate: the number of set bits becomes the number of clear
+    // bits, and the rotation count is based on position b rather than position
+    // a (since b is the location of the 'lowest' 1 bit after inversion).
+    s = d - s;
+    r = (clz_b + 1) & (d - 1);
+  } else {
+    r = (clz_a + 1) & (d - 1);
+  }
+
+  // Now we're done, except for having to encode the S output in such a way that
+  // it gives both the number of set bits and the length of the repeated
+  // segment. The s field is encoded like this:
+  //
+  //     imms    size        S
+  //    ssssss    64    UInt(ssssss)
+  //    0sssss    32    UInt(sssss)
+  //    10ssss    16    UInt(ssss)
+  //    110sss     8    UInt(sss)
+  //    1110ss     4    UInt(ss)
+  //    11110s     2    UInt(s)
+  //
+  // So we 'or' (-d << 1) with our computed s to form imms.
+  if ((n != NULL) || (imm_s != NULL) || (imm_r != NULL)) {
+    *n = out_n;
+    *imm_s = ((-d << 1) | (s - 1)) & 0x3f;
+    *imm_r = r;
+  }
+
+  return true;
+}
+
+
+bool Assembler::IsImmConditionalCompare(int64_t immediate) {
+  return is_uint5(immediate);
+}
+
+
+bool Assembler::IsImmFP32(float imm) {
+  // Valid values will have the form:
+  // aBbb.bbbc.defg.h000.0000.0000.0000.0000
+  uint32_t bits = float_to_rawbits(imm);
+  // bits[19..0] are cleared.
+  if ((bits & 0x7ffff) != 0)
+    return false;
+
+  // bits[29..25] are all set or all cleared.
+  uint32_t b_pattern = (bits >> 16) & 0x3e00;
+  if (b_pattern != 0 && b_pattern != 0x3e00)
+    return false;
+
+  // bit[30] and bit[29] are opposite.
+  if (((bits ^ (bits << 1)) & 0x40000000) == 0)
+    return false;
+
+  return true;
+}
+
+
+bool Assembler::IsImmFP64(double imm) {
+  // Valid values will have the form:
+  // aBbb.bbbb.bbcd.efgh.0000.0000.0000.0000
+  // 0000.0000.0000.0000.0000.0000.0000.0000
+  uint64_t bits = double_to_rawbits(imm);
+  // bits[47..0] are cleared.
+  if ((bits & 0x0000ffffffffffff) != 0)
+    return false;
+
+  // bits[61..54] are all set or all cleared.
+  uint32_t b_pattern = (bits >> 48) & 0x3fc0;
+  if ((b_pattern != 0) && (b_pattern != 0x3fc0))
+    return false;
+
+  // bit[62] and bit[61] are opposite.
+  if (((bits ^ (bits << 1)) & (UINT64_C(1) << 62)) == 0)
+    return false;
+
+  return true;
+}
+
+
+LoadStoreOp Assembler::LoadOpFor(const CPURegister& rt) {
+  VIXL_ASSERT(rt.IsValid());
+  if (rt.IsRegister())
+    return rt.Is64Bits() ? LDR_x : LDR_w;
+
+  VIXL_ASSERT(rt.IsFPRegister());
+  return rt.Is64Bits() ? LDR_d : LDR_s;
+}
+
+
+LoadStorePairOp Assembler::LoadPairOpFor(const CPURegister& rt, const CPURegister& rt2) {
+  VIXL_ASSERT(AreSameSizeAndType(rt, rt2));
+  USE(rt2);
+  if (rt.IsRegister())
+    return rt.Is64Bits() ? LDP_x : LDP_w;
+
+  VIXL_ASSERT(rt.IsFPRegister());
+  return rt.Is64Bits() ? LDP_d : LDP_s;
+}
+
+
+LoadStoreOp Assembler::StoreOpFor(const CPURegister& rt) {
+  VIXL_ASSERT(rt.IsValid());
+  if (rt.IsRegister())
+    return rt.Is64Bits() ? STR_x : STR_w;
+
+  VIXL_ASSERT(rt.IsFPRegister());
+  return rt.Is64Bits() ? STR_d : STR_s;
+}
+
+
+LoadStorePairOp Assembler::StorePairOpFor(const CPURegister& rt, const CPURegister& rt2) {
+  VIXL_ASSERT(AreSameSizeAndType(rt, rt2));
+  USE(rt2);
+  if (rt.IsRegister())
+    return rt.Is64Bits() ? STP_x : STP_w;
+
+  VIXL_ASSERT(rt.IsFPRegister());
+  return rt.Is64Bits() ? STP_d : STP_s;
+}
+
+
+LoadStorePairNonTemporalOp Assembler::LoadPairNonTemporalOpFor(const CPURegister& rt, const CPURegister& rt2) {
+  VIXL_ASSERT(AreSameSizeAndType(rt, rt2));
+  USE(rt2);
+  if (rt.IsRegister())
+    return rt.Is64Bits() ? LDNP_x : LDNP_w;
+
+  VIXL_ASSERT(rt.IsFPRegister());
+  return rt.Is64Bits() ? LDNP_d : LDNP_s;
+}
+
+
+LoadStorePairNonTemporalOp Assembler::StorePairNonTemporalOpFor(const CPURegister& rt, const CPURegister& rt2) {
+  VIXL_ASSERT(AreSameSizeAndType(rt, rt2));
+  USE(rt2);
+  if (rt.IsRegister())
+    return rt.Is64Bits() ? STNP_x : STNP_w;
+
+  VIXL_ASSERT(rt.IsFPRegister());
+  return rt.Is64Bits() ? STNP_d : STNP_s;
+}
+
+
+LoadLiteralOp Assembler::LoadLiteralOpFor(const CPURegister& rt) {
+  if (rt.IsRegister())
+    return rt.Is64Bits() ? LDR_x_lit : LDR_w_lit;
+
+  VIXL_ASSERT(rt.IsFPRegister());
+  return rt.Is64Bits() ? LDR_d_lit : LDR_s_lit;
+}
+
+
+void Assembler::RecordLiteral(int64_t imm, unsigned size) {
+  MOZ_CRASH("RecordLiteral");
+}
+
+
+
+bool AreAliased(const CPURegister& reg1, const CPURegister& reg2,
+                const CPURegister& reg3, const CPURegister& reg4,
+                const CPURegister& reg5, const CPURegister& reg6,
+                const CPURegister& reg7, const CPURegister& reg8) {
+  int number_of_valid_regs = 0;
+  int number_of_valid_fpregs = 0;
+
+  RegList unique_regs = 0;
+  RegList unique_fpregs = 0;
+
+  const CPURegister regs[] = {reg1, reg2, reg3, reg4, reg5, reg6, reg7, reg8};
+
+  for (unsigned i = 0; i < sizeof(regs) / sizeof(regs[0]); i++) {
+    if (regs[i].IsRegister()) {
+      number_of_valid_regs++;
+      unique_regs |= regs[i].Bit();
+    } else if (regs[i].IsFPRegister()) {
+      number_of_valid_fpregs++;
+      unique_fpregs |= regs[i].Bit();
+    } else {
+      VIXL_ASSERT(!regs[i].IsValid());
+    }
+  }
+
+  int number_of_unique_regs = CountSetBits(unique_regs, sizeof(unique_regs) * 8);
+  int number_of_unique_fpregs = CountSetBits(unique_fpregs, sizeof(unique_fpregs) * 8);
+
+  VIXL_ASSERT(number_of_valid_regs >= number_of_unique_regs);
+  VIXL_ASSERT(number_of_valid_fpregs >= number_of_unique_fpregs);
+
+  return (number_of_valid_regs != number_of_unique_regs) ||
+         (number_of_valid_fpregs != number_of_unique_fpregs);
+}
+
+
+bool AreSameSizeAndType(const CPURegister& reg1, const CPURegister& reg2,
+                        const CPURegister& reg3, const CPURegister& reg4,
+                        const CPURegister& reg5, const CPURegister& reg6,
+                        const CPURegister& reg7, const CPURegister& reg8) {
+  VIXL_ASSERT(reg1.IsValid());
+  bool match = true;
+  match &= !reg2.IsValid() || reg2.IsSameSizeAndType(reg1);
+  match &= !reg3.IsValid() || reg3.IsSameSizeAndType(reg1);
+  match &= !reg4.IsValid() || reg4.IsSameSizeAndType(reg1);
+  match &= !reg5.IsValid() || reg5.IsSameSizeAndType(reg1);
+  match &= !reg6.IsValid() || reg6.IsSameSizeAndType(reg1);
+  match &= !reg7.IsValid() || reg7.IsSameSizeAndType(reg1);
+  match &= !reg8.IsValid() || reg8.IsSameSizeAndType(reg1);
+  return match;
+}
+
+} // namespace vixl
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Assembler-vixl.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Assembler-vixl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Assembler-vixl.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Assembler-vixl.h	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,1932 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#ifndef VIXL_A64_ASSEMBLER_A64_H_
+#define VIXL_A64_ASSEMBLER_A64_H_
+
+#include "jit/arm64/vixl/Globals-vixl.h"
+#include "jit/arm64/vixl/Instructions-vixl.h"
+#include "jit/arm64/vixl/MozBaseAssembler-vixl.h"
+#include "jit/arm64/vixl/Utils-vixl.h"
+
+#include "jit/JitSpewer.h"
+
+#include "jit/shared/Assembler-shared.h"
+#include "jit/shared/IonAssemblerBufferWithConstantPools.h"
+
+namespace vixl {
+
+using js::jit::BufferOffset;
+using js::jit::Label;
+using js::jit::Address;
+using js::jit::BaseIndex;
+
+
+// Registers.
+
+typedef uint64_t RegList;
+static const int kRegListSizeInBits = sizeof(RegList) * 8;
+
+// Some CPURegister methods can return Register and FPRegister types, so we
+// need to declare them in advance.
+class Register;
+class FPRegister;
+
+class CPURegister {
+ public:
+  enum RegisterType {
+    // The kInvalid value is used to detect uninitialized static instances,
+    // which are always zero-initialized before any constructors are called.
+    kInvalid = 0,
+    kRegister,
+    kFPRegister,
+    kNoRegister
+  };
+
+  constexpr CPURegister()
+    : code_(0), size_(0), type_(kNoRegister) {
+  }
+
+  constexpr CPURegister(unsigned code, unsigned size, RegisterType type)
+    : code_(code), size_(size), type_(type) {
+  }
+
+  unsigned code() const {
+    VIXL_ASSERT(IsValid());
+    return code_;
+  }
+
+  RegisterType type() const {
+    VIXL_ASSERT(IsValidOrNone());
+    return type_;
+  }
+
+  RegList Bit() const {
+    VIXL_ASSERT(code_ < (sizeof(RegList) * 8));
+    return IsValid() ? (static_cast<RegList>(1) << code_) : 0;
+  }
+
+  unsigned size() const {
+    VIXL_ASSERT(IsValid());
+    return size_;
+  }
+
+  int SizeInBytes() const {
+    VIXL_ASSERT(IsValid());
+    VIXL_ASSERT(size() % 8 == 0);
+    return size_ / 8;
+  }
+
+  int SizeInBits() const {
+    VIXL_ASSERT(IsValid());
+    return size_;
+  }
+
+  bool Is32Bits() const {
+    VIXL_ASSERT(IsValid());
+    return size_ == 32;
+  }
+
+  bool Is64Bits() const {
+    VIXL_ASSERT(IsValid());
+    return size_ == 64;
+  }
+
+  bool IsValid() const {
+    if (IsValidRegister() || IsValidFPRegister()) {
+      VIXL_ASSERT(!IsNone());
+      return true;
+    }
+
+    VIXL_ASSERT(IsNone());
+    return false;
+  }
+
+  bool IsValidRegister() const {
+    return IsRegister() &&
+           ((size_ == kWRegSize) || (size_ == kXRegSize)) &&
+           ((code_ < kNumberOfRegisters) || (code_ == kSPRegInternalCode));
+  }
+
+  bool IsValidFPRegister() const {
+    return IsFPRegister() &&
+           ((size_ == kSRegSize) || (size_ == kDRegSize)) &&
+           (code_ < kNumberOfFPRegisters);
+  }
+
+  bool IsNone() const {
+    // kNoRegister types should always have size 0 and code 0.
+    VIXL_ASSERT((type_ != kNoRegister) || (code_ == 0));
+    VIXL_ASSERT((type_ != kNoRegister) || (size_ == 0));
+
+    return type_ == kNoRegister;
+  }
+
+  bool Aliases(const CPURegister& other) const {
+    VIXL_ASSERT(IsValidOrNone() && other.IsValidOrNone());
+    return (code_ == other.code_) && (type_ == other.type_);
+  }
+
+  bool Is(const CPURegister& other) const {
+    VIXL_ASSERT(IsValidOrNone() && other.IsValidOrNone());
+    return Aliases(other) && (size_ == other.size_);
+  }
+
+  inline bool IsZero() const {
+    VIXL_ASSERT(IsValid());
+    return IsRegister() && (code_ == kZeroRegCode);
+  }
+
+  inline bool IsSP() const {
+    VIXL_ASSERT(IsValid());
+    return IsRegister() && (code_ == kSPRegInternalCode);
+  }
+
+  inline bool IsRegister() const {
+    return type_ == kRegister;
+  }
+
+  inline bool IsFPRegister() const {
+    return type_ == kFPRegister;
+  }
+
+  const Register& W() const;
+  const Register& X() const;
+  const FPRegister& S() const;
+  const FPRegister& D() const;
+
+  inline bool IsSameSizeAndType(const CPURegister& other) const {
+    return (size_ == other.size_) && (type_ == other.type_);
+  }
+
+ protected:
+  unsigned code_;
+  unsigned size_;
+  RegisterType type_;
+
+ private:
+  bool IsValidOrNone() const {
+    return IsValid() || IsNone();
+  }
+};
+
+class Register : public CPURegister {
+ public:
+  explicit Register() : CPURegister() {}
+
+  inline explicit Register(const CPURegister& other)
+    : CPURegister(other.code(), other.size(), other.type()) {
+    VIXL_ASSERT(IsValidRegister());
+  }
+
+  constexpr Register(unsigned code, unsigned size)
+    : CPURegister(code, size, kRegister) {
+  }
+
+  constexpr Register(js::jit::Register r, unsigned size)
+    : CPURegister(r.code(), size, kRegister) {
+  }
+
+  bool IsValid() const {
+    VIXL_ASSERT(IsRegister() || IsNone());
+    return IsValidRegister();
+  }
+
+  static const Register& WRegFromCode(unsigned code);
+  static const Register& XRegFromCode(unsigned code);
+
+  // V8 compatibility.
+  static const int kNumRegisters = kNumberOfRegisters;
+  static const int kNumAllocatableRegisters = kNumberOfRegisters - 1;
+
+ private:
+  static const Register wregisters[];
+  static const Register xregisters[];
+};
+
+class FPRegister : public CPURegister {
+ public:
+  inline FPRegister() : CPURegister() {}
+
+  inline explicit FPRegister(const CPURegister& other)
+    : CPURegister(other.code(), other.size(), other.type()) {
+    VIXL_ASSERT(IsValidFPRegister());
+  }
+  constexpr inline FPRegister(js::jit::FloatRegister r, unsigned size)
+    : CPURegister(r.code_, size, kFPRegister) {
+  }
+  constexpr inline FPRegister(js::jit::FloatRegister r)
+    : CPURegister(r.code_, r.size() * 8, kFPRegister) {
+  }
+  constexpr inline FPRegister(unsigned code, unsigned size)
+    : CPURegister(code, size, kFPRegister) {
+  }
+
+  bool IsValid() const {
+    VIXL_ASSERT(IsFPRegister() || IsNone());
+    return IsValidFPRegister();
+  }
+
+  static const FPRegister& SRegFromCode(unsigned code);
+  static const FPRegister& DRegFromCode(unsigned code);
+
+  // V8 compatibility.
+  static const int kNumRegisters = kNumberOfFPRegisters;
+  static const int kNumAllocatableRegisters = kNumberOfFPRegisters - 1;
+
+ private:
+  static const FPRegister sregisters[];
+  static const FPRegister dregisters[];
+};
+
+// No*Reg is used to indicate an unused argument, or an error case. Note that
+// these all compare equal (using the Is() method). The Register and FPRegister
+// variants are provided for convenience.
+const Register NoReg;
+const FPRegister NoFPReg;
+const CPURegister NoCPUReg;
+
+#define DEFINE_REGISTERS(N)  \
+constexpr Register w##N(N, kWRegSize);  \
+constexpr Register x##N(N, kXRegSize);
+REGISTER_CODE_LIST(DEFINE_REGISTERS)
+#undef DEFINE_REGISTERS
+constexpr Register wsp(kSPRegInternalCode, kWRegSize);
+constexpr Register sp(kSPRegInternalCode, kXRegSize);
+
+#define DEFINE_FPREGISTERS(N)  \
+constexpr FPRegister s##N(N, kSRegSize);  \
+constexpr FPRegister d##N(N, kDRegSize);
+REGISTER_CODE_LIST(DEFINE_FPREGISTERS)
+#undef DEFINE_FPREGISTERS
+
+// Registers aliases.
+constexpr Register ip0 = x16;
+constexpr Register ip1 = x17;
+constexpr Register lr = x30;
+constexpr Register xzr = x31;
+constexpr Register wzr = w31;
+
+// AreAliased returns true if any of the named registers overlap. Arguments
+// set to NoReg are ignored. The system stack pointer may be specified.
+bool AreAliased(const CPURegister& reg1,
+                const CPURegister& reg2,
+                const CPURegister& reg3 = NoReg,
+                const CPURegister& reg4 = NoReg,
+                const CPURegister& reg5 = NoReg,
+                const CPURegister& reg6 = NoReg,
+                const CPURegister& reg7 = NoReg,
+                const CPURegister& reg8 = NoReg);
+
+// AreSameSizeAndType returns true if all of the specified registers have the
+// same size, and are of the same type. The system stack pointer may be
+// specified. Arguments set to NoReg are ignored, as are any subsequent
+// arguments. At least one argument (reg1) must be valid (not NoCPUReg).
+bool AreSameSizeAndType(const CPURegister& reg1,
+                        const CPURegister& reg2,
+                        const CPURegister& reg3 = NoCPUReg,
+                        const CPURegister& reg4 = NoCPUReg,
+                        const CPURegister& reg5 = NoCPUReg,
+                        const CPURegister& reg6 = NoCPUReg,
+                        const CPURegister& reg7 = NoCPUReg,
+                        const CPURegister& reg8 = NoCPUReg);
+
+// Lists of registers.
+class CPURegList {
+ public:
+  inline explicit CPURegList(CPURegister reg1,
+                             CPURegister reg2 = NoCPUReg,
+                             CPURegister reg3 = NoCPUReg,
+                             CPURegister reg4 = NoCPUReg)
+    : list_(reg1.Bit() | reg2.Bit() | reg3.Bit() | reg4.Bit()),
+      size_(reg1.size()), type_(reg1.type()) {
+    VIXL_ASSERT(AreSameSizeAndType(reg1, reg2, reg3, reg4));
+    VIXL_ASSERT(IsValid());
+  }
+
+  inline CPURegList(CPURegister::RegisterType type, unsigned size, RegList list)
+    : list_(list), size_(size), type_(type) {
+    VIXL_ASSERT(IsValid());
+  }
+
+  inline CPURegList(CPURegister::RegisterType type, unsigned size,
+                    unsigned first_reg, unsigned last_reg)
+    : size_(size), type_(type) {
+    VIXL_ASSERT(((type == CPURegister::kRegister) &&
+                (last_reg < kNumberOfRegisters)) ||
+               ((type == CPURegister::kFPRegister) &&
+                (last_reg < kNumberOfFPRegisters)));
+    VIXL_ASSERT(last_reg >= first_reg);
+    list_ = (UINT64_C(1) << (last_reg + 1)) - 1;
+    list_ &= ~((UINT64_C(1) << first_reg) - 1);
+    VIXL_ASSERT(IsValid());
+  }
+
+  inline CPURegister::RegisterType type() const {
+    VIXL_ASSERT(IsValid());
+    return type_;
+  }
+
+  // Combine another CPURegList into this one. Registers that already exist in
+  // this list are left unchanged. The type and size of the registers in the
+  // 'other' list must match those in this list.
+  void Combine(const CPURegList& other) {
+    VIXL_ASSERT(IsValid());
+    VIXL_ASSERT(other.type() == type_);
+    VIXL_ASSERT(other.RegisterSizeInBits() == size_);
+    list_ |= other.list();
+  }
+
+  // Remove every register in the other CPURegList from this one. Registers that
+  // do not exist in this list are ignored. The type and size of the registers
+  // in the 'other' list must match those in this list.
+  void Remove(const CPURegList& other) {
+    VIXL_ASSERT(IsValid());
+    VIXL_ASSERT(other.type() == type_);
+    VIXL_ASSERT(other.RegisterSizeInBits() == size_);
+    list_ &= ~other.list();
+  }
+
+  // Variants of Combine and Remove which take a single register.
+  inline void Combine(const CPURegister& other) {
+    VIXL_ASSERT(other.type() == type_);
+    VIXL_ASSERT(other.size() == size_);
+    Combine(other.code());
+  }
+
+  inline void Remove(const CPURegister& other) {
+    VIXL_ASSERT(other.type() == type_);
+    VIXL_ASSERT(other.size() == size_);
+    Remove(other.code());
+  }
+
+  // Variants of Combine and Remove which take a single register by its code;
+  // the type and size of the register is inferred from this list.
+  inline void Combine(int code) {
+    VIXL_ASSERT(IsValid());
+    VIXL_ASSERT(CPURegister(code, size_, type_).IsValid());
+    list_ |= (UINT64_C(1) << code);
+  }
+
+  inline void Remove(int code) {
+    VIXL_ASSERT(IsValid());
+    VIXL_ASSERT(CPURegister(code, size_, type_).IsValid());
+    list_ &= ~(UINT64_C(1) << code);
+  }
+
+  inline RegList list() const {
+    VIXL_ASSERT(IsValid());
+    return list_;
+  }
+
+  inline void set_list(RegList new_list) {
+    VIXL_ASSERT(IsValid());
+    list_ = new_list;
+  }
+
+  // Remove all callee-saved registers from the list. This can be useful when
+  // preparing registers for an AAPCS64 function call, for example.
+  void RemoveCalleeSaved();
+
+  CPURegister PopLowestIndex();
+  CPURegister PopHighestIndex();
+
+  // AAPCS64 callee-saved registers.
+  static CPURegList GetCalleeSaved(unsigned size = kXRegSize);
+  static CPURegList GetCalleeSavedFP(unsigned size = kDRegSize);
+
+  // AAPCS64 caller-saved registers. Note that this includes lr.
+  static CPURegList GetCallerSaved(unsigned size = kXRegSize);
+  static CPURegList GetCallerSavedFP(unsigned size = kDRegSize);
+
+  inline bool IsEmpty() const {
+    VIXL_ASSERT(IsValid());
+    return list_ == 0;
+  }
+
+  inline bool IncludesAliasOf(const CPURegister& other) const {
+    VIXL_ASSERT(IsValid());
+    return (type_ == other.type()) && ((other.Bit() & list_) != 0);
+  }
+
+  inline bool IncludesAliasOf(int code) const {
+    VIXL_ASSERT(IsValid());
+    return ((code & list_) != 0);
+  }
+
+  inline int Count() const {
+    VIXL_ASSERT(IsValid());
+    return CountSetBits(list_, kRegListSizeInBits);
+  }
+
+  inline unsigned RegisterSizeInBits() const {
+    VIXL_ASSERT(IsValid());
+    return size_;
+  }
+
+  inline unsigned RegisterSizeInBytes() const {
+    int size_in_bits = RegisterSizeInBits();
+    VIXL_ASSERT((size_in_bits % 8) == 0);
+    return size_in_bits / 8;
+  }
+
+  inline unsigned TotalSizeInBytes() const {
+    VIXL_ASSERT(IsValid());
+    return RegisterSizeInBytes() * Count();
+  }
+
+ private:
+  RegList list_;
+  unsigned size_;
+  CPURegister::RegisterType type_;
+
+  bool IsValid() const;
+};
+
+// AAPCS64 callee-saved registers.
+extern const CPURegList kCalleeSaved;
+extern const CPURegList kCalleeSavedFP;
+
+// AAPCS64 caller-saved registers. Note that this includes lr.
+extern const CPURegList kCallerSaved;
+extern const CPURegList kCallerSavedFP;
+
+// Operand.
+class Operand {
+ public:
+  // #<immediate>
+  // where <immediate> is int64_t.
+  // This is allowed to be an implicit constructor because Operand is
+  // a wrapper class that doesn't normally perform any type conversion.
+  Operand(int64_t immediate);           // NOLINT(runtime/explicit)
+
+  // rm, {<shift> #<shift_amount>}
+  // where <shift> is one of {LSL, LSR, ASR, ROR}.
+  //       <shift_amount> is uint6_t.
+  // This is allowed to be an implicit constructor because Operand is
+  // a wrapper class that doesn't normally perform any type conversion.
+  Operand(Register reg,
+          Shift shift = LSL,
+          unsigned shift_amount = 0);   // NOLINT(runtime/explicit)
+
+  // rm, {<extend> {#<shift_amount>}}
+  // where <extend> is one of {UXTB, UXTH, UXTW, UXTX, SXTB, SXTH, SXTW, SXTX}.
+  //       <shift_amount> is uint2_t.
+  explicit Operand(Register reg, Extend extend, unsigned shift_amount = 0);
+
+  bool IsImmediate() const;
+  bool IsShiftedRegister() const;
+  bool IsExtendedRegister() const;
+  bool IsZero() const;
+
+  // This returns an LSL shift (<= 4) operand as an equivalent extend operand,
+  // which helps in the encoding of instructions that use the stack pointer.
+  Operand ToExtendedRegister() const;
+
+  int64_t immediate() const {
+    VIXL_ASSERT(IsImmediate());
+    return immediate_;
+  }
+
+  Register reg() const {
+    VIXL_ASSERT(IsShiftedRegister() || IsExtendedRegister());
+    return reg_;
+  }
+
+  CPURegister maybeReg() const {
+    if (IsShiftedRegister() || IsExtendedRegister())
+      return reg_;
+    return NoCPUReg;
+  }
+
+  Shift shift() const {
+    VIXL_ASSERT(IsShiftedRegister());
+    return shift_;
+  }
+
+  Extend extend() const {
+    VIXL_ASSERT(IsExtendedRegister());
+    return extend_;
+  }
+
+  unsigned shift_amount() const {
+    VIXL_ASSERT(IsShiftedRegister() || IsExtendedRegister());
+    return shift_amount_;
+  }
+
+ private:
+  int64_t immediate_;
+  Register reg_;
+  Shift shift_;
+  Extend extend_;
+  unsigned shift_amount_;
+};
+
+
+// MemOperand represents the addressing mode of a load or store instruction.
+class MemOperand {
+ public:
+  explicit MemOperand(Register base,
+                      ptrdiff_t offset = 0,
+                      AddrMode addrmode = Offset);
+  explicit MemOperand(Register base,
+                      Register regoffset,
+                      Shift shift = LSL,
+                      unsigned shift_amount = 0);
+  explicit MemOperand(Register base,
+                      Register regoffset,
+                      Extend extend,
+                      unsigned shift_amount = 0);
+  explicit MemOperand(Register base,
+                      const Operand& offset,
+                      AddrMode addrmode = Offset);
+
+  // Adapter constructors using C++11 delegating.
+  explicit MemOperand(js::jit::Address addr)
+    : MemOperand(Register(addr.base, 64), (ptrdiff_t)addr.offset) {
+  }
+
+  const Register& base() const {
+    return base_;
+  }
+  const Register& regoffset() const {
+    return regoffset_;
+  }
+  ptrdiff_t offset() const {
+    return offset_;
+  }
+  AddrMode addrmode() const {
+    return addrmode_;
+  }
+  Shift shift() const {
+    return shift_;
+  }
+  Extend extend() const {
+    return extend_;
+  }
+  unsigned shift_amount() const {
+    return shift_amount_;
+  }
+  bool IsImmediateOffset() const;
+  bool IsRegisterOffset() const;
+  bool IsPreIndex() const;
+  bool IsPostIndex() const;
+
+ private:
+  Register base_;
+  Register regoffset_;
+  ptrdiff_t offset_;
+  AddrMode addrmode_;
+  Shift shift_;
+  Extend extend_;
+  unsigned shift_amount_;
+};
+
+// Control whether or not position-independent code should be emitted.
+enum PositionIndependentCodeOption {
+  // All code generated will be position-independent; all branches and
+  // references to labels generated with the Label class will use PC-relative
+  // addressing.
+  PositionIndependentCode,
+
+  // Allow VIXL to generate code that refers to absolute addresses. With this
+  // option, it will not be possible to copy the code buffer and run it from a
+  // different address; code must be generated in its final location.
+  PositionDependentCode,
+
+  // Allow VIXL to assume that the bottom 12 bits of the address will be
+  // constant, but that the top 48 bits may change. This allows `adrp` to
+  // function in systems which copy code between pages, but otherwise maintain
+  // 4KB page alignment.
+  PageOffsetDependentCode
+};
+
+// Control how scaled- and unscaled-offset loads and stores are generated.
+enum LoadStoreScalingOption {
+  // Prefer scaled-immediate-offset instructions, but emit unscaled-offset,
+  // register-offset, pre-index or post-index instructions if necessary.
+  PreferScaledOffset,
+
+  // Prefer unscaled-immediate-offset instructions, but emit scaled-offset,
+  // register-offset, pre-index or post-index instructions if necessary.
+  PreferUnscaledOffset,
+
+  // Require scaled-immediate-offset instructions.
+  RequireScaledOffset,
+
+  // Require unscaled-immediate-offset instructions.
+  RequireUnscaledOffset
+};
+
+// Assembler.
+class Assembler : public MozBaseAssembler {
+ public:
+  Assembler()
+    : pc_(nullptr) { // FIXME: Yeah this thing needs some lovin'.
+#ifdef DEBUG
+    finalized_ = false;
+#endif
+  }
+
+  // The destructor asserts that one of the following is true:
+  //  * The Assembler object has not been used.
+  //  * Nothing has been emitted since the last Reset() call.
+  //  * Nothing has been emitted since the last FinalizeCode() call.
+  ~Assembler() {
+    // FIXME: Probably useful to assert the above, once we hook up ARMBuffer.
+    // VIXL_ASSERT(finalized_ || (pc_ == buffer_));
+  }
+
+  // System functions.
+
+  // Start generating code from the beginning of the buffer, discarding any code
+  // and data that has already been emitted into the buffer.
+  //
+  // In order to avoid any accidental transfer of state, Reset ASSERTs that the
+  // constant pool is not blocked.
+  void Reset();
+
+  // Finalize a code buffer of generated instructions. This function must be
+  // called before executing or copying code from the buffer.
+  void FinalizeCode();
+
+  // Bit set when a DoubleCondition does not map to a single ARM condition.
+  // The MacroAssembler must special-case these conditions, or else
+  // ConditionFromDoubleCondition will complain.
+  static const int DoubleConditionBitSpecial = 0x100;
+
+  enum DoubleCondition {
+    DoubleOrdered                        = Condition::vc,
+    DoubleEqual                          = Condition::eq,
+    DoubleNotEqual                       = Condition::ne | DoubleConditionBitSpecial,
+    DoubleGreaterThan                    = Condition::gt,
+    DoubleGreaterThanOrEqual             = Condition::ge,
+    DoubleLessThan                       = Condition::lo, // Could also use Condition::mi.
+    DoubleLessThanOrEqual                = Condition::ls,
+
+    // If either operand is NaN, these conditions always evaluate to true.
+    DoubleUnordered                      = Condition::vs,
+    DoubleEqualOrUnordered               = Condition::eq | DoubleConditionBitSpecial,
+    DoubleNotEqualOrUnordered            = Condition::ne,
+    DoubleGreaterThanOrUnordered         = Condition::hi,
+    DoubleGreaterThanOrEqualOrUnordered  = Condition::hs,
+    DoubleLessThanOrUnordered            = Condition::lt,
+    DoubleLessThanOrEqualOrUnordered     = Condition::le
+  };
+
+  static inline Condition InvertCondition(Condition cond) {
+    // Conditions al and nv behave identically, as "always true". They can't be
+    // inverted, because there is no "always false" condition.
+    VIXL_ASSERT((cond != al) && (cond != nv));
+    return static_cast<Condition>(cond ^ 1);
+  }
+  // This is chaging the condition codes for cmp a, b to the same codes for cmp b, a.
+  static inline Condition InvertCmpCondition(Condition cond) {
+    // Conditions al and nv behave identically, as "always true". They can't be
+    // inverted, because there is no "always false" condition.
+    switch (cond) {
+    case eq:
+    case ne:
+      return cond;
+    case gt:
+      return le;
+    case le:
+      return gt;
+    case ge:
+      return lt;
+    case lt:
+      return ge;
+    case hi:
+      return lo;
+    case lo:
+      return hi;
+    case hs:
+      return ls;
+    case ls:
+      return hs;
+    case mi:
+      return pl;
+    case pl:
+      return mi;
+    default:
+      MOZ_CRASH("TODO: figure this case out.");
+    }
+    return static_cast<Condition>(cond ^ 1);
+  }
+
+  static inline Condition ConditionFromDoubleCondition(DoubleCondition cond) {
+    VIXL_ASSERT(!(cond & DoubleConditionBitSpecial));
+    return static_cast<Condition>(cond);
+  }
+
+  // Instruction set functions.
+
+  // Branch / Jump instructions.
+  // Branch to register.
+
+  void br(const Register& xn);
+  static void br(Instruction* at, const Register& xn);
+
+  // Branch with link to register.
+  void blr(const Register& xn);
+  static void blr(Instruction* at, const Register& xn);
+  // Branch to register with return hint.
+  void ret(const Register& xn = lr);
+
+  // Unconditional branch to label.
+  BufferOffset b(Label* label);
+
+  // Conditional branch to label.
+  BufferOffset b(Label* label, Condition cond);
+
+  // Unconditional branch to PC offset.
+  BufferOffset b(int imm26);
+  static void b(Instruction* at, int imm26);
+
+  // Conditional branch to PC offset.
+  BufferOffset b(int imm19, Condition cond);
+  static void b(Instruction* at, int imm19, Condition cond);
+
+  // Branch with link to label.
+  void bl(Label* label);
+
+  // Branch with link to PC offset.
+  void bl(int imm26);
+  static void bl(Instruction* at, int imm26);
+
+  // Compare and branch to label if zero.
+  void cbz(const Register& rt, Label* label);
+
+  // Compare and branch to PC offset if zero.
+  void cbz(const Register& rt, int imm19);
+  static void cbz(Instruction* at, const Register& rt, int imm19);
+
+  // Compare and branch to label if not zero.
+  void cbnz(const Register& rt, Label* label);
+
+  // Compare and branch to PC offset if not zero.
+  void cbnz(const Register& rt, int imm19);
+  static void cbnz(Instruction* at, const Register& rt, int imm19);
+
+  // Test bit and branch to label if zero.
+  void tbz(const Register& rt, unsigned bit_pos, Label* label);
+
+  // Test bit and branch to PC offset if zero.
+  void tbz(const Register& rt, unsigned bit_pos, int imm14);
+  static void tbz(Instruction* at, const Register& rt, unsigned bit_pos, int imm14);
+
+  // Test bit and branch to label if not zero.
+  void tbnz(const Register& rt, unsigned bit_pos, Label* label);
+
+  // Test bit and branch to PC offset if not zero.
+  void tbnz(const Register& rt, unsigned bit_pos, int imm14);
+  static void tbnz(Instruction* at, const Register& rt, unsigned bit_pos, int imm14);
+
+  // Address calculation instructions.
+  // Calculate a PC-relative address. Unlike for branches the offset in adr is
+  // unscaled (i.e. the result can be unaligned).
+
+  // Calculate the address of a label.
+  void adr(const Register& rd, Label* label);
+
+  // Calculate the address of a PC offset.
+  void adr(const Register& rd, int imm21);
+  static void adr(Instruction* at, const Register& rd, int imm21);
+
+  // Calculate the page address of a label.
+  void adrp(const Register& rd, Label* label);
+
+  // Calculate the page address of a PC offset.
+  void adrp(const Register& rd, int imm21);
+  static void adrp(Instruction* at, const Register& rd, int imm21);
+
+  // Data Processing instructions.
+  // Add.
+  void add(const Register& rd, const Register& rn, const Operand& operand);
+
+  // Add and update status flags.
+  void adds(const Register& rd, const Register& rn, const Operand& operand);
+
+  // Compare negative.
+  void cmn(const Register& rn, const Operand& operand);
+
+  // Subtract.
+  void sub(const Register& rd, const Register& rn, const Operand& operand);
+
+  // Subtract and update status flags.
+  void subs(const Register& rd, const Register& rn, const Operand& operand);
+
+  // Compare.
+  void cmp(const Register& rn, const Operand& operand);
+
+  // Negate.
+  void neg(const Register& rd, const Operand& operand);
+
+  // Negate and update status flags.
+  void negs(const Register& rd, const Operand& operand);
+
+  // Add with carry bit.
+  void adc(const Register& rd, const Register& rn, const Operand& operand);
+
+  // Add with carry bit and update status flags.
+  void adcs(const Register& rd, const Register& rn, const Operand& operand);
+
+  // Subtract with carry bit.
+  void sbc(const Register& rd, const Register& rn, const Operand& operand);
+
+  // Subtract with carry bit and update status flags.
+  void sbcs(const Register& rd, const Register& rn, const Operand& operand);
+
+  // Negate with carry bit.
+  void ngc(const Register& rd, const Operand& operand);
+
+  // Negate with carry bit and update status flags.
+  void ngcs(const Register& rd, const Operand& operand);
+
+  // Logical instructions.
+  // Bitwise and (A & B).
+  void and_(const Register& rd, const Register& rn, const Operand& operand);
+
+  // Bitwise and (A & B) and update status flags.
+  BufferOffset ands(const Register& rd, const Register& rn, const Operand& operand);
+
+  // Bit test and set flags.
+  BufferOffset tst(const Register& rn, const Operand& operand);
+
+  // Bit clear (A & ~B).
+  void bic(const Register& rd, const Register& rn, const Operand& operand);
+
+  // Bit clear (A & ~B) and update status flags.
+  void bics(const Register& rd, const Register& rn, const Operand& operand);
+
+  // Bitwise or (A | B).
+  void orr(const Register& rd, const Register& rn, const Operand& operand);
+
+  // Bitwise nor (A | ~B).
+  void orn(const Register& rd, const Register& rn, const Operand& operand);
+
+  // Bitwise eor/xor (A ^ B).
+  void eor(const Register& rd, const Register& rn, const Operand& operand);
+
+  // Bitwise enor/xnor (A ^ ~B).
+  void eon(const Register& rd, const Register& rn, const Operand& operand);
+
+  // Logical shift left by variable.
+  void lslv(const Register& rd, const Register& rn, const Register& rm);
+
+  // Logical shift right by variable.
+  void lsrv(const Register& rd, const Register& rn, const Register& rm);
+
+  // Arithmetic shift right by variable.
+  void asrv(const Register& rd, const Register& rn, const Register& rm);
+
+  // Rotate right by variable.
+  void rorv(const Register& rd, const Register& rn, const Register& rm);
+
+  // Bitfield instructions.
+  // Bitfield move.
+  void bfm(const Register& rd, const Register& rn, unsigned immr, unsigned imms);
+
+  // Signed bitfield move.
+  void sbfm(const Register& rd, const Register& rn, unsigned immr, unsigned imms);
+
+  // Unsigned bitfield move.
+  void ubfm(const Register& rd, const Register& rn, unsigned immr, unsigned imms);
+
+  // Bfm aliases.
+  // Bitfield insert.
+  inline void bfi(const Register& rd, const Register& rn, unsigned lsb, unsigned width) {
+    VIXL_ASSERT(width >= 1);
+    VIXL_ASSERT(lsb + width <= rn.size());
+    bfm(rd, rn, (rd.size() - lsb) & (rd.size() - 1), width - 1);
+  }
+
+  // Bitfield extract and insert low.
+  inline void bfxil(const Register& rd, const Register& rn, unsigned lsb, unsigned width) {
+    VIXL_ASSERT(width >= 1);
+    VIXL_ASSERT(lsb + width <= rn.size());
+    bfm(rd, rn, lsb, lsb + width - 1);
+  }
+
+  // Sbfm aliases.
+  // Arithmetic shift right.
+  inline void asr(const Register& rd, const Register& rn, unsigned shift) {
+    VIXL_ASSERT(shift < rd.size());
+    sbfm(rd, rn, shift, rd.size() - 1);
+  }
+
+  // Signed bitfield insert with zero at right.
+  inline void sbfiz(const Register& rd, const Register& rn, unsigned lsb, unsigned width) {
+    VIXL_ASSERT(width >= 1);
+    VIXL_ASSERT(lsb + width <= rn.size());
+    sbfm(rd, rn, (rd.size() - lsb) & (rd.size() - 1), width - 1);
+  }
+
+  // Signed bitfield extract.
+  inline void sbfx(const Register& rd, const Register& rn, unsigned lsb, unsigned width) {
+    VIXL_ASSERT(width >= 1);
+    VIXL_ASSERT(lsb + width <= rn.size());
+    sbfm(rd, rn, lsb, lsb + width - 1);
+  }
+
+  // Signed extend byte.
+  inline void sxtb(const Register& rd, const Register& rn) {
+    sbfm(rd, rn, 0, 7);
+  }
+
+  // Signed extend halfword.
+  inline void sxth(const Register& rd, const Register& rn) {
+    sbfm(rd, rn, 0, 15);
+  }
+
+  // Signed extend word.
+  inline void sxtw(const Register& rd, const Register& rn) {
+    sbfm(rd, rn, 0, 31);
+  }
+
+  // Ubfm aliases.
+  // Logical shift left.
+  inline void lsl(const Register& rd, const Register& rn, unsigned shift) {
+    unsigned reg_size = rd.size();
+    VIXL_ASSERT(shift < reg_size);
+    ubfm(rd, rn, (reg_size - shift) % reg_size, reg_size - shift - 1);
+  }
+
+  // Logical shift right.
+  inline void lsr(const Register& rd, const Register& rn, unsigned shift) {
+    VIXL_ASSERT(shift < rd.size());
+    ubfm(rd, rn, shift, rd.size() - 1);
+  }
+
+  // Unsigned bitfield insert with zero at right.
+  inline void ubfiz(const Register& rd, const Register& rn, unsigned lsb, unsigned width) {
+    VIXL_ASSERT(width >= 1);
+    VIXL_ASSERT(lsb + width <= rn.size());
+    ubfm(rd, rn, (rd.size() - lsb) & (rd.size() - 1), width - 1);
+  }
+
+  // Unsigned bitfield extract.
+  inline void ubfx(const Register& rd, const Register& rn, unsigned lsb, unsigned width) {
+    VIXL_ASSERT(width >= 1);
+    VIXL_ASSERT(lsb + width <= rn.size());
+    ubfm(rd, rn, lsb, lsb + width - 1);
+  }
+
+  // Unsigned extend byte.
+  inline void uxtb(const Register& rd, const Register& rn) {
+    ubfm(rd, rn, 0, 7);
+  }
+
+  // Unsigned extend halfword.
+  inline void uxth(const Register& rd, const Register& rn) {
+    ubfm(rd, rn, 0, 15);
+  }
+
+  // Unsigned extend word.
+  inline void uxtw(const Register& rd, const Register& rn) {
+    ubfm(rd, rn, 0, 31);
+  }
+
+  // Extract.
+  void extr(const Register& rd, const Register& rn, const Register& rm, unsigned lsb);
+
+  // Conditional select: rd = cond ? rn : rm.
+  void csel(const Register& rd, const Register& rn, const Register& rm, Condition cond);
+
+  // Conditional select increment: rd = cond ? rn : rm + 1.
+  void csinc(const Register& rd, const Register& rn, const Register& rm, Condition cond);
+
+  // Conditional select inversion: rd = cond ? rn : ~rm.
+  void csinv(const Register& rd, const Register& rn, const Register& rm, Condition cond);
+
+  // Conditional select negation: rd = cond ? rn : -rm.
+  void csneg(const Register& rd, const Register& rn, const Register& rm, Condition cond);
+
+  // Conditional set: rd = cond ? 1 : 0.
+  void cset(const Register& rd, Condition cond);
+
+  // Conditional set mask: rd = cond ? -1 : 0.
+  void csetm(const Register& rd, Condition cond);
+
+  // Conditional increment: rd = cond ? rn + 1 : rn.
+  void cinc(const Register& rd, const Register& rn, Condition cond);
+
+  // Conditional invert: rd = cond ? ~rn : rn.
+  void cinv(const Register& rd, const Register& rn, Condition cond);
+
+  // Conditional negate: rd = cond ? -rn : rn.
+  void cneg(const Register& rd, const Register& rn, Condition cond);
+
+  // Rotate right.
+  inline void ror(const Register& rd, const Register& rs, unsigned shift) {
+    extr(rd, rs, rs, shift);
+  }
+
+  // Conditional comparison.
+  // Conditional compare negative.
+  void ccmn(const Register& rn, const Operand& operand, StatusFlags nzcv, Condition cond);
+
+  // Conditional compare.
+  void ccmp(const Register& rn, const Operand& operand, StatusFlags nzcv, Condition cond);
+
+  // Multiply.
+  void mul(const Register& rd, const Register& rn, const Register& rm);
+
+  // Negated multiply.
+  void mneg(const Register& rd, const Register& rn, const Register& rm);
+
+  // Signed long multiply: 32 x 32 -> 64-bit.
+  void smull(const Register& rd, const Register& rn, const Register& rm);
+
+  // Signed multiply high: 64 x 64 -> 64-bit <127:64>.
+  void smulh(const Register& xd, const Register& xn, const Register& xm);
+
+  // Multiply and accumulate.
+  void madd(const Register& rd, const Register& rn,
+            const Register& rm, const Register& ra);
+
+  // Multiply and subtract.
+  void msub(const Register& rd, const Register& rn,
+            const Register& rm, const Register& ra);
+
+  // Signed long multiply and accumulate: 32 x 32 + 64 -> 64-bit.
+  void smaddl(const Register& rd, const Register& rn,
+              const Register& rm, const Register& ra);
+
+  // Unsigned long multiply and accumulate: 32 x 32 + 64 -> 64-bit.
+  void umaddl(const Register& rd, const Register& rn,
+              const Register& rm, const Register& ra);
+
+  // Signed long multiply and subtract: 64 - (32 x 32) -> 64-bit.
+  void smsubl(const Register& rd, const Register& rn,
+              const Register& rm, const Register& ra);
+
+  // Unsigned long multiply and subtract: 64 - (32 x 32) -> 64-bit.
+  void umsubl(const Register& rd, const Register& rn,
+              const Register& rm, const Register& ra);
+
+  // Signed integer divide.
+  void sdiv(const Register& rd, const Register& rn, const Register& rm);
+
+  // Unsigned integer divide.
+  void udiv(const Register& rd, const Register& rn, const Register& rm);
+
+  // Bit reverse.
+  void rbit(const Register& rd, const Register& rn);
+
+  // Reverse bytes in 16-bit half words.
+  void rev16(const Register& rd, const Register& rn);
+
+  // Reverse bytes in 32-bit words.
+  void rev32(const Register& rd, const Register& rn);
+
+  // Reverse bytes.
+  void rev(const Register& rd, const Register& rn);
+
+  // Count leading zeroes.
+  void clz(const Register& rd, const Register& rn);
+
+  // Count leading sign bits.
+  void cls(const Register& rd, const Register& rn);
+
+  // Memory instructions.
+  // Load integer or FP register.
+  void ldr(const CPURegister& rt, const MemOperand& src,
+           LoadStoreScalingOption option = PreferScaledOffset);
+
+  // Store integer or FP register.
+  void str(const CPURegister& rt, const MemOperand& dst,
+           LoadStoreScalingOption option = PreferScaledOffset);
+
+  // Load word with sign extension.
+  void ldrsw(const Register& rt, const MemOperand& src,
+             LoadStoreScalingOption option = PreferScaledOffset);
+
+  // Load byte.
+  void ldrb(const Register& rt, const MemOperand& src,
+            LoadStoreScalingOption option = PreferScaledOffset);
+
+  // Store byte.
+  void strb(const Register& rt, const MemOperand& dst,
+            LoadStoreScalingOption option = PreferScaledOffset);
+
+  // Load byte with sign extension.
+  void ldrsb(const Register& rt, const MemOperand& src,
+             LoadStoreScalingOption option = PreferScaledOffset);
+
+  // Load half-word.
+  void ldrh(const Register& rt, const MemOperand& src,
+            LoadStoreScalingOption option = PreferScaledOffset);
+
+  // Store half-word.
+  void strh(const Register& rt, const MemOperand& dst,
+            LoadStoreScalingOption option = PreferScaledOffset);
+
+  // Load half-word with sign extension.
+  void ldrsh(const Register& rt, const MemOperand& src,
+             LoadStoreScalingOption option = PreferScaledOffset);
+
+  // Load integer or FP register (with unscaled offset).
+  void ldur(const CPURegister& rt, const MemOperand& src,
+            LoadStoreScalingOption option = PreferUnscaledOffset);
+
+  // Store integer or FP register (with unscaled offset).
+  void stur(const CPURegister& rt, const MemOperand& src,
+            LoadStoreScalingOption option = PreferUnscaledOffset);
+
+  // Load word with sign extension.
+  void ldursw(const Register& rt, const MemOperand& src,
+              LoadStoreScalingOption option = PreferUnscaledOffset);
+
+  // Load byte (with unscaled offset).
+  void ldurb(const Register& rt, const MemOperand& src,
+             LoadStoreScalingOption option = PreferUnscaledOffset);
+
+  // Store byte (with unscaled offset).
+  void sturb(const Register& rt, const MemOperand& dst,
+             LoadStoreScalingOption option = PreferUnscaledOffset);
+
+  // Load byte with sign extension (and unscaled offset).
+  void ldursb(const Register& rt, const MemOperand& src,
+              LoadStoreScalingOption option = PreferUnscaledOffset);
+
+  // Load half-word (with unscaled offset).
+  void ldurh(const Register& rt, const MemOperand& src,
+             LoadStoreScalingOption option = PreferUnscaledOffset);
+
+  // Store half-word (with unscaled offset).
+  void sturh(const Register& rt, const MemOperand& dst,
+             LoadStoreScalingOption option = PreferUnscaledOffset);
+
+  // Load half-word with sign extension (and unscaled offset).
+  void ldursh(const Register& rt, const MemOperand& src,
+              LoadStoreScalingOption option = PreferUnscaledOffset);
+
+  // Load integer or FP register pair.
+  void ldp(const CPURegister& rt, const CPURegister& rt2, const MemOperand& src);
+
+  // Store integer or FP register pair.
+  void stp(const CPURegister& rt, const CPURegister& rt2, const MemOperand& dst);
+
+  // Load word pair with sign extension.
+  void ldpsw(const Register& rt, const Register& rt2, const MemOperand& src);
+
+  // Load integer or FP register pair, non-temporal.
+  void ldnp(const CPURegister& rt, const CPURegister& rt2, const MemOperand& src);
+
+  // Store integer or FP register pair, non-temporal.
+  void stnp(const CPURegister& rt, const CPURegister& rt2, const MemOperand& dst);
+
+  // Load integer or FP register from pc + imm19 << 2.
+  void ldr(const CPURegister& rt, int imm19);
+  static void ldr(Instruction* at, const CPURegister& rt, int imm19);
+
+  // Load word with sign extension from pc + imm19 << 2.
+  void ldrsw(const Register& rt, int imm19);
+
+  // Store exclusive byte.
+  void stxrb(const Register& rs, const Register& rt, const MemOperand& dst);
+
+  // Store exclusive half-word.
+  void stxrh(const Register& rs, const Register& rt, const MemOperand& dst);
+
+  // Store exclusive register.
+  void stxr(const Register& rs, const Register& rt, const MemOperand& dst);
+
+  // Load exclusive byte.
+  void ldxrb(const Register& rt, const MemOperand& src);
+
+  // Load exclusive half-word.
+  void ldxrh(const Register& rt, const MemOperand& src);
+
+  // Load exclusive register.
+  void ldxr(const Register& rt, const MemOperand& src);
+
+  // Store exclusive register pair.
+  void stxp(const Register& rs, const Register& rt,
+            const Register& rt2, const MemOperand& dst);
+
+  // Load exclusive register pair.
+  void ldxp(const Register& rt, const Register& rt2, const MemOperand& src);
+
+  // Store-release exclusive byte.
+  void stlxrb(const Register& rs, const Register& rt, const MemOperand& dst);
+
+  // Store-release exclusive half-word.
+  void stlxrh(const Register& rs, const Register& rt, const MemOperand& dst);
+
+  // Store-release exclusive register.
+  void stlxr(const Register& rs, const Register& rt, const MemOperand& dst);
+
+  // Load-acquire exclusive byte.
+  void ldaxrb(const Register& rt, const MemOperand& src);
+
+  // Load-acquire exclusive half-word.
+  void ldaxrh(const Register& rt, const MemOperand& src);
+
+  // Load-acquire exclusive register.
+  void ldaxr(const Register& rt, const MemOperand& src);
+
+  // Store-release exclusive register pair.
+  void stlxp(const Register& rs, const Register& rt,
+             const Register& rt2, const MemOperand& dst);
+
+  // Load-acquire exclusive register pair.
+  void ldaxp(const Register& rt, const Register& rt2, const MemOperand& src);
+
+  // Store-release byte.
+  void stlrb(const Register& rt, const MemOperand& dst);
+
+  // Store-release half-word.
+  void stlrh(const Register& rt, const MemOperand& dst);
+
+  // Store-release register.
+  void stlr(const Register& rt, const MemOperand& dst);
+
+  // Load-acquire byte.
+  void ldarb(const Register& rt, const MemOperand& src);
+
+  // Load-acquire half-word.
+  void ldarh(const Register& rt, const MemOperand& src);
+
+  // Load-acquire register.
+  void ldar(const Register& rt, const MemOperand& src);
+
+  // Move instructions. The default shift of -1 indicates that the move
+  // instruction will calculate an appropriate 16-bit immediate and left shift
+  // that is equal to the 64-bit immediate argument. If an explicit left shift
+  // is specified (0, 16, 32 or 48), the immediate must be a 16-bit value.
+  //
+  // For movk, an explicit shift can be used to indicate which half word should
+  // be overwritten, eg. movk(x0, 0, 0) will overwrite the least-significant
+  // half word with zero, whereas movk(x0, 0, 48) will overwrite the
+  // most-significant.
+
+  // Move immediate and keep.
+  void movk(const Register& rd, uint64_t imm, int shift = -1) {
+    MoveWide(rd, imm, shift, MOVK);
+  }
+
+  // Move inverted immediate.
+  void movn(const Register& rd, uint64_t imm, int shift = -1) {
+    MoveWide(rd, imm, shift, MOVN);
+  }
+
+  // Move immediate.
+  void movz(const Register& rd, uint64_t imm, int shift = -1) {
+    MoveWide(rd, imm, shift, MOVZ);
+  }
+
+  // Misc instructions.
+  // Monitor debug-mode breakpoint.
+  void brk(int code);
+
+  // System exception. Used for simulator directives.
+  void svc(int code);
+  static void svc(Instruction* at, int code);
+
+  // Halting debug-mode breakpoint.
+  void hlt(int code);
+
+  // Move register to register.
+  void mov(const Register& rd, const Register& rn);
+
+  // Move inverted operand to register.
+  void mvn(const Register& rd, const Operand& operand);
+
+  // System instructions.
+  // Move to register from system register.
+  void mrs(const Register& rt, SystemRegister sysreg);
+
+  // Move from register to system register.
+  void msr(SystemRegister sysreg, const Register& rt);
+
+  // System hint.
+  BufferOffset hint(SystemHint code);
+  static void hint(Instruction* at, SystemHint code);
+  // Clear exclusive monitor.
+  void clrex(int imm4 = 0xf);
+
+  // Data memory barrier.
+  void dmb(BarrierDomain domain, BarrierType type);
+
+  // Data synchronization barrier.
+  void dsb(BarrierDomain domain, BarrierType type);
+
+  // Instruction synchronization barrier.
+  void isb();
+
+  // Alias for system instructions.
+  // No-op.
+  BufferOffset nop() {
+    return hint(NOP);
+  }
+  static void nop(Instruction* at);
+  // FP instructions.
+  // Move double precision immediate to FP register.
+  void fmov(const FPRegister& fd, double imm);
+
+  // Move single precision immediate to FP register.
+  void fmov(const FPRegister& fd, float imm);
+
+  // Move FP register to register.
+  void fmov(const Register& rd, const FPRegister& fn);
+
+  // Move register to FP register.
+  void fmov(const FPRegister& fd, const Register& rn);
+
+  // Move FP register to FP register.
+  void fmov(const FPRegister& fd, const FPRegister& fn);
+
+  // FP add.
+  void fadd(const FPRegister& fd, const FPRegister& fn, const FPRegister& fm);
+
+  // FP subtract.
+  void fsub(const FPRegister& fd, const FPRegister& fn, const FPRegister& fm);
+
+  // FP multiply.
+  void fmul(const FPRegister& fd, const FPRegister& fn, const FPRegister& fm);
+
+  // FP fused multiply and add.
+  void fmadd(const FPRegister& fd, const FPRegister& fn,
+             const FPRegister& fm, const FPRegister& fa);
+
+  // FP fused multiply and subtract.
+  void fmsub(const FPRegister& fd, const FPRegister& fn,
+             const FPRegister& fm, const FPRegister& fa);
+
+  // FP fused multiply, add and negate.
+  void fnmadd(const FPRegister& fd, const FPRegister& fn,
+              const FPRegister& fm, const FPRegister& fa);
+
+  // FP fused multiply, subtract and negate.
+  void fnmsub(const FPRegister& fd, const FPRegister& fn,
+              const FPRegister& fm, const FPRegister& fa);
+
+  // FP divide.
+  void fdiv(const FPRegister& fd, const FPRegister& fn, const FPRegister& fm);
+
+  // FP maximum.
+  void fmax(const FPRegister& fd, const FPRegister& fn, const FPRegister& fm);
+
+  // FP minimum.
+  void fmin(const FPRegister& fd, const FPRegister& fn, const FPRegister& fm);
+
+  // FP maximum number.
+  void fmaxnm(const FPRegister& fd, const FPRegister& fn, const FPRegister& fm);
+
+  // FP minimum number.
+  void fminnm(const FPRegister& fd, const FPRegister& fn, const FPRegister& fm);
+
+  // FP absolute.
+  void fabs(const FPRegister& fd, const FPRegister& fn);
+
+  // FP negate.
+  void fneg(const FPRegister& fd, const FPRegister& fn);
+
+  // FP square root.
+  void fsqrt(const FPRegister& fd, const FPRegister& fn);
+
+  // FP round to integer (nearest with ties to away).
+  void frinta(const FPRegister& fd, const FPRegister& fn);
+
+  // FP round to integer (toward minus infinity).
+  void frintm(const FPRegister& fd, const FPRegister& fn);
+
+  // FP round to integer (nearest with ties to even).
+  void frintn(const FPRegister& fd, const FPRegister& fn);
+
+  // FP round to integer (towards zero).
+  void frintz(const FPRegister& fd, const FPRegister& fn);
+
+  // FP compare registers.
+  void fcmp(const FPRegister& fn, const FPRegister& fm);
+
+  // FP compare immediate.
+  void fcmp(const FPRegister& fn, double value);
+
+  // FP conditional compare.
+  void fccmp(const FPRegister& fn, const FPRegister& fm, StatusFlags nzcv, Condition cond);
+
+  // FP conditional select.
+  void fcsel(const FPRegister& fd, const FPRegister& fn,
+             const FPRegister& fm, Condition cond);
+
+  // Common FP Convert function.
+  void FPConvertToInt(const Register& rd, const FPRegister& fn, FPIntegerConvertOp op);
+
+  // FP convert between single and double precision.
+  void fcvt(const FPRegister& fd, const FPRegister& fn);
+
+  // Convert FP to signed integer (nearest with ties to away).
+  void fcvtas(const Register& rd, const FPRegister& fn);
+
+  // Convert FP to unsigned integer (nearest with ties to away).
+  void fcvtau(const Register& rd, const FPRegister& fn);
+
+  // Convert FP to signed integer (round towards -infinity).
+  void fcvtms(const Register& rd, const FPRegister& fn);
+
+  // Convert FP to unsigned integer (round towards -infinity).
+  void fcvtmu(const Register& rd, const FPRegister& fn);
+
+  // Convert FP to signed integer (round towards infinity).
+  void fcvtps(const Register& rd, const FPRegister& fn);
+
+  // Convert FP to unsigned integer (round towards infinity).
+  void fcvtpu(const Register& rd, const FPRegister& fn);
+
+  // Convert FP to signed integer (nearest with ties to even).
+  void fcvtns(const Register& rd, const FPRegister& fn);
+
+  // Convert FP to unsigned integer (nearest with ties to even).
+  void fcvtnu(const Register& rd, const FPRegister& fn);
+
+  // Convert FP to signed integer (round towards zero).
+  void fcvtzs(const Register& rd, const FPRegister& fn);
+
+  // Convert FP to unsigned integer (round towards zero).
+  void fcvtzu(const Register& rd, const FPRegister& fn);
+
+  // Convert signed integer or fixed point to FP.
+  void scvtf(const FPRegister& fd, const Register& rn, unsigned fbits = 0);
+
+  // Convert unsigned integer or fixed point to FP.
+  void ucvtf(const FPRegister& fd, const Register& rn, unsigned fbits = 0);
+
+  // Emit generic instructions.
+  // Emit raw instructions into the instruction stream.
+  inline void dci(Instr raw_inst) {
+    Emit(raw_inst);
+  }
+
+  // Emit 32 bits of data into the instruction stream.
+  inline void dc32(uint32_t data) {
+    EmitData(&data, sizeof(data));
+  }
+
+  // Emit 64 bits of data into the instruction stream.
+  inline void dc64(uint64_t data) {
+    EmitData(&data, sizeof(data));
+  }
+
+  // Copy a string into the instruction stream, including the terminating NULL
+  // character. The instruction pointer (pc_) is then aligned correctly for
+  // subsequent instructions.
+  void EmitStringData(const char * string) {
+    VIXL_ASSERT(string != NULL);
+
+    size_t len = strlen(string) + 1;
+    EmitData(string, len);
+
+    // Pad with NULL characters until pc_ is aligned.
+    const char pad[] = {'\0', '\0', '\0', '\0'};
+    JS_STATIC_ASSERT(sizeof(pad) == kInstructionSize);
+    Instruction* next_pc = AlignUp(pc_, kInstructionSize);
+    EmitData(&pad, next_pc - pc_);
+  }
+
+  // Code generation helpers.
+
+  // Register encoding.
+  static Instr Rd(CPURegister rd) {
+    VIXL_ASSERT(rd.code() != kSPRegInternalCode);
+    return rd.code() << Rd_offset;
+  }
+
+  static Instr Rn(CPURegister rn) {
+    VIXL_ASSERT(rn.code() != kSPRegInternalCode);
+    return rn.code() << Rn_offset;
+  }
+
+  static Instr Rm(CPURegister rm) {
+    VIXL_ASSERT(rm.code() != kSPRegInternalCode);
+    return rm.code() << Rm_offset;
+  }
+
+  static Instr Ra(CPURegister ra) {
+    VIXL_ASSERT(ra.code() != kSPRegInternalCode);
+    return ra.code() << Ra_offset;
+  }
+
+  static Instr Rt(CPURegister rt) {
+    VIXL_ASSERT(rt.code() != kSPRegInternalCode);
+    return rt.code() << Rt_offset;
+  }
+
+  static Instr Rt2(CPURegister rt2) {
+    VIXL_ASSERT(rt2.code() != kSPRegInternalCode);
+    return rt2.code() << Rt2_offset;
+  }
+
+  static Instr Rs(CPURegister rs) {
+    VIXL_ASSERT(rs.code() != kSPRegInternalCode);
+    return rs.code() << Rs_offset;
+  }
+
+  // These encoding functions allow the stack pointer to be encoded, and
+  // disallow the zero register.
+  static Instr RdSP(Register rd) {
+    VIXL_ASSERT(!rd.IsZero());
+    return (rd.code() & kRegCodeMask) << Rd_offset;
+  }
+
+  static Instr RnSP(Register rn) {
+    VIXL_ASSERT(!rn.IsZero());
+    return (rn.code() & kRegCodeMask) << Rn_offset;
+  }
+
+  // Flags encoding.
+  static Instr Flags(FlagsUpdate S) {
+    if (S == SetFlags)
+      return 1 << FlagsUpdate_offset;
+
+    if (S == LeaveFlags)
+      return 0 << FlagsUpdate_offset;
+
+    VIXL_UNREACHABLE();
+    return 0;
+  }
+
+  static Instr Cond(Condition cond) {
+    return cond << Condition_offset;
+  }
+
+  // PC-relative address encoding.
+  static Instr ImmPCRelAddress(int imm21) {
+    VIXL_ASSERT(is_int21(imm21));
+    Instr imm = static_cast<Instr>(truncate_to_int21(imm21));
+    Instr immhi = (imm >> ImmPCRelLo_width) << ImmPCRelHi_offset;
+    Instr immlo = imm << ImmPCRelLo_offset;
+    return (immhi & ImmPCRelHi_mask) | (immlo & ImmPCRelLo_mask);
+  }
+
+  // Branch encoding.
+  static Instr ImmUncondBranch(int imm26) {
+    VIXL_ASSERT(is_int26(imm26));
+    return truncate_to_int26(imm26) << ImmUncondBranch_offset;
+  }
+
+  static Instr ImmCondBranch(int imm19) {
+    VIXL_ASSERT(is_int19(imm19));
+    return truncate_to_int19(imm19) << ImmCondBranch_offset;
+  }
+
+  static Instr ImmCmpBranch(int imm19) {
+    VIXL_ASSERT(is_int19(imm19));
+    return truncate_to_int19(imm19) << ImmCmpBranch_offset;
+  }
+
+  static Instr ImmTestBranch(int imm14) {
+    VIXL_ASSERT(is_int14(imm14));
+    return truncate_to_int14(imm14) << ImmTestBranch_offset;
+  }
+
+  static Instr ImmTestBranchBit(unsigned bit_pos) {
+    VIXL_ASSERT(is_uint6(bit_pos));
+    // Subtract five from the shift offset, as we need bit 5 from bit_pos.
+    unsigned b5 = bit_pos << (ImmTestBranchBit5_offset - 5);
+    unsigned b40 = bit_pos << ImmTestBranchBit40_offset;
+    b5 &= ImmTestBranchBit5_mask;
+    b40 &= ImmTestBranchBit40_mask;
+    return b5 | b40;
+  }
+
+  // Data Processing encoding.
+  static Instr SF(Register rd) {
+    return rd.Is64Bits() ? SixtyFourBits : ThirtyTwoBits;
+  }
+
+  static Instr ImmAddSub(int64_t imm) {
+    VIXL_ASSERT(IsImmAddSub(imm));
+    if (is_uint12(imm)) // No shift required.
+      return imm << ImmAddSub_offset;
+    return ((imm >> 12) << ImmAddSub_offset) | (1 << ShiftAddSub_offset);
+  }
+
+  static inline Instr ImmS(unsigned imms, unsigned reg_size) {
+    VIXL_ASSERT(((reg_size == kXRegSize) && is_uint6(imms)) ||
+               ((reg_size == kWRegSize) && is_uint5(imms)));
+    USE(reg_size);
+    return imms << ImmS_offset;
+  }
+
+  static inline Instr ImmR(unsigned immr, unsigned reg_size) {
+    VIXL_ASSERT(((reg_size == kXRegSize) && is_uint6(immr)) ||
+               ((reg_size == kWRegSize) && is_uint5(immr)));
+    USE(reg_size);
+    VIXL_ASSERT(is_uint6(immr));
+    return immr << ImmR_offset;
+  }
+
+  static inline Instr ImmSetBits(unsigned imms, unsigned reg_size) {
+    VIXL_ASSERT((reg_size == kWRegSize) || (reg_size == kXRegSize));
+    VIXL_ASSERT(is_uint6(imms));
+    VIXL_ASSERT((reg_size == kXRegSize) || is_uint6(imms + 3));
+    USE(reg_size);
+    return imms << ImmSetBits_offset;
+  }
+
+  static inline Instr ImmRotate(unsigned immr, unsigned reg_size) {
+    VIXL_ASSERT((reg_size == kWRegSize) || (reg_size == kXRegSize));
+    VIXL_ASSERT(((reg_size == kXRegSize) && is_uint6(immr)) ||
+               ((reg_size == kWRegSize) && is_uint5(immr)));
+    USE(reg_size);
+    return immr << ImmRotate_offset;
+  }
+
+  static inline Instr ImmLLiteral(int imm19) {
+    VIXL_ASSERT(is_int19(imm19));
+    return truncate_to_int19(imm19) << ImmLLiteral_offset;
+  }
+
+  static inline Instr BitN(unsigned bitn, unsigned reg_size) {
+    VIXL_ASSERT((reg_size == kWRegSize) || (reg_size == kXRegSize));
+    VIXL_ASSERT((reg_size == kXRegSize) || (bitn == 0));
+    USE(reg_size);
+    return bitn << BitN_offset;
+  }
+
+  static Instr ShiftDP(Shift shift) {
+    VIXL_ASSERT(shift == LSL || shift == LSR || shift == ASR || shift == ROR);
+    return shift << ShiftDP_offset;
+  }
+
+  static Instr ImmDPShift(unsigned amount) {
+    VIXL_ASSERT(is_uint6(amount));
+    return amount << ImmDPShift_offset;
+  }
+
+  static Instr ExtendMode(Extend extend) {
+    return extend << ExtendMode_offset;
+  }
+
+  static Instr ImmExtendShift(unsigned left_shift) {
+    VIXL_ASSERT(left_shift <= 4);
+    return left_shift << ImmExtendShift_offset;
+  }
+
+  static Instr ImmCondCmp(unsigned imm) {
+    VIXL_ASSERT(is_uint5(imm));
+    return imm << ImmCondCmp_offset;
+  }
+
+  static Instr Nzcv(StatusFlags nzcv) {
+    return ((nzcv >> Flags_offset) & 0xf) << Nzcv_offset;
+  }
+
+  // MemOperand offset encoding.
+  static Instr ImmLSUnsigned(int imm12) {
+    VIXL_ASSERT(is_uint12(imm12));
+    return imm12 << ImmLSUnsigned_offset;
+  }
+
+  static Instr ImmLS(int imm9) {
+    VIXL_ASSERT(is_int9(imm9));
+    return truncate_to_int9(imm9) << ImmLS_offset;
+  }
+
+  static Instr ImmLSPair(int imm7, LSDataSize size) {
+    VIXL_ASSERT(((imm7 >> size) << size) == imm7);
+    int scaled_imm7 = imm7 >> size;
+    VIXL_ASSERT(is_int7(scaled_imm7));
+    return truncate_to_int7(scaled_imm7) << ImmLSPair_offset;
+  }
+
+  static Instr ImmShiftLS(unsigned shift_amount) {
+    VIXL_ASSERT(is_uint1(shift_amount));
+    return shift_amount << ImmShiftLS_offset;
+  }
+
+  static Instr ImmException(int imm16) {
+    VIXL_ASSERT(is_uint16(imm16));
+    return imm16 << ImmException_offset;
+  }
+
+  static Instr ImmSystemRegister(int imm15) {
+    VIXL_ASSERT(is_uint15(imm15));
+    return imm15 << ImmSystemRegister_offset;
+  }
+
+  static Instr ImmHint(int imm7) {
+    VIXL_ASSERT(is_uint7(imm7));
+    return imm7 << ImmHint_offset;
+  }
+
+  static Instr CRm(int imm4) {
+    VIXL_ASSERT(is_uint4(imm4));
+    return imm4 << CRm_offset;
+  }
+
+  static Instr ImmBarrierDomain(int imm2) {
+    VIXL_ASSERT(is_uint2(imm2));
+    return imm2 << ImmBarrierDomain_offset;
+  }
+
+  static Instr ImmBarrierType(int imm2) {
+    VIXL_ASSERT(is_uint2(imm2));
+    return imm2 << ImmBarrierType_offset;
+  }
+
+  static LSDataSize CalcLSDataSize(LoadStoreOp op) {
+    VIXL_ASSERT((SizeLS_offset + SizeLS_width) == (kInstructionSize * 8));
+    return static_cast<LSDataSize>(op >> SizeLS_offset);
+  }
+
+  // Move immediates encoding.
+  static Instr ImmMoveWide(uint64_t imm) {
+    VIXL_ASSERT(is_uint16(imm));
+    return imm << ImmMoveWide_offset;
+  }
+
+  static Instr ShiftMoveWide(int64_t shift) {
+    VIXL_ASSERT(is_uint2(shift));
+    return shift << ShiftMoveWide_offset;
+  }
+
+  // FP Immediates.
+  static Instr ImmFP32(float imm);
+  static Instr ImmFP64(double imm);
+
+  // FP register type.
+  static Instr FPType(FPRegister fd) {
+    return fd.Is64Bits() ? FP64 : FP32;
+  }
+
+  static Instr FPScale(unsigned scale) {
+    VIXL_ASSERT(is_uint6(scale));
+    return scale << FPScale_offset;
+  }
+
+  size_t size() const {
+    return SizeOfCodeGenerated();
+  }
+
+  // Size of the code generated in bytes, including pools.
+  size_t SizeOfCodeGenerated() const {
+    return armbuffer_.size();
+  }
+
+  inline PositionIndependentCodeOption pic() {
+    return pic_;
+  }
+
+  inline bool AllowPageOffsetDependentCode() {
+    return (pic() == PageOffsetDependentCode) ||
+           (pic() == PositionDependentCode);
+  }
+
+ protected:
+  inline const Register& AppropriateZeroRegFor(const CPURegister& reg) const {
+    return reg.Is64Bits() ? xzr : wzr;
+  }
+
+  BufferOffset LoadStore(const CPURegister& rt, const MemOperand& addr, LoadStoreOp op,
+                         LoadStoreScalingOption option = PreferScaledOffset);
+
+  static bool IsImmLSUnscaled(ptrdiff_t offset);
+  static bool IsImmLSScaled(ptrdiff_t offset, LSDataSize size);
+
+  BufferOffset Logical(const Register& rd, const Register& rn,
+                       const Operand& operand, LogicalOp op);
+  BufferOffset LogicalImmediate(const Register& rd, const Register& rn, unsigned n,
+                                unsigned imm_s, unsigned imm_r, LogicalOp op);
+  static bool IsImmLogical(uint64_t value, unsigned width, unsigned* n = nullptr,
+                           unsigned* imm_s = nullptr, unsigned* imm_r = nullptr);
+
+  void ConditionalCompare(const Register& rn, const Operand& operand, StatusFlags nzcv,
+                          Condition cond, ConditionalCompareOp op);
+  static bool IsImmConditionalCompare(int64_t immediate);
+
+  void AddSubWithCarry(const Register& rd, const Register& rn, const Operand& operand,
+                       FlagsUpdate S, AddSubWithCarryOp op);
+
+  static bool IsImmFP32(float imm);
+  static bool IsImmFP64(double imm);
+
+  // Functions for emulating operands not directly supported by the instruction
+  // set.
+  void EmitShift(const Register& rd, const Register& rn, Shift shift, unsigned amount);
+  void EmitExtendShift(const Register& rd, const Register& rn,
+                       Extend extend, unsigned left_shift);
+
+  void AddSub(const Register& rd, const Register& rn, const Operand& operand,
+              FlagsUpdate S, AddSubOp op);
+  static bool IsImmAddSub(int64_t immediate);
+
+  // Find an appropriate LoadStoreOp or LoadStorePairOp for the specified
+  // registers. Only simple loads are supported; sign- and zero-extension (such
+  // as in LDPSW_x or LDRB_w) are not supported.
+  static LoadStoreOp LoadOpFor(const CPURegister& rt);
+  static LoadStorePairOp LoadPairOpFor(const CPURegister& rt, const CPURegister& rt2);
+  static LoadStoreOp StoreOpFor(const CPURegister& rt);
+  static LoadStorePairOp StorePairOpFor(const CPURegister& rt, const CPURegister& rt2);
+
+  static LoadStorePairNonTemporalOp LoadPairNonTemporalOpFor(
+    const CPURegister& rt, const CPURegister& rt2);
+
+  static LoadStorePairNonTemporalOp StorePairNonTemporalOpFor(
+    const CPURegister& rt, const CPURegister& rt2);
+
+  static LoadLiteralOp LoadLiteralOpFor(const CPURegister& rt);
+
+
+ private:
+  // Instruction helpers.
+  void MoveWide(const Register& rd, uint64_t imm, int shift, MoveWideImmediateOp mov_op);
+  BufferOffset DataProcShiftedRegister(const Register& rd, const Register& rn,
+                                       const Operand& operand, FlagsUpdate S, Instr op);
+  void DataProcExtendedRegister(const Register& rd, const Register& rn,
+                                const Operand& operand, FlagsUpdate S, Instr op);
+  void LoadStorePair(const CPURegister& rt, const CPURegister& rt2,
+                     const MemOperand& addr, LoadStorePairOp op);
+  void LoadStorePairNonTemporal(const CPURegister& rt, const CPURegister& rt2,
+                                const MemOperand& addr, LoadStorePairNonTemporalOp op);
+  void LoadLiteral(const CPURegister& rt, uint64_t imm, LoadLiteralOp op);
+  void LoadPCLiteral(const CPURegister& rt, ptrdiff_t PCInsOffset, LoadLiteralOp op);
+  void ConditionalSelect(const Register& rd, const Register& rn,
+                         const Register& rm, Condition cond, ConditionalSelectOp op);
+  void DataProcessing1Source(const Register& rd, const Register& rn,
+                             DataProcessing1SourceOp op);
+  void DataProcessing3Source(const Register& rd, const Register& rn,
+                             const Register& rm, const Register& ra,
+                             DataProcessing3SourceOp op);
+  void FPDataProcessing1Source(const FPRegister& fd, const FPRegister& fn,
+                               FPDataProcessing1SourceOp op);
+  void FPDataProcessing2Source(const FPRegister& fd, const FPRegister& fn,
+                               const FPRegister& fm, FPDataProcessing2SourceOp op);
+  void FPDataProcessing3Source(const FPRegister& fd, const FPRegister& fn,
+                               const FPRegister& fm, const FPRegister& fa,
+                               FPDataProcessing3SourceOp op);
+
+  void RecordLiteral(int64_t imm, unsigned size);
+
+  // Link the current (not-yet-emitted) instruction to the specified label, then
+  // return an offset to be encoded in the instruction. If the label is not yet
+  // bound, an offset of LabelBase::INVALID_OFFSET is returned.
+  ptrdiff_t LinkAndGetByteOffsetTo(BufferOffset branch, Label* label);
+  ptrdiff_t LinkAndGetInstructionOffsetTo(BufferOffset branch, Label* label);
+  ptrdiff_t LinkAndGetPageOffsetTo(BufferOffset branch, Label* label);
+
+  // A common implementation for the LinkAndGet<Type>OffsetTo helpers.
+  template <int element_size>
+  ptrdiff_t LinkAndGetOffsetTo(BufferOffset branch, Label* label);
+
+ private:
+  inline void CheckBufferSpace() {
+    VIXL_ASSERT(!armbuffer_.oom());
+  }
+
+ protected:
+  // Prevent generation of a literal pool for the next |maxInst| instructions.
+  // Guarantees instruction linearity.
+  class AutoBlockLiteralPool {
+    ARMBuffer* armbuffer_;
+
+   public:
+    AutoBlockLiteralPool(Assembler* assembler, size_t maxInst)
+      : armbuffer_(&assembler->armbuffer_) {
+      armbuffer_->enterNoPool(maxInst);
+    }
+    ~AutoBlockLiteralPool() {
+      armbuffer_->leaveNoPool();
+    }
+  };
+
+ protected:
+  PositionIndependentCodeOption pic_;
+
+  // Pointer of current instruction (into the ARMBuffer).
+  Instruction* pc_;
+
+#ifdef DEBUG
+  bool finalized_;
+#endif
+};
+
+} // namespace vixl
+
+#endif  // VIXL_A64_ASSEMBLER_A64_H_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Constants-vixl.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Constants-vixl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Constants-vixl.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Constants-vixl.h	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,1244 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#ifndef VIXL_A64_CONSTANTS_A64_H_
+#define VIXL_A64_CONSTANTS_A64_H_
+
+#include <stdint.h>
+
+#include "jit/arm64/vixl/Globals-vixl.h"
+
+namespace vixl {
+
+const unsigned kNumberOfRegisters = 32;
+const unsigned kNumberOfFPRegisters = 32;
+
+// Supervisor Call (svc) specific support.
+//
+// The SVC instruction encodes an optional 16-bit immediate value.
+// The simulator understands the codes below.
+enum SVCSimulatorCodes {
+  kCallRtRedirected = 0x10,  // Transition to x86_64 C code.
+  kMarkStackPointer = 0x11,  // Push the current SP on a special Simulator stack.
+  kCheckStackPointer = 0x12  // Pop from the special Simulator stack and compare to SP.
+};
+
+#define REGISTER_CODE_LIST(R)                                                  \
+R(0)  R(1)  R(2)  R(3)  R(4)  R(5)  R(6)  R(7)                                 \
+R(8)  R(9)  R(10) R(11) R(12) R(13) R(14) R(15)                                \
+R(16) R(17) R(18) R(19) R(20) R(21) R(22) R(23)                                \
+R(24) R(25) R(26) R(27) R(28) R(29) R(30) R(31)
+
+#define INSTRUCTION_FIELDS_LIST(V_)                                            \
+/* Register fields */                                                          \
+V_(Rd, 4, 0, Bits)                        /* Destination register.        */   \
+V_(Rn, 9, 5, Bits)                        /* First source register.       */   \
+V_(Rm, 20, 16, Bits)                      /* Second source register.      */   \
+V_(Ra, 14, 10, Bits)                      /* Third source register.       */   \
+V_(Rt, 4, 0, Bits)                        /* Load/store register.         */   \
+V_(Rt2, 14, 10, Bits)                     /* Load/store second register.  */   \
+V_(Rs, 20, 16, Bits)                      /* Exclusive access status.     */   \
+                                                                               \
+/* Common bits */                                                              \
+V_(SixtyFourBits, 31, 31, Bits)                                                \
+V_(FlagsUpdate, 29, 29, Bits)                                                  \
+                                                                               \
+/* PC relative addressing */                                                   \
+V_(ImmPCRelHi, 23, 5, SignedBits)                                              \
+V_(ImmPCRelLo, 30, 29, Bits)                                                   \
+                                                                               \
+/* Add/subtract/logical shift register */                                      \
+V_(ShiftDP, 23, 22, Bits)                                                      \
+V_(ImmDPShift, 15, 10, Bits)                                                   \
+                                                                               \
+/* Add/subtract immediate */                                                   \
+V_(ImmAddSub, 21, 10, Bits)                                                    \
+V_(ShiftAddSub, 23, 22, Bits)                                                  \
+                                                                               \
+/* Add/substract extend */                                                     \
+V_(ImmExtendShift, 12, 10, Bits)                                               \
+V_(ExtendMode, 15, 13, Bits)                                                   \
+                                                                               \
+/* Move wide */                                                                \
+V_(ImmMoveWide, 20, 5, Bits)                                                   \
+V_(ShiftMoveWide, 22, 21, Bits)                                                \
+                                                                               \
+/* Logical immediate, bitfield and extract */                                  \
+V_(BitN, 22, 22, Bits)                                                         \
+V_(ImmRotate, 21, 16, Bits)                                                    \
+V_(ImmSetBits, 15, 10, Bits)                                                   \
+V_(ImmR, 21, 16, Bits)                                                         \
+V_(ImmS, 15, 10, Bits)                                                         \
+                                                                               \
+/* Test and branch immediate */                                                \
+V_(ImmTestBranch, 18, 5, SignedBits)                                           \
+V_(ImmTestBranchBit40, 23, 19, Bits)                                           \
+V_(ImmTestBranchBit5, 31, 31, Bits)                                            \
+                                                                               \
+/* Conditionals */                                                             \
+V_(Condition, 15, 12, Bits)                                                    \
+V_(ConditionBranch, 3, 0, Bits)                                                \
+V_(Nzcv, 3, 0, Bits)                                                           \
+V_(ImmCondCmp, 20, 16, Bits)                                                   \
+V_(ImmCondBranch, 23, 5, SignedBits)                                           \
+                                                                               \
+/* Floating point */                                                           \
+V_(FPType, 23, 22, Bits)                                                       \
+V_(ImmFP, 20, 13, Bits)                                                        \
+V_(FPScale, 15, 10, Bits)                                                      \
+                                                                               \
+/* Load Store */                                                               \
+V_(ImmLS, 20, 12, SignedBits)                                                  \
+V_(ImmLSUnsigned, 21, 10, Bits)                                                \
+V_(ImmLSPair, 21, 15, SignedBits)                                              \
+V_(SizeLS, 31, 30, Bits)                                                       \
+V_(ImmShiftLS, 12, 12, Bits)                                                   \
+V_(ImmPrefetchOperation, 4, 0, Bits)                                           \
+V_(PrefetchHint, 4, 3, Bits)                                                   \
+V_(PrefetchTarget, 2, 1, Bits)                                                 \
+V_(PrefetchStream, 0, 0, Bits)                                                 \
+                                                                               \
+/* Other immediates */                                                         \
+V_(ImmUncondBranch, 25, 0, SignedBits)                                         \
+V_(ImmCmpBranch, 23, 5, SignedBits)                                            \
+V_(ImmLLiteral, 23, 5, SignedBits)                                             \
+V_(ImmException, 20, 5, Bits)                                                  \
+V_(ImmHint, 11, 5, Bits)                                                       \
+V_(ImmBarrierDomain, 11, 10, Bits)                                             \
+V_(ImmBarrierType, 9, 8, Bits)                                                 \
+                                                                               \
+/* System (MRS, MSR) */                                                        \
+V_(ImmSystemRegister, 19, 5, Bits)                                             \
+V_(SysO0, 19, 19, Bits)                                                        \
+V_(SysOp1, 18, 16, Bits)                                                       \
+V_(SysOp2, 7, 5, Bits)                                                         \
+V_(CRn, 15, 12, Bits)                                                          \
+V_(CRm, 11, 8, Bits)                                                           \
+                                                                               \
+/* Load-/store-exclusive */                                                    \
+V_(LdStXLoad, 22, 22, Bits)                                                    \
+V_(LdStXNotExclusive, 23, 23, Bits)                                            \
+V_(LdStXAcquireRelease, 15, 15, Bits)                                          \
+V_(LdStXSizeLog2, 31, 30, Bits)                                                \
+V_(LdStXPair, 21, 21, Bits)                                                    \
+
+
+#define SYSTEM_REGISTER_FIELDS_LIST(V_, M_)                                    \
+/* NZCV */                                                                     \
+V_(Flags, 31, 28, Bits)                                                        \
+V_(N, 31, 31, Bits)                                                            \
+V_(Z, 30, 30, Bits)                                                            \
+V_(C, 29, 29, Bits)                                                            \
+V_(V, 28, 28, Bits)                                                            \
+M_(NZCV, Flags_mask)                                                           \
+                                                                               \
+/* FPCR */                                                                     \
+V_(AHP, 26, 26, Bits)                                                          \
+V_(DN, 25, 25, Bits)                                                           \
+V_(FZ, 24, 24, Bits)                                                           \
+V_(RMode, 23, 22, Bits)                                                        \
+M_(FPCR, AHP_mask | DN_mask | FZ_mask | RMode_mask)
+
+
+// Fields offsets.
+#define DECLARE_FIELDS_OFFSETS(Name, HighBit, LowBit, X)                       \
+const int Name##_offset = LowBit;                                              \
+const int Name##_width = HighBit - LowBit + 1;                                 \
+const uint32_t Name##_mask = ((1 << Name##_width) - 1) << LowBit;
+#define NOTHING(A, B)
+INSTRUCTION_FIELDS_LIST(DECLARE_FIELDS_OFFSETS)
+SYSTEM_REGISTER_FIELDS_LIST(DECLARE_FIELDS_OFFSETS, NOTHING)
+#undef NOTHING
+#undef DECLARE_FIELDS_BITS
+
+// ImmPCRel is a compound field (not present in INSTRUCTION_FIELDS_LIST), formed
+// from ImmPCRelLo and ImmPCRelHi.
+const int ImmPCRel_mask = ImmPCRelLo_mask | ImmPCRelHi_mask;
+
+// Condition codes.
+enum Condition {
+  eq = 0,
+  ne = 1,
+  hs = 2,
+  lo = 3,
+  mi = 4,
+  pl = 5,
+  vs = 6,
+  vc = 7,
+  hi = 8,
+  ls = 9,
+  ge = 10,
+  lt = 11,
+  gt = 12,
+  le = 13,
+  al = 14,
+  nv = 15,  // Behaves as always/al.
+
+  Equal = 0, Zero = 0,
+  NotEqual = 1, NonZero = 1,
+  AboveOrEqual = 2,
+  Below = 3,
+  Signed = 4,
+  NotSigned = 5,
+  Overflow = 6,
+  NoOverflow = 7,
+  Above = 8,
+  BelowOrEqual = 9,
+  GreaterThanOrEqual_ = 10,
+  LessThan_ = 11,
+  GreaterThan_ = 12,
+  LessThanOrEqual_ = 13,
+  Always = 14,
+  Never = 15
+};
+
+inline Condition InvertCondition(Condition cond) {
+  // Conditions al and nv behave identically, as "always true". They can't be
+  // inverted, because there is no "always false" condition.
+  VIXL_ASSERT((cond != al) && (cond != nv));
+  return static_cast<Condition>(cond ^ 1);
+}
+
+enum FlagsUpdate {
+  SetFlags   = 1,
+  LeaveFlags = 0
+};
+
+enum StatusFlags {
+  NoFlag    = 0,
+
+  // Derive the flag combinations from the system register bit descriptions.
+  NFlag     = N_mask,
+  ZFlag     = Z_mask,
+  CFlag     = C_mask,
+  VFlag     = V_mask,
+  NZFlag    = NFlag | ZFlag,
+  NCFlag    = NFlag | CFlag,
+  NVFlag    = NFlag | VFlag,
+  ZCFlag    = ZFlag | CFlag,
+  ZVFlag    = ZFlag | VFlag,
+  CVFlag    = CFlag | VFlag,
+  NZCFlag   = NFlag | ZFlag | CFlag,
+  NZVFlag   = NFlag | ZFlag | VFlag,
+  NCVFlag   = NFlag | CFlag | VFlag,
+  ZCVFlag   = ZFlag | CFlag | VFlag,
+  NZCVFlag  = NFlag | ZFlag | CFlag | VFlag,
+
+  // Floating-point comparison results.
+  FPEqualFlag       = ZCFlag,
+  FPLessThanFlag    = NFlag,
+  FPGreaterThanFlag = CFlag,
+  FPUnorderedFlag   = CVFlag
+};
+
+enum Shift {
+  NO_SHIFT = -1,
+  LSL = 0x0,
+  LSR = 0x1,
+  ASR = 0x2,
+  ROR = 0x3
+};
+
+enum Extend {
+  NO_EXTEND = -1,
+  UXTB      = 0,
+  UXTH      = 1,
+  UXTW      = 2,
+  UXTX      = 3,
+  SXTB      = 4,
+  SXTH      = 5,
+  SXTW      = 6,
+  SXTX      = 7
+};
+
+enum SystemHint {
+  NOP   = 0,
+  YIELD = 1,
+  WFE   = 2,
+  WFI   = 3,
+  SEV   = 4,
+  SEVL  = 5
+};
+
+enum BarrierDomain {
+  OuterShareable = 0,
+  NonShareable   = 1,
+  InnerShareable = 2,
+  FullSystem     = 3
+};
+
+enum BarrierType {
+  BarrierOther  = 0,
+  BarrierReads  = 1,
+  BarrierWrites = 2,
+  BarrierAll    = 3
+};
+
+enum PrefetchOperation {
+  PLDL1KEEP = 0x00,
+  PLDL1STRM = 0x01,
+  PLDL2KEEP = 0x02,
+  PLDL2STRM = 0x03,
+  PLDL3KEEP = 0x04,
+  PLDL3STRM = 0x05,
+
+  PLIL1KEEP = 0x08,
+  PLIL1STRM = 0x09,
+  PLIL2KEEP = 0x0a,
+  PLIL2STRM = 0x0b,
+  PLIL3KEEP = 0x0c,
+  PLIL3STRM = 0x0d,
+
+  PSTL1KEEP = 0x10,
+  PSTL1STRM = 0x11,
+  PSTL2KEEP = 0x12,
+  PSTL2STRM = 0x13,
+  PSTL3KEEP = 0x14,
+  PSTL3STRM = 0x15
+};
+
+// System/special register names.
+// This information is not encoded as one field but as the concatenation of
+// multiple fields (Op0<0>, Op1, Crn, Crm, Op2).
+enum SystemRegister {
+  NZCV = ((0x1 << SysO0_offset) |
+          (0x3 << SysOp1_offset) |
+          (0x4 << CRn_offset) |
+          (0x2 << CRm_offset) |
+          (0x0 << SysOp2_offset)) >> ImmSystemRegister_offset,
+  FPCR = ((0x1 << SysO0_offset) |
+          (0x3 << SysOp1_offset) |
+          (0x4 << CRn_offset) |
+          (0x4 << CRm_offset) |
+          (0x0 << SysOp2_offset)) >> ImmSystemRegister_offset
+};
+
+// Instruction enumerations.
+//
+// These are the masks that define a class of instructions, and the list of
+// instructions within each class. Each enumeration has a Fixed, FMask and
+// Mask value.
+//
+// Fixed: The fixed bits in this instruction class.
+// FMask: The mask used to extract the fixed bits in the class.
+// Mask:  The mask used to identify the instructions within a class.
+//
+// The enumerations can be used like this:
+//
+// VIXL_ASSERT(instr->Mask(PCRelAddressingFMask) == PCRelAddressingFixed);
+// switch(instr->Mask(PCRelAddressingMask)) {
+//   case ADR:  Format("adr 'Xd, 'AddrPCRelByte"); break;
+//   case ADRP: Format("adrp 'Xd, 'AddrPCRelPage"); break;
+//   default:   printf("Unknown instruction\n");
+// }
+
+
+// Generic fields.
+enum GenericInstrField {
+  SixtyFourBits        = 0x80000000,
+  ThirtyTwoBits        = 0x00000000,
+  FP32                 = 0x00000000,
+  FP64                 = 0x00400000
+};
+
+// PC relative addressing.
+enum PCRelAddressingOp {
+  PCRelAddressingFixed = 0x10000000,
+  PCRelAddressingFMask = 0x1F000000,
+  PCRelAddressingMask  = 0x9F000000,
+  ADR                  = PCRelAddressingFixed | 0x00000000,
+  ADRP                 = PCRelAddressingFixed | 0x80000000
+};
+
+// Add/sub (immediate, shifted and extended.)
+const int kSFOffset = 31;
+enum AddSubOp {
+  AddSubOpMask      = 0x60000000,
+  AddSubSetFlagsBit = 0x20000000,
+  ADD               = 0x00000000,
+  ADDS              = ADD | AddSubSetFlagsBit,
+  SUB               = 0x40000000,
+  SUBS              = SUB | AddSubSetFlagsBit
+};
+
+#define ADD_SUB_OP_LIST(V)  \
+  V(ADD),                   \
+  V(ADDS),                  \
+  V(SUB),                   \
+  V(SUBS)
+
+enum AddSubImmediateOp {
+  AddSubImmediateFixed = 0x11000000,
+  AddSubImmediateFMask = 0x1F000000,
+  AddSubImmediateMask  = 0xFF000000,
+  #define ADD_SUB_IMMEDIATE(A)           \
+  A##_w_imm = AddSubImmediateFixed | A,  \
+  A##_x_imm = AddSubImmediateFixed | A | SixtyFourBits
+  ADD_SUB_OP_LIST(ADD_SUB_IMMEDIATE)
+  #undef ADD_SUB_IMMEDIATE
+};
+
+enum AddSubShiftedOp {
+  AddSubShiftedFixed   = 0x0B000000,
+  AddSubShiftedFMask   = 0x1F200000,
+  AddSubShiftedMask    = 0xFF200000,
+  #define ADD_SUB_SHIFTED(A)             \
+  A##_w_shift = AddSubShiftedFixed | A,  \
+  A##_x_shift = AddSubShiftedFixed | A | SixtyFourBits
+  ADD_SUB_OP_LIST(ADD_SUB_SHIFTED)
+  #undef ADD_SUB_SHIFTED
+};
+
+enum AddSubExtendedOp {
+  AddSubExtendedFixed  = 0x0B200000,
+  AddSubExtendedFMask  = 0x1F200000,
+  AddSubExtendedMask   = 0xFFE00000,
+  #define ADD_SUB_EXTENDED(A)           \
+  A##_w_ext = AddSubExtendedFixed | A,  \
+  A##_x_ext = AddSubExtendedFixed | A | SixtyFourBits
+  ADD_SUB_OP_LIST(ADD_SUB_EXTENDED)
+  #undef ADD_SUB_EXTENDED
+};
+
+// Add/sub with carry.
+enum AddSubWithCarryOp {
+  AddSubWithCarryFixed = 0x1A000000,
+  AddSubWithCarryFMask = 0x1FE00000,
+  AddSubWithCarryMask  = 0xFFE0FC00,
+  ADC_w                = AddSubWithCarryFixed | ADD,
+  ADC_x                = AddSubWithCarryFixed | ADD | SixtyFourBits,
+  ADC                  = ADC_w,
+  ADCS_w               = AddSubWithCarryFixed | ADDS,
+  ADCS_x               = AddSubWithCarryFixed | ADDS | SixtyFourBits,
+  SBC_w                = AddSubWithCarryFixed | SUB,
+  SBC_x                = AddSubWithCarryFixed | SUB | SixtyFourBits,
+  SBC                  = SBC_w,
+  SBCS_w               = AddSubWithCarryFixed | SUBS,
+  SBCS_x               = AddSubWithCarryFixed | SUBS | SixtyFourBits
+};
+
+
+// Logical (immediate and shifted register).
+enum LogicalOp {
+  LogicalOpMask = 0x60200000,
+  NOT   = 0x00200000,
+  AND   = 0x00000000,
+  BIC   = AND | NOT,
+  ORR   = 0x20000000,
+  ORN   = ORR | NOT,
+  EOR   = 0x40000000,
+  EON   = EOR | NOT,
+  ANDS  = 0x60000000,
+  BICS  = ANDS | NOT
+};
+
+// Logical immediate.
+enum LogicalImmediateOp {
+  LogicalImmediateFixed = 0x12000000,
+  LogicalImmediateFMask = 0x1F800000,
+  LogicalImmediateMask  = 0xFF800000,
+  AND_w_imm   = LogicalImmediateFixed | AND,
+  AND_x_imm   = LogicalImmediateFixed | AND | SixtyFourBits,
+  ORR_w_imm   = LogicalImmediateFixed | ORR,
+  ORR_x_imm   = LogicalImmediateFixed | ORR | SixtyFourBits,
+  EOR_w_imm   = LogicalImmediateFixed | EOR,
+  EOR_x_imm   = LogicalImmediateFixed | EOR | SixtyFourBits,
+  ANDS_w_imm  = LogicalImmediateFixed | ANDS,
+  ANDS_x_imm  = LogicalImmediateFixed | ANDS | SixtyFourBits
+};
+
+// Logical shifted register.
+enum LogicalShiftedOp {
+  LogicalShiftedFixed = 0x0A000000,
+  LogicalShiftedFMask = 0x1F000000,
+  LogicalShiftedMask  = 0xFF200000,
+  AND_w               = LogicalShiftedFixed | AND,
+  AND_x               = LogicalShiftedFixed | AND | SixtyFourBits,
+  AND_shift           = AND_w,
+  BIC_w               = LogicalShiftedFixed | BIC,
+  BIC_x               = LogicalShiftedFixed | BIC | SixtyFourBits,
+  BIC_shift           = BIC_w,
+  ORR_w               = LogicalShiftedFixed | ORR,
+  ORR_x               = LogicalShiftedFixed | ORR | SixtyFourBits,
+  ORR_shift           = ORR_w,
+  ORN_w               = LogicalShiftedFixed | ORN,
+  ORN_x               = LogicalShiftedFixed | ORN | SixtyFourBits,
+  ORN_shift           = ORN_w,
+  EOR_w               = LogicalShiftedFixed | EOR,
+  EOR_x               = LogicalShiftedFixed | EOR | SixtyFourBits,
+  EOR_shift           = EOR_w,
+  EON_w               = LogicalShiftedFixed | EON,
+  EON_x               = LogicalShiftedFixed | EON | SixtyFourBits,
+  EON_shift           = EON_w,
+  ANDS_w              = LogicalShiftedFixed | ANDS,
+  ANDS_x              = LogicalShiftedFixed | ANDS | SixtyFourBits,
+  ANDS_shift          = ANDS_w,
+  BICS_w              = LogicalShiftedFixed | BICS,
+  BICS_x              = LogicalShiftedFixed | BICS | SixtyFourBits,
+  BICS_shift          = BICS_w
+};
+
+// Move wide immediate.
+enum MoveWideImmediateOp {
+  MoveWideImmediateFixed = 0x12800000,
+  MoveWideImmediateFMask = 0x1F800000,
+  MoveWideImmediateMask  = 0xFF800000,
+  MOVN                   = 0x00000000,
+  MOVZ                   = 0x40000000,
+  MOVK                   = 0x60000000,
+  MOVN_w                 = MoveWideImmediateFixed | MOVN,
+  MOVN_x                 = MoveWideImmediateFixed | MOVN | SixtyFourBits,
+  MOVZ_w                 = MoveWideImmediateFixed | MOVZ,
+  MOVZ_x                 = MoveWideImmediateFixed | MOVZ | SixtyFourBits,
+  MOVK_w                 = MoveWideImmediateFixed | MOVK,
+  MOVK_x                 = MoveWideImmediateFixed | MOVK | SixtyFourBits
+};
+
+// Bitfield.
+const int kBitfieldNOffset = 22;
+enum BitfieldOp {
+  BitfieldFixed = 0x13000000,
+  BitfieldFMask = 0x1F800000,
+  BitfieldMask  = 0xFF800000,
+  SBFM_w        = BitfieldFixed | 0x00000000,
+  SBFM_x        = BitfieldFixed | 0x80000000,
+  SBFM          = SBFM_w,
+  BFM_w         = BitfieldFixed | 0x20000000,
+  BFM_x         = BitfieldFixed | 0xA0000000,
+  BFM           = BFM_w,
+  UBFM_w        = BitfieldFixed | 0x40000000,
+  UBFM_x        = BitfieldFixed | 0xC0000000,
+  UBFM          = UBFM_w
+  // Bitfield N field.
+};
+
+// Extract.
+enum ExtractOp {
+  ExtractFixed = 0x13800000,
+  ExtractFMask = 0x1F800000,
+  ExtractMask  = 0xFFA00000,
+  EXTR_w       = ExtractFixed | 0x00000000,
+  EXTR_x       = ExtractFixed | 0x80000000,
+  EXTR         = EXTR_w
+};
+
+// Unconditional branch.
+enum UnconditionalBranchOp {
+  UnconditionalBranchFixed = 0x14000000,
+  UnconditionalBranchFMask = 0x7C000000,
+  UnconditionalBranchMask  = 0xFC000000,
+  B                        = UnconditionalBranchFixed | 0x00000000,
+  BL                       = UnconditionalBranchFixed | 0x80000000
+};
+
+// Unconditional branch to register.
+enum UnconditionalBranchToRegisterOp {
+  UnconditionalBranchToRegisterFixed = 0xD6000000,
+  UnconditionalBranchToRegisterFMask = 0xFE000000,
+  UnconditionalBranchToRegisterMask  = 0xFFFFFC1F,
+  BR      = UnconditionalBranchToRegisterFixed | 0x001F0000,
+  BLR     = UnconditionalBranchToRegisterFixed | 0x003F0000,
+  RET     = UnconditionalBranchToRegisterFixed | 0x005F0000
+};
+
+// Compare and branch.
+enum CompareBranchOp {
+  CompareBranchFixed = 0x34000000,
+  CompareBranchFMask = 0x7E000000,
+  CompareBranchMask  = 0xFF000000,
+  CBZ_w              = CompareBranchFixed | 0x00000000,
+  CBZ_x              = CompareBranchFixed | 0x80000000,
+  CBZ                = CBZ_w,
+  CBNZ_w             = CompareBranchFixed | 0x01000000,
+  CBNZ_x             = CompareBranchFixed | 0x81000000,
+  CBNZ               = CBNZ_w
+};
+
+// Test and branch.
+enum TestBranchOp {
+  TestBranchFixed = 0x36000000,
+  TestBranchFMask = 0x7E000000,
+  TestBranchMask  = 0x7F000000,
+  TBZ             = TestBranchFixed | 0x00000000,
+  TBNZ            = TestBranchFixed | 0x01000000
+};
+
+// Conditional branch.
+enum ConditionalBranchOp {
+  ConditionalBranchFixed = 0x54000000,
+  ConditionalBranchFMask = 0xFE000000,
+  ConditionalBranchMask  = 0xFF000010,
+  B_cond                 = ConditionalBranchFixed | 0x00000000
+};
+
+// System.
+// System instruction encoding is complicated because some instructions use op
+// and CR fields to encode parameters. To handle this cleanly, the system
+// instructions are split into more than one enum.
+
+enum SystemOp {
+  SystemFixed = 0xD5000000,
+  SystemFMask = 0xFFC00000
+};
+
+enum SystemSysRegOp {
+  SystemSysRegFixed = 0xD5100000,
+  SystemSysRegFMask = 0xFFD00000,
+  SystemSysRegMask  = 0xFFF00000,
+  MRS               = SystemSysRegFixed | 0x00200000,
+  MSR               = SystemSysRegFixed | 0x00000000
+};
+
+enum SystemHintOp {
+  SystemHintFixed = 0xD503201F,
+  SystemHintFMask = 0xFFFFF01F,
+  SystemHintMask  = 0xFFFFF01F,
+  HINT            = SystemHintFixed | 0x00000000
+};
+
+// Exception.
+enum ExceptionOp {
+  ExceptionFixed = 0xD4000000,
+  ExceptionFMask = 0xFF000000,
+  ExceptionMask  = 0xFFE0001F,
+  HLT            = ExceptionFixed | 0x00400000,
+  BRK            = ExceptionFixed | 0x00200000,
+  SVC            = ExceptionFixed | 0x00000001,
+  HVC            = ExceptionFixed | 0x00000002,
+  SMC            = ExceptionFixed | 0x00000003,
+  DCPS1          = ExceptionFixed | 0x00A00001,
+  DCPS2          = ExceptionFixed | 0x00A00002,
+  DCPS3          = ExceptionFixed | 0x00A00003
+};
+
+enum MemBarrierOp {
+  MemBarrierFixed = 0xD503309F,
+  MemBarrierFMask = 0xFFFFF09F,
+  MemBarrierMask  = 0xFFFFF0FF,
+  DSB             = MemBarrierFixed | 0x00000000,
+  DMB             = MemBarrierFixed | 0x00000020,
+  ISB             = MemBarrierFixed | 0x00000040
+};
+
+enum SystemExclusiveMonitorOp {
+  SystemExclusiveMonitorFixed = 0xD503305F,
+  SystemExclusiveMonitorFMask = 0xFFFFF0FF,
+  SystemExclusiveMonitorMask  = 0xFFFFF0FF,
+  CLREX                       = SystemExclusiveMonitorFixed
+};
+
+// Any load or store.
+enum LoadStoreAnyOp {
+  LoadStoreAnyFMask = 0x0a000000,
+  LoadStoreAnyFixed = 0x08000000
+};
+
+// Any load pair or store pair.
+enum LoadStorePairAnyOp {
+  LoadStorePairAnyFMask = 0x3a000000,
+  LoadStorePairAnyFixed = 0x28000000
+};
+
+#define LOAD_STORE_PAIR_OP_LIST(V)  \
+  V(STP, w,   0x00000000),          \
+  V(LDP, w,   0x00400000),          \
+  V(LDPSW, x, 0x40400000),          \
+  V(STP, x,   0x80000000),          \
+  V(LDP, x,   0x80400000),          \
+  V(STP, s,   0x04000000),          \
+  V(LDP, s,   0x04400000),          \
+  V(STP, d,   0x44000000),          \
+  V(LDP, d,   0x44400000)
+
+// Load/store pair (post, pre and offset.)
+enum LoadStorePairOp {
+  LoadStorePairMask = 0xC4400000,
+  LoadStorePairLBit = 1 << 22,
+  #define LOAD_STORE_PAIR(A, B, C) \
+  A##_##B = C
+  LOAD_STORE_PAIR_OP_LIST(LOAD_STORE_PAIR)
+  #undef LOAD_STORE_PAIR
+};
+
+enum LoadStorePairPostIndexOp {
+  LoadStorePairPostIndexFixed = 0x28800000,
+  LoadStorePairPostIndexFMask = 0x3B800000,
+  LoadStorePairPostIndexMask  = 0xFFC00000,
+  #define LOAD_STORE_PAIR_POST_INDEX(A, B, C)  \
+  A##_##B##_post = LoadStorePairPostIndexFixed | A##_##B
+  LOAD_STORE_PAIR_OP_LIST(LOAD_STORE_PAIR_POST_INDEX)
+  #undef LOAD_STORE_PAIR_POST_INDEX
+};
+
+enum LoadStorePairPreIndexOp {
+  LoadStorePairPreIndexFixed = 0x29800000,
+  LoadStorePairPreIndexFMask = 0x3B800000,
+  LoadStorePairPreIndexMask  = 0xFFC00000,
+  #define LOAD_STORE_PAIR_PRE_INDEX(A, B, C)  \
+  A##_##B##_pre = LoadStorePairPreIndexFixed | A##_##B
+  LOAD_STORE_PAIR_OP_LIST(LOAD_STORE_PAIR_PRE_INDEX)
+  #undef LOAD_STORE_PAIR_PRE_INDEX
+};
+
+enum LoadStorePairOffsetOp {
+  LoadStorePairOffsetFixed = 0x29000000,
+  LoadStorePairOffsetFMask = 0x3B800000,
+  LoadStorePairOffsetMask  = 0xFFC00000,
+  #define LOAD_STORE_PAIR_OFFSET(A, B, C)  \
+  A##_##B##_off = LoadStorePairOffsetFixed | A##_##B
+  LOAD_STORE_PAIR_OP_LIST(LOAD_STORE_PAIR_OFFSET)
+  #undef LOAD_STORE_PAIR_OFFSET
+};
+
+enum LoadStorePairNonTemporalOp {
+  LoadStorePairNonTemporalFixed = 0x28000000,
+  LoadStorePairNonTemporalFMask = 0x3B800000,
+  LoadStorePairNonTemporalMask  = 0xFFC00000,
+  STNP_w = LoadStorePairNonTemporalFixed | STP_w,
+  LDNP_w = LoadStorePairNonTemporalFixed | LDP_w,
+  STNP_x = LoadStorePairNonTemporalFixed | STP_x,
+  LDNP_x = LoadStorePairNonTemporalFixed | LDP_x,
+  STNP_s = LoadStorePairNonTemporalFixed | STP_s,
+  LDNP_s = LoadStorePairNonTemporalFixed | LDP_s,
+  STNP_d = LoadStorePairNonTemporalFixed | STP_d,
+  LDNP_d = LoadStorePairNonTemporalFixed | LDP_d
+};
+
+// Load literal.
+enum LoadLiteralOp {
+  LoadLiteralFixed = 0x18000000,
+  LoadLiteralFMask = 0x3B000000,
+  LoadLiteralMask  = 0xFF000000,
+  LDR_w_lit        = LoadLiteralFixed | 0x00000000,
+  LDR_x_lit        = LoadLiteralFixed | 0x40000000,
+  LDRSW_x_lit      = LoadLiteralFixed | 0x80000000,
+  PRFM_lit         = LoadLiteralFixed | 0xC0000000,
+  LDR_s_lit        = LoadLiteralFixed | 0x04000000,
+  LDR_d_lit        = LoadLiteralFixed | 0x44000000
+};
+
+#define LOAD_STORE_OP_LIST(V)     \
+  V(ST, RB, w,  0x00000000),  \
+  V(ST, RH, w,  0x40000000),  \
+  V(ST, R, w,   0x80000000),  \
+  V(ST, R, x,   0xC0000000),  \
+  V(LD, RB, w,  0x00400000),  \
+  V(LD, RH, w,  0x40400000),  \
+  V(LD, R, w,   0x80400000),  \
+  V(LD, R, x,   0xC0400000),  \
+  V(LD, RSB, x, 0x00800000),  \
+  V(LD, RSH, x, 0x40800000),  \
+  V(LD, RSW, x, 0x80800000),  \
+  V(LD, RSB, w, 0x00C00000),  \
+  V(LD, RSH, w, 0x40C00000),  \
+  V(ST, R, s,   0x84000000),  \
+  V(ST, R, d,   0xC4000000),  \
+  V(LD, R, s,   0x84400000),  \
+  V(LD, R, d,   0xC4400000)
+
+
+// Load/store (post, pre, offset and unsigned.)
+enum LoadStoreOp {
+  LoadStoreOpMask = 0xC4C00000,
+  #define LOAD_STORE(A, B, C, D)  \
+  A##B##_##C = D
+  LOAD_STORE_OP_LIST(LOAD_STORE),
+  #undef LOAD_STORE
+  PRFM = 0xC0800000
+};
+
+// Load/store unscaled offset.
+enum LoadStoreUnscaledOffsetOp {
+  LoadStoreUnscaledOffsetFixed = 0x38000000,
+  LoadStoreUnscaledOffsetFMask = 0x3B200C00,
+  LoadStoreUnscaledOffsetMask  = 0xFFE00C00,
+  PRFUM                        = LoadStoreUnscaledOffsetFixed | PRFM,
+  #define LOAD_STORE_UNSCALED(A, B, C, D)  \
+  A##U##B##_##C = LoadStoreUnscaledOffsetFixed | D
+  LOAD_STORE_OP_LIST(LOAD_STORE_UNSCALED)
+  #undef LOAD_STORE_UNSCALED
+};
+
+// Load/store post index.
+enum LoadStorePostIndex {
+  LoadStorePostIndexFixed = 0x38000400,
+  LoadStorePostIndexFMask = 0x3B200C00,
+  LoadStorePostIndexMask  = 0xFFE00C00,
+  #define LOAD_STORE_POST_INDEX(A, B, C, D)  \
+  A##B##_##C##_post = LoadStorePostIndexFixed | D
+  LOAD_STORE_OP_LIST(LOAD_STORE_POST_INDEX)
+  #undef LOAD_STORE_POST_INDEX
+};
+
+// Load/store pre index.
+enum LoadStorePreIndex {
+  LoadStorePreIndexFixed = 0x38000C00,
+  LoadStorePreIndexFMask = 0x3B200C00,
+  LoadStorePreIndexMask  = 0xFFE00C00,
+  #define LOAD_STORE_PRE_INDEX(A, B, C, D)  \
+  A##B##_##C##_pre = LoadStorePreIndexFixed | D
+  LOAD_STORE_OP_LIST(LOAD_STORE_PRE_INDEX)
+  #undef LOAD_STORE_PRE_INDEX
+};
+
+// Load/store unsigned offset.
+enum LoadStoreUnsignedOffset {
+  LoadStoreUnsignedOffsetFixed = 0x39000000,
+  LoadStoreUnsignedOffsetFMask = 0x3B000000,
+  LoadStoreUnsignedOffsetMask  = 0xFFC00000,
+  PRFM_unsigned                = LoadStoreUnsignedOffsetFixed | PRFM,
+  #define LOAD_STORE_UNSIGNED_OFFSET(A, B, C, D) \
+  A##B##_##C##_unsigned = LoadStoreUnsignedOffsetFixed | D
+  LOAD_STORE_OP_LIST(LOAD_STORE_UNSIGNED_OFFSET)
+  #undef LOAD_STORE_UNSIGNED_OFFSET
+};
+
+// Load/store register offset.
+enum LoadStoreRegisterOffset {
+  LoadStoreRegisterOffsetFixed = 0x38200800,
+  LoadStoreRegisterOffsetFMask = 0x3B200C00,
+  LoadStoreRegisterOffsetMask  = 0xFFE00C00,
+  PRFM_reg                     = LoadStoreRegisterOffsetFixed | PRFM,
+  #define LOAD_STORE_REGISTER_OFFSET(A, B, C, D) \
+  A##B##_##C##_reg = LoadStoreRegisterOffsetFixed | D
+  LOAD_STORE_OP_LIST(LOAD_STORE_REGISTER_OFFSET)
+  #undef LOAD_STORE_REGISTER_OFFSET
+};
+
+enum LoadStoreExclusive {
+  LoadStoreExclusiveFixed = 0x08000000,
+  LoadStoreExclusiveFMask = 0x3F000000,
+  LoadStoreExclusiveMask  = 0xFFE08000,
+  STXRB_w  = LoadStoreExclusiveFixed | 0x00000000,
+  STXRH_w  = LoadStoreExclusiveFixed | 0x40000000,
+  STXR_w   = LoadStoreExclusiveFixed | 0x80000000,
+  STXR_x   = LoadStoreExclusiveFixed | 0xC0000000,
+  LDXRB_w  = LoadStoreExclusiveFixed | 0x00400000,
+  LDXRH_w  = LoadStoreExclusiveFixed | 0x40400000,
+  LDXR_w   = LoadStoreExclusiveFixed | 0x80400000,
+  LDXR_x   = LoadStoreExclusiveFixed | 0xC0400000,
+  STXP_w   = LoadStoreExclusiveFixed | 0x80200000,
+  STXP_x   = LoadStoreExclusiveFixed | 0xC0200000,
+  LDXP_w   = LoadStoreExclusiveFixed | 0x80600000,
+  LDXP_x   = LoadStoreExclusiveFixed | 0xC0600000,
+  STLXRB_w = LoadStoreExclusiveFixed | 0x00008000,
+  STLXRH_w = LoadStoreExclusiveFixed | 0x40008000,
+  STLXR_w  = LoadStoreExclusiveFixed | 0x80008000,
+  STLXR_x  = LoadStoreExclusiveFixed | 0xC0008000,
+  LDAXRB_w = LoadStoreExclusiveFixed | 0x00408000,
+  LDAXRH_w = LoadStoreExclusiveFixed | 0x40408000,
+  LDAXR_w  = LoadStoreExclusiveFixed | 0x80408000,
+  LDAXR_x  = LoadStoreExclusiveFixed | 0xC0408000,
+  STLXP_w  = LoadStoreExclusiveFixed | 0x80208000,
+  STLXP_x  = LoadStoreExclusiveFixed | 0xC0208000,
+  LDAXP_w  = LoadStoreExclusiveFixed | 0x80608000,
+  LDAXP_x  = LoadStoreExclusiveFixed | 0xC0608000,
+  STLRB_w  = LoadStoreExclusiveFixed | 0x00808000,
+  STLRH_w  = LoadStoreExclusiveFixed | 0x40808000,
+  STLR_w   = LoadStoreExclusiveFixed | 0x80808000,
+  STLR_x   = LoadStoreExclusiveFixed | 0xC0808000,
+  LDARB_w  = LoadStoreExclusiveFixed | 0x00C08000,
+  LDARH_w  = LoadStoreExclusiveFixed | 0x40C08000,
+  LDAR_w   = LoadStoreExclusiveFixed | 0x80C08000,
+  LDAR_x   = LoadStoreExclusiveFixed | 0xC0C08000
+};
+
+// Conditional compare.
+enum ConditionalCompareOp {
+  ConditionalCompareMask = 0x60000000,
+  CCMN                   = 0x20000000,
+  CCMP                   = 0x60000000
+};
+
+// Conditional compare register.
+enum ConditionalCompareRegisterOp {
+  ConditionalCompareRegisterFixed = 0x1A400000,
+  ConditionalCompareRegisterFMask = 0x1FE00800,
+  ConditionalCompareRegisterMask  = 0xFFE00C10,
+  CCMN_w = ConditionalCompareRegisterFixed | CCMN,
+  CCMN_x = ConditionalCompareRegisterFixed | SixtyFourBits | CCMN,
+  CCMP_w = ConditionalCompareRegisterFixed | CCMP,
+  CCMP_x = ConditionalCompareRegisterFixed | SixtyFourBits | CCMP
+};
+
+// Conditional compare immediate.
+enum ConditionalCompareImmediateOp {
+  ConditionalCompareImmediateFixed = 0x1A400800,
+  ConditionalCompareImmediateFMask = 0x1FE00800,
+  ConditionalCompareImmediateMask  = 0xFFE00C10,
+  CCMN_w_imm = ConditionalCompareImmediateFixed | CCMN,
+  CCMN_x_imm = ConditionalCompareImmediateFixed | SixtyFourBits | CCMN,
+  CCMP_w_imm = ConditionalCompareImmediateFixed | CCMP,
+  CCMP_x_imm = ConditionalCompareImmediateFixed | SixtyFourBits | CCMP
+};
+
+// Conditional select.
+enum ConditionalSelectOp {
+  ConditionalSelectFixed = 0x1A800000,
+  ConditionalSelectFMask = 0x1FE00000,
+  ConditionalSelectMask  = 0xFFE00C00,
+  CSEL_w                 = ConditionalSelectFixed | 0x00000000,
+  CSEL_x                 = ConditionalSelectFixed | 0x80000000,
+  CSEL                   = CSEL_w,
+  CSINC_w                = ConditionalSelectFixed | 0x00000400,
+  CSINC_x                = ConditionalSelectFixed | 0x80000400,
+  CSINC                  = CSINC_w,
+  CSINV_w                = ConditionalSelectFixed | 0x40000000,
+  CSINV_x                = ConditionalSelectFixed | 0xC0000000,
+  CSINV                  = CSINV_w,
+  CSNEG_w                = ConditionalSelectFixed | 0x40000400,
+  CSNEG_x                = ConditionalSelectFixed | 0xC0000400,
+  CSNEG                  = CSNEG_w
+};
+
+// Data processing 1 source.
+enum DataProcessing1SourceOp {
+  DataProcessing1SourceFixed = 0x5AC00000,
+  DataProcessing1SourceFMask = 0x5FE00000,
+  DataProcessing1SourceMask  = 0xFFFFFC00,
+  RBIT    = DataProcessing1SourceFixed | 0x00000000,
+  RBIT_w  = RBIT,
+  RBIT_x  = RBIT | SixtyFourBits,
+  REV16   = DataProcessing1SourceFixed | 0x00000400,
+  REV16_w = REV16,
+  REV16_x = REV16 | SixtyFourBits,
+  REV     = DataProcessing1SourceFixed | 0x00000800,
+  REV_w   = REV,
+  REV32_x = REV | SixtyFourBits,
+  REV_x   = DataProcessing1SourceFixed | SixtyFourBits | 0x00000C00,
+  CLZ     = DataProcessing1SourceFixed | 0x00001000,
+  CLZ_w   = CLZ,
+  CLZ_x   = CLZ | SixtyFourBits,
+  CLS     = DataProcessing1SourceFixed | 0x00001400,
+  CLS_w   = CLS,
+  CLS_x   = CLS | SixtyFourBits
+};
+
+// Data processing 2 source.
+enum DataProcessing2SourceOp {
+  DataProcessing2SourceFixed = 0x1AC00000,
+  DataProcessing2SourceFMask = 0x5FE00000,
+  DataProcessing2SourceMask  = 0xFFE0FC00,
+  UDIV_w  = DataProcessing2SourceFixed | 0x00000800,
+  UDIV_x  = DataProcessing2SourceFixed | 0x80000800,
+  UDIV    = UDIV_w,
+  SDIV_w  = DataProcessing2SourceFixed | 0x00000C00,
+  SDIV_x  = DataProcessing2SourceFixed | 0x80000C00,
+  SDIV    = SDIV_w,
+  LSLV_w  = DataProcessing2SourceFixed | 0x00002000,
+  LSLV_x  = DataProcessing2SourceFixed | 0x80002000,
+  LSLV    = LSLV_w,
+  LSRV_w  = DataProcessing2SourceFixed | 0x00002400,
+  LSRV_x  = DataProcessing2SourceFixed | 0x80002400,
+  LSRV    = LSRV_w,
+  ASRV_w  = DataProcessing2SourceFixed | 0x00002800,
+  ASRV_x  = DataProcessing2SourceFixed | 0x80002800,
+  ASRV    = ASRV_w,
+  RORV_w  = DataProcessing2SourceFixed | 0x00002C00,
+  RORV_x  = DataProcessing2SourceFixed | 0x80002C00,
+  RORV    = RORV_w,
+  CRC32B  = DataProcessing2SourceFixed | 0x00004000,
+  CRC32H  = DataProcessing2SourceFixed | 0x00004400,
+  CRC32W  = DataProcessing2SourceFixed | 0x00004800,
+  CRC32X  = DataProcessing2SourceFixed | SixtyFourBits | 0x00004C00,
+  CRC32CB = DataProcessing2SourceFixed | 0x00005000,
+  CRC32CH = DataProcessing2SourceFixed | 0x00005400,
+  CRC32CW = DataProcessing2SourceFixed | 0x00005800,
+  CRC32CX = DataProcessing2SourceFixed | SixtyFourBits | 0x00005C00
+};
+
+// Data processing 3 source.
+enum DataProcessing3SourceOp {
+  DataProcessing3SourceFixed = 0x1B000000,
+  DataProcessing3SourceFMask = 0x1F000000,
+  DataProcessing3SourceMask  = 0xFFE08000,
+  MADD_w                     = DataProcessing3SourceFixed | 0x00000000,
+  MADD_x                     = DataProcessing3SourceFixed | 0x80000000,
+  MADD                       = MADD_w,
+  MSUB_w                     = DataProcessing3SourceFixed | 0x00008000,
+  MSUB_x                     = DataProcessing3SourceFixed | 0x80008000,
+  MSUB                       = MSUB_w,
+  SMADDL_x                   = DataProcessing3SourceFixed | 0x80200000,
+  SMSUBL_x                   = DataProcessing3SourceFixed | 0x80208000,
+  SMULH_x                    = DataProcessing3SourceFixed | 0x80400000,
+  UMADDL_x                   = DataProcessing3SourceFixed | 0x80A00000,
+  UMSUBL_x                   = DataProcessing3SourceFixed | 0x80A08000,
+  UMULH_x                    = DataProcessing3SourceFixed | 0x80C00000
+};
+
+// Floating point compare.
+enum FPCompareOp {
+  FPCompareFixed = 0x1E202000,
+  FPCompareFMask = 0x5F203C00,
+  FPCompareMask  = 0xFFE0FC1F,
+  FCMP_s         = FPCompareFixed | 0x00000000,
+  FCMP_d         = FPCompareFixed | FP64 | 0x00000000,
+  FCMP           = FCMP_s,
+  FCMP_s_zero    = FPCompareFixed | 0x00000008,
+  FCMP_d_zero    = FPCompareFixed | FP64 | 0x00000008,
+  FCMP_zero      = FCMP_s_zero,
+  FCMPE_s        = FPCompareFixed | 0x00000010,
+  FCMPE_d        = FPCompareFixed | FP64 | 0x00000010,
+  FCMPE_s_zero   = FPCompareFixed | 0x00000018,
+  FCMPE_d_zero   = FPCompareFixed | FP64 | 0x00000018
+};
+
+// Floating point conditional compare.
+enum FPConditionalCompareOp {
+  FPConditionalCompareFixed = 0x1E200400,
+  FPConditionalCompareFMask = 0x5F200C00,
+  FPConditionalCompareMask  = 0xFFE00C10,
+  FCCMP_s                   = FPConditionalCompareFixed | 0x00000000,
+  FCCMP_d                   = FPConditionalCompareFixed | FP64 | 0x00000000,
+  FCCMP                     = FCCMP_s,
+  FCCMPE_s                  = FPConditionalCompareFixed | 0x00000010,
+  FCCMPE_d                  = FPConditionalCompareFixed | FP64 | 0x00000010,
+  FCCMPE                    = FCCMPE_s
+};
+
+// Floating point conditional select.
+enum FPConditionalSelectOp {
+  FPConditionalSelectFixed = 0x1E200C00,
+  FPConditionalSelectFMask = 0x5F200C00,
+  FPConditionalSelectMask  = 0xFFE00C00,
+  FCSEL_s                  = FPConditionalSelectFixed | 0x00000000,
+  FCSEL_d                  = FPConditionalSelectFixed | FP64 | 0x00000000,
+  FCSEL                    = FCSEL_s
+};
+
+// Floating point immediate.
+enum FPImmediateOp {
+  FPImmediateFixed = 0x1E201000,
+  FPImmediateFMask = 0x5F201C00,
+  FPImmediateMask  = 0xFFE01C00,
+  FMOV_s_imm       = FPImmediateFixed | 0x00000000,
+  FMOV_d_imm       = FPImmediateFixed | FP64 | 0x00000000
+};
+
+// Floating point data processing 1 source.
+enum FPDataProcessing1SourceOp {
+  FPDataProcessing1SourceFixed = 0x1E204000,
+  FPDataProcessing1SourceFMask = 0x5F207C00,
+  FPDataProcessing1SourceMask  = 0xFFFFFC00,
+  FMOV_s   = FPDataProcessing1SourceFixed | 0x00000000,
+  FMOV_d   = FPDataProcessing1SourceFixed | FP64 | 0x00000000,
+  FMOV     = FMOV_s,
+  FABS_s   = FPDataProcessing1SourceFixed | 0x00008000,
+  FABS_d   = FPDataProcessing1SourceFixed | FP64 | 0x00008000,
+  FABS     = FABS_s,
+  FNEG_s   = FPDataProcessing1SourceFixed | 0x00010000,
+  FNEG_d   = FPDataProcessing1SourceFixed | FP64 | 0x00010000,
+  FNEG     = FNEG_s,
+  FSQRT_s  = FPDataProcessing1SourceFixed | 0x00018000,
+  FSQRT_d  = FPDataProcessing1SourceFixed | FP64 | 0x00018000,
+  FSQRT    = FSQRT_s,
+  FCVT_ds  = FPDataProcessing1SourceFixed | 0x00028000,
+  FCVT_sd  = FPDataProcessing1SourceFixed | FP64 | 0x00020000,
+  FRINTN_s = FPDataProcessing1SourceFixed | 0x00040000,
+  FRINTN_d = FPDataProcessing1SourceFixed | FP64 | 0x00040000,
+  FRINTN   = FRINTN_s,
+  FRINTP_s = FPDataProcessing1SourceFixed | 0x00048000,
+  FRINTP_d = FPDataProcessing1SourceFixed | FP64 | 0x00048000,
+  FRINTP   = FRINTP_s,
+  FRINTM_s = FPDataProcessing1SourceFixed | 0x00050000,
+  FRINTM_d = FPDataProcessing1SourceFixed | FP64 | 0x00050000,
+  FRINTM   = FRINTM_s,
+  FRINTZ_s = FPDataProcessing1SourceFixed | 0x00058000,
+  FRINTZ_d = FPDataProcessing1SourceFixed | FP64 | 0x00058000,
+  FRINTZ   = FRINTZ_s,
+  FRINTA_s = FPDataProcessing1SourceFixed | 0x00060000,
+  FRINTA_d = FPDataProcessing1SourceFixed | FP64 | 0x00060000,
+  FRINTA   = FRINTA_s,
+  FRINTX_s = FPDataProcessing1SourceFixed | 0x00070000,
+  FRINTX_d = FPDataProcessing1SourceFixed | FP64 | 0x00070000,
+  FRINTX   = FRINTX_s,
+  FRINTI_s = FPDataProcessing1SourceFixed | 0x00078000,
+  FRINTI_d = FPDataProcessing1SourceFixed | FP64 | 0x00078000,
+  FRINTI   = FRINTI_s
+};
+
+// Floating point data processing 2 source.
+enum FPDataProcessing2SourceOp {
+  FPDataProcessing2SourceFixed = 0x1E200800,
+  FPDataProcessing2SourceFMask = 0x5F200C00,
+  FPDataProcessing2SourceMask  = 0xFFE0FC00,
+  FMUL     = FPDataProcessing2SourceFixed | 0x00000000,
+  FMUL_s   = FMUL,
+  FMUL_d   = FMUL | FP64,
+  FDIV     = FPDataProcessing2SourceFixed | 0x00001000,
+  FDIV_s   = FDIV,
+  FDIV_d   = FDIV | FP64,
+  FADD     = FPDataProcessing2SourceFixed | 0x00002000,
+  FADD_s   = FADD,
+  FADD_d   = FADD | FP64,
+  FSUB     = FPDataProcessing2SourceFixed | 0x00003000,
+  FSUB_s   = FSUB,
+  FSUB_d   = FSUB | FP64,
+  FMAX     = FPDataProcessing2SourceFixed | 0x00004000,
+  FMAX_s   = FMAX,
+  FMAX_d   = FMAX | FP64,
+  FMIN     = FPDataProcessing2SourceFixed | 0x00005000,
+  FMIN_s   = FMIN,
+  FMIN_d   = FMIN | FP64,
+  FMAXNM   = FPDataProcessing2SourceFixed | 0x00006000,
+  FMAXNM_s = FMAXNM,
+  FMAXNM_d = FMAXNM | FP64,
+  FMINNM   = FPDataProcessing2SourceFixed | 0x00007000,
+  FMINNM_s = FMINNM,
+  FMINNM_d = FMINNM | FP64,
+  FNMUL    = FPDataProcessing2SourceFixed | 0x00008000,
+  FNMUL_s  = FNMUL,
+  FNMUL_d  = FNMUL | FP64
+};
+
+// Floating point data processing 3 source.
+enum FPDataProcessing3SourceOp {
+  FPDataProcessing3SourceFixed = 0x1F000000,
+  FPDataProcessing3SourceFMask = 0x5F000000,
+  FPDataProcessing3SourceMask  = 0xFFE08000,
+  FMADD_s                      = FPDataProcessing3SourceFixed | 0x00000000,
+  FMSUB_s                      = FPDataProcessing3SourceFixed | 0x00008000,
+  FNMADD_s                     = FPDataProcessing3SourceFixed | 0x00200000,
+  FNMSUB_s                     = FPDataProcessing3SourceFixed | 0x00208000,
+  FMADD_d                      = FPDataProcessing3SourceFixed | 0x00400000,
+  FMSUB_d                      = FPDataProcessing3SourceFixed | 0x00408000,
+  FNMADD_d                     = FPDataProcessing3SourceFixed | 0x00600000,
+  FNMSUB_d                     = FPDataProcessing3SourceFixed | 0x00608000
+};
+
+// Conversion between floating point and integer.
+enum FPIntegerConvertOp {
+  FPIntegerConvertFixed = 0x1E200000,
+  FPIntegerConvertFMask = 0x5F20FC00,
+  FPIntegerConvertMask  = 0xFFFFFC00,
+  FCVTNS    = FPIntegerConvertFixed | 0x00000000,
+  FCVTNS_ws = FCVTNS,
+  FCVTNS_xs = FCVTNS | SixtyFourBits,
+  FCVTNS_wd = FCVTNS | FP64,
+  FCVTNS_xd = FCVTNS | SixtyFourBits | FP64,
+  FCVTNU    = FPIntegerConvertFixed | 0x00010000,
+  FCVTNU_ws = FCVTNU,
+  FCVTNU_xs = FCVTNU | SixtyFourBits,
+  FCVTNU_wd = FCVTNU | FP64,
+  FCVTNU_xd = FCVTNU | SixtyFourBits | FP64,
+  FCVTPS    = FPIntegerConvertFixed | 0x00080000,
+  FCVTPS_ws = FCVTPS,
+  FCVTPS_xs = FCVTPS | SixtyFourBits,
+  FCVTPS_wd = FCVTPS | FP64,
+  FCVTPS_xd = FCVTPS | SixtyFourBits | FP64,
+  FCVTPU    = FPIntegerConvertFixed | 0x00090000,
+  FCVTPU_ws = FCVTPU,
+  FCVTPU_xs = FCVTPU | SixtyFourBits,
+  FCVTPU_wd = FCVTPU | FP64,
+  FCVTPU_xd = FCVTPU | SixtyFourBits | FP64,
+  FCVTMS    = FPIntegerConvertFixed | 0x00100000,
+  FCVTMS_ws = FCVTMS,
+  FCVTMS_xs = FCVTMS | SixtyFourBits,
+  FCVTMS_wd = FCVTMS | FP64,
+  FCVTMS_xd = FCVTMS | SixtyFourBits | FP64,
+  FCVTMU    = FPIntegerConvertFixed | 0x00110000,
+  FCVTMU_ws = FCVTMU,
+  FCVTMU_xs = FCVTMU | SixtyFourBits,
+  FCVTMU_wd = FCVTMU | FP64,
+  FCVTMU_xd = FCVTMU | SixtyFourBits | FP64,
+  FCVTZS    = FPIntegerConvertFixed | 0x00180000,
+  FCVTZS_ws = FCVTZS,
+  FCVTZS_xs = FCVTZS | SixtyFourBits,
+  FCVTZS_wd = FCVTZS | FP64,
+  FCVTZS_xd = FCVTZS | SixtyFourBits | FP64,
+  FCVTZU    = FPIntegerConvertFixed | 0x00190000,
+  FCVTZU_ws = FCVTZU,
+  FCVTZU_xs = FCVTZU | SixtyFourBits,
+  FCVTZU_wd = FCVTZU | FP64,
+  FCVTZU_xd = FCVTZU | SixtyFourBits | FP64,
+  SCVTF     = FPIntegerConvertFixed | 0x00020000,
+  SCVTF_sw  = SCVTF,
+  SCVTF_sx  = SCVTF | SixtyFourBits,
+  SCVTF_dw  = SCVTF | FP64,
+  SCVTF_dx  = SCVTF | SixtyFourBits | FP64,
+  UCVTF     = FPIntegerConvertFixed | 0x00030000,
+  UCVTF_sw  = UCVTF,
+  UCVTF_sx  = UCVTF | SixtyFourBits,
+  UCVTF_dw  = UCVTF | FP64,
+  UCVTF_dx  = UCVTF | SixtyFourBits | FP64,
+  FCVTAS    = FPIntegerConvertFixed | 0x00040000,
+  FCVTAS_ws = FCVTAS,
+  FCVTAS_xs = FCVTAS | SixtyFourBits,
+  FCVTAS_wd = FCVTAS | FP64,
+  FCVTAS_xd = FCVTAS | SixtyFourBits | FP64,
+  FCVTAU    = FPIntegerConvertFixed | 0x00050000,
+  FCVTAU_ws = FCVTAU,
+  FCVTAU_xs = FCVTAU | SixtyFourBits,
+  FCVTAU_wd = FCVTAU | FP64,
+  FCVTAU_xd = FCVTAU | SixtyFourBits | FP64,
+  FMOV_ws   = FPIntegerConvertFixed | 0x00060000,
+  FMOV_sw   = FPIntegerConvertFixed | 0x00070000,
+  FMOV_xd   = FMOV_ws | SixtyFourBits | FP64,
+  FMOV_dx   = FMOV_sw | SixtyFourBits | FP64
+};
+
+// Conversion between fixed point and floating point.
+enum FPFixedPointConvertOp {
+  FPFixedPointConvertFixed = 0x1E000000,
+  FPFixedPointConvertFMask = 0x5F200000,
+  FPFixedPointConvertMask  = 0xFFFF0000,
+  FCVTZS_fixed    = FPFixedPointConvertFixed | 0x00180000,
+  FCVTZS_ws_fixed = FCVTZS_fixed,
+  FCVTZS_xs_fixed = FCVTZS_fixed | SixtyFourBits,
+  FCVTZS_wd_fixed = FCVTZS_fixed | FP64,
+  FCVTZS_xd_fixed = FCVTZS_fixed | SixtyFourBits | FP64,
+  FCVTZU_fixed    = FPFixedPointConvertFixed | 0x00190000,
+  FCVTZU_ws_fixed = FCVTZU_fixed,
+  FCVTZU_xs_fixed = FCVTZU_fixed | SixtyFourBits,
+  FCVTZU_wd_fixed = FCVTZU_fixed | FP64,
+  FCVTZU_xd_fixed = FCVTZU_fixed | SixtyFourBits | FP64,
+  SCVTF_fixed     = FPFixedPointConvertFixed | 0x00020000,
+  SCVTF_sw_fixed  = SCVTF_fixed,
+  SCVTF_sx_fixed  = SCVTF_fixed | SixtyFourBits,
+  SCVTF_dw_fixed  = SCVTF_fixed | FP64,
+  SCVTF_dx_fixed  = SCVTF_fixed | SixtyFourBits | FP64,
+  UCVTF_fixed     = FPFixedPointConvertFixed | 0x00030000,
+  UCVTF_sw_fixed  = UCVTF_fixed,
+  UCVTF_sx_fixed  = UCVTF_fixed | SixtyFourBits,
+  UCVTF_dw_fixed  = UCVTF_fixed | FP64,
+  UCVTF_dx_fixed  = UCVTF_fixed | SixtyFourBits | FP64
+};
+
+// Unimplemented and unallocated instructions. These are defined to make fixed
+// bit assertion easier.
+enum UnimplementedOp {
+  UnimplementedFixed = 0x00000000,
+  UnimplementedFMask = 0x00000000
+};
+
+enum UnallocatedOp {
+  UnallocatedFixed = 0x00000000,
+  UnallocatedFMask = 0x00000000
+};
+
+}  // namespace vixl
+
+#endif  // VIXL_A64_CONSTANTS_A64_H_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Cpu-vixl.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Cpu-vixl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Cpu-vixl.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Cpu-vixl.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,168 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#include "jit/arm64/vixl/Cpu-vixl.h"
+
+#include "jsutil.h"
+
+#include "jit/arm64/vixl/Utils-vixl.h"
+
+namespace vixl {
+
+// Initialise to smallest possible cache size.
+unsigned CPU::dcache_line_size_ = 1;
+unsigned CPU::icache_line_size_ = 1;
+
+// Currently computes I and D cache line size.
+void
+CPU::SetUp()
+{
+    uint32_t cache_type_register = GetCacheType();
+
+    // The cache type register holds information about the caches, including I
+    // D caches line size.
+    static const int kDCacheLineSizeShift = 16;
+    static const int kICacheLineSizeShift = 0;
+    static const uint32_t kDCacheLineSizeMask = 0xf << kDCacheLineSizeShift;
+    static const uint32_t kICacheLineSizeMask = 0xf << kICacheLineSizeShift;
+
+    // The cache type register holds the size of the I and D caches in words as
+    // a power of two.
+    uint32_t dcache_line_size_power_of_two =
+        (cache_type_register & kDCacheLineSizeMask) >> kDCacheLineSizeShift;
+    uint32_t icache_line_size_power_of_two =
+        (cache_type_register & kICacheLineSizeMask) >> kICacheLineSizeShift;
+
+    dcache_line_size_ = 4 << dcache_line_size_power_of_two;
+    icache_line_size_ = 4 << icache_line_size_power_of_two;
+}
+
+uint32_t
+CPU::GetCacheType()
+{
+#ifdef JS_ARM64_SIMULATOR
+    // This will lead to a cache with 1 byte long lines, which is fine since the
+    // simulator will not need this information.
+    return 0;
+#else
+    uint32_t cache_type_register;
+    // Copy the content of the cache type register to a core register.
+    __asm__ __volatile__ ("mrs %[ctr], ctr_el0"  // NOLINT
+                          : [ctr] "=r" (cache_type_register));
+    return cache_type_register;
+#endif
+}
+
+
+void
+CPU::EnsureIAndDCacheCoherency(void* address, size_t length)
+{
+#ifdef JS_ARM64_SIMULATOR
+    USE(address);
+    USE(length);
+#else
+    if (length == 0)
+        return;
+
+    // The code below assumes user space cache operations are allowed.
+
+    // Work out the line sizes for each cache, and use them to determine the
+    // start addresses.
+    uintptr_t start = reinterpret_cast<uintptr_t>(address);
+    uintptr_t dsize = static_cast<uintptr_t>(dcache_line_size_);
+    uintptr_t isize = static_cast<uintptr_t>(icache_line_size_);
+    uintptr_t dline = start & ~(dsize - 1);
+    uintptr_t iline = start & ~(isize - 1);
+
+    // Cache line sizes are always a power of 2.
+    MOZ_ASSERT(IsPowerOfTwo(dsize));
+    MOZ_ASSERT(IsPowerOfTwo(isize));
+    uintptr_t end = start + length;
+
+    do {
+        __asm__ __volatile__ (
+                // Clean each line of the D cache containing the target data.
+                //
+                // dc       : Data Cache maintenance
+                //     c    : Clean
+                //      va  : by (Virtual) Address
+                //        u : to the point of Unification
+                // The point of unification for a processor is the point by which the
+                // instruction and data caches are guaranteed to see the same copy of a
+                // memory location. See ARM DDI 0406B page B2-12 for more information.
+                "   dc    cvau, %[dline]\n"
+                :
+                : [dline] "r" (dline)
+                // This code does not write to memory, but the "memory" dependency
+                // prevents GCC from reordering the code.
+                : "memory");
+        dline += dsize;
+    } while (dline < end);
+
+    __asm__ __volatile__ (
+        // Make sure that the data cache operations (above) complete before the
+        // instruction cache operations (below).
+        //
+        // dsb      : Data Synchronisation Barrier
+        //      ish : Inner SHareable domain
+        //
+        // The point of unification for an Inner Shareable shareability domain is
+        // the point by which the instruction and data caches of all the processors
+        // in that Inner Shareable shareability domain are guaranteed to see the
+        // same copy of a memory location.  See ARM DDI 0406B page B2-12 for more
+        // information.
+        "   dsb   ish\n"
+        : : : "memory");
+
+    do {
+        __asm__ __volatile__ (
+            // Invalidate each line of the I cache containing the target data.
+            //
+            // ic      : Instruction Cache maintenance
+            //    i    : Invalidate
+            //     va  : by Address
+            //       u : to the point of Unification
+            "   ic   ivau, %[iline]\n"
+            :
+            : [iline] "r" (iline)
+            : "memory");
+        iline += isize;
+    } while (iline < end);
+
+    __asm__ __volatile__ (
+        // Make sure that the instruction cache operations (above) take effect
+        // before the isb (below).
+        "   dsb  ish\n"
+
+        // Ensure that any instructions already in the pipeline are discarded and
+        // reloaded from the new data.
+        // isb : Instruction Synchronisation Barrier
+        "   isb\n"
+        : : : "memory");
+#endif // JS_ARM64_SIMULATOR
+}
+
+} // namespace vixl
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Cpu-vixl.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Cpu-vixl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Cpu-vixl.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Cpu-vixl.h	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,83 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#ifndef VIXL_CPU_A64_H
+#define VIXL_CPU_A64_H
+
+#include "jit/arm64/vixl/Globals-vixl.h"
+#include "jit/arm64/vixl/Instructions-vixl.h"
+
+namespace vixl {
+
+class CPU {
+ public:
+  // Initialise CPU support.
+  static void SetUp();
+
+  // Ensures the data at a given address and with a given size is the same for
+  // the I and D caches. I and D caches are not automatically coherent on ARM
+  // so this operation is required before any dynamically generated code can
+  // safely run.
+  static void EnsureIAndDCacheCoherency(void *address, size_t length);
+
+  // Handle tagged pointers.
+  template <typename T>
+  static T SetPointerTag(T pointer, uint64_t tag) {
+    VIXL_ASSERT(is_uintn(kAddressTagWidth, tag));
+
+    // Use C-style casts to get static_cast behaviour for integral types (T),
+    // and reinterpret_cast behaviour for other types.
+
+    uint64_t raw = (uint64_t)pointer;
+    VIXL_STATIC_ASSERT(sizeof(pointer) == sizeof(raw));
+
+    raw = (raw & ~kAddressTagMask) | (tag << kAddressTagOffset);
+    return (T)raw;
+  }
+
+  template <typename T>
+  static uint64_t GetPointerTag(T pointer) {
+    // Use C-style casts to get static_cast behaviour for integral types (T),
+    // and reinterpret_cast behaviour for other types.
+
+    uint64_t raw = (uint64_t)pointer;
+    VIXL_STATIC_ASSERT(sizeof(pointer) == sizeof(raw));
+
+    return (raw & kAddressTagMask) >> kAddressTagOffset;
+  }
+
+ private:
+  // Return the content of the cache type register.
+  static uint32_t GetCacheType();
+
+  // I and D cache line size in bytes.
+  static unsigned icache_line_size_;
+  static unsigned dcache_line_size_;
+};
+
+}  // namespace vixl
+
+#endif  // VIXL_CPU_A64_H
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Debugger-vixl.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Debugger-vixl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Debugger-vixl.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Debugger-vixl.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,1509 @@
+// Copyright 2013 ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY ARM LIMITED 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 ARM LIMITED 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.
+
+#include "js-config.h"
+
+#ifdef JS_ARM64_SIMULATOR
+
+#include "jit/arm64/vixl/Debugger-vixl.h"
+
+namespace vixl {
+
+// List of commands supported by the debugger.
+#define DEBUG_COMMAND_LIST(C)  \
+C(HelpCommand)                 \
+C(ContinueCommand)             \
+C(StepCommand)                 \
+C(DisasmCommand)               \
+C(PrintCommand)                \
+C(ExamineCommand)
+
+// Debugger command lines are broken up in token of different type to make
+// processing easier later on.
+class Token {
+ public:
+  virtual ~Token() {}
+
+  // Token type.
+  virtual bool IsRegister() const { return false; }
+  virtual bool IsFPRegister() const { return false; }
+  virtual bool IsIdentifier() const { return false; }
+  virtual bool IsAddress() const { return false; }
+  virtual bool IsInteger() const { return false; }
+  virtual bool IsFormat() const { return false; }
+  virtual bool IsUnknown() const { return false; }
+  // Token properties.
+  virtual bool CanAddressMemory() const { return false; }
+  virtual uint8_t* ToAddress(Debugger* debugger) const;
+  virtual void Print(FILE* out = stdout) const = 0;
+
+  static Token* Tokenize(const char* arg);
+};
+
+// Tokens often hold one value.
+template<typename T> class ValueToken : public Token {
+ public:
+  explicit ValueToken(T value) : value_(value) {}
+  ValueToken() {}
+
+  T value() const { return value_; }
+
+ protected:
+  T value_;
+};
+
+// Integer registers (X or W) and their aliases.
+// Format: wn or xn with 0 <= n < 32 or a name in the aliases list.
+class RegisterToken : public ValueToken<const Register> {
+ public:
+  explicit RegisterToken(const Register reg)
+      : ValueToken<const Register>(reg) {}
+
+  virtual bool IsRegister() const { return true; }
+  virtual bool CanAddressMemory() const { return value().Is64Bits(); }
+  virtual uint8_t* ToAddress(Debugger* debugger) const;
+  virtual void Print(FILE* out = stdout) const ;
+  const char* Name() const;
+
+  static Token* Tokenize(const char* arg);
+  static RegisterToken* Cast(Token* tok) {
+    VIXL_ASSERT(tok->IsRegister());
+    return reinterpret_cast<RegisterToken*>(tok);
+  }
+
+ private:
+  static const int kMaxAliasNumber = 4;
+  static const char* kXAliases[kNumberOfRegisters][kMaxAliasNumber];
+  static const char* kWAliases[kNumberOfRegisters][kMaxAliasNumber];
+};
+
+// Floating point registers (D or S).
+// Format: sn or dn with 0 <= n < 32.
+class FPRegisterToken : public ValueToken<const FPRegister> {
+ public:
+  explicit FPRegisterToken(const FPRegister fpreg)
+      : ValueToken<const FPRegister>(fpreg) {}
+
+  virtual bool IsFPRegister() const { return true; }
+  virtual void Print(FILE* out = stdout) const ;
+
+  static Token* Tokenize(const char* arg);
+  static FPRegisterToken* Cast(Token* tok) {
+    VIXL_ASSERT(tok->IsFPRegister());
+    return reinterpret_cast<FPRegisterToken*>(tok);
+  }
+};
+
+
+// Non-register identifiers.
+// Format: Alphanumeric string starting with a letter.
+class IdentifierToken : public ValueToken<char*> {
+ public:
+  explicit IdentifierToken(const char* name) {
+    int size = strlen(name) + 1;
+    value_ = new char[size];
+    strncpy(value_, name, size);
+  }
+  virtual ~IdentifierToken() { delete[] value_; }
+
+  virtual bool IsIdentifier() const { return true; }
+  virtual bool CanAddressMemory() const { return strcmp(value(), "pc") == 0; }
+  virtual uint8_t* ToAddress(Debugger* debugger) const;
+  virtual void Print(FILE* out = stdout) const;
+
+  static Token* Tokenize(const char* arg);
+  static IdentifierToken* Cast(Token* tok) {
+    VIXL_ASSERT(tok->IsIdentifier());
+    return reinterpret_cast<IdentifierToken*>(tok);
+  }
+};
+
+// 64-bit address literal.
+// Format: 0x... with up to 16 hexadecimal digits.
+class AddressToken : public ValueToken<uint8_t*> {
+ public:
+  explicit AddressToken(uint8_t* address) : ValueToken<uint8_t*>(address) {}
+
+  virtual bool IsAddress() const { return true; }
+  virtual bool CanAddressMemory() const { return true; }
+  virtual uint8_t* ToAddress(Debugger* debugger) const;
+  virtual void Print(FILE* out = stdout) const ;
+
+  static Token* Tokenize(const char* arg);
+  static AddressToken* Cast(Token* tok) {
+    VIXL_ASSERT(tok->IsAddress());
+    return reinterpret_cast<AddressToken*>(tok);
+  }
+};
+
+
+// 64-bit decimal integer literal.
+// Format: n.
+class IntegerToken : public ValueToken<int64_t> {
+ public:
+  explicit IntegerToken(int value) : ValueToken<int64_t>(value) {}
+
+  virtual bool IsInteger() const { return true; }
+  virtual void Print(FILE* out = stdout) const;
+
+  static Token* Tokenize(const char* arg);
+  static IntegerToken* Cast(Token* tok) {
+    VIXL_ASSERT(tok->IsInteger());
+    return reinterpret_cast<IntegerToken*>(tok);
+  }
+};
+
+// Literal describing how to print a chunk of data (up to 64 bits).
+// Format: .ln
+// where l (letter) is one of
+//  * x: hexadecimal
+//  * s: signed integer
+//  * u: unsigned integer
+//  * f: floating point
+//  * i: instruction
+// and n (size) is one of 8, 16, 32 and 64. n should be omitted for
+// instructions.
+class FormatToken : public Token {
+ public:
+  FormatToken() {}
+
+  virtual bool IsFormat() const { return true; }
+  virtual int SizeOf() const = 0;
+  virtual char type_code() const = 0;
+  virtual void PrintData(void* data, FILE* out = stdout) const = 0;
+  virtual void Print(FILE* out = stdout) const = 0;
+
+  static Token* Tokenize(const char* arg);
+  static FormatToken* Cast(Token* tok) {
+    VIXL_ASSERT(tok->IsFormat());
+    return reinterpret_cast<FormatToken*>(tok);
+  }
+};
+
+
+template<typename T> class Format : public FormatToken {
+ public:
+  Format(const char* fmt, char type_code) : fmt_(fmt), type_code_(type_code) {}
+
+  virtual int SizeOf() const { return sizeof(T); }
+  virtual char type_code() const { return type_code_; }
+  virtual void PrintData(void* data, FILE* out = stdout) const {
+    T value;
+    memcpy(&value, data, sizeof(value));
+    fprintf(out, fmt_, value);
+  }
+  virtual void Print(FILE* out = stdout) const;
+
+ private:
+  const char* fmt_;
+  char type_code_;
+};
+
+// Tokens which don't fit any of the above.
+class UnknownToken : public Token {
+ public:
+  explicit UnknownToken(const char* arg) {
+    int size = strlen(arg) + 1;
+    unknown_ = new char[size];
+    strncpy(unknown_, arg, size);
+  }
+  virtual ~UnknownToken() { delete[] unknown_; }
+
+  virtual bool IsUnknown() const { return true; }
+  virtual void Print(FILE* out = stdout) const;
+
+ private:
+  char* unknown_;
+};
+
+
+// All debugger commands must subclass DebugCommand and implement Run, Print
+// and Build. Commands must also define kHelp and kAliases.
+class DebugCommand {
+ public:
+  explicit DebugCommand(Token* name) : name_(IdentifierToken::Cast(name)) {}
+  DebugCommand() : name_(NULL) {}
+  virtual ~DebugCommand() { delete name_; }
+
+  const char* name() { return name_->value(); }
+  // Run the command on the given debugger. The command returns true if
+  // execution should move to the next instruction.
+  virtual bool Run(Debugger * debugger) = 0;
+  virtual void Print(FILE* out = stdout);
+
+  static bool Match(const char* name, const char** aliases);
+  static DebugCommand* Parse(char* line);
+  static void PrintHelp(const char** aliases,
+                        const char* args,
+                        const char* help);
+
+ private:
+  IdentifierToken* name_;
+};
+
+// For all commands below see their respective kHelp and kAliases in
+// debugger-a64.cc
+class HelpCommand : public DebugCommand {
+ public:
+  explicit HelpCommand(Token* name) : DebugCommand(name) {}
+
+  virtual bool Run(Debugger* debugger);
+
+  static DebugCommand* Build(std::vector<Token*> args);
+
+  static const char* kHelp;
+  static const char* kAliases[];
+  static const char* kArguments;
+};
+
+
+class ContinueCommand : public DebugCommand {
+ public:
+  explicit ContinueCommand(Token* name) : DebugCommand(name) {}
+
+  virtual bool Run(Debugger* debugger);
+
+  static DebugCommand* Build(std::vector<Token*> args);
+
+  static const char* kHelp;
+  static const char* kAliases[];
+  static const char* kArguments;
+};
+
+
+class StepCommand : public DebugCommand {
+ public:
+  StepCommand(Token* name, IntegerToken* count)
+      : DebugCommand(name), count_(count) {}
+  virtual ~StepCommand() { delete count_; }
+
+  int64_t count() { return count_->value(); }
+  virtual bool Run(Debugger* debugger);
+  virtual void Print(FILE* out = stdout);
+
+  static DebugCommand* Build(std::vector<Token*> args);
+
+  static const char* kHelp;
+  static const char* kAliases[];
+  static const char* kArguments;
+
+ private:
+  IntegerToken* count_;
+};
+
+class DisasmCommand : public DebugCommand {
+ public:
+  static DebugCommand* Build(std::vector<Token*> args);
+
+  static const char* kHelp;
+  static const char* kAliases[];
+  static const char* kArguments;
+};
+
+
+class PrintCommand : public DebugCommand {
+ public:
+  PrintCommand(Token* name, Token* target, FormatToken* format)
+      : DebugCommand(name), target_(target), format_(format) {}
+  virtual ~PrintCommand() {
+    delete target_;
+    delete format_;
+  }
+
+  Token* target() { return target_; }
+  FormatToken* format() { return format_; }
+  virtual bool Run(Debugger* debugger);
+  virtual void Print(FILE* out = stdout);
+
+  static DebugCommand* Build(std::vector<Token*> args);
+
+  static const char* kHelp;
+  static const char* kAliases[];
+  static const char* kArguments;
+
+ private:
+  Token* target_;
+  FormatToken* format_;
+};
+
+class ExamineCommand : public DebugCommand {
+ public:
+  ExamineCommand(Token* name,
+                 Token* target,
+                 FormatToken* format,
+                 IntegerToken* count)
+      : DebugCommand(name), target_(target), format_(format), count_(count) {}
+  virtual ~ExamineCommand() {
+    delete target_;
+    delete format_;
+    delete count_;
+  }
+
+  Token* target() { return target_; }
+  FormatToken* format() { return format_; }
+  IntegerToken* count() { return count_; }
+  virtual bool Run(Debugger* debugger);
+  virtual void Print(FILE* out = stdout);
+
+  static DebugCommand* Build(std::vector<Token*> args);
+
+  static const char* kHelp;
+  static const char* kAliases[];
+  static const char* kArguments;
+
+ private:
+  Token* target_;
+  FormatToken* format_;
+  IntegerToken* count_;
+};
+
+// Commands which name does not match any of the known commnand.
+class UnknownCommand : public DebugCommand {
+ public:
+  explicit UnknownCommand(std::vector<Token*> args) : args_(args) {}
+  virtual ~UnknownCommand();
+
+  virtual bool Run(Debugger* debugger);
+
+ private:
+  std::vector<Token*> args_;
+};
+
+// Commands which name match a known command but the syntax is invalid.
+class InvalidCommand : public DebugCommand {
+ public:
+  InvalidCommand(std::vector<Token*> args, int index, const char* cause)
+      : args_(args), index_(index), cause_(cause) {}
+  virtual ~InvalidCommand();
+
+  virtual bool Run(Debugger* debugger);
+
+ private:
+  std::vector<Token*> args_;
+  int index_;
+  const char* cause_;
+};
+
+const char* HelpCommand::kAliases[] = { "help", NULL };
+const char* HelpCommand::kArguments = NULL;
+const char* HelpCommand::kHelp = "  Print this help.";
+
+const char* ContinueCommand::kAliases[] = { "continue", "c", NULL };
+const char* ContinueCommand::kArguments = NULL;
+const char* ContinueCommand::kHelp = "  Resume execution.";
+
+const char* StepCommand::kAliases[] = { "stepi", "si", NULL };
+const char* StepCommand::kArguments = "[n = 1]";
+const char* StepCommand::kHelp = "  Execute n next instruction(s).";
+
+const char* DisasmCommand::kAliases[] = { "disasm", "di", NULL };
+const char* DisasmCommand::kArguments = "[n = 10]";
+const char* DisasmCommand::kHelp =
+  "  Disassemble n instruction(s) at pc.\n"
+  "  This command is equivalent to x pc.i [n = 10]."
+;
+
+const char* PrintCommand::kAliases[] = { "print", "p", NULL };
+const char* PrintCommand::kArguments =  "<entity>[.format]";
+const char* PrintCommand::kHelp =
+  "  Print the given entity according to the given format.\n"
+  "  The format parameter only affects individual registers; it is ignored\n"
+  "  for other entities.\n"
+  "  <entity> can be one of the following:\n"
+  "   * A register name (such as x0, s1, ...).\n"
+  "   * 'regs', to print all integer (W and X) registers.\n"
+  "   * 'fpregs' to print all floating-point (S and D) registers.\n"
+  "   * 'sysregs' to print all system registers (including NZCV).\n"
+  "   * 'pc' to print the current program counter.\n"
+;
+
+const char* ExamineCommand::kAliases[] = { "m", "mem", "x", NULL };
+const char* ExamineCommand::kArguments = "<addr>[.format] [n = 10]";
+const char* ExamineCommand::kHelp =
+  "  Examine memory. Print n items of memory at address <addr> according to\n"
+  "  the given [.format].\n"
+  "  Addr can be an immediate address, a register name or pc.\n"
+  "  Format is made of a type letter: 'x' (hexadecimal), 's' (signed), 'u'\n"
+  "  (unsigned), 'f' (floating point), i (instruction) and a size in bits\n"
+  "  when appropriate (8, 16, 32, 64)\n"
+  "  E.g 'x sp.x64' will print 10 64-bit words from the stack in\n"
+  "  hexadecimal format."
+;
+
+const char* RegisterToken::kXAliases[kNumberOfRegisters][kMaxAliasNumber] = {
+  { "x0", NULL },
+  { "x1", NULL },
+  { "x2", NULL },
+  { "x3", NULL },
+  { "x4", NULL },
+  { "x5", NULL },
+  { "x6", NULL },
+  { "x7", NULL },
+  { "x8", NULL },
+  { "x9", NULL },
+  { "x10", NULL },
+  { "x11", NULL },
+  { "x12", NULL },
+  { "x13", NULL },
+  { "x14", NULL },
+  { "x15", NULL },
+  { "ip0", "x16", NULL },
+  { "ip1", "x17", NULL },
+  { "x18", "pr", NULL },
+  { "x19", NULL },
+  { "x20", NULL },
+  { "x21", NULL },
+  { "x22", NULL },
+  { "x23", NULL },
+  { "x24", NULL },
+  { "x25", NULL },
+  { "x26", NULL },
+  { "x27", NULL },
+  { "x28", NULL },
+  { "fp", "x29", NULL },
+  { "lr", "x30", NULL },
+  { "sp", NULL}
+};
+
+const char* RegisterToken::kWAliases[kNumberOfRegisters][kMaxAliasNumber] = {
+  { "w0", NULL },
+  { "w1", NULL },
+  { "w2", NULL },
+  { "w3", NULL },
+  { "w4", NULL },
+  { "w5", NULL },
+  { "w6", NULL },
+  { "w7", NULL },
+  { "w8", NULL },
+  { "w9", NULL },
+  { "w10", NULL },
+  { "w11", NULL },
+  { "w12", NULL },
+  { "w13", NULL },
+  { "w14", NULL },
+  { "w15", NULL },
+  { "w16", NULL },
+  { "w17", NULL },
+  { "w18", NULL },
+  { "w19", NULL },
+  { "w20", NULL },
+  { "w21", NULL },
+  { "w22", NULL },
+  { "w23", NULL },
+  { "w24", NULL },
+  { "w25", NULL },
+  { "w26", NULL },
+  { "w27", NULL },
+  { "w28", NULL },
+  { "w29", NULL },
+  { "w30", NULL },
+  { "wsp", NULL }
+};
+
+
+Debugger::Debugger(Decoder* decoder, FILE* stream)
+    : Simulator(decoder, stream),
+      debug_parameters_(DBG_INACTIVE),
+      pending_request_(false),
+      steps_(0),
+      last_command_(NULL) {
+  disasm_ = new PrintDisassembler(stdout);
+  printer_ = new Decoder();
+  printer_->AppendVisitor(disasm_);
+}
+
+
+void Debugger::Run() {
+  pc_modified_ = false;
+  while (pc_ != kEndOfSimAddress) {
+    if (pending_request()) RunDebuggerShell();
+    ExecuteInstruction();
+  }
+}
+
+
+void Debugger::PrintInstructions(const void* address, int64_t count) {
+  if (count == 0) {
+    return;
+  }
+
+  const Instruction* from = Instruction::CastConst(address);
+  if (count < 0) {
+    count = -count;
+    from -= (count - 1) * kInstructionSize;
+  }
+  const Instruction* to = from + count * kInstructionSize;
+
+  for (const Instruction* current = from;
+       current < to;
+       current = current->NextInstruction()) {
+    printer_->Decode(current);
+  }
+}
+
+
+void Debugger::PrintMemory(const uint8_t* address,
+                           const FormatToken* format,
+                           int64_t count) {
+  if (count == 0) {
+    return;
+  }
+
+  const uint8_t* from = address;
+  int size = format->SizeOf();
+  if (count < 0) {
+    count = -count;
+    from -= (count - 1) * size;
+  }
+  const uint8_t* to = from + count * size;
+
+  for (const uint8_t* current = from; current < to; current += size) {
+    if (((current - from) % 8) == 0) {
+      printf("\n%p: ", current);
+    }
+
+    uint64_t data = MemoryRead<uint64_t>(current);
+    format->PrintData(&data);
+    printf(" ");
+  }
+  printf("\n\n");
+}
+
+
+void Debugger::PrintRegister(const Register& target_reg,
+                             const char* name,
+                             const FormatToken* format) {
+  const uint64_t reg_size = target_reg.size();
+  const uint64_t format_size = format->SizeOf() * 8;
+  const uint64_t count = reg_size / format_size;
+  const uint64_t mask = 0xffffffffffffffff >> (64 - format_size);
+  const uint64_t reg_value = reg<uint64_t>(target_reg.code(),
+                                           Reg31IsStackPointer);
+  VIXL_ASSERT(count > 0);
+
+  printf("%s = ", name);
+  for (uint64_t i = 1; i <= count; i++) {
+    uint64_t data = reg_value >> (reg_size - (i * format_size));
+    data &= mask;
+    format->PrintData(&data);
+    printf(" ");
+  }
+  printf("\n");
+}
+
+
+void Debugger::PrintFPRegister(const FPRegister& target_fpreg,
+                               const FormatToken* format) {
+  const uint64_t fpreg_size = target_fpreg.size();
+  const uint64_t format_size = format->SizeOf() * 8;
+  const uint64_t count = fpreg_size / format_size;
+  const uint64_t mask = 0xffffffffffffffff >> (64 - format_size);
+  const uint64_t fpreg_value = fpreg<uint64_t>(fpreg_size,
+                                               target_fpreg.code());
+  VIXL_ASSERT(count > 0);
+
+  if (target_fpreg.Is32Bits()) {
+    printf("s%u = ", target_fpreg.code());
+  } else {
+    printf("d%u = ", target_fpreg.code());
+  }
+  for (uint64_t i = 1; i <= count; i++) {
+    uint64_t data = fpreg_value >> (fpreg_size - (i * format_size));
+    data &= mask;
+    format->PrintData(&data);
+    printf(" ");
+  }
+  printf("\n");
+}
+
+
+void Debugger::VisitException(const Instruction* instr) {
+  switch (instr->Mask(ExceptionMask)) {
+    case BRK:
+      DoBreakpoint(instr);
+      return;
+    case HLT:   // Fall through.
+    default: Simulator::VisitException(instr);
+  }
+}
+
+
+// Read a command. A command will be at most kMaxDebugShellLine char long and
+// ends with '\n\0'.
+// TODO: Should this be a utility function?
+char* Debugger::ReadCommandLine(const char* prompt, char* buffer, int length) {
+  int fgets_calls = 0;
+  char* end = NULL;
+
+  printf("%s", prompt);
+  fflush(stdout);
+
+  do {
+    if (fgets(buffer, length, stdin) == NULL) {
+      printf(" ** Error while reading command. **\n");
+      return NULL;
+    }
+
+    fgets_calls++;
+    end = strchr(buffer, '\n');
+  } while (end == NULL);
+
+  if (fgets_calls != 1) {
+    printf(" ** Command too long. **\n");
+    return NULL;
+  }
+
+  // Remove the newline from the end of the command.
+  VIXL_ASSERT(end[1] == '\0');
+  VIXL_ASSERT((end - buffer) < (length - 1));
+  end[0] = '\0';
+
+  return buffer;
+}
+
+
+void Debugger::RunDebuggerShell() {
+  if (IsDebuggerRunning()) {
+    if (steps_ > 0) {
+      // Finish stepping first.
+      --steps_;
+      return;
+    }
+
+    printf("Next: ");
+    PrintInstructions(pc());
+    bool done = false;
+    while (!done) {
+      char buffer[kMaxDebugShellLine];
+      char* line = ReadCommandLine("vixl> ", buffer, kMaxDebugShellLine);
+
+      if (line == NULL) continue;  // An error occurred.
+
+      DebugCommand* command = DebugCommand::Parse(line);
+      if (command != NULL) {
+        last_command_ = command;
+      }
+
+      if (last_command_ != NULL) {
+        done = last_command_->Run(this);
+      } else {
+        printf("No previous command to run!\n");
+      }
+    }
+
+    if ((debug_parameters_ & DBG_BREAK) != 0) {
+      // The break request has now been handled, move to next instruction.
+      debug_parameters_ &= ~DBG_BREAK;
+      increment_pc();
+    }
+  }
+}
+
+
+void Debugger::DoBreakpoint(const Instruction* instr) {
+  VIXL_ASSERT(instr->Mask(ExceptionMask) == BRK);
+
+  printf("Hit breakpoint at pc=%p.\n", reinterpret_cast<const void*>(instr));
+  set_debug_parameters(debug_parameters() | DBG_BREAK | DBG_ACTIVE);
+  // Make the shell point to the brk instruction.
+  set_pc(instr);
+}
+
+
+static bool StringToUInt64(uint64_t* value, const char* line, int base = 10) {
+  char* endptr = NULL;
+  errno = 0;  // Reset errors.
+  uint64_t parsed = strtoul(line, &endptr, base);
+
+  if (errno == ERANGE) {
+    // Overflow.
+    return false;
+  }
+
+  if (endptr == line) {
+    // No digits were parsed.
+    return false;
+  }
+
+  if (*endptr != '\0') {
+    // Non-digit characters present at the end.
+    return false;
+  }
+
+  *value = parsed;
+  return true;
+}
+
+
+static bool StringToInt64(int64_t* value, const char* line, int base = 10) {
+  char* endptr = NULL;
+  errno = 0;  // Reset errors.
+  int64_t parsed = strtol(line, &endptr, base);
+
+  if (errno == ERANGE) {
+    // Overflow, undeflow.
+    return false;
+  }
+
+  if (endptr == line) {
+    // No digits were parsed.
+    return false;
+  }
+
+  if (*endptr != '\0') {
+    // Non-digit characters present at the end.
+    return false;
+  }
+
+  *value = parsed;
+  return true;
+}
+
+
+uint8_t* Token::ToAddress(Debugger* debugger) const {
+  USE(debugger);
+  VIXL_UNREACHABLE();
+  return NULL;
+}
+
+
+Token* Token::Tokenize(const char* arg) {
+  if ((arg == NULL) || (*arg == '\0')) {
+    return NULL;
+  }
+
+  // The order is important. For example Identifier::Tokenize would consider
+  // any register to be a valid identifier.
+
+  Token* token = RegisterToken::Tokenize(arg);
+  if (token != NULL) {
+    return token;
+  }
+
+  token = FPRegisterToken::Tokenize(arg);
+  if (token != NULL) {
+    return token;
+  }
+
+  token = IdentifierToken::Tokenize(arg);
+  if (token != NULL) {
+    return token;
+  }
+
+  token = AddressToken::Tokenize(arg);
+  if (token != NULL) {
+    return token;
+  }
+
+  token = IntegerToken::Tokenize(arg);
+  if (token != NULL) {
+    return token;
+  }
+
+  return new UnknownToken(arg);
+}
+
+
+uint8_t* RegisterToken::ToAddress(Debugger* debugger) const {
+  VIXL_ASSERT(CanAddressMemory());
+  uint64_t reg_value = debugger->xreg(value().code(), Reg31IsStackPointer);
+  uint8_t* address = NULL;
+  memcpy(&address, &reg_value, sizeof(address));
+  return address;
+}
+
+
+void RegisterToken::Print(FILE* out) const {
+  VIXL_ASSERT(value().IsValid());
+  fprintf(out, "[Register %s]", Name());
+}
+
+
+const char* RegisterToken::Name() const {
+  if (value().Is32Bits()) {
+    return kWAliases[value().code()][0];
+  } else {
+    return kXAliases[value().code()][0];
+  }
+}
+
+
+Token* RegisterToken::Tokenize(const char* arg) {
+  for (unsigned i = 0; i < kNumberOfRegisters; i++) {
+    // Is it a X register or alias?
+    for (const char** current = kXAliases[i]; *current != NULL; current++) {
+      if (strcmp(arg, *current) == 0) {
+        return new RegisterToken(Register::XRegFromCode(i));
+      }
+    }
+
+    // Is it a W register or alias?
+    for (const char** current = kWAliases[i]; *current != NULL; current++) {
+      if (strcmp(arg, *current) == 0) {
+        return new RegisterToken(Register::WRegFromCode(i));
+      }
+    }
+  }
+
+  return NULL;
+}
+
+
+void FPRegisterToken::Print(FILE* out) const {
+  VIXL_ASSERT(value().IsValid());
+  char prefix = value().Is32Bits() ? 's' : 'd';
+  fprintf(out, "[FPRegister %c%" PRIu32 "]", prefix, value().code());
+}
+
+
+Token* FPRegisterToken::Tokenize(const char* arg) {
+  if (strlen(arg) < 2) {
+    return NULL;
+  }
+
+  switch (*arg) {
+    case 's':
+    case 'd':
+      const char* cursor = arg + 1;
+      uint64_t code = 0;
+      if (!StringToUInt64(&code, cursor)) {
+        return NULL;
+      }
+
+      if (code > kNumberOfFPRegisters) {
+        return NULL;
+      }
+
+      FPRegister fpreg = NoFPReg;
+      switch (*arg) {
+        case 's': fpreg = FPRegister::SRegFromCode(code); break;
+        case 'd': fpreg = FPRegister::DRegFromCode(code); break;
+        default: VIXL_UNREACHABLE();
+      }
+
+      return new FPRegisterToken(fpreg);
+  }
+
+  return NULL;
+}
+
+
+uint8_t* IdentifierToken::ToAddress(Debugger* debugger) const {
+  VIXL_ASSERT(CanAddressMemory());
+  const Instruction* pc_value = debugger->pc();
+  uint8_t* address = NULL;
+  memcpy(&address, &pc_value, sizeof(address));
+  return address;
+}
+
+void IdentifierToken::Print(FILE* out) const {
+  fprintf(out, "[Identifier %s]", value());
+}
+
+
+Token* IdentifierToken::Tokenize(const char* arg) {
+  if (!isalpha(arg[0])) {
+    return NULL;
+  }
+
+  const char* cursor = arg + 1;
+  while ((*cursor != '\0') && isalnum(*cursor)) {
+    ++cursor;
+  }
+
+  if (*cursor == '\0') {
+    return new IdentifierToken(arg);
+  }
+
+  return NULL;
+}
+
+
+uint8_t* AddressToken::ToAddress(Debugger* debugger) const {
+  USE(debugger);
+  return value();
+}
+
+
+void AddressToken::Print(FILE* out) const {
+  fprintf(out, "[Address %p]", value());
+}
+
+
+Token* AddressToken::Tokenize(const char* arg) {
+  if ((strlen(arg) < 3) || (arg[0] != '0') || (arg[1] != 'x')) {
+    return NULL;
+  }
+
+  uint64_t ptr = 0;
+  if (!StringToUInt64(&ptr, arg, 16)) {
+    return NULL;
+  }
+
+  uint8_t* address = reinterpret_cast<uint8_t*>(ptr);
+  return new AddressToken(address);
+}
+
+
+void IntegerToken::Print(FILE* out) const {
+  fprintf(out, "[Integer %" PRId64 "]", value());
+}
+
+
+Token* IntegerToken::Tokenize(const char* arg) {
+  int64_t value = 0;
+  if (!StringToInt64(&value, arg)) {
+    return NULL;
+  }
+
+  return new IntegerToken(value);
+}
+
+
+Token* FormatToken::Tokenize(const char* arg) {
+  int length = strlen(arg);
+  switch (arg[0]) {
+    case 'x':
+    case 's':
+    case 'u':
+    case 'f':
+      if (length == 1) return NULL;
+      break;
+    case 'i':
+      if (length == 1) return new Format<uint32_t>("%08" PRIx32, 'i');
+    default: return NULL;
+  }
+
+  char* endptr = NULL;
+  errno = 0;  // Reset errors.
+  uint64_t count = strtoul(arg + 1, &endptr, 10);
+
+  if (errno != 0) {
+    // Overflow, etc.
+    return NULL;
+  }
+
+  if (endptr == arg) {
+    // No digits were parsed.
+    return NULL;
+  }
+
+  if (*endptr != '\0') {
+    // There are unexpected (non-digit) characters after the number.
+    return NULL;
+  }
+
+  switch (arg[0]) {
+    case 'x':
+      switch (count) {
+        case 8: return new Format<uint8_t>("%02" PRIx8, 'x');
+        case 16: return new Format<uint16_t>("%04" PRIx16, 'x');
+        case 32: return new Format<uint32_t>("%08" PRIx32, 'x');
+        case 64: return new Format<uint64_t>("%016" PRIx64, 'x');
+        default: return NULL;
+      }
+    case 's':
+      switch (count) {
+        case 8: return new Format<int8_t>("%4" PRId8, 's');
+        case 16: return new Format<int16_t>("%6" PRId16, 's');
+        case 32: return new Format<int32_t>("%11" PRId32, 's');
+        case 64: return new Format<int64_t>("%20" PRId64, 's');
+        default: return NULL;
+      }
+    case 'u':
+      switch (count) {
+        case 8: return new Format<uint8_t>("%3" PRIu8, 'u');
+        case 16: return new Format<uint16_t>("%5" PRIu16, 'u');
+        case 32: return new Format<uint32_t>("%10" PRIu32, 'u');
+        case 64: return new Format<uint64_t>("%20" PRIu64, 'u');
+        default: return NULL;
+      }
+    case 'f':
+      switch (count) {
+        case 32: return new Format<float>("%13g", 'f');
+        case 64: return new Format<double>("%13g", 'f');
+        default: return NULL;
+      }
+    default:
+      VIXL_UNREACHABLE();
+      return NULL;
+  }
+}
+
+
+template<typename T>
+void Format<T>::Print(FILE* out) const {
+  unsigned size = sizeof(T) * 8;
+  fprintf(out, "[Format %c%u - %s]", type_code_, size, fmt_);
+}
+
+
+void UnknownToken::Print(FILE* out) const {
+  fprintf(out, "[Unknown %s]", unknown_);
+}
+
+
+void DebugCommand::Print(FILE* out) {
+  fprintf(out, "%s", name());
+}
+
+
+bool DebugCommand::Match(const char* name, const char** aliases) {
+  for (const char** current = aliases; *current != NULL; current++) {
+    if (strcmp(name, *current) == 0) {
+       return true;
+    }
+  }
+
+  return false;
+}
+
+
+DebugCommand* DebugCommand::Parse(char* line) {
+  std::vector<Token*> args;
+
+  for (char* chunk = strtok(line, " \t");
+       chunk != NULL;
+       chunk = strtok(NULL, " \t")) {
+    char* dot = strchr(chunk, '.');
+    if (dot != NULL) {
+      // 'Token.format'.
+      Token* format = FormatToken::Tokenize(dot + 1);
+      if (format != NULL) {
+        *dot = '\0';
+        args.push_back(Token::Tokenize(chunk));
+        args.push_back(format);
+      } else {
+        // Error while parsing the format, push the UnknownToken so an error
+        // can be accurately reported.
+        args.push_back(Token::Tokenize(chunk));
+      }
+    } else {
+      args.push_back(Token::Tokenize(chunk));
+    }
+  }
+
+  if (args.size() == 0) {
+    return NULL;
+  }
+
+  if (!args[0]->IsIdentifier()) {
+    return new InvalidCommand(args, 0, "command name is not valid");
+  }
+
+  const char* name = IdentifierToken::Cast(args[0])->value();
+  #define RETURN_IF_MATCH(Command)       \
+  if (Match(name, Command::kAliases)) {  \
+    return Command::Build(args);         \
+  }
+  DEBUG_COMMAND_LIST(RETURN_IF_MATCH);
+  #undef RETURN_IF_MATCH
+
+  return new UnknownCommand(args);
+}
+
+
+void DebugCommand::PrintHelp(const char** aliases,
+                             const char* args,
+                             const char* help) {
+  VIXL_ASSERT(aliases[0] != NULL);
+  VIXL_ASSERT(help != NULL);
+
+  printf("\n----\n\n");
+  for (const char** current = aliases; *current != NULL; current++) {
+    if (args != NULL) {
+      printf("%s %s\n", *current, args);
+    } else {
+      printf("%s\n", *current);
+    }
+  }
+  printf("\n%s\n", help);
+}
+
+
+bool HelpCommand::Run(Debugger* debugger) {
+  VIXL_ASSERT(debugger->IsDebuggerRunning());
+  USE(debugger);
+
+  #define PRINT_HELP(Command)                     \
+    DebugCommand::PrintHelp(Command::kAliases,    \
+                            Command::kArguments,  \
+                            Command::kHelp);
+  DEBUG_COMMAND_LIST(PRINT_HELP);
+  #undef PRINT_HELP
+  printf("\n----\n\n");
+
+  return false;
+}
+
+
+DebugCommand* HelpCommand::Build(std::vector<Token*> args) {
+  if (args.size() != 1) {
+    return new InvalidCommand(args, -1, "too many arguments");
+  }
+
+  return new HelpCommand(args[0]);
+}
+
+
+bool ContinueCommand::Run(Debugger* debugger) {
+  VIXL_ASSERT(debugger->IsDebuggerRunning());
+
+  debugger->set_debug_parameters(debugger->debug_parameters() & ~DBG_ACTIVE);
+  return true;
+}
+
+
+DebugCommand* ContinueCommand::Build(std::vector<Token*> args) {
+  if (args.size() != 1) {
+    return new InvalidCommand(args, -1, "too many arguments");
+  }
+
+  return new ContinueCommand(args[0]);
+}
+
+
+bool StepCommand::Run(Debugger* debugger) {
+  VIXL_ASSERT(debugger->IsDebuggerRunning());
+
+  int64_t steps = count();
+  if (steps < 0) {
+    printf(" ** invalid value for steps: %" PRId64 " (<0) **\n", steps);
+  } else if (steps > 1) {
+    debugger->set_steps(steps - 1);
+  }
+
+  return true;
+}
+
+
+void StepCommand::Print(FILE* out) {
+  fprintf(out, "%s %" PRId64 "", name(), count());
+}
+
+
+DebugCommand* StepCommand::Build(std::vector<Token*> args) {
+  IntegerToken* count = NULL;
+  switch (args.size()) {
+    case 1: {  // step [1]
+      count = new IntegerToken(1);
+      break;
+    }
+    case 2: {  // step n
+      Token* first = args[1];
+      if (!first->IsInteger()) {
+        return new InvalidCommand(args, 1, "expects int");
+      }
+      count = IntegerToken::Cast(first);
+      break;
+    }
+    default:
+      return new InvalidCommand(args, -1, "too many arguments");
+  }
+
+  return new StepCommand(args[0], count);
+}
+
+
+DebugCommand* DisasmCommand::Build(std::vector<Token*> args) {
+  IntegerToken* count = NULL;
+  switch (args.size()) {
+    case 1: {  // disasm [10]
+      count = new IntegerToken(10);
+      break;
+    }
+    case 2: {  // disasm n
+      Token* first = args[1];
+      if (!first->IsInteger()) {
+        return new InvalidCommand(args, 1, "expects int");
+      }
+
+      count = IntegerToken::Cast(first);
+      break;
+    }
+    default:
+      return new InvalidCommand(args, -1, "too many arguments");
+  }
+
+  Token* target = new IdentifierToken("pc");
+  FormatToken* format = new Format<uint32_t>("%08" PRIx32, 'i');
+  return new ExamineCommand(args[0], target, format, count);
+}
+
+
+void PrintCommand::Print(FILE* out) {
+  fprintf(out, "%s ", name());
+  target()->Print(out);
+  if (format() != NULL) format()->Print(out);
+}
+
+
+bool PrintCommand::Run(Debugger* debugger) {
+  VIXL_ASSERT(debugger->IsDebuggerRunning());
+
+  Token* tok = target();
+  if (tok->IsIdentifier()) {
+    char* identifier = IdentifierToken::Cast(tok)->value();
+    if (strcmp(identifier, "regs") == 0) {
+      debugger->PrintRegisters();
+    } else if (strcmp(identifier, "fpregs") == 0) {
+      debugger->PrintFPRegisters();
+    } else if (strcmp(identifier, "sysregs") == 0) {
+      debugger->PrintSystemRegisters();
+    } else if (strcmp(identifier, "pc") == 0) {
+      printf("pc = %16p\n", reinterpret_cast<const void*>(debugger->pc()));
+    } else {
+      printf(" ** Unknown identifier to print: %s **\n", identifier);
+    }
+
+    return false;
+  }
+
+  FormatToken* format_tok = format();
+  VIXL_ASSERT(format_tok != NULL);
+  if (format_tok->type_code() == 'i') {
+    // TODO(all): Add support for instruction disassembly.
+    printf(" ** unsupported format: instructions **\n");
+    return false;
+  }
+
+  if (tok->IsRegister()) {
+    RegisterToken* reg_tok = RegisterToken::Cast(tok);
+    Register reg = reg_tok->value();
+    debugger->PrintRegister(reg, reg_tok->Name(), format_tok);
+    return false;
+  }
+
+  if (tok->IsFPRegister()) {
+    FPRegister fpreg = FPRegisterToken::Cast(tok)->value();
+    debugger->PrintFPRegister(fpreg, format_tok);
+    return false;
+  }
+
+  VIXL_UNREACHABLE();
+  return false;
+}
+
+
+DebugCommand* PrintCommand::Build(std::vector<Token*> args) {
+  if (args.size() < 2) {
+    return new InvalidCommand(args, -1, "too few arguments");
+  }
+
+  Token* target = args[1];
+  if (!target->IsRegister() &&
+      !target->IsFPRegister() &&
+      !target->IsIdentifier()) {
+    return new InvalidCommand(args, 1, "expects reg or identifier");
+  }
+
+  FormatToken* format = NULL;
+  int target_size = 0;
+  if (target->IsRegister()) {
+    Register reg = RegisterToken::Cast(target)->value();
+    target_size = reg.SizeInBytes();
+  } else if (target->IsFPRegister()) {
+    FPRegister fpreg = FPRegisterToken::Cast(target)->value();
+    target_size = fpreg.SizeInBytes();
+  }
+  // If the target is an identifier there must be no format. This is checked
+  // in the switch statement below.
+
+  switch (args.size()) {
+    case 2: {
+      if (target->IsRegister()) {
+        switch (target_size) {
+          case 4: format = new Format<uint32_t>("%08" PRIx32, 'x'); break;
+          case 8: format = new Format<uint64_t>("%016" PRIx64, 'x'); break;
+          default: VIXL_UNREACHABLE();
+        }
+      } else if (target->IsFPRegister()) {
+        switch (target_size) {
+          case 4: format = new Format<float>("%8g", 'f'); break;
+          case 8: format = new Format<double>("%8g", 'f'); break;
+          default: VIXL_UNREACHABLE();
+        }
+      }
+      break;
+    }
+    case 3: {
+      if (target->IsIdentifier()) {
+        return new InvalidCommand(args, 2,
+            "format is only allowed with registers");
+      }
+
+      Token* second = args[2];
+      if (!second->IsFormat()) {
+        return new InvalidCommand(args, 2, "expects format");
+      }
+      format = FormatToken::Cast(second);
+
+      if (format->SizeOf() > target_size) {
+        return new InvalidCommand(args, 2, "format too wide");
+      }
+
+      break;
+    }
+    default:
+      return new InvalidCommand(args, -1, "too many arguments");
+  }
+
+  return new PrintCommand(args[0], target, format);
+}
+
+
+bool ExamineCommand::Run(Debugger* debugger) {
+  VIXL_ASSERT(debugger->IsDebuggerRunning());
+
+  uint8_t* address = target()->ToAddress(debugger);
+  int64_t  amount = count()->value();
+  if (format()->type_code() == 'i') {
+    debugger->PrintInstructions(address, amount);
+  } else {
+    debugger->PrintMemory(address, format(), amount);
+  }
+
+  return false;
+}
+
+
+void ExamineCommand::Print(FILE* out) {
+  fprintf(out, "%s ", name());
+  format()->Print(out);
+  target()->Print(out);
+}
+
+
+DebugCommand* ExamineCommand::Build(std::vector<Token*> args) {
+  if (args.size() < 2) {
+    return new InvalidCommand(args, -1, "too few arguments");
+  }
+
+  Token* target = args[1];
+  if (!target->CanAddressMemory()) {
+    return new InvalidCommand(args, 1, "expects address");
+  }
+
+  FormatToken* format = NULL;
+  IntegerToken* count = NULL;
+
+  switch (args.size()) {
+    case 2: {  // mem addr[.x64] [10]
+      format = new Format<uint64_t>("%016" PRIx64, 'x');
+      count = new IntegerToken(10);
+      break;
+    }
+    case 3: {  // mem addr.format [10]
+               // mem addr[.x64] n
+      Token* second = args[2];
+      if (second->IsFormat()) {
+        format = FormatToken::Cast(second);
+        count = new IntegerToken(10);
+        break;
+      } else if (second->IsInteger()) {
+        format = new Format<uint64_t>("%016" PRIx64, 'x');
+        count = IntegerToken::Cast(second);
+      } else {
+        return new InvalidCommand(args, 2, "expects format or integer");
+      }
+      VIXL_UNREACHABLE();
+      break;
+    }
+    case 4: {  // mem addr.format n
+      Token* second = args[2];
+      Token* third = args[3];
+      if (!second->IsFormat() || !third->IsInteger()) {
+        return new InvalidCommand(args, -1, "expects addr[.format] [n]");
+      }
+      format = FormatToken::Cast(second);
+      count = IntegerToken::Cast(third);
+      break;
+    }
+    default:
+      return new InvalidCommand(args, -1, "too many arguments");
+  }
+
+  return new ExamineCommand(args[0], target, format, count);
+}
+
+
+UnknownCommand::~UnknownCommand() {
+  const int size = args_.size();
+  for (int i = 0; i < size; ++i) {
+    delete args_[i];
+  }
+}
+
+
+bool UnknownCommand::Run(Debugger* debugger) {
+  VIXL_ASSERT(debugger->IsDebuggerRunning());
+  USE(debugger);
+
+  printf(" ** Unknown Command:");
+  const int size = args_.size();
+  for (int i = 0; i < size; ++i) {
+    printf(" ");
+    args_[i]->Print(stdout);
+  }
+  printf(" **\n");
+
+  return false;
+}
+
+
+InvalidCommand::~InvalidCommand() {
+  const int size = args_.size();
+  for (int i = 0; i < size; ++i) {
+    delete args_[i];
+  }
+}
+
+
+bool InvalidCommand::Run(Debugger* debugger) {
+  VIXL_ASSERT(debugger->IsDebuggerRunning());
+  USE(debugger);
+
+  printf(" ** Invalid Command:");
+  const int size = args_.size();
+  for (int i = 0; i < size; ++i) {
+    printf(" ");
+    if (i == index_) {
+      printf(">>");
+      args_[i]->Print(stdout);
+      printf("<<");
+    } else {
+      args_[i]->Print(stdout);
+    }
+  }
+  printf(" **\n");
+  printf(" ** %s\n", cause_);
+
+  return false;
+}
+
+}  // namespace vixl
+
+#endif  // JS_ARM64_SIMULATOR
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Debugger-vixl.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Debugger-vixl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Debugger-vixl.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Debugger-vixl.h	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,113 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#ifndef VIXL_A64_DEBUGGER_A64_H_
+#define VIXL_A64_DEBUGGER_A64_H_
+
+#include <ctype.h>
+#include <errno.h>
+#include <limits.h>
+#include <vector>
+
+#include "jit/arm64/vixl/Constants-vixl.h"
+#include "jit/arm64/vixl/Globals-vixl.h"
+#include "jit/arm64/vixl/Simulator-vixl.h"
+#include "jit/arm64/vixl/Utils-vixl.h"
+
+namespace vixl {
+
+// Flags that represent the debugger state.
+enum DebugParameters {
+  DBG_INACTIVE = 0,
+  DBG_ACTIVE = 1 << 0,  // The debugger is active.
+  DBG_BREAK  = 1 << 1   // The debugger is at a breakpoint.
+};
+
+// Forward declarations.
+class DebugCommand;
+class Token;
+class FormatToken;
+
+class Debugger : public Simulator {
+ public:
+  explicit Debugger(Decoder* decoder, FILE* stream = stdout);
+
+  virtual void Run();
+  virtual void VisitException(const Instruction* instr);
+
+  int debug_parameters() const { return debug_parameters_; }
+  void set_debug_parameters(int parameters) {
+    debug_parameters_ = parameters;
+
+    update_pending_request();
+  }
+
+  // Numbers of instructions to execute before the debugger shell is given
+  // back control.
+  int steps() const { return steps_; }
+  void set_steps(int value) {
+    VIXL_ASSERT(value > 1);
+    steps_ = value;
+  }
+
+  bool IsDebuggerRunning() const {
+    return (debug_parameters_ & DBG_ACTIVE) != 0;
+  }
+
+  bool pending_request() const { return pending_request_; }
+  void update_pending_request() {
+    pending_request_ = IsDebuggerRunning();
+  }
+
+  void PrintInstructions(const void* address, int64_t count = 1);
+  void PrintMemory(const uint8_t* address,
+                   const FormatToken* format,
+                   int64_t count = 1);
+  void PrintRegister(const Register& target_reg,
+                     const char* name,
+                     const FormatToken* format);
+  void PrintFPRegister(const FPRegister& target_fpreg,
+                       const FormatToken* format);
+
+ private:
+  char* ReadCommandLine(const char* prompt, char* buffer, int length);
+  void RunDebuggerShell();
+  void DoBreakpoint(const Instruction* instr);
+
+  int debug_parameters_;
+  bool pending_request_;
+  int steps_;
+  DebugCommand* last_command_;
+  PrintDisassembler* disasm_;
+  Decoder* printer_;
+
+  // Length of the biggest command line accepted by the debugger shell.
+  static const int kMaxDebugShellLine = 256;
+};
+
+}  // namespace vixl
+
+#endif  // VIXL_A64_DEBUGGER_A64_H_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Decoder-vixl.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Decoder-vixl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Decoder-vixl.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Decoder-vixl.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,708 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#include "jit/arm64/vixl/Decoder-vixl.h"
+
+#include "jit/arm64/vixl/Globals-vixl.h"
+#include "jit/arm64/vixl/Utils-vixl.h"
+
+namespace vixl {
+
+void Decoder::DecodeInstruction(const Instruction *instr) {
+  if (instr->Bits(28, 27) == 0) {
+    VisitUnallocated(instr);
+  } else {
+    switch (instr->Bits(27, 24)) {
+      // 0:   PC relative addressing.
+      case 0x0: DecodePCRelAddressing(instr); break;
+
+      // 1:   Add/sub immediate.
+      case 0x1: DecodeAddSubImmediate(instr); break;
+
+      // A:   Logical shifted register.
+      //      Add/sub with carry.
+      //      Conditional compare register.
+      //      Conditional compare immediate.
+      //      Conditional select.
+      //      Data processing 1 source.
+      //      Data processing 2 source.
+      // B:   Add/sub shifted register.
+      //      Add/sub extended register.
+      //      Data processing 3 source.
+      case 0xA:
+      case 0xB: DecodeDataProcessing(instr); break;
+
+      // 2:   Logical immediate.
+      //      Move wide immediate.
+      case 0x2: DecodeLogical(instr); break;
+
+      // 3:   Bitfield.
+      //      Extract.
+      case 0x3: DecodeBitfieldExtract(instr); break;
+
+      // 4:   Unconditional branch immediate.
+      //      Exception generation.
+      //      Compare and branch immediate.
+      // 5:   Compare and branch immediate.
+      //      Conditional branch.
+      //      System.
+      // 6,7: Unconditional branch.
+      //      Test and branch immediate.
+      case 0x4:
+      case 0x5:
+      case 0x6:
+      case 0x7: DecodeBranchSystemException(instr); break;
+
+      // 8,9: Load/store register pair post-index.
+      //      Load register literal.
+      //      Load/store register unscaled immediate.
+      //      Load/store register immediate post-index.
+      //      Load/store register immediate pre-index.
+      //      Load/store register offset.
+      //      Load/store exclusive.
+      // C,D: Load/store register pair offset.
+      //      Load/store register pair pre-index.
+      //      Load/store register unsigned immediate.
+      //      Advanced SIMD.
+      case 0x8:
+      case 0x9:
+      case 0xC:
+      case 0xD: DecodeLoadStore(instr); break;
+
+      // E:   FP fixed point conversion.
+      //      FP integer conversion.
+      //      FP data processing 1 source.
+      //      FP compare.
+      //      FP immediate.
+      //      FP data processing 2 source.
+      //      FP conditional compare.
+      //      FP conditional select.
+      //      Advanced SIMD.
+      // F:   FP data processing 3 source.
+      //      Advanced SIMD.
+      case 0xE:
+      case 0xF: DecodeFP(instr); break;
+    }
+  }
+}
+
+void Decoder::AppendVisitor(DecoderVisitor* new_visitor) {
+  visitors_.push_back(new_visitor);
+}
+
+
+void Decoder::PrependVisitor(DecoderVisitor* new_visitor) {
+  visitors_.push_front(new_visitor);
+}
+
+
+void Decoder::InsertVisitorBefore(DecoderVisitor* new_visitor,
+                                  DecoderVisitor* registered_visitor) {
+  std::list<DecoderVisitor*>::iterator it;
+  for (it = visitors_.begin(); it != visitors_.end(); it++) {
+    if (*it == registered_visitor) {
+      visitors_.insert(it, new_visitor);
+      return;
+    }
+  }
+  // We reached the end of the list. The last element must be
+  // registered_visitor.
+  VIXL_ASSERT(*it == registered_visitor);
+  visitors_.insert(it, new_visitor);
+}
+
+
+void Decoder::InsertVisitorAfter(DecoderVisitor* new_visitor,
+                                 DecoderVisitor* registered_visitor) {
+  std::list<DecoderVisitor*>::iterator it;
+  for (it = visitors_.begin(); it != visitors_.end(); it++) {
+    if (*it == registered_visitor) {
+      it++;
+      visitors_.insert(it, new_visitor);
+      return;
+    }
+  }
+  // We reached the end of the list. The last element must be
+  // registered_visitor.
+  VIXL_ASSERT(*it == registered_visitor);
+  visitors_.push_back(new_visitor);
+}
+
+
+void Decoder::RemoveVisitor(DecoderVisitor* visitor) {
+  visitors_.remove(visitor);
+}
+
+
+void Decoder::DecodePCRelAddressing(const Instruction* instr) {
+  VIXL_ASSERT(instr->Bits(27, 24) == 0x0);
+  // We know bit 28 is set, as <b28:b27> = 0 is filtered out at the top level
+  // decode.
+  VIXL_ASSERT(instr->Bit(28) == 0x1);
+  VisitPCRelAddressing(instr);
+}
+
+
+void Decoder::DecodeBranchSystemException(const Instruction* instr) {
+  VIXL_ASSERT((instr->Bits(27, 24) == 0x4) ||
+              (instr->Bits(27, 24) == 0x5) ||
+              (instr->Bits(27, 24) == 0x6) ||
+              (instr->Bits(27, 24) == 0x7) );
+
+  switch (instr->Bits(31, 29)) {
+    case 0:
+    case 4: {
+      VisitUnconditionalBranch(instr);
+      break;
+    }
+    case 1:
+    case 5: {
+      if (instr->Bit(25) == 0) {
+        VisitCompareBranch(instr);
+      } else {
+        VisitTestBranch(instr);
+      }
+      break;
+    }
+    case 2: {
+      if (instr->Bit(25) == 0) {
+        if ((instr->Bit(24) == 0x1) ||
+            (instr->Mask(0x01000010) == 0x00000010)) {
+          VisitUnallocated(instr);
+        } else {
+          VisitConditionalBranch(instr);
+        }
+      } else {
+        VisitUnallocated(instr);
+      }
+      break;
+    }
+    case 6: {
+      if (instr->Bit(25) == 0) {
+        if (instr->Bit(24) == 0) {
+          if ((instr->Bits(4, 2) != 0) ||
+              (instr->Mask(0x00E0001D) == 0x00200001) ||
+              (instr->Mask(0x00E0001D) == 0x00400001) ||
+              (instr->Mask(0x00E0001E) == 0x00200002) ||
+              (instr->Mask(0x00E0001E) == 0x00400002) ||
+              (instr->Mask(0x00E0001C) == 0x00600000) ||
+              (instr->Mask(0x00E0001C) == 0x00800000) ||
+              (instr->Mask(0x00E0001F) == 0x00A00000) ||
+              (instr->Mask(0x00C0001C) == 0x00C00000)) {
+            VisitUnallocated(instr);
+          } else {
+            VisitException(instr);
+          }
+        } else {
+          if (instr->Bits(23, 22) == 0) {
+            const Instr masked_003FF0E0 = instr->Mask(0x003FF0E0);
+            if ((instr->Bits(21, 19) == 0x4) ||
+                (masked_003FF0E0 == 0x00033000) ||
+                (masked_003FF0E0 == 0x003FF020) ||
+                (masked_003FF0E0 == 0x003FF060) ||
+                (masked_003FF0E0 == 0x003FF0E0) ||
+                (instr->Mask(0x00388000) == 0x00008000) ||
+                (instr->Mask(0x0038E000) == 0x00000000) ||
+                (instr->Mask(0x0039E000) == 0x00002000) ||
+                (instr->Mask(0x003AE000) == 0x00002000) ||
+                (instr->Mask(0x003CE000) == 0x00042000) ||
+                (instr->Mask(0x003FFFC0) == 0x000320C0) ||
+                (instr->Mask(0x003FF100) == 0x00032100) ||
+                (instr->Mask(0x003FF200) == 0x00032200) ||
+                (instr->Mask(0x003FF400) == 0x00032400) ||
+                (instr->Mask(0x003FF800) == 0x00032800) ||
+                (instr->Mask(0x0038F000) == 0x00005000) ||
+                (instr->Mask(0x0038E000) == 0x00006000)) {
+              VisitUnallocated(instr);
+            } else {
+              VisitSystem(instr);
+            }
+          } else {
+            VisitUnallocated(instr);
+          }
+        }
+      } else {
+        if ((instr->Bit(24) == 0x1) ||
+            (instr->Bits(20, 16) != 0x1F) ||
+            (instr->Bits(15, 10) != 0) ||
+            (instr->Bits(4, 0) != 0) ||
+            (instr->Bits(24, 21) == 0x3) ||
+            (instr->Bits(24, 22) == 0x3)) {
+          VisitUnallocated(instr);
+        } else {
+          VisitUnconditionalBranchToRegister(instr);
+        }
+      }
+      break;
+    }
+    case 3:
+    case 7: {
+      VisitUnallocated(instr);
+      break;
+    }
+  }
+}
+
+
+void Decoder::DecodeLoadStore(const Instruction* instr) {
+  VIXL_ASSERT((instr->Bits(27, 24) == 0x8) ||
+              (instr->Bits(27, 24) == 0x9) ||
+              (instr->Bits(27, 24) == 0xC) ||
+              (instr->Bits(27, 24) == 0xD) );
+
+  if (instr->Bit(24) == 0) {
+    if (instr->Bit(28) == 0) {
+      if (instr->Bit(29) == 0) {
+        if (instr->Bit(26) == 0) {
+          VisitLoadStoreExclusive(instr);
+        } else {
+          DecodeAdvSIMDLoadStore(instr);
+        }
+      } else {
+        if ((instr->Bits(31, 30) == 0x3) ||
+            (instr->Mask(0xC4400000) == 0x40000000)) {
+          VisitUnallocated(instr);
+        } else {
+          if (instr->Bit(23) == 0) {
+            if (instr->Mask(0xC4400000) == 0xC0400000) {
+              VisitUnallocated(instr);
+            } else {
+              VisitLoadStorePairNonTemporal(instr);
+            }
+          } else {
+            VisitLoadStorePairPostIndex(instr);
+          }
+        }
+      }
+    } else {
+      if (instr->Bit(29) == 0) {
+        if (instr->Mask(0xC4000000) == 0xC4000000) {
+          VisitUnallocated(instr);
+        } else {
+          VisitLoadLiteral(instr);
+        }
+      } else {
+        if ((instr->Mask(0x84C00000) == 0x80C00000) ||
+            (instr->Mask(0x44800000) == 0x44800000) ||
+            (instr->Mask(0x84800000) == 0x84800000)) {
+          VisitUnallocated(instr);
+        } else {
+          if (instr->Bit(21) == 0) {
+            switch (instr->Bits(11, 10)) {
+              case 0: {
+                VisitLoadStoreUnscaledOffset(instr);
+                break;
+              }
+              case 1: {
+                if (instr->Mask(0xC4C00000) == 0xC0800000) {
+                  VisitUnallocated(instr);
+                } else {
+                  VisitLoadStorePostIndex(instr);
+                }
+                break;
+              }
+              case 2: {
+                // TODO: VisitLoadStoreRegisterOffsetUnpriv.
+                VisitUnimplemented(instr);
+                break;
+              }
+              case 3: {
+                if (instr->Mask(0xC4C00000) == 0xC0800000) {
+                  VisitUnallocated(instr);
+                } else {
+                  VisitLoadStorePreIndex(instr);
+                }
+                break;
+              }
+            }
+          } else {
+            if (instr->Bits(11, 10) == 0x2) {
+              if (instr->Bit(14) == 0) {
+                VisitUnallocated(instr);
+              } else {
+                VisitLoadStoreRegisterOffset(instr);
+              }
+            } else {
+              VisitUnallocated(instr);
+            }
+          }
+        }
+      }
+    }
+  } else {
+    if (instr->Bit(28) == 0) {
+      if (instr->Bit(29) == 0) {
+        VisitUnallocated(instr);
+      } else {
+        if ((instr->Bits(31, 30) == 0x3) ||
+            (instr->Mask(0xC4400000) == 0x40000000)) {
+          VisitUnallocated(instr);
+        } else {
+          if (instr->Bit(23) == 0) {
+            VisitLoadStorePairOffset(instr);
+          } else {
+            VisitLoadStorePairPreIndex(instr);
+          }
+        }
+      }
+    } else {
+      if (instr->Bit(29) == 0) {
+        VisitUnallocated(instr);
+      } else {
+        if ((instr->Mask(0x84C00000) == 0x80C00000) ||
+            (instr->Mask(0x44800000) == 0x44800000) ||
+            (instr->Mask(0x84800000) == 0x84800000)) {
+          VisitUnallocated(instr);
+        } else {
+          VisitLoadStoreUnsignedOffset(instr);
+        }
+      }
+    }
+  }
+}
+
+
+void Decoder::DecodeLogical(const Instruction* instr) {
+  VIXL_ASSERT(instr->Bits(27, 24) == 0x2);
+
+  if (instr->Mask(0x80400000) == 0x00400000) {
+    VisitUnallocated(instr);
+  } else {
+    if (instr->Bit(23) == 0) {
+      VisitLogicalImmediate(instr);
+    } else {
+      if (instr->Bits(30, 29) == 0x1) {
+        VisitUnallocated(instr);
+      } else {
+        VisitMoveWideImmediate(instr);
+      }
+    }
+  }
+}
+
+
+void Decoder::DecodeBitfieldExtract(const Instruction* instr) {
+  VIXL_ASSERT(instr->Bits(27, 24) == 0x3);
+
+  if ((instr->Mask(0x80400000) == 0x80000000) ||
+      (instr->Mask(0x80400000) == 0x00400000) ||
+      (instr->Mask(0x80008000) == 0x00008000)) {
+    VisitUnallocated(instr);
+  } else if (instr->Bit(23) == 0) {
+    if ((instr->Mask(0x80200000) == 0x00200000) ||
+        (instr->Mask(0x60000000) == 0x60000000)) {
+      VisitUnallocated(instr);
+    } else {
+      VisitBitfield(instr);
+    }
+  } else {
+    if ((instr->Mask(0x60200000) == 0x00200000) ||
+        (instr->Mask(0x60000000) != 0x00000000)) {
+      VisitUnallocated(instr);
+    } else {
+      VisitExtract(instr);
+    }
+  }
+}
+
+
+void Decoder::DecodeAddSubImmediate(const Instruction* instr) {
+  VIXL_ASSERT(instr->Bits(27, 24) == 0x1);
+  if (instr->Bit(23) == 1) {
+    VisitUnallocated(instr);
+  } else {
+    VisitAddSubImmediate(instr);
+  }
+}
+
+
+void Decoder::DecodeDataProcessing(const Instruction* instr) {
+  VIXL_ASSERT((instr->Bits(27, 24) == 0xA) ||
+              (instr->Bits(27, 24) == 0xB));
+
+  if (instr->Bit(24) == 0) {
+    if (instr->Bit(28) == 0) {
+      if (instr->Mask(0x80008000) == 0x00008000) {
+        VisitUnallocated(instr);
+      } else {
+        VisitLogicalShifted(instr);
+      }
+    } else {
+      switch (instr->Bits(23, 21)) {
+        case 0: {
+          if (instr->Mask(0x0000FC00) != 0) {
+            VisitUnallocated(instr);
+          } else {
+            VisitAddSubWithCarry(instr);
+          }
+          break;
+        }
+        case 2: {
+          if ((instr->Bit(29) == 0) ||
+              (instr->Mask(0x00000410) != 0)) {
+            VisitUnallocated(instr);
+          } else {
+            if (instr->Bit(11) == 0) {
+              VisitConditionalCompareRegister(instr);
+            } else {
+              VisitConditionalCompareImmediate(instr);
+            }
+          }
+          break;
+        }
+        case 4: {
+          if (instr->Mask(0x20000800) != 0x00000000) {
+            VisitUnallocated(instr);
+          } else {
+            VisitConditionalSelect(instr);
+          }
+          break;
+        }
+        case 6: {
+          if (instr->Bit(29) == 0x1) {
+            VisitUnallocated(instr);
+          } else {
+            if (instr->Bit(30) == 0) {
+              if ((instr->Bit(15) == 0x1) ||
+                  (instr->Bits(15, 11) == 0) ||
+                  (instr->Bits(15, 12) == 0x1) ||
+                  (instr->Bits(15, 12) == 0x3) ||
+                  (instr->Bits(15, 13) == 0x3) ||
+                  (instr->Mask(0x8000EC00) == 0x00004C00) ||
+                  (instr->Mask(0x8000E800) == 0x80004000) ||
+                  (instr->Mask(0x8000E400) == 0x80004000)) {
+                VisitUnallocated(instr);
+              } else {
+                VisitDataProcessing2Source(instr);
+              }
+            } else {
+              if ((instr->Bit(13) == 1) ||
+                  (instr->Bits(20, 16) != 0) ||
+                  (instr->Bits(15, 14) != 0) ||
+                  (instr->Mask(0xA01FFC00) == 0x00000C00) ||
+                  (instr->Mask(0x201FF800) == 0x00001800)) {
+                VisitUnallocated(instr);
+              } else {
+                VisitDataProcessing1Source(instr);
+              }
+            }
+            break;
+          }
+        }
+        case 1:
+        case 3:
+        case 5:
+        case 7: VisitUnallocated(instr); break;
+      }
+    }
+  } else {
+    if (instr->Bit(28) == 0) {
+     if (instr->Bit(21) == 0) {
+        if ((instr->Bits(23, 22) == 0x3) ||
+            (instr->Mask(0x80008000) == 0x00008000)) {
+          VisitUnallocated(instr);
+        } else {
+          VisitAddSubShifted(instr);
+        }
+      } else {
+        if ((instr->Mask(0x00C00000) != 0x00000000) ||
+            (instr->Mask(0x00001400) == 0x00001400) ||
+            (instr->Mask(0x00001800) == 0x00001800)) {
+          VisitUnallocated(instr);
+        } else {
+          VisitAddSubExtended(instr);
+        }
+      }
+    } else {
+      if ((instr->Bit(30) == 0x1) ||
+          (instr->Bits(30, 29) == 0x1) ||
+          (instr->Mask(0xE0600000) == 0x00200000) ||
+          (instr->Mask(0xE0608000) == 0x00400000) ||
+          (instr->Mask(0x60608000) == 0x00408000) ||
+          (instr->Mask(0x60E00000) == 0x00E00000) ||
+          (instr->Mask(0x60E00000) == 0x00800000) ||
+          (instr->Mask(0x60E00000) == 0x00600000)) {
+        VisitUnallocated(instr);
+      } else {
+        VisitDataProcessing3Source(instr);
+      }
+    }
+  }
+}
+
+
+void Decoder::DecodeFP(const Instruction* instr) {
+  VIXL_ASSERT((instr->Bits(27, 24) == 0xE) ||
+              (instr->Bits(27, 24) == 0xF));
+
+  if (instr->Bit(28) == 0) {
+    DecodeAdvSIMDDataProcessing(instr);
+  } else {
+    if (instr->Bit(29) == 1) {
+      VisitUnallocated(instr);
+    } else {
+      if (instr->Bits(31, 30) == 0x3) {
+        VisitUnallocated(instr);
+      } else if (instr->Bits(31, 30) == 0x1) {
+        DecodeAdvSIMDDataProcessing(instr);
+      } else {
+        if (instr->Bit(24) == 0) {
+          if (instr->Bit(21) == 0) {
+            if ((instr->Bit(23) == 1) ||
+                (instr->Bit(18) == 1) ||
+                (instr->Mask(0x80008000) == 0x00000000) ||
+                (instr->Mask(0x000E0000) == 0x00000000) ||
+                (instr->Mask(0x000E0000) == 0x000A0000) ||
+                (instr->Mask(0x00160000) == 0x00000000) ||
+                (instr->Mask(0x00160000) == 0x00120000)) {
+              VisitUnallocated(instr);
+            } else {
+              VisitFPFixedPointConvert(instr);
+            }
+          } else {
+            if (instr->Bits(15, 10) == 32) {
+              VisitUnallocated(instr);
+            } else if (instr->Bits(15, 10) == 0) {
+              if ((instr->Bits(23, 22) == 0x3) ||
+                  (instr->Mask(0x000E0000) == 0x000A0000) ||
+                  (instr->Mask(0x000E0000) == 0x000C0000) ||
+                  (instr->Mask(0x00160000) == 0x00120000) ||
+                  (instr->Mask(0x00160000) == 0x00140000) ||
+                  (instr->Mask(0x20C40000) == 0x00800000) ||
+                  (instr->Mask(0x20C60000) == 0x00840000) ||
+                  (instr->Mask(0xA0C60000) == 0x80060000) ||
+                  (instr->Mask(0xA0C60000) == 0x00860000) ||
+                  (instr->Mask(0xA0C60000) == 0x00460000) ||
+                  (instr->Mask(0xA0CE0000) == 0x80860000) ||
+                  (instr->Mask(0xA0CE0000) == 0x804E0000) ||
+                  (instr->Mask(0xA0CE0000) == 0x000E0000) ||
+                  (instr->Mask(0xA0D60000) == 0x00160000) ||
+                  (instr->Mask(0xA0D60000) == 0x80560000) ||
+                  (instr->Mask(0xA0D60000) == 0x80960000)) {
+                VisitUnallocated(instr);
+              } else {
+                VisitFPIntegerConvert(instr);
+              }
+            } else if (instr->Bits(14, 10) == 16) {
+              const Instr masked_A0DF8000 = instr->Mask(0xA0DF8000);
+              if ((instr->Mask(0x80180000) != 0) ||
+                  (masked_A0DF8000 == 0x00020000) ||
+                  (masked_A0DF8000 == 0x00030000) ||
+                  (masked_A0DF8000 == 0x00068000) ||
+                  (masked_A0DF8000 == 0x00428000) ||
+                  (masked_A0DF8000 == 0x00430000) ||
+                  (masked_A0DF8000 == 0x00468000) ||
+                  (instr->Mask(0xA0D80000) == 0x00800000) ||
+                  (instr->Mask(0xA0DE0000) == 0x00C00000) ||
+                  (instr->Mask(0xA0DF0000) == 0x00C30000) ||
+                  (instr->Mask(0xA0DC0000) == 0x00C40000)) {
+                VisitUnallocated(instr);
+              } else {
+                VisitFPDataProcessing1Source(instr);
+              }
+            } else if (instr->Bits(13, 10) == 8) {
+              if ((instr->Bits(15, 14) != 0) ||
+                  (instr->Bits(2, 0) != 0) ||
+                  (instr->Mask(0x80800000) != 0x00000000)) {
+                VisitUnallocated(instr);
+              } else {
+                VisitFPCompare(instr);
+              }
+            } else if (instr->Bits(12, 10) == 4) {
+              if ((instr->Bits(9, 5) != 0) ||
+                  (instr->Mask(0x80800000) != 0x00000000)) {
+                VisitUnallocated(instr);
+              } else {
+                VisitFPImmediate(instr);
+              }
+            } else {
+              if (instr->Mask(0x80800000) != 0x00000000) {
+                VisitUnallocated(instr);
+              } else {
+                switch (instr->Bits(11, 10)) {
+                  case 1: {
+                    VisitFPConditionalCompare(instr);
+                    break;
+                  }
+                  case 2: {
+                    if ((instr->Bits(15, 14) == 0x3) ||
+                        (instr->Mask(0x00009000) == 0x00009000) ||
+                        (instr->Mask(0x0000A000) == 0x0000A000)) {
+                      VisitUnallocated(instr);
+                    } else {
+                      VisitFPDataProcessing2Source(instr);
+                    }
+                    break;
+                  }
+                  case 3: {
+                    VisitFPConditionalSelect(instr);
+                    break;
+                  }
+                  default: VIXL_UNREACHABLE();
+                }
+              }
+            }
+          }
+        } else {
+          // Bit 30 == 1 has been handled earlier.
+          VIXL_ASSERT(instr->Bit(30) == 0);
+          if (instr->Mask(0xA0800000) != 0) {
+            VisitUnallocated(instr);
+          } else {
+            VisitFPDataProcessing3Source(instr);
+          }
+        }
+      }
+    }
+  }
+}
+
+
+void Decoder::DecodeAdvSIMDLoadStore(const Instruction* instr) {
+  // TODO: Implement Advanced SIMD load/store instruction decode.
+  VIXL_ASSERT(instr->Bits(29, 25) == 0x6);
+  VisitUnimplemented(instr);
+}
+
+
+void Decoder::DecodeAdvSIMDDataProcessing(const Instruction* instr) {
+  // TODO: Implement Advanced SIMD data processing instruction decode.
+  VIXL_ASSERT(instr->Bits(27, 25) == 0x7);
+  VisitUnimplemented(instr);
+}
+
+
+#define DEFINE_VISITOR_CALLERS(A)                                              \
+  void Decoder::Visit##A(const Instruction *instr) {                           \
+    VIXL_ASSERT(instr->Mask(A##FMask) == A##Fixed);                            \
+    std::list<DecoderVisitor*>::iterator it;                                   \
+    for (it = visitors_.begin(); it != visitors_.end(); it++) {                \
+      (*it)->Visit##A(instr);                                                  \
+    }                                                                          \
+  }
+VISITOR_LIST(DEFINE_VISITOR_CALLERS)
+#undef DEFINE_VISITOR_CALLERS
+}  // namespace vixl
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Decoder-vixl.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Decoder-vixl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Decoder-vixl.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Decoder-vixl.h	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,239 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#ifndef VIXL_A64_DECODER_A64_H_
+#define VIXL_A64_DECODER_A64_H_
+
+#include <list>
+
+#include "jit/arm64/vixl/Globals-vixl.h"
+#include "jit/arm64/vixl/Instructions-vixl.h"
+
+
+// List macro containing all visitors needed by the decoder class.
+
+#define VISITOR_LIST(V)             \
+  V(PCRelAddressing)                \
+  V(AddSubImmediate)                \
+  V(LogicalImmediate)               \
+  V(MoveWideImmediate)              \
+  V(Bitfield)                       \
+  V(Extract)                        \
+  V(UnconditionalBranch)            \
+  V(UnconditionalBranchToRegister)  \
+  V(CompareBranch)                  \
+  V(TestBranch)                     \
+  V(ConditionalBranch)              \
+  V(System)                         \
+  V(Exception)                      \
+  V(LoadStorePairPostIndex)         \
+  V(LoadStorePairOffset)            \
+  V(LoadStorePairPreIndex)          \
+  V(LoadStorePairNonTemporal)       \
+  V(LoadLiteral)                    \
+  V(LoadStoreUnscaledOffset)        \
+  V(LoadStorePostIndex)             \
+  V(LoadStorePreIndex)              \
+  V(LoadStoreRegisterOffset)        \
+  V(LoadStoreUnsignedOffset)        \
+  V(LoadStoreExclusive)             \
+  V(LogicalShifted)                 \
+  V(AddSubShifted)                  \
+  V(AddSubExtended)                 \
+  V(AddSubWithCarry)                \
+  V(ConditionalCompareRegister)     \
+  V(ConditionalCompareImmediate)    \
+  V(ConditionalSelect)              \
+  V(DataProcessing1Source)          \
+  V(DataProcessing2Source)          \
+  V(DataProcessing3Source)          \
+  V(FPCompare)                      \
+  V(FPConditionalCompare)           \
+  V(FPConditionalSelect)            \
+  V(FPImmediate)                    \
+  V(FPDataProcessing1Source)        \
+  V(FPDataProcessing2Source)        \
+  V(FPDataProcessing3Source)        \
+  V(FPIntegerConvert)               \
+  V(FPFixedPointConvert)            \
+  V(Unallocated)                    \
+  V(Unimplemented)
+
+namespace vixl {
+
+// The Visitor interface. Disassembler and simulator (and other tools)
+// must provide implementations for all of these functions.
+class DecoderVisitor {
+ public:
+  enum VisitorConstness {
+    kConstVisitor,
+    kNonConstVisitor
+  };
+  explicit DecoderVisitor(VisitorConstness constness = kConstVisitor)
+      : constness_(constness) {}
+
+  virtual ~DecoderVisitor() {}
+
+  #define DECLARE(A) virtual void Visit##A(const Instruction* instr) = 0;
+  VISITOR_LIST(DECLARE)
+  #undef DECLARE
+
+  bool IsConstVisitor() const { return constness_ == kConstVisitor; }
+  Instruction* MutableInstruction(const Instruction* instr) {
+    VIXL_ASSERT(!IsConstVisitor());
+    return const_cast<Instruction*>(instr);
+  }
+
+ private:
+  const VisitorConstness constness_;
+};
+
+
+class Decoder {
+ public:
+  Decoder() {}
+
+  // Top-level wrappers around the actual decoding function.
+  void Decode(const Instruction* instr) {
+    std::list<DecoderVisitor*>::iterator it;
+    for (it = visitors_.begin(); it != visitors_.end(); it++) {
+      VIXL_ASSERT((*it)->IsConstVisitor());
+    }
+    DecodeInstruction(instr);
+  }
+  void Decode(Instruction* instr) {
+    DecodeInstruction(const_cast<const Instruction*>(instr));
+  }
+
+  // Register a new visitor class with the decoder.
+  // Decode() will call the corresponding visitor method from all registered
+  // visitor classes when decoding reaches the leaf node of the instruction
+  // decode tree.
+  // Visitors are called in order.
+  // A visitor can be registered multiple times.
+  //
+  //   d.AppendVisitor(V1);
+  //   d.AppendVisitor(V2);
+  //   d.PrependVisitor(V2);
+  //   d.AppendVisitor(V3);
+  //
+  //   d.Decode(i);
+  //
+  // will call in order visitor methods in V2, V1, V2, V3.
+  void AppendVisitor(DecoderVisitor* visitor);
+  void PrependVisitor(DecoderVisitor* visitor);
+  // These helpers register `new_visitor` before or after the first instance of
+  // `registered_visiter` in the list.
+  // So if
+  //   V1, V2, V1, V2
+  // are registered in this order in the decoder, calls to
+  //   d.InsertVisitorAfter(V3, V1);
+  //   d.InsertVisitorBefore(V4, V2);
+  // will yield the order
+  //   V1, V3, V4, V2, V1, V2
+  //
+  // For more complex modifications of the order of registered visitors, one can
+  // directly access and modify the list of visitors via the `visitors()'
+  // accessor.
+  void InsertVisitorBefore(DecoderVisitor* new_visitor,
+                           DecoderVisitor* registered_visitor);
+  void InsertVisitorAfter(DecoderVisitor* new_visitor,
+                          DecoderVisitor* registered_visitor);
+
+  // Remove all instances of a previously registered visitor class from the list
+  // of visitors stored by the decoder.
+  void RemoveVisitor(DecoderVisitor* visitor);
+
+  #define DECLARE(A) void Visit##A(const Instruction* instr);
+  VISITOR_LIST(DECLARE)
+  #undef DECLARE
+
+
+  std::list<DecoderVisitor*>* visitors() { return &visitors_; }
+
+ private:
+  // Decodes an instruction and calls the visitor functions registered with the
+  // Decoder class.
+  void DecodeInstruction(const Instruction* instr);
+
+  // Decode the PC relative addressing instruction, and call the corresponding
+  // visitors.
+  // On entry, instruction bits 27:24 = 0x0.
+  void DecodePCRelAddressing(const Instruction* instr);
+
+  // Decode the add/subtract immediate instruction, and call the correspoding
+  // visitors.
+  // On entry, instruction bits 27:24 = 0x1.
+  void DecodeAddSubImmediate(const Instruction* instr);
+
+  // Decode the branch, system command, and exception generation parts of
+  // the instruction tree, and call the corresponding visitors.
+  // On entry, instruction bits 27:24 = {0x4, 0x5, 0x6, 0x7}.
+  void DecodeBranchSystemException(const Instruction* instr);
+
+  // Decode the load and store parts of the instruction tree, and call
+  // the corresponding visitors.
+  // On entry, instruction bits 27:24 = {0x8, 0x9, 0xC, 0xD}.
+  void DecodeLoadStore(const Instruction* instr);
+
+  // Decode the logical immediate and move wide immediate parts of the
+  // instruction tree, and call the corresponding visitors.
+  // On entry, instruction bits 27:24 = 0x2.
+  void DecodeLogical(const Instruction* instr);
+
+  // Decode the bitfield and extraction parts of the instruction tree,
+  // and call the corresponding visitors.
+  // On entry, instruction bits 27:24 = 0x3.
+  void DecodeBitfieldExtract(const Instruction* instr);
+
+  // Decode the data processing parts of the instruction tree, and call the
+  // corresponding visitors.
+  // On entry, instruction bits 27:24 = {0x1, 0xA, 0xB}.
+  void DecodeDataProcessing(const Instruction* instr);
+
+  // Decode the floating point parts of the instruction tree, and call the
+  // corresponding visitors.
+  // On entry, instruction bits 27:24 = {0xE, 0xF}.
+  void DecodeFP(const Instruction* instr);
+
+  // Decode the Advanced SIMD (NEON) load/store part of the instruction tree,
+  // and call the corresponding visitors.
+  // On entry, instruction bits 29:25 = 0x6.
+  void DecodeAdvSIMDLoadStore(const Instruction* instr);
+
+  // Decode the Advanced SIMD (NEON) data processing part of the instruction
+  // tree, and call the corresponding visitors.
+  // On entry, instruction bits 27:25 = 0x7.
+  void DecodeAdvSIMDDataProcessing(const Instruction* instr);
+
+ private:
+  // Visitors are registered in a list.
+  std::list<DecoderVisitor*> visitors_;
+};
+
+}  // namespace vixl
+
+#endif  // VIXL_A64_DECODER_A64_H_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Disasm-vixl.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Disasm-vixl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Disasm-vixl.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Disasm-vixl.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,1955 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#include "jit/arm64/vixl/Disasm-vixl.h"
+
+#include <cstdlib>
+
+namespace vixl {
+
+Disassembler::Disassembler() {
+  buffer_size_ = 256;
+  buffer_ = reinterpret_cast<char*>(malloc(buffer_size_));
+  buffer_pos_ = 0;
+  own_buffer_ = true;
+  code_address_offset_ = 0;
+}
+
+
+Disassembler::Disassembler(char* text_buffer, int buffer_size) {
+  buffer_size_ = buffer_size;
+  buffer_ = text_buffer;
+  buffer_pos_ = 0;
+  own_buffer_ = false;
+  code_address_offset_ = 0;
+}
+
+
+Disassembler::~Disassembler() {
+  if (own_buffer_) {
+    free(buffer_);
+  }
+}
+
+
+char* Disassembler::GetOutput() {
+  return buffer_;
+}
+
+
+void Disassembler::VisitAddSubImmediate(const Instruction* instr) {
+  bool rd_is_zr = RdIsZROrSP(instr);
+  bool stack_op = (rd_is_zr || RnIsZROrSP(instr)) &&
+                  (instr->ImmAddSub() == 0) ? true : false;
+  const char *mnemonic = "";
+  const char *form = "'Rds, 'Rns, 'IAddSub";
+  const char *form_cmp = "'Rns, 'IAddSub";
+  const char *form_mov = "'Rds, 'Rns";
+
+  switch (instr->Mask(AddSubImmediateMask)) {
+    case ADD_w_imm:
+    case ADD_x_imm: {
+      mnemonic = "add";
+      if (stack_op) {
+        mnemonic = "mov";
+        form = form_mov;
+      }
+      break;
+    }
+    case ADDS_w_imm:
+    case ADDS_x_imm: {
+      mnemonic = "adds";
+      if (rd_is_zr) {
+        mnemonic = "cmn";
+        form = form_cmp;
+      }
+      break;
+    }
+    case SUB_w_imm:
+    case SUB_x_imm: mnemonic = "sub"; break;
+    case SUBS_w_imm:
+    case SUBS_x_imm: {
+      mnemonic = "subs";
+      if (rd_is_zr) {
+        mnemonic = "cmp";
+        form = form_cmp;
+      }
+      break;
+    }
+    default: VIXL_UNREACHABLE();
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitAddSubShifted(const Instruction* instr) {
+  bool rd_is_zr = RdIsZROrSP(instr);
+  bool rn_is_zr = RnIsZROrSP(instr);
+  const char *mnemonic = "";
+  const char *form = "'Rd, 'Rn, 'Rm'HDP";
+  const char *form_cmp = "'Rn, 'Rm'HDP";
+  const char *form_neg = "'Rd, 'Rm'HDP";
+
+  switch (instr->Mask(AddSubShiftedMask)) {
+    case ADD_w_shift:
+    case ADD_x_shift: mnemonic = "add"; break;
+    case ADDS_w_shift:
+    case ADDS_x_shift: {
+      mnemonic = "adds";
+      if (rd_is_zr) {
+        mnemonic = "cmn";
+        form = form_cmp;
+      }
+      break;
+    }
+    case SUB_w_shift:
+    case SUB_x_shift: {
+      mnemonic = "sub";
+      if (rn_is_zr) {
+        mnemonic = "neg";
+        form = form_neg;
+      }
+      break;
+    }
+    case SUBS_w_shift:
+    case SUBS_x_shift: {
+      mnemonic = "subs";
+      if (rd_is_zr) {
+        mnemonic = "cmp";
+        form = form_cmp;
+      } else if (rn_is_zr) {
+        mnemonic = "negs";
+        form = form_neg;
+      }
+      break;
+    }
+    default: VIXL_UNREACHABLE();
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitAddSubExtended(const Instruction* instr) {
+  bool rd_is_zr = RdIsZROrSP(instr);
+  const char *mnemonic = "";
+  Extend mode = static_cast<Extend>(instr->ExtendMode());
+  const char *form = ((mode == UXTX) || (mode == SXTX)) ?
+                     "'Rds, 'Rns, 'Xm'Ext" : "'Rds, 'Rns, 'Wm'Ext";
+  const char *form_cmp = ((mode == UXTX) || (mode == SXTX)) ?
+                         "'Rns, 'Xm'Ext" : "'Rns, 'Wm'Ext";
+
+  switch (instr->Mask(AddSubExtendedMask)) {
+    case ADD_w_ext:
+    case ADD_x_ext: mnemonic = "add"; break;
+    case ADDS_w_ext:
+    case ADDS_x_ext: {
+      mnemonic = "adds";
+      if (rd_is_zr) {
+        mnemonic = "cmn";
+        form = form_cmp;
+      }
+      break;
+    }
+    case SUB_w_ext:
+    case SUB_x_ext: mnemonic = "sub"; break;
+    case SUBS_w_ext:
+    case SUBS_x_ext: {
+      mnemonic = "subs";
+      if (rd_is_zr) {
+        mnemonic = "cmp";
+        form = form_cmp;
+      }
+      break;
+    }
+    default: VIXL_UNREACHABLE();
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitAddSubWithCarry(const Instruction* instr) {
+  bool rn_is_zr = RnIsZROrSP(instr);
+  const char *mnemonic = "";
+  const char *form = "'Rd, 'Rn, 'Rm";
+  const char *form_neg = "'Rd, 'Rm";
+
+  switch (instr->Mask(AddSubWithCarryMask)) {
+    case ADC_w:
+    case ADC_x: mnemonic = "adc"; break;
+    case ADCS_w:
+    case ADCS_x: mnemonic = "adcs"; break;
+    case SBC_w:
+    case SBC_x: {
+      mnemonic = "sbc";
+      if (rn_is_zr) {
+        mnemonic = "ngc";
+        form = form_neg;
+      }
+      break;
+    }
+    case SBCS_w:
+    case SBCS_x: {
+      mnemonic = "sbcs";
+      if (rn_is_zr) {
+        mnemonic = "ngcs";
+        form = form_neg;
+      }
+      break;
+    }
+    default: VIXL_UNREACHABLE();
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitLogicalImmediate(const Instruction* instr) {
+  bool rd_is_zr = RdIsZROrSP(instr);
+  bool rn_is_zr = RnIsZROrSP(instr);
+  const char *mnemonic = "";
+  const char *form = "'Rds, 'Rn, 'ITri";
+
+  if (instr->ImmLogical() == 0) {
+    // The immediate encoded in the instruction is not in the expected format.
+    Format(instr, "unallocated", "(LogicalImmediate)");
+    return;
+  }
+
+  switch (instr->Mask(LogicalImmediateMask)) {
+    case AND_w_imm:
+    case AND_x_imm: mnemonic = "and"; break;
+    case ORR_w_imm:
+    case ORR_x_imm: {
+      mnemonic = "orr";
+      unsigned reg_size = (instr->SixtyFourBits() == 1) ? kXRegSize
+                                                        : kWRegSize;
+      if (rn_is_zr && !IsMovzMovnImm(reg_size, instr->ImmLogical())) {
+        mnemonic = "mov";
+        form = "'Rds, 'ITri";
+      }
+      break;
+    }
+    case EOR_w_imm:
+    case EOR_x_imm: mnemonic = "eor"; break;
+    case ANDS_w_imm:
+    case ANDS_x_imm: {
+      mnemonic = "ands";
+      if (rd_is_zr) {
+        mnemonic = "tst";
+        form = "'Rn, 'ITri";
+      }
+      break;
+    }
+    default: VIXL_UNREACHABLE();
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+bool Disassembler::IsMovzMovnImm(unsigned reg_size, uint64_t value) {
+  VIXL_ASSERT((reg_size == kXRegSize) ||
+              ((reg_size == kWRegSize) && (value <= 0xffffffff)));
+
+  // Test for movz: 16 bits set at positions 0, 16, 32 or 48.
+  if (((value & UINT64_C(0xffffffffffff0000)) == 0) ||
+      ((value & UINT64_C(0xffffffff0000ffff)) == 0) ||
+      ((value & UINT64_C(0xffff0000ffffffff)) == 0) ||
+      ((value & UINT64_C(0x0000ffffffffffff)) == 0)) {
+    return true;
+  }
+
+  // Test for movn: NOT(16 bits set at positions 0, 16, 32 or 48).
+  if ((reg_size == kXRegSize) &&
+      (((~value & UINT64_C(0xffffffffffff0000)) == 0) ||
+       ((~value & UINT64_C(0xffffffff0000ffff)) == 0) ||
+       ((~value & UINT64_C(0xffff0000ffffffff)) == 0) ||
+       ((~value & UINT64_C(0x0000ffffffffffff)) == 0))) {
+    return true;
+  }
+  if ((reg_size == kWRegSize) &&
+      (((value & 0xffff0000) == 0xffff0000) ||
+       ((value & 0x0000ffff) == 0x0000ffff))) {
+    return true;
+  }
+  return false;
+}
+
+
+void Disassembler::VisitLogicalShifted(const Instruction* instr) {
+  bool rd_is_zr = RdIsZROrSP(instr);
+  bool rn_is_zr = RnIsZROrSP(instr);
+  const char *mnemonic = "";
+  const char *form = "'Rd, 'Rn, 'Rm'HLo";
+
+  switch (instr->Mask(LogicalShiftedMask)) {
+    case AND_w:
+    case AND_x: mnemonic = "and"; break;
+    case BIC_w:
+    case BIC_x: mnemonic = "bic"; break;
+    case EOR_w:
+    case EOR_x: mnemonic = "eor"; break;
+    case EON_w:
+    case EON_x: mnemonic = "eon"; break;
+    case BICS_w:
+    case BICS_x: mnemonic = "bics"; break;
+    case ANDS_w:
+    case ANDS_x: {
+      mnemonic = "ands";
+      if (rd_is_zr) {
+        mnemonic = "tst";
+        form = "'Rn, 'Rm'HLo";
+      }
+      break;
+    }
+    case ORR_w:
+    case ORR_x: {
+      mnemonic = "orr";
+      if (rn_is_zr && (instr->ImmDPShift() == 0) && (instr->ShiftDP() == LSL)) {
+        mnemonic = "mov";
+        form = "'Rd, 'Rm";
+      }
+      break;
+    }
+    case ORN_w:
+    case ORN_x: {
+      mnemonic = "orn";
+      if (rn_is_zr) {
+        mnemonic = "mvn";
+        form = "'Rd, 'Rm'HLo";
+      }
+      break;
+    }
+    default: VIXL_UNREACHABLE();
+  }
+
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitConditionalCompareRegister(const Instruction* instr) {
+  const char *mnemonic = "";
+  const char *form = "'Rn, 'Rm, 'INzcv, 'Cond";
+
+  switch (instr->Mask(ConditionalCompareRegisterMask)) {
+    case CCMN_w:
+    case CCMN_x: mnemonic = "ccmn"; break;
+    case CCMP_w:
+    case CCMP_x: mnemonic = "ccmp"; break;
+    default: VIXL_UNREACHABLE();
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitConditionalCompareImmediate(const Instruction* instr) {
+  const char *mnemonic = "";
+  const char *form = "'Rn, 'IP, 'INzcv, 'Cond";
+
+  switch (instr->Mask(ConditionalCompareImmediateMask)) {
+    case CCMN_w_imm:
+    case CCMN_x_imm: mnemonic = "ccmn"; break;
+    case CCMP_w_imm:
+    case CCMP_x_imm: mnemonic = "ccmp"; break;
+    default: VIXL_UNREACHABLE();
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitConditionalSelect(const Instruction* instr) {
+  bool rnm_is_zr = (RnIsZROrSP(instr) && RmIsZROrSP(instr));
+  bool rn_is_rm = (instr->Rn() == instr->Rm());
+  const char *mnemonic = "";
+  const char *form = "'Rd, 'Rn, 'Rm, 'Cond";
+  const char *form_test = "'Rd, 'CInv";
+  const char *form_update = "'Rd, 'Rn, 'CInv";
+
+  Condition cond = static_cast<Condition>(instr->Condition());
+  bool invertible_cond = (cond != al) && (cond != nv);
+
+  switch (instr->Mask(ConditionalSelectMask)) {
+    case CSEL_w:
+    case CSEL_x: mnemonic = "csel"; break;
+    case CSINC_w:
+    case CSINC_x: {
+      mnemonic = "csinc";
+      if (rnm_is_zr && invertible_cond) {
+        mnemonic = "cset";
+        form = form_test;
+      } else if (rn_is_rm && invertible_cond) {
+        mnemonic = "cinc";
+        form = form_update;
+      }
+      break;
+    }
+    case CSINV_w:
+    case CSINV_x: {
+      mnemonic = "csinv";
+      if (rnm_is_zr && invertible_cond) {
+        mnemonic = "csetm";
+        form = form_test;
+      } else if (rn_is_rm && invertible_cond) {
+        mnemonic = "cinv";
+        form = form_update;
+      }
+      break;
+    }
+    case CSNEG_w:
+    case CSNEG_x: {
+      mnemonic = "csneg";
+      if (rn_is_rm && invertible_cond) {
+        mnemonic = "cneg";
+        form = form_update;
+      }
+      break;
+    }
+    default: VIXL_UNREACHABLE();
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitBitfield(const Instruction* instr) {
+  unsigned s = instr->ImmS();
+  unsigned r = instr->ImmR();
+  unsigned rd_size_minus_1 =
+    ((instr->SixtyFourBits() == 1) ? kXRegSize : kWRegSize) - 1;
+  const char *mnemonic = "";
+  const char *form = "";
+  const char *form_shift_right = "'Rd, 'Rn, 'IBr";
+  const char *form_extend = "'Rd, 'Wn";
+  const char *form_bfiz = "'Rd, 'Rn, 'IBZ-r, 'IBs+1";
+  const char *form_bfx = "'Rd, 'Rn, 'IBr, 'IBs-r+1";
+  const char *form_lsl = "'Rd, 'Rn, 'IBZ-r";
+
+  switch (instr->Mask(BitfieldMask)) {
+    case SBFM_w:
+    case SBFM_x: {
+      mnemonic = "sbfx";
+      form = form_bfx;
+      if (r == 0) {
+        form = form_extend;
+        if (s == 7) {
+          mnemonic = "sxtb";
+        } else if (s == 15) {
+          mnemonic = "sxth";
+        } else if ((s == 31) && (instr->SixtyFourBits() == 1)) {
+          mnemonic = "sxtw";
+        } else {
+          form = form_bfx;
+        }
+      } else if (s == rd_size_minus_1) {
+        mnemonic = "asr";
+        form = form_shift_right;
+      } else if (s < r) {
+        mnemonic = "sbfiz";
+        form = form_bfiz;
+      }
+      break;
+    }
+    case UBFM_w:
+    case UBFM_x: {
+      mnemonic = "ubfx";
+      form = form_bfx;
+      if (r == 0) {
+        form = form_extend;
+        if (s == 7) {
+          mnemonic = "uxtb";
+        } else if (s == 15) {
+          mnemonic = "uxth";
+        } else {
+          form = form_bfx;
+        }
+      }
+      if (s == rd_size_minus_1) {
+        mnemonic = "lsr";
+        form = form_shift_right;
+      } else if (r == s + 1) {
+        mnemonic = "lsl";
+        form = form_lsl;
+      } else if (s < r) {
+        mnemonic = "ubfiz";
+        form = form_bfiz;
+      }
+      break;
+    }
+    case BFM_w:
+    case BFM_x: {
+      mnemonic = "bfxil";
+      form = form_bfx;
+      if (s < r) {
+        mnemonic = "bfi";
+        form = form_bfiz;
+      }
+    }
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitExtract(const Instruction* instr) {
+  const char *mnemonic = "";
+  const char *form = "'Rd, 'Rn, 'Rm, 'IExtract";
+
+  switch (instr->Mask(ExtractMask)) {
+    case EXTR_w:
+    case EXTR_x: {
+      if (instr->Rn() == instr->Rm()) {
+        mnemonic = "ror";
+        form = "'Rd, 'Rn, 'IExtract";
+      } else {
+        mnemonic = "extr";
+      }
+      break;
+    }
+    default: VIXL_UNREACHABLE();
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitPCRelAddressing(const Instruction* instr) {
+  switch (instr->Mask(PCRelAddressingMask)) {
+    case ADR: Format(instr, "adr", "'Xd, 'AddrPCRelByte"); break;
+    case ADRP: Format(instr, "adrp", "'Xd, 'AddrPCRelPage"); break;
+    default: Format(instr, "unimplemented", "(PCRelAddressing)");
+  }
+}
+
+
+void Disassembler::VisitConditionalBranch(const Instruction* instr) {
+  switch (instr->Mask(ConditionalBranchMask)) {
+    case B_cond: Format(instr, "b.'CBrn", "'BImmCond"); break;
+    default: VIXL_UNREACHABLE();
+  }
+}
+
+
+void Disassembler::VisitUnconditionalBranchToRegister(
+    const Instruction* instr) {
+  const char *mnemonic = "unimplemented";
+  const char *form = "'Xn";
+
+  switch (instr->Mask(UnconditionalBranchToRegisterMask)) {
+    case BR: mnemonic = "br"; break;
+    case BLR: mnemonic = "blr"; break;
+    case RET: {
+      mnemonic = "ret";
+      if (instr->Rn() == kLinkRegCode) {
+        form = NULL;
+      }
+      break;
+    }
+    default: form = "(UnconditionalBranchToRegister)";
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitUnconditionalBranch(const Instruction* instr) {
+  const char *mnemonic = "";
+  const char *form = "'BImmUncn";
+
+  switch (instr->Mask(UnconditionalBranchMask)) {
+    case B: mnemonic = "b"; break;
+    case BL: mnemonic = "bl"; break;
+    default: VIXL_UNREACHABLE();
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitDataProcessing1Source(const Instruction* instr) {
+  const char *mnemonic = "";
+  const char *form = "'Rd, 'Rn";
+
+  switch (instr->Mask(DataProcessing1SourceMask)) {
+    #define FORMAT(A, B)  \
+    case A##_w:           \
+    case A##_x: mnemonic = B; break;
+    FORMAT(RBIT, "rbit");
+    FORMAT(REV16, "rev16");
+    FORMAT(REV, "rev");
+    FORMAT(CLZ, "clz");
+    FORMAT(CLS, "cls");
+    #undef FORMAT
+    case REV32_x: mnemonic = "rev32"; break;
+    default: VIXL_UNREACHABLE();
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitDataProcessing2Source(const Instruction* instr) {
+  const char *mnemonic = "unimplemented";
+  const char *form = "'Rd, 'Rn, 'Rm";
+
+  switch (instr->Mask(DataProcessing2SourceMask)) {
+    #define FORMAT(A, B)  \
+    case A##_w:           \
+    case A##_x: mnemonic = B; break;
+    FORMAT(UDIV, "udiv");
+    FORMAT(SDIV, "sdiv");
+    FORMAT(LSLV, "lsl");
+    FORMAT(LSRV, "lsr");
+    FORMAT(ASRV, "asr");
+    FORMAT(RORV, "ror");
+    #undef FORMAT
+    default: form = "(DataProcessing2Source)";
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitDataProcessing3Source(const Instruction* instr) {
+  bool ra_is_zr = RaIsZROrSP(instr);
+  const char *mnemonic = "";
+  const char *form = "'Xd, 'Wn, 'Wm, 'Xa";
+  const char *form_rrr = "'Rd, 'Rn, 'Rm";
+  const char *form_rrrr = "'Rd, 'Rn, 'Rm, 'Ra";
+  const char *form_xww = "'Xd, 'Wn, 'Wm";
+  const char *form_xxx = "'Xd, 'Xn, 'Xm";
+
+  switch (instr->Mask(DataProcessing3SourceMask)) {
+    case MADD_w:
+    case MADD_x: {
+      mnemonic = "madd";
+      form = form_rrrr;
+      if (ra_is_zr) {
+        mnemonic = "mul";
+        form = form_rrr;
+      }
+      break;
+    }
+    case MSUB_w:
+    case MSUB_x: {
+      mnemonic = "msub";
+      form = form_rrrr;
+      if (ra_is_zr) {
+        mnemonic = "mneg";
+        form = form_rrr;
+      }
+      break;
+    }
+    case SMADDL_x: {
+      mnemonic = "smaddl";
+      if (ra_is_zr) {
+        mnemonic = "smull";
+        form = form_xww;
+      }
+      break;
+    }
+    case SMSUBL_x: {
+      mnemonic = "smsubl";
+      if (ra_is_zr) {
+        mnemonic = "smnegl";
+        form = form_xww;
+      }
+      break;
+    }
+    case UMADDL_x: {
+      mnemonic = "umaddl";
+      if (ra_is_zr) {
+        mnemonic = "umull";
+        form = form_xww;
+      }
+      break;
+    }
+    case UMSUBL_x: {
+      mnemonic = "umsubl";
+      if (ra_is_zr) {
+        mnemonic = "umnegl";
+        form = form_xww;
+      }
+      break;
+    }
+    case SMULH_x: {
+      mnemonic = "smulh";
+      form = form_xxx;
+      break;
+    }
+    case UMULH_x: {
+      mnemonic = "umulh";
+      form = form_xxx;
+      break;
+    }
+    default: VIXL_UNREACHABLE();
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitCompareBranch(const Instruction* instr) {
+  const char *mnemonic = "";
+  const char *form = "'Rt, 'BImmCmpa";
+
+  switch (instr->Mask(CompareBranchMask)) {
+    case CBZ_w:
+    case CBZ_x: mnemonic = "cbz"; break;
+    case CBNZ_w:
+    case CBNZ_x: mnemonic = "cbnz"; break;
+    default: VIXL_UNREACHABLE();
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitTestBranch(const Instruction* instr) {
+  const char *mnemonic = "";
+  // If the top bit of the immediate is clear, the tested register is
+  // disassembled as Wt, otherwise Xt. As the top bit of the immediate is
+  // encoded in bit 31 of the instruction, we can reuse the Rt form, which
+  // uses bit 31 (normally "sf") to choose the register size.
+  const char *form = "'Rt, 'IS, 'BImmTest";
+
+  switch (instr->Mask(TestBranchMask)) {
+    case TBZ: mnemonic = "tbz"; break;
+    case TBNZ: mnemonic = "tbnz"; break;
+    default: VIXL_UNREACHABLE();
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitMoveWideImmediate(const Instruction* instr) {
+  const char *mnemonic = "";
+  const char *form = "'Rd, 'IMoveImm";
+
+  // Print the shift separately for movk, to make it clear which half word will
+  // be overwritten. Movn and movz print the computed immediate, which includes
+  // shift calculation.
+  switch (instr->Mask(MoveWideImmediateMask)) {
+    case MOVN_w:
+    case MOVN_x:
+      if ((instr->ImmMoveWide()) || (instr->ShiftMoveWide() == 0)) {
+        if ((instr->SixtyFourBits() == 0) && (instr->ImmMoveWide() == 0xffff)) {
+          mnemonic = "movn";
+        } else {
+          mnemonic = "mov";
+          form = "'Rd, 'IMoveNeg";
+        }
+      } else {
+        mnemonic = "movn";
+      }
+      break;
+    case MOVZ_w:
+    case MOVZ_x:
+      if ((instr->ImmMoveWide()) || (instr->ShiftMoveWide() == 0))
+        mnemonic = "mov";
+      else
+        mnemonic = "movz";
+      break;
+    case MOVK_w:
+    case MOVK_x: mnemonic = "movk"; form = "'Rd, 'IMoveLSL"; break;
+    default: VIXL_UNREACHABLE();
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+#define LOAD_STORE_LIST(V)    \
+  V(STRB_w, "strb", "'Wt")    \
+  V(STRH_w, "strh", "'Wt")    \
+  V(STR_w, "str", "'Wt")      \
+  V(STR_x, "str", "'Xt")      \
+  V(LDRB_w, "ldrb", "'Wt")    \
+  V(LDRH_w, "ldrh", "'Wt")    \
+  V(LDR_w, "ldr", "'Wt")      \
+  V(LDR_x, "ldr", "'Xt")      \
+  V(LDRSB_x, "ldrsb", "'Xt")  \
+  V(LDRSH_x, "ldrsh", "'Xt")  \
+  V(LDRSW_x, "ldrsw", "'Xt")  \
+  V(LDRSB_w, "ldrsb", "'Wt")  \
+  V(LDRSH_w, "ldrsh", "'Wt")  \
+  V(STR_s, "str", "'St")      \
+  V(STR_d, "str", "'Dt")      \
+  V(LDR_s, "ldr", "'St")      \
+  V(LDR_d, "ldr", "'Dt")
+
+void Disassembler::VisitLoadStorePreIndex(const Instruction* instr) {
+  const char *mnemonic = "unimplemented";
+  const char *form = "(LoadStorePreIndex)";
+
+  switch (instr->Mask(LoadStorePreIndexMask)) {
+    #define LS_PREINDEX(A, B, C) \
+    case A##_pre: mnemonic = B; form = C ", ['Xns'ILS]!"; break;
+    LOAD_STORE_LIST(LS_PREINDEX)
+    #undef LS_PREINDEX
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitLoadStorePostIndex(const Instruction* instr) {
+  const char *mnemonic = "unimplemented";
+  const char *form = "(LoadStorePostIndex)";
+
+  switch (instr->Mask(LoadStorePostIndexMask)) {
+    #define LS_POSTINDEX(A, B, C) \
+    case A##_post: mnemonic = B; form = C ", ['Xns]'ILS"; break;
+    LOAD_STORE_LIST(LS_POSTINDEX)
+    #undef LS_POSTINDEX
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitLoadStoreUnsignedOffset(const Instruction* instr) {
+  const char *mnemonic = "unimplemented";
+  const char *form = "(LoadStoreUnsignedOffset)";
+
+  switch (instr->Mask(LoadStoreUnsignedOffsetMask)) {
+    #define LS_UNSIGNEDOFFSET(A, B, C) \
+    case A##_unsigned: mnemonic = B; form = C ", ['Xns'ILU]"; break;
+    LOAD_STORE_LIST(LS_UNSIGNEDOFFSET)
+    #undef LS_UNSIGNEDOFFSET
+    case PRFM_unsigned: mnemonic = "prfm"; form = "'PrefOp, ['Xns'ILU]";
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitLoadStoreRegisterOffset(const Instruction* instr) {
+  const char *mnemonic = "unimplemented";
+  const char *form = "(LoadStoreRegisterOffset)";
+
+  switch (instr->Mask(LoadStoreRegisterOffsetMask)) {
+    #define LS_REGISTEROFFSET(A, B, C) \
+    case A##_reg: mnemonic = B; form = C ", ['Xns, 'Offsetreg]"; break;
+    LOAD_STORE_LIST(LS_REGISTEROFFSET)
+    #undef LS_REGISTEROFFSET
+    case PRFM_reg: mnemonic = "prfm"; form = "'PrefOp, ['Xns, 'Offsetreg]";
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitLoadStoreUnscaledOffset(const Instruction* instr) {
+  const char *mnemonic = "unimplemented";
+  const char *form = "'Wt, ['Xns'ILS]";
+  const char *form_x = "'Xt, ['Xns'ILS]";
+  const char *form_s = "'St, ['Xns'ILS]";
+  const char *form_d = "'Dt, ['Xns'ILS]";
+  const char *form_prefetch = "'PrefOp, ['Xns'ILS]";
+
+  switch (instr->Mask(LoadStoreUnscaledOffsetMask)) {
+    case STURB_w:  mnemonic = "sturb"; break;
+    case STURH_w:  mnemonic = "sturh"; break;
+    case STUR_w:   mnemonic = "stur"; break;
+    case STUR_x:   mnemonic = "stur"; form = form_x; break;
+    case STUR_s:   mnemonic = "stur"; form = form_s; break;
+    case STUR_d:   mnemonic = "stur"; form = form_d; break;
+    case LDURB_w:  mnemonic = "ldurb"; break;
+    case LDURH_w:  mnemonic = "ldurh"; break;
+    case LDUR_w:   mnemonic = "ldur"; break;
+    case LDUR_x:   mnemonic = "ldur"; form = form_x; break;
+    case LDUR_s:   mnemonic = "ldur"; form = form_s; break;
+    case LDUR_d:   mnemonic = "ldur"; form = form_d; break;
+    case LDURSB_x: form = form_x;  // Fall through.
+    case LDURSB_w: mnemonic = "ldursb"; break;
+    case LDURSH_x: form = form_x;  // Fall through.
+    case LDURSH_w: mnemonic = "ldursh"; break;
+    case LDURSW_x: mnemonic = "ldursw"; form = form_x; break;
+    case PRFUM:    mnemonic = "prfum"; form = form_prefetch; break;
+    default: form = "(LoadStoreUnscaledOffset)";
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitLoadLiteral(const Instruction* instr) {
+  const char *mnemonic = "ldr";
+  const char *form = "(LoadLiteral)";
+
+  switch (instr->Mask(LoadLiteralMask)) {
+    case LDR_w_lit: form = "'Wt, 'ILLiteral 'LValue"; break;
+    case LDR_x_lit: form = "'Xt, 'ILLiteral 'LValue"; break;
+    case LDR_s_lit: form = "'St, 'ILLiteral 'LValue"; break;
+    case LDR_d_lit: form = "'Dt, 'ILLiteral 'LValue"; break;
+    case LDRSW_x_lit: {
+      mnemonic = "ldrsw";
+      form = "'Xt, 'ILLiteral 'LValue";
+      break;
+    }
+    case PRFM_lit: {
+      mnemonic = "prfm";
+      form = "'PrefOp, 'ILLiteral 'LValue";
+      break;
+    }
+    default: mnemonic = "unimplemented";
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+#define LOAD_STORE_PAIR_LIST(V)         \
+  V(STP_w, "stp", "'Wt, 'Wt2", "4")     \
+  V(LDP_w, "ldp", "'Wt, 'Wt2", "4")     \
+  V(LDPSW_x, "ldpsw", "'Xt, 'Xt2", "4") \
+  V(STP_x, "stp", "'Xt, 'Xt2", "8")     \
+  V(LDP_x, "ldp", "'Xt, 'Xt2", "8")     \
+  V(STP_s, "stp", "'St, 'St2", "4")     \
+  V(LDP_s, "ldp", "'St, 'St2", "4")     \
+  V(STP_d, "stp", "'Dt, 'Dt2", "8")     \
+  V(LDP_d, "ldp", "'Dt, 'Dt2", "8")
+
+void Disassembler::VisitLoadStorePairPostIndex(const Instruction* instr) {
+  const char *mnemonic = "unimplemented";
+  const char *form = "(LoadStorePairPostIndex)";
+
+  switch (instr->Mask(LoadStorePairPostIndexMask)) {
+    #define LSP_POSTINDEX(A, B, C, D) \
+    case A##_post: mnemonic = B; form = C ", ['Xns]'ILP" D; break;
+    LOAD_STORE_PAIR_LIST(LSP_POSTINDEX)
+    #undef LSP_POSTINDEX
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitLoadStorePairPreIndex(const Instruction* instr) {
+  const char *mnemonic = "unimplemented";
+  const char *form = "(LoadStorePairPreIndex)";
+
+  switch (instr->Mask(LoadStorePairPreIndexMask)) {
+    #define LSP_PREINDEX(A, B, C, D) \
+    case A##_pre: mnemonic = B; form = C ", ['Xns'ILP" D "]!"; break;
+    LOAD_STORE_PAIR_LIST(LSP_PREINDEX)
+    #undef LSP_PREINDEX
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitLoadStorePairOffset(const Instruction* instr) {
+  const char *mnemonic = "unimplemented";
+  const char *form = "(LoadStorePairOffset)";
+
+  switch (instr->Mask(LoadStorePairOffsetMask)) {
+    #define LSP_OFFSET(A, B, C, D) \
+    case A##_off: mnemonic = B; form = C ", ['Xns'ILP" D "]"; break;
+    LOAD_STORE_PAIR_LIST(LSP_OFFSET)
+    #undef LSP_OFFSET
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitLoadStorePairNonTemporal(const Instruction* instr) {
+  const char *mnemonic = "unimplemented";
+  const char *form;
+
+  switch (instr->Mask(LoadStorePairNonTemporalMask)) {
+    case STNP_w: mnemonic = "stnp"; form = "'Wt, 'Wt2, ['Xns'ILP4]"; break;
+    case LDNP_w: mnemonic = "ldnp"; form = "'Wt, 'Wt2, ['Xns'ILP4]"; break;
+    case STNP_x: mnemonic = "stnp"; form = "'Xt, 'Xt2, ['Xns'ILP8]"; break;
+    case LDNP_x: mnemonic = "ldnp"; form = "'Xt, 'Xt2, ['Xns'ILP8]"; break;
+    case STNP_s: mnemonic = "stnp"; form = "'St, 'St2, ['Xns'ILP4]"; break;
+    case LDNP_s: mnemonic = "ldnp"; form = "'St, 'St2, ['Xns'ILP4]"; break;
+    case STNP_d: mnemonic = "stnp"; form = "'Dt, 'Dt2, ['Xns'ILP8]"; break;
+    case LDNP_d: mnemonic = "ldnp"; form = "'Dt, 'Dt2, ['Xns'ILP8]"; break;
+    default: form = "(LoadStorePairNonTemporal)";
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitLoadStoreExclusive(const Instruction* instr) {
+  const char *mnemonic = "unimplemented";
+  const char *form;
+
+  switch (instr->Mask(LoadStoreExclusiveMask)) {
+    case STXRB_w: mnemonic = "stxrb"; form = "'Ws, 'Wt, ['Xns]"; break;
+    case STXRH_w: mnemonic = "stxrh"; form = "'Ws, 'Wt, ['Xns]"; break;
+    case STXR_w: mnemonic = "stxr"; form = "'Ws, 'Wt, ['Xns]"; break;
+    case STXR_x: mnemonic = "stxr"; form = "'Ws, 'Xt, ['Xns]"; break;
+    case LDXRB_w: mnemonic = "ldxrb"; form = "'Wt, ['Xns]"; break;
+    case LDXRH_w: mnemonic = "ldxrh"; form = "'Wt, ['Xns]"; break;
+    case LDXR_w: mnemonic = "ldxr"; form = "'Wt, ['Xns]"; break;
+    case LDXR_x: mnemonic = "ldxr"; form = "'Xt, ['Xns]"; break;
+    case STXP_w: mnemonic = "stxp"; form = "'Ws, 'Wt, 'Wt2, ['Xns]"; break;
+    case STXP_x: mnemonic = "stxp"; form = "'Ws, 'Xt, 'Xt2, ['Xns]"; break;
+    case LDXP_w: mnemonic = "ldxp"; form = "'Wt, 'Wt2, ['Xns]"; break;
+    case LDXP_x: mnemonic = "ldxp"; form = "'Xt, 'Xt2, ['Xns]"; break;
+    case STLXRB_w: mnemonic = "stlxrb"; form = "'Ws, 'Wt, ['Xns]"; break;
+    case STLXRH_w: mnemonic = "stlxrh"; form = "'Ws, 'Wt, ['Xns]"; break;
+    case STLXR_w: mnemonic = "stlxr"; form = "'Ws, 'Wt, ['Xns]"; break;
+    case STLXR_x: mnemonic = "stlxr"; form = "'Ws, 'Xt, ['Xns]"; break;
+    case LDAXRB_w: mnemonic = "ldaxrb"; form = "'Wt, ['Xns]"; break;
+    case LDAXRH_w: mnemonic = "ldaxrh"; form = "'Wt, ['Xns]"; break;
+    case LDAXR_w: mnemonic = "ldaxr"; form = "'Wt, ['Xns]"; break;
+    case LDAXR_x: mnemonic = "ldaxr"; form = "'Xt, ['Xns]"; break;
+    case STLXP_w: mnemonic = "stlxp"; form = "'Ws, 'Wt, 'Wt2, ['Xns]"; break;
+    case STLXP_x: mnemonic = "stlxp"; form = "'Ws, 'Xt, 'Xt2, ['Xns]"; break;
+    case LDAXP_w: mnemonic = "ldaxp"; form = "'Wt, 'Wt2, ['Xns]"; break;
+    case LDAXP_x: mnemonic = "ldaxp"; form = "'Xt, 'Xt2, ['Xns]"; break;
+    case STLRB_w: mnemonic = "stlrb"; form = "'Wt, ['Xns]"; break;
+    case STLRH_w: mnemonic = "stlrh"; form = "'Wt, ['Xns]"; break;
+    case STLR_w: mnemonic = "stlr"; form = "'Wt, ['Xns]"; break;
+    case STLR_x: mnemonic = "stlr"; form = "'Xt, ['Xns]"; break;
+    case LDARB_w: mnemonic = "ldarb"; form = "'Wt, ['Xns]"; break;
+    case LDARH_w: mnemonic = "ldarh"; form = "'Wt, ['Xns]"; break;
+    case LDAR_w: mnemonic = "ldar"; form = "'Wt, ['Xns]"; break;
+    case LDAR_x: mnemonic = "ldar"; form = "'Xt, ['Xns]"; break;
+    default: form = "(LoadStoreExclusive)";
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitFPCompare(const Instruction* instr) {
+  const char *mnemonic = "unimplemented";
+  const char *form = "'Fn, 'Fm";
+  const char *form_zero = "'Fn, #0.0";
+
+  switch (instr->Mask(FPCompareMask)) {
+    case FCMP_s_zero:
+    case FCMP_d_zero: form = form_zero;  // Fall through.
+    case FCMP_s:
+    case FCMP_d: mnemonic = "fcmp"; break;
+    default: form = "(FPCompare)";
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitFPConditionalCompare(const Instruction* instr) {
+  const char *mnemonic = "unmplemented";
+  const char *form = "'Fn, 'Fm, 'INzcv, 'Cond";
+
+  switch (instr->Mask(FPConditionalCompareMask)) {
+    case FCCMP_s:
+    case FCCMP_d: mnemonic = "fccmp"; break;
+    case FCCMPE_s:
+    case FCCMPE_d: mnemonic = "fccmpe"; break;
+    default: form = "(FPConditionalCompare)";
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitFPConditionalSelect(const Instruction* instr) {
+  const char *mnemonic = "";
+  const char *form = "'Fd, 'Fn, 'Fm, 'Cond";
+
+  switch (instr->Mask(FPConditionalSelectMask)) {
+    case FCSEL_s:
+    case FCSEL_d: mnemonic = "fcsel"; break;
+    default: VIXL_UNREACHABLE();
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitFPDataProcessing1Source(const Instruction* instr) {
+  const char *mnemonic = "unimplemented";
+  const char *form = "'Fd, 'Fn";
+
+  switch (instr->Mask(FPDataProcessing1SourceMask)) {
+    #define FORMAT(A, B)  \
+    case A##_s:           \
+    case A##_d: mnemonic = B; break;
+    FORMAT(FMOV, "fmov");
+    FORMAT(FABS, "fabs");
+    FORMAT(FNEG, "fneg");
+    FORMAT(FSQRT, "fsqrt");
+    FORMAT(FRINTN, "frintn");
+    FORMAT(FRINTP, "frintp");
+    FORMAT(FRINTM, "frintm");
+    FORMAT(FRINTZ, "frintz");
+    FORMAT(FRINTA, "frinta");
+    FORMAT(FRINTX, "frintx");
+    FORMAT(FRINTI, "frinti");
+    #undef FORMAT
+    case FCVT_ds: mnemonic = "fcvt"; form = "'Dd, 'Sn"; break;
+    case FCVT_sd: mnemonic = "fcvt"; form = "'Sd, 'Dn"; break;
+    default: form = "(FPDataProcessing1Source)";
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitFPDataProcessing2Source(const Instruction* instr) {
+  const char *mnemonic = "";
+  const char *form = "'Fd, 'Fn, 'Fm";
+
+  switch (instr->Mask(FPDataProcessing2SourceMask)) {
+    #define FORMAT(A, B)  \
+    case A##_s:           \
+    case A##_d: mnemonic = B; break;
+    FORMAT(FMUL, "fmul");
+    FORMAT(FDIV, "fdiv");
+    FORMAT(FADD, "fadd");
+    FORMAT(FSUB, "fsub");
+    FORMAT(FMAX, "fmax");
+    FORMAT(FMIN, "fmin");
+    FORMAT(FMAXNM, "fmaxnm");
+    FORMAT(FMINNM, "fminnm");
+    FORMAT(FNMUL, "fnmul");
+    #undef FORMAT
+    default: VIXL_UNREACHABLE();
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitFPDataProcessing3Source(const Instruction* instr) {
+  const char *mnemonic = "";
+  const char *form = "'Fd, 'Fn, 'Fm, 'Fa";
+
+  switch (instr->Mask(FPDataProcessing3SourceMask)) {
+    #define FORMAT(A, B)  \
+    case A##_s:           \
+    case A##_d: mnemonic = B; break;
+    FORMAT(FMADD, "fmadd");
+    FORMAT(FMSUB, "fmsub");
+    FORMAT(FNMADD, "fnmadd");
+    FORMAT(FNMSUB, "fnmsub");
+    #undef FORMAT
+    default: VIXL_UNREACHABLE();
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitFPImmediate(const Instruction* instr) {
+  const char *mnemonic = "";
+  const char *form = "(FPImmediate)";
+
+  switch (instr->Mask(FPImmediateMask)) {
+    case FMOV_s_imm: mnemonic = "fmov"; form = "'Sd, 'IFPSingle"; break;
+    case FMOV_d_imm: mnemonic = "fmov"; form = "'Dd, 'IFPDouble"; break;
+    default: VIXL_UNREACHABLE();
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitFPIntegerConvert(const Instruction* instr) {
+  const char *mnemonic = "unimplemented";
+  const char *form = "(FPIntegerConvert)";
+  const char *form_rf = "'Rd, 'Fn";
+  const char *form_fr = "'Fd, 'Rn";
+
+  switch (instr->Mask(FPIntegerConvertMask)) {
+    case FMOV_ws:
+    case FMOV_xd: mnemonic = "fmov"; form = form_rf; break;
+    case FMOV_sw:
+    case FMOV_dx: mnemonic = "fmov"; form = form_fr; break;
+    case FCVTAS_ws:
+    case FCVTAS_xs:
+    case FCVTAS_wd:
+    case FCVTAS_xd: mnemonic = "fcvtas"; form = form_rf; break;
+    case FCVTAU_ws:
+    case FCVTAU_xs:
+    case FCVTAU_wd:
+    case FCVTAU_xd: mnemonic = "fcvtau"; form = form_rf; break;
+    case FCVTMS_ws:
+    case FCVTMS_xs:
+    case FCVTMS_wd:
+    case FCVTMS_xd: mnemonic = "fcvtms"; form = form_rf; break;
+    case FCVTMU_ws:
+    case FCVTMU_xs:
+    case FCVTMU_wd:
+    case FCVTMU_xd: mnemonic = "fcvtmu"; form = form_rf; break;
+    case FCVTNS_ws:
+    case FCVTNS_xs:
+    case FCVTNS_wd:
+    case FCVTNS_xd: mnemonic = "fcvtns"; form = form_rf; break;
+    case FCVTNU_ws:
+    case FCVTNU_xs:
+    case FCVTNU_wd:
+    case FCVTNU_xd: mnemonic = "fcvtnu"; form = form_rf; break;
+    case FCVTZU_xd:
+    case FCVTZU_ws:
+    case FCVTZU_wd:
+    case FCVTZU_xs: mnemonic = "fcvtzu"; form = form_rf; break;
+    case FCVTZS_xd:
+    case FCVTZS_wd:
+    case FCVTZS_xs:
+    case FCVTZS_ws: mnemonic = "fcvtzs"; form = form_rf; break;
+    case SCVTF_sw:
+    case SCVTF_sx:
+    case SCVTF_dw:
+    case SCVTF_dx: mnemonic = "scvtf"; form = form_fr; break;
+    case UCVTF_sw:
+    case UCVTF_sx:
+    case UCVTF_dw:
+    case UCVTF_dx: mnemonic = "ucvtf"; form = form_fr; break;
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitFPFixedPointConvert(const Instruction* instr) {
+  const char *mnemonic = "";
+  const char *form = "'Rd, 'Fn, 'IFPFBits";
+  const char *form_fr = "'Fd, 'Rn, 'IFPFBits";
+
+  switch (instr->Mask(FPFixedPointConvertMask)) {
+    case FCVTZS_ws_fixed:
+    case FCVTZS_xs_fixed:
+    case FCVTZS_wd_fixed:
+    case FCVTZS_xd_fixed: mnemonic = "fcvtzs"; break;
+    case FCVTZU_ws_fixed:
+    case FCVTZU_xs_fixed:
+    case FCVTZU_wd_fixed:
+    case FCVTZU_xd_fixed: mnemonic = "fcvtzu"; break;
+    case SCVTF_sw_fixed:
+    case SCVTF_sx_fixed:
+    case SCVTF_dw_fixed:
+    case SCVTF_dx_fixed: mnemonic = "scvtf"; form = form_fr; break;
+    case UCVTF_sw_fixed:
+    case UCVTF_sx_fixed:
+    case UCVTF_dw_fixed:
+    case UCVTF_dx_fixed: mnemonic = "ucvtf"; form = form_fr; break;
+    default: VIXL_UNREACHABLE();
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitSystem(const Instruction* instr) {
+  // Some system instructions hijack their Op and Cp fields to represent a
+  // range of immediates instead of indicating a different instruction. This
+  // makes the decoding tricky.
+  const char *mnemonic = "unimplemented";
+  const char *form = "(System)";
+
+  if (instr->Mask(SystemExclusiveMonitorFMask) == SystemExclusiveMonitorFixed) {
+    switch (instr->Mask(SystemExclusiveMonitorMask)) {
+      case CLREX: {
+        mnemonic = "clrex";
+        form = (instr->CRm() == 0xf) ? NULL : "'IX";
+        break;
+      }
+    }
+  } else if (instr->Mask(SystemSysRegFMask) == SystemSysRegFixed) {
+    switch (instr->Mask(SystemSysRegMask)) {
+      case MRS: {
+        mnemonic = "mrs";
+        switch (instr->ImmSystemRegister()) {
+          case NZCV: form = "'Xt, nzcv"; break;
+          case FPCR: form = "'Xt, fpcr"; break;
+          default: form = "'Xt, (unknown)"; break;
+        }
+        break;
+      }
+      case MSR: {
+        mnemonic = "msr";
+        switch (instr->ImmSystemRegister()) {
+          case NZCV: form = "nzcv, 'Xt"; break;
+          case FPCR: form = "fpcr, 'Xt"; break;
+          default: form = "(unknown), 'Xt"; break;
+        }
+        break;
+      }
+    }
+  } else if (instr->Mask(SystemHintFMask) == SystemHintFixed) {
+    switch (instr->ImmHint()) {
+      case NOP: {
+        mnemonic = "nop";
+        form = NULL;
+        break;
+      }
+    }
+  } else if (instr->Mask(MemBarrierFMask) == MemBarrierFixed) {
+    switch (instr->Mask(MemBarrierMask)) {
+      case DMB: {
+        mnemonic = "dmb";
+        form = "'M";
+        break;
+      }
+      case DSB: {
+        mnemonic = "dsb";
+        form = "'M";
+        break;
+      }
+      case ISB: {
+        mnemonic = "isb";
+        form = NULL;
+        break;
+      }
+    }
+  }
+
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitException(const Instruction* instr) {
+  const char *mnemonic = "unimplemented";
+  const char *form = "'IDebug";
+
+  switch (instr->Mask(ExceptionMask)) {
+    case HLT: mnemonic = "hlt"; break;
+    case BRK: mnemonic = "brk"; break;
+    case SVC: mnemonic = "svc"; break;
+    case HVC: mnemonic = "hvc"; break;
+    case SMC: mnemonic = "smc"; break;
+    case DCPS1: mnemonic = "dcps1"; form = "{'IDebug}"; break;
+    case DCPS2: mnemonic = "dcps2"; form = "{'IDebug}"; break;
+    case DCPS3: mnemonic = "dcps3"; form = "{'IDebug}"; break;
+    default: form = "(Exception)";
+  }
+  Format(instr, mnemonic, form);
+}
+
+
+void Disassembler::VisitUnimplemented(const Instruction* instr) {
+  Format(instr, "unimplemented", "(Unimplemented)");
+}
+
+
+void Disassembler::VisitUnallocated(const Instruction* instr) {
+  Format(instr, "unallocated", "(Unallocated)");
+}
+
+
+void Disassembler::ProcessOutput(const Instruction* /*instr*/) {
+  // The base disasm does nothing more than disassembling into a buffer.
+}
+
+
+void Disassembler::AppendRegisterNameToOutput(const Instruction* instr,
+                                              const CPURegister& reg) {
+  USE(instr);
+  VIXL_ASSERT(reg.IsValid());
+  char reg_char;
+
+  if (reg.IsRegister()) {
+    reg_char = reg.Is64Bits() ? 'x' : 'w';
+  } else {
+    VIXL_ASSERT(reg.IsFPRegister());
+    reg_char = reg.Is64Bits() ? 'd' : 's';
+  }
+
+  if (reg.IsFPRegister() || !(reg.Aliases(sp) || reg.Aliases(xzr))) {
+    // A normal register: w0 - w30, x0 - x30, s0 - s31, d0 - d31.
+    AppendToOutput("%c%d", reg_char, reg.code());
+  } else if (reg.Aliases(sp)) {
+    // Disassemble w31/x31 as stack pointer wsp/sp.
+    AppendToOutput("%s", reg.Is64Bits() ? "sp" : "wsp");
+  } else {
+    // Disassemble w31/x31 as zero register wzr/xzr.
+    AppendToOutput("%czr", reg_char);
+  }
+}
+
+
+void Disassembler::AppendPCRelativeOffsetToOutput(const Instruction* instr,
+                                                  int64_t offset) {
+  USE(instr);
+  char sign = (offset < 0) ? '-' : '+';
+  AppendToOutput("#%c0x%" PRIx64, sign, std::abs(offset));
+}
+
+
+void Disassembler::AppendAddressToOutput(const Instruction* instr,
+                                         const void* addr) {
+  USE(instr);
+  AppendToOutput("(addr 0x%" PRIxPTR ")", reinterpret_cast<uintptr_t>(addr));
+}
+
+
+void Disassembler::AppendCodeAddressToOutput(const Instruction* instr,
+                                             const void* addr) {
+  AppendAddressToOutput(instr, addr);
+}
+
+
+void Disassembler::AppendDataAddressToOutput(const Instruction* instr,
+                                             const void* addr) {
+  AppendAddressToOutput(instr, addr);
+}
+
+
+void Disassembler::AppendCodeRelativeAddressToOutput(const Instruction* instr,
+                                                     const void* addr) {
+  USE(instr);
+  int64_t rel_addr = CodeRelativeAddress(addr);
+  if (rel_addr >= 0) {
+    AppendToOutput("(addr 0x%" PRIx64 ")", rel_addr);
+  } else {
+    AppendToOutput("(addr -0x%" PRIx64 ")", -rel_addr);
+  }
+}
+
+
+void Disassembler::AppendCodeRelativeCodeAddressToOutput(
+    const Instruction* instr, const void* addr) {
+  AppendCodeRelativeAddressToOutput(instr, addr);
+}
+
+
+void Disassembler::AppendCodeRelativeDataAddressToOutput(
+    const Instruction* instr, const void* addr) {
+  AppendCodeRelativeAddressToOutput(instr, addr);
+}
+
+
+void Disassembler::MapCodeAddress(int64_t base_address,
+                                  const Instruction* instr_address) {
+  set_code_address_offset(
+      base_address - reinterpret_cast<intptr_t>(instr_address));
+}
+int64_t Disassembler::CodeRelativeAddress(const void* addr) {
+  return reinterpret_cast<intptr_t>(addr) + code_address_offset();
+}
+
+
+void Disassembler::Format(const Instruction* instr, const char* mnemonic,
+                          const char* format) {
+  VIXL_ASSERT(mnemonic != NULL);
+  ResetOutput();
+  Substitute(instr, mnemonic);
+  if (format != NULL) {
+    buffer_[buffer_pos_++] = ' ';
+    Substitute(instr, format);
+  }
+  buffer_[buffer_pos_] = 0;
+  ProcessOutput(instr);
+}
+
+
+void Disassembler::Substitute(const Instruction* instr, const char* string) {
+  char chr = *string++;
+  while (chr != '\0') {
+    if (chr == '\'') {
+      string += SubstituteField(instr, string);
+    } else {
+      buffer_[buffer_pos_++] = chr;
+    }
+    chr = *string++;
+  }
+}
+
+
+int Disassembler::SubstituteField(const Instruction* instr,
+                                  const char* format) {
+  switch (format[0]) {
+    case 'R':  // Register. X or W, selected by sf bit.
+    case 'F':  // FP Register. S or D, selected by type field.
+    case 'W':
+    case 'X':
+    case 'S':
+    case 'D': return SubstituteRegisterField(instr, format);
+    case 'I': return SubstituteImmediateField(instr, format);
+    case 'L': return SubstituteLiteralField(instr, format);
+    case 'H': return SubstituteShiftField(instr, format);
+    case 'P': return SubstitutePrefetchField(instr, format);
+    case 'C': return SubstituteConditionField(instr, format);
+    case 'E': return SubstituteExtendField(instr, format);
+    case 'A': return SubstitutePCRelAddressField(instr, format);
+    case 'B': return SubstituteBranchTargetField(instr, format);
+    case 'O': return SubstituteLSRegOffsetField(instr, format);
+    case 'M': return SubstituteBarrierField(instr, format);
+    default: {
+      VIXL_UNREACHABLE();
+      return 1;
+    }
+  }
+}
+
+
+int Disassembler::SubstituteRegisterField(const Instruction* instr,
+                                          const char* format) {
+  unsigned reg_num = 0;
+  unsigned field_len = 2;
+  switch (format[1]) {
+    case 'd': reg_num = instr->Rd(); break;
+    case 'n': reg_num = instr->Rn(); break;
+    case 'm': reg_num = instr->Rm(); break;
+    case 'a': reg_num = instr->Ra(); break;
+    case 's': reg_num = instr->Rs(); break;
+    case 't': {
+      if (format[2] == '2') {
+        reg_num = instr->Rt2();
+        field_len = 3;
+      } else {
+        reg_num = instr->Rt();
+      }
+      break;
+    }
+    default: VIXL_UNREACHABLE();
+  }
+
+  // Increase field length for registers tagged as stack.
+  if (format[2] == 's') {
+    field_len = 3;
+  }
+
+  CPURegister::RegisterType reg_type;
+  unsigned reg_size;
+
+  if (format[0] == 'R') {
+    // Register type is R: use sf bit to choose X and W.
+    reg_type = CPURegister::kRegister;
+    reg_size = instr->SixtyFourBits() ? kXRegSize : kWRegSize;
+  } else if (format[0] == 'F') {
+    // Floating-point register: use type field to choose S or D.
+    reg_type = CPURegister::kFPRegister;
+    reg_size = ((instr->FPType() & 1) == 0) ? kSRegSize : kDRegSize;
+  } else {
+    // The register type is specified.
+    switch (format[0]) {
+      case 'W':
+        reg_type = CPURegister::kRegister; reg_size = kWRegSize; break;
+      case 'X':
+        reg_type = CPURegister::kRegister; reg_size = kXRegSize; break;
+      case 'S':
+        reg_type = CPURegister::kFPRegister; reg_size = kSRegSize; break;
+      case 'D':
+        reg_type = CPURegister::kFPRegister; reg_size = kDRegSize; break;
+      default:
+        VIXL_UNREACHABLE();
+        reg_type = CPURegister::kRegister;
+        reg_size = kXRegSize;
+    }
+  }
+
+  if ((reg_type == CPURegister::kRegister) &&
+      (reg_num == kZeroRegCode) && (format[2] == 's')) {
+    reg_num = kSPRegInternalCode;
+  }
+
+  AppendRegisterNameToOutput(instr, CPURegister(reg_num, reg_size, reg_type));
+
+  return field_len;
+}
+
+
+int Disassembler::SubstituteImmediateField(const Instruction* instr,
+                                           const char* format) {
+  VIXL_ASSERT(format[0] == 'I');
+
+  switch (format[1]) {
+    case 'M': {  // IMoveImm, IMoveNeg or IMoveLSL.
+      if (format[5] == 'L') {
+        AppendToOutput("#0x%" PRIx64, instr->ImmMoveWide());
+        if (instr->ShiftMoveWide() > 0) {
+          AppendToOutput(", lsl #%" PRId64, 16 * instr->ShiftMoveWide());
+        }
+      } else {
+        VIXL_ASSERT((format[5] == 'I') || (format[5] == 'N'));
+        uint64_t imm = instr->ImmMoveWide() << (16 * instr->ShiftMoveWide());
+        if (format[5] == 'N')
+          imm = ~imm;
+        if (!instr->SixtyFourBits())
+          imm &= UINT64_C(0xffffffff);
+        AppendToOutput("#0x%" PRIx64, imm);
+      }
+      return 8;
+    }
+    case 'L': {
+      switch (format[2]) {
+        case 'L': {  // ILLiteral - Immediate Load Literal.
+          AppendToOutput("pc%+" PRId64,
+                         instr->ImmLLiteral() << kLiteralEntrySizeLog2);
+          return 9;
+        }
+        case 'S': {  // ILS - Immediate Load/Store.
+          if (instr->ImmLS() != 0) {
+            AppendToOutput(", #%" PRId64, instr->ImmLS());
+          }
+          return 3;
+        }
+        case 'P': {  // ILPx - Immediate Load/Store Pair, x = access size.
+          if (instr->ImmLSPair() != 0) {
+            // format[3] is the scale value. Convert to a number.
+            int scale = format[3] - 0x30;
+            AppendToOutput(", #%" PRId64, instr->ImmLSPair() * scale);
+          }
+          return 4;
+        }
+        case 'U': {  // ILU - Immediate Load/Store Unsigned.
+          if (instr->ImmLSUnsigned() != 0) {
+            AppendToOutput(", #%" PRIu64,
+                           instr->ImmLSUnsigned() << instr->SizeLS());
+          }
+          return 3;
+        }
+      }
+    }
+    case 'C': {  // ICondB - Immediate Conditional Branch.
+      int64_t offset = instr->ImmCondBranch() << 2;
+      AppendPCRelativeOffsetToOutput(instr, offset);
+      return 6;
+    }
+    case 'A': {  // IAddSub.
+      VIXL_ASSERT(instr->ShiftAddSub() <= 1);
+      int64_t imm = instr->ImmAddSub() << (12 * instr->ShiftAddSub());
+      AppendToOutput("#0x%" PRIx64 " (%" PRId64 ")", imm, imm);
+      return 7;
+    }
+    case 'F': {  // IFPSingle, IFPDouble or IFPFBits.
+      if (format[3] == 'F') {  // IFPFbits.
+        AppendToOutput("#%" PRId64, 64 - instr->FPScale());
+        return 8;
+      } else {
+        AppendToOutput("#0x%" PRIx64 " (%.4f)", instr->ImmFP(),
+                       format[3] == 'S' ? instr->ImmFP32() : instr->ImmFP64());
+        return 9;
+      }
+    }
+    case 'T': {  // ITri - Immediate Triangular Encoded.
+      AppendToOutput("#0x%" PRIx64, instr->ImmLogical());
+      return 4;
+    }
+    case 'N': {  // INzcv.
+      int nzcv = (instr->Nzcv() << Flags_offset);
+      AppendToOutput("#%c%c%c%c", ((nzcv & NFlag) == 0) ? 'n' : 'N',
+                                  ((nzcv & ZFlag) == 0) ? 'z' : 'Z',
+                                  ((nzcv & CFlag) == 0) ? 'c' : 'C',
+                                  ((nzcv & VFlag) == 0) ? 'v' : 'V');
+      return 5;
+    }
+    case 'P': {  // IP - Conditional compare.
+      AppendToOutput("#%" PRId64, instr->ImmCondCmp());
+      return 2;
+    }
+    case 'B': {  // Bitfields.
+      return SubstituteBitfieldImmediateField(instr, format);
+    }
+    case 'E': {  // IExtract.
+      AppendToOutput("#%" PRId64, instr->ImmS());
+      return 8;
+    }
+    case 'S': {  // IS - Test and branch bit.
+      AppendToOutput("#%" PRId64, (instr->ImmTestBranchBit5() << 5) |
+                                  instr->ImmTestBranchBit40());
+      return 2;
+    }
+    case 'D': {  // IDebug - HLT and BRK instructions.
+      AppendToOutput("#0x%" PRIx64, instr->ImmException());
+      return 6;
+    }
+    case 'X': {  // IX - CLREX instruction.
+      AppendToOutput("#0x%" PRIx64, instr->CRm());
+      return 2;
+    }
+    default: {
+      VIXL_UNIMPLEMENTED();
+      return 0;
+    }
+  }
+}
+
+
+int Disassembler::SubstituteBitfieldImmediateField(const Instruction* instr,
+                                                   const char* format) {
+  VIXL_ASSERT((format[0] == 'I') && (format[1] == 'B'));
+  unsigned r = instr->ImmR();
+  unsigned s = instr->ImmS();
+
+  switch (format[2]) {
+    case 'r': {  // IBr.
+      AppendToOutput("#%d", r);
+      return 3;
+    }
+    case 's': {  // IBs+1 or IBs-r+1.
+      if (format[3] == '+') {
+        AppendToOutput("#%d", s + 1);
+        return 5;
+      } else {
+        VIXL_ASSERT(format[3] == '-');
+        AppendToOutput("#%d", s - r + 1);
+        return 7;
+      }
+    }
+    case 'Z': {  // IBZ-r.
+      VIXL_ASSERT((format[3] == '-') && (format[4] == 'r'));
+      unsigned reg_size = (instr->SixtyFourBits() == 1) ? kXRegSize : kWRegSize;
+      AppendToOutput("#%d", reg_size - r);
+      return 5;
+    }
+    default: {
+      VIXL_UNREACHABLE();
+      return 0;
+    }
+  }
+}
+
+
+int Disassembler::SubstituteLiteralField(const Instruction* instr,
+                                         const char* format) {
+  VIXL_ASSERT(strncmp(format, "LValue", 6) == 0);
+  USE(format);
+
+  const void * address = instr->LiteralAddress<const void *>();
+  switch (instr->Mask(LoadLiteralMask)) {
+    case LDR_w_lit:
+    case LDR_x_lit:
+    case LDRSW_x_lit:
+    case LDR_s_lit:
+    case LDR_d_lit:
+      AppendCodeRelativeDataAddressToOutput(instr, address);
+      break;
+    case PRFM_lit: {
+      // Use the prefetch hint to decide how to print the address.
+      switch (instr->PrefetchHint()) {
+        case 0x0:     // PLD: prefetch for load.
+        case 0x2:     // PST: prepare for store.
+          AppendCodeRelativeDataAddressToOutput(instr, address);
+          break;
+        case 0x1:     // PLI: preload instructions.
+          AppendCodeRelativeCodeAddressToOutput(instr, address);
+          break;
+        case 0x3:     // Unallocated hint.
+          AppendCodeRelativeAddressToOutput(instr, address);
+          break;
+      }
+      break;
+    }
+    default:
+      VIXL_UNREACHABLE();
+  }
+
+  return 6;
+}
+
+
+int Disassembler::SubstituteShiftField(const Instruction* instr,
+                                       const char* format) {
+  VIXL_ASSERT(format[0] == 'H');
+  VIXL_ASSERT(instr->ShiftDP() <= 0x3);
+
+  switch (format[1]) {
+    case 'D': {  // HDP.
+      VIXL_ASSERT(instr->ShiftDP() != ROR);
+    }  // Fall through.
+    case 'L': {  // HLo.
+      if (instr->ImmDPShift() != 0) {
+        const char* shift_type[] = {"lsl", "lsr", "asr", "ror"};
+        AppendToOutput(", %s #%" PRId64, shift_type[instr->ShiftDP()],
+                       instr->ImmDPShift());
+      }
+      return 3;
+    }
+    default:
+      VIXL_UNIMPLEMENTED();
+      return 0;
+  }
+}
+
+
+int Disassembler::SubstituteConditionField(const Instruction* instr,
+                                           const char* format) {
+  VIXL_ASSERT(format[0] == 'C');
+  const char* condition_code[] = { "eq", "ne", "hs", "lo",
+                                   "mi", "pl", "vs", "vc",
+                                   "hi", "ls", "ge", "lt",
+                                   "gt", "le", "al", "nv" };
+  int cond;
+  switch (format[1]) {
+    case 'B': cond = instr->ConditionBranch(); break;
+    case 'I': {
+      cond = InvertCondition(static_cast<Condition>(instr->Condition()));
+      break;
+    }
+    default: cond = instr->Condition();
+  }
+  AppendToOutput("%s", condition_code[cond]);
+  return 4;
+}
+
+
+int Disassembler::SubstitutePCRelAddressField(const Instruction* instr,
+                                              const char* format) {
+  VIXL_ASSERT((strcmp(format, "AddrPCRelByte") == 0) ||   // Used by `adr`.
+              (strcmp(format, "AddrPCRelPage") == 0));    // Used by `adrp`.
+
+  int64_t offset = instr->ImmPCRel();
+
+  // Compute the target address based on the effective address (after applying
+  // code_address_offset). This is required for correct behaviour of adrp.
+  const Instruction* base = instr + code_address_offset();
+  if (format[9] == 'P') {
+    offset *= kPageSize;
+    base = AlignDown(base, kPageSize);
+  }
+  // Strip code_address_offset before printing, so we can use the
+  // semantically-correct AppendCodeRelativeAddressToOutput.
+  const void* target =
+      reinterpret_cast<const void*>(base + offset - code_address_offset());
+
+  AppendPCRelativeOffsetToOutput(instr, offset);
+  AppendToOutput(" ");
+  AppendCodeRelativeAddressToOutput(instr, target);
+  return 13;
+}
+
+
+int Disassembler::SubstituteBranchTargetField(const Instruction* instr,
+                                              const char* format) {
+  VIXL_ASSERT(strncmp(format, "BImm", 4) == 0);
+
+  int64_t offset = 0;
+  switch (format[5]) {
+    // BImmUncn - unconditional branch immediate.
+    case 'n': offset = instr->ImmUncondBranch(); break;
+    // BImmCond - conditional branch immediate.
+    case 'o': offset = instr->ImmCondBranch(); break;
+    // BImmCmpa - compare and branch immediate.
+    case 'm': offset = instr->ImmCmpBranch(); break;
+    // BImmTest - test and branch immediate.
+    case 'e': offset = instr->ImmTestBranch(); break;
+    default: VIXL_UNIMPLEMENTED();
+  }
+  offset <<= kInstructionSizeLog2;
+  const void* target_address = reinterpret_cast<const void*>(instr + offset);
+  VIXL_STATIC_ASSERT(sizeof(*instr) == 1);
+
+  AppendPCRelativeOffsetToOutput(instr, offset);
+  AppendToOutput(" ");
+  AppendCodeRelativeCodeAddressToOutput(instr, target_address);
+
+  return 8;
+}
+
+
+int Disassembler::SubstituteExtendField(const Instruction* instr,
+                                        const char* format) {
+  VIXL_ASSERT(strncmp(format, "Ext", 3) == 0);
+  VIXL_ASSERT(instr->ExtendMode() <= 7);
+  USE(format);
+
+  const char* extend_mode[] = { "uxtb", "uxth", "uxtw", "uxtx",
+                                "sxtb", "sxth", "sxtw", "sxtx" };
+
+  // If rd or rn is SP, uxtw on 32-bit registers and uxtx on 64-bit
+  // registers becomes lsl.
+  if (((instr->Rd() == kZeroRegCode) || (instr->Rn() == kZeroRegCode)) &&
+      (((instr->ExtendMode() == UXTW) && (instr->SixtyFourBits() == 0)) ||
+       (instr->ExtendMode() == UXTX))) {
+    if (instr->ImmExtendShift() > 0) {
+      AppendToOutput(", lsl #%" PRId64, instr->ImmExtendShift());
+    }
+  } else {
+    AppendToOutput(", %s", extend_mode[instr->ExtendMode()]);
+    if (instr->ImmExtendShift() > 0) {
+      AppendToOutput(" #%" PRId64, instr->ImmExtendShift());
+    }
+  }
+  return 3;
+}
+
+
+int Disassembler::SubstituteLSRegOffsetField(const Instruction* instr,
+                                             const char* format) {
+  VIXL_ASSERT(strncmp(format, "Offsetreg", 9) == 0);
+  const char* extend_mode[] = { "undefined", "undefined", "uxtw", "lsl",
+                                "undefined", "undefined", "sxtw", "sxtx" };
+  USE(format);
+
+  unsigned shift = instr->ImmShiftLS();
+  Extend ext = static_cast<Extend>(instr->ExtendMode());
+  char reg_type = ((ext == UXTW) || (ext == SXTW)) ? 'w' : 'x';
+
+  unsigned rm = instr->Rm();
+  if (rm == kZeroRegCode) {
+    AppendToOutput("%czr", reg_type);
+  } else {
+    AppendToOutput("%c%d", reg_type, rm);
+  }
+
+  // Extend mode UXTX is an alias for shift mode LSL here.
+  if (!((ext == UXTX) && (shift == 0))) {
+    AppendToOutput(", %s", extend_mode[ext]);
+    if (shift != 0) {
+      AppendToOutput(" #%" PRId64, instr->SizeLS());
+    }
+  }
+  return 9;
+}
+
+
+int Disassembler::SubstitutePrefetchField(const Instruction* instr,
+                                          const char* format) {
+  VIXL_ASSERT(format[0] == 'P');
+  USE(format);
+
+  static const char* hints[] = {"ld", "li", "st"};
+  static const char* stream_options[] = {"keep", "strm"};
+
+  unsigned hint = instr->PrefetchHint();
+  unsigned target = instr->PrefetchTarget() + 1;
+  unsigned stream = instr->PrefetchStream();
+
+  if ((hint >= (sizeof(hints) / sizeof(hints[0]))) || (target > 3)) {
+    // Unallocated prefetch operations.
+    int prefetch_mode = instr->ImmPrefetchOperation();
+    AppendToOutput("#0b%c%c%c%c%c",
+                   (prefetch_mode & (1 << 4)) ? '1' : '0',
+                   (prefetch_mode & (1 << 3)) ? '1' : '0',
+                   (prefetch_mode & (1 << 2)) ? '1' : '0',
+                   (prefetch_mode & (1 << 1)) ? '1' : '0',
+                   (prefetch_mode & (1 << 0)) ? '1' : '0');
+  } else {
+    VIXL_ASSERT(stream < (sizeof(stream_options) / sizeof(stream_options[0])));
+    AppendToOutput("p%sl%d%s", hints[hint], target, stream_options[stream]);
+  }
+  return 6;
+}
+
+int Disassembler::SubstituteBarrierField(const Instruction* instr,
+                                         const char* format) {
+  VIXL_ASSERT(format[0] == 'M');
+  USE(format);
+
+  static const char* options[4][4] = {
+    { "sy (0b0000)", "oshld", "oshst", "osh" },
+    { "sy (0b0100)", "nshld", "nshst", "nsh" },
+    { "sy (0b1000)", "ishld", "ishst", "ish" },
+    { "sy (0b1100)", "ld", "st", "sy" }
+  };
+  int domain = instr->ImmBarrierDomain();
+  int type = instr->ImmBarrierType();
+
+  AppendToOutput("%s", options[domain][type]);
+  return 1;
+}
+
+void Disassembler::ResetOutput() {
+  buffer_pos_ = 0;
+  buffer_[buffer_pos_] = 0;
+}
+
+
+void Disassembler::AppendToOutput(const char* format, ...) {
+  va_list args;
+  va_start(args, format);
+  buffer_pos_ += vsnprintf(&buffer_[buffer_pos_], buffer_size_, format, args);
+  va_end(args);
+}
+
+
+void PrintDisassembler::ProcessOutput(const Instruction* instr) {
+  fprintf(stream_, "0x%016" PRIx64 "  %08" PRIx32 "\t\t%s\n",
+          reinterpret_cast<uint64_t>(instr),
+          instr->InstructionBits(),
+          GetOutput());
+}
+}  // namespace vixl
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Disasm-vixl.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Disasm-vixl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Disasm-vixl.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Disasm-vixl.h	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,176 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#ifndef VIXL_A64_DISASM_A64_H
+#define VIXL_A64_DISASM_A64_H
+
+#include "jit/arm64/vixl/Assembler-vixl.h"
+#include "jit/arm64/vixl/Decoder-vixl.h"
+#include "jit/arm64/vixl/Globals-vixl.h"
+#include "jit/arm64/vixl/Instructions-vixl.h"
+#include "jit/arm64/vixl/Utils-vixl.h"
+
+namespace vixl {
+
+class Disassembler: public DecoderVisitor {
+ public:
+  Disassembler();
+  Disassembler(char* text_buffer, int buffer_size);
+  virtual ~Disassembler();
+  char* GetOutput();
+
+  // Declare all Visitor functions.
+  #define DECLARE(A) virtual void Visit##A(const Instruction* instr);
+  VISITOR_LIST(DECLARE)
+  #undef DECLARE
+
+ protected:
+  virtual void ProcessOutput(const Instruction* instr);
+
+  // Default output functions.  The functions below implement a default way of
+  // printing elements in the disassembly. A sub-class can override these to
+  // customize the disassembly output.
+
+  // Prints the name of a register.
+  virtual void AppendRegisterNameToOutput(const Instruction* instr,
+                                          const CPURegister& reg);
+
+  // Prints a PC-relative offset. This is used for example when disassembling
+  // branches to immediate offsets.
+  virtual void AppendPCRelativeOffsetToOutput(const Instruction* instr,
+                                              int64_t offset);
+
+  // Prints an address, in the general case. It can be code or data. This is
+  // used for example to print the target address of an ADR instruction.
+  virtual void AppendCodeRelativeAddressToOutput(const Instruction* instr,
+                                                 const void* addr);
+
+  // Prints the address of some code.
+  // This is used for example to print the target address of a branch to an
+  // immediate offset.
+  // A sub-class can for example override this method to lookup the address and
+  // print an appropriate name.
+  virtual void AppendCodeRelativeCodeAddressToOutput(const Instruction* instr,
+                                                     const void* addr);
+
+  // Prints the address of some data.
+  // This is used for example to print the source address of a load literal
+  // instruction.
+  virtual void AppendCodeRelativeDataAddressToOutput(const Instruction* instr,
+                                                     const void* addr);
+
+  // Same as the above, but for addresses that are not relative to the code
+  // buffer. They are currently not used by VIXL.
+  virtual void AppendAddressToOutput(const Instruction* instr,
+                                     const void* addr);
+  virtual void AppendCodeAddressToOutput(const Instruction* instr,
+                                         const void* addr);
+  virtual void AppendDataAddressToOutput(const Instruction* instr,
+                                         const void* addr);
+
+ public:
+  // Get/Set the offset that should be added to code addresses when printing
+  // code-relative addresses in the AppendCodeRelative<Type>AddressToOutput()
+  // helpers.
+  // Below is an example of how a branch immediate instruction in memory at
+  // address 0xb010200 would disassemble with different offsets.
+  // Base address | Disassembly
+  //          0x0 | 0xb010200:  b #+0xcc  (addr 0xb0102cc)
+  //      0x10000 | 0xb000200:  b #+0xcc  (addr 0xb0002cc)
+  //    0xb010200 |       0x0:  b #+0xcc  (addr 0xcc)
+  void MapCodeAddress(int64_t base_address, const Instruction* instr_address);
+  int64_t CodeRelativeAddress(const void* instr);
+
+ private:
+  void Format(
+      const Instruction* instr, const char* mnemonic, const char* format);
+  void Substitute(const Instruction* instr, const char* string);
+  int SubstituteField(const Instruction* instr, const char* format);
+  int SubstituteRegisterField(const Instruction* instr, const char* format);
+  int SubstituteImmediateField(const Instruction* instr, const char* format);
+  int SubstituteLiteralField(const Instruction* instr, const char* format);
+  int SubstituteBitfieldImmediateField(
+      const Instruction* instr, const char* format);
+  int SubstituteShiftField(const Instruction* instr, const char* format);
+  int SubstituteExtendField(const Instruction* instr, const char* format);
+  int SubstituteConditionField(const Instruction* instr, const char* format);
+  int SubstitutePCRelAddressField(const Instruction* instr, const char* format);
+  int SubstituteBranchTargetField(const Instruction* instr, const char* format);
+  int SubstituteLSRegOffsetField(const Instruction* instr, const char* format);
+  int SubstitutePrefetchField(const Instruction* instr, const char* format);
+  int SubstituteBarrierField(const Instruction* instr, const char* format);
+
+  bool RdIsZROrSP(const Instruction* instr) const {
+    return (instr->Rd() == kZeroRegCode);
+  }
+
+  bool RnIsZROrSP(const Instruction* instr) const {
+    return (instr->Rn() == kZeroRegCode);
+  }
+
+  bool RmIsZROrSP(const Instruction* instr) const {
+    return (instr->Rm() == kZeroRegCode);
+  }
+
+  bool RaIsZROrSP(const Instruction* instr) const {
+    return (instr->Ra() == kZeroRegCode);
+  }
+
+  bool IsMovzMovnImm(unsigned reg_size, uint64_t value);
+
+  int64_t code_address_offset() const { return code_address_offset_; }
+
+ protected:
+  void ResetOutput();
+  void AppendToOutput(const char* string, ...) PRINTF_CHECK(2, 3);
+
+  void set_code_address_offset(int64_t code_address_offset) {
+    code_address_offset_ = code_address_offset;
+  }
+
+  char* buffer_;
+  uint32_t buffer_pos_;
+  uint32_t buffer_size_;
+  bool own_buffer_;
+
+  int64_t code_address_offset_;
+};
+
+
+class PrintDisassembler: public Disassembler {
+ public:
+  explicit PrintDisassembler(FILE* stream) : stream_(stream) { }
+  virtual ~PrintDisassembler() { }
+
+ protected:
+  virtual void ProcessOutput(const Instruction* instr);
+
+ private:
+  FILE *stream_;
+};
+}  // namespace vixl
+
+#endif  // VIXL_A64_DISASM_A64_H
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Globals-vixl.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Globals-vixl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Globals-vixl.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Globals-vixl.h	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,88 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#ifndef VIXL_GLOBALS_H
+#define VIXL_GLOBALS_H
+
+// Get standard C99 macros for integer types.
+#ifndef __STDC_CONSTANT_MACROS
+#define __STDC_CONSTANT_MACROS
+#endif
+
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS
+#endif
+
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS
+#endif
+
+#include "mozilla/Assertions.h"
+
+#include <inttypes.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "js-config.h"
+
+#include "jit/arm64/vixl/Platform-vixl.h"
+#include "js/Utility.h"
+
+
+typedef uint8_t byte;
+
+const int KBytes = 1024;
+const int MBytes = 1024 * KBytes;
+
+#define VIXL_ABORT() printf("in %s, line %i", __FILE__, __LINE__); abort()
+#ifdef DEBUG
+  #define VIXL_ASSERT(condition) MOZ_ASSERT(condition)
+  #define VIXL_CHECK(condition) VIXL_ASSERT(condition)
+  #define VIXL_UNIMPLEMENTED() printf("UNIMPLEMENTED\t"); VIXL_ABORT()
+  #define VIXL_UNREACHABLE() printf("UNREACHABLE\t"); VIXL_ABORT()
+#else
+  #define VIXL_ASSERT(condition) ((void) 0)
+  #define VIXL_CHECK(condition) ((void) 0)
+  #define VIXL_UNIMPLEMENTED() ((void) 0)
+  #define VIXL_UNREACHABLE() ((void) 0)
+#endif
+// This is not as powerful as template based assertions, but it is simple.
+// It assumes that the descriptions are unique. If this starts being a problem,
+// we can switch to a different implemention.
+#define VIXL_CONCAT(a, b) a##b
+#define VIXL_STATIC_ASSERT_LINE(line, condition) \
+  typedef char VIXL_CONCAT(STATIC_ASSERT_LINE_, line)[(condition) ? 1 : -1] \
+  __attribute__((unused))
+#define VIXL_STATIC_ASSERT(condition) VIXL_STATIC_ASSERT_LINE(__LINE__, condition) //NOLINT
+
+template <typename T> inline void USE(T) {}
+
+#define VIXL_ALIGNMENT_EXCEPTION() printf("ALIGNMENT EXCEPTION\t"); VIXL_ABORT()
+
+#endif  // VIXL_GLOBALS_H
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Instructions-vixl.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Instructions-vixl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Instructions-vixl.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Instructions-vixl.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,314 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#include "jit/arm64/vixl/Instructions-vixl.h"
+#include "jit/arm64/vixl/Assembler-vixl.h"
+
+namespace vixl {
+
+
+// Floating-point infinity values.
+const float kFP32PositiveInfinity = rawbits_to_float(0x7f800000);
+const float kFP32NegativeInfinity = rawbits_to_float(0xff800000);
+const double kFP64PositiveInfinity =
+    rawbits_to_double(UINT64_C(0x7ff0000000000000));
+const double kFP64NegativeInfinity =
+    rawbits_to_double(UINT64_C(0xfff0000000000000));
+
+
+// The default NaN values (for FPCR.DN=1).
+const double kFP64DefaultNaN = rawbits_to_double(UINT64_C(0x7ff8000000000000));
+const float kFP32DefaultNaN = rawbits_to_float(0x7fc00000);
+
+
+static uint64_t RotateRight(uint64_t value,
+                            unsigned int rotate,
+                            unsigned int width) {
+  VIXL_ASSERT(width <= 64);
+  rotate &= 63;
+  return ((value & ((UINT64_C(1) << rotate) - 1)) <<
+          (width - rotate)) | (value >> rotate);
+}
+
+
+static uint64_t RepeatBitsAcrossReg(unsigned reg_size,
+                                    uint64_t value,
+                                    unsigned width) {
+  VIXL_ASSERT((width == 2) || (width == 4) || (width == 8) || (width == 16) ||
+              (width == 32));
+  VIXL_ASSERT((reg_size == kWRegSize) || (reg_size == kXRegSize));
+  uint64_t result = value & ((UINT64_C(1) << width) - 1);
+  for (unsigned i = width; i < reg_size; i *= 2) {
+    result |= (result << i);
+  }
+  return result;
+}
+
+
+bool Instruction::IsLoad() const {
+  if (Mask(LoadStoreAnyFMask) != LoadStoreAnyFixed) {
+    return false;
+  }
+
+  if (Mask(LoadStorePairAnyFMask) == LoadStorePairAnyFixed) {
+    return Mask(LoadStorePairLBit) != 0;
+  } else {
+    LoadStoreOp op = static_cast<LoadStoreOp>(Mask(LoadStoreOpMask));
+    switch (op) {
+      case LDRB_w:
+      case LDRH_w:
+      case LDR_w:
+      case LDR_x:
+      case LDRSB_w:
+      case LDRSB_x:
+      case LDRSH_w:
+      case LDRSH_x:
+      case LDRSW_x:
+      case LDR_s:
+      case LDR_d: return true;
+      default: return false;
+    }
+  }
+}
+
+
+bool Instruction::IsStore() const {
+  if (Mask(LoadStoreAnyFMask) != LoadStoreAnyFixed) {
+    return false;
+  }
+
+  if (Mask(LoadStorePairAnyFMask) == LoadStorePairAnyFixed) {
+    return Mask(LoadStorePairLBit) == 0;
+  } else {
+    LoadStoreOp op = static_cast<LoadStoreOp>(Mask(LoadStoreOpMask));
+    switch (op) {
+      case STRB_w:
+      case STRH_w:
+      case STR_w:
+      case STR_x:
+      case STR_s:
+      case STR_d: return true;
+      default: return false;
+    }
+  }
+}
+
+
+// Logical immediates can't encode zero, so a return value of zero is used to
+// indicate a failure case. Specifically, where the constraints on imm_s are
+// not met.
+uint64_t Instruction::ImmLogical() const {
+  unsigned reg_size = SixtyFourBits() ? kXRegSize : kWRegSize;
+  int64_t n = BitN();
+  int64_t imm_s = ImmSetBits();
+  int64_t imm_r = ImmRotate();
+
+  // An integer is constructed from the n, imm_s and imm_r bits according to
+  // the following table:
+  //
+  //  N   imms    immr    size        S             R
+  //  1  ssssss  rrrrrr    64    UInt(ssssss)  UInt(rrrrrr)
+  //  0  0sssss  xrrrrr    32    UInt(sssss)   UInt(rrrrr)
+  //  0  10ssss  xxrrrr    16    UInt(ssss)    UInt(rrrr)
+  //  0  110sss  xxxrrr     8    UInt(sss)     UInt(rrr)
+  //  0  1110ss  xxxxrr     4    UInt(ss)      UInt(rr)
+  //  0  11110s  xxxxxr     2    UInt(s)       UInt(r)
+  // (s bits must not be all set)
+  //
+  // A pattern is constructed of size bits, where the least significant S+1
+  // bits are set. The pattern is rotated right by R, and repeated across a
+  // 32 or 64-bit value, depending on destination register width.
+  //
+
+  if (n == 1) {
+    if (imm_s == 0x3F) {
+      return 0;
+    }
+    uint64_t bits = (UINT64_C(1) << (imm_s + 1)) - 1;
+    return RotateRight(bits, imm_r, 64);
+  } else {
+    if ((imm_s >> 1) == 0x1F) {
+      return 0;
+    }
+    for (int width = 0x20; width >= 0x2; width >>= 1) {
+      if ((imm_s & width) == 0) {
+        int mask = width - 1;
+        if ((imm_s & mask) == mask) {
+          return 0;
+        }
+        uint64_t bits = (UINT64_C(1) << ((imm_s & mask) + 1)) - 1;
+        return RepeatBitsAcrossReg(reg_size,
+                                   RotateRight(bits, imm_r & mask, width),
+                                   width);
+      }
+    }
+  }
+  VIXL_UNREACHABLE();
+  return 0;
+}
+
+
+float Instruction::ImmFP32() const {
+  //  ImmFP: abcdefgh (8 bits)
+  // Single: aBbb.bbbc.defg.h000.0000.0000.0000.0000 (32 bits)
+  // where B is b ^ 1
+  uint32_t bits = ImmFP();
+  uint32_t bit7 = (bits >> 7) & 0x1;
+  uint32_t bit6 = (bits >> 6) & 0x1;
+  uint32_t bit5_to_0 = bits & 0x3f;
+  uint32_t result = (bit7 << 31) | ((32 - bit6) << 25) | (bit5_to_0 << 19);
+
+  return rawbits_to_float(result);
+}
+
+
+double Instruction::ImmFP64() const {
+  //  ImmFP: abcdefgh (8 bits)
+  // Double: aBbb.bbbb.bbcd.efgh.0000.0000.0000.0000
+  //         0000.0000.0000.0000.0000.0000.0000.0000 (64 bits)
+  // where B is b ^ 1
+  uint32_t bits = ImmFP();
+  uint64_t bit7 = (bits >> 7) & 0x1;
+  uint64_t bit6 = (bits >> 6) & 0x1;
+  uint64_t bit5_to_0 = bits & 0x3f;
+  uint64_t result = (bit7 << 63) | ((256 - bit6) << 54) | (bit5_to_0 << 48);
+
+  return rawbits_to_double(result);
+}
+
+
+LSDataSize CalcLSPairDataSize(LoadStorePairOp op) {
+  switch (op) {
+    case STP_x:
+    case LDP_x:
+    case STP_d:
+    case LDP_d: return LSDoubleWord;
+    default: return LSWord;
+  }
+}
+
+
+const Instruction* Instruction::ImmPCOffsetTarget() const {
+  const Instruction * base = this;
+  ptrdiff_t offset;
+  if (IsPCRelAddressing()) {
+    // ADR and ADRP.
+    offset = ImmPCRel();
+    if (Mask(PCRelAddressingMask) == ADRP) {
+      base = AlignDown(base, kPageSize);
+      offset *= kPageSize;
+    } else {
+      VIXL_ASSERT(Mask(PCRelAddressingMask) == ADR);
+    }
+  } else {
+    // All PC-relative branches.
+    VIXL_ASSERT(BranchType() != UnknownBranchType);
+    // Relative branch offsets are instruction-size-aligned.
+    offset = ImmBranch() << kInstructionSizeLog2;
+  }
+  return base + offset;
+}
+
+
+inline int Instruction::ImmBranch() const {
+  switch (BranchType()) {
+    case CondBranchType: return ImmCondBranch();
+    case UncondBranchType: return ImmUncondBranch();
+    case CompareBranchType: return ImmCmpBranch();
+    case TestBranchType: return ImmTestBranch();
+    default: VIXL_UNREACHABLE();
+  }
+  return 0;
+}
+
+
+void Instruction::SetImmPCOffsetTarget(const Instruction* target) {
+  if (IsPCRelAddressing()) {
+    SetPCRelImmTarget(target);
+  } else {
+    SetBranchImmTarget(target);
+  }
+}
+
+
+void Instruction::SetPCRelImmTarget(const Instruction* target) {
+  int32_t imm21;
+  if ((Mask(PCRelAddressingMask) == ADR)) {
+    imm21 = target - this;
+  } else {
+    VIXL_ASSERT(Mask(PCRelAddressingMask) == ADRP);
+    uintptr_t this_page = reinterpret_cast<uintptr_t>(this) / kPageSize;
+    uintptr_t target_page = reinterpret_cast<uintptr_t>(target) / kPageSize;
+    imm21 = target_page - this_page;
+  }
+  Instr imm = vixl::Assembler::ImmPCRelAddress(imm21);
+
+  SetInstructionBits(Mask(~ImmPCRel_mask) | imm);
+}
+
+
+void Instruction::SetBranchImmTarget(const Instruction* target) {
+  VIXL_ASSERT(((target - this) & 3) == 0);
+  Instr branch_imm = 0;
+  uint32_t imm_mask = 0;
+  int offset = (target - this) >> kInstructionSizeLog2;
+  switch (BranchType()) {
+    case CondBranchType: {
+      branch_imm = vixl::Assembler::ImmCondBranch(offset);
+      imm_mask = ImmCondBranch_mask;
+      break;
+    }
+    case UncondBranchType: {
+      branch_imm = vixl::Assembler::ImmUncondBranch(offset);
+      imm_mask = ImmUncondBranch_mask;
+      break;
+    }
+    case CompareBranchType: {
+      branch_imm = vixl::Assembler::ImmCmpBranch(offset);
+      imm_mask = ImmCmpBranch_mask;
+      break;
+    }
+    case TestBranchType: {
+      branch_imm = vixl::Assembler::ImmTestBranch(offset);
+      imm_mask = ImmTestBranch_mask;
+      break;
+    }
+    default: VIXL_UNREACHABLE();
+  }
+  SetInstructionBits(Mask(~imm_mask) | branch_imm);
+}
+
+
+void Instruction::SetImmLLiteral(const Instruction* source) {
+  VIXL_ASSERT(IsWordAligned(source));
+  ptrdiff_t offset = (source - this) >> kLiteralEntrySizeLog2;
+  Instr imm = vixl::Assembler::ImmLLiteral(offset);
+  Instr mask = ImmLLiteral_mask;
+
+  SetInstructionBits(Mask(~mask) | imm);
+}
+}  // namespace vixl
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Instructions-vixl.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Instructions-vixl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Instructions-vixl.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Instructions-vixl.h	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,407 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#ifndef VIXL_A64_INSTRUCTIONS_A64_H_
+#define VIXL_A64_INSTRUCTIONS_A64_H_
+
+#include "jit/arm64/vixl/Constants-vixl.h"
+#include "jit/arm64/vixl/Globals-vixl.h"
+#include "jit/arm64/vixl/Utils-vixl.h"
+
+namespace vixl {
+// ISA constants. --------------------------------------------------------------
+
+typedef uint32_t Instr;
+const unsigned kInstructionSize = 4;
+const unsigned kInstructionSizeLog2 = 2;
+const unsigned kLiteralEntrySize = 4;
+const unsigned kLiteralEntrySizeLog2 = 2;
+const unsigned kMaxLoadLiteralRange = 1 * MBytes;
+
+// This is the nominal page size (as used by the adrp instruction); the actual
+// size of the memory pages allocated by the kernel is likely to differ.
+const unsigned kPageSize = 4 * KBytes;
+const unsigned kPageSizeLog2 = 12;
+
+const unsigned kWRegSize = 32;
+const unsigned kWRegSizeLog2 = 5;
+const unsigned kWRegSizeInBytes = kWRegSize / 8;
+const unsigned kWRegSizeInBytesLog2 = kWRegSizeLog2 - 3;
+const unsigned kXRegSize = 64;
+const unsigned kXRegSizeLog2 = 6;
+const unsigned kXRegSizeInBytes = kXRegSize / 8;
+const unsigned kXRegSizeInBytesLog2 = kXRegSizeLog2 - 3;
+const unsigned kSRegSize = 32;
+const unsigned kSRegSizeLog2 = 5;
+const unsigned kSRegSizeInBytes = kSRegSize / 8;
+const unsigned kSRegSizeInBytesLog2 = kSRegSizeLog2 - 3;
+const unsigned kDRegSize = 64;
+const unsigned kDRegSizeLog2 = 6;
+const unsigned kDRegSizeInBytes = kDRegSize / 8;
+const unsigned kDRegSizeInBytesLog2 = kDRegSizeLog2 - 3;
+const uint64_t kWRegMask = UINT64_C(0xffffffff);
+const uint64_t kXRegMask = UINT64_C(0xffffffffffffffff);
+const uint64_t kSRegMask = UINT64_C(0xffffffff);
+const uint64_t kDRegMask = UINT64_C(0xffffffffffffffff);
+const uint64_t kSSignMask = UINT64_C(0x80000000);
+const uint64_t kDSignMask = UINT64_C(0x8000000000000000);
+const uint64_t kWSignMask = UINT64_C(0x80000000);
+const uint64_t kXSignMask = UINT64_C(0x8000000000000000);
+const uint64_t kByteMask = UINT64_C(0xff);
+const uint64_t kHalfWordMask = UINT64_C(0xffff);
+const uint64_t kWordMask = UINT64_C(0xffffffff);
+const uint64_t kXMaxUInt = UINT64_C(0xffffffffffffffff);
+const uint64_t kWMaxUInt = UINT64_C(0xffffffff);
+const int64_t kXMaxInt = INT64_C(0x7fffffffffffffff);
+const int64_t kXMinInt = INT64_C(0x8000000000000000);
+const int32_t kWMaxInt = INT32_C(0x7fffffff);
+const int32_t kWMinInt = INT32_C(0x80000000);
+const unsigned kLinkRegCode = 30;
+const unsigned kZeroRegCode = 31;
+const unsigned kSPRegInternalCode = 63;
+const unsigned kRegCodeMask = 0x1f;
+
+const unsigned kAddressTagOffset = 56;
+const unsigned kAddressTagWidth = 8;
+const uint64_t kAddressTagMask =
+    ((UINT64_C(1) << kAddressTagWidth) - 1) << kAddressTagOffset;
+VIXL_STATIC_ASSERT(kAddressTagMask == UINT64_C(0xff00000000000000));
+
+// AArch64 floating-point specifics. These match IEEE-754.
+const unsigned kDoubleMantissaBits = 52;
+const unsigned kDoubleExponentBits = 11;
+const unsigned kFloatMantissaBits = 23;
+const unsigned kFloatExponentBits = 8;
+
+// Floating-point infinity values.
+extern const float kFP32PositiveInfinity;
+extern const float kFP32NegativeInfinity;
+extern const double kFP64PositiveInfinity;
+extern const double kFP64NegativeInfinity;
+
+// The default NaN values (for FPCR.DN=1).
+extern const double kFP64DefaultNaN;
+extern const float kFP32DefaultNaN;
+
+
+enum LSDataSize {
+  LSByte        = 0,
+  LSHalfword    = 1,
+  LSWord        = 2,
+  LSDoubleWord  = 3
+};
+
+LSDataSize CalcLSPairDataSize(LoadStorePairOp op);
+
+enum ImmBranchType {
+  UnknownBranchType = 0,
+  CondBranchType    = 1,
+  UncondBranchType  = 2,
+  CompareBranchType = 3,
+  TestBranchType    = 4
+};
+
+enum AddrMode {
+  Offset,
+  PreIndex,
+  PostIndex
+};
+
+enum FPRounding {
+  // The first four values are encodable directly by FPCR<RMode>.
+  FPTieEven = 0x0,
+  FPPositiveInfinity = 0x1,
+  FPNegativeInfinity = 0x2,
+  FPZero = 0x3,
+
+  // The final rounding mode is only available when explicitly specified by the
+  // instruction (such as with fcvta). It cannot be set in FPCR.
+  FPTieAway
+};
+
+enum Reg31Mode {
+  Reg31IsStackPointer,
+  Reg31IsZeroRegister
+};
+
+// Instructions. ---------------------------------------------------------------
+
+class Instruction {
+ public:
+  Instr InstructionBits() const {
+    return *(reinterpret_cast<const Instr*>(this));
+  }
+
+  void SetInstructionBits(Instr new_instr) {
+    *(reinterpret_cast<Instr*>(this)) = new_instr;
+  }
+
+  int Bit(int pos) const {
+    return (InstructionBits() >> pos) & 1;
+  }
+
+  uint32_t Bits(int msb, int lsb) const {
+    return unsigned_bitextract_32(msb, lsb, InstructionBits());
+  }
+
+  int32_t SignedBits(int msb, int lsb) const {
+    int32_t bits = *(reinterpret_cast<const int32_t*>(this));
+    return signed_bitextract_32(msb, lsb, bits);
+  }
+
+  Instr Mask(uint32_t mask) const {
+    return InstructionBits() & mask;
+  }
+
+  #define DEFINE_GETTER(Name, HighBit, LowBit, Func)             \
+  int64_t Name() const { return Func(HighBit, LowBit); }
+  INSTRUCTION_FIELDS_LIST(DEFINE_GETTER)
+  #undef DEFINE_GETTER
+
+  // ImmPCRel is a compound field (not present in INSTRUCTION_FIELDS_LIST),
+  // formed from ImmPCRelLo and ImmPCRelHi.
+  int ImmPCRel() const {
+    int const offset = ((ImmPCRelHi() << ImmPCRelLo_width) | ImmPCRelLo());
+    int const width = ImmPCRelLo_width + ImmPCRelHi_width;
+    return signed_bitextract_32(width-1, 0, offset);
+  }
+
+  uint64_t ImmLogical() const;
+  float ImmFP32() const;
+  double ImmFP64() const;
+
+  LSDataSize SizeLSPair() const {
+    return CalcLSPairDataSize(
+             static_cast<LoadStorePairOp>(Mask(LoadStorePairMask)));
+  }
+
+  // Helpers.
+  bool IsCondBranchImm() const {
+    return Mask(ConditionalBranchFMask) == ConditionalBranchFixed;
+  }
+
+  bool IsUncondBranchImm() const {
+    return Mask(UnconditionalBranchFMask) == UnconditionalBranchFixed;
+  }
+
+  bool IsCompareBranch() const {
+    return Mask(CompareBranchFMask) == CompareBranchFixed;
+  }
+
+  bool IsTestBranch() const {
+    return Mask(TestBranchFMask) == TestBranchFixed;
+  }
+
+  bool IsPCRelAddressing() const {
+    return Mask(PCRelAddressingFMask) == PCRelAddressingFixed;
+  }
+
+  bool IsLogicalImmediate() const {
+    return Mask(LogicalImmediateFMask) == LogicalImmediateFixed;
+  }
+
+  bool IsAddSubImmediate() const {
+    return Mask(AddSubImmediateFMask) == AddSubImmediateFixed;
+  }
+
+  bool IsAddSubExtended() const {
+    return Mask(AddSubExtendedFMask) == AddSubExtendedFixed;
+  }
+
+  bool IsLoadOrStore() const {
+    return Mask(LoadStoreAnyFMask) == LoadStoreAnyFixed;
+  }
+
+  bool IsLoad() const;
+  bool IsStore() const;
+
+  bool IsLoadLiteral() const {
+    // This includes PRFM_lit.
+    return Mask(LoadLiteralFMask) == LoadLiteralFixed;
+  }
+
+  bool IsMovn() const {
+    return (Mask(MoveWideImmediateMask) == MOVN_x) ||
+           (Mask(MoveWideImmediateMask) == MOVN_w);
+  }
+
+  // Mozilla modifications.
+  bool IsUncondB() const;
+  bool IsCondB() const;
+  bool IsBL() const;
+  bool IsBR() const;
+  bool IsBLR() const;
+  bool IsTBZ() const;
+  bool IsTBNZ() const;
+  bool IsCBZ() const;
+  bool IsCBNZ() const;
+  bool IsLDR() const;
+  bool IsADR() const;
+  bool IsADRP() const;
+  bool IsBranchLinkImm() const;
+  bool IsTargetReachable(Instruction* target) const;
+  ptrdiff_t ImmPCRawOffset() const;
+  void SetBits32(int msb, int lsb, unsigned value);
+
+#define DEFINE_SETTERS(Name, HighBit, LowBit, Func)  \
+  inline void Set##Name(unsigned n) { SetBits32(HighBit, LowBit, n); }
+INSTRUCTION_FIELDS_LIST(DEFINE_SETTERS)
+#undef DEFINE_SETTERS
+
+  // Indicate whether Rd can be the stack pointer or the zero register. This
+  // does not check that the instruction actually has an Rd field.
+  Reg31Mode RdMode() const {
+    // The following instructions use sp or wsp as Rd:
+    //  Add/sub (immediate) when not setting the flags.
+    //  Add/sub (extended) when not setting the flags.
+    //  Logical (immediate) when not setting the flags.
+    // Otherwise, r31 is the zero register.
+    if (IsAddSubImmediate() || IsAddSubExtended()) {
+      if (Mask(AddSubSetFlagsBit)) {
+        return Reg31IsZeroRegister;
+      } else {
+        return Reg31IsStackPointer;
+      }
+    }
+    if (IsLogicalImmediate()) {
+      // Of the logical (immediate) instructions, only ANDS (and its aliases)
+      // can set the flags. The others can all write into sp.
+      // Note that some logical operations are not available to
+      // immediate-operand instructions, so we have to combine two masks here.
+      if (Mask(LogicalImmediateMask & LogicalOpMask) == ANDS) {
+        return Reg31IsZeroRegister;
+      } else {
+        return Reg31IsStackPointer;
+      }
+    }
+    return Reg31IsZeroRegister;
+  }
+
+  // Indicate whether Rn can be the stack pointer or the zero register. This
+  // does not check that the instruction actually has an Rn field.
+  Reg31Mode RnMode() const {
+    // The following instructions use sp or wsp as Rn:
+    //  All loads and stores.
+    //  Add/sub (immediate).
+    //  Add/sub (extended).
+    // Otherwise, r31 is the zero register.
+    if (IsLoadOrStore() || IsAddSubImmediate() || IsAddSubExtended()) {
+      return Reg31IsStackPointer;
+    }
+    return Reg31IsZeroRegister;
+  }
+
+  ImmBranchType BranchType() const {
+    if (IsCondBranchImm()) {
+      return CondBranchType;
+    } else if (IsUncondBranchImm()) {
+      return UncondBranchType;
+    } else if (IsCompareBranch()) {
+      return CompareBranchType;
+    } else if (IsTestBranch()) {
+      return TestBranchType;
+    } else {
+      return UnknownBranchType;
+    }
+  }
+
+  // Find the target of this instruction. 'this' may be a branch or a
+  // PC-relative addressing instruction.
+  const Instruction* ImmPCOffsetTarget() const;
+
+  // Patch a PC-relative offset to refer to 'target'. 'this' may be a branch or
+  // a PC-relative addressing instruction.
+  void SetImmPCOffsetTarget(const Instruction* target);
+  // Patch a literal load instruction to load from 'source'.
+  void SetImmLLiteral(const Instruction* source);
+
+  // Calculate the address of a literal referred to by a load-literal
+  // instruction, and return it as the specified type.
+  //
+  // The literal itself is safely mutable only if the backing buffer is safely
+  // mutable.
+  template <typename T>
+  T LiteralAddress() const {
+    uint64_t base_raw = reinterpret_cast<uintptr_t>(this);
+    ptrdiff_t offset = ImmLLiteral() << kLiteralEntrySizeLog2;
+    uint64_t address_raw = base_raw + offset;
+
+    // Cast the address using a C-style cast. A reinterpret_cast would be
+    // appropriate, but it can't cast one integral type to another.
+    T address = (T)(address_raw);
+
+    // Assert that the address can be represented by the specified type.
+    VIXL_ASSERT((uint64_t)(address) == address_raw);
+
+    return address;
+  }
+
+  uint32_t Literal32() const {
+    uint32_t literal;
+    memcpy(&literal, LiteralAddress<const void*>(), sizeof(literal));
+    return literal;
+  }
+
+  uint64_t Literal64() const {
+    uint64_t literal;
+    memcpy(&literal, LiteralAddress<const void*>(), sizeof(literal));
+    return literal;
+  }
+
+  float LiteralFP32() const {
+    return rawbits_to_float(Literal32());
+  }
+
+  double LiteralFP64() const {
+    return rawbits_to_double(Literal64());
+  }
+
+  const Instruction* NextInstruction() const {
+    return this + kInstructionSize;
+  }
+
+  const Instruction* InstructionAtOffset(int64_t offset) const {
+    VIXL_ASSERT(IsWordAligned(this + offset));
+    return this + offset;
+  }
+
+  template<typename T> static Instruction* Cast(T src) {
+    return reinterpret_cast<Instruction*>(src);
+  }
+
+  template<typename T> static const Instruction* CastConst(T src) {
+    return reinterpret_cast<const Instruction*>(src);
+  }
+
+ private:
+  int ImmBranch() const;
+
+  void SetPCRelImmTarget(const Instruction* target);
+  void SetBranchImmTarget(const Instruction* target);
+};
+}  // namespace vixl
+
+#endif  // VIXL_A64_INSTRUCTIONS_A64_H_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Instrument-vixl.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Instrument-vixl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Instrument-vixl.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Instrument-vixl.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,642 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#include "jit/arm64/vixl/Instrument-vixl.h"
+
+namespace vixl {
+
+Counter::Counter(const char* name, CounterType type)
+    : count_(0), enabled_(false), type_(type) {
+  VIXL_ASSERT(name != NULL);
+  strncpy(name_, name, kCounterNameMaxLength);
+}
+
+
+void Counter::Enable() {
+  enabled_ = true;
+}
+
+
+void Counter::Disable() {
+  enabled_ = false;
+}
+
+
+bool Counter::IsEnabled() {
+  return enabled_;
+}
+
+
+void Counter::Increment() {
+  if (enabled_) {
+    count_++;
+  }
+}
+
+
+uint64_t Counter::count() {
+  uint64_t result = count_;
+  if (type_ == Gauge) {
+    // If the counter is a Gauge, reset the count after reading.
+    count_ = 0;
+  }
+  return result;
+}
+
+
+const char* Counter::name() {
+  return name_;
+}
+
+
+CounterType Counter::type() {
+  return type_;
+}
+
+
+typedef struct {
+  const char* name;
+  CounterType type;
+} CounterDescriptor;
+
+
+static const CounterDescriptor kCounterList[] = {
+  {"Instruction", Cumulative},
+
+  {"Move Immediate", Gauge},
+  {"Add/Sub DP", Gauge},
+  {"Logical DP", Gauge},
+  {"Other Int DP", Gauge},
+  {"FP DP", Gauge},
+
+  {"Conditional Select", Gauge},
+  {"Conditional Compare", Gauge},
+
+  {"Unconditional Branch", Gauge},
+  {"Compare and Branch", Gauge},
+  {"Test and Branch", Gauge},
+  {"Conditional Branch", Gauge},
+
+  {"Load Integer", Gauge},
+  {"Load FP", Gauge},
+  {"Load Pair", Gauge},
+  {"Load Literal", Gauge},
+
+  {"Store Integer", Gauge},
+  {"Store FP", Gauge},
+  {"Store Pair", Gauge},
+
+  {"PC Addressing", Gauge},
+  {"Other", Gauge},
+};
+
+
+Instrument::Instrument(const char* datafile, uint64_t sample_period)
+    : output_stream_(stdout), sample_period_(sample_period) {
+
+  // Set up the output stream. If datafile is non-NULL, use that file. If it
+  // can't be opened, or datafile is NULL, use stdout.
+  if (datafile != NULL) {
+    output_stream_ = fopen(datafile, "w");
+    if (output_stream_ == NULL) {
+      printf("Can't open output file %s. Using stdout.\n", datafile);
+      output_stream_ = stdout;
+    }
+  }
+
+  static const int num_counters =
+    sizeof(kCounterList) / sizeof(CounterDescriptor);
+
+  // Dump an instrumentation description comment at the top of the file.
+  fprintf(output_stream_, "# counters=%d\n", num_counters);
+  fprintf(output_stream_, "# sample_period=%" PRIu64 "\n", sample_period_);
+
+  // Construct Counter objects from counter description array.
+  for (int i = 0; i < num_counters; i++) {
+    Counter* counter = new Counter(kCounterList[i].name, kCounterList[i].type);
+    counters_.push_back(counter);
+  }
+
+  DumpCounterNames();
+}
+
+
+Instrument::~Instrument() {
+  // Dump any remaining instruction data to the output file.
+  DumpCounters();
+
+  // Free all the counter objects.
+  std::list<Counter*>::iterator it;
+  for (it = counters_.begin(); it != counters_.end(); it++) {
+    delete *it;
+  }
+
+  if (output_stream_ != stdout) {
+    fclose(output_stream_);
+  }
+}
+
+
+void Instrument::Update() {
+  // Increment the instruction counter, and dump all counters if a sample period
+  // has elapsed.
+  static Counter* counter = GetCounter("Instruction");
+  VIXL_ASSERT(counter->type() == Cumulative);
+  counter->Increment();
+
+  if (counter->IsEnabled() && (counter->count() % sample_period_) == 0) {
+    DumpCounters();
+  }
+}
+
+
+void Instrument::DumpCounters() {
+  // Iterate through the counter objects, dumping their values to the output
+  // stream.
+  std::list<Counter*>::const_iterator it;
+  for (it = counters_.begin(); it != counters_.end(); it++) {
+    fprintf(output_stream_, "%" PRIu64 ",", (*it)->count());
+  }
+  fprintf(output_stream_, "\n");
+  fflush(output_stream_);
+}
+
+
+void Instrument::DumpCounterNames() {
+  // Iterate through the counter objects, dumping the counter names to the
+  // output stream.
+  std::list<Counter*>::const_iterator it;
+  for (it = counters_.begin(); it != counters_.end(); it++) {
+    fprintf(output_stream_, "%s,", (*it)->name());
+  }
+  fprintf(output_stream_, "\n");
+  fflush(output_stream_);
+}
+
+
+void Instrument::HandleInstrumentationEvent(unsigned event) {
+  switch (event) {
+    case InstrumentStateEnable: Enable(); break;
+    case InstrumentStateDisable: Disable(); break;
+    default: DumpEventMarker(event);
+  }
+}
+
+
+void Instrument::DumpEventMarker(unsigned marker) {
+  // Dumpan event marker to the output stream as a specially formatted comment
+  // line.
+  static Counter* counter = GetCounter("Instruction");
+
+  fprintf(output_stream_, "# %c%c @ %" PRId64 "\n", marker & 0xff,
+          (marker >> 8) & 0xff, counter->count());
+}
+
+
+Counter* Instrument::GetCounter(const char* name) {
+  // Get a Counter object by name from the counter list.
+  std::list<Counter*>::const_iterator it;
+  for (it = counters_.begin(); it != counters_.end(); it++) {
+    if (strcmp((*it)->name(), name) == 0) {
+      return *it;
+    }
+  }
+
+  // A Counter by that name does not exist: print an error message to stderr
+  // and the output file, and exit.
+  static const char* error_message =
+    "# Error: Unknown counter \"%s\". Exiting.\n";
+  fprintf(stderr, error_message, name);
+  fprintf(output_stream_, error_message, name);
+  exit(1);
+}
+
+
+void Instrument::Enable() {
+  std::list<Counter*>::iterator it;
+  for (it = counters_.begin(); it != counters_.end(); it++) {
+    (*it)->Enable();
+  }
+}
+
+
+void Instrument::Disable() {
+  std::list<Counter*>::iterator it;
+  for (it = counters_.begin(); it != counters_.end(); it++) {
+    (*it)->Disable();
+  }
+}
+
+
+void Instrument::VisitPCRelAddressing(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("PC Addressing");
+  counter->Increment();
+}
+
+
+void Instrument::VisitAddSubImmediate(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Add/Sub DP");
+  counter->Increment();
+}
+
+
+void Instrument::VisitLogicalImmediate(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Logical DP");
+  counter->Increment();
+}
+
+
+void Instrument::VisitMoveWideImmediate(const Instruction* instr) {
+  Update();
+  static Counter* counter = GetCounter("Move Immediate");
+
+  if (instr->IsMovn() && (instr->Rd() == kZeroRegCode)) {
+    unsigned imm = instr->ImmMoveWide();
+    HandleInstrumentationEvent(imm);
+  } else {
+    counter->Increment();
+  }
+}
+
+
+void Instrument::VisitBitfield(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Other Int DP");
+  counter->Increment();
+}
+
+
+void Instrument::VisitExtract(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Other Int DP");
+  counter->Increment();
+}
+
+
+void Instrument::VisitUnconditionalBranch(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Unconditional Branch");
+  counter->Increment();
+}
+
+
+void Instrument::VisitUnconditionalBranchToRegister(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Unconditional Branch");
+  counter->Increment();
+}
+
+
+void Instrument::VisitCompareBranch(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Compare and Branch");
+  counter->Increment();
+}
+
+
+void Instrument::VisitTestBranch(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Test and Branch");
+  counter->Increment();
+}
+
+
+void Instrument::VisitConditionalBranch(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Conditional Branch");
+  counter->Increment();
+}
+
+
+void Instrument::VisitSystem(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Other");
+  counter->Increment();
+}
+
+
+void Instrument::VisitException(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Other");
+  counter->Increment();
+}
+
+
+void Instrument::InstrumentLoadStorePair(const Instruction* instr) {
+  static Counter* load_pair_counter = GetCounter("Load Pair");
+  static Counter* store_pair_counter = GetCounter("Store Pair");
+
+  if (instr->Mask(LoadStorePairLBit) != 0) {
+    load_pair_counter->Increment();
+  } else {
+    store_pair_counter->Increment();
+  }
+}
+
+
+void Instrument::VisitLoadStorePairPostIndex(const Instruction* instr) {
+  Update();
+  InstrumentLoadStorePair(instr);
+}
+
+
+void Instrument::VisitLoadStorePairOffset(const Instruction* instr) {
+  Update();
+  InstrumentLoadStorePair(instr);
+}
+
+
+void Instrument::VisitLoadStorePairPreIndex(const Instruction* instr) {
+  Update();
+  InstrumentLoadStorePair(instr);
+}
+
+
+void Instrument::VisitLoadStorePairNonTemporal(const Instruction* instr) {
+  Update();
+  InstrumentLoadStorePair(instr);
+}
+
+
+void Instrument::VisitLoadStoreExclusive(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Other");
+  counter->Increment();
+}
+
+
+void Instrument::VisitLoadLiteral(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Load Literal");
+  counter->Increment();
+}
+
+
+void Instrument::InstrumentLoadStore(const Instruction* instr) {
+  static Counter* load_int_counter = GetCounter("Load Integer");
+  static Counter* store_int_counter = GetCounter("Store Integer");
+  static Counter* load_fp_counter = GetCounter("Load FP");
+  static Counter* store_fp_counter = GetCounter("Store FP");
+
+  switch (instr->Mask(LoadStoreOpMask)) {
+    case STRB_w:    // Fall through.
+    case STRH_w:    // Fall through.
+    case STR_w:     // Fall through.
+    case STR_x:     store_int_counter->Increment(); break;
+    case STR_s:     // Fall through.
+    case STR_d:     store_fp_counter->Increment(); break;
+    case LDRB_w:    // Fall through.
+    case LDRH_w:    // Fall through.
+    case LDR_w:     // Fall through.
+    case LDR_x:     // Fall through.
+    case LDRSB_x:   // Fall through.
+    case LDRSH_x:   // Fall through.
+    case LDRSW_x:   // Fall through.
+    case LDRSB_w:   // Fall through.
+    case LDRSH_w:   load_int_counter->Increment(); break;
+    case LDR_s:     // Fall through.
+    case LDR_d:     load_fp_counter->Increment(); break;
+  }
+}
+
+
+void Instrument::VisitLoadStoreUnscaledOffset(const Instruction* instr) {
+  Update();
+  InstrumentLoadStore(instr);
+}
+
+
+void Instrument::VisitLoadStorePostIndex(const Instruction* instr) {
+  USE(instr);
+  Update();
+  InstrumentLoadStore(instr);
+}
+
+
+void Instrument::VisitLoadStorePreIndex(const Instruction* instr) {
+  Update();
+  InstrumentLoadStore(instr);
+}
+
+
+void Instrument::VisitLoadStoreRegisterOffset(const Instruction* instr) {
+  Update();
+  InstrumentLoadStore(instr);
+}
+
+
+void Instrument::VisitLoadStoreUnsignedOffset(const Instruction* instr) {
+  Update();
+  InstrumentLoadStore(instr);
+}
+
+
+void Instrument::VisitLogicalShifted(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Logical DP");
+  counter->Increment();
+}
+
+
+void Instrument::VisitAddSubShifted(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Add/Sub DP");
+  counter->Increment();
+}
+
+
+void Instrument::VisitAddSubExtended(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Add/Sub DP");
+  counter->Increment();
+}
+
+
+void Instrument::VisitAddSubWithCarry(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Add/Sub DP");
+  counter->Increment();
+}
+
+
+void Instrument::VisitConditionalCompareRegister(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Conditional Compare");
+  counter->Increment();
+}
+
+
+void Instrument::VisitConditionalCompareImmediate(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Conditional Compare");
+  counter->Increment();
+}
+
+
+void Instrument::VisitConditionalSelect(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Conditional Select");
+  counter->Increment();
+}
+
+
+void Instrument::VisitDataProcessing1Source(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Other Int DP");
+  counter->Increment();
+}
+
+
+void Instrument::VisitDataProcessing2Source(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Other Int DP");
+  counter->Increment();
+}
+
+
+void Instrument::VisitDataProcessing3Source(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Other Int DP");
+  counter->Increment();
+}
+
+
+void Instrument::VisitFPCompare(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("FP DP");
+  counter->Increment();
+}
+
+
+void Instrument::VisitFPConditionalCompare(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Conditional Compare");
+  counter->Increment();
+}
+
+
+void Instrument::VisitFPConditionalSelect(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Conditional Select");
+  counter->Increment();
+}
+
+
+void Instrument::VisitFPImmediate(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("FP DP");
+  counter->Increment();
+}
+
+
+void Instrument::VisitFPDataProcessing1Source(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("FP DP");
+  counter->Increment();
+}
+
+
+void Instrument::VisitFPDataProcessing2Source(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("FP DP");
+  counter->Increment();
+}
+
+
+void Instrument::VisitFPDataProcessing3Source(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("FP DP");
+  counter->Increment();
+}
+
+
+void Instrument::VisitFPIntegerConvert(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("FP DP");
+  counter->Increment();
+}
+
+
+void Instrument::VisitFPFixedPointConvert(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("FP DP");
+  counter->Increment();
+}
+
+
+void Instrument::VisitUnallocated(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Other");
+  counter->Increment();
+}
+
+
+void Instrument::VisitUnimplemented(const Instruction* instr) {
+  USE(instr);
+  Update();
+  static Counter* counter = GetCounter("Other");
+  counter->Increment();
+}
+
+
+}  // namespace vixl
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Instrument-vixl.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Instrument-vixl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Instrument-vixl.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Instrument-vixl.h	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,106 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#ifndef VIXL_A64_INSTRUMENT_A64_H_
+#define VIXL_A64_INSTRUMENT_A64_H_
+
+#include "jit/arm64/vixl/Constants-vixl.h"
+#include "jit/arm64/vixl/Decoder-vixl.h"
+#include "jit/arm64/vixl/Globals-vixl.h"
+#include "jit/arm64/vixl/Utils-vixl.h"
+
+namespace vixl {
+
+const int kCounterNameMaxLength = 256;
+const uint64_t kDefaultInstrumentationSamplingPeriod = 1 << 22;
+
+
+enum InstrumentState {
+  InstrumentStateDisable = 0,
+  InstrumentStateEnable = 1
+};
+
+
+enum CounterType {
+  Gauge = 0,      // Gauge counters reset themselves after reading.
+  Cumulative = 1  // Cumulative counters keep their value after reading.
+};
+
+
+class Counter {
+ public:
+  explicit Counter(const char* name, CounterType type = Gauge);
+
+  void Increment();
+  void Enable();
+  void Disable();
+  bool IsEnabled();
+  uint64_t count();
+  const char* name();
+  CounterType type();
+
+ private:
+  char name_[kCounterNameMaxLength];
+  uint64_t count_;
+  bool enabled_;
+  CounterType type_;
+};
+
+
+class Instrument: public DecoderVisitor {
+ public:
+  explicit Instrument(const char* datafile = NULL,
+    uint64_t sample_period = kDefaultInstrumentationSamplingPeriod);
+  ~Instrument();
+
+  void Enable();
+  void Disable();
+
+  // Declare all Visitor functions.
+  #define DECLARE(A) void Visit##A(const Instruction* instr);
+  VISITOR_LIST(DECLARE)
+  #undef DECLARE
+
+ private:
+  void Update();
+  void DumpCounters();
+  void DumpCounterNames();
+  void DumpEventMarker(unsigned marker);
+  void HandleInstrumentationEvent(unsigned event);
+  Counter* GetCounter(const char* name);
+
+  void InstrumentLoadStore(const Instruction* instr);
+  void InstrumentLoadStorePair(const Instruction* instr);
+
+  std::list<Counter*> counters_;
+
+  FILE *output_stream_;
+  uint64_t sample_period_;
+};
+
+}  // namespace vixl
+
+#endif  // VIXL_A64_INSTRUMENT_A64_H_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/MacroAssembler-vixl.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/MacroAssembler-vixl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/MacroAssembler-vixl.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/MacroAssembler-vixl.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,1532 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#include "jit/arm64/vixl/MacroAssembler-vixl.h"
+
+#include <ctype.h>
+
+namespace vixl {
+
+
+void MacroAssembler::B(Label* label, BranchType type, Register reg, int bit) {
+  VIXL_ASSERT((reg.Is(NoReg) || (type >= kBranchTypeFirstUsingReg)));
+  VIXL_ASSERT((bit == -1) || (type >= kBranchTypeFirstUsingBit));
+
+  if (kBranchTypeFirstCondition <= type && type <= kBranchTypeLastCondition) {
+    B(static_cast<Condition>(type), label);
+  } else {
+    switch (type) {
+    case always:
+      B(label);
+      break;
+    case never:
+      break;
+    case reg_zero:
+      Cbz(reg, label);
+      break;
+    case reg_not_zero:
+      Cbnz(reg, label);
+      break;
+    case reg_bit_clear:
+      Tbz(reg, bit, label);
+      break;
+    case reg_bit_set:
+      Tbnz(reg, bit, label);
+      break;
+    default:
+      VIXL_UNREACHABLE();
+    }
+  }
+}
+
+
+void MacroAssembler::And(const Register& rd, const Register& rn, const Operand& operand) {
+  LogicalMacro(rd, rn, operand, AND);
+}
+
+
+void MacroAssembler::Ands(const Register& rd, const Register& rn, const Operand& operand) {
+  LogicalMacro(rd, rn, operand, ANDS);
+}
+
+
+void MacroAssembler::Tst(const Register& rn, const Operand& operand) {
+  Ands(AppropriateZeroRegFor(rn), rn, operand);
+}
+
+
+void MacroAssembler::Bic(const Register& rd, const Register& rn, const Operand& operand) {
+  LogicalMacro(rd, rn, operand, BIC);
+}
+
+
+void MacroAssembler::Bics(const Register& rd, const Register& rn, const Operand& operand) {
+  LogicalMacro(rd, rn, operand, BICS);
+}
+
+
+void MacroAssembler::Orr(const Register& rd, const Register& rn, const Operand& operand) {
+  LogicalMacro(rd, rn, operand, ORR);
+}
+
+
+void MacroAssembler::Orn(const Register& rd, const Register& rn, const Operand& operand) {
+  LogicalMacro(rd, rn, operand, ORN);
+}
+
+
+void MacroAssembler::Eor(const Register& rd, const Register& rn, const Operand& operand) {
+  LogicalMacro(rd, rn, operand, EOR);
+}
+
+
+void MacroAssembler::Eon(const Register& rd, const Register& rn, const Operand& operand) {
+  LogicalMacro(rd, rn, operand, EON);
+}
+
+
+void MacroAssembler::LogicalMacro(const Register& rd, const Register& rn,
+                                  const Operand& operand, LogicalOp op) {
+  UseScratchRegisterScope temps(this);
+
+  if (operand.IsImmediate()) {
+    int64_t immediate = operand.immediate();
+    unsigned reg_size = rd.size();
+
+    // If the operation is NOT, invert the operation and immediate.
+    if ((op & NOT) == NOT) {
+      op = static_cast<LogicalOp>(op & ~NOT);
+      immediate = ~immediate;
+    }
+
+    // Ignore the top 32 bits of an immediate if we're moving to a W register.
+    if (rd.Is32Bits()) {
+      // Check that the top 32 bits are consistent.
+      VIXL_ASSERT(((immediate >> kWRegSize) == 0) ||
+                 ((immediate >> kWRegSize) == -1));
+      immediate &= kWRegMask;
+    }
+
+    VIXL_ASSERT(rd.Is64Bits() || is_uint32(immediate));
+
+    // Special cases for all set or all clear immediates.
+    if (immediate == 0) {
+      switch (op) {
+      case AND:
+        Mov(rd, 0);
+        return;
+      case ORR:  // Fall through.
+      case EOR:
+        Mov(rd, rn);
+        return;
+      case ANDS:  // Fall through.
+      case BICS:
+        break;
+      default:
+        VIXL_UNREACHABLE();
+      }
+    } else if ((rd.Is64Bits() && (immediate == -1)) ||
+               (rd.Is32Bits() && (immediate == 0xffffffff))) {
+      switch (op) {
+      case AND:
+        Mov(rd, rn);
+        return;
+      case ORR:
+        Mov(rd, immediate);
+        return;
+      case EOR:
+        Mvn(rd, rn);
+        return;
+      case ANDS:  // Fall through.
+      case BICS:
+        break;
+      default:
+        VIXL_UNREACHABLE();
+      }
+    }
+
+    unsigned n, imm_s, imm_r;
+    if (IsImmLogical(immediate, reg_size, &n, &imm_s, &imm_r)) {
+      // Immediate can be encoded in the instruction.
+      LogicalImmediate(rd, rn, n, imm_s, imm_r, op);
+    } else {
+      // Immediate can't be encoded: synthesize using move immediate.
+      Register temp = temps.AcquireSameSizeAs(rn);
+      Operand imm_operand = MoveImmediateForShiftedOp(temp, immediate);
+
+      // VIXL can acquire temp registers. Assert that the caller is aware.
+      VIXL_ASSERT(!temp.Is(rd) && !temp.Is(rn));
+      VIXL_ASSERT(!temp.Is(operand.maybeReg()));
+
+      if (rd.Is(sp)) {
+        // If rd is the stack pointer we cannot use it as the destination
+        // register so we use the temp register as an intermediate again.
+        Logical(temp, rn, imm_operand, op);
+        Mov(sp, temp);
+      } else {
+        Logical(rd, rn, imm_operand, op);
+      }
+    }
+
+  } else if (operand.IsExtendedRegister()) {
+    VIXL_ASSERT(operand.reg().size() <= rd.size());
+    // Add/sub extended supports shift <= 4. We want to support exactly the
+    // same modes here.
+    VIXL_ASSERT(operand.shift_amount() <= 4);
+    VIXL_ASSERT(operand.reg().Is64Bits() ||
+               ((operand.extend() != UXTX) && (operand.extend() != SXTX)));
+
+    temps.Exclude(operand.reg());
+    Register temp = temps.AcquireSameSizeAs(rn);
+
+    // VIXL can acquire temp registers. Assert that the caller is aware.
+    VIXL_ASSERT(!temp.Is(rd) && !temp.Is(rn));
+    VIXL_ASSERT(!temp.Is(operand.maybeReg()));
+
+    EmitExtendShift(temp, operand.reg(), operand.extend(),
+                    operand.shift_amount());
+    Logical(rd, rn, Operand(temp), op);
+  } else {
+    // The operand can be encoded in the instruction.
+    VIXL_ASSERT(operand.IsShiftedRegister());
+    Logical(rd, rn, operand, op);
+  }
+}
+
+
+void MacroAssembler::Mov(const Register& rd, const Operand& operand, DiscardMoveMode discard_mode) {
+  if (operand.IsImmediate()) {
+    // Call the macro assembler for generic immediates.
+    Mov(rd, operand.immediate());
+  } else if (operand.IsShiftedRegister() && (operand.shift_amount() != 0)) {
+    // Emit a shift instruction if moving a shifted register. This operation
+    // could also be achieved using an orr instruction (like orn used by Mvn),
+    // but using a shift instruction makes the disassembly clearer.
+    EmitShift(rd, operand.reg(), operand.shift(), operand.shift_amount());
+  } else if (operand.IsExtendedRegister()) {
+    // Emit an extend instruction if moving an extended register. This handles
+    // extend with post-shift operations, too.
+    EmitExtendShift(rd, operand.reg(), operand.extend(), operand.shift_amount());
+  } else {
+    // Otherwise, emit a register move only if the registers are distinct, or
+    // if they are not X registers.
+    //
+    // Note that mov(w0, w0) is not a no-op because it clears the top word of
+    // x0. A flag is provided (kDiscardForSameWReg) if a move between the same W
+    // registers is not required to clear the top word of the X register. In
+    // this case, the instruction is discarded.
+    //
+    // If the sp is an operand, add #0 is emitted, otherwise, orr #0.
+    if (!rd.Is(operand.reg()) || (rd.Is32Bits() && (discard_mode == kDontDiscardForSameWReg)))
+      mov(rd, operand.reg());
+  }
+}
+
+
+void MacroAssembler::Mvn(const Register& rd, const Operand& operand) {
+  if (operand.IsImmediate()) {
+    // Call the macro assembler for generic immediates.
+    Mvn(rd, operand.immediate());
+  } else if (operand.IsExtendedRegister()) {
+    UseScratchRegisterScope temps(this);
+    temps.Exclude(operand.reg());
+
+    // Emit two instructions for the extend case. This differs from Mov, as
+    // the extend and invert can't be achieved in one instruction.
+    Register temp = temps.AcquireSameSizeAs(rd);
+
+    // VIXL can acquire temp registers. Assert that the caller is aware.
+    VIXL_ASSERT(!temp.Is(rd) && !temp.Is(operand.maybeReg()));
+
+    EmitExtendShift(temp, operand.reg(), operand.extend(), operand.shift_amount());
+    mvn(rd, Operand(temp));
+  } else {
+    // Otherwise, register and shifted register cases can be handled by the
+    // assembler directly, using orn.
+    mvn(rd, operand);
+  }
+}
+
+
+void MacroAssembler::Mov(const Register& rd, uint64_t imm) {
+  VIXL_ASSERT(is_uint32(imm) || is_int32(imm) || rd.Is64Bits());
+
+  // Immediates on Aarch64 can be produced using an initial value, and zero to
+  // three move keep operations.
+  // JS_STATIC_ASSERT(kMaxInstrForMoveImm == 4);
+
+  // Initial values can be generated with:
+  //  1. 64-bit move zero (movz).
+  //  2. 32-bit move inverted (movn).
+  //  3. 64-bit move inverted.
+  //  4. 32-bit orr immediate.
+  //  5. 64-bit orr immediate.
+  // Move-keep may then be used to modify each of the 16-bit half words.
+  //
+  // The code below supports all five initial value generators, and
+  // applying move-keep operations to move-zero and move-inverted initial
+  // values.
+
+  // Try to move the immediate in one instruction, and if that fails, switch to
+  // using multiple instructions.
+  if (!TryOneInstrMoveImmediate(rd, imm)) {
+    unsigned reg_size = rd.size();
+
+    // Generic immediate case. Imm will be represented by
+    //   [imm3, imm2, imm1, imm0], where each imm is 16 bits.
+    // A move-zero or move-inverted is generated for the first non-zero or
+    // non-0xffff immX, and a move-keep for subsequent non-zero immX.
+
+    uint64_t ignored_halfword = 0;
+    bool invert_move = false;
+    // If the number of 0xffff halfwords is greater than the number of 0x0000
+    // halfwords, it's more efficient to use move-inverted.
+    if (CountClearHalfWords(~imm, reg_size) > CountClearHalfWords(imm, reg_size)) {
+      ignored_halfword = 0xffff;
+      invert_move = true;
+    }
+
+    // Mov instructions can't move values into the stack pointer, so set up a
+    // temporary register, if needed.
+    UseScratchRegisterScope temps(this);
+    Register temp = rd.IsSP() ? temps.AcquireSameSizeAs(rd) : rd;
+
+    // Iterate through the halfwords. Use movn/movz for the first non-ignored
+    // halfword, and movk for subsequent halfwords.
+    VIXL_ASSERT((reg_size % 16) == 0);
+    bool first_mov_done = false;
+    for (unsigned i = 0; i < (temp.size() / 16); i++) {
+      uint64_t imm16 = (imm >> (16 * i)) & 0xffff;
+      if (imm16 != ignored_halfword) {
+        if (!first_mov_done) {
+          if (invert_move)
+            movn(temp, ~imm16 & 0xffff, 16 * i);
+          else
+            movz(temp, imm16, 16 * i);
+          first_mov_done = true;
+        } else {
+          // Construct a wider constant.
+          movk(temp, imm16, 16 * i);
+        }
+      }
+    }
+
+    VIXL_ASSERT(first_mov_done);
+
+    // Move the temporary if the original destination register was the stack
+    // pointer.
+    if (rd.IsSP())
+      mov(rd, temp);
+  }
+}
+
+
+unsigned MacroAssembler::CountClearHalfWords(uint64_t imm, unsigned reg_size) {
+  VIXL_ASSERT((reg_size % 8) == 0);
+  int count = 0;
+  for (unsigned i = 0; i < (reg_size / 16); i++) {
+    if ((imm & 0xffff) == 0)
+      count++;
+    imm >>= 16;
+  }
+  return count;
+}
+
+
+// The movz instruction can generate immediates containing an arbitrary 16-bit
+// value, with remaining bits clear, eg. 0x00001234, 0x0000123400000000.
+bool MacroAssembler::IsImmMovz(uint64_t imm, unsigned reg_size) {
+  VIXL_ASSERT((reg_size == kXRegSize) || (reg_size == kWRegSize));
+  return CountClearHalfWords(imm, reg_size) >= ((reg_size / 16) - 1);
+}
+
+
+// The movn instruction can generate immediates containing an arbitrary 16-bit
+// value, with remaining bits set, eg. 0xffff1234, 0xffff1234ffffffff.
+bool MacroAssembler::IsImmMovn(uint64_t imm, unsigned reg_size) {
+  return IsImmMovz(~imm, reg_size);
+}
+
+
+void MacroAssembler::Ccmp(const Register& rn, const Operand& operand,
+                          StatusFlags nzcv, Condition cond) {
+  if (operand.IsImmediate() && (operand.immediate() < 0))
+    ConditionalCompareMacro(rn, -operand.immediate(), nzcv, cond, CCMN);
+  else
+    ConditionalCompareMacro(rn, operand, nzcv, cond, CCMP);
+}
+
+
+void MacroAssembler::Ccmn(const Register& rn, const Operand& operand,
+                          StatusFlags nzcv, Condition cond) {
+  if (operand.IsImmediate() && (operand.immediate() < 0))
+    ConditionalCompareMacro(rn, -operand.immediate(), nzcv, cond, CCMP);
+  else
+    ConditionalCompareMacro(rn, operand, nzcv, cond, CCMN);
+}
+
+
+void MacroAssembler::ConditionalCompareMacro(const Register& rn, const Operand& operand,
+                                             StatusFlags nzcv, Condition cond,
+                                             ConditionalCompareOp op) {
+  VIXL_ASSERT((cond != al) && (cond != nv));
+  if ((operand.IsShiftedRegister() && (operand.shift_amount() == 0)) ||
+      (operand.IsImmediate() && IsImmConditionalCompare(operand.immediate()))) {
+    // The immediate can be encoded in the instruction, or the operand is an
+    // unshifted register: call the assembler.
+    ConditionalCompare(rn, operand, nzcv, cond, op);
+  } else {
+    UseScratchRegisterScope temps(this);
+    // The operand isn't directly supported by the instruction: perform the
+    // operation on a temporary register.
+    Register temp = temps.AcquireSameSizeAs(rn);
+    VIXL_ASSERT(!temp.Is(rn) && !temp.Is(operand.maybeReg()));
+
+    Mov(temp, operand);
+    ConditionalCompare(rn, temp, nzcv, cond, op);
+  }
+}
+
+
+void MacroAssembler::Csel(const Register& rd, const Register& rn,
+                          const Operand& operand, Condition cond) {
+  VIXL_ASSERT(!rd.IsZero());
+  VIXL_ASSERT(!rn.IsZero());
+  VIXL_ASSERT((cond != al) && (cond != nv));
+  if (operand.IsImmediate()) {
+    // Immediate argument. Handle special cases of 0, 1 and -1 using zero
+    // register.
+    int64_t imm = operand.immediate();
+    Register zr = AppropriateZeroRegFor(rn);
+    if (imm == 0) {
+      csel(rd, rn, zr, cond);
+    } else if (imm == 1) {
+      csinc(rd, rn, zr, cond);
+    } else if (imm == -1) {
+      csinv(rd, rn, zr, cond);
+    } else {
+      UseScratchRegisterScope temps(this);
+      Register temp = temps.AcquireSameSizeAs(rn);
+      VIXL_ASSERT(!temp.Is(rd) && !temp.Is(rn));
+      VIXL_ASSERT(!temp.Is(operand.maybeReg()));
+
+      Mov(temp, operand.immediate());
+      csel(rd, rn, temp, cond);
+    }
+  } else if (operand.IsShiftedRegister() && (operand.shift_amount() == 0)) {
+    // Unshifted register argument.
+    csel(rd, rn, operand.reg(), cond);
+  } else {
+    // All other arguments.
+    UseScratchRegisterScope temps(this);
+    Register temp = temps.AcquireSameSizeAs(rn);
+    VIXL_ASSERT(!temp.Is(rd) && !temp.Is(rn));
+    VIXL_ASSERT(!temp.Is(operand.maybeReg()));
+
+    Mov(temp, operand);
+    csel(rd, rn, temp, cond);
+  }
+}
+
+
+void MacroAssembler::Add(const Register& rd, const Register& rn, const Operand& operand) {
+  if (operand.IsImmediate() && (operand.immediate() < 0) && IsImmAddSub(-operand.immediate()))
+    AddSubMacro(rd, rn, -operand.immediate(), LeaveFlags, SUB);
+  else
+    AddSubMacro(rd, rn, operand, LeaveFlags, ADD);
+}
+
+
+void MacroAssembler::Adds(const Register& rd, const Register& rn, const Operand& operand) {
+  if (operand.IsImmediate() && (operand.immediate() < 0) && IsImmAddSub(-operand.immediate()))
+    AddSubMacro(rd, rn, -operand.immediate(), SetFlags, SUB);
+  else
+    AddSubMacro(rd, rn, operand, SetFlags, ADD);
+}
+
+
+void MacroAssembler::Sub(const Register& rd, const Register& rn, const Operand& operand) {
+  if (operand.IsImmediate() && (operand.immediate() < 0) && IsImmAddSub(-operand.immediate()))
+    AddSubMacro(rd, rn, -operand.immediate(), LeaveFlags, ADD);
+  else
+    AddSubMacro(rd, rn, operand, LeaveFlags, SUB);
+}
+
+
+void MacroAssembler::Subs(const Register& rd, const Register& rn, const Operand& operand) {
+  if (operand.IsImmediate() && (operand.immediate() < 0) && IsImmAddSub(-operand.immediate()))
+    AddSubMacro(rd, rn, -operand.immediate(), SetFlags, ADD);
+  else
+    AddSubMacro(rd, rn, operand, SetFlags, SUB);
+}
+
+
+void MacroAssembler::Cmn(const Register& rn, const Operand& operand) {
+  Adds(AppropriateZeroRegFor(rn), rn, operand);
+}
+
+
+void MacroAssembler::Cmp(const Register& rn, const Operand& operand) {
+  Subs(AppropriateZeroRegFor(rn), rn, operand);
+}
+
+
+void MacroAssembler::Fcmp(const FPRegister& fn, double value) {
+  if (value != 0.0) {
+    UseScratchRegisterScope temps(this);
+    FPRegister temp = temps.AcquireSameSizeAs(fn);
+    VIXL_ASSERT(!temp.Is(fn));
+
+    Fmov(temp, value);
+    fcmp(fn, temp);
+  } else {
+    fcmp(fn, value);
+  }
+}
+
+
+void MacroAssembler::Fmov(FPRegister fd, double imm) {
+  if (fd.Is32Bits()) {
+    Fmov(fd, static_cast<float>(imm));
+    return;
+  }
+
+  VIXL_ASSERT(fd.Is64Bits());
+  if (IsImmFP64(imm))
+    fmov(fd, imm);
+  else if ((imm == 0.0) && (copysign(1.0, imm) == 1.0))
+    fmov(fd, xzr);
+  else
+    Assembler::fImmPool64(fd, imm);
+}
+
+
+void MacroAssembler::Fmov(FPRegister fd, float imm) {
+  if (fd.Is64Bits()) {
+    Fmov(fd, static_cast<double>(imm));
+    return;
+  }
+
+  VIXL_ASSERT(fd.Is32Bits());
+  if (IsImmFP32(imm))
+    fmov(fd, imm);
+  else if ((imm == 0.0) && (copysign(1.0, imm) == 1.0))
+    fmov(fd, wzr);
+  else
+    Assembler::fImmPool32(fd, imm);
+}
+
+
+void MacroAssembler::Neg(const Register& rd, const Operand& operand) {
+  if (operand.IsImmediate())
+    Mov(rd, -operand.immediate());
+  else
+    Sub(rd, AppropriateZeroRegFor(rd), operand);
+}
+
+
+void MacroAssembler::Negs(const Register& rd, const Operand& operand) {
+  Subs(rd, AppropriateZeroRegFor(rd), operand);
+}
+
+
+bool MacroAssembler::TryOneInstrMoveImmediate(const Register& dst, int64_t imm) {
+  unsigned n, imm_s, imm_r;
+  int reg_size = dst.size();
+
+  if (imm == 0 && !dst.IsSP()) {
+    // Zero is always held in the zero register.
+    mov(dst, AppropriateZeroRegFor(dst));
+    return true;
+  }
+
+  if (IsImmMovz(imm, reg_size) && !dst.IsSP()) {
+    // Immediate can be represented in a move zero instruction. Movz can't write
+    // to the stack pointer.
+    movz(dst, imm);
+    return true;
+  }
+
+  if (IsImmMovn(imm, reg_size) && !dst.IsSP()) {
+    // Immediate can be represented in a move negative instruction. Movn can't
+    // write to the stack pointer.
+    movn(dst, dst.Is64Bits() ? ~imm : (~imm & kWRegMask));
+    return true;
+  }
+
+  if (IsImmLogical(imm, reg_size, &n, &imm_s, &imm_r)) {
+    // Immediate can be represented in a logical orr instruction.
+    VIXL_ASSERT(!dst.IsZero());
+    LogicalImmediate(dst, AppropriateZeroRegFor(dst), n, imm_s, imm_r, ORR);
+    return true;
+  }
+
+  return false;
+}
+
+
+Operand MacroAssembler::MoveImmediateForShiftedOp(const Register& dst, int64_t imm) {
+  int reg_size = dst.size();
+
+  // Encode the immediate in a single move instruction, if possible.
+  if (TryOneInstrMoveImmediate(dst, imm)) {
+    // The move was successful; nothing to do here.
+  } else {
+    // Pre-shift the immediate to the least-significant bits of the register.
+    int shift_low = CountTrailingZeros(imm, reg_size);
+    int64_t imm_low = imm >> shift_low;
+
+    // Pre-shift the immediate to the most-significant bits of the register,
+    // inserting set bits in the least-significant bits.
+    int shift_high = CountLeadingZeros(imm, reg_size);
+    int64_t imm_high = (imm << shift_high) | ((1 << shift_high) - 1);
+
+    if (TryOneInstrMoveImmediate(dst, imm_low)) {
+      // The new immediate has been moved into the destination's low bits:
+      // return a new leftward-shifting operand.
+      return Operand(dst, LSL, shift_low);
+    } else if (TryOneInstrMoveImmediate(dst, imm_high)) {
+      // The new immediate has been moved into the destination's high bits:
+      // return a new rightward-shifting operand.
+      return Operand(dst, LSR, shift_high);
+    } else {
+      Mov(dst, imm);
+    }
+  }
+  return Operand(dst);
+}
+
+
+void MacroAssembler::AddSubMacro(const Register& rd, const Register& rn,
+                                 const Operand& operand, FlagsUpdate S, AddSubOp op) {
+  if (operand.IsZero() && rd.Is(rn) && rd.Is64Bits() && rn.Is64Bits() &&
+      (S == LeaveFlags)) {
+    // The instruction would be a nop. Avoid generating useless code.
+    return;
+  }
+
+  if ((operand.IsImmediate() && !IsImmAddSub(operand.immediate())) ||
+      (rn.IsZero() && !operand.IsShiftedRegister())                ||
+      (operand.IsShiftedRegister() && (operand.shift() == ROR))) {
+    UseScratchRegisterScope temps(this);
+    Register temp = temps.AcquireSameSizeAs(rn);
+
+    // VIXL can acquire temp registers. Assert that the caller is aware.
+    VIXL_ASSERT(!temp.Is(rd) && !temp.Is(rn));
+    VIXL_ASSERT(!temp.Is(operand.maybeReg()));
+
+    if (operand.IsImmediate()) {
+      Operand imm_operand = MoveImmediateForShiftedOp(temp, operand.immediate());
+      AddSub(rd, rn, imm_operand, S, op);
+    } else {
+      Mov(temp, operand);
+      AddSub(rd, rn, temp, S, op);
+    }
+  } else {
+    AddSub(rd, rn, operand, S, op);
+  }
+}
+
+
+void MacroAssembler::Adc(const Register& rd, const Register& rn, const Operand& operand) {
+  AddSubWithCarryMacro(rd, rn, operand, LeaveFlags, ADC);
+}
+
+
+void MacroAssembler::Adcs(const Register& rd, const Register& rn, const Operand& operand) {
+  AddSubWithCarryMacro(rd, rn, operand, SetFlags, ADC);
+}
+
+
+void MacroAssembler::Sbc(const Register& rd, const Register& rn, const Operand& operand) {
+  AddSubWithCarryMacro(rd, rn, operand, LeaveFlags, SBC);
+}
+
+
+void MacroAssembler::Sbcs(const Register& rd, const Register& rn, const Operand& operand) {
+  AddSubWithCarryMacro(rd, rn, operand, SetFlags, SBC);
+}
+
+
+void MacroAssembler::Ngc(const Register& rd, const Operand& operand) {
+  Register zr = AppropriateZeroRegFor(rd);
+  Sbc(rd, zr, operand);
+}
+
+
+void MacroAssembler::Ngcs(const Register& rd, const Operand& operand) {
+  Register zr = AppropriateZeroRegFor(rd);
+  Sbcs(rd, zr, operand);
+}
+
+
+void MacroAssembler::AddSubWithCarryMacro(const Register& rd, const Register& rn,
+                                          const Operand& operand, FlagsUpdate S, AddSubWithCarryOp op) {
+  VIXL_ASSERT(rd.size() == rn.size());
+  UseScratchRegisterScope temps(this);
+
+  if (operand.IsImmediate() || (operand.IsShiftedRegister() && (operand.shift() == ROR))) {
+    // Add/sub with carry (immediate or ROR shifted register.)
+    Register temp = temps.AcquireSameSizeAs(rn);
+    VIXL_ASSERT(!temp.Is(rd) && !temp.Is(rn) && !temp.Is(operand.maybeReg()));
+
+    Mov(temp, operand);
+    AddSubWithCarry(rd, rn, Operand(temp), S, op);
+  } else if (operand.IsShiftedRegister() && (operand.shift_amount() != 0)) {
+    // Add/sub with carry (shifted register).
+    VIXL_ASSERT(operand.reg().size() == rd.size());
+    VIXL_ASSERT(operand.shift() != ROR);
+    VIXL_ASSERT(is_uintn(rd.size() == kXRegSize ? kXRegSizeLog2 : kWRegSizeLog2,
+                        operand.shift_amount()));
+
+    temps.Exclude(operand.reg());
+    Register temp = temps.AcquireSameSizeAs(rn);
+    VIXL_ASSERT(!temp.Is(rd) && !temp.Is(rn) && !temp.Is(operand.maybeReg()));
+
+    EmitShift(temp, operand.reg(), operand.shift(), operand.shift_amount());
+    AddSubWithCarry(rd, rn, Operand(temp), S, op);
+  } else if (operand.IsExtendedRegister()) {
+    // Add/sub with carry (extended register).
+    VIXL_ASSERT(operand.reg().size() <= rd.size());
+    // Add/sub extended supports a shift <= 4. We want to support exactly the
+    // same modes.
+    VIXL_ASSERT(operand.shift_amount() <= 4);
+    VIXL_ASSERT(operand.reg().Is64Bits() ||
+               ((operand.extend() != UXTX) && (operand.extend() != SXTX)));
+
+    temps.Exclude(operand.reg());
+    Register temp = temps.AcquireSameSizeAs(rn);
+    VIXL_ASSERT(!temp.Is(rd) && !temp.Is(rn) && !temp.Is(operand.maybeReg()));
+
+    EmitExtendShift(temp, operand.reg(), operand.extend(), operand.shift_amount());
+    AddSubWithCarry(rd, rn, Operand(temp), S, op);
+  } else {
+    // The addressing mode is directly supported by the instruction.
+    AddSubWithCarry(rd, rn, operand, S, op);
+  }
+}
+
+
+#define DEFINE_FUNCTION(FN, REGTYPE, REG, OP)                             \
+void MacroAssembler::FN(const REGTYPE REG, const MemOperand& addr) {  \
+    LoadStoreMacro(REG, addr, OP);                                        \
+}
+LS_MACRO_LIST(DEFINE_FUNCTION)
+#undef DEFINE_FUNCTION
+
+
+
+BufferOffset MacroAssembler::LoadStoreMacro(const CPURegister& rt, const MemOperand& addr,
+                                            LoadStoreOp op) {
+  int64_t offset = addr.offset();
+  LSDataSize size = CalcLSDataSize(op);
+
+  // Check if an immediate offset fits in the immediate field of the
+  // appropriate instruction. If not, emit two instructions to perform
+  // the operation.
+  if (addr.IsImmediateOffset() && !IsImmLSScaled(offset, size) && !IsImmLSUnscaled(offset)) {
+    // Immediate offset that can't be encoded using unsigned or unscaled
+    // addressing modes.
+    UseScratchRegisterScope temps(this);
+    Register temp = temps.AcquireSameSizeAs(addr.base());
+    VIXL_ASSERT(!temp.Is(rt));
+    VIXL_ASSERT(!temp.Is(addr.base()) && !temp.Is(addr.regoffset()));
+
+    Mov(temp, addr.offset());
+    return LoadStore(rt, MemOperand(addr.base(), temp), op);
+  } else if (addr.IsPostIndex() && !IsImmLSUnscaled(offset)) {
+    // Post-index beyond unscaled addressing range.
+    BufferOffset ret = LoadStore(rt, MemOperand(addr.base()), op);
+    Add(addr.base(), addr.base(), Operand(offset));
+    return ret;
+  } else if (addr.IsPreIndex() && !IsImmLSUnscaled(offset)) {
+    // Pre-index beyond unscaled addressing range.
+    Add(addr.base(), addr.base(), Operand(offset));
+    return LoadStore(rt, MemOperand(addr.base()), op);
+  } else {
+    // Encodable in one load/store instruction.
+    return LoadStore(rt, addr, op);
+  }
+}
+
+
+void MacroAssembler::PushStackPointer() {
+  PrepareForPush(1, 8);
+
+  // Pushing a stack pointer leads to implementation-defined
+  // behavior, which may be surprising. In particular,
+  //   str x28, [x28, #-8]!
+  // pre-decrements the stack pointer, storing the decremented value.
+  // Additionally, sp is read as xzr in this context, so it cannot be pushed.
+  // So we must use a scratch register.
+  UseScratchRegisterScope temps(this);
+  Register scratch = temps.AcquireX();
+
+  Mov(scratch, GetStackPointer64());
+  str(scratch, MemOperand(GetStackPointer64(), -8, PreIndex));
+}
+
+
+void MacroAssembler::Push(const CPURegister& src0, const CPURegister& src1,
+                     const CPURegister& src2, const CPURegister& src3) {
+  VIXL_ASSERT(AreSameSizeAndType(src0, src1, src2, src3));
+  VIXL_ASSERT(src0.IsValid());
+
+  int count = 1 + src1.IsValid() + src2.IsValid() + src3.IsValid();
+  int size = src0.SizeInBytes();
+
+  if (src0.Is(GetStackPointer64())) {
+    VIXL_ASSERT(count == 1);
+    VIXL_ASSERT(size == 8);
+    PushStackPointer();
+    return;
+  }
+
+  PrepareForPush(count, size);
+  PushHelper(count, size, src0, src1, src2, src3);
+}
+
+
+void MacroAssembler::Pop(const CPURegister& dst0, const CPURegister& dst1,
+                         const CPURegister& dst2, const CPURegister& dst3) {
+  // It is not valid to pop into the same register more than once in one
+  // instruction, not even into the zero register.
+  VIXL_ASSERT(!AreAliased(dst0, dst1, dst2, dst3));
+  VIXL_ASSERT(AreSameSizeAndType(dst0, dst1, dst2, dst3));
+  VIXL_ASSERT(dst0.IsValid());
+
+  int count = 1 + dst1.IsValid() + dst2.IsValid() + dst3.IsValid();
+  int size = dst0.SizeInBytes();
+
+  PrepareForPop(count, size);
+  PopHelper(count, size, dst0, dst1, dst2, dst3);
+}
+
+
+void MacroAssembler::PushCPURegList(CPURegList registers) {
+  int size = registers.RegisterSizeInBytes();
+
+  PrepareForPush(registers.Count(), size);
+  // Push up to four registers at a time because if the current stack pointer is
+  // sp and reg_size is 32, registers must be pushed in blocks of four in order
+  // to maintain the 16-byte alignment for sp.
+  while (!registers.IsEmpty()) {
+    int count_before = registers.Count();
+    const CPURegister& src0 = registers.PopHighestIndex();
+    const CPURegister& src1 = registers.PopHighestIndex();
+    const CPURegister& src2 = registers.PopHighestIndex();
+    const CPURegister& src3 = registers.PopHighestIndex();
+    int count = count_before - registers.Count();
+    PushHelper(count, size, src0, src1, src2, src3);
+  }
+}
+
+
+void MacroAssembler::PopCPURegList(CPURegList registers) {
+  int size = registers.RegisterSizeInBytes();
+
+  PrepareForPop(registers.Count(), size);
+  // Pop up to four registers at a time because if the current stack pointer is
+  // sp and reg_size is 32, registers must be pushed in blocks of four in order
+  // to maintain the 16-byte alignment for sp.
+  while (!registers.IsEmpty()) {
+    int count_before = registers.Count();
+    const CPURegister& dst0 = registers.PopLowestIndex();
+    const CPURegister& dst1 = registers.PopLowestIndex();
+    const CPURegister& dst2 = registers.PopLowestIndex();
+    const CPURegister& dst3 = registers.PopLowestIndex();
+    int count = count_before - registers.Count();
+    PopHelper(count, size, dst0, dst1, dst2, dst3);
+  }
+}
+
+
+void MacroAssembler::PushMultipleTimes(int count, Register src) {
+  int size = src.SizeInBytes();
+
+  PrepareForPush(count, size);
+  // Push up to four registers at a time if possible because if the current
+  // stack pointer is sp and the register size is 32, registers must be pushed
+  // in blocks of four in order to maintain the 16-byte alignment for sp.
+  while (count >= 4) {
+    PushHelper(4, size, src, src, src, src);
+    count -= 4;
+  }
+  if (count >= 2) {
+    PushHelper(2, size, src, src, NoReg, NoReg);
+    count -= 2;
+  }
+  if (count == 1) {
+    PushHelper(1, size, src, NoReg, NoReg, NoReg);
+    count -= 1;
+  }
+  VIXL_ASSERT(count == 0);
+}
+
+
+void MacroAssembler::PushHelper(int count, int size, const CPURegister& src0,
+                                const CPURegister& src1, const CPURegister& src2,
+                                const CPURegister& src3) {
+  // Ensure that we don't unintentionally modify scratch or debug registers.
+  InstructionAccurateScope scope(this);
+
+  VIXL_ASSERT(AreSameSizeAndType(src0, src1, src2, src3));
+  VIXL_ASSERT(size == src0.SizeInBytes());
+
+  // Pushing the stack pointer has unexpected behavior. See PushStackPointer().
+  VIXL_ASSERT(!src0.Is(GetStackPointer64()) && !src0.Is(sp));
+  VIXL_ASSERT(!src1.Is(GetStackPointer64()) && !src1.Is(sp));
+  VIXL_ASSERT(!src2.Is(GetStackPointer64()) && !src2.Is(sp));
+  VIXL_ASSERT(!src3.Is(GetStackPointer64()) && !src3.Is(sp));
+
+  // The JS engine should never push 4 bytes.
+  VIXL_ASSERT(size >= 8);
+
+  // When pushing multiple registers, the store order is chosen such that
+  // Push(a, b) is equivalent to Push(a) followed by Push(b).
+  switch (count) {
+  case 1:
+    VIXL_ASSERT(src1.IsNone() && src2.IsNone() && src3.IsNone());
+    str(src0, MemOperand(GetStackPointer64(), -1 * size, PreIndex));
+    break;
+  case 2:
+    VIXL_ASSERT(src2.IsNone() && src3.IsNone());
+    stp(src1, src0, MemOperand(GetStackPointer64(), -2 * size, PreIndex));
+    break;
+  case 3:
+    VIXL_ASSERT(src3.IsNone());
+    stp(src2, src1, MemOperand(GetStackPointer64(), -3 * size, PreIndex));
+    str(src0, MemOperand(GetStackPointer64(), 2 * size));
+    break;
+  case 4:
+    // Skip over 4 * size, then fill in the gap. This allows four W registers
+    // to be pushed using sp, whilst maintaining 16-byte alignment for sp at
+    // all times.
+    stp(src3, src2, MemOperand(GetStackPointer64(), -4 * size, PreIndex));
+    stp(src1, src0, MemOperand(GetStackPointer64(), 2 * size));
+    break;
+  default:
+    VIXL_UNREACHABLE();
+  }
+}
+
+
+void MacroAssembler::PopHelper(int count, int size, const CPURegister& dst0,
+                               const CPURegister& dst1, const CPURegister& dst2,
+                               const CPURegister& dst3) {
+  // Ensure that we don't unintentionally modify scratch or debug registers.
+  InstructionAccurateScope scope(this);
+
+  VIXL_ASSERT(AreSameSizeAndType(dst0, dst1, dst2, dst3));
+  VIXL_ASSERT(size == dst0.SizeInBytes());
+
+  // When popping multiple registers, the load order is chosen such that
+  // Pop(a, b) is equivalent to Pop(a) followed by Pop(b).
+  switch (count) {
+  case 1:
+    VIXL_ASSERT(dst1.IsNone() && dst2.IsNone() && dst3.IsNone());
+    ldr(dst0, MemOperand(GetStackPointer64(), 1 * size, PostIndex));
+    break;
+  case 2:
+    VIXL_ASSERT(dst2.IsNone() && dst3.IsNone());
+    ldp(dst0, dst1, MemOperand(GetStackPointer64(), 2 * size, PostIndex));
+    break;
+  case 3:
+    VIXL_ASSERT(dst3.IsNone());
+    ldr(dst2, MemOperand(GetStackPointer64(), 2 * size));
+    ldp(dst0, dst1, MemOperand(GetStackPointer64(), 3 * size, PostIndex));
+    break;
+  case 4:
+    // Load the higher addresses first, then load the lower addresses and skip
+    // the whole block in the second instruction. This allows four W registers
+    // to be popped using sp, whilst maintaining 16-byte alignment for sp at
+    // all times.
+    ldp(dst2, dst3, MemOperand(GetStackPointer64(), 2 * size));
+    ldp(dst0, dst1, MemOperand(GetStackPointer64(), 4 * size, PostIndex));
+    break;
+  default:
+    VIXL_UNREACHABLE();
+  }
+}
+
+
+void MacroAssembler::PrepareForPush(int count, int size) {
+  if (sp.Is(GetStackPointer64())) {
+    // If the current stack pointer is sp, then it must be aligned to 16 bytes
+    // on entry and the total size of the specified registers must also be a
+    // multiple of 16 bytes.
+    VIXL_ASSERT((count * size) % 16 == 0);
+  } else {
+    // Even if the current stack pointer is not the system stack pointer (sp),
+    // the system stack pointer will still be modified in order to comply with
+    // ABI rules about accessing memory below the system stack pointer.
+    BumpSystemStackPointer(count * size);
+  }
+}
+
+
+void MacroAssembler::PrepareForPop(int count, int size) {
+  if (sp.Is(GetStackPointer64())) {
+    // If the current stack pointer is sp, then it must be aligned to 16 bytes
+    // on entry and the total size of the specified registers must also be a
+    // multiple of 16 bytes.
+    VIXL_ASSERT((count * size) % 16 == 0);
+  }
+}
+
+
+void MacroAssembler::Poke(const Register& src, const Operand& offset) {
+  if (offset.IsImmediate())
+    VIXL_ASSERT(offset.immediate() >= 0);
+
+  Str(src, MemOperand(GetStackPointer64(), offset));
+}
+
+
+void MacroAssembler::Peek(const Register& dst, const Operand& offset) {
+  if (offset.IsImmediate())
+    VIXL_ASSERT(offset.immediate() >= 0);
+
+  Ldr(dst, MemOperand(GetStackPointer64(), offset));
+}
+
+
+void MacroAssembler::Claim(const Operand& size) {
+  if (size.IsZero())
+    return;
+
+  if (size.IsImmediate()) {
+    VIXL_ASSERT(size.immediate() > 0);
+    if (sp.Is(GetStackPointer64()))
+      VIXL_ASSERT((size.immediate() % 16) == 0);
+  }
+
+  if (!sp.Is(GetStackPointer64()))
+    BumpSystemStackPointer(size);
+
+  Sub(GetStackPointer64(), GetStackPointer64(), size);
+}
+
+
+void MacroAssembler::Drop(const Operand& size) {
+  if (size.IsZero())
+    return;
+
+  if (size.IsImmediate()) {
+    VIXL_ASSERT(size.immediate() > 0);
+    if (sp.Is(GetStackPointer64()))
+      VIXL_ASSERT((size.immediate() % 16) == 0);
+  }
+
+  Add(GetStackPointer64(), GetStackPointer64(), size);
+}
+
+
+void MacroAssembler::PushCalleeSavedRegisters() {
+  // Ensure that the macro-assembler doesn't use any scratch registers.
+  InstructionAccurateScope scope(this);
+
+  // This method must not be called unless the current stack pointer is sp.
+  VIXL_ASSERT(sp.Is(GetStackPointer64()));
+
+  MemOperand tos(sp, -2 * kXRegSizeInBytes, PreIndex);
+
+  stp(x29, x30, tos);
+  stp(x27, x28, tos);
+  stp(x25, x26, tos);
+  stp(x23, x24, tos);
+  stp(x21, x22, tos);
+  stp(x19, x20, tos);
+
+  stp(d14, d15, tos);
+  stp(d12, d13, tos);
+  stp(d10, d11, tos);
+  stp(d8, d9, tos);
+}
+
+
+void MacroAssembler::PopCalleeSavedRegisters() {
+  // Ensure that the macro-assembler doesn't use any scratch registers.
+  InstructionAccurateScope scope(this);
+
+  // This method must not be called unless the current stack pointer is sp.
+  VIXL_ASSERT(sp.Is(GetStackPointer64()));
+
+  MemOperand tos(sp, 2 * kXRegSizeInBytes, PostIndex);
+
+  ldp(d8, d9, tos);
+  ldp(d10, d11, tos);
+  ldp(d12, d13, tos);
+  ldp(d14, d15, tos);
+
+  ldp(x19, x20, tos);
+  ldp(x21, x22, tos);
+  ldp(x23, x24, tos);
+  ldp(x25, x26, tos);
+  ldp(x27, x28, tos);
+  ldp(x29, x30, tos);
+}
+
+
+void MacroAssembler::BumpSystemStackPointer(const Operand& space) {
+  VIXL_ASSERT(!sp.Is(GetStackPointer64()));
+  // TODO: Several callers rely on this not using scratch registers, so we use
+  // the assembler directly here. However, this means that large immediate
+  // values of 'space' cannot be handled.
+  InstructionAccurateScope scope(this);
+  sub(sp, GetStackPointer64(), space);
+}
+
+
+// This is the main Printf implementation. All callee-saved registers are
+// preserved, but NZCV and the caller-saved registers may be clobbered.
+void MacroAssembler::PrintfNoPreserve(const char * format, const CPURegister& arg0,
+                                      const CPURegister& arg1, const CPURegister& arg2,
+                                      const CPURegister& arg3) {
+  // We cannot handle a caller-saved stack pointer. It doesn't make much sense
+  // in most cases anyway, so this restriction shouldn't be too serious.
+  VIXL_ASSERT(!kCallerSaved.IncludesAliasOf(GetStackPointer64()));
+
+  // The provided arguments, and their proper PCS registers.
+  CPURegister args[kPrintfMaxArgCount] = {arg0, arg1, arg2, arg3};
+  CPURegister pcs[kPrintfMaxArgCount];
+
+  int arg_count = kPrintfMaxArgCount;
+
+  // The PCS varargs registers for printf. Note that x0 is used for the printf
+  // format string.
+  static const CPURegList kPCSVarargs =
+    CPURegList(CPURegister::kRegister, kXRegSize, 1, arg_count);
+  static const CPURegList kPCSVarargsFP =
+    CPURegList(CPURegister::kFPRegister, kDRegSize, 0, arg_count - 1);
+
+  // We can use caller-saved registers as scratch values, except for the
+  // arguments and the PCS registers where they might need to go.
+  UseScratchRegisterScope temps(this);
+  temps.Include(kCallerSaved);
+  temps.Include(kCallerSavedFP);
+  temps.Exclude(kPCSVarargs);
+  temps.Exclude(kPCSVarargsFP);
+  temps.Exclude(arg0, arg1, arg2, arg3);
+
+  // Copies of the arg lists that we can iterate through.
+  CPURegList pcs_varargs = kPCSVarargs;
+  CPURegList pcs_varargs_fp = kPCSVarargsFP;
+
+  // Place the arguments. There are lots of clever tricks and optimizations we
+  // could use here, but Printf is a debug tool so instead we just try to keep
+  // it simple: Move each input that isn't already in the right place to a
+  // scratch register, then move everything back.
+  for (unsigned i = 0; i < kPrintfMaxArgCount; i++) {
+    // Work out the proper PCS register for this argument.
+    if (args[i].IsRegister()) {
+      pcs[i] = pcs_varargs.PopLowestIndex().X();
+      // We might only need a W register here. We need to know the size of the
+      // argument so we can properly encode it for the simulator call.
+      if (args[i].Is32Bits())
+        pcs[i] = pcs[i].W();
+    } else if (args[i].IsFPRegister()) {
+      // In C, floats are always cast to doubles for varargs calls.
+      pcs[i] = pcs_varargs_fp.PopLowestIndex().D();
+    } else {
+      VIXL_ASSERT(args[i].IsNone());
+      arg_count = i;
+      break;
+    }
+
+    // If the argument is already in the right place, leave it where it is.
+    if (args[i].Aliases(pcs[i]))
+      continue;
+
+    // Otherwise, if the argument is in a PCS argument register, allocate an
+    // appropriate scratch register and then move it out of the way.
+    if (kPCSVarargs.IncludesAliasOf(args[i]) || kPCSVarargsFP.IncludesAliasOf(args[i])) {
+      if (args[i].IsRegister()) {
+        Register old_arg = Register(args[i]);
+        Register new_arg = temps.AcquireSameSizeAs(old_arg);
+        Mov(new_arg, old_arg);
+        args[i] = new_arg;
+      } else {
+        FPRegister old_arg = FPRegister(args[i]);
+        FPRegister new_arg = temps.AcquireSameSizeAs(old_arg);
+        Fmov(new_arg, old_arg);
+        args[i] = new_arg;
+      }
+    }
+  }
+
+  // Do a second pass to move values into their final positions and perform any
+  // conversions that may be required.
+  for (int i = 0; i < arg_count; i++) {
+    VIXL_ASSERT(pcs[i].type() == args[i].type());
+    if (pcs[i].IsRegister()) {
+      Mov(Register(pcs[i]), Register(args[i]), kDiscardForSameWReg);
+    } else {
+      VIXL_ASSERT(pcs[i].IsFPRegister());
+      if (pcs[i].size() == args[i].size())
+        Fmov(FPRegister(pcs[i]), FPRegister(args[i]));
+      else
+        Fcvt(FPRegister(pcs[i]), FPRegister(args[i]));
+    }
+  }
+
+  // Load the format string into x0, as per the procedure-call standard.
+  //
+  // To make the code as portable as possible, the format string is encoded
+  // directly in the instruction stream. It might be cleaner to encode it in a
+  // literal pool, but since Printf is usually used for debugging, it is
+  // beneficial for it to be minimally dependent on other features.
+  temps.Exclude(x0);
+  Label format_address;
+  Adr(x0, &format_address);
+
+  // Emit the format string directly in the instruction stream.
+  { 
+    flushBuffer();
+    Label after_data;
+    B(&after_data);
+    Bind(&format_address);
+    EmitStringData(format);
+    Unreachable();
+    Bind(&after_data);
+  }
+
+  // We don't pass any arguments on the stack, but we still need to align the C
+  // stack pointer to a 16-byte boundary for PCS compliance.
+  if (!sp.Is(GetStackPointer64()))
+    Bic(sp, GetStackPointer64(), 0xf);
+
+  // Actually call printf. This part needs special handling for the simulator,
+  // since the system printf function will use a different instruction set and
+  // the procedure-call standard will not be compatible.
+#ifdef JS_ARM64_SIMULATOR
+  {
+    InstructionAccurateScope scope(this, kPrintfLength / kInstructionSize);
+    hlt(kPrintfOpcode);
+    dc32(arg_count);          // kPrintfArgCountOffset
+
+    // Determine the argument pattern.
+    uint32_t arg_pattern_list = 0;
+    for (int i = 0; i < arg_count; i++) {
+      uint32_t arg_pattern;
+      if (pcs[i].IsRegister()) {
+        arg_pattern = pcs[i].Is32Bits() ? kPrintfArgW : kPrintfArgX;
+      } else {
+        VIXL_ASSERT(pcs[i].Is64Bits());
+        arg_pattern = kPrintfArgD;
+      }
+      VIXL_ASSERT(arg_pattern < (1 << kPrintfArgPatternBits));
+      arg_pattern_list |= (arg_pattern << (kPrintfArgPatternBits * i));
+    }
+    dc32(arg_pattern_list);   // kPrintfArgPatternListOffset
+  }
+#else
+  Register tmp = temps.AcquireX();
+  Mov(tmp, reinterpret_cast<uintptr_t>(printf));
+  Blr(tmp);
+#endif
+}
+
+
+void MacroAssembler::Printf(const char * format, CPURegister arg0, CPURegister arg1,
+                            CPURegister arg2, CPURegister arg3) {
+  // We can only print sp if it is the current stack pointer.
+  if (!sp.Is(GetStackPointer64())) {
+    VIXL_ASSERT(!sp.Aliases(arg0));
+    VIXL_ASSERT(!sp.Aliases(arg1));
+    VIXL_ASSERT(!sp.Aliases(arg2));
+    VIXL_ASSERT(!sp.Aliases(arg3));
+  }
+
+  // Make sure that the macro assembler doesn't try to use any of our arguments
+  // as scratch registers.
+  UseScratchRegisterScope exclude_all(this);
+  exclude_all.ExcludeAll();
+
+  // Preserve all caller-saved registers as well as NZCV.
+  // If sp is the stack pointer, PushCPURegList asserts that the size of each
+  // list is a multiple of 16 bytes.
+  PushCPURegList(kCallerSaved);
+  PushCPURegList(kCallerSavedFP);
+
+  {
+    UseScratchRegisterScope temps(this);
+    // We can use caller-saved registers as scratch values (except for argN).
+    temps.Include(kCallerSaved);
+    temps.Include(kCallerSavedFP);
+    temps.Exclude(arg0, arg1, arg2, arg3);
+
+    // If any of the arguments are the current stack pointer, allocate a new
+    // register for them, and adjust the value to compensate for pushing the
+    // caller-saved registers.
+    bool arg0_sp = GetStackPointer64().Aliases(arg0);
+    bool arg1_sp = GetStackPointer64().Aliases(arg1);
+    bool arg2_sp = GetStackPointer64().Aliases(arg2);
+    bool arg3_sp = GetStackPointer64().Aliases(arg3);
+    if (arg0_sp || arg1_sp || arg2_sp || arg3_sp) {
+      // Allocate a register to hold the original stack pointer value, to pass
+      // to PrintfNoPreserve as an argument.
+      Register arg_sp = temps.AcquireX();
+      Add(arg_sp, GetStackPointer64(),
+          kCallerSaved.TotalSizeInBytes() + kCallerSavedFP.TotalSizeInBytes());
+      if (arg0_sp) arg0 = Register(arg_sp.code(), arg0.size());
+      if (arg1_sp) arg1 = Register(arg_sp.code(), arg1.size());
+      if (arg2_sp) arg2 = Register(arg_sp.code(), arg2.size());
+      if (arg3_sp) arg3 = Register(arg_sp.code(), arg3.size());
+    }
+
+    // Preserve NZCV.
+    Register tmp = temps.AcquireX();
+    Mrs(tmp, NZCV);
+    Push(tmp, xzr);
+    temps.Release(tmp);
+
+    PrintfNoPreserve(format, arg0, arg1, arg2, arg3);
+
+    // Restore NZCV.
+    tmp = temps.AcquireX();
+    Pop(xzr, tmp);
+    Msr(NZCV, tmp);
+    temps.Release(tmp);
+  }
+
+  PopCPURegList(kCallerSavedFP);
+  PopCPURegList(kCallerSaved);
+}
+
+
+void MacroAssembler::Trace(TraceParameters parameters, TraceCommand command) {
+#ifdef JS_ARM64_SIMULATOR
+  // The arguments to the trace pseudo instruction need to be contiguous in
+  // memory, so make sure we don't try to emit a literal pool.
+  InstructionAccurateScope scope(this, kTraceLength / kInstructionSize);
+
+  Label start;
+  bind(&start);
+
+  // Refer to instructions-a64.h for a description of the marker and its
+  // arguments.
+  hlt(kTraceOpcode);
+
+  //VIXL_ASSERT(SizeOfCodeGeneratedSince(&start) == kTraceParamsOffset);
+  dc32(parameters);
+
+  //VIXL_ASSERT(SizeOfCodeGeneratedSince(&start) == kTraceCommandOffset);
+  dc32(command);
+#else
+  // Emit nothing on real hardware.
+#endif
+}
+
+
+void MacroAssembler::Log(TraceParameters parameters) {
+#ifdef JS_ARM64_SIMULATOR
+  // The arguments to the log pseudo instruction need to be contiguous in
+  // memory, so make sure we don't try to emit a literal pool.
+  InstructionAccurateScope scope(this, kLogLength / kInstructionSize);
+
+  Label start;
+  bind(&start);
+
+  // Refer to instructions-a64.h for a description of the marker and its
+  // arguments.
+  hlt(kLogOpcode);
+
+  //VIXL_ASSERT(SizeOfCodeGeneratedSince(&start) == kLogParamsOffset);
+  dc32(parameters);
+#else
+  // Emit nothing on real hardware.
+#endif
+}
+
+
+void MacroAssembler::EnableInstrumentation() {
+  VIXL_ASSERT(!isprint(InstrumentStateEnable));
+  InstructionAccurateScope scope(this, 1);
+  movn(xzr, InstrumentStateEnable);
+}
+
+
+void MacroAssembler::DisableInstrumentation() {
+  VIXL_ASSERT(!isprint(InstrumentStateDisable));
+  InstructionAccurateScope scope(this, 1);
+  movn(xzr, InstrumentStateDisable);
+}
+
+
+void MacroAssembler::AnnotateInstrumentation(const char* marker_name) {
+  VIXL_ASSERT(strlen(marker_name) == 2);
+
+  // We allow only printable characters in the marker names. Unprintable
+  // characters are reserved for controlling features of the instrumentation.
+  VIXL_ASSERT(isprint(marker_name[0]) && isprint(marker_name[1]));
+
+  InstructionAccurateScope scope(this, 1);
+  movn(xzr, (marker_name[1] << 8) | marker_name[0]);
+}
+
+
+UseScratchRegisterScope::~UseScratchRegisterScope() {
+  available_->set_list(old_available_);
+  availablefp_->set_list(old_availablefp_);
+}
+
+
+bool UseScratchRegisterScope::IsAvailable(const CPURegister& reg) const {
+  return available_->IncludesAliasOf(reg) || availablefp_->IncludesAliasOf(reg);
+}
+
+
+Register UseScratchRegisterScope::AcquireSameSizeAs(const Register& reg) {
+  int code = AcquireNextAvailable(available_).code();
+  return Register(code, reg.size());
+}
+
+
+FPRegister UseScratchRegisterScope::AcquireSameSizeAs(const FPRegister& reg) {
+  int code = AcquireNextAvailable(availablefp_).code();
+  return FPRegister(code, reg.size());
+}
+
+
+void UseScratchRegisterScope::Release(const CPURegister& reg) {
+  if (reg.IsRegister())
+    ReleaseByCode(available_, reg.code());
+  else if (reg.IsFPRegister())
+    ReleaseByCode(availablefp_, reg.code());
+  else
+    VIXL_ASSERT(reg.IsNone());
+}
+
+
+void UseScratchRegisterScope::Include(const CPURegList& list) {
+  if (list.type() == CPURegister::kRegister) {
+    // Make sure that neither sp nor xzr are included the list.
+    IncludeByRegList(available_, list.list() & ~(xzr.Bit() | sp.Bit()));
+  } else {
+    VIXL_ASSERT(list.type() == CPURegister::kFPRegister);
+    IncludeByRegList(availablefp_, list.list());
+  }
+}
+
+
+void UseScratchRegisterScope::Include(const Register& reg1, const Register& reg2,
+                                      const Register& reg3, const Register& reg4) {
+  RegList include = reg1.Bit() | reg2.Bit() | reg3.Bit() | reg4.Bit();
+  // Make sure that neither sp nor xzr are included the list.
+  include &= ~(xzr.Bit() | sp.Bit());
+
+  IncludeByRegList(available_, include);
+}
+
+
+void UseScratchRegisterScope::Include(const FPRegister& reg1, const FPRegister& reg2,
+                                      const FPRegister& reg3, const FPRegister& reg4) {
+  RegList include = reg1.Bit() | reg2.Bit() | reg3.Bit() | reg4.Bit();
+  IncludeByRegList(availablefp_, include);
+}
+
+
+void UseScratchRegisterScope::Exclude(const CPURegList& list) {
+  if (list.type() == CPURegister::kRegister) {
+    ExcludeByRegList(available_, list.list());
+  } else {
+    VIXL_ASSERT(list.type() == CPURegister::kFPRegister);
+    ExcludeByRegList(availablefp_, list.list());
+  }
+}
+
+
+void UseScratchRegisterScope::Exclude(const Register& reg1, const Register& reg2,
+                                      const Register& reg3, const Register& reg4) {
+  RegList exclude = reg1.Bit() | reg2.Bit() | reg3.Bit() | reg4.Bit();
+  ExcludeByRegList(available_, exclude);
+}
+
+
+void UseScratchRegisterScope::Exclude(const FPRegister& reg1, const FPRegister& reg2,
+                                      const FPRegister& reg3, const FPRegister& reg4) {
+  RegList excludefp = reg1.Bit() | reg2.Bit() | reg3.Bit() | reg4.Bit();
+  ExcludeByRegList(availablefp_, excludefp);
+}
+
+
+void UseScratchRegisterScope::Exclude(const CPURegister& reg1, const CPURegister& reg2,
+                                      const CPURegister& reg3, const CPURegister& reg4) {
+  RegList exclude = 0;
+  RegList excludefp = 0;
+
+  const CPURegister regs[] = {reg1, reg2, reg3, reg4};
+
+  for (unsigned i = 0; i < (sizeof(regs) / sizeof(regs[0])); i++) {
+    if (regs[i].IsRegister())
+      exclude |= regs[i].Bit();
+    else if (regs[i].IsFPRegister())
+      excludefp |= regs[i].Bit();
+    else
+      VIXL_ASSERT(regs[i].IsNone());
+  }
+
+  ExcludeByRegList(available_, exclude);
+  ExcludeByRegList(availablefp_, excludefp);
+}
+
+
+void UseScratchRegisterScope::ExcludeAll() {
+  ExcludeByRegList(available_, available_->list());
+  ExcludeByRegList(availablefp_, availablefp_->list());
+}
+
+
+CPURegister UseScratchRegisterScope::AcquireNextAvailable(CPURegList* available) {
+  VIXL_ASSERT(!available->IsEmpty());
+  CPURegister result = available->PopLowestIndex();
+  VIXL_ASSERT(!AreAliased(result, xzr, sp));
+  return result;
+}
+
+
+void UseScratchRegisterScope::ReleaseByCode(CPURegList* available, int code) {
+  ReleaseByRegList(available, static_cast<RegList>(1) << code);
+}
+
+
+void UseScratchRegisterScope::ReleaseByRegList(CPURegList* available, RegList regs) {
+  available->set_list(available->list() | regs);
+}
+
+
+void UseScratchRegisterScope::IncludeByRegList(CPURegList* available, RegList regs) {
+  available->set_list(available->list() | regs);
+}
+
+
+void UseScratchRegisterScope::ExcludeByRegList(CPURegList* available, RegList exclude) {
+  available->set_list(available->list() & ~exclude);
+}
+
+
+} // namespace vixl
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/MacroAssembler-vixl.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/MacroAssembler-vixl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/MacroAssembler-vixl.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/MacroAssembler-vixl.h	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,1238 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#ifndef VIXL_A64_MACRO_ASSEMBLER_A64_H_
+#define VIXL_A64_MACRO_ASSEMBLER_A64_H_
+
+// TODO: Re-enable once landed.
+// #include "jit/arm64/Assembler-arm64.h"
+
+#include "jit/arm64/vixl/Debugger-vixl.h"
+#include "jit/arm64/vixl/Globals-vixl.h"
+
+#define LS_MACRO_LIST(V)                                      \
+  V(Ldrb, Register&, rt, LDRB_w)                              \
+  V(Strb, Register&, rt, STRB_w)                              \
+  V(Ldrsb, Register&, rt, rt.Is64Bits() ? LDRSB_x : LDRSB_w)  \
+  V(Ldrh, Register&, rt, LDRH_w)                              \
+  V(Strh, Register&, rt, STRH_w)                              \
+  V(Ldrsh, Register&, rt, rt.Is64Bits() ? LDRSH_x : LDRSH_w)  \
+  V(Ldr, CPURegister&, rt, LoadOpFor(rt))                     \
+  V(Str, CPURegister&, rt, StoreOpFor(rt))                    \
+  V(Ldrsw, Register&, rt, LDRSW_x)
+
+namespace vixl {
+
+enum BranchType {
+  // Copies of architectural conditions.
+  // The associated conditions can be used in place of those, the code will
+  // take care of reinterpreting them with the correct type.
+  integer_eq = eq,
+  integer_ne = ne,
+  integer_hs = hs,
+  integer_lo = lo,
+  integer_mi = mi,
+  integer_pl = pl,
+  integer_vs = vs,
+  integer_vc = vc,
+  integer_hi = hi,
+  integer_ls = ls,
+  integer_ge = ge,
+  integer_lt = lt,
+  integer_gt = gt,
+  integer_le = le,
+  integer_al = al,
+  integer_nv = nv,
+
+  // These two are *different* from the architectural codes al and nv.
+  // 'always' is used to generate unconditional branches.
+  // 'never' is used to not generate a branch (generally as the inverse
+  // branch type of 'always).
+  always, never,
+  // cbz and cbnz
+  reg_zero, reg_not_zero,
+  // tbz and tbnz
+  reg_bit_clear, reg_bit_set,
+
+  // Aliases.
+  kBranchTypeFirstCondition = eq,
+  kBranchTypeLastCondition = nv,
+  kBranchTypeFirstUsingReg = reg_zero,
+  kBranchTypeFirstUsingBit = reg_bit_clear
+};
+
+enum DiscardMoveMode { kDontDiscardForSameWReg, kDiscardForSameWReg };
+
+class MacroAssembler : public js::jit::Assembler {
+ public:
+  MacroAssembler()
+    : js::jit::Assembler(),
+      sp_(x28),
+      tmp_list_(ip0, ip1),
+      fptmp_list_(d31) {
+  }
+
+  // Logical macros.
+  void And(const Register& rd, const Register& rn, const Operand& operand);
+  void Ands(const Register& rd, const Register& rn, const Operand& operand);
+  void Bic(const Register& rd, const Register& rn, const Operand& operand);
+  void Bics(const Register& rd, const Register& rn, const Operand& operand);
+  void Orr(const Register& rd, const Register& rn, const Operand& operand);
+  void Orn(const Register& rd, const Register& rn, const Operand& operand);
+  void Eor(const Register& rd, const Register& rn, const Operand& operand);
+  void Eon(const Register& rd, const Register& rn, const Operand& operand);
+  void Tst(const Register& rn, const Operand& operand);
+  void LogicalMacro(const Register& rd, const Register& rn,
+                    const Operand& operand, LogicalOp op);
+
+  // Add and sub macros.
+  void Add(const Register& rd, const Register& rn, const Operand& operand);
+  void Adds(const Register& rd, const Register& rn, const Operand& operand);
+  void Sub(const Register& rd, const Register& rn, const Operand& operand);
+  void Subs(const Register& rd, const Register& rn, const Operand& operand);
+  void Cmn(const Register& rn, const Operand& operand);
+  void Cmp(const Register& rn, const Operand& operand);
+  void Neg(const Register& rd, const Operand& operand);
+  void Negs(const Register& rd, const Operand& operand);
+  void AddSubMacro(const Register& rd, const Register& rn,
+                   const Operand& operand, FlagsUpdate S, AddSubOp op);
+
+  // Add/sub with carry macros.
+  void Adc(const Register& rd, const Register& rn, const Operand& operand);
+  void Adcs(const Register& rd, const Register& rn, const Operand& operand);
+  void Sbc(const Register& rd, const Register& rn, const Operand& operand);
+  void Sbcs(const Register& rd, const Register& rn, const Operand& operand);
+  void Ngc(const Register& rd, const Operand& operand);
+  void Ngcs(const Register& rd, const Operand& operand);
+  void AddSubWithCarryMacro(const Register& rd, const Register& rn,
+                            const Operand& operand, FlagsUpdate S, AddSubWithCarryOp op);
+
+  // Move macros.
+  void Mov(const Register& rd, uint64_t imm);
+  void Mov(const Register& rd, const Operand& operand,
+           DiscardMoveMode discard_mode = kDontDiscardForSameWReg);
+  void Mvn(const Register& rd, uint64_t imm) {
+    Mov(rd, (rd.size() == kXRegSize) ? ~imm : (~imm & kWRegMask));
+  }
+  void Mvn(const Register& rd, const Operand& operand);
+  bool IsImmMovz(uint64_t imm, unsigned reg_size);
+  bool IsImmMovn(uint64_t imm, unsigned reg_size);
+  unsigned CountClearHalfWords(uint64_t imm, unsigned reg_size);
+
+  // Try to move an immediate into the destination register in a single
+  // instruction. Returns true for success, and updates the contents of dst.
+  // Returns false, otherwise.
+  bool TryOneInstrMoveImmediate(const Register& dst, int64_t imm);
+
+  // Move an immediate into register dst, and return an Operand object for
+  // use with a subsequent instruction that accepts a shift. The value moved
+  // into dst is not necessarily equal to imm; it may have had a shifting
+  // operation applied to it that will be subsequently undone by the shift
+  // applied in the Operand.
+  Operand MoveImmediateForShiftedOp(const Register& dst, int64_t imm);
+
+  // Conditional macros.
+  void Ccmp(const Register& rn, const Operand& operand, StatusFlags nzcv, Condition cond);
+  void Ccmn(const Register& rn, const Operand& operand, StatusFlags nzcv, Condition cond);
+  void ConditionalCompareMacro(const Register& rn, const Operand& operand,
+                               StatusFlags nzcv, Condition cond, ConditionalCompareOp op);
+  void Csel(const Register& rd, const Register& rn, const Operand& operand, Condition cond);
+
+  // Load/store macros.
+#define DECLARE_FUNCTION(FN, REGTYPE, REG, OP) \
+    void FN(const REGTYPE REG, const MemOperand& addr);
+  LS_MACRO_LIST(DECLARE_FUNCTION)
+#undef DECLARE_FUNCTION
+
+  BufferOffset LoadStoreMacro(const CPURegister& rt, const MemOperand& addr, LoadStoreOp op);
+
+  // Push or pop up to 4 registers of the same width to or from the stack,
+  // using the current stack pointer as set by SetStackPointer64.
+  //
+  // If an argument register is 'NoReg', all further arguments are also assumed
+  // to be 'NoReg', and are thus not pushed or popped.
+  //
+  // Arguments are ordered such that "Push(a, b);" is functionally equivalent
+  // to "Push(a); Push(b);".
+  //
+  // It is valid to push the same register more than once, and there is no
+  // restriction on the order in which registers are specified.
+  //
+  // It is not valid to pop into the same register more than once in one
+  // operation, not even into the zero register.
+  //
+  // If the current stack pointer (as set by SetStackPointer64) is sp, then it
+  // must be aligned to 16 bytes on entry and the total size of the specified
+  // registers must also be a multiple of 16 bytes.
+  //
+  // Even if the current stack pointer is not the system stack pointer (sp),
+  // Push (and derived methods) will still modify the system stack pointer in
+  // order to comply with ABI rules about accessing memory below the system
+  // stack pointer.
+  //
+  // Other than the registers passed into Pop, the stack pointer and (possibly)
+  // the system stack pointer, these methods do not modify any other registers.
+  void Push(const CPURegister& src0, const CPURegister& src1 = NoReg,
+            const CPURegister& src2 = NoReg, const CPURegister& src3 = NoReg);
+  void Pop(const CPURegister& dst0, const CPURegister& dst1 = NoReg,
+           const CPURegister& dst2 = NoReg, const CPURegister& dst3 = NoReg);
+  void PushStackPointer();
+
+  // Alternative forms of Push and Pop, taking a RegList or CPURegList that
+  // specifies the registers that are to be pushed or popped. Higher-numbered
+  // registers are associated with higher memory addresses (as in the A32 push
+  // and pop instructions).
+  //
+  // (Push|Pop)SizeRegList allow you to specify the register size as a
+  // parameter. Only kXRegSize, kWRegSize, kDRegSize and kSRegSize are
+  // supported.
+  //
+  // Otherwise, (Push|Pop)(CPU|X|W|D|S)RegList is preferred.
+  void PushCPURegList(CPURegList registers);
+  void PopCPURegList(CPURegList registers);
+
+  void PushSizeRegList(RegList registers, unsigned reg_size,
+                       CPURegister::RegisterType type = CPURegister::kRegister) {
+    PushCPURegList(CPURegList(type, reg_size, registers));
+  }
+  void PopSizeRegList(RegList registers, unsigned reg_size,
+                      CPURegister::RegisterType type = CPURegister::kRegister) {
+    PopCPURegList(CPURegList(type, reg_size, registers));
+  }
+  void PushXRegList(RegList regs) {
+    PushSizeRegList(regs, kXRegSize);
+  }
+  void PopXRegList(RegList regs) {
+    PopSizeRegList(regs, kXRegSize);
+  }
+  void PushWRegList(RegList regs) {
+    PushSizeRegList(regs, kWRegSize);
+  }
+  void PopWRegList(RegList regs) {
+    PopSizeRegList(regs, kWRegSize);
+  }
+  inline void PushDRegList(RegList regs) {
+    PushSizeRegList(regs, kDRegSize, CPURegister::kFPRegister);
+  }
+  inline void PopDRegList(RegList regs) {
+    PopSizeRegList(regs, kDRegSize, CPURegister::kFPRegister);
+  }
+  inline void PushSRegList(RegList regs) {
+    PushSizeRegList(regs, kSRegSize, CPURegister::kFPRegister);
+  }
+  inline void PopSRegList(RegList regs) {
+    PopSizeRegList(regs, kSRegSize, CPURegister::kFPRegister);
+  }
+
+  // Push the specified register 'count' times.
+  void PushMultipleTimes(int count, Register src);
+
+  // Poke 'src' onto the stack. The offset is in bytes.
+  //
+  // If the current stack pointer (as set by SetStackPointer64) is sp, then sp
+  // must be aligned to 16 bytes.
+  void Poke(const Register& src, const Operand& offset);
+
+  // Peek at a value on the stack, and put it in 'dst'. The offset is in bytes.
+  //
+  // If the current stack pointer (as set by SetStackPointer64) is sp, then sp
+  // must be aligned to 16 bytes.
+  void Peek(const Register& dst, const Operand& offset);
+
+  // Claim or drop stack space without actually accessing memory.
+  //
+  // If the current stack pointer (as set by SetStackPointer64) is sp, then it
+  // must be aligned to 16 bytes and the size claimed or dropped must be a
+  // multiple of 16 bytes.
+  void Claim(const Operand& size);
+  void Drop(const Operand& size);
+
+  // Preserve the callee-saved registers (as defined by AAPCS64).
+  //
+  // Higher-numbered registers are pushed before lower-numbered registers, and
+  // thus get higher addresses.
+  // Floating-point registers are pushed before general-purpose registers, and
+  // thus get higher addresses.
+  //
+  // This method must not be called unless GetStackPointer64() is sp, and it is
+  // aligned to 16 bytes.
+  void PushCalleeSavedRegisters();
+
+  // Restore the callee-saved registers (as defined by AAPCS64).
+  //
+  // Higher-numbered registers are popped after lower-numbered registers, and
+  // thus come from higher addresses.
+  // Floating-point registers are popped after general-purpose registers, and
+  // thus come from higher addresses.
+  //
+  // This method must not be called unless GetStackPointer64() is sp, and it is
+  // aligned to 16 bytes.
+  void PopCalleeSavedRegisters();
+
+  // Remaining instructions are simple pass-through calls to the assembler.
+  void Adr(const Register& rd, Label* label) {
+    VIXL_ASSERT(!rd.IsZero());
+    adr(rd, label);
+  }
+  void Adrp(const Register& rd, Label* label) {
+    VIXL_ASSERT(!rd.IsZero());
+    adrp(rd, label);
+  }
+  void Asr(const Register& rd, const Register& rn, unsigned shift) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    asr(rd, rn, shift);
+  }
+  void Asr(const Register& rd, const Register& rn, const Register& rm) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    VIXL_ASSERT(!rm.IsZero());
+    asrv(rd, rn, rm);
+  }
+
+  // Branch type inversion relies on these relations.
+  JS_STATIC_ASSERT((reg_zero      == (reg_not_zero ^ 1)) &&
+                   (reg_bit_clear == (reg_bit_set ^ 1)) &&
+                   (always        == (never ^ 1)));
+
+  BranchType InvertBranchType(BranchType type) {
+    if (kBranchTypeFirstCondition <= type && type <= kBranchTypeLastCondition)
+      return static_cast<BranchType>(InvertCondition(static_cast<Condition>(type)));
+    return static_cast<BranchType>(type ^ 1);
+  }
+
+  void B(Label* label, BranchType type, Register reg = NoReg, int bit = -1);
+
+  void B(Label* label) {
+    b(label);
+  }
+  void B(Label* label, Condition cond) {
+    VIXL_ASSERT((cond != al) && (cond != nv));
+    b(label, cond);
+  }
+  void B(Condition cond, Label* label) {
+    B(label, cond);
+  }
+  void Bfi(const Register& rd, const Register& rn, unsigned lsb, unsigned width) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    bfi(rd, rn, lsb, width);
+  }
+  void Bfxil(const Register& rd, const Register& rn, unsigned lsb, unsigned width) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    bfxil(rd, rn, lsb, width);
+  }
+  void Bind(Label* label) {
+    bind(label);
+  }
+  void Bl(Label* label) {
+    bl(label);
+  }
+  void Blr(const Register& xn) {
+    VIXL_ASSERT(!xn.IsZero());
+    blr(xn);
+  }
+  void Br(const Register& xn) {
+    VIXL_ASSERT(!xn.IsZero());
+    br(xn);
+  }
+  void Brk(int code = 0) {
+    brk(code);
+  }
+  void Cbnz(const Register& rt, Label* label) {
+    VIXL_ASSERT(!rt.IsZero());
+    cbnz(rt, label);
+  }
+  void Cbz(const Register& rt, Label* label) {
+    VIXL_ASSERT(!rt.IsZero());
+    cbz(rt, label);
+  }
+  void Cinc(const Register& rd, const Register& rn, Condition cond) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    cinc(rd, rn, cond);
+  }
+  void Cinv(const Register& rd, const Register& rn, Condition cond) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    cinv(rd, rn, cond);
+  }
+  void Clrex() {
+    clrex();
+  }
+  void Cls(const Register& rd, const Register& rn) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    cls(rd, rn);
+  }
+  void Clz(const Register& rd, const Register& rn) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    clz(rd, rn);
+  }
+  void Cneg(const Register& rd, const Register& rn, Condition cond) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    cneg(rd, rn, cond);
+  }
+  void Cset(const Register& rd, Condition cond) {
+    VIXL_ASSERT(!rd.IsZero());
+    cset(rd, cond);
+  }
+  void Csetm(const Register& rd, Condition cond) {
+    VIXL_ASSERT(!rd.IsZero());
+    csetm(rd, cond);
+  }
+  void Csinc(const Register& rd, const Register& rn, const Register& rm, Condition cond) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    VIXL_ASSERT((cond != al) && (cond != nv));
+    csinc(rd, rn, rm, cond);
+  }
+  void Csinv(const Register& rd, const Register& rn, const Register& rm, Condition cond) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    VIXL_ASSERT(!rm.IsZero());
+    VIXL_ASSERT((cond != al) && (cond != nv));
+    csinv(rd, rn, rm, cond);
+  }
+  void Csneg(const Register& rd, const Register& rn, const Register& rm, Condition cond) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    VIXL_ASSERT((cond != al) && (cond != nv));
+    csneg(rd, rn, rm, cond);
+  }
+  void Dmb(BarrierDomain domain, BarrierType type) {
+    dmb(domain, type);
+  }
+  void Dsb(BarrierDomain domain, BarrierType type) {
+    dsb(domain, type);
+  }
+  void Extr(const Register& rd, const Register& rn, const Register& rm, unsigned lsb) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    VIXL_ASSERT(!rm.IsZero());
+    extr(rd, rn, rm, lsb);
+  }
+  void Fabs(const FPRegister& fd, const FPRegister& fn) {
+    fabs(fd, fn);
+  }
+  void Fadd(const FPRegister& fd, const FPRegister& fn, const FPRegister& fm) {
+    fadd(fd, fn, fm);
+  }
+  void Fccmp(const FPRegister& fn, const FPRegister& fm, StatusFlags nzcv, Condition cond) {
+    VIXL_ASSERT((cond != al) && (cond != nv));
+    fccmp(fn, fm, nzcv, cond);
+  }
+  void Fcmp(const FPRegister& fn, const FPRegister& fm) {
+    fcmp(fn, fm);
+  }
+  void Fcmp(const FPRegister& fn, double value);
+  void Fcsel(const FPRegister& fd, const FPRegister& fn,
+             const FPRegister& fm, Condition cond) {
+    VIXL_ASSERT((cond != al) && (cond != nv));
+    fcsel(fd, fn, fm, cond);
+  }
+  void Fcvt(const FPRegister& fd, const FPRegister& fn) {
+    fcvt(fd, fn);
+  }
+  void Fcvtas(const Register& rd, const FPRegister& fn) {
+    VIXL_ASSERT(!rd.IsZero());
+    fcvtas(rd, fn);
+  }
+  void Fcvtau(const Register& rd, const FPRegister& fn) {
+    VIXL_ASSERT(!rd.IsZero());
+    fcvtau(rd, fn);
+  }
+  void Fcvtms(const Register& rd, const FPRegister& fn) {
+    VIXL_ASSERT(!rd.IsZero());
+    fcvtms(rd, fn);
+  }
+  void Fcvtmu(const Register& rd, const FPRegister& fn) {
+    VIXL_ASSERT(!rd.IsZero());
+    fcvtmu(rd, fn);
+  }
+  void Fcvtps(const Register& rd, const FPRegister& fn) {
+    VIXL_ASSERT(!rd.IsZero());
+    fcvtps(rd, fn);
+  }
+  void Fcvtpu(const Register& rd, const FPRegister& fn) {
+    VIXL_ASSERT(!rd.IsZero());
+    fcvtpu(rd, fn);
+  }
+  void Fcvtns(const Register& rd, const FPRegister& fn) {
+    VIXL_ASSERT(!rd.IsZero());
+    fcvtns(rd, fn);
+  }
+  void Fcvtnu(const Register& rd, const FPRegister& fn) {
+    VIXL_ASSERT(!rd.IsZero());
+    fcvtnu(rd, fn);
+  }
+  void Fcvtzs(const Register& rd, const FPRegister& fn) {
+    VIXL_ASSERT(!rd.IsZero());
+    fcvtzs(rd, fn);
+  }
+  void Fcvtzu(const Register& rd, const FPRegister& fn) {
+    VIXL_ASSERT(!rd.IsZero());
+    fcvtzu(rd, fn);
+  }
+  void Fdiv(const FPRegister& fd, const FPRegister& fn, const FPRegister& fm) {
+    fdiv(fd, fn, fm);
+  }
+  void Fmax(const FPRegister& fd, const FPRegister& fn, const FPRegister& fm) {
+    fmax(fd, fn, fm);
+  }
+  void Fmaxnm(const FPRegister& fd, const FPRegister& fn, const FPRegister& fm) {
+    fmaxnm(fd, fn, fm);
+  }
+  void Fmin(const FPRegister& fd, const FPRegister& fn, const FPRegister& fm) {
+    fmin(fd, fn, fm);
+  }
+  void Fminnm(const FPRegister& fd, const FPRegister& fn, const FPRegister& fm) {
+    fminnm(fd, fn, fm);
+  }
+  void Fmov(FPRegister fd, FPRegister fn) {
+    // Only emit an instruction if fd and fn are different, and they are both D
+    // registers. fmov(s0, s0) is not a no-op because it clears the top word of
+    // d0. Technically, fmov(d0, d0) is not a no-op either because it clears
+    // the top of q0, but FPRegister does not currently support Q registers.
+    if (!fd.Is(fn) || !fd.Is64Bits())
+      fmov(fd, fn);
+  }
+  void Fmov(FPRegister fd, Register rn) {
+    VIXL_ASSERT(!rn.IsZero());
+    fmov(fd, rn);
+  }
+  // Provide explicit double and float interfaces for FP immediate moves, rather
+  // than relying on implicit C++ casts. This allows signalling NaNs to be
+  // preserved when the immediate matches the format of fd. Most systems convert
+  // signalling NaNs to quiet NaNs when converting between float and double.
+  void Fmov(FPRegister fd, double imm);
+  void Fmov(FPRegister fd, float imm);
+  // Provide a template to allow other types to be converted automatically.
+  template<typename T>
+  void Fmov(FPRegister fd, T imm) {
+    Fmov(fd, static_cast<double>(imm));
+  }
+  void Fmov(Register rd, FPRegister fn) {
+    VIXL_ASSERT(!rd.IsZero());
+    fmov(rd, fn);
+  }
+  void Fmul(const FPRegister& fd, const FPRegister& fn, const FPRegister& fm) {
+    fmul(fd, fn, fm);
+  }
+  void Fmadd(const FPRegister& fd, const FPRegister& fn,
+             const FPRegister& fm, const FPRegister& fa) {
+    fmadd(fd, fn, fm, fa);
+  }
+  void Fmsub(const FPRegister& fd, const FPRegister& fn,
+             const FPRegister& fm, const FPRegister& fa) {
+    fmsub(fd, fn, fm, fa);
+  }
+  void Fnmadd(const FPRegister& fd, const FPRegister& fn,
+              const FPRegister& fm, const FPRegister& fa) {
+    fnmadd(fd, fn, fm, fa);
+  }
+  void Fnmsub(const FPRegister& fd, const FPRegister& fn,
+              const FPRegister& fm, const FPRegister& fa) {
+    fnmsub(fd, fn, fm, fa);
+  }
+  void Fneg(const FPRegister& fd, const FPRegister& fn) {
+    fneg(fd, fn);
+  }
+  void Frinta(const FPRegister& fd, const FPRegister& fn) {
+    frinta(fd, fn);
+  }
+  void Frintm(const FPRegister& fd, const FPRegister& fn) {
+    frintm(fd, fn);
+  }
+  void Frintn(const FPRegister& fd, const FPRegister& fn) {
+    frintn(fd, fn);
+  }
+  void Frintz(const FPRegister& fd, const FPRegister& fn) {
+    frintz(fd, fn);
+  }
+  void Fsqrt(const FPRegister& fd, const FPRegister& fn) {
+    fsqrt(fd, fn);
+  }
+  void Fsub(const FPRegister& fd, const FPRegister& fn, const FPRegister& fm) {
+    fsub(fd, fn, fm);
+  }
+  void Hint(SystemHint code) {
+    hint(code);
+  }
+  void Hlt(int code) {
+    hlt(code);
+  }
+  void Isb() {
+    isb();
+  }
+  void Ldar(const Register& rt, const MemOperand& src) {
+    ldar(rt, src);
+  }
+  void Ldarb(const Register& rt, const MemOperand& src) {
+    ldarb(rt, src);
+  }
+  void Ldarh(const Register& rt, const MemOperand& src) {
+    ldarh(rt, src);
+  }
+  void Ldaxp(const Register& rt, const Register& rt2, const MemOperand& src) {
+    VIXL_ASSERT(!rt.Aliases(rt2));
+    ldaxp(rt, rt2, src);
+  }
+  void Ldaxr(const Register& rt, const MemOperand& src) {
+    ldaxr(rt, src);
+  }
+  void Ldaxrb(const Register& rt, const MemOperand& src) {
+    ldaxrb(rt, src);
+  }
+  void Ldaxrh(const Register& rt, const MemOperand& src) {
+    ldaxrh(rt, src);
+  }
+  void Ldnp(const CPURegister& rt, const CPURegister& rt2, const MemOperand& src) {
+    ldnp(rt, rt2, src);
+  }
+  void Ldp(const CPURegister& rt, const CPURegister& rt2, const MemOperand& src) {
+    ldp(rt, rt2, src);
+  }
+  void Ldpsw(const Register& rt, const Register& rt2, const MemOperand& src) {
+    ldpsw(rt, rt2, src);
+  }
+  // Provide both double and float interfaces for FP immediate loads, rather
+  // than relying on implicit C++ casts. This allows signalling NaNs to be
+  // preserved when the immediate matches the format of fd. Most systems convert
+  // signalling NaNs to quiet NaNs when converting between float and double.
+  void Ldr(const FPRegister& ft, double imm) {
+    if (ft.Is64Bits()) {
+      ldr(ft, imm);
+    } else {
+      ldr(ft, static_cast<float>(imm));
+    }
+  }
+  void Ldr(const FPRegister& ft, float imm) {
+    if (ft.Is32Bits()) {
+      ldr(ft, imm);
+    } else {
+      ldr(ft, static_cast<double>(imm));
+    }
+  }
+  void Ldr(const Register& rt, uint64_t imm) {
+    VIXL_ASSERT(!rt.IsZero());
+    ldr(rt, imm);
+  }
+  void Ldxp(const Register& rt, const Register& rt2, const MemOperand& src) {
+    VIXL_ASSERT(!rt.Aliases(rt2));
+    ldxp(rt, rt2, src);
+  }
+  void Ldxr(const Register& rt, const MemOperand& src) {
+    ldxr(rt, src);
+  }
+  void Ldxrb(const Register& rt, const MemOperand& src) {
+    ldxrb(rt, src);
+  }
+  void Ldxrh(const Register& rt, const MemOperand& src) {
+    ldxrh(rt, src);
+  }
+  void Lsl(const Register& rd, const Register& rn, unsigned shift) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    lsl(rd, rn, shift);
+  }
+  void Lsl(const Register& rd, const Register& rn, const Register& rm) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    VIXL_ASSERT(!rm.IsZero());
+    lslv(rd, rn, rm);
+  }
+  void Lsr(const Register& rd, const Register& rn, unsigned shift) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    lsr(rd, rn, shift);
+  }
+  void Lsr(const Register& rd, const Register& rn, const Register& rm) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    VIXL_ASSERT(!rm.IsZero());
+    lsrv(rd, rn, rm);
+  }
+  void Madd(const Register& rd, const Register& rn,
+            const Register& rm, const Register& ra) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    VIXL_ASSERT(!rm.IsZero());
+    VIXL_ASSERT(!ra.IsZero());
+    madd(rd, rn, rm, ra);
+  }
+  void Mneg(const Register& rd, const Register& rn, const Register& rm) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    VIXL_ASSERT(!rm.IsZero());
+    mneg(rd, rn, rm);
+  }
+  void Mov(const Register& rd, const Register& rn) {
+    mov(rd, rn);
+  }
+  void Movk(const Register& rd, uint64_t imm, int shift = -1) {
+    VIXL_ASSERT(!rd.IsZero());
+    movk(rd, imm, shift);
+  }
+  void Mrs(const Register& rt, SystemRegister sysreg) {
+    VIXL_ASSERT(!rt.IsZero());
+    mrs(rt, sysreg);
+  }
+  void Msr(SystemRegister sysreg, const Register& rt) {
+    VIXL_ASSERT(!rt.IsZero());
+    msr(sysreg, rt);
+  }
+  void Msub(const Register& rd, const Register& rn,
+            const Register& rm, const Register& ra) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    VIXL_ASSERT(!rm.IsZero());
+    VIXL_ASSERT(!ra.IsZero());
+    msub(rd, rn, rm, ra);
+  }
+  void Mul(const Register& rd, const Register& rn, const Register& rm) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    VIXL_ASSERT(!rm.IsZero());
+    mul(rd, rn, rm);
+  }
+  void Nop() {
+    nop();
+  }
+  void Rbit(const Register& rd, const Register& rn) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    rbit(rd, rn);
+  }
+  void Ret(const Register& xn = lr) {
+    VIXL_ASSERT(!xn.IsZero());
+    ret(xn);
+  }
+  void Rev(const Register& rd, const Register& rn) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    rev(rd, rn);
+  }
+  void Rev16(const Register& rd, const Register& rn) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    rev16(rd, rn);
+  }
+  void Rev32(const Register& rd, const Register& rn) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    rev32(rd, rn);
+  }
+  void Ror(const Register& rd, const Register& rs, unsigned shift) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rs.IsZero());
+    ror(rd, rs, shift);
+  }
+  void Ror(const Register& rd, const Register& rn, const Register& rm) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    VIXL_ASSERT(!rm.IsZero());
+    rorv(rd, rn, rm);
+  }
+  void Sbfiz(const Register& rd, const Register& rn, unsigned lsb, unsigned width) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    sbfiz(rd, rn, lsb, width);
+  }
+  void Sbfx(const Register& rd, const Register& rn, unsigned lsb, unsigned width) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    sbfx(rd, rn, lsb, width);
+  }
+  void Scvtf(const FPRegister& fd, const Register& rn, unsigned fbits = 0) {
+    VIXL_ASSERT(!rn.IsZero());
+    scvtf(fd, rn, fbits);
+  }
+  void Sdiv(const Register& rd, const Register& rn, const Register& rm) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    VIXL_ASSERT(!rm.IsZero());
+    sdiv(rd, rn, rm);
+  }
+  void Smaddl(const Register& rd, const Register& rn,
+              const Register& rm, const Register& ra) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    VIXL_ASSERT(!rm.IsZero());
+    VIXL_ASSERT(!ra.IsZero());
+    smaddl(rd, rn, rm, ra);
+  }
+  void Smsubl(const Register& rd, const Register& rn,
+              const Register& rm, const Register& ra) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    VIXL_ASSERT(!rm.IsZero());
+    VIXL_ASSERT(!ra.IsZero());
+    smsubl(rd, rn, rm, ra);
+  }
+  void Smull(const Register& rd, const Register& rn, const Register& rm) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    VIXL_ASSERT(!rm.IsZero());
+    smull(rd, rn, rm);
+  }
+  void Smulh(const Register& xd, const Register& xn, const Register& xm) {
+    VIXL_ASSERT(!xd.IsZero());
+    VIXL_ASSERT(!xn.IsZero());
+    VIXL_ASSERT(!xm.IsZero());
+    smulh(xd, xn, xm);
+  }
+  void Stlr(const Register& rt, const MemOperand& dst) {
+    stlr(rt, dst);
+  }
+  void Stlrb(const Register& rt, const MemOperand& dst) {
+    stlrb(rt, dst);
+  }
+  void Stlrh(const Register& rt, const MemOperand& dst) {
+    stlrh(rt, dst);
+  }
+  void Stlxp(const Register& rs, const Register& rt,
+             const Register& rt2, const MemOperand& dst) {
+    VIXL_ASSERT(!rs.Aliases(dst.base()));
+    VIXL_ASSERT(!rs.Aliases(rt));
+    VIXL_ASSERT(!rs.Aliases(rt2));
+    stlxp(rs, rt, rt2, dst);
+  }
+  void Stlxr(const Register& rs, const Register& rt, const MemOperand& dst) {
+    VIXL_ASSERT(!rs.Aliases(dst.base()));
+    VIXL_ASSERT(!rs.Aliases(rt));
+    stlxr(rs, rt, dst);
+  }
+  void Stlxrb(const Register& rs, const Register& rt, const MemOperand& dst) {
+    VIXL_ASSERT(!rs.Aliases(dst.base()));
+    VIXL_ASSERT(!rs.Aliases(rt));
+    stlxrb(rs, rt, dst);
+  }
+  void Stlxrh(const Register& rs, const Register& rt, const MemOperand& dst) {
+    VIXL_ASSERT(!rs.Aliases(dst.base()));
+    VIXL_ASSERT(!rs.Aliases(rt));
+    stlxrh(rs, rt, dst);
+  }
+  void Stnp(const CPURegister& rt, const CPURegister& rt2, const MemOperand& dst) {
+    stnp(rt, rt2, dst);
+  }
+  void Stp(const CPURegister& rt, const CPURegister& rt2, const MemOperand& dst) {
+    stp(rt, rt2, dst);
+  }
+  void Stxp(const Register& rs, const Register& rt,
+            const Register& rt2, const MemOperand& dst) {
+    VIXL_ASSERT(!rs.Aliases(dst.base()));
+    VIXL_ASSERT(!rs.Aliases(rt));
+    VIXL_ASSERT(!rs.Aliases(rt2));
+    stxp(rs, rt, rt2, dst);
+  }
+  void Stxr(const Register& rs, const Register& rt, const MemOperand& dst) {
+    VIXL_ASSERT(!rs.Aliases(dst.base()));
+    VIXL_ASSERT(!rs.Aliases(rt));
+    stxr(rs, rt, dst);
+  }
+  void Stxrb(const Register& rs, const Register& rt, const MemOperand& dst) {
+    VIXL_ASSERT(!rs.Aliases(dst.base()));
+    VIXL_ASSERT(!rs.Aliases(rt));
+    stxrb(rs, rt, dst);
+  }
+  void Stxrh(const Register& rs, const Register& rt, const MemOperand& dst) {
+    VIXL_ASSERT(!rs.Aliases(dst.base()));
+    VIXL_ASSERT(!rs.Aliases(rt));
+    stxrh(rs, rt, dst);
+  }
+  void Sxtb(const Register& rd, const Register& rn) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    sxtb(rd, rn);
+  }
+  void Sxth(const Register& rd, const Register& rn) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    sxth(rd, rn);
+  }
+  void Sxtw(const Register& rd, const Register& rn) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    sxtw(rd, rn);
+  }
+  void Tbnz(const Register& rt, unsigned bit_pos, Label* label) {
+    VIXL_ASSERT(!rt.IsZero());
+    tbnz(rt, bit_pos, label);
+  }
+  void Tbz(const Register& rt, unsigned bit_pos, Label* label) {
+    VIXL_ASSERT(!rt.IsZero());
+    tbz(rt, bit_pos, label);
+  }
+  void Ubfiz(const Register& rd, const Register& rn, unsigned lsb, unsigned width) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    ubfiz(rd, rn, lsb, width);
+  }
+  void Ubfx(const Register& rd, const Register& rn, unsigned lsb, unsigned width) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    ubfx(rd, rn, lsb, width);
+  }
+  void Ucvtf(const FPRegister& fd, const Register& rn, unsigned fbits = 0) {
+    VIXL_ASSERT(!rn.IsZero());
+    ucvtf(fd, rn, fbits);
+  }
+  void Udiv(const Register& rd, const Register& rn, const Register& rm) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    VIXL_ASSERT(!rm.IsZero());
+    udiv(rd, rn, rm);
+  }
+  void Umaddl(const Register& rd, const Register& rn,
+              const Register& rm, const Register& ra) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    VIXL_ASSERT(!rm.IsZero());
+    VIXL_ASSERT(!ra.IsZero());
+    umaddl(rd, rn, rm, ra);
+  }
+  void Umsubl(const Register& rd, const Register& rn,
+              const Register& rm, const Register& ra) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    VIXL_ASSERT(!rm.IsZero());
+    VIXL_ASSERT(!ra.IsZero());
+    umsubl(rd, rn, rm, ra);
+  }
+  void Unreachable() {
+#ifdef JS_ARM64_SIMULATOR
+    hlt(kUnreachableOpcode);
+#else
+    // Branch to 0 to generate a segfault.
+    // lr - kInstructionSize is the address of the offending instruction.
+    blr(xzr);
+#endif
+  }
+  void Uxtb(const Register& rd, const Register& rn) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    uxtb(rd, rn);
+  }
+  void Uxth(const Register& rd, const Register& rn) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    uxth(rd, rn);
+  }
+  void Uxtw(const Register& rd, const Register& rn) {
+    VIXL_ASSERT(!rd.IsZero());
+    VIXL_ASSERT(!rn.IsZero());
+    uxtw(rd, rn);
+  }
+
+  // Push the system stack pointer (sp) down to allow the same to be done to
+  // the current stack pointer (according to GetStackPointer64()). This must be
+  // called _before_ accessing the memory.
+  //
+  // This is necessary when pushing or otherwise adding things to the stack, to
+  // satisfy the AAPCS64 constraint that the memory below the system stack
+  // pointer is not accessed.
+  //
+  // This method asserts that GetStackPointer64() is not sp, since the call does
+  // not make sense in that context.
+  //
+  // TODO: This method can only accept values of 'space' that can be encoded in
+  // one instruction. Refer to the implementation for details.
+  void BumpSystemStackPointer(const Operand& space);
+
+  // Set the current stack pointer, but don't generate any code.
+  void SetStackPointer64(const Register& stack_pointer) {
+    VIXL_ASSERT(!TmpList()->IncludesAliasOf(stack_pointer));
+    sp_ = stack_pointer;
+  }
+
+  // Return the current stack pointer, as set by SetStackPointer64.
+  const Register& GetStackPointer64() const {
+    return sp_;
+  }
+  const js::jit::Register getStackPointer() const {
+    int code = sp_.code();
+    if (code == kSPRegInternalCode) {
+      code = 31;
+    }
+    return js::jit::Register::FromCode(code);
+  }
+
+  CPURegList* TmpList() {
+    return &tmp_list_;
+  }
+  CPURegList* FPTmpList() {
+    return &fptmp_list_;
+  }
+
+  // Like printf, but print at run-time from generated code.
+  //
+  // The caller must ensure that arguments for floating-point placeholders
+  // (such as %e, %f or %g) are FPRegisters, and that arguments for integer
+  // placeholders are Registers.
+  //
+  // At the moment it is only possible to print the value of sp if it is the
+  // current stack pointer. Otherwise, the MacroAssembler will automatically
+  // update sp on every push (using BumpSystemStackPointer), so determining its
+  // value is difficult.
+  //
+  // Format placeholders that refer to more than one argument, or to a specific
+  // argument, are not supported. This includes formats like "%1$d" or "%.*d".
+  //
+  // This function automatically preserves caller-saved registers so that
+  // calling code can use Printf at any point without having to worry about
+  // corruption. The preservation mechanism generates a lot of code. If this is
+  // a problem, preserve the important registers manually and then call
+  // PrintfNoPreserve. Callee-saved registers are not used by Printf, and are
+  // implicitly preserved.
+  void Printf(const char * format,
+              CPURegister arg0 = NoCPUReg,
+              CPURegister arg1 = NoCPUReg,
+              CPURegister arg2 = NoCPUReg,
+              CPURegister arg3 = NoCPUReg);
+
+  // Like Printf, but don't preserve any caller-saved registers, not even 'lr'.
+  //
+  // The return code from the system printf call will be returned in x0.
+  void PrintfNoPreserve(const char * format,
+                        const CPURegister& arg0 = NoCPUReg,
+                        const CPURegister& arg1 = NoCPUReg,
+                        const CPURegister& arg2 = NoCPUReg,
+                        const CPURegister& arg3 = NoCPUReg);
+
+
+  // Trace control when running the debug simulator.
+  //
+  // For example:
+  //
+  // __ Trace(LOG_REGS, TRACE_ENABLE);
+  // Will add registers to the trace if it wasn't already the case.
+  //
+  // __ Trace(LOG_DISASM, TRACE_DISABLE);
+  // Will stop logging disassembly. It has no effect if the disassembly wasn't
+  // already being logged.
+  void Trace(TraceParameters parameters, TraceCommand command);
+
+  // Log the requested data independently of what is being traced.
+  //
+  // For example:
+  //
+  // __ Log(LOG_FLAGS)
+  // Will output the flags.
+  void Log(TraceParameters parameters);
+
+  // Enable or disable instrumentation when an Instrument visitor is attached to
+  // the simulator.
+  void EnableInstrumentation();
+  void DisableInstrumentation();
+
+  // Add a marker to the instrumentation data produced by an Instrument visitor.
+  // The name is a two character string that will be attached to the marker in
+  // the output data.
+  void AnnotateInstrumentation(const char* marker_name);
+
+ private:
+  // The actual Push and Pop implementations. These don't generate any code
+  // other than that required for the push or pop. This allows
+  // (Push|Pop)CPURegList to bundle together setup code for a large block of
+  // registers.
+  //
+  // Note that size is per register, and is specified in bytes.
+  void PushHelper(int count, int size,
+                  const CPURegister& src0, const CPURegister& src1,
+                  const CPURegister& src2, const CPURegister& src3);
+  void PopHelper(int count, int size,
+                 const CPURegister& dst0, const CPURegister& dst1,
+                 const CPURegister& dst2, const CPURegister& dst3);
+
+  // Perform necessary maintenance operations before a push or pop.
+  //
+  // Note that size is per register, and is specified in bytes.
+  void PrepareForPush(int count, int size);
+  void PrepareForPop(int count, int size);
+
+#if DEBUG
+  // Tell whether any of the macro instruction can be used. When false the
+  // MacroAssembler will assert if a method which can emit a variable number
+  // of instructions is called.
+#endif
+
+  // The register to use as a stack pointer for stack operations.
+  Register sp_;
+
+  // Scratch registers available for use by the MacroAssembler.
+  CPURegList tmp_list_;
+  CPURegList fptmp_list_;
+};
+
+
+// Use this scope when you need a one-to-one mapping between methods and
+// instructions. This scope prevents the MacroAssembler from being called and
+// literal pools from being emitted. It also asserts the number of instructions
+// emitted is what you specified when creating the scope.
+// FIXME: Because of the disabled calls below, this class asserts nothing.
+class InstructionAccurateScope {
+ public:
+#ifdef DEBUG
+  explicit InstructionAccurateScope(MacroAssembler* masm, int count = 0)
+    : masm_(masm), size_(count * kInstructionSize) {
+    //masm_->BlockLiteralPool();
+    if (size_ != 0) {
+      masm_->bind(&start_);
+    }
+  }
+#else
+  explicit InstructionAccurateScope(MacroAssembler* masm, int count = 0)
+    : masm_(masm) {
+    USE(count);
+    //masm_->BlockLiteralPool();
+  }
+#endif
+
+  ~InstructionAccurateScope() {
+    //masm_->ReleaseLiteralPool();
+#if 0 // FIXME: Are we going to use this?
+#ifdef DEBUG
+    if (start_.bound()) {
+      VIXL_ASSERT(masm_->SizeOfCodeGeneratedSince(&start_) == size_);
+    }
+#endif
+#endif
+  }
+
+ private:
+  MacroAssembler* masm_;
+#ifdef DEBUG
+  uint64_t size_;
+  Label start_;
+#endif
+};
+
+
+// This scope utility allows scratch registers to be managed safely. The
+// MacroAssembler's TmpList() (and FPTmpList()) is used as a pool of scratch
+// registers. These registers can be allocated on demand, and will be returned
+// at the end of the scope.
+//
+// When the scope ends, the MacroAssembler's lists will be restored to their
+// original state, even if the lists were modified by some other means.
+class UseScratchRegisterScope {
+ public:
+  explicit UseScratchRegisterScope(MacroAssembler* masm)
+    : available_(masm->TmpList()),
+      availablefp_(masm->FPTmpList()),
+      old_available_(available_->list()),
+      old_availablefp_(availablefp_->list()) {
+    VIXL_ASSERT(available_->type() == CPURegister::kRegister);
+    VIXL_ASSERT(availablefp_->type() == CPURegister::kFPRegister);
+  }
+
+  ~UseScratchRegisterScope();
+
+  bool IsAvailable(const CPURegister& reg) const;
+
+  // Take a register from the appropriate temps list. It will be returned
+  // automatically when the scope ends.
+  Register AcquireW() {
+    return AcquireNextAvailable(available_).W();
+  }
+  Register AcquireX() {
+    return AcquireNextAvailable(available_).X();
+  }
+  FPRegister AcquireS() {
+    return AcquireNextAvailable(availablefp_).S();
+  }
+  FPRegister AcquireD() {
+    return AcquireNextAvailable(availablefp_).D();
+  }
+
+
+  Register AcquireSameSizeAs(const Register& reg);
+  FPRegister AcquireSameSizeAs(const FPRegister& reg);
+
+
+  // Explicitly release an acquired (or excluded) register, putting it back in
+  // the appropriate temps list.
+  void Release(const CPURegister& reg);
+
+
+  // Make the specified registers available as scratch registers for the
+  // duration of this scope.
+  void Include(const CPURegList& list);
+  void Include(const Register& reg1,
+               const Register& reg2 = NoReg,
+               const Register& reg3 = NoReg,
+               const Register& reg4 = NoReg);
+  void Include(const FPRegister& reg1,
+               const FPRegister& reg2 = NoFPReg,
+               const FPRegister& reg3 = NoFPReg,
+               const FPRegister& reg4 = NoFPReg);
+
+
+  // Make sure that the specified registers are not available in this scope.
+  // This can be used to prevent helper functions from using sensitive
+  // registers, for example.
+  void Exclude(const CPURegList& list);
+  void Exclude(const Register& reg1,
+               const Register& reg2 = NoReg,
+               const Register& reg3 = NoReg,
+               const Register& reg4 = NoReg);
+  void Exclude(const FPRegister& reg1,
+               const FPRegister& reg2 = NoFPReg,
+               const FPRegister& reg3 = NoFPReg,
+               const FPRegister& reg4 = NoFPReg);
+  void Exclude(const CPURegister& reg1,
+               const CPURegister& reg2 = NoCPUReg,
+               const CPURegister& reg3 = NoCPUReg,
+               const CPURegister& reg4 = NoCPUReg);
+
+
+  // Prevent any scratch registers from being used in this scope.
+  void ExcludeAll();
+
+
+ private:
+  static CPURegister AcquireNextAvailable(CPURegList* available);
+  static void ReleaseByCode(CPURegList* available, int code);
+  static void ReleaseByRegList(CPURegList* available, RegList regs);
+  static void IncludeByRegList(CPURegList* available, RegList exclude);
+  static void ExcludeByRegList(CPURegList* available, RegList exclude);
+
+  // Available scratch registers.
+  CPURegList* available_;     // kRegister
+  CPURegList* availablefp_;   // kFPRegister
+
+  // The state of the available lists at the start of this scope.
+  RegList old_available_;     // kRegister
+  RegList old_availablefp_;   // kFPRegister
+};
+
+} // namespace vixl
+
+#endif  // VIXL_A64_MACRO_ASSEMBLER_A64_H_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/MozAssembler-vixl.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/MozAssembler-vixl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/MozAssembler-vixl.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/MozAssembler-vixl.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,613 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#include "jsutil.h"
+
+#include "jit/arm64/vixl/Assembler-vixl.h"
+#include "jit/Label.h"
+
+namespace vixl {
+
+
+// Assembler
+void Assembler::Reset() {
+#ifdef DEBUG
+    finalized_ = false;
+#endif
+    pc_ = nullptr;
+}
+
+void Assembler::FinalizeCode() {
+#ifdef DEBUG
+  finalized_ = true;
+#endif
+}
+
+
+// A common implementation for the LinkAndGet<Type>OffsetTo helpers.
+//
+// If the label is bound, returns the offset as a multiple of element_size.
+// Otherwise, links the instruction to the label and returns the offset to encode
+// as a multiple of kInstructionSize.
+//
+// The offset is calculated by aligning the PC and label addresses down to a
+// multiple of element_size, then calculating the (scaled) offset between them.
+// This matches the semantics of adrp, for example.
+template <int element_size>
+ptrdiff_t Assembler::LinkAndGetOffsetTo(BufferOffset branch, Label* label) {
+  if (armbuffer_.oom())
+    return js::jit::LabelBase::INVALID_OFFSET;
+
+  // The label is bound: all uses are already linked.
+  if (label->bound()) {
+    ptrdiff_t branch_offset = ptrdiff_t(branch.getOffset() / element_size);
+    ptrdiff_t label_offset = ptrdiff_t(label->offset() / element_size);
+    return label_offset - branch_offset;
+  }
+
+  // The label is unbound and unused: store the offset in the label itself
+  // for patching by bind().
+  if (!label->used()) {
+    label->use(branch.getOffset());
+    return js::jit::LabelBase::INVALID_OFFSET;
+  }
+
+  // The label is unbound but used. Create an implicit linked list between
+  // the branches, and update the linked list head in the label struct.
+  ptrdiff_t prevHeadOffset = static_cast<ptrdiff_t>(label->offset());
+  label->use(branch.getOffset());
+  VIXL_ASSERT(prevHeadOffset - branch.getOffset() != js::jit::LabelBase::INVALID_OFFSET);
+  return prevHeadOffset - branch.getOffset();
+}
+
+
+ptrdiff_t Assembler::LinkAndGetByteOffsetTo(BufferOffset branch, Label* label) {
+  return LinkAndGetOffsetTo<1>(branch, label);
+}
+
+
+ptrdiff_t Assembler::LinkAndGetInstructionOffsetTo(BufferOffset branch, Label* label) {
+  return LinkAndGetOffsetTo<kInstructionSize>(branch, label);
+}
+
+
+ptrdiff_t Assembler::LinkAndGetPageOffsetTo(BufferOffset branch, Label* label) {
+  return LinkAndGetOffsetTo<kPageSize>(branch, label);
+}
+
+
+BufferOffset Assembler::b(int imm26) {
+  return EmitBranch(B | ImmUncondBranch(imm26));
+}
+
+
+void Assembler::b(Instruction* at, int imm26) {
+  return EmitBranch(at, B | ImmUncondBranch(imm26));
+}
+
+
+BufferOffset Assembler::b(int imm19, Condition cond) {
+  return EmitBranch(B_cond | ImmCondBranch(imm19) | cond);
+}
+
+
+void Assembler::b(Instruction* at, int imm19, Condition cond) {
+  EmitBranch(at, B_cond | ImmCondBranch(imm19) | cond);
+}
+
+
+BufferOffset Assembler::b(Label* label) {
+  // Flush the instruction buffer before calculating relative offset.
+  BufferOffset branch = b(0);
+  Instruction* ins = getInstructionAt(branch);
+  VIXL_ASSERT(ins->IsUncondBranchImm());
+
+  // Encode the relative offset.
+  b(ins, LinkAndGetInstructionOffsetTo(branch, label));
+  return branch;
+}
+
+
+BufferOffset Assembler::b(Label* label, Condition cond) {
+  // Flush the instruction buffer before calculating relative offset.
+  BufferOffset branch = b(0, Always);
+  Instruction* ins = getInstructionAt(branch);
+  VIXL_ASSERT(ins->IsCondBranchImm());
+
+  // Encode the relative offset.
+  b(ins, LinkAndGetInstructionOffsetTo(branch, label), cond);
+  return branch;
+}
+
+
+void Assembler::bl(int imm26) {
+  EmitBranch(BL | ImmUncondBranch(imm26));
+}
+
+
+void Assembler::bl(Instruction* at, int imm26) {
+  EmitBranch(at, BL | ImmUncondBranch(imm26));
+}
+
+
+void Assembler::bl(Label* label) {
+  // Flush the instruction buffer before calculating relative offset.
+  BufferOffset branch = b(0);
+  Instruction* ins = getInstructionAt(branch);
+
+  // Encode the relative offset.
+  bl(ins, LinkAndGetInstructionOffsetTo(branch, label));
+}
+
+
+void Assembler::cbz(const Register& rt, int imm19) {
+  EmitBranch(SF(rt) | CBZ | ImmCmpBranch(imm19) | Rt(rt));
+}
+
+
+void Assembler::cbz(Instruction* at, const Register& rt, int imm19) {
+  EmitBranch(at, SF(rt) | CBZ | ImmCmpBranch(imm19) | Rt(rt));
+}
+
+
+void Assembler::cbz(const Register& rt, Label* label) {
+  // Flush the instruction buffer before calculating relative offset.
+  BufferOffset branch = b(0);
+  Instruction* ins = getInstructionAt(branch);
+
+  // Encode the relative offset.
+  cbz(ins, rt, LinkAndGetInstructionOffsetTo(branch, label));
+}
+
+
+void Assembler::cbnz(const Register& rt, int imm19) {
+  EmitBranch(SF(rt) | CBNZ | ImmCmpBranch(imm19) | Rt(rt));
+}
+
+
+void Assembler::cbnz(Instruction* at, const Register& rt, int imm19) {
+  EmitBranch(at, SF(rt) | CBNZ | ImmCmpBranch(imm19) | Rt(rt));
+}
+
+
+void Assembler::cbnz(const Register& rt, Label* label) {
+  // Flush the instruction buffer before calculating relative offset.
+  BufferOffset branch = b(0);
+  Instruction* ins = getInstructionAt(branch);
+
+  // Encode the relative offset.
+  cbnz(ins, rt, LinkAndGetInstructionOffsetTo(branch, label));
+}
+
+
+void Assembler::tbz(const Register& rt, unsigned bit_pos, int imm14) {
+  VIXL_ASSERT(rt.Is64Bits() || (rt.Is32Bits() && (bit_pos < kWRegSize)));
+  EmitBranch(TBZ | ImmTestBranchBit(bit_pos) | ImmTestBranch(imm14) | Rt(rt));
+}
+
+
+void Assembler::tbz(Instruction* at, const Register& rt, unsigned bit_pos, int imm14) {
+  VIXL_ASSERT(rt.Is64Bits() || (rt.Is32Bits() && (bit_pos < kWRegSize)));
+  EmitBranch(at, TBZ | ImmTestBranchBit(bit_pos) | ImmTestBranch(imm14) | Rt(rt));
+}
+
+
+void Assembler::tbz(const Register& rt, unsigned bit_pos, Label* label) {
+  // Flush the instruction buffer before calculating relative offset.
+  BufferOffset branch = b(0);
+  Instruction* ins = getInstructionAt(branch);
+
+  // Encode the relative offset.
+  tbz(ins, rt, bit_pos, LinkAndGetInstructionOffsetTo(branch, label));
+}
+
+
+void Assembler::tbnz(const Register& rt, unsigned bit_pos, int imm14) {
+  VIXL_ASSERT(rt.Is64Bits() || (rt.Is32Bits() && (bit_pos < kWRegSize)));
+  EmitBranch(TBNZ | ImmTestBranchBit(bit_pos) | ImmTestBranch(imm14) | Rt(rt));
+}
+
+
+void Assembler::tbnz(Instruction* at, const Register& rt, unsigned bit_pos, int imm14) {
+  VIXL_ASSERT(rt.Is64Bits() || (rt.Is32Bits() && (bit_pos < kWRegSize)));
+  EmitBranch(at, TBNZ | ImmTestBranchBit(bit_pos) | ImmTestBranch(imm14) | Rt(rt));
+}
+
+
+void Assembler::tbnz(const Register& rt, unsigned bit_pos, Label* label) {
+  // Flush the instruction buffer before calculating relative offset.
+  BufferOffset branch = b(0);
+  Instruction* ins = getInstructionAt(branch);
+
+  // Encode the relative offset.
+  tbnz(ins, rt, bit_pos, LinkAndGetInstructionOffsetTo(branch, label));
+}
+
+
+void Assembler::adr(const Register& rd, int imm21) {
+  VIXL_ASSERT(rd.Is64Bits());
+  EmitBranch(ADR | ImmPCRelAddress(imm21) | Rd(rd));
+}
+
+
+void Assembler::adr(Instruction* at, const Register& rd, int imm21) {
+  VIXL_ASSERT(rd.Is64Bits());
+  EmitBranch(at, ADR | ImmPCRelAddress(imm21) | Rd(rd));
+}
+
+
+void Assembler::adr(const Register& rd, Label* label) {
+  // Flush the instruction buffer before calculating relative offset.
+  // ADR is not a branch.
+  BufferOffset offset = Emit(0);
+  Instruction* ins = getInstructionAt(offset);
+
+  // Encode the relative offset.
+  adr(ins, rd, LinkAndGetByteOffsetTo(offset, label));
+}
+
+
+void Assembler::adrp(const Register& rd, int imm21) {
+  VIXL_ASSERT(rd.Is64Bits());
+  EmitBranch(ADRP | ImmPCRelAddress(imm21) | Rd(rd));
+}
+
+
+void Assembler::adrp(Instruction* at, const Register& rd, int imm21) {
+  VIXL_ASSERT(rd.Is64Bits());
+  EmitBranch(at, ADRP | ImmPCRelAddress(imm21) | Rd(rd));
+}
+
+
+void Assembler::adrp(const Register& rd, Label* label) {
+  VIXL_ASSERT(AllowPageOffsetDependentCode());
+
+  BufferOffset offset = Emit(0);
+  Instruction* ins = getInstructionAt(offset);
+
+  // Encode the relative offset.
+  adrp(ins, rd, LinkAndGetPageOffsetTo(offset, label));
+}
+
+
+BufferOffset Assembler::ands(const Register& rd, const Register& rn, const Operand& operand) {
+  return Logical(rd, rn, operand, ANDS);
+}
+
+
+BufferOffset Assembler::tst(const Register& rn, const Operand& operand) {
+  return ands(AppropriateZeroRegFor(rn), rn, operand);
+}
+
+
+void Assembler::ldr(Instruction* at, const CPURegister& rt, int imm19) {
+  LoadLiteralOp op = LoadLiteralOpFor(rt);
+  Emit(at, op | ImmLLiteral(imm19) | Rt(rt));
+}
+
+
+BufferOffset Assembler::hint(SystemHint code) {
+  return Emit(HINT | ImmHint(code) | Rt(xzr));
+}
+
+
+void Assembler::hint(Instruction* at, SystemHint code) {
+  Emit(at, HINT | ImmHint(code) | Rt(xzr));
+}
+
+
+void Assembler::svc(Instruction* at, int code) {
+  VIXL_ASSERT(is_uint16(code));
+  Emit(at, SVC | ImmException(code));
+}
+
+
+void Assembler::nop(Instruction* at) {
+  hint(at, NOP);
+}
+
+
+BufferOffset Assembler::Logical(const Register& rd, const Register& rn,
+                                const Operand& operand, LogicalOp op)
+{
+  VIXL_ASSERT(rd.size() == rn.size());
+  if (operand.IsImmediate()) {
+    int64_t immediate = operand.immediate();
+    unsigned reg_size = rd.size();
+
+    VIXL_ASSERT(immediate != 0);
+    VIXL_ASSERT(immediate != -1);
+    VIXL_ASSERT(rd.Is64Bits() || is_uint32(immediate));
+
+    // If the operation is NOT, invert the operation and immediate.
+    if ((op & NOT) == NOT) {
+      op = static_cast<LogicalOp>(op & ~NOT);
+      immediate = rd.Is64Bits() ? ~immediate : (~immediate & kWRegMask);
+    }
+
+    unsigned n, imm_s, imm_r;
+    if (IsImmLogical(immediate, reg_size, &n, &imm_s, &imm_r)) {
+      // Immediate can be encoded in the instruction.
+      return LogicalImmediate(rd, rn, n, imm_s, imm_r, op);
+    } else {
+      // This case is handled in the macro assembler.
+      VIXL_UNREACHABLE();
+    }
+  } else {
+    VIXL_ASSERT(operand.IsShiftedRegister());
+    VIXL_ASSERT(operand.reg().size() == rd.size());
+    Instr dp_op = static_cast<Instr>(op | LogicalShiftedFixed);
+    return DataProcShiftedRegister(rd, rn, operand, LeaveFlags, dp_op);
+  }
+}
+
+
+BufferOffset Assembler::LogicalImmediate(const Register& rd, const Register& rn,
+                                         unsigned n, unsigned imm_s, unsigned imm_r, LogicalOp op)
+{
+    unsigned reg_size = rd.size();
+    Instr dest_reg = (op == ANDS) ? Rd(rd) : RdSP(rd);
+    return Emit(SF(rd) | LogicalImmediateFixed | op | BitN(n, reg_size) |
+                ImmSetBits(imm_s, reg_size) | ImmRotate(imm_r, reg_size) | dest_reg | Rn(rn));
+}
+
+
+BufferOffset Assembler::DataProcShiftedRegister(const Register& rd, const Register& rn,
+                                                const Operand& operand, FlagsUpdate S, Instr op)
+{
+  VIXL_ASSERT(operand.IsShiftedRegister());
+  VIXL_ASSERT(rn.Is64Bits() || (rn.Is32Bits() && is_uint5(operand.shift_amount())));
+  return Emit(SF(rd) | op | Flags(S) |
+              ShiftDP(operand.shift()) | ImmDPShift(operand.shift_amount()) |
+              Rm(operand.reg()) | Rn(rn) | Rd(rd));
+}
+
+
+void MozBaseAssembler::InsertIndexIntoTag(uint8_t* load, uint32_t index) {
+  // Store the js::jit::PoolEntry index into the instruction.
+  // finishPool() will walk over all literal load instructions
+  // and use PatchConstantPoolLoad() to patch to the final relative offset.
+  *((uint32_t*)load) |= Assembler::ImmLLiteral(index);
+}
+
+
+bool MozBaseAssembler::PatchConstantPoolLoad(void* loadAddr, void* constPoolAddr) {
+  Instruction* load = reinterpret_cast<Instruction*>(loadAddr);
+
+  // The load currently contains the js::jit::PoolEntry's index,
+  // as written by InsertIndexIntoTag().
+  uint32_t index = load->ImmLLiteral();
+
+  // Each entry in the literal pool is uint32_t-sized.
+  uint32_t* constPool = reinterpret_cast<uint32_t*>(constPoolAddr);
+  Instruction* source = reinterpret_cast<Instruction*>(&constPool[index]);
+
+  load->SetImmLLiteral(source);
+  return false; // Nothing uses the return value.
+}
+
+
+uint32_t MozBaseAssembler::PlaceConstantPoolBarrier(int offset) {
+  MOZ_CRASH("PlaceConstantPoolBarrier");
+}
+
+
+struct PoolHeader {
+  uint32_t data;
+
+  struct Header {
+    // The size should take into account the pool header.
+    // The size is in units of Instruction (4bytes), not byte.
+    union {
+      struct {
+        uint32_t size : 15;
+        bool isNatural : 1;
+        uint32_t ONES : 16;
+      };
+      uint32_t data;
+    };
+
+    Header(int size_, bool isNatural_)
+      : size(size_),
+        isNatural(isNatural_),
+        ONES(0xffff)
+    { }
+
+    Header(uint32_t data)
+      : data(data)
+    {
+      JS_STATIC_ASSERT(sizeof(Header) == sizeof(uint32_t));
+      VIXL_ASSERT(ONES == 0xffff);
+    }
+
+    uint32_t raw() const {
+      JS_STATIC_ASSERT(sizeof(Header) == sizeof(uint32_t));
+      return data;
+    }
+  };
+
+  PoolHeader(int size_, bool isNatural_)
+    : data(Header(size_, isNatural_).raw())
+  { }
+
+  uint32_t size() const {
+    Header tmp(data);
+    return tmp.size;
+  }
+
+  uint32_t isNatural() const {
+    Header tmp(data);
+    return tmp.isNatural;
+  }
+};
+
+
+void MozBaseAssembler::WritePoolHeader(uint8_t* start, js::jit::Pool* p, bool isNatural) {
+  JS_STATIC_ASSERT(sizeof(PoolHeader) == 4);
+
+  // Get the total size of the pool.
+  uint8_t* pool = start + sizeof(PoolHeader) + p->getPoolSize();
+
+  uintptr_t size = pool - start;
+  VIXL_ASSERT((size & 3) == 0);
+  size = size >> 2;
+  VIXL_ASSERT(size < (1 << 15));
+
+  PoolHeader header(size, isNatural);
+  *(PoolHeader*)start = header;
+}
+
+
+void MozBaseAssembler::WritePoolFooter(uint8_t* start, js::jit::Pool* p, bool isNatural) {
+  return;
+}
+
+
+void MozBaseAssembler::WritePoolGuard(BufferOffset branch, Instruction* inst, BufferOffset dest) {
+  int byteOffset = dest.getOffset() - branch.getOffset();
+  VIXL_ASSERT(byteOffset % kInstructionSize == 0);
+
+  int instOffset = byteOffset >> kInstructionSizeLog2;
+  Assembler::b(inst, instOffset);
+}
+
+
+ptrdiff_t MozBaseAssembler::GetBranchOffset(const Instruction* ins) {
+  // Branch instructions use an instruction offset.
+  if (ins->BranchType() != UnknownBranchType)
+    return ins->ImmPCRawOffset() * kInstructionSize;
+
+  // ADR and ADRP encode relative offsets and therefore require patching as if they were branches.
+  // ADR uses a byte offset.
+  if (ins->IsADR())
+    return ins->ImmPCRawOffset();
+
+  // ADRP uses a page offset.
+  if (ins->IsADRP())
+    return ins->ImmPCRawOffset() * kPageSize;
+
+  MOZ_CRASH("Unsupported branch type");
+}
+
+
+void MozBaseAssembler::RetargetNearBranch(Instruction* i, int offset, Condition cond, bool final) {
+  if (i->IsCondBranchImm()) {
+    VIXL_ASSERT(i->IsCondB());
+    Assembler::b(i, offset, cond);
+    return;
+  }
+  MOZ_CRASH("Unsupported branch type");
+}
+
+
+void MozBaseAssembler::RetargetNearBranch(Instruction* i, int byteOffset, bool final) {
+  const int instOffset = byteOffset >> kInstructionSizeLog2;
+
+  // The only valid conditional instruction is B.
+  if (i->IsCondBranchImm()) {
+    VIXL_ASSERT(byteOffset % kInstructionSize == 0);
+    VIXL_ASSERT(i->IsCondB());
+    Condition cond = static_cast<Condition>(i->ConditionBranch());
+    Assembler::b(i, instOffset, cond);
+    return;
+  }
+
+  // Valid unconditional branches are B and BL.
+  if (i->IsUncondBranchImm()) {
+    VIXL_ASSERT(byteOffset % kInstructionSize == 0);
+    if (i->IsUncondB()) {
+      Assembler::b(i, instOffset);
+    } else {
+      VIXL_ASSERT(i->IsBL());
+      Assembler::bl(i, instOffset);
+    }
+
+    VIXL_ASSERT(i->ImmUncondBranch() == instOffset);
+    return;
+  }
+
+  // Valid compare branches are CBZ and CBNZ.
+  if (i->IsCompareBranch()) {
+    VIXL_ASSERT(byteOffset % kInstructionSize == 0);
+    Register rt = i->SixtyFourBits() ? Register::XRegFromCode(i->Rt())
+                                     : Register::WRegFromCode(i->Rt());
+
+    if (i->IsCBZ()) {
+      Assembler::cbz(i, rt, instOffset);
+    } else {
+      VIXL_ASSERT(i->IsCBNZ());
+      Assembler::cbnz(i, rt, instOffset);
+    }
+
+    VIXL_ASSERT(i->ImmCmpBranch() == instOffset);
+    return;
+  }
+
+  // Valid test branches are TBZ and TBNZ.
+  if (i->IsTestBranch()) {
+    VIXL_ASSERT(byteOffset % kInstructionSize == 0);
+    // Opposite of ImmTestBranchBit(): MSB in bit 5, 0:5 at bit 40.
+    unsigned bit_pos = (i->ImmTestBranchBit5() << 5) | (i->ImmTestBranchBit40());
+    VIXL_ASSERT(is_uint6(bit_pos));
+
+    // Register size doesn't matter for the encoding.
+    Register rt = Register::XRegFromCode(i->Rt());
+
+    if (i->IsTBZ()) {
+      Assembler::tbz(i, rt, bit_pos, instOffset);
+    } else {
+      VIXL_ASSERT(i->IsTBNZ());
+      Assembler::tbnz(i, rt, bit_pos, instOffset);
+    }
+
+    VIXL_ASSERT(i->ImmTestBranch() == instOffset);
+    return;
+  }
+
+  if (i->IsADR()) {
+    Register rd = Register::XRegFromCode(i->Rd());
+    Assembler::adr(i, rd, byteOffset);
+    return;
+  }
+
+  if (i->IsADRP()) {
+    const int pageOffset = byteOffset >> kPageSizeLog2;
+    Register rd = Register::XRegFromCode(i->Rd());
+    Assembler::adrp(i, rd, pageOffset);
+    return;
+  }
+
+  MOZ_CRASH("Unsupported branch type");
+}
+
+
+void MozBaseAssembler::RetargetFarBranch(Instruction* i, uint8_t** slot, uint8_t* dest, Condition cond) {
+  MOZ_CRASH("RetargetFarBranch()");
+}
+
+
+}  // namespace vixl
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/MozBaseAssembler-vixl.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/MozBaseAssembler-vixl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/MozBaseAssembler-vixl.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/MozBaseAssembler-vixl.h	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,176 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#ifndef jit_arm64_vixl_MozBaseAssembler_vixl_h
+#define jit_arm64_vixl_MozBaseAssembler_vixl_h
+
+#include "jit/arm64/vixl/Constants-vixl.h"
+#include "jit/arm64/vixl/Instructions-vixl.h"
+
+#include "jit/shared/Assembler-shared.h"
+#include "jit/shared/IonAssemblerBufferWithConstantPools.h"
+
+namespace vixl {
+
+
+using js::jit::BufferOffset;
+
+
+class MozBaseAssembler;
+typedef js::jit::AssemblerBufferWithConstantPools<1024, 4, Instruction, MozBaseAssembler> ARMBuffer;
+
+
+// Base class for vixl::Assembler, for isolating Moz-specific changes to VIXL.
+class MozBaseAssembler : public js::jit::AssemblerShared {
+  // Buffer initialization constants.
+  static const unsigned BufferGuardSize = 1;
+  static const unsigned BufferHeaderSize = 1;
+  static const size_t   BufferCodeAlignment = 8;
+  static const size_t   BufferMaxPoolOffset = 1024;
+  static const unsigned BufferPCBias = 0;
+  static const uint32_t BufferAlignmentFillInstruction = BRK | (0xdead << ImmException_offset);
+  static const uint32_t BufferNopFillInstruction = HINT | (31 << Rt_offset);
+  static const unsigned BufferNumDebugNopsToInsert = 0;
+
+ public:
+  MozBaseAssembler()
+    : armbuffer_(BufferGuardSize,
+                 BufferHeaderSize,
+                 BufferCodeAlignment,
+                 BufferMaxPoolOffset,
+                 BufferPCBias,
+                 BufferAlignmentFillInstruction,
+                 BufferNopFillInstruction,
+                 BufferNumDebugNopsToInsert)
+  { }
+
+ public:
+  // Helper function for use with the ARMBuffer.
+  // The MacroAssembler must create an AutoJitContextAlloc before initializing the buffer.
+  void initWithAllocator() {
+    armbuffer_.initWithAllocator();
+  }
+
+  // Return the Instruction at a given byte offset.
+  Instruction* getInstructionAt(BufferOffset offset) {
+    return armbuffer_.getInst(offset);
+  }
+
+  // Return the byte offset of a bound label.
+  template <typename T>
+  inline T GetLabelByteOffset(const js::jit::Label* label) {
+    VIXL_ASSERT(label->bound());
+    JS_STATIC_ASSERT(sizeof(T) >= sizeof(uint32_t));
+    return reinterpret_cast<T>(label->offset());
+  }
+
+ protected:
+  // Emit the instruction, returning its offset.
+  BufferOffset Emit(Instr instruction, bool isBranch = false) {
+    JS_STATIC_ASSERT(sizeof(instruction) == kInstructionSize);
+    return armbuffer_.putInt(*(uint32_t*)(&instruction), isBranch);
+  }
+
+  BufferOffset EmitBranch(Instr instruction) {
+    return Emit(instruction, true);
+  }
+
+ public:
+  // Emit the instruction at |at|.
+  static void Emit(Instruction* at, Instr instruction) {
+    JS_STATIC_ASSERT(sizeof(instruction) == kInstructionSize);
+    memcpy(at, &instruction, sizeof(instruction));
+  }
+
+  static void EmitBranch(Instruction* at, Instr instruction) {
+    // TODO: Assert that the buffer already has the instruction marked as a branch.
+    Emit(at, instruction);
+  }
+
+  // Emit data inline in the instruction stream.
+  BufferOffset EmitData(void const * data, unsigned size) {
+    VIXL_ASSERT(size % 4 == 0);
+    return armbuffer_.allocEntry(size / sizeof(uint32_t), 0, (uint8_t*)(data), nullptr);
+  }
+
+ public:
+  // Size of the code generated in bytes, including pools.
+  size_t SizeOfCodeGenerated() const {
+    return armbuffer_.size();
+  }
+
+  // Move the pool into the instruction stream.
+  void flushBuffer() {
+    armbuffer_.flushPool();
+  }
+
+  // Inhibit pool flushing for the given number of instructions.
+  // Generating more than |maxInst| instructions in a no-pool region
+  // triggers an assertion within the ARMBuffer.
+  // Does not nest.
+  void enterNoPool(size_t maxInst) {
+    armbuffer_.enterNoPool(maxInst);
+  }
+
+  // Marks the end of a no-pool region.
+  void leaveNoPool() {
+    armbuffer_.leaveNoPool();
+  }
+
+ public:
+  // Static interface used by IonAssemblerBufferWithConstantPools.
+  static void InsertIndexIntoTag(uint8_t* load, uint32_t index);
+  static bool PatchConstantPoolLoad(void* loadAddr, void* constPoolAddr);
+  static uint32_t PlaceConstantPoolBarrier(int offset);
+
+  static void WritePoolHeader(uint8_t* start, js::jit::Pool* p, bool isNatural);
+  static void WritePoolFooter(uint8_t* start, js::jit::Pool* p, bool isNatural);
+  static void WritePoolGuard(BufferOffset branch, Instruction* inst, BufferOffset dest);
+
+  static ptrdiff_t GetBranchOffset(const Instruction* i);
+  static void RetargetNearBranch(Instruction* i, int offset, Condition cond, bool final = true);
+  static void RetargetNearBranch(Instruction* i, int offset, bool final = true);
+  static void RetargetFarBranch(Instruction* i, uint8_t** slot, uint8_t* dest, Condition cond);
+
+ protected:
+  // The buffer into which code and relocation info are generated.
+  ARMBuffer armbuffer_;
+
+  js::jit::CompactBufferWriter jumpRelocations_;
+  js::jit::CompactBufferWriter dataRelocations_;
+  js::jit::CompactBufferWriter relocations_;
+  js::jit::CompactBufferWriter preBarriers_;
+
+  // Literal pools.
+  mozilla::Array<js::jit::Pool, 4> pools_;
+};
+
+
+}  // namespace vixl
+
+
+#endif  // jit_arm64_vixl_MozBaseAssembler_vixl_h
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/MozInstructions-vixl.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/MozInstructions-vixl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/MozInstructions-vixl.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/MozInstructions-vixl.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,138 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#include "jit/arm64/vixl/Instructions-vixl.h"
+
+namespace vixl {
+
+bool Instruction::IsUncondB() const {
+  return Mask(UnconditionalBranchMask) == (UnconditionalBranchFixed | B);
+}
+
+
+bool Instruction::IsCondB() const {
+  return Mask(ConditionalBranchMask) == (ConditionalBranchFixed | B_cond);
+}
+
+
+bool Instruction::IsBL() const {
+  return Mask(UnconditionalBranchMask) == (UnconditionalBranchFixed | BL);
+}
+
+
+bool Instruction::IsBR() const {
+  return Mask(UnconditionalBranchToRegisterMask) == (UnconditionalBranchToRegisterFixed | BR);
+}
+
+
+bool Instruction::IsBLR() const {
+  return Mask(UnconditionalBranchToRegisterMask) == (UnconditionalBranchToRegisterFixed | BLR);
+}
+
+
+bool Instruction::IsTBZ() const {
+  return Mask(TestBranchMask) == TBZ;
+}
+
+
+bool Instruction::IsTBNZ() const {
+  return Mask(TestBranchMask) == TBNZ;
+}
+
+
+bool Instruction::IsCBZ() const {
+  return Mask(CompareBranchMask) == CBZ_w || Mask(CompareBranchMask) == CBZ_x;
+}
+
+
+bool Instruction::IsCBNZ() const {
+  return Mask(CompareBranchMask) == CBNZ_w || Mask(CompareBranchMask) == CBNZ_x;
+}
+
+
+bool Instruction::IsLDR() const {
+  return Mask(LoadLiteralMask) == LDR_x_lit;
+}
+
+
+bool Instruction::IsADR() const {
+  return Mask(PCRelAddressingMask) == ADR;
+}
+
+
+bool Instruction::IsADRP() const {
+  return Mask(PCRelAddressingMask) == ADRP;
+}
+
+
+bool Instruction::IsBranchLinkImm() const {
+  return Mask(UnconditionalBranchFMask) == (UnconditionalBranchFixed | BL);
+}
+
+
+bool Instruction::IsTargetReachable(Instruction* target) const {
+    VIXL_ASSERT(((target - this) & 3) == 0);
+    int offset = (target - this) >> kInstructionSizeLog2;
+    switch (BranchType()) {
+      case CondBranchType:
+        return is_int19(offset);
+      case UncondBranchType:
+        return is_int26(offset);
+      case CompareBranchType:
+        return is_int19(offset);
+      case TestBranchType:
+        return is_int14(offset);
+      default:
+        VIXL_UNREACHABLE();
+    }
+}
+
+
+ptrdiff_t Instruction::ImmPCRawOffset() const {
+  ptrdiff_t offset;
+  if (IsPCRelAddressing()) {
+    // ADR and ADRP.
+    offset = ImmPCRel();
+  } else if (BranchType() == UnknownBranchType) {
+    offset = ImmLLiteral();
+  } else {
+    offset = ImmBranch();
+  }
+  return offset;
+}
+
+
+void Instruction::SetBits32(int msb, int lsb, unsigned value) {
+  uint32_t me;
+  memcpy(&me, this, sizeof(me));
+  uint32_t new_mask = (1 << (msb+1)) - (1 << lsb);
+  uint32_t keep_mask = ~new_mask;
+  me = (me & keep_mask) | ((value << lsb) & new_mask);
+  memcpy(this, &me, sizeof(me));
+}
+
+
+} // namespace vixl
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/MozSimulator-vixl.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/MozSimulator-vixl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/MozSimulator-vixl.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/MozSimulator-vixl.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,691 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#include "mozilla/DebugOnly.h"
+
+#include "jit/arm64/vixl/Debugger-vixl.h"
+#include "jit/arm64/vixl/Simulator-vixl.h"
+#include "jit/IonTypes.h"
+#include "vm/Runtime.h"
+
+namespace vixl {
+
+
+using mozilla::DebugOnly;
+using js::jit::ABIFunctionType;
+
+
+Simulator::Simulator() {
+  decoder_ = js_new<Decoder>();
+  if (!decoder_) {
+    MOZ_ReportAssertionFailure("[unhandlable oom] Decoder", __FILE__, __LINE__);
+    MOZ_CRASH();
+  }
+
+  // FIXME: This just leaks the Decoder object for now, which is probably OK.
+  // FIXME: We should free it at some point.
+  // FIXME: Note that it can't be stored in the SimulatorRuntime due to lifetime conflicts.
+  this->init(decoder_, stdout);
+}
+
+
+Simulator::Simulator(Decoder* decoder, FILE* stream) {
+  this->init(decoder, stream);
+}
+
+
+void Simulator::ResetState() {
+  // Reset the system registers.
+  nzcv_ = SimSystemRegister::DefaultValueFor(NZCV);
+  fpcr_ = SimSystemRegister::DefaultValueFor(FPCR);
+
+  // Reset registers to 0.
+  pc_ = NULL;
+  pc_modified_ = false;
+  for (unsigned i = 0; i < kNumberOfRegisters; i++) {
+    set_xreg(i, 0xbadbeef);
+  }
+  // Set FP registers to a value that is a NaN in both 32-bit and 64-bit FP.
+  uint64_t nan_bits = UINT64_C(0x7ff0dead7f8beef1);
+  VIXL_ASSERT(IsSignallingNaN(rawbits_to_double(nan_bits & kDRegMask)));
+  VIXL_ASSERT(IsSignallingNaN(rawbits_to_float(nan_bits & kSRegMask)));
+  for (unsigned i = 0; i < kNumberOfFPRegisters; i++) {
+    set_dreg_bits(i, nan_bits);
+  }
+  // Returning to address 0 exits the Simulator.
+  set_lr(kEndOfSimAddress);
+  set_resume_pc(nullptr);
+}
+
+
+void Simulator::init(Decoder* decoder, FILE* stream) {
+  // Ensure that shift operations act as the simulator expects.
+  VIXL_ASSERT((static_cast<int32_t>(-1) >> 1) == -1);
+  VIXL_ASSERT((static_cast<uint32_t>(-1) >> 1) == 0x7FFFFFFF);
+
+  // Set up the decoder.
+  decoder_ = decoder;
+  decoder_->AppendVisitor(this);
+
+  stream_ = stream;
+  print_disasm_ = new PrintDisassembler(stream_);
+  set_coloured_trace(false);
+  trace_parameters_ = LOG_NONE;
+
+  ResetState();
+
+  // Allocate and set up the simulator stack.
+  stack_ = new byte[stack_size_];
+  stack_limit_ = stack_ + stack_protection_size_;
+  // Configure the starting stack pointer.
+  //  - Find the top of the stack.
+  byte * tos = stack_ + stack_size_;
+  //  - There's a protection region at both ends of the stack.
+  tos -= stack_protection_size_;
+  //  - The stack pointer must be 16-byte aligned.
+  tos = AlignDown(tos, 16);
+  set_sp(tos);
+
+  // Set the sample period to 10, as the VIXL examples and tests are short.
+  instrumentation_ = new Instrument("vixl_stats.csv", 10);
+
+  // Print a warning about exclusive-access instructions, but only the first
+  // time they are encountered. This warning can be silenced using
+  // SilenceExclusiveAccessWarning().
+  print_exclusive_access_warning_ = true;
+
+  lock_ = PR_NewLock();
+  if (!lock_)
+    MOZ_CRASH("Could not allocate simulator lock.");
+  lockOwner_ = nullptr;
+  redirection_ = nullptr;
+}
+
+
+Simulator* Simulator::Current() {
+  return js::TlsPerThreadData.get()->simulator();
+}
+
+
+Simulator* Simulator::Create() {
+  Decoder* decoder = js_new<vixl::Decoder>();
+  if (!decoder) {
+    MOZ_ReportAssertionFailure("[unhandlable oom] Decoder", __FILE__, __LINE__);
+    MOZ_CRASH();
+  }
+
+  // FIXME: This just leaks the Decoder object for now, which is probably OK.
+  // FIXME: We should free it at some point.
+  // FIXME: Note that it can't be stored in the SimulatorRuntime due to lifetime conflicts.
+  if (getenv("USE_DEBUGGER") != nullptr) {
+    Debugger* debugger = js_new<Debugger>(decoder, stdout);
+    if (!debugger) {
+      MOZ_ReportAssertionFailure("[unhandlable oom] Decoder", __FILE__, __LINE__);
+      MOZ_CRASH();
+    }
+    return debugger;
+  }
+
+  Simulator* sim = js_new<Simulator>();
+  if (!sim) {
+    MOZ_CRASH("NEED SIMULATOR");
+    return nullptr;
+  }
+  sim->init(decoder, stdout);
+
+  return sim;
+} 
+
+
+void Simulator::Destroy(Simulator* sim) {
+  js_delete(sim);
+}
+
+
+void Simulator::ExecuteInstruction() {
+  // The program counter should always be aligned.
+  VIXL_ASSERT(IsWordAligned(pc_));
+  decoder_->Decode(pc_);
+  const Instruction* rpc = resume_pc_;
+  increment_pc();
+
+  if (MOZ_UNLIKELY(rpc)) {
+    JSRuntime::innermostAsmJSActivation()->setResumePC((void*)pc());
+    set_pc(rpc);
+    // Just calling set_pc turns the pc_modified_ flag on, which means it doesn't
+    // auto-step after executing the next instruction.  Force that to off so it
+    // will auto-step after executing the first instruction of the handler.
+    pc_modified_ = false;
+    resume_pc_ = nullptr;
+  }
+}
+
+
+uintptr_t Simulator::stackLimit() const {
+  return reinterpret_cast<uintptr_t>(stack_limit_);
+}
+
+
+uintptr_t* Simulator::addressOfStackLimit() {
+  return (uintptr_t*)&stack_limit_;
+}
+
+
+bool Simulator::overRecursed(uintptr_t newsp) const {
+  if (newsp)
+    newsp = xreg(31, Reg31IsStackPointer);
+  return newsp <= stackLimit();
+}
+
+
+bool Simulator::overRecursedWithExtra(uint32_t extra) const {
+  uintptr_t newsp = xreg(31, Reg31IsStackPointer) - extra;
+  return newsp <= stackLimit();
+}
+
+
+void Simulator::set_resume_pc(const Instruction* new_resume_pc) {
+  resume_pc_ = AddressUntag(new_resume_pc);
+}
+
+
+int64_t Simulator::call(uint8_t* entry, int argument_count, ...) {
+  va_list parameters;
+  va_start(parameters, argument_count);
+
+  // First eight arguments passed in registers.
+  VIXL_ASSERT(argument_count <= 8);
+  // This code should use the type of the called function
+  // (with templates, like the callVM machinery), but since the
+  // number of called functions is miniscule, their types have been
+  // divined from the number of arguments.
+  if (argument_count == 8) {
+      // EnterJitData::jitcode.
+      set_xreg(0, va_arg(parameters, int64_t));
+      // EnterJitData::maxArgc.
+      set_xreg(1, va_arg(parameters, unsigned));
+      // EnterJitData::maxArgv.
+      set_xreg(2, va_arg(parameters, int64_t));
+      // EnterJitData::osrFrame.
+      set_xreg(3, va_arg(parameters, int64_t));
+      // EnterJitData::calleeToken.
+      set_xreg(4, va_arg(parameters, int64_t));
+      // EnterJitData::scopeChain.
+      set_xreg(5, va_arg(parameters, int64_t));
+      // EnterJitData::osrNumStackValues.
+      set_xreg(6, va_arg(parameters, unsigned));
+      // Address of EnterJitData::result.
+      set_xreg(7, va_arg(parameters, int64_t));
+  } else if (argument_count == 2) {
+      // EntryArg* args
+      set_xreg(0, va_arg(parameters, int64_t));
+      // uint8_t* GlobalData
+      set_xreg(1, va_arg(parameters, int64_t));
+  } else if (argument_count == 1) { // irregexp
+      // InputOutputData& data
+      set_xreg(0, va_arg(parameters, int64_t));
+  } else {
+      MOZ_CRASH("Unknown number of arguments");
+  }
+
+  va_end(parameters);
+
+  // Call must transition back to native code on exit.
+  VIXL_ASSERT(xreg(30) == int64_t(kEndOfSimAddress));
+
+  // Execute the simulation.
+  DebugOnly<int64_t> entryStack = xreg(31, Reg31IsStackPointer);
+  RunFrom((Instruction*)entry);
+  DebugOnly<int64_t> exitStack = xreg(31, Reg31IsStackPointer);
+  VIXL_ASSERT(entryStack == exitStack);
+
+  int64_t result = xreg(0);
+  if (getenv("USE_DEBUGGER"))
+      printf("LEAVE\n");
+  return result;
+}
+
+
+// Protects the icache and redirection properties of the simulator.
+class AutoLockSimulatorCache
+{
+  friend class Simulator;
+
+ public:
+  explicit AutoLockSimulatorCache(Simulator* sim) : sim_(sim) {
+    PR_Lock(sim_->lock_);
+    VIXL_ASSERT(!sim_->lockOwner_);
+#ifdef DEBUG
+    sim_->lockOwner_ = PR_GetCurrentThread();
+#endif
+  }
+
+  ~AutoLockSimulatorCache() {
+#ifdef DEBUG
+    VIXL_ASSERT(sim_->lockOwner_ == PR_GetCurrentThread());
+    sim_->lockOwner_ = nullptr;
+#endif
+    PR_Unlock(sim_->lock_);
+  }
+
+ private:
+   Simulator* const sim_;
+};
+
+
+// When the generated code calls a VM function (masm.callWithABI) we need to
+// call that function instead of trying to execute it with the simulator
+// (because it's x64 code instead of AArch64 code). We do that by redirecting the VM
+// call to a svc (Supervisor Call) instruction that is handled by the
+// simulator. We write the original destination of the jump just at a known
+// offset from the svc instruction so the simulator knows what to call.
+class Redirection
+{
+  friend class Simulator;
+
+  Redirection(void* nativeFunction, ABIFunctionType type, Simulator* sim)
+    : nativeFunction_(nativeFunction),
+    type_(type),
+    next_(nullptr)
+  {
+    next_ = sim->redirection();
+    // TODO: Flush ICache?
+    sim->setRedirection(this);
+
+    Instruction* instr = (Instruction*)(&svcInstruction_);
+    vixl::Assembler::svc(instr, kCallRtRedirected);
+  }
+
+ public:
+  void* addressOfSvcInstruction() { return &svcInstruction_; }
+  void* nativeFunction() const { return nativeFunction_; }
+  ABIFunctionType type() const { return type_; }
+
+  static Redirection* Get(void* nativeFunction, ABIFunctionType type) {
+    Simulator* sim = Simulator::Current();
+    AutoLockSimulatorCache alsr(sim);
+
+    // TODO: Store srt_ in the simulator for this assertion.
+    // VIXL_ASSERT_IF(pt->simulator(), pt->simulator()->srt_ == srt);
+
+    Redirection* current = sim->redirection();
+    for (; current != nullptr; current = current->next_) {
+      if (current->nativeFunction_ == nativeFunction) {
+        VIXL_ASSERT(current->type() == type);
+        return current;
+      }
+    }
+
+    Redirection* redir = (Redirection*)js_malloc(sizeof(Redirection));
+    if (!redir) {
+      MOZ_ReportAssertionFailure("[unhandlable oom] Simulator redirection", __FILE__, __LINE__);
+      MOZ_CRASH();
+    }
+    new(redir) Redirection(nativeFunction, type, sim);
+    return redir;
+  }
+
+  static const Redirection* FromSvcInstruction(const Instruction* svcInstruction) {
+    const uint8_t* addrOfSvc = reinterpret_cast<const uint8_t*>(svcInstruction);
+    const uint8_t* addrOfRedirection = addrOfSvc - offsetof(Redirection, svcInstruction_);
+    return reinterpret_cast<const Redirection*>(addrOfRedirection);
+  }
+
+ private:
+  void* nativeFunction_;
+  uint32_t svcInstruction_;
+  ABIFunctionType type_;
+  Redirection* next_;
+};
+
+
+void Simulator::setRedirection(Redirection* redirection) {
+  // VIXL_ASSERT(lockOwner_); TODO
+  redirection_ = redirection;
+}
+
+
+Redirection* Simulator::redirection() const {
+  return redirection_;
+}
+
+
+void* Simulator::RedirectNativeFunction(void* nativeFunction, ABIFunctionType type) {
+  Redirection* redirection = Redirection::Get(nativeFunction, type);
+  return redirection->addressOfSvcInstruction();
+}
+
+
+void Simulator::VisitException(const Instruction* instr) {
+  switch (instr->Mask(ExceptionMask)) {
+    case BRK: {
+      int lowbit  = ImmException_offset;
+      int highbit = ImmException_offset + ImmException_width - 1;
+      HostBreakpoint(instr->Bits(highbit, lowbit));
+      break;
+    }
+    case HLT:
+      switch (instr->ImmException()) {
+        case kUnreachableOpcode:
+          DoUnreachable(instr);
+          return;
+        case kTraceOpcode:
+          DoTrace(instr);
+          return;
+        case kLogOpcode:
+          DoLog(instr);
+          return;
+        case kPrintfOpcode:
+          DoPrintf(instr);
+          return;
+        default:
+          HostBreakpoint();
+          return;
+      }
+    case SVC:
+      // The SVC instruction is hijacked by the JIT as a pseudo-instruction
+      // causing the Simulator to execute host-native code for callWithABI.
+      switch (instr->ImmException()) {
+        case kCallRtRedirected:
+          VisitCallRedirection(instr);
+          return;
+        case kMarkStackPointer:
+          spStack_.append(xreg(31, Reg31IsStackPointer));
+          return;
+        case kCheckStackPointer: {
+          int64_t current = xreg(31, Reg31IsStackPointer);
+          int64_t expected = spStack_.popCopy();
+          VIXL_ASSERT(current == expected);
+          return;
+        }
+        default:
+          VIXL_UNIMPLEMENTED();
+      }
+      break;
+    default:
+      VIXL_UNIMPLEMENTED();
+  }
+}
+
+
+void Simulator::setGPR32Result(int32_t result) {
+    set_wreg(0, result);
+}
+
+
+void Simulator::setGPR64Result(int64_t result) {
+    set_xreg(0, result);
+}
+
+
+void Simulator::setFP32Result(float result) {
+    set_sreg(0, result);
+}
+
+
+void Simulator::setFP64Result(double result) {
+    set_dreg(0, result);
+}
+
+
+typedef int64_t (*Prototype_General0)();
+typedef int64_t (*Prototype_General1)(int64_t arg0);
+typedef int64_t (*Prototype_General2)(int64_t arg0, int64_t arg1);
+typedef int64_t (*Prototype_General3)(int64_t arg0, int64_t arg1, int64_t arg2);
+typedef int64_t (*Prototype_General4)(int64_t arg0, int64_t arg1, int64_t arg2, int64_t arg3);
+typedef int64_t (*Prototype_General5)(int64_t arg0, int64_t arg1, int64_t arg2, int64_t arg3,
+                                      int64_t arg4);
+typedef int64_t (*Prototype_General6)(int64_t arg0, int64_t arg1, int64_t arg2, int64_t arg3,
+                                      int64_t arg4, int64_t arg5);
+typedef int64_t (*Prototype_General7)(int64_t arg0, int64_t arg1, int64_t arg2, int64_t arg3,
+                                      int64_t arg4, int64_t arg5, int64_t arg6);
+typedef int64_t (*Prototype_General8)(int64_t arg0, int64_t arg1, int64_t arg2, int64_t arg3,
+                                      int64_t arg4, int64_t arg5, int64_t arg6, int64_t arg7);
+
+typedef int64_t (*Prototype_Int_Double)(double arg0);
+typedef int64_t (*Prototype_Int_IntDouble)(int32_t arg0, double arg1);
+
+typedef float (*Prototype_Float32_Float32)(float arg0);
+
+typedef double (*Prototype_Double_None)();
+typedef double (*Prototype_Double_Double)(double arg0);
+typedef double (*Prototype_Double_Int)(int32_t arg0);
+typedef double (*Prototype_Double_DoubleInt)(double arg0, int64_t arg1);
+typedef double (*Prototype_Double_IntDouble)(int64_t arg0, double arg1);
+typedef double (*Prototype_Double_DoubleDouble)(double arg0, double arg1);
+typedef double (*Prototype_Double_DoubleDoubleDouble)(double arg0, double arg1, double arg2);
+typedef double (*Prototype_Double_DoubleDoubleDoubleDouble)(double arg0, double arg1,
+                                                            double arg2, double arg3);
+
+
+// Simulator support for callWithABI().
+void
+Simulator::VisitCallRedirection(const Instruction* instr)
+{
+  VIXL_ASSERT(instr->Mask(ExceptionMask) == SVC);
+  VIXL_ASSERT(instr->ImmException() == kCallRtRedirected);
+
+  const Redirection* redir = Redirection::FromSvcInstruction(instr);
+  uintptr_t nativeFn = reinterpret_cast<uintptr_t>(redir->nativeFunction());
+
+  // Stack must be aligned prior to the call.
+  // FIXME: It's actually our job to perform the alignment...
+  //VIXL_ASSERT((xreg(31, Reg31IsStackPointer) & (StackAlignment - 1)) == 0);
+
+  // Used to assert that callee-saved registers are preserved.
+  DebugOnly<int64_t> x19 = xreg(19);
+  DebugOnly<int64_t> x20 = xreg(20);
+  DebugOnly<int64_t> x21 = xreg(21);
+  DebugOnly<int64_t> x22 = xreg(22);
+  DebugOnly<int64_t> x23 = xreg(23);
+  DebugOnly<int64_t> x24 = xreg(24);
+  DebugOnly<int64_t> x25 = xreg(25);
+  DebugOnly<int64_t> x26 = xreg(26);
+  DebugOnly<int64_t> x27 = xreg(27);
+  DebugOnly<int64_t> x28 = xreg(28);
+  DebugOnly<int64_t> x29 = xreg(29);
+  DebugOnly<int64_t> savedSP = xreg(31, Reg31IsStackPointer);
+
+  // Remember LR for returning from the "call".
+  int64_t savedLR = xreg(30);
+
+  // Allow recursive Simulator calls: returning from the call must stop
+  // the simulation and transition back to native Simulator code.
+  set_xreg(30, int64_t(kEndOfSimAddress));
+
+  // Store argument register values in local variables for ease of use below.
+  int64_t x0 = xreg(0);
+  int64_t x1 = xreg(1);
+  int64_t x2 = xreg(2);
+  int64_t x3 = xreg(3);
+  int64_t x4 = xreg(4);
+  int64_t x5 = xreg(5);
+  int64_t x6 = xreg(6);
+  int64_t x7 = xreg(7);
+  double d0 = dreg(0);
+  double d1 = dreg(1);
+  double d2 = dreg(2);
+  double d3 = dreg(3);
+  float s0 = sreg(0);
+
+  // Dispatch the call and set the return value.
+  switch (redir->type()) {
+    // Cases with int64_t return type.
+    case js::jit::Args_General0: {
+      int64_t ret = reinterpret_cast<Prototype_General0>(nativeFn)();
+      setGPR64Result(ret);
+      break;
+    }
+    case js::jit::Args_General1: {
+      int64_t ret = reinterpret_cast<Prototype_General1>(nativeFn)(x0);
+      setGPR64Result(ret);
+      break;
+    }
+    case js::jit::Args_General2: {
+      int64_t ret = reinterpret_cast<Prototype_General2>(nativeFn)(x0, x1);
+      setGPR64Result(ret);
+      break;
+    }
+    case js::jit::Args_General3: {
+      int64_t ret = reinterpret_cast<Prototype_General3>(nativeFn)(x0, x1, x2);
+      setGPR64Result(ret);
+      break;
+    }
+    case js::jit::Args_General4: {
+      int64_t ret = reinterpret_cast<Prototype_General4>(nativeFn)(x0, x1, x2, x3);
+      setGPR64Result(ret);
+      break;
+    }
+    case js::jit::Args_General5: {
+      int64_t ret = reinterpret_cast<Prototype_General5>(nativeFn)(x0, x1, x2, x3, x4);
+      setGPR64Result(ret);
+      break;
+    }
+    case js::jit::Args_General6: {
+      int64_t ret = reinterpret_cast<Prototype_General6>(nativeFn)(x0, x1, x2, x3, x4, x5);
+      setGPR64Result(ret);
+      break;
+    }
+    case js::jit::Args_General7: {
+      int64_t ret = reinterpret_cast<Prototype_General7>(nativeFn)(x0, x1, x2, x3, x4, x5, x6);
+      setGPR64Result(ret);
+      break;
+    }
+    case js::jit::Args_General8: {
+      int64_t ret = reinterpret_cast<Prototype_General8>(nativeFn)(x0, x1, x2, x3, x4, x5, x6, x7);
+      setGPR64Result(ret);
+      break;
+    }
+
+    // Cases with GPR return type. This can be int32 or int64, but int64 is a safer assumption.
+    case js::jit::Args_Int_Double: {
+      int64_t ret = reinterpret_cast<Prototype_Int_Double>(nativeFn)(d0);
+      setGPR64Result(ret);
+      break;
+    }
+    case js::jit::Args_Int_IntDouble: {
+      int64_t ret = reinterpret_cast<Prototype_Int_IntDouble>(nativeFn)(x0, d0);
+      setGPR64Result(ret);
+      break;
+    }
+
+    // Cases with float return type.
+    case js::jit::Args_Float32_Float32: {
+      float ret = reinterpret_cast<Prototype_Float32_Float32>(nativeFn)(s0);
+      setFP32Result(ret);
+      break;
+    }
+
+    // Cases with double return type.
+    case js::jit::Args_Double_None: {
+      double ret = reinterpret_cast<Prototype_Double_None>(nativeFn)();
+      setFP64Result(ret);
+      break;
+    }
+    case js::jit::Args_Double_Double: {
+      double ret = reinterpret_cast<Prototype_Double_Double>(nativeFn)(d0);
+      setFP64Result(ret);
+      break;
+    }
+    case js::jit::Args_Double_Int: {
+      double ret = reinterpret_cast<Prototype_Double_Int>(nativeFn)(x0);
+      setFP64Result(ret);
+      break;
+    }
+    case js::jit::Args_Double_DoubleInt: {
+      double ret = reinterpret_cast<Prototype_Double_DoubleInt>(nativeFn)(d0, x0);
+      setFP64Result(ret);
+      break;
+    }
+    case js::jit::Args_Double_DoubleDouble: {
+      double ret = reinterpret_cast<Prototype_Double_DoubleDouble>(nativeFn)(d0, d1);
+      setFP64Result(ret);
+      break;
+    }
+    case js::jit::Args_Double_DoubleDoubleDouble: {
+      double ret = reinterpret_cast<Prototype_Double_DoubleDoubleDouble>(nativeFn)(d0, d1, d2);
+      setFP64Result(ret);
+      break;
+    }
+    case js::jit::Args_Double_DoubleDoubleDoubleDouble: {
+      double ret = reinterpret_cast<Prototype_Double_DoubleDoubleDoubleDouble>(nativeFn)(d0, d1, d2, d3);
+      setFP64Result(ret);
+      break;
+    }
+
+    case js::jit::Args_Double_IntDouble: {
+      double ret = reinterpret_cast<Prototype_Double_IntDouble>(nativeFn)(x0, d0);
+      setFP64Result(ret);
+      break;
+    }
+
+    default:
+      MOZ_CRASH("Unknown function type.");
+  }
+
+  // TODO: Nuke the volatile registers.
+
+  // Assert that callee-saved registers are unchanged.
+  VIXL_ASSERT(xreg(19) == x19);
+  VIXL_ASSERT(xreg(20) == x20);
+  VIXL_ASSERT(xreg(21) == x21);
+  VIXL_ASSERT(xreg(22) == x22);
+  VIXL_ASSERT(xreg(23) == x23);
+  VIXL_ASSERT(xreg(24) == x24);
+  VIXL_ASSERT(xreg(25) == x25);
+  VIXL_ASSERT(xreg(26) == x26);
+  VIXL_ASSERT(xreg(27) == x27);
+  VIXL_ASSERT(xreg(28) == x28);
+  VIXL_ASSERT(xreg(29) == x29);
+
+  // Assert that the stack is unchanged.
+  VIXL_ASSERT(savedSP == xreg(31, Reg31IsStackPointer));
+
+  // Simulate a return.
+  set_lr(savedLR);
+  set_pc((Instruction*)savedLR);
+  if (getenv("USE_DEBUGGER"))
+    printf("SVCRET\n");
+}
+
+
+}  // namespace vixl
+
+
+vixl::Simulator* js::PerThreadData::simulator() const {
+  return runtime_->simulator();
+}
+
+
+vixl::Simulator* JSRuntime::simulator() const {
+  return simulator_;
+}
+
+
+uintptr_t* JSRuntime::addressOfSimulatorStackLimit() {
+  return simulator_->addressOfStackLimit();
+}
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Platform-vixl.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Platform-vixl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Platform-vixl.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Platform-vixl.h	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,42 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#ifndef VIXL_PLATFORM_H
+#define VIXL_PLATFORM_H
+
+// Define platform specific functionalities.
+// TODO: Remove used of signal.h.
+#include <signal.h>
+
+#include "js-config.h"
+
+namespace vixl {
+
+inline void HostBreakpoint(int64_t code = 0) { raise(SIGINT); }
+
+} // namespace vixl
+
+#endif // VIXL_PLATFORM_H
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Simulator-vixl.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Simulator-vixl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Simulator-vixl.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Simulator-vixl.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,2870 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#include "js-config.h"
+
+#ifdef JS_ARM64_SIMULATOR
+
+#include "jit/arm64/vixl/Simulator-vixl.h"
+
+#include <math.h>
+#include <string.h>
+
+namespace vixl {
+
+const Instruction* Simulator::kEndOfSimAddress = NULL;
+
+void SimSystemRegister::SetBits(int msb, int lsb, uint32_t bits) {
+  int width = msb - lsb + 1;
+  VIXL_ASSERT(is_uintn(width, bits) || is_intn(width, bits));
+
+  bits <<= lsb;
+  uint32_t mask = ((1 << width) - 1) << lsb;
+  VIXL_ASSERT((mask & write_ignore_mask_) == 0);
+
+  value_ = (value_ & ~mask) | (bits & mask);
+}
+
+
+SimSystemRegister SimSystemRegister::DefaultValueFor(SystemRegister id) {
+  switch (id) {
+    case NZCV:
+      return SimSystemRegister(0x00000000, NZCVWriteIgnoreMask);
+    case FPCR:
+      return SimSystemRegister(0x00000000, FPCRWriteIgnoreMask);
+    default:
+      VIXL_UNREACHABLE();
+      return SimSystemRegister();
+  }
+}
+
+
+Simulator::~Simulator() {
+  delete [] stack_;
+  // The decoder may outlive the simulator.
+  decoder_->RemoveVisitor(print_disasm_);
+  delete print_disasm_;
+
+  decoder_->RemoveVisitor(instrumentation_);
+  delete instrumentation_;
+}
+
+
+void Simulator::Run() {
+  pc_modified_ = false;
+  while (pc_ != kEndOfSimAddress) {
+    ExecuteInstruction();
+  }
+}
+
+
+void Simulator::RunFrom(const Instruction* first) {
+  set_pc(first);
+  Run();
+}
+
+
+const char* Simulator::xreg_names[] = {
+"x0",  "x1",  "x2",  "x3",  "x4",  "x5",  "x6",  "x7",
+"x8",  "x9",  "x10", "x11", "x12", "x13", "x14", "x15",
+"x16", "x17", "x18", "x19", "x20", "x21", "x22", "x23",
+"x24", "x25", "x26", "x27", "x28", "x29", "lr",  "xzr", "sp"};
+
+
+const char* Simulator::wreg_names[] = {
+"w0",  "w1",  "w2",  "w3",  "w4",  "w5",  "w6",  "w7",
+"w8",  "w9",  "w10", "w11", "w12", "w13", "w14", "w15",
+"w16", "w17", "w18", "w19", "w20", "w21", "w22", "w23",
+"w24", "w25", "w26", "w27", "w28", "w29", "w30", "wzr", "wsp"};
+
+const char* Simulator::sreg_names[] = {
+"s0",  "s1",  "s2",  "s3",  "s4",  "s5",  "s6",  "s7",
+"s8",  "s9",  "s10", "s11", "s12", "s13", "s14", "s15",
+"s16", "s17", "s18", "s19", "s20", "s21", "s22", "s23",
+"s24", "s25", "s26", "s27", "s28", "s29", "s30", "s31"};
+
+const char* Simulator::dreg_names[] = {
+"d0",  "d1",  "d2",  "d3",  "d4",  "d5",  "d6",  "d7",
+"d8",  "d9",  "d10", "d11", "d12", "d13", "d14", "d15",
+"d16", "d17", "d18", "d19", "d20", "d21", "d22", "d23",
+"d24", "d25", "d26", "d27", "d28", "d29", "d30", "d31"};
+
+const char* Simulator::vreg_names[] = {
+"v0",  "v1",  "v2",  "v3",  "v4",  "v5",  "v6",  "v7",
+"v8",  "v9",  "v10", "v11", "v12", "v13", "v14", "v15",
+"v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23",
+"v24", "v25", "v26", "v27", "v28", "v29", "v30", "v31"};
+
+
+
+const char* Simulator::WRegNameForCode(unsigned code, Reg31Mode mode) {
+  VIXL_ASSERT(code < kNumberOfRegisters);
+  // If the code represents the stack pointer, index the name after zr.
+  if ((code == kZeroRegCode) && (mode == Reg31IsStackPointer)) {
+    code = kZeroRegCode + 1;
+  }
+  return wreg_names[code];
+}
+
+
+const char* Simulator::XRegNameForCode(unsigned code, Reg31Mode mode) {
+  VIXL_ASSERT(code < kNumberOfRegisters);
+  // If the code represents the stack pointer, index the name after zr.
+  if ((code == kZeroRegCode) && (mode == Reg31IsStackPointer)) {
+    code = kZeroRegCode + 1;
+  }
+  return xreg_names[code];
+}
+
+
+const char* Simulator::SRegNameForCode(unsigned code) {
+  VIXL_ASSERT(code < kNumberOfFPRegisters);
+  return sreg_names[code];
+}
+
+
+const char* Simulator::DRegNameForCode(unsigned code) {
+  VIXL_ASSERT(code < kNumberOfFPRegisters);
+  return dreg_names[code];
+}
+
+
+const char* Simulator::VRegNameForCode(unsigned code) {
+  VIXL_ASSERT(code < kNumberOfFPRegisters);
+  return vreg_names[code];
+}
+
+
+#define COLOUR(colour_code)       "\033[0;" colour_code "m"
+#define COLOUR_BOLD(colour_code)  "\033[1;" colour_code "m"
+#define NORMAL  ""
+#define GREY    "30"
+#define RED     "31"
+#define GREEN   "32"
+#define YELLOW  "33"
+#define BLUE    "34"
+#define MAGENTA "35"
+#define CYAN    "36"
+#define WHITE   "37"
+void Simulator::set_coloured_trace(bool value) {
+  coloured_trace_ = value;
+
+  clr_normal          = value ? COLOUR(NORMAL)        : "";
+  clr_flag_name       = value ? COLOUR_BOLD(WHITE)    : "";
+  clr_flag_value      = value ? COLOUR(NORMAL)        : "";
+  clr_reg_name        = value ? COLOUR_BOLD(CYAN)     : "";
+  clr_reg_value       = value ? COLOUR(CYAN)          : "";
+  clr_fpreg_name      = value ? COLOUR_BOLD(MAGENTA)  : "";
+  clr_fpreg_value     = value ? COLOUR(MAGENTA)       : "";
+  clr_memory_address  = value ? COLOUR_BOLD(BLUE)     : "";
+  clr_warning         = value ? COLOUR_BOLD(YELLOW)   : "";
+  clr_warning_message = value ? COLOUR(YELLOW)        : "";
+  clr_printf          = value ? COLOUR(GREEN)         : "";
+}
+#undef COLOUR
+#undef COLOUR_BOLD
+#undef NORMAL
+#undef GREY
+#undef RED
+#undef GREEN
+#undef YELLOW
+#undef BLUE
+#undef MAGENTA
+#undef CYAN
+#undef WHITE
+
+
+void Simulator::set_trace_parameters(int parameters) {
+  bool disasm_before = trace_parameters_ & LOG_DISASM;
+  trace_parameters_ = parameters;
+  bool disasm_after = trace_parameters_ & LOG_DISASM;
+
+  if (disasm_before != disasm_after) {
+    if (disasm_after) {
+      decoder_->InsertVisitorBefore(print_disasm_, this);
+    } else {
+      decoder_->RemoveVisitor(print_disasm_);
+    }
+  }
+}
+
+
+void Simulator::set_instruction_stats(bool value) {
+  if (value != instruction_stats_) {
+    if (value) {
+      decoder_->AppendVisitor(instrumentation_);
+    } else {
+      decoder_->RemoveVisitor(instrumentation_);
+    }
+    instruction_stats_ = value;
+  }
+}
+
+// Helpers ---------------------------------------------------------------------
+int64_t Simulator::AddWithCarry(unsigned reg_size,
+                                bool set_flags,
+                                int64_t src1,
+                                int64_t src2,
+                                int64_t carry_in) {
+  VIXL_ASSERT((carry_in == 0) || (carry_in == 1));
+  VIXL_ASSERT((reg_size == kXRegSize) || (reg_size == kWRegSize));
+
+  uint64_t u1, u2;
+  int64_t result;
+  int64_t signed_sum = src1 + src2 + carry_in;
+
+  uint32_t N, Z, C, V;
+
+  if (reg_size == kWRegSize) {
+    u1 = static_cast<uint64_t>(src1) & kWRegMask;
+    u2 = static_cast<uint64_t>(src2) & kWRegMask;
+
+    result = signed_sum & kWRegMask;
+    // Compute the C flag by comparing the sum to the max unsigned integer.
+    C = ((kWMaxUInt - u1) < (u2 + carry_in)) ||
+        ((kWMaxUInt - u1 - carry_in) < u2);
+    // Overflow iff the sign bit is the same for the two inputs and different
+    // for the result.
+    int64_t s_src1 = src1 << (kXRegSize - kWRegSize);
+    int64_t s_src2 = src2 << (kXRegSize - kWRegSize);
+    int64_t s_result = result << (kXRegSize - kWRegSize);
+    V = ((s_src1 ^ s_src2) >= 0) && ((s_src1 ^ s_result) < 0);
+
+  } else {
+    u1 = static_cast<uint64_t>(src1);
+    u2 = static_cast<uint64_t>(src2);
+
+    result = signed_sum;
+    // Compute the C flag by comparing the sum to the max unsigned integer.
+    C = ((kXMaxUInt - u1) < (u2 + carry_in)) ||
+        ((kXMaxUInt - u1 - carry_in) < u2);
+    // Overflow iff the sign bit is the same for the two inputs and different
+    // for the result.
+    V = ((src1 ^ src2) >= 0) && ((src1 ^ result) < 0);
+  }
+
+  N = CalcNFlag(result, reg_size);
+  Z = CalcZFlag(result);
+
+  if (set_flags) {
+    nzcv().SetN(N);
+    nzcv().SetZ(Z);
+    nzcv().SetC(C);
+    nzcv().SetV(V);
+    LogSystemRegister(NZCV);
+  }
+  return result;
+}
+
+
+int64_t Simulator::ShiftOperand(unsigned reg_size,
+                                int64_t value,
+                                Shift shift_type,
+                                unsigned amount) {
+  if (amount == 0) {
+    return value;
+  }
+  int64_t mask = reg_size == kXRegSize ? kXRegMask : kWRegMask;
+  switch (shift_type) {
+    case LSL:
+      return (value << amount) & mask;
+    case LSR:
+      return static_cast<uint64_t>(value) >> amount;
+    case ASR: {
+      // Shift used to restore the sign.
+      unsigned s_shift = kXRegSize - reg_size;
+      // Value with its sign restored.
+      int64_t s_value = (value << s_shift) >> s_shift;
+      return (s_value >> amount) & mask;
+    }
+    case ROR: {
+      if (reg_size == kWRegSize) {
+        value &= kWRegMask;
+      }
+      return (static_cast<uint64_t>(value) >> amount) |
+             ((value & ((INT64_C(1) << amount) - 1)) <<
+              (reg_size - amount));
+    }
+    default:
+      VIXL_UNIMPLEMENTED();
+      return 0;
+  }
+}
+
+
+int64_t Simulator::ExtendValue(unsigned reg_size,
+                               int64_t value,
+                               Extend extend_type,
+                               unsigned left_shift) {
+  switch (extend_type) {
+    case UXTB:
+      value &= kByteMask;
+      break;
+    case UXTH:
+      value &= kHalfWordMask;
+      break;
+    case UXTW:
+      value &= kWordMask;
+      break;
+    case SXTB:
+      value = (value << 56) >> 56;
+      break;
+    case SXTH:
+      value = (value << 48) >> 48;
+      break;
+    case SXTW:
+      value = (value << 32) >> 32;
+      break;
+    case UXTX:
+    case SXTX:
+      break;
+    default:
+      VIXL_UNREACHABLE();
+  }
+  int64_t mask = (reg_size == kXRegSize) ? kXRegMask : kWRegMask;
+  return (value << left_shift) & mask;
+}
+
+
+template<> double Simulator::FPDefaultNaN<double>() const {
+  return kFP64DefaultNaN;
+}
+
+
+template<> float Simulator::FPDefaultNaN<float>() const {
+  return kFP32DefaultNaN;
+}
+
+
+void Simulator::FPCompare(double val0, double val1) {
+  AssertSupportedFPCR();
+
+  // TODO: This assumes that the C++ implementation handles comparisons in the
+  // way that we expect (as per AssertSupportedFPCR()).
+  if ((isnan(val0) != 0) || (isnan(val1) != 0)) {
+    nzcv().SetRawValue(FPUnorderedFlag);
+  } else if (val0 < val1) {
+    nzcv().SetRawValue(FPLessThanFlag);
+  } else if (val0 > val1) {
+    nzcv().SetRawValue(FPGreaterThanFlag);
+  } else if (val0 == val1) {
+    nzcv().SetRawValue(FPEqualFlag);
+  } else {
+    VIXL_UNREACHABLE();
+  }
+  LogSystemRegister(NZCV);
+}
+
+
+void Simulator::PrintSystemRegisters() {
+  PrintSystemRegister(NZCV);
+  PrintSystemRegister(FPCR);
+}
+
+
+void Simulator::PrintRegisters() {
+  for (unsigned i = 0; i < kNumberOfRegisters; i++) {
+    PrintRegister(i);
+  }
+}
+
+
+void Simulator::PrintFPRegisters() {
+  for (unsigned i = 0; i < kNumberOfFPRegisters; i++) {
+    PrintFPRegister(i);
+  }
+}
+
+
+void Simulator::PrintRegister(unsigned code, Reg31Mode r31mode) {
+  // Don't print writes into xzr.
+  if ((code == kZeroRegCode) && (r31mode == Reg31IsZeroRegister)) {
+    return;
+  }
+
+  // The template is "# x<code>:value".
+  fprintf(stream_, "# %s%5s: %s0x%016" PRIx64 "%s\n",
+          clr_reg_name, XRegNameForCode(code, r31mode),
+          clr_reg_value, reg<uint64_t>(code, r31mode), clr_normal);
+}
+
+
+void Simulator::PrintFPRegister(unsigned code, PrintFPRegisterSizes sizes) {
+  // The template is "# v<code>:bits (d<code>:value, ...)".
+
+  VIXL_ASSERT(sizes != 0);
+  VIXL_ASSERT((sizes & kPrintAllFPRegValues) == sizes);
+
+  // Print the raw bits.
+  fprintf(stream_, "# %s%5s: %s0x%016" PRIx64 "%s (",
+          clr_fpreg_name, VRegNameForCode(code),
+          clr_fpreg_value, fpreg<uint64_t>(code), clr_normal);
+
+  // Print all requested value interpretations.
+  bool need_separator = false;
+  if (sizes & kPrintDRegValue) {
+    fprintf(stream_, "%s%s%s: %s%g%s",
+            need_separator ? ", " : "",
+            clr_fpreg_name, DRegNameForCode(code),
+            clr_fpreg_value, fpreg<double>(code), clr_normal);
+    need_separator = true;
+  }
+
+  if (sizes & kPrintSRegValue) {
+    fprintf(stream_, "%s%s%s: %s%g%s",
+            need_separator ? ", " : "",
+            clr_fpreg_name, SRegNameForCode(code),
+            clr_fpreg_value, fpreg<float>(code), clr_normal);
+    need_separator = true;
+  }
+
+  // End the value list.
+  fprintf(stream_, ")\n");
+}
+
+
+void Simulator::PrintSystemRegister(SystemRegister id) {
+  switch (id) {
+    case NZCV:
+      fprintf(stream_, "# %sNZCV: %sN:%d Z:%d C:%d V:%d%s\n",
+              clr_flag_name, clr_flag_value,
+              nzcv().N(), nzcv().Z(), nzcv().C(), nzcv().V(),
+              clr_normal);
+      break;
+    case FPCR: {
+      static const char * rmode[] = {
+        "0b00 (Round to Nearest)",
+        "0b01 (Round towards Plus Infinity)",
+        "0b10 (Round towards Minus Infinity)",
+        "0b11 (Round towards Zero)"
+      };
+      VIXL_ASSERT(fpcr().RMode() < (sizeof(rmode) / sizeof(rmode[0])));
+      fprintf(stream_,
+              "# %sFPCR: %sAHP:%d DN:%d FZ:%d RMode:%s%s\n",
+              clr_flag_name, clr_flag_value,
+              fpcr().AHP(), fpcr().DN(), fpcr().FZ(), rmode[fpcr().RMode()],
+              clr_normal);
+      break;
+    }
+    default:
+      VIXL_UNREACHABLE();
+  }
+}
+
+
+void Simulator::PrintRead(uintptr_t address,
+                          size_t size,
+                          unsigned reg_code) {
+  USE(size);  // Size is unused here.
+
+  // The template is "# x<code>:value <- address".
+  fprintf(stream_, "# %s%5s: %s0x%016" PRIx64 "%s",
+          clr_reg_name, XRegNameForCode(reg_code),
+          clr_reg_value, reg<uint64_t>(reg_code), clr_normal);
+
+  fprintf(stream_, " <- %s0x%016" PRIxPTR "%s\n",
+          clr_memory_address, address, clr_normal);
+}
+
+
+void Simulator::PrintReadFP(uintptr_t address,
+                            size_t size,
+                            unsigned reg_code) {
+  // The template is "# reg:bits (reg:value) <- address".
+  switch (size) {
+    case kSRegSizeInBytes:
+      VIXL_STATIC_ASSERT(kSRegSizeInBytes == 4);
+      fprintf(stream_, "# %s%5s: %s0x%016" PRIx64 "%s (%s%s: %s%gf%s)",
+              clr_fpreg_name, VRegNameForCode(reg_code),
+              clr_fpreg_value, fpreg<uint64_t>(reg_code), clr_normal,
+              clr_fpreg_name, SRegNameForCode(reg_code),
+              clr_fpreg_value, fpreg<float>(reg_code), clr_normal);
+      break;
+    case kDRegSizeInBytes:
+      VIXL_STATIC_ASSERT(kDRegSizeInBytes == 8);
+      fprintf(stream_, "# %s%5s: %s0x%016" PRIx64 "%s (%s%s: %s%g%s)",
+              clr_fpreg_name, VRegNameForCode(reg_code),
+              clr_fpreg_value, fpreg<uint64_t>(reg_code), clr_normal,
+              clr_fpreg_name, DRegNameForCode(reg_code),
+              clr_fpreg_value, fpreg<double>(reg_code), clr_normal);
+      break;
+    default:
+      VIXL_UNREACHABLE();
+  }
+
+  fprintf(stream_, " <- %s0x%016" PRIxPTR "%s\n",
+          clr_memory_address, address, clr_normal);
+}
+
+
+void Simulator::PrintWrite(uintptr_t address,
+                           size_t size,
+                           unsigned reg_code) {
+  // The template is "# reg:value -> address". To keep the trace tidy and
+  // readable, the value is aligned with the values in the register trace.
+  switch (size) {
+    case 1:
+      fprintf(stream_, "# %s%5s<7:0>:          %s0x%02" PRIx8 "%s",
+              clr_reg_name, WRegNameForCode(reg_code),
+              clr_reg_value, reg<uint8_t>(reg_code), clr_normal);
+      break;
+    case 2:
+      fprintf(stream_, "# %s%5s<15:0>:       %s0x%04" PRIx16 "%s",
+              clr_reg_name, WRegNameForCode(reg_code),
+              clr_reg_value, reg<uint16_t>(reg_code), clr_normal);
+      break;
+    case kWRegSizeInBytes:
+      VIXL_STATIC_ASSERT(kWRegSizeInBytes == 4);
+      fprintf(stream_, "# %s%5s:         %s0x%08" PRIx32 "%s",
+              clr_reg_name, WRegNameForCode(reg_code),
+              clr_reg_value, reg<uint32_t>(reg_code), clr_normal);
+      break;
+    case kXRegSizeInBytes:
+      VIXL_STATIC_ASSERT(kXRegSizeInBytes == 8);
+      fprintf(stream_, "# %s%5s: %s0x%016" PRIx64 "%s",
+              clr_reg_name, XRegNameForCode(reg_code),
+              clr_reg_value, reg<uint64_t>(reg_code), clr_normal);
+      break;
+    default:
+      VIXL_UNREACHABLE();
+  }
+
+  fprintf(stream_, " -> %s0x%016" PRIxPTR "%s\n",
+          clr_memory_address, address, clr_normal);
+}
+
+
+void Simulator::PrintWriteFP(uintptr_t address,
+                             size_t size,
+                             unsigned reg_code) {
+  // The template is "# reg:bits (reg:value) -> address". To keep the trace tidy
+  // and readable, the value is aligned with the values in the register trace.
+  switch (size) {
+    case kSRegSizeInBytes:
+      VIXL_STATIC_ASSERT(kSRegSize == 32);
+      fprintf(stream_, "# %s%5s<31:0>:   %s0x%08" PRIx32 "%s (%s%s: %s%gf%s)",
+              clr_fpreg_name, VRegNameForCode(reg_code),
+              clr_fpreg_value, fpreg<uint32_t>(reg_code), clr_normal,
+              clr_fpreg_name, SRegNameForCode(reg_code),
+              clr_fpreg_value, fpreg<float>(reg_code), clr_normal);
+      break;
+    case kDRegSizeInBytes:
+      VIXL_STATIC_ASSERT(kDRegSize == 64);
+      fprintf(stream_, "# %s%5s: %s0x%016" PRIx64 "%s (%s%s: %s%g%s)",
+              clr_fpreg_name, VRegNameForCode(reg_code),
+              clr_fpreg_value, fpreg<uint64_t>(reg_code), clr_normal,
+              clr_fpreg_name, DRegNameForCode(reg_code),
+              clr_fpreg_value, fpreg<double>(reg_code), clr_normal);
+      break;
+    default:
+      VIXL_UNREACHABLE();
+  }
+
+  fprintf(stream_, " -> %s0x%016" PRIxPTR "%s\n",
+          clr_memory_address, address, clr_normal);
+}
+
+
+// Visitors---------------------------------------------------------------------
+
+void Simulator::VisitUnimplemented(const Instruction* instr) {
+  printf("Unimplemented instruction at %p: 0x%08" PRIx32 "\n",
+         reinterpret_cast<const void*>(instr), instr->InstructionBits());
+  VIXL_UNIMPLEMENTED();
+}
+
+
+void Simulator::VisitUnallocated(const Instruction* instr) {
+  printf("Unallocated instruction at %p: 0x%08" PRIx32 "\n",
+         reinterpret_cast<const void*>(instr), instr->InstructionBits());
+  VIXL_UNIMPLEMENTED();
+}
+
+
+void Simulator::VisitPCRelAddressing(const Instruction* instr) {
+  VIXL_ASSERT((instr->Mask(PCRelAddressingMask) == ADR) ||
+              (instr->Mask(PCRelAddressingMask) == ADRP));
+
+  set_reg(instr->Rd(), instr->ImmPCOffsetTarget());
+}
+
+
+void Simulator::VisitUnconditionalBranch(const Instruction* instr) {
+  switch (instr->Mask(UnconditionalBranchMask)) {
+    case BL:
+      set_lr(instr->NextInstruction());
+      // Fall through.
+    case B:
+      set_pc(instr->ImmPCOffsetTarget());
+      break;
+    default: VIXL_UNREACHABLE();
+  }
+}
+
+
+void Simulator::VisitConditionalBranch(const Instruction* instr) {
+  VIXL_ASSERT(instr->Mask(ConditionalBranchMask) == B_cond);
+  if (ConditionPassed(instr->ConditionBranch())) {
+    set_pc(instr->ImmPCOffsetTarget());
+  }
+}
+
+
+void Simulator::VisitUnconditionalBranchToRegister(const Instruction* instr) {
+  const Instruction* target = Instruction::Cast(xreg(instr->Rn()));
+
+  switch (instr->Mask(UnconditionalBranchToRegisterMask)) {
+    case BLR:
+      set_lr(instr->NextInstruction());
+      // Fall through.
+    case BR:
+    case RET: set_pc(target); break;
+    default: VIXL_UNREACHABLE();
+  }
+}
+
+
+void Simulator::VisitTestBranch(const Instruction* instr) {
+  unsigned bit_pos = (instr->ImmTestBranchBit5() << 5) |
+                     instr->ImmTestBranchBit40();
+  bool bit_zero = ((xreg(instr->Rt()) >> bit_pos) & 1) == 0;
+  bool take_branch = false;
+  switch (instr->Mask(TestBranchMask)) {
+    case TBZ: take_branch = bit_zero; break;
+    case TBNZ: take_branch = !bit_zero; break;
+    default: VIXL_UNIMPLEMENTED();
+  }
+  if (take_branch) {
+    set_pc(instr->ImmPCOffsetTarget());
+  }
+}
+
+
+void Simulator::VisitCompareBranch(const Instruction* instr) {
+  unsigned rt = instr->Rt();
+  bool take_branch = false;
+  switch (instr->Mask(CompareBranchMask)) {
+    case CBZ_w: take_branch = (wreg(rt) == 0); break;
+    case CBZ_x: take_branch = (xreg(rt) == 0); break;
+    case CBNZ_w: take_branch = (wreg(rt) != 0); break;
+    case CBNZ_x: take_branch = (xreg(rt) != 0); break;
+    default: VIXL_UNIMPLEMENTED();
+  }
+  if (take_branch) {
+    set_pc(instr->ImmPCOffsetTarget());
+  }
+}
+
+
+void Simulator::AddSubHelper(const Instruction* instr, int64_t op2) {
+  unsigned reg_size = instr->SixtyFourBits() ? kXRegSize : kWRegSize;
+  bool set_flags = instr->FlagsUpdate();
+  int64_t new_val = 0;
+  Instr operation = instr->Mask(AddSubOpMask);
+
+  switch (operation) {
+    case ADD:
+    case ADDS: {
+      new_val = AddWithCarry(reg_size,
+                             set_flags,
+                             reg(reg_size, instr->Rn(), instr->RnMode()),
+                             op2);
+      break;
+    }
+    case SUB:
+    case SUBS: {
+      new_val = AddWithCarry(reg_size,
+                             set_flags,
+                             reg(reg_size, instr->Rn(), instr->RnMode()),
+                             ~op2,
+                             1);
+      break;
+    }
+    default: VIXL_UNREACHABLE();
+  }
+
+  set_reg(reg_size, instr->Rd(), new_val, LogRegWrites, instr->RdMode());
+}
+
+
+void Simulator::VisitAddSubShifted(const Instruction* instr) {
+  unsigned reg_size = instr->SixtyFourBits() ? kXRegSize : kWRegSize;
+  int64_t op2 = ShiftOperand(reg_size,
+                             reg(reg_size, instr->Rm()),
+                             static_cast<Shift>(instr->ShiftDP()),
+                             instr->ImmDPShift());
+  AddSubHelper(instr, op2);
+}
+
+
+void Simulator::VisitAddSubImmediate(const Instruction* instr) {
+  int64_t op2 = instr->ImmAddSub() << ((instr->ShiftAddSub() == 1) ? 12 : 0);
+  AddSubHelper(instr, op2);
+}
+
+
+void Simulator::VisitAddSubExtended(const Instruction* instr) {
+  unsigned reg_size = instr->SixtyFourBits() ? kXRegSize : kWRegSize;
+  int64_t op2 = ExtendValue(reg_size,
+                            reg(reg_size, instr->Rm()),
+                            static_cast<Extend>(instr->ExtendMode()),
+                            instr->ImmExtendShift());
+  AddSubHelper(instr, op2);
+}
+
+
+void Simulator::VisitAddSubWithCarry(const Instruction* instr) {
+  unsigned reg_size = instr->SixtyFourBits() ? kXRegSize : kWRegSize;
+  int64_t op2 = reg(reg_size, instr->Rm());
+  int64_t new_val;
+
+  if ((instr->Mask(AddSubOpMask) == SUB) || instr->Mask(AddSubOpMask) == SUBS) {
+    op2 = ~op2;
+  }
+
+  new_val = AddWithCarry(reg_size,
+                         instr->FlagsUpdate(),
+                         reg(reg_size, instr->Rn()),
+                         op2,
+                         C());
+
+  set_reg(reg_size, instr->Rd(), new_val);
+}
+
+
+void Simulator::VisitLogicalShifted(const Instruction* instr) {
+  unsigned reg_size = instr->SixtyFourBits() ? kXRegSize : kWRegSize;
+  Shift shift_type = static_cast<Shift>(instr->ShiftDP());
+  unsigned shift_amount = instr->ImmDPShift();
+  int64_t op2 = ShiftOperand(reg_size, reg(reg_size, instr->Rm()), shift_type,
+                             shift_amount);
+  if (instr->Mask(NOT) == NOT) {
+    op2 = ~op2;
+  }
+  LogicalHelper(instr, op2);
+}
+
+
+void Simulator::VisitLogicalImmediate(const Instruction* instr) {
+  LogicalHelper(instr, instr->ImmLogical());
+}
+
+
+void Simulator::LogicalHelper(const Instruction* instr, int64_t op2) {
+  unsigned reg_size = instr->SixtyFourBits() ? kXRegSize : kWRegSize;
+  int64_t op1 = reg(reg_size, instr->Rn());
+  int64_t result = 0;
+  bool update_flags = false;
+
+  // Switch on the logical operation, stripping out the NOT bit, as it has a
+  // different meaning for logical immediate instructions.
+  switch (instr->Mask(LogicalOpMask & ~NOT)) {
+    case ANDS: update_flags = true;  // Fall through.
+    case AND: result = op1 & op2; break;
+    case ORR: result = op1 | op2; break;
+    case EOR: result = op1 ^ op2; break;
+    default:
+      VIXL_UNIMPLEMENTED();
+  }
+
+  if (update_flags) {
+    nzcv().SetN(CalcNFlag(result, reg_size));
+    nzcv().SetZ(CalcZFlag(result));
+    nzcv().SetC(0);
+    nzcv().SetV(0);
+    LogSystemRegister(NZCV);
+  }
+
+  set_reg(reg_size, instr->Rd(), result, LogRegWrites, instr->RdMode());
+}
+
+
+void Simulator::VisitConditionalCompareRegister(const Instruction* instr) {
+  unsigned reg_size = instr->SixtyFourBits() ? kXRegSize : kWRegSize;
+  ConditionalCompareHelper(instr, reg(reg_size, instr->Rm()));
+}
+
+
+void Simulator::VisitConditionalCompareImmediate(const Instruction* instr) {
+  ConditionalCompareHelper(instr, instr->ImmCondCmp());
+}
+
+
+void Simulator::ConditionalCompareHelper(const Instruction* instr,
+                                         int64_t op2) {
+  unsigned reg_size = instr->SixtyFourBits() ? kXRegSize : kWRegSize;
+  int64_t op1 = reg(reg_size, instr->Rn());
+
+  if (ConditionPassed(instr->Condition())) {
+    // If the condition passes, set the status flags to the result of comparing
+    // the operands.
+    if (instr->Mask(ConditionalCompareMask) == CCMP) {
+      AddWithCarry(reg_size, true, op1, ~op2, 1);
+    } else {
+      VIXL_ASSERT(instr->Mask(ConditionalCompareMask) == CCMN);
+      AddWithCarry(reg_size, true, op1, op2, 0);
+    }
+  } else {
+    // If the condition fails, set the status flags to the nzcv immediate.
+    nzcv().SetFlags(instr->Nzcv());
+    LogSystemRegister(NZCV);
+  }
+}
+
+
+void Simulator::VisitLoadStoreUnsignedOffset(const Instruction* instr) {
+  int offset = instr->ImmLSUnsigned() << instr->SizeLS();
+  LoadStoreHelper(instr, offset, Offset);
+}
+
+
+void Simulator::VisitLoadStoreUnscaledOffset(const Instruction* instr) {
+  LoadStoreHelper(instr, instr->ImmLS(), Offset);
+}
+
+
+void Simulator::VisitLoadStorePreIndex(const Instruction* instr) {
+  LoadStoreHelper(instr, instr->ImmLS(), PreIndex);
+}
+
+
+void Simulator::VisitLoadStorePostIndex(const Instruction* instr) {
+  LoadStoreHelper(instr, instr->ImmLS(), PostIndex);
+}
+
+
+void Simulator::VisitLoadStoreRegisterOffset(const Instruction* instr) {
+  Extend ext = static_cast<Extend>(instr->ExtendMode());
+  VIXL_ASSERT((ext == UXTW) || (ext == UXTX) || (ext == SXTW) || (ext == SXTX));
+  unsigned shift_amount = instr->ImmShiftLS() * instr->SizeLS();
+
+  int64_t offset = ExtendValue(kXRegSize, xreg(instr->Rm()), ext,
+                               shift_amount);
+  LoadStoreHelper(instr, offset, Offset);
+}
+
+
+void Simulator::LoadStoreHelper(const Instruction* instr,
+                                int64_t offset,
+                                AddrMode addrmode) {
+  unsigned srcdst = instr->Rt();
+  uintptr_t address = AddressModeHelper(instr->Rn(), offset, addrmode);
+
+  LoadStoreOp op = static_cast<LoadStoreOp>(instr->Mask(LoadStoreOpMask));
+  switch (op) {
+    // Use NoRegLog to suppress the register trace (LOG_REGS, LOG_FP_REGS). We
+    // will print a more detailed log.
+    case LDRB_w:
+      set_wreg(srcdst, MemoryRead<uint8_t>(address), NoRegLog);
+      break;
+    case LDRH_w:
+      set_wreg(srcdst, MemoryRead<uint16_t>(address), NoRegLog);
+      break;
+    case LDR_w:
+      set_wreg(srcdst, MemoryRead<uint32_t>(address), NoRegLog);
+      break;
+    case LDR_x:
+      set_xreg(srcdst, MemoryRead<uint64_t>(address), NoRegLog);
+      break;
+    case LDRSB_w:
+      set_wreg(srcdst, MemoryRead<int8_t>(address), NoRegLog);
+      break;
+    case LDRSH_w:
+      set_wreg(srcdst, MemoryRead<int16_t>(address), NoRegLog);
+      break;
+    case LDRSB_x:
+      set_xreg(srcdst, MemoryRead<int8_t>(address), NoRegLog);
+      break;
+    case LDRSH_x:
+      set_xreg(srcdst, MemoryRead<int16_t>(address), NoRegLog);
+      break;
+    case LDRSW_x:
+      set_xreg(srcdst, MemoryRead<int32_t>(address), NoRegLog);
+      break;
+    case LDR_s:
+      set_sreg(srcdst, MemoryRead<float>(address), NoRegLog);
+      break;
+    case LDR_d:
+      set_dreg(srcdst, MemoryRead<double>(address), NoRegLog);
+      break;
+
+    case STRB_w:  MemoryWrite<uint8_t>(address, wreg(srcdst)); break;
+    case STRH_w:  MemoryWrite<uint16_t>(address, wreg(srcdst)); break;
+    case STR_w:   MemoryWrite<uint32_t>(address, wreg(srcdst)); break;
+    case STR_x:   MemoryWrite<uint64_t>(address, xreg(srcdst)); break;
+    case STR_s:   MemoryWrite<float>(address, sreg(srcdst)); break;
+    case STR_d:   MemoryWrite<double>(address, dreg(srcdst)); break;
+
+    // Ignore prfm hint instructions.
+    case PRFM: break;
+
+    default: VIXL_UNIMPLEMENTED();
+  }
+
+  size_t access_size = 1 << instr->SizeLS();
+  if (instr->IsLoad()) {
+    if ((op == LDR_s) || (op == LDR_d)) {
+      LogReadFP(address, access_size, srcdst);
+    } else {
+      LogRead(address, access_size, srcdst);
+    }
+  } else {
+    if ((op == STR_s) || (op == STR_d)) {
+      LogWriteFP(address, access_size, srcdst);
+    } else {
+      LogWrite(address, access_size, srcdst);
+    }
+  }
+
+  local_monitor_.MaybeClear();
+}
+
+
+void Simulator::VisitLoadStorePairOffset(const Instruction* instr) {
+  LoadStorePairHelper(instr, Offset);
+}
+
+
+void Simulator::VisitLoadStorePairPreIndex(const Instruction* instr) {
+  LoadStorePairHelper(instr, PreIndex);
+}
+
+
+void Simulator::VisitLoadStorePairPostIndex(const Instruction* instr) {
+  LoadStorePairHelper(instr, PostIndex);
+}
+
+
+void Simulator::VisitLoadStorePairNonTemporal(const Instruction* instr) {
+  LoadStorePairHelper(instr, Offset);
+}
+
+
+void Simulator::LoadStorePairHelper(const Instruction* instr,
+                                    AddrMode addrmode) {
+  unsigned rt = instr->Rt();
+  unsigned rt2 = instr->Rt2();
+  size_t access_size = 1 << instr->SizeLSPair();
+  int64_t offset = instr->ImmLSPair() * access_size;
+  uintptr_t address = AddressModeHelper(instr->Rn(), offset, addrmode);
+  uintptr_t address2 = address + access_size;
+
+  LoadStorePairOp op =
+    static_cast<LoadStorePairOp>(instr->Mask(LoadStorePairMask));
+
+  // 'rt' and 'rt2' can only be aliased for stores.
+  VIXL_ASSERT(((op & LoadStorePairLBit) == 0) || (rt != rt2));
+
+  switch (op) {
+    // Use NoRegLog to suppress the register trace (LOG_REGS, LOG_FP_REGS). We
+    // will print a more detailed log.
+    case LDP_w: {
+      VIXL_ASSERT(access_size == kWRegSizeInBytes);
+      set_wreg(rt, MemoryRead<uint32_t>(address), NoRegLog);
+      set_wreg(rt2, MemoryRead<uint32_t>(address2), NoRegLog);
+      break;
+    }
+    case LDP_s: {
+      VIXL_ASSERT(access_size == kSRegSizeInBytes);
+      set_sreg(rt, MemoryRead<float>(address), NoRegLog);
+      set_sreg(rt2, MemoryRead<float>(address2), NoRegLog);
+      break;
+    }
+    case LDP_x: {
+      VIXL_ASSERT(access_size == kXRegSizeInBytes);
+      set_xreg(rt, MemoryRead<uint64_t>(address), NoRegLog);
+      set_xreg(rt2, MemoryRead<uint64_t>(address2), NoRegLog);
+      break;
+    }
+    case LDP_d: {
+      VIXL_ASSERT(access_size == kDRegSizeInBytes);
+      set_dreg(rt, MemoryRead<double>(address), NoRegLog);
+      set_dreg(rt2, MemoryRead<double>(address2), NoRegLog);
+      break;
+    }
+    case LDPSW_x: {
+      VIXL_ASSERT(access_size == kWRegSizeInBytes);
+      set_xreg(rt, MemoryRead<int32_t>(address), NoRegLog);
+      set_xreg(rt2, MemoryRead<int32_t>(address2), NoRegLog);
+      break;
+    }
+    case STP_w: {
+      VIXL_ASSERT(access_size == kWRegSizeInBytes);
+      MemoryWrite<uint32_t>(address, wreg(rt));
+      MemoryWrite<uint32_t>(address2, wreg(rt2));
+      break;
+    }
+    case STP_s: {
+      VIXL_ASSERT(access_size == kSRegSizeInBytes);
+      MemoryWrite<float>(address, sreg(rt));
+      MemoryWrite<float>(address2, sreg(rt2));
+      break;
+    }
+    case STP_x: {
+      VIXL_ASSERT(access_size == kXRegSizeInBytes);
+      MemoryWrite<uint64_t>(address, xreg(rt));
+      MemoryWrite<uint64_t>(address2, xreg(rt2));
+      break;
+    }
+    case STP_d: {
+      VIXL_ASSERT(access_size == kDRegSizeInBytes);
+      MemoryWrite<double>(address, dreg(rt));
+      MemoryWrite<double>(address2, dreg(rt2));
+      break;
+    }
+    default: VIXL_UNREACHABLE();
+  }
+
+  // Print a detailed trace (including the memory address) instead of the basic
+  // register:value trace generated by set_*reg().
+  if (instr->IsLoad()) {
+    if ((op == LDP_s) || (op == LDP_d)) {
+      LogReadFP(address, access_size, rt);
+      LogReadFP(address2, access_size, rt2);
+    } else {
+      LogRead(address, access_size, rt);
+      LogRead(address2, access_size, rt2);
+    }
+  } else {
+    if ((op == STP_s) || (op == STP_d)) {
+      LogWriteFP(address, access_size, rt);
+      LogWriteFP(address2, access_size, rt2);
+    } else {
+      LogWrite(address, access_size, rt);
+      LogWrite(address2, access_size, rt2);
+    }
+  }
+
+  local_monitor_.MaybeClear();
+}
+
+
+void Simulator::PrintExclusiveAccessWarning() {
+  if (print_exclusive_access_warning_) {
+    fprintf(
+        stderr,
+        "%sWARNING:%s VIXL simulator support for load-/store-/clear-exclusive "
+        "instructions is limited. Refer to the README for details.%s\n",
+        clr_warning, clr_warning_message, clr_normal);
+    print_exclusive_access_warning_ = false;
+  }
+}
+
+
+void Simulator::VisitLoadStoreExclusive(const Instruction* instr) {
+  PrintExclusiveAccessWarning();
+
+  unsigned rs = instr->Rs();
+  unsigned rt = instr->Rt();
+  unsigned rt2 = instr->Rt2();
+  unsigned rn = instr->Rn();
+
+  LoadStoreExclusive op =
+      static_cast<LoadStoreExclusive>(instr->Mask(LoadStoreExclusiveMask));
+
+  bool is_acquire_release = instr->LdStXAcquireRelease();
+  bool is_exclusive = !instr->LdStXNotExclusive();
+  bool is_load = instr->LdStXLoad();
+  bool is_pair = instr->LdStXPair();
+
+  size_t element_size = 1 << instr->LdStXSizeLog2();
+  size_t access_size = is_pair ? element_size * 2 : element_size;
+  uint64_t address = reg<uint64_t>(rn, Reg31IsStackPointer);
+
+  // Verify that the address is available to the host.
+  VIXL_ASSERT(address == static_cast<uintptr_t>(address));
+
+  // Check the alignment of `address`.
+  if (AlignDown(address, access_size) != address) {
+    VIXL_ALIGNMENT_EXCEPTION();
+  }
+
+  // The sp must be aligned to 16 bytes when it is accessed.
+  if ((rn == 31) && (AlignDown(address, 16) != address)) {
+    VIXL_ALIGNMENT_EXCEPTION();
+  }
+
+  if (is_load) {
+    if (is_exclusive) {
+      local_monitor_.MarkExclusive(address, access_size);
+    } else {
+      // Any non-exclusive load can clear the local monitor as a side effect. We
+      // don't need to do this, but it is useful to stress the simulated code.
+      local_monitor_.Clear();
+    }
+
+    // Use NoRegLog to suppress the register trace (LOG_REGS, LOG_FP_REGS). We
+    // will print a more detailed log.
+    switch (op) {
+      case LDXRB_w:
+      case LDAXRB_w:
+      case LDARB_w:
+        set_wreg(rt, MemoryRead<uint8_t>(address), NoRegLog);
+        break;
+      case LDXRH_w:
+      case LDAXRH_w:
+      case LDARH_w:
+        set_wreg(rt, MemoryRead<uint16_t>(address), NoRegLog);
+        break;
+      case LDXR_w:
+      case LDAXR_w:
+      case LDAR_w:
+        set_wreg(rt, MemoryRead<uint32_t>(address), NoRegLog);
+        break;
+      case LDXR_x:
+      case LDAXR_x:
+      case LDAR_x:
+        set_xreg(rt, MemoryRead<uint64_t>(address), NoRegLog);
+        break;
+      case LDXP_w:
+      case LDAXP_w:
+        set_wreg(rt, MemoryRead<uint32_t>(address), NoRegLog);
+        set_wreg(rt2, MemoryRead<uint32_t>(address + element_size), NoRegLog);
+        break;
+      case LDXP_x:
+      case LDAXP_x:
+        set_xreg(rt, MemoryRead<uint64_t>(address), NoRegLog);
+        set_xreg(rt2, MemoryRead<uint64_t>(address + element_size), NoRegLog);
+        break;
+      default:
+        VIXL_UNREACHABLE();
+    }
+
+    if (is_acquire_release) {
+      // Approximate load-acquire by issuing a full barrier after the load.
+      __sync_synchronize();
+    }
+
+    LogRead(address, access_size, rt);
+    if (is_pair) {
+      LogRead(address + element_size, access_size, rt2);
+    }
+  } else {
+    if (is_acquire_release) {
+      // Approximate store-release by issuing a full barrier before the store.
+      __sync_synchronize();
+    }
+
+    bool do_store = true;
+    if (is_exclusive) {
+      do_store = local_monitor_.IsExclusive(address, access_size) &&
+                 global_monitor_.IsExclusive(address, access_size);
+      set_wreg(rs, do_store ? 0 : 1);
+
+      //  - All exclusive stores explicitly clear the local monitor.
+      local_monitor_.Clear();
+    } else {
+      //  - Any other store can clear the local monitor as a side effect.
+      local_monitor_.MaybeClear();
+    }
+
+    if (do_store) {
+      switch (op) {
+        case STXRB_w:
+        case STLXRB_w:
+        case STLRB_w:
+          MemoryWrite<uint8_t>(address, wreg(rt));
+          break;
+        case STXRH_w:
+        case STLXRH_w:
+        case STLRH_w:
+          MemoryWrite<uint16_t>(address, wreg(rt));
+          break;
+        case STXR_w:
+        case STLXR_w:
+        case STLR_w:
+          MemoryWrite<uint32_t>(address, wreg(rt));
+          break;
+        case STXR_x:
+        case STLXR_x:
+        case STLR_x:
+          MemoryWrite<uint64_t>(address, xreg(rt));
+          break;
+        case STXP_w:
+        case STLXP_w:
+          MemoryWrite<uint32_t>(address, wreg(rt));
+          MemoryWrite<uint32_t>(address + element_size, wreg(rt2));
+          break;
+        case STXP_x:
+        case STLXP_x:
+          MemoryWrite<uint64_t>(address, xreg(rt));
+          MemoryWrite<uint64_t>(address + element_size, xreg(rt2));
+          break;
+        default:
+          VIXL_UNREACHABLE();
+      }
+
+      LogWrite(address, element_size, rt);
+      if (is_pair) {
+        LogWrite(address + element_size, element_size, rt2);
+      }
+    }
+  }
+}
+
+
+void Simulator::VisitLoadLiteral(const Instruction* instr) {
+  unsigned rt = instr->Rt();
+  uint64_t address = instr->LiteralAddress<uint64_t>();
+
+  // Verify that the calculated address is available to the host.
+  VIXL_ASSERT(address == static_cast<uintptr_t>(address));
+
+  switch (instr->Mask(LoadLiteralMask)) {
+    // Use NoRegLog to suppress the register trace (LOG_REGS, LOG_FP_REGS), then
+    // print a more detailed log.
+    case LDR_w_lit:
+      set_wreg(rt, MemoryRead<uint32_t>(address), NoRegLog);
+      LogRead(address, kWRegSizeInBytes, rt);
+      break;
+    case LDR_x_lit:
+      set_xreg(rt, MemoryRead<uint64_t>(address), NoRegLog);
+      LogRead(address, kXRegSizeInBytes, rt);
+      break;
+    case LDR_s_lit:
+      set_sreg(rt, MemoryRead<float>(address), NoRegLog);
+      LogReadFP(address, kSRegSizeInBytes, rt);
+      break;
+    case LDR_d_lit:
+      set_dreg(rt, MemoryRead<double>(address), NoRegLog);
+      LogReadFP(address, kDRegSizeInBytes, rt);
+      break;
+    case LDRSW_x_lit:
+      set_xreg(rt, MemoryRead<int32_t>(address), NoRegLog);
+      LogRead(address, kWRegSizeInBytes, rt);
+      break;
+
+    // Ignore prfm hint instructions.
+    case PRFM_lit: break;
+
+    default: VIXL_UNREACHABLE();
+  }
+
+  local_monitor_.MaybeClear();
+}
+
+
+uintptr_t Simulator::AddressModeHelper(unsigned addr_reg,
+                                       int64_t offset,
+                                       AddrMode addrmode) {
+  uint64_t address = xreg(addr_reg, Reg31IsStackPointer);
+
+  if ((addr_reg == 31) && ((address % 16) != 0)) {
+    // When the base register is SP the stack pointer is required to be
+    // quadword aligned prior to the address calculation and write-backs.
+    // Misalignment will cause a stack alignment fault.
+    VIXL_ALIGNMENT_EXCEPTION();
+  }
+
+  if ((addrmode == PreIndex) || (addrmode == PostIndex)) {
+    VIXL_ASSERT(offset != 0);
+    set_xreg(addr_reg, address + offset, LogRegWrites, Reg31IsStackPointer);
+  }
+
+  if ((addrmode == Offset) || (addrmode == PreIndex)) {
+    address += offset;
+  }
+
+  // Verify that the calculated address is available to the host.
+  VIXL_ASSERT(address == static_cast<uintptr_t>(address));
+
+  return static_cast<uintptr_t>(address);
+}
+
+
+void Simulator::VisitMoveWideImmediate(const Instruction* instr) {
+  MoveWideImmediateOp mov_op =
+    static_cast<MoveWideImmediateOp>(instr->Mask(MoveWideImmediateMask));
+  int64_t new_xn_val = 0;
+
+  bool is_64_bits = instr->SixtyFourBits() == 1;
+  // Shift is limited for W operations.
+  VIXL_ASSERT(is_64_bits || (instr->ShiftMoveWide() < 2));
+
+  // Get the shifted immediate.
+  int64_t shift = instr->ShiftMoveWide() * 16;
+  int64_t shifted_imm16 = instr->ImmMoveWide() << shift;
+
+  // Compute the new value.
+  switch (mov_op) {
+    case MOVN_w:
+    case MOVN_x: {
+        new_xn_val = ~shifted_imm16;
+        if (!is_64_bits) new_xn_val &= kWRegMask;
+      break;
+    }
+    case MOVK_w:
+    case MOVK_x: {
+        unsigned reg_code = instr->Rd();
+        int64_t prev_xn_val = is_64_bits ? xreg(reg_code)
+                                         : wreg(reg_code);
+        new_xn_val =
+            (prev_xn_val & ~(INT64_C(0xffff) << shift)) | shifted_imm16;
+      break;
+    }
+    case MOVZ_w:
+    case MOVZ_x: {
+        new_xn_val = shifted_imm16;
+      break;
+    }
+    default:
+      VIXL_UNREACHABLE();
+  }
+
+  // Update the destination register.
+  set_xreg(instr->Rd(), new_xn_val);
+}
+
+
+void Simulator::VisitConditionalSelect(const Instruction* instr) {
+  uint64_t new_val = xreg(instr->Rn());
+
+  if (ConditionFailed(static_cast<Condition>(instr->Condition()))) {
+    new_val = xreg(instr->Rm());
+    switch (instr->Mask(ConditionalSelectMask)) {
+      case CSEL_w:
+      case CSEL_x: break;
+      case CSINC_w:
+      case CSINC_x: new_val++; break;
+      case CSINV_w:
+      case CSINV_x: new_val = ~new_val; break;
+      case CSNEG_w:
+      case CSNEG_x: new_val = -new_val; break;
+      default: VIXL_UNIMPLEMENTED();
+    }
+  }
+  unsigned reg_size = instr->SixtyFourBits() ? kXRegSize : kWRegSize;
+  set_reg(reg_size, instr->Rd(), new_val);
+}
+
+
+void Simulator::VisitDataProcessing1Source(const Instruction* instr) {
+  unsigned dst = instr->Rd();
+  unsigned src = instr->Rn();
+
+  switch (instr->Mask(DataProcessing1SourceMask)) {
+    case RBIT_w: set_wreg(dst, ReverseBits(wreg(src), kWRegSize)); break;
+    case RBIT_x: set_xreg(dst, ReverseBits(xreg(src), kXRegSize)); break;
+    case REV16_w: set_wreg(dst, ReverseBytes(wreg(src), Reverse16)); break;
+    case REV16_x: set_xreg(dst, ReverseBytes(xreg(src), Reverse16)); break;
+    case REV_w: set_wreg(dst, ReverseBytes(wreg(src), Reverse32)); break;
+    case REV32_x: set_xreg(dst, ReverseBytes(xreg(src), Reverse32)); break;
+    case REV_x: set_xreg(dst, ReverseBytes(xreg(src), Reverse64)); break;
+    case CLZ_w: set_wreg(dst, CountLeadingZeros(wreg(src), kWRegSize)); break;
+    case CLZ_x: set_xreg(dst, CountLeadingZeros(xreg(src), kXRegSize)); break;
+    case CLS_w: {
+      set_wreg(dst, CountLeadingSignBits(wreg(src), kWRegSize));
+      break;
+    }
+    case CLS_x: {
+      set_xreg(dst, CountLeadingSignBits(xreg(src), kXRegSize));
+      break;
+    }
+    default: VIXL_UNIMPLEMENTED();
+  }
+}
+
+
+uint64_t Simulator::ReverseBits(uint64_t value, unsigned num_bits) {
+  VIXL_ASSERT((num_bits == kWRegSize) || (num_bits == kXRegSize));
+  uint64_t result = 0;
+  for (unsigned i = 0; i < num_bits; i++) {
+    result = (result << 1) | (value & 1);
+    value >>= 1;
+  }
+  return result;
+}
+
+
+uint64_t Simulator::ReverseBytes(uint64_t value, ReverseByteMode mode) {
+  // Split the 64-bit value into an 8-bit array, where b[0] is the least
+  // significant byte, and b[7] is the most significant.
+  uint8_t bytes[8];
+  uint64_t mask = 0xff00000000000000;
+  for (int i = 7; i >= 0; i--) {
+    bytes[i] = (value & mask) >> (i * 8);
+    mask >>= 8;
+  }
+
+  // Permutation tables for REV instructions.
+  //  permute_table[Reverse16] is used by REV16_x, REV16_w
+  //  permute_table[Reverse32] is used by REV32_x, REV_w
+  //  permute_table[Reverse64] is used by REV_x
+  VIXL_STATIC_ASSERT((Reverse16 == 0) && (Reverse32 == 1) && (Reverse64 == 2));
+  static const uint8_t permute_table[3][8] = { {6, 7, 4, 5, 2, 3, 0, 1},
+                                               {4, 5, 6, 7, 0, 1, 2, 3},
+                                               {0, 1, 2, 3, 4, 5, 6, 7} };
+  uint64_t result = 0;
+  for (int i = 0; i < 8; i++) {
+    result <<= 8;
+    result |= bytes[permute_table[mode][i]];
+  }
+  return result;
+}
+
+
+void Simulator::VisitDataProcessing2Source(const Instruction* instr) {
+  Shift shift_op = NO_SHIFT;
+  int64_t result = 0;
+  switch (instr->Mask(DataProcessing2SourceMask)) {
+    case SDIV_w: {
+      int32_t rn = wreg(instr->Rn());
+      int32_t rm = wreg(instr->Rm());
+      if ((rn == kWMinInt) && (rm == -1)) {
+        result = kWMinInt;
+      } else if (rm == 0) {
+        // Division by zero can be trapped, but not on A-class processors.
+        result = 0;
+      } else {
+        result = rn / rm;
+      }
+      break;
+    }
+    case SDIV_x: {
+      int64_t rn = xreg(instr->Rn());
+      int64_t rm = xreg(instr->Rm());
+      if ((rn == kXMinInt) && (rm == -1)) {
+        result = kXMinInt;
+      } else if (rm == 0) {
+        // Division by zero can be trapped, but not on A-class processors.
+        result = 0;
+      } else {
+        result = rn / rm;
+      }
+      break;
+    }
+    case UDIV_w: {
+      uint32_t rn = static_cast<uint32_t>(wreg(instr->Rn()));
+      uint32_t rm = static_cast<uint32_t>(wreg(instr->Rm()));
+      if (rm == 0) {
+        // Division by zero can be trapped, but not on A-class processors.
+        result = 0;
+      } else {
+        result = rn / rm;
+      }
+      break;
+    }
+    case UDIV_x: {
+      uint64_t rn = static_cast<uint64_t>(xreg(instr->Rn()));
+      uint64_t rm = static_cast<uint64_t>(xreg(instr->Rm()));
+      if (rm == 0) {
+        // Division by zero can be trapped, but not on A-class processors.
+        result = 0;
+      } else {
+        result = rn / rm;
+      }
+      break;
+    }
+    case LSLV_w:
+    case LSLV_x: shift_op = LSL; break;
+    case LSRV_w:
+    case LSRV_x: shift_op = LSR; break;
+    case ASRV_w:
+    case ASRV_x: shift_op = ASR; break;
+    case RORV_w:
+    case RORV_x: shift_op = ROR; break;
+    default: VIXL_UNIMPLEMENTED();
+  }
+
+  unsigned reg_size = instr->SixtyFourBits() ? kXRegSize : kWRegSize;
+  if (shift_op != NO_SHIFT) {
+    // Shift distance encoded in the least-significant five/six bits of the
+    // register.
+    int mask = (instr->SixtyFourBits() == 1) ? 0x3f : 0x1f;
+    unsigned shift = wreg(instr->Rm()) & mask;
+    result = ShiftOperand(reg_size, reg(reg_size, instr->Rn()), shift_op,
+                          shift);
+  }
+  set_reg(reg_size, instr->Rd(), result);
+}
+
+
+// The algorithm used is adapted from the one described in section 8.2 of
+//   Hacker's Delight, by Henry S. Warren, Jr.
+// It assumes that a right shift on a signed integer is an arithmetic shift.
+static int64_t MultiplyHighSigned(int64_t u, int64_t v) {
+  uint64_t u0, v0, w0;
+  int64_t u1, v1, w1, w2, t;
+
+  u0 = u & 0xffffffff;
+  u1 = u >> 32;
+  v0 = v & 0xffffffff;
+  v1 = v >> 32;
+
+  w0 = u0 * v0;
+  t = u1 * v0 + (w0 >> 32);
+  w1 = t & 0xffffffff;
+  w2 = t >> 32;
+  w1 = u0 * v1 + w1;
+
+  return u1 * v1 + w2 + (w1 >> 32);
+}
+
+
+void Simulator::VisitDataProcessing3Source(const Instruction* instr) {
+  unsigned reg_size = instr->SixtyFourBits() ? kXRegSize : kWRegSize;
+
+  int64_t result = 0;
+  // Extract and sign- or zero-extend 32-bit arguments for widening operations.
+  uint64_t rn_u32 = reg<uint32_t>(instr->Rn());
+  uint64_t rm_u32 = reg<uint32_t>(instr->Rm());
+  int64_t rn_s32 = reg<int32_t>(instr->Rn());
+  int64_t rm_s32 = reg<int32_t>(instr->Rm());
+  switch (instr->Mask(DataProcessing3SourceMask)) {
+    case MADD_w:
+    case MADD_x:
+      result = xreg(instr->Ra()) + (xreg(instr->Rn()) * xreg(instr->Rm()));
+      break;
+    case MSUB_w:
+    case MSUB_x:
+      result = xreg(instr->Ra()) - (xreg(instr->Rn()) * xreg(instr->Rm()));
+      break;
+    case SMADDL_x: result = xreg(instr->Ra()) + (rn_s32 * rm_s32); break;
+    case SMSUBL_x: result = xreg(instr->Ra()) - (rn_s32 * rm_s32); break;
+    case UMADDL_x: result = xreg(instr->Ra()) + (rn_u32 * rm_u32); break;
+    case UMSUBL_x: result = xreg(instr->Ra()) - (rn_u32 * rm_u32); break;
+    case SMULH_x:
+      result = MultiplyHighSigned(xreg(instr->Rn()), xreg(instr->Rm()));
+      break;
+    default: VIXL_UNIMPLEMENTED();
+  }
+  set_reg(reg_size, instr->Rd(), result);
+}
+
+
+void Simulator::VisitBitfield(const Instruction* instr) {
+  unsigned reg_size = instr->SixtyFourBits() ? kXRegSize : kWRegSize;
+  int64_t reg_mask = instr->SixtyFourBits() ? kXRegMask : kWRegMask;
+  int64_t R = instr->ImmR();
+  int64_t S = instr->ImmS();
+  int64_t diff = S - R;
+  int64_t mask;
+  if (diff >= 0) {
+    mask = (diff < (reg_size - 1)) ? (INT64_C(1) << (diff + 1)) - 1
+                                   : reg_mask;
+  } else {
+    mask = (INT64_C(1) << (S + 1)) - 1;
+    mask = (static_cast<uint64_t>(mask) >> R) | (mask << (reg_size - R));
+    diff += reg_size;
+  }
+
+  // inzero indicates if the extracted bitfield is inserted into the
+  // destination register value or in zero.
+  // If extend is true, extend the sign of the extracted bitfield.
+  bool inzero = false;
+  bool extend = false;
+  switch (instr->Mask(BitfieldMask)) {
+    case BFM_x:
+    case BFM_w:
+      break;
+    case SBFM_x:
+    case SBFM_w:
+      inzero = true;
+      extend = true;
+      break;
+    case UBFM_x:
+    case UBFM_w:
+      inzero = true;
+      break;
+    default:
+      VIXL_UNIMPLEMENTED();
+  }
+
+  int64_t dst = inzero ? 0 : reg(reg_size, instr->Rd());
+  int64_t src = reg(reg_size, instr->Rn());
+  // Rotate source bitfield into place.
+  int64_t result = (static_cast<uint64_t>(src) >> R) | (src << (reg_size - R));
+  // Determine the sign extension.
+  int64_t topbits = ((INT64_C(1) << (reg_size - diff - 1)) - 1) << (diff + 1);
+  int64_t signbits = extend && ((src >> S) & 1) ? topbits : 0;
+
+  // Merge sign extension, dest/zero and bitfield.
+  result = signbits | (result & mask) | (dst & ~mask);
+
+  set_reg(reg_size, instr->Rd(), result);
+}
+
+
+void Simulator::VisitExtract(const Instruction* instr) {
+  unsigned lsb = instr->ImmS();
+  unsigned reg_size = (instr->SixtyFourBits() == 1) ? kXRegSize
+                                                    : kWRegSize;
+  uint64_t low_res = static_cast<uint64_t>(reg(reg_size, instr->Rm())) >> lsb;
+  uint64_t high_res =
+      (lsb == 0) ? 0 : reg(reg_size, instr->Rn()) << (reg_size - lsb);
+  set_reg(reg_size, instr->Rd(), low_res | high_res);
+}
+
+
+void Simulator::VisitFPImmediate(const Instruction* instr) {
+  AssertSupportedFPCR();
+
+  unsigned dest = instr->Rd();
+  switch (instr->Mask(FPImmediateMask)) {
+    case FMOV_s_imm: set_sreg(dest, instr->ImmFP32()); break;
+    case FMOV_d_imm: set_dreg(dest, instr->ImmFP64()); break;
+    default: VIXL_UNREACHABLE();
+  }
+}
+
+
+void Simulator::VisitFPIntegerConvert(const Instruction* instr) {
+  AssertSupportedFPCR();
+
+  unsigned dst = instr->Rd();
+  unsigned src = instr->Rn();
+
+  FPRounding round = RMode();
+
+  switch (instr->Mask(FPIntegerConvertMask)) {
+    case FCVTAS_ws: set_wreg(dst, FPToInt32(sreg(src), FPTieAway)); break;
+    case FCVTAS_xs: set_xreg(dst, FPToInt64(sreg(src), FPTieAway)); break;
+    case FCVTAS_wd: set_wreg(dst, FPToInt32(dreg(src), FPTieAway)); break;
+    case FCVTAS_xd: set_xreg(dst, FPToInt64(dreg(src), FPTieAway)); break;
+    case FCVTAU_ws: set_wreg(dst, FPToUInt32(sreg(src), FPTieAway)); break;
+    case FCVTAU_xs: set_xreg(dst, FPToUInt64(sreg(src), FPTieAway)); break;
+    case FCVTAU_wd: set_wreg(dst, FPToUInt32(dreg(src), FPTieAway)); break;
+    case FCVTAU_xd: set_xreg(dst, FPToUInt64(dreg(src), FPTieAway)); break;
+    case FCVTMS_ws:
+      set_wreg(dst, FPToInt32(sreg(src), FPNegativeInfinity));
+      break;
+    case FCVTMS_xs:
+      set_xreg(dst, FPToInt64(sreg(src), FPNegativeInfinity));
+      break;
+    case FCVTMS_wd:
+      set_wreg(dst, FPToInt32(dreg(src), FPNegativeInfinity));
+      break;
+    case FCVTMS_xd:
+      set_xreg(dst, FPToInt64(dreg(src), FPNegativeInfinity));
+      break;
+    case FCVTMU_ws:
+      set_wreg(dst, FPToUInt32(sreg(src), FPNegativeInfinity));
+      break;
+    case FCVTMU_xs:
+      set_xreg(dst, FPToUInt64(sreg(src), FPNegativeInfinity));
+      break;
+    case FCVTMU_wd:
+      set_wreg(dst, FPToUInt32(dreg(src), FPNegativeInfinity));
+      break;
+    case FCVTMU_xd:
+      set_xreg(dst, FPToUInt64(dreg(src), FPNegativeInfinity));
+      break;
+    case FCVTNS_ws: set_wreg(dst, FPToInt32(sreg(src), FPTieEven)); break;
+    case FCVTNS_xs: set_xreg(dst, FPToInt64(sreg(src), FPTieEven)); break;
+    case FCVTNS_wd: set_wreg(dst, FPToInt32(dreg(src), FPTieEven)); break;
+    case FCVTNS_xd: set_xreg(dst, FPToInt64(dreg(src), FPTieEven)); break;
+    case FCVTNU_ws: set_wreg(dst, FPToUInt32(sreg(src), FPTieEven)); break;
+    case FCVTNU_xs: set_xreg(dst, FPToUInt64(sreg(src), FPTieEven)); break;
+    case FCVTNU_wd: set_wreg(dst, FPToUInt32(dreg(src), FPTieEven)); break;
+    case FCVTNU_xd: set_xreg(dst, FPToUInt64(dreg(src), FPTieEven)); break;
+    case FCVTZS_ws: set_wreg(dst, FPToInt32(sreg(src), FPZero)); break;
+    case FCVTZS_xs: set_xreg(dst, FPToInt64(sreg(src), FPZero)); break;
+    case FCVTZS_wd: set_wreg(dst, FPToInt32(dreg(src), FPZero)); break;
+    case FCVTZS_xd: set_xreg(dst, FPToInt64(dreg(src), FPZero)); break;
+    case FCVTZU_ws: set_wreg(dst, FPToUInt32(sreg(src), FPZero)); break;
+    case FCVTZU_xs: set_xreg(dst, FPToUInt64(sreg(src), FPZero)); break;
+    case FCVTZU_wd: set_wreg(dst, FPToUInt32(dreg(src), FPZero)); break;
+    case FCVTZU_xd: set_xreg(dst, FPToUInt64(dreg(src), FPZero)); break;
+    case FMOV_ws: set_wreg(dst, sreg_bits(src)); break;
+    case FMOV_xd: set_xreg(dst, dreg_bits(src)); break;
+    case FMOV_sw: set_sreg_bits(dst, wreg(src)); break;
+    case FMOV_dx: set_dreg_bits(dst, xreg(src)); break;
+
+    // A 32-bit input can be handled in the same way as a 64-bit input, since
+    // the sign- or zero-extension will not affect the conversion.
+    case SCVTF_dx: set_dreg(dst, FixedToDouble(xreg(src), 0, round)); break;
+    case SCVTF_dw: set_dreg(dst, FixedToDouble(wreg(src), 0, round)); break;
+    case UCVTF_dx: set_dreg(dst, UFixedToDouble(xreg(src), 0, round)); break;
+    case UCVTF_dw: {
+      set_dreg(dst, UFixedToDouble(static_cast<uint32_t>(wreg(src)), 0, round));
+      break;
+    }
+    case SCVTF_sx: set_sreg(dst, FixedToFloat(xreg(src), 0, round)); break;
+    case SCVTF_sw: set_sreg(dst, FixedToFloat(wreg(src), 0, round)); break;
+    case UCVTF_sx: set_sreg(dst, UFixedToFloat(xreg(src), 0, round)); break;
+    case UCVTF_sw: {
+      set_sreg(dst, UFixedToFloat(static_cast<uint32_t>(wreg(src)), 0, round));
+      break;
+    }
+
+    default: VIXL_UNREACHABLE();
+  }
+}
+
+
+void Simulator::VisitFPFixedPointConvert(const Instruction* instr) {
+  AssertSupportedFPCR();
+
+  unsigned dst = instr->Rd();
+  unsigned src = instr->Rn();
+  int fbits = 64 - instr->FPScale();
+
+  FPRounding round = RMode();
+
+  switch (instr->Mask(FPFixedPointConvertMask)) {
+    // A 32-bit input can be handled in the same way as a 64-bit input, since
+    // the sign- or zero-extension will not affect the conversion.
+    case SCVTF_dx_fixed:
+      set_dreg(dst, FixedToDouble(xreg(src), fbits, round));
+      break;
+    case SCVTF_dw_fixed:
+      set_dreg(dst, FixedToDouble(wreg(src), fbits, round));
+      break;
+    case UCVTF_dx_fixed:
+      set_dreg(dst, UFixedToDouble(xreg(src), fbits, round));
+      break;
+    case UCVTF_dw_fixed: {
+      set_dreg(dst,
+               UFixedToDouble(static_cast<uint32_t>(wreg(src)), fbits, round));
+      break;
+    }
+    case SCVTF_sx_fixed:
+      set_sreg(dst, FixedToFloat(xreg(src), fbits, round));
+      break;
+    case SCVTF_sw_fixed:
+      set_sreg(dst, FixedToFloat(wreg(src), fbits, round));
+      break;
+    case UCVTF_sx_fixed:
+      set_sreg(dst, UFixedToFloat(xreg(src), fbits, round));
+      break;
+    case UCVTF_sw_fixed: {
+      set_sreg(dst,
+               UFixedToFloat(static_cast<uint32_t>(wreg(src)), fbits, round));
+      break;
+    }
+    default: VIXL_UNREACHABLE();
+  }
+}
+
+
+int32_t Simulator::FPToInt32(double value, FPRounding rmode) {
+  value = FPRoundInt(value, rmode);
+  if (value >= kWMaxInt) {
+    return kWMaxInt;
+  } else if (value < kWMinInt) {
+    return kWMinInt;
+  }
+  return isnan(value) ? 0 : static_cast<int32_t>(value);
+}
+
+
+int64_t Simulator::FPToInt64(double value, FPRounding rmode) {
+  value = FPRoundInt(value, rmode);
+  if (value >= kXMaxInt) {
+    return kXMaxInt;
+  } else if (value < kXMinInt) {
+    return kXMinInt;
+  }
+  return isnan(value) ? 0 : static_cast<int64_t>(value);
+}
+
+
+uint32_t Simulator::FPToUInt32(double value, FPRounding rmode) {
+  value = FPRoundInt(value, rmode);
+  if (value >= kWMaxUInt) {
+    return kWMaxUInt;
+  } else if (value < 0.0) {
+    return 0;
+  }
+  return isnan(value) ? 0 : static_cast<uint32_t>(value);
+}
+
+
+uint64_t Simulator::FPToUInt64(double value, FPRounding rmode) {
+  value = FPRoundInt(value, rmode);
+  if (value >= kXMaxUInt) {
+    return kXMaxUInt;
+  } else if (value < 0.0) {
+    return 0;
+  }
+  return isnan(value) ? 0 : static_cast<uint64_t>(value);
+}
+
+
+void Simulator::VisitFPCompare(const Instruction* instr) {
+  AssertSupportedFPCR();
+
+  switch (instr->Mask(FPCompareMask)) {
+    case FCMP_s: FPCompare(sreg(instr->Rn()), sreg(instr->Rm())); break;
+    case FCMP_d: FPCompare(dreg(instr->Rn()), dreg(instr->Rm())); break;
+    case FCMP_s_zero: FPCompare(sreg(instr->Rn()), 0.0f); break;
+    case FCMP_d_zero: FPCompare(dreg(instr->Rn()), 0.0); break;
+    default: VIXL_UNIMPLEMENTED();
+  }
+}
+
+
+void Simulator::VisitFPConditionalCompare(const Instruction* instr) {
+  AssertSupportedFPCR();
+
+  switch (instr->Mask(FPConditionalCompareMask)) {
+    case FCCMP_s:
+      if (ConditionPassed(instr->Condition())) {
+        FPCompare(sreg(instr->Rn()), sreg(instr->Rm()));
+      } else {
+        nzcv().SetFlags(instr->Nzcv());
+        LogSystemRegister(NZCV);
+      }
+      break;
+    case FCCMP_d:
+      if (ConditionPassed(instr->Condition())) {
+        FPCompare(dreg(instr->Rn()), dreg(instr->Rm()));
+      } else {
+        nzcv().SetFlags(instr->Nzcv());
+        LogSystemRegister(NZCV);
+      }
+      break;
+    default: VIXL_UNIMPLEMENTED();
+  }
+}
+
+
+void Simulator::VisitFPConditionalSelect(const Instruction* instr) {
+  AssertSupportedFPCR();
+
+  Instr selected;
+  if (ConditionPassed(instr->Condition())) {
+    selected = instr->Rn();
+  } else {
+    selected = instr->Rm();
+  }
+
+  switch (instr->Mask(FPConditionalSelectMask)) {
+    case FCSEL_s: set_sreg(instr->Rd(), sreg(selected)); break;
+    case FCSEL_d: set_dreg(instr->Rd(), dreg(selected)); break;
+    default: VIXL_UNIMPLEMENTED();
+  }
+}
+
+
+void Simulator::VisitFPDataProcessing1Source(const Instruction* instr) {
+  AssertSupportedFPCR();
+  const FPRounding fpcr_rounding = static_cast<FPRounding>(fpcr().RMode());
+
+  unsigned fd = instr->Rd();
+  unsigned fn = instr->Rn();
+
+  switch (instr->Mask(FPDataProcessing1SourceMask)) {
+    case FMOV_s: set_sreg(fd, sreg(fn)); break;
+    case FMOV_d: set_dreg(fd, dreg(fn)); break;
+    case FABS_s: set_sreg(fd, fabsf(sreg(fn))); break;
+    case FABS_d: set_dreg(fd, fabs(dreg(fn))); break;
+    case FNEG_s: set_sreg(fd, -sreg(fn)); break;
+    case FNEG_d: set_dreg(fd, -dreg(fn)); break;
+    case FSQRT_s: set_sreg(fd, FPSqrt(sreg(fn))); break;
+    case FSQRT_d: set_dreg(fd, FPSqrt(dreg(fn))); break;
+    case FRINTA_s: set_sreg(fd, FPRoundInt(sreg(fn), FPTieAway)); break;
+    case FRINTA_d: set_dreg(fd, FPRoundInt(dreg(fn), FPTieAway)); break;
+    case FRINTI_s: set_sreg(fd, FPRoundInt(sreg(fn), fpcr_rounding)); break;
+    case FRINTI_d: set_dreg(fd, FPRoundInt(dreg(fn), fpcr_rounding)); break;
+    case FRINTM_s:
+        set_sreg(fd, FPRoundInt(sreg(fn), FPNegativeInfinity)); break;
+    case FRINTM_d:
+        set_dreg(fd, FPRoundInt(dreg(fn), FPNegativeInfinity)); break;
+    case FRINTN_s: set_sreg(fd, FPRoundInt(sreg(fn), FPTieEven)); break;
+    case FRINTN_d: set_dreg(fd, FPRoundInt(dreg(fn), FPTieEven)); break;
+    case FRINTP_s:
+        set_sreg(fd, FPRoundInt(sreg(fn), FPPositiveInfinity)); break;
+    case FRINTP_d:
+        set_dreg(fd, FPRoundInt(dreg(fn), FPPositiveInfinity)); break;
+    case FRINTX_s: {
+      float input = sreg(fn);
+      float rounded = FPRoundInt(input, fpcr_rounding);
+      set_sreg(fd, rounded);
+      if (!isnan(input) && (input != rounded)) FPProcessException();
+      break;
+    }
+    case FRINTX_d: {
+      double input = dreg(fn);
+      double rounded = FPRoundInt(input, fpcr_rounding);
+      set_dreg(fd, rounded);
+      if (!isnan(input) && (input != rounded)) FPProcessException();
+      break;
+    }
+    case FRINTZ_s: set_sreg(fd, FPRoundInt(sreg(fn), FPZero)); break;
+    case FRINTZ_d: set_dreg(fd, FPRoundInt(dreg(fn), FPZero)); break;
+    case FCVT_ds: set_dreg(fd, FPToDouble(sreg(fn))); break;
+    case FCVT_sd: set_sreg(fd, FPToFloat(dreg(fn), FPTieEven)); break;
+    default: VIXL_UNIMPLEMENTED();
+  }
+}
+
+
+// Assemble the specified IEEE-754 components into the target type and apply
+// appropriate rounding.
+//  sign:     0 = positive, 1 = negative
+//  exponent: Unbiased IEEE-754 exponent.
+//  mantissa: The mantissa of the input. The top bit (which is not encoded for
+//            normal IEEE-754 values) must not be omitted. This bit has the
+//            value 'pow(2, exponent)'.
+//
+// The input value is assumed to be a normalized value. That is, the input may
+// not be infinity or NaN. If the source value is subnormal, it must be
+// normalized before calling this function such that the highest set bit in the
+// mantissa has the value 'pow(2, exponent)'.
+//
+// Callers should use FPRoundToFloat or FPRoundToDouble directly, rather than
+// calling a templated FPRound.
+template <class T, int ebits, int mbits>
+static T FPRound(int64_t sign, int64_t exponent, uint64_t mantissa,
+                 FPRounding round_mode) {
+  VIXL_ASSERT((sign == 0) || (sign == 1));
+
+  // Only the FPTieEven rounding mode is implemented.
+  VIXL_ASSERT(round_mode == FPTieEven);
+  USE(round_mode);
+
+  // Rounding can promote subnormals to normals, and normals to infinities. For
+  // example, a double with exponent 127 (FLT_MAX_EXP) would appear to be
+  // encodable as a float, but rounding based on the low-order mantissa bits
+  // could make it overflow. With ties-to-even rounding, this value would become
+  // an infinity.
+
+  // ---- Rounding Method ----
+  //
+  // The exponent is irrelevant in the rounding operation, so we treat the
+  // lowest-order bit that will fit into the result ('onebit') as having
+  // the value '1'. Similarly, the highest-order bit that won't fit into
+  // the result ('halfbit') has the value '0.5'. The 'point' sits between
+  // 'onebit' and 'halfbit':
+  //
+  //            These bits fit into the result.
+  //               |---------------------|
+  //  mantissa = 0bxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+  //                                     ||
+  //                                    / |
+  //                                   /  halfbit
+  //                               onebit
+  //
+  // For subnormal outputs, the range of representable bits is smaller and
+  // the position of onebit and halfbit depends on the exponent of the
+  // input, but the method is otherwise similar.
+  //
+  //   onebit(frac)
+  //     |
+  //     | halfbit(frac)          halfbit(adjusted)
+  //     | /                      /
+  //     | |                      |
+  //  0b00.0 (exact)      -> 0b00.0 (exact)                    -> 0b00
+  //  0b00.0...           -> 0b00.0...                         -> 0b00
+  //  0b00.1 (exact)      -> 0b00.0111..111                    -> 0b00
+  //  0b00.1...           -> 0b00.1...                         -> 0b01
+  //  0b01.0 (exact)      -> 0b01.0 (exact)                    -> 0b01
+  //  0b01.0...           -> 0b01.0...                         -> 0b01
+  //  0b01.1 (exact)      -> 0b01.1 (exact)                    -> 0b10
+  //  0b01.1...           -> 0b01.1...                         -> 0b10
+  //  0b10.0 (exact)      -> 0b10.0 (exact)                    -> 0b10
+  //  0b10.0...           -> 0b10.0...                         -> 0b10
+  //  0b10.1 (exact)      -> 0b10.0111..111                    -> 0b10
+  //  0b10.1...           -> 0b10.1...                         -> 0b11
+  //  0b11.0 (exact)      -> 0b11.0 (exact)                    -> 0b11
+  //  ...                   /             |                      /   |
+  //                       /              |                     /    |
+  //                                                           /     |
+  // adjusted = frac - (halfbit(mantissa) & ~onebit(frac));   /      |
+  //
+  //                   mantissa = (mantissa >> shift) + halfbit(adjusted);
+
+  static const int mantissa_offset = 0;
+  static const int exponent_offset = mantissa_offset + mbits;
+  static const int sign_offset = exponent_offset + ebits;
+  VIXL_ASSERT(sign_offset == (sizeof(T) * 8 - 1));
+
+  // Bail out early for zero inputs.
+  if (mantissa == 0) {
+    return sign << sign_offset;
+  }
+
+  // If all bits in the exponent are set, the value is infinite or NaN.
+  // This is true for all binary IEEE-754 formats.
+  static const int infinite_exponent = (1 << ebits) - 1;
+  static const int max_normal_exponent = infinite_exponent - 1;
+
+  // Apply the exponent bias to encode it for the result. Doing this early makes
+  // it easy to detect values that will be infinite or subnormal.
+  exponent += max_normal_exponent >> 1;
+
+  if (exponent > max_normal_exponent) {
+    // Overflow: The input is too large for the result type to represent. The
+    // FPTieEven rounding mode handles overflows using infinities.
+    exponent = infinite_exponent;
+    mantissa = 0;
+    return (sign << sign_offset) |
+           (exponent << exponent_offset) |
+           (mantissa << mantissa_offset);
+  }
+
+  // Calculate the shift required to move the top mantissa bit to the proper
+  // place in the destination type.
+  const int highest_significant_bit = 63 - CountLeadingZeros(mantissa, 64);
+  int shift = highest_significant_bit - mbits;
+
+  if (exponent <= 0) {
+    // The output will be subnormal (before rounding).
+
+    // For subnormal outputs, the shift must be adjusted by the exponent. The +1
+    // is necessary because the exponent of a subnormal value (encoded as 0) is
+    // the same as the exponent of the smallest normal value (encoded as 1).
+    shift += -exponent + 1;
+
+    // Handle inputs that would produce a zero output.
+    //
+    // Shifts higher than highest_significant_bit+1 will always produce a zero
+    // result. A shift of exactly highest_significant_bit+1 might produce a
+    // non-zero result after rounding.
+    if (shift > (highest_significant_bit + 1)) {
+      // The result will always be +/-0.0.
+      return sign << sign_offset;
+    }
+
+    // Properly encode the exponent for a subnormal output.
+    exponent = 0;
+  } else {
+    // Clear the topmost mantissa bit, since this is not encoded in IEEE-754
+    // normal values.
+    mantissa &= ~(UINT64_C(1) << highest_significant_bit);
+  }
+
+  if (shift > 0) {
+    // We have to shift the mantissa to the right. Some precision is lost, so we
+    // need to apply rounding.
+    uint64_t onebit_mantissa = (mantissa >> (shift)) & 1;
+    uint64_t halfbit_mantissa = (mantissa >> (shift-1)) & 1;
+    uint64_t adjusted = mantissa - (halfbit_mantissa & ~onebit_mantissa);
+    T halfbit_adjusted = (adjusted >> (shift-1)) & 1;
+
+    T result = (sign << sign_offset) |
+               (exponent << exponent_offset) |
+               ((mantissa >> shift) << mantissa_offset);
+
+    // A very large mantissa can overflow during rounding. If this happens, the
+    // exponent should be incremented and the mantissa set to 1.0 (encoded as
+    // 0). Applying halfbit_adjusted after assembling the float has the nice
+    // side-effect that this case is handled for free.
+    //
+    // This also handles cases where a very large finite value overflows to
+    // infinity, or where a very large subnormal value overflows to become
+    // normal.
+    return result + halfbit_adjusted;
+  } else {
+    // We have to shift the mantissa to the left (or not at all). The input
+    // mantissa is exactly representable in the output mantissa, so apply no
+    // rounding correction.
+    return (sign << sign_offset) |
+           (exponent << exponent_offset) |
+           ((mantissa << -shift) << mantissa_offset);
+  }
+}
+
+
+// See FPRound for a description of this function.
+static inline double FPRoundToDouble(int64_t sign, int64_t exponent,
+                                     uint64_t mantissa, FPRounding round_mode) {
+  int64_t bits =
+      FPRound<int64_t, kDoubleExponentBits, kDoubleMantissaBits>(sign,
+                                                                 exponent,
+                                                                 mantissa,
+                                                                 round_mode);
+  return rawbits_to_double(bits);
+}
+
+
+// See FPRound for a description of this function.
+static inline float FPRoundToFloat(int64_t sign, int64_t exponent,
+                                   uint64_t mantissa, FPRounding round_mode) {
+  int32_t bits =
+      FPRound<int32_t, kFloatExponentBits, kFloatMantissaBits>(sign,
+                                                               exponent,
+                                                               mantissa,
+                                                               round_mode);
+  return rawbits_to_float(bits);
+}
+
+
+double Simulator::FixedToDouble(int64_t src, int fbits, FPRounding round) {
+  if (src >= 0) {
+    return UFixedToDouble(src, fbits, round);
+  } else {
+    // This works for all negative values, including INT64_MIN.
+    return -UFixedToDouble(-src, fbits, round);
+  }
+}
+
+
+double Simulator::UFixedToDouble(uint64_t src, int fbits, FPRounding round) {
+  // An input of 0 is a special case because the result is effectively
+  // subnormal: The exponent is encoded as 0 and there is no implicit 1 bit.
+  if (src == 0) {
+    return 0.0;
+  }
+
+  // Calculate the exponent. The highest significant bit will have the value
+  // 2^exponent.
+  const int highest_significant_bit = 63 - CountLeadingZeros(src, 64);
+  const int64_t exponent = highest_significant_bit - fbits;
+
+  return FPRoundToDouble(0, exponent, src, round);
+}
+
+
+float Simulator::FixedToFloat(int64_t src, int fbits, FPRounding round) {
+  if (src >= 0) {
+    return UFixedToFloat(src, fbits, round);
+  } else {
+    // This works for all negative values, including INT64_MIN.
+    return -UFixedToFloat(-src, fbits, round);
+  }
+}
+
+
+float Simulator::UFixedToFloat(uint64_t src, int fbits, FPRounding round) {
+  // An input of 0 is a special case because the result is effectively
+  // subnormal: The exponent is encoded as 0 and there is no implicit 1 bit.
+  if (src == 0) {
+    return 0.0f;
+  }
+
+  // Calculate the exponent. The highest significant bit will have the value
+  // 2^exponent.
+  const int highest_significant_bit = 63 - CountLeadingZeros(src, 64);
+  const int32_t exponent = highest_significant_bit - fbits;
+
+  return FPRoundToFloat(0, exponent, src, round);
+}
+
+
+double Simulator::FPRoundInt(double value, FPRounding round_mode) {
+  if ((value == 0.0) || (value == kFP64PositiveInfinity) ||
+      (value == kFP64NegativeInfinity)) {
+    return value;
+  } else if (isnan(value)) {
+    return FPProcessNaN(value);
+  }
+
+  double int_result = floor(value);
+  double error = value - int_result;
+  switch (round_mode) {
+    case FPTieAway: {
+      // Take care of correctly handling the range ]-0.5, -0.0], which must
+      // yield -0.0.
+      if ((-0.5 < value) && (value < 0.0)) {
+        int_result = -0.0;
+
+      } else if ((error > 0.5) || ((error == 0.5) && (int_result >= 0.0))) {
+        // If the error is greater than 0.5, or is equal to 0.5 and the integer
+        // result is positive, round up.
+        int_result++;
+      }
+      break;
+    }
+    case FPTieEven: {
+      // Take care of correctly handling the range [-0.5, -0.0], which must
+      // yield -0.0.
+      if ((-0.5 <= value) && (value < 0.0)) {
+        int_result = -0.0;
+
+      // If the error is greater than 0.5, or is equal to 0.5 and the integer
+      // result is odd, round up.
+      } else if ((error > 0.5) ||
+          ((error == 0.5) && (fmod(int_result, 2) != 0))) {
+        int_result++;
+      }
+      break;
+    }
+    case FPZero: {
+      // If value>0 then we take floor(value)
+      // otherwise, ceil(value).
+      if (value < 0) {
+         int_result = ceil(value);
+      }
+      break;
+    }
+    case FPNegativeInfinity: {
+      // We always use floor(value).
+      break;
+    }
+    case FPPositiveInfinity: {
+      // Take care of correctly handling the range ]-1.0, -0.0], which must
+      // yield -0.0.
+      if ((-1.0 < value) && (value < 0.0)) {
+        int_result = -0.0;
+
+      // If the error is non-zero, round up.
+      } else if (error > 0.0) {
+        int_result++;
+      }
+      break;
+    }
+    default: VIXL_UNIMPLEMENTED();
+  }
+  return int_result;
+}
+
+
+double Simulator::FPToDouble(float value) {
+  switch (std::fpclassify(value)) {
+    case FP_NAN: {
+      if (DN()) return kFP64DefaultNaN;
+
+      // Convert NaNs as the processor would:
+      //  - The sign is propagated.
+      //  - The payload (mantissa) is transferred entirely, except that the top
+      //    bit is forced to '1', making the result a quiet NaN. The unused
+      //    (low-order) payload bits are set to 0.
+      uint32_t raw = float_to_rawbits(value);
+
+      uint64_t sign = raw >> 31;
+      uint64_t exponent = (1 << 11) - 1;
+      uint64_t payload = unsigned_bitextract_64(21, 0, raw);
+      payload <<= (52 - 23);  // The unused low-order bits should be 0.
+      payload |= (UINT64_C(1) << 51);  // Force a quiet NaN.
+
+      return rawbits_to_double((sign << 63) | (exponent << 52) | payload);
+    }
+
+    case FP_ZERO:
+    case FP_NORMAL:
+    case FP_SUBNORMAL:
+    case FP_INFINITE: {
+      // All other inputs are preserved in a standard cast, because every value
+      // representable using an IEEE-754 float is also representable using an
+      // IEEE-754 double.
+      return static_cast<double>(value);
+    }
+  }
+
+  VIXL_UNREACHABLE();
+  return static_cast<double>(value);
+}
+
+
+float Simulator::FPToFloat(double value, FPRounding round_mode) {
+  // Only the FPTieEven rounding mode is implemented.
+  VIXL_ASSERT(round_mode == FPTieEven);
+  USE(round_mode);
+
+  switch (std::fpclassify(value)) {
+    case FP_NAN: {
+      if (DN()) return kFP32DefaultNaN;
+
+      // Convert NaNs as the processor would:
+      //  - The sign is propagated.
+      //  - The payload (mantissa) is transferred as much as possible, except
+      //    that the top bit is forced to '1', making the result a quiet NaN.
+      uint64_t raw = double_to_rawbits(value);
+
+      uint32_t sign = raw >> 63;
+      uint32_t exponent = (1 << 8) - 1;
+      uint32_t payload = unsigned_bitextract_64(50, 52 - 23, raw);
+      payload |= (1 << 22);   // Force a quiet NaN.
+
+      return rawbits_to_float((sign << 31) | (exponent << 23) | payload);
+    }
+
+    case FP_ZERO:
+    case FP_INFINITE: {
+      // In a C++ cast, any value representable in the target type will be
+      // unchanged. This is always the case for +/-0.0 and infinities.
+      return static_cast<float>(value);
+    }
+
+    case FP_NORMAL:
+    case FP_SUBNORMAL: {
+      // Convert double-to-float as the processor would, assuming that FPCR.FZ
+      // (flush-to-zero) is not set.
+      uint64_t raw = double_to_rawbits(value);
+      // Extract the IEEE-754 double components.
+      uint32_t sign = raw >> 63;
+      // Extract the exponent and remove the IEEE-754 encoding bias.
+      int32_t exponent = unsigned_bitextract_64(62, 52, raw) - 1023;
+      // Extract the mantissa and add the implicit '1' bit.
+      uint64_t mantissa = unsigned_bitextract_64(51, 0, raw);
+      if (std::fpclassify(value) == FP_NORMAL) {
+        mantissa |= (UINT64_C(1) << 52);
+      }
+      return FPRoundToFloat(sign, exponent, mantissa, round_mode);
+    }
+  }
+
+  VIXL_UNREACHABLE();
+  return value;
+}
+
+
+void Simulator::VisitFPDataProcessing2Source(const Instruction* instr) {
+  AssertSupportedFPCR();
+
+  unsigned fd = instr->Rd();
+  unsigned fn = instr->Rn();
+  unsigned fm = instr->Rm();
+
+  // Fmaxnm and Fminnm have special NaN handling.
+  switch (instr->Mask(FPDataProcessing2SourceMask)) {
+    case FMAXNM_s: set_sreg(fd, FPMaxNM(sreg(fn), sreg(fm))); return;
+    case FMAXNM_d: set_dreg(fd, FPMaxNM(dreg(fn), dreg(fm))); return;
+    case FMINNM_s: set_sreg(fd, FPMinNM(sreg(fn), sreg(fm))); return;
+    case FMINNM_d: set_dreg(fd, FPMinNM(dreg(fn), dreg(fm))); return;
+    default:
+      break;    // Fall through.
+  }
+
+  if (FPProcessNaNs(instr)) return;
+
+  switch (instr->Mask(FPDataProcessing2SourceMask)) {
+    case FADD_s: set_sreg(fd, FPAdd(sreg(fn), sreg(fm))); break;
+    case FADD_d: set_dreg(fd, FPAdd(dreg(fn), dreg(fm))); break;
+    case FSUB_s: set_sreg(fd, FPSub(sreg(fn), sreg(fm))); break;
+    case FSUB_d: set_dreg(fd, FPSub(dreg(fn), dreg(fm))); break;
+    case FMUL_s: set_sreg(fd, FPMul(sreg(fn), sreg(fm))); break;
+    case FMUL_d: set_dreg(fd, FPMul(dreg(fn), dreg(fm))); break;
+    case FDIV_s: set_sreg(fd, FPDiv(sreg(fn), sreg(fm))); break;
+    case FDIV_d: set_dreg(fd, FPDiv(dreg(fn), dreg(fm))); break;
+    case FMAX_s: set_sreg(fd, FPMax(sreg(fn), sreg(fm))); break;
+    case FMAX_d: set_dreg(fd, FPMax(dreg(fn), dreg(fm))); break;
+    case FMIN_s: set_sreg(fd, FPMin(sreg(fn), sreg(fm))); break;
+    case FMIN_d: set_dreg(fd, FPMin(dreg(fn), dreg(fm))); break;
+    case FMAXNM_s:
+    case FMAXNM_d:
+    case FMINNM_s:
+    case FMINNM_d:
+      // These were handled before the standard FPProcessNaNs() stage.
+      VIXL_UNREACHABLE();
+    default: VIXL_UNIMPLEMENTED();
+  }
+}
+
+
+void Simulator::VisitFPDataProcessing3Source(const Instruction* instr) {
+  AssertSupportedFPCR();
+
+  unsigned fd = instr->Rd();
+  unsigned fn = instr->Rn();
+  unsigned fm = instr->Rm();
+  unsigned fa = instr->Ra();
+
+  switch (instr->Mask(FPDataProcessing3SourceMask)) {
+    // fd = fa +/- (fn * fm)
+    case FMADD_s: set_sreg(fd, FPMulAdd(sreg(fa), sreg(fn), sreg(fm))); break;
+    case FMSUB_s: set_sreg(fd, FPMulAdd(sreg(fa), -sreg(fn), sreg(fm))); break;
+    case FMADD_d: set_dreg(fd, FPMulAdd(dreg(fa), dreg(fn), dreg(fm))); break;
+    case FMSUB_d: set_dreg(fd, FPMulAdd(dreg(fa), -dreg(fn), dreg(fm))); break;
+    // Negated variants of the above.
+    case FNMADD_s:
+      set_sreg(fd, FPMulAdd(-sreg(fa), -sreg(fn), sreg(fm)));
+      break;
+    case FNMSUB_s:
+      set_sreg(fd, FPMulAdd(-sreg(fa), sreg(fn), sreg(fm)));
+      break;
+    case FNMADD_d:
+      set_dreg(fd, FPMulAdd(-dreg(fa), -dreg(fn), dreg(fm)));
+      break;
+    case FNMSUB_d:
+      set_dreg(fd, FPMulAdd(-dreg(fa), dreg(fn), dreg(fm)));
+      break;
+    default: VIXL_UNIMPLEMENTED();
+  }
+}
+
+
+template <typename T>
+T Simulator::FPAdd(T op1, T op2) {
+  // NaNs should be handled elsewhere.
+  VIXL_ASSERT(!isnan(op1) && !isnan(op2));
+
+  if (isinf(op1) && isinf(op2) && (op1 != op2)) {
+    // inf + -inf returns the default NaN.
+    FPProcessException();
+    return FPDefaultNaN<T>();
+  } else {
+    // Other cases should be handled by standard arithmetic.
+    return op1 + op2;
+  }
+}
+
+
+template <typename T>
+T Simulator::FPDiv(T op1, T op2) {
+  // NaNs should be handled elsewhere.
+  VIXL_ASSERT(!isnan(op1) && !isnan(op2));
+
+  if ((isinf(op1) && isinf(op2)) || ((op1 == 0.0) && (op2 == 0.0))) {
+    // inf / inf and 0.0 / 0.0 return the default NaN.
+    FPProcessException();
+    return FPDefaultNaN<T>();
+  } else {
+    if (op2 == 0.0) FPProcessException();
+
+    // Other cases should be handled by standard arithmetic.
+    return op1 / op2;
+  }
+}
+
+
+template <typename T>
+T Simulator::FPMax(T a, T b) {
+  // NaNs should be handled elsewhere.
+  VIXL_ASSERT(!isnan(a) && !isnan(b));
+
+  if ((a == 0.0) && (b == 0.0) &&
+      (copysign(1.0, a) != copysign(1.0, b))) {
+    // a and b are zero, and the sign differs: return +0.0.
+    return 0.0;
+  } else {
+    return (a > b) ? a : b;
+  }
+}
+
+
+template <typename T>
+T Simulator::FPMaxNM(T a, T b) {
+  if (IsQuietNaN(a) && !IsQuietNaN(b)) {
+    a = kFP64NegativeInfinity;
+  } else if (!IsQuietNaN(a) && IsQuietNaN(b)) {
+    b = kFP64NegativeInfinity;
+  }
+
+  T result = FPProcessNaNs(a, b);
+  return isnan(result) ? result : FPMax(a, b);
+}
+
+
+template <typename T>
+T Simulator::FPMin(T a, T b) {
+  // NaNs should be handled elsewhere.
+  VIXL_ASSERT(!isnan(a) && !isnan(b));
+
+  if ((a == 0.0) && (b == 0.0) &&
+      (copysign(1.0, a) != copysign(1.0, b))) {
+    // a and b are zero, and the sign differs: return -0.0.
+    return -0.0;
+  } else {
+    return (a < b) ? a : b;
+  }
+}
+
+
+template <typename T>
+T Simulator::FPMinNM(T a, T b) {
+  if (IsQuietNaN(a) && !IsQuietNaN(b)) {
+    a = kFP64PositiveInfinity;
+  } else if (!IsQuietNaN(a) && IsQuietNaN(b)) {
+    b = kFP64PositiveInfinity;
+  }
+
+  T result = FPProcessNaNs(a, b);
+  return isnan(result) ? result : FPMin(a, b);
+}
+
+
+template <typename T>
+T Simulator::FPMul(T op1, T op2) {
+  // NaNs should be handled elsewhere.
+  VIXL_ASSERT(!isnan(op1) && !isnan(op2));
+
+  if ((isinf(op1) && (op2 == 0.0)) || (isinf(op2) && (op1 == 0.0))) {
+    // inf * 0.0 returns the default NaN.
+    FPProcessException();
+    return FPDefaultNaN<T>();
+  } else {
+    // Other cases should be handled by standard arithmetic.
+    return op1 * op2;
+  }
+}
+
+
+template<typename T>
+T Simulator::FPMulAdd(T a, T op1, T op2) {
+  T result = FPProcessNaNs3(a, op1, op2);
+
+  T sign_a = copysign(1.0, a);
+  T sign_prod = copysign(1.0, op1) * copysign(1.0, op2);
+  bool isinf_prod = isinf(op1) || isinf(op2);
+  bool operation_generates_nan =
+      (isinf(op1) && (op2 == 0.0)) ||                     // inf * 0.0
+      (isinf(op2) && (op1 == 0.0)) ||                     // 0.0 * inf
+      (isinf(a) && isinf_prod && (sign_a != sign_prod));  // inf - inf
+
+  if (isnan(result)) {
+    // Generated NaNs override quiet NaNs propagated from a.
+    if (operation_generates_nan && IsQuietNaN(a)) {
+      FPProcessException();
+      return FPDefaultNaN<T>();
+    } else {
+      return result;
+    }
+  }
+
+  // If the operation would produce a NaN, return the default NaN.
+  if (operation_generates_nan) {
+    FPProcessException();
+    return FPDefaultNaN<T>();
+  }
+
+  // Work around broken fma implementations for exact zero results: The sign of
+  // exact 0.0 results is positive unless both a and op1 * op2 are negative.
+  if (((op1 == 0.0) || (op2 == 0.0)) && (a == 0.0)) {
+    return ((sign_a < 0) && (sign_prod < 0)) ? -0.0 : 0.0;
+  }
+
+  result = FusedMultiplyAdd(op1, op2, a);
+  VIXL_ASSERT(!isnan(result));
+
+  // Work around broken fma implementations for rounded zero results: If a is
+  // 0.0, the sign of the result is the sign of op1 * op2 before rounding.
+  if ((a == 0.0) && (result == 0.0)) {
+    return copysign(0.0, sign_prod);
+  }
+
+  return result;
+}
+
+
+template <typename T>
+T Simulator::FPSub(T op1, T op2) {
+  // NaNs should be handled elsewhere.
+  VIXL_ASSERT(!isnan(op1) && !isnan(op2));
+
+  if (isinf(op1) && isinf(op2) && (op1 == op2)) {
+    // inf - inf returns the default NaN.
+    FPProcessException();
+    return FPDefaultNaN<T>();
+  } else {
+    // Other cases should be handled by standard arithmetic.
+    return op1 - op2;
+  }
+}
+
+
+template <typename T>
+T Simulator::FPSqrt(T op) {
+  if (isnan(op)) {
+    return FPProcessNaN(op);
+  } else if (op < 0.0) {
+    FPProcessException();
+    return FPDefaultNaN<T>();
+  } else {
+    return sqrt(op);
+  }
+}
+
+
+template <typename T>
+T Simulator::FPProcessNaN(T op) {
+  VIXL_ASSERT(isnan(op));
+  if (IsSignallingNaN(op)) {
+    FPProcessException();
+  }
+  return DN() ? FPDefaultNaN<T>() : ToQuietNaN(op);
+}
+
+
+template <typename T>
+T Simulator::FPProcessNaNs(T op1, T op2) {
+  if (IsSignallingNaN(op1)) {
+    return FPProcessNaN(op1);
+  } else if (IsSignallingNaN(op2)) {
+    return FPProcessNaN(op2);
+  } else if (isnan(op1)) {
+    VIXL_ASSERT(IsQuietNaN(op1));
+    return FPProcessNaN(op1);
+  } else if (isnan(op2)) {
+    VIXL_ASSERT(IsQuietNaN(op2));
+    return FPProcessNaN(op2);
+  } else {
+    return 0.0;
+  }
+}
+
+
+template <typename T>
+T Simulator::FPProcessNaNs3(T op1, T op2, T op3) {
+  if (IsSignallingNaN(op1)) {
+    return FPProcessNaN(op1);
+  } else if (IsSignallingNaN(op2)) {
+    return FPProcessNaN(op2);
+  } else if (IsSignallingNaN(op3)) {
+    return FPProcessNaN(op3);
+  } else if (isnan(op1)) {
+    VIXL_ASSERT(IsQuietNaN(op1));
+    return FPProcessNaN(op1);
+  } else if (isnan(op2)) {
+    VIXL_ASSERT(IsQuietNaN(op2));
+    return FPProcessNaN(op2);
+  } else if (isnan(op3)) {
+    VIXL_ASSERT(IsQuietNaN(op3));
+    return FPProcessNaN(op3);
+  } else {
+    return 0.0;
+  }
+}
+
+
+bool Simulator::FPProcessNaNs(const Instruction* instr) {
+  unsigned fd = instr->Rd();
+  unsigned fn = instr->Rn();
+  unsigned fm = instr->Rm();
+  bool done = false;
+
+  if (instr->Mask(FP64) == FP64) {
+    double result = FPProcessNaNs(dreg(fn), dreg(fm));
+    if (isnan(result)) {
+      set_dreg(fd, result);
+      done = true;
+    }
+  } else {
+    float result = FPProcessNaNs(sreg(fn), sreg(fm));
+    if (isnan(result)) {
+      set_sreg(fd, result);
+      done = true;
+    }
+  }
+
+  return done;
+}
+
+
+void Simulator::VisitSystem(const Instruction* instr) {
+  // Some system instructions hijack their Op and Cp fields to represent a
+  // range of immediates instead of indicating a different instruction. This
+  // makes the decoding tricky.
+  if (instr->Mask(SystemExclusiveMonitorFMask) == SystemExclusiveMonitorFixed) {
+    VIXL_ASSERT(instr->Mask(SystemExclusiveMonitorMask) == CLREX);
+    switch (instr->Mask(SystemExclusiveMonitorMask)) {
+      case CLREX: {
+        PrintExclusiveAccessWarning();
+        ClearLocalMonitor();
+        break;
+      }
+    }
+  } else if (instr->Mask(SystemSysRegFMask) == SystemSysRegFixed) {
+    switch (instr->Mask(SystemSysRegMask)) {
+      case MRS: {
+        switch (instr->ImmSystemRegister()) {
+          case NZCV: set_xreg(instr->Rt(), nzcv().RawValue()); break;
+          case FPCR: set_xreg(instr->Rt(), fpcr().RawValue()); break;
+          default: VIXL_UNIMPLEMENTED();
+        }
+        break;
+      }
+      case MSR: {
+        switch (instr->ImmSystemRegister()) {
+          case NZCV:
+            nzcv().SetRawValue(xreg(instr->Rt()));
+            LogSystemRegister(NZCV);
+            break;
+          case FPCR:
+            fpcr().SetRawValue(xreg(instr->Rt()));
+            LogSystemRegister(FPCR);
+            break;
+          default: VIXL_UNIMPLEMENTED();
+        }
+        break;
+      }
+    }
+  } else if (instr->Mask(SystemHintFMask) == SystemHintFixed) {
+    VIXL_ASSERT(instr->Mask(SystemHintMask) == HINT);
+    switch (instr->ImmHint()) {
+      case NOP: break;
+      default: VIXL_UNIMPLEMENTED();
+    }
+  } else if (instr->Mask(MemBarrierFMask) == MemBarrierFixed) {
+    __sync_synchronize();
+  } else {
+    VIXL_UNIMPLEMENTED();
+  }
+}
+
+
+void Simulator::DoUnreachable(const Instruction* instr) {
+  VIXL_ASSERT((instr->Mask(ExceptionMask) == HLT) &&
+              (instr->ImmException() == kUnreachableOpcode));
+
+  fprintf(stream_, "Hit UNREACHABLE marker at pc=%p.\n",
+          reinterpret_cast<const void*>(instr));
+  abort();
+}
+
+
+void Simulator::DoTrace(const Instruction* instr) {
+  VIXL_ASSERT((instr->Mask(ExceptionMask) == HLT) &&
+              (instr->ImmException() == kTraceOpcode));
+
+  // Read the arguments encoded inline in the instruction stream.
+  uint32_t parameters;
+  uint32_t command;
+
+  VIXL_STATIC_ASSERT(sizeof(*instr) == 1);
+  memcpy(&parameters, instr + kTraceParamsOffset, sizeof(parameters));
+  memcpy(&command, instr + kTraceCommandOffset, sizeof(command));
+
+  switch (command) {
+    case TRACE_ENABLE:
+      set_trace_parameters(trace_parameters() | parameters);
+      break;
+    case TRACE_DISABLE:
+      set_trace_parameters(trace_parameters() & ~parameters);
+      break;
+    default:
+      VIXL_UNREACHABLE();
+  }
+
+  set_pc(instr->InstructionAtOffset(kTraceLength));
+}
+
+
+void Simulator::DoLog(const Instruction* instr) {
+  VIXL_ASSERT((instr->Mask(ExceptionMask) == HLT) &&
+              (instr->ImmException() == kLogOpcode));
+
+  // Read the arguments encoded inline in the instruction stream.
+  uint32_t parameters;
+
+  VIXL_STATIC_ASSERT(sizeof(*instr) == 1);
+  memcpy(&parameters, instr + kTraceParamsOffset, sizeof(parameters));
+
+  // We don't support a one-shot LOG_DISASM.
+  VIXL_ASSERT((parameters & LOG_DISASM) == 0);
+  // Print the requested information.
+  if (parameters & LOG_SYS_REGS) PrintSystemRegisters();
+  if (parameters & LOG_REGS) PrintRegisters();
+  if (parameters & LOG_FP_REGS) PrintFPRegisters();
+
+  set_pc(instr->InstructionAtOffset(kLogLength));
+}
+
+
+void Simulator::DoPrintf(const Instruction* instr) {
+  VIXL_ASSERT((instr->Mask(ExceptionMask) == HLT) &&
+              (instr->ImmException() == kPrintfOpcode));
+
+  // Read the arguments encoded inline in the instruction stream.
+  uint32_t arg_count;
+  uint32_t arg_pattern_list;
+  VIXL_STATIC_ASSERT(sizeof(*instr) == 1);
+  memcpy(&arg_count,
+         instr + kPrintfArgCountOffset,
+         sizeof(arg_count));
+  memcpy(&arg_pattern_list,
+         instr + kPrintfArgPatternListOffset,
+         sizeof(arg_pattern_list));
+
+  VIXL_ASSERT(arg_count <= kPrintfMaxArgCount);
+  VIXL_ASSERT((arg_pattern_list >> (kPrintfArgPatternBits * arg_count)) == 0);
+
+  // We need to call the host printf function with a set of arguments defined by
+  // arg_pattern_list. Because we don't know the types and sizes of the
+  // arguments, this is very difficult to do in a robust and portable way. To
+  // work around the problem, we pick apart the format string, and print one
+  // format placeholder at a time.
+
+  // Allocate space for the format string. We take a copy, so we can modify it.
+  // Leave enough space for one extra character per expected argument (plus the
+  // '\0' termination).
+  const char * format_base = reg<const char *>(0);
+  VIXL_ASSERT(format_base != NULL);
+  size_t length = strlen(format_base) + 1;
+  char * const format = new char[length + arg_count];
+
+  // A list of chunks, each with exactly one format placeholder.
+  const char * chunks[kPrintfMaxArgCount];
+
+  // Copy the format string and search for format placeholders.
+  uint32_t placeholder_count = 0;
+  char * format_scratch = format;
+  for (size_t i = 0; i < length; i++) {
+    if (format_base[i] != '%') {
+      *format_scratch++ = format_base[i];
+    } else {
+      if (format_base[i + 1] == '%') {
+        // Ignore explicit "%%" sequences.
+        *format_scratch++ = format_base[i];
+        i++;
+        // Chunks after the first are passed as format strings to printf, so we
+        // need to escape '%' characters in those chunks.
+        if (placeholder_count > 0) *format_scratch++ = format_base[i];
+      } else {
+        VIXL_CHECK(placeholder_count < arg_count);
+        // Insert '\0' before placeholders, and store their locations.
+        *format_scratch++ = '\0';
+        chunks[placeholder_count++] = format_scratch;
+        *format_scratch++ = format_base[i];
+      }
+    }
+  }
+  VIXL_CHECK(placeholder_count == arg_count);
+
+  // Finally, call printf with each chunk, passing the appropriate register
+  // argument. Normally, printf returns the number of bytes transmitted, so we
+  // can emulate a single printf call by adding the result from each chunk. If
+  // any call returns a negative (error) value, though, just return that value.
+
+  printf("%s", clr_printf);
+
+  // Because '\0' is inserted before each placeholder, the first string in
+  // 'format' contains no format placeholders and should be printed literally.
+  int result = printf("%s", format);
+  int pcs_r = 1;      // Start at x1. x0 holds the format string.
+  int pcs_f = 0;      // Start at d0.
+  if (result >= 0) {
+    for (uint32_t i = 0; i < placeholder_count; i++) {
+      int part_result = -1;
+
+      uint32_t arg_pattern = arg_pattern_list >> (i * kPrintfArgPatternBits);
+      arg_pattern &= (1 << kPrintfArgPatternBits) - 1;
+      switch (arg_pattern) {
+        case kPrintfArgW: part_result = printf(chunks[i], wreg(pcs_r++)); break;
+        case kPrintfArgX: part_result = printf(chunks[i], xreg(pcs_r++)); break;
+        case kPrintfArgD: part_result = printf(chunks[i], dreg(pcs_f++)); break;
+        default: VIXL_UNREACHABLE();
+      }
+
+      if (part_result < 0) {
+        // Handle error values.
+        result = part_result;
+        break;
+      }
+
+      result += part_result;
+    }
+  }
+
+  printf("%s", clr_normal);
+
+  // Printf returns its result in x0 (just like the C library's printf).
+  set_xreg(0, result);
+
+  // The printf parameters are inlined in the code, so skip them.
+  set_pc(instr->InstructionAtOffset(kPrintfLength));
+
+  // Set LR as if we'd just called a native printf function.
+  set_lr(pc());
+
+  delete[] format;
+}
+
+}  // namespace vixl
+
+#endif  // JS_ARM64_SIMULATOR
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Simulator-vixl.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Simulator-vixl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Simulator-vixl.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Simulator-vixl.h	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,977 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#ifndef VIXL_A64_SIMULATOR_A64_H_
+#define VIXL_A64_SIMULATOR_A64_H_
+
+#include "mozilla/Vector.h"
+
+#include "jsalloc.h"
+
+#include "jit/arm64/vixl/Assembler-vixl.h"
+#include "jit/arm64/vixl/Disasm-vixl.h"
+#include "jit/arm64/vixl/Globals-vixl.h"
+#include "jit/arm64/vixl/Instructions-vixl.h"
+#include "jit/arm64/vixl/Instrument-vixl.h"
+#include "jit/arm64/vixl/Utils-vixl.h"
+#include "jit/IonTypes.h"
+#include "vm/PosixNSPR.h"
+
+#define JS_CHECK_SIMULATOR_RECURSION_WITH_EXTRA(cx, extra, onerror)             \
+    JS_BEGIN_MACRO                                                              \
+        if (cx->mainThread().simulator()->overRecursedWithExtra(extra)) {       \
+            js::ReportOverRecursed(cx);                                         \
+            onerror;                                                            \
+        }                                                                       \
+    JS_END_MACRO
+
+namespace vixl {
+
+// Debug instructions.
+//
+// VIXL's macro-assembler and simulator support a few pseudo instructions to
+// make debugging easier. These pseudo instructions do not exist on real
+// hardware.
+//
+// TODO: Provide controls to prevent the macro assembler from emitting
+// pseudo-instructions. This is important for ahead-of-time compilers, where the
+// macro assembler is built with USE_SIMULATOR but the code will eventually be
+// run on real hardware.
+//
+// TODO: Also consider allowing these pseudo-instructions to be disabled in the
+// simulator, so that users can check that the input is a valid native code.
+// (This isn't possible in all cases. Printf won't work, for example.)
+//
+// Each debug pseudo instruction is represented by a HLT instruction. The HLT
+// immediate field is used to identify the type of debug pseudo isntruction.
+// Each pseudo instruction uses a custom encoding for additional arguments, as
+// described below.
+
+// Unreachable
+//
+// Instruction which should never be executed. This is used as a guard in parts
+// of the code that should not be reachable, such as in data encoded inline in
+// the instructions.
+const Instr kUnreachableOpcode = 0xdeb0;
+
+// Printf
+//  - arg_count: The number of arguments.
+//  - arg_pattern: A set of PrintfArgPattern values, packed into two-bit fields.
+//
+// Simulate a call to printf.
+//
+// Floating-point and integer arguments are passed in separate sets of registers
+// in AAPCS64 (even for varargs functions), so it is not possible to determine
+// the type of each argument without some information about the values that were
+// passed in. This information could be retrieved from the printf format string,
+// but the format string is not trivial to parse so we encode the relevant
+// information with the HLT instruction.
+//
+// Also, the following registers are populated (as if for a native A64 call):
+//    x0: The format string
+// x1-x7: Optional arguments, if type == CPURegister::kRegister
+// d0-d7: Optional arguments, if type == CPURegister::kFPRegister
+const Instr kPrintfOpcode = 0xdeb1;
+const unsigned kPrintfArgCountOffset = 1 * kInstructionSize;
+const unsigned kPrintfArgPatternListOffset = 2 * kInstructionSize;
+const unsigned kPrintfLength = 3 * kInstructionSize;
+
+const unsigned kPrintfMaxArgCount = 4;
+
+// The argument pattern is a set of two-bit-fields, each with one of the
+// following values:
+enum PrintfArgPattern {
+  kPrintfArgW = 1,
+  kPrintfArgX = 2,
+  // There is no kPrintfArgS because floats are always converted to doubles in C
+  // varargs calls.
+  kPrintfArgD = 3
+};
+static const unsigned kPrintfArgPatternBits = 2;
+
+// Trace
+//  - parameter: TraceParameter stored as a uint32_t
+//  - command: TraceCommand stored as a uint32_t
+//
+// Allow for trace management in the generated code. This enables or disables
+// automatic tracing of the specified information for every simulated
+// instruction.
+const Instr kTraceOpcode = 0xdeb2;
+const unsigned kTraceParamsOffset = 1 * kInstructionSize;
+const unsigned kTraceCommandOffset = 2 * kInstructionSize;
+const unsigned kTraceLength = 3 * kInstructionSize;
+
+// Trace parameters.
+enum TraceParameters {
+  LOG_DISASM     = 1 << 0,  // Log disassembly.
+  LOG_REGS       = 1 << 1,  // Log general purpose registers.
+  LOG_FP_REGS    = 1 << 2,  // Log floating-point registers.
+  LOG_SYS_REGS   = 1 << 3,  // Log the flags and system registers.
+  LOG_WRITE      = 1 << 4,  // Log writes to memory.
+
+  LOG_NONE       = 0,
+  LOG_STATE      = LOG_REGS | LOG_FP_REGS | LOG_SYS_REGS,
+  LOG_ALL        = LOG_DISASM | LOG_STATE | LOG_WRITE
+};
+
+// Trace commands.
+enum TraceCommand {
+  TRACE_ENABLE   = 1,
+  TRACE_DISABLE  = 2
+};
+
+// Log
+//  - parameter: TraceParameter stored as a uint32_t
+//
+// Print the specified information once. This mechanism is separate from Trace.
+// In particular, _all_ of the specified registers are printed, rather than just
+// the registers that the instruction writes.
+//
+// Any combination of the TraceParameters values can be used, except that
+// LOG_DISASM is not supported for Log.
+const Instr kLogOpcode = 0xdeb3;
+const unsigned kLogParamsOffset = 1 * kInstructionSize;
+const unsigned kLogLength = 2 * kInstructionSize;
+
+// The proper way to initialize a simulated system register (such as NZCV) is as
+// follows:
+//  SimSystemRegister nzcv = SimSystemRegister::DefaultValueFor(NZCV);
+class SimSystemRegister {
+ public:
+  // The default constructor represents a register which has no writable bits.
+  // It is not possible to set its value to anything other than 0.
+  SimSystemRegister() : value_(0), write_ignore_mask_(0xffffffff) { }
+
+  uint32_t RawValue() const {
+    return value_;
+  }
+
+  void SetRawValue(uint32_t new_value) {
+    value_ = (value_ & write_ignore_mask_) | (new_value & ~write_ignore_mask_);
+  }
+
+  uint32_t Bits(int msb, int lsb) const {
+    return unsigned_bitextract_32(msb, lsb, value_);
+  }
+
+  int32_t SignedBits(int msb, int lsb) const {
+    return signed_bitextract_32(msb, lsb, value_);
+  }
+
+  void SetBits(int msb, int lsb, uint32_t bits);
+
+  // Default system register values.
+  static SimSystemRegister DefaultValueFor(SystemRegister id);
+
+#define DEFINE_GETTER(Name, HighBit, LowBit, Func)                            \
+  uint32_t Name() const { return Func(HighBit, LowBit); }              \
+  void Set##Name(uint32_t bits) { SetBits(HighBit, LowBit, bits); }
+#define DEFINE_WRITE_IGNORE_MASK(Name, Mask)                                  \
+  static const uint32_t Name##WriteIgnoreMask = ~static_cast<uint32_t>(Mask);
+
+  SYSTEM_REGISTER_FIELDS_LIST(DEFINE_GETTER, DEFINE_WRITE_IGNORE_MASK)
+
+#undef DEFINE_ZERO_BITS
+#undef DEFINE_GETTER
+
+ protected:
+  // Most system registers only implement a few of the bits in the word. Other
+  // bits are "read-as-zero, write-ignored". The write_ignore_mask argument
+  // describes the bits which are not modifiable.
+  SimSystemRegister(uint32_t value, uint32_t write_ignore_mask)
+      : value_(value), write_ignore_mask_(write_ignore_mask) { }
+
+  uint32_t value_;
+  uint32_t write_ignore_mask_;
+};
+
+
+// Represent a register (r0-r31, v0-v31).
+template<int kSizeInBytes>
+class SimRegisterBase {
+ public:
+  // Write the specified value. The value is zero-extended if necessary.
+  template<typename T>
+  void Set(T new_value) {
+    VIXL_STATIC_ASSERT(sizeof(new_value) <= kSizeInBytes);
+    if (sizeof(new_value) < kSizeInBytes) {
+      // All AArch64 registers are zero-extending.
+      memset(value_ + sizeof(new_value), 0, kSizeInBytes - sizeof(new_value));
+    }
+    memcpy(value_, &new_value, sizeof(new_value));
+  }
+
+  // Read the value as the specified type. The value is truncated if necessary.
+  template<typename T>
+  T Get() const {
+    T result;
+    VIXL_STATIC_ASSERT(sizeof(result) <= kSizeInBytes);
+    memcpy(&result, value_, sizeof(T));
+    return result;
+  }
+
+ protected:
+  uint8_t value_[kSizeInBytes];
+};
+typedef SimRegisterBase<kXRegSizeInBytes> SimRegister;      // r0-r31
+typedef SimRegisterBase<kDRegSizeInBytes> SimFPRegister;    // v0-v31
+
+
+class SimExclusiveLocalMonitor {
+ public:
+  SimExclusiveLocalMonitor() : kSkipClearProbability(8), seed_(0x87654321) {
+    Clear();
+  }
+
+  // Clear the exclusive monitor (like clrex).
+  void Clear() {
+    address_ = 0;
+    size_ = 0;
+  }
+
+  // Clear the exclusive monitor most of the time.
+  void MaybeClear() {
+    if ((seed_ % kSkipClearProbability) != 0) {
+      Clear();
+    }
+
+    // Advance seed_ using a simple linear congruential generator.
+    seed_ = (seed_ * 48271) % 2147483647;
+  }
+
+  // Mark the address range for exclusive access (like load-exclusive).
+  void MarkExclusive(uint64_t address, size_t size) {
+    address_ = address;
+    size_ = size;
+  }
+
+  // Return true if the address range is marked (like store-exclusive).
+  // This helper doesn't implicitly clear the monitor.
+  bool IsExclusive(uint64_t address, size_t size) {
+    VIXL_ASSERT(size > 0);
+    // Be pedantic: Require both the address and the size to match.
+    return (size == size_) && (address == address_);
+  }
+
+ private:
+  uint64_t address_;
+  size_t size_;
+
+  const int kSkipClearProbability;
+  uint32_t seed_;
+};
+
+
+// We can't accurate simulate the global monitor since it depends on external
+// influences. Instead, this implementation occasionally causes accesses to
+// fail, according to kPassProbability.
+class SimExclusiveGlobalMonitor {
+ public:
+  SimExclusiveGlobalMonitor() : kPassProbability(8), seed_(0x87654321) {}
+
+  bool IsExclusive(uint64_t address, size_t size) {
+    USE(address);
+    USE(size);
+
+    bool pass = (seed_ % kPassProbability) != 0;
+    // Advance seed_ using a simple linear congruential generator.
+    seed_ = (seed_ * 48271) % 2147483647;
+    return pass;
+  }
+
+ private:
+  const int kPassProbability;
+  uint32_t seed_;
+};
+
+class Redirection;
+
+class Simulator : public DecoderVisitor {
+  friend class AutoLockSimulatorCache;
+
+ public:
+  explicit Simulator(Decoder* decoder, FILE* stream = stdout);
+  ~Simulator();
+
+  // Moz changes.
+  explicit Simulator();
+  void init(Decoder* decoder, FILE* stream);
+  static Simulator* Current();
+  static Simulator* Create();
+  static void Destroy(Simulator* sim);
+  uintptr_t stackLimit() const;
+  uintptr_t* addressOfStackLimit();
+  bool overRecursed(uintptr_t newsp = 0) const;
+  bool overRecursedWithExtra(uint32_t extra) const;
+  int64_t call(uint8_t* entry, int argument_count, ...);
+  void setRedirection(Redirection* redirection);
+  Redirection* redirection() const;
+  static void* RedirectNativeFunction(void* nativeFunction, js::jit::ABIFunctionType type);
+  void setGPR32Result(int32_t result);
+  void setGPR64Result(int64_t result);
+  void setFP32Result(float result);
+  void setFP64Result(double result);
+  void VisitCallRedirection(const Instruction* instr);
+
+  void ResetState();
+
+  // Run the simulator.
+  virtual void Run();
+  void RunFrom(const Instruction* first);
+
+  // Simulation helpers.
+  const Instruction* pc() const { return pc_; }
+  void set_pc(const Instruction* new_pc) {
+    pc_ = AddressUntag(new_pc);
+    pc_modified_ = true;
+  }
+  void set_resume_pc(const Instruction* new_resume_pc);
+
+  void increment_pc() {
+    if (!pc_modified_) {
+      pc_ = pc_->NextInstruction();
+    }
+
+    pc_modified_ = false;
+  }
+
+  void ExecuteInstruction();
+
+  // Declare all Visitor functions.
+  #define DECLARE(A) virtual void Visit##A(const Instruction* instr);
+  VISITOR_LIST(DECLARE)
+  #undef DECLARE
+
+  // Integer register accessors.
+
+  // Basic accessor: Read the register as the specified type.
+  template<typename T>
+  T reg(unsigned code, Reg31Mode r31mode = Reg31IsZeroRegister) const {
+    VIXL_ASSERT(code < kNumberOfRegisters);
+    if ((code == 31) && (r31mode == Reg31IsZeroRegister)) {
+      T result;
+      memset(&result, 0, sizeof(result));
+      return result;
+    }
+    return registers_[code].Get<T>();
+  }
+
+  // Common specialized accessors for the reg() template.
+  int32_t wreg(unsigned code,
+               Reg31Mode r31mode = Reg31IsZeroRegister) const {
+    return reg<int32_t>(code, r31mode);
+  }
+
+  int64_t xreg(unsigned code,
+               Reg31Mode r31mode = Reg31IsZeroRegister) const {
+    return reg<int64_t>(code, r31mode);
+  }
+
+  // As above, with parameterized size and return type. The value is
+  // either zero-extended or truncated to fit, as required.
+  template<typename T>
+  T reg(unsigned size, unsigned code,
+        Reg31Mode r31mode = Reg31IsZeroRegister) const {
+    uint64_t raw;
+    switch (size) {
+      case kWRegSize: raw = reg<uint32_t>(code, r31mode); break;
+      case kXRegSize: raw = reg<uint64_t>(code, r31mode); break;
+      default:
+        VIXL_UNREACHABLE();
+        return 0;
+    }
+
+    T result;
+    VIXL_STATIC_ASSERT(sizeof(result) <= sizeof(raw));
+    // Copy the result and truncate to fit. This assumes a little-endian host.
+    memcpy(&result, &raw, sizeof(result));
+    return result;
+  }
+
+  // Use int64_t by default if T is not specified.
+  int64_t reg(unsigned size, unsigned code,
+              Reg31Mode r31mode = Reg31IsZeroRegister) const {
+    return reg<int64_t>(size, code, r31mode);
+  }
+
+  enum RegLogMode {
+    LogRegWrites,
+    NoRegLog
+  };
+
+  // Write 'value' into an integer register. The value is zero-extended. This
+  // behaviour matches AArch64 register writes.
+  template<typename T>
+  void set_reg(unsigned code, T value,
+               RegLogMode log_mode = LogRegWrites,
+               Reg31Mode r31mode = Reg31IsZeroRegister) {
+    VIXL_STATIC_ASSERT((sizeof(T) == kWRegSizeInBytes) ||
+                       (sizeof(T) == kXRegSizeInBytes));
+    VIXL_ASSERT(code < kNumberOfRegisters);
+
+    if ((code == 31) && (r31mode == Reg31IsZeroRegister)) {
+      return;
+    }
+
+    registers_[code].Set(value);
+
+    if (log_mode == LogRegWrites) LogRegister(code, r31mode);
+  }
+
+  // Common specialized accessors for the set_reg() template.
+  void set_wreg(unsigned code, int32_t value,
+                RegLogMode log_mode = LogRegWrites,
+                Reg31Mode r31mode = Reg31IsZeroRegister) {
+    set_reg(code, value, log_mode, r31mode);
+  }
+
+  void set_xreg(unsigned code, int64_t value,
+               RegLogMode log_mode = LogRegWrites,
+                Reg31Mode r31mode = Reg31IsZeroRegister) {
+    set_reg(code, value, log_mode, r31mode);
+  }
+
+  // As above, with parameterized size and type. The value is either
+  // zero-extended or truncated to fit, as required.
+  template<typename T>
+  void set_reg(unsigned size, unsigned code, T value,
+               RegLogMode log_mode = LogRegWrites,
+               Reg31Mode r31mode = Reg31IsZeroRegister) {
+    // Zero-extend the input.
+    uint64_t raw = 0;
+    VIXL_STATIC_ASSERT(sizeof(value) <= sizeof(raw));
+    memcpy(&raw, &value, sizeof(value));
+
+    // Write (and possibly truncate) the value.
+    switch (size) {
+      case kWRegSize: set_reg<uint32_t>(code, raw, log_mode, r31mode); break;
+      case kXRegSize: set_reg<uint64_t>(code, raw, log_mode, r31mode); break;
+      default:
+        VIXL_UNREACHABLE();
+        return;
+    }
+  }
+
+  // Common specialized accessors for the set_reg() template.
+
+  // Commonly-used special cases.
+  template<typename T>
+  void set_lr(T value) {
+    set_reg(kLinkRegCode, value);
+  }
+
+  template<typename T>
+  void set_sp(T value) {
+    set_reg(31, value, LogRegWrites, Reg31IsStackPointer);
+  }
+
+  // FP register accessors.
+  // These are equivalent to the integer register accessors, but for FP
+  // registers.
+
+  // Basic accessor: Read the register as the specified type.
+  template<typename T>
+  T fpreg(unsigned code) const {
+    VIXL_STATIC_ASSERT((sizeof(T) == kSRegSizeInBytes) ||
+                       (sizeof(T) == kDRegSizeInBytes));
+    VIXL_ASSERT(code < kNumberOfFPRegisters);
+
+    return fpregisters_[code].Get<T>();
+  }
+
+  // Common specialized accessors for the fpreg() template.
+  float sreg(unsigned code) const {
+    return fpreg<float>(code);
+  }
+
+  uint32_t sreg_bits(unsigned code) const {
+    return fpreg<uint32_t>(code);
+  }
+
+  double dreg(unsigned code) const {
+    return fpreg<double>(code);
+  }
+
+  uint64_t dreg_bits(unsigned code) const {
+    return fpreg<uint64_t>(code);
+  }
+
+  // As above, with parameterized size and return type. The value is
+  // either zero-extended or truncated to fit, as required.
+  template<typename T>
+  T fpreg(unsigned size, unsigned code) const {
+    uint64_t raw;
+    switch (size) {
+      case kSRegSize: raw = fpreg<uint32_t>(code); break;
+      case kDRegSize: raw = fpreg<uint64_t>(code); break;
+      default:
+        VIXL_UNREACHABLE();
+        raw = 0;
+        break;
+    }
+
+    T result;
+    VIXL_STATIC_ASSERT(sizeof(result) <= sizeof(raw));
+    // Copy the result and truncate to fit. This assumes a little-endian host.
+    memcpy(&result, &raw, sizeof(result));
+    return result;
+  }
+
+  // Basic accessor: Write the specified value.
+  template<typename T>
+  void set_fpreg(unsigned code, T value,
+                RegLogMode log_mode = LogRegWrites) {
+    VIXL_STATIC_ASSERT((sizeof(value) == kSRegSizeInBytes) ||
+                       (sizeof(value) == kDRegSizeInBytes));
+    VIXL_ASSERT(code < kNumberOfFPRegisters);
+    fpregisters_[code].Set(value);
+
+    if (log_mode == LogRegWrites) {
+      if (sizeof(value) <= kSRegSizeInBytes) {
+        LogFPRegister(code, kPrintSRegValue);
+      } else {
+        LogFPRegister(code, kPrintDRegValue);
+      }
+    }
+  }
+
+  // Common specialized accessors for the set_fpreg() template.
+  void set_sreg(unsigned code, float value,
+                RegLogMode log_mode = LogRegWrites) {
+    set_fpreg(code, value, log_mode);
+  }
+
+  void set_sreg_bits(unsigned code, uint32_t value,
+                     RegLogMode log_mode = LogRegWrites) {
+    set_fpreg(code, value, log_mode);
+  }
+
+  void set_dreg(unsigned code, double value,
+                RegLogMode log_mode = LogRegWrites) {
+    set_fpreg(code, value, log_mode);
+  }
+
+  void set_dreg_bits(unsigned code, uint64_t value,
+                     RegLogMode log_mode = LogRegWrites) {
+    set_fpreg(code, value, log_mode);
+  }
+
+  bool N() const { return nzcv_.N() != 0; }
+  bool Z() const { return nzcv_.Z() != 0; }
+  bool C() const { return nzcv_.C() != 0; }
+  bool V() const { return nzcv_.V() != 0; }
+  SimSystemRegister& nzcv() { return nzcv_; }
+
+  // TODO(jbramley): Find a way to make the fpcr_ members return the proper
+  // types, so these accessors are not necessary.
+  FPRounding RMode() { return static_cast<FPRounding>(fpcr_.RMode()); }
+  bool DN() { return fpcr_.DN() != 0; }
+  SimSystemRegister& fpcr() { return fpcr_; }
+
+  // Print all registers of the specified types.
+  void PrintRegisters();
+  void PrintFPRegisters();
+  void PrintSystemRegisters();
+
+  // Like Print* (above), but respect trace_parameters().
+  void LogSystemRegisters() {
+    if (trace_parameters() & LOG_SYS_REGS) PrintSystemRegisters();
+  }
+  void LogRegisters() {
+    if (trace_parameters() & LOG_REGS) PrintRegisters();
+  }
+  void LogFPRegisters() {
+    if (trace_parameters() & LOG_FP_REGS) PrintFPRegisters();
+  }
+
+  // Specify relevant register sizes, for PrintFPRegister.
+  //
+  // These values are bit masks; they can be combined in case multiple views of
+  // a machine register are interesting.
+  enum PrintFPRegisterSizes {
+    kPrintDRegValue = 1 << kDRegSizeInBytes,
+    kPrintSRegValue = 1 << kSRegSizeInBytes,
+    kPrintAllFPRegValues = kPrintDRegValue | kPrintSRegValue
+  };
+
+  // Print individual register values (after update).
+  void PrintRegister(unsigned code, Reg31Mode r31mode = Reg31IsStackPointer);
+  void PrintFPRegister(unsigned code,
+                       PrintFPRegisterSizes sizes = kPrintAllFPRegValues);
+  void PrintSystemRegister(SystemRegister id);
+
+  // Like Print* (above), but respect trace_parameters().
+  void LogRegister(unsigned code, Reg31Mode r31mode = Reg31IsStackPointer) {
+    if (trace_parameters() & LOG_REGS) PrintRegister(code, r31mode);
+  }
+  void LogFPRegister(unsigned code,
+                     PrintFPRegisterSizes sizes = kPrintAllFPRegValues) {
+    if (trace_parameters() & LOG_FP_REGS) PrintFPRegister(code, sizes);
+  }
+  void LogSystemRegister(SystemRegister id) {
+    if (trace_parameters() & LOG_SYS_REGS) PrintSystemRegister(id);
+  }
+
+  // Print memory accesses.
+  void PrintRead(uintptr_t address, size_t size, unsigned reg_code);
+  void PrintReadFP(uintptr_t address, size_t size, unsigned reg_code);
+  void PrintWrite(uintptr_t address, size_t size, unsigned reg_code);
+  void PrintWriteFP(uintptr_t address, size_t size, unsigned reg_code);
+
+  // Like Print* (above), but respect trace_parameters().
+  void LogRead(uintptr_t address, size_t size, unsigned reg_code) {
+    if (trace_parameters() & LOG_REGS) PrintRead(address, size, reg_code);
+  }
+  void LogReadFP(uintptr_t address, size_t size, unsigned reg_code) {
+    if (trace_parameters() & LOG_FP_REGS) PrintReadFP(address, size, reg_code);
+  }
+  void LogWrite(uintptr_t address, size_t size, unsigned reg_code) {
+    if (trace_parameters() & LOG_WRITE) PrintWrite(address, size, reg_code);
+  }
+  void LogWriteFP(uintptr_t address, size_t size, unsigned reg_code) {
+    if (trace_parameters() & LOG_WRITE) PrintWriteFP(address, size, reg_code);
+  }
+
+  void DoUnreachable(const Instruction* instr);
+  void DoTrace(const Instruction* instr);
+  void DoLog(const Instruction* instr);
+
+  static const char* WRegNameForCode(unsigned code,
+                                     Reg31Mode mode = Reg31IsZeroRegister);
+  static const char* XRegNameForCode(unsigned code,
+                                     Reg31Mode mode = Reg31IsZeroRegister);
+  static const char* SRegNameForCode(unsigned code);
+  static const char* DRegNameForCode(unsigned code);
+  static const char* VRegNameForCode(unsigned code);
+
+  bool coloured_trace() const { return coloured_trace_; }
+  void set_coloured_trace(bool value);
+
+  int trace_parameters() const { return trace_parameters_; }
+  void set_trace_parameters(int parameters);
+
+  void set_instruction_stats(bool value);
+
+  // Clear the simulated local monitor to force the next store-exclusive
+  // instruction to fail.
+  void ClearLocalMonitor() {
+    local_monitor_.Clear();
+  }
+
+  void SilenceExclusiveAccessWarning() {
+    print_exclusive_access_warning_ = false;
+  }
+
+ protected:
+  const char* clr_normal;
+  const char* clr_flag_name;
+  const char* clr_flag_value;
+  const char* clr_reg_name;
+  const char* clr_reg_value;
+  const char* clr_fpreg_name;
+  const char* clr_fpreg_value;
+  const char* clr_memory_address;
+  const char* clr_warning;
+  const char* clr_warning_message;
+  const char* clr_printf;
+
+  // Simulation helpers ------------------------------------
+  bool ConditionPassed(Condition cond) {
+    switch (cond) {
+      case eq:
+        return Z();
+      case ne:
+        return !Z();
+      case hs:
+        return C();
+      case lo:
+        return !C();
+      case mi:
+        return N();
+      case pl:
+        return !N();
+      case vs:
+        return V();
+      case vc:
+        return !V();
+      case hi:
+        return C() && !Z();
+      case ls:
+        return !(C() && !Z());
+      case ge:
+        return N() == V();
+      case lt:
+        return N() != V();
+      case gt:
+        return !Z() && (N() == V());
+      case le:
+        return !(!Z() && (N() == V()));
+      case nv:  // Fall through.
+      case al:
+        return true;
+      default:
+        VIXL_UNREACHABLE();
+        return false;
+    }
+  }
+
+  bool ConditionPassed(Instr cond) {
+    return ConditionPassed(static_cast<Condition>(cond));
+  }
+
+  bool ConditionFailed(Condition cond) {
+    return !ConditionPassed(cond);
+  }
+
+  void AddSubHelper(const Instruction* instr, int64_t op2);
+  int64_t AddWithCarry(unsigned reg_size,
+                       bool set_flags,
+                       int64_t src1,
+                       int64_t src2,
+                       int64_t carry_in = 0);
+  void LogicalHelper(const Instruction* instr, int64_t op2);
+  void ConditionalCompareHelper(const Instruction* instr, int64_t op2);
+  void LoadStoreHelper(const Instruction* instr,
+                       int64_t offset,
+                       AddrMode addrmode);
+  void LoadStorePairHelper(const Instruction* instr, AddrMode addrmode);
+  uintptr_t AddressModeHelper(unsigned addr_reg,
+                              int64_t offset,
+                              AddrMode addrmode);
+
+  uint64_t AddressUntag(uint64_t address) {
+    return address & ~kAddressTagMask;
+  }
+
+  template <typename T>
+  T* AddressUntag(T* address) {
+    uintptr_t address_raw = reinterpret_cast<uintptr_t>(address);
+    return reinterpret_cast<T*>(AddressUntag(address_raw));
+  }
+
+  template <typename T, typename A>
+  T MemoryRead(A address) {
+    T value;
+    address = AddressUntag(address);
+    VIXL_ASSERT((sizeof(value) == 1) || (sizeof(value) == 2) ||
+                (sizeof(value) == 4) || (sizeof(value) == 8));
+    memcpy(&value, reinterpret_cast<const char *>(address), sizeof(value));
+    return value;
+  }
+
+  template <typename T, typename A>
+  void MemoryWrite(A address, T value) {
+    address = AddressUntag(address);
+    VIXL_ASSERT((sizeof(value) == 1) || (sizeof(value) == 2) ||
+                (sizeof(value) == 4) || (sizeof(value) == 8));
+    memcpy(reinterpret_cast<char *>(address), &value, sizeof(value));
+  }
+
+  int64_t ShiftOperand(unsigned reg_size,
+                       int64_t value,
+                       Shift shift_type,
+                       unsigned amount);
+  int64_t Rotate(unsigned reg_width,
+                 int64_t value,
+                 Shift shift_type,
+                 unsigned amount);
+  int64_t ExtendValue(unsigned reg_width,
+                      int64_t value,
+                      Extend extend_type,
+                      unsigned left_shift = 0);
+
+  enum ReverseByteMode {
+    Reverse16 = 0,
+    Reverse32 = 1,
+    Reverse64 = 2
+  };
+  uint64_t ReverseBytes(uint64_t value, ReverseByteMode mode);
+  uint64_t ReverseBits(uint64_t value, unsigned num_bits);
+
+  template <typename T>
+  T FPDefaultNaN() const;
+
+  void FPCompare(double val0, double val1);
+  double FPRoundInt(double value, FPRounding round_mode);
+  double FPToDouble(float value);
+  float FPToFloat(double value, FPRounding round_mode);
+  double FixedToDouble(int64_t src, int fbits, FPRounding round_mode);
+  double UFixedToDouble(uint64_t src, int fbits, FPRounding round_mode);
+  float FixedToFloat(int64_t src, int fbits, FPRounding round_mode);
+  float UFixedToFloat(uint64_t src, int fbits, FPRounding round_mode);
+  int32_t FPToInt32(double value, FPRounding rmode);
+  int64_t FPToInt64(double value, FPRounding rmode);
+  uint32_t FPToUInt32(double value, FPRounding rmode);
+  uint64_t FPToUInt64(double value, FPRounding rmode);
+
+  template <typename T>
+  T FPAdd(T op1, T op2);
+
+  template <typename T>
+  T FPDiv(T op1, T op2);
+
+  template <typename T>
+  T FPMax(T a, T b);
+
+  template <typename T>
+  T FPMaxNM(T a, T b);
+
+  template <typename T>
+  T FPMin(T a, T b);
+
+  template <typename T>
+  T FPMinNM(T a, T b);
+
+  template <typename T>
+  T FPMul(T op1, T op2);
+
+  template <typename T>
+  T FPMulAdd(T a, T op1, T op2);
+
+  template <typename T>
+  T FPSqrt(T op);
+
+  template <typename T>
+  T FPSub(T op1, T op2);
+
+  // This doesn't do anything at the moment. We'll need it if we want support
+  // for cumulative exception bits or floating-point exceptions.
+  void FPProcessException() { }
+
+  // Standard NaN processing.
+  template <typename T>
+  T FPProcessNaN(T op);
+
+  bool FPProcessNaNs(const Instruction* instr);
+
+  template <typename T>
+  T FPProcessNaNs(T op1, T op2);
+
+  template <typename T>
+  T FPProcessNaNs3(T op1, T op2, T op3);
+
+  // Pseudo Printf instruction
+  void DoPrintf(const Instruction* instr);
+
+  // Processor state ---------------------------------------
+
+  // Simulated monitors for exclusive access instructions.
+  SimExclusiveLocalMonitor local_monitor_;
+  SimExclusiveGlobalMonitor global_monitor_;
+
+  // Output stream.
+  FILE* stream_;
+  PrintDisassembler* print_disasm_;
+
+  // Instruction statistics instrumentation.
+  Instrument* instrumentation_;
+
+  // General purpose registers. Register 31 is the stack pointer.
+  SimRegister registers_[kNumberOfRegisters];
+
+  // Floating point registers
+  SimFPRegister fpregisters_[kNumberOfFPRegisters];
+
+  // Program Status Register.
+  // bits[31, 27]: Condition flags N, Z, C, and V.
+  //               (Negative, Zero, Carry, Overflow)
+  SimSystemRegister nzcv_;
+
+  // Floating-Point Control Register
+  SimSystemRegister fpcr_;
+
+  // Only a subset of FPCR features are supported by the simulator. This helper
+  // checks that the FPCR settings are supported.
+  //
+  // This is checked when floating-point instructions are executed, not when
+  // FPCR is set. This allows generated code to modify FPCR for external
+  // functions, or to save and restore it when entering and leaving generated
+  // code.
+  void AssertSupportedFPCR() {
+    VIXL_ASSERT(fpcr().FZ() == 0);             // No flush-to-zero support.
+    VIXL_ASSERT(fpcr().RMode() == FPTieEven);  // Ties-to-even rounding only.
+
+    // The simulator does not support half-precision operations so fpcr().AHP()
+    // is irrelevant, and is not checked here.
+  }
+
+  static int CalcNFlag(uint64_t result, unsigned reg_size) {
+    return (result >> (reg_size - 1)) & 1;
+  }
+
+  static int CalcZFlag(uint64_t result) {
+    return result == 0;
+  }
+
+  static const uint32_t kConditionFlagsMask = 0xf0000000;
+
+  // Stack
+  byte* stack_;
+  static const int stack_protection_size_ = 256;
+  // 2 KB stack.
+  static const int stack_size_ = 2 * 1024 + 2 * stack_protection_size_;
+  byte* stack_limit_;
+
+  Decoder* decoder_;
+  // Indicates if the pc has been modified by the instruction and should not be
+  // automatically incremented.
+  bool pc_modified_;
+  const Instruction* pc_;
+  const Instruction* resume_pc_;
+
+  static const char* xreg_names[];
+  static const char* wreg_names[];
+  static const char* sreg_names[];
+  static const char* dreg_names[];
+  static const char* vreg_names[];
+
+  static const Instruction* kEndOfSimAddress;
+
+ private:
+  bool coloured_trace_;
+
+  // A set of TraceParameters flags.
+  int trace_parameters_;
+
+  // Indicates whether the instruction instrumentation is active.
+  bool instruction_stats_;
+
+  // Indicates whether the exclusive-access warning has been printed.
+  bool print_exclusive_access_warning_;
+  void PrintExclusiveAccessWarning();
+
+ protected:
+  // Moz: Synchronizes access between main thread and compilation threads.
+  PRLock* lock_;
+#ifdef DEBUG
+  PRThread* lockOwner_;
+#endif
+  Redirection* redirection_;
+  mozilla::Vector<int64_t, 0, js::SystemAllocPolicy> spStack_;
+};
+}  // namespace vixl
+
+#endif  // VIXL_A64_SIMULATOR_A64_H_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Utils-vixl.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Utils-vixl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Utils-vixl.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Utils-vixl.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,114 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#include "jit/arm64/vixl/Utils-vixl.h"
+
+#include "mozilla/MathAlgorithms.h"
+
+#include <stdio.h>
+
+namespace vixl {
+
+uint32_t
+float_to_rawbits(float value)
+{
+    uint32_t bits = 0;
+    memcpy(&bits, &value, 4);
+    return bits;
+}
+
+
+uint64_t
+double_to_rawbits(double value)
+{
+    uint64_t bits = 0;
+    memcpy(&bits, &value, 8);
+    return bits;
+}
+
+float
+rawbits_to_float(uint32_t bits)
+{
+    float value = 0.0;
+    memcpy(&value, &bits, 4);
+    return value;
+}
+
+double
+rawbits_to_double(uint64_t bits)
+{
+    double value = 0.0;
+    memcpy(&value, &bits, 8);
+    return value;
+}
+
+int
+CountLeadingZeros(uint64_t value, int width)
+{
+    MOZ_ASSERT((width == 32) || (width == 64));
+    int count = 0;
+    uint64_t bit_test = UINT64_C(1) << (width - 1);
+    while ((count < width) && ((bit_test & value) == 0)) {
+        count++;
+        bit_test >>= 1;
+    }
+    return count;
+}
+
+int
+CountLeadingSignBits(int64_t value, int width)
+{
+    MOZ_ASSERT((width == 32) || (width == 64));
+    if (value >= 0)
+        return CountLeadingZeros(value, width) - 1;
+    return CountLeadingZeros(~value, width) - 1;
+}
+
+int
+CountTrailingZeros(uint64_t value, int width)
+{
+    MOZ_ASSERT((width == 32) || (width == 64));
+    int count = 0;
+    while ((count < width) && (((value >> count) & 1) == 0))
+        count++;
+    return count;
+}
+
+int
+CountSetBits(uint64_t value, int width)
+{
+    MOZ_ASSERT((width == 32) || (width == 64));
+
+    if (width == 32)
+        return mozilla::CountPopulation32(uint32_t(value));
+    return mozilla::CountPopulation64(value);
+}
+
+uint64_t LowestSetBit(uint64_t value) {
+  return value & -value;
+}
+
+} // namespace vixl
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Utils-vixl.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Utils-vixl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/arm64/vixl/Utils-vixl.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/arm64/vixl/Utils-vixl.h	2015-05-25 20:43:22.000000000 +0000
@@ -0,0 +1,199 @@
+// Copyright 2013, ARM Limited
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of ARM Limited nor the names of its contributors may be
+//     used to endorse or promote products derived from this software without
+//     specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+
+#ifndef VIXL_UTILS_H
+#define VIXL_UTILS_H
+
+#include "mozilla/FloatingPoint.h"
+
+#include "jit/arm64/vixl/Globals-vixl.h"
+
+namespace vixl {
+
+// Macros for compile-time format checking.
+#if defined(__GNUC__)
+#define PRINTF_CHECK(format_index, varargs_index) \
+  __attribute__((format(printf, format_index, varargs_index)))
+#else
+#define PRINTF_CHECK(format_index, varargs_index)
+#endif
+
+// Check number width.
+inline bool is_intn(unsigned n, int64_t x) {
+  VIXL_ASSERT((0 < n) && (n < 64));
+  int64_t limit = INT64_C(1) << (n - 1);
+  return (-limit <= x) && (x < limit);
+}
+
+inline bool is_uintn(unsigned n, int64_t x) {
+  VIXL_ASSERT((0 < n) && (n < 64));
+  return !(x >> n);
+}
+
+inline unsigned truncate_to_intn(unsigned n, int64_t x) {
+  VIXL_ASSERT((0 < n) && (n < 64));
+  return (x & ((INT64_C(1) << n) - 1));
+}
+
+#define INT_1_TO_63_LIST(V)                                                    \
+V(1)  V(2)  V(3)  V(4)  V(5)  V(6)  V(7)  V(8)                                 \
+V(9)  V(10) V(11) V(12) V(13) V(14) V(15) V(16)                                \
+V(17) V(18) V(19) V(20) V(21) V(22) V(23) V(24)                                \
+V(25) V(26) V(27) V(28) V(29) V(30) V(31) V(32)                                \
+V(33) V(34) V(35) V(36) V(37) V(38) V(39) V(40)                                \
+V(41) V(42) V(43) V(44) V(45) V(46) V(47) V(48)                                \
+V(49) V(50) V(51) V(52) V(53) V(54) V(55) V(56)                                \
+V(57) V(58) V(59) V(60) V(61) V(62) V(63)
+
+#define DECLARE_IS_INT_N(N)                                                    \
+inline bool is_int##N(int64_t x) { return is_intn(N, x); }
+#define DECLARE_IS_UINT_N(N)                                                   \
+inline bool is_uint##N(int64_t x) { return is_uintn(N, x); }
+#define DECLARE_TRUNCATE_TO_INT_N(N)                                           \
+inline int truncate_to_int##N(int x) { return truncate_to_intn(N, x); }
+INT_1_TO_63_LIST(DECLARE_IS_INT_N)
+INT_1_TO_63_LIST(DECLARE_IS_UINT_N)
+INT_1_TO_63_LIST(DECLARE_TRUNCATE_TO_INT_N)
+#undef DECLARE_IS_INT_N
+#undef DECLARE_IS_UINT_N
+#undef DECLARE_TRUNCATE_TO_INT_N
+
+// Bit field extraction.
+inline uint32_t unsigned_bitextract_32(int msb, int lsb, uint32_t x) {
+  return (x >> lsb) & ((1 << (1 + msb - lsb)) - 1);
+}
+
+inline uint64_t unsigned_bitextract_64(int msb, int lsb, uint64_t x) {
+  return (x >> lsb) & ((static_cast<uint64_t>(1) << (1 + msb - lsb)) - 1);
+}
+
+inline int32_t signed_bitextract_32(int msb, int lsb, int32_t x) {
+  return (x << (31 - msb)) >> (lsb + 31 - msb);
+}
+
+inline int64_t signed_bitextract_64(int msb, int lsb, int64_t x) {
+  return (x << (63 - msb)) >> (lsb + 63 - msb);
+}
+
+// Floating point representation.
+uint32_t float_to_rawbits(float value);
+uint64_t double_to_rawbits(double value);
+float rawbits_to_float(uint32_t bits);
+double rawbits_to_double(uint64_t bits);
+
+// NaN tests.
+inline bool IsSignallingNaN(double num) {
+  const uint64_t kFP64QuietNaNMask = UINT64_C(0x0008000000000000);
+  uint64_t raw = double_to_rawbits(num);
+  if (mozilla::IsNaN(num) && ((raw & kFP64QuietNaNMask) == 0))
+    return true;
+  return false;
+}
+
+inline bool IsSignallingNaN(float num) {
+  const uint32_t kFP32QuietNaNMask = 0x00400000;
+  uint32_t raw = float_to_rawbits(num);
+  if (mozilla::IsNaN(num) && ((raw & kFP32QuietNaNMask) == 0))
+    return true;
+  return false;
+}
+
+template <typename T>
+inline bool IsQuietNaN(T num) {
+  return mozilla::IsNaN(num) && !IsSignallingNaN(num);
+}
+
+// Convert the NaN in 'num' to a quiet NaN.
+inline double ToQuietNaN(double num) {
+  const uint64_t kFP64QuietNaNMask = UINT64_C(0x0008000000000000);
+  VIXL_ASSERT(mozilla::IsNaN(num));
+  return rawbits_to_double(double_to_rawbits(num) | kFP64QuietNaNMask);
+}
+
+inline float ToQuietNaN(float num) {
+  const uint32_t kFP32QuietNaNMask = 0x00400000;
+  VIXL_ASSERT(mozilla::IsNaN(num));
+  return rawbits_to_float(float_to_rawbits(num) | kFP32QuietNaNMask);
+}
+
+// Fused multiply-add.
+inline double FusedMultiplyAdd(double op1, double op2, double a) {
+  return fma(op1, op2, a);
+}
+
+inline float FusedMultiplyAdd(float op1, float op2, float a) {
+  return fmaf(op1, op2, a);
+}
+
+// Bit counting.
+int CountLeadingZeros(uint64_t value, int width);
+int CountLeadingSignBits(int64_t value, int width);
+int CountTrailingZeros(uint64_t value, int width);
+int CountSetBits(uint64_t value, int width);
+uint64_t LowestSetBit(uint64_t value);
+
+// Pointer alignment
+// TODO: rename/refactor to make it specific to instructions.
+template<typename T>
+bool IsWordAligned(T pointer) {
+  VIXL_ASSERT(sizeof(pointer) == sizeof(intptr_t));   // NOLINT(runtime/sizeof)
+  return (reinterpret_cast<intptr_t>(pointer) & 3) == 0;
+}
+
+// Increment a pointer until it has the specified alignment.
+template<class T>
+T AlignUp(T pointer, size_t alignment) {
+  // Use C-style casts to get static_cast behaviour for integral types (T), and
+  // reinterpret_cast behaviour for other types.
+
+  uintptr_t pointer_raw = (uintptr_t)pointer;
+  JS_STATIC_ASSERT(sizeof(pointer) == sizeof(pointer_raw));
+
+  size_t align_step = (alignment - pointer_raw) % alignment;
+  VIXL_ASSERT((pointer_raw + align_step) % alignment == 0);
+
+  return (T)(pointer_raw + align_step);
+}
+
+// Decrement a pointer until it has the specified alignment.
+template<class T>
+T AlignDown(T pointer, size_t alignment) {
+  // Use C-style casts to get static_cast behaviour for integral types (T), and
+  // reinterpret_cast behaviour for other types.
+
+  uintptr_t pointer_raw = (uintptr_t)pointer;
+  JS_STATIC_ASSERT(sizeof(pointer) == sizeof(pointer_raw));
+
+  size_t align_step = pointer_raw % alignment;
+  VIXL_ASSERT((pointer_raw - align_step) % alignment == 0);
+
+  return (T)(pointer_raw - align_step);
+}
+
+}  // namespace vixl
+
+#endif  // VIXL_UTILS_H
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/BacktrackingAllocator.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/BacktrackingAllocator.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/BacktrackingAllocator.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/BacktrackingAllocator.cpp	2015-05-25 20:43:20.000000000 +0000
@@ -12,9 +12,398 @@
 
 using mozilla::DebugOnly;
 
+/////////////////////////////////////////////////////////////////////
+// Utility
+/////////////////////////////////////////////////////////////////////
+
+static inline bool
+SortBefore(UsePosition* a, UsePosition* b)
+{
+    return a->pos <= b->pos;
+}
+
+static inline bool
+SortBefore(LiveRange::BundleLink* a, LiveRange::BundleLink* b)
+{
+    LiveRange* rangea = LiveRange::get(a);
+    LiveRange* rangeb = LiveRange::get(b);
+    MOZ_ASSERT(!rangea->intersects(rangeb));
+    return rangea->from() < rangeb->from();
+}
+
+static inline bool
+SortBefore(LiveRange::RegisterLink* a, LiveRange::RegisterLink* b)
+{
+    return LiveRange::get(a)->from() <= LiveRange::get(b)->from();
+}
+
+template <typename T>
+static inline void
+InsertSortedList(InlineForwardList<T> &list, T* value)
+{
+    if (list.empty()) {
+        list.pushFront(value);
+        return;
+    }
+
+    if (SortBefore(list.back(), value)) {
+        list.pushBack(value);
+        return;
+    }
+
+    T* prev = nullptr;
+    for (InlineForwardListIterator<T> iter = list.begin(); iter; iter++) {
+        if (SortBefore(value, *iter))
+            break;
+        prev = *iter;
+    }
+
+    if (prev)
+        list.insertAfter(prev, value);
+    else
+        list.pushFront(value);
+}
+
+/////////////////////////////////////////////////////////////////////
+// LiveRange
+/////////////////////////////////////////////////////////////////////
+
+void
+LiveRange::addUse(UsePosition* use)
+{
+    MOZ_ASSERT(covers(use->pos));
+    InsertSortedList(uses_, use);
+}
+
+void
+LiveRange::distributeUses(LiveRange* other)
+{
+    MOZ_ASSERT(other->vreg() == vreg());
+    MOZ_ASSERT(this != other);
+
+    // Move over all uses which fit in |other|'s boundaries.
+    for (UsePositionIterator iter = usesBegin(); iter; ) {
+        UsePosition* use = *iter;
+        if (other->covers(use->pos)) {
+            uses_.removeAndIncrement(iter);
+            other->addUse(use);
+        } else {
+            iter++;
+        }
+    }
+
+    // Distribute the definition to |other| as well, if possible.
+    if (hasDefinition() && from() == other->from())
+        other->setHasDefinition();
+}
+
+bool
+LiveRange::contains(LiveRange* other) const
+{
+    return from() <= other->from() && to() >= other->to();
+}
+
+void
+LiveRange::intersect(LiveRange* other, Range* pre, Range* inside, Range* post) const
+{
+    MOZ_ASSERT(pre->empty() && inside->empty() && post->empty());
+
+    CodePosition innerFrom = from();
+    if (from() < other->from()) {
+        if (to() < other->from()) {
+            *pre = range_;
+            return;
+        }
+        *pre = Range(from(), other->from());
+        innerFrom = other->from();
+    }
+
+    CodePosition innerTo = to();
+    if (to() > other->to()) {
+        if (from() >= other->to()) {
+            *post = range_;
+            return;
+        }
+        *post = Range(other->to(), to());
+        innerTo = other->to();
+    }
+
+    if (innerFrom != innerTo)
+        *inside = Range(innerFrom, innerTo);
+}
+
+bool
+LiveRange::intersects(LiveRange* other) const
+{
+    Range pre, inside, post;
+    intersect(other, &pre, &inside, &post);
+    return !inside.empty();
+}
+
+/////////////////////////////////////////////////////////////////////
+// SpillSet
+/////////////////////////////////////////////////////////////////////
+
+void
+SpillSet::setAllocation(LAllocation alloc)
+{
+    for (size_t i = 0; i < numSpilledBundles(); i++)
+        spilledBundle(i)->setAllocation(alloc);
+}
+
+/////////////////////////////////////////////////////////////////////
+// LiveBundle
+/////////////////////////////////////////////////////////////////////
+
+#ifdef DEBUG
+size_t
+LiveBundle::numRanges() const
+{
+    size_t count = 0;
+    for (LiveRange::BundleLinkIterator iter = rangesBegin(); iter; iter++)
+        count++;
+    return count;
+}
+#endif // DEBUG
+
+LiveRange*
+LiveBundle::rangeFor(CodePosition pos) const
+{
+    for (LiveRange::BundleLinkIterator iter = rangesBegin(); iter; iter++) {
+        LiveRange* range = LiveRange::get(*iter);
+        if (range->covers(pos))
+            return range;
+    }
+    return nullptr;
+}
+
+void
+LiveBundle::addRange(LiveRange* range)
+{
+    MOZ_ASSERT(!range->bundle());
+    range->setBundle(this);
+    InsertSortedList(ranges_, &range->bundleLink);
+}
+
+bool
+LiveBundle::addRange(TempAllocator& alloc, uint32_t vreg, CodePosition from, CodePosition to)
+{
+    LiveRange* range = LiveRange::New(alloc, vreg, from, to);
+    if (!range)
+        return false;
+    addRange(range);
+    return true;
+}
+
+bool
+LiveBundle::addRangeAndDistributeUses(TempAllocator& alloc, LiveRange* oldRange,
+                                      CodePosition from, CodePosition to)
+{
+    LiveRange* range = LiveRange::New(alloc, oldRange->vreg(), from, to);
+    if (!range)
+        return false;
+    addRange(range);
+    oldRange->distributeUses(range);
+    return true;
+}
+
+LiveRange*
+LiveBundle::popFirstRange()
+{
+    LiveRange::BundleLinkIterator iter = rangesBegin();
+    if (!iter)
+        return nullptr;
+
+    LiveRange* range = LiveRange::get(*iter);
+    ranges_.removeAt(iter);
+
+    range->setBundle(nullptr);
+    return range;
+}
+
+void
+LiveBundle::removeRange(LiveRange* range)
+{
+    for (LiveRange::BundleLinkIterator iter = rangesBegin(); iter; iter++) {
+        LiveRange* existing = LiveRange::get(*iter);
+        if (existing == range) {
+            ranges_.removeAt(iter);
+            return;
+        }
+    }
+    MOZ_CRASH();
+}
+
+/////////////////////////////////////////////////////////////////////
+// VirtualRegister
+/////////////////////////////////////////////////////////////////////
+
+bool
+VirtualRegister::addInitialRange(TempAllocator& alloc, CodePosition from, CodePosition to)
+{
+    MOZ_ASSERT(from < to);
+
+    // Mark [from,to) as a live range for this register during the initial
+    // liveness analysis, coalescing with any existing overlapping ranges.
+
+    LiveRange* prev = nullptr;
+    LiveRange* merged = nullptr;
+    for (LiveRange::RegisterLinkIterator iter(rangesBegin()); iter; ) {
+        LiveRange* existing = LiveRange::get(*iter);
+
+        if (from > existing->to()) {
+            // The new range should go after this one.
+            prev = existing;
+            iter++;
+            continue;
+        }
+
+        if (to.next() < existing->from()) {
+            // The new range should go before this one.
+            break;
+        }
+
+        if (!merged) {
+            // This is the first old range we've found that overlaps the new
+            // range. Extend this one to cover its union with the new range.
+            merged = existing;
+
+            if (from < existing->from())
+                existing->setFrom(from);
+            if (to > existing->to())
+                existing->setTo(to);
+
+            // Continue searching to see if any other old ranges can be
+            // coalesced with the new merged range.
+            iter++;
+            continue;
+        }
+
+        // Coalesce this range into the previous range we merged into.
+        MOZ_ASSERT(existing->from() >= merged->from());
+        if (existing->to() > merged->to())
+            merged->setTo(existing->to());
+
+        MOZ_ASSERT(!existing->hasDefinition());
+        existing->distributeUses(merged);
+        MOZ_ASSERT(!existing->hasUses());
+
+        ranges_.removeAndIncrement(iter);
+    }
+
+    if (!merged) {
+        // The new range does not overlap any existing range for the vreg.
+        LiveRange* range = LiveRange::New(alloc, vreg(), from, to);
+        if (!range)
+            return false;
+
+        if (prev)
+            ranges_.insertAfter(&prev->registerLink, &range->registerLink);
+        else
+            ranges_.pushFront(&range->registerLink);
+    }
+
+    return true;
+}
+
+void
+VirtualRegister::addInitialUse(UsePosition* use)
+{
+    LiveRange::get(*rangesBegin())->addUse(use);
+}
+
+void
+VirtualRegister::setInitialDefinition(CodePosition from)
+{
+    LiveRange* first = LiveRange::get(*rangesBegin());
+    MOZ_ASSERT(from >= first->from());
+    first->setFrom(from);
+    first->setHasDefinition();
+}
+
+LiveRange*
+VirtualRegister::rangeFor(CodePosition pos) const
+{
+    for (LiveRange::RegisterLinkIterator iter = rangesBegin(); iter; iter++) {
+        LiveRange* range = LiveRange::get(*iter);
+        if (range->covers(pos))
+            return range;
+    }
+    return nullptr;
+}
+
+void
+VirtualRegister::addRange(LiveRange* range)
+{
+    InsertSortedList(ranges_, &range->registerLink);
+}
+
+void
+VirtualRegister::removeRange(LiveRange* range)
+{
+    for (LiveRange::RegisterLinkIterator iter = rangesBegin(); iter; iter++) {
+        LiveRange* existing = LiveRange::get(*iter);
+        if (existing == range) {
+            ranges_.removeAt(iter);
+            return;
+        }
+    }
+    MOZ_CRASH();
+}
+
+/////////////////////////////////////////////////////////////////////
+// BacktrackingAllocator
+/////////////////////////////////////////////////////////////////////
+
+// This function pre-allocates and initializes as much global state as possible
+// to avoid littering the algorithms with memory management cruft.
 bool
 BacktrackingAllocator::init()
 {
+    if (!RegisterAllocator::init())
+        return false;
+
+    liveIn = mir->allocate<BitSet>(graph.numBlockIds());
+    if (!liveIn)
+        return false;
+
+    callRanges = LiveBundle::New(alloc(), nullptr, nullptr);
+
+    size_t numVregs = graph.numVirtualRegisters();
+    if (!vregs.init(mir->alloc(), numVregs))
+        return false;
+    memset(&vregs[0], 0, sizeof(VirtualRegister) * numVregs);
+    for (uint32_t i = 0; i < numVregs; i++)
+        new(&vregs[i]) VirtualRegister();
+
+    // Build virtual register objects.
+    for (size_t i = 0; i < graph.numBlocks(); i++) {
+        if (mir->shouldCancel("Create data structures (main loop)"))
+            return false;
+
+        LBlock* block = graph.getBlock(i);
+        for (LInstructionIterator ins = block->begin(); ins != block->end(); ins++) {
+            for (size_t j = 0; j < ins->numDefs(); j++) {
+                LDefinition* def = ins->getDef(j);
+                if (def->isBogusTemp())
+                    continue;
+                vreg(def).init(*ins, def, /* isTemp = */ false);
+            }
+
+            for (size_t j = 0; j < ins->numTemps(); j++) {
+                LDefinition* def = ins->getTemp(j);
+                if (def->isBogusTemp())
+                    continue;
+                vreg(def).init(*ins, def, /* isTemp = */ true);
+            }
+        }
+        for (size_t j = 0; j < block->numPhis(); j++) {
+            LPhi* phi = block->getPhi(j);
+            LDefinition* def = phi->getDef(0);
+            vreg(def).init(phi, def, /* isTemp = */ false);
+        }
+    }
+
     LiveRegisterSet remainingRegisters(allRegisters_.asLiveSet());
     while (!remainingRegisters.emptyGeneral()) {
         AnyRegister reg = AnyRegister(remainingRegisters.takeAnyGeneral());
@@ -29,13 +418,6 @@
     for (size_t i = 0; i < AnyRegister::Total; i++) {
         registers[i].reg = AnyRegister::FromCode(i);
         registers[i].allocations.setAllocator(lifoAlloc);
-
-        LiveInterval* fixed = fixedIntervals[i];
-        for (size_t j = 0; j < fixed->numRanges(); j++) {
-            AllocatedRange range(fixed, fixed->getRange(j));
-            if (!registers[i].allocations.insert(range))
-                return false;
-        }
     }
 
     hotcode.setAllocator(lifoAlloc);
@@ -45,8 +427,6 @@
     // crapshoot, so just mark the bodies of inner loops as hot and everything
     // else as cold.
 
-    LiveInterval* hotcodeInterval = LiveInterval::New(alloc(), 0);
-
     LBlock* backedge = nullptr;
     for (size_t i = 0; i < graph.numBlocks(); i++) {
         LBlock* block = graph.getBlock(i);
@@ -57,21 +437,353 @@
         if (block->mir()->isLoopHeader())
             backedge = block->mir()->backedge()->lir();
 
-        if (block == backedge) {
-            LBlock* header = block->mir()->loopHeaderOfBackedge()->lir();
-            CodePosition from = entryOf(header);
-            CodePosition to = exitOf(block).next();
-            if (!hotcodeInterval->addRange(from, to))
-                return false;
+        if (block == backedge) {
+            LBlock* header = block->mir()->loopHeaderOfBackedge()->lir();
+            LiveRange* range = LiveRange::New(alloc(), 0, entryOf(header), exitOf(block).next());
+            if (!range || !hotcode.insert(range))
+                return false;
+        }
+    }
+
+    return true;
+}
+
+bool
+BacktrackingAllocator::addInitialFixedRange(AnyRegister reg, CodePosition from, CodePosition to)
+{
+    LiveRange* range = LiveRange::New(alloc(), 0, from, to);
+    return range && registers[reg.code()].allocations.insert(range);
+}
+
+#ifdef DEBUG
+// Returns true iff ins has a def/temp reusing the input allocation.
+static bool
+IsInputReused(LInstruction* ins, LUse* use)
+{
+    for (size_t i = 0; i < ins->numDefs(); i++) {
+        if (ins->getDef(i)->policy() == LDefinition::MUST_REUSE_INPUT &&
+            ins->getOperand(ins->getDef(i)->getReusedInput())->toUse() == use)
+        {
+            return true;
+        }
+    }
+
+    for (size_t i = 0; i < ins->numTemps(); i++) {
+        if (ins->getTemp(i)->policy() == LDefinition::MUST_REUSE_INPUT &&
+            ins->getOperand(ins->getTemp(i)->getReusedInput())->toUse() == use)
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+#endif
+
+/*
+ * This function builds up liveness ranges for all virtual registers
+ * defined in the function. Additionally, it populates the liveIn array with
+ * information about which registers are live at the beginning of a block, to
+ * aid resolution and reification in a later phase.
+ *
+ * The algorithm is based on the one published in:
+ *
+ * Wimmer, Christian, and Michael Franz. "Linear Scan Register Allocation on
+ *     SSA Form." Proceedings of the International Symposium on Code Generation
+ *     and Optimization. Toronto, Ontario, Canada, ACM. 2010. 170-79. PDF.
+ *
+ * The algorithm operates on blocks ordered such that dominators of a block
+ * are before the block itself, and such that all blocks of a loop are
+ * contiguous. It proceeds backwards over the instructions in this order,
+ * marking registers live at their uses, ending their live ranges at
+ * definitions, and recording which registers are live at the top of every
+ * block. To deal with loop backedges, registers live at the beginning of
+ * a loop gain a range covering the entire loop.
+ */
+bool
+BacktrackingAllocator::buildLivenessInfo()
+{
+    JitSpew(JitSpew_RegAlloc, "Beginning liveness analysis");
+
+    Vector<MBasicBlock*, 1, SystemAllocPolicy> loopWorkList;
+    BitSet loopDone(graph.numBlockIds());
+    if (!loopDone.init(alloc()))
+        return false;
+
+    for (size_t i = graph.numBlocks(); i > 0; i--) {
+        if (mir->shouldCancel("Build Liveness Info (main loop)"))
+            return false;
+
+        LBlock* block = graph.getBlock(i - 1);
+        MBasicBlock* mblock = block->mir();
+
+        BitSet& live = liveIn[mblock->id()];
+        new (&live) BitSet(graph.numVirtualRegisters());
+        if (!live.init(alloc()))
+            return false;
+
+        // Propagate liveIn from our successors to us.
+        for (size_t i = 0; i < mblock->lastIns()->numSuccessors(); i++) {
+            MBasicBlock* successor = mblock->lastIns()->getSuccessor(i);
+            // Skip backedges, as we fix them up at the loop header.
+            if (mblock->id() < successor->id())
+                live.insertAll(liveIn[successor->id()]);
+        }
+
+        // Add successor phis.
+        if (mblock->successorWithPhis()) {
+            LBlock* phiSuccessor = mblock->successorWithPhis()->lir();
+            for (unsigned int j = 0; j < phiSuccessor->numPhis(); j++) {
+                LPhi* phi = phiSuccessor->getPhi(j);
+                LAllocation* use = phi->getOperand(mblock->positionInPhiSuccessor());
+                uint32_t reg = use->toUse()->virtualRegister();
+                live.insert(reg);
+            }
+        }
+
+        // Registers are assumed alive for the entire block, a define shortens
+        // the range to the point of definition.
+        for (BitSet::Iterator liveRegId(live); liveRegId; ++liveRegId) {
+            if (!vregs[*liveRegId].addInitialRange(alloc(), entryOf(block), exitOf(block).next()))
+                return false;
+        }
+
+        // Shorten the front end of ranges for live variables to their point of
+        // definition, if found.
+        for (LInstructionReverseIterator ins = block->rbegin(); ins != block->rend(); ins++) {
+            // Calls may clobber registers, so force a spill and reload around the callsite.
+            if (ins->isCall()) {
+                for (AnyRegisterIterator iter(allRegisters_.asLiveSet()); iter.more(); iter++) {
+                    bool found = false;
+                    for (size_t i = 0; i < ins->numDefs(); i++) {
+                        if (ins->getDef(i)->isFixed() &&
+                            ins->getDef(i)->output()->aliases(LAllocation(*iter))) {
+                            found = true;
+                            break;
+                        }
+                    }
+                    if (!found) {
+                        if (!addInitialFixedRange(*iter, outputOf(*ins), outputOf(*ins).next()))
+                            return false;
+                    }
+                }
+                if (!callRanges->addRange(alloc(), 0, outputOf(*ins), outputOf(*ins).next()))
+                    return false;
+            }
+            DebugOnly<bool> hasDoubleDef = false;
+            DebugOnly<bool> hasFloat32Def = false;
+            for (size_t i = 0; i < ins->numDefs(); i++) {
+                LDefinition* def = ins->getDef(i);
+                if (def->isBogusTemp())
+                    continue;
+#ifdef DEBUG
+                if (def->type() == LDefinition::DOUBLE)
+                    hasDoubleDef = true;
+                if (def->type() == LDefinition::FLOAT32)
+                    hasFloat32Def = true;
+#endif
+                CodePosition from = outputOf(*ins);
+
+                if (def->policy() == LDefinition::MUST_REUSE_INPUT) {
+                    // MUST_REUSE_INPUT is implemented by allocating an output
+                    // register and moving the input to it. Register hints are
+                    // used to avoid unnecessary moves. We give the input an
+                    // LUse::ANY policy to avoid allocating a register for the
+                    // input.
+                    LUse* inputUse = ins->getOperand(def->getReusedInput())->toUse();
+                    MOZ_ASSERT(inputUse->policy() == LUse::REGISTER);
+                    MOZ_ASSERT(inputUse->usedAtStart());
+                    *inputUse = LUse(inputUse->virtualRegister(), LUse::ANY, /* usedAtStart = */ true);
+                }
+
+                if (!vreg(def).addInitialRange(alloc(), from, from.next()))
+                    return false;
+                vreg(def).setInitialDefinition(from);
+                live.remove(def->virtualRegister());
+            }
+
+            for (size_t i = 0; i < ins->numTemps(); i++) {
+                LDefinition* temp = ins->getTemp(i);
+                if (temp->isBogusTemp())
+                    continue;
+
+                // Normally temps are considered to cover both the input
+                // and output of the associated instruction. In some cases
+                // though we want to use a fixed register as both an input
+                // and clobbered register in the instruction, so watch for
+                // this and shorten the temp to cover only the output.
+                CodePosition from = inputOf(*ins);
+                if (temp->policy() == LDefinition::FIXED) {
+                    AnyRegister reg = temp->output()->toRegister();
+                    for (LInstruction::InputIterator alloc(**ins); alloc.more(); alloc.next()) {
+                        if (alloc->isUse()) {
+                            LUse* use = alloc->toUse();
+                            if (use->isFixedRegister()) {
+                                if (GetFixedRegister(vreg(use).def(), use) == reg)
+                                    from = outputOf(*ins);
+                            }
+                        }
+                    }
+                }
+
+                CodePosition to =
+                    ins->isCall() ? outputOf(*ins) : outputOf(*ins).next();
+
+                if (!vreg(temp).addInitialRange(alloc(), from, to))
+                    return false;
+                vreg(temp).setInitialDefinition(from);
+            }
+
+            DebugOnly<bool> hasUseRegister = false;
+            DebugOnly<bool> hasUseRegisterAtStart = false;
+
+            for (LInstruction::InputIterator inputAlloc(**ins); inputAlloc.more(); inputAlloc.next()) {
+                if (inputAlloc->isUse()) {
+                    LUse* use = inputAlloc->toUse();
+
+                    // Call uses should always be at-start or fixed, since
+                    // calls use all registers.
+                    MOZ_ASSERT_IF(ins->isCall() && !inputAlloc.isSnapshotInput(),
+                                  use->isFixedRegister() || use->usedAtStart());
+
+#ifdef DEBUG
+                    // Don't allow at-start call uses if there are temps of the same kind,
+                    // so that we don't assign the same register.
+                    if (ins->isCall() && use->usedAtStart()) {
+                        for (size_t i = 0; i < ins->numTemps(); i++)
+                            MOZ_ASSERT(vreg(ins->getTemp(i)).type() != vreg(use).type());
+                    }
+
+                    // If there are both useRegisterAtStart(x) and useRegister(y)
+                    // uses, we may assign the same register to both operands
+                    // (bug 772830). Don't allow this for now.
+                    if (use->policy() == LUse::REGISTER) {
+                        if (use->usedAtStart()) {
+                            if (!IsInputReused(*ins, use))
+                                hasUseRegisterAtStart = true;
+                        } else {
+                            hasUseRegister = true;
+                        }
+                    }
+                    MOZ_ASSERT(!(hasUseRegister && hasUseRegisterAtStart));
+#endif
+
+                    // Don't treat RECOVERED_INPUT uses as keeping the vreg alive.
+                    if (use->policy() == LUse::RECOVERED_INPUT)
+                        continue;
+
+                    // Fixed uses on calls are specially overridden to happen
+                    // at the input position.
+                    CodePosition to =
+                        (use->usedAtStart() || (ins->isCall() && use->isFixedRegister()))
+                        ? inputOf(*ins)
+                        : outputOf(*ins);
+                    if (use->isFixedRegister()) {
+                        LAllocation reg(AnyRegister::FromCode(use->registerCode()));
+                        for (size_t i = 0; i < ins->numDefs(); i++) {
+                            LDefinition* def = ins->getDef(i);
+                            if (def->policy() == LDefinition::FIXED && *def->output() == reg)
+                                to = inputOf(*ins);
+                        }
+                    }
+
+                    if (!vreg(use).addInitialRange(alloc(), entryOf(block), to.next()))
+                        return false;
+                    UsePosition* usePosition = new(alloc()) UsePosition(use, to);
+                    if (!usePosition)
+                        return false;
+                    vreg(use).addInitialUse(usePosition);
+                    live.insert(use->virtualRegister());
+                }
+            }
+        }
+
+        // Phis have simultaneous assignment semantics at block begin, so at
+        // the beginning of the block we can be sure that liveIn does not
+        // contain any phi outputs.
+        for (unsigned int i = 0; i < block->numPhis(); i++) {
+            LDefinition* def = block->getPhi(i)->getDef(0);
+            if (live.contains(def->virtualRegister())) {
+                live.remove(def->virtualRegister());
+            } else {
+                // This is a dead phi, so add a dummy range over all phis. This
+                // can go away if we have an earlier dead code elimination pass.
+                CodePosition entryPos = entryOf(block);
+                if (!vreg(def).addInitialRange(alloc(), entryPos, entryPos.next()))
+                    return false;
+            }
+        }
+
+        if (mblock->isLoopHeader()) {
+            // A divergence from the published algorithm is required here, as
+            // our block order does not guarantee that blocks of a loop are
+            // contiguous. As a result, a single live range spanning the
+            // loop is not possible. Additionally, we require liveIn in a later
+            // pass for resolution, so that must also be fixed up here.
+            MBasicBlock* loopBlock = mblock->backedge();
+            while (true) {
+                // Blocks must already have been visited to have a liveIn set.
+                MOZ_ASSERT(loopBlock->id() >= mblock->id());
+
+                // Add a range for this entire loop block
+                CodePosition from = entryOf(loopBlock->lir());
+                CodePosition to = exitOf(loopBlock->lir()).next();
+
+                for (BitSet::Iterator liveRegId(live); liveRegId; ++liveRegId) {
+                    if (!vregs[*liveRegId].addInitialRange(alloc(), from, to))
+                        return false;
+                }
+
+                // Fix up the liveIn set.
+                liveIn[loopBlock->id()].insertAll(live);
+
+                // Make sure we don't visit this node again
+                loopDone.insert(loopBlock->id());
+
+                // If this is the loop header, any predecessors are either the
+                // backedge or out of the loop, so skip any predecessors of
+                // this block
+                if (loopBlock != mblock) {
+                    for (size_t i = 0; i < loopBlock->numPredecessors(); i++) {
+                        MBasicBlock* pred = loopBlock->getPredecessor(i);
+                        if (loopDone.contains(pred->id()))
+                            continue;
+                        if (!loopWorkList.append(pred))
+                            return false;
+                    }
+                }
+
+                // Terminate loop if out of work.
+                if (loopWorkList.empty())
+                    break;
+
+                // Grab the next block off the work list, skipping any OSR block.
+                MBasicBlock* osrBlock = graph.mir().osrBlock();
+                while (!loopWorkList.empty()) {
+                    loopBlock = loopWorkList.popCopy();
+                    if (loopBlock != osrBlock)
+                        break;
+                }
+
+                // If end is reached without finding a non-OSR block, then no more work items were found.
+                if (loopBlock == osrBlock) {
+                    MOZ_ASSERT(loopWorkList.empty());
+                    break;
+                }
+            }
+
+            // Clear the done set for other loops
+            loopDone.clear();
         }
-    }
 
-    for (size_t i = 0; i < hotcodeInterval->numRanges(); i++) {
-        AllocatedRange range(hotcodeInterval, hotcodeInterval->getRange(i));
-        if (!hotcode.insert(range))
-            return false;
+        MOZ_ASSERT_IF(!mblock->numPredecessors(), live.empty());
     }
 
+    JitSpew(JitSpew_RegAlloc, "Liveness analysis complete");
+
+    if (JitSpewEnabled(JitSpew_RegAlloc))
+        dumpInstructions();
+
     return true;
 }
 
@@ -80,10 +792,10 @@
 {
     JitSpew(JitSpew_RegAlloc, "Beginning register allocation");
 
-    if (!buildLivenessInfo())
+    if (!init())
         return false;
 
-    if (!init())
+    if (!buildLivenessInfo())
         return false;
 
     if (JitSpewEnabled(JitSpew_RegAlloc))
@@ -93,22 +805,21 @@
         return false;
 
     JitSpew(JitSpew_RegAlloc, "Beginning grouping and queueing registers");
-    if (!groupAndQueueRegisters())
+    if (!mergeAndQueueRegisters())
         return false;
-    JitSpew(JitSpew_RegAlloc, "Grouping and queueing registers complete");
 
     if (JitSpewEnabled(JitSpew_RegAlloc))
-        dumpRegisterGroups();
+        dumpVregs();
 
     JitSpew(JitSpew_RegAlloc, "Beginning main allocation loop");
 
-    // Allocate, spill and split register intervals until finished.
+    // Allocate, spill and split bundles until finished.
     while (!allocationQueue.empty()) {
         if (mir->shouldCancel("Backtracking Allocation"))
             return false;
 
         QueueItem item = allocationQueue.removeHighest();
-        if (item.interval ? !processInterval(item.interval) : !processGroup(item.group))
+        if (!processBundle(item.bundle))
             return false;
     }
     JitSpew(JitSpew_RegAlloc, "Main allocation loop complete");
@@ -135,44 +846,6 @@
 }
 
 static bool
-LifetimesOverlap(BacktrackingVirtualRegister* reg0, BacktrackingVirtualRegister* reg1)
-{
-    // Registers may have been eagerly split in two, see tryGroupReusedRegister.
-    // In such cases, only consider the first interval.
-    MOZ_ASSERT(reg0->numIntervals() <= 2 && reg1->numIntervals() <= 2);
-
-    LiveInterval* interval0 = reg0->getInterval(0);
-    LiveInterval* interval1 = reg1->getInterval(0);
-
-    // Interval ranges are sorted in reverse order. The lifetimes overlap if
-    // any of their ranges overlap.
-    size_t index0 = 0, index1 = 0;
-    while (index0 < interval0->numRanges() && index1 < interval1->numRanges()) {
-        const LiveInterval::Range
-            *range0 = interval0->getRange(index0),
-            *range1 = interval1->getRange(index1);
-        if (range0->from >= range1->to)
-            index0++;
-        else if (range1->from >= range0->to)
-            index1++;
-        else
-            return true;
-    }
-
-    return false;
-}
-
-bool
-BacktrackingAllocator::canAddToGroup(VirtualRegisterGroup* group, BacktrackingVirtualRegister* reg)
-{
-    for (size_t i = 0; i < group->registers.length(); i++) {
-        if (LifetimesOverlap(reg, &vregs[group->registers[i]]))
-            return false;
-    }
-    return true;
-}
-
-static bool
 IsArgumentSlotDefinition(LDefinition* def)
 {
     return def->policy() == LDefinition::FIXED && def->output()->isArgument();
@@ -182,204 +855,225 @@
 IsThisSlotDefinition(LDefinition* def)
 {
     return IsArgumentSlotDefinition(def) &&
-           def->output()->toArgument()->index() < THIS_FRAME_ARGSLOT + sizeof(Value);
+        def->output()->toArgument()->index() < THIS_FRAME_ARGSLOT + sizeof(Value);
 }
 
 bool
-BacktrackingAllocator::tryGroupRegisters(uint32_t vreg0, uint32_t vreg1)
+BacktrackingAllocator::tryMergeBundles(LiveBundle* bundle0, LiveBundle* bundle1)
 {
-    // See if reg0 and reg1 can be placed in the same group, following the
-    // restrictions imposed by VirtualRegisterGroup and any other registers
-    // already grouped with reg0 or reg1.
-    BacktrackingVirtualRegister* reg0 = &vregs[vreg0];
-    BacktrackingVirtualRegister* reg1 = &vregs[vreg1];
+    // See if bundle0 and bundle1 can be merged together.
+    if (bundle0 == bundle1)
+        return true;
 
-    if (!reg0->isCompatibleVReg(*reg1))
+    // Get a representative virtual register from each bundle.
+    VirtualRegister& reg0 = vregs[bundle0->firstRange()->vreg()];
+    VirtualRegister& reg1 = vregs[bundle1->firstRange()->vreg()];
+
+    if (!reg0.isCompatible(reg1))
         return true;
 
     // Registers which might spill to the frame's |this| slot can only be
     // grouped with other such registers. The frame's |this| slot must always
     // hold the |this| value, as required by JitFrame tracing and by the Ion
     // constructor calling convention.
-    if (IsThisSlotDefinition(reg0->def()) || IsThisSlotDefinition(reg1->def())) {
-        if (*reg0->def()->output() != *reg1->def()->output())
+    if (IsThisSlotDefinition(reg0.def()) || IsThisSlotDefinition(reg1.def())) {
+        if (*reg0.def()->output() != *reg1.def()->output())
             return true;
     }
 
     // Registers which might spill to the frame's argument slots can only be
     // grouped with other such registers if the frame might access those
     // arguments through a lazy arguments object.
-    if (IsArgumentSlotDefinition(reg0->def()) || IsArgumentSlotDefinition(reg1->def())) {
+    if (IsArgumentSlotDefinition(reg0.def()) || IsArgumentSlotDefinition(reg1.def())) {
         JSScript* script = graph.mir().entryBlock()->info().script();
         if (script && script->argumentsHasVarBinding()) {
-            if (*reg0->def()->output() != *reg1->def()->output())
+            if (*reg0.def()->output() != *reg1.def()->output())
                 return true;
         }
     }
 
-    VirtualRegisterGroup* group0 = reg0->group();
-    VirtualRegisterGroup* group1 = reg1->group();
-
-    if (!group0 && group1)
-        return tryGroupRegisters(vreg1, vreg0);
-
-    if (group0) {
-        if (group1) {
-            if (group0 == group1) {
-                // The registers are already grouped together.
-                return true;
-            }
-            // Try to unify the two distinct groups.
-            for (size_t i = 0; i < group1->registers.length(); i++) {
-                if (!canAddToGroup(group0, &vregs[group1->registers[i]]))
-                    return true;
-            }
-            for (size_t i = 0; i < group1->registers.length(); i++) {
-                uint32_t vreg = group1->registers[i];
-                if (!group0->registers.append(vreg))
-                    return false;
-                vregs[vreg].setGroup(group0);
-            }
-            return true;
-        }
-        if (!canAddToGroup(group0, reg1))
+    // Make sure that ranges in the bundles do not overlap.
+    LiveRange::BundleLinkIterator iter0 = bundle0->rangesBegin(), iter1 = bundle1->rangesBegin();
+    while (iter0 && iter1) {
+        LiveRange* range0 = LiveRange::get(*iter0);
+        LiveRange* range1 = LiveRange::get(*iter1);
+
+        if (range0->from() >= range1->to())
+            iter1++;
+        else if (range1->from() >= range0->to())
+            iter0++;
+        else
             return true;
-        if (!group0->registers.append(vreg1))
-            return false;
-        reg1->setGroup(group0);
-        return true;
     }
 
-    if (LifetimesOverlap(reg0, reg1))
-        return true;
-
-    VirtualRegisterGroup* group = new(alloc()) VirtualRegisterGroup(alloc());
-    if (!group->registers.append(vreg0) || !group->registers.append(vreg1))
-        return false;
+    // Move all ranges from bundle1 into bundle0.
+    while (LiveRange* range = bundle1->popFirstRange())
+        bundle0->addRange(range);
 
-    reg0->setGroup(group);
-    reg1->setGroup(group);
     return true;
 }
 
-bool
-BacktrackingAllocator::tryGroupReusedRegister(uint32_t def, uint32_t use)
+static inline LDefinition*
+FindReusingDefinition(LNode* ins, LAllocation* alloc)
 {
-    BacktrackingVirtualRegister& reg = vregs[def];
-    BacktrackingVirtualRegister& usedReg = vregs[use];
+    for (size_t i = 0; i < ins->numDefs(); i++) {
+        LDefinition* def = ins->getDef(i);
+        if (def->policy() == LDefinition::MUST_REUSE_INPUT &&
+            ins->getOperand(def->getReusedInput()) == alloc)
+            return def;
+    }
+    for (size_t i = 0; i < ins->numTemps(); i++) {
+        LDefinition* def = ins->getTemp(i);
+        if (def->policy() == LDefinition::MUST_REUSE_INPUT &&
+            ins->getOperand(def->getReusedInput()) == alloc)
+            return def;
+    }
+    return nullptr;
+}
 
-    // reg is a vreg which reuses its input usedReg for its output physical
-    // register. Try to group reg with usedReg if at all possible, as avoiding
-    // copies before reg's instruction is crucial for the quality of the
-    // generated code (MUST_REUSE_INPUT is used by all arithmetic instructions
-    // on x86/x64).
+bool
+BacktrackingAllocator::tryMergeReusedRegister(VirtualRegister& def, VirtualRegister& input)
+{
+    // def is a vreg which reuses input for its output physical register. Try
+    // to merge ranges for def with those of input if possible, as avoiding
+    // copies before def's instruction is crucial for generated code quality
+    // (MUST_REUSE_INPUT is used for all arithmetic on x86/x64).
 
-    if (reg.intervalFor(inputOf(reg.ins()))) {
-        MOZ_ASSERT(reg.isTemp());
-        reg.setMustCopyInput();
+    if (def.rangeFor(inputOf(def.ins()))) {
+        MOZ_ASSERT(def.isTemp());
+        def.setMustCopyInput();
         return true;
     }
 
-    if (!usedReg.intervalFor(outputOf(reg.ins()))) {
+    LiveRange* inputRange = input.rangeFor(outputOf(def.ins()));
+    if (!inputRange) {
         // The input is not live after the instruction, either in a safepoint
         // for the instruction or in subsequent code. The input and output
         // can thus be in the same group.
-        return tryGroupRegisters(use, def);
+        return tryMergeBundles(def.firstBundle(), input.firstBundle());
     }
 
     // The input is live afterwards, either in future instructions or in a
     // safepoint for the reusing instruction. This is impossible to satisfy
     // without copying the input.
     //
-    // It may or may not be better to split the interval at the point of the
-    // definition, which may permit grouping. One case where it is definitely
-    // better to split is if the input never has any register uses after the
-    // instruction. Handle this splitting eagerly.
-
-    if (usedReg.numIntervals() != 1 ||
-        (usedReg.def()->isFixed() && !usedReg.def()->output()->isRegister())) {
-        reg.setMustCopyInput();
-        return true;
-    }
-    LiveInterval* interval = usedReg.getInterval(0);
-    LBlock* block = reg.ins()->block();
+    // It may or may not be better to split the input into two bundles at the
+    // point of the definition, which may permit merging. One case where it is
+    // definitely better to split is if the input never has any register uses
+    // after the instruction. Handle this splitting eagerly.
+
+    LBlock* block = def.ins()->block();
 
     // The input's lifetime must end within the same block as the definition,
     // otherwise it could live on in phis elsewhere.
-    if (interval->end() > exitOf(block)) {
-        reg.setMustCopyInput();
+    if (inputRange != input.lastRange() || inputRange->to() > exitOf(block)) {
+        def.setMustCopyInput();
+        return true;
+    }
+
+    // If we already split the input for some other register, don't make a
+    // third bundle.
+    if (inputRange->bundle() != input.firstRange()->bundle()) {
+        def.setMustCopyInput();
+        return true;
+    }
+
+    // If the input will start out in memory then adding a separate bundle for
+    // memory uses after the def won't help.
+    if (input.def()->isFixed() && !input.def()->output()->isRegister()) {
+        def.setMustCopyInput();
         return true;
     }
 
-    for (UsePositionIterator iter = interval->usesBegin(); iter != interval->usesEnd(); iter++) {
-        if (iter->pos <= inputOf(reg.ins()))
+    // The input cannot have register or reused uses after the definition.
+    for (UsePositionIterator iter = inputRange->usesBegin(); iter; iter++) {
+        if (iter->pos <= inputOf(def.ins()))
             continue;
 
         LUse* use = iter->use;
         if (FindReusingDefinition(insData[iter->pos], use)) {
-            reg.setMustCopyInput();
+            def.setMustCopyInput();
             return true;
         }
         if (use->policy() != LUse::ANY && use->policy() != LUse::KEEPALIVE) {
-            reg.setMustCopyInput();
+            def.setMustCopyInput();
             return true;
         }
     }
 
-    LiveInterval* preInterval = LiveInterval::New(alloc(), interval->vreg(), 0);
-    for (size_t i = 0; i < interval->numRanges(); i++) {
-        const LiveInterval::Range* range = interval->getRange(i);
-        MOZ_ASSERT(range->from <= inputOf(reg.ins()));
-
-        CodePosition to = Min(range->to, outputOf(reg.ins()));
-        if (!preInterval->addRange(range->from, to))
-            return false;
-    }
-
-    // The new interval starts at reg's input position, which means it overlaps
-    // with the old interval at one position. This is what we want, because we
-    // need to copy the input before the instruction.
-    LiveInterval* postInterval = LiveInterval::New(alloc(), interval->vreg(), 0);
-    if (!postInterval->addRange(inputOf(reg.ins()), interval->end()))
+    LiveRange* preRange = LiveRange::New(alloc(), input.vreg(),
+                                         inputRange->from(), outputOf(def.ins()));
+    if (!preRange)
         return false;
 
-    LiveIntervalVector newIntervals;
-    if (!newIntervals.append(preInterval) || !newIntervals.append(postInterval))
+    // The new range starts at reg's input position, which means it overlaps
+    // with the old range at one position. This is what we want, because we
+    // need to copy the input before the instruction.
+    LiveRange* postRange = LiveRange::New(alloc(), input.vreg(),
+                                          inputOf(def.ins()), inputRange->to());
+    if (!postRange)
         return false;
 
-    distributeUses(interval, newIntervals);
+    inputRange->distributeUses(preRange);
+    inputRange->distributeUses(postRange);
+    MOZ_ASSERT(!inputRange->hasUses());
 
     JitSpew(JitSpew_RegAlloc, "  splitting reused input at %u to try to help grouping",
-            inputOf(reg.ins()));
+            inputOf(def.ins()));
 
-    if (!split(interval, newIntervals))
-        return false;
+    LiveBundle* firstBundle = inputRange->bundle();
+    input.removeRange(inputRange);
+    input.addRange(preRange);
+    input.addRange(postRange);
 
-    MOZ_ASSERT(usedReg.numIntervals() == 2);
+    firstBundle->removeRange(inputRange);
+    firstBundle->addRange(preRange);
 
-    usedReg.setCanonicalSpillExclude(inputOf(reg.ins()));
+    // The new range goes in a separate bundle, where it will be spilled during
+    // allocation.
+    LiveBundle* secondBundle = LiveBundle::New(alloc(), nullptr, nullptr);
+    if (!secondBundle)
+        return false;
+    secondBundle->addRange(postRange);
 
-    return tryGroupRegisters(use, def);
+    return tryMergeBundles(def.firstBundle(), input.firstBundle());
 }
 
 bool
-BacktrackingAllocator::groupAndQueueRegisters()
+BacktrackingAllocator::mergeAndQueueRegisters()
 {
-    // If there is an OSR block, group parameters in that block with the
+    MOZ_ASSERT(!vregs[0u].hasRanges());
+
+    // Create a bundle for each register containing all its ranges.
+    for (size_t i = 1; i < graph.numVirtualRegisters(); i++) {
+        VirtualRegister& reg = vregs[i];
+        if (!reg.hasRanges())
+            continue;
+
+        LiveBundle* bundle = LiveBundle::New(alloc(), nullptr, nullptr);
+        if (!bundle)
+            return false;
+        for (LiveRange::RegisterLinkIterator iter = reg.rangesBegin(); iter; iter++) {
+            LiveRange* range = LiveRange::get(*iter);
+            bundle->addRange(range);
+        }
+    }
+
+    // If there is an OSR block, merge parameters in that block with the
     // corresponding parameters in the initial block.
     if (MBasicBlock* osr = graph.mir().osrBlock()) {
-        size_t originalVreg = 1;
+        size_t original = 1;
         for (LInstructionIterator iter = osr->lir()->begin(); iter != osr->lir()->end(); iter++) {
             if (iter->isParameter()) {
                 for (size_t i = 0; i < iter->numDefs(); i++) {
                     DebugOnly<bool> found = false;
-                    uint32_t paramVreg = iter->getDef(i)->virtualRegister();
-                    for (; originalVreg < paramVreg; originalVreg++) {
-                        if (*vregs[originalVreg].def()->output() == *iter->getDef(i)->output()) {
-                            MOZ_ASSERT(vregs[originalVreg].ins()->isParameter());
-                            if (!tryGroupRegisters(originalVreg, paramVreg))
+                    VirtualRegister &paramVreg = vreg(iter->getDef(i));
+                    for (; original < paramVreg.vreg(); original++) {
+                        VirtualRegister &originalVreg = vregs[original];
+                        if (*originalVreg.def()->output() == *iter->getDef(i)->output()) {
+                            MOZ_ASSERT(originalVreg.ins()->isParameter());
+                            if (!tryMergeBundles(originalVreg.firstBundle(), paramVreg.firstBundle()))
                                 return false;
-                            MOZ_ASSERT(vregs[originalVreg].group() == vregs[paramVreg].group());
                             found = true;
                             break;
                         }
@@ -390,79 +1084,47 @@
         }
     }
 
-    // Try to group registers with their reused inputs.
-    // Virtual register number 0 is unused.
-    MOZ_ASSERT(vregs[0u].numIntervals() == 0);
+    // Try to merge registers with their reused inputs.
     for (size_t i = 1; i < graph.numVirtualRegisters(); i++) {
-        BacktrackingVirtualRegister& reg = vregs[i];
-        if (!reg.numIntervals())
+        VirtualRegister& reg = vregs[i];
+        if (!reg.hasRanges())
             continue;
 
         if (reg.def()->policy() == LDefinition::MUST_REUSE_INPUT) {
             LUse* use = reg.ins()->getOperand(reg.def()->getReusedInput())->toUse();
-            if (!tryGroupReusedRegister(i, use->virtualRegister()))
+            if (!tryMergeReusedRegister(reg, vreg(use)))
                 return false;
         }
     }
 
-    // Try to group phis with their inputs.
+    // Try to merge phis with their inputs.
     for (size_t i = 0; i < graph.numBlocks(); i++) {
         LBlock* block = graph.getBlock(i);
         for (size_t j = 0; j < block->numPhis(); j++) {
             LPhi* phi = block->getPhi(j);
-            uint32_t output = phi->getDef(0)->virtualRegister();
+            VirtualRegister &outputVreg = vreg(phi->getDef(0));
             for (size_t k = 0, kend = phi->numOperands(); k < kend; k++) {
-                uint32_t input = phi->getOperand(k)->toUse()->virtualRegister();
-                if (!tryGroupRegisters(input, output))
+                VirtualRegister& inputVreg = vreg(phi->getOperand(k)->toUse());
+                if (!tryMergeBundles(inputVreg.firstBundle(), outputVreg.firstBundle()))
                     return false;
             }
         }
     }
 
-    // Virtual register number 0 is unused.
-    MOZ_ASSERT(vregs[0u].numIntervals() == 0);
+    // Add all bundles to the allocation queue, and create spill sets for them.
     for (size_t i = 1; i < graph.numVirtualRegisters(); i++) {
-        if (mir->shouldCancel("Backtracking Enqueue Registers"))
-            return false;
-
-        BacktrackingVirtualRegister& reg = vregs[i];
-        MOZ_ASSERT(reg.numIntervals() <= 2);
-        MOZ_ASSERT(!reg.canonicalSpill());
-
-        if (!reg.numIntervals())
-            continue;
+        VirtualRegister& reg = vregs[i];
+        for (LiveRange::RegisterLinkIterator iter = reg.rangesBegin(); iter; iter++) {
+            LiveRange* range = LiveRange::get(*iter);
+            LiveBundle* bundle = range->bundle();
+            if (range == bundle->firstRange()) {
+                SpillSet* spill = SpillSet::New(alloc());
+                if (!spill)
+                    return false;
+                bundle->setSpillSet(spill);
 
-        // Eagerly set the canonical spill slot for registers which are fixed
-        // for that slot, and reuse it for other registers in the group.
-        LDefinition* def = reg.def();
-        if (def->policy() == LDefinition::FIXED && !def->output()->isRegister()) {
-            MOZ_ASSERT(!def->output()->isStackSlot());
-            reg.setCanonicalSpill(*def->output());
-            if (reg.group() && reg.group()->spill.isUse())
-                reg.group()->spill = *def->output();
-        }
-
-        // Place all intervals for this register on the allocation queue.
-        // During initial queueing use single queue items for groups of
-        // registers, so that they will be allocated together and reduce the
-        // risk of unnecessary conflicts. This is in keeping with the idea that
-        // register groups are effectively single registers whose value changes
-        // during execution. If any intervals in the group are evicted later
-        // then they will be reallocated individually.
-        size_t start = 0;
-        if (VirtualRegisterGroup* group = reg.group()) {
-            if (i == group->canonicalReg()) {
-                size_t priority = computePriority(group);
-                if (!allocationQueue.insert(QueueItem(group, priority)))
-                    return false;
-            }
-            start++;
-        }
-        for (; start < reg.numIntervals(); start++) {
-            LiveInterval* interval = reg.getInterval(start);
-            if (interval->numRanges() > 0) {
-                size_t priority = computePriority(interval);
-                if (!allocationQueue.insert(QueueItem(interval, priority)))
+                size_t priority = computePriority(bundle);
+                if (!allocationQueue.insert(QueueItem(bundle, priority)))
                     return false;
             }
         }
@@ -474,117 +1136,121 @@
 static const size_t MAX_ATTEMPTS = 2;
 
 bool
-BacktrackingAllocator::tryAllocateFixed(LiveInterval* interval, bool* success,
-                                        bool* pfixed, LiveIntervalVector& conflicting)
+BacktrackingAllocator::tryAllocateFixed(LiveBundle* bundle, Requirement requirement,
+                                        bool* success, bool* pfixed,
+                                        LiveBundleVector& conflicting)
 {
-    // Spill intervals which are required to be in a certain stack slot.
-    if (!interval->requirement()->allocation().isRegister()) {
+    // Spill bundles which are required to be in a certain stack slot.
+    if (!requirement.allocation().isRegister()) {
         JitSpew(JitSpew_RegAlloc, "  stack allocation requirement");
-        interval->setAllocation(interval->requirement()->allocation());
+        bundle->setAllocation(requirement.allocation());
         *success = true;
         return true;
     }
 
-    AnyRegister reg = interval->requirement()->allocation().toRegister();
-    return tryAllocateRegister(registers[reg.code()], interval, success, pfixed, conflicting);
+    AnyRegister reg = requirement.allocation().toRegister();
+    return tryAllocateRegister(registers[reg.code()], bundle, success, pfixed, conflicting);
 }
 
 bool
-BacktrackingAllocator::tryAllocateNonFixed(LiveInterval* interval, bool* success,
-                                           bool* pfixed, LiveIntervalVector& conflicting)
-{
-    // If we want, but do not require an interval to be in a specific
-    // register, only look at that register for allocating and evict
-    // or spill if it is not available. Picking a separate register may
-    // be even worse than spilling, as it will still necessitate moves
-    // and will tie up more registers than if we spilled.
-    if (interval->hint()->kind() == Requirement::FIXED) {
-        AnyRegister reg = interval->hint()->allocation().toRegister();
-        if (!tryAllocateRegister(registers[reg.code()], interval, success, pfixed, conflicting))
+BacktrackingAllocator::tryAllocateNonFixed(LiveBundle* bundle,
+                                           Requirement requirement, Requirement hint,
+                                           bool* success, bool* pfixed,
+                                           LiveBundleVector& conflicting)
+{
+    // If we want, but do not require a bundle to be in a specific register,
+    // only look at that register for allocating and evict or spill if it is
+    // not available. Picking a separate register may be even worse than
+    // spilling, as it will still necessitate moves and will tie up more
+    // registers than if we spilled.
+    if (hint.kind() == Requirement::FIXED) {
+        AnyRegister reg = hint.allocation().toRegister();
+        if (!tryAllocateRegister(registers[reg.code()], bundle, success, pfixed, conflicting))
             return false;
         if (*success)
             return true;
     }
 
-    // Spill intervals which have no hint or register requirement.
-    if (interval->requirement()->kind() == Requirement::NONE &&
-        interval->hint()->kind() != Requirement::REGISTER)
-    {
-        spill(interval);
+    // Spill bundles which have no hint or register requirement.
+    if (requirement.kind() == Requirement::NONE && hint.kind() != Requirement::REGISTER) {
+        if (!spill(bundle))
+            return false;
         *success = true;
         return true;
     }
 
-    if (conflicting.empty() || minimalInterval(interval)) {
-        // Search for any available register which the interval can be
+    if (conflicting.empty() || minimalBundle(bundle)) {
+        // Search for any available register which the bundle can be
         // allocated to.
         for (size_t i = 0; i < AnyRegister::Total; i++) {
-            if (!tryAllocateRegister(registers[i], interval, success, pfixed, conflicting))
+            if (!tryAllocateRegister(registers[i], bundle, success, pfixed, conflicting))
                 return false;
             if (*success)
                 return true;
         }
     }
 
-    // Spill intervals which have no register requirement if they didn't get
+    // Spill bundles which have no register requirement if they didn't get
     // allocated.
-    if (interval->requirement()->kind() == Requirement::NONE) {
-        spill(interval);
+    if (requirement.kind() == Requirement::NONE) {
+        if (!spill(bundle))
+            return false;
         *success = true;
         return true;
     }
 
-    // We failed to allocate this interval.
+    // We failed to allocate this bundle.
     MOZ_ASSERT(!*success);
     return true;
 }
 
 bool
-BacktrackingAllocator::processInterval(LiveInterval* interval)
+BacktrackingAllocator::processBundle(LiveBundle* bundle)
 {
     if (JitSpewEnabled(JitSpew_RegAlloc)) {
         JitSpew(JitSpew_RegAlloc, "Allocating %s [priority %lu] [weight %lu]",
-                interval->toString(), computePriority(interval), computeSpillWeight(interval));
+                bundle->toString(), computePriority(bundle), computeSpillWeight(bundle));
     }
 
-    // An interval can be processed by doing any of the following:
+    // A bundle can be processed by doing any of the following:
     //
-    // - Assigning the interval a register. The interval cannot overlap any
-    //   other interval allocated for that physical register.
+    // - Assigning the bundle a register. The bundle cannot overlap any other
+    //   bundle allocated for that physical register.
     //
-    // - Spilling the interval, provided it has no register uses.
+    // - Spilling the bundle, provided it has no register uses.
     //
-    // - Splitting the interval into two or more intervals which cover the
-    //   original one. The new intervals are placed back onto the priority
-    //   queue for later processing.
+    // - Splitting the bundle into two or more bundles which cover the original
+    //   one. The new bundles are placed back onto the priority queue for later
+    //   processing.
     //
-    // - Evicting one or more existing allocated intervals, and then doing one
-    //   of the above operations. Evicted intervals are placed back on the
-    //   priority queue. Any evicted intervals must have a lower spill weight
-    //   than the interval being processed.
+    // - Evicting one or more existing allocated bundles, and then doing one
+    //   of the above operations. Evicted bundles are placed back on the
+    //   priority queue. Any evicted bundles must have a lower spill weight
+    //   than the bundle being processed.
     //
     // As long as this structure is followed, termination is guaranteed.
-    // In general, we want to minimize the amount of interval splitting
-    // (which generally necessitates spills), so allocate longer lived, lower
-    // weight intervals first and evict and split them later if they prevent
-    // allocation for higher weight intervals.
+    // In general, we want to minimize the amount of bundle splitting (which
+    // generally necessitates spills), so allocate longer lived, lower weight
+    // bundles first and evict and split them later if they prevent allocation
+    // for higher weight bundles.
 
-    bool canAllocate = setIntervalRequirement(interval);
+    Requirement requirement, hint;
+    bool canAllocate = computeRequirement(bundle, &requirement, &hint);
 
     bool fixed;
-    LiveIntervalVector conflicting;
+    LiveBundleVector conflicting;
     for (size_t attempt = 0;; attempt++) {
         if (canAllocate) {
             bool success = false;
             fixed = false;
             conflicting.clear();
 
-            // Ok, let's try allocating for this interval.
-            if (interval->requirement()->kind() == Requirement::FIXED) {
-                if (!tryAllocateFixed(interval, &success, &fixed, conflicting))
+            // Ok, let's try allocating for this bundle.
+            if (requirement.kind() == Requirement::FIXED) {
+                if (!tryAllocateFixed(bundle, requirement, &success, &fixed, conflicting))
                     return false;
             } else {
-                if (!tryAllocateNonFixed(interval, &success, &fixed, conflicting))
+                if (!tryAllocateNonFixed(bundle, requirement, hint, &success, &fixed, conflicting))
                     return false;
             }
 
@@ -592,241 +1258,127 @@
             if (success)
                 return true;
 
-            // If that didn't work, but we have one or more non-fixed intervals
+            // If that didn't work, but we have one or more non-fixed bundles
             // known to be conflicting, maybe we can evict them and try again.
             if (attempt < MAX_ATTEMPTS &&
                 !fixed &&
                 !conflicting.empty() &&
-                maximumSpillWeight(conflicting) < computeSpillWeight(interval))
-            {
-                for (size_t i = 0; i < conflicting.length(); i++) {
-                    if (!evictInterval(conflicting[i]))
-                        return false;
+                maximumSpillWeight(conflicting) < computeSpillWeight(bundle))
+                {
+                    for (size_t i = 0; i < conflicting.length(); i++) {
+                        if (!evictBundle(conflicting[i]))
+                            return false;
+                    }
+                    continue;
                 }
-                continue;
-            }
-        }
-
-        // A minimal interval cannot be split any further. If we try to split
-        // it at this point we will just end up with the same interval and will
-        // enter an infinite loop. Weights and the initial live intervals must
-        // be constructed so that any minimal interval is allocatable.
-        MOZ_ASSERT(!minimalInterval(interval));
-
-        LiveInterval* conflict = conflicting.empty() ? nullptr : conflicting[0];
-        return chooseIntervalSplit(interval, canAllocate && fixed, conflict);
-    }
-}
-
-bool
-BacktrackingAllocator::processGroup(VirtualRegisterGroup* group)
-{
-    if (JitSpewEnabled(JitSpew_RegAlloc)) {
-        JitSpew(JitSpew_RegAlloc, "Allocating group v%u [priority %lu] [weight %lu]",
-                group->registers[0], computePriority(group), computeSpillWeight(group));
-    }
-
-    bool fixed;
-    LiveInterval* conflict;
-    for (size_t attempt = 0;; attempt++) {
-        // Search for any available register which the group can be allocated to.
-        fixed = false;
-        conflict = nullptr;
-        for (size_t i = 0; i < AnyRegister::Total; i++) {
-            bool success;
-            if (!tryAllocateGroupRegister(registers[i], group, &success, &fixed, &conflict))
-                return false;
-            if (success) {
-                conflict = nullptr;
-                break;
-            }
-        }
-
-        if (attempt < MAX_ATTEMPTS &&
-            !fixed &&
-            conflict &&
-            conflict->hasVreg() &&
-            computeSpillWeight(conflict) < computeSpillWeight(group))
-        {
-            if (!evictInterval(conflict))
-                return false;
-            continue;
         }
 
-        for (size_t i = 0; i < group->registers.length(); i++) {
-            VirtualRegister& reg = vregs[group->registers[i]];
-            MOZ_ASSERT(reg.numIntervals() <= 2);
-            if (!processInterval(reg.getInterval(0)))
-                return false;
-        }
+        // A minimal bundle cannot be split any further. If we try to split it
+        // it at this point we will just end up with the same bundle and will
+        // enter an infinite loop. Weights and the initial live ranges must
+        // be constructed so that any minimal bundle is allocatable.
+        MOZ_ASSERT(!minimalBundle(bundle));
 
-        return true;
+        LiveBundle* conflict = conflicting.empty() ? nullptr : conflicting[0];
+        return chooseBundleSplit(bundle, canAllocate && fixed, conflict);
     }
 }
 
 bool
-BacktrackingAllocator::setIntervalRequirement(LiveInterval* interval)
+BacktrackingAllocator::computeRequirement(LiveBundle* bundle,
+                                          Requirement *requirement, Requirement *hint)
 {
-    // Set any requirement or hint on interval according to its definition and
+    // Set any requirement or hint on bundle according to its definition and
     // uses. Return false if there are conflicting requirements which will
-    // require the interval to be split.
-    interval->setHint(Requirement());
-    interval->setRequirement(Requirement());
-
-    BacktrackingVirtualRegister* reg = &vregs[interval->vreg()];
-
-    // Set a hint if another interval in the same group is in a register.
-    if (VirtualRegisterGroup* group = reg->group()) {
-        if (group->allocation.isRegister()) {
-            if (JitSpewEnabled(JitSpew_RegAlloc)) {
-                JitSpew(JitSpew_RegAlloc, "  Hint %s, used by group allocation",
-                        group->allocation.toString());
-            }
-            interval->setHint(Requirement(group->allocation));
-        }
-    }
+    // require the bundle to be split.
 
-    if (interval->index() == 0) {
-        // The first interval is the definition, so deal with any definition
-        // constraints/hints.
-
-        LDefinition::Policy policy = reg->def()->policy();
-        if (policy == LDefinition::FIXED) {
-            // Fixed policies get a FIXED requirement.
-            if (JitSpewEnabled(JitSpew_RegAlloc)) {
+    for (LiveRange::BundleLinkIterator iter = bundle->rangesBegin(); iter; iter++) {
+        LiveRange* range = LiveRange::get(*iter);
+        VirtualRegister &reg = vregs[range->vreg()];
+
+        if (range->hasDefinition()) {
+            // Deal with any definition constraints/hints.
+            LDefinition::Policy policy = reg.def()->policy();
+            if (policy == LDefinition::FIXED) {
+                // Fixed policies get a FIXED requirement.
                 JitSpew(JitSpew_RegAlloc, "  Requirement %s, fixed by definition",
-                        reg->def()->output()->toString());
+                        reg.def()->output()->toString());
+                if (!requirement->merge(Requirement(*reg.def()->output())))
+                    return false;
+            } else if (reg.ins()->isPhi()) {
+                // Phis don't have any requirements, but they should prefer their
+                // input allocations. This is captured by the group hints above.
+            } else {
+                // Non-phis get a REGISTER requirement.
+                if (!requirement->merge(Requirement(Requirement::REGISTER)))
+                    return false;
             }
-            interval->setRequirement(Requirement(*reg->def()->output()));
-        } else if (reg->ins()->isPhi()) {
-            // Phis don't have any requirements, but they should prefer their
-            // input allocations. This is captured by the group hints above.
-        } else {
-            // Non-phis get a REGISTER requirement.
-            interval->setRequirement(Requirement(Requirement::REGISTER));
         }
-    }
 
-    // Search uses for requirements.
-    for (UsePositionIterator iter = interval->usesBegin();
-         iter != interval->usesEnd();
-         iter++)
-    {
-        LUse::Policy policy = iter->use->policy();
-        if (policy == LUse::FIXED) {
-            AnyRegister required = GetFixedRegister(reg->def(), iter->use);
+        // Search uses for requirements.
+        for (UsePositionIterator iter = range->usesBegin(); iter; iter++) {
+            LUse::Policy policy = iter->use->policy();
+            if (policy == LUse::FIXED) {
+                AnyRegister required = GetFixedRegister(reg.def(), iter->use);
 
-            if (JitSpewEnabled(JitSpew_RegAlloc)) {
                 JitSpew(JitSpew_RegAlloc, "  Requirement %s, due to use at %u",
                         required.name(), iter->pos.bits());
-            }
-
-            // If there are multiple fixed registers which the interval is
-            // required to use, fail. The interval will need to be split before
-            // it can be allocated.
-            if (!interval->addRequirement(Requirement(LAllocation(required))))
-                return false;
-        } else if (policy == LUse::REGISTER) {
-            if (!interval->addRequirement(Requirement(Requirement::REGISTER)))
-                return false;
-        } else if (policy == LUse::ANY) {
-            // ANY differs from KEEPALIVE by actively preferring a register.
-            interval->addHint(Requirement(Requirement::REGISTER));
-        }
-    }
-
-    return true;
-}
 
-bool
-BacktrackingAllocator::tryAllocateGroupRegister(PhysicalRegister& r, VirtualRegisterGroup* group,
-                                                bool* psuccess, bool* pfixed, LiveInterval** pconflicting)
-{
-    *psuccess = false;
-
-    if (!r.allocatable)
-        return true;
-
-    if (!vregs[group->registers[0]].isCompatibleReg(r.reg))
-        return true;
-
-    bool allocatable = true;
-    LiveInterval* conflicting = nullptr;
-
-    for (size_t i = 0; i < group->registers.length(); i++) {
-        VirtualRegister& reg = vregs[group->registers[i]];
-        MOZ_ASSERT(reg.numIntervals() <= 2);
-        LiveInterval* interval = reg.getInterval(0);
-
-        for (size_t j = 0; j < interval->numRanges(); j++) {
-            AllocatedRange range(interval, interval->getRange(j)), existing;
-            if (r.allocations.contains(range, &existing)) {
-                if (conflicting) {
-                    if (conflicting != existing.interval)
-                        return true;
-                } else {
-                    conflicting = existing.interval;
-                }
-                allocatable = false;
+                // If there are multiple fixed registers which the bundle is
+                // required to use, fail. The bundle will need to be split before
+                // it can be allocated.
+                if (!requirement->merge(Requirement(LAllocation(required))))
+                    return false;
+            } else if (policy == LUse::REGISTER) {
+                if (!requirement->merge(Requirement(Requirement::REGISTER)))
+                    return false;
+            } else if (policy == LUse::ANY) {
+                // ANY differs from KEEPALIVE by actively preferring a register.
+                hint->merge(Requirement(Requirement::REGISTER));
             }
         }
     }
 
-    if (!allocatable) {
-        MOZ_ASSERT(conflicting);
-        if (!*pconflicting || computeSpillWeight(conflicting) < computeSpillWeight(*pconflicting))
-            *pconflicting = conflicting;
-        if (!conflicting->hasVreg())
-            *pfixed = true;
-        return true;
-    }
-
-    *psuccess = true;
-
-    group->allocation = LAllocation(r.reg);
     return true;
 }
 
 bool
-BacktrackingAllocator::tryAllocateRegister(PhysicalRegister& r, LiveInterval* interval,
-                                           bool* success, bool* pfixed, LiveIntervalVector& conflicting)
+BacktrackingAllocator::tryAllocateRegister(PhysicalRegister& r, LiveBundle* bundle,
+                                           bool* success, bool* pfixed, LiveBundleVector& conflicting)
 {
     *success = false;
 
     if (!r.allocatable)
         return true;
 
-    BacktrackingVirtualRegister* reg = &vregs[interval->vreg()];
-    if (!reg->isCompatibleReg(r.reg))
-        return true;
+    LiveBundleVector aliasedConflicting;
 
-    MOZ_ASSERT_IF(interval->requirement()->kind() == Requirement::FIXED,
-                  interval->requirement()->allocation() == LAllocation(r.reg));
+    for (LiveRange::BundleLinkIterator iter = bundle->rangesBegin(); iter; iter++) {
+        LiveRange* range = LiveRange::get(*iter);
+        VirtualRegister &reg = vregs[range->vreg()];
 
-    LiveIntervalVector aliasedConflicting;
+        if (!reg.isCompatible(r.reg))
+            return true;
 
-    for (size_t i = 0; i < interval->numRanges(); i++) {
-        AllocatedRange range(interval, interval->getRange(i)), existing;
         for (size_t a = 0; a < r.reg.numAliased(); a++) {
             PhysicalRegister& rAlias = registers[r.reg.aliased(a).code()];
+            LiveRange* existing;
             if (!rAlias.allocations.contains(range, &existing))
                 continue;
-            if (existing.interval->hasVreg()) {
-                MOZ_ASSERT(existing.interval->getAllocation()->toRegister() == rAlias.reg);
+            if (existing->hasVreg()) {
+                MOZ_ASSERT(existing->bundle()->allocation().toRegister() == rAlias.reg);
                 bool duplicate = false;
                 for (size_t i = 0; i < aliasedConflicting.length(); i++) {
-                    if (aliasedConflicting[i] == existing.interval) {
+                    if (aliasedConflicting[i] == existing->bundle()) {
                         duplicate = true;
                         break;
                     }
                 }
-                if (!duplicate && !aliasedConflicting.append(existing.interval))
+                if (!duplicate && !aliasedConflicting.append(existing->bundle()))
                     return false;
             } else {
-                if (JitSpewEnabled(JitSpew_RegAlloc)) {
-                    JitSpew(JitSpew_RegAlloc, "  %s collides with fixed use %s",
-                            rAlias.reg.name(), existing.range->toString());
-                }
+                JitSpew(JitSpew_RegAlloc, "  %s collides with fixed use %s",
+                        rAlias.reg.name(), existing->toString());
                 *pfixed = true;
                 return true;
             }
@@ -834,24 +1386,22 @@
     }
 
     if (!aliasedConflicting.empty()) {
-        // One or more aliased registers is allocated to another live interval
+        // One or more aliased registers is allocated to another bundle
         // overlapping this one. Keep track of the conflicting set, and in the
         // case of multiple conflicting sets keep track of the set with the
         // lowest maximum spill weight.
 
         if (JitSpewEnabled(JitSpew_RegAlloc)) {
             if (aliasedConflicting.length() == 1) {
-                LiveInterval* existing = aliasedConflicting[0];
-                JitSpew(JitSpew_RegAlloc, "  %s collides with v%u[%u] %s [weight %lu]",
-                        r.reg.name(), existing->vreg(), existing->index(),
-                        existing->rangesToString(), computeSpillWeight(existing));
+                LiveBundle* existing = aliasedConflicting[0];
+                JitSpew(JitSpew_RegAlloc, "  %s collides with %s [weight %lu]",
+                        r.reg.name(), existing->toString(), computeSpillWeight(existing));
             } else {
                 JitSpew(JitSpew_RegAlloc, "  %s collides with the following", r.reg.name());
                 for (size_t i = 0; i < aliasedConflicting.length(); i++) {
-                    LiveInterval* existing = aliasedConflicting[i];
-                    JitSpew(JitSpew_RegAlloc, "      v%u[%u] %s [weight %lu]",
-                            existing->vreg(), existing->index(),
-                            existing->rangesToString(), computeSpillWeight(existing));
+                    LiveBundle* existing = aliasedConflicting[i];
+                    JitSpew(JitSpew_RegAlloc, "      %s [weight %lu]",
+                            existing->toString(), computeSpillWeight(existing));
                 }
             }
         }
@@ -871,190 +1421,117 @@
 
     JitSpew(JitSpew_RegAlloc, "  allocated to %s", r.reg.name());
 
-    for (size_t i = 0; i < interval->numRanges(); i++) {
-        AllocatedRange range(interval, interval->getRange(i));
+    for (LiveRange::BundleLinkIterator iter = bundle->rangesBegin(); iter; iter++) {
+        LiveRange* range = LiveRange::get(*iter);
         if (!r.allocations.insert(range))
             return false;
     }
 
-    // Set any register hint for allocating other intervals in the same group.
-    if (VirtualRegisterGroup* group = reg->group()) {
-        if (!group->allocation.isRegister())
-            group->allocation = LAllocation(r.reg);
-    }
-
-    interval->setAllocation(LAllocation(r.reg));
+    bundle->setAllocation(LAllocation(r.reg));
     *success = true;
     return true;
 }
 
 bool
-BacktrackingAllocator::evictInterval(LiveInterval* interval)
+BacktrackingAllocator::evictBundle(LiveBundle* bundle)
 {
     if (JitSpewEnabled(JitSpew_RegAlloc)) {
         JitSpew(JitSpew_RegAlloc, "  Evicting %s [priority %lu] [weight %lu]",
-                interval->toString(), computePriority(interval), computeSpillWeight(interval));
+                bundle->toString(), computePriority(bundle), computeSpillWeight(bundle));
     }
 
-    MOZ_ASSERT(interval->getAllocation()->isRegister());
-
-    AnyRegister reg(interval->getAllocation()->toRegister());
+    AnyRegister reg(bundle->allocation().toRegister());
     PhysicalRegister& physical = registers[reg.code()];
     MOZ_ASSERT(physical.reg == reg && physical.allocatable);
 
-    for (size_t i = 0; i < interval->numRanges(); i++) {
-        AllocatedRange range(interval, interval->getRange(i));
+    for (LiveRange::BundleLinkIterator iter = bundle->rangesBegin(); iter; iter++) {
+        LiveRange* range = LiveRange::get(*iter);
         physical.allocations.remove(range);
     }
 
-    interval->setAllocation(LAllocation());
-
-    size_t priority = computePriority(interval);
-    return allocationQueue.insert(QueueItem(interval, priority));
-}
-
-void
-BacktrackingAllocator::distributeUses(LiveInterval* interval,
-                                      const LiveIntervalVector& newIntervals)
-{
-    MOZ_ASSERT(newIntervals.length() >= 2);
+    bundle->setAllocation(LAllocation());
 
-    // Simple redistribution of uses from an old interval to a set of new
-    // intervals. Intervals are permitted to overlap, in which case this will
-    // assign uses in the overlapping section to the interval with the latest
-    // start position.
-    for (UsePositionIterator iter(interval->usesBegin());
-         iter != interval->usesEnd();
-         iter++)
-    {
-        CodePosition pos = iter->pos;
-        LiveInterval* addInterval = nullptr;
-        for (size_t i = 0; i < newIntervals.length(); i++) {
-            LiveInterval* newInterval = newIntervals[i];
-            if (newInterval->covers(pos)) {
-                if (!addInterval || newInterval->start() < addInterval->start())
-                    addInterval = newInterval;
-            }
-        }
-        addInterval->addUseAtEnd(new(alloc()) UsePosition(iter->use, iter->pos));
-    }
+    size_t priority = computePriority(bundle);
+    return allocationQueue.insert(QueueItem(bundle, priority));
 }
 
 bool
-BacktrackingAllocator::split(LiveInterval* interval,
-                             const LiveIntervalVector& newIntervals)
+BacktrackingAllocator::splitAndRequeueBundles(LiveBundle* bundle,
+                                              const LiveBundleVector& newBundles)
 {
     if (JitSpewEnabled(JitSpew_RegAlloc)) {
-        JitSpew(JitSpew_RegAlloc, "    splitting interval %s into:", interval->toString());
-        for (size_t i = 0; i < newIntervals.length(); i++) {
-            JitSpew(JitSpew_RegAlloc, "      %s", newIntervals[i]->toString());
-            MOZ_ASSERT(newIntervals[i]->start() >= interval->start());
-            MOZ_ASSERT(newIntervals[i]->end() <= interval->end());
-        }
+        JitSpew(JitSpew_RegAlloc, "    splitting bundle %s into:", bundle->toString());
+        for (size_t i = 0; i < newBundles.length(); i++)
+            JitSpew(JitSpew_RegAlloc, "      %s", newBundles[i]->toString());
     }
 
-    MOZ_ASSERT(newIntervals.length() >= 2);
-
-    // Find the earliest interval in the new list.
-    LiveInterval* first = newIntervals[0];
-    for (size_t i = 1; i < newIntervals.length(); i++) {
-        if (newIntervals[i]->start() < first->start())
-            first = newIntervals[i];
+    // Remove all ranges in the old bundle from their register's list.
+    for (LiveRange::BundleLinkIterator iter = bundle->rangesBegin(); iter; iter++) {
+        LiveRange* range = LiveRange::get(*iter);
+        vregs[range->vreg()].removeRange(range);
     }
 
-    // Replace the old interval in the virtual register's state with the new intervals.
-    VirtualRegister* reg = &vregs[interval->vreg()];
-    reg->replaceInterval(interval, first);
-    for (size_t i = 0; i < newIntervals.length(); i++) {
-        if (newIntervals[i] != first && !reg->addInterval(newIntervals[i]))
-            return false;
+    // Add all ranges in the new bundles to their register's list.
+    for (size_t i = 0; i < newBundles.length(); i++) {
+        LiveBundle* newBundle = newBundles[i];
+        for (LiveRange::BundleLinkIterator iter = newBundle->rangesBegin(); iter; iter++) {
+            LiveRange* range = LiveRange::get(*iter);
+            vregs[range->vreg()].addRange(range);
+        }
     }
 
-    return true;
-}
-
-bool BacktrackingAllocator::requeueIntervals(const LiveIntervalVector& newIntervals)
-{
-    // Queue the new intervals for register assignment.
-    for (size_t i = 0; i < newIntervals.length(); i++) {
-        LiveInterval* newInterval = newIntervals[i];
-        size_t priority = computePriority(newInterval);
-        if (!allocationQueue.insert(QueueItem(newInterval, priority)))
+    // Queue the new bundles for register assignment.
+    for (size_t i = 0; i < newBundles.length(); i++) {
+        LiveBundle* newBundle = newBundles[i];
+        size_t priority = computePriority(newBundle);
+        if (!allocationQueue.insert(QueueItem(newBundle, priority)))
             return false;
     }
+
     return true;
 }
 
-void
-BacktrackingAllocator::spill(LiveInterval* interval)
+bool
+BacktrackingAllocator::spill(LiveBundle* bundle)
 {
-    JitSpew(JitSpew_RegAlloc, "  Spilling interval");
-
-    MOZ_ASSERT(interval->requirement()->kind() == Requirement::NONE);
-    MOZ_ASSERT(!interval->getAllocation()->isStackSlot());
-
-    // We can't spill bogus intervals.
-    MOZ_ASSERT(interval->hasVreg());
-
-    BacktrackingVirtualRegister* reg = &vregs[interval->vreg()];
-
-    if (LiveInterval* spillInterval = interval->spillInterval()) {
-        JitSpew(JitSpew_RegAlloc, "    Spilling to existing spill interval");
-        while (!interval->usesEmpty())
-            spillInterval->addUse(interval->popUse());
-        reg->removeInterval(interval);
-        return;
-    }
-
-    bool useCanonical = !reg->hasCanonicalSpillExclude()
-        || interval->start() < reg->canonicalSpillExclude();
-
-    if (useCanonical) {
-        if (reg->canonicalSpill()) {
-            JitSpew(JitSpew_RegAlloc, "    Picked canonical spill location %s",
-                    reg->canonicalSpill()->toString());
-            interval->setAllocation(*reg->canonicalSpill());
-            return;
-        }
+    JitSpew(JitSpew_RegAlloc, "  Spilling bundle");
+    MOZ_ASSERT(bundle->allocation().isBogus());
 
-        if (reg->group() && !reg->group()->spill.isUse()) {
-            JitSpew(JitSpew_RegAlloc, "    Reusing group spill location %s",
-                    reg->group()->spill.toString());
-            interval->setAllocation(reg->group()->spill);
-            reg->setCanonicalSpill(reg->group()->spill);
-            return;
+    if (LiveBundle* spillParent = bundle->spillParent()) {
+        JitSpew(JitSpew_RegAlloc, "    Using existing spill bundle");
+        for (LiveRange::BundleLinkIterator iter = bundle->rangesBegin(); iter; iter++) {
+            LiveRange* range = LiveRange::get(*iter);
+            LiveRange* parentRange = spillParent->rangeFor(range->from());
+            MOZ_ASSERT(parentRange->contains(range));
+            MOZ_ASSERT(range->vreg() == parentRange->vreg());
+            range->distributeUses(parentRange);
+            MOZ_ASSERT(!range->hasUses());
+            vregs[range->vreg()].removeRange(range);
         }
+        return true;
     }
 
-    uint32_t virtualSlot = numVirtualStackSlots++;
-
-    // Count virtual stack slots down from the maximum representable value, so
-    // that virtual slots are more obviously distinguished from real slots.
-    LStackSlot alloc(LAllocation::DATA_MASK - virtualSlot);
-    interval->setAllocation(alloc);
-
-    JitSpew(JitSpew_RegAlloc, "    Allocating spill location %s", alloc.toString());
-
-    if (useCanonical) {
-        reg->setCanonicalSpill(alloc);
-        if (reg->group())
-            reg->group()->spill = alloc;
-    }
+    return bundle->spillSet()->addSpilledBundle(bundle);
 }
 
 bool
 BacktrackingAllocator::pickStackSlots()
 {
     for (size_t i = 1; i < graph.numVirtualRegisters(); i++) {
-        BacktrackingVirtualRegister* reg = &vregs[i];
+        VirtualRegister& reg = vregs[i];
 
         if (mir->shouldCancel("Backtracking Pick Stack Slots"))
             return false;
 
-        for (size_t j = 0; j < reg->numIntervals(); j++) {
-            LiveInterval* interval = reg->getInterval(j);
-            if (!pickStackSlot(interval))
-                return false;
+        for (LiveRange::RegisterLinkIterator iter = reg.rangesBegin(); iter; iter++) {
+            LiveRange* range = LiveRange::get(*iter);
+            LiveBundle* bundle = range->bundle();
+
+            if (bundle->allocation().isBogus()) {
+                if (!pickStackSlot(bundle->spillSet()))
+                    return false;
+                MOZ_ASSERT(!bundle->allocation().isBogus());
+            }
         }
     }
 
@@ -1062,69 +1539,31 @@
 }
 
 bool
-BacktrackingAllocator::pickStackSlot(LiveInterval* interval)
+BacktrackingAllocator::pickStackSlot(SpillSet* spillSet)
 {
-    LAllocation alloc = *interval->getAllocation();
-    MOZ_ASSERT(!alloc.isUse());
-
-    if (!isVirtualStackSlot(alloc))
-        return true;
-
-    BacktrackingVirtualRegister& reg = vregs[interval->vreg()];
-
-    // Get a list of all the intervals which will share this stack slot.
-    LiveIntervalVector commonIntervals;
-
-    if (!commonIntervals.append(interval))
-        return false;
-
-    if (reg.canonicalSpill() && alloc == *reg.canonicalSpill()) {
-        // Look for other intervals in the vreg using this spill slot.
-        for (size_t i = 0; i < reg.numIntervals(); i++) {
-            LiveInterval* ninterval = reg.getInterval(i);
-            if (ninterval != interval && *ninterval->getAllocation() == alloc) {
-                if (!commonIntervals.append(ninterval))
-                    return false;
-            }
-        }
-
-        // Look for intervals in other registers with the same group using this
-        // spill slot.
-        if (reg.group() && alloc == reg.group()->spill) {
-            for (size_t i = 0; i < reg.group()->registers.length(); i++) {
-                uint32_t nvreg = reg.group()->registers[i];
-                if (nvreg == interval->vreg())
-                    continue;
-                BacktrackingVirtualRegister& nreg = vregs[nvreg];
-                for (size_t j = 0; j < nreg.numIntervals(); j++) {
-                    LiveInterval* ninterval = nreg.getInterval(j);
-                    if (*ninterval->getAllocation() == alloc) {
-                        if (!commonIntervals.append(ninterval))
-                            return false;
-                    }
+    // Look through all ranges that have been spilled in this set for a
+    // register definition which is fixed to a stack or argument slot. If we
+    // find one, use it for all bundles that have been spilled. tryMergeBundles
+    // makes sure this reuse is possible when an initial bundle contains ranges
+    // from multiple virtual registers.
+    for (size_t i = 0; i < spillSet->numSpilledBundles(); i++) {
+        LiveBundle* bundle = spillSet->spilledBundle(i);
+        for (LiveRange::BundleLinkIterator iter = bundle->rangesBegin(); iter; iter++) {
+            LiveRange* range = LiveRange::get(*iter);
+            if (range->hasDefinition()) {
+                LDefinition* def = vregs[range->vreg()].def();
+                if (def->policy() == LDefinition::FIXED) {
+                    MOZ_ASSERT(!def->output()->isRegister());
+                    MOZ_ASSERT(!def->output()->isStackSlot());
+                    spillSet->setAllocation(*def->output());
+                    return true;
                 }
             }
         }
-    } else {
-        MOZ_ASSERT_IF(reg.group(), alloc != reg.group()->spill);
     }
 
-    if (!reuseOrAllocateStackSlot(commonIntervals, reg.type(), &alloc))
-        return false;
-
-    MOZ_ASSERT(!isVirtualStackSlot(alloc));
-
-    // Set the physical stack slot for each of the intervals found earlier.
-    for (size_t i = 0; i < commonIntervals.length(); i++)
-        commonIntervals[i]->setAllocation(alloc);
-
-    return true;
-}
+    LDefinition::Type type = vregs[spillSet->spilledBundle(0)->firstRange()->vreg()].type();
 
-bool
-BacktrackingAllocator::reuseOrAllocateStackSlot(const LiveIntervalVector& intervals, LDefinition::Type type,
-                                                LAllocation* palloc)
-{
     SpillSlotList* slotList;
     switch (StackSlotAllocator::width(type)) {
       case 4:  slotList = &normalSlots; break;
@@ -1138,108 +1577,125 @@
     // and allocating a new slot.
     static const size_t MAX_SEARCH_COUNT = 10;
 
-    if (!slotList->empty()) {
-        size_t searches = 0;
-        SpillSlot* stop = nullptr;
-        while (true) {
-            SpillSlot* spill = *slotList->begin();
-            if (!stop) {
-                stop = spill;
-            } else if (stop == spill) {
-                // We looked through every slot in the list.
-                break;
-            }
+    size_t searches = 0;
+    SpillSlot* stop = nullptr;
+    while (!slotList->empty()) {
+        SpillSlot* spillSlot = *slotList->begin();
+        if (!stop) {
+            stop = spillSlot;
+        } else if (stop == spillSlot) {
+            // We looked through every slot in the list.
+            break;
+        }
 
-            bool success = true;
-            for (size_t i = 0; i < intervals.length() && success; i++) {
-                LiveInterval* interval = intervals[i];
-                for (size_t j = 0; j < interval->numRanges(); j++) {
-                    AllocatedRange range(interval, interval->getRange(j)), existing;
-                    if (spill->allocated.contains(range, &existing)) {
-                        success = false;
-                        break;
-                    }
+        bool success = true;
+        for (size_t i = 0; i < spillSet->numSpilledBundles(); i++) {
+            LiveBundle* bundle = spillSet->spilledBundle(i);
+            for (LiveRange::BundleLinkIterator iter = bundle->rangesBegin(); iter; iter++) {
+                LiveRange* range = LiveRange::get(*iter);
+                LiveRange* existing;
+                if (spillSlot->allocated.contains(range, &existing)) {
+                    success = false;
+                    break;
                 }
             }
-            if (success) {
-                // We can reuse this physical stack slot for the new intervals.
-                // Update the allocated ranges for the slot.
-                if (!insertAllRanges(spill->allocated, intervals))
+            if (!success)
+                break;
+        }
+        if (success) {
+            // We can reuse this physical stack slot for the new bundles.
+            // Update the allocated ranges for the slot.
+            for (size_t i = 0; i < spillSet->numSpilledBundles(); i++) {
+                LiveBundle* bundle = spillSet->spilledBundle(i);
+                if (!insertAllRanges(spillSlot->allocated, bundle))
                     return false;
-                *palloc = spill->alloc;
-                return true;
             }
+            spillSet->setAllocation(spillSlot->alloc);
+            return true;
+        }
 
-            // On a miss, move the spill to the end of the list. This will cause us
-            // to make fewer attempts to allocate from slots with a large and
-            // highly contended range.
-            slotList->popFront();
-            slotList->pushBack(spill);
+        // On a miss, move the spill to the end of the list. This will cause us
+        // to make fewer attempts to allocate from slots with a large and
+        // highly contended range.
+        slotList->popFront();
+        slotList->pushBack(spillSlot);
 
-            if (++searches == MAX_SEARCH_COUNT)
-                break;
-        }
+        if (++searches == MAX_SEARCH_COUNT)
+            break;
     }
 
     // We need a new physical stack slot.
     uint32_t stackSlot = stackSlotAllocator.allocateSlot(type);
 
-    // Make sure the virtual and physical stack slots don't start overlapping.
-    if (isVirtualStackSlot(LStackSlot(stackSlot)))
-        return false;
-
-    SpillSlot* spill = new(alloc()) SpillSlot(stackSlot, alloc().lifoAlloc());
-    if (!spill)
+    SpillSlot* spillSlot = new(alloc()) SpillSlot(stackSlot, alloc().lifoAlloc());
+    if (!spillSlot)
         return false;
 
-    if (!insertAllRanges(spill->allocated, intervals))
-        return false;
+    for (size_t i = 0; i < spillSet->numSpilledBundles(); i++) {
+        LiveBundle* bundle = spillSet->spilledBundle(i);
+        if (!insertAllRanges(spillSlot->allocated, bundle))
+            return false;
+    }
 
-    *palloc = spill->alloc;
+    spillSet->setAllocation(spillSlot->alloc);
 
-    slotList->pushFront(spill);
+    slotList->pushFront(spillSlot);
     return true;
 }
 
 bool
-BacktrackingAllocator::insertAllRanges(AllocatedRangeSet& set, const LiveIntervalVector& intervals)
+BacktrackingAllocator::insertAllRanges(LiveRangeSet& set, LiveBundle* bundle)
 {
-    for (size_t i = 0; i < intervals.length(); i++) {
-        LiveInterval* interval = intervals[i];
-        for (size_t j = 0; j < interval->numRanges(); j++) {
-            AllocatedRange range(interval, interval->getRange(j));
-            if (!set.insert(range))
-                return false;
-        }
+    for (LiveRange::BundleLinkIterator iter = bundle->rangesBegin(); iter; iter++) {
+        LiveRange* range = LiveRange::get(*iter);
+        if (!set.insert(range))
+            return false;
     }
     return true;
 }
 
-// Add moves to resolve conflicting assignments between a block and its
-// predecessors.
 bool
 BacktrackingAllocator::resolveControlFlow()
 {
+    // Add moves to handle changing assignments for vregs over their lifetime.
     JitSpew(JitSpew_RegAlloc, "Resolving control flow (vreg loop)");
 
-    // Virtual register number 0 is unused.
-    MOZ_ASSERT(vregs[0u].numIntervals() == 0);
+    // Look for places where a register's assignment changes in the middle of a
+    // basic block.
+    MOZ_ASSERT(!vregs[0u].hasRanges());
     for (size_t i = 1; i < graph.numVirtualRegisters(); i++) {
-        BacktrackingVirtualRegister* reg = &vregs[i];
+        VirtualRegister& reg = vregs[i];
 
         if (mir->shouldCancel("Backtracking Resolve Control Flow (vreg loop)"))
             return false;
 
-        for (size_t j = 1; j < reg->numIntervals(); j++) {
-            LiveInterval* interval = reg->getInterval(j);
-            MOZ_ASSERT(interval->index() == j);
+        for (LiveRange::RegisterLinkIterator iter = reg.rangesBegin(); iter; iter++) {
+            LiveRange* range = LiveRange::get(*iter);
+
+            // The range which defines the register does not have a predecessor
+            // to add moves from.
+            if (range->hasDefinition())
+                continue;
+
+            // Ignore ranges that start at block boundaries. We will handle
+            // these in the next phase.
+            CodePosition start = range->from();
+            LNode* ins = insData[start];
+            if (start == entryOf(ins->block()))
+                continue;
 
+            // If we already saw a range which covers the start of this range
+            // and has the same allocation, we don't need an explicit move at
+            // the start of this range.
             bool skip = false;
-            for (int k = j - 1; k >= 0; k--) {
-                LiveInterval* prevInterval = reg->getInterval(k);
-                if (prevInterval->start() != interval->start())
-                    break;
-                if (*prevInterval->getAllocation() == *interval->getAllocation()) {
+            for (LiveRange::RegisterLinkIterator prevIter = reg.rangesBegin();
+                 prevIter != iter;
+                 prevIter++)
+            {
+                LiveRange* prevRange = LiveRange::get(*prevIter);
+                if (prevRange->covers(start) &&
+                    prevRange->bundle()->allocation() == range->bundle()->allocation())
+                {
                     skip = true;
                     break;
                 }
@@ -1247,19 +1703,13 @@
             if (skip)
                 continue;
 
-            CodePosition start = interval->start();
-            LNode* ins = insData[start];
-            if (start > entryOf(ins->block())) {
-                MOZ_ASSERT(start == inputOf(ins) || start == outputOf(ins));
-
-                LiveInterval* prevInterval = reg->intervalFor(start.previous());
-                if (start.subpos() == CodePosition::INPUT) {
-                    if (!moveInput(ins->toInstruction(), prevInterval, interval, reg->type()))
-                        return false;
-                } else {
-                    if (!moveAfter(ins->toInstruction(), prevInterval, interval, reg->type()))
-                        return false;
-                }
+            LiveRange* predecessorRange = reg.rangeFor(start.previous());
+            if (start.subpos() == CodePosition::INPUT) {
+                if (!moveInput(ins->toInstruction(), predecessorRange, range, reg.type()))
+                    return false;
+            } else {
+                if (!moveAfter(ins->toInstruction(), predecessorRange, range, reg.type()))
+                    return false;
             }
         }
     }
@@ -1275,13 +1725,13 @@
         if (mSuccessor->numPredecessors() < 1)
             continue;
 
-        // Resolve phis to moves
+        // Resolve phis to moves.
         for (size_t j = 0; j < successor->numPhis(); j++) {
             LPhi* phi = successor->getPhi(j);
             MOZ_ASSERT(phi->numDefs() == 1);
             LDefinition* def = phi->getDef(0);
-            VirtualRegister* vreg = &vregs[def];
-            LiveInterval* to = vreg->intervalFor(entryOf(successor));
+            VirtualRegister& reg = vreg(def);
+            LiveRange* to = reg.rangeFor(entryOf(successor));
             MOZ_ASSERT(to);
 
             for (size_t k = 0; k < mSuccessor->numPredecessors(); k++) {
@@ -1289,7 +1739,7 @@
                 MOZ_ASSERT(predecessor->mir()->numSuccessors() == 1);
 
                 LAllocation* input = phi->getOperand(k);
-                LiveInterval* from = vregs[input].intervalFor(exitOf(predecessor));
+                LiveRange* from = vreg(input).rangeFor(exitOf(predecessor));
                 MOZ_ASSERT(from);
 
                 if (!moveAtExit(predecessor, from, to, def->type()))
@@ -1297,7 +1747,8 @@
             }
         }
 
-        // Resolve split intervals with moves
+        // Add moves to resolve graph edges with different allocations at their
+        // source and target.
         BitSet& live = liveIn[mSuccessor->id()];
 
         for (BitSet::Iterator liveRegId(live); liveRegId; ++liveRegId) {
@@ -1306,14 +1757,14 @@
             for (size_t j = 0; j < mSuccessor->numPredecessors(); j++) {
                 LBlock* predecessor = mSuccessor->getPredecessor(j)->lir();
 
-                for (size_t k = 0; k < reg.numIntervals(); k++) {
-                    LiveInterval* to = reg.getInterval(k);
+                for (LiveRange::RegisterLinkIterator iter = reg.rangesBegin(); iter; iter++) {
+                    LiveRange* to = LiveRange::get(*iter);
                     if (!to->covers(entryOf(successor)))
                         continue;
                     if (to->covers(exitOf(predecessor)))
                         continue;
 
-                    LiveInterval* from = reg.intervalFor(exitOf(predecessor));
+                    LiveRange* from = reg.rangeFor(exitOf(predecessor));
 
                     if (mSuccessor->numPredecessors() > 1) {
                         MOZ_ASSERT(predecessor->mir()->numSuccessors() == 1);
@@ -1356,12 +1807,12 @@
 }
 
 bool
-BacktrackingAllocator::isRegisterDefinition(LiveInterval* interval)
+BacktrackingAllocator::isRegisterDefinition(LiveRange* range)
 {
-    if (interval->index() != 0)
+    if (!range->hasDefinition())
         return false;
 
-    VirtualRegister& reg = vregs[interval->vreg()];
+    VirtualRegister& reg = vregs[range->vreg()];
     if (reg.ins()->isPhi())
         return false;
 
@@ -1376,56 +1827,50 @@
 {
     JitSpew(JitSpew_RegAlloc, "Reifying Allocations");
 
-    // Virtual register number 0 is unused.
-    MOZ_ASSERT(vregs[0u].numIntervals() == 0);
+    MOZ_ASSERT(!vregs[0u].hasRanges());
     for (size_t i = 1; i < graph.numVirtualRegisters(); i++) {
-        VirtualRegister* reg = &vregs[i];
+        VirtualRegister& reg = vregs[i];
 
         if (mir->shouldCancel("Backtracking Reify Allocations (main loop)"))
             return false;
 
-        for (size_t j = 0; j < reg->numIntervals(); j++) {
-            LiveInterval* interval = reg->getInterval(j);
-            MOZ_ASSERT(interval->index() == j);
-
-            if (interval->index() == 0) {
-                reg->def()->setOutput(*interval->getAllocation());
-                if (reg->ins()->recoversInput()) {
-                    LSnapshot* snapshot = reg->ins()->toInstruction()->snapshot();
+        for (LiveRange::RegisterLinkIterator iter = reg.rangesBegin(); iter; iter++) {
+            LiveRange* range = LiveRange::get(*iter);
+
+            if (range->hasDefinition()) {
+                reg.def()->setOutput(range->bundle()->allocation());
+                if (reg.ins()->recoversInput()) {
+                    LSnapshot* snapshot = reg.ins()->toInstruction()->snapshot();
                     for (size_t i = 0; i < snapshot->numEntries(); i++) {
                         LAllocation* entry = snapshot->getEntry(i);
                         if (entry->isUse() && entry->toUse()->policy() == LUse::RECOVERED_INPUT)
-                            *entry = *reg->def()->output();
+                            *entry = *reg.def()->output();
                     }
                 }
             }
 
-            for (UsePositionIterator iter(interval->usesBegin());
-                 iter != interval->usesEnd();
-                 iter++)
-            {
+            for (UsePositionIterator iter(range->usesBegin()); iter; iter++) {
                 LAllocation* alloc = iter->use;
-                *alloc = *interval->getAllocation();
+                *alloc = range->bundle()->allocation();
 
                 // For any uses which feed into MUST_REUSE_INPUT definitions,
                 // add copies if the use and def have different allocations.
                 LNode* ins = insData[iter->pos];
                 if (LDefinition* def = FindReusingDefinition(ins, alloc)) {
-                    LiveInterval* outputInterval =
-                        vregs[def->virtualRegister()].intervalFor(outputOf(ins));
-                    LAllocation* res = outputInterval->getAllocation();
-                    LAllocation* sourceAlloc = interval->getAllocation();
+                    LiveRange* outputRange = vreg(def).rangeFor(outputOf(ins));
+                    LAllocation res = outputRange->bundle()->allocation();
+                    LAllocation sourceAlloc = range->bundle()->allocation();
 
-                    if (*res != *alloc) {
+                    if (res != *alloc) {
                         LMoveGroup* group = getInputMoveGroup(ins->toInstruction());
-                        if (!group->addAfter(sourceAlloc, res, reg->type()))
+                        if (!group->addAfter(sourceAlloc, res, reg.type()))
                             return false;
-                        *alloc = *res;
+                        *alloc = res;
                     }
                 }
             }
 
-            addLiveRegistersForInterval(reg, interval);
+            addLiveRegistersForRange(reg, range);
         }
     }
 
@@ -1433,6 +1878,104 @@
     return true;
 }
 
+size_t
+BacktrackingAllocator::findFirstNonCallSafepoint(CodePosition from)
+{
+    size_t i = 0;
+    for (; i < graph.numNonCallSafepoints(); i++) {
+        const LInstruction* ins = graph.getNonCallSafepoint(i);
+        if (from <= inputOf(ins))
+            break;
+    }
+    return i;
+}
+
+void
+BacktrackingAllocator::addLiveRegistersForRange(VirtualRegister& reg, LiveRange* range)
+{
+    // Fill in the live register sets for all non-call safepoints.
+    LAllocation a = range->bundle()->allocation();
+    if (!a.isRegister())
+        return;
+
+    // Don't add output registers to the safepoint.
+    CodePosition start = range->from();
+    if (range->hasDefinition() && !reg.isTemp()) {
+#ifdef CHECK_OSIPOINT_REGISTERS
+        // We don't add the output register to the safepoint,
+        // but it still might get added as one of the inputs.
+        // So eagerly add this reg to the safepoint clobbered registers.
+        if (reg.ins()->isInstruction()) {
+            if (LSafepoint* safepoint = reg.ins()->toInstruction()->safepoint())
+                safepoint->addClobberedRegister(a.toRegister());
+        }
+#endif
+        start = start.next();
+    }
+
+    size_t i = findFirstNonCallSafepoint(start);
+    for (; i < graph.numNonCallSafepoints(); i++) {
+        LInstruction* ins = graph.getNonCallSafepoint(i);
+        CodePosition pos = inputOf(ins);
+
+        // Safepoints are sorted, so we can shortcut out of this loop
+        // if we go out of range.
+        if (range->to() <= pos)
+            break;
+
+        MOZ_ASSERT(range->covers(pos));
+
+        LSafepoint* safepoint = ins->safepoint();
+        safepoint->addLiveRegister(a.toRegister());
+
+#ifdef CHECK_OSIPOINT_REGISTERS
+        if (reg.isTemp())
+            safepoint->addClobberedRegister(a.toRegister());
+#endif
+    }
+}
+
+static inline bool
+IsNunbox(VirtualRegister& reg)
+{
+#ifdef JS_NUNBOX32
+    return reg.type() == LDefinition::TYPE ||
+           reg.type() == LDefinition::PAYLOAD;
+#else
+    return false;
+#endif
+}
+
+static inline bool
+IsSlotsOrElements(VirtualRegister& reg)
+{
+    return reg.type() == LDefinition::SLOTS;
+}
+
+static inline bool
+IsTraceable(VirtualRegister& reg)
+{
+    if (reg.type() == LDefinition::OBJECT)
+        return true;
+#ifdef JS_PUNBOX64
+    if (reg.type() == LDefinition::BOX)
+        return true;
+#endif
+    return false;
+}
+
+size_t
+BacktrackingAllocator::findFirstSafepoint(CodePosition pos, size_t startFrom)
+{
+    size_t i = startFrom;
+    for (; i < graph.numSafepoints(); i++) {
+        LInstruction* ins = graph.getSafepoint(i);
+        if (pos <= inputOf(ins))
+            break;
+    }
+    return i;
+}
+
 bool
 BacktrackingAllocator::populateSafepoints()
 {
@@ -1440,73 +1983,70 @@
 
     size_t firstSafepoint = 0;
 
-    // Virtual register number 0 is unused.
     MOZ_ASSERT(!vregs[0u].def());
-    for (uint32_t i = 1; i < vregs.numVirtualRegisters(); i++) {
-        BacktrackingVirtualRegister* reg = &vregs[i];
+    for (uint32_t i = 1; i < graph.numVirtualRegisters(); i++) {
+        VirtualRegister& reg = vregs[i];
 
-        if (!reg->def() || (!IsTraceable(reg) && !IsSlotsOrElements(reg) && !IsNunbox(reg)))
+        if (!reg.def() || (!IsTraceable(reg) && !IsSlotsOrElements(reg) && !IsNunbox(reg)))
             continue;
 
-        firstSafepoint = findFirstSafepoint(reg->getInterval(0), firstSafepoint);
+        firstSafepoint = findFirstSafepoint(inputOf(reg.ins()), firstSafepoint);
         if (firstSafepoint >= graph.numSafepoints())
             break;
 
-        // Find the furthest endpoint. Intervals are sorted, but by start
-        // position, and we want the greatest end position.
-        CodePosition end = reg->getInterval(0)->end();
-        for (size_t j = 1; j < reg->numIntervals(); j++)
-            end = Max(end, reg->getInterval(j)->end());
-
-        for (size_t j = firstSafepoint; j < graph.numSafepoints(); j++) {
-            LInstruction* ins = graph.getSafepoint(j);
-
-            // Stop processing safepoints if we know we're out of this virtual
-            // register's range.
-            if (end < outputOf(ins))
-                break;
+        for (LiveRange::RegisterLinkIterator iter = reg.rangesBegin(); iter; iter++) {
+            LiveRange* range = LiveRange::get(*iter);
 
-            // Include temps but not instruction outputs. Also make sure MUST_REUSE_INPUT
-            // is not used with gcthings or nunboxes, or we would have to add the input reg
-            // to this safepoint.
-            if (ins == reg->ins() && !reg->isTemp()) {
-                DebugOnly<LDefinition*> def = reg->def();
-                MOZ_ASSERT_IF(def->policy() == LDefinition::MUST_REUSE_INPUT,
-                              def->type() == LDefinition::GENERAL ||
-                              def->type() == LDefinition::INT32 ||
-                              def->type() == LDefinition::FLOAT32 ||
-                              def->type() == LDefinition::DOUBLE);
-                continue;
-            }
+            for (size_t j = firstSafepoint; j < graph.numSafepoints(); j++) {
+                LInstruction* ins = graph.getSafepoint(j);
 
-            LSafepoint* safepoint = ins->safepoint();
+                if (!range->covers(inputOf(ins))) {
+                    if (inputOf(ins) >= range->to())
+                        break;
+                    continue;
+                }
 
-            for (size_t k = 0; k < reg->numIntervals(); k++) {
-                LiveInterval* interval = reg->getInterval(k);
-                if (!interval->covers(inputOf(ins)))
+                // Include temps but not instruction outputs. Also make sure
+                // MUST_REUSE_INPUT is not used with gcthings or nunboxes, or
+                // we would have to add the input reg to this safepoint.
+                if (ins == reg.ins() && !reg.isTemp()) {
+                    DebugOnly<LDefinition*> def = reg.def();
+                    MOZ_ASSERT_IF(def->policy() == LDefinition::MUST_REUSE_INPUT,
+                                  def->type() == LDefinition::GENERAL ||
+                                  def->type() == LDefinition::INT32 ||
+                                  def->type() == LDefinition::FLOAT32 ||
+                                  def->type() == LDefinition::DOUBLE);
                     continue;
+                }
 
-                LAllocation* a = interval->getAllocation();
-                if (a->isGeneralReg() && ins->isCall())
+                LSafepoint* safepoint = ins->safepoint();
+
+                LAllocation a = range->bundle()->allocation();
+                if (a.isGeneralReg() && ins->isCall())
                     continue;
 
-                switch (reg->type()) {
+                switch (reg.type()) {
                   case LDefinition::OBJECT:
-                    safepoint->addGcPointer(*a);
+                    if (!safepoint->addGcPointer(a))
+                        return false;
                     break;
                   case LDefinition::SLOTS:
-                    safepoint->addSlotsOrElementsPointer(*a);
+                    if (!safepoint->addSlotsOrElementsPointer(a))
+                        return false;
                     break;
 #ifdef JS_NUNBOX32
                   case LDefinition::TYPE:
-                    safepoint->addNunboxType(i, *a);
+                    if (!safepoint->addNunboxType(i, a))
+                        return false;
                     break;
                   case LDefinition::PAYLOAD:
-                    safepoint->addNunboxPayload(i, *a);
+                    if (!safepoint->addNunboxPayload(i, a))
+                        return false;
                     break;
 #else
                   case LDefinition::BOX:
-                    safepoint->addBoxedValue(*a);
+                    if (!safepoint->addBoxedValue(a))
+                        return false;
                     break;
 #endif
                   default:
@@ -1527,6 +2067,10 @@
     // only required for x86, as other platforms always have scratch registers
     // available for use.
 #ifdef JS_CODEGEN_X86
+    LiveRange* range = LiveRange::New(alloc(), 0, CodePosition(), CodePosition().next());
+    if (!range)
+        return false;
+
     for (size_t i = 0; i < graph.numBlocks(); i++) {
         if (mir->shouldCancel("Backtracking Annotate Move Groups"))
             return false;
@@ -1536,8 +2080,8 @@
         for (LInstructionIterator iter = block->begin(); iter != block->end(); ++iter) {
             if (iter->isMoveGroup()) {
                 CodePosition from = last ? outputOf(last) : entryOf(block);
-                LiveInterval::Range range(from, from.next());
-                AllocatedRange search(nullptr, &range), existing;
+                range->setTo(from.next());
+                range->setFrom(from);
 
                 for (size_t i = 0; i < AnyRegister::Total; i++) {
                     PhysicalRegister& reg = registers[i];
@@ -1545,9 +2089,9 @@
                         continue;
 
                     // This register is unavailable for use if (a) it is in use
-                    // by some live interval immediately before the move group,
+                    // by some live range immediately before the move group,
                     // or (b) it is an operand in one of the group's moves. The
-                    // latter case handles live intervals which end immediately
+                    // latter case handles live ranges which end immediately
                     // before the move group or start immediately after.
                     // For (b) we need to consider move groups immediately
                     // preceding or following this one.
@@ -1581,7 +2125,8 @@
                         } while (riter != block->begin());
                     }
 
-                    if (found || reg.allocations.contains(search, &existing))
+                    LiveRange* existing;
+                    if (found || reg.allocations.contains(range, &existing))
                         continue;
 
                     iter->toMoveGroup()->setScratchRegister(reg.reg.gpr());
@@ -1597,71 +2142,131 @@
     return true;
 }
 
-void
-BacktrackingAllocator::dumpRegisterGroups()
-{
+/////////////////////////////////////////////////////////////////////
+// Debugging methods
+/////////////////////////////////////////////////////////////////////
+
 #ifdef DEBUG
-    bool any = false;
 
-    // Virtual register number 0 is unused.
-    MOZ_ASSERT(!vregs[0u].group());
-    for (size_t i = 1; i < graph.numVirtualRegisters(); i++) {
-        VirtualRegisterGroup* group = vregs[i].group();
-        if (group && i == group->canonicalReg()) {
-            if (!any) {
-                fprintf(stderr, "Register groups:\n");
-                any = true;
-            }
-            fprintf(stderr, " ");
-            for (size_t j = 0; j < group->registers.length(); j++)
-                fprintf(stderr, " v%u", group->registers[j]);
-            fprintf(stderr, "\n");
-        }
+const char*
+LiveRange::toString() const
+{
+    // Not reentrant!
+    static char buf[2000];
+
+    char* cursor = buf;
+    char* end = cursor + sizeof(buf);
+
+    int n = JS_snprintf(cursor, end - cursor, "v%u [%u,%u)",
+                        hasVreg() ? vreg() : 0, from().bits(), to().bits());
+    if (n < 0) MOZ_CRASH();
+    cursor += n;
+
+    if (bundle() && !bundle()->allocation().isBogus()) {
+        n = JS_snprintf(cursor, end - cursor, " %s", bundle()->allocation().toString());
+        if (n < 0) MOZ_CRASH();
+        cursor += n;
     }
-    if (any)
-        fprintf(stderr, "\n");
-#endif
+
+    if (hasDefinition()) {
+        n = JS_snprintf(cursor, end - cursor, " (def)");
+        if (n < 0) MOZ_CRASH();
+        cursor += n;
+    }
+
+    for (UsePositionIterator iter = usesBegin(); iter; iter++) {
+        n = JS_snprintf(cursor, end - cursor, " %s@%u", iter->use->toString(), iter->pos.bits());
+        if (n < 0) MOZ_CRASH();
+        cursor += n;
+    }
+
+    return buf;
+}
+
+const char*
+LiveBundle::toString() const
+{
+    // Not reentrant!
+    static char buf[2000];
+
+    char* cursor = buf;
+    char* end = cursor + sizeof(buf);
+
+    for (LiveRange::BundleLinkIterator iter = rangesBegin(); iter; iter++) {
+        int n = JS_snprintf(cursor, end - cursor, "%s %s",
+                            (iter == rangesBegin()) ? "" : " ##",
+                            LiveRange::get(*iter)->toString());
+        if (n < 0) MOZ_CRASH();
+        cursor += n;
+    }
+
+    return buf;
 }
 
+#endif // DEBUG
+
 void
-BacktrackingAllocator::dumpFixedRanges()
+BacktrackingAllocator::dumpVregs()
 {
 #ifdef DEBUG
-    bool any = false;
+    MOZ_ASSERT(!vregs[0u].hasRanges());
 
-    for (size_t i = 0; i < AnyRegister::Total; i++) {
-        if (registers[i].allocatable && fixedIntervals[i]->numRanges() != 0) {
-            if (!any) {
-                fprintf(stderr, "Live ranges by physical register:\n");
-                any = true;
+    fprintf(stderr, "Live ranges by virtual register:\n");
+
+    for (uint32_t i = 1; i < graph.numVirtualRegisters(); i++) {
+        fprintf(stderr, "  ");
+        VirtualRegister& reg = vregs[i];
+        for (LiveRange::RegisterLinkIterator iter = reg.rangesBegin(); iter; iter++) {
+            if (iter != reg.rangesBegin())
+                fprintf(stderr, " ## ");
+            fprintf(stderr, "%s", LiveRange::get(*iter)->toString());
+        }
+        fprintf(stderr, "\n");
+    }
+
+    fprintf(stderr, "\nLive ranges by bundle:\n");
+
+    for (uint32_t i = 1; i < graph.numVirtualRegisters(); i++) {
+        VirtualRegister& reg = vregs[i];
+        for (LiveRange::RegisterLinkIterator baseIter = reg.rangesBegin(); baseIter; baseIter++) {
+            LiveRange* range = LiveRange::get(*baseIter);
+            LiveBundle* bundle = range->bundle();
+            if (range == bundle->firstRange()) {
+                fprintf(stderr, "  ");
+                for (LiveRange::BundleLinkIterator iter = bundle->rangesBegin(); iter; iter++) {
+                    if (iter != bundle->rangesBegin())
+                        fprintf(stderr, " ## ");
+                    fprintf(stderr, "%s", LiveRange::get(*iter)->toString());
+                }
+                fprintf(stderr, "\n");
             }
-            fprintf(stderr, "  %s: %s\n", AnyRegister::FromCode(i).name(), fixedIntervals[i]->toString());
         }
     }
+#endif
+}
 
-    if (any)
-        fprintf(stderr, "\n");
+void
+BacktrackingAllocator::dumpFixedRanges()
+{
+#ifdef DEBUG
+    fprintf(stderr, "Live ranges by physical register: %s\n", callRanges->toString());
 #endif // DEBUG
 }
 
 #ifdef DEBUG
-struct BacktrackingAllocator::PrintLiveIntervalRange
+struct BacktrackingAllocator::PrintLiveRange
 {
     bool& first_;
 
-    explicit PrintLiveIntervalRange(bool& first) : first_(first) {}
+    explicit PrintLiveRange(bool& first) : first_(first) {}
 
-    void operator()(const AllocatedRange& item)
+    void operator()(const LiveRange* range)
     {
-        if (item.range == item.interval->getRange(0)) {
-            if (first_)
-                first_ = false;
-            else
-                fprintf(stderr, " /");
-            if (item.interval->hasVreg())
-                fprintf(stderr, " v%u[%u]", item.interval->vreg(), item.interval->index());
-            fprintf(stderr, "%s", item.interval->rangesToString());
-        }
+        if (first_)
+            first_ = false;
+        else
+            fprintf(stderr, " /");
+        fprintf(stderr, " %s", range->toString());
     }
 };
 #endif
@@ -1670,7 +2275,7 @@
 BacktrackingAllocator::dumpAllocations()
 {
 #ifdef DEBUG
-    fprintf(stderr, "Allocations by virtual register:\n");
+    fprintf(stderr, "Allocations:\n");
 
     dumpVregs();
 
@@ -1680,7 +2285,7 @@
         if (registers[i].allocatable && !registers[i].allocations.empty()) {
             fprintf(stderr, "  %s:", AnyRegister::FromCode(i).name());
             bool first = true;
-            registers[i].allocations.forEach(PrintLiveIntervalRange(first));
+            registers[i].allocations.forEach(PrintLiveRange(first));
             fprintf(stderr, "\n");
         }
     }
@@ -1689,82 +2294,69 @@
 #endif // DEBUG
 }
 
-bool
-BacktrackingAllocator::addLiveInterval(LiveIntervalVector& intervals, uint32_t vreg,
-                                       LiveInterval* spillInterval,
-                                       CodePosition from, CodePosition to)
-{
-    LiveInterval* interval = LiveInterval::New(alloc(), vreg, 0);
-    interval->setSpillInterval(spillInterval);
-    return interval->addRange(from, to) && intervals.append(interval);
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // Heuristic Methods
 ///////////////////////////////////////////////////////////////////////////////
 
 size_t
-BacktrackingAllocator::computePriority(const LiveInterval* interval)
+BacktrackingAllocator::computePriority(LiveBundle* bundle)
 {
-    // The priority of an interval is its total length, so that longer lived
-    // intervals will be processed before shorter ones (even if the longer ones
-    // have a low spill weight). See processInterval().
+    // The priority of a bundle is its total length, so that longer lived
+    // bundles will be processed before shorter ones (even if the longer ones
+    // have a low spill weight). See processBundle().
     size_t lifetimeTotal = 0;
 
-    for (size_t i = 0; i < interval->numRanges(); i++) {
-        const LiveInterval::Range* range = interval->getRange(i);
-        lifetimeTotal += range->to - range->from;
+    for (LiveRange::BundleLinkIterator iter = bundle->rangesBegin(); iter; iter++) {
+        LiveRange* range = LiveRange::get(*iter);
+        lifetimeTotal += range->to() - range->from();
     }
 
     return lifetimeTotal;
 }
 
-size_t
-BacktrackingAllocator::computePriority(const VirtualRegisterGroup* group)
-{
-    size_t priority = 0;
-    for (size_t j = 0; j < group->registers.length(); j++) {
-        uint32_t vreg = group->registers[j];
-        priority += computePriority(vregs[vreg].getInterval(0));
-    }
-    return priority;
-}
-
 bool
-BacktrackingAllocator::minimalDef(const LiveInterval* interval, LNode* ins)
+BacktrackingAllocator::minimalDef(LiveRange* range, LNode* ins)
 {
-    // Whether interval is a minimal interval capturing a definition at ins.
-    return (interval->end() <= minimalDefEnd(ins).next()) &&
-        ((!ins->isPhi() && interval->start() == inputOf(ins)) || interval->start() == outputOf(ins));
+    // Whether this is a minimal range capturing a definition at ins.
+    return (range->to() <= minimalDefEnd(ins).next()) &&
+           ((!ins->isPhi() && range->from() == inputOf(ins)) || range->from() == outputOf(ins));
 }
 
 bool
-BacktrackingAllocator::minimalUse(const LiveInterval* interval, LNode* ins)
+BacktrackingAllocator::minimalUse(LiveRange* range, LNode* ins)
 {
-    // Whether interval is a minimal interval capturing a use at ins.
-    return (interval->start() == inputOf(ins)) &&
-        (interval->end() == outputOf(ins) || interval->end() == outputOf(ins).next());
+    // Whether this is a minimal range capturing a use at ins.
+    return (range->from() == inputOf(ins)) &&
+           (range->to() == outputOf(ins) || range->to() == outputOf(ins).next());
 }
 
 bool
-BacktrackingAllocator::minimalInterval(const LiveInterval* interval, bool* pfixed)
+BacktrackingAllocator::minimalBundle(LiveBundle* bundle, bool* pfixed)
 {
-    if (!interval->hasVreg()) {
+    LiveRange::BundleLinkIterator iter = bundle->rangesBegin();
+    LiveRange* range = LiveRange::get(*iter);
+
+    if (!range->hasVreg()) {
         *pfixed = true;
         return true;
     }
 
-    if (interval->index() == 0) {
-        VirtualRegister& reg = vregs[interval->vreg()];
+    // If a bundle contains multiple ranges, splitAtAllRegisterUses will split
+    // each range into a separate bundle.
+    if (++iter)
+        return false;
+
+    if (range->hasDefinition()) {
+        VirtualRegister& reg = vregs[range->vreg()];
         if (pfixed)
             *pfixed = reg.def()->policy() == LDefinition::FIXED && reg.def()->output()->isRegister();
-        return minimalDef(interval, reg.ins());
+        return minimalDef(range, reg.ins());
     }
 
     bool fixed = false, minimal = false, multiple = false;
 
-    for (UsePositionIterator iter = interval->usesBegin(); iter != interval->usesEnd(); iter++) {
-        if (iter != interval->usesBegin())
+    for (UsePositionIterator iter = range->usesBegin(); iter; iter++) {
+        if (iter != range->usesBegin())
             multiple = true;
         LUse* use = iter->use;
 
@@ -1773,12 +2365,12 @@
             if (fixed)
                 return false;
             fixed = true;
-            if (minimalUse(interval, insData[iter->pos]))
+            if (minimalUse(range, insData[iter->pos]))
                 minimal = true;
             break;
 
           case LUse::REGISTER:
-            if (minimalUse(interval, insData[iter->pos]))
+            if (minimalUse(range, insData[iter->pos]))
                 minimal = true;
             break;
 
@@ -1787,8 +2379,8 @@
         }
     }
 
-    // If an interval contains a fixed use and at least one other use,
-    // splitAtAllRegisterUses will split each use into a different interval.
+    // If a range contains a fixed use and at least one other use,
+    // splitAtAllRegisterUses will split each use into a different bundle.
     if (multiple && fixed)
         minimal = false;
 
@@ -1798,108 +2390,96 @@
 }
 
 size_t
-BacktrackingAllocator::computeSpillWeight(const LiveInterval* interval)
+BacktrackingAllocator::computeSpillWeight(LiveBundle* bundle)
 {
-    // Minimal intervals have an extremely high spill weight, to ensure they
-    // can evict any other intervals and be allocated to a register.
+    // Minimal bundles have an extremely high spill weight, to ensure they
+    // can evict any other bundles and be allocated to a register.
     bool fixed;
-    if (minimalInterval(interval, &fixed))
+    if (minimalBundle(bundle, &fixed))
         return fixed ? 2000000 : 1000000;
 
     size_t usesTotal = 0;
 
-    if (interval->index() == 0) {
-        VirtualRegister* reg = &vregs[interval->vreg()];
-        if (reg->def()->policy() == LDefinition::FIXED && reg->def()->output()->isRegister())
-            usesTotal += 2000;
-        else if (!reg->ins()->isPhi())
-            usesTotal += 2000;
-    }
-
-    for (UsePositionIterator iter = interval->usesBegin(); iter != interval->usesEnd(); iter++) {
-        LUse* use = iter->use;
+    for (LiveRange::BundleLinkIterator iter = bundle->rangesBegin(); iter; iter++) {
+        LiveRange* range = LiveRange::get(*iter);
 
-        switch (use->policy()) {
-          case LUse::ANY:
-            usesTotal += 1000;
-            break;
+        if (range->hasDefinition()) {
+            VirtualRegister& reg = vregs[range->vreg()];
+            if (reg.def()->policy() == LDefinition::FIXED && reg.def()->output()->isRegister())
+                usesTotal += 2000;
+            else if (!reg.ins()->isPhi())
+                usesTotal += 2000;
+        }
+
+        for (UsePositionIterator iter = range->usesBegin(); iter; iter++) {
+            LUse* use = iter->use;
+
+            switch (use->policy()) {
+              case LUse::ANY:
+                usesTotal += 1000;
+                break;
 
-          case LUse::REGISTER:
-          case LUse::FIXED:
-            usesTotal += 2000;
-            break;
+              case LUse::REGISTER:
+              case LUse::FIXED:
+                usesTotal += 2000;
+                break;
 
-          case LUse::KEEPALIVE:
-            break;
+              case LUse::KEEPALIVE:
+                break;
 
-          default:
-            // Note: RECOVERED_INPUT will not appear in UsePositionIterator.
-            MOZ_CRASH("Bad use");
+              default:
+                // Note: RECOVERED_INPUT will not appear in UsePositionIterator.
+                MOZ_CRASH("Bad use");
+            }
         }
     }
 
-    // Intervals for registers in groups get higher weights.
-    if (interval->hint()->kind() != Requirement::NONE)
-        usesTotal += 2000;
-
     // Compute spill weight as a use density, lowering the weight for long
-    // lived intervals with relatively few uses.
-    size_t lifetimeTotal = computePriority(interval);
+    // lived bundles with relatively few uses.
+    size_t lifetimeTotal = computePriority(bundle);
     return lifetimeTotal ? usesTotal / lifetimeTotal : 0;
 }
 
 size_t
-BacktrackingAllocator::computeSpillWeight(const VirtualRegisterGroup* group)
+BacktrackingAllocator::maximumSpillWeight(const LiveBundleVector& bundles)
 {
     size_t maxWeight = 0;
-    for (size_t j = 0; j < group->registers.length(); j++) {
-        uint32_t vreg = group->registers[j];
-        maxWeight = Max(maxWeight, computeSpillWeight(vregs[vreg].getInterval(0)));
-    }
-    return maxWeight;
-}
-
-size_t
-BacktrackingAllocator::maximumSpillWeight(const LiveIntervalVector& intervals)
-{
-    size_t maxWeight = 0;
-    for (size_t i = 0; i < intervals.length(); i++)
-        maxWeight = Max(maxWeight, computeSpillWeight(intervals[i]));
+    for (size_t i = 0; i < bundles.length(); i++)
+        maxWeight = Max(maxWeight, computeSpillWeight(bundles[i]));
     return maxWeight;
 }
 
 bool
-BacktrackingAllocator::trySplitAcrossHotcode(LiveInterval* interval, bool* success)
+BacktrackingAllocator::trySplitAcrossHotcode(LiveBundle* bundle, bool* success)
 {
-    // If this interval has portions that are hot and portions that are cold,
+    // If this bundle has portions that are hot and portions that are cold,
     // split it at the boundaries between hot and cold code.
 
-    const LiveInterval::Range* hotRange = nullptr;
+    LiveRange* hotRange = nullptr;
 
-    for (size_t i = 0; i < interval->numRanges(); i++) {
-        AllocatedRange range(interval, interval->getRange(i)), existing;
-        if (hotcode.contains(range, &existing)) {
-            hotRange = existing.range;
+    for (LiveRange::BundleLinkIterator iter = bundle->rangesBegin(); iter; iter++) {
+        LiveRange* range = LiveRange::get(*iter);
+        if (hotcode.contains(range, &hotRange))
             break;
-        }
     }
 
-    // Don't split if there is no hot code in the interval.
+    // Don't split if there is no hot code in the bundle.
     if (!hotRange) {
-        JitSpew(JitSpew_RegAlloc, "  interval does not contain hot code");
+        JitSpew(JitSpew_RegAlloc, "  bundle does not contain hot code");
         return true;
     }
 
-    // Don't split if there is no cold code in the interval.
+    // Don't split if there is no cold code in the bundle.
     bool coldCode = false;
-    for (size_t i = 0; i < interval->numRanges(); i++) {
-        if (!hotRange->contains(interval->getRange(i))) {
+    for (LiveRange::BundleLinkIterator iter = bundle->rangesBegin(); iter; iter++) {
+        LiveRange* range = LiveRange::get(*iter);
+        if (!hotRange->contains(range)) {
             coldCode = true;
             break;
         }
     }
     if (!coldCode) {
-        JitSpew(JitSpew_RegAlloc, "  interval does not contain cold code");
+        JitSpew(JitSpew_RegAlloc, "  bundle does not contain cold code");
         return true;
     }
 
@@ -1911,104 +2491,111 @@
     // soon and this special case removed. See bug 948838.
     if (compilingAsmJS()) {
         SplitPositionVector splitPositions;
-        if (!splitPositions.append(hotRange->from) || !splitPositions.append(hotRange->to))
+        if (!splitPositions.append(hotRange->from()) || !splitPositions.append(hotRange->to()))
             return false;
         *success = true;
-        return splitAt(interval, splitPositions);
+        return splitAt(bundle, splitPositions);
     }
 
-    LiveInterval* hotInterval = LiveInterval::New(alloc(), interval->vreg(), 0);
-    LiveInterval* preInterval = nullptr;
-    LiveInterval* postInterval = nullptr;
+    LiveBundle* hotBundle = LiveBundle::New(alloc(), bundle->spillSet(), bundle->spillParent());
+    if (!hotBundle)
+        return false;
+    LiveBundle* preBundle = nullptr;
+    LiveBundle* postBundle = nullptr;
 
-    // Accumulate the ranges of hot and cold code in the interval. Note that
+    // Accumulate the ranges of hot and cold code in the bundle. Note that
     // we are only comparing with the single hot range found, so the cold code
     // may contain separate hot ranges.
-    Vector<LiveInterval::Range, 1, SystemAllocPolicy> hotList, coldList;
-    for (size_t i = 0; i < interval->numRanges(); i++) {
-        LiveInterval::Range hot, coldPre, coldPost;
-        interval->getRange(i)->intersect(hotRange, &coldPre, &hot, &coldPost);
+    for (LiveRange::BundleLinkIterator iter = bundle->rangesBegin(); iter; iter++) {
+        LiveRange* range = LiveRange::get(*iter);
+        LiveRange::Range hot, coldPre, coldPost;
+        range->intersect(hotRange, &coldPre, &hot, &coldPost);
 
-        if (!hot.empty() && !hotInterval->addRange(hot.from, hot.to))
-            return false;
+        if (!hot.empty()) {
+            if (!hotBundle->addRangeAndDistributeUses(alloc(), range, hot.from, hot.to))
+                return false;
+        }
 
         if (!coldPre.empty()) {
-            if (!preInterval)
-                preInterval = LiveInterval::New(alloc(), interval->vreg(), 0);
-            if (!preInterval->addRange(coldPre.from, coldPre.to))
+            if (!preBundle) {
+                preBundle = LiveBundle::New(alloc(), bundle->spillSet(), bundle->spillParent());
+                if (!preBundle)
+                    return false;
+            }
+            if (!preBundle->addRangeAndDistributeUses(alloc(), range, coldPre.from, coldPre.to))
                 return false;
         }
 
         if (!coldPost.empty()) {
-            if (!postInterval)
-                postInterval = LiveInterval::New(alloc(), interval->vreg(), 0);
-            if (!postInterval->addRange(coldPost.from, coldPost.to))
+            if (!postBundle)
+                postBundle = LiveBundle::New(alloc(), bundle->spillSet(), bundle->spillParent());
+            if (!postBundle->addRangeAndDistributeUses(alloc(), range, coldPost.from, coldPost.to))
                 return false;
         }
     }
 
-    MOZ_ASSERT(preInterval || postInterval);
-    MOZ_ASSERT(hotInterval->numRanges());
+    MOZ_ASSERT(preBundle || postBundle);
+    MOZ_ASSERT(hotBundle->numRanges() != 0);
 
-    LiveIntervalVector newIntervals;
-    if (!newIntervals.append(hotInterval))
+    LiveBundleVector newBundles;
+    if (!newBundles.append(hotBundle))
         return false;
-    if (preInterval && !newIntervals.append(preInterval))
+    if (preBundle && !newBundles.append(preBundle))
         return false;
-    if (postInterval && !newIntervals.append(postInterval))
+    if (postBundle && !newBundles.append(postBundle))
         return false;
 
-    distributeUses(interval, newIntervals);
-
     *success = true;
-    return split(interval, newIntervals) && requeueIntervals(newIntervals);
+    return splitAndRequeueBundles(bundle, newBundles);
 }
 
 bool
-BacktrackingAllocator::trySplitAfterLastRegisterUse(LiveInterval* interval, LiveInterval* conflict, bool* success)
+BacktrackingAllocator::trySplitAfterLastRegisterUse(LiveBundle* bundle, LiveBundle* conflict,
+                                                    bool* success)
 {
-    // If this interval's later uses do not require it to be in a register,
+    // If this bundle's later uses do not require it to be in a register,
     // split it after the last use which does require a register. If conflict
     // is specified, only consider register uses before the conflict starts.
 
     CodePosition lastRegisterFrom, lastRegisterTo, lastUse;
 
-    // If the definition of the interval is in a register, consider that a
-    // register use too for our purposes here.
-    if (isRegisterDefinition(interval)) {
-        CodePosition spillStart = minimalDefEnd(insData[interval->start()]).next();
-        if (!conflict || spillStart < conflict->start()) {
-            lastUse = lastRegisterFrom = interval->start();
-            lastRegisterTo = spillStart;
-        }
-    }
+    for (LiveRange::BundleLinkIterator iter = bundle->rangesBegin(); iter; iter++) {
+        LiveRange* range = LiveRange::get(*iter);
 
-    for (UsePositionIterator iter(interval->usesBegin());
-         iter != interval->usesEnd();
-         iter++)
-    {
-        LUse* use = iter->use;
-        LNode* ins = insData[iter->pos];
+        // If the range defines a register, consider that a register use for
+        // our purposes here.
+        if (isRegisterDefinition(range)) {
+            CodePosition spillStart = minimalDefEnd(insData[range->from()]).next();
+            if (!conflict || spillStart < conflict->firstRange()->from()) {
+                lastUse = lastRegisterFrom = range->from();
+                lastRegisterTo = spillStart;
+            }
+        }
 
-        // Uses in the interval should be sorted.
-        MOZ_ASSERT(iter->pos >= lastUse);
-        lastUse = inputOf(ins);
-
-        if (!conflict || outputOf(ins) < conflict->start()) {
-            if (isRegisterUse(use, ins, /* considerCopy = */ true)) {
-                lastRegisterFrom = inputOf(ins);
-                lastRegisterTo = iter->pos.next();
+        for (UsePositionIterator iter(range->usesBegin()); iter; iter++) {
+            LUse* use = iter->use;
+            LNode* ins = insData[iter->pos];
+
+            // Uses in the bundle should be sorted.
+            MOZ_ASSERT(iter->pos >= lastUse);
+            lastUse = inputOf(ins);
+
+            if (!conflict || outputOf(ins) < conflict->firstRange()->from()) {
+                if (isRegisterUse(use, ins, /* considerCopy = */ true)) {
+                    lastRegisterFrom = inputOf(ins);
+                    lastRegisterTo = iter->pos.next();
+                }
             }
         }
     }
 
     // Can't trim non-register uses off the end by splitting.
     if (!lastRegisterFrom.bits()) {
-        JitSpew(JitSpew_RegAlloc, "  interval has no register uses");
+        JitSpew(JitSpew_RegAlloc, "  bundle has no register uses");
         return true;
     }
-    if (lastRegisterFrom == lastUse) {
-        JitSpew(JitSpew_RegAlloc, "  interval's last use is a register use");
+    if (lastUse < lastRegisterTo) {
+        JitSpew(JitSpew_RegAlloc, "  bundle's last use is a register use");
         return true;
     }
 
@@ -2019,45 +2606,55 @@
     if (!splitPositions.append(lastRegisterTo))
         return false;
     *success = true;
-    return splitAt(interval, splitPositions);
+    return splitAt(bundle, splitPositions);
 }
 
 bool
-BacktrackingAllocator::trySplitBeforeFirstRegisterUse(LiveInterval* interval, LiveInterval* conflict, bool* success)
+BacktrackingAllocator::trySplitBeforeFirstRegisterUse(LiveBundle* bundle, LiveBundle* conflict, bool* success)
 {
-    // If this interval's earlier uses do not require it to be in a register,
+    // If this bundle's earlier uses do not require it to be in a register,
     // split it before the first use which does require a register. If conflict
     // is specified, only consider register uses after the conflict ends.
 
-    if (isRegisterDefinition(interval)) {
-        JitSpew(JitSpew_RegAlloc, "  interval is defined by a register");
+    if (isRegisterDefinition(bundle->firstRange())) {
+        JitSpew(JitSpew_RegAlloc, "  bundle is defined by a register");
         return true;
     }
-    if (interval->index() != 0) {
-        JitSpew(JitSpew_RegAlloc, "  interval is not defined in memory");
+    if (!bundle->firstRange()->hasDefinition()) {
+        JitSpew(JitSpew_RegAlloc, "  bundle does not have definition");
         return true;
     }
 
     CodePosition firstRegisterFrom;
 
-    for (UsePositionIterator iter(interval->usesBegin());
-         iter != interval->usesEnd();
-         iter++)
-    {
-        LUse* use = iter->use;
-        LNode* ins = insData[iter->pos];
+    CodePosition conflictEnd;
+    if (conflict) {
+        for (LiveRange::BundleLinkIterator iter = conflict->rangesBegin(); iter; iter++) {
+            LiveRange* range = LiveRange::get(*iter);
+            if (range->to() > conflictEnd)
+                conflictEnd = range->to();
+        }
+    }
 
-        if (!conflict || outputOf(ins) >= conflict->end()) {
-            if (isRegisterUse(use, ins, /* considerCopy = */ true)) {
-                firstRegisterFrom = inputOf(ins);
-                break;
+    for (LiveRange::BundleLinkIterator iter = bundle->rangesBegin(); iter; iter++) {
+        LiveRange* range = LiveRange::get(*iter);
+
+        for (UsePositionIterator iter(range->usesBegin()); iter; iter++) {
+            LUse* use = iter->use;
+            LNode* ins = insData[iter->pos];
+
+            if (!conflict || outputOf(ins) >= conflictEnd) {
+                if (isRegisterUse(use, ins, /* considerCopy = */ true)) {
+                    firstRegisterFrom = inputOf(ins);
+                    break;
+                }
             }
         }
     }
 
     if (!firstRegisterFrom.bits()) {
         // Can't trim non-register uses off the beginning by splitting.
-        JitSpew(JitSpew_RegAlloc, "  interval has no register uses");
+        JitSpew(JitSpew_RegAlloc, "  bundle has no register uses");
         return true;
     }
 
@@ -2068,236 +2665,240 @@
     if (!splitPositions.append(firstRegisterFrom))
         return false;
     *success = true;
-    return splitAt(interval, splitPositions);
+    return splitAt(bundle, splitPositions);
 }
 
-bool
-BacktrackingAllocator::splitAtAllRegisterUses(LiveInterval* interval)
+// When splitting a bundle according to a list of split positions, return
+// whether a use or range at |pos| should use a different bundle than the last
+// position this was called for. 
+static bool
+UseNewBundle(const SplitPositionVector& splitPositions, CodePosition pos,
+             size_t* activeSplitPosition)
 {
-    // Split this interval so that all its register uses become minimal
-    // intervals and allow the vreg to be spilled throughout its range.
-
-    LiveIntervalVector newIntervals;
-    uint32_t vreg = interval->vreg();
-
-    JitSpew(JitSpew_RegAlloc, "  split at all register uses");
-
-    // If this LiveInterval is the result of an earlier split which created a
-    // spill interval, that spill interval covers the whole range, so we don't
-    // need to create a new one.
-    bool spillIntervalIsNew = false;
-    LiveInterval* spillInterval = interval->spillInterval();
-    if (!spillInterval) {
-        spillInterval = LiveInterval::New(alloc(), vreg, 0);
-        spillIntervalIsNew = true;
+    if (splitPositions.empty()) {
+        // When the split positions are empty we are splitting at all uses.
+        return true;
     }
 
-    CodePosition spillStart = interval->start();
-    if (isRegisterDefinition(interval)) {
-        // Treat the definition of the interval as a register use so that it
-        // can be split and spilled ASAP.
-        CodePosition from = interval->start();
-        CodePosition to = minimalDefEnd(insData[from]).next();
-        if (!addLiveInterval(newIntervals, vreg, spillInterval, from, to))
-            return false;
-        spillStart = to;
+    if (*activeSplitPosition == splitPositions.length()) {
+        // We've advanced past all split positions.
+        return false;
     }
 
-    if (spillIntervalIsNew) {
-        for (size_t i = 0; i < interval->numRanges(); i++) {
-            const LiveInterval::Range* range = interval->getRange(i);
-            CodePosition from = Max(range->from, spillStart);
-            if (!spillInterval->addRange(from, range->to))
-                return false;
-        }
+    if (splitPositions[*activeSplitPosition] > pos) {
+        // We haven't gotten to the next split position yet.
+        return false;
     }
 
-    for (UsePositionIterator iter(interval->usesBegin());
-         iter != interval->usesEnd();
-         iter++)
+    // We've advanced past the next split position, find the next one which we
+    // should split at.
+    while (*activeSplitPosition < splitPositions.length() &&
+           splitPositions[*activeSplitPosition] <= pos)
     {
-        LNode* ins = insData[iter->pos];
-        if (iter->pos < spillStart) {
-            newIntervals.back()->addUseAtEnd(new(alloc()) UsePosition(iter->use, iter->pos));
-        } else if (isRegisterUse(iter->use, ins)) {
-            // For register uses which are not useRegisterAtStart, pick an
-            // interval that covers both the instruction's input and output, so
-            // that the register is not reused for an output.
-            CodePosition from = inputOf(ins);
-            CodePosition to = iter->use->usedAtStart() ? outputOf(ins) : iter->pos.next();
-
-            // Use the same interval for duplicate use positions, except when
-            // the uses are fixed (they may require incompatible registers).
-            if (newIntervals.empty() ||
-                newIntervals.back()->end() != to ||
-                newIntervals.back()->usesBegin()->use->policy() == LUse::FIXED ||
-                iter->use->policy() == LUse::FIXED)
-            {
-                if (!addLiveInterval(newIntervals, vreg, spillInterval, from, to))
-                    return false;
-            }
-
-            newIntervals.back()->addUseAtEnd(new(alloc()) UsePosition(iter->use, iter->pos));
-        } else {
-            MOZ_ASSERT(spillIntervalIsNew);
-            spillInterval->addUseAtEnd(new(alloc()) UsePosition(iter->use, iter->pos));
-        }
+        (*activeSplitPosition)++;
     }
-
-    if (spillIntervalIsNew && !newIntervals.append(spillInterval))
-        return false;
-
-    return split(interval, newIntervals) && requeueIntervals(newIntervals);
+    return true;
 }
 
-// Find the next split position after the current position.
-static size_t NextSplitPosition(size_t activeSplitPosition,
-                                const SplitPositionVector& splitPositions,
-                                CodePosition currentPos)
+static bool
+HasPrecedingRangeSharingVreg(LiveBundle* bundle, LiveRange* range)
 {
-    while (activeSplitPosition < splitPositions.length() &&
-           splitPositions[activeSplitPosition] <= currentPos)
-    {
-        ++activeSplitPosition;
+    MOZ_ASSERT(range->bundle() == bundle);
+
+    for (LiveRange::BundleLinkIterator iter = bundle->rangesBegin(); iter; iter++) {
+        LiveRange* prevRange = LiveRange::get(*iter);
+        if (prevRange == range)
+            return false;
+        if (prevRange->vreg() == range->vreg())
+            return true;
     }
-    return activeSplitPosition;
+
+    MOZ_CRASH();
 }
 
-// Test whether the current position has just crossed a split point.
-static bool SplitHere(size_t activeSplitPosition,
-                      const SplitPositionVector& splitPositions,
-                      CodePosition currentPos)
+static bool
+HasFollowingRangeSharingVreg(LiveBundle* bundle, LiveRange* range)
 {
-    return activeSplitPosition < splitPositions.length() &&
-           currentPos >= splitPositions[activeSplitPosition];
+    MOZ_ASSERT(range->bundle() == bundle);
+
+    bool foundRange = false;
+    for (LiveRange::BundleLinkIterator iter = bundle->rangesBegin(); iter; iter++) {
+        LiveRange* prevRange = LiveRange::get(*iter);
+        if (foundRange && prevRange->vreg() == range->vreg())
+            return true;
+        if (prevRange == range)
+            foundRange = true;
+    }
+
+    MOZ_ASSERT(foundRange);
+    return false;
 }
 
 bool
-BacktrackingAllocator::splitAt(LiveInterval* interval,
-                               const SplitPositionVector& splitPositions)
+BacktrackingAllocator::splitAt(LiveBundle* bundle, const SplitPositionVector& splitPositions)
 {
-    // Split the interval at the given split points. Unlike splitAtAllRegisterUses,
-    // consolidate any register uses which have no intervening split points into the
-    // same resulting interval.
+    // Split the bundle at the given split points. Register uses which have no
+    // intervening split points are consolidated into the same bundle. If the
+    // list of split points is empty, then all register uses are placed in
+    // minimal bundles.
 
-    // splitPositions should be non-empty and sorted.
-    MOZ_ASSERT(!splitPositions.empty());
+    // splitPositions should be sorted.
     for (size_t i = 1; i < splitPositions.length(); ++i)
         MOZ_ASSERT(splitPositions[i-1] < splitPositions[i]);
 
-    // Don't spill the interval until after the end of its definition.
-    CodePosition spillStart = interval->start();
-    if (isRegisterDefinition(interval))
-        spillStart = minimalDefEnd(insData[interval->start()]).next();
-
-    uint32_t vreg = interval->vreg();
-
-    // If this LiveInterval is the result of an earlier split which created a
-    // spill interval, that spill interval covers the whole range, so we don't
-    // need to create a new one.
-    bool spillIntervalIsNew = false;
-    LiveInterval* spillInterval = interval->spillInterval();
-    if (!spillInterval) {
-        spillInterval = LiveInterval::New(alloc(), vreg, 0);
-        spillIntervalIsNew = true;
-
-        for (size_t i = 0; i < interval->numRanges(); i++) {
-            const LiveInterval::Range* range = interval->getRange(i);
-            CodePosition from = Max(range->from, spillStart);
-            if (!spillInterval->addRange(from, range->to))
-                return false;
+    // We don't need to create a new spill bundle if there already is one.
+    bool spillBundleIsNew = false;
+    LiveBundle* spillBundle = bundle->spillParent();
+    if (!spillBundle) {
+        spillBundle = LiveBundle::New(alloc(), bundle->spillSet(), nullptr);
+        if (!spillBundle)
+            return false;
+        spillBundleIsNew = true;
+
+        for (LiveRange::BundleLinkIterator iter = bundle->rangesBegin(); iter; iter++) {
+            LiveRange* range = LiveRange::get(*iter);
+
+            CodePosition from = range->from();
+            if (isRegisterDefinition(range))
+                from = minimalDefEnd(insData[from]).next();
+
+            if (from < range->to()) {
+                if (!spillBundle->addRange(alloc(), range->vreg(), from, range->to()))
+                    return false;
+
+                if (range->hasDefinition() && !isRegisterDefinition(range))
+                    spillBundle->lastRange()->setHasDefinition();
+            }
         }
     }
 
-    LiveIntervalVector newIntervals;
+    LiveBundleVector newBundles;
 
-    CodePosition lastRegisterUse;
-    if (spillStart != interval->start()) {
-        LiveInterval* newInterval = LiveInterval::New(alloc(), vreg, 0);
-        newInterval->setSpillInterval(spillInterval);
-        if (!newIntervals.append(newInterval))
-            return false;
-        lastRegisterUse = interval->start();
-    }
-
-    size_t activeSplitPosition = NextSplitPosition(0, splitPositions, interval->start());
-    for (UsePositionIterator iter(interval->usesBegin()); iter != interval->usesEnd(); iter++) {
-        LNode* ins = insData[iter->pos];
-        if (iter->pos < spillStart) {
-            newIntervals.back()->addUseAtEnd(new(alloc()) UsePosition(iter->use, iter->pos));
-            activeSplitPosition = NextSplitPosition(activeSplitPosition, splitPositions, iter->pos);
-        } else if (isRegisterUse(iter->use, ins)) {
-            if (lastRegisterUse.bits() == 0 ||
-                SplitHere(activeSplitPosition, splitPositions, iter->pos))
-            {
-                // Place this register use into a different interval from the
+    // The bundle which ranges are currently being added to.
+    LiveBundle* activeBundle = LiveBundle::New(alloc(), bundle->spillSet(), spillBundle);
+    if (!newBundles.append(activeBundle))
+        return false;
+
+    // State for use by UseNewBundle.
+    size_t activeSplitPosition = 0;
+
+    // Make new bundles according to the split positions, and distribute ranges
+    // and uses to them.
+    for (LiveRange::BundleLinkIterator iter = bundle->rangesBegin(); iter; iter++) {
+        LiveRange* range = LiveRange::get(*iter);
+
+        if (UseNewBundle(splitPositions, range->from(), &activeSplitPosition)) {
+            activeBundle = LiveBundle::New(alloc(), bundle->spillSet(), spillBundle);
+            if (!newBundles.append(activeBundle))
+                return false;
+        }
+
+        LiveRange* activeRange = LiveRange::New(alloc(), range->vreg(), range->from(), range->to());
+        if (!activeRange)
+            return false;
+        activeBundle->addRange(activeRange);
+
+        if (isRegisterDefinition(range))
+            activeRange->setHasDefinition();
+
+        while (range->hasUses()) {
+            UsePosition* use = range->popUse();
+            LNode* ins = insData[use->pos];
+
+            // Any uses of a register that appear before its definition has
+            // finished must be associated with the range for that definition.
+            if (isRegisterDefinition(range) && use->pos <= minimalDefEnd(insData[range->from()])) {
+                activeRange->addUse(use);
+            } else if (isRegisterUse(use->use, ins)) {
+                // Place this register use into a different bundle from the
                 // last one if there are any split points between the two uses.
-                LiveInterval* newInterval = LiveInterval::New(alloc(), vreg, 0);
-                newInterval->setSpillInterval(spillInterval);
-                if (!newIntervals.append(newInterval))
-                    return false;
-                activeSplitPosition = NextSplitPosition(activeSplitPosition,
-                                                        splitPositions,
-                                                        iter->pos);
+                // UseNewBundle always returns true if we are splitting at all
+                // register uses, but we can still reuse the last range and
+                // bundle if they have uses at the same position, except when
+                // either use is fixed (the two uses might require incompatible
+                // registers.)
+                if (UseNewBundle(splitPositions, use->pos, &activeSplitPosition) &&
+                    (!activeRange->hasUses() ||
+                     activeRange->usesBegin()->pos != use->pos ||
+                     activeRange->usesBegin()->use->policy() == LUse::FIXED ||
+                     use->use->policy() == LUse::FIXED))
+                {
+                    activeBundle = LiveBundle::New(alloc(), bundle->spillSet(), spillBundle);
+                    if (!newBundles.append(activeBundle))
+                        return false;
+                    activeRange = LiveRange::New(alloc(), range->vreg(), range->from(), range->to());
+                    if (!activeRange)
+                        return false;
+                    activeBundle->addRange(activeRange);
+                }
+
+                activeRange->addUse(use);
+            } else {
+                MOZ_ASSERT(spillBundleIsNew);
+                spillBundle->rangeFor(use->pos)->addUse(use);
             }
-            newIntervals.back()->addUseAtEnd(new(alloc()) UsePosition(iter->use, iter->pos));
-            lastRegisterUse = iter->pos;
-        } else {
-            MOZ_ASSERT(spillIntervalIsNew);
-            spillInterval->addUseAtEnd(new(alloc()) UsePosition(iter->use, iter->pos));
         }
     }
 
-    // Compute ranges for each new interval that cover all its uses.
-    size_t activeRange = interval->numRanges();
-    for (size_t i = 0; i < newIntervals.length(); i++) {
-        LiveInterval* newInterval = newIntervals[i];
-        CodePosition start, end;
-        if (i == 0 && spillStart != interval->start()) {
-            start = interval->start();
-            if (newInterval->usesEmpty())
-                end = spillStart;
-            else
-                end = newInterval->usesBack()->pos.next();
-        } else {
-            start = inputOf(insData[newInterval->usesBegin()->pos]);
-            end = newInterval->usesBack()->pos.next();
-        }
-        for (; activeRange > 0; --activeRange) {
-            const LiveInterval::Range* range = interval->getRange(activeRange - 1);
-            if (range->to <= start)
-                continue;
-            if (range->from >= end)
-                break;
-            if (!newInterval->addRange(Max(range->from, start),
-                                       Min(range->to, end)))
-                return false;
-            if (range->to >= end)
-                break;
+    LiveBundleVector filteredBundles;
+
+    // Trim the ends of ranges in each new bundle when there are no other
+    // earlier or later ranges in the same bundle with the same vreg.
+    for (size_t i = 0; i < newBundles.length(); i++) {
+        LiveBundle* bundle = newBundles[i];
+
+        for (LiveRange::BundleLinkIterator iter = bundle->rangesBegin(); iter; ) {
+            LiveRange* range = LiveRange::get(*iter);
+
+            if (!range->hasDefinition()) {
+                if (!HasPrecedingRangeSharingVreg(bundle, range)) {
+                    if (range->hasUses()) {
+                        UsePosition* use = *range->usesBegin();
+                        range->setFrom(inputOf(insData[use->pos]));
+                    } else {
+                        bundle->removeRangeAndIncrementIterator(iter);
+                        continue;
+                    }
+                }
+            }
+
+            if (!HasFollowingRangeSharingVreg(bundle, range)) {
+                if (range->hasUses()) {
+                    UsePosition* use = range->lastUse();
+                    range->setTo(use->pos.next());
+                } else if (range->hasDefinition()) {
+                    range->setTo(minimalDefEnd(insData[range->from()]).next());
+                } else {
+                    bundle->removeRangeAndIncrementIterator(iter);
+                    continue;
+                }
+            }
+
+            iter++;
         }
+
+        if (bundle->hasRanges() && !filteredBundles.append(bundle))
+            return false;
     }
 
-    if (spillIntervalIsNew && !newIntervals.append(spillInterval))
+    if (spillBundleIsNew && !filteredBundles.append(spillBundle))
         return false;
 
-    return split(interval, newIntervals) && requeueIntervals(newIntervals);
+    return splitAndRequeueBundles(bundle, filteredBundles);
 }
 
 bool
-BacktrackingAllocator::splitAcrossCalls(LiveInterval* interval)
+BacktrackingAllocator::splitAcrossCalls(LiveBundle* bundle)
 {
-    // Split the interval to separate register uses and non-register uses and
+    // Split the bundle to separate register uses and non-register uses and
     // allow the vreg to be spilled across its range.
 
-    // Find the locations of all calls in the interval's range. Fixed intervals
-    // are introduced by buildLivenessInfo only for calls when allocating for
-    // the backtracking allocator. fixedIntervalsUnion is sorted backwards, so
-    // iterate through it backwards.
+    // Find the locations of all calls in the bundle's range.
     SplitPositionVector callPositions;
-    for (size_t i = fixedIntervalsUnion->numRanges(); i > 0; i--) {
-        const LiveInterval::Range* range = fixedIntervalsUnion->getRange(i - 1);
-        if (interval->covers(range->from) && interval->covers(range->from.previous())) {
-            if (!callPositions.append(range->from))
+    for (LiveRange::BundleLinkIterator iter = callRanges->rangesBegin(); iter; iter++) {
+        LiveRange* callRange = LiveRange::get(*iter);
+        if (bundle->rangeFor(callRange->from()) && bundle->rangeFor(callRange->from().previous())) {
+            if (!callPositions.append(callRange->from()))
                 return false;
         }
     }
@@ -2305,37 +2906,38 @@
 
 #ifdef DEBUG
     JitSpewStart(JitSpew_RegAlloc, "  split across calls at ");
-    for (size_t i = 0; i < callPositions.length(); ++i) {
+    for (size_t i = 0; i < callPositions.length(); ++i)
         JitSpewCont(JitSpew_RegAlloc, "%s%u", i != 0 ? ", " : "", callPositions[i].bits());
-    }
     JitSpewFin(JitSpew_RegAlloc);
 #endif
 
-    return splitAt(interval, callPositions);
+    return splitAt(bundle, callPositions);
 }
 
 bool
-BacktrackingAllocator::chooseIntervalSplit(LiveInterval* interval, bool fixed, LiveInterval* conflict)
+BacktrackingAllocator::chooseBundleSplit(LiveBundle* bundle, bool fixed, LiveBundle* conflict)
 {
     bool success = false;
 
-    if (!trySplitAcrossHotcode(interval, &success))
+    if (!trySplitAcrossHotcode(bundle, &success))
         return false;
     if (success)
         return true;
 
     if (fixed)
-        return splitAcrossCalls(interval);
+        return splitAcrossCalls(bundle);
 
-    if (!trySplitBeforeFirstRegisterUse(interval, conflict, &success))
+    if (!trySplitBeforeFirstRegisterUse(bundle, conflict, &success))
         return false;
     if (success)
         return true;
 
-    if (!trySplitAfterLastRegisterUse(interval, conflict, &success))
+    if (!trySplitAfterLastRegisterUse(bundle, conflict, &success))
         return false;
     if (success)
         return true;
 
-    return splitAtAllRegisterUses(interval);
+    // Split at all register uses.
+    SplitPositionVector emptyPositions;
+    return splitAt(bundle, emptyPositions);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/BacktrackingAllocator.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/BacktrackingAllocator.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/BacktrackingAllocator.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/BacktrackingAllocator.h	2015-05-25 20:43:20.000000000 +0000
@@ -11,7 +11,8 @@
 
 #include "ds/PriorityQueue.h"
 #include "ds/SplayTree.h"
-#include "jit/LiveRangeAllocator.h"
+#include "jit/RegisterAllocator.h"
+#include "jit/StackSlotAllocator.h"
 
 // Backtracking priority queue based register allocator based on that described
 // in the following blog post:
@@ -21,55 +22,489 @@
 namespace js {
 namespace jit {
 
-// Information about a group of registers. Registers may be grouped together
-// when (a) all of their lifetimes are disjoint, (b) they are of the same type
-// (double / non-double) and (c) it is desirable that they have the same
-// allocation.
-struct VirtualRegisterGroup : public TempObject
+class Requirement
 {
-    // All virtual registers in the group.
-    Vector<uint32_t, 2, JitAllocPolicy> registers;
+  public:
+    enum Kind {
+        NONE,
+        REGISTER,
+        FIXED,
+        MUST_REUSE_INPUT
+    };
 
-    // Desired physical register to use for registers in the group.
-    LAllocation allocation;
+    Requirement()
+      : kind_(NONE)
+    { }
 
-    // Spill location to be shared by registers in the group.
-    LAllocation spill;
+    explicit Requirement(Kind kind)
+      : kind_(kind)
+    {
+        // These have dedicated constructors.
+        MOZ_ASSERT(kind != FIXED && kind != MUST_REUSE_INPUT);
+    }
 
-    explicit VirtualRegisterGroup(TempAllocator& alloc)
-      : registers(alloc), allocation(LUse(0, LUse::ANY)), spill(LUse(0, LUse::ANY))
-    {}
-
-    uint32_t canonicalReg() {
-        uint32_t minimum = registers[0];
-        for (size_t i = 1; i < registers.length(); i++)
-            minimum = Min(minimum, registers[i]);
-        return minimum;
+    Requirement(Kind kind, CodePosition at)
+      : kind_(kind),
+        position_(at)
+    {
+        // These have dedicated constructors.
+        MOZ_ASSERT(kind != FIXED && kind != MUST_REUSE_INPUT);
+    }
+
+    explicit Requirement(LAllocation fixed)
+      : kind_(FIXED),
+        allocation_(fixed)
+    {
+        MOZ_ASSERT(!fixed.isBogus() && !fixed.isUse());
+    }
+
+    // Only useful as a hint, encodes where the fixed requirement is used to
+    // avoid allocating a fixed register too early.
+    Requirement(LAllocation fixed, CodePosition at)
+      : kind_(FIXED),
+        allocation_(fixed),
+        position_(at)
+    {
+        MOZ_ASSERT(!fixed.isBogus() && !fixed.isUse());
+    }
+
+    Requirement(uint32_t vreg, CodePosition at)
+      : kind_(MUST_REUSE_INPUT),
+        allocation_(LUse(vreg, LUse::ANY)),
+        position_(at)
+    { }
+
+    Kind kind() const {
+        return kind_;
+    }
+
+    LAllocation allocation() const {
+        MOZ_ASSERT(!allocation_.isBogus() && !allocation_.isUse());
+        return allocation_;
+    }
+
+    uint32_t virtualRegister() const {
+        MOZ_ASSERT(allocation_.isUse());
+        MOZ_ASSERT(kind() == MUST_REUSE_INPUT);
+        return allocation_.toUse()->virtualRegister();
+    }
+
+    CodePosition pos() const {
+        return position_;
+    }
+
+    int priority() const;
+
+    bool merge(const Requirement& newRequirement) {
+        // Merge newRequirement with any existing requirement, returning false
+        // if the new and old requirements conflict.
+        MOZ_ASSERT(newRequirement.kind() != Requirement::MUST_REUSE_INPUT);
+
+        if (newRequirement.kind() == Requirement::FIXED) {
+            if (kind() == Requirement::FIXED)
+                return newRequirement.allocation() == allocation();
+            *this = newRequirement;
+            return true;
+        }
+
+        MOZ_ASSERT(newRequirement.kind() == Requirement::REGISTER);
+        if (kind() == Requirement::FIXED)
+            return allocation().isRegister();
+
+        *this = newRequirement;
+        return true;
+    }
+
+    void dump() const;
+
+  private:
+    Kind kind_;
+    LAllocation allocation_;
+    CodePosition position_;
+};
+
+struct UsePosition : public TempObject,
+                     public InlineForwardListNode<UsePosition>
+{
+    LUse* use;
+    CodePosition pos;
+
+    UsePosition(LUse* use, CodePosition pos) :
+        use(use),
+        pos(pos)
+    {
+        // Verify that the usedAtStart() flag is consistent with the
+        // subposition. For now ignore fixed registers, because they
+        // are handled specially around calls.
+        MOZ_ASSERT_IF(!use->isFixedRegister(),
+                      pos.subpos() == (use->usedAtStart()
+                                       ? CodePosition::INPUT
+                                       : CodePosition::OUTPUT));
     }
 };
 
-class BacktrackingVirtualRegister : public VirtualRegister
+typedef InlineForwardListIterator<UsePosition> UsePositionIterator;
+
+// Backtracking allocator data structures overview.
+//
+// LiveRange: A continuous range of positions where a virtual register is live.
+// LiveBundle: A set of LiveRanges which do not overlap.
+// VirtualRegister: A set of all LiveRanges used for some LDefinition.
+//
+// The allocator first performs a liveness ananlysis on the LIR graph which
+// constructs LiveRanges for each VirtualRegister, determining where the
+// registers are live.
+//
+// The ranges are then bundled together according to heuristics, and placed on
+// the allocation queue.
+//
+// As bundles are removed from the allocation queue, we attempt to find a
+// physical register or stack slot allocation for all ranges in the removed
+// bundle, possibly evicting already-allocated bundles. See processBundle()
+// for details.
+//
+// If we are not able to allocate a bundle, it is split according to heuristics
+// into two or more smaller bundles which cover all the ranges of the original.
+// These smaller bundles are then allocated independently.
+
+class LiveBundle;
+
+class LiveRange : public TempObject
 {
+  public:
+    // Linked lists are used to keep track of the ranges in each LiveBundle and
+    // VirtualRegister. Since a LiveRange may be in two lists simultaneously, use
+    // these auxiliary classes to keep things straight.
+    class BundleLink : public InlineForwardListNode<BundleLink> {};
+    class RegisterLink : public InlineForwardListNode<RegisterLink> {};
+
+    typedef InlineForwardListIterator<BundleLink> BundleLinkIterator;
+    typedef InlineForwardListIterator<RegisterLink> RegisterLinkIterator;
+
+    // Links in the lists in LiveBundle and VirtualRegister.
+    BundleLink bundleLink;
+    RegisterLink registerLink;
+
+    static LiveRange* get(BundleLink* link) {
+        return reinterpret_cast<LiveRange*>(reinterpret_cast<uint8_t*>(link) -
+                                            offsetof(LiveRange, bundleLink));
+    }
+    static LiveRange* get(RegisterLink* link) {
+        return reinterpret_cast<LiveRange*>(reinterpret_cast<uint8_t*>(link) -
+                                            offsetof(LiveRange, registerLink));
+    }
+
+    struct Range
+    {
+        // The beginning of this range, inclusive.
+        CodePosition from;
+
+        // The end of this range, exclusive.
+        CodePosition to;
+
+        Range() {}
+
+        Range(CodePosition from, CodePosition to)
+          : from(from), to(to)
+        {
+            MOZ_ASSERT(!empty());
+        }
+
+        bool empty() {
+            MOZ_ASSERT(from <= to);
+            return from == to;
+        }
+    };
+
+  private:
+    // The virtual register this range is for, or zero if this does not have a
+    // virtual register (for example, it is in the callRanges bundle).
+    uint32_t vreg_;
+
+    // The bundle containing this range, null if liveness information is being
+    // constructed and we haven't started allocating bundles yet.
+    LiveBundle* bundle_;
+
+    // The code positions in this range.
+    Range range_;
+
+    // All uses of the virtual register in this range, ordered by location.
+    InlineForwardList<UsePosition> uses_;
+
+    // Whether this range contains the virtual register's definition.
+    bool hasDefinition_;
+
+    LiveRange(uint32_t vreg, Range range)
+      : vreg_(vreg), bundle_(nullptr), range_(range), hasDefinition_(false)
+    {
+        MOZ_ASSERT(!range.empty());
+    }
+
+  public:
+    static LiveRange* New(TempAllocator& alloc, uint32_t vreg,
+                          CodePosition from, CodePosition to) {
+        return new(alloc) LiveRange(vreg, Range(from, to));
+    }
+
+    uint32_t vreg() const {
+        MOZ_ASSERT(hasVreg());
+        return vreg_;
+    }
+    bool hasVreg() const {
+        return vreg_ != 0;
+    }
+
+    LiveBundle* bundle() const {
+        return bundle_;
+    }
+
+    CodePosition from() const {
+        return range_.from;
+    }
+    CodePosition to() const {
+        return range_.to;
+    }
+    bool covers(CodePosition pos) const {
+        return pos >= from() && pos < to();
+    }
+
+    // Whether this range wholly contains other.
+    bool contains(LiveRange* other) const;
+
+    // Intersect this range with other, returning the subranges of this
+    // that are before, inside, or after other.
+    void intersect(LiveRange* other, Range* pre, Range* inside, Range* post) const;
+
+    // Whether this range has any intersection with other.
+    bool intersects(LiveRange* other) const;
+
+    UsePositionIterator usesBegin() const {
+        return uses_.begin();
+    }
+    UsePosition* lastUse() const {
+        return uses_.back();
+    }
+    bool hasUses() const {
+        return !!usesBegin();
+    }
+    UsePosition* popUse() {
+        return uses_.popFront();
+    }
+
+    bool hasDefinition() const {
+        return hasDefinition_;
+    }
+
+    void setFrom(CodePosition from) {
+        range_.from = from;
+        MOZ_ASSERT(!range_.empty());
+    }
+    void setTo(CodePosition to) {
+        range_.to = to;
+        MOZ_ASSERT(!range_.empty());
+    }
+
+    void setBundle(LiveBundle* bundle) {
+        bundle_ = bundle;
+    }
+
+    void addUse(UsePosition* use);
+    void distributeUses(LiveRange* other);
+
+    void setHasDefinition() {
+        MOZ_ASSERT(!hasDefinition_);
+        hasDefinition_ = true;
+    }
+
+    // Return a string describing this range. This is not re-entrant!
+#ifdef DEBUG
+    const char* toString() const;
+#else
+    const char* toString() const { return "???"; }
+#endif
+
+    // Comparator for use in range splay trees.
+    static int compare(LiveRange* v0, LiveRange* v1) {
+        // LiveRange includes 'from' but excludes 'to'.
+        if (v0->to() <= v1->from())
+            return -1;
+        if (v0->from() >= v1->to())
+            return 1;
+        return 0;
+    }
+};
+
+// Tracks information about bundles that should all be spilled to the same
+// physical location. At the beginning of allocation, each bundle has its own
+// spill set. As bundles are split, the new smaller bundles continue to use the
+// same spill set.
+class SpillSet : public TempObject
+{
+    // All bundles with this spill set which have been spilled. All bundles in
+    // this list will be given the same physical slot.
+    Vector<LiveBundle*, 1, JitAllocPolicy> list_;
+
+    explicit SpillSet(TempAllocator& alloc)
+      : list_(alloc)
+    { }
+
+  public:
+    static SpillSet* New(TempAllocator& alloc) {
+        return new(alloc) SpillSet(alloc);
+    }
+
+    bool addSpilledBundle(LiveBundle* bundle) {
+        return list_.append(bundle);
+    }
+    size_t numSpilledBundles() const {
+        return list_.length();
+    }
+    LiveBundle* spilledBundle(size_t i) const {
+        return list_[i];
+    }
+
+    void setAllocation(LAllocation alloc);
+};
+
+// A set of live ranges which are all pairwise disjoint. The register allocator
+// attempts to find allocations for an entire bundle, and if it fails the
+// bundle will be broken into smaller ones which are allocated independently.
+class LiveBundle : public TempObject
+{
+    // Set to use if this bundle or one it is split into is spilled.
+    SpillSet* spill_;
+
+    // All the ranges in this set, ordered by location.
+    InlineForwardList<LiveRange::BundleLink> ranges_;
+
+    // Allocation to use for ranges in this set, bogus if unallocated or spilled
+    // and not yet given a physical stack slot.
+    LAllocation alloc_;
+
+    // Bundle which entirely contains this one and has no register uses. This
+    // may or may not be spilled by the allocator, but it can be spilled and
+    // will not be split.
+    LiveBundle* spillParent_;
+
+    LiveBundle(SpillSet* spill, LiveBundle* spillParent)
+      : spill_(spill), spillParent_(spillParent)
+    { }
+
+  public:
+    static LiveBundle* New(TempAllocator& alloc, SpillSet* spill, LiveBundle* spillParent) {
+        return new(alloc) LiveBundle(spill, spillParent);
+    }
+
+    SpillSet* spillSet() const {
+        return spill_;
+    }
+    void setSpillSet(SpillSet* spill) {
+        spill_ = spill;
+    }
+
+    LiveRange::BundleLinkIterator rangesBegin() const {
+        return ranges_.begin();
+    }
+    bool hasRanges() const {
+        return !!rangesBegin();
+    }
+    LiveRange* firstRange() const {
+        return LiveRange::get(*rangesBegin());
+    }
+    LiveRange* lastRange() const {
+        return LiveRange::get(ranges_.back());
+    }
+    LiveRange* rangeFor(CodePosition pos) const;
+    void removeRange(LiveRange* range);
+    void removeRangeAndIncrementIterator(LiveRange::BundleLinkIterator& iter) {
+        ranges_.removeAndIncrement(iter);
+    }
+    void addRange(LiveRange* range);
+    bool addRange(TempAllocator& alloc, uint32_t vreg, CodePosition from, CodePosition to);
+    bool addRangeAndDistributeUses(TempAllocator& alloc, LiveRange* oldRange,
+                                   CodePosition from, CodePosition to);
+    LiveRange* popFirstRange();
+#ifdef DEBUG
+    size_t numRanges() const;
+#endif
+
+    LAllocation allocation() const {
+        return alloc_;
+    }
+    void setAllocation(LAllocation alloc) {
+        alloc_ = alloc;
+    }
+
+    LiveBundle* spillParent() const {
+        return spillParent_;
+    }
+
+    // Return a string describing this bundle. This is not re-entrant!
+#ifdef DEBUG
+    const char* toString() const;
+#else
+    const char* toString() const { return "???"; }
+#endif
+};
+
+// Information about the allocation for a virtual register.
+class VirtualRegister
+{
+    // Instruction which defines this register.
+    LNode* ins_;
+
+    // Definition in the instruction for this register.
+    LDefinition* def_;
+
+    // All live ranges for this register. These may overlap each other, and are
+    // ordered by their start position.
+    InlineForwardList<LiveRange::RegisterLink> ranges_;
+
+    // Whether def_ is a temp or an output.
+    bool isTemp_;
+
     // If this register's definition is MUST_REUSE_INPUT, whether a copy must
     // be introduced before the definition that relaxes the policy.
     bool mustCopyInput_;
 
-    // Spill location to use for this register.
-    LAllocation canonicalSpill_;
-
-    // Code position above which the canonical spill cannot be used; such
-    // intervals may overlap other registers in the same group.
-    CodePosition canonicalSpillExclude_;
-
-    // If this register is associated with a group of other registers,
-    // information about the group. This structure is shared between all
-    // registers in the group.
-    VirtualRegisterGroup* group_;
+    void operator=(const VirtualRegister&) = delete;
+    VirtualRegister(const VirtualRegister&) = delete;
 
   public:
-    explicit BacktrackingVirtualRegister(TempAllocator& alloc)
-      : VirtualRegister(alloc)
-    {}
+    explicit VirtualRegister()
+    {
+        // Note: This class is zeroed before it is constructed.
+    }
+
+    void init(LNode* ins, LDefinition* def, bool isTemp) {
+        MOZ_ASSERT(!ins_);
+        ins_ = ins;
+        def_ = def;
+        isTemp_ = isTemp;
+    }
+
+    LNode* ins() const {
+        return ins_;
+    }
+    LDefinition* def() const {
+        return def_;
+    }
+    LDefinition::Type type() const {
+        return def()->type();
+    }
+    uint32_t vreg() const {
+        return def()->virtualRegister();
+    }
+    bool isCompatible(const AnyRegister& r) const {
+        return def_->isCompatibleReg(r);
+    }
+    bool isCompatible(const VirtualRegister& vr) const {
+        return def_->isCompatibleDef(*vr.def_);
+    }
+    bool isTemp() const {
+        return isTemp_;
+    }
+
     void setMustCopyInput() {
         mustCopyInput_ = true;
     }
@@ -77,56 +512,56 @@
         return mustCopyInput_;
     }
 
-    void setCanonicalSpill(LAllocation alloc) {
-        MOZ_ASSERT(!alloc.isUse());
-        canonicalSpill_ = alloc;
+    LiveRange::RegisterLinkIterator rangesBegin() const {
+        return ranges_.begin();
     }
-    const LAllocation* canonicalSpill() const {
-        return canonicalSpill_.isBogus() ? nullptr : &canonicalSpill_;
+    bool hasRanges() const {
+        return !!rangesBegin();
     }
-
-    void setCanonicalSpillExclude(CodePosition pos) {
-        canonicalSpillExclude_ = pos;
-    }
-    bool hasCanonicalSpillExclude() const {
-        return canonicalSpillExclude_.bits() != 0;
+    LiveRange* firstRange() const {
+        return LiveRange::get(*rangesBegin());
     }
-    CodePosition canonicalSpillExclude() const {
-        MOZ_ASSERT(hasCanonicalSpillExclude());
-        return canonicalSpillExclude_;
+    LiveRange* lastRange() const {
+        return LiveRange::get(ranges_.back());
     }
+    LiveRange* rangeFor(CodePosition pos) const;
+    void removeRange(LiveRange* range);
+    void addRange(LiveRange* range);
 
-    void setGroup(VirtualRegisterGroup* group) {
-        group_ = group;
-    }
-    VirtualRegisterGroup* group() {
-        return group_;
+    LiveBundle* firstBundle() const {
+        return firstRange()->bundle();
     }
+
+    bool addInitialRange(TempAllocator& alloc, CodePosition from, CodePosition to);
+    void addInitialUse(UsePosition* use);
+    void setInitialDefinition(CodePosition from);
 };
 
 // A sequence of code positions, for tellings BacktrackingAllocator::splitAt
 // where to split.
 typedef js::Vector<CodePosition, 4, SystemAllocPolicy> SplitPositionVector;
 
-class BacktrackingAllocator
-  : private LiveRangeAllocator<BacktrackingVirtualRegister>
+class BacktrackingAllocator : protected RegisterAllocator
 {
     friend class C1Spewer;
     friend class JSONSpewer;
 
-    // Priority queue element: either an interval or group of intervals and the
-    // associated priority.
+    BitSet* liveIn;
+    FixedList<VirtualRegister> vregs;
+
+    // Ranges where all registers must be spilled due to call instructions.
+    LiveBundle* callRanges;
+
+    // Allocation state.
+    StackSlotAllocator stackSlotAllocator;
+
+    // Priority queue element: a bundle and the associated priority.
     struct QueueItem
     {
-        LiveInterval* interval;
-        VirtualRegisterGroup* group;
-
-        QueueItem(LiveInterval* interval, size_t priority)
-          : interval(interval), group(nullptr), priority_(priority)
-        {}
+        LiveBundle* bundle;
 
-        QueueItem(VirtualRegisterGroup* group, size_t priority)
-          : interval(nullptr), group(group), priority_(priority)
+        QueueItem(LiveBundle* bundle, size_t priority)
+          : bundle(bundle), priority_(priority)
         {}
 
         static size_t priority(const QueueItem& v) {
@@ -139,37 +574,14 @@
 
     PriorityQueue<QueueItem, QueueItem, 0, SystemAllocPolicy> allocationQueue;
 
-    // A subrange over which a physical register is allocated.
-    struct AllocatedRange {
-        LiveInterval* interval;
-        const LiveInterval::Range* range;
-
-        AllocatedRange()
-          : interval(nullptr), range(nullptr)
-        {}
-
-        AllocatedRange(LiveInterval* interval, const LiveInterval::Range* range)
-          : interval(interval), range(range)
-        {}
-
-        static int compare(const AllocatedRange& v0, const AllocatedRange& v1) {
-            // LiveInterval::Range includes 'from' but excludes 'to'.
-            if (v0.range->to <= v1.range->from)
-                return -1;
-            if (v0.range->from >= v1.range->to)
-                return 1;
-            return 0;
-        }
-    };
-
-    typedef SplayTree<AllocatedRange, AllocatedRange> AllocatedRangeSet;
+    typedef SplayTree<LiveRange*, LiveRange> LiveRangeSet;
 
     // Each physical register is associated with the set of ranges over which
     // that register is currently allocated.
     struct PhysicalRegister {
         bool allocatable;
         AnyRegister reg;
-        AllocatedRangeSet allocations;
+        LiveRangeSet allocations;
 
         PhysicalRegister() : allocatable(false) {}
     };
@@ -177,16 +589,12 @@
 
     // Ranges of code which are considered to be hot, for which good allocation
     // should be prioritized.
-    AllocatedRangeSet hotcode;
-
-    // During register allocation, virtual stack slots are used for spills.
-    // These are converted to actual spill locations
-    size_t numVirtualStackSlots;
+    LiveRangeSet hotcode;
 
     // Information about an allocated stack slot.
     struct SpillSlot : public TempObject, public InlineForwardListNode<SpillSlot> {
         LStackSlot alloc;
-        AllocatedRangeSet allocated;
+        LiveRangeSet allocated;
 
         SpillSlot(uint32_t slot, LifoAlloc* alloc)
           : alloc(slot), allocated(alloc)
@@ -199,93 +607,130 @@
 
   public:
     BacktrackingAllocator(MIRGenerator* mir, LIRGenerator* lir, LIRGraph& graph)
-      : LiveRangeAllocator<BacktrackingVirtualRegister>(mir, lir, graph),
-        numVirtualStackSlots(0)
+      : RegisterAllocator(mir, lir, graph),
+        liveIn(nullptr),
+        callRanges(nullptr)
     { }
 
     bool go();
 
   private:
 
-    typedef Vector<LiveInterval*, 4, SystemAllocPolicy> LiveIntervalVector;
+    typedef Vector<LiveRange*, 4, SystemAllocPolicy> LiveRangeVector;
+    typedef Vector<LiveBundle*, 4, SystemAllocPolicy> LiveBundleVector;
 
+    // Liveness methods.
     bool init();
-    bool canAddToGroup(VirtualRegisterGroup* group, BacktrackingVirtualRegister* reg);
-    bool tryGroupRegisters(uint32_t vreg0, uint32_t vreg1);
-    bool tryGroupReusedRegister(uint32_t def, uint32_t use);
-    bool groupAndQueueRegisters();
-    bool tryAllocateFixed(LiveInterval* interval, bool* success, bool* pfixed,
-                          LiveIntervalVector& conflicting);
-    bool tryAllocateNonFixed(LiveInterval* interval, bool* success, bool* pfixed,
-                             LiveIntervalVector& conflicting);
-    bool processInterval(LiveInterval* interval);
-    bool processGroup(VirtualRegisterGroup* group);
-    bool setIntervalRequirement(LiveInterval* interval);
-    bool tryAllocateRegister(PhysicalRegister& r, LiveInterval* interval,
-                             bool* success, bool* pfixed, LiveIntervalVector& conflicting);
-    bool tryAllocateGroupRegister(PhysicalRegister& r, VirtualRegisterGroup* group,
-                                  bool* psuccess, bool* pfixed, LiveInterval** pconflicting);
-    bool evictInterval(LiveInterval* interval);
-    void distributeUses(LiveInterval* interval, const LiveIntervalVector& newIntervals);
-    bool split(LiveInterval* interval, const LiveIntervalVector& newIntervals);
-    bool requeueIntervals(const LiveIntervalVector& newIntervals);
-    void spill(LiveInterval* interval);
+    bool buildLivenessInfo();
+
+    bool addInitialFixedRange(AnyRegister reg, CodePosition from, CodePosition to);
+
+    VirtualRegister& vreg(const LDefinition* def) {
+        return vregs[def->virtualRegister()];
+    }
+    VirtualRegister& vreg(const LAllocation* alloc) {
+        MOZ_ASSERT(alloc->isUse());
+        return vregs[alloc->toUse()->virtualRegister()];
+    }
+
+    // Allocation methods.
+    bool tryMergeBundles(LiveBundle* bundle0, LiveBundle* bundle1);
+    bool tryMergeReusedRegister(VirtualRegister& def, VirtualRegister& input);
+    bool mergeAndQueueRegisters();
+    bool tryAllocateFixed(LiveBundle* bundle, Requirement requirement,
+                          bool* success, bool* pfixed, LiveBundleVector& conflicting);
+    bool tryAllocateNonFixed(LiveBundle* bundle, Requirement requirement, Requirement hint,
+                             bool* success, bool* pfixed, LiveBundleVector& conflicting);
+    bool processBundle(LiveBundle* bundle);
+    bool computeRequirement(LiveBundle* bundle, Requirement *prequirement, Requirement *phint);
+    bool tryAllocateRegister(PhysicalRegister& r, LiveBundle* bundle,
+                             bool* success, bool* pfixed, LiveBundleVector& conflicting);
+    bool evictBundle(LiveBundle* bundle);
+    bool splitAndRequeueBundles(LiveBundle* bundle, const LiveBundleVector& newBundles);
+    bool spill(LiveBundle* bundle);
 
     bool isReusedInput(LUse* use, LNode* ins, bool considerCopy);
     bool isRegisterUse(LUse* use, LNode* ins, bool considerCopy = false);
-    bool isRegisterDefinition(LiveInterval* interval);
-    bool addLiveInterval(LiveIntervalVector& intervals, uint32_t vreg,
-                         LiveInterval* spillInterval,
-                         CodePosition from, CodePosition to);
-    bool pickStackSlot(LiveInterval* interval);
-    bool reuseOrAllocateStackSlot(const LiveIntervalVector& intervals, LDefinition::Type type,
-                                  LAllocation* palloc);
-    bool insertAllRanges(AllocatedRangeSet& set, const LiveIntervalVector& intervals);
+    bool isRegisterDefinition(LiveRange* range);
+    bool pickStackSlot(SpillSet* spill);
+    bool insertAllRanges(LiveRangeSet& set, LiveBundle* bundle);
 
+    // Reification methods.
     bool pickStackSlots();
     bool resolveControlFlow();
     bool reifyAllocations();
     bool populateSafepoints();
     bool annotateMoveGroups();
+    size_t findFirstNonCallSafepoint(CodePosition from);
+    size_t findFirstSafepoint(CodePosition pos, size_t startFrom);
+    void addLiveRegistersForRange(VirtualRegister& reg, LiveRange* range);
 
-    void dumpRegisterGroups();
+    bool addMove(LMoveGroup* moves, LiveRange* from, LiveRange* to, LDefinition::Type type) {
+        LAllocation fromAlloc = from->bundle()->allocation();
+        LAllocation toAlloc = to->bundle()->allocation();
+        MOZ_ASSERT(fromAlloc != toAlloc);
+        return moves->add(fromAlloc, toAlloc, type);
+    }
+
+    bool moveInput(LInstruction* ins, LiveRange* from, LiveRange* to, LDefinition::Type type) {
+        if (from->bundle()->allocation() == to->bundle()->allocation())
+            return true;
+        LMoveGroup* moves = getInputMoveGroup(ins);
+        return addMove(moves, from, to, type);
+    }
+
+    bool moveAfter(LInstruction* ins, LiveRange* from, LiveRange* to, LDefinition::Type type) {
+        if (from->bundle()->allocation() == to->bundle()->allocation())
+            return true;
+        LMoveGroup* moves = getMoveGroupAfter(ins);
+        return addMove(moves, from, to, type);
+    }
+
+    bool moveAtExit(LBlock* block, LiveRange* from, LiveRange* to, LDefinition::Type type) {
+        if (from->bundle()->allocation() == to->bundle()->allocation())
+            return true;
+        LMoveGroup* moves = block->getExitMoveGroup(alloc());
+        return addMove(moves, from, to, type);
+    }
+
+    bool moveAtEntry(LBlock* block, LiveRange* from, LiveRange* to, LDefinition::Type type) {
+        if (from->bundle()->allocation() == to->bundle()->allocation())
+            return true;
+        LMoveGroup* moves = block->getEntryMoveGroup(alloc());
+        return addMove(moves, from, to, type);
+    }
+
+    // Debugging methods.
     void dumpFixedRanges();
     void dumpAllocations();
 
-    struct PrintLiveIntervalRange;
+    struct PrintLiveRange;
 
-    bool minimalDef(const LiveInterval* interval, LNode* ins);
-    bool minimalUse(const LiveInterval* interval, LNode* ins);
-    bool minimalInterval(const LiveInterval* interval, bool* pfixed = nullptr);
+    bool minimalDef(LiveRange* range, LNode* ins);
+    bool minimalUse(LiveRange* range, LNode* ins);
+    bool minimalBundle(LiveBundle* bundle, bool* pfixed = nullptr);
 
     // Heuristic methods.
 
-    size_t computePriority(const LiveInterval* interval);
-    size_t computeSpillWeight(const LiveInterval* interval);
-
-    size_t computePriority(const VirtualRegisterGroup* group);
-    size_t computeSpillWeight(const VirtualRegisterGroup* group);
+    size_t computePriority(LiveBundle* bundle);
+    size_t computeSpillWeight(LiveBundle* bundle);
 
-    size_t maximumSpillWeight(const LiveIntervalVector& intervals);
+    size_t maximumSpillWeight(const LiveBundleVector& bundles);
 
-    bool chooseIntervalSplit(LiveInterval* interval, bool fixed, LiveInterval* conflict);
+    bool chooseBundleSplit(LiveBundle* bundle, bool fixed, LiveBundle* conflict);
 
-    bool splitAt(LiveInterval* interval,
+    bool splitAt(LiveBundle* bundle,
                  const SplitPositionVector& splitPositions);
-    bool trySplitAcrossHotcode(LiveInterval* interval, bool* success);
-    bool trySplitAfterLastRegisterUse(LiveInterval* interval, LiveInterval* conflict, bool* success);
-    bool trySplitBeforeFirstRegisterUse(LiveInterval* interval, LiveInterval* conflict, bool* success);
-    bool splitAtAllRegisterUses(LiveInterval* interval);
-    bool splitAcrossCalls(LiveInterval* interval);
+    bool trySplitAcrossHotcode(LiveBundle* bundle, bool* success);
+    bool trySplitAfterLastRegisterUse(LiveBundle* bundle, LiveBundle* conflict, bool* success);
+    bool trySplitBeforeFirstRegisterUse(LiveBundle* bundle, LiveBundle* conflict, bool* success);
+    bool splitAcrossCalls(LiveBundle* bundle);
 
     bool compilingAsmJS() {
         return mir->info().compilingAsmJS();
     }
 
-    bool isVirtualStackSlot(LAllocation alloc) {
-        return alloc.isStackSlot() &&
-               LAllocation::DATA_MASK - alloc.toStackSlot()->slot() < numVirtualStackSlots;
-    }
+    void dumpVregs();
 };
 
 } // namespace jit
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/BaselineCompiler.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/BaselineCompiler.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/BaselineCompiler.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/BaselineCompiler.cpp	2015-05-25 20:43:20.000000000 +0000
@@ -107,8 +107,10 @@
     if (!emitOutOfLinePostBarrierSlot())
         return Method_Error;
 
-    if (masm.oom())
+    if (masm.oom()) {
+        ReportOutOfMemory(cx);
         return Method_Error;
+    }
 
     Linker linker(masm);
     AutoFlushICache afc("Baseline");
@@ -170,8 +172,10 @@
         previousOffset = entry.nativeOffset;
     }
 
-    if (pcEntries.oom())
+    if (pcEntries.oom()) {
+        ReportOutOfMemory(cx);
         return Method_Error;
+    }
 
     prologueOffset_.fixup(&masm);
     epilogueOffset_.fixup(&masm);
@@ -282,6 +286,7 @@
         JitcodeGlobalTable* globalTable = cx->runtime()->jitRuntime()->getJitcodeGlobalTable();
         if (!globalTable->addEntry(entry, cx->runtime())) {
             entry.destroy();
+            ReportOutOfMemory(cx);
             return Method_Error;
         }
 
@@ -936,8 +941,10 @@
         bool addIndexEntry = (pc == script->code() || lastOpUnreachable || emittedOps > 100);
         if (addIndexEntry)
             emittedOps = 0;
-        if (!addPCMappingEntry(addIndexEntry))
+        if (!addPCMappingEntry(addIndexEntry)) {
+            ReportOutOfMemory(cx);
             return Method_Error;
+        }
 
         // Emit traps for breakpoints and step mode.
         if (compileDebugInstrumentation_ && !emitDebugTrap())
@@ -3389,7 +3396,7 @@
 {
     frame.syncStack(0);
 
-    ArrayObject* templateObject = NewDenseUnallocatedArray(cx, 0, NullPtr(), TenuredObject);
+    ArrayObject* templateObject = NewDenseUnallocatedArray(cx, 0, nullptr, TenuredObject);
     if (!templateObject)
         return false;
     ObjectGroup::fixRestArgumentsGroup(cx, templateObject);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/BaselineIC.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/BaselineIC.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/BaselineIC.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/BaselineIC.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -6116,7 +6116,7 @@
     FallbackICSpew(cx, stub, "In");
 
     if (!objValue.isObject()) {
-        ReportValueError(cx, JSMSG_IN_NOT_OBJECT, -1, objValue, NullPtr());
+        ReportValueError(cx, JSMSG_IN_NOT_OBJECT, -1, objValue, nullptr);
         return false;
     }
 
@@ -9932,7 +9932,7 @@
             count = args.length();
         else if (args.length() == 1 && args[0].isInt32() && args[0].toInt32() >= 0)
             count = args[0].toInt32();
-        res.set(NewDenseUnallocatedArray(cx, count, NullPtr(), TenuredObject));
+        res.set(NewDenseUnallocatedArray(cx, count, nullptr, TenuredObject));
         if (!res)
             return false;
 
@@ -9944,7 +9944,7 @@
     }
 
     if (native == intrinsic_NewDenseArray) {
-        res.set(NewDenseUnallocatedArray(cx, 0, NullPtr(), TenuredObject));
+        res.set(NewDenseUnallocatedArray(cx, 0, nullptr, TenuredObject));
         if (!res)
             return false;
 
@@ -9972,7 +9972,7 @@
     }
 
     if (native == js::str_split && args.length() == 1 && args[0].isString()) {
-        res.set(NewDenseUnallocatedArray(cx, 0, NullPtr(), TenuredObject));
+        res.set(NewDenseUnallocatedArray(cx, 0, nullptr, TenuredObject));
         if (!res)
             return false;
 
@@ -10129,7 +10129,7 @@
             return true;
 
         // If callee is not an interpreted constructor, we have to throw.
-        if (constructing && !fun->isInterpretedConstructor())
+        if (constructing && !fun->isConstructor())
             return true;
 
         if (!fun->hasJITCode()) {
@@ -10227,7 +10227,7 @@
         return true;
     }
 
-    if (fun->isNative() && (!constructing || (constructing && fun->isNativeConstructor()))) {
+    if (fun->isNative() && (!constructing || (constructing && fun->isConstructor()))) {
         // Generalized native call stubs are not here yet!
         MOZ_ASSERT(!stub->nativeStubsAreGeneralized());
 
@@ -10304,7 +10304,7 @@
     if (!group)
         return false;
 
-    RootedArrayObject newObj(cx, NewDenseFullyAllocatedArray(cx, length, NullPtr(), TenuredObject));
+    RootedArrayObject newObj(cx, NewDenseFullyAllocatedArray(cx, length, nullptr, TenuredObject));
     if (!newObj)
         return false;
 
@@ -12121,7 +12121,7 @@
     FallbackICSpew(cx, stub, "InstanceOf");
 
     if (!rhs.isObject()) {
-        ReportValueError(cx, JSMSG_BAD_INSTANCEOF_RHS, -1, rhs, NullPtr());
+        ReportValueError(cx, JSMSG_BAD_INSTANCEOF_RHS, -1, rhs, nullptr);
         return false;
     }
 
@@ -13115,7 +13115,7 @@
     unsigned numRest = numActuals > numFormals ? numActuals - numFormals : 0;
     Value* rest = frame->argv() + numFormals;
 
-    ArrayObject* obj = NewDenseCopiedArray(cx, numRest, rest, NullPtr());
+    ArrayObject* obj = NewDenseCopiedArray(cx, numRest, rest, nullptr);
     if (!obj)
         return false;
     ObjectGroup::fixRestArgumentsGroup(cx, obj);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/BaselineIC.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/BaselineIC.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/BaselineIC.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/BaselineIC.h	2015-05-25 20:43:21.000000000 +0000
@@ -2925,7 +2925,7 @@
         acctype_(acctype),
         needsAtomize_(needsAtomize),
         offset_(offset),
-        getter_(js::NullPtr()),
+        getter_(nullptr),
         pcOffset_(0)
     {}
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/BaselineJIT.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/BaselineJIT.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/BaselineJIT.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/BaselineJIT.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -115,7 +115,7 @@
     data.result.setInt32(data.numActualArgs);
     {
         AssertCompartmentUnchanged pcc(cx);
-        JitActivation activation(cx);
+        JitActivation activation(cx, data.calleeToken);
 
         if (data.osrFrame)
             data.osrFrame->setRunningInJit();
@@ -228,14 +228,19 @@
 
     LifoAlloc alloc(TempAllocator::PreferredLifoChunkSize);
     TempAllocator* temp = alloc.new_<TempAllocator>(&alloc);
-    if (!temp)
+    if (!temp) {
+        ReportOutOfMemory(cx);
         return Method_Error;
+    }
 
     JitContext jctx(cx, temp);
 
     BaselineCompiler compiler(cx, *temp, script);
-    if (!compiler.init())
+    if (!compiler.init()) {
+        ReportOutOfMemory(cx);
         return Method_Error;
+    }
+
     if (forceDebugInstrumentation)
         compiler.setCompileDebugInstrumentation();
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/C1Spewer.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/C1Spewer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/C1Spewer.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/C1Spewer.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -63,19 +63,18 @@
 }
 
 void
-C1Spewer::spewIntervals(const char* pass, BacktrackingAllocator* regalloc)
+C1Spewer::spewRanges(const char* pass, BacktrackingAllocator* regalloc)
 {
     if (!spewout_)
         return;
 
-    fprintf(spewout_, "begin_intervals\n");
+    fprintf(spewout_, "begin_ranges\n");
     fprintf(spewout_, " name \"%s\"\n", pass);
 
-    size_t nextId = 0x4000;
     for (MBasicBlockIterator block(graph->begin()); block != graph->end(); block++)
-        spewIntervals(spewout_, *block, regalloc, nextId);
+        spewRanges(spewout_, *block, regalloc);
 
-    fprintf(spewout_, "end_intervals\n");
+    fprintf(spewout_, "end_ranges\n");
     fflush(spewout_);
 }
 
@@ -112,42 +111,37 @@
 }
 
 void
-C1Spewer::spewIntervals(FILE* fp, BacktrackingAllocator* regalloc, LNode* ins, size_t& nextId)
+C1Spewer::spewRanges(FILE* fp, BacktrackingAllocator* regalloc, LNode* ins)
 {
     for (size_t k = 0; k < ins->numDefs(); k++) {
         uint32_t id = ins->getDef(k)->virtualRegister();
         VirtualRegister* vreg = &regalloc->vregs[id];
 
-        for (size_t i = 0; i < vreg->numIntervals(); i++) {
-            LiveInterval* live = vreg->getInterval(i);
-            if (live->numRanges()) {
-                fprintf(fp, "%d object \"", (i == 0) ? id : int32_t(nextId++));
-                fprintf(fp, "%s", live->getAllocation()->toString());
-                fprintf(fp, "\" %d -1", id);
-                for (size_t j = 0; j < live->numRanges(); j++) {
-                    fprintf(fp, " [%u, %u[", live->getRange(j)->from.bits(),
-                            live->getRange(j)->to.bits());
-                }
-                for (UsePositionIterator usePos(live->usesBegin()); usePos != live->usesEnd(); usePos++)
-                    fprintf(fp, " %u M", usePos->pos.bits());
-                fprintf(fp, " \"\"\n");
-            }
+        for (LiveRange::RegisterLinkIterator iter = vreg->rangesBegin(); iter; iter++) {
+            LiveRange* range = LiveRange::get(*iter);
+            fprintf(fp, "%d object \"", id);
+            fprintf(fp, "%s", range->bundle()->allocation().toString());
+            fprintf(fp, "\" %d -1", id);
+            fprintf(fp, " [%u, %u[", range->from().bits(), range->to().bits());
+            for (UsePositionIterator usePos(range->usesBegin()); usePos; usePos++)
+                fprintf(fp, " %u M", usePos->pos.bits());
+            fprintf(fp, " \"\"\n");
         }
     }
 }
 
 void
-C1Spewer::spewIntervals(FILE* fp, MBasicBlock* block, BacktrackingAllocator* regalloc, size_t& nextId)
+C1Spewer::spewRanges(FILE* fp, MBasicBlock* block, BacktrackingAllocator* regalloc)
 {
     LBlock* lir = block->lir();
     if (!lir)
         return;
 
     for (size_t i = 0; i < lir->numPhis(); i++)
-        spewIntervals(fp, regalloc, lir->getPhi(i), nextId);
+        spewRanges(fp, regalloc, lir->getPhi(i));
 
     for (LInstructionIterator ins = lir->begin(); ins != lir->end(); ins++)
-        spewIntervals(fp, regalloc, *ins, nextId);
+        spewRanges(fp, regalloc, *ins);
 }
 
 void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/C1Spewer.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/C1Spewer.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/C1Spewer.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/C1Spewer.h	2015-05-25 20:43:21.000000000 +0000
@@ -34,14 +34,14 @@
     bool init(const char* path);
     void beginFunction(MIRGraph* graph, HandleScript script);
     void spewPass(const char* pass);
-    void spewIntervals(const char* pass, BacktrackingAllocator* regalloc);
+    void spewRanges(const char* pass, BacktrackingAllocator* regalloc);
     void endFunction();
     void finish();
 
   private:
     void spewPass(FILE* fp, MBasicBlock* block);
-    void spewIntervals(FILE* fp, BacktrackingAllocator* regalloc, LNode* ins, size_t& nextId);
-    void spewIntervals(FILE* fp, MBasicBlock* block, BacktrackingAllocator* regalloc, size_t& nextId);
+    void spewRanges(FILE* fp, BacktrackingAllocator* regalloc, LNode* ins);
+    void spewRanges(FILE* fp, MBasicBlock* block, BacktrackingAllocator* regalloc);
 };
 
 } // namespace jit
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/CodeGenerator.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/CodeGenerator.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/CodeGenerator.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/CodeGenerator.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -64,7 +64,7 @@
   private:
     LInstruction* lir_;
     size_t cacheIndex_;
-    AddCacheState state_;
+    RepatchLabel entry_;
 
   public:
     OutOfLineUpdateCache(LInstruction* lir, size_t cacheIndex)
@@ -83,8 +83,8 @@
     LInstruction* lir() const {
         return lir_;
     }
-    AddCacheState& state() {
-        return state_;
+    RepatchLabel& entry() {
+        return entry_;
     }
 
     void accept(CodeGenerator* codegen) {
@@ -125,10 +125,7 @@
     OutOfLineUpdateCache* ool = new(alloc()) OutOfLineUpdateCache(lir, cacheIndex);
     addOutOfLineCode(ool, mir);
 
-    // OOL-specific state depends on the type of cache.
-    cache->initializeAddCacheState(lir, &ool->state());
-
-    cache->emitInitialJump(masm, ool->state());
+    cache->emitInitialJump(masm, ool->entry());
     masm.bind(ool->rejoin());
 }
 
@@ -139,7 +136,7 @@
 
     // Register the location of the OOL path in the IC.
     cache->setFallbackLabel(masm.labelForPatch());
-    cache->bindInitialJump(masm, ool->state());
+    masm.bind(&ool->entry());
 
     // Dispatch to ICs' accept functions.
     cache->accept(this, ool);
@@ -1713,7 +1710,7 @@
     emitLambdaInit(output, scopeChain, info);
 
     if (info.flags & JSFunction::EXTENDED) {
-        MOZ_ASSERT(info.fun->isMethod());
+        MOZ_ASSERT(info.fun->allowSuperProperty());
         static_assert(FunctionExtended::NUM_EXTENDED_SLOTS == 2, "All slots must be initialized");
         masm.storeValue(UndefinedValue(), Address(output, FunctionExtended::offsetOfExtendedSlot(0)));
         masm.storeValue(UndefinedValue(), Address(output, FunctionExtended::offsetOfExtendedSlot(1)));
@@ -2120,13 +2117,13 @@
     for (size_t i = 0; i < group->numMoves(); i++) {
         const LMove& move = group->getMove(i);
 
-        const LAllocation* from = move.from();
-        const LAllocation* to = move.to();
+        LAllocation from = move.from();
+        LAllocation to = move.to();
         LDefinition::Type type = move.type();
 
         // No bogus moves.
-        MOZ_ASSERT(*from != *to);
-        MOZ_ASSERT(!from->isConstant());
+        MOZ_ASSERT(from != to);
+        MOZ_ASSERT(!from.isConstant());
         MoveOp::Type moveType;
         switch (type) {
           case LDefinition::OBJECT:
@@ -3044,7 +3041,7 @@
     // Missing arguments must have been explicitly appended by the IonBuilder.
     MOZ_ASSERT(target->nargs() <= call->mir()->numStackArgs() - 1);
 
-    MOZ_ASSERT_IF(call->mir()->isConstructing(), target->isInterpretedConstructor());
+    MOZ_ASSERT_IF(call->mir()->isConstructing(), target->isConstructor());
 
     masm.checkStackAlignment();
 
@@ -6737,7 +6734,7 @@
         Address initLength(elements, ObjectElements::offsetOfInitializedLength());
         masm.branchKey(Assembler::NotEqual, initLength, ToInt32Key(index), &callStub);
     } else {
-        Address initLength(obj, UnboxedArrayObject::offsetOfCapacityIndexAndInitializedLength());
+        Address initLength(object, UnboxedArrayObject::offsetOfCapacityIndexAndInitializedLength());
         masm.load32(initLength, ToRegister(temp));
         masm.and32(Imm32(UnboxedArrayObject::InitializedLengthMask), ToRegister(temp));
         masm.branchKey(Assembler::NotEqual, ToRegister(temp), ToInt32Key(index), &callStub);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/EffectiveAddressAnalysis.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/EffectiveAddressAnalysis.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/EffectiveAddressAnalysis.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/EffectiveAddressAnalysis.h	2015-05-25 20:43:21.000000000 +0000
@@ -7,6 +7,8 @@
 #ifndef jit_EffectiveAddressAnalysis_h
 #define jit_EffectiveAddressAnalysis_h
 
+#include "jit/MIRGenerator.h"
+
 namespace js {
 namespace jit {
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/ExecutableAllocatorWin.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/ExecutableAllocatorWin.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/ExecutableAllocatorWin.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/ExecutableAllocatorWin.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -229,15 +229,11 @@
 ExecutablePool::Allocation ExecutableAllocator::systemAlloc(size_t n)
 {
     void* allocation = nullptr;
-    // Randomization disabled to avoid a performance fault on x64 builds.
-    // See bug 728623.
-#ifndef JS_CPU_X64
     if (!RandomizeIsBroken()) {
         void* randomAddress = computeRandomAllocationAddress();
         allocation = AllocateExecutableMemory(randomAddress, n, PAGE_EXECUTE_READWRITE,
                                               "js-jit-code", pageSize);
     }
-#endif
     if (!allocation) {
         allocation = AllocateExecutableMemory(nullptr, n, PAGE_EXECUTE_READWRITE,
                                               "js-jit-code", pageSize);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/InlineList.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/InlineList.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/InlineList.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/InlineList.h	2015-05-25 20:43:21.000000000 +0000
@@ -68,11 +68,6 @@
         return iterator(nullptr);
     }
     void removeAt(iterator where) {
-        iterator iter(where);
-        iter++;
-#ifdef DEBUG
-        iter.modifyCount_++;
-#endif
         removeAfter(where.prev, where.iter);
     }
     void pushFront(Node* t) {
@@ -92,7 +87,7 @@
         removeAfter(this, result);
         return result;
     }
-    T* back() {
+    T* back() const {
         MOZ_ASSERT(!empty());
         return static_cast<T*>(tail_);
     }
@@ -116,6 +111,18 @@
         at->next = item->next;
         item->next = nullptr;
     }
+    void removeAndIncrement(iterator &where) {
+        // Do not change modifyCount_ here. The iterator can still be used
+        // after calling this method, unlike the other methods that modify
+        // the list.
+        Node* item = where.iter;
+        where.iter = item->next;
+        if (item == tail_)
+            tail_ = where.prev;
+        MOZ_ASSERT(where.prev->next == item);
+        where.prev->next = where.iter;
+        item->next = nullptr;
+    }
     void splitAfter(Node* at, InlineForwardList<T>* to) {
         MOZ_ASSERT(to->empty());
         if (!at)
@@ -185,6 +192,9 @@
     bool operator ==(const InlineForwardListIterator<T>& where) const {
         return iter == where.iter;
     }
+    explicit operator bool() const {
+        return iter != nullptr;
+    }
 
 private:
     Node* prev;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/IonBuilder.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/IonBuilder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/IonBuilder.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/IonBuilder.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -29,6 +29,7 @@
 
 #include "jit/CompileInfo-inl.h"
 #include "vm/NativeObject-inl.h"
+#include "vm/ScopeObject-inl.h"
 
 using namespace js;
 using namespace js::jit;
@@ -463,7 +464,7 @@
     }
 
     JSScript* inlineScript = target->nonLazyScript();
-    if (callInfo.constructing() && !target->isInterpretedConstructor()) {
+    if (callInfo.constructing() && !target->isConstructor()) {
         trackOptimizationOutcome(TrackedOutcome::CantInlineNotConstructor);
         return DontInline(inlineScript, "Callee is not a constructor");
     }
@@ -5894,7 +5895,7 @@
 
     // Native constructors build the new Object themselves.
     if (target->isNative()) {
-        if (!target->isNativeConstructor())
+        if (!target->isConstructor())
             return nullptr;
 
         MConstant* magic = MConstant::New(alloc(), MagicValue(JS_IS_CONSTRUCTING));
@@ -6344,8 +6345,7 @@
 {
     // Constructor calls to non-constructors should throw. We don't want to use
     // CallKnown in this case.
-    MOZ_ASSERT_IF(callInfo.constructing() && target,
-                  target->isInterpretedConstructor() || target->isNativeConstructor());
+    MOZ_ASSERT_IF(callInfo.constructing() && target, target->isConstructor());
 
     MCall* call = makeCallHelper(target, callInfo);
     if (!call)
@@ -9369,7 +9369,9 @@
         }
 
         // Compute the length for unboxed array objects.
-        if (UnboxedArrayElementType(constraints(), obj, nullptr) != JSVAL_TYPE_MAGIC) {
+        if (UnboxedArrayElementType(constraints(), obj, nullptr) != JSVAL_TYPE_MAGIC &&
+            !objTypes->hasObjectFlags(constraints(), OBJECT_FLAG_LENGTH_OVERFLOW))
+        {
             current->pop();
 
             MUnboxedArrayLength* length = MUnboxedArrayLength::New(alloc(), obj);
@@ -10868,11 +10870,6 @@
 {
     MOZ_ASSERT(*emitted == false);
 
-    if (obj->type() != MIRType_Object) {
-        trackOptimizationOutcome(TrackedOutcome::NotObject);
-        return true;
-    }
-
     BaselineInspector::ReceiverVector receivers(alloc());
     BaselineInspector::ObjectGroupVector convertUnboxedGroups(alloc());
     if (!inspector->maybeInfoForPropertyOp(pc, receivers, convertUnboxedGroups))
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/IonCaches.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/IonCaches.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/IonCaches.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/IonCaches.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -168,16 +168,19 @@
     bool hasNextStubOffset_ : 1;
     bool hasStubCodePatchOffset_ : 1;
 
+    IonCache& cache_;
+
     CodeLocationLabel rejoinLabel_;
     CodeOffsetJump nextStubOffset_;
     CodeOffsetJump rejoinOffset_;
     CodeOffsetLabel stubCodePatchOffset_;
 
   public:
-    explicit StubAttacher(CodeLocationLabel rejoinLabel)
+    explicit StubAttacher(IonCache& cache)
       : hasNextStubOffset_(false),
         hasStubCodePatchOffset_(false),
-        rejoinLabel_(rejoinLabel),
+        cache_(cache),
+        rejoinLabel_(cache.rejoinLabel_),
         nextStubOffset_(),
         rejoinOffset_(),
         stubCodePatchOffset_()
@@ -253,22 +256,6 @@
         }
     }
 
-    virtual void patchNextStubJump(MacroAssembler& masm, JitCode* code) = 0;
-};
-
-const ImmPtr IonCache::StubAttacher::STUB_ADDR = ImmPtr((void*)0xdeadc0de);
-
-class RepatchIonCache::RepatchStubAppender : public IonCache::StubAttacher
-{
-    RepatchIonCache& cache_;
-
-  public:
-    explicit RepatchStubAppender(RepatchIonCache& cache)
-      : StubAttacher(cache.rejoinLabel()),
-        cache_(cache)
-    {
-    }
-
     void patchNextStubJump(MacroAssembler& masm, JitCode* code) {
         // Patch the previous nextStubJump of the last stub, or the jump from the
         // codeGen, to jump into the newly allocated code.
@@ -289,97 +276,16 @@
     }
 };
 
-void
-RepatchIonCache::reset()
-{
-    IonCache::reset();
-    PatchJump(initialJump_, fallbackLabel_);
-    lastJump_ = initialJump_;
-}
+const ImmPtr IonCache::StubAttacher::STUB_ADDR = ImmPtr((void*)0xdeadc0de);
 
 void
-RepatchIonCache::emitInitialJump(MacroAssembler& masm, AddCacheState& addState)
+IonCache::emitInitialJump(MacroAssembler& masm, RepatchLabel& entry)
 {
-    initialJump_ = masm.jumpWithPatch(&addState.repatchEntry);
+    initialJump_ = masm.jumpWithPatch(&entry);
     lastJump_ = initialJump_;
-}
-
-void
-RepatchIonCache::bindInitialJump(MacroAssembler& masm, AddCacheState& addState)
-{
-    masm.bind(&addState.repatchEntry);
-}
-
-void
-RepatchIonCache::updateBaseAddress(JitCode* code, MacroAssembler& masm)
-{
-    IonCache::updateBaseAddress(code, masm);
-    initialJump_.repoint(code, &masm);
-    lastJump_.repoint(code, &masm);
-}
-
-class DispatchIonCache::DispatchStubPrepender : public IonCache::StubAttacher
-{
-    DispatchIonCache& cache_;
-
-  public:
-    explicit DispatchStubPrepender(DispatchIonCache& cache)
-      : StubAttacher(cache.rejoinLabel_),
-        cache_(cache)
-    {
-    }
-
-    void patchNextStubJump(MacroAssembler& masm, JitCode* code) {
-        MOZ_ASSERT(hasNextStubOffset_);
-
-        // Jump to the previous entry in the stub dispatch table. We
-        // have not yet executed the code we're patching the jump in.
-        nextStubOffset_.fixup(&masm);
-        CodeLocationJump nextStubJump(code, nextStubOffset_);
-        PatchJump(nextStubJump, CodeLocationLabel(cache_.firstStub_));
-
-        // Update the dispatch table. Modification to jumps after the dispatch
-        // table is updated is disallowed, lest we race on entry into an
-        // unfinalized stub.
-        cache_.firstStub_ = code->raw();
-    }
-};
-
-void
-DispatchIonCache::reset()
-{
-    IonCache::reset();
-    firstStub_ = fallbackLabel_.raw();
-}
-void
-DispatchIonCache::emitInitialJump(MacroAssembler& masm, AddCacheState& addState)
-{
-    Register scratch = addState.dispatchScratch;
-    dispatchLabel_ = masm.movWithPatch(ImmPtr((void*)-1), scratch);
-    masm.loadPtr(Address(scratch, 0), scratch);
-    masm.jump(scratch);
-    rejoinLabel_ = masm.labelForPatch();
-}
-
-void
-DispatchIonCache::bindInitialJump(MacroAssembler& masm, AddCacheState& addState)
-{
-    // Do nothing.
-}
-
-void
-DispatchIonCache::updateBaseAddress(JitCode* code, MacroAssembler& masm)
-{
-    // The address of firstStub_ should be pointer aligned.
-    MOZ_ASSERT(uintptr_t(&firstStub_) % sizeof(uintptr_t) == 0);
-
-    IonCache::updateBaseAddress(code, masm);
-    dispatchLabel_.fixup(&masm);
-    Assembler::PatchDataWithValueCheck(CodeLocationLabel(code, dispatchLabel_),
-                                       ImmPtr(&firstStub_),
-                                       ImmPtr((void*)-1));
-    firstStub_ = fallbackLabel_.raw();
-    rejoinLabel_.repoint(code, &masm);
+    Label label;
+    masm.bind(&label);
+    rejoinLabel_ = CodeOffsetLabel(label.offset());
 }
 
 void
@@ -465,11 +371,9 @@
 IonCache::updateBaseAddress(JitCode* code, MacroAssembler& masm)
 {
     fallbackLabel_.repoint(code, &masm);
-}
-
-void
-IonCache::initializeAddCacheState(LInstruction* ins, AddCacheState* addState)
-{
+    initialJump_.repoint(code, &masm);
+    lastJump_.repoint(code, &masm);
+    rejoinLabel_.repoint(code, &masm);
 }
 
 static void*
@@ -1415,7 +1319,7 @@
 
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
 
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
     const char* attachKind;
 
     switch (type) {
@@ -1464,7 +1368,7 @@
 
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
 
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
     GenerateReadUnboxed(cx, ion, masm, attacher, obj, property, object(), output());
     return linkAndAttachStub(cx, masm, attacher, ion, "read unboxed");
 }
@@ -1492,7 +1396,7 @@
 
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
 
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
     GenerateReadSlot(cx, ion, masm, attacher, obj, obj,
                      shape, object(), output());
     return linkAndAttachStub(cx, masm, attacher, ion, "read unboxed expando");
@@ -1526,7 +1430,7 @@
     *emitted = true;
 
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
     GenerateTypedArrayLength(cx, masm, attacher, AnyTypedArrayLayout(obj), object(), output());
 
     setHasTypedArrayLengthStub(obj);
@@ -1631,7 +1535,7 @@
 
     Label failures;
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
 
     // Guard on the shape of the object.
     attacher.branchNextStubOrLabel(masm, Assembler::NotEqual,
@@ -1700,7 +1604,7 @@
 
     Label failures;
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
 
     // Guard on the shape of the object.
     attacher.branchNextStubOrLabel(masm, Assembler::NotEqual,
@@ -1813,7 +1717,7 @@
 
     Label failures;
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
 
     Register scratchReg = output().valueReg().scratchReg();
 
@@ -1866,7 +1770,7 @@
 
     Label failures;
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
 
     Register tmpReg;
     if (output().hasValue()) {
@@ -2019,7 +1923,7 @@
 void
 GetPropertyIC::reset()
 {
-    RepatchIonCache::reset();
+    IonCache::reset();
     hasTypedArrayLengthStub_ = false;
     hasSharedTypedArrayLengthStub_ = false;
     hasStrictArgumentsLengthStub_ = false;
@@ -2038,11 +1942,8 @@
 IonCache::reset()
 {
     this->stubCount_ = 0;
-}
-
-void
-IonCache::destroy()
-{
+    PatchJump(initialJump_, fallbackLabel_);
+    lastJump_ = initialJump_;
 }
 
 // Jump to failure if a value being written is not a property for obj/id.
@@ -2128,7 +2029,7 @@
                              HandleObject obj, HandleShape shape, bool checkTypeset)
 {
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
     GenerateSetSlot(cx, masm, attacher, obj, shape, object(), value(), needsTypeBarrier(),
                     checkTypeset);
     return linkAndAttachStub(cx, masm, attacher, ion, "setting");
@@ -2321,7 +2222,7 @@
     MOZ_ASSERT(!hasGenericProxyStub());
 
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
 
     Label failures;
     {
@@ -2378,7 +2279,7 @@
 
     Label failures;
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
 
     // Guard on the shape of the object.
     masm.branchPtr(Assembler::NotEqual,
@@ -2669,7 +2570,7 @@
 
     Label failures;
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
 
     // Guard on the shape of the object.
     masm.branchPtr(Assembler::NotEqual,
@@ -2715,7 +2616,7 @@
                                 void* returnAddr)
 {
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
 
     Label failure;
     TestMatchingReceiver(masm, attacher, object(), obj, &failure);
@@ -2861,7 +2762,7 @@
     MOZ_ASSERT_IF(!needsTypeBarrier(), !checkTypeset);
 
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
     GenerateAddSlot(cx, masm, attacher, obj, oldShape, oldGroup, object(), value(), checkTypeset);
     return linkAndAttachStub(cx, masm, attacher, ion, "adding");
 }
@@ -3097,7 +2998,7 @@
                                 bool checkTypeset)
 {
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
     GenerateSetUnboxed(cx, masm, attacher, obj, id, unboxedOffset, unboxedType,
                        object(), value(), checkTypeset);
     return linkAndAttachStub(cx, masm, attacher, ion, "set_unboxed");
@@ -3312,7 +3213,7 @@
 void
 SetPropertyIC::reset()
 {
-    RepatchIonCache::reset();
+    IonCache::reset();
     hasGenericProxyStub_ = false;
 }
 
@@ -3418,7 +3319,7 @@
     masm.branchIfFalseBool(scratch, &failures);
     masm.bind(&equal);
 
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
     if (canCache == GetPropertyIC::CanAttachReadSlot) {
         GenerateReadSlot(cx, ion, masm, attacher, obj, holder, shape, object(), output(),
                          &failures);
@@ -3507,7 +3408,7 @@
                                  HandleObject obj, const Value& idval)
 {
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
     if (!GenerateDenseElement(cx, masm, attacher, obj, idval, object(), index(), output()))
         return false;
 
@@ -3662,7 +3563,7 @@
                                      HandleObject obj, const Value& idval)
 {
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
     GenerateDenseElementHole(cx, masm, attacher, ion, obj, idval, object(), index(), output());
 
     return linkAndAttachStub(cx, masm, attacher, ion, "dense hole");
@@ -3813,7 +3714,7 @@
                                       HandleObject tarr, const Value& idval)
 {
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
     GenerateGetTypedArrayElement(cx, masm, attacher, tarr, idval, object(), index(), output(),
                                  allowDoubleResult());
     return linkAndAttachStub(cx, masm, attacher, ion, "typed array");
@@ -3827,7 +3728,7 @@
 
     Label failures;
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
 
     Register tmpReg = output().scratchReg().gpr();
     MOZ_ASSERT(tmpReg != InvalidReg);
@@ -4015,7 +3916,7 @@
 void
 GetElementIC::reset()
 {
-    RepatchIonCache::reset();
+    IonCache::reset();
     hasDenseStub_ = false;
     hasStrictArgumentsStub_ = false;
     hasNormalArgumentsStub_ = false;
@@ -4213,7 +4114,7 @@
                                  HandleObject obj, const Value& idval)
 {
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
     if (!GenerateSetDenseElement(cx, masm, attacher, obj, idval,
                                  guardHoles(), object(), index(),
                                  value(), tempToUnboxIndex(),
@@ -4315,7 +4216,7 @@
                                       HandleObject tarr)
 {
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
     if (!GenerateSetTypedArrayElement(cx, masm, attacher, tarr,
                                       object(), index(), value(),
                                       tempToUnboxIndex(), temp(), tempDouble(), tempFloat32()))
@@ -4354,7 +4255,7 @@
 void
 SetElementIC::reset()
 {
-    RepatchIonCache::reset();
+    IonCache::reset();
     hasDenseStub_ = false;
 }
 
@@ -4365,7 +4266,7 @@
     MOZ_ASSERT(scopeChain->is<GlobalObject>());
 
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
 
     // Guard on the scope chain.
     attacher.branchNextStub(masm, Assembler::NotEqual, scopeChainReg(),
@@ -4442,7 +4343,7 @@
     MOZ_ASSERT(IsCacheableNonGlobalScope(scopeChain));
 
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
 
     // Guard on the shape of the scope chain.
     Label failures;
@@ -4535,7 +4436,7 @@
 {
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
     Label failures;
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
 
     Register scratchReg = outputReg().valueReg().scratchReg();
 
@@ -4604,7 +4505,7 @@
                          HandleShape shape, void* returnAddr)
 {
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
-    RepatchStubAppender attacher(*this);
+    StubAttacher attacher(*this);
 
     Label failures;
     Register scratchReg = outputReg().valueReg().scratchReg();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/IonCaches.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/IonCaches.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/IonCaches.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/IonCaches.h	2015-05-25 20:43:21.000000000 +0000
@@ -46,15 +46,6 @@
 #undef VISIT_INS
 };
 
-// Common shared temporary state needed during codegen between the different
-// kinds of caches. Used by OutOfLineUpdateCache.
-struct AddCacheState
-{
-    RepatchLabel repatchEntry;
-    Register dispatchScratch;
-};
-
-
 // Common structure encoding the state of a polymorphic inline cache contained
 // in the code for an IonScript. IonCaches are used for polymorphic operations
 // where multiple implementations may be required.
@@ -64,14 +55,71 @@
 // may generate a stub to perform the operation in certain cases (e.g. a
 // particular shape for an input object) and attach the stub to existing
 // stubs, forming a daisy chain of tests for how to perform the operation in
-// different circumstances. The details of how stubs are linked up as
-// described in comments below for the classes RepatchIonCache and
-// DispatchIonCache.
+// different circumstances.
 //
 // Eventually, if too many stubs are generated the cache function may disable
 // the cache, by generating a stub to make a call and perform the operation
 // within the VM.
 //
+// The caches initially generate a patchable jump to an out of line call
+// to the cache function. Stubs are attached by appending: when attaching a
+// new stub, we patch the any failure conditions in last generated stub to
+// jump to the new stub. Failure conditions in the new stub jump to the cache
+// function which may generate new stubs.
+//
+//        Control flow               Pointers
+//      =======#                 ----.     .---->
+//             #                     |     |
+//             #======>              \-----/
+//
+// Initial state:
+//
+//  JIT Code
+// +--------+   .---------------.
+// |        |   |               |
+// |========|   v +----------+  |
+// |== IC ==|====>| Cache Fn |  |
+// |========|     +----------+  |
+// |        |<=#       #        |
+// |        |  #=======#        |
+// +--------+  Rejoin path      |
+//     |________                |
+//             |                |
+//     IC      |                |
+//   Entry     |                |
+// +------------+               |
+// | lastJump_  |---------------/
+// +------------+
+// |    ...     |
+// +------------+
+//
+// Attaching stubs:
+//
+//   Patch the jump pointed to by lastJump_ to jump to the new stub. Update
+//   lastJump_ to be the new stub's failure jump. The failure jump of the new
+//   stub goes to the fallback label, which is the cache function. In this
+//   fashion, new stubs are _appended_ to the chain of stubs, as lastJump_
+//   points to the _tail_ of the stub chain.
+//
+//  JIT Code
+// +--------+ #=======================#
+// |        | #                       v
+// |========| #   +----------+     +------+
+// |== IC ==|=#   | Cache Fn |<====| Stub |
+// |========|     +----------+  ^  +------+
+// |        |<=#      #         |     #
+// |        |  #======#=========|=====#
+// +--------+      Rejoin path  |
+//     |________                |
+//             |                |
+//     IC      |                |
+//   Entry     |                |
+// +------------+               |
+// | lastJump_  |---------------/
+// +------------+
+// |    ...     |
+// +------------+
+//
 // While calls may be made to the cache function and other VM functions, the
 // cache may still be treated as pure during optimization passes, such that
 // LICM and GVN may be performed on operations around the cache as if the
@@ -166,6 +214,10 @@
     // IC code to enter a callee.
     jsbytecode* profilerLeavePc_;
 
+    CodeLocationJump initialJump_;
+    CodeLocationJump lastJump_;
+    CodeLocationLabel rejoinLabel_;
+
   private:
     static const size_t MAX_STUBS;
     void incrementStubCount() {
@@ -184,7 +236,10 @@
         fallbackLabel_(),
         script_(nullptr),
         pc_(nullptr),
-        profilerLeavePc_(nullptr)
+        profilerLeavePc_(nullptr),
+        initialJump_(),
+        lastJump_(),
+        rejoinLabel_()
     {
     }
 
@@ -206,22 +261,16 @@
     }
 
     // Get the address at which IC rejoins the mainline jitcode.
-    virtual void* rejoinAddress() = 0;
+    void* rejoinAddress() const {
+        return rejoinLabel_.raw();
+    }
 
-    virtual void emitInitialJump(MacroAssembler& masm, AddCacheState& addState) = 0;
-    virtual void bindInitialJump(MacroAssembler& masm, AddCacheState& addState) = 0;
-    virtual void updateBaseAddress(JitCode* code, MacroAssembler& masm);
-
-    // Initialize the AddCacheState depending on the kind of cache, like
-    // setting a scratch register. Defaults to doing nothing.
-    virtual void initializeAddCacheState(LInstruction* ins, AddCacheState* addState);
+    void emitInitialJump(MacroAssembler& masm, RepatchLabel& entry);
+    void updateBaseAddress(JitCode* code, MacroAssembler& masm);
 
     // Reset the cache around garbage collection.
     virtual void reset();
 
-    // Destroy any extra resources the cache uses upon IonScript finalization.
-    virtual void destroy();
-
     bool canAttachStub() const {
         return stubCount_ < MAX_STUBS;
     }
@@ -285,223 +334,6 @@
     }
 };
 
-//
-// Repatch caches initially generate a patchable jump to an out of line call
-// to the cache function. Stubs are attached by appending: when attaching a
-// new stub, we patch the any failure conditions in last generated stub to
-// jump to the new stub. Failure conditions in the new stub jump to the cache
-// function which may generate new stubs.
-//
-//        Control flow               Pointers
-//      =======#                 ----.     .---->
-//             #                     |     |
-//             #======>              \-----/
-//
-// Initial state:
-//
-//  JIT Code
-// +--------+   .---------------.
-// |        |   |               |
-// |========|   v +----------+  |
-// |== IC ==|====>| Cache Fn |  |
-// |========|     +----------+  |
-// |        |<=#       #        |
-// |        |  #=======#        |
-// +--------+  Rejoin path      |
-//     |________                |
-//             |                |
-//   Repatch   |                |
-//     IC      |                |
-//   Entry     |                |
-// +------------+               |
-// | lastJump_  |---------------/
-// +------------+
-// |    ...     |
-// +------------+
-//
-// Attaching stubs:
-//
-//   Patch the jump pointed to by lastJump_ to jump to the new stub. Update
-//   lastJump_ to be the new stub's failure jump. The failure jump of the new
-//   stub goes to the fallback label, which is the cache function. In this
-//   fashion, new stubs are _appended_ to the chain of stubs, as lastJump_
-//   points to the _tail_ of the stub chain.
-//
-//  JIT Code
-// +--------+ #=======================#
-// |        | #                       v
-// |========| #   +----------+     +------+
-// |== IC ==|=#   | Cache Fn |<====| Stub |
-// |========|     +----------+  ^  +------+
-// |        |<=#      #         |     #
-// |        |  #======#=========|=====#
-// +--------+      Rejoin path  |
-//     |________                |
-//             |                |
-//   Repatch   |                |
-//     IC      |                |
-//   Entry     |                |
-// +------------+               |
-// | lastJump_  |---------------/
-// +------------+
-// |    ...     |
-// +------------+
-//
-class RepatchIonCache : public IonCache
-{
-  protected:
-    class RepatchStubAppender;
-
-    CodeLocationJump initialJump_;
-    CodeLocationJump lastJump_;
-
-    // Offset from the initial jump to the rejoin label.
-#ifdef JS_CODEGEN_ARM
-    static const size_t REJOIN_LABEL_OFFSET = 4;
-#elif defined(JS_CODEGEN_MIPS)
-    // The size of jump created by MacroAssemblerMIPSCompat::jumpWithPatch.
-    static const size_t REJOIN_LABEL_OFFSET = 4 * sizeof(void*);
-#else
-    static const size_t REJOIN_LABEL_OFFSET = 0;
-#endif
-
-    CodeLocationLabel rejoinLabel() const {
-        uint8_t* ptr = initialJump_.raw();
-#if defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_MIPS)
-        uint32_t i = 0;
-        while (i < REJOIN_LABEL_OFFSET)
-            ptr = Assembler::NextInstruction(ptr, &i);
-#endif
-        return CodeLocationLabel(ptr);
-    }
-
-  public:
-    RepatchIonCache()
-      : initialJump_(),
-        lastJump_()
-    {
-    }
-
-    virtual void reset() override;
-
-    // Set the initial jump state of the cache. The initialJump is the inline
-    // jump that will point to out-of-line code (such as the slow path, or
-    // stubs), and the rejoinLabel is the position that all out-of-line paths
-    // will rejoin to.
-    void emitInitialJump(MacroAssembler& masm, AddCacheState& addState) override;
-    void bindInitialJump(MacroAssembler& masm, AddCacheState& addState) override;
-
-    // Update the labels once the code is finalized.
-    void updateBaseAddress(JitCode* code, MacroAssembler& masm) override;
-
-    virtual void* rejoinAddress() override {
-        return rejoinLabel().raw();
-    }
-};
-
-//
-// Dispatch caches avoid patching already-running code. Instead, the jump to
-// the stub chain is indirect by way of the firstStub_ pointer
-// below. Initially the pointer points to the cache function which may attach
-// new stubs. Stubs are attached by prepending: when attaching a new stub, we
-// jump to the previous stub on failure conditions, then overwrite the
-// firstStub_ pointer with the newly generated stub.
-//
-// This style does not patch the already executing instruction stream, does
-// not need to worry about cache coherence of cached jump addresses, and does
-// not have to worry about aligning the exit jumps to ensure atomic patching,
-// at the expense of an extra memory read to load the very first stub.
-//
-// ICs that need to work in parallel execution need to be dispatch
-// style. Since PJS's removal, nothing else yet uses this style of ICs.
-//
-//        Control flow               Pointers             Memory load
-//      =======#                 ----.     .---->         ******
-//             #                     |     |                   *
-//             #======>              \-----/                   *******
-//
-// Initial state:
-//
-//    The first stub points to the cache function.
-//
-//  JIT Code
-// +--------+                                 .-------.
-// |        |                                 v       |
-// |========|     +---------------+     +----------+  |
-// |== IC ==|====>| Load and jump |====>| Cache Fn |  |
-// |========|     +---------------+     +----------+  |
-// |        |<=#           *                #         |
-// |        |  #===========*================#         |
-// +--------+       Rejoin * path                     |
-//     |________           *                          |
-//             |           *                          |
-//   Dispatch  |           *                          |
-//     IC    **|************                          |
-//   Entry   * |                                      |
-// +------------+                                     |
-// | firstStub_ |-------------------------------------/
-// +------------+
-// |    ...     |
-// +------------+
-//
-// Attaching stubs:
-//
-//   Assign the address of the new stub to firstStub_. The new stub jumps to
-//   the old address held in firstStub_ on failure. Note that there is no
-//   concept of a fallback label here, new stubs are _prepended_, as
-//   firstStub_ always points to the _head_ of the stub chain.
-//
-//  JIT Code
-// +--------+                        #=====================#   .-----.
-// |        |                        #                     v   v     |
-// |========|     +---------------+  #  +----------+     +------+    |
-// |== IC ==|====>| Load and jump |==#  | Cache Fn |<====| Stub |    |
-// |========|     +---------------+     +----------+     +------+    |
-// |        |<=#           *                #                #       |
-// |        |  #===========*================#================#       |
-// +--------+       Rejoin * path                                    |
-//     |________           *                                         |
-//             |           *                                         |
-//   Dispatch  |           *                                         |
-//     IC    **|************                                         |
-//   Entry   * |                                                     |
-// +------------+                                                    |
-// | firstStub_ |----------------------------------------------------/
-// +------------+
-// |    ...     |
-// +------------+
-//
-class DispatchIonCache : public IonCache
-{
-  protected:
-    class DispatchStubPrepender;
-
-    uint8_t* firstStub_;
-    CodeLocationLabel rejoinLabel_;
-    CodeOffsetLabel dispatchLabel_;
-
-  public:
-    DispatchIonCache()
-      : firstStub_(nullptr),
-        rejoinLabel_(),
-        dispatchLabel_()
-    {
-    }
-
-    virtual void reset() override;
-    virtual void initializeAddCacheState(LInstruction* ins, AddCacheState* addState) override;
-
-    void emitInitialJump(MacroAssembler& masm, AddCacheState& addState) override;
-    void bindInitialJump(MacroAssembler& masm, AddCacheState& addState) override;
-
-    // Fix up the first stub pointer once the code is finalized.
-    void updateBaseAddress(JitCode* code, MacroAssembler& masm) override;
-
-    virtual void* rejoinAddress() override {
-        return rejoinLabel_.raw();
-    }
-};
-
 // Define the cache kind and pre-declare data structures used for calling inline
 // caches.
 #define CACHE_HEADER(ickind)                                        \
@@ -536,7 +368,7 @@
     { }
 };
 
-class GetPropertyIC : public RepatchIonCache
+class GetPropertyIC : public IonCache
 {
   protected:
     // Registers live after the cache, excluding output registers. The initial
@@ -681,7 +513,7 @@
                        HandleObject obj, MutableHandleValue vp);
 };
 
-class SetPropertyIC : public RepatchIonCache
+class SetPropertyIC : public IonCache
 {
   protected:
     // Registers live after the cache, excluding output registers. The initial
@@ -768,7 +600,7 @@
                        HandleObject obj, HandleValue value);
 };
 
-class GetElementIC : public RepatchIonCache
+class GetElementIC : public IonCache
 {
   protected:
     LiveRegisterSet liveRegs_;
@@ -879,7 +711,7 @@
     }
 };
 
-class SetElementIC : public RepatchIonCache
+class SetElementIC : public IonCache
 {
   protected:
     Register object_;
@@ -963,7 +795,7 @@
            HandleValue idval, HandleValue value);
 };
 
-class BindNameIC : public RepatchIonCache
+class BindNameIC : public IonCache
 {
   protected:
     Register scopeChain_;
@@ -1000,7 +832,7 @@
     update(JSContext* cx, HandleScript outerScript, size_t cacheIndex, HandleObject scopeChain);
 };
 
-class NameIC : public RepatchIonCache
+class NameIC : public IonCache
 {
   protected:
     // Registers live after the cache, excluding output registers. The initial
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/IonCode.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/IonCode.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/IonCode.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/IonCode.h	2015-05-25 20:43:21.000000000 +0000
@@ -503,7 +503,6 @@
     }
     void toggleBarriers(bool enabled);
     void purgeCaches();
-    void destroyCaches();
     void unlinkFromRuntime(FreeOp* fop);
     void copySnapshots(const SnapshotWriter* writer);
     void copyRecovers(const RecoverWriter* writer);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/Ion.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/Ion.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/Ion.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/Ion.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -46,6 +46,10 @@
 
 #include "jscompartmentinlines.h"
 #include "jsobjinlines.h"
+#include "jsscriptinlines.h"
+
+#include "jit/JitFrames-inl.h"
+#include "vm/ScopeObject-inl.h"
 
 using namespace js;
 using namespace js::jit;
@@ -1095,7 +1099,6 @@
     if (script->pendingBuilder())
         jit::FinishOffThreadBuilder(nullptr, script->pendingBuilder());
 
-    script->destroyCaches();
     script->unlinkFromRuntime(fop);
     fop->free_(script);
 }
@@ -1122,13 +1125,6 @@
 }
 
 void
-IonScript::destroyCaches()
-{
-    for (size_t i = 0; i < numCaches(); i++)
-        getCacheFromIndex(i).destroy();
-}
-
-void
 IonScript::unlinkFromRuntime(FreeOp* fop)
 {
     // The writes to the executable buffer below may clobber backedge jumps, so
@@ -2384,7 +2380,7 @@
     data.result.setInt32(data.numActualArgs);
     {
         AssertCompartmentUnchanged pcc(cx);
-        JitActivation activation(cx);
+        JitActivation activation(cx, data.calleeToken);
 
         CALL_GENERATED_CODE(enter, data.jitcode, data.maxArgc, data.maxArgv, /* osrFrame = */nullptr, data.calleeToken,
                             /* scopeChain = */ nullptr, 0, data.result.address());
@@ -2481,14 +2477,15 @@
 {
     JS_CHECK_RECURSION(cx, return JitExec_Error);
 
-    IonScript* ion = fun->nonLazyScript()->ionScript();
+    RootedScript script(cx, fun->nonLazyScript());
+    IonScript* ion = script->ionScript();
     JitCode* code = ion->method();
     void* jitcode = code->raw();
 
     MOZ_ASSERT(jit::IsIonEnabled(cx));
     MOZ_ASSERT(!ion->bailoutExpected());
 
-    JitActivation activation(cx);
+    JitActivation activation(cx, CalleeToToken(script));
 
     EnterJitCode enter = cx->runtime()->jitRuntime()->enterIon();
     void* calleeToken = CalleeToToken(fun, /* constructing = */ false);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/JitcodeMap.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/JitcodeMap.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/JitcodeMap.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/JitcodeMap.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -1552,7 +1552,7 @@
 } // namespace jit
 } // namespace js
 
-JS::ForEachProfiledFrameOp::FrameHandle::FrameHandle(JSRuntime* rt, JitcodeGlobalEntry& entry,
+JS::ForEachProfiledFrameOp::FrameHandle::FrameHandle(JSRuntime* rt, js::jit::JitcodeGlobalEntry& entry,
                                                      void* addr, const char* label, uint32_t depth)
   : rt_(rt),
     entry_(entry),
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/JitFrameIterator.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/JitFrameIterator.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/JitFrameIterator.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/JitFrameIterator.h	2015-05-25 20:43:21.000000000 +0000
@@ -23,6 +23,8 @@
 namespace js {
 namespace jit {
 
+typedef void * CalleeToken;
+
 enum FrameType
 {
     // A JS frame is analagous to a js::InterpreterFrame, representing one scripted
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/JitFrames.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/JitFrames.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/JitFrames.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/JitFrames.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -2987,6 +2987,35 @@
         return;
     }
 
+    if (prevType == JitFrame_Unwound_Rectifier) {
+        // Unwound rectifier exit frames still keep their 'JS' format (with
+        // the target function and actual-args included in the frame and not
+        // counted in the frame size).
+        RectifierFrameLayout* rectFrame =
+            GetPreviousRawFrame<JitFrameLayout, RectifierFrameLayout*>((JitFrameLayout*) frame);
+
+        MOZ_ASSERT(rectFrame->prevType() == JitFrame_BaselineStub ||
+                   rectFrame->prevType() == JitFrame_IonJS);
+
+        if (rectFrame->prevType() == JitFrame_BaselineStub) {
+            // Unwind past stub frame.
+            BaselineStubFrameLayout* stubFrame =
+                GetPreviousRawFrame<RectifierFrameLayout, BaselineStubFrameLayout*>(rectFrame);
+            MOZ_ASSERT(stubFrame->prevType() == JitFrame_BaselineJS);
+            returnAddressToFp_ = stubFrame->returnAddress();
+            fp_ = ((uint8_t*) stubFrame->reverseSavedFramePtr())
+                    + jit::BaselineFrame::FramePointerOffset;
+            type_ = JitFrame_BaselineJS;
+            return;
+        }
+
+        // else, prior frame was ion frame.
+        returnAddressToFp_ = rectFrame->returnAddress();
+        fp_ = GetPreviousRawFrame<RectifierFrameLayout, uint8_t*>(rectFrame);
+        type_ = JitFrame_IonJS;
+        return;
+    }
+
     MOZ_CRASH("Invalid frame type prior to exit frame.");
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/JitFrames.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/JitFrames.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/JitFrames.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/JitFrames.h	2015-05-25 20:43:21.000000000 +0000
@@ -18,8 +18,6 @@
 namespace js {
 namespace jit {
 
-typedef void * CalleeToken;
-
 enum CalleeTokenTag
 {
     CalleeToken_Function = 0x0, // untagged
@@ -375,13 +373,10 @@
         return offsetof(JitFrameLayout, numActualArgs_);
     }
     static size_t offsetOfThis() {
-        JitFrameLayout* base = nullptr;
-        return reinterpret_cast<size_t>(&base->argv()[0]);
+        return sizeof(JitFrameLayout);
     }
     static size_t offsetOfActualArgs() {
-        JitFrameLayout* base = nullptr;
-        // +1 to skip |this|.
-        return reinterpret_cast<size_t>(&base->argv()[1]);
+        return offsetOfThis() + sizeof(Value);
     }
     static size_t offsetOfActualArg(size_t arg) {
         return offsetOfActualArgs() + arg * sizeof(Value);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/JitOptions.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/JitOptions.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/JitOptions.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/JitOptions.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -161,6 +161,9 @@
 
     // The bytecode length limit for small function.
     SET_DEFAULT(smallFunctionMaxBytecodeLength_, 100);
+
+    // Toggles whether unboxed plain objects can be created by the VM.
+    SET_DEFAULT(disableUnboxedObjects, false);
 }
 
 bool
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/JitOptions.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/JitOptions.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/JitOptions.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/JitOptions.h	2015-05-25 20:43:21.000000000 +0000
@@ -67,6 +67,9 @@
     uint32_t osrPcMismatchesBeforeRecompile;
     uint32_t smallFunctionMaxBytecodeLength_;
 
+    // The options below affect the rest of the VM, and not just the JIT.
+    bool disableUnboxedObjects;
+
     JitOptions();
     bool isSmallFunction(JSScript* script) const;
     void setEagerCompilation();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/JitSpewer.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/JitSpewer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/JitSpewer.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/JitSpewer.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -177,11 +177,11 @@
         return;
 
     c1Spewer.spewPass(pass);
-    c1Spewer.spewIntervals(pass, ra);
+    c1Spewer.spewRanges(pass, ra);
     jsonSpewer.beginPass(pass);
     jsonSpewer.spewMIR(graph);
     jsonSpewer.spewLIR(graph);
-    jsonSpewer.spewIntervals(ra);
+    jsonSpewer.spewRanges(ra);
     jsonSpewer.endPass();
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/JSONSpewer.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/JSONSpewer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/JSONSpewer.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/JSONSpewer.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -396,12 +396,12 @@
 }
 
 void
-JSONSpewer::spewIntervals(BacktrackingAllocator* regalloc)
+JSONSpewer::spewRanges(BacktrackingAllocator* regalloc)
 {
     if (!fp_)
         return;
 
-    beginObjectProperty("intervals");
+    beginObjectProperty("ranges");
     beginListProperty("blocks");
 
     for (size_t bno = 0; bno < regalloc->graph.numBlocks(); bno++) {
@@ -417,27 +417,17 @@
 
                 beginObject();
                 integerProperty("vreg", id);
-                beginListProperty("intervals");
+                beginListProperty("ranges");
 
-                for (size_t i = 0; i < vreg->numIntervals(); i++) {
-                    LiveInterval* live = vreg->getInterval(i);
+                for (LiveRange::RegisterLinkIterator iter = vreg->rangesBegin(); iter; iter++) {
+                    LiveRange* range = LiveRange::get(*iter);
 
-                    if (live->numRanges()) {
-                        beginObject();
-                        property("allocation");
-                        fprintf(fp_, "\"%s\"", live->getAllocation()->toString());
-                        beginListProperty("ranges");
-
-                        for (size_t j = 0; j < live->numRanges(); j++) {
-                            beginObject();
-                            integerProperty("start", live->getRange(j)->from.bits());
-                            integerProperty("end", live->getRange(j)->to.bits());
-                            endObject();
-                        }
-
-                        endList();
-                        endObject();
-                    }
+                    beginObject();
+                    property("allocation");
+                    fprintf(fp_, "\"%s\"", range->bundle()->allocation().toString());
+                    integerProperty("start", range->from().bits());
+                    integerProperty("end", range->to().bits());
+                    endObject();
                 }
 
                 endList();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/JSONSpewer.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/JSONSpewer.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/JSONSpewer.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/JSONSpewer.h	2015-05-25 20:43:21.000000000 +0000
@@ -61,7 +61,7 @@
     void spewMIR(MIRGraph* mir);
     void spewLIns(LNode* ins);
     void spewLIR(MIRGraph* mir);
-    void spewIntervals(BacktrackingAllocator* regalloc);
+    void spewRanges(BacktrackingAllocator* regalloc);
     void endPass();
     void endFunction();
     void finish();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/LIR-Common.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/LIR-Common.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/LIR-Common.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/LIR-Common.h	2015-05-25 20:43:21.000000000 +0000
@@ -58,27 +58,21 @@
 
 class LMove
 {
-    LAllocation* from_;
-    LAllocation* to_;
+    LAllocation from_;
+    LAllocation to_;
     LDefinition::Type type_;
 
   public:
-    LMove(LAllocation* from, LAllocation* to, LDefinition::Type type)
+    LMove(LAllocation from, LAllocation to, LDefinition::Type type)
       : from_(from),
         to_(to),
         type_(type)
     { }
 
-    LAllocation* from() {
+    LAllocation from() const {
         return from_;
     }
-    const LAllocation* from() const {
-        return from_;
-    }
-    LAllocation* to() {
-        return to_;
-    }
-    const LAllocation* to() const {
+    LAllocation to() const {
         return to_;
     }
     LDefinition::Type type() const {
@@ -109,10 +103,10 @@
     void printOperands(FILE* fp);
 
     // Add a move which takes place simultaneously with all others in the group.
-    bool add(LAllocation* from, LAllocation* to, LDefinition::Type type);
+    bool add(LAllocation from, LAllocation to, LDefinition::Type type);
 
     // Add a move which takes place after existing moves in the group.
-    bool addAfter(LAllocation* from, LAllocation* to, LDefinition::Type type);
+    bool addAfter(LAllocation from, LAllocation to, LDefinition::Type type);
 
     size_t numMoves() const {
         return moves_.length();
@@ -137,7 +131,7 @@
     bool uses(Register reg) {
         for (size_t i = 0; i < numMoves(); i++) {
             LMove move = getMove(i);
-            if (*move.from() == LGeneralReg(reg) || *move.to() == LGeneralReg(reg))
+            if (move.from() == LGeneralReg(reg) || move.to() == LGeneralReg(reg))
                 return true;
         }
         return false;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/LIR.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/LIR.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/LIR.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/LIR.cpp	2015-05-25 20:43:21.000000000 +0000
@@ -110,7 +110,6 @@
             if (!inputs)
                 return false;
 
-            // MSVC 2015 cannot handle "new (&phis_[phiIndex++])"
             void* addr = &phis_[phiIndex++];
             LPhi* lphi = new (addr) LPhi(phi, inputs);
             lphi->setBlock(this);
@@ -535,28 +534,28 @@
 }
 
 bool
-LMoveGroup::add(LAllocation* from, LAllocation* to, LDefinition::Type type)
+LMoveGroup::add(LAllocation from, LAllocation to, LDefinition::Type type)
 {
 #ifdef DEBUG
-    MOZ_ASSERT(*from != *to);
+    MOZ_ASSERT(from != to);
     for (size_t i = 0; i < moves_.length(); i++)
-        MOZ_ASSERT(*to != *moves_[i].to());
+        MOZ_ASSERT(to != moves_[i].to());
 
     // Check that SIMD moves are aligned according to ABI requirements.
     if (LDefinition(type).isSimdType()) {
-        MOZ_ASSERT(from->isMemory() || from->isFloatReg());
-        if (from->isMemory()) {
-            if (from->isArgument())
-                MOZ_ASSERT(from->toArgument()->index() % SimdMemoryAlignment == 0);
+        MOZ_ASSERT(from.isMemory() || from.isFloatReg());
+        if (from.isMemory()) {
+            if (from.isArgument())
+                MOZ_ASSERT(from.toArgument()->index() % SimdMemoryAlignment == 0);
             else
-                MOZ_ASSERT(from->toStackSlot()->slot() % SimdMemoryAlignment == 0);
+                MOZ_ASSERT(from.toStackSlot()->slot() % SimdMemoryAlignment == 0);
         }
-        MOZ_ASSERT(to->isMemory() || to->isFloatReg());
-        if (to->isMemory()) {
-            if (to->isArgument())
-                MOZ_ASSERT(to->toArgument()->index() % SimdMemoryAlignment == 0);
+        MOZ_ASSERT(to.isMemory() || to.isFloatReg());
+        if (to.isMemory()) {
+            if (to.isArgument())
+                MOZ_ASSERT(to.toArgument()->index() % SimdMemoryAlignment == 0);
             else
-                MOZ_ASSERT(to->toStackSlot()->slot() % SimdMemoryAlignment == 0);
+                MOZ_ASSERT(to.toStackSlot()->slot() % SimdMemoryAlignment == 0);
         }
     }
 #endif
@@ -564,24 +563,24 @@
 }
 
 bool
-LMoveGroup::addAfter(LAllocation* from, LAllocation* to, LDefinition::Type type)
+LMoveGroup::addAfter(LAllocation from, LAllocation to, LDefinition::Type type)
 {
     // Transform the operands to this move so that performing the result
     // simultaneously with existing moves in the group will have the same
     // effect as if the original move took place after the existing moves.
 
     for (size_t i = 0; i < moves_.length(); i++) {
-        if (*moves_[i].to() == *from) {
+        if (moves_[i].to() == from) {
             from = moves_[i].from();
             break;
         }
     }
 
-    if (*from == *to)
+    if (from == to)
         return true;
 
     for (size_t i = 0; i < moves_.length(); i++) {
-        if (*to == *moves_[i].to()) {
+        if (to == moves_[i].to()) {
             moves_[i] = LMove(from, to, type);
             return true;
         }
@@ -596,8 +595,8 @@
     for (size_t i = 0; i < numMoves(); i++) {
         const LMove& move = getMove(i);
         // Use two printfs, as LAllocation::toString is not reentrant.
-        fprintf(fp, " [%s", move.from()->toString());
-        fprintf(fp, " -> %s", move.to()->toString());
+        fprintf(fp, " [%s", move.from().toString());
+        fprintf(fp, " -> %s", move.to().toString());
 #ifdef DEBUG
         fprintf(fp, ", %s", TypeChars[move.type()]);
 #endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/LiveRangeAllocator.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/LiveRangeAllocator.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/LiveRangeAllocator.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/LiveRangeAllocator.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,996 +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=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/LiveRangeAllocator.h"
-
-#include "mozilla/DebugOnly.h"
-
-#include "jsprf.h"
-
-#include "jit/BacktrackingAllocator.h"
-#include "jit/BitSet.h"
-
-using namespace js;
-using namespace js::jit;
-
-using mozilla::DebugOnly;
-
-int
-Requirement::priority() const
-{
-    switch (kind_) {
-      case Requirement::FIXED:
-        return 0;
-
-      case Requirement::REGISTER:
-        return 1;
-
-      case Requirement::NONE:
-        return 2;
-
-      default:
-        MOZ_CRASH("Unknown requirement kind.");
-    }
-}
-
-const char*
-Requirement::toString() const
-{
-#ifdef DEBUG
-    // Not reentrant!
-    static char buf[1000];
-
-    char* cursor = buf;
-    char* end = cursor + sizeof(buf);
-
-    int n = -1;  // initialize to silence GCC warning
-    switch (kind()) {
-      case NONE:
-        return "none";
-      case REGISTER:
-        n = JS_snprintf(cursor, end - cursor, "r");
-        break;
-      case FIXED:
-        n = JS_snprintf(cursor, end - cursor, "%s", allocation().toString());
-        break;
-      case MUST_REUSE_INPUT:
-        n = JS_snprintf(cursor, end - cursor, "v%u", virtualRegister());
-        break;
-    }
-    if (n < 0)
-        return "???";
-    cursor += n;
-
-    if (pos() != CodePosition::MIN) {
-        n = JS_snprintf(cursor, end - cursor, "@%u", pos().bits());
-        if (n < 0)
-            return "???";
-        cursor += n;
-    }
-
-    return buf;
-#else
-    return " ???";
-#endif
-}
-
-void
-Requirement::dump() const
-{
-    fprintf(stderr, "%s\n", toString());
-}
-
-bool
-LiveInterval::Range::contains(const Range* other) const
-{
-    return from <= other->from && to >= other->to;
-}
-
-void
-LiveInterval::Range::intersect(const Range* other, Range* pre, Range* inside, Range* post) const
-{
-    MOZ_ASSERT(pre->empty() && inside->empty() && post->empty());
-
-    CodePosition innerFrom = from;
-    if (from < other->from) {
-        if (to < other->from) {
-            *pre = Range(from, to);
-            return;
-        }
-        *pre = Range(from, other->from);
-        innerFrom = other->from;
-    }
-
-    CodePosition innerTo = to;
-    if (to > other->to) {
-        if (from >= other->to) {
-            *post = Range(from, to);
-            return;
-        }
-        *post = Range(other->to, to);
-        innerTo = other->to;
-    }
-
-    if (innerFrom != innerTo)
-        *inside = Range(innerFrom, innerTo);
-}
-
-const char*
-LiveInterval::Range::toString() const
-{
-#ifdef DEBUG
-    // Not reentrant!
-    static char buf[1000];
-
-    char* cursor = buf;
-    char* end = cursor + sizeof(buf);
-
-    int n = JS_snprintf(cursor, end - cursor, "[%u,%u)", from.bits(), to.bits());
-    if (n < 0)
-        return " ???";
-    cursor += n;
-
-    return buf;
-#else
-    return " ???";
-#endif
-}
-
-void
-LiveInterval::Range::dump() const
-{
-    fprintf(stderr, "%s\n", toString());
-}
-
-bool
-LiveInterval::addRangeAtHead(CodePosition from, CodePosition to)
-{
-    MOZ_ASSERT(from < to);
-    MOZ_ASSERT(ranges_.empty() || from <= ranges_.back().from);
-
-    Range newRange(from, to);
-
-    if (ranges_.empty())
-        return ranges_.append(newRange);
-
-    Range& first = ranges_.back();
-    if (to < first.from)
-        return ranges_.append(newRange);
-
-    if (to == first.from) {
-        first.from = from;
-        return true;
-    }
-
-    MOZ_ASSERT(from < first.to);
-    MOZ_ASSERT(to > first.from);
-    if (from < first.from)
-        first.from = from;
-    if (to > first.to)
-        first.to = to;
-
-    return true;
-}
-
-bool
-LiveInterval::addRange(CodePosition from, CodePosition to)
-{
-    MOZ_ASSERT(from < to);
-
-    Range newRange(from, to);
-
-    Range* i;
-    // Find the location to insert the new range
-    for (i = ranges_.end(); i > ranges_.begin(); i--) {
-        if (newRange.from <= i[-1].to) {
-            if (i[-1].from < newRange.from)
-                newRange.from = i[-1].from;
-            break;
-        }
-    }
-    // Perform coalescing on overlapping ranges
-    Range* coalesceEnd = i;
-    for (; i > ranges_.begin(); i--) {
-        if (newRange.to < i[-1].from)
-            break;
-        if (newRange.to < i[-1].to)
-            newRange.to = i[-1].to;
-    }
-
-    if (i == coalesceEnd)
-        return ranges_.insert(i, newRange);
-
-    i[0] = newRange;
-    ranges_.erase(i + 1, coalesceEnd);
-    return true;
-}
-
-void
-LiveInterval::setFrom(CodePosition from)
-{
-    while (!ranges_.empty()) {
-        if (ranges_.back().to < from) {
-            ranges_.popBack();
-        } else {
-            if (from == ranges_.back().to)
-                ranges_.popBack();
-            else
-                ranges_.back().from = from;
-            break;
-        }
-    }
-}
-
-bool
-LiveInterval::covers(CodePosition pos)
-{
-    if (pos < start() || pos >= end())
-        return false;
-
-    // Loop over the ranges in ascending order.
-    size_t i = lastProcessedRangeIfValid(pos);
-    for (; i < ranges_.length(); i--) {
-        if (pos < ranges_[i].from)
-            return false;
-        setLastProcessedRange(i, pos);
-        if (pos < ranges_[i].to)
-            return true;
-    }
-    return false;
-}
-
-CodePosition
-LiveInterval::intersect(LiveInterval* other)
-{
-    if (start() > other->start())
-        return other->intersect(this);
-
-    // Loop over the ranges in ascending order. As an optimization,
-    // try to start at the last processed range.
-    size_t i = lastProcessedRangeIfValid(other->start());
-    size_t j = other->ranges_.length() - 1;
-    if (i >= ranges_.length() || j >= other->ranges_.length())
-        return CodePosition::MIN;
-
-    while (true) {
-        const Range& r1 = ranges_[i];
-        const Range& r2 = other->ranges_[j];
-
-        if (r1.from <= r2.from) {
-            if (r1.from <= other->start())
-                setLastProcessedRange(i, other->start());
-            if (r2.from < r1.to)
-                return r2.from;
-            if (i == 0 || ranges_[i-1].from > other->end())
-                break;
-            i--;
-        } else {
-            if (r1.from < r2.to)
-                return r1.from;
-            if (j == 0 || other->ranges_[j-1].from > end())
-                break;
-            j--;
-        }
-    }
-
-    return CodePosition::MIN;
-}
-
-/*
- * This function takes the callee interval and moves all ranges following or
- * including provided position to the target interval. Additionally, if a
- * range in the callee interval spans the given position, it is split and the
- * latter half is placed in the target interval.
- *
- * This function should only be called if it is known that the interval should
- * actually be split (and, presumably, a move inserted). As such, it is an
- * error for the caller to request a split that moves all intervals into the
- * target. Doing so will trip the assertion at the bottom of the function.
- */
-bool
-LiveInterval::splitFrom(CodePosition pos, LiveInterval* after)
-{
-    MOZ_ASSERT(pos >= start() && pos < end());
-    MOZ_ASSERT(after->ranges_.empty());
-
-    // Move all intervals over to the target
-    size_t bufferLength = ranges_.length();
-    Range* buffer = ranges_.extractRawBuffer();
-    if (!buffer)
-        return false;
-    after->ranges_.replaceRawBuffer(buffer, bufferLength);
-
-    // Move intervals back as required
-    for (Range* i = &after->ranges_.back(); i >= after->ranges_.begin(); i--) {
-        if (pos >= i->to)
-            continue;
-
-        if (pos > i->from) {
-            // Split the range
-            Range split(i->from, pos);
-            i->from = pos;
-            if (!ranges_.append(split))
-                return false;
-        }
-        if (!ranges_.append(i + 1, after->ranges_.end()))
-            return false;
-        after->ranges_.shrinkBy(after->ranges_.end() - i - 1);
-        break;
-    }
-
-    // Split the linked list of use positions
-    UsePosition* prev = nullptr;
-    for (UsePositionIterator usePos(usesBegin()); usePos != usesEnd(); usePos++) {
-        if (usePos->pos > pos)
-            break;
-        prev = *usePos;
-    }
-
-    uses_.splitAfter(prev, &after->uses_);
-    return true;
-}
-
-void
-LiveInterval::addUse(UsePosition* use)
-{
-    // Insert use positions in ascending order. Note that instructions
-    // are visited in reverse order, so in most cases the loop terminates
-    // at the first iteration and the use position will be added to the
-    // front of the list.
-    UsePosition* prev = nullptr;
-    for (UsePositionIterator current(usesBegin()); current != usesEnd(); current++) {
-        if (current->pos >= use->pos)
-            break;
-        prev = *current;
-    }
-
-    if (prev)
-        uses_.insertAfter(prev, use);
-    else
-        uses_.pushFront(use);
-}
-
-void
-LiveInterval::addUseAtEnd(UsePosition* use)
-{
-    MOZ_ASSERT(uses_.empty() || use->pos >= uses_.back()->pos);
-    uses_.pushBack(use);
-}
-
-UsePosition*
-LiveInterval::nextUseAfter(CodePosition after)
-{
-    for (UsePositionIterator usePos(usesBegin()); usePos != usesEnd(); usePos++) {
-        if (usePos->pos >= after) {
-            LUse::Policy policy = usePos->use->policy();
-            MOZ_ASSERT(policy != LUse::RECOVERED_INPUT);
-            if (policy != LUse::KEEPALIVE)
-                return *usePos;
-        }
-    }
-    return nullptr;
-}
-
-UsePosition*
-LiveInterval::popUse()
-{
-    return uses_.popFront();
-}
-
-/*
- * This function locates the first "real" use of this interval that follows
- * the given code position. Non-"real" uses are currently just snapshots,
- * which keep virtual registers alive but do not result in the
- * generation of code that use them.
- */
-CodePosition
-LiveInterval::nextUsePosAfter(CodePosition after)
-{
-    UsePosition* min = nextUseAfter(after);
-    return min ? min->pos : CodePosition::MAX;
-}
-
-LiveInterval*
-VirtualRegister::intervalFor(CodePosition pos)
-{
-    // Intervals are sorted in ascending order by their start position.
-    for (LiveInterval** i = intervals_.begin(); i != intervals_.end(); i++) {
-        if ((*i)->covers(pos))
-            return *i;
-        if (pos < (*i)->start())
-            break;
-    }
-    return nullptr;
-}
-
-LiveInterval*
-VirtualRegister::getFirstInterval()
-{
-    MOZ_ASSERT(!intervals_.empty());
-    return intervals_[0];
-}
-
-// Instantiate LiveRangeAllocator for each template instance.
-template bool LiveRangeAllocator<BacktrackingVirtualRegister>::buildLivenessInfo();
-template void LiveRangeAllocator<BacktrackingVirtualRegister>::dumpVregs();
-
-#ifdef DEBUG
-// Returns true iff ins has a def/temp reusing the input allocation.
-static bool
-IsInputReused(LInstruction* ins, LUse* use)
-{
-    for (size_t i = 0; i < ins->numDefs(); i++) {
-        if (ins->getDef(i)->policy() == LDefinition::MUST_REUSE_INPUT &&
-            ins->getOperand(ins->getDef(i)->getReusedInput())->toUse() == use)
-        {
-            return true;
-        }
-    }
-
-    for (size_t i = 0; i < ins->numTemps(); i++) {
-        if (ins->getTemp(i)->policy() == LDefinition::MUST_REUSE_INPUT &&
-            ins->getOperand(ins->getTemp(i)->getReusedInput())->toUse() == use)
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-#endif
-
-/*
- * This function pre-allocates and initializes as much global state as possible
- * to avoid littering the algorithms with memory management cruft.
- */
-template <typename VREG>
-bool
-LiveRangeAllocator<VREG>::init()
-{
-    if (!RegisterAllocator::init())
-        return false;
-
-    liveIn = mir->allocate<BitSet>(graph.numBlockIds());
-    if (!liveIn)
-        return false;
-
-    // Initialize fixed intervals.
-    for (size_t i = 0; i < AnyRegister::Total; i++) {
-        AnyRegister reg = AnyRegister::FromCode(i);
-        LiveInterval* interval = LiveInterval::New(alloc(), 0);
-        interval->setAllocation(LAllocation(reg));
-        fixedIntervals[i] = interval;
-    }
-
-    fixedIntervalsUnion = LiveInterval::New(alloc(), 0);
-
-    if (!vregs.init(mir, graph.numVirtualRegisters()))
-        return false;
-
-    // Build virtual register objects
-    for (size_t i = 0; i < graph.numBlocks(); i++) {
-        if (mir->shouldCancel("Create data structures (main loop)"))
-            return false;
-
-        LBlock* block = graph.getBlock(i);
-        for (LInstructionIterator ins = block->begin(); ins != block->end(); ins++) {
-            for (size_t j = 0; j < ins->numDefs(); j++) {
-                LDefinition* def = ins->getDef(j);
-                if (def->isBogusTemp())
-                    continue;
-                if (!vregs[def].init(alloc(), *ins, def, /* isTemp */ false))
-                    return false;
-            }
-
-            for (size_t j = 0; j < ins->numTemps(); j++) {
-                LDefinition* def = ins->getTemp(j);
-                if (def->isBogusTemp())
-                    continue;
-                if (!vregs[def].init(alloc(), *ins, def, /* isTemp */ true))
-                    return false;
-            }
-        }
-        for (size_t j = 0; j < block->numPhis(); j++) {
-            LPhi* phi = block->getPhi(j);
-            LDefinition* def = phi->getDef(0);
-            if (!vregs[def].init(alloc(), phi, def, /* isTemp */ false))
-                return false;
-        }
-    }
-
-    return true;
-}
-
-/*
- * This function builds up liveness intervals for all virtual registers
- * defined in the function. Additionally, it populates the liveIn array with
- * information about which registers are live at the beginning of a block, to
- * aid resolution and reification in a later phase.
- *
- * The algorithm is based on the one published in:
- *
- * Wimmer, Christian, and Michael Franz. "Linear Scan Register Allocation on
- *     SSA Form." Proceedings of the International Symposium on Code Generation
- *     and Optimization. Toronto, Ontario, Canada, ACM. 2010. 170-79. PDF.
- *
- * The algorithm operates on blocks ordered such that dominators of a block
- * are before the block itself, and such that all blocks of a loop are
- * contiguous. It proceeds backwards over the instructions in this order,
- * marking registers live at their uses, ending their live intervals at
- * definitions, and recording which registers are live at the top of every
- * block. To deal with loop backedges, variables live at the beginning of
- * a loop gain an interval covering the entire loop.
- */
-template <typename VREG>
-bool
-LiveRangeAllocator<VREG>::buildLivenessInfo()
-{
-    JitSpew(JitSpew_RegAlloc, "Beginning liveness analysis");
-
-    if (!init())
-        return false;
-
-    Vector<MBasicBlock*, 1, SystemAllocPolicy> loopWorkList;
-    BitSet loopDone(graph.numBlockIds());
-    if (!loopDone.init(alloc()))
-        return false;
-
-    for (size_t i = graph.numBlocks(); i > 0; i--) {
-        if (mir->shouldCancel("Build Liveness Info (main loop)"))
-            return false;
-
-        LBlock* block = graph.getBlock(i - 1);
-        MBasicBlock* mblock = block->mir();
-
-        BitSet& live = liveIn[mblock->id()];
-        new (&live) BitSet(graph.numVirtualRegisters());
-        if (!live.init(alloc()))
-            return false;
-
-        // Propagate liveIn from our successors to us
-        for (size_t i = 0; i < mblock->lastIns()->numSuccessors(); i++) {
-            MBasicBlock* successor = mblock->lastIns()->getSuccessor(i);
-            // Skip backedges, as we fix them up at the loop header.
-            if (mblock->id() < successor->id())
-                live.insertAll(liveIn[successor->id()]);
-        }
-
-        // Add successor phis
-        if (mblock->successorWithPhis()) {
-            LBlock* phiSuccessor = mblock->successorWithPhis()->lir();
-            for (unsigned int j = 0; j < phiSuccessor->numPhis(); j++) {
-                LPhi* phi = phiSuccessor->getPhi(j);
-                LAllocation* use = phi->getOperand(mblock->positionInPhiSuccessor());
-                uint32_t reg = use->toUse()->virtualRegister();
-                live.insert(reg);
-            }
-        }
-
-        // Variables are assumed alive for the entire block, a define shortens
-        // the interval to the point of definition.
-        for (BitSet::Iterator liveRegId(live); liveRegId; ++liveRegId) {
-            if (!vregs[*liveRegId].getInterval(0)->addRangeAtHead(entryOf(block),
-                                                                  exitOf(block).next()))
-            {
-                return false;
-            }
-        }
-
-        // Shorten the front end of live intervals for live variables to their
-        // point of definition, if found.
-        for (LInstructionReverseIterator ins = block->rbegin(); ins != block->rend(); ins++) {
-            // Calls may clobber registers, so force a spill and reload around the callsite.
-            if (ins->isCall()) {
-                for (AnyRegisterIterator iter(allRegisters_.asLiveSet()); iter.more(); iter++) {
-                    bool found = false;
-
-                    for (size_t i = 0; i < ins->numDefs(); i++) {
-                        if (ins->getDef(i)->isFixed() &&
-                            ins->getDef(i)->output()->aliases(LAllocation(*iter))) {
-                            found = true;
-                            break;
-                        }
-                    }
-                    if (!found && !addFixedRangeAtHead(*iter, outputOf(*ins), outputOf(*ins).next()))
-                        return false;
-                }
-            }
-            DebugOnly<bool> hasDoubleDef = false;
-            DebugOnly<bool> hasFloat32Def = false;
-            for (size_t i = 0; i < ins->numDefs(); i++) {
-                LDefinition* def = ins->getDef(i);
-                if (def->isBogusTemp())
-                    continue;
-#ifdef DEBUG
-                    if (def->type() == LDefinition::DOUBLE)
-                        hasDoubleDef = true;
-                    if (def->type() == LDefinition::FLOAT32)
-                        hasFloat32Def = true;
-#endif
-                CodePosition from = outputOf(*ins);
-
-                if (def->policy() == LDefinition::MUST_REUSE_INPUT) {
-                    // MUST_REUSE_INPUT is implemented by allocating an output
-                    // register and moving the input to it. Register hints are
-                    // used to avoid unnecessary moves. We give the input an
-                    // LUse::ANY policy to avoid allocating a register for the
-                    // input.
-                    LUse* inputUse = ins->getOperand(def->getReusedInput())->toUse();
-                    MOZ_ASSERT(inputUse->policy() == LUse::REGISTER);
-                    MOZ_ASSERT(inputUse->usedAtStart());
-                    *inputUse = LUse(inputUse->virtualRegister(), LUse::ANY, /* usedAtStart = */ true);
-                }
-
-                LiveInterval* interval = vregs[def].getInterval(0);
-                interval->setFrom(from);
-
-                // Ensure that if there aren't any uses, there's at least
-                // some interval for the output to go into.
-                if (interval->numRanges() == 0) {
-                    if (!interval->addRangeAtHead(from, from.next()))
-                        return false;
-                }
-                live.remove(def->virtualRegister());
-            }
-
-            for (size_t i = 0; i < ins->numTemps(); i++) {
-                LDefinition* temp = ins->getTemp(i);
-                if (temp->isBogusTemp())
-                    continue;
-
-                // Normally temps are considered to cover both the input
-                // and output of the associated instruction. In some cases
-                // though we want to use a fixed register as both an input
-                // and clobbered register in the instruction, so watch for
-                // this and shorten the temp to cover only the output.
-                CodePosition from = inputOf(*ins);
-                if (temp->policy() == LDefinition::FIXED) {
-                    AnyRegister reg = temp->output()->toRegister();
-                    for (LInstruction::InputIterator alloc(**ins); alloc.more(); alloc.next()) {
-                        if (alloc->isUse()) {
-                            LUse* use = alloc->toUse();
-                            if (use->isFixedRegister()) {
-                                if (GetFixedRegister(vregs[use].def(), use) == reg)
-                                    from = outputOf(*ins);
-                            }
-                        }
-                    }
-                }
-
-                CodePosition to =
-                    ins->isCall() ? outputOf(*ins) : outputOf(*ins).next();
-                if (!vregs[temp].getInterval(0)->addRangeAtHead(from, to))
-                    return false;
-            }
-
-            DebugOnly<bool> hasUseRegister = false;
-            DebugOnly<bool> hasUseRegisterAtStart = false;
-
-            for (LInstruction::InputIterator inputAlloc(**ins); inputAlloc.more(); inputAlloc.next()) {
-                if (inputAlloc->isUse()) {
-                    LUse* use = inputAlloc->toUse();
-
-                    // Call uses should always be at-start or fixed, since the fixed intervals
-                    // use all registers.
-                    MOZ_ASSERT_IF(ins->isCall() && !inputAlloc.isSnapshotInput(),
-                                  use->isFixedRegister() || use->usedAtStart());
-
-#ifdef DEBUG
-                    // Don't allow at-start call uses if there are temps of the same kind,
-                    // so that we don't assign the same register.
-                    if (ins->isCall() && use->usedAtStart()) {
-                        for (size_t i = 0; i < ins->numTemps(); i++)
-                            MOZ_ASSERT(vregs[ins->getTemp(i)].isFloatReg() != vregs[use].isFloatReg());
-                    }
-
-                    // If there are both useRegisterAtStart(x) and useRegister(y)
-                    // uses, we may assign the same register to both operands due to
-                    // interval splitting (bug 772830). Don't allow this for now.
-                    if (use->policy() == LUse::REGISTER) {
-                        if (use->usedAtStart()) {
-                            if (!IsInputReused(*ins, use))
-                                hasUseRegisterAtStart = true;
-                        } else {
-                            hasUseRegister = true;
-                        }
-                    }
-                    MOZ_ASSERT(!(hasUseRegister && hasUseRegisterAtStart));
-#endif
-
-                    // Don't treat RECOVERED_INPUT uses as keeping the vreg alive.
-                    if (use->policy() == LUse::RECOVERED_INPUT)
-                        continue;
-
-                    // Fixed uses on calls are specially overridden to happen
-                    // at the input position.
-                    CodePosition to =
-                        (use->usedAtStart() || (ins->isCall() && use->isFixedRegister()))
-                        ? inputOf(*ins)
-                        : outputOf(*ins);
-                    if (use->isFixedRegister()) {
-                        LAllocation reg(AnyRegister::FromCode(use->registerCode()));
-                        for (size_t i = 0; i < ins->numDefs(); i++) {
-                            LDefinition* def = ins->getDef(i);
-                            if (def->policy() == LDefinition::FIXED && *def->output() == reg)
-                                to = inputOf(*ins);
-                        }
-                    }
-
-                    LiveInterval* interval = vregs[use].getInterval(0);
-                    if (!interval->addRangeAtHead(entryOf(block), to.next()))
-                        return false;
-                    interval->addUse(new(alloc()) UsePosition(use, to));
-
-                    live.insert(use->virtualRegister());
-                }
-            }
-        }
-
-        // Phis have simultaneous assignment semantics at block begin, so at
-        // the beginning of the block we can be sure that liveIn does not
-        // contain any phi outputs.
-        for (unsigned int i = 0; i < block->numPhis(); i++) {
-            LDefinition* def = block->getPhi(i)->getDef(0);
-            if (live.contains(def->virtualRegister())) {
-                live.remove(def->virtualRegister());
-            } else {
-                // This is a dead phi, so add a dummy range over all phis. This
-                // can go away if we have an earlier dead code elimination pass.
-                CodePosition entryPos = entryOf(block);
-                if (!vregs[def].getInterval(0)->addRangeAtHead(entryPos, entryPos.next()))
-                    return false;
-            }
-        }
-
-        if (mblock->isLoopHeader()) {
-            // A divergence from the published algorithm is required here, as
-            // our block order does not guarantee that blocks of a loop are
-            // contiguous. As a result, a single live interval spanning the
-            // loop is not possible. Additionally, we require liveIn in a later
-            // pass for resolution, so that must also be fixed up here.
-            MBasicBlock* loopBlock = mblock->backedge();
-            while (true) {
-                // Blocks must already have been visited to have a liveIn set.
-                MOZ_ASSERT(loopBlock->id() >= mblock->id());
-
-                // Add an interval for this entire loop block
-                CodePosition from = entryOf(loopBlock->lir());
-                CodePosition to = exitOf(loopBlock->lir()).next();
-
-                for (BitSet::Iterator liveRegId(live); liveRegId; ++liveRegId) {
-                    if (!vregs[*liveRegId].getInterval(0)->addRange(from, to))
-                        return false;
-                }
-
-                // Fix up the liveIn set to account for the new interval
-                liveIn[loopBlock->id()].insertAll(live);
-
-                // Make sure we don't visit this node again
-                loopDone.insert(loopBlock->id());
-
-                // If this is the loop header, any predecessors are either the
-                // backedge or out of the loop, so skip any predecessors of
-                // this block
-                if (loopBlock != mblock) {
-                    for (size_t i = 0; i < loopBlock->numPredecessors(); i++) {
-                        MBasicBlock* pred = loopBlock->getPredecessor(i);
-                        if (loopDone.contains(pred->id()))
-                            continue;
-                        if (!loopWorkList.append(pred))
-                            return false;
-                    }
-                }
-
-                // Terminate loop if out of work.
-                if (loopWorkList.empty())
-                    break;
-
-                // Grab the next block off the work list, skipping any OSR block.
-                MBasicBlock* osrBlock = graph.mir().osrBlock();
-                while (!loopWorkList.empty()) {
-                    loopBlock = loopWorkList.popCopy();
-                    if (loopBlock != osrBlock)
-                        break;
-                }
-
-                // If end is reached without finding a non-OSR block, then no more work items were found.
-                if (loopBlock == osrBlock) {
-                    MOZ_ASSERT(loopWorkList.empty());
-                    break;
-                }
-            }
-
-            // Clear the done set for other loops
-            loopDone.clear();
-        }
-
-        MOZ_ASSERT_IF(!mblock->numPredecessors(), live.empty());
-    }
-
-    validateVirtualRegisters();
-
-    // If the script has an infinite loop, there may be no MReturn and therefore
-    // no fixed intervals. Add a small range to fixedIntervalsUnion so that the
-    // rest of the allocator can assume it has at least one range.
-    if (fixedIntervalsUnion->numRanges() == 0) {
-        if (!fixedIntervalsUnion->addRangeAtHead(CodePosition(0, CodePosition::INPUT),
-                                                 CodePosition(0, CodePosition::OUTPUT)))
-        {
-            return false;
-        }
-    }
-
-    JitSpew(JitSpew_RegAlloc, "Liveness analysis complete");
-
-    if (JitSpewEnabled(JitSpew_RegAlloc)) {
-        dumpInstructions();
-
-        fprintf(stderr, "Live ranges by virtual register:\n");
-        dumpVregs();
-    }
-
-    return true;
-}
-
-template <typename VREG>
-void
-LiveRangeAllocator<VREG>::dumpVregs()
-{
-#ifdef DEBUG
-    // Virtual register number 0 is unused.
-    MOZ_ASSERT(vregs[0u].numIntervals() == 0);
-    for (uint32_t i = 1; i < graph.numVirtualRegisters(); i++) {
-        fprintf(stderr, "  ");
-        VirtualRegister& vreg = vregs[i];
-        for (size_t j = 0; j < vreg.numIntervals(); j++) {
-            if (j)
-                fprintf(stderr, " / ");
-            fprintf(stderr, "%s", vreg.getInterval(j)->toString());
-        }
-        fprintf(stderr, "\n");
-    }
-
-    fprintf(stderr, "\n");
-#endif
-}
-
-#ifdef DEBUG
-
-void
-LiveInterval::validateRanges()
-{
-    Range* prev = nullptr;
-
-    for (size_t i = ranges_.length() - 1; i < ranges_.length(); i--) {
-        Range* range = &ranges_[i];
-
-        MOZ_ASSERT(range->from < range->to);
-        MOZ_ASSERT_IF(prev, prev->to <= range->from);
-        prev = range;
-    }
-}
-
-#endif // DEBUG
-
-const char*
-LiveInterval::rangesToString() const
-{
-#ifdef DEBUG
-    // Not reentrant!
-    static char buf[2000];
-
-    char* cursor = buf;
-    char* end = cursor + sizeof(buf);
-
-    int n;
-
-    for (size_t i = ranges_.length() - 1; i < ranges_.length(); i--) {
-        const LiveInterval::Range* range = getRange(i);
-        n = JS_snprintf(cursor, end - cursor, " %s", range->toString());
-        if (n < 0)
-            return " ???";
-        cursor += n;
-    }
-
-    return buf;
-#else
-    return " ???";
-#endif
-}
-
-#ifdef DEBUG
-static bool
-IsHintInteresting(const Requirement& requirement, const Requirement& hint)
-{
-    if (hint.kind() == Requirement::NONE)
-        return false;
-
-    if (hint.kind() != Requirement::FIXED && hint.kind() != Requirement::REGISTER)
-        return true;
-
-    Requirement merge = requirement;
-    if (!merge.mergeRequirement(hint))
-        return true;
-
-    return merge.kind() != requirement.kind();
-}
-#endif
-
-const char*
-LiveInterval::toString() const
-{
-#ifdef DEBUG
-    // Not reentrant!
-    static char buf[2000];
-
-    char* cursor = buf;
-    char* end = cursor + sizeof(buf);
-
-    int n;
-
-    if (hasVreg()) {
-        n = JS_snprintf(cursor, end - cursor, "v%u", vreg());
-        if (n < 0) return "???";
-        cursor += n;
-    }
-
-    n = JS_snprintf(cursor, end - cursor, "[%u]", index());
-    if (n < 0) return "???";
-    cursor += n;
-
-    if (requirement_.kind() != Requirement::NONE || hint_.kind() != Requirement::NONE) {
-        n = JS_snprintf(cursor, end - cursor, " req(");
-        if (n < 0) return "???";
-        cursor += n;
-
-        bool printHint = IsHintInteresting(requirement_, hint_);
-
-        if (requirement_.kind() != Requirement::NONE) {
-            n = JS_snprintf(cursor, end - cursor, "%s%s",
-                            requirement_.toString(),
-                            printHint ? "," : "");
-            if (n < 0) return "???";
-            cursor += n;
-        }
-        if (printHint) {
-            n = JS_snprintf(cursor, end - cursor, "%s?", hint_.toString());
-            if (n < 0) return "???";
-            cursor += n;
-        }
-
-        n = JS_snprintf(cursor, end - cursor, ")");
-        if (n < 0) return "???";
-        cursor += n;
-    }
-
-    if (!alloc_.isBogus()) {
-        n = JS_snprintf(cursor, end - cursor, " has(%s)", alloc_.toString());
-        if (n < 0) return "???";
-        cursor += n;
-    }
-
-    n = JS_snprintf(cursor, end - cursor, "%s", rangesToString());
-    if (n < 0) return "???";
-    cursor += n;
-
-    for (UsePositionIterator usePos(usesBegin()); usePos != usesEnd(); usePos++) {
-        n = JS_snprintf(cursor, end - cursor, " %s@%u",
-                        usePos->use->toString(), usePos->pos.bits());
-        if (n < 0) return "???";
-        cursor += n;
-    }
-
-    return buf;
-#else
-    return "???";
-#endif
-}
-
-void
-LiveInterval::dump() const
-{
-    fprintf(stderr, "%s\n", toString());
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/LiveRangeAllocator.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/LiveRangeAllocator.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/LiveRangeAllocator.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/LiveRangeAllocator.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,758 +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=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/. */
-
-#ifndef jit_LiveRangeAllocator_h
-#define jit_LiveRangeAllocator_h
-
-#include "mozilla/Array.h"
-#include "mozilla/DebugOnly.h"
-
-#include "jit/RegisterAllocator.h"
-#include "jit/StackSlotAllocator.h"
-
-// Common structures and functions used by register allocators that operate on
-// virtual register live ranges.
-
-namespace js {
-namespace jit {
-
-class Requirement
-{
-  public:
-    enum Kind {
-        NONE,
-        REGISTER,
-        FIXED,
-        MUST_REUSE_INPUT
-    };
-
-    Requirement()
-      : kind_(NONE)
-    { }
-
-    explicit Requirement(Kind kind)
-      : kind_(kind)
-    {
-        // These have dedicated constructors.
-        MOZ_ASSERT(kind != FIXED && kind != MUST_REUSE_INPUT);
-    }
-
-    Requirement(Kind kind, CodePosition at)
-      : kind_(kind),
-        position_(at)
-    {
-        // These have dedicated constructors.
-        MOZ_ASSERT(kind != FIXED && kind != MUST_REUSE_INPUT);
-    }
-
-    explicit Requirement(LAllocation fixed)
-      : kind_(FIXED),
-        allocation_(fixed)
-    {
-        MOZ_ASSERT(!fixed.isBogus() && !fixed.isUse());
-    }
-
-    // Only useful as a hint, encodes where the fixed requirement is used to
-    // avoid allocating a fixed register too early.
-    Requirement(LAllocation fixed, CodePosition at)
-      : kind_(FIXED),
-        allocation_(fixed),
-        position_(at)
-    {
-        MOZ_ASSERT(!fixed.isBogus() && !fixed.isUse());
-    }
-
-    Requirement(uint32_t vreg, CodePosition at)
-      : kind_(MUST_REUSE_INPUT),
-        allocation_(LUse(vreg, LUse::ANY)),
-        position_(at)
-    { }
-
-    Kind kind() const {
-        return kind_;
-    }
-
-    LAllocation allocation() const {
-        MOZ_ASSERT(!allocation_.isBogus() && !allocation_.isUse());
-        return allocation_;
-    }
-
-    uint32_t virtualRegister() const {
-        MOZ_ASSERT(allocation_.isUse());
-        MOZ_ASSERT(kind() == MUST_REUSE_INPUT);
-        return allocation_.toUse()->virtualRegister();
-    }
-
-    CodePosition pos() const {
-        return position_;
-    }
-
-    int priority() const;
-
-    bool mergeRequirement(const Requirement& newRequirement) {
-        // Merge newRequirement with any existing requirement, returning false
-        // if the new and old requirements conflict.
-        MOZ_ASSERT(newRequirement.kind() != Requirement::MUST_REUSE_INPUT);
-
-        if (newRequirement.kind() == Requirement::FIXED) {
-            if (kind() == Requirement::FIXED)
-                return newRequirement.allocation() == allocation();
-            *this = newRequirement;
-            return true;
-        }
-
-        MOZ_ASSERT(newRequirement.kind() == Requirement::REGISTER);
-        if (kind() == Requirement::FIXED)
-            return allocation().isRegister();
-
-        *this = newRequirement;
-        return true;
-    }
-
-    // Return a string describing this requirement. This is not re-entrant!
-    const char* toString() const;
-
-    void dump() const;
-
-  private:
-    Kind kind_;
-    LAllocation allocation_;
-    CodePosition position_;
-};
-
-struct UsePosition : public TempObject,
-                     public InlineForwardListNode<UsePosition>
-{
-    LUse* use;
-    CodePosition pos;
-
-    UsePosition(LUse* use, CodePosition pos) :
-        use(use),
-        pos(pos)
-    {
-        // Verify that the usedAtStart() flag is consistent with the
-        // subposition. For now ignore fixed registers, because they
-        // are handled specially around calls.
-        MOZ_ASSERT_IF(!use->isFixedRegister(),
-                      pos.subpos() == (use->usedAtStart()
-                                       ? CodePosition::INPUT
-                                       : CodePosition::OUTPUT));
-    }
-};
-
-typedef InlineForwardListIterator<UsePosition> UsePositionIterator;
-
-static inline bool
-UseCompatibleWith(const LUse* use, LAllocation alloc)
-{
-    switch (use->policy()) {
-      case LUse::ANY:
-      case LUse::KEEPALIVE:
-        return alloc.isRegister() || alloc.isMemory();
-      case LUse::REGISTER:
-        return alloc.isRegister();
-      case LUse::FIXED:
-          // Fixed uses are handled using fixed intervals. The
-          // UsePosition is only used as hint.
-        return alloc.isRegister();
-      default:
-        MOZ_CRASH("Unknown use policy");
-    }
-}
-
-#ifdef DEBUG
-
-static inline bool
-DefinitionCompatibleWith(LNode* ins, const LDefinition* def, LAllocation alloc)
-{
-    if (ins->isPhi()) {
-        if (def->isFloatReg())
-            return alloc.isFloatReg() || alloc.isStackSlot();
-        return alloc.isGeneralReg() || alloc.isStackSlot();
-    }
-
-    switch (def->policy()) {
-      case LDefinition::REGISTER:
-        if (!alloc.isRegister())
-            return false;
-        return alloc.isFloatReg() == def->isFloatReg();
-      case LDefinition::FIXED:
-        return alloc == *def->output();
-      case LDefinition::MUST_REUSE_INPUT:
-        if (!alloc.isRegister() || !ins->numOperands())
-            return false;
-        return alloc == *ins->getOperand(def->getReusedInput());
-      default:
-        MOZ_CRASH("Unknown definition policy");
-    }
-}
-
-#endif // DEBUG
-
-static inline LDefinition*
-FindReusingDefinition(LNode* ins, LAllocation* alloc)
-{
-    for (size_t i = 0; i < ins->numDefs(); i++) {
-        LDefinition* def = ins->getDef(i);
-        if (def->policy() == LDefinition::MUST_REUSE_INPUT &&
-            ins->getOperand(def->getReusedInput()) == alloc)
-            return def;
-    }
-    for (size_t i = 0; i < ins->numTemps(); i++) {
-        LDefinition* def = ins->getTemp(i);
-        if (def->policy() == LDefinition::MUST_REUSE_INPUT &&
-            ins->getOperand(def->getReusedInput()) == alloc)
-            return def;
-    }
-    return nullptr;
-}
-
-/*
- * A live interval is a set of disjoint ranges of code positions where a
- * virtual register is live. Register allocation operates on these intervals,
- * splitting them as necessary and assigning allocations to them as it runs.
- */
-class LiveInterval
-  : public TempObject
-{
-  public:
-    /*
-     * A range is a contiguous sequence of CodePositions where the virtual
-     * register associated with this interval is live.
-     */
-    struct Range {
-        Range()
-          : from(),
-            to()
-        { }
-        Range(CodePosition f, CodePosition t)
-          : from(f),
-            to(t)
-        {
-            MOZ_ASSERT(from < to);
-        }
-
-        // The beginning of this range, inclusive.
-        CodePosition from;
-
-        // The end of this range, exclusive.
-        CodePosition to;
-
-        bool empty() const {
-            return from >= to;
-        }
-
-        // Whether this range wholly contains other.
-        bool contains(const Range* other) const;
-
-        // Intersect this range with other, returning the subranges of this
-        // that are before, inside, or after other.
-        void intersect(const Range* other, Range* pre, Range* inside, Range* post) const;
-
-        // Return a string describing this range. This is not re-entrant!
-        const char* toString() const;
-
-        void dump() const;
-    };
-
-  private:
-    Vector<Range, 1, JitAllocPolicy> ranges_;
-    LAllocation alloc_;
-    LiveInterval* spillInterval_;
-    uint32_t vreg_;
-    uint32_t index_;
-    Requirement requirement_;
-    Requirement hint_;
-    InlineForwardList<UsePosition> uses_;
-    size_t lastProcessedRange_;
-
-    LiveInterval(TempAllocator& alloc, uint32_t vreg, uint32_t index)
-      : ranges_(alloc),
-        spillInterval_(nullptr),
-        vreg_(vreg),
-        index_(index),
-        lastProcessedRange_(size_t(-1))
-    { }
-
-    LiveInterval(TempAllocator& alloc, uint32_t index)
-      : ranges_(alloc),
-        spillInterval_(nullptr),
-        vreg_(UINT32_MAX),
-        index_(index),
-        lastProcessedRange_(size_t(-1))
-    { }
-
-  public:
-    static LiveInterval* New(TempAllocator& alloc, uint32_t vreg, uint32_t index) {
-        return new(alloc) LiveInterval(alloc, vreg, index);
-    }
-    static LiveInterval* New(TempAllocator& alloc, uint32_t index) {
-        return new(alloc) LiveInterval(alloc, index);
-    }
-
-    bool addRange(CodePosition from, CodePosition to);
-    bool addRangeAtHead(CodePosition from, CodePosition to);
-    void setFrom(CodePosition from);
-    CodePosition intersect(LiveInterval* other);
-    bool covers(CodePosition pos);
-
-    CodePosition start() const {
-        MOZ_ASSERT(!ranges_.empty());
-        return ranges_.back().from;
-    }
-
-    CodePosition end() const {
-        MOZ_ASSERT(!ranges_.empty());
-        return ranges_.begin()->to;
-    }
-
-    size_t numRanges() const {
-        return ranges_.length();
-    }
-    const Range* getRange(size_t i) const {
-        return &ranges_[i];
-    }
-    void setLastProcessedRange(size_t range, mozilla::DebugOnly<CodePosition> pos) {
-        // If the range starts after pos, we may not be able to use
-        // it in the next lastProcessedRangeIfValid call.
-        MOZ_ASSERT(ranges_[range].from <= pos);
-        lastProcessedRange_ = range;
-    }
-    size_t lastProcessedRangeIfValid(CodePosition pos) const {
-        if (lastProcessedRange_ < ranges_.length() && ranges_[lastProcessedRange_].from <= pos)
-            return lastProcessedRange_;
-        return ranges_.length() - 1;
-    }
-
-    LAllocation* getAllocation() {
-        return &alloc_;
-    }
-    void setAllocation(LAllocation alloc) {
-        alloc_ = alloc;
-    }
-    void setSpillInterval(LiveInterval* spill) {
-        spillInterval_ = spill;
-    }
-    LiveInterval* spillInterval() {
-        return spillInterval_;
-    }
-    bool hasVreg() const {
-        return vreg_ != UINT32_MAX;
-    }
-    uint32_t vreg() const {
-        MOZ_ASSERT(hasVreg());
-        return vreg_;
-    }
-    uint32_t index() const {
-        return index_;
-    }
-    void setIndex(uint32_t index) {
-        index_ = index;
-    }
-    const Requirement* requirement() const {
-        return &requirement_;
-    }
-    void setRequirement(const Requirement& requirement) {
-        // A MUST_REUSE_INPUT requirement complicates regalloc too much; it
-        // should only be used as hint.
-        MOZ_ASSERT(requirement.kind() != Requirement::MUST_REUSE_INPUT);
-        requirement_ = requirement;
-    }
-    bool addRequirement(const Requirement& newRequirement) {
-        return requirement_.mergeRequirement(newRequirement);
-    }
-    void addHint(const Requirement& newHint) {
-        // Unlike addRequirement, here in addHint we ignore merge failures,
-        // because these are just hints.
-        hint_.mergeRequirement(newHint);
-    }
-    const Requirement* hint() const {
-        return &hint_;
-    }
-    void setHint(const Requirement& hint) {
-        hint_ = hint;
-    }
-    bool isSpill() const {
-        return alloc_.isStackSlot();
-    }
-    bool splitFrom(CodePosition pos, LiveInterval* after);
-
-    void addUse(UsePosition* use);
-    void addUseAtEnd(UsePosition* use);
-    UsePosition* popUse();
-    UsePosition* nextUseAfter(CodePosition pos);
-    CodePosition nextUsePosAfter(CodePosition pos);
-
-    UsePositionIterator usesBegin() const {
-        return uses_.begin();
-    }
-
-    UsePositionIterator usesEnd() const {
-        return uses_.end();
-    }
-
-    bool usesEmpty() const {
-        return uses_.empty();
-    }
-
-    UsePosition* usesBack() {
-        return uses_.back();
-    }
-
-#ifdef DEBUG
-    void validateRanges();
-#endif
-
-    // Return a string describing the ranges in this LiveInterval. This is
-    // not re-entrant!
-    const char* rangesToString() const;
-
-    // Return a string describing this LiveInterval. This is not re-entrant!
-    const char* toString() const;
-
-    void dump() const;
-};
-
-/*
- * Represents all of the register allocation state associated with a virtual
- * register, including all associated intervals and pointers to relevant LIR
- * structures.
- */
-class VirtualRegister
-{
-    LNode* ins_;
-    LDefinition* def_;
-    Vector<LiveInterval*, 1, JitAllocPolicy> intervals_;
-
-    // Whether def_ is a temp or an output.
-    bool isTemp_ : 1;
-
-    void operator=(const VirtualRegister&) = delete;
-    VirtualRegister(const VirtualRegister&) = delete;
-
-  protected:
-    explicit VirtualRegister(TempAllocator& alloc)
-      : intervals_(alloc)
-    {}
-
-  public:
-    bool init(TempAllocator& alloc, LNode* ins, LDefinition* def,
-              bool isTemp)
-    {
-        MOZ_ASSERT(ins && !ins_);
-        ins_ = ins;
-        def_ = def;
-        isTemp_ = isTemp;
-        LiveInterval* initial = LiveInterval::New(alloc, def->virtualRegister(), 0);
-        if (!initial)
-            return false;
-        return intervals_.append(initial);
-    }
-    LBlock* block() {
-        return ins_->block();
-    }
-    LNode* ins() {
-        return ins_;
-    }
-    LDefinition* def() const {
-        return def_;
-    }
-    LDefinition::Type type() const {
-        return def()->type();
-    }
-    bool isTemp() const {
-        return isTemp_;
-    }
-    size_t numIntervals() const {
-        return intervals_.length();
-    }
-    LiveInterval* getInterval(size_t i) const {
-        return intervals_[i];
-    }
-    LiveInterval* lastInterval() const {
-        MOZ_ASSERT(numIntervals() > 0);
-        return getInterval(numIntervals() - 1);
-    }
-    void replaceInterval(LiveInterval* old, LiveInterval* interval) {
-        MOZ_ASSERT(intervals_[old->index()] == old);
-        interval->setIndex(old->index());
-        intervals_[old->index()] = interval;
-    }
-    bool addInterval(LiveInterval* interval) {
-        MOZ_ASSERT(interval->numRanges());
-        MOZ_ASSERT(interval->vreg() != 0);
-
-        // Preserve ascending order for faster lookups.
-        LiveInterval** found = nullptr;
-        LiveInterval** i;
-        for (i = intervals_.begin(); i != intervals_.end(); i++) {
-            if (!found && interval->start() < (*i)->start())
-                found = i;
-            if (found)
-                (*i)->setIndex((*i)->index() + 1);
-        }
-        if (!found)
-            found = intervals_.end();
-        interval->setIndex(found - intervals_.begin());
-        return intervals_.insert(found, interval);
-    }
-    void removeInterval(LiveInterval* interval) {
-        intervals_.erase(intervals_.begin() + interval->index());
-        for (size_t i = interval->index(), e = intervals_.length(); i < e; ++i)
-            intervals_[i]->setIndex(i);
-        interval->setIndex(-1);
-    }
-    bool isFloatReg() const {
-        return def_->isFloatReg();
-    }
-    bool isCompatibleReg(const AnyRegister& r) const {
-        return def_->isCompatibleReg(r);
-    }
-    bool isCompatibleVReg(const VirtualRegister& vr) const {
-        return def_->isCompatibleDef(*vr.def_);
-    }
-
-    LiveInterval* intervalFor(CodePosition pos);
-    LiveInterval* getFirstInterval();
-};
-
-// Index of the virtual registers in a graph. VREG is a subclass of
-// VirtualRegister extended with any allocator specific state for the vreg.
-template <typename VREG>
-class VirtualRegisterMap
-{
-  private:
-    FixedList<VREG> vregs_;
-
-    void operator=(const VirtualRegisterMap&) = delete;
-    VirtualRegisterMap(const VirtualRegisterMap&) = delete;
-
-  public:
-    VirtualRegisterMap()
-      : vregs_()
-    { }
-
-    bool init(MIRGenerator* gen, uint32_t numVregs) {
-        if (!vregs_.init(gen->alloc(), numVregs))
-            return false;
-        memset(&vregs_[0], 0, sizeof(VREG) * numVregs);
-        TempAllocator& alloc = gen->alloc();
-        for (uint32_t i = 0; i < numVregs; i++)
-            new(&vregs_[i]) VREG(alloc);
-        return true;
-    }
-    VREG& operator[](unsigned int index) {
-        return vregs_[index];
-    }
-    VREG& operator[](const LAllocation* alloc) {
-        MOZ_ASSERT(alloc->isUse());
-        return vregs_[alloc->toUse()->virtualRegister()];
-    }
-    VREG& operator[](const LDefinition* def) {
-        return vregs_[def->virtualRegister()];
-    }
-    uint32_t numVirtualRegisters() const {
-        return vregs_.length();
-    }
-};
-
-static inline bool
-IsNunbox(VirtualRegister* vreg)
-{
-#ifdef JS_NUNBOX32
-    return vreg->type() == LDefinition::TYPE ||
-           vreg->type() == LDefinition::PAYLOAD;
-#else
-    return false;
-#endif
-}
-
-static inline bool
-IsSlotsOrElements(VirtualRegister* vreg)
-{
-    return vreg->type() == LDefinition::SLOTS;
-}
-
-static inline bool
-IsTraceable(VirtualRegister* reg)
-{
-    if (reg->type() == LDefinition::OBJECT)
-        return true;
-#ifdef JS_PUNBOX64
-    if (reg->type() == LDefinition::BOX)
-        return true;
-#endif
-    return false;
-}
-
-template <typename VREG>
-class LiveRangeAllocator : protected RegisterAllocator
-{
-  protected:
-    // Computed inforamtion
-    BitSet* liveIn;
-    VirtualRegisterMap<VREG> vregs;
-    mozilla::Array<LiveInterval*, AnyRegister::Total> fixedIntervals;
-
-    // Union of all ranges in fixedIntervals, used to quickly determine
-    // whether an interval intersects with a fixed register.
-    LiveInterval* fixedIntervalsUnion;
-
-    // Allocation state
-    StackSlotAllocator stackSlotAllocator;
-
-    LiveRangeAllocator(MIRGenerator* mir, LIRGenerator* lir, LIRGraph& graph)
-      : RegisterAllocator(mir, lir, graph),
-        liveIn(nullptr),
-        fixedIntervalsUnion(nullptr)
-    {
-    }
-
-    bool buildLivenessInfo();
-
-    bool init();
-
-    bool addFixedRangeAtHead(AnyRegister reg, CodePosition from, CodePosition to) {
-        if (!fixedIntervals[reg.code()]->addRangeAtHead(from, to))
-            return false;
-        return fixedIntervalsUnion->addRangeAtHead(from, to);
-    }
-
-    void validateVirtualRegisters()
-    {
-#ifdef DEBUG
-        if (!js_JitOptions.checkGraphConsistency)
-            return;
-
-        for (size_t i = 1; i < graph.numVirtualRegisters(); i++) {
-            VirtualRegister* reg = &vregs[i];
-
-            LiveInterval* prev = nullptr;
-            for (size_t j = 0; j < reg->numIntervals(); j++) {
-                LiveInterval* interval = reg->getInterval(j);
-                MOZ_ASSERT(interval->vreg() == i);
-                MOZ_ASSERT(interval->index() == j);
-
-                if (interval->numRanges() == 0)
-                    continue;
-
-                MOZ_ASSERT_IF(prev, prev->end() <= interval->start());
-                interval->validateRanges();
-
-                prev = interval;
-            }
-        }
-#endif
-    }
-
-    bool addMove(LMoveGroup* moves, LiveInterval* from, LiveInterval* to, LDefinition::Type type) {
-        MOZ_ASSERT(*from->getAllocation() != *to->getAllocation());
-        return moves->add(from->getAllocation(), to->getAllocation(), type);
-    }
-
-    bool moveInput(LInstruction* ins, LiveInterval* from, LiveInterval* to, LDefinition::Type type) {
-        if (*from->getAllocation() == *to->getAllocation())
-            return true;
-        LMoveGroup* moves = getInputMoveGroup(ins);
-        return addMove(moves, from, to, type);
-    }
-
-    bool moveAfter(LInstruction* ins, LiveInterval* from, LiveInterval* to, LDefinition::Type type) {
-        if (*from->getAllocation() == *to->getAllocation())
-            return true;
-        LMoveGroup* moves = getMoveGroupAfter(ins);
-        return addMove(moves, from, to, type);
-    }
-
-    bool moveAtExit(LBlock* block, LiveInterval* from, LiveInterval* to, LDefinition::Type type) {
-        if (*from->getAllocation() == *to->getAllocation())
-            return true;
-        LMoveGroup* moves = block->getExitMoveGroup(alloc());
-        return addMove(moves, from, to, type);
-    }
-
-    bool moveAtEntry(LBlock* block, LiveInterval* from, LiveInterval* to, LDefinition::Type type) {
-        if (*from->getAllocation() == *to->getAllocation())
-            return true;
-        LMoveGroup* moves = block->getEntryMoveGroup(alloc());
-        return addMove(moves, from, to, type);
-    }
-
-    size_t findFirstNonCallSafepoint(CodePosition from) const
-    {
-        size_t i = 0;
-        for (; i < graph.numNonCallSafepoints(); i++) {
-            const LInstruction* ins = graph.getNonCallSafepoint(i);
-            if (from <= inputOf(ins))
-                break;
-        }
-        return i;
-    }
-
-    void addLiveRegistersForInterval(VirtualRegister* reg, LiveInterval* interval)
-    {
-        // Fill in the live register sets for all non-call safepoints.
-        LAllocation* a = interval->getAllocation();
-        if (!a->isRegister())
-            return;
-
-        // Don't add output registers to the safepoint.
-        CodePosition start = interval->start();
-        if (interval->index() == 0 && !reg->isTemp()) {
-#ifdef CHECK_OSIPOINT_REGISTERS
-            // We don't add the output register to the safepoint,
-            // but it still might get added as one of the inputs.
-            // So eagerly add this reg to the safepoint clobbered registers.
-            if (reg->ins()->isInstruction()) {
-                if (LSafepoint* safepoint = reg->ins()->toInstruction()->safepoint())
-                    safepoint->addClobberedRegister(a->toRegister());
-            }
-#endif
-            start = start.next();
-        }
-
-        size_t i = findFirstNonCallSafepoint(start);
-        for (; i < graph.numNonCallSafepoints(); i++) {
-            LInstruction* ins = graph.getNonCallSafepoint(i);
-            CodePosition pos = inputOf(ins);
-
-            // Safepoints are sorted, so we can shortcut out of this loop
-            // if we go out of range.
-            if (interval->end() <= pos)
-                break;
-
-            if (!interval->covers(pos))
-                continue;
-
-            LSafepoint* safepoint = ins->safepoint();
-            safepoint->addLiveRegister(a->toRegister());
-
-#ifdef CHECK_OSIPOINT_REGISTERS
-            if (reg->isTemp())
-                safepoint->addClobberedRegister(a->toRegister());
-#endif
-        }
-    }
-
-    // Finds the first safepoint that is within range of an interval.
-    size_t findFirstSafepoint(const LiveInterval* interval, size_t startFrom) const
-    {
-        size_t i = startFrom;
-        for (; i < graph.numSafepoints(); i++) {
-            LInstruction* ins = graph.getSafepoint(i);
-            if (interval->start() <= inputOf(ins))
-                break;
-        }
-        return i;
-    }
-
-    void dumpVregs();
-};
-
-} // namespace jit
-} // namespace js
-
-#endif /* jit_LiveRangeAllocator_h */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/MacroAssembler.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/MacroAssembler.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/MacroAssembler.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/MacroAssembler.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -888,6 +888,20 @@
 MacroAssembler::loadUnboxedProperty(BaseIndex address, JSValueType type,
                                     TypedOrValueRegister output);
 
+static void
+StoreUnboxedFailure(MacroAssembler& masm, Label* failure)
+{
+    // Storing a value to an unboxed property is a fallible operation and
+    // the caller must provide a failure label if a particular unboxed store
+    // might fail. Sometimes, however, a store that cannot succeed (such as
+    // storing a string to an int32 property) will be marked as infallible.
+    // This can only happen if the code involved is unreachable.
+    if (failure)
+        masm.jump(failure);
+    else
+        masm.assumeUnreachable("Incompatible write to unboxed property");
+}
+
 template <typename T>
 void
 MacroAssembler::storeUnboxedProperty(T address, JSValueType type,
@@ -899,12 +913,12 @@
             if (value.value().isBoolean())
                 store8(Imm32(value.value().toBoolean()), address);
             else
-                jump(failure);
+                StoreUnboxedFailure(*this, failure);
         } else if (value.reg().hasTyped()) {
             if (value.reg().type() == MIRType_Boolean)
                 store8(value.reg().typedReg().gpr(), address);
             else
-                jump(failure);
+                StoreUnboxedFailure(*this, failure);
         } else {
             if (failure)
                 branchTestBoolean(Assembler::NotEqual, value.reg().valueReg(), failure);
@@ -917,12 +931,12 @@
             if (value.value().isInt32())
                 store32(Imm32(value.value().toInt32()), address);
             else
-                jump(failure);
+                StoreUnboxedFailure(*this, failure);
         } else if (value.reg().hasTyped()) {
             if (value.reg().type() == MIRType_Int32)
                 store32(value.reg().typedReg().gpr(), address);
             else
-                jump(failure);
+                StoreUnboxedFailure(*this, failure);
         } else {
             if (failure)
                 branchTestInt32(Assembler::NotEqual, value.reg().valueReg(), failure);
@@ -936,7 +950,7 @@
                 loadConstantDouble(value.value().toNumber(), ScratchDoubleReg);
                 storeDouble(ScratchDoubleReg, address);
             } else {
-                jump(failure);
+                StoreUnboxedFailure(*this, failure);
             }
         } else if (value.reg().hasTyped()) {
             if (value.reg().type() == MIRType_Int32) {
@@ -945,7 +959,7 @@
             } else if (value.reg().type() == MIRType_Double) {
                 storeDouble(value.reg().typedReg().fpu(), address);
             } else {
-                jump(failure);
+                StoreUnboxedFailure(*this, failure);
             }
         } else {
             ValueOperand reg = value.reg().valueReg();
@@ -967,13 +981,13 @@
             if (value.value().isObjectOrNull())
                 storePtr(ImmGCPtr(value.value().toObjectOrNull()), address);
             else
-                jump(failure);
+                StoreUnboxedFailure(*this, failure);
         } else if (value.reg().hasTyped()) {
             MOZ_ASSERT(value.reg().type() != MIRType_Null);
             if (value.reg().type() == MIRType_Object)
                 storePtr(value.reg().typedReg().gpr(), address);
             else
-                jump(failure);
+                StoreUnboxedFailure(*this, failure);
         } else {
             if (failure) {
                 Label ok;
@@ -990,12 +1004,12 @@
             if (value.value().isString())
                 storePtr(ImmGCPtr(value.value().toString()), address);
             else
-                jump(failure);
+                StoreUnboxedFailure(*this, failure);
         } else if (value.reg().hasTyped()) {
             if (value.reg().type() == MIRType_String)
                 storePtr(value.reg().typedReg().gpr(), address);
             else
-                jump(failure);
+                StoreUnboxedFailure(*this, failure);
         } else {
             if (failure)
                 branchTestString(Assembler::NotEqual, value.reg().valueReg(), failure);
@@ -2387,51 +2401,14 @@
     MOZ_ASSERT(JSFunction::offsetOfNargs() % sizeof(uint32_t) == 0);
     MOZ_ASSERT(JSFunction::offsetOfFlags() == JSFunction::offsetOfNargs() + 2);
 
-    // Emit code for the following test:
-    //
-    // bool isInterpretedConstructor() const {
-    //     return isInterpreted() && !isFunctionPrototype() && !isArrow() &&
-    //         (!isSelfHostedBuiltin() || isSelfHostedConstructor());
-    // }
-
     // First, ensure it's a scripted function.
     load32(Address(fun, JSFunction::offsetOfNargs()), scratch);
     int32_t bits = IMM32_16ADJ(JSFunction::INTERPRETED);
     branchTest32(Assembler::Zero, scratch, Imm32(bits), label);
 
-    // Common case: if IS_FUN_PROTO, ARROW and SELF_HOSTED are not set,
-    // the function is an interpreted constructor and we're done.
-    Label done, moreChecks;
-
-    // Start with the easy ones. Check IS_FUN_PROTO and SELF_HOSTED.
-    bits = IMM32_16ADJ( (JSFunction::IS_FUN_PROTO | JSFunction::SELF_HOSTED) );
-    branchTest32(Assembler::NonZero, scratch, Imm32(bits), &moreChecks);
-
-    // Check !isArrow()
-    bits = IMM32_16ADJ(JSFunction::FUNCTION_KIND_MASK);
-    and32(Imm32(bits), scratch);
-
-    bits = IMM32_16ADJ(JSFunction::ARROW_KIND);
-    branch32(Assembler::NotEqual, scratch, Imm32(bits), &done);
-
-    // Reload the smashed flags and nargs for more checks.
-    load32(Address(fun, JSFunction::offsetOfNargs()), scratch);
-
-    {
-        bind(&moreChecks);
-        // The callee is either Function.prototype, an arrow function or
-        // self-hosted. None of these are constructible, except self-hosted
-        // constructors, so branch to |label| if SELF_HOSTED_CTOR is not set.
-        bits = IMM32_16ADJ(JSFunction::SELF_HOSTED_CTOR);
-        branchTest32(Assembler::Zero, scratch, Imm32(bits), label);
-
-#ifdef DEBUG
-        bits = IMM32_16ADJ(JSFunction::IS_FUN_PROTO);
-        branchTest32(Assembler::Zero, scratch, Imm32(bits), &done);
-        assumeUnreachable("Function.prototype should not have the SELF_HOSTED_CTOR flag");
-#endif
-    }
-    bind(&done);
+    // Check if the CONSTRUCTOR bit is set.
+    bits = IMM32_16ADJ(JSFunction::CONSTRUCTOR);
+    branchTest32(Assembler::Zero, scratch, Imm32(bits), label);
 }
 
 void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/MCallOptimize.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/MCallOptimize.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/MCallOptimize.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/MCallOptimize.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -2756,9 +2756,7 @@
     // Don't optimize if we're constructing and the callee is not a
     // constructor, so that CallKnown does not have to handle this case
     // (it should always throw).
-    if (nativeCallInfo.constructing() && !scriptedTarget->isInterpretedConstructor() &&
-        !scriptedTarget->isNativeConstructor())
-    {
+    if (nativeCallInfo.constructing() && !scriptedTarget->isConstructor()) {
         return InliningStatus_NotInlined;
     }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/mips/CodeGenerator-mips.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/mips/CodeGenerator-mips.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/mips/CodeGenerator-mips.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/mips/CodeGenerator-mips.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -948,11 +948,11 @@
 }
 
 MoveOperand
-CodeGeneratorMIPS::toMoveOperand(const LAllocation* a) const
+CodeGeneratorMIPS::toMoveOperand(LAllocation a) const
 {
-    if (a->isGeneralReg())
+    if (a.isGeneralReg())
         return MoveOperand(ToRegister(a));
-    if (a->isFloatReg()) {
+    if (a.isFloatReg()) {
         return MoveOperand(ToFloatRegister(a));
     }
     int32_t offset = ToStackOffset(a);
@@ -1798,13 +1798,6 @@
 }
 
 void
-DispatchIonCache::initializeAddCacheState(LInstruction* ins, AddCacheState* addState)
-{
-    // Can always use the scratch register on MIPS.
-    addState->dispatchScratch = ScratchRegister;
-}
-
-void
 CodeGeneratorMIPS::visitLoadTypedArrayElementStatic(LLoadTypedArrayElementStatic* ins)
 {
     MOZ_CRASH("NYI");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/mips/CodeGenerator-mips.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/mips/CodeGenerator-mips.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/mips/CodeGenerator-mips.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/mips/CodeGenerator-mips.h	2015-05-25 20:43:22.000000000 +0000
@@ -58,7 +58,7 @@
         return ToOperand(def->output());
     }
 
-    MoveOperand toMoveOperand(const LAllocation* a) const;
+    MoveOperand toMoveOperand(LAllocation a) const;
 
     template <typename T1, typename T2>
     void bailoutCmp32(Assembler::Condition c, T1 lhs, T2 rhs, LSnapshot* snapshot) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/none/Trampoline-none.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/none/Trampoline-none.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/none/Trampoline-none.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/none/Trampoline-none.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -32,8 +32,6 @@
 FrameSizeClass FrameSizeClass::ClassLimit() { MOZ_CRASH(); }
 uint32_t FrameSizeClass::frameSize() const { MOZ_CRASH(); }
 
-void DispatchIonCache::initializeAddCacheState(LInstruction*, AddCacheState*) { MOZ_CRASH(); }
-
 const Register ABIArgGenerator::NonArgReturnReg0 = { Registers::invalid_reg };
 const Register ABIArgGenerator::NonArgReturnReg1 = {  Registers::invalid_reg };
 const Register ABIArgGenerator::NonArg_VolatileReg = {  Registers::invalid_reg };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/RegisterAllocator.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/RegisterAllocator.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/RegisterAllocator.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/RegisterAllocator.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -191,8 +191,8 @@
         if (ins->isMoveGroup()) {
             LMoveGroup* group = ins->toMoveGroup();
             for (int i = group->numMoves() - 1; i >= 0; i--) {
-                if (*group->getMove(i).to() == alloc) {
-                    alloc = *group->getMove(i).from();
+                if (group->getMove(i).to() == alloc) {
+                    alloc = group->getMove(i).from();
                     break;
                 }
             }
@@ -412,8 +412,8 @@
                 LMoveGroup* group = ins->toMoveGroup();
                 for (int i = group->numMoves() - 1; i >= 0; i--) {
                     // Use two printfs, as LAllocation::toString is not reentrant.
-                    fprintf(stderr, " [%s", group->getMove(i).from()->toString());
-                    fprintf(stderr, " -> %s]", group->getMove(i).to()->toString());
+                    fprintf(stderr, " [%s", group->getMove(i).from().toString());
+                    fprintf(stderr, " -> %s]", group->getMove(i).to().toString());
                 }
                 fprintf(stderr, "\n");
                 continue;
@@ -552,8 +552,8 @@
                 LMoveGroup* group = ins->toMoveGroup();
                 for (int i = group->numMoves() - 1; i >= 0; i--) {
                     // Use two printfs, as LAllocation::toString is not reentant.
-                    fprintf(stderr, " [%s", group->getMove(i).from()->toString());
-                    fprintf(stderr, " -> %s]", group->getMove(i).to()->toString());
+                    fprintf(stderr, " [%s", group->getMove(i).from().toString());
+                    fprintf(stderr, " -> %s]", group->getMove(i).to().toString());
                 }
                 fprintf(stderr, "\n");
                 continue;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/RematerializedFrame.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/RematerializedFrame.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/RematerializedFrame.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/RematerializedFrame.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -41,6 +41,11 @@
     numActualArgs_(numActualArgs),
     script_(iter.script())
 {
+    if (iter.isFunctionFrame())
+        callee_ = iter.callee(fallback);
+    else
+        callee_ = nullptr;
+
     CopyValueToRematerializedFrame op(slots_);
     iter.readFrameArgsAndLocals(cx, op, op, &scopeChain_, &hasCallObj_, &returnValue_,
                                 &argsObj_, &thisValue_, ReadFrame_Actuals,
@@ -149,6 +154,8 @@
 {
     TraceRoot(trc, &script_, "remat ion frame script");
     TraceRoot(trc, &scopeChain_, "remat ion frame scope chain");
+    if (callee_)
+        TraceRoot(trc, &callee_, "remat ion frame callee");
     TraceRoot(trc, &returnValue_, "remat ion frame return value");
     TraceRoot(trc, &thisValue_, "remat ion frame this");
     TraceRootRange(trc, numActualArgs_ + script_->nfixed(), slots_, "remat ion frame stack");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/RematerializedFrame.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/RematerializedFrame.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/RematerializedFrame.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/RematerializedFrame.h	2015-05-25 20:43:22.000000000 +0000
@@ -43,6 +43,7 @@
 
     JSScript* script_;
     JSObject* scopeChain_;
+    JSFunction* callee_;
     ArgumentsObject* argsObj_;
 
     Value returnValue_;
@@ -151,10 +152,11 @@
         return isFunctionFrame() ? fun() : nullptr;
     }
     JSFunction* callee() const {
-        return fun();
+        MOZ_ASSERT(isFunctionFrame());
+        return callee_;
     }
     Value calleev() const {
-        return ObjectValue(*fun());
+        return ObjectValue(*callee());
     }
     Value& thisValue() {
         return thisValue_;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/shared/BaselineCompiler-shared.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/shared/BaselineCompiler-shared.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/shared/BaselineCompiler-shared.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/shared/BaselineCompiler-shared.h	2015-05-25 20:43:23.000000000 +0000
@@ -81,8 +81,10 @@
             return nullptr;
 
         // Create the entry and add it to the vector.
-        if (!icEntries_.append(ICEntry(script->pcToOffset(pc), kind)))
+        if (!icEntries_.append(ICEntry(script->pcToOffset(pc), kind))) {
+            ReportOutOfMemory(cx);
             return nullptr;
+        }
         ICEntry& vecEntry = icEntries_.back();
 
         // Set the first stub for the IC entry to the fallback stub
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/shared/CodeGenerator-shared.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/shared/CodeGenerator-shared.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/shared/CodeGenerator-shared.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/shared/CodeGenerator-shared.h	2015-05-25 20:43:23.000000000 +0000
@@ -235,10 +235,13 @@
         return offset;
     }
 
+    inline int32_t ToStackOffset(LAllocation a) const {
+        if (a.isArgument())
+            return ArgToStackOffset(a.toArgument()->index());
+        return SlotToStackOffset(a.toStackSlot()->slot());
+    }
     inline int32_t ToStackOffset(const LAllocation* a) const {
-        if (a->isArgument())
-            return ArgToStackOffset(a->toArgument()->index());
-        return SlotToStackOffset(a->toStackSlot()->slot());
+        return ToStackOffset(*a);
     }
 
     uint32_t frameSize() const {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/StupidAllocator.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/StupidAllocator.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/StupidAllocator.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/StupidAllocator.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -186,11 +186,11 @@
 {
     if (registers[index].dirty) {
         LMoveGroup* input = getInputMoveGroup(ins);
-        LAllocation* source = new(alloc()) LAllocation(registers[index].reg);
+        LAllocation source(registers[index].reg);
 
         uint32_t existing = registers[index].vreg;
         LAllocation* dest = stackLocation(existing);
-        input->addAfter(source, dest, registers[index].type);
+        input->addAfter(source, *dest, registers[index].type);
 
         registers[index].dirty = false;
     }
@@ -219,8 +219,8 @@
     // Load a vreg from its stack location to a register.
     LMoveGroup* input = getInputMoveGroup(ins);
     LAllocation* source = stackLocation(vreg);
-    LAllocation* dest = new(alloc()) LAllocation(registers[index].reg);
-    input->addAfter(source, dest, type);
+    LAllocation dest(registers[index].reg);
+    input->addAfter(*source, dest, type);
     registers[index].set(vreg, ins);
     registers[index].type = type;
 }
@@ -321,7 +321,7 @@
                 }
             }
 
-            group->add(source, dest, phi->getDef(0)->type());
+            group->add(*source, *dest, phi->getDef(0)->type());
         }
     }
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/TypePolicy.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/TypePolicy.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/TypePolicy.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/TypePolicy.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -1000,13 +1000,16 @@
 bool
 StoreUnboxedObjectOrNullPolicy::adjustInputs(TempAllocator& alloc, MInstruction* ins)
 {
-    SingleObjectPolicy::staticAdjustInputs(alloc, ins);
+    ObjectPolicy<0>::staticAdjustInputs(alloc, ins);
+    ObjectPolicy<3>::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();
 
+    MOZ_ASSERT(store->typedObj()->type() == MIRType_Object);
+
     MDefinition* value = store->value();
     if (value->type() == MIRType_Object ||
         value->type() == MIRType_Null ||
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/VMFunctions.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/VMFunctions.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/VMFunctions.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/VMFunctions.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -25,6 +25,7 @@
 #include "vm/NativeObject-inl.h"
 #include "vm/StringObject-inl.h"
 #include "vm/TypeInference-inl.h"
+#include "vm/UnboxedObject-inl.h"
 
 using namespace js;
 using namespace js::jit;
@@ -291,11 +292,11 @@
 {
     if (MOZ_LIKELY(obj->lengthIsWritable())) {
         uint32_t idx = obj->length();
-        NativeObject::EnsureDenseResult result = obj->ensureDenseElements(cx, idx, 1);
-        if (result == NativeObject::ED_FAILED)
+        DenseElementResult result = obj->ensureDenseElements(cx, idx, 1);
+        if (result == DenseElementResult::Failure)
             return false;
 
-        if (result == NativeObject::ED_OK) {
+        if (result == DenseElementResult::Success) {
             obj->setDenseElement(idx, v);
             MOZ_ASSERT(idx < INT32_MAX);
             *length = idx + 1;
@@ -552,7 +553,7 @@
 
     if (callee->is<JSFunction>()) {
         JSFunction* fun = &callee->as<JSFunction>();
-        if (fun->isInterpretedConstructor()) {
+        if (fun->isInterpreted() && fun->isConstructor()) {
             JSScript* script = fun->getOrCreateScript(cx);
             if (!script || !script->ensureHasTypes(cx))
                 return false;
@@ -891,7 +892,7 @@
     NewObjectKind newKind = templateObj->group()->shouldPreTenure()
                             ? TenuredObject
                             : GenericObject;
-    ArrayObject* arrRes = NewDenseCopiedArray(cx, length, rest, NullPtr(), newKind);
+    ArrayObject* arrRes = NewDenseCopiedArray(cx, length, rest, nullptr, newKind);
     if (arrRes)
         arrRes->setGroup(templateObj->group());
     return arrRes;
@@ -1113,41 +1114,14 @@
                               HandleValue value, bool strict)
 {
     // This function is called from Ion code for StoreElementHole's OOL path.
-    // In this case we know the object is native or an unboxed array and we can
-    // use setDenseElement instead of setDenseElementWithType.
+    // In this case we know the object is native or an unboxed array and that
+    // no type changes are needed.
 
-    NativeObject::EnsureDenseResult result = NativeObject::ED_SPARSE;
-    do {
-        if (index < 0 || obj->is<UnboxedArrayObject>())
-            break;
-        bool isArray = obj->is<ArrayObject>();
-        if (isArray && !obj->as<ArrayObject>().lengthIsWritable())
-            break;
-        uint32_t idx = uint32_t(index);
-        result = obj->as<NativeObject>().ensureDenseElements(cx, idx, 1);
-        if (result != NativeObject::ED_OK)
-            break;
-        if (isArray) {
-            ArrayObject& arr = obj->as<ArrayObject>();
-            if (idx >= arr.length())
-                arr.setLengthInt32(idx + 1);
-        }
-        obj->as<NativeObject>().setDenseElement(idx, value);
-        return true;
-    } while (false);
-
-    if (result == NativeObject::ED_FAILED)
-        return false;
-    MOZ_ASSERT(result == NativeObject::ED_SPARSE);
-
-    if (index >= 0 && obj->is<UnboxedArrayObject>()) {
-        UnboxedArrayObject* nobj = &obj->as<UnboxedArrayObject>();
-        if (uint32_t(index) == nobj->initializedLength() &&
-            uint32_t(index) < UnboxedArrayObject::MaximumCapacity)
-        {
-            return nobj->appendElementNoTypeChange(cx, index, value);
-        }
-    }
+    DenseElementResult result =
+        SetOrExtendAnyBoxedOrUnboxedDenseElements(cx, obj, index, value.address(), 1,
+                                                  DontUpdateTypes);
+    if (result != DenseElementResult::Incomplete)
+        return result == DenseElementResult::Success;
 
     RootedValue indexVal(cx, Int32Value(index));
     return SetObjectElement(cx, obj, indexVal, value, strict);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/x64/CodeGenerator-x64.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/x64/CodeGenerator-x64.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/x64/CodeGenerator-x64.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/x64/CodeGenerator-x64.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -594,19 +594,19 @@
         masm.jmp(&rejoin);
         masm.bind(&goahead);
     }
+    uint32_t before = masm.size();
     masm.compareExchangeToTypedIntArray(accessType == Scalar::Uint32 ? Scalar::Int32 : accessType,
                                         srcAddr,
                                         oldval,
                                         newval,
                                         InvalidReg,
                                         ToAnyRegister(ins->output()));
-    uint32_t after = masm.size();
     if (rejoin.used())
         masm.bind(&rejoin);
     MOZ_ASSERT(mir->offset() == 0,
                "The AsmJS signal handler doesn't yet support emulating "
                "atomic accesses in the case of a fault from an unwrapped offset");
-    masm.append(AsmJSHeapAccess(after, AsmJSHeapAccess::Throw, maybeCmpOffset));
+    masm.append(AsmJSHeapAccess(before, AsmJSHeapAccess::Throw, maybeCmpOffset));
 }
 
 void
@@ -639,6 +639,7 @@
         masm.jmp(&rejoin);
         masm.bind(&goahead);
     }
+    uint32_t before = masm.size();
     if (value->isConstant()) {
         masm.atomicBinopToTypedIntArray(op, accessType == Scalar::Uint32 ? Scalar::Int32 : accessType,
                                         Imm32(ToInt32(value)),
@@ -654,13 +655,12 @@
                                         InvalidReg,
                                         ToAnyRegister(ins->output()));
     }
-    uint32_t after = masm.size();
     if (rejoin.used())
         masm.bind(&rejoin);
     MOZ_ASSERT(mir->offset() == 0,
                "The AsmJS signal handler doesn't yet support emulating "
                "atomic accesses in the case of a fault from an unwrapped offset");
-    masm.append(AsmJSHeapAccess(after, AsmJSHeapAccess::Throw, maybeCmpOffset));
+    masm.append(AsmJSHeapAccess(before, AsmJSHeapAccess::Throw, maybeCmpOffset));
 }
 
 void
@@ -691,18 +691,18 @@
         masm.bind(&goahead);
     }
 
+    uint32_t before = masm.size();
     if (value->isConstant())
         masm.atomicBinopToTypedIntArray(op, accessType, Imm32(ToInt32(value)), srcAddr);
     else
         masm.atomicBinopToTypedIntArray(op, accessType, ToRegister(value), srcAddr);
 
-    uint32_t after = masm.size();
     if (rejoin.used())
         masm.bind(&rejoin);
     MOZ_ASSERT(mir->offset() == 0,
                "The AsmJS signal handler doesn't yet support emulating "
                "atomic accesses in the case of a fault from an unwrapped offset");
-    masm.append(AsmJSHeapAccess(after, AsmJSHeapAccess::Throw, maybeCmpOffset));
+    masm.append(AsmJSHeapAccess(before, AsmJSHeapAccess::Throw, maybeCmpOffset));
 }
 
 void
@@ -797,13 +797,6 @@
 }
 
 void
-DispatchIonCache::initializeAddCacheState(LInstruction* ins, AddCacheState* addState)
-{
-    // Can always use the scratch register on x64.
-    addState->dispatchScratch = ScratchReg;
-}
-
-void
 CodeGeneratorX64::visitTruncateDToInt32(LTruncateDToInt32* ins)
 {
     FloatRegister input = ToFloatRegister(ins->input());
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/x86/CodeGenerator-x86.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/x86/CodeGenerator-x86.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/x86/CodeGenerator-x86.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/x86/CodeGenerator-x86.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -865,14 +865,6 @@
     masm.append(AsmJSGlobalAccess(label, mir->globalDataOffset()));
 }
 
-void
-DispatchIonCache::initializeAddCacheState(LInstruction* ins, AddCacheState* addState)
-{
-    // On x86, where there is no general purpose scratch register available,
-    // child cache classes must manually specify a dispatch scratch register.
-    MOZ_CRASH("x86 needs manual assignment of dispatchScratch");
-}
-
 namespace js {
 namespace jit {
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/x86/MacroAssembler-x86.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/x86/MacroAssembler-x86.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/x86/MacroAssembler-x86.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/x86/MacroAssembler-x86.h	2015-05-25 20:43:23.000000000 +0000
@@ -67,6 +67,14 @@
     MoveResolver moveResolver_;
 
   private:
+    Operand payloadOfAfterStackPush(const Address& address) {
+        // If we are basing off %esp, the address will be invalid after the
+        // first push.
+        if (address.base == StackPointer)
+            return Operand(address.base, address.offset + 4);
+        else 
+            return payloadOf(address);
+    }
     Operand payloadOf(const Address& address) {
         return Operand(address.base, address.offset);
     }
@@ -240,7 +248,7 @@
     }
     void pushValue(const Address& addr) {
         push(tagOf(addr));
-        push(payloadOf(addr));
+        push(payloadOfAfterStackPush(addr));
     }
     void storePayload(const Value& val, Operand dest) {
         jsval_layout jv = JSVAL_TO_IMPL(val);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/x86-shared/CodeGenerator-x86-shared.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/x86-shared/CodeGenerator-x86-shared.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/x86-shared/CodeGenerator-x86-shared.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/x86-shared/CodeGenerator-x86-shared.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -1528,11 +1528,11 @@
 }
 
 MoveOperand
-CodeGeneratorX86Shared::toMoveOperand(const LAllocation* a) const
+CodeGeneratorX86Shared::toMoveOperand(LAllocation a) const
 {
-    if (a->isGeneralReg())
+    if (a.isGeneralReg())
         return MoveOperand(ToRegister(a));
-    if (a->isFloatReg())
+    if (a.isFloatReg())
         return MoveOperand(ToFloatRegister(a));
     return MoveOperand(StackPointer, ToStackOffset(a));
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/x86-shared/CodeGenerator-x86-shared.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/x86-shared/CodeGenerator-x86-shared.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit/x86-shared/CodeGenerator-x86-shared.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit/x86-shared/CodeGenerator-x86-shared.h	2015-05-25 20:43:23.000000000 +0000
@@ -115,7 +115,7 @@
         return ToOperand(def->output());
     }
 
-    MoveOperand toMoveOperand(const LAllocation* a) const;
+    MoveOperand toMoveOperand(LAllocation a) const;
 
     void bailoutIf(Assembler::Condition condition, LSnapshot* snapshot);
     void bailoutIf(Assembler::DoubleCondition condition, LSnapshot* snapshot);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/lib/oomTest.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/lib/oomTest.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/lib/oomTest.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/lib/oomTest.js	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,30 @@
+// Function to test OOM handling by repeatedly calling a function and failing
+// successive allocations.
+
+const verbose = false;
+
+if (!("oomAtAllocation" in this && "resetOOMFailure" in this))
+    quit();
+
+if ("gczeal" in this)
+    gczeal(0);
+
+function oomTest(f) {
+    var i = 1;
+    var more;
+    do {
+        if (verbose)
+            print("fail at " + i);
+        try {
+            oomAtAllocation(i);
+            f();
+        } catch (e) {
+            // Ignore exceptions.
+        }
+        more = resetOOMFailure();
+        i++;
+    } while(more);
+
+    if (verbose)
+        print("finished after " + i);
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/asm.js/testBug1164391.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/asm.js/testBug1164391.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/asm.js/testBug1164391.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/asm.js/testBug1164391.js	2015-05-25 20:43:08.000000000 +0000
@@ -0,0 +1,17 @@
+function m(stdlib, ffi, heap) {
+    "use asm";
+    var HEAP32 = new stdlib.SharedInt32Array(heap);
+    var add = stdlib.Atomics.add;
+    var load = stdlib.Atomics.load;
+    function add_sharedEv(i1) {
+	i1 = i1 | 0;
+	load(HEAP32, i1 >> 2);
+	add(HEAP32, i1 >> 2, 1);
+	load(HEAP32, i1 >> 2);
+    }
+    return {add_sharedEv:add_sharedEv};
+}
+var sab = new SharedArrayBuffer(65536);
+var {add_sharedEv} = m(this, {}, sab);
+add_sharedEv(sab.byteLength);
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/auto-regress/bug491806.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/auto-regress/bug491806.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/auto-regress/bug491806.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/auto-regress/bug491806.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-// Binary: cache/js-dbg-64-0ba03471b3b0-linux
-// Flags:
-//
-uneval(new Function("\
-  for(\
-    ((let (functional) x) for each ([] in [])); \
-    yield x; \
-    (let (x = true) x));\
-"))
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/auto-regress/bug523793.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/auto-regress/bug523793.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/auto-regress/bug523793.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/auto-regress/bug523793.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-// |jit-test| error:ReferenceError
-
-// Binary: cache/js-dbg-32-525d852c622d-linux
-// Flags: -j
-//
-(function() {
-    let(x)
-    (function() {
-        for (let a in [0, x, 0, 0])
-        (function() {
-            for (let y in [0, 0]) print
-        })();
-    })()
-    with({}) throw x;
-})()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/auto-regress/bug531298.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/auto-regress/bug531298.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/auto-regress/bug531298.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/auto-regress/bug531298.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-// Binary: cache/js-dbg-32-15c46082297d-linux
-// Flags: -j
-//
-(function() {
-  (eval("\
-    (function() {\
-      let(e)((function() { ((function f(a) {\
-          if (a < 1) {\
-            return 1\
-          }\
-          x = arguments;\
-          return f(a - 1) + f(a - 2)\
-        })(6))\
-      })())\
-    })\
-  "))()
-})()
-gc()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/auto-regress/bug569774.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/auto-regress/bug569774.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/auto-regress/bug569774.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/auto-regress/bug569774.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-// Binary: cache/js-dbg-64-7f7dfb33a33e-linux
-// Flags:
-//
-x = Proxy.create((function () {}), (evalcx('')))
-try {
-    (function () {
-        ((let(e = eval) e).call(x, ("\"\"")))
-    })()
-} catch (e) {}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/auto-regress/bug650617.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/auto-regress/bug650617.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/auto-regress/bug650617.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/auto-regress/bug650617.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-// |jit-test| error:ReferenceError
-
-// Binary: cache/js-dbg-64-242947d76f73-linux
-// Flags:
-//
-for (b in [evalcx("let(e)eval()", evalcx('split'))]) {}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/auto-regress/bug712169.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/auto-regress/bug712169.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/auto-regress/bug712169.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/auto-regress/bug712169.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-// |jit-test| slow;
-
-// Binary: cache/js-dbg-32-f98c57415d8d-linux
-// Flags:
-//
-
-try {
-  var str = '0123456789';
-  for (var icount = 0; icount < 25; ++icount, let(icount2, printStatus) (function() gczeal(2))[1]++)
-        str = str + str;
-} catch(ex) {
-  new Date( str, false, (new RegExp('[0-9]{3}')).test('23 2 34 78 9 09'));
-}
-this.toSource();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/auto-regress/bug740509.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/auto-regress/bug740509.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/auto-regress/bug740509.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/auto-regress/bug740509.js	2015-05-25 20:43:09.000000000 +0000
@@ -59,9 +59,6 @@
 function DayWithinYear( t ) {\
   return( Day(t) - DayFromYear(YearFromTime(t)));\
 ");
-lfcode.push("this.__proto__ = []; \
-let ( _ = this ) Boolean   (\"({ set x([, b, c]) { } })\");\
-");
 while (true) {
 	var file = lfcode.shift(); if (file == undefined) { break; }
 	if (file == "evaluate") {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/auto-regress/bug745158.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/auto-regress/bug745158.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/auto-regress/bug745158.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/auto-regress/bug745158.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-// |jit-test| error:TypeError
-
-// Binary: cache/js-dbg-32-3fa30b0edd15-linux
-// Flags:
-//
-
-let ([] = 1) 3;
-let (i) new [i][print[i]];
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/auto-regress/bug765280.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/auto-regress/bug765280.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/auto-regress/bug765280.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/auto-regress/bug765280.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-// |jit-test| error:Error
-
-// Binary: cache/js-dbg-64-85e31a4bdd41-linux
-// Flags:
-//
-
-function f(x = let([] = c) 1, ... __call__)  {}
-assertEq(this > f, true);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/auto-regress/bug771946.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/auto-regress/bug771946.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/auto-regress/bug771946.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/auto-regress/bug771946.js	2015-05-25 20:43:09.000000000 +0000
@@ -1,4 +1,4 @@
 // Binary: cache/js-dbg-64-221f1a184f67-linux
 // Flags:
 //
-Date.prototype.setFullYear(Math.cos(1))
+new Date().setFullYear(Math.cos(1))
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/auto-regress/bug800407.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/auto-regress/bug800407.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/auto-regress/bug800407.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/auto-regress/bug800407.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-// Binary: cache/js-dbg-32-5cca0408a73f-linux
-// Flags:
-//
-
-options("strict_mode");
-function test(str, arg, result) {
-    var fun = new Function('x', str);
-    var got = fun.toSource();
-}
-test('return let (y) x;');
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/baseline/bug1115844.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/baseline/bug1115844.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/baseline/bug1115844.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/baseline/bug1115844.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-function f() {
-    let(x) yield x;
-}
-var g = f();
-g.next();
-g.close();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/baseline/bug842326.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/baseline/bug842326.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/baseline/bug842326.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/baseline/bug842326.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-function TestCase(n, d, e, a)
-this.passed = getTestCaseResult(e, a);
-function getTestCaseResult(expected, actual) {
-    if (actual != actual)
-	return gTestcases;
-}
-gczeal(4);
-try {
-    var TEST_STRING = new String("");
-    new TestCase(null, 0,eval("x = new Boolean(true); x.charCodeAt=String.prototype.charCodeAt;x.charCodeAt(0)") );
-    new TestCase(null, null, 0, eval("x.charCodeAt=String.prototype.charCodeAt;x.charCodeAt(1)"));
-    new TestCase(null, null, 0, eval("x.charCodeAt=String.prototype.charCodeAt;x.charCodeAt(2)"));
-    new TestCase(null, null, 0, eval("x.charCodeAt=String.prototype.charCodeAt;x.charCodeAt(3)"));
-    new TestCase(null, null, Number.NaN, eval("x.charCodeAt=String.prototype.charCodeAt;x.charCodeAt(4)"));
-    new new let (r) (function () {}) ();
-} catch(e) {}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/bug510642.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/bug510642.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/bug510642.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/bug510642.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-// Don't crash or assert.
-
-(function () {
-    var x;
-    (eval("\
-    (function () {\
-        for (y in [0, 0]) let(a)((function () {\
-            for (w in [0, 0])\
-                x = 0\
-        })());\
-        with({}) {}\
-    })\
-    "))()
-})()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/bug601395.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/bug601395.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/bug601395.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/bug601395.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-// |jit-test| error: SyntaxError;
-let(y = let(d = []) u, x
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/bug601402.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/bug601402.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/bug601402.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/bug601402.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-// |jit-test| error: SyntaxError;
-for (let d in [(0)]) let(b = (let(e) {}), d
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/bug646968-1.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/bug646968-1.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/bug646968-1.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/bug646968-1.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-var x = 5;
-let (x = x)
-    assertEq(x, 5);
-let (x = eval("x"))
-    assertEq(x, 5);
-let (x = function () { with ({}) return x; })
-    assertEq(x(), 5);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/bug646968-2.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/bug646968-2.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/bug646968-2.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/bug646968-2.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-var x = 5;
-(let (x = x) assertEq(x, 5));
-(let (x = eval("x")) assertEq(x, 5));
-(let (x = function () { with ({}) return x; }) assertEq(x(), 5));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/bug646968-6.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/bug646968-6.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/bug646968-6.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/bug646968-6.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-function test(s) {
-    eval(s);
-    let (a = ({}).q = 0, x = x)
-        assertEq(x, 5);
-}
-test('var x = 5;');
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/bug647695.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/bug647695.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/bug647695.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/bug647695.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-try { let(x = Date(7), y = let(a = x)("")) {} } catch (e) {}
-
-try {
-with({
-    y: Float64Array
-})
-for each(let y in [y]) {}
-} catch (e) {}
-
-try { test(); } catch (e) {}
-function test() {
-    try {
-        var result, arguments = 'adddb', arguments;
-    } catch (ex) {}
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/bug662338.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/bug662338.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/bug662338.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/bug662338.js	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-let (parsesSuccessfully = SyntaxError) function () parsesSuccessfully
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/bug708805.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/bug708805.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/bug708805.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/bug708805.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-gczeal(4);
-test();
-function test()
-eval("with({}) let(x=[])(function(){x})()");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/bug729364.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/bug729364.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/bug729364.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/bug729364.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-function f() {
-  try {} catch (e) {}
-}
-function g(code) {
-  function m() {
-    return "(function(){return " + code + "})()"
-  }
-  var codeNestedDeep = m(codeNestedDeep)
-  h(m(code), "same-compartment")
-  h(codeNestedDeep, "same-compartment")
-}
-function h(code, globalType) {
-  try {
-    evalcx(code, newGlobal(globalType))
-  } catch (e) {
-    "" + f()
-  }
-}
-function p()(function() function() {})
-g("print(let(x=verifyprebarriers(),q)((x(\"\",l('')))?(\"\"):(\"\")))()")
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/bug753283.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/bug753283.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/bug753283.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/bug753283.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-var summary = '';
-function printStatus (msg) {
-  var lines = msg.split ("\n");
-}
-evaluate("\
-function f() {\
-    var ss = [\
-        new f(Int8Array, propertyIsEnumerable, '[let (x = 3, y = 4) x].map(0)')\
-    ];\
-}\
-try {\
-    f();\
-} catch (e) {}\
-  gczeal(4);\
-  printStatus (summary);\
-");
-evaluate("\
-function g(n, h) {\
-    var a = f;\
-    if (n <= 0) \
-    return f; \
-    var t = g(n - 1, h);\
-    var r = function(x) {    };\
-}\
-g(80, f);\
-");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/destructuring-default.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/destructuring-default.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/destructuring-default.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/destructuring-default.js	2015-05-25 20:43:11.000000000 +0000
@@ -92,7 +92,7 @@
 }
 testAll(testThrow);
 
-// XXX: Support for let blocks and expressions will be removed in bug 1023609.
+// XXX: Support for let blocks will be removed in bug 1023609.
 // However, they test a special code path in destructuring assignment so having
 // these tests here for now seems like a good idea.
 function testLetBlock(pattern, input) {
@@ -103,13 +103,6 @@
 }
 testAll(testLetBlock);
 
-function testLetExpression(pattern, input) {
-  return new Function('input',
-    'return (let (' + pattern + ' = input) [a, b, c, d, e, f]);'
-  )(input);
-}
-testAll(testLetExpression);
-
 // test global const
 const [ca = 1, cb = 2] = [];
 assertEq(ca, 1);
@@ -157,7 +150,7 @@
 
 // defaults are evaluated even if there is no binding
 var evaled = false;
-({a: {} = (evaled = true, null)}) = {};
+({a: {} = (evaled = true, {})}) = {};
 assertEq(evaled, true);
 evaled = false;
 assertThrowsInstanceOf(() => { [[] = (evaled = true, 2)] = [] }, TypeError);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/destructuring-requireobjectcoercible.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/destructuring-requireobjectcoercible.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/destructuring-requireobjectcoercible.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/destructuring-requireobjectcoercible.js	2015-05-25 20:43:11.000000000 +0000
@@ -0,0 +1,102 @@
+load(libdir + 'asserts.js');
+load(libdir + 'iteration.js');
+
+function f(v)
+{
+  if (v + "")
+    ({} = v);
+}
+
+f(true);
+f({});
+assertThrowsInstanceOf(() => f(null), TypeError);
+assertThrowsInstanceOf(() => f(undefined), TypeError);
+
+function g(v)
+{
+  if (v + "")
+    ({} = v);
+}
+
+g(true);
+g({});
+assertThrowsInstanceOf(() => g(undefined), TypeError);
+assertThrowsInstanceOf(() => g(null), TypeError);
+
+function h(v)
+{
+  if (v + "")
+    ([] = v);
+}
+
+h([true]);
+h("foo");
+assertThrowsInstanceOf(() => h(undefined), TypeError);
+assertThrowsInstanceOf(() => h(null), TypeError);
+
+Object.defineProperty(Boolean.prototype, "v",
+                      { get() { "use strict"; return typeof this; },
+                        enumerable: true,
+                        configurable: true });
+
+Object.defineProperty(Number.prototype, "v",
+                      { get() { "use strict"; return typeof this; },
+                        enumerable: true,
+                        configurable: true });
+
+Object.defineProperty(String.prototype, "v",
+                      { get() { "use strict"; return typeof this; },
+                        enumerable: true,
+                        configurable: true });
+
+Object.defineProperty(Symbol.prototype, "v",
+                      { get() { "use strict"; return typeof this; },
+                        enumerable: true,
+                        configurable: true });
+
+function primitiveThisSupported()
+{
+  return 3.14.custom === "number";
+}
+
+function primitiveThisTests()
+{
+  function f(v)
+  {
+    var type = typeof v;
+
+    ({ v } = v);
+
+    assertEq(v, type);
+  }
+
+  f(true);
+  f(3.14);
+  f(72);
+  f("ohai");
+  f(Symbol.iterator);
+
+  assertThrowsInstanceOf(() => f(undefined), TypeError);
+  assertThrowsInstanceOf(() => f(null), TypeError);
+
+  function g(v)
+  {
+    var type = typeof v;
+
+    ({ v } = v);
+
+    assertEq(v, type);
+  }
+
+  g(true);
+  g(3.14);
+  g(72);
+  g("ohai");
+  g(Symbol.iterator);
+
+  assertThrowsInstanceOf(() => g(null), TypeError);
+  assertThrowsInstanceOf(() => g(undefined), TypeError);
+}
+if (primitiveThisSupported())
+  primitiveThisTests();
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/destructuring-rest.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/destructuring-rest.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/destructuring-rest.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/destructuring-rest.js	2015-05-25 20:43:11.000000000 +0000
@@ -128,7 +128,7 @@
 }
 testDeclaration(testThrow);
 
-// XXX: Support for let blocks and expressions will be removed in bug 1023609.
+// XXX: Support for let blocks will be removed in bug 1023609.
 // However, they test a special code path in destructuring assignment so having
 // these tests here for now seems like a good idea.
 function testLetBlock(pattern, input, binding) {
@@ -139,12 +139,3 @@
   )(input);
 }
 testDeclaration(testLetBlock);
-
-function testLetExpression(pattern, input, binding) {
-  binding = binding || 'rest';
-  return new Function('input',
-    'return (let (' + pattern + ' = input) ' + binding + ');'
-  )(input);
-}
-testDeclaration(testLetExpression);
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/expression-autopsy.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/expression-autopsy.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/expression-autopsy.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/expression-autopsy.js	2015-05-25 20:43:11.000000000 +0000
@@ -111,12 +111,27 @@
 // A few one off tests
 check_one("6", (function () { 6() }), " is not a function");
 check_one("0", (function () { Array.prototype.reverse.call('123'); }), " is read-only");
-check_one(`(intermediate value)[Symbol.iterator](...).next(...).value`,
-          function () { var [{ x }] = [null, {}]; }, " is null");
-check_one(`(intermediate value)[Symbol.iterator](...).next(...).value`,
+check_one("(intermediate value)[Symbol.iterator](...).next(...).value",
           function () { ieval("let (x) { var [a, b, [c0, c1]] = [x, x, x]; }") }, " is undefined");
 check_one("void 1", function() { (void 1)(); }, " is not a function");
 check_one("void o[1]", function() { var o = []; (void o[1])() }, " is not a function");
 
+// Manual testing for this case: the only way to trigger an error is *not* on
+// an attempted property access during destructuring, and the error message
+// invoking ToObject(null) is different: "can't convert {0} to object".
+try
+{
+  (function() {
+    var [{x}] = [null, {}];
+   })();
+  throw new Error("didn't throw");
+}
+catch (e)
+{
+  assertEq(e instanceof TypeError, true,
+           "expected TypeError, got " + e);
+  assertEq(e.message, "can't convert null to object");
+}
+
 // Check fallback behavior
 assertThrowsInstanceOf(function () { for (let x of undefined) {} }, TypeError);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/function-tosource-constructor.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/function-tosource-constructor.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/function-tosource-constructor.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/function-tosource-constructor.js	2015-05-25 20:43:11.000000000 +0000
@@ -8,8 +8,6 @@
 assertEq(f.toSource(), "(function anonymous(a, ...rest) {\nreturn rest[42] + b;\n})")
 assertEq(decompileFunction(f), f.toString());
 assertEq(decompileBody(f), "return rest[42] + b;");
-f = Function("x", "return let (y) x;");
-assertEq(f.toSource(), "(function anonymous(x) {\nreturn let (y) x;\n})");
 f = Function("");
 assertEq(f.toString(), "function anonymous() {\n\n}");
 f = Function("", "(abc)");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/regress-bug720680.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/regress-bug720680.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/regress-bug720680.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/regress-bug720680.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-// |jit-test| error: InternalError
-version(0);
-eval("\
-function TimeFromYear( y ) {}\
-addTestCase( -2208988800000 );\
-function addTestCase( t ) {\
-  var start = TimeFromYear((addTestCase(addTestCase << t, 0)));\
-    new TestCase( \
-                  SECTION,\
-                  '(new Date('+d+')).getUTCDay()',\
-                  WeekDay((d)),\
-                  (new Date(let ({ stop } = 'properties.length' )('/ab[c\\\n]/'))).getUTCDay() \
-                );\
-}\
-");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/syntax-error-illegal-character.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/syntax-error-illegal-character.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/syntax-error-illegal-character.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/syntax-error-illegal-character.js	2015-05-25 20:43:11.000000000 +0000
@@ -977,7 +977,6 @@
 test("let ( x = 1, y = 2 ) { x @");
 test("let ( x = 1, y = 2 ) { x; @");
 test("let ( x = 1, y = 2 ) { x; } @");
-test_no_strict("let ( x = 1, y = 2 ) x @");
 
 // Expression closures
 
@@ -1014,22 +1013,6 @@
 test("for each (let x in y @");
 test("for each (let x in y) @");
 
-// let expression
-
-test("(let @");
-test("(let ( @");
-test("(let ( x @");
-test("(let ( x = @");
-test("(let ( x = 1 @");
-test("(let ( x = 1, @");
-test("(let ( x = 1, y @");
-test("(let ( x = 1, y = @");
-test("(let ( x = 1, y = 2 @");
-test("(let ( x = 1, y = 2 ) @");
-test("(let ( x = 1, y = 2 ) x @");
-test("(let ( x = 1, y = 2 ) x) @");
-test("(let ( x = 1, y = 2 ) x); @");
-
 // Legacy array comprehensions
 
 test("[x @");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/testBug579647.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/testBug579647.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/testBug579647.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/testBug579647.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-expected = "TypeError: a is not a function";
-actual = "";
-
-try {
-    a = ""
-    for each(x in [0, 0, 0, 0]) {
-        a %= x
-    } ( let (a=-a) a)()
-} catch (e) {
-    actual = '' + e;
-}
-
-assertEq(actual, expected);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/testBug692274-4.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/testBug692274-4.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/testBug692274-4.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/testBug692274-4.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-// |jit-test| error: TypeError
-var obj = {};
-let ([] = print) 3; 
-let ( i = "a" ) new i [ obj[i] ];
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/testBug709633.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/testBug709633.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/testBug709633.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/testBug709633.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-test();
-function test() {
-  var f;
-  f = function() { (let(x) {y: z}) }
-    let (f = function() {
-        for (var t=0;t<6;++t) ++f;
-    }) { f(); } //  {  }       
-  actual = f + '';
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/testBug773108.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/testBug773108.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/testBug773108.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/testBug773108.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-// |jit-test| error:InternalError
-
-Function("\
-for each(l in[(let(c)([])\
-for each(l in[]))(let(c)w for(u in[]))(let(u)w for(l in[]))(let(c)w for(u in[]))\
-(let(u)w for each(l in[]))(let(c)w for(u in[]))(let(u)w for(l in[]))(let(c)w for(u in[]))\
-(let(u)w for each(l in[]))(let(c)w for(u in[]))(let(u)w for(l in[]))(let(c)w for(u in[]))\
-(let(l)w for(l in[]))(let(u)w for(l in['']))(let(c)w for(u in[]))(let(u)w for(l in[]))\
-(let(c)w for(l in[]))(let(l)w for(l in[]))(let(c)w for(l in[]))(let(u)w for(l in[]))\
-(let(c)w for(l in[]))(let(u)w for each(l in[x]))(let(w,x)w for(u in[]))]){}\
-")
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/testCrossCompartmentTransparency.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/testCrossCompartmentTransparency.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/testCrossCompartmentTransparency.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/testCrossCompartmentTransparency.js	2015-05-25 20:43:12.000000000 +0000
@@ -15,7 +15,7 @@
 var proxy1 = g1.eval(proxyStr);
 var proxy2 = g2.eval(proxyStr);
 
-function test(str, f) {
+function test(str, f, isGeneric = false) {
     "use strict";
 
     var x = f(eval(str));
@@ -29,7 +29,7 @@
         assertEq(Object.prototype.toString.call(e), "[object Error]");
         threw = true;
     }
-    assertEq(threw, true);
+    assertEq(threw, !isGeneric);
     threw = false;
     try {
         f(g2.eval("new Object()"));
@@ -37,7 +37,7 @@
         assertEq(Object.prototype.toString.call(e), "[object Error]");
         threw = true;
     }
-    assertEq(threw, true);
+    assertEq(threw, !isGeneric);
     threw = false;
     try {
         f(proxy1);
@@ -45,7 +45,7 @@
         assertEq(Object.prototype.toString.call(e), "[object Error]");
         threw = true;
     }
-    assertEq(threw, true);
+    assertEq(threw, !isGeneric);
     threw = false;
     try {
         f(proxy2);
@@ -53,7 +53,7 @@
         assertEq(Object.prototype.toString.call(e), "[object Error]");
         threw = true;
     }
-    assertEq(threw, true);
+    assertEq(threw, !isGeneric);
 }
 
 test("new Boolean(true)", b => Boolean.prototype.toSource.call(b));
@@ -153,7 +153,7 @@
 test("new Date()", d => justDontThrow(Date.prototype.toTimeString.call(d)));
 test("new Date()", d => justDontThrow(Date.prototype.toDateString.call(d)));
 test("new Date()", d => justDontThrow(Date.prototype.toSource.call(d)));
-test("new Date()", d => justDontThrow(Date.prototype.toString.call(d)));
+test("new Date()", d => justDontThrow(Date.prototype.toString.call(d)), true);
 test("new Date()", d => justDontThrow(Date.prototype.valueOf.call(d)));
 
 throw "done";
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/testDynamicUsage.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/testDynamicUsage.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/testDynamicUsage.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/testDynamicUsage.js	2015-05-25 20:43:12.000000000 +0000
@@ -59,10 +59,6 @@
 assertEq((function(a) { let ([x,y] = a) { x += y; return (function() x)() } })([1,2]), 3);
 assertEq((function(a) { let ([[l, x],[m, y]] = a) { (function() { x += y })(); return x } })([[0,1],[0,2]]), 3);
 assertEq((function(a) { let ([[l, x],[m, y]] = a) { x += y; return (function() x)() } })([[0,1],[0,2]]), 3);
-assertEq((function(a) { return let ([x,y] = a) ((function() { x += y })(), x) })([1,2]), 3);
-assertEq((function(a) { return let ([x,y] = a) (x += y, (function() x)()) })([1,2]), 3);
-assertEq((function(a) { return let ([[l, x],[m, y]] = a) ((function() { x += y })(), x) })([[0,1],[0,2]]), 3);
-assertEq((function(a) { return let ([[l, x],[m, y]] = a) (x += y, (function() x)()) })([[0,1],[0,2]]), 3);
 
 assertEq((function() { let x = 3; return (function() { return x })() })(), 3);
 assertEq((function() { let g = function() { return x }; let x = 3; return g() })(), 3);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/testLet.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/testLet.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/testLet.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/testLet.js	2015-05-25 20:43:12.000000000 +0000
@@ -57,47 +57,46 @@
 }
 
 // let expr
-test('return let (y) x;');
-test('return let (x) "" + x;', 'unicorns', 'undefined');
-test('return let (y = x) (y++, "" + y);', 'unicorns', 'NaN');
-test('return let (y = 1) (y = x, y);');
-test('return let ([] = x) x;');
-test('return let (x = {a: x}) x.a;');
-test('return let ({a: x} = {a: x}) x;');
-test('return let ([x] = [x]) x;');
-test('return let ({0: x} = [x]) x;');
-test('return let ({0: []} = [[]]) x;');
-test('return let ([, ] = x) x;');
-test('return let ([, , , , ] = x) x;');
-test('return let (x = x) x;');
-test('return let (x = eval("x")) x;');
-test('return let (x = (let (x = x + 1) x) + 1) x;', 1, 3);
-test('return let (x = (let (x = eval("x") + 1) eval("x")) + 1) eval("x");', 1, 3);
-test('return let (x = x + 1, y = x) y;');
-test('return let (x = x + 1, [] = x, /*[[, , ]] = x, */y = x) y;');
-test('return let ([{a: x}] = x, [, {b: y}] = x) let (x = x + 1, y = y + 2) x + y;', [{a:"p"},{b:"p"}], "p1p2");
-test('return let ([] = []) x;');
-test('return let ([] = [x]) x;');
-test('return let ([a] = (1, [x])) a;');
-test('return let ([a] = (1, x, 1, x)) a;', ['ponies']);
-test('return let ([x] = [x]) x;');
-test('return let ([[a, [b, c]]] = [[x, []]]) a;');
-test('return let ([x, y] = [x, x + 1]) x + y;', 1, 3);
-test('return let ([x, y, z] = [x, x + 1, x + 2]) x + y + z;', 1, 6);
-test('return let ([[x]] = [[x]]) x;');
-test('return let ([x, y] = [x, x + 1]) x;');
-test('return let ([x, [y, z]] = [x, x + 1]) x;');
-test('return let ([{x: [x]}, {y1: y, z1: z}] = [x, x + 1]) x;',{x:['ponies']});
-test('return let (x = (3, x)) x;');
-test('return let (x = x + "s") x;', 'ponie');
-test('return let ([x] = (3, [x])) x;');
-test('return let (y = x) function () {return eval("y");}();');
-test('return eval("let (y = x) y");');
-test('return let (y = x) (eval("var y = 2"), y);', 'ponies', 2);
-test('"use strict";return let (y = x) (eval("var y = 2"), y);');
-test('this.y = x;return let (y = 1) this.eval("y");');
-test('try {let (x = x) eval("throw x");} catch (e) {return e;}');
-test('try {return let (x = eval("throw x")) x;} catch (e) {return e;}');
+isParseError('return let (y) x;');
+isParseError('return let (x) "" + x;', 'unicorns', 'undefined');
+isParseError('return let (y = x) (y++, "" + y);', 'unicorns', 'NaN');
+isParseError('return let (y = 1) (y = x, y);');
+isParseError('return let ([] = x) x;');
+isParseError('return let (x = {a: x}) x.a;');
+isParseError('return let ({a: x} = {a: x}) x;');
+isParseError('return let ([x] = [x]) x;');
+isParseError('return let ({0: x} = [x]) x;');
+isParseError('return let ({0: []} = [[]]) x;');
+isParseError('return let ([, ] = x) x;');
+isParseError('return let ([, , , , ] = x) x;');
+isParseError('return let (x = x) x;');
+isParseError('return let (x = eval("x")) x;');
+isParseError('return let (x = (let (x = x + 1) x) + 1) x;', 1, 3);
+isParseError('return let (x = (let (x = eval("x") + 1) eval("x")) + 1) eval("x");', 1, 3);
+isParseError('return let (x = x + 1, y = x) y;');
+isParseError('return let (x = x + 1, [] = x, /*[[, , ]] = x, */y = x) y;');
+isParseError('return let ([{a: x}] = x, [, {b: y}] = x) let (x = x + 1, y = y + 2) x + y;', [{a:"p"},{b:"p"}], "p1p2");
+isParseError('return let ([] = []) x;');
+isParseError('return let ([] = [x]) x;');
+isParseError('return let ([a] = (1, [x])) a;');
+isParseError('return let ([a] = (1, x, 1, x)) a;', ['ponies']);
+isParseError('return let ([x] = [x]) x;');
+isParseError('return let ([[a, [b, c]]] = [[x, []]]) a;');
+isParseError('return let ([x, y] = [x, x + 1]) x + y;', 1, 3);
+isParseError('return let ([x, y, z] = [x, x + 1, x + 2]) x + y + z;', 1, 6);
+isParseError('return let ([[x]] = [[x]]) x;');
+isParseError('return let ([x, y] = [x, x + 1]) x;');
+isParseError('return let ([x, [y, z]] = [x, x + 1]) x;');
+isParseError('return let ([{x: [x]}, {y1: y, z1: z}] = [x, x + 1]) x;',{x:['ponies']});
+isParseError('return let (x = (3, x)) x;');
+isParseError('return let (x = x + "s") x;', 'ponie');
+isParseError('return let ([x] = (3, [x])) x;');
+isParseError('return let (y = x) function () {return eval("y");}();');
+isParseError('return let (y = x) (eval("var y = 2"), y);', 'ponies', 2);
+isParseError('"use strict";return let (y = x) (eval("var y = 2"), y);');
+isParseError('this.y = x;return let (y = 1) this.eval("y");');
+isParseError('try {let (x = x) eval("throw x");} catch (e) {return e;}');
+isParseError('try {return let (x = eval("throw x")) x;} catch (e) {return e;}');
 isParseError('let (x = 1, x = 2) x');
 isParseError('let ([x, y] = a, {a:x} = b) x');
 isParseError('let ([x, y, x] = a) x');
@@ -121,8 +120,8 @@
 test('let ([, , , , ] = x) {return x;}');
 test('let (x = x) {return x;}');
 test('let (x = eval("x")) {return x;}');
-test('let (x = (let (x = x + 1) x) + 1) {return x;}', 1, 3);
-test('let (x = (let (x = eval("x") + 1) eval("x")) + 1) {return eval("x");}', 1, 3);
+isParseError('let (x = (let (x = x + 1) x) + 1) {return x;}', 1, 3);
+isParseError('let (x = (let (x = eval("x") + 1) eval("x")) + 1) {return eval("x");}', 1, 3);
 test('let (x = x + 1, y = x) {return y;}');
 test('let (x = x + 1, [] = x, [[, , ]] = x, y = x) {return y;}');
 test('let ([{a: x}] = x, [, {b: y}] = x) {let (x = x + 1, y = y + 2) {return x + y;}}', [{a:"p"},{b:"p"}], "p1p2");
@@ -139,7 +138,7 @@
 test('let ([x, [y, z]] = [x, x + 1]) {return x;}');
 test('let ([{x: [x]}, {y1: y, z1: z}] = [x, x + 1]) {return x;}',{x:['ponies']});
 test('let (y = x[1]) {let (x = x[0]) {try {let (y = "unicorns") {throw y;}} catch (e) {return x + y;}}}', ['pon','ies']);
-test('let (x = x) {try {let (x = "unicorns") eval("throw x");} catch (e) {return x;}}');
+isParseError('let (x = x) {try {let (x = "unicorns") eval("throw x");} catch (e) {return x;}}');
 test('let (y = x) {return function () {return eval("y");}();}');
 test('return eval("let (y = x) {y;}");');
 test('let (y = x) {eval("var y = 2");return y;}', 'ponies', 2);
@@ -159,8 +158,8 @@
 test('var x = x;return x;');
 test('var y = y;return "" + y;', 'unicorns', 'undefined');
 test('var x = eval("x");return x;');
-test('var x = (let (x = x + 1) x) + 1;return x;', 1, 3);
-test('var x = (let (x = eval("x") + 1) eval("x")) + 1;return eval("x");', 1, 3);
+isParseError('var x = (let (x = x + 1) x) + 1;return x;', 1, 3);
+isParseError('var x = (let (x = eval("x") + 1) eval("x")) + 1;return eval("x");', 1, 3);
 test('var X = x + 1, y = x;return y;');
 test('var X = x + 1, [] = X, [[, , ]] = X, y = x;return y;');
 test('var [{a: X}] = x, [, {b: y}] = x;var X = X + 1, y = y + 2;return X + y;', [{a:"p"},{b:"p"}], "p1p2");
@@ -187,8 +186,8 @@
 test('if (x) {let [] = x;return x;}');
 test('if (x) {let [, ] = x;return x;}');
 test('if (x) {let [, , , , ] = x;return x;}');
-test('if (x) {let y = (let (x = x + 1) x) + 1;return y;}', 1, 3);
-test('if (x) {let y = (let (x = eval("x") + 1) eval("x")) + 1;return eval("y");}', 1, 3);
+isParseError('if (x) {let y = (let (x = x + 1) x) + 1;return y;}', 1, 3);
+isParseError('if (x) {let y = (let (x = eval("x") + 1) eval("x")) + 1;return eval("y");}', 1, 3);
 test('if (x) {let X = x + 1, y = x;return y;}');
 test('if (x) {let X = x + 1, [] = X, [[, , ]] = X, y = x;return y;}');
 test('if (x) {let [{a: X}] = x, [, {b: Y}] = x;var XX = X + 1, YY = Y + 2;return XX + YY;}', [{a:"p"},{b:"p"}], "p1p2");
@@ -232,8 +231,8 @@
 test('for (let y = 1;;) {return x;}');
 test('for (let y = 1;; ++y) {return x;}');
 test('for (let y = 1; ++y;) {return x;}');
-test('for (let (x = 1) x; x != 1; ++x) {return x;}');
-test('for (let (x = 1, [{a: b, c: d}] = [{a: 1, c: 2}]) x; x != 1; ++x) {return x;}');
+isParseError('for (let (x = 1) x; x != 1; ++x) {return x;}');
+isParseError('for (let (x = 1, [{a: b, c: d}] = [{a: 1, c: 2}]) x; x != 1; ++x) {return x;}');
 test('for (let [[a, [b, c]]] = [[x, []]];;) {return a;}');
 test('var sum = 0;for (let y = x; y < 4; ++y) {sum += y;}return sum;', 1, 6);
 test('var sum = 0;for (let x = x, y = 10; x < 4; ++x) {sum += x;}return sum;', 1, 6);
@@ -280,7 +279,7 @@
 test('for (let x in eval("x")) {return x;}', {ponies:true});
 test('for (let x in x) {return eval("x");}', {ponies:true});
 test('for (let x in eval("x")) {return eval("x");}', {ponies:true});
-test('for ((let (x = {y: true}) x).y in eval("x")) {return eval("x");}');
+isParseError('for ((let (x = {y: true}) x).y in eval("x")) {return eval("x");}');
 test('for (let i in x) {break;}return x;');
 test('for (let i in x) {break;}return eval("x");');
 test('for (let x in x) {break;}return x;');
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/testScriptCloning.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/testScriptCloning.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/testScriptCloning.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/testScriptCloning.js	2015-05-25 20:43:12.000000000 +0000
@@ -15,9 +15,6 @@
 g.f = new Function('return function(x,y) { return x.search(/a/) + y.search(/b/) };');
 assertEq(g.eval("clone(f)()('12a','foo')"), 1);
 
-g.f = new Function('return [function(x) x+2, function(y) let(z=y+1) z];');
-assertEq(g.eval("let ([f,g] = clone(f)()) f(g(4))"), 7);
-
 g.f = new Function('return function(x) { switch(x) { case "a": return "b"; case null: return "c" } };');
 assertEq(g.eval("clone(f)()('a')"), "b");
 assertEq(g.eval("clone(f)()(null)"), "c");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/throw-apply-too-many-args.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/throw-apply-too-many-args.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/basic/throw-apply-too-many-args.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/basic/throw-apply-too-many-args.js	2015-05-25 20:43:12.000000000 +0000
@@ -4,7 +4,9 @@
   arguments.length = getMaxArgs() + 1;
   g.apply(this, arr);
 }
-var args = [[5], [5], [5], [5], [5], [5], [5], [5], [5], [5], [5], let (x = []) (x.length = getMaxArgs() + 1, x)]
+let x = [];
+x.length = getMaxArgs() + 1;
+var args = [[5], [5], [5], [5], [5], [5], [5], [5], [5], [5], [5], x]
 try
 {
   for (var i = 0; i < args.length; i++) { arr = args[i]; f(); }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/closures/bug540131-3.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/closures/bug540131-3.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/closures/bug540131-3.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/closures/bug540131-3.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-(function() {
-  (eval("\
-    (function() {\
-      let(e = eval(\"\
-        for(z=0;z<5;z++){}\
-      \"))\
-      (function(){\
-        x = e\
-      })()\
-    })\
-  "))()
-})();
-print(x)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/debug/bug1160182.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/debug/bug1160182.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/debug/bug1160182.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/debug/bug1160182.js	2015-05-25 20:43:15.000000000 +0000
@@ -0,0 +1,11 @@
+var g = newGlobal();
+g.eval("(" + function() {
+    var o = {get x() {}};
+    this.method = Object.getOwnPropertyDescriptor(o, "x").get;
+    assertEq(isLazyFunction(method), true);
+} + ")()");
+var dbg = new Debugger();
+var gw = dbg.addDebuggee(g);
+var scripts = dbg.findScripts();
+var methodv = gw.makeDebuggeeValue(g.method);
+assertEq(scripts.indexOf(methodv.script) != -1, true);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/debug/Environment-find-02.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/debug/Environment-find-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/debug/Environment-find-02.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/debug/Environment-find-02.js	2015-05-25 20:43:14.000000000 +0000
@@ -14,5 +14,5 @@
 };
 
 g.eval("h();");
-g.eval("(function () { let (x = 1, y = 2) h(); })();");
+g.eval("(function () { h(); })();");
 assertEq(hits, 2);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/debug/Environment-find-06.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/debug/Environment-find-06.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/debug/Environment-find-06.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/debug/Environment-find-06.js	2015-05-25 20:43:14.000000000 +0000
@@ -42,8 +42,6 @@
 test2('function f() { let @@ = 0; { let y = 0; h(); } }  f();');
 test2('             { for (let @@ = 0; X < 1; X++) h(); }');
 test2('function f() { for (let @@ = 0; X < 1; X++) h(); }  f();');
-test2('             {        (let (@@ = 0) let (y = 2, z = 3) h()); }');
-test2('function f() { return (let (@@ = 0) let (y = 2, z = 3) h()); }  f();');
 
 test1('(function X() { h(); })();');
 test1('(function X(a, b, c) { h(); })(1, 2, 3);');
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/debug/Environment-type-01.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/debug/Environment-type-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/debug/Environment-type-01.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/debug/Environment-type-01.js	2015-05-25 20:43:14.000000000 +0000
@@ -16,7 +16,6 @@
 test("with({x: 1, y: 2}) h();", 'with');
 test("(function (s) { with ({x: 1, y: 2}) h(); })();", 'with');
 test("let (x = 1) { h(); }", 'declarative');
-test("(let (x = 1) h());", 'declarative');
 test("for (let x = 0; x < 1; x++) h();", 'declarative');
 test("for (let x in h()) ;", 'object');
 test("for (let x in {a:1}) h();", 'declarative');
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/for-of/syntax-1.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/for-of/syntax-1.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/for-of/syntax-1.js	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/for-of/syntax-1.js	2015-05-25 20:43:16.000000000 +0000
@@ -18,5 +18,4 @@
 test("for (a in b of c)");
 test("for each (a of b)");
 test("for (a of b of c)");
-test("for (let (a = 1) a of b)");
 test("for (let {a: 1} of b)");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/gc/bug-1165966.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/gc/bug-1165966.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/gc/bug-1165966.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/gc/bug-1165966.js	2015-05-25 20:43:16.000000000 +0000
@@ -0,0 +1,6 @@
+// |jit-test| --no-ggc; allow-unhandlable-oom
+load(libdir + 'oomTest.js');
+var g = newGlobal();
+oomTest(function() {
+    Debugger(g);
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/gc/bug-880776.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/gc/bug-880776.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/gc/bug-880776.js	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/gc/bug-880776.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-
-gczeal(11);
-var otherGlobal = newGlobal();
-function test(str, arg, result)
-{
-        var fun = new Function('x', str);
-            var code = "(function (x) { " + str + " })";
-                var c = clone(otherGlobal.evaluate(code));
-                    assertEq(c.toSource(), eval(code).toSource());
-}
-test('return let (y) x;');
-test('return let (x) "" + x;', 'unicorns', 'undefined');
-test('return let (y = x) (y++, "" + y);', 'unicorns', 'NaN');
-test('return let (y = 1) (y = x, y);');
-test('return let ([] = x) x;');
-test('return let ([, ] = x) x;');
-test('return let ([, , , , ] = x) x;');
-test('return let ([[]] = x) x;');
-test('return let ([[[[[[[[[[[[[]]]]]]]]]]]]] = x) x;');
-test('return let ([[], []] = x) x;');
-test('return let ([[[[]]], [], , [], [[]]] = x) x;');
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/ion/bug770332.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/ion/bug770332.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/ion/bug770332.js	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/ion/bug770332.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-function TestCase(n, d, e, a) {}
-function reportCompare (expected, actual, description) {
-  var testcase = new TestCase("unknown-test-name", description, expected, actual);
-}
-var status = 'Testing scope after changing obj.__proto__';
-function test() {
-  let ( actual = [ ]  ) TestCase   .__proto__ = null;
-  reportCompare (expect, actual, status);
-}
-var actual = 'error';
-var expect = 'error';
-for (i = 0; i < 12000; i++)  {
-  test();
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/ion/bug827821.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/ion/bug827821.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/ion/bug827821.js	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/ion/bug827821.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-var lfcode = new Array();
-lfcode.push("3");
-lfcode.push("\
-	gczeal(2);\
-	for (let q = 0; q < 50; ++q) {\
-		var w = \"r\".match(/r/);\
-	}\
-	let (eval) (function  (a) {\
-		Function = gczeal;\
-	})();\
-	// .js\
-");
-lfcode.push(" // .js");
-lfcode.push(" // .js");
-lfcode.push(" // .js");
-while (true) {
-	var file = lfcode.shift(); if (file == undefined) { break; }
-        loadFile(file)
-}
-function loadFile(lfVarx) {
-    try {
-        if (lfVarx.substr(-3) == ".js") {
-	    uneval("foo");
-            switch (lfRunTypeId) {
-                case 3: function newFunc(x) { new Function(x)(); }; newFunc(lfVarx); break;
-                case 4: eval("(function() { " + lfVarx + " })();"); break;
-            }
-        } else if (!isNaN(lfVarx)) {
-            lfRunTypeId = parseInt(lfVarx);
-	}
-    } catch (lfVare) {}
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/jaeger/bug580703.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/jaeger/bug580703.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/jaeger/bug580703.js	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/jaeger/bug580703.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-
-
-let(w)(function () {
-    w
-})
-let(e)(function () {
-    e
-})
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/jaeger/bug591602.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/jaeger/bug591602.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/jaeger/bug591602.js	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/jaeger/bug591602.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-try {
-    for (x in ['']) {
-        gczeal(2)
-    }
-} catch(e) {}
-try {
-    var x, e
-    p()
-} catch(e) {}
-try { (function() {
-        let(x)((function() {
-            let(y)((function() {
-                try {
-                    let(c) o
-                } finally { (f, [1,2,3])
-                }
-            }))
-        }))
-    })()
-} catch(e) {}
-try { (function() {
-        if (x.w("", (function() {
-            t
-        })())) {}
-    })()
-} catch(e) {}
-try {
-    gczeal()
-} catch(e) {}
-try { (function() {
-        for (let w in [0, 0]) let(b)((function() {
-            let(x = w = [])((function() {
-                for (let a in []);
-            }))
-        })())
-    })()
-} catch(e) {}
-
-/* Don't assert with -m only. */
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/parser/home-object-getter.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/parser/home-object-getter.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/parser/home-object-getter.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/parser/home-object-getter.js	2015-05-25 20:43:20.000000000 +0000
@@ -0,0 +1,4 @@
+var o = {get a() {
+    return eval("5");
+}}
+assertEq(o.a, 5);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/profiler/AutoEntryMonitor-01.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/profiler/AutoEntryMonitor-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/profiler/AutoEntryMonitor-01.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/profiler/AutoEntryMonitor-01.js	2015-05-25 20:43:20.000000000 +0000
@@ -0,0 +1,50 @@
+// AutoEntryMonitor should catch all entry points into JavaScript.
+
+load(libdir + 'array-compare.js');
+
+function cold_and_warm(f, params, expected) {
+  print(uneval(params));
+  print(uneval(entryPoints(params)));
+  assertEq(arraysEqual(entryPoints(params), expected), true);
+
+  // Warm up the function a bit, so the JITs will compile it, and try again.
+  if (f)
+    for (i = 0; i < 10; i++)
+      f();
+
+  assertEq(arraysEqual(entryPoints(params), expected), true);
+}
+
+function entry1() { }
+cold_and_warm(entry1, { function: entry1 }, [ "entry1" ]);
+
+var getx = { get x() { } };
+cold_and_warm(Object.getOwnPropertyDescriptor(getx, 'x').get,
+              { object: getx, property: 'x' }, [ "getx.x" ]);
+
+var sety = { set y(v) { } };
+cold_and_warm(Object.getOwnPropertyDescriptor(sety, 'y').set,
+              { object: sety, property: 'y', value: 'glerk' }, [ "sety.y" ]);
+
+cold_and_warm(Object.prototype.toString, { ToString: {} }, []);
+
+var toS = { toString: function myToString() { return "string"; } };
+cold_and_warm(toS.toString, { ToString: toS }, [ "myToString" ]);
+
+cold_and_warm(undefined, { ToNumber: {} }, []);
+
+var vOf = { valueOf: function myValueOf() { return 42; } };
+cold_and_warm(vOf.valueOf, { ToNumber: vOf }, [ "myValueOf" ]);
+
+var toSvOf = { toString: function relations() { return Object; },
+               valueOf: function wallpaper() { return 17; } };
+cold_and_warm(() => {  toSvOf.toString(); toSvOf.valueOf(); },
+              { ToString: toSvOf }, [ "relations", "wallpaper" ]);
+
+var vOftoS = { toString: function ettes() { return "6-inch lengths"; },
+               valueOf: function deathBy() { return Math; } };
+cold_and_warm(() => {  vOftoS.valueOf(); vOftoS.toString(); },
+              { ToNumber: vOftoS }, [ "deathBy", "ettes" ]);
+
+
+cold_and_warm(() => 0, { eval: "Math.atan2(1,1);" }, [ "eval:entryPoint eval" ]);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/profiler/AutoEntryMonitor-02.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/profiler/AutoEntryMonitor-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/profiler/AutoEntryMonitor-02.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/profiler/AutoEntryMonitor-02.js	2015-05-25 20:43:20.000000000 +0000
@@ -0,0 +1,12 @@
+// Nested uses of AutoEntryMonitor should behave with decorum.
+
+load(libdir + 'array-compare.js');
+
+function Cobb() {
+  var twoShot = { toString: function Saito() { return Object; },
+                  valueOf: function Fischer() { return "Ariadne"; } };
+  assertEq(arraysEqual(entryPoints({ ToString: twoShot }),
+                       [ "Saito", "Fischer" ]), true);
+}
+
+assertEq(arraysEqual(entryPoints({ function: Cobb }), ["Cobb"]), true);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/profiler/bug1164448.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/profiler/bug1164448.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/profiler/bug1164448.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/profiler/bug1164448.js	2015-05-25 20:43:20.000000000 +0000
@@ -0,0 +1,25 @@
+// |jit-test| error: TypeError
+
+print = function(s) { return s.toString(); }
+var gTestcases = new Array();
+function TestCase(n, d, e, a)
+  gTestcases[gTc++] = this;
+    dump = print;
+  for ( gTc=0; gTc < gTestcases.length; gTc++ ) {}
+function jsTestDriverEnd() {
+  for (var i = 0; i < gTestcases.length; i++)
+    gTestcases[i].dump();
+}
+TestCase();
+var g = newGlobal();
+g.parent = this;
+g.eval("new Debugger(parent).onExceptionUnwind = function () {};");
+enableSPSProfiling();
+if (getBuildConfiguration()["arm-simulator"])
+    enableSingleStepProfiling(1);
+loadFile("jsTestDriverEnd();");
+loadFile("jsTestDriverEnd();");
+jsTestDriverEnd();
+function loadFile(lfVarx) {
+    try { evaluate(lfVarx); } catch (lfVare) {}
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/saved-stacks/async-max-frame-count.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/saved-stacks/async-max-frame-count.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jit-test/tests/saved-stacks/async-max-frame-count.js	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jit-test/tests/saved-stacks/async-max-frame-count.js	2015-05-25 20:43:20.000000000 +0000
@@ -13,7 +13,14 @@
 function checkRecursion(n, limit) {
   print("checkRecursion(" + uneval(n) + ", " + uneval(limit) + ")");
 
-  var stack = recur(n, limit);
+  try {
+    var stack = recur(n, limit);
+  } catch (e) {
+    // Some platforms, like ASAN builds, can end up overrecursing. Tolerate
+    // these failures.
+    assertEq(/too much recursion/.test("" + e), true);
+    return;
+  }
 
   // Async stacks are limited even if we didn't ask for a limit. There is a
   // default limit on frames attached on top of any synchronous frames. In this
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi.cpp	2015-05-25 20:43:24.000000000 +0000
@@ -151,7 +151,7 @@
     if (code_ == JSMSG_OBJECT_NOT_EXTENSIBLE || code_ == JSMSG_SET_NON_OBJECT_RECEIVER) {
         RootedValue val(cx, ObjectValue(*obj));
         return ReportValueErrorFlags(cx, flags, code_, JSDVG_IGNORE_STACK, val,
-                                     NullPtr(), nullptr, nullptr);
+                                     nullptr, nullptr, nullptr);
     }
     if (ErrorTakesIdArgument(code_)) {
         RootedValue idv(cx, IdToValue(id));
@@ -1992,7 +1992,7 @@
     MOZ_ASSERT(clasp != &JSFunction::class_);
     MOZ_ASSERT(!(clasp->flags & JSCLASS_IS_GLOBAL));
 
-    return NewObjectWithClassProto(cx, clasp, NullPtr());
+    return NewObjectWithClassProto(cx, clasp, nullptr);
 }
 
 JS_PUBLIC_API(JSObject*)
@@ -2657,7 +2657,7 @@
     if (!clasp)
         clasp = &PlainObject::class_;    /* default class is Object */
 
-    RootedObject nobj(cx, NewObjectWithClassProto(cx, clasp, NullPtr()));
+    RootedObject nobj(cx, NewObjectWithClassProto(cx, clasp, nullptr));
     if (!nobj)
         return nullptr;
 
@@ -2818,6 +2818,26 @@
 }
 
 JS_PUBLIC_API(bool)
+JS_HasOwnPropertyById(JSContext* cx, HandleObject obj, HandleId id, bool* foundp)
+{
+    AssertHeapIsIdle(cx);
+    CHECK_REQUEST(cx);
+    assertSameCompartment(cx, obj, id);
+
+    return HasOwnProperty(cx, obj, id, foundp);
+}
+
+JS_PUBLIC_API(bool)
+JS_HasOwnProperty(JSContext* cx, HandleObject obj, const char* name, bool* foundp)
+{
+    JSAtom* atom = Atomize(cx, name, strlen(name));
+    if (!atom)
+        return false;
+    RootedId id(cx, AtomToId(atom));
+    return JS_HasOwnPropertyById(cx, obj, id, foundp);
+}
+
+JS_PUBLIC_API(bool)
 JS_GetPropertyDescriptorById(JSContext* cx, HandleObject obj, HandleId id,
                              MutableHandle<JSPropertyDescriptor> desc)
 {
@@ -3400,7 +3420,7 @@
 extern JS_PUBLIC_API(bool)
 JS_IsConstructor(JSFunction* fun)
 {
-    return fun->isNativeConstructor() || fun->isInterpretedConstructor();
+    return fun->isConstructor();
 }
 
 JS_PUBLIC_API(JSObject*)
@@ -3817,7 +3837,7 @@
     AutoLastFrameCheck lfc(cx);
 
     script.set(frontend::CompileScript(cx, &cx->tempLifoAlloc(), cx->global(),
-                                       NullPtr(), NullPtr(), options, srcBuf));
+                                       nullptr, nullptr, options, srcBuf));
     return !!script;
 }
 
@@ -4041,7 +4061,7 @@
             return false;
     }
 
-    fun.set(NewScriptedFunction(cx, 0, JSFunction::INTERPRETED, funAtom,
+    fun.set(NewScriptedFunction(cx, 0, JSFunction::INTERPRETED_NORMAL, funAtom,
                                 gc::AllocKind::FUNCTION, TenuredObject,
                                 enclosingDynamicScope));
     if (!fun)
@@ -4151,7 +4171,7 @@
     assertSameCompartment(cx, obj, scriptArg);
 
     if (!script->hasPollutedGlobalScope() && !obj->is<GlobalObject>()) {
-        script = CloneScript(cx, NullPtr(), NullPtr(), script, HasPollutedGlobalScope);
+        script = CloneScript(cx, nullptr, nullptr, script, HasPollutedGlobalScope);
         if (!script)
             return false;
         js::Debugger::onNewScript(cx, script);
@@ -4201,7 +4221,7 @@
     CHECK_REQUEST(cx);
     RootedScript script(cx, scriptArg);
     if (script->compartment() != cx->compartment()) {
-        script = CloneScript(cx, NullPtr(), NullPtr(), script);
+        script = CloneScript(cx, nullptr, nullptr, script);
         if (!script)
             return false;
 
@@ -4228,7 +4248,7 @@
     options.setIsRunOnce(true);
     SourceCompressionTask sct(cx);
     RootedScript script(cx, frontend::CompileScript(cx, &cx->tempLifoAlloc(),
-                                                    scope, NullPtr(), NullPtr(), options,
+                                                    scope, nullptr, nullptr, options,
                                                     srcBuf, nullptr, 0, &sct));
     if (!script)
         return false;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi.h	2015-05-25 20:43:24.000000000 +0000
@@ -1137,8 +1137,7 @@
         ion_(true),
         asmJS_(true),
         nativeRegExp_(true),
-        unboxedObjects_(false), // Not enabled by default yet
-        unboxedArrays_(false), // Ditto
+        unboxedArrays_(false),
         werror_(false),
         strictMode_(false),
         extraWarnings_(false),
@@ -1182,12 +1181,6 @@
         return *this;
     }
 
-    bool unboxedObjects() const { return unboxedObjects_; }
-    RuntimeOptions& setUnboxedObjects(bool flag) {
-        unboxedObjects_ = flag;
-        return *this;
-    }
-
     bool unboxedArrays() const { return unboxedArrays_; }
     RuntimeOptions& setUnboxedArrays(bool flag) {
         unboxedArrays_ = flag;
@@ -1239,7 +1232,6 @@
     bool ion_ : 1;
     bool asmJS_ : 1;
     bool nativeRegExp_ : 1;
-    bool unboxedObjects_ : 1;
     bool unboxedArrays_ : 1;
     bool werror_ : 1;
     bool strictMode_ : 1;
@@ -2103,6 +2095,11 @@
      { nullptr, JS_CAST_STRING_TO(getterName, const JSJitInfo*) },  \
      { nullptr, JS_CAST_STRING_TO(setterName, const JSJitInfo*) } }
 #define JS_PS_END { nullptr, 0, JSNATIVE_WRAPPER(nullptr), JSNATIVE_WRAPPER(nullptr) }
+#define JS_SELF_HOSTED_SYM_GET(symbol, getterName, flags) \
+    {reinterpret_cast<const char*>(uint32_t(::JS::SymbolCode::symbol) + 1), \
+     uint8_t(JS_CHECK_ACCESSOR_FLAGS(flags) | JSPROP_SHARED | JSPROP_GETTER), \
+     { { nullptr, JS_CAST_STRING_TO(getterName, const JSJitInfo*) } }, \
+     JSNATIVE_WRAPPER(nullptr) }
 
 /*
  * To define a native function, set call to a JSNativeWrapper. To define a
@@ -2428,8 +2425,8 @@
 JS_GetObjectRuntime(JSObject* obj);
 
 /*
- * Unlike JS_NewObject, JS_NewObjectWithGivenProto does not compute a default proto.
- * If proto is JS::NullPtr, the JS object will have `null` as [[Prototype]].
+ * Unlike JS_NewObject, JS_NewObjectWithGivenProto does not compute a default
+ * proto. If proto is nullptr, the JS object will have `null` as [[Prototype]].
  */
 extern JS_PUBLIC_API(JSObject*)
 JS_NewObjectWithGivenProto(JSContext* cx, const JSClass* clasp, JS::Handle<JSObject*> proto);
@@ -2893,6 +2890,12 @@
 JS_GetOwnUCPropertyDescriptor(JSContext* cx, JS::HandleObject obj, const char16_t* name,
                               JS::MutableHandle<JSPropertyDescriptor> desc);
 
+extern JS_PUBLIC_API(bool)
+JS_HasOwnPropertyById(JSContext* cx, JS::HandleObject obj, JS::HandleId id, bool* foundp);
+
+extern JS_PUBLIC_API(bool)
+JS_HasOwnProperty(JSContext* cx, JS::HandleObject obj, const char* name, bool* foundp);
+
 /*
  * Like JS_GetOwnPropertyDescriptorById but will return a property on
  * an object on the prototype chain (returned in desc->obj). If desc->obj is null,
@@ -4349,12 +4352,13 @@
 enum class SymbolCode : uint32_t {
     iterator,                       // Symbol.iterator
     match,                          // Symbol.match
+    species,                        // Symbol.species
     InSymbolRegistry = 0xfffffffe,  // created by Symbol.for() or JS::GetSymbolFor()
     UniqueSymbol = 0xffffffff       // created by Symbol() or JS::NewSymbol()
 };
 
 /* For use in loops that iterate over the well-known symbols. */
-const size_t WellKnownSymbolLimit = 2;
+const size_t WellKnownSymbolLimit = 3;
 
 /*
  * Return the SymbolCode telling what sort of symbol `symbol` is.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi-tests/testBindCallable.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi-tests/testBindCallable.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi-tests/testBindCallable.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi-tests/testBindCallable.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -21,7 +21,7 @@
 
   JS::RootedValue retval(cx);
   JS::RootedValue fun(cx, JS::ObjectValue(*newCallable));
-  bool called = JS_CallFunctionValue(cx, JS::NullPtr(), fun, JS::HandleValueArray::empty(), &retval);
+  bool called = JS_CallFunctionValue(cx, nullptr, fun, JS::HandleValueArray::empty(), &retval);
   CHECK(called);
 
   CHECK(retval.isInt32());
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi-tests/testChromeBuffer.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi-tests/testChromeBuffer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi-tests/testChromeBuffer.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi-tests/testChromeBuffer.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -41,7 +41,7 @@
     {
         JSAutoCompartment ac(cx, trusted_glob);
         JS::RootedValue funVal(cx, JS::ObjectValue(*trusted_fun));
-        ok = JS_CallFunctionValue(cx, JS::NullPtr(), funVal, JS::HandleValueArray::empty(), args.rval());
+        ok = JS_CallFunctionValue(cx, nullptr, funVal, JS::HandleValueArray::empty(), args.rval());
     }
     JS_RestoreFrameChain(cx);
     return ok;
@@ -100,7 +100,7 @@
         CHECK(JS_DefineProperty(cx, global, "untrusted", fun, JSPROP_ENUMERATE));
 
         JS::RootedValue rval(cx);
-        CHECK(JS_CallFunction(cx, JS::NullPtr(), fun, JS::HandleValueArray(v), &rval));
+        CHECK(JS_CallFunction(cx, nullptr, fun, JS::HandleValueArray(v), &rval));
         CHECK(rval.toInt32() == 100);
         JS::RuntimeOptionsRef(rt) = oldOptions;
     }
@@ -149,7 +149,7 @@
         CHECK(JS_DefineProperty(cx, global, "untrusted", fun, JSPROP_ENUMERATE));
 
         JS::RootedValue rval(cx);
-        CHECK(JS_CallFunction(cx, JS::NullPtr(), fun, JS::HandleValueArray(v), &rval));
+        CHECK(JS_CallFunction(cx, nullptr, fun, JS::HandleValueArray(v), &rval));
         bool match;
         CHECK(JS_StringEqualsAscii(cx, rval.toString(), "From trusted: InternalError: too much recursion", &match));
         CHECK(match);
@@ -190,7 +190,7 @@
 
         JS::RootedValue arg(cx, JS::ObjectValue(*callTrusted));
         JS::RootedValue rval(cx);
-        CHECK(JS_CallFunction(cx, JS::NullPtr(), fun, JS::HandleValueArray(arg), &rval));
+        CHECK(JS_CallFunction(cx, nullptr, fun, JS::HandleValueArray(arg), &rval));
         CHECK(rval.toInt32() == 42);
     }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi-tests/testClassGetter.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi-tests/testClassGetter.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi-tests/testClassGetter.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi-tests/testClassGetter.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -53,7 +53,7 @@
 
 BEGIN_TEST(testClassGetter_isCalled)
 {
-    CHECK(JS_InitClass(cx, global, js::NullPtr(), &ptestClass, PTest, 0,
+    CHECK(JS_InitClass(cx, global, nullptr, &ptestClass, PTest, 0,
                        nullptr, ptestFunctions, nullptr, nullptr));
 
     EXEC("function check() { var o = new PTest(); o.test_fn(); o.test_value1; o.test_value2; o.test_value1; }");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi-tests/testGCCellPtr.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi-tests/testGCCellPtr.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi-tests/testGCCellPtr.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi-tests/testGCCellPtr.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -32,19 +32,19 @@
     CHECK(JS_CompileScript(cx, code, strlen(code), opts, &script));
     CHECK(script);
 
-    CHECK(!JS::GCCellPtr::NullPtr());
+    CHECK(!JS::GCCellPtr(nullptr));
 
     CHECK(JS::GCCellPtr(obj.get()));
-    CHECK(JS::GCCellPtr(obj.get()).kind() == JSTRACE_OBJECT);
-    CHECK(JS::GCCellPtr(JS::ObjectValue(*obj)).kind() == JSTRACE_OBJECT);
+    CHECK(JS::GCCellPtr(obj.get()).kind() == JS::TraceKind::Object);
+    CHECK(JS::GCCellPtr(JS::ObjectValue(*obj)).kind() == JS::TraceKind::Object);
 
     CHECK(JS::GCCellPtr(str.get()));
-    CHECK(JS::GCCellPtr(str.get()).kind() == JSTRACE_STRING);
-    CHECK(JS::GCCellPtr(JS::StringValue(str)).kind() == JSTRACE_STRING);
+    CHECK(JS::GCCellPtr(str.get()).kind() == JS::TraceKind::String);
+    CHECK(JS::GCCellPtr(JS::StringValue(str)).kind() == JS::TraceKind::String);
 
     CHECK(JS::GCCellPtr(script.get()));
-    CHECK(!JS::GCCellPtr::NullPtr());
-    CHECK(JS::GCCellPtr(script.get()).kind() == JSTRACE_SCRIPT);
+    CHECK(!JS::GCCellPtr(nullptr));
+    CHECK(JS::GCCellPtr(script.get()).kind() == JS::TraceKind::Script);
 
     JS::GCCellPtr objcell(obj.get());
     JS::GCCellPtr scriptcell = JS::GCCellPtr(script.get());
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi-tests/testGCMarking.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi-tests/testGCMarking.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi-tests/testGCMarking.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi-tests/testGCMarking.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -8,11 +8,11 @@
 #include "jsapi-tests/tests.h"
 
 class CCWTestTracer : public JS::CallbackTracer {
-    static void staticCallback(JS::CallbackTracer* trc, void** thingp, JSGCTraceKind kind) {
+    static void staticCallback(JS::CallbackTracer* trc, void** thingp, JS::TraceKind kind) {
         static_cast<CCWTestTracer*>(trc)->callback(thingp, kind);
     }
 
-    void callback(void** thingp, JSGCTraceKind kind) {
+    void callback(void** thingp, JS::TraceKind kind) {
         numberOfThingsTraced++;
 
         printf("*thingp         = %p\n", *thingp);
@@ -29,9 +29,9 @@
     bool          okay;
     size_t        numberOfThingsTraced;
     void**        expectedThingp;
-    JSGCTraceKind expectedKind;
+    JS::TraceKind expectedKind;
 
-    CCWTestTracer(JSContext* cx, void** expectedThingp, JSGCTraceKind expectedKind)
+    CCWTestTracer(JSContext* cx, void** expectedThingp, JS::TraceKind expectedKind)
       : JS::CallbackTracer(JS_GetRuntime(cx), staticCallback),
         okay(true),
         numberOfThingsTraced(0),
@@ -69,7 +69,7 @@
     CHECK(zones.put(global1->zone()));
 
     void* thing = obj.get();
-    CCWTestTracer trc(cx, &thing, JSTRACE_OBJECT);
+    CCWTestTracer trc(cx, &thing, JS::TraceKind::Object);
     JS_TraceIncomingCCWs(&trc, zones);
     CHECK(trc.numberOfThingsTraced == 1);
     CHECK(trc.okay);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi-tests/testMutedErrors.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi-tests/testMutedErrors.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi-tests/testMutedErrors.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi-tests/testMutedErrors.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -5,6 +5,8 @@
 #include "jsfriendapi.h"
 #include "jsapi-tests/tests.h"
 
+using mozilla::UniquePtr;
+
 static bool sErrorReportMuted = false;
 BEGIN_TEST(testMutedErrors)
 {
@@ -45,7 +47,7 @@
 eval(const char* asciiChars, bool mutedErrors, JS::MutableHandleValue rval)
 {
     size_t len = strlen(asciiChars);
-    char16_t* chars = new char16_t[len+1];
+    UniquePtr<char16_t[]> chars(new char16_t[len+1]);
     for (size_t i = 0; i < len; ++i)
         chars[i] = asciiChars[i];
     chars[len] = 0;
@@ -60,10 +62,7 @@
     options.setMutedErrors(mutedErrors)
            .setFileAndLine("", 0);
 
-    bool ok = JS::Evaluate(cx, options, chars, len, rval);
-
-    delete[] chars;
-    return ok;
+    return JS::Evaluate(cx, options, chars.get(), len, rval);
 }
 
 bool
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi-tests/testObjectEmulatingUndefined.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi-tests/testObjectEmulatingUndefined.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi-tests/testObjectEmulatingUndefined.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi-tests/testObjectEmulatingUndefined.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -22,7 +22,7 @@
 
 BEGIN_TEST(testObjectEmulatingUndefined_truthy)
 {
-    CHECK(JS_InitClass(cx, global, js::NullPtr(), &ObjectEmulatingUndefinedClass,
+    CHECK(JS_InitClass(cx, global, nullptr, &ObjectEmulatingUndefinedClass,
                        ObjectEmulatingUndefinedConstructor, 0,
                        nullptr, nullptr, nullptr, nullptr));
 
@@ -48,7 +48,7 @@
 
 BEGIN_TEST(testObjectEmulatingUndefined_equal)
 {
-    CHECK(JS_InitClass(cx, global, js::NullPtr(), &ObjectEmulatingUndefinedClass,
+    CHECK(JS_InitClass(cx, global, nullptr, &ObjectEmulatingUndefinedClass,
                        ObjectEmulatingUndefinedConstructor, 0,
                        nullptr, nullptr, nullptr, nullptr));
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi-tests/testPersistentRooted.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi-tests/testPersistentRooted.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi-tests/testPersistentRooted.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi-tests/testPersistentRooted.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -6,6 +6,7 @@
 #include "jsapi-tests/tests.h"
 
 using namespace JS;
+using mozilla::UniquePtr;
 
 struct BarkWhenTracedClass {
     static int finalizeCount;
@@ -81,13 +82,13 @@
 {
     BarkWhenTracedClass::reset();
 
-    Kennel* kennel = Allocate(cx);
-    CHECK(kennel);
+    UniquePtr<Kennel> kennel(Allocate(cx));
+    CHECK(kennel.get());
 
     // GC should be able to find our barker.
     CHECK(GCFinalizesNBarkers(cx, 0));
 
-    delete(kennel);
+    kennel = nullptr;
 
     // Now GC should not be able to find the barker.
     JS_GC(JS_GetRuntime(cx));
@@ -117,21 +118,21 @@
 {
     BarkWhenTracedClass::reset();
 
-    Kennel* kennel = Allocate(cx);
-    CHECK(kennel);
+    UniquePtr<Kennel> kennel(Allocate(cx));
+    CHECK(kennel.get());
 
     CHECK(GCFinalizesNBarkers(cx, 0));
 
     // Copy construction! AMAZING!
-    Kennel* newKennel = new Kennel(*kennel);
+    UniquePtr<Kennel> newKennel(new Kennel(*kennel));
 
     CHECK(GCFinalizesNBarkers(cx, 0));
 
-    delete(kennel);
+    kennel = nullptr;
 
     CHECK(GCFinalizesNBarkers(cx, 0));
 
-    delete(newKennel);
+    newKennel = nullptr;
 
     // Now that kennel and nowKennel are both deallocated, GC should not be
     // able to find the barker.
@@ -147,13 +148,13 @@
 {
     BarkWhenTracedClass::reset();
 
-    Kennel* kennel = Allocate(cx);
-    CHECK(kennel);
+    UniquePtr<Kennel> kennel(Allocate(cx));
+    CHECK(kennel.get());
 
     CHECK(GCFinalizesNBarkers(cx, 0));
 
     // Allocate a new, empty kennel.
-    Kennel* kennel2 = new Kennel(cx);
+    UniquePtr<Kennel> kennel2(new Kennel(cx));
 
     // Assignment! ASTONISHING!
     *kennel2 = *kennel;
@@ -161,22 +162,22 @@
     // With both kennels referring to the same barker, it is held alive.
     CHECK(GCFinalizesNBarkers(cx, 0));
 
-    delete(kennel2);
+    kennel2 = nullptr;
 
     // The destination of the assignment alone holds the barker alive.
     CHECK(GCFinalizesNBarkers(cx, 0));
 
     // Allocate a second barker.
-    kennel2 = Allocate(cx);
-    CHECK(kennel);
+    kennel2 = UniquePtr<Kennel>(Allocate(cx));
+    CHECK(kennel2.get());
 
     *kennel = *kennel2;
 
     // Nothing refers to the first kennel any more.
     CHECK(GCFinalizesNBarkers(cx, 1));
 
-    delete(kennel);
-    delete(kennel2);
+    kennel = nullptr;
+    kennel2 = nullptr;
 
     // Now that kennel and kennel2 are both deallocated, GC should not be
     // able to find the barker.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi-tests/testProfileStrings.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi-tests/testProfileStrings.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi-tests/testProfileStrings.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi-tests/testProfileStrings.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -82,7 +82,7 @@
 {
     js::SetRuntimeProfilingStack(cx->runtime(), pstack, &psize, 10);
     JS::RootedObject global(cx, JS::CurrentGlobalOrNull(cx));
-    return JS_InitClass(cx, global, js::NullPtr(), &ptestClass, Prof, 0,
+    return JS_InitClass(cx, global, nullptr, &ptestClass, Prof, 0,
                         nullptr, ptestFunctions, nullptr, nullptr);
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi-tests/testSetPropertyIgnoringNamedGetter.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi-tests/testSetPropertyIgnoringNamedGetter.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi-tests/testSetPropertyIgnoringNamedGetter.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi-tests/testSetPropertyIgnoringNamedGetter.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -46,7 +46,7 @@
                 return false;
             if (match) {
                 desc.object().set(proxy);
-                desc.attributesRef() = JSPROP_READONLY | JSPROP_ENUMERATE;
+                desc.attributesRef() = JSPROP_ENUMERATE;
                 desc.value().setInt32(42);
                 return true;
             }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi-tests/testUncaughtError.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi-tests/testUncaughtError.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi-tests/testUncaughtError.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi-tests/testUncaughtError.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -22,7 +22,7 @@
         return false;
 
     Rooted<Value> err(cx);
-    if (!CreateError(cx, JSEXN_TYPEERR, JS::NullPtr(), empty, 0, 0, nullptr, empty, &err))
+    if (!CreateError(cx, JSEXN_TYPEERR, nullptr, empty, 0, 0, nullptr, empty, &err))
         return false;
 
     Rooted<JSObject*> errObj(cx, &err.toObject());
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi-tests/testXDR.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi-tests/testXDR.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsapi-tests/testXDR.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsapi-tests/testXDR.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -12,6 +12,8 @@
 
 #include "jsscriptinlines.h"
 
+using mozilla::UniquePtr;
+
 static JSScript*
 FreezeThaw(JSContext* cx, JS::HandleScript script)
 {
@@ -41,7 +43,8 @@
         "function makeClosure(s, name, value) {\n"
         "    eval(s);\n"
         "    Math.sin(value);\n"
-        "    return let (n = name, v = value) function () { return String(v); };\n"
+        "    let n = name, v = value;\n"
+        "    return function () { return String(v); };\n"
         "}\n"
         "var f = makeClosure('0;', 'status', 'ok');\n";
 
@@ -129,7 +132,8 @@
         CHECK(script);
 
         size_t len = strlen(*sm);
-        char16_t* expected = js::InflateString(cx, *sm, &len);
+        UniquePtr<char16_t,JS::FreePolicy> expected_wrapper(js::InflateString(cx, *sm, &len));
+        char16_t *expected = expected_wrapper.get();
         CHECK(expected);
 
         // The script source takes responsibility of free'ing |expected|.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsarray.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsarray.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsarray.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsarray.cpp	2015-05-25 20:43:24.000000000 +0000
@@ -42,6 +42,7 @@
 #include "vm/Interpreter-inl.h"
 #include "vm/NativeObject-inl.h"
 #include "vm/Runtime-inl.h"
+#include "vm/UnboxedObject-inl.h"
 
 using namespace js;
 using namespace js::gc;
@@ -65,6 +66,11 @@
         return true;
     }
 
+    if (obj->is<UnboxedArrayObject>()) {
+        *lengthp = obj->as<UnboxedArrayObject>().length();
+        return true;
+    }
+
     if (obj->is<ArgumentsObject>()) {
         ArgumentsObject& argsobj = obj->as<ArgumentsObject>();
         if (!argsobj.hasOverriddenLength()) {
@@ -208,14 +214,13 @@
 {
 }
 
-template <typename IndexType>
 static bool
 GetElement(JSContext* cx, HandleObject obj, HandleObject receiver,
-           IndexType index, bool* hole, MutableHandleValue vp)
+           uint32_t index, bool* hole, MutableHandleValue vp)
 {
     AssertGreaterThanZero(index);
-    if (obj->isNative() && index < obj->as<NativeObject>().getDenseInitializedLength()) {
-        vp.set(obj->as<NativeObject>().getDenseElement(uint32_t(index)));
+    if (index < GetAnyBoxedOrUnboxedInitializedLength(obj)) {
+        vp.set(GetAnyBoxedOrUnboxedDenseElement(obj, uint32_t(index)));
         if (!vp.isMagic(JS_ELEMENTS_HOLE)) {
             *hole = false;
             return true;
@@ -288,20 +293,37 @@
     return true;
 }
 
+template <JSValueType Type>
+DenseElementResult
+GetBoxedOrUnboxedDenseElements(JSObject* aobj, uint32_t length, Value* vp)
+{
+    MOZ_ASSERT(!ObjectMayHaveExtraIndexedProperties(aobj));
+
+    if (length > GetBoxedOrUnboxedInitializedLength<Type>(aobj))
+        return DenseElementResult::Incomplete;
+
+    for (size_t i = 0; i < length; i++) {
+        vp[i] = GetBoxedOrUnboxedDenseElement<Type>(aobj, i);
+
+        // No other indexed properties so hole => undefined.
+        if (vp[i].isMagic(JS_ELEMENTS_HOLE))
+            vp[i] = UndefinedValue();
+    }
+
+    return DenseElementResult::Success;
+}
+
+DefineBoxedOrUnboxedFunctor3(GetBoxedOrUnboxedDenseElements,
+                             JSObject*, uint32_t, Value*);
+
 bool
 js::GetElements(JSContext* cx, HandleObject aobj, uint32_t length, Value* vp)
 {
-    if (aobj->is<ArrayObject>() &&
-        length <= aobj->as<ArrayObject>().getDenseInitializedLength() &&
-        !ObjectMayHaveExtraIndexedProperties(aobj))
-    {
-        /* No other indexed properties so hole = undefined */
-        const Value* srcbeg = aobj->as<ArrayObject>().getDenseElements();
-        const Value* srcend = srcbeg + length;
-        const Value* src = srcbeg;
-        for (Value* dst = vp; src < srcend; ++dst, ++src)
-            *dst = src->isMagic(JS_ELEMENTS_HOLE) ? UndefinedValue() : *src;
-        return true;
+    if (!ObjectMayHaveExtraIndexedProperties(aobj)) {
+        GetBoxedOrUnboxedDenseElementsFunctor functor(aobj, length, vp);
+        DenseElementResult result = CallBoxedOrUnboxedSpecialization(functor, aobj);
+        if (result != DenseElementResult::Incomplete)
+            return result == DenseElementResult::Success;
     }
 
     if (aobj->is<ArgumentsObject>()) {
@@ -325,39 +347,20 @@
     return true;
 }
 
-/*
- * Set the value of the property at the given index to v assuming v is rooted.
- */
+// Set the value of the property at the given index to v. The behavior of this
+// function is currently incoherent and it sometimes defines the property
+// instead. See bug 1163091.
 static bool
 SetArrayElement(JSContext* cx, HandleObject obj, double index, HandleValue v)
 {
     MOZ_ASSERT(index >= 0);
 
-    if (obj->is<ArrayObject>() && !obj->isIndexed()) {
-        Rooted<ArrayObject*> arr(cx, &obj->as<ArrayObject>());
-        /* Predicted/prefetched code should favor the remains-dense case. */
-        NativeObject::EnsureDenseResult result = NativeObject::ED_SPARSE;
-        do {
-            if (index > uint32_t(-1))
-                break;
-            uint32_t idx = uint32_t(index);
-            if (idx >= arr->length() && !arr->lengthIsWritable()) {
-                JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR, GetErrorMessage, nullptr,
-                                             JSMSG_CANT_REDEFINE_ARRAY_LENGTH);
-                return false;
-            }
-            result = arr->ensureDenseElements(cx, idx, 1);
-            if (result != NativeObject::ED_OK)
-                break;
-            if (idx >= arr->length())
-                arr->setLengthInt32(idx + 1);
-            arr->setDenseElementWithType(cx, idx, v);
-            return true;
-        } while (false);
-
-        if (result == NativeObject::ED_FAILED)
-            return false;
-        MOZ_ASSERT(result == NativeObject::ED_SPARSE);
+    if ((obj->is<ArrayObject>() || obj->is<UnboxedArrayObject>()) && !obj->isIndexed() && index <= UINT32_MAX) {
+        DenseElementResult result =
+            SetOrExtendAnyBoxedOrUnboxedDenseElements(cx, obj, uint32_t(index), v.address(), 1,
+                                                      UpdateTypes);
+        if (result != DenseElementResult::Incomplete)
+            return result == DenseElementResult::Success;
     }
 
     RootedId id(cx);
@@ -765,6 +768,16 @@
     return true;
 }
 
+static inline bool
+ObjectMayHaveExtraIndexedOwnProperties(JSObject* obj)
+{
+    return (!obj->isNative() && !obj->is<UnboxedArrayObject>()) ||
+           obj->isIndexed() ||
+           IsAnyTypedArray(obj) ||
+           ClassMayResolveId(*obj->runtimeFromAnyThread()->commonNames,
+                             obj->getClass(), INT_TO_JSID(0), obj);
+}
+
 bool
 js::ObjectMayHaveExtraIndexedProperties(JSObject* obj)
 {
@@ -774,29 +787,13 @@
      * and indexed properties or elements along its prototype chain.
      */
 
-    MOZ_ASSERT(obj->isNative());
-
-    if (obj->isIndexed())
+    if (ObjectMayHaveExtraIndexedOwnProperties(obj))
         return true;
 
-    /*
-     * Walk up the prototype chain and see if this indexed element already
-     * exists. If we hit the end of the prototype chain, it's safe to set the
-     * element on the original object.
-     */
     while ((obj = obj->getProto()) != nullptr) {
-        /*
-         * If the prototype is a non-native object (possibly a dense array), or
-         * a native object (possibly a slow array) that has indexed properties,
-         * return true.
-         */
-        if (!obj->isNative())
-            return true;
-        if (obj->isIndexed())
+        if (ObjectMayHaveExtraIndexedOwnProperties(obj))
             return true;
-        if (obj->as<NativeObject>().getDenseInitializedLength() > 0)
-            return true;
-        if (IsAnyTypedArray(obj))
+        if (GetAnyBoxedOrUnboxedInitializedLength(obj) != 0)
             return true;
     }
 
@@ -925,6 +922,72 @@
     }
 };
 
+template <typename SeparatorOp, JSValueType Type>
+static DenseElementResult
+ArrayJoinDenseKernel(JSContext* cx, SeparatorOp sepOp, HandleObject obj, uint32_t length,
+                     StringBuffer& sb, uint32_t* numProcessed)
+{
+    // This loop handles all elements up to initializedLength. If
+    // length > initLength we rely on the second loop to add the
+    // other elements.
+    MOZ_ASSERT(*numProcessed == 0);
+    uint32_t initLength = Min<uint32_t>(GetBoxedOrUnboxedInitializedLength<Type>(obj), length);
+    while (*numProcessed < initLength) {
+        if (!CheckForInterrupt(cx))
+            return DenseElementResult::Failure;
+
+        const Value& elem = GetBoxedOrUnboxedDenseElement<Type>(obj, *numProcessed);
+
+        if (elem.isString()) {
+            if (!sb.append(elem.toString()))
+                return DenseElementResult::Failure;
+        } else if (elem.isNumber()) {
+            if (!NumberValueToStringBuffer(cx, elem, sb))
+                return DenseElementResult::Failure;
+        } else if (elem.isBoolean()) {
+            if (!BooleanToStringBuffer(elem.toBoolean(), sb))
+                return DenseElementResult::Failure;
+        } else if (elem.isObject() || elem.isSymbol()) {
+            /*
+             * Object stringifying could modify the initialized length or make
+             * the array sparse. Delegate it to a separate loop to keep this
+             * one tight.
+             *
+             * Symbol stringifying is a TypeError, so into the slow path
+             * with those as well.
+             */
+            break;
+        } else {
+            MOZ_ASSERT(elem.isMagic(JS_ELEMENTS_HOLE) || elem.isNullOrUndefined());
+        }
+
+        if (++(*numProcessed) != length && !sepOp(cx, sb))
+            return DenseElementResult::Failure;
+    }
+
+    return DenseElementResult::Incomplete;
+}
+
+template <typename SeparatorOp>
+struct ArrayJoinDenseKernelFunctor {
+    JSContext* cx;
+    SeparatorOp sepOp;
+    HandleObject obj;
+    uint32_t length;
+    StringBuffer& sb;
+    uint32_t* numProcessed;
+
+    ArrayJoinDenseKernelFunctor(JSContext* cx, SeparatorOp sepOp, HandleObject obj,
+                                uint32_t length, StringBuffer& sb, uint32_t* numProcessed)
+      : cx(cx), sepOp(sepOp), obj(obj), length(length), sb(sb), numProcessed(numProcessed)
+    {}
+
+    template <JSValueType Type>
+    DenseElementResult operator()() {
+        return ArrayJoinDenseKernel<SeparatorOp, Type>(cx, sepOp, obj, length, sb, numProcessed);
+    }
+};
+
 template <bool Locale, typename SeparatorOp>
 static bool
 ArrayJoinKernel(JSContext* cx, SeparatorOp sepOp, HandleObject obj, uint32_t length,
@@ -932,43 +995,11 @@
 {
     uint32_t i = 0;
 
-    if (!Locale && obj->is<ArrayObject>() && !ObjectMayHaveExtraIndexedProperties(obj)) {
-        // This loop handles all elements up to initializedLength. If
-        // length > initLength we rely on the second loop to add the
-        // other elements.
-        uint32_t initLength = obj->as<ArrayObject>().getDenseInitializedLength();
-        while (i < initLength) {
-            if (!CheckForInterrupt(cx))
-                return false;
-
-            const Value& elem = obj->as<ArrayObject>().getDenseElement(i);
-
-            if (elem.isString()) {
-                if (!sb.append(elem.toString()))
-                    return false;
-            } else if (elem.isNumber()) {
-                if (!NumberValueToStringBuffer(cx, elem, sb))
-                    return false;
-            } else if (elem.isBoolean()) {
-                if (!BooleanToStringBuffer(elem.toBoolean(), sb))
-                    return false;
-            } else if (elem.isObject() || elem.isSymbol()) {
-                /*
-                 * Object stringifying could modify the initialized length or make
-                 * the array sparse. Delegate it to a separate loop to keep this
-                 * one tight.
-                 *
-                 * Symbol stringifying is a TypeError, so into the slow path
-                 * with those as well.
-                 */
-                break;
-            } else {
-                MOZ_ASSERT(elem.isMagic(JS_ELEMENTS_HOLE) || elem.isNullOrUndefined());
-            }
-
-            if (++i != length && !sepOp(cx, sb))
-                return false;
-        }
+    if (!Locale && !ObjectMayHaveExtraIndexedProperties(obj)) {
+        ArrayJoinDenseKernelFunctor<SeparatorOp> functor(cx, sepOp, obj, length, sb, &i);
+        DenseElementResult result = CallBoxedOrUnboxedSpecialization(functor, obj);
+        if (result == DenseElementResult::Failure)
+            return false;
     }
 
     if (i != length) {
@@ -1016,13 +1047,10 @@
     // An optimized version of a special case of steps 7-11: when length==1 and
     // the 0th element is a string, ToString() of that element is a no-op and
     // so it can be immediately returned as the result.
-    if (length == 1 && !Locale && obj->is<ArrayObject>() &&
-        obj->as<ArrayObject>().getDenseInitializedLength() == 1)
-    {
-        const Value& elem0 = obj->as<ArrayObject>().getDenseElement(0);
-        if (elem0.isString()) {
+    if (length == 1 && !Locale && GetAnyBoxedOrUnboxedInitializedLength(obj) == 1) {
+        Value elem0 = GetAnyBoxedOrUnboxedDenseElement(obj, 0);
+        if (elem0.isString())
             return elem0.toString();
-        }
     }
 
     StringBuffer sb(cx);
@@ -1064,10 +1092,7 @@
     }
 
     // Step 11
-    JSString* str = sb.finishString();
-    if (!str)
-        return nullptr;
-    return str;
+    return sb.finishString();
 }
 
 template <bool Locale>
@@ -1172,32 +1197,6 @@
     return ArrayJoin<false>(cx, args);
 }
 
-static inline bool
-InitArrayTypes(JSContext* cx, ObjectGroup* group, JSObject* obj,
-               const Value* vector, unsigned count)
-{
-    if (!group->unknownProperties()) {
-        AutoEnterAnalysis enter(cx);
-
-        HeapTypeSet* types = group->getProperty(cx, obj, JSID_VOID);
-        if (!types)
-            return false;
-
-        for (unsigned i = 0; i < count; i++) {
-            if (vector[i].isMagic(JS_ELEMENTS_HOLE))
-                continue;
-            types->addType(cx, TypeSet::GetValueType(vector[i]));
-        }
-    }
-    return true;
-}
-
-enum ShouldUpdateTypes
-{
-    UpdateTypes = true,
-    DontUpdateTypes = false
-};
-
 /* vector must point to rooted memory. */
 static bool
 InitArrayElements(JSContext* cx, HandleObject obj, uint32_t start, uint32_t count, const Value* vector, ShouldUpdateTypes updateTypes)
@@ -1210,45 +1209,13 @@
     ObjectGroup* group = obj->getGroup(cx);
     if (!group)
         return false;
-    if (updateTypes && !InitArrayTypes(cx, group, obj, vector, count))
-        return false;
-
-    /*
-     * Optimize for dense arrays so long as adding the given set of elements
-     * wouldn't otherwise make the array slow or exceed a non-writable array
-     * length.
-     */
-    do {
-        if (!obj->is<ArrayObject>())
-            break;
-        if (ObjectMayHaveExtraIndexedProperties(obj))
-            break;
-
-        HandleArrayObject arr = obj.as<ArrayObject>();
-
-        if (arr->shouldConvertDoubleElements())
-            break;
-
-        if (!arr->lengthIsWritable() && start + count > arr->length())
-            break;
-
-        NativeObject::EnsureDenseResult result = arr->ensureDenseElements(cx, start, count);
-        if (result != NativeObject::ED_OK) {
-            if (result == NativeObject::ED_FAILED)
-                return false;
-            MOZ_ASSERT(result == NativeObject::ED_SPARSE);
-            break;
-        }
 
-        uint32_t newlen = start + count;
-        if (newlen > arr->length())
-            arr->setLengthInt32(newlen);
-
-        MOZ_ASSERT(count < UINT32_MAX / sizeof(Value));
-        arr->copyDenseElements(start, vector, count);
-        MOZ_ASSERT_IF(count != 0, !arr->getDenseElement(newlen - 1).isMagic(JS_ELEMENTS_HOLE));
-        return true;
-    } while (false);
+    if (!ObjectMayHaveExtraIndexedProperties(obj)) {
+        DenseElementResult result =
+            SetOrExtendAnyBoxedOrUnboxedDenseElements(cx, obj, start, vector, count, updateTypes);
+        if (result != DenseElementResult::Incomplete)
+            return result == DenseElementResult::Success;
+    }
 
     const Value* end = vector + count;
     while (vector < end && start <= MAX_ARRAY_INDEX) {
@@ -1279,32 +1246,15 @@
     return true;
 }
 
-static bool
-array_reverse(JSContext* cx, unsigned argc, Value* vp)
-{
-    CallArgs args = CallArgsFromVp(argc, vp);
-    RootedObject obj(cx, ToObject(cx, args.thisv()));
-    if (!obj)
-        return false;
-
-    uint32_t len;
-    if (!GetLengthProperty(cx, obj, &len))
-        return false;
-
-    do {
-        if (!obj->is<ArrayObject>())
-            break;
-        if (ObjectMayHaveExtraIndexedProperties(obj))
-            break;
-
-        HandleArrayObject arr = obj.as<ArrayObject>();
-
-        /* An empty array or an array with no elements is already reversed. */
-        if (len == 0 || arr->getDenseCapacity() == 0) {
-            args.rval().setObject(*obj);
-            return true;
-        }
+template <JSValueType Type>
+DenseElementResult
+ArrayReverseDenseKernel(JSContext* cx, HandleObject obj, uint32_t length)
+{
+    /* An empty array or an array with no elements is already reversed. */
+    if (length == 0 || GetBoxedOrUnboxedInitializedLength<Type>(obj) == 0)
+        return DenseElementResult::Success;
 
+    if (Type == JSVAL_TYPE_MAGIC) {
         /*
          * It's actually surprisingly complicated to reverse an array due to the
          * orthogonality of array length and array capacity while handling
@@ -1314,46 +1264,71 @@
          * holes in the array at its start) and ensure that the capacity is
          * sufficient to hold all the elements in the array if it were full.
          */
-        NativeObject::EnsureDenseResult result =
-            arr->ensureDenseElements(cx, len, 0);
-        if (result != NativeObject::ED_OK) {
-            if (result == NativeObject::ED_FAILED)
-                return false;
-            MOZ_ASSERT(result == NativeObject::ED_SPARSE);
-            break;
-        }
+        DenseElementResult result = obj->as<NativeObject>().ensureDenseElements(cx, length, 0);
+        if (result != DenseElementResult::Success)
+            return result;
 
         /* Fill out the array's initialized length to its proper length. */
-        arr->ensureDenseInitializedLength(cx, len, 0);
+        obj->as<NativeObject>().ensureDenseInitializedLength(cx, length, 0);
+    } else {
+        // Unboxed arrays can only be reversed if their initialized length
+        // matches their actual length. Otherwise the reversal will place holes
+        // at the beginning of the array, which we don't support.
+        if (length != obj->as<UnboxedArrayObject>().length())
+            return DenseElementResult::Incomplete;
+    }
+
+    RootedValue origlo(cx), orighi(cx);
+
+    uint32_t lo = 0, hi = length - 1;
+    for (; lo < hi; lo++, hi--) {
+        origlo = GetBoxedOrUnboxedDenseElement<Type>(obj, lo);
+        orighi = GetBoxedOrUnboxedDenseElement<Type>(obj, hi);
+        SetBoxedOrUnboxedDenseElementNoTypeChange<Type>(obj, lo, orighi);
+        if (orighi.isMagic(JS_ELEMENTS_HOLE) &&
+            !SuppressDeletedProperty(cx, obj, INT_TO_JSID(lo)))
+        {
+            return DenseElementResult::Failure;
+        }
+        SetBoxedOrUnboxedDenseElementNoTypeChange<Type>(obj, hi, origlo);
+        if (origlo.isMagic(JS_ELEMENTS_HOLE) &&
+            !SuppressDeletedProperty(cx, obj, INT_TO_JSID(hi)))
+        {
+            return DenseElementResult::Failure;
+        }
+    }
 
-        RootedValue origlo(cx), orighi(cx);
+    return DenseElementResult::Success;
+}
 
-        uint32_t lo = 0, hi = len - 1;
-        for (; lo < hi; lo++, hi--) {
-            origlo = arr->getDenseElement(lo);
-            orighi = arr->getDenseElement(hi);
-            arr->setDenseElement(lo, orighi);
-            if (orighi.isMagic(JS_ELEMENTS_HOLE) &&
-                !SuppressDeletedProperty(cx, arr, INT_TO_JSID(lo)))
-            {
-                return false;
-            }
-            arr->setDenseElement(hi, origlo);
-            if (origlo.isMagic(JS_ELEMENTS_HOLE) &&
-                !SuppressDeletedProperty(cx, arr, INT_TO_JSID(hi)))
-            {
-                return false;
-            }
-        }
+DefineBoxedOrUnboxedFunctor3(ArrayReverseDenseKernel,
+                             JSContext*, HandleObject, uint32_t);
 
-        /*
-         * Per ECMA-262, don't update the length of the array, even if the new
-         * array has trailing holes (and thus the original array began with
-         * holes).
-         */
-        args.rval().setObject(*arr);
-        return true;
-    } while (false);
+static bool
+array_reverse(JSContext* cx, unsigned argc, Value* vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+    RootedObject obj(cx, ToObject(cx, args.thisv()));
+    if (!obj)
+        return false;
+
+    uint32_t len;
+    if (!GetLengthProperty(cx, obj, &len))
+        return false;
+
+    if (!ObjectMayHaveExtraIndexedProperties(obj)) {
+        ArrayReverseDenseKernelFunctor functor(cx, obj, len);
+        DenseElementResult result = CallBoxedOrUnboxedSpecialization(functor, obj);
+        if (result != DenseElementResult::Incomplete) {
+            /*
+             * Per ECMA-262, don't update the length of the array, even if the new
+             * array has trailing holes (and thus the original array began with
+             * holes).
+             */
+            args.rval().setObject(*obj);
+            return result == DenseElementResult::Success;
+        }
+    }
 
     RootedValue lowval(cx), hival(cx);
     for (uint32_t i = 0, half = len / 2; i < half; i++) {
@@ -2026,37 +2001,25 @@
     if (!GetLengthProperty(cx, obj, &length))
         return false;
 
-    /* Fast path for native objects with dense elements. */
-    do {
-        if (!obj->isNative() || IsAnyTypedArray(obj.get()))
-            break;
-
-        if (obj->is<ArrayObject>() && !obj->as<ArrayObject>().lengthIsWritable())
-            break;
-
-        if (ObjectMayHaveExtraIndexedProperties(obj))
-            break;
-
-        uint32_t argCount = args.length();
-        NativeObject::EnsureDenseResult result =
-            obj->as<NativeObject>().ensureDenseElements(cx, length, argCount);
-        if (result == NativeObject::ED_FAILED)
-            return false;
+    if (!ObjectMayHaveExtraIndexedProperties(obj)) {
+        DenseElementResult result =
+            SetOrExtendAnyBoxedOrUnboxedDenseElements(cx, obj, length,
+                                                      args.array(), args.length(), UpdateTypes);
+        if (result != DenseElementResult::Incomplete) {
+            if (result == DenseElementResult::Failure)
+                return false;
 
-        if (result == NativeObject::ED_OK) {
-            for (uint32_t i = 0, index = length; i < argCount; index++, i++)
-                obj->as<NativeObject>().setDenseElementWithType(cx, index, args[i]);
-            uint32_t newlength = length + argCount;
+            uint32_t newlength = length + args.length();
             args.rval().setNumber(newlength);
-            if (obj->is<ArrayObject>()) {
-                obj->as<ArrayObject>().setLengthInt32(newlength);
-                return true;
-            }
-            return SetLengthProperty(cx, obj, newlength);
-        }
 
-        MOZ_ASSERT(result == NativeObject::ED_SPARSE);
-    } while (false);
+            // SetOrExtendAnyBoxedOrUnboxedDenseElements takes care of updating the
+            // length for boxed and unboxed arrays. Handle updates to the length of
+            // non-arrays here.
+            if (!IsArray(obj, cx))
+                return SetLengthProperty(cx, obj, newlength);
+            return true;
+        }
+    }
 
     /* Steps 4-5. */
     if (!InitArrayElements(cx, obj, length, args.length(), args.array(), UpdateTypes))
@@ -2120,6 +2083,33 @@
     obj->moveDenseElementsNoPreBarrier(0, 1, initlen);
 }
 
+template <JSValueType Type>
+DenseElementResult
+ArrayShiftDenseKernel(JSContext* cx, JSObject* obj, Value* rval)
+{
+    if (ObjectMayHaveExtraIndexedProperties(obj))
+        return DenseElementResult::Incomplete;
+
+    size_t initlen = GetBoxedOrUnboxedInitializedLength<Type>(obj);
+    if (initlen == 0)
+        return DenseElementResult::Incomplete;
+
+    *rval = GetBoxedOrUnboxedDenseElement<Type>(obj, 0);
+    if (rval->isMagic(JS_ELEMENTS_HOLE))
+        rval->setUndefined();
+
+    DenseElementResult result = MoveBoxedOrUnboxedDenseElements<Type>(cx, obj, 0, 1, initlen - 1);
+    MOZ_ASSERT(result != DenseElementResult::Incomplete);
+    if (result == DenseElementResult::Failure)
+        return DenseElementResult::Failure;
+
+    SetBoxedOrUnboxedInitializedLength<Type>(cx, obj, initlen - 1);
+    return DenseElementResult::Success;
+}
+
+DefineBoxedOrUnboxedFunctor3(ArrayShiftDenseKernel,
+                             JSContext*, JSObject*, Value*);
+
 /* ES5 15.4.4.9 */
 bool
 js::array_shift(JSContext* cx, unsigned argc, Value* vp)
@@ -2150,27 +2140,16 @@
     uint32_t newlen = len - 1;
 
     /* Fast paths. */
-    if (obj->is<ArrayObject>()) {
-        ArrayObject* aobj = &obj->as<ArrayObject>();
-        if (aobj->getDenseInitializedLength() > 0 &&
-            newlen < aobj->getDenseCapacity() &&
-            !ObjectMayHaveExtraIndexedProperties(aobj))
-        {
-            args.rval().set(aobj->getDenseElement(0));
-            if (args.rval().isMagic(JS_ELEMENTS_HOLE))
-                args.rval().setUndefined();
-
-            if (!aobj->maybeCopyElementsForWrite(cx))
-                return false;
-
-            aobj->moveDenseElements(0, 1, aobj->getDenseInitializedLength() - 1);
-            aobj->setDenseInitializedLength(aobj->getDenseInitializedLength() - 1);
+    ArrayShiftDenseKernelFunctor functor(cx, obj, args.rval().address());
+    DenseElementResult result = CallBoxedOrUnboxedSpecialization(functor, obj);
+    if (result != DenseElementResult::Incomplete) {
+        if (result == DenseElementResult::Failure)
+            return false;
 
-            if (!SetLengthProperty(cx, obj, newlen))
-                return false;
+        if (!SetLengthProperty(cx, obj, newlen))
+            return false;
 
-            return SuppressDeletedProperty(cx, obj, INT_TO_JSID(newlen));
-        }
+        return SuppressDeletedProperty(cx, obj, INT_TO_JSID(newlen));
     }
 
     /* Steps 5, 10. */
@@ -2218,6 +2197,9 @@
     if (args.length() > 0) {
         /* Slide up the array to make room for all args at the bottom. */
         if (length > 0) {
+            // Only include a fast path for boxed arrays. Unboxed arrays can'nt
+            // be optimized here because unshifting temporarily places holes at
+            // the start of the array.
             bool optimized = false;
             do {
                 if (!obj->is<ArrayObject>())
@@ -2227,12 +2209,11 @@
                 ArrayObject* aobj = &obj->as<ArrayObject>();
                 if (!aobj->lengthIsWritable())
                     break;
-                NativeObject::EnsureDenseResult result =
-                    aobj->ensureDenseElements(cx, length, args.length());
-                if (result != NativeObject::ED_OK) {
-                    if (result == NativeObject::ED_FAILED)
+                DenseElementResult result = aobj->ensureDenseElements(cx, length, args.length());
+                if (result != DenseElementResult::Success) {
+                    if (result == DenseElementResult::Failure)
                         return false;
-                    MOZ_ASSERT(result == NativeObject::ED_SPARSE);
+                    MOZ_ASSERT(result == DenseElementResult::Incomplete);
                     break;
                 }
                 aobj->moveDenseElements(args.length(), 0, length);
@@ -2277,30 +2258,89 @@
     return true;
 }
 
-static inline void
-TryReuseArrayGroup(JSObject* obj, ArrayObject* narr)
+// Return a new array with the default prototype and specified allocated
+// capacity and length. If possible, try to reuse the group of the input
+// object. The resulting array will have the same boxed/unboxed elements
+// representation as the input object, and will either reuse the input
+// object's group or will have unknown property types.
+static inline JSObject*
+NewFullyAllocatedArrayTryReuseGroup(JSContext* cx, JSObject* obj, size_t length)
 {
-    /*
-     * Try to change the group of a newly created array narr to the same group
-     * as obj. This can only be performed if the original object is an array
-     * and has the same prototype.
-     */
-    MOZ_ASSERT(ObjectGroup::hasDefaultNewGroup(narr->getProto(), &ArrayObject::class_, narr->group()));
+    if (!obj->is<ArrayObject>() && !obj->is<UnboxedArrayObject>())
+        return NewDenseFullyAllocatedArray(cx, length);
 
-    if (obj->is<ArrayObject>() &&
-        !obj->isSingleton() &&
-        !obj->group()->hasUnanalyzedPreliminaryObjects() &&
-        obj->getProto() == narr->getProto())
-    {
-        narr->setGroup(obj->group());
+    if (obj->getProto() != cx->global()->maybeGetArrayPrototype())
+        return NewDenseFullyAllocatedArray(cx, length);
+
+    RootedObjectGroup group(cx, obj->getGroup(cx));
+    if (!group)
+        return nullptr;
+
+    if (group->maybePreliminaryObjects())
+        group->maybePreliminaryObjects()->maybeAnalyze(cx, group);
+
+    NewObjectKind newKind = GenericObject;
+    if (group->shouldPreTenure() || group->maybePreliminaryObjects())
+        newKind = TenuredObject;
+
+    if (group->maybeUnboxedLayout()) {
+        if (length > UnboxedArrayObject::MaximumCapacity)
+            return NewDenseFullyAllocatedArray(cx, length, nullptr, newKind);
+
+        return UnboxedArrayObject::create(cx, group, length, newKind);
     }
+
+    ArrayObject* res = NewDenseFullyAllocatedArray(cx, length, nullptr, newKind);
+    if (!res)
+        return nullptr;
+
+    res->setGroup(group);
+
+    if (PreliminaryObjectArray* preliminaryObjects = group->maybePreliminaryObjects())
+        preliminaryObjects->registerNewObject(res);
+
+    return res;
+}
+
+// As above, except this might not allocate space up to |length| and will
+// definitely return a normal boxed array, instead of an unboxed array. This
+// should be used when the result might need sparse elements.
+static inline ArrayObject*
+NewPartlyAllocatedArrayTryReuseGroup(JSContext* cx, JSObject* obj, size_t length)
+{
+    if (!obj->is<ArrayObject>() && !obj->is<UnboxedArrayObject>())
+        return NewDensePartlyAllocatedArray(cx, length);
+
+    if (obj->getProto() != cx->global()->maybeGetArrayPrototype())
+        return NewDensePartlyAllocatedArray(cx, length);
+
+    RootedObjectGroup group(cx, obj->getGroup(cx));
+    if (!group)
+        return nullptr;
+
+    if (group->maybePreliminaryObjects())
+        group->maybePreliminaryObjects()->maybeAnalyze(cx, group);
+
+    NewObjectKind newKind = GenericObject;
+    if (group->shouldPreTenure() || group->maybePreliminaryObjects())
+        newKind = TenuredObject;
+
+    if (group->maybeUnboxedLayout())
+        return NewDensePartlyAllocatedArray(cx, length, nullptr, newKind);
+
+    ArrayObject* res = NewDensePartlyAllocatedArray(cx, length, nullptr, newKind);
+    if (!res)
+        return nullptr;
+
+    res->setGroup(group);
+    return res;
 }
 
 /*
- * Returns true if this is a dense array whose |count| properties starting from
- * |startingIndex| may be accessed (get, set, delete) directly through its
- * contiguous vector of elements without fear of getters, setters, etc. along
- * the prototype chain, or of enumerators requiring notification of
+ * Returns true if this is a dense or unboxed array whose |count| properties
+ * starting from |startingIndex| may be accessed (get, set, delete) directly
+ * through its contiguous vector of elements without fear of getters, setters,
+ * etc. along the prototype chain, or of enumerators requiring notification of
  * modifications.
  */
 static inline bool
@@ -2311,33 +2351,35 @@
         return false;
 
     /* There's no optimizing possible if it's not an array. */
-    if (!arr->is<ArrayObject>())
+    if (!arr->is<ArrayObject>() && !arr->is<UnboxedArrayObject>())
         return false;
 
     /*
      * Don't optimize if the array might be in the midst of iteration.  We
      * rely on this to be able to safely move dense array elements around with
-     * just a memmove (see JSObject::moveDenseArrayElements), without worrying
+     * just a memmove (see NativeObject::moveDenseArrayElements), without worrying
      * about updating any in-progress enumerators for properties implicitly
      * deleted if a hole is moved from one location to another location not yet
      * visited.  See bug 690622.
-     *
-     * Another potential wrinkle: what if the enumeration is happening on an
-     * object which merely has |arr| on its prototype chain?  It turns out this
-     * case can't happen, because any dense array used as the prototype of
-     * another object is first slowified, for type inference's sake.
      */
     ObjectGroup* arrGroup = arr->getGroup(cx);
     if (MOZ_UNLIKELY(!arrGroup || arrGroup->hasAllFlags(OBJECT_FLAG_ITERATED)))
         return false;
 
     /*
+     * Another potential wrinkle: what if the enumeration is happening on an
+     * object which merely has |arr| on its prototype chain?
+     */
+    if (arr->isDelegate())
+        return false;
+
+    /*
      * Now watch out for getters and setters along the prototype chain or in
      * other indexed properties on the object.  (Note that non-writable length
      * is subsumed by the initializedLength comparison.)
      */
     return !ObjectMayHaveExtraIndexedProperties(arr) &&
-           startingIndex + count <= arr->as<ArrayObject>().getDenseInitializedLength();
+           startingIndex + count <= GetAnyBoxedOrUnboxedInitializedLength(arr);
 }
 
 /* ES5 15.4.4.12. */
@@ -2393,19 +2435,20 @@
     MOZ_ASSERT(len - actualStart >= actualDeleteCount);
 
     /* Steps 2, 8-9. */
-    Rooted<ArrayObject*> arr(cx);
+    RootedObject arr(cx);
     if (CanOptimizeForDenseStorage(obj, actualStart, actualDeleteCount, cx)) {
         if (returnValueIsUsed) {
-            arr = NewDenseCopiedArray(cx, actualDeleteCount, obj.as<ArrayObject>(), actualStart);
+            arr = NewFullyAllocatedArrayTryReuseGroup(cx, obj, actualDeleteCount);
             if (!arr)
                 return false;
-            TryReuseArrayGroup(obj, arr);
+            DebugOnly<DenseElementResult> result =
+                CopyAnyBoxedOrUnboxedDenseElements(cx, arr, obj, actualStart, actualDeleteCount);
+            MOZ_ASSERT(result.value == DenseElementResult::Success);
         }
     } else {
-        arr = NewDenseFullyAllocatedArray(cx, actualDeleteCount);
+        arr = NewFullyAllocatedArrayTryReuseGroup(cx, obj, actualDeleteCount);
         if (!arr)
             return false;
-        TryReuseArrayGroup(obj, arr);
 
         RootedValue fromValue(cx);
         for (uint32_t k = 0; k < actualDeleteCount; k++) {
@@ -2429,22 +2472,16 @@
         uint32_t finalLength = len - actualDeleteCount + itemCount;
 
         if (CanOptimizeForDenseStorage(obj, 0, len, cx)) {
-            ArrayObject* aobj = &obj->as<ArrayObject>();
-
-            if (!aobj->maybeCopyElementsForWrite(cx))
-                return false;
-
             /* Steps 12(a)-(b). */
-            aobj->moveDenseElements(targetIndex, sourceIndex, len - sourceIndex);
-
-            /*
-             * Update the initialized length. Do so before shrinking so that we
-             * can apply the write barrier to the old slots.
-             */
-            aobj->setDenseInitializedLength(finalLength);
+            DenseElementResult result =
+                MoveAnyBoxedOrUnboxedDenseElements(cx, obj, targetIndex, sourceIndex,
+                                                   len - sourceIndex);
+            MOZ_ASSERT(result != DenseElementResult::Incomplete);
+            if (result == DenseElementResult::Failure)
+                return false;
 
             /* Steps 12(c)-(d). */
-            aobj->shrinkElements(cx, finalLength);
+            SetAnyBoxedOrUnboxedInitializedLength(cx, obj, finalLength);
         } else {
             /*
              * This is all very slow if the length is very large. We don't yet
@@ -2507,21 +2544,24 @@
         if (obj->is<ArrayObject>()) {
             Rooted<ArrayObject*> arr(cx, &obj->as<ArrayObject>());
             if (arr->lengthIsWritable()) {
-                NativeObject::EnsureDenseResult res =
+                DenseElementResult result =
                     arr->ensureDenseElements(cx, arr->length(), itemCount - actualDeleteCount);
-                if (res == NativeObject::ED_FAILED)
+                if (result == DenseElementResult::Failure)
                     return false;
             }
         }
 
         if (CanOptimizeForDenseStorage(obj, len, itemCount - actualDeleteCount, cx)) {
-            ArrayObject* aobj = &obj->as<ArrayObject>();
-            if (!aobj->maybeCopyElementsForWrite(cx))
+            DenseElementResult result =
+                MoveAnyBoxedOrUnboxedDenseElements(cx, obj, actualStart + itemCount,
+                                                   actualStart + actualDeleteCount,
+                                                   len - (actualStart + actualDeleteCount));
+            MOZ_ASSERT(result != DenseElementResult::Incomplete);
+            if (result == DenseElementResult::Failure)
                 return false;
-            aobj->moveDenseElements(actualStart + itemCount,
-                                    actualStart + actualDeleteCount,
-                                    len - (actualStart + actualDeleteCount));
-            aobj->setDenseInitializedLength(len + itemCount - actualDeleteCount);
+
+            /* Steps 12(c)-(d). */
+            SetAnyBoxedOrUnboxedInitializedLength(cx, obj, len + itemCount - actualDeleteCount);
         } else {
             RootedValue fromValue(cx);
             for (double k = len - actualDeleteCount; k > actualStart; k--) {
@@ -2608,16 +2648,22 @@
     if (!aobj)
         return false;
 
-    Rooted<ArrayObject*> narr(cx);
+    RootedObject narr(cx);
     uint32_t length;
-    if (aobj->is<ArrayObject>() && !aobj->isIndexed()) {
-        length = aobj->as<ArrayObject>().length();
-        uint32_t initlen = aobj->as<ArrayObject>().getDenseInitializedLength();
-        narr = NewDenseCopiedArray(cx, initlen, aobj.as<ArrayObject>(), 0);
+    if (IsArray(aobj, cx) && !ObjectMayHaveExtraIndexedProperties(aobj)) {
+        if (!GetLengthProperty(cx, aobj, &length))
+            return false;
+
+        size_t initlen = GetAnyBoxedOrUnboxedInitializedLength(aobj);
+        narr = NewFullyAllocatedArrayTryReuseGroup(cx, aobj, initlen);
         if (!narr)
             return false;
-        TryReuseArrayGroup(aobj, narr);
-        narr->setLength(cx, length);
+        SetAnyBoxedOrUnboxedArrayLength(cx, narr, length);
+
+        DebugOnly<DenseElementResult> result =
+            CopyAnyBoxedOrUnboxedDenseElements(cx, narr, aobj, 0, initlen);
+        MOZ_ASSERT(result.value == DenseElementResult::Success);
+
         args.rval().setObject(*narr);
         if (argc == 0)
             return true;
@@ -2858,38 +2904,38 @@
     if (begin > end)
         begin = end;
 
-    Rooted<ArrayObject*> narr(cx);
+    if (!ObjectMayHaveExtraIndexedProperties(obj)) {
+        size_t initlen = GetAnyBoxedOrUnboxedInitializedLength(obj);
+        size_t count = 0;
+        if (initlen > begin)
+            count = Min<size_t>(initlen - begin, end - begin);
 
-    if (obj->is<ArrayObject>() && !ObjectMayHaveExtraIndexedProperties(obj)) {
-        narr = NewDenseFullyAllocatedArray(cx, end - begin);
+        RootedObject narr(cx, NewFullyAllocatedArrayTryReuseGroup(cx, obj, count));
         if (!narr)
             return false;
-        TryReuseArrayGroup(obj, narr);
+        SetAnyBoxedOrUnboxedArrayLength(cx, narr, end - begin);
 
-        ArrayObject* aobj = &obj->as<ArrayObject>();
-        if (aobj->getDenseInitializedLength() > begin) {
-            uint32_t numSourceElements = aobj->getDenseInitializedLength() - begin;
-            uint32_t initLength = Min(numSourceElements, end - begin);
-            narr->setDenseInitializedLength(initLength);
-            narr->initDenseElements(0, &aobj->getDenseElement(begin), initLength);
+        if (count) {
+            DebugOnly<DenseElementResult> result =
+                CopyAnyBoxedOrUnboxedDenseElements(cx, narr, obj, begin, count);
+            MOZ_ASSERT(result.value == DenseElementResult::Success);
         }
         args.rval().setObject(*narr);
         return true;
     }
 
-    narr = NewDensePartlyAllocatedArray(cx, end - begin);
+    RootedArrayObject narr(cx, NewPartlyAllocatedArrayTryReuseGroup(cx, obj, end - begin));
     if (!narr)
         return false;
-    TryReuseArrayGroup(obj, narr);
 
     if (js::GetElementsOp op = obj->getOps()->getElements) {
         // Ensure that we have dense elements, so that ElementAdder::append can
         // use setDenseElementWithType.
-        NativeObject::EnsureDenseResult result = narr->ensureDenseElements(cx, 0, end - begin);
-        if (result == NativeObject::ED_FAILED)
-             return false;
+        DenseElementResult result = narr->ensureDenseElements(cx, 0, end - begin);
+        if (result == DenseElementResult::Failure)
+            return false;
 
-        if (result == NativeObject::ED_OK) {
+        if (result == DenseElementResult::Success) {
             ElementAdder adder(cx, narr, end - begin, ElementAdder::CheckHasElemPreserveHoles);
             if (!op(cx, obj, begin, end, &adder))
                 return false;
@@ -2899,7 +2945,7 @@
         }
 
         // Fallthrough
-        MOZ_ASSERT(result == NativeObject::ED_SPARSE);
+        MOZ_ASSERT(result == DenseElementResult::Incomplete);
     }
 
     if (obj->isNative() && obj->isIndexed() && end - begin > 1000) {
@@ -3026,14 +3072,18 @@
 static bool
 ArrayFromCallArgs(JSContext* cx, HandleObjectGroup group, CallArgs& args)
 {
-    if (!InitArrayTypes(cx, group, nullptr, args.array(), args.length()))
-        return false;
-    JSObject* obj = (args.length() == 0)
-        ? NewDenseEmptyArray(cx)
-        : NewDenseCopiedArray(cx, args.length(), args.array());
+    JSObject* obj = NewDenseFullyAllocatedArray(cx, args.length());
     if (!obj)
         return false;
     obj->setGroup(group);
+
+    DenseElementResult result =
+        SetOrExtendAnyBoxedOrUnboxedDenseElements(cx, obj, 0, args.array(), args.length(),
+                                                  UpdateTypes);
+    if (result == DenseElementResult::Failure)
+        return false;
+    MOZ_ASSERT(result == DenseElementResult::Success);
+
     args.rval().setObject(*obj);
     return true;
 }
@@ -3380,7 +3430,7 @@
 }
 
 ArrayObject * JS_FASTCALL
-js::NewDenseEmptyArray(JSContext* cx, HandleObject proto /* = NullPtr() */,
+js::NewDenseEmptyArray(JSContext* cx, HandleObject proto /* = nullptr */,
                        NewObjectKind newKind /* = GenericObject */)
 {
     return NewArray<0>(cx, 0, proto, newKind);
@@ -3388,7 +3438,7 @@
 
 ArrayObject * JS_FASTCALL
 js::NewDenseFullyAllocatedArray(ExclusiveContext* cx, uint32_t length,
-                                HandleObject proto /* = NullPtr() */,
+                                HandleObject proto /* = nullptr */,
                                 NewObjectKind newKind /* = GenericObject */)
 {
     return NewArray<NativeObject::NELEMENTS_LIMIT>(cx, length, proto, newKind);
@@ -3396,7 +3446,7 @@
 
 ArrayObject * JS_FASTCALL
 js::NewDensePartlyAllocatedArray(ExclusiveContext* cx, uint32_t length,
-                                 HandleObject proto /* = NullPtr() */,
+                                 HandleObject proto /* = nullptr */,
                                  NewObjectKind newKind /* = GenericObject */)
 {
     return NewArray<ArrayObject::EagerAllocationMaxLength>(cx, length, proto, newKind);
@@ -3404,7 +3454,7 @@
 
 ArrayObject * JS_FASTCALL
 js::NewDenseUnallocatedArray(ExclusiveContext* cx, uint32_t length,
-                             HandleObject proto /* = NullPtr() */,
+                             HandleObject proto /* = nullptr */,
                              NewObjectKind newKind /* = GenericObject */)
 {
     return NewArray<0>(cx, length, proto, newKind);
@@ -3420,12 +3470,12 @@
 
     ArrayObject* arr;
     if (allocating == NewArray_Unallocating) {
-        arr = NewDenseUnallocatedArray(cx, length, NullPtr(), newKind);
+        arr = NewDenseUnallocatedArray(cx, length, nullptr, newKind);
     } else if (allocating == NewArray_PartlyAllocating) {
-        arr = NewDensePartlyAllocatedArray(cx, length, NullPtr(), newKind);
+        arr = NewDensePartlyAllocatedArray(cx, length, nullptr, newKind);
     } else {
         MOZ_ASSERT(allocating == NewArray_FullyAllocating);
-        arr = NewDenseFullyAllocatedArray(cx, length, NullPtr(), newKind);
+        arr = NewDenseFullyAllocatedArray(cx, length, nullptr, newKind);
     }
     if (!arr)
         return nullptr;
@@ -3446,7 +3496,7 @@
 
 ArrayObject*
 js::NewDenseCopiedArray(JSContext* cx, uint32_t length, HandleArrayObject src,
-                        uint32_t elementOffset, HandleObject proto /* = NullPtr() */)
+                        uint32_t elementOffset, HandleObject proto /* = nullptr */)
 {
     MOZ_ASSERT(!src->isIndexed());
 
@@ -3457,10 +3507,8 @@
     MOZ_ASSERT(arr->getDenseCapacity() >= length);
 
     const Value* vp = src->getDenseElements() + elementOffset;
-    arr->setDenseInitializedLength(vp ? length : 0);
-
-    if (vp)
-        arr->initDenseElements(0, vp, length);
+    arr->setDenseInitializedLength(length);
+    arr->initDenseElements(0, vp, length);
 
     return arr;
 }
@@ -3468,7 +3516,7 @@
 // values must point at already-rooted Value objects
 ArrayObject*
 js::NewDenseCopiedArray(JSContext* cx, uint32_t length, const Value* values,
-                        HandleObject proto /* = NullPtr() */,
+                        HandleObject proto /* = nullptr */,
                         NewObjectKind newKind /* = GenericObject */)
 {
     ArrayObject* arr = NewArray<NativeObject::NELEMENTS_LIMIT>(cx, length, proto);
@@ -3533,7 +3581,7 @@
         RootedValue arg(cx, args[i]);
 
         UniquePtr<char[], JS::FreePolicy> bytes =
-            DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, arg, NullPtr());
+            DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, arg, nullptr);
         if (!bytes)
             return false;
         if (arg.isPrimitive() ||
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsarray.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsarray.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsarray.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsarray.h	2015-05-25 20:43:24.000000000 +0000
@@ -39,7 +39,7 @@
 
 /* Create a dense array with no capacity allocated, length set to 0. */
 extern ArrayObject * JS_FASTCALL
-NewDenseEmptyArray(JSContext* cx, HandleObject proto = NullPtr(),
+NewDenseEmptyArray(JSContext* cx, HandleObject proto = nullptr,
                    NewObjectKind newKind = GenericObject);
 
 /*
@@ -47,7 +47,7 @@
  * contents. This is useful, e.g., when accepting length from the user.
  */
 extern ArrayObject * JS_FASTCALL
-NewDenseUnallocatedArray(ExclusiveContext* cx, uint32_t length, HandleObject proto = NullPtr(),
+NewDenseUnallocatedArray(ExclusiveContext* cx, uint32_t length, HandleObject proto = nullptr,
                          NewObjectKind newKind = GenericObject);
 
 /*
@@ -55,12 +55,12 @@
  * but with only |EagerAllocationMaxLength| elements allocated.
  */
 extern ArrayObject * JS_FASTCALL
-NewDensePartlyAllocatedArray(ExclusiveContext* cx, uint32_t length, HandleObject proto = NullPtr(),
+NewDensePartlyAllocatedArray(ExclusiveContext* cx, uint32_t length, HandleObject proto = nullptr,
                              NewObjectKind newKind = GenericObject);
 
 /* Create a dense array with length and capacity == 'length', initialized length set to 0. */
 extern ArrayObject * JS_FASTCALL
-NewDenseFullyAllocatedArray(ExclusiveContext* cx, uint32_t length, HandleObject proto = NullPtr(),
+NewDenseFullyAllocatedArray(ExclusiveContext* cx, uint32_t length, HandleObject proto = nullptr,
                             NewObjectKind newKind = GenericObject);
 
 enum AllocatingBehaviour {
@@ -80,12 +80,12 @@
 /* Create a dense array with a copy of the dense array elements in src. */
 extern ArrayObject*
 NewDenseCopiedArray(JSContext* cx, uint32_t length, HandleArrayObject src,
-                    uint32_t elementOffset, HandleObject proto = NullPtr());
+                    uint32_t elementOffset, HandleObject proto = nullptr);
 
 /* Create a dense array from the given array values, which must be rooted */
 extern ArrayObject*
 NewDenseCopiedArray(JSContext* cx, uint32_t length, const Value* values,
-                    HandleObject proto = NullPtr(), NewObjectKind newKind = GenericObject);
+                    HandleObject proto = nullptr, NewObjectKind newKind = GenericObject);
 
 /* Create a dense array based on templateObject with the given length. */
 extern ArrayObject*
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsast.tbl firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsast.tbl
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsast.tbl	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsast.tbl	2015-05-25 20:43:24.000000000 +0000
@@ -37,7 +37,6 @@
 ASTDEF(AST_COMP_EXPR,             "ComprehensionExpression",        "comprehensionExpression")
 ASTDEF(AST_GENERATOR_EXPR,        "GeneratorExpression",            "generatorExpression")
 ASTDEF(AST_YIELD_EXPR,            "YieldExpression",                "yieldExpression")
-ASTDEF(AST_LET_EXPR,              "LetExpression",                  "letExpression")
 ASTDEF(AST_CLASS_EXPR,            "ClassExpression",                "classExpression")
 
 ASTDEF(AST_EMPTY_STMT,            "EmptyStatement",                 "emptyStatement")
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jscompartment.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jscompartment.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jscompartment.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jscompartment.cpp	2015-05-25 20:43:24.000000000 +0000
@@ -223,7 +223,7 @@
             key.kind == CrossCompartmentKey::DebuggerSource)
         {
             MOZ_ASSERT(IsInsideNursery(key.wrapped) ||
-                       key.wrapped->asTenured().getTraceKind() == JSTRACE_OBJECT);
+                       key.wrapped->asTenured().getTraceKind() == JS::TraceKind::Object);
             TraceManuallyBarrieredEdge(trc, reinterpret_cast<JSObject**>(&key.wrapped),
                                        "CCW wrapped object");
         }
@@ -624,17 +624,17 @@
           case CrossCompartmentKey::DebuggerEnvironment:
           case CrossCompartmentKey::DebuggerSource:
               MOZ_ASSERT(IsInsideNursery(key.wrapped) ||
-                         key.wrapped->asTenured().getTraceKind() == JSTRACE_OBJECT);
+                         key.wrapped->asTenured().getTraceKind() == JS::TraceKind::Object);
               keyDying = IsAboutToBeFinalizedUnbarriered(
                   reinterpret_cast<JSObject**>(&key.wrapped));
               break;
           case CrossCompartmentKey::StringWrapper:
-              MOZ_ASSERT(key.wrapped->asTenured().getTraceKind() == JSTRACE_STRING);
+              MOZ_ASSERT(key.wrapped->asTenured().getTraceKind() == JS::TraceKind::String);
               keyDying = IsAboutToBeFinalizedUnbarriered(
                   reinterpret_cast<JSString**>(&key.wrapped));
               break;
           case CrossCompartmentKey::DebuggerScript:
-              MOZ_ASSERT(key.wrapped->asTenured().getTraceKind() == JSTRACE_SCRIPT);
+              MOZ_ASSERT(key.wrapped->asTenured().getTraceKind() == JS::TraceKind::Script);
               keyDying = IsAboutToBeFinalizedUnbarriered(
                   reinterpret_cast<JSScript**>(&key.wrapped));
               break;
@@ -749,10 +749,8 @@
 }
 
 static bool
-CreateLazyScriptsForCompartment(JSContext* cx)
+AddLazyFunctionsForCompartment(JSContext* cx, AutoObjectVector& lazyFunctions, AllocKind kind)
 {
-    AutoObjectVector lazyFunctions(cx);
-
     // Find all live root lazy functions in the compartment: those which have a
     // source object, indicating that they have a parent, and which do not have
     // an uncompiled enclosing script. The last condition is so that we don't
@@ -762,12 +760,8 @@
     // Some LazyScripts have a non-null |JSScript* script| pointer. We still
     // want to delazify in that case: this pointer is weak so the JSScript
     // could be destroyed at the next GC.
-    //
-    // Note that while we ideally iterate over LazyScripts, LazyScripts do not
-    // currently stand in 1-1 relation with JSScripts; JSFunctions with the
-    // same LazyScript may create different JSScripts due to relazification of
-    // clones. See bug 1105306.
-    for (gc::ZoneCellIter i(cx->zone(), AllocKind::FUNCTION); !i.done(); i.next()) {
+
+    for (gc::ZoneCellIter i(cx->zone(), kind); !i.done(); i.next()) {
         JSFunction* fun = &i.get<JSObject>()->as<JSFunction>();
 
         // Sweeping is incremental; take care to not delazify functions that
@@ -788,6 +782,22 @@
         }
     }
 
+    return true;
+}
+
+static bool
+CreateLazyScriptsForCompartment(JSContext* cx)
+{
+    AutoObjectVector lazyFunctions(cx);
+
+    if (!AddLazyFunctionsForCompartment(cx, lazyFunctions, AllocKind::FUNCTION))
+        return false;
+
+    // Methods, for instance {get method() {}}, are extended functions that can
+    // be relazified, so we need to handle those as well.
+    if (!AddLazyFunctionsForCompartment(cx, lazyFunctions, AllocKind::FUNCTION_EXTENDED))
+        return false;
+
     // Create scripts for each lazy function, updating the list of functions to
     // process with any newly exposed inner functions in created scripts.
     // A function cannot be delazified until its outer script exists.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jscompartment.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jscompartment.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jscompartment.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jscompartment.h	2015-05-25 20:43:24.000000000 +0000
@@ -383,11 +383,11 @@
     void markCrossCompartmentWrappers(JSTracer* trc);
 
     inline bool wrap(JSContext* cx, JS::MutableHandleValue vp,
-                     JS::HandleObject existing = js::NullPtr());
+                     JS::HandleObject existing = nullptr);
 
     bool wrap(JSContext* cx, js::MutableHandleString strp);
     bool wrap(JSContext* cx, JS::MutableHandleObject obj,
-              JS::HandleObject existingArg = js::NullPtr());
+              JS::HandleObject existingArg = nullptr);
     bool wrap(JSContext* cx, JS::MutableHandle<js::PropertyDescriptor> desc);
 
     template<typename T> bool wrap(JSContext* cx, JS::AutoVectorRooter<T>& vec) {
@@ -586,7 +586,7 @@
         DeprecatedLegacyGenerator = 2,      // JS 1.7+
         DeprecatedExpressionClosure = 3,    // Added in JS 1.8
         DeprecatedLetBlock = 4,             // Added in JS 1.7
-        DeprecatedLetExpression = 5,        // Added in JS 1.7
+        // NO LONGER USING 5
         DeprecatedNoSuchMethod = 6,         // JS 1.7+
         DeprecatedFlagsArgument = 7,        // JS 1.3 or older
         RegExpSourceProperty = 8,           // ES5
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsdate.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsdate.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsdate.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsdate.cpp	2015-05-25 20:43:24.000000000 +0000
@@ -2869,18 +2869,26 @@
 }
 #endif
 
-MOZ_ALWAYS_INLINE bool
-date_toString_impl(JSContext* cx, CallArgs args)
-{
-    return date_format(cx, args.thisv().toObject().as<DateObject>().UTCTime().toNumber(),
-                       FORMATSPEC_FULL, args.rval());
-}
-
+// ES6 final draft 20.3.4.41.
 static bool
 date_toString(JSContext* cx, unsigned argc, Value* vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    return CallNonGenericMethod<IsDate, date_toString_impl>(cx, args);
+    // Step 2.a. (reordered)
+    double tv = GenericNaN();
+    if (args.thisv().isObject()) {
+        // Step 1.
+        RootedObject obj(cx, &args.thisv().toObject());
+        // Step 2.
+        if (ObjectClassIs(obj, ESClass_Date, cx)) {
+            // Step 3.a.
+            RootedValue unboxed(cx);
+            Unbox(cx, obj, &unboxed);
+            tv = unboxed.toNumber();
+        }
+    }
+    // Step 4.
+    return date_format(cx, tv, FORMATSPEC_FULL, args.rval());
 }
 
 MOZ_ALWAYS_INLINE bool
@@ -3119,11 +3127,16 @@
     return DateMultipleArguments(cx, args);
 }
 
+// ES6 final draft 20.3.4.
+static JSObject*
+CreateDatePrototype(JSContext* cx, JSProtoKey key)
+{
+    return cx->global()->createBlankPrototype(cx, &DateObject::protoClass_);
+}
+
 static bool
 FinishDateClassInit(JSContext* cx, HandleObject ctor, HandleObject proto)
 {
-    proto->as<DateObject>().setUTCTime(ClippedTime::NaN());
-
     /*
      * Date.prototype.toGMTString has the same initial value as
      * Date.prototype.toUTCString.
@@ -3131,8 +3144,8 @@
     RootedValue toUTCStringFun(cx);
     RootedId toUTCStringId(cx, NameToId(cx->names().toUTCString));
     RootedId toGMTStringId(cx, NameToId(cx->names().toGMTString));
-    return NativeGetProperty(cx, proto.as<DateObject>(), toUTCStringId, &toUTCStringFun) &&
-           NativeDefineProperty(cx, proto.as<DateObject>(), toGMTStringId, toUTCStringFun,
+    return NativeGetProperty(cx, proto.as<NativeObject>(), toUTCStringId, &toUTCStringFun) &&
+           NativeDefineProperty(cx, proto.as<NativeObject>(), toGMTStringId, toUTCStringFun,
                                 nullptr, nullptr, 0);
 }
 
@@ -3155,7 +3168,7 @@
     nullptr, /* trace */
     {
         GenericCreateConstructor<DateConstructor, 7, gc::AllocKind::FUNCTION>,
-        GenericCreatePrototype,
+        CreateDatePrototype,
         date_static_methods,
         nullptr,
         date_methods,
@@ -3164,6 +3177,34 @@
     }
 };
 
+const Class DateObject::protoClass_ = {
+    js_Object_str,
+    JSCLASS_HAS_CACHED_PROTO(JSProto_Date),
+    nullptr, /* addProperty */
+    nullptr, /* delProperty */
+    nullptr, /* getProperty */
+    nullptr, /* setProperty */
+    nullptr, /* enumerate */
+    nullptr, /* resolve */
+    nullptr, /* mayResolve */
+    nullptr, /* convert */
+    nullptr, /* finalize */
+    nullptr, /* call */
+    nullptr, /* hasInstance */
+    nullptr, /* construct */
+    nullptr, /* trace  */
+    {
+        DELEGATED_CLASSSPEC(&DateObject::class_.spec),
+        nullptr,
+        nullptr,
+        nullptr,
+        nullptr,
+        nullptr,
+        nullptr,
+        ClassSpec::IsDelegated
+    }
+};
+
 JSObject*
 js::NewDateObjectMsec(JSContext* cx, ClippedTime t)
 {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsexn.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsexn.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsexn.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsexn.cpp	2015-05-25 20:43:24.000000000 +0000
@@ -473,7 +473,7 @@
     Rooted<ErrorObject*> err(cx, &errorProto->as<ErrorObject>());
     RootedString emptyStr(cx, cx->names().empty);
     JSExnType type = ExnTypeFromProtoKey(key);
-    if (!ErrorObject::init(cx, err, type, nullptr, emptyStr, NullPtr(), 0, 0, emptyStr))
+    if (!ErrorObject::init(cx, err, type, nullptr, emptyStr, nullptr, 0, 0, emptyStr))
         return nullptr;
 
     // The various prototypes also have .name in addition to the normal error
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsexn.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsexn.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsexn.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsexn.h	2015-05-25 20:43:24.000000000 +0000
@@ -12,6 +12,7 @@
 #define jsexn_h
 
 #include "jsapi.h"
+#include "jscntxt.h"
 #include "NamespaceImports.h"
 
 namespace js {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsfriendapi.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsfriendapi.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsfriendapi.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsfriendapi.cpp	2015-05-25 20:43:24.000000000 +0000
@@ -136,7 +136,7 @@
      * ObjectGroup attached to our proto with information about our object, since
      * we're not going to be using that ObjectGroup anyway.
      */
-    RootedObject obj(cx, NewObjectWithGivenProto(cx, (const js::Class*)clasp, NullPtr(),
+    RootedObject obj(cx, NewObjectWithGivenProto(cx, (const js::Class*)clasp, nullptr,
                                                  SingletonObject));
     if (!obj)
         return nullptr;
@@ -211,17 +211,17 @@
 }
 
 JS_FRIEND_API(void)
-JS_TraceShapeCycleCollectorChildren(JSTracer* trc, JS::GCCellPtr shape)
+JS_TraceShapeCycleCollectorChildren(JS::CallbackTracer* trc, JS::GCCellPtr shape)
 {
     MOZ_ASSERT(shape.isShape());
-    MarkCycleCollectorChildren(trc, static_cast<Shape*>(shape.asCell()));
+    TraceCycleCollectorChildren(trc, static_cast<Shape*>(shape.asCell()));
 }
 
 JS_FRIEND_API(void)
-JS_TraceObjectGroupCycleCollectorChildren(JSTracer* trc, JS::GCCellPtr group)
+JS_TraceObjectGroupCycleCollectorChildren(JS::CallbackTracer* trc, JS::GCCellPtr group)
 {
     MOZ_ASSERT(group.isObjectGroup());
-    MarkCycleCollectorChildren(trc, static_cast<ObjectGroup*>(group.asCell()));
+    TraceCycleCollectorChildren(trc, static_cast<ObjectGroup*>(group.asCell()));
 }
 
 static bool
@@ -592,11 +592,11 @@
     return true;
 }
 
-JS_FRIEND_API(JSGCTraceKind)
+JS_FRIEND_API(JS::TraceKind)
 js::GCThingTraceKind(void* thing)
 {
     MOZ_ASSERT(thing);
-    return gc::GetGCThingTraceKind(thing);
+    return static_cast<js::gc::Cell*>(thing)->getTraceKind();
 }
 
 JS_FRIEND_API(void)
@@ -886,14 +886,31 @@
     return buf;
 }
 
-struct DumpHeapTracer : public JS::CallbackTracer
+struct DumpHeapTracer : public JS::CallbackTracer, public WeakMapTracer
 {
     FILE*  output;
 
-    DumpHeapTracer(FILE* fp, JSRuntime* rt, JSTraceCallback callback,
-                   WeakMapTraceKind weakTraceKind)
-      : JS::CallbackTracer(rt, callback, weakTraceKind), output(fp)
+    DumpHeapTracer(FILE* fp, JSRuntime* rt, JSTraceCallback callback)
+      : JS::CallbackTracer(rt, callback, DoNotTraceWeakMaps),
+        js::WeakMapTracer(rt, DumpWeakMap), output(fp)
     {}
+
+private:
+    static void
+    DumpWeakMap(js::WeakMapTracer* trc, JSObject* map,
+                JS::GCCellPtr key, JS::GCCellPtr value)
+    {
+        DumpHeapTracer* tracer =
+            static_cast<DumpHeapTracer*>(trc);
+
+        JSObject* kdelegate = nullptr;
+        if (key.isObject()) {
+            kdelegate = js::GetWeakmapKeyDelegate(key.toObject());
+        }
+
+        fprintf(tracer->output, "WeakMapEntry map=%p key=%p keyDelegate=%p value=%p\n",
+                map, key.asCell(), kdelegate, value.asCell());
+    }
 };
 
 static char
@@ -928,7 +945,7 @@
 
 static void
 DumpHeapVisitArena(JSRuntime* rt, void* data, gc::Arena* arena,
-                   JSGCTraceKind traceKind, size_t thingSize)
+                   JS::TraceKind traceKind, size_t thingSize)
 {
     DumpHeapTracer* dtrc = static_cast<DumpHeapTracer*>(data);
     fprintf(dtrc->output, "# arena allockind=%u size=%u\n",
@@ -937,7 +954,7 @@
 
 static void
 DumpHeapVisitCell(JSRuntime* rt, void* data, void* thing,
-                  JSGCTraceKind traceKind, size_t thingSize)
+                  JS::TraceKind traceKind, size_t thingSize)
 {
     DumpHeapTracer* dtrc = static_cast<DumpHeapTracer*>(data);
     char cellDesc[1024 * 32];
@@ -947,7 +964,7 @@
 }
 
 static void
-DumpHeapVisitChild(JS::CallbackTracer* trc, void** thingp, JSGCTraceKind kind)
+DumpHeapVisitChild(JS::CallbackTracer* trc, void** thingp, JS::TraceKind kind)
 {
     if (gc::IsInsideNursery((js::gc::Cell*)*thingp))
         return;
@@ -959,7 +976,7 @@
 }
 
 static void
-DumpHeapVisitRoot(JS::CallbackTracer* trc, void** thingp, JSGCTraceKind kind)
+DumpHeapVisitRoot(JS::CallbackTracer* trc, void** thingp, JS::TraceKind kind)
 {
     if (gc::IsInsideNursery((js::gc::Cell*)*thingp))
         return;
@@ -976,9 +993,13 @@
     if (nurseryBehaviour == js::CollectNurseryBeforeDump)
         rt->gc.evictNursery(JS::gcreason::API);
 
-    DumpHeapTracer dtrc(fp, rt, DumpHeapVisitRoot, TraceWeakMapKeysValues);
+    DumpHeapTracer dtrc(fp, rt, DumpHeapVisitRoot);
+    fprintf(dtrc.output, "# Roots.\n");
     TraceRuntime(&dtrc);
 
+    fprintf(dtrc.output, "# Weak maps.\n");
+    WeakMapBase::traceAllMappings(&dtrc);
+
     fprintf(dtrc.output, "==========\n");
 
     dtrc.setTraceCallback(DumpHeapVisitChild);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsfriendapi.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsfriendapi.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsfriendapi.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsfriendapi.h	2015-05-25 20:43:24.000000000 +0000
@@ -96,9 +96,9 @@
  * all cycle-participating data it reaches, using bounded stack space.
  */
 extern JS_FRIEND_API(void)
-JS_TraceShapeCycleCollectorChildren(JSTracer* trc, JS::GCCellPtr shape);
+JS_TraceShapeCycleCollectorChildren(JS::CallbackTracer* trc, JS::GCCellPtr shape);
 extern JS_FRIEND_API(void)
-JS_TraceObjectGroupCycleCollectorChildren(JSTracer* trc, JS::GCCellPtr group);
+JS_TraceObjectGroupCycleCollectorChildren(JS::CallbackTracer* trc, JS::GCCellPtr group);
 
 enum {
     JS_TELEMETRY_GC_REASON,
@@ -116,6 +116,9 @@
     JS_TELEMETRY_GC_NON_INCREMENTAL,
     JS_TELEMETRY_GC_SCC_SWEEP_TOTAL_MS,
     JS_TELEMETRY_GC_SCC_SWEEP_MAX_PAUSE_MS,
+    JS_TELEMETRY_GC_MINOR_REASON,
+    JS_TELEMETRY_GC_MINOR_REASON_LONG,
+    JS_TELEMETRY_GC_MINOR_US,
     JS_TELEMETRY_DEPRECATED_LANGUAGE_EXTENSIONS_IN_CONTENT,
     JS_TELEMETRY_ADDON_EXCEPTIONS
 };
@@ -523,7 +526,7 @@
 extern JS_FRIEND_API(JSObject*)
 GetWeakmapKeyDelegate(JSObject* key);
 
-JS_FRIEND_API(JSGCTraceKind)
+JS_FRIEND_API(JS::TraceKind)
 GCThingTraceKind(void* thing);
 
 /*
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsfun.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsfun.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsfun.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsfun.cpp	2015-05-25 20:43:24.000000000 +0000
@@ -595,7 +595,7 @@
         if (uint16_t(flagsword) & JSFunction::EXTENDED)
             allocKind = gc::AllocKind::FUNCTION_EXTENDED;
         fun = NewFunctionWithProto(cx, nullptr, 0, JSFunction::INTERPRETED,
-                                   /* enclosingDynamicScope = */ NullPtr(), NullPtr(), proto,
+                                   /* enclosingDynamicScope = */ nullptr, nullptr, proto,
                                    allocKind, TenuredObject);
         if (!fun)
             return false;
@@ -651,7 +651,7 @@
 
     gc::AllocKind allocKind = srcFun->getAllocKind();
     RootedFunction clone(cx, NewFunctionWithProto(cx, nullptr, 0,
-                                                  JSFunction::INTERPRETED, NullPtr(), NullPtr(),
+                                                  JSFunction::INTERPRETED, nullptr, nullptr,
                                                   cloneProto, allocKind, TenuredObject));
     if (!clone)
         return nullptr;
@@ -698,7 +698,7 @@
          * has a non-object as its .prototype value.
          */
         RootedValue val(cx, ObjectValue(*obj));
-        ReportValueError(cx, JSMSG_BAD_PROTOTYPE, -1, val, js::NullPtr());
+        ReportValueError(cx, JSMSG_BAD_PROTOTYPE, -1, val, nullptr);
         return false;
     }
 
@@ -756,7 +756,7 @@
 
     RootedObject functionCtor(cx,
       NewFunctionWithProto(cx, Function, 1, JSFunction::NATIVE_CTOR,
-                           NullPtr(), HandlePropertyName(cx->names().Function),
+                           nullptr, HandlePropertyName(cx->names().Function),
                            functionProto, AllocKind::FUNCTION, SingletonObject));
     if (!functionCtor)
         return nullptr;
@@ -777,7 +777,7 @@
      */
     JSObject* functionProto_ =
         NewFunctionWithProto(cx, nullptr, 0, JSFunction::INTERPRETED,
-                             self, NullPtr(), objectProto, AllocKind::FUNCTION,
+                             self, nullptr, objectProto, AllocKind::FUNCTION,
                              SingletonObject);
     if (!functionProto_)
         return nullptr;
@@ -807,7 +807,7 @@
         return nullptr;
 
     RootedScript script(cx, JSScript::Create(cx,
-                                             /* enclosingScope = */ js::NullPtr(),
+                                             /* enclosingScope = */ nullptr,
                                              /* savedCallerFun = */ false,
                                              options,
                                              /* staticLevel = */ 0,
@@ -845,7 +845,7 @@
     // confused.
     RootedFunction throwTypeError(cx,
       NewFunctionWithProto(cx, ThrowTypeError, 0, JSFunction::NATIVE_FUN,
-                           NullPtr(), NullPtr(), functionProto, AllocKind::FUNCTION,
+                           nullptr, nullptr, functionProto, AllocKind::FUNCTION,
                            SingletonObject));
     if (!throwTypeError || !PreventExtensions(cx, throwTypeError))
         return nullptr;
@@ -980,8 +980,9 @@
             return out.finishString();
         }
     }
-    
-    bool funIsMethodOrNonArrowLambda = (fun->isLambda() && !fun->isArrow()) || fun->isMethod();
+
+    bool funIsMethodOrNonArrowLambda = (fun->isLambda() && !fun->isArrow()) || fun->isMethod() ||
+                                        fun->isGetter() || fun->isSetter();
     if (!bodyOnly) {
         // If we're not in pretty mode, put parentheses around lambda functions and methods.
         if (fun->isInterpreted() && !lambdaParen && funIsMethodOrNonArrowLambda) {
@@ -1955,7 +1956,7 @@
         ok = frontend::CompileStarGeneratorBody(cx, &fun, options, formals, srcBuf);
     else
         ok = frontend::CompileFunctionBody(cx, &fun, options, formals, srcBuf,
-                                           /* enclosingScope = */ js::NullPtr());
+                                           /* enclosingScope = */ nullptr);
     args.rval().setObject(*fun);
     return ok;
 }
@@ -1984,7 +1985,7 @@
                       NewObjectKind newKind /* = GenericObject */)
 {
     return NewFunctionWithProto(cx, native, nargs, JSFunction::NATIVE_FUN,
-                                NullPtr(), atom, NullPtr(), allocKind, newKind);
+                                nullptr, atom, nullptr, allocKind, newKind);
 }
 
 JSFunction*
@@ -1994,8 +1995,8 @@
                          JSFunction::Flags flags /* = JSFunction::NATIVE_CTOR */)
 {
     MOZ_ASSERT(flags & JSFunction::NATIVE_CTOR);
-    return NewFunctionWithProto(cx, native, nargs, flags, NullPtr(), atom,
-                                NullPtr(), allocKind, newKind);
+    return NewFunctionWithProto(cx, native, nargs, flags, nullptr, atom,
+                                nullptr, allocKind, newKind);
 }
 
 JSFunction*
@@ -2003,11 +2004,11 @@
                         JSFunction::Flags flags, HandleAtom atom,
                         gc::AllocKind allocKind /* = AllocKind::FUNCTION */,
                         NewObjectKind newKind /* = GenericObject */,
-                        HandleObject enclosingDynamicScope /* = NullPtr() */)
+                        HandleObject enclosingDynamicScope /* = nullptr */)
 {
     return NewFunctionWithProto(cx, nullptr, nargs, flags,
                                 enclosingDynamicScope ? enclosingDynamicScope : cx->global(),
-                                atom, NullPtr(), allocKind, newKind);
+                                atom, nullptr, allocKind, newKind);
 }
 
 JSFunction*
@@ -2330,7 +2331,7 @@
 {
     JSObject* callee = &calleev.toObject();
     if (callee->is<JSFunction>())
-        MOZ_ASSERT(callee->as<JSFunction>().isNativeConstructor());
+        MOZ_ASSERT(callee->as<JSFunction>().isConstructor());
     else
         MOZ_ASSERT(callee->constructHook() != nullptr);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsfun.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsfun.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsfun.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsfun.h	2015-05-25 20:43:24.000000000 +0000
@@ -32,12 +32,15 @@
         NormalFunction = 0,
         Arrow,                      /* ES6 '(args) => body' syntax */
         Method,                     /* ES6 MethodDefinition */
-        AsmJS                       /* function is an asm.js module or exported function */
+        Getter,
+        Setter,
+        AsmJS,                      /* function is an asm.js module or exported function */
+        FunctionKindLimit
     };
 
     enum Flags {
         INTERPRETED      = 0x0001,  /* function has a JSScript and environment. */
-        NATIVE_CTOR      = 0x0002,  /* native that can be called as a constructor */
+        CONSTRUCTOR      = 0x0002,  /* function that can be called as a constructor */
         EXTENDED         = 0x0004,  /* structure is FunctionExtended */
         IS_FUN_PROTO     = 0x0008,  /* function is Function.prototype for some global object */
         EXPR_BODY        = 0x0010,  /* arrow function with expression body or
@@ -49,33 +52,42 @@
                                        function-statement) */
         SELF_HOSTED      = 0x0080,  /* function is self-hosted builtin and must not be
                                        decompilable nor constructible. */
-        SELF_HOSTED_CTOR = 0x0100,  /* function is self-hosted builtin constructor and
-                                       must be constructible but not decompilable. */
+        // Free bit
         HAS_REST         = 0x0200,  /* function has a rest (...) parameter */
         INTERPRETED_LAZY = 0x0400,  /* function is interpreted but doesn't have a script yet */
         RESOLVED_LENGTH  = 0x0800,  /* f.length has been resolved (see fun_resolve). */
         RESOLVED_NAME    = 0x1000,  /* f.name has been resolved (see fun_resolve). */
 
         FUNCTION_KIND_SHIFT = 13,
-        FUNCTION_KIND_MASK  = 0x3 << FUNCTION_KIND_SHIFT,
+        FUNCTION_KIND_MASK  = 0x7 << FUNCTION_KIND_SHIFT,
 
         ASMJS_KIND = AsmJS << FUNCTION_KIND_SHIFT,
         ARROW_KIND = Arrow << FUNCTION_KIND_SHIFT,
+        METHOD_KIND = Method << FUNCTION_KIND_SHIFT,
+        GETTER_KIND = Getter << FUNCTION_KIND_SHIFT,
+        SETTER_KIND = Setter << FUNCTION_KIND_SHIFT,
 
         /* Derived Flags values for convenience: */
         NATIVE_FUN = 0,
+        NATIVE_CTOR = NATIVE_FUN | CONSTRUCTOR,
         ASMJS_CTOR = ASMJS_KIND | NATIVE_CTOR,
         ASMJS_LAMBDA_CTOR = ASMJS_KIND | NATIVE_CTOR | LAMBDA,
-        INTERPRETED_METHOD = INTERPRETED | (Method << FUNCTION_KIND_SHIFT),
-        INTERPRETED_LAMBDA = INTERPRETED | LAMBDA,
+        INTERPRETED_METHOD = INTERPRETED | METHOD_KIND,
+        INTERPRETED_CLASS_CONSTRUCTOR = INTERPRETED | METHOD_KIND | CONSTRUCTOR,
+        INTERPRETED_GETTER = INTERPRETED | GETTER_KIND,
+        INTERPRETED_SETTER = INTERPRETED | SETTER_KIND,
+        INTERPRETED_LAMBDA = INTERPRETED | LAMBDA | CONSTRUCTOR,
         INTERPRETED_LAMBDA_ARROW = INTERPRETED | LAMBDA | ARROW_KIND,
-        STABLE_ACROSS_CLONES = NATIVE_CTOR | IS_FUN_PROTO | EXPR_BODY | HAS_GUESSED_ATOM |
-                               LAMBDA | SELF_HOSTED | SELF_HOSTED_CTOR | HAS_REST |
-                               FUNCTION_KIND_MASK
+        INTERPRETED_NORMAL = INTERPRETED | CONSTRUCTOR,
+
+        STABLE_ACROSS_CLONES = IS_FUN_PROTO | CONSTRUCTOR | EXPR_BODY | HAS_GUESSED_ATOM |
+                               LAMBDA | SELF_HOSTED |  HAS_REST | FUNCTION_KIND_MASK
     };
 
     static_assert((INTERPRETED | INTERPRETED_LAZY) == js::JS_FUNCTION_INTERPRETED_BITS,
                   "jsfriendapi.h's JSFunction::INTERPRETED-alike is wrong");
+    static_assert(((FunctionKindLimit - 1) << FUNCTION_KIND_SHIFT) <= FUNCTION_KIND_MASK,
+                  "FunctionKind doesn't fit into flags_");
 
   private:
     uint16_t        nargs_;       /* number of formal arguments
@@ -135,8 +147,9 @@
     bool isInterpreted()            const { return flags() & (INTERPRETED | INTERPRETED_LAZY); }
     bool isNative()                 const { return !isInterpreted(); }
 
+    bool isConstructor()            const { return flags() & CONSTRUCTOR; }
+
     /* Possible attributes of a native function: */
-    bool isNativeConstructor()      const { return flags() & NATIVE_CTOR; }
     bool isAsmJSNative()            const { return kind() == AsmJS; }
 
     /* Possible attributes of an interpreted function: */
@@ -145,15 +158,26 @@
     bool hasGuessedAtom()           const { return flags() & HAS_GUESSED_ATOM; }
     bool isLambda()                 const { return flags() & LAMBDA; }
     bool isSelfHostedBuiltin()      const { return flags() & SELF_HOSTED; }
-    bool isSelfHostedConstructor()  const { return flags() & SELF_HOSTED_CTOR; }
     bool hasRest()                  const { return flags() & HAS_REST; }
     bool isInterpretedLazy()        const { return flags() & INTERPRETED_LAZY; }
     bool hasScript()                const { return flags() & INTERPRETED; }
 
     // Arrow functions store their lexical |this| in the first extended slot.
     bool isArrow()                  const { return kind() == Arrow; }
+    // Every class-constructor is also a method.
     bool isMethod()                 const { return kind() == Method; }
 
+    bool isGetter()                 const { return kind() == Getter; }
+    bool isSetter()                 const { return kind() == Setter; }
+
+    bool isClassConstructor() const {
+        return kind() == Method && isConstructor();
+    }
+
+    bool allowSuperProperty() const {
+        return isMethod() || isGetter() || isSetter();
+    }
+
     bool hasResolvedLength()        const { return flags() & RESOLVED_LENGTH; }
     bool hasResolvedName()          const { return flags() & RESOLVED_NAME; }
 
@@ -168,12 +192,7 @@
     bool isBuiltin() const {
         return (isNative() && !isAsmJSNative()) || isSelfHostedBuiltin();
     }
-    bool isInterpretedConstructor() const {
-        // Note: the JITs inline this check, so be careful when making changes
-        // here. See MacroAssembler::branchIfNotInterpretedConstructor.
-        return isInterpreted() && !isFunctionPrototype() && !isArrow() &&
-               (!isSelfHostedBuiltin() || isSelfHostedConstructor());
-    }
+
     bool isNamedLambda() const {
         return isLambda() && displayAtom() && !hasGuessedAtom();
     }
@@ -194,6 +213,13 @@
         this->flags_ |= static_cast<uint16_t>(kind) << FUNCTION_KIND_SHIFT;
     }
 
+    // Make the function constructible.
+    void setIsConstructor() {
+        MOZ_ASSERT(!isConstructor());
+        MOZ_ASSERT(isSelfHostedBuiltin());
+        flags_ |= CONSTRUCTOR;
+    }
+
     // Can be called multiple times by the parser.
     void setArgCount(uint16_t nargs) {
         this->nargs_ = nargs;
@@ -207,11 +233,8 @@
     void setIsSelfHostedBuiltin() {
         MOZ_ASSERT(!isSelfHostedBuiltin());
         flags_ |= SELF_HOSTED;
-    }
-
-    void setIsSelfHostedConstructor() {
-        MOZ_ASSERT(!isSelfHostedConstructor());
-        flags_ |= SELF_HOSTED_CTOR;
+        // Self-hosted functions should not be constructable.
+        flags_ &= ~CONSTRUCTOR;
     }
 
     void setIsFunctionPrototype() {
@@ -545,7 +568,7 @@
 NewScriptedFunction(ExclusiveContext* cx, unsigned nargs, JSFunction::Flags flags,
                     HandleAtom atom, gc::AllocKind allocKind = gc::AllocKind::FUNCTION,
                     NewObjectKind newKind = GenericObject,
-                    HandleObject enclosingDynamicScope = NullPtr());
+                    HandleObject enclosingDynamicScope = nullptr);
 
 // If proto is nullptr, Function.prototype is used instead.  If
 // enclosingDynamicScope is null, the function will have a null environment()
@@ -613,7 +636,7 @@
 CloneFunctionObject(JSContext* cx, HandleFunction fun, HandleObject parent,
                     gc::AllocKind kind = gc::AllocKind::FUNCTION,
                     NewObjectKind newKindArg = GenericObject,
-                    HandleObject proto = NullPtr());
+                    HandleObject proto = nullptr);
 
 extern bool
 FindBody(JSContext* cx, HandleFunction fun, HandleLinearString src, size_t* bodyStart,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsfuninlines.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsfuninlines.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsfuninlines.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsfuninlines.h	2015-05-25 20:43:24.000000000 +0000
@@ -53,7 +53,7 @@
 
 inline JSFunction*
 CloneFunctionObjectIfNotSingleton(JSContext* cx, HandleFunction fun, HandleObject parent,
-                                  HandleObject proto = NullPtr(),
+                                  HandleObject proto = nullptr,
                                   NewObjectKind newKind = GenericObject)
 {
     /*
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsgc.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsgc.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsgc.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsgc.cpp	2015-05-25 20:43:24.000000000 +0000
@@ -2209,12 +2209,12 @@
 
 
 void
-MovingTracer::Visit(JS::CallbackTracer* jstrc, void** thingp, JSGCTraceKind kind)
+MovingTracer::Visit(JS::CallbackTracer* jstrc, void** thingp, JS::TraceKind kind)
 {
     TenuredCell* thing = TenuredCell::fromPointer(*thingp);
 
     // Currently we only relocate objects.
-    if (kind != JSTRACE_OBJECT) {
+    if (kind != JS::TraceKind::Object) {
         MOZ_ASSERT(!RelocationOverlay::isCellForwarded(thing));
         return;
     }
@@ -2272,7 +2272,7 @@
 
 template <typename T>
 static void
-UpdateCellPointersTyped(MovingTracer* trc, ArenaHeader* arena, JSGCTraceKind traceKind)
+UpdateCellPointersTyped(MovingTracer* trc, ArenaHeader* arena, JS::TraceKind traceKind)
 {
     for (ArenaCellIterUnderGC i(arena); !i.done(); i.next()) {
         T* cell = reinterpret_cast<T*>(i.getCell());
@@ -2288,7 +2288,7 @@
 UpdateCellPointers(MovingTracer* trc, ArenaHeader* arena)
 {
     AllocKind kind = arena->getAllocKind();
-    JSGCTraceKind traceKind = MapAllocToTraceKind(kind);
+    JS::TraceKind traceKind = MapAllocToTraceKind(kind);
 
     switch (kind) {
       case AllocKind::FUNCTION:
@@ -3685,17 +3685,17 @@
     {}
 
     Cell* src;
-    JSGCTraceKind srcKind;
+    JS::TraceKind srcKind;
     Zone* zone;
     JSCompartment* compartment;
 };
 
 static bool
-InCrossCompartmentMap(JSObject* src, Cell* dst, JSGCTraceKind dstKind)
+InCrossCompartmentMap(JSObject* src, Cell* dst, JS::TraceKind dstKind)
 {
     JSCompartment* srccomp = src->compartment();
 
-    if (dstKind == JSTRACE_OBJECT) {
+    if (dstKind == JS::TraceKind::Object) {
         Value key = ObjectValue(*static_cast<JSObject*>(dst));
         if (WrapperMap::Ptr p = srccomp->lookupWrapper(key)) {
             if (*p->value().unsafeGet() == ObjectValue(*src))
@@ -3717,36 +3717,25 @@
 
 static void
 CheckCompartment(CompartmentCheckTracer* trc, JSCompartment* thingCompartment,
-                 Cell* thing, JSGCTraceKind kind)
+                 Cell* thing, JS::TraceKind kind)
 {
     MOZ_ASSERT(thingCompartment == trc->compartment ||
                trc->runtime()->isAtomsCompartment(thingCompartment) ||
-               (trc->srcKind == JSTRACE_OBJECT &&
+               (trc->srcKind == JS::TraceKind::Object &&
                 InCrossCompartmentMap((JSObject*)trc->src, thing, kind)));
 }
 
-static JSCompartment*
-CompartmentOfCell(Cell* thing, JSGCTraceKind kind)
-{
-    if (kind == JSTRACE_OBJECT)
-        return static_cast<JSObject*>(thing)->compartment();
-    else if (kind == JSTRACE_SHAPE)
-        return static_cast<Shape*>(thing)->compartment();
-    else if (kind == JSTRACE_BASE_SHAPE)
-        return static_cast<BaseShape*>(thing)->compartment();
-    else if (kind == JSTRACE_SCRIPT)
-        return static_cast<JSScript*>(thing)->compartment();
-    else
-        return nullptr;
-}
+struct MaybeCompartmentFunctor {
+    template <typename T> JSCompartment* operator()(T* t) { return t->maybeCompartment(); }
+};
 
 static void
-CheckCompartmentCallback(JS::CallbackTracer* trcArg, void** thingp, JSGCTraceKind kind)
+CheckCompartmentCallback(JS::CallbackTracer* trcArg, void** thingp, JS::TraceKind kind)
 {
     CompartmentCheckTracer* trc = static_cast<CompartmentCheckTracer*>(trcArg);
     TenuredCell* thing = TenuredCell::fromPointer(*thingp);
 
-    JSCompartment* comp = CompartmentOfCell(thing, kind);
+    JSCompartment* comp = CallTyped(MaybeCompartmentFunctor(), thing, kind);
     if (comp && trc->compartment)
         CheckCompartment(trc, comp, thing, kind);
     else
@@ -3766,7 +3755,7 @@
             for (ZoneCellIterUnderGC i(zone, thingKind); !i.done(); i.next()) {
                 trc.src = i.getCell();
                 trc.srcKind = MapAllocToTraceKind(thingKind);
-                trc.compartment = CompartmentOfCell(trc.src, trc.srcKind);
+                trc.compartment = CallTyped(MaybeCompartmentFunctor(), trc.src, trc.srcKind);
                 JS_TraceChildren(&trc, trc.src, trc.srcKind);
             }
         }
@@ -6873,16 +6862,16 @@
 JS::AssertGCThingIsNotAnObjectSubclass(Cell* cell)
 {
     MOZ_ASSERT(cell);
-    MOZ_ASSERT(cell->getTraceKind() != JSTRACE_OBJECT);
+    MOZ_ASSERT(cell->getTraceKind() != JS::TraceKind::Object);
 }
 
 JS_FRIEND_API(void)
-js::gc::AssertGCThingHasType(js::gc::Cell* cell, JSGCTraceKind kind)
+js::gc::AssertGCThingHasType(js::gc::Cell* cell, JS::TraceKind kind)
 {
     if (!cell)
-        MOZ_ASSERT(kind == JSTRACE_NULL);
+        MOZ_ASSERT(kind == JS::TraceKind::Null);
     else if (IsInsideNursery(cell))
-        MOZ_ASSERT(kind == JSTRACE_OBJECT);
+        MOZ_ASSERT(kind == JS::TraceKind::Object);
     else
         MOZ_ASSERT(MapAllocToTraceKind(cell->asTenured().getAllocKind()) == kind);
 }
@@ -6971,18 +6960,12 @@
 }
 
 JS_FRIEND_API(const char*)
-JS::GCTraceKindToAscii(JSGCTraceKind kind)
+JS::GCTraceKindToAscii(JS::TraceKind kind)
 {
     switch(kind) {
-      case JSTRACE_OBJECT: return "Object";
-      case JSTRACE_SCRIPT: return "Script";
-      case JSTRACE_STRING: return "String";
-      case JSTRACE_SYMBOL: return "Symbol";
-      case JSTRACE_SHAPE: return "Shape";
-      case JSTRACE_BASE_SHAPE: return "BaseShape";
-      case JSTRACE_LAZY_SCRIPT: return "LazyScript";
-      case JSTRACE_JITCODE: return "JitCode";
-      case JSTRACE_OBJECT_GROUP: return "ObjectGroup";
+#define MAP_NAME(name, _0, _1) case JS::TraceKind::name: return #name;
+FOR_EACH_GC_LAYOUT(MAP_NAME);
+#undef MAP_NAME
       default: return "Invalid";
     }
 }
@@ -6991,19 +6974,19 @@
   : ptr(0)
 {
     if (v.isString())
-        ptr = checkedCast(v.toString(), JSTRACE_STRING);
+        ptr = checkedCast(v.toString(), JS::TraceKind::String);
     else if (v.isObject())
-        ptr = checkedCast(&v.toObject(), JSTRACE_OBJECT);
+        ptr = checkedCast(&v.toObject(), JS::TraceKind::Object);
     else if (v.isSymbol())
-        ptr = checkedCast(v.toSymbol(), JSTRACE_SYMBOL);
+        ptr = checkedCast(v.toSymbol(), JS::TraceKind::Symbol);
     else
-        ptr = checkedCast(nullptr, JSTRACE_NULL);
+        ptr = checkedCast(nullptr, JS::TraceKind::Null);
 }
 
-JSGCTraceKind
+JS::TraceKind
 JS::GCCellPtr::outOfLineKind() const
 {
-    MOZ_ASSERT(JSGCTraceKind(ptr & JSTRACE_OUTOFLINE) == JSTRACE_OUTOFLINE);
+    MOZ_ASSERT((ptr & OutOfLineTraceKindMask) == OutOfLineTraceKindMask);
     MOZ_ASSERT(asCell()->isTenured());
     return MapAllocToTraceKind(asCell()->asTenured().getAllocKind());
 }
@@ -7162,40 +7145,17 @@
     return IsIncrementalBarrierNeeded(cx->runtime());
 }
 
+struct IncrementalReferenceBarrierFunctor {
+    template <typename T> void operator()(T* t) { T::writeBarrierPre(t); }
+};
+
 JS_PUBLIC_API(void)
 JS::IncrementalReferenceBarrier(GCCellPtr thing)
 {
     if (!thing)
         return;
 
-    if (thing.isString() && thing.toString()->isPermanentAtom())
-        return;
-
-#ifdef DEBUG
-    Zone* zone = thing.isObject()
-                 ? thing.toObject()->zone()
-                 : thing.asCell()->asTenured().zone();
-    MOZ_ASSERT(!zone->runtimeFromMainThread()->isHeapMajorCollecting());
-#endif
-
-    switch(thing.kind()) {
-      case JSTRACE_OBJECT: return JSObject::writeBarrierPre(thing.toObject());
-      case JSTRACE_STRING: return JSString::writeBarrierPre(thing.toString());
-      case JSTRACE_SCRIPT: return JSScript::writeBarrierPre(thing.toScript());
-      case JSTRACE_SYMBOL: return JS::Symbol::writeBarrierPre(thing.toSymbol());
-      case JSTRACE_LAZY_SCRIPT:
-        return LazyScript::writeBarrierPre(static_cast<LazyScript*>(thing.asCell()));
-      case JSTRACE_JITCODE:
-        return jit::JitCode::writeBarrierPre(static_cast<jit::JitCode*>(thing.asCell()));
-      case JSTRACE_SHAPE:
-        return Shape::writeBarrierPre(static_cast<Shape*>(thing.asCell()));
-      case JSTRACE_BASE_SHAPE:
-        return BaseShape::writeBarrierPre(static_cast<BaseShape*>(thing.asCell()));
-      case JSTRACE_OBJECT_GROUP:
-        return ObjectGroup::writeBarrierPre(static_cast<ObjectGroup*>(thing.asCell()));
-      default:
-        MOZ_CRASH("Invalid trace kind in IncrementalReferenceBarrier.");
-    }
+    CallTyped(IncrementalReferenceBarrierFunctor(), thing.asCell(), thing.kind());
 }
 
 JS_PUBLIC_API(void)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsgc.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsgc.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsgc.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsgc.h	2015-05-25 20:43:24.000000000 +0000
@@ -25,7 +25,6 @@
 
 #define FOR_EACH_GC_LAYOUT(D) \
  /* PrettyName       TypeName           AddToCCKind */ \
-    D(AccessorShape, js::AccessorShape, true) \
     D(BaseShape,     js::BaseShape,     true) \
     D(JitCode,       js::jit::JitCode,  true) \
     D(LazyScript,    js::LazyScript,    true) \
@@ -71,6 +70,15 @@
     COMPACT
 };
 
+// Map from base trace type to the trace kind.
+template <typename T> struct MapTypeToTraceKind {};
+#define EXPAND_DEF(name, type, _) \
+    template <> struct MapTypeToTraceKind<type> { \
+        static const JS::TraceKind kind = JS::TraceKind::name; \
+    };
+FOR_EACH_GC_LAYOUT(EXPAND_DEF);
+#undef EXPAND_DEF
+
 /* Map from C++ type to alloc kind. JSObject does not have a 1:1 mapping, so must use Arena::thingSize. */
 template <typename T> struct MapTypeToFinalizeKind {};
 template <> struct MapTypeToFinalizeKind<JSScript>          { static const AllocKind kind = AllocKind::SCRIPT; };
@@ -176,9 +184,6 @@
             (!clasp->finalize || (clasp->flags & JSCLASS_BACKGROUND_FINALIZE)));
 }
 
-inline JSGCTraceKind
-GetGCThingTraceKind(const void* thing);
-
 // Fortunately, few places in the system need to deal with fully abstract
 // cells. In those places that do, we generally want to move to a layout
 // templated function as soon as possible. This template wraps the upcast
@@ -196,34 +201,36 @@
 #endif
 template <typename F, typename... Args>
 auto
-CallTyped(F f, JSGCTraceKind traceKind, Args&&... args)
+CallTyped(F f, JS::TraceKind traceKind, Args&&... args)
   -> decltype(f. DEPENDENT_TEMPLATE_HINT operator()<JSObject>(mozilla::Forward<Args>(args)...))
 {
     switch (traceKind) {
-      case JSTRACE_OBJECT:
-          return f. DEPENDENT_TEMPLATE_HINT operator()<JSObject>(mozilla::Forward<Args>(args)...);
-      case JSTRACE_SCRIPT:
-          return f. DEPENDENT_TEMPLATE_HINT operator()<JSScript>(mozilla::Forward<Args>(args)...);
-      case JSTRACE_STRING:
-          return f. DEPENDENT_TEMPLATE_HINT operator()<JSString>(mozilla::Forward<Args>(args)...);
-      case JSTRACE_SYMBOL:
-          return f. DEPENDENT_TEMPLATE_HINT operator()<JS::Symbol>(mozilla::Forward<Args>(args)...);
-      case JSTRACE_BASE_SHAPE:
-          return f. DEPENDENT_TEMPLATE_HINT operator()<BaseShape>(mozilla::Forward<Args>(args)...);
-      case JSTRACE_JITCODE:
-          return f. DEPENDENT_TEMPLATE_HINT operator()<jit::JitCode>(mozilla::Forward<Args>(args)...);
-      case JSTRACE_LAZY_SCRIPT:
-          return f. DEPENDENT_TEMPLATE_HINT operator()<LazyScript>(mozilla::Forward<Args>(args)...);
-      case JSTRACE_SHAPE:
-          return f. DEPENDENT_TEMPLATE_HINT operator()<Shape>(mozilla::Forward<Args>(args)...);
-      case JSTRACE_OBJECT_GROUP:
-          return f. DEPENDENT_TEMPLATE_HINT operator()<ObjectGroup>(mozilla::Forward<Args>(args)...);
+#define EXPAND_DEF(name, type, _) \
+      case JS::TraceKind::name: \
+        return f. DEPENDENT_TEMPLATE_HINT operator()<type>(mozilla::Forward<Args>(args)...);
+      FOR_EACH_GC_LAYOUT(EXPAND_DEF);
+#undef EXPAND_DEF
       default:
           MOZ_CRASH("Invalid trace kind in CallTyped.");
     }
 }
 #undef DEPENDENT_TEMPLATE_HINT
 
+template <typename F, typename... Args>
+auto
+CallTyped(F f, void* thing, JS::TraceKind traceKind, Args&&... args)
+  -> decltype(f(reinterpret_cast<JSObject*>(0), mozilla::Forward<Args>(args)...))
+{
+    switch (traceKind) {
+#define EXPAND_DEF(name, type, _) \
+      case JS::TraceKind::name: \
+          return f(static_cast<type*>(thing), mozilla::Forward<Args>(args)...);
+      FOR_EACH_GC_LAYOUT(EXPAND_DEF);
+#undef EXPAND_DEF
+      default:
+          MOZ_CRASH("Invalid trace kind in CallTyped.");
+    }
+}
 /* Capacity for slotsToThingKind */
 const size_t SLOTS_TO_THING_KIND_LIMIT = 17;
 
@@ -1124,9 +1131,9 @@
 typedef void (*IterateChunkCallback)(JSRuntime* rt, void* data, gc::Chunk* chunk);
 typedef void (*IterateZoneCallback)(JSRuntime* rt, void* data, JS::Zone* zone);
 typedef void (*IterateArenaCallback)(JSRuntime* rt, void* data, gc::Arena* arena,
-                                     JSGCTraceKind traceKind, size_t thingSize);
+                                     JS::TraceKind traceKind, size_t thingSize);
 typedef void (*IterateCellCallback)(JSRuntime* rt, void* data, void* thing,
-                                    JSGCTraceKind traceKind, size_t thingSize);
+                                    JS::TraceKind traceKind, size_t thingSize);
 
 /*
  * This function calls |zoneCallback| on every zone, |compartmentCallback| on
@@ -1396,14 +1403,23 @@
 /* Disable OOM testing in sections which are not OOM safe. */
 class AutoEnterOOMUnsafeRegion
 {
-    uint32_t saved_;
+    bool oomEnabled_;
+    int64_t oomAfter_;
 
   public:
-    AutoEnterOOMUnsafeRegion() : saved_(OOM_maxAllocations) {
-        OOM_maxAllocations = UINT32_MAX;
+    AutoEnterOOMUnsafeRegion()
+      : oomEnabled_(OOM_maxAllocations != UINT32_MAX)
+    {
+        if (oomEnabled_) {
+            oomAfter_ = OOM_maxAllocations - OOM_counter;
+            OOM_maxAllocations = UINT32_MAX;
+        }
     }
+
     ~AutoEnterOOMUnsafeRegion() {
-        OOM_maxAllocations = saved_;
+        MOZ_ASSERT(OOM_maxAllocations == UINT32_MAX);
+        if (oomEnabled_)
+            OOM_maxAllocations = OOM_counter + oomAfter_;
     }
 };
 #else
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsgcinlines.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsgcinlines.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsgcinlines.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsgcinlines.h	2015-05-25 20:43:24.000000000 +0000
@@ -26,16 +26,6 @@
     return GetGCObjectKind(nslots);
 }
 
-inline JSGCTraceKind
-GetGCThingTraceKind(const void* thing)
-{
-    MOZ_ASSERT(thing);
-    const Cell* cell = static_cast<const Cell*>(thing);
-    if (IsInsideNursery(cell))
-        return JSTRACE_OBJECT;
-    return MapAllocToTraceKind(cell->asTenured().getAllocKind());
-}
-
 inline void
 GCRuntime::poke()
 {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsiter.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsiter.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsiter.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsiter.cpp	2015-05-25 20:43:24.000000000 +0000
@@ -457,7 +457,7 @@
             return false;
         RootedValue val(cx, ObjectValue(*obj));
         ReportValueError2(cx, JSMSG_BAD_TRAP_RETURN_VALUE,
-                          -1, val, js::NullPtr(), bytes.ptr());
+                          -1, val, nullptr, bytes.ptr());
         return false;
     }
     objp.set(&rval.toObject());
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/js.msg firefox-trunk-41.0~a1~hg20150524r245419/js/src/js.msg
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/js.msg	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/js.msg	2015-05-25 20:43:23.000000000 +0000
@@ -64,6 +64,7 @@
 MSG_DEF(JSMSG_REDECLARED_VAR,          2, JSEXN_TYPEERR, "redeclaration of {0} {1}")
 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_OVERWRITING_ACCESSOR,    1, JSEXN_TYPEERR, "can't overwrite accessor property {0}")
 MSG_DEF(JSMSG_UNDEFINED_PROP,          1, JSEXN_REFERENCEERR, "reference to undefined property {0}")
 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")
@@ -228,6 +229,7 @@
 MSG_DEF(JSMSG_CURLY_BEFORE_BODY,       0, JSEXN_SYNTAXERR, "missing { before function body")
 MSG_DEF(JSMSG_CURLY_BEFORE_CATCH,      0, JSEXN_SYNTAXERR, "missing { before catch block")
 MSG_DEF(JSMSG_CURLY_BEFORE_CLASS,      0, JSEXN_SYNTAXERR, "missing { before class body")
+MSG_DEF(JSMSG_CURLY_BEFORE_LET,        0, JSEXN_SYNTAXERR, "missing { before let block")
 MSG_DEF(JSMSG_CURLY_BEFORE_FINALLY,    0, JSEXN_SYNTAXERR, "missing { before finally block")
 MSG_DEF(JSMSG_CURLY_BEFORE_SWITCH,     0, JSEXN_SYNTAXERR, "missing { before switch body")
 MSG_DEF(JSMSG_CURLY_BEFORE_TRY,        0, JSEXN_SYNTAXERR, "missing { before try block")
@@ -238,7 +240,6 @@
 MSG_DEF(JSMSG_DEPRECATED_FLAGS_ARG,    0, JSEXN_NONE, "flags argument of String.prototype.{search,match,replace} is deprecated")
 MSG_DEF(JSMSG_DEPRECATED_LET_BLOCK,      0, JSEXN_NONE, "JavaScript 1.7's let blocks are deprecated")
 MSG_DEF(JSMSG_DEPRECATED_FOR_EACH,     0, JSEXN_NONE, "JavaScript 1.6's for-each-in loops are deprecated; consider using ES6 for-of instead")
-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}")
@@ -307,7 +308,6 @@
 MSG_DEF(JSMSG_SEMI_BEFORE_STMNT,       0, JSEXN_SYNTAXERR, "missing ; before statement")
 MSG_DEF(JSMSG_SOURCE_TOO_LONG,         0, JSEXN_RANGEERR, "source is too long")
 MSG_DEF(JSMSG_STMT_AFTER_RETURN,       0, JSEXN_SYNTAXERR, "unreachable code after return statement")
-MSG_DEF(JSMSG_STRICT_CODE_LET_EXPR_STMT, 0, JSEXN_ERR, "strict mode code may not contain unparenthesized let expression statements")
 MSG_DEF(JSMSG_STRICT_CODE_WITH,        0, JSEXN_SYNTAXERR, "strict mode code may not contain 'with' statements")
 MSG_DEF(JSMSG_STRICT_FUNCTION_STATEMENT, 0, JSEXN_SYNTAXERR, "in strict mode code, functions may be declared only at top level or immediately within another function")
 MSG_DEF(JSMSG_TEMPLSTR_UNTERM_EXPR,    0, JSEXN_SYNTAXERR, "missing } in template string")
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsobj.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsobj.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsobj.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsobj.cpp	2015-05-25 20:43:25.000000000 +0000
@@ -98,7 +98,7 @@
     if (v.isPrimitive()) {
         RootedValue value(cx, v);
         UniquePtr<char[], JS::FreePolicy> bytes =
-            DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, value, NullPtr());
+            DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, value, nullptr);
         if (!bytes)
             return nullptr;
         JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT, bytes.get());
@@ -216,7 +216,7 @@
     HandleValue v = args[0];
     if (!v.isObject()) {
         UniquePtr<char[], JS::FreePolicy> bytes =
-            DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, v, NullPtr());
+            DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, v, nullptr);
         if (!bytes)
             return false;
         JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
@@ -264,7 +264,7 @@
     if (js_ErrorFormatString[errorNumber].argCount == 1) {
         RootedValue val(cx, ObjectValue(*obj));
         ReportValueErrorFlags(cx, JSREPORT_ERROR, errorNumber,
-                              JSDVG_IGNORE_STACK, val, NullPtr(),
+                              JSDVG_IGNORE_STACK, val, nullptr,
                               nullptr, nullptr);
     } else {
         MOZ_ASSERT(js_ErrorFormatString[errorNumber].argCount == 0);
@@ -1717,7 +1717,7 @@
         }
 
         RootedArrayObject clone(cx, NewDenseUnallocatedArray(cx, aobj->length(),
-                                                             NullPtr(), newKind));
+                                                             nullptr, newKind));
         if (!clone || !clone->ensureElements(cx, values.length()))
             return nullptr;
 
@@ -1857,7 +1857,7 @@
             return false;
 
         if (mode == XDR_DECODE) {
-            obj.set(NewDenseUnallocatedArray(cx, length, NullPtr(), TenuredObject));
+            obj.set(NewDenseUnallocatedArray(cx, length, nullptr, TenuredObject));
             if (!obj)
                 return false;
             aobj = &obj->as<ArrayObject>();
@@ -1999,7 +1999,7 @@
     MOZ_ASSERT(srcArray->getElementsHeader()->ownerObject() == srcObj);
 
     size_t length = srcArray->as<ArrayObject>().length();
-    RootedArrayObject res(cx, NewDenseFullyAllocatedArray(cx, length, NullPtr(), TenuredObject));
+    RootedArrayObject res(cx, NewDenseFullyAllocatedArray(cx, length, nullptr, TenuredObject));
     if (!res)
         return nullptr;
 
@@ -2603,7 +2603,7 @@
 {
     if (is<JSFunction>()) {
         const JSFunction& fun = as<JSFunction>();
-        return fun.isNativeConstructor() || fun.isInterpretedConstructor();
+        return fun.isConstructor();
     }
     return constructHook() != nullptr;
 }
@@ -2857,7 +2857,7 @@
 {
     RootedValue val(cx, IdToValue(id));
     return ReportValueErrorFlags(cx, report, JSMSG_READ_ONLY,
-                                 JSDVG_IGNORE_STACK, val, js::NullPtr(),
+                                 JSDVG_IGNORE_STACK, val, nullptr,
                                  nullptr, nullptr);
 }
 
@@ -2866,7 +2866,7 @@
 {
     RootedValue val(cx, IdToValue(id));
     return ReportValueErrorFlags(cx, report, JSMSG_CANT_DELETE,
-                                 JSDVG_IGNORE_STACK, val, js::NullPtr(),
+                                 JSDVG_IGNORE_STACK, val, nullptr,
                                  nullptr, nullptr);
 }
 
@@ -2875,7 +2875,7 @@
 {
     RootedValue val(cx, ObjectValue(*this));
     return ReportValueErrorFlags(cx, report, JSMSG_OBJECT_NOT_EXTENSIBLE,
-                                 JSDVG_IGNORE_STACK, val, js::NullPtr(),
+                                 JSDVG_IGNORE_STACK, val, nullptr,
                                  nullptr, nullptr);
 }
 
@@ -3095,7 +3095,7 @@
     MOZ_ASSERT(!(attrs & JSPROP_PROPOP_ACCESSORS));
 
     Rooted<PropertyDescriptor> desc(cx);
-    desc.initFields(NullPtr(), value, attrs, getter, setter);
+    desc.initFields(nullptr, value, attrs, getter, setter);
     if (DefinePropertyOp op = obj->getOps()->defineProperty) {
         if (!cx->shouldBeJSContext())
             return false;
@@ -3502,7 +3502,7 @@
 
     if (val.isNullOrUndefined()) {
         if (reportScanStack) {
-            ReportIsNullOrUndefined(cx, JSDVG_SEARCH_STACK, val, NullPtr());
+            ReportIsNullOrUndefined(cx, JSDVG_SEARCH_STACK, val, nullptr);
         } else {
             JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_CONVERT_TO,
                                  val.isNull() ? "null" : "undefined", "object");
@@ -4113,7 +4113,11 @@
         {
             GetObjectSlotNameFunctor func(nobj);
             JS::AutoTracingDetails ctx(trc, func);
-            TraceObjectSlots(trc, nobj, 0, nobj->slotSpan());
+            JS::AutoTracingIndex index(trc);
+            for (uint32_t i = 0; i < nobj->slotSpan(); ++i) {
+                TraceManuallyBarrieredEdge(trc, nobj->getSlotRef(i).unsafeGet(), "object slot");
+                ++index;
+            }
         }
 
         do {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsobj.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsobj.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsobj.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsobj.h	2015-05-25 20:43:25.000000000 +0000
@@ -155,9 +155,8 @@
         return group_->lazy();
     }
 
-    JSCompartment* compartment() const {
-        return group_->compartment();
-    }
+    JSCompartment* compartment() const { return group_->compartment(); }
+    JSCompartment* maybeCompartment() const { return compartment(); }
 
     inline js::Shape* maybeShape() const;
     inline js::Shape* ensureShape(js::ExclusiveContext* cx);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsobjinlines.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsobjinlines.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsobjinlines.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsobjinlines.h	2015-05-25 20:43:25.000000000 +0000
@@ -680,7 +680,7 @@
 NewBuiltinClassInstance(ExclusiveContext* cx, const Class* clasp, gc::AllocKind allocKind,
                         NewObjectKind newKind = GenericObject)
 {
-    return NewObjectWithClassProto(cx, clasp, NullPtr(), allocKind, newKind);
+    return NewObjectWithClassProto(cx, clasp, nullptr, allocKind, newKind);
 }
 
 inline JSObject*
@@ -763,7 +763,7 @@
       case ESClass_Object: return obj->is<PlainObject>() || obj->is<UnboxedPlainObject>();
       case ESClass_Array:
       case ESClass_IsArray:
-        // There difference between those is only relevant for proxies.
+        // The difference between Array and IsArray is only relevant for proxies.
         return obj->is<ArrayObject>() || obj->is<UnboxedArrayObject>();
       case ESClass_Number: return obj->is<NumberObject>();
       case ESClass_String: return obj->is<StringObject>();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsopcode.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsopcode.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsopcode.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsopcode.cpp	2015-05-25 20:43:25.000000000 +0000
@@ -530,9 +530,9 @@
     Bytecode*& code = codeArray_[offset];
     if (!code) {
         code = alloc().new_<Bytecode>();
-        if (!code)
-            return false;
-        if (!code->captureOffsetStack(alloc(), offsetStack, stackDepth)) {
+        if (!code ||
+            !code->captureOffsetStack(alloc(), offsetStack, stackDepth))
+        {
             reportOOM();
             return false;
         }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsreflect.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsreflect.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsreflect.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsreflect.cpp	2015-05-25 20:43:25.000000000 +0000
@@ -165,7 +165,7 @@
           userv(c)
     {}
 
-    bool init(HandleObject userobj = js::NullPtr()) {
+    bool init(HandleObject userobj = nullptr) {
         if (src) {
             if (!atomValue(src, &srcval))
                 return false;
@@ -201,7 +201,7 @@
 
             if (!funv.isObject() || !funv.toObject().is<JSFunction>()) {
                 ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_NOT_FUNCTION,
-                                      JSDVG_SEARCH_STACK, funv, js::NullPtr(), nullptr, nullptr);
+                                      JSDVG_SEARCH_STACK, funv, nullptr, nullptr, nullptr);
                 return false;
             }
 
@@ -681,8 +681,6 @@
     bool generatorExpression(HandleValue body, NodeVector& blocks, HandleValue filter,
                              bool isLegacy, TokenPos* pos, MutableHandleValue dst);
 
-    bool letExpression(NodeVector& head, HandleValue expr, TokenPos* pos, MutableHandleValue dst);
-
     /*
      * declarations
      */
@@ -1476,24 +1474,6 @@
 }
 
 bool
-NodeBuilder::letExpression(NodeVector& head, HandleValue expr, TokenPos* pos,
-                           MutableHandleValue dst)
-{
-    RootedValue array(cx);
-    if (!newArray(head, &array))
-        return false;
-
-    RootedValue cb(cx, callbacks[AST_LET_EXPR]);
-    if (!cb.isNull())
-        return callback(cb, array, expr, pos, dst);
-
-    return newNode(AST_LET_EXPR, pos,
-                   "head", array,
-                   "body", expr,
-                   dst);
-}
-
-bool
 NodeBuilder::letStatement(NodeVector& head, HandleValue stmt, TokenPos* pos, MutableHandleValue dst)
 {
     RootedValue array(cx);
@@ -1800,7 +1780,7 @@
     bool declaration(ParseNode* pn, MutableHandleValue dst);
     bool variableDeclaration(ParseNode* pn, bool lexical, MutableHandleValue dst);
     bool variableDeclarator(ParseNode* pn, MutableHandleValue dst);
-    bool let(ParseNode* pn, bool expr, MutableHandleValue dst);
+    bool letBlock(ParseNode* pn, MutableHandleValue dst);
     bool importDeclaration(ParseNode* pn, MutableHandleValue dst);
     bool importSpecifier(ParseNode* pn, MutableHandleValue dst);
     bool exportDeclaration(ParseNode* pn, MutableHandleValue dst);
@@ -2144,7 +2124,7 @@
 }
 
 bool
-ASTSerializer::let(ParseNode* pn, bool expr, MutableHandleValue dst)
+ASTSerializer::letBlock(ParseNode* pn, MutableHandleValue dst)
 {
     MOZ_ASSERT(pn->pn_pos.encloses(pn->pn_left->pn_pos));
     MOZ_ASSERT(pn->pn_pos.encloses(pn->pn_right->pn_pos));
@@ -2168,11 +2148,8 @@
     }
 
     RootedValue v(cx);
-    return expr
-           ? expression(letBody->pn_expr, &v) &&
-             builder.letExpression(dtors, v, &pn->pn_pos, dst)
-           : statement(letBody->pn_expr, &v) &&
-             builder.letStatement(dtors, v, &pn->pn_pos, dst);
+    return statement(letBody->pn_expr, &v) &&
+           builder.letStatement(dtors, v, &pn->pn_pos, dst);
 }
 
 bool
@@ -2442,7 +2419,7 @@
         return declaration(pn, dst);
 
       case PNK_LETBLOCK:
-        return let(pn, false, dst);
+        return letBlock(pn, dst);
 
       case PNK_LET:
       case PNK_CONST:
@@ -3192,9 +3169,6 @@
         LOCAL_ASSERT(pn->pn_count == 1);
         return comprehension(pn->pn_head, dst);
 
-      case PNK_LETEXPR:
-        return let(pn, true, dst);
-
       case PNK_CLASS:
         return classDefinition(pn, true, dst);
 
@@ -3625,7 +3599,7 @@
     if (!arg.isNullOrUndefined()) {
         if (!arg.isObject()) {
             ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_UNEXPECTED_TYPE,
-                                  JSDVG_SEARCH_STACK, arg, js::NullPtr(),
+                                  JSDVG_SEARCH_STACK, arg, nullptr,
                                   "not an object", nullptr);
             return false;
         }
@@ -3677,7 +3651,7 @@
         if (!prop.isNullOrUndefined()) {
             if (!prop.isObject()) {
                 ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_UNEXPECTED_TYPE,
-                                      JSDVG_SEARCH_STACK, prop, js::NullPtr(),
+                                      JSDVG_SEARCH_STACK, prop, nullptr,
                                       "not an object", nullptr);
                 return false;
             }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsscript.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsscript.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsscript.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsscript.cpp	2015-05-25 20:43:25.000000000 +0000
@@ -1174,7 +1174,7 @@
         }
 
         if (mode == XDR_DECODE)
-            lazy.set(LazyScript::Create(cx, fun, NullPtr(), enclosingScope, enclosingScript,
+            lazy.set(LazyScript::Create(cx, fun, nullptr, enclosingScope, enclosingScript,
                                         packedFields, begin, end, lineno, column));
     }
 
@@ -1388,7 +1388,7 @@
 ScriptSourceObject*
 ScriptSourceObject::create(ExclusiveContext* cx, ScriptSource* source)
 {
-    RootedObject object(cx, NewObjectWithGivenProto(cx, &class_, NullPtr()));
+    RootedObject object(cx, NewObjectWithGivenProto(cx, &class_, nullptr));
     if (!object)
         return nullptr;
     RootedScriptSource sourceObject(cx, &object->as<ScriptSourceObject>());
@@ -3244,7 +3244,7 @@
     if (script->compartment() != cx->compartment() && scope) {
         MOZ_ASSERT(!scope->as<StaticEvalObject>().isDirect() &&
                    !scope->as<StaticEvalObject>().isStrict());
-        scope = StaticEvalObject::create(cx, NullPtr());
+        scope = StaticEvalObject::create(cx, nullptr);
         if (!scope)
             return false;
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsscript.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsscript.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsscript.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsscript.h	2015-05-25 20:43:25.000000000 +0000
@@ -1061,6 +1061,7 @@
     inline JSPrincipals* principals();
 
     JSCompartment* compartment() const { return compartment_; }
+    JSCompartment* maybeCompartment() const { return compartment(); }
 
     void setVersion(JSVersion v) { version = v; }
 
@@ -1733,7 +1734,7 @@
         JSContext* cx_;
         bool oldDoNotRelazify_;
       public:
-        explicit AutoDelazify(JSContext* cx, JS::HandleFunction fun = JS::NullPtr())
+        explicit AutoDelazify(JSContext* cx, JS::HandleFunction fun = nullptr)
             : script_(cx)
             , cx_(cx)
         {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsutil.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsutil.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsutil.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsutil.cpp	2015-05-25 20:43:25.000000000 +0000
@@ -31,6 +31,7 @@
 /* For JS_OOM_POSSIBLY_FAIL in jsutil.h. */
 JS_PUBLIC_DATA(uint32_t) OOM_maxAllocations = UINT32_MAX;
 JS_PUBLIC_DATA(uint32_t) OOM_counter = 0;
+JS_PUBLIC_DATA(bool) OOM_failAlways = true;
 #endif
 
 JS_PUBLIC_API(void)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsweakmap.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsweakmap.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsweakmap.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsweakmap.cpp	2015-05-25 20:43:25.000000000 +0000
@@ -39,7 +39,10 @@
 
 WeakMapBase::~WeakMapBase()
 {
-    MOZ_ASSERT(!isInList());
+    MOZ_ASSERT(CurrentThreadIsGCSweeping() || CurrentThreadIsHandlingInitFailure());
+    MOZ_ASSERT_IF(CurrentThreadIsGCSweeping(), !isInList());
+    if (isInList())
+        removeWeakMapFromList(this);
 }
 
 void
@@ -48,9 +51,9 @@
     MOZ_ASSERT(isInList());
     if (tracer->isMarkingTracer()) {
         // We don't trace any of the WeakMap entries at this time, just record
-        // record the fact that the WeakMap has been marked. Enties are marked
+        // record the fact that the WeakMap has been marked. Entries are marked
         // in the iterative marking phase by markAllIteratively(), which happens
-        // when many keys as possible have been marked already.
+        // when as many keys as possible have been marked already.
         MOZ_ASSERT(tracer->eagerlyTraceWeakMaps() == DoNotTraceWeakMaps);
         marked = true;
     } else {
@@ -392,7 +395,7 @@
 
     if (!args.get(0).isObject()) {
         UniquePtr<char[], JS::FreePolicy> bytes =
-            DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, args.get(0), NullPtr());
+            DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, args.get(0), nullptr);
         if (!bytes)
             return false;
         JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT, bytes.get());
@@ -577,7 +580,7 @@
             if (isOriginalAdder) {
                 if (keyVal.isPrimitive()) {
                     UniquePtr<char[], JS::FreePolicy> bytes =
-                        DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, keyVal, NullPtr());
+                        DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, keyVal, nullptr);
                     if (!bytes)
                         return false;
                     JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT, bytes.get());
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsweakmap.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsweakmap.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/jsweakmap.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/jsweakmap.h	2015-05-25 20:43:25.000000000 +0000
@@ -92,7 +92,7 @@
     virtual void finish() = 0;
 
     // Object that this weak map is part of, if any.
-    RelocatablePtrObject memberOf;
+    HeapPtrObject memberOf;
 
     // Compartment that this weak map is part of.
     JSCompartment* compartment;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/moz.build firefox-trunk-41.0~a1~hg20150524r245419/js/src/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/moz.build	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/moz.build	2015-05-25 20:43:25.000000000 +0000
@@ -213,7 +213,6 @@
     'jit/JSONSpewer.cpp',
     'jit/LICM.cpp',
     'jit/LIR.cpp',
-    'jit/LiveRangeAllocator.cpp',
     'jit/LoopUnroller.cpp',
     'jit/Lowering.cpp',
     'jit/MacroAssembler.cpp',
@@ -539,6 +538,11 @@
     # But given the conversion from bool is specified, and this is a
     # pattern widely used in code in js/src, suppress this warning here.
     CXXFLAGS += ['-wd4805']
+    # C4661 ("no suitable definition provided for explicit template
+    # instantiation request") is emitted for all Parser methods that
+    # have a Parser<FullParseHandler> definition but no
+    # Parser<SyntaxParseHandler> definition, see bug 1167030.
+    CXXFLAGS += ['-wd4661']
     CXXFLAGS += ['-we4067', '-we4258', '-we4275']
 
 if CONFIG['OS_ARCH'] not in ('WINNT', 'HP-UX'):
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/perf/jsperf.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/perf/jsperf.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/perf/jsperf.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/perf/jsperf.cpp	2015-05-25 20:43:26.000000000 +0000
@@ -213,7 +213,7 @@
 {
     if (!value.isObject()) {
         UniquePtr<char[], JS::FreePolicy> bytes =
-            DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, value, NullPtr());
+            DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, value, nullptr);
         if (!bytes)
             return nullptr;
         JS_ReportErrorNumber(cx, GetErrorMessage, 0, JSMSG_NOT_NONNULL_OBJECT, bytes.get());
@@ -241,7 +241,7 @@
 
     RootedObject global(cx, globalArg);
     RootedObject prototype(cx);
-    prototype = JS_InitClass(cx, global, js::NullPtr() /* parent */,
+    prototype = JS_InitClass(cx, global, nullptr /* parent */,
                              &pm_class, pm_construct, 1,
                              pm_props, pm_fns, 0, 0);
     if (!prototype)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/proxy/BaseProxyHandler.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/proxy/BaseProxyHandler.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/proxy/BaseProxyHandler.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/proxy/BaseProxyHandler.cpp	2015-05-25 20:43:26.000000000 +0000
@@ -154,15 +154,26 @@
             return CallJSSetterOp(cx, setter, receiverObj, id, &valCopy, result);
         }
 
-        // Steps 5.c-d. Adapt for SpiderMonkey by using HasOwnProperty instead
-        // of the standard [[GetOwnProperty]].
-        bool existingDescriptor;
-        if (!HasOwnProperty(cx, receiverObj, id, &existingDescriptor))
+        // Steps 5.c-d.
+        Rooted<PropertyDescriptor> existingDescriptor(cx);
+        if (!GetOwnPropertyDescriptor(cx, receiverObj, id, &existingDescriptor))
             return false;
 
-        // Steps 5.e-f.
+        // Step 5.e.
+        if (existingDescriptor.object()) {
+            // Step 5.e.i.
+            if (existingDescriptor.isAccessorDescriptor())
+                return result.fail(JSMSG_OVERWRITING_ACCESSOR);
+
+            // Step 5.e.ii.
+            if (!existingDescriptor.writable())
+                return result.fail(JSMSG_READ_ONLY);
+        }
+
+
+        // Steps 5.e.iii-iv. and 5.f.i.
         unsigned attrs =
-            existingDescriptor
+            existingDescriptor.object()
             ? JSPROP_IGNORE_ENUMERATE | JSPROP_IGNORE_READONLY | JSPROP_IGNORE_PERMANENT
             : JSPROP_ENUMERATE;
 
@@ -301,7 +312,7 @@
     assertEnteredPolicy(cx, proxy, JSID_VOID, GET);
     RootedValue val(cx, ObjectValue(*proxy.get()));
     ReportValueError(cx, JSMSG_BAD_INSTANCEOF_RHS,
-                     JSDVG_SEARCH_STACK, val, js::NullPtr());
+                     JSDVG_SEARCH_STACK, val, nullptr);
     return false;
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/proxy/DeadObjectProxy.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/proxy/DeadObjectProxy.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/proxy/DeadObjectProxy.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/proxy/DeadObjectProxy.cpp	2015-05-25 20:43:26.000000000 +0000
@@ -14,11 +14,17 @@
 using namespace js;
 using namespace js::gc;
 
+static void
+ReportDead(JSContext *cx)
+{
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+}
+
 bool
 DeadObjectProxy::getOwnPropertyDescriptor(JSContext* cx, HandleObject wrapper, HandleId id,
                                           MutableHandle<PropertyDescriptor> desc) const
 {
-    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    ReportDead(cx);
     return false;
 }
 
@@ -27,7 +33,7 @@
                                 Handle<PropertyDescriptor> desc,
                                 ObjectOpResult& result) const
 {
-    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    ReportDead(cx);
     return false;
 }
 
@@ -35,7 +41,7 @@
 DeadObjectProxy::ownPropertyKeys(JSContext* cx, HandleObject wrapper,
                                  AutoIdVector& props) const
 {
-    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    ReportDead(cx);
     return false;
 }
 
@@ -43,14 +49,14 @@
 DeadObjectProxy::delete_(JSContext* cx, HandleObject wrapper, HandleId id,
                          ObjectOpResult& result) const
 {
-    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    ReportDead(cx);
     return false;
 }
 
 bool
 DeadObjectProxy::enumerate(JSContext* cx, HandleObject wrapper, MutableHandleObject objp) const
 {
-    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    ReportDead(cx);
     return false;
 }
 
@@ -64,7 +70,7 @@
 bool
 DeadObjectProxy::preventExtensions(JSContext* cx, HandleObject proxy, ObjectOpResult& result) const
 {
-    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    ReportDead(cx);
     return false;
 }
 
@@ -80,14 +86,14 @@
 bool
 DeadObjectProxy::call(JSContext* cx, HandleObject wrapper, const CallArgs& args) const
 {
-    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    ReportDead(cx);
     return false;
 }
 
 bool
 DeadObjectProxy::construct(JSContext* cx, HandleObject wrapper, const CallArgs& args) const
 {
-    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    ReportDead(cx);
     return false;
 }
 
@@ -95,7 +101,7 @@
 DeadObjectProxy::nativeCall(JSContext* cx, IsAcceptableThis test, NativeImpl impl,
                             CallArgs args) const
 {
-    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    ReportDead(cx);
     return false;
 }
 
@@ -103,14 +109,14 @@
 DeadObjectProxy::hasInstance(JSContext* cx, HandleObject proxy, MutableHandleValue v,
                              bool* bp) const
 {
-    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    ReportDead(cx);
     return false;
 }
 
 bool
 DeadObjectProxy::objectClassIs(HandleObject obj, ESClassValue classValue, JSContext* cx) const
 {
-    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    ReportDead(cx);
     return false;
 }
 
@@ -123,13 +129,14 @@
 JSString*
 DeadObjectProxy::fun_toString(JSContext* cx, HandleObject proxy, unsigned indent) const
 {
+    ReportDead(cx);
     return nullptr;
 }
 
 bool
 DeadObjectProxy::regexp_toShared(JSContext* cx, HandleObject proxy, RegExpGuard* g) const
 {
-    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    ReportDead(cx);
     return false;
 }
 
@@ -137,7 +144,7 @@
 DeadObjectProxy::defaultValue(JSContext* cx, HandleObject obj, JSType hint,
                               MutableHandleValue vp) const
 {
-    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    ReportDead(cx);
     return false;
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/proxy/ScriptedDirectProxyHandler.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/proxy/ScriptedDirectProxyHandler.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/proxy/ScriptedDirectProxyHandler.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/proxy/ScriptedDirectProxyHandler.cpp	2015-05-25 20:43:26.000000000 +0000
@@ -157,7 +157,7 @@
     if (!AtomToPrintableString(cx, atom, &bytes))
         return;
     ReportValueError2(cx, JSMSG_INVALID_TRAP_RESULT, JSDVG_IGNORE_STACK, v,
-                      js::NullPtr(), bytes.ptr());
+                      nullptr, bytes.ptr());
 }
 
 // This function is shared between ownPropertyKeys, enumerate, and
@@ -708,7 +708,7 @@
     // step 14-15
     if (desc.object() && !desc.configurable()) {
         RootedValue v(cx, IdToValue(id));
-        ReportValueError(cx, JSMSG_CANT_DELETE, JSDVG_IGNORE_STACK, v, js::NullPtr());
+        ReportValueError(cx, JSMSG_CANT_DELETE, JSDVG_IGNORE_STACK, v, nullptr);
         return false;
     }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/proxy/ScriptedIndirectProxyHandler.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/proxy/ScriptedIndirectProxyHandler.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/proxy/ScriptedIndirectProxyHandler.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/proxy/ScriptedIndirectProxyHandler.cpp	2015-05-25 20:43:26.000000000 +0000
@@ -156,7 +156,7 @@
         if (AtomToPrintableString(cx, atom, &bytes)) {
             RootedValue val(cx, ObjectOrNullValue(proxy));
             ReportValueError2(cx, JSMSG_BAD_TRAP_RETURN_VALUE,
-                              JSDVG_SEARCH_STACK, val, js::NullPtr(), bytes.ptr());
+                              JSDVG_SEARCH_STACK, val, nullptr, bytes.ptr());
         }
         return false;
     }
@@ -532,7 +532,7 @@
     // Stash the call and construct traps on a holder object that we can stick
     // in a slot on the proxy.
     RootedObject ccHolder(cx, JS_NewObjectWithGivenProto(cx, Jsvalify(&CallConstructHolder),
-                                                         js::NullPtr()));
+                                                         nullptr));
     if (!ccHolder)
         return false;
     ccHolder->as<NativeObject>().setReservedSlot(0, ObjectValue(*call));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/proxy/SecurityWrapper.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/proxy/SecurityWrapper.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/proxy/SecurityWrapper.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/proxy/SecurityWrapper.cpp	2015-05-25 20:43:26.000000000 +0000
@@ -11,12 +11,18 @@
 
 using namespace js;
 
+static void
+ReportUnwrapDenied(JSContext *cx)
+{
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNWRAP_DENIED);
+}
+
 template <class Base>
 bool
 SecurityWrapper<Base>::enter(JSContext* cx, HandleObject wrapper, HandleId id,
                              Wrapper::Action act, bool* bp) const
 {
-    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNWRAP_DENIED);
+    ReportUnwrapDenied(cx);
     *bp = false;
     return false;
 }
@@ -26,7 +32,7 @@
 SecurityWrapper<Base>::nativeCall(JSContext* cx, IsAcceptableThis test, NativeImpl impl,
                                   CallArgs args) const
 {
-    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNWRAP_DENIED);
+    ReportUnwrapDenied(cx);
     return false;
 }
 
@@ -35,7 +41,7 @@
 SecurityWrapper<Base>::setPrototype(JSContext* cx, HandleObject wrapper, HandleObject proto,
                                     ObjectOpResult& result) const
 {
-    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNWRAP_DENIED);
+    ReportUnwrapDenied(cx);
     return false;
 }
 
@@ -44,7 +50,7 @@
 SecurityWrapper<Base>::setImmutablePrototype(JSContext* cx, HandleObject wrapper,
                                              bool* succeeded) const
 {
-    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNWRAP_DENIED);
+    ReportUnwrapDenied(cx);
     return false;
 }
 
@@ -129,7 +135,7 @@
 SecurityWrapper<Base>::watch(JSContext* cx, HandleObject proxy,
                              HandleId id, HandleObject callable) const
 {
-    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNWRAP_DENIED);
+    ReportUnwrapDenied(cx);
     return false;
 }
 
@@ -138,7 +144,7 @@
 SecurityWrapper<Base>::unwatch(JSContext* cx, HandleObject proxy,
                                HandleId id) const
 {
-    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNWRAP_DENIED);
+    ReportUnwrapDenied(cx);
     return false;
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/shell/js.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/shell/js.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/shell/js.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/shell/js.cpp	2015-05-25 20:43:26.000000000 +0000
@@ -86,14 +86,9 @@
 #include "vm/Interpreter-inl.h"
 #include "vm/Stack-inl.h"
 
-#ifdef XP_WIN
-# define PATH_MAX (MAX_PATH > _MAX_DIR ? MAX_PATH : _MAX_DIR)
-#else
-# include <libgen.h>
-#endif
-
 using namespace js;
 using namespace js::cli;
+using namespace js::shell;
 
 using mozilla::ArrayLength;
 using mozilla::MakeUnique;
@@ -110,11 +105,6 @@
     EXITCODE_TIMEOUT            = 6
 };
 
-enum PathResolutionMode {
-    RootRelative,
-    ScriptRelative
-};
-
 static size_t gStackChunkSize = 8192;
 
 /*
@@ -142,7 +132,6 @@
 static bool enableIon = false;
 static bool enableAsmJS = false;
 static bool enableNativeRegExp = false;
-static bool enableUnboxedObjects = false;
 static bool enableUnboxedArrays = false;
 #ifdef JS_GC_ZEAL
 static char gZealStr[128];
@@ -195,14 +184,6 @@
 static bool OOM_printAllocationCount = false;
 #endif
 
-enum JSShellErrNum {
-#define MSG_DEF(name, count, exception, format) \
-    name,
-#include "jsshell.msg"
-#undef MSG_DEF
-    JSShellErr_Limit
-};
-
 static JSContext*
 NewContext(JSRuntime* rt);
 
@@ -213,12 +194,6 @@
 NewGlobalObject(JSContext* cx, JS::CompartmentOptions& options,
                 JSPrincipals* principals);
 
-static const JSErrorFormatString*
-my_GetErrorMessage(void* userRef, const unsigned errorNumber);
-
-static void
-my_ErrorReporter(JSContext* cx, const char* message, JSErrorReport* report);
-
 /*
  * A toy principals type for the shell.
  *
@@ -384,7 +359,7 @@
         JS::AutoSaveExceptionState savedExc(cx);
         JSAutoCompartment ac(cx, &interruptFunc.toObject());
         RootedValue rval(cx);
-        if (!JS_CallFunctionValue(cx, JS::NullPtr(), interruptFunc,
+        if (!JS_CallFunctionValue(cx, nullptr, interruptFunc,
                                   JS::HandleValueArray::empty(), &rval))
         {
             return false;
@@ -565,18 +540,6 @@
     fprintf(out, "\n");
 }
 
-class AutoCloseInputFile
-{
-  private:
-    FILE* f_;
-  public:
-    explicit AutoCloseInputFile(FILE* f) : f_(f) {}
-    ~AutoCloseInputFile() {
-        if (f_ && f_ != stdin)
-            fclose(f_);
-    }
-};
-
 static void
 Process(JSContext* cx, const char* filename, bool forceTTY)
 {
@@ -631,77 +594,6 @@
     return true;
 }
 
-/*
- * Resolve a (possibly) relative filename to an absolute path. If
- * |scriptRelative| is true, then the result will be relative to the directory
- * containing the currently-running script, or the current working directory if
- * the currently-running script is "-e" (namely, you're using it from the
- * command line.) Otherwise, it will be relative to the current working
- * directory.
- */
-static JSString*
-ResolvePath(JSContext* cx, HandleString filenameStr, PathResolutionMode resolveMode)
-{
-    JSAutoByteString filename(cx, filenameStr);
-    if (!filename)
-        return nullptr;
-
-    const char* pathname = filename.ptr();
-    if (pathname[0] == '/')
-        return filenameStr;
-#ifdef XP_WIN
-    // Various forms of absolute paths per http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247%28v=vs.85%29.aspx
-    // "\..."
-    if (pathname[0] == '\\')
-        return filenameStr;
-    // "C:\..."
-    if (strlen(pathname) > 3 && isalpha(pathname[0]) && pathname[1] == ':' && pathname[2] == '\\')
-        return filenameStr;
-    // "\\..."
-    if (strlen(pathname) > 2 && pathname[1] == '\\' && pathname[2] == '\\')
-        return filenameStr;
-#endif
-
-    /* Get the currently executing script's name. */
-    JS::AutoFilename scriptFilename;
-    if (!DescribeScriptedCaller(cx, &scriptFilename))
-        return nullptr;
-
-    if (!scriptFilename.get())
-        return nullptr;
-
-    if (strcmp(scriptFilename.get(), "-e") == 0 || strcmp(scriptFilename.get(), "typein") == 0)
-        resolveMode = RootRelative;
-
-    static char buffer[PATH_MAX+1];
-    if (resolveMode == ScriptRelative) {
-#ifdef XP_WIN
-        // The docs say it can return EINVAL, but the compiler says it's void
-        _splitpath(scriptFilename.get(), nullptr, buffer, nullptr, nullptr);
-#else
-        strncpy(buffer, scriptFilename.get(), PATH_MAX+1);
-        if (buffer[PATH_MAX] != '\0')
-            return nullptr;
-
-        // dirname(buffer) might return buffer, or it might return a
-        // statically-allocated string
-        memmove(buffer, dirname(buffer), strlen(buffer) + 1);
-#endif
-    } else {
-        const char* cwd = getcwd(buffer, PATH_MAX);
-        if (!cwd)
-            return nullptr;
-    }
-
-    size_t len = strlen(buffer);
-    buffer[len] = '/';
-    strncpy(buffer + len + 1, pathname, sizeof(buffer) - (len+1));
-    if (buffer[PATH_MAX] != '\0')
-        return nullptr;
-
-    return JS_NewStringCopyZ(cx, buffer);
-}
-
 static bool
 CreateMappedArrayBuffer(JSContext* cx, unsigned argc, Value* vp)
 {
@@ -1366,8 +1258,8 @@
     return JS_WrapValue(cx, args.rval());
 }
 
-static JSString*
-FileAsString(JSContext* cx, const char* pathname)
+JSString*
+js::shell::FileAsString(JSContext* cx, const char* pathname)
 {
     FILE* file;
     RootedString str(cx);
@@ -1412,39 +1304,6 @@
     return str;
 }
 
-static JSObject*
-FileAsTypedArray(JSContext* cx, const char* pathname)
-{
-    FILE* file = fopen(pathname, "rb");
-    if (!file) {
-        JS_ReportError(cx, "can't open %s: %s", pathname, strerror(errno));
-        return nullptr;
-    }
-    AutoCloseInputFile autoClose(file);
-
-    RootedObject obj(cx);
-    if (fseek(file, 0, SEEK_END) != 0) {
-        JS_ReportError(cx, "can't seek end of %s", pathname);
-    } else {
-        size_t len = ftell(file);
-        if (fseek(file, 0, SEEK_SET) != 0) {
-            JS_ReportError(cx, "can't seek start of %s", pathname);
-        } else {
-            obj = JS_NewUint8Array(cx, len);
-            if (!obj)
-                return nullptr;
-            char* buf = (char*) obj->as<TypedArrayObject>().viewData();
-            size_t cc = fread(buf, 1, len, file);
-            if (cc != len) {
-                JS_ReportError(cx, "can't read %s: %s", pathname,
-                               (ptrdiff_t(cc) < 0) ? strerror(errno) : "short read");
-                obj = nullptr;
-            }
-        }
-    }
-    return obj;
-}
-
 /*
  * Function to run scripts and return compilation + execution time. Semantics
  * are closely modelled after the equivalent function in WebKit, as this is used
@@ -2238,14 +2097,14 @@
             Sprint(sp, " LAMBDA");
         if (fun->isHeavyweight())
             Sprint(sp, " HEAVYWEIGHT");
+        if (fun->isConstructor())
+            Sprint(sp, " CONSTRUCTOR");
         if (fun->isExprBody())
             Sprint(sp, " EXPRESSION_CLOSURE");
         if (fun->isFunctionPrototype())
             Sprint(sp, " Function.prototype");
         if (fun->isSelfHostedBuiltin())
             Sprint(sp, " SELF_HOSTED");
-        if (fun->isSelfHostedConstructor())
-            Sprint(sp, " SELF_HOSTED_CTOR");
         if (fun->isArrow())
             Sprint(sp, " ARROW");
         Sprint(sp, "\n");
@@ -2412,7 +2271,7 @@
     Sprinter sprinter(cx);
     if (!sprinter.init())
         return false;
-    bool ok = DisassembleScript(cx, script, JS::NullPtr(), p.lines, p.recursive, &sprinter);
+    bool ok = DisassembleScript(cx, script, nullptr, p.lines, p.recursive, &sprinter);
     if (ok)
         fprintf(stdout, "%s\n", sprinter.string());
     if (!ok)
@@ -3592,112 +3451,6 @@
     }
 };
 
-static bool
-ReadFile(JSContext* cx, unsigned argc, jsval* vp, bool scriptRelative)
-{
-    CallArgs args = CallArgsFromVp(argc, vp);
-
-    if (args.length() < 1 || args.length() > 2) {
-        JS_ReportErrorNumber(cx, my_GetErrorMessage, nullptr,
-                             args.length() < 1 ? JSSMSG_NOT_ENOUGH_ARGS : JSSMSG_TOO_MANY_ARGS,
-                             "snarf");
-        return false;
-    }
-
-    if (!args[0].isString() || (args.length() == 2 && !args[1].isString())) {
-        JS_ReportErrorNumber(cx, my_GetErrorMessage, nullptr, JSSMSG_INVALID_ARGS, "snarf");
-        return false;
-    }
-
-    RootedString givenPath(cx, args[0].toString());
-    RootedString str(cx, ResolvePath(cx, givenPath, scriptRelative ? ScriptRelative : RootRelative));
-    if (!str)
-        return false;
-
-    JSAutoByteString filename(cx, str);
-    if (!filename)
-        return false;
-
-    if (args.length() > 1) {
-        JSString* opt = JS::ToString(cx, args[1]);
-        if (!opt)
-            return false;
-        bool match;
-        if (!JS_StringEqualsAscii(cx, opt, "binary", &match))
-            return false;
-        if (match) {
-            JSObject* obj;
-            if (!(obj = FileAsTypedArray(cx, filename.ptr())))
-                return false;
-            args.rval().setObject(*obj);
-            return true;
-        }
-    }
-
-    if (!(str = FileAsString(cx, filename.ptr())))
-        return false;
-    args.rval().setString(str);
-    return true;
-}
-
-static bool
-Snarf(JSContext* cx, unsigned argc, jsval* vp)
-{
-    return ReadFile(cx, argc, vp, false);
-}
-
-static bool
-ReadRelativeToScript(JSContext* cx, unsigned argc, jsval* vp)
-{
-    return ReadFile(cx, argc, vp, true);
-}
-
-static bool
-redirect(JSContext* cx, FILE* fp, HandleString relFilename)
-{
-    RootedString filename(cx, ResolvePath(cx, relFilename, RootRelative));
-    if (!filename)
-        return false;
-    JSAutoByteString filenameABS(cx, filename);
-    if (!filenameABS)
-        return false;
-    if (freopen(filenameABS.ptr(), "wb", fp) == nullptr) {
-        JS_ReportError(cx, "cannot redirect to %s: %s", filenameABS.ptr(), strerror(errno));
-        return false;
-    }
-    return true;
-}
-
-static bool
-RedirectOutput(JSContext* cx, unsigned argc, jsval* vp)
-{
-    CallArgs args = CallArgsFromVp(argc, vp);
-
-    if (args.length() < 1 || args.length() > 2) {
-        JS_ReportErrorNumber(cx, my_GetErrorMessage, nullptr, JSSMSG_INVALID_ARGS, "redirect");
-        return false;
-    }
-
-    if (args[0].isString()) {
-        RootedString stdoutPath(cx, args[0].toString());
-        if (!stdoutPath)
-            return false;
-        if (!redirect(cx, stdout, stdoutPath))
-            return false;
-    }
-
-    if (args.length() > 1 && args[1].isString()) {
-        RootedString stderrPath(cx, args[1].toString());
-        if (!stderrPath)
-            return false;
-        if (!redirect(cx, stderr, stderrPath))
-            return false;
-    }
-
-    args.rval().setUndefined();
-    return true;
-}
-
 static int sArgc;
 static char** sArgv;
 
@@ -4512,6 +4265,207 @@
     return true;
 }
 
+namespace js {
+namespace shell {
+
+class ShellAutoEntryMonitor : JS::dbg::AutoEntryMonitor {
+    Vector<UniqueChars, 1, js::SystemAllocPolicy> log;
+    bool oom;
+    bool enteredWithoutExit;
+
+  public:
+    explicit ShellAutoEntryMonitor(JSContext *cx)
+      : AutoEntryMonitor(cx),
+        oom(false),
+        enteredWithoutExit(false)
+    { }
+
+    ~ShellAutoEntryMonitor() {
+        MOZ_ASSERT(!enteredWithoutExit);
+    }
+
+    void Entry(JSContext* cx, JSFunction* function) override {
+        MOZ_ASSERT(!enteredWithoutExit);
+        enteredWithoutExit = true;
+
+        RootedString displayId(cx, JS_GetFunctionDisplayId(function));
+        if (displayId) {
+            UniqueChars displayIdStr(JS_EncodeStringToUTF8(cx, displayId));
+            oom = !displayIdStr || !log.append(mozilla::Move(displayIdStr));
+            return;
+        }
+
+        oom = !log.append(make_string_copy("anonymous"));
+    }
+
+    void Entry(JSContext* cx, JSScript* script) override {
+        MOZ_ASSERT(!enteredWithoutExit);
+        enteredWithoutExit = true;
+
+        UniqueChars label(JS_smprintf("eval:%s", JS_GetScriptFilename(script)));
+        oom = !label || !log.append(mozilla::Move(label));
+    }
+
+    void Exit(JSContext* cx) override {
+        MOZ_ASSERT(enteredWithoutExit);
+        enteredWithoutExit = false;
+    }
+
+    bool buildResult(JSContext *cx, MutableHandleValue resultValue) {
+        if (oom) {
+            JS_ReportOutOfMemory(cx);
+            return false;
+        }
+
+        RootedObject result(cx, JS_NewArrayObject(cx, log.length()));
+        if (!result)
+            return false;
+
+        for (size_t i = 0; i < log.length(); i++) {
+            char *name = log[i].get();
+            RootedString string(cx, Atomize(cx, name, strlen(name)));
+            if (!string)
+                return false;
+            RootedValue value(cx, StringValue(string));
+            if (!JS_SetElement(cx, result, i, value))
+                return false;
+        }
+
+        resultValue.setObject(*result.get());
+        return true;
+    }
+};
+
+} // namespace shell
+} // namespace js
+
+static bool
+EntryPoints(JSContext* cx, unsigned argc, Value* vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+
+    if (args.length() != 1) {
+        JS_ReportError(cx, "Wrong number of arguments");
+        return false;
+    }
+
+    RootedObject opts(cx, ToObject(cx, args[0]));
+    if (!opts)
+        return false;
+
+    // { function: f } --- Call f.
+    {
+        RootedValue fun(cx), dummy(cx);
+
+        if (!JS_GetProperty(cx, opts, "function", &fun))
+            return false;
+        if (!fun.isUndefined()) {
+            js::shell::ShellAutoEntryMonitor sarep(cx);
+            if (!Call(cx, UndefinedHandleValue, fun, JS::HandleValueArray::empty(), &dummy))
+                return false;
+            return sarep.buildResult(cx, args.rval());
+        }
+    }
+
+    // { object: o, property: p, value: v } --- Fetch o[p], or if
+    // v is present, assign o[p] = v.
+    {
+        RootedValue objectv(cx), propv(cx), valuev(cx);
+
+        if (!JS_GetProperty(cx, opts, "object", &objectv) ||
+            !JS_GetProperty(cx, opts, "property", &propv))
+            return false;
+        if (!objectv.isUndefined() && !propv.isUndefined()) {
+            RootedObject object(cx, ToObject(cx, objectv));
+            if (!object)
+                return false;
+
+            RootedString string(cx, ToString(cx, propv));
+            if (!string)
+                return false;
+            RootedId id(cx);
+            if (!JS_StringToId(cx, string, &id))
+                return false;
+
+            if (!JS_GetProperty(cx, opts, "value", &valuev))
+                return false;
+
+            js::shell::ShellAutoEntryMonitor sarep(cx);
+
+            if (!valuev.isUndefined()) {
+                if (!JS_SetPropertyById(cx, object, id, valuev))
+                    return false;
+            } else {
+                if (!JS_GetPropertyById(cx, object, id, &valuev))
+                    return false;
+            }
+
+            return sarep.buildResult(cx, args.rval());
+        }
+    }
+
+    // { ToString: v } --- Apply JS::ToString to v.
+    {
+        RootedValue v(cx);
+
+        if (!JS_GetProperty(cx, opts, "ToString", &v))
+            return false;
+        if (!v.isUndefined()) {
+            js::shell::ShellAutoEntryMonitor sarep(cx);
+            if (!JS::ToString(cx, v))
+                return false;
+            return sarep.buildResult(cx, args.rval());
+        }
+    }
+
+    // { ToNumber: v } --- Apply JS::ToNumber to v.
+    {
+        RootedValue v(cx);
+        double dummy;
+
+        if (!JS_GetProperty(cx, opts, "ToNumber", &v))
+            return false;
+        if (!v.isUndefined()) {
+            js::shell::ShellAutoEntryMonitor sarep(cx);
+            if (!JS::ToNumber(cx, v, &dummy))
+                return false;
+            return sarep.buildResult(cx, args.rval());
+        }
+    }
+
+    // { eval: code } --- Apply ToString and then Evaluate to code.
+    {
+        RootedValue code(cx), dummy(cx);
+
+        if (!JS_GetProperty(cx, opts, "eval", &code))
+            return false;
+        if (!code.isUndefined()) {
+            RootedString codeString(cx, ToString(cx, code));
+            if (!codeString || !codeString->ensureFlat(cx))
+                return false;
+
+            AutoStableStringChars stableChars(cx);
+            if (!stableChars.initTwoByte(cx, codeString))
+                return false;
+            const char16_t* chars = stableChars.twoByteRange().start().get();
+            size_t length = codeString->length();
+
+            CompileOptions options(cx);
+            options.setIntroductionType("entryPoint eval")
+                   .setFileAndLine("entryPoint eval", 1);
+
+            js::shell::ShellAutoEntryMonitor sarep(cx);
+            if (!JS::Evaluate(cx, options, chars, length, &dummy))
+                return false;
+            return sarep.buildResult(cx, args.rval());
+        }
+    }
+
+    JS_ReportError(cx, "bad 'params' object");
+    return false;
+}
+
+
 static const JSFunctionSpecWithHelp shell_functions[] = {
     JS_FN_HELP("version", Version, 0, 0,
 "version([number])",
@@ -4706,20 +4660,6 @@
 "sleep(dt)",
 "  Sleep for dt seconds."),
 
-    JS_FN_HELP("snarf", Snarf, 1, 0,
-"snarf(filename, [\"binary\"])",
-"  Read filename into returned string. Filename is relative to the current\n"
-               "  working directory."),
-
-    JS_FN_HELP("read", Snarf, 1, 0,
-"read(filename, [\"binary\"])",
-"  Synonym for snarf."),
-
-    JS_FN_HELP("readRelativeToScript", ReadRelativeToScript, 1, 0,
-"readRelativeToScript(filename, [\"binary\"])",
-"  Read filename into returned string. Filename is relative to the directory\n"
-"  containing the current script."),
-
     JS_FN_HELP("compile", Compile, 1, 0,
 "compile(code)",
 "  Compiles a string to bytecode, potentially throwing."),
@@ -4867,6 +4807,30 @@
 "  Return an int32 value which corresponds to the offset of the latest stack\n"
 "  pointer, such that one can take the differences of 2 to estimate a frame-size."),
 
+    JS_FN_HELP("entryPoints", EntryPoints, 1, 0,
+"entryPoints(params)",
+"Carry out some JSAPI operation as directed by |params|, and return an array of\n"
+"objects describing which JavaScript entry points were invoked as a result.\n"
+"|params| is an object whose properties indicate what operation to perform. Here\n"
+"are the recognized groups of properties:\n"
+"\n"
+"{ function }: Call the object |params.function| with no arguments.\n"
+"\n"
+"{ object, property }: Fetch the property named |params.property| of\n"
+"|params.object|.\n"
+"\n"
+"{ ToString }: Apply JS::ToString to |params.toString|.\n"
+"\n"
+"{ ToNumber }: Apply JS::ToNumber to |params.toNumber|.\n"
+"\n"
+"{ eval }: Apply JS::Evaluate to |params.eval|.\n"
+"\n"
+"The return value is an array of strings, with one element for each\n"
+"JavaScript invocation that occurred as a result of the given\n"
+"operation. Each element is the name of the function invoked, or the\n"
+"string 'eval:FILENAME' if the code was invoked by 'eval' or something\n"
+"similar.\n"),
+
     JS_FS_HELP_END
 };
 
@@ -4888,11 +4852,6 @@
 "pc2line(fun[, pc])",
 "  Map PC to line number."),
 
-    JS_FN_HELP("redirect", RedirectOutput, 2, 0,
-"redirect(stdoutFilename[, stderrFilename])",
-"  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("nestedShell", NestedShell, 0, 0,
 "nestedShell(shellArgs...)",
 "  Execute the given code in a new JS shell process, passing this nested shell\n"
@@ -5071,8 +5030,8 @@
 #undef MSG_DEF
 };
 
-static const JSErrorFormatString*
-my_GetErrorMessage(void* userRef, const unsigned errorNumber)
+const JSErrorFormatString*
+js::shell::my_GetErrorMessage(void* userRef, const unsigned errorNumber)
 {
     if (errorNumber == 0 || errorNumber >= JSShellErr_Limit)
         return nullptr;
@@ -5080,8 +5039,8 @@
     return &jsShell_ErrorFormatString[errorNumber];
 }
 
-static void
-my_ErrorReporter(JSContext* cx, const char* message, JSErrorReport* report)
+void
+js::shell::my_ErrorReporter(JSContext* cx, const char* message, JSErrorReport* report)
 {
     gGotError = PrintError(cx, gErrFile, message, report, reportWarnings);
     if (report->exnType != JSEXN_NONE && !JSREPORT_IS_WARNING(report->flags)) {
@@ -5666,12 +5625,13 @@
         if (!fuzzingSafe) {
             if (!JS_DefineFunctionsWithHelp(cx, glob, fuzzing_unsafe_functions))
                 return nullptr;
-            if (!js::DefineOS(cx, glob))
-                return nullptr;
             if (!DefineConsole(cx, glob))
                 return nullptr;
         }
 
+        if (!DefineOS(cx, glob, fuzzingSafe))
+            return nullptr;
+
         RootedObject performanceObj(cx, JS_NewObject(cx, nullptr));
         if (!performanceObj)
             return nullptr;
@@ -5694,7 +5654,7 @@
         };
         SetDOMCallbacks(cx->runtime(), &DOMcallbacks);
 
-        RootedObject domProto(cx, JS_InitClass(cx, glob, js::NullPtr(), &dom_class, dom_constructor,
+        RootedObject domProto(cx, JS_InitClass(cx, glob, nullptr, &dom_class, dom_constructor,
                                                0, dom_props, dom_methods, nullptr, nullptr));
         if (!domProto)
             return nullptr;
@@ -5817,16 +5777,17 @@
     enableIon = !op.getBoolOption("no-ion");
     enableAsmJS = !op.getBoolOption("no-asmjs");
     enableNativeRegExp = !op.getBoolOption("no-native-regexp");
-    enableUnboxedObjects = op.getBoolOption("unboxed-objects");
     enableUnboxedArrays = op.getBoolOption("unboxed-arrays");
 
     JS::RuntimeOptionsRef(rt).setBaseline(enableBaseline)
                              .setIon(enableIon)
                              .setAsmJS(enableAsmJS)
                              .setNativeRegExp(enableNativeRegExp)
-                             .setUnboxedObjects(enableUnboxedObjects)
                              .setUnboxedArrays(enableUnboxedArrays);
 
+    if (op.getBoolOption("no-unboxed-objects"))
+        jit::js_JitOptions.disableUnboxedObjects = true;
+
     if (const char* str = op.getStringOption("ion-scalar-replacement")) {
         if (strcmp(str, "on") == 0)
             jit::js_JitOptions.disableScalarReplacement = false;
@@ -6030,7 +5991,6 @@
                              .setIon(enableIon)
                              .setAsmJS(enableAsmJS)
                              .setNativeRegExp(enableNativeRegExp)
-                             .setUnboxedObjects(enableUnboxedObjects)
                              .setUnboxedArrays(enableUnboxedArrays);
     rt->setOffthreadIonCompilationEnabled(offthreadCompilation);
     rt->profilingScripts = enableDisassemblyDumps;
@@ -6173,7 +6133,7 @@
         || !op.addBoolOption('\0', "no-ion", "Disable IonMonkey")
         || !op.addBoolOption('\0', "no-asmjs", "Disable asm.js compilation")
         || !op.addBoolOption('\0', "no-native-regexp", "Disable native regexp compilation")
-        || !op.addBoolOption('\0', "unboxed-objects", "Allow creating unboxed plain objects")
+        || !op.addBoolOption('\0', "no-unboxed-objects", "Disable creating unboxed plain objects")
         || !op.addBoolOption('\0', "unboxed-arrays", "Allow creating unboxed arrays")
         || !op.addStringOption('\0', "ion-scalar-replacement", "on/off",
                                "Scalar Replacement (default: on, off to disable)")
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/shell/jsshell.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/shell/jsshell.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/shell/jsshell.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/shell/jsshell.h	2015-05-25 20:43:26.000000000 +0000
@@ -0,0 +1,41 @@
+#ifndef jsshell_js_h
+#define jsshell_js_h
+
+#include "jsapi.h"
+
+namespace js {
+namespace shell {
+
+enum JSShellErrNum {
+#define MSG_DEF(name, count, exception, format) \
+    name,
+#include "jsshell.msg"
+#undef MSG_DEF
+    JSShellErr_Limit
+};
+
+const JSErrorFormatString*
+my_GetErrorMessage(void* userRef, const unsigned errorNumber);
+
+static void
+my_ErrorReporter(JSContext* cx, const char* message, JSErrorReport* report);
+
+JSString*
+FileAsString(JSContext* cx, const char* pathname);
+
+class AutoCloseInputFile
+{
+  private:
+    FILE* f_;
+  public:
+    explicit AutoCloseInputFile(FILE* f) : f_(f) {}
+    ~AutoCloseInputFile() {
+        if (f_ && f_ != stdin)
+            fclose(f_);
+    }
+};
+
+} /* namespace shell */
+} /* namespace js */
+
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/shell/OSObject.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/shell/OSObject.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/shell/OSObject.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/shell/OSObject.cpp	2015-05-25 20:43:26.000000000 +0000
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #ifdef XP_WIN
+#include <direct.h>
 #include <process.h>
 #include <string.h>
 #else
@@ -18,13 +19,262 @@
 #include <unistd.h>
 #endif
 
+#include "jsapi.h"
 // For JSFunctionSpecWithHelp
 #include "jsfriendapi.h"
+#include "jsobj.h"
+#ifdef XP_WIN
+# include "jswin.h"
+#endif
+#include "jswrapper.h"
 
 #include "js/Conversions.h"
+#include "shell/jsshell.h"
+#include "vm/TypedArrayObject.h"
+
+#include "jsobjinlines.h"
+
+#ifdef XP_WIN
+# define PATH_MAX (MAX_PATH > _MAX_DIR ? MAX_PATH : _MAX_DIR)
+# define getcwd _getcwd
+#else
+# include <libgen.h>
+#endif
 
 using namespace JS;
 
+namespace js {
+namespace shell {
+
+/*
+ * Resolve a (possibly) relative filename to an absolute path. If
+ * |scriptRelative| is true, then the result will be relative to the directory
+ * containing the currently-running script, or the current working directory if
+ * the currently-running script is "-e" (namely, you're using it from the
+ * command line.) Otherwise, it will be relative to the current working
+ * directory.
+ */
+JSString*
+ResolvePath(JSContext* cx, HandleString filenameStr, PathResolutionMode resolveMode)
+{
+    JSAutoByteString filename(cx, filenameStr);
+    if (!filename)
+        return nullptr;
+
+    const char* pathname = filename.ptr();
+    if (pathname[0] == '/')
+        return filenameStr;
+#ifdef XP_WIN
+    // Various forms of absolute paths per http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247%28v=vs.85%29.aspx
+    // "\..."
+    if (pathname[0] == '\\')
+        return filenameStr;
+    // "C:\..."
+    if (strlen(pathname) > 3 && isalpha(pathname[0]) && pathname[1] == ':' && pathname[2] == '\\')
+        return filenameStr;
+    // "\\..."
+    if (strlen(pathname) > 2 && pathname[1] == '\\' && pathname[2] == '\\')
+        return filenameStr;
+#endif
+
+    /* Get the currently executing script's name. */
+    JS::AutoFilename scriptFilename;
+    if (!DescribeScriptedCaller(cx, &scriptFilename))
+        return nullptr;
+
+    if (!scriptFilename.get())
+        return nullptr;
+
+    if (strcmp(scriptFilename.get(), "-e") == 0 || strcmp(scriptFilename.get(), "typein") == 0)
+        resolveMode = RootRelative;
+
+    static char buffer[PATH_MAX+1];
+    if (resolveMode == ScriptRelative) {
+#ifdef XP_WIN
+        // The docs say it can return EINVAL, but the compiler says it's void
+        _splitpath(scriptFilename.get(), nullptr, buffer, nullptr, nullptr);
+#else
+        strncpy(buffer, scriptFilename.get(), PATH_MAX+1);
+        if (buffer[PATH_MAX] != '\0')
+            return nullptr;
+
+        // dirname(buffer) might return buffer, or it might return a
+        // statically-allocated string
+        memmove(buffer, dirname(buffer), strlen(buffer) + 1);
+#endif
+    } else {
+        const char* cwd = getcwd(buffer, PATH_MAX);
+        if (!cwd)
+            return nullptr;
+    }
+
+    size_t len = strlen(buffer);
+    buffer[len] = '/';
+    strncpy(buffer + len + 1, pathname, sizeof(buffer) - (len+1));
+    if (buffer[PATH_MAX] != '\0')
+        return nullptr;
+
+    return JS_NewStringCopyZ(cx, buffer);
+}
+
+static JSObject*
+FileAsTypedArray(JSContext* cx, const char* pathname)
+{
+    FILE* file = fopen(pathname, "rb");
+    if (!file) {
+        JS_ReportError(cx, "can't open %s: %s", pathname, strerror(errno));
+        return nullptr;
+    }
+    AutoCloseInputFile autoClose(file);
+
+    RootedObject obj(cx);
+    if (fseek(file, 0, SEEK_END) != 0) {
+        JS_ReportError(cx, "can't seek end of %s", pathname);
+    } else {
+        size_t len = ftell(file);
+        if (fseek(file, 0, SEEK_SET) != 0) {
+            JS_ReportError(cx, "can't seek start of %s", pathname);
+        } else {
+            obj = JS_NewUint8Array(cx, len);
+            if (!obj)
+                return nullptr;
+            char* buf = (char*) obj->as<js::TypedArrayObject>().viewData();
+            size_t cc = fread(buf, 1, len, file);
+            if (cc != len) {
+                JS_ReportError(cx, "can't read %s: %s", pathname,
+                               (ptrdiff_t(cc) < 0) ? strerror(errno) : "short read");
+                obj = nullptr;
+            }
+        }
+    }
+    return obj;
+}
+
+static bool
+ReadFile(JSContext* cx, unsigned argc, jsval* vp, bool scriptRelative)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+
+    if (args.length() < 1 || args.length() > 2) {
+        JS_ReportErrorNumber(cx, js::shell::my_GetErrorMessage, nullptr,
+                             args.length() < 1 ? JSSMSG_NOT_ENOUGH_ARGS : JSSMSG_TOO_MANY_ARGS,
+                             "snarf");
+        return false;
+    }
+
+    if (!args[0].isString() || (args.length() == 2 && !args[1].isString())) {
+        JS_ReportErrorNumber(cx, js::shell::my_GetErrorMessage, nullptr, JSSMSG_INVALID_ARGS, "snarf");
+        return false;
+    }
+
+    RootedString givenPath(cx, args[0].toString());
+    RootedString str(cx, js::shell::ResolvePath(cx, givenPath, scriptRelative ? ScriptRelative : RootRelative));
+    if (!str)
+        return false;
+
+    JSAutoByteString filename(cx, str);
+    if (!filename)
+        return false;
+
+    if (args.length() > 1) {
+        JSString* opt = JS::ToString(cx, args[1]);
+        if (!opt)
+            return false;
+        bool match;
+        if (!JS_StringEqualsAscii(cx, opt, "binary", &match))
+            return false;
+        if (match) {
+            JSObject* obj;
+            if (!(obj = FileAsTypedArray(cx, filename.ptr())))
+                return false;
+            args.rval().setObject(*obj);
+            return true;
+        }
+    }
+
+    if (!(str = FileAsString(cx, filename.ptr())))
+        return false;
+    args.rval().setString(str);
+    return true;
+}
+
+static bool
+osfile_readFile(JSContext* cx, unsigned argc, jsval* vp)
+{
+    return ReadFile(cx, argc, vp, false);
+}
+
+static bool
+osfile_readRelativeToScript(JSContext* cx, unsigned argc, jsval* vp)
+{
+    return ReadFile(cx, argc, vp, true);
+}
+
+static bool
+Redirect(JSContext* cx, FILE* fp, HandleString relFilename)
+{
+    RootedString filename(cx, ResolvePath(cx, relFilename, RootRelative));
+    if (!filename)
+        return false;
+    JSAutoByteString filenameABS(cx, filename);
+    if (!filenameABS)
+        return false;
+    if (freopen(filenameABS.ptr(), "wb", fp) == nullptr) {
+        JS_ReportError(cx, "cannot redirect to %s: %s", filenameABS.ptr(), strerror(errno));
+        return false;
+    }
+    return true;
+}
+
+static bool
+osfile_redirect(JSContext* cx, unsigned argc, jsval* vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+
+    if (args.length() < 1 || args.length() > 2) {
+        JS_ReportErrorNumber(cx, my_GetErrorMessage, nullptr, JSSMSG_INVALID_ARGS, "redirect");
+        return false;
+    }
+
+    if (args[0].isString()) {
+        RootedString stdoutPath(cx, args[0].toString());
+        if (!stdoutPath)
+            return false;
+        if (!Redirect(cx, stdout, stdoutPath))
+            return false;
+    }
+
+    if (args.length() > 1 && args[1].isString()) {
+        RootedString stderrPath(cx, args[1].toString());
+        if (!stderrPath)
+            return false;
+        if (!Redirect(cx, stderr, stderrPath))
+            return false;
+    }
+
+    args.rval().setUndefined();
+    return true;
+}
+
+static const JSFunctionSpecWithHelp osfile_functions[] = {
+    JS_FN_HELP("readFile", osfile_readFile, 1, 0,
+"readFile(filename, [\"binary\"])",
+"  Read filename into returned string. Filename is relative to the current\n"
+               "  working directory."),
+
+    JS_FN_HELP("readRelativeToScript", osfile_readRelativeToScript, 1, 0,
+"readRelativeToScript(filename, [\"binary\"])",
+"  Read filename into returned string. Filename is relative to the directory\n"
+"  containing the current script."),
+
+    JS_FN_HELP("redirect", osfile_redirect, 2, 0,
+"redirect(stdoutFilename[, stderrFilename])",
+"  Redirect stdout and/or stderr to the named file. Pass undefined to avoid\n"
+"   redirecting. Filenames are relative to the current working directory."),
+
+    JS_FS_HELP_END
+};
+
 static bool
 os_getenv(JSContext* cx, unsigned argc, Value* vp)
 {
@@ -292,14 +542,54 @@
 "  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
-js::DefineOS(JSContext* cx, HandleObject global)
+DefineOS(JSContext* cx, HandleObject global, bool fuzzingSafe)
 {
     RootedObject obj(cx, JS_NewPlainObject(cx));
-    return obj &&
-           JS_DefineFunctionsWithHelp(cx, obj, os_functions) &&
-           JS_DefineProperty(cx, global, "os", obj, 0);
+    if (!obj || !JS_DefineProperty(cx, global, "os", obj, 0))
+        return false;
+
+    if (!fuzzingSafe) {
+        if (!JS_DefineFunctionsWithHelp(cx, obj, os_functions))
+            return false;
+    }
+
+    RootedObject osfile(cx, JS_NewPlainObject(cx));
+    if (!osfile ||
+        !JS_DefineFunctionsWithHelp(cx, osfile, osfile_functions) ||
+        !JS_DefineProperty(cx, obj, "file", osfile, 0))
+    {
+        return false;
+    }
+
+    // For backwards compatibility, expose various os.file.* functions as
+    // direct methods on the global.
+    RootedValue val(cx);
+
+    struct {
+        const char* src;
+        const char* dst;
+    } osfile_exports[] = {
+        { "readFile", "read" },
+        { "readFile", "snarf" },
+        { "readRelativeToScript", "readRelativeToScript" },
+        { "redirect", "redirect" }
+    };
+
+    for (auto pair : osfile_exports) {
+        if (!JS_GetProperty(cx, osfile, pair.src, &val))
+            return false;
+        RootedObject function(cx, &val.toObject());
+        if (!JS_DefineProperty(cx, global, pair.dst, function, 0))
+            return false;
+    }
+
+    return true;
+}
+
+}
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/shell/OSObject.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/shell/OSObject.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/shell/OSObject.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/shell/OSObject.h	2015-05-25 20:43:26.000000000 +0000
@@ -12,11 +12,21 @@
 #include "jsapi.h"
 
 namespace js {
+namespace shell {
 
 /* Define an os object on the given global object. */
 bool
-DefineOS(JSContext* cx, JS::HandleObject global);
+DefineOS(JSContext* cx, JS::HandleObject global, bool fuzzingSafe);
 
+enum PathResolutionMode {
+    RootRelative,
+    ScriptRelative
+};
+
+JSString*
+ResolvePath(JSContext* cx, JS::HandleString filenameStr, PathResolutionMode resolveMode);
+
+}
 }
 
 #endif /* shell_OSObject_h */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma/Date/15.9.5.2-2-n.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma/Date/15.9.5.2-2-n.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma/Date/15.9.5.2-2-n.js	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma/Date/15.9.5.2-2-n.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-/* -*- tab-width: 2; 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/. */
-
-
-/**
-   File Name:          15.9.5.2-2.js
-   ECMA Section:       15.9.5.2 Date.prototype.toString
-   Description:
-   This function returns a string value. The contents of the string are
-   implementation dependent, but are intended to represent the Date in a
-   convenient, human-readable form in the current time zone.
-
-   The toString function is not generic; it generates a runtime error if its
-   this value is not a Date object. Therefore it cannot be transferred to
-   other kinds of objects for use as a method.
-
-
-   This verifies that calling toString on an object that is not a string
-   generates a runtime error.
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-
-var SECTION = "15.9.5.2-2";
-var VERSION = "ECMA_1";
-startTest();
-var TITLE   = "Date.prototype.toString";
-
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var OBJ = new MyObject( new Date(0) );
-
-DESCRIPTION = "var OBJ = new MyObject( new Date(0) ); OBJ.toString()";
-EXPECTED = "error";
-
-new TestCase( SECTION,
-	      "var OBJ = new MyObject( new Date(0) ); OBJ.toString()",
-	      "error",
-	      eval("OBJ.toString()") );
-test();
-
-function MyObject( value ) {
-  this.value = value;
-  this.valueOf = new Function( "return this.value" );
-  this.toString = Date.prototype.toString;
-  return this;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma/Date/15.9.5.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma/Date/15.9.5.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma/Date/15.9.5.js	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma/Date/15.9.5.js	2015-05-25 20:43:27.000000000 +0000
@@ -39,11 +39,14 @@
 
 new TestCase( SECTION,
 	      "Date.prototype.getClass",
-	      "[object Date]",
+	      "[object Object]",
 	      Date.prototype.getClass() );
 new TestCase( SECTION,
 	      "Date.prototype.valueOf()",
-	      NaN,
-	      Date.prototype.valueOf() );
+	      "TypeError",
+	      (function() { try { Date.prototype.valueOf() } catch (e) { return e.constructor.name; } })());
+new TestCase( SECTION,
+          "Date.prototype.__proto__ == Object.prototype",
+          true,
+          Date.prototype.__proto__ == Object.prototype );
 test();
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma/extensions/15.9.5.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma/extensions/15.9.5.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma/extensions/15.9.5.js	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma/extensions/15.9.5.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/* -*- tab-width: 2; 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/. */
-
-
-/**
-   File Name:          15.9.5.js
-   ECMA Section:       15.9.5 Properties of the Date prototype object
-   Description:
-
-   The Date prototype object is itself a Date object (its [[Class]] is
-   "Date") whose value is NaN.
-
-   The value of the internal [[Prototype]] property of the Date prototype
-   object is the Object prototype object (15.2.3.1).
-
-   In following descriptions of functions that are properties of the Date
-   prototype object, the phrase "this Date object" refers to the object that
-   is the this value for the invocation of the function; it is an error if
-   this does not refer to an object for which the value of the internal
-   [[Class]] property is "Date". Also, the phrase "this time value" refers
-   to the number value for the time represented by this Date object, that is,
-   the value of the internal [[Value]] property of this Date object.
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-
-var SECTION = "15.9.5";
-var VERSION = "ECMA_1";
-startTest();
-var TITLE   = "Properties of the Date Prototype Object";
-
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-new TestCase( SECTION,
-	      "Date.prototype.__proto__ == Object.prototype",
-	      true,
-	      Date.prototype.__proto__ == Object.prototype );
-test();
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_2/Exceptions/date-001.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_2/Exceptions/date-001.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_2/Exceptions/date-001.js	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_2/Exceptions/date-001.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/**
-   File Name:          date-001.js
-   Corresponds To:     15.9.5.2-2.js
-   ECMA Section:       15.9.5.2 Date.prototype.toString
-   Description:
-   This function returns a string value. The contents of the string are
-   implementation dependent, but are intended to represent the Date in a
-   convenient, human-readable form in the current time zone.
-
-   The toString function is not generic; it generates a runtime error if its
-   this value is not a Date object. Therefore it cannot be transferred to
-   other kinds of objects for use as a method.
-
-
-   This verifies that calling toString on an object that is not a string
-   generates a runtime error.
-
-   Author:             christine@netscape.com
-   Date:               12 november 1997
-*/
-var SECTION = "date-001";
-var VERSION = "JS1_4";
-var TITLE   = "Date.prototype.toString";
-
-startTest();
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-var result = "Failed";
-var exception = "No exception thrown";
-var expect = "Passed";
-
-try {
-  var OBJ = new MyObject( new Date(0) );
-  result = OBJ.toString();
-} catch ( e ) {
-  result = expect;
-  exception = e.toString();
-}
-
-new TestCase(
-  SECTION,
-  "OBJECT = new MyObject( new Date(0)) ; result = OBJ.toString()" +
-  " (threw " + exception +")",
-  expect,
-  result );
-
-test();
-
-function MyObject( value ) {
-  this.value = value;
-  this.valueOf = new Function( "return this.value" );
-  this.toString = Date.prototype.toString;
-  return this;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_5/misc/builtin-methods-reject-null-undefined-this.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_5/misc/builtin-methods-reject-null-undefined-this.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_5/misc/builtin-methods-reject-null-undefined-this.js	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_5/misc/builtin-methods-reject-null-undefined-this.js	2015-05-25 20:43:31.000000000 +0000
@@ -59,7 +59,7 @@
                */
               "toFixed",
               "toExponential", "toPrecision"],
-    Date:    ["toString", "toDateString", "toTimeString", "toLocaleString",
+    Date:    ["toDateString", "toTimeString", "toLocaleString",
               "toLocaleDateString", "toLocaleTimeString", "valueOf", "getTime",
               "getFullYear", "getUTCFullYear", "getMonth", "getUTCMonth",
               "getDate", "getUTCDate", "getDay", "getUTCDay", "getHours",
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Class/methDefn.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Class/methDefn.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Class/methDefn.js	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Class/methDefn.js	2015-05-25 20:43:31.000000000 +0000
@@ -32,6 +32,9 @@
 syntaxError("b = {a({}}");
 syntaxError("b = {a@(){}}");
 syntaxError("b = {a() => 0}");
+syntaxError("b = {a() void 0}");
+syntaxError("b = {a() 1}");
+syntaxError("b = {a() false}");
 
 b = {a(){return 5;}};
 assertEq(b.a(), 5);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Class/methodInstallation.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Class/methodInstallation.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Class/methodInstallation.js	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Class/methodInstallation.js	2015-05-25 20:43:31.000000000 +0000
@@ -60,12 +60,14 @@
     assertEq(aGetDesc.configurable, true);
     assertEq(aGetDesc.enumerable, true);
     aGetDesc.get();
+    assertThrowsInstanceOf(() => new aGetDesc.get, TypeError);
     assertEq(getterCalled, true);
 
     var aSetDesc = Object.getOwnPropertyDescriptor(a.prototype, \"setter\");
     assertEq(aSetDesc.configurable, true);
     assertEq(aSetDesc.enumerable, true);
     aSetDesc.set();
+    assertThrowsInstanceOf(() => new aSetDesc.set, TypeError);
     assertEq(setterCalled, true);
     assertDeepEq(aSetDesc, Object.getOwnPropertyDescriptor(a.prototype, \"setter\"));
 
@@ -75,6 +77,7 @@
     assertEq(aStaticMethDesc.enumerable, true);
     assertEq(aStaticMethDesc.writable, true);
     aStaticMethDesc.value();
+    assertThrowsInstanceOf(() => new aStaticMethDesc.value, TypeError);
     assertEq(staticMethodCalled, true);
 
     assertEq(Object.getOwnPropertyDescriptor(new a(), \"staticGetter\"), undefined);
@@ -82,6 +85,7 @@
     assertEq(aStaticGetDesc.configurable, true);
     assertEq(aStaticGetDesc.enumerable, true);
     aStaticGetDesc.get();
+    assertThrowsInstanceOf(() => new aStaticGetDesc.get, TypeError);
     assertEq(staticGetterCalled, true);
 
     assertEq(Object.getOwnPropertyDescriptor(new a(), \"staticSetter\"), undefined);
@@ -89,6 +93,7 @@
     assertEq(aStaticSetDesc.configurable, true);
     assertEq(aStaticSetDesc.enumerable, true);
     aStaticSetDesc.set();
+    assertThrowsInstanceOf(() => new aStaticSetDesc.set, TypeError);
     assertEq(staticSetterCalled, true);
 
     assertEq([...new a()].join(), "cow,pig");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Class/superPropBasicGetter.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Class/superPropBasicGetter.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Class/superPropBasicGetter.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Class/superPropBasicGetter.js	2015-05-25 20:43:31.000000000 +0000
@@ -0,0 +1,43 @@
+var test = `
+
+class base {
+    constructor() {}
+
+    getValue() {
+        return this._prop;
+    }
+
+    setValue(v) {
+        this._prop = v;
+    }
+}
+
+class derived extends base {
+    constructor() {}
+
+    get a() { return super.getValue(); }
+    set a(v) { super.setValue(v); }
+
+    get b() { return eval('super.getValue()'); }
+    set b(v) { eval('super.setValue(v);'); }
+
+    test() {
+        this.a = 15;
+        assertEq(this.a, 15);
+
+        assertEq(this.b, 15);
+        this.b = 30;
+        assertEq(this.b, 30);
+    }
+}
+
+var derivedInstance = new derived();
+derivedInstance.test();
+
+`;
+
+if (classesEnabled())
+    eval(test);
+
+if (typeof reportCompare === 'function')
+    reportCompare(0,0,"OK");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Class/superPropEvalInsideArrow.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Class/superPropEvalInsideArrow.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Class/superPropEvalInsideArrow.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Class/superPropEvalInsideArrow.js	2015-05-25 20:43:31.000000000 +0000
@@ -0,0 +1,11 @@
+class foo {
+    constructor() { }
+
+    method() {
+        return (() => eval('super.toString'));
+    }
+}
+assertEq(new foo().method()(), Object.prototype.toString);
+
+if (typeof reportCompare === "function")
+    reportCompare(0,0,"OK");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Class/superPropEvalInsideNested.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Class/superPropEvalInsideNested.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Class/superPropEvalInsideNested.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Class/superPropEvalInsideNested.js	2015-05-25 20:43:31.000000000 +0000
@@ -0,0 +1,13 @@
+// It's invalid to eval super.prop inside a nested non-method, even if it
+// appears inside a method definition
+assertThrowsInstanceOf(() =>
+({
+    method() {
+        (function () {
+            eval('super.toString');
+        })();
+    }
+}).method(), SyntaxError);
+
+if (typeof reportCompare === 'function')
+    reportCompare(0,0,"OK");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Class/superPropHeavyweightArrow.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Class/superPropHeavyweightArrow.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Class/superPropHeavyweightArrow.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Class/superPropHeavyweightArrow.js	2015-05-25 20:43:31.000000000 +0000
@@ -0,0 +1,12 @@
+class foo {
+    constructor() { }
+
+    method() {
+        return (() => (eval(''), super.toString));
+    }
+}
+
+assertEq(new foo().method()(), Object.prototype.toString);
+
+if (typeof reportCompare === "function")
+    reportCompare(0,0,"OK");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Class/superPropNoOverwriting.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Class/superPropNoOverwriting.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Class/superPropNoOverwriting.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Class/superPropNoOverwriting.js	2015-05-25 20:43:31.000000000 +0000
@@ -0,0 +1,65 @@
+var test = `
+
+class X {
+    constructor() {
+        Object.defineProperty(this, "prop1", {
+            configurable: true,
+            writable: false,
+            value: 1
+        });
+
+        Object.defineProperty(this, "prop2", {
+            configurable: true,
+            get: function() { return 15; }
+        });
+
+        Object.defineProperty(this, "prop3", {
+            configurable: true,
+            set: function(a) { }
+        });
+
+        Object.defineProperty(this, "prop4", {
+            configurable: true,
+            get: function() { return 20; },
+            set: function(a) { }
+        });
+    }
+
+    f1() {
+        super.prop1 = 2;
+    }
+
+    f2() {
+        super.prop2 = 3;
+    }
+
+    f3() {
+        super.prop3 = 4;
+    }
+
+    f4() {
+        super.prop4 = 5;
+    }
+}
+
+var x = new X();
+
+assertThrowsInstanceOf(() => x.f1(), TypeError);
+assertEq(x.prop1, 1);
+
+assertThrowsInstanceOf(() => x.f2(), TypeError);
+assertEq(x.prop2, 15);
+
+assertThrowsInstanceOf(() => x.f3(), TypeError);
+assertEq(x.prop3, undefined);
+
+assertThrowsInstanceOf(() => x.f4(), TypeError);
+assertEq(x.prop4, 20);
+
+`;
+
+if (classesEnabled())
+    eval(test);
+
+if (typeof reportCompare === 'function')
+    reportCompare(0,0,"OK");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Date/prototype-is-not-a-date.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Date/prototype-is-not-a-date.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Date/prototype-is-not-a-date.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Date/prototype-is-not-a-date.js	2015-05-25 20:43:31.000000000 +0000
@@ -0,0 +1,15 @@
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/
+ */
+
+var BUGNUMBER = 861219;
+var summary = "Date.prototype isn't an instance of Date";
+
+print(BUGNUMBER + ": " + summary);
+
+assertEq(Date.prototype instanceof Date, false);
+assertEq(Date.prototype.__proto__, Object.prototype);
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Date/toString-generic.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Date/toString-generic.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Date/toString-generic.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Date/toString-generic.js	2015-05-25 20:43:31.000000000 +0000
@@ -0,0 +1,13 @@
+var BUGNUMBER = 861219;
+var summary = 'Date.prototype.toString is a generic function';
+
+print(BUGNUMBER + ": " + summary);
+
+for (var thisValue of [null, undefined, 0, 1.2, true, false, "foo", Symbol.iterator,
+                       {}, [], /foo/, Date.prototype, new Proxy(new Date(), {})])
+{
+  assertEq(Date.prototype.toString.call(thisValue), "Invalid Date");
+}
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/extensions/for-in-with-assignments.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/extensions/for-in-with-assignments.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/extensions/for-in-with-assignments.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/extensions/for-in-with-assignments.js	2015-05-25 20:43:32.000000000 +0000
@@ -0,0 +1,74 @@
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/
+ */
+
+var gTestfile = "for-in-with-assignments.js";
+var BUGNUMBER = 1164741;
+var summary =
+  "Parse |for (var ... = ... in ...)| but execute it as if the assignment " +
+  "weren't there";
+
+print(BUGNUMBER + ": " + summary);
+
+/**************
+ * BEGIN TEST *
+ **************/
+
+// This is a total grab-bag of junk originally in tests changed when this
+// syntax was removed.  Leaving it all in one file will make it easier to
+// eventually remove.  Avert your eyes!
+
+if (typeof Reflect !== "undefined")
+  Reflect.parse("for (var x = 3 in []) { }");
+
+/******************************************************************************/
+
+function testQ() {
+  try {
+    for (var i = 0 in this) throw p;
+  } catch (e) {
+    if (i !== 94)
+      return "what";
+  }
+}
+testQ();
+
+/******************************************************************************/
+
+function f3(i,o){for(var x=i in o)parseInt(o[x]); return x}
+function f4(i,o){with(this)for(var x=i in o)parseInt(o[x]); return x}
+
+assertEq(f3(42, []), undefined);
+assertEq(f3(42, ['first']), "0");
+assertEq(f4(42, []), undefined);
+assertEq(f4(42, ['first']), "0");
+
+/******************************************************************************/
+
+function SetLangHead(l){
+  with(p){
+    for(var i=0 in x)
+      if(getElementById("TxtH"+i)!=undefined)
+        parseInt('huh');
+  }
+}
+x=[0,1,2,3];
+p={getElementById: function (id){parseInt(uneval(this), id); return undefined;}};
+SetLangHead(1);
+
+/******************************************************************************/
+
+(function(){for(var x = arguments in []){} function x(){}})();
+
+/******************************************************************************/
+
+with (0)
+  for (var b = 0 in 0);  // don't assert in parser
+
+/******************************************************************************/
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
+
+print("Tests complete");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Object/accessor-non-constructor.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Object/accessor-non-constructor.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Object/accessor-non-constructor.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Object/accessor-non-constructor.js	2015-05-25 20:43:32.000000000 +0000
@@ -0,0 +1,20 @@
+var obj = { get a() { return 1; } };
+assertThrowsInstanceOf(() => {
+    new Object.getOwnPropertyDescriptor(obj, "a").get
+}, TypeError);
+
+obj = { set a(b) { } };
+assertThrowsInstanceOf(() => {
+    new Object.getOwnPropertyDescriptor(obj, "a").set
+}, TypeError);
+
+obj = { get a() { return 1; }, set a(b) { } };
+assertThrowsInstanceOf(() => {
+    new Object.getOwnPropertyDescriptor(obj, "a").get
+}, TypeError);
+assertThrowsInstanceOf(() => {
+    new Object.getOwnPropertyDescriptor(obj, "a").set
+}, TypeError);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Object/method-non-constructor.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Object/method-non-constructor.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Object/method-non-constructor.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Object/method-non-constructor.js	2015-05-25 20:43:32.000000000 +0000
@@ -0,0 +1,12 @@
+var obj = { method() { } };
+assertThrowsInstanceOf(() => {
+    new obj.method;
+}, TypeError);
+
+obj = { constructor() { } };
+assertThrowsInstanceOf(() => {
+    new obj.constructor;
+}, TypeError);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Proxy/proxy-no-receiver-overwrite.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Proxy/proxy-no-receiver-overwrite.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Proxy/proxy-no-receiver-overwrite.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Proxy/proxy-no-receiver-overwrite.js	2015-05-25 20:43:32.000000000 +0000
@@ -0,0 +1,23 @@
+"use strict";
+
+var y = new Proxy({}, {
+    getOwnPropertyDescriptor(target, key) {
+        if (key === "a") {
+            return { configurable: true, get: function(v) {} };
+        } else {
+            assertEq(key, "b");
+            return { configurable: true, writable: false, value: 15 };
+        }
+    },
+
+    defineProperty() {
+        throw "not invoked";
+    }
+})
+
+// This will invoke [[Set]] on the target, with the proxy as receiver.
+assertThrowsInstanceOf(() => y.a = 1, TypeError);
+assertThrowsInstanceOf(() => y.b = 2, TypeError);
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Statements/for-in-with-destructuring-assignments.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Statements/for-in-with-destructuring-assignments.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Statements/for-in-with-destructuring-assignments.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Statements/for-in-with-destructuring-assignments.js	2015-05-25 20:43:32.000000000 +0000
@@ -0,0 +1,130 @@
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/
+ */
+
+var gTestfile = "for-in-with-destructuring-assignments.js";
+var BUGNUMBER = 1164741;
+var summary = "|for (var <pat> = ... in ...)| is invalid syntax";
+
+print(BUGNUMBER + ": " + summary);
+
+/**************
+ * BEGIN TEST *
+ **************/
+
+// This is a total grab-bag of junk originally in tests changed when this
+// syntax was removed.  Avert your eyes!
+
+assertThrowsInstanceOf(() => eval(`
+   for (var [x] = x>>x in [[]<[]])
+   {
+     [];
+   }`),
+ SyntaxError);
+
+/******************************************************************************/
+
+assertThrowsInstanceOf(function() {
+  // Abandon all hope, ye who try to read this.
+  eval(`
+    (function () {
+      for
+      (var [x] = function(){}
+       in
+       (function m(a) {
+         if (a < 1) {
+           x;
+           return;
+         }
+         return m(a - 1) + m(a - 2);
+       })(7)(eval(""))
+      )
+      {
+        [];
+      }
+    })
+  `)();
+}, SyntaxError);
+
+/******************************************************************************/
+
+assertThrowsInstanceOf(() => eval(`
+  for (var [e] = [] in (eval("for (b = 0; b < 6; ++b) gc()"))) {}
+`), SyntaxError);
+
+/******************************************************************************/
+
+assertThrowsInstanceOf(() => eval("for (var [ v , c ] = 0 in undefined) { }"),
+                       SyntaxError);
+
+/******************************************************************************/
+
+assertThrowsInstanceOf(() => eval("var b = e; for (var [e] = b in w) c"),
+                       SyntaxError);
+
+/******************************************************************************/
+
+assertThrowsInstanceOf(() => eval("for (var {a: []} = 2 in []) { }"),
+                       SyntaxError);
+
+/******************************************************************************/
+
+assertThrowsInstanceOf(() => eval(`try
+  {
+    for (var [,{y}] = 1 in []) {}
+  }
+  catch(ex)
+  {
+  }`),
+SyntaxError);
+
+/******************************************************************************/
+
+assertThrowsInstanceOf(() => eval("for (var [x] = [] in null);"),
+                       SyntaxError);
+
+/******************************************************************************/
+
+assertThrowsInstanceOf(() => eval("for (var [x] = x in y) var x;"),
+                       SyntaxError);
+
+/******************************************************************************/
+
+assertThrowsInstanceOf(() => eval(`
+  for (var [arguments] = ({ get y(){} }) in y ) (x);
+`),
+SyntaxError);
+
+/******************************************************************************/
+
+if (typeof evalcx == 'function') {
+  var src = 'try {\n' +
+  '    for (var [e] = /x/ in d) {\n' +
+  '        (function () {});\n' +
+  '    }\n' +
+  '} catch (e) {}\n' +
+  'try {\n' +
+  '    let(x = Object.freeze(this, /x/))\n' +
+  '    e = {}.toString\n' +
+  '    function y() {}\n' +
+  '} catch (e) {}';
+
+  try
+  {
+    evalcx(src);
+    throw new Error("didn't throw");
+  }
+  catch (e)
+  {
+    assertEq(e.name === "SyntaxError", true,
+             "expected invalid syntax, got " + e);
+  }
+}
+
+/******************************************************************************/
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
+
+print("Tests complete");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Statements/for-of-var-with-initializer.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Statements/for-of-var-with-initializer.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Statements/for-of-var-with-initializer.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Statements/for-of-var-with-initializer.js	2015-05-25 20:43:32.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/
+ */
+
+var gTestfile = "for-of-var-with-initializer.js";
+var BUGNUMBER = 1164741;
+var summary = "Don't assert parsing |for (var x = 3 of 42);|";
+
+print(BUGNUMBER + ": " + summary);
+
+/**************
+ * BEGIN TEST *
+ **************/
+
+try
+{
+  Function("for (var x = 3 of 42);");
+  throw new Error("didn't throw");
+}
+catch (e)
+{
+  assertEq(e instanceof SyntaxError, true,
+           "expected syntax error, got: " + e);
+}
+
+/******************************************************************************/
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
+
+print("Tests complete");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Symbol/species.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Symbol/species.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Symbol/species.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Symbol/species.js	2015-05-25 20:43:32.000000000 +0000
@@ -0,0 +1,22 @@
+var BUGNUMBER = 1131043;
+var summary = "Implement @@species getter for builtin types";
+
+print(BUGNUMBER + ": " + summary);
+
+for (var C of [Map, Set]) {
+  assertEq(C[Symbol.species], C);
+}
+
+for (C of [Map, Set]) {
+  var desc = Object.getOwnPropertyDescriptor(C, Symbol.species);
+  assertDeepEq(Object.keys(desc).sort(), ["configurable", "enumerable", "get", "set"]);
+  assertEq(desc.set, undefined);
+  assertEq(desc.enumerable, false);
+  assertEq(desc.configurable, true);
+  assertEq(desc.get.apply(null), null);
+  assertEq(desc.get.apply(undefined), undefined);
+  assertEq(desc.get.apply(42), 42);
+}
+
+if (typeof reportCompare === "function")
+    reportCompare(0, 0);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Symbol/well-known.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Symbol/well-known.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/Symbol/well-known.js	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/Symbol/well-known.js	2015-05-25 20:43:32.000000000 +0000
@@ -4,6 +4,7 @@
 var names = [
     "iterator",
     "match",
+    "species",
 ];
 
 for (var name of names) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/TypedArray/of.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/TypedArray/of.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/TypedArray/of.js	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/TypedArray/of.js	2015-05-25 20:43:32.000000000 +0000
@@ -60,9 +60,13 @@
         }, TypeError);
     });
 
-    // FIXME: Should throw if `this` is a method definition or a getter/setter function, see bug 1059908.
-    constructor.of.call({method() {}}.method);
-    constructor.of.call(Object.getOwnPropertyDescriptor({get getter() {}}, "getter").get);
+    // Throw if `this` is a method definition or a getter/setter function.
+    assertThrowsInstanceOf(() => {
+        constructor.of.call({method() {}}.method);
+    }, TypeError);
+    assertThrowsInstanceOf(() => {
+        constructor.of.call(Object.getOwnPropertyDescriptor({get getter() {}}, "getter").get);
+    }, TypeError);
 
     // Generators are also legal constructors.
     assertEq(constructor.of.call(function*(len) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/TypedArray/slice.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/TypedArray/slice.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/ecma_6/TypedArray/slice.js	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/ecma_6/TypedArray/slice.js	2015-05-25 20:43:32.000000000 +0000
@@ -68,8 +68,8 @@
     mathConstructor.constructor = Math.sin;
     assertDeepEq(mathConstructor.slice(4), new constructor(4));
 
-    assertEq("species" in Symbol, false,
-             "you've implemented @@species -- add real tests here!");
+    assertEq(Symbol.species in Int8Array, false,
+             "you've implemented %TypedArray%[@@species] -- add real tests here!");
 }
 
 if (typeof reportCompare === "function")
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_4/Regress/date-001-n.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_4/Regress/date-001-n.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_4/Regress/date-001-n.js	2015-05-13 18:06:08.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_4/Regress/date-001-n.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +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/. */
-
-
-/**
- *  File Name:          date-001-n.js
- *  Description:
- *
- *  http://scopus.mcom.com/bugsplat/show_bug.cgi?id=299903
- *
- *  Author:             christine@netscape.com
- *  Date:               11 August 1998
- */
-var SECTION = "date-001-n.js";
-var VERSION = "JS1_4";
-var TITLE   = "Regression test case for 299903";
-var BUGNUMBER="299903";
-
-startTest();
-
-writeHeaderToLog( SECTION + " "+ TITLE);
-
-function MyDate() {
-  this.foo = "bar";
-}
-MyDate.prototype = new Date();
-
-DESCRIPTION =
-  "function MyDate() { this.foo = \"bar\"; }; MyDate.prototype = new Date(); new MyDate().toString()";
-EXPECTED = "error";
-
-new TestCase(
-  SECTION,
-  "function MyDate() { this.foo = \"bar\"; }; "+
-  "MyDate.prototype = new Date(); " +
-  "new MyDate().toString()",
-  "error",
-  new MyDate().toString() );
-
-test();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/block/regress-344262.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/block/regress-344262.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/block/regress-344262.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/block/regress-344262.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +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 = 344262;
-var summary = 'Variables bound by let statement/expression';
-var actual = '';
-var expect = 0;
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
- 
-  function f() {
-    var a = [];
-    for (var i = 0; i < 10; i++) {
-      a[i] = let (j = i) function () { return j; };
-      var b = [];
-      for (var k = 0; k <= i; k++)
-        b.push(a[k]());
-      print(b.join());
-    }
-    actual = a[0]();
-    print(actual);
-  }
-  f();
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/block/regress-345542.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/block/regress-345542.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/block/regress-345542.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/block/regress-345542.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +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 = 345542;
-var summary = 'Use let in let-scoped loops';
-var actual = 'No Crash';
-var expect = 'No Crash';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
- 
-  var f = [];
-  for (let i = 0; i < 1; i++) f[i] = let (n = i) function () { return n; };
-  for (let i = 0; i < 2; i++) f[i] = let (n = i) function () { return n; };
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/block/regress-349653.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/block/regress-349653.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/block/regress-349653.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/block/regress-349653.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +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 = 349653;
-var summary = 'Do not assert: OBJ_GET_CLASS(cx, obj) == &js_ArrayClass';
-var actual = 'No Crash';
-var expect = 'No Crash';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
- 
-  void ({y: true ? [1 for (x in [2])] : 3 })
-    reportCompare(expect, actual, summary);
-
-  let (a) true ? [2 for each (z in function(id) { return id })] : 3;
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/block/regress-351497.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/block/regress-351497.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/block/regress-351497.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/block/regress-351497.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +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 = 351497;
-var summary = 'Do not assert for(let (w) x in y)';
-var actual = 'No Crash';
-var expect = 'No Crash';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
- 
-  expect = /SyntaxError: (invalid for\/in left-hand side|missing variable name)/;
-  try
-  {
-    eval('for(let (w) x in y) { }');
-  }
-  catch(ex)
-  {
-    actual = ex + '';
-  }
-
-  reportMatch(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/block/regress-352185.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/block/regress-352185.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/block/regress-352185.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/block/regress-352185.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 = 352185;
-var summary = 'Do not assert on switch with let';
-var actual = 'No Crash';
-var expect = 'No Crash';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
-
-  try
-  {
-    eval('switch(let (a) 2) { case 0: let b; }');
-  }
-  catch(ex)
-  {
-    // See https://bugzilla.mozilla.org/show_bug.cgi?id=408957
-    summary = 'let declaration must be direct child of block or top-level implicit block';
-    expect = 'SyntaxError';
-    actual = ex.name;
-  }
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/block/regress-352609.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/block/regress-352609.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/block/regress-352609.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/block/regress-352609.js	2015-05-25 20:43:36.000000000 +0000
@@ -21,28 +21,6 @@
   printBugNumber(BUGNUMBER);
   printStatus (summary);
 
-  expect = /TypeError: 0 is not a function/;
-  try
-  {
-    [let (x = 3, y = 4) x].map(0);
-  }
-  catch(ex)
-  {
-    actual = ex + '';
-  }
-  reportMatch(expect, actual, '[let (x = 3, y = 4) x].map(0)');
-
-  expect = /TypeError: (p.z = \[let \(x = 3, y = 4\) x\]|.*Array.*) is not a function/;
-  try
-  {
-    var p = {}; (p.z = [let (x = 3, y = 4) x])();
-  }
-  catch(ex)
-  {
-    actual = ex + '';
-  }
-  reportMatch(expect, actual, 'p = {}; (p.z = [let (x = 3, y = 4) x])()');
-
   expect = /TypeError: (p.z = \(let \(x\) x\)|.*Undefined.*) is not a function/;
   try
   {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/block/regress-352616.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/block/regress-352616.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/block/regress-352616.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/block/regress-352616.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +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 = 352616;
-var summary = 'Do not Crash reporting error with |for..in| and |let|';
-var actual = 'No Crash';
-var expect = 'No Crash';
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
-
-  expect = /TypeError: (.+\.c is not a function|Cannot find function c.)/;
-  actual = 'No Error';
-  try
-  {
-    for(a in (let (b=1) 2).c(3)) { };
-  }
-  catch(ex)
-  {
-    actual = ex + '';
-  }
-
-  reportMatch(expect, actual, summary + ': 1');
-
-  expect = /TypeError: (.+\.c is not a function|Cannot find function c.)/;
-  actual = 'No Error';
-  try
-  {
-    for(a in (let (b=1,d=2) 2).c(3)) { };
-  }
-  catch(ex)
-  {
-    actual = ex + '';
-  }
-
-  reportMatch(expect, actual, summary + ': 2');
-
-  expect = /TypeError: (.+\.c is not a function|Cannot find function c.)/;
-  actual = 'No Error';
-  try
-  {
-    for(a in (let (b=1,d=2) 2).c(3)) { };
-  }
-  catch(ex)
-  {
-    actual = ex + '';
-  }
-
-  reportMatch(expect, actual, summary + ': 3');
-
-  exitFunc ('test');
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/block/regress-352624.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/block/regress-352624.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/block/regress-352624.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/block/regress-352624.js	2015-05-25 20:43:36.000000000 +0000
@@ -20,13 +20,10 @@
   printBugNumber(BUGNUMBER);
   printStatus (summary);
   printStatus('This bug can only be verified with a WAY_TOO_MUCH_GC build');
- 
+
   let (x = [].map(function () {})) { x; }
   reportCompare(expect, actual, summary + ': 1');
 
-  let (x = [].map(function () {})) 3
-    reportCompare(expect, actual, summary + ': 2');
-
   var g = function() {};
   (function() { let x = [].map(function () {}); g(x); })()
     reportCompare(expect, actual, summary + ': 3');
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/expressions/regress-349624.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/expressions/regress-349624.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/expressions/regress-349624.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/expressions/regress-349624.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +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 = 349624;
-var summary = 'let in initial-value expression for another let';
-var actual = 'No Crash';
-var expect = 'No Crash';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
- 
-  let(y = let (x) 4) 3
-
-    reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/expressions/regress-349818.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/expressions/regress-349818.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/expressions/regress-349818.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/expressions/regress-349818.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +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 = 349818;
-var summary = 'let expression should not assert';
-var actual = '';
-var expect = '';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
-
-  let (x=3) x;
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/expressions/regress-421806.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/expressions/regress-421806.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/expressions/regress-421806.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/expressions/regress-421806.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +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 = 421806;
-var summary = 'Do not assert: *pcstack[pcdepth - 1] == JSOP_ENTERBLOCK';
-var actual = 'No Crash';
-var expect = 'No Crash';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
- 
-  try 
-  { 
-    let([] = c) 1; 
-  } 
-  catch(ex) 
-  { 
-    try
-    {
-      this.a.b; 
-    }
-    catch(ex2)
-    {
-    }
-  }
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/extensions/regress-353454.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/extensions/regress-353454.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/extensions/regress-353454.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/extensions/regress-353454.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 353454;
-var summary = 'Do not assert with regexp iterator';
-var actual = 'No Crash';
-var expect = 'No Crash';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
- 
-  actual = "no exception";
-  try
-  {
-    expect = 'TypeError';
-    var obj = {a: 5}; obj.__iterator__ = /x/g; for(x in y = let (z) obj) { }
-  }
-  catch(ex)
-  {
-    actual = ex instanceof TypeError ? 'TypeError' : "" + ex;
-  }
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/lexical/regress-346642-03.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/lexical/regress-346642-03.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/lexical/regress-346642-03.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/lexical/regress-346642-03.js	2015-05-25 20:43:37.000000000 +0000
@@ -107,18 +107,6 @@
   }
   reportCompare(expect, actual, summary + ': 7');
 
-  expect = 'TypeError: ++x is not a function';
-  actual = 'No Crash';
-  try
-  {
-    let (x=3) ((++x)())
-      }
-  catch(ex)
-  {
-    actual = ex + '';
-  }
-  reportCompare(expect, actual, summary + ': 8');
-
   expect = 'ReferenceError: x.y is not defined';
   actual = 'No Crash';
   try
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/regress/regress-352870-02.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/regress/regress-352870-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/regress/regress-352870-02.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/regress/regress-352870-02.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +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 = 352870;
-var summary = 'Do not assert for crazy huge testcases';
-var actual = '';
-var expect = '';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
- 
-  expect = /TypeError: .+\.g (has no properties|is undefined)/;
-  actual = '';
-  try
-  {
-    switch(4) { case [(let (y = [].j(5)) ({}))
-                      for (p in ([1,2,3,4].g).v({},((w).y(z, [1]))))]: }  }
-  catch(ex)
-  {
-    actual = ex + '';
-  }
-  reportMatch(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/regress/regress-361566.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/regress/regress-361566.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/regress/regress-361566.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/regress/regress-361566.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +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 = 361566;
-var summary = 'Do not assert: !fp->blockChain || OBJ_GET_PARENT(cx, obj) == fp->blockChain';
-var actual = '';
-var expect = '';
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
-
-  try { let([] = z) 3; } catch(ex) { }
- 
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/regress/regress-373828.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/regress/regress-373828.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/regress/regress-373828.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/regress/regress-373828.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 = 373828;
-var summary = 'Do not assert: op == JSOP_LEAVEBLOCKEXPR ? ' + 
-  'fp->spbase + OBJ_BLOCK_DEPTH(cx, obj) == sp - 1 : fp->spbase + OBJ_BLOCK_DEPTH(cx, obj) == sp';
-var actual = 'No Crash';
-var expect = 'No Crash';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
- 
-  try
-  {
-    for(let y in [5,6]) let([] = [1]) (function(){ }); d;
-  }
-  catch(ex)
-  {
-  }
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/regress/regress-387951.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/regress/regress-387951.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/regress/regress-387951.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/regress/regress-387951.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +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 = 387951;
-var summary = 'Do not assert: cg->stackDepth >= 0';
-var actual = 'No Crash';
-var expect = 'No Crash';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
- 
-  with(delete let (functional) null ? 1 : {}){}
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/regress/regress-414553.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/regress/regress-414553.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/regress/regress-414553.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/regress/regress-414553.js	2015-05-25 20:43:37.000000000 +0000
@@ -9,7 +9,9 @@
 printStatus(summary);
 
 var expected = '1,2,3,4';
-var actual = let (a = 1, [b,c] = [2,3], d = 4) ( String([a,b,c,d]) );
+
+let a = 1, [b,c] = [2,3], d = 4;
+var actual = String([a,b,c,d]);
 
 reportCompare(expected, actual, 'destructuring assignment in let');
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/regress/regress-420399.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/regress/regress-420399.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_7/regress/regress-420399.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_7/regress/regress-420399.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-// |reftest| skip -- obsolete test
-/* -*- 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/. */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 420399;
-var summary = 'Let expression error involving undefined';
-var actual = '';
-var expect = '';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
- 
-  expect = /TypeError: \(let \(a = undefined\) a\) (is undefined|has no properties)/;
-  try
-  {
-    (let (a=undefined) a).b = 3;
-  }
-  catch(ex)
-  {
-    actual = ex + '';
-  }
-
-  reportMatch(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8/genexps/regress-380237-04.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8/genexps/regress-380237-04.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8/genexps/regress-380237-04.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8/genexps/regress-380237-04.js	2015-05-25 20:43:37.000000000 +0000
@@ -51,8 +51,6 @@
 needParens(14, "for (i in xx) { }");
 needParens(15, "throw xx");
 needParens(16, "try { } catch (e if xx) { }");
-needParens(17, "let (x=3) xx");
-needParens(18, "let (x=xx) 3");
 
 // Function calls
 doesNotNeedParens(19, "f(xx);");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8/genexps/regress-667131.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8/genexps/regress-667131.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8/genexps/regress-667131.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8/genexps/regress-667131.js	2015-05-25 20:43:37.000000000 +0000
@@ -3,7 +3,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/. */
 
-
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 667131;
 var summary = 'yield ignored if maybeNoteLegacyGenerator called too late';
@@ -19,18 +18,10 @@
     (function(){})([yield[]], (""))
 }
 
-function reported2() {
-    (function(){})(let(w = "") yield, (e))
-}
-
 function simplified1() {
     print([yield], (0))
 }
 
-function simplified2() {
-    print(let(w) yield, (0))
-}
-
 function f1(a) { [x for (x in yield) for (y in (a))] }
 function f2(a) { [x for (x in yield) if (y in (a))] }
 function f3(a) { ([x for (x in yield) for (y in (a))]) }
@@ -39,16 +30,12 @@
 function f7() { print({a:yield},(0)) }
 
 function f8() { ([yield], (0)) }
-function f9() { (let(w)yield, (0)) }
 
 testGenerator(reported1, "reported function with array literal");
-testGenerator(reported2, "reported function with let-expression");
 testGenerator(simplified1, "reported function with array literal, simplified");
-testGenerator(simplified2, "reported function with let-expression, simplified");
 testGenerator(f1, "top-level array comprehension with paren expr in for-block");
 testGenerator(f2, "top-level array comprehension with paren expr in if-block");
 testGenerator(f3, "parenthesized array comprehension with paren expr in for-block");
 testGenerator(f4, "parenthesized array comprehension with paren expr in if-block");
 testGenerator(f7, "object literal");
 testGenerator(f8, "array literal in paren exp");
-testGenerator(f9, "let-expression in paren exp");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8/regress/regress-453492.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8/regress/regress-453492.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8/regress/regress-453492.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8/regress/regress-453492.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +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 = 453492;
-var summary = 'Do not assert: op == JSOP_ENUMELEM || op == JSOP_ENUMCONSTELEM';
-var actual = '';
-var expect = '';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
-
-  print(function() { [(let(a)1)[2]] = 3; });
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8/regress/regress-464092-01.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8/regress/regress-464092-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8/regress/regress-464092-01.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8/regress/regress-464092-01.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +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 = 464092;
-var summary = 'Do not assert: OBJ_IS_CLONED_BLOCK(obj)';
-var actual = '';
-var expect = '';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
-
-  let (a) 'b'.replace(/b/g, function() { c = this; }); c.d = 3; c.d;
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8/regress/regress-464092-02.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8/regress/regress-464092-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8/regress/regress-464092-02.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8/regress/regress-464092-02.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 = 464092;
-var summary = 'Censor block objects';
-var actual = '';
-var expect = '';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
-
-  try
-  {
-    let (a) 'b'.replace(/b/g, function() c = this );
-  }
-  catch(ex)
-  {
-    actual = ex + '';
-  }
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8/regress/regress-472528-01.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8/regress/regress-472528-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8/regress/regress-472528-01.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8/regress/regress-472528-01.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +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 = 472528;
-var summary = 'Do not assert: !js_IsActiveWithOrBlock(cx, fp->scopeChain, 0)';
-var actual = '';
-var expect = '';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
-
-  jit(true);
-
-  try
-  {
-    for (var i = 0; i < 4; ++i) {
-      for (let j = 0; j < 2; ++j) { }
-      let (x) (function(){});
-    }
-  }
-  catch(ex)
-  {
-  }
-  jit(false);
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8/regress/regress-472528-02.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8/regress/regress-472528-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8/regress/regress-472528-02.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8/regress/regress-472528-02.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +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 = 472528;
-var summary = 'Do not assert: !fp->blockChain';
-var actual = '';
-var expect = '';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
-
-  jit(true);
-
-  try
-  {
-    for (let i = 0; i < 4; ++i) {
-      for (let j = 0; j < 2; ++j) { }
-      let (x) (function(){});
-    }
-  }
-  catch(ex)
-  {
-  }
-  jit(false);
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8/regress/regress-472703.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8/regress/regress-472703.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8/regress/regress-472703.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8/regress/regress-472703.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +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 = 472703;
-var summary = 'Do not assert: regs.sp[-1] == OBJECT_TO_JSVAL(fp->scopeChain)';
-var actual = '';
-var expect = '';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
-
-  jit(true);
-
-  try
-  {
-    eval(
-      'for (var z = 0; z < 2; ++z) { with({}) for(let y in [1, null]); let(x)' +
-      '(function(){})(); }'
-      );
-  }
-  catch(ex)
-  {
-  }
-  jit(false);
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_1/regress/regress-420399.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_1/regress/regress-420399.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_1/regress/regress-420399.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_1/regress/regress-420399.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +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 = 420399;
-var summary = 'Let expression error involving undefined';
-var actual = '';
-var expect = '';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
- 
-  expect = "TypeError: a is undefined";
-  try
-  {
-    (let (a=undefined) a).b = 3;
-  }
-  catch(ex)
-  {
-    actual = ex + '';
-  }
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_1/regress/regress-452498-054.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_1/regress/regress-452498-054.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_1/regress/regress-452498-054.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_1/regress/regress-452498-054.js	2015-05-25 20:43:37.000000000 +0000
@@ -31,11 +31,6 @@
   function f() { var x; eval("let x, x;"); }
   f();
 
-// Assertion failure: fp2->fun && fp2->script,
-// at ../jsinterp.cpp:5589
-//
-  eval("let(x) function(){ x = this; }()");
-
   reportCompare(expect, actual, summary);
 
   exitFunc ('test');
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_1/regress/regress-452498-068.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_1/regress/regress-452498-068.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_1/regress/regress-452498-068.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_1/regress/regress-452498-068.js	2015-05-25 20:43:37.000000000 +0000
@@ -45,13 +45,6 @@
 
 // =====
 
-  for(
-    const NaN = undefined;
-    this.__defineSetter__("x4", function(){});
-    (eval("", (p={})))) let ({} = (((x ))(function ([]) {})), x1) y;
-
-// =====
-
   function f(){ var c; eval("{var c = NaN, c;}"); }
   f();
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_1/regress/regress-452498-082.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_1/regress/regress-452498-082.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_1/regress/regress-452498-082.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_1/regress/regress-452498-082.js	2015-05-25 20:43:37.000000000 +0000
@@ -73,21 +73,6 @@
   }
 
 // =====
-
-  if (typeof window == 'undefined')
-    global = this;
-  else
-    global = window;
-
-  try
-  {
-    eval('(function(){with(global){1e-81; }for(let [x, x3] = global -= x in []) function(){}})();');
-  }
-  catch(ex)
-  {
-  }
-
-// =====
   try
   {
     eval(
@@ -116,11 +101,6 @@
 
 // =====
 
-  var f = new Function("try { with({}) x = x; } catch(\u3056 if (function(){x = x2;})()) { let([] = [1.2e3.valueOf(\"number\")]) ((function(){})()); } ");
-  "" + f;
-
-// =====
-
   var f = new Function("[] = [( '' )()];");
   "" + f;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_1/regress/regress-452498-130.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_1/regress/regress-452498-130.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_1/regress/regress-452498-130.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_1/regress/regress-452498-130.js	2015-05-25 20:43:37.000000000 +0000
@@ -26,20 +26,6 @@
 // =====
   ((function x()x in []) for (y in []))
 
-//Assertion failure: lexdep->frameLevel() <= funbox->level, at ../jsparse.cpp:1778
-// Opt crash [@ JSCompiler::setFunctionKinds]
-// =====
-    let(x=[]) function(){try {x} catch(x) {} }
-
-// Assertion failure: cg->upvars.lookup(atom), at ../jsemit.cpp:2034
-// =====
-  try
-  {
-    eval('for(let [y] = (let (x) (y)) in []) function(){}');
-  }
-  catch(ex)
-  {
-  }
 // Assertion failure: !(pnu->pn_dflags & PND_BOUND), at ../jsemit.cpp:1818
 // =====
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_1/regress/regress-452498-178.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_1/regress/regress-452498-178.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_1/regress/regress-452498-178.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_1/regress/regress-452498-178.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 #178  From  Gary Kwong
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
-
-// Assertion failure: slot < fp2->script->nfixed, at ../jsinterp.cpp:5610
-
-  eval("with({}) let(x=[])(function(){x})()");
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/extensions/regress-668438.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/extensions/regress-668438.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/extensions/regress-668438.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/extensions/regress-668438.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-// -*- indent-tabs-mode: nil; js-indent-level: 4 -*-
-// Any copyright is dedicated to the Public Domain.
-// http://creativecommons.org/licenses/publicdomain/
-
-// Don't assert trying to parse this.
-let(x = (x(( function() { 
-                 return { e: function() { e in x } };
-             }))
-         for (x in [])))
-true;
-
-reportCompare(true, true);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/reflect-parse/alternateBuilder.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/reflect-parse/alternateBuilder.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/reflect-parse/alternateBuilder.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/reflect-parse/alternateBuilder.js	2015-05-25 20:43:38.000000000 +0000
@@ -138,7 +138,6 @@
     comprehensionExpression: reject,
     generatorExpression: reject,
     yieldExpression: reject,
-    letExpression: reject,
 
     emptyStatement: () => ["EmptyStmt", {}],
     blockStatement: function(stmts) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/reflect-parse/basicBuilder.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/reflect-parse/basicBuilder.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/reflect-parse/basicBuilder.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/reflect-parse/basicBuilder.js	2015-05-25 20:43:38.000000000 +0000
@@ -42,7 +42,6 @@
 assertGlobalExpr("[x for (x in y)]", 17, { comprehensionExpression: () => 17 });
 assertGlobalExpr("(x for (x in y))", 18, { generatorExpression: () => 18 });
 assertGlobalExpr("(function() { yield 42 })", genFunExpr(null, [], blockStmt([exprStmt(19)])), { yieldExpression: () => 19 });
-assertGlobalExpr("(let (x) x)", 20, { letExpression: () => 20 });
 
 assertGlobalStmt("switch (x) { case y: }", switchStmt(ident("x"), [1]), { switchCase: () => 1 });
 assertGlobalStmt("try { } catch (e) { }", 2, { tryStatement: (b, g, u, f) => u, catchClause: () => 2 });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/reflect-parse/classes.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/reflect-parse/classes.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/reflect-parse/classes.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/reflect-parse/classes.js	2015-05-25 20:43:38.000000000 +0000
@@ -408,10 +408,10 @@
     assertError("(()=>super['prop'])", SyntaxError);
     assertError("function *foo() { super['prop']; }", SyntaxError);
     assertError("super['prop']", SyntaxError);
-    
+
     // Or inside functions inside method definitions...
     assertClassError("class NAME { constructor() { function nested() { super.prop; }}}", SyntaxError);
-    
+
     // Bare super is forbidden
     assertError("super", SyntaxError);
 
@@ -442,6 +442,17 @@
     assertClassError("class NAME { constructor() { super.m(", SyntaxError);
     assertClassError("class NAME { constructor() { super[", SyntaxError);
     assertClassError("class NAME { constructor() { super(", SyntaxError);
+
+    // Can not omit curly brackets
+    assertClassError("class NAME { constructor() ({}) }", SyntaxError);
+    assertClassError("class NAME { constructor() void 0 }", SyntaxError);
+    assertClassError("class NAME { constructor() 1 }", SyntaxError);
+    assertClassError("class NAME { constructor() false }", SyntaxError);
+    assertClassError("class NAME { constructor() {} a() ({}) }", SyntaxError);
+    assertClassError("class NAME { constructor() {} a() void 0 }", SyntaxError);
+    assertClassError("class NAME { constructor() {} a() 1 }", SyntaxError);
+    assertClassError("class NAME { constructor() {} a() false }", SyntaxError);
+
 }
 
 if (classesEnabled())
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/reflect-parse/for-loop-destructuring.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/reflect-parse/for-loop-destructuring.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/reflect-parse/for-loop-destructuring.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/reflect-parse/for-loop-destructuring.js	2015-05-25 20:43:38.000000000 +0000
@@ -36,6 +36,16 @@
 assertError("for each (const {a:x,b:y,c:z} in foo);", SyntaxError);
 assertError("for each (const [x,y,z] in foo);", SyntaxError);
 
+assertError("for (x = 22 in foo);", SyntaxError);-
+assertError("for ({a:x,b:y,c:z} = 22 in foo);", SyntaxError);
+assertError("for ([x,y,z] = 22 in foo);", SyntaxError);
+assertError("for (const x = 22 in foo);", SyntaxError);
+assertError("for (const {a:x,b:y,c:z} = 22 in foo);", SyntaxError);
+assertError("for (const [x,y,z] = 22 in foo);", SyntaxError);
+assertError("for each (const x = 22 in foo);", SyntaxError);
+assertError("for each (const {a:x,b:y,c:z} = 22 in foo);", SyntaxError);
+assertError("for each (const [x,y,z] = 22 in foo);", SyntaxError);
+
 }
 
 runtest(test);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/reflect-parse/lexicals.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/reflect-parse/lexicals.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/reflect-parse/lexicals.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/reflect-parse/lexicals.js	2015-05-25 20:43:38.000000000 +0000
@@ -14,30 +14,6 @@
 assertDecl("const {x:y} = foo;", constDecl([{ id: objPatt([assignProp("x", ident("y"))]),
                                               init: ident("foo") }]));
 
-
-// let expressions
-
-assertExpr("(let (x=1) x)", letExpr([{ id: ident("x"), init: lit(1) }], ident("x")));
-assertExpr("(let (x=1,y=2) y)", letExpr([{ id: ident("x"), init: lit(1) },
-                                         { id: ident("y"), init: lit(2) }],
-                                        ident("y")));
-assertExpr("(let (x=1,y=2,z=3) z)", letExpr([{ id: ident("x"), init: lit(1) },
-                                             { id: ident("y"), init: lit(2) },
-                                             { id: ident("z"), init: lit(3) }],
-                                            ident("z")));
-assertExpr("(let (x) x)", letExpr([{ id: ident("x"), init: null }], ident("x")));
-assertExpr("(let (x,y) y)", letExpr([{ id: ident("x"), init: null },
-                                     { id: ident("y"), init: null }],
-                                    ident("y")));
-assertExpr("(let (x,y,z) z)", letExpr([{ id: ident("x"), init: null },
-                                       { id: ident("y"), init: null },
-                                       { id: ident("z"), init: null }],
-                                      ident("z")));
-assertExpr("(let (x = 1, y = x) y)", letExpr([{ id: ident("x"), init: lit(1) },
-                                              { id: ident("y"), init: ident("x") }],
-                                             ident("y")));
-assertError("(let (x = 1, x = 2) x)", TypeError);
-
 // let statements
 
 assertStmt("let (x=1) { }", letStmt([{ id: ident("x"), init: lit(1) }], blockStmt([])));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/reflect-parse/methodDefn.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/reflect-parse/methodDefn.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/reflect-parse/methodDefn.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/reflect-parse/methodDefn.js	2015-05-25 20:43:38.000000000 +0000
@@ -10,6 +10,11 @@
               objExpr([{ key: ident("a"), value: genFunExpr(ident("a"), [], blockStmt([])), method:
               true}])));
 
+// Method definitions without braces
+assertError("({ a() void 0 })", SyntaxError);
+assertError("({ a() 1 })", SyntaxError);
+assertError("({ a() false })", SyntaxError);
+
 // getters and setters
 
 assertExpr("({ get x() { return 42 } })",
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/reflect-parse/PatternBuilders.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/reflect-parse/PatternBuilders.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/reflect-parse/PatternBuilders.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/reflect-parse/PatternBuilders.js	2015-05-25 20:43:38.000000000 +0000
@@ -232,9 +232,6 @@
 function graphExpr(idx, body) {
     return Pattern({ type: "GraphExpression", index: idx, expression: body });
 }
-function letExpr(head, body) {
-    return Pattern({ type: "LetExpression", head: head, body: body });
-}
 function idxExpr(idx) {
     return Pattern({ type: "GraphIndexExpression", index: idx });
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/regress/regress-569464.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/regress/regress-569464.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/regress/regress-569464.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/regress/regress-569464.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- * Contributor: Dave Herman
- */
-
-function earlyError(src) {
-    var threw;
-    try {
-        eval(src);
-        threw = false;
-    } catch (expected) {
-        threw = true;
-    }
-    assertEq(threw, true);
-}
-
-earlyError("'use strict'; let (x) 42;");
-earlyError("function f() { 'use strict'; let (x) 42;");
-earlyError("'use strict'; function id(x) { return x } let (a=1) a ? f : x++(42);");
-earlyError("function id(x) { return x } function f() { 'use strict'; let (a=1) a ? f : x++(42); }");
-earlyError("'use strict'; let (x=2, y=3) x=3, y=13");
-earlyError("function f() { 'use strict'; let (x=2, y=3) x=3, y=13 }");
-
-x = "global";
-(let (x=2, y=3) x=3, y=13);
-assertEq(x, "global");
-assertEq(y, 13);
-
-// https://bugzilla.mozilla.org/show_bug.cgi?id=569464#c12
-g = (let (x=7) x*x for each (x in [1,2,3]));
-for (let y in g) {
-    assertEq(y, 49);
-}
-
-reportCompare(0, 0, "In strict mode, let expression statements are disallowed.");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/regress/regress-592202-1.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/regress/regress-592202-1.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/regress/regress-592202-1.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/regress/regress-592202-1.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- */
-i = 42
-eval("let(y){(function(){let({}=y){(function(){let({}=y=[])(i)})()}})()}")
-reportCompare(0, 0, "ok");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/regress/regress-592202-2.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/regress/regress-592202-2.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/regress/regress-592202-2.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/regress/regress-592202-2.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- */
-eval("\
-  let(b)((\
-    function(){\
-      let(d=b)\
-      ((function(){\
-        b=b\
-      })())\
-    }\
-  )())\
-")
-reportCompare(0, 0, "ok");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/regress/regress-600137.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/regress/regress-600137.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/regress/regress-600137.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/regress/regress-600137.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 4 -*- */
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- */
-
-if (typeof evalcx == 'function') {
-    var src = 'try {\n' +
-    '    for (var [e] in d) {\n' +
-    '        (function () {});\n' +
-    '    }\n' +
-    '} catch (e) {}\n' +
-    'try {\n' +
-    '    let(x = Object.freeze(this, /x/))\n' +
-    '    e = {}.toString\n' +
-    '    function y() {}\n' +
-    '} catch (e) {}';
-
-    evalcx(src);
-}
-
-reportCompare(0, 0, "don't crash");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/regress/regress-673070-1.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/regress/regress-673070-1.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/regress/regress-673070-1.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/regress/regress-673070-1.js	2015-05-25 20:43:38.000000000 +0000
@@ -2,7 +2,8 @@
 // http://creativecommons.org/licenses/publicdomain/
 
 var q = [2];
-let ([q] = eval("q"))
+let ([q] = eval("q")) {
     assertEq(q, 2);
+}
 
 reportCompare(0, 0, 'ok');
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/regress/regress-673070-2.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/regress/regress-673070-2.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/js1_8_5/regress/regress-673070-2.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/js1_8_5/regress/regress-673070-2.js	2015-05-25 20:43:38.000000000 +0000
@@ -2,7 +2,8 @@
 // http://creativecommons.org/licenses/publicdomain/
 
 var q = 1;
-let ([q] = [eval("q")])
+let ([q] = [eval("q")]) {
     assertEq(q, 1);
+}
 
 reportCompare(0, 0, 'ok');
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/shell.js firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/shell.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/tests/shell.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/tests/shell.js	2015-05-25 20:43:38.000000000 +0000
@@ -535,8 +535,6 @@
     }
     return deriv;
   }
-
-  return 0;
 }
 
 function compareSource(expect, actual, summary)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/ArrayBufferObject.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/ArrayBufferObject.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/ArrayBufferObject.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/ArrayBufferObject.cpp	2015-05-25 20:43:49.000000000 +0000
@@ -1549,7 +1549,7 @@
     RootedId byteLengthId(cx, NameToId(cx->names().byteLength));
     unsigned attrs = JSPROP_SHARED | JSPROP_GETTER;
     JSObject* getter =
-        NewNativeFunction(cx, ArrayBufferObject::byteLengthGetter, 0, js::NullPtr());
+        NewNativeFunction(cx, ArrayBufferObject::byteLengthGetter, 0, nullptr);
     if (!getter)
         return nullptr;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/ArrayObject-inl.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/ArrayObject-inl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/ArrayObject-inl.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/ArrayObject-inl.h	2015-05-25 20:43:49.000000000 +0000
@@ -12,6 +12,9 @@
 #include "gc/GCTrace.h"
 #include "vm/String.h"
 
+#include "jsgcinlines.h"
+#include "jsobjinlines.h"
+
 #include "vm/TypeInference-inl.h"
 
 namespace js {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/CommonPropertyNames.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/CommonPropertyNames.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/CommonPropertyNames.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/CommonPropertyNames.h	2015-05-25 20:43:49.000000000 +0000
@@ -176,6 +176,7 @@
     macro(proxy, proxy, "proxy") \
     macro(reason, reason, "reason") \
     macro(Reify, Reify, "Reify") \
+    macro(RequireObjectCoercible, RequireObjectCoercible, "RequireObjectCoercible") \
     macro(resumeGenerator, resumeGenerator, "resumeGenerator") \
     macro(return, return_, "return") \
     macro(revoke, revoke, "revoke") \
@@ -248,6 +249,7 @@
      * enum JS::SymbolCode in jsapi.h. */ \
     macro(iterator, iterator, "iterator") \
     macro(match, match, "match") \
+    macro(species, species, "species") \
     /* Same goes for the descriptions of the well-known symbols. */ \
     macro(Symbol_create, Symbol_create, "Symbol.create") \
     macro(Symbol_hasInstance, Symbol_hasInstance, "Symbol.hasInstance") \
@@ -255,6 +257,7 @@
     macro(Symbol_isRegExp, Symbol_isRegExp, "Symbol.isRegExp") \
     macro(Symbol_iterator, Symbol_iterator, "Symbol.iterator") \
     macro(Symbol_match,    Symbol_match,    "Symbol.match") \
+    macro(Symbol_species,  Symbol_species,  "Symbol.species") \
     macro(Symbol_toPrimitive, Symbol_toPrimitive, "Symbol.toPrimitive") \
     macro(Symbol_toStringTag, Symbol_toStringTag, "Symbol.toStringTag") \
     macro(Symbol_unscopables, Symbol_unscopables, "Symbol.unscopables") \
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/DateObject.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/DateObject.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/DateObject.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/DateObject.h	2015-05-25 20:43:49.000000000 +0000
@@ -41,6 +41,7 @@
 
   public:
     static const Class class_;
+    static const Class protoClass_;
 
     inline const js::Value& UTCTime() const {
         return getFixedSlot(UTC_TIME_SLOT);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/Debugger.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/Debugger.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/Debugger.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/Debugger.cpp	2015-05-25 20:43:49.000000000 +0000
@@ -39,6 +39,7 @@
 
 using namespace js;
 
+using JS::dbg::AutoEntryMonitor;
 using JS::dbg::Builder;
 using js::frontend::IsIdentifier;
 using mozilla::ArrayLength;
@@ -137,7 +138,7 @@
     if (!JSID_IS_ATOM(id) || !IsIdentifier(JSID_TO_ATOM(id))) {
         RootedValue val(cx, v);
         ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_UNEXPECTED_TYPE,
-                              JSDVG_SEARCH_STACK, val, js::NullPtr(), "not an identifier",
+                              JSDVG_SEARCH_STACK, val, nullptr, "not an identifier",
                               nullptr);
         return false;
     }
@@ -704,7 +705,7 @@
 Debugger::slowPathOnDebuggerStatement(JSContext* cx, AbstractFramePtr frame)
 {
     RootedValue rval(cx);
-    JSTrapStatus status = dispatchHook(cx, &rval, OnDebuggerStatement, NullPtr());
+    JSTrapStatus status = dispatchHook(cx, &rval, OnDebuggerStatement, nullptr);
 
     switch (status) {
       case JSTRAP_CONTINUE:
@@ -735,7 +736,7 @@
         return JSTRAP_CONTINUE;
 
     RootedValue rval(cx);
-    JSTrapStatus status = dispatchHook(cx, &rval, OnExceptionUnwind, NullPtr());
+    JSTrapStatus status = dispatchHook(cx, &rval, OnExceptionUnwind, nullptr);
 
     switch (status) {
       case JSTRAP_CONTINUE:
@@ -3064,7 +3065,7 @@
     THIS_DEBUGGER(cx, argc, vp, "clearAllBreakpoints", args, dbg);
     for (WeakGlobalObjectSet::Range r = dbg->debuggees.all(); !r.empty(); r.popFront())
         r.front()->compartment()->clearBreakpointsIn(cx->runtime()->defaultFreeOp(),
-                                                     dbg, NullPtr());
+                                                     dbg, nullptr);
     return true;
 }
 
@@ -3108,7 +3109,7 @@
     Debugger* debugger;
     {
         /* Construct the underlying C++ object. */
-        auto dbg = cx->make_unique<Debugger>(cx, obj.get());
+        AutoInitGCManagedObject<Debugger> dbg(cx->make_unique<Debugger>(cx, obj.get()));
         if (!dbg || !dbg->init(cx))
             return false;
 
@@ -4096,7 +4097,7 @@
     /* Add all events to the array. */
     uint32_t index = 0;
     for (EventEntry* eventItem = events; eventItem < events + num; eventItem++, index++) {
-        RootedObject item(cx, NewObjectWithGivenProto(cx, &PlainObject::class_, NullPtr()));
+        RootedObject item(cx, NewObjectWithGivenProto(cx, &PlainObject::class_, nullptr));
         if (!item)
             return false;
 
@@ -4195,7 +4196,7 @@
     /* Add all events to the array. */
     uint32_t index = 0;
     for (EventEntry* eventItem = events; eventItem < events + num; eventItem++) {
-        RootedObject item(cx, NewObjectWithGivenProto(cx, &PlainObject::class_, NullPtr()));
+        RootedObject item(cx, NewObjectWithGivenProto(cx, &PlainObject::class_, nullptr));
         if (!item)
             return false;
 
@@ -6000,7 +6001,7 @@
         Rooted<jsid> id(cx);
         for (unsigned i = 0; i < fargc; i++) {
             RootedFunction getobj(cx);
-            getobj = NewNativeFunction(cx, DebuggerArguments_getArg, 0, js::NullPtr(),
+            getobj = NewNativeFunction(cx, DebuggerArguments_getArg, 0, nullptr,
                                        gc::AllocKind::FUNCTION_EXTENDED);
             if (!getobj)
                 return false;
@@ -6183,7 +6184,7 @@
      * boundaries, and we are putting a DebugScopeProxy or non-syntactic With on
      * the scope chain.
      */
-    Rooted<StaticEvalObject*> staticScope(cx, StaticEvalObject::create(cx, js::NullPtr()));
+    Rooted<StaticEvalObject*> staticScope(cx, StaticEvalObject::create(cx, nullptr));
     if (!staticScope)
         return false;
     CompileOptions options(cx);
@@ -6320,7 +6321,7 @@
 
     /* If evalWithBindings, create the inner environment. */
     if (evalWithBindings) {
-        RootedPlainObject nenv(cx, NewObjectWithGivenProto<PlainObject>(cx, NullPtr()));
+        RootedPlainObject nenv(cx, NewObjectWithGivenProto<PlainObject>(cx, nullptr));
         if (!nenv)
             return false;
         RootedId id(cx);
@@ -6375,7 +6376,7 @@
     UpdateFrameIterPc(iter);
     return DebuggerGenericEval(cx, "Debugger.Frame.prototype.eval",
                                args[0], EvalWithDefaultBindings, JS::UndefinedHandleValue,
-                               args.get(1), args.rval(), dbg, js::NullPtr(), &iter);
+                               args.get(1), args.rval(), dbg, nullptr, &iter);
 }
 
 static bool
@@ -6388,7 +6389,7 @@
     UpdateFrameIterPc(iter);
     return DebuggerGenericEval(cx, "Debugger.Frame.prototype.evalWithBindings",
                                args[0], EvalHasExtraBindings, args[1], args.get(2),
-                               args.rval(), dbg, js::NullPtr(), &iter);
+                               args.rval(), dbg, nullptr, &iter);
 }
 
 static bool
@@ -7225,11 +7226,11 @@
 
         if (obj->is<GlobalObject>()) {
             ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_DEBUG_WRAPPER_IN_WAY,
-                                  JSDVG_SEARCH_STACK, dbgobj, js::NullPtr(),
+                                  JSDVG_SEARCH_STACK, dbgobj, nullptr,
                                   isWrapper, isWindowProxy);
         } else {
             ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_DEBUG_BAD_REFERENT,
-                                  JSDVG_SEARCH_STACK, dbgobj, js::NullPtr(),
+                                  JSDVG_SEARCH_STACK, dbgobj, nullptr,
                                   "a global object", nullptr);
         }
         return false;
@@ -7802,6 +7803,21 @@
 }
 
 
+/*** JS::dbg::AutoEntryMonitor ******************************************************************/
+
+AutoEntryMonitor::AutoEntryMonitor(JSContext* cx)
+  : runtime_(cx->runtime()),
+    savedMonitor_(cx->runtime()->entryMonitor)
+{
+    runtime_->entryMonitor = this;
+}
+
+AutoEntryMonitor::~AutoEntryMonitor()
+{
+    runtime_->entryMonitor = savedMonitor_;
+}
+
+
 /*** Glue ****************************************************************************************/
 
 extern JS_PUBLIC_API(bool)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/DebuggerMemory.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/DebuggerMemory.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/DebuggerMemory.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/DebuggerMemory.cpp	2015-05-25 20:43:49.000000000 +0000
@@ -191,7 +191,7 @@
             return false;
 
         // Don't pop the AllocationSite yet. The queue's links are followed by
-        // the GC to find the AllocationSite, but are not barried, so we must
+        // the GC to find the AllocationSite, but are not barriered, so we must
         // edit them with great care. Use the queue entry in place, and then
         // pop and delete together.
         Debugger::AllocationSite* allocSite = dbg->allocationsLog.getFirst();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/ForOfIterator.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/ForOfIterator.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/ForOfIterator.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/ForOfIterator.cpp	2015-05-25 20:43:49.000000000 +0000
@@ -72,7 +72,7 @@
     // one about |obj|.
     if (!callee.isObject() || !callee.toObject().isCallable()) {
         UniquePtr<char[], JS::FreePolicy> bytes = DecompileValueGenerator(cx, JSDVG_SEARCH_STACK,
-                                                                          iterable, NullPtr());
+                                                                          iterable, nullptr);
         if (!bytes)
             return false;
         JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_ITERABLE, bytes.get());
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/GeneratorObject.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/GeneratorObject.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/GeneratorObject.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/GeneratorObject.cpp	2015-05-25 20:43:49.000000000 +0000
@@ -68,7 +68,7 @@
 
     if (*pc == JSOP_YIELD && genObj->isClosing() && genObj->is<LegacyGeneratorObject>()) {
         RootedValue val(cx, ObjectValue(*frame.callee()));
-        ReportValueError(cx, JSMSG_BAD_GENERATOR_YIELD, JSDVG_IGNORE_STACK, val, NullPtr());
+        ReportValueError(cx, JSMSG_BAD_GENERATOR_YIELD, JSDVG_IGNORE_STACK, val, nullptr);
         return false;
     }
 
@@ -312,7 +312,7 @@
         RootedObject proto(cx, &function.toObject());
         RootedAtom name(cx, cx->names().GeneratorFunction);
         RootedObject genFunction(cx, NewFunctionWithProto(cx, Generator, 1,
-                                                          JSFunction::NATIVE_CTOR, NullPtr(), name,
+                                                          JSFunction::NATIVE_CTOR, nullptr, name,
                                                           proto));
         if (!genFunction)
             return false;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/GlobalObject.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/GlobalObject.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/GlobalObject.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/GlobalObject.cpp	2015-05-25 20:43:49.000000000 +0000
@@ -153,8 +153,8 @@
     // |createPrototype|, |prototypeFunctions|, and |prototypeProperties|
     // should all be null.
     RootedObject proto(cx);
-    if (clasp->spec.createPrototype) {
-        proto = clasp->spec.createPrototype(cx, key);
+    if (clasp->spec.createPrototypeHook()) {
+        proto = clasp->spec.createPrototypeHook()(cx, key);
         if (!proto)
             return false;
 
@@ -162,7 +162,7 @@
     }
 
     // Create the constructor.
-    RootedObject ctor(cx, clasp->spec.createConstructor(cx, key));
+    RootedObject ctor(cx, clasp->spec.createConstructorHook()(cx, key));
     if (!ctor)
         return false;
 
@@ -178,19 +178,19 @@
     // Define any specified functions and properties, unless we're a dependent
     // standard class (in which case they live on the prototype).
     if (!StandardClassIsDependent(key)) {
-        if (const JSFunctionSpec* funs = clasp->spec.prototypeFunctions) {
+        if (const JSFunctionSpec* funs = clasp->spec.prototypeFunctions()) {
             if (!JS_DefineFunctions(cx, proto, funs, DontDefineLateProperties))
                 return false;
         }
-        if (const JSPropertySpec* props = clasp->spec.prototypeProperties) {
+        if (const JSPropertySpec* props = clasp->spec.prototypeProperties()) {
             if (!JS_DefineProperties(cx, proto, props))
                 return false;
         }
-        if (const JSFunctionSpec* funs = clasp->spec.constructorFunctions) {
+        if (const JSFunctionSpec* funs = clasp->spec.constructorFunctions()) {
             if (!JS_DefineFunctions(cx, ctor, funs, DontDefineLateProperties))
                 return false;
         }
-        if (const JSPropertySpec* props = clasp->spec.constructorProperties) {
+        if (const JSPropertySpec* props = clasp->spec.constructorProperties()) {
             if (!JS_DefineProperties(cx, ctor, props))
                 return false;
         }
@@ -201,7 +201,7 @@
         return false;
 
     // Call the post-initialization hook, if provided.
-    if (clasp->spec.finishInit && !clasp->spec.finishInit(cx, ctor, proto))
+    if (clasp->spec.finishInitHook() && !clasp->spec.finishInitHook()(cx, ctor, proto))
         return false;
 
     if (clasp->spec.shouldDefineConstructor()) {
@@ -242,7 +242,7 @@
     MOZ_ASSERT(clasp->flags & JSCLASS_IS_GLOBAL);
     MOZ_ASSERT(clasp->trace == JS_GlobalObjectTraceHook);
 
-    JSObject* obj = NewObjectWithGivenProto(cx, clasp, NullPtr(), SingletonObject);
+    JSObject* obj = NewObjectWithGivenProto(cx, clasp, nullptr, SingletonObject);
     if (!obj)
         return nullptr;
 
@@ -354,11 +354,11 @@
     MOZ_ASSERT(cx->runtime()->isSelfHostingGlobal(global));
     const Class* clasp = ProtoKeyToClass(protoKey);
     RootedObject proto(cx);
-    proto = clasp->spec.createPrototype(cx, protoKey);
+    proto = clasp->spec.createPrototypeHook()(cx, protoKey);
     if (!proto)
         return false;
 
-    RootedObject ctor(cx, clasp->spec.createConstructor(cx, protoKey));
+    RootedObject ctor(cx, clasp->spec.createConstructorHook()(cx, protoKey));
     if (!ctor)
         return false;
 
@@ -391,6 +391,14 @@
         return false;
     }
 
+    RootedValue std_species(cx);
+    std_species.setSymbol(cx->wellKnownSymbols().get(JS::SymbolCode::species));
+    if (!JS_DefineProperty(cx, global, "std_species", std_species,
+                           JSPROP_PERMANENT | JSPROP_READONLY))
+    {
+        return false;
+    }
+
     return InitBareBuiltinCtor(cx, global, JSProto_Array) &&
            InitBareBuiltinCtor(cx, global, JSProto_TypedArray) &&
            InitBareBuiltinCtor(cx, global, JSProto_Uint8Array) &&
@@ -534,7 +542,7 @@
     if (debuggers)
         return debuggers;
 
-    NativeObject* obj = NewNativeObjectWithGivenProto(cx, &GlobalDebuggees_class, NullPtr());
+    NativeObject* obj = NewNativeObjectWithGivenProto(cx, &GlobalDebuggees_class, nullptr);
     if (!obj)
         return nullptr;
     debuggers = cx->new_<DebuggerVector>();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/GlobalObject.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/GlobalObject.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/GlobalObject.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/GlobalObject.h	2015-05-25 20:43:49.000000000 +0000
@@ -69,47 +69,49 @@
      */
     static const unsigned STANDARD_CLASS_SLOTS  = JSProto_LIMIT * 3;
 
-    /* Various function values needed by the engine. */
-    static const unsigned EVAL                    = APPLICATION_SLOTS + STANDARD_CLASS_SLOTS;
-    static const unsigned CREATE_DATAVIEW_FOR_THIS = EVAL + 1;
-    static const unsigned THROWTYPEERROR          = CREATE_DATAVIEW_FOR_THIS + 1;
+    enum : unsigned {
+        /* Various function values needed by the engine. */
+        EVAL = APPLICATION_SLOTS + STANDARD_CLASS_SLOTS,
+        CREATE_DATAVIEW_FOR_THIS,
+        THROWTYPEERROR,
 
-    /*
-     * Instances of the internal createArrayFromBuffer function used by the
-     * typed array code, one per typed array element type.
-     */
-    static const unsigned FROM_BUFFER_UINT8 = THROWTYPEERROR + 1;
-    static const unsigned FROM_BUFFER_INT8 = FROM_BUFFER_UINT8 + 1;
-    static const unsigned FROM_BUFFER_UINT16 = FROM_BUFFER_INT8 + 1;
-    static const unsigned FROM_BUFFER_INT16 = FROM_BUFFER_UINT16 + 1;
-    static const unsigned FROM_BUFFER_UINT32 = FROM_BUFFER_INT16 + 1;
-    static const unsigned FROM_BUFFER_INT32 = FROM_BUFFER_UINT32 + 1;
-    static const unsigned FROM_BUFFER_FLOAT32 = FROM_BUFFER_INT32 + 1;
-    static const unsigned FROM_BUFFER_FLOAT64 = FROM_BUFFER_FLOAT32 + 1;
-    static const unsigned FROM_BUFFER_UINT8CLAMPED = FROM_BUFFER_FLOAT64 + 1;
+        /*
+         * Instances of the internal createArrayFromBuffer function used by the
+         * typed array code, one per typed array element type.
+         */
+        FROM_BUFFER_UINT8,
+        FROM_BUFFER_INT8,
+        FROM_BUFFER_UINT16,
+        FROM_BUFFER_INT16,
+        FROM_BUFFER_UINT32,
+        FROM_BUFFER_INT32,
+        FROM_BUFFER_FLOAT32,
+        FROM_BUFFER_FLOAT64,
+        FROM_BUFFER_UINT8CLAMPED,
 
-    /* One-off properties stored after slots for built-ins. */
-    static const unsigned ARRAY_ITERATOR_PROTO  = FROM_BUFFER_UINT8CLAMPED + 1;
-    static const unsigned STRING_ITERATOR_PROTO  = ARRAY_ITERATOR_PROTO + 1;
-    static const unsigned LEGACY_GENERATOR_OBJECT_PROTO = STRING_ITERATOR_PROTO + 1;
-    static const unsigned STAR_GENERATOR_OBJECT_PROTO = LEGACY_GENERATOR_OBJECT_PROTO + 1;
-    static const unsigned MAP_ITERATOR_PROTO      = STAR_GENERATOR_OBJECT_PROTO + 1;
-    static const unsigned SET_ITERATOR_PROTO      = MAP_ITERATOR_PROTO + 1;
-    static const unsigned COLLATOR_PROTO          = SET_ITERATOR_PROTO + 1;
-    static const unsigned NUMBER_FORMAT_PROTO     = COLLATOR_PROTO + 1;
-    static const unsigned DATE_TIME_FORMAT_PROTO  = NUMBER_FORMAT_PROTO + 1;
-    static const unsigned REGEXP_STATICS          = DATE_TIME_FORMAT_PROTO + 1;
-    static const unsigned WARNED_ONCE_FLAGS       = REGEXP_STATICS + 1;
-    static const unsigned RUNTIME_CODEGEN_ENABLED = WARNED_ONCE_FLAGS + 1;
-    static const unsigned DEBUGGERS               = RUNTIME_CODEGEN_ENABLED + 1;
-    static const unsigned INTRINSICS              = DEBUGGERS + 1;
-    static const unsigned FLOAT32X4_TYPE_DESCR    = INTRINSICS + 1;
-    static const unsigned FLOAT64X2_TYPE_DESCR    = FLOAT32X4_TYPE_DESCR + 1;
-    static const unsigned INT32X4_TYPE_DESCR      = FLOAT64X2_TYPE_DESCR + 1;
-    static const unsigned FOR_OF_PIC_CHAIN        = INT32X4_TYPE_DESCR + 1;
+        /* One-off properties stored after slots for built-ins. */
+        ARRAY_ITERATOR_PROTO,
+        STRING_ITERATOR_PROTO,
+        LEGACY_GENERATOR_OBJECT_PROTO,
+        STAR_GENERATOR_OBJECT_PROTO,
+        MAP_ITERATOR_PROTO,
+        SET_ITERATOR_PROTO,
+        COLLATOR_PROTO,
+        NUMBER_FORMAT_PROTO,
+        DATE_TIME_FORMAT_PROTO,
+        REGEXP_STATICS,
+        WARNED_ONCE_FLAGS,
+        RUNTIME_CODEGEN_ENABLED,
+        DEBUGGERS,
+        INTRINSICS,
+        FLOAT32X4_TYPE_DESCR,
+        FLOAT64X2_TYPE_DESCR,
+        INT32X4_TYPE_DESCR,
+        FOR_OF_PIC_CHAIN,
 
-    /* Total reserved-slot count for global objects. */
-    static const unsigned RESERVED_SLOTS = FOR_OF_PIC_CHAIN + 1;
+        /* Total reserved-slot count for global objects. */
+        RESERVED_SLOTS
+    };
 
     /*
      * The slot count must be in the public API for JSCLASS_GLOBAL_FLAGS, and
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/HelperThreads.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/HelperThreads.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/HelperThreads.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/HelperThreads.cpp	2015-05-25 20:43:49.000000000 +0000
@@ -1232,7 +1232,7 @@
         SourceBufferHolder srcBuf(parseTask->chars, parseTask->length,
                                   SourceBufferHolder::NoOwnership);
         parseTask->script = frontend::CompileScript(parseTask->cx, &parseTask->alloc,
-                                                    NullPtr(), NullPtr(), NullPtr(),
+                                                    nullptr, nullptr, nullptr,
                                                     parseTask->options,
                                                     srcBuf);
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/Interpreter.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/Interpreter.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/Interpreter.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/Interpreter.cpp	2015-05-25 20:43:49.000000000 +0000
@@ -176,7 +176,7 @@
         return false;
 
     if (value.isObject()) {
-        NativeObject* obj = NewNativeObjectWithClassProto(cx, &js_NoSuchMethodClass, NullPtr());
+        NativeObject* obj = NewNativeObjectWithClassProto(cx, &js_NoSuchMethodClass, nullptr);
         if (!obj)
             return false;
 
@@ -346,7 +346,7 @@
     unsigned error = construct ? JSMSG_NOT_CONSTRUCTOR : JSMSG_NOT_FUNCTION;
     int spIndex = numToSkip >= 0 ? -(numToSkip + 1) : JSDVG_SEARCH_STACK;
 
-    ReportValueError3(cx, error, spIndex, v, NullPtr(), nullptr, nullptr);
+    ReportValueError3(cx, error, spIndex, v, nullptr, nullptr, nullptr);
     return false;
 }
 
@@ -722,9 +722,10 @@
 
     /* Invoke native functions. */
     JSFunction* fun = &args.callee().as<JSFunction>();
-    MOZ_ASSERT_IF(construct, !fun->isNativeConstructor());
-    if (fun->isNative())
+    if (fun->isNative()) {
+        MOZ_ASSERT_IF(construct, !fun->isConstructor());
         return CallJSNative(cx, fun->native(), args);
+    }
 
     if (!fun->getOrCreateScript(cx))
         return false;
@@ -801,12 +802,12 @@
     if (callee.is<JSFunction>()) {
         RootedFunction fun(cx, &callee.as<JSFunction>());
 
-        if (fun->isNativeConstructor())
-            return CallJSNativeConstructor(cx, fun->native(), args);
-
-        if (!fun->isInterpretedConstructor())
+        if (!fun->isConstructor())
             return ReportIsNotFunction(cx, args.calleev(), args.length() + 1, CONSTRUCT);
 
+        if (fun->isNative())
+            return CallJSNativeConstructor(cx, fun->native(), args);
+
         if (!Invoke(cx, args, CONSTRUCT))
             return false;
 
@@ -952,7 +953,7 @@
 
     RootedValue val(cx, ObjectValue(*obj));
     ReportValueError(cx, JSMSG_BAD_INSTANCEOF_RHS,
-                        JSDVG_SEARCH_STACK, val, NullPtr());
+                        JSDVG_SEARCH_STACK, val, nullptr);
     return false;
 }
 
@@ -2167,7 +2168,7 @@
 {
     HandleValue rref = REGS.stackHandleAt(-1);
     if (!rref.isObject()) {
-        ReportValueError(cx, JSMSG_IN_NOT_OBJECT, -1, rref, js::NullPtr());
+        ReportValueError(cx, JSMSG_IN_NOT_OBJECT, -1, rref, nullptr);
         goto error;
     }
     RootedObject& obj = rootObject0;
@@ -2775,7 +2776,7 @@
 
     RootedValue& receiver = rootValue0;
     receiver = REGS.sp[-3];
-    
+
     RootedObject& obj = rootObject0;
     obj = &REGS.sp[-2].toObject();
 
@@ -2947,7 +2948,7 @@
     bool isFunction = IsFunctionObject(args.calleev(), fun.address());
 
     /* Don't bother trying to fast-path calls to scripted non-constructors. */
-    if (!isFunction || !fun->isInterpretedConstructor()) {
+    if (!isFunction || !fun->isInterpreted() || !fun->isConstructor()) {
         if (construct) {
             if (!InvokeConstructor(cx, args))
                 goto error;
@@ -3714,7 +3715,7 @@
     RootedValue& rref = rootValue0;
     rref = REGS.sp[-1];
     if (rref.isPrimitive()) {
-        ReportValueError(cx, JSMSG_BAD_INSTANCEOF_RHS, -1, rref, js::NullPtr());
+        ReportValueError(cx, JSMSG_BAD_INSTANCEOF_RHS, -1, rref, nullptr);
         goto error;
     }
     RootedObject& obj = rootObject0;
@@ -3914,7 +3915,7 @@
             goto error;
 
         if (!objProto.isObjectOrNull()) {
-            ReportValueError(cx, JSMSG_PROTO_NOT_OBJORNULL, -1, objProto, NullPtr());
+            ReportValueError(cx, JSMSG_PROTO_NOT_OBJORNULL, -1, objProto, nullptr);
             goto error;
         }
     }
@@ -3963,7 +3964,7 @@
     /* Load the function to be initialized */
     RootedFunction& func = rootFunction0;
     func = &REGS.sp[-1].toObject().as<JSFunction>();
-    MOZ_ASSERT(func->isMethod());
+    MOZ_ASSERT(func->allowSuperProperty());
 
     /* Load the home object */
     RootedNativeObject& obj = rootNativeObject0;
@@ -3980,7 +3981,14 @@
     for (; !si.done(); ++si) {
         if (si.hasScopeObject() && si.type() == ScopeIter::Call) {
             JSFunction& callee = si.scope().as<CallObject>().callee();
-            MOZ_ASSERT(callee.isMethod());
+
+            // Arrow functions don't have the information we're looking for,
+            // their enclosing scopes do. Nevertheless, they might have call
+            // objects. Skip them to find what we came for.
+            if (callee.isArrow())
+                continue;
+
+            MOZ_ASSERT(callee.allowSuperProperty());
             MOZ_ASSERT(callee.nonLazyScript()->needsHomeObject());
             const Value& homeObjVal = callee.getExtendedSlot(FunctionExtended::METHOD_HOMEOBJECT_SLOT);
 
@@ -4183,7 +4191,7 @@
 {
     MOZ_ASSERT(fun->isArrow());
 
-    RootedObject clone(cx, CloneFunctionObjectIfNotSingleton(cx, fun, parent, NullPtr(),
+    RootedObject clone(cx, CloneFunctionObjectIfNotSingleton(cx, fun, parent, nullptr,
                                                              TenuredObject));
     if (!clone)
         return nullptr;
@@ -4210,7 +4218,7 @@
      */
     RootedFunction fun(cx, funArg);
     if (fun->isNative() || fun->environment() != scopeChain) {
-        fun = CloneFunctionObjectIfNotSingleton(cx, fun, scopeChain, NullPtr(), TenuredObject);
+        fun = CloneFunctionObjectIfNotSingleton(cx, fun, scopeChain, nullptr, TenuredObject);
         if (!fun)
             return false;
     } else {
@@ -4718,7 +4726,7 @@
             return UnboxedArrayObject::create(cx, group, length, newKind);
     }
 
-    ArrayObject* obj = NewDenseFullyAllocatedArray(cx, length, NullPtr(), newKind);
+    ArrayObject* obj = NewDenseFullyAllocatedArray(cx, length, nullptr, newKind);
     if (!obj)
         return nullptr;
 
@@ -4748,7 +4756,7 @@
     }
 
     ArrayObject* obj = NewDenseFullyAllocatedArray(cx, templateObject->as<ArrayObject>().length(),
-                                                   NullPtr(), newKind);
+                                                   nullptr, newKind);
     if (!obj)
         return nullptr;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/Interpreter-inl.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/Interpreter-inl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/Interpreter-inl.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/Interpreter-inl.h	2015-05-25 20:43:49.000000000 +0000
@@ -186,7 +186,7 @@
         return GlobalObject::getOrCreateBooleanPrototype(cx, global);
 
     MOZ_ASSERT(v.isNull() || v.isUndefined());
-    ReportIsNullOrUndefined(cx, spindex, v, NullPtr());
+    ReportIsNullOrUndefined(cx, spindex, v, nullptr);
     return nullptr;
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/MemoryMetrics.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/MemoryMetrics.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/MemoryMetrics.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/MemoryMetrics.cpp	2015-05-25 20:43:49.000000000 +0000
@@ -346,7 +346,7 @@
 
 static void
 StatsArenaCallback(JSRuntime* rt, void* data, gc::Arena* arena,
-                   JSGCTraceKind traceKind, size_t thingSize)
+                   JS::TraceKind traceKind, size_t thingSize)
 {
     RuntimeStats* rtStats = static_cast<StatsClosure*>(data)->rtStats;
 
@@ -401,14 +401,14 @@
 // profile speed for complex pages such as gmail.com.
 template <Granularity granularity>
 static void
-StatsCellCallback(JSRuntime* rt, void* data, void* thing, JSGCTraceKind traceKind,
+StatsCellCallback(JSRuntime* rt, void* data, void* thing, JS::TraceKind traceKind,
                   size_t thingSize)
 {
     StatsClosure* closure = static_cast<StatsClosure*>(data);
     RuntimeStats* rtStats = closure->rtStats;
     ZoneStats* zStats = rtStats->currZoneStats;
     switch (traceKind) {
-      case JSTRACE_OBJECT: {
+      case JS::TraceKind::Object: {
         JSObject* obj = static_cast<JSObject*>(thing);
         CompartmentStats* cStats = GetCompartmentStats(obj->compartment());
         JS::ClassInfo info;        // This zeroes all the sizes.
@@ -429,7 +429,7 @@
         break;
       }
 
-      case JSTRACE_SCRIPT: {
+      case JS::TraceKind::Script: {
         JSScript* script = static_cast<JSScript*>(thing);
         CompartmentStats* cStats = GetCompartmentStats(script->compartment());
         cStats->scriptsGCHeap += thingSize;
@@ -469,7 +469,7 @@
         break;
       }
 
-      case JSTRACE_STRING: {
+      case JS::TraceKind::String: {
         JSString* str = static_cast<JSString*>(thing);
 
         JS::StringInfo info;
@@ -499,11 +499,11 @@
         break;
       }
 
-      case JSTRACE_SYMBOL:
+      case JS::TraceKind::Symbol:
         zStats->symbolsGCHeap += thingSize;
         break;
 
-      case JSTRACE_BASE_SHAPE: {
+      case JS::TraceKind::BaseShape: {
         BaseShape* base = static_cast<BaseShape*>(thing);
         CompartmentStats* cStats = GetCompartmentStats(base->compartment());
 
@@ -519,20 +519,20 @@
         break;
       }
 
-      case JSTRACE_JITCODE: {
+      case JS::TraceKind::JitCode: {
         zStats->jitCodesGCHeap += thingSize;
         // The code for a script is counted in ExecutableAllocator::sizeOfCode().
         break;
       }
 
-      case JSTRACE_LAZY_SCRIPT: {
+      case JS::TraceKind::LazyScript: {
         LazyScript* lazy = static_cast<LazyScript*>(thing);
         zStats->lazyScriptsGCHeap += thingSize;
         zStats->lazyScriptsMallocHeap += lazy->sizeOfExcludingThis(rtStats->mallocSizeOf_);
         break;
       }
 
-      case JSTRACE_SHAPE: {
+      case JS::TraceKind::Shape: {
         Shape* shape = static_cast<Shape*>(thing);
         CompartmentStats* cStats = GetCompartmentStats(shape->compartment());
         JS::ClassInfo info;        // This zeroes all the sizes.
@@ -550,7 +550,7 @@
         break;
       }
 
-      case JSTRACE_OBJECT_GROUP: {
+      case JS::TraceKind::ObjectGroup: {
         ObjectGroup* group = static_cast<ObjectGroup*>(thing);
         zStats->objectGroupsGCHeap += thingSize;
         zStats->objectGroupsMallocHeap += group->sizeOfExcludingThis(rtStats->mallocSizeOf_);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/NativeObject.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/NativeObject.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/NativeObject.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/NativeObject.cpp	2015-05-25 20:43:49.000000000 +0000
@@ -357,6 +357,8 @@
     size_t oldSpan = shape->numFixedSlots();
     size_t newSpan = shape->slotSpan();
 
+    initializeSlotRange(0, oldSpan);
+
     // A failure at this point will leave the object as a mutant, and we
     // can't recover.
     if (oldSpan != newSpan && !updateSlotsForSpan(cx, oldSpan, newSpan))
@@ -526,7 +528,7 @@
     return true;
 }
 
-/* static */ NativeObject::EnsureDenseResult
+/* static */ DenseElementResult
 NativeObject::maybeDensifySparseElements(js::ExclusiveContext* cx, HandleNativeObject obj)
 {
     /*
@@ -535,7 +537,7 @@
      * (see PropertyTree::MAX_HEIGHT).
      */
     if (!obj->inDictionaryMode())
-        return ED_SPARSE;
+        return DenseElementResult::Incomplete;
 
     /*
      * Only measure the number of indexed properties every log(n) times when
@@ -543,11 +545,11 @@
      */
     uint32_t slotSpan = obj->slotSpan();
     if (slotSpan != RoundUpPow2(slotSpan))
-        return ED_SPARSE;
+        return DenseElementResult::Incomplete;
 
     /* Watch for conditions under which an object's elements cannot be dense. */
     if (!obj->nonProxyIsExtensible() || obj->watched())
-        return ED_SPARSE;
+        return DenseElementResult::Incomplete;
 
     /*
      * The indexes in the object need to be sufficiently dense before they can
@@ -571,17 +573,17 @@
                  * For simplicity, only densify the object if all indexed
                  * properties can be converted to dense elements.
                  */
-                return ED_SPARSE;
+                return DenseElementResult::Incomplete;
             }
         }
         shape = shape->previous();
     }
 
     if (numDenseElements * SPARSE_DENSITY_RATIO < newInitializedLength)
-        return ED_SPARSE;
+        return DenseElementResult::Incomplete;
 
     if (newInitializedLength >= NELEMENTS_LIMIT)
-        return ED_SPARSE;
+        return DenseElementResult::Incomplete;
 
     /*
      * This object meets all necessary restrictions, convert all indexed
@@ -589,11 +591,11 @@
      */
 
     if (!obj->maybeCopyElementsForWrite(cx))
-        return ED_FAILED;
+        return DenseElementResult::Failure;
 
     if (newInitializedLength > obj->getDenseCapacity()) {
         if (!obj->growElements(cx, newInitializedLength))
-            return ED_FAILED;
+            return DenseElementResult::Failure;
     }
 
     obj->ensureDenseInitializedLength(cx, newInitializedLength, 0);
@@ -617,10 +619,10 @@
             if (shape != obj->lastProperty()) {
                 shape = shape->previous();
                 if (!obj->removeProperty(cx, id))
-                    return ED_FAILED;
+                    return DenseElementResult::Failure;
             } else {
                 if (!obj->removeProperty(cx, id))
-                    return ED_FAILED;
+                    return DenseElementResult::Failure;
                 shape = obj->lastProperty();
             }
 
@@ -636,9 +638,9 @@
      * to grow the object.
      */
     if (!obj->clearFlag(cx, BaseShape::INDEXED))
-        return ED_FAILED;
+        return DenseElementResult::Failure;
 
-    return ED_OK;
+    return DenseElementResult::Success;
 }
 
 // Round up |reqAllocated| to a good size. Up to 1 Mebi (i.e. 1,048,576) the
@@ -1126,10 +1128,10 @@
         !IsAnyTypedArray(obj))
     {
         uint32_t index = JSID_TO_INT(id);
-        NativeObject::EnsureDenseResult edResult = obj->ensureDenseElements(cx, index, 1);
-        if (edResult == NativeObject::ED_FAILED)
+        DenseElementResult edResult = obj->ensureDenseElements(cx, index, 1);
+        if (edResult == DenseElementResult::Failure)
             return false;
-        if (edResult == NativeObject::ED_OK) {
+        if (edResult == DenseElementResult::Success) {
             obj->setDenseElementWithType(cx, index, desc.value());
             if (!CallAddPropertyHookDense(cx, obj, index, desc.value()))
                 return false;
@@ -1153,11 +1155,11 @@
 
         uint32_t index = JSID_TO_INT(id);
         NativeObject::removeDenseElementForSparseIndex(cx, obj, index);
-        NativeObject::EnsureDenseResult edResult =
+        DenseElementResult edResult =
             NativeObject::maybeDensifySparseElements(cx, obj);
-        if (edResult == NativeObject::ED_FAILED)
+        if (edResult == DenseElementResult::Failure)
             return false;
-        if (edResult == NativeObject::ED_OK) {
+        if (edResult == DenseElementResult::Success) {
             MOZ_ASSERT(!desc.setter());
             return CallAddPropertyHookDense(cx, obj, index, desc.value());
         }
@@ -1438,7 +1440,7 @@
                          ObjectOpResult& result)
 {
     Rooted<PropertyDescriptor> desc(cx);
-    desc.initFields(NullPtr(), value, attrs, getter, setter);
+    desc.initFields(nullptr, value, attrs, getter, setter);
     return NativeDefineProperty(cx, obj, id, desc, result);
 }
 
@@ -1756,7 +1758,7 @@
     // Ok, bad undefined property reference: whine about it.
     RootedValue val(cx, IdToValue(id));
     return ReportValueErrorFlags(cx, flags, JSMSG_UNDEFINED_PROP, JSDVG_IGNORE_STACK, val,
-                                    js::NullPtr(), nullptr, nullptr);
+                                    nullptr, nullptr, nullptr);
 }
 
 /* The NoGC version of GetNonexistentProperty, present only to make types line up. */
@@ -1974,26 +1976,43 @@
         return result.fail(JSMSG_SET_NON_OBJECT_RECEIVER);
     RootedObject receiver(cx, &receiverValue.toObject());
 
-    // Step 5.c-d: Test whether receiver has an existing own property
-    // receiver[id]. The spec calls [[GetOwnProperty]]; js::HasOwnProperty is
-    // the same thing except faster in the non-proxy case. Sometimes we can
-    // even optimize away the HasOwnProperty call.
     bool existing;
     if (receiver == obj) {
+        // Steps 5.c-e.ii.
         // The common case. The caller has necessarily done a property lookup
         // on obj and passed us the answer as objHasOwn.
+        // We also know that the property is a data property and writable
+        // if it exists.
 #ifdef DEBUG
         // Check that objHasOwn is correct. This could fail if receiver or a
         // native object on its prototype chain has a nondeterministic resolve
         // hook. We shouldn't have any that are quite that badly behaved.
-        if (!HasOwnProperty(cx, receiver, id, &existing))
+        Rooted<PropertyDescriptor> desc(cx);
+        if (!GetOwnPropertyDescriptor(cx, receiver, id, &desc))
             return false;
-        MOZ_ASSERT(existing == objHasOwn);
+        MOZ_ASSERT(!!desc.object() == objHasOwn);
+        MOZ_ASSERT_IF(desc.object(), desc.isDataDescriptor());
+        MOZ_ASSERT_IF(desc.object(), desc.writable());
 #endif
         existing = objHasOwn;
     } else {
-        if (!HasOwnProperty(cx, receiver, id, &existing))
+        // Steps 5.c-d.
+        Rooted<PropertyDescriptor> desc(cx);
+        if (!GetOwnPropertyDescriptor(cx, receiver, id, &desc))
             return false;
+
+        existing = !!desc.object();
+
+        // Step 5.e.
+        if (existing) {
+            // Step 5.e.i.
+            if (desc.isAccessorDescriptor())
+                return result.fail(JSMSG_OVERWRITING_ACCESSOR);
+
+            // Step 5.e.ii.
+            if (!desc.writable())
+                return result.fail(JSMSG_READ_ONLY);
+        }
     }
 
     // Invalidate SpiderMonkey-specific caches or bail.
@@ -2003,7 +2022,7 @@
     if (!PurgeScopeChain(cx, receiver, id))
         return false;
 
-    // Step 5.e-f. Define the new data property.
+    // Steps 5.e.iii-iv. and 5.f.i. Define the new data property.
     unsigned attrs =
         existing
         ? JSPROP_IGNORE_ENUMERATE | JSPROP_IGNORE_READONLY | JSPROP_IGNORE_PERMANENT
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/NativeObject.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/NativeObject.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/NativeObject.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/NativeObject.h	2015-05-25 20:43:49.000000000 +0000
@@ -306,6 +306,17 @@
     }
 }
 
+// Operations which change an object's dense elements can either succeed, fail,
+// or be unable to complete. For native objects, the latter is used when the
+// object's elements must become sparse instead. The enum below is used for
+// such operations, and for similar operations on unboxed arrays and methods
+// that work on both kinds of objects.
+enum class DenseElementResult {
+    Failure,
+    Success,
+    Incomplete
+};
+
 /*
  * NativeObject specifies the internal implementation of a native object.
  *
@@ -1047,21 +1058,16 @@
     inline bool writeToIndexWouldMarkNotPacked(uint32_t index);
     inline void markDenseElementsNotPacked(ExclusiveContext* cx);
 
-    /*
-     * ensureDenseElements ensures that the object can hold at least
-     * index + extra elements. It returns ED_OK on success, ED_FAILED on
-     * failure to grow the array, ED_SPARSE when the object is too sparse to
-     * grow (this includes the case of index + extra overflow). In the last
-     * two cases the object is kept intact.
-     */
-    enum EnsureDenseResult { ED_OK, ED_FAILED, ED_SPARSE };
-
-  public:
-    inline EnsureDenseResult ensureDenseElements(ExclusiveContext* cx,
-                                                 uint32_t index, uint32_t extra);
+    // Ensures that the object can hold at least index + extra elements. This
+    // returns DenseElement_Success on success, DenseElement_Failed on failure
+    // to grow the array, or DenseElement_Incomplete when the object is too
+    // sparse to grow (this includes the case of index + extra overflow). In
+    // the last two cases the object is kept intact.
+    inline DenseElementResult ensureDenseElements(ExclusiveContext* cx,
+                                                  uint32_t index, uint32_t extra);
 
-    inline EnsureDenseResult extendDenseElements(ExclusiveContext* cx,
-                                                 uint32_t requiredCapacity, uint32_t extra);
+    inline DenseElementResult extendDenseElements(ExclusiveContext* cx,
+                                                  uint32_t requiredCapacity, uint32_t extra);
 
     /* Convert a single dense element to a sparse property. */
     static bool sparsifyDenseElement(ExclusiveContext* cx,
@@ -1089,8 +1095,8 @@
      * After adding a sparse index to obj, see if it should be converted to use
      * dense elements.
      */
-    static EnsureDenseResult maybeDensifySparseElements(ExclusiveContext* cx,
-                                                        HandleNativeObject obj);
+    static DenseElementResult maybeDensifySparseElements(ExclusiveContext* cx,
+                                                         HandleNativeObject obj);
 
     inline HeapSlot* fixedElements() const {
         static_assert(2 * sizeof(Value) == sizeof(ObjectElements),
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/NativeObject-inl.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/NativeObject-inl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/NativeObject-inl.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/NativeObject-inl.h	2015-05-25 20:43:49.000000000 +0000
@@ -146,7 +146,7 @@
     ensureDenseInitializedLengthNoPackedCheck(cx, index, extra);
 }
 
-NativeObject::EnsureDenseResult
+DenseElementResult
 NativeObject::extendDenseElements(ExclusiveContext* cx,
                                   uint32_t requiredCapacity, uint32_t extra)
 {
@@ -159,7 +159,7 @@
      */
     if (!nonProxyIsExtensible() || watched()) {
         MOZ_ASSERT(getDenseCapacity() == 0);
-        return ED_SPARSE;
+        return DenseElementResult::Incomplete;
     }
 
     /*
@@ -168,7 +168,7 @@
      * every time a new index is added.
      */
     if (isIndexed())
-        return ED_SPARSE;
+        return DenseElementResult::Incomplete;
 
     /*
      * We use the extra argument also as a hint about number of non-hole
@@ -176,16 +176,16 @@
      */
     if (requiredCapacity > MIN_SPARSE_INDEX &&
         willBeSparseElements(requiredCapacity, extra)) {
-        return ED_SPARSE;
+        return DenseElementResult::Incomplete;
     }
 
     if (!growElements(cx, requiredCapacity))
-        return ED_FAILED;
+        return DenseElementResult::Failure;
 
-    return ED_OK;
+    return DenseElementResult::Success;
 }
 
-inline NativeObject::EnsureDenseResult
+inline DenseElementResult
 NativeObject::ensureDenseElements(ExclusiveContext* cx, uint32_t index, uint32_t extra)
 {
     MOZ_ASSERT(isNative());
@@ -194,7 +194,7 @@
         markDenseElementsNotPacked(cx);
 
     if (!maybeCopyElementsForWrite(cx))
-        return ED_FAILED;
+        return DenseElementResult::Failure;
 
     uint32_t currentCapacity = getDenseCapacity();
 
@@ -203,31 +203,31 @@
         /* Optimize for the common case. */
         if (index < currentCapacity) {
             ensureDenseInitializedLengthNoPackedCheck(cx, index, 1);
-            return ED_OK;
+            return DenseElementResult::Success;
         }
         requiredCapacity = index + 1;
         if (requiredCapacity == 0) {
             /* Overflow. */
-            return ED_SPARSE;
+            return DenseElementResult::Incomplete;
         }
     } else {
         requiredCapacity = index + extra;
         if (requiredCapacity < index) {
             /* Overflow. */
-            return ED_SPARSE;
+            return DenseElementResult::Incomplete;
         }
         if (requiredCapacity <= currentCapacity) {
             ensureDenseInitializedLengthNoPackedCheck(cx, index, extra);
-            return ED_OK;
+            return DenseElementResult::Success;
         }
     }
 
-    EnsureDenseResult edr = extendDenseElements(cx, requiredCapacity, extra);
-    if (edr != ED_OK)
-        return edr;
+    DenseElementResult result = extendDenseElements(cx, requiredCapacity, extra);
+    if (result != DenseElementResult::Success)
+        return result;
 
     ensureDenseInitializedLengthNoPackedCheck(cx, index, extra);
-    return ED_OK;
+    return DenseElementResult::Success;
 }
 
 inline Value
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/ObjectGroup.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/ObjectGroup.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/ObjectGroup.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/ObjectGroup.cpp	2015-05-25 20:43:50.000000000 +0000
@@ -43,8 +43,12 @@
 void
 ObjectGroup::finalize(FreeOp* fop)
 {
+    if (newScriptDontCheckGeneration())
+        newScriptDontCheckGeneration()->clear();
     fop->delete_(newScriptDontCheckGeneration());
     fop->delete_(maybeUnboxedLayoutDontCheckGeneration());
+    if (maybePreliminaryObjectsDontCheckGeneration())
+        maybePreliminaryObjectsDontCheckGeneration()->clear();
     fop->delete_(maybePreliminaryObjectsDontCheckGeneration());
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/ObjectGroup.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/ObjectGroup.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/ObjectGroup.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/ObjectGroup.h	2015-05-25 20:43:50.000000000 +0000
@@ -216,9 +216,8 @@
         return res;
     }
 
-    JSCompartment* compartment() const {
-        return compartment_;
-    }
+    JSCompartment* compartment() const { return compartment_; }
+    JSCompartment* maybeCompartment() const { return compartment(); }
 
   private:
     /* Flags for this group. */
@@ -330,7 +329,8 @@
     }
 
     bool hasUnanalyzedPreliminaryObjects() {
-        return (newScript() && !newScript()->analyzed()) || maybePreliminaryObjects();
+        return (newScriptDontCheckGeneration() && !newScriptDontCheckGeneration()->analyzed()) ||
+               maybePreliminaryObjectsDontCheckGeneration();
     }
 
     UnboxedLayout* maybeUnboxedLayout() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/PIC.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/PIC.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/PIC.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/PIC.cpp	2015-05-25 20:43:50.000000000 +0000
@@ -308,7 +308,7 @@
 js::ForOfPIC::createForOfPICObject(JSContext* cx, Handle<GlobalObject*> global)
 {
     assertSameCompartment(cx, global);
-    NativeObject* obj = NewNativeObjectWithGivenProto(cx, &ForOfPIC::jsclass, NullPtr());
+    NativeObject* obj = NewNativeObjectWithGivenProto(cx, &ForOfPIC::jsclass, nullptr);
     if (!obj)
         return nullptr;
     ForOfPIC::Chain* chain = cx->new_<ForOfPIC::Chain>();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/ReceiverGuard.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/ReceiverGuard.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/ReceiverGuard.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/ReceiverGuard.cpp	2015-05-25 20:43:50.000000000 +0000
@@ -6,8 +6,11 @@
 
 #include "vm/ReceiverGuard.h"
 
+#include "builtin/TypedObject.h"
 #include "vm/UnboxedObject.h"
 
+using namespace js;
+
 ReceiverGuard::ReceiverGuard(JSObject* obj)
   : group(nullptr), shape(nullptr)
 {
@@ -59,6 +62,6 @@
 {
     if (shape_)
         TraceEdge(trc, &shape_, "receiver_guard_shape");
-    else
+    if (group_)
         TraceEdge(trc, &group_, "receiver_guard_group");
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/RegExpObject.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/RegExpObject.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/RegExpObject.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/RegExpObject.cpp	2015-05-25 20:43:50.000000000 +0000
@@ -841,7 +841,7 @@
     MOZ_ASSERT(!matchResultTemplateObject_);
 
     /* Create template array object */
-    RootedArrayObject templateObject(cx, NewDenseUnallocatedArray(cx, 0, NullPtr(), TenuredObject));
+    RootedArrayObject templateObject(cx, NewDenseUnallocatedArray(cx, 0, nullptr, TenuredObject));
     if (!templateObject)
         return matchResultTemplateObject_; // = nullptr
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/RegExpStatics.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/RegExpStatics.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/RegExpStatics.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/RegExpStatics.cpp	2015-05-25 20:43:50.000000000 +0000
@@ -56,7 +56,7 @@
 RegExpStaticsObject*
 RegExpStatics::create(ExclusiveContext* cx, Handle<GlobalObject*> parent)
 {
-    RegExpStaticsObject* obj = NewObjectWithGivenProto<RegExpStaticsObject>(cx, NullPtr());
+    RegExpStaticsObject* obj = NewObjectWithGivenProto<RegExpStaticsObject>(cx, nullptr);
     if (!obj)
         return nullptr;
     RegExpStatics* res = cx->new_<RegExpStatics>();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/Runtime.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/Runtime.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/Runtime.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/Runtime.cpp	2015-05-25 20:43:50.000000000 +0000
@@ -126,6 +126,7 @@
     asmJSActivationStack_(nullptr),
     asyncStackForNewActivations(nullptr),
     asyncCauseForNewActivations(nullptr),
+    entryMonitor(nullptr),
     parentRuntime(parentRuntime),
     interrupt_(false),
     telemetryCallback(nullptr),
@@ -171,6 +172,7 @@
     profilingScripts(false),
     suppressProfilerSampling(false),
     hadOutOfMemory(false),
+    handlingInitFailure(false),
     haveCreatedContext(false),
     allowRelazificationForTesting(false),
     data(nullptr),
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/Runtime.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/Runtime.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/Runtime.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/Runtime.h	2015-05-25 20:43:50.000000000 +0000
@@ -430,6 +430,7 @@
 {
     js::ImmutableSymbolPtr iterator;
     js::ImmutableSymbolPtr match;
+    js::ImmutableSymbolPtr species;
 
     const ImmutableSymbolPtr& get(size_t u) const {
         MOZ_ASSERT(u < JS::WellKnownSymbolLimit);
@@ -680,6 +681,9 @@
      */
     JSString* asyncCauseForNewActivations;
 
+    /* If non-null, report JavaScript entry points to this monitor. */
+    JS::dbg::AutoEntryMonitor* entryMonitor;
+
     js::Activation* const* addressOfActivation() const {
         return &activation_;
     }
@@ -1073,6 +1077,9 @@
     /* Had an out-of-memory error which did not populate an exception. */
     bool                hadOutOfMemory;
 
+    /* We are curently deleting an object due to an initialization failure. */
+    mozilla::DebugOnly<bool> handlingInitFailure;
+
     /* A context has been created on this runtime. */
     bool                haveCreatedContext;
 
@@ -1922,6 +1929,71 @@
     MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
 };
 
+/*
+ * AutoInitGCManagedObject is a wrapper for use when initializing a object whose
+ * lifetime is managed by the GC.  It ensures that the object is destroyed if
+ * initialization fails but also allows us to assert the invariant that such
+ * objects are only destroyed in this way or by the GC.
+ *
+ * It has a limited interface but is a drop-in replacement for UniquePtr<T> is
+ * this situation.  For example:
+ *
+ *   AutoInitGCManagedObject<MyClass> ptr(cx->make_unique<MyClass>());
+ *   if (!ptr) {
+ *     ReportOutOfMemory(cx);
+ *     return nullptr;
+ *   }
+ *
+ *   if (!ptr->init(cx))
+ *     return nullptr;    // Object destroyed here if init() failed.
+ *
+ *   object->setPrivate(ptr.release());
+ *   // Initialization successful, ptr is now owned through another object.
+ */
+template <typename T>
+class MOZ_STACK_CLASS AutoInitGCManagedObject
+{
+    typedef mozilla::UniquePtr<T, JS::DeletePolicy<T>> UniquePtrT;
+
+    UniquePtrT ptr_;
+
+  public:
+    explicit AutoInitGCManagedObject(UniquePtrT&& ptr)
+      : ptr_(mozilla::Move(ptr))
+    {}
+
+    ~AutoInitGCManagedObject() {
+#ifdef DEBUG
+        if (ptr_) {
+            JSRuntime* rt = TlsPerThreadData.get()->runtimeFromMainThread();
+            MOZ_ASSERT(!rt->handlingInitFailure);
+            rt->handlingInitFailure = true;
+            ptr_.reset(nullptr);
+            rt->handlingInitFailure = false;
+        }
+#endif
+    }
+
+    T& operator*() const {
+        return *ptr_.get();
+    }
+
+    T* operator->() const {
+        return ptr_.get();
+    }
+
+    explicit operator bool() const {
+        return ptr_.get() != nullptr;
+    }
+
+    T* release() {
+        return ptr_.release();
+    }
+
+    AutoInitGCManagedObject(const AutoInitGCManagedObject<T>& other) = delete;
+    AutoInitGCManagedObject& operator=(const AutoInitGCManagedObject<T>& other) = delete;
+};
+
 } /* namespace js */
 
 #ifdef _MSC_VER
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/SelfHosting.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/SelfHosting.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/SelfHosting.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/SelfHosting.cpp	2015-05-25 20:43:50.000000000 +0000
@@ -177,7 +177,7 @@
             errorArgs[i - 1].encodeLatin1(cx, val.toString());
         } else {
             UniquePtr<char[], JS::FreePolicy> bytes =
-                DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, val, NullPtr());
+                DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, val, nullptr);
             if (!bytes)
                 return;
             errorArgs[i - 1].initBytes(bytes.release());
@@ -240,6 +240,7 @@
     MOZ_ASSERT(args.length() == 2);
     MOZ_ASSERT(args[0].isObject());
     MOZ_ASSERT(args[0].toObject().is<JSFunction>());
+    MOZ_ASSERT(args[0].toObject().as<JSFunction>().isSelfHostedBuiltin());
     MOZ_ASSERT(args[1].isObject());
 
     // Normal .prototype properties aren't enumerable.  But for this to clone
@@ -252,7 +253,7 @@
         return false;
     }
 
-    ctor->as<JSFunction>().setIsSelfHostedConstructor();
+    ctor->as<JSFunction>().setIsConstructor();
     args.rval().setUndefined();
     return true;
 }
@@ -308,18 +309,18 @@
         return false;
     buffer->setGroup(newgroup);
 
-    NativeObject::EnsureDenseResult edr = buffer->ensureDenseElements(cx, length, 0);
+    DenseElementResult edr = buffer->ensureDenseElements(cx, length, 0);
     switch (edr) {
-      case NativeObject::ED_OK:
+      case DenseElementResult::Success:
         args.rval().setObject(*buffer);
         return true;
 
-      case NativeObject::ED_SPARSE: // shouldn't happen!
+      case DenseElementResult::Incomplete: // shouldn't happen!
         MOZ_ASSERT(!"%EnsureDenseArrayElements() would yield sparse array");
         JS_ReportError(cx, "%EnsureDenseArrayElements() would yield sparse array");
         break;
 
-      case NativeObject::ED_FAILED:
+      case DenseElementResult::Failure:
         break;
     }
     return false;
@@ -1672,14 +1673,14 @@
         MOZ_ASSERT(selfHostedObject->is<GlobalObject>());
         RootedValue value(cx, IdToValue(id));
         return ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_NO_SUCH_SELF_HOSTED_PROP,
-                                     JSDVG_IGNORE_STACK, value, NullPtr(), nullptr, nullptr);
+                                     JSDVG_IGNORE_STACK, value, nullptr, nullptr, nullptr);
     }
 
     RootedShape shape(cx, selfHostedObject->lookupPure(id));
     if (!shape) {
         RootedValue value(cx, IdToValue(id));
         return ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_NO_SUCH_SELF_HOSTED_PROP,
-                                     JSDVG_IGNORE_STACK, value, NullPtr(), nullptr, nullptr);
+                                     JSDVG_IGNORE_STACK, value, nullptr, nullptr, nullptr);
     }
 
     MOZ_ASSERT(shape->hasSlot() && shape->hasDefaultGetter());
@@ -1808,10 +1809,10 @@
             return nullptr;
         clone = StringObject::create(cx, str);
     } else if (selfHostedObject->is<ArrayObject>()) {
-        clone = NewDenseEmptyArray(cx, NullPtr(), TenuredObject);
+        clone = NewDenseEmptyArray(cx, nullptr, TenuredObject);
     } else {
         MOZ_ASSERT(selfHostedObject->isNative());
-        clone = NewObjectWithGivenProto(cx, selfHostedObject->getClass(), NullPtr(),
+        clone = NewObjectWithGivenProto(cx, selfHostedObject->getClass(), nullptr,
                                         selfHostedObject->asTenured().getAllocKind(),
                                         SingletonObject);
     }
@@ -1871,7 +1872,7 @@
     if (!sourceScript)
         return false;
     MOZ_ASSERT(!sourceScript->enclosingStaticScope());
-    JSScript* cscript = CloneScript(cx, NullPtr(), targetFun, sourceScript);
+    JSScript* cscript = CloneScript(cx, nullptr, targetFun, sourceScript);
     if (!cscript)
         return false;
     cscript->setFunction(targetFun);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/Shape.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/Shape.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/Shape.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/Shape.h	2015-05-25 20:43:50.000000000 +0000
@@ -426,6 +426,7 @@
     void setSlotSpan(uint32_t slotSpan) { MOZ_ASSERT(isOwned()); slotSpan_ = slotSpan; }
 
     JSCompartment* compartment() const { return compartment_; }
+    JSCompartment* maybeCompartment() const { return compartment(); }
 
     /*
      * Lookup base shapes from the compartment's baseShapes table, adding if
@@ -655,6 +656,7 @@
 
     const HeapPtrShape& previous() const { return parent; }
     JSCompartment* compartment() const { return base()->compartment(); }
+    JSCompartment* maybeCompartment() const { return compartment(); }
 
     template <AllowGC allowGC>
     class Range {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/SharedArrayObject.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/SharedArrayObject.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/SharedArrayObject.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/SharedArrayObject.cpp	2015-05-25 20:43:50.000000000 +0000
@@ -346,7 +346,7 @@
     RootedId byteLengthId(cx, NameToId(cx->names().byteLength));
     unsigned attrs = JSPROP_SHARED | JSPROP_GETTER | JSPROP_PERMANENT;
     JSObject* getter =
-        NewNativeFunction(cx, SharedArrayBufferObject::byteLengthGetter, 0, NullPtr());
+        NewNativeFunction(cx, SharedArrayBufferObject::byteLengthGetter, 0, nullptr);
     if (!getter)
         return nullptr;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/SharedTypedArrayObject.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/SharedTypedArrayObject.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/SharedTypedArrayObject.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/SharedTypedArrayObject.cpp	2015-05-25 20:43:50.000000000 +0000
@@ -350,7 +350,7 @@
         unsigned attrs = JSPROP_SHARED | JSPROP_GETTER;
 
         Rooted<GlobalObject*> global(cx, cx->compartment()->maybeGlobal());
-        JSObject* getter = NewNativeFunction(cx, native, 0, NullPtr());
+        JSObject* getter = NewNativeFunction(cx, native, 0, nullptr);
         if (!getter)
             return false;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/Stack.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/Stack.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/Stack.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/Stack.cpp	2015-05-25 20:43:50.000000000 +0000
@@ -133,7 +133,7 @@
     unsigned nformal = fun()->nargs() - 1, nactual = numActualArgs();
     unsigned nrest = (nactual > nformal) ? nactual - nformal : 0;
     Value* restvp = argv() + nformal;
-    ArrayObject* obj = NewDenseCopiedArray(cx, nrest, restvp, NullPtr());
+    ArrayObject* obj = NewDenseCopiedArray(cx, nrest, restvp, nullptr);
     if (!obj)
         return nullptr;
     ObjectGroup::fixRestArgumentsGroup(cx, obj);
@@ -1388,7 +1388,7 @@
     return false;
 }
 
-jit::JitActivation::JitActivation(JSContext* cx, bool active)
+jit::JitActivation::JitActivation(JSContext* cx, CalleeToken entryPoint, bool active)
   : Activation(cx, Jit),
     active_(active),
     isLazyLinkExitFrame_(false),
@@ -1411,10 +1411,22 @@
         prevJitJSContext_ = nullptr;
         prevJitActivation_ = nullptr;
     }
+
+    if (entryMonitor_) {
+        MOZ_ASSERT(entryPoint);
+
+        if (CalleeTokenIsFunction(entryPoint))
+            entryMonitor_->Entry(cx_, CalleeTokenToFunction(entryPoint));
+        else
+            entryMonitor_->Entry(cx_, CalleeTokenToScript(entryPoint));
+    }
 }
 
 jit::JitActivation::~JitActivation()
 {
+    if (entryMonitor_)
+        entryMonitor_->Exit(cx_);
+
     if (active_) {
         if (isProfiling())
             unregisterProfiling();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/Stack.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/Stack.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/Stack.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/Stack.h	2015-05-25 20:43:50.000000000 +0000
@@ -21,6 +21,12 @@
 
 struct JSCompartment;
 
+namespace JS {
+namespace dbg {
+class AutoEntryMonitor;
+}
+}
+
 namespace js {
 
 class ArgumentsObject;
@@ -543,7 +549,7 @@
     unsigned numActualArgs() const { MOZ_ASSERT(hasArgs()); return u.nactual; }
 
     /* Watch out, this exposes a pointer to the unaliased formal arg array. */
-    Value* argv() const { return argv_; }
+    Value* argv() const { MOZ_ASSERT(hasArgs()); return argv_; }
 
     /*
      * Arguments object
@@ -1091,6 +1097,11 @@
     // Value of asyncCause to be attached to asyncStack_.
     RootedString asyncCause_;
 
+    // The entry point monitor that was set on cx_->runtime() when this
+    // Activation was created. Subclasses should report their entry frame's
+    // function or script here.
+    JS::dbg::AutoEntryMonitor* entryMonitor_;
+
     enum Kind { Interpreter, Jit, AsmJS };
     Kind kind_;
 
@@ -1340,7 +1351,11 @@
 #endif
 
   public:
-    explicit JitActivation(JSContext* cx, bool active = true);
+    // If non-null, |entryScript| should be the script we're about to begin
+    // executing, for the benefit of performance tooling. We can pass null for
+    // entryScript when we know we couldn't possibly be entering JS directly
+    // from the JSAPI: OSR, asm.js -> Ion transitions, and so on.
+    explicit JitActivation(JSContext* cx, CalleeToken entryPoint, bool active = true);
     ~JitActivation();
 
     bool isActive() const {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/Stack-inl.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/Stack-inl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/Stack-inl.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/Stack-inl.h	2015-05-25 20:43:50.000000000 +0000
@@ -16,6 +16,7 @@
 
 #include "jit/BaselineFrame.h"
 #include "jit/RematerializedFrame.h"
+#include "js/Debug.h"
 #include "vm/GeneratorObject.h"
 #include "vm/ScopeObject.h"
 
@@ -846,10 +847,12 @@
     hideScriptedCallerCount_(0),
     asyncStack_(cx, cx->runtime_->asyncStackForNewActivations),
     asyncCause_(cx, cx->runtime_->asyncCauseForNewActivations),
+    entryMonitor_(cx->runtime_->entryMonitor),
     kind_(kind)
 {
     cx->runtime_->asyncStackForNewActivations = nullptr;
     cx->runtime_->asyncCauseForNewActivations = nullptr;
+    cx->runtime_->entryMonitor = nullptr;
     cx->runtime_->activation_ = this;
 }
 
@@ -859,6 +862,7 @@
     MOZ_ASSERT(cx_->runtime_->activation_ == this);
     MOZ_ASSERT(hideScriptedCallerCount_ == 0);
     cx_->runtime_->activation_ = prev_;
+    cx_->runtime_->entryMonitor = entryMonitor_;
     cx_->runtime_->asyncCauseForNewActivations = asyncCause_;
     cx_->runtime_->asyncStackForNewActivations = asyncStack_;
 }
@@ -896,6 +900,13 @@
     regs_.prepareToRun(*entryFrame, state.script());
     MOZ_ASSERT(regs_.pc == state.script()->code());
     MOZ_ASSERT_IF(entryFrame_->isEvalFrame(), state.script()->isActiveEval());
+
+    if (entryMonitor_) {
+        if (entryFrame->isFunctionFrame())
+            entryMonitor_->Entry(cx_, entryFrame->fun());
+        else
+            entryMonitor_->Entry(cx_, entryFrame->script());
+    }
 }
 
 InterpreterActivation::~InterpreterActivation()
@@ -908,6 +919,9 @@
     MOZ_ASSERT(oldFrameCount_ == cx->runtime()->interpreterStack().frameCount_);
     MOZ_ASSERT_IF(oldFrameCount_ == 0, cx->runtime()->interpreterStack().allocator_.used() == 0);
 
+    if (entryMonitor_)
+        entryMonitor_->Exit(cx_);
+
     if (entryFrame_)
         cx->runtime()->interpreterStack().releaseFrame(entryFrame_);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/Symbol.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/Symbol.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/Symbol.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/Symbol.h	2015-05-25 20:43:50.000000000 +0000
@@ -62,6 +62,11 @@
     }
     inline void finalize(js::FreeOp*) {}
 
+    static MOZ_ALWAYS_INLINE void writeBarrierPre(Symbol* thing) {
+        if (thing && !thing->isWellKnownSymbol())
+            thing->asTenured().writeBarrierPre(thing);
+    }
+
 #ifdef DEBUG
     void dump(FILE* fp = stderr);
 #endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/TypedArrayObject.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/TypedArrayObject.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/TypedArrayObject.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/TypedArrayObject.cpp	2015-05-25 20:43:50.000000000 +0000
@@ -233,7 +233,7 @@
             return nullptr;
 
         return NewFunctionWithProto(cx, class_constructor, 3,
-                                    JSFunction::NATIVE_CTOR, NullPtr(),
+                                    JSFunction::NATIVE_CTOR, nullptr,
                                     ClassName(key, cx),
                                     ctorProto, gc::AllocKind::FUNCTION,
                                     SingletonObject);
@@ -253,7 +253,7 @@
 
         RootedFunction fun(cx);
         fun = NewNativeFunction(cx, ArrayBufferObject::createTypedArrayFromBuffer<NativeType>,
-                                0, NullPtr());
+                                0, nullptr);
         if (!fun)
             return false;
 
@@ -1120,7 +1120,7 @@
         return true;
     }
 
-    return construct(cx, bufobj, args, NullPtr());
+    return construct(cx, bufobj, args, nullptr);
 }
 
 template <typename NativeType>
@@ -1833,8 +1833,8 @@
 // @@toStringTag) a custom class.  The third requirement mandates that each
 // prototype's class have the relevant typed array's cached JSProtoKey in them.
 // Thus we need one class with cached prototype per kind of typed array, with a
-// dummy createConstructor to placate js::ClassSpec::defined().
-#define IMPL_TYPED_ARRAY_PROTO_CLASS(typedArray) \
+// delegated ClassSpec.
+#define IMPL_TYPED_ARRAY_PROTO_CLASS(typedArray, i) \
 { \
     /*
      * Actually ({}).toString.call(Uint8Array.prototype) should throw, because
@@ -1859,27 +1859,27 @@
     nullptr, /* construct */ \
     nullptr, /* trace  */ \
     { \
-        typedArray::createConstructor, \
-        typedArray::createPrototype, \
+        DELEGATED_CLASSSPEC(&TypedArrayObject::classes[i].spec), \
         nullptr, \
         nullptr, \
         nullptr, \
         nullptr, \
         nullptr, \
-        JSProto_TypedArray \
+        nullptr, \
+        JSProto_TypedArray | ClassSpec::IsDelegated \
     } \
 }
 
 const Class TypedArrayObject::protoClasses[Scalar::MaxTypedArrayViewType] = {
-    IMPL_TYPED_ARRAY_PROTO_CLASS(Int8Array),
-    IMPL_TYPED_ARRAY_PROTO_CLASS(Uint8Array),
-    IMPL_TYPED_ARRAY_PROTO_CLASS(Int16Array),
-    IMPL_TYPED_ARRAY_PROTO_CLASS(Uint16Array),
-    IMPL_TYPED_ARRAY_PROTO_CLASS(Int32Array),
-    IMPL_TYPED_ARRAY_PROTO_CLASS(Uint32Array),
-    IMPL_TYPED_ARRAY_PROTO_CLASS(Float32Array),
-    IMPL_TYPED_ARRAY_PROTO_CLASS(Float64Array),
-    IMPL_TYPED_ARRAY_PROTO_CLASS(Uint8ClampedArray)
+    IMPL_TYPED_ARRAY_PROTO_CLASS(Int8Array, 0),
+    IMPL_TYPED_ARRAY_PROTO_CLASS(Uint8Array, 1),
+    IMPL_TYPED_ARRAY_PROTO_CLASS(Int16Array, 2),
+    IMPL_TYPED_ARRAY_PROTO_CLASS(Uint16Array, 3),
+    IMPL_TYPED_ARRAY_PROTO_CLASS(Int32Array, 4),
+    IMPL_TYPED_ARRAY_PROTO_CLASS(Uint32Array, 5),
+    IMPL_TYPED_ARRAY_PROTO_CLASS(Float32Array, 6),
+    IMPL_TYPED_ARRAY_PROTO_CLASS(Float64Array, 7),
+    IMPL_TYPED_ARRAY_PROTO_CLASS(Uint8ClampedArray, 8)
 };
 
 /* static */ bool
@@ -1961,7 +1961,7 @@
 
     Rooted<GlobalObject*> global(cx, cx->compartment()->maybeGlobal());
     JSObject* getter =
-        NewNativeFunction(cx, DataViewObject::getter<ValueGetter>, 0, NullPtr());
+        NewNativeFunction(cx, DataViewObject::getter<ValueGetter>, 0, nullptr);
     if (!getter)
         return false;
 
@@ -2006,7 +2006,7 @@
      * global for use by the DataViewObject constructor.
      */
     RootedFunction fun(cx, NewNativeFunction(cx, ArrayBufferObject::createDataViewForThis,
-                                             0, NullPtr()));
+                                             0, nullptr));
     if (!fun)
         return false;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/TypeInference.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/TypeInference.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/TypeInference.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/TypeInference.cpp	2015-05-25 20:43:50.000000000 +0000
@@ -48,12 +48,6 @@
 using mozilla::PodCopy;
 using mozilla::PodZero;
 
-static inline jsid
-id_prototype(JSContext* cx)
-{
-    return NameToId(cx->names().prototype);
-}
-
 #ifdef DEBUG
 
 static inline jsid
@@ -2864,6 +2858,11 @@
             prop->types.setNonDataProperty(cx);
         }
     }
+
+    if (maybeUnboxedLayout() && maybeUnboxedLayout()->nativeGroup())
+        MarkObjectGroupUnknownProperties(cx, maybeUnboxedLayout()->nativeGroup());
+    if (ObjectGroup* unboxedGroup = maybeOriginalUnboxedGroup())
+        MarkObjectGroupUnknownProperties(cx, unboxedGroup);
 }
 
 TypeNewScript*
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/TypeInference.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/TypeInference.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/TypeInference.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/TypeInference.h	2015-05-25 20:43:50.000000000 +0000
@@ -806,6 +806,10 @@
       : shape_(shape)
     {}
 
+    void clear() {
+        shape_.init(nullptr);
+    }
+
     Shape* shape() {
         return shape_;
     }
@@ -914,6 +918,13 @@
         js_free(initializerList);
     }
 
+    void clear() {
+        function_.init(nullptr);
+        templateObject_.init(nullptr);
+        initializedShape_.init(nullptr);
+        initializedGroup_.init(nullptr);
+    }
+
     static void writeBarrierPre(TypeNewScript* newScript);
 
     bool analyzed() const {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/TypeInference-inl.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/TypeInference-inl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/TypeInference-inl.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/TypeInference-inl.h	2015-05-25 20:43:50.000000000 +0000
@@ -445,7 +445,7 @@
 }
 
 inline void
-MarkObjectGroupUnknownProperties(JSContext* cx, ObjectGroup* obj)
+MarkObjectGroupUnknownProperties(ExclusiveContext* cx, ObjectGroup* obj)
 {
     if (!obj->unknownProperties())
         obj->markUnknown(cx);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/UbiNode.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/UbiNode.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/UbiNode.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/UbiNode.cpp	2015-05-25 20:43:50.000000000 +0000
@@ -58,33 +58,18 @@
     MOZ_CRASH("null ubi::Node");
 }
 
-Node::Node(JSGCTraceKind kind, void* ptr)
-{
-    switch (kind) {
-      case JSTRACE_OBJECT:       construct(static_cast<JSObject*>(ptr));         break;
-      case JSTRACE_SCRIPT:       construct(static_cast<JSScript*>(ptr));         break;
-      case JSTRACE_STRING:       construct(static_cast<JSString*>(ptr));         break;
-      case JSTRACE_SYMBOL:       construct(static_cast<JS::Symbol*>(ptr));       break;
-      case JSTRACE_BASE_SHAPE:   construct(static_cast<js::BaseShape*>(ptr));    break;
-      case JSTRACE_JITCODE:      construct(static_cast<js::jit::JitCode*>(ptr)); break;
-      case JSTRACE_LAZY_SCRIPT:  construct(static_cast<js::LazyScript*>(ptr));   break;
-      case JSTRACE_SHAPE:        construct(static_cast<js::Shape*>(ptr));        break;
-      case JSTRACE_OBJECT_GROUP: construct(static_cast<js::ObjectGroup*>(ptr));  break;
+struct Node::ConstructFunctor : public BoolDefaultAdaptor<Value, false> {
+    template <typename T> bool operator()(T* t, Node* node) { node->construct(t); return true; }
+};
 
-      default:
-        MOZ_CRASH("bad JSGCTraceKind passed to JS::ubi::Node::Node");
-    }
+Node::Node(JS::TraceKind kind, void* ptr)
+{
+    CallTyped(ConstructFunctor(), ptr, kind, this);
 }
 
 Node::Node(HandleValue value)
 {
-    if (value.isObject())
-        construct(&value.toObject());
-    else if (value.isString())
-        construct(value.toString());
-    else if (value.isSymbol())
-        construct(value.toSymbol());
-    else
+    if (!DispatchValueTyped(ConstructFunctor(), value, this))
         construct<void>(nullptr);
 }
 
@@ -123,11 +108,11 @@
     // True if we should populate the edge's names.
     bool wantNames;
 
-    static void staticCallback(JS::CallbackTracer* trc, void** thingp, JSGCTraceKind kind) {
+    static void staticCallback(JS::CallbackTracer* trc, void** thingp, JS::TraceKind kind) {
         static_cast<SimpleEdgeVectorTracer*>(trc)->callback(thingp, kind);
     }
 
-    void callback(void** thingp, JSGCTraceKind kind) {
+    void callback(void** thingp, JS::TraceKind kind) {
         if (!okay)
             return;
 
@@ -187,7 +172,7 @@
   public:
     explicit SimpleEdgeRange(JSContext* cx) : edges(cx), i(0) { }
 
-    bool init(JSContext* cx, void* thing, JSGCTraceKind kind, bool wantNames = true) {
+    bool init(JSContext* cx, void* thing, JS::TraceKind kind, bool wantNames = true) {
         SimpleEdgeVectorTracer tracer(cx, &edges, wantNames);
         JS_TraceChildren(&tracer, thing, kind);
         settle();
@@ -288,7 +273,6 @@
 }
 }
 
-
 namespace JS {
 namespace ubi {
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/UnboxedObject.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/UnboxedObject.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/UnboxedObject.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/UnboxedObject.cpp	2015-05-25 20:43:50.000000000 +0000
@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "vm/UnboxedObject.h"
+#include "vm/UnboxedObject-inl.h"
 
 #include "jit/JitCommon.h"
 #include "jit/Linker.h"
@@ -274,98 +274,6 @@
         remove();
 }
 
-static inline bool
-SetUnboxedValue(ExclusiveContext* cx, JSObject* unboxedObject, jsid id,
-                uint8_t* p, JSValueType type, const Value& v)
-{
-    switch (type) {
-      case JSVAL_TYPE_BOOLEAN:
-        if (v.isBoolean()) {
-            *p = v.toBoolean();
-            return true;
-        }
-        return false;
-
-      case JSVAL_TYPE_INT32:
-        if (v.isInt32()) {
-            *reinterpret_cast<int32_t*>(p) = v.toInt32();
-            return true;
-        }
-        return false;
-
-      case JSVAL_TYPE_DOUBLE:
-        if (v.isNumber()) {
-            *reinterpret_cast<double*>(p) = v.toNumber();
-            return true;
-        }
-        return false;
-
-      case JSVAL_TYPE_STRING:
-        if (v.isString()) {
-            MOZ_ASSERT(!IsInsideNursery(v.toString()));
-            *reinterpret_cast<PreBarrieredString*>(p) = v.toString();
-            return true;
-        }
-        return false;
-
-      case JSVAL_TYPE_OBJECT:
-        if (v.isObjectOrNull()) {
-            // Update property types when writing object properties. Types for
-            // other properties were captured when the unboxed layout was
-            // created.
-            AddTypePropertyId(cx, unboxedObject, id, v);
-
-            // Manually trigger post barriers on the whole object. If we treat
-            // the pointer as a HeapPtrObject we will get confused later if the
-            // object is converted to its native representation.
-            JSObject* obj = v.toObjectOrNull();
-            if (IsInsideNursery(v.toObjectOrNull()) && !IsInsideNursery(unboxedObject)) {
-                JSRuntime* rt = cx->asJSContext()->runtime();
-                rt->gc.storeBuffer.putWholeCellFromMainThread(unboxedObject);
-            }
-
-            *reinterpret_cast<PreBarrieredObject*>(p) = obj;
-            return true;
-        }
-        return false;
-
-      default:
-        MOZ_CRASH("Invalid type for unboxed value");
-    }
-}
-
-static inline Value
-GetUnboxedValue(uint8_t* p, JSValueType type, bool maybeUninitialized)
-{
-    switch (type) {
-      case JSVAL_TYPE_BOOLEAN:
-        return BooleanValue(*p != 0);
-
-      case JSVAL_TYPE_INT32:
-        return Int32Value(*reinterpret_cast<int32_t*>(p));
-
-      case JSVAL_TYPE_DOUBLE: {
-        // During unboxed plain object creation, non-GC thing properties are
-        // left uninitialized. This is normally fine, since the properties will
-        // be filled in shortly, but if they are read before that happens we
-        // need to make sure that doubles are canonical.
-        double d = *reinterpret_cast<double*>(p);
-        if (maybeUninitialized)
-            return DoubleValue(JS::CanonicalizeNaN(d));
-        return DoubleValue(d);
-      }
-
-      case JSVAL_TYPE_STRING:
-        return StringValue(*reinterpret_cast<JSString**>(p));
-
-      case JSVAL_TYPE_OBJECT:
-        return ObjectOrNullValue(*reinterpret_cast<JSObject**>(p));
-
-      default:
-        MOZ_CRASH("Invalid type for unboxed value");
-    }
-}
-
 /////////////////////////////////////////////////////////////////////
 // UnboxedPlainObject
 /////////////////////////////////////////////////////////////////////
@@ -375,7 +283,8 @@
                              const Value& v)
 {
     uint8_t* p = &data_[property.offset];
-    return SetUnboxedValue(cx, this, NameToId(property.name), p, property.type, v);
+    return SetUnboxedValue(cx, this, NameToId(property.name), p, property.type, v,
+                           /* preBarrier = */ true);
 }
 
 Value
@@ -424,7 +333,7 @@
     if (obj->expando_)
         return obj->expando_;
 
-    UnboxedExpandoObject* expando = NewObjectWithGivenProto<UnboxedExpandoObject>(cx, NullPtr());
+    UnboxedExpandoObject* expando = NewObjectWithGivenProto<UnboxedExpandoObject>(cx, nullptr);
     if (!expando)
         return nullptr;
 
@@ -1080,7 +989,7 @@
         res->setCapacityIndex(CapacityMatchesLengthIndex);
     }
 
-    res->setLength(length);
+    res->setLength(cx, length);
     res->setInitializedLength(0);
     return res;
 }
@@ -1090,7 +999,7 @@
 {
     MOZ_ASSERT(index < initializedLength());
     uint8_t* p = elements() + index * elementSize();
-    return SetUnboxedValue(cx, this, JSID_VOID, p, elementType(), v);
+    return SetUnboxedValue(cx, this, JSID_VOID, p, elementType(), v, /* preBarrier = */ true);
 }
 
 bool
@@ -1098,30 +1007,17 @@
 {
     MOZ_ASSERT(index < initializedLength());
     uint8_t* p = elements() + index * elementSize();
-    if (UnboxedTypeNeedsPreBarrier(elementType()))
-        *reinterpret_cast<void**>(p) = nullptr;
-    return SetUnboxedValue(cx, this, JSID_VOID, p, elementType(), v);
+    return SetUnboxedValue(cx, this, JSID_VOID, p, elementType(), v, /* preBarrier = */ false);
 }
 
-bool
-UnboxedArrayObject::appendElementNoTypeChange(ExclusiveContext* cx, size_t index, const Value& v)
+void
+UnboxedArrayObject::initElementNoTypeChange(size_t index, const Value& v)
 {
-    // The caller should check these preconditions, and ensure that writing v
-    // to this object will not change element type information.
-    MOZ_ASSERT(index == initializedLength());
-    MOZ_ASSERT(index < UnboxedArrayObject::MaximumCapacity);
-
-    if (initializedLength() == capacity()) {
-        if (!growElements(cx, index + 1))
-            return false;
-    }
-
-    setInitializedLength(index + 1);
-    JS_ALWAYS_TRUE(initElement(cx, index, v));
-    if (length() <= index)
-        setLength(index + 1);
-
-    return true;
+    MOZ_ASSERT(index < initializedLength());
+    uint8_t* p = elements() + index * elementSize();
+    if (UnboxedTypeNeedsPreBarrier(elementType()))
+        *reinterpret_cast<void**>(p) = nullptr;
+    SetUnboxedValueNoTypeChange(this, p, elementType(), v, /* preBarrier = */ false);
 }
 
 Value
@@ -1435,7 +1331,7 @@
             nobj->setInitializedLength(index + 1);
             if (nobj->initElement(cx, index, desc.value())) {
                 if (nobj->length() <= index)
-                    nobj->setLength(index + 1);
+                    nobj->setLengthInt32(index + 1);
                 return result.succeed();
             }
             nobj->setInitializedLength(index);
@@ -1499,14 +1395,13 @@
                 uint32_t len;
                 if (!CanonicalizeArrayLengthValue(cx, v, &len))
                     return false;
-                if (len <= INT32_MAX) {
-                    UnboxedArrayObject* nobj = &obj->as<UnboxedArrayObject>();
-                    nobj->setLength(len);
-                    if (len < nobj->initializedLength()) {
-                        nobj->setInitializedLength(len);
-                        nobj->shrinkElements(cx, len);
-                    }
+                UnboxedArrayObject* nobj = &obj->as<UnboxedArrayObject>();
+                nobj->setLength(cx, len);
+                if (len < nobj->initializedLength()) {
+                    nobj->setInitializedLength(len);
+                    nobj->shrinkElements(cx, len);
                 }
+                return result.succeed();
             }
 
             if (!convertToNative(cx, obj))
@@ -1849,7 +1744,7 @@
     setInitializedLength(0);
     setInlineElements();
 
-    setLength(NextValue(values, valueCursor).toInt32());
+    setLength(cx, NextValue(values, valueCursor).toInt32());
 
     int32_t initlen = NextValue(values, valueCursor).toInt32();
 
@@ -1885,26 +1780,26 @@
 js::TryConvertToUnboxedLayout(ExclusiveContext* cx, Shape* templateShape,
                               ObjectGroup* group, PreliminaryObjectArray* objects)
 {
-    // Unboxed objects are nightly only for now. The getenv() call will be
+    bool isArray = !templateShape;
+
+    // Unboxed arrays are nightly only for now. The getenv() call will be
     // removed when they are on by default. See bug 1153266.
+    if (isArray) {
 #ifdef NIGHTLY_BUILD
-    if (templateShape) {
-        if (!getenv("JS_OPTION_USE_UNBOXED_OBJECTS")) {
-            if (!group->runtimeFromAnyThread()->options().unboxedObjects())
+        if (!getenv("JS_OPTION_USE_UNBOXED_ARRAYS")) {
+            if (!group->runtimeFromAnyThread()->options().unboxedArrays())
                 return true;
         }
+#else
+        return true;
+#endif
     } else {
-        if (!group->runtimeFromAnyThread()->options().unboxedArrays())
+        if (jit::js_JitOptions.disableUnboxedObjects)
             return true;
     }
-#else
-    return true;
-#endif
 
     MOZ_ASSERT_IF(templateShape, !templateShape->getObjectFlags());
 
-    bool isArray = !templateShape;
-
     if (group->runtimeFromAnyThread()->isSelfHostingGlobal(cx->global()))
         return true;
 
@@ -2040,3 +1935,47 @@
     layout.release();
     return true;
 }
+
+DefineBoxedOrUnboxedFunctor6(SetOrExtendBoxedOrUnboxedDenseElements,
+                             JSContext*, JSObject*, uint32_t, const Value*, uint32_t, ShouldUpdateTypes);
+
+DenseElementResult
+js::SetOrExtendAnyBoxedOrUnboxedDenseElements(JSContext* cx, JSObject* obj,
+                                              uint32_t start, const Value* vp, uint32_t count,
+                                              ShouldUpdateTypes updateTypes)
+{
+    SetOrExtendBoxedOrUnboxedDenseElementsFunctor functor(cx, obj, start, vp, count, updateTypes);
+    return CallBoxedOrUnboxedSpecialization(functor, obj);
+};
+
+DefineBoxedOrUnboxedFunctor5(MoveBoxedOrUnboxedDenseElements,
+                             JSContext*, JSObject*, uint32_t, uint32_t, uint32_t);
+
+DenseElementResult
+js::MoveAnyBoxedOrUnboxedDenseElements(JSContext* cx, JSObject* obj,
+                                       uint32_t dstStart, uint32_t srcStart, uint32_t length)
+{
+    MoveBoxedOrUnboxedDenseElementsFunctor functor(cx, obj, dstStart, srcStart, length);
+    return CallBoxedOrUnboxedSpecialization(functor, obj);
+}
+
+DefineBoxedOrUnboxedFunctor5(CopyBoxedOrUnboxedDenseElements,
+                             JSContext*, JSObject*, JSObject*, uint32_t, uint32_t);
+
+DenseElementResult
+js::CopyAnyBoxedOrUnboxedDenseElements(JSContext* cx, JSObject* dst, JSObject* src,
+                                       uint32_t srcStart, uint32_t length)
+{
+    CopyBoxedOrUnboxedDenseElementsFunctor functor(cx, dst, src, srcStart, length);
+    return CallBoxedOrUnboxedSpecialization(functor, dst);
+}
+
+DefineBoxedOrUnboxedFunctor3(SetBoxedOrUnboxedInitializedLength,
+                             JSContext*, JSObject*, size_t);
+
+void
+js::SetAnyBoxedOrUnboxedInitializedLength(JSContext* cx, JSObject* obj, size_t initlen)
+{
+    SetBoxedOrUnboxedInitializedLengthFunctor functor(cx, obj, initlen);
+    JS_ALWAYS_TRUE(CallBoxedOrUnboxedSpecialization(functor, obj) == DenseElementResult::Success);
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/UnboxedObject.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/UnboxedObject.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/UnboxedObject.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/UnboxedObject.h	2015-05-25 20:43:50.000000000 +0000
@@ -35,6 +35,12 @@
     return type == JSVAL_TYPE_STRING || type == JSVAL_TYPE_OBJECT;
 }
 
+static inline bool
+UnboxedTypeNeedsPostBarrier(JSValueType type)
+{
+    return type == JSVAL_TYPE_OBJECT;
+}
+
 // Class tracking information specific to unboxed objects.
 class UnboxedLayout : public mozilla::LinkedListElement<UnboxedLayout>
 {
@@ -108,8 +114,15 @@
     }
 
     ~UnboxedLayout() {
+        if (newScript_)
+            newScript_->clear();
         js_delete(newScript_);
         js_free(traceList_);
+
+        nativeGroup_.init(nullptr);
+        nativeShape_.init(nullptr);
+        replacementNewGroup_.init(nullptr);
+        constructorCode_.init(nullptr);
     }
 
     bool isArray() {
@@ -430,9 +443,17 @@
 
     bool setElement(ExclusiveContext* cx, size_t index, const Value& v);
     bool initElement(ExclusiveContext* cx, size_t index, const Value& v);
+    void initElementNoTypeChange(size_t index, const Value& v);
     Value getElement(size_t index);
 
-    bool appendElementNoTypeChange(ExclusiveContext* cx, size_t index, const Value& v);
+    template <JSValueType Type> inline bool setElementSpecific(ExclusiveContext* cx, size_t index,
+                                                               const Value& v);
+    template <JSValueType Type> inline void setElementNoTypeChangeSpecific(size_t index, const Value& v);
+    template <JSValueType Type> inline bool initElementSpecific(ExclusiveContext* cx, size_t index,
+                                                                const Value& v);
+    template <JSValueType Type> inline void initElementNoTypeChangeSpecific(size_t index, const Value& v);
+    template <JSValueType Type> inline Value getElementSpecific(size_t index);
+    template <JSValueType Type> inline void triggerPreBarrier(size_t index);
 
     bool growElements(ExclusiveContext* cx, size_t cap);
     void shrinkElements(ExclusiveContext* cx, size_t cap);
@@ -450,15 +471,12 @@
         return offsetof(UnboxedArrayObject, inlineElements_);
     }
 
-  private:
-    void setInlineElements() {
-        elements_ = &inlineElements_[0];
+    void setLengthInt32(uint32_t length) {
+        MOZ_ASSERT(length <= INT32_MAX);
+        length_ = length;
     }
 
-    void setLength(uint32_t len) {
-        MOZ_ASSERT(len <= INT32_MAX);
-        length_ = len;
-    }
+    inline void setLength(ExclusiveContext* cx, uint32_t len);
 
     void setInitializedLength(uint32_t initlen) {
         MOZ_ASSERT(initlen <= InitializedLengthMask);
@@ -466,6 +484,11 @@
             (capacityIndexAndInitializedLength_ & CapacityMask) | initlen;
     }
 
+  private:
+    void setInlineElements() {
+        elements_ = &inlineElements_[0];
+    }
+
     void setCapacityIndex(uint32_t index) {
         MOZ_ASSERT(index <= (CapacityMask >> CapacityShift));
         capacityIndexAndInitializedLength_ =
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/UnboxedObject-inl.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/UnboxedObject-inl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/UnboxedObject-inl.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/UnboxedObject-inl.h	2015-05-25 20:43:50.000000000 +0000
@@ -0,0 +1,607 @@
+/* -*- 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/. */
+
+#ifndef vm_UnboxedObject_inl_h
+#define vm_UnboxedObject_inl_h
+
+#include "vm/UnboxedObject.h"
+
+#include "vm/ArrayObject-inl.h"
+#include "vm/NativeObject-inl.h"
+
+namespace js {
+
+static inline Value
+GetUnboxedValue(uint8_t* p, JSValueType type, bool maybeUninitialized)
+{
+    switch (type) {
+      case JSVAL_TYPE_BOOLEAN:
+        return BooleanValue(*p != 0);
+
+      case JSVAL_TYPE_INT32:
+        return Int32Value(*reinterpret_cast<int32_t*>(p));
+
+      case JSVAL_TYPE_DOUBLE: {
+        // During unboxed plain object creation, non-GC thing properties are
+        // left uninitialized. This is normally fine, since the properties will
+        // be filled in shortly, but if they are read before that happens we
+        // need to make sure that doubles are canonical.
+        double d = *reinterpret_cast<double*>(p);
+        if (maybeUninitialized)
+            return DoubleValue(JS::CanonicalizeNaN(d));
+        return DoubleValue(d);
+      }
+
+      case JSVAL_TYPE_STRING:
+        return StringValue(*reinterpret_cast<JSString**>(p));
+
+      case JSVAL_TYPE_OBJECT:
+        return ObjectOrNullValue(*reinterpret_cast<JSObject**>(p));
+
+      default:
+        MOZ_CRASH("Invalid type for unboxed value");
+    }
+}
+
+static inline void
+SetUnboxedValueNoTypeChange(JSObject* unboxedObject,
+                            uint8_t* p, JSValueType type, const Value& v,
+                            bool preBarrier)
+{
+    switch (type) {
+      case JSVAL_TYPE_BOOLEAN:
+        *p = v.toBoolean();
+        return;
+
+      case JSVAL_TYPE_INT32:
+        *reinterpret_cast<int32_t*>(p) = v.toInt32();
+        return;
+
+      case JSVAL_TYPE_DOUBLE:
+        *reinterpret_cast<double*>(p) = v.toNumber();
+        return;
+
+      case JSVAL_TYPE_STRING: {
+        MOZ_ASSERT(!IsInsideNursery(v.toString()));
+        JSString** np = reinterpret_cast<JSString**>(p);
+        if (preBarrier)
+            JSString::writeBarrierPre(*np);
+        *np = v.toString();
+        return;
+      }
+
+      case JSVAL_TYPE_OBJECT: {
+        JSObject** np = reinterpret_cast<JSObject**>(p);
+
+        // Manually trigger post barriers on the whole object. If we treat
+        // the pointer as a HeapPtrObject we will get confused later if the
+        // object is converted to its native representation.
+        JSObject* obj = v.toObjectOrNull();
+        if (IsInsideNursery(obj) && !IsInsideNursery(unboxedObject)) {
+            JSRuntime* rt = unboxedObject->runtimeFromMainThread();
+            rt->gc.storeBuffer.putWholeCellFromMainThread(unboxedObject);
+        }
+
+        if (preBarrier)
+            JSObject::writeBarrierPre(*np);
+        *np = obj;
+        return;
+      }
+
+      default:
+        MOZ_CRASH("Invalid type for unboxed value");
+    }
+}
+
+static inline bool
+SetUnboxedValue(ExclusiveContext* cx, JSObject* unboxedObject, jsid id,
+                uint8_t* p, JSValueType type, const Value& v, bool preBarrier)
+{
+    switch (type) {
+      case JSVAL_TYPE_BOOLEAN:
+        if (v.isBoolean()) {
+            *p = v.toBoolean();
+            return true;
+        }
+        return false;
+
+      case JSVAL_TYPE_INT32:
+        if (v.isInt32()) {
+            *reinterpret_cast<int32_t*>(p) = v.toInt32();
+            return true;
+        }
+        return false;
+
+      case JSVAL_TYPE_DOUBLE:
+        if (v.isNumber()) {
+            *reinterpret_cast<double*>(p) = v.toNumber();
+            return true;
+        }
+        return false;
+
+      case JSVAL_TYPE_STRING:
+        if (v.isString()) {
+            MOZ_ASSERT(!IsInsideNursery(v.toString()));
+            JSString** np = reinterpret_cast<JSString**>(p);
+            if (preBarrier)
+                JSString::writeBarrierPre(*np);
+            *np = v.toString();
+            return true;
+        }
+        return false;
+
+      case JSVAL_TYPE_OBJECT:
+        if (v.isObjectOrNull()) {
+            JSObject** np = reinterpret_cast<JSObject**>(p);
+
+            // Update property types when writing object properties. Types for
+            // other properties were captured when the unboxed layout was
+            // created.
+            AddTypePropertyId(cx, unboxedObject, id, v);
+
+            // As above, trigger post barriers on the whole object.
+            JSObject* obj = v.toObjectOrNull();
+            if (IsInsideNursery(v.toObjectOrNull()) && !IsInsideNursery(unboxedObject)) {
+                JSRuntime* rt = unboxedObject->runtimeFromMainThread();
+                rt->gc.storeBuffer.putWholeCellFromMainThread(unboxedObject);
+            }
+
+            if (preBarrier)
+                JSObject::writeBarrierPre(*np);
+            *np = obj;
+            return true;
+        }
+        return false;
+
+      default:
+        MOZ_CRASH("Invalid type for unboxed value");
+    }
+}
+
+/////////////////////////////////////////////////////////////////////
+// UnboxedArrayObject
+/////////////////////////////////////////////////////////////////////
+
+inline void
+UnboxedArrayObject::setLength(ExclusiveContext* cx, uint32_t length)
+{
+    if (length > INT32_MAX) {
+        // Track objects with overflowing lengths in type information.
+        MarkObjectGroupFlags(cx, this, OBJECT_FLAG_LENGTH_OVERFLOW);
+    }
+
+    length_ = length;
+}
+
+template <JSValueType Type>
+inline bool
+UnboxedArrayObject::setElementSpecific(ExclusiveContext* cx, size_t index, const Value& v)
+{
+    MOZ_ASSERT(index < initializedLength());
+    MOZ_ASSERT(Type == elementType());
+    uint8_t* p = elements() + index * UnboxedTypeSize(Type);
+    return SetUnboxedValue(cx, this, JSID_VOID, p, elementType(), v, /* preBarrier = */ true);
+}
+
+template <JSValueType Type>
+inline void
+UnboxedArrayObject::setElementNoTypeChangeSpecific(size_t index, const Value& v)
+{
+    MOZ_ASSERT(index < initializedLength());
+    MOZ_ASSERT(Type == elementType());
+    uint8_t* p = elements() + index * UnboxedTypeSize(Type);
+    return SetUnboxedValueNoTypeChange(this, p, elementType(), v, /* preBarrier = */ true);
+}
+
+template <JSValueType Type>
+inline bool
+UnboxedArrayObject::initElementSpecific(ExclusiveContext* cx, size_t index, const Value& v)
+{
+    MOZ_ASSERT(index < initializedLength());
+    MOZ_ASSERT(Type == elementType());
+    uint8_t* p = elements() + index * UnboxedTypeSize(Type);
+    return SetUnboxedValue(cx, this, JSID_VOID, p, elementType(), v, /* preBarrier = */ false);
+}
+
+template <JSValueType Type>
+inline void
+UnboxedArrayObject::initElementNoTypeChangeSpecific(size_t index, const Value& v)
+{
+    MOZ_ASSERT(index < initializedLength());
+    MOZ_ASSERT(Type == elementType());
+    uint8_t* p = elements() + index * UnboxedTypeSize(Type);
+    return SetUnboxedValueNoTypeChange(this, p, elementType(), v, /* preBarrier = */ false);
+}
+
+template <JSValueType Type>
+inline Value
+UnboxedArrayObject::getElementSpecific(size_t index)
+{
+    MOZ_ASSERT(index < initializedLength());
+    MOZ_ASSERT(Type == elementType());
+    uint8_t* p = elements() + index * UnboxedTypeSize(Type);
+    return GetUnboxedValue(p, Type, /* maybeUninitialized = */ false);
+}
+
+template <JSValueType Type>
+inline void
+UnboxedArrayObject::triggerPreBarrier(size_t index)
+{
+    MOZ_ASSERT(UnboxedTypeNeedsPreBarrier(Type));
+
+    uint8_t* p = elements() + index * UnboxedTypeSize(Type);
+
+    switch (Type) {
+      case JSVAL_TYPE_STRING: {
+        JSString** np = reinterpret_cast<JSString**>(p);
+        JSString::writeBarrierPre(*np);
+        break;
+      }
+
+      case JSVAL_TYPE_OBJECT: {
+        JSObject** np = reinterpret_cast<JSObject**>(p);
+        JSObject::writeBarrierPre(*np);
+        break;
+      }
+
+      default:
+        MOZ_CRASH("Bad type");
+    }
+}
+
+/////////////////////////////////////////////////////////////////////
+// Combined methods for NativeObject and UnboxedArrayObject accesses.
+/////////////////////////////////////////////////////////////////////
+
+static inline size_t
+GetAnyBoxedOrUnboxedInitializedLength(JSObject* obj)
+{
+    if (obj->isNative())
+        return obj->as<NativeObject>().getDenseInitializedLength();
+    if (obj->is<UnboxedArrayObject>())
+        return obj->as<UnboxedArrayObject>().initializedLength();
+    return 0;
+}
+
+static inline Value
+GetAnyBoxedOrUnboxedDenseElement(JSObject* obj, size_t index)
+{
+    if (obj->isNative())
+        return obj->as<NativeObject>().getDenseElement(index);
+    return obj->as<UnboxedArrayObject>().getElement(index);
+}
+
+static inline void
+SetAnyBoxedOrUnboxedArrayLength(JSContext* cx, JSObject* obj, size_t length)
+{
+    if (obj->is<ArrayObject>()) {
+        MOZ_ASSERT(length >= obj->as<ArrayObject>().length());
+        obj->as<ArrayObject>().setLength(cx, length);
+    } else {
+        MOZ_ASSERT(length >= obj->as<UnboxedArrayObject>().length());
+        obj->as<UnboxedArrayObject>().setLength(cx, length);
+    }
+}
+
+/////////////////////////////////////////////////////////////////////
+// Template methods for NativeObject and UnboxedArrayObject accesses.
+/////////////////////////////////////////////////////////////////////
+
+template <JSValueType Type>
+static inline bool
+HasBoxedOrUnboxedDenseElements(JSObject* obj)
+{
+    if (Type == JSVAL_TYPE_MAGIC)
+        return obj->isNative();
+    return obj->is<UnboxedArrayObject>() && obj->as<UnboxedArrayObject>().elementType() == Type;
+}
+
+template <JSValueType Type>
+static inline size_t
+GetBoxedOrUnboxedInitializedLength(JSObject* obj)
+{
+    if (Type == JSVAL_TYPE_MAGIC)
+        return obj->as<NativeObject>().getDenseInitializedLength();
+    return obj->as<UnboxedArrayObject>().initializedLength();
+}
+
+template <JSValueType Type>
+static inline DenseElementResult
+SetBoxedOrUnboxedInitializedLength(JSContext* cx, JSObject* obj, size_t initlen)
+{
+    size_t oldInitlen = GetBoxedOrUnboxedInitializedLength<Type>(obj);
+    if (Type == JSVAL_TYPE_MAGIC) {
+        obj->as<NativeObject>().setDenseInitializedLength(initlen);
+        if (initlen < oldInitlen)
+            obj->as<NativeObject>().shrinkElements(cx, initlen);
+    } else {
+        obj->as<UnboxedArrayObject>().setInitializedLength(initlen);
+        if (initlen < oldInitlen)
+            obj->as<UnboxedArrayObject>().shrinkElements(cx, initlen);
+    }
+    return DenseElementResult::Success;
+}
+
+template <JSValueType Type>
+static inline size_t
+GetBoxedOrUnboxedCapacity(JSObject* obj)
+{
+    if (Type == JSVAL_TYPE_MAGIC)
+        return obj->as<NativeObject>().getDenseCapacity();
+    return obj->as<UnboxedArrayObject>().capacity();
+}
+
+template <JSValueType Type>
+static inline Value
+GetBoxedOrUnboxedDenseElement(JSObject* obj, size_t index)
+{
+    if (Type == JSVAL_TYPE_MAGIC)
+        return obj->as<NativeObject>().getDenseElement(index);
+    return obj->as<UnboxedArrayObject>().getElementSpecific<Type>(index);
+}
+
+template <JSValueType Type>
+static inline void
+SetBoxedOrUnboxedDenseElementNoTypeChange(JSObject* obj, size_t index, const Value& value)
+{
+    if (Type == JSVAL_TYPE_MAGIC)
+        obj->as<NativeObject>().setDenseElement(index, value);
+    else
+        obj->as<UnboxedArrayObject>().setElementNoTypeChangeSpecific<Type>(index, value);
+}
+
+enum ShouldUpdateTypes
+{
+    UpdateTypes = true,
+    DontUpdateTypes = false
+};
+
+template <JSValueType Type>
+static inline DenseElementResult
+SetOrExtendBoxedOrUnboxedDenseElements(JSContext* cx, JSObject* obj,
+                                       uint32_t start, const Value* vp, uint32_t count,
+                                       ShouldUpdateTypes updateTypes)
+{
+    if (Type == JSVAL_TYPE_MAGIC) {
+        NativeObject* nobj = &obj->as<NativeObject>();
+
+        if (obj->is<ArrayObject>() &&
+            !obj->as<ArrayObject>().lengthIsWritable() &&
+            start + count >= obj->as<ArrayObject>().length())
+        {
+            return DenseElementResult::Incomplete;
+        }
+
+        DenseElementResult result = nobj->ensureDenseElements(cx, start, count);
+        if (result != DenseElementResult::Success)
+            return result;
+
+        if (obj->is<ArrayObject>() && start + count >= obj->as<ArrayObject>().length())
+            obj->as<ArrayObject>().setLengthInt32(start + count);
+
+        if (updateTypes == DontUpdateTypes && !nobj->shouldConvertDoubleElements()) {
+            nobj->copyDenseElements(start, vp, count);
+        } else {
+            for (size_t i = 0; i < count; i++)
+                nobj->setDenseElementWithType(cx, start + i, vp[i]);
+        }
+
+        return DenseElementResult::Success;
+    }
+
+    UnboxedArrayObject* nobj = &obj->as<UnboxedArrayObject>();
+
+    if (start > nobj->initializedLength())
+        return DenseElementResult::Incomplete;
+
+    if (start + count >= UnboxedArrayObject::MaximumCapacity)
+        return DenseElementResult::Incomplete;
+
+    if (start + count > nobj->capacity() && !nobj->growElements(cx, start + count))
+        return DenseElementResult::Failure;
+
+    size_t oldInitlen = nobj->initializedLength();
+
+    // Overwrite any existing elements covered by the new range. If we fail
+    // after this point due to some incompatible type being written to the
+    // object's elements, afterwards the contents will be different from when
+    // we started. The caller must retry the operation using a generic path,
+    // which will overwrite the already-modified elements as well as the ones
+    // that were left alone.
+    size_t i = 0;
+    if (updateTypes == DontUpdateTypes) {
+        for (size_t j = start; i < count && j < oldInitlen; i++)
+            nobj->setElementNoTypeChangeSpecific<Type>(j, vp[i]);
+    } else {
+        for (size_t j = start; i < count && j < oldInitlen; i++) {
+            if (!nobj->setElementSpecific<Type>(cx, j, vp[i]))
+                return DenseElementResult::Incomplete;
+        }
+    }
+
+    if (i != count) {
+        obj->as<UnboxedArrayObject>().setInitializedLength(start + count);
+        if (updateTypes == DontUpdateTypes) {
+            for (; i < count; i++)
+                nobj->initElementNoTypeChangeSpecific<Type>(start + i, vp[i]);
+        } else {
+            for (; i < count; i++) {
+                if (!nobj->initElementSpecific<Type>(cx, start + i, vp[i])) {
+                    nobj->setInitializedLength(oldInitlen);
+                    return DenseElementResult::Incomplete;
+                }
+            }
+        }
+    }
+
+    if (start + count >= nobj->length())
+        nobj->setLength(cx, start + count);
+
+    return DenseElementResult::Success;
+}
+
+template <JSValueType Type>
+static inline DenseElementResult
+MoveBoxedOrUnboxedDenseElements(JSContext* cx, JSObject* obj, uint32_t dstStart, uint32_t srcStart,
+                                uint32_t length)
+{
+    MOZ_ASSERT(HasBoxedOrUnboxedDenseElements<Type>(obj));
+
+    if (Type == JSVAL_TYPE_MAGIC) {
+        if (!obj->as<NativeObject>().maybeCopyElementsForWrite(cx))
+            return DenseElementResult::Failure;
+        obj->as<NativeObject>().moveDenseElements(dstStart, srcStart, length);
+    } else {
+        uint8_t* data = obj->as<UnboxedArrayObject>().elements();
+        size_t elementSize = UnboxedTypeSize(Type);
+
+        if (UnboxedTypeNeedsPreBarrier(Type)) {
+            // Trigger pre barriers on any elements we are overwriting. See
+            // moveDenseElements::moveDenseElements. No post barrier is needed
+            // as only whole cell post barriers are used with unboxed objects.
+            for (size_t i = 0; i < length; i++)
+                obj->as<UnboxedArrayObject>().triggerPreBarrier<Type>(dstStart + i);
+        }
+
+        memmove(data + dstStart * elementSize,
+                data + srcStart * elementSize,
+                length * elementSize);
+    }
+
+    return DenseElementResult::Success;
+}
+
+template <JSValueType Type>
+static inline DenseElementResult
+CopyBoxedOrUnboxedDenseElements(JSContext* cx, JSObject* dst, JSObject* src,
+                                uint32_t srcStart, uint32_t length)
+{
+    MOZ_ASSERT(HasBoxedOrUnboxedDenseElements<Type>(src));
+    MOZ_ASSERT(HasBoxedOrUnboxedDenseElements<Type>(dst));
+    MOZ_ASSERT(GetBoxedOrUnboxedInitializedLength<Type>(dst) == 0);
+    MOZ_ASSERT(GetBoxedOrUnboxedCapacity<Type>(dst) >= length);
+
+    SetBoxedOrUnboxedInitializedLength<Type>(cx, dst, length);
+
+    if (Type == JSVAL_TYPE_MAGIC) {
+        const Value* vp = src->as<NativeObject>().getDenseElements() + srcStart;
+        dst->as<NativeObject>().initDenseElements(0, vp, length);
+    } else {
+        uint8_t* dstData = dst->as<UnboxedArrayObject>().elements();
+        uint8_t* srcData = src->as<UnboxedArrayObject>().elements();
+        size_t elementSize = UnboxedTypeSize(Type);
+
+        memcpy(dstData, srcData + srcStart * elementSize, length * elementSize);
+
+        // Add a post barrier if we might have copied a nursery pointer to dst.
+        if (UnboxedTypeNeedsPostBarrier(Type) && !IsInsideNursery(dst))
+            dst->runtimeFromMainThread()->gc.storeBuffer.putWholeCellFromMainThread(dst);
+    }
+
+    return DenseElementResult::Success;
+}
+
+/////////////////////////////////////////////////////////////////////
+// Dispatch to specialized methods based on the type of an object.
+/////////////////////////////////////////////////////////////////////
+
+// Goop to fix MSVC. See CallTyped in jsgc.h.
+#ifdef _MSC_VER
+# define DEPENDENT_TEMPLATE_HINT
+#else
+# define DEPENDENT_TEMPLATE_HINT template
+#endif
+
+// Function to dispatch a method specialized to whatever boxed or unboxed dense
+// elements which an input object has.
+template <typename F>
+DenseElementResult
+CallBoxedOrUnboxedSpecialization(F f, JSObject* obj)
+{
+    if (HasBoxedOrUnboxedDenseElements<JSVAL_TYPE_MAGIC>(obj))
+        return f. DEPENDENT_TEMPLATE_HINT operator()<JSVAL_TYPE_MAGIC>();
+    if (HasBoxedOrUnboxedDenseElements<JSVAL_TYPE_BOOLEAN>(obj))
+        return f. DEPENDENT_TEMPLATE_HINT operator()<JSVAL_TYPE_BOOLEAN>();
+    if (HasBoxedOrUnboxedDenseElements<JSVAL_TYPE_INT32>(obj))
+        return f. DEPENDENT_TEMPLATE_HINT operator()<JSVAL_TYPE_INT32>();
+    if (HasBoxedOrUnboxedDenseElements<JSVAL_TYPE_DOUBLE>(obj))
+        return f. DEPENDENT_TEMPLATE_HINT operator()<JSVAL_TYPE_DOUBLE>();
+    if (HasBoxedOrUnboxedDenseElements<JSVAL_TYPE_STRING>(obj))
+        return f. DEPENDENT_TEMPLATE_HINT operator()<JSVAL_TYPE_STRING>();
+    if (HasBoxedOrUnboxedDenseElements<JSVAL_TYPE_OBJECT>(obj))
+        return f. DEPENDENT_TEMPLATE_HINT operator()<JSVAL_TYPE_OBJECT>();
+    return DenseElementResult::Incomplete;
+}
+
+#undef DEPENDENT_TEMPLATE_HINT
+
+#define DefineBoxedOrUnboxedFunctor3(Signature, A, B, C)                \
+struct Signature ## Functor {                                           \
+    A a; B b; C c;                                                      \
+    Signature ## Functor(A a, B b, C c)                                 \
+      : a(a), b(b), c(c)                                                \
+    {}                                                                  \
+    template <JSValueType Type>                                         \
+    DenseElementResult operator()() {                                   \
+        return Signature<Type>(a, b, c);                                \
+    }                                                                   \
+}
+
+#define DefineBoxedOrUnboxedFunctor4(Signature, A, B, C, D)             \
+struct Signature ## Functor {                                           \
+    A a; B b; C c; D d;                                                 \
+    Signature ## Functor(A a, B b, C c, D d)                            \
+      : a(a), b(b), c(c), d(d)                                          \
+    {}                                                                  \
+    template <JSValueType Type>                                         \
+    DenseElementResult operator()() {                                   \
+        return Signature<Type>(a, b, c, d);                             \
+    }                                                                   \
+}
+
+#define DefineBoxedOrUnboxedFunctor5(Signature, A, B, C, D, E)          \
+struct Signature ## Functor {                                           \
+    A a; B b; C c; D d; E e;                                            \
+    Signature ## Functor(A a, B b, C c, D d, E e)                       \
+      : a(a), b(b), c(c), d(d), e(e)                                    \
+    {}                                                                  \
+    template <JSValueType Type>                                         \
+    DenseElementResult operator()() {                                   \
+        return Signature<Type>(a, b, c, d, e);                          \
+    }                                                                   \
+}
+
+#define DefineBoxedOrUnboxedFunctor6(Signature, A, B, C, D, E, F)       \
+struct Signature ## Functor {                                           \
+    A a; B b; C c; D d; E e; F f;                                       \
+    Signature ## Functor(A a, B b, C c, D d, E e, F f)                  \
+      : a(a), b(b), c(c), d(d), e(e), f(f)                              \
+    {}                                                                  \
+    template <JSValueType Type>                                         \
+    DenseElementResult operator()() {                                   \
+        return Signature<Type>(a, b, c, d, e, f);                       \
+    }                                                                   \
+}
+
+DenseElementResult
+SetOrExtendAnyBoxedOrUnboxedDenseElements(JSContext* cx, JSObject* obj,
+                                          uint32_t start, const Value* vp, uint32_t count,
+                                          ShouldUpdateTypes updateTypes);
+
+DenseElementResult
+MoveAnyBoxedOrUnboxedDenseElements(JSContext* cx, JSObject* obj,
+                                   uint32_t dstStart, uint32_t srcStart, uint32_t length);
+
+DenseElementResult
+CopyAnyBoxedOrUnboxedDenseElements(JSContext* cx, JSObject* dst, JSObject* src,
+                                   uint32_t srcStart, uint32_t length);
+
+void
+SetAnyBoxedOrUnboxedInitializedLength(JSContext* cx, JSObject* obj, size_t initlen);
+
+} // namespace js
+
+#endif // vm_UnboxedObject_inl_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/Xdr.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/Xdr.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/Xdr.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/Xdr.cpp	2015-05-25 20:43:50.000000000 +0000
@@ -114,7 +114,7 @@
     if (!VersionCheck(this))
         return false;
 
-    return XDRInterpretedFunction(this, NullPtr(), NullPtr(), objp);
+    return XDRInterpretedFunction(this, nullptr, nullptr, objp);
 }
 
 template<XDRMode mode>
@@ -127,7 +127,7 @@
     if (!VersionCheck(this))
         return false;
 
-    if (!XDRScript(this, NullPtr(), NullPtr(), NullPtr(), scriptp))
+    if (!XDRScript(this, nullptr, nullptr, nullptr, scriptp))
         return false;
 
     return true;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/Xdr.h firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/Xdr.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/src/vm/Xdr.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/src/vm/Xdr.h	2015-05-25 20:43:50.000000000 +0000
@@ -29,7 +29,7 @@
  *
  *  https://developer.mozilla.org/en-US/docs/SpiderMonkey/Internals/Bytecode
  */
-static const uint32_t XDR_BYTECODE_VERSION_SUBTRAHEND = 283;
+static const uint32_t XDR_BYTECODE_VERSION_SUBTRAHEND = 285;
 static const uint32_t XDR_BYTECODE_VERSION =
     uint32_t(0xb973c0de - XDR_BYTECODE_VERSION_SUBTRAHEND);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/loader/mozJSComponentLoader.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/loader/mozJSComponentLoader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/loader/mozJSComponentLoader.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/loader/mozJSComponentLoader.cpp	2015-05-25 20:43:51.000000000 +0000
@@ -8,7 +8,7 @@
 
 #include <cstdarg>
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #ifdef ANDROID
 #include <android/log.h>
 #endif
@@ -69,12 +69,10 @@
 #define XPC_SERIALIZATION_BUFFER_SIZE   (64 * 1024)
 #define XPC_DESERIALIZATION_BUFFER_SIZE (12 * 8192)
 
-#ifdef PR_LOGGING
 // NSPR_LOG_MODULES=JSComponentLoader:5
 static PRLogModuleInfo* gJSCLLog;
-#endif
 
-#define LOG(args) PR_LOG(gJSCLLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gJSCLLog, PR_LOG_DEBUG, args)
 
 // Components.utils.import error messages
 #define ERROR_SCOPE_OBJ "%s - Second argument must be an object."
@@ -199,11 +197,9 @@
 {
     MOZ_ASSERT(!sSelf, "mozJSComponentLoader should be a singleton");
 
-#ifdef PR_LOGGING
     if (!gJSCLLog) {
         gJSCLLog = PR_NewLogModule("JSComponentLoader");
     }
-#endif
 
     sSelf = this;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/loader/mozJSSubScriptLoader.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/loader/mozJSSubScriptLoader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/loader/mozJSSubScriptLoader.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/loader/mozJSSubScriptLoader.cpp	2015-05-25 20:43:51.000000000 +0000
@@ -25,16 +25,21 @@
 #include "xpcprivate.h" // For xpc::OptionsBase
 #include "jswrapper.h"
 
+#include "mozilla/dom/Promise.h"
+#include "mozilla/dom/ToJSValue.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/scache/StartupCache.h"
 #include "mozilla/scache/StartupCacheUtils.h"
 #include "mozilla/unused.h"
 #include "nsContentUtils.h"
 #include "nsStringGlue.h"
+#include "nsCycleCollectionParticipant.h"
 
 using namespace mozilla::scache;
 using namespace JS;
 using namespace xpc;
 using namespace mozilla;
+using namespace mozilla::dom;
 
 class MOZ_STACK_CLASS LoadSubScriptOptions : public OptionsBase {
 public:
@@ -44,17 +49,20 @@
         , target(cx)
         , charset(NullString())
         , ignoreCache(false)
+        , async(false)
     { }
 
     virtual bool Parse() {
       return ParseObject("target", &target) &&
              ParseString("charset", charset) &&
-             ParseBoolean("ignoreCache", &ignoreCache);
+             ParseBoolean("ignoreCache", &ignoreCache) &&
+             ParseBoolean("async", &async);
     }
 
     RootedObject target;
     nsString charset;
     bool ignoreCache;
+    bool async;
 };
 
 
@@ -109,17 +117,335 @@
 }
 
 nsresult
+PrepareScript(nsIURI* uri,
+              JSContext* cx,
+              RootedObject& targetObj,
+              const char* uriStr,
+              const nsAString& charset,
+              const char* buf,
+              int64_t len,
+              bool reuseGlobal,
+              MutableHandleScript script,
+              MutableHandleFunction function)
+{
+    JS::CompileOptions options(cx);
+    options.setFileAndLine(uriStr, 1);
+    if (!charset.IsVoid()) {
+        char16_t* scriptBuf = nullptr;
+        size_t scriptLength = 0;
+
+        nsresult rv =
+            nsScriptLoader::ConvertToUTF16(nullptr, reinterpret_cast<const uint8_t*>(buf), len,
+                                           charset, nullptr, scriptBuf, scriptLength);
+
+        JS::SourceBufferHolder srcBuf(scriptBuf, scriptLength,
+                                      JS::SourceBufferHolder::GiveOwnership);
+
+        if (NS_FAILED(rv)) {
+            return ReportError(cx, LOAD_ERROR_BADCHARSET, uri);
+        }
+
+        if (!reuseGlobal) {
+            options.setHasPollutedScope(!JS_IsGlobalObject(targetObj));
+            JS::Compile(cx, options, srcBuf, script);
+        } else {
+            AutoObjectVector scopeChain(cx);
+            if (!JS_IsGlobalObject(targetObj) &&
+                !scopeChain.append(targetObj)) {
+                return NS_ERROR_OUT_OF_MEMORY;
+            }
+            // XXXbz do we really not care if the compile fails???
+            JS::CompileFunction(cx, scopeChain, options, nullptr, 0, nullptr,
+                                srcBuf, function);
+        }
+    } else {
+        // We only use lazy source when no special encoding is specified because
+        // the lazy source loader doesn't know the encoding.
+        if (!reuseGlobal) {
+            options.setSourceIsLazy(true)
+                   .setHasPollutedScope(!JS_IsGlobalObject(targetObj));
+            JS::Compile(cx, options, buf, len, script);
+        } else {
+            AutoObjectVector scopeChain(cx);
+            if (!JS_IsGlobalObject(targetObj) &&
+                !scopeChain.append(targetObj)) {
+                return NS_ERROR_OUT_OF_MEMORY;
+            }
+            // XXXbz do we really not care if the compile fails???
+            JS::CompileFunction(cx, scopeChain, options, nullptr, 0, nullptr,
+                                buf, len, function);
+        }
+    }
+    return NS_OK;
+}
+
+nsresult
+EvalScript(JSContext* cx,
+           RootedObject& target_obj,
+           MutableHandleValue retval,
+           nsIURI* uri,
+           bool cache,
+           RootedScript& script,
+           RootedFunction& function)
+{
+    if (function) {
+        script = JS_GetFunctionScript(cx, function);
+    }
+
+    bool ok = false;
+    if (function) {
+        ok = JS_CallFunction(cx, target_obj, function, JS::HandleValueArray::empty(),
+                             retval);
+    } else {
+        if (JS_IsGlobalObject(target_obj)) {
+            ok = JS_ExecuteScript(cx, script, retval);
+        } else {
+            JS::AutoObjectVector scopeChain(cx);
+            ok = scopeChain.append(target_obj) &&
+                 JS_ExecuteScript(cx, scopeChain, script, retval);
+        }
+    }
+
+    if (ok) {
+        JSAutoCompartment rac(cx, target_obj);
+        if (!JS_WrapValue(cx, retval))
+            return NS_ERROR_UNEXPECTED;
+    }
+
+    nsAutoCString cachePath;
+    JSVersion version = JS_GetVersion(cx);
+    cachePath.AppendPrintf("jssubloader/%d", version);
+    PathifyURI(uri, cachePath);
+
+    nsCOMPtr<nsIScriptSecurityManager> secman =
+        do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID);
+    if (!secman)
+        return NS_OK;
+
+    nsCOMPtr<nsIPrincipal> principal;
+    nsresult rv = secman->GetSystemPrincipal(getter_AddRefs(principal));
+    if (NS_FAILED(rv) || !principal)
+        return rv;
+
+    if (cache && ok && !!script) {
+        WriteCachedScript(StartupCache::GetSingleton(),
+                          cachePath, cx, principal, script);
+    }
+    return NS_OK;
+}
+
+class AsyncScriptLoader : public nsIStreamLoaderObserver
+{
+public:
+    NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+    NS_DECL_NSISTREAMLOADEROBSERVER
+
+    NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(AsyncScriptLoader)
+
+    AsyncScriptLoader(nsIChannel* aChannel, bool aReuseGlobal,
+                      JSObject* aTargetObj, const nsAString& aCharset,
+                      bool aCache, Promise* aPromise)
+        : mChannel(aChannel)
+        , mTargetObj(aTargetObj)
+        , mPromise(aPromise)
+        , mCharset(aCharset)
+        , mReuseGlobal(aReuseGlobal)
+        , mCache(aCache)
+    {
+        // Needed for the cycle collector to manage mTargetObj.
+        mozilla::HoldJSObjects(this);
+    }
+
+private:
+    virtual ~AsyncScriptLoader() {
+        mozilla::DropJSObjects(this);
+    }
+
+    nsRefPtr<nsIChannel>      mChannel;
+    Heap<JSObject*>           mTargetObj;
+    nsRefPtr<Promise>         mPromise;
+    nsString                  mCharset;
+    bool                      mReuseGlobal;
+    bool                      mCache;
+};
+
+NS_IMPL_CYCLE_COLLECTION_CLASS(AsyncScriptLoader)
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(AsyncScriptLoader)
+  NS_INTERFACE_MAP_ENTRY(nsIStreamLoaderObserver)
+NS_INTERFACE_MAP_END
+
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(AsyncScriptLoader)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK(mPromise)
+  tmp->mTargetObj = nullptr;
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(AsyncScriptLoader)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPromise)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
+
+NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(AsyncScriptLoader)
+  NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mTargetObj)
+NS_IMPL_CYCLE_COLLECTION_TRACE_END
+
+NS_IMPL_CYCLE_COLLECTING_ADDREF(AsyncScriptLoader)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(AsyncScriptLoader)
+
+class MOZ_STACK_CLASS AutoRejectPromise
+{
+  public:
+    AutoRejectPromise(JSContext* cx,
+                      Promise* aPromise,
+                      nsIGlobalObject* aGlobalObject)
+      : mCx(cx)
+      , mPromise(aPromise)
+      , mGlobalObject(aGlobalObject) {}
+
+    ~AutoRejectPromise() {
+      if (mPromise) {
+        JS::Rooted<JS::Value> undefined(mCx, JS::UndefinedValue());
+        mPromise->MaybeReject(mCx, undefined);
+      }
+    }
+
+    void ResolvePromise(HandleValue aResolveValue) {
+      mPromise->MaybeResolve(aResolveValue);
+      mPromise = nullptr;
+    }
+
+  private:
+    JSContext*                mCx;
+    nsRefPtr<Promise>         mPromise;
+    nsCOMPtr<nsIGlobalObject> mGlobalObject;
+};
+
+NS_IMETHODIMP
+AsyncScriptLoader::OnStreamComplete(nsIStreamLoader* aLoader,
+                                    nsISupports* aContext,
+                                    nsresult aStatus,
+                                    uint32_t aLength,
+                                    const uint8_t* aBuf)
+{
+    nsCOMPtr<nsIURI> uri;
+    mChannel->GetURI(getter_AddRefs(uri));
+
+    nsCOMPtr<nsIGlobalObject> globalObject = xpc::NativeGlobal(mTargetObj);
+    AutoEntryScript aes(globalObject, "async loadSubScript");
+    JSContext* cx = aes.cx();
+    AutoRejectPromise autoPromise(cx, mPromise, globalObject);
+
+    if (NS_FAILED(aStatus)) {
+        ReportError(cx, "Unable to load script.", uri);
+    }
+    // Just notify that we are done with this load.
+    NS_ENSURE_SUCCESS(aStatus, NS_OK);
+
+    if (aLength == 0) {
+        return ReportError(cx, LOAD_ERROR_NOCONTENT, uri);
+    }
+
+    if (aLength > INT32_MAX) {
+        return ReportError(cx, LOAD_ERROR_CONTENTTOOBIG, uri);
+    }
+
+    RootedFunction function(cx);
+    RootedScript script(cx);
+    nsAutoCString spec;
+    uri->GetSpec(spec);
+
+    RootedObject target_obj(cx, mTargetObj);
+
+    nsresult rv = PrepareScript(uri, cx, target_obj, spec.get(),
+                                mCharset,
+                                reinterpret_cast<const char*>(aBuf), aLength,
+                                mReuseGlobal, &script, &function);
+    if (NS_FAILED(rv)) {
+        return rv;
+    }
+
+    JS::Rooted<JS::Value> retval(cx);
+    rv = EvalScript(cx, target_obj, &retval, uri, mCache, script, function);
+
+    if (NS_SUCCEEDED(rv)) {
+        autoPromise.ResolvePromise(retval);
+    }
+
+    return rv;
+}
+
+nsresult
+mozJSSubScriptLoader::ReadScriptAsync(nsIURI* uri, JSObject* targetObjArg,
+                                      const nsAString& charset,
+                                      nsIIOService* serv, bool reuseGlobal,
+                                      bool cache, MutableHandleValue retval)
+{
+    RootedObject target_obj(nsContentUtils::RootingCx(), targetObjArg);
+
+    nsCOMPtr<nsIGlobalObject> globalObject = xpc::NativeGlobal(target_obj);
+    ErrorResult result;
+
+    AutoJSAPI jsapi;
+    if (NS_WARN_IF(!jsapi.Init(globalObject))) {
+      return NS_ERROR_UNEXPECTED;
+    }
+
+    nsRefPtr<Promise> promise = Promise::Create(globalObject, result);
+    if (result.Failed()) {
+      promise = nullptr;
+    }
+
+    DebugOnly<bool> asJS = ToJSValue(jsapi.cx(), promise, retval);
+    MOZ_ASSERT(asJS, "Should not fail to convert the promise to a JS value");
+
+    // We create a channel and call SetContentType, to avoid expensive MIME type
+    // lookups (bug 632490).
+    nsCOMPtr<nsIChannel> channel;
+    nsresult rv;
+    rv = NS_NewChannel(getter_AddRefs(channel),
+                       uri,
+                       nsContentUtils::GetSystemPrincipal(),
+                       nsILoadInfo::SEC_NORMAL,
+                       nsIContentPolicy::TYPE_OTHER,
+                       nullptr,  // aLoadGroup
+                       nullptr,  // aCallbacks
+                       nsIRequest::LOAD_NORMAL,
+                       serv);
+
+    if (!NS_SUCCEEDED(rv)) {
+        return rv;
+    }
+
+    channel->SetContentType(NS_LITERAL_CSTRING("application/javascript"));
+
+    nsRefPtr<AsyncScriptLoader> loadObserver =
+        new AsyncScriptLoader(channel,
+                              reuseGlobal,
+                              target_obj,
+                              charset,
+                              cache,
+                              promise);
+
+    nsCOMPtr<nsIStreamLoader> loader;
+    rv = NS_NewStreamLoader(getter_AddRefs(loader), loadObserver);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsCOMPtr<nsIStreamListener> listener = loader.get();
+    return channel->AsyncOpen(listener, nullptr);
+}
+
+nsresult
 mozJSSubScriptLoader::ReadScript(nsIURI* uri, JSContext* cx, JSObject* targetObjArg,
                                  const nsAString& charset, const char* uriStr,
                                  nsIIOService* serv, nsIPrincipal* principal,
                                  bool reuseGlobal, JS::MutableHandleScript script,
                                  JS::MutableHandleFunction function)
 {
-    RootedObject target_obj(cx, targetObjArg);
-
     script.set(nullptr);
     function.set(nullptr);
 
+    RootedObject target_obj(cx, targetObjArg);
+
     // We create a channel and call SetContentType, to avoid expensive MIME type
     // lookups (bug 632490).
     nsCOMPtr<nsIChannel> chan;
@@ -157,56 +483,13 @@
 
     nsCString buf;
     rv = NS_ReadInputStreamToString(instream, buf, len);
-    if (NS_FAILED(rv))
-        return rv;
-
-    JS::CompileOptions options(cx);
-    options.setFileAndLine(uriStr, 1);
-    if (!charset.IsVoid()) {
-        char16_t* scriptBuf = nullptr;
-        size_t scriptLength = 0;
-
-        rv = nsScriptLoader::ConvertToUTF16(nullptr, reinterpret_cast<const uint8_t*>(buf.get()), len,
-                                            charset, nullptr, scriptBuf, scriptLength);
-
-        JS::SourceBufferHolder srcBuf(scriptBuf, scriptLength,
-                                      JS::SourceBufferHolder::GiveOwnership);
-
-        if (NS_FAILED(rv)) {
-            return ReportError(cx, LOAD_ERROR_BADCHARSET, uri);
-        }
+    NS_ENSURE_SUCCESS(rv, rv);
 
-        if (!reuseGlobal) {
-            options.setHasPollutedScope(!JS_IsGlobalObject(target_obj));
-            JS::Compile(cx, options, srcBuf, script);
-        } else {
-            AutoObjectVector scopeChain(cx);
-            if (!JS_IsGlobalObject(target_obj) &&
-                !scopeChain.append(target_obj)) {
-                return NS_ERROR_OUT_OF_MEMORY;
-            }
-            // XXXbz do we really not care if the compile fails???
-            JS::CompileFunction(cx, scopeChain, options, nullptr, 0, nullptr,
-                                srcBuf, function);
-        }
-    } else {
-        // We only use lazy source when no special encoding is specified because
-        // the lazy source loader doesn't know the encoding.
-        if (!reuseGlobal) {
-            options.setSourceIsLazy(true)
-                   .setHasPollutedScope(!JS_IsGlobalObject(target_obj));
-            JS::Compile(cx, options, buf.get(), len, script);
-        } else {
-            AutoObjectVector scopeChain(cx);
-            if (!JS_IsGlobalObject(target_obj) &&
-                !scopeChain.append(target_obj)) {
-                return NS_ERROR_OUT_OF_MEMORY;
-            }
-            // XXXbz do we really not care if the compile fails???
-            JS::CompileFunction(cx, scopeChain, options, nullptr, 0, nullptr,
-                                buf.get(), len, function);
-        }
-    }
+    rv = PrepareScript(uri, cx, target_obj, uriStr, charset,
+                       buf.get(), len,
+                       reuseGlobal,
+                       script, function);
+    NS_ENSURE_SUCCESS(rv, rv);
 
     return NS_OK;
 }
@@ -351,7 +634,6 @@
         uriStr = tmp;
     }
 
-    bool writeScript = false;
     JSVersion version = JS_GetVersion(cx);
     nsAutoCString cachePath;
     cachePath.AppendPrintf("jssubloader/%d", version);
@@ -361,45 +643,25 @@
     RootedScript script(cx);
     if (cache && !options.ignoreCache)
         rv = ReadCachedScript(cache, cachePath, cx, mSystemPrincipal, &script);
+
+    // If we are doing an async load, trigger it and bail out.
+    if (!script && options.async) {
+        return ReadScriptAsync(uri, targetObj, options.charset, serv,
+                               reusingGlobal, !!cache, retval);
+    }
+
     if (!script) {
         rv = ReadScript(uri, cx, targetObj, options.charset,
                         static_cast<const char*>(uriStr.get()), serv,
                         principal, reusingGlobal, &script, &function);
-        writeScript = !!script;
+    } else {
+        cache = nullptr;
     }
 
     if (NS_FAILED(rv) || (!script && !function))
         return rv;
 
-    if (function) {
-        script = JS_GetFunctionScript(cx, function);
-    }
-
-    bool ok = false;
-    if (function) {
-        ok = JS_CallFunction(cx, targetObj, function, JS::HandleValueArray::empty(),
-                             retval);
-    } else {
-        if (JS_IsGlobalObject(targetObj)) {
-            ok = JS_ExecuteScript(cx, script, retval);
-        } else {
-            JS::AutoObjectVector scopeChain(cx);
-            ok = scopeChain.append(targetObj) &&
-                 JS_ExecuteScript(cx, scopeChain, script, retval);
-        }
-    }
-
-    if (ok) {
-        JSAutoCompartment rac(cx, result_obj);
-        if (!JS_WrapValue(cx, retval))
-            return NS_ERROR_UNEXPECTED;
-    }
-
-    if (cache && ok && writeScript) {
-        WriteCachedScript(cache, cachePath, cx, mSystemPrincipal, script);
-    }
-
-    return NS_OK;
+    return EvalScript(cx, targetObj, retval, uri, !!cache, script, function);
 }
 
 /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/loader/mozJSSubScriptLoader.h firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/loader/mozJSSubScriptLoader.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/loader/mozJSSubScriptLoader.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/loader/mozJSSubScriptLoader.h	2015-05-25 20:43:51.000000000 +0000
@@ -39,6 +39,11 @@
                         bool reuseGlobal, JS::MutableHandleScript script,
                         JS::MutableHandleFunction function);
 
+    nsresult ReadScriptAsync(nsIURI* uri, JSObject* target_obj,
+                             const nsAString& charset,
+                             nsIIOService* serv, bool reuseGlobal,
+                             bool cache, JS::MutableHandleValue retval);
+
     nsresult DoLoadSubScriptWithOptions(const nsAString& url,
                                         LoadSubScriptOptions& options,
                                         JSContext* cx,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/ExportHelpers.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/ExportHelpers.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/ExportHelpers.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/ExportHelpers.cpp	2015-05-25 20:43:51.000000000 +0000
@@ -137,7 +137,7 @@
       {
         nsRefPtr<MozNDEFRecord> ndefRecord = new MozNDEFRecord(global);
         result = ndefRecord->ReadStructuredClone(cx, reader) ?
-                 ndefRecord->WrapObject(cx, JS::NullPtr()) : nullptr;
+                 ndefRecord->WrapObject(cx, nullptr) : nullptr;
       }
       return result;
 #else
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/nsXPConnect.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/nsXPConnect.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/nsXPConnect.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/nsXPConnect.cpp	2015-05-25 20:43:51.000000000 +0000
@@ -216,9 +216,7 @@
     mIsMuted = aReport->isMuted;
 }
 
-#ifdef PR_LOGGING
 static PRLogModuleInfo* gJSDiagnostics;
-#endif
 
 void
 xpc::ErrorReport::LogToConsole()
@@ -243,17 +241,15 @@
         fflush(stderr);
     }
 
-#ifdef PR_LOGGING
     // Log to the PR Log Module.
     if (!gJSDiagnostics)
         gJSDiagnostics = PR_NewLogModule("JSDiagnostics");
     if (gJSDiagnostics) {
-        PR_LOG(gJSDiagnostics,
+        MOZ_LOG(gJSDiagnostics,
                 JSREPORT_IS_WARNING(mFlags) ? PR_LOG_WARNING : PR_LOG_ERROR,
                 ("file %s, line %u\n%s", NS_LossyConvertUTF16toASCII(mFileName).get(),
                  mLineNumber, NS_LossyConvertUTF16toASCII(mErrorMsg).get()));
     }
-#endif
 
     // Log to the console. We do this last so that we can simply return if
     // there's no console service without affecting the other reporting
@@ -376,7 +372,7 @@
     if (!((const js::Class*)clasp)->ext.isWrappedNative)
     {
         VerifyTraceProtoAndIfaceCacheCalledTracer trc(JS_GetRuntime(cx));
-        JS_TraceChildren(&trc, global, JSTRACE_OBJECT);
+        JS_TraceChildren(&trc, global, JS::TraceKind::Object);
         MOZ_ASSERT(trc.ok, "Trace hook on global needs to call TraceXPCGlobal for XPConnect compartments.");
     }
 #endif
@@ -1264,7 +1260,7 @@
 NS_IMETHODIMP
 nsXPConnect::WriteScript(nsIObjectOutputStream* stream, JSContext* cx, JSScript* script)
 {
-    return WriteScriptOrFunction(stream, cx, script, NullPtr());
+    return WriteScriptOrFunction(stream, cx, script, nullptr);
 }
 
 NS_IMETHODIMP
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/Sandbox.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/Sandbox.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/Sandbox.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/Sandbox.cpp	2015-05-25 20:43:51.000000000 +0000
@@ -218,7 +218,7 @@
 
     dom::Crypto* crypto = new dom::Crypto();
     crypto->Init(native);
-    JS::RootedObject wrapped(cx, crypto->WrapObject(cx, JS::NullPtr()));
+    JS::RootedObject wrapped(cx, crypto->WrapObject(cx, nullptr));
     return JS_DefineProperty(cx, obj, "crypto", wrapped, JSPROP_ENUMERATE);
 }
 
@@ -232,7 +232,7 @@
 
     dom::RTCIdentityProviderRegistrar* registrar =
             new dom::RTCIdentityProviderRegistrar(nativeGlobal);
-    JS::RootedObject wrapped(cx, registrar->WrapObject(cx, JS::NullPtr()));
+    JS::RootedObject wrapped(cx, registrar->WrapObject(cx, nullptr));
     return JS_DefineProperty(cx, obj, "rtcIdentityProvider", wrapped, JSPROP_ENUMERATE);
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/XPCComponents.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/XPCComponents.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/XPCComponents.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/XPCComponents.cpp	2015-05-25 20:43:51.000000000 +0000
@@ -28,7 +28,6 @@
 #include "mozilla/dom/StructuredCloneTags.h"
 #include "mozilla/dom/WindowBinding.h"
 #include "nsZipArchive.h"
-#include "nsIDOMFile.h"
 #include "nsIDOMFileList.h"
 #include "nsWindowMemoryReporter.h"
 #include "nsDOMClassInfo.h"
@@ -2855,7 +2854,7 @@
 
     JS::AutoSetAsyncStackForNewCalls sas(cx, asyncStackObj, asyncCauseString);
 
-    if (!JS_CallFunctionValue(cx, JS::NullPtr(), function,
+    if (!JS_CallFunctionValue(cx, nullptr, function,
                               JS::HandleValueArray::empty(), retval))
     {
         return NS_ERROR_XPC_JAVASCRIPT_ERROR;
@@ -3300,7 +3299,7 @@
     // Invoke the callback, if passed.
     if (aCallback.isObject()) {
         RootedValue ignored(aCx);
-        if (!JS_CallFunctionValue(aCx, JS::NullPtr(), aCallback, JS::HandleValueArray(globalVal), &ignored))
+        if (!JS_CallFunctionValue(aCx, nullptr, aCallback, JS::HandleValueArray(globalVal), &ignored))
             return NS_ERROR_FAILURE;
     }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/XPCConvert.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/XPCConvert.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/XPCConvert.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/XPCConvert.cpp	2015-05-25 20:43:51.000000000 +0000
@@ -782,7 +782,7 @@
     if (!flat && cache && cache->IsDOMBinding()) {
         RootedObject global(cx, xpcscope->GetGlobalJSObject());
         js::AssertSameCompartment(cx, global);
-        flat = cache->WrapObject(cx, JS::NullPtr());
+        flat = cache->WrapObject(cx, nullptr);
         if (!flat)
             return false;
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/XPCJSID.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/XPCJSID.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/XPCJSID.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/XPCJSID.cpp	2015-05-25 20:43:51.000000000 +0000
@@ -712,7 +712,7 @@
 
     // 'push' a call context and call on it
     RootedId name(cx, rt->GetStringID(XPCJSRuntime::IDX_CREATE_INSTANCE));
-    XPCCallContext ccx(JS_CALLER, cx, obj, JS::NullPtr(), name, args.length(), args.array(),
+    XPCCallContext ccx(JS_CALLER, cx, obj, nullptr, name, args.length(), args.array(),
                        args.rval().address());
 
     *_retval = XPCWrappedNative::CallMethod(ccx);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/XPCJSRuntime.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/XPCJSRuntime.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/XPCJSRuntime.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/XPCJSRuntime.cpp	2015-05-25 20:43:51.000000000 +0000
@@ -280,6 +280,16 @@
             StringBeginsWith(uristr, kToolkit) ||
             StringBeginsWith(uristr, kBrowser))
             return false;
+
+        // -- GROSS HACK ALERT --
+        // The Yandex Elements 8.10.2 extension implements its own "xb://" URL
+        // scheme. If we call NS_NewURI() on an "xb://..." URL, we'll end up
+        // calling into the extension's own JS-implemented nsIProtocolHandler
+        // object, which we can't allow while we're iterating over the JS heap.
+        // So just skip any such URL.
+        // -- GROSS HACK ALERT --
+        if (StringBeginsWith(uristr, NS_LITERAL_CSTRING("xb")))
+            return false;
     }
 
     nsCOMPtr<nsIURI> uri;
@@ -3148,6 +3158,15 @@
       case JS_TELEMETRY_GC_SCC_SWEEP_MAX_PAUSE_MS:
         Telemetry::Accumulate(Telemetry::GC_SCC_SWEEP_MAX_PAUSE_MS, sample);
         break;
+      case JS_TELEMETRY_GC_MINOR_REASON:
+        Telemetry::Accumulate(Telemetry::GC_MINOR_REASON, sample);
+        break;
+      case JS_TELEMETRY_GC_MINOR_REASON_LONG:
+        Telemetry::Accumulate(Telemetry::GC_MINOR_REASON_LONG, sample);
+        break;
+      case JS_TELEMETRY_GC_MINOR_US:
+        Telemetry::Accumulate(Telemetry::GC_MINOR_US, sample);
+        break;
       case JS_TELEMETRY_DEPRECATED_LANGUAGE_EXTENSIONS_IN_CONTENT:
         Telemetry::Accumulate(Telemetry::JS_DEPRECATED_LANGUAGE_EXTENSIONS_IN_CONTENT, sample);
         break;
@@ -3387,15 +3406,15 @@
     // were not taken at the time of this writing, so we hazard a guess that
     // ASAN builds have roughly thrice the stack overhead as normal builds.
     // On normal builds, the largest stack frame size we might encounter is
-    // 9.0k (see above), so let's use a buffer of 9.0 * 3 * 10 = 270k.
+    // 9.0k (see above), so let's use a buffer of 9.0 * 5 * 10 = 450k.
     const size_t kStackQuota =  2 * kDefaultStackQuota;
-    const size_t kTrustedScriptBuffer = 270 * 1024;
+    const size_t kTrustedScriptBuffer = 450 * 1024;
 #elif defined(XP_WIN)
     // 1MB is the default stack size on Windows, so use 900k.
     // Windows PGO stack frames have unfortunately gotten pretty large lately. :-(
     const size_t kStackQuota = 900 * 1024;
-    const size_t kTrustedScriptBuffer = (sizeof(size_t) == 8) ? 160 * 1024
-                                                              : 100 * 1024;
+    const size_t kTrustedScriptBuffer = (sizeof(size_t) == 8) ? 180 * 1024   //win64
+                                                              : 120 * 1024;  //win32
     // The following two configurations are linux-only. Given the numbers above,
     // we use 50k and 100k trusted buffers on 32-bit and 64-bit respectively.
 #elif defined(DEBUG)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/XPCLog.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/XPCLog.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/XPCLog.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/XPCLog.cpp	2015-05-25 20:43:51.000000000 +0000
@@ -7,7 +7,7 @@
 /* Debug Logging support. */
 
 #include "XPCLog.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prprf.h"
 #include "mozilla/mozalloc.h"
 #include <string.h>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/XPCLog.h firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/XPCLog.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/XPCLog.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/XPCLog.h	2015-05-25 20:43:51.000000000 +0000
@@ -9,7 +9,7 @@
 #ifndef xpclog_h___
 #define xpclog_h___
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 /*
  * This uses prlog.h See prlog.h for environment settings for output.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/XPCMaps.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/XPCMaps.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/XPCMaps.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/XPCMaps.cpp	2015-05-25 20:43:51.000000000 +0000
@@ -182,7 +182,7 @@
 
 Native2WrappedNativeMap::Native2WrappedNativeMap(int length)
 {
-    mTable = new PLDHashTable(PL_DHashGetStubOps(), sizeof(Entry), length);
+    mTable = new PLDHashTable2(PL_DHashGetStubOps(), sizeof(Entry), length);
 }
 
 Native2WrappedNativeMap::~Native2WrappedNativeMap()
@@ -230,7 +230,7 @@
 
 IID2WrappedJSClassMap::IID2WrappedJSClassMap(int length)
 {
-    mTable = new PLDHashTable(&Entry::sOps, sizeof(Entry), length);
+    mTable = new PLDHashTable2(&Entry::sOps, sizeof(Entry), length);
 }
 
 IID2WrappedJSClassMap::~IID2WrappedJSClassMap()
@@ -263,7 +263,7 @@
 
 IID2NativeInterfaceMap::IID2NativeInterfaceMap(int length)
 {
-    mTable = new PLDHashTable(&Entry::sOps, sizeof(Entry), length);
+    mTable = new PLDHashTable2(&Entry::sOps, sizeof(Entry), length);
 }
 
 IID2NativeInterfaceMap::~IID2NativeInterfaceMap()
@@ -304,7 +304,7 @@
 
 ClassInfo2NativeSetMap::ClassInfo2NativeSetMap(int length)
 {
-    mTable = new PLDHashTable(PL_DHashGetStubOps(), sizeof(Entry), length);
+    mTable = new PLDHashTable2(PL_DHashGetStubOps(), sizeof(Entry), length);
 }
 
 ClassInfo2NativeSetMap::~ClassInfo2NativeSetMap()
@@ -342,7 +342,7 @@
 
 ClassInfo2WrappedNativeProtoMap::ClassInfo2WrappedNativeProtoMap(int length)
 {
-    mTable = new PLDHashTable(PL_DHashGetStubOps(), sizeof(Entry), length);
+    mTable = new PLDHashTable2(PL_DHashGetStubOps(), sizeof(Entry), length);
 }
 
 ClassInfo2WrappedNativeProtoMap::~ClassInfo2WrappedNativeProtoMap()
@@ -462,7 +462,7 @@
 
 NativeSetMap::NativeSetMap(int length)
 {
-    mTable = new PLDHashTable(&Entry::sOps, sizeof(Entry), length);
+    mTable = new PLDHashTable2(&Entry::sOps, sizeof(Entry), length);
 }
 
 NativeSetMap::~NativeSetMap()
@@ -525,7 +525,7 @@
 
 IID2ThisTranslatorMap::IID2ThisTranslatorMap(int length)
 {
-    mTable = new PLDHashTable(&Entry::sOps, sizeof(Entry), length);
+    mTable = new PLDHashTable2(&Entry::sOps, sizeof(Entry), length);
 }
 
 IID2ThisTranslatorMap::~IID2ThisTranslatorMap()
@@ -601,7 +601,7 @@
 
 XPCNativeScriptableSharedMap::XPCNativeScriptableSharedMap(int length)
 {
-    mTable = new PLDHashTable(&Entry::sOps, sizeof(Entry), length);
+    mTable = new PLDHashTable2(&Entry::sOps, sizeof(Entry), length);
 }
 
 XPCNativeScriptableSharedMap::~XPCNativeScriptableSharedMap()
@@ -652,8 +652,8 @@
 
 XPCWrappedNativeProtoMap::XPCWrappedNativeProtoMap(int length)
 {
-    mTable = new PLDHashTable(PL_DHashGetStubOps(),
-                              sizeof(PLDHashEntryStub), length);
+    mTable = new PLDHashTable2(PL_DHashGetStubOps(),
+                               sizeof(PLDHashEntryStub), length);
 }
 
 XPCWrappedNativeProtoMap::~XPCWrappedNativeProtoMap()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/XPCMaps.h firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/XPCMaps.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/XPCMaps.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/XPCMaps.h	2015-05-25 20:43:51.000000000 +0000
@@ -158,7 +158,7 @@
     static size_t SizeOfEntryExcludingThis(PLDHashEntryHdr* hdr, mozilla::MallocSizeOf mallocSizeOf, void*);
 
 private:
-    PLDHashTable* mTable;
+    PLDHashTable2* mTable;
 };
 
 /*************************/
@@ -212,7 +212,7 @@
     IID2WrappedJSClassMap();    // no implementation
     explicit IID2WrappedJSClassMap(int size);
 private:
-    PLDHashTable* mTable;
+    PLDHashTable2* mTable;
 };
 
 /*************************/
@@ -271,7 +271,7 @@
     static size_t SizeOfEntryExcludingThis(PLDHashEntryHdr* hdr, mozilla::MallocSizeOf mallocSizeOf, void*);
 
 private:
-    PLDHashTable* mTable;
+    PLDHashTable2* mTable;
 };
 
 /*************************/
@@ -328,7 +328,7 @@
     ClassInfo2NativeSetMap();    // no implementation
     explicit ClassInfo2NativeSetMap(int size);
 private:
-    PLDHashTable* mTable;
+    PLDHashTable2* mTable;
 };
 
 /*************************/
@@ -384,7 +384,7 @@
     static size_t SizeOfEntryExcludingThis(PLDHashEntryHdr* hdr, mozilla::MallocSizeOf mallocSizeOf, void*);
 
 private:
-    PLDHashTable* mTable;
+    PLDHashTable2* mTable;
 };
 
 /*************************/
@@ -454,7 +454,7 @@
     static size_t SizeOfEntryExcludingThis(PLDHashEntryHdr* hdr, mozilla::MallocSizeOf mallocSizeOf, void*);
 
 private:
-    PLDHashTable* mTable;
+    PLDHashTable2* mTable;
 };
 
 /***************************************************************************/
@@ -512,7 +512,7 @@
     IID2ThisTranslatorMap();    // no implementation
     explicit IID2ThisTranslatorMap(int size);
 private:
-    PLDHashTable* mTable;
+    PLDHashTable2* mTable;
 };
 
 /***************************************************************************/
@@ -548,7 +548,7 @@
     XPCNativeScriptableSharedMap();    // no implementation
     explicit XPCNativeScriptableSharedMap(int size);
 private:
-    PLDHashTable* mTable;
+    PLDHashTable2* mTable;
 };
 
 /***************************************************************************/
@@ -586,7 +586,7 @@
     XPCWrappedNativeProtoMap();    // no implementation
     explicit XPCWrappedNativeProtoMap(int size);
 private:
-    PLDHashTable* mTable;
+    PLDHashTable2* mTable;
 };
 
 /***************************************************************************/
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/xpcprivate.h firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/xpcprivate.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/xpcprivate.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/xpcprivate.h	2015-05-25 20:43:51.000000000 +0000
@@ -820,8 +820,8 @@
 
     XPCCallContext(XPCContext::LangType callerLanguage,
                    JSContext* cx,
-                   JS::HandleObject obj    = JS::NullPtr(),
-                   JS::HandleObject funobj = JS::NullPtr(),
+                   JS::HandleObject obj    = nullptr,
+                   JS::HandleObject funobj = nullptr,
                    JS::HandleId id         = JSID_VOIDHANDLE,
                    unsigned argc           = NO_ARGS,
                    jsval* argv             = nullptr,
@@ -1285,7 +1285,7 @@
                           jsval* pval)
         {MOZ_ASSERT(IsConstant(),
                     "Only call this if you're sure this is a constant!");
-         return Resolve(ccx, iface, JS::NullPtr(), pval);}
+         return Resolve(ccx, iface, nullptr, pval);}
 
     bool NewFunctionObject(XPCCallContext& ccx, XPCNativeInterface* iface,
                            JS::HandleObject parent, jsval* pval);
@@ -3511,7 +3511,7 @@
     { }
 
     JSObject* ToJSObject(JSContext* cx) {
-        JS::RootedObject obj(cx, JS_NewObjectWithGivenProto(cx, nullptr, JS::NullPtr()));
+        JS::RootedObject obj(cx, JS_NewObjectWithGivenProto(cx, nullptr, nullptr));
         if (!obj)
             return nullptr;
 
@@ -3724,8 +3724,17 @@
 
     const nsACString& GetLocation() {
         if (location.IsEmpty() && locationURI) {
-            if (NS_FAILED(locationURI->GetSpec(location)))
+
+            nsCOMPtr<nsIXPConnectWrappedJS> jsLocationURI =
+                 do_QueryInterface(locationURI);
+            if (jsLocationURI) {
+                // We cannot call into JS-implemented nsIURI objects, because
+                // we are iterating over the JS heap at this point.
+                location =
+                    NS_LITERAL_CSTRING("<JS-implemented nsIURI location>");
+            } else if (NS_FAILED(locationURI->GetSpec(location))) {
                 location = NS_LITERAL_CSTRING("<unknown location>");
+            }
         }
         return location;
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/XPCShellImpl.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/XPCShellImpl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/XPCShellImpl.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/XPCShellImpl.cpp	2015-05-25 20:43:51.000000000 +0000
@@ -580,7 +580,7 @@
 
     JSAutoCompartment ac(cx, &callback.toObject());
     RootedValue rv(cx);
-    if (!JS_CallFunctionValue(cx, JS::NullPtr(), callback, JS::HandleValueArray::empty(), &rv) ||
+    if (!JS_CallFunctionValue(cx, nullptr, callback, JS::HandleValueArray::empty(), &rv) ||
         !rv.isBoolean())
     {
         NS_WARNING("Scripted interrupt callback failed! Terminating script.");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/XPCWrappedNativeJSOps.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/src/XPCWrappedNativeJSOps.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/src/XPCWrappedNativeJSOps.cpp	2015-05-25 20:43:51.000000000 +0000
@@ -415,7 +415,7 @@
 static bool
 XPC_WN_OnlyIWrite_AddPropertyStub(JSContext* cx, HandleObject obj, HandleId id, HandleValue v)
 {
-    XPCCallContext ccx(JS_CALLER, cx, obj, NullPtr(), id);
+    XPCCallContext ccx(JS_CALLER, cx, obj, nullptr, id);
     XPCWrappedNative* wrapper = ccx.GetWrapper();
     THROW_AND_RETURN_IF_BAD_WRAPPER(cx, wrapper);
 
@@ -613,7 +613,7 @@
 static bool
 XPC_WN_NoHelper_Resolve(JSContext* cx, HandleObject obj, HandleId id, bool* resolvedp)
 {
-    XPCCallContext ccx(JS_CALLER, cx, obj, NullPtr(), id);
+    XPCCallContext ccx(JS_CALLER, cx, obj, nullptr, id);
     XPCWrappedNative* wrapper = ccx.GetWrapper();
     THROW_AND_RETURN_IF_BAD_WRAPPER(cx, wrapper);
 
@@ -781,7 +781,7 @@
     // N.B. we want obj to be the callee, not JS_THIS(cx, vp)
     RootedObject obj(cx, &args.callee());
 
-    XPCCallContext ccx(JS_CALLER, cx, obj, NullPtr(), JSID_VOIDHANDLE, args.length(),
+    XPCCallContext ccx(JS_CALLER, cx, obj, nullptr, JSID_VOIDHANDLE, args.length(),
                        args.array(), args.rval().address());
     if (!ccx.IsValid())
         return false;
@@ -799,7 +799,7 @@
     if (!obj)
         return false;
 
-    XPCCallContext ccx(JS_CALLER, cx, obj, NullPtr(), JSID_VOIDHANDLE, args.length(),
+    XPCCallContext ccx(JS_CALLER, cx, obj, nullptr, JSID_VOIDHANDLE, args.length(),
                        args.array(), args.rval().address());
     if (!ccx.IsValid())
         return false;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/tests/chrome/chrome.ini firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/tests/chrome/chrome.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/tests/chrome/chrome.ini	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/tests/chrome/chrome.ini	2015-05-25 20:43:51.000000000 +0000
@@ -17,6 +17,7 @@
 [test_bug361111.xul]
 [test_bug448587.xul]
 [test_bug484459.xul]
+skip-if = os == 'win' || os == 'mac' # bug 1131110
 [test_bug500931.xul]
 [test_bug503926.xul]
 [test_bug533596.xul]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/tests/chrome/test_cloneInto.xul firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/tests/chrome/test_cloneInto.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/tests/chrome/test_cloneInto.xul	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/tests/chrome/test_cloneInto.xul	2015-05-25 20:43:52.000000000 +0000
@@ -49,7 +49,7 @@
     if (Array.isArray(a))
       return 'array';
 
-    if (a instanceof Ci.nsIDOMFile)
+    if (a instanceof File)
       return 'file';
 
     if (a instanceof Ci.nsIDOMBlob)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/tests/mochitest/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/tests/mochitest/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/tests/mochitest/mochitest.ini	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/tests/mochitest/mochitest.ini	2015-05-25 20:43:52.000000000 +0000
@@ -96,6 +96,7 @@
 [test_bug1005806.html]
 [test_bug1021258.html]
 [test_bug1094930.html]
+[test_bug1158558.html]
 [test_crossOriginObjects.html]
 [test_crosscompartment_weakmap.html]
 [test_frameWrapping.html]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/tests/mochitest/test_bug1158558.html firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/tests/mochitest/test_bug1158558.html
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/tests/mochitest/test_bug1158558.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/tests/mochitest/test_bug1158558.html	2015-05-25 20:43:52.000000000 +0000
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1158558
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 1158558</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=1158558">Mozilla Bug 1158558</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  <input id="ipt"></input>
+</div>
+<pre id="test">
+</pre>
+<script type="application/javascript">
+
+/** Test for Bug 1158558 **/
+
+// Observers of cycle-collector-begin can be implemented in JS, and
+// thus can end up starting an incremental GC while we're in the middle
+// of a CC slice.
+
+SimpleTest.waitForExplicitFinish();
+
+var observer = {
+  observe: function(subject, topic, data) {
+    SpecialPowers.removeObserver(observer, "cycle-collector-begin");
+    SpecialPowers.Cu.getJSTestingFunctions().startgc(1);
+
+    ok(true, "Do something so the test harness doesn't get angry");
+
+    SimpleTest.finish();
+  }
+};
+
+SpecialPowers.addObserver(observer, "cycle-collector-begin", false);
+
+SpecialPowers.Cu.forceCC();
+
+</script>
+</body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/tests/unit/bug451678_subscript.js firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/tests/unit/bug451678_subscript.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/tests/unit/bug451678_subscript.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/tests/unit/bug451678_subscript.js	2015-05-25 20:43:52.000000000 +0000
@@ -1,2 +1,5 @@
 var tags = [];
 function makeTags() {}
+
+// This will be the return value of the script.
+42
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/tests/unit/component-blob.js firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/tests/unit/component-blob.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/tests/unit/component-blob.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/tests/unit/component-blob.js	2015-05-25 20:43:52.000000000 +0000
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-Components.utils.importGlobalProperties(['Blob']);
+Components.utils.importGlobalProperties(['Blob', 'File']);
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
@@ -31,7 +31,7 @@
     // do some tests
     do_check_true(f1 instanceof Ci.nsIDOMBlob, "Should be a DOM Blob");
 
-    do_check_true(!(f1 instanceof Ci.nsIDOMFile), "Should not be a DOM File");
+    do_check_true(!(f1 instanceof File), "Should not be a DOM File");
 
     do_check_true(f1.type == "text/xml", "Wrong type");
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/tests/unit/component-file.js firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/tests/unit/component-file.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/tests/unit/component-file.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/tests/unit/component-file.js	2015-05-25 20:43:52.000000000 +0000
@@ -36,8 +36,8 @@
     var f2 = new File(file);
 
     // do some tests
-    do_check_true(f1 instanceof Ci.nsIDOMFile, "Should be a DOM File");
-    do_check_true(f2 instanceof Ci.nsIDOMFile, "Should be a DOM File");
+    do_check_true(f1 instanceof File, "Should be a DOM File");
+    do_check_true(f2 instanceof File, "Should be a DOM File");
 
     do_check_true(f1.name == "xpcshell.ini", "Should be the right file");
     do_check_true(f2.name == "xpcshell.ini", "Should be the right file");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/tests/unit/test_blob2.js firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/tests/unit/test_blob2.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/tests/unit/test_blob2.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/tests/unit/test_blob2.js	2015-05-25 20:43:52.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.importGlobalProperties(['Blob']);
+Components.utils.importGlobalProperties(['Blob', 'File']);
 
 const Ci = Components.interfaces;
 
@@ -15,7 +15,7 @@
   // do some tests
   do_check_true(f1 instanceof Ci.nsIDOMBlob, "Should be a DOM Blob");
 
-  do_check_true(!(f1 instanceof Ci.nsIDOMFile), "Should not be a DOM File");
+  do_check_true(!(f1 instanceof File), "Should not be a DOM File");
 
   do_check_true(f1.type == "text/xml", "Wrong type");
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/tests/unit/test_bug1150106.js firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/tests/unit/test_bug1150106.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/tests/unit/test_bug1150106.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/tests/unit/test_bug1150106.js	2015-05-25 20:43:52.000000000 +0000
@@ -0,0 +1,35 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+
+var srvScope = {};
+
+function success(result) {
+  equal(result, 42, "Result of script is correct");
+  ok('makeTags' in srvScope && srvScope.makeTags instanceof Function,
+     "makeTags is a function.");
+  do_test_finished();
+}
+
+function error() {
+  ok(false, "error loading the script asynchronously.");
+  do_test_finished();
+}
+
+function run_test() {
+  do_test_pending();
+
+  var file = do_get_file("bug451678_subscript.js");
+  var ios = Cc["@mozilla.org/network/io-service;1"]
+              .getService(Ci.nsIIOService);
+  var uri = ios.newFileURI(file);
+  var scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
+                       .getService(Ci.mozIJSSubScriptLoader);
+  var p = scriptLoader.loadSubScriptWithOptions(uri.spec,
+                                                { target: srvScope,
+                                                  async: true });
+  p.then(success, error);
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/tests/unit/test_bug809652.js firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/tests/unit/test_bug809652.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/tests/unit/test_bug809652.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/tests/unit/test_bug809652.js	2015-05-25 20:43:52.000000000 +0000
@@ -40,7 +40,6 @@
   checkThrows("Date.prototype.getYear.call(d)", sb);
   checkThrows("Date.prototype.valueOf.call(d)", sb);
   checkThrows("d.valueOf()", sb);
-  checkThrows("Date.prototype.toString.call(d)", sb);
   checkThrows("d.toString()", sb);
 
   /* Typed arrays. */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/tests/unit/test_file2.js firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/tests/unit/test_file2.js
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/tests/unit/test_file2.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/tests/unit/test_file2.js	2015-05-25 20:43:52.000000000 +0000
@@ -21,8 +21,8 @@
   var f2 = new File(file);
 
   // do some tests
-  do_check_true(f1 instanceof Ci.nsIDOMFile, "Should be a DOM File");
-  do_check_true(f2 instanceof Ci.nsIDOMFile, "Should be a DOM File");
+  do_check_true(f1 instanceof File, "Should be a DOM File");
+  do_check_true(f2 instanceof File, "Should be a DOM File");
 
   do_check_true(f1.name == "xpcshell.ini", "Should be the right file");
   do_check_true(f2.name == "xpcshell.ini", "Should be the right file");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/tests/unit/xpcshell.ini firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/tests/unit/xpcshell.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/tests/unit/xpcshell.ini	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/tests/unit/xpcshell.ini	2015-05-25 20:43:52.000000000 +0000
@@ -55,6 +55,7 @@
 [test_bug1081990.js]
 [test_bug1110546.js]
 [test_bug1131707.js]
+[test_bug1150106.js]
 [test_bug1150771.js]
 [test_bug1151385.js]
 [test_bug_442086.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/wrappers/XrayWrapper.cpp firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/wrappers/XrayWrapper.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/wrappers/XrayWrapper.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/wrappers/XrayWrapper.cpp	2015-05-25 20:43:52.000000000 +0000
@@ -504,7 +504,7 @@
 
     // Scan through the functions. Indexed array properties are handled above.
     const JSFunctionSpec* fsMatch = nullptr;
-    for (const JSFunctionSpec* fs = clasp->spec.prototypeFunctions; fs && fs->name; ++fs) {
+    for (const JSFunctionSpec* fs = clasp->spec.prototypeFunctions(); fs && fs->name; ++fs) {
         if (PropertySpecNameEqualsId(fs->name, id)) {
             fsMatch = fs;
             break;
@@ -532,7 +532,7 @@
 
     // Scan through the properties.
     const JSPropertySpec* psMatch = nullptr;
-    for (const JSPropertySpec* ps = clasp->spec.prototypeProperties; ps && ps->name; ++ps) {
+    for (const JSPropertySpec* ps = clasp->spec.prototypeProperties(); ps && ps->name; ++ps) {
         if (PropertySpecNameEqualsId(ps->name, id)) {
             psMatch = ps;
             break;
@@ -765,14 +765,14 @@
     MOZ_ASSERT(clasp->spec.defined());
 
     // Convert the method and property names to jsids and pass them to the caller.
-    for (const JSFunctionSpec* fs = clasp->spec.prototypeFunctions; fs && fs->name; ++fs) {
+    for (const JSFunctionSpec* fs = clasp->spec.prototypeFunctions(); fs && fs->name; ++fs) {
         jsid id;
         if (!PropertySpecNameToPermanentId(cx, fs->name, &id))
             return false;
         if (!MaybeAppend(id, flags, props))
             return false;
     }
-    for (const JSPropertySpec* ps = clasp->spec.prototypeProperties; ps && ps->name; ++ps) {
+    for (const JSPropertySpec* ps = clasp->spec.prototypeProperties(); ps && ps->name; ++ps) {
         jsid id;
         if (!PropertySpecNameToPermanentId(cx, ps->name, &id))
             return false;
@@ -788,7 +788,7 @@
 {
     RootedObject target(cx, getTargetObject(wrapper));
     RootedObject holder(cx, JS_NewObjectWithGivenProto(cx, &HolderClass,
-                                                       JS::NullPtr()));
+                                                       nullptr));
     if (!holder)
         return nullptr;
 
@@ -986,7 +986,7 @@
 
     // Create the expando object.
     RootedObject expandoObject(cx,
-      JS_NewObjectWithGivenProto(cx, &ExpandoObjectClass, JS::NullPtr()));
+      JS_NewObjectWithGivenProto(cx, &ExpandoObjectClass, nullptr));
     if (!expandoObject)
         return nullptr;
 
@@ -1032,7 +1032,7 @@
         if (!JS_WrapObject(cx, &consumerGlobal))
             return nullptr;
         expandoObject = attachExpandoObject(cx, target, ObjectPrincipal(wrapper),
-                                            isSandbox ? (HandleObject)consumerGlobal : NullPtr());
+                                            isSandbox ? (HandleObject)consumerGlobal : nullptr);
     }
     return expandoObject;
 }
@@ -1168,7 +1168,7 @@
 
     // This will do verification and the method lookup for us.
     RootedObject target(cx, getTargetObject(wrapper));
-    XPCCallContext ccx(JS_CALLER, cx, target, NullPtr(), id);
+    XPCCallContext ccx(JS_CALLER, cx, target, nullptr, id);
 
     // There are no native numeric (or symbol-keyed) properties, so we can
     // shortcut here. We will not find the property.
@@ -1484,7 +1484,7 @@
 JSObject*
 XPCWrappedNativeXrayTraits::createHolder(JSContext* cx, JSObject* wrapper)
 {
-    return JS_NewObjectWithGivenProto(cx, &HolderClass, JS::NullPtr());
+    return JS_NewObjectWithGivenProto(cx, &HolderClass, nullptr);
 }
 
 bool
@@ -1495,7 +1495,7 @@
     // Run the call hook of the wrapped native.
     XPCWrappedNative* wn = getWN(wrapper);
     if (NATIVE_HAS_FLAG(wn, WantCall)) {
-        XPCCallContext ccx(JS_CALLER, cx, wrapper, NullPtr(), JSID_VOIDHANDLE, args.length(),
+        XPCCallContext ccx(JS_CALLER, cx, wrapper, nullptr, JSID_VOIDHANDLE, args.length(),
                            args.array(), args.rval().address());
         if (!ccx.IsValid())
             return false;
@@ -1521,7 +1521,7 @@
     // Run the construct hook of the wrapped native.
     XPCWrappedNative* wn = getWN(wrapper);
     if (NATIVE_HAS_FLAG(wn, WantConstruct)) {
-        XPCCallContext ccx(JS_CALLER, cx, wrapper, NullPtr(), JSID_VOIDHANDLE, args.length(),
+        XPCCallContext ccx(JS_CALLER, cx, wrapper, nullptr, JSID_VOIDHANDLE, args.length(),
                            args.array(), args.rval().address());
         if (!ccx.IsValid())
             return false;
@@ -1699,7 +1699,7 @@
 JSObject*
 DOMXrayTraits::createHolder(JSContext* cx, JSObject* wrapper)
 {
-    return JS_NewObjectWithGivenProto(cx, nullptr, JS::NullPtr());
+    return JS_NewObjectWithGivenProto(cx, nullptr, nullptr);
 }
 
 namespace XrayUtils {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/wrappers/XrayWrapper.h firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/wrappers/XrayWrapper.h
--- firefox-trunk-41.0~a1~hg20150513r243603/js/xpconnect/wrappers/XrayWrapper.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/js/xpconnect/wrappers/XrayWrapper.h	2015-05-25 20:43:52.000000000 +0000
@@ -399,7 +399,7 @@
 
     virtual JSObject* createHolder(JSContext* cx, JSObject* wrapper) override
     {
-        return JS_NewObjectWithGivenProto(cx, nullptr, JS::NullPtr());
+        return JS_NewObjectWithGivenProto(cx, nullptr, nullptr);
     }
 
     static OpaqueXrayTraits singleton;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/changesets firefox-trunk-41.0~a1~hg20150524r245419/l10n/changesets
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/changesets	2015-05-13 18:09:31.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/changesets	2015-05-25 20:52:44.000000000 +0000
@@ -8,7 +8,7 @@
 br 247:b2a174c5dec1
 bs 92:5478bcad3dc0
 ca 671:0427dac6c811
-cs 2013:e4994848f43e
+cs 2022:fb99f8fd3f5a
 cy 233:038ac23e35c2
 da 735:3da200622aa9
 de 3102:e90ebdee49a7
@@ -16,15 +16,15 @@
 en-GB 444:876cf60b4ae5
 en-ZA 72:17beceda1cc2
 eo 382:a3cf736ff4cb
-es-AR 965:01787137a63a
-es-CL 633:57a3f7748d5a
-es-ES 2427:909dfac9dac9
+es-AR 968:be2f600968a2
+es-CL 638:b14dc4b0bcb3
+es-ES 2438:082f245c66df
 es-MX 382:ed9deb48c0bd
 et 530:54f9fbfcd622
 eu 379:d7df5b30dd48
 fa 421:947cad3bcb84
 fi 557:9fa360eef979
-fr 5360:bb9d719723a5
+fr 5370:e0c9ef0f39cf
 fy-NL 1157:453401a56b04
 ga-IE 465:f841e9037f9e
 gd 519:1c2db3f5f73c
@@ -35,9 +35,9 @@
 hr 935:bd9589f3311f
 hu 794:b45f6b60407e
 hy-AM 284:b9b46392d10f
-id 582:314b32d89286
+id 586:db7a70fb880a
 is 297:33af74865c25
-it 3944:b051f75c169f
+it 3984:a95e261b0d20
 ja 693:9eeb2e8d96ff
 ja-JP-mac 694:6a82bb12ec37
 kk 313:082569ba0c42
@@ -55,14 +55,14 @@
 nn-NO 636:2032d95af2a7
 or 188:627670ac2eac
 pa-IN 589:b51530b15a00
-pl 5502:d8a23ce06470
+pl 5526:577b435fa391
 pt-BR 664:723658175bdd
 pt-PT 2124:f25649a63bdf
 rm 388:945a12b3635b
 ro 419:ad3a5fe2543b
-ru 2362:deb7777016b6
+ru 2367:7611f63f2de2
 si 414:fb01300c5c4a
-sk 1503:effcef1b27fb
+sk 1620:0a6bcb15f33f
 sl 1102:50b974bd9a70
 son 151:8c7e276e62d6
 sq 774:4e1d2dc5d752
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/baseMenuOverlay.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/baseMenuOverlay.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/baseMenuOverlay.dtd	2015-05-13 18:07:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/baseMenuOverlay.dtd	2015-05-25 20:45:41.000000000 +0000
@@ -25,6 +25,10 @@
 
 <!ENTITY helpSafeMode.label "Restartovat se zakázanými doplňky…">
 <!ENTITY helpSafeMode.accesskey "R">
+<!ENTITY helpSafeMode.stop.label       "Restartovat s povolenými doplňky">
+<!ENTITY helpSafeMode.stop.accesskey   "R">
+
+
 
 <!ENTITY healthReport2.label      "Hlášení o zdraví aplikace &brandShorterName;">
 <!ENTITY healthReport2.accesskey  "H">
@@ -44,9 +48,9 @@
 <!ENTITY servicesMenuMac.label "Služby">
 
 <!ENTITY hideThisAppCmdMac2.label       "Skrýt &brandShorterName;">
-<!ENTITY hideThisAppCmdMac2.commandkey  "S">
+<!ENTITY hideThisAppCmdMac2.commandkey  "H">
 
 <!ENTITY hideOtherAppsCmdMac.label "Skrýt ostatní">
-<!ENTITY hideOtherAppsCmdMac.commandkey "k">
+<!ENTITY hideOtherAppsCmdMac.commandkey "H">
 
 <!ENTITY showAllAppsCmdMac.label "Zobrazit vše">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/browser.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/browser.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/browser.dtd	2015-05-13 18:07:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/browser.dtd	2015-05-25 20:45:41.000000000 +0000
@@ -425,6 +425,16 @@
      search providers:  "Search for <used typed keywords> with:" -->
 <!ENTITY searchFor.label              "Hledat ">
 <!ENTITY searchWith.label             " pomocí:">
+
+<!-- LOCALIZATION NOTE (search.label, searchAfter.label):
+      This string is used to build the header above the list of one-click search
+      providers when a one off engine has been selected.  The searchAfter text is
+      intentionally left empty for en-US and can be used by other localizations to
+      display a string after the search engine name.  This string will be displayed
+      as:  "Search <selected engine name><searchAfter.label text>" -->
+<!ENTITY search.label                 "Hledat ">
+<!ENTITY searchAfter.label            "">
+
 <!-- LOCALIZATION NOTE (searchWithHeader.label):
      The wording of this string should be as close as possible to
      searchFor.label and searchWith.label. This string will be used instead of
@@ -742,7 +752,6 @@
 <!ENTITY customizeMode.lwthemes.menuManage.accessKey "S">
 <!ENTITY customizeMode.lwthemes.menuGetMore "Získat více motivů">
 <!ENTITY customizeMode.lwthemes.menuGetMore.accessKey "Z">
-<!ENTITY customizeMode.deveditionTheme.label2 "Použít motiv Developer Edition">
 
 <!ENTITY social.chatBar.commandkey "c">
 <!ENTITY social.chatBar.label "Přepnout na chat">
@@ -803,8 +812,6 @@
 
 <!ENTITY appMenuSidebars.label         "Postranní lišty">
 
-<!ENTITY switchToMetroCmd2.label       "Spustit v prohlížeči &brandShortName; pro Windows 8 Touch">
-
 <!-- LOCALIZATION NOTE: (panicButton.view.mainTimeframeDesc, panicButton.view.5min, panicButton.view.2hr, panicButton.view.day):
      The .mainTimeframeDesc string combined with any of the 3 others is meant to form a complete sentence, e.g. "Forget the last: Five minutes".
      Please ensure that this remains the case in the translation. -->
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/browser.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/browser.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/browser.properties	2015-05-13 18:07:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/browser.properties	2015-05-25 20:45:41.000000000 +0000
@@ -37,6 +37,7 @@
 addonDownloadingAndVerifying=Stahování a ověřování doplňku…;Stahování a ověřování #1 doplňků…;Stahování a ověřování #1 doplňků…
 addonDownloadVerifying=Ověřování…
  
+addonInstall.unsigned=(Neověřeno)
 addonInstall.cancelButton.label=Zrušit
 addonInstall.cancelButton.accesskey=Z
 addonInstall.acceptButton.label=Instalovat
@@ -48,11 +49,17 @@
 # #1 is brandShortName
 # #2 is the number of add-ons being installed
 addonConfirmInstall.message=Tato stránka chce nainstalovat doplněk do aplikace #1:;Tato stránka chce nainstalovat #2 doplňky do aplikace #1:;Tato stránka chce nainstalovat #2 doplňků do aplikace #1:
+addonConfirmInstallUnsigned.message=Upozornění: Tato stránka chce nainstalovat neověřený doplněk do aplikace #1. Pokračujte na vlastní riziko.;Upozornění: Tato stránka chce nainstalovat #2 neověřené doplňky do aplikace #1. Pokračujte na vlastní riziko.;Upozornění: Tato stránka chce nainstalovat #2 neověřených doplňků do aplikace #1. Pokračujte na vlastní riziko.
 
+# LOCALIZATION NOTE (addonConfirmInstallSomeUnsigned.message):
+# Semicolon-separated list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is brandShortName
+# #2 is the total number of add-ons being installed (at least 2)
+addonConfirmInstallSomeUnsigned.message=;Upozornění: Tato stránka chce nainstalovat #2 doplňky do aplikace #1, z nichž některé jsou neověřené. Pokračujte na vlastní riziko.;Upozornění: Tato stránka chce nainstalovat #2 doplňků do aplikace #1, z nichž některé jsou neověřené. Pokračujte na vlastní riziko.
 
 addonwatch.slow=%1$S může způsobovat, že %2$S běží pomalu
 addonwatch.disable.label=Zakázat %S
-addonwatch.disable.accesskey=Z
 addonwatch.ignoreSession.label=Ignorovat nyní
 addonwatch.ignoreSession.accesskey=I
 addonwatch.ignorePerm.label=Ignorovat trvale
@@ -77,6 +84,7 @@
 addonError-2=Doplněk z #2 nemohl být nainstalován, protože neodpovídá doplňku, který je očekáván aplikací #3.
 addonError-3=Doplněk z #2 nemohl být nainstalován, protože je porušený.
 addonError-4=Doplněk #1 nemohl být nainstalován, protože aplikace #3 nemohla změnit potřebné soubory.
+addonError-5=Aplikace #3 zabránila tomuto serveru v instalaci neověřeného doplňku.
 
 # LOCALIZATION NOTE (addonLocalError-1, addonLocalError-2, addonLocalError-3, addonLocalError-4, addonErrorIncompatible, addonErrorBlocklisted):
 # #1 is the add-on name, #3 is the application name, #4 is the application version
@@ -84,9 +92,14 @@
 addonLocalError-2=Tento doplněk nemohl být nainstalován, protože neodpovídá doplňku, který je očekáván aplikací #3.
 addonLocalError-3=Tento doplněk nemohl být nainstalován, protože je porušený.
 addonLocalError-4=Doplněk #1 nemohl být nainstalován, protože aplikace #3 nemohla změnit potřebné soubory.
+addonLocalError-5=Tento doplněk nemohl být nainstalován, protože nebyl ověřen.
 addonErrorIncompatible=Doplněk #1 nemohl být nainstalován, protože není kompatibilní s aplikací #3 #4.
 addonErrorBlocklisted=Doplněk #1 nemohl být nainstalován, protože způsobuje problémy s bezpečností nebo stabilitou.
 
+unsignedAddonsDisabled.message=Jeden nebo více nainstalovaných doplňků nelze ověřit, a proto byly zakázány.
+unsignedAddonsDisabled.learnMore.label=Zjistit více
+unsignedAddonsDisabled.learnMore.accesskey=Z
+
 # LOCALIZATION NOTE (deveditionTheme.name): This should be nearly the brand name for aurora.
 # See browser/branding/aurora/locales/*/brand.properties
 deveditionTheme.name=Developer Edition
@@ -368,6 +381,15 @@
 webNotifications.neverShow.accesskey=N
 webNotifications.showFromSite=Chcete zobrazit upozornění od %S?
 
+# Push Notifications
+push.allowForSession=Povolit pro relaci
+push.allowForSession.accesskey=P
+push.alwaysAllow=Vždy povolit nabízené upozornění
+push.alwaysAllow.accesskey=V
+push.alwaysBlock=Vždy blokovat nabízené upozornění
+push.alwaysBlock.accesskey=B
+push.enablePush=Chcete povolit nabízené upozornění pro %S?
+
 # Pointer lock UI
 
 pointerLock.allow2=Skrýt ukazatel
@@ -391,6 +413,7 @@
 safebrowsing.reportedAttackSite=Nahlášená útočná stránka!
 safebrowsing.notAnAttackButton.label=Toto není útočná stránka…
 safebrowsing.notAnAttackButton.accessKey=T
+safebrowsing.reportedUnwantedSite=Nahlášena nevyžádaná stránka se software!
 
 # Ctrl-Tab
 # LOCALIZATION NOTE (ctrlTab.listAllTabs.label): #1 represents the number
@@ -761,4 +784,39 @@
 # This will show as an item in the Reading List, and will link to a SUMO article describing Sync:
 #   https://support.mozilla.org/kb/how-do-i-set-up-firefox-sync
 # %S is syncBrandShortName
-readingList.prepopulatedArticles.supportSync = Zpřístupněte si s aplikací %S svůj Seznam ke čtení kdekoliv jste 
\ No newline at end of file
+readingList.prepopulatedArticles.supportSync = Zpřístupněte si s aplikací %S svůj Seznam ke čtení kdekoliv jste 
+
+# LOCALIZATION NOTE (e10s.offerPopup.mainMessage
+#                    e10s.offerPopup.highlight1
+#                    e10s.offerPopup.highlight2
+#                    e10s.offerPopup.enableAndRestart.label
+#                    e10s.offerPopup.enableAndRestart.accesskey
+#                    e10s.offerPopup.noThanks.label
+#                    e10s.offerPopup.noThanks.accesskey
+#                    e10s.postActivationInfobar.message
+#                    e10s.postActivationInfobar.learnMore.label
+#                    e10s.postActivationInfobar.learnMore.accesskey
+#                    e10s.accessibilityNotice.mainMessage
+#                    e10s.accessibilityNotice.disableAndRestart.label
+#                    e10s.accessibilityNotice.disableAndRestart.accesskey
+#                    e10s.accessibilityNotice.dontDisable.label
+#                    e10s.accessibilityNotice.dontDisable.accesskey):
+# These strings are related to the messages we display to offer e10s (Multi-process) to users
+# on the pre-release channels. They won't be used in release but they will likely be used in
+# beta starting from version 41, so it's still useful to have these strings properly localized.
+# %S is brandShortName
+e10s.offerPopup.mainMessage = Multiprocesová architektura se již brzy objeví v aplikaci %S. Můžete ji však používat již nyní a získat včasný přístup k některým z výhod:
+e10s.offerPopup.highlight1 = Lepší odezva
+e10s.offerPopup.highlight2 = Méně pádů
+e10s.offerPopup.enableAndRestart.label = Povolit a restartovat
+e10s.offerPopup.enableAndRestart.accesskey = P
+e10s.offerPopup.noThanks.label = Ne, děkuji
+e10s.offerPopup.noThanks.accesskey = N
+e10s.postActivationInfobar.message = Nyní pomáháte testovat multiprocesovou architekturu v aplikaci %S! Hlašte prosím problémy, které naleznete.
+e10s.postActivationInfobar.learnMore.label = Zjistit více
+e10s.postActivationInfobar.learnMore.accesskey = Z
+e10s.accessibilityNotice.mainMessage = Multiprocesová architektura zatím nepodporuje funkce pro přístupnost. Multiprocesová architektura bude zakázána, pokud %S restartujete. Přejete si provést restart?
+e10s.accessibilityNotice.disableAndRestart.label = Zakázat a restartovat
+e10s.accessibilityNotice.disableAndRestart.accesskey = Z
+e10s.accessibilityNotice.dontDisable.label = Nezakazovat
+e10s.accessibilityNotice.dontDisable.accesskey = N
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/customizableui/customizableWidgets.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/customizableui/customizableWidgets.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/customizableui/customizableWidgets.properties	2015-05-13 18:07:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/customizableui/customizableWidgets.properties	2015-05-25 20:45:41.000000000 +0000
@@ -33,10 +33,6 @@
 # LOCALIZATION NOTE(add-ons-button.tooltiptext3): %S is the keyboard shortcut
 add-ons-button.tooltiptext3 = Otevře Správce doplňků (%S)
 
-switch-to-metro-button2.label = Windows 8 Touch
-# LOCALIZATION NOTE(switch-to-metro-button2.tooltiptext): %S is the brand short name
-switch-to-metro-button2.tooltiptext = Spustí v prohlížeči %S pro Windows 8 Touch
-
 preferences-button.label = Předvolby
 preferences-button.tooltiptext2 = Otevře předvolby
 preferences-button.tooltiptext.withshortcut = Otevře předvolby (%S)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/animationinspector.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/animationinspector.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/animationinspector.properties	2015-05-13 18:07:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/animationinspector.properties	2015-05-25 20:45:41.000000000 +0000
@@ -46,3 +46,9 @@
 # how long (in seconds) the animation lasts, or what is the animation's current
 # time (in seconds too);
 player.timeLabel=%Ss
+
+# LOCALIZATION NOTE (player.playbackRateLabel):
+# This string is displayed in each animation player widget, as the label of
+# drop-down list items that can be used to change the rate at which the
+# animation runs (1x being the default, 2x being twice as fast).
+player.playbackRateLabel=%Sx
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/debugger.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/debugger.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/debugger.dtd	2015-05-13 18:07:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/debugger.dtd	2015-05-25 20:45:42.000000000 +0000
@@ -198,3 +198,17 @@
 <!ENTITY debuggerUI.stepping.stepIn2    "VK_SEMICOLON">
 <!ENTITY debuggerUI.stepping.stepOut1   "VK_F11">
 <!ENTITY debuggerUI.stepping.stepOut2   "VK_SEMICOLON">
+
+<!-- LOCALIZATION NOTE (debuggerUI.context.newTab):  This is the label
+   -  for the Open in New Tab menu item displayed in the context menu of the
+   -  debugger sources side menu. This should be the same as
+   -  netmonitorUI.context.newTab  -->
+<!ENTITY debuggerUI.context.newTab           "Otevřít v novém panelu">
+<!ENTITY debuggerUI.context.newTab.accesskey "O">
+ 
+<!-- LOCALIZATION NOTE (debuggerUI.context.copyUrl): This is the label displayed
+   -  on the context menu that copies the selected request's url. This should be
+   -  the same as netmonitorUI.context.copyUrl -->
+<!ENTITY debuggerUI.context.copyUrl           "Kopírovat URL">
+<!ENTITY debuggerUI.context.copyUrl.accesskey "K">
+<!ENTITY debuggerUI.context.copyUrl.key "K">
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/debugger.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/debugger.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/debugger.properties	2015-05-13 18:07:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/debugger.properties	2015-05-25 20:45:42.000000000 +0000
@@ -218,6 +218,10 @@
 # viewer when there is an error loading a file
 errorLoadingText=Chyba při načítání zdroje:\n
 
+# LOCALIZATION NOTE (errorLoadingText2): The text that is displayed in the debugger
+# viewer when there is an error loading a file
+errorLoadingText2=Chyba při načítání této URL: %S
+
 # LOCALIZATION NOTE (emptyStackText): The text that is displayed in the watch
 # expressions list to add a new item.
 addWatchExpressionText=Přidat sledovaný výraz
@@ -321,3 +325,4 @@
 variablesViewMissingArgs=(nedostupné)
 
 evalGroupLabel=Vyhodnocené zdroje
+anonymousSourcesLabel=Anonymní zdroje
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/filterwidget.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/filterwidget.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/filterwidget.dtd	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/filterwidget.dtd	2015-05-25 20:45:42.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/. -->
+
+<!-- LOCALIZATION NOTE : FILE These strings are used in the CSS Filter Editor Widget
+   - which can be found in a tooltip that appears in the Rule View when clicking
+   - on a filter swatch displayed next to CSS declarations like 'filter: blur(2px)'. -->
+<!-- LOCALIZATION NOTE (filterListSelectPlaceholder): This string is used as
+   - a preview option in the list of possible filters <select> -->
+<!ENTITY filterListSelectPlaceholder "Zvolte filtr">
+ 
+<!-- LOCALIZATION NOTE (addNewFilterButton): This string is displayed on a button used to add new filters -->
+<!ENTITY addNewFilterButton "Přidat">
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/filterwidget.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/filterwidget.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/filterwidget.properties	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/filterwidget.properties	2015-05-25 20:45:42.000000000 +0000
@@ -0,0 +1,33 @@
+## This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+# LOCALIZATION NOTE These strings are used in the CSS Filter Editor Widget
+# which can be found in a tooltip that appears in the Rule View when clicking
+# on a filter swatch displayed next to CSS declarations like 'filter: blur(2px)'.
+
+# LOCALIZATION NOTE (emptyFilterList):
+# This string is displayed when filter's list is empty
+# (no filter specified / all removed)
+emptyFilterList=Žádný filtr nebyl specifikován
+
+# LOCALIZATION NOTE (addUsingList):
+# This string is displayed under [emptyFilterList] when filter's
+# list is empty, guiding user to add a filter using the list below it
+addUsingList=Přidat filtr pomocí seznamu níže
+ 
+# LOCALIZATION NOTE (dropShadowPlaceholder):
+# This string is used as a placeholder for drop-shadow's input
+# in the filter list (shown when <input> is empty)
+dropShadowPlaceholder=x y barva radiusu
+ 
+# LOCALIZATION NOTE (dragHandleTooltipText):
+# This string is used as a tooltip text (shown on mouse hover) on the
+# drag handles of filters which are used to re-order filters
+dragHandleTooltipText=Tažením nahoru nebo dolů změníte pořadí filtrů
+
+# LOCALIZATION NOTE (labelDragTooltipText):
+# This string is used as a tooltip text (shown on mouse hover) on the
+# filters' labels which can be dragged left/right to increase/decrease
+# the filter's value (like photoshop)
+labelDragTooltipText=Tažením doleva nebo doprava snížíte nebo zvýšíte hodnotu
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/inspector.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/inspector.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/inspector.dtd	2015-05-13 18:07:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/inspector.dtd	2015-05-25 20:45:42.000000000 +0000
@@ -68,6 +68,12 @@
 <!ENTITY inspectorHTMLPasteLastChild.label       "Jako poslední potomek">
 <!ENTITY inspectorHTMLPasteLastChild.accesskey   "s">
 
+<!-- LOCALIZATION NOTE (inspectorScrollNodeIntoView.label): This is the label
+      shown in the inspector contextual-menu for the item that lets users scroll
+      the current node into view -->
+<!ENTITY inspectorScrollNodeIntoView.label       "Posunout na zobrazení">
+<!ENTITY inspectorScrollNodeIntoView.accesskey   "S">
+
 <!-- LOCALIZATION NOTE (inspectorHTMLDelete.label): This is the label shown in
      the inspector contextual-menu for the item that lets users delete the
      current node -->
@@ -80,7 +86,10 @@
      the placeholder in inspector search box -->
 <!ENTITY inspectorSearchHTML.label2          "Hledat podle CSS selektorů">
 
-
+<!-- LOCALIZATION NOTE (inspectorSearchHTML.label3): This is the label that will
+     be shown as the placeholder in the future, once the inspector search box
+     supports the full text HTML search in Bug 835896. -->
+<!ENTITY inspectorSearchHTML.label3 "Hledat HTML">
 <!ENTITY inspectorSearchHTML.key "F">
 
 <!-- LOCALIZATION NOTE (inspectorCopyImageDataUri.label): This is the label
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/inspector.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/inspector.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/inspector.properties	2015-05-13 18:07:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/inspector.properties	2015-05-25 20:45:42.000000000 +0000
@@ -53,4 +53,53 @@
 previewTooltip.image.brokenImage=Nepodařilo se načíst obrázek
 
 #LOCALIZATION NOTE: Used in the image preview tooltip when the image could not be loaded
-eventsTooltip.openInDebugger=Otevřít v debuggeru
\ No newline at end of file
+eventsTooltip.openInDebugger=Otevřít v debuggeru
+
+# LOCALIZATION NOTE (docsTooltip.visitMDN): Shown in the tooltip that displays
+# help from MDN. This is a link to the complete MDN documentation page.
+docsTooltip.visitMDN=Navštívit MDN stránku
+ 
+# LOCALIZATION NOTE (docsTooltip.visitMDN): Shown in the docs tooltip when the MDN page
+# could not be loaded (for example, because of a connectivity problem).
+docsTooltip.loadDocsError=Nelze načíst stránku dokumentace.
+
+# LOCALIZATION NOTE (inspector.collapsePane): This is the tooltip for the button
+# that collapses the right panel (rules, computed, box-model, etc...) in the
+# inspector UI.
+inspector.collapsePane=Sbalit panel
+ 
+# LOCALIZATION NOTE (inspector.expandPane): This is the tooltip for the button
+# that expands the right panel (rules, computed, box-model, etc...) in the
+# inspector UI.
+inspector.expandPane=Rozbalit panel
+ 
+# LOCALIZATION NOTE (inspector.searchResultsCount): This is the label that
+# will show up next to the inspector search box. %1$S is the current result
+# index and %2$S is the total number of search results. For example: "3 of 9".
+# This won't be visible until the search box is updated in Bug 835896.
+inspector.searchResultsCount2=%1$S z %2$S
+
+# LOCALIZATION NOTE (inspector.searchResultsNone): This is the label that
+# will show up next to the inspector search box when no matches were found
+# for the given string.
+# This won't be visible until the search box is updated in Bug 835896.
+inspector.searchResultsNone=Žádná shoda
+
+# LOCALIZATION NOTE (inspector.menu.openUrlInNewTab.label): This is the label of
+# a menu item in the inspector contextual-menu that appears when the user right-
+# clicks on the attribute of a node in the inspector that is a URL, and that
+# allows to open that URL in a new tab.
+inspector.menu.openUrlInNewTab.label=Otevřít odkaz v novém panelu
+
+# LOCALIZATION NOTE (inspector.menu.copyUrlToClipboard.label): This is the label
+# of a menu item in the inspector contextual-menu that appears when the user
+# right-clicks on the attribute of a node in the inspector that is a URL, and
+# that allows to copy that URL in the clipboard.
+inspector.menu.copyUrlToClipboard.label=Kopírovat adresu odkazu
+
+# LOCALIZATION NOTE (inspector.menu.selectElement.label): This is the label of a
+# menu item in the inspector contextual-menu that appears when the user right-
+# clicks on the attribute of a node in the inspector that is the ID of another
+# element in the DOM (like with <label for="input-id">), and that allows to
+# select that element in the inspector.
+inspector.menu.selectElement.label=Zvolit prvek #%S
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/jsonview.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/jsonview.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/jsonview.properties	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/jsonview.properties	2015-05-25 20:45:42.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/.
+ 
+# LOCALIZATION NOTE These strings are used in the JSON View tool
+# that is used to inspect application/json document types loaded
+# in the browser.
+ 
+# LOCALIZATION NOTE The correct localization of this file might be to keep it
+# in English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best documentation
+# on web development on the web.
+
+# LOCALIZATION NOTE (jsonViewer.tab.JSON, jsonViewer.tab.RawData,
+# jsonViewer.tab.Headers): Label for a panel tab.
+jsonViewer.tab.JSON=JSON
+jsonViewer.tab.RawData=Raw Data
+jsonViewer.tab.Headers=Hlavičky
+ 
+# LOCALIZATION NOTE (jsonViewer.responseHeaders, jsonViewer.requestHeaders):
+# Label for header groups within the 'Headers' panel.
+jsonViewer.responseHeaders=Hlavičky odpovědi
+jsonViewer.requestHeaders=Hlavičky požadavku
+
+# LOCALIZATION NOTE (jsonViewer.Save): Label for save command
+jsonViewer.Save=Uložit
+
+# LOCALIZATION NOTE (jsonViewer.Copy): Label for clipboard copy command
+jsonViewer.Copy=Kopírovat
+
+# LOCALIZATION NOTE (jsonViewer.PrettyPrint): Label for JSON
+# pretty print action button.
+jsonViewer.PrettyPrint=Pretty Print
+
+# LOCALIZATION NOTE (jsonViewer.reps.more): Label used in arrays
+# that have more items than displayed.
+jsonViewer.reps.more=více...
+
+# LOCALIZATION NOTE (jsonViewer.filterJSON): Label used in search box
+# at the top right cornder of the JSON Viewer.
+jsonViewer.filterJSON=Filtr JSON
+ 
+# LOCALIZATION NOTE (jsonViewer.reps.reference): Label used for cycle
+# references in an array.
+jsonViewer.reps.reference=Cyklus reference
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/netmonitor.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/netmonitor.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/netmonitor.dtd	2015-05-13 18:07:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/netmonitor.dtd	2015-05-25 20:45:42.000000000 +0000
@@ -123,6 +123,11 @@
   -  in the network details footer for the "Other" filtering button. -->
 <!ENTITY netmonitorUI.footer.filterOther  "Ostatní">
 
+<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterFreetext): This is the label displayed
+  -  in the network details footer for the url filtering textbox. -->
+<!ENTITY netmonitorUI.footer.filterFreetext.label  "Filtr URL adres">
+<!ENTITY netmonitorUI.footer.filterFreetext.key  "F">
+
 <!-- LOCALIZATION NOTE (debuggerUI.footer.clear): This is the label displayed
   -  in the network details footer for the "Clear" button. -->
 <!ENTITY netmonitorUI.footer.clear  "Vymazat">
@@ -254,15 +259,51 @@
   -  on the context menu that copies the selected request's url -->
 <!ENTITY netmonitorUI.context.copyUrl      "Kopírovat URL">
 
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl.accesskey): This is the access key
+  -  for the Copy URL menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.context.copyUrl.accesskey  "K">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrlParams): This is the label displayed
+  -  on the context menu that copies the selected request's url parameters -->
+<!ENTITY netmonitorUI.context.copyUrlParams     "Kopírovat parametry URL">
+ 
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrlParams.accesskey): This is the access key
+  -  for the Copy URL Parameters menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.context.copyUrlParams.accesskey "P">
+
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyAsCurl): This is the label displayed
   -  on the context menu that copies the selected request as a cURL command.
   -  The capitalization is part of the official name and should be used throughout all languages.
   -  http://en.wikipedia.org/wiki/CURL -->
 <!ENTITY netmonitorUI.context.copyAsCurl    "Kopírovat cURL">
 
-<!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl.accesskey): This is the access key
-  -  for the Copy URL menu item displayed in the context menu for a request -->
-<!ENTITY netmonitorUI.context.copyUrl.accesskey  "K">
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyAsCUrl.accesskey): This is the access key
+  -  for the Copy as cURL menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.context.copyAsCurl.accesskey "C">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyRequestHeaders): This is the label displayed
+  -  on the context menu that copies the selected item's request headers -->
+<!ENTITY netmonitorUI.context.copyRequestHeaders     "Kopírovat hlavičky požadavku">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyRequestHeaders.accesskey): This is the access key
+  -  for the Copy Request Headers menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.context.copyRequestHeaders.accesskey  "Q">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyResponseHeaders): This is the label displayed
+  -  on the context menu that copies the selected item's response headers -->
+<!ENTITY netmonitorUI.context.copyResponseHeaders     "Kopírovat hlavičky odpovědi">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyResponseHeaders.accesskey): This is the access key
+  -  for the Copy Response Headers menu item displayed in the context menu for a response -->
+<!ENTITY netmonitorUI.context.copyResponseHeaders.accesskey  "S">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyResponse): This is the label displayed
+  -  on the context menu that copies the selected response as a string -->
+<!ENTITY netmonitorUI.context.copyResponse "Kopírovat odpověď">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyRespose.accesskey): This is the access key
+  -  for the Copy Response menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.context.copyResponse.accesskey  "R">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyImageAsDataUri): This is the label displayed
   -  on the context menu that copies the selected image as data uri -->
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/profiler.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/profiler.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/profiler.dtd	2015-05-13 18:07:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/profiler.dtd	2015-05-25 20:45:42.000000000 +0000
@@ -21,6 +21,19 @@
 <!ENTITY profilerUI.stopNotice1    "Opětovným klepnutím na tlačítko">
 <!ENTITY profilerUI.stopNotice2    "ukončíte nahrávání.">
 
+<!-- LOCALIZATION NOTE (profilerUI.startRecording/profilerUI.stopRecording): These are
+  -  the labels shown on the main recording buttons to start/stop recording. -->
+<!ENTITY profilerUI.startRecording "Zapnout záznam výkonu">
+<!ENTITY profilerUI.stopRecording  "Zastavit záznam výkonu">
+
+<!-- LOCALIZATION NOTE (profilerUI.bufferStatusTooltip): This string
+  -  is displayed as the tooltip for the buffer capacity during a recording. -->
+<!ENTITY profilerUI.bufferStatusTooltip "Profiler ukládá vzorky v kruhové vyrovnávací paměti a poté, co vyrovnávací paměť dosáhne limitu pro nahrávání, novější vzorky začnou přepisovat vzorky na začátku záznamu.">
+
+<!-- LOCALIZATION NOTE (profilerUI.bufferStatusFull): This string
+  -  is displayed when the profiler's circular buffer has started to overlap. -->
+<!ENTITY profilerUI.bufferStatusFull "Vyrovnávací paměť je plná. Starší vzorky jsou nyní přepsány.">
+
 <!-- LOCALIZATION NOTE (profilerUI.loadingNotice): This is the label shown
   -  in the call list view while loading a profile. -->
 <!ENTITY profilerUI.loadingNotice "Nahrávání…">
@@ -29,6 +42,10 @@
   -  on a button that starts a new profile. -->
 <!ENTITY profilerUI.recordButton.tooltip "Nahraje volání funkcí JavaScriptu.">
 
+<!-- LOCALIZATION NOTE (profilerUI.recordButton2): This string is displayed
+  -  on a button that starts a new profile. -->
+<!ENTITY profilerUI.recordButton2.tooltip "Přepnout stav nahrávání záznamu výkonu.">
+	
 <!-- LOCALIZATION NOTE (profilerUI.importButton): This string is displayed
   -  on a button that opens a dialog to import a saved profile data file. -->
 <!ENTITY profilerUI.importButton "Importovat…">
@@ -60,15 +77,22 @@
 <!-- LOCALIZATION NOTE (profilerUI.table.*): These strings are displayed
   -  in the call tree headers for a recording. -->
 <!ENTITY profilerUI.table.totalDuration2  "Celkový čas">
+<!ENTITY profilerUI.table.totalDuration.tooltip    "Množství času stráveného v této funkci a funkcích, které jsou volány.">
 <!ENTITY profilerUI.table.selfDuration2   "Vlastní čas">
+<!ENTITY profilerUI.table.selfDuration.tooltip     "Množství času stráveného pouze v rámci této funkce.">
 <!ENTITY profilerUI.table.totalPercentage "Celkové vytížení">
+<!ENTITY profilerUI.table.totalPercentage.tooltip  "Procento času stráveného v této funkci a funkcích, které jsou volány.">
 <!ENTITY profilerUI.table.selfPercentage  "Vlastní vytížení">
+<!ENTITY profilerUI.table.selfPercentage.tooltip   "Procento času stráveného pouze v rámci této funkce.">
 <!ENTITY profilerUI.table.samples         "Vzorky">
+<!ENTITY profilerUI.table.samples.tooltip          "Čas této funkci na zásobníku, když profiler vzal vzorek.">
 <!ENTITY profilerUI.table.function        "Funkce">
+<!ENTITY profilerUI.table.function.tooltip         "Jméno a adresa zdroje vzorkové funkce.">
 <!ENTITY profilerUI.table.totalAlloc1       "Celkový počet vzorků alokací">
-<!ENTITY profilerUI.table.totalAllocTooltip "Celkový počet objektů vzorků alokací v tomto umístění a v callees.">
+<!ENTITY profilerUI.table.totalAlloc.tooltip       "Celkový počet objektů vzorků alokací v tomto umístění a v callees.">
 <!ENTITY profilerUI.table.selfAlloc1        "Vlastních vzorků alokací">
-<!ENTITY profilerUI.table.selfAllocTooltip  "Počet objektů vzorků alokací v tomto umístění.">
+<!ENTITY profilerUI.table.selfAlloc.tooltip        "Počet objektů vzorků alokací v tomto umístění.">
+
 
 <!-- LOCALIZATION NOTE (profilerUI.newtab.tooltiptext): The tooltiptext shown
   -  on the "+" (new tab) button for a profile when a selection is available. -->
@@ -97,16 +121,39 @@
   -  label for the checkbox that toggles the flattening of tree recursion in inspected
   -  functions in the profiler. -->
 <!ENTITY profilerUI.flattenTreeRecursion             "Srovnat rekurzivní strukturu stromu">
-<!ENTITY profilerUI.flattenTreeRecursion.tooltiptext "Srovnat rekurzi při zkoumání funkcí.">
+<!ENTITY profilerUI.flattenTreeRecursion.tooltiptext "Srovnává rekurzi při zkoumání funkcí.">
 
 <!-- LOCALIZATION NOTE (profilerUI.enableMemory): This string
   -  is displayed next to a checkbox determining whether or not memory
   -  measurements are enabled. -->
 <!ENTITY profilerUI.enableMemory             "Nahrávat paměť">
-<!ENTITY profilerUI.enableMemory.tooltiptext "Nahrávat spotřebu paměti během profilování.">
+<!ENTITY profilerUI.enableMemory.tooltiptext "Nahrává spotřebu paměti během profilování.">
 
 <!-- LOCALIZATION NOTE (profilerUI.enableFramerate): This string
   -  is displayed next to a checkbox determining whether or not framerate
   -  is recorded. -->
 <!ENTITY profilerUI.enableFramerate             "Zaznamenávat frekvenci snímkování">
-<!ENTITY profilerUI.enableFramerate.tooltiptext "Zaznamenávat frekvenci snímkování během profilování.">
+<!ENTITY profilerUI.enableFramerate.tooltiptext "Zaznamenává frekvenci snímkování během profilování.">
+
+<!-- LOCALIZATION NOTE (profilerUI.showJITOptimizations): This string
+  -  is displayed next to a checkbox determining whether or not JIT optimization data
+  -  should be shown. -->
+<!ENTITY profilerUI.showJITOptimizations             "Zobrazit JIT optimalizace">
+<!ENTITY profilerUI.showJITOptimizations.tooltiptext "Zobrazí JIT optimalizaci vzorků dat v každém snímku stromu volání JS.">
+
+<!-- LOCALIZATION NOTE (profilerUI.JITOptimizationsTitle): This string
+  -  is displayed as the title of the JIT Optimizations panel. -->
+<!ENTITY profilerUI.JITOptimizationsTitle "JIT optimalizace">
+
+<!-- LOCALIZATION NOTE (profilerUI.console.recordingNoticeStart/recordingNoticeEnd):
+  -  This string is displayed when a recording is selected that started via console.profile.
+  -  Wraps the command used to start, like "Currently recording via console.profile("label")" -->
+<!ENTITY profilerUI.console.recordingNoticeStart "Aktuálně nahráváte přes">
+<!ENTITY profilerUI.console.recordingNoticeEnd   "">
+
+<!-- LOCALIZATION NOTE (profilerUI.console.stopCommandStart/stopCommandEnd):
+  -  This string is displayed when a recording is selected that started via console.profile.
+  -  Indicates how to stop the recording, wrapping the command, like
+  -  "Stop recording by entering console.profilEnd("label") into the console." -->
+<!ENTITY profilerUI.console.stopCommandStart "Zastavit nahrávání zadáním">
+<!ENTITY profilerUI.console.stopCommandEnd   "do konzole.">
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/profiler.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/profiler.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/profiler.properties	2015-05-13 18:07:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/profiler.properties	2015-05-25 20:45:42.000000000 +0000
@@ -121,3 +121,29 @@
 # This string is displayed as a filter for saving a recording to disk.
 recordingsList.saveDialogAllFilter=Všechny soubory
 
+# LOCALIZATION NOTE (jit.optimizationFailure):
+# This string is displayed in a tooltip when no JIT optimizations were detected.
+jit.optimizationFailure=Optimalizace se nezdařila
+
+# LOCALIZATION NOTE (jit.samples2):
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# This string is displayed for the unit representing the number of times a
+# frame is sampled.
+# "#1" represents the number of samples
+# example: 30 samples
+jit.samples2=#1 vzorek;#1 vzorky;#1 vzorků
+
+# LOCALIZATION NOTE (jit.empty):
+# This string is displayed when there are no JIT optimizations to display.
+jit.empty=Pro tento snímek nebyly nahrány žádné JIT optimalizace.
+
+# LOCALIZATION NOTE (consoleProfile.recordingNotice/stopCommand):
+# These strings are displayed when a recording is in progress, that was started from the console.
+# TODO REMOVE
+consoleProfile.recordingNotice=Aktuálně nahrává profil "%S".
+# TODO REMOVE
+consoleProfile.stopCommand=Zastavit profilování zadáním "console.profileEnd('%S')" do konzole.
+
+# LOCALIZATION NOTE (profiler.bufferStatus):
+# This string is displayed illustrating how full the profiler's circular buffer is.
+profiler.bufferStatus=Kapacita vyrovnávací paměti: %S%
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/styleeditor.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/styleeditor.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/styleeditor.dtd	2015-05-13 18:07:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/styleeditor.dtd	2015-05-25 20:45:42.000000000 +0000
@@ -61,3 +61,7 @@
 <!ENTITY noStyleSheet-tip-action.label "připojit nový stylopis">
 <!-- LOCALICATION NOTE  (noStyleSheet-tip-end.label): End of the tip sentence -->
 <!ENTITY noStyleSheet-tip-end.label ".">
+
+<!-- LOCALIZATION NOTE (openLinkNewTab.label): This is the text for the
+     context menu item that opens a stylesheet in a new tab -->
+<!ENTITY openLinkNewTab.label     "Otevřít odkaz v novém panelu">
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/styleinspector.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/styleinspector.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/styleinspector.dtd	2015-05-13 18:07:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/styleinspector.dtd	2015-05-25 20:45:42.000000000 +0000
@@ -13,9 +13,9 @@
   -  should be displayed or not. -->
 <!ENTITY browserStylesLabel "Styly prohlížeče">
 
-<!-- LOCALIZATION NOTE (userStylesSearch): This is the placeholder that goes in
+<!-- LOCALIZATION NOTE (filterStylesPlaceholder): This is the placeholder that goes in
   -  the search box when no search term has been entered. -->
-<!ENTITY userStylesSearch "Hledat">
+<!ENTITY filterStylesPlaceholder      "Filtr stylů">
 
 <!-- LOCALIZATION NOTE (selectedElementLabel): This is the label for the path of
   -  the highlighted element in the web page. This path is based on the document
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/timeline.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/timeline.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/timeline.properties	2015-05-13 18:07:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/timeline.properties	2015-05-25 20:45:42.000000000 +0000
@@ -40,8 +40,11 @@
 timeline.label.reflow2=Rozložení
 timeline.label.paint=Vykreslení
 timeline.label.javascript2=Volání funkce
+timeline.label.parseHTML=Parsování HTML
+timeline.label.parseXML=Parsování XML
 timeline.label.domevent=Událost DOM
 timeline.label.consoleTime=Konzola
+timeline.label.garbageCollection=GC Akce
 
 # LOCALIZATION NOTE (graphs.memory):
 # This string is displayed in the memory graph of the Performance tool,
@@ -70,4 +73,5 @@
 timeline.markerDetail.startStack=Zásobník na začátku:
 timeline.markerDetail.endStack=Zásobník na konci:
 timeline.markerDetail.unknownFrame=<neznámé umístění>
-timeline.markerDetail.asyncStack=(Asynchronní: %S)
\ No newline at end of file
+timeline.markerDetail.asyncStack=(Asynchronní: %S)
+timeline.markerDetail.causeName=Příčina:
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/toolbox.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/toolbox.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/toolbox.dtd	2015-05-13 18:07:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/toolbox.dtd	2015-05-25 20:45:42.000000000 +0000
@@ -6,6 +6,9 @@
 <!-- LOCALIZATION NOTE : FILE Do not translate key -->
 
 <!ENTITY closeCmd.key "W">
+<!ENTITY toggleToolbox.key  "I">
+<!ENTITY toggleToolboxF12.keycode          "VK_F12">
+<!ENTITY toggleToolboxF12.keytext          "F12">
 
 <!ENTITY toolboxCloseButton.tooltip "Zavře nástroje vývoje">
 <!ENTITY toolboxOptionsButton.key "O">
@@ -97,11 +100,11 @@
 <!ENTITY options.disableCache.label2     "Zakázat mezipaměť (když jsou nástroje otevřeny)">
 <!ENTITY options.disableCache.tooltip2   "Zapnutí této volby zakáže mezipaměť pro všechny panely do doby, kdy jsou nástroje otevřeny.">
 
-<!-- LOCALIZATION NOTE (options.enableServiceWorkersTesting.label,
-  -  options.enableServiceWorkersTesting.tooltip): This is the options panel label and
-  -  tooltip for the checkbox that toggles the service workers testing features on or off. -->
-<!ENTITY options.enableServiceWorkersTesting.label     "Povolit testovací funkce Service Workers (když jsou nástroje otevřeny)">
-<!ENTITY options.enableServiceWorkersTesting.tooltip   "Zapnutí této volby povolí testovací funkce Service Workers za situace, kdy budou nástroje otevřeny.">
+<!-- LOCALIZATION NOTE (options.enableServiceWorkersHTTP.label,
+  -  options.enableServiceWorkersHTTP.tooltip): This is the options panel label and
+  -  tooltip for the checkbox that toggles the service workers testing features on or off. This option enables service workers over HTTP. -->
+<!ENTITY options.enableServiceWorkersHTTP.label     "Povolit Service Workers přes HTTP (když jsou nástroje otevřeny)">
+<!ENTITY options.enableServiceWorkersHTTP.tooltip   "Zapnutí této volby umožní Service Workers přes HTTP pro všechny panely, které mají panel nástrojů otevřen.">
 
 <!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the default developer
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/toolbox.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/toolbox.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/toolbox.properties	2015-05-13 18:07:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/toolbox.properties	2015-05-25 20:45:42.000000000 +0000
@@ -70,11 +70,6 @@
 # This is the tooltip of the pick button in the toolbox toolbar
 pickButton.tooltip=Vybere prvek na stránce
 
-# LOCALIZATION NOTE (sidebar.showAllTabs.label)
-# This is the label shown in the show all tabs button in the tabbed side
-# bar, when there's no enough space to show all tabs at once
-sidebar.showAllTabs.label=…
-
 # LOCALIZATION NOTE (sidebar.showAllTabs.tooltip)
 # This is the tooltip shown when hover over the '…' button in the tabbed side
 # bar, when there's no enough space to show all tabs at once
@@ -92,3 +87,15 @@
 # Used as a message in the alert displayed when trying to open a browser
 # content toolbox and there is no content process running
 toolbox.noContentProcess.message=Neběží žádný proces s obsahem.
+
+# LOCALIZATION NOTE (toolbox.viewCssSourceInStyleEditor.label)
+# Used as a message in either tooltips or contextual menu items to open the
+# corresponding URL as a css file in the Style-Editor tool.
+# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditor is used.
+toolbox.viewCssSourceInStyleEditor.label=Otevřít soubor v Editoru stylů
+
+# LOCALIZATION NOTE (toolbox.viewJsSourceInDebugger.label)
+# Used as a message in either tooltips or contextual menu items to open the
+# corresponding URL as a js file in the Debugger tool.
+# DEV NOTE: Mostly used wherever toolbox.viewSourceInDebugger is used.
+toolbox.viewJsSourceInDebugger.label=Otevřít soubor v Debuggeru
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/webConsole.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/webConsole.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/webConsole.dtd	2015-05-13 18:07:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/webConsole.dtd	2015-05-25 20:45:42.000000000 +0000
@@ -76,6 +76,16 @@
 <!ENTITY btnConsoleXhr          "XHR">
 <!ENTITY btnConsoleReflows      "Přeformátování">
 
+<!-- LOCALIZATION NODE (btnConsoleSharedWorkers) the term "Shared Workers"
+  -  should not be translated. -->
+<!ENTITY btnConsoleSharedWorkers "Shared Workers">
+<!-- LOCALIZATION NODE (btnConsoleServiceWorkers) the term "Service Workers"
+  -  should not be translated. -->
+<!ENTITY btnConsoleServiceWorkers "Service Workers">
+<!-- LOCALIZATION NODE (btnConsoleWindowlessWorkers) the term "Workers"
+  -  should not be translated. -->
+<!ENTITY btnConsoleWindowlessWorkers "Doplněk nebo Chrome Workers">
+
 <!ENTITY filterOutput.placeholder "Filtr výstupu">
 <!ENTITY btnClear.label "Vymazat">
 <!ENTITY btnClear.tooltip "Vymaže obsah webové konzoly">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/webide.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/webide.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/webide.dtd	2015-05-13 18:07:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/webide.dtd	2015-05-25 20:45:42.000000000 +0000
@@ -197,3 +197,16 @@
 
 <!-- Logs panel -->
 <!ENTITY logs_title "Žurnál příkazů před zabalením">
+
+<!-- Simulator Options -->
+<!ENTITY simulator_title "Možnosti Simulátoru">
+<!ENTITY simulator_remove "Odstranit Simulátor">
+<!ENTITY simulator_reset "Obnovit výchozí">
+<!ENTITY simulator_name "Jméno">
+<!ENTITY simulator_software "Software">
+<!ENTITY simulator_version "Verze">
+<!ENTITY simulator_profile "Profil">
+<!ENTITY simulator_hardware "Hardware">
+<!ENTITY simulator_device "Zařízení">
+<!ENTITY simulator_screenSize "Obrazovka">
+<!ENTITY simulator_pixelRatio "Poměr pixelů">
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/webide.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/webide.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/devtools/webide.properties	2015-05-13 18:07:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/devtools/webide.properties	2015-05-25 20:45:42.000000000 +0000
@@ -19,8 +19,11 @@
 importHostedApp_title=Otevření hostované aplikace
 importHostedApp_header=Vložit URL manifestu
 
-notification_showTroubleShooting_label=odstraňování problémů
-notification_showTroubleShooting_accesskey=t
+selectCustomBinary_title=Volba vlastní verze B2G
+selectCustomProfile_title=Volba vlastního profilu Gaia
+
+notification_showTroubleShooting_label=Řešení problémů
+notification_showTroubleShooting_accesskey=e
 
 # LOCALIZATION NOTE (project_tab_loading): This is shown as a temporary tab
 # title for browser tab projects when the tab is still loading.
@@ -77,3 +80,9 @@
 
 # Device preferences and settings
 device_reset_default=Obnovit výchozí nastavení
+
+# Simulator options
+simulator_custom_device=Vlastní
+simulator_custom_binary=Vlastní verze B2G…
+simulator_custom_profile=Vlastní profil Gaia…
+simulator_default_profile=Použít výchozí
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/loop/loop.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/loop/loop.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/loop/loop.properties	2015-05-13 18:07:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/loop/loop.properties	2015-05-25 20:45:42.000000000 +0000
@@ -12,6 +12,19 @@
 rooms_tab_button_tooltip=Konverzace
 contacts_tab_button_tooltip=Kontakty
 
+## LOCALIZATION_NOTE(sign_in_again_title_line_one, sign_in_again_title_line_two2):
+## These are displayed together at the top of the panel when a user is needed to
+## sign-in again. The emphesis is on the first line to get the user to sign-in again,
+## and this is displayed in slightly larger font. Please arrange as necessary for
+## your locale.
+## {{clientShortname2}} will be replaced by the brand name for either string.
+sign_in_again_title_line_one=Prosím přihlašte se znovu
+sign_in_again_title_line_two2=nadále používat {{clientShortname2}}
+sign_in_again_button=Přihlásit se
+## LOCALIZATION_NOTE(sign_in_again_use_as_guest_button2): {{clientSuperShortname}}
+## will be replaced by the super short brandname.
+sign_in_again_use_as_guest_button2=Použít {{clientSuperShortname}} jako host
+
 ## LOCALIZATION_NOTE(first_time_experience.title): clientShortname will be
 ## replaced by the brand name
 first_time_experience_title={{clientShortname}} — Připojit se ke konverzaci
@@ -107,7 +120,7 @@
 ## LOCALIZATION NOTE (add_or_import_contact_title): This is the subtitle of the
 ## panel.
 add_or_import_contact_title=Přidat nebo importovat kontakt
-import_contacts_button=Import
+import_contacts_button2=Importovat z Googlu
 importing_contacts_progress_button=Probíhá import…
 import_contacts_failure_message=Některé kontakty nemohly být naimportovány. Zkuste to prosím znovu.
 ## LOCALIZATION NOTE(import_contacts_success_message): Success notification message
@@ -128,7 +141,7 @@
 
 ## LOCALIZATION NOTE(remove_contact_menu_button): Displayed in the contact list in
 ## a pop-up menu next to the contact's name.
-remove_contact_menu_button=Odebrat kontakt
+remove_contact_menu_button2=Odebrat kontakt…
 ## LOCALIZATION NOTE(confirm_delete_contact_alert): This is an alert that is displayed
 ## to confirm deletion of a contact.
 confirm_delete_contact_alert=Jste si jisti, že chcete smazat tento kontakt?
@@ -195,7 +208,7 @@
 unmute_local_video_button_title=Zrušit vypnutí videa
 active_screenshare_button_title=Ukončit sdílení
 inactive_screenshare_button_title=Sdílet obrazovku
-share_tabs_button_title=Sdílet mé panely
+share_tabs_button_title2=Sdílet vaše panely
 share_windows_button_title=Sdílet jiná okna
 
 ## LOCALIZATION NOTE (call_with_contact_title): The title displayed
@@ -248,6 +261,7 @@
 cannot_start_call_session_not_ready=Nepodařilo se zahájit hovor, relace není připravena.
 network_disconnected=Síťové spojení bylo náhle ukončeno.
 connection_error_see_console_notification=Hovor selhal. Podívejte se do konzole na detaily.
+no_media_failure_message=Kamera nebo mikrofon nebyly nalezeny.
 
 ## LOCALIZATION NOTE (legal_text_and_links3): In this item, don't translate the
 ## parts between {{..}} because these will be replaced with links with the labels
@@ -304,9 +318,7 @@
 rooms_list_delete_tooltip=Smaže konverzaci
 rooms_list_deleteConfirmation_label=Jste si jisti?
 rooms_list_no_current_conversations=Žádné aktuální konverzace
-rooms_name_this_room_label=Název této konverzace
-rooms_name_this_room_tooltip2=Klepněte pro úpravu názvu konverzace
-rooms_name_change_failed_label=Konverzace nemůže být přejmenována
+rooms_change_failed_label=Konverzace nemůže být aktualizována
 rooms_new_room_button_label=Zahájit konverzaci
 rooms_only_occupant_label=Jste zde první.
 rooms_panel_title=Volba konverzace nebo zahájení nové
@@ -338,4 +350,11 @@
 ## The quotes around the title are intentional.
 context_edit_activate_label=Bavme se o "{{title}}"
 context_edit_name_placeholder=Jméno konverzace
-context_edit_comments_placeholder=Komentáře
\ No newline at end of file
+context_edit_comments_placeholder=Komentáře
+context_add_some_label=Přidat nějaký kontext
+context_edit_tooltip=Upraví kontext
+context_hide_tooltip=Skryje kontext
+context_show_tooltip=Zobrazí kontext
+context_save_label=Uložit kontext
+context_link_modified=Tento odkaz byl upraven.
+context_learn_more_link_label=Zjistit více.
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/newTab.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/newTab.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/newTab.dtd	2015-05-13 18:07:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/newTab.dtd	2015-05-25 20:45:42.000000000 +0000
@@ -4,6 +4,10 @@
 
 <!-- These strings are used in the about:newtab page -->
 <!ENTITY newtab.pageTitle "Nový panel">
+<!ENTITY newtab.customize.classic "Zobrazit vaše top stránky">
+<!ENTITY newtab.customize.cog.enhanced "Zahrnout doporučené stránky">
+<!ENTITY newtab.customize.cog.title "Ovládání nového panelu">
+<!ENTITY newtab.customize.cog.learn "Zjistit více o novém panelu">
 <!ENTITY newtab.customize.title "Přizpůsobení stránky nového panelu">
 <!ENTITY newtab.customize.suggested "Zobrazit návrhy a top stránky">
 <!ENTITY newtab.customize.topsites "Zobrazit vaše top stránky">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/newTab.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/newTab.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/newTab.properties	2015-05-13 18:07:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/newTab.properties	2015-05-25 20:45:42.000000000 +0000
@@ -9,6 +9,10 @@
 # and enhanced tiles on the same line as the tile's title, so prefer short
 # strings to avoid overlap. This string should be uppercase.
 newtab.sponsored.button=SPONZOROVÁNO
+# LOCALIZATION NOTE(newtab.suggested.button): This text appears for sponsored
+# and suggested tiles on the same line as the tile's title, so prefer short
+# strings to avoid overlap. This string should be uppercase.
+newtab.suggested.tag=NAVRŽENO
 # LOCALIZATION NOTE(newtab.suggested.button): %1$S will be replaced inline by
 # one of the user's top 100 sites that triggered this suggested tile.
 # This text appears for suggested tiles under the tile's title, so prefer short
@@ -18,6 +22,10 @@
 # the (X) block icon. %2$S will be replaced by an active link using string
 # newtab.learn.link as text.
 newtab.sponsored.explain=Tento náhled se vám zobrazuje, protože se jedná o partnera Mozilly. Můžete jej kdykoliv odebrat klepnutím na tlačítko %1$S. %2$S
+# LOCALIZATION NOTE(newtab.sponsored.explain2): %1$S will be replaced inline by
+# the (X) block icon. %2$S will be replaced by an active link using string
+# newtab.learn.link as text.
+newtab.sponsored.explain2=Tento server se vám zobrazuje, protože se jedná o partnera Mozilly. Můžete jej kdykoliv odebrat klepnutím na tlačítko %1$S. %2$S
 # LOCALIZATION NOTE(newtab.suggested.explain): %1$S will be replaced inline by
 # the (X) block icon. %2$S will be replaced by an active link using string
 # newtab.learn.link as text.
@@ -35,5 +43,36 @@
 # LOCALIZATION NOTE(newtab.intro.paragraph3): %1$S will be replaced inline by
 # the gear icon used to customize the new tab window.
 newtab.intro.paragraph3=Náhledy můžete vypnout v předvolbách, které získáte klepnutím na tlačítko %1$S. 
+# LOCALIZATION NOTE(newtab.intro.paragraph4): %1$S will be replaced inline by
+# the gear icon used to customize the new tab window. %2$S will be replaced by
+# newtab.intro.controls as text
+newtab.intro.paragraph4=Tuto funkci můžete vypnout klepnutím na tlačítko (%1$S) a zvolením "Zobrazit prázdnou stránku" v nabídce %2$S.
+newtab.intro.paragraph5=Nový panel zobrazí servery, které navštěvujete nejčastěji spolu s místy, o kterých si myslíme, že by vás mohla zajímat. Chcete-li začít, uvidíte několik stránek z Mozilly.
+# LOCALIZATION NOTE(newtab.intro.paragraph6): %1$S will be replaced by
+# newtab.intro.paragraph6.remove as bold text. %2$S will be replaced by
+# newtab.intro.paragraph6.pin as bold text
+newtab.intro.paragraph6=Můžete %1$S nebo %2$S libovolný web pomocí ovládání dostupných na převrácení.
+newtab.intro.paragraph6.remove=odstranit
+newtab.intro.paragraph6.pin=připnout
+newtab.intro.paragraph7=Některé ze stránek, které uvidíte, mohou být navrhnuty Mozillou a mohou být sponzorovány partnery Mozilly. Vždy říkáme, které náhledy jsou sponzorované. %1$S
+# LOCALIZATION NOTE(newtab.intro.paragraph8): %1$S will be replaced by
+# brandShortName as text. %2$S will be replaced inline by an active link using
+# string newtab.learn.link as text.
+newtab.intro.paragraph8=%1$S bude zobrazovat pouze ty stránky, které nejvíce odpovídají vašim zájmům na webu.  %2$S
+newtab.intro.paragraph9=Nyní, když otevřete novou záložku, uvidíte také stránky, o kterých si myslíme, že by vás mohly zajímat.
+# LOCALIZATION NOTE(newtab.intro.controls): the controls in the gear icon
+# menu for customizing the new tab window. Used in newtab.intro.paragraph4
+newtab.intro.controls=Ovládání nového panelu
 newtab.learn.link=Zjistit více…
-newtab.privacy.link=Poznámka k soukromí
\ No newline at end of file
+newtab.privacy.link=Poznámka k soukromí
+newtab.learn.link2=Více o novém panelu
+newtab.privacy.link2=O vašem soukromí
+# LOCALIZATION NOTE(newtab.intro.header.welcome): %1$S will be replaced by
+# brandShortName as bold text.
+newtab.intro.header.welcome=Vítejte v novém panelu na %1$S!
+newtab.intro.header.update=Nový panel dostal aktualizaci!
+newtab.intro.skip=Přeskočit
+newtab.intro.continue=Pokračovat v průvodci
+newtab.intro.back=Zpět
+newtab.intro.next=Další
+newtab.intro.gotit=Rozumím!
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/places/places.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/places/places.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/places/places.dtd	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/places/places.dtd	2015-05-25 20:45:42.000000000 +0000
@@ -85,7 +85,6 @@
 <!ENTITY col.url.label "Adresa">
 <!ENTITY col.mostrecentvisit.label "Poslední návštěva">
 <!ENTITY col.visitcount.label "Počet návštěv">
-<!ENTITY col.keyword.label "Klíčové slovo">
 <!ENTITY col.description.label "Popis">
 <!ENTITY col.dateadded.label "Přidáno">
 <!ENTITY col.lastmodified.label "Poslední změna">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/places/places.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/places/places.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/places/places.properties	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/places/places.properties	2015-05-25 20:45:42.000000000 +0000
@@ -36,8 +36,6 @@
 view.sortBy.1.date.accesskey=l
 view.sortBy.1.visitCount.label=Dle počtu návštěv
 view.sortBy.1.visitCount.accesskey=o
-view.sortBy.1.keyword.label=Dle klíčového slova
-view.sortBy.1.keyword.accesskey=k
 view.sortBy.1.description.label=Dle popisu
 view.sortBy.1.description.accesskey=p
 view.sortBy.1.dateAdded.label=Dle přidání
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/preferences/aboutPermissions.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/preferences/aboutPermissions.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/preferences/aboutPermissions.dtd	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/preferences/aboutPermissions.dtd	2015-05-25 20:45:42.000000000 +0000
@@ -42,5 +42,7 @@
 <!ENTITY popup.label "Otevírat vyskakovací okna">
 
 <!ENTITY fullscreen.label "Celá obrazovka">
+
+<!ENTITY push.label                      "Přijímat nabízená upozornění">
 <!ENTITY camera.label                    "Použít kameru">
 <!ENTITY microphone.label                "Použít mikrofón">
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/preferences/advanced.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/preferences/advanced.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/preferences/advanced.dtd	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/preferences/advanced.dtd	2015-05-25 20:45:42.000000000 +0000
@@ -79,8 +79,6 @@
      in preferences.properties -->
 <!ENTITY updateAuto1.label               "Instalovat aktualizace automaticky (doporučováno z důvodu vyšší bezpečnosti)">
 <!ENTITY updateAuto1.accesskey           "I">
-<!ENTITY updateAutoMetro.label           "Instalovat aktualizace automaticky z desktopu i vzhledu aplikace &brandShortName; pro Windows 8">
-<!ENTITY updateAutoMetro.accesskey       "s">
 <!ENTITY updateCheck.label               "Vyhledávat aktualizace, ale dotázat se, zda mají být nainstalovány">
 <!ENTITY updateCheck.accesskey           "e">
 <!ENTITY updateManual.label              "Nikdy nevyhledávat aktualizace (nedoporučováno z důvodu rizika ohrožení)">
@@ -89,8 +87,6 @@
 <!ENTITY updateAutoAddonWarn.label       "Upozornit, pokud by aktualizace zakázala některé doplňky">
 <!ENTITY updateAutoAddonWarn.accesskey "U">
 
-<!ENTITY updateAutoMetroWarn.label       "(Styl aplikace &brandShortName; pro Windows 8 nekontroluje kompatibilitu doplňků)">
-
 <!ENTITY updateHistory.label "Zobrazit historii aktualizací">
 <!ENTITY updateHistory.accesskey "b">
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/preferences/main.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/preferences/main.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/preferences/main.dtd	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/preferences/main.dtd	2015-05-25 20:45:42.000000000 +0000
@@ -41,3 +41,5 @@
 <!ENTITY separateProfileMode.label        "Povolit současné spuštění aplikací &brandShortName; a Firefox">
 <!ENTITY useFirefoxSync.label             "Tip: Budou použity oddělené uživatelské profily. Pro sdílení dat mezi nimi můžete použít službu Sync.">
 <!ENTITY getStarted.label                 "Začít používat Sync…">
+
+<!ENTITY e10sEnabled.label                "Povolit multiprocesový &brandShortName;">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/preferences/preferences.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/preferences/preferences.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/preferences/preferences.properties	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/preferences/preferences.properties	2015-05-25 20:45:42.000000000 +0000
@@ -136,11 +136,6 @@
 #   %2$S = unit (MB, KB, etc.)
 actualAppCacheSize=Velikost mezipaměti webových aplikací je %1$S %2$S
 
-###Preferences::Advanced::Update
-#LOCALIZATION NOTE: The next string is for updating in Windows 8 only instead of updateAuto1.label.  %S = brandShortName
-updateAutoDesktop.label=Instalovat aktualizace automaticky z desktopové verze aplikace %S
-updateAutoDesktop.accessKey=I
-
 syncUnlink.title=Odpojení zařízení
 syncUnlink.label=Toto zařízení nebude již dále připojeno k vašemu účtu Sync. Všechna vaše osobní data, jak v zařízení, tak v účtu Sync, zůstanou nedotčena.
 syncUnlinkConfirm.label=Odpojit
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd	2015-05-25 20:45:42.000000000 +0000
@@ -12,6 +12,11 @@
 <!ENTITY safeb.blocked.malwarePage.shortDesc "Tato webová stránka na serveru <span id='malware_sitename'/> byla nahlášena jako útočná stránka a proto byla na základě vašeho bezpečnostního nastavení zablokována.">
 <!ENTITY safeb.blocked.malwarePage.longDesc "<p>Útočné stránky se pokouší nainstalovat programy, které kradou vaše důvěrná data, používají váš počítač k dalším útokům, nebo jakkoliv poničí váš systém.</p><p>Některé stránky poskytují škodlivý software záměrně, řada z nich byla ale sama napadena a činí tak bez vědomí jejich vlastníků.</p>">
 
+<!ENTITY safeb.blocked.unwantedPage.title "Nahlášena nevyžádaná softwarová stránka">
+<!-- Localization note (safeb.blocked.malware.shortDesc) - Please don't translate the contents of the <span id="unwanted_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
+<!ENTITY safeb.blocked.unwantedPage.shortDesc "Tato webová stránka na serveru <span id='unwanted_sitename'/> byla nahlášena, že obsahuje nežádoucí software a byla zablokována na základě vašeho bezpečnostního nastavení.">
+<!ENTITY safeb.blocked.unwantedPage.longDesc "<p>Nežádoucí softwarové stránky se pokouší nainstalovat software, který může být klamný a ovlivnit váš systém neočekávanými způsoby.</p>">
+
 <!ENTITY safeb.blocked.phishingPage.title "Nahlášená podvodná stránka!">
 <!-- Localization note (safeb.blocked.phishing.shortDesc) - Please don't translate the contents of the <span id="phishing_sitename"/> tag. It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
 <!ENTITY safeb.blocked.phishingPage.shortDesc "Tato webová stránka na serveru <span id='phishing_sitename'/> byla nahlášena jako podvodná stránka a proto byla na základě vašeho bezpečnostního nastavení zablokována.">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/sitePermissions.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/sitePermissions.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/sitePermissions.properties	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/sitePermissions.properties	2015-05-25 20:45:42.000000000 +0000
@@ -18,4 +18,5 @@
 permission.indexedDB.label = Spravovat offline úložiště
 permission.fullscreen.label = Režim celé obrazovky
 permission.pointerLock.label = Skrývat ukazatel myši
+permission.push.label = Příjem nabízených upozornění
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/syncSetup.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/syncSetup.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/syncSetup.dtd	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/syncSetup.dtd	2015-05-25 20:45:42.000000000 +0000
@@ -33,8 +33,6 @@
 <!ENTITY setup.choosePassword.accesskey "h">
 <!ENTITY setup.confirmPassword.label "Kontrola hesla">
 <!ENTITY setup.confirmPassword.accesskey "K">
-<!ENTITY setup.setupMetro.label     "Synchronizovat s &brandShortName; pro Windows 8">
-<!ENTITY setup.setupMetro.accesskey "S">
 
 <!-- LOCALIZATION NOTE: tosAgree1, tosLink, tosAgree2, ppLink, tosAgree3 are
      joined with implicit white space, so spaces in the strings aren't necessary -->
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/tabbrowser.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/tabbrowser.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/browser/tabbrowser.properties	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/browser/tabbrowser.properties	2015-05-25 20:45:42.000000000 +0000
@@ -18,7 +18,7 @@
 tabs.downloading=Stahování…
 
 tabs.emptyTabTitle=Nový panel
-tabs.closeTab=Zavře panel
+tabs.closeTab=Zavřít panel
 tabs.close=Zavřít
 tabs.closeWarningTitle=Potvrdit zavření ostatních panelů
 # LOCALIZATION NOTE (tabs.closeWarningMultiple):
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/overrides/appstrings.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/overrides/appstrings.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/overrides/appstrings.properties	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/overrides/appstrings.properties	2015-05-25 20:45:42.000000000 +0000
@@ -30,6 +30,7 @@
 externalProtocolChkMsg=Zapamatovat si tuto volbu pro všechny odkazy stejného typu.
 externalProtocolLaunchBtn=Spustit aplikaci
 malwareBlocked=Stránka %S byla nahlášena jako útočná stránka a tak byla na základě vašeho nastavení zablokována.
+unwantedBlocked=Stránka %S byla nahlášena jako stránka s nevyžádaným software a byla zablokována na základě vašeho bezpečnostního nastavení.
 phishingBlocked=Stránka %S byla nahlášena jako podvodná stránka, jejíž účelem je vylákat z uživatelů jejich osobní či finanční informace.
 cspBlocked=Bezpečnostní pravidla této stránky jí nedovolí, aby byla načítána tímto způsobem.
 corruptedContentError=Stránka, kterou se snažíte načíst, nemůže být zobrazena, jelikož v přenesená data jsou chybná.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/overrides/netError.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/overrides/netError.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/chrome/overrides/netError.dtd	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/chrome/overrides/netError.dtd	2015-05-25 20:45:42.000000000 +0000
@@ -164,6 +164,11 @@
 <p>Vlastníci webových stránek, kteří jsou přesvědčení, že jejich stránky byly nahlášeny omylem jako útočné, mohou <a href='http://www.stopbadware.org/home/reviewinfo' >požádat o kontrolu</a>.</p>
 ">
 
+<!ENTITY unwantedBlocked.title "Podezdřelá nevyžádaná stránka se software!">
+<!ENTITY unwantedBlocked.longDesc "
+<p>Nežádoucí stránka se software se pokouší nainstalovat software, který může být klamavý a ovlivnit váš systém neočekávanými způsoby.</p>
+">
+
 <!ENTITY phishingBlocked.title "Podezřelá podvodná stránka!">
 <!ENTITY phishingBlocked.longDesc "
 <p>Vložení osobních informací na takovéto stránce může skočit krádeží identity nebo jiným podvodem.</p>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/profile/bookmarks.inc firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/profile/bookmarks.inc
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/browser/profile/bookmarks.inc	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/browser/profile/bookmarks.inc	2015-05-25 20:45:42.000000000 +0000
@@ -37,9 +37,4 @@
 # link title for http://en-US.www.mozilla.com/en-US/firefox/about/
 #define firefox_about O nás
 
-# LOCALIZATION NOTE (firefox_feedback):
-# link title for browser feedback page
-# currently used by Metro only: https://input.mozilla.org/feedback/metrofirefox
-#define firefox_feedback Zpětná vazba
-
 #unfilter emptyLines
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/chat/xmpp.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/chat/xmpp.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/chat/xmpp.properties	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/chat/xmpp.properties	2015-05-25 20:45:42.000000000 +0000
@@ -46,6 +46,10 @@
 conversation.error.joinFailed=Připojení se nepodařilo: %S
 conversation.error.joinFailedNotAuthorized=Je vyžadována registrace: Nemáte oprávnění pro připojení do této místnosti.
 conversation.error.creationFailedNotAllowed=Omezený přístup: Nemáte oprávnění vytvářet místnosti.
+#   This is displayed in a conversation as an error message when remote server
+#   is not found.
+#   %S is the name of MUC room.
+conversation.error.joinFailedRemoteServerNotFound=Nelze se připojit do místnosti %S, protože se server, na kterém je umístěna, se nedaří spojit.
 #   These are displayed in a conversation as a system error message.
 conversation.error.remoteServerNotFound=Připojení k serveru příjemce se nezdařilo
 conversation.error.unknownError=Neznámá chyba
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/dom/chrome/appstrings.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/dom/chrome/appstrings.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/dom/chrome/appstrings.properties	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/dom/chrome/appstrings.properties	2015-05-25 20:45:42.000000000 +0000
@@ -29,6 +29,7 @@
 externalProtocolChkMsg=Zapamatovat si tuto volbu pro všechny odkazy stejného typu.
 externalProtocolLaunchBtn=Spustit aplikaci
 malwareBlocked=Tato stránka na %S byla nahlášena jako podvodná stránka a tak na základě vašeho nastavení byla zablokována.
+unwantedBlocked=Stránka %S byla nahlášena jako stránka s nevyžádaným software a byla zablokována na základě vašeho bezpečnostního nastavení.
 phishingBlocked=Stránka %S byla nahlášena jako podvodná stránka, jejíž účelem je vylákat z uživatelů jejich osobní či finanční informace.
 cspBlocked=Bezpečnostní pravidla této stránky jí nedovolí, aby byla načtena tímto způsobem.
 corruptedContentError=Stránka, kterou se snažíte načíst, nemůže být zobrazena, jelikož v přenesená data jsou chybná.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/dom/chrome/dom/dom.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/dom/chrome/dom/dom.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/dom/chrome/dom/dom.properties	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/dom/chrome/dom/dom.properties	2015-05-25 20:45:42.000000000 +0000
@@ -163,3 +163,7 @@
 WillChangeBudgetWarning=Spotřeba paměti will-change je příliš vysoká. Oblast okrytí je %1$S bodů, dostupné množství je plocha dokumentu vynásobená hodnotou %2$S (%3$S bodů). Všechny výskyty will-change budou v dokumentu ignorovány, jakmile se dostupné množství překročí.
 # LOCALIZATION NOTE: Do not translate "ServiceWorker".
 HittingMaxWorkersPerDomain=ServiceWorker nemůže být okamžitě spuštěn, protože ostatní dokumenty ze stejného zdroje již používají maximální počet pracovníků. ServiceWorker je nyní ve frontě a bude spuštěn jakmile nějaký pracovník dokončí svou činnost.
+# LOCALIZATION NOTE: Do no translate "setVelocity", "PannerNode", "AudioListener", "speedOfSound" and "dopplerFactor"
+PannerNodeDopplerWarning=Použití setVelocity nad PannerNode a AudioListener či speedOfSound a dopplerFactor nad AudioListener je zastaralé a tito členové budou odebráni. Pro více informací navštivte https://developer.mozilla.org/en-US/docs/Web/API/AudioListener#Deprecated_features   
+# LOCALIZATION NOTE: Do not translate "Worker".
+EmptyWorkerSourceWarning=Pokoušíte se vytvořit Worker nad prázdným zdrojem. To je patrně neúmyslné. 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/dom/chrome/netError.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/dom/chrome/netError.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/dom/chrome/netError.dtd	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/dom/chrome/netError.dtd	2015-05-25 20:45:42.000000000 +0000
@@ -82,6 +82,11 @@
 <p>Vlastníci webových stránek, kteří jsou přesvědčení, že jejich stránky byly nahlášeny omylem jako útočné, mohou <a href='http://www.stopbadware.org/home/reviewinfo' >požádat o kontrolu</a>.</p>
 ">
 
+<!ENTITY unwantedBlocked.title "Podezdřelá nevyžádaná stránka se software!">
+<!ENTITY unwantedBlocked.longDesc "
+<p>Nežádoucí stránka se software se pokouší nainstalovat software, který může být klamavý a ovlivnit váš systém neočekávanými způsoby.</p>
+">
+
 <!ENTITY phishingBlocked.title "Podezřelá podvodná stránka!">
 <!ENTITY phishingBlocked.longDesc "
 <p>Vložení osobních informací na takovéto stránce může skočit krádeží identity nebo jiným podvodem.</p>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/dom/chrome/security/csp.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/dom/chrome/security/csp.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/dom/chrome/security/csp.properties	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/dom/chrome/security/csp.properties	2015-05-25 20:45:42.000000000 +0000
@@ -29,6 +29,13 @@
 # LOCALIZATION NOTE (ignoringUnknownOption):
 # %1$S is the option that could not be understood
 ignoringUnknownOption = Ignorována neznámá možnost %1$S
+# LOCALIZATION NOTE (ignoringDuplicateSrc):
+# %1$S defines the duplicate src
+ignoringDuplicateSrc = Duplicitní zdroje %1$S jsou ignorovány.
+# LOCALIZATION NOTE (ignoringSrcWithinScriptSrc):
+# %1$S is the ignored src
+# script-src is a directive name and should not be localized
+ignoringSrcWithinScriptSrc = Ignorování "%1$S" uvnitř script-src: určeny nonce-source či hash-source   
 # LOCALIZATION NOTE (reportURInotETLDPlus1):
 # %1$S is the ETLD of the report URI that could not be used
 reportURInotHttpsOrHttp2 = URI reportu (%1$S) by mělo být HTTP nebo HTTPS URI.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/security/manager/chrome/pipnss/pipnss.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/security/manager/chrome/pipnss/pipnss.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/security/manager/chrome/pipnss/pipnss.properties	2015-05-13 18:07:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/security/manager/chrome/pipnss/pipnss.properties	2015-05-25 20:45:42.000000000 +0000
@@ -110,6 +110,10 @@
 CertDumpAnsiX9DsaSignature=Podpis ANSI X9.57 s DSA
 CertDumpAnsiX9DsaSignatureWithSha1=Podpis ANSI X9.57 DSA s SHA1 součtem
 CertDumpAnsiX962ECDsaSignatureWithSha1=Podpis ANSI X9.57 ECDSA s SHA1
+CertDumpAnsiX962ECDsaSignatureWithSha224=Podpis ANSI X9.62 ECDSA s SHA224
+CertDumpAnsiX962ECDsaSignatureWithSha256=Podpis ANSI X9.62 ECDSA s SHA256
+CertDumpAnsiX962ECDsaSignatureWithSha384=Podpis ANSI X9.62 ECDSA s SHA384
+CertDumpAnsiX962ECDsaSignatureWithSha512=Podpis ANSI X9.62 ECDSA s SHA512
 CertDumpKUSign=Podpisování
 CertDumpKUNonRep=Nepopiratelnost
 CertDumpKUEnc=Zašifrování klíče
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/toolkit/chrome/global/aboutServiceWorkers.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/toolkit/chrome/global/aboutServiceWorkers.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/toolkit/chrome/global/aboutServiceWorkers.dtd	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/toolkit/chrome/global/aboutServiceWorkers.dtd	2015-05-25 20:45:42.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/. -->
+
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY aboutServiceWorkers.title                     "O Service Worker">
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY aboutServiceWorkers.maintitle                 "Registrovaní Service Workers">
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY aboutServiceWorkers.warning_not_enabled       "Service Workers nejsou povoleny.">
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY aboutServiceWorkers.warning_no_serviceworkers "Není zaregistrován žádný Service Worker.">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/toolkit/chrome/global/aboutServiceWorkers.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/toolkit/chrome/global/aboutServiceWorkers.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/toolkit/chrome/global/aboutServiceWorkers.properties	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/toolkit/chrome/global/aboutServiceWorkers.properties	2015-05-25 20:45:42.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/.
+
+title = Původ: %S
+
+# LOCALIZATION NOTE: %1$S is brandShortName, %2$2 is the application ID, and $%$3 is true/false value.
+# LOCALIZATION NOTE: the term "InBrowserElement" should not be translated
+b2gtitle = ID aplikace %2$S v prohlížeči %1$S - InBrowserElement %3$S
+
+scope = Rozsah:
+
+scriptSpec = Specifikace skriptu:
+
+# LOCALIZATION NOTE: the term "Worker" should not be translated.
+currentWorkerURL = URL aktuálního Worker:
+
+activeCacheName = Název aktivní vyrovnávací paměti:
+
+waitingCacheName = Čekající název vyrovnávací paměti:
+
+true = true
+
+false = false
+
+# LOCALIZATION NOTE this term is used as a button label (verb, not noun).
+update = Aktualizovat
+
+unregister = Odregistrace
+
+waiting = Čekání…
+
+# LOCALIZATION NOTE: the term "Service Worker" should not translated.
+unregisterError = Chyba při rušení registrace tohoto Service Worker.
+
+pushEndpoint = Push Endpoint:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/toolkit/chrome/global/aboutSupport.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/toolkit/chrome/global/aboutSupport.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/toolkit/chrome/global/aboutSupport.dtd	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/toolkit/chrome/global/aboutSupport.dtd	2015-05-25 20:45:42.000000000 +0000
@@ -57,6 +57,9 @@
 <!ENTITY aboutSupport.appBasicsUserAgent "Identifikace prohlížeče">
 <!ENTITY aboutSupport.appBasicsMemoryUse "Spotřeba paměti">
 
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY aboutSupport.appBasicsServiceWorkers "Registrovaní Service Workers">
+
 <!ENTITY aboutSupport.appBasicsMultiProcessSupport "Multiprocesová okna">
 
 <!ENTITY aboutSupport.showDir.label "Otevřít adresář">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/toolkit/chrome/global/aboutSupport.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/toolkit/chrome/global/aboutSupport.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/toolkit/chrome/global/aboutSupport.properties	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/toolkit/chrome/global/aboutSupport.properties	2015-05-25 20:45:42.000000000 +0000
@@ -37,6 +37,8 @@
 # "GPU Accelerated Windows: 0/2"
 acceleratedWindows=Grafická akcelerace Windows
 
+supportsHardwareH264 = Podporuje hardwarové dekódování H264
+
 # LOCALIZATION NOTE (rawDataCopied) Text displayed in a mobile "Toast" to user when the
 # raw data is successfully copied to the clipboard via button press.
 rawDataCopied=Data byla zkopírována
@@ -96,6 +98,7 @@
 multiProcessStatus = %1$S/%2$S (výchozí: %3$S)
 
 asyncPanZoom = Asynchronní lupa/panning
+apzNone = nic
 wheelEnabled = vstup kolečka povolen 
 touchEnabled = dotykový vstup povolen
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/toolkit/chrome/global/console.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/toolkit/chrome/global/console.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/toolkit/chrome/global/console.properties	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/toolkit/chrome/global/console.properties	2015-05-25 20:45:42.000000000 +0000
@@ -4,6 +4,7 @@
 
 typeError=Chyba:
 typeWarning=Varování:
+typeMessage=Zpráva:
 errFile=Zdrojový soubor: %S
 errLine=Řádek: %S
 errLineCol=Řádek: %S, Sloupec: %S
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/toolkit/chrome/global/devtools/gclicommands.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/toolkit/chrome/global/devtools/gclicommands.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/toolkit/chrome/global/devtools/gclicommands.properties	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/toolkit/chrome/global/devtools/gclicommands.properties	2015-05-25 20:45:42.000000000 +0000
@@ -0,0 +1,1567 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE These strings are used inside Web Console commands.
+# The Web Console command line is available from the Web Developer sub-menu
+# -> 'Web Console'.
+#
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# LOCALIZATION NOTE (helpDesc) A very short string used to describe the
+# function of the help command.
+helpDesc=Zobrazí nápovědu k dostupným příkazům
+
+# LOCALIZATION NOTE (helpAvailable) Used in the output of the help command to
+# explain the contents of the command help table.
+helpAvailable=Dostupné příkazy
+
+# LOCALIZATION NOTE (notAvailableInE10S) Used in the output of any command that
+# is not compatible with multiprocess mode (E10S).
+notAvailableInE10S=Příkaz '%1$S' není dostupný v multiprocesovém režimu (E10S)
+
+# LOCALIZATION NOTE (consoleDesc) A very short string used to describe the
+# function of the console command.
+consoleDesc=Příkazy ovládající konzolu
+
+# LOCALIZATION NOTE (consoleManual) A longer description describing the
+# set of commands that control the console.
+consoleManual=Filtruje, smaže nebo zavře webovou konzolu
+
+# LOCALIZATION NOTE (consoleclearDesc) A very short string used to describe the
+# function of the 'console clear' command.
+consoleclearDesc=Vymaže konzolu
+
+# LOCALIZATION NOTE (screenshotDesc) A very short description of the
+# 'screenshot' command. See screenshotManual for a fuller description of what
+# it does. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+screenshotDesc=Uloží obrázek stránky
+
+# LOCALIZATION NOTE (screenshotManual) A fuller description of the 'screenshot'
+# command, displayed when the user asks for help on what it does.
+screenshotManual=Uloží obrázek PNG celého viditelného okna (volitelně s prodlevou)
+
+# LOCALIZATION NOTE (screenshotFilenameDesc) A very short string to describe
+# the 'filename' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotFilenameDesc=Cílový soubor
+
+# LOCALIZATION NOTE (screenshotFilenameManual) A fuller description of the
+# 'filename' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotFilenameManual=Jméno souboru, do kterého se uloží náhled (mělo by mít příponu '.png').
+
+# LOCALIZATION NOTE (screenshotClipboardDesc) A very short string to describe
+# the 'clipboard' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotClipboardDesc=Kopírovat náhled do schránky? (true/false)
+
+# LOCALIZATION NOTE (screenshotClipboardManual) A fuller description of the
+# 'clipboard' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotClipboardManual=Pravda, pokud chcete kopírovat náhled do schránky místo jeho uložení do souboru.
+
+# LOCALIZATION NOTE (screenshotChromeDesc) A very short string to describe
+# the 'chrome' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+# The argument (%1$S) is the browser name.
+screenshotChromeDesc2=Zahrnout okno aplikace %1$S s ovládacími prvky? (true/false)
+
+# LOCALIZATION NOTE (screenshotChromeManual) A fuller description of the
+# 'chrome' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+# The argument (%1$S) is the browser name.
+screenshotChromeManual2=Pravda, pokud má náhled obsahovat celé okno aplikace %1$S s ovládacími prvky místo obsahu webové stránky.
+
+# LOCALIZATION NOTE (screenshotGroupOptions) A label for the optional options of
+# the screenshot command.
+screenshotGroupOptions=Možnosti
+
+# LOCALIZATION NOTE (screenshotGroupOptions) A label for the advanced options of
+# the screenshot command.
+screenshotAdvancedOptions=Pokročilé možnosti
+
+# LOCALIZATION NOTE (screenshotDelayDesc) A very short string to describe
+# the 'delay' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotDelayDesc=Prodleva (v sekundách)
+
+# LOCALIZATION NOTE (screenshotDelayManual) A fuller description of the
+# 'delay' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotDelayManual=Čas, který se čeká (v sekundách) před uložením náhledu
+
+# LOCALIZATION NOTE (screenshotFullscreenDesc) A very short string to describe
+# the 'fullscreen' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotFullPageDesc=Celou stránku? (true/false)
+
+# LOCALIZATION NOTE (screenshotFullscreenManual) A fuller description of the
+# 'fullscreen' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotFullPageManual=Pravda, pokud má být uložena celá stránka včetně částí mimo zobrazenou plochu.
+
+# LOCALIZATION NOTE (screenshotSelectorChromeConflict) Exception thwon when user
+# tries to use 'selector' option along with 'chrome' option of the screenshot
+# command. Refer: https://bugzilla.mozilla.org/show_bug.cgi?id=659268#c7
+screenshotSelectorChromeConflict=Volba selector není podporována se současně zapnutou volbou chrome
+
+# LOCALIZATION NOTE (screenshotGeneratedFilename) The auto generated filename
+# when no file name is provided. the first argument (%1$S) is the date string
+# in yyyy-mm-dd format and the second argument (%2$S) is the time string
+# in HH.MM.SS format. Please don't add the extension here.
+screenshotGeneratedFilename=Náhled dne %1$S v %2$S
+
+# LOCALIZATION NOTE (screenshotErrorSavingToFile) Text displayed to user upon
+# encountering error while saving the screenshot to the file specified.
+screenshotErrorSavingToFile=Chyba při ukládání do souboru
+
+# LOCALIZATION NOTE (screenshotSavedToFile) Text displayed to user when the
+# screenshot is successfully saved to the file specified.
+screenshotSavedToFile=Náhled uložen do souboru
+
+# LOCALIZATION NOTE (screenshotErrorCopying) Text displayed to user upon
+# encountering error while copying the screenshot to clipboard.
+screenshotErrorCopying=Při kopírování náhledu do schránky nastala chyba.
+
+# LOCALIZATION NOTE (screenshotCopied) Text displayed to user when the
+# screenshot is successfully copied to the clipboard.
+screenshotCopied=Náhled zkopírován do schránky.
+
+# LOCALIZATION NOTE (screenshotTooltip) Text displayed as tooltip for screenshot button in devtools ToolBox.
+screenshotTooltip=Vytvoří snímek celé stránky
+
+# LOCALIZATION NOTE (screenshotImgurDesc) A very short string to describe
+# the 'imgur' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotImgurDesc=Nahraje na imgur.com
+
+# LOCALIZATION NOTE (screenshotImgurManual) A fuller description of the
+# 'imgur' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotImgurManual=Použijte, pokud chcete nahrát obrázek na imgur.com na místo uložení na disk
+
+# LOCALIZATION NOTE (screenshotImgurError) Text displayed to user upon
+# encountering error while uploading the screenshot to imgur.com.
+screenshotImgurError=Nepodařilo se připojit k imgur API
+
+# LOCALIZATION NOTE (screenshotImgurUploading) Text displayed to user when the
+# screenshot is successfully sent to Imgur but the program is waiting on a response.
+# The argument (%1$S) is a new image URL at Imgur.
+screenshotImgurUploaded=Nahráno na %1$S
+
+# LOCALIZATION NOTE (highlightDesc) A very short description of the
+# 'highlight' command. See highlightManual for a fuller description of what
+# it does. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+highlightDesc=Zvýrazní uzly
+
+# LOCALIZATION NOTE (highlightManual) A fuller description of the 'highlight'
+# command, displayed when the user asks for help on what it does.
+highlightManual=Zvýrazní uzly, které na stránce odpovídají selektoru
+
+# LOCALIZATION NOTE (highlightSelectorDesc) A very short string to describe
+# the 'selector' parameter to the 'highlight' command, which is displayed in
+# a dialog when the user is using this command.
+highlightSelectorDesc=Selektor CSS
+
+# LOCALIZATION NOTE (highlightSelectorManual) A fuller description of the
+# 'selector' parameter to the 'highlight' command, displayed when the user
+# asks for help on what it does.
+highlightSelectorManual=Selektor CSS použitý na vyhledávání uzlů na stránce
+
+# LOCALIZATION NOTE (highlightOptionsDesc) The title of a set of options to
+# the 'highlight' command, displayed as a heading to the list of option.
+highlightOptionsDesc=Možnosti
+
+# LOCALIZATION NOTE (highlightHideGuidesDesc) A very short string to describe
+# the 'hideguides' option parameter to the 'highlight' command, which is
+# displayed in a dialog when the user is using this command.
+highlightHideGuidesDesc=Skryje okraje
+
+# LOCALIZATION NOTE (highlightHideGuidesManual) A fuller description of the
+# 'hideguides' option parameter to the 'highlight' command, displayed when the
+# user asks for help on what it does.
+highlightHideGuidesManual=Skryje okraje okolo zvýrazněného uzlu
+
+# LOCALIZATION NOTE (highlightShowInfoBarDesc) A very short string to describe
+# the 'showinfobar' option parameter to the 'highlight' command, which is
+# displayed in a dialog when the user is using this command.
+highlightShowInfoBarDesc=Zobrazí infopanel uzlu
+
+# LOCALIZATION NOTE (highlightShowInfoBarManual) A fuller description of the
+# 'showinfobar' option parameter to the 'highlight' command, displayed when the
+# user asks for help on what it does.
+highlightShowInfoBarManual=Zobrazí infopanel nad zvýrazněným uzlem (infopanel zobrazuje název značky, atributy a rozměry)
+
+# LOCALIZATION NOTE (highlightShowAllDesc) A very short string to describe
+# the 'showall' option parameter to the 'highlight' command, which is
+# displayed in a dialog when the user is using this command.
+highlightShowAllDesc=Zobrazí všechny výskyty
+
+# LOCALIZATION NOTE (highlightShowAllManual) A fuller description of the
+# 'showall' option parameter to the 'highlight' command, displayed when the
+# user asks for help on what it does.
+highlightShowAllManual=Pokud selektoru odpovídá velké množství uzlů, je kvůli zabránění zpomalení stránky zobrazeno pouze prvních 100. Použitím této volby zobrazíte všechny výskyty
+
+# LOCALIZATION NOTE (highlightRegionDesc) A very short string to describe the
+# 'region' option parameter to the 'highlight' command, which is displayed in a
+# dialog when the user is using this command.
+highlightRegionDesc=Oblast modelu boxu
+
+# LOCALIZATION NOTE (highlightRegionManual) A fuller description of the 'region'
+# option parameter to the 'highlight' command, displayed when the user asks for
+# help on what it does.
+highlightRegionManual=Která oblast modelu boxu by měla být zvýrazněna: 'content', 'padding', 'border' nebo 'margin' 
+
+# LOCALIZATION NOTE (highlightFillDesc) A very short string to describe the
+# 'fill' option parameter to the 'highlight' command, which is displayed in a
+# dialog when the user is using this command.
+highlightFillDesc=Styl výplně
+
+# LOCALIZATION NOTE (highlightFillManual) A fuller description of the 'fill'
+# option parameter to the 'highlight' command, displayed when the user asks for
+# help on what it does.
+highlightFillManual=Přepíše předvolený styl výplně oblasti vlastní barvou
+
+# LOCALIZATION NOTE (highlightKeepDesc) A very short string to describe the
+# 'keep' option parameter to the 'highlight' command, which is displayed in a
+# dialog when the user is using this command.
+highlightKeepDesc=Ponechá existující zvýraznění
+
+# LOCALIZATION NOTE (highlightKeepManual) A fuller description of the 'keep'
+# option parameter to the 'highlight' command, displayed when the user asks for
+# help on what it does.
+highlightKeepManual=Ve výchozím nastavení jsou při spuštění příkazu existující zvýraznění skryta. Tato volba mění toto chování
+
+# LOCALIZATION NOTE (highlightOutputConfirm) A confirmation message for the
+# 'highlight' command, displayed to the user once the command has been entered,
+# informing the user how many nodes have been highlighted successfully and how
+# to turn highlighting off
+highlightOutputConfirm2=%1$S uzel zvýrazněn;%1$S uzly zvýrazněny;%1$S uzlů zvýrazněno
+
+# LOCALIZATION NOTE (highlightOutputMaxReached) A confirmation message for the
+# 'highlight' command, displayed to the user once the command has been entered,
+# informing the user how many nodes have been highlighted successfully and that
+# some nodes could not be highlighted due to the maximum number of nodes being
+# reached, and how to turn highlighting off
+highlightOutputMaxReached=Počet odpovídajících uzlů: %1$S, ale zvýrazněno pouze %2$S. Pro zvýraznění všech použijte '--showall' 
+
+# LOCALIZATION NOTE (unhighlightDesc) A very short description of the
+# 'unhighlight' command. See unhighlightManual for a fuller description of what
+# it does. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+unhighlightDesc=Zruší zvýraznění všech uzlů
+
+# LOCALIZATION NOTE (unhighlightManual) A fuller description of the 'unhighlight'
+# command, displayed when the user asks for help on what it does.
+unhighlightManual=Zruší zvýraznění všech uzlů, které byly zvýrazněny pomocí příkazu 'highlight' 
+
+# LOCALIZATION NOTE (restartBrowserDesc) A very short description of the
+# 'restart' command. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+# The argument (%1$S) is the browser name.
+restartBrowserDesc=Restartuje aplikaci %1$S
+
+# LOCALIZATION NOTE (restartBrowserNocacheDesc) A very short string to
+# describe the 'nocache' parameter to the 'restart' command, which is
+# displayed in a dialog when the user is using this command.
+restartBrowserNocacheDesc=Zakáže načtení obsahu z mezipaměti 
+
+# LOCALIZATION NOTE (restartBrowserRequestCancelled) A string displayed to the
+# user when a scheduled restart has been aborted by the user.
+restartBrowserRequestCancelled=Restartování zrušeno uživatelem.
+
+# LOCALIZATION NOTE (restartBrowserRestarting) A string displayed to the
+# user when a restart has been initiated without a delay.
+# The argument (%1$S) is the browser name.
+restartBrowserRestarting=Restartování aplikace %1$S…
+
+# LOCALIZATION NOTE (inspectDesc) A very short description of the 'inspect'
+# command. See inspectManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+inspectDesc=Prozkoumá uzel
+
+# LOCALIZATION NOTE (inspectManual) A fuller description of the 'inspect'
+# command, displayed when the user asks for help on what it does.
+inspectManual=Otevře průzkumníka a zobrazí pomocí CSS vybraný prvek a prozkoumá jeho rozměry a vlastnosti
+
+# LOCALIZATION NOTE (inspectNodeDesc) A very short string to describe the
+# 'node' parameter to the 'inspect' command, which is displayed in a dialog
+# when the user is using this command.
+inspectNodeDesc=Selektor CSS
+
+# LOCALIZATION NOTE (inspectNodeManual) A fuller description of the 'node'
+# parameter to the 'inspect' command, displayed when the user asks for help
+# on what it does.
+inspectNodeManual=Selektor CSS používaný v Document.querySelector, který určuje jeden právě prvek
+
+# LOCALIZATION NOTE (eyedropperDesc) A very short description of the 'eyedropper'
+# command. See eyedropperManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+eyedropperDesc=Získá barvu ze stránky
+
+# LOCALIZATION NOTE (eyedropperManual) A fuller description of the 'eyedropper'
+# command, displayed when the user asks for help on what it does.
+eyedropperManual=Otevře panel, který zvětší zvolenou část stránky a zkopíruje definici barvy zvoleného pixelu
+
+# LOCALIZATION NOTE (eyedropperTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles the Eyedropper tool.
+eyedropperTooltip=Získá barvu ze stránky
+
+# LOCALIZATION NOTE (tiltDesc) A very short description of the 'tilt'
+# command. See tiltManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltDesc=Vizualizuje webovou stránku ve 3D
+
+# LOCALIZATION NOTE (tiltManual) A fuller description of the 'tilt'
+# command, displayed when the user asks for help on what it does.
+tiltManual=Umožní prozkoumat vztahy mezi prvky stránky a jejich potomky v prostředí 3D
+
+# LOCALIZATION NOTE (tiltOpenDesc) A very short description of the 'tilt inspect'
+# command. See tiltOpenManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltOpenDesc=Otevře průzkumníka v prostředí 3D
+
+# LOCALIZATION NOTE (tiltOpenManual) A fuller description of the 'tilt translate'
+# command, displayed when the user asks for help on what it does.
+tiltOpenManual=Otevře průzkumníka v prostředí 3D a volitelně pomocí CSS selektoru zvýrazní vybraný uzel
+
+# LOCALIZATION NOTE (tiltToggleTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles Tilt 3D View.
+tiltToggleTooltip=3D pohled
+
+# LOCALIZATION NOTE (tiltTranslateDesc) A very short description of the 'tilt translate'
+# command. See tiltTranslateManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltTranslateDesc=Posune 3D síť stránky
+
+# LOCALIZATION NOTE (tiltTranslateManual) A fuller description of the 'tilt translate'
+# command, displayed when the user asks for help on what it does.
+tiltTranslateManual=Posune 3D síť webové stránky v určitém směru
+
+# LOCALIZATION NOTE (tiltTranslateXDesc) A very short string to describe the
+# 'x' parameter to the 'tilt translate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltTranslateXDesc=X (body)
+
+# LOCALIZATION NOTE (tiltTranslateXManual) A fuller description of the 'x'
+# parameter to the 'translate' command, displayed when the user asks for help
+# on what it does.
+tiltTranslateXManual=Množství bodů, o které se posune 3D síť webové stránky ve směru osy X
+
+# LOCALIZATION NOTE (tiltTranslateYDesc) A very short string to describe the
+# 'y' parameter to the 'tilt translate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltTranslateYDesc=Y (body)
+
+# LOCALIZATION NOTE (tiltTranslateYManual) A fuller description of the 'y'
+# parameter to the 'translate' command, displayed when the user asks for help
+# on what it does.
+tiltTranslateYManual=Množství bodů, o které se posune 3D síť webové stránky ve směru osy Y
+
+# LOCALIZATION NOTE (tiltRotateDesc) A very short description of the 'tilt rotate'
+# command. See tiltRotateManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltRotateDesc=Otočí 3D síť stránky
+
+# LOCALIZATION NOTE (tiltRotateManual) A fuller description of the 'tilt rotate'
+# command, displayed when the user asks for help on what it does.
+tiltRotateManual=Otočí 3D síť webové stránky v určitém směru
+
+# LOCALIZATION NOTE (tiltRotateXDesc) A very short string to describe the
+# 'x' parameter to the 'tilt rotate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltRotateXDesc=X (stupně)
+
+# LOCALIZATION NOTE (tiltRotateXManual) A fuller description of the 'x'
+# parameter to the 'rotate' command, displayed when the user asks for help
+# on what it does.
+tiltRotateXManual=Velikost úhlu, o který se otočí 3D síť webové stránky kolem osy X
+
+# LOCALIZATION NOTE (tiltRotateYDesc) A very short string to describe the
+# 'y' parameter to the 'tilt rotate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltRotateYDesc=Y (stupně)
+
+# LOCALIZATION NOTE (tiltRotateYManual) A fuller description of the 'y'
+# parameter to the 'rotate' command, displayed when the user asks for help
+# on what it does.
+tiltRotateYManual=Velikost úhlu, o který se otočí 3D síť webové stránky kolem osy Y
+
+# LOCALIZATION NOTE (tiltRotateZDesc) A very short string to describe the
+# 'z' parameter to the 'tilt rotate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltRotateZDesc=Z (stupně)
+
+# LOCALIZATION NOTE (tiltRotateZManual) A fuller description of the 'z'
+# parameter to the 'rotate' command, displayed when the user asks for help
+# on what it does.
+tiltRotateZManual=Velikost úhlu, o který se otočí 3D síť webové stránky kolem osy Z
+
+# LOCALIZATION NOTE (tiltZoomDesc) A very short description of the 'tilt zoom'
+# command. See tiltZoomManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltZoomDesc=Změní měřítko 3D sítě stránky
+
+# LOCALIZATION NOTE (tiltZoomManual) A fuller description of the 'tilt zoom'
+# command, displayed when the user asks for help on what it does.
+tiltZoomManual=Posune 3D síť webové stránky ve směru osy Z
+
+# LOCALIZATION NOTE (tiltZoomAmountDesc) A very short string to describe the
+# 'zoom' parameter to the 'tilt zoom' command, which is displayed in a dialog
+# when the user is using this command.
+tiltZoomAmountDesc=Z (body)
+
+# LOCALIZATION NOTE (tiltZoomAmmuntManual) A fuller description of the 'zoom'
+# parameter to the 'zoom' command, displayed when the user asks for help
+# on what it does.
+tiltZoomAmountManual=Množství bodů, o které se posune 3D síť webové stránky ve směru osy Z
+
+# LOCALIZATION NOTE (tiltResetDesc) A very short description of the 'tilt reset'
+# command. See tiltResetManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltResetDesc=Obnoví výchozí hodnoty
+
+# LOCALIZATION NOTE (tiltResetManual) A fuller description of the 'tilt reset'
+# command, displayed when the user asks for help on what it does.
+tiltResetManual=Obnoví výchozí hodnoty posunu, otočení a měřítka 3D sítě webové stránky
+
+# LOCALIZATION NOTE (tiltCloseDesc) A very short description of the 'tilt close'
+# command. See tiltCloseManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltCloseDesc=Zavře 3D vizualizaci
+
+# LOCALIZATION NOTE (tiltCloseManual) A fuller description of the 'tilt close'
+# command, displayed when the user asks for help on what it does.
+tiltCloseManual=Zavře 3D vizualizaci a přepne zpět výchozího režimu průzkumníka
+
+# LOCALIZATION NOTE (debuggerClosed) Used in the output of several commands
+# to explain that the debugger must be opened first.
+debuggerClosed=Před použitím tohoto příkazu musí být debugger otevřený
+
+# LOCALIZATION NOTE (debuggerStopped) Used in the output of several commands
+# to explain that the debugger must be opened first.
+debuggerStopped=Před nastavením zarážky musí být debugger otevřen 
+
+# LOCALIZATION NOTE (breakDesc) A very short string used to describe the
+# function of the break command.
+breakDesc=Spravuje zarážky
+
+# LOCALIZATION NOTE (breakManual) A longer description describing the
+# set of commands that control breakpoints.
+breakManual=Příkazy pro vypsání, přidání a odstranění zarážek
+
+# LOCALIZATION NOTE (breaklistDesc) A very short string used to describe the
+# function of the 'break list' command.
+breaklistDesc=Zobrazí nastavené zarážky
+
+# LOCALIZATION NOTE (breaklistNone) Used in the output of the 'break list'
+# command to explain that the list is empty.
+breaklistNone=Žádné zarážky nejsou nastaveny
+
+# LOCALIZATION NOTE (breaklistOutRemove) A title used in the output from the
+# 'break list' command on a button which can be used to remove breakpoints
+breaklistOutRemove=Odebrat
+
+# LOCALIZATION NOTE (breakaddAdded) Used in the output of the 'break add'
+# command to explain that a breakpoint was added.
+breakaddAdded=Zarážka přidána
+
+# LOCALIZATION NOTE (breakaddFailed) Used in the output of the 'break add'
+# command to explain that a breakpoint could not be added.
+breakaddFailed=Nepodařilo se nastavit zarážku: %S
+
+# LOCALIZATION NOTE (breakaddDesc) A very short string used to describe the
+# function of the 'break add' command.
+breakaddDesc=Přidá zarážku
+
+# LOCALIZATION NOTE (breakaddManual) A longer description describing the
+# set of commands that are responsible for adding breakpoints.
+breakaddManual=Podporované typy zarážek: řádek
+
+# LOCALIZATION NOTE (breakaddlineDesc) A very short string used to describe the
+# function of the 'break add line' command.
+breakaddlineDesc=Přidá řádkovou zarážku
+
+# LOCALIZATION NOTE (breakaddlineFileDesc) A very short string used to describe
+# the function of the file parameter in the 'break add line' command.
+breakaddlineFileDesc=URI souboru JS
+
+# LOCALIZATION NOTE (breakaddlineLineDesc) A very short string used to describe
+# the function of the line parameter in the 'break add line' command.
+breakaddlineLineDesc=Číslo řádku
+
+# LOCALIZATION NOTE (breakdelDesc) A very short string used to describe the
+# function of the 'break del' command.
+breakdelDesc=Odebere zarážku
+
+# LOCALIZATION NOTE (breakdelBreakidDesc) A very short string used to describe
+# the function of the index parameter in the 'break del' command.
+breakdelBreakidDesc=Index zarážky
+
+# LOCALIZATION NOTE (breakdelRemoved) Used in the output of the 'break del'
+# command to explain that a breakpoint was removed.
+breakdelRemoved=Zarážka odebrána
+
+# LOCALIZATION NOTE (dbgDesc) A very short string used to describe the
+# function of the dbg command.
+dbgDesc=Spravuje debugger
+
+# LOCALIZATION NOTE (dbgManual) A longer description describing the
+# set of commands that control the debugger.
+dbgManual=Příkazy k přerušení a obnovení běhu hlavního vlákna, krokování kódu do, z a přes
+
+# LOCALIZATION NOTE (dbgOpen) A very short string used to describe the function
+# of the dbg open command.
+dbgOpen=Otevře debugger
+
+# LOCALIZATION NOTE (dbgClose) A very short string used to describe the function
+# of the dbg close command.
+dbgClose=Zavře debugger
+
+# LOCALIZATION NOTE (dbgInterrupt) A very short string used to describe the
+# function of the dbg interrupt command.
+dbgInterrupt=Pozastaví běh hlavního vlákna
+
+# LOCALIZATION NOTE (dbgContinue) A very short string used to describe the
+# function of the dbg continue command.
+dbgContinue=Obnoví běh hlavního vlákna dokud není skript ukončen nebo není nalezena zarážka.
+
+# LOCALIZATION NOTE (dbgStepDesc) A very short string used to describe the
+# function of the dbg step command.
+dbgStepDesc=Spravuje krokování
+
+# LOCALIZATION NOTE (dbgStepManual) A longer description describing the
+# set of commands that control stepping.
+dbgStepManual=Příkazy ke krokování kódu do, z a přes
+
+# LOCALIZATION NOTE (dbgStepOverDesc) A very short string used to describe the
+# function of the dbg step over command.
+dbgStepOverDesc=Spustí aktuální řádek kódu a zastaví u další. Pokud obsahuje aktuální řádek voláním funkce, spustí debugger celou funkci.
+
+# LOCALIZATION NOTE (dbgStepInDesc) A very short string used to describe the
+# function of the dbg step over command.
+dbgStepInDesc=Spustí aktuální řádek kódu a zastaví u další. Pokud obsahuje aktuální řádek voláním funkce, krokuje debugger kód i uvnitř funkce.
+
+# LOCALIZATION NOTE (dbgStepOutDesc) A very short string used to describe the
+# function of the dbg step over command.
+dbgStepOutDesc=Krokuje kód ven z aktuální funkce o jednu úroveň výše, pokud je funkce vnořená. V hlavním těle kódu je skript vykonán až do další zarážky nebo do konce. Přeskočené řádky kódu nejsou krokovány, ale vykonány jsou.
+
+# LOCALIZATION NOTE (dbgListSourcesDesc) A very short string used to describe the
+# function of the dbg list command.
+dbgListSourcesDesc=Vypíše seznam URL zdrojů nahraných v debuggeru
+
+# LOCALIZATION NOTE (dbgBlackBoxDesc) A very short string used to describe the
+# function of the 'dbg blackbox' command.
+dbgBlackBoxDesc=Přidá v debuggeru zdroje do black boxu
+
+# LOCALIZATION NOTE (dbgBlackBoxSourceDesc) A very short string used to describe the
+# 'source' parameter to the 'dbg blackbox' command.
+dbgBlackBoxSourceDesc=Přidá konkrétní zdroj do black boxu
+
+# LOCALIZATION NOTE (dbgBlackBoxGlobDesc) A very short string used to describe the
+# 'glob' parameter to the 'dbg blackbox' command.
+dbgBlackBoxGlobDesc=Přidá do black boxu všechny zdroje, které odpovídají pravidlu (například: "*.min.js")
+
+# LOCALIZATION NOTE (dbgBlackBoxInvertDesc) A very short string used to describe the
+# 'invert' parameter to the 'dbg blackbox' command.
+dbgBlackBoxInvertDesc=Inverze pravidla. Přidá black boxing pro každý zdroj, který není uveden nebo neodpovídá zadanému pravidlu.
+
+# LOCALIZATION NOTE (dbgBlackBoxEmptyDesc) A very short string used to let the
+# user know that no sources were black boxed.
+dbgBlackBoxEmptyDesc=(Žádný zdroj není v black boxu)
+
+# LOCALIZATION NOTE (dbgBlackBoxNonEmptyDesc) A very short string used to let the
+# user know which sources were black boxed.
+dbgBlackBoxNonEmptyDesc=Následující zdroje byly přidány do black boxu:
+
+# LOCALIZATION NOTE (dbgBlackBoxErrorDesc) A very short string used to let the
+# user know there was an error black boxing a source (whose url follows this
+# text).
+dbgBlackBoxErrorDesc=Chyba při black boxingu:
+
+# LOCALIZATION NOTE (dbgUnBlackBoxDesc) A very short string used to describe the
+# function of the 'dbg unblackbox' command.
+dbgUnBlackBoxDesc=Ukončí black boxing zdrojů v debuggeru.
+
+# LOCALIZATION NOTE (dbgUnBlackBoxSourceDesc) A very short string used to describe the
+# 'source' parameter to the 'dbg unblackbox' command.
+dbgUnBlackBoxSourceDesc=Ukončí black boxing u konkrétního zdroje.
+
+# LOCALIZATION NOTE (dbgUnBlackBoxGlobDesc) A very short string used to describe the
+# 'glob' parameter to the 'dbg blackbox' command.
+dbgUnBlackBoxGlobDesc=Ukončí black boxing všech zdrojů, které odpovídají pravidlu (například: "*.min.js")
+
+# LOCALIZATION NOTE (dbgUnBlackBoxEmptyDesc) A very short string used to let the
+# user know that we did not stop black boxing any sources.
+dbgUnBlackBoxEmptyDesc=(Neukončí black boxing žádného zdroje)
+
+# LOCALIZATION NOTE (dbgUnBlackBoxNonEmptyDesc) A very short string used to let the
+# user know which sources we stopped black boxing.
+dbgUnBlackBoxNonEmptyDesc=Ukončí black boxing následujících zdrojů:
+
+# LOCALIZATION NOTE (dbgUnBlackBoxErrorDesc) A very short string used to let the
+# user know there was an error black boxing a source (whose url follows this
+# text).
+dbgUnBlackBoxErrorDesc=Chyba při ukončování black boxingu:
+
+# LOCALIZATION NOTE (dbgUnBlackBoxInvertDesc) A very short string used to describe the
+# 'invert' parameter to the 'dbg unblackbox' command.
+dbgUnBlackBoxInvertDesc=Inverze pravidla. Ukončí black boxing pro každý zdroj, který neodpovídá zadanému pravidlu.
+
+# LOCALIZATION NOTE (consolecloseDesc) A very short description of the
+# 'console close' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+consolecloseDesc=Zavře konzolu
+
+# LOCALIZATION NOTE (consoleopenDesc) A very short description of the
+# 'console open' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+consoleopenDesc=Otevře konzolu
+
+# LOCALIZATION NOTE (editDesc) A very short description of the 'edit'
+# command. See editManual2 for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+editDesc=Upraví zdroje stránky
+
+# LOCALIZATION NOTE (editManual) A fuller description of the 'edit' command,
+# displayed when the user asks for help on what it does.
+editManual2=Upraví jeden ze zdrojů, které jsou součástí této stránky
+
+# LOCALIZATION NOTE (editResourceDesc) A very short string to describe the
+# 'resource' parameter to the 'edit' command, which is displayed in a dialog
+# when the user is using this command.
+editResourceDesc=URL k úpravě
+
+# LOCALIZATION NOTE (editLineToJumpToDesc) A very short string to describe the
+# 'line' parameter to the 'edit' command, which is displayed in a dialog
+# when the user is using this command.
+editLineToJumpToDesc=Řádek k úpravě
+
+# LOCALIZATION NOTE (resizePageDesc) A very short string to describe the
+# 'resizepage' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizePageDesc=Změnit velikost stránky
+
+# LOCALIZATION NOTE (resizePageArgWidthDesc) A very short string to describe the
+# 'width' parameter to the 'resizepage' command, which is displayed in a dialog
+# when the user is using this command.
+resizePageArgWidthDesc=Šířka v bodech
+
+# LOCALIZATION NOTE (resizePageArgWidthDesc) A very short string to describe the
+# 'height' parameter to the 'resizepage' command, which is displayed in a dialog
+# when the user is using this command.
+resizePageArgHeightDesc=Výška v bodech
+
+# LOCALIZATION NOTE (resizeModeOnDesc) A very short string to describe the
+# 'resizeon ' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeOnDesc=Zapne režim responzivního designu
+
+# LOCALIZATION NOTE (resizeModeOffDesc) A very short string to describe the
+# 'resize off' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeOffDesc=Ukončí režim responzivního designu
+
+# LOCALIZATION NOTE (resizeModeToggleDesc) A very short string to describe the
+# 'resize toggle' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeToggleDesc=Přepne režim responzivního designu
+
+# LOCALIZATION NOTE (resizeModeToggleTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles Responsive Design Mode.
+resizeModeToggleTooltip=Responzivní design
+
+# LOCALIZATION NOTE (resizeModeToDesc) A very short string to describe the
+# 'resize to' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeToDesc=Změní velikost stránky
+
+# LOCALIZATION NOTE (resizeModeDesc) A very short string to describe the
+# 'resize' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeDesc=Ovládá režim responzivního designu
+
+# LOCALIZATION NOTE (resizeModeManual) A fuller description of the 'resize'
+# command, displayed when the user asks for help on what it does.
+# The argument (%1$S) is the browser name.
+resizeModeManual2=Responzivní webové stránky se přizpůsobují svému prostředí a vypadají dobře jak na mobilním telefonu, filmovém plátně a vším mezi tím. Režim responzivního designu vám umožní otestovat různé velikosti stránek bez nutnosti měnit velikost aplikace %1$S.
+
+# LOCALIZATION NOTE (cmdDesc) A very short description of the 'cmd'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+cmdDesc=Manipuluje s příkazy
+
+# LOCALIZATION NOTE (cmdRefreshDesc) A very short description of the 'cmd refresh'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+cmdRefreshDesc=Znovu načte seznam příkazů
+
+# LOCALIZATION NOTE (cmdStatus3) When the we load new commands from mozcmd
+# directory, we report where we loaded from using %1$S.
+cmdStatus3=Přečteny příkazy z '%1$S'
+
+# LOCALIZATION NOTE (cmdSetdirDesc)  A very short description of the 'cmd setdir'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+cmdSetdirDesc=Nastavení adresáře se soubory mozcmd
+
+# LOCALIZATION NOTE (cmdSetdirManual2) A fuller description of the 'cmd setdir'
+# command, displayed when the user asks for help on what it does.
+cmdSetdirManual2=Adresář s 'mozcmd' je snadný způsob, jak vytvářet nové vlastní příkazy. Pro více informací si přečtěte článek v <a href="https://developer.mozilla.org/docs/Tools/GCLI/Customization">dokumentaci na MDN</a>.
+
+# LOCALIZATION NOTE (cmdSetdirDirectoryDesc) The description of the directory
+# parameter to the 'cmd setdir' command.
+cmdSetdirDirectoryDesc=Adresář obsahující soubory .mozcmd
+
+# LOCALIZATION NOTE (addonDesc) A very short description of the 'addon'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+addonDesc=Manipuluje s doplňky
+
+# LOCALIZATION NOTE (addonListDesc) A very short description of the 'addon list'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+addonListDesc=Vypíše seznam nainstalovaných doplňků
+
+# LOCALIZATION NOTE (addonListTypeDesc) A very short description of the
+# 'addon list <type>' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+addonListTypeDesc=Zvolí typ doplňku
+
+# LOCALIZATION NOTE (addonListDictionaryHeading, addonListExtensionHeading,
+# addonListLocaleHeading, addonListPluginHeading, addonListThemeHeading,
+# addonListUnknownHeading) Used in the output of the 'addon list' command as the
+# first line of output.
+addonListDictionaryHeading=Následující slovníky jsou nainstalovány:
+addonListExtensionHeading=Následující rozšíření jsou nainstalována:
+addonListLocaleHeading=Následující lokalizace jsou nainstalována:
+addonListPluginHeading=Následující zásuvné moduly jsou nainstalovány:
+addonListThemeHeading=Následující motivy vzhledu jsou nainstalovány:
+addonListAllHeading=Následující slovníky jsou nainstalovány:
+addonListUnknownHeading=Následující doplňky zvoleného typu jsou nainstalovány:
+
+# LOCALIZATION NOTE (addonListOutEnable, addonListOutDisable) Used in the
+# output of the 'addon list' command as the labels for the enable/disable
+# action buttons in the listing. This string is designed to be shown in a
+# small action button next to the addon name, which is why it should be as
+# short as possible.
+addonListOutEnable=Povolit
+addonListOutDisable=Zakázat
+
+# LOCALIZATION NOTE (addonPending, addonPendingEnable, addonPendingDisable,
+# addonPendingUninstall, addonPendingInstall, addonPendingUpgrade) Used in
+# the output of the 'addon list' command as the descriptions of pending
+# addon operations. addonPending is used as a prefix for a list of pending
+# actions (named by the other lookup variables). These strings are designed
+# to be shown alongside addon names, which is why they should be as short
+# as possible.
+addonPending=čeká na
+addonPendingEnable=povolení
+addonPendingDisable=zakázání
+addonPendingUninstall=odinstalaci
+addonPendingInstall=instalaci
+addonPendingUpgrade=aktualizaci
+
+# LOCALIZATION NOTE (addonNameDesc) A very short description of the
+# name parameter of numerous addon commands. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+addonNameDesc=Název doplňku
+
+# LOCALIZATION NOTE (addonNoneOfType) Used in the output of the 'addon list'
+# command when a search for addons of a particular type were not found.
+addonNoneOfType=Žádné doplňky zvoleného typu nejsou nainstalovány:
+
+# LOCALIZATION NOTE (addonEnableDesc) A very short description of the
+# 'addon enable <type>' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+addonEnableDesc=Povolí zvolený doplněk
+
+# LOCALIZATION NOTE (addonAlreadyEnabled) Used in the output of the
+# 'addon enable' command when an attempt is made to enable an add-on that is
+# already enabled.
+addonAlreadyEnabled=Doplněk %S je již povolený.
+
+# LOCALIZATION NOTE (addonEnabled) Used in the output of the 'addon enable'
+# command when an addon is enabled.
+addonEnabled=Doplněk %S byl povolený.
+
+# LOCALIZATION NOTE (addonDisableDesc) A very short description of the
+# 'addon disable <type>' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+addonDisableDesc=Disable the specified add-on
+
+# LOCALIZATION NOTE (addonAlreadyDisabled) Used in the output of the
+# 'addon disable' command when an attempt is made to disable an add-on that is
+# already disabled.
+addonAlreadyDisabled=Doplněk %S je již zakázaný.
+
+# LOCALIZATION NOTE (addonDisabled) Used in the output of the 'addon disable'
+# command when an addon is disabled.
+addonDisabled=Doplněk %S byl zakázán.
+
+# LOCALIZATION NOTE (exportDesc) A very short description of the 'export'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+exportDesc=Exportuje zdroje stránky
+
+# LOCALIZATION NOTE (exportHtmlDesc) A very short description of the 'export
+# html' command. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+exportHtmlDesc=Exportuje HTML kód stránky
+
+# LOCALIZATION NOTE (pagemodDesc) A very short description of the 'pagemod'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+pagemodDesc=Změní strukturu stránky
+
+# LOCALIZATION NOTE (pagemodReplaceDesc) A very short description of the
+# 'pagemod replace' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+pagemodReplaceDesc=Vyhledá a nahradí prvky stránky
+
+# LOCALIZATION NOTE (pagemodReplaceSearchDesc) A very short string to describe
+# the 'search' parameter to the 'pagemod replace' command, which is displayed in
+# a dialog when the user is using this command.
+pagemodReplaceSearchDesc=Hledaný řetězec
+
+# LOCALIZATION NOTE (pagemodReplaceReplaceDesc) A very short string to describe
+# the 'replace' parameter to the 'pagemod replace' command, which is displayed in
+# a dialog when the user is using this command.
+pagemodReplaceReplaceDesc=Nahrazovaný řetězec
+
+# LOCALIZATION NOTE (pagemodReplaceIgnoreCaseDesc) A very short string to
+# describe the 'ignoreCase' parameter to the 'pagemod replace' command, which is
+# displayed in a dialog when the user is using this command.
+pagemodReplaceIgnoreCaseDesc=Hledá bez rozlišení velikosti
+
+# LOCALIZATION NOTE (pagemodReplaceRootDesc) A very short string to describe the
+# 'root' parameter to the 'pagemod replace' command, which is displayed in
+# a dialog when the user is using this command.
+pagemodReplaceRootDesc=Hledá z kořene určeným selektorem CSS
+
+# LOCALIZATION NOTE (pagemodReplaceSelectorDesc) A very short string to describe
+# the 'selector' parameter to the 'pagemod replace' command, which is displayed
+# in a dialog when the user is using this command.
+pagemodReplaceSelectorDesc=Hledá jako CSS selektor
+
+# LOCALIZATION NOTE (pagemodReplaceAttributesDesc) A very short string to
+# describe the 'attributes' parameter to the 'pagemod replace' command, which is
+# displayed in a dialog when the user is using this command.
+pagemodReplaceAttributesDesc=Hledá attributy odpovídající regexpu
+
+# LOCALIZATION NOTE (pagemodReplaceAttrOnlyDesc) A very short string to describe
+# the 'attrOnly' parameter to the 'pagemod replace' command, which is displayed
+# in a dialog when the user is using this command.
+pagemodReplaceAttrOnlyDesc=Hledá pouze atributy
+
+# LOCALIZATION NOTE (pagemodReplaceContentOnlyDesc) A very short string to
+# describe the 'contentOnly' parameter to the 'pagemod replace' command, which
+# is displayed in a dialog when the user is using this command.
+pagemodReplaceContentOnlyDesc=Hledá pouze textové uzly
+
+# LOCALIZATION NOTE (pagemodReplaceResultMatchedElements) A string displayed as
+# the result of the 'pagemod replace' command.
+pagemodReplaceResult=Prvky odpovídající selektoru: %1$S. Nahrazení v textových uzlech: %2$S. Nahrazení v atributech: %3$S.
+
+# LOCALIZATION NOTE (pagemodRemoveDesc) A very short description of the
+# 'pagemod remove' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+pagemodRemoveDesc=Odebere ze stránky prvky a atributy
+
+# LOCALIZATION NOTE (pagemodRemoveElementDesc) A very short description of the
+# 'pagemod remove element' command. This string is designed to be shown in
+# a menu alongside the command name, which is why it should be as short as
+# possible.
+pagemodRemoveElementDesc=Odebere ze stránky prvky
+
+# LOCALIZATION NOTE (pagemodRemoveElementSearchDesc) A very short string to
+# describe the 'search' parameter to the 'pagemod remove element' command, which
+# is displayed in a dialog when the user is using this command.
+pagemodRemoveElementSearchDesc=CSS selektor určující odebírané prvky a atributy
+
+# LOCALIZATION NOTE (pagemodRemoveElementRootDesc) A very short string to
+# describe the 'root' parameter to the 'pagemod remove element' command, which
+# is displayed in a dialog when the user is using this command.
+pagemodRemoveElementRootDesc=CSS selektor určující kořen hledání
+
+# LOCALIZATION NOTE (pagemodRemoveElementStripOnlyDesc) A very short string to
+# describe the 'stripOnly' parameter to the 'pagemod remove element' command,
+# which is displayed in a dialog when the user is using this command.
+pagemodRemoveElementStripOnlyDesc=Odebere prvky, ale nechá obsah
+
+# LOCALIZATION NOTE (pagemodRemoveElementIfEmptyOnlyDesc) A very short string to
+# describe the 'ifEmptyOnly' parameter to the 'pagemod remove element' command,
+# which is displayed in a dialog when the user is using this command.
+pagemodRemoveElementIfEmptyOnlyDesc=Odebere pouze prázdné prvky
+
+# LOCALIZATION NOTE (pagemodRemoveElementResultMatchedAndRemovedElements)
+# A string displayed as the result of the 'pagemod remove element' command.
+pagemodRemoveElementResultMatchedAndRemovedElements=Prvky odpovídající selektoru: %1$S. Odebrané prvky: %2$S.
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeDesc) A very short description of the
+# 'pagemod remove attribute' command. This string is designed to be shown in
+# a menu alongside the command name, which is why it should be as short as
+# possible.
+pagemodRemoveAttributeDesc=Odebere odpovídající atributy
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeSearchAttributesDesc) A very short
+# string to describe the 'searchAttributes' parameter to the 'pagemod remove
+# attribute' command, which is displayed in a dialog when the user is using this
+# command.
+pagemodRemoveAttributeSearchAttributesDesc=Regexp určující odebírané atributy
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeSearchElementsDesc) A very short
+# string to describe the 'searchElements' parameter to the 'pagemod remove
+# attribute' command, which is displayed in a dialog when the user is using this
+# command.
+pagemodRemoveAttributeSearchElementsDesc=Selektor CSS určující vybírané prvky
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeRootDesc) A very short string to
+# describe the 'root' parameter to the 'pagemod remove attribute' command, which
+# is displayed in a dialog when the user is using this command.
+pagemodRemoveAttributeRootDesc=Selektor CSS určující kořen hledání
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeIgnoreCaseDesc) A very short string
+# to describe the 'ignoreCase' parameter to the 'pagemod remove attribute'
+# command, which is displayed in a dialog when the user is using this command.
+pagemodRemoveAttributeIgnoreCaseDesc=Provede hledání bez ohledu na velikost
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeResult) A string displayed as the
+# result of the 'pagemod remove attribute' command.
+pagemodRemoveAttributeResult=Prvky odpovídající selektoru: %1$S. Odebrané atributy: %2$S.
+
+# LOCALIZATION NOTE (toolsDesc2) A very short description of the 'tools'
+# command, the parent command for tool-hacking commands.
+# The argument (%1$S) is the browser name.
+toolsDesc2=Upravování nástrojů vývojáře aplikace %1$S 
+
+# LOCALIZATION NOTE (toolsManual2) A fuller description of the 'tools'
+# command. The argument (%1$S) is the browser name.
+toolsManual2=Řada příkazů souvisejících s přímou úpravou nástrojů vývojáře aplikace %1$S. 
+
+# LOCALIZATION NOTE (toolsSrcdirDesc) A very short description of the 'tools srcdir'
+# command, for pointing your developer tools loader at a mozilla-central source tree.
+toolsSrcdirDesc=Načtení nástrojů z kopie mozilla-central
+
+# LOCALIZATION NOTE (toolsSrcdirNotFound) Shown when the 'tools srcdir' command was handed
+# an invalid srcdir.
+toolsSrcdirNotFound=Adresář %1$s neexistuje nebo se nejedná o platnou kopii mozilla-central. 
+
+# LOCALIZATION NOTE (toolsSrcdirReloaded) Displayed when tools have been reloaded by the
+# 'tools srcdir' command.
+toolsSrcdirReloaded=Nástroje byly načteny z adresáře %1$s.
+
+# LOCALIZATION NOTE (toolsSrcdirManual2) A full description of the 'tools srcdir'
+# command. The argument (%1$S) is the browser name.
+toolsSrcdirManual2=Načte nástroje vývojáře aplikace %1$S z kopie mozilla-central. 
+
+# LOCALIZATION NOTE (toolsSrcdirDir) The srcdir argument to the 'tools srcdir' command.
+toolsSrcdirDir=Kopie mozilla-central
+
+# LOCALIZATION NOTE (toolsBuiltinDesc) A short description of the 'tools builtin'
+# command, which overrides a previous 'tools srcdir' command.
+toolsBuiltinDesc=Použití vestavěných nástrojů
+
+# LOCALIZATION NOTE (toolsBuiltinDesc) A fuller description of the 'tools builtin'
+# command.
+toolsBuiltinManual=Použití vestavěných nástrojů. Přepíše libovolný předchozí příkaz srcdir.
+
+# LOCALIZATION NOTE (toolsBuiltinReloaded) Displayed when tools are loaded with the
+# 'tools builtin' command.
+toolsBuiltinReloaded=Vestavěné nástroje načteny.
+
+# LOCALIZATION NOTE (toolsReloadDesc) A short description of the 'tools reload' command.
+# which will reload the tools from the current srcdir.
+toolsReloadDesc=Obnovení nástrojů vývojáře
+
+# LOCALIZATION NOTE (toolsReloaded2) Displayed when tools are reloaded with the 'tools
+# reload' command.
+toolsReloaded2=Nástroje obnoveny.
+
+# LOCALIZATION NOTE (cookieDesc) A very short description of the 'cookie'
+# command. See cookieManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+cookieDesc=Zobrazí a změní cookies
+
+# LOCALIZATION NOTE (cookieManual) A fuller description of the 'cookie'
+# command, displayed when the user asks for help on what it does.
+cookieManual=Příkazy k vypsaní, vytvoření, smazání a změně cookies v aktální doméně.
+
+# LOCALIZATION NOTE (cookieListDesc) A very short description of the
+# 'cookie list' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+cookieListDesc=Zobrazí cookies
+
+# LOCALIZATION NOTE (cookieListManual) A fuller description of the 'cookie list'
+# command, displayed when the user asks for help on what it does.
+cookieListManual=Zobrazí seznam cookies odpovídající aktuální stránce
+
+# LOCALIZATION NOTE (cookieListOutHost,cookieListOutPath,cookieListOutExpires,cookieListOutAttributes):
+# The 'cookie list' command has a number of headings for cookie properties.
+# Particular care should be taken in translating these strings as they have
+# references to names in the cookies spec.
+cookieListOutHost=Server:
+cookieListOutPath=Cesta:
+cookieListOutExpires=Platnost do:
+cookieListOutAttributes=Atributy:
+
+# LOCALIZATION NOTE (cookieListOutNone) The output of the 'cookie list' command
+# uses this string when no cookie attributes (like httpOnly, secure, etc) apply
+cookieListOutNone=Žádné
+
+# LOCALIZATION NOTE (cookieListOutSession) The output of the 'cookie list'
+# command uses this string to describe a cookie with an expiry value of '0'
+# that is to say it is a session cookie
+cookieListOutSession=Ukončení prohlížeče (relace)
+
+# LOCALIZATION NOTE (cookieListOutNonePage) The output of the 'cookie list'
+# command uses this string for pages like 'about:blank' which can't contain
+# cookies
+cookieListOutNonePage=Pro tuto stránku nebylo nalezeno žádné cookie
+
+# LOCALIZATION NOTE (cookieListOutNoneHost) The output of the 'cookie list'
+# command uses this string when there are no cookies on a given web page
+cookieListOutNoneHost=Pro server „%1$S“ nebylo nalezeno žádné cookie
+
+# LOCALIZATION NOTE (cookieListOutEdit) A title used in the output from the
+# 'cookie list' command on a button which can be used to edit cookie values
+cookieListOutEdit=Upravit
+
+# LOCALIZATION NOTE (cookieListOutRemove) A title used in the output from the
+# 'cookie list' command on a button which can be used to remove cookies
+cookieListOutRemove=Odebrat
+
+# LOCALIZATION NOTE (cookieRemoveDesc) A very short description of the
+# 'cookie remove' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+cookieRemoveDesc=Odebere cookie
+
+# LOCALIZATION NOTE (cookieRemoveManual) A fuller description of the 'cookie remove'
+# command, displayed when the user asks for help on what it does.
+cookieRemoveManual=Odebere cookie zadané svým klíčem
+
+# LOCALIZATION NOTE (cookieRemoveKeyDesc) A very short string to describe the
+# 'key' parameter to the 'cookie remove' command, which is displayed in a dialog
+# when the user is using this command.
+cookieRemoveKeyDesc=Klíč odebíraného cookie
+
+# LOCALIZATION NOTE (cookieSetDesc) A very short description of the
+# 'cookie set' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+cookieSetDesc=Nastaví cookie
+
+# LOCALIZATION NOTE (cookieSetManual) A fuller description of the 'cookie set'
+# command, displayed when the user asks for help on what it does.
+cookieSetManual=Nastaví do zadaného klíče cookie určené nepovinně jedním nebo více parametry: platnost (maximální platnost v sekundách nebo datum konce platnosti ve formátu GMT), cesta, doména, zabezpečení
+
+# LOCALIZATION NOTE (cookieSetKeyDesc) A very short string to describe the
+# 'key' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetKeyDesc=Klíč nastavovaného cookie
+
+# LOCALIZATION NOTE (cookieSetValueDesc) A very short string to describe the
+# 'value' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetValueDesc=Hodnota nastavovaného cookie
+
+# LOCALIZATION NOTE (cookieSetOptionsDesc) The title of a set of options to
+# the 'cookie set' command, displayed as a heading to the list of option.
+cookieSetOptionsDesc=Možnosti
+
+# LOCALIZATION NOTE (cookieSetPathDesc) A very short string to describe the
+# 'path' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetPathDesc=Cesta nastavovaného cookie
+
+# LOCALIZATION NOTE (cookieSetDomainDesc) A very short string to describe the
+# 'domain' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetDomainDesc=Doména nastavovaného cookie
+
+# LOCALIZATION NOTE (cookieSetSecureDesc) A very short string to describe the
+# 'secure' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetSecureDesc=Cookie přenášené pouze pomocí https
+
+# LOCALIZATION NOTE (cookieSetHttpOnlyDesc) A very short string to describe the
+# 'httpOnly' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetHttpOnlyDesc=Není dostupné pomocí skriptu na straně klienta
+
+# LOCALIZATION NOTE (cookieSetSessionDesc) A very short string to describe the
+# 'session' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetSessionDesc=Je platné pouze po dobu relace prohlížeče
+
+# LOCALIZATION NOTE (cookieSetExpiresDesc) A very short string to describe the
+# 'expires' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetExpiresDesc=Datum platnosti cookie (datum dle RFC2822 v uvozovkách nebo dle ISO 8601)
+
+# LOCALIZATION NOTE (jsbDesc) A very short description of the
+# 'jsb' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+jsbDesc=Zkrášlovač Javascriptu
+
+# LOCALIZATION NOTE (jsbUrlDesc) A very short description of the
+# 'jsb <url>' parameter. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+jsbUrlDesc=Adresa ke zkrášlovanému souboru JS
+
+# LOCALIZATION NOTE (jsbIndentSizeDesc) A very short description of the
+# 'jsb <indentSize>' parameter. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+jsbIndentSizeDesc=Počet odsazujících znaků
+
+# LOCALIZATION NOTE (jsbIndentSizeManual) A fuller description of the
+# 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
+# does.
+jsbIndentSizeManual=Počet znaků, které odsadí každý řádek
+
+# LOCALIZATION NOTE (jsbIndentCharDesc) A very short description of the
+# 'jsb <indentChar>' parameter. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+jsbIndentCharDesc=Znaky odsazující každý řádek
+
+# LOCALIZATION NOTE (jsbIndentCharManual) A fuller description of the
+# 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
+# does.
+jsbIndentCharManual=Znaky odsazující každý řádek - mezera nebo tabulátor
+
+# the 'jsb <doNotPreserveNewlines>' parameter. This string is designed to be
+# shown in a menu alongside the command name, which is why it should be as short
+# as possible.
+jsbDoNotPreserveNewlinesDesc=Nezachová existující konce řádků
+
+# LOCALIZATION NOTE (jsbPreserveNewlinesManual) A fuller description of the
+# 'jsb <jsbPreserveNewlines>' parameter, displayed when the user asks for help
+# on what it does.
+jsbPreserveNewlinesManual=Měli by být zachovány existující konce řádků
+
+# LOCALIZATION NOTE (jsbPreserveMaxNewlinesDesc) A very short description of the
+# 'jsb <preserveMaxNewlines>' parameter. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+jsbPreserveMaxNewlinesDesc=Maximální počet konců řádků
+
+# LOCALIZATION NOTE (jsbPreserveMaxNewlinesManual) A fuller description of the
+# 'jsb <preserveMaxNewlines>' parameter, displayed when the user asks for help
+# on what it does.
+jsbPreserveMaxNewlinesManual=Maximální počet za sebou následujících konců řádků
+
+# LOCALIZATION NOTE (jsbJslintHappyDesc) A very short description of the
+# 'jsb <jslintHappy>' parameter. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+jsbJslintHappyDesc=Vynutit řežim jslint-stricter?
+
+# LOCALIZATION NOTE (jsbJslintHappyManual) A fuller description of the
+# 'jsb <jslintHappy>' parameter, displayed when the user asks for help
+# on what it does.
+jsbJslintHappyManual=Je-li nastaveno na true, je vynucen režim jslint-stricter
+
+# LOCALIZATION NOTE (jsbBraceStyleDesc2) A very short description of the
+# 'jsb <braceStyle>' parameter. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+jsbBraceStyleDesc2=Výběr stylu závorek
+
+# LOCALIZATION NOTE (jsbBraceStyleManual2) A fuller description of the
+# 'jsb <braceStyle>' parameter, displayed when the user asks for help
+# on what it does.
+#
+# NOTES: The keywords collapse, expand, end-expand and expand-strict should not
+# be translated. "even if it will break your code" means that the resulting code
+# may no longer be functional.
+jsbBraceStyleManual2=Výběr stylu závorek: collapse - umístí závorky na stejnou řádku jako výraz; expand - umístí závorky na samostatné řádky (styl Allman / ANSI); end-expand - umístí koncovou závorku na samostatný řádek; expand-strict - umístí závorky na samostatné řádky, i když to rozbije kód.
+
+# LOCALIZATION NOTE (jsbNoSpaceBeforeConditionalDesc) A very short description
+# of the 'jsb <noSpaceBeforeConditional>' parameter. This string is designed to
+# be shown in a menu alongside the command name, which is why it should be as
+# short as possible.
+jsbNoSpaceBeforeConditionalDesc=Žádná mezera před if
+
+# LOCALIZATION NOTE (jsbUnescapeStringsDesc) A very short description of the
+# 'jsb <unescapeStrings>' parameter. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+jsbUnescapeStringsDesc=Odescapování znaků \\xNN?
+
+# LOCALIZATION NOTE (jsbUnescapeStringsManual) A fuller description of the
+# 'jsb <unescapeStrings>' parameter, displayed when the user asks for help
+# on what it does.
+jsbUnescapeStringsManual=Měli by být tisknutelné znaky zakódvané jako \\xNN odescapovány?
+
+# LOCALIZATION NOTE (jsbInvalidURL) Displayed when an invalid URL is passed to
+# the jsb command.
+jsbInvalidURL=Vložte prosím platnou adresu
+
+# LOCALIZATION NOTE (jsbOptionsDesc) The title of a set of options to
+# the 'jsb' command, displayed as a heading to the list of options.
+jsbOptionsDesc=Možnosti
+
+# LOCALIZATION NOTE (calllogDesc) A very short description of the
+# 'calllog' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogDesc=Příkazy k žurnálování volání funkcí
+
+# LOCALIZATION NOTE (calllogStartDesc) A very short description of the
+# 'calllog start' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogStartDesc=Zapne žurnálování volání funkcí do konzoly
+
+# LOCALIZATION NOTE (calllogStartReply) A string displayed as the result of
+# the 'calllog start' command.
+calllogStartReply=Žurnálování zapnuto.
+
+# LOCALIZATION NOTE (calllogStopDesc) A very short description of the
+# 'calllog stop' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogStopDesc=Vypne žurnálování volání funkcí
+
+# LOCALIZATION NOTE (calllogStopNoLogging) A string displayed as the result of
+# the 'calllog stop' command when there is nothing to stop.
+calllogStopNoLogging=Žádné žurnálování není aktuálně aktivní
+
+# LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
+# the 'calllog stop' command when there are logging actions to stop.
+calllogStopReply=Žurnálování vypnuto. Aktivní kontext: %1$S.
+
+# LOCALIZATION NOTE (calllogStartChromeDesc) A very short description of the
+# 'calllog chromestart' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogChromeStartDesc=Zapne žurnálování volání funkcí chrome do konzoly
+
+# LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
+# 'calllog chromestart <sourceType>' parameter. This string is designed to be
+# shown in a menu alongside the command name, which is why it should be as short as possible.
+calllogChromeSourceTypeDesc=Globální object, JSM URI nebo JS poskytující globální objekt
+
+# LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
+# 'calllog chromestart' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogChromeSourceTypeManual=Globální objekt, JSM URI nebo JS vykonávaný v okně chrome, ze kterého se získává globální objekt
+
+# LOCALIZATION NOTE (calllogChromeStartReply) A string displayed as the result
+# of the 'calllog chromestart' command.
+calllogChromeStartReply=Žurnálování zapnuto.
+
+# LOCALIZATION NOTE (calllogChromeStopDesc) A very short description of the
+# 'calllog chromestop' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogChromeStopDesc=Vypne žurnálování volání funkcí chrome
+
+# LOCALIZATION NOTE (calllogChromeStopNoLogging) A string displayed as the
+# result of the 'calllog chromestop' command when there is nothing to stop.
+calllogChromeStopNoLogging=Žádné žurnálování funkcí chrome není aktuálné aktivní
+
+# LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
+# the 'calllog chromestop' command when there are logging actions to stop.
+calllogChromeStopReply=Žurnálování vypnuto. Activní kontext: %1$S.
+
+# LOCALIZATION NOTE (callLogChromeAnonFunction) A string displayed as the result
+# of the 'calllog chromestart' command when an anonymouse function is to be
+# logged.
+callLogChromeAnonFunction=<anonymní>
+
+# LOCALIZATION NOTE (callLogChromeMethodCall) A string displayed as the result
+# of the 'calllog chromestart' command to proceed a method name when it is to be
+# logged.
+callLogChromeMethodCall=Volání metody
+
+# LOCALIZATION NOTE (callLogChromeInvalidJSM) A string displayed as the result
+# of the 'calllog chromestart' command with an invalid JSM or JSM path.
+callLogChromeInvalidJSM=Neplatný JSM!
+
+# LOCALIZATION NOTE (callLogChromeVarNotFoundContent) A string displayed as the
+# result of the 'calllog chromestart' command with a source type of
+# content-variable and an invalid variable name.
+callLogChromeVarNotFoundContent=Proměnná nebyla v okně obsahu nalezena.
+
+# LOCALIZATION NOTE (callLogChromeVarNotFoundChrome) A string displayed as the
+# result of the 'calllog chromestart' command with a source type of
+# chrome-variable and an invalid variable name.
+callLogChromeVarNotFoundChrome=Proměnná nebyla v okně chrome nalezena.
+
+# LOCALIZATION NOTE (callLogChromeEvalException) A string displayed as the
+# result of the 'calllog chromestart' command with a source type of javascript
+# and invalid JavaScript code.
+callLogChromeEvalException=Vyhodnocovaný JavaScript vyhodil následující výjimku
+
+# LOCALIZATION NOTE (callLogChromeEvalNeedsObject) A string displayed as the
+# result of passing a non-JavaScript object creating source via the
+# 'calllog chromestart javascript' command.
+callLogChromeEvalNeedsObject=Kód JavaScriptu se musí vyhodnotit do objektu, volání jehož metod se má žurnálovat např."({a1: function() {this.a2()},a2: function() {}});"
+
+# LOCALIZATION NOTE (scratchpadOpenTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which opens Scratchpad.
+scratchpadOpenTooltip=Zápisník
+
+# LOCALIZATION NOTE (paintflashingDesc) A very short string used to describe the
+# function of the "paintflashing" command
+paintflashingDesc=Zvýrazní vykreslovanou obast
+
+# LOCALIZATION NOTE (paintflashingOnDesc) A very short string used to describe the
+# function of the "paintflashing on" command.
+paintflashingOnDesc=Zapne zvýraznění překreslování
+
+# LOCALIZATION NOTE (paintflashingOffDesc) A very short string used to describe the
+# function of the "paintflashing off" command.
+paintflashingOffDesc=Vypne zvýraznění překreslování
+
+# LOCALIZATION NOTE (paintflashingChrome) A very short string used to describe the
+# function of the "paintflashing on/off chrome" command.
+paintflashingChromeDesc=rámce chrome
+
+# LOCALIZATION NOTE (paintflashingManual) A longer description describing the
+# set of commands that control paint flashing.
+paintflashingManual=Vykreslí překreslované oblasti v různých barvách
+
+# LOCALIZATION NOTE (paintflashingTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles paint flashing.
+paintflashingTooltip=Zvýrazní překreslované oblasti
+
+# LOCALIZATION NOTE (paintflashingOnDesc) A very short string used to describe the
+# function of the "paintflashing on" command.
+paintflashingToggleDesc=Přepne zvýrazňování překreslování
+
+# LOCALIZATION NOTE (splitconsoleTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles the split webconsole.
+splitconsoleTooltip=Přepne rozdělení konzole
+
+# LOCALIZATION NOTE (appCacheDesc) A very short string used to describe the
+# function of the "appcache" command
+appCacheDesc=Nástroje aplikační mezipaměti
+
+# LOCALIZATION NOTE (appCacheValidateDesc) A very short string used to describe
+# the function of the "appcache validate" command.
+appCacheValidateDesc=Zkontroluje aplikační mezipaměti
+
+# LOCALIZATION NOTE (appCacheValidateManual) A fuller description of the
+# 'validate' parameter to the 'appcache' command, displayed when the user asks
+# for help on what it does.
+appCacheValidateManual=Nalezne problémy související s manifestem mezipaměti a soubory, na které odkazuje
+
+# LOCALIZATION NOTE (appCacheValidateUriDesc) A very short string used to describe
+# the function of the "uri" parameter of the appcache validate" command.
+appCacheValidateUriDesc=URI pro kontrolu
+
+# LOCALIZATION NOTE (appCacheValidated) Displayed by the "appcache validate"
+# command when it has been successfully validated.
+appCacheValidatedSuccessfully=Kontrola appcache byla úspěšná.
+
+# LOCALIZATION NOTE (appCacheClearDesc) A very short string used to describe
+# the function of the "appcache clear" command.
+appCacheClearDesc=Vymaže položky z aplikační mezipaměti
+
+# LOCALIZATION NOTE (appCacheClearManual) A fuller description of the
+# 'appcache clear' command, displayed when the user asks for help on what it does.
+appCacheClearManual=Vymaže jednu či více položek z aplikační mezipaměti
+
+# LOCALIZATION NOTE (appCacheClearCleared) Displayed by the "appcache clear"
+# command when entries are successfully cleared.
+appCacheClearCleared=Položky byly úspěšně vymazány.
+
+# LOCALIZATION NOTE (AppCacheListDesc) A very short string used to describe
+# the function of the "appcache list" command.
+appCacheListDesc=Zobrazí seznam položek aplikační mezipaměti.
+
+# LOCALIZATION NOTE (AppCacheListManual) A fuller description of the
+# 'appcache list' command, displayed when the user asks for help on what it does.
+appCacheListManual=Zobrazí seznam všech položek aplikační mezipaměti. Pokud je použit parametr pro vyhledání, pak se v tabulce zobrazí pouze položky obsahující hledaný výraz.
+
+# LOCALIZATION NOTE (AppCacheListSearchDesc) A very short string used to describe
+# the function of the "search" parameter of the appcache list" command.
+appCacheListSearchDesc=Filtr výsledků dle vyhledaného výrazu.
+
+# LOCALIZATION NOTE (AppCacheList*) Row headers for the 'appcache list' command.
+appCacheListKey=Klíč:
+appCacheListDataSize=Velikost dat:
+appCacheListDeviceID=ID zařízení:
+appCacheListExpirationTime=Platnost do:
+appCacheListFetchCount=Počet vrácení:
+appCacheListLastFetched=Naposledy vráceno:
+appCacheListLastModified=Naposledy upraveno:
+
+# LOCALIZATION NOTE (appCacheListViewEntry) The text for the view entry button
+# of the 'appcache list' command.
+appCacheListViewEntry=Zobrazit položku
+
+# LOCALIZATION NOTE (appCacheViewEntryDesc) A very short string used to describe
+# the function of the "appcache viewentry" command.
+appCacheViewEntryDesc=Otevře nový panel obsahující informace o konkrétní položce mezipaměti.
+
+# LOCALIZATION NOTE (appCacheViewEntryManual) A fuller description of the
+# 'appcache viewentry' command, displayed when the user asks for help on what it
+# does.
+appCacheViewEntryManual=Otevře nový panel obsahující informace o konkrétní položce mezipaměti.
+
+# LOCALIZATION NOTE (appCacheViewEntryKey) A very short string used to describe
+# the function of the "key" parameter of the 'appcache viewentry' command.
+appCacheViewEntryKey=Klíč položky, která se má zobrazit.
+
+# LOCALIZATION NOTE (profilerDesc) A very short string used to describe the
+# function of the profiler command.
+profilerDesc=Správa profileru
+
+# LOCALIZATION NOTE (profilerManual) A longer description describing the
+# set of commands that control the profiler.
+profilerManual=Příkazy na spuštění či zastavení profileru JavaScriptu
+
+# LOCALIZATION NOTE (profilerOpen) A very short string used to describe the function
+# of the profiler open command.
+profilerOpenDesc=Otevře profiler
+
+# LOCALIZATION NOTE (profilerClose) A very short string used to describe the function
+# of the profiler close command.
+profilerCloseDesc=Zavře profiler
+
+# LOCALIZATION NOTE (profilerStart) A very short string used to describe the function
+# of the profiler start command.
+profilerStartDesc=Spustí profilování
+
+# LOCALIZATION NOTE (profilerStartManual) A fuller description of the 'profile name'
+# parameter. This parameter is used to name a newly created profile or to lookup
+# an existing profile by its name.
+profilerStartManual=Název profilu, který si přejete spustit.
+
+# LOCALIZATION NOTE (profilerStop) A very short string used to describe the function
+# of the profiler stop command.
+profilerStopDesc=Ukončí profilování
+
+# LOCALIZATION NOTE (profilerStopManual) A fuller description of the 'profile name'
+# parameter. This parameter is used to lookup an existing profile by its name.
+profilerStopManual=Název profilu, který si přejete ukončit.
+
+# LOCALIZATION NOTE (profilerList) A very short string used to describe the function
+# of the profiler list command.
+profilerListDesc=Seznam všech profilů
+
+# LOCALIZATION NOTE (profilerShow) A very short string used to describe the function
+# of the profiler show command.
+profilerShowDesc=Zobrazí konkrétní profil
+
+# LOCALIZATION NOTE (profilerShowManual) A fuller description of the 'profile name'
+# parameter. This parameter is used to name a newly created profile or to lookup
+# an existing profile by its name.
+profilerShowManual=Název profilu.
+
+# LOCALIZATION NOTE (profilerAlreadyStarted) A message that is displayed whenever
+# an operation cannot be completed because the profile in question has already
+# been started.
+profilerAlreadyStarted2=Tento profil byl již spuštěn
+
+# LOCALIZATION NOTE (profilerNotFound) A message that is displayed whenever
+# an operation cannot be completed because the profile in question could not be
+# found.
+profilerNotFound=Profil nenalezen
+
+# LOCALIZATION NOTE (profilerNotStarted) A message that is displayed whenever
+# an operation cannot be completed because the profile in question has not been
+# started yet. It also contains a hint to use the 'profile start' command to
+# start the profiler.
+profilerNotStarted3=Tento profil nebyl ještě spuštěn. K zobrazení výsledků použijte příkaz 'profile start'
+
+# LOCALIZATION NOTE (profilerStarted2) A very short string that indicates that
+# we have started recording.
+profilerStarted2=Nahrávání…
+
+# LOCALIZATION NOTE (profilerStopped) A very short string that indicates that
+# we have stopped recording.
+profilerStopped=Ukončování…
+
+# LOCALIZATION NOTE (profilerNotReady) A message that is displayed whenever
+# an operation cannot be completed because the profiler has not been opened yet.
+profilerNotReady=Aby tento příkaz fungoval, musíte nejdříve otevřít profiler
+
+# LOCALIZATION NOTE (listenDesc) A very short string used to describe the
+# function of the 'listen' command.
+listenDesc=Otevře vzdálený port pro ladění
+
+# LOCALIZATION NOTE (listenManual2) A longer description of the 'listen'
+# command.
+listenManual2=%1$S může umožnit vzdálené ladění přes TCP/IP spojení. Z bezpečnostních důvodů je to ve výchozím nastavení zakázané, ale může to být pomocí tohoto příkazu povoleno. 
+
+# LOCALIZATION NOTE (listenPortDesc) A very short string used to describe the
+# function of 'port' parameter to the 'listen' command.
+listenPortDesc=TCP port pro naslouchání
+
+# LOCALIZATION NOTE (listenDisabledOutput) Text of a message output during the
+# execution of the 'listen' command.
+listenDisabledOutput=Naslouchání je zakázáno předvolbou devtools.debugger.remote-enabled
+
+# LOCALIZATION NOTE (listenInitOutput) Text of a message output during the
+# execution of the 'listen' command. %1$S is a port number
+listenInitOutput=Naslouchání na portu %1$S
+
+# LOCALIZATION NOTE (listenNoInitOutput) Text of a message output during the
+# execution of the 'listen' command.
+listenNoInitOutput=DebuggerServer nebyl inicializován
+
+# LOCALIZATION NOTE (mediaDesc, mediaEmulateDesc, mediaEmulateManual,
+# mediaEmulateType, mediaResetDesc, mediaResetManual) These strings describe
+# the 'media' commands and all available parameters.
+mediaDesc=Emulace konkrétního typu CSS media
+mediaEmulateDesc=Emulace konkrétního typu CSS media
+mediaEmulateManual=Zobrazí dokument, jako kdyby byl vykresen na zřízení podporující konkrétní typ média. Zobrazí odpovídající CSS pravidla.
+mediaEmulateType=Typy média, které bude emulováno
+mediaResetDesc=Ukončí emulaci konkrétního typu CSS media
+
+# LOCALIZATION NOTE (injectDesc, injectManual, injectLibraryDesc, injectLoaded,
+# injectFailed) These strings describe the 'inject' commands and all available
+# parameters.
+injectDesc=Vloží běžné knihovny do stránky
+injectManual2=Vloží běžné knihovny co kontextu stránky, které mohou být následně přístupné z konzole.
+injectLibraryDesc=Zvolte knihovny, keré chcete vložit nebo vložte platnou URL skriptu, který chcete vložit.
+injectLoaded=%1$S načteno
+injectFailed=Načtení %1$S selhalo - neplatné URI
+
+# LOCALIZATION NOTE (folderDesc, folderOpenDesc, folderOpenDir,
+# folderOpenProfileDesc) These strings describe the 'folder' commands and
+# all available parameters.
+folderDesc=Otevře složky
+folderOpenDesc=Otevře složku na konkrétní cestě
+folderOpenDir=Cesta k adresáři
+folderOpenProfileDesc=Otevře adresář s profilem
+
+# LOCALIZATION NOTE (folderInvalidPath) A string displayed as the result
+# of the 'folder open' command with an invalid folder path.
+folderInvalidPath=Vložte prosím platnou cestu
+
+# LOCALIZATION NOTE (folderOpenDirResult) A very short string used to
+# describe the result of the 'folder open' command.
+# The argument (%1$S) is the folder path.
+folderOpenDirResult=Otevřeno %1$S
+
+# LOCALIZATION NOTE (rulersDesc) A very short description of the
+# 'rulers' command. See rulersManual for a fuller description of what
+# it does. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+rulersDesc=Toggle rulers for the page
+
+# LOCALIZATION NOTE (rulersManual) A fuller description of the 'rulers'
+# command, displayed when the user asks for help on what it does.
+rulersManual=Toggle the horizontal and vertical rulers for the current page
+
+# LOCALIZATION NOTE (rulersTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles the rulers.
+rulersTooltip=Toggle rulers for the page
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/toolkit/chrome/global/devtools/gcli.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/toolkit/chrome/global/devtools/gcli.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/toolkit/chrome/global/devtools/gcli.properties	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/toolkit/chrome/global/devtools/gcli.properties	2015-05-25 20:45:42.000000000 +0000
@@ -0,0 +1,320 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE These strings are used inside the Web Console
+# command line which is available from the Web Developer sub-menu
+# -> 'Web Console'.
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# For each command there are in general two strings. As an example consider
+# the 'pref' command.
+# commandDesc (e.g. prefDesc for the command 'pref'): this string contains a
+# very short description of the command. It's designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+# commandManual (e.g. prefManual for the command 'pref'): this string will
+# contain a fuller description of the command. It's diplayed when the user
+# asks for help about a specific command (e.g. 'help pref').
+
+# LOCALIZATION NOTE: This message is used to describe any command or command
+# parameter when no description has been provided.
+canonDescNone=(bez popisu)
+
+# LOCALIZATION NOTE: The default name for a group of parameters.
+canonDefaultGroupName=Možnosti
+
+# LOCALIZATION NOTE (canonProxyDesc, canonProxyManual): These commands are
+# used to execute commands on a remote system (using a proxy). Parameters: %S
+# is the name of the remote system.
+canonProxyDesc=Vykonat příkaz na %S
+canonProxyManual=Skupina příkazů, které jsou sputěny na vzdáleném systému. Vzdálený systém je dosažen skrze %S
+
+# LOCALIZATION NOTE: This error message is displayed when we try to add a new
+# command (using a proxy) where one already exists with the same name.
+canonProxyExists=Již existuje příkaz pojmenovaný '%S'
+
+# LOCALIZATION NOTE: This message describes the '{' command, which allows
+# entry of JavaScript like traditional developer tool command lines.
+
+cliEvalJavascript=Vloží JavaScript
+
+# LOCALIZATION NOTE: This message is displayed when the command line has more
+# arguments than the current command can understand.
+cliUnusedArg=Příliš mnoho parametrů
+
+# LOCALIZATION NOTE: The title of the dialog which displays the options that
+# are available to the current command.
+cliOptions=Dostupné možnosti
+
+# LOCALIZATION NOTE: The error message when the user types a command that
+# isn't registered
+cliUnknownCommand2=Neplatný příkaz: '%1$S'.
+
+# LOCALIZATION NOTE: A parameter should have a value, but doesn't
+cliIncompleteParam=Pro '%1$S' je vyžadována hodnota.
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a file
+# that does not exist, but should (e.g. for use with File->Open) %1$S is a
+# filename
+fileErrNotExists='%1$S' neexistuje
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a file
+# that exists, but should not (e.g. for use with File->Save As) %1$S is a
+# filename
+fileErrExists='%1$S' již existuje
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a
+# non-file, when a file is needed. %1$S is a filename
+fileErrIsNotFile='%1$S' není soubor
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a
+# non-directory, when a directory is needed (e.g. for use with 'cd') %1$S is a
+# filename
+fileErrIsNotDirectory='%1$S' není adresář
+
+# LOCALIZATION NOTE: Error message given when a file argument does not match
+# the specified regular expression %1$S is a filename %2$S is a regular
+# expression
+fileErrDoesntMatch='%1$S' neodpovídá '%2$S'
+
+# LOCALIZATION NOTE: When the menu has displayed all the matches that it
+# should (i.e. about 10 items) then we display this to alert the user that
+# more matches are available.
+fieldMenuMore=A další odpovídají, pokračujte v psaní
+
+# LOCALIZATION NOTE: The command line provides completion for JavaScript
+# commands, however there are times when the scope of what we're completing
+# against can't be used. This error message is displayed when this happens.
+jstypeParseScope=Rozsah ztracen
+
+# LOCALIZATION NOTE (jstypeParseMissing, jstypeBeginSyntax,
+# jstypeBeginUnterm): These error messages are displayed when the command line
+# is doing JavaScript completion and encounters errors.
+jstypeParseMissing=Nelze najít vlastnost „%S“
+jstypeBeginSyntax=Syntaktická chyba
+jstypeBeginUnterm=Neukončený řetězcový literál
+
+# LOCALIZATION NOTE: This message is displayed if the system for providing
+# JavaScript completions encounters and error it displays this.
+jstypeParseError=Chyba
+
+# LOCALIZATION NOTE (typesNumberNan, typesNumberNotInt2, typesDateNan): These
+# error messages are displayed when the command line is passed a variable
+# which has the wrong format and can't be converted. Parameters: %S is the
+# passed variable.
+typesNumberNan=Nelze převést „%S“ na číslo.
+typesNumberNotInt2=Nelze převést "%S" na číslo.
+typesDateNan=Nelze převést "%S" na datum
+
+# LOCALIZATION NOTE (typesNumberMax, typesNumberMin, typesDateMax,
+# typesDateMin): These error messages are displayed when the command line is
+# passed a variable which has a value out of range (number or date).
+# Parameters: %1$S is the passed variable, %2$S is the limit value.
+typesNumberMax=%1$S je větší než povolené maximum: %2$S.
+typesNumberMin=%1$S je menší než povolené minimum: %2$S.
+typesDateMax=%1$S je pozdější než maximální povolená hodnota: %2$S.
+typesDateMin=%1$S je dřívější než minimální povolená hodnota: %2$S.
+
+# LOCALIZATION NOTE: This error message is displayed when the command line is
+# passed an option with a limited number of correct values, but the passed
+# value is not one of them.
+typesSelectionNomatch=Nelze použít hodnotu „%S“.
+
+# LOCALIZATION NOTE: This error message is displayed when the command line is
+# expecting a CSS query string, however the passed string is not valid.
+nodeParseSyntax=Syntaktická chyba v dotazu CSS
+
+# LOCALIZATION NOTE (nodeParseMultiple, nodeParseNone): These error messages
+# are displayed when the command line is expecting a CSS string that matches a
+# single node, but more nodes (or none) match.
+nodeParseMultiple=Odpovídá příliš mnoho uzlů (%S)
+nodeParseNone=Neodpovídá žádný uzel
+
+# LOCALIZATION NOTE (helpDesc, helpManual, helpSearchDesc, helpSearchManual3):
+# These strings describe the "help" command, used to display a description of
+# a command (e.g. "help pref"), and its parameter 'search'.
+helpDesc=Nápověda k dostupným příkazům
+helpManual=Poskytuje nápovědu konkrétních příkazů (je-li zadán hledací řetězec a odpovídá-li přesně) nebo dostupných příkazů (není-li zadán hledací řetězec nebo neodpovídá-li přesně).
+helpSearchDesc=Hledací řetězec
+helpSearchManual3=Hledací řetězec používaný k omezení seznamu zobrazovaných příkazů. Regulární výrazy nejsou podporovány.
+
+# LOCALIZATION NOTE (helpManSynopsis, helpManDescription):
+# These strings are displayed in the help page for a command in the console.
+helpManSynopsis=Anotace
+
+# LOCALIZATION NOTE: This message is displayed in the help page if the command
+# has no parameters.
+helpManNone=Žádné
+
+# LOCALIZATION NOTE (helpListAll): The heading shown in response to the 'help'
+# command when used without a filter, just above the list of known commands.
+helpListAll=Dostupné příkazy:
+
+# LOCALIZATION NOTE (helpListPrefix, helpListNone): These messages are
+# displayed in response to the 'help <search>' command (i.e. with a search
+# string), just above the list of matching commands. Parameters: %S is the
+# search string.
+helpListPrefix=Příkazy začínající s „%1$S“:
+helpListNone=Žádné příkazy začínající s „%1$S“:
+
+# LOCALIZATION NOTE (helpManRequired, helpManOptional, helpManDefault): When
+# the 'help x' command wants to show the manual for the 'x' command, it needs
+# to be able to describe the parameters as either required or optional, or if
+# they have a default value.
+helpManRequired=vyžadováno
+helpManOptional=nepovinné
+helpManDefault=nepovínné, výchozí=%S
+
+# LOCALIZATION NOTE (helpIntro): This forms part of the output from the 'help'
+# command. 'GCLI' is a project name and should be left untranslated.
+helpIntro=GCLI je experiment s cílem vytvořit vysoko použitelnou příkazovou řádku pro webové vývojáře. 
+
+# LOCALIZATION NOTE: Text shown as part of the output of the 'help' command
+# when the command in question has sub-commands, before a list of the matching
+# sub-commands.
+subCommands=Pod-příkazy
+
+# LOCALIZATION NOTE: This error message is displayed when the command line is
+# cannot find a match for the parse types.
+commandParseError=Chyba při parsování příkazové řádky
+
+# LOCALIZATION NOTE (contextDesc, contextManual, contextPrefixDesc): These
+# strings are used to describe the 'context' command and its 'prefix'
+# parameter. See localization comment for 'connect' for an explanation about
+# 'prefix'.
+contextDesc=Zaměření na skupinu příkazů
+contextManual=Nastavení výchozího prefixu pro budoucí příkazy. Například 'context git' umožňuje zadat pouze 'commit' na místo 'git commit'.
+contextPrefixDesc=Prefix příkazu
+
+# LOCALIZATION NOTE: This message message displayed during the processing of
+# the 'context' command, when the found command is not a parent command.
+contextNotParentError=Nelze použít '%S' jako prefix, protože se nejedná o rodičovský příkaz.
+
+# LOCALIZATION NOTE (contextReply, contextEmptyReply): These messages are
+# displayed during the processing of the 'context' command, to indicate
+# success or that there is no command prefix.
+contextReply=Je použito %S jako prefix příkazu
+contextEmptyReply=Prefix příkazu není nastaven
+
+# LOCALIZATION NOTE (connectDesc, connectManual, connectPrefixDesc,
+# connectPortDesc, connectHostDesc, connectDupReply): These strings describe
+# the 'connect' command and all its available parameters. A 'prefix' is an 
+# alias for the remote server (think of it as a "connection name"), and it
+# allows to identify a specific server when connected to multiple remote
+# servers.
+connectDesc=Proxy commands to server
+connectManual=Připojení k serveru a spouštění lokálních verzí příkazů na serveru. Vzdálené příkazy mají prefix, aby se odlišily od místních příkazů (pokud se jej chcete zbavit, podívejte se na příkaz context) 
+connectPrefixDesc=Rodičovský prefix pro importované příkazy
+connectMethodDesc=Metoda připojení
+connectUrlDesc=URL, ke kterému se připojuje
+connectDupReply=Připojení pojmenované %S již existuje.
+
+# LOCALIZATION NOTE: The output of the 'connect' command, telling the user
+# what it has done. Parameters: %S is the prefix command. See localization
+# comment for 'connect' for an explanation about 'prefix'.
+connectReply=Přidáno %S příkazů.
+
+# LOCALIZATION NOTE (disconnectDesc2, disconnectManual2,
+# disconnectPrefixDesc): These strings describe the 'disconnect' command and
+# all its available parameters. See localization comment for 'connect' for an
+# explanation about 'prefix'.
+disconnectDesc2=Odpojit od serveru
+disconnectManual2=Odpojí od serveru, který je aktuálně připojen pro vykonávání vzdálených příkazů
+disconnectPrefixDesc=Rodičovský prefix pro importované příkazy
+
+# LOCALIZATION NOTE: This is the output of the 'disconnect' command,
+# explaining the user what has been done. Parameters: %S is the number of
+# commands removed.
+disconnectReply=Odebráno %S příkazů.
+
+# LOCALIZATION NOTE (globalDesc, globalWindowDesc, globalOutput): These
+# strings describe the 'global' command and its parameters
+globalDesc=Změní JS global
+globalWindowDesc=Nové okno/global
+globalOutput=JS global je nyní %S
+
+# LOCALIZATION NOTE: These strings describe the 'clear' command
+clearDesc=Vymaže výstup
+
+# LOCALIZATION NOTE (langDesc, langOutput): These strings describe the 'lang'
+# command and its parameters
+langDesc=Zadávejte příkazy v jiných jazycích
+langOutput=Nyní používáte %S
+
+# LOCALIZATION NOTE (prefDesc, prefManual, prefListDesc, prefListManual,
+# prefListSearchDesc, prefListSearchManual, prefShowDesc, prefShowManual,
+# prefShowSettingDesc, prefShowSettingManual): These strings describe the
+# 'pref' command and all its available sub-commands and parameters.
+prefDesc=Příkazy k ovládání předvoleb
+prefManual=Příkazy k zobrazení a změnu předvoleb jak v GCLI tak okolního prostředí
+prefListDesc=Zobrazí dostupné předvolby
+prefListManual=Zobrazí seznam předvoleb, volitelně filtrovaných při použití parametru 'search'
+prefListSearchDesc=Filtruje seznam zobrazovaných předvoleb
+prefListSearchManual=V seznamu dostupných předvoleb vyhledá ty, které odpovídají zadanému řetězci
+prefShowDesc=Zobrazí hodnotu předvolby
+prefShowManual=Zobrazí hodnotu zadané předvolby
+prefShowSettingDesc=Zobrazovaná předvolba
+prefShowSettingManual=Název zobrazované předvolby
+
+# LOCALIZATION NOTE: This message is used to show the preference name and the
+# associated preference value. Parameters: %1$S is the preference name, %2$S
+# is the preference value.
+prefShowSettingValue=%1$S: %2$S
+
+# LOCALIZATION NOTE (prefSetDesc, prefSetManual, prefSetSettingDesc,
+# prefSetSettingManual, prefSetValueDesc, prefSetValueManual): These strings
+# describe the 'pref set' command and all its parameters.
+prefSetDesc=Změní předvolbu
+prefSetManual=Změní předvolbu definovanou prostředím
+prefSetSettingDesc=Měněná předvolba
+prefSetSettingManual=Název měněné předvolby
+prefSetValueDesc=Nová hodnota předvolby
+prefSetValueManual=Nová hodnota pro zadanou předvolbu
+
+# LOCALIZATION NOTE (prefResetDesc, prefResetManual, prefResetSettingDesc,
+# prefResetSettingManual): These strings describe the 'pref reset' command and
+# all its parameters.
+prefResetDesc=Obnoví předvolbu
+prefResetManual=Obnoví předvolbu na výchozí systémovou hodnotu
+prefResetSettingDesc=Obnovovaná předvolba
+prefResetSettingManual=Název obnovované předvolby
+
+# LOCALIZATION NOTE: This string is displayed in the output from the 'pref
+# list' command as a label to an input element that allows the user to filter
+# the results.
+prefOutputFilter=Filtr
+
+# LOCALIZATION NOTE (prefOutputName, prefOutputValue): These strings are
+# displayed in the output from the 'pref list' command as table headings.
+prefOutputName=Název
+prefOutputValue=Hodnota
+
+# LOCALIZATION NOTE (introDesc, introManual): These strings describe the
+# 'intro' command. The localization of 'Got it!' should be the same used in
+# introTextGo.
+introDesc=Zobrazí uvítací zprávu
+introManual=Zobrazí zprávu zobrazovanou uživatelům, dokud nekliknou na tlačítko 'Rozumím'
+
+# LOCALIZATION NOTE (introTextOpening3, introTextCommands, introTextKeys2,
+# introTextF1Escape, introTextGo): These strings are displayed when the user
+# first opens the developer toolbar to explain the command line, and is shown
+# each time it is opened until the user clicks the 'Got it!' button.
+introTextOpening3=Tato příkazová řádka experiment snažící se vytvořit užitečnou příkazovou řádku pro webové vývojáře. 
+introTextCommands=Seznam příkazů lze získat pomocí příkazu
+introTextKeys2=, pro zobrazení/skrytí nápovědy příkazu stiskněte
+introTextF1Escape=F1/Escape
+introTextGo=Rozumím
+
+# LOCALIZATION NOTE: This is a short description of the 'hideIntro' setting.
+hideIntroDesc=Zobrazí úvodní uvítací zprávu
+
+# LOCALIZATION NOTE: This is a description of the 'eagerHelper' setting. It's
+# displayed when the user asks for help on the settings. eagerHelper allows
+# users to select between showing no tooltips, permanent tooltips, and only
+# important tooltips.
+eagerHelperDesc=Jak rychle se zobrazuje nápověda
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/toolkit/chrome/global/devtools/styleinspector.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/toolkit/chrome/global/devtools/styleinspector.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/toolkit/chrome/global/devtools/styleinspector.properties	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/toolkit/chrome/global/devtools/styleinspector.properties	2015-05-25 20:45:42.000000000 +0000
@@ -104,6 +104,14 @@
 # the rule view context menu "Show original sources" entry.
 ruleView.contextmenu.showOrigSources.accessKey=O
 
+# LOCALIZATION NOTE (ruleView.contextmenu.showMdnDocs): Text displayed in the rule view
+# context menu to display docs from MDN for an item.
+ruleView.contextmenu.showMdnDocs=Zobrazit dokumentaci na MDN
+
+# LOCALIZATION NOTE (ruleView.contextmenu.showMdnDocs.accessKey): Access key for
+# the rule view context menu "Show MDN docs" entry.
+ruleView.contextmenu.showMdnDocs.accessKey=Z
+
 # LOCALIZATION NOTE (ruleView.contextmenu.addRule): Text displayed in the
 # rule view context menu for adding a new rule to the element.
 ruleView.contextmenu.addRule=Přidat pravidlo
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/toolkit/chrome/global/intl.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/toolkit/chrome/global/intl.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/toolkit/chrome/global/intl.properties	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/toolkit/chrome/global/intl.properties	2015-05-25 20:45:42.000000000 +0000
@@ -21,7 +21,7 @@
 # language drop-down in the fonts pref panel. Set it to the value of one of the
 # menuitems in the "selectLangs" menulist in
 # browser/components/preferences/fonts.xul
-font.language.group=x-central-euro
+font.language.group=x-western
 # Localization Note: Add the code for your language at the front of this entry,
 # leaving "en-us, en" for fallback. It's recommended to use the same form, e.g.
 # "ja-jp, ja, en-us, en"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/toolkit/chrome/mozapps/extensions/extensions.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/toolkit/chrome/mozapps/extensions/extensions.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-05-25 20:45:42.000000000 +0000
@@ -23,6 +23,9 @@
 <!ENTITY cmd.back.tooltip "Přejde jednu stránku zpět">
 <!ENTITY cmd.forward.tooltip "Přejde jednu stránku vpřed">
 
+<!ENTITY showUnsignedExtensions.button.label  "Některá rozšíření nemohla být ověřena">
+<!ENTITY showAllExtensions.button.label       "Zobrazit všechny rozšíření">
+
 <!-- global warnings -->
 <!ENTITY warning.safemode.label "V nouzovém režimu jsou všechny doplňky zakázány.">
 <!ENTITY warning.checkcompatibility.label "Kontrola kompatibility doplňků je zakázána. Aplikace může obsahovat nekompatibilní doplňky.">
@@ -103,6 +106,7 @@
 <!ENTITY cmd.uninstallAddon.label "Odebrat">
 <!ENTITY cmd.uninstallAddon.accesskey "d">
 <!ENTITY cmd.debugAddon.label "Ladění">
+<!ENTITY cmd.debugAddon.accesskey             "L">
 <!ENTITY cmd.showPreferencesWin.label "Možnosti">
 <!ENTITY cmd.showPreferencesWin.tooltip "Umožní změnit možnosti doplňku">
 <!ENTITY cmd.showPreferencesUnix.label "Předvolby">
@@ -231,3 +235,19 @@
 <!ENTITY experiment.info.changetelemetry.accesskey "N">
 
 <!ENTITY setting.learnmore "Zjistit více…">
+
+<!ENTITY disabledUnsigned.heading "Některé doplňky byly zablokovány">
+<!-- LOCALIZATION NOTE (disabledUnsigned.description.start, disabledUnsigned.description.findAddonsLink, disabledUnsigned.description.end):
+     These entities form a sentence, with
+     disabledUnsigned.description.findAddonsLink being a link to an external site. -->
+<!ENTITY disabledUnsigned.description.start "Následující doplňky nebyly ověřeny pro použití v aplikaci &brandShortName;. Můžete ">
+<!ENTITY disabledUnsigned.description.findAddonsLink "za ně nají náhrady">
+<!ENTITY disabledUnsigned.description.end " nebo požádat vývojáře, aby je nechal ověřit.">
+<!ENTITY disabledUnsigned.learnMore "Zjistěte více o naší snaze o vaši bezpečnost.">
+<!-- LOCALIZATION NOTE (disabledUnsigned.devInfo.start, disabledUnsigned.devInfo.linkToManual, disabledUnsigned.devInfo.end):
+     These entities form a sentence, with disabledUnsigned.devInfo.linkToManual
+     being a link to an external site. -->
+<!ENTITY disabledUnsigned.devInfo.start "Vývojáři, kteří mají zájem o ověření svých rozšíření, mohou pokračovat přečtením ">
+<!ENTITY disabledUnsigned.devInfo.linkToManual "našeho manuálu">
+<!ENTITY disabledUnsigned.devInfo.end ".">
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/toolkit/chrome/mozapps/extensions/extensions.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/toolkit/chrome/mozapps/extensions/extensions.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/toolkit/chrome/mozapps/extensions/extensions.properties	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/toolkit/chrome/mozapps/extensions/extensions.properties	2015-05-25 20:45:42.000000000 +0000
@@ -23,6 +23,12 @@
 
 #LOCALIZATION NOTE (notification.incompatible) %1$S is the add-on name, %2$S is brand name, %3$S is application version
 notification.incompatible=Doplněk %1$S je nekompatibilní s aplikací %2$S %3$S.
+
+#LOCALIZATION NOTE (notification.unsigned, notification.unsignedAndDisabled) %1$S is the add-on name, %2$S is brand name
+notification.unsignedAndDisabled=Doplněk %1$S nemohl být ověřen pro použití v aplikaci %2$S a byl zakázán.
+notification.unsigned=Doplněk %1$S nemohl být ověřen pro použití v aplikaci %2$S. Používejte jej obezřetně.
+notification.unsigned.link=Více informací
+
 #LOCALIZATION NOTE (notification.blocked) %1$S is the add-on name
 notification.blocked=Doplněk %1$S byl zakázán z bezpečnostních a výkonových důvodů.
 notification.blocked.link=Více informací
@@ -74,6 +80,10 @@
 
 #LOCALIZATION NOTE (details.notification.incompatible) %1$S is the add-on name, %2$S is brand name, %3$S is application version
 details.notification.incompatible=Doplněk %1$S je nekompatibilní s aplikací %2$S %3$S.
+#LOCALIZATION NOTE (details.notification.unsigned, details.notification.unsignedAndDisabled) %1$S is the add-on name, %2$S is brand name
+details.notification.unsignedAndDisabled=Doplněk %1$S nemohl býl ověřen pro použití v aplikaci %2$S a byl zakázán.
+details.notification.unsigned=Doplněk %1$S nemohl býl ověřen pro použití v aplikaci %2$S. Používejte jej obezřetně.
+details.notification.unsigned.link=Více informací
 #LOCALIZATION NOTE (details.notification.blocked) %1$S is the add-on name
 details.notification.blocked=Doplněk %1$S byl zakázán z bezpečnostních a výkonových důvodů.
 details.notification.blocked.link=Více informací
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/toolkit/chrome/places/places.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/toolkit/chrome/places/places.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/toolkit/chrome/places/places.properties	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/toolkit/chrome/places/places.properties	2015-05-25 20:45:42.000000000 +0000
@@ -29,8 +29,3 @@
 # %1$S is the file size
 # %2$S is the file size unit
 backupFileSizeText=%1$S %2$S
-
-# LOCALIZATION NOTE (windows8TouchTitle): this is the name of the folder used
-# to store bookmarks created in Metro mode and share bookmarks between Metro
-# and Desktop.
-windows8TouchTitle=Windows 8 Touch
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/webapprt/webapprt/overrides/appstrings.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/webapprt/webapprt/overrides/appstrings.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/webapprt/webapprt/overrides/appstrings.properties	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/webapprt/webapprt/overrides/appstrings.properties	2015-05-25 20:45:42.000000000 +0000
@@ -29,6 +29,7 @@
 externalProtocolChkMsg=Zapamatovat si tuto volbu pro všechny odkazy stejného typu.
 externalProtocolLaunchBtn=Spustit aplikaci
 malwareBlocked=Stránka %S byla nahlášena jako útočná stránka a tak byla na základě vašeho nastavení zablokována.
+unwantedBlocked=Stránka %S byla nahlášena jako stránka s nevyžádaným software a byla zablokována na základě vašeho bezpečnostního nastavení.
 phishingBlocked=Stránka %S byla nahlášena jako podvodná stránka, jejíž účelem je vylákat z uživatelů jejich osobní či finanční informace.
 cspBlocked=Tato aplikace se pokusila přistoupit ke zdroji, který obsahuje bezpečnostní pravidla obsahu, která brání načtení tímto způsobem.
 corruptedContentError=Aplikace nemůže pokračovat v načítání, protože byla detekována chyba při přenášení dat.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/webapprt/webapprt/overrides/dom.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/webapprt/webapprt/overrides/dom.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/cs/webapprt/webapprt/overrides/dom.properties	2015-05-13 18:07:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/cs/webapprt/webapprt/overrides/dom.properties	2015-05-25 20:45:42.000000000 +0000
@@ -151,4 +151,6 @@
 # LOCALIZATION NOTE: Do not translate "XMLHttpRequest"
 SyncXMLHttpRequestWarning=Synchronní XMLHttpRequest v hlavním vláknu je zastaralý z důvodu jeho špatného vlivu na uživatelský zážitek. Pro více informací si přečtěte http://xhr.spec.whatwg.org/
 # LOCALIZATION NOTE: Do not translate "DataContainerEvent" or "CustomEvent"
-DataContainerEventWarning=Použití DataContainerEvent je zastaralé. Používejte raději CustomEvent.
\ No newline at end of file
+DataContainerEventWarning=Použití DataContainerEvent je zastaralé. Používejte raději CustomEvent.
+# LOCALIZATION NOTE: Do not translate "Worker".
+EmptyWorkerSourceWarning=Pokoušíte se vytvářete Worker z prázdného zdroje. To je pravděpodobně neúmyslné.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/browser.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/browser.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/browser.properties	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/browser.properties	2015-05-25 20:46:30.000000000 +0000
@@ -37,21 +37,29 @@
 addonDownloadingAndVerifying=Descargando y verificando complemento…;Descargando y verificando #1 complementos…
 addonDownloadVerifying=Verificando
 
+addonInstall.unsigned=(Sin verificar)
 addonInstall.cancelButton.label=Cancelar
 addonInstall.cancelButton.accesskey=C
 addonInstall.acceptButton.label=Instalar
 addonInstall.acceptButton.accesskey=I
 
-# LOCALIZATION NOTE (addonConfirmInstallMessage):
+# LOCALIZATION NOTE (addonConfirmInstallMessage,addonConfirmInstallUnsigned):
 # Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is brandShortName
 # #2 is the number of add-ons being installed
 addonConfirmInstall.message=Este sitio desea instalar un complemento en #1:;Este sitio desea instalar #2 complementos en #1:
+addonConfirmInstallUnsigned.message=Advertencia: Este sitio desea instalar un complemento sin verificar en #1. Proceda bajo su propio riesgo.;Advertencia: Este sitio desea instalar #2 complementos sin verificar en #1. Proceda bajo su propio riesgo.
+
+# LOCALIZATION NOTE (addonConfirmInstallSomeUnsigned.message):
+# Semicolon-separated list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is brandShortName
+# #2 is the total number of add-ons being installed (at least 2)
+addonConfirmInstallSomeUnsigned.message=;Advertencia: Este sitio desea instalar #2 complementos en #1, algunos de los cuales no están verificados. Proceda bajo su propio riesgo.
 
 addonwatch.slow=%1$S podría estar haciendo que %2$S se ejecute muy lento
 addonwatch.disable.label=Deshabilitar %S
-addonwatch.disable.accesskey=D
 addonwatch.ignoreSession.label=Ignorar por ahora
 addonwatch.ignoreSession.accesskey=I
 addonwatch.ignorePerm.label=Ignorar permanentemente
@@ -69,24 +77,29 @@
 addonInstallRestartButton=Reiniciar ahora
 addonInstallRestartButton.accesskey=R
 
-# LOCALIZATION NOTE (addonError-1, addonError-2, addonError-3, addonError-4, addonError-5):
-# #1 is the add-on name, #2 is the host name, #3 is the application name
-# #4 is the application version
-addonError-1=El complemento no pudo descargarse por una falla en la conexión a #2.
-addonError-2=El complemento de #2 no pudo instalarse poruqe no coincide con el complemento que esperaba #3.
-addonError-3=El complemento descargdo de #2 no pudo instalarse porque parece estar corrupto.
-addonError-4=#1 no pudo instalarse porque #3 no pudo modificar el archivo necesario.
-addonError-5=#3 ha evitado que este sitio instale un complemento no verificado.
-
-# LOCALIZATION NOTE (addonLocalError-1, addonLocalError-2, addonLocalError-3, addonLocalError-4, addonLocalError-5, addonErrorIncompatible, addonErrorBlocklisted):
-# #1 is the add-on name, #3 is the application name, #4 is the application version
-addonLocalError-1=Este complemento no pudo instalarse por un error en el sistema de archivos.
-addonLocalError-2=Este complemento no pudo instalarse porque no coincide con el complemento que esperaba #3.
-addonLocalError-3=Este complemento no pudo instalarse porque parece estar corrupto.
-addonLocalError-4=#1 no pudo instalarse porque #3 no pudo modificar el archivo necesario.
-addonLocalError-5=Este complemento no pudo ser instalado porque no ha sido verificado.
-addonErrorIncompatible=#1 no pudo instalarse porque no es compatible con #3 #4.
-addonErrorBlocklisted=#1 no pudo instalarse porque tiene un riesgo alto de causar problemas de estabilidad o seguridad.
+# LOCALIZATION NOTE (addonInstallError-1, addonInstallError-2, addonInstallError-3, addonInstallError-4, addonInstallError-5, addonLocalInstallError-1, addonLocalInstallError-2, addonLocalInstallError-3, addonLocalInstallError-4, addonLocalInstallError-5):
+# %1$S is the application name, %2$S is the add-on name
+addonInstallError-1=El complemento no pudo descargarse por una falla en la conexión.
+addonInstallError-2=El complemento no pudo instalarse porque no coincide con el complemento que esperaba %1$S.
+addonInstallError-3=El complemento descargdo de este sitio no pudo instalarse porque parece estar corrupto.
+addonInstallError-4=%2$S no pudo instalarse porque %1$S no pudo modificar el archivo necesario.
+addonInstallError-5=%1$S ha evitado que este sitio instale un complemento no verificado.
+addonLocalInstallError-1=Este complemento no pudo instalarse por un error en el sistema de archivos.
+addonLocalInstallError-2=Este complemento no pudo instalarse porque no coincide con el complemento que esperaba %1$S.
+addonLocalInstallError-3=Este complemento no pudo instalarse porque parece estar corrupto.
+addonLocalInstallError-4=%2$S no pudo instalarse porque %1$S no pudo modificar el archivo necesario.
+addonLocalInstallError-5=Este complemento no pudo ser instalado porque no ha sido verificado.
+
+# LOCALIZATION NOTE (addonInstallErrorIncompatible):
+# %1$S is the application name, %2$S is the application version, %3$S is the add-on name
+addonInstallErrorIncompatible=%3$S no pudo instalarse porque no es compatible con %1$S %2$S.
+
+# LOCALIZATION NOTE (addonInstallErrorBlocklisted): %S is add-on name
+addonInstallErrorBlocklisted=%S no pudo instalarse porque tiene un riesgo alto de causar problemas de estabilidad o seguridad.
+
+unsignedAddonsDisabled.message=Uno o más de los complementos instalados no pueden ser verificados y han sido deshabilitados.
+unsignedAddonsDisabled.learnMore.label=Conocer más
+unsignedAddonsDisabled.learnMore.accesskey=C
 
 # LOCALIZATION NOTE (deveditionTheme.name): This should be nearly the brand name for aurora.
 # See browser/branding/aurora/locales/*/brand.properties
@@ -357,8 +370,8 @@
 geolocation.alwaysShareLocation.accesskey=a
 geolocation.neverShareLocation=Nunca compartir ubicación
 geolocation.neverShareLocation.accesskey=N
-geolocation.shareWithSite=¿Desea compartir su ubicación con %S?
-geolocation.shareWithFile=¿Desea compartir su ubicación con el archivo %S?
+geolocation.shareWithSite2=¿Desea compartir su ubicación con este sitio?
+geolocation.shareWithFile2=¿Desea compartir su ubicación con este archivo?
 
 webNotifications.showForSession=Mostrar para esta sesión
 webNotifications.showForSession.accesskey=s
@@ -366,7 +379,7 @@
 webNotifications.alwaysShow.accesskey=a
 webNotifications.neverShow=Siempre bloquear notificaciones
 webNotifications.neverShow.accesskey=n
-webNotifications.showFromSite=¿Desea mostrar notificaciones de %S?
+webNotifications.showFromSite2=¿Desea mostrar notificaciones de este sitio?
 
 # Push Notifications
 push.allowForSession=Permitir para esta sesión
@@ -375,7 +388,7 @@
 push.alwaysAllow.accesskey=a
 push.alwaysBlock=Siempre bloquear notificaciones push
 push.alwaysBlock.accesskey=b
-push.enablePush=¿Desea permitir notificaciones push para %S?
+push.enablePush2=¿Desea permitir notificaciones push para este sitio?
 
 # Pointer lock UI
 
@@ -385,8 +398,8 @@
 pointerLock.alwaysAllow.accesskey=a
 pointerLock.neverAllow=Nunca permitir ocultar
 pointerLock.neverAllow.accesskey=N
-pointerLock.title2=¿Desea permitir que el puntero se oculte en %S?
-pointerLock.autoLock.title2=%S ocultará el puntero.
+pointerLock.title3=¿Desea permitir que el puntero se oculte en este sitio?
+pointerLock.autoLock.title3=Este sitio ocultará el puntero.
 
 # Phishing/Malware Notification Bar.
 # LOCALIZATION NOTE (notAForgery, notAnAttack)
@@ -768,3 +781,38 @@
 #   https://support.mozilla.org/kb/how-do-i-set-up-firefox-sync
 # %S is syncBrandShortName
 readingList.prepopulatedArticles.supportSync = Acceda la lista de lectura en cualquier parte con %S
+
+# LOCALIZATION NOTE (e10s.offerPopup.mainMessage
+#                    e10s.offerPopup.highlight1
+#                    e10s.offerPopup.highlight2
+#                    e10s.offerPopup.enableAndRestart.label
+#                    e10s.offerPopup.enableAndRestart.accesskey
+#                    e10s.offerPopup.noThanks.label
+#                    e10s.offerPopup.noThanks.accesskey
+#                    e10s.postActivationInfobar.message
+#                    e10s.postActivationInfobar.learnMore.label
+#                    e10s.postActivationInfobar.learnMore.accesskey
+#                    e10s.accessibilityNotice.mainMessage
+#                    e10s.accessibilityNotice.disableAndRestart.label
+#                    e10s.accessibilityNotice.disableAndRestart.accesskey
+#                    e10s.accessibilityNotice.dontDisable.label
+#                    e10s.accessibilityNotice.dontDisable.accesskey):
+# These strings are related to the messages we display to offer e10s (Multi-process) to users
+# on the pre-release channels. They won't be used in release but they will likely be used in
+# beta starting from version 41, so it's still useful to have these strings properly localized.
+# %S is brandShortName
+e10s.offerPopup.mainMessage = Multiproceso está llegando pronto a %S. Puede comenzar a usarlo ahora para tener acceso a algunos de sus beneficios desde ahora:
+e10s.offerPopup.highlight1 = Mejor capacidad de respuesta
+e10s.offerPopup.highlight2 = Menos colgadas
+e10s.offerPopup.enableAndRestart.label = Habilitar y reiniciar
+e10s.offerPopup.enableAndRestart.accesskey = e
+e10s.offerPopup.noThanks.label = No, gracias
+e10s.offerPopup.noThanks.accesskey = N
+e10s.postActivationInfobar.message = ¡Ahora está ayudando a probar el multiproceso en %S! Informe los problemas que encuentre.
+e10s.postActivationInfobar.learnMore.label = Conocer más
+e10s.postActivationInfobar.learnMore.accesskey = L
+e10s.accessibilityNotice.mainMessage = Multiproceso aún no soporta las características de acesibilidad. El multiproceso puede deshabilitarse si reinicia %S. ¿Desea reiniciar?
+e10s.accessibilityNotice.disableAndRestart.label = Deshabilitar y reiniciar
+e10s.accessibilityNotice.disableAndRestart.accesskey = r
+e10s.accessibilityNotice.dontDisable.label = No deshabilitar
+e10s.accessibilityNotice.dontDisable.accesskey = D
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/debugger.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/debugger.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/debugger.properties	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/debugger.properties	2015-05-25 20:46:30.000000000 +0000
@@ -214,9 +214,9 @@
 # yet.
 loadingText=Cargando\u2026
 
-# LOCALIZATION NOTE (errorLoadingText): The text that is displayed in the debugger
+# LOCALIZATION NOTE (errorLoadingText2): The text that is displayed in the debugger
 # viewer when there is an error loading a file
-errorLoadingText=Error cargando fuente:\n
+errorLoadingText2=Error cargando URL: %S
 
 # LOCALIZATION NOTE (emptyStackText): The text that is displayed in the watch
 # expressions list to add a new item.
@@ -325,4 +325,4 @@
 variablesViewUninitialized=(no inicializado)
 variablesViewMissingArgs=(no disponible)
 
-evalGroupLabel=Fuentes evaluadas
+anonymousSourcesLabel=Fuentes anónimas
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/font-inspector.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/font-inspector.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/font-inspector.dtd	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/font-inspector.dtd	2015-05-25 20:46:30.000000000 +0000
@@ -7,6 +7,10 @@
 
 <!ENTITY title "Fuentes">
 <!ENTITY showAllFonts "Ver todas las fuentes usadas en esta página">
-<!ENTITY usedAs "Used as: ">
+<!ENTITY usedAs "Usada como: ">
 <!ENTITY system "sistema">
 <!ENTITY remote "remota">
+
+<!-- LOCALIZATION NOTE (previewHint): This is the label shown as the
+     placeholder in font inspector preview text box. -->
+<!ENTITY previewHint "Vista previa">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/gclicommands.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/gclicommands.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/gclicommands.properties	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/gclicommands.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,1566 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# LOCALIZATION NOTE These strings are used inside Web Console commands.
-# The Web Console command line is available from the Web Developer sub-menu
-# -> 'Web Console'.
-#
-# The correct localization of this file might be to keep it in
-# English, or another language commonly spoken among web developers.
-# You want to make that choice consistent across the developer tools.
-# A good criteria is the language in which you'd find the best
-# documentation on web development on the web.
-
-# LOCALIZATION NOTE (helpDesc) A very short string used to describe the
-# function of the help command.
-helpDesc=Obtener ayuda sobre los comandos disponibles
-
-# LOCALIZATION NOTE (helpAvailable) Used in the output of the help command to
-# explain the contents of the command help table.
-helpAvailable=Comandos disponibles
-
-# LOCALIZATION NOTE (notAvailableInE10S) Used in the output of any command that
-# is not compatible with multiprocess mode (E10S).
-notAvailableInE10S=El comando '%1$S' no está disponible en modo multiproceso (E10S)
-
-# LOCALIZATION NOTE (consoleDesc) A very short string used to describe the
-# function of the console command.
-consoleDesc=Comandos para controlar la consola
-
-# LOCALIZATION NOTE (consoleManual) A longer description describing the
-# set of commands that control the console.
-consoleManual=Filtrar, limpiar y cerrar la consola web
-
-# LOCALIZATION NOTE (consoleclearDesc) A very short string used to describe the
-# function of the 'console clear' command.
-consoleclearDesc=Limpiar la consola
-
-# LOCALIZATION NOTE (screenshotDesc) A very short description of the
-# 'screenshot' command. See screenshotManual for a fuller description of what
-# it does. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible.
-screenshotDesc=Guardar una imagen de la página
-
-# LOCALIZATION NOTE (screenshotManual) A fuller description of the 'screenshot'
-# command, displayed when the user asks for help on what it does.
-screenshotManual=Guardar una imagen PNG del ventana visible completa (opcionalmente después de un retardo)
-
-# LOCALIZATION NOTE (screenshotFilenameDesc) A very short string to describe
-# the 'filename' parameter to the 'screenshot' command, which is displayed in
-# a dialog when the user is using this command.
-screenshotFilenameDesc=Archivo de destino
-
-# LOCALIZATION NOTE (screenshotFilenameManual) A fuller description of the
-# 'filename' parameter to the 'screenshot' command, displayed when the user
-# asks for help on what it does.
-screenshotFilenameManual=El nombre del archivo (debería tener una extensión '.png') en el cual guardar la captura de pantalla.
-
-# LOCALIZATION NOTE (screenshotClipboardDesc) A very short string to describe
-# the 'clipboard' parameter to the 'screenshot' command, which is displayed in
-# a dialog when the user is using this command.
-screenshotClipboardDesc=¿Copiar captura al portapapeles? (verdadero/falso)
-
-
-# LOCALIZATION NOTE (screenshotClipboardManual) A fuller description of the
-# 'clipboard' parameter to the 'screenshot' command, displayed when the user
-# asks for help on what it does.
-screenshotClipboardManual=Verdadero si quiere copiar la captura en lugar de guardarla en un archivo.
-
-# LOCALIZATION NOTE (screenshotChromeDesc) A very short string to describe
-# the 'chrome' parameter to the 'screenshot' command, which is displayed in
-# a dialog when the user is using this command.
-# The argument (%1$S) is the browser name.
-screenshotChromeDesc2=¿Capturar ventana chrome de %1$S? (verdadero/falso)
-
-# LOCALIZATION NOTE (screenshotChromeManual) A fuller description of the
-# 'chrome' parameter to the 'screenshot' command, displayed when the user
-# asks for help on what it does.
-# The argument (%1$S) is the browser name.
-screenshotChromeManual2=Verdadero si desea hacer la captura de pantalla de la ventana de %1$S en lugar de la ventana con el contenido de la página web.
-
-# LOCALIZATION NOTE (screenshotGroupOptions) A label for the optional options of
-# the screenshot command.
-screenshotGroupOptions=Opciones
-
-# LOCALIZATION NOTE (screenshotGroupOptions) A label for the advanced options of
-# the screenshot command.
-screenshotAdvancedOptions=Opciones avanzadas
-
-# LOCALIZATION NOTE (screenshotDelayDesc) A very short string to describe
-# the 'delay' parameter to the 'screenshot' command, which is displayed in
-# a dialog when the user is using this command.
-screenshotDelayDesc=Retardo (segundos)
-
-# LOCALIZATION NOTE (screenshotDelayManual) A fuller description of the
-# 'delay' parameter to the 'screenshot' command, displayed when the user
-# asks for help on what it does.
-screenshotDelayManual=El tiempo a esperar (en segundos) antes de tomar la captura de pantalla
-
-# LOCALIZATION NOTE (screenshotFullscreenDesc) A very short string to describe
-# the 'fullscreen' parameter to the 'screenshot' command, which is displayed in
-# a dialog when the user is using this command.
-screenshotFullPageDesc=¿Página completa? (verdadero/falso)
-
-# LOCALIZATION NOTE (screenshotFullscreenManual) A fuller description of the
-# 'fullscreen' parameter to the 'screenshot' command, displayed when the user
-# asks for help on what it does.
-screenshotFullPageManual=Verdadero si la captura debería incluír partes de la página que está fuera de los límites visibles actualmente.
-
-# LOCALIZATION NOTE (screenshotSelectorChromeConflict) Exception thwon when user
-# tries to use 'selector' option along with 'chrome' option of the screenshot
-# command. Refer: https://bugzilla.mozilla.org/show_bug.cgi?id=659268#c7
-screenshotSelectorChromeConflict=selector option is not supported when chrome option is true
-
-# LOCALIZATION NOTE (screenshotGeneratedFilename) The auto generated filename
-# when no file name is provided. the first argument (%1$S) is the date string
-# in yyyy-mm-dd format and the second argument (%2$S) is the time string
-# in HH.MM.SS format. Please don't add the extension here.
-screenshotGeneratedFilename=Captura %1$S - %2$S
-
-# LOCALIZATION NOTE (screenshotErrorSavingToFile) Text displayed to user upon
-# encountering error while saving the screenshot to the file specified.
-screenshotErrorSavingToFile=Error guardando en
-
-# LOCALIZATION NOTE (screenshotSavedToFile) Text displayed to user when the
-# screenshot is successfully saved to the file specified.
-screenshotSavedToFile=Guardado en
-
-# LOCALIZATION NOTE (screenshotErrorCopying) Text displayed to user upon
-# encountering error while copying the screenshot to clipboard.
-screenshotErrorCopying=Ocurrió un error al copiar al portapapeles.
-
-# LOCALIZATION NOTE (screenshotCopied) Text displayed to user when the
-# screenshot is successfully copied to the clipboard.
-screenshotCopied=Copiado al portapapeles.
-
-# LOCALIZATION NOTE (screenshotTooltip) Text displayed as tooltip for screenshot button in devtools ToolBox.
-screenshotTooltip=Tomar una captura de página completa
-
-# LOCALIZATION NOTE (screenshotImgurDesc) A very short string to describe
-# the 'imgur' parameter to the 'screenshot' command, which is displayed in
-# a dialog when the user is using this command.
-screenshotImgurDesc=Subir a imgur.com
-
-# LOCALIZATION NOTE (screenshotImgurManual) A fuller description of the
-# 'imgur' parameter to the 'screenshot' command, displayed when the user
-# asks for help on what it does.
-screenshotImgurManual=Use si desea subir a imgur.com en vez de guardar en el disco
-
-# LOCALIZATION NOTE (screenshotImgurError) Text displayed to user upon
-# encountering error while uploading the screenshot to imgur.com.
-screenshotImgurError=No se pudo alcanzar la API de imgur
-
-# LOCALIZATION NOTE (screenshotImgurUploading) Text displayed to user when the
-# screenshot is successfully sent to Imgur but the program is waiting on a response.
-# The argument (%1$S) is a new image URL at Imgur.
-screenshotImgurUploaded=Subido a %1$S
-
-# LOCALIZATION NOTE (highlightDesc) A very short description of the
-# 'highlight' command. See highlightManual for a fuller description of what
-# it does. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible.
-highlightDesc=Resaltar nodos
-
-# LOCALIZATION NOTE (highlightManual) A fuller description of the 'highlight'
-# command, displayed when the user asks for help on what it does.
-highlightManual=Resalta nodos que coincidan con un selector en la págna
-
-# LOCALIZATION NOTE (highlightSelectorDesc) A very short string to describe
-# the 'selector' parameter to the 'highlight' command, which is displayed in
-# a dialog when the user is using this command.
-highlightSelectorDesc=Selector CSS
-
-# LOCALIZATION NOTE (highlightSelectorManual) A fuller description of the
-# 'selector' parameter to the 'highlight' command, displayed when the user
-# asks for help on what it does.
-highlightSelectorManual=El selector CSS usado para coincidir con los nodos de la página
-
-# LOCALIZATION NOTE (highlightOptionsDesc) The title of a set of options to
-# the 'highlight' command, displayed as a heading to the list of option.
-highlightOptionsDesc=Opciones
-
-# LOCALIZATION NOTE (highlightHideGuidesDesc) A very short string to describe
-# the 'hideguides' option parameter to the 'highlight' command, which is
-# displayed in a dialog when the user is using this command.
-highlightHideGuidesDesc=Ocultar guías
-
-# LOCALIZATION NOTE (highlightHideGuidesManual) A fuller description of the
-# 'hideguides' option parameter to the 'highlight' command, displayed when the
-# user asks for help on what it does.
-highlightHideGuidesManual=Oculta las guías alrededor del nodo resaltado
-
-# LOCALIZATION NOTE (highlightShowInfoBarDesc) A very short string to describe
-# the 'showinfobar' option parameter to the 'highlight' command, which is
-# displayed in a dialog when the user is using this command.
-highlightShowInfoBarDesc=Mostrar información del nodo
-
-# LOCALIZATION NOTE (highlightShowInfoBarManual) A fuller description of the
-# 'showinfobar' option parameter to the 'highlight' command, displayed when the
-# user asks for help on what it does.
-highlightShowInfoBarManual=Muestra la barra de información sobre el nodo resaltado (la barra de información muestra el nombre de etiqueta, atributos y dimensión)
-
-# LOCALIZATION NOTE (highlightShowAllDesc) A very short string to describe
-# the 'showall' option parameter to the 'highlight' command, which is
-# displayed in a dialog when the user is using this command.
-highlightShowAllDesc=Mostrar todas las coincidencias
-
-# LOCALIZATION NOTE (highlightShowAllManual) A fuller description of the
-# 'showall' option parameter to the 'highlight' command, displayed when the
-# user asks for help on what it does.
-highlightShowAllManual=Si demasiados nodos coinciden con el selector, se mostrarán solamente los primeros cien para evitar sobrecargar la página. Use esta opción para mostrar todas las coincidencias
-
-# LOCALIZATION NOTE (highlightRegionDesc) A very short string to describe the
-# 'region' option parameter to the 'highlight' command, which is displayed in a
-# dialog when the user is using this command.
-highlightRegionDesc=Box model region
-
-# LOCALIZATION NOTE (highlightRegionManual) A fuller description of the 'region'
-# option parameter to the 'highlight' command, displayed when the user asks for
-# help on what it does.
-highlightRegionManual=Which box model region should be highlighted: 'content', 'padding', 'border' or 'margin'
-
-# LOCALIZATION NOTE (highlightFillDesc) A very short string to describe the
-# 'fill' option parameter to the 'highlight' command, which is displayed in a
-# dialog when the user is using this command.
-highlightFillDesc=Estilo de llenado
-
-# LOCALIZATION NOTE (highlightFillManual) A fuller description of the 'fill'
-# option parameter to the 'highlight' command, displayed when the user asks for
-# help on what it does.
-highlightFillManual=Override the default region fill style with a custom color
-
-# LOCALIZATION NOTE (highlightKeepDesc) A very short string to describe the
-# 'keep' option parameter to the 'highlight' command, which is displayed in a
-# dialog when the user is using this command.
-highlightKeepDesc=Mantener resaltadores existentes
-
-# LOCALIZATION NOTE (highlightKeepManual) A fuller description of the 'keep'
-# option parameter to the 'highlight' command, displayed when the user asks for
-# help on what it does.
-highlightKeepManual=Por defecto, los resaltadores existentes se ocultan al ejecutar el comando, a menos que se establezca esta opción
-
-# LOCALIZATION NOTE (highlightOutputConfirm) A confirmation message for the
-# 'highlight' command, displayed to the user once the command has been entered,
-# informing the user how many nodes have been highlighted successfully and how
-# to turn highlighting off
-highlightOutputConfirm2=%1$S nodo resaltado;%1$S nodos resaltados
-
-# LOCALIZATION NOTE (highlightOutputMaxReached) A confirmation message for the
-# 'highlight' command, displayed to the user once the command has been entered,
-# informing the user how many nodes have been highlighted successfully and that
-# some nodes could not be highlighted due to the maximum number of nodes being
-# reached, and how to turn highlighting off
-highlightOutputMaxReached=%1$S nodos coincidentes, pero solo %2$S nodos resaltados. Use '--showall' para mostrarlos a todos
-
-# LOCALIZATION NOTE (unhighlightDesc) A very short description of the
-# 'unhighlight' command. See unhighlightManual for a fuller description of what
-# it does. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible.
-unhighlightDesc=Unhighlight all nodes
-
-# LOCALIZATION NOTE (unhighlightManual) A fuller description of the 'unhighlight'
-# command, displayed when the user asks for help on what it does.
-unhighlightManual=Unhighlight all nodes previously highlighted with the 'highlight' command
-
-# LOCALIZATION NOTE (restartBrowserDesc) A very short description of the
-# 'restart' command. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible.
-# The argument (%1$S) is the browser name.
-restartBrowserDesc=Reiniciar %1$S
-
-# LOCALIZATION NOTE (restartBrowserNocacheDesc) A very short string to
-# describe the 'nocache' parameter to the 'restart' command, which is
-# displayed in a dialog when the user is using this command.
-restartBrowserNocacheDesc=Deshabilita cargar contenido de caché al reiniciar
-
-# LOCALIZATION NOTE (restartBrowserRequestCancelled) A string displayed to the
-# user when a scheduled restart has been aborted by the user.
-restartBrowserRequestCancelled=Pedido de reinicio cancelado por el usuario.
-
-# LOCALIZATION NOTE (restartBrowserRestarting) A string displayed to the
-# user when a restart has been initiated without a delay.
-# The argument (%1$S) is the browser name.
-restartBrowserRestarting=Reiniciando %1$S…
-
-# LOCALIZATION NOTE (inspectDesc) A very short description of the 'inspect'
-# command. See inspectManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-inspectDesc=Inspeccionar un nodo
-
-# LOCALIZATION NOTE (inspectManual) A fuller description of the 'inspect'
-# command, displayed when the user asks for help on what it does.
-inspectManual=Investigar las dimensiones y propiedades de un elemento usando un selector CSS para abrir el resaltador de DOM
-
-# LOCALIZATION NOTE (inspectNodeDesc) A very short string to describe the
-# 'node' parameter to the 'inspect' command, which is displayed in a dialog
-# when the user is using this command.
-inspectNodeDesc=Selector CSS
-
-# LOCALIZATION NOTE (inspectNodeManual) A fuller description of the 'node'
-# parameter to the 'inspect' command, displayed when the user asks for help
-# on what it does.
-inspectNodeManual=Un selector CSS para usar con Document.querySelector que identifica un elemento solo
-
-# LOCALIZATION NOTE (eyedropperDesc) A very short description of the 'eyedropper'
-# command. See eyedropperManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-eyedropperDesc=Tomar un color de la página
-
-# LOCALIZATION NOTE (eyedropperManual) A fuller description of the 'eyedropper'
-# command, displayed when the user asks for help on what it does.
-eyedropperManual=Abre un panel que magnifica un área de la página para inspeccionar píxeles y copiar valores de color
-
-# LOCALIZATION NOTE (eyedropperTooltip) A string displayed as the
-# tooltip of button in devtools toolbox which toggles the Eyedropper tool.
-eyedropperTooltip=Toma un color de la página
-
-# LOCALIZATION NOTE (tiltDesc) A very short description of the 'tilt'
-# command. See tiltManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-tiltDesc=Visualizar la página web en 3D
-
-# LOCALIZATION NOTE (tiltManual) A fuller description of the 'tilt'
-# command, displayed when the user asks for help on what it does.
-tiltManual=Investigar la relación entre varias partes de una página web y sus ancestros en un ambiente 3D
-
-# LOCALIZATION NOTE (tiltOpenDesc) A very short description of the 'tilt inspect'
-# command. See tiltOpenManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-tiltOpenDesc=Abrir la vista 3D del inspector
-
-# LOCALIZATION NOTE (tiltOpenManual) A fuller description of the 'tilt translate'
-# command, displayed when the user asks for help on what it does.
-tiltOpenManual=Inicializar el inspector de páginas 3D y opcionalmente resaltar un nodo usando un selector CSS
-
-# LOCALIZATION NOTE (tiltToggleTooltip) A string displayed as the
-# tooltip of button in devtools toolbox which toggles Tilt 3D View.
-tiltToggleTooltip=Vista 3D
-
-# LOCALIZATION NOTE (tiltTranslateDesc) A very short description of the 'tilt translate'
-# command. See tiltTranslateManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-tiltTranslateDesc=Move the webpage mesh
-
-# LOCALIZATION NOTE (tiltTranslateManual) A fuller description of the 'tilt translate'
-# command, displayed when the user asks for help on what it does.
-tiltTranslateManual=Incrementally translate the webpage mesh in a certain direction
-
-# LOCALIZATION NOTE (tiltTranslateXDesc) A very short string to describe the
-# 'x' parameter to the 'tilt translate' command, which is displayed in a dialog
-# when the user is using this command.
-tiltTranslateXDesc=X (píxeles)
-
-# LOCALIZATION NOTE (tiltTranslateXManual) A fuller description of the 'x'
-# parameter to the 'translate' command, displayed when the user asks for help
-# on what it does.
-tiltTranslateXManual=The ammount in pixels to translate the webpage mesh on the X axis
-
-# LOCALIZATION NOTE (tiltTranslateYDesc) A very short string to describe the
-# 'y' parameter to the 'tilt translate' command, which is displayed in a dialog
-# when the user is using this command.
-tiltTranslateYDesc=Y (pixels)
-
-# LOCALIZATION NOTE (tiltTranslateYManual) A fuller description of the 'y'
-# parameter to the 'translate' command, displayed when the user asks for help
-# on what it does.
-tiltTranslateYManual=The ammount in pixels to translate the webpage mesh on the Y axis
-
-# LOCALIZATION NOTE (tiltRotateDesc) A very short description of the 'tilt rotate'
-# command. See tiltRotateManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-tiltRotateDesc=Spin the webpage mesh
-
-# LOCALIZATION NOTE (tiltRotateManual) A fuller description of the 'tilt rotate'
-# command, displayed when the user asks for help on what it does.
-tiltRotateManual=Incrementally rotate the webpage mesh in a certain direction
-
-# LOCALIZATION NOTE (tiltRotateXDesc) A very short string to describe the
-# 'x' parameter to the 'tilt rotate' command, which is displayed in a dialog
-# when the user is using this command.
-tiltRotateXDesc=X (grados)
-
-# LOCALIZATION NOTE (tiltRotateXManual) A fuller description of the 'x'
-# parameter to the 'rotate' command, displayed when the user asks for help
-# on what it does.
-tiltRotateXManual=The ammount in degrees to rotate the webpage mesh along the X axis
-
-# LOCALIZATION NOTE (tiltRotateYDesc) A very short string to describe the
-# 'y' parameter to the 'tilt rotate' command, which is displayed in a dialog
-# when the user is using this command.
-tiltRotateYDesc=Y (grados)
-
-# LOCALIZATION NOTE (tiltRotateYManual) A fuller description of the 'y'
-# parameter to the 'rotate' command, displayed when the user asks for help
-# on what it does.
-tiltRotateYManual=The ammount in degrees to rotate the webpage mesh along the Y axis
-
-# LOCALIZATION NOTE (tiltRotateZDesc) A very short string to describe the
-# 'z' parameter to the 'tilt rotate' command, which is displayed in a dialog
-# when the user is using this command.
-tiltRotateZDesc=Z (grados)
-
-# LOCALIZATION NOTE (tiltRotateZManual) A fuller description of the 'z'
-# parameter to the 'rotate' command, displayed when the user asks for help
-# on what it does.
-tiltRotateZManual=The ammount in degrees to rotate the webpage mesh along the Z axis
-
-# LOCALIZATION NOTE (tiltZoomDesc) A very short description of the 'tilt zoom'
-# command. See tiltZoomManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-tiltZoomDesc=Move away or towards the webpage mesh
-
-# LOCALIZATION NOTE (tiltZoomManual) A fuller description of the 'tilt zoom'
-# command, displayed when the user asks for help on what it does.
-tiltZoomManual=Incrementally move the webpage mesh in a certain direction along the Z axis
-
-# LOCALIZATION NOTE (tiltZoomAmountDesc) A very short string to describe the
-# 'zoom' parameter to the 'tilt zoom' command, which is displayed in a dialog
-# when the user is using this command.
-tiltZoomAmountDesc=Zoom (pixels)
-
-# LOCALIZATION NOTE (tiltZoomAmmuntManual) A fuller description of the 'zoom'
-# parameter to the 'zoom' command, displayed when the user asks for help
-# on what it does.
-tiltZoomAmountManual=The amount in pixels to translate the webpage mesh along the Z axis
-
-# LOCALIZATION NOTE (tiltResetDesc) A very short description of the 'tilt reset'
-# command. See tiltResetManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-tiltResetDesc=Reset the translation, rotation and zoom
-
-# LOCALIZATION NOTE (tiltResetManual) A fuller description of the 'tilt reset'
-# command, displayed when the user asks for help on what it does.
-tiltResetManual=Resets any transformations applied to the webpage mesh modelview matrix
-
-# LOCALIZATION NOTE (tiltCloseDesc) A very short description of the 'tilt close'
-# command. See tiltCloseManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-tiltCloseDesc=Cerrar la visualización si está abierta
-
-# LOCALIZATION NOTE (tiltCloseManual) A fuller description of the 'tilt close'
-# command, displayed when the user asks for help on what it does.
-tiltCloseManual=Close the visualization and switch back to the Inspector default highlighter
-
-# LOCALIZATION NOTE (debuggerClosed) Used in the output of several commands
-# to explain that the debugger must be opened first.
-debuggerClosed=El depurador debe estar abierto antes de usar este comando
-
-# LOCALIZATION NOTE (debuggerStopped) Used in the output of several commands
-# to explain that the debugger must be opened first.
-debuggerStopped=The debugger must be opened before setting breakpoints
-
-# LOCALIZATION NOTE (breakDesc) A very short string used to describe the
-# function of the break command.
-breakDesc=Manage breakpoints
-
-# LOCALIZATION NOTE (breakManual) A longer description describing the
-# set of commands that control breakpoints.
-breakManual=Commands to list, add and remove breakpoints
-
-# LOCALIZATION NOTE (breaklistDesc) A very short string used to describe the
-# function of the 'break list' command.
-breaklistDesc=Display known breakpoints
-
-# LOCALIZATION NOTE (breaklistNone) Used in the output of the 'break list'
-# command to explain that the list is empty.
-breaklistNone=No breakpoints set
-
-# LOCALIZATION NOTE (breaklistOutRemove) A title used in the output from the
-# 'break list' command on a button which can be used to remove breakpoints
-breaklistOutRemove=Eliminar
-
-# LOCALIZATION NOTE (breakaddAdded) Used in the output of the 'break add'
-# command to explain that a breakpoint was added.
-breakaddAdded=Added breakpoint
-
-# LOCALIZATION NOTE (breakaddFailed) Used in the output of the 'break add'
-# command to explain that a breakpoint could not be added.
-breakaddFailed=Could not set breakpoint: %S
-
-# LOCALIZATION NOTE (breakaddDesc) A very short string used to describe the
-# function of the 'break add' command.
-breakaddDesc=Add a breakpoint
-
-# LOCALIZATION NOTE (breakaddManual) A longer description describing the
-# set of commands that are responsible for adding breakpoints.
-breakaddManual=Breakpoint types supported: line
-
-# LOCALIZATION NOTE (breakaddlineDesc) A very short string used to describe the
-# function of the 'break add line' command.
-breakaddlineDesc=Add a line breakpoint
-
-# LOCALIZATION NOTE (breakaddlineFileDesc) A very short string used to describe
-# the function of the file parameter in the 'break add line' command.
-breakaddlineFileDesc=JS file URI
-
-# LOCALIZATION NOTE (breakaddlineLineDesc) A very short string used to describe
-# the function of the line parameter in the 'break add line' command.
-breakaddlineLineDesc=Número de línea
-
-# LOCALIZATION NOTE (breakdelDesc) A very short string used to describe the
-# function of the 'break del' command.
-breakdelDesc=Remove a breakpoint
-
-# LOCALIZATION NOTE (breakdelBreakidDesc) A very short string used to describe
-# the function of the index parameter in the 'break del' command.
-breakdelBreakidDesc=Index of breakpoint
-
-# LOCALIZATION NOTE (breakdelRemoved) Used in the output of the 'break del'
-# command to explain that a breakpoint was removed.
-breakdelRemoved=Breakpoint removed
-
-# LOCALIZATION NOTE (dbgDesc) A very short string used to describe the
-# function of the dbg command.
-dbgDesc=Administrar depurador
-
-# LOCALIZATION NOTE (dbgManual) A longer description describing the
-# set of commands that control the debugger.
-dbgManual=Commands to interrupt or resume the main thread, step in, out and over lines of code
-
-# LOCALIZATION NOTE (dbgOpen) A very short string used to describe the function
-# of the dbg open command.
-dbgOpen=Abrir el depurador
-
-# LOCALIZATION NOTE (dbgClose) A very short string used to describe the function
-# of the dbg close command.
-dbgClose=Cerrar el depurador
-
-# LOCALIZATION NOTE (dbgInterrupt) A very short string used to describe the
-# function of the dbg interrupt command.
-dbgInterrupt=Pauses the main thread
-
-# LOCALIZATION NOTE (dbgContinue) A very short string used to describe the
-# function of the dbg continue command.
-dbgContinue=Resumes the main thread, and continues execution following a breakpoint, until the next breakpoint or the termination of the script.
-
-# LOCALIZATION NOTE (dbgStepDesc) A very short string used to describe the
-# function of the dbg step command.
-dbgStepDesc=Manage stepping
-
-# LOCALIZATION NOTE (dbgStepManual) A longer description describing the
-# set of commands that control stepping.
-dbgStepManual=Commands to step in, out and over lines of code
-
-# LOCALIZATION NOTE (dbgStepOverDesc) A very short string used to describe the
-# function of the dbg step over command.
-dbgStepOverDesc=Executes the current statement and then stops at the next statement. If the current statement is a function call then the debugger executes the whole function, and it stops at the next statement after the function call
-
-# LOCALIZATION NOTE (dbgStepInDesc) A very short string used to describe the
-# function of the dbg step over command.
-dbgStepInDesc=Executes the current statement and then stops at the next statement. If the current statement is a function call, then the debugger steps into that function, otherwise it stops at the next statement
-
-# LOCALIZATION NOTE (dbgStepOutDesc) A very short string used to describe the
-# function of the dbg step over command.
-dbgStepOutDesc=Steps out of the current function and up one level if the function is nested. If in the main body, the script is executed to the end, or to the next breakpoint. The skipped statements are executed, but not stepped through
-
-# LOCALIZATION NOTE (dbgListSourcesDesc) A very short string used to describe the
-# function of the dbg list command.
-dbgListSourcesDesc=Listar las URLs fuente cargadas en el depurador
-
-# LOCALIZATION NOTE (dbgBlackBoxDesc) A very short string used to describe the
-# function of the 'dbg blackbox' command.
-dbgBlackBoxDesc=Black box sources in the debugger
-
-# LOCALIZATION NOTE (dbgBlackBoxSourceDesc) A very short string used to describe the
-# 'source' parameter to the 'dbg blackbox' command.
-dbgBlackBoxSourceDesc=A specific source to black box
-
-# LOCALIZATION NOTE (dbgBlackBoxGlobDesc) A very short string used to describe the
-# 'glob' parameter to the 'dbg blackbox' command.
-dbgBlackBoxGlobDesc=Black box all sources that match this glob (for example: "*.min.js")
-
-# LOCALIZATION NOTE (dbgBlackBoxInvertDesc) A very short string used to describe the
-# 'invert' parameter to the 'dbg blackbox' command.
-dbgBlackBoxInvertDesc=Invert matching, so that we black box every source that is not the source provided or does not match the provided glob pattern.
-
-# LOCALIZATION NOTE (dbgBlackBoxEmptyDesc) A very short string used to let the
-# user know that no sources were black boxed.
-dbgBlackBoxEmptyDesc=(No sources black boxed)
-
-# LOCALIZATION NOTE (dbgBlackBoxNonEmptyDesc) A very short string used to let the
-# user know which sources were black boxed.
-dbgBlackBoxNonEmptyDesc=The following sources were black boxed:
-
-# LOCALIZATION NOTE (dbgBlackBoxErrorDesc) A very short string used to let the
-# user know there was an error black boxing a source (whose url follows this
-# text).
-dbgBlackBoxErrorDesc=Error black boxing:
-
-# LOCALIZATION NOTE (dbgUnBlackBoxDesc) A very short string used to describe the
-# function of the 'dbg unblackbox' command.
-dbgUnBlackBoxDesc=Stop black boxing sources in the debugger
-
-# LOCALIZATION NOTE (dbgUnBlackBoxSourceDesc) A very short string used to describe the
-# 'source' parameter to the 'dbg unblackbox' command.
-dbgUnBlackBoxSourceDesc=A specific source to stop black boxing
-
-# LOCALIZATION NOTE (dbgUnBlackBoxGlobDesc) A very short string used to describe the
-# 'glob' parameter to the 'dbg blackbox' command.
-dbgUnBlackBoxGlobDesc=Stop black boxing all sources that match this glob (for example: "*.min.js")
-
-# LOCALIZATION NOTE (dbgUnBlackBoxEmptyDesc) A very short string used to let the
-# user know that we did not stop black boxing any sources.
-dbgUnBlackBoxEmptyDesc=(Did not stop black boxing any sources)
-
-# LOCALIZATION NOTE (dbgUnBlackBoxNonEmptyDesc) A very short string used to let the
-# user know which sources we stopped black boxing.
-dbgUnBlackBoxNonEmptyDesc=Stopped black boxing the following sources:
-
-# LOCALIZATION NOTE (dbgUnBlackBoxErrorDesc) A very short string used to let the
-# user know there was an error black boxing a source (whose url follows this
-# text).
-dbgUnBlackBoxErrorDesc=Error stopping black boxing:
-
-# LOCALIZATION NOTE (dbgUnBlackBoxInvertDesc) A very short string used to describe the
-# 'invert' parameter to the 'dbg unblackbox' command.
-dbgUnBlackBoxInvertDesc=Invert matching, so that we stop black boxing every source that is not the source provided or does not match the provided glob pattern.
-
-# LOCALIZATION NOTE (consolecloseDesc) A very short description of the
-# 'console close' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-consolecloseDesc=Cerrar la consola
-
-# LOCALIZATION NOTE (consoleopenDesc) A very short description of the
-# 'console open' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-consoleopenDesc=Abrir la consola
-
-# LOCALIZATION NOTE (editDesc) A very short description of the 'edit'
-# command. See editManual2 for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-editDesc=Tweak a page resource
-
-# LOCALIZATION NOTE (editManual2) A fuller description of the 'edit' command,
-# displayed when the user asks for help on what it does.
-editManual2=Editar uno de los recursos que es parte de esta página
-
-# LOCALIZATION NOTE (editResourceDesc) A very short string to describe the
-# 'resource' parameter to the 'edit' command, which is displayed in a dialog
-# when the user is using this command.
-editResourceDesc=URL a editar
-
-# LOCALIZATION NOTE (editLineToJumpToDesc) A very short string to describe the
-# 'line' parameter to the 'edit' command, which is displayed in a dialog
-# when the user is using this command.
-editLineToJumpToDesc=Línea a la cual ir
-
-# LOCALIZATION NOTE (resizePageDesc) A very short string to describe the
-# 'resizepage' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-resizePageDesc=Resize the page
-
-# LOCALIZATION NOTE (resizePageArgWidthDesc) A very short string to describe the
-# 'width' parameter to the 'resizepage' command, which is displayed in a dialog
-# when the user is using this command.
-resizePageArgWidthDesc=Ancho en pixeles
-
-# LOCALIZATION NOTE (resizePageArgWidthDesc) A very short string to describe the
-# 'height' parameter to the 'resizepage' command, which is displayed in a dialog
-# when the user is using this command.
-resizePageArgHeightDesc=Altura en pixeles
-
-# LOCALIZATION NOTE (resizeModeOnDesc) A very short string to describe the
-# 'resizeon ' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-resizeModeOnDesc=Entrar en modo de diseño adaptable
-
-# LOCALIZATION NOTE (resizeModeOffDesc) A very short string to describe the
-# 'resize off' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-resizeModeOffDesc=Salir de modo de diseño adaptable
-
-# LOCALIZATION NOTE (resizeModeToggleDesc) A very short string to describe the
-# 'resize toggle' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-resizeModeToggleDesc=Toggle Responsive Design Mode
-
-# LOCALIZATION NOTE (resizeModeToggleTooltip) A string displayed as the
-# tooltip of button in devtools toolbox which toggles Responsive Design Mode.
-resizeModeToggleTooltip=Modo de diseño adaptable
-
-# LOCALIZATION NOTE (resizeModeToDesc) A very short string to describe the
-# 'resize to' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-resizeModeToDesc=Alterar tamaño de página
-
-# LOCALIZATION NOTE (resizeModeDesc) A very short string to describe the
-# 'resize' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-resizeModeDesc=Controlar modo de diseño adaptable
-
-# LOCALIZATION NOTE (resizeModeManual) A fuller description of the 'resize'
-# command, displayed when the user asks for help on what it does.
-# The argument (%1$S) is the browser name.
-resizeModeManual2=Los sitios web adaptables responden a su entorno, así que se ven bien en una pantalla de celular, una pantalla de cine y todo lo que hay en el medio. El modo de diseño adaptable permite probar fácilmente una variedad de tamaños de página en %1$S sin necesidad de cambiar el tamaño del navegador completo.
-
-# LOCALIZATION NOTE (cmdDesc) A very short description of the 'cmd'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-cmdDesc=Manipular los comandos
-
-# LOCALIZATION NOTE (cmdRefreshDesc) A very short description of the 'cmd refresh'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-cmdRefreshDesc=Releer directorio mozcmd
-
-# LOCALIZATION NOTE (cmdStatus3) When the we load new commands from mozcmd
-# directory, we report where we loaded from using %1$S.
-cmdStatus3=Comandos cargados desde '%1$S'
-
-# LOCALIZATION NOTE (cmdSetdirDesc) 
-cmdSetdirDesc=Configurar un directorio mozcmd
-
-# LOCALIZATION NOTE (cmdSetdirManual2) A fuller description of the 'cmd setdir'
-# command, displayed when the user asks for help on what it does.
-cmdSetdirManual2=Un directorio 'mozcmd' es una forma fácil de crear nuevos comandos personalizados. Para más información vea la <a href="https://developer.mozilla.org/docs/Tools/GCLI/Customization">documentación de MDN</a>.
-
-# LOCALIZATION NOTE (cmdSetdirDirectoryDesc) The description of the directory
-# parameter to the 'cmd setdir' command.
-cmdSetdirDirectoryDesc=Directorio conteniendo archivos .mozcmd
-
-# LOCALIZATION NOTE (addonDesc) A very short description of the 'addon'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-addonDesc=Manipular complementos
-
-# LOCALIZATION NOTE (addonListDesc) A very short description of the 'addon list'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-addonListDesc=Listar complementos instalados
-
-# LOCALIZATION NOTE (addonListTypeDesc) A very short description of the
-# 'addon list <type>' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-addonListTypeDesc=Seleccionar un tipo de complemento
-
-# LOCALIZATION NOTE (addonListDictionaryHeading, addonListExtensionHeading,
-# addonListLocaleHeading, addonListPluginHeading, addonListThemeHeading,
-# addonListUnknownHeading) Used in the output of the 'addon list' command as the
-# first line of output.
-addonListDictionaryHeading=Los siguientes diccionarios están actualmente instalados:
-addonListExtensionHeading=Las siguientes extensiones están actualmente instaladas:
-addonListLocaleHeading=Los siguientes idiomas están actualmente instalados:
-addonListPluginHeading=Los siguientes plugins están actualmente instalados:
-addonListThemeHeading=Los siguientes temas están actualmente instalados:
-addonListAllHeading=Los siguientes complementos están actualmente instalados:
-addonListUnknownHeading=Los siguientes complementos del tipo seleccionado están actualmente instalados:
-
-# LOCALIZATION NOTE (addonListOutEnable, addonListOutDisable) Used in the
-# output of the 'addon list' command as the labels for the enable/disable
-# action buttons in the listing. This string is designed to be shown in a
-# small action button next to the addon name, which is why it should be as
-# short as possible.
-addonListOutEnable=Habilitar
-addonListOutDisable=Deshabilitar
-
-# LOCALIZATION NOTE (addonPending, addonPendingEnable, addonPendingDisable,
-# addonPendingUninstall, addonPendingInstall, addonPendingUpgrade) Used in
-# the output of the 'addon list' command as the descriptions of pending
-# addon operations. addonPending is used as a prefix for a list of pending
-# actions (named by the other lookup variables). These strings are designed
-# to be shown alongside addon names, which is why they should be as short
-# as possible.
-addonPending=pendiente
-addonPendingEnable=habilitar
-addonPendingDisable=deshabilitar
-addonPendingUninstall=desinstalar
-addonPendingInstall=instalar
-addonPendingUpgrade=actualizar
-
-# LOCALIZATION NOTE (addonNameDesc) A very short description of the
-# name parameter of numerous addon commands. This string is designed to be shown
-# in a menu alongside the command name, which is why it should be as short as
-# possible.
-addonNameDesc=Nombre del complemento
-
-# LOCALIZATION NOTE (addonNoneOfType) Used in the output of the 'addon list'
-# command when a search for addons of a particular type were not found.
-addonNoneOfType=No hay complementos instalados de ese tipo.
-
-# LOCALIZATION NOTE (addonEnableDesc) A very short description of the
-# 'addon enable <type>' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-addonEnableDesc=Habilitar el complemento especificado
-
-# LOCALIZATION NOTE (addonAlreadyEnabled) Used in the output of the
-# 'addon enable' command when an attempt is made to enable an addon is already
-# enabled.
-addonAlreadyEnabled=%S ya está habilitado.
-
-# LOCALIZATION NOTE (addonEnabled) Used in the output of the 'addon enable'
-# command when an addon is enabled.
-addonEnabled=%S habilitado.
-
-# LOCALIZATION NOTE (addonDisableDesc) A very short description of the
-# 'addon disable <type>' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-addonDisableDesc=Deshabilitar el complemento especificado
-
-# LOCALIZATION NOTE (addonAlreadyDisabled) Used in the output of the
-# 'addon disable' command when an attempt is made to disable an addon is already
-# disabled.
-addonAlreadyDisabled=%S ya está deshabilitado.
-
-# LOCALIZATION NOTE (addonDisabled) Used in the output of the 'addon disable'
-# command when an addon is disabled.
-addonDisabled=%S deshabilitado.
-
-# LOCALIZATION NOTE (exportDesc) A very short description of the 'export'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-exportDesc=Exportar recursos
-
-# LOCALIZATION NOTE (exportHtmlDesc) A very short description of the 'export
-# html' command. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible.
-exportHtmlDesc=Exportar HTML de la página
-
-# LOCALIZATION NOTE (pagemodDesc) A very short description of the 'pagemod'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-pagemodDesc=Hacer cambios en la página
-
-# LOCALIZATION NOTE (pagemodReplaceDesc) A very short description of the
-# 'pagemod replace' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-pagemodReplaceDesc=Buscar y reemplazar en elementos de página
-
-# LOCALIZATION NOTE (pagemodReplaceSearchDesc) A very short string to describe
-# the 'search' parameter to the 'pagemod replace' command, which is displayed in
-# a dialog when the user is using this command.
-pagemodReplaceSearchDesc=Qué buscar
-
-# LOCALIZATION NOTE (pagemodReplaceReplaceDesc) A very short string to describe
-# the 'replace' parameter to the 'pagemod replace' command, which is displayed in
-# a dialog when the user is using this command.
-pagemodReplaceReplaceDesc=Cadena de reemplazo
-
-# LOCALIZATION NOTE (pagemodReplaceIgnoreCaseDesc) A very short string to
-# describe the 'ignoreCase' parameter to the 'pagemod replace' command, which is
-# displayed in a dialog when the user is using this command.
-pagemodReplaceIgnoreCaseDesc=Perform case-insensitive search
-
-# LOCALIZATION NOTE (pagemodReplaceRootDesc) A very short string to describe the
-# 'root' parameter to the 'pagemod replace' command, which is displayed in
-# a dialog when the user is using this command.
-pagemodReplaceRootDesc=CSS selector to root of search
-
-# LOCALIZATION NOTE (pagemodReplaceSelectorDesc) A very short string to describe
-# the 'selector' parameter to the 'pagemod replace' command, which is displayed
-# in a dialog when the user is using this command.
-pagemodReplaceSelectorDesc=CSS selector to match in search
-
-# LOCALIZATION NOTE (pagemodReplaceAttributesDesc) A very short string to
-# describe the 'attributes' parameter to the 'pagemod replace' command, which is
-# displayed in a dialog when the user is using this command.
-pagemodReplaceAttributesDesc=Attribute match regexp
-
-# LOCALIZATION NOTE (pagemodReplaceAttrOnlyDesc) A very short string to describe
-# the 'attrOnly' parameter to the 'pagemod replace' command, which is displayed
-# in a dialog when the user is using this command.
-pagemodReplaceAttrOnlyDesc=Restringir búsqueda a atributos
-
-# LOCALIZATION NOTE (pagemodReplaceContentOnlyDesc) A very short string to
-# describe the 'contentOnly' parameter to the 'pagemod replace' command, which
-# is displayed in a dialog when the user is using this command.
-pagemodReplaceContentOnlyDesc=Restringir búsqueda a nodos de texto
-
-# LOCALIZATION NOTE (pagemodReplaceResultMatchedElements) A string displayed as
-# the result of the 'pagemod replace' command.
-pagemodReplaceResult=Elements matched by selector: %1$S. Replaces in text nodes: %2$S. Replaces in attributes: %3$S.
-
-# LOCALIZATION NOTE (pagemodRemoveDesc) A very short description of the
-# 'pagemod remove' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-pagemodRemoveDesc=Eliminar elemetos y atributos de la página
-
-# LOCALIZATION NOTE (pagemodRemoveElementDesc) A very short description of the
-# 'pagemod remove element' command. This string is designed to be shown in
-# a menu alongside the command name, which is why it should be as short as
-# possible.
-pagemodRemoveElementDesc=Eliminar elementos de la página
-
-# LOCALIZATION NOTE (pagemodRemoveElementSearchDesc) A very short string to
-# describe the 'search' parameter to the 'pagemod remove element' command, which
-# is displayed in a dialog when the user is using this command.
-pagemodRemoveElementSearchDesc=CSS selector specifying elements to remove
-
-# LOCALIZATION NOTE (pagemodRemoveElementRootDesc) A very short string to
-# describe the 'root' parameter to the 'pagemod remove element' command, which
-# is displayed in a dialog when the user is using this command.
-pagemodRemoveElementRootDesc=CSS selector specifying root of search
-
-# LOCALIZATION NOTE (pagemodRemoveElementStripOnlyDesc) A very short string to
-# describe the 'stripOnly' parameter to the 'pagemod remove element' command,
-# which is displayed in a dialog when the user is using this command.
-pagemodRemoveElementStripOnlyDesc=Eliminar elemento pero mantener contenido
-
-# LOCALIZATION NOTE (pagemodRemoveElementIfEmptyOnlyDesc) A very short string to
-# describe the 'ifEmptyOnly' parameter to the 'pagemod remove element' command,
-# which is displayed in a dialog when the user is using this command.
-pagemodRemoveElementIfEmptyOnlyDesc=Eliminar solamente elementos vacíos
-
-# LOCALIZATION NOTE (pagemodRemoveElementResultMatchedAndRemovedElements)
-# A string displayed as the result of the 'pagemod remove element' command.
-pagemodRemoveElementResultMatchedAndRemovedElements=Elements matched by selector: %1$S. Elements removed: %2$S.
-
-# LOCALIZATION NOTE (pagemodRemoveAttributeDesc) A very short description of the
-# 'pagemod remove attribute' command. This string is designed to be shown in
-# a menu alongside the command name, which is why it should be as short as
-# possible.
-pagemodRemoveAttributeDesc=Remove matching atributes
-
-# LOCALIZATION NOTE (pagemodRemoveAttributeSearchAttributesDesc) A very short
-# string to describe the 'searchAttributes' parameter to the 'pagemod remove
-# attribute' command, which is displayed in a dialog when the user is using this
-# command.
-pagemodRemoveAttributeSearchAttributesDesc=Regexp specifying attributes to remove
-
-# LOCALIZATION NOTE (pagemodRemoveAttributeSearchElementsDesc) A very short
-# string to describe the 'searchElements' parameter to the 'pagemod remove
-# attribute' command, which is displayed in a dialog when the user is using this
-# command.
-pagemodRemoveAttributeSearchElementsDesc=CSS selector of elements to include
-
-# LOCALIZATION NOTE (pagemodRemoveAttributeRootDesc) A very short string to
-# describe the 'root' parameter to the 'pagemod remove attribute' command, which
-# is displayed in a dialog when the user is using this command.
-pagemodRemoveAttributeRootDesc=CSS selector of root of search
-
-# LOCALIZATION NOTE (pagemodRemoveAttributeIgnoreCaseDesc) A very short string
-# to describe the 'ignoreCase' parameter to the 'pagemod remove attribute'
-# command, which is displayed in a dialog when the user is using this command.
-pagemodRemoveAttributeIgnoreCaseDesc=Perform case-insensitive search
-
-# LOCALIZATION NOTE (pagemodRemoveAttributeResult) A string displayed as the
-# result of the 'pagemod remove attribute' command.
-pagemodRemoveAttributeResult=Elements matched by selector: %1$S. Attributes removed: %2$S.
-
-# LOCALIZATION NOTE (toolsDesc2) A very short description of the 'tools'
-# command, the parent command for tool-hacking commands.
-# The argument (%1$S) is the browser name.
-toolsDesc2=Hackear las herramientas de desarrollador de %1$S
-
-# LOCALIZATION NOTE (toolsManual2) A fuller description of the 'tools'
-# command. The argument (%1$S) is the browser name.
-toolsManual2=Varios comands relacionados con el hackeo directo de las herramientas de desarrollador de %1$S.
-
-# LOCALIZATION NOTE (toolsSrcdirDesc) A very short description of the 'tools srcdir'
-# command, for pointing your developer tools loader at a mozilla-central source tree.
-toolsSrcdirDesc=Cargar herramientas desde un checkout de mozilla-central
-
-# LOCALIZATION NOTE (toolsSrcdirNotFound) Shown when the 'tools srcdir' command was handed
-# an invalid srcdir.
-toolsSrcdirNotFound=%1$s no existe o no es un checkout de mozilla-central.
-
-# LOCALIZATION NOTE (toolsSrcdirReloaded) Displayed when tools have been reloaded by the
-# 'tools srcdir' command.
-toolsSrcdirReloaded=Herramientas cargadas desde %1$s.
-
-# LOCALIZATION NOTE (toolsSrcdirManual2) A full description of the 'tools srcdir'
-# command. The argument (%1$S) is the browser name.
-toolsSrcdirManual2=Cargar las herramientas de desarrollador de %1$S desde un checkout completo de mozilla-central.
-
-# LOCALIZATION NOTE (toolsSrcdirDir) The srcdir argument to the 'tools srcdir' command.
-toolsSrcdirDir=Un checkout de mozilla-central
-
-# LOCALIZATION NOTE (toolsBuiltinDesc) A short description of the 'tools builtin'
-# command, which overrides a previous 'tools srcdir' command.
-toolsBuiltinDesc=Usar las herramientas integradas
-
-# LOCALIZATION NOTE (toolsBuiltinDesc) A fuller description of the 'tools builtin'
-# command.
-toolsBuiltinManual=Usar las herramientas integradas, en lugar de cualquier comando srcdir previo.
-
-# LOCALIZATION NOTE (toolsBuiltinReloaded) Displayed when tools are loaded with the
-# 'tools builtin' command.
-toolsBuiltinReloaded=Herramientas integradas cargadas.
-
-# LOCALIZATION NOTE (toolsReloadDesc) A short description of the 'tools reload' command.
-# which will reload the tools from the current srcdir.
-toolsReloadDesc=Recargar las herramientas de desarrollador
-
-# LOCALIZATION NOTE (toolsReloaded2) Displayed when tools are reloaded with the 'tools
-# reload' command.
-toolsReloaded2=Herramientas recargadas.
-
-# LOCALIZATION NOTE (cookieDesc) A very short description of the 'cookie'
-# command. See cookieManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-cookieDesc=Mostrar y alterar cookies
-
-# LOCALIZATION NOTE (cookieManual) A fuller description of the 'cookie'
-# command, displayed when the user asks for help on what it does.
-cookieManual=Comandos para listar, crear, borrar y alterar cookies para el dominio actual.
-
-# LOCALIZATION NOTE (cookieListDesc) A very short description of the
-# 'cookie list' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-cookieListDesc=Mostrar cookies
-
-# LOCALIZATION NOTE (cookieListManual) A fuller description of the 'cookie list'
-# command, displayed when the user asks for help on what it does.
-cookieListManual=Mostrar una lista de cookies relevantes a la página actual.
-
-# LOCALIZATION NOTE (cookieListOutHost,cookieListOutPath,cookieListOutExpires,cookieListOutAttributes):
-# The 'cookie list' command has a number of headings for cookie properties.
-# Particular care should be taken in translating these strings as they have
-# references to names in the cookies spec.
-cookieListOutHost=Servidor:
-cookieListOutPath=Ruta:
-cookieListOutExpires=Expira:
-cookieListOutAttributes=Atributos:
-
-# LOCALIZATION NOTE (cookieListOutNone) The output of the 'cookie list' command
-# uses this string when no cookie attributes (like httpOnly, secure, etc) apply
-cookieListOutNone=Ninguna
-
-# LOCALIZATION NOTE (cookieListOutSession) The output of the 'cookie list'
-# command uses this string to describe a cookie with an expiry value of '0'
-# that is to say it is a session cookie
-cookieListOutSession=Al salir del navegador (sesión)
-
-# LOCALIZATION NOTE (cookieListOutNonePage) The output of the 'cookie list'
-# command uses this string for pages like 'about:blank' which can't contain
-# cookies
-cookieListOutNonePage=No se encontraron cookies en esta página
-
-# LOCALIZATION NOTE (cookieListOutNoneHost) The output of the 'cookie list'
-# command uses this string when there are no cookies on a given web page
-cookieListOutNoneHost=No se encontraron cookies para el servidor %1$S
-
-# LOCALIZATION NOTE (cookieListOutEdit) A title used in the output from the
-# 'cookie list' command on a button which can be used to edit cookie values
-cookieListOutEdit=Editar
-
-# LOCALIZATION NOTE (cookieListOutRemove) A title used in the output from the
-# 'cookie list' command on a button which can be used to remove cookies
-cookieListOutRemove=Eliminar
-
-# LOCALIZATION NOTE (cookieRemoveDesc) A very short description of the
-# 'cookie remove' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-cookieRemoveDesc=Eliminar cookie
-
-# LOCALIZATION NOTE (cookieRemoveManual) A fuller description of the 'cookie remove'
-# command, displayed when the user asks for help on what it does.
-cookieRemoveManual=Remove a cookie, given its key
-
-# LOCALIZATION NOTE (cookieRemoveKeyDesc) A very short string to describe the
-# 'key' parameter to the 'cookie remove' command, which is displayed in a dialog
-# when the user is using this command.
-cookieRemoveKeyDesc=The key of the cookie to remove
-
-# LOCALIZATION NOTE (cookieSetDesc) A very short description of the
-# 'cookie set' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-cookieSetDesc=Set a cookie
-
-# LOCALIZATION NOTE (cookieSetManual) A fuller description of the 'cookie set'
-# command, displayed when the user asks for help on what it does.
-cookieSetManual=Set a cookie by specifying a key name, it's value and optionally one or more of the following attributes: expires (max-age in seconds or the expires date in GMTString format), path, domain, secure
-
-# LOCALIZATION NOTE (cookieSetKeyDesc) A very short string to describe the
-# 'key' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetKeyDesc=The key of the cookie to set
-
-# LOCALIZATION NOTE (cookieSetValueDesc) A very short string to describe the
-# 'value' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetValueDesc=The value of the cookie to set
-
-# LOCALIZATION NOTE (cookieSetOptionsDesc) The title of a set of options to
-# the 'cookie set' command, displayed as a heading to the list of option.
-cookieSetOptionsDesc=Opciones
-
-# LOCALIZATION NOTE (cookieSetPathDesc) A very short string to describe the
-# 'path' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetPathDesc=The path of the cookie to set
-
-# LOCALIZATION NOTE (cookieSetDomainDesc) A very short string to describe the
-# 'domain' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetDomainDesc=The domain of the cookie to set
-
-# LOCALIZATION NOTE (cookieSetSecureDesc) A very short string to describe the
-# 'secure' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetSecureDesc=Sólo se transmite sobre https
-
-# LOCALIZATION NOTE (cookieSetHttpOnlyDesc) A very short string to describe the
-# 'httpOnly' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetHttpOnlyDesc=No accesible desde script del lado del ciente
-
-# LOCALIZATION NOTE (cookieSetSessionDesc) A very short string to describe the
-# 'session' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetSessionDesc=Solamente válido para el tiempo de vida de la sesión del navegador
-
-# LOCALIZATION NOTE (cookieSetExpiresDesc) A very short string to describe the
-# 'expires' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetExpiresDesc=La fecha de expiración de cookie (fecha RFC2822 o ISO 8601)
-
-# LOCALIZATION NOTE (jsbDesc) A very short description of the
-# 'jsb' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-jsbDesc=Embellecedor de JavaScript
-
-# LOCALIZATION NOTE (jsbUrlDesc) A very short description of the
-# 'jsb <url>' parameter. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-jsbUrlDesc=URL del archivo JS a embellecer
-
-# LOCALIZATION NOTE (jsbIndentSizeDesc) A very short description of the
-# 'jsb <indentSize>' parameter. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-jsbIndentSizeDesc=Tamaño de sangría en caracteres
-
-# LOCALIZATION NOTE (jsbIndentSizeManual) A fuller description of the
-# 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
-# does.
-jsbIndentSizeManual=Número de caracteres con los que indentar cada línea
-
-# LOCALIZATION NOTE (jsbIndentCharDesc) A very short description of the
-# 'jsb <indentChar>' parameter. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-jsbIndentCharDesc=Caracteres usados para indentar cada línea
-
-# LOCALIZATION NOTE (jsbIndentCharManual) A fuller description of the
-# 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
-# does.
-jsbIndentCharManual=Caracteres usados para indentar cada línea. Posibles opciones son espacio o tab.
-
-# the 'jsb <doNotPreserveNewlines>' parameter. This string is designed to be
-# shown in a menu alongside the command name, which is why it should be as short
-# as possible.
-jsbDoNotPreserveNewlinesDesc=No mantener saltos de línea
-
-# LOCALIZATION NOTE (jsbPreserveNewlinesManual) A fuller description of the
-# 'jsb <jsbPreserveNewlines>' parameter, displayed when the user asks for help
-# on what it does.
-jsbPreserveNewlinesManual=Se deberían mantener los saltos de línea existentes
-
-# LOCALIZATION NOTE (jsbPreserveMaxNewlinesDesc) A very short description of the
-# 'jsb <preserveMaxNewlines>' parameter. This string is designed to be shown
-# in a menu alongside the command name, which is why it should be as short as
-# possible.
-jsbPreserveMaxNewlinesDesc=Cantidad máxima de saltos de línea consecutivos
-
-# LOCALIZATION NOTE (jsbPreserveMaxNewlinesManual) A fuller description of the
-# 'jsb <preserveMaxNewlines>' parameter, displayed when the user asks for help
-# on what it does.
-jsbPreserveMaxNewlinesManual=El numero máximo de saltos de línea consecutivos a preservar
-
-# LOCALIZATION NOTE (jsbJslintHappyDesc) A very short description of the
-# 'jsb <jslintHappy>' parameter. This string is designed to be shown
-# in a menu alongside the command name, which is why it should be as short as
-# possible.
-jsbJslintHappyDesc=¿Forzar modo jslint-stricter?
-
-# LOCALIZATION NOTE (jsbJslintHappyManual) A fuller description of the
-# 'jsb <jslintHappy>' parameter, displayed when the user asks for help
-# on what it does.
-jsbJslintHappyManual=Al establecerlo a true, el modo jslint-stricter es forzado
-
-# LOCALIZATION NOTE (jsbBraceStyleDesc2) A very short description of the
-# 'jsb <braceStyle>' parameter. This string is designed to be shown
-# in a menu alongside the command name, which is why it should be as short as
-# possible.
-jsbBraceStyleDesc2=Seleccione el estilo de codificación de llaves
-
-# LOCALIZATION NOTE (jsbBraceStyleManual2) A fuller description of the
-# 'jsb <braceStyle>' parameter, displayed when the user asks for help
-# on what it does.
-#
-# NOTES: The keywords collapse, expand, end-expand and expand-strict should not
-# be translated. "even if it will break your code" means that the resulting code
-# may no longer be functional.
-jsbBraceStyleManual2=Seleccione el estilo de codificación de llaves: collapse - poner llaves en la misma línea de las sentencias de control; expand - poner llaves en su propia línea (Allman / estilo ANSI ); end-expand - poner llaves de cierre en su propia línea; expand-strict - poner llaves en su propia línea aún si se rompe el código.
-
-# LOCALIZATION NOTE (jsbNoSpaceBeforeConditionalDesc) A very short description
-# of the 'jsb <noSpaceBeforeConditional>' parameter. This string is designed to
-# be shown in a menu alongside the command name, which is why it should be as
-# short as possible.
-jsbNoSpaceBeforeConditionalDesc=Sin espacio antes de sentencias condicionales
-
-# LOCALIZATION NOTE (jsbUnescapeStringsDesc) A very short description of the
-# 'jsb <unescapeStrings>' parameter. This string is designed to be shown
-# in a menu alongside the command name, which is why it should be as short as
-# possible.
-jsbUnescapeStringsDesc=Unescape \\xNN characters?
-
-# LOCALIZATION NOTE (jsbUnescapeStringsManual) A fuller description of the
-# 'jsb <unescapeStrings>' parameter, displayed when the user asks for help
-# on what it does.
-jsbUnescapeStringsManual=Should printable characters in strings encoded in \\xNN notation be unescaped?
-
-# LOCALIZATION NOTE (jsbInvalidURL) Displayed when an invalid URL is passed to
-# the jsb command.
-jsbInvalidURL=Ingrese una URL válida
-
-# LOCALIZATION NOTE (jsbOptionsDesc) The title of a set of options to
-# the 'jsb' command, displayed as a heading to the list of options.
-jsbOptionsDesc=Opciones
-
-# LOCALIZATION NOTE (calllogDesc) A very short description of the
-# 'calllog' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-calllogDesc=Commands to manipulate function call logging
-
-# LOCALIZATION NOTE (calllogStartDesc) A very short description of the
-# 'calllog start' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-calllogStartDesc=Start logging function calls to the console
-
-# LOCALIZATION NOTE (calllogStartReply) A string displayed as the result of
-# the 'calllog start' command.
-calllogStartReply=Call logging started.
-
-# LOCALIZATION NOTE (calllogStopDesc) A very short description of the
-# 'calllog stop' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-calllogStopDesc=Stop function call logging
-
-# LOCALIZATION NOTE (calllogStopNoLogging) A string displayed as the result of
-# the 'calllog stop' command when there is nothing to stop.
-calllogStopNoLogging=No call logging is currently active
-
-# LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
-# the 'calllog stop' command when there are logging actions to stop.
-calllogStopReply=Stopped call logging. Active contexts: %1$S.
-
-# LOCALIZATION NOTE (calllogStartChromeDesc) A very short description of the
-# 'calllog chromestart' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-calllogChromeStartDesc=Start logging function calls for chrome code to the console
-
-# LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
-# 'calllog chromestart <sourceType>' parameter. This string is designed to be
-# shown in a menu alongside the command name, which is why it should be as short as possible.
-calllogChromeSourceTypeDesc=Global object, JSM URI, or JS to get a global object from
-
-# LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
-# 'calllog chromestart' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-calllogChromeSourceTypeManual=The global object, URI of a JSM, or JS to execute in the chrome window from which to obtain a global object
-
-# LOCALIZATION NOTE (calllogChromeStartReply) A string displayed as the result
-# of the 'calllog chromestart' command.
-calllogChromeStartReply=Call logging started.
-
-# LOCALIZATION NOTE (calllogChromeStopDesc) A very short description of the
-# 'calllog chromestop' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-calllogChromeStopDesc=Stop function call logging
-
-# LOCALIZATION NOTE (calllogChromeStopNoLogging) A string displayed as the
-# result of the 'calllog chromestop' command when there is nothing to stop.
-calllogChromeStopNoLogging=No call logging for chrome code is currently active
-
-# LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
-# the 'calllog chromestop' command when there are logging actions to stop.
-calllogChromeStopReply=Stopped call logging. Active contexts: %1$S.
-
-# LOCALIZATION NOTE (callLogChromeAnonFunction) A string displayed as the result
-# of the 'calllog chromestart' command when an anonymouse function is to be
-# logged.
-callLogChromeAnonFunction=<anónimo>
-
-# LOCALIZATION NOTE (callLogChromeMethodCall) A string displayed as the result
-# of the 'calllog chromestart' command to proceed a method name when it is to be
-# logged.
-callLogChromeMethodCall=Llamada a método
-
-# LOCALIZATION NOTE (callLogChromeInvalidJSM) A string displayed as the result
-# of the 'calllog chromestart' command with an invalid JSM or JSM path.
-callLogChromeInvalidJSM=Invalid JSM!
-
-# LOCALIZATION NOTE (callLogChromeVarNotFoundContent) A string displayed as the
-# result of the 'calllog chromestart' command with a source type of
-# content-variable and an invalid variable name.
-callLogChromeVarNotFoundContent=Variable no encontrada en ventana de contenido.
-
-# LOCALIZATION NOTE (callLogChromeVarNotFoundChrome) A string displayed as the
-# result of the 'calllog chromestart' command with a source type of
-# chrome-variable and an invalid variable name.
-callLogChromeVarNotFoundChrome=Variable no encontrada en ventana de chrome.
-
-# LOCALIZATION NOTE (callLogChromeEvalException) A string displayed as the
-# result of the 'calllog chromestart' command with a source type of javascript
-# and invalid JavaScript code.
-callLogChromeEvalException=JavaScript evaluado lanzó la siguiente excepción
-
-# LOCALIZATION NOTE (callLogChromeEvalNeedsObject) A string displayed as the
-# result of passing a non-JavaScript object creating source via the
-# 'calllog chromestart javascript' command.
-callLogChromeEvalNeedsObject=The JavaScript source must evaluate to an object whose method calls are to be logged e.g. "({a1: function() {this.a2()},a2: function() {}});"
-
-# LOCALIZATION NOTE (scratchpadOpenTooltip) A string displayed as the
-# tooltip of button in devtools toolbox which opens Scratchpad.
-scratchpadOpenTooltip=Borrador
-
-# LOCALIZATION NOTE (paintflashingDesc) A very short string used to describe the
-# function of the "paintflashing" command
-paintflashingDesc=Resaltar área pintada
-
-# LOCALIZATION NOTE (paintflashingOnDesc) A very short string used to describe the
-# function of the "paintflashing on" command.
-paintflashingOnDesc=Encender parpadeo de pintura
-
-# LOCALIZATION NOTE (paintflashingOffDesc) A very short string used to describe the
-# function of the "paintflashing off" command.
-paintflashingOffDesc=Apagar parpadeo de pintura
-
-# LOCALIZATION NOTE (paintflashingChrome) A very short string used to describe the
-# function of the "paintflashing on/off chrome" command.
-paintflashingChromeDesc=chrome frames
-
-# LOCALIZATION NOTE (paintflashingManual) A longer description describing the
-# set of commands that control paint flashing.
-paintflashingManual=Dibujar áreas repintadas en diferentes colores
-
-# LOCALIZATION NOTE (paintflashingTooltip) A string displayed as the
-# tooltip of button in devtools toolbox which toggles paint flashing.
-paintflashingTooltip=Resaltar área pintada
-
-# LOCALIZATION NOTE (paintflashingOnDesc) A very short string used to describe the
-# function of the "paintflashing on" command.
-paintflashingToggleDesc=Intercambiar parpadeo de la pintura
-
-# LOCALIZATION NOTE (splitconsoleTooltip) A string displayed as the
-# tooltip of button in devtools toolbox which toggles the split webconsole.
-splitconsoleTooltip=Intercambiar consola dividida
-
-# LOCALIZATION NOTE (appCacheDesc) A very short string used to describe the
-# function of the "appcache" command
-appCacheDesc=Utilidades de caché de aplicaciones
-
-# LOCALIZATION NOTE (appCacheValidateDesc) A very short string used to describe
-# the function of the "appcache validate" command.
-appCacheValidateDesc=Validar manifiesto del caché
-
-# LOCALIZATION NOTE (appCacheValidateManual) A fuller description of the
-# 'validate' parameter to the 'appcache' command, displayed when the user asks
-# for help on what it does.
-appCacheValidateManual=Buscar problemas relacionados con el manifiesto del caché y los archivos a los que referencia
-
-# LOCALIZATION NOTE (appCacheValidateUriDesc) A very short string used to describe
-# the function of the "uri" parameter of the appcache validate" command.
-appCacheValidateUriDesc=URI a verificar
-
-# LOCALIZATION NOTE (appCacheValidated) Displayed by the "appcache validate"
-# command when it has been successfully validated.
-appCacheValidatedSuccessfully=Appcache validado exitosamente.
-
-# LOCALIZATION NOTE (appCacheClearDesc) A very short string used to describe
-# the function of the "appcache clear" command.
-appCacheClearDesc=Limpiar entradas el caché de aplicaciones
-
-# LOCALIZATION NOTE (appCacheClearManual) A fuller description of the
-# 'appcache clear' command, displayed when the user asks for help on what it does.
-appCacheClearManual=Limpiar una o más entradas del caché de aplicaciones
-
-# LOCALIZATION NOTE (appCacheClearCleared) Displayed by the "appcache clear"
-# command when entries are successfully cleared.
-appCacheClearCleared=Entradas borradas exitosamente.
-
-# LOCALIZATION NOTE (AppCacheListDesc) A very short string used to describe
-# the function of the "appcache list" command.
-appCacheListDesc=Mostrar una lista de las entradas del caché de aplicaciones.
-
-# LOCALIZATION NOTE (AppCacheListManual) A fuller description of the
-# 'appcache list' command, displayed when the user asks for help on what it does.
-appCacheListManual=Mostrar una lista de todas las entradas del caché de aplicaciones. Si se usó el parámetro de búsqueda, la tabla muestra las entradas que contengan el término a buscar.
-
-# LOCALIZATION NOTE (AppCacheListSearchDesc) A very short string used to describe
-# the function of the "search" parameter of the appcache list" command.
-appCacheListSearchDesc=Filtrar resultados usando un término de búsqueda.
-
-# LOCALIZATION NOTE (AppCacheList*) Row headers for the 'appcache list' command.
-appCacheListKey=Clave:
-appCacheListDataSize=Tamaño de datos:
-appCacheListDeviceID=ID de dispositivo:
-appCacheListExpirationTime=Expira:
-appCacheListFetchCount=Cantidad de entregas:
-appCacheListLastFetched=Última entrega:
-appCacheListLastModified=Última modificación:
-
-# LOCALIZATION NOTE (appCacheListViewEntry) The text for the view entry button
-# of the 'appcache list' command.
-appCacheListViewEntry=Ver entrada
-
-# LOCALIZATION NOTE (appCacheViewEntryDesc) A very short string used to describe
-# the function of the "appcache viewentry" command.
-appCacheViewEntryDesc=Abrir una nueva pestaña conteniendo la información de la entrada de caché especificada.
-
-# LOCALIZATION NOTE (appCacheViewEntryManual) A fuller description of the
-# 'appcache viewentry' command, displayed when the user asks for help on what it
-# does.
-appCacheViewEntryManual=Abrir una nueva pestaña conteniendo la información de la entrada de caché especificada.
-
-# LOCALIZATION NOTE (appCacheViewEntryKey) A very short string used to describe
-# the function of the "key" parameter of the 'appcache viewentry' command.
-appCacheViewEntryKey=La clave para la entrada a mostrar.
-
-# LOCALIZATION NOTE (profilerDesc) A very short string used to describe the
-# function of the profiler command.
-profilerDesc=Administrar perfilador
-
-# LOCALIZATION NOTE (profilerManual) A longer description describing the
-# set of commands that control the profiler.
-profilerManual=Comandos para iniciar o detener el perfilador de JavaScript
-
-# LOCALIZATION NOTE (profilerOpen) A very short string used to describe the function
-# of the profiler open command.
-profilerOpenDesc=Abrir el perfilador
-
-# LOCALIZATION NOTE (profilerClose) A very short string used to describe the function
-# of the profiler close command.
-profilerCloseDesc=Cerrar el perfilador
-
-# LOCALIZATION NOTE (profilerStart) A very short string used to describe the function
-# of the profiler start command.
-profilerStartDesc=Iniciar perfilado
-
-# LOCALIZATION NOTE (profilerStartManual) A fuller description of the 'profile name'
-# parameter. This parameter is used to name a newly created profile or to lookup
-# an existing profile by its name.
-profilerStartManual=Nombre del perfil que desea iniciar.
-
-# LOCALIZATION NOTE (profilerStop) A very short string used to describe the function
-# of the profiler stop command.
-profilerStopDesc=Detener perfilado
-
-# LOCALIZATION NOTE (profilerStopManual) A fuller description of the 'profile name'
-# parameter. This parameter is used to lookup an existing profile by its name.
-profilerStopManual=Nombre del perfil que desea detener.
-
-# LOCALIZATION NOTE (profilerList) A very short string used to describe the function
-# of the profiler list command.
-profilerListDesc=Listar todos los perfiles
-
-# LOCALIZATION NOTE (profilerShow) A very short string used to describe the function
-# of the profiler show command.
-profilerShowDesc=Mostrar perfil individual
-
-# LOCALIZATION NOTE (profilerShowManual) A fuller description of the 'profile name'
-# parameter. This parameter is used to name a newly created profile or to lookup
-# an existing profile by its name.
-profilerShowManual=Nombre de un perfil.
-
-# LOCALIZATION NOTE (profilerAlreadyStarted) A message that is displayed whenever
-# an operation cannot be completed because the profile in question has already
-# been started.
-profilerAlreadyStarted2=El perfil ya ha sido iniciado
-
-# LOCALIZATION NOTE (profilerNotFound) A message that is displayed whenever
-# an operation cannot be completed because the profile in question could not be
-# found.
-profilerNotFound=Perfil no encontrado
-
-# LOCALIZATION NOTE (profilerNotStarted) A message that is displayed whenever
-# an operation cannot be completed because the profile in question has not been
-# started yet. It also contains a hint to use the 'profile start' command to
-# start the profiler.
-profilerNotStarted3=El perfilador aún no ha sido iniciado. Use 'profile start' para iniciar el perfilado
-
-# LOCALIZATION NOTE (profilerStarted2) A very short string that indicates that
-# we have started recording.
-profilerStarted2=Grabando…
-
-# LOCALIZATION NOTE (profilerStopped) A very short string that indicates that
-# we have stopped recording.
-profilerStopped=Detenido…
-
-# LOCALIZATION NOTE (profilerNotReady) A message that is displayed whenever
-# an operation cannot be completed because the profiler has not been opened yet.
-profilerNotReady=Para que este comando funcione, primero necesita abrir el perfilador
-
-# LOCALIZATION NOTE (listenDesc) A very short string used to describe the
-# function of the 'listen' command.
-listenDesc=Abrir un puerto de depuración remota
-
-# LOCALIZATION NOTE (listenManual2) A longer description of the 'listen'
-# command.
-listenManual2=%1$S puede permitir la depuración remota sobre una conexión TCP/IP. Por razones de seguridad está desactivado por defecto, pero puede habilitarse usando este comando.
-
-# LOCALIZATION NOTE (listenPortDesc) A very short string used to describe the
-# function of 'port' parameter to the 'listen' command.
-listenPortDesc=El puerto TCP en el cual escuchar
-
-# LOCALIZATION NOTE (listenDisabledOutput) Text of a message output during the
-# execution of the 'listen' command.
-listenDisabledOutput=Escuchar está deshabilitado por a preferencia devtools.debugger.remote-enabled
-
-# LOCALIZATION NOTE (listenInitOutput) Text of a message output during the
-# execution of the 'listen' command. %1$S is a port number
-listenInitOutput=Escuchando en el puerto %1$S
-
-# LOCALIZATION NOTE (listenNoInitOutput) Text of a message output during the
-# execution of the 'listen' command.
-listenNoInitOutput=DebuggerServer no está inicializado
-
-# LOCALIZATION NOTE (mediaDesc, mediaEmulateDesc, mediaEmulateManual,
-# mediaEmulateType, mediaResetDesc, mediaResetManual) These strings describe
-# the 'media' commands and all available parameters.
-mediaDesc=Emulación de tipo de medios CSS
-mediaEmulateDesc=Emular un tipo de medios CSS especificado
-mediaEmulateManual=Ver el documento como si fuera dibujado en un dispositivo que soporta el tipo de medios especificado, con las reglas CSS relevantes aplicadas.
-mediaEmulateType=El tipo de medios a emular
-mediaResetDesc=Dejar de emular un tipo de medios CSS
-
-# LOCALIZATION NOTE (injectDesc, injectManual, injectLibraryDesc, injectLoaded,
-# injectFailed) These strings describe the 'inject' commands and all available
-# parameters.
-injectDesc=Inyectar librerías comunes en la página
-injectManual2=Inyecta librerías coimunes en el contenido de la página que también puede accederse desde consola.
-injectLibraryDesc=Seleccione la librería a inyectar o ingrese una URI válida de script para inyectar
-injectLoaded=%1$S cargada
-injectFailed=Falló la carga de %1$S - URI inválida
-
-# LOCALIZATION NOTE (folderDesc, folderOpenDesc, folderOpenDir,
-# folderOpenProfileDesc) These strings describe the 'folder' commands and
-# all available parameters.
-folderDesc=Carpetas abiertas
-folderOpenDesc=Ruta de carpetas abiertas
-folderOpenDir=Ruta de directorio
-folderOpenProfileDesc=Directorio de perfil abierto
-
-# LOCALIZATION NOTE (folderInvalidPath) A string displayed as the result
-# of the 'folder open' command with an invalid folder path.
-folderInvalidPath=Ingrese una ruta válida
-
-# LOCALIZATION NOTE (folderOpenDirResult) A very short string used to
-# describe the result of the 'folder open' command.
-# The argument (%1$S) is the folder path.
-folderOpenDirResult=Se abrió %1$S
-
-# LOCALIZATION NOTE (rulesDesc) A very short description of the
-# 'rules' command. See highlightManual for a fuller description of what
-# it does. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible.
-rulersDesc=Invertir reglas para la página
-
-# LOCALIZATION NOTE (rulesManual) A fuller description of the 'rules'
-# command, displayed when the user asks for help on what it does.
-rulersManual=Invertir las reglas horizontal y vertical para la página actual
-
-# LOCALIZATION NOTE (rulersTooltip) A string displayed as the
-# tooltip of button in devtools toolbox which toggles the rulers highligher.
-rulersTooltip=Invertir reglas para la página
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/gcli.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/gcli.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/gcli.properties	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/gcli.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,442 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# LOCALIZATION NOTE These strings are used inside the Web Console
-# command line which is available from the Web Developer sub-menu
-# -> 'Web Console'.
-# The correct localization of this file might be to keep it in
-# English, or another language commonly spoken among web developers.
-# You want to make that choice consistent across the developer tools.
-# A good criteria is the language in which you'd find the best
-# documentation on web development on the web.
-
-# LOCALIZATION NOTE (canonDescNone): Short string used to describe any command
-# or command parameter when no description has been provided.
-canonDescNone=(Sin descripción)
-
-# LOCALIZATION NOTE (canonDefaultGroupName): The default name for a group of
-# parameters.
-canonDefaultGroupName=Opciones
-
-# LOCALIZATION NOTE (canonProxyDesc): A very short description of a set of
-# remote commands. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible. See
-# canonProxyManual for a fuller description of what it does.
-canonProxyDesc=Ejecutar un comando en %S
-
-# LOCALIZATION NOTE (canonProxyManual): A fuller description of a set of
-# remote commands. Displayed when the user asks for help on what it does.
-canonProxyManual=Un juego de comandos que son ejecutados en un sistema remoto. El sistema remoto es alcanzado vía %S
-
-# LOCALIZATION NOTE (canonProxyExists): An error message displayed when we try
-# to add new command (via a proxy) where one already exists in that name.
-canonProxyExists=Ya hay un comando llamado '%S'
-
-# LOCALIZATION NOTE (cliEvalJavascript): The special '{' command allows entry
-# of JavaScript like traditional developer tool command lines. This describes
-# the '{' command.
-cliEvalJavascript=Ingrese JavaScript directamente
-
-# LOCALIZATION NOTE (cliUnusedArg): When the command line has more arguments
-# than the current command can understand this is the error message shown to
-# the user.
-cliUnusedArg=Demasiados argumentos
-
-# LOCALIZATION NOTE (cliOptions): The title of the dialog which displays the
-# options that are available to the current command.
-cliOptions=Opciones disponibles
-
-# LOCALIZATION NOTE: The error message when the user types a command that
-# isn't registered
-cliUnknownCommand2=Comando inválido: '%1$S'.
-
-# LOCALIZATION NOTE: A parameter should have a value, but doesn't
-cliIncompleteParam=Valor requerido para '%1$S'.
-
-# LOCALIZATION NOTE: Error message given when a file argument points to a file
-# that does not exist, but should (e.g. for use with File->Open) %1$S is a
-# filename
-fileErrNotExists='%1$S' no existe
-
-# LOCALIZATION NOTE: Error message given when a file argument points to a file
-# that exists, but should not (e.g. for use with File->Save As) %1$S is a
-# filename
-fileErrExists='%1$S' ya existe
-
-# LOCALIZATION NOTE: Error message given when a file argument points to a
-# non-file, when a file is needed. %1$S is a filename
-fileErrIsNotFile='%1$S' no es un archivo
-
-# LOCALIZATION NOTE: Error message given when a file argument points to a
-# non-directory, when a directory is needed (e.g. for use with 'cd') %1$S is a
-# filename
-fileErrIsNotDirectory='%1$S' no es un directorio
-
-# LOCALIZATION NOTE: Error message given when a file argument does not match
-# the specified regular expression %1$S is a filename %2$S is a regular
-# expression
-fileErrDoesntMatch='%1$S' no coincide con '%2$S'
-
-# LOCALIZATION NOTE (fieldMenuMore): When the menu has displayed all the
-# matches that it should (i.e. about 10 items) then we display this to alert
-# the user that more matches are available.
-fieldMenuMore=Más coincidencias, siga tipeando
-
-# LOCALIZATION NOTE (jstypeParseScope): The command line provides completion
-# for JavaScript commands, however there are times when the scope of what
-# we're completing against can't be used. This error message is displayed when
-# this happens.
-jstypeParseScope=Alcance perdido
-
-# LOCALIZATION NOTE (jstypeParseMissing): When the command line is doing
-# JavaScript completion, sometimes the property to be completed does not
-# exist. This error message is displayed when this happens.
-jstypeParseMissing=No se encuentra la propiedad '%S'
-
-# LOCALIZATION NOTE (jstypeBeginSyntax): When the command line is doing
-# JavaScript completion using invalid JavaScript, this error message is
-# displayed.
-jstypeBeginSyntax=Error de sintaxis
-
-# LOCALIZATION NOTE (jstypeBeginUnterm): When the command line is doing
-# JavaScript completion using a string that is not properly terminated, this
-# error message is displayed.
-jstypeBeginUnterm=Cadena literal sin terminar
-
-# LOCALIZATION NOTE (jstypeParseError): If the system for providing JavaScript
-# completions encounters and error it displays this.
-jstypeParseError=Error
-
-# LOCALIZATION NOTE (typesNumberNan): When the command line is passed a
-# number, however the input string is not a valid number, this error message
-# is displayed.
-typesNumberNan=No se puede convertir "%S" a un número.
-
-# LOCALIZATION NOTE (typesNumberMax): When the command line is passed a
-# number, but the number is bigger than the largest allowed number, this error
-# message is displayed.
-typesNumberMax=%1$S es mayor que el máximo permitido: %2$S.
-
-# LOCALIZATION NOTE (typesNumberMin): When the command line is passed a
-# number, but the number is lower than the smallest allowed number, this error
-# message is displayed.
-typesNumberMin=%1$S es menor que el mínimo permitido: %2$S.
-
-# LOCALIZATION NOTE (typesNumberNotInt2): When the command line is passed a
-# number, but the number has a decimal part and floats are not allowed.
-typesNumberNotInt2=No se puede convertir "%S" a entero.
-
-# LOCALIZATION NOTE (typesDateNan): When the command line is passed a date,
-# however the input string is not a valid date, this error message is
-# displayed.
-typesDateNan=No se puede convertir "%S" a una fecha.
-
-# LOCALIZATION NOTE (typesDateMax): When the command line is passed a date,
-# but the number is later than the latest allowed date, this error message is
-# displayed.
-typesDateMax=%1$S es posterior al máximo permitido: %2$S.
-
-# LOCALIZATION NOTE (typesDateMin): When the command line is passed a date,
-# but the date is earlier than the earliest allowed number, this error message
-# is displayed.
-typesDateMin=%1$S es anterior al máximo permitido: %2$S.
-
-# LOCALIZATION NOTE (typesSelectionNomatch): When the command line is passed
-# an option with a limited number of correct values, but the passed value is
-# not one of them, this error message is displayed.
-typesSelectionNomatch=No se puede usar '%S'.
-
-# LOCALIZATION NOTE (nodeParseSyntax): When the command line is expecting a
-# CSS query string, however the passed string is not valid, this error message
-# is displayed.
-nodeParseSyntax=Error de sintaxis en consulta CSS
-
-# LOCALIZATION NOTE (nodeParseMultiple): When the command line is expecting a
-# CSS string that matches a single node, but more than one node matches, this
-# error message is displayed.
-nodeParseMultiple=Demasiadas coincidencias (%S)
-
-# LOCALIZATION NOTE (nodeParseNone): When the command line is expecting a CSS
-# string that matches a single node, but no nodes match, this error message is
-# displayed.
-nodeParseNone=Sin coincidencia
-
-# LOCALIZATION NOTE (helpDesc): A very short description of the 'help'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible. See helpManual for a
-# fuller description of what it does.
-helpDesc=Obtenga ayuda sobre los comandos disponibles
-
-# LOCALIZATION NOTE (helpManual): A fuller description of the 'help' command.
-# Displayed when the user asks for help on what it does.
-helpManual=Provee ayuda, ya sea sobre un comando específico (si se ingresó una cadena a buscar y hay una coincidencia exacta) o sobre los comandos disponibles (si no se ingresó una cadena a buscar o si no hay coincidencia exacta).
-
-# LOCALIZATION NOTE (helpSearchDesc): A very short description of the 'search'
-# parameter to the 'help' command. See helpSearchManual2 for a fuller
-# description of what it does. This string is designed to be shown in a dialog
-# with restricted space, which is why it should be as short as possible.
-helpSearchDesc=Cadena a buscar
-
-# LOCALIZATION NOTE (helpSearchManual3): A fuller description of the 'search'
-# parameter to the 'help' command. Displayed when the user asks for help on
-# what it does.
-helpSearchManual3=cadena a buscar para reducir el listado de comandos que se muestran. No se soportan expresiones regulares.
-
-# LOCALIZATION NOTE (helpManSynopsis): A heading shown at the top of a help
-# page for a command in the console It labels a summary of the parameters to
-# the command
-helpManSynopsis=Sinopsis
-
-# LOCALIZATION NOTE (helpManNone): Some text shown under the parameters
-# heading in a help page for a command which has no parameters.
-helpManNone=Ninguno
-
-# LOCALIZATION NOTE (helpListAll): The heading shown in response to the 'help'
-# command when used without a filter, just above the list of known commands.
-helpListAll=Comandos disponibles:
-
-# LOCALIZATION NOTE (helpListPrefix, helpListNone): These messages are
-# displayed in response to the 'help <search>' command (i.e. with a search
-# string), just above the list of matching commands. Parameters: %S is the
-# search string.
-helpListPrefix=Comandos que comienzan con '%1$S':
-helpListNone=Ningun comando comienza con '%1$S'
-
-# LOCALIZATION NOTE (helpManRequired, helpManOptional, helpManDefault): When
-# the 'help x' command wants to show the manual for the 'x' command, it needs
-# to be able to describe the parameters as either required or optional, or if
-# they have a default value.
-helpManRequired=requerido
-helpManOptional=opcional
-helpManDefault=opcional, predeterminado=%S
-
-# LOCALIZATION NOTE (helpIntro): This forms part of the output from the 'help'
-# command. 'GCLI' is a project name and should be left untranslated.
-helpIntro=GCLI es un experimento para crear una línea de comandos para desarrolladores web muy fácil de usar.
-
-# LOCALIZATION NOTE (subCommands): Text shown as part of the output of the
-# 'help' command when the command in question has sub-commands, before a list
-# of the matching sub-commands
-subCommands=Subcomandos
-
-# LOCALIZATION NOTE: This error message is displayed when the command line is
-# cannot find a match for the parse types.
-commandParseError=Error de análisis de la línea de comandos
-
-# LOCALIZATION NOTE (contextDesc, contextManual, contextPrefixDesc): These
-# strings are used to describe the 'context' command and its 'prefix'
-# parameter. See localization comment for 'connect' for an explanation about
-# 'prefix'.
-contextDesc=Concentrar en un grupo de comandos
-contextManual=Configurar un prefijo predeterminado para comandos futuros. Por ejemplo 'context git' podría permitirle escribir 'commit' en lugar de 'git commit'.
-contextPrefixDesc=El prefijo del comando
-
-# LOCALIZATION NOTE (contextNotParentError): An error message displayed during
-# the processing of the 'context' command, when the found command is not a
-# parent command.
-contextNotParentError=No se puede usar '%1$S' como prefijo porque no es un comando padre.
-
-# LOCALIZATION NOTE (contextReply): A message displayed during the processing
-# of the 'context' command, to indicate success.
-contextReply=Usando %1$S como prefijo de comando
-
-# LOCALIZATION NOTE (contextEmptyReply): A message displayed during the
-# processing of the 'context' command, to indicate that there is no command
-# prefix
-contextEmptyReply=El prefijo de comando no está establecido
-
-# LOCALIZATION NOTE (connectDesc, connectManual, connectPrefixDesc,
-# connectMethodDesc, connectUrlDesc, connectDupReply): These strings describe
-# the 'connect' command and all its available parameters. A 'prefix' is an 
-# alias for the remote server (think of it as a "connection name"), and it
-# allows to identify a specific server when connected to multiple remote
-# servers.
-connectDesc=Comandos proxy al servidor
-connectManual=Conectar al servidor, creando versiones locales de los comandos en el servidor. Los comandos remotos inicialmente tienen un prefijo para distinguirlos de los comandos locales (but see the context command to get past this)
-connectPrefixDesc=Prefijo padre para los comandos importados
-connectMethodDesc=El método de conexión
-connectUrlDesc=URL para conectarse
-connectDupReply=Una conexión llamada %S ya existe.
-
-# LOCALIZATION NOTE (connectReply): The output of the 'connect' command,
-# telling the user what it has done.
-connectReply=Agregados %S comandos.
-
-# LOCALIZATION NOTE (disconnectDesc2, disconnectManual2,
-# disconnectPrefixDesc): These strings describe the 'disconnect' command and
-# all its available parameters. See localization comment for 'connect' for an
-# explanation about 'prefix'.
-disconnectDesc2=Desconectar del servidor
-disconnectManual2=Desconectar de un servidor actualmente vinculado para ejecución remota de comandos
-disconnectPrefixDesc=Prefijo padre para comandos importados
-
-# LOCALIZATION NOTE (disconnectReply): The output of the 'disconnect' command,
-# telling the user what it's done.
-disconnectReply=Eliminados %S comandos.
-
-# LOCALIZATION NOTE (globalDesc, globalWindowDesc, globalOutput): These
-# strings describe the 'global' command and its parameters
-globalDesc=Cambiar el JS global
-globalWindowDesc=Nueva ventana/global
-globalOutput=JS global ahora es %S
-
-# LOCALIZATION NOTE: These strings describe the 'clear' command
-clearDesc=Limpiar el área de salida
-
-# LOCALIZATION NOTE (langDesc, langOutput): These strings describe the 'lang'
-# command and its parameters
-langDesc=Ingrese comandos en diferentes lenguajes
-langOutput=Ahora está usando %S
-
-# LOCALIZATION NOTE (prefDesc): A very short description of the 'pref'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible. See prefManual for a
-# fuller description of what it does.
-prefDesc=Comandos para controlar la configuración
-
-# LOCALIZATION NOTE (prefManual): A fuller description of the 'pref' command.
-# Displayed when the user asks for help on what it does.
-prefManual=Commands to display and alter preferences both for GCLI and the surrounding environment
-
-# LOCALIZATION NOTE (prefListDesc): A very short description of the 'pref
-# list' command. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible. See
-# prefListManual for a fuller description of what it does.
-prefListDesc=Mostrar configuración disponible
-
-# LOCALIZATION NOTE (prefListManual): A fuller description of the 'pref list'
-# command. Displayed when the user asks for help on what it does.
-prefListManual=Mostrar una lista de preferencias, filtrada opcionalmente usando el parámetro 'search' 
-
-# LOCALIZATION NOTE (prefListSearchDesc): A short description of the 'search'
-# parameter to the 'pref list' command. See prefListSearchManual for a fuller
-# description of what it does. This string is designed to be shown in a dialog
-# with restricted space, which is why it should be as short as possible.
-prefListSearchDesc=Filtrar la lista de configuraciones mostradas
-
-# LOCALIZATION NOTE (prefListSearchManual): A fuller description of the
-# 'search' parameter to the 'pref list' command. Displayed when the user asks
-# for help on what it does.
-prefListSearchManual=Buscar la cadena ingresada en la lista de preferencias disponibles
-
-# LOCALIZATION NOTE (prefShowDesc): A very short description of the 'pref
-# show' command. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible. See
-# prefShowManual for a fuller description of what it does.
-prefShowDesc=Mostrar valor de configuración
-
-# LOCALIZATION NOTE (prefShowManual): A fuller description of the 'pref show'
-# command. Displayed when the user asks for help on what it does.
-prefShowManual=Mostrar el valor de una preferencia dada
-
-# LOCALIZATION NOTE (prefShowSettingDesc): A short description of the
-# 'setting' parameter to the 'pref show' command. See prefShowSettingManual
-# for a fuller description of what it does. This string is designed to be
-# shown in a dialog with restricted space, which is why it should be as short
-# as possible.
-prefShowSettingDesc=Configuración a mostrar
-
-# LOCALIZATION NOTE (prefShowSettingManual): A fuller description of the
-# 'setting' parameter to the 'pref show' command. Displayed when the user asks
-# for help on what it does.
-prefShowSettingManual=El nombre de la configuración a mostrar
-
-# LOCALIZATION NOTE (prefShowSettingValue): This is used to show the
-# preference name and the associated preference value. %1$S is replaced with
-# the preference name and %2$S is replaced with the preference value.
-prefShowSettingValue=%1$S: %2$S
-
-# LOCALIZATION NOTE (prefSetDesc): A very short description of the 'pref set'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible. See prefSetManual for
-# a fuller description of what it does.
-prefSetDesc=Alterar una configuración
-
-# LOCALIZATION NOTE (prefSetManual): A fuller description of the 'pref set'
-# command. Displayed when the user asks for help on what it does.
-prefSetManual=Alterar preferencias definidas por el entorno
-
-# LOCALIZATION NOTE (prefSetSettingDesc): A short description of the 'setting'
-# parameter to the 'pref set' command. See prefSetSettingManual for a fuller
-# description of what it does. This string is designed to be shown in a dialog
-# with restricted space, which is why it should be as short as possible.
-prefSetSettingDesc=Configuración a alterar
-
-# LOCALIZATION NOTE (prefSetSettingManual): A fuller description of the
-# 'setting' parameter to the 'pref set' command. Displayed when the user asks
-# for help on what it does.
-prefSetSettingManual=El nombre de la configuración a alterar.
-
-# LOCALIZATION NOTE (prefSetValueDesc): A short description of the 'value'
-# parameter to the 'pref set' command. See prefSetValueManual for a fuller
-# description of what it does. This string is designed to be shown in a dialog
-# with restricted space, which is why it should be as short as possible.
-prefSetValueDesc=Nuevo valor para la configuración
-
-# LOCALIZATION NOTE (prefSetValueManual): A fuller description of the 'value'
-# parameter to the 'pref set' command. Displayed when the user asks for help
-# on what it does.
-prefSetValueManual=El nuevo valor para la configuración especificada
-
-# LOCALIZATION NOTE (prefResetDesc): A very short description of the 'pref
-# reset' command. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible. See
-# prefResetManual for a fuller description of what it does.
-prefResetDesc=Restablecer una configuración
-
-# LOCALIZATION NOTE (prefResetManual): A fuller description of the 'pref
-# reset' command. Displayed when the user asks for help on what it does.
-prefResetManual=Restablecer el valor de una configuración al predeterminado del sistema
-
-# LOCALIZATION NOTE (prefResetSettingDesc): A short description of the
-# 'setting' parameter to the 'pref reset' command. See prefResetSettingManual
-# for a fuller description of what it does. This string is designed to be
-# shown in a dialog with restricted space, which is why it should be as short
-# as possible.
-prefResetSettingDesc=Configuración a restablecer
-
-# LOCALIZATION NOTE (prefResetSettingManual): A fuller description of the
-# 'setting' parameter to the 'pref reset' command. Displayed when the user
-# asks for help on what it does.
-prefResetSettingManual=El nombre de la configuración a restablecer al valor predeterminado del sistema
-
-# LOCALIZATION NOTE (prefOutputFilter): Displayed in the output from the 'pref
-# list' command as a label to an input element that allows the user to filter
-# the results
-prefOutputFilter=Filtro
-
-# LOCALIZATION NOTE (prefOutputName): Displayed in the output from the 'pref
-# list' command as a heading to a table. The column contains the names of the
-# available preferences
-prefOutputName=Nombre
-
-# LOCALIZATION NOTE (prefOutputValue): Displayed in the output from the 'pref
-# list' command as a heading to a table. The column contains the values of the
-# available preferences
-prefOutputValue=Valor
-
-# LOCALIZATION NOTE (introDesc, introManual): These strings describe the
-# 'intro' command. The localization of 'Got it!' should be the same used in
-# introTextGo.
-introDesc=Muestra el mensaje de inicio
-introManual=Volver a mostrar el mensaje que se muestra a los nuevos usuarios hasta que presionan el botón '¡Lo tengo!'
-
-# LOCALIZATION NOTE (introTextOpening3, introTextCommands, introTextKeys2,
-# introTextF1Escape, introTextGo): These strings are displayed when the user
-# first opens the developer toolbar to explain the command line, and is shown
-# each time it is opened until the user clicks the 'Got it!' button.
-introTextOpening3=GCLI es un experimento para crear una línea de comando altamente usable para diseñadores web.
-introTextCommands=Para una lista de comandos ingrese
-introTextKeys2=o para mostrar/ocultar ayuda de comandos presione
-introTextF1Escape=F1/Escape
-introTextGo=¡Lo tengo!
-
-
-# LOCALIZATION NOTE (hideIntroDesc): Short description of the 'hideIntro' setting.
-hideIntroDesc=Mostrar el mensaje inicial de bienvenida
-
-# LOCALIZATION NOTE (eagerHelperDesc): Short description of the 'eagerHelper'
-# setting. Displayed when the user asks for help on the settings.
-eagerHelperDesc=How eager are the tooltips
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/inspector.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/inspector.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/inspector.dtd	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/inspector.dtd	2015-05-25 20:46:30.000000000 +0000
@@ -87,6 +87,11 @@
 <!ENTITY inspectorSearchHTML.label2          "Buscar con selectores CSS">
 <!ENTITY inspectorSearchHTML.key            "F">
 
+<!-- LOCALIZATION NOTE (inspectorSearchHTML.label3): This is the label that will
+     be shown as the placeholder in the future, once the inspector search box
+     supports the full text HTML search in Bug 835896. -->
+<!ENTITY inspectorSearchHTML.label3 "Buscar HTML">
+
 <!-- 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
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/inspector.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/inspector.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/inspector.properties	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/inspector.properties	2015-05-25 20:46:30.000000000 +0000
@@ -72,3 +72,34 @@
 # that expands the right panel (rules, computed, box-model, etc...) in the
 # inspector UI.
 inspector.expandPane=Expandir vista
+
+# LOCALIZATION NOTE (inspector.searchResultsCount): This is the label that
+# will show up next to the inspector search box. %1$S is the current result
+# index and %2$S is the total number of search results. For example: "3 of 9".
+# This won't be visible until the search box is updated in Bug 835896.
+inspector.searchResultsCount2=%1$S de %2$S
+
+# LOCALIZATION NOTE (inspector.searchResultsNone): This is the label that
+# will show up next to the inspector search box when no matches were found
+# for the given string.
+# This won't be visible until the search box is updated in Bug 835896.
+inspector.searchResultsNone=Sin coincidencia
+
+# LOCALIZATION NOTE (inspector.menu.openUrlInNewTab.label): This is the label of
+# a menu item in the inspector contextual-menu that appears when the user right-
+# clicks on the attribute of a node in the inspector that is a URL, and that
+# allows to open that URL in a new tab.
+inspector.menu.openUrlInNewTab.label=Abrir enlace en nueva pestaña
+
+# LOCALIZATION NOTE (inspector.menu.copyUrlToClipboard.label): This is the label
+# of a menu item in the inspector contextual-menu that appears when the user
+# right-clicks on the attribute of a node in the inspector that is a URL, and
+# that allows to copy that URL in the clipboard.
+inspector.menu.copyUrlToClipboard.label=Copiar dirección del enlace
+
+# LOCALIZATION NOTE (inspector.menu.selectElement.label): This is the label of a
+# menu item in the inspector contextual-menu that appears when the user right-
+# clicks on the attribute of a node in the inspector that is the ID of another
+# element in the DOM (like with <label for="input-id">), and that allows to
+# select that element in the inspector.
+inspector.menu.selectElement.label=Seleccionar elemento #%S
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/jsonview.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/jsonview.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/jsonview.properties	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/jsonview.properties	2015-05-25 20:46:30.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/.
+
+# LOCALIZATION NOTE These strings are used in the JSON View tool
+# that is used to inspect application/json document types loaded
+# in the browser.
+
+# LOCALIZATION NOTE The correct localization of this file might be to keep it
+# in English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best documentation
+# on web development on the web.
+
+# LOCALIZATION NOTE (jsonViewer.tab.JSON, jsonViewer.tab.RawData,
+# jsonViewer.tab.Headers): Label for a panel tab.
+jsonViewer.tab.JSON=JSON
+jsonViewer.tab.RawData=Datos en bruto
+jsonViewer.tab.Headers=Encabezados
+
+# LOCALIZATION NOTE (jsonViewer.responseHeaders, jsonViewer.requestHeaders):
+# Label for header groups within the 'Headers' panel.
+jsonViewer.responseHeaders=Encabezados de respuesta
+jsonViewer.requestHeaders=Encabezados de pedido
+
+# LOCALIZATION NOTE (jsonViewer.Save): Label for save command
+jsonViewer.Save=Guardar
+
+# LOCALIZATION NOTE (jsonViewer.Copy): Label for clipboard copy command
+jsonViewer.Copy=Copiar
+
+# LOCALIZATION NOTE (jsonViewer.PrettyPrint): Label for JSON
+# pretty print action button.
+jsonViewer.PrettyPrint=Impresión prolija
+
+# LOCALIZATION NOTE (jsonViewer.reps.more): Label used in arrays
+# that have more items than displayed.
+jsonViewer.reps.more=más...
+
+# LOCALIZATION NOTE (jsonViewer.filterJSON): Label used in search box
+# at the top right cornder of the JSON Viewer.
+jsonViewer.filterJSON=Filtrar JSON
+
+# LOCALIZATION NOTE (jsonViewer.reps.reference): Label used for cycle
+# references in an array.
+jsonViewer.reps.reference=Referencia en ciclo
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/netmonitor.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/netmonitor.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/netmonitor.dtd	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/netmonitor.dtd	2015-05-25 20:46:30.000000000 +0000
@@ -259,6 +259,22 @@
   -  on the context menu that copies the selected request's url -->
 <!ENTITY netmonitorUI.context.copyUrl      "Copiar URL">
 
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrlParams): This is the label displayed
+  -  on the context menu that copies the selected request's url parameters -->
+<!ENTITY netmonitorUI.context.copyUrlParams     "Copiar parámetros URL">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrlParams.accesskey): This is the access key
+  -  for the Copy URL Parameters menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.context.copyUrlParams.accesskey "P">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyPostData): This is the label displayed
+  -  on the context menu that copies the selected request's post data -->
+<!ENTITY netmonitorUI.context.copyPostData     "Copiar datos de POST">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyPostData.accesskey): This is the access key
+  -  for the Copy POST Data menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.context.copyPostData.accesskey "D">
+
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyAsCurl): This is the label displayed
   -  on the context menu that copies the selected request as a cURL command.
   -  The capitalization is part of the official name and should be used throughout all languages.
@@ -285,6 +301,16 @@
   -  for the Copy Response menu item displayed in the context menu for a request -->
 <!ENTITY netmonitorUI.context.copyResponse.accesskey  "r">
 
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyAsCurl): This is the label displayed
+  -  on the context menu that copies the selected request as a cURL command.
+  -  The capitalization is part of the official name and should be used throughout all languages.
+  -  http://en.wikipedia.org/wiki/CURL -->
+<!ENTITY netmonitorUI.context.copyAsCurl    "Copiar como cURL">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyAsCUrl.accesskey): This is the access key
+  -  for the Copy as cURL menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.context.copyAsCurl.accesskey "C">
+
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyRequestHeaders): This is the label displayed
   -  on the context menu that copies the selected item's request headers -->
 <!ENTITY netmonitorUI.context.copyRequestHeaders     "Copiar encabezados de pedido">
@@ -297,6 +323,10 @@
   -  on the context menu that copies the selected item's response headers -->
 <!ENTITY netmonitorUI.context.copyResponseHeaders     "Copiar encabezados de respuesta">
 
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyResponseHeaders.accesskey): This is the access key
+  -  for the Copy Response Headers menu item displayed in the context menu for a response -->
+<!ENTITY netmonitorUI.context.copyResponseHeaders.accesskey  "S">
+
 <!-- LOCALIZATION NOTE (debuggerUI.summary.editAndResend): This is the label displayed
   -  on the button in the headers tab that opens a form to edit and resend the currently
      displayed request -->
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/profiler.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/profiler.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/profiler.dtd	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/profiler.dtd	2015-05-25 20:46:30.000000000 +0000
@@ -18,17 +18,37 @@
 
 <!-- LOCALIZATION NOTE (profilerUI.stopNotice1/2): This is the label shown
   -  in the call list view while recording a profile. -->
+<!-- TODO remove -->
 <!ENTITY profilerUI.stopNotice1    "Clic en el">
+<!-- TODO remove -->
 <!ENTITY profilerUI.stopNotice2    "botón de nuevo para dejar de perfilar.">
 
+<!-- LOCALIZATION NOTE (profilerUI.startRecording/profilerUI.stopRecording): These are
+  -  the labels shown on the main recording buttons to start/stop recording. -->
+<!ENTITY profilerUI.startRecording "Iniciar grabación de rendimiento">
+<!ENTITY profilerUI.stopRecording  "Detener grabación de rendimiento">
+
+<!-- LOCALIZATION NOTE (profilerUI.bufferStatusTooltip): This string
+  -  is displayed as the tooltip for the buffer capacity during a recording. -->
+<!ENTITY profilerUI.bufferStatusTooltip "El perfilador guarda muestras en un buffer circular y una vez que el buffer alcanza el límite de la grabación, las nuevas muestras comienzan a sobreescribir las del principio de la grabación.">
+
+<!-- LOCALIZATION NOTE (profilerUI.bufferStatusFull): This string
+  -  is displayed when the profiler's circular buffer has started to overlap. -->
+<!ENTITY profilerUI.bufferStatusFull "El buffer está lleno. Las muestras antiguas están siendo sobreescritas.">
+
 <!-- LOCALIZATION NOTE (profilerUI.loadingNotice): This is the label shown
   -  in the call list view while loading a profile. -->
 <!ENTITY profilerUI.loadingNotice "Cargando…">
 
 <!-- LOCALIZATION NOTE (profilerUI.recordButton): This string is displayed
   -  on a button that starts a new profile. -->
+<!-- TODO remove -->
 <!ENTITY profilerUI.recordButton.tooltip "Registrar llamadas a funciones de JavaScript.">
 
+<!-- LOCALIZATION NOTE (profilerUI.recordButton2): This string is displayed
+  -  on a button that starts a new profile. -->
+<!ENTITY profilerUI.recordButton2.tooltip "Intercambiar el estado de la grabación de rendimiento.">
+
 <!-- LOCALIZATION NOTE (profilerUI.importButton): This string is displayed
   -  on a button that opens a dialog to import a saved profile data file. -->
 <!ENTITY profilerUI.importButton "Importar…">
@@ -126,3 +146,16 @@
 <!-- LOCALIZATION NOTE (profilerUI.JITOptimizationsTitle): This string
   -  is displayed as the title of the JIT Optimizations panel. -->
 <!ENTITY profilerUI.JITOptimizationsTitle "Optimizaciones JIT">
+
+<!-- LOCALIZATION NOTE (profilerUI.console.recordingNoticeStart/recordingNoticeEnd):
+  -  This string is displayed when a recording is selected that started via console.profile.
+  -  Wraps the command used to start, like "Currently recording via console.profile("label")" -->
+<!ENTITY profilerUI.console.recordingNoticeStart "Actualmente grabado vía">
+<!ENTITY profilerUI.console.recordingNoticeEnd   "">
+
+<!-- LOCALIZATION NOTE (profilerUI.console.stopCommandStart/stopCommandEnd):
+  -  This string is displayed when a recording is selected that started via console.profile.
+  -  Indicates how to stop the recording, wrapping the command, like
+  -  "Stop recording by entering console.profilEnd("label") into the console." -->
+<!ENTITY profilerUI.console.stopCommandStart "Detener la grabación ingresando">
+<!ENTITY profilerUI.console.stopCommandEnd   "en la consola.">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/profiler.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/profiler.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/profiler.properties	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/profiler.properties	2015-05-25 20:46:30.000000000 +0000
@@ -141,3 +141,7 @@
 # These strings are displayed when a recording is in progress, that was started from the console.
 consoleProfile.recordingNotice=Actualmente grabando perfil "%S".
 consoleProfile.stopCommand=Dejar de perfilar tipeando \"console.profileEnd(\'%S\')\" en la consola.
+
+# LOCALIZATION NOTE (profiler.bufferStatus):
+# This string is displayed illustrating how full the profiler's circular buffer is.
+profiler.bufferStatus=Capacidad de buffer: %S%
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/styleinspector.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/styleinspector.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/styleinspector.dtd	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/styleinspector.dtd	2015-05-25 20:46:30.000000000 +0000
@@ -17,6 +17,11 @@
   -  the search box when no search term has been entered. -->
 <!ENTITY filterStylesPlaceholder      "Estilos de filtro">
 
+<!-- LOCALIZATION NOTE (addRuleButtonTooltip): This is the tooltip shown when
+  -  hovering the `Add new rule` button in the rules view toolbar. This should
+  -  match ruleView.contextmenu.addNewRule in styleinspector.properties -->
+<!ENTITY addRuleButtonTooltip  "Agregar nueva regla">
+
 <!-- LOCALIZATION NOTE (selectedElementLabel): This is the label for the path of
   -  the highlighted element in the web page. This path is based on the document
   -  tree. -->
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/timeline.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/timeline.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/timeline.properties	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/timeline.properties	2015-05-25 20:46:30.000000000 +0000
@@ -45,6 +45,7 @@
 timeline.label.domevent=Evento DOM
 timeline.label.consoleTime=Consola
 timeline.label.garbageCollection=Evento GC
+timeline.label.timestamp=Fecha y hora
 
 # LOCALIZATION NOTE (graphs.memory):
 # This string is displayed in the memory graph of the Performance tool,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/toolbox.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/toolbox.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/toolbox.dtd	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/toolbox.dtd	2015-05-25 20:46:30.000000000 +0000
@@ -6,6 +6,9 @@
 <!-- LOCALIZATION NOTE : FILE Do not translate key -->
 
 <!ENTITY closeCmd.key  "W">
+<!ENTITY toggleToolbox.key  "I">
+<!ENTITY toggleToolboxF12.keycode          "VK_F12">
+<!ENTITY toggleToolboxF12.keytext          "F12">
 
 <!ENTITY toolboxCloseButton.tooltip  "Cerrar herramientas para desarrolladores">
 <!ENTITY toolboxOptionsButton.key      "O">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/toolbox.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/toolbox.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/toolbox.properties	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/toolbox.properties	2015-05-25 20:46:30.000000000 +0000
@@ -88,3 +88,15 @@
 # Used as a message in the alert displayed when trying to open a browser
 # content toolbox and there is no content process running
 toolbox.noContentProcess.message=No se ejecuta proceso de contenido.
+
+# LOCALIZATION NOTE (toolbox.viewCssSourceInStyleEditor.label)
+# Used as a message in either tooltips or contextual menu items to open the
+# corresponding URL as a css file in the Style-Editor tool.
+# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditor is used.
+toolbox.viewCssSourceInStyleEditor.label=Abrir archivo en editor de estilos
+
+# LOCALIZATION NOTE (toolbox.viewJsSourceInDebugger.label)
+# Used as a message in either tooltips or contextual menu items to open the
+# corresponding URL as a js file in the Debugger tool.
+# DEV NOTE: Mostly used wherever toolbox.viewSourceInDebugger is used.
+toolbox.viewJsSourceInDebugger.label=Abrir archivo en depurador
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/webide.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/webide.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/devtools/webide.properties	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/devtools/webide.properties	2015-05-25 20:46:30.000000000 +0000
@@ -19,8 +19,8 @@
 importHostedApp_title=Abrir aplicación alojada
 importHostedApp_header=Ingrese URL del manifiesto
 
-selectCustomBinary_title=Seleccionar binario B2G personalizado
-selectCustomProfile_title=Seleccionar perfil de Gaia personalizado
+selectCustomBinary_title=Seleccionar binario de B2G personalizado
+selectCustomProfile_title=Seleccionar perfil personalizado de Gaia
 
 notification_showTroubleShooting_label=solucionar problemas
 notification_showTroubleShooting_accesskey=p
@@ -46,9 +46,14 @@
 error_cantFetchAddonsJSON=No se puede cargar la lista de complementos: %S
 
 error_appProjectsLoadFailed=No se puede cargar la lista de proyecto. Esto puede ocurrir si ha usado este perfil con una versión más nueva de Firefox.
+error_folderCreationFailed=No se puede crear la carpeta del proyecto en el directorio seleccionado.
 
 addons_stable=estable
 addons_unstable=inestable
+# LOCALIZATION NOTE (addons_simulator_label): This label is shown as the name of
+# a given simulator version in the "Manage Simulators" pane.  %1$S: Firefox OS
+# version in the simulator, ex. 1.3.  %2$S: Simulator stability label, ex.
+# "stable" or "unstable".
 addons_simulator_label=Simulador de Firefox OS %1$S (%2$S)
 addons_install_button=instalar
 addons_uninstall_button=desinstalar
@@ -78,7 +83,7 @@
 device_reset_default=Reniciar como predeterminado
 
 # Simulator options
-simulator_custom_device=Personalizar
-simulator_custom_binary=Binario B2G personalizado…
-simulator_custom_profile=Perfil de Gaia personalizado…
+simulator_custom_device=Personalizado
+simulator_custom_binary=Binario personalizado de B2G…
+simulator_custom_profile=Perfil personalizado de Gaia…
 simulator_default_profile=Usar predeterminado
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/loop/loop.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/loop/loop.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/loop/loop.properties	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/loop/loop.properties	2015-05-25 20:46:30.000000000 +0000
@@ -12,6 +12,19 @@
 rooms_tab_button_tooltip=Conversaciones
 contacts_tab_button_tooltip=Contactos
 
+## LOCALIZATION_NOTE(sign_in_again_title_line_one, sign_in_again_title_line_two2):
+## These are displayed together at the top of the panel when a user is needed to
+## sign-in again. The emphesis is on the first line to get the user to sign-in again,
+## and this is displayed in slightly larger font. Please arrange as necessary for
+## your locale.
+## {{clientShortname2}} will be replaced by the brand name for either string.
+sign_in_again_title_line_one=Ingrese nuevamente
+sign_in_again_title_line_two2=para continuar usando {{clientShortname2}}
+sign_in_again_button=Ingresar
+## LOCALIZATION_NOTE(sign_in_again_use_as_guest_button2): {{clientSuperShortname}}
+## will be replaced by the super short brandname.
+sign_in_again_use_as_guest_button2=Usar {{clientSuperShortname}} como invitado
+
 ## LOCALIZATION_NOTE(first_time_experience.title): clientShortname will be
 ## replaced by the brand name
 first_time_experience_title={{clientShortname}} — Unirse a la conversación
@@ -306,8 +319,7 @@
 rooms_list_delete_tooltip=Borrar conversación
 rooms_list_deleteConfirmation_label=¿Está seguro?
 rooms_list_no_current_conversations=No hay conversaciones actuales
-rooms_name_this_room_label=Nombrar esta conversación
-rooms_name_change_failed_label=La conversación no puede renombrarse
+rooms_change_failed_label=La conversación no puede actualizarse
 rooms_new_room_button_label=Iniciar esta conversación
 rooms_only_occupant_label=Es el primero aquí.
 rooms_panel_title=Elegir una conversación o iniciar una nueva
@@ -327,7 +339,7 @@
 infobar_menuitem_dontshowagain_accesskey=v
 
 # Context in conversation strings
-context_offer_label=Hablemos sobre esta página
+
 # LOCALIZATION NOTE (context_inroom_label): this string is followed by the
 # title/URL of the website you are having a conversation about, displayed on a
 # separate line. If this structure doesn't work for your locale, you might want
@@ -340,3 +352,10 @@
 context_edit_activate_label=Hablemos sobre "{{title}}"
 context_edit_name_placeholder=Nombre de la conversación
 context_edit_comments_placeholder=Comentarios
+context_add_some_label=Agregar algún contexto
+context_edit_tooltip=Editar contexto
+context_hide_tooltip=Ocultar contexto
+context_show_tooltip=Mostrar contexto
+context_save_label=Guardar contexto
+context_link_modified=Este enlace fue modificado.
+context_learn_more_link_label=Concer más.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/newTab.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/newTab.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/newTab.dtd	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/newTab.dtd	2015-05-25 20:46:30.000000000 +0000
@@ -4,6 +4,10 @@
 
 <!-- These strings are used in the about:newtab page -->
 <!ENTITY newtab.pageTitle "Nueva pestaña">
+<!ENTITY newtab.customize.classic "Mostrar sitios principales">
+<!ENTITY newtab.customize.cog.enhanced "Incluir sitios sugeridos">
+<!ENTITY newtab.customize.cog.title "Controles de nueva pestañá">
+<!ENTITY newtab.customize.cog.learn "Aprender sobre nueva pestañá">
 <!ENTITY newtab.customize.title "Personalizar la página nueva pestaña">
 <!ENTITY newtab.customize.suggested "Mostrar sugeridos y sitios principales">
 <!ENTITY newtab.customize.topsites "Mostrar sitios principales">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/newTab.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/newTab.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/newTab.properties	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/newTab.properties	2015-05-25 20:46:30.000000000 +0000
@@ -9,6 +9,10 @@
 # and enhanced tiles on the same line as the tile's title, so prefer short
 # strings to avoid overlap. This string should be uppercase.
 newtab.sponsored.button=PATROCINADO
+# LOCALIZATION NOTE(newtab.suggested.button): This text appears for sponsored
+# and suggested tiles on the same line as the tile's title, so prefer short
+# strings to avoid overlap. This string should be uppercase.
+newtab.suggested.tag=SUGERIDO
 # LOCALIZATION NOTE(newtab.suggested.button): %1$S will be replaced inline by
 # one of the user's top 100 sites that triggered this suggested tile.
 # This text appears for suggested tiles under the tile's title, so prefer short
@@ -18,6 +22,10 @@
 # the (X) block icon. %2$S will be replaced by an active link using string
 # newtab.learn.link as text.
 newtab.sponsored.explain=Este mosaico se está mostrando en nombre de un partner de Mozilla. Puede eliminarlo en cualquier momento haciendo clic en el botón %1$S. %2$S
+# LOCALIZATION NOTE(newtab.sponsored.explain2): %1$S will be replaced inline by
+# the (X) block icon. %2$S will be replaced by an active link using string
+# newtab.learn.link as text.
+newtab.sponsored.explain2=Este sitio es sugerido en nombre de un partner de Mozilla. Puede eliminarlo en cualquier momento haciendo clic en el botón %1$S. %2$S
 # LOCALIZATION NOTE(newtab.suggested.explain): %1$S will be replaced inline by
 # the (X) block icon. %2$S will be replaced by an active link using string
 # newtab.learn.link as text.
@@ -26,15 +34,40 @@
 # the gear icon used to customize the new tab window. %2$S will be replaced by
 # an active link using string newtab.learn.link as text.
 newtab.enhanced.explain=Un partner de Mozilla ha mejorado visualmente este mosaico, reemplazando la captura de pantalla. Puede deshabilitar los mosaicos mejorados haciendo clic en el botón %1$S para sus preferencias. %2$S
-# LOCALIZATION NOTE(newtab.intro.paragraph1): %1$S will be replaced inline by
-# active link using string newtab.learn.link as text.
-newtab.intro.paragraph1=Al abrir una nueva pestaña, verá mosaicos de los sitios que visita frecuentemente, junto con mosaicos que pensamos que le pueden interesar. Algunos de estos mosaicos pueden ser patrocinados por partners de Mozilla. Siempre indicamos cuales de los mosaicos son patrocinados. %1$S
 # LOCALIZATION NOTE(newtab.intro.paragraph2): %1$S will be replaced inline by
 # active link using string newtab.privacy.link as text.
-newtab.intro.paragraph2=Para proveer este servicio, Mozilla recolecta y usa cierta información analítica relacionada con el uso de los mosaicos de acuerdo con nuestra %1$S.
-# LOCALIZATION NOTE(newtab.intro.paragraph3): %1$S will be replaced inline by
-# the gear icon used to customize the new tab window.
-newtab.intro.paragraph3=Puede desactivar la funcionalidad de los mosaicos haciendo clic en el botón %1$S para sus preferencias.
+newtab.intro.paragraph2=Para poder proveer este servicio, Mozilla recolecta y usa cierta información analítica relacionada con el uso de los mosaicos de acuerdo con nuestro %1$S.
+# LOCALIZATION NOTE(newtab.intro.paragraph4.2): %1$S will be replaced inline by
+# the gear icon used to customize the new tab window. %2$S will be replaced by
+# newtab.intro.controls as text. The quoted strings should be the same as
+# newtab.customize.cog.enhanced.
+newtab.intro.paragraph4.2=Puede desactivar este servicio haciendo clic en el botón con el engranaje (%1$S) y desmarcando "Incluir sitios sugeridos" en le menú %2$S.
+newtab.intro.paragraph5=Nueva pestañá mostrará los sitios que visite más frecuentemente junto con sitios que pensamos que le puedan interesar. Para comenzar, verá varios sitios de Mozilla.
+# LOCALIZATION NOTE(newtab.intro.paragraph6): %1$S will be replaced by
+# newtab.intro.paragraph6.remove as bold text. %2$S will be replaced by
+# newtab.intro.paragraph6.pin as bold text
+newtab.intro.paragraph6=Puede %1$S o %2$S cualquier sitio usando los controles disponibles en el mosaico.
+newtab.intro.paragraph6.remove=eliminar
+newtab.intro.paragraph6.pin=pegar
+newtab.intro.paragraph7=Algunos de los sitios que podrá ver pueden ser sugeridos por Mozilla y pueden ser patrocinados por un partner de Mozilla. Siempre indicaremos que sitios son patrocinados.
+# LOCALIZATION NOTE(newtab.intro.paragraph8): %1$S will be replaced by
+# brandShortName as text. %2$S will be replaced inline by an active link using
+# string newtab.learn.link as text.
+newtab.intro.paragraph8=%1$S solamente mostrará los sitios que coincidan más estrechamente con sus intereses en la web. %2$S
+newtab.intro.paragraph9=Ahora cuando abra una nueva pestaña, también verá sitios que pensamos que le pueden interesar.
+# LOCALIZATION NOTE(newtab.intro.controls): the controls in the gear icon
+# menu for customizing the new tab window. Used in newtab.intro.paragraph4
+newtab.intro.controls=Controles de nueva pestaña
 newtab.learn.link=Conocer más…
 newtab.privacy.link=nota de privacidad
-
+newtab.learn.link2=Más sobre nueva pestaña
+newtab.privacy.link2=Acerca de la privacidad
+# LOCALIZATION NOTE(newtab.intro.header.welcome): %1$S will be replaced by
+# brandShortName as bold text.
+newtab.intro.header.welcome=¡Bienvenido a la nueva pestañá en %1$S!
+newtab.intro.header.update=¡Nueva pestaña tuvo una actualización!
+newtab.intro.skip=Saltear esto
+newtab.intro.continue=Continuar tour
+newtab.intro.back=Atrás
+newtab.intro.next=Siguiente
+newtab.intro.gotit=¡Lo tengo!
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/places/places.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/places/places.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/places/places.dtd	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/places/places.dtd	2015-05-25 20:46:30.000000000 +0000
@@ -85,7 +85,6 @@
 <!ENTITY col.url.label                     "Dirección">
 <!ENTITY col.mostrecentvisit.label "Visita más reciente">
 <!ENTITY col.visitcount.label              "Cantidad de visitas">
-<!ENTITY col.keyword.label                 "Palabra clave">
 <!ENTITY col.description.label             "Descripción">
 <!ENTITY col.dateadded.label               "Agregado">
 <!ENTITY col.lastmodified.label            "Última modificación">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/places/places.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/places/places.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/places/places.properties	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/places/places.properties	2015-05-25 20:46:30.000000000 +0000
@@ -36,8 +36,6 @@
 view.sortBy.1.date.accesskey=v
 view.sortBy.1.visitCount.label=Ordenar por cantidad de visitas
 view.sortBy.1.visitCount.accesskey=c
-view.sortBy.1.keyword.label=Ordenar por palabra clave
-view.sortBy.1.keyword.accesskey=p
 view.sortBy.1.description.label=Ordenar por descripción
 view.sortBy.1.description.accesskey=d
 view.sortBy.1.dateAdded.label=Ordenar por agregado
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/preferences/main.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/preferences/main.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/preferences/main.dtd	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/preferences/main.dtd	2015-05-25 20:46:30.000000000 +0000
@@ -42,3 +42,4 @@
 <!ENTITY useFirefoxSync.label             "Consejo: Esta opción usa perfiles separados. Use Sync para compartir datos entre ellos.">
 <!ENTITY getStarted.label                 "Comenzar a usar Sync…">
 
+<!ENTITY e10sEnabled.label                "Habilitar multiproceso en &brandShortName;">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd	2015-05-25 20:46:30.000000000 +0000
@@ -12,6 +12,11 @@
 <!ENTITY safeb.blocked.malwarePage.shortDesc "La página web en <span id='malware_sitename'/> ha sido informada como una página de ataque y ha sido bloqueada según sus preferencias de seguridad.">
 <!ENTITY safeb.blocked.malwarePage.longDesc "<p>Las páginas de ataque tratan de instalar programas que roban información privada, usan su computadora para atacar otras o dañan su sistema.</p><p>Algunas páginas de ataque intencionalmente distribuyen software dañino, pero muchos están comprometidos sin el conocimiento o permiso de sus dueños.</p>">
 
+<!ENTITY safeb.blocked.unwantedPage.title "¡Página informada por entregar software no deseado!">
+<!-- Localization note (safeb.blocked.malware.shortDesc) - Please don't translate the contents of the <span id="unwanted_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
+<!ENTITY safeb.blocked.unwantedPage.shortDesc "La página web en <span id='unwanted_sitename'/> ha sido informada por contener software no deseado y ha sido bloqueada según sus preferencias de seguridad.">
+<!ENTITY safeb.blocked.unwantedPage.longDesc "<p>Las páginas con software no deseado tratan de instalar programas que pueden ser engañosos y afectar a su sistema en formas inesperadas.</p>">
+
 <!ENTITY safeb.blocked.phishingPage.title "¡Fraude web informado!">
 <!-- Localization note (safeb.blocked.phishing.shortDesc) - Please don't translate the contents of the <span id="phishing_sitename"/> tag. It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
 <!ENTITY safeb.blocked.phishingPage.shortDesc "Esta página web en <span id='phishing_sitename'/> ha sido informada como fraudulenta y ha sido bloqueada según sus preferencias de seguridad.">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/syncProgress.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/syncProgress.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/browser/syncProgress.dtd	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/browser/syncProgress.dtd	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY % brandDTD
-    SYSTEM "chrome://branding/locale/brand.dtd">
-    %brandDTD;
-
-<!-- These strings are used in the sync progress upload page -->
-<!ENTITY syncProgress.pageTitle    "Su primera sincronización">
-<!ENTITY syncProgress.textBlurb    "Sus datos están siendo cifrados y subidos en segundo plano. Puede cerrar esta pestaña y continuar usando &brandShortName;.">
-<!ENTITY syncProgress.closeButton  "Cerrar">
-<!ENTITY syncProgress.logoAltText  "&brandShortName; logo">
-<!ENTITY syncProgress.diffText     "&brandShortName; ahora sincronizará automáticamente en segundo plano.  Puede cerrar esta pestaña y continuar usando &brandShortName;.">
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/overrides/appstrings.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/overrides/appstrings.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/overrides/appstrings.properties	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/overrides/appstrings.properties	2015-05-25 20:46:30.000000000 +0000
@@ -29,8 +29,9 @@
 externalProtocolUnknown = <desconocida>
 externalProtocolChkMsg = Recordar mi selección para todos los enlaces de este tipo.
 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.
+malwareBlocked=El sitio web %S ha sido informado como un sitio de ataque y fue bloqueado basado en sus preferencias de seguridad.
+unwantedBlocked=El sitio web %S ha sido informado por entregar software no deseado y ha sido bloqueado basado en sus preferencias de seguridad.
+phishingBlocked=El sitio web %S ha sido informado como un sitio fraudulento diseñado para engañar usuarios para que compartan información personal o financiera.
 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 sportada que ya no está disponible en Firefox.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/overrides/netError.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/overrides/netError.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/browser/chrome/overrides/netError.dtd	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/browser/chrome/overrides/netError.dtd	2015-05-25 20:46:30.000000000 +0000
@@ -164,6 +164,11 @@
 <p>Los dueños de sitios web que creen que su sitio ha sido reportado como un sitio de ataque por error pueden <a href='http://www.stopbadware.org/home/reviewinfo' >pedir una revisión</a>.</p>
 ">
 
+<!ENTITY unwantedBlocked.title "¡Sitio sospechoso de software no deseado!">
+<!ENTITY unwantedBlocked.longDesc "
+<p>Páginas de software no deseado tratan de instalar programas que pueden ser engañosos y afectar a su sistema en formas inesperadas.</p>
+">
+
 <!ENTITY phishingBlocked.title "¡Sitio sospechoso de fraude!">
 <!ENTITY phishingBlocked.longDesc "
 <p>Ingresando cualquier información personal en esta página puede resultar en robo de identidad o algún otro fraude.</p>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/dom/chrome/dom/dom.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/dom/chrome/dom/dom.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/dom/chrome/dom/dom.properties	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/dom/chrome/dom/dom.properties	2015-05-25 20:46:31.000000000 +0000
@@ -82,7 +82,6 @@
 FullScreenDeniedSubDocFullScreen=El pedido de pantalla completa fue denegado porque un subdocumento del documento solicitante ya está en pantalla completa.
 FullScreenDeniedNotDescendant=El pedido de pantalla completa fue denegado porque el elemento solicitante no es un descendiente del elemento de pantalla completa actual.
 FullScreenDeniedNotFocusedTab=El pedido de pantalla completa fue denegado porque el elemento solicitante no está en la pestaña que tiene el foco actualmente.
-FullScreenDeniedContentOnly=El pedido de pantalla completa fue denegado porque el elemento solicitante está en el documento chrome y la API de pantalla completa está configurada solamente para contenido.
 RemovedFullScreenElement=Saliendo de pantalla completa porque el elemento full-screen fue eliminado del documento.
 FocusedWindowedPluginWhileFullScreen=Saliendo de pantalla completa porque un plugin en ventana obtuvo el foco.
 HTMLSyncXHRWarning=HTML parsing in XMLHttpRequest is not supported in the synchronous mode.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/security/manager/chrome/pipnss/nsserrors.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/security/manager/chrome/pipnss/nsserrors.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/security/manager/chrome/pipnss/nsserrors.properties	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/security/manager/chrome/pipnss/nsserrors.properties	2015-05-25 20:46:30.000000000 +0000
@@ -318,3 +318,4 @@
 MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE=El servidor presentó un certificado que aún no es válido.
 MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE=Un certificado que aún no es válido fue usado para emitir el certificado del servidor.
 MOZILLA_PKIX_ERROR_SIGNATURE_ALGORITHM_MISMATCH=El algoritmo de firma en el campo de firma del certificado no coincide con su propio campo signatureAlgorithm
+MOZILLA_PKIX_ERROR_OCSP_RESPONSE_FOR_CERT_MISSING=La respuesta OCSP no incluye un estado para el certificado que está siendo verificado.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/toolkit/chrome/global/aboutTelemetry.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/toolkit/chrome/global/aboutTelemetry.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/toolkit/chrome/global/aboutTelemetry.dtd	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/toolkit/chrome/global/aboutTelemetry.dtd	2015-05-25 20:46:31.000000000 +0000
@@ -4,18 +4,70 @@
 
 <!ENTITY aboutTelemetry.pageTitle "Datos de Telemetry">
 
-<!ENTITY aboutTelemetry.telemetryEnabled "
-  Telemetry está <span>habilitado</span>.
+<!ENTITY aboutTelemetry.changeDataChoices "
+  Cambiar
 ">
 
-<!ENTITY aboutTelemetry.telemetryDisabled "
-  Telemetry está <span>deshabilitado</span>.
+<!ENTITY aboutTelemetry.uploadEnabled "
+  Subida de datos FHR <span>habilitada</span>.
+">
+
+<!ENTITY aboutTelemetry.uploadDisabled "
+  Subida de datos FHR <span>deshabilitada</span>.
+">
+
+<!ENTITY aboutTelemetry.extendedRecordingEnabled "
+  Grabación de Telemetry estendida <span>habilitada</span>.
+">
+
+<!ENTITY aboutTelemetry.extendedRecordingDisabled "
+  Grabación de Telemetry extendida <span>deshabilitada</span>.
+">
+
+<!ENTITY aboutTelemetry.pingDataSource "
+Fuente de datos de ping:
+">
+
+<!ENTITY aboutTelemetry.showCurrentPingData "
+Datos de ping actuales
+">
+
+<!ENTITY aboutTelemetry.showArchivedPingData "
+Datos de ping archivados
+">
+
+<!ENTITY aboutTelemetry.showSubsessionData "
+Mostrar datos de subsesión
+">
+
+<!ENTITY aboutTelemetry.choosePing "
+Elegir ping:
+">
+
+<!ENTITY aboutTelemetry.showNewerPing "
+&lt;&lt; Ping más reciente
+">
+
+<!ENTITY aboutTelemetry.showOlderPing "
+Ping más antiguo &gt;&gt;
+">
+
+<!ENTITY aboutTelemetry.archiveWeekHeader "
+Semana
+">
+
+<!ENTITY aboutTelemetry.archivePingHeader "
+Ping
 ">
 
 <!ENTITY aboutTelemetry.generalDataSection "
   Datos generales
 ">
 
+<!ENTITY aboutTelemetry.environmentDataSection "
+  Datos de entorno
+">
+
 <!ENTITY aboutTelemetry.telemetryLogSection "
   Registro de Telemetry
 ">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/toolkit/chrome/global/aboutTelemetry.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/toolkit/chrome/global/aboutTelemetry.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/toolkit/chrome/global/aboutTelemetry.properties	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/toolkit/chrome/global/aboutTelemetry.properties	2015-05-25 20:46:31.000000000 +0000
@@ -13,6 +13,10 @@
 
 generalDataHeadingValue = Valor
 
+environmentDataHeadingName = Nombre
+
+environmentDataHeadingValue = Valor
+
 telemetryLogTitle = Registro de Telemetry
 
 telemetryLogHeadingId = Id
@@ -54,10 +58,6 @@
 
 histogramCopy = Copiar
 
-disableTelemetry = Deshabiitar Telemetry
-
-enableTelemetry = Habilitar Telemetry
-
 keysHeader = Propiedad
 
 valuesHeader = Valor
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/toolkit/chrome/global/devtools/gclicommands.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/toolkit/chrome/global/devtools/gclicommands.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/toolkit/chrome/global/devtools/gclicommands.properties	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/toolkit/chrome/global/devtools/gclicommands.properties	2015-05-25 20:46:31.000000000 +0000
@@ -0,0 +1,1577 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE These strings are used inside Web Console commands.
+# The Web Console command line is available from the Web Developer sub-menu
+# -> 'Web Console'.
+#
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# LOCALIZATION NOTE (helpDesc) A very short string used to describe the
+# function of the help command.
+helpDesc=Obtener ayuda sobre los comandos disponibles
+
+# LOCALIZATION NOTE (helpAvailable) Used in the output of the help command to
+# explain the contents of the command help table.
+helpAvailable=Comandos disponibles
+
+# LOCALIZATION NOTE (notAvailableInE10S) Used in the output of any command that
+# is not compatible with multiprocess mode (E10S).
+notAvailableInE10S=El comando '%1$S' no está disponible en modo multiproceso (E10S)
+
+# LOCALIZATION NOTE (consoleDesc) A very short string used to describe the
+# function of the console command.
+consoleDesc=Comandos para controlar la consola
+
+# LOCALIZATION NOTE (consoleManual) A longer description describing the
+# set of commands that control the console.
+consoleManual=Filtrar, limpiar y cerrar la consola web
+
+# LOCALIZATION NOTE (consoleclearDesc) A very short string used to describe the
+# function of the 'console clear' command.
+consoleclearDesc=Limpiar la consola
+
+# LOCALIZATION NOTE (screenshotDesc) A very short description of the
+# 'screenshot' command. See screenshotManual for a fuller description of what
+# it does. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+screenshotDesc=Guardar una imagen de la página
+
+# LOCALIZATION NOTE (screenshotManual) A fuller description of the 'screenshot'
+# command, displayed when the user asks for help on what it does.
+screenshotManual=Guardar una imagen PNG del ventana visible completa (opcionalmente después de un retardo)
+
+# LOCALIZATION NOTE (screenshotFilenameDesc) A very short string to describe
+# the 'filename' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotFilenameDesc=Archivo de destino
+
+# LOCALIZATION NOTE (screenshotFilenameManual) A fuller description of the
+# 'filename' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotFilenameManual=El nombre del archivo (debería tener una extensión '.png') en el cual guardar la captura de pantalla.
+
+# LOCALIZATION NOTE (screenshotClipboardDesc) A very short string to describe
+# the 'clipboard' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotClipboardDesc=¿Copiar captura al portapapeles? (verdadero/falso)
+
+
+# LOCALIZATION NOTE (screenshotClipboardManual) A fuller description of the
+# 'clipboard' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotClipboardManual=Verdadero si quiere copiar la captura en lugar de guardarla en un archivo.
+
+# LOCALIZATION NOTE (screenshotChromeDesc) A very short string to describe
+# the 'chrome' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+# The argument (%1$S) is the browser name.
+screenshotChromeDesc2=¿Capturar ventana chrome de %1$S? (verdadero/falso)
+
+# LOCALIZATION NOTE (screenshotChromeManual) A fuller description of the
+# 'chrome' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+# The argument (%1$S) is the browser name.
+screenshotChromeManual2=Verdadero si desea hacer la captura de pantalla de la ventana de %1$S en lugar de la ventana con el contenido de la página web.
+
+# LOCALIZATION NOTE (screenshotGroupOptions) A label for the optional options of
+# the screenshot command.
+screenshotGroupOptions=Opciones
+
+# LOCALIZATION NOTE (screenshotGroupOptions) A label for the advanced options of
+# the screenshot command.
+screenshotAdvancedOptions=Opciones avanzadas
+
+# LOCALIZATION NOTE (screenshotDelayDesc) A very short string to describe
+# the 'delay' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotDelayDesc=Retardo (segundos)
+
+# LOCALIZATION NOTE (screenshotDelayManual) A fuller description of the
+# 'delay' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotDelayManual=El tiempo a esperar (en segundos) antes de tomar la captura de pantalla
+
+# LOCALIZATION NOTE (screenshotFullscreenDesc) A very short string to describe
+# the 'fullscreen' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotFullPageDesc=¿Página completa? (verdadero/falso)
+
+# LOCALIZATION NOTE (screenshotFullscreenManual) A fuller description of the
+# 'fullscreen' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotFullPageManual=Verdadero si la captura debería incluír partes de la página que está fuera de los límites visibles actualmente.
+
+# LOCALIZATION NOTE (screenshotSelectorChromeConflict) Exception thwon when user
+# tries to use 'selector' option along with 'chrome' option of the screenshot
+# command. Refer: https://bugzilla.mozilla.org/show_bug.cgi?id=659268#c7
+screenshotSelectorChromeConflict=selector option is not supported when chrome option is true
+
+# LOCALIZATION NOTE (screenshotGeneratedFilename) The auto generated filename
+# when no file name is provided. the first argument (%1$S) is the date string
+# in yyyy-mm-dd format and the second argument (%2$S) is the time string
+# in HH.MM.SS format. Please don't add the extension here.
+screenshotGeneratedFilename=Captura %1$S - %2$S
+
+# LOCALIZATION NOTE (screenshotErrorSavingToFile) Text displayed to user upon
+# encountering error while saving the screenshot to the file specified.
+screenshotErrorSavingToFile=Error guardando en
+
+# LOCALIZATION NOTE (screenshotSavedToFile) Text displayed to user when the
+# screenshot is successfully saved to the file specified.
+screenshotSavedToFile=Guardado en
+
+# LOCALIZATION NOTE (screenshotErrorCopying) Text displayed to user upon
+# encountering error while copying the screenshot to clipboard.
+screenshotErrorCopying=Ocurrió un error al copiar al portapapeles.
+
+# LOCALIZATION NOTE (screenshotCopied) Text displayed to user when the
+# screenshot is successfully copied to the clipboard.
+screenshotCopied=Copiado al portapapeles.
+
+# LOCALIZATION NOTE (screenshotTooltip) Text displayed as tooltip for screenshot button in devtools ToolBox.
+screenshotTooltip=Tomar una captura de página completa
+
+# LOCALIZATION NOTE (screenshotImgurDesc) A very short string to describe
+# the 'imgur' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotImgurDesc=Subir a imgur.com
+
+# LOCALIZATION NOTE (screenshotImgurManual) A fuller description of the
+# 'imgur' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotImgurManual=Usar si desea subir a imgur.com en vez de guardar en el disco
+
+# LOCALIZATION NOTE (screenshotImgurError) Text displayed to user upon
+# encountering error while uploading the screenshot to imgur.com.
+screenshotImgurError=No se puede alcanzar API de imgur
+
+# LOCALIZATION NOTE (screenshotImgurUploading) Text displayed to user when the
+# screenshot is successfully sent to Imgur but the program is waiting on a response.
+# The argument (%1$S) is a new image URL at Imgur.
+screenshotImgurUploaded=Subido a %1$S
+
+# LOCALIZATION NOTE (highlightDesc) A very short description of the
+# 'highlight' command. See highlightManual for a fuller description of what
+# it does. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+highlightDesc=Resaltar nodos
+
+# LOCALIZATION NOTE (highlightManual) A fuller description of the 'highlight'
+# command, displayed when the user asks for help on what it does.
+highlightManual=Resalta nodos que coincidan con un selector en la págna
+
+# LOCALIZATION NOTE (highlightSelectorDesc) A very short string to describe
+# the 'selector' parameter to the 'highlight' command, which is displayed in
+# a dialog when the user is using this command.
+highlightSelectorDesc=Selector CSS
+
+# LOCALIZATION NOTE (highlightSelectorManual) A fuller description of the
+# 'selector' parameter to the 'highlight' command, displayed when the user
+# asks for help on what it does.
+highlightSelectorManual=El selector CSS usado para coincidir con los nodos de la página
+
+# LOCALIZATION NOTE (highlightOptionsDesc) The title of a set of options to
+# the 'highlight' command, displayed as a heading to the list of option.
+highlightOptionsDesc=Opciones
+
+# LOCALIZATION NOTE (highlightHideGuidesDesc) A very short string to describe
+# the 'hideguides' option parameter to the 'highlight' command, which is
+# displayed in a dialog when the user is using this command.
+highlightHideGuidesDesc=Ocultar guías
+
+# LOCALIZATION NOTE (highlightHideGuidesManual) A fuller description of the
+# 'hideguides' option parameter to the 'highlight' command, displayed when the
+# user asks for help on what it does.
+highlightHideGuidesManual=Oculta las guías alrededor del nodo resaltado
+
+# LOCALIZATION NOTE (highlightShowInfoBarDesc) A very short string to describe
+# the 'showinfobar' option parameter to the 'highlight' command, which is
+# displayed in a dialog when the user is using this command.
+highlightShowInfoBarDesc=Mostrar información del nodo
+
+# LOCALIZATION NOTE (highlightShowInfoBarManual) A fuller description of the
+# 'showinfobar' option parameter to the 'highlight' command, displayed when the
+# user asks for help on what it does.
+highlightShowInfoBarManual=Muestra la barra de información sobre el nodo resaltado (la barra de información muestra el nombre de etiqueta, atributos y dimensión)
+
+# LOCALIZATION NOTE (highlightShowAllDesc) A very short string to describe
+# the 'showall' option parameter to the 'highlight' command, which is
+# displayed in a dialog when the user is using this command.
+highlightShowAllDesc=Mostrar todas las coincidencias
+
+# LOCALIZATION NOTE (highlightShowAllManual) A fuller description of the
+# 'showall' option parameter to the 'highlight' command, displayed when the
+# user asks for help on what it does.
+highlightShowAllManual=Si demasiados nodos coinciden con el selector, se mostrarán solamente los primeros cien para evitar sobrecargar la página. Use esta opción para mostrar todas las coincidencias
+
+# LOCALIZATION NOTE (highlightRegionDesc) A very short string to describe the
+# 'region' option parameter to the 'highlight' command, which is displayed in a
+# dialog when the user is using this command.
+highlightRegionDesc=Box model region
+
+# LOCALIZATION NOTE (highlightRegionManual) A fuller description of the 'region'
+# option parameter to the 'highlight' command, displayed when the user asks for
+# help on what it does.
+highlightRegionManual=Which box model region should be highlighted: 'content', 'padding', 'border' or 'margin'
+
+# LOCALIZATION NOTE (highlightFillDesc) A very short string to describe the
+# 'fill' option parameter to the 'highlight' command, which is displayed in a
+# dialog when the user is using this command.
+highlightFillDesc=Estilo de llenado
+
+# LOCALIZATION NOTE (highlightFillManual) A fuller description of the 'fill'
+# option parameter to the 'highlight' command, displayed when the user asks for
+# help on what it does.
+highlightFillManual=Override the default region fill style with a custom color
+
+# LOCALIZATION NOTE (highlightKeepDesc) A very short string to describe the
+# 'keep' option parameter to the 'highlight' command, which is displayed in a
+# dialog when the user is using this command.
+highlightKeepDesc=Mantener resaltadores existentes
+
+# LOCALIZATION NOTE (highlightKeepManual) A fuller description of the 'keep'
+# option parameter to the 'highlight' command, displayed when the user asks for
+# help on what it does.
+highlightKeepManual=Por defecto, los resaltadores existentes se ocultan al ejecutar el comando, a menos que se establezca esta opción
+
+# LOCALIZATION NOTE (highlightOutputConfirm) A confirmation message for the
+# 'highlight' command, displayed to the user once the command has been entered,
+# informing the user how many nodes have been highlighted successfully and how
+# to turn highlighting off
+highlightOutputConfirm2=%1$S nodo resaltado;%1$S nodos resaltados
+
+# LOCALIZATION NOTE (highlightOutputMaxReached) A confirmation message for the
+# 'highlight' command, displayed to the user once the command has been entered,
+# informing the user how many nodes have been highlighted successfully and that
+# some nodes could not be highlighted due to the maximum number of nodes being
+# reached, and how to turn highlighting off
+highlightOutputMaxReached=%1$S nodos coincidentes, pero solo %2$S nodos resaltados. Use '--showall' para mostrarlos a todos
+
+# LOCALIZATION NOTE (unhighlightDesc) A very short description of the
+# 'unhighlight' command. See unhighlightManual for a fuller description of what
+# it does. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+unhighlightDesc=Unhighlight all nodes
+
+# LOCALIZATION NOTE (unhighlightManual) A fuller description of the 'unhighlight'
+# command, displayed when the user asks for help on what it does.
+unhighlightManual=Unhighlight all nodes previously highlighted with the 'highlight' command
+
+# LOCALIZATION NOTE (restartBrowserDesc) A very short description of the
+# 'restart' command. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+# The argument (%1$S) is the browser name.
+restartBrowserDesc=Reiniciar %1$S
+
+# LOCALIZATION NOTE (restartBrowserNocacheDesc) A very short string to
+# describe the 'nocache' parameter to the 'restart' command, which is
+# displayed in a dialog when the user is using this command.
+restartBrowserNocacheDesc=Deshabilita cargar contenido de caché al reiniciar
+
+# LOCALIZATION NOTE (restartBrowserRequestCancelled) A string displayed to the
+# user when a scheduled restart has been aborted by the user.
+restartBrowserRequestCancelled=Pedido de reinicio cancelado por el usuario.
+
+# LOCALIZATION NOTE (restartBrowserRestarting) A string displayed to the
+# user when a restart has been initiated without a delay.
+# The argument (%1$S) is the browser name.
+restartBrowserRestarting=Reiniciando %1$S…
+
+# LOCALIZATION NOTE (inspectDesc) A very short description of the 'inspect'
+# command. See inspectManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+inspectDesc=Inspeccionar un nodo
+
+# LOCALIZATION NOTE (inspectManual) A fuller description of the 'inspect'
+# command, displayed when the user asks for help on what it does.
+inspectManual=Investigar las dimensiones y propiedades de un elemento usando un selector CSS para abrir el resaltador de DOM
+
+# LOCALIZATION NOTE (inspectNodeDesc) A very short string to describe the
+# 'node' parameter to the 'inspect' command, which is displayed in a dialog
+# when the user is using this command.
+inspectNodeDesc=Selector CSS
+
+# LOCALIZATION NOTE (inspectNodeManual) A fuller description of the 'node'
+# parameter to the 'inspect' command, displayed when the user asks for help
+# on what it does.
+inspectNodeManual=Un selector CSS para usar con Document.querySelector que identifica un elemento solo
+
+# LOCALIZATION NOTE (eyedropperDesc) A very short description of the 'eyedropper'
+# command. See eyedropperManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+eyedropperDesc=Tomar un color de la página
+
+# LOCALIZATION NOTE (eyedropperManual) A fuller description of the 'eyedropper'
+# command, displayed when the user asks for help on what it does.
+eyedropperManual=Abre un panel que magnifica un área de la página para inspeccionar píxeles y copiar valores de color
+
+# LOCALIZATION NOTE (eyedropperTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles the Eyedropper tool.
+eyedropperTooltip=Toma un color de la página
+
+# LOCALIZATION NOTE (tiltDesc) A very short description of the 'tilt'
+# command. See tiltManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltDesc=Visualizar la página web en 3D
+
+# LOCALIZATION NOTE (tiltManual) A fuller description of the 'tilt'
+# command, displayed when the user asks for help on what it does.
+tiltManual=Investigar la relación entre varias partes de una página web y sus ancestros en un ambiente 3D
+
+# LOCALIZATION NOTE (tiltOpenDesc) A very short description of the 'tilt inspect'
+# command. See tiltOpenManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltOpenDesc=Abrir la vista 3D del inspector
+
+# LOCALIZATION NOTE (tiltOpenManual) A fuller description of the 'tilt translate'
+# command, displayed when the user asks for help on what it does.
+tiltOpenManual=Inicializar el inspector de páginas 3D y opcionalmente resaltar un nodo usando un selector CSS
+
+# LOCALIZATION NOTE (tiltToggleTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles Tilt 3D View.
+tiltToggleTooltip=Vista 3D
+
+# LOCALIZATION NOTE (tiltTranslateDesc) A very short description of the 'tilt translate'
+# command. See tiltTranslateManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltTranslateDesc=Move the webpage mesh
+
+# LOCALIZATION NOTE (tiltTranslateManual) A fuller description of the 'tilt translate'
+# command, displayed when the user asks for help on what it does.
+tiltTranslateManual=Incrementally translate the webpage mesh in a certain direction
+
+# LOCALIZATION NOTE (tiltTranslateXDesc) A very short string to describe the
+# 'x' parameter to the 'tilt translate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltTranslateXDesc=X (píxeles)
+
+# LOCALIZATION NOTE (tiltTranslateXManual) A fuller description of the 'x'
+# parameter to the 'translate' command, displayed when the user asks for help
+# on what it does.
+tiltTranslateXManual=The ammount in pixels to translate the webpage mesh on the X axis
+
+# LOCALIZATION NOTE (tiltTranslateYDesc) A very short string to describe the
+# 'y' parameter to the 'tilt translate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltTranslateYDesc=Y (pixels)
+
+# LOCALIZATION NOTE (tiltTranslateYManual) A fuller description of the 'y'
+# parameter to the 'translate' command, displayed when the user asks for help
+# on what it does.
+tiltTranslateYManual=The ammount in pixels to translate the webpage mesh on the Y axis
+
+# LOCALIZATION NOTE (tiltRotateDesc) A very short description of the 'tilt rotate'
+# command. See tiltRotateManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltRotateDesc=Spin the webpage mesh
+
+# LOCALIZATION NOTE (tiltRotateManual) A fuller description of the 'tilt rotate'
+# command, displayed when the user asks for help on what it does.
+tiltRotateManual=Incrementally rotate the webpage mesh in a certain direction
+
+# LOCALIZATION NOTE (tiltRotateXDesc) A very short string to describe the
+# 'x' parameter to the 'tilt rotate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltRotateXDesc=X (grados)
+
+# LOCALIZATION NOTE (tiltRotateXManual) A fuller description of the 'x'
+# parameter to the 'rotate' command, displayed when the user asks for help
+# on what it does.
+tiltRotateXManual=The ammount in degrees to rotate the webpage mesh along the X axis
+
+# LOCALIZATION NOTE (tiltRotateYDesc) A very short string to describe the
+# 'y' parameter to the 'tilt rotate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltRotateYDesc=Y (grados)
+
+# LOCALIZATION NOTE (tiltRotateYManual) A fuller description of the 'y'
+# parameter to the 'rotate' command, displayed when the user asks for help
+# on what it does.
+tiltRotateYManual=The ammount in degrees to rotate the webpage mesh along the Y axis
+
+# LOCALIZATION NOTE (tiltRotateZDesc) A very short string to describe the
+# 'z' parameter to the 'tilt rotate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltRotateZDesc=Z (grados)
+
+# LOCALIZATION NOTE (tiltRotateZManual) A fuller description of the 'z'
+# parameter to the 'rotate' command, displayed when the user asks for help
+# on what it does.
+tiltRotateZManual=The ammount in degrees to rotate the webpage mesh along the Z axis
+
+# LOCALIZATION NOTE (tiltZoomDesc) A very short description of the 'tilt zoom'
+# command. See tiltZoomManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltZoomDesc=Move away or towards the webpage mesh
+
+# LOCALIZATION NOTE (tiltZoomManual) A fuller description of the 'tilt zoom'
+# command, displayed when the user asks for help on what it does.
+tiltZoomManual=Incrementally move the webpage mesh in a certain direction along the Z axis
+
+# LOCALIZATION NOTE (tiltZoomAmountDesc) A very short string to describe the
+# 'zoom' parameter to the 'tilt zoom' command, which is displayed in a dialog
+# when the user is using this command.
+tiltZoomAmountDesc=Zoom (pixels)
+
+# LOCALIZATION NOTE (tiltZoomAmmuntManual) A fuller description of the 'zoom'
+# parameter to the 'zoom' command, displayed when the user asks for help
+# on what it does.
+tiltZoomAmountManual=The amount in pixels to translate the webpage mesh along the Z axis
+
+# LOCALIZATION NOTE (tiltResetDesc) A very short description of the 'tilt reset'
+# command. See tiltResetManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltResetDesc=Reset the translation, rotation and zoom
+
+# LOCALIZATION NOTE (tiltResetManual) A fuller description of the 'tilt reset'
+# command, displayed when the user asks for help on what it does.
+tiltResetManual=Resets any transformations applied to the webpage mesh modelview matrix
+
+# LOCALIZATION NOTE (tiltCloseDesc) A very short description of the 'tilt close'
+# command. See tiltCloseManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltCloseDesc=Cerrar la visualización si está abierta
+
+# LOCALIZATION NOTE (tiltCloseManual) A fuller description of the 'tilt close'
+# command, displayed when the user asks for help on what it does.
+tiltCloseManual=Close the visualization and switch back to the Inspector default highlighter
+
+# LOCALIZATION NOTE (debuggerClosed) Used in the output of several commands
+# to explain that the debugger must be opened first.
+debuggerClosed=El depurador debe estar abierto antes de usar este comando
+
+# LOCALIZATION NOTE (debuggerStopped) Used in the output of several commands
+# to explain that the debugger must be opened first.
+debuggerStopped=The debugger must be opened before setting breakpoints
+
+# LOCALIZATION NOTE (breakDesc) A very short string used to describe the
+# function of the break command.
+breakDesc=Manage breakpoints
+
+# LOCALIZATION NOTE (breakManual) A longer description describing the
+# set of commands that control breakpoints.
+breakManual=Commands to list, add and remove breakpoints
+
+# LOCALIZATION NOTE (breaklistDesc) A very short string used to describe the
+# function of the 'break list' command.
+breaklistDesc=Display known breakpoints
+
+# LOCALIZATION NOTE (breaklistNone) Used in the output of the 'break list'
+# command to explain that the list is empty.
+breaklistNone=No breakpoints set
+
+# LOCALIZATION NOTE (breaklistOutRemove) A title used in the output from the
+# 'break list' command on a button which can be used to remove breakpoints
+breaklistOutRemove=Eliminar
+
+# LOCALIZATION NOTE (breakaddAdded) Used in the output of the 'break add'
+# command to explain that a breakpoint was added.
+breakaddAdded=Added breakpoint
+
+# LOCALIZATION NOTE (breakaddFailed) Used in the output of the 'break add'
+# command to explain that a breakpoint could not be added.
+breakaddFailed=Could not set breakpoint: %S
+
+# LOCALIZATION NOTE (breakaddDesc) A very short string used to describe the
+# function of the 'break add' command.
+breakaddDesc=Add a breakpoint
+
+# LOCALIZATION NOTE (breakaddManual) A longer description describing the
+# set of commands that are responsible for adding breakpoints.
+breakaddManual=Breakpoint types supported: line
+
+# LOCALIZATION NOTE (breakaddlineDesc) A very short string used to describe the
+# function of the 'break add line' command.
+breakaddlineDesc=Add a line breakpoint
+
+# LOCALIZATION NOTE (breakaddlineFileDesc) A very short string used to describe
+# the function of the file parameter in the 'break add line' command.
+breakaddlineFileDesc=JS file URI
+
+# LOCALIZATION NOTE (breakaddlineLineDesc) A very short string used to describe
+# the function of the line parameter in the 'break add line' command.
+breakaddlineLineDesc=Número de línea
+
+# LOCALIZATION NOTE (breakdelDesc) A very short string used to describe the
+# function of the 'break del' command.
+breakdelDesc=Remove a breakpoint
+
+# LOCALIZATION NOTE (breakdelBreakidDesc) A very short string used to describe
+# the function of the index parameter in the 'break del' command.
+breakdelBreakidDesc=Index of breakpoint
+
+# LOCALIZATION NOTE (breakdelRemoved) Used in the output of the 'break del'
+# command to explain that a breakpoint was removed.
+breakdelRemoved=Breakpoint removed
+
+# LOCALIZATION NOTE (dbgDesc) A very short string used to describe the
+# function of the dbg command.
+dbgDesc=Administrar depurador
+
+# LOCALIZATION NOTE (dbgManual) A longer description describing the
+# set of commands that control the debugger.
+dbgManual=Commands to interrupt or resume the main thread, step in, out and over lines of code
+
+# LOCALIZATION NOTE (dbgOpen) A very short string used to describe the function
+# of the dbg open command.
+dbgOpen=Abrir el depurador
+
+# LOCALIZATION NOTE (dbgClose) A very short string used to describe the function
+# of the dbg close command.
+dbgClose=Cerrar el depurador
+
+# LOCALIZATION NOTE (dbgInterrupt) A very short string used to describe the
+# function of the dbg interrupt command.
+dbgInterrupt=Pauses the main thread
+
+# LOCALIZATION NOTE (dbgContinue) A very short string used to describe the
+# function of the dbg continue command.
+dbgContinue=Resumes the main thread, and continues execution following a breakpoint, until the next breakpoint or the termination of the script.
+
+# LOCALIZATION NOTE (dbgStepDesc) A very short string used to describe the
+# function of the dbg step command.
+dbgStepDesc=Manage stepping
+
+# LOCALIZATION NOTE (dbgStepManual) A longer description describing the
+# set of commands that control stepping.
+dbgStepManual=Commands to step in, out and over lines of code
+
+# LOCALIZATION NOTE (dbgStepOverDesc) A very short string used to describe the
+# function of the dbg step over command.
+dbgStepOverDesc=Executes the current statement and then stops at the next statement. If the current statement is a function call then the debugger executes the whole function, and it stops at the next statement after the function call
+
+# LOCALIZATION NOTE (dbgStepInDesc) A very short string used to describe the
+# function of the dbg step over command.
+dbgStepInDesc=Executes the current statement and then stops at the next statement. If the current statement is a function call, then the debugger steps into that function, otherwise it stops at the next statement
+
+# LOCALIZATION NOTE (dbgStepOutDesc) A very short string used to describe the
+# function of the dbg step over command.
+dbgStepOutDesc=Steps out of the current function and up one level if the function is nested. If in the main body, the script is executed to the end, or to the next breakpoint. The skipped statements are executed, but not stepped through
+
+# LOCALIZATION NOTE (dbgListSourcesDesc) A very short string used to describe the
+# function of the dbg list command.
+dbgListSourcesDesc=Listar las URLs fuente cargadas en el depurador
+
+# LOCALIZATION NOTE (dbgBlackBoxDesc) A very short string used to describe the
+# function of the 'dbg blackbox' command.
+dbgBlackBoxDesc=Black box sources in the debugger
+
+# LOCALIZATION NOTE (dbgBlackBoxSourceDesc) A very short string used to describe the
+# 'source' parameter to the 'dbg blackbox' command.
+dbgBlackBoxSourceDesc=A specific source to black box
+
+# LOCALIZATION NOTE (dbgBlackBoxGlobDesc) A very short string used to describe the
+# 'glob' parameter to the 'dbg blackbox' command.
+dbgBlackBoxGlobDesc=Black box all sources that match this glob (for example: "*.min.js")
+
+# LOCALIZATION NOTE (dbgBlackBoxInvertDesc) A very short string used to describe the
+# 'invert' parameter to the 'dbg blackbox' command.
+dbgBlackBoxInvertDesc=Invert matching, so that we black box every source that is not the source provided or does not match the provided glob pattern.
+
+# LOCALIZATION NOTE (dbgBlackBoxEmptyDesc) A very short string used to let the
+# user know that no sources were black boxed.
+dbgBlackBoxEmptyDesc=(No sources black boxed)
+
+# LOCALIZATION NOTE (dbgBlackBoxNonEmptyDesc) A very short string used to let the
+# user know which sources were black boxed.
+dbgBlackBoxNonEmptyDesc=The following sources were black boxed:
+
+# LOCALIZATION NOTE (dbgBlackBoxErrorDesc) A very short string used to let the
+# user know there was an error black boxing a source (whose url follows this
+# text).
+dbgBlackBoxErrorDesc=Error black boxing:
+
+# LOCALIZATION NOTE (dbgUnBlackBoxDesc) A very short string used to describe the
+# function of the 'dbg unblackbox' command.
+dbgUnBlackBoxDesc=Stop black boxing sources in the debugger
+
+# LOCALIZATION NOTE (dbgUnBlackBoxSourceDesc) A very short string used to describe the
+# 'source' parameter to the 'dbg unblackbox' command.
+dbgUnBlackBoxSourceDesc=A specific source to stop black boxing
+
+# LOCALIZATION NOTE (dbgUnBlackBoxGlobDesc) A very short string used to describe the
+# 'glob' parameter to the 'dbg blackbox' command.
+dbgUnBlackBoxGlobDesc=Stop black boxing all sources that match this glob (for example: "*.min.js")
+
+# LOCALIZATION NOTE (dbgUnBlackBoxEmptyDesc) A very short string used to let the
+# user know that we did not stop black boxing any sources.
+dbgUnBlackBoxEmptyDesc=(Did not stop black boxing any sources)
+
+# LOCALIZATION NOTE (dbgUnBlackBoxNonEmptyDesc) A very short string used to let the
+# user know which sources we stopped black boxing.
+dbgUnBlackBoxNonEmptyDesc=Stopped black boxing the following sources:
+
+# LOCALIZATION NOTE (dbgUnBlackBoxErrorDesc) A very short string used to let the
+# user know there was an error black boxing a source (whose url follows this
+# text).
+dbgUnBlackBoxErrorDesc=Error stopping black boxing:
+
+# LOCALIZATION NOTE (dbgUnBlackBoxInvertDesc) A very short string used to describe the
+# 'invert' parameter to the 'dbg unblackbox' command.
+dbgUnBlackBoxInvertDesc=Invert matching, so that we stop black boxing every source that is not the source provided or does not match the provided glob pattern.
+
+# LOCALIZATION NOTE (consolecloseDesc) A very short description of the
+# 'console close' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+consolecloseDesc=Cerrar la consola
+
+# LOCALIZATION NOTE (consoleopenDesc) A very short description of the
+# 'console open' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+consoleopenDesc=Abrir la consola
+
+# LOCALIZATION NOTE (editDesc) A very short description of the 'edit'
+# command. See editManual2 for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+editDesc=Tweak a page resource
+
+# LOCALIZATION NOTE (editManual2) A fuller description of the 'edit' command,
+# displayed when the user asks for help on what it does.
+editManual2=Editar uno de los recursos que es parte de esta página
+
+# LOCALIZATION NOTE (editResourceDesc) A very short string to describe the
+# 'resource' parameter to the 'edit' command, which is displayed in a dialog
+# when the user is using this command.
+editResourceDesc=URL a editar
+
+# LOCALIZATION NOTE (editLineToJumpToDesc) A very short string to describe the
+# 'line' parameter to the 'edit' command, which is displayed in a dialog
+# when the user is using this command.
+editLineToJumpToDesc=Línea a la cual ir
+
+# LOCALIZATION NOTE (resizePageDesc) A very short string to describe the
+# 'resizepage' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizePageDesc=Resize the page
+
+# LOCALIZATION NOTE (resizePageArgWidthDesc) A very short string to describe the
+# 'width' parameter to the 'resizepage' command, which is displayed in a dialog
+# when the user is using this command.
+resizePageArgWidthDesc=Ancho en pixeles
+
+# LOCALIZATION NOTE (resizePageArgWidthDesc) A very short string to describe the
+# 'height' parameter to the 'resizepage' command, which is displayed in a dialog
+# when the user is using this command.
+resizePageArgHeightDesc=Altura en pixeles
+
+# LOCALIZATION NOTE (resizeModeOnDesc) A very short string to describe the
+# 'resizeon ' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeOnDesc=Entrar en modo de diseño adaptable
+
+# LOCALIZATION NOTE (resizeModeOffDesc) A very short string to describe the
+# 'resize off' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeOffDesc=Salir de modo de diseño adaptable
+
+# LOCALIZATION NOTE (resizeModeToggleDesc) A very short string to describe the
+# 'resize toggle' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeToggleDesc=Toggle Responsive Design Mode
+
+# LOCALIZATION NOTE (resizeModeToggleTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles Responsive Design Mode.
+resizeModeToggleTooltip=Modo de diseño adaptable
+
+# LOCALIZATION NOTE (resizeModeToDesc) A very short string to describe the
+# 'resize to' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeToDesc=Alterar tamaño de página
+
+# LOCALIZATION NOTE (resizeModeDesc) A very short string to describe the
+# 'resize' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeDesc=Controlar modo de diseño adaptable
+
+# LOCALIZATION NOTE (resizeModeManual) A fuller description of the 'resize'
+# command, displayed when the user asks for help on what it does.
+# The argument (%1$S) is the browser name.
+resizeModeManual2=Los sitios web adaptables responden a su entorno, así que se ven bien en una pantalla de celular, una pantalla de cine y todo lo que hay en el medio. El modo de diseño adaptable permite probar fácilmente una variedad de tamaños de página en %1$S sin necesidad de cambiar el tamaño del navegador completo.
+
+# LOCALIZATION NOTE (cmdDesc) A very short description of the 'cmd'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+cmdDesc=Manipular los comandos
+
+# LOCALIZATION NOTE (cmdRefreshDesc) A very short description of the 'cmd refresh'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+cmdRefreshDesc=Releer directorio mozcmd
+
+# LOCALIZATION NOTE (cmdStatus3) When the we load new commands from mozcmd
+# directory, we report where we loaded from using %1$S.
+cmdStatus3=Comandos cargados desde '%1$S'
+
+# LOCALIZATION NOTE (cmdSetdirDesc) 
+cmdSetdirDesc=Configurar un directorio mozcmd
+
+# LOCALIZATION NOTE (cmdSetdirManual2) A fuller description of the 'cmd setdir'
+# command, displayed when the user asks for help on what it does.
+cmdSetdirManual2=Un directorio 'mozcmd' es una forma fácil de crear nuevos comandos personalizados. Para más información vea la <a href="https://developer.mozilla.org/docs/Tools/GCLI/Customization">documentación de MDN</a>.
+
+# LOCALIZATION NOTE (cmdSetdirDirectoryDesc) The description of the directory
+# parameter to the 'cmd setdir' command.
+cmdSetdirDirectoryDesc=Directorio conteniendo archivos .mozcmd
+
+# LOCALIZATION NOTE (addonDesc) A very short description of the 'addon'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+addonDesc=Manipular complementos
+
+# LOCALIZATION NOTE (addonListDesc) A very short description of the 'addon list'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+addonListDesc=Listar complementos instalados
+
+# LOCALIZATION NOTE (addonListTypeDesc) A very short description of the
+# 'addon list <type>' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+addonListTypeDesc=Seleccionar un tipo de complemento
+
+# LOCALIZATION NOTE (addonListDictionaryHeading, addonListExtensionHeading,
+# addonListLocaleHeading, addonListPluginHeading, addonListThemeHeading,
+# addonListUnknownHeading) Used in the output of the 'addon list' command as the
+# first line of output.
+addonListDictionaryHeading=Los siguientes diccionarios están actualmente instalados:
+addonListExtensionHeading=Las siguientes extensiones están actualmente instaladas:
+addonListLocaleHeading=Los siguientes idiomas están actualmente instalados:
+addonListPluginHeading=Los siguientes plugins están actualmente instalados:
+addonListThemeHeading=Los siguientes temas están actualmente instalados:
+addonListAllHeading=Los siguientes complementos están actualmente instalados:
+addonListUnknownHeading=Los siguientes complementos del tipo seleccionado están actualmente instalados:
+
+# LOCALIZATION NOTE (addonListOutEnable, addonListOutDisable) Used in the
+# output of the 'addon list' command as the labels for the enable/disable
+# action buttons in the listing. This string is designed to be shown in a
+# small action button next to the addon name, which is why it should be as
+# short as possible.
+addonListOutEnable=Habilitar
+addonListOutDisable=Deshabilitar
+
+# LOCALIZATION NOTE (addonPending, addonPendingEnable, addonPendingDisable,
+# addonPendingUninstall, addonPendingInstall, addonPendingUpgrade) Used in
+# the output of the 'addon list' command as the descriptions of pending
+# addon operations. addonPending is used as a prefix for a list of pending
+# actions (named by the other lookup variables). These strings are designed
+# to be shown alongside addon names, which is why they should be as short
+# as possible.
+addonPending=pendiente
+addonPendingEnable=habilitar
+addonPendingDisable=deshabilitar
+addonPendingUninstall=desinstalar
+addonPendingInstall=instalar
+addonPendingUpgrade=actualizar
+
+# LOCALIZATION NOTE (addonNameDesc) A very short description of the
+# name parameter of numerous addon commands. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+addonNameDesc=Nombre del complemento
+
+# LOCALIZATION NOTE (addonNoneOfType) Used in the output of the 'addon list'
+# command when a search for addons of a particular type were not found.
+addonNoneOfType=No hay complementos instalados de ese tipo.
+
+# LOCALIZATION NOTE (addonEnableDesc) A very short description of the
+# 'addon enable <type>' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+addonEnableDesc=Habilitar el complemento especificado
+
+# LOCALIZATION NOTE (addonAlreadyEnabled) Used in the output of the
+# 'addon enable' command when an attempt is made to enable an addon is already
+# enabled.
+addonAlreadyEnabled=%S ya está habilitado.
+
+# LOCALIZATION NOTE (addonEnabled) Used in the output of the 'addon enable'
+# command when an addon is enabled.
+addonEnabled=%S habilitado.
+
+# LOCALIZATION NOTE (addonDisableDesc) A very short description of the
+# 'addon disable <type>' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+addonDisableDesc=Deshabilitar el complemento especificado
+
+# LOCALIZATION NOTE (addonAlreadyDisabled) Used in the output of the
+# 'addon disable' command when an attempt is made to disable an addon is already
+# disabled.
+addonAlreadyDisabled=%S ya está deshabilitado.
+
+# LOCALIZATION NOTE (addonDisabled) Used in the output of the 'addon disable'
+# command when an addon is disabled.
+addonDisabled=%S deshabilitado.
+
+# LOCALIZATION NOTE (exportDesc) A very short description of the 'export'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+exportDesc=Exportar recursos
+
+# LOCALIZATION NOTE (exportHtmlDesc) A very short description of the 'export
+# html' command. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+exportHtmlDesc=Exportar HTML de la página
+
+# LOCALIZATION NOTE (pagemodDesc) A very short description of the 'pagemod'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+pagemodDesc=Hacer cambios en la página
+
+# LOCALIZATION NOTE (pagemodReplaceDesc) A very short description of the
+# 'pagemod replace' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+pagemodReplaceDesc=Buscar y reemplazar en elementos de página
+
+# LOCALIZATION NOTE (pagemodReplaceSearchDesc) A very short string to describe
+# the 'search' parameter to the 'pagemod replace' command, which is displayed in
+# a dialog when the user is using this command.
+pagemodReplaceSearchDesc=Qué buscar
+
+# LOCALIZATION NOTE (pagemodReplaceReplaceDesc) A very short string to describe
+# the 'replace' parameter to the 'pagemod replace' command, which is displayed in
+# a dialog when the user is using this command.
+pagemodReplaceReplaceDesc=Cadena de reemplazo
+
+# LOCALIZATION NOTE (pagemodReplaceIgnoreCaseDesc) A very short string to
+# describe the 'ignoreCase' parameter to the 'pagemod replace' command, which is
+# displayed in a dialog when the user is using this command.
+pagemodReplaceIgnoreCaseDesc=Perform case-insensitive search
+
+# LOCALIZATION NOTE (pagemodReplaceRootDesc) A very short string to describe the
+# 'root' parameter to the 'pagemod replace' command, which is displayed in
+# a dialog when the user is using this command.
+pagemodReplaceRootDesc=CSS selector to root of search
+
+# LOCALIZATION NOTE (pagemodReplaceSelectorDesc) A very short string to describe
+# the 'selector' parameter to the 'pagemod replace' command, which is displayed
+# in a dialog when the user is using this command.
+pagemodReplaceSelectorDesc=CSS selector to match in search
+
+# LOCALIZATION NOTE (pagemodReplaceAttributesDesc) A very short string to
+# describe the 'attributes' parameter to the 'pagemod replace' command, which is
+# displayed in a dialog when the user is using this command.
+pagemodReplaceAttributesDesc=Attribute match regexp
+
+# LOCALIZATION NOTE (pagemodReplaceAttrOnlyDesc) A very short string to describe
+# the 'attrOnly' parameter to the 'pagemod replace' command, which is displayed
+# in a dialog when the user is using this command.
+pagemodReplaceAttrOnlyDesc=Restringir búsqueda a atributos
+
+# LOCALIZATION NOTE (pagemodReplaceContentOnlyDesc) A very short string to
+# describe the 'contentOnly' parameter to the 'pagemod replace' command, which
+# is displayed in a dialog when the user is using this command.
+pagemodReplaceContentOnlyDesc=Restringir búsqueda a nodos de texto
+
+# LOCALIZATION NOTE (pagemodReplaceResultMatchedElements) A string displayed as
+# the result of the 'pagemod replace' command.
+pagemodReplaceResult=Elements matched by selector: %1$S. Replaces in text nodes: %2$S. Replaces in attributes: %3$S.
+
+# LOCALIZATION NOTE (pagemodRemoveDesc) A very short description of the
+# 'pagemod remove' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+pagemodRemoveDesc=Eliminar elemetos y atributos de la página
+
+# LOCALIZATION NOTE (pagemodRemoveElementDesc) A very short description of the
+# 'pagemod remove element' command. This string is designed to be shown in
+# a menu alongside the command name, which is why it should be as short as
+# possible.
+pagemodRemoveElementDesc=Eliminar elementos de la página
+
+# LOCALIZATION NOTE (pagemodRemoveElementSearchDesc) A very short string to
+# describe the 'search' parameter to the 'pagemod remove element' command, which
+# is displayed in a dialog when the user is using this command.
+pagemodRemoveElementSearchDesc=CSS selector specifying elements to remove
+
+# LOCALIZATION NOTE (pagemodRemoveElementRootDesc) A very short string to
+# describe the 'root' parameter to the 'pagemod remove element' command, which
+# is displayed in a dialog when the user is using this command.
+pagemodRemoveElementRootDesc=CSS selector specifying root of search
+
+# LOCALIZATION NOTE (pagemodRemoveElementStripOnlyDesc) A very short string to
+# describe the 'stripOnly' parameter to the 'pagemod remove element' command,
+# which is displayed in a dialog when the user is using this command.
+pagemodRemoveElementStripOnlyDesc=Eliminar elemento pero mantener contenido
+
+# LOCALIZATION NOTE (pagemodRemoveElementIfEmptyOnlyDesc) A very short string to
+# describe the 'ifEmptyOnly' parameter to the 'pagemod remove element' command,
+# which is displayed in a dialog when the user is using this command.
+pagemodRemoveElementIfEmptyOnlyDesc=Eliminar solamente elementos vacíos
+
+# LOCALIZATION NOTE (pagemodRemoveElementResultMatchedAndRemovedElements)
+# A string displayed as the result of the 'pagemod remove element' command.
+pagemodRemoveElementResultMatchedAndRemovedElements=Elements matched by selector: %1$S. Elements removed: %2$S.
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeDesc) A very short description of the
+# 'pagemod remove attribute' command. This string is designed to be shown in
+# a menu alongside the command name, which is why it should be as short as
+# possible.
+pagemodRemoveAttributeDesc=Remove matching atributes
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeSearchAttributesDesc) A very short
+# string to describe the 'searchAttributes' parameter to the 'pagemod remove
+# attribute' command, which is displayed in a dialog when the user is using this
+# command.
+pagemodRemoveAttributeSearchAttributesDesc=Regexp specifying attributes to remove
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeSearchElementsDesc) A very short
+# string to describe the 'searchElements' parameter to the 'pagemod remove
+# attribute' command, which is displayed in a dialog when the user is using this
+# command.
+pagemodRemoveAttributeSearchElementsDesc=CSS selector of elements to include
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeRootDesc) A very short string to
+# describe the 'root' parameter to the 'pagemod remove attribute' command, which
+# is displayed in a dialog when the user is using this command.
+pagemodRemoveAttributeRootDesc=CSS selector of root of search
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeIgnoreCaseDesc) A very short string
+# to describe the 'ignoreCase' parameter to the 'pagemod remove attribute'
+# command, which is displayed in a dialog when the user is using this command.
+pagemodRemoveAttributeIgnoreCaseDesc=Perform case-insensitive search
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeResult) A string displayed as the
+# result of the 'pagemod remove attribute' command.
+pagemodRemoveAttributeResult=Elements matched by selector: %1$S. Attributes removed: %2$S.
+
+# LOCALIZATION NOTE (toolsDesc2) A very short description of the 'tools'
+# command, the parent command for tool-hacking commands.
+# The argument (%1$S) is the browser name.
+toolsDesc2=Hackear las herramientas de desarrollador de %1$S
+
+# LOCALIZATION NOTE (toolsManual2) A fuller description of the 'tools'
+# command. The argument (%1$S) is the browser name.
+toolsManual2=Varios comands relacionados con el hackeo directo de las herramientas de desarrollador de %1$S.
+
+# LOCALIZATION NOTE (toolsSrcdirDesc) A very short description of the 'tools srcdir'
+# command, for pointing your developer tools loader at a mozilla-central source tree.
+toolsSrcdirDesc=Cargar herramientas desde un checkout de mozilla-central
+
+# LOCALIZATION NOTE (toolsSrcdirNotFound) Shown when the 'tools srcdir' command was handed
+# an invalid srcdir.
+toolsSrcdirNotFound=%1$s no existe o no es un checkout de mozilla-central.
+
+# LOCALIZATION NOTE (toolsSrcdirReloaded) Displayed when tools have been reloaded by the
+# 'tools srcdir' command.
+toolsSrcdirReloaded=Herramientas cargadas desde %1$s.
+
+# LOCALIZATION NOTE (toolsSrcdirManual2) A full description of the 'tools srcdir'
+# command. The argument (%1$S) is the browser name.
+toolsSrcdirManual2=Cargar las herramientas de desarrollador de %1$S desde un checkout completo de mozilla-central.
+
+# LOCALIZATION NOTE (toolsSrcdirDir) The srcdir argument to the 'tools srcdir' command.
+toolsSrcdirDir=Un checkout de mozilla-central
+
+# LOCALIZATION NOTE (toolsBuiltinDesc) A short description of the 'tools builtin'
+# command, which overrides a previous 'tools srcdir' command.
+toolsBuiltinDesc=Usar las herramientas integradas
+
+# LOCALIZATION NOTE (toolsBuiltinDesc) A fuller description of the 'tools builtin'
+# command.
+toolsBuiltinManual=Usar las herramientas integradas, en lugar de cualquier comando srcdir previo.
+
+# LOCALIZATION NOTE (toolsBuiltinReloaded) Displayed when tools are loaded with the
+# 'tools builtin' command.
+toolsBuiltinReloaded=Herramientas integradas cargadas.
+
+# LOCALIZATION NOTE (toolsReloadDesc) A short description of the 'tools reload' command.
+# which will reload the tools from the current srcdir.
+toolsReloadDesc=Recargar las herramientas de desarrollador
+
+# LOCALIZATION NOTE (toolsReloaded2) Displayed when tools are reloaded with the 'tools
+# reload' command.
+toolsReloaded2=Herramientas recargadas.
+
+# LOCALIZATION NOTE (cookieDesc) A very short description of the 'cookie'
+# command. See cookieManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+cookieDesc=Mostrar y alterar cookies
+
+# LOCALIZATION NOTE (cookieManual) A fuller description of the 'cookie'
+# command, displayed when the user asks for help on what it does.
+cookieManual=Comandos para listar, crear, borrar y alterar cookies para el dominio actual.
+
+# LOCALIZATION NOTE (cookieListDesc) A very short description of the
+# 'cookie list' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+cookieListDesc=Mostrar cookies
+
+# LOCALIZATION NOTE (cookieListManual) A fuller description of the 'cookie list'
+# command, displayed when the user asks for help on what it does.
+cookieListManual=Mostrar una lista de cookies relevantes a la página actual.
+
+# LOCALIZATION NOTE (cookieListOutHost,cookieListOutPath,cookieListOutExpires,cookieListOutAttributes):
+# The 'cookie list' command has a number of headings for cookie properties.
+# Particular care should be taken in translating these strings as they have
+# references to names in the cookies spec.
+cookieListOutHost=Servidor:
+cookieListOutPath=Ruta:
+cookieListOutExpires=Expira:
+cookieListOutAttributes=Atributos:
+
+# LOCALIZATION NOTE (cookieListOutNone) The output of the 'cookie list' command
+# uses this string when no cookie attributes (like httpOnly, secure, etc) apply
+cookieListOutNone=Ninguna
+
+# LOCALIZATION NOTE (cookieListOutSession) The output of the 'cookie list'
+# command uses this string to describe a cookie with an expiry value of '0'
+# that is to say it is a session cookie
+cookieListOutSession=Al salir del navegador (sesión)
+
+# LOCALIZATION NOTE (cookieListOutNonePage) The output of the 'cookie list'
+# command uses this string for pages like 'about:blank' which can't contain
+# cookies
+cookieListOutNonePage=No se encontraron cookies en esta página
+
+# LOCALIZATION NOTE (cookieListOutNoneHost) The output of the 'cookie list'
+# command uses this string when there are no cookies on a given web page
+cookieListOutNoneHost=No se encontraron cookies para el servidor %1$S
+
+# LOCALIZATION NOTE (cookieListOutEdit) A title used in the output from the
+# 'cookie list' command on a button which can be used to edit cookie values
+cookieListOutEdit=Editar
+
+# LOCALIZATION NOTE (cookieListOutRemove) A title used in the output from the
+# 'cookie list' command on a button which can be used to remove cookies
+cookieListOutRemove=Eliminar
+
+# LOCALIZATION NOTE (cookieRemoveDesc) A very short description of the
+# 'cookie remove' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+cookieRemoveDesc=Eliminar cookie
+
+# LOCALIZATION NOTE (cookieRemoveManual) A fuller description of the 'cookie remove'
+# command, displayed when the user asks for help on what it does.
+cookieRemoveManual=Remove a cookie, given its key
+
+# LOCALIZATION NOTE (cookieRemoveKeyDesc) A very short string to describe the
+# 'key' parameter to the 'cookie remove' command, which is displayed in a dialog
+# when the user is using this command.
+cookieRemoveKeyDesc=The key of the cookie to remove
+
+# LOCALIZATION NOTE (cookieSetDesc) A very short description of the
+# 'cookie set' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+cookieSetDesc=Set a cookie
+
+# LOCALIZATION NOTE (cookieSetManual) A fuller description of the 'cookie set'
+# command, displayed when the user asks for help on what it does.
+cookieSetManual=Set a cookie by specifying a key name, it's value and optionally one or more of the following attributes: expires (max-age in seconds or the expires date in GMTString format), path, domain, secure
+
+# LOCALIZATION NOTE (cookieSetKeyDesc) A very short string to describe the
+# 'key' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetKeyDesc=The key of the cookie to set
+
+# LOCALIZATION NOTE (cookieSetValueDesc) A very short string to describe the
+# 'value' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetValueDesc=The value of the cookie to set
+
+# LOCALIZATION NOTE (cookieSetOptionsDesc) The title of a set of options to
+# the 'cookie set' command, displayed as a heading to the list of option.
+cookieSetOptionsDesc=Opciones
+
+# LOCALIZATION NOTE (cookieSetPathDesc) A very short string to describe the
+# 'path' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetPathDesc=The path of the cookie to set
+
+# LOCALIZATION NOTE (cookieSetDomainDesc) A very short string to describe the
+# 'domain' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetDomainDesc=The domain of the cookie to set
+
+# LOCALIZATION NOTE (cookieSetSecureDesc) A very short string to describe the
+# 'secure' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetSecureDesc=Sólo se transmite sobre https
+
+# LOCALIZATION NOTE (cookieSetHttpOnlyDesc) A very short string to describe the
+# 'httpOnly' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetHttpOnlyDesc=No accesible desde script del lado del ciente
+
+# LOCALIZATION NOTE (cookieSetSessionDesc) A very short string to describe the
+# 'session' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetSessionDesc=Solamente válido para el tiempo de vida de la sesión del navegador
+
+# LOCALIZATION NOTE (cookieSetExpiresDesc) A very short string to describe the
+# 'expires' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetExpiresDesc=La fecha de expiración de cookie (fecha RFC2822 o ISO 8601)
+
+# LOCALIZATION NOTE (jsbDesc) A very short description of the
+# 'jsb' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+jsbDesc=Embellecedor de JavaScript
+
+# LOCALIZATION NOTE (jsbUrlDesc) A very short description of the
+# 'jsb <url>' parameter. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+jsbUrlDesc=URL del archivo JS a embellecer
+
+# LOCALIZATION NOTE (jsbIndentSizeDesc) A very short description of the
+# 'jsb <indentSize>' parameter. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+jsbIndentSizeDesc=Tamaño de sangría en caracteres
+
+# LOCALIZATION NOTE (jsbIndentSizeManual) A fuller description of the
+# 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
+# does.
+jsbIndentSizeManual=Número de caracteres con los que indentar cada línea
+
+# LOCALIZATION NOTE (jsbIndentCharDesc) A very short description of the
+# 'jsb <indentChar>' parameter. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+jsbIndentCharDesc=Caracteres usados para indentar cada línea
+
+# LOCALIZATION NOTE (jsbIndentCharManual) A fuller description of the
+# 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
+# does.
+jsbIndentCharManual=Caracteres usados para indentar cada línea. Posibles opciones son espacio o tab.
+
+# the 'jsb <doNotPreserveNewlines>' parameter. This string is designed to be
+# shown in a menu alongside the command name, which is why it should be as short
+# as possible.
+jsbDoNotPreserveNewlinesDesc=No mantener saltos de línea
+
+# LOCALIZATION NOTE (jsbPreserveNewlinesManual) A fuller description of the
+# 'jsb <jsbPreserveNewlines>' parameter, displayed when the user asks for help
+# on what it does.
+jsbPreserveNewlinesManual=Se deberían mantener los saltos de línea existentes
+
+# LOCALIZATION NOTE (jsbPreserveMaxNewlinesDesc) A very short description of the
+# 'jsb <preserveMaxNewlines>' parameter. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+jsbPreserveMaxNewlinesDesc=Cantidad máxima de saltos de línea consecutivos
+
+# LOCALIZATION NOTE (jsbPreserveMaxNewlinesManual) A fuller description of the
+# 'jsb <preserveMaxNewlines>' parameter, displayed when the user asks for help
+# on what it does.
+jsbPreserveMaxNewlinesManual=El numero máximo de saltos de línea consecutivos a preservar
+
+# LOCALIZATION NOTE (jsbJslintHappyDesc) A very short description of the
+# 'jsb <jslintHappy>' parameter. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+jsbJslintHappyDesc=¿Forzar modo jslint-stricter?
+
+# LOCALIZATION NOTE (jsbJslintHappyManual) A fuller description of the
+# 'jsb <jslintHappy>' parameter, displayed when the user asks for help
+# on what it does.
+jsbJslintHappyManual=Al establecerlo a true, el modo jslint-stricter es forzado
+
+# LOCALIZATION NOTE (jsbBraceStyleDesc2) A very short description of the
+# 'jsb <braceStyle>' parameter. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+jsbBraceStyleDesc2=Seleccione el estilo de codificación de llaves
+
+# LOCALIZATION NOTE (jsbBraceStyleManual2) A fuller description of the
+# 'jsb <braceStyle>' parameter, displayed when the user asks for help
+# on what it does.
+#
+# NOTES: The keywords collapse, expand, end-expand and expand-strict should not
+# be translated. "even if it will break your code" means that the resulting code
+# may no longer be functional.
+jsbBraceStyleManual2=Seleccione el estilo de codificación de llaves: collapse - poner llaves en la misma línea de las sentencias de control; expand - poner llaves en su propia línea (Allman / estilo ANSI ); end-expand - poner llaves de cierre en su propia línea; expand-strict - poner llaves en su propia línea aún si se rompe el código.
+
+# LOCALIZATION NOTE (jsbNoSpaceBeforeConditionalDesc) A very short description
+# of the 'jsb <noSpaceBeforeConditional>' parameter. This string is designed to
+# be shown in a menu alongside the command name, which is why it should be as
+# short as possible.
+jsbNoSpaceBeforeConditionalDesc=Sin espacio antes de sentencias condicionales
+
+# LOCALIZATION NOTE (jsbUnescapeStringsDesc) A very short description of the
+# 'jsb <unescapeStrings>' parameter. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+jsbUnescapeStringsDesc=Unescape \\xNN characters?
+
+# LOCALIZATION NOTE (jsbUnescapeStringsManual) A fuller description of the
+# 'jsb <unescapeStrings>' parameter, displayed when the user asks for help
+# on what it does.
+jsbUnescapeStringsManual=Should printable characters in strings encoded in \\xNN notation be unescaped?
+
+# LOCALIZATION NOTE (jsbInvalidURL) Displayed when an invalid URL is passed to
+# the jsb command.
+jsbInvalidURL=Ingrese una URL válida
+
+# LOCALIZATION NOTE (jsbOptionsDesc) The title of a set of options to
+# the 'jsb' command, displayed as a heading to the list of options.
+jsbOptionsDesc=Opciones
+
+# LOCALIZATION NOTE (calllogDesc) A very short description of the
+# 'calllog' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogDesc=Commands to manipulate function call logging
+
+# LOCALIZATION NOTE (calllogStartDesc) A very short description of the
+# 'calllog start' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogStartDesc=Start logging function calls to the console
+
+# LOCALIZATION NOTE (calllogStartReply) A string displayed as the result of
+# the 'calllog start' command.
+calllogStartReply=Call logging started.
+
+# LOCALIZATION NOTE (calllogStopDesc) A very short description of the
+# 'calllog stop' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogStopDesc=Stop function call logging
+
+# LOCALIZATION NOTE (calllogStopNoLogging) A string displayed as the result of
+# the 'calllog stop' command when there is nothing to stop.
+calllogStopNoLogging=No call logging is currently active
+
+# LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
+# the 'calllog stop' command when there are logging actions to stop.
+calllogStopReply=Stopped call logging. Active contexts: %1$S.
+
+# LOCALIZATION NOTE (calllogStartChromeDesc) A very short description of the
+# 'calllog chromestart' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogChromeStartDesc=Start logging function calls for chrome code to the console
+
+# LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
+# 'calllog chromestart <sourceType>' parameter. This string is designed to be
+# shown in a menu alongside the command name, which is why it should be as short as possible.
+calllogChromeSourceTypeDesc=Global object, JSM URI, or JS to get a global object from
+
+# LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
+# 'calllog chromestart' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogChromeSourceTypeManual=The global object, URI of a JSM, or JS to execute in the chrome window from which to obtain a global object
+
+# LOCALIZATION NOTE (calllogChromeStartReply) A string displayed as the result
+# of the 'calllog chromestart' command.
+calllogChromeStartReply=Call logging started.
+
+# LOCALIZATION NOTE (calllogChromeStopDesc) A very short description of the
+# 'calllog chromestop' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogChromeStopDesc=Stop function call logging
+
+# LOCALIZATION NOTE (calllogChromeStopNoLogging) A string displayed as the
+# result of the 'calllog chromestop' command when there is nothing to stop.
+calllogChromeStopNoLogging=No call logging for chrome code is currently active
+
+# LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
+# the 'calllog chromestop' command when there are logging actions to stop.
+calllogChromeStopReply=Stopped call logging. Active contexts: %1$S.
+
+# LOCALIZATION NOTE (callLogChromeAnonFunction) A string displayed as the result
+# of the 'calllog chromestart' command when an anonymouse function is to be
+# logged.
+callLogChromeAnonFunction=<anónimo>
+
+# LOCALIZATION NOTE (callLogChromeMethodCall) A string displayed as the result
+# of the 'calllog chromestart' command to proceed a method name when it is to be
+# logged.
+callLogChromeMethodCall=Llamada a método
+
+# LOCALIZATION NOTE (callLogChromeInvalidJSM) A string displayed as the result
+# of the 'calllog chromestart' command with an invalid JSM or JSM path.
+callLogChromeInvalidJSM=Invalid JSM!
+
+# LOCALIZATION NOTE (callLogChromeVarNotFoundContent) A string displayed as the
+# result of the 'calllog chromestart' command with a source type of
+# content-variable and an invalid variable name.
+callLogChromeVarNotFoundContent=Variable no encontrada en ventana de contenido.
+
+# LOCALIZATION NOTE (callLogChromeVarNotFoundChrome) A string displayed as the
+# result of the 'calllog chromestart' command with a source type of
+# chrome-variable and an invalid variable name.
+callLogChromeVarNotFoundChrome=Variable no encontrada en ventana de chrome.
+
+# LOCALIZATION NOTE (callLogChromeEvalException) A string displayed as the
+# result of the 'calllog chromestart' command with a source type of javascript
+# and invalid JavaScript code.
+callLogChromeEvalException=JavaScript evaluado lanzó la siguiente excepción
+
+# LOCALIZATION NOTE (callLogChromeEvalNeedsObject) A string displayed as the
+# result of passing a non-JavaScript object creating source via the
+# 'calllog chromestart javascript' command.
+callLogChromeEvalNeedsObject=The JavaScript source must evaluate to an object whose method calls are to be logged e.g. "({a1: function() {this.a2()},a2: function() {}});"
+
+# LOCALIZATION NOTE (scratchpadOpenTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which opens Scratchpad.
+scratchpadOpenTooltip=Borrador
+
+# LOCALIZATION NOTE (paintflashingDesc) A very short string used to describe the
+# function of the "paintflashing" command
+paintflashingDesc=Resaltar área pintada
+
+# LOCALIZATION NOTE (paintflashingOnDesc) A very short string used to describe the
+# function of the "paintflashing on" command.
+paintflashingOnDesc=Encender parpadeo de pintura
+
+# LOCALIZATION NOTE (paintflashingOffDesc) A very short string used to describe the
+# function of the "paintflashing off" command.
+paintflashingOffDesc=Apagar parpadeo de pintura
+
+# LOCALIZATION NOTE (paintflashingChrome) A very short string used to describe the
+# function of the "paintflashing on/off chrome" command.
+paintflashingChromeDesc=chrome frames
+
+# LOCALIZATION NOTE (paintflashingManual) A longer description describing the
+# set of commands that control paint flashing.
+paintflashingManual=Dibujar áreas repintadas en diferentes colores
+
+# LOCALIZATION NOTE (paintflashingTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles paint flashing.
+paintflashingTooltip=Resaltar área pintada
+
+# LOCALIZATION NOTE (paintflashingOnDesc) A very short string used to describe the
+# function of the "paintflashing on" command.
+paintflashingToggleDesc=Intercambiar parpadeo de la pintura
+
+# LOCALIZATION NOTE (splitconsoleTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles the split webconsole.
+splitconsoleTooltip=Intercambiar consola dividida
+
+# LOCALIZATION NOTE (appCacheDesc) A very short string used to describe the
+# function of the "appcache" command
+appCacheDesc=Utilidades de caché de aplicaciones
+
+# LOCALIZATION NOTE (appCacheValidateDesc) A very short string used to describe
+# the function of the "appcache validate" command.
+appCacheValidateDesc=Validar manifiesto del caché
+
+# LOCALIZATION NOTE (appCacheValidateManual) A fuller description of the
+# 'validate' parameter to the 'appcache' command, displayed when the user asks
+# for help on what it does.
+appCacheValidateManual=Buscar problemas relacionados con el manifiesto del caché y los archivos a los que referencia
+
+# LOCALIZATION NOTE (appCacheValidateUriDesc) A very short string used to describe
+# the function of the "uri" parameter of the appcache validate" command.
+appCacheValidateUriDesc=URI a verificar
+
+# LOCALIZATION NOTE (appCacheValidated) Displayed by the "appcache validate"
+# command when it has been successfully validated.
+appCacheValidatedSuccessfully=Appcache validado exitosamente.
+
+# LOCALIZATION NOTE (appCacheClearDesc) A very short string used to describe
+# the function of the "appcache clear" command.
+appCacheClearDesc=Limpiar entradas el caché de aplicaciones
+
+# LOCALIZATION NOTE (appCacheClearManual) A fuller description of the
+# 'appcache clear' command, displayed when the user asks for help on what it does.
+appCacheClearManual=Limpiar una o más entradas del caché de aplicaciones
+
+# LOCALIZATION NOTE (appCacheClearCleared) Displayed by the "appcache clear"
+# command when entries are successfully cleared.
+appCacheClearCleared=Entradas borradas exitosamente.
+
+# LOCALIZATION NOTE (AppCacheListDesc) A very short string used to describe
+# the function of the "appcache list" command.
+appCacheListDesc=Mostrar una lista de las entradas del caché de aplicaciones.
+
+# LOCALIZATION NOTE (AppCacheListManual) A fuller description of the
+# 'appcache list' command, displayed when the user asks for help on what it does.
+appCacheListManual=Mostrar una lista de todas las entradas del caché de aplicaciones. Si se usó el parámetro de búsqueda, la tabla muestra las entradas que contengan el término a buscar.
+
+# LOCALIZATION NOTE (AppCacheListSearchDesc) A very short string used to describe
+# the function of the "search" parameter of the appcache list" command.
+appCacheListSearchDesc=Filtrar resultados usando un término de búsqueda.
+
+# LOCALIZATION NOTE (AppCacheList*) Row headers for the 'appcache list' command.
+appCacheListKey=Clave:
+appCacheListDataSize=Tamaño de datos:
+appCacheListDeviceID=ID de dispositivo:
+appCacheListExpirationTime=Expira:
+appCacheListFetchCount=Cantidad de entregas:
+appCacheListLastFetched=Última entrega:
+appCacheListLastModified=Última modificación:
+
+# LOCALIZATION NOTE (appCacheListViewEntry) The text for the view entry button
+# of the 'appcache list' command.
+appCacheListViewEntry=Ver entrada
+
+# LOCALIZATION NOTE (appCacheViewEntryDesc) A very short string used to describe
+# the function of the "appcache viewentry" command.
+appCacheViewEntryDesc=Abrir una nueva pestaña conteniendo la información de la entrada de caché especificada.
+
+# LOCALIZATION NOTE (appCacheViewEntryManual) A fuller description of the
+# 'appcache viewentry' command, displayed when the user asks for help on what it
+# does.
+appCacheViewEntryManual=Abrir una nueva pestaña conteniendo la información de la entrada de caché especificada.
+
+# LOCALIZATION NOTE (appCacheViewEntryKey) A very short string used to describe
+# the function of the "key" parameter of the 'appcache viewentry' command.
+appCacheViewEntryKey=La clave para la entrada a mostrar.
+
+# LOCALIZATION NOTE (profilerDesc) A very short string used to describe the
+# function of the profiler command.
+profilerDesc=Administrar perfilador
+
+# LOCALIZATION NOTE (profilerManual) A longer description describing the
+# set of commands that control the profiler.
+profilerManual=Comandos para iniciar o detener el perfilador de JavaScript
+
+# LOCALIZATION NOTE (profilerOpen) A very short string used to describe the function
+# of the profiler open command.
+profilerOpenDesc=Abrir el perfilador
+
+# LOCALIZATION NOTE (profilerClose) A very short string used to describe the function
+# of the profiler close command.
+profilerCloseDesc=Cerrar el perfilador
+
+# LOCALIZATION NOTE (profilerStart) A very short string used to describe the function
+# of the profiler start command.
+profilerStartDesc=Iniciar perfilado
+
+# LOCALIZATION NOTE (profilerStartManual) A fuller description of the 'profile name'
+# parameter. This parameter is used to name a newly created profile or to lookup
+# an existing profile by its name.
+profilerStartManual=Nombre del perfil que desea iniciar.
+
+# LOCALIZATION NOTE (profilerStop) A very short string used to describe the function
+# of the profiler stop command.
+profilerStopDesc=Detener perfilado
+
+# LOCALIZATION NOTE (profilerStopManual) A fuller description of the 'profile name'
+# parameter. This parameter is used to lookup an existing profile by its name.
+profilerStopManual=Nombre del perfil que desea detener.
+
+# LOCALIZATION NOTE (profilerList) A very short string used to describe the function
+# of the profiler list command.
+profilerListDesc=Listar todos los perfiles
+
+# LOCALIZATION NOTE (profilerShow) A very short string used to describe the function
+# of the profiler show command.
+profilerShowDesc=Mostrar perfil individual
+
+# LOCALIZATION NOTE (profilerShowManual) A fuller description of the 'profile name'
+# parameter. This parameter is used to name a newly created profile or to lookup
+# an existing profile by its name.
+profilerShowManual=Nombre de un perfil.
+
+# LOCALIZATION NOTE (profilerAlreadyStarted) A message that is displayed whenever
+# an operation cannot be completed because the profile in question has already
+# been started.
+profilerAlreadyStarted2=El perfil ya ha sido iniciado
+
+# LOCALIZATION NOTE (profilerNotFound) A message that is displayed whenever
+# an operation cannot be completed because the profile in question could not be
+# found.
+profilerNotFound=Perfil no encontrado
+
+# LOCALIZATION NOTE (profilerNotStarted) A message that is displayed whenever
+# an operation cannot be completed because the profile in question has not been
+# started yet. It also contains a hint to use the 'profile start' command to
+# start the profiler.
+profilerNotStarted3=El perfilador aún no ha sido iniciado. Use 'profile start' para iniciar el perfilado
+
+# LOCALIZATION NOTE (profilerStarted2) A very short string that indicates that
+# we have started recording.
+profilerStarted2=Grabando…
+
+# LOCALIZATION NOTE (profilerStopped) A very short string that indicates that
+# we have stopped recording.
+profilerStopped=Detenido…
+
+# LOCALIZATION NOTE (profilerNotReady) A message that is displayed whenever
+# an operation cannot be completed because the profiler has not been opened yet.
+profilerNotReady=Para que este comando funcione, primero necesita abrir el perfilador
+
+# LOCALIZATION NOTE (listenDesc) A very short string used to describe the
+# function of the 'listen' command.
+listenDesc=Abrir un puerto de depuración remota
+
+# LOCALIZATION NOTE (listenManual2) A longer description of the 'listen'
+# command.
+listenManual2=%1$S puede permitir la depuración remota sobre una conexión TCP/IP. Por razones de seguridad está desactivado por defecto, pero puede habilitarse usando este comando.
+
+# LOCALIZATION NOTE (listenPortDesc) A very short string used to describe the
+# function of 'port' parameter to the 'listen' command.
+listenPortDesc=El puerto TCP en el cual escuchar
+
+# LOCALIZATION NOTE (listenDisabledOutput) Text of a message output during the
+# execution of the 'listen' command.
+listenDisabledOutput=Escuchar está deshabilitado por a preferencia devtools.debugger.remote-enabled
+
+# LOCALIZATION NOTE (listenInitOutput) Text of a message output during the
+# execution of the 'listen' command. %1$S is a port number
+listenInitOutput=Escuchando en el puerto %1$S
+
+# LOCALIZATION NOTE (listenNoInitOutput) Text of a message output during the
+# execution of the 'listen' command.
+listenNoInitOutput=DebuggerServer no está inicializado
+
+# LOCALIZATION NOTE (mediaDesc, mediaEmulateDesc, mediaEmulateManual,
+# mediaEmulateType, mediaResetDesc, mediaResetManual) These strings describe
+# the 'media' commands and all available parameters.
+mediaDesc=Emulación de tipo de medios CSS
+mediaEmulateDesc=Emular un tipo de medios CSS especificado
+mediaEmulateManual=Ver el documento como si fuera dibujado en un dispositivo que soporta el tipo de medios especificado, con las reglas CSS relevantes aplicadas.
+mediaEmulateType=El tipo de medios a emular
+mediaResetDesc=Dejar de emular un tipo de medios CSS
+
+# LOCALIZATION NOTE (injectDesc, injectManual, injectLibraryDesc, injectLoaded,
+# injectFailed) These strings describe the 'inject' commands and all available
+# parameters.
+injectDesc=Inyectar librerías comunes en la página
+injectManual2=Inyecta librerías coimunes en el contenido de la página que también puede accederse desde consola.
+injectLibraryDesc=Seleccione la librería a inyectar o ingrese una URI válida de script para inyectar
+injectLoaded=%1$S cargada
+injectFailed=Falló la carga de %1$S - URI inválida
+
+# LOCALIZATION NOTE (folderDesc, folderOpenDesc, folderOpenDir,
+# folderOpenProfileDesc) These strings describe the 'folder' commands and
+# all available parameters.
+folderDesc=Carpetas abiertas
+folderOpenDesc=Ruta de carpetas abiertas
+folderOpenDir=Ruta de directorio
+folderOpenProfileDesc=Directorio de perfil abierto
+
+# LOCALIZATION NOTE (folderInvalidPath) A string displayed as the result
+# of the 'folder open' command with an invalid folder path.
+folderInvalidPath=Ingrese una ruta válida
+
+# LOCALIZATION NOTE (folderOpenDirResult) A very short string used to
+# describe the result of the 'folder open' command.
+# The argument (%1$S) is the folder path.
+folderOpenDirResult=Se abrió %1$S
+
+# LOCALIZATION NOTE (security)
+securityDesc=Mostrar características de seguridad soportadas
+securityManual=Comandos para listar y obtener sugerencias sobre características de seguridad para el dominio actual.
+securityListDesc=Mostrar características de seguridad
+securityListManual=Mostrar una lista de todas las características de seguridad relevantes de la página actual.
+# CSP specific
+securityCSPDesc=Mostrar características de seguridad CSP específicas
+securityCSPManual=Mostrar información sobre CSP aplicado a la página actual.
+securityCSPRemWildCard=¿Desea eliminar los comodines(*)?
+securityCSPPotentialXSS=¡Vulnerabilidad XSS potencial!
+
+# LOCALIZATION NOTE (rulersDesc) A very short description of the
+# 'rulers' command. See rulersManual for a fuller description of what
+# it does. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+rulersDesc=Intercambiar reglas para la página
+
+# LOCALIZATION NOTE (rulersManual) A fuller description of the 'rulers'
+# command, displayed when the user asks for help on what it does.
+rulersManual=Intercambiar las reglas horizontal y vertical para la página actual
+
+# LOCALIZATION NOTE (rulersTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles the rulers.
+rulersTooltip=Intercambiar reglas para la página
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/toolkit/chrome/global/devtools/gcli.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/toolkit/chrome/global/devtools/gcli.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/toolkit/chrome/global/devtools/gcli.properties	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/toolkit/chrome/global/devtools/gcli.properties	2015-05-25 20:46:31.000000000 +0000
@@ -0,0 +1,442 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE These strings are used inside the Web Console
+# command line which is available from the Web Developer sub-menu
+# -> 'Web Console'.
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# LOCALIZATION NOTE (canonDescNone): Short string used to describe any command
+# or command parameter when no description has been provided.
+canonDescNone=(Sin descripción)
+
+# LOCALIZATION NOTE (canonDefaultGroupName): The default name for a group of
+# parameters.
+canonDefaultGroupName=Opciones
+
+# LOCALIZATION NOTE (canonProxyDesc): A very short description of a set of
+# remote commands. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible. See
+# canonProxyManual for a fuller description of what it does.
+canonProxyDesc=Ejecutar un comando en %S
+
+# LOCALIZATION NOTE (canonProxyManual): A fuller description of a set of
+# remote commands. Displayed when the user asks for help on what it does.
+canonProxyManual=Un juego de comandos que son ejecutados en un sistema remoto. El sistema remoto es alcanzado vía %S
+
+# LOCALIZATION NOTE (canonProxyExists): An error message displayed when we try
+# to add new command (via a proxy) where one already exists in that name.
+canonProxyExists=Ya hay un comando llamado '%S'
+
+# LOCALIZATION NOTE (cliEvalJavascript): The special '{' command allows entry
+# of JavaScript like traditional developer tool command lines. This describes
+# the '{' command.
+cliEvalJavascript=Ingrese JavaScript directamente
+
+# LOCALIZATION NOTE (cliUnusedArg): When the command line has more arguments
+# than the current command can understand this is the error message shown to
+# the user.
+cliUnusedArg=Demasiados argumentos
+
+# LOCALIZATION NOTE (cliOptions): The title of the dialog which displays the
+# options that are available to the current command.
+cliOptions=Opciones disponibles
+
+# LOCALIZATION NOTE: The error message when the user types a command that
+# isn't registered
+cliUnknownCommand2=Comando inválido: '%1$S'.
+
+# LOCALIZATION NOTE: A parameter should have a value, but doesn't
+cliIncompleteParam=Valor requerido para '%1$S'.
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a file
+# that does not exist, but should (e.g. for use with File->Open) %1$S is a
+# filename
+fileErrNotExists='%1$S' no existe
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a file
+# that exists, but should not (e.g. for use with File->Save As) %1$S is a
+# filename
+fileErrExists='%1$S' ya existe
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a
+# non-file, when a file is needed. %1$S is a filename
+fileErrIsNotFile='%1$S' no es un archivo
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a
+# non-directory, when a directory is needed (e.g. for use with 'cd') %1$S is a
+# filename
+fileErrIsNotDirectory='%1$S' no es un directorio
+
+# LOCALIZATION NOTE: Error message given when a file argument does not match
+# the specified regular expression %1$S is a filename %2$S is a regular
+# expression
+fileErrDoesntMatch='%1$S' no coincide con '%2$S'
+
+# LOCALIZATION NOTE (fieldMenuMore): When the menu has displayed all the
+# matches that it should (i.e. about 10 items) then we display this to alert
+# the user that more matches are available.
+fieldMenuMore=Más coincidencias, siga tipeando
+
+# LOCALIZATION NOTE (jstypeParseScope): The command line provides completion
+# for JavaScript commands, however there are times when the scope of what
+# we're completing against can't be used. This error message is displayed when
+# this happens.
+jstypeParseScope=Alcance perdido
+
+# LOCALIZATION NOTE (jstypeParseMissing): When the command line is doing
+# JavaScript completion, sometimes the property to be completed does not
+# exist. This error message is displayed when this happens.
+jstypeParseMissing=No se encuentra la propiedad '%S'
+
+# LOCALIZATION NOTE (jstypeBeginSyntax): When the command line is doing
+# JavaScript completion using invalid JavaScript, this error message is
+# displayed.
+jstypeBeginSyntax=Error de sintaxis
+
+# LOCALIZATION NOTE (jstypeBeginUnterm): When the command line is doing
+# JavaScript completion using a string that is not properly terminated, this
+# error message is displayed.
+jstypeBeginUnterm=Cadena literal sin terminar
+
+# LOCALIZATION NOTE (jstypeParseError): If the system for providing JavaScript
+# completions encounters and error it displays this.
+jstypeParseError=Error
+
+# LOCALIZATION NOTE (typesNumberNan): When the command line is passed a
+# number, however the input string is not a valid number, this error message
+# is displayed.
+typesNumberNan=No se puede convertir "%S" a un número.
+
+# LOCALIZATION NOTE (typesNumberMax): When the command line is passed a
+# number, but the number is bigger than the largest allowed number, this error
+# message is displayed.
+typesNumberMax=%1$S es mayor que el máximo permitido: %2$S.
+
+# LOCALIZATION NOTE (typesNumberMin): When the command line is passed a
+# number, but the number is lower than the smallest allowed number, this error
+# message is displayed.
+typesNumberMin=%1$S es menor que el mínimo permitido: %2$S.
+
+# LOCALIZATION NOTE (typesNumberNotInt2): When the command line is passed a
+# number, but the number has a decimal part and floats are not allowed.
+typesNumberNotInt2=No se puede convertir "%S" a entero.
+
+# LOCALIZATION NOTE (typesDateNan): When the command line is passed a date,
+# however the input string is not a valid date, this error message is
+# displayed.
+typesDateNan=No se puede convertir "%S" a una fecha.
+
+# LOCALIZATION NOTE (typesDateMax): When the command line is passed a date,
+# but the number is later than the latest allowed date, this error message is
+# displayed.
+typesDateMax=%1$S es posterior al máximo permitido: %2$S.
+
+# LOCALIZATION NOTE (typesDateMin): When the command line is passed a date,
+# but the date is earlier than the earliest allowed number, this error message
+# is displayed.
+typesDateMin=%1$S es anterior al máximo permitido: %2$S.
+
+# LOCALIZATION NOTE (typesSelectionNomatch): When the command line is passed
+# an option with a limited number of correct values, but the passed value is
+# not one of them, this error message is displayed.
+typesSelectionNomatch=No se puede usar '%S'.
+
+# LOCALIZATION NOTE (nodeParseSyntax): When the command line is expecting a
+# CSS query string, however the passed string is not valid, this error message
+# is displayed.
+nodeParseSyntax=Error de sintaxis en consulta CSS
+
+# LOCALIZATION NOTE (nodeParseMultiple): When the command line is expecting a
+# CSS string that matches a single node, but more than one node matches, this
+# error message is displayed.
+nodeParseMultiple=Demasiadas coincidencias (%S)
+
+# LOCALIZATION NOTE (nodeParseNone): When the command line is expecting a CSS
+# string that matches a single node, but no nodes match, this error message is
+# displayed.
+nodeParseNone=Sin coincidencia
+
+# LOCALIZATION NOTE (helpDesc): A very short description of the 'help'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible. See helpManual for a
+# fuller description of what it does.
+helpDesc=Obtenga ayuda sobre los comandos disponibles
+
+# LOCALIZATION NOTE (helpManual): A fuller description of the 'help' command.
+# Displayed when the user asks for help on what it does.
+helpManual=Provee ayuda, ya sea sobre un comando específico (si se ingresó una cadena a buscar y hay una coincidencia exacta) o sobre los comandos disponibles (si no se ingresó una cadena a buscar o si no hay coincidencia exacta).
+
+# LOCALIZATION NOTE (helpSearchDesc): A very short description of the 'search'
+# parameter to the 'help' command. See helpSearchManual2 for a fuller
+# description of what it does. This string is designed to be shown in a dialog
+# with restricted space, which is why it should be as short as possible.
+helpSearchDesc=Cadena a buscar
+
+# LOCALIZATION NOTE (helpSearchManual3): A fuller description of the 'search'
+# parameter to the 'help' command. Displayed when the user asks for help on
+# what it does.
+helpSearchManual3=cadena a buscar para reducir el listado de comandos que se muestran. No se soportan expresiones regulares.
+
+# LOCALIZATION NOTE (helpManSynopsis): A heading shown at the top of a help
+# page for a command in the console It labels a summary of the parameters to
+# the command
+helpManSynopsis=Sinopsis
+
+# LOCALIZATION NOTE (helpManNone): Some text shown under the parameters
+# heading in a help page for a command which has no parameters.
+helpManNone=Ninguno
+
+# LOCALIZATION NOTE (helpListAll): The heading shown in response to the 'help'
+# command when used without a filter, just above the list of known commands.
+helpListAll=Comandos disponibles:
+
+# LOCALIZATION NOTE (helpListPrefix, helpListNone): These messages are
+# displayed in response to the 'help <search>' command (i.e. with a search
+# string), just above the list of matching commands. Parameters: %S is the
+# search string.
+helpListPrefix=Comandos que comienzan con '%1$S':
+helpListNone=Ningun comando comienza con '%1$S'
+
+# LOCALIZATION NOTE (helpManRequired, helpManOptional, helpManDefault): When
+# the 'help x' command wants to show the manual for the 'x' command, it needs
+# to be able to describe the parameters as either required or optional, or if
+# they have a default value.
+helpManRequired=requerido
+helpManOptional=opcional
+helpManDefault=opcional, predeterminado=%S
+
+# LOCALIZATION NOTE (helpIntro): This forms part of the output from the 'help'
+# command. 'GCLI' is a project name and should be left untranslated.
+helpIntro=GCLI es un experimento para crear una línea de comandos para desarrolladores web muy fácil de usar.
+
+# LOCALIZATION NOTE (subCommands): Text shown as part of the output of the
+# 'help' command when the command in question has sub-commands, before a list
+# of the matching sub-commands
+subCommands=Subcomandos
+
+# LOCALIZATION NOTE: This error message is displayed when the command line is
+# cannot find a match for the parse types.
+commandParseError=Error de análisis de la línea de comandos
+
+# LOCALIZATION NOTE (contextDesc, contextManual, contextPrefixDesc): These
+# strings are used to describe the 'context' command and its 'prefix'
+# parameter. See localization comment for 'connect' for an explanation about
+# 'prefix'.
+contextDesc=Concentrar en un grupo de comandos
+contextManual=Configurar un prefijo predeterminado para comandos futuros. Por ejemplo 'context git' podría permitirle escribir 'commit' en lugar de 'git commit'.
+contextPrefixDesc=El prefijo del comando
+
+# LOCALIZATION NOTE (contextNotParentError): An error message displayed during
+# the processing of the 'context' command, when the found command is not a
+# parent command.
+contextNotParentError=No se puede usar '%1$S' como prefijo porque no es un comando padre.
+
+# LOCALIZATION NOTE (contextReply): A message displayed during the processing
+# of the 'context' command, to indicate success.
+contextReply=Usando %1$S como prefijo de comando
+
+# LOCALIZATION NOTE (contextEmptyReply): A message displayed during the
+# processing of the 'context' command, to indicate that there is no command
+# prefix
+contextEmptyReply=El prefijo de comando no está establecido
+
+# LOCALIZATION NOTE (connectDesc, connectManual, connectPrefixDesc,
+# connectMethodDesc, connectUrlDesc, connectDupReply): These strings describe
+# the 'connect' command and all its available parameters. A 'prefix' is an 
+# alias for the remote server (think of it as a "connection name"), and it
+# allows to identify a specific server when connected to multiple remote
+# servers.
+connectDesc=Comandos proxy al servidor
+connectManual=Conectar al servidor, creando versiones locales de los comandos en el servidor. Los comandos remotos inicialmente tienen un prefijo para distinguirlos de los comandos locales (but see the context command to get past this)
+connectPrefixDesc=Prefijo padre para los comandos importados
+connectMethodDesc=El método de conexión
+connectUrlDesc=URL para conectarse
+connectDupReply=Una conexión llamada %S ya existe.
+
+# LOCALIZATION NOTE (connectReply): The output of the 'connect' command,
+# telling the user what it has done.
+connectReply=Agregados %S comandos.
+
+# LOCALIZATION NOTE (disconnectDesc2, disconnectManual2,
+# disconnectPrefixDesc): These strings describe the 'disconnect' command and
+# all its available parameters. See localization comment for 'connect' for an
+# explanation about 'prefix'.
+disconnectDesc2=Desconectar del servidor
+disconnectManual2=Desconectar de un servidor actualmente vinculado para ejecución remota de comandos
+disconnectPrefixDesc=Prefijo padre para comandos importados
+
+# LOCALIZATION NOTE (disconnectReply): The output of the 'disconnect' command,
+# telling the user what it's done.
+disconnectReply=Eliminados %S comandos.
+
+# LOCALIZATION NOTE (globalDesc, globalWindowDesc, globalOutput): These
+# strings describe the 'global' command and its parameters
+globalDesc=Cambiar el JS global
+globalWindowDesc=Nueva ventana/global
+globalOutput=JS global ahora es %S
+
+# LOCALIZATION NOTE: These strings describe the 'clear' command
+clearDesc=Limpiar el área de salida
+
+# LOCALIZATION NOTE (langDesc, langOutput): These strings describe the 'lang'
+# command and its parameters
+langDesc=Ingrese comandos en diferentes lenguajes
+langOutput=Ahora está usando %S
+
+# LOCALIZATION NOTE (prefDesc): A very short description of the 'pref'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible. See prefManual for a
+# fuller description of what it does.
+prefDesc=Comandos para controlar la configuración
+
+# LOCALIZATION NOTE (prefManual): A fuller description of the 'pref' command.
+# Displayed when the user asks for help on what it does.
+prefManual=Commands to display and alter preferences both for GCLI and the surrounding environment
+
+# LOCALIZATION NOTE (prefListDesc): A very short description of the 'pref
+# list' command. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible. See
+# prefListManual for a fuller description of what it does.
+prefListDesc=Mostrar configuración disponible
+
+# LOCALIZATION NOTE (prefListManual): A fuller description of the 'pref list'
+# command. Displayed when the user asks for help on what it does.
+prefListManual=Mostrar una lista de preferencias, filtrada opcionalmente usando el parámetro 'search' 
+
+# LOCALIZATION NOTE (prefListSearchDesc): A short description of the 'search'
+# parameter to the 'pref list' command. See prefListSearchManual for a fuller
+# description of what it does. This string is designed to be shown in a dialog
+# with restricted space, which is why it should be as short as possible.
+prefListSearchDesc=Filtrar la lista de configuraciones mostradas
+
+# LOCALIZATION NOTE (prefListSearchManual): A fuller description of the
+# 'search' parameter to the 'pref list' command. Displayed when the user asks
+# for help on what it does.
+prefListSearchManual=Buscar la cadena ingresada en la lista de preferencias disponibles
+
+# LOCALIZATION NOTE (prefShowDesc): A very short description of the 'pref
+# show' command. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible. See
+# prefShowManual for a fuller description of what it does.
+prefShowDesc=Mostrar valor de configuración
+
+# LOCALIZATION NOTE (prefShowManual): A fuller description of the 'pref show'
+# command. Displayed when the user asks for help on what it does.
+prefShowManual=Mostrar el valor de una preferencia dada
+
+# LOCALIZATION NOTE (prefShowSettingDesc): A short description of the
+# 'setting' parameter to the 'pref show' command. See prefShowSettingManual
+# for a fuller description of what it does. This string is designed to be
+# shown in a dialog with restricted space, which is why it should be as short
+# as possible.
+prefShowSettingDesc=Configuración a mostrar
+
+# LOCALIZATION NOTE (prefShowSettingManual): A fuller description of the
+# 'setting' parameter to the 'pref show' command. Displayed when the user asks
+# for help on what it does.
+prefShowSettingManual=El nombre de la configuración a mostrar
+
+# LOCALIZATION NOTE (prefShowSettingValue): This is used to show the
+# preference name and the associated preference value. %1$S is replaced with
+# the preference name and %2$S is replaced with the preference value.
+prefShowSettingValue=%1$S: %2$S
+
+# LOCALIZATION NOTE (prefSetDesc): A very short description of the 'pref set'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible. See prefSetManual for
+# a fuller description of what it does.
+prefSetDesc=Alterar una configuración
+
+# LOCALIZATION NOTE (prefSetManual): A fuller description of the 'pref set'
+# command. Displayed when the user asks for help on what it does.
+prefSetManual=Alterar preferencias definidas por el entorno
+
+# LOCALIZATION NOTE (prefSetSettingDesc): A short description of the 'setting'
+# parameter to the 'pref set' command. See prefSetSettingManual for a fuller
+# description of what it does. This string is designed to be shown in a dialog
+# with restricted space, which is why it should be as short as possible.
+prefSetSettingDesc=Configuración a alterar
+
+# LOCALIZATION NOTE (prefSetSettingManual): A fuller description of the
+# 'setting' parameter to the 'pref set' command. Displayed when the user asks
+# for help on what it does.
+prefSetSettingManual=El nombre de la configuración a alterar.
+
+# LOCALIZATION NOTE (prefSetValueDesc): A short description of the 'value'
+# parameter to the 'pref set' command. See prefSetValueManual for a fuller
+# description of what it does. This string is designed to be shown in a dialog
+# with restricted space, which is why it should be as short as possible.
+prefSetValueDesc=Nuevo valor para la configuración
+
+# LOCALIZATION NOTE (prefSetValueManual): A fuller description of the 'value'
+# parameter to the 'pref set' command. Displayed when the user asks for help
+# on what it does.
+prefSetValueManual=El nuevo valor para la configuración especificada
+
+# LOCALIZATION NOTE (prefResetDesc): A very short description of the 'pref
+# reset' command. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible. See
+# prefResetManual for a fuller description of what it does.
+prefResetDesc=Restablecer una configuración
+
+# LOCALIZATION NOTE (prefResetManual): A fuller description of the 'pref
+# reset' command. Displayed when the user asks for help on what it does.
+prefResetManual=Restablecer el valor de una configuración al predeterminado del sistema
+
+# LOCALIZATION NOTE (prefResetSettingDesc): A short description of the
+# 'setting' parameter to the 'pref reset' command. See prefResetSettingManual
+# for a fuller description of what it does. This string is designed to be
+# shown in a dialog with restricted space, which is why it should be as short
+# as possible.
+prefResetSettingDesc=Configuración a restablecer
+
+# LOCALIZATION NOTE (prefResetSettingManual): A fuller description of the
+# 'setting' parameter to the 'pref reset' command. Displayed when the user
+# asks for help on what it does.
+prefResetSettingManual=El nombre de la configuración a restablecer al valor predeterminado del sistema
+
+# LOCALIZATION NOTE (prefOutputFilter): Displayed in the output from the 'pref
+# list' command as a label to an input element that allows the user to filter
+# the results
+prefOutputFilter=Filtro
+
+# LOCALIZATION NOTE (prefOutputName): Displayed in the output from the 'pref
+# list' command as a heading to a table. The column contains the names of the
+# available preferences
+prefOutputName=Nombre
+
+# LOCALIZATION NOTE (prefOutputValue): Displayed in the output from the 'pref
+# list' command as a heading to a table. The column contains the values of the
+# available preferences
+prefOutputValue=Valor
+
+# LOCALIZATION NOTE (introDesc, introManual): These strings describe the
+# 'intro' command. The localization of 'Got it!' should be the same used in
+# introTextGo.
+introDesc=Muestra el mensaje de inicio
+introManual=Volver a mostrar el mensaje que se muestra a los nuevos usuarios hasta que presionan el botón '¡Lo tengo!'
+
+# LOCALIZATION NOTE (introTextOpening3, introTextCommands, introTextKeys2,
+# introTextF1Escape, introTextGo): These strings are displayed when the user
+# first opens the developer toolbar to explain the command line, and is shown
+# each time it is opened until the user clicks the 'Got it!' button.
+introTextOpening3=GCLI es un experimento para crear una línea de comando altamente usable para diseñadores web.
+introTextCommands=Para una lista de comandos ingrese
+introTextKeys2=o para mostrar/ocultar ayuda de comandos presione
+introTextF1Escape=F1/Escape
+introTextGo=¡Lo tengo!
+
+
+# LOCALIZATION NOTE (hideIntroDesc): Short description of the 'hideIntro' setting.
+hideIntroDesc=Mostrar el mensaje inicial de bienvenida
+
+# LOCALIZATION NOTE (eagerHelperDesc): Short description of the 'eagerHelper'
+# setting. Displayed when the user asks for help on the settings.
+eagerHelperDesc=How eager are the tooltips
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/toolkit/chrome/global/devtools/styleinspector.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/toolkit/chrome/global/devtools/styleinspector.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/toolkit/chrome/global/devtools/styleinspector.properties	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/toolkit/chrome/global/devtools/styleinspector.properties	2015-05-25 20:46:31.000000000 +0000
@@ -112,13 +112,14 @@
 # the rule view context menu "Show MDN docs" entry.
 ruleView.contextmenu.showMdnDocs.accessKey=D
 
-# LOCALIZATION NOTE (ruleView.contextmenu.addRule): Text displayed in the
+# LOCALIZATION NOTE (ruleView.contextmenu.addNewRule): Text displayed in the
 # rule view context menu for adding a new rule to the element.
-ruleView.contextmenu.addRule=Agregar regla
+# This should match addRuleButton.tooltip in styleinspector.dtd
+ruleView.contextmenu.addNewRule=Agregar nueva regla
 
 # LOCALIZATION NOTE (ruleView.contextmenu.addRule.accessKey): Access key for
 # the rule view context menu "Add rule" entry.
-ruleView.contextmenu.addRule.accessKey=r
+ruleView.contextmenu.addNewRule.accessKey=R
 
 # LOCALIZATION NOTE (computedView.contextmenu.selectAll): Text displayed in the
 # computed view context menu.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/toolkit/chrome/global/viewSource.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/toolkit/chrome/global/viewSource.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/toolkit/chrome/global/viewSource.properties	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/toolkit/chrome/global/viewSource.properties	2015-05-25 20:46:31.000000000 +0000
@@ -12,3 +12,6 @@
 viewSelectionSourceTitle = Fuente DOM de la selección
 viewMathMLSourceTitle    = Fuente DOM de MathML
 
+context_goToLine_label        = Ir a línea…
+context_wrapLongLines_label   = Ajustar líneas largas
+context_highlightSyntax_label = Resaltar sintaxis
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/toolkit/chrome/mozapps/extensions/extensions.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/toolkit/chrome/mozapps/extensions/extensions.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-05-25 20:46:31.000000000 +0000
@@ -25,6 +25,9 @@
 <!ENTITY cmd.back.tooltip                     "Retroceder una página">
 <!ENTITY cmd.forward.tooltip                  "Avanzar una página">
 
+<!ENTITY showUnsignedExtensions.button.label  "Algunas extensiones no pudieron ser verificadas">
+<!ENTITY showAllExtensions.button.label       "Mostrar todas las extensiones">
+
 <!-- global warnings -->
 <!ENTITY warning.safemode.label                    "Todos los complementos fueron deshabilitados por el modo seguro.">
 <!ENTITY warning.checkcompatibility.label          "La verificación de compatibilidad de complementos está deshabilitada. Puede tener complementos incompatibles.">
@@ -234,3 +237,18 @@
 <!ENTITY experiment.info.changetelemetry.accesskey "T">
 
 <!ENTITY setting.learnmore "Conocer más…">
+
+<!ENTITY disabledUnsigned.heading "Algunos complementos han sido deshabilitados">
+<!-- LOCALIZATION NOTE (disabledUnsigned.description.start, disabledUnsigned.description.findAddonsLink, disabledUnsigned.description.end):
+     These entities form a sentence, with
+     disabledUnsigned.description.findAddonsLink being a link to an external site. -->
+<!ENTITY disabledUnsigned.description.start "Los siguientes complementos no han sido verificados para usar en &brandShortName;. Puede ">
+<!ENTITY disabledUnsigned.description.findAddonsLink "buscar reemplazos">
+<!ENTITY disabledUnsigned.description.end " o pedir al desarrollador que los haga verificar.">
+<!ENTITY disabledUnsigned.learnMore "Conocer más sobre nuestros esfuerzos para ayudar a mantenerlo seguro mientras está en línea.">
+<!-- LOCALIZATION NOTE (disabledUnsigned.devInfo.start, disabledUnsigned.devInfo.linkToManual, disabledUnsigned.devInfo.end):
+     These entities form a sentence, with disabledUnsigned.devInfo.linkToManual
+     being a link to an external site. -->
+<!ENTITY disabledUnsigned.devInfo.start "Desarrolladores interesados en conseguir que sus complementos sean verificados pueden continuar leyendo nuestro ">
+<!ENTITY disabledUnsigned.devInfo.linkToManual "manual">
+<!ENTITY disabledUnsigned.devInfo.end ".">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/webapprt/webapprt/overrides/dom.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/webapprt/webapprt/overrides/dom.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-AR/webapprt/webapprt/overrides/dom.properties	2015-05-13 18:07:18.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-AR/webapprt/webapprt/overrides/dom.properties	2015-05-25 20:46:31.000000000 +0000
@@ -79,7 +79,6 @@
 FullScreenDeniedSubDocFullScreen=Request for full-screen was denied because a subdocument of the document requesting full-screen is already full-screen.
 FullScreenDeniedNotDescendant=Request for full-screen was denied because requesting element is not a descendant of the current full-screen element.
 FullScreenDeniedNotFocusedTab=Request for full-screen was denied because requesting element is not in the currently focused tab.
-FullScreenDeniedContentOnly=Request for full-screen was denied because requesting element is in the chrome document and the fullscreen API is configured for content only.
 RemovedFullScreenElement=Exited full-screen because full-screen element was removed from document.
 FocusedWindowedPluginWhileFullScreen=Exited full-screen because windowed plugin was focused.
 HTMLSyncXHRWarning=HTML parsing in XMLHttpRequest is not supported in the synchronous mode.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/baseMenuOverlay.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/baseMenuOverlay.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/baseMenuOverlay.dtd	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/baseMenuOverlay.dtd	2015-05-25 20:46:36.000000000 +0000
@@ -20,6 +20,8 @@
 <!ENTITY helpKeyboardShortcuts.accesskey "K">
 <!ENTITY helpSafeMode.label       "Reiniciar con los complementos deshabilitados…">
 <!ENTITY helpSafeMode.accesskey   "R">
+<!ENTITY helpSafeMode.stop.label  "Reiniciar con los complementos habilitados…">
+<!ENTITY helpSafeMode.stop.accesskey   "R">
 <!ENTITY healthReport2.label      "Reporte de salud de &brandShorterName;">
 <!ENTITY healthReport2.accesskey  "e">
 <!ENTITY helpTroubleshootingInfo.label      "Información para resolver problemas">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/browser.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/browser.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/browser.dtd	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/browser.dtd	2015-05-25 20:46:36.000000000 +0000
@@ -574,22 +574,18 @@
 <!ENTITY pluginBlockNow.label "Bloquear complemento">
 <!ENTITY pluginNotification.width "28em">
 <!ENTITY uiTour.infoPanel.close "Cerrar">
-<!ENTITY switchToMetroCmd2.label       "Relanzar en &brandShortName; para Windows 8 táctil">
 
 <!ENTITY panicButton.view.mainTimeframeDesc       "Olvidar datos de hace:">
 <!ENTITY panicButton.view.5min                    "Cinco minutos">
 <!ENTITY panicButton.view.2hr                     "Dos horas">
 <!ENTITY panicButton.view.day                     "24 horas">
-
 <!ENTITY panicButton.view.mainActionDesc          "Proceder implicará:">
 <!ENTITY panicButton.view.deleteCookies           "Borrar las <html:strong>Cookies</html:strong> recientes">
 <!ENTITY panicButton.view.deleteHistory           "Borrar el <html:strong>Historial</html:strong> reciente">
 <!ENTITY panicButton.view.deleteTabsAndWindows    "Cerrar todas las <html:strong>Pestañas</html:strong> y <html:strong>Ventanas</html:strong>">
 <!ENTITY panicButton.view.openNewWindow           "Abrir una nueva ventana en blanco">
-
 <!ENTITY panicButton.view.undoWarning             "Esta acción no puede ser deshecha.">
 <!ENTITY panicButton.view.forgetButton            "¡Olvidar!">
-
 <!ENTITY panicButton.thankyou.msg1                "Tu historial reciente ha sido limpiado.">
 <!ENTITY panicButton.thankyou.msg2                "¡Navega seguro!">
 <!ENTITY panicButton.thankyou.buttonlabel         "¡Gracias!">
@@ -605,8 +601,6 @@
 
 <!ENTITY emeLearnMoreContextMenu.label            "Aprender más acerca de DRM…">
 <!ENTITY emeLearnMoreContextMenu.accesskey        "D">
-
-
 <!ENTITY emeNotificationsNotNow.label             "Ahora no">
 <!ENTITY emeNotificationsNotNow.accesskey         "N">
 <!ENTITY emeNotificationsDontAskAgain.label       "No volver a preguntar">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/browser.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/browser.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/browser.properties	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/browser.properties	2015-05-25 20:46:36.000000000 +0000
@@ -23,9 +23,10 @@
 addonInstall.acceptButton.label=Instalar
 addonInstall.acceptButton.accesskey=I
 addonConfirmInstall.message=Este sitio quiere instalar un complemento en #1:;Este sitio quiere instalar #2 complementos en #1:
+addonConfirmInstallUnsigned.message=Atención: Este sitio quiere instalar un complemento no verificado en #1. Proceda bajo su propio riesgo.;Atención: Este sitio quiere instalar #2 complementos no verificados en #1. Proceda bajo su propio riesgo.
+addonConfirmInstallSomeUnsigned.message=;Atención: Este sitio quiere instalar #2 complementos en #1, algunos de los cuales no están verificados. Proceda bajo su propio riesgo.
 addonwatch.slow=Puede que %S haga que %S corra lento
 addonwatch.disable.label=Desactivar %S
-addonwatch.disable.accesskey=D
 addonwatch.ignoreSession.label=Ignorar por ahora
 addonwatch.ignoreSession.accesskey=I
 addonwatch.ignorePerm.label=Ignorar permanentemente
@@ -41,12 +42,17 @@
 addonError-2 = El complemento de #2 no pudo instalarse poruqe no coincide con el complemento que esperaba #3.
 addonError-3 = El complemento descargdo de #2 no pudo instalarse porque parece estar corrupto.
 addonError-4 = #1 no pudo instalarse porque #3 no pudo modificar el archivo necesario.
+addonError-5=#3 ha prevenido que este sitio instale un complemento no verificado.
 addonLocalError-1 = Este complemento no pudo instalarse por un error en el sistema de archivos.
 addonLocalError-2 = Este complemento no pudo instalarse porque no coincided con el complemento que esperaba #3.
 addonLocalError-3 = Este complemento no pudo instalarse porque parece estar corrupto.
 addonLocalError-4 = #1 no pudo instalarse porque #3 no pudo modificar el archivo necesario.
+addonLocalError-5=Este complemento no pudo instalarse porque no ha sido verificado.
 addonErrorIncompatible = #1 no pudo instalarse porque no es compatible con #3 #4.
 addonErrorBlocklisted = #1 no pudo instalarse porque tiene un riesgo alto de causar problemas de estabilidad o seguridad.
+unsignedAddonsDisabled.message=Uno o más de los complementos instalados no pudieron ser verificados y fueron desactivados.
+unsignedAddonsDisabled.learnMore.label=Aprender más
+unsignedAddonsDisabled.learnMore.accesskey=L
 deveditionTheme.name=Developer Edition
 lwthemeInstallRequest.message = Este sitio (%S) intentó instalar un tema.
 lwthemeInstallRequest.allowButton = Permitir
@@ -223,6 +229,7 @@
 safebrowsing.reportedAttackSite = ¡Sospecha de sitio atacante!
 safebrowsing.notAnAttackButton.label = Este no es un sitio peligroso…
 safebrowsing.notAnAttackButton.accessKey = A
+safebrowsing.reportedUnwantedSite=¡Sitio sospechoso de software indeseable!
 ctrlTab.listAllTabs.label=;Mostrar todas las #1 pestañas
 addKeywordTitleAutoFill = Buscar %S
 tabview.title = %S - Agrupa tus pestañas
@@ -418,3 +425,20 @@
 readingList.prepopulatedArticles.supportReadingList = Guarde, sincronice y lea páginas en cualquier parte con la Lista de lectura
 readingList.prepopulatedArticles.supportReaderView = Disfrute de las páginas Web sin distracciones con la Vista del lector
 readingList.prepopulatedArticles.supportSync = Acceda a su Lista de lectura desde cualquier parte con %S
+
+# Cadenas para canales pre-release desde la v41
+e10s.offerPopup.mainMessage = El multiprocesamiento llegará pronto a %S. Puede empezar a usarlo desde ya para tener un acceso temprano a algunos de los beneficios:
+e10s.offerPopup.highlight1 = Respuesta mejorada
+e10s.offerPopup.highlight2 = Menos cuelges
+e10s.offerPopup.enableAndRestart.label = Activar y reiniciar
+e10s.offerPopup.enableAndRestart.accesskey = E
+e10s.offerPopup.noThanks.label = No, gracias
+e10s.offerPopup.noThanks.accesskey = N
+e10s.postActivationInfobar.message = ¡Ahora está ayudando a probar el multiprocesamiento en %S! Por favor, repórtenos los problemas con los que se encuentre.
+e10s.postActivationInfobar.learnMore.label = Aprender más
+e10s.postActivationInfobar.learnMore.accesskey = L
+e10s.accessibilityNotice.mainMessage = El multiprocesamiento actualmente no soporta las funciones de accesibilidad. El multiprocesamiento será desactivado si reinicia %S. ¿Desea reiniciar ahora?
+e10s.accessibilityNotice.disableAndRestart.label = Desactivar y reiniciar
+e10s.accessibilityNotice.disableAndRestart.accesskey = R
+e10s.accessibilityNotice.dontDisable.label = No desactivar
+e10s.accessibilityNotice.dontDisable.accesskey = D
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/customizableui/customizableWidgets.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/customizableui/customizableWidgets.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/customizableui/customizableWidgets.properties	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/customizableui/customizableWidgets.properties	2015-05-25 20:46:36.000000000 +0000
@@ -26,9 +26,6 @@
 add-ons-button.label = Complementos
 add-ons-button.tooltiptext3 = Administre sus complementos (%S)
 
-switch-to-metro-button2.label = Windows 8 táctil
-switch-to-metro-button2.tooltiptext = Relanzar en %S para Windows 8 táctil
-
 preferences-button.label = Preferencias
 preferences-button.tooltiptext2 = Abrir Preferencias
 preferences-button.tooltiptext.withshortcut = Abrir Preferencias (%S)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/devtools/gclicommands.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/devtools/gclicommands.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/devtools/gclicommands.properties	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/devtools/gclicommands.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,358 +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/.
-
-helpDesc = Obtenga ayuda sobre los comandos disponibles
-helpAvailable = Comandos disponibles
-notAvailableInE10S=El comando '%1$S' no está disponible en el modo multiproceso (E10S)
-consoleDesc = Comandos para controlar la consola
-consoleManual = Filtrar, limpiar y cerrar la consola web
-consoleclearDesc = Limpiar la consola
-screenshotDesc = Guardar una imagen de la página
-screenshotManual = Guardar imagen PNG de la ventana visible completa (opcionalmente después de un retraso)
-screenshotFilenameDesc = Nombre del archivo de destino
-screenshotFilenameManual = El nombre del archivo (debe tener una extención '.png') al cual se escribirá la captura de pantalla.
-screenshotClipboardDesc = ¿Copiar captura de pantalla al portapapeles? (verdadero/falso)
-screenshotClipboardManual = Verdadero si desea copiar la captura de pantalla en vez de guardarla a un archivo.
-screenshotChromeDesc2=¿Capturar ventana chrome de %1$S? (verdadero/falso)
-screenshotChromeManual2=Verdadero si usted quiere tomar una captura de pantalla de la ventana de %1$S mas que de la ventana de contenido de la página web.
-screenshotGroupOptions = Opciones
-screenshotDelayDesc = Retraso (segundos)
-screenshotDelayManual = El tiempo a esperar (en segundos) antes de que una captura sea tomada)
-screenshotFullPageDesc = ¿Página web entera? (verdadero/falso)
-screenshotFullPageManual = Verdadero si la captura de pantalla debiera también incluir partes del sitio web que quedan fuera de los margenes visibles.
-screenshotSelectorChromeConflict = la opción del selector no está soportada cuando la opción chrome es verdadera
-screenshotGeneratedFilename = Captura del %1$S a las %2$S
-screenshotErrorSavingToFile = Error al guardar a
-screenshotSavedToFile = Guardado a
-screenshotErrorCopying = Ocurrio un error al copiar al portapapeles
-screenshotCopied = Copiado al portapapeles.
-screenshotTooltip=Toma una captura de la página completa
-highlightDesc=Destacar nodos
-highlightManual=Destacar nodos que coincidan con un selector en la página
-highlightSelectorDesc=Selector CSS
-highlightSelectorManual=El selector CSS usado para buscar coincidencia de nodos en la página
-highlightOptionsDesc=Opciones
-highlightHideGuidesDesc=Ocultar guías
-highlightHideGuidesManual=Ocultar las guías alrededor del nodo destacado
-highlightShowInfoBarDesc=Mostrar la barra informativa del nodo
-highlightShowInfoBarManual=Mostrar la barra informativa sobre el nodo destacado (la barra informativa muestra el nombre de la etiqueta, atributos y dimensión)
-highlightShowAllDesc=Mostrar todas las coincidencias
-highlightShowAllManual=Si demasiados nodos coinciden con el selector, solo los primeros 100 serán mostrados para evitar ralentizar mucho la página. Use esta opción para mostrar todas las coincidencias en su lugar
-highlightRegionDesc=Región del modelo de caja
-highlightRegionManual=Que región de modelo de caja debiera ser destacada: 'content', 'padding', 'border' o 'margin'
-highlightFillDesc=Estilo de relleno
-highlightFillManual=Rellenar el estilo de relleno predeterminado de la región con un color personalizado
-highlightKeepDesc=Mantener destacadores existentes
-highlightKeepManual=Por defecto, los destacadores existentes son ocultados al ejecutar el comando, salvo que esta opción esté marcada
-highlightOutputConfirm2=%1$S nodo destacado;%1$S nodos destacados
-highlightOutputMaxReached=%1$S nodos coincidieron, pero solo %2$S nodos fueron destacados. Use '--showall' para mostrar todos
-unhighlightDesc=Quitar destacado a todos los nodos
-unhighlightManual=Quitar destacado a todos los nodos previamente destacados con el comando 'highlight'
-restartBrowserDesc=Reiniciar %1$S
-restartBrowserNocacheDesc=Desactiva la carga de contenido desde la caché al reiniciar
-restartBrowserRequestCancelled=Solicitud de reinicio cancelada por el usuario.
-restartBrowserRestarting=Reiniciando %1$S…
-inspectDesc = Inspeccionar un nodo
-inspectManual = Investigar las dimensiones y propiedades de un elemento usando un selector CSS para abrir el resaltador de DOM
-inspectNodeDesc = Selector CSS
-inspectNodeManual = Un selector CSS para usar con Document.querySelector que identifica un solo elemento
-eyedropperDesc=Tomar un color de la página
-eyedropperManual=Abre un panel que agranda un área de la página para inspeccionar pixeles y copiar los valores de color
-eyedropperTooltip=Toma un color de la página
-tiltDesc = Visualizar la página en 3D
-tiltManual = Investigar la relación entre varias partes de una página web y sus ancestros en un entorno 3D
-tiltOpenDesc = Abrir la vista del Inspector 3D
-tiltOpenManual = Inicializar el inspector 3D de la página y opcionalmente resaltar el nodo usando un selector CSS
-tiltToggleTooltip=Vista 3D
-tiltTranslateDesc = Mover la malla de la página
-tiltTranslateManual = Incrementar la traslación de la malla de la página web en una determinada dirección
-tiltTranslateXDesc = X (píxeles)
-tiltTranslateXManual = La cantidad en píxeles para trasladar la malla de la página web a lo largo del eje X
-tiltTranslateYDesc = Y (píxeles)
-tiltTranslateYManual = La cantidad en píxeles para trasladar la malla de la página web a lo largo del eje Y
-tiltRotateDesc = Rotar la malla de la página web
-tiltRotateManual = Incrementar la rotación de la malla de la página web en una determinada dirección
-tiltRotateXDesc = X (grados)
-tiltRotateXManual = La cantidad en grados para rotar la malla de la página web a lo largo del eje X
-tiltRotateYDesc = Y (grados)
-tiltRotateYManual = La cantidad en grados para rotar la malla de la página web a lo largo del eje Y
-tiltRotateZDesc = Z (grados)
-tiltRotateZManual = La cantidad en grados para rotar la malla de la página web a lo largo del eje Z
-tiltZoomDesc = Acercar o alejar la malla de la página web
-tiltZoomManual = Incrementar el movimiento de la malla de la página web en una cierta dirección a lo largo del eje Z
-tiltZoomAmountDesc = Tamaño (píxeles)
-tiltZoomAmountManual = La cantidad en píxeles para trasladar la malla de la página web a lo largo del eje Z
-tiltResetDesc = Restablecer la traslación, rotación y el tamaño
-tiltResetManual = Restablece cualquier transformación aplicada a la matriz de la malla que modela la visión de la página web
-tiltCloseDesc = Cerrar la visualización si está abierta
-tiltCloseManual = Cerrar la visualización y volver al Inspector por defecto
-debuggerClosed=El depurador debe ser abierto antes de usar este comando
-debuggerStopped=El depurador debe ser abierto antes de configurar puntos de ruptura
-breakDesc = Administrar puntos de ruptura
-breakManual = Comandos a listar, añadir y eliminar puntos de ruptura
-breaklistDesc = Mostrar puntos de ruptura conocidos
-breaklistNone = No hay puntos de ruptura configurados
-breaklistOutRemove=Eliminar
-breakaddAdded = Punto de ruptura añadido
-breakaddFailed = No se puede configurar el punto de ruptura: %S
-breakaddDesc = Agregar punto de ruptura
-breakaddManual = Tipos de puntos de ruptura soportados: línea
-breakaddlineDesc = Agregar un punto de ruptura en línea
-breakaddlineFileDesc = JS archivo URI
-breakaddlineLineDesc = Número de línea
-breakdelDesc = Eliminar un punto de ruptura
-breakdelBreakidDesc = Índice de punto de ruptura
-breakdelRemoved = Punto de ruptura eliminado
-dbgDesc = Administrar el depurador
-dbgManual = Comandos para interrumpir o resumir el hilo principal, entrar, salir y saltar sobre las líneas de código
-dbgOpen = Abrir el depurador
-dbgClose = Cerrar el depurador
-dbgInterrupt = Pausar el hilo principal
-dbgContinue = Reanudar el hilo principal, y continuar la ejecución que sigue al punto de ruptura, hasta que se encuentre el siguiente punto o se termine el script.
-dbgStepDesc = Administrar pasos
-dbgStepManual = Comandos para entrar, salir y saltar sobre líneas de código
-dbgStepOverDesc = Ejecuta la sentencia actual y después se detiene en la siguiente sentencia. Si la sentencia actual es una llamada a una función, entonces el depurador ejecuta la función completa y se detiene en la  sentencia que sigue a la llamada a la función
-dbgStepInDesc = Ejecuta la sentencia actual y después se detiene en la siguiente sentencia. Si la sentencia actual es una llamada a una función, entonces el depurador entra en dicha función; en cualquier otro caso, se detiene en la siguiente sentencia
-dbgStepOutDesc = Sale de la función actual a un nivel superior si la función está anidada. Si está en el cuerpo principal, el script es ejecutado hasta el final o hasta el siguiente punto de ruptura. Las sentencias saltadas son ejecutadas, pero no se introduce en su interior
-dbgListSourcesDesc=Listar las URL de origen cargadas en el depurador
-dbgBlackBoxDesc=Marcar con negro las cajas de fuentes en el depurador
-dbgBlackBoxSourceDesc=Una fuente específica a marcar con negro
-dbgBlackBoxGlobDesc=Marcar con negro todas las fuentes que coincidan con este generalizador (por ejemplo: "*.min.js")
-dbgBlackBoxInvertDesc=Invertir coincidencias, de forma tal que se marquen con negro todas las fuentes que no están provistas o no coinciden con el patrón general otorgado.
-dbgBlackBoxEmptyDesc=(No se marcaron fuentes con negro)
-dbgBlackBoxNonEmptyDesc=Las siguientes fuentes fueron marcadas con negro:
-dbgBlackBoxErrorDesc=Error al marcar con negro:
-dbgUnBlackBoxDesc=Dejar de marcar con negro las fuentes en el depurador
-dbgUnBlackBoxSourceDesc=Una fuente específica a dejar de marcar con negro
-dbgUnBlackBoxGlobDesc=Dejar de marcar con negro todas las fuentes que coinciden on este generalizador (por ejemplo: "*.min.js")
-dbgUnBlackBoxEmptyDesc=(No se dejó de marcar con negro ninguna fuente)
-dbgUnBlackBoxNonEmptyDesc=Se dejó de marcar con negro las siguientes fuentes:
-dbgUnBlackBoxErrorDesc=Error al dejar de marcar con negro:
-dbgUnBlackBoxInvertDesc=Invertir coincidencias, de forma tal que se dejen de marcar con negro todas las fuentes que no están provistas o no coinciden con el patrón general otorgado.
-consolecloseDesc = Cerrar la consola
-consoleopenDesc = Abrir la consola
-editDesc = Modificar un recurso de la página
-editManual2 = Editar uno de los recursos que es parte de esta página
-editResourceDesc = URL a editar
-editLineToJumpToDesc = Línea a saltar
-resizePageDesc = Redimencionar la página
-resizePageArgWidthDesc = Ancho en píxeles
-resizePageArgHeightDesc = Ancho en píxelesAlto en píxeles
-resizeModeOnDesc = Entrar en la vista de diseño adaptable
-resizeModeOffDesc = Salir de la vista de diseño adaptable
-resizeModeToggleDesc = Cambiar la vista de diseño adaptable
-resizeModeToggleTooltip=Modo de diseño adaptable
-resizeModeToDesc = Alterar tamaño de página
-resizeModeDesc = Controlar el modo de vista de diseño adaptable
-resizeModeManual2=Los sitios web con diseño adaptable responden a su entorno, por lo que se ven bien en una pantalla móvil, una pantalla de cine y todas las que este entremedio. El modo de diseño adaptable le permite probar fácilmente una variedad de tamaños de página en %1$S sin necesidad de redimencionar su navegador completo.
-cmdDesc = Manipular los comandos
-cmdRefreshDesc = Volver a leer el directorio mozcmd
-cmdStatus3=Comandos de '%1$S' cargados
-cmdSetdirDesc=Configura un directorio mozcmd
-cmdSetdirManual2=Un directorio 'mozcmd' es una manera fácil de crear nuevos comandos personalizados. Para más información vea la <a href="https://developer.mozilla.org/docs/Tools/GCLI/Customization">documentación de MDN</a>.
-cmdSetdirDirectoryDesc=Directorio que contiene archivos .mozcmd
-addonDesc = Manipular complementos
-addonListDesc = Enlistar complementos instalados
-addonListTypeDesc = Seleccionar un tipo de complemento
-addonListDictionaryHeading = Los siguientes diccionarios están actualmente instalados:
-addonListExtensionHeading = Las siguientes extensiones están actualmente instaladas:
-addonListLocaleHeading = Las siguientes localizaciones están actualmente instaladas:
-addonListPluginHeading = Los siguientes complementos están actualmente instalados:
-addonListThemeHeading = Los siguientes temas están actualmente isntalados:
-addonListAllHeading = Los siguientes complementos están actualmente instalados:
-addonListUnknownHeading = Los siguientes complementos del tipo seleccionado están actualmente instalados:
-addonListOutEnable=Activar
-addonListOutDisable=Desactivar
-addonPending=pendiente
-addonPendingEnable=activar
-addonPendingDisable=desactivar
-addonPendingUninstall=desinstalar
-addonPendingInstall=instalar
-addonPendingUpgrade=actualizar
-addonNameDesc = El nombre del complemento
-addonNoneOfType = No hay complementos de ese tipo instalados.
-addonEnableDesc = Activar el complemento especificado
-addonAlreadyEnabled = %S ya está activado.
-addonEnabled = %S activado.
-addonDisableDesc = Desactivar el complemento especificado
-addonAlreadyDisabled = %S ya está desactivado.
-addonDisabled = %S desactivado.
-exportDesc = Exportar recursos
-exportHtmlDesc = Exportar HTML desde página
-pagemodDesc = Hacer cambios a la página
-pagemodReplaceDesc = Buscar y reemplazar en los elementos de la página
-pagemodReplaceSearchDesc = Qué buscar
-pagemodReplaceReplaceDesc = Cadena de reemplazo
-pagemodReplaceIgnoreCaseDesc = Realizar búsqueda sin sensibilidad por mayúsculas
-pagemodReplaceRootDesc = Selector CSS de la raíz de la búsqueda
-pagemodReplaceSelectorDesc = Selector CSS para concordar en la búsqueda
-pagemodReplaceAttributesDesc = Expresión regular para buscar atributo
-pagemodReplaceAttrOnlyDesc = Restringir la búsqueda a los atributos
-pagemodReplaceContentOnlyDesc = Restringir búsqueda a los nodos de texto
-pagemodReplaceResult = Elementos coincidentes con el selector: %1$S. Reemplaza el texto en los nodos: %2$S. Reemplaza en los atributos: %3$S.
-pagemodRemoveDesc = Eliminar elementos y atributos de la página
-pagemodRemoveElementDesc = Eliminar elementos de la página
-pagemodRemoveElementSearchDesc = Selector CSS que especifica los elementos a eliminar
-pagemodRemoveElementRootDesc = Selector CSS que especifica la raíz de la búsqueda
-pagemodRemoveElementStripOnlyDesc = Eliminar elemento, pero dejar el contenido
-pagemodRemoveElementIfEmptyOnlyDesc = Eliminar solo elementos vacíos
-pagemodRemoveElementResultMatchedAndRemovedElements = Elementos coincidentes con el selector: %1$S. Elementos eliminados: %2$S.
-pagemodRemoveAttributeDesc = Eliminar atributos coincidentes
-pagemodRemoveAttributeSearchAttributesDesc = Expresión regular que especifica los atributos a eliminar
-pagemodRemoveAttributeSearchElementsDesc = Selector CSS de los elementos a incluir
-pagemodRemoveAttributeRootDesc = Selector CSS de la raíz de la búsqueda
-pagemodRemoveAttributeIgnoreCaseDesc = Realizar búsqueda sin sensibilidad por mayúsculas
-pagemodRemoveAttributeResult = Elementos coincidentes con el selector: %1$S. Atributos eliminados: %2$S.
-toolsDesc2=Hackear las Herramientas de desarrollador de %1$S
-toolsManual2=Varios comandos relacionados a hackear directamente en las herramientas de %1$S.
-toolsSrcdirDesc=Cargar herramientas desde un repositorio de mozilla-central
-toolsSrcdirNotFound=%1$s no existe o no es un repositorio de mozilla-central.
-toolsSrcdirReloaded=Herramientas cargadas desde %1$s.
-toolsSrcdirManual2=Cargar kas herramientas de desarrollador de %1$S desde un repositorio de mozilla-central completo.
-toolsSrcdirDir=Un repositorio de mozilla-central
-toolsBuiltinDesc=Usar las herramientas integradas
-toolsBuiltinManual=Use las herramientas integradas, por sobre cualquier comando srcdir previo.
-toolsBuiltinReloaded=Herramientas integradas cargadas.
-toolsReloadDesc=Recargar las herramientas de desarrollador
-toolsReloaded2=Herramientas descargadas.
-cookieDesc = Mostrar y modificar cookies
-cookieManual = Comandos para listar, crear, eliminar y alterar cookies para el dominio actual.
-cookieListDesc = Mostrar cookies
-cookieListManual = Mostrar una lista de cookies relevantes a la página actual.
-cookieListOutHost=Servidor:
-cookieListOutPath=Dirección:
-cookieListOutExpires=Expira:
-cookieListOutAttributes=Attributes:
-cookieListOutNone=Ninguno
-cookieListOutSession=Al salir del navegador (sesión)
-cookieListOutNonePage=No se encontraron cookies para esta página
-cookieListOutNoneHost=No se encontraron cookies para el servidor %1$S
-cookieListOutEdit = Editar
-cookieListOutRemove = RemoverEliminar
-cookieRemoveDesc = Eliminar una cookie
-cookieRemoveManual = Eliminar una cookie, según su clave
-cookieRemoveKeyDesc = La clave de la cookie a eliminar
-cookieSetDesc = Configurar una cookie
-cookieSetManual = Configurar una cookie especificando su clave, su valor y opcionalmente uno o más de los siguientes atributos: expires (max-age en segundos o la fecha de expiración en formato GMTString), path, domain, secure
-cookieSetKeyDesc = La clave de la cookie a configurar
-cookieSetValueDesc = El valor de la cookie a configurar
-cookieSetOptionsDesc = Opciones
-cookieSetPathDesc = La ubicación de la cookie a configurar
-cookieSetDomainDesc = El dominio de la cookie a configurar
-cookieSetSecureDesc = Transmitida solo bajo https
-cookieSetHttpOnlyDesc=No accesible desde el script del lado del cliente
-cookieSetSessionDesc=Solo válido para el tiempo de vida de la sesión del navegador
-cookieSetExpiresDesc=La fecha de expiración de la cookie (RFC2822 citado o fecha ISO 8601)
-jsbDesc = Embellecedor de JavaScript
-jsbUrlDesc = La URL del archivo JS a embellecer
-jsbIndentSizeDesc = Tamaño de la sangría en carácteres
-jsbIndentSizeManual = El número de carácteres usado para la sangría de cada línea
-jsbIndentCharDesc = Los carácteres usados para la sangría de cada línea
-jsbIndentCharManual = Los carácteres usados para la sangría de cada línea. Las opciones posibles son espacio o tabulación.
-jsbDoNotPreserveNewlinesDesc = No preservar quiebres de línea
-jsbPreserveNewlinesManual = Debieran preservarse los quiebres de línea existentes
-jsbPreserveMaxNewlinesDesc = Quiebres de línea consecutivos máximo
-jsbPreserveMaxNewlinesManual = El número máximo de quiebres de líneas consecutivos a preservar
-jsbJslintHappyDesc = ¿Imponer modo jslint-stricter?
-jsbJslintHappyManual = Al ser ajustado como verdadero, el modo jslint-stricter es impuesto
-jsbBraceStyleDesc2= Seleccione el estilo de codificación de las llaves
-jsbBraceStyleManual2=Seleccione el estilo de codificación de las llaves: colapsar - pone llaves en la misma línea que las declaraciones de control; expandir - pone llaves en la línea propia (estilo Allman / ANSI); expandir al final - pone llaves de término en la línea propia; expandir de forma estricta - pone llaves en la línea propia incluso si separará su código.
-jsbNoSpaceBeforeConditionalDesc = No hay espacio antes de las sentencias condicionales
-jsbUnescapeStringsDesc = ¿De-escapar los carácteres \\xNN?
-jsbUnescapeStringsManual = ¿Debieran ser los carácteres en las cadenas codificadas en la notación \\xNN ser de-escapadas?
-jsbInvalidURL = Por favor, ingrese una URL válida
-jsbOptionsDesc = Opciones
-calllogDesc = Comandos para manipular registro de llamadas a funciones
-calllogStartDesc = Iniciar registro de llamadas a funciones a la consola
-calllogStartReply = Registro de llamadas iniciado.
-calllogStopDesc = Detener registro de llamadas a funciones
-calllogStopNoLogging = No hay ningún registro de llamadas activo en este momento
-calllogStopReply = Registro de llamadas detenido. Contextos activos: %1$S.
-calllogChromeStartDesc = Iniciar registro de llamadas a funciones para código crome a la consola
-calllogChromeSourceTypeDesc = Objeto global, URI JSM o JS desde el cual obtener un objeto global
-calllogChromeSourceTypeManual = El objeto global, URI de un JSM, o un JS para ejecutar en una ventana chrome desde el cual obtener un objeto global
-calllogChromeStartReply = Registro de llamadas iniciado.
-calllogChromeStopDesc = Detener registro de llamadas a funciones
-calllogChromeStopNoLogging = No hay registros de llamadas para código chrome activos en este momento
-calllogChromeStopReply = Registro de llamadas detenido. Contextos activos: %1$S.
-callLogChromeAnonFunction = <anónima>
-callLogChromeMethodCall = Llamada al método
-callLogChromeInvalidJSM = ¡JSM inválido!
-callLogChromeVarNotFoundContent = Variable no encontrada en la ventana de contenido.
-callLogChromeVarNotFoundChrome = Variable no encontrada en la ventana de chrome
-callLogChromeEvalException = El código JavaScript evaluado lanzó la siguiente excepción
-callLogChromeEvalNeedsObject = El código JavaScript debería evaluar a un objeto cuyas llamadas a métodos sean registradas. Por ejemplo: "({a1: function() {this.a2()}, a2:function() {}};"
-scratchpadOpenTooltip=Borrador
-paintflashingDesc=Destacar área pintada
-paintflashingOnDesc = Activar destacador de pintado
-paintflashingOffDesc = Desactivar destacador de pintado
-paintflashingChromeDesc=cuadros chrome
-paintflashingManual=Dibujar áreas repintadas en diferentes colores
-paintflashingTooltip=Destacar área pintada
-paintflashingToggleDesc=Cambiar estado del destacador
-splitconsoleTooltip=Cambiar división de consola
-appCacheDesc=Utilidades de cache de la aplicación
-appCacheValidateDesc=Validar manifiesto de caché
-appCacheValidateManual=Encontrar problemas relacionados a un manifiesto de caché y el archivo al que se refiere
-appCacheValidateUriDesc=URI a revisar
-appCacheValidatedSuccessfully=Appcache validado exitosamente.
-appCacheClearDesc=Limpiar entradas de la caché de la aplicación
-appCacheClearManual=Limpiar una o más entradas de la caché de la aplicación
-appCacheClearCleared=Entradas limpiadas exitosamente.
-appCacheListDesc=Mostrar una lista de entradas de caché de la aplicación.
-appCacheListManual=Mostrar una lista de todas las entradas de caché de la aplicación. Si el parámetro de busqueda es usado entonces la tabla muestra las entradas que contengan el término de búsqueda.
-appCacheListSearchDesc=Filtrar resultados usando un término de búsqueda.
-appCacheListKey=Clave:
-appCacheListDataSize=Tamaño de datos:
-appCacheListDeviceID=ID de dispositivo:
-appCacheListExpirationTime=Expira:
-appCacheListFetchCount=Contador de obtenciones:
-appCacheListLastFetched=Última obtención:
-appCacheListLastModified=Última modificación:
-appCacheListViewEntry=Ver entrada
-appCacheViewEntryDesc=appCacheViewEntryManual=Abrir una nueva pestaña que contenga la información específica de la entrada de caché.
-appCacheViewEntryManual=Abrir una nueva pestaña que contenga la información de la entrada de caché.
-appCacheViewEntryKey=La clave para la entrada a mostrar.
-profilerDesc=Administrar perfilador
-profilerManual=Comandos para iniciar o detener un perfilador de JavaScript
-profilerOpenDesc=Abrir el perfilador
-profilerCloseDesc=Cerrar el perfilador
-profilerStartDesc=Empezar a perfilar
-profilerStartManual=Nombre de un perfilador que desee iniciar.
-profilerStopDesc=Dejar de perfilar
-profilerStopManual=Nombre de un perfilador que desee detener.
-profilerListDesc=Listar todos los perfiles
-profilerShowDesc=Mostrar perfil individual
-profilerShowManual=Nombre de un perfilador.
-profilerAlreadyStarted2=El perfil ya ha sido iniciado
-profilerNotFound=Perfilador no encontrado
-profilerNotStarted3=El perfilador aún no ha sido iniciado. Use 'iniciar perfil' para empezar a perfilar
-profilerStarted2=Grabando…
-profilerStopped=Detenido…
-profilerNotReady=Para que este comando funcione usted necesita abrir primero el perfilador
-listenDesc=Abrir un puerto de depuración remoto
-listenManual2=%1$S puede permitir depuración remota sobre una conexión TCP/IP connection. Por razones de seguridad esto está desactivado por defecto, pero puede ser activado usando este comando.
-listenPortDesc=El puerto TCP sobre el que escuchar
-listenDisabledOutput=Escuchar está desactivado por la preferencia devtools.debugger.remote-enabled
-listenInitOutput=Escuchando en los puertos %1$S
-listenNoInitOutput=DebuggerServer no iniciado
-mediaDesc=emulación de tipo de medio CSS
-mediaEmulateDesc=Emular un tipo de medio CSS especificado
-mediaEmulateManual=Ver el documento como si fuera renderizado en un dispositivo que soporte el tipo de medio dado, con las regas de CSS relevantes aplicadas.
-mediaEmulateType=El tipo de medio a emular
-mediaResetDesc=Detener emulación de tipo de medio CSS
-injectDesc=Inyecta librerías comunes a la página
-injectManual2=Inyecta librerías comunes al contenido de la página que también pueden ser accedidas desde la consola.
-injectLibraryDesc=Selecciona la librería a inyectar o ingresa una URI de script válido a inyectar
-injectLoaded=%1$S cargado
-injectFailed=Falló la carga de %1$S - URI inválida
-folderDesc=Abrir carpetas
-folderOpenDesc=Abrir ubicación de la carpeta
-folderOpenDir=Ubicación de la carpeta
-folderOpenProfileDesc=Abrir carpeta del perfil
-folderInvalidPath=Por favor, ingresa una ubicación válida
-folderOpenDirResult=%1$S abierto
-rulersDesc=Cambiar reglas para la página
-rulersManual=Cambiar la regla horizontal y la vertical para la página actual
-rulersTooltip=Cambiar reglas para la página
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/devtools/gcli.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/devtools/gcli.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/devtools/gcli.properties	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/devtools/gcli.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +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/.
-
-canonDescNone = (Sin descripción)
-canonDefaultGroupName=Opciones
-canonProxyDesc=Ejecutar un comando en %S
-canonProxyManual=Un conjunto de comandos que son ejecutados en un sistema remoto. El sistema remoto es alcanzado mediante %S
-canonProxyExists=Ya hay un comando llamado '%S'
-cliEvalJavascript = Ingrese JavaScript directamente
-cliUnusedArg = Demasiados argumentos
-cliOptions = Opciones disponibles
-cliUnknownCommand=Comando inválido
-cliIncompleteParam=Valor requerido para '%1$S'.
-fileErrNotExists='%1$S' no existe
-fileErrExists='%1$S' ya existe
-fileErrIsNotFile='%1$S' no es un archivo
-fileErrIsNotDirectory='%1$S' no es un directorio
-fileErrDoesntMatch='%1$S' no coincide con '%2$S'
-fieldMenuMore = Más coincidencias, siga intentando
-jstypeParseScope = Alcance perdido
-jstypeParseMissing = No se encuentra la propiedad '%S'
-jstypeBeginSyntax = Error de sintaxis
-jstypeBeginUnterm = Cadena literal sin terminar
-jstypeParseError = Error
-typesNumberNan = No se puede convertir "%S" a un número.
-typesNumberMax = %1$S es mayor que el máximo permitido: %2$S.
-typesNumberMin = %1$S es menor que el mínimo permitido: %2$S.
-typesNumberNotInt2=No se puede convertir "%S" a un entero.
-typesDateNan=No se puede convertir "%S" a una fecha.
-typesDateMax=%1$S es posterior al máximo permitido: %2$S.
-typesDateMin=%1$S es anterior al mínimo permitido: %2$S.
-typesSelectionNomatch = No se puede usar '%S'.
-nodeParseSyntax = Error de sintaxis en consulta CSS
-nodeParseMultiple = Demasiadas coincidencias (%S)
-nodeParseNone = Sin coincidencia
-helpDesc = Obtenga ayuda sobre los comandos disponibles
-helpManual = Provee ayuda, ya sea sobre un comando específico (si se ingresó una cadena a buscar y hay una coincidencia exacta) o sobre los comandos disponibles (si no se ingresó una cadena a buscar o si no hay coincidencia exacta).
-helpSearchDesc = Cadena a buscar
-helpSearchManual3 = Cadena a buscar para reducir las órdenes que son mostradas. Las expresiones regulares no están admitidas.
-helpManSynopsis = Sinopsis
-helpManNone = Ninguno
-helpListAll = Comandos disponibles:
-helpListPrefix = Comandos que comienzan con '%1$S':
-helpListNone = No hay comandos que comiencen con '%1$S'
-helpManRequired = requerido
-helpManOptional = opcional
-helpManDefault=opcional, predeterminado=%1$S
-helpIntro=GCLI es un experimento para crear una línea de comandos altamente usable para desarrolladores web.
-subCommands = Sub-comandos
-commandParseError=Error de análisis de línea de comandos
-contextDesc=Concentrarse en un grupo de comandos
-contextManual=Configura un prefijo predeterminado para comandos futuros. Por ejemplo 'context git' le permitirá escribir 'commit' en vez de 'git commit'.
-contextPrefixDesc=El prefijo del comando
-contextNotParentError=No se puede usar '%1$S' como un prefijo porque no es un comando padre.
-contextReply=Usar %1$S como un prefijo de comando
-contextEmptyReply=El prefijo del comando no está ajustado
-connectDesc=Comandos proxy al servidor
-connectManual=Conectar al servidor, creando versiones locales de los comandos en el servidor. Los comandos remotos inicialmente tienen un prefijo para distinguirlos de los comandos locales (pero vea el contexto del comando para ignorar esto).
-connectPrefixDesc=Prefijo padre para comandos importados
-connectMethodDesc=El método de conexión
-connectUrlDesc=La URL a la cual conectar
-connectDupReply=La conexión llamada %S ya existe.
-connectReply=Añadidos %S comandos.
-disconnectDesc2=Desconectar del servidor
-disconnectManual2=Desconectar del servidor actualmente conectado para la ejecución de comandos
-disconnectPrefixDesc=Prefijo padre para comandos importados
-disconnectReply=Eliminados %S comandos.
-globalDesc=Cambiar el JS global
-globalWindowDesc=La nueva ventana/global
-globalOutput=El JS global es ahora %S
-clearDesc=Limpiar los datos de salida
-langDesc=Ingresar comandos en diferentes idiomas
-langOutput=Ahora estás usando %S
-prefDesc = Comandos para controlar opciones
-prefManual = Órdenes para mostrar y alterar preferencias, tanto para el GCLI como para el entorno cercano
-prefListDesc = Mostrar opciones disponibles
-prefListManual = Mostrar una lista de preferencias, opcionalmente filtradas usando el parámetro 'search'
-prefListSearchDesc = Filtrar la lista de preferencias mostradas
-prefListSearchManual = Buscar por la cadena dada en la lista de preferencias disponibles
-prefShowDesc = Mostrar el valor del ajuste
-prefShowManual = Mostrar el valor de una preferencia dada
-prefShowSettingValue=%1$S: %2$S
-prefShowSettingDesc = Ajuste a mostrar
-prefShowSettingManual = El nombre del ajuste a mostrar
-prefSetDesc = Modificar un ajuste
-prefSetManual = Modificar preferencias definidas por el entorno
-prefSetSettingDesc = Ajuste a modificar
-prefSetSettingManual = El nombre del ajuste a modificar.
-prefSetValueDesc = El nuevo valor para el ajuste
-prefSetValueManual = El nuevo valor para el ajuste especificado
-prefResetDesc = Reiniciar un ajuste
-prefResetManual = Reiniciar el valor de una cadena al predeterminado del sistema
-prefResetSettingDesc = Ajuste a reiniciar
-prefResetSettingManual = El nombre del ajuste a reiniciar al valor predeterminado del sistema
-prefOutputFilter = Filtro
-prefOutputName = Nombre
-prefOutputValue = Valor
-introDesc = Mostrar el mensaje de apertura
-introManual = Volver a mostrar el mensaje que se enseña a los usuarios hasta que pulsan en el botón '¡Lo tengo!'
-introTextCommands = Para una lista de comandos escriba
-introTextOpening3=GCLI es un experimento para crear una línea de comando altamente usable para desarrolladores web.
-introTextKeys2=, o para mostrar/ocultar consejos sobre los comandos presione
-introTextF1Escape = F1/Escape
-introTextGo = ¡Lo tengo!
-hideIntroDesc = Mostrar el mensaje inicial de bienvenida
-eagerHelperDesc = Cuán rápidas son las descripciones emergentes
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/loop/loop.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/loop/loop.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/loop/loop.properties	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/loop/loop.properties	2015-05-25 20:46:37.000000000 +0000
@@ -7,6 +7,10 @@
 clientSuperShortname=Hello
 rooms_tab_button_tooltip=Conversaciones
 contacts_tab_button_tooltip=Contactos
+sign_in_again_title_line_one=Por favor, conéctese nuevamente
+sign_in_again_title_line_two2=para seguir usando {{clientShortname2}}
+sign_in_again_button=Conectarse
+sign_in_again_use_as_guest_button2=Usar {{clientSuperShortname}} como Invitado
 first_time_experience_title={{clientShortname}} — Unirse a la conversación
 first_time_experience_button_label=Empezar
 invite_header_text=Invita a alguien para que se una.
@@ -58,7 +62,7 @@
 add_contact_button=Añadir contacto
 valid_email_text_description=Por favor, ingrese una dirección de correo válida
 add_or_import_contact_title=Añadir o importar contacto
-import_contacts_button=Importar
+import_contacts_button2=Importar de Google
 importing_contacts_progress_button=Importando…
 import_contacts_failure_message=Algunos contactos no pudieron ser importados. Por favor, inténtelo nuevamente.
 import_contacts_success_message={{total}} contacto fue importado exitosamente.;{{total}} contactos fueron importados exitosamente.
@@ -66,7 +70,7 @@
 import_failed_description_simple=Lo sentimos, la importación de contactos falló
 import_failed_description_some=Algunos contactos no pudieron ser importados
 import_failed_support_button=Ayuda
-remove_contact_menu_button=Remover contacto
+remove_contact_menu_button2=Remover contacto…
 confirm_delete_contact_alert=¿Estás seguro de querer eliminar este contacto?
 confirm_delete_contact_remove_button=Remover contacto
 confirm_delete_contact_cancel_button=Cancelar
@@ -166,8 +170,7 @@
 rooms_list_delete_tooltip=Borrar conversación
 rooms_list_deleteConfirmation_label=¿Está seguro?
 rooms_list_no_current_conversations=No hay conversaciones en este momento
-rooms_name_this_room_label=Ponle un nombre a esta conversación
-rooms_name_change_failed_label=La conversación no puede ser renombrada
+rooms_change_failed_label=La conversación no puede ser actualizada
 rooms_new_room_button_label=Empezar una conversación
 rooms_only_occupant_label=Es el primero aquí.
 rooms_panel_title=Escoge una conversación o inicia una nueva
@@ -191,3 +194,10 @@
 context_edit_activate_label=Hablar sobre "{{title}}"
 context_edit_name_placeholder=Nombre de la conversación
 context_edit_comments_placeholder=Comentarios
+context_add_some_label=Añadir un poco de contexto
+context_edit_tooltip=Editar contexto
+context_hide_tooltip=Ocultar contexto
+context_show_tooltip=Mostrar contexto
+context_save_label=Guardar contexto
+context_link_modified=Este enlace fue modificado.
+context_learn_more_link_label=Aprender más.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/newTab.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/newTab.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/newTab.dtd	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/newTab.dtd	2015-05-25 20:46:37.000000000 +0000
@@ -3,6 +3,10 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY newtab.pageTitle "Nueva pestaña">
+<!ENTITY newtab.customize.classic "Mostrar sus sitios frecuentes">
+<!ENTITY newtab.customize.cog.enhanced "Incluir sitios sugeridos">
+<!ENTITY newtab.customize.cog.title "Controles de la Nueva pestaña">
+<!ENTITY newtab.customize.cog.learn "Aprender acerca de la Nueva pestaña">
 <!ENTITY newtab.customize.title "Personalizar su página Nueva pestaña">
 <!ENTITY newtab.customize.suggested "Mostrar sugeridos y sus sitios preferidos">
 <!ENTITY newtab.customize.topsites "Mostrar sus sitios preferidos">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/newTab.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/newTab.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/newTab.properties	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/newTab.properties	2015-05-25 20:46:37.000000000 +0000
@@ -15,3 +15,12 @@
 newtab.intro.paragraph3=Puede modificar la función de miniaturas apretando el botón %1$S según su preferencia.
 newtab.learn.link=Aprender más…
 newtab.privacy.link=Política de privacidad
+newtab.learn.link2=Más acerca de la Nueva pestaña
+newtab.privacy.link2=Acerca de su privacidad
+newtab.intro.header.welcome=¡Bienvenido a la Nueva pestaña en %1$S!
+newtab.intro.header.update=¡La Nueva pestaña ha sido actualizada!
+newtab.intro.skip=Saltarse esto
+newtab.intro.continue=Continuar tur
+newtab.intro.back=Atrás
+newtab.intro.next=Siguiente
+newtab.intro.gotit=¡Entendido!
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/places/places.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/places/places.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/places/places.dtd	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/places/places.dtd	2015-05-25 20:46:36.000000000 +0000
@@ -85,7 +85,6 @@
 <!ENTITY col.url.label           "Dirección">
 <!ENTITY col.mostrecentvisit.label "Última visita">
 <!ENTITY col.visitcount.label    "Contador de visitas">
-<!ENTITY col.keyword.label       "Palabra clave">
 <!ENTITY col.description.label   "Descripción">
 <!ENTITY col.dateadded.label     "Añadido">
 <!ENTITY col.lastmodified.label  "Última modificación">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/places/places.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/places/places.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/places/places.properties	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/places/places.properties	2015-05-25 20:46:36.000000000 +0000
@@ -27,8 +27,6 @@
 view.sortBy.1.date.accesskey=V
 view.sortBy.1.visitCount.label=Ordenar por contador de visitas
 view.sortBy.1.visitCount.accesskey=C
-view.sortBy.1.keyword.label=Ordenar por palabra clave
-view.sortBy.1.keyword.accesskey=K
 view.sortBy.1.description.label=Ordenar por descripción
 view.sortBy.1.description.accesskey=D
 view.sortBy.1.dateAdded.label=Ordenar por fecha de adición
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/preferences/advanced.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/preferences/advanced.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/preferences/advanced.dtd	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/preferences/advanced.dtd	2015-05-25 20:46:36.000000000 +0000
@@ -52,15 +52,12 @@
 <!ENTITY updateApp.label "Actualizaciones de &brandShortName;:">
 <!ENTITY updateAuto1.label               "Instalar actualizaciones automáticamente (recomendado: mayor seguridad)">
 <!ENTITY updateAuto1.accesskey           "A">
-<!ENTITY updateAutoMetro.label           "Automáticamente actualizar desde &brandShortName; para escritorio y estilo Windows 8">
-<!ENTITY updateAutoMetro.accesskey       "s">
 <!ENTITY updateCheck.label "Buscar actualizaciones, pero dejarme elegir si deseo instalarlas">
 <!ENTITY updateCheck.accesskey "c">
 <!ENTITY updateManual.label "Nunca buscar actualizaciones (no recomendado: riesgos de seguridad)">
 <!ENTITY updateManual.accesskey "N">
 <!ENTITY updateAutoAddonWarn.label "Avisarme si ésto deshabilitará alguno de mis complementos">
 <!ENTITY updateAutoAddonWarn.accesskey "v">
-<!ENTITY updateAutoMetroWarn.label       "(&brandShortName; estilo Windows 8 no revisa la compatibilidad de complementos)">
 <!ENTITY updateHistory.label "Mostrar historial de actualización">
 <!ENTITY updateHistory.accesskey "H">
 <!ENTITY useService.label "Usar un servicio en segundo plano para instalar actualizaciones">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/preferences/main.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/preferences/main.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/preferences/main.dtd	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/preferences/main.dtd	2015-05-25 20:46:36.000000000 +0000
@@ -37,3 +37,5 @@
 <!ENTITY separateProfileMode.label        "Permitir a &brandShortName; y Firefox ejecutarse al mismo tiempo">
 <!ENTITY useFirefoxSync.label             "Consejo: Esto usa perfiles separados. Use Sync para compartir datos entre ellos.">
 <!ENTITY getStarted.label                 "Empezar a usar Sync…">
+
+<!ENTITY e10sEnabled.label                "Activar &brandShortName; multiproceso">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/preferences/preferences.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/preferences/preferences.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/preferences/preferences.properties	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/preferences/preferences.properties	2015-05-25 20:46:36.000000000 +0000
@@ -62,7 +62,6 @@
 actualDiskCacheSizeCalculated=Calculando tamaño de la caché de contenido web…
 actualAppCacheSize = Su caché de aplicaciones está usando actualmente %1$S %2$S de espacio en disco
 updateAutoDesktop.label=Instalar automáticamente actualizaciones de %S para escritorio
-updateAutoDesktop.accessKey=A
 syncUnlink.title = ¿Desea desvincular su dispositivo?
 syncUnlink.label = Este dispositivo no estará más asociado con su cuenta de Sync. Todos sus datos personales, tanto en este dispositivo como en su cuenta de Sync permanecerán intactos.
 syncUnlinkConfirm.label = Desvincular
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd	2015-05-25 20:46:36.000000000 +0000
@@ -2,17 +2,21 @@
    - License, v. 2.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 - Don't translate the contents of the <span id="malware_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
+
 <!ENTITY safeb.palm.accept.label "¡Sácame de aquí!">
 <!ENTITY safeb.palm.decline.label "Ignorar esta advertencia">
 <!ENTITY safeb.palm.notforgery.label2 "No es un sitio fraudulento…">
 <!ENTITY safeb.palm.reportPage.label "¿Por qué fue bloqueado este sitio?">
 
 <!ENTITY safeb.blocked.malwarePage.title "¡Sospecha de sitio malicioso!">
-<!-- Localization note (safeb.blocked.malware.shortDesc) - Please don't translate the contents of the <span id="malware_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
-<!ENTITY safeb.blocked.malwarePage.shortDesc "Este sitio web en <span id='malware_sitename'/> ha sido reportado como un sitio malicioso y ha sido bloqueado basado en sus preferencias de seguridad.">
+<!ENTITY safeb.blocked.malwarePage.shortDesc "Este sitio web en <span id='malware_sitename'/> ha sido reportado como un sitio malicioso y ha sido bloqueado en base a sus preferencias de seguridad.">
 <!ENTITY safeb.blocked.malwarePage.longDesc "<p>Los sitios maliciosos tratan de instalar programas que roban información privada, utilizan su computador para atacar otros o dañan su sistema.</p><p>Algunos sitios maliciosos distribuyen intencionalmente software dañino, pero muchos son utilizados sin el conocimiento o permiso de sus dueños.</p>">
 
+<!ENTITY safeb.blocked.unwantedPage.title "¡Sitio sospechoso de software indeseable!">
+<!ENTITY safeb.blocked.unwantedPage.shortDesc "Este sitio web en <span id='unwanted_sitename'/> ha sido reportado como un sitio que contiene software no deseado y ha sido bloqueado en base a sus preferencias de seguridad.">
+<!ENTITY safeb.blocked.unwantedPage.longDesc "<p>Las páginas de software no deseado intentan instalar software que puede ser engañoso y afectar su sistema de formas inesperadas.</p>">
+
 <!ENTITY safeb.blocked.phishingPage.title "¡Sitio sospechoso de fraude!">
-<!-- Localization note (safeb.blocked.phishing.shortDesc) - Please don't translate the contents of the <span id="phishing_sitename"/> tag. It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
-<!ENTITY safeb.blocked.phishingPage.shortDesc "Este sitio web en <span id='phishing_sitename'/> ha sido informado como un sitio fraudulento y ha sido bloqueado basado en sus preferencias de seguridad.">
+<!ENTITY safeb.blocked.phishingPage.shortDesc "Este sitio web en <span id='phishing_sitename'/> ha sido informado como un sitio fraudulento y ha sido bloqueado en base a sus preferencias de seguridad.">
 <!ENTITY safeb.blocked.phishingPage.longDesc "<p>Los sitios fraudulentos están diseñados para engañarlo para que revele información personal o financiera imitando fuentes en las que confía.</p><p>Ingresando cualquier información en esta página web puede resultar en robo de identidad o algún otro fraude.</p>">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/syncProgress.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/syncProgress.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/syncProgress.dtd	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/syncProgress.dtd	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-    %brandDTD;
-<!-- These strings are used in the sync progress upload page -->
-
-<!ENTITY syncProgress.pageTitle    "Su primera sincronización">
-<!ENTITY syncProgress.textBlurb    "Sus datos están siendo cifrados y subidos en segundo plano. Puede cerrar esta pestaña y continuar usando &brandShortName;.">
-<!ENTITY syncProgress.closeButton  "Cerrar">
-<!ENTITY syncProgress.logoAltText  "Logo de &brandShortName;">
-<!ENTITY syncProgress.diffText     "&brandShortName; ahora sincronizará automáticamente en segundo plano.  Puede cerrar esta pestaña y continuar usando &brandShortName;.">
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/syncSetup.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/syncSetup.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/browser/syncSetup.dtd	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/browser/syncSetup.dtd	2015-05-25 20:46:36.000000000 +0000
@@ -25,8 +25,6 @@
 <!ENTITY setup.choosePassword.accesskey "P">
 <!ENTITY setup.confirmPassword.label "Confirmar contraseña">
 <!ENTITY setup.confirmPassword.accesskey "m">
-<!ENTITY setup.setupMetro.label     "Sincronizar con &brandShortName; estilo Windows 8">
-<!ENTITY setup.setupMetro.accesskey "S">
 <!ENTITY setup.tosAgree1.label "Acepto los">
 <!ENTITY setup.tosAgree1.accesskey "a">
 <!ENTITY setup.tosLink.label "Terminos del servicio">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/overrides/appstrings.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/overrides/appstrings.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/overrides/appstrings.properties	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/overrides/appstrings.properties	2015-05-25 20:46:36.000000000 +0000
@@ -27,7 +27,8 @@
 externalProtocolUnknown = <Desconocido>
 externalProtocolChkMsg = Recordar mi elección para todos los enlaces de este tipo.
 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.
+malwareBlocked = El sitio en %S ha sido identificado como un sitio atacante y ha sido bloqueado en base a sus preferencias de seguridad.
+unwantedBlocked=El sitio en %S ha sido reportado por entregar software indeseado y ha sido bloqueado en base a 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.
 cspBlocked=Esta página tiene una política de seguridad de contenido que previene sea cargada de esta manera.
 corruptedContentError = La página que está intentando ver no puede ser mostrada porque se detectó un error en la transmisión de los datos.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/overrides/netError.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/overrides/netError.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/chrome/overrides/netError.dtd	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/chrome/overrides/netError.dtd	2015-05-25 20:46:36.000000000 +0000
@@ -112,7 +112,7 @@
 <!ENTITY nssBadCert.title "Falló la conexión segura">
 <!ENTITY nssBadCert.longDesc2 "
 <ul>
-  <li>Esto peude ser un problema con la configuración del servidor, o puede ser que alguien esté intentando suplantar el servidor.</li>
+  <li>Esto puede ser un problema con la configuración del servidor, o puede ser que alguien esté intentando suplantar el servidor.</li>
   <li>Si usted se ha conectado correctarmente a este servidor en el pasado, el error puede ser temporal, y usted puede intentar nuevamente después.</li>
 </ul>
 ">
@@ -128,7 +128,12 @@
 <p>Sitios de ataque intentan instalar programas que roban información privada, usan su computador para atacar a otros, o dañan su sistema.</p>
 <p>Los dueños de sitios web que creen que su sitio ha sido reportado como un sitio de ataque por error debieran <a href='http://www.stopbadware.org/home/reviewinfo' >solicitar una revisión</a>.</p>
 ">
-<!ENTITY phishingBlocked.title "¡Sitio web sospechoso de suplantación!">
+
+<!ENTITY unwantedBlocked.title "¡Sitio sospechoso de software indeseable!">
+<!ENTITY unwantedBlocked.longDesc "
+<p>Las páginas de software indeseable intentan instalar software que puede ser engañoso y afectar su sistema de formas inesperadas.</p>
+">
+<!ENTITY phishingBlocked.title "¡Sitio sospechoso de suplantación!">
 <!ENTITY phishingBlocked.longDesc "
 <p>Ingresar cualquier dato personal en esta página puede resultar en un robo de identidad u otro fraude.</p>
 <p>Este tipo de web falsas son usadas en estafas conocidas como ataques phishing, en los que páginas fraudulentas y correos son usados para imitar fuentes en que usted confía.</p>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/profile/bookmarks.inc firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/profile/bookmarks.inc
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/browser/profile/bookmarks.inc	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/browser/profile/bookmarks.inc	2015-05-25 20:46:36.000000000 +0000
@@ -7,7 +7,6 @@
 #define bookmarks_title Marcadores
 #define bookmarks_heading Marcadores
 
-
 #define bookmarks_toolbarfolder Barra de herramientas de la carpeta de Marcadores
 #define bookmarks_toolbarfolder_description Agregar los marcadores a esta carpeta para verlos en la barra de herramientas de Marcadores
 
@@ -35,9 +34,4 @@
 # link title for http://en-US.www.mozilla.com/en-US/firefox/about/
 #define firefox_about Acerca de nosotros
 
-# LOCALIZATION NOTE (firefox_feedback):
-# link title for browser feedback page
-# currently used by Metro only: https://input.mozilla.org/feedback/metrofirefox
-#define firefox_feedback Enviar opinión
-
 #unfilter emptyLines
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/dom/chrome/appstrings.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/dom/chrome/appstrings.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/dom/chrome/appstrings.properties	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/dom/chrome/appstrings.properties	2015-05-25 20:46:37.000000000 +0000
@@ -27,7 +27,8 @@
 externalProtocolUnknown = <Desconocido>
 externalProtocolChkMsg = Recordar mi elección para todos los enlaces de este tipo.
 externalProtocolLaunchBtn = Lanzar aplicación
-malwareBlocked = El sitio web %S ha sido reportado como un sitio malicioso y fue bloqueado basado en sus preferencias de seguridad.
+malwareBlocked = El sitio web %S ha sido reportado como un sitio malicioso y ha sido bloqueado en base a sus preferencias de seguridad.
+unwantedBlocked=El sitio en %S ha sido reportado por entregar software indeseado y ha sido bloqueado en base a 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.
 cspBlocked=Esta página tiene una política de seguridad de contenido que previene sea cargada de esta manera.
 corruptedContentError = La página que está tratando de ver no puede mostrarse porque se detectó un error en la transmisión de los datos.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/dom/chrome/netError.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/dom/chrome/netError.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/dom/chrome/netError.dtd	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/dom/chrome/netError.dtd	2015-05-25 20:46:36.000000000 +0000
@@ -59,9 +59,13 @@
 <p>Los sitios maliciosos intentan instalar programas que roban su información privada, utilizan su computador parar atacar otros o dañar su sistema.</p>
 <p>Los dueños de sitios web que crean que su sitio ha sido reportado como un sitio de ataque por error pueden <a href='http://www.stopbadware.org/home/reviewinfo' >solicitar una revisión</a>.</p>
 ">
+<!ENTITY unwantedBlocked.title "¡Sitio sospechoso de software indeseable!">
+<!ENTITY unwantedBlocked.longDesc "
+<p>Las páginas de software indeseable intentan instalar software que puede ser engañoso y afectar su sistema de formas inesperadas.</p>
+">
 <!ENTITY phishingBlocked.title "¡Sospecha de sitio web fraudulento!">
 <!ENTITY phishingBlocked.longDesc "
-<p>Ingresar cualquier dato personal en este sitio peude resultar en un robo de identidad u otro fraude.</p>
+<p>Ingresar cualquier dato personal en este sitio puede resultar en un robo de identidad u otro fraude.</p>
 <p>Esta clase de sitios falsificados son usados en estafas conocidas como ataques de phishing, en el cual los sitios Web fraudulentos y e-mails son usados para imitar sitios en los que usted confia.</p>
 ">
 <!ENTITY cspBlocked.title "Bloqueado por la política de seguridad de contenido">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/toolkit/chrome/global/aboutServiceWorkers.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/toolkit/chrome/global/aboutServiceWorkers.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/toolkit/chrome/global/aboutServiceWorkers.properties	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/toolkit/chrome/global/aboutServiceWorkers.properties	2015-05-25 20:46:36.000000000 +0000
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 title = Origen: %S
-b2gtitle = Firefox OS AppID %S - InBrowserElement %S
+b2gtitle =  %1$S Application ID %2$S - InBrowserElement %3$S
 scope = Alcance:
 scriptSpec = Especificaciones del Script:
 
@@ -23,3 +23,5 @@
 
 # LOCALIZATION NODE the term "Service Worker" should not translated.
 unregisterError = Falló el desregistrar este Service Worker.
+
+pushEndpoint = Punto final del empuje:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/toolkit/chrome/global/devtools/gclicommands.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/toolkit/chrome/global/devtools/gclicommands.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/toolkit/chrome/global/devtools/gclicommands.properties	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/toolkit/chrome/global/devtools/gclicommands.properties	2015-05-25 20:46:37.000000000 +0000
@@ -0,0 +1,358 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+helpDesc = Obtenga ayuda sobre los comandos disponibles
+helpAvailable = Comandos disponibles
+notAvailableInE10S=El comando '%1$S' no está disponible en el modo multiproceso (E10S)
+consoleDesc = Comandos para controlar la consola
+consoleManual = Filtrar, limpiar y cerrar la consola web
+consoleclearDesc = Limpiar la consola
+screenshotDesc = Guardar una imagen de la página
+screenshotManual = Guardar imagen PNG de la ventana visible completa (opcionalmente después de un retraso)
+screenshotFilenameDesc = Nombre del archivo de destino
+screenshotFilenameManual = El nombre del archivo (debe tener una extención '.png') al cual se escribirá la captura de pantalla.
+screenshotClipboardDesc = ¿Copiar captura de pantalla al portapapeles? (verdadero/falso)
+screenshotClipboardManual = Verdadero si desea copiar la captura de pantalla en vez de guardarla a un archivo.
+screenshotChromeDesc2=¿Capturar ventana chrome de %1$S? (verdadero/falso)
+screenshotChromeManual2=Verdadero si usted quiere tomar una captura de pantalla de la ventana de %1$S mas que de la ventana de contenido de la página web.
+screenshotGroupOptions = Opciones
+screenshotDelayDesc = Retraso (segundos)
+screenshotDelayManual = El tiempo a esperar (en segundos) antes de que una captura sea tomada)
+screenshotFullPageDesc = ¿Página web entera? (verdadero/falso)
+screenshotFullPageManual = Verdadero si la captura de pantalla debiera también incluir partes del sitio web que quedan fuera de los margenes visibles.
+screenshotSelectorChromeConflict = la opción del selector no está soportada cuando la opción chrome es verdadera
+screenshotGeneratedFilename = Captura del %1$S a las %2$S
+screenshotErrorSavingToFile = Error al guardar a
+screenshotSavedToFile = Guardado a
+screenshotErrorCopying = Ocurrio un error al copiar al portapapeles
+screenshotCopied = Copiado al portapapeles.
+screenshotTooltip=Toma una captura de la página completa
+highlightDesc=Destacar nodos
+highlightManual=Destacar nodos que coincidan con un selector en la página
+highlightSelectorDesc=Selector CSS
+highlightSelectorManual=El selector CSS usado para buscar coincidencia de nodos en la página
+highlightOptionsDesc=Opciones
+highlightHideGuidesDesc=Ocultar guías
+highlightHideGuidesManual=Ocultar las guías alrededor del nodo destacado
+highlightShowInfoBarDesc=Mostrar la barra informativa del nodo
+highlightShowInfoBarManual=Mostrar la barra informativa sobre el nodo destacado (la barra informativa muestra el nombre de la etiqueta, atributos y dimensión)
+highlightShowAllDesc=Mostrar todas las coincidencias
+highlightShowAllManual=Si demasiados nodos coinciden con el selector, solo los primeros 100 serán mostrados para evitar ralentizar mucho la página. Use esta opción para mostrar todas las coincidencias en su lugar
+highlightRegionDesc=Región del modelo de caja
+highlightRegionManual=Que región de modelo de caja debiera ser destacada: 'content', 'padding', 'border' o 'margin'
+highlightFillDesc=Estilo de relleno
+highlightFillManual=Rellenar el estilo de relleno predeterminado de la región con un color personalizado
+highlightKeepDesc=Mantener destacadores existentes
+highlightKeepManual=Por defecto, los destacadores existentes son ocultados al ejecutar el comando, salvo que esta opción esté marcada
+highlightOutputConfirm2=%1$S nodo destacado;%1$S nodos destacados
+highlightOutputMaxReached=%1$S nodos coincidieron, pero solo %2$S nodos fueron destacados. Use '--showall' para mostrar todos
+unhighlightDesc=Quitar destacado a todos los nodos
+unhighlightManual=Quitar destacado a todos los nodos previamente destacados con el comando 'highlight'
+restartBrowserDesc=Reiniciar %1$S
+restartBrowserNocacheDesc=Desactiva la carga de contenido desde la caché al reiniciar
+restartBrowserRequestCancelled=Solicitud de reinicio cancelada por el usuario.
+restartBrowserRestarting=Reiniciando %1$S…
+inspectDesc = Inspeccionar un nodo
+inspectManual = Investigar las dimensiones y propiedades de un elemento usando un selector CSS para abrir el resaltador de DOM
+inspectNodeDesc = Selector CSS
+inspectNodeManual = Un selector CSS para usar con Document.querySelector que identifica un solo elemento
+eyedropperDesc=Tomar un color de la página
+eyedropperManual=Abre un panel que agranda un área de la página para inspeccionar pixeles y copiar los valores de color
+eyedropperTooltip=Toma un color de la página
+tiltDesc = Visualizar la página en 3D
+tiltManual = Investigar la relación entre varias partes de una página web y sus ancestros en un entorno 3D
+tiltOpenDesc = Abrir la vista del Inspector 3D
+tiltOpenManual = Inicializar el inspector 3D de la página y opcionalmente resaltar el nodo usando un selector CSS
+tiltToggleTooltip=Vista 3D
+tiltTranslateDesc = Mover la malla de la página
+tiltTranslateManual = Incrementar la traslación de la malla de la página web en una determinada dirección
+tiltTranslateXDesc = X (píxeles)
+tiltTranslateXManual = La cantidad en píxeles para trasladar la malla de la página web a lo largo del eje X
+tiltTranslateYDesc = Y (píxeles)
+tiltTranslateYManual = La cantidad en píxeles para trasladar la malla de la página web a lo largo del eje Y
+tiltRotateDesc = Rotar la malla de la página web
+tiltRotateManual = Incrementar la rotación de la malla de la página web en una determinada dirección
+tiltRotateXDesc = X (grados)
+tiltRotateXManual = La cantidad en grados para rotar la malla de la página web a lo largo del eje X
+tiltRotateYDesc = Y (grados)
+tiltRotateYManual = La cantidad en grados para rotar la malla de la página web a lo largo del eje Y
+tiltRotateZDesc = Z (grados)
+tiltRotateZManual = La cantidad en grados para rotar la malla de la página web a lo largo del eje Z
+tiltZoomDesc = Acercar o alejar la malla de la página web
+tiltZoomManual = Incrementar el movimiento de la malla de la página web en una cierta dirección a lo largo del eje Z
+tiltZoomAmountDesc = Tamaño (píxeles)
+tiltZoomAmountManual = La cantidad en píxeles para trasladar la malla de la página web a lo largo del eje Z
+tiltResetDesc = Restablecer la traslación, rotación y el tamaño
+tiltResetManual = Restablece cualquier transformación aplicada a la matriz de la malla que modela la visión de la página web
+tiltCloseDesc = Cerrar la visualización si está abierta
+tiltCloseManual = Cerrar la visualización y volver al Inspector por defecto
+debuggerClosed=El depurador debe ser abierto antes de usar este comando
+debuggerStopped=El depurador debe ser abierto antes de configurar puntos de ruptura
+breakDesc = Administrar puntos de ruptura
+breakManual = Comandos a listar, añadir y eliminar puntos de ruptura
+breaklistDesc = Mostrar puntos de ruptura conocidos
+breaklistNone = No hay puntos de ruptura configurados
+breaklistOutRemove=Eliminar
+breakaddAdded = Punto de ruptura añadido
+breakaddFailed = No se puede configurar el punto de ruptura: %S
+breakaddDesc = Agregar punto de ruptura
+breakaddManual = Tipos de puntos de ruptura soportados: línea
+breakaddlineDesc = Agregar un punto de ruptura en línea
+breakaddlineFileDesc = JS archivo URI
+breakaddlineLineDesc = Número de línea
+breakdelDesc = Eliminar un punto de ruptura
+breakdelBreakidDesc = Índice de punto de ruptura
+breakdelRemoved = Punto de ruptura eliminado
+dbgDesc = Administrar el depurador
+dbgManual = Comandos para interrumpir o resumir el hilo principal, entrar, salir y saltar sobre las líneas de código
+dbgOpen = Abrir el depurador
+dbgClose = Cerrar el depurador
+dbgInterrupt = Pausar el hilo principal
+dbgContinue = Reanudar el hilo principal, y continuar la ejecución que sigue al punto de ruptura, hasta que se encuentre el siguiente punto o se termine el script.
+dbgStepDesc = Administrar pasos
+dbgStepManual = Comandos para entrar, salir y saltar sobre líneas de código
+dbgStepOverDesc = Ejecuta la sentencia actual y después se detiene en la siguiente sentencia. Si la sentencia actual es una llamada a una función, entonces el depurador ejecuta la función completa y se detiene en la  sentencia que sigue a la llamada a la función
+dbgStepInDesc = Ejecuta la sentencia actual y después se detiene en la siguiente sentencia. Si la sentencia actual es una llamada a una función, entonces el depurador entra en dicha función; en cualquier otro caso, se detiene en la siguiente sentencia
+dbgStepOutDesc = Sale de la función actual a un nivel superior si la función está anidada. Si está en el cuerpo principal, el script es ejecutado hasta el final o hasta el siguiente punto de ruptura. Las sentencias saltadas son ejecutadas, pero no se introduce en su interior
+dbgListSourcesDesc=Listar las URL de origen cargadas en el depurador
+dbgBlackBoxDesc=Marcar con negro las cajas de fuentes en el depurador
+dbgBlackBoxSourceDesc=Una fuente específica a marcar con negro
+dbgBlackBoxGlobDesc=Marcar con negro todas las fuentes que coincidan con este generalizador (por ejemplo: "*.min.js")
+dbgBlackBoxInvertDesc=Invertir coincidencias, de forma tal que se marquen con negro todas las fuentes que no están provistas o no coinciden con el patrón general otorgado.
+dbgBlackBoxEmptyDesc=(No se marcaron fuentes con negro)
+dbgBlackBoxNonEmptyDesc=Las siguientes fuentes fueron marcadas con negro:
+dbgBlackBoxErrorDesc=Error al marcar con negro:
+dbgUnBlackBoxDesc=Dejar de marcar con negro las fuentes en el depurador
+dbgUnBlackBoxSourceDesc=Una fuente específica a dejar de marcar con negro
+dbgUnBlackBoxGlobDesc=Dejar de marcar con negro todas las fuentes que coinciden on este generalizador (por ejemplo: "*.min.js")
+dbgUnBlackBoxEmptyDesc=(No se dejó de marcar con negro ninguna fuente)
+dbgUnBlackBoxNonEmptyDesc=Se dejó de marcar con negro las siguientes fuentes:
+dbgUnBlackBoxErrorDesc=Error al dejar de marcar con negro:
+dbgUnBlackBoxInvertDesc=Invertir coincidencias, de forma tal que se dejen de marcar con negro todas las fuentes que no están provistas o no coinciden con el patrón general otorgado.
+consolecloseDesc = Cerrar la consola
+consoleopenDesc = Abrir la consola
+editDesc = Modificar un recurso de la página
+editManual2 = Editar uno de los recursos que es parte de esta página
+editResourceDesc = URL a editar
+editLineToJumpToDesc = Línea a saltar
+resizePageDesc = Redimencionar la página
+resizePageArgWidthDesc = Ancho en píxeles
+resizePageArgHeightDesc = Ancho en píxelesAlto en píxeles
+resizeModeOnDesc = Entrar en la vista de diseño adaptable
+resizeModeOffDesc = Salir de la vista de diseño adaptable
+resizeModeToggleDesc = Cambiar la vista de diseño adaptable
+resizeModeToggleTooltip=Modo de diseño adaptable
+resizeModeToDesc = Alterar tamaño de página
+resizeModeDesc = Controlar el modo de vista de diseño adaptable
+resizeModeManual2=Los sitios web con diseño adaptable responden a su entorno, por lo que se ven bien en una pantalla móvil, una pantalla de cine y todas las que este entremedio. El modo de diseño adaptable le permite probar fácilmente una variedad de tamaños de página en %1$S sin necesidad de redimencionar su navegador completo.
+cmdDesc = Manipular los comandos
+cmdRefreshDesc = Volver a leer el directorio mozcmd
+cmdStatus3=Comandos de '%1$S' cargados
+cmdSetdirDesc=Configura un directorio mozcmd
+cmdSetdirManual2=Un directorio 'mozcmd' es una manera fácil de crear nuevos comandos personalizados. Para más información vea la <a href="https://developer.mozilla.org/docs/Tools/GCLI/Customization">documentación de MDN</a>.
+cmdSetdirDirectoryDesc=Directorio que contiene archivos .mozcmd
+addonDesc = Manipular complementos
+addonListDesc = Enlistar complementos instalados
+addonListTypeDesc = Seleccionar un tipo de complemento
+addonListDictionaryHeading = Los siguientes diccionarios están actualmente instalados:
+addonListExtensionHeading = Las siguientes extensiones están actualmente instaladas:
+addonListLocaleHeading = Las siguientes localizaciones están actualmente instaladas:
+addonListPluginHeading = Los siguientes complementos están actualmente instalados:
+addonListThemeHeading = Los siguientes temas están actualmente isntalados:
+addonListAllHeading = Los siguientes complementos están actualmente instalados:
+addonListUnknownHeading = Los siguientes complementos del tipo seleccionado están actualmente instalados:
+addonListOutEnable=Activar
+addonListOutDisable=Desactivar
+addonPending=pendiente
+addonPendingEnable=activar
+addonPendingDisable=desactivar
+addonPendingUninstall=desinstalar
+addonPendingInstall=instalar
+addonPendingUpgrade=actualizar
+addonNameDesc = El nombre del complemento
+addonNoneOfType = No hay complementos de ese tipo instalados.
+addonEnableDesc = Activar el complemento especificado
+addonAlreadyEnabled = %S ya está activado.
+addonEnabled = %S activado.
+addonDisableDesc = Desactivar el complemento especificado
+addonAlreadyDisabled = %S ya está desactivado.
+addonDisabled = %S desactivado.
+exportDesc = Exportar recursos
+exportHtmlDesc = Exportar HTML desde página
+pagemodDesc = Hacer cambios a la página
+pagemodReplaceDesc = Buscar y reemplazar en los elementos de la página
+pagemodReplaceSearchDesc = Qué buscar
+pagemodReplaceReplaceDesc = Cadena de reemplazo
+pagemodReplaceIgnoreCaseDesc = Realizar búsqueda sin sensibilidad por mayúsculas
+pagemodReplaceRootDesc = Selector CSS de la raíz de la búsqueda
+pagemodReplaceSelectorDesc = Selector CSS para concordar en la búsqueda
+pagemodReplaceAttributesDesc = Expresión regular para buscar atributo
+pagemodReplaceAttrOnlyDesc = Restringir la búsqueda a los atributos
+pagemodReplaceContentOnlyDesc = Restringir búsqueda a los nodos de texto
+pagemodReplaceResult = Elementos coincidentes con el selector: %1$S. Reemplaza el texto en los nodos: %2$S. Reemplaza en los atributos: %3$S.
+pagemodRemoveDesc = Eliminar elementos y atributos de la página
+pagemodRemoveElementDesc = Eliminar elementos de la página
+pagemodRemoveElementSearchDesc = Selector CSS que especifica los elementos a eliminar
+pagemodRemoveElementRootDesc = Selector CSS que especifica la raíz de la búsqueda
+pagemodRemoveElementStripOnlyDesc = Eliminar elemento, pero dejar el contenido
+pagemodRemoveElementIfEmptyOnlyDesc = Eliminar solo elementos vacíos
+pagemodRemoveElementResultMatchedAndRemovedElements = Elementos coincidentes con el selector: %1$S. Elementos eliminados: %2$S.
+pagemodRemoveAttributeDesc = Eliminar atributos coincidentes
+pagemodRemoveAttributeSearchAttributesDesc = Expresión regular que especifica los atributos a eliminar
+pagemodRemoveAttributeSearchElementsDesc = Selector CSS de los elementos a incluir
+pagemodRemoveAttributeRootDesc = Selector CSS de la raíz de la búsqueda
+pagemodRemoveAttributeIgnoreCaseDesc = Realizar búsqueda sin sensibilidad por mayúsculas
+pagemodRemoveAttributeResult = Elementos coincidentes con el selector: %1$S. Atributos eliminados: %2$S.
+toolsDesc2=Hackear las Herramientas de desarrollador de %1$S
+toolsManual2=Varios comandos relacionados a hackear directamente en las herramientas de %1$S.
+toolsSrcdirDesc=Cargar herramientas desde un repositorio de mozilla-central
+toolsSrcdirNotFound=%1$s no existe o no es un repositorio de mozilla-central.
+toolsSrcdirReloaded=Herramientas cargadas desde %1$s.
+toolsSrcdirManual2=Cargar kas herramientas de desarrollador de %1$S desde un repositorio de mozilla-central completo.
+toolsSrcdirDir=Un repositorio de mozilla-central
+toolsBuiltinDesc=Usar las herramientas integradas
+toolsBuiltinManual=Use las herramientas integradas, por sobre cualquier comando srcdir previo.
+toolsBuiltinReloaded=Herramientas integradas cargadas.
+toolsReloadDesc=Recargar las herramientas de desarrollador
+toolsReloaded2=Herramientas descargadas.
+cookieDesc = Mostrar y modificar cookies
+cookieManual = Comandos para listar, crear, eliminar y alterar cookies para el dominio actual.
+cookieListDesc = Mostrar cookies
+cookieListManual = Mostrar una lista de cookies relevantes a la página actual.
+cookieListOutHost=Servidor:
+cookieListOutPath=Dirección:
+cookieListOutExpires=Expira:
+cookieListOutAttributes=Attributes:
+cookieListOutNone=Ninguno
+cookieListOutSession=Al salir del navegador (sesión)
+cookieListOutNonePage=No se encontraron cookies para esta página
+cookieListOutNoneHost=No se encontraron cookies para el servidor %1$S
+cookieListOutEdit = Editar
+cookieListOutRemove = RemoverEliminar
+cookieRemoveDesc = Eliminar una cookie
+cookieRemoveManual = Eliminar una cookie, según su clave
+cookieRemoveKeyDesc = La clave de la cookie a eliminar
+cookieSetDesc = Configurar una cookie
+cookieSetManual = Configurar una cookie especificando su clave, su valor y opcionalmente uno o más de los siguientes atributos: expires (max-age en segundos o la fecha de expiración en formato GMTString), path, domain, secure
+cookieSetKeyDesc = La clave de la cookie a configurar
+cookieSetValueDesc = El valor de la cookie a configurar
+cookieSetOptionsDesc = Opciones
+cookieSetPathDesc = La ubicación de la cookie a configurar
+cookieSetDomainDesc = El dominio de la cookie a configurar
+cookieSetSecureDesc = Transmitida solo bajo https
+cookieSetHttpOnlyDesc=No accesible desde el script del lado del cliente
+cookieSetSessionDesc=Solo válido para el tiempo de vida de la sesión del navegador
+cookieSetExpiresDesc=La fecha de expiración de la cookie (RFC2822 citado o fecha ISO 8601)
+jsbDesc = Embellecedor de JavaScript
+jsbUrlDesc = La URL del archivo JS a embellecer
+jsbIndentSizeDesc = Tamaño de la sangría en carácteres
+jsbIndentSizeManual = El número de carácteres usado para la sangría de cada línea
+jsbIndentCharDesc = Los carácteres usados para la sangría de cada línea
+jsbIndentCharManual = Los carácteres usados para la sangría de cada línea. Las opciones posibles son espacio o tabulación.
+jsbDoNotPreserveNewlinesDesc = No preservar quiebres de línea
+jsbPreserveNewlinesManual = Debieran preservarse los quiebres de línea existentes
+jsbPreserveMaxNewlinesDesc = Quiebres de línea consecutivos máximo
+jsbPreserveMaxNewlinesManual = El número máximo de quiebres de líneas consecutivos a preservar
+jsbJslintHappyDesc = ¿Imponer modo jslint-stricter?
+jsbJslintHappyManual = Al ser ajustado como verdadero, el modo jslint-stricter es impuesto
+jsbBraceStyleDesc2= Seleccione el estilo de codificación de las llaves
+jsbBraceStyleManual2=Seleccione el estilo de codificación de las llaves: colapsar - pone llaves en la misma línea que las declaraciones de control; expandir - pone llaves en la línea propia (estilo Allman / ANSI); expandir al final - pone llaves de término en la línea propia; expandir de forma estricta - pone llaves en la línea propia incluso si separará su código.
+jsbNoSpaceBeforeConditionalDesc = No hay espacio antes de las sentencias condicionales
+jsbUnescapeStringsDesc = ¿De-escapar los carácteres \\xNN?
+jsbUnescapeStringsManual = ¿Debieran ser los carácteres en las cadenas codificadas en la notación \\xNN ser de-escapadas?
+jsbInvalidURL = Por favor, ingrese una URL válida
+jsbOptionsDesc = Opciones
+calllogDesc = Comandos para manipular registro de llamadas a funciones
+calllogStartDesc = Iniciar registro de llamadas a funciones a la consola
+calllogStartReply = Registro de llamadas iniciado.
+calllogStopDesc = Detener registro de llamadas a funciones
+calllogStopNoLogging = No hay ningún registro de llamadas activo en este momento
+calllogStopReply = Registro de llamadas detenido. Contextos activos: %1$S.
+calllogChromeStartDesc = Iniciar registro de llamadas a funciones para código crome a la consola
+calllogChromeSourceTypeDesc = Objeto global, URI JSM o JS desde el cual obtener un objeto global
+calllogChromeSourceTypeManual = El objeto global, URI de un JSM, o un JS para ejecutar en una ventana chrome desde el cual obtener un objeto global
+calllogChromeStartReply = Registro de llamadas iniciado.
+calllogChromeStopDesc = Detener registro de llamadas a funciones
+calllogChromeStopNoLogging = No hay registros de llamadas para código chrome activos en este momento
+calllogChromeStopReply = Registro de llamadas detenido. Contextos activos: %1$S.
+callLogChromeAnonFunction = <anónima>
+callLogChromeMethodCall = Llamada al método
+callLogChromeInvalidJSM = ¡JSM inválido!
+callLogChromeVarNotFoundContent = Variable no encontrada en la ventana de contenido.
+callLogChromeVarNotFoundChrome = Variable no encontrada en la ventana de chrome
+callLogChromeEvalException = El código JavaScript evaluado lanzó la siguiente excepción
+callLogChromeEvalNeedsObject = El código JavaScript debería evaluar a un objeto cuyas llamadas a métodos sean registradas. Por ejemplo: "({a1: function() {this.a2()}, a2:function() {}};"
+scratchpadOpenTooltip=Borrador
+paintflashingDesc=Destacar área pintada
+paintflashingOnDesc = Activar destacador de pintado
+paintflashingOffDesc = Desactivar destacador de pintado
+paintflashingChromeDesc=cuadros chrome
+paintflashingManual=Dibujar áreas repintadas en diferentes colores
+paintflashingTooltip=Destacar área pintada
+paintflashingToggleDesc=Cambiar estado del destacador
+splitconsoleTooltip=Cambiar división de consola
+appCacheDesc=Utilidades de cache de la aplicación
+appCacheValidateDesc=Validar manifiesto de caché
+appCacheValidateManual=Encontrar problemas relacionados a un manifiesto de caché y el archivo al que se refiere
+appCacheValidateUriDesc=URI a revisar
+appCacheValidatedSuccessfully=Appcache validado exitosamente.
+appCacheClearDesc=Limpiar entradas de la caché de la aplicación
+appCacheClearManual=Limpiar una o más entradas de la caché de la aplicación
+appCacheClearCleared=Entradas limpiadas exitosamente.
+appCacheListDesc=Mostrar una lista de entradas de caché de la aplicación.
+appCacheListManual=Mostrar una lista de todas las entradas de caché de la aplicación. Si el parámetro de busqueda es usado entonces la tabla muestra las entradas que contengan el término de búsqueda.
+appCacheListSearchDesc=Filtrar resultados usando un término de búsqueda.
+appCacheListKey=Clave:
+appCacheListDataSize=Tamaño de datos:
+appCacheListDeviceID=ID de dispositivo:
+appCacheListExpirationTime=Expira:
+appCacheListFetchCount=Contador de obtenciones:
+appCacheListLastFetched=Última obtención:
+appCacheListLastModified=Última modificación:
+appCacheListViewEntry=Ver entrada
+appCacheViewEntryDesc=appCacheViewEntryManual=Abrir una nueva pestaña que contenga la información específica de la entrada de caché.
+appCacheViewEntryManual=Abrir una nueva pestaña que contenga la información de la entrada de caché.
+appCacheViewEntryKey=La clave para la entrada a mostrar.
+profilerDesc=Administrar perfilador
+profilerManual=Comandos para iniciar o detener un perfilador de JavaScript
+profilerOpenDesc=Abrir el perfilador
+profilerCloseDesc=Cerrar el perfilador
+profilerStartDesc=Empezar a perfilar
+profilerStartManual=Nombre de un perfilador que desee iniciar.
+profilerStopDesc=Dejar de perfilar
+profilerStopManual=Nombre de un perfilador que desee detener.
+profilerListDesc=Listar todos los perfiles
+profilerShowDesc=Mostrar perfil individual
+profilerShowManual=Nombre de un perfilador.
+profilerAlreadyStarted2=El perfil ya ha sido iniciado
+profilerNotFound=Perfilador no encontrado
+profilerNotStarted3=El perfilador aún no ha sido iniciado. Use 'iniciar perfil' para empezar a perfilar
+profilerStarted2=Grabando…
+profilerStopped=Detenido…
+profilerNotReady=Para que este comando funcione usted necesita abrir primero el perfilador
+listenDesc=Abrir un puerto de depuración remoto
+listenManual2=%1$S puede permitir depuración remota sobre una conexión TCP/IP connection. Por razones de seguridad esto está desactivado por defecto, pero puede ser activado usando este comando.
+listenPortDesc=El puerto TCP sobre el que escuchar
+listenDisabledOutput=Escuchar está desactivado por la preferencia devtools.debugger.remote-enabled
+listenInitOutput=Escuchando en los puertos %1$S
+listenNoInitOutput=DebuggerServer no iniciado
+mediaDesc=emulación de tipo de medio CSS
+mediaEmulateDesc=Emular un tipo de medio CSS especificado
+mediaEmulateManual=Ver el documento como si fuera renderizado en un dispositivo que soporte el tipo de medio dado, con las regas de CSS relevantes aplicadas.
+mediaEmulateType=El tipo de medio a emular
+mediaResetDesc=Detener emulación de tipo de medio CSS
+injectDesc=Inyecta librerías comunes a la página
+injectManual2=Inyecta librerías comunes al contenido de la página que también pueden ser accedidas desde la consola.
+injectLibraryDesc=Selecciona la librería a inyectar o ingresa una URI de script válido a inyectar
+injectLoaded=%1$S cargado
+injectFailed=Falló la carga de %1$S - URI inválida
+folderDesc=Abrir carpetas
+folderOpenDesc=Abrir ubicación de la carpeta
+folderOpenDir=Ubicación de la carpeta
+folderOpenProfileDesc=Abrir carpeta del perfil
+folderInvalidPath=Por favor, ingresa una ubicación válida
+folderOpenDirResult=%1$S abierto
+rulersDesc=Cambiar reglas para la página
+rulersManual=Cambiar la regla horizontal y la vertical para la página actual
+rulersTooltip=Cambiar reglas para la página
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/toolkit/chrome/global/devtools/gcli.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/toolkit/chrome/global/devtools/gcli.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/toolkit/chrome/global/devtools/gcli.properties	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/toolkit/chrome/global/devtools/gcli.properties	2015-05-25 20:46:37.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/.
+
+canonDescNone = (Sin descripción)
+canonDefaultGroupName=Opciones
+canonProxyDesc=Ejecutar un comando en %S
+canonProxyManual=Un conjunto de comandos que son ejecutados en un sistema remoto. El sistema remoto es alcanzado mediante %S
+canonProxyExists=Ya hay un comando llamado '%S'
+cliEvalJavascript = Ingrese JavaScript directamente
+cliUnusedArg = Demasiados argumentos
+cliOptions = Opciones disponibles
+cliUnknownCommand=Comando inválido
+cliIncompleteParam=Valor requerido para '%1$S'.
+fileErrNotExists='%1$S' no existe
+fileErrExists='%1$S' ya existe
+fileErrIsNotFile='%1$S' no es un archivo
+fileErrIsNotDirectory='%1$S' no es un directorio
+fileErrDoesntMatch='%1$S' no coincide con '%2$S'
+fieldMenuMore = Más coincidencias, siga intentando
+jstypeParseScope = Alcance perdido
+jstypeParseMissing = No se encuentra la propiedad '%S'
+jstypeBeginSyntax = Error de sintaxis
+jstypeBeginUnterm = Cadena literal sin terminar
+jstypeParseError = Error
+typesNumberNan = No se puede convertir "%S" a un número.
+typesNumberMax = %1$S es mayor que el máximo permitido: %2$S.
+typesNumberMin = %1$S es menor que el mínimo permitido: %2$S.
+typesNumberNotInt2=No se puede convertir "%S" a un entero.
+typesDateNan=No se puede convertir "%S" a una fecha.
+typesDateMax=%1$S es posterior al máximo permitido: %2$S.
+typesDateMin=%1$S es anterior al mínimo permitido: %2$S.
+typesSelectionNomatch = No se puede usar '%S'.
+nodeParseSyntax = Error de sintaxis en consulta CSS
+nodeParseMultiple = Demasiadas coincidencias (%S)
+nodeParseNone = Sin coincidencia
+helpDesc = Obtenga ayuda sobre los comandos disponibles
+helpManual = Provee ayuda, ya sea sobre un comando específico (si se ingresó una cadena a buscar y hay una coincidencia exacta) o sobre los comandos disponibles (si no se ingresó una cadena a buscar o si no hay coincidencia exacta).
+helpSearchDesc = Cadena a buscar
+helpSearchManual3 = Cadena a buscar para reducir las órdenes que son mostradas. Las expresiones regulares no están admitidas.
+helpManSynopsis = Sinopsis
+helpManNone = Ninguno
+helpListAll = Comandos disponibles:
+helpListPrefix = Comandos que comienzan con '%1$S':
+helpListNone = No hay comandos que comiencen con '%1$S'
+helpManRequired = requerido
+helpManOptional = opcional
+helpManDefault=opcional, predeterminado=%1$S
+helpIntro=GCLI es un experimento para crear una línea de comandos altamente usable para desarrolladores web.
+subCommands = Sub-comandos
+commandParseError=Error de análisis de línea de comandos
+contextDesc=Concentrarse en un grupo de comandos
+contextManual=Configura un prefijo predeterminado para comandos futuros. Por ejemplo 'context git' le permitirá escribir 'commit' en vez de 'git commit'.
+contextPrefixDesc=El prefijo del comando
+contextNotParentError=No se puede usar '%1$S' como un prefijo porque no es un comando padre.
+contextReply=Usar %1$S como un prefijo de comando
+contextEmptyReply=El prefijo del comando no está ajustado
+connectDesc=Comandos proxy al servidor
+connectManual=Conectar al servidor, creando versiones locales de los comandos en el servidor. Los comandos remotos inicialmente tienen un prefijo para distinguirlos de los comandos locales (pero vea el contexto del comando para ignorar esto).
+connectPrefixDesc=Prefijo padre para comandos importados
+connectMethodDesc=El método de conexión
+connectUrlDesc=La URL a la cual conectar
+connectDupReply=La conexión llamada %S ya existe.
+connectReply=Añadidos %S comandos.
+disconnectDesc2=Desconectar del servidor
+disconnectManual2=Desconectar del servidor actualmente conectado para la ejecución de comandos
+disconnectPrefixDesc=Prefijo padre para comandos importados
+disconnectReply=Eliminados %S comandos.
+globalDesc=Cambiar el JS global
+globalWindowDesc=La nueva ventana/global
+globalOutput=El JS global es ahora %S
+clearDesc=Limpiar los datos de salida
+langDesc=Ingresar comandos en diferentes idiomas
+langOutput=Ahora estás usando %S
+prefDesc = Comandos para controlar opciones
+prefManual = Órdenes para mostrar y alterar preferencias, tanto para el GCLI como para el entorno cercano
+prefListDesc = Mostrar opciones disponibles
+prefListManual = Mostrar una lista de preferencias, opcionalmente filtradas usando el parámetro 'search'
+prefListSearchDesc = Filtrar la lista de preferencias mostradas
+prefListSearchManual = Buscar por la cadena dada en la lista de preferencias disponibles
+prefShowDesc = Mostrar el valor del ajuste
+prefShowManual = Mostrar el valor de una preferencia dada
+prefShowSettingValue=%1$S: %2$S
+prefShowSettingDesc = Ajuste a mostrar
+prefShowSettingManual = El nombre del ajuste a mostrar
+prefSetDesc = Modificar un ajuste
+prefSetManual = Modificar preferencias definidas por el entorno
+prefSetSettingDesc = Ajuste a modificar
+prefSetSettingManual = El nombre del ajuste a modificar.
+prefSetValueDesc = El nuevo valor para el ajuste
+prefSetValueManual = El nuevo valor para el ajuste especificado
+prefResetDesc = Reiniciar un ajuste
+prefResetManual = Reiniciar el valor de una cadena al predeterminado del sistema
+prefResetSettingDesc = Ajuste a reiniciar
+prefResetSettingManual = El nombre del ajuste a reiniciar al valor predeterminado del sistema
+prefOutputFilter = Filtro
+prefOutputName = Nombre
+prefOutputValue = Valor
+introDesc = Mostrar el mensaje de apertura
+introManual = Volver a mostrar el mensaje que se enseña a los usuarios hasta que pulsan en el botón '¡Lo tengo!'
+introTextCommands = Para una lista de comandos escriba
+introTextOpening3=GCLI es un experimento para crear una línea de comando altamente usable para desarrolladores web.
+introTextKeys2=, o para mostrar/ocultar consejos sobre los comandos presione
+introTextF1Escape = F1/Escape
+introTextGo = ¡Lo tengo!
+hideIntroDesc = Mostrar el mensaje inicial de bienvenida
+eagerHelperDesc = Cuán rápidas son las descripciones emergentes
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/toolkit/chrome/mozapps/extensions/extensions.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/toolkit/chrome/mozapps/extensions/extensions.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-05-25 20:46:36.000000000 +0000
@@ -170,3 +170,13 @@
 <!ENTITY experiment.info.changetelemetry.accesskey "T">
 
 <!ENTITY setting.learnmore "Aprender más…">
+
+<!ENTITY disabledUnsigned.heading "Algunos complementos han sido desactivados">
+<!ENTITY disabledUnsigned.description.start "Los siguientes complementos no han sido verificados para ser usados en &brandShortName;. Puede ">
+<!ENTITY disabledUnsigned.description.findAddonsLink "buscar reemplazos">
+<!ENTITY disabledUnsigned.description.end " o solicitarle al desarrollador que los haga verificar.">
+<!ENTITY disabledUnsigned.learnMore "Aprenda más sobre nuestros esfuerzos para ayudarle a mantenerse seguro en línea.">
+<!ENTITY disabledUnsigned.devInfo.start "Los desarrolladores interesados en tener sus complementos verificados pueden continuar leyendo nuestro ">
+<!ENTITY disabledUnsigned.devInfo.linkToManual "manual">
+<!ENTITY disabledUnsigned.devInfo.end ".">
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/toolkit/chrome/mozapps/extensions/extensions.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/toolkit/chrome/mozapps/extensions/extensions.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/toolkit/chrome/mozapps/extensions/extensions.properties	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/toolkit/chrome/mozapps/extensions/extensions.properties	2015-05-25 20:46:36.000000000 +0000
@@ -10,6 +10,9 @@
 numReviews = #1 reseña;#1 reseñas
 dateUpdated = Actualizado %S
 notification.incompatible = %1$S es incompatible con %2$S %3$S.
+notification.unsignedAndDisabled=%1$S no pudo ser verificado para su uso en %2$S y ha sido desactivado.
+notification.unsigned=%1$S no pudo ser verificado para su uso en %2$S. Proceda con precaución.
+notification.unsigned.link=Más información
 notification.blocked = %1$S ha sido deshabilitado debido a problemas de seguridad o estabilidad.
 notification.blocked.link = Más información
 notification.softblocked = Se sabe que %1$S causa problemas de seguridad o estabilidad
@@ -43,6 +46,9 @@
 installFailed = Error al instalar
 installCancelled = Instalación cancelada
 details.notification.incompatible = %1$S es incompatible con %2$S %3$S.
+details.notification.unsignedAndDisabled=%1$S no pudo ser verificado para su uso en %2$S y ha sido desactivado.
+details.notification.unsigned=%1$S no pudo ser verificado para su uso en %2$S. Proceda con precaución.
+details.notification.unsigned.link=Más información
 details.notification.blocked = %1$S ha sido deshabilitado debido a problemas de seguridad o estabilidad.
 details.notification.blocked.link = Más información
 details.notification.softblocked = Se sabe que %1$S causa problemas de seguridad o estabilidad.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/toolkit/chrome/places/places.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/toolkit/chrome/places/places.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/toolkit/chrome/places/places.properties	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/toolkit/chrome/places/places.properties	2015-05-25 20:46:37.000000000 +0000
@@ -15,5 +15,4 @@
 finduri-AgeInMonths-isgreater = Anterior a %S meses
 finduri-MonthYear = %1$S de %2$S
 localhost = (archivos locales)
-backupFileSizeText=%1$S %2$S
-windows8TouchTitle=Windows 8 táctil
\ No newline at end of file
+backupFileSizeText=%1$S %2$S
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/webapprt/webapprt/overrides/appstrings.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/webapprt/webapprt/overrides/appstrings.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-CL/webapprt/webapprt/overrides/appstrings.properties	2015-05-13 18:07:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-CL/webapprt/webapprt/overrides/appstrings.properties	2015-05-25 20:46:37.000000000 +0000
@@ -27,7 +27,8 @@
 externalProtocolUnknown=<Desconocido>
 externalProtocolChkMsg=Recordar mi selección para todos los enlaces de este tipo.
 externalProtocolLaunchBtn=Lanzar aplicación
-malwareBlocked=El sitio en %S ha sido reportado como sitio atacante y ha sido bloqueado basándose en sus preferencias de seguridad.
+malwareBlocked=El sitio en %S ha sido reportado como sitio atacante y ha sido bloqueado en base a sus preferencias de seguridad.
+unwantedBlocked=El sitio en %S ha sido reportado por entregar software indeseado y ha sido bloqueado en base a sus preferencias de seguridad.
 phishingBlocked=El sitio web en %S ha sido reportado como falsificación diseñada para engañar a los usuarios para compartir su información personal o financiera.
 cspBlocked=Esta aplicación intentó acceder a un recurso que tiene una política de seguridad de contenido que previene sea cargado de esta manera.
 corruptedContentError=La aplicación no puede continuar la carga debido a que se detectó un error en la transmisión de datos.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/chrome/browser/browser.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/chrome/browser/browser.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/chrome/browser/browser.properties	2015-05-13 18:07:22.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/chrome/browser/browser.properties	2015-05-25 20:46:44.000000000 +0000
@@ -39,18 +39,18 @@
 addonsInstalledNeedsRestart = #1 será instalado después de reiniciar #3.;#2 complementos serán instalados después de reiniciar #3.
 addonInstallRestartButton = Reiniciar ahora
 addonInstallRestartButton.accesskey = R
-addonError-1 = El complemento no ha podido ser descargado por un error con la conexión en #2.
-addonError-2 = El complemento de #2 no ha podido ser instalado porque no concuerda con el complemento #3 esperado.
-addonError-3 = El complemento descargado desde #2 no ha podido ser instalado porque parece que está corrupto.
-addonError-4 = #1 no ha podido ser instalado porque #3 no puede modificar el archivo necesario.
-addonError-5 = #3 ha evitado que este sitio instale un complemento sin verificar.
-addonLocalError-1 = Este complemento no ha podido ser instalado por un error en el sistema de ficheros.
-addonLocalError-2 = Este complemento no ha podido ser instalado porque no concuerda con la extensión #3 esperada.
-addonLocalError-3 = Este complemento no ha podido ser instalado porque parece que está corrupto.
-addonLocalError-4 = #1 no ha podido ser instalado porque #3 no puede modificar el archivo necesario.
-addonLocalError-5 = Este complemento no se ha podido instalar porque no ha sido verificado.
-addonErrorIncompatible = #1 no ha podido ser instalado porque no es compatible con #3 #4.
-addonErrorBlocklisted = #1 no ha podido ser instalado porque tiene un alto riesgo de causar problemas de estabilidad o seguridad.
+addonInstallError-1 = El complemento no ha podido ser descargado por un error con la conexión.
+addonInstallError-2 = Este complemento no ha podido ser instalado porque no concuerda con el complemento %1$S esperado.
+addonInstallError-3 = El complemento descargado desde este sitio no ha podido ser instalado porque parece que está corrupto.
+addonInstallError-4 = %2$S no ha podido ser instalado porque %1$S no puede modificar el archivo necesario.
+addonInstallError-5 = %1$S ha evitado que este sitio instala un complemento no verificado.
+addonLocalInstallError-1 = Este complemento no ha podido ser instalado por un error en el sistema de ficheros.
+addonLocalInstallError-2 = Este complemento no ha podido ser instalado porque no concuerda con el complemento %1$S esperado.
+addonLocalInstallError-3 = Este complemento no ha podido ser instalado porque parece que está corrupto.
+addonLocalInstallError-4 = %2$S no ha podido ser instalado porque %1$S no puede modificar el archivo necesario.
+addonLocalInstallError-5 = Este complemento no ha podido ser instalado porque no ha sido verificado.
+addonInstallErrorIncompatible = %3$S no ha podido ser instalado porque no es compatible con %1$S %2$S.
+addonInstallErrorBlocklisted = %S no ha podido ser instalado porque tiene un alto riesgo de causar problemas de estabilidad o seguridad.
 unsignedAddonsDisabled.message = Uno o más complementos instalados no se pueden verificar y han sido desactivados.
 unsignedAddonsDisabled.learnMore.label = Saber más
 unsignedAddonsDisabled.learnMore.accesskey = S
@@ -189,30 +189,30 @@
 geolocation.alwaysShareLocation.accesskey = A
 geolocation.neverShareLocation = Nunca compartir la ubicación
 geolocation.neverShareLocation.accesskey = N
-geolocation.shareWithSite = ¿Le gustaría compartir su ubicación con %S?
-geolocation.shareWithFile = ¿Le gustaría compartir su ubicación con el fichero %S?
+geolocation.shareWithSite2 = ¿Le gustaría compartir su ubicación con este sitio?
+geolocation.shareWithFile2 = ¿Le gustaría compartir su ubicación con este archivo?
 webNotifications.showForSession = Mostrar para esta sesión
 webNotifications.showForSession.accesskey = s
 webNotifications.alwaysShow = Mostrar siempre notificaciones
 webNotifications.alwaysShow.accesskey = A
 webNotifications.neverShow = Bloquear siempre notificaciones
 webNotifications.neverShow.accesskey = N
-webNotifications.showFromSite = ¿Le gustaría mostrar notificaciones desde %S?
+webNotifications.showFromSite2 = ¿Desea mostrar notificaciones de este sitio?
 push.allowForSession = Permitir en esta sesión
 push.allowForSession.accesskey = P
 push.alwaysAllow = Permitir siempre notificaciones de servidor
 push.alwaysAllow.accesskey = s
 push.alwaysBlock = Bloquear siempre notificaciones del servidor (push)
 push.alwaysBlock.accesskey = B
-push.enablePush = ¿Desea permitir notificaciones de servidor para %S?
+push.enablePush2 = ¿Desea permitir notificaciones push en este sitio?
 pointerLock.allow2 = Ocultar el puntero
 pointerLock.allow2.accesskey = t
 pointerLock.alwaysAllow = Siempre permitir la ocultación
 pointerLock.alwaysAllow.accesskey = A
 pointerLock.neverAllow = Nunca permitir la ocultación
 pointerLock.neverAllow.accesskey = N
-pointerLock.title2 = ¿Le gustaría permitir que el puntero se ocultara en %S?
-pointerLock.autoLock.title2 = %S ocultará el puntero.
+pointerLock.title3 = ¿Desea permitir que se oculte el puntero en este sitio?
+pointerLock.autoLock.title3 = Este sitio ocultará el puntero.
 safebrowsing.getMeOutOfHereButton.label = ¡Sácame de aquí!
 safebrowsing.getMeOutOfHereButton.accessKey = S
 safebrowsing.reportedWebForgery = ¡Este sitio es una falsificación de otra web!
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/chrome/browser/devtools/debugger.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/chrome/browser/devtools/debugger.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/chrome/browser/devtools/debugger.properties	2015-05-13 18:07:22.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/chrome/browser/devtools/debugger.properties	2015-05-25 20:46:44.000000000 +0000
@@ -75,7 +75,7 @@
 breakpointMenuItem.disableAll = Desactivar todos los puntos de ruptura
 breakpointMenuItem.deleteAll = Eliminar todos los puntos de ruptura
 loadingText = Cargando…
-errorLoadingText = Error al cargar el código fuente:\n
+errorLoadingText2 = Error al cargar esta URL: %S
 addWatchExpressionText = Añadir expresión de vigilancia
 addWatchExpressionButton = Observar
 emptyVariablesText = No hay variables para mostrar
@@ -104,4 +104,4 @@
 variablesViewOptimizedOut = (optimizado externamente)
 variablesViewUninitialized = (no inicializado)
 variablesViewMissingArgs = (no disponible)
-evalGroupLabel = Fuentes evaluados
+anonymousSourcesLabel = Fuentes desconocidas
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/chrome/browser/devtools/font-inspector.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/chrome/browser/devtools/font-inspector.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/chrome/browser/devtools/font-inspector.dtd	2015-05-13 18:07:22.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/chrome/browser/devtools/font-inspector.dtd	2015-05-25 20:46:44.000000000 +0000
@@ -7,3 +7,4 @@
 <!ENTITY usedAs "Usada como: ">
 <!ENTITY system "sistema">
 <!ENTITY remote "Eliminar">
+<!ENTITY previewHint "Previsualizar texto">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/chrome/browser/devtools/inspector.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/chrome/browser/devtools/inspector.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/chrome/browser/devtools/inspector.properties	2015-05-13 18:07:22.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/chrome/browser/devtools/inspector.properties	2015-05-25 20:46:44.000000000 +0000
@@ -24,7 +24,7 @@
 docsTooltip.loadDocsError = No se ha podido cargar la página de documentos.
 inspector.collapsePane = Colapsar panel
 inspector.expandPane = Expandir panel
-inspector.searchResultsCount = %S de %S
+inspector.searchResultsCount2 = %1$S of %2$S
 inspector.searchResultsNone = Sin coincidencias
 inspector.menu.openUrlInNewTab.label = Abrir enlace en una pestaña nueva
 inspector.menu.copyUrlToClipboard.label = Copiar dirección del enlace
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/chrome/browser/devtools/jsonview.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/chrome/browser/devtools/jsonview.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/chrome/browser/devtools/jsonview.properties	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/chrome/browser/devtools/jsonview.properties	2015-05-25 20:46:44.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/.
+
+jsonViewer.tab.JSON = JSON
+jsonViewer.tab.RawData = Datos sin procesar
+jsonViewer.tab.Headers = Cabeceras
+jsonViewer.responseHeaders = Cabeceras de la respuesta
+jsonViewer.requestHeaders = Cabeceras de la petición
+jsonViewer.Save = Guardar
+jsonViewer.Copy = Copiar
+jsonViewer.PrettyPrint = Adaptar para impresión
+jsonViewer.reps.more = más…
+jsonViewer.filterJSON = Filtrar JSON
+jsonViewer.reps.reference = Recorrer referencias
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/chrome/browser/devtools/netmonitor.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/chrome/browser/devtools/netmonitor.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/chrome/browser/devtools/netmonitor.dtd	2015-05-13 18:07:22.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/chrome/browser/devtools/netmonitor.dtd	2015-05-25 20:46:44.000000000 +0000
@@ -66,6 +66,8 @@
 <!ENTITY netmonitorUI.context.copyUrl.accesskey "L">
 <!ENTITY netmonitorUI.context.copyUrlParams "Copiar parámetros de la URL">
 <!ENTITY netmonitorUI.context.copyUrlParams.accesskey "R">
+<!ENTITY netmonitorUI.context.copyPostData "Copiar datos POST">
+<!ENTITY netmonitorUI.context.copyPostData.accesskey "P">
 <!ENTITY netmonitorUI.context.copyAsCurl "Copiar como cURL">
 <!ENTITY netmonitorUI.context.copyAsCurl.accesskey "C">
 <!ENTITY netmonitorUI.context.copyRequestHeaders "Copiar cabeceras de solicitud">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/chrome/browser/devtools/styleinspector.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/chrome/browser/devtools/styleinspector.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/chrome/browser/devtools/styleinspector.dtd	2015-05-13 18:07:22.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/chrome/browser/devtools/styleinspector.dtd	2015-05-25 20:46:44.000000000 +0000
@@ -4,6 +4,7 @@
 
 <!ENTITY browserStylesLabel "Ver estilos">
 <!ENTITY filterStylesPlaceholder "Filtrar estilos">
+<!ENTITY addRuleButtonTooltip "Añadir regla nueva">
 <!ENTITY selectedElementLabel "Elemento seleccionado:">
 <!ENTITY noPropertiesFound "No se han encontrado propiedades CSS.">
 <!ENTITY computedViewTitle "Computada">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/chrome/browser/devtools/timeline.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/chrome/browser/devtools/timeline.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/chrome/browser/devtools/timeline.properties	2015-05-13 18:07:22.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/chrome/browser/devtools/timeline.properties	2015-05-25 20:46:44.000000000 +0000
@@ -16,6 +16,7 @@
 timeline.label.domevent = Evento DOM
 timeline.label.consoleTime = Consola
 timeline.label.garbageCollection = Evento GC
+timeline.label.timestamp = Marca de tiempo
 graphs.memory = MB
 timeline.markerDetailFormat = %1$S (%2$S)
 timeline.markerDetail.start = Inicio:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/chrome/browser/devtools/webide.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/chrome/browser/devtools/webide.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/chrome/browser/devtools/webide.properties	2015-05-13 18:07:22.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/chrome/browser/devtools/webide.properties	2015-05-25 20:46:44.000000000 +0000
@@ -27,6 +27,7 @@
 error_cantConnectToApp = No se puede conectar con la aplicación: %1$S
 error_cantFetchAddonsJSON = No se puede obtener la lista de complementos: %S
 error_appProjectsLoadFailed = No se puede cargar la lista de proyectos. Esto puede suceder si ha usado este perfil con una versión más reciente de Firefox.
+error_folderCreationFailed = No se puede crear la carpeta del proyecto en el directorio seleccionado.
 addons_stable = estable
 addons_unstable = inestable
 addons_simulator_label = Firefox OS %1$S Simulator (%2$S)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/chrome/browser/loop/loop.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/chrome/browser/loop/loop.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/chrome/browser/loop/loop.properties	2015-05-13 18:07:22.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/chrome/browser/loop/loop.properties	2015-05-25 20:46:44.000000000 +0000
@@ -7,9 +7,9 @@
 rooms_tab_button_tooltip = Conversaciones
 contacts_tab_button_tooltip = Contactos
 sign_in_again_title_line_one = Vuelva a conectarse
-sign_in_again_title_line_two = para continuar usando Firefox Hello
+sign_in_again_title_line_two2 = para continuar usando {{clientShortName2}}
 sign_in_again_button = Conectarse
-sign_in_again_use_as_guest_button = Usar Hello como invitado
+sign_in_again_use_as_guest_button2 = Usar {{clientSuperShortname}} como invitado
 first_time_experience_title = {{clientShortname}} — Unirse a la conversión
 first_time_experience_button_label = Comenzar
 invite_header_text = Invite a alguien a unirse a usted.
@@ -168,7 +168,6 @@
 infobar_button_gotit_accesskey = L
 infobar_menuitem_dontshowagain_label = No volver a mostrar
 infobar_menuitem_dontshowagain_accesskey = N
-context_offer_label = Hablemos sobre esta página
 context_inroom_label = Hablemos sobre:
 context_edit_activate_label = Hablar sobre "{{title}}"
 context_edit_name_placeholder = Nombre de la conversación
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/chrome/browser/newTab.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/chrome/browser/newTab.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/chrome/browser/newTab.dtd	2015-05-13 18:07:22.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/chrome/browser/newTab.dtd	2015-05-25 20:46:44.000000000 +0000
@@ -2,11 +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/. -->
 
-<!ENTITY newtab.pageTitle "Nueva pestaña">
+<!ENTITY newtab.pageTitle "Pestaña nueva">
 <!ENTITY newtab.customize.classic "Mostrar sus sitios preferidos">
 <!ENTITY newtab.customize.cog.enhanced "Incluir sitios sugeridos">
-<!ENTITY newtab.customize.cog.title "Controles de pestañas nuevas">
-<!ENTITY newtab.customize.cog.learn "Saber más sobre las pestañas nuevas">
+<!ENTITY newtab.customize.cog.title "Controles de Nueva pestaña">
+<!ENTITY newtab.customize.cog.learn "Saber más sobre Nueva pestaña">
 <!ENTITY newtab.customize.title "Personalizar su página Nueva pestaña">
 <!ENTITY newtab.customize.suggested "Mostrar sitios sugeridos y sus sitios preferidos">
 <!ENTITY newtab.customize.topsites "Mostrar sus sitios preferidos">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/chrome/browser/newTab.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/chrome/browser/newTab.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/chrome/browser/newTab.properties	2015-05-13 18:07:22.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/chrome/browser/newTab.properties	2015-05-25 20:46:44.000000000 +0000
@@ -12,8 +12,24 @@
 newtab.sponsored.explain2 = Le sugerimos este sitio en nombre de un socio de Mozilla. Puede eliminarlo en cualquier momento haciendo clic en el botón %1$S. %2$S
 newtab.suggested.explain = Este sitio se lo sugiere Mozilla. Puede eliminarlo en cualquier momento pulsando el botón %1$S. %2$S
 newtab.enhanced.explain = Un socio de Mozilla ha mejorado esta miniatura visualmente sustituyendo la captura de pantalla. Puede desactivar las miniaturas mejoradas haciendo clic en el botón %1$S para acceder a las preferencias. %2$S
-newtab.intro.paragraph1 = Al abrir una pestaña nueva, verá miniaturas de los sitios que visita con frecuencia, junto con miniaturas que creemos que pueden interesarle. Algunas de éstas pueden estar patrocinadas por socios de Mozilla. Siempre le indicaremos qué miniaturas son patrocinadas. %1$S
 newtab.intro.paragraph2 = Con el fin de prestarle este servicio, Mozilla recopila y utiliza cierta información analítica sobre cómo utiliza las miniaturas, conforme a nuestro %1$S.
-newtab.intro.paragraph3 = Puede desactivar las miniaturas haciendo clic en el botón %1$S para acceder a las preferencias.
+newtab.intro.paragraph4.2 = Puede desactivar este servicio pulsando en el botón de la rueda (%1$S) y desmarcando "Incluir sitios sugeridos" en el menú %2$S.
+newtab.intro.paragraph5 = La pestaña nueva mostrará los sitios que visita con más frecuencia, junto con sitios que pensamos que pueden interesarle. Para comenzar, verá varios sitios de Mozilla.
+newtab.intro.paragraph6 = Puede %1$S o %2$S cualquier sitio usando los controles disponibles en el rollover.
+newtab.intro.paragraph6.remove = eliminar
+newtab.intro.paragraph6.pin = fijar
+newtab.intro.paragraph7 = Algunos de los sitios que verá pueden haber sido sugeridos por Mozilla y pueden estar patrocinados por un socio de Mozilla. Siempre le indicaremos qué sitios están patrocinados.
+newtab.intro.paragraph8 = %1$S solo mostrará sitios que se acerquen lo más posible a sus intereses en la web. %2$S
+newtab.intro.paragraph9 = Ahora, cuando abra una pestaña nueva, también verá sitios que creemos que podrían resultarle interesantes.
+newtab.intro.controls = Controles de Nueva pestaña
 newtab.learn.link = Saber más…
-newtab.privacy.link = Aviso sobre privacidad
+newtab.privacy.link = aviso sobre privacidad
+newtab.learn.link2 = Más sobre Nueva pestaña
+newtab.privacy.link2 = Sobre su privacidad
+newtab.intro.header.welcome = ¡Bienvenido a la nueva pestaña de %1$S!
+newtab.intro.header.update = ¡La nueva pestaña ha sido actualizada!
+newtab.intro.skip = Saltarse esto
+newtab.intro.continue = Continuar visita
+newtab.intro.back = Anterior
+newtab.intro.next = Siguiente
+newtab.intro.gotit = ¡Lo tengo!
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/pdfviewer/viewer.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/pdfviewer/viewer.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/browser/pdfviewer/viewer.properties	2015-05-13 18:07:22.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/browser/pdfviewer/viewer.properties	2015-05-25 20:46:44.000000000 +0000
@@ -77,9 +77,9 @@
 find_next.title = Encontrar la siguiente aparición de esta frase
 find_next_label = Siguiente
 find_highlight = Resaltar todos
-find_match_case_label = Coincidencia de mayús./minús.
+find_match_case_label = Concordar mayús./minús.
 find_reached_top = Se alcanzó el inicio del documento, se continúa desde el final
-find_reached_bottom = Se alcanzó el final del documento, se continúa desde el inicio
+find_reached_bottom = Fin del documento alcanzado, se continúa desde arriba
 find_not_found = Frase no encontrada
 error_more_info = Más información
 error_less_info = Menos información
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/dom/chrome/dom/dom.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/dom/chrome/dom/dom.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/dom/chrome/dom/dom.properties	2015-05-13 18:07:23.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/dom/chrome/dom/dom.properties	2015-05-25 20:46:44.000000000 +0000
@@ -69,7 +69,6 @@
 FullScreenDeniedSubDocFullScreen = La solicitud de pantalla completa ha sido denegada porque un subdocumento del documento que lo ha solicitado ya está en pantalla completa.
 FullScreenDeniedNotDescendant = La solicitud de pantalla completa ha sido denegada porque el elemento que lo ha solicitado no es un descendiente del elemento actual de pantalla completa.
 FullScreenDeniedNotFocusedTab = La solicitud de pantalla completa ha sido denegada porque el elemento que la ha realizado no está en la pestaña activa en este momento.
-FullScreenDeniedContentOnly = La solicitud de pantalla completa ha sido denegada porque el elemento que lo solicitó está en el directorio chrome y la API de pantalla completa está configurada sólo para contenido.
 RemovedFullScreenElement = Se ha salido del modo de pantalla completa porque el elemento en pantalla completa ha sido eliminado del documento.
 FocusedWindowedPluginWhileFullScreen = Se ha abandonado la pantalla completa porque un plugin en ventana ha recibido el foco.
 HTMLSyncXHRWarning = El análisis HTML en XMLHttpRequest no está admitido en el modo síncrono.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/security/manager/chrome/pipnss/nsserrors.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/security/manager/chrome/pipnss/nsserrors.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/security/manager/chrome/pipnss/nsserrors.properties	2015-05-13 18:07:22.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/security/manager/chrome/pipnss/nsserrors.properties	2015-05-25 20:46:44.000000000 +0000
@@ -318,3 +318,4 @@
 MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE = El servidor ha presentado un certificado que aún no es válido.
 MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE = Se ha usado un certificado que aún no es válido para emitir el certificado del servidor.
 MOZILLA_PKIX_ERROR_SIGNATURE_ALGORITHM_MISMATCH = El algoritmo de firma en el campo de firma del certificado no concuerda con el algoritmo en su campo signatureAlgorithm.
+MOZILLA_PKIX_ERROR_OCSP_RESPONSE_FOR_CERT_MISSING = La respuesta OCSP no incluye un estado para el certificado que se está verificando.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/toolkit/chrome/global/aboutTelemetry.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/toolkit/chrome/global/aboutTelemetry.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/toolkit/chrome/global/aboutTelemetry.dtd	2015-05-13 18:07:22.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/toolkit/chrome/global/aboutTelemetry.dtd	2015-05-25 20:46:44.000000000 +0000
@@ -3,14 +3,53 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY aboutTelemetry.pageTitle "Datos de Telemetry">
-<!ENTITY aboutTelemetry.telemetryEnabled "
-  Telemetry está <span>activado</span>.
+<!ENTITY aboutTelemetry.changeDataChoices "
+  Cambiar
 ">
-<!ENTITY aboutTelemetry.telemetryDisabled "
-  Telemetry está <span>desactivado</span>.
+<!ENTITY aboutTelemetry.uploadEnabled "
+  El envío de datos de FHR está <span>activado</span>.
+">
+<!ENTITY aboutTelemetry.uploadDisabled "
+  El envío de datos de FHR está <span>desactivado</span>.
+">
+<!ENTITY aboutTelemetry.extendedRecordingEnabled "
+  El registro extendido de Telemetry está <span>activado</span>.
+">
+<!ENTITY aboutTelemetry.extendedRecordingDisabled "
+  El registro extendido de Telemetry está <span>desactivado</span>.
+">
+<!ENTITY aboutTelemetry.pingDataSource "
+Origen de los datos de ping:
+">
+<!ENTITY aboutTelemetry.showCurrentPingData "
+Datos acuales de ping
+">
+<!ENTITY aboutTelemetry.showArchivedPingData "
+Datos archivados de ping
+">
+<!ENTITY aboutTelemetry.showSubsessionData "
+Mostrar datos de subsesión
+">
+<!ENTITY aboutTelemetry.choosePing "
+Elija ping:
+">
+<!ENTITY aboutTelemetry.showNewerPing "
+&lt;&lt; Ping más reciente
+">
+<!ENTITY aboutTelemetry.showOlderPing "
+Ping más antiguo &gt;&gt;
+">
+<!ENTITY aboutTelemetry.archiveWeekHeader "
+Semana
+">
+<!ENTITY aboutTelemetry.archivePingHeader "
+Ping
 ">
 <!ENTITY aboutTelemetry.generalDataSection "
   Datos generales">
+<!ENTITY aboutTelemetry.environmentDataSection "
+  Datos del entorno
+">
 <!ENTITY aboutTelemetry.telemetryLogSection "
   Registro de Telemetry
 ">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/toolkit/chrome/global/aboutTelemetry.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/toolkit/chrome/global/aboutTelemetry.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/toolkit/chrome/global/aboutTelemetry.properties	2015-05-13 18:07:22.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/toolkit/chrome/global/aboutTelemetry.properties	2015-05-25 20:46:44.000000000 +0000
@@ -6,6 +6,8 @@
 generalDataTitle = Datos generales
 generalDataHeadingName = Nombre
 generalDataHeadingValue = Valor
+environmentDataHeadingName = Nombre
+environmentDataHeadingValue = Valor
 telemetryLogTitle = Registro de Telemetry
 telemetryLogHeadingId = Id
 telemetryLogHeadingTimestamp = Fecha y hora
@@ -24,8 +26,6 @@
 histogramAverage = media
 histogramSum = suma
 histogramCopy = Copiar
-disableTelemetry = Desactivar Telemetry
-enableTelemetry = Activar Telemetry
 keysHeader = Propiedad
 valuesHeader = Valor
 addonTableID = ID del complemento
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/toolkit/chrome/global/devtools/gclicommands.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/toolkit/chrome/global/devtools/gclicommands.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/toolkit/chrome/global/devtools/gclicommands.properties	2015-05-13 18:07:22.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/toolkit/chrome/global/devtools/gclicommands.properties	2015-05-25 20:46:44.000000000 +0000
@@ -358,6 +358,14 @@
 folderOpenProfileDesc = Abrir directorio del perfil
 folderInvalidPath = Introduzca una ruta válida
 folderOpenDirResult = %1$S abierto
+securityDesc = Mostrar características de seguridad admitidas
+securityManual = Órdenes para listar y obtener sugerencias sobre las características de seguridad en el dominio.
+securityListDesc = Mostrar características de seguridad
+securityListManual = Mostrar una lista de todas las características de seguridad relevantes de la página actual.
+securityCSPDesc = Mostrar características de seguridad específicas de CSP
+securityCSPManual = Mostrar información sobre la CSP aplicada a la página actual.
+securityCSPRemWildCard = ¿Puede eliminar el comodín(*)?
+securityCSPPotentialXSS = ¡Vulnerabilidad potencial XSS!
 rulersDesc = Alternar reglas en la página
 rulersManual = Alternar las reglas horizontal y vertical en la página actual
 rulersTooltip = Alternar reglas en la página
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/toolkit/chrome/global/devtools/styleinspector.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/toolkit/chrome/global/devtools/styleinspector.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/toolkit/chrome/global/devtools/styleinspector.properties	2015-05-13 18:07:22.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/toolkit/chrome/global/devtools/styleinspector.properties	2015-05-25 20:46:44.000000000 +0000
@@ -27,8 +27,8 @@
 ruleView.contextmenu.showOrigSources.accessKey = M
 ruleView.contextmenu.showMdnDocs = Mostrar documentos de MDN
 ruleView.contextmenu.showMdnDocs.accessKey = D
-ruleView.contextmenu.addRule = Añadir regla
-ruleView.contextmenu.addRule.accessKey = r
+ruleView.contextmenu.addNewRule = Añadir regla nueva
+ruleView.contextmenu.addNewRule.accessKey = e
 computedView.contextmenu.selectAll = Seleccionar todo
 computedView.contextmenu.selectAll.accessKey = a
 computedView.contextmenu.copy = Copiar
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/toolkit/chrome/global/viewSource.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/toolkit/chrome/global/viewSource.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/toolkit/chrome/global/viewSource.properties	2015-05-13 18:07:23.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/toolkit/chrome/global/viewSource.properties	2015-05-25 20:46:44.000000000 +0000
@@ -11,3 +11,6 @@
 statusBarLineCol = Línea %1$S, Columna %2$S
 viewSelectionSourceTitle = Fuente DOM de la selección
 viewMathMLSourceTitle = Fuente DOM de MathML
+context_goToLine_label = Ir a la línea…
+context_wrapLongLines_label = Ajustar líneas largas
+context_highlightSyntax_label = Resaltar sintaxis
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/webapprt/webapprt/overrides/dom.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/webapprt/webapprt/overrides/dom.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/es-ES/webapprt/webapprt/overrides/dom.properties	2015-05-13 18:07:23.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/es-ES/webapprt/webapprt/overrides/dom.properties	2015-05-25 20:46:44.000000000 +0000
@@ -69,7 +69,6 @@
 FullScreenDeniedSubDocFullScreen = La solicitud de pantalla completa ha sido denegada porque un subdocumento del documento que lo ha solicitado ya está en pantalla completa.
 FullScreenDeniedNotDescendant = La solicitud de pantalla completa ha sido denegada porque el elemento que lo ha solicitado no es un descendiente del elemento actual de pantalla completa.
 FullScreenDeniedNotFocusedTab = La solicitud de pantalla completa ha sido denegada porque el elemento que la ha realizado no está en la pestaña activa en este momento.
-FullScreenDeniedContentOnly = La solicitud de pantalla completa ha sido denegada porque el elemento que lo solicitó está en el directorio chrome y la API de pantalla completa está configurada sólo para contenido.
 RemovedFullScreenElement = Se ha salido del modo de pantalla completa porque el elemento en pantalla completa ha sido eliminado del documento.
 FocusedWindowedPluginWhileFullScreen = Se ha abandonado la pantalla completa porque un plugin en ventana ha recibido el foco.
 HTMLSyncXHRWarning = El análisis HTML en XMLHttpRequest no está admitido en el modo síncrono.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/browser/chrome/browser/browser.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/browser/chrome/browser/browser.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/browser/chrome/browser/browser.properties	2015-05-13 18:07:34.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/browser/chrome/browser/browser.properties	2015-05-25 20:47:21.000000000 +0000
@@ -370,8 +370,8 @@
 geolocation.alwaysShareLocation.accesskey=T
 geolocation.neverShareLocation=Ne jamais partager sa localisation
 geolocation.neverShareLocation.accesskey=N
-geolocation.shareWithSite=Voulez-vous partager votre localisation avec %S ?
-geolocation.shareWithFile=Voulez-vous partager votre localisation avec le fichier %S ?
+geolocation.shareWithSite2=Voulez-vous partager votre localisation avec ce site ?
+geolocation.shareWithFile2=Voulez-vous partager votre localisation avec ce fichier ?
 
 webNotifications.showForSession=Afficher pour cette session
 webNotifications.showForSession.accesskey=s
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/browser/chrome/browser/devtools/debugger.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/browser/chrome/browser/devtools/debugger.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/browser/chrome/browser/devtools/debugger.properties	2015-05-13 18:07:34.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/browser/chrome/browser/devtools/debugger.properties	2015-05-25 20:47:21.000000000 +0000
@@ -214,9 +214,9 @@
 # yet.
 loadingText=Chargement…
 
-# LOCALIZATION NOTE (errorLoadingText): The text that is displayed in the debugger
+# LOCALIZATION NOTE (errorLoadingText2): The text that is displayed in the debugger
 # viewer when there is an error loading a file
-errorLoadingText=Erreur lors du chargement de la source :\n
+errorLoadingText2=Erreur lors du chargement de cette URL : %S
 
 # LOCALIZATION NOTE (addWatchExpressionText): The text that is displayed in the
 # watch expressions list to add a new item.
@@ -320,4 +320,4 @@
 variablesViewUninitialized=(non initialisée)
 variablesViewMissingArgs=(indisponible)
 
-evalGroupLabel=Sources « eval »
+anonymousSourcesLabel=Sources anonymes
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/browser/chrome/browser/devtools/inspector.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/browser/chrome/browser/devtools/inspector.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/browser/chrome/browser/devtools/inspector.properties	2015-05-13 18:07:34.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/browser/chrome/browser/devtools/inspector.properties	2015-05-25 20:47:21.000000000 +0000
@@ -74,10 +74,10 @@
 inspector.expandPane=Développer le panneau
 
 # LOCALIZATION NOTE (inspector.searchResultsCount): This is the label that
-# will show up next to the inspector search box showing the current result
-# index alongside the total number of search results.  For example, "3 of 9".
+# will show up next to the inspector search box. %1$S is the current result
+# index and %2$S is the total number of search results. For example: "3 of 9".
 # This won't be visible until the search box is updated in Bug 835896.
-inspector.searchResultsCount=%S sur %S
+inspector.searchResultsCount2=%1$S sur %2$S
 
 # LOCALIZATION NOTE (inspector.searchResultsNone): This is the label that
 # will show up next to the inspector search box when no matches were found
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/browser/chrome/browser/devtools/jsonview.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/browser/chrome/browser/devtools/jsonview.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/browser/chrome/browser/devtools/jsonview.properties	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/browser/chrome/browser/devtools/jsonview.properties	2015-05-25 20:47:21.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/.
+
+# LOCALIZATION NOTE These strings are used in the JSON View tool
+# that is used to inspect application/json document types loaded
+# in the browser.
+
+# LOCALIZATION NOTE The correct localization of this file might be to keep it
+# in English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best documentation
+# on web development on the web.
+
+# LOCALIZATION NOTE (jsonViewer.tab.JSON, jsonViewer.tab.RawData,
+# jsonViewer.tab.Headers): Label for a panel tab.
+jsonViewer.tab.JSON=JSON
+jsonViewer.tab.RawData=Données brutes
+jsonViewer.tab.Headers=En-têtes
+
+# LOCALIZATION NOTE (jsonViewer.responseHeaders, jsonViewer.requestHeaders):
+# Label for header groups within the 'Headers' panel.
+jsonViewer.responseHeaders=En-têtes de réponse
+jsonViewer.requestHeaders=En-têtes de requête
+
+# LOCALIZATION NOTE (jsonViewer.Save): Label for save command
+jsonViewer.Save=Enregistrer
+
+# LOCALIZATION NOTE (jsonViewer.Copy): Label for clipboard copy command
+jsonViewer.Copy=Copier
+
+# LOCALIZATION NOTE (jsonViewer.PrettyPrint): Label for JSON
+# pretty print action button.
+jsonViewer.PrettyPrint=Formater et indenter
+
+# LOCALIZATION NOTE (jsonViewer.reps.more): Label used in arrays
+# that have more items than displayed.
+jsonViewer.reps.more=plus…
+
+# LOCALIZATION NOTE (jsonViewer.filterJSON): Label used in search box
+# at the top right cornder of the JSON Viewer.
+jsonViewer.filterJSON=Filtrer le JSON
+
+# LOCALIZATION NOTE (jsonViewer.reps.reference): Label used for cycle
+# references in an array.
+jsonViewer.reps.reference=Cycle de références
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/browser/chrome/browser/devtools/netmonitor.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/browser/chrome/browser/devtools/netmonitor.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/browser/chrome/browser/devtools/netmonitor.properties	2015-05-13 18:07:34.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/browser/chrome/browser/devtools/netmonitor.properties	2015-05-25 20:47:21.000000000 +0000
@@ -167,7 +167,7 @@
 # This label is displayed in the network table footer providing concise
 # information about all requests. Parameters: #1 is the number of requests,
 # #2 is the size, #3 is the number of seconds.
-networkMenu.summary=Une requête, #2 Ko, #3 s;#1 requêtes, #2 Ko, #3 s
+networkMenu.summary=1 requête – #2 Ko – #3 s;#1 requêtes – #2 Ko – #3 s
 
 # LOCALIZATION NOTE (networkMenu.sizeKB): This is the label displayed
 # in the network menu specifying the size of a request (in kilobytes).
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/browser/chrome/browser/devtools/timeline.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/browser/chrome/browser/devtools/timeline.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/browser/chrome/browser/devtools/timeline.properties	2015-05-13 18:07:34.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/browser/chrome/browser/devtools/timeline.properties	2015-05-25 20:47:21.000000000 +0000
@@ -45,6 +45,7 @@
 timeline.label.domevent=Évènement DOM
 timeline.label.consoleTime=Console
 timeline.label.garbageCollection=Évènement GC
+timeline.label.timestamp=Horodatage
 
 # LOCALIZATION NOTE (graphs.memory):
 # This string is displayed in the memory graph of the Performance tool,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/browser/chrome/browser/loop/loop.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/browser/chrome/browser/loop/loop.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/browser/chrome/browser/loop/loop.properties	2015-05-13 18:07:34.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/browser/chrome/browser/loop/loop.properties	2015-05-25 20:47:21.000000000 +0000
@@ -12,14 +12,18 @@
 rooms_tab_button_tooltip=Conversations
 contacts_tab_button_tooltip=Contacts
 
-## LOCALIZATION_NOTE(sign_in_again_title_line_one, sign_in_again_title_line_two):
+## LOCALIZATION_NOTE(sign_in_again_title_line_one, sign_in_again_title_line_two2):
 ## These are displayed together at the top of the panel when a user is needed to
-## sign-in again. The first "line_one" is slightly bigger font that "line_two",
-## hence the separation.
+## sign-in again. The emphesis is on the first line to get the user to sign-in again,
+## and this is displayed in slightly larger font. Please arrange as necessary for
+## your locale.
+## {{clientShortname2}} will be replaced by the brand name for either string.
 sign_in_again_title_line_one=Veuillez vous connecter à nouveau
-sign_in_again_title_line_two=pour continuer à utiliser Firefox Hello
+sign_in_again_title_line_two2=pour continuer à utiliser {{clientShortname2}}
 sign_in_again_button=Se connecter
-sign_in_again_use_as_guest_button=Utiliser Hello en tant qu'invité
+## LOCALIZATION_NOTE(sign_in_again_use_as_guest_button2): {{clientSuperShortname}}
+## will be replaced by the super short brandname.
+sign_in_again_use_as_guest_button2=Utiliser {{clientSuperShortname}} en tant qu'invité
 
 ## LOCALIZATION_NOTE(first_time_experience.title): clientShortname will be
 ## replaced by the brand name
@@ -357,7 +361,6 @@
 infobar_menuitem_dontshowagain_accesskey=N
 
 # Context in conversation strings
-context_offer_label=Discutons de cette page
 # LOCALIZATION NOTE (context_inroom_label): this string is followed by the
 # title/URL of the website you are having a conversation about, displayed on a
 # separate line. If this structure doesn't work for your locale, you might want
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/browser/chrome/browser/newTab.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/browser/chrome/browser/newTab.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/browser/chrome/browser/newTab.dtd	2015-05-13 18:07:34.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/browser/chrome/browser/newTab.dtd	2015-05-25 20:47:21.000000000 +0000
@@ -6,9 +6,9 @@
 <!ENTITY newtab.pageTitle "Nouvel onglet">
 <!ENTITY newtab.customize.classic "Afficher les sites les plus visités">
 <!ENTITY newtab.customize.cog.enhanced "Inclure les sites suggérés">
-<!ENTITY newtab.customize.cog.title "Contrôles de la page « Nouvel onglet »">
+<!ENTITY newtab.customize.cog.title "Contrôles de la page Nouvel onglet">
 <!ENTITY newtab.customize.cog.learn "En savoir plus sur cette page">
-<!ENTITY newtab.customize.title "Personnaliser la page « Nouvel onglet »">
+<!ENTITY newtab.customize.title "Personnaliser la page Nouvel onglet">
 <!ENTITY newtab.customize.suggested "Afficher les sites les plus visités et ceux suggérés">
 <!ENTITY newtab.customize.topsites "Afficher les sites les plus visités">
 <!ENTITY newtab.customize.blank2 "Afficher une page vide">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/browser/chrome/browser/newTab.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/browser/chrome/browser/newTab.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/browser/chrome/browser/newTab.properties	2015-05-13 18:07:34.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/browser/chrome/browser/newTab.properties	2015-05-25 20:47:21.000000000 +0000
@@ -35,14 +35,39 @@
 # the (X) block icon. %2$S will be replaced by an active link using string
 # newtab.learn.link as text.
 newtab.suggested.explain=Ce site vous est suggéré par Mozilla. Vous pouvez le retirer à tout moment en cliquant sur le bouton %1$S. %2$S
-# LOCALIZATION NOTE(newtab.intro.paragraph1): %1$S will be replaced inline by
-# active link using string newtab.learn.link as text.
-newtab.intro.paragraph1=Lorsque vous ouvrez un nouvel onglet, vous apercevrez des vignettes en provenance des sites que vous visitez le plus souvent, mais aussi des vignettes que nous pensons pouvoir vous intéresser. Certaines peuvent être parrainées par des partenaires de Mozilla. Nous vous indiquerons toujours lesquelles sont parrainées. %1$S
 # LOCALIZATION NOTE(newtab.intro.paragraph2): %1$S will be replaced inline by
 # active link using string newtab.privacy.link as text.
 newtab.intro.paragraph2=Afin d'assurer ce service, Mozilla collecte et utilise certaines informations statistiques liées à votre utilisation des vignettes, conformément à notre %1$S.
-# LOCALIZATION NOTE(newtab.intro.paragraph3): %1$S will be replaced inline by
-# the gear icon used to customize the new tab window.
-newtab.intro.paragraph3=Vous pouvez désactiver à votre convenance la fonctionnalité des vignettes en cliquant sur le bouton %1$S.
+# LOCALIZATION NOTE(newtab.intro.paragraph4): %1$S will be replaced inline by
+# the gear icon used to customize the new tab window. %2$S will be replaced by
+# newtab.intro.controls as text
+newtab.intro.paragraph4=Vous pouvez désactiver cette fonctionnalité en cliquant sur la roue crantée (%1$S) et en sélectionnant « Afficher une page vide » depuis le menu %2$S.
+newtab.intro.paragraph5=La page Nouvel onglet vous montrera les sites que vous visitez le plus souvent, mais aussi les sites que nous pensons pouvoir vous intéresser. Au début, vous verrez différents sites de Mozilla.
+# LOCALIZATION NOTE(newtab.intro.paragraph6): %1$S will be replaced by
+# newtab.intro.paragraph6.remove as bold text. %2$S will be replaced by
+# newtab.intro.paragraph6.pin as bold text
+newtab.intro.paragraph6=Vous pouvez %1$S ou %2$S n'importe quel site en utilisant les contrôles disponibles au survol.
+newtab.intro.paragraph6.remove=retirer
+newtab.intro.paragraph6.pin=épingler
+newtab.intro.paragraph7=Certains des sites qui vous seront présentés peuvent être suggérés par Mozilla et peuvent être parrainés par un partenaire de Mozilla. Nous vous indiquerons toujours quels sites sont parrainés.
+# LOCALIZATION NOTE(newtab.intro.paragraph8): %1$S will be replaced by
+# brandShortName as text. %2$S will be replaced inline by an active link using
+# string newtab.learn.link as text.
+newtab.intro.paragraph8=%1$S vous montrera uniquement des sites qui sont au plus proche de vos centres d'intérêt sur le Web. %2$S
+newtab.intro.paragraph9=Désormais, lorsque vous ouvrirez la page Nouvel onglet, vous apercevrez des sites qui pourraient vous intéresser.
+# LOCALIZATION NOTE(newtab.intro.controls): the controls in the gear icon
+# menu for customizing the new tab window. Used in newtab.intro.paragraph4
+newtab.intro.controls=Contrôles de la page Nouvel onglet
 newtab.learn.link=En savoir plus…
 newtab.privacy.link=politique de confidentialité
+newtab.learn.link2=En savoir plus sur la page Nouvel onglet
+newtab.privacy.link2=Informations concernant votre vie privée
+# LOCALIZATION NOTE(newtab.intro.header.welcome): %1$S will be replaced by
+# brandShortName as bold text.
+newtab.intro.header.welcome=Bienvenue sur la page Nouvel onglet de %1$S
+newtab.intro.header.update=La page Nouvel onglet a été mise à jour
+newtab.intro.skip=Passer
+newtab.intro.continue=Continuer la visite
+newtab.intro.back=Retour
+newtab.intro.next=Suivant
+newtab.intro.gotit=Fermer
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/browser/chrome/browser/syncKey.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/browser/chrome/browser/syncKey.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/browser/chrome/browser/syncKey.dtd	2015-05-13 18:07:34.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/browser/chrome/browser/syncKey.dtd	2015-05-25 20:47:21.000000000 +0000
@@ -5,7 +5,7 @@
 <!ENTITY syncKey.page.title               "Votre clé &syncBrand.fullName.label;">
 <!ENTITY syncKey.page.description2        "Cette clé est utilisée pour décoder les données de votre compte &syncBrand.fullName.label;. Vous devrez saisir cette clé chaque fois que vous configurez &syncBrand.fullName.label; sur un nouvel appareil.">
 <!ENTITY syncKey.keepItSecret.heading     "Ne la communiquez à personne">
-<!ENTITY syncKey.keepItSecret.description "Votre compte &syncBrand.fullName.label; est chiffré pour protéger votre vie privée. Sans cette clé, il faudrait des années avant que quiconque puisse arriver à décoder vos informations personnelles. Vous êtez la seule personne à avoir cette clé. Cela signifie que personne d'autre ne peut accéder à vos données &syncBrand.fullName.label;.">
+<!ENTITY syncKey.keepItSecret.description "Votre compte &syncBrand.fullName.label; est chiffré pour protéger votre vie privée. Sans cette clé, il faudrait des années avant que quiconque puisse arriver à décoder vos informations personnelles. Vous êtes la seule personne à avoir cette clé. Cela signifie que personne d'autre ne peut accéder à vos données &syncBrand.fullName.label;.">
 <!ENTITY syncKey.keepItSafe.heading       "Ne la perdez pas">
 <!ENTITY syncKey.keepItSafe1.description  "Ne perdez pas cette clé.">
 <!ENTITY syncKey.keepItSafe2.description  " Nous n'en gardons aucune copie (elle n'aurait plus rien de secret !), ">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/browser/chrome/browser/syncProgress.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/browser/chrome/browser/syncProgress.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/browser/chrome/browser/syncProgress.dtd	2015-05-13 18:07:34.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/browser/chrome/browser/syncProgress.dtd	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY % brandDTD
-    SYSTEM "chrome://branding/locale/brand.dtd">
-    %brandDTD;
-
-<!-- These strings are used in the sync progress upload page -->
-<!ENTITY syncProgress.pageTitle    "Votre première synchronisation">
-<!ENTITY syncProgress.textBlurb    "Vos données sont à présent chiffrées et envoyées en arrière-plan. Vous pouvez fermer cet onglet et continuer à utiliser &brandShortName;.">
-<!ENTITY syncProgress.closeButton  "Fermer">
-<!ENTITY syncProgress.logoAltText  "&brandShortName;">
-<!ENTITY syncProgress.diffText     "&brandShortName; sera désormais synchronisé automatiquement en arrière-plan. Vous pouvez fermer cet onglet et continuer à utiliser &brandShortName;.">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/dom/chrome/dom/dom.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/dom/chrome/dom/dom.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/dom/chrome/dom/dom.properties	2015-05-13 18:07:34.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/dom/chrome/dom/dom.properties	2015-05-25 20:47:21.000000000 +0000
@@ -81,7 +81,6 @@
 FullScreenDeniedSubDocFullScreen=La requête d'accès au plein écran a été refusée car un sous-document du document à l'origine de la requête est déjà en plein écran.
 FullScreenDeniedNotDescendant=La requête d'accès au plein écran a été refusée car l'élément à l'origine de la requête n'est pas un descendant de l'élément actuellement en plein écran.
 FullScreenDeniedNotFocusedTab=La requête d'accès au plein écran a été refusée car l'élément à l'origine de la requête n'est pas dans l'onglet actuellement sélectionné.
-FullScreenDeniedContentOnly=La requête d'accès au plein écran a été refusée car l'élément à l'origine de la requête est dans le document du chrome et que l'API plein écran est configurée uniquement pour le contenu.
 RemovedFullScreenElement=Sortie du mode plein écran car l'élément plein écran a été supprimé du document.
 FocusedWindowedPluginWhileFullScreen=Sortie du mode plein écran car un plugin fenêtré a été sélectionné.
 HTMLSyncXHRWarning=L'analyse syntaxique du HTML dans XMLHttpRequest n'est pas gérée en mode synchrone.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/toolkit/chrome/global/aboutSupport.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/toolkit/chrome/global/aboutSupport.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/toolkit/chrome/global/aboutSupport.dtd	2015-05-13 18:07:34.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/toolkit/chrome/global/aboutSupport.dtd	2015-05-25 20:47:21.000000000 +0000
@@ -104,5 +104,5 @@
 
 <!ENTITY aboutSupport.sandboxTitle "Bac à sable">
 
-<!ENTITY aboutSupport.safeModeTitle "Essayer en mode sans échec">
+<!ENTITY aboutSupport.safeModeTitle "Essayez en mode sans échec">
 <!ENTITY aboutSupport.restartInSafeMode.label "Redémarrer avec les modules désactivés…">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/toolkit/chrome/global/aboutTelemetry.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/toolkit/chrome/global/aboutTelemetry.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/toolkit/chrome/global/aboutTelemetry.dtd	2015-05-13 18:07:34.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/toolkit/chrome/global/aboutTelemetry.dtd	2015-05-25 20:47:21.000000000 +0000
@@ -4,18 +4,62 @@
 
 <!ENTITY aboutTelemetry.pageTitle "Données télémétriques">
 
-<!ENTITY aboutTelemetry.telemetryEnabled "
-  La télémétrie est <span>activée</span>.
+<!ENTITY aboutTelemetry.changeDataChoices "
+  Modifier
 ">
 
-<!ENTITY aboutTelemetry.telemetryDisabled "
-  La télémétrie est <span>désactivée</span>.
+<!ENTITY aboutTelemetry.uploadEnabled "
+  L'envoi de données FHR est <span>activé</span>.
+">
+
+<!ENTITY aboutTelemetry.uploadDisabled "
+  L'envoi de données FHR est <span>désactivé</span>.
+">
+
+<!ENTITY aboutTelemetry.extendedRecordingEnabled "
+  L'enregistrement télémétrique étendu est <span>activé</span>.
+">
+
+<!ENTITY aboutTelemetry.extendedRecordingDisabled "
+  L'enregistrement télémétrique étendu est <span>désactivé</span>.
+">
+
+<!ENTITY aboutTelemetry.pingDataSource "
+Source des données de ping :
+">
+
+<!ENTITY aboutTelemetry.showCurrentPingData "
+Données de ping actuelles
+">
+
+<!ENTITY aboutTelemetry.showArchivedPingData "
+Données de ping archivées
+">
+
+<!ENTITY aboutTelemetry.showSubsessionData "
+Afficher les données de sous-session
+">
+
+<!ENTITY aboutTelemetry.choosePing "
+Sélectionner le ping :
+">
+
+<!ENTITY aboutTelemetry.showPreviousPing "
+&lt;&lt; Ping précédent
+">
+
+<!ENTITY aboutTelemetry.showNextPing "
+Ping suivant &gt;&gt;
 ">
 
 <!ENTITY aboutTelemetry.generalDataSection "
   Données générales
 ">
 
+<!ENTITY aboutTelemetry.environmentDataSection "
+  Données de l'environnement
+">
+
 <!ENTITY aboutTelemetry.telemetryLogSection "
   Journal de la télémétrie
 ">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/toolkit/chrome/global/aboutTelemetry.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/toolkit/chrome/global/aboutTelemetry.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/toolkit/chrome/global/aboutTelemetry.properties	2015-05-13 18:07:34.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/toolkit/chrome/global/aboutTelemetry.properties	2015-05-25 20:47:21.000000000 +0000
@@ -13,6 +13,10 @@
 
 generalDataHeadingValue = Valeur
 
+environmentDataHeadingName = Nom
+
+environmentDataHeadingValue = Valeur
+
 telemetryLogTitle = Journal de la télémétrie
 
 telemetryLogHeadingId = Identifiant
@@ -54,10 +58,6 @@
 
 histogramCopy = Copier
 
-disableTelemetry = Désactiver la télémétrie
-
-enableTelemetry = Activer la télémétrie
-
 keysHeader = Propriété
 
 valuesHeader = Valeur
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/webapprt/webapprt/overrides/dom.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/webapprt/webapprt/overrides/dom.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/fr/webapprt/webapprt/overrides/dom.properties	2015-05-13 18:07:34.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/fr/webapprt/webapprt/overrides/dom.properties	2015-05-25 20:47:21.000000000 +0000
@@ -81,7 +81,6 @@
 FullScreenDeniedSubDocFullScreen=La requête d'accès au plein écran a été refusée car un sous-document du document à l'origine de la requête est déjà en plein écran.
 FullScreenDeniedNotDescendant=La requête d'accès au plein écran a été refusée car l'élément à l'origine de la requête n'est pas un descendant de l'élément actuellement en plein écran.
 FullScreenDeniedNotFocusedTab=La requête d'accès au plein écran a été refusée car l'élément à l'origine de la requête n'est pas dans l'onglet actuellement sélectionné.
-FullScreenDeniedContentOnly=La requête d'accès au plein écran a été refusée car l'élément à l'origine de la requête est dans le document du chrome et que l'API plein écran est configurée uniquement pour le contenu.
 RemovedFullScreenElement=Sortie du mode plein écran car l'élément plein écran a été supprimé du document.
 FocusedWindowedPluginWhileFullScreen=Sortie du mode plein écran car un plugin fenêtré a été sélectionné.
 HTMLSyncXHRWarning=L'analyse syntaxique du HTML dans XMLHttpRequest n'est pas gérée en mode synchrone.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/baseMenuOverlay.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/baseMenuOverlay.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/baseMenuOverlay.dtd	2015-05-13 18:07:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/baseMenuOverlay.dtd	2015-05-25 20:48:31.000000000 +0000
@@ -25,6 +25,8 @@
 
 <!ENTITY helpSafeMode.label       "Mulai Ulang dengan Pengaya Dinonaktifkan…">
 <!ENTITY helpSafeMode.accesskey   "n">
+<!ENTITY helpSafeMode.stop.label       "Mulai Ulang dengan Pengaya Diaktifkan">
+<!ENTITY helpSafeMode.stop.accesskey   "n">
 
 <!ENTITY healthReport2.label      "Laporan Kebugaran &brandShorterName;">
 <!ENTITY healthReport2.accesskey  "o">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/browser.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/browser.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/browser.dtd	2015-05-13 18:07:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/browser.dtd	2015-05-25 20:48:31.000000000 +0000
@@ -423,10 +423,20 @@
 
 <!ENTITY searchFor.label              "Cari ">
 <!ENTITY searchWith.label             " lewat:">
+<!-- LOCALIZATION NOTE (search.label, searchAfter.label):
+     This string is used to build the header above the list of one-click search
+     providers when a one off engine has been selected.  The searchAfter text is
+     intentionally left empty for en-US and can be used by other localizations to
+     display a string after the search engine name.  This string will be displayed
+     as:  "Search <selected engine name><searchAfter.label text>" -->
+
+<!ENTITY search.label                 "Cari ">
+<!ENTITY searchAfter.label            "">
 <!-- LOCALIZATION NOTE (searchWithHeader.label):
      The wording of this string should be as close as possible to
      searchFor.label and searchWith.label. This string will be used instead of
      them when the user has not typed any keyword. -->
+
 <!ENTITY searchWithHeader.label       "Cari lewat:">
 <!-- LOCALIZATION NOTE (changeSearchSettings.button):
      This string won't wrap, so if the translated string is longer,
@@ -743,7 +753,6 @@
 <!ENTITY customizeMode.lwthemes.menuManage.accessKey "K">
 <!ENTITY customizeMode.lwthemes.menuGetMore "Dapatkan Tema Lainnya">
 <!ENTITY customizeMode.lwthemes.menuGetMore.accessKey "D">
-<!ENTITY customizeMode.deveditionTheme.label2 "Gunakan Tema Developer Edition">
 
 <!ENTITY social.chatBar.commandkey "c">
 <!ENTITY social.chatBar.label "Fokuskan di obrolan">
@@ -803,8 +812,6 @@
 <!ENTITY uiTour.infoPanel.close "Tutup">
 
 <!ENTITY appMenuSidebars.label         "Bilah Samping">
-
-<!ENTITY switchToMetroCmd2.label       "Buka ulang di &brandShortName; untuk Windows 8 Touch">
 <!-- LOCALIZATION NOTE: (panicButton.view.mainTimeframeDesc, panicButton.view.5min, panicButton.view.2hr, panicButton.view.day):
      The .mainTimeframeDesc string combined with any of the 3 others is meant to form a complete sentence, e.g. "Forget the last: Five minutes".
      Please ensure that this remains the case in the translation. -->
@@ -845,7 +852,7 @@
 <!ENTITY emeNotificationsNotNow.label             "Jangan Sekarang">
 <!ENTITY emeNotificationsNotNow.accesskey         "J">
 <!ENTITY emeNotificationsDontAskAgain.label       "Jangan tanyakan lagi">
-<!ENTITY emeNotificationsDontAskAgain.accesskey   "D">
+<!ENTITY emeNotificationsDontAskAgain.accesskey   "J">
 
 <!ENTITY readingList.label                        "Daftar Bacaan">
 <!ENTITY readingList.sidebar.commandKey           "R">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/browser.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/browser.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/browser.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/browser.properties	2015-05-25 20:48:31.000000000 +0000
@@ -37,21 +37,29 @@
 addonDownloadingAndVerifying=Mengunduh dan memverifikasi pengaya…;Mengunduh dan memverifikasi #1 pengaya…
 addonDownloadVerifying=Memverifikasi
 
+addonInstall.unsigned=(Belum Diverifikasi)
 addonInstall.cancelButton.label=Batal
 addonInstall.cancelButton.accesskey=B
 addonInstall.acceptButton.label=Instal
 addonInstall.acceptButton.accesskey=I
 
-# LOCALIZATION NOTE (addonConfirmInstallMessage):
+# LOCALIZATION NOTE (addonConfirmInstallMessage,addonConfirmInstallUnsigned):
 # Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is brandShortName
 # #2 is the number of add-ons being installed
 addonConfirmInstall.message=Situs ini ingin menginstal pengaya di #1:;Situs ini ingin menginstal #2 pengaya di #1:
+addonConfirmInstallUnsigned.message=Perhatian: Situs ini ingin menginstal pengaya yang tidak diverifikasi pada #1. Jika melanjutkan. risiko ditanggung sendiri.;Perhatian: Situs ini ingin menginstal #2 pengaya yang tidak diverifikasi pada #1. Jika melanjutkan. risiko ditanggung sendiri.
+
+# LOCALIZATION NOTE (addonConfirmInstallSomeUnsigned.message):
+# Semicolon-separated list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is brandShortName
+# #2 is the total number of add-ons being installed (at least 2)
+addonConfirmInstallSomeUnsigned.message=;Perhatian: Situs ini ingin menginstal #2 pengaya pada #1, beberapa diantaranya tidak diverifikasi. Jika melanjutkan. risiko ditanggung sendiri.
 
 addonwatch.slow=%1$S mungkin menyebabkan %2$S berjalan lambat
 addonwatch.disable.label=Nonaktifkan %S
-addonwatch.disable.accesskey=N
 addonwatch.ignoreSession.label=Abaikan saat ini
 addonwatch.ignoreSession.accesskey=A
 addonwatch.ignorePerm.label=Abaikan secara permanen
@@ -69,23 +77,29 @@
 addonInstallRestartButton=Mulai Ulang Sekarang
 addonInstallRestartButton.accesskey=S
 
-# LOCALIZATION NOTE (addonError-1, addonError-2, addonError-3, addonError-4):
+# LOCALIZATION NOTE (addonError-1, addonError-2, addonError-3, addonError-4, addonError-5):
 # #1 is the add-on name, #2 is the host name, #3 is the application name
 # #4 is the application version
 addonError-1=Pengaya tidak dapat diunduh karena kegagalan sambungan ke #2.
 addonError-2=Pengaya dari #2 tidak dapat dipasang karena tidak cocok dengan #3.
 addonError-3=Pengaya yang diunduh dari #2 tidak dapat dipasang karena rusak.
 addonError-4=#1 tidak dapat dipasang karena #3 tidak dapat mengubah berkas yang dibutuhkan.
+addonError-5=#3 telah mencegah situs ini untuk menginstal pengaya yang tidak diverifikasi.
 
-# LOCALIZATION NOTE (addonLocalError-1, addonLocalError-2, addonLocalError-3, addonLocalError-4, addonErrorIncompatible, addonErrorBlocklisted):
+# LOCALIZATION NOTE (addonLocalError-1, addonLocalError-2, addonLocalError-3, addonLocalError-4, addonLocalError-5, addonErrorIncompatible, addonErrorBlocklisted):
 # #1 is the add-on name, #3 is the application name, #4 is the application version
 addonLocalError-1=Pengaya ini tidak dapat dipasang karena ada kesalahan pada sistem berkas.
 addonLocalError-2=Pengaya ini tidak dapat dipasang karena tidak cocok dengan #3.
 addonLocalError-3=Pengaya ini tidak dapat dipasang karena tampaknya berkasnya rusak.
 addonLocalError-4=#1 tidak dapat dipasang karena #3 tidak dapat mengubah berkas yang dibutuhkan.
+addonLocalError-5=Pengaya ini tidak dapat dipasang karena belum diverifikasi.
 addonErrorIncompatible=#1 tidak dapat dipasang karena tidak kompatibel dengan #3 #4.
 addonErrorBlocklisted=#1 tidak dapat dipasang karena berisiko tinggi untuk menyebabkan masalah stabilitas dan keamanan.
 
+unsignedAddonsDisabled.message=Satu atau beberapa pengaya terinstal tidak dapat diverifikasi dan telah dinonaktifkan.
+unsignedAddonsDisabled.learnMore.label=Pelajari Lebih Lanjut
+unsignedAddonsDisabled.learnMore.accesskey=P
+
 # LOCALIZATION NOTE (deveditionTheme.name): This should be nearly the brand name for aurora.
 # See browser/branding/aurora/locales/*/brand.properties
 deveditionTheme.name=Developer Edition
@@ -366,6 +380,15 @@
 webNotifications.neverShow.accesskey=B
 webNotifications.showFromSite=Ingin menampilkan pemberitahuan dari %S?
 
+# Push Notifications
+push.allowForSession=Izinkan untuk Sesi ini
+push.allowForSession.accesskey=S
+push.alwaysAllow=Selalu Izinkan Pemberitahuan Push
+push.alwaysAllow.accesskey=I
+push.alwaysBlock=Selalu Blokir Pemberitahuan Push
+push.alwaysBlock.accesskey=B
+push.enablePush=Ingin menampilkan Pemberitahuan Push dari %S?
+
 # Pointer lock UI
 
 pointerLock.allow2=Sembunyikan penunjuk
@@ -389,6 +412,7 @@
 safebrowsing.reportedAttackSite=Telah Dilaporkan Sebagai Situs Penyerang!
 safebrowsing.notAnAttackButton.label=Situs ini bukan situs penyerang…
 safebrowsing.notAnAttackButton.accessKey=s
+safebrowsing.reportedUnwantedSite=Telah Dilaporkan Sebagai Situs Perangkat Lunak yang Tidak Diinginkan!
 
 # Ctrl-Tab
 # LOCALIZATION NOTE (ctrlTab.listAllTabs.label): #1 represents the number
@@ -761,3 +785,38 @@
 #   https://support.mozilla.org/kb/how-do-i-set-up-firefox-sync
 # %S is syncBrandShortName
 readingList.prepopulatedArticles.supportSync = Akses Daftar Baca Anda di mana saja dengan %S
+
+# LOCALIZATION NOTE (e10s.offerPopup.mainMessage
+#                    e10s.offerPopup.highlight1
+#                    e10s.offerPopup.highlight2
+#                    e10s.offerPopup.enableAndRestart.label
+#                    e10s.offerPopup.enableAndRestart.accesskey
+#                    e10s.offerPopup.noThanks.label
+#                    e10s.offerPopup.noThanks.accesskey
+#                    e10s.postActivationInfobar.message
+#                    e10s.postActivationInfobar.learnMore.label
+#                    e10s.postActivationInfobar.learnMore.accesskey
+#                    e10s.accessibilityNotice.mainMessage
+#                    e10s.accessibilityNotice.disableAndRestart.label
+#                    e10s.accessibilityNotice.disableAndRestart.accesskey
+#                    e10s.accessibilityNotice.dontDisable.label
+#                    e10s.accessibilityNotice.dontDisable.accesskey):
+# These strings are related to the messages we display to offer e10s (Multi-process) to users
+# on the pre-release channels. They won't be used in release but they will likely be used in
+# beta starting from version 41, so it's still useful to have these strings properly localized.
+# %S is brandShortName
+e10s.offerPopup.mainMessage = Multiproses akan segera hadir di %S. Anda dapat menggunakannya sekarang untuk mendapatkan beberapa manfaat:
+e10s.offerPopup.highlight1 = Lebih responsif
+e10s.offerPopup.highlight2 = Lebih sedikit mogok
+e10s.offerPopup.enableAndRestart.label = Aktifkan dan Mulai Ulang
+e10s.offerPopup.enableAndRestart.accesskey = A
+e10s.offerPopup.noThanks.label = Tidak, terima kasih
+e10s.offerPopup.noThanks.accesskey = T
+e10s.postActivationInfobar.message = Kini Anda membantu menguji multiproses di %S! Laporkan masalah yang Anda temukan.
+e10s.postActivationInfobar.learnMore.label = Pelajari Lebih Lanjut
+e10s.postActivationInfobar.learnMore.accesskey = P
+e10s.accessibilityNotice.mainMessage = Multiproses belum menyediakan dukungan untuk fitur aksesibilitas. Multiproses akan dinonaktifkan jika Anda memulai ulang %S. Ingin memulai ulang?
+e10s.accessibilityNotice.disableAndRestart.label = Nonaktifkan dan Mulai Ulang
+e10s.accessibilityNotice.disableAndRestart.accesskey = M
+e10s.accessibilityNotice.dontDisable.label = Jangan Nonaktifkan
+e10s.accessibilityNotice.dontDisable.accesskey = J
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/customizableui/customizableWidgets.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/customizableui/customizableWidgets.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/customizableui/customizableWidgets.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/customizableui/customizableWidgets.properties	2015-05-25 20:48:31.000000000 +0000
@@ -33,10 +33,6 @@
 # LOCALIZATION NOTE(add-ons-button.tooltiptext3): %S is the keyboard shortcut
 add-ons-button.tooltiptext3 = Kelola pengaya Anda (%S)
 
-switch-to-metro-button2.label = Windows 8 Touch
-# LOCALIZATION NOTE(switch-to-metro-button2.tooltiptext): %S is the brand short name
-switch-to-metro-button2.tooltiptext = Buka Ulang %S untuk Windows 8 Touch
-
 preferences-button.label = Pengaturan
 preferences-button.tooltiptext2 = Buka Pengaturan
 preferences-button.tooltiptext.withshortcut = Buka Pengaturan (%S)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/animationinspector.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/animationinspector.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/animationinspector.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/animationinspector.properties	2015-05-25 20:48:31.000000000 +0000
@@ -46,3 +46,9 @@
 # how long (in seconds) the animation lasts, or what is the animation's current
 # time (in seconds too);
 player.timeLabel=%Sd
+
+# LOCALIZATION NOTE (player.playbackRateLabel):
+# This string is displayed in each animation player widget, as the label of
+# drop-down list items that can be used to change the rate at which the
+# animation runs (1x being the default, 2x being twice as fast).
+player.playbackRateLabel=%Sx
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/debugger.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/debugger.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/debugger.dtd	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/debugger.dtd	2015-05-25 20:48:32.000000000 +0000
@@ -198,3 +198,17 @@
 <!ENTITY debuggerUI.stepping.stepIn2    "VK_SEMICOLON">
 <!ENTITY debuggerUI.stepping.stepOut1   "VK_F11">
 <!ENTITY debuggerUI.stepping.stepOut2   "VK_SEMICOLON">
+<!-- LOCALIZATION NOTE (debuggerUI.context.newTab):  This is the label
+  -  for the Open in New Tab menu item displayed in the context menu of the
+  -  debugger sources side menu. This should be the same as
+  -  netmonitorUI.context.newTab  -->
+
+<!ENTITY debuggerUI.context.newTab           "Buka di Tab Baru">
+<!ENTITY debuggerUI.context.newTab.accesskey "T">
+<!-- LOCALIZATION NOTE (debuggerUI.context.copyUrl): This is the label displayed
+  -  on the context menu that copies the selected request's url. This should be
+  -  the same as netmonitorUI.context.copyUrl -->
+
+<!ENTITY debuggerUI.context.copyUrl           "Salin URL">
+<!ENTITY debuggerUI.context.copyUrl.accesskey "S">
+<!ENTITY debuggerUI.context.copyUrl.key "C">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/debugger.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/debugger.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/debugger.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/debugger.properties	2015-05-25 20:48:32.000000000 +0000
@@ -218,6 +218,10 @@
 # viewer when there is an error loading a file
 errorLoadingText=Galat saat memuat sumber:\n
 
+# LOCALIZATION NOTE (errorLoadingText2): The text that is displayed in the debugger
+# viewer when there is an error loading a file
+errorLoadingText2=Kesalahan saat memuat URL ini: %S
+
 # LOCALIZATION NOTE (addWatchExpressionText): The text that is displayed in the
 # watch expressions list to add a new item.
 addWatchExpressionText=Tambahkan ekspresi pemantau
@@ -321,3 +325,4 @@
 variablesViewMissingArgs=(tidak tersedia)
 
 evalGroupLabel=Sumber yang Dievaluasi
+anonymousSourcesLabel=Sumber Anonim
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/filterwidget.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/filterwidget.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/filterwidget.dtd	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/filterwidget.dtd	2015-05-25 20:48:32.000000000 +0000
@@ -0,0 +1,14 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<!-- LOCALIZATION NOTE : FILE These strings are used in the CSS Filter Editor Widget
+   - which can be found in a tooltip that appears in the Rule View when clicking
+   - on a filter swatch displayed next to CSS declarations like 'filter: blur(2px)'. -->
+<!-- LOCALIZATION NOTE (filterListSelectPlaceholder): This string is used as
+   - a preview option in the list of possible filters <select> -->
+
+
+<!ENTITY filterListSelectPlaceholder "Pilih Filter">
+<!-- LOCALIZATION NOTE (addNewFilterButton): This string is displayed on a button used to add new filters -->
+
+<!ENTITY addNewFilterButton "Tambah">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/filterwidget.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/filterwidget.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/filterwidget.properties	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/filterwidget.properties	2015-05-25 20:48:32.000000000 +0000
@@ -0,0 +1,33 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE These strings are used in the CSS Filter Editor Widget
+# which can be found in a tooltip that appears in the Rule View when clicking
+# on a filter swatch displayed next to CSS declarations like 'filter: blur(2px)'.
+
+# LOCALIZATION NOTE (emptyFilterList):
+# This string is displayed when filter's list is empty
+# (no filter specified / all removed)
+emptyFilterList=Tidak ada filter ditentukan
+
+# LOCALIZATION NOTE (addUsingList):
+# This string is displayed under [emptyFilterList] when filter's
+# list is empty, guiding user to add a filter using the list below it
+addUsingList=Tambahkan filter menggunakan daftar berikut
+
+# LOCALIZATION NOTE (dropShadowPlaceholder):
+# This string is used as a placeholder for drop-shadow's input
+# in the filter list (shown when <input> is empty)
+dropShadowPlaceholder=warna radius x y
+
+# LOCALIZATION NOTE (dragHandleTooltipText):
+# This string is used as a tooltip text (shown on mouse hover) on the
+# drag handles of filters which are used to re-order filters
+dragHandleTooltipText=Seret ke atas atau ke bawah untuk mengubah urutan filter
+
+# LOCALIZATION NOTE (labelDragTooltipText):
+# This string is used as a tooltip text (shown on mouse hover) on the
+# filters' labels which can be dragged left/right to increase/decrease
+# the filter's value (like photoshop)
+labelDragTooltipText=Seret ke kiri atau ke kanan untuk menurunkan atau meningkatkan nilai
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/gclicommands.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/gclicommands.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/gclicommands.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/gclicommands.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,1530 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# LOCALIZATION NOTE These strings are used inside Web Console commands.
-# The Web Console command line is available from the Web Developer sub-menu
-# -> 'Web Console'.
-#
-# The correct localization of this file might be to keep it in
-# English, or another language commonly spoken among web developers.
-# You want to make that choice consistent across the developer tools.
-# A good criteria is the language in which you'd find the best
-# documentation on web development on the web.
-
-# LOCALIZATION NOTE (helpDesc) A very short string used to describe the
-# function of the help command.
-helpDesc=Dapatkan bantuan untuk perintah yang tersedia
-
-# LOCALIZATION NOTE (helpAvailable) Used in the output of the help command to
-# explain the contents of the command help table.
-helpAvailable=Perintah yang Tersedia
-
-# LOCALIZATION NOTE (notAvailableInE10S) Used in the output of any command that
-# is not compatible with multiprocess mode (E10S).
-notAvailableInE10S=Perintah '%1$S' tidak tersedia dalam mode multiproses (E10S)
-
-# LOCALIZATION NOTE (consoleDesc) A very short string used to describe the
-# function of the console command.
-consoleDesc=Perintah untuk mengontrol konsol
-
-# LOCALIZATION NOTE (consoleManual) A longer description describing the
-# set of commands that control the console.
-consoleManual=Filter, bersihkan, dan tutup konsol web
-
-# LOCALIZATION NOTE (consoleclearDesc) A very short string used to describe the
-# function of the 'console clear' command.
-consoleclearDesc=Bersihkan konsol
-
-# LOCALIZATION NOTE (screenshotDesc) A very short description of the
-# 'screenshot' command. See screenshotManual for a fuller description of what
-# it does. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible.
-screenshotDesc=Simpan gambar tangkapan laman
-
-# LOCALIZATION NOTE (screenshotManual) A fuller description of the 'screenshot'
-# command, displayed when the user asks for help on what it does.
-screenshotManual=Simpan gambar tangkapan PNG dari seluruh jendela yang terlihat (setelah waktu tunda opsional)
-
-# LOCALIZATION NOTE (screenshotFilenameDesc) A very short string to describe
-# the 'filename' parameter to the 'screenshot' command, which is displayed in
-# a dialog when the user is using this command.
-screenshotFilenameDesc=Nama berkas tujuan
-
-# LOCALIZATION NOTE (screenshotFilenameManual) A fuller description of the
-# 'filename' parameter to the 'screenshot' command, displayed when the user
-# asks for help on what it does.
-screenshotFilenameManual=Nama berkas (dengan ekstensi '.png') tujuan penulisan tangkapan layar.
-
-# LOCALIZATION NOTE (screenshotClipboardDesc) A very short string to describe
-# the 'clipboard' parameter to the 'screenshot' command, which is displayed in
-# a dialog when the user is using this command.
-screenshotClipboardDesc=Salin tangkapan layar ke papan klip? (true/false)
-
-# LOCALIZATION NOTE (screenshotClipboardManual) A fuller description of the
-# 'clipboard' parameter to the 'screenshot' command, displayed when the user
-# asks for help on what it does.
-screenshotClipboardManual='True' jika ingin menyalin tangkapan layar, alih-alih menyimpannya sebagai sebuah berkas.
-
-# LOCALIZATION NOTE (screenshotChromeDesc) A very short string to describe
-# the 'chrome' parameter to the 'screenshot' command, which is displayed in
-# a dialog when the user is using this command.
-# The argument (%1$S) is the browser name.
-screenshotChromeDesc2=Tangkap jendela chrome %1$S? (true/false)
-
-# LOCALIZATION NOTE (screenshotChromeManual) A fuller description of the
-# 'chrome' parameter to the 'screenshot' command, displayed when the user
-# asks for help on what it does.
-# The argument (%1$S) is the browser name.
-screenshotChromeManual2='True' jika Anda ingin mengambil tangkapan layar dari %1$S, alih-alih isi jendela laman web.
-
-# LOCALIZATION NOTE (screenshotGroupOptions) A label for the optional options of
-# the screenshot command.
-screenshotGroupOptions=Opsi
-
-# LOCALIZATION NOTE (screenshotDelayDesc) A very short string to describe
-# the 'delay' parameter to the 'screenshot' command, which is displayed in
-# a dialog when the user is using this command.
-screenshotDelayDesc=Waktu tunda (detik)
-
-# LOCALIZATION NOTE (screenshotDelayManual) A fuller description of the
-# 'delay' parameter to the 'screenshot' command, displayed when the user
-# asks for help on what it does.
-screenshotDelayManual=Waktu tunggu (dalam detik) sebelum tangkapan layar diambil
-
-# LOCALIZATION NOTE (screenshotFullscreenDesc) A very short string to describe
-# the 'fullscreen' parameter to the 'screenshot' command, which is displayed in
-# a dialog when the user is using this command.
-screenshotFullPageDesc=Seluruh laman web? (true/false)
-
-# LOCALIZATION NOTE (screenshotFullscreenManual) A fuller description of the
-# 'fullscreen' parameter to the 'screenshot' command, displayed when the user
-# asks for help on what it does.
-screenshotFullPageManual=True jika tangkapan layar juga menyertakan bagian laman web yang tidak di ditampilkan pada layar saat ini.
-
-# LOCALIZATION NOTE (screenshotSelectorChromeConflict) Exception thrown when user
-# tries to use 'selector' option along with 'chrome' option of the screenshot
-# command. Refer: https://bugzilla.mozilla.org/show_bug.cgi?id=659268#c7
-screenshotSelectorChromeConflict=opsi selektor tidak didukung ketika opsi chrome bernilai true
-
-# LOCALIZATION NOTE (screenshotGeneratedFilename) The auto generated filename
-# when no file name is provided. The first argument (%1$S) is the date string
-# in yyyy-mm-dd format and the second argument (%2$S) is the time string
-# in HH.MM.SS format. Please don't add the extension here.
-screenshotGeneratedFilename=Tangkapan Layar %1$S pada %2$S
-
-# LOCALIZATION NOTE (screenshotErrorSavingToFile) Text displayed to user upon
-# encountering error while saving the screenshot to the file specified.
-screenshotErrorSavingToFile=Kesalahan saat menyimpan ke tujuan
-
-# LOCALIZATION NOTE (screenshotSavedToFile) Text displayed to user when the
-# screenshot is successfully saved to the file specified.
-screenshotSavedToFile=Disimpan di
-
-# LOCALIZATION NOTE (screenshotErrorCopying) Text displayed to user upon
-# encountering error while copying the screenshot to clipboard.
-screenshotErrorCopying=Terjadi galat saat menyalin ke clipboard.
-
-# LOCALIZATION NOTE (screenshotCopied) Text displayed to user when the
-# screenshot is successfully copied to the clipboard.
-screenshotCopied=Disalin ke clipboard.
-
-# LOCALIZATION NOTE (screenshotTooltip) Text displayed as tooltip for screenshot button in devtools ToolBox.
-screenshotTooltip=Buat tangkapan layar untuk satu halaman penuh
-
-# LOCALIZATION NOTE (highlightDesc) A very short description of the
-# 'highlight' command. See highlightManual for a fuller description of what
-# it does. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible.
-highlightDesc=Sorot simpul
-
-# LOCALIZATION NOTE (highlightManual) A fuller description of the 'highlight'
-# command, displayed when the user asks for help on what it does.
-highlightManual=Sorot simpul yang cocok dengan selektor pada laman
-
-# LOCALIZATION NOTE (highlightSelectorDesc) A very short string to describe
-# the 'selector' parameter to the 'highlight' command, which is displayed in
-# a dialog when the user is using this command.
-highlightSelectorDesc=Selektor CSS
-
-# LOCALIZATION NOTE (highlightSelectorManual) A fuller description of the
-# 'selector' parameter to the 'highlight' command, displayed when the user
-# asks for help on what it does.
-highlightSelectorManual=Selektor CSS yang digunakan untuk mencocokkan simpul pada laman
-
-# LOCALIZATION NOTE (highlightOptionsDesc) The title of a set of options to
-# the 'highlight' command, displayed as a heading to the list of option.
-highlightOptionsDesc=Opsi
-
-# LOCALIZATION NOTE (highlightHideGuidesDesc) A very short string to describe
-# the 'hideguides' option parameter to the 'highlight' command, which is
-# displayed in a dialog when the user is using this command.
-highlightHideGuidesDesc=Sembunyikan panduan
-
-# LOCALIZATION NOTE (highlightHideGuidesManual) A fuller description of the
-# 'hideguides' option parameter to the 'highlight' command, displayed when the
-# user asks for help on what it does.
-highlightHideGuidesManual=Sembunyikan panduan di sekeliling simpul yang disorot
-
-# LOCALIZATION NOTE (highlightShowInfoBarDesc) A very short string to describe
-# the 'showinfobar' option parameter to the 'highlight' command, which is
-# displayed in a dialog when the user is using this command.
-highlightShowInfoBarDesc=Tampilkan bilah info simpul
-
-# LOCALIZATION NOTE (highlightShowInfoBarManual) A fuller description of the
-# 'showinfobar' option parameter to the 'highlight' command, displayed when the
-# user asks for help on what it does.
-highlightShowInfoBarManual=Tampilkan bilah info di atas simpul yang disorit (bilah info menampilkan nama tag, atribut, dan dimensi)
-
-# LOCALIZATION NOTE (highlightShowAllDesc) A very short string to describe
-# the 'showall' option parameter to the 'highlight' command, which is
-# displayed in a dialog when the user is using this command.
-highlightShowAllDesc=Tampilkan semua yang cocok
-
-# LOCALIZATION NOTE (highlightShowAllManual) A fuller description of the
-# 'showall' option parameter to the 'highlight' command, displayed when the
-# user asks for help on what it does.
-highlightShowAllManual=Terlalu banyak simpul yang cocok dengan selektor, hanya 100 simpul pertama yang ditampilkan agar tidak terlalu memperlambat laman. Gunakan opsi ini untuk menampilkan semua yang cocok
-
-# LOCALIZATION NOTE (highlightRegionDesc) A very short string to describe the
-# 'region' option parameter to the 'highlight' command, which is displayed in a
-# dialog when the user is using this command.
-highlightRegionDesc=Area model kotak
-
-# LOCALIZATION NOTE (highlightRegionManual) A fuller description of the 'region'
-# option parameter to the 'highlight' command, displayed when the user asks for
-# help on what it does.
-highlightRegionManual=Area kotak model mana yang akan disorot: 'content', 'padding', 'border', atau 'margin'
-
-# LOCALIZATION NOTE (highlightFillDesc) A very short string to describe the
-# 'fill' option parameter to the 'highlight' command, which is displayed in a
-# dialog when the user is using this command.
-highlightFillDesc=Gaya isian
-
-# LOCALIZATION NOTE (highlightFillManual) A fuller description of the 'fill'
-# option parameter to the 'highlight' command, displayed when the user asks for
-# help on what it does.
-highlightFillManual=Menimpa gaya isian area bawaan dengan warna pilihan
-
-# LOCALIZATION NOTE (highlightKeepDesc) A very short string to describe the
-# 'keep' option parameter to the 'highlight' command, which is displayed in a
-# dialog when the user is using this command.
-highlightKeepDesc=Biarkan penyorot yang ada
-
-# LOCALIZATION NOTE (highlightKeepManual) A fuller description of the 'keep'
-# option parameter to the 'highlight' command, displayed when the user asks for
-# help on what it does.
-highlightKeepManual=Jika tidak diubah, penyorot yang ada akan disembunyikan saat perintah dijalankan, kecuali opsi ini diaktifkan
-
-# LOCALIZATION NOTE (highlightOutputConfirm) A confirmation message for the
-# 'highlight' command, displayed to the user once the command has been entered,
-# informing the user how many nodes have been highlighted successfully and how
-# to turn highlighting off
-highlightOutputConfirm2=%1$S simpul disorot;%1$S simpul disorot
-
-# LOCALIZATION NOTE (highlightOutputMaxReached) A confirmation message for the
-# 'highlight' command, displayed to the user once the command has been entered,
-# informing the user how many nodes have been highlighted successfully and that
-# some nodes could not be highlighted due to the maximum number of nodes being
-# reached, and how to turn highlighting off
-highlightOutputMaxReached=%1$S simpul cocok, tetapi hanya %2$S simpul yang disorot. Gunakan '--showall' untuk menampilkan semua
-
-# LOCALIZATION NOTE (unhighlightDesc) A very short description of the
-# 'unhighlight' command. See unhighlightManual for a fuller description of what
-# it does. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible.
-unhighlightDesc=Buang sorotan semua simpul
-
-# LOCALIZATION NOTE (unhighlightManual) A fuller description of the 'unhighlight'
-# command, displayed when the user asks for help on what it does.
-unhighlightManual=Buang sorotan semua simpul yang disorot sebelumnya dengan perintah 'highlight'
-
-# LOCALIZATION NOTE (restartBrowserDesc) A very short description of the
-# 'restart' command. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible.
-# The argument (%1$S) is the browser name.
-restartBrowserDesc=Mulai Ulang %1$S
-
-# LOCALIZATION NOTE (restartBrowserNocacheDesc) A very short string to
-# describe the 'nocache' parameter to the 'restart' command, which is
-# displayed in a dialog when the user is using this command.
-restartBrowserNocacheDesc=Nonaktifkan pemuatan isi dari tembolok saat memulai ulang
-
-# LOCALIZATION NOTE (restartBrowserRequestCancelled) A string displayed to the
-# user when a scheduled restart has been aborted by the user.
-restartBrowserRequestCancelled=Permintaan memulai ulang dibatalkan pengguna.
-
-# LOCALIZATION NOTE (restartBrowserRestarting) A string displayed to the
-# user when a restart has been initiated without a delay.
-# The argument (%1$S) is the browser name.
-restartBrowserRestarting=Memulai Ulang %1$S…
-
-# LOCALIZATION NOTE (inspectDesc) A very short description of the 'inspect'
-# command. See inspectManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-inspectDesc=Inspeksi simpul
-
-# LOCALIZATION NOTE (inspectManual) A fuller description of the 'inspect'
-# command, displayed when the user asks for help on what it does.
-inspectManual=Selidiki dimensi dan properti sebuah elemen dengan menggunakan selektor CSS untuk membuka penyorot DOM
-
-# LOCALIZATION NOTE (inspectNodeDesc) A very short string to describe the
-# 'node' parameter to the 'inspect' command, which is displayed in a dialog
-# when the user is using this command.
-inspectNodeDesc=Selektor CSS
-
-# LOCALIZATION NOTE (inspectNodeManual) A fuller description of the 'node'
-# parameter to the 'inspect' command, displayed when the user asks for help
-# on what it does.
-inspectNodeManual=Selektor CSS untuk digunakan pada Document.querySelector yang akan mengidentifikasi elemen tunggal
-
-# LOCALIZATION NOTE (eyedropperDesc) A very short description of the 'eyedropper'
-# command. See eyedropperManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-eyedropperDesc=Pilih salah satu warna dari laman
-
-# LOCALIZATION NOTE (eyedropperManual) A fuller description of the 'eyedropper'
-# command, displayed when the user asks for help on what it does.
-eyedropperManual=Buka panel yang menampilkan area yang diperbesar untuk melihat dalam skala piksel dan menyalin nilai warnanya
-
-# LOCALIZATION NOTE (eyedropperTooltip) A string displayed as the
-# tooltip of button in devtools toolbox which toggles the Eyedropper tool.
-eyedropperTooltip=Pilih salah satu warna dari laman
-
-# LOCALIZATION NOTE (tiltDesc) A very short description of the 'tilt'
-# command. See tiltManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-tiltDesc=Visualisikan laman web secara 3D
-
-# LOCALIZATION NOTE (tiltManual) A fuller description of the 'tilt'
-# command, displayed when the user asks for help on what it does.
-tiltManual=Selidiki hubungan antara bagian-bagian laman dengan induknya dalam lingkungan 3D
-
-# LOCALIZATION NOTE (tiltOpenDesc) A very short description of the 'tilt inspect'
-# command. See tiltOpenManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-tiltOpenDesc=Buka tampilan Inspektur 3D
-
-# LOCALIZATION NOTE (tiltOpenManual) A fuller description of the 'tilt translate'
-# command, displayed when the user asks for help on what it does.
-tiltOpenManual=Inisialisasi inspektur 3D dan secara opsional menyorot node dengan selektor CSS
-
-# LOCALIZATION NOTE (tiltToggleTooltip) A string displayed as the
-# tooltip of button in devtools toolbox which toggles Tilt 3D View.
-tiltToggleTooltip=Tampilan 3D
-
-# LOCALIZATION NOTE (tiltTranslateDesc) A very short description of the 'tilt translate'
-# command. See tiltTranslateManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-tiltTranslateDesc=Pindahkan mesh laman web
-
-# LOCALIZATION NOTE (tiltTranslateManual) A fuller description of the 'tilt translate'
-# command, displayed when the user asks for help on what it does.
-tiltTranslateManual=Translasikan secara bertahap mesh laman web dengan arah tertentu
-
-# LOCALIZATION NOTE (tiltTranslateXDesc) A very short string to describe the
-# 'x' parameter to the 'tilt translate' command, which is displayed in a dialog
-# when the user is using this command.
-tiltTranslateXDesc=X (piksel)
-
-# LOCALIZATION NOTE (tiltTranslateXManual) A fuller description of the 'x'
-# parameter to the 'translate' command, displayed when the user asks for help
-# on what it does.
-tiltTranslateXManual=Nilai piksel translasi pada mesh laman web pada sumbu X
-
-# LOCALIZATION NOTE (tiltTranslateYDesc) A very short string to describe the
-# 'y' parameter to the 'tilt translate' command, which is displayed in a dialog
-# when the user is using this command.
-tiltTranslateYDesc=Y (piksel)
-
-# LOCALIZATION NOTE (tiltTranslateYManual) A fuller description of the 'y'
-# parameter to the 'translate' command, displayed when the user asks for help
-# on what it does.
-tiltTranslateYManual=Nilai piksel translasi pada mesh laman web pada sumbu Y
-
-# LOCALIZATION NOTE (tiltRotateDesc) A very short description of the 'tilt rotate'
-# command. See tiltRotateManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-tiltRotateDesc=Putar mesh laman web
-
-# LOCALIZATION NOTE (tiltRotateManual) A fuller description of the 'tilt rotate'
-# command, displayed when the user asks for help on what it does.
-tiltRotateManual=Rotasikan secara bertahap mesh laman web dengan arah tertentu
-
-# LOCALIZATION NOTE (tiltRotateXDesc) A very short string to describe the
-# 'x' parameter to the 'tilt rotate' command, which is displayed in a dialog
-# when the user is using this command.
-tiltRotateXDesc=X (derajat)
-
-# LOCALIZATION NOTE (tiltRotateXManual) A fuller description of the 'x'
-# parameter to the 'rotate' command, displayed when the user asks for help
-# on what it does.
-tiltRotateXManual=Nilai derajat putaran untuk merotasi mesh laman web pada sumbu X
-
-# LOCALIZATION NOTE (tiltRotateYDesc) A very short string to describe the
-# 'y' parameter to the 'tilt rotate' command, which is displayed in a dialog
-# when the user is using this command.
-tiltRotateYDesc=Y (derajat)
-
-# LOCALIZATION NOTE (tiltRotateYManual) A fuller description of the 'y'
-# parameter to the 'rotate' command, displayed when the user asks for help
-# on what it does.
-tiltRotateYManual=Nilai derajat putaran untuk merotasi mesh laman web pada sumbu Y
-
-# LOCALIZATION NOTE (tiltRotateZDesc) A very short string to describe the
-# 'z' parameter to the 'tilt rotate' command, which is displayed in a dialog
-# when the user is using this command.
-tiltRotateZDesc=Z (derajat)
-
-# LOCALIZATION NOTE (tiltRotateZManual) A fuller description of the 'z'
-# parameter to the 'rotate' command, displayed when the user asks for help
-# on what it does.
-tiltRotateZManual=Nilai derajat putaran untuk merotasi mesh laman web pada sumbu Z
-
-# LOCALIZATION NOTE (tiltZoomDesc) A very short description of the 'tilt zoom'
-# command. See tiltZoomManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-tiltZoomDesc=Menjauh atau mendekati mesh laman web
-
-# LOCALIZATION NOTE (tiltZoomManual) A fuller description of the 'tilt zoom'
-# command, displayed when the user asks for help on what it does.
-tiltZoomManual=Gerakkan secara bertahap mesh laman web ke arah tertentu dalam sumbu Z
-
-# LOCALIZATION NOTE (tiltZoomAmountDesc) A very short string to describe the
-# 'zoom' parameter to the 'tilt zoom' command, which is displayed in a dialog
-# when the user is using this command.
-tiltZoomAmountDesc=Perbesaran (piksel)
-
-# LOCALIZATION NOTE (tiltZoomAmmuntManual) A fuller description of the 'zoom'
-# parameter to the 'zoom' command, displayed when the user asks for help
-# on what it does.
-tiltZoomAmountManual=Nilai piksel translasi pada mesh laman web pada sumbu Z
-
-# LOCALIZATION NOTE (tiltResetDesc) A very short description of the 'tilt reset'
-# command. See tiltResetManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-tiltResetDesc=Setel ulang translasi, rotasi, dan perbesaran
-
-# LOCALIZATION NOTE (tiltResetManual) A fuller description of the 'tilt reset'
-# command, displayed when the user asks for help on what it does.
-tiltResetManual=Setel ulang transformasi yang diterapkan pada matriks tampilan model mesh laman web sebelumnya
-
-# LOCALIZATION NOTE (tiltCloseDesc) A very short description of the 'tilt close'
-# command. See tiltCloseManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-tiltCloseDesc=Tutup visualisasi yang terbuka
-
-# LOCALIZATION NOTE (tiltCloseManual) A fuller description of the 'tilt close'
-# command, displayed when the user asks for help on what it does.
-tiltCloseManual=Tutup visualisasi dan kembali ke penyorot bawaan Inspektur
-
-# LOCALIZATION NOTE (debuggerClosed) Used in the output of several commands
-# to explain that the debugger must be opened first.
-debuggerClosed=Debugger harus dibuka sebelum menggunakan perintah ini
-
-# LOCALIZATION NOTE (debuggerStopped) Used in the output of several commands
-# to explain that the debugger must be opened first before setting breakpoints.
-debuggerStopped=Debugger harus terbuka sebelum menyetel breakpoint
-
-# LOCALIZATION NOTE (breakDesc) A very short string used to describe the
-# function of the break command.
-breakDesc=Kelola breakpoint
-
-# LOCALIZATION NOTE (breakManual) A longer description describing the
-# set of commands that control breakpoints.
-breakManual=Perintah untuk menampilkan, menambah, dan menghapus breakpoint
-
-# LOCALIZATION NOTE (breaklistDesc) A very short string used to describe the
-# function of the 'break list' command.
-breaklistDesc=Tampilkan breakpoint yang ada
-
-# LOCALIZATION NOTE (breaklistNone) Used in the output of the 'break list'
-# command to explain that the list is empty.
-breaklistNone=Tidak ada breakpoint yang disetel
-
-# LOCALIZATION NOTE (breaklistOutRemove) A title used in the output from the
-# 'break list' command on a button which can be used to remove breakpoints
-breaklistOutRemove=Hapus
-
-# LOCALIZATION NOTE (breakaddAdded) Used in the output of the 'break add'
-# command to explain that a breakpoint was added.
-breakaddAdded=Breakpoint ditambahkan
-
-# LOCALIZATION NOTE (breakaddFailed) Used in the output of the 'break add'
-# command to explain that a breakpoint could not be added.
-breakaddFailed=Tidak dapat menyetel breakpoint: %S
-
-# LOCALIZATION NOTE (breakaddDesc) A very short string used to describe the
-# function of the 'break add' command.
-breakaddDesc=Tambahkan breakpoint
-
-# LOCALIZATION NOTE (breakaddManual) A longer description describing the
-# set of commands that are responsible for adding breakpoints.
-breakaddManual=Jenis breakpoint yang didukung: baris
-
-# LOCALIZATION NOTE (breakaddlineDesc) A very short string used to describe the
-# function of the 'break add line' command.
-breakaddlineDesc=Tambahkan breakpoint baris
-
-# LOCALIZATION NOTE (breakaddlineFileDesc) A very short string used to describe
-# the function of the file parameter in the 'break add line' command.
-breakaddlineFileDesc=URI berkas JS
-
-# LOCALIZATION NOTE (breakaddlineLineDesc) A very short string used to describe
-# the function of the line parameter in the 'break add line' command.
-breakaddlineLineDesc=Nomor baris
-
-# LOCALIZATION NOTE (breakdelDesc) A very short string used to describe the
-# function of the 'break del' command.
-breakdelDesc=Hapus breakpoint
-
-# LOCALIZATION NOTE (breakdelBreakidDesc) A very short string used to describe
-# the function of the index parameter in the 'break del' command.
-breakdelBreakidDesc=Indeks breakpoint
-
-# LOCALIZATION NOTE (breakdelRemoved) Used in the output of the 'break del'
-# command to explain that a breakpoint was removed.
-breakdelRemoved=Breakpoint dihapus
-
-# LOCALIZATION NOTE (dbgDesc) A very short string used to describe the
-# function of the dbg command.
-dbgDesc=Kelola debugger
-
-# LOCALIZATION NOTE (dbgManual) A longer description describing the
-# set of commands that control the debugger.
-dbgManual=Perintah untuk menyela atau melanjutkan utas utama, memasuki, melangkah keluar dari, dan melewati baris kode
-
-# LOCALIZATION NOTE (dbgOpen) A very short string used to describe the function
-# of the dbg open command.
-dbgOpen=Buka debugger
-
-# LOCALIZATION NOTE (dbgClose) A very short string used to describe the function
-# of the dbg close command.
-dbgClose=Tutup debugger
-
-# LOCALIZATION NOTE (dbgInterrupt) A very short string used to describe the
-# function of the dbg interrupt command.
-dbgInterrupt=Hentikan sementara utas utama
-
-# LOCALIZATION NOTE (dbgContinue) A very short string used to describe the
-# function of the dbg continue command.
-dbgContinue=Melanjutkan kembali utas utama, dan meneruskan eksekusi breakpoint tersebut, sampai breakpoint selanjutnya atau penghentian skrip.
-
-# LOCALIZATION NOTE (dbgStepDesc) A very short string used to describe the
-# function of the dbg step command.
-dbgStepDesc=Kelola pelangkahan
-
-# LOCALIZATION NOTE (dbgStepManual) A longer description describing the
-# set of commands that control stepping.
-dbgStepManual=Perintah untuk memasuki, melangkah keluar dari dan melewati baris kode
-
-# LOCALIZATION NOTE (dbgStepOverDesc) A very short string used to describe the
-# function of the dbg step over command.
-dbgStepOverDesc=Mengeksekusi pernyataan aktual dan kemudian berhenti pada pernyataan berikutnya. Jika pernyataan aktual adalah sebuah pemanggilan fungsi maka debugger akan mengeksekusi fungsi secara keseluruhan, dan akan berhenti pada pernyataan berikutnya setelah pemanggilan fungsi
-
-# LOCALIZATION NOTE (dbgStepInDesc) A very short string used to describe the
-# function of the dbg step in command.
-dbgStepInDesc=Mengeksekusi pernyataan aktual dan kemudian berhenti pada pernyataan berikutnya. Jika pernyataan aktual adalah sebuah pemanggilan fungsi maka debugger akan masuk ke fungsi tersebut, jika tidak maka akan berhenti pada pernyataan berikutnya
-
-# LOCALIZATION NOTE (dbgStepOutDesc) A very short string used to describe the
-# function of the dbg step out command.
-dbgStepOutDesc=Keluar dari fungsi aktual dan naik satu level jika fungsinya berkalang. Jika sedang berada di skrip utama, skrip akan dieksekusi sampai akhir, atau sampai breakpoint selanjutnya. Pernyataan yang dilewati tetap akan dieksekusi, namun tidak secara keseluruhan
-
-# LOCALIZATION NOTE (dbgListSourcesDesc) A very short string used to describe the
-# function of the dbg list command.
-dbgListSourcesDesc=Tampilkan daftar URL sumber yang dimuat pada debugger
-
-# LOCALIZATION NOTE (dbgBlackBoxDesc) A very short string used to describe the
-# function of the 'dbg blackbox' command.
-dbgBlackBoxDesc=Sumber kotak hitam pada debugger
-
-# LOCALIZATION NOTE (dbgBlackBoxSourceDesc) A very short string used to describe the
-# 'source' parameter to the 'dbg blackbox' command.
-dbgBlackBoxSourceDesc=Kode sumber tertentu untuk dimasukkan ke kotak hotam
-
-# LOCALIZATION NOTE (dbgBlackBoxGlobDesc) A very short string used to describe the
-# 'glob' parameter to the 'dbg blackbox' command.
-dbgBlackBoxGlobDesc=Masukkan semua sumber yang cocok dengan pola ini ke kotak hitam (misal: "*.min.js")
-
-# LOCALIZATION NOTE (dbgBlackBoxInvertDesc) A very short string used to describe the
-# 'invert' parameter to the 'dbg blackbox' command.
-dbgBlackBoxInvertDesc=Balikkan pencocokan, agar sumber yang tidak disediakan atau tidak cocok dengan pola glob yang disediakan tidak akan dimasukkan ke kotak hitam.
-
-# LOCALIZATION NOTE (dbgBlackBoxEmptyDesc) A very short string used to let the
-# user know that no sources were black boxed.
-dbgBlackBoxEmptyDesc=(Tidak ada kode sumber yang dijadikan kotak hitam)
-
-# LOCALIZATION NOTE (dbgBlackBoxNonEmptyDesc) A very short string used to let the
-# user know which sources were black boxed.
-dbgBlackBoxNonEmptyDesc=Kode sumber berikut dimasukkan kotak hitam:
-
-# LOCALIZATION NOTE (dbgBlackBoxErrorDesc) A very short string used to let the
-# user know there was an error black boxing a source (whose url follows this
-# text).
-dbgBlackBoxErrorDesc=Galat saat memasukkan ke kotak hitam:
-
-# LOCALIZATION NOTE (dbgUnBlackBoxDesc) A very short string used to describe the
-# function of the 'dbg unblackbox' command.
-dbgUnBlackBoxDesc=Hentikan memasukkan kode sumber ke kotak hitam pada debugger
-
-# LOCALIZATION NOTE (dbgUnBlackBoxSourceDesc) A very short string used to describe the
-# 'source' parameter to the 'dbg unblackbox' command.
-dbgUnBlackBoxSourceDesc=Kode sumber tertentu yang dikeluarkan dari kotak hitam
-
-# LOCALIZATION NOTE (dbgUnBlackBoxGlobDesc) A very short string used to describe the
-# 'glob' parameter to the 'dbg blackbox' command.
-dbgUnBlackBoxGlobDesc=Keluarkan semua sumber yang cocok dengan pola ini dari kotak hitam (misal: "*.min.js")
-
-# LOCALIZATION NOTE (dbgUnBlackBoxEmptyDesc) A very short string used to let the
-# user know that we did not stop black boxing any sources.
-dbgUnBlackBoxEmptyDesc=(Tidak ada kode sumber yang dikeluarkan dari kotak hitam)
-
-# LOCALIZATION NOTE (dbgUnBlackBoxNonEmptyDesc) A very short string used to let the
-# user know which sources we stopped black boxing.
-dbgUnBlackBoxNonEmptyDesc=Kode sumber berikut dikeluarkan dari kotak hitam:
-
-# LOCALIZATION NOTE (dbgUnBlackBoxErrorDesc) A very short string used to let the
-# user know there was an error black boxing a source (whose url follows this
-# text).
-dbgUnBlackBoxErrorDesc=Galat saat mengeluarkan dari kotak hitam:
-
-# LOCALIZATION NOTE (dbgUnBlackBoxInvertDesc) A very short string used to describe the
-# 'invert' parameter to the 'dbg unblackbox' command.
-dbgUnBlackBoxInvertDesc=Balikkan pencocokan, agar sumber yang tidak disediakan atau tidak cocok dengan pola glob yang disediakan tidak akan dikeluarkan ke kotak hitam.
-
-# LOCALIZATION NOTE (consolecloseDesc) A very short description of the
-# 'console close' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-consolecloseDesc=Tutup konsol
-
-# LOCALIZATION NOTE (consoleopenDesc) A very short description of the
-# 'console open' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-consoleopenDesc=Buka konsol
-
-# LOCALIZATION NOTE (editDesc) A very short description of the 'edit'
-# command. See editManual2 for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-editDesc=Ubahsuaikan sumber daya laman
-
-# LOCALIZATION NOTE (editManual2) A fuller description of the 'edit' command,
-# displayed when the user asks for help on what it does.
-editManual2=Edit salah satu sumber daya yang menjadi bagian dari halaman ini
-
-# LOCALIZATION NOTE (editResourceDesc) A very short string to describe the
-# 'resource' parameter to the 'edit' command, which is displayed in a dialog
-# when the user is using this command.
-editResourceDesc=URL yang diedit
-
-# LOCALIZATION NOTE (editLineToJumpToDesc) A very short string to describe the
-# 'line' parameter to the 'edit' command, which is displayed in a dialog
-# when the user is using this command.
-editLineToJumpToDesc=Loncat ke baris
-
-# LOCALIZATION NOTE (resizePageDesc) A very short string to describe the
-# 'resizepage' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-resizePageDesc=Ubah ukuran laman
-
-# LOCALIZATION NOTE (resizePageArgWidthDesc) A very short string to describe the
-# 'width' parameter to the 'resizepage' command, which is displayed in a dialog
-# when the user is using this command.
-resizePageArgWidthDesc=Lebar dalam satuan piksel
-
-# LOCALIZATION NOTE (resizePageArgWidthDesc) A very short string to describe the
-# 'height' parameter to the 'resizepage' command, which is displayed in a dialog
-# when the user is using this command.
-resizePageArgHeightDesc=Tinggi dalam satuan piksel
-
-# LOCALIZATION NOTE (resizeModeOnDesc) A very short string to describe the
-# 'resizeon ' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-resizeModeOnDesc=Memasuki Mode Desain Responsif
-
-# LOCALIZATION NOTE (resizeModeOffDesc) A very short string to describe the
-# 'resize off' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-resizeModeOffDesc=Keluar dari Mode Desain Responsif
-
-# LOCALIZATION NOTE (resizeModeToggleDesc) A very short string to describe the
-# 'resize toggle' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-resizeModeToggleDesc=Pengalih Mode Desain Responsif
-
-# LOCALIZATION NOTE (resizeModeToggleTooltip) A string displayed as the
-# tooltip of button in devtools toolbox which toggles Responsive Design Mode.
-resizeModeToggleTooltip=Tampilan Desain Responsif
-
-# LOCALIZATION NOTE (resizeModeToDesc) A very short string to describe the
-# 'resize to' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-resizeModeToDesc=Ubah ukuran laman
-
-# LOCALIZATION NOTE (resizeModeDesc) A very short string to describe the
-# 'resize' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-resizeModeDesc=Mengatur Mode Desain Responsif
-
-# LOCALIZATION NOTE (resizeModeManual) A fuller description of the 'resize'
-# command, displayed when the user asks for help on what it does.
-# The argument (%1$S) is the browser name.
-resizeModeManual2=Situs web yang responsif bereaksi terhadap lingkungan penampilnya, sehingga terlihat baik pada tampilan seluler, tampilan sinema, dan ukuran tampilan di antaranya. Mode Desain Responsif dapat digunakan untuk menguji berbagai ukuran laman pada %1$S tanpa perlu mengubah ukuran jendela peramban secara keseluruhan.
-
-# LOCALIZATION NOTE (cmdDesc) A very short description of the 'cmd'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-cmdDesc=Memanipulasi perintah
-
-# LOCALIZATION NOTE (cmdRefreshDesc) A very short description of the 'cmd refresh'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-cmdRefreshDesc=Membaca ulang direktori mozcmd
-
-# LOCALIZATION NOTE (cmdStatus3) When the we load new commands from mozcmd
-# directory, we report where we loaded from using %1$S.
-cmdStatus3=Perintah dimuat dari '%1$S'
-
-# LOCALIZATION NOTE (cmdSetdirDesc)  A very short description of the 'cmd setdir'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-cmdSetdirDesc=Siapkan folder berisi mozcmd
-
-# LOCALIZATION NOTE (cmdSetdirManual2) A fuller description of the 'cmd setdir'
-# command, displayed when the user asks for help on what it does.
-cmdSetdirManual2=Folder 'mozcmd' merupakan cara mudah untuk membuat perintah khusus baru. Untuk informasi selengkapnya, baca <a href="https://developer.mozilla.org/docs/Tools/GCLI/Customization">dokumentasi MDN</a>.
-
-# LOCALIZATION NOTE (cmdSetdirDirectoryDesc) The description of the directory
-# parameter to the 'cmd setdir' command.
-cmdSetdirDirectoryDesc=Folder berisi berkas .mozcmd
-
-# LOCALIZATION NOTE (addonDesc) A very short description of the 'addon'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-addonDesc=Memanipulasi pengaya
-
-# LOCALIZATION NOTE (addonListDesc) A very short description of the 'addon list'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-addonListDesc=Tampilkan pengaya terpasang
-
-# LOCALIZATION NOTE (addonListTypeDesc) A very short description of the
-# 'addon list <type>' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-addonListTypeDesc=Pilih jenis pengaya
-
-# LOCALIZATION NOTE (addonListDictionaryHeading, addonListExtensionHeading,
-# addonListLocaleHeading, addonListPluginHeading, addonListThemeHeading,
-# addonListUnknownHeading) Used in the output of the 'addon list' command as the
-# first line of output.
-addonListDictionaryHeading=Kamus berikut terpasang:
-addonListExtensionHeading=Ekstensi berikut terpasang:
-addonListLocaleHeading=Pelokalan berikut terpasang:
-addonListPluginHeading=Plugin berikut terpasang:
-addonListThemeHeading=Tema berikut terpasang:
-addonListAllHeading=Pengaya berikut terpasang:
-addonListUnknownHeading=Pengaya jenis terpilih berikut terpasang:
-
-# LOCALIZATION NOTE (addonListOutEnable, addonListOutDisable) Used in the
-# output of the 'addon list' command as the labels for the enable/disable
-# action buttons in the listing. This string is designed to be shown in a
-# small action button next to the addon name, which is why it should be as
-# short as possible.
-addonListOutEnable=Aktifkan
-addonListOutDisable=Nonaktifkan
-
-# LOCALIZATION NOTE (addonPending, addonPendingEnable, addonPendingDisable,
-# addonPendingUninstall, addonPendingInstall, addonPendingUpgrade) Used in
-# the output of the 'addon list' command as the descriptions of pending
-# addon operations. addonPending is used as a prefix for a list of pending
-# actions (named by the other lookup variables). These strings are designed
-# to be shown alongside addon names, which is why they should be as short
-# as possible.
-addonPending=tertunda
-addonPendingEnable=aktifkan
-addonPendingDisable=nonaktifkan
-addonPendingUninstall=hapus instalasi
-addonPendingInstall=instal
-addonPendingUpgrade=tingkatkan versi
-
-# LOCALIZATION NOTE (addonNameDesc) A very short description of the
-# name parameter of numerous add-on commands. This string is designed to be shown
-# in a menu alongside the command name, which is why it should be as short as
-# possible.
-addonNameDesc=Nama pengaya
-
-# LOCALIZATION NOTE (addonNoneOfType) Used in the output of the 'addon list'
-# command when a search for add-ons of a particular type were not found.
-addonNoneOfType=Tidak ada pengaya jenis tersebut yang terpasang.
-
-# LOCALIZATION NOTE (addonEnableDesc) A very short description of the
-# 'addon enable <type>' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-addonEnableDesc=Aktifkan pengaya yang telah ditentukan
-
-# LOCALIZATION NOTE (addonAlreadyEnabled) Used in the output of the
-# 'addon enable' command when an attempt is made to enable an add-on that is
-# already enabled.
-addonAlreadyEnabled=%S sudah diaktifkan.
-
-# LOCALIZATION NOTE (addonEnabled) Used in the output of the 'addon enable'
-# command when an add-on is enabled.
-addonEnabled=%S diaktifkan.
-
-# LOCALIZATION NOTE (addonDisableDesc) A very short description of the
-# 'addon disable <type>' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-addonDisableDesc=Nonaktifkan pengaya yang telah ditentukan
-
-# LOCALIZATION NOTE (addonAlreadyDisabled) Used in the output of the
-# 'addon disable' command when an attempt is made to disable an add-on that is
-# already disabled.
-addonAlreadyDisabled=%S sudah dinonaktifkan.
-
-# LOCALIZATION NOTE (addonDisabled) Used in the output of the 'addon disable'
-# command when an add-on is disabled.
-addonDisabled=%S dinonaktifkan.
-
-# LOCALIZATION NOTE (exportDesc) A very short description of the 'export'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-exportDesc=Ekspor sumber daya
-
-# LOCALIZATION NOTE (exportHtmlDesc) A very short description of the 'export
-# html' command. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible.
-exportHtmlDesc=Ekspor laman dalam format HTML
-
-# LOCALIZATION NOTE (pagemodDesc) A very short description of the 'pagemod'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-pagemodDesc=Ubah laman
-
-# LOCALIZATION NOTE (pagemodReplaceDesc) A very short description of the
-# 'pagemod replace' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-pagemodReplaceDesc=Cari dan ganti di elemen pada laman
-
-# LOCALIZATION NOTE (pagemodReplaceSearchDesc) A very short string to describe
-# the 'search' parameter to the 'pagemod replace' command, which is displayed in
-# a dialog when the user is using this command.
-pagemodReplaceSearchDesc=Yang dicari
-
-# LOCALIZATION NOTE (pagemodReplaceReplaceDesc) A very short string to describe
-# the 'replace' parameter to the 'pagemod replace' command, which is displayed in
-# a dialog when the user is using this command.
-pagemodReplaceReplaceDesc=Teks pengganti
-
-# LOCALIZATION NOTE (pagemodReplaceIgnoreCaseDesc) A very short string to
-# describe the 'ignoreCase' parameter to the 'pagemod replace' command, which is
-# displayed in a dialog when the user is using this command.
-pagemodReplaceIgnoreCaseDesc=Pencarian (besar/kecil berpengaruh)
-
-# LOCALIZATION NOTE (pagemodReplaceRootDesc) A very short string to describe the
-# 'root' parameter to the 'pagemod replace' command, which is displayed in
-# a dialog when the user is using this command.
-pagemodReplaceRootDesc=Selektor CSS induk yang akan dicari
-
-# LOCALIZATION NOTE (pagemodReplaceSelectorDesc) A very short string to describe
-# the 'selector' parameter to the 'pagemod replace' command, which is displayed
-# in a dialog when the user is using this command.
-pagemodReplaceSelectorDesc=Selektor CSS yang akan dicocokkan dalam pencarian
-
-# LOCALIZATION NOTE (pagemodReplaceAttributesDesc) A very short string to
-# describe the 'attributes' parameter to the 'pagemod replace' command, which is
-# displayed in a dialog when the user is using this command.
-pagemodReplaceAttributesDesc=Pencocokan atribut berdasar regex
-
-# LOCALIZATION NOTE (pagemodReplaceAttrOnlyDesc) A very short string to describe
-# the 'attrOnly' parameter to the 'pagemod replace' command, which is displayed
-# in a dialog when the user is using this command.
-pagemodReplaceAttrOnlyDesc=Batas pencarian hanya pada atribut
-
-# LOCALIZATION NOTE (pagemodReplaceContentOnlyDesc) A very short string to
-# describe the 'contentOnly' parameter to the 'pagemod replace' command, which
-# is displayed in a dialog when the user is using this command.
-pagemodReplaceContentOnlyDesc=Batasi pencarian pada node teks
-
-# LOCALIZATION NOTE (pagemodReplaceResultMatchedElements) A string displayed as
-# the result of the 'pagemod replace' command.
-pagemodReplaceResult=Elemen yang cocok dengan selektor: %1$S. Penggantian pada node teks: %2$S. Penggantian pada atribut: %3$S.
-
-# LOCALIZATION NOTE (pagemodRemoveDesc) A very short description of the
-# 'pagemod remove' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-pagemodRemoveDesc=Hapus elemen dan atribut dari laman
-
-# LOCALIZATION NOTE (pagemodRemoveElementDesc) A very short description of the
-# 'pagemod remove element' command. This string is designed to be shown in
-# a menu alongside the command name, which is why it should be as short as
-# possible.
-pagemodRemoveElementDesc=Hapus elemen dari laman
-
-# LOCALIZATION NOTE (pagemodRemoveElementSearchDesc) A very short string to
-# describe the 'search' parameter to the 'pagemod remove element' command, which
-# is displayed in a dialog when the user is using this command.
-pagemodRemoveElementSearchDesc=Selektor CSS elemen yang akan dihapus
-
-# LOCALIZATION NOTE (pagemodRemoveElementRootDesc) A very short string to
-# describe the 'root' parameter to the 'pagemod remove element' command, which
-# is displayed in a dialog when the user is using this command.
-pagemodRemoveElementRootDesc=Selektor CSS induk yang akan dicari
-
-# LOCALIZATION NOTE (pagemodRemoveElementStripOnlyDesc) A very short string to
-# describe the 'stripOnly' parameter to the 'pagemod remove element' command,
-# which is displayed in a dialog when the user is using this command.
-pagemodRemoveElementStripOnlyDesc=Hapus elemen, biarkan kontennya
-
-# LOCALIZATION NOTE (pagemodRemoveElementIfEmptyOnlyDesc) A very short string to
-# describe the 'ifEmptyOnly' parameter to the 'pagemod remove element' command,
-# which is displayed in a dialog when the user is using this command.
-pagemodRemoveElementIfEmptyOnlyDesc=Hanya hapus elemen yang kosong
-
-# LOCALIZATION NOTE (pagemodRemoveElementResultMatchedAndRemovedElements)
-# A string displayed as the result of the 'pagemod remove element' command.
-pagemodRemoveElementResultMatchedAndRemovedElements=Elemen yang cocok dengan selektor: %1$S. Element dihapus: %2$S.
-
-# LOCALIZATION NOTE (pagemodRemoveAttributeDesc) A very short description of the
-# 'pagemod remove attribute' command. This string is designed to be shown in
-# a menu alongside the command name, which is why it should be as short as
-# possible.
-pagemodRemoveAttributeDesc=Hapus atribut yang cocok
-
-# LOCALIZATION NOTE (pagemodRemoveAttributeSearchAttributesDesc) A very short
-# string to describe the 'searchAttributes' parameter to the 'pagemod remove
-# attribute' command, which is displayed in a dialog when the user is using this
-# command.
-pagemodRemoveAttributeSearchAttributesDesc=Pola regex untuk atribut yang akan diganti
-
-# LOCALIZATION NOTE (pagemodRemoveAttributeSearchElementsDesc) A very short
-# string to describe the 'searchElements' parameter to the 'pagemod remove
-# attribute' command, which is displayed in a dialog when the user is using this
-# command.
-pagemodRemoveAttributeSearchElementsDesc=Selektor CSS elemen untuk disertakan
-
-# LOCALIZATION NOTE (pagemodRemoveAttributeRootDesc) A very short string to
-# describe the 'root' parameter to the 'pagemod remove attribute' command, which
-# is displayed in a dialog when the user is using this command.
-pagemodRemoveAttributeRootDesc=Selektor CSS induk pencarian
-
-# LOCALIZATION NOTE (pagemodRemoveAttributeIgnoreCaseDesc) A very short string
-# to describe the 'ignoreCase' parameter to the 'pagemod remove attribute'
-# command, which is displayed in a dialog when the user is using this command.
-pagemodRemoveAttributeIgnoreCaseDesc=Pencarian (besar/kecil berpengaruh)
-
-# LOCALIZATION NOTE (pagemodRemoveAttributeResult) A string displayed as the
-# result of the 'pagemod remove attribute' command.
-pagemodRemoveAttributeResult=Elemen yang cocok dengan selektor: %1$S. Atribut dihapus: %2$S.
-
-# LOCALIZATION NOTE (toolsDesc2) A very short description of the 'tools'
-# command, the parent command for tool-hacking commands.
-# The argument (%1$S) is the browser name.
-toolsDesc2=Retas Alat Pengembang %1$S
-
-# LOCALIZATION NOTE (toolsManual2) A fuller description of the 'tools'
-# command. The argument (%1$S) is the browser name.
-toolsManual2=Berbagai perintah yang terkait dengan peretasan langsung ke Alat Pengembang %1$S.
-
-# LOCALIZATION NOTE (toolsSrcdirDesc) A very short description of the 'tools srcdir'
-# command, for pointing your developer tools loader at a mozilla-central source tree.
-toolsSrcdirDesc=Muat alat dari proses checkout dari mozilla-central
-
-# LOCALIZATION NOTE (toolsSrcdirNotFound) Shown when the 'tools srcdir' command was handed
-# an invalid srcdir.
-toolsSrcdirNotFound=%1$s tidak ada atau bukan checkout dari mozilla-central.
-
-# LOCALIZATION NOTE (toolsSrcdirReloaded) Displayed when tools have been reloaded by the
-# 'tools srcdir' command.
-toolsSrcdirReloaded=Alat dimuat dari %1$s.
-
-# LOCALIZATION NOTE (toolsSrcdirManual2) A full description of the 'tools srcdir'
-# command. The argument (%1$S) is the browser name.
-toolsSrcdirManual2=Muat Alat Pengembang %1$S dari checkout lengkap complete mozilla-central.
-
-# LOCALIZATION NOTE (toolsSrcdirDir) The srcdir argument to the 'tools srcdir' command.
-toolsSrcdirDir=Checkout mozilla-central
-
-# LOCALIZATION NOTE (toolsBuiltinDesc) A short description of the 'tools builtin'
-# command, which overrides a previous 'tools srcdir' command.
-toolsBuiltinDesc=Gunakan alat yang tersedia secara bawaan
-
-# LOCALIZATION NOTE (toolsBuiltinDesc) A fuller description of the 'tools builtin'
-# command.
-toolsBuiltinManual=Gunakan alat yang tersedia secara bawaan, tanpa menghiraukan perintah srcdir sebelumnya.
-
-# LOCALIZATION NOTE (toolsBuiltinReloaded) Displayed when tools are loaded with the
-# 'tools builtin' command.
-toolsBuiltinReloaded=Alat bawaan dimuat.
-
-# LOCALIZATION NOTE (toolsReloadDesc) A short description of the 'tools reload' command.
-# which will reload the tools from the current srcdir.
-toolsReloadDesc=Muat ulang alat pengembang
-
-# LOCALIZATION NOTE (toolsReloaded2) Displayed when tools are reloaded with the 'tools
-# reload' command.
-toolsReloaded2=Alat dimuat ulang.
-
-# LOCALIZATION NOTE (cookieDesc) A very short description of the 'cookie'
-# command. See cookieManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-cookieDesc=Tampilkan dan ubah kuki
-
-# LOCALIZATION NOTE (cookieManual) A fuller description of the 'cookie'
-# command, displayed when the user asks for help on what it does.
-cookieManual=Perintah untuk menampilkan, membuat, menghapus, dan mengubah kuki pada domain saat ini.
-
-# LOCALIZATION NOTE (cookieListDesc) A very short description of the
-# 'cookie list' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-cookieListDesc=Tampilkan kuki
-
-# LOCALIZATION NOTE (cookieListManual) A fuller description of the 'cookie list'
-# command, displayed when the user asks for help on what it does.
-cookieListManual=Tampilkan daftar kuki yang relevan untuk laman ini.
-
-# LOCALIZATION NOTE (cookieListOutHost,cookieListOutPath,cookieListOutExpires,cookieListOutAttributes):
-# The 'cookie list' command has a number of headings for cookie properties.
-# Particular care should be taken in translating these strings as they have
-# references to names in the cookies spec.
-cookieListOutHost=Host:
-cookieListOutPath=Jalur:
-cookieListOutExpires=Kedaluwarsa:
-cookieListOutAttributes=Atribut:
-
-# LOCALIZATION NOTE (cookieListOutNone) The output of the 'cookie list' command
-# uses this string when no cookie attributes (like httpOnly, secure, etc) apply
-cookieListOutNone=Tidak ada
-
-# LOCALIZATION NOTE (cookieListOutSession) The output of the 'cookie list'
-# command uses this string to describe a cookie with an expiry value of '0'
-# that is to say it is a session cookie
-cookieListOutSession=Saat keluar dari peramban (sesi)
-
-# LOCALIZATION NOTE (cookieListOutNonePage) The output of the 'cookie list'
-# command uses this string for pages like 'about:blank' which can't contain
-# cookies
-cookieListOutNonePage=Tidak ada kuki yang ditemukan untuk laman ini
-
-# LOCALIZATION NOTE (cookieListOutNoneHost) The output of the 'cookie list'
-# command uses this string when there are no cookies on a given web page
-cookieListOutNoneHost=Tidak ada kuki yang ditemukan untuk host %1$S
-
-# LOCALIZATION NOTE (cookieListOutEdit) A title used in the output from the
-# 'cookie list' command on a button which can be used to edit cookie values
-cookieListOutEdit=Edit
-
-# LOCALIZATION NOTE (cookieListOutRemove) A title used in the output from the
-# 'cookie list' command on a button which can be used to remove cookies
-cookieListOutRemove=Hapus
-
-# LOCALIZATION NOTE (cookieRemoveDesc) A very short description of the
-# 'cookie remove' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-cookieRemoveDesc=Hapus kuki
-
-# LOCALIZATION NOTE (cookieRemoveManual) A fuller description of the 'cookie remove'
-# command, displayed when the user asks for help on what it does.
-cookieRemoveManual=Hapus kuki berdasarkan kuncinya
-
-# LOCALIZATION NOTE (cookieRemoveKeyDesc) A very short string to describe the
-# 'key' parameter to the 'cookie remove' command, which is displayed in a dialog
-# when the user is using this command.
-cookieRemoveKeyDesc=Kunci kuki yang akan dihapus
-
-# LOCALIZATION NOTE (cookieSetDesc) A very short description of the
-# 'cookie set' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-cookieSetDesc=Setel kuki
-
-# LOCALIZATION NOTE (cookieSetManual) A fuller description of the 'cookie set'
-# command, displayed when the user asks for help on what it does.
-cookieSetManual=Setel kuki berdasarkan nama kunci, nilai, dan salah satu atribut opsional berikut: expires (max-age dalam detik atau expires date dalam format GMTString), path, domain, dan secure
-
-# LOCALIZATION NOTE (cookieSetKeyDesc) A very short string to describe the
-# 'key' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetKeyDesc=Kunci kuki yang akan disetel
-
-# LOCALIZATION NOTE (cookieSetValueDesc) A very short string to describe the
-# 'value' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetValueDesc=Nilai kuki yang akan disetel
-
-# LOCALIZATION NOTE (cookieSetOptionsDesc) The title of a set of options to
-# the 'cookie set' command, displayed as a heading to the list of option.
-cookieSetOptionsDesc=Opsi
-
-# LOCALIZATION NOTE (cookieSetPathDesc) A very short string to describe the
-# 'path' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetPathDesc=Jalur lokasi kuki yang akan disetel
-
-# LOCALIZATION NOTE (cookieSetDomainDesc) A very short string to describe the
-# 'domain' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetDomainDesc=Domain kuki yang akan disetel
-
-# LOCALIZATION NOTE (cookieSetSecureDesc) A very short string to describe the
-# 'secure' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetSecureDesc=Hanya kirimkan lewat https
-
-# LOCALIZATION NOTE (cookieSetHttpOnlyDesc) A very short string to describe the
-# 'httpOnly' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetHttpOnlyDesc=Tidak dapat diakses dari skrip sisi klien
-
-# LOCALIZATION NOTE (cookieSetSessionDesc) A very short string to describe the
-# 'session' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetSessionDesc=Hanya valid selama sesi peramban
-
-# LOCALIZATION NOTE (cookieSetExpiresDesc) A very short string to describe the
-# 'expires' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetExpiresDesc=Tanggal kedaluwarsa kuki (format RFC2822 dalam kutip atau tanggal ISO 8601)
-
-# LOCALIZATION NOTE (jsbDesc) A very short description of the
-# 'jsb' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-jsbDesc=Pemformat JavaScript
-
-# LOCALIZATION NOTE (jsbUrlDesc) A very short description of the
-# 'jsb <url>' parameter. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-jsbUrlDesc=URL berkas JS untuk diformat
-
-# LOCALIZATION NOTE (jsbIndentSizeDesc) A very short description of the
-# 'jsb <indentSize>' parameter. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-jsbIndentSizeDesc=Ukuran indentasi dalam karakter
-
-# LOCALIZATION NOTE (jsbIndentSizeManual) A fuller description of the
-# 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
-# does.
-jsbIndentSizeManual=Jumlah karakter indentasi tiap baris
-
-# LOCALIZATION NOTE (jsbIndentCharDesc) A very short description of the
-# 'jsb <indentChar>' parameter. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-jsbIndentCharDesc=Karakter indentasi tiap baris
-
-# LOCALIZATION NOTE (jsbIndentCharManual) A fuller description of the
-# 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
-# does.
-jsbIndentCharManual=Karakter yang akan digunakan untuk indentasi baris. Salah satu dari spasi atau tab.
-
-# the 'jsb <doNotPreserveNewlines>' parameter. This string is designed to be
-# shown in a menu alongside the command name, which is why it should be as short
-# as possible.
-jsbDoNotPreserveNewlinesDesc=Buang semua baris kosong
-
-# LOCALIZATION NOTE (jsbPreserveNewlinesManual) A fuller description of the
-# 'jsb <jsbPreserveNewlines>' parameter, displayed when the user asks for help
-# on what it does.
-jsbPreserveNewlinesManual=Pilihan untuk menghapus atau membiarkan baris kosong yang ada
-
-# LOCALIZATION NOTE (jsbPreserveMaxNewlinesDesc) A very short description of the
-# 'jsb <preserveMaxNewlines>' parameter. This string is designed to be shown
-# in a menu alongside the command name, which is why it should be as short as
-# possible.
-jsbPreserveMaxNewlinesDesc=Jumlah baris kosong berurutan
-
-# LOCALIZATION NOTE (jsbPreserveMaxNewlinesManual) A fuller description of the
-# 'jsb <preserveMaxNewlines>' parameter, displayed when the user asks for help
-# on what it does.
-jsbPreserveMaxNewlinesManual=Jumlah maksimum baris kosong yang akan dibiarkan
-
-# LOCALIZATION NOTE (jsbJslintHappyDesc) A very short description of the
-# 'jsb <jslintHappy>' parameter. This string is designed to be shown
-# in a menu alongside the command name, which is why it should be as short as
-# possible.
-jsbJslintHappyDesc=Paksa mode jslint-stricter?
-
-# LOCALIZATION NOTE (jsbJslintHappyManual) A fuller description of the
-# 'jsb <jslintHappy>' parameter, displayed when the user asks for help
-# on what it does.
-jsbJslintHappyManual=Jika disetel sebagai true, mode jslint-stricter akan digunakan secara paksa
-
-# LOCALIZATION NOTE (jsbBraceStyleDesc2) A very short description of the
-# 'jsb <braceStyle>' parameter. This string is designed to be shown
-# in a menu alongside the command name, which is why it should be as short as
-# possible.
-jsbBraceStyleDesc2=Pilih gaya kode untuk tanda kurung
-
-# LOCALIZATION NOTE (jsbBraceStyleManual2) A fuller description of the
-# 'jsb <braceStyle>' parameter, displayed when the user asks for help
-# on what it does.
-#
-# NOTES: The keywords collapse, expand, end-expand and expand-strict should not
-# be translated. "even if it will break your code" means that the resulting code
-# may no longer be functional.
-jsbBraceStyleManual2=Pilih gaya kode untuk tanda kurung: ciutkan - tanda kurung ada di baris yang sama dengan pernyataan kontrol; bentangkan - tanda kurung pada baris baru (gaya Allman/ANSI); pembentangan ketat - tanda kurung pada baris baru walau pun kodenya akan rusak.
-
-# LOCALIZATION NOTE (jsbNoSpaceBeforeConditionalDesc) A very short description
-# of the 'jsb <noSpaceBeforeConditional>' parameter. This string is designed to
-# be shown in a menu alongside the command name, which is why it should be as
-# short as possible.
-jsbNoSpaceBeforeConditionalDesc=Hapus spasi sebelum pernyataan kondisional
-
-# LOCALIZATION NOTE (jsbUnescapeStringsDesc) A very short description of the
-# 'jsb <unescapeStrings>' parameter. This string is designed to be shown
-# in a menu alongside the command name, which is why it should be as short as
-# possible.
-jsbUnescapeStringsDesc=Karakter \\xNN di-unescape?
-
-# LOCALIZATION NOTE (jsbUnescapeStringsManual) A fuller description of the
-# 'jsb <unescapeStrings>' parameter, displayed when the user asks for help
-# on what it does.
-jsbUnescapeStringsManual=Aktif/Nonaktifkan proses unescape pada string notasi \\xNN?
-
-# LOCALIZATION NOTE (jsbInvalidURL) Displayed when an invalid URL is passed to
-# the jsb command.
-jsbInvalidURL=Masukkan URL yang valid
-
-# LOCALIZATION NOTE (jsbOptionsDesc) The title of a set of options to
-# the 'jsb' command, displayed as a heading to the list of options.
-jsbOptionsDesc=Opsi
-
-# LOCALIZATION NOTE (calllogDesc) A very short description of the
-# 'calllog' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-calllogDesc=Perintah untuk memanipulasi pencatatan pemanggilan fungsi
-
-# LOCALIZATION NOTE (calllogStartDesc) A very short description of the
-# 'calllog start' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-calllogStartDesc=Mulai pencatatan pemanggilan fungsi ke konsol
-
-# LOCALIZATION NOTE (calllogStartReply) A string displayed as the result of
-# the 'calllog start' command.
-calllogStartReply=Pencatatan pemanggilan dimulai.
-
-# LOCALIZATION NOTE (calllogStopDesc) A very short description of the
-# 'calllog stop' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-calllogStopDesc=Hentikan pencatatan pemanggilan fungsi
-
-# LOCALIZATION NOTE (calllogStopNoLogging) A string displayed as the result of
-# the 'calllog stop' command when there is nothing to stop.
-calllogStopNoLogging=Tidak ada pencatatan pemanggilan yang aktif
-
-# LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
-# the 'calllog stop' command when there are logging actions to stop.
-calllogStopReply=Hentikan pencatatan pemanggilan. Konteks aktif: %1$S.
-
-# LOCALIZATION NOTE (calllogStartChromeDesc) A very short description of the
-# 'calllog chromestart' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-calllogChromeStartDesc=Mulai pencatatan pemanggilan fungsi untuk kode chrome ke konsol
-
-# LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
-# 'calllog chromestart <sourceType>' parameter. This string is designed to be
-# shown in a menu alongside the command name, which is why it should be as short as possible.
-calllogChromeSourceTypeDesc=Objek global, URI JSM, atau JS yang akan diambil objek globalnya
-
-# LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
-# 'calllog chromestart' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-calllogChromeSourceTypeManual=The global object, URI of a JSM, or JS to execute in the chrome window from which to obtain a global object
-
-# LOCALIZATION NOTE (calllogChromeStartReply) A string displayed as the result
-# of the 'calllog chromestart' command.
-calllogChromeStartReply=Pencatatan pemanggilan dimulai.
-
-# LOCALIZATION NOTE (calllogChromeStopDesc) A very short description of the
-# 'calllog chromestop' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-calllogChromeStopDesc=Hentikan pencatatan pemanggilan fungsi
-
-# LOCALIZATION NOTE (calllogChromeStopNoLogging) A string displayed as the
-# result of the 'calllog chromestop' command when there is nothing to stop.
-calllogChromeStopNoLogging=Tidak ada pencatatan pemanggilan pada kode chrome yang sedang aktif
-
-# LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
-# the 'calllog chromestop' command when there are logging actions to stop.
-calllogChromeStopReply=Pencatatan pemanggilan dihentikan. Konteks aktif: %1$S.
-
-# LOCALIZATION NOTE (callLogChromeAnonFunction) A string displayed as the result
-# of the 'calllog chromestart' command when an anonymouse function is to be
-# logged.
-callLogChromeAnonFunction=<anonymous>
-
-# LOCALIZATION NOTE (callLogChromeMethodCall) A string displayed as the result
-# of the 'calllog chromestart' command to proceed a method name when it is to be
-# logged.
-callLogChromeMethodCall=Pemanggilan metode
-
-# LOCALIZATION NOTE (callLogChromeInvalidJSM) A string displayed as the result
-# of the 'calllog chromestart' command with an invalid JSM or JSM path.
-callLogChromeInvalidJSM=JSM tidak valid!
-
-# LOCALIZATION NOTE (callLogChromeVarNotFoundContent) A string displayed as the
-# result of the 'calllog chromestart' command with a source type of
-# content-variable and an invalid variable name.
-callLogChromeVarNotFoundContent=Variabel tidak ditemukan pada jendela konten.
-
-# LOCALIZATION NOTE (callLogChromeVarNotFoundChrome) A string displayed as the
-# result of the 'calllog chromestart' command with a source type of
-# chrome-variable and an invalid variable name.
-callLogChromeVarNotFoundChrome=Variabel tidak ditemukan pada jendela chrome.
-
-# LOCALIZATION NOTE (callLogChromeEvalException) A string displayed as the
-# result of the 'calllog chromestart' command with a source type of JavaScript
-# and invalid JavaScript code.
-callLogChromeEvalException=JavaScript yang dievaluasi melemparkan eksepsi berikut
-
-# LOCALIZATION NOTE (callLogChromeEvalNeedsObject) A string displayed as the
-# result of passing a non-JavaScript object creating source via the
-# 'calllog chromestart javascript' command.
-callLogChromeEvalNeedsObject=Sumber JavaScript harus mengevaluasi objek yang berisi pemanggilan metode yang akan dicatat, misalnya "({a1: function() {this.a2()},a2: function() {}});"
-
-# LOCALIZATION NOTE (scratchpadOpenTooltip) A string displayed as the
-# tooltip of button in devtools toolbox which opens Scratchpad.
-scratchpadOpenTooltip=Scratchpad
-
-# LOCALIZATION NOTE (paintflashingDesc) A very short string used to describe the
-# function of the "paintflashing" command
-paintflashingDesc=Sorot area yang digambar
-
-# LOCALIZATION NOTE (paintflashingOnDesc) A very short string used to describe the
-# function of the "paintflashing on" command.
-paintflashingOnDesc=Aktifkan kilat gambar
-
-# LOCALIZATION NOTE (paintflashingOffDesc) A very short string used to describe the
-# function of the "paintflashing off" command.
-paintflashingOffDesc=Nonaktifkan kilat gambar
-
-# LOCALIZATION NOTE (paintflashingChrome) A very short string used to describe the
-# function of the "paintflashing on/off chrome" command.
-paintflashingChromeDesc=frame chrome
-
-# LOCALIZATION NOTE (paintflashingManual) A longer description describing the
-# set of commands that control paint flashing.
-paintflashingManual=Gambar area yang digambar ulang pada warna yang berbeda
-
-# LOCALIZATION NOTE (paintflashingTooltip) A string displayed as the
-# tooltip of button in devtools toolbox which toggles paint flashing.
-paintflashingTooltip=Sorot area yang digambar
-
-# LOCALIZATION NOTE (paintflashingToggleDesc) A very short string used to describe the
-# function of the "paintflashing toggle" command.
-paintflashingToggleDesc=Aktifkan/Nonaktifkan kilat penggambaran
-
-# LOCALIZATION NOTE (splitconsoleTooltip) A string displayed as the
-# tooltip of button in devtools toolbox which toggles the split webconsole.
-splitconsoleTooltip=Aktifkan/Nonaktifkan pembagian konsol
-
-# LOCALIZATION NOTE (appCacheDesc) A very short string used to describe the
-# function of the "appcache" command
-appCacheDesc=Utilitas tembolok aplikasi
-
-# LOCALIZATION NOTE (appCacheValidateDesc) A very short string used to describe
-# the function of the "appcache validate" command.
-appCacheValidateDesc=Validasikan manifest tembolok
-
-# LOCALIZATION NOTE (appCacheValidateManual) A fuller description of the
-# 'validate' parameter to the 'appcache' command, displayed when the user asks
-# for help on what it does.
-appCacheValidateManual=Temukan masalah terkait manifest tembolok dan berkas yang dirujuk
-
-# LOCALIZATION NOTE (appCacheValidateUriDesc) A very short string used to describe
-# the function of the "uri" parameter of the appcache validate" command.
-appCacheValidateUriDesc=URI untuk diperiksa
-
-# LOCALIZATION NOTE (appCacheValidated) Displayed by the "appcache validate"
-# command when it has been successfully validated.
-appCacheValidatedSuccessfully=Tembolok aplikasi sukses divalidasikan.
-
-# LOCALIZATION NOTE (appCacheClearDesc) A very short string used to describe
-# the function of the "appcache clear" command.
-appCacheClearDesc=Bersihkan item pada tembolok aplikasi
-
-# LOCALIZATION NOTE (appCacheClearManual) A fuller description of the
-# 'appcache clear' command, displayed when the user asks for help on what it does.
-appCacheClearManual=Bersihkan satu atau lebih item pada tembolok aplikasi
-
-# LOCALIZATION NOTE (appCacheClearCleared) Displayed by the "appcache clear"
-# command when entries are successfully cleared.
-appCacheClearCleared=Item sukses dibersihkan.
-
-# LOCALIZATION NOTE (AppCacheListDesc) A very short string used to describe
-# the function of the "appcache list" command.
-appCacheListDesc=Tampilkan daftar item tembolok aplikasi.
-
-# LOCALIZATION NOTE (AppCacheListManual) A fuller description of the
-# 'appcache list' command, displayed when the user asks for help on what it does.
-appCacheListManual=Menampilkan daftar semua item tembolok aplikasi. Jika ada parameter pencarian, tabel akan menampilkan item yang cocok dengan yang dicari.
-
-# LOCALIZATION NOTE (AppCacheListSearchDesc) A very short string used to describe
-# the function of the "search" parameter of the appcache list" command.
-appCacheListSearchDesc=Filter hasil berdasarkan yang dicari
-
-# LOCALIZATION NOTE (AppCacheList*) Row headers for the 'appcache list' command.
-appCacheListKey=Kunci:
-appCacheListDataSize=Ukuran data:
-appCacheListDeviceID=ID Perangkat:
-appCacheListExpirationTime=Kedaluwarsa:
-appCacheListFetchCount=Jumlah pengambilan:
-appCacheListLastFetched=Terakhir diambil:
-appCacheListLastModified=Terakhir diubah:
-
-# LOCALIZATION NOTE (appCacheListViewEntry) The text for the view entry button
-# of the 'appcache list' command.
-appCacheListViewEntry=Tampilkan Item
-
-# LOCALIZATION NOTE (appCacheViewEntryDesc) A very short string used to describe
-# the function of the "appcache viewentry" command.
-appCacheViewEntryDesc=Buka tab baru berisi informasi item tembolok yang dipilih.
-
-# LOCALIZATION NOTE (appCacheViewEntryManual) A fuller description of the
-# 'appcache viewentry' command, displayed when the user asks for help on what it
-# does.
-appCacheViewEntryManual=Buka tab baru berisi informasi item tembolok yang dipilih.
-
-# LOCALIZATION NOTE (appCacheViewEntryKey) A very short string used to describe
-# the function of the "key" parameter of the 'appcache viewentry' command.
-appCacheViewEntryKey=Kunci item yang ditampilkan.
-
-# LOCALIZATION NOTE (profilerDesc) A very short string used to describe the
-# function of the profiler command.
-profilerDesc=Kelola profiler
-
-# LOCALIZATION NOTE (profilerManual) A longer description describing the
-# set of commands that control the profiler.
-profilerManual=Perintah untuk memulai atau menghentikan profiler JavaScript
-
-# LOCALIZATION NOTE (profilerOpen) A very short string used to describe the function
-# of the profiler open command.
-profilerOpenDesc=Buka profiler
-
-# LOCALIZATION NOTE (profilerClose) A very short string used to describe the function
-# of the profiler close command.
-profilerCloseDesc=Tutup profiler
-
-# LOCALIZATION NOTE (profilerStart) A very short string used to describe the function
-# of the profiler start command.
-profilerStartDesc=Mulai proses profil
-
-# LOCALIZATION NOTE (profilerStartManual) A fuller description of the 'profile name'
-# parameter. This parameter is used to name a newly created profile or to lookup
-# an existing profile by its name.
-profilerStartManual=Nama profil yang ingin dimulai.
-
-# LOCALIZATION NOTE (profilerStop) A very short string used to describe the function
-# of the profiler stop command.
-profilerStopDesc=Hentikan proses profil
-
-# LOCALIZATION NOTE (profilerStopManual) A fuller description of the 'profile name'
-# parameter. This parameter is used to lookup an existing profile by its name.
-profilerStopManual=Name profil yang ingin dihentikan.
-
-# LOCALIZATION NOTE (profilerList) A very short string used to describe the function
-# of the profiler list command.
-profilerListDesc=Tampilkan semua profil
-
-# LOCALIZATION NOTE (profilerShow) A very short string used to describe the function
-# of the profiler show command.
-profilerShowDesc=Tampilkan profil secara individual
-
-# LOCALIZATION NOTE (profilerShowManual) A fuller description of the 'profile name'
-# parameter. This parameter is used to name a newly created profile or to lookup
-# an existing profile by its name.
-profilerShowManual=Nama profil.
-
-# LOCALIZATION NOTE (profilerAlreadyStarted) A message that is displayed whenever
-# an operation cannot be completed because the profile in question has already
-# been started.
-profilerAlreadyStarted2=Profil sudah dimulai
-
-# LOCALIZATION NOTE (profilerNotFound) A message that is displayed whenever
-# an operation cannot be completed because the profile in question could not be
-# found.
-profilerNotFound=Profil tidak ditemukan
-
-# LOCALIZATION NOTE (profilerNotStarted) A message that is displayed whenever
-# an operation cannot be completed because the profile in question has not been
-# started yet. It also contains a hint to use the 'profile start' command to
-# start the profiler.
-profilerNotStarted3=Profiler belum dimulai. Gunakan perintah 'profile start' untuk memulai proses profil
-
-# LOCALIZATION NOTE (profilerStarted2) A very short string that indicates that
-# we have started recording.
-profilerStarted2=Merekam…
-
-# LOCALIZATION NOTE (profilerStopped) A very short string that indicates that
-# we have stopped recording.
-profilerStopped=Dihentikan…
-
-# LOCALIZATION NOTE (profilerNotReady) A message that is displayed whenever
-# an operation cannot be completed because the profiler has not been opened yet.
-profilerNotReady=Agar perintah ini dapat berfungsi, Anda harus membuka profiler terlebih dulu
-
-# LOCALIZATION NOTE (listenDesc) A very short string used to describe the
-# function of the 'listen' command.
-listenDesc=Buka port debug daring
-
-# LOCALIZATION NOTE (listenManual2) A longer description of the 'listen'
-# command.
-listenManual2=%1$S dapat mengizinkan pendebugan daring lewat sambungan TCP/IP. Untuk alasan keamanan, pengaturan ini tidak aktif secara baku, tetapi dapat diaktifkan dengan perintan ini.
-
-# LOCALIZATION NOTE (listenPortDesc) A very short string used to describe the
-# function of 'port' parameter to the 'listen' command.
-listenPortDesc=Port TCP untuk mendengar
-
-# LOCALIZATION NOTE (listenDisabledOutput) Text of a message output during the
-# execution of the 'listen' command.
-listenDisabledOutput=Pendengaran dinonaktifkan oleh nilai preferensi devtools.debugger.remote-enabled
-
-# LOCALIZATION NOTE (listenInitOutput) Text of a message output during the
-# execution of the 'listen' command. %1$S is a port number
-listenInitOutput=Mendengarkan pada port %1$S
-
-# LOCALIZATION NOTE (listenNoInitOutput) Text of a message output during the
-# execution of the 'listen' command.
-listenNoInitOutput=DebuggerServer tidak diinisialisasikan
-
-# LOCALIZATION NOTE (mediaDesc, mediaEmulateDesc, mediaEmulateManual,
-# mediaEmulateType, mediaResetDesc, mediaResetManual) These strings describe
-# the 'media' commands and all available parameters.
-mediaDesc=Emulasi jenis media CSS
-mediaEmulateDesc=Emulasikan jenis media CSS yang ditentukan
-mediaEmulateManual=Tampilkan dokumen seperti jika dirender pada perangkat yang menukung jenis media yang ditentukan, serta penerapan rule CSS yang relevan.
-mediaEmulateType=Jenis media untuk diemulasikan
-mediaResetDesc=Hentikan emulasi jenis media CSS
-
-# LOCALIZATION NOTE (injectDesc, injectManual, injectLibraryDesc, injectLoaded,
-# injectFailed) These strings describe the 'inject' commands and all available
-# parameters.
-injectDesc=Suntikkan pustaka umum ke laman
-injectManual2=Suntikkan pustaka umum ke konten laman yang juga dapat diakses dari konsol.
-injectLibraryDesc=Pilih pustaka untuk disuntikkan atau masukkan URI skrip yang valid untuk disuntikkkan
-injectLoaded=%1$S dimuat
-injectFailed=Gagal memuat %1$S - URI Tidak Valid
-
-# LOCALIZATION NOTE (folderDesc, folderOpenDesc, folderOpenDir,
-# folderOpenProfileDesc) These strings describe the 'folder' commands and
-# all available parameters.
-folderDesc=Buka folder
-folderOpenDesc=Buka lokasi folder
-folderOpenDir=Lokasi Direktori
-folderOpenProfileDesc=Buka direktori profil
-
-# LOCALIZATION NOTE (folderInvalidPath) A string displayed as the result
-# of the 'folder open' command with an invalid folder path.
-folderInvalidPath=Masukkan lokasi yang vali
-
-# LOCALIZATION NOTE (folderOpenDirResult) A very short string used to
-# describe the result of the 'folder open' command.
-# The argument (%1$S) is the folder path.
-folderOpenDirResult=%1$S dibuka
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/gcli.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/gcli.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/gcli.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/gcli.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,318 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# LOCALIZATION NOTE These strings are used inside the Web Console
-# command line which is available from the Web Developer sub-menu
-# -> 'Web Console'.
-# The correct localization of this file might be to keep it in
-# English, or another language commonly spoken among web developers.
-# You want to make that choice consistent across the developer tools.
-# A good criteria is the language in which you'd find the best
-# documentation on web development on the web.
-
-# For each command there are in general two strings. As an example consider
-# the 'pref' command.
-# commandDesc (e.g. prefDesc for the command 'pref'): this string contains a
-# very short description of the command. It's designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-# commandManual (e.g. prefManual for the command 'pref'): this string will
-# contain a fuller description of the command. It's diplayed when the user
-# asks for help about a specific command (e.g. 'help pref').
-
-# LOCALIZATION NOTE: This message is used to describe any command or command
-# parameter when no description has been provided.
-canonDescNone=(Tidak ada deskripsi)
-
-# LOCALIZATION NOTE: The default name for a group of parameters.
-canonDefaultGroupName=Opsi
-
-# LOCALIZATION NOTE (canonProxyDesc, canonProxyManual): These commands are
-# used to execute commands on a remote system (using a proxy). Parameters: %S
-# is the name of the remote system.
-canonProxyDesc=Jalankan perintah pada %S
-canonProxyManual=Sekelompok perintah yang dijalankan pada sistem daring. Sistem daring dihubungi lewat %S
-
-# LOCALIZATION NOTE: This error message is displayed when we try to add a new
-# command (using a proxy) where one already exists with the same name.
-canonProxyExists=Sudah ada perintah dengan nama '%S'
-
-# LOCALIZATION NOTE: This message describes the '{' command, which allows
-# entry of JavaScript like traditional developer tool command lines.
-cliEvalJavascript=Ketikkan langsung JavaScript
-
-# LOCALIZATION NOTE: This message is displayed when the command line has more
-# arguments than the current command can understand.
-cliUnusedArg=Terlalu banyak argumen
-
-# LOCALIZATION NOTE: The title of the dialog which displays the options that
-# are available to the current command.
-cliOptions=Opsi Tersedia
-
-# LOCALIZATION NOTE: The error message when the user types a command that
-# isn't registered
-cliUnknownCommand=Perintah Tidak Valid
-
-# LOCALIZATION NOTE: A parameter should have a value, but doesn't
-cliIncompleteParam=Dibutuhkan nilai untuk '%1$S'.
-
-# LOCALIZATION NOTE: Error message given when a file argument points to a file
-# that does not exist, but should (e.g. for use with File->Open) %1$S is a
-# filename
-fileErrNotExists='%1$S' tidak ada
-
-# LOCALIZATION NOTE: Error message given when a file argument points to a file
-# that exists, but should not (e.g. for use with File->Save As) %1$S is a
-# filename
-fileErrExists='%1$S' sudah ada
-
-# LOCALIZATION NOTE: Error message given when a file argument points to a
-# non-file, when a file is needed. %1$S is a filename
-fileErrIsNotFile='%1$S' bukan berkas
-
-# LOCALIZATION NOTE: Error message given when a file argument points to a
-# non-directory, when a directory is needed (e.g. for use with 'cd') %1$S is a
-# filename
-fileErrIsNotDirectory='%1$S' bukan direktori
-
-# LOCALIZATION NOTE: Error message given when a file argument does not match
-# the specified regular expression %1$S is a filename %2$S is a regular
-# expression
-fileErrDoesntMatch='%1$S' tidak cocok dengan '%2$S'
-
-# LOCALIZATION NOTE: When the menu has displayed all the matches that it
-# should (i.e. about 10 items) then we display this to alert the user that
-# more matches are available.
-fieldMenuMore=Teruskan mengetik untuk mengetahui pilihan lain yang cocok
-
-# LOCALIZATION NOTE: The command line provides completion for JavaScript
-# commands, however there are times when the scope of what we're completing
-# against can't be used. This error message is displayed when this happens.
-jstypeParseScope=Cakupan hilang
-
-# LOCALIZATION NOTE (jstypeParseMissing, jstypeBeginSyntax,
-# jstypeBeginUnterm): These error messages are displayed when the command line
-# is doing JavaScript completion and encounters errors.
-jstypeParseMissing=Tidak dapat menemukan properti '%S'
-jstypeBeginSyntax=Galat sintaks
-jstypeBeginUnterm=Literal string tidak diakhiri dengan benar
-
-# LOCALIZATION NOTE: This message is displayed if the system for providing
-# JavaScript completions encounters and error it displays this.
-jstypeParseError=Galat
-
-# LOCALIZATION NOTE (typesNumberNan, typesNumberNotInt2, typesDateNan): These
-# error messages are displayed when the command line is passed a variable
-# which has the wrong format and can't be converted. Parameters: %S is the
-# passed variable.
-typesNumberNan=Tidak dapat mengonversikan "%S" menjadi angka.
-typesNumberNotInt2=Tidak dapat mengonversikan "%S" ke bilangan bulat.
-typesDateNan=Tidak dapat mengonversikan "%S" ke tanggal.
-
-# LOCALIZATION NOTE (typesNumberMax, typesNumberMin, typesDateMax,
-# typesDateMin): These error messages are displayed when the command line is
-# passed a variable which has a value out of range (number or date).
-# Parameters: %1$S is the passed variable, %2$S is the limit value.
-typesNumberMax=%1$S lebih besar daripada nilai maksimal yang diizinkan: %2$S.
-typesNumberMin=%1$S lebih kecil dibandingkan nilai minimal yang diizinkan: %2$S.
-typesDateMax=%1$S adalah tanggal sesudah maksimum yang diizinkan: %2$S.
-typesDateMin=%1$S adalah tanggal sebelum minimum yang diizinkan: %2$S.
-
-# LOCALIZATION NOTE: This error message is displayed when the command line is
-# passed an option with a limited number of correct values, but the passed
-# value is not one of them.
-typesSelectionNomatch=Tidak dapat menggunakan '%S'.
-
-# LOCALIZATION NOTE: This error message is displayed when the command line is
-# expecting a CSS query string, however the passed string is not valid.
-nodeParseSyntax=Galat sintaks pada kueri CSS
-
-# LOCALIZATION NOTE (nodeParseMultiple, nodeParseNone): These error messages
-# are displayed when the command line is expecting a CSS string that matches a
-# single node, but more nodes (or none) match.
-nodeParseMultiple=Terlalu banyak kecocokan (%S)
-nodeParseNone=Tidak ada yang cocok
-
-# LOCALIZATION NOTE (helpDesc, helpManual, helpSearchDesc, helpSearchManual3):
-# These strings describe the "help" command, used to display a description of
-# a command (e.g. "help pref"), and its parameter 'search'.
-helpDesc=Dapatkan bantuan untuk perintah yang tersedia
-helpManual=Menyediakan bantuan untuk perintah tertentu (jika string pencarian ditentukan dan ada yang cocok ditemukan) atau untuk perintah yang tersedia (jika string pencarian tidak ditentukan, atau tidak yang cocok ditemukan).
-helpSearchDesc=String pencarian
-helpSearchManual3=teks pencarian untuk mempersempit daftar perintah yang ditampilkan. Ekspresi reguler tidak didukung.
-
-# LOCALIZATION NOTE: These strings are displayed in the help page for a
-# command in the console.
-helpManSynopsis=Sinopsis
-
-# LOCALIZATION NOTE: This message is displayed in the help page if the command
-# has no parameters.
-helpManNone=Tidak ada
-
-# LOCALIZATION NOTE: This message is displayed in response to the 'help'
-# command when used without a filter, just above the list of known commands.
-helpListAll=Perintah Tersedia:
-
-# LOCALIZATION NOTE (helpListPrefix, helpListNone): These messages are
-# displayed in response to the 'help <search>' command (i.e. with a search
-# string), just above the list of matching commands. Parameters: %S is the
-# search string.
-helpListPrefix=Perintah yang diawali dengan '%S':
-helpListNone=Tidak ada perintah yang diawali dengan '%S'
-
-# LOCALIZATION NOTE (helpManRequired, helpManOptional, helpManDefault): When
-# the 'help x' command wants to show the manual for the 'x' command, it needs
-# to be able to describe the parameters as either required or optional, or if
-# they have a default value.
-helpManRequired=diwajibkan
-helpManOptional=opsional
-helpManDefault=opsional, baku=%S
-
-# LOCALIZATION NOTE: This forms part of the output from the 'help' command.
-# 'GCLI' is a project name and should be left untranslated.
-helpIntro=GCLI merupakan eksperimen untuk menciptakan perintah baris yang sangat berguna bagi pengembang web.
-
-# LOCALIZATION NOTE: Text shown as part of the output of the 'help' command
-# when the command in question has sub-commands, before a list of the matching
-# sub-commands.
-subCommands=Sub-Perintah
-
-# LOCALIZATION NOTE: This error message is displayed when the command line is
-# cannot find a match for the parse types.
-commandParseError=Kesalahan penguraian perintah baris
-
-# LOCALIZATION NOTE (contextDesc, contextManual, contextPrefixDesc): These
-# strings are used to describe the 'context' command and its 'prefix'
-# parameter. See localization comment for 'connect' for an explanation about
-# 'prefix'.
-contextDesc=Konsentrasikan pada sekelompok perintah
-contextManual=Siapkan awalan baku untu perintah masa datang. Misalnya 'context git' akan dapat Anda gunakan untuk mengetikkan 'commit', alih-alih mengetikkan 'git commit'.
-contextPrefixDesc=Awalan perintah
-
-# LOCALIZATION NOTE: This message message displayed during the processing of
-# the 'context' command, when the found command is not a parent command.
-contextNotParentError=Tidak dapat menggunakan '%S' sebagai awalan karena bukan perintah induk.
-
-# LOCALIZATION NOTE (contextReply, contextEmptyReply): These messages are
-# displayed during the processing of the 'context' command, to indicate
-# success or that there is no command prefix.
-contextReply=Menggunakan %S sebagai awalan perintah
-contextEmptyReply=Awalan perintah dibersihkan
-
-# LOCALIZATION NOTE (connectDesc, connectManual, connectPrefixDesc,
-# connectMethodDesc, connectUrlDesc, connectDupReply): These strings describe
-# the 'connect' command and all its available parameters. A 'prefix' is an 
-# alias for the remote server (think of it as a "connection name"), and it
-# allows to identify a specific server when connected to multiple remote
-# servers.
-connectDesc=Perintah proksi ke server
-connectManual=Sambungkan ke server, lalu buat versi lokal perintah pada server. Pada awalnya perintah daring memiliki awalan untuk membedakannya dengan perintah lokal (tetapi dengan melihat perintah konteks untuk melaluinya)
-connectPrefixDesc=Awalan induk untuk perintah yang diimpor
-connectMethodDesc=Metode penyambungan
-connectUrlDesc=URL tujuan sambungan
-connectDupReply=Sambungan memanggil %S yang telah ada sebelumnya.
-
-# LOCALIZATION NOTE: The output of the 'connect' command, telling the user
-# what it has done. Parameters: %S is the prefix command. See localization
-# comment for 'connect' for an explanation about 'prefix'.
-connectReply=Perintah %S ditambahkan.
-
-# LOCALIZATION NOTE (disconnectDesc2, disconnectManual2,
-# disconnectPrefixDesc): These strings describe the 'disconnect' command and
-# all its available parameters. See localization comment for 'connect' for an
-# explanation about 'prefix'.
-disconnectDesc2=Putuskan sambungan dari server
-disconnectManual2=Putuskan dari server yang sedang tersambung untuk eksekusi perintah daring
-disconnectPrefixDesc=Awalan induk untuk perintah yang diimpor
-
-# LOCALIZATION NOTE: This is the output of the 'disconnect' command,
-# explaining the user what has been done. Parameters: %S is the number of
-# commands removed.
-disconnectReply=Perintah %S dihapus.
-
-# LOCALIZATION NOTE (globalDesc, globalWindowDesc, globalOutput): These
-# strings describe the 'global' command and its parameters
-globalDesc=Ubah global JS
-globalWindowDesc=Global/Jendela baru
-globalOutput=Global JS sekarang adalah %S
-
-# LOCALIZATION NOTE: These strings describe the 'clear' command
-clearDesc=Bersihkan area keluaran
-
-# LOCALIZATION NOTE (langDesc, langOutput): These strings describe the 'lang'
-# command and its parameters
-langDesc=Masukkan perintah dalam bahasa berbeda
-langOutput=Anda sedang menggunakan %S
-
-# LOCALIZATION NOTE (prefDesc, prefManual, prefListDesc, prefListManual,
-# prefListSearchDesc, prefListSearchManual, prefShowDesc, prefShowManual,
-# prefShowSettingDesc, prefShowSettingManual): These strings describe the
-# 'pref' command and all its available sub-commands and parameters.
-prefDesc=Perintah untuk mengontrol setelan
-prefManual=Perintah untuk menampilkan dan mengubah pengaturan baik untuk GCLI maupun lingkungannya
-prefListDesc=Tampilkan setelan yang tersedia
-prefListManual=Tampilkan daftar setelan, difilter secara opsional dengan parameter 'search'
-prefListSearchDesc=Filter daftar setelan yang ditampilkan
-prefListSearchManual=Cari string pada daftar setelan yang tersedia
-prefShowDesc=Tampilkan nilai setelan
-prefShowManual=Tampilkan nilai setelan yang diberikan
-prefShowSettingDesc=Setelan untuk ditampilkan
-prefShowSettingManual=Nama setelan untuk ditampilkan
-
-# LOCALIZATION NOTE: This message is used to show the preference name and the
-# associated preference value. Parameters: %1$S is the preference name, %2$S
-# is the preference value.
-prefShowSettingValue=%1$S: %2$S
-
-# LOCALIZATION NOTE (prefSetDesc, prefSetManual, prefSetSettingDesc,
-# prefSetSettingManual, prefSetValueDesc, prefSetValueManual): These strings
-# describe the 'pref set' command and all its parameters.
-prefSetDesc=Ubah setelan
-prefSetManual=Ubah preferensi yang didefinisikan lingkungan
-prefSetSettingDesc=Setelan untuk diubah
-prefSetSettingManual=Nama setelan untuk diubah.
-prefSetValueDesc=Nilai baru setelan
-prefSetValueManual=Nilai baru untuk setelan yang ditentukan
-
-# LOCALIZATION NOTE (prefResetDesc, prefResetManual, prefResetSettingDesc,
-# prefResetSettingManual): These strings describe the 'pref reset' command and
-# all its parameters.
-prefResetDesc=Setel ulang sebuah setelan
-prefResetManual=Setel ulang sebuah setelan menjadi nilai bawaan
-prefResetSettingDesc=Setelan untuk disetel ulang
-prefResetSettingManual=Nama setelan yang akan disetel ulang menjadi nilai bawaan
-
-# LOCALIZATION NOTE: This string is displayed in the output from the 'pref
-# list' command as a label to an input element that allows the user to filter
-# the results.
-prefOutputFilter=Filter
-
-# LOCALIZATION NOTE (prefOutputName, prefOutputValue): These strings are
-# displayed in the output from the 'pref list' command as table headings.
-prefOutputName=Nama
-prefOutputValue=Nilai
-
-# LOCALIZATION NOTE (introDesc, introManual): These strings describe the
-# 'intro' command. The localization of 'Got it!' should be the same used in
-# introTextGo.
-introDesc=Tampilkan pesan selamat datang
-introManual=Tampilkan ulang pesan untuk pengguna baru hingga mengeklik tombol 'Paham!'
-
-# LOCALIZATION NOTE (introTextOpening3, introTextCommands, introTextKeys2,
-# introTextF1Escape, introTextGo): These strings are displayed when the user
-# first opens the developer toolbar to explain the command line, and is shown
-# each time it is opened until the user clicks the 'Got it!' button.
-introTextOpening3=GCLI merupakan sebuah eksperimen untuk membuat lingkungan perintah baris yang dapat digunakan pengembang web.
-introTextCommands=Untuk menampilkan daftar ketikkan
-introTextKeys2=, atau untuk menampilkan/menyembunyikan bantuan perintah, tekan
-introTextF1Escape=F1/Escape
-introTextGo=Paham!
-
-# LOCALIZATION NOTE: This is a short description of the 'hideIntro' setting.
-hideIntroDesc=Tampilkan pesan selamat datang
-
-# LOCALIZATION NOTE: This is a description of the 'eagerHelper' setting. It's
-# displayed when the user asks for help on the settings. eagerHelper allows
-# users to select between showing no tooltips, permanent tooltips, and only
-# important tooltips.
-eagerHelperDesc=Seberapa detail tooltip
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/inspector.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/inspector.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/inspector.dtd	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/inspector.dtd	2015-05-25 20:48:32.000000000 +0000
@@ -67,11 +67,16 @@
 
 <!ENTITY inspectorHTMLPasteLastChild.label       "Sebagai Anakan Terakhir">
 <!ENTITY inspectorHTMLPasteLastChild.accesskey   "r">
+<!-- LOCALIZATION NOTE (inspectorScrollNodeIntoView.label): This is the label
+     shown in the inspector contextual-menu for the item that lets users scroll
+     the current node into view -->
+
+<!ENTITY inspectorScrollNodeIntoView.label       "Gulir ke Tampilan">
+<!ENTITY inspectorScrollNodeIntoView.accesskey   "G">
 <!-- 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          "Hapus Simpul">
 <!ENTITY inspectorHTMLDelete.accesskey      "H">
 
@@ -81,6 +86,11 @@
 
 <!ENTITY inspectorSearchHTML.label2          "Cari berdasar selektor CSS">
 <!ENTITY inspectorSearchHTML.key            "F">
+<!-- LOCALIZATION NOTE (inspectorSearchHTML.label3): This is the label that will
+     be shown as the placeholder in the future, once the inspector search box
+     supports the full text HTML search in Bug 835896. -->
+
+<!ENTITY inspectorSearchHTML.label3 "Cari HTML">
 <!-- 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
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/inspector.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/inspector.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/inspector.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/inspector.properties	2015-05-25 20:48:32.000000000 +0000
@@ -54,3 +54,52 @@
 
 #LOCALIZATION NOTE: Used in the image preview tooltip when the image could not be loaded
 eventsTooltip.openInDebugger=Buka di Debugger
+
+# LOCALIZATION NOTE (docsTooltip.visitMDN): Shown in the tooltip that displays
+# help from MDN. This is a link to the complete MDN documentation page.
+docsTooltip.visitMDN=Kunjungi laman MDN
+
+# LOCALIZATION NOTE (docsTooltip.visitMDN): Shown in the docs tooltip when the MDN page
+# could not be loaded (for example, because of a connectivity problem).
+docsTooltip.loadDocsError=Tidak dapat memuat laman dokumentasi.
+
+# LOCALIZATION NOTE (inspector.collapsePane): This is the tooltip for the button
+# that collapses the right panel (rules, computed, box-model, etc...) in the
+# inspector UI.
+inspector.collapsePane=Ciutkan panel
+
+# LOCALIZATION NOTE (inspector.expandPane): This is the tooltip for the button
+# that expands the right panel (rules, computed, box-model, etc...) in the
+# inspector UI.
+inspector.expandPane=Bentangkan panel
+
+# LOCALIZATION NOTE (inspector.searchResultsCount): This is the label that
+# will show up next to the inspector search box. %1$S is the current result
+# index and %2$S is the total number of search results. For example: "3 of 9".
+# This won't be visible until the search box is updated in Bug 835896.
+inspector.searchResultsCount2=%1$S dari %2$S
+
+# LOCALIZATION NOTE (inspector.searchResultsNone): This is the label that
+# will show up next to the inspector search box when no matches were found
+# for the given string.
+# This won't be visible until the search box is updated in Bug 835896.
+inspector.searchResultsNone=Tidak ada yang cocok
+
+# LOCALIZATION NOTE (inspector.menu.openUrlInNewTab.label): This is the label of
+# a menu item in the inspector contextual-menu that appears when the user right-
+# clicks on the attribute of a node in the inspector that is a URL, and that
+# allows to open that URL in a new tab.
+inspector.menu.openUrlInNewTab.label=Buka Tautan di Tab Baru
+
+# LOCALIZATION NOTE (inspector.menu.copyUrlToClipboard.label): This is the label
+# of a menu item in the inspector contextual-menu that appears when the user
+# right-clicks on the attribute of a node in the inspector that is a URL, and
+# that allows to copy that URL in the clipboard.
+inspector.menu.copyUrlToClipboard.label=Salin Alamat Tautan
+
+# LOCALIZATION NOTE (inspector.menu.selectElement.label): This is the label of a
+# menu item in the inspector contextual-menu that appears when the user right-
+# clicks on the attribute of a node in the inspector that is the ID of another
+# element in the DOM (like with <label for="input-id">), and that allows to
+# select that element in the inspector.
+inspector.menu.selectElement.label=Pilih Elemen #%S
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/jsonview.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/jsonview.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/jsonview.properties	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/jsonview.properties	2015-05-25 20:48:32.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/.
+
+# LOCALIZATION NOTE These strings are used in the JSON View tool
+# that is used to inspect application/json document types loaded
+# in the browser.
+
+# LOCALIZATION NOTE The correct localization of this file might be to keep it
+# in English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best documentation
+# on web development on the web.
+
+# LOCALIZATION NOTE (jsonViewer.tab.JSON, jsonViewer.tab.RawData,
+# jsonViewer.tab.Headers): Label for a panel tab.
+jsonViewer.tab.JSON=JSON
+jsonViewer.tab.RawData=Data Mentah
+jsonViewer.tab.Headers=Header
+
+# LOCALIZATION NOTE (jsonViewer.responseHeaders, jsonViewer.requestHeaders):
+# Label for header groups within the 'Headers' panel.
+jsonViewer.responseHeaders=Header Balasan
+jsonViewer.requestHeaders=Header Permintaan
+
+# LOCALIZATION NOTE (jsonViewer.Save): Label for save command
+jsonViewer.Save=Simpan
+
+# LOCALIZATION NOTE (jsonViewer.Copy): Label for clipboard copy command
+jsonViewer.Copy=Salin
+
+# LOCALIZATION NOTE (jsonViewer.PrettyPrint): Label for JSON
+# pretty print action button.
+jsonViewer.PrettyPrint=Cetak Rapi
+
+# LOCALIZATION NOTE (jsonViewer.reps.more): Label used in arrays
+# that have more items than displayed.
+jsonViewer.reps.more=lainnya...
+
+# LOCALIZATION NOTE (jsonViewer.filterJSON): Label used in search box
+# at the top right cornder of the JSON Viewer.
+jsonViewer.filterJSON=Filter JSON
+
+# LOCALIZATION NOTE (jsonViewer.reps.reference): Label used for cycle
+# references in an array.
+jsonViewer.reps.reference=Referensi Siklus
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/netmonitor.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/netmonitor.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/netmonitor.dtd	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/netmonitor.dtd	2015-05-25 20:48:32.000000000 +0000
@@ -123,6 +123,11 @@
   -  in the network details footer for the "Other" filtering button. -->
 
 <!ENTITY netmonitorUI.footer.filterOther  "Lainnya">
+<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterFreetext): This is the label displayed
+  -  in the network details footer for the url filtering textbox. -->
+
+<!ENTITY netmonitorUI.footer.filterFreetext.label  "Filter URL">
+<!ENTITY netmonitorUI.footer.filterFreetext.key  "F">
 <!-- LOCALIZATION NOTE (netmonitorUI.footer.clear): This is the label displayed
   -  in the network details footer for the "Clear" button. -->
 
@@ -242,28 +247,56 @@
   -  in the security tab describing the server certificate section. -->
 
 <!ENTITY netmonitorUI.security.certificate "Sertifikat:">
-<!-- LOCALIZATION NOTE (netmonitorUI.context.perfTools): This is the label displayed
-  -  on the context menu that shows the performance analysis tools -->
-
-<!ENTITY netmonitorUI.context.perfTools   "Mulai Analisis Kinerja…">
-<!-- LOCALIZATION NOTE (netmonitorUI.context.perfTools.accesskey): This is the access key
-  -  for the performance analysis menu item displayed in the context menu for a request -->
-
-<!ENTITY netmonitorUI.context.perfTools.accesskey "K">
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl): This is the label displayed
   -  on the context menu that copies the selected request's url -->
 
 <!ENTITY netmonitorUI.context.copyUrl     "Salin URL">
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl.accesskey): This is the access key
+  -  for the Copy URL menu item displayed in the context menu for a request -->
+
+<!ENTITY netmonitorUI.context.copyUrl.accesskey "U">
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrlParams): This is the label displayed
+  -  on the context menu that copies the selected request's url parameters -->
+
+<!ENTITY netmonitorUI.context.copyUrlParams     "Salin Parameter URL">
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrlParams.accesskey): This is the access key
+  -  for the Copy URL Parameters menu item displayed in the context menu for a request -->
+
+<!ENTITY netmonitorUI.context.copyUrlParams.accesskey "P">
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyAsCurl): This is the label displayed
   -  on the context menu that copies the selected request as a cURL command.
   -  The capitalization is part of the official name and should be used throughout all languages.
   -  http://en.wikipedia.org/wiki/CURL -->
 
 <!ENTITY netmonitorUI.context.copyAsCurl    "Salin sebagai cURL">
-<!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl.accesskey): This is the access key
-  -  for the Copy URL menu item displayed in the context menu for a request -->
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyAsCUrl.accesskey): This is the access key
+  -  for the Copy as cURL menu item displayed in the context menu for a request -->
 
-<!ENTITY netmonitorUI.context.copyUrl.accesskey "S">
+<!ENTITY netmonitorUI.context.copyAsCurl.accesskey "S">
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyRequestHeaders): This is the label displayed
+  -  on the context menu that copies the selected item's request headers -->
+
+<!ENTITY netmonitorUI.context.copyRequestHeaders     "Salin Header Permintaan">
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyRequestHeaders.accesskey): This is the access key
+  -  for the Copy Request Headers menu item displayed in the context menu for a request -->
+
+<!ENTITY netmonitorUI.context.copyRequestHeaders.accesskey  "H">
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyResponseHeaders): This is the label displayed
+  -  on the context menu that copies the selected item's response headers -->
+
+<!ENTITY netmonitorUI.context.copyResponseHeaders     "Salin Header Balasan">
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyResponseHeaders.accesskey): This is the access key
+  -  for the Copy Response Headers menu item displayed in the context menu for a response -->
+
+<!ENTITY netmonitorUI.context.copyResponseHeaders.accesskey  "B">
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyResponse): This is the label displayed
+  -  on the context menu that copies the selected response as a string -->
+
+<!ENTITY netmonitorUI.context.copyResponse "Salin Balasan">
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyRespose.accesskey): This is the access key
+  -  for the Copy Response menu item displayed in the context menu for a request -->
+
+<!ENTITY netmonitorUI.context.copyResponse.accesskey  "l">
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyImageAsDataUri): This is the label displayed
   -  on the context menu that copies the selected image as data uri -->
 
@@ -280,7 +313,7 @@
 <!-- LOCALIZATION NOTE (netmonitorUI.summary.editAndResend.accesskey): This is the access key
   -  for the "Edit and Resend" menu item displayed in the context menu for a request -->
 
-<!ENTITY netmonitorUI.summary.editAndResend.accesskey "U">
+<!ENTITY netmonitorUI.summary.editAndResend.accesskey "E">
 <!-- LOCALIZATION NOTE (netmonitorUI.summary.rawHeaders): This is the label displayed
   -  on the button in the headers tab that toggle view for raw request/response headers
      from the currently displayed request -->
@@ -304,6 +337,14 @@
   -  network container -->
 
 <!ENTITY netmonitorUI.context.newTab.accesskey "T">
+<!-- LOCALIZATION NOTE (netmonitorUI.context.perfTools): This is the label displayed
+  -  on the context menu that shows the performance analysis tools -->
+
+<!ENTITY netmonitorUI.context.perfTools   "Mulai Analisis Kinerja…">
+<!-- LOCALIZATION NOTE (netmonitorUI.context.perfTools.accesskey): This is the access key
+  -  for the performance analysis menu item displayed in the context menu for a request -->
+
+<!ENTITY netmonitorUI.context.perfTools.accesskey "A">
 <!-- LOCALIZATION NOTE (netmonitorUI.custom.newRequest): This is the label displayed
   -  as the title of the new custom request form -->
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/netmonitor.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/netmonitor.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/netmonitor.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/netmonitor.properties	2015-05-25 20:48:32.000000000 +0000
@@ -36,8 +36,8 @@
 
 # LOCALIZATION NOTE (netmonitor.security.state.insecure)
 # This string is used as an tooltip for request that was performed over insecure
-# channel i.e. the connection was not encrypted.
-netmonitor.security.state.insecure=Sambungan yang digunakan untuk mengambil sumber daya ini tidak dienkripsi.
+# channel i.e. the connection was not https
+netmonitor.security.state.insecure=Sambungan yang digunakan untuk mengambil sumber daya ini tidak aman.
 
 # LOCALIZATION NOTE (netmonitor.security.state.broken)
 # This string is used as an tooltip for request that failed due to security
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/profiler.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/profiler.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/profiler.dtd	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/profiler.dtd	2015-05-25 20:48:32.000000000 +0000
@@ -10,24 +10,46 @@
   - documentation on web development on the web. -->
 <!-- LOCALIZATION NOTE (profilerUI.emptyNotice1/2): This is the label shown
   -  in the call list view when empty. -->
+<!-- TODO remove -->
 
 
 
 <!ENTITY profilerUI.emptyNotice1    "Klik pada tombol">
+<!-- TODO remove -->
 <!ENTITY profilerUI.emptyNotice2    "untuk mulai merekam pemanggilan fungsi JavaScript.">
 <!-- LOCALIZATION NOTE (profilerUI.stopNotice1/2): This is the label shown
   -  in the call list view while recording a profile. -->
+<!-- TODO remove -->
 
 <!ENTITY profilerUI.stopNotice1    "Klik pada tombol">
+<!-- TODO remove -->
 <!ENTITY profilerUI.stopNotice2    "sekali lagi untuk menghentikan pemrofilan.">
+<!-- LOCALIZATION NOTE (profilerUI.startRecording/profilerUI.stopRecording): These are
+  -  the labels shown on the main recording buttons to start/stop recording. -->
+
+<!ENTITY profilerUI.startRecording "Mulai Rekam Kinerja">
+<!ENTITY profilerUI.stopRecording  "Hentikan Rekaman Kinerja">
+<!-- LOCALIZATION NOTE (profilerUI.bufferStatusTooltip): This string
+  -  is displayed as the tooltip for the buffer capacity during a recording. -->
+
+<!ENTITY profilerUI.bufferStatusTooltip "Profiler menyimpan sampel dalam buffer sirkular dan segera setelah buffer mencapai batas rekaman, sampel baru akan menimpa samepl lama di awal rekaman.">
+<!-- LOCALIZATION NOTE (profilerUI.bufferStatusFull): This string
+  -  is displayed when the profiler's circular buffer has started to overlap. -->
+
+<!ENTITY profilerUI.bufferStatusFull "Buffer penuh. Sampel lama ditimpa.">
 <!-- LOCALIZATION NOTE (profilerUI.loadingNotice): This is the label shown
   -  in the call list view while loading a profile. -->
 
 <!ENTITY profilerUI.loadingNotice "Memuat…">
 <!-- LOCALIZATION NOTE (profilerUI.recordButton): This string is displayed
   -  on a button that starts a new profile. -->
+<!-- TODO remove -->
 
 <!ENTITY profilerUI.recordButton.tooltip "Rekam pemanggilan fungsi JavaScript.">
+<!-- LOCALIZATION NOTE (profilerUI.recordButton2): This string is displayed
+  -  on a button that starts a new profile. -->
+
+<!ENTITY profilerUI.recordButton2.tooltip "Aktifkan/Nonaktifkan status kinerja rekaman">
 <!-- LOCALIZATION NOTE (profilerUI.importButton): This string is displayed
   -  on a button that opens a dialog to import a saved profile data file. -->
 
@@ -51,16 +73,22 @@
 <!-- LOCALIZATION NOTE (profilerUI.table.*): These strings are displayed
   -  in the call tree headers for a recording. -->
 
-<!ENTITY profilerUI.table.totalDuration2  "Total Waktu">
-<!ENTITY profilerUI.table.selfDuration2   "Waktu Sendiri">
-<!ENTITY profilerUI.table.totalPercentage "Total Beban">
-<!ENTITY profilerUI.table.selfPercentage  "Beban Item">
-<!ENTITY profilerUI.table.samples         "Sampling">
-<!ENTITY profilerUI.table.function        "Fungsi">
-<!ENTITY profilerUI.table.totalAlloc1       "Jumlah Alokasi Sampel">
-<!ENTITY profilerUI.table.totalAllocTooltip "Jumlah total alokasi Objek yang di-samping pada lokasi ini dan pemanggilnya.">
-<!ENTITY profilerUI.table.selfAlloc1        "Alokasi Sampling Mandiri">
-<!ENTITY profilerUI.table.selfAllocTooltip  "Jumlah alokasi Objek yang di-samping pada lokasi ini.">
+<!ENTITY profilerUI.table.totalDuration2           "Total Waktu">
+<!ENTITY profilerUI.table.totalDuration.tooltip    "Jumlah waktu yang dihabiskan pada fungsi ini dan fungsi yang dipanggilnya.">
+<!ENTITY profilerUI.table.selfDuration2            "Waktu Sendiri">
+<!ENTITY profilerUI.table.selfDuration.tooltip     "Waktu yang dihabiskan hanya dalam fungsi ini.">
+<!ENTITY profilerUI.table.totalPercentage          "Total Beban">
+<!ENTITY profilerUI.table.totalPercentage.tooltip  "Persentase waktu yang dihabiskan dalam fungsi ini dan fungsi yang dipanggil olehnya.">
+<!ENTITY profilerUI.table.selfPercentage           "Beban Item">
+<!ENTITY profilerUI.table.selfPercentage.tooltip   "Persentasi waktu yang dihabiskan hanya dalam fungsi ini.">
+<!ENTITY profilerUI.table.samples                  "Sampling">
+<!ENTITY profilerUI.table.samples.tooltip          "Jumlah munculan fungsi ini dalam stack saat profiler mengambil sampel.">
+<!ENTITY profilerUI.table.function                 "Fungsi">
+<!ENTITY profilerUI.table.function.tooltip         "Nama dan lokasi sumber fungsi yang disampling.">
+<!ENTITY profilerUI.table.totalAlloc1              "Jumlah Alokasi Sampel">
+<!ENTITY profilerUI.table.totalAlloc.tooltip       "Jumlah total alokasi Objek yang di-samping pada lokasi ini dan pemanggilnya.">
+<!ENTITY profilerUI.table.selfAlloc1               "Alokasi Sampling Mandiri">
+<!ENTITY profilerUI.table.selfAlloc.tooltip        "Jumlah alokasi Objek yang di-samping pada lokasi ini.">
 <!-- LOCALIZATION NOTE (profilerUI.newtab.tooltiptext): The tooltiptext shown
   -  on the "+" (new tab) button for a profile when a selection is available. -->
 
@@ -107,3 +135,26 @@
 
 <!ENTITY profilerUI.enableFramerate             "Rekam Framerate">
 <!ENTITY profilerUI.enableFramerate.tooltiptext "Rekam framerate saat pemrofilan.">
+<!-- LOCALIZATION NOTE (profilerUI.showJITOptimizations): This string
+  -  is displayed next to a checkbox determining whether or not JIT optimization data
+  -  should be shown. -->
+
+<!ENTITY profilerUI.showJITOptimizations             "Tampilkan Optimisasi JIT">
+<!ENTITY profilerUI.showJITOptimizations.tooltiptext "Tampilkan data optimisasi JIT yang diambil sebagai sampel dalam tiap bingkai pada pohon panggilan JS.">
+<!-- LOCALIZATION NOTE (profilerUI.JITOptimizationsTitle): This string
+  -  is displayed as the title of the JIT Optimizations panel. -->
+
+<!ENTITY profilerUI.JITOptimizationsTitle "Optimisasi JIT">
+<!-- LOCALIZATION NOTE (profilerUI.console.recordingNoticeStart/recordingNoticeEnd):
+  -  This string is displayed when a recording is selected that started via console.profile.
+  -  Wraps the command used to start, like "Currently recording via console.profile("label")" -->
+
+<!ENTITY profilerUI.console.recordingNoticeStart "Sedang merekam via">
+<!ENTITY profilerUI.console.recordingNoticeEnd   "">
+<!-- LOCALIZATION NOTE (profilerUI.console.stopCommandStart/stopCommandEnd):
+  -  This string is displayed when a recording is selected that started via console.profile.
+  -  Indicates how to stop the recording, wrapping the command, like
+  -  "Stop recording by entering console.profilEnd("label") into the console." -->
+
+<!ENTITY profilerUI.console.stopCommandStart "Berhenti merekam dengan memasukkan">
+<!ENTITY profilerUI.console.stopCommandEnd   "ke konsol.">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/profiler.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/profiler.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/profiler.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/profiler.properties	2015-05-25 20:48:32.000000000 +0000
@@ -121,3 +121,29 @@
 # This string is displayed as a filter for saving a recording to disk.
 recordingsList.saveDialogAllFilter=Semua Berkas
 
+# LOCALIZATION NOTE (jit.optimizationFailure):
+# This string is displayed in a tooltip when no JIT optimizations were detected.
+jit.optimizationFailure=Optimasi gagal
+
+# LOCALIZATION NOTE (jit.samples2):
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# This string is displayed for the unit representing the number of times a
+# frame is sampled.
+# "#1" represents the number of samples
+# example: 30 samples
+jit.samples2=#1 sample;#1 sampel
+
+# LOCALIZATION NOTE (jit.empty):
+# This string is displayed when there are no JIT optimizations to display.
+jit.empty=Tidak ada optimasi JIT yang direkam untuk bingkai ini.
+
+# LOCALIZATION NOTE (consoleProfile.recordingNotice/stopCommand):
+# These strings are displayed when a recording is in progress, that was started from the console.
+# TODO REMOVE
+consoleProfile.recordingNotice=Sedang merekam profil "%S".
+# TODO REMOVE
+consoleProfile.stopCommand=Hentikan pemrofilan dengan mengetikkan "console.profileEnd('%S')" ke dalam konsol.
+
+# LOCALIZATION NOTE (profiler.bufferStatus):
+# This string is displayed illustrating how full the profiler's circular buffer is.
+profiler.bufferStatus=Kapasitas buffer: %S%
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/styleeditor.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/styleeditor.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/styleeditor.dtd	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/styleeditor.dtd	2015-05-25 20:48:32.000000000 +0000
@@ -61,3 +61,7 @@
 <!ENTITY noStyleSheet-tip-action.label "menambahkan lembar gaya baru">
 <!-- LOCALICATION NOTE  (noStyleSheet-tip-end.label): End of the tip sentence -->
 <!ENTITY noStyleSheet-tip-end.label    "?">
+<!-- LOCALIZATION NOTE (openLinkNewTab.label): This is the text for the
+     context menu item that opens a stylesheet in a new tab -->
+
+<!ENTITY openLinkNewTab.label     "Buka Tautan di Tab Baru">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/styleinspector.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/styleinspector.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/styleinspector.dtd	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/styleinspector.dtd	2015-05-25 20:48:32.000000000 +0000
@@ -12,10 +12,10 @@
 
 
 <!ENTITY browserStylesLabel    "Gaya peramban">
-<!-- LOCALIZATION NOTE (userStylesSearch): This is the placeholder that goes in
+<!-- LOCALIZATION NOTE (filterStylesPlaceholder): This is the placeholder that goes in
   -  the search box when no search term has been entered. -->
 
-<!ENTITY userStylesSearch      "Cari">
+<!ENTITY filterStylesPlaceholder      "Gaya Filter">
 <!-- LOCALIZATION NOTE (selectedElementLabel): This is the label for the path of
   -  the highlighted element in the web page. This path is based on the document
   -  tree. -->
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/timeline.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/timeline.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/timeline.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/timeline.properties	2015-05-25 20:48:32.000000000 +0000
@@ -40,8 +40,11 @@
 timeline.label.reflow2=Tata Letak
 timeline.label.paint=Pengggambaran
 timeline.label.javascript2=Pemanggilan Fungsi
+timeline.label.parseHTML=Uraikan HTML
+timeline.label.parseXML=Uraikan XML
 timeline.label.domevent=Peristiwa DOM
 timeline.label.consoleTime=Konsol
+timeline.label.garbageCollection=Kejadian GC
 
 # LOCALIZATION NOTE (graphs.memory):
 # This string is displayed in the memory graph of the Performance tool,
@@ -71,3 +74,4 @@
 timeline.markerDetail.endStack=Stack di akhir:
 timeline.markerDetail.unknownFrame=<lokasi tidak diketahui>
 timeline.markerDetail.asyncStack=(Asinkronus: %S)
+timeline.markerDetail.causeName=Sebab:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/toolbox.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/toolbox.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/toolbox.dtd	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/toolbox.dtd	2015-05-25 20:48:32.000000000 +0000
@@ -6,6 +6,9 @@
 
 
 <!ENTITY closeCmd.key  "W">
+<!ENTITY toggleToolbox.key  "I">
+<!ENTITY toggleToolboxF12.keycode          "VK_F12">
+<!ENTITY toggleToolboxF12.keytext          "F12">
 
 <!ENTITY toolboxCloseButton.tooltip    "Tutup Alat Pengembang">
 <!ENTITY toolboxOptionsButton.key      "O">
@@ -97,12 +100,12 @@
 
 <!ENTITY options.disableCache.label2     "Nonaktifkan Tembolok (saat alat terbuka)">
 <!ENTITY options.disableCache.tooltip2   "Dengan mengaktifkan opsi ini, tembolok akan dinonaktifkan untuk semua tab dengan alat terbuka.">
-<!-- LOCALIZATION NOTE (options.enableServiceWorkersTesting.label,
-  -  options.enableServiceWorkersTesting.tooltip): This is the options panel label and
-  -  tooltip for the checkbox that toggles the service workers testing features on or off. -->
+<!-- LOCALIZATION NOTE (options.enableServiceWorkersHTTP.label,
+  -  options.enableServiceWorkersHTTP.tooltip): This is the options panel label and
+  -  tooltip for the checkbox that toggles the service workers testing features on or off. This option enables service workers over HTTP. -->
 
-<!ENTITY options.enableServiceWorkersTesting.label     "Aktifkan fitur uji Service Worker (saat kotak alat terbuka)">
-<!ENTITY options.enableServiceWorkersTesting.tooltip   "Mengaktifkan opsi ini akan mengaktifkan fitur uji Service Worker untuk semua tab yang kotak alatnya terbuka.">
+<!ENTITY options.enableServiceWorkersHTTP.label     "Aktifkan Service Worker lewat HTTP (saat kotak alat terbuka)">
+<!ENTITY options.enableServiceWorkersHTTP.tooltip   "Mengaktifkan opsi ini akan mengaktifkan Service Worker lewat HTTP untuk semua tab yang kotak alatnya terbuka.">
 <!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the default developer
   -  tools. -->
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/toolbox.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/toolbox.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/toolbox.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/toolbox.properties	2015-05-25 20:48:32.000000000 +0000
@@ -71,11 +71,6 @@
 # This is the tooltip of the pick button in the toolbox toolbar
 pickButton.tooltip=Pilih elemen dari laman
 
-# LOCALIZATION NOTE (sidebar.showAllTabs.label)
-# This is the label shown in the show all tabs button in the tabbed side
-# bar, when there's no enough space to show all tabs at once
-sidebar.showAllTabs.label=…
-
 # LOCALIZATION NOTE (sidebar.showAllTabs.tooltip)
 # This is the tooltip shown when hover over the '…' button in the tabbed side
 # bar, when there's no enough space to show all tabs at once
@@ -93,3 +88,15 @@
 # Used as a message in the alert displayed when trying to open a browser
 # content toolbox and there is no content process running
 toolbox.noContentProcess.message=Tidak ada proses konten yang sedang berjalan.
+
+# LOCALIZATION NOTE (toolbox.viewCssSourceInStyleEditor.label)
+# Used as a message in either tooltips or contextual menu items to open the
+# corresponding URL as a css file in the Style-Editor tool.
+# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditor is used.
+toolbox.viewCssSourceInStyleEditor.label=Buka Berkas dalam Editor Gaya
+
+# LOCALIZATION NOTE (toolbox.viewJsSourceInDebugger.label)
+# Used as a message in either tooltips or contextual menu items to open the
+# corresponding URL as a js file in the Debugger tool.
+# DEV NOTE: Mostly used wherever toolbox.viewSourceInDebugger is used.
+toolbox.viewJsSourceInDebugger.label=Buka Berkas di Debugger
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/webConsole.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/webConsole.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/webConsole.dtd	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/webConsole.dtd	2015-05-25 20:48:32.000000000 +0000
@@ -75,6 +75,16 @@
 <!ENTITY btnConsoleLog          "Catatan">
 <!ENTITY btnConsoleXhr          "XHR">
 <!ENTITY btnConsoleReflows      "Pengaliran ulang">
+<!-- LOCALIZATION NODE (btnConsoleSharedWorkers) the term "Shared Workers"
+  -  should not be translated. -->
+
+<!ENTITY btnConsoleSharedWorkers "Worker Bersama">
+<!-- LOCALIZATION NODE (btnConsoleServiceWorkers) the term "Service Workers"
+  -  should not be translated. -->
+<!ENTITY btnConsoleServiceWorkers "Service Worker">
+<!-- LOCALIZATION NODE (btnConsoleWindowlessWorkers) the term "Workers"
+  -  should not be translated. -->
+<!ENTITY btnConsoleWindowlessWorkers "Worker Pengaya atau Chrome">
 
 <!ENTITY filterOutput.placeholder "Filter keluaran">
 <!ENTITY btnClear.label        "Bersihkan">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/webide.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/webide.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/webide.dtd	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/webide.dtd	2015-05-25 20:48:32.000000000 +0000
@@ -195,3 +195,16 @@
 <!-- Logs panel -->
 
 <!ENTITY logs_title "Catatan Perintah Prapaket">
+<!-- Simulator Options -->
+
+<!ENTITY simulator_title "Opsi Simulator">
+<!ENTITY simulator_remove "Hapus Simulator">
+<!ENTITY simulator_reset "Kembalikan Bawaan">
+<!ENTITY simulator_name "Nama">
+<!ENTITY simulator_software "Perangkat Lunak">
+<!ENTITY simulator_version "Versi">
+<!ENTITY simulator_profile "Profil">
+<!ENTITY simulator_hardware "Perangkat Keras">
+<!ENTITY simulator_device "Perangkat">
+<!ENTITY simulator_screenSize "Layar">
+<!ENTITY simulator_pixelRatio "Rasio Piksel">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/webide.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/webide.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/devtools/webide.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/devtools/webide.properties	2015-05-25 20:48:32.000000000 +0000
@@ -19,6 +19,9 @@
 importHostedApp_title=Buka Aplikasi yang Di-Host
 importHostedApp_header=Masukkan URL Manifest
 
+selectCustomBinary_title=Pilih binari B2G ubahsuaian
+selectCustomProfile_title=Pilih profil Gaia ubahsuaian
+
 notification_showTroubleShooting_label=Penyelesaian masalah
 notification_showTroubleShooting_accesskey=y
 
@@ -77,3 +80,9 @@
 
 # Device preferences and settings
 device_reset_default=Setel ulang ke bawaan
+
+# Simulator options
+simulator_custom_device=Ubahsuai
+simulator_custom_binary=Binari B2G Terubahsuai…
+simulator_custom_profile=Profil Gaia Terubahsuai...
+simulator_default_profile=Gunakan bawaan
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/loop/loop.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/loop/loop.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/loop/loop.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/loop/loop.properties	2015-05-25 20:48:32.000000000 +0000
@@ -12,6 +12,19 @@
 rooms_tab_button_tooltip=Percakapan
 contacts_tab_button_tooltip=Kontak
 
+## LOCALIZATION_NOTE(sign_in_again_title_line_one, sign_in_again_title_line_two2):
+## These are displayed together at the top of the panel when a user is needed to
+## sign-in again. The emphesis is on the first line to get the user to sign-in again,
+## and this is displayed in slightly larger font. Please arrange as necessary for
+## your locale.
+## {{clientShortname2}} will be replaced by the brand name for either string.
+sign_in_again_title_line_one=Masuk kembali
+sign_in_again_title_line_two2=untuk melanjutkan menggunakan {{clientShortname2}}
+sign_in_again_button=Masuk
+## LOCALIZATION_NOTE(sign_in_again_use_as_guest_button2): {{clientSuperShortname}}
+## will be replaced by the super short brandname.
+sign_in_again_use_as_guest_button2=Gunakan {{clientSuperShortname}} sebagai Tamu
+
 ## LOCALIZATION_NOTE(first_time_experience.title): clientShortname will be
 ## replaced by the brand name
 first_time_experience_title={{clientShortname}} — Gabung ke percakapan
@@ -108,7 +121,7 @@
 ## LOCALIZATION NOTE (add_or_import_contact_title): This is the subtitle of the
 ## panel.
 add_or_import_contact_title=Tambahkan atau Impor Kontak
-import_contacts_button=Impor
+import_contacts_button2=Impor dari Google
 importing_contacts_progress_button=Mengimpor…
 import_contacts_failure_message=Beberapa kontak tidak dapat diimpor. Coba lagi.
 ## LOCALIZATION NOTE(import_contacts_success_message): Success notification message
@@ -127,9 +140,9 @@
 import_failed_description_some=Beberapa kontak tidak dapat diimpor
 import_failed_support_button=Bantuan
 
-## LOCALIZATION NOTE(remove_contact_menu_button): Displayed in the contact list in
+## LOCALIZATION NOTE(remove_contact_menu_button2): Displayed in the contact list in
 ## a pop-up menu next to the contact's name.
-remove_contact_menu_button=Hapus Kontak
+remove_contact_menu_button2=Hapus Kontak…
 ## LOCALIZATION NOTE(confirm_delete_contact_alert): This is an alert that is displayed
 ## to confirm deletion of a contact.
 confirm_delete_contact_alert=Yakin akan menghapus kontak ini?
@@ -195,7 +208,7 @@
 unmute_local_video_button_title=Aktifkan video Anda
 active_screenshare_button_title=Berhenti berbagi
 inactive_screenshare_button_title=Bagikan layar Anda
-share_tabs_button_title=Bagikan Tab saya
+share_tabs_button_title2=Bagikan Tab Anda
 share_windows_button_title=Bagikan Jendela lainnya
 
 ## LOCALIZATION NOTE (call_with_contact_title): The title displayed
@@ -248,6 +261,7 @@
 cannot_start_call_session_not_ready=Tidak dapat memulai panggilan, sesi tidak siap.
 network_disconnected=Sambungan jaringan terputus tiba-tiba.
 connection_error_see_console_notification=Panggilan gagal, liat konsol untuk melihat detail.
+no_media_failure_message=Tidak ada kamera atau mikrofon ditemukan.
 
 ## LOCALIZATION NOTE (legal_text_and_links3): In this item, don't translate the
 ## parts between {{..}} because these will be replaced with links with the labels
@@ -303,9 +317,7 @@
 rooms_list_delete_tooltip=Hapus percakapan
 rooms_list_deleteConfirmation_label=Yakin?
 rooms_list_no_current_conversations=Tidak ada percakapan saat ini
-rooms_name_this_room_label=Beri nama percakapan ini
-rooms_name_this_room_tooltip2=Klik untuk mengedit nama percakapan
-rooms_name_change_failed_label=Nama percakapan tidak dapat diganti
+rooms_change_failed_label=Nama percakapan tidak dapat diperbarui
 rooms_new_room_button_label=Mulai percakapan
 rooms_only_occupant_label=Anda yang pertama di sini.
 rooms_panel_title=Pilih percakapan atau mulai yang baru
@@ -338,3 +350,10 @@
 context_edit_activate_label=Diskusi tentang "{{title}}"
 context_edit_name_placeholder=Nama Percakapan
 context_edit_comments_placeholder=Komentar
+context_add_some_label=Tambahkan konteks
+context_edit_tooltip=Edit Konteks
+context_hide_tooltip=Sembunyikan Konteks
+context_show_tooltip=Tampilkan Konteks
+context_save_label=Simpan Konteks
+context_link_modified=Tautan ini telah diubah.
+context_learn_more_link_label=Pelajari lebih lanjut.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/newTab.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/newTab.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/newTab.dtd	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/newTab.dtd	2015-05-25 20:48:32.000000000 +0000
@@ -4,6 +4,10 @@
 <!-- These strings are used in the about:newtab page -->
 
 <!ENTITY newtab.pageTitle "Tab Baru">
+<!ENTITY newtab.customize.classic "Tampilkan situs teratas Anda">
+<!ENTITY newtab.customize.cog.enhanced "Sertakan situs disarankan">
+<!ENTITY newtab.customize.cog.title "Kendali Tab Baru">
+<!ENTITY newtab.customize.cog.learn "Pelajari lebih lanjut tentang Tab Baru">
 <!ENTITY newtab.customize.title "Ubahsuai Laman Tab Baru Anda">
 <!ENTITY newtab.customize.suggested "Tampilkan situs disarankan dan situs teratas Anda">
 <!ENTITY newtab.customize.topsites "Tampilkan situs teratas Anda">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/newTab.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/newTab.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/newTab.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/newTab.properties	2015-05-25 20:48:32.000000000 +0000
@@ -9,6 +9,10 @@
 # and enhanced tiles on the same line as the tile's title, so prefer short
 # strings to avoid overlap. This string should be uppercase.
 newtab.sponsored.button=BERSPONSOR
+# LOCALIZATION NOTE(newtab.suggested.button): This text appears for sponsored
+# and suggested tiles on the same line as the tile's title, so prefer short
+# strings to avoid overlap. This string should be uppercase.
+newtab.suggested.tag=DISARANKAN
 # LOCALIZATION NOTE(newtab.suggested.button): %1$S will be replaced inline by
 # one of the user's top 100 sites that triggered this suggested tile.
 # This text appears for suggested tiles under the tile's title, so prefer short
@@ -18,6 +22,10 @@
 # the (X) block icon. %2$S will be replaced by an active link using string
 # newtab.learn.link as text.
 newtab.sponsored.explain=Ubin ini ditampilkan untuk Anda atas nama mitra Mozilla. Anda dapat menghapusnya kapan saja dengan mengeklik tombol %1$S. %2$S
+# LOCALIZATION NOTE(newtab.sponsored.explain2): %1$S will be replaced inline by
+# the (X) block icon. %2$S will be replaced by an active link using string
+# newtab.learn.link as text.
+newtab.sponsored.explain2=Situs ini disarankan untuk Anda atas nama mitra Mozilla. Anda dapat menghapusnya kapan saja dengan mengeklik tombol %1$S. %2$S
 # LOCALIZATION NOTE(newtab.suggested.explain): %1$S will be replaced inline by
 # the (X) block icon. %2$S will be replaced by an active link using string
 # newtab.learn.link as text.
@@ -25,15 +33,46 @@
 # LOCALIZATION NOTE(newtab.enhanced.explain): %1$S will be replaced inline by
 # the gear icon used to customize the new tab window. %2$S will be replaced by
 # an active link using string newtab.learn.link as text.
-newtab.enhanced.explain=A Mozilla partner has visually enhanced this tile, replacing the screenshot. You can turn off enhanced tiles by clicking the %1$S button for your preferences. %2$S
+newtab.enhanced.explain=Mitra Mozilla telah meningkatkan ubin ini secara visual dengan mengganti tangkapan layar. Anda dapat menonaktifkan ubin yang dipercanggih dengan mengeklik tombol %1$S untuk memilih preferensi Anda. %2$S
 # LOCALIZATION NOTE(newtab.intro.paragraph1): %1$S will be replaced inline by
 # active link using string newtab.learn.link as text.
-newtab.intro.paragraph1=When you open a new tab, you’ll see tiles from the sites you frequently visit, along with tiles that we think might be of interest to you. Some of these tiles may be sponsored by Mozilla partners. We’ll always indicate to you which tiles are sponsored. %1$S
+newtab.intro.paragraph1=Saat Anda membuka tab baru, Anda akan menjumpai ubin berisi situs yang sering Anda kiunjungi, beserta ubin yang menurut kami menarik bagi Anda. Beberapa ubin ini mungkin disponsori mitra Mozilla. Kami selalu menunjukkan ubin mana yang disponsori. %1$S
 # LOCALIZATION NOTE(newtab.intro.paragraph2): %1$S will be replaced inline by
 # active link using string newtab.privacy.link as text.
-newtab.intro.paragraph2=In order to provide this service, Mozilla collects and uses certain analytics information relating to your use of the tiles in accordance with our %1$S.
+newtab.intro.paragraph2=Untuk menyediakan layanan ini, Mozilla mengumpulkan dan menggunakan beberapa informasi analitik tertentu yang terkait dengan penggunaan ubin sesuai dengan %1$S kami.
 # LOCALIZATION NOTE(newtab.intro.paragraph3): %1$S will be replaced inline by
 # the gear icon used to customize the new tab window.
-newtab.intro.paragraph3=You can turn off the tiles feature by clicking the %1$S button for your preferences.
+newtab.intro.paragraph3=Anda dapat menonaktifkan fitur ubin dengan mengeklik tombol %1$S untuk memilih preferensi Anda.
+# LOCALIZATION NOTE(newtab.intro.paragraph4): %1$S will be replaced inline by
+# the gear icon used to customize the new tab window. %2$S will be replaced by
+# newtab.intro.controls as text
+newtab.intro.paragraph4=Anda dapat menonaktifkan fitur ini dengan mengeklik tombol roda gigi (%1$S) dan memilih "Tampilkan laman kosong" pada menu %2$S.
+newtab.intro.paragraph5=Tab Baru akan menampilkan situs yang sering Anda kunjungi, beserta situs yang menurut kami menarik bagi Anda. Untuk memulai, Anda akan melihat beberapa situs dari Mozilla.
+# LOCALIZATION NOTE(newtab.intro.paragraph6): %1$S will be replaced by
+# newtab.intro.paragraph6.remove as bold text. %2$S will be replaced by
+# newtab.intro.paragraph6.pin as bold text
+newtab.intro.paragraph6=Anda dapat %1$S atau %2$S situs apa saja menggunakan kontrol yang tersedia saat Anda melayangkan mouse.
+newtab.intro.paragraph6.remove=menghapus
+newtab.intro.paragraph6.pin=menyematkan
+newtab.intro.paragraph7=Beberapa situs yang akan Anda lihat mungkin disarankan oleh Mozilla dan mungkin disponsori oleh mitra Mozilla. Kami akan selalu menampilkan tanda pada situs yang disponsori.
+# LOCALIZATION NOTE(newtab.intro.paragraph8): %1$S will be replaced by
+# brandShortName as text. %2$S will be replaced inline by an active link using
+# string newtab.learn.link as text.
+newtab.intro.paragraph8=%1$S hanya akan menampilkan situs yang menyesuaikan dengan ketertarikan Anda di Web. %2$S
+newtab.intro.paragraph9=Kini saat Anda membuka Tab Baru, Anda juga akan melihat situs yang menurut kami menarik bagi Anda.
+# LOCALIZATION NOTE(newtab.intro.controls): the controls in the gear icon
+# menu for customizing the new tab window. Used in newtab.intro.paragraph4
+newtab.intro.controls=Kendali Tab Baru
 newtab.learn.link=Pelajari lebih lanjut…
 newtab.privacy.link=Privacy Notice
+newtab.learn.link2=Lebih lanjut tentang Tab Baru
+newtab.privacy.link2=Tentang privasi Anda
+# LOCALIZATION NOTE(newtab.intro.header.welcome): %1$S will be replaced by
+# brandShortName as bold text.
+newtab.intro.header.welcome=Selamat datang di Tab Baru pada %1$S!
+newtab.intro.header.update=Tab Baru kini diperbarui!
+newtab.intro.skip=Lewati
+newtab.intro.continue=Lanjutkan tur
+newtab.intro.back=Kembali
+newtab.intro.next=Selanjutnya
+newtab.intro.gotit=Paham!
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/places/places.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/places/places.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/places/places.dtd	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/places/places.dtd	2015-05-25 20:48:32.000000000 +0000
@@ -85,7 +85,6 @@
 <!ENTITY col.url.label           "Lokasi">
 <!ENTITY col.mostrecentvisit.label "Kunjungan Terakhir">
 <!ENTITY col.visitcount.label    "Jumlah Kunjungan">
-<!ENTITY col.keyword.label       "Kata Kunci">
 <!ENTITY col.description.label   "Deskripsi">
 <!ENTITY col.dateadded.label     "Ditambahkan pada">
 <!ENTITY col.lastmodified.label  "Modifikasi Terakhir">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/places/places.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/places/places.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/places/places.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/places/places.properties	2015-05-25 20:48:32.000000000 +0000
@@ -36,8 +36,6 @@
 view.sortBy.1.date.accesskey=K
 view.sortBy.1.visitCount.label=Urut berdasarkan Jumlah Kunjungan
 view.sortBy.1.visitCount.accesskey=J
-view.sortBy.1.keyword.label=Urut berdasarkan Kata Kunci
-view.sortBy.1.keyword.accesskey=K
 view.sortBy.1.description.label=Urut berdasarkan Deskripsi
 view.sortBy.1.description.accesskey=D
 view.sortBy.1.dateAdded.label=Urut berdasarkan Waktu Ditambahkan
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/preferences/aboutPermissions.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/preferences/aboutPermissions.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/preferences/aboutPermissions.dtd	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/preferences/aboutPermissions.dtd	2015-05-25 20:48:32.000000000 +0000
@@ -42,5 +42,7 @@
 <!ENTITY popup.label                     "Buka Jendela Sembulan">
 
 <!ENTITY fullscreen.label                "Layar Penuh">
+
+<!ENTITY push.label                      "Terima Pemberitahuan Push">
 <!ENTITY camera.label                    "Gunakan Kamera">
 <!ENTITY microphone.label                "Gunakan Mikrofon">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/preferences/advanced.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/preferences/advanced.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/preferences/advanced.dtd	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/preferences/advanced.dtd	2015-05-25 20:48:32.000000000 +0000
@@ -74,13 +74,8 @@
 <!ENTITY updateTab.label                 "Pemutakhiran">
 
 <!ENTITY updateApp.label                 "Pemutakhiran &brandShortName;:">
-<!-- Note either updateAuto1 is used or (updateAutoMetro and updateAutoDesktop),
-     so re-using accesss key in updateAuto1 is OK. updateAutoDesktop can be found
-     in preferences.properties -->
 <!ENTITY updateAuto1.label               "Otomatis pasang pemutakhiran (disarankan: untuk keamanan lebih baik)">
 <!ENTITY updateAuto1.accesskey           "O">
-<!ENTITY updateAutoMetro.label           "Otomatis mutakhirkan lewat desktop dan versi &brandShortName; Windows 8">
-<!ENTITY updateAutoMetro.accesskey       "s">
 <!ENTITY updateCheck.label               "Periksa pemutakhiran, biarkan saya memilih apakah akan dipasang atau tidak">
 <!ENTITY updateCheck.accesskey           "b">
 <!ENTITY updateManual.label              "Jangan pernah memeriksa pemutakhiran (tidak disarankan: berisiko keamanan)">
@@ -89,8 +84,6 @@
 <!ENTITY updateAutoAddonWarn.label       "Peringatkan saya jika pemutakhiran akan menonaktifkan satu atau beberapa pengaya">
 <!ENTITY updateAutoAddonWarn.accesskey   "P">
 
-<!ENTITY updateAutoMetroWarn.label       "(versi &brandShortName; Windows 8 tidak memeriksa kompatibilitas pengaya)">
-
 <!ENTITY updateHistory.label             "Tampilkan Riwayat Pemutakhiran">
 <!ENTITY updateHistory.accesskey         "w">
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/preferences/main.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/preferences/main.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/preferences/main.dtd	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/preferences/main.dtd	2015-05-25 20:48:32.000000000 +0000
@@ -41,3 +41,5 @@
 <!ENTITY separateProfileMode.label        "Izinkan &brandShortName; dan Firefox untuk dijalankan pada saat yang bersamaan">
 <!ENTITY useFirefoxSync.label             "Kiat: Fitur ini menggunakan data profil yang berbeda. Gunakan fitur Sync untuk berbagi data antar-profil tersebut.">
 <!ENTITY getStarted.label                 "Mulai gunakan Sync…">
+
+<!ENTITY e10sEnabled.label                "Aktifkan &brandShortName; multiproses">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/preferences/preferences.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/preferences/preferences.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/preferences/preferences.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/preferences/preferences.properties	2015-05-25 20:48:32.000000000 +0000
@@ -136,11 +136,6 @@
 #   %2$S = unit (MB, KB, etc.)
 actualAppCacheSize=Tembolok aplikasi web Anda memakan tempat sebesar %1$S %2$S ruang diska
 
-###Preferences::Advanced::Update
-#LOCALIZATION NOTE: The next string is for updating in Windows 8 only instead of updateAuto1.label.  %S = brandShortName
-updateAutoDesktop.label=Instal pembaruan otomatis dari %S desktop
-updateAutoDesktop.accessKey=o
-
 syncUnlink.title=Ingin memutus kaitan ke perangkat Anda?
 syncUnlink.label=Perangkat ini tidak akan lagi dikaitkan dengan akun Anda. Semua data pribadi Anda di perangkat ini dan akun Sync Anda masih tetap ada.
 syncUnlinkConfirm.label=Putuskan
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd	2015-05-25 20:48:32.000000000 +0000
@@ -13,6 +13,11 @@
 <!ENTITY safeb.blocked.malwarePage.longDesc "<p>Situs penyerang mencoba memasang program yang dapat mencuri informasi pribadi, menggunakan komputer untuk menyerang komputer lain, atau merusak sistem.</p> 
 <p>Beberapa situs penyerang secara sengaja mendistribusikan perangkat lunak perusak dan banyak komputer telah terserang tanpa diketahui atau diizinkan pemiliknya.</p>">
 
+<!ENTITY safeb.blocked.unwantedPage.title "Laporkan Laman Perangkat Lunak yang Tidak Diinginkan!">
+<!-- Localization note (safeb.blocked.malware.shortDesc) - Please don't translate the contents of the <span id="unwanted_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
+<!ENTITY safeb.blocked.unwantedPage.shortDesc "Situs web di <span id='unwanted_sitename'/> telah dilaporkan mengandung perangkat lunak yang tidak diinginkan dan telah diblokir berdasarkan pengaturan keamanan Anda.">
+<!ENTITY safeb.blocked.unwantedPage.longDesc "<p>Laman perangkat lunak yang tidak diinginkan mencoba menginstal perangkat lunak yang mungkin menipu dan mempengaruhi sistem Anda dalam cara yang tidak diinginkan.</p>">
+
 <!ENTITY safeb.blocked.phishingPage.title "Telah Dilaporkan sebagai Pemalsuan Web!">
 <!-- Localization note (safeb.blocked.phishing.shortDesc) - Please don't translate the contents of the <span id="phishing_sitename"/> tag. It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
 <!ENTITY safeb.blocked.phishingPage.shortDesc "Situs web di <span id='phishing_sitename'/> telah dilaporkan sebagai pemalsuan web dan telah diblokir berdasarkan pengaturan keamanan Anda.">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/shellservice.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/shellservice.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/shellservice.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/shellservice.properties	2015-05-25 20:48:32.000000000 +0000
@@ -15,7 +15,7 @@
 setDefaultBrowserNotNow.label      = Jangan sekarang
 setDefaultBrowserNotNow.accesskey  = J
 setDefaultBrowserNever.label       = Jangan tanyakan lagi
-setDefaultBrowserNever.accesskey   = D
+setDefaultBrowserNever.accesskey   = J
 
 # LOCALIZATION NOTE (setDefaultBrowserTitle, setDefaultBrowserMessage, setDefaultBrowserDontAsk, setDefaultBrowserAlertConfirm.label, setDefaultBrowserAlertNotNow.label):
 # These strings are used as an alternative to the ones above, in a modal dialog.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/sitePermissions.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/sitePermissions.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/sitePermissions.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/sitePermissions.properties	2015-05-25 20:48:32.000000000 +0000
@@ -18,4 +18,4 @@
 permission.indexedDB.label = Mengelola Penyimpanan Luring
 permission.fullscreen.label = Berpindah ke Mode Layar Penuh
 permission.pointerLock.label = Menyembunyikan Penunjuk Mouse
-
+permission.push.label = Terima Pemberitahuan Push
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/syncSetup.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/syncSetup.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/browser/syncSetup.dtd	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/browser/syncSetup.dtd	2015-05-25 20:48:32.000000000 +0000
@@ -33,8 +33,6 @@
 <!ENTITY setup.choosePassword.accesskey  "T">
 <!ENTITY setup.confirmPassword.label     "Konfirmasi Sandi">
 <!ENTITY setup.confirmPassword.accesskey "m">
-<!ENTITY setup.setupMetro.label     "Sinkronkan dengan &brandShortName; gaya Windows 8">
-<!ENTITY setup.setupMetro.accesskey "S">
 <!-- LOCALIZATION NOTE: tosAgree1, tosLink, tosAgree2, ppLink, tosAgree3 are
      joined with implicit white space, so spaces in the strings aren't necessary -->
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/overrides/appstrings.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/overrides/appstrings.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/overrides/appstrings.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/overrides/appstrings.properties	2015-05-25 20:48:32.000000000 +0000
@@ -30,6 +30,7 @@
 externalProtocolChkMsg=Ingatkan memakai pilihan ini untuk semua tautan yang jenisnya sama.
 externalProtocolLaunchBtn=Buka aplikasi
 malwareBlocked=Situs di %S telah dilaporkan sebagai situs penyerang dan telah diblokir sesuai dengan pengaturan keamanan Anda.
+unwantedBlocked=Situs di %S telah dilaporkan melayani perangkat lunak yang tidak diinginkan dan telah diblokir sesuai dengan pengaturan keamanan Anda.
 phishingBlocked=Situs web di %S telah dilaporkan sebagai situs palsu yang didesain untuk menipu pengguna agar pengguna memberitahukan data pribadi dan keuangan.
 cspBlocked=Laman mengandung kebijakan keamanan konten yang mencegahnya untuk dimuat dengan cara ini.
 corruptedContentError=Laman yang akan dibuka tidak dapat ditampilkan karena ada terdeteksi galat pada pengiriman data.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/overrides/netError.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/overrides/netError.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/chrome/overrides/netError.dtd	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/chrome/overrides/netError.dtd	2015-05-25 20:48:32.000000000 +0000
@@ -123,6 +123,9 @@
 <!ENTITY malwareBlocked.longDesc "<p>Situs penyerang mencoba memasang program yang dapat mencuri data pribadi, menggunakan komputer Anda untuk menyerang komputer lain, atau merusak sistem Anda.</p> 
 <p>Pemilik situs web yang merasa situs yang bersangkutan bukan merupakan situs web penyerang dapat meminta <a href='http://www.stopbadware.org/home/reviewinfo' >peninjauan kembali</a>.</p>">
 
+<!ENTITY unwantedBlocked.title "Tersangka Situs Perangkat Lunak yang Tidak Diinginkan!">
+<!ENTITY unwantedBlocked.longDesc "<p>Laman perangkat lunak yang tidak diinginkan mencoba menginstal perangkat lunak yang mungkin menipu dan mempengaruhi sistem Anda dalam cara yang tidak diinginkan.</p>">
+
 <!ENTITY phishingBlocked.title "Tersangka Pemalsuan Web!">
 <!ENTITY phishingBlocked.longDesc "<p>Dengan memasukkan informasi pribadi pada laman ini, pencurian identitas atau kejahatan lainnya dapat terjadi.</p> 
 <p>Jenis pemalsuan web yang digunakan untuk penipuan (scam) dikenal sebagai &quot;phishing attack&quot; yaitu penipuan dengan cara meniru laman web dan email yang mungkin Anda percayai.</p>">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/pdfviewer/viewer.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/pdfviewer/viewer.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/pdfviewer/viewer.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/pdfviewer/viewer.properties	2015-05-25 20:48:32.000000000 +0000
@@ -110,7 +110,7 @@
 find_previous_label=Sebelumnya
 find_next.title=Temukan lebih lanjut
 find_next_label=Selanjutnya
-find_highlight=Sorot semu&anya
+find_highlight=Sorot semuanya
 find_match_case_label=Cocokkan BESAR/kecil
 find_reached_top=Sampai di awal dokumen, dilanjutkan dari bawah
 find_reached_bottom=Sampai di akhir dokumen, dilanjutkan dari atas
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/profile/bookmarks.inc firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/profile/bookmarks.inc
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/browser/profile/bookmarks.inc	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/browser/profile/bookmarks.inc	2015-05-25 20:48:32.000000000 +0000
@@ -76,16 +76,4 @@
 #define firefox_about Tentang Kami
 
 
-# LOCALIZATION NOTE (firefox_feedback):
-
-
-# link title for browser feedback page
-
-
-# currently used by Metro only: https://input.mozilla.org/feedback/metrofirefox
-
-
-#define firefox_feedback Kirim Saran
-
-
 #unfilter emptyLines
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/dom/chrome/appstrings.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/dom/chrome/appstrings.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/dom/chrome/appstrings.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/dom/chrome/appstrings.properties	2015-05-25 20:48:32.000000000 +0000
@@ -29,6 +29,7 @@
 externalProtocolChkMsg=Ingatkan memakai pilihan ini untuk semua tautan yang jenisnya sama.
 externalProtocolLaunchBtn=Buka aplikasi
 malwareBlocked=Situs di %S telah dilaporkan sebagai situs penyerang dan telah diblokir sesuai dengan pengaturan keamanan Anda.
+unwantedBlocked=Situs di %S telah dilaporkan sebagai situs yang melayani perangkat lunak yang tidak diinginkan dan telah diblokir sesuai dengan pengaturan keamanan Anda.
 phishingBlocked=Situs web di %S telah dilaporkan sebagai situs palsu yang didesain untuk menipu pengguna dengan cara menipu pengguna untuk memberitahukan data pribadi dan keuangan.
 cspBlocked=Laman mengandung kebijakan keamanan konten yang mencegahnya untuk dimuat dengan cara ini.
 corruptedContentError=Laman yang akan dibuka tidak dapat ditampilkan karena ada terdeteksi galat pada pengiriman data.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/dom/chrome/dom/dom.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/dom/chrome/dom/dom.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/dom/chrome/dom/dom.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/dom/chrome/dom/dom.properties	2015-05-25 20:48:32.000000000 +0000
@@ -9,7 +9,7 @@
 StopScriptButton=Hentikan skrip
 DebugScriptButton=Buka dengan program Debug
 WaitForScriptButton=Lanjutkan
-DontAskAgain=Jangan tanyakan lagi
+DontAskAgain=&Jangan tanyakan lagi
 JSURLLoadBlockedWarning=Percobaan untuk memuat javascript skrip: URL sebuah host yang sedang menampilkan isi dari host lain telah diblokir oleh Pengelola Keamanan.
 WindowCloseBlockedWarning=Skrip tidak diperbolehkan menutup jendela yang tidak dibuka oleh skrip.
 OnBeforeUnloadTitle=Yakin?
@@ -163,3 +163,7 @@
 WillChangeBudgetWarning=Konsumsi memori yang akan berubah terlalu tinggi. Area permukaan mencakup %1$S piksel, anggaran merupakan hasil dari area permukaan dokumen dikalikan dengan %2$S (%3$S piksel). Semua kejadian yang akan berubah pada dokumen akan diabaikan jika melewati batas anggaran.
 # LOCALIZATION NOTE: Do not translate "ServiceWorker".
 HittingMaxWorkersPerDomain=Sebuah ServiceWorker tidak dapat dimulai langsung karena dokumen lain dengan sumber yang sama telah menggunakan ServiceWorker dalam jumlah maksimum. ServiceWorker tersebut kini diantrikan dan akan dimulai segera setelah beberapa ServiceWorker lainnya selesai.
+# LOCALIZATION NOTE: Do no translate "setVelocity", "PannerNode", "AudioListener", "speedOfSound" and "dopplerFactor"
+PannerNodeDopplerWarning=Penggunaan setVelocity pada PannerNode dan AudioListener serta speedOfSound dan dopplerFactor pada AudioListener tidak disarankan lagi dan anggota tersebut akan dihapus. Untuk bantuan lebih lanjut lihat https://developer.mozilla.org/en-US/docs/Web/API/AudioListener#Deprecated_features
+# LOCALIZATION NOTE: Do not translate "Worker".
+EmptyWorkerSourceWarning=Mencoba membuat Worker dari sumber kosong. Mungkin ini tidak disengaja.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/dom/chrome/netError.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/dom/chrome/netError.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/dom/chrome/netError.dtd	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/dom/chrome/netError.dtd	2015-05-25 20:48:32.000000000 +0000
@@ -76,6 +76,9 @@
 <!ENTITY malwareBlocked.longDesc "<p>Situs penyerang mencoba memasang program yang dapat mencuri data pribadi, menggunakan komputer Anda untuk menyerang komputer lain, atau merusak sistem Anda.</p> 
 <p>Pemilik situs web yang merasa situs yang bersangkutan bukan merupakan situs web penyerang dapat meminta <a href='http://www.stopbadware.org/home/reviewinfo' >peninjauan kembali</a>.</p>">
 
+<!ENTITY unwantedBlocked.title "Tersangka Situs yang Melayani Perangkat Lunak Tidak Diinginkan!">
+<!ENTITY unwantedBlocked.longDesc "<p>Perangkat lunak yang tidak diinginkan mencoba menginstal perangkat lunak yang menipu dan mempengaruhi sistem dengan cara yang tidak diinginkan.</p>">
+
 <!ENTITY phishingBlocked.title "Tersangka Pemalsuan Web!">
 <!ENTITY phishingBlocked.longDesc "<p>Dengan memasukkan informasi pribadi pada laman ini, dapat menyebabkan pencurian identitas atau kejahatan lainnya.</p> 
 <p>Jenis pemalsuan web yang dikenal sebagai &quot;phishing attacks&quot;, memalsukan laman web dan email yang Anda percaya.</p>">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/dom/chrome/security/csp.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/dom/chrome/security/csp.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/dom/chrome/security/csp.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/dom/chrome/security/csp.properties	2015-05-25 20:48:32.000000000 +0000
@@ -29,6 +29,13 @@
 # LOCALIZATION NOTE (ignoringUnknownOption):
 # %1$S is the option that could not be understood
 ignoringUnknownOption = Mengabaikan opsi tidak dikenal %1$S
+# LOCALIZATION NOTE (ignoringDuplicateSrc):
+# %1$S defines the duplicate src
+ignoringDuplicateSrc = Mengabaikan sumber daya duplikat %1$S
+# LOCALIZATION NOTE (ignoringSrcWithinScriptSrc):
+# %1$S is the ignored src
+# script-src is a directive name and should not be localized
+ignoringSrcWithinScriptSrc = Mengabaikan "%1$S" dalam script-src: nonce-source atau hash-source ditentukan
 # LOCALIZATION NOTE (reportURInotHttpsOrHttp2):
 # %1$S is the ETLD of the report URI that is not HTTP or HTTPS
 reportURInotHttpsOrHttp2 = URI laporan (%1$S) harus sebagai URI HTTP atau HTTPS.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/security/manager/chrome/pipnss/nsserrors.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/security/manager/chrome/pipnss/nsserrors.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/security/manager/chrome/pipnss/nsserrors.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/security/manager/chrome/pipnss/nsserrors.properties	2015-05-25 20:48:31.000000000 +0000
@@ -213,7 +213,7 @@
 SEC_ERROR_EXPORTING_CERTIFICATES=Kesalahan saat mencoba mengekspor sertifikat.
 SEC_ERROR_IMPORTING_CERTIFICATES=Kesalahan saat mencoba mengimpor sertifikat.
 SEC_ERROR_PKCS12_DECODING_PFX=Gagal mengimpor. Kesalahan mendekode. Berkas tidak sah.
-SEC_ERROR_PKCS12_INVALID_MAC=Gagal mengimpor. MAC tidak sah. Sandi salah atau berkas terkorupsi.
+SEC_ERROR_PKCS12_INVALID_MAC=Gagal mengimpor. MAC tidak valid. Sandi salah atau berkas terkorupsi.
 SEC_ERROR_PKCS12_UNSUPPORTED_MAC_ALGORITHM=Gagal mengimpor. Algoritma MAC tidak didukung.
 SEC_ERROR_PKCS12_UNSUPPORTED_TRANSPORT_MODE=Gagal mengimpor. Hanya mode integritas sandi dan privasi yang didukung.
 SEC_ERROR_PKCS12_CORRUPT_PFX_STRUCTURE=Gagal mengimpor. Struktur berkas terkorupsi.
@@ -245,7 +245,7 @@
 SEC_ERROR_JS_ADD_MOD_FAILURE=Gagal menambah modul
 SEC_ERROR_JS_DEL_MOD_FAILURE=Gagal menghapus modul.
 SEC_ERROR_OLD_KRL=KRL baru tidak lebih baru dari yang ada sekarang.
-SEC_ERROR_CKL_CONFLICT=KRL baru mempunyai penerbit yang berbeda dari KRL yang sekarang. Hapus KRL yang sekarang.
+SEC_ERROR_CKL_CONFLICT=CKL baru mempunyai penerbit yang berbeda dari CKL yang sekarang. Hapus CKL yang sekarang.
 SEC_ERROR_CERT_NOT_IN_NAME_SPACE=Otoritas Sertifikat untuk sertifikat ini tidak diizinkan untuk mengeluarkan sertifikat dengan nama berikut.
 SEC_ERROR_KRL_NOT_YET_VALID=Daftar pencabutan kunci untuk sertifikat ini masih belum sah.
 SEC_ERROR_CRL_NOT_YET_VALID=Daftar pencabutan sertifikat untuk sertifikat ini masih belum sah.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/security/manager/chrome/pipnss/pipnss.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/security/manager/chrome/pipnss/pipnss.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/security/manager/chrome/pipnss/pipnss.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/security/manager/chrome/pipnss/pipnss.properties	2015-05-25 20:48:31.000000000 +0000
@@ -110,6 +110,10 @@
 CertDumpAnsiX9DsaSignature=Tandatangan DSA ANSI X9.57
 CertDumpAnsiX9DsaSignatureWithSha1=Tandatangan DSA ANSI X9.57 dengan Digest SHA1
 CertDumpAnsiX962ECDsaSignatureWithSha1=Tandatangan ECDSA ANSI X9.62 dengan SHA1
+CertDumpAnsiX962ECDsaSignatureWithSha224=Tandatangan ECDSA ANSI X9.62 dengan SHA224
+CertDumpAnsiX962ECDsaSignatureWithSha256=Tandatangan ECDSA ANSI X9.62 dengan SHA256
+CertDumpAnsiX962ECDsaSignatureWithSha384=Tandatangan ECDSA ANSI X9.62 dengan SHA384
+CertDumpAnsiX962ECDsaSignatureWithSha512=Tandatangan ECDSA ANSI X9.62 dengan SHA512
 CertDumpKUSign=Penandatanganan
 CertDumpKUNonRep=Tidak-menolak
 CertDumpKUEnc=Encipherment Kunci
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/global/aboutRights.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/global/aboutRights.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/global/aboutRights.dtd	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/global/aboutRights.dtd	2015-05-25 20:48:32.000000000 +0000
@@ -82,7 +82,7 @@
 <!ENTITY rights2.webservices-term1 "&vendorShortName;, kontributornya, lisensornya, dan partnernya bekerja untuk menyediakan Layanan terakurat dan terbaru. Akan tetapi kami tidak dapat menjamin informasi tersebut bersifat komprehensif dan bebas dari kesalahan. Sebagai contoh, Layanan Safe Browsing mungkin tidak dapat mengidentifikasi situs yang berisiko dan situs yang aman salah diidentifikasi serta seluruh lokasi pada Layanan Berbasis Lokasi yang dikembalikan dari penyedia layanan kami hanya bersifat perkiraan serta kami atau pun penyedia layanan kami tidak dapat menjamin akurasi lokasi yang disediakan.">
 <!ENTITY rights.webservices-term2 "&vendorShortName; dapat memberhentikan atau mengubah Layanan sesuai dengan kebijaksanaan masing-masing.">
 <!ENTITY rights2.webservices-term3 "Anda dipersilakan untuk menggunakan Layanan tersebut dengan menggunakan &brandShortName; yang disertakan dan &vendorShortName; memberikan hak kepada Anda untuk menggunakannya.  &vendorShortName; dan para lisensornya berhak atas seluruh hak lainnya dalam Layanan tersebut. Persyaratan ini tidak dimaksudkan untuk membatasi hak yang diberikan atas dasar lisensi kode sumber terbuka yang dapat diterapkan pada &brandShortName; dan versi kode sumber &brandShortName; yang berkaitan.">
-<!ENTITY rights.webservices-term4 "Layanan disediakan &quot;sebagaimana adanya&quot;. &vendorShortName;, para kontributor, lisensor, dan distributor menyangkal semua jaminan dan garansi, baik yang telah disebutkan mau pun tersirat, termasuk secara tak terbatas, bahwa Layanan dapat digunakan untuk kepentingan dagang (merchantable) dan sesuai dengan penggunaan khusus oleh Anda. Anda menanggung seluruh risiko atas Layanan yang Anda pilih untuk Anda gunakan dan atas performansi Layanan tersebut. Beberapa yurisdiksi tidak mengizinkan pengecualian atau pembatasan pada jaminan yang tersirat sehingga penyangkalan ini tidak dapat diterapkan pada Anda.">
+<!ENTITY rights.webservices-term4 "Layanan disediakan &quot;sebagaimana adanya&quot;. &vendorShortName;, para kontributor, lisensor, dan distributor menyangkal semua jaminan dan garansi, baik yang telah disebutkan mau pun tersirat, termasuk secara tak terbatas, bahwa Layanan dapat digunakan untuk kepentingan dagang (merchantable) dan sesuai dengan penggunaan khusus oleh Anda. Anda menanggung seluruh risiko atas Layanan yang Anda pilih untuk Anda gunakan dan atas kinerja Layanan tersebut. Beberapa wilayah hukum tidak mengizinkan pengecualian atau pembatasan pada jaminan yang tersirat sehingga penyangkalan ini tidak dapat diterapkan pada Anda.">
 <!ENTITY rights.webservices-term5 "Kecuali diwajibkan oleh hukum, &vendorShortName;, para kontributor, lisensor, dan distributor tidak akan menanggung kerusakan yang bersifat khusus, tidak langsung, insidental, sebab-akibat, pidana, ganti-rugi yang terjadi atas akibat atau yang berhubungan dengan penggunaan &brandShortName; beserta Layanan-nya. Pertanggungan secara kolektif di bawah persyaratan ini tidak boleh melebihi $500 (lima ratus dollar). Beberapa yuridiksi tidak mengizinkan pengecualian atau pembatasan atas kerusakan tertentu sehingga penyangkalan ini tidak dapat diterapkan pada Anda.">
 <!ENTITY rights.webservices-term6 "&vendorShortName; dapat memutakhirkan persyaratan ini secara seperlunya dari waktu ke waktu. Persyaratan ini tidak dapat diubah atau dibatalkan tanpa perjanjian tertulis dengan &vendorShortName;.">
 <!ENTITY rights.webservices-term7 "Persyaratan berikut diatur berdasarkan hukum negara bagian California, Amerika Serikat, dengan mengecualikan pertentangan atas ketentuan hukum yang bersifat sementara. Jika terdapat bagian dari persyaratan ini yang tidak dalam status sah atau tidak dapat dilaksanakan, bagian lainnya tetap berkekuatan penuh. Jika terjadi pertentangan antara versi terjemahan dan versi berbahasa Inggris atas persyaratan ini, versi berbahasa Inggris yang memiliki kekuatan penuh.">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/global/aboutServiceWorkers.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/global/aboutServiceWorkers.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/global/aboutServiceWorkers.dtd	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/global/aboutServiceWorkers.dtd	2015-05-25 20:48:32.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/. -->
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+
+<!ENTITY aboutServiceWorkers.title                     "Tentang Service Worker">
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY aboutServiceWorkers.maintitle                 "Service Worker Terdaftar">
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY aboutServiceWorkers.warning_not_enabled       "Service Worker tidak diaktifkan.">
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY aboutServiceWorkers.warning_no_serviceworkers "Tidak ada Service Worker terdaftar.">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/global/aboutServiceWorkers.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/global/aboutServiceWorkers.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/global/aboutServiceWorkers.properties	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/global/aboutServiceWorkers.properties	2015-05-25 20:48:32.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/.
+
+title = Sumber: %S
+
+# LOCALIZATION NOTE: %1$S is brandShortName, %2$2 is the application ID, and $%$3 is true/false value.
+# LOCALIZATION NOTE: the term "InBrowserElement" should not be translated
+b2gtitle = ID Aplikasi %1$S %2$S - InBrowserElement %3$S
+
+scope = Cakupan:
+
+scriptSpec = Spesifikasi Skrip:
+
+# LOCALIZATION NOTE: the term "Worker" should not be translated.
+currentWorkerURL = URL Worker Saat Ini:
+
+activeCacheName = Nama Tembolok Aktif:
+
+waitingCacheName = Nama Tembolok Menunggu:
+
+true = true
+
+false = false
+
+# LOCALIZATION NOTE this term is used as a button label (verb, not noun).
+update = Perbarui
+
+unregister = Batalkan Pendaftaran
+
+waiting = Menunggu…
+
+# LOCALIZATION NOTE: the term "Service Worker" should not translated.
+unregisterError = Gagal membatalkan pendaftaran Service Worker ini.
+
+pushEndpoint = Endpoint Push:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/global/aboutSupport.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/global/aboutSupport.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/global/aboutSupport.dtd	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/global/aboutSupport.dtd	2015-05-25 20:48:32.000000000 +0000
@@ -54,6 +54,9 @@
 <!ENTITY aboutSupport.appBasicsBuildConfig "Konfigurasi Build">
 <!ENTITY aboutSupport.appBasicsUserAgent "User Agent">
 <!ENTITY aboutSupport.appBasicsMemoryUse "Penggunaan Memori">
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+
+<!ENTITY aboutSupport.appBasicsServiceWorkers "Service Worker Terdaftar">
 
 <!ENTITY aboutSupport.appBasicsMultiProcessSupport "Jendela Multiproses">
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/global/aboutSupport.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/global/aboutSupport.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/global/aboutSupport.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/global/aboutSupport.properties	2015-05-25 20:48:32.000000000 +0000
@@ -37,6 +37,8 @@
 # "GPU Accelerated Windows: 0/2"
 acceleratedWindows = Windows Terakselerasi dengan GPU
 
+supportsHardwareH264 = Mendukung Dekode H264 Perangkat Keras
+
 # LOCALIZATION NOTE (rawDataCopied) Text displayed in a mobile "Toast" to user when the
 # raw data is successfully copied to the clipboard via button press.
 rawDataCopied=Data mentah telah disalin ke papan klip
@@ -96,6 +98,7 @@
 multiProcessStatus = %1$S/%2$S (baku: %3$S)
 
 asyncPanZoom = Geser/Perbesaran Asinkron
+apzNone = tidak ada
 wheelEnabled = input wheel diaktifkan
 touchEnabled = input sentuh diaktifkan
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/global/aboutTelemetry.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/global/aboutTelemetry.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/global/aboutTelemetry.dtd	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/global/aboutTelemetry.dtd	2015-05-25 20:48:32.000000000 +0000
@@ -8,9 +8,9 @@
 
 <!ENTITY aboutTelemetry.telemetryDisabled "  Telemetri <span>dinonaktifkan</span>.">
 
-<!ENTITY aboutTelemetry.generalDataSection "  Data Umum">
+<!ENTITY aboutTelemetry.generalDataSection "   Data Umum">
 
-<!ENTITY aboutTelemetry.telemetryLogSection "  Log Telemetri">
+<!ENTITY aboutTelemetry.telemetryLogSection "   Log Telemetri">
 
 <!ENTITY aboutTelemetry.slowSqlSection "  Pernyataan SQL Lambat">
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/global/console.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/global/console.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/global/console.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/global/console.properties	2015-05-25 20:48:32.000000000 +0000
@@ -4,6 +4,7 @@
 
 typeError=Kesalahan:
 typeWarning=Peringatan:
+typeMessage=Pesan:
 errFile=Berkas Kode Sumber: %S
 errLine=Baris: %S
 errLineCol=Baris: %S, Kolom: %S
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/global/devtools/gclicommands.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/global/devtools/gclicommands.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/global/devtools/gclicommands.properties	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/global/devtools/gclicommands.properties	2015-05-25 20:48:32.000000000 +0000
@@ -0,0 +1,1567 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE These strings are used inside Web Console commands.
+# The Web Console command line is available from the Web Developer sub-menu
+# -> 'Web Console'.
+#
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# LOCALIZATION NOTE (helpDesc) A very short string used to describe the
+# function of the help command.
+helpDesc=Dapatkan bantuan untuk perintah yang tersedia
+
+# LOCALIZATION NOTE (helpAvailable) Used in the output of the help command to
+# explain the contents of the command help table.
+helpAvailable=Perintah yang Tersedia
+
+# LOCALIZATION NOTE (notAvailableInE10S) Used in the output of any command that
+# is not compatible with multiprocess mode (E10S).
+notAvailableInE10S=Perintah '%1$S' tidak tersedia dalam mode multiproses (E10S)
+
+# LOCALIZATION NOTE (consoleDesc) A very short string used to describe the
+# function of the console command.
+consoleDesc=Perintah untuk mengontrol konsol
+
+# LOCALIZATION NOTE (consoleManual) A longer description describing the
+# set of commands that control the console.
+consoleManual=Filter, bersihkan, dan tutup konsol web
+
+# LOCALIZATION NOTE (consoleclearDesc) A very short string used to describe the
+# function of the 'console clear' command.
+consoleclearDesc=Bersihkan konsol
+
+# LOCALIZATION NOTE (screenshotDesc) A very short description of the
+# 'screenshot' command. See screenshotManual for a fuller description of what
+# it does. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+screenshotDesc=Simpan gambar tangkapan laman
+
+# LOCALIZATION NOTE (screenshotManual) A fuller description of the 'screenshot'
+# command, displayed when the user asks for help on what it does.
+screenshotManual=Simpan gambar tangkapan PNG dari seluruh jendela yang terlihat (setelah waktu tunda opsional)
+
+# LOCALIZATION NOTE (screenshotFilenameDesc) A very short string to describe
+# the 'filename' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotFilenameDesc=Nama berkas tujuan
+
+# LOCALIZATION NOTE (screenshotFilenameManual) A fuller description of the
+# 'filename' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotFilenameManual=Nama berkas (dengan ekstensi '.png') tujuan penulisan tangkapan layar.
+
+# LOCALIZATION NOTE (screenshotClipboardDesc) A very short string to describe
+# the 'clipboard' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotClipboardDesc=Salin tangkapan layar ke papan klip? (true/false)
+
+# LOCALIZATION NOTE (screenshotClipboardManual) A fuller description of the
+# 'clipboard' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotClipboardManual='True' jika ingin menyalin tangkapan layar, alih-alih menyimpannya sebagai sebuah berkas.
+
+# LOCALIZATION NOTE (screenshotChromeDesc) A very short string to describe
+# the 'chrome' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+# The argument (%1$S) is the browser name.
+screenshotChromeDesc2=Tangkap jendela chrome %1$S? (true/false)
+
+# LOCALIZATION NOTE (screenshotChromeManual) A fuller description of the
+# 'chrome' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+# The argument (%1$S) is the browser name.
+screenshotChromeManual2='True' jika Anda ingin mengambil tangkapan layar dari %1$S, alih-alih isi jendela laman web.
+
+# LOCALIZATION NOTE (screenshotGroupOptions) A label for the optional options of
+# the screenshot command.
+screenshotGroupOptions=Opsi
+
+# LOCALIZATION NOTE (screenshotGroupOptions) A label for the advanced options of
+# the screenshot command.
+screenshotAdvancedOptions=Opsi Tingkat Lanjut
+
+# LOCALIZATION NOTE (screenshotDelayDesc) A very short string to describe
+# the 'delay' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotDelayDesc=Waktu tunda (detik)
+
+# LOCALIZATION NOTE (screenshotDelayManual) A fuller description of the
+# 'delay' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotDelayManual=Waktu tunggu (dalam detik) sebelum tangkapan layar diambil
+
+# LOCALIZATION NOTE (screenshotFullscreenDesc) A very short string to describe
+# the 'fullscreen' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotFullPageDesc=Seluruh laman web? (true/false)
+
+# LOCALIZATION NOTE (screenshotFullscreenManual) A fuller description of the
+# 'fullscreen' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotFullPageManual=True jika tangkapan layar juga menyertakan bagian laman web yang tidak di ditampilkan pada layar saat ini.
+
+# LOCALIZATION NOTE (screenshotSelectorChromeConflict) Exception thrown when user
+# tries to use 'selector' option along with 'chrome' option of the screenshot
+# command. Refer: https://bugzilla.mozilla.org/show_bug.cgi?id=659268#c7
+screenshotSelectorChromeConflict=opsi selektor tidak didukung ketika opsi chrome bernilai true
+
+# LOCALIZATION NOTE (screenshotGeneratedFilename) The auto generated filename
+# when no file name is provided. The first argument (%1$S) is the date string
+# in yyyy-mm-dd format and the second argument (%2$S) is the time string
+# in HH.MM.SS format. Please don't add the extension here.
+screenshotGeneratedFilename=Tangkapan Layar %1$S pada %2$S
+
+# LOCALIZATION NOTE (screenshotErrorSavingToFile) Text displayed to user upon
+# encountering error while saving the screenshot to the file specified.
+screenshotErrorSavingToFile=Kesalahan saat menyimpan ke tujuan
+
+# LOCALIZATION NOTE (screenshotSavedToFile) Text displayed to user when the
+# screenshot is successfully saved to the file specified.
+screenshotSavedToFile=Disimpan di
+
+# LOCALIZATION NOTE (screenshotErrorCopying) Text displayed to user upon
+# encountering error while copying the screenshot to clipboard.
+screenshotErrorCopying=Terjadi galat saat menyalin ke clipboard.
+
+# LOCALIZATION NOTE (screenshotCopied) Text displayed to user when the
+# screenshot is successfully copied to the clipboard.
+screenshotCopied=Disalin ke clipboard.
+
+# LOCALIZATION NOTE (screenshotTooltip) Text displayed as tooltip for screenshot button in devtools ToolBox.
+screenshotTooltip=Buat tangkapan layar untuk satu halaman penuh
+
+# LOCALIZATION NOTE (screenshotImgurDesc) A very short string to describe
+# the 'imgur' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotImgurDesc=Unggah ke imgur.com
+
+# LOCALIZATION NOTE (screenshotImgurManual) A fuller description of the
+# 'imgur' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotImgurManual=Gunakan jika Anda ingin mengunggahnya ke imgur.com, bukan ke disk
+
+# LOCALIZATION NOTE (screenshotImgurError) Text displayed to user upon
+# encountering error while uploading the screenshot to imgur.com.
+screenshotImgurError=Tidak dapat menjangkau API imgur
+
+# LOCALIZATION NOTE (screenshotImgurUploading) Text displayed to user when the
+# screenshot is successfully sent to Imgur but the program is waiting on a response.
+# The argument (%1$S) is a new image URL at Imgur.
+screenshotImgurUploaded=Diunggah ke %1$S
+
+# LOCALIZATION NOTE (highlightDesc) A very short description of the
+# 'highlight' command. See highlightManual for a fuller description of what
+# it does. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+highlightDesc=Sorot simpul
+
+# LOCALIZATION NOTE (highlightManual) A fuller description of the 'highlight'
+# command, displayed when the user asks for help on what it does.
+highlightManual=Sorot simpul yang cocok dengan selektor pada laman
+
+# LOCALIZATION NOTE (highlightSelectorDesc) A very short string to describe
+# the 'selector' parameter to the 'highlight' command, which is displayed in
+# a dialog when the user is using this command.
+highlightSelectorDesc=Selektor CSS
+
+# LOCALIZATION NOTE (highlightSelectorManual) A fuller description of the
+# 'selector' parameter to the 'highlight' command, displayed when the user
+# asks for help on what it does.
+highlightSelectorManual=Selektor CSS yang digunakan untuk mencocokkan simpul pada laman
+
+# LOCALIZATION NOTE (highlightOptionsDesc) The title of a set of options to
+# the 'highlight' command, displayed as a heading to the list of option.
+highlightOptionsDesc=Opsi
+
+# LOCALIZATION NOTE (highlightHideGuidesDesc) A very short string to describe
+# the 'hideguides' option parameter to the 'highlight' command, which is
+# displayed in a dialog when the user is using this command.
+highlightHideGuidesDesc=Sembunyikan panduan
+
+# LOCALIZATION NOTE (highlightHideGuidesManual) A fuller description of the
+# 'hideguides' option parameter to the 'highlight' command, displayed when the
+# user asks for help on what it does.
+highlightHideGuidesManual=Sembunyikan panduan di sekeliling simpul yang disorot
+
+# LOCALIZATION NOTE (highlightShowInfoBarDesc) A very short string to describe
+# the 'showinfobar' option parameter to the 'highlight' command, which is
+# displayed in a dialog when the user is using this command.
+highlightShowInfoBarDesc=Tampilkan bilah info simpul
+
+# LOCALIZATION NOTE (highlightShowInfoBarManual) A fuller description of the
+# 'showinfobar' option parameter to the 'highlight' command, displayed when the
+# user asks for help on what it does.
+highlightShowInfoBarManual=Tampilkan bilah info di atas simpul yang disorit (bilah info menampilkan nama tag, atribut, dan dimensi)
+
+# LOCALIZATION NOTE (highlightShowAllDesc) A very short string to describe
+# the 'showall' option parameter to the 'highlight' command, which is
+# displayed in a dialog when the user is using this command.
+highlightShowAllDesc=Tampilkan semua yang cocok
+
+# LOCALIZATION NOTE (highlightShowAllManual) A fuller description of the
+# 'showall' option parameter to the 'highlight' command, displayed when the
+# user asks for help on what it does.
+highlightShowAllManual=Terlalu banyak simpul yang cocok dengan selektor, hanya 100 simpul pertama yang ditampilkan agar tidak terlalu memperlambat laman. Gunakan opsi ini untuk menampilkan semua yang cocok
+
+# LOCALIZATION NOTE (highlightRegionDesc) A very short string to describe the
+# 'region' option parameter to the 'highlight' command, which is displayed in a
+# dialog when the user is using this command.
+highlightRegionDesc=Area model kotak
+
+# LOCALIZATION NOTE (highlightRegionManual) A fuller description of the 'region'
+# option parameter to the 'highlight' command, displayed when the user asks for
+# help on what it does.
+highlightRegionManual=Area kotak model mana yang akan disorot: 'content', 'padding', 'border', atau 'margin'
+
+# LOCALIZATION NOTE (highlightFillDesc) A very short string to describe the
+# 'fill' option parameter to the 'highlight' command, which is displayed in a
+# dialog when the user is using this command.
+highlightFillDesc=Gaya isian
+
+# LOCALIZATION NOTE (highlightFillManual) A fuller description of the 'fill'
+# option parameter to the 'highlight' command, displayed when the user asks for
+# help on what it does.
+highlightFillManual=Menimpa gaya isian area bawaan dengan warna pilihan
+
+# LOCALIZATION NOTE (highlightKeepDesc) A very short string to describe the
+# 'keep' option parameter to the 'highlight' command, which is displayed in a
+# dialog when the user is using this command.
+highlightKeepDesc=Biarkan penyorot yang ada
+
+# LOCALIZATION NOTE (highlightKeepManual) A fuller description of the 'keep'
+# option parameter to the 'highlight' command, displayed when the user asks for
+# help on what it does.
+highlightKeepManual=Jika tidak diubah, penyorot yang ada akan disembunyikan saat perintah dijalankan, kecuali opsi ini diaktifkan
+
+# LOCALIZATION NOTE (highlightOutputConfirm) A confirmation message for the
+# 'highlight' command, displayed to the user once the command has been entered,
+# informing the user how many nodes have been highlighted successfully and how
+# to turn highlighting off
+highlightOutputConfirm2=%1$S simpul disorot;%1$S simpul disorot
+
+# LOCALIZATION NOTE (highlightOutputMaxReached) A confirmation message for the
+# 'highlight' command, displayed to the user once the command has been entered,
+# informing the user how many nodes have been highlighted successfully and that
+# some nodes could not be highlighted due to the maximum number of nodes being
+# reached, and how to turn highlighting off
+highlightOutputMaxReached=%1$S simpul cocok, tetapi hanya %2$S simpul yang disorot. Gunakan '--showall' untuk menampilkan semua
+
+# LOCALIZATION NOTE (unhighlightDesc) A very short description of the
+# 'unhighlight' command. See unhighlightManual for a fuller description of what
+# it does. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+unhighlightDesc=Buang sorotan semua simpul
+
+# LOCALIZATION NOTE (unhighlightManual) A fuller description of the 'unhighlight'
+# command, displayed when the user asks for help on what it does.
+unhighlightManual=Buang sorotan semua simpul yang disorot sebelumnya dengan perintah 'highlight'
+
+# LOCALIZATION NOTE (restartBrowserDesc) A very short description of the
+# 'restart' command. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+# The argument (%1$S) is the browser name.
+restartBrowserDesc=Mulai Ulang %1$S
+
+# LOCALIZATION NOTE (restartBrowserNocacheDesc) A very short string to
+# describe the 'nocache' parameter to the 'restart' command, which is
+# displayed in a dialog when the user is using this command.
+restartBrowserNocacheDesc=Nonaktifkan pemuatan isi dari tembolok saat memulai ulang
+
+# LOCALIZATION NOTE (restartBrowserRequestCancelled) A string displayed to the
+# user when a scheduled restart has been aborted by the user.
+restartBrowserRequestCancelled=Permintaan memulai ulang dibatalkan pengguna.
+
+# LOCALIZATION NOTE (restartBrowserRestarting) A string displayed to the
+# user when a restart has been initiated without a delay.
+# The argument (%1$S) is the browser name.
+restartBrowserRestarting=Memulai Ulang %1$S…
+
+# LOCALIZATION NOTE (inspectDesc) A very short description of the 'inspect'
+# command. See inspectManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+inspectDesc=Inspeksi simpul
+
+# LOCALIZATION NOTE (inspectManual) A fuller description of the 'inspect'
+# command, displayed when the user asks for help on what it does.
+inspectManual=Selidiki dimensi dan properti sebuah elemen dengan menggunakan selektor CSS untuk membuka penyorot DOM
+
+# LOCALIZATION NOTE (inspectNodeDesc) A very short string to describe the
+# 'node' parameter to the 'inspect' command, which is displayed in a dialog
+# when the user is using this command.
+inspectNodeDesc=Selektor CSS
+
+# LOCALIZATION NOTE (inspectNodeManual) A fuller description of the 'node'
+# parameter to the 'inspect' command, displayed when the user asks for help
+# on what it does.
+inspectNodeManual=Selektor CSS untuk digunakan pada Document.querySelector yang akan mengidentifikasi elemen tunggal
+
+# LOCALIZATION NOTE (eyedropperDesc) A very short description of the 'eyedropper'
+# command. See eyedropperManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+eyedropperDesc=Pilih salah satu warna dari laman
+
+# LOCALIZATION NOTE (eyedropperManual) A fuller description of the 'eyedropper'
+# command, displayed when the user asks for help on what it does.
+eyedropperManual=Buka panel yang menampilkan area yang diperbesar untuk melihat dalam skala piksel dan menyalin nilai warnanya
+
+# LOCALIZATION NOTE (eyedropperTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles the Eyedropper tool.
+eyedropperTooltip=Pilih salah satu warna dari laman
+
+# LOCALIZATION NOTE (tiltDesc) A very short description of the 'tilt'
+# command. See tiltManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltDesc=Visualisikan laman web secara 3D
+
+# LOCALIZATION NOTE (tiltManual) A fuller description of the 'tilt'
+# command, displayed when the user asks for help on what it does.
+tiltManual=Selidiki hubungan antara bagian-bagian laman dengan induknya dalam lingkungan 3D
+
+# LOCALIZATION NOTE (tiltOpenDesc) A very short description of the 'tilt inspect'
+# command. See tiltOpenManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltOpenDesc=Buka tampilan Inspektur 3D
+
+# LOCALIZATION NOTE (tiltOpenManual) A fuller description of the 'tilt translate'
+# command, displayed when the user asks for help on what it does.
+tiltOpenManual=Inisialisasi inspektur 3D dan secara opsional menyorot node dengan selektor CSS
+
+# LOCALIZATION NOTE (tiltToggleTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles Tilt 3D View.
+tiltToggleTooltip=Tampilan 3D
+
+# LOCALIZATION NOTE (tiltTranslateDesc) A very short description of the 'tilt translate'
+# command. See tiltTranslateManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltTranslateDesc=Pindahkan mesh laman web
+
+# LOCALIZATION NOTE (tiltTranslateManual) A fuller description of the 'tilt translate'
+# command, displayed when the user asks for help on what it does.
+tiltTranslateManual=Translasikan secara bertahap mesh laman web dengan arah tertentu
+
+# LOCALIZATION NOTE (tiltTranslateXDesc) A very short string to describe the
+# 'x' parameter to the 'tilt translate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltTranslateXDesc=X (piksel)
+
+# LOCALIZATION NOTE (tiltTranslateXManual) A fuller description of the 'x'
+# parameter to the 'translate' command, displayed when the user asks for help
+# on what it does.
+tiltTranslateXManual=Nilai piksel translasi pada mesh laman web pada sumbu X
+
+# LOCALIZATION NOTE (tiltTranslateYDesc) A very short string to describe the
+# 'y' parameter to the 'tilt translate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltTranslateYDesc=Y (piksel)
+
+# LOCALIZATION NOTE (tiltTranslateYManual) A fuller description of the 'y'
+# parameter to the 'translate' command, displayed when the user asks for help
+# on what it does.
+tiltTranslateYManual=Nilai piksel translasi pada mesh laman web pada sumbu Y
+
+# LOCALIZATION NOTE (tiltRotateDesc) A very short description of the 'tilt rotate'
+# command. See tiltRotateManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltRotateDesc=Putar mesh laman web
+
+# LOCALIZATION NOTE (tiltRotateManual) A fuller description of the 'tilt rotate'
+# command, displayed when the user asks for help on what it does.
+tiltRotateManual=Rotasikan secara bertahap mesh laman web dengan arah tertentu
+
+# LOCALIZATION NOTE (tiltRotateXDesc) A very short string to describe the
+# 'x' parameter to the 'tilt rotate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltRotateXDesc=X (derajat)
+
+# LOCALIZATION NOTE (tiltRotateXManual) A fuller description of the 'x'
+# parameter to the 'rotate' command, displayed when the user asks for help
+# on what it does.
+tiltRotateXManual=Nilai derajat putaran untuk merotasi mesh laman web pada sumbu X
+
+# LOCALIZATION NOTE (tiltRotateYDesc) A very short string to describe the
+# 'y' parameter to the 'tilt rotate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltRotateYDesc=Y (derajat)
+
+# LOCALIZATION NOTE (tiltRotateYManual) A fuller description of the 'y'
+# parameter to the 'rotate' command, displayed when the user asks for help
+# on what it does.
+tiltRotateYManual=Nilai derajat putaran untuk merotasi mesh laman web pada sumbu Y
+
+# LOCALIZATION NOTE (tiltRotateZDesc) A very short string to describe the
+# 'z' parameter to the 'tilt rotate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltRotateZDesc=Z (derajat)
+
+# LOCALIZATION NOTE (tiltRotateZManual) A fuller description of the 'z'
+# parameter to the 'rotate' command, displayed when the user asks for help
+# on what it does.
+tiltRotateZManual=Nilai derajat putaran untuk merotasi mesh laman web pada sumbu Z
+
+# LOCALIZATION NOTE (tiltZoomDesc) A very short description of the 'tilt zoom'
+# command. See tiltZoomManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltZoomDesc=Menjauh atau mendekati mesh laman web
+
+# LOCALIZATION NOTE (tiltZoomManual) A fuller description of the 'tilt zoom'
+# command, displayed when the user asks for help on what it does.
+tiltZoomManual=Gerakkan secara bertahap mesh laman web ke arah tertentu dalam sumbu Z
+
+# LOCALIZATION NOTE (tiltZoomAmountDesc) A very short string to describe the
+# 'zoom' parameter to the 'tilt zoom' command, which is displayed in a dialog
+# when the user is using this command.
+tiltZoomAmountDesc=Perbesaran (piksel)
+
+# LOCALIZATION NOTE (tiltZoomAmmuntManual) A fuller description of the 'zoom'
+# parameter to the 'zoom' command, displayed when the user asks for help
+# on what it does.
+tiltZoomAmountManual=Nilai piksel translasi pada mesh laman web pada sumbu Z
+
+# LOCALIZATION NOTE (tiltResetDesc) A very short description of the 'tilt reset'
+# command. See tiltResetManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltResetDesc=Setel ulang translasi, rotasi, dan perbesaran
+
+# LOCALIZATION NOTE (tiltResetManual) A fuller description of the 'tilt reset'
+# command, displayed when the user asks for help on what it does.
+tiltResetManual=Setel ulang transformasi yang diterapkan pada matriks tampilan model mesh laman web sebelumnya
+
+# LOCALIZATION NOTE (tiltCloseDesc) A very short description of the 'tilt close'
+# command. See tiltCloseManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltCloseDesc=Tutup visualisasi yang terbuka
+
+# LOCALIZATION NOTE (tiltCloseManual) A fuller description of the 'tilt close'
+# command, displayed when the user asks for help on what it does.
+tiltCloseManual=Tutup visualisasi dan kembali ke penyorot bawaan Inspektur
+
+# LOCALIZATION NOTE (debuggerClosed) Used in the output of several commands
+# to explain that the debugger must be opened first.
+debuggerClosed=Debugger harus dibuka sebelum menggunakan perintah ini
+
+# LOCALIZATION NOTE (debuggerStopped) Used in the output of several commands
+# to explain that the debugger must be opened first before setting breakpoints.
+debuggerStopped=Debugger harus terbuka sebelum menyetel breakpoint
+
+# LOCALIZATION NOTE (breakDesc) A very short string used to describe the
+# function of the break command.
+breakDesc=Kelola breakpoint
+
+# LOCALIZATION NOTE (breakManual) A longer description describing the
+# set of commands that control breakpoints.
+breakManual=Perintah untuk menampilkan, menambah, dan menghapus breakpoint
+
+# LOCALIZATION NOTE (breaklistDesc) A very short string used to describe the
+# function of the 'break list' command.
+breaklistDesc=Tampilkan breakpoint yang ada
+
+# LOCALIZATION NOTE (breaklistNone) Used in the output of the 'break list'
+# command to explain that the list is empty.
+breaklistNone=Tidak ada breakpoint yang disetel
+
+# LOCALIZATION NOTE (breaklistOutRemove) A title used in the output from the
+# 'break list' command on a button which can be used to remove breakpoints
+breaklistOutRemove=Hapus
+
+# LOCALIZATION NOTE (breakaddAdded) Used in the output of the 'break add'
+# command to explain that a breakpoint was added.
+breakaddAdded=Breakpoint ditambahkan
+
+# LOCALIZATION NOTE (breakaddFailed) Used in the output of the 'break add'
+# command to explain that a breakpoint could not be added.
+breakaddFailed=Tidak dapat menyetel breakpoint: %S
+
+# LOCALIZATION NOTE (breakaddDesc) A very short string used to describe the
+# function of the 'break add' command.
+breakaddDesc=Tambahkan breakpoint
+
+# LOCALIZATION NOTE (breakaddManual) A longer description describing the
+# set of commands that are responsible for adding breakpoints.
+breakaddManual=Jenis breakpoint yang didukung: baris
+
+# LOCALIZATION NOTE (breakaddlineDesc) A very short string used to describe the
+# function of the 'break add line' command.
+breakaddlineDesc=Tambahkan breakpoint baris
+
+# LOCALIZATION NOTE (breakaddlineFileDesc) A very short string used to describe
+# the function of the file parameter in the 'break add line' command.
+breakaddlineFileDesc=URI berkas JS
+
+# LOCALIZATION NOTE (breakaddlineLineDesc) A very short string used to describe
+# the function of the line parameter in the 'break add line' command.
+breakaddlineLineDesc=Nomor baris
+
+# LOCALIZATION NOTE (breakdelDesc) A very short string used to describe the
+# function of the 'break del' command.
+breakdelDesc=Hapus breakpoint
+
+# LOCALIZATION NOTE (breakdelBreakidDesc) A very short string used to describe
+# the function of the index parameter in the 'break del' command.
+breakdelBreakidDesc=Indeks breakpoint
+
+# LOCALIZATION NOTE (breakdelRemoved) Used in the output of the 'break del'
+# command to explain that a breakpoint was removed.
+breakdelRemoved=Breakpoint dihapus
+
+# LOCALIZATION NOTE (dbgDesc) A very short string used to describe the
+# function of the dbg command.
+dbgDesc=Kelola debugger
+
+# LOCALIZATION NOTE (dbgManual) A longer description describing the
+# set of commands that control the debugger.
+dbgManual=Perintah untuk menyela atau melanjutkan utas utama, memasuki, melangkah keluar dari, dan melewati baris kode
+
+# LOCALIZATION NOTE (dbgOpen) A very short string used to describe the function
+# of the dbg open command.
+dbgOpen=Buka debugger
+
+# LOCALIZATION NOTE (dbgClose) A very short string used to describe the function
+# of the dbg close command.
+dbgClose=Tutup debugger
+
+# LOCALIZATION NOTE (dbgInterrupt) A very short string used to describe the
+# function of the dbg interrupt command.
+dbgInterrupt=Hentikan sementara utas utama
+
+# LOCALIZATION NOTE (dbgContinue) A very short string used to describe the
+# function of the dbg continue command.
+dbgContinue=Melanjutkan kembali utas utama, dan meneruskan eksekusi breakpoint tersebut, sampai breakpoint selanjutnya atau penghentian skrip.
+
+# LOCALIZATION NOTE (dbgStepDesc) A very short string used to describe the
+# function of the dbg step command.
+dbgStepDesc=Kelola pelangkahan
+
+# LOCALIZATION NOTE (dbgStepManual) A longer description describing the
+# set of commands that control stepping.
+dbgStepManual=Perintah untuk memasuki, melangkah keluar dari dan melewati baris kode
+
+# LOCALIZATION NOTE (dbgStepOverDesc) A very short string used to describe the
+# function of the dbg step over command.
+dbgStepOverDesc=Mengeksekusi pernyataan aktual dan kemudian berhenti pada pernyataan berikutnya. Jika pernyataan aktual adalah sebuah pemanggilan fungsi maka debugger akan mengeksekusi fungsi secara keseluruhan, dan akan berhenti pada pernyataan berikutnya setelah pemanggilan fungsi
+
+# LOCALIZATION NOTE (dbgStepInDesc) A very short string used to describe the
+# function of the dbg step in command.
+dbgStepInDesc=Mengeksekusi pernyataan aktual dan kemudian berhenti pada pernyataan berikutnya. Jika pernyataan aktual adalah sebuah pemanggilan fungsi maka debugger akan masuk ke fungsi tersebut, jika tidak maka akan berhenti pada pernyataan berikutnya
+
+# LOCALIZATION NOTE (dbgStepOutDesc) A very short string used to describe the
+# function of the dbg step out command.
+dbgStepOutDesc=Keluar dari fungsi aktual dan naik satu level jika fungsinya berkalang. Jika sedang berada di skrip utama, skrip akan dieksekusi sampai akhir, atau sampai breakpoint selanjutnya. Pernyataan yang dilewati tetap akan dieksekusi, namun tidak secara keseluruhan
+
+# LOCALIZATION NOTE (dbgListSourcesDesc) A very short string used to describe the
+# function of the dbg list command.
+dbgListSourcesDesc=Tampilkan daftar URL sumber yang dimuat pada debugger
+
+# LOCALIZATION NOTE (dbgBlackBoxDesc) A very short string used to describe the
+# function of the 'dbg blackbox' command.
+dbgBlackBoxDesc=Sumber kotak hitam pada debugger
+
+# LOCALIZATION NOTE (dbgBlackBoxSourceDesc) A very short string used to describe the
+# 'source' parameter to the 'dbg blackbox' command.
+dbgBlackBoxSourceDesc=Kode sumber tertentu untuk dimasukkan ke kotak hotam
+
+# LOCALIZATION NOTE (dbgBlackBoxGlobDesc) A very short string used to describe the
+# 'glob' parameter to the 'dbg blackbox' command.
+dbgBlackBoxGlobDesc=Masukkan semua sumber yang cocok dengan pola ini ke kotak hitam (misal: "*.min.js")
+
+# LOCALIZATION NOTE (dbgBlackBoxInvertDesc) A very short string used to describe the
+# 'invert' parameter to the 'dbg blackbox' command.
+dbgBlackBoxInvertDesc=Balikkan pencocokan, agar sumber yang tidak disediakan atau tidak cocok dengan pola glob yang disediakan tidak akan dimasukkan ke kotak hitam.
+
+# LOCALIZATION NOTE (dbgBlackBoxEmptyDesc) A very short string used to let the
+# user know that no sources were black boxed.
+dbgBlackBoxEmptyDesc=(Tidak ada kode sumber yang dijadikan kotak hitam)
+
+# LOCALIZATION NOTE (dbgBlackBoxNonEmptyDesc) A very short string used to let the
+# user know which sources were black boxed.
+dbgBlackBoxNonEmptyDesc=Kode sumber berikut dimasukkan kotak hitam:
+
+# LOCALIZATION NOTE (dbgBlackBoxErrorDesc) A very short string used to let the
+# user know there was an error black boxing a source (whose url follows this
+# text).
+dbgBlackBoxErrorDesc=Galat saat memasukkan ke kotak hitam:
+
+# LOCALIZATION NOTE (dbgUnBlackBoxDesc) A very short string used to describe the
+# function of the 'dbg unblackbox' command.
+dbgUnBlackBoxDesc=Hentikan memasukkan kode sumber ke kotak hitam pada debugger
+
+# LOCALIZATION NOTE (dbgUnBlackBoxSourceDesc) A very short string used to describe the
+# 'source' parameter to the 'dbg unblackbox' command.
+dbgUnBlackBoxSourceDesc=Kode sumber tertentu yang dikeluarkan dari kotak hitam
+
+# LOCALIZATION NOTE (dbgUnBlackBoxGlobDesc) A very short string used to describe the
+# 'glob' parameter to the 'dbg blackbox' command.
+dbgUnBlackBoxGlobDesc=Keluarkan semua sumber yang cocok dengan pola ini dari kotak hitam (misal: "*.min.js")
+
+# LOCALIZATION NOTE (dbgUnBlackBoxEmptyDesc) A very short string used to let the
+# user know that we did not stop black boxing any sources.
+dbgUnBlackBoxEmptyDesc=(Tidak ada kode sumber yang dikeluarkan dari kotak hitam)
+
+# LOCALIZATION NOTE (dbgUnBlackBoxNonEmptyDesc) A very short string used to let the
+# user know which sources we stopped black boxing.
+dbgUnBlackBoxNonEmptyDesc=Kode sumber berikut dikeluarkan dari kotak hitam:
+
+# LOCALIZATION NOTE (dbgUnBlackBoxErrorDesc) A very short string used to let the
+# user know there was an error black boxing a source (whose url follows this
+# text).
+dbgUnBlackBoxErrorDesc=Galat saat mengeluarkan dari kotak hitam:
+
+# LOCALIZATION NOTE (dbgUnBlackBoxInvertDesc) A very short string used to describe the
+# 'invert' parameter to the 'dbg unblackbox' command.
+dbgUnBlackBoxInvertDesc=Balikkan pencocokan, agar sumber yang tidak disediakan atau tidak cocok dengan pola glob yang disediakan tidak akan dikeluarkan ke kotak hitam.
+
+# LOCALIZATION NOTE (consolecloseDesc) A very short description of the
+# 'console close' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+consolecloseDesc=Tutup konsol
+
+# LOCALIZATION NOTE (consoleopenDesc) A very short description of the
+# 'console open' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+consoleopenDesc=Buka konsol
+
+# LOCALIZATION NOTE (editDesc) A very short description of the 'edit'
+# command. See editManual2 for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+editDesc=Ubahsuaikan sumber daya laman
+
+# LOCALIZATION NOTE (editManual2) A fuller description of the 'edit' command,
+# displayed when the user asks for help on what it does.
+editManual2=Edit salah satu sumber daya yang menjadi bagian dari halaman ini
+
+# LOCALIZATION NOTE (editResourceDesc) A very short string to describe the
+# 'resource' parameter to the 'edit' command, which is displayed in a dialog
+# when the user is using this command.
+editResourceDesc=URL yang diedit
+
+# LOCALIZATION NOTE (editLineToJumpToDesc) A very short string to describe the
+# 'line' parameter to the 'edit' command, which is displayed in a dialog
+# when the user is using this command.
+editLineToJumpToDesc=Loncat ke baris
+
+# LOCALIZATION NOTE (resizePageDesc) A very short string to describe the
+# 'resizepage' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizePageDesc=Ubah ukuran laman
+
+# LOCALIZATION NOTE (resizePageArgWidthDesc) A very short string to describe the
+# 'width' parameter to the 'resizepage' command, which is displayed in a dialog
+# when the user is using this command.
+resizePageArgWidthDesc=Lebar dalam satuan piksel
+
+# LOCALIZATION NOTE (resizePageArgWidthDesc) A very short string to describe the
+# 'height' parameter to the 'resizepage' command, which is displayed in a dialog
+# when the user is using this command.
+resizePageArgHeightDesc=Tinggi dalam satuan piksel
+
+# LOCALIZATION NOTE (resizeModeOnDesc) A very short string to describe the
+# 'resizeon ' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeOnDesc=Memasuki Mode Desain Responsif
+
+# LOCALIZATION NOTE (resizeModeOffDesc) A very short string to describe the
+# 'resize off' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeOffDesc=Keluar dari Mode Desain Responsif
+
+# LOCALIZATION NOTE (resizeModeToggleDesc) A very short string to describe the
+# 'resize toggle' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeToggleDesc=Pengalih Mode Desain Responsif
+
+# LOCALIZATION NOTE (resizeModeToggleTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles Responsive Design Mode.
+resizeModeToggleTooltip=Tampilan Desain Responsif
+
+# LOCALIZATION NOTE (resizeModeToDesc) A very short string to describe the
+# 'resize to' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeToDesc=Ubah ukuran laman
+
+# LOCALIZATION NOTE (resizeModeDesc) A very short string to describe the
+# 'resize' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeDesc=Mengatur Mode Desain Responsif
+
+# LOCALIZATION NOTE (resizeModeManual) A fuller description of the 'resize'
+# command, displayed when the user asks for help on what it does.
+# The argument (%1$S) is the browser name.
+resizeModeManual2=Situs web yang responsif bereaksi terhadap lingkungan penampilnya, sehingga terlihat baik pada tampilan seluler, tampilan sinema, dan ukuran tampilan di antaranya. Mode Desain Responsif dapat digunakan untuk menguji berbagai ukuran laman pada %1$S tanpa perlu mengubah ukuran jendela peramban secara keseluruhan.
+
+# LOCALIZATION NOTE (cmdDesc) A very short description of the 'cmd'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+cmdDesc=Memanipulasi perintah
+
+# LOCALIZATION NOTE (cmdRefreshDesc) A very short description of the 'cmd refresh'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+cmdRefreshDesc=Membaca ulang direktori mozcmd
+
+# LOCALIZATION NOTE (cmdStatus3) When the we load new commands from mozcmd
+# directory, we report where we loaded from using %1$S.
+cmdStatus3=Perintah dimuat dari '%1$S'
+
+# LOCALIZATION NOTE (cmdSetdirDesc)  A very short description of the 'cmd setdir'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+cmdSetdirDesc=Siapkan folder berisi mozcmd
+
+# LOCALIZATION NOTE (cmdSetdirManual2) A fuller description of the 'cmd setdir'
+# command, displayed when the user asks for help on what it does.
+cmdSetdirManual2=Folder 'mozcmd' merupakan cara mudah untuk membuat perintah khusus baru. Untuk informasi selengkapnya, baca <a href="https://developer.mozilla.org/docs/Tools/GCLI/Customization">dokumentasi MDN</a>.
+
+# LOCALIZATION NOTE (cmdSetdirDirectoryDesc) The description of the directory
+# parameter to the 'cmd setdir' command.
+cmdSetdirDirectoryDesc=Folder berisi berkas .mozcmd
+
+# LOCALIZATION NOTE (addonDesc) A very short description of the 'addon'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+addonDesc=Memanipulasi pengaya
+
+# LOCALIZATION NOTE (addonListDesc) A very short description of the 'addon list'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+addonListDesc=Tampilkan pengaya terpasang
+
+# LOCALIZATION NOTE (addonListTypeDesc) A very short description of the
+# 'addon list <type>' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+addonListTypeDesc=Pilih jenis pengaya
+
+# LOCALIZATION NOTE (addonListDictionaryHeading, addonListExtensionHeading,
+# addonListLocaleHeading, addonListPluginHeading, addonListThemeHeading,
+# addonListUnknownHeading) Used in the output of the 'addon list' command as the
+# first line of output.
+addonListDictionaryHeading=Kamus berikut terpasang:
+addonListExtensionHeading=Ekstensi berikut terpasang:
+addonListLocaleHeading=Pelokalan berikut terpasang:
+addonListPluginHeading=Plugin berikut terpasang:
+addonListThemeHeading=Tema berikut terpasang:
+addonListAllHeading=Pengaya berikut terpasang:
+addonListUnknownHeading=Pengaya jenis terpilih berikut terpasang:
+
+# LOCALIZATION NOTE (addonListOutEnable, addonListOutDisable) Used in the
+# output of the 'addon list' command as the labels for the enable/disable
+# action buttons in the listing. This string is designed to be shown in a
+# small action button next to the addon name, which is why it should be as
+# short as possible.
+addonListOutEnable=Aktifkan
+addonListOutDisable=Nonaktifkan
+
+# LOCALIZATION NOTE (addonPending, addonPendingEnable, addonPendingDisable,
+# addonPendingUninstall, addonPendingInstall, addonPendingUpgrade) Used in
+# the output of the 'addon list' command as the descriptions of pending
+# addon operations. addonPending is used as a prefix for a list of pending
+# actions (named by the other lookup variables). These strings are designed
+# to be shown alongside addon names, which is why they should be as short
+# as possible.
+addonPending=tertunda
+addonPendingEnable=aktifkan
+addonPendingDisable=nonaktifkan
+addonPendingUninstall=hapus instalasi
+addonPendingInstall=instal
+addonPendingUpgrade=tingkatkan versi
+
+# LOCALIZATION NOTE (addonNameDesc) A very short description of the
+# name parameter of numerous add-on commands. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+addonNameDesc=Nama pengaya
+
+# LOCALIZATION NOTE (addonNoneOfType) Used in the output of the 'addon list'
+# command when a search for add-ons of a particular type were not found.
+addonNoneOfType=Tidak ada pengaya jenis tersebut yang terpasang.
+
+# LOCALIZATION NOTE (addonEnableDesc) A very short description of the
+# 'addon enable <type>' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+addonEnableDesc=Aktifkan pengaya yang telah ditentukan
+
+# LOCALIZATION NOTE (addonAlreadyEnabled) Used in the output of the
+# 'addon enable' command when an attempt is made to enable an add-on that is
+# already enabled.
+addonAlreadyEnabled=%S sudah diaktifkan.
+
+# LOCALIZATION NOTE (addonEnabled) Used in the output of the 'addon enable'
+# command when an add-on is enabled.
+addonEnabled=%S diaktifkan.
+
+# LOCALIZATION NOTE (addonDisableDesc) A very short description of the
+# 'addon disable <type>' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+addonDisableDesc=Nonaktifkan pengaya yang telah ditentukan
+
+# LOCALIZATION NOTE (addonAlreadyDisabled) Used in the output of the
+# 'addon disable' command when an attempt is made to disable an add-on that is
+# already disabled.
+addonAlreadyDisabled=%S sudah dinonaktifkan.
+
+# LOCALIZATION NOTE (addonDisabled) Used in the output of the 'addon disable'
+# command when an add-on is disabled.
+addonDisabled=%S dinonaktifkan.
+
+# LOCALIZATION NOTE (exportDesc) A very short description of the 'export'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+exportDesc=Ekspor sumber daya
+
+# LOCALIZATION NOTE (exportHtmlDesc) A very short description of the 'export
+# html' command. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+exportHtmlDesc=Ekspor laman dalam format HTML
+
+# LOCALIZATION NOTE (pagemodDesc) A very short description of the 'pagemod'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+pagemodDesc=Ubah laman
+
+# LOCALIZATION NOTE (pagemodReplaceDesc) A very short description of the
+# 'pagemod replace' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+pagemodReplaceDesc=Cari dan ganti di elemen pada laman
+
+# LOCALIZATION NOTE (pagemodReplaceSearchDesc) A very short string to describe
+# the 'search' parameter to the 'pagemod replace' command, which is displayed in
+# a dialog when the user is using this command.
+pagemodReplaceSearchDesc=Yang dicari
+
+# LOCALIZATION NOTE (pagemodReplaceReplaceDesc) A very short string to describe
+# the 'replace' parameter to the 'pagemod replace' command, which is displayed in
+# a dialog when the user is using this command.
+pagemodReplaceReplaceDesc=Teks pengganti
+
+# LOCALIZATION NOTE (pagemodReplaceIgnoreCaseDesc) A very short string to
+# describe the 'ignoreCase' parameter to the 'pagemod replace' command, which is
+# displayed in a dialog when the user is using this command.
+pagemodReplaceIgnoreCaseDesc=Pencarian (besar/kecil berpengaruh)
+
+# LOCALIZATION NOTE (pagemodReplaceRootDesc) A very short string to describe the
+# 'root' parameter to the 'pagemod replace' command, which is displayed in
+# a dialog when the user is using this command.
+pagemodReplaceRootDesc=Selektor CSS induk yang akan dicari
+
+# LOCALIZATION NOTE (pagemodReplaceSelectorDesc) A very short string to describe
+# the 'selector' parameter to the 'pagemod replace' command, which is displayed
+# in a dialog when the user is using this command.
+pagemodReplaceSelectorDesc=Selektor CSS yang akan dicocokkan dalam pencarian
+
+# LOCALIZATION NOTE (pagemodReplaceAttributesDesc) A very short string to
+# describe the 'attributes' parameter to the 'pagemod replace' command, which is
+# displayed in a dialog when the user is using this command.
+pagemodReplaceAttributesDesc=Pencocokan atribut berdasar regex
+
+# LOCALIZATION NOTE (pagemodReplaceAttrOnlyDesc) A very short string to describe
+# the 'attrOnly' parameter to the 'pagemod replace' command, which is displayed
+# in a dialog when the user is using this command.
+pagemodReplaceAttrOnlyDesc=Batas pencarian hanya pada atribut
+
+# LOCALIZATION NOTE (pagemodReplaceContentOnlyDesc) A very short string to
+# describe the 'contentOnly' parameter to the 'pagemod replace' command, which
+# is displayed in a dialog when the user is using this command.
+pagemodReplaceContentOnlyDesc=Batasi pencarian pada node teks
+
+# LOCALIZATION NOTE (pagemodReplaceResultMatchedElements) A string displayed as
+# the result of the 'pagemod replace' command.
+pagemodReplaceResult=Elemen yang cocok dengan selektor: %1$S. Penggantian pada node teks: %2$S. Penggantian pada atribut: %3$S.
+
+# LOCALIZATION NOTE (pagemodRemoveDesc) A very short description of the
+# 'pagemod remove' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+pagemodRemoveDesc=Hapus elemen dan atribut dari laman
+
+# LOCALIZATION NOTE (pagemodRemoveElementDesc) A very short description of the
+# 'pagemod remove element' command. This string is designed to be shown in
+# a menu alongside the command name, which is why it should be as short as
+# possible.
+pagemodRemoveElementDesc=Hapus elemen dari laman
+
+# LOCALIZATION NOTE (pagemodRemoveElementSearchDesc) A very short string to
+# describe the 'search' parameter to the 'pagemod remove element' command, which
+# is displayed in a dialog when the user is using this command.
+pagemodRemoveElementSearchDesc=Selektor CSS elemen yang akan dihapus
+
+# LOCALIZATION NOTE (pagemodRemoveElementRootDesc) A very short string to
+# describe the 'root' parameter to the 'pagemod remove element' command, which
+# is displayed in a dialog when the user is using this command.
+pagemodRemoveElementRootDesc=Selektor CSS induk yang akan dicari
+
+# LOCALIZATION NOTE (pagemodRemoveElementStripOnlyDesc) A very short string to
+# describe the 'stripOnly' parameter to the 'pagemod remove element' command,
+# which is displayed in a dialog when the user is using this command.
+pagemodRemoveElementStripOnlyDesc=Hapus elemen, biarkan kontennya
+
+# LOCALIZATION NOTE (pagemodRemoveElementIfEmptyOnlyDesc) A very short string to
+# describe the 'ifEmptyOnly' parameter to the 'pagemod remove element' command,
+# which is displayed in a dialog when the user is using this command.
+pagemodRemoveElementIfEmptyOnlyDesc=Hanya hapus elemen yang kosong
+
+# LOCALIZATION NOTE (pagemodRemoveElementResultMatchedAndRemovedElements)
+# A string displayed as the result of the 'pagemod remove element' command.
+pagemodRemoveElementResultMatchedAndRemovedElements=Elemen yang cocok dengan selektor: %1$S. Element dihapus: %2$S.
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeDesc) A very short description of the
+# 'pagemod remove attribute' command. This string is designed to be shown in
+# a menu alongside the command name, which is why it should be as short as
+# possible.
+pagemodRemoveAttributeDesc=Hapus atribut yang cocok
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeSearchAttributesDesc) A very short
+# string to describe the 'searchAttributes' parameter to the 'pagemod remove
+# attribute' command, which is displayed in a dialog when the user is using this
+# command.
+pagemodRemoveAttributeSearchAttributesDesc=Pola regex untuk atribut yang akan diganti
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeSearchElementsDesc) A very short
+# string to describe the 'searchElements' parameter to the 'pagemod remove
+# attribute' command, which is displayed in a dialog when the user is using this
+# command.
+pagemodRemoveAttributeSearchElementsDesc=Selektor CSS elemen untuk disertakan
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeRootDesc) A very short string to
+# describe the 'root' parameter to the 'pagemod remove attribute' command, which
+# is displayed in a dialog when the user is using this command.
+pagemodRemoveAttributeRootDesc=Selektor CSS induk pencarian
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeIgnoreCaseDesc) A very short string
+# to describe the 'ignoreCase' parameter to the 'pagemod remove attribute'
+# command, which is displayed in a dialog when the user is using this command.
+pagemodRemoveAttributeIgnoreCaseDesc=Pencarian (besar/kecil berpengaruh)
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeResult) A string displayed as the
+# result of the 'pagemod remove attribute' command.
+pagemodRemoveAttributeResult=Elemen yang cocok dengan selektor: %1$S. Atribut dihapus: %2$S.
+
+# LOCALIZATION NOTE (toolsDesc2) A very short description of the 'tools'
+# command, the parent command for tool-hacking commands.
+# The argument (%1$S) is the browser name.
+toolsDesc2=Retas Alat Pengembang %1$S
+
+# LOCALIZATION NOTE (toolsManual2) A fuller description of the 'tools'
+# command. The argument (%1$S) is the browser name.
+toolsManual2=Berbagai perintah yang terkait dengan peretasan langsung ke Alat Pengembang %1$S.
+
+# LOCALIZATION NOTE (toolsSrcdirDesc) A very short description of the 'tools srcdir'
+# command, for pointing your developer tools loader at a mozilla-central source tree.
+toolsSrcdirDesc=Muat alat dari proses checkout dari mozilla-central
+
+# LOCALIZATION NOTE (toolsSrcdirNotFound) Shown when the 'tools srcdir' command was handed
+# an invalid srcdir.
+toolsSrcdirNotFound=%1$s tidak ada atau bukan checkout dari mozilla-central.
+
+# LOCALIZATION NOTE (toolsSrcdirReloaded) Displayed when tools have been reloaded by the
+# 'tools srcdir' command.
+toolsSrcdirReloaded=Alat dimuat dari %1$s.
+
+# LOCALIZATION NOTE (toolsSrcdirManual2) A full description of the 'tools srcdir'
+# command. The argument (%1$S) is the browser name.
+toolsSrcdirManual2=Muat Alat Pengembang %1$S dari checkout lengkap complete mozilla-central.
+
+# LOCALIZATION NOTE (toolsSrcdirDir) The srcdir argument to the 'tools srcdir' command.
+toolsSrcdirDir=Checkout mozilla-central
+
+# LOCALIZATION NOTE (toolsBuiltinDesc) A short description of the 'tools builtin'
+# command, which overrides a previous 'tools srcdir' command.
+toolsBuiltinDesc=Gunakan alat yang tersedia secara bawaan
+
+# LOCALIZATION NOTE (toolsBuiltinDesc) A fuller description of the 'tools builtin'
+# command.
+toolsBuiltinManual=Gunakan alat yang tersedia secara bawaan, tanpa menghiraukan perintah srcdir sebelumnya.
+
+# LOCALIZATION NOTE (toolsBuiltinReloaded) Displayed when tools are loaded with the
+# 'tools builtin' command.
+toolsBuiltinReloaded=Alat bawaan dimuat.
+
+# LOCALIZATION NOTE (toolsReloadDesc) A short description of the 'tools reload' command.
+# which will reload the tools from the current srcdir.
+toolsReloadDesc=Muat ulang alat pengembang
+
+# LOCALIZATION NOTE (toolsReloaded2) Displayed when tools are reloaded with the 'tools
+# reload' command.
+toolsReloaded2=Alat dimuat ulang.
+
+# LOCALIZATION NOTE (cookieDesc) A very short description of the 'cookie'
+# command. See cookieManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+cookieDesc=Tampilkan dan ubah kuki
+
+# LOCALIZATION NOTE (cookieManual) A fuller description of the 'cookie'
+# command, displayed when the user asks for help on what it does.
+cookieManual=Perintah untuk menampilkan, membuat, menghapus, dan mengubah kuki pada domain saat ini.
+
+# LOCALIZATION NOTE (cookieListDesc) A very short description of the
+# 'cookie list' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+cookieListDesc=Tampilkan kuki
+
+# LOCALIZATION NOTE (cookieListManual) A fuller description of the 'cookie list'
+# command, displayed when the user asks for help on what it does.
+cookieListManual=Tampilkan daftar kuki yang relevan untuk laman ini.
+
+# LOCALIZATION NOTE (cookieListOutHost,cookieListOutPath,cookieListOutExpires,cookieListOutAttributes):
+# The 'cookie list' command has a number of headings for cookie properties.
+# Particular care should be taken in translating these strings as they have
+# references to names in the cookies spec.
+cookieListOutHost=Host:
+cookieListOutPath=Jalur:
+cookieListOutExpires=Kedaluwarsa:
+cookieListOutAttributes=Atribut:
+
+# LOCALIZATION NOTE (cookieListOutNone) The output of the 'cookie list' command
+# uses this string when no cookie attributes (like httpOnly, secure, etc) apply
+cookieListOutNone=Tidak ada
+
+# LOCALIZATION NOTE (cookieListOutSession) The output of the 'cookie list'
+# command uses this string to describe a cookie with an expiry value of '0'
+# that is to say it is a session cookie
+cookieListOutSession=Saat keluar dari peramban (sesi)
+
+# LOCALIZATION NOTE (cookieListOutNonePage) The output of the 'cookie list'
+# command uses this string for pages like 'about:blank' which can't contain
+# cookies
+cookieListOutNonePage=Tidak ada kuki yang ditemukan untuk laman ini
+
+# LOCALIZATION NOTE (cookieListOutNoneHost) The output of the 'cookie list'
+# command uses this string when there are no cookies on a given web page
+cookieListOutNoneHost=Tidak ada kuki yang ditemukan untuk host %1$S
+
+# LOCALIZATION NOTE (cookieListOutEdit) A title used in the output from the
+# 'cookie list' command on a button which can be used to edit cookie values
+cookieListOutEdit=Edit
+
+# LOCALIZATION NOTE (cookieListOutRemove) A title used in the output from the
+# 'cookie list' command on a button which can be used to remove cookies
+cookieListOutRemove=Hapus
+
+# LOCALIZATION NOTE (cookieRemoveDesc) A very short description of the
+# 'cookie remove' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+cookieRemoveDesc=Hapus kuki
+
+# LOCALIZATION NOTE (cookieRemoveManual) A fuller description of the 'cookie remove'
+# command, displayed when the user asks for help on what it does.
+cookieRemoveManual=Hapus kuki berdasarkan kuncinya
+
+# LOCALIZATION NOTE (cookieRemoveKeyDesc) A very short string to describe the
+# 'key' parameter to the 'cookie remove' command, which is displayed in a dialog
+# when the user is using this command.
+cookieRemoveKeyDesc=Kunci kuki yang akan dihapus
+
+# LOCALIZATION NOTE (cookieSetDesc) A very short description of the
+# 'cookie set' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+cookieSetDesc=Setel kuki
+
+# LOCALIZATION NOTE (cookieSetManual) A fuller description of the 'cookie set'
+# command, displayed when the user asks for help on what it does.
+cookieSetManual=Setel kuki berdasarkan nama kunci, nilai, dan salah satu atribut opsional berikut: expires (max-age dalam detik atau expires date dalam format GMTString), path, domain, dan secure
+
+# LOCALIZATION NOTE (cookieSetKeyDesc) A very short string to describe the
+# 'key' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetKeyDesc=Kunci kuki yang akan disetel
+
+# LOCALIZATION NOTE (cookieSetValueDesc) A very short string to describe the
+# 'value' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetValueDesc=Nilai kuki yang akan disetel
+
+# LOCALIZATION NOTE (cookieSetOptionsDesc) The title of a set of options to
+# the 'cookie set' command, displayed as a heading to the list of option.
+cookieSetOptionsDesc=Opsi
+
+# LOCALIZATION NOTE (cookieSetPathDesc) A very short string to describe the
+# 'path' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetPathDesc=Jalur lokasi kuki yang akan disetel
+
+# LOCALIZATION NOTE (cookieSetDomainDesc) A very short string to describe the
+# 'domain' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetDomainDesc=Domain kuki yang akan disetel
+
+# LOCALIZATION NOTE (cookieSetSecureDesc) A very short string to describe the
+# 'secure' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetSecureDesc=Hanya kirimkan lewat https
+
+# LOCALIZATION NOTE (cookieSetHttpOnlyDesc) A very short string to describe the
+# 'httpOnly' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetHttpOnlyDesc=Tidak dapat diakses dari skrip sisi klien
+
+# LOCALIZATION NOTE (cookieSetSessionDesc) A very short string to describe the
+# 'session' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetSessionDesc=Hanya valid selama sesi peramban
+
+# LOCALIZATION NOTE (cookieSetExpiresDesc) A very short string to describe the
+# 'expires' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetExpiresDesc=Tanggal kedaluwarsa kuki (format RFC2822 dalam kutip atau tanggal ISO 8601)
+
+# LOCALIZATION NOTE (jsbDesc) A very short description of the
+# 'jsb' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+jsbDesc=Pemformat JavaScript
+
+# LOCALIZATION NOTE (jsbUrlDesc) A very short description of the
+# 'jsb <url>' parameter. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+jsbUrlDesc=URL berkas JS untuk diformat
+
+# LOCALIZATION NOTE (jsbIndentSizeDesc) A very short description of the
+# 'jsb <indentSize>' parameter. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+jsbIndentSizeDesc=Ukuran indentasi dalam karakter
+
+# LOCALIZATION NOTE (jsbIndentSizeManual) A fuller description of the
+# 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
+# does.
+jsbIndentSizeManual=Jumlah karakter indentasi tiap baris
+
+# LOCALIZATION NOTE (jsbIndentCharDesc) A very short description of the
+# 'jsb <indentChar>' parameter. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+jsbIndentCharDesc=Karakter indentasi tiap baris
+
+# LOCALIZATION NOTE (jsbIndentCharManual) A fuller description of the
+# 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
+# does.
+jsbIndentCharManual=Karakter yang akan digunakan untuk indentasi baris. Salah satu dari spasi atau tab.
+
+# the 'jsb <doNotPreserveNewlines>' parameter. This string is designed to be
+# shown in a menu alongside the command name, which is why it should be as short
+# as possible.
+jsbDoNotPreserveNewlinesDesc=Buang semua baris kosong
+
+# LOCALIZATION NOTE (jsbPreserveNewlinesManual) A fuller description of the
+# 'jsb <jsbPreserveNewlines>' parameter, displayed when the user asks for help
+# on what it does.
+jsbPreserveNewlinesManual=Pilihan untuk menghapus atau membiarkan baris kosong yang ada
+
+# LOCALIZATION NOTE (jsbPreserveMaxNewlinesDesc) A very short description of the
+# 'jsb <preserveMaxNewlines>' parameter. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+jsbPreserveMaxNewlinesDesc=Jumlah baris kosong berurutan
+
+# LOCALIZATION NOTE (jsbPreserveMaxNewlinesManual) A fuller description of the
+# 'jsb <preserveMaxNewlines>' parameter, displayed when the user asks for help
+# on what it does.
+jsbPreserveMaxNewlinesManual=Jumlah maksimum baris kosong yang akan dibiarkan
+
+# LOCALIZATION NOTE (jsbJslintHappyDesc) A very short description of the
+# 'jsb <jslintHappy>' parameter. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+jsbJslintHappyDesc=Paksa mode jslint-stricter?
+
+# LOCALIZATION NOTE (jsbJslintHappyManual) A fuller description of the
+# 'jsb <jslintHappy>' parameter, displayed when the user asks for help
+# on what it does.
+jsbJslintHappyManual=Jika disetel sebagai true, mode jslint-stricter akan digunakan secara paksa
+
+# LOCALIZATION NOTE (jsbBraceStyleDesc2) A very short description of the
+# 'jsb <braceStyle>' parameter. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+jsbBraceStyleDesc2=Pilih gaya kode untuk tanda kurung
+
+# LOCALIZATION NOTE (jsbBraceStyleManual2) A fuller description of the
+# 'jsb <braceStyle>' parameter, displayed when the user asks for help
+# on what it does.
+#
+# NOTES: The keywords collapse, expand, end-expand and expand-strict should not
+# be translated. "even if it will break your code" means that the resulting code
+# may no longer be functional.
+jsbBraceStyleManual2=Pilih gaya kode untuk tanda kurung: ciutkan - tanda kurung ada di baris yang sama dengan pernyataan kontrol; bentangkan - tanda kurung pada baris baru (gaya Allman/ANSI); pembentangan ketat - tanda kurung pada baris baru walau pun kodenya akan rusak.
+
+# LOCALIZATION NOTE (jsbNoSpaceBeforeConditionalDesc) A very short description
+# of the 'jsb <noSpaceBeforeConditional>' parameter. This string is designed to
+# be shown in a menu alongside the command name, which is why it should be as
+# short as possible.
+jsbNoSpaceBeforeConditionalDesc=Hapus spasi sebelum pernyataan kondisional
+
+# LOCALIZATION NOTE (jsbUnescapeStringsDesc) A very short description of the
+# 'jsb <unescapeStrings>' parameter. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+jsbUnescapeStringsDesc=Karakter \\xNN di-unescape?
+
+# LOCALIZATION NOTE (jsbUnescapeStringsManual) A fuller description of the
+# 'jsb <unescapeStrings>' parameter, displayed when the user asks for help
+# on what it does.
+jsbUnescapeStringsManual=Aktif/Nonaktifkan proses unescape pada string notasi \\xNN?
+
+# LOCALIZATION NOTE (jsbInvalidURL) Displayed when an invalid URL is passed to
+# the jsb command.
+jsbInvalidURL=Masukkan URL yang valid
+
+# LOCALIZATION NOTE (jsbOptionsDesc) The title of a set of options to
+# the 'jsb' command, displayed as a heading to the list of options.
+jsbOptionsDesc=Opsi
+
+# LOCALIZATION NOTE (calllogDesc) A very short description of the
+# 'calllog' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogDesc=Perintah untuk memanipulasi pencatatan pemanggilan fungsi
+
+# LOCALIZATION NOTE (calllogStartDesc) A very short description of the
+# 'calllog start' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogStartDesc=Mulai pencatatan pemanggilan fungsi ke konsol
+
+# LOCALIZATION NOTE (calllogStartReply) A string displayed as the result of
+# the 'calllog start' command.
+calllogStartReply=Pencatatan pemanggilan dimulai.
+
+# LOCALIZATION NOTE (calllogStopDesc) A very short description of the
+# 'calllog stop' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogStopDesc=Hentikan pencatatan pemanggilan fungsi
+
+# LOCALIZATION NOTE (calllogStopNoLogging) A string displayed as the result of
+# the 'calllog stop' command when there is nothing to stop.
+calllogStopNoLogging=Tidak ada pencatatan pemanggilan yang aktif
+
+# LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
+# the 'calllog stop' command when there are logging actions to stop.
+calllogStopReply=Hentikan pencatatan pemanggilan. Konteks aktif: %1$S.
+
+# LOCALIZATION NOTE (calllogStartChromeDesc) A very short description of the
+# 'calllog chromestart' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogChromeStartDesc=Mulai pencatatan pemanggilan fungsi untuk kode chrome ke konsol
+
+# LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
+# 'calllog chromestart <sourceType>' parameter. This string is designed to be
+# shown in a menu alongside the command name, which is why it should be as short as possible.
+calllogChromeSourceTypeDesc=Objek global, URI JSM, atau JS yang akan diambil objek globalnya
+
+# LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
+# 'calllog chromestart' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogChromeSourceTypeManual=The global object, URI of a JSM, or JS to execute in the chrome window from which to obtain a global object
+
+# LOCALIZATION NOTE (calllogChromeStartReply) A string displayed as the result
+# of the 'calllog chromestart' command.
+calllogChromeStartReply=Pencatatan pemanggilan dimulai.
+
+# LOCALIZATION NOTE (calllogChromeStopDesc) A very short description of the
+# 'calllog chromestop' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogChromeStopDesc=Hentikan pencatatan pemanggilan fungsi
+
+# LOCALIZATION NOTE (calllogChromeStopNoLogging) A string displayed as the
+# result of the 'calllog chromestop' command when there is nothing to stop.
+calllogChromeStopNoLogging=Tidak ada pencatatan pemanggilan pada kode chrome yang sedang aktif
+
+# LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
+# the 'calllog chromestop' command when there are logging actions to stop.
+calllogChromeStopReply=Pencatatan pemanggilan dihentikan. Konteks aktif: %1$S.
+
+# LOCALIZATION NOTE (callLogChromeAnonFunction) A string displayed as the result
+# of the 'calllog chromestart' command when an anonymouse function is to be
+# logged.
+callLogChromeAnonFunction=<anonymous>
+
+# LOCALIZATION NOTE (callLogChromeMethodCall) A string displayed as the result
+# of the 'calllog chromestart' command to proceed a method name when it is to be
+# logged.
+callLogChromeMethodCall=Pemanggilan metode
+
+# LOCALIZATION NOTE (callLogChromeInvalidJSM) A string displayed as the result
+# of the 'calllog chromestart' command with an invalid JSM or JSM path.
+callLogChromeInvalidJSM=JSM tidak valid!
+
+# LOCALIZATION NOTE (callLogChromeVarNotFoundContent) A string displayed as the
+# result of the 'calllog chromestart' command with a source type of
+# content-variable and an invalid variable name.
+callLogChromeVarNotFoundContent=Variabel tidak ditemukan pada jendela konten.
+
+# LOCALIZATION NOTE (callLogChromeVarNotFoundChrome) A string displayed as the
+# result of the 'calllog chromestart' command with a source type of
+# chrome-variable and an invalid variable name.
+callLogChromeVarNotFoundChrome=Variabel tidak ditemukan pada jendela chrome.
+
+# LOCALIZATION NOTE (callLogChromeEvalException) A string displayed as the
+# result of the 'calllog chromestart' command with a source type of JavaScript
+# and invalid JavaScript code.
+callLogChromeEvalException=JavaScript yang dievaluasi melemparkan eksepsi berikut
+
+# LOCALIZATION NOTE (callLogChromeEvalNeedsObject) A string displayed as the
+# result of passing a non-JavaScript object creating source via the
+# 'calllog chromestart javascript' command.
+callLogChromeEvalNeedsObject=Sumber JavaScript harus mengevaluasi objek yang berisi pemanggilan metode yang akan dicatat, misalnya "({a1: function() {this.a2()},a2: function() {}});"
+
+# LOCALIZATION NOTE (scratchpadOpenTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which opens Scratchpad.
+scratchpadOpenTooltip=Scratchpad
+
+# LOCALIZATION NOTE (paintflashingDesc) A very short string used to describe the
+# function of the "paintflashing" command
+paintflashingDesc=Sorot area yang digambar
+
+# LOCALIZATION NOTE (paintflashingOnDesc) A very short string used to describe the
+# function of the "paintflashing on" command.
+paintflashingOnDesc=Aktifkan kilat gambar
+
+# LOCALIZATION NOTE (paintflashingOffDesc) A very short string used to describe the
+# function of the "paintflashing off" command.
+paintflashingOffDesc=Nonaktifkan kilat gambar
+
+# LOCALIZATION NOTE (paintflashingChrome) A very short string used to describe the
+# function of the "paintflashing on/off chrome" command.
+paintflashingChromeDesc=frame chrome
+
+# LOCALIZATION NOTE (paintflashingManual) A longer description describing the
+# set of commands that control paint flashing.
+paintflashingManual=Gambar area yang digambar ulang pada warna yang berbeda
+
+# LOCALIZATION NOTE (paintflashingTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles paint flashing.
+paintflashingTooltip=Sorot area yang digambar
+
+# LOCALIZATION NOTE (paintflashingToggleDesc) A very short string used to describe the
+# function of the "paintflashing toggle" command.
+paintflashingToggleDesc=Aktifkan/Nonaktifkan kilat penggambaran
+
+# LOCALIZATION NOTE (splitconsoleTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles the split webconsole.
+splitconsoleTooltip=Aktifkan/Nonaktifkan pembagian konsol
+
+# LOCALIZATION NOTE (appCacheDesc) A very short string used to describe the
+# function of the "appcache" command
+appCacheDesc=Utilitas tembolok aplikasi
+
+# LOCALIZATION NOTE (appCacheValidateDesc) A very short string used to describe
+# the function of the "appcache validate" command.
+appCacheValidateDesc=Validasikan manifest tembolok
+
+# LOCALIZATION NOTE (appCacheValidateManual) A fuller description of the
+# 'validate' parameter to the 'appcache' command, displayed when the user asks
+# for help on what it does.
+appCacheValidateManual=Temukan masalah terkait manifest tembolok dan berkas yang dirujuk
+
+# LOCALIZATION NOTE (appCacheValidateUriDesc) A very short string used to describe
+# the function of the "uri" parameter of the appcache validate" command.
+appCacheValidateUriDesc=URI untuk diperiksa
+
+# LOCALIZATION NOTE (appCacheValidated) Displayed by the "appcache validate"
+# command when it has been successfully validated.
+appCacheValidatedSuccessfully=Tembolok aplikasi sukses divalidasikan.
+
+# LOCALIZATION NOTE (appCacheClearDesc) A very short string used to describe
+# the function of the "appcache clear" command.
+appCacheClearDesc=Bersihkan item pada tembolok aplikasi
+
+# LOCALIZATION NOTE (appCacheClearManual) A fuller description of the
+# 'appcache clear' command, displayed when the user asks for help on what it does.
+appCacheClearManual=Bersihkan satu atau lebih item pada tembolok aplikasi
+
+# LOCALIZATION NOTE (appCacheClearCleared) Displayed by the "appcache clear"
+# command when entries are successfully cleared.
+appCacheClearCleared=Item sukses dibersihkan.
+
+# LOCALIZATION NOTE (AppCacheListDesc) A very short string used to describe
+# the function of the "appcache list" command.
+appCacheListDesc=Tampilkan daftar item tembolok aplikasi.
+
+# LOCALIZATION NOTE (AppCacheListManual) A fuller description of the
+# 'appcache list' command, displayed when the user asks for help on what it does.
+appCacheListManual=Menampilkan daftar semua item tembolok aplikasi. Jika ada parameter pencarian, tabel akan menampilkan item yang cocok dengan yang dicari.
+
+# LOCALIZATION NOTE (AppCacheListSearchDesc) A very short string used to describe
+# the function of the "search" parameter of the appcache list" command.
+appCacheListSearchDesc=Filter hasil berdasarkan yang dicari
+
+# LOCALIZATION NOTE (AppCacheList*) Row headers for the 'appcache list' command.
+appCacheListKey=Kunci:
+appCacheListDataSize=Ukuran data:
+appCacheListDeviceID=ID Perangkat:
+appCacheListExpirationTime=Kedaluwarsa:
+appCacheListFetchCount=Jumlah pengambilan:
+appCacheListLastFetched=Terakhir diambil:
+appCacheListLastModified=Terakhir diubah:
+
+# LOCALIZATION NOTE (appCacheListViewEntry) The text for the view entry button
+# of the 'appcache list' command.
+appCacheListViewEntry=Tampilkan Item
+
+# LOCALIZATION NOTE (appCacheViewEntryDesc) A very short string used to describe
+# the function of the "appcache viewentry" command.
+appCacheViewEntryDesc=Buka tab baru berisi informasi item tembolok yang dipilih.
+
+# LOCALIZATION NOTE (appCacheViewEntryManual) A fuller description of the
+# 'appcache viewentry' command, displayed when the user asks for help on what it
+# does.
+appCacheViewEntryManual=Buka tab baru berisi informasi item tembolok yang dipilih.
+
+# LOCALIZATION NOTE (appCacheViewEntryKey) A very short string used to describe
+# the function of the "key" parameter of the 'appcache viewentry' command.
+appCacheViewEntryKey=Kunci item yang ditampilkan.
+
+# LOCALIZATION NOTE (profilerDesc) A very short string used to describe the
+# function of the profiler command.
+profilerDesc=Kelola profiler
+
+# LOCALIZATION NOTE (profilerManual) A longer description describing the
+# set of commands that control the profiler.
+profilerManual=Perintah untuk memulai atau menghentikan profiler JavaScript
+
+# LOCALIZATION NOTE (profilerOpen) A very short string used to describe the function
+# of the profiler open command.
+profilerOpenDesc=Buka profiler
+
+# LOCALIZATION NOTE (profilerClose) A very short string used to describe the function
+# of the profiler close command.
+profilerCloseDesc=Tutup profiler
+
+# LOCALIZATION NOTE (profilerStart) A very short string used to describe the function
+# of the profiler start command.
+profilerStartDesc=Mulai proses profil
+
+# LOCALIZATION NOTE (profilerStartManual) A fuller description of the 'profile name'
+# parameter. This parameter is used to name a newly created profile or to lookup
+# an existing profile by its name.
+profilerStartManual=Nama profil yang ingin dimulai.
+
+# LOCALIZATION NOTE (profilerStop) A very short string used to describe the function
+# of the profiler stop command.
+profilerStopDesc=Hentikan proses profil
+
+# LOCALIZATION NOTE (profilerStopManual) A fuller description of the 'profile name'
+# parameter. This parameter is used to lookup an existing profile by its name.
+profilerStopManual=Name profil yang ingin dihentikan.
+
+# LOCALIZATION NOTE (profilerList) A very short string used to describe the function
+# of the profiler list command.
+profilerListDesc=Tampilkan semua profil
+
+# LOCALIZATION NOTE (profilerShow) A very short string used to describe the function
+# of the profiler show command.
+profilerShowDesc=Tampilkan profil secara individual
+
+# LOCALIZATION NOTE (profilerShowManual) A fuller description of the 'profile name'
+# parameter. This parameter is used to name a newly created profile or to lookup
+# an existing profile by its name.
+profilerShowManual=Nama profil.
+
+# LOCALIZATION NOTE (profilerAlreadyStarted) A message that is displayed whenever
+# an operation cannot be completed because the profile in question has already
+# been started.
+profilerAlreadyStarted2=Profil sudah dimulai
+
+# LOCALIZATION NOTE (profilerNotFound) A message that is displayed whenever
+# an operation cannot be completed because the profile in question could not be
+# found.
+profilerNotFound=Profil tidak ditemukan
+
+# LOCALIZATION NOTE (profilerNotStarted) A message that is displayed whenever
+# an operation cannot be completed because the profile in question has not been
+# started yet. It also contains a hint to use the 'profile start' command to
+# start the profiler.
+profilerNotStarted3=Profiler belum dimulai. Gunakan perintah 'profile start' untuk memulai proses profil
+
+# LOCALIZATION NOTE (profilerStarted2) A very short string that indicates that
+# we have started recording.
+profilerStarted2=Merekam…
+
+# LOCALIZATION NOTE (profilerStopped) A very short string that indicates that
+# we have stopped recording.
+profilerStopped=Dihentikan…
+
+# LOCALIZATION NOTE (profilerNotReady) A message that is displayed whenever
+# an operation cannot be completed because the profiler has not been opened yet.
+profilerNotReady=Agar perintah ini dapat berfungsi, Anda harus membuka profiler terlebih dulu
+
+# LOCALIZATION NOTE (listenDesc) A very short string used to describe the
+# function of the 'listen' command.
+listenDesc=Buka port debug daring
+
+# LOCALIZATION NOTE (listenManual2) A longer description of the 'listen'
+# command.
+listenManual2=%1$S dapat mengizinkan pendebugan daring lewat sambungan TCP/IP. Untuk alasan keamanan, pengaturan ini tidak aktif secara baku, tetapi dapat diaktifkan dengan perintan ini.
+
+# LOCALIZATION NOTE (listenPortDesc) A very short string used to describe the
+# function of 'port' parameter to the 'listen' command.
+listenPortDesc=Port TCP untuk mendengar
+
+# LOCALIZATION NOTE (listenDisabledOutput) Text of a message output during the
+# execution of the 'listen' command.
+listenDisabledOutput=Pendengaran dinonaktifkan oleh nilai preferensi devtools.debugger.remote-enabled
+
+# LOCALIZATION NOTE (listenInitOutput) Text of a message output during the
+# execution of the 'listen' command. %1$S is a port number
+listenInitOutput=Mendengarkan pada port %1$S
+
+# LOCALIZATION NOTE (listenNoInitOutput) Text of a message output during the
+# execution of the 'listen' command.
+listenNoInitOutput=DebuggerServer tidak diinisialisasikan
+
+# LOCALIZATION NOTE (mediaDesc, mediaEmulateDesc, mediaEmulateManual,
+# mediaEmulateType, mediaResetDesc, mediaResetManual) These strings describe
+# the 'media' commands and all available parameters.
+mediaDesc=Emulasi jenis media CSS
+mediaEmulateDesc=Emulasikan jenis media CSS yang ditentukan
+mediaEmulateManual=Tampilkan dokumen seperti jika dirender pada perangkat yang menukung jenis media yang ditentukan, serta penerapan rule CSS yang relevan.
+mediaEmulateType=Jenis media untuk diemulasikan
+mediaResetDesc=Hentikan emulasi jenis media CSS
+
+# LOCALIZATION NOTE (injectDesc, injectManual, injectLibraryDesc, injectLoaded,
+# injectFailed) These strings describe the 'inject' commands and all available
+# parameters.
+injectDesc=Suntikkan pustaka umum ke laman
+injectManual2=Suntikkan pustaka umum ke konten laman yang juga dapat diakses dari konsol.
+injectLibraryDesc=Pilih pustaka untuk disuntikkan atau masukkan URI skrip yang valid untuk disuntikkkan
+injectLoaded=%1$S dimuat
+injectFailed=Gagal memuat %1$S - URI Tidak Valid
+
+# LOCALIZATION NOTE (folderDesc, folderOpenDesc, folderOpenDir,
+# folderOpenProfileDesc) These strings describe the 'folder' commands and
+# all available parameters.
+folderDesc=Buka folder
+folderOpenDesc=Buka lokasi folder
+folderOpenDir=Lokasi Direktori
+folderOpenProfileDesc=Buka direktori profil
+
+# LOCALIZATION NOTE (folderInvalidPath) A string displayed as the result
+# of the 'folder open' command with an invalid folder path.
+folderInvalidPath=Masukkan lokasi yang vali
+
+# LOCALIZATION NOTE (folderOpenDirResult) A very short string used to
+# describe the result of the 'folder open' command.
+# The argument (%1$S) is the folder path.
+folderOpenDirResult=%1$S dibuka
+
+# LOCALIZATION NOTE (rulersDesc) A very short description of the
+# 'rulers' command. See rulersManual for a fuller description of what
+# it does. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+rulersDesc=Aktifkan/Nonaktifkan penggaris pada laman ini
+
+# LOCALIZATION NOTE (rulersManual) A fuller description of the 'rulers'
+# command, displayed when the user asks for help on what it does.
+rulersManual=Aktifkan/Nonaktifkan penggaris horizontal dan vertikal pada laman ini
+
+# LOCALIZATION NOTE (rulersTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles the rulers.
+rulersTooltip=Aktifkan/Nonaktifkan penggaris pada laman ini
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/global/devtools/gcli.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/global/devtools/gcli.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/global/devtools/gcli.properties	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/global/devtools/gcli.properties	2015-05-25 20:48:32.000000000 +0000
@@ -0,0 +1,318 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE These strings are used inside the Web Console
+# command line which is available from the Web Developer sub-menu
+# -> 'Web Console'.
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# For each command there are in general two strings. As an example consider
+# the 'pref' command.
+# commandDesc (e.g. prefDesc for the command 'pref'): this string contains a
+# very short description of the command. It's designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+# commandManual (e.g. prefManual for the command 'pref'): this string will
+# contain a fuller description of the command. It's diplayed when the user
+# asks for help about a specific command (e.g. 'help pref').
+
+# LOCALIZATION NOTE: This message is used to describe any command or command
+# parameter when no description has been provided.
+canonDescNone=(Tidak ada deskripsi)
+
+# LOCALIZATION NOTE: The default name for a group of parameters.
+canonDefaultGroupName=Opsi
+
+# LOCALIZATION NOTE (canonProxyDesc, canonProxyManual): These commands are
+# used to execute commands on a remote system (using a proxy). Parameters: %S
+# is the name of the remote system.
+canonProxyDesc=Jalankan perintah pada %S
+canonProxyManual=Sekelompok perintah yang dijalankan pada sistem daring. Sistem daring dihubungi lewat %S
+
+# LOCALIZATION NOTE: This error message is displayed when we try to add a new
+# command (using a proxy) where one already exists with the same name.
+canonProxyExists=Sudah ada perintah dengan nama '%S'
+
+# LOCALIZATION NOTE: This message describes the '{' command, which allows
+# entry of JavaScript like traditional developer tool command lines.
+cliEvalJavascript=Ketikkan langsung JavaScript
+
+# LOCALIZATION NOTE: This message is displayed when the command line has more
+# arguments than the current command can understand.
+cliUnusedArg=Terlalu banyak argumen
+
+# LOCALIZATION NOTE: The title of the dialog which displays the options that
+# are available to the current command.
+cliOptions=Opsi Tersedia
+
+# LOCALIZATION NOTE: The error message when the user types a command that
+# isn't registered
+cliUnknownCommand2=Perintah Tidak Valid; '%1$S'
+
+# LOCALIZATION NOTE: A parameter should have a value, but doesn't
+cliIncompleteParam=Dibutuhkan nilai untuk '%1$S'.
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a file
+# that does not exist, but should (e.g. for use with File->Open) %1$S is a
+# filename
+fileErrNotExists='%1$S' tidak ada
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a file
+# that exists, but should not (e.g. for use with File->Save As) %1$S is a
+# filename
+fileErrExists='%1$S' sudah ada
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a
+# non-file, when a file is needed. %1$S is a filename
+fileErrIsNotFile='%1$S' bukan berkas
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a
+# non-directory, when a directory is needed (e.g. for use with 'cd') %1$S is a
+# filename
+fileErrIsNotDirectory='%1$S' bukan direktori
+
+# LOCALIZATION NOTE: Error message given when a file argument does not match
+# the specified regular expression %1$S is a filename %2$S is a regular
+# expression
+fileErrDoesntMatch='%1$S' tidak cocok dengan '%2$S'
+
+# LOCALIZATION NOTE: When the menu has displayed all the matches that it
+# should (i.e. about 10 items) then we display this to alert the user that
+# more matches are available.
+fieldMenuMore=Teruskan mengetik untuk mengetahui pilihan lain yang cocok
+
+# LOCALIZATION NOTE: The command line provides completion for JavaScript
+# commands, however there are times when the scope of what we're completing
+# against can't be used. This error message is displayed when this happens.
+jstypeParseScope=Cakupan hilang
+
+# LOCALIZATION NOTE (jstypeParseMissing, jstypeBeginSyntax,
+# jstypeBeginUnterm): These error messages are displayed when the command line
+# is doing JavaScript completion and encounters errors.
+jstypeParseMissing=Tidak dapat menemukan properti '%S'
+jstypeBeginSyntax=Galat sintaks
+jstypeBeginUnterm=Literal string tidak diakhiri dengan benar
+
+# LOCALIZATION NOTE: This message is displayed if the system for providing
+# JavaScript completions encounters and error it displays this.
+jstypeParseError=Galat
+
+# LOCALIZATION NOTE (typesNumberNan, typesNumberNotInt2, typesDateNan): These
+# error messages are displayed when the command line is passed a variable
+# which has the wrong format and can't be converted. Parameters: %S is the
+# passed variable.
+typesNumberNan=Tidak dapat mengonversikan "%S" menjadi angka.
+typesNumberNotInt2=Tidak dapat mengonversikan "%S" ke bilangan bulat.
+typesDateNan=Tidak dapat mengonversikan "%S" ke tanggal.
+
+# LOCALIZATION NOTE (typesNumberMax, typesNumberMin, typesDateMax,
+# typesDateMin): These error messages are displayed when the command line is
+# passed a variable which has a value out of range (number or date).
+# Parameters: %1$S is the passed variable, %2$S is the limit value.
+typesNumberMax=%1$S lebih besar daripada nilai maksimal yang diizinkan: %2$S.
+typesNumberMin=%1$S lebih kecil dibandingkan nilai minimal yang diizinkan: %2$S.
+typesDateMax=%1$S adalah tanggal sesudah maksimum yang diizinkan: %2$S.
+typesDateMin=%1$S adalah tanggal sebelum minimum yang diizinkan: %2$S.
+
+# LOCALIZATION NOTE: This error message is displayed when the command line is
+# passed an option with a limited number of correct values, but the passed
+# value is not one of them.
+typesSelectionNomatch=Tidak dapat menggunakan '%S'.
+
+# LOCALIZATION NOTE: This error message is displayed when the command line is
+# expecting a CSS query string, however the passed string is not valid.
+nodeParseSyntax=Galat sintaks pada kueri CSS
+
+# LOCALIZATION NOTE (nodeParseMultiple, nodeParseNone): These error messages
+# are displayed when the command line is expecting a CSS string that matches a
+# single node, but more nodes (or none) match.
+nodeParseMultiple=Terlalu banyak kecocokan (%S)
+nodeParseNone=Tidak ada yang cocok
+
+# LOCALIZATION NOTE (helpDesc, helpManual, helpSearchDesc, helpSearchManual3):
+# These strings describe the "help" command, used to display a description of
+# a command (e.g. "help pref"), and its parameter 'search'.
+helpDesc=Dapatkan bantuan untuk perintah yang tersedia
+helpManual=Menyediakan bantuan untuk perintah tertentu (jika string pencarian ditentukan dan ada yang cocok ditemukan) atau untuk perintah yang tersedia (jika string pencarian tidak ditentukan, atau tidak yang cocok ditemukan).
+helpSearchDesc=String pencarian
+helpSearchManual3=teks pencarian untuk mempersempit daftar perintah yang ditampilkan. Ekspresi reguler tidak didukung.
+
+# LOCALIZATION NOTE: These strings are displayed in the help page for a
+# command in the console.
+helpManSynopsis=Sinopsis
+
+# LOCALIZATION NOTE: This message is displayed in the help page if the command
+# has no parameters.
+helpManNone=Tidak ada
+
+# LOCALIZATION NOTE: This message is displayed in response to the 'help'
+# command when used without a filter, just above the list of known commands.
+helpListAll=Perintah Tersedia:
+
+# LOCALIZATION NOTE (helpListPrefix, helpListNone): These messages are
+# displayed in response to the 'help <search>' command (i.e. with a search
+# string), just above the list of matching commands. Parameters: %S is the
+# search string.
+helpListPrefix=Perintah yang diawali dengan '%S':
+helpListNone=Tidak ada perintah yang diawali dengan '%S'
+
+# LOCALIZATION NOTE (helpManRequired, helpManOptional, helpManDefault): When
+# the 'help x' command wants to show the manual for the 'x' command, it needs
+# to be able to describe the parameters as either required or optional, or if
+# they have a default value.
+helpManRequired=diwajibkan
+helpManOptional=opsional
+helpManDefault=opsional, baku=%S
+
+# LOCALIZATION NOTE: This forms part of the output from the 'help' command.
+# 'GCLI' is a project name and should be left untranslated.
+helpIntro=GCLI merupakan eksperimen untuk menciptakan perintah baris yang sangat berguna bagi pengembang web.
+
+# LOCALIZATION NOTE: Text shown as part of the output of the 'help' command
+# when the command in question has sub-commands, before a list of the matching
+# sub-commands.
+subCommands=Sub-Perintah
+
+# LOCALIZATION NOTE: This error message is displayed when the command line is
+# cannot find a match for the parse types.
+commandParseError=Kesalahan penguraian perintah baris
+
+# LOCALIZATION NOTE (contextDesc, contextManual, contextPrefixDesc): These
+# strings are used to describe the 'context' command and its 'prefix'
+# parameter. See localization comment for 'connect' for an explanation about
+# 'prefix'.
+contextDesc=Konsentrasikan pada sekelompok perintah
+contextManual=Siapkan awalan baku untu perintah masa datang. Misalnya 'context git' akan dapat Anda gunakan untuk mengetikkan 'commit', alih-alih mengetikkan 'git commit'.
+contextPrefixDesc=Awalan perintah
+
+# LOCALIZATION NOTE: This message message displayed during the processing of
+# the 'context' command, when the found command is not a parent command.
+contextNotParentError=Tidak dapat menggunakan '%S' sebagai awalan karena bukan perintah induk.
+
+# LOCALIZATION NOTE (contextReply, contextEmptyReply): These messages are
+# displayed during the processing of the 'context' command, to indicate
+# success or that there is no command prefix.
+contextReply=Menggunakan %S sebagai awalan perintah
+contextEmptyReply=Awalan perintah dibersihkan
+
+# LOCALIZATION NOTE (connectDesc, connectManual, connectPrefixDesc,
+# connectMethodDesc, connectUrlDesc, connectDupReply): These strings describe
+# the 'connect' command and all its available parameters. A 'prefix' is an 
+# alias for the remote server (think of it as a "connection name"), and it
+# allows to identify a specific server when connected to multiple remote
+# servers.
+connectDesc=Perintah proksi ke server
+connectManual=Sambungkan ke server, lalu buat versi lokal perintah pada server. Pada awalnya perintah daring memiliki awalan untuk membedakannya dengan perintah lokal (tetapi dengan melihat perintah konteks untuk melaluinya)
+connectPrefixDesc=Awalan induk untuk perintah yang diimpor
+connectMethodDesc=Metode penyambungan
+connectUrlDesc=URL tujuan sambungan
+connectDupReply=Sambungan memanggil %S yang telah ada sebelumnya.
+
+# LOCALIZATION NOTE: The output of the 'connect' command, telling the user
+# what it has done. Parameters: %S is the prefix command. See localization
+# comment for 'connect' for an explanation about 'prefix'.
+connectReply=Perintah %S ditambahkan.
+
+# LOCALIZATION NOTE (disconnectDesc2, disconnectManual2,
+# disconnectPrefixDesc): These strings describe the 'disconnect' command and
+# all its available parameters. See localization comment for 'connect' for an
+# explanation about 'prefix'.
+disconnectDesc2=Putuskan sambungan dari server
+disconnectManual2=Putuskan dari server yang sedang tersambung untuk eksekusi perintah daring
+disconnectPrefixDesc=Awalan induk untuk perintah yang diimpor
+
+# LOCALIZATION NOTE: This is the output of the 'disconnect' command,
+# explaining the user what has been done. Parameters: %S is the number of
+# commands removed.
+disconnectReply=Perintah %S dihapus.
+
+# LOCALIZATION NOTE (globalDesc, globalWindowDesc, globalOutput): These
+# strings describe the 'global' command and its parameters
+globalDesc=Ubah global JS
+globalWindowDesc=Global/Jendela baru
+globalOutput=Global JS sekarang adalah %S
+
+# LOCALIZATION NOTE: These strings describe the 'clear' command
+clearDesc=Bersihkan area keluaran
+
+# LOCALIZATION NOTE (langDesc, langOutput): These strings describe the 'lang'
+# command and its parameters
+langDesc=Masukkan perintah dalam bahasa berbeda
+langOutput=Anda sedang menggunakan %S
+
+# LOCALIZATION NOTE (prefDesc, prefManual, prefListDesc, prefListManual,
+# prefListSearchDesc, prefListSearchManual, prefShowDesc, prefShowManual,
+# prefShowSettingDesc, prefShowSettingManual): These strings describe the
+# 'pref' command and all its available sub-commands and parameters.
+prefDesc=Perintah untuk mengontrol setelan
+prefManual=Perintah untuk menampilkan dan mengubah pengaturan baik untuk GCLI maupun lingkungannya
+prefListDesc=Tampilkan setelan yang tersedia
+prefListManual=Tampilkan daftar setelan, difilter secara opsional dengan parameter 'search'
+prefListSearchDesc=Filter daftar setelan yang ditampilkan
+prefListSearchManual=Cari string pada daftar setelan yang tersedia
+prefShowDesc=Tampilkan nilai setelan
+prefShowManual=Tampilkan nilai setelan yang diberikan
+prefShowSettingDesc=Setelan untuk ditampilkan
+prefShowSettingManual=Nama setelan untuk ditampilkan
+
+# LOCALIZATION NOTE: This message is used to show the preference name and the
+# associated preference value. Parameters: %1$S is the preference name, %2$S
+# is the preference value.
+prefShowSettingValue=%1$S: %2$S
+
+# LOCALIZATION NOTE (prefSetDesc, prefSetManual, prefSetSettingDesc,
+# prefSetSettingManual, prefSetValueDesc, prefSetValueManual): These strings
+# describe the 'pref set' command and all its parameters.
+prefSetDesc=Ubah setelan
+prefSetManual=Ubah preferensi yang didefinisikan lingkungan
+prefSetSettingDesc=Setelan untuk diubah
+prefSetSettingManual=Nama setelan untuk diubah.
+prefSetValueDesc=Nilai baru setelan
+prefSetValueManual=Nilai baru untuk setelan yang ditentukan
+
+# LOCALIZATION NOTE (prefResetDesc, prefResetManual, prefResetSettingDesc,
+# prefResetSettingManual): These strings describe the 'pref reset' command and
+# all its parameters.
+prefResetDesc=Setel ulang sebuah setelan
+prefResetManual=Setel ulang sebuah setelan menjadi nilai bawaan
+prefResetSettingDesc=Setelan untuk disetel ulang
+prefResetSettingManual=Nama setelan yang akan disetel ulang menjadi nilai bawaan
+
+# LOCALIZATION NOTE: This string is displayed in the output from the 'pref
+# list' command as a label to an input element that allows the user to filter
+# the results.
+prefOutputFilter=Filter
+
+# LOCALIZATION NOTE (prefOutputName, prefOutputValue): These strings are
+# displayed in the output from the 'pref list' command as table headings.
+prefOutputName=Nama
+prefOutputValue=Nilai
+
+# LOCALIZATION NOTE (introDesc, introManual): These strings describe the
+# 'intro' command. The localization of 'Got it!' should be the same used in
+# introTextGo.
+introDesc=Tampilkan pesan selamat datang
+introManual=Tampilkan ulang pesan untuk pengguna baru hingga mengeklik tombol 'Paham!'
+
+# LOCALIZATION NOTE (introTextOpening3, introTextCommands, introTextKeys2,
+# introTextF1Escape, introTextGo): These strings are displayed when the user
+# first opens the developer toolbar to explain the command line, and is shown
+# each time it is opened until the user clicks the 'Got it!' button.
+introTextOpening3=GCLI merupakan sebuah eksperimen untuk membuat lingkungan perintah baris yang dapat digunakan pengembang web.
+introTextCommands=Untuk menampilkan daftar ketikkan
+introTextKeys2=, atau untuk menampilkan/menyembunyikan bantuan perintah, tekan
+introTextF1Escape=F1/Escape
+introTextGo=Paham!
+
+# LOCALIZATION NOTE: This is a short description of the 'hideIntro' setting.
+hideIntroDesc=Tampilkan pesan selamat datang
+
+# LOCALIZATION NOTE: This is a description of the 'eagerHelper' setting. It's
+# displayed when the user asks for help on the settings. eagerHelper allows
+# users to select between showing no tooltips, permanent tooltips, and only
+# important tooltips.
+eagerHelperDesc=Seberapa detail tooltip
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/global/devtools/styleinspector.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/global/devtools/styleinspector.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/global/devtools/styleinspector.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/global/devtools/styleinspector.properties	2015-05-25 20:48:32.000000000 +0000
@@ -104,6 +104,14 @@
 # the rule view context menu "Show original sources" entry.
 ruleView.contextmenu.showOrigSources.accessKey=a
 
+# LOCALIZATION NOTE (ruleView.contextmenu.showMdnDocs): Text displayed in the rule view
+# context menu to display docs from MDN for an item.
+ruleView.contextmenu.showMdnDocs=Tampilkan dokumentasi MDN
+
+# LOCALIZATION NOTE (ruleView.contextmenu.showMdnDocs.accessKey): Access key for
+# the rule view context menu "Show MDN docs" entry.
+ruleView.contextmenu.showMdnDocs.accessKey=D
+
 # 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 firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/mozapps/extensions/extensions.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/mozapps/extensions/extensions.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-05-25 20:48:32.000000000 +0000
@@ -22,6 +22,9 @@
 
 <!ENTITY cmd.back.tooltip                     "Mundur satu laman">
 <!ENTITY cmd.forward.tooltip                  "Maju satu laman">
+
+<!ENTITY showUnsignedExtensions.button.label  "Beberapa ekstensi tidak dapat diverifikasi">
+<!ENTITY showAllExtensions.button.label       "Tampilkan semua ekstensi">
 <!-- global warnings -->
 
 <!ENTITY warning.safemode.label                    "Semua pengaya telah dimatikan dalam mode aman.">
@@ -103,6 +106,7 @@
 <!ENTITY cmd.uninstallAddon.label             "Hapus">
 <!ENTITY cmd.uninstallAddon.accesskey         "H">
 <!ENTITY cmd.debugAddon.label                 "Debug">
+<!ENTITY cmd.debugAddon.accesskey             "b">
 <!ENTITY cmd.showPreferencesWin.label         "Pengaturan">
 <!ENTITY cmd.showPreferencesWin.tooltip       "Ubah pengaturan pengaya ini">
 <!ENTITY cmd.showPreferencesUnix.label        "Pengaturan">
@@ -230,3 +234,18 @@
 <!ENTITY experiment.info.changetelemetry.accesskey "T">
 
 <!ENTITY setting.learnmore "Pelajari Lebih Lanjut…">
+
+<!ENTITY disabledUnsigned.heading "Beberapa pengaya telah dinonaktifkan">
+<!-- LOCALIZATION NOTE (disabledUnsigned.description.start, disabledUnsigned.description.findAddonsLink, disabledUnsigned.description.end):
+     These entities form a sentence, with
+     disabledUnsigned.description.findAddonsLink being a link to an external site. -->
+<!ENTITY disabledUnsigned.description.start "Pengaya berikut belum diverifikasi untuk digunakan di &brandShortName;. Anda dapat ">
+<!ENTITY disabledUnsigned.description.findAddonsLink "temukan pengganti">
+<!ENTITY disabledUnsigned.description.end " atau minta pengembangnya untuk memverifikasi.">
+<!ENTITY disabledUnsigned.learnMore "Pelajari tentang usaha kami untuk menjaga keselamatan daring Anda.">
+<!-- LOCALIZATION NOTE (disabledUnsigned.devInfo.start, disabledUnsigned.devInfo.linkToManual, disabledUnsigned.devInfo.end):
+     These entities form a sentence, with disabledUnsigned.devInfo.linkToManual
+     being a link to an external site. -->
+<!ENTITY disabledUnsigned.devInfo.start "Pengembang yang tertarik untuk memverifikasi pengayanya dapat terus melanjutkan membaca ">
+<!ENTITY disabledUnsigned.devInfo.linkToManual "manual">
+<!ENTITY disabledUnsigned.devInfo.end " kami.">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/mozapps/extensions/extensions.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/mozapps/extensions/extensions.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/mozapps/extensions/extensions.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/mozapps/extensions/extensions.properties	2015-05-25 20:48:32.000000000 +0000
@@ -23,6 +23,10 @@
 
 #LOCALIZATION NOTE (notification.incompatible) %1$S is the add-on name, %2$S is brand name, %3$S is application version
 notification.incompatible=%1$S tidak kompatibel dengan %2$S %3$S.
+#LOCALIZATION NOTE (notification.unsigned, notification.unsignedAndDisabled) %1$S is the add-on name, %2$S is brand name
+notification.unsignedAndDisabled=%1$S tidak dapat diverifikasi untuk digunakan di %2$S dan telah dinonaktifkan.
+notification.unsigned=%1$S tidak dapat diverifikasi untuk digunakan di %2$S. Lanjutkan dengan hati-hati.
+notification.unsigned.link=Informasi Selengkapnya
 #LOCALIZATION NOTE (notification.blocked) %1$S is the add-on name
 notification.blocked=%1$S telah dimatikan karena masalah keamanan atau kestabilan.
 notification.blocked.link=Informasi Selengkapnya
@@ -74,6 +78,10 @@
 
 #LOCALIZATION NOTE (details.notification.incompatible) %1$S is the add-on name, %2$S is brand name, %3$S is application version
 details.notification.incompatible=%1$S tidak kompatibel dengan %2$S %3$S.
+#LOCALIZATION NOTE (details.notification.unsigned, details.notification.unsignedAndDisabled) %1$S is the add-on name, %2$S is brand name
+details.notification.unsignedAndDisabled=%1$S tidak dapat diverifikasi untuk digunakan di %2$S dan telah dinonaktifkan.
+details.notification.unsigned=%1$S tidak dapat diverifikasi untuk digunakan di %2$S. Lanjutkan dengan hati-hati.
+details.notification.unsigned.link=Informasi Selengkapnya
 #LOCALIZATION NOTE (details.notification.blocked) %1$S is the add-on name
 details.notification.blocked=%1$S telah dimatikan karena masalah keamanan atau kestabilan.
 details.notification.blocked.link=Informasi Selengkapnya
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/places/places.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/places/places.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/chrome/places/places.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/chrome/places/places.properties	2015-05-25 20:48:32.000000000 +0000
@@ -29,8 +29,3 @@
 # %1$S is the file size
 # %2$S is the file size unit
 backupFileSizeText=%1$S %2$S
-
-# LOCALIZATION NOTE (windows8TouchTitle): this is the name of the folder used
-# to store bookmarks created in Metro mode and share bookmarks between Metro
-# and Desktop.
-windows8TouchTitle=Windows 8 Touch
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/crashreporter/crashreporter.ini firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/crashreporter/crashreporter.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/toolkit/crashreporter/crashreporter.ini	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/toolkit/crashreporter/crashreporter.ini	2015-05-25 20:48:32.000000000 +0000
@@ -18,7 +18,7 @@
 CrashReporterSorry=Kami Mohon Maaf
 ; LOCALIZATION NOTE (CrashReporterDescriptionText2): The %s is replaced with the product name.
 CrashReporterDescriptionText2=%s mengalami kerusakan dan mati tanpa sengaja.\n\nUntuk membantu kami mendiagnosa dan memperbaiki masalah ini, Anda dapat mengirimkan laporan kerusakan.
-CrashReporterDefault=Aplikasi ini harus berjalan setelah terjadi kerusakan untuk dikirimkan ke vendor aplikasi. Aplikasi ini tidak bisa berjalan langsung.
+CrashReporterDefault=Aplikasi ini akan berjalan setelah terjadi kerusakan untuk dikirimkan ke vendor aplikasi. Aplikasi ini tidak bisa berjalan langsung.
 Details=Detail…
 ViewReportTitle=Isi Laporan
 CommentGrayText=Tambahkan komentar. Catatan: Komentar dapat dilihat publik
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/webapprt/webapprt/overrides/appstrings.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/webapprt/webapprt/overrides/appstrings.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/webapprt/webapprt/overrides/appstrings.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/webapprt/webapprt/overrides/appstrings.properties	2015-05-25 20:48:32.000000000 +0000
@@ -29,6 +29,7 @@
 externalProtocolChkMsg=Ingat pilihan saya untuk semua tautan jenis ini.
 externalProtocolLaunchBtn=Jalankan aplikasi
 malwareBlocked=Situs pada %S telah dilaporkan sebagai situs penyerang dan telah diblokir berdasarkan pengaturan keamanan Anda.
+unwantedBlocked=Situs pada %S telah dilaporkan sebagai situs yang melayani perangkat lunak yang tidak diinginkan dan telah diblokir berdasarkan pengaturan keamanan Anda.
 phishingBlocked=Situs web pada at %S telah dilaporkan sebagai pemalsuan web yang mencoba menipu pengguna agar membagi data pribadi atau keuangannya.
 cspBlocked=Aplikasi mencoba mengakses sumber daya yang memiliki kebijakan keamanan konten, yang mencegahnya untuk dimuat dengan cara ini.
 corruptedContentError=Aplikasi tidak dapat dimuat karena terdeteksi galat pada pengiriman data.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/webapprt/webapprt/overrides/dom.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/webapprt/webapprt/overrides/dom.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/id/webapprt/webapprt/overrides/dom.properties	2015-05-13 18:07:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/id/webapprt/webapprt/overrides/dom.properties	2015-05-25 20:48:32.000000000 +0000
@@ -9,7 +9,7 @@
 StopScriptButton=Hentikan skrip
 DebugScriptButton=Buka dengan program Debug
 WaitForScriptButton=Lanjutkan
-DontAskAgain=Jangan tanyakan lagi
+DontAskAgain=&Jangan tanyakan lagi
 JSURLLoadBlockedWarning=Percobaan untuk memuat javascript skrip: URL sebuah host yang sedang menampilkan isi dari host lain telah diblokir oleh Pengelola Keamanan.
 WindowCloseBlockedWarning=Skrip tidak diperbolehkan menutup jendela yang tidak dibuka oleh skrip.
 OnBeforeUnloadTitle=Yakin?
@@ -152,3 +152,5 @@
 SyncXMLHttpRequestWarning=XMLHttpRequest sinkronus pada utas utama tidak disarankan lagi karena berefek negatif pada pengalaman pengguna. Untuk bantuan lebih lanjut buka http://xhr.spec.whatwg.org/
 # LOCALIZATION NOTE: Do not translate "DataContainerEvent" or "CustomEvent"
 DataContainerEventWarning=Penggunaan DataContainerEvent tidak disarankan lagi. Gunakan CustomEvent.
+# LOCALIZATION NOTE: Do not translate "Worker".
+EmptyWorkerSourceWarning=Percobaan membuat Worker dari sumber yang kosong. Ini mungkin tidak disengaja.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/browser/chrome/browser/browser.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/browser/chrome/browser/browser.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/browser/chrome/browser/browser.properties	2015-05-13 18:08:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/browser/chrome/browser/browser.properties	2015-05-25 20:48:46.000000000 +0000
@@ -39,18 +39,18 @@
 addonsInstalledNeedsRestart = #1 verrà installato dopo il riavvio di #3.;#2 componenti aggiuntivi verranno installati dopo il riavvio di #3.
 addonInstallRestartButton = Riavvia adesso
 addonInstallRestartButton.accesskey = R
-addonError-1 = Impossibile scaricare il componente aggiuntivo a causa di un errore nella connessione con #2.
-addonError-2 = Impossibile installare il componente aggiuntivo da #2 in quanto non corrisponde al componente aggiuntivo atteso da #3.
-addonError-3 = Impossibile installare il componente aggiuntivo scaricato da #2 in quanto il file risulta danneggiato.
-addonError-4 = Impossibile installare #1 in quanto #3 non è in grado di modificare il file richiesto.
-addonError-5 = L’installazione di un componente aggiuntivo non verificato è stata bloccata da #3.
-addonLocalError-1 = Impossibile installare questo componente aggiuntivo in quanto si è verificato un errore nel filesystem.
-addonLocalError-2 = Impossibile installare questo componente aggiuntivo in quanto non corrisponde al componente aggiuntivo atteso da #3.
-addonLocalError-3 = Impossibile installare questo componente aggiuntivo in quanto risulta danneggiato.
-addonLocalError-4 = Impossibile installare #1 in quanto #3 non è in grado di modificare il file richiesto.
-addonLocalError-5 = Impossibile installare questo componente aggiuntivo in quanto non verificato.
-addonErrorIncompatible = Impossibile installare #1 in quanto non compatibile con #3 #4.
-addonErrorBlocklisted = Impossibile installare #1 in quanto comporta un rischio elevato per la stabilità o la sicurezza.
+addonInstallError-1 = Impossibile scaricare il componente aggiuntivo a causa di un errore nella connessione.
+addonInstallError-2 = Impossibile installare il componente aggiuntivo in quanto non corrisponde al componente aggiuntivo atteso da %1$S.
+addonInstallError-3 = Impossibile installare il componente aggiuntivo scaricato da questo sito in quanto il file risulta danneggiato.
+addonInstallError-4 = Impossibile installare %2$S in quanto %1$S non è in grado di modificare il file richiesto.
+addonInstallError-5 = L’installazione di un componente aggiuntivo non verificato è stata bloccata da %1$S.
+addonLocalInstallError-1 = Impossibile installare questo componente aggiuntivo in quanto si è verificato un errore nel filesystem.
+addonLocalInstallError-2 = Impossibile installare questo componente aggiuntivo in quanto non corrisponde al componente aggiuntivo atteso da %1$S.
+addonLocalInstallError-3 = Impossibile installare questo componente aggiuntivo in quanto risulta danneggiato.
+addonLocalInstallError-4 = Impossibile installare %2$S in quanto %1$S non è in grado di modificare il file richiesto.
+addonLocalInstallError-5 = Impossibile installare questo componente aggiuntivo in quanto non verificato.
+addonInstallErrorIncompatible = Impossibile installare %3$S in quanto non compatibile con %1$S %2$S.
+addonInstallErrorBlocklisted = Impossibile installare %S in quanto comporta un rischio elevato per la stabilità o la sicurezza.
 unsignedAddonsDisabled.message = Alcuni dei componenti aggiuntivi installati sono stati disattivati in quanto non è stato possibile verificarli.
 unsignedAddonsDisabled.learnMore.label = Ulteriori informazioni
 unsignedAddonsDisabled.learnMore.accesskey = U
@@ -189,30 +189,30 @@
 geolocation.alwaysShareLocation.accesskey = C
 geolocation.neverShareLocation = Non comunicare mai la posizione
 geolocation.neverShareLocation.accesskey = N
-geolocation.shareWithSite = Comunicare la propria posizione a %S?
-geolocation.shareWithFile = Comunicare la propria posizione al file %S?
+geolocation.shareWithSite2 = Comunicare la propria posizione a questo sito?
+geolocation.shareWithFile2 = Comunicare la propria posizione a questo file?
 webNotifications.showForSession = Visualizza per questa sessione
 webNotifications.showForSession.accesskey = s
 webNotifications.alwaysShow = Visualizza sempre le notifiche
 webNotifications.alwaysShow.accesskey = V
 webNotifications.neverShow = Blocca sempre le notifiche
 webNotifications.neverShow.accesskey = B
-webNotifications.showFromSite = Visualizzare le notifiche da %S?
+webNotifications.showFromSite2 = Visualizzare le notifiche da questo sito?
 push.allowForSession = Consenti per la sessione
 push.allowForSession.accesskey = s
 push.alwaysAllow = Consenti sempre
 push.alwaysAllow.accesskey = C
 push.alwaysBlock = Blocca sempre
 push.alwaysBlock.accesskey = B
-push.enablePush = Consentire a %S l’utilizzo di notifiche push?
+push.enablePush2 = Consentire a questo sito l’utilizzo di notifiche push?
 pointerLock.allow2 = Nascondi puntatore del mouse
 pointerLock.allow2.accesskey = N
 pointerLock.alwaysAllow = Consenti sempre
 pointerLock.alwaysAllow.accesskey = C
 pointerLock.neverAllow = Non nascondere mai
 pointerLock.neverAllow.accesskey = m
-pointerLock.title2 = Consentire al browser di nascondere il puntatore del mouse su %S?
-pointerLock.autoLock.title2 = %S nasconderà il puntatore del mouse.
+pointerLock.title3 = Consentire al browser di nascondere il puntatore del mouse su questo sito?
+pointerLock.autoLock.title3 = Questo sito nasconderà il puntatore del mouse.
 safebrowsing.getMeOutOfHereButton.label = Allontanarsi da questo sito
 safebrowsing.getMeOutOfHereButton.accessKey = A
 safebrowsing.reportedWebForgery = Segnalato sito contraffatto
@@ -404,7 +404,7 @@
 readingList.promo.firstUse.syncSignedIn.moveToButton = Successivo: semplicità di accesso »
 readingList.prepopulatedArticles.learnMore = Scopri come rendere più piacevole la lettura con %S
 readingList.prepopulatedArticles.supportReadingList = Salva, sincronizza e leggi ovunque ti trovi grazie all’Elenco lettura
-readingList.prepopulatedArticles.supportReaderView = Scopri il piacere di leggere senza distrazioni grazie alla Vista lettore
+readingList.prepopulatedArticles.supportReaderView = Scopri il piacere di leggere senza distrazioni grazie alla Modalità lettura
 readingList.prepopulatedArticles.supportSync = Accedi all’Elenco lettura da qualunque dispositivo con %S
 e10s.offerPopup.mainMessage = %S diventerà a breve multiprocesso. È possibile iniziare a utilizzare questa modalità oggi stesso e trarre vantaggio da alcuni dei miglioramenti:
 e10s.offerPopup.highlight1 = Maggiore reattività
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/browser/chrome/browser/devtools/debugger.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/browser/chrome/browser/devtools/debugger.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/browser/chrome/browser/devtools/debugger.properties	2015-05-13 18:08:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/browser/chrome/browser/devtools/debugger.properties	2015-05-25 20:48:46.000000000 +0000
@@ -75,7 +75,6 @@
 breakpointMenuItem.disableAll = Disattiva tutti i punti di interruzione
 breakpointMenuItem.deleteAll = Rimuovi tutti i punti di interruzione
 loadingText = Caricamento in corso…
-errorLoadingText = Errore caricamento sorgente:\n
 errorLoadingText2 = Errore durante il caricamento del seguente URL: %S
 addWatchExpressionText = Aggiungi espressione di controllo
 addWatchExpressionButton = Controlla
@@ -105,5 +104,4 @@
 variablesViewOptimizedOut = (rimosso da ottimizzazione)
 variablesViewUninitialized = (non inizializzato)
 variablesViewMissingArgs = (non disponibile)
-evalGroupLabel = Risorse “eval”
 anonymousSourcesLabel = Risorse anonime
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/browser/chrome/browser/devtools/font-inspector.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/browser/chrome/browser/devtools/font-inspector.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/browser/chrome/browser/devtools/font-inspector.dtd	2015-05-13 18:08:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/browser/chrome/browser/devtools/font-inspector.dtd	2015-05-25 20:48:46.000000000 +0000
@@ -7,3 +7,4 @@
 <!ENTITY usedAs "Utilizzato come:">
 <!ENTITY system "sistema">
 <!ENTITY remote "remoto">
+<!ENTITY previewHint "Anteprima testo">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/browser/chrome/browser/devtools/netmonitor.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/browser/chrome/browser/devtools/netmonitor.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/browser/chrome/browser/devtools/netmonitor.dtd	2015-05-13 18:08:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/browser/chrome/browser/devtools/netmonitor.dtd	2015-05-25 20:48:46.000000000 +0000
@@ -70,6 +70,8 @@
 <!ENTITY netmonitorUI.context.copyUrl.accesskey "C">
 <!ENTITY netmonitorUI.context.copyUrlParams "Copia parametri URL">
 <!ENTITY netmonitorUI.context.copyUrlParams.accesskey "m">
+<!ENTITY netmonitorUI.context.copyPostData "Copia dati POST">
+<!ENTITY netmonitorUI.context.copyPostData.accesskey "T">
 <!ENTITY netmonitorUI.context.copyImageAsDataUri "Copia immagine come data URI">
 <!ENTITY netmonitorUI.context.copyImageAsDataUri.accesskey "C">
 <!ENTITY netmonitorUI.context.copyResponse "Copia risposta">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/browser/chrome/browser/devtools/styleinspector.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/browser/chrome/browser/devtools/styleinspector.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/browser/chrome/browser/devtools/styleinspector.dtd	2015-05-13 18:08:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/browser/chrome/browser/devtools/styleinspector.dtd	2015-05-25 20:48:46.000000000 +0000
@@ -4,6 +4,7 @@
 
 <!ENTITY browserStylesLabel "Stili del browser">
 <!ENTITY filterStylesPlaceholder "Filtra stili">
+<!ENTITY addRuleButtonTooltip "Aggiungi nuova regola">
 <!ENTITY selectedElementLabel "Elemento selezionato:">
 <!ENTITY noPropertiesFound "Nessuna proprietà CSS trovata.">
 <!ENTITY computedViewTitle "Calcolate">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/browser/chrome/browser/devtools/timeline.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/browser/chrome/browser/devtools/timeline.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/browser/chrome/browser/devtools/timeline.properties	2015-05-13 18:08:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/browser/chrome/browser/devtools/timeline.properties	2015-05-25 20:48:46.000000000 +0000
@@ -16,6 +16,7 @@
 timeline.label.domevent = Eventi DOM
 timeline.label.consoleTime = Console
 timeline.label.garbageCollection = Evento GC
+timeline.label.timestamp = Timestamp
 graphs.memory = MB
 timeline.markerDetailFormat = %1$S (%2$S)
 timeline.markerDetail.start = Inizio:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/browser/chrome/browser/devtools/webide.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/browser/chrome/browser/devtools/webide.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/browser/chrome/browser/devtools/webide.properties	2015-05-13 18:08:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/browser/chrome/browser/devtools/webide.properties	2015-05-25 20:48:46.000000000 +0000
@@ -23,6 +23,7 @@
 error_cantConnectToApp = Impossibile connettersi all’app: %1$S
 error_cantFetchAddonsJSON = Impossibile ottenere l’elenco dei componenti aggiuntivi: %S
 error_appProjectsLoadFailed = Impossibile caricare la lista dei progetti. Il problema può verificarsi se questo profilo è stato utilizzato con una versione più recente di Firefox.
+error_folderCreationFailed = Impossibile creare la cartella del progetto nel percorso selezionato.
 addons_stable = stabile
 addons_unstable = instabile
 addons_simulator_label = Simulatore Firefox OS %1$S (%2$S)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/browser/chrome/browser/loop/loop.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/browser/chrome/browser/loop/loop.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/browser/chrome/browser/loop/loop.properties	2015-05-13 18:08:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/browser/chrome/browser/loop/loop.properties	2015-05-25 20:48:46.000000000 +0000
@@ -166,7 +166,6 @@
 infobar_button_gotit_accesskey = R
 infobar_menuitem_dontshowagain_label = Non mostrare nuovamente
 infobar_menuitem_dontshowagain_accesskey = N
-context_offer_label = Parliamo di questa pagina
 context_inroom_label = Parliamo di:
 context_edit_activate_label = Discussione su “{{title}}”
 context_edit_name_placeholder = Nome conversazione
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/browser/chrome/browser/newTab.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/browser/chrome/browser/newTab.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/browser/chrome/browser/newTab.properties	2015-05-13 18:08:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/browser/chrome/browser/newTab.properties	2015-05-25 20:48:46.000000000 +0000
@@ -12,26 +12,24 @@
 newtab.sponsored.explain2 = Questo sito è consigliato da un partner di Mozilla. È possibile rimuoverlo in qualunque momento utilizzando il pulsante %1$S. %2$S
 newtab.suggested.explain = Questo sito è consigliato da Mozilla. È possibile rimuoverlo in qualunque momento utilizzando il pulsante %1$S. %2$S
 newtab.enhanced.explain = Un partner di Mozilla ha migliorato l’aspetto di questo riquadro sostituendone l’immagine. È possibile disattivare questo tipo di riquadri utilizzando il pulsante %1$S. %2$S
-newtab.intro.paragraph1 = Quando si apre una nuova scheda vengono visualizzati riquadri per i siti più visitati, insieme a riquadri che riteniamo possano essere interessanti per gli utenti. Alcuni di questi riquadri, sempre identificabili in modo chiaro, potrebbero essere sponsorizzati da partner di Mozilla. %1$S
-newtab.intro.paragraph2 = Per fornire questo servizio Mozilla raccoglie e utilizza alcune informazioni statistiche relative all’utilizzo dei riquadri secondo quanto specificato nell’%1$S.
-newtab.intro.paragraph3 = È possibile disattivare questa funzione utilizzando il pulsante %1$S e modificando le proprie impostazioni.
-newtab.intro.paragraph4 = È possibile disattivare questa funzione utilizzando il pulsante a forma di ingranaggio (%1$S) e selezionando “Pagina bianca” nel menu “%2$S”.
-newtab.intro.paragraph5 = Nuova scheda visualizzerà i siti visitati più frequentemente, insieme a siti che a nostro parere potrebbero interessarti. Inizialmente vedrai diversi siti legati a Mozilla.
+newtab.intro.paragraph2 = Per fornire questo servizio Mozilla raccoglie e utilizza alcune informazioni statistiche relative all’utilizzo dei riquadri, in conformità a quanto specificato nell’%1$S.
+newtab.intro.paragraph4.2 = È possibile disattivare questa funzione utilizzando il pulsante a forma di ingranaggio (%1$S) e deselezionando “Includi i siti consigliati” nel menu “%2$S”.
+newtab.intro.paragraph5 = Nuova scheda visualizzerà i siti visitati più frequentemente, insieme a siti che, a nostro parere, potrebbero interessarti. Inizialmente vedrai diversi siti legati a Mozilla.
 newtab.intro.paragraph6 = È possibile %1$S o %2$S qualunque sito utilizzando i controlli visualizzati quando si passa il cursore sul riquadro.
 newtab.intro.paragraph6.remove = eliminare
 newtab.intro.paragraph6.pin = bloccare
 newtab.intro.paragraph7 = Alcuni dei siti visualizzati potrebbero essere suggeriti da Mozilla o essere sponsorizzati da un partner di Mozilla. I siti sponsorizzati saranno sempre chiaramente identificabili.
 newtab.intro.paragraph8 = %1$S visualizzerà solo siti che rientrano tra i tuoi interessi sul Web. %2$S
-newtab.intro.paragraph9 = Ora, quando si apre Nuova scheda, verranno visualizzati anche siti che a nostro parere potrebbero interessarti.
+newtab.intro.paragraph9 = Ora, quando si apre Nuova scheda, verranno visualizzati anche siti che, a nostro parere, potrebbero interessarti.
 newtab.intro.controls = Controlli Nuova scheda
 newtab.learn.link = Ulteriori informazioni…
 newtab.privacy.link = informativa sulla privacy
 newtab.learn.link2 = Ulteriori informazioni su Nuova scheda
 newtab.privacy.link2 = Informazioni sulla privacy
 newtab.intro.header.welcome = Benvenuto nella Nuova scheda di %1$S
-newtab.intro.header.update = Nuova scheda è stata aggiornata
-newtab.intro.skip = Ignora
+newtab.intro.header.update = Aggiornamento per Nuova scheda
+newtab.intro.skip = Salta
 newtab.intro.continue = Continua il tour
 newtab.intro.back = Indietro
 newtab.intro.next = Avanti
-newtab.intro.gotit = Tutto chiaro.
+newtab.intro.gotit = Tutto chiaro
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/chat/irc.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/chat/irc.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/chat/irc.properties	2015-05-13 18:08:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/chat/irc.properties	2015-05-25 20:48:46.000000000 +0000
@@ -12,7 +12,7 @@
 joinChat.password = _Password
 options.server = Server
 options.port = Porta
-options.ssl = Usa SSL
+options.ssl = Utilizza SSL
 options.encoding = Set di caratteri
 options.quitMessage = Messaggio di chiusura
 options.partMessage = Messaggio di uscita
@@ -98,7 +98,7 @@
 error.notChannelOp = Non si dispone dei privilegi di operatore di canale su %S.
 error.notChannelOwner = Non si è proprietari del canale %S.
 error.wrongKey = Impossibile entrare in %S, password errata.
-error.sendMessageFailed = Si è verificato un errore durante l'invio dell'ultimo messaggio. Tentare nuovamente quando la connessione sarà rispristinata.
+error.sendMessageFailed = Si è verificato un errore durante l'invio dell'ultimo messaggio. Tentare nuovamente quando la connessione sarà ripristinata.
 error.channelForward = Non è stato possibile entrare in %1$S e si è stati rediretti automaticamente in %2$S.
 tooltip.realname = Nome
 tooltip.server = Connesso a
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/chat/xmpp.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/chat/xmpp.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/chat/xmpp.properties	2015-05-13 18:08:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/chat/xmpp.properties	2015-05-25 20:48:46.000000000 +0000
@@ -27,6 +27,7 @@
 conversation.error.joinFailed = Impossibile entrare in: %S
 conversation.error.joinFailedNotAuthorized = Registrazione obbligatoria: non si dispone di autorizzazioni sufficienti per entrare in questa stanza.
 conversation.error.creationFailedNotAllowed = Accesso limitato: permessi insufficienti per creare stanze.
+conversation.error.joinFailedRemoteServerNotFound = Impossibile accedere alla stanza %S in quanto il server che ospita la stanza non può essere raggiunto.
 conversation.error.remoteServerNotFound = Impossibile raggiungere il server del destinatario
 conversation.error.unknownError = Errore sconosciuto
 tooltip.status = Stato (%S)
@@ -36,13 +37,13 @@
 chatRoomField.server = _Server
 chatRoomField.nick = _Nick
 chatRoomField.password = _Password
-conversation.muc.invitationWithReason = Si è stati invitati da %1$S in %2$S: %3$S
-conversation.muc.invitationWithoutReason = Si è stati invitati da %1$S in %2$S
+conversation.muc.invitationWithReason = Ricevuto un invito da %1$S in %2$S: %3$S
+conversation.muc.invitationWithoutReason = Ricevuto un invito da %1$S in %2$S
 options.resource = Risorsa
 options.priority = Priorità
 options.connectionSecurity = Sicurezza della connessione
 options.connectionSecurity.requireEncryption = Cifratura obbligatoria
-options.connectionSecurity.opportunisticTLS = Usa cifratura se disponibile
+options.connectionSecurity.opportunisticTLS = Utilizza cifratura se disponibile
 options.connectionSecurity.allowUnencryptedAuth = Consentire l'invio della password in chiaro
 options.connectServer = Server
 options.connectPort = Porta
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/dom/chrome/dom/dom.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/dom/chrome/dom/dom.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/dom/chrome/dom/dom.properties	2015-05-13 18:08:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/dom/chrome/dom/dom.properties	2015-05-25 20:48:46.000000000 +0000
@@ -69,7 +69,6 @@
 FullScreenDeniedSubDocFullScreen = Richiesta di passare alla modalità schermo intero rifiutata in quanto un sottodocumento del documento che l’ha richiesta è già in modalità schermo intero.
 FullScreenDeniedNotDescendant = Richiesta di passare alla modalità schermo intero rifiutata in quanto l’elemento che l’ha richiesta non è un discendente dell’elemento full-screen corrente.
 FullScreenDeniedNotFocusedTab = Richiesta di passare alla modalità schermo intero rifiutata in quanto l’elemento che l’ha richiesta non si trova nella scheda attualmente selezionata.
-FullScreenDeniedContentOnly = Richiesta di passare alla modalità schermo intero rifiutata in quanto l’elemento che l’ha richiesta si trova nel documento chrome e le API fullscreen sono configurate solo per i contenuti.
 RemovedFullScreenElement = Abbandonata la modalità schermo intero in quanto l’elemento full-screen è stato rimosso dal documento.
 FocusedWindowedPluginWhileFullScreen = Abbandonata la modalità schermo intero in quanto è stato attivato un plugin con finestra nativa (windowed).
 HTMLSyncXHRWarning = L’analisi (parsing) HTML non è supportata in XMLHttpRequest in modalità sincrona.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/security/manager/chrome/pipnss/nsserrors.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/security/manager/chrome/pipnss/nsserrors.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/security/manager/chrome/pipnss/nsserrors.properties	2015-05-13 18:08:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/security/manager/chrome/pipnss/nsserrors.properties	2015-05-25 20:48:46.000000000 +0000
@@ -318,3 +318,4 @@
 MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE = Il server utilizza il meccanismo di “key pinning” ma non è possibile creare una catena di certificati affidabili che corrisponda al pinset. Non è possibile ignorare violazioni relative al “key pinning”.
 MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY = Il server utilizza un certificato con un’estensione limitazioni di base che lo identifica come autorità di certificazione. Questo non dovrebbe accadere per un certificato emesso correttamente.
 MOZILLA_PKIX_ERROR_SIGNATURE_ALGORITHM_MISMATCH = L’algoritmo di firma specificato nel campo “signature” del certificato non corrisponde a quello specificato nel campo “signatureAlgorithm”.
+MOZILLA_PKIX_ERROR_OCSP_RESPONSE_FOR_CERT_MISSING = La risposta OCSP non include uno stato per il certificato in fase di verifica.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/toolkit/chrome/global/aboutTelemetry.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/toolkit/chrome/global/aboutTelemetry.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/toolkit/chrome/global/aboutTelemetry.dtd	2015-05-13 18:08:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/toolkit/chrome/global/aboutTelemetry.dtd	2015-05-25 20:48:46.000000000 +0000
@@ -3,9 +3,22 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY aboutTelemetry.pageTitle "Dati telemetria">
-<!ENTITY aboutTelemetry.telemetryEnabled "La telemetria è <span>attiva</span>.">
-<!ENTITY aboutTelemetry.telemetryDisabled "La telemetria è <span>disattivata</span>.">
+<!ENTITY aboutTelemetry.changeDataChoices "Modifica">
+<!ENTITY aboutTelemetry.uploadEnabled "L’invio dei dati FHR è <span>attivo</span>.">
+<!ENTITY aboutTelemetry.uploadDisabled "L’invio dei dati FHR è <span>disattivato</span>.">
+<!ENTITY aboutTelemetry.extendedRecordingEnabled "La registrazione della telemetria estesa è <span>attiva</span>.">
+<!ENTITY aboutTelemetry.extendedRecordingDisabled "La registrazione della telemetria estesa è <span>disattivata</span>.">
+<!ENTITY aboutTelemetry.pingDataSource "Sorgente ping dati:">
+<!ENTITY aboutTelemetry.showCurrentPingData "Ping dati corrente">
+<!ENTITY aboutTelemetry.showArchivedPingData "Ping dati archiviati">
+<!ENTITY aboutTelemetry.showSubsessionData "Visualizza dati sottosessione">
+<!ENTITY aboutTelemetry.choosePing "Scegli ping:">
+<!ENTITY aboutTelemetry.showNewerPing "&lt;&lt; Ping più recente">
+<!ENTITY aboutTelemetry.showOlderPing "Ping più vecchio &gt;&gt;">
+<!ENTITY aboutTelemetry.archiveWeekHeader "Settimana">
+<!ENTITY aboutTelemetry.archivePingHeader "Ping">
 <!ENTITY aboutTelemetry.generalDataSection "Dati generali">
+<!ENTITY aboutTelemetry.environmentDataSection "Dati ambiente">
 <!ENTITY aboutTelemetry.telemetryLogSection "Registro telemetria">
 <!ENTITY aboutTelemetry.slowSqlSection "Istruzioni SQL lente">
 <!ENTITY aboutTelemetry.chromeHangsSection "Blocchi del browser">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/toolkit/chrome/global/aboutTelemetry.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/toolkit/chrome/global/aboutTelemetry.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/toolkit/chrome/global/aboutTelemetry.properties	2015-05-13 18:08:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/toolkit/chrome/global/aboutTelemetry.properties	2015-05-25 20:48:46.000000000 +0000
@@ -6,6 +6,8 @@
 generalDataTitle = Dati generali
 generalDataHeadingName = Nome
 generalDataHeadingValue = Valore
+environmentDataHeadingName = Nome
+environmentDataHeadingValue = Valore
 slowSqlMain = Istruzioni SQL lente nel thread principale
 slowSqlOther = Istruzioni SQL lente nei thread di supporto
 slowSqlHits = Num.
@@ -20,8 +22,6 @@
 histogramAverage = media
 histogramSum = somma
 histogramCopy = Copia
-disableTelemetry = Disattiva telemetria
-enableTelemetry = Attiva telemetria
 keysHeader = Proprietà
 valuesHeader = Valore
 telemetryLogTitle = Registro telemetria
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/toolkit/chrome/global/devtools/gclicommands.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/toolkit/chrome/global/devtools/gclicommands.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/toolkit/chrome/global/devtools/gclicommands.properties	2015-05-13 18:08:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/toolkit/chrome/global/devtools/gclicommands.properties	2015-05-25 20:48:46.000000000 +0000
@@ -358,6 +358,14 @@
 folderOpenProfileDesc = Apri cartella del profilo
 folderInvalidPath = Inserire un percorso valido
 folderOpenDirResult = Aperto %1$S
+securityDesc = Visualizza funzioni di sicurezza supportate
+securityManual = Comandi per visualizzare suggerimenti sulle funzioni di sicurezza disponibili per il dominio corrente.
+securityListDesc = Visualizza funzioni di sicurezza
+securityListManual = Visualizza un elenco delle funzioni di sicurezza disponibili per la pagina corrente.
+securityCSPDesc = Visualizza funzioni di sicurezza specifiche per CSP
+securityCSPManual = Visualizza consigli relativi a CSP applicati alla pagina corrente.
+securityCSPRemWildCard = È possibile rimuovere la wildcard(*)?
+securityCSPPotentialXSS = Potenziale vulnerabilità XSS.
 rulersDesc = Attiva/disattiva righelli per la pagina
 rulersManual = Attiva/disattiva i righelli orizzontale e verticale per la pagina corrente
 rulersTooltip = Attiva/disattiva righelli per la pagina
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/toolkit/chrome/global/devtools/styleinspector.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/toolkit/chrome/global/devtools/styleinspector.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/toolkit/chrome/global/devtools/styleinspector.properties	2015-05-13 18:08:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/toolkit/chrome/global/devtools/styleinspector.properties	2015-05-25 20:48:46.000000000 +0000
@@ -27,8 +27,8 @@
 ruleView.contextmenu.showOrigSources.accessKey = o
 ruleView.contextmenu.showMdnDocs = Visualizza documentazione MDN
 ruleView.contextmenu.showMdnDocs.accessKey = D
-ruleView.contextmenu.addRule = Aggiungi regola
-ruleView.contextmenu.addRule.accessKey = u
+ruleView.contextmenu.addNewRule = Aggiungi nuova regola
+ruleView.contextmenu.addNewRule.accessKey = u
 computedView.contextmenu.selectAll = Seleziona tutto
 computedView.contextmenu.selectAll.accessKey = A
 computedView.contextmenu.copy = Copia
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/toolkit/chrome/global/viewSource.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/toolkit/chrome/global/viewSource.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/toolkit/chrome/global/viewSource.properties	2015-05-13 18:08:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/toolkit/chrome/global/viewSource.properties	2015-05-25 20:48:46.000000000 +0000
@@ -11,3 +11,6 @@
 statusBarLineCol = Riga %1$S, col. %2$S
 viewSelectionSourceTitle = Sorgente DOM della selezione
 viewMathMLSourceTitle = Sorgente DOM MathML
+context_goToLine_label = Vai alla riga…
+context_wrapLongLines_label = A capo automatico
+context_highlightSyntax_label = Evidenzia sintassi
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/webapprt/webapprt/overrides/dom.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/webapprt/webapprt/overrides/dom.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/it/webapprt/webapprt/overrides/dom.properties	2015-05-13 18:08:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/it/webapprt/webapprt/overrides/dom.properties	2015-05-25 20:48:46.000000000 +0000
@@ -69,7 +69,6 @@
 FullScreenDeniedSubDocFullScreen = Richiesta di passare alla modalità schermo intero rifiutata in quanto un sottodocumento del documento che l’ha richiesta è già in modalità schermo intero.
 FullScreenDeniedNotDescendant = Richiesta di passare alla modalità schermo intero rifiutata in quanto l’elemento che l’ha richiesta non è un discendente dell’elemento full-screen corrente.
 FullScreenDeniedNotFocusedTab = Richiesta di passare alla modalità schermo intero rifiutata in quanto l’elemento che l’ha richiesta non si trova nella scheda attualmente selezionata.
-FullScreenDeniedContentOnly = Richiesta di passare alla modalità schermo intero rifiutata in quanto l’elemento che l’ha richiesta si trova nel documento chrome e le API fullscreen sono configurate solo per i contenuti.
 RemovedFullScreenElement = Abbandonata la modalità schermo intero in quanto l’elemento full-screen è stato rimosso dal documento.
 FocusedWindowedPluginWhileFullScreen = Abbandonata la modalità schermo intero in quanto è stato attivato un plugin con finestra nativa (windowed).
 HTMLSyncXHRWarning = L’analisi (parsing) HTML non è supportata in XMLHttpRequest in modalità sincrona.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/pl/browser/chrome/browser/browser.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/pl/browser/chrome/browser/browser.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/pl/browser/chrome/browser/browser.properties	2015-05-13 18:08:40.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/pl/browser/chrome/browser/browser.properties	2015-05-25 20:50:32.000000000 +0000
@@ -602,10 +602,10 @@
 e10s.offerPopup.enableAndRestart.accesskey=W
 e10s.offerPopup.noThanks.label=Nie, dzięki
 e10s.offerPopup.noThanks.accesskey=N
-e10s.postActivationInfobar.message=Pomagasz testować program %S w wielu procesach! Prosimy o zgłaszanie napotanych problemów.
+e10s.postActivationInfobar.message=Pomagasz testować program %S w wielu procesach! Prosimy o zgłaszanie napotkanych problemów.
 e10s.postActivationInfobar.learnMore.label=Więcej informacji
 e10s.postActivationInfobar.learnMore.accesskey=i
-e10s.accessibilityNotice.mainMessage=Program uruchomiony w wielu procesach nie obsługuje jeszcze funkcji dostępności. Obsługa wielu procesów zostanie wyłączona jeśli uruchomisz ponownie program %S.
+e10s.accessibilityNotice.mainMessage=Program uruchomiony w wielu procesach nie obsługuje jeszcze funkcji dostępności. Obsługa wielu procesów zostanie wyłączona, jeśli uruchomisz ponownie program %S.
 e10s.accessibilityNotice.disableAndRestart.label=Wyłącz i uruchom ponownie
 e10s.accessibilityNotice.disableAndRestart.accesskey=W
 e10s.accessibilityNotice.dontDisable.label=Nie wyłączaj
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/pl/browser/chrome/browser/devtools/profiler.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/pl/browser/chrome/browser/devtools/profiler.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/pl/browser/chrome/browser/devtools/profiler.dtd	2015-05-13 18:08:40.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/pl/browser/chrome/browser/devtools/profiler.dtd	2015-05-25 20:50:32.000000000 +0000
@@ -61,5 +61,5 @@
 
 <!ENTITY profilerUI.console.recordingNoticeStart "Rejestrowanie poprzez">
 <!ENTITY profilerUI.console.recordingNoticeEnd "">
-<!ENTITY profilerUI.console.stopCommandStart "Zatrzymaj rejestrowanie wprowadzając „">
+<!ENTITY profilerUI.console.stopCommandStart "Zatrzymaj rejestrowanie, wprowadzając „">
 <!ENTITY profilerUI.console.stopCommandEnd "” w konsoli.">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/pl/browser/chrome/browser/devtools/timeline.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/pl/browser/chrome/browser/devtools/timeline.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/pl/browser/chrome/browser/devtools/timeline.properties	2015-05-13 18:08:40.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/pl/browser/chrome/browser/devtools/timeline.properties	2015-05-25 20:50:32.000000000 +0000
@@ -17,6 +17,7 @@
 timeline.label.domevent=Zdarzenie DOM
 timeline.label.consoleTime=Konsola
 timeline.label.garbageCollection=Zdarzenie GC
+timeline.label.timestamp=Znacznik czasu
 
 graphs.memory=MB
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/pl/browser/chrome/browser/newTab.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/pl/browser/chrome/browser/newTab.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/pl/browser/chrome/browser/newTab.properties	2015-05-13 18:08:40.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/pl/browser/chrome/browser/newTab.properties	2015-05-25 20:50:32.000000000 +0000
@@ -12,24 +12,22 @@
 newtab.sponsored.explain2=Ta strona została zasugerowana w imieniu partnera Mozilli. W każdym momencie można ją usunąć, używając przycisku %1$S. %2$S
 newtab.suggested.explain=Strona zasugerowana przez Mozillę. Jej miniaturkę można w każdej chwili usunąć przyciskiem %1$S. %2$S
 newtab.enhanced.explain=Partner Mozilli zmienił wygląd tej miniaturki. Modyfikowanie miniaturek można wyłączyć, korzystając z przycisku %1$S. %2$S
-newtab.intro.paragraph1=W nowych kartach wyświetlane są miniaturki często odwiedzanych stron oraz miniaturki, które naszym zdaniem mogą być interesujące. Niektóre z nich mogą być sponsorowane przez partnerów Mozilli i zawsze będą stosownie oznaczane. %1$S
 newtab.intro.paragraph2=Aby udostępniać tę funkcję, Mozilla zbiera i wykorzystuje pewne informacje o sposobie wykorzystywania miniaturek, zgodnie z %1$S.
-newtab.intro.paragraph3=Wyświetlanie miniaturek można wyłączyć, korzystając z przycisku %1$S.
-newtab.intro.paragraph4=Wyświetlanie miniaturek można wyłączyć klikając przycisk %1$S i wybierając „Pusta” z menu %2$S.
-newtab.intro.paragraph5=Na stronie nowej karty będą wyświetlane najczęściej odwiedzane strony oraz takie, które jak sądzimy, mogą Ciebie zainteresować. Na początek wyświetlimy kilka stron Mozilli.
-newtab.intro.paragraph6=Możesz %2$S lub %1$S dowolną stronę korzystając z przycisków dostępnych po najechaniu kursorem nad miniturkę.
+newtab.intro.paragraph4=Wyświetlanie miniaturek można wyłączyć, klikając przycisk %1$S i wybierając „Pusta” z menu %2$S.
+newtab.intro.paragraph5=Na stronie nowej karty będą wyświetlane najczęściej odwiedzane strony oraz takie, które jak sądzimy, mogą być dla Ciebie interesujące. Na początek wyświetlimy kilka stron Mozilli.
+newtab.intro.paragraph6=Możesz %2$S lub %1$S dowolną stronę korzystając z przycisków dostępnych po najechaniu kursorem nad miniaturkę.
 newtab.intro.paragraph6.remove=usunąć
 newtab.intro.paragraph6.pin=przypiąć
 newtab.intro.paragraph7=Niektóre wyświetlane strony mogą być sugerowane przez Mozillę i mogą być sponsorowane przez jej partnerów. Sponsorowane strony będą zawsze odpowiednio wyróżnione.
 newtab.intro.paragraph8=%1$S pokaże tylko strony najlepiej pasujące do Twoich zainteresowań w sieci. %2$S
-newtab.intro.paragraph9=Teraz, gdy otworzysz nową kartę, zobaczysz również karty, które jak sądzimy, mogą Ciebie zainteresować.
-newtab.intro.controls=ustwień nowej karty
+newtab.intro.paragraph9=Teraz, gdy otworzysz nową kartę, zobaczysz również karty, które jak sądzimy, mogą być dla Ciebie interesujące.
+newtab.intro.controls=ustawień nowej karty
 newtab.privacy.link=polityką prywatności
 newtab.learn.link=Więcej informacji…
-newtab.learn.link2=Więcej informacji o stronie nowej karty
+newtab.learn.link2=Więcej informacji o nowej karcie
 newtab.privacy.link2=O prywatności
 newtab.intro.header.welcome=Witamy na stronie nowej karty w programie %1$S!
-newtab.intro.header.update=Strona nowej karaty została uaktualniania!
+newtab.intro.header.update=Strona nowej karty została uaktualniania!
 newtab.intro.skip=Pomiń
 newtab.intro.continue=Kontynuuj
 newtab.intro.back=Cofnij
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/pl/browser/chrome/browser/preferences/fonts.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/pl/browser/chrome/browser/preferences/fonts.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/pl/browser/chrome/browser/preferences/fonts.dtd	2015-05-13 18:08:40.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/pl/browser/chrome/browser/preferences/fonts.dtd	2015-05-25 20:50:32.000000000 +0000
@@ -63,7 +63,7 @@
 <!ENTITY  allowPagesToUse.accesskey               "i">
 
 <!ENTITY languages.customize.Fallback2.grouplabel "Kodowanie tekstu dla przestarzałych treści">
-<!ENTITY languages.customize.Fallback2.label "Rezerwowe lodowanie tekstu:">
+<!ENTITY languages.customize.Fallback2.label "Rezerwowe kodowanie tekstu:">
 <!ENTITY languages.customize.Fallback2.accesskey "k">
 <!ENTITY languages.customize.Fallback2.desc "Kodowanie tekstu używane na stronach, które same go nie określają.">
 <!ENTITY languages.customize.Fallback.auto "Domyślne dla obecnej lokalizacji">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/pl/browser/chrome/browser/syncCustomize.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/pl/browser/chrome/browser/syncCustomize.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/pl/browser/chrome/browser/syncCustomize.dtd	2015-05-13 18:08:40.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/pl/browser/chrome/browser/syncCustomize.dtd	2015-05-25 20:50:32.000000000 +0000
@@ -2,8 +2,8 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY syncCustomize.dialog.title "Opcje synchronizacji">
-<!ENTITY syncCustomize.acceptButton.label "Rozpocznij">
+<!ENTITY syncCustomize.dialog.title "Ustawienia synchronizacji">
+<!ENTITY syncCustomize.acceptButton.label "Synchronizuj">
 
 <!ENTITY syncCustomize.title "Wybór rzeczy do synchronizacji">
 <!ENTITY syncCustomize.description "Ustawienia synchronizacji można zmieniać w opcjach.">
@@ -13,13 +13,13 @@
 <!ENTITY engine.bookmarks.accesskey "Z">
 <!ENTITY engine.readinglist.label "Czytelnia">
 <!ENTITY engine.readinglist.accesskey "C">
-<!ENTITY engine.history.label "Historię">
+<!ENTITY engine.history.label "Historia">
 <!ENTITY engine.history.accesskey "H">
 <!ENTITY engine.tabs.label "Karty">
 <!ENTITY engine.tabs.accesskey "K">
 <!ENTITY engine.passwords.label "Hasła">
 <!ENTITY engine.passwords.accesskey "a">
-<!ENTITY engine.addons.label "Dodatki (desktop)">
+<!ENTITY engine.addons.label "Dodatki wersji na komputery">
 <!ENTITY engine.addons.accesskey "D">
-<!ENTITY engine.prefs.label "Ustawienia (desktop)">
+<!ENTITY engine.prefs.label "Ustawienia wersji na komputery">
 <!ENTITY engine.prefs.accesskey "U">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/pl/browser/chrome/browser/syncProgress.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/pl/browser/chrome/browser/syncProgress.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/pl/browser/chrome/browser/syncProgress.dtd	2015-05-13 18:08:40.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/pl/browser/chrome/browser/syncProgress.dtd	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY % brandDTD
-    SYSTEM "chrome://branding/locale/brand.dtd">
-    %brandDTD;
-
-<!-- These strings are used in the sync progress upload page -->
-<!ENTITY syncProgress.pageTitle    "Pierwsza synchronizacja">
-<!ENTITY syncProgress.textBlurb    "Twoje dane są teraz szyfrowane i przesyłane w tle. Możesz zamknąć tę kartę i kontynuować pracę z programem &brandShortName;.">
-<!ENTITY syncProgress.closeButton  "Zamknij">
-<!ENTITY syncProgress.logoAltText  "Logo programu &brandShortName;">
-<!ENTITY syncProgress.diffText     "Synchronizacja programu &brandShortName; będzie się odbywać automatycznie w tle. Możesz zamknąć tę kartę i kontynuować pracę z programem &brandShortName;.">
-
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/pl/toolkit/chrome/global/aboutTelemetry.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/pl/toolkit/chrome/global/aboutTelemetry.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/pl/toolkit/chrome/global/aboutTelemetry.dtd	2015-05-13 18:08:40.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/pl/toolkit/chrome/global/aboutTelemetry.dtd	2015-05-25 20:50:32.000000000 +0000
@@ -2,17 +2,23 @@
    - License, v. 2.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 aboutTelemetry.pageTitle "Dane Telemetrii">
+<!ENTITY aboutTelemetry.pageTitle "Dane telemetrii">
+<!ENTITY aboutTelemetry.changeDataChoices "Zmień">
+<!ENTITY aboutTelemetry.uploadEnabled "Wysyłanie danych o zdrowiu Firefoksa jest <span>włączone</span>.">
+<!ENTITY aboutTelemetry.uploadDisabled "Wysyłanie danych o zdrowiu Firefoksa jest <span>wyłączone</span>.">
+<!ENTITY aboutTelemetry.extendedRecordingEnabled "Rejestrowanie rozszerzonych danych telemertrii jest <span>włączone</span>.">
+<!ENTITY aboutTelemetry.extendedRecordingDisabled "Rejestrowanie rozszerzonych danych telemertrii jest <span>wyłączone</span>.">
 
-<!ENTITY aboutTelemetry.telemetryEnabled "
-  Telemetria jest <span>włączona</span>.
-">
-
-<!ENTITY aboutTelemetry.telemetryDisabled "
-  Telemetria jest <span>wyłączona</span>.
-">
+<!ENTITY aboutTelemetry.pingDataSource "Źródło danych ping:">
+<!ENTITY aboutTelemetry.showCurrentPingData "Bieżące">
+<!ENTITY aboutTelemetry.showArchivedPingData "Archiwum">
+<!ENTITY aboutTelemetry.showSubsessionData "Dane subsesji">
+<!ENTITY aboutTelemetry.choosePing "Pingi:">
+<!ENTITY aboutTelemetry.showNewerPing "&lt;&lt; Nowsze">
+<!ENTITY aboutTelemetry.showOlderPing "Starsze &gt;&gt;">
 
 <!ENTITY aboutTelemetry.generalDataSection "Ogólne">
+<!ENTITY aboutTelemetry.environmentDataSection "Dane środowiska">
 <!ENTITY aboutTelemetry.telemetryLogSection "Dziennik telemetrii">
 <!ENTITY aboutTelemetry.slowSqlSection "
   Powolne polecenia SQL
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/pl/toolkit/chrome/global/aboutTelemetry.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/pl/toolkit/chrome/global/aboutTelemetry.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/pl/toolkit/chrome/global/aboutTelemetry.properties	2015-05-13 18:08:40.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/pl/toolkit/chrome/global/aboutTelemetry.properties	2015-05-25 20:50:32.000000000 +0000
@@ -7,6 +7,8 @@
 generalDataTitle=Dane ogólne
 generalDataHeadingName=Nazwa
 generalDataHeadingValue=Wartość
+environmentDataHeadingName=Nazwa
+environmentDataHeadingValue=Wartość
 
 telemetryLogTitle=Dziennik telemetrii
 telemetryLogHeadingId=Identyfikator
@@ -44,9 +46,6 @@
 
 histogramSum = suma
 histogramCopy=Kopiuj
-disableTelemetry = Wyłącz telemetrię
-
-enableTelemetry = Włącz telemetrię
 
 keysHeader = Własność
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/browser/chrome/browser/browser.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/browser/chrome/browser/browser.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/browser/chrome/browser/browser.properties	2015-05-13 18:08:52.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/browser/chrome/browser/browser.properties	2015-05-25 20:51:04.000000000 +0000
@@ -39,18 +39,18 @@
 addonsInstalledNeedsRestart = #1 будет установлен после перезапуска вами #3.;#2 дополнения будут установлены после перезапуска вами #3.;#2 дополнений будет установлено после перезапуска вами #3.
 addonInstallRestartButton = Перезапустить сейчас
 addonInstallRestartButton.accesskey = з
-addonError-1 = Дополнение не может быть загружено из-за ошибки соединения с #2.
-addonError-2 = Дополнение с #2 не может быть установлено, так как оно не соответствует дополнению, ожидаемому #3.
-addonError-3 = Дополнение, загруженное с #2, не может быть установлено, так как оно, по-видимому, повреждено.
-addonError-4 = #1 не может быть установлено, так как #3 не может изменить нужный файл.
-addonError-5 = #3 заблокировал установку непроверенного дополнения с этого сайта.
-addonLocalError-1 = Это дополнение не может быть установлено из-за ошибки файловой системы.
-addonLocalError-2 = Это дополнение не может быть установлено, так как оно не соответствует дополнению, ожидаемому #3.
-addonLocalError-3 = Это дополнение не может быть установлено, так как оно, по-видимому, повреждено.
-addonLocalError-4 = #1 не может быть установлено, так как #3 не может изменить нужный файл.
-addonLocalError-5 = Это дополнение не может быть установлено, так как оно не было проверено.
-addonErrorIncompatible = #1 не может быть установлено, так как оно несовместимо с #3 #4.
-addonErrorBlocklisted = #1 не может быть установлено, так как есть высокий риск, что оно вызовет проблемы со стабильностью или безопасностью.
+addonInstallError-1 = Дополнение не может быть загружено из-за ошибки соединения.
+addonInstallError-2 = Дополнение не может быть установлено, так как оно не соответствует дополнению, ожидаемому %1$S.
+addonInstallError-3 = Дополнение, загруженное с этого сайта, не может быть установлено, так как оно, по-видимому, повреждено.
+addonInstallError-4 = %2$S не может быть установлено, так как %1$S не может изменить нужный файл.
+addonInstallError-5 = %1$S заблокировал установку непроверенного дополнения с этого сайта.
+addonLocalInstallError-1 = Это дополнение не может быть установлено из-за ошибки файловой системы.
+addonLocalInstallError-2 = Это дополнение не может быть установлено, так как оно не соответствует дополнению, ожидаемому %1$S.
+addonLocalInstallError-3 = Это дополнение не может быть установлено, так как оно, по-видимому, повреждено.
+addonLocalInstallError-4 = %2$S не может быть установлено, так как %1$S не может изменить нужный файл.
+addonLocalInstallError-5 = Это дополнение не может быть установлено, так как оно не было проверено.
+addonInstallErrorIncompatible = %3$S не может быть установлено, так как оно несовместимо с %1$S %2$S.
+addonInstallErrorBlocklisted = %S не может быть установлено, так как есть высокий риск, что оно вызовет проблемы со стабильностью или безопасностью.
 unsignedAddonsDisabled.message = Одно или несколько установленных дополнений не могут быть проверены, поэтому они были отключены.
 unsignedAddonsDisabled.learnMore.label = Подробнее
 unsignedAddonsDisabled.learnMore.accesskey = о
@@ -189,30 +189,30 @@
 geolocation.alwaysShareLocation.accesskey = е
 geolocation.neverShareLocation = Никогда не сообщать местоположение
 geolocation.neverShareLocation.accesskey = и
-geolocation.shareWithSite = Вы хотите сообщить свое местоположение %S?
-geolocation.shareWithFile = Вы хотите сообщить свое местоположение файлу %S?
+geolocation.shareWithSite2 = Вы хотите сообщить свое местоположение этому сайту?
+geolocation.shareWithFile2 = Вы хотите сообщить свое местоположение этому файлу?
 webNotifications.showForSession = Отображать только на этот сеанс
 webNotifications.showForSession.accesskey = о
 webNotifications.alwaysShow = Всегда отображать уведомления
 webNotifications.alwaysShow.accesskey = а
 webNotifications.neverShow = Всегда блокировать уведомления
 webNotifications.neverShow.accesskey = и
-webNotifications.showFromSite = Вы хотите отображать уведомления с %S?
+webNotifications.showFromSite2 = Вы хотите отображать уведомления с этого сайта?
 push.allowForSession = Разрешить на сессию
 push.allowForSession.accesskey = и
 push.alwaysAllow = Всегда разрешать оповещения
 push.alwaysAllow.accesskey = е
 push.alwaysBlock = Всегда блокировать оповещения
 push.alwaysBlock.accesskey = а
-push.enablePush = Вы хотите разрешить %S отображать оповещения?
+push.enablePush2 = Вы хотите разрешить этому сайту отображать оповещения?
 pointerLock.allow2 = Скрыть указатель мыши
 pointerLock.allow2.accesskey = ы
 pointerLock.alwaysAllow = Всегда разрешать скрытие
 pointerLock.alwaysAllow.accesskey = е
 pointerLock.neverAllow = Никогда не разрешать скрытие
 pointerLock.neverAllow.accesskey = и
-pointerLock.title2 = Вы хотите разрешить скрыть указатель мыши на %S?
-pointerLock.autoLock.title2 = %S скроет указатель мыши.
+pointerLock.title3 = Вы хотите разрешить скрыть указатель мыши на этом сайте?
+pointerLock.autoLock.title3 = Этот сайт скроет указатель мыши.
 safebrowsing.getMeOutOfHereButton.label = Уходим отсюда!
 safebrowsing.getMeOutOfHereButton.accessKey = х
 safebrowsing.reportedWebForgery = Имеется информация, что этот сайт является мошенническим!
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/browser/chrome/browser/devtools/debugger.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/browser/chrome/browser/devtools/debugger.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/browser/chrome/browser/devtools/debugger.properties	2015-05-13 18:08:52.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/browser/chrome/browser/devtools/debugger.properties	2015-05-25 20:51:04.000000000 +0000
@@ -75,7 +75,6 @@
 breakpointMenuItem.disableAll = Отключить все точки останова
 breakpointMenuItem.deleteAll = Удалить все точки останова
 loadingText = Загрузка…
-errorLoadingText = Ошибка загрузки источника:\n
 errorLoadingText2 = Ошибка загрузки этого URL: %S
 addWatchExpressionText = Добавить выражение для отслеживания
 addWatchExpressionButton = Отслеживать
@@ -105,5 +104,4 @@
 variablesViewOptimizedOut = (оптимизировано)
 variablesViewUninitialized = (неинициализировано)
 variablesViewMissingArgs = (недоступно)
-evalGroupLabel = Источники "eval"
 anonymousSourcesLabel = Анонимные источники
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/browser/chrome/browser/devtools/netmonitor.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/browser/chrome/browser/devtools/netmonitor.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/browser/chrome/browser/devtools/netmonitor.dtd	2015-05-13 18:08:52.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/browser/chrome/browser/devtools/netmonitor.dtd	2015-05-25 20:51:04.000000000 +0000
@@ -66,6 +66,8 @@
 <!ENTITY netmonitorUI.context.copyUrl.accesskey "а">
 <!ENTITY netmonitorUI.context.copyUrlParams "Копировать параметры URL">
 <!ENTITY netmonitorUI.context.copyUrlParams.accesskey "ы">
+<!ENTITY netmonitorUI.context.copyPostData "Копировать данные POST">
+<!ENTITY netmonitorUI.context.copyPostData.accesskey "ь">
 <!ENTITY netmonitorUI.context.copyAsCurl "Копировать как cURL">
 <!ENTITY netmonitorUI.context.copyAsCurl.accesskey "в">
 <!ENTITY netmonitorUI.context.copyRequestHeaders "Копировать заголовки запроса">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/browser/chrome/browser/devtools/styleinspector.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/browser/chrome/browser/devtools/styleinspector.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/browser/chrome/browser/devtools/styleinspector.dtd	2015-05-13 18:08:52.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/browser/chrome/browser/devtools/styleinspector.dtd	2015-05-25 20:51:04.000000000 +0000
@@ -4,6 +4,7 @@
 
 <!ENTITY browserStylesLabel "Стили браузера">
 <!ENTITY filterStylesPlaceholder "Фильтр стилей">
+<!ENTITY addRuleButtonTooltip "Добавить новое правило">
 <!ENTITY selectedElementLabel "Выбранный элемент:">
 <!ENTITY noPropertiesFound "CSS-свойства не найдены.">
 <!ENTITY computedViewTitle "Вычислено">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/browser/chrome/browser/devtools/timeline.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/browser/chrome/browser/devtools/timeline.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/browser/chrome/browser/devtools/timeline.properties	2015-05-13 18:08:52.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/browser/chrome/browser/devtools/timeline.properties	2015-05-25 20:51:04.000000000 +0000
@@ -16,6 +16,7 @@
 timeline.label.domevent = Событие DOM
 timeline.label.consoleTime = Консоль
 timeline.label.garbageCollection = Событие GC
+timeline.label.timestamp = Временная метка
 graphs.memory = МБ
 timeline.markerDetailFormat = %1$S (%2$S)
 timeline.markerDetail.start = Начало:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/browser/chrome/browser/devtools/webide.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/browser/chrome/browser/devtools/webide.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/browser/chrome/browser/devtools/webide.properties	2015-05-13 18:08:52.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/browser/chrome/browser/devtools/webide.properties	2015-05-25 20:51:04.000000000 +0000
@@ -27,6 +27,7 @@
 error_cantConnectToApp = Не удалось соединиться с приложением: %1$S
 error_cantFetchAddonsJSON = Не удалось получить список дополнений: %S
 error_appProjectsLoadFailed = Не удается загрузить список проектов. Это может произойти, если вы использовали этот профиль с более новой версией Firefox.
+error_folderCreationFailed = Не удалось создать папку проекта в выбранном каталоге.
 addons_stable = стабильный
 addons_unstable = нестабильный
 addons_simulator_label = Симулятор Firefox OS %1$S (%2$S)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/browser/chrome/browser/loop/loop.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/browser/chrome/browser/loop/loop.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/browser/chrome/browser/loop/loop.properties	2015-05-13 18:08:52.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/browser/chrome/browser/loop/loop.properties	2015-05-25 20:51:04.000000000 +0000
@@ -168,7 +168,6 @@
 infobar_button_gotit_accesskey = о
 infobar_menuitem_dontshowagain_label = Не показывать это снова
 infobar_menuitem_dontshowagain_accesskey = е
-context_offer_label = Давайте поговорим об этой странице
 context_inroom_label = Давайте поговорим о:
 context_edit_activate_label = Поговорить о "{{title}}"
 context_edit_name_placeholder = Имя видеозвонка
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/browser/chrome/browser/newTab.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/browser/chrome/browser/newTab.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/browser/chrome/browser/newTab.properties	2015-05-13 18:08:52.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/browser/chrome/browser/newTab.properties	2015-05-25 20:51:04.000000000 +0000
@@ -12,10 +12,8 @@
 newtab.sponsored.explain2 = Этот сайт был предложен вам от имени партнера Mozilla. Его можно удалить в любое время, щёлкнув по кнопке %1$S. %2$S
 newtab.suggested.explain = Этот сайт был предложен вам Mozilla. Его можно удалить в любое время, щёлкнув по кнопке %1$S. %2$S
 newtab.enhanced.explain = Партнер Mozilla визуально улучшил эту плитку, заменив снимок экрана. Отображение улучшенных плиток можно отключить, щёлкнув по кнопке %1$S. %2$S
-newtab.intro.paragraph1 = Открыв новую вкладку, вы увидите плитки сайтов, которые вы часто посещаете, а также плитки, которые, по нашему мнению, могут быть вам интересны. Некоторые из этих плиток могут спонсироваться партнерами Mozilla. Мы всегда указываем, у каких плиток есть спонсоры. %1$S
 newtab.intro.paragraph2 = Для оказания этой услуги Mozilla собирает и использует определенную аналитическую информацию об использовании вами плиток в соответствии с нашим %1$S.
-newtab.intro.paragraph3 = Вы можете отключить эту функцию плиток, щёлкнув по кнопке %1$S.
-newtab.intro.paragraph4 = Вы можете отключить эту функцию, щёлкнув по кнопке шестерни (%1$S) и выбрав «Отображать пустую страницу» в меню %2$S.
+newtab.intro.paragraph4.2 = Вы можете отключить эту услугу, щёлкнув по кнопке шестерни (%1$S) и сняв флажок «Включая предлагаемые сайты» в меню %2$S.
 newtab.intro.paragraph5 = На «Новой вкладке» будут отображаться сайты, которые вы часто посещаете, а также сайты, которые, по нашему мнению, могут быть вам интересны. Для начала, вы увидите несколько сайтов от Mozilla.
 newtab.intro.paragraph6 = Вы можете %1$S или %2$S любой сайт с помощью элементов управления, доступных при наведении на него.
 newtab.intro.paragraph6.remove = удалить
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/browser/chrome/browser/preferences/advanced.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/browser/chrome/browser/preferences/advanced.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/browser/chrome/browser/preferences/advanced.dtd	2015-05-13 18:08:52.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/browser/chrome/browser/preferences/advanced.dtd	2015-05-25 20:51:04.000000000 +0000
@@ -25,7 +25,7 @@
 <!ENTITY enableHealthReport.accesskey "ю">
 <!ENTITY healthReportLearnMore.label "Подробнее">
 <!ENTITY telemetryDesc.label "Поделиться сведениями о производительности, использовании, аппаратном обеспечении и настройках вашего браузера с &vendorShortName;, чтобы помочь нам сделать &brandShortName; ещё лучше">
-<!ENTITY enableTelemetryData.label "Делиться дополнительными данными (например, Телеметрией)">
+<!ENTITY enableTelemetryData.label "Делиться дополнительными данными (называемыми Телеметрией)">
 <!ENTITY enableTelemetryData.accesskey "и">
 <!ENTITY telemetryLearnMore.label "Подробнее">
 <!ENTITY crashReporterDesc.label "&brandShortName; отправляет сообщения о падении, чтобы помочь &vendorShortName; сделать ваш браузер более стабильным и безопасным">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/browser/chrome/browser/preferences/colors.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/browser/chrome/browser/preferences/colors.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/browser/chrome/browser/preferences/colors.dtd	2015-05-13 18:08:52.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/browser/chrome/browser/preferences/colors.dtd	2015-05-25 20:51:04.000000000 +0000
@@ -3,7 +3,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY colorsDialog.title "Цвета">
-<!ENTITY window.width "42em">
+<!ENTITY window.width "52em">
 <!ENTITY window.macWidth "57em">
 <!ENTITY overridePageColors.label "Заменять цвета, указанные страницей, на выбранные мной выше цвета:">
 <!ENTITY overridePageColors.accesskey "а">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/browser/chrome/browser/syncProgress.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/browser/chrome/browser/syncProgress.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/browser/chrome/browser/syncProgress.dtd	2015-05-13 18:08:52.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/browser/chrome/browser/syncProgress.dtd	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY % brandDTD
-    SYSTEM "chrome://branding/locale/brand.dtd">
-    %brandDTD;
-
-<!-- These strings are used in the sync progress upload page -->
-<!ENTITY syncProgress.pageTitle "Ваша первая синхронизация">
-<!ENTITY syncProgress.textBlurb "Ваши данные сейчас шифруются и выгружаются в фоновом режиме. Вы можете закрыть эту вкладку и продолжить использовать &brandShortName;.">
-<!ENTITY syncProgress.closeButton "Закрыть">
-<!ENTITY syncProgress.logoAltText "Логотип &brandShortName;">
-<!ENTITY syncProgress.diffText "&brandShortName; теперь будет автоматически производить синхронизацию в фоновом режиме. Вы можете закрыть эту вкладку и продолжить использовать &brandShortName;.">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/dom/chrome/dom/dom.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/dom/chrome/dom/dom.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/dom/chrome/dom/dom.properties	2015-05-13 18:08:52.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/dom/chrome/dom/dom.properties	2015-05-25 20:51:05.000000000 +0000
@@ -69,7 +69,6 @@
 FullScreenDeniedSubDocFullScreen = В запросе полноэкранного режима было отказано, так как поддокумент документа, запрашивающего полноэкранный режим, уже находится в полноэкранном режиме.
 FullScreenDeniedNotDescendant = В запросе полноэкранного режима было отказано, так как запрашивающий элемент не был порождён текущим полноэкранным элементом.
 FullScreenDeniedNotFocusedTab = В запросе полноэкранного режима было отказано, так как запрашивающий элемент не расположен во вкладке, находящейся сейчас в фокусе.
-FullScreenDeniedContentOnly = В запросе полноэкранного режима было отказано, так как запрашивающий элемент расположен в документе chrome, а полноэкранное API настроено только для контента.
 RemovedFullScreenElement = Из полноэкранного режима произведён выход, так как полноэкранный элемент был удалён из документа.
 FocusedWindowedPluginWhileFullScreen = Из полноэкранного режима произведён выход, так как в фокусе был windowed-плагин.
 HTMLSyncXHRWarning = Парсинг HTML в XMLHttpRequest в синхронном режиме не поддерживается.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/security/manager/chrome/pipnss/nsserrors.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/security/manager/chrome/pipnss/nsserrors.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/security/manager/chrome/pipnss/nsserrors.properties	2015-05-13 18:08:52.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/security/manager/chrome/pipnss/nsserrors.properties	2015-05-25 20:51:04.000000000 +0000
@@ -318,3 +318,4 @@
 MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE = Сертификат, полученный от сервера, ещё не действителен.
 MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE = Сертификат, который ещё не действителен, был использован для выдачи сертификата сервера.
 MOZILLA_PKIX_ERROR_SIGNATURE_ALGORITHM_MISMATCH = Алгоритм подписи в поле подписи сертификата не соответствует алгоритму в его поле signatureAlgorithm.
+MOZILLA_PKIX_ERROR_OCSP_RESPONSE_FOR_CERT_MISSING = OCSP-ответ не включает в себя статус проверяемого сертификата.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/toolkit/chrome/global/aboutTelemetry.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/toolkit/chrome/global/aboutTelemetry.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/toolkit/chrome/global/aboutTelemetry.dtd	2015-05-13 18:08:52.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/toolkit/chrome/global/aboutTelemetry.dtd	2015-05-25 20:51:04.000000000 +0000
@@ -3,12 +3,34 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY aboutTelemetry.pageTitle "Данные телеметрии">
-<!ENTITY aboutTelemetry.telemetryEnabled "
-   Телеметрия <span>включена</span>. ">
-<!ENTITY aboutTelemetry.telemetryDisabled "
-   Телеметрия <span>отключена</span>. ">
+<!ENTITY aboutTelemetry.changeDataChoices "
+  Изменить ">
+<!ENTITY aboutTelemetry.uploadEnabled "
+  Выгрузка данных FHR <span>включена</span>. ">
+<!ENTITY aboutTelemetry.uploadDisabled "
+  Выгрузка данных FHR <span>отключена</span>. ">
+<!ENTITY aboutTelemetry.extendedRecordingEnabled "
+  Запись расширенной телеметрии <span>включена</span>. ">
+<!ENTITY aboutTelemetry.extendedRecordingDisabled "
+  Запись расширенной телеметрии <span>отключена</span>. ">
+<!ENTITY aboutTelemetry.pingDataSource "
+Источник данных пинга:">
+<!ENTITY aboutTelemetry.showCurrentPingData "
+Данные текущего пинга ">
+<!ENTITY aboutTelemetry.showArchivedPingData "
+Данные архивированного пинга ">
+<!ENTITY aboutTelemetry.showSubsessionData "
+Отображать данные подсессии ">
+<!ENTITY aboutTelemetry.choosePing "
+Выберите пинг: ">
+<!ENTITY aboutTelemetry.showNewerPing "
+&lt;&lt; Более новый пинг ">
+<!ENTITY aboutTelemetry.showOlderPing "
+Более старый пинг &gt;&gt; ">
 <!ENTITY aboutTelemetry.generalDataSection "
    Общие данные">
+<!ENTITY aboutTelemetry.environmentDataSection "
+   Данные окружения ">
 <!ENTITY aboutTelemetry.telemetryLogSection "
    Лог телеметрии ">
 <!ENTITY aboutTelemetry.slowSqlSection "
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/toolkit/chrome/global/aboutTelemetry.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/toolkit/chrome/global/aboutTelemetry.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/toolkit/chrome/global/aboutTelemetry.properties	2015-05-13 18:08:52.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/toolkit/chrome/global/aboutTelemetry.properties	2015-05-25 20:51:04.000000000 +0000
@@ -6,6 +6,8 @@
 generalDataTitle = Общие данные
 generalDataHeadingName = Имя
 generalDataHeadingValue = Значение
+environmentDataHeadingName = Имя
+environmentDataHeadingValue = Значение
 telemetryLogTitle = Лог телеметрии
 telemetryLogHeadingId = Идентификатор
 telemetryLogHeadingTimestamp = Временная метка
@@ -24,8 +26,6 @@
 histogramAverage = среднее
 histogramSum = сумма
 histogramCopy = Копировать
-disableTelemetry = Отключить телеметрию
-enableTelemetry = Включить телеметрию
 keysHeader = Свойство
 valuesHeader = Значение
 addonTableID = ID дополнения
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/toolkit/chrome/global/devtools/gclicommands.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/toolkit/chrome/global/devtools/gclicommands.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/toolkit/chrome/global/devtools/gclicommands.properties	2015-05-13 18:08:52.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/toolkit/chrome/global/devtools/gclicommands.properties	2015-05-25 20:51:04.000000000 +0000
@@ -224,7 +224,7 @@
 cookieDesc = Показ и изменение куков
 cookieManual = Команды для показа, создания, удаления и изменения куков для текущего домена.
 cookieListDesc = Показать куки
-cookieListManual = Отображает список куков, относящихся к текущей странице.
+cookieListManual = Показать список куков, относящихся к текущей странице.
 cookieListOutHost = Узел:
 cookieListOutPath = Путь:
 cookieListOutExpires = Срок действия истекает:
@@ -358,6 +358,14 @@
 folderOpenProfileDesc = Открыть каталог профиля
 folderInvalidPath = Введите корректный путь
 folderOpenDirResult = Открыт %1$S
+securityDesc = Показать поддерживаемые функции безопасности
+securityManual = Команды для перечисления и получения предложений о функциях безопасности для текущего домена.
+securityListDesc = Показать функции безопасности
+securityListManual = Показать список всех функций безопасности подходящих для текущей страницы.
+securityCSPDesc = Показать специфичные для CSP функции безопасности
+securityCSPManual = Показать отзыв о CSP, применённой к текущей странице.
+securityCSPRemWildCard = Вы можете удалить символ подстановки(*)?
+securityCSPPotentialXSS = Потенциальная уязвимость XSS!
 rulersDesc = Переключить линейки для страницы
 rulersManual = Переключить отображение горизонтальных и вертикальных линеек для текущей страницы
 rulersTooltip = Переключить отображение линеек для этой страницы
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/toolkit/chrome/global/devtools/styleinspector.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/toolkit/chrome/global/devtools/styleinspector.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/toolkit/chrome/global/devtools/styleinspector.properties	2015-05-13 18:08:52.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/toolkit/chrome/global/devtools/styleinspector.properties	2015-05-25 20:51:04.000000000 +0000
@@ -27,8 +27,8 @@
 ruleView.contextmenu.showOrigSources.accessKey = о
 ruleView.contextmenu.showMdnDocs = Показать документацию MDN
 ruleView.contextmenu.showMdnDocs.accessKey = з
-ruleView.contextmenu.addRule = Добавить правило
-ruleView.contextmenu.addRule.accessKey = а
+ruleView.contextmenu.addNewRule = Добавить новое правило
+ruleView.contextmenu.addNewRule.accessKey = ь
 computedView.contextmenu.selectAll = Выделить всё
 computedView.contextmenu.selectAll.accessKey = ы
 computedView.contextmenu.copy = Копировать
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/webapprt/webapprt/overrides/dom.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/webapprt/webapprt/overrides/dom.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/ru/webapprt/webapprt/overrides/dom.properties	2015-05-13 18:08:52.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/ru/webapprt/webapprt/overrides/dom.properties	2015-05-25 20:51:05.000000000 +0000
@@ -69,7 +69,6 @@
 FullScreenDeniedSubDocFullScreen = В запросе полноэкранного режима было отказано, так как поддокумент документа, запрашивающего полноэкранный режим, уже находится в полноэкранном режиме.
 FullScreenDeniedNotDescendant = В запросе полноэкранного режима было отказано, так как запрашивающий элемент не был порождён текущим полноэкранным элементом.
 FullScreenDeniedNotFocusedTab = В запросе полноэкранного режима было отказано, так как запрашивающий элемент не расположен во вкладке, находящейся сейчас в фокусе.
-FullScreenDeniedContentOnly = В запросе полноэкранного режима было отказано, так как запрашивающий элемент расположен в документе chrome, а полноэкранное API настроено только для контента.
 RemovedFullScreenElement = Из полноэкранного режима произведён выход, так как полноэкранный элемент был удалён из документа.
 FocusedWindowedPluginWhileFullScreen = Из полноэкранного режима произведён выход, так как в фокусе был windowed-плагин.
 HTMLSyncXHRWarning = Парсинг HTML в XMLHttpRequest в синхронном режиме не поддерживается.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/b2g/chrome/overrides/appstrings.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/b2g/chrome/overrides/appstrings.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/b2g/chrome/overrides/appstrings.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/b2g/chrome/overrides/appstrings.properties	2015-05-25 20:51:18.000000000 +0000
@@ -30,6 +30,7 @@
 externalProtocolChkMsg=Zapamätať si nastavenie pre všetky odkazy rovnakého typu.
 externalProtocolLaunchBtn=Spustiť aplikáciu
 malwareBlocked=Stránka %S bola označená ako podvodná a na základe nastavení zabezpečenia bola zablokovaná.
+unwantedBlocked=Stránka %S bola označená ako ponúkajúca nevyžiadaný softvér 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.
 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.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/baseMenuOverlay.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/baseMenuOverlay.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/baseMenuOverlay.dtd	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/baseMenuOverlay.dtd	2015-05-25 20:51:18.000000000 +0000
@@ -25,6 +25,8 @@
 
 <!ENTITY helpSafeMode.label       "Reštartovať a zakázať doplnky…">
 <!ENTITY helpSafeMode.accesskey   "R">
+<!ENTITY helpSafeMode.stop.label       "Reštartovať a povoliť doplnky…">
+<!ENTITY helpSafeMode.stop.accesskey   "R">
 
 <!ENTITY healthReport2.label       "Správa o kondícii prehliadača &brandShorterName;">
 <!ENTITY healthReport2.accesskey   "S">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/browser.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/browser.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/browser.dtd	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/browser.dtd	2015-05-25 20:51:18.000000000 +0000
@@ -422,6 +422,16 @@
      search providers:  "Search for <used typed keywords> with:" -->
 <!ENTITY searchFor.label              "Vyhľadať ">
 <!ENTITY searchWith.label             " pomocou:">
+
+<!-- LOCALIZATION NOTE (search.label, searchAfter.label):
+     This string is used to build the header above the list of one-click search
+     providers when a one off engine has been selected.  The searchAfter text is
+     intentionally left empty for en-US and can be used by other localizations to
+     display a string after the search engine name.  This string will be displayed
+     as:  "Search <selected engine name><searchAfter.label text>" -->
+<!ENTITY search.label                 "Vyhľadávanie pomocou ">
+<!ENTITY searchAfter.label            "">
+
 <!-- LOCALIZATION NOTE (searchWithHeader.label):
      The wording of this string should be as close as possible to
      searchFor.label and searchWith.label. This string will be used instead of
@@ -798,8 +808,6 @@
 
 <!ENTITY appMenuSidebars.label         "Bočné panely">
 
-<!ENTITY switchToMetroCmd2.label       "Spustiť v prehliadači &brandShortName; pre Windows 8 Touch">
-
 <!-- LOCALIZATION NOTE: (panicButton.view.mainTimeframeDesc, panicButton.view.5min, panicButton.view.2hr, panicButton.view.day):
      The .mainTimeframeDesc string combined with any of the 3 others is meant to form a complete sentence, e.g. "Forget the last: Five minutes".
      Please ensure that this remains the case in the translation. -->
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/browser.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/browser.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/browser.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/browser.properties	2015-05-25 20:51:18.000000000 +0000
@@ -37,21 +37,29 @@
 addonDownloadingAndVerifying=Preberá a overuje sa doplnok…;Preberajú a overujú sa #1 doplnky…;Preberá a overuje sa #1 doplnkov…
 addonDownloadVerifying=Overuje sa
 
+addonInstall.unsigned=(neoverený)
 addonInstall.cancelButton.label=Zrušiť
 addonInstall.cancelButton.accesskey=Z
 addonInstall.acceptButton.label=Nainštalovať
 addonInstall.acceptButton.accesskey=N
 
-# LOCALIZATION NOTE (addonConfirmInstallMessage):
+# LOCALIZATION NOTE (addonConfirmInstallMessage,addonConfirmInstallUnsigned):
 # Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is brandShortName
 # #2 is the number of add-ons being installed
 addonConfirmInstall.message=Táto stránka sa pokúša nainštalovať doplnok pre #1:;Táto stránka sa pokúša nainštalovať #2 doplnky pre #1:;Táto stránka sa pokúša nainštalovať #2 doplnkov pre #1:
+addonConfirmInstallUnsigned.message=Upozornenie: táto stránka sa do prehliadača #1 pokúša nainštalovať neoverený doplnok. Pokračujete na vlastné riziko.;Upozornenie: táto stránka sa do prehliadača #1 pokúša nainštalovať #2 neoverené doplnky. Pokračujete na vlastné riziko.;Upozornenie: táto stránka sa do prehliadača #1 pokúša nainštalovať #2 neoverených doplnkov. Pokračujete na vlastné riziko.
+
+# LOCALIZATION NOTE (addonConfirmInstallSomeUnsigned.message):
+# Semicolon-separated list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is brandShortName
+# #2 is the total number of add-ons being installed (at least 2)
+addonConfirmInstallSomeUnsigned.message=;Upozornenie: táto stránka sa do prehliadača #1 pokúša nainštalovať #2 doplnky, niektoré z nich nie sú overené. Pokračujete na vlastné riziko.;Upozornenie: táto stránka sa do prehliadača #1 pokúša nainštalovať #2 doplnkov, niektoré z nich nie sú overené. Pokračujete na vlastné riziko.
 
 addonwatch.slow=Doplnok %1$S môže spomaľovať prehliadač %2$S
 addonwatch.disable.label=Zakázať %S
-addonwatch.disable.accesskey=Z
 addonwatch.ignoreSession.label=Ignorovať teraz
 addonwatch.ignoreSession.accesskey=I
 addonwatch.ignorePerm.label=Ignorovať natrvalo
@@ -69,22 +77,29 @@
 addonInstallRestartButton=Reštartovať
 addonInstallRestartButton.accesskey=R
 
-# LOCALIZATION NOTE (addonError-1, addonError-2, addonError-3, addonError-4):
-# #1 is the add-on name, #2 is the host name, #3 is the application name
-# #4 is the application version
-addonError-1=Doplnok nemohol byť prevzatý kvôli problémom s pripojením k #2.
-addonError-2=Doplnok zo stránky #2 nemohol byť nainštalovaný, pretože neodpovedá tomu, čo prehliadač #3 očakával.
-addonError-3=Doplnok prevzatý zo stránky #2 nemohol byť nainštalovaný, pretože je zrejme poškodený.
-addonError-4=Doplnok #1 nemohol byť nainštalovaný, pretože #3 nemohol upraviť potrebný súbor.
-
-# LOCALIZATION NOTE (addonLocalError-1, addonLocalError-2, addonLocalError-3, addonLocalError-4, addonErrorIncompatible, addonErrorBlocklisted):
-# #1 is the add-on name, #3 is the application name, #4 is the application version
-addonLocalError-1=Doplnok nemohol byť nainštalovaný kvôli chybe v súborovom systéme.
-addonLocalError-2=Doplnok nemohol byť nainštalovaný, pretože neodpovedá tomu, čo prehliadač #3 očakával.
-addonLocalError-3=Doplnok nemohol byť nainštalovaný, pretože je zrejme poškodený.
-addonLocalError-4=Doplnok #1 nemohol byť nainštalovaný, pretože #3 nemohol upraviť potrebný súbor.
-addonErrorIncompatible=Doplnok #1 nemohol byť nainštalovaný, pretože nie je kompatibilný s prehliadačom #3 #4.
-addonErrorBlocklisted=Doplnok #1 nebol byť nainštalovaný, pretože je veľké riziko, že spôsobí problémy so stabilitou alebo bezpečnosťou prehliadača.
+# LOCALIZATION NOTE (addonInstallError-1, addonInstallError-2, addonInstallError-3, addonInstallError-4, addonInstallError-5, addonLocalInstallError-1, addonLocalInstallError-2, addonLocalInstallError-3, addonLocalInstallError-4, addonLocalInstallError-5):
+# %1$S is the application name, %2$S is the add-on name
+addonInstallError-1=Doplnok nemohol byť prevzatý kvôli problémom s pripojením.
+addonInstallError-2=Doplnok nemohol byť nainštalovaný, pretože neodpovedá tomu, čo prehliadač %1$S očakával.
+addonInstallError-3=Doplnok prevzatý z tejto stránky nemohol byť nainštalovaný, pretože je zrejme poškodený.
+addonInstallError-4=Doplnok %2$S nemohol byť nainštalovaný, pretože %1$S nemohol upraviť potrebný súbor.
+addonInstallError-5=%1$S zabránil tejto stránke nainštalovať neoverený doplnok.
+addonLocalInstallError-1=Tento doplnok nemohol byť nainštalovaný kvôli chybe v súborovom systéme.
+addonLocalInstallError-2=Tento doplnok nemohol byť nainštalovaný, pretože neodpovedá tomu, čo prehliadač %1$S očakával.
+addonLocalInstallError-3=Tento doplnok nemohol byť nainštalovaný, pretože je zrejme poškodený.
+addonLocalInstallError-4=Doplnok %2$S nemohol byť nainštalovaný, pretože %1$S nemohol upraviť potrebný súbor.
+addonLocalInstallError-5=Tento doplnok nemohol byť nainštalovaný, pretože nebol overený.
+
+# LOCALIZATION NOTE (addonInstallErrorIncompatible):
+# %1$S is the application name, %2$S is the application version, %3$S is the add-on name
+addonInstallErrorIncompatible=Doplnok %3$S nemohol byť nainštalovaný, pretože nie je kompatibilný s prehliadačom %1$S %2$S.
+
+# LOCALIZATION NOTE (addonInstallErrorBlocklisted): %S is add-on name
+addonInstallErrorBlocklisted=Doplnok %S nebol byť nainštalovaný, pretože je veľké riziko, že spôsobí problémy so stabilitou alebo bezpečnosťou prehliadača.
+
+unsignedAddonsDisabled.message=Jeden alebo viac doplnkov nebolo možné overiť a preto boli zakázané.
+unsignedAddonsDisabled.learnMore.label=Ďalšie informácie
+unsignedAddonsDisabled.learnMore.accesskey=a
 
 # LOCALIZATION NOTE (deveditionTheme.name): This should be nearly the brand name for aurora.
 # See browser/branding/aurora/locales/*/brand.properties
@@ -355,8 +370,8 @@
 geolocation.alwaysShareLocation.accesskey=a
 geolocation.neverShareLocation=Nikdy neprezrádzať polohu
 geolocation.neverShareLocation.accesskey=k
-geolocation.shareWithSite=Chcete stránke %S prezradiť, kde sa nachádzate?
-geolocation.shareWithFile=Chcete súboru %S prezradiť, kde sa nachádzate?
+geolocation.shareWithSite2=Chcete tejto stránke prezradiť, kde sa nachádzate?
+geolocation.shareWithFile2=Chcete tomuto súboru prezradiť, kde sa nachádzate?
 
 webNotifications.showForSession=Zobrazovať pre túto reláciu
 webNotifications.showForSession.accesskey=Z
@@ -364,7 +379,16 @@
 webNotifications.alwaysShow.accesskey=V
 webNotifications.neverShow=Vždy blokovať upozornenia
 webNotifications.neverShow.accesskey=b
-webNotifications.showFromSite=Chcete zobrazovať upozornenia z %S?
+webNotifications.showFromSite2=Chcete zobrazovať upozornenia z tejto stránky?
+
+# Push Notifications
+push.allowForSession=Povoliť pre reláciu
+push.allowForSession.accesskey=r
+push.alwaysAllow=Vždy povoliť notifikácie typu Push
+push.alwaysAllow.accesskey=V
+push.alwaysBlock=Vždy blokovať notifikácie typu Push
+push.alwaysBlock.accesskey=b
+push.enablePush2=Chcete povoliť notifikácie typu Push pre túto stránku?
 
 # Pointer lock UI
 
@@ -374,8 +398,8 @@
 pointerLock.alwaysAllow.accesskey=V
 pointerLock.neverAllow=Nikdy nepovoliť skrývanie
 pointerLock.neverAllow.accesskey=N
-pointerLock.title2=Chcete povoliť skrývanie kurzora na stránke %S?
-pointerLock.autoLock.title2=%S skryje kurzor.
+pointerLock.title3=Chcete povoliť skrývanie kurzora na tejto stránke?
+pointerLock.autoLock.title3=Táto stránka skryje kurzor.
 
 # Phishing/Malware Notification Bar.
 # LOCALIZATION NOTE (notAForgery, notAnAttack)
@@ -389,6 +413,7 @@
 safebrowsing.reportedAttackSite=Nahlásená škodlivá stránka!
 safebrowsing.notAnAttackButton.label=Toto nie je škodlivá stránka…
 safebrowsing.notAnAttackButton.accessKey=T
+safebrowsing.reportedUnwantedSite=Nahlásená ako stránka s nevyžiadaným softvérom!
 
 # Ctrl-Tab
 # LOCALIZATION NOTE (ctrlTab.listAllTabs.label): #1 represents the number
@@ -722,7 +747,7 @@
 # » is used as an indication that pressing this button progresses through the tour.
 readingList.promo.firstUse.readingList.moveToButton = Ďalej: jednoduché nájdenie »
 readingList.promo.firstUse.readerView.title = Zobrazenie Čítačka
-readingList.promo.firstUse.readerView.body = Odstráni všetko čo vás rozptyľuje, aby ste sa mohli sústrediť na to, čo si naozaj chcete prečítať.
+readingList.promo.firstUse.readerView.body = Odstráni všetko, čo vás rozptyľuje, aby ste sa mohli sústrediť na to, čo si naozaj chcete prečítať.
 # LOCALIZATION NOTE(readingList.promo.firstUse.readerView.moveToButton):
 # » is used as an indication that pressing this button progresses through the tour.
 readingList.promo.firstUse.readerView.moveToButton = Ďalej: jednoduché čítanie »
@@ -761,3 +786,38 @@
 #   https://support.mozilla.org/kb/how-do-i-set-up-firefox-sync
 # %S is syncBrandShortName
 readingList.prepopulatedArticles.supportSync = So službou %S máte prístup k svojmu Zoznamu na prečítanie nech sa kdekoľvek
+
+# LOCALIZATION NOTE (e10s.offerPopup.mainMessage
+#                    e10s.offerPopup.highlight1
+#                    e10s.offerPopup.highlight2
+#                    e10s.offerPopup.enableAndRestart.label
+#                    e10s.offerPopup.enableAndRestart.accesskey
+#                    e10s.offerPopup.noThanks.label
+#                    e10s.offerPopup.noThanks.accesskey
+#                    e10s.postActivationInfobar.message
+#                    e10s.postActivationInfobar.learnMore.label
+#                    e10s.postActivationInfobar.learnMore.accesskey
+#                    e10s.accessibilityNotice.mainMessage
+#                    e10s.accessibilityNotice.disableAndRestart.label
+#                    e10s.accessibilityNotice.disableAndRestart.accesskey
+#                    e10s.accessibilityNotice.dontDisable.label
+#                    e10s.accessibilityNotice.dontDisable.accesskey):
+# These strings are related to the messages we display to offer e10s (Multi-process) to users
+# on the pre-release channels. They won't be used in release but they will likely be used in
+# beta starting from version 41, so it's still useful to have these strings properly localized.
+# %S is brandShortName
+e10s.offerPopup.mainMessage = Podpora viacerých procesov prichádza už čoskoro do prehliadača %S. Využívať ju môžete začať už teraz a získate tak niektoré z jej výhod:
+e10s.offerPopup.highlight1 = Vylepšená odozva
+e10s.offerPopup.highlight2 = Menej zlyhaní
+e10s.offerPopup.enableAndRestart.label = Povoliť a reštartovať
+e10s.offerPopup.enableAndRestart.accesskey = v
+e10s.offerPopup.noThanks.label = Nie, ďakujem
+e10s.offerPopup.noThanks.accesskey = N
+e10s.postActivationInfobar.message = Teraz pomáhate testovať podporu viacerých procesov v prehliadači %S! Prosím, nahláste problémy, ak nejaké objavíte.
+e10s.postActivationInfobar.learnMore.label = Ďalšie informácie
+e10s.postActivationInfobar.learnMore.accesskey = a
+e10s.accessibilityNotice.mainMessage = Režim viacerých procesov zatiaľ nepodporuje funkcie zjednodušenia ovládania. Režim viacerých procesov bude vypnutý, ak %S teraz reštartujete. Chcete ho reštartovať?
+e10s.accessibilityNotice.disableAndRestart.label = Vypnúť a reštartovať
+e10s.accessibilityNotice.disableAndRestart.accesskey = V
+e10s.accessibilityNotice.dontDisable.label = Nevypínať
+e10s.accessibilityNotice.dontDisable.accesskey = N
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/customizableui/customizableWidgets.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/customizableui/customizableWidgets.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/customizableui/customizableWidgets.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/customizableui/customizableWidgets.properties	2015-05-25 20:51:18.000000000 +0000
@@ -33,10 +33,6 @@
 # LOCALIZATION NOTE(add-ons-button.tooltiptext3): %S is the keyboard shortcut
 add-ons-button.tooltiptext3 = Umožní spravovať vaše doplnky (%S)
 
-switch-to-metro-button2.label = Windows 8 Touch
-# LOCALIZATION NOTE(switch-to-metro-button2.tooltiptext): %S is the brand short name
-switch-to-metro-button2.tooltiptext = Spustí v prehliadači %S pre Windows 8 Touch
-
 preferences-button.label = Možnosti
 preferences-button.tooltiptext2 = Otvorí okno s nastaveniami
 preferences-button.tooltiptext.withshortcut = Otvorí okno s nastaveniami (%S)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/debugger.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/debugger.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/debugger.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/debugger.properties	2015-05-25 20:51:18.000000000 +0000
@@ -214,9 +214,9 @@
 # yet.
 loadingText=Načítava sa\u2026
 
-# LOCALIZATION NOTE (errorLoadingText): The text that is displayed in the debugger
+# LOCALIZATION NOTE (errorLoadingText2): The text that is displayed in the debugger
 # viewer when there is an error loading a file
-errorLoadingText=Chyba pri načítavaní zdrojového kódu:\n
+errorLoadingText2=Chyba pri načítavaní adresy: %S
 
 # LOCALIZATION NOTE (addWatchExpressionText): The text that is displayed in the
 # watch expressions list to add a new item.
@@ -320,4 +320,4 @@
 variablesViewUninitialized=(neinicializované)
 variablesViewMissingArgs=(nedostupné)
 
-evalGroupLabel=Vyhodnotené zdroje
+anonymousSourcesLabel=Anonymné zdroje
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/filterwidget.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/filterwidget.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/filterwidget.dtd	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/filterwidget.dtd	2015-05-25 20:51:18.000000000 +0000
@@ -0,0 +1,14 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- LOCALIZATION NOTE : FILE These strings are used in the CSS Filter Editor Widget
+   - which can be found in a tooltip that appears in the Rule View when clicking
+   - on a filter swatch displayed next to CSS declarations like 'filter: blur(2px)'. -->
+
+<!-- LOCALIZATION NOTE (filterListSelectPlaceholder): This string is used as
+   - a preview option in the list of possible filters <select> -->
+<!ENTITY filterListSelectPlaceholder "Zvoľte filter">
+
+<!-- LOCALIZATION NOTE (addNewFilterButton): This string is displayed on a button used to add new filters -->
+<!ENTITY addNewFilterButton "Pridať">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/filterwidget.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/filterwidget.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/filterwidget.properties	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/filterwidget.properties	2015-05-25 20:51:18.000000000 +0000
@@ -0,0 +1,33 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE These strings are used in the CSS Filter Editor Widget
+# which can be found in a tooltip that appears in the Rule View when clicking
+# on a filter swatch displayed next to CSS declarations like 'filter: blur(2px)'.
+
+# LOCALIZATION NOTE (emptyFilterList):
+# This string is displayed when filter's list is empty
+# (no filter specified / all removed)
+emptyFilterList=Nie je zvolený žiadny filter
+
+# LOCALIZATION NOTE (addUsingList):
+# This string is displayed under [emptyFilterList] when filter's
+# list is empty, guiding user to add a filter using the list below it
+addUsingList=Pridajte filter zo zoznamu nižšie
+
+# LOCALIZATION NOTE (dropShadowPlaceholder):
+# This string is used as a placeholder for drop-shadow's input
+# in the filter list (shown when <input> is empty)
+dropShadowPlaceholder=x y radius farba
+
+# LOCALIZATION NOTE (dragHandleTooltipText):
+# This string is used as a tooltip text (shown on mouse hover) on the
+# drag handles of filters which are used to re-order filters
+dragHandleTooltipText=Filter usporiadate posúvaním nahor alebo nadol
+
+# LOCALIZATION NOTE (labelDragTooltipText):
+# This string is used as a tooltip text (shown on mouse hover) on the
+# filters' labels which can be dragged left/right to increase/decrease
+# the filter's value (like photoshop)
+labelDragTooltipText=Hodnotu zväčšíte/zmenšíte posúvaním doľava/doprava
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/font-inspector.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/font-inspector.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/font-inspector.dtd	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/font-inspector.dtd	2015-05-25 20:51:18.000000000 +0000
@@ -10,3 +10,7 @@
 <!ENTITY usedAs "Použité ako: ">
 <!ENTITY system "systémové">
 <!ENTITY remote "vzdialené">
+
+<!-- LOCALIZATION NOTE (previewHint): This is the label shown as the
+     placeholder in font inspector preview text box. -->
+<!ENTITY previewHint "Ukážka textu">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/gclicommands.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/gclicommands.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/gclicommands.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/gclicommands.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,1539 +0,0 @@
-  # This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# LOCALIZATION NOTE These strings are used inside Web Console commands.
-# The Web Console command line is available from the Web Developer sub-menu
-# -> 'Web Console'.
-#
-# The correct localization of this file might be to keep it in
-# English, or another language commonly spoken among web developers.
-# You want to make that choice consistent across the developer tools.
-# A good criteria is the language in which you'd find the best
-# documentation on web development on the web.
-
-# LOCALIZATION NOTE (helpDesc) A very short string used to describe the
-# function of the help command.
-helpDesc=Pomocník pre dostupné príkazy
-
-# LOCALIZATION NOTE (helpAvailable) Used in the output of the help command to
-# explain the contents of the command help table.
-helpAvailable=Dostupné príkazy
-
-# LOCALIZATION NOTE (notAvailableInE10S) Used in the output of any command that
-# is not compatible with multiprocess mode (E10S).
-notAvailableInE10S=Príkaz '%1$S' nie je dostupný v režime viacerých procesov (E10S)
-
-# LOCALIZATION NOTE (consoleDesc) A very short string used to describe the
-# function of the console command.
-consoleDesc=Príkazy na ovládanie konzoly
-
-# LOCALIZATION NOTE (consoleManual) A longer description describing the
-# set of commands that control the console.
-consoleManual=Filtrovanie, vymazanie a zatvorenie webovej konzoly
-
-# LOCALIZATION NOTE (consoleclearDesc) A very short string used to describe the
-# function of the 'console clear' command.
-consoleclearDesc=Vymaže konzolu
-
-# LOCALIZATION NOTE (screenshotDesc) A very short description of the
-# 'screenshot' command. See screenshotManual for a fuller description of what
-# it does. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible.
-screenshotDesc=Uloží snímku stránky
-
-# LOCALIZATION NOTE (screenshotManual) A fuller description of the 'screenshot'
-# command, displayed when the user asks for help on what it does.
-screenshotManual=Uloží snímku celého viditeľného okna ako obrázok PNG (voliteľne s oneskorením)
-
-# LOCALIZATION NOTE (screenshotFilenameDesc) A very short string to describe
-# the 'filename' parameter to the 'screenshot' command, which is displayed in
-# a dialog when the user is using this command.
-screenshotFilenameDesc=Názov cieľového súboru
-
-# LOCALIZATION NOTE (screenshotFilenameManual) A fuller description of the
-# 'filename' parameter to the 'screenshot' command, displayed when the user
-# asks for help on what it does.
-screenshotFilenameManual=Názov súboru (mal by mať príponu '.png'), do ktorého sa obrázok uloží.
-
-# LOCALIZATION NOTE (screenshotClipboardDesc) A very short string to describe
-# the 'clipboard' parameter to the 'screenshot' command, which is displayed in
-# a dialog when the user is using this command.
-screenshotClipboardDesc=Kopírovať snímku do schránky? (true/false)
-
-# LOCALIZATION NOTE (screenshotClipboardManual) A fuller description of the
-# 'clipboard' parameter to the 'screenshot' command, displayed when the user
-# asks for help on what it does.
-screenshotClipboardManual=Zadaním hodnoty true sa snímka skopíruje do schránky namiesto do súboru.
-
-# LOCALIZATION NOTE (screenshotChromeDesc2) A very short string to describe
-# the 'chrome' parameter to the 'screenshot' command, which is displayed in
-# a dialog when the user is using this command.
-# The argument (%1$S) is the browser name.
-screenshotChromeDesc2=Zachytiť okno prehliadača %1$S? (true/false)
-
-# LOCALIZATION NOTE (screenshotChromeManual2) A fuller description of the
-# 'chrome' parameter to the 'screenshot' command, displayed when the user
-# asks for help on what it does.
-# The argument (%1$S) is the browser name.
-screenshotChromeManual2=Zadaním hodnoty true sa zosníma celé okno prehliadača %1$S, nie iba obsah webovej stránky.
-
-# LOCALIZATION NOTE (screenshotGroupOptions) A label for the optional options of
-# the screenshot command.
-screenshotGroupOptions=Možnosti
-
-# LOCALIZATION NOTE (screenshotDelayDesc) A very short string to describe
-# the 'delay' parameter to the 'screenshot' command, which is displayed in
-# a dialog when the user is using this command.
-screenshotDelayDesc=Oneskorenie (v sekundách)
-
-# LOCALIZATION NOTE (screenshotDelayManual) A fuller description of the
-# 'delay' parameter to the 'screenshot' command, displayed when the user
-# asks for help on what it does.
-screenshotDelayManual=Čas (v sekundách) po zhotovenie snímky
-
-# LOCALIZATION NOTE (screenshotFullscreenDesc) A very short string to describe
-# the 'fullscreen' parameter to the 'screenshot' command, which is displayed in
-# a dialog when the user is using this command.
-screenshotFullPageDesc=Celú webovú stránku? (true/false)
-
-# LOCALIZATION NOTE (screenshotFullscreenManual) A fuller description of the
-# 'fullscreen' parameter to the 'screenshot' command, displayed when the user
-# asks for help on what it does.
-screenshotFullPageManual=Nastavte na true, ak má snímok obsahovať aj časti webovej stránky, ktoré aktuálne nie sú viditeľné.
-
-# LOCALIZATION NOTE (screenshotSelectorChromeConflict) Exception thrown when user
-# tries to use 'selector' option along with 'chrome' option of the screenshot
-# command. Refer: https://bugzilla.mozilla.org/show_bug.cgi?id=659268#c7
-screenshotSelectorChromeConflict=Použitie selektora nie je povolené, ak je voľba chrome nastavená na hodnotu true
-
-# LOCALIZATION NOTE (screenshotGeneratedFilename) The auto generated filename
-# when no file name is provided. The first argument (%1$S) is the date string
-# in yyyy-mm-dd format and the second argument (%2$S) is the time string
-# in HH.MM.SS format. Please don't add the extension here.
-screenshotGeneratedFilename=Snimka_%1$S_o_%2$S
-
-# LOCALIZATION NOTE (screenshotErrorSavingToFile) Text displayed to user upon
-# encountering error while saving the screenshot to the file specified.
-screenshotErrorSavingToFile=Chyba pri ukladaní do
-
-# LOCALIZATION NOTE (screenshotSavedToFile) Text displayed to user when the
-# screenshot is successfully saved to the file specified.
-screenshotSavedToFile=Uložené do
-
-# LOCALIZATION NOTE (screenshotErrorCopying) Text displayed to user upon
-# encountering error while copying the screenshot to clipboard.
-screenshotErrorCopying=Počas kopírovania do schránky sa vyskytla chyba.
-
-# LOCALIZATION NOTE (screenshotCopied) Text displayed to user when the
-# screenshot is successfully copied to the clipboard.
-screenshotCopied=Skopírované do schránky.
-
-# LOCALIZATION NOTE (screenshotTooltip) Text displayed as tooltip for screenshot button in devtools ToolBox.
-screenshotTooltip=Vytvorí snímku celej stránky
-
-# LOCALIZATION NOTE (highlightDesc) A very short description of the
-# 'highlight' command. See highlightManual for a fuller description of what
-# it does. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible.
-highlightDesc=Zvýrazní uzly
-
-# LOCALIZATION NOTE (highlightManual) A fuller description of the 'highlight'
-# command, displayed when the user asks for help on what it does.
-highlightManual=Zvýrazní uzly, ktoré na stránke zodpovedajú selektoru
-
-# LOCALIZATION NOTE (highlightSelectorDesc) A very short string to describe
-# the 'selector' parameter to the 'highlight' command, which is displayed in
-# a dialog when the user is using this command.
-highlightSelectorDesc=Selektor CSS
-
-# LOCALIZATION NOTE (highlightSelectorManual) A fuller description of the
-# 'selector' parameter to the 'highlight' command, displayed when the user
-# asks for help on what it does.
-highlightSelectorManual=Selektor CSS použitý na vyhľadanie uzlov na stránke
-
-# LOCALIZATION NOTE (highlightOptionsDesc) The title of a set of options to
-# the 'highlight' command, displayed as a heading to the list of option.
-highlightOptionsDesc=Možnosti
-
-# LOCALIZATION NOTE (highlightHideGuidesDesc) A very short string to describe
-# the 'hideguides' option parameter to the 'highlight' command, which is
-# displayed in a dialog when the user is using this command.
-highlightHideGuidesDesc=Skryje okraje
-
-# LOCALIZATION NOTE (highlightHideGuidesManual) A fuller description of the
-# 'hideguides' option parameter to the 'highlight' command, displayed when the
-# user asks for help on what it does.
-highlightHideGuidesManual=Skryje okraje okolo zvýrazneného uzla
-
-# LOCALIZATION NOTE (highlightShowInfoBarDesc) A very short string to describe
-# the 'showinfobar' option parameter to the 'highlight' command, which is
-# displayed in a dialog when the user is using this command.
-highlightShowInfoBarDesc=Zobrazí infopanel uzla
-
-# LOCALIZATION NOTE (highlightShowInfoBarManual) A fuller description of the
-# 'showinfobar' option parameter to the 'highlight' command, displayed when the
-# user asks for help on what it does.
-highlightShowInfoBarManual=Zobrazí infopanel nad zvýrazneným uzlom (infopanel zobrazuje názov značky, atribúty a rozmery)
-
-# LOCALIZATION NOTE (highlightShowAllDesc) A very short string to describe
-# the 'showall' option parameter to the 'highlight' command, which is
-# displayed in a dialog when the user is using this command.
-highlightShowAllDesc=Zobrazí všetky zhody
-
-# LOCALIZATION NOTE (highlightShowAllManual) A fuller description of the
-# 'showall' option parameter to the 'highlight' command, displayed when the
-# user asks for help on what it does.
-highlightShowAllManual=Ak selektoru zodpovedá príliš veľa uzlov, kvôli zabráneniu spomalenia stránky sa zobrazí len prvých 100 uzlov. Použitím tejto voľby zobrazíte všetky uzly
-
-# LOCALIZATION NOTE (highlightRegionDesc) A very short string to describe the
-# 'region' option parameter to the 'highlight' command, which is displayed in a
-# dialog when the user is using this command.
-highlightRegionDesc=Oblasť box modelu
-
-# LOCALIZATION NOTE (highlightRegionManual) A fuller description of the 'region'
-# option parameter to the 'highlight' command, displayed when the user asks for
-# help on what it does.
-highlightRegionManual=Ktorá oblasť box modelu by mala byť zvýraznená: 'content', 'padding', 'border' alebo 'margin'
-
-# LOCALIZATION NOTE (highlightFillDesc) A very short string to describe the
-# 'fill' option parameter to the 'highlight' command, which is displayed in a
-# dialog when the user is using this command.
-highlightFillDesc=Štýl výplne
-
-# LOCALIZATION NOTE (highlightFillManual) A fuller description of the 'fill'
-# option parameter to the 'highlight' command, displayed when the user asks for
-# help on what it does.
-highlightFillManual=Prepíše predvolený štýl výplne oblasti vlastnou farbou
-
-# LOCALIZATION NOTE (highlightKeepDesc) A very short string to describe the
-# 'keep' option parameter to the 'highlight' command, which is displayed in a
-# dialog when the user is using this command.
-highlightKeepDesc=Ponechá existujúce zvýraznenia
-
-# LOCALIZATION NOTE (highlightKeepManual) A fuller description of the 'keep'
-# option parameter to the 'highlight' command, displayed when the user asks for
-# help on what it does.
-highlightKeepManual=Predvolene sú pri spustení príkazu existujúce zvýraznenia skryté. Správanie je možné zmeniť touto voľbou
-
-# LOCALIZATION NOTE (highlightOutputConfirm) A confirmation message for the
-# 'highlight' command, displayed to the user once the command has been entered,
-# informing the user how many nodes have been highlighted successfully and how
-# to turn highlighting off
-highlightOutputConfirm2=%1$S zvýraznený uzol;%1$S zvýraznené uzly;%1$S zvýraznených uzlov
-
-# LOCALIZATION NOTE (highlightOutputMaxReached) A confirmation message for the
-# 'highlight' command, displayed to the user once the command has been entered,
-# informing the user how many nodes have been highlighted successfully and that
-# some nodes could not be highlighted due to the maximum number of nodes being
-# reached, and how to turn highlighting off
-highlightOutputMaxReached=Zodpovedajúcich uzlov: %1$S, z toho zvýraznených: %2$S. Použitím '--showall' zobrazíte všetky uzly
-
-# LOCALIZATION NOTE (unhighlightDesc) A very short description of the
-# 'unhighlight' command. See unhighlightManual for a fuller description of what
-# it does. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible.
-unhighlightDesc=Zruší zvýraznenie všetkých uzlov
-
-# LOCALIZATION NOTE (unhighlightManual) A fuller description of the 'unhighlight'
-# command, displayed when the user asks for help on what it does.
-unhighlightManual=Zruší zvýraznenie všetkých predtým pomocou príkazu 'highlight' zvýrazených uzlov
-
-# LOCALIZATION NOTE (restartBrowserDesc) A very short description of the
-# 'restart' command. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible.
-# The argument (%1$S) is the browser name.
-restartBrowserDesc=Reštartuje %1$S
-
-# LOCALIZATION NOTE (restartBrowserNocacheDesc) A very short string to
-# describe the 'nocache' parameter to the 'restart' command, which is
-# displayed in a dialog when the user is using this command.
-restartBrowserNocacheDesc=Zakáže načítavanie obsahu z vyrovnávacej pamäte až do reštartu prehliadača
-
-# LOCALIZATION NOTE (restartBrowserRequestCancelled) A string displayed to the
-# user when a scheduled restart has been aborted by the user.
-restartBrowserRequestCancelled=Požiadavka na reštartovanie bola používateľom zrušená.
-
-# LOCALIZATION NOTE (restartBrowserRestarting) A string displayed to the
-# user when a restart has been initiated without a delay.
-# The argument (%1$S) is the browser name.
-restartBrowserRestarting=%1$S sa reštartuje…
-
-# LOCALIZATION NOTE (inspectDesc) A very short description of the 'inspect'
-# command. See inspectManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-inspectDesc=Preskúma uzol
-
-# LOCALIZATION NOTE (inspectManual) A fuller description of the 'inspect'
-# command, displayed when the user asks for help on what it does.
-inspectManual=Preskúma rozmery a vlastnosti prvku použitím selektora CSS na otvorenie funkcie DOM highlighter
-
-# LOCALIZATION NOTE (inspectNodeDesc) A very short string to describe the
-# 'node' parameter to the 'inspect' command, which is displayed in a dialog
-# when the user is using this command.
-inspectNodeDesc=Selektor CSS
-
-# LOCALIZATION NOTE (inspectNodeManual) A fuller description of the 'node'
-# parameter to the 'inspect' command, displayed when the user asks for help
-# on what it does.
-inspectNodeManual=Selektor CSS pre metódu document.querySelector, ktorá identifikuje daný prvok
-
-# LOCALIZATION NOTE (eyedropperDesc) A very short description of the 'eyedropper'
-# command. See eyedropperManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-eyedropperDesc=Získa farbu z webovej stránky
-
-# LOCALIZATION NOTE (eyedropperManual) A fuller description of the 'eyedropper'
-# command, displayed when the user asks for help on what it does.
-eyedropperManual=Otvorí panel, ktorý zväčší oblasť stránky s cieľom preskúmať body a skopírovať kódy farieb
-
-# LOCALIZATION NOTE (eyedropperTooltip) A string displayed as the
-# tooltip of button in devtools toolbox which toggles the Eyedropper tool.
-eyedropperTooltip=Získať farbu z webovej stránky
-
-# LOCALIZATION NOTE (tiltDesc) A very short description of the 'tilt'
-# command. See tiltManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-tiltDesc=Vizualizuje webovú stránku v 3D
-
-# LOCALIZATION NOTE (tiltManual) A fuller description of the 'tilt'
-# command, displayed when the user asks for help on what it does.
-tiltManual=Umožňuje preskúmať vzájomné vzťahy medzi rôznymi súčasťami webovej stránky a ich potomkami v 3D prostredí
-
-# LOCALIZATION NOTE (tiltOpenDesc) A very short description of the 'tilt inspect'
-# command. See tiltOpenManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-tiltOpenDesc=Otvorí 3D zobrazenie Prieskumníka
-
-# LOCALIZATION NOTE (tiltOpenManual) A fuller description of the 'tilt translate'
-# command, displayed when the user asks for help on what it does.
-tiltOpenManual=Spustí 3D zobrazenie Prieskumníka a voliteľne zvýrazní uzol použitím selektora CSS
-
-# LOCALIZATION NOTE (tiltToggleTooltip) A string displayed as the
-# tooltip of button in devtools toolbox which toggles Tilt 3D View.
-tiltToggleTooltip=3D zobrazenie
-
-# LOCALIZATION NOTE (tiltTranslateDesc) A very short description of the 'tilt translate'
-# command. See tiltTranslateManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-tiltTranslateDesc=Posunie sieť webovej stránky
-
-# LOCALIZATION NOTE (tiltTranslateManual) A fuller description of the 'tilt translate'
-# command, displayed when the user asks for help on what it does.
-tiltTranslateManual=Posunie sieť webovej stránky o zadanú hodnotu v danom smere
-
-# LOCALIZATION NOTE (tiltTranslateXDesc) A very short string to describe the
-# 'x' parameter to the 'tilt translate' command, which is displayed in a dialog
-# when the user is using this command.
-tiltTranslateXDesc=X (bodov)
-
-# LOCALIZATION NOTE (tiltTranslateXManual) A fuller description of the 'x'
-# parameter to the 'translate' command, displayed when the user asks for help
-# on what it does.
-tiltTranslateXManual=Hodnota v bodoch, o ktorú sa sieť webovej stránky posunie po osi X
-
-# LOCALIZATION NOTE (tiltTranslateYDesc) A very short string to describe the
-# 'y' parameter to the 'tilt translate' command, which is displayed in a dialog
-# when the user is using this command.
-tiltTranslateYDesc=Y (bodov)
-
-# LOCALIZATION NOTE (tiltTranslateYManual) A fuller description of the 'y'
-# parameter to the 'translate' command, displayed when the user asks for help
-# on what it does.
-tiltTranslateYManual=Hodnota v bodoch, o ktorú sa sieť webovej stránky posunie po osi Y
-
-# LOCALIZATION NOTE (tiltRotateDesc) A very short description of the 'tilt rotate'
-# command. See tiltRotateManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-tiltRotateDesc=Otočí sieť webovej stránky
-
-# LOCALIZATION NOTE (tiltRotateManual) A fuller description of the 'tilt rotate'
-# command, displayed when the user asks for help on what it does.
-tiltRotateManual=Otočí sieť webovej stránky o zadaný uhol v danom smere
-
-# LOCALIZATION NOTE (tiltRotateXDesc) A very short string to describe the
-# 'x' parameter to the 'tilt rotate' command, which is displayed in a dialog
-# when the user is using this command.
-tiltRotateXDesc=X (stupňov)
-
-# LOCALIZATION NOTE (tiltRotateXManual) A fuller description of the 'x'
-# parameter to the 'rotate' command, displayed when the user asks for help
-# on what it does.
-tiltRotateXManual=Hodnota v stupňoch, o ktorú sa sieť webovej stránky otočí okolo osi X
-
-# LOCALIZATION NOTE (tiltRotateYDesc) A very short string to describe the
-# 'y' parameter to the 'tilt rotate' command, which is displayed in a dialog
-# when the user is using this command.
-tiltRotateYDesc=Y (stupňov)
-
-# LOCALIZATION NOTE (tiltRotateYManual) A fuller description of the 'y'
-# parameter to the 'rotate' command, displayed when the user asks for help
-# on what it does.
-tiltRotateYManual=Hodnota v stupňoch, o ktorú sa sieť webovej stránky otočí okolo osi Y
-
-# LOCALIZATION NOTE (tiltRotateZDesc) A very short string to describe the
-# 'z' parameter to the 'tilt rotate' command, which is displayed in a dialog
-# when the user is using this command.
-tiltRotateZDesc=Z (stupňov)
-
-# LOCALIZATION NOTE (tiltRotateZManual) A fuller description of the 'z'
-# parameter to the 'rotate' command, displayed when the user asks for help
-# on what it does.
-tiltRotateZManual=Hodnota v stupňoch, o ktorú sa sieť webovej stránky otočí okolo osi Z
-
-# LOCALIZATION NOTE (tiltZoomDesc) A very short description of the 'tilt zoom'
-# command. See tiltZoomManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-tiltZoomDesc=Priblíži alebo oddiali sieť webovej stránky
-
-# LOCALIZATION NOTE (tiltZoomManual) A fuller description of the 'tilt zoom'
-# command, displayed when the user asks for help on what it does.
-tiltZoomManual=Posunie sieť webovej stránky okolo osi Z
-
-# LOCALIZATION NOTE (tiltZoomAmountDesc) A very short string to describe the
-# 'zoom' parameter to the 'tilt zoom' command, which is displayed in a dialog
-# when the user is using this command.
-tiltZoomAmountDesc=Lupa (bodov)
-
-# LOCALIZATION NOTE (tiltZoomAmmuntManual) A fuller description of the 'zoom'
-# parameter to the 'zoom' command, displayed when the user asks for help
-# on what it does.
-tiltZoomAmountManual=Hodnota v bodoch, o ktorú sa sieť webovej stránky posunie po osi Z
-
-# LOCALIZATION NOTE (tiltResetDesc) A very short description of the 'tilt reset'
-# command. See tiltResetManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-tiltResetDesc=Vynuluje posun, otočenie a priblíženie
-
-# LOCALIZATION NOTE (tiltResetManual) A fuller description of the 'tilt reset'
-# command, displayed when the user asks for help on what it does.
-tiltResetManual=Nastaví predvolené hodnoty posunu, otočenia a priblíženia siete webovej stránky
-
-# LOCALIZATION NOTE (tiltCloseDesc) A very short description of the 'tilt close'
-# command. See tiltCloseManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-tiltCloseDesc=Zavrie vizualizáciu, ak je otvorená
-
-# LOCALIZATION NOTE (tiltCloseManual) A fuller description of the 'tilt close'
-# command, displayed when the user asks for help on what it does.
-tiltCloseManual=Zavrie vizualizáciu a prepne sa späť do okna Prieskumníka
-
-# LOCALIZATION NOTE (debuggerClosed) Used in the output of several commands
-# to explain that the debugger must be opened first.
-debuggerClosed=Pred použitím tohto príkazu musí byť otvorené okno ladenia.
-
-# LOCALIZATION NOTE (debuggerStopped) Used in the output of several commands
-# to explain that the debugger must be opened first before setting breakpoints.
-debuggerStopped=Pred nastavením bodu prerušenia musí byť otvorené okno ladenia
-
-# LOCALIZATION NOTE (breakDesc) A very short string used to describe the
-# function of the break command.
-breakDesc=Správa bodov prerušenia
-
-# LOCALIZATION NOTE (breakManual) A longer description describing the
-# set of commands that control breakpoints.
-breakManual=Príkazy na zobrazenie, pridanie a odstránenie bodov prerušenia
-
-# LOCALIZATION NOTE (breaklistDesc) A very short string used to describe the
-# function of the 'break list' command.
-breaklistDesc=Zobrazí známe body prerušení
-
-# LOCALIZATION NOTE (breaklistNone) Used in the output of the 'break list'
-# command to explain that the list is empty.
-breaklistNone=Nie sú nastavené žiadne body prerušenia
-
-# LOCALIZATION NOTE (breaklistOutRemove) A title used in the output from the
-# 'break list' command on a button which can be used to remove breakpoints
-breaklistOutRemove=Odstrániť
-
-# LOCALIZATION NOTE (breakaddAdded) Used in the output of the 'break add'
-# command to explain that a breakpoint was added.
-breakaddAdded=Bod prerušenia pridaný
-
-# LOCALIZATION NOTE (breakaddFailed) Used in the output of the 'break add'
-# command to explain that a breakpoint could not be added.
-breakaddFailed=Nebolo možné nastaviť bod prerušenia: %S
-
-# LOCALIZATION NOTE (breakaddDesc) A very short string used to describe the
-# function of the 'break add' command.
-breakaddDesc=Pridá bod prerušenia
-
-# LOCALIZATION NOTE (breakaddManual) A longer description describing the
-# set of commands that are responsible for adding breakpoints.
-breakaddManual=Podporované typy bodov prerušenia: riadok
-
-# LOCALIZATION NOTE (breakaddlineDesc) A very short string used to describe the
-# function of the 'break add line' command.
-breakaddlineDesc=Pridá bod prerušenia na riadok
-
-# LOCALIZATION NOTE (breakaddlineFileDesc) A very short string used to describe
-# the function of the file parameter in the 'break add line' command.
-breakaddlineFileDesc=Adresa súboru JS
-
-# LOCALIZATION NOTE (breakaddlineLineDesc) A very short string used to describe
-# the function of the line parameter in the 'break add line' command.
-breakaddlineLineDesc=Číslo riadku
-
-# LOCALIZATION NOTE (breakdelDesc) A very short string used to describe the
-# function of the 'break del' command.
-breakdelDesc=Odstráni bod prerušenia
-
-# LOCALIZATION NOTE (breakdelBreakidDesc) A very short string used to describe
-# the function of the index parameter in the 'break del' command.
-breakdelBreakidDesc=Index bodu prerušenia
-
-# LOCALIZATION NOTE (breakdelRemoved) Used in the output of the 'break del'
-# command to explain that a breakpoint was removed.
-breakdelRemoved=Bod prerušenia odstránený
-
-# LOCALIZATION NOTE (dbgDesc) A very short string used to describe the
-# function of the dbg command.
-dbgDesc=Správa ladenia
-
-# LOCALIZATION NOTE (dbgManual) A longer description describing the
-# set of commands that control the debugger.
-dbgManual=Príkazy na prerušenie alebo opätovné spustenie hlavného vlákna či krokovanie riadkov kódu
-
-# LOCALIZATION NOTE (dbgOpen) A very short string used to describe the function
-# of the dbg open command.
-dbgOpen=Otvorí okno ladenia
-
-# LOCALIZATION NOTE (dbgClose) A very short string used to describe the function
-# of the dbg close command.
-dbgClose=Zavrie okno ladenia
-
-# LOCALIZATION NOTE (dbgInterrupt) A very short string used to describe the
-# function of the dbg interrupt command.
-dbgInterrupt=Pozastaví hlavné vlákno
-
-# LOCALIZATION NOTE (dbgContinue) A very short string used to describe the
-# function of the dbg continue command.
-dbgContinue=Opätovne spustí hlavné vlákno a pokračuje vo vykonávaní po ďalší bod prerušenia alebo ukončenie skriptu.
-
-# LOCALIZATION NOTE (dbgStepDesc) A very short string used to describe the
-# function of the dbg step command.
-dbgStepDesc=Správa krokovania
-
-# LOCALIZATION NOTE (dbgStepManual) A longer description describing the
-# set of commands that control stepping.
-dbgStepManual=Príkazy na krokovanie riadkov kódu
-
-# LOCALIZATION NOTE (dbgStepOverDesc) A very short string used to describe the
-# function of the dbg step over command.
-dbgStepOverDesc=Vykoná aktuálny príkaz a zastaví na ďalšom príkaze. Ak je aktuálnym príkazom volanie funkcie, ladenie vykoná celú funkciu a zastaví na ďalšom príkaze po volaní funkcie
-
-# LOCALIZATION NOTE (dbgStepInDesc) A very short string used to describe the
-# function of the dbg step in command.
-dbgStepInDesc=Vykoná aktuálny príkaz a zastaví na ďalšom príkaze. Ak je aktuálnym príkazom volanie funkcie, ladenie vkročí do funkcie, inak zastaví na ďalšom príkaze
-
-# LOCALIZATION NOTE (dbgStepOutDesc) A very short string used to describe the
-# function of the dbg step out command.
-dbgStepOutDesc=Vyjde z aktuálnej funkcie a o úroveň vyššie, ak je funkcia vnorená. Ak sa potom nachádza v hlavnom tele, skript sa vykoná do konca alebo po ďalší bod prerušenia. Príkazy medzi nimi sú vykonané, ale nie sú krokované
-
-# LOCALIZATION NOTE (dbgListSourcesDesc) A very short string used to describe the
-# function of the dbg list command.
-dbgListSourcesDesc=Zobrazí zoznam zdrojových adries URL načítaných v ladení
-
-# LOCALIZATION NOTE (dbgBlackBoxDesc) A very short string used to describe the
-# function of the 'dbg blackbox' command.
-dbgBlackBoxDesc=Pridá zdroje v ladiacom nástroji do black boxu
-
-# LOCALIZATION NOTE (dbgBlackBoxSourceDesc) A very short string used to describe the
-# 'source' parameter to the 'dbg blackbox' command.
-dbgBlackBoxSourceDesc=Zdroj, ktorý bude pridaný do black boxu
-
-# LOCALIZATION NOTE (dbgBlackBoxGlobDesc) A very short string used to describe the
-# 'glob' parameter to the 'dbg blackbox' command.
-dbgBlackBoxGlobDesc=Pridá do black boxu všetky zdroje, ktoré sa zhodujú s výrazom (napríklad "*.min.js")
-
-# LOCALIZATION NOTE (dbgBlackBoxInvertDesc) A very short string used to describe the
-# 'invert' parameter to the 'dbg blackbox' command.
-dbgBlackBoxInvertDesc=Invertuje výber zdrojov, to znamená, že do black box pridá zdroj, ktorý nie je uvedený alebo sa nezhoduje so zadaným výrazom.
-    
-# LOCALIZATION NOTE (dbgBlackBoxEmptyDesc) A very short string used to let the
-# user know that no sources were black boxed.
-dbgBlackBoxEmptyDesc=(v black boxe nie sú žiadne zdroje)
-
-# LOCALIZATION NOTE (dbgBlackBoxNonEmptyDesc) A very short string used to let the
-# user know which sources were black boxed.
-dbgBlackBoxNonEmptyDesc=Nasledovné zdroje boli pridané do black boxu:
-
-# LOCALIZATION NOTE (dbgBlackBoxErrorDesc) A very short string used to let the
-# user know there was an error black boxing a source (whose url follows this
-# text).
-dbgBlackBoxErrorDesc=Chyba black boxu:
-
-# LOCALIZATION NOTE (dbgUnBlackBoxDesc) A very short string used to describe the
-# function of the 'dbg unblackbox' command.
-dbgUnBlackBoxDesc=Zastaví black boxing zdrojov v nástroji ladenia
-
-# LOCALIZATION NOTE (dbgUnBlackBoxSourceDesc) A very short string used to describe the
-# 'source' parameter to the 'dbg unblackbox' command.
-dbgUnBlackBoxSourceDesc=Zdroj, pre ktorý bude zastavený black boxing
-
-# LOCALIZATION NOTE (dbgUnBlackBoxGlobDesc) A very short string used to describe the
-# 'glob' parameter to the 'dbg blackbox' command.
-dbgUnBlackBoxGlobDesc=Zastaví black boxing pre všetky zdroje, ktoré sa zhodujú s výrazom (napríklad "*.min.js")
-
-# LOCALIZATION NOTE (dbgUnBlackBoxEmptyDesc) A very short string used to let the
-# user know that we did not stop black boxing any sources.
-dbgUnBlackBoxEmptyDesc=(black boxing nebol zastavený pre žiadne zdroje)
-
-# LOCALIZATION NOTE (dbgUnBlackBoxNonEmptyDesc) A very short string used to let the
-# user know which sources we stopped black boxing.
-dbgUnBlackBoxNonEmptyDesc=Black boxing zastavený pre nasledovné zdroje:
-
-# LOCALIZATION NOTE (dbgUnBlackBoxErrorDesc) A very short string used to let the
-# user know there was an error black boxing a source (whose url follows this
-# text).
-dbgUnBlackBoxErrorDesc=Chyba pri zastavovaní black boxing:
-
-# LOCALIZATION NOTE (dbgUnBlackBoxInvertDesc) A very short string used to describe the
-# 'invert' parameter to the 'dbg unblackbox' command.
-dbgUnBlackBoxInvertDesc=Invertuje výber zdrojov, to znamená, že zastaví black boxing pre každý zdroj, ktorý nie je uvedený alebo sa nezhoduje so zadaným výrazom.
-
-# LOCALIZATION NOTE (consolecloseDesc) A very short description of the
-# 'console close' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-consolecloseDesc=Zavrie konzolu
-
-# LOCALIZATION NOTE (consoleopenDesc) A very short description of the
-# 'console open' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-consoleopenDesc=Otvorí konzolu
-
-# LOCALIZATION NOTE (editDesc) A very short description of the 'edit'
-# command. See editManual2 for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-editDesc=Upraví zdroj stránky
-
-# LOCALIZATION NOTE (editManual2) A fuller description of the 'edit' command,
-# displayed when the user asks for help on what it does.
-editManual2=Upraví jeden zo zdrojov, ktorý je súčasťou tejto stránky
-
-# LOCALIZATION NOTE (editResourceDesc) A very short string to describe the
-# 'resource' parameter to the 'edit' command, which is displayed in a dialog
-# when the user is using this command.
-editResourceDesc=Adresa na úpravy
-
-# LOCALIZATION NOTE (editLineToJumpToDesc) A very short string to describe the
-# 'line' parameter to the 'edit' command, which is displayed in a dialog
-# when the user is using this command.
-editLineToJumpToDesc=Riadok, na ktorý prejsť
-
-# LOCALIZATION NOTE (resizePageDesc) A very short string to describe the
-# 'resizepage' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-resizePageDesc=Zmení veľkosť stránky
-
-# LOCALIZATION NOTE (resizePageArgWidthDesc) A very short string to describe the
-# 'width' parameter to the 'resizepage' command, which is displayed in a dialog
-# when the user is using this command.
-resizePageArgWidthDesc=Šírka v bodoch
-
-# LOCALIZATION NOTE (resizePageArgWidthDesc) A very short string to describe the
-# 'height' parameter to the 'resizepage' command, which is displayed in a dialog
-# when the user is using this command.
-resizePageArgHeightDesc=Výška v bodoch
-
-# LOCALIZATION NOTE (resizeModeOnDesc) A very short string to describe the
-# 'resizeon ' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-resizeModeOnDesc=Prejde do režimu Responsive Design
-
-# LOCALIZATION NOTE (resizeModeOffDesc) A very short string to describe the
-# 'resize off' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-resizeModeOffDesc=Ukončí režim Responsive Design
-
-# LOCALIZATION NOTE (resizeModeToggleDesc) A very short string to describe the
-# 'resize toggle' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-resizeModeToggleDesc=Prepne režim Responsive Design
-
-# LOCALIZATION NOTE (resizeModeToggleTooltip) A string displayed as the
-# tooltip of button in devtools toolbox which toggles Responsive Design Mode.
-resizeModeToggleTooltip=Režim Responsive Design
-
-# LOCALIZATION NOTE (resizeModeToDesc) A very short string to describe the
-# 'resize to' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-resizeModeToDesc=Upraví veľkosť stránky
-
-# LOCALIZATION NOTE (resizeModeDesc) A very short string to describe the
-# 'resize' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-resizeModeDesc=Ovláda režim Responsive Design
-
-# LOCALIZATION NOTE (resizeModeManual2) A fuller description of the 'resize'
-# command, displayed when the user asks for help on what it does.
-# The argument (%1$S) is the browser name.
-resizeModeManual2=Stránky v režime Responsive design reagujú na svoje prostredie, takže vyzerajú dobre na mobilnom zariadení, širokouhlom televíznom prijímači a na všetkých zariadeniach medzi nimi. Režim Responsive Design umožňuje jednoducho otestovať rôzne rozlíšenia stránky priamo v prehliadači %1$S bez nutnosti meniť rozlíšenie celého prehliadača.
-
-# LOCALIZATION NOTE (cmdDesc) A very short description of the 'cmd'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-cmdDesc=Narábanie s príkazmi
-
-# LOCALIZATION NOTE (cmdRefreshDesc) A very short description of the 'cmd refresh'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-cmdRefreshDesc=Opätovne načíta obsah adresára mozcmd
-
-# LOCALIZATION NOTE (cmdStatus3) When the we load new commands from mozcmd
-# directory, we report where we loaded from using %1$S.
-cmdStatus3=Načítané príkazy z priečinka '%1$S'
-
-# LOCALIZATION NOTE (cmdSetdirDesc)  A very short description of the 'cmd setdir'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-cmdSetdirDesc=Nastaví priečinok mozcmd
-
-# LOCALIZATION NOTE (cmdSetdirManual2) A fuller description of the 'cmd setdir'
-cmdSetdirManual2=Priečinok 'mozcmd' je jednoduchá cesta na vytvorenie vlastných príkazov. Podrobnejšie informácie nájdete v <a href="https://developer.mozilla.org/docs/Tools/GCLI/Customization">dokumentácii na MDN</a>.
-
-# LOCALIZATION NOTE (cmdSetdirDirectoryDesc) The description of the directory
-# parameter to the 'cmd setdir' command.
-cmdSetdirDirectoryDesc=Priečinok obsahujúci súbory .mozcmd
-
-# LOCALIZATION NOTE (addonDesc) A very short description of the 'addon'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-addonDesc=Správa doplnkov
-
-# LOCALIZATION NOTE (addonListDesc) A very short description of the 'addon list'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-addonListDesc=Zobrazí nainštalované doplnky
-
-# LOCALIZATION NOTE (addonListTypeDesc) A very short description of the
-# 'addon list <type>' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-addonListTypeDesc=Zvolí typ doplnku
-
-# LOCALIZATION NOTE (addonListDictionaryHeading, addonListExtensionHeading,
-# addonListLocaleHeading, addonListPluginHeading, addonListThemeHeading,
-# addonListUnknownHeading) Used in the output of the 'addon list' command as the
-# first line of output.
-addonListDictionaryHeading=Nainštalované sú nasledovné slovníky:
-addonListExtensionHeading=Nainštalované sú nasledovné rozšírenia:
-addonListLocaleHeading=Nainštalované sú nasledovné jazykové balíky:
-addonListPluginHeading=Nainštalované sú nasledovné zásuvné moduly:
-addonListThemeHeading=Nainštalované sú nasledovné témy:
-addonListAllHeading=Nainštalované sú nasledovné doplnky:
-addonListUnknownHeading=Nainštalované sú nasledovné doplnky zvoleného typu:
-
-# LOCALIZATION NOTE (addonListOutEnable, addonListOutDisable) Used in the
-# output of the 'addon list' command as the labels for the enable/disable
-# action buttons in the listing. This string is designed to be shown in a
-# small action button next to the addon name, which is why it should be as
-# short as possible.
-addonListOutEnable=Povoliť
-addonListOutDisable=Zakázať
-
-# LOCALIZATION NOTE (addonPending, addonPendingEnable, addonPendingDisable,
-# addonPendingUninstall, addonPendingInstall, addonPendingUpgrade) Used in
-# the output of the 'addon list' command as the descriptions of pending
-# addon operations. addonPending is used as a prefix for a list of pending
-# actions (named by the other lookup variables). These strings are designed
-# to be shown alongside addon names, which is why they should be as short
-# as possible.
-addonPending=čaká na
-addonPendingEnable=povolenie
-addonPendingDisable=zakázanie
-addonPendingUninstall=odinštaláciu
-addonPendingInstall=inštaláciu
-addonPendingUpgrade=aktualizáciu
-
-# LOCALIZATION NOTE (addonNameDesc) A very short description of the
-# name parameter of numerous addon commands. This string is designed to be shown
-# in a menu alongside the command name, which is why it should be as short as
-# possible.
-addonNameDesc=Názov doplnku
-
-# LOCALIZATION NOTE (addonNoneOfType) Used in the output of the 'addon list'
-# command when a search for addons of a particular type were not found.
-addonNoneOfType=Nie sú nainštalované žiadne doplnky zadaného typu.
-
-# LOCALIZATION NOTE (addonEnableDesc) A very short description of the
-# 'addon enable <type>' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-addonEnableDesc=Povolí zadaný doplnok
-
-# LOCALIZATION NOTE (addonAlreadyEnabled) Used in the output of the
-# 'addon enable' command when an attempt is made to enable an add-on that is
-# already enabled.
-addonAlreadyEnabled=Doplnok %S je už povolený.
-
-# LOCALIZATION NOTE (addonEnabled) Used in the output of the 'addon enable'
-# command when an addon is enabled.
-addonEnabled=Doplnok %S povolený.
-
-# LOCALIZATION NOTE (addonDisableDesc) A very short description of the
-# 'addon disable <type>' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-addonDisableDesc=Zakáže zadaný doplnok
-
-# LOCALIZATION NOTE (addonAlreadyDisabled) Used in the output of the
-# 'addon disable' command when an attempt is made to disable an add-on that is
-# already disabled.
-addonAlreadyDisabled=Doplnok %S je už zakázaný.
-
-# LOCALIZATION NOTE (addonDisabled) Used in the output of the 'addon disable'
-# command when an addon is disabled.
-addonDisabled=Doplnok %S zakázaný.
-
-# LOCALIZATION NOTE (exportDesc) A very short description of the 'export'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-exportDesc=Exportuje zdroje
-
-# LOCALIZATION NOTE (exportHtmlDesc) A very short description of the 'export
-# html' command. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible.
-exportHtmlDesc=Exportuje kód HTML zo stránky
-
-# LOCALIZATION NOTE (pagemodDesc) A very short description of the 'pagemod'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-pagemodDesc=Vykoná zmeny na stránke
-
-# LOCALIZATION NOTE (pagemodReplaceDesc) A very short description of the
-# 'pagemod replace' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-pagemodReplaceDesc=Vyhľadá a nahradí text v prvkoch stránky
-
-# LOCALIZATION NOTE (pagemodReplaceSearchDesc) A very short string to describe
-# the 'search' parameter to the 'pagemod replace' command, which is displayed in
-# a dialog when the user is using this command.
-pagemodReplaceSearchDesc=Výraz vyhľadávania
-
-# LOCALIZATION NOTE (pagemodReplaceReplaceDesc) A very short string to describe
-# the 'replace' parameter to the 'pagemod replace' command, which is displayed in
-# a dialog when the user is using this command.
-pagemodReplaceReplaceDesc=Výraz nahradenia 
-
-# LOCALIZATION NOTE (pagemodReplaceIgnoreCaseDesc) A very short string to
-# describe the 'ignoreCase' parameter to the 'pagemod replace' command, which is
-# displayed in a dialog when the user is using this command.
-pagemodReplaceIgnoreCaseDesc=Nerozlišovať malé a veľké písmená
-
-# LOCALIZATION NOTE (pagemodReplaceRootDesc) A very short string to describe the
-# 'root' parameter to the 'pagemod replace' command, which is displayed in
-# a dialog when the user is using this command.
-pagemodReplaceRootDesc=CSS selektor pre koreň vyhľadávania
-
-# LOCALIZATION NOTE (pagemodReplaceSelectorDesc) A very short string to describe
-# the 'selector' parameter to the 'pagemod replace' command, which is displayed
-# in a dialog when the user is using this command.
-pagemodReplaceSelectorDesc=CSS selektor pre vyhľadávanie
-
-# LOCALIZATION NOTE (pagemodReplaceAttributesDesc) A very short string to
-# describe the 'attributes' parameter to the 'pagemod replace' command, which is
-# displayed in a dialog when the user is using this command.
-pagemodReplaceAttributesDesc=Regulárny výraz na vyhľadávanie atribútov
-
-# LOCALIZATION NOTE (pagemodReplaceAttrOnlyDesc) A very short string to describe
-# the 'attrOnly' parameter to the 'pagemod replace' command, which is displayed
-# in a dialog when the user is using this command.
-pagemodReplaceAttrOnlyDesc=Obmedziť vyhľadávanie na atribúty
-
-# LOCALIZATION NOTE (pagemodReplaceContentOnlyDesc) A very short string to
-# describe the 'contentOnly' parameter to the 'pagemod replace' command, which
-# is displayed in a dialog when the user is using this command.
-pagemodReplaceContentOnlyDesc=Obmedziť vyhľadávanie na textové uzly
-
-# LOCALIZATION NOTE (pagemodReplaceResultMatchedElements) A string displayed as
-# the result of the 'pagemod replace' command.
-pagemodReplaceResult=Prvky zhodné so selektorom: %1$S. Náhrady v textových uzloch: %2$S. Náhrady v atribútoch: %3$S.
-
-# LOCALIZATION NOTE (pagemodRemoveDesc) A very short description of the
-# 'pagemod remove' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-pagemodRemoveDesc=Odstráni prvky a atribúty zo stránky
-
-# LOCALIZATION NOTE (pagemodRemoveElementDesc) A very short description of the
-# 'pagemod remove element' command. This string is designed to be shown in
-# a menu alongside the command name, which is why it should be as short as
-# possible.
-pagemodRemoveElementDesc=Odstráni prvky zo stránky
-
-# LOCALIZATION NOTE (pagemodRemoveElementSearchDesc) A very short string to
-# describe the 'search' parameter to the 'pagemod remove element' command, which
-# is displayed in a dialog when the user is using this command.
-pagemodRemoveElementSearchDesc=CSS selektor určujúci prvky na odstránenie
-
-# LOCALIZATION NOTE (pagemodRemoveElementRootDesc) A very short string to
-# describe the 'root' parameter to the 'pagemod remove element' command, which
-# is displayed in a dialog when the user is using this command.
-pagemodRemoveElementRootDesc=CSS selektor určujúci koreň vyhľadávania
-
-# LOCALIZATION NOTE (pagemodRemoveElementStripOnlyDesc) A very short string to
-# describe the 'stripOnly' parameter to the 'pagemod remove element' command,
-# which is displayed in a dialog when the user is using this command.
-pagemodRemoveElementStripOnlyDesc=Odstráni prvok, ale ponechá obsah
-
-# LOCALIZATION NOTE (pagemodRemoveElementIfEmptyOnlyDesc) A very short string to
-# describe the 'ifEmptyOnly' parameter to the 'pagemod remove element' command,
-# which is displayed in a dialog when the user is using this command.
-pagemodRemoveElementIfEmptyOnlyDesc=Odstráni len prázdne prvky
-
-# LOCALIZATION NOTE (pagemodRemoveElementResultMatchedAndRemovedElements)
-# A string displayed as the result of the 'pagemod remove element' command.
-pagemodRemoveElementResultMatchedAndRemovedElements=Prvky zhodné so selektorom: %1$S. Odstránené prvky: %2$S.
-
-# LOCALIZATION NOTE (pagemodRemoveAttributeDesc) A very short description of the
-# 'pagemod remove attribute' command. This string is designed to be shown in
-# a menu alongside the command name, which is why it should be as short as
-# possible.
-pagemodRemoveAttributeDesc=Odstráni zhodné atribúty
-
-# LOCALIZATION NOTE (pagemodRemoveAttributeSearchAttributesDesc) A very short
-# string to describe the 'searchAttributes' parameter to the 'pagemod remove
-# attribute' command, which is displayed in a dialog when the user is using this
-# command.
-pagemodRemoveAttributeSearchAttributesDesc=Regulárny výraz určujúci atribúty na odstránenie
-
-# LOCALIZATION NOTE (pagemodRemoveAttributeSearchElementsDesc) A very short
-# string to describe the 'searchElements' parameter to the 'pagemod remove
-# attribute' command, which is displayed in a dialog when the user is using this
-# command.
-pagemodRemoveAttributeSearchElementsDesc=CSS selektor určujúci prvky
-
-# LOCALIZATION NOTE (pagemodRemoveAttributeRootDesc) A very short string to
-# describe the 'root' parameter to the 'pagemod remove attribute' command, which
-# is displayed in a dialog when the user is using this command.
-pagemodRemoveAttributeRootDesc=CSS selektor určujúci koreň vyhľadávania
-
-# LOCALIZATION NOTE (pagemodRemoveAttributeIgnoreCaseDesc) A very short string
-# to describe the 'ignoreCase' parameter to the 'pagemod remove attribute'
-# command, which is displayed in a dialog when the user is using this command.
-pagemodRemoveAttributeIgnoreCaseDesc=Nerozlišovať malé a veľké písmená
-
-# LOCALIZATION NOTE (pagemodRemoveAttributeResult) A string displayed as the
-# result of the 'pagemod remove attribute' command.
-pagemodRemoveAttributeResult=Prvky zhodné so selektorom: %1$S. Odstránené atribúty: %2$S.
-
-# LOCALIZATION NOTE (toolsDesc2) A very short description of the 'tools'
-# command, the parent command for tool-hacking commands.
-# The argument (%1$S) is the browser name.
-toolsDesc2=Hackovanie Vývojárskych nástrojov %1$Su
-
-# LOCALIZATION NOTE (toolsManual2) A fuller description of the 'tools'
-# command. The argument (%1$S) is the browser name.
-toolsManual2=Rôzne príkazy týkajúce sa priameho hackovania Vývojárskych nástrojov %1$Su.
-
-# LOCALIZATION NOTE (toolsSrcdirDesc) A very short description of the 'tools srcdir'
-# command, for pointing your developer tools loader at a mozilla-central source tree.
-toolsSrcdirDesc=Načíta nástroje z mozilla-central
-
-# LOCALIZATION NOTE (toolsSrcdirNotFound) Shown when the 'tools srcdir' command was handed
-# an invalid srcdir.
-toolsSrcdirNotFound=%1$s neexistuje alebo nie je mozilla-central checkout.
-
-# LOCALIZATION NOTE (toolsSrcdirReloaded) Displayed when tools have been reloaded by the
-# 'tools srcdir' command.
-toolsSrcdirReloaded=Načítané nástroje z %1$s.
-
-# LOCALIZATION NOTE (toolsSrcdirManual2) A full description of the 'tools srcdir'
-# command. The argument (%1$S) is the browser name.
-toolsSrcdirManual2=Načíta Vývojárske nástroje %1$Su použitím mozilla-central checkout.
-
-# LOCALIZATION NOTE (toolsSrcdirDir) The srcdir argument to the 'tools srcdir' command.
-toolsSrcdirDir=mozilla-central checkout
-
-# LOCALIZATION NOTE (toolsBuiltinDesc) A short description of the 'tools builtin'
-# command, which overrides a previous 'tools srcdir' command.
-toolsBuiltinDesc=Použije vstavané nástroje
-
-# LOCALIZATION NOTE (toolsBuiltinDesc) A fuller description of the 'tools builtin'
-# command.
-toolsBuiltinManual=Použije vstavané nástroje, má prednosť pre akýmkoľvek predchádzajúcim príkazom srcdir.
-
-# LOCALIZATION NOTE (toolsBuiltinReloaded) Displayed when tools are loaded with the
-# 'tools builtin' command.
-toolsBuiltinReloaded=Vstavané nástroje načítané.
-
-# LOCALIZATION NOTE (toolsReloadDesc) A short description of the 'tools reload' command.
-# which will reload the tools from the current srcdir.
-toolsReloadDesc=Opätovne načíta vývojárske nástroje
-
-# LOCALIZATION NOTE (toolsReloaded2) Displayed when tools are reloaded with the 'tools
-# reload' command.
-toolsReloaded2=Nástroje opätovne načítané.
-
-# LOCALIZATION NOTE (cookieDesc) A very short description of the 'cookie'
-# command. See cookieManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-cookieDesc=Zobrazí a upraví cookies
-
-# LOCALIZATION NOTE (cookieManual) A fuller description of the 'cookie'
-# command, displayed when the user asks for help on what it does.
-cookieManual=Príkazy na zobrazenie, vytvorenie, odstránenie a úpravu cookies pre aktuálnu doménu.
-
-# LOCALIZATION NOTE (cookieListDesc) A very short description of the
-# 'cookie list' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-cookieListDesc=Zobrazí cookies
-
-# LOCALIZATION NOTE (cookieListManual) A fuller description of the 'cookie list'
-# command, displayed when the user asks for help on what it does.
-cookieListManual=Zobrazí zoznam cookies relevantných pre aktuálnu stránku.
-
-# LOCALIZATION NOTE (cookieListOutHost,cookieListOutPath,cookieListOutExpires,cookieListOutAttributes):
-# The 'cookie list' command has a number of headings for cookie properties.
-# Particular care should be taken in translating these strings as they have
-# references to names in the cookies spec.
-cookieListOutHost=Server:
-cookieListOutPath=Cesta:
-cookieListOutExpires=Koniec platnosti:
-cookieListOutAttributes=Atribúty:
-
-# LOCALIZATION NOTE (cookieListOutNone) The output of the 'cookie list' command
-# uses this string when no cookie attributes (like httpOnly, secure, etc) apply
-cookieListOutNone=žiadne
-
-# LOCALIZATION NOTE (cookieListOutSession) The output of the 'cookie list'
-# command uses this string to describe a cookie with an expiry value of '0'
-# that is to say it is a session cookie
-cookieListOutSession=Pri ukončení prehliadača (relácie)
-
-# LOCALIZATION NOTE (cookieListOutNonePage) The output of the 'cookie list'
-# command uses this string for pages like 'about:blank' which can't contain
-# cookies
-cookieListOutNonePage=Pre túto stránku neboli nájdené žiadne cookies
-
-# LOCALIZATION NOTE (cookieListOutNoneHost) The output of the 'cookie list'
-# command uses this string when there are no cookies on a given web page
-cookieListOutNoneHost=Pre server %1$S neboli nájdené žiadne cookies
-
-# LOCALIZATION NOTE (cookieListOutEdit) A title used in the output from the
-# 'cookie list' command on a button which can be used to edit cookie values
-cookieListOutEdit=Upraviť
-
-# LOCALIZATION NOTE (cookieListOutRemove) A title used in the output from the
-# 'cookie list' command on a button which can be used to remove cookies
-cookieListOutRemove=Odstrániť
-
-# LOCALIZATION NOTE (cookieRemoveDesc) A very short description of the
-# 'cookie remove' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-cookieRemoveDesc=Odstráni cookie
-
-# LOCALIZATION NOTE (cookieRemoveManual) A fuller description of the 'cookie remove'
-# command, displayed when the user asks for help on what it does.
-cookieRemoveManual=Odstráni cookie na základe jeho kľúča
-
-# LOCALIZATION NOTE (cookieRemoveKeyDesc) A very short string to describe the
-# 'key' parameter to the 'cookie remove' command, which is displayed in a dialog
-# when the user is using this command.
-cookieRemoveKeyDesc=Kľúč súboru cookie, ktorý sa má odstrániť
-
-# LOCALIZATION NOTE (cookieSetDesc) A very short description of the
-# 'cookie set' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-cookieSetDesc=Nastaví cookie
-
-# LOCALIZATION NOTE (cookieSetManual) A fuller description of the 'cookie set'
-# command, displayed when the user asks for help on what it does.
-cookieSetManual=Nastaví cookie určení kľúča, jeho hodnoty a voliteľne jedného alebo viacerých z nasledovných atribútov: expires (maximálny vek v sekundách alebo dátum vypršania vo formáte GMTString), path, domain, secure
-
-# LOCALIZATION NOTE (cookieSetKeyDesc) A very short string to describe the
-# 'key' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetKeyDesc=Kľúč nastavovaného cookie
-
-# LOCALIZATION NOTE (cookieSetValueDesc) A very short string to describe the
-# 'value' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetValueDesc=Hodnota nastavovaného cookie
-
-# LOCALIZATION NOTE (cookieSetOptionsDesc) The title of a set of options to
-# the 'cookie set' command, displayed as a heading to the list of option.
-cookieSetOptionsDesc=Voľby
-
-# LOCALIZATION NOTE (cookieSetPathDesc) A very short string to describe the
-# 'path' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetPathDesc=Cesta k nastavovanému cookie
-
-# LOCALIZATION NOTE (cookieSetDomainDesc) A very short string to describe the
-# 'domain' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetDomainDesc=Doména nastavovaného cookie
-
-# LOCALIZATION NOTE (cookieSetSecureDesc) A very short string to describe the
-# 'secure' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetSecureDesc=Prenášané len cez https
-
-# LOCALIZATION NOTE (cookieSetHttpOnlyDesc) A very short string to describe the
-# 'httpOnly' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetHttpOnlyDesc=Nie je dostupné zo skriptu na strane klienta
-
-# LOCALIZATION NOTE (cookieSetSessionDesc) A very short string to describe the
-# 'session' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetSessionDesc=Platné len pre danú reláciu prehliadača
-
-# LOCALIZATION NOTE (cookieSetExpiresDesc) A very short string to describe the
-# 'expires' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetExpiresDesc=Dátum konca platnosti cookie (formát RFC2822 alebo ISO 8601)
-
-# LOCALIZATION NOTE (jsbDesc) A very short description of the
-# 'jsb' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-jsbDesc=JavaScript beautifier
-
-# LOCALIZATION NOTE (jsbUrlDesc) A very short description of the
-# 'jsb <url>' parameter. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-jsbUrlDesc=Adresa súboru JS na preformátovanie
-
-# LOCALIZATION NOTE (jsbIndentSizeDesc) A very short description of the
-# 'jsb <indentSize>' parameter. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-jsbIndentSizeDesc=Veľkosť odsadenia v znakoch
-
-# LOCALIZATION NOTE (jsbIndentSizeManual) A fuller description of the
-# 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
-# does.
-jsbIndentSizeManual=Počet znakov, ktorými sa odsadí každý riadok
-
-# LOCALIZATION NOTE (jsbIndentCharDesc) A very short description of the
-# 'jsb <indentChar>' parameter. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-jsbIndentCharDesc=Znaky používané na odsadenie každého riadku
-
-# LOCALIZATION NOTE (jsbIndentCharManual) A fuller description of the
-# 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
-# does.
-jsbIndentCharManual=Znaky používané na odsadenie každého riadku, možné voľby sú medzera a tabulátor.
-
-# the 'jsb <doNotPreserveNewlines>' parameter. This string is designed to be
-# shown in a menu alongside the command name, which is why it should be as short
-# as possible.
-jsbDoNotPreserveNewlinesDesc=Nezachovávať zalomenia riadkov
-
-# LOCALIZATION NOTE (jsbPreserveNewlinesManual) A fuller description of the
-# 'jsb <jsbPreserveNewlines>' parameter, displayed when the user asks for help
-# on what it does.
-jsbPreserveNewlinesManual=Majú byť existujúce zalomenia riadkov zachované?
-
-# LOCALIZATION NOTE (jsbPreserveMaxNewlinesDesc) A very short description of the
-# 'jsb <preserveMaxNewlines>' parameter. This string is designed to be shown
-# in a menu alongside the command name, which is why it should be as short as
-# possible.
-jsbPreserveMaxNewlinesDesc=Maximálny počet zalomení riadkov za sebou
-
-# LOCALIZATION NOTE (jsbPreserveMaxNewlinesManual) A fuller description of the
-# 'jsb <preserveMaxNewlines>' parameter, displayed when the user asks for help
-# on what it does.
-jsbPreserveMaxNewlinesManual=Maximálny počet zalomení riadkov za sebou, ktoré ostanú zachované
-
-# LOCALIZATION NOTE (jsbJslintHappyDesc) A very short description of the
-# 'jsb <jslintHappy>' parameter. This string is designed to be shown
-# in a menu alongside the command name, which is why it should be as short as
-# possible.
-jsbJslintHappyDesc=Vynútiť režim jslint-stricter?
-
-# LOCALIZATION NOTE (jsbJslintHappyManual) A fuller description of the
-# 'jsb <jslintHappy>' parameter, displayed when the user asks for help
-# on what it does.
-jsbJslintHappyManual=Ak je voľba nastavená na true, použije sa režim jslint-stricter
-
-# LOCALIZATION NOTE (jsbBraceStyleDesc2) A very short description of the
-# 'jsb <braceStyle>' parameter. This string is designed to be shown
-# in a menu alongside the command name, which is why it should be as short as
-# possible.
-jsbBraceStyleDesc2=Zvoľte štýl kódovania zátvoriek
-
-# LOCALIZATION NOTE (jsbBraceStyleManual2) A fuller description of the
-# 'jsb <braceStyle>' parameter, displayed when the user asks for help
-# on what it does.
-jsbBraceStyleManual2=Zvoľte štýl kódovania zátvoriek: collapse - zátvorky sú na rovnakom riadku ako výraz; expand - zátvorky sú na novom riadku (štýl Allman / ANSI); end-expand - koncové zátvorky na vlastnom riadku; expand-strict - zátvorky na vlastnom riadku aj v prípade, že kód nebude validný.
-
-# LOCALIZATION NOTE (jsbNoSpaceBeforeConditionalDesc) A very short description
-# of the 'jsb <noSpaceBeforeConditional>' parameter. This string is designed to
-# be shown in a menu alongside the command name, which is why it should be as
-# short as possible.
-jsbNoSpaceBeforeConditionalDesc=Bez medzery pred podmienenými príkazmi
-
-# LOCALIZATION NOTE (jsbUnescapeStringsDesc) A very short description of the
-# 'jsb <unescapeStrings>' parameter. This string is designed to be shown
-# in a menu alongside the command name, which is why it should be as short as
-# possible.
-jsbUnescapeStringsDesc=Odkódovať znaky \\xNN?
-
-# LOCALIZATION NOTE (jsbUnescapeStringsManual) A fuller description of the
-# 'jsb <unescapeStrings>' parameter, displayed when the user asks for help
-# on what it does.
-jsbUnescapeStringsManual=Majú byť tlačiteľné znaky v reťazcoch zakódované v notácii \\xNN odkódované?
-
-# LOCALIZATION NOTE (jsbInvalidURL) Displayed when an invalid URL is passed to
-# the jsb command.
-jsbInvalidURL=Zadajte platnú adresu URL
-
-# LOCALIZATION NOTE (jsbOptionsDesc) The title of a set of options to
-# the 'jsb' command, displayed as a heading to the list of options.
-jsbOptionsDesc=Možnosti
-
-# LOCALIZATION NOTE (calllogDesc) A very short description of the
-# 'calllog' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-calllogDesc=Príkazy na správu zaznamenávania volaní funkcií
-
-# LOCALIZATION NOTE (calllogStartDesc) A very short description of the
-# 'calllog start' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-calllogStartDesc=Spustí zaznamenávanie volaní funkcií do konzoly
-
-# LOCALIZATION NOTE (calllogStartReply) A string displayed as the result of
-# the 'calllog start' command.
-calllogStartReply=Zaznamenávanie volaní funkcií spustené.
-
-# LOCALIZATION NOTE (calllogStopDesc) A very short description of the
-# 'calllog stop' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-calllogStopDesc=Zastaví zaznamenávanie volaní funkcií
-
-# LOCALIZATION NOTE (calllogStopNoLogging) A string displayed as the result of
-# the 'calllog stop' command when there is nothing to stop.
-calllogStopNoLogging=Práve nie je spustené žiadne zaznamenávanie volaní funkcií
-
-# LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
-# the 'calllog stop' command when there are logging actions to stop.
-calllogStopReply=Zaznamenávanie volaní funkcií zastavené. Aktívny kontext: %1$S.
-
-# LOCALIZATION NOTE (calllogStartChromeDesc) A very short description of the
-# 'calllog chromestart' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-calllogChromeStartDesc=Spustí zaznamenávanie volaní funkcií pre kód chrome do konzoly
-
-# LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
-# 'calllog chromestart <sourceType>' parameter. This string is designed to be
-# shown in a menu alongside the command name, which is why it should be as short as possible.
-calllogChromeSourceTypeDesc=Globálny objekt, adresa JSM alebo JS, z ktorej sa získa globálny objekt
-
-# LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
-# 'calllog chromestart' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-calllogChromeSourceTypeManual=Globálny objekt, adresa JSM alebo JS, ktorý sa vykoná v okne chrome, z ktorého sa získa globálny objekt
-
-# LOCALIZATION NOTE (calllogChromeStartReply) A string displayed as the result
-# of the 'calllog chromestart' command.
-calllogChromeStartReply=Zaznamenávanie volaní spustené.
-
-# LOCALIZATION NOTE (calllogChromeStopDesc) A very short description of the
-# 'calllog chromestop' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-calllogChromeStopDesc=Zastaví zaznamenávanie volaní funkcií
-
-# LOCALIZATION NOTE (calllogChromeStopNoLogging) A string displayed as the
-# result of the 'calllog chromestop' command when there is nothing to stop.
-calllogChromeStopNoLogging=Aktuálne nie je aktívne žiadne zaznamenávanie funkcií pre kód chrome
-
-# LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
-# the 'calllog chromestop' command when there are logging actions to stop.
-calllogChromeStopReply=Zaznamenávanie volaní zastavené. Aktívne kontexty: %1$S.
-
-# LOCALIZATION NOTE (callLogChromeAnonFunction) A string displayed as the result
-# of the 'calllog chromestart' command when an anonymouse function is to be
-# logged.
-callLogChromeAnonFunction=<anonymná>
-
-# LOCALIZATION NOTE (callLogChromeMethodCall) A string displayed as the result
-# of the 'calllog chromestart' command to proceed a method name when it is to be
-# logged.
-callLogChromeMethodCall=Volanie metódy
-
-# LOCALIZATION NOTE (callLogChromeInvalidJSM) A string displayed as the result
-# of the 'calllog chromestart' command with an invalid JSM or JSM path.
-callLogChromeInvalidJSM=Neplatné JSM!
-
-# LOCALIZATION NOTE (callLogChromeVarNotFoundContent) A string displayed as the
-# result of the 'calllog chromestart' command with a source type of
-# content-variable and an invalid variable name.
-callLogChromeVarNotFoundContent=Premenná nebola v okne content nájdená.
-
-# LOCALIZATION NOTE (callLogChromeVarNotFoundChrome) A string displayed as the
-# result of the 'calllog chromestart' command with a source type of
-# chrome-variable and an invalid variable name.
-callLogChromeVarNotFoundChrome=Premenná nebola v okne chrome nájdená.
-
-# LOCALIZATION NOTE (callLogChromeEvalException) A string displayed as the
-# result of the 'calllog chromestart' command with a source type of JavaScript
-# and invalid JavaScript code.
-callLogChromeEvalException=Vykonávaný kód JavaScriptu vyhodil nasledovnú výnimku
-
-# LOCALIZATION NOTE (callLogChromeEvalNeedsObject) A string displayed as the
-# result of passing a non-JavaScript object creating source via the
-# 'calllog chromestart javascript' command.
-callLogChromeEvalNeedsObject=Zdroj JavaScriptu sa musí vykonávať v objekte, ktorého volania metód sú zaznamenávané, napr. "({a1: function() {this.a2()},a2: function() {}});"
-
-# LOCALIZATION NOTE (scratchpadOpenTooltip) A string displayed as the
-# tooltip of button in devtools toolbox which opens Scratchpad.
-scratchpadOpenTooltip=Editor JavaScriptu - Scratchpad
-
-# LOCALIZATION NOTE (paintflashingDesc) A very short string used to describe the
-# function of the "paintflashing" command
-paintflashingDesc=Zvýrazňuje oblasť prekreslenia
-
-# LOCALIZATION NOTE (paintflashingOnDesc) A very short string used to describe the
-# function of the "paintflashing on" command.
-paintflashingOnDesc=Zapne funkciu zvýrazňovania prekresľovania
-
-# LOCALIZATION NOTE (paintflashingOffDesc) A very short string used to describe the
-# function of the "paintflashing off" command.
-paintflashingOffDesc=Vypne funkciu zvýrazňovania prekresľovania
-
-# LOCALIZATION NOTE (paintflashingChrome) A very short string used to describe the
-# function of the "paintflashing on/off chrome" command.
-paintflashingChromeDesc=rámce chrome
-
-# LOCALIZATION NOTE (paintflashingManual) A longer description describing the
-# set of commands that control paint flashing.
-paintflashingManual=Vyskresľuje prekreslené oblasti rôznymi farbami
-
-# LOCALIZATION NOTE (paintflashingTooltip) A string displayed as the
-# tooltip of button in devtools toolbox which toggles paint flashing.
-paintflashingTooltip=Zvýrazniť oblasť prekreslenia
-
-# LOCALIZATION NOTE (paintflashingToggleDesc) A very short string used to describe the
-# function of the "paintflashing toggle" command.
-paintflashingToggleDesc=Prepne funkciu zvýrazňovania prekresľovania
-
-# LOCALIZATION NOTE (splitconsoleTooltip) A string displayed as the
-# tooltip of button in devtools toolbox which toggles the split webconsole.
-splitconsoleTooltip=Prepne funkciu rozdelenia konzoly
-
-# LOCALIZATION NOTE (appCacheDesc) A very short string used to describe the
-# function of the "appcache" command
-appCacheDesc=Utility pre vyrovnávaciu pamäť aplikácie
-
-# LOCALIZATION NOTE (appCacheValidateDesc) A very short string used to describe
-# the function of the "appcache validate" command.
-appCacheValidateDesc=Overí platnosť manifestu vyrovnávacej pamäte
-
-# LOCALIZATION NOTE (appCacheValidateManual) A fuller description of the
-# 'validate' parameter to the 'appcache' command, displayed when the user asks
-# for help on what it does.
-appCacheValidateManual=Nájde problémy vzťahujúce sa k manifestu vyrovnávacej pamäte a súborom, na ktoré manifest odkazuje
-
-# LOCALIZATION NOTE (appCacheValidateUriDesc) A very short string used to describe
-# the function of the "uri" parameter of the appcache validate" command.
-appCacheValidateUriDesc=Adresa URI, ktorej platnosť chcete overiť
-
-# LOCALIZATION NOTE (appCacheValidated) Displayed by the "appcache validate"
-# command when it has been successfully validated.
-appCacheValidatedSuccessfully=Vyrovnávacia pamäť aplikácie úspešne overená.
-
-# LOCALIZATION NOTE (appCacheClearDesc) A very short string used to describe
-# the function of the "appcache clear" command.
-appCacheClearDesc=Vymaže položky z vyrovnávacej pamäte aplikácie
-
-# LOCALIZATION NOTE (appCacheClearManual) A fuller description of the
-# 'appcache clear' command, displayed when the user asks for help on what it does.
-appCacheClearManual=Vymaže jednu alebo viac položiek z vyrovnávacej pamäte aplikácie
-
-# LOCALIZATION NOTE (appCacheClearCleared) Displayed by the "appcache clear"
-# command when entries are successfully cleared.
-appCacheClearCleared=Položky úspešne vymazané.
-
-# LOCALIZATION NOTE (AppCacheListDesc) A very short string used to describe
-# the function of the "appcache list" command.
-appCacheListDesc=Zobrazí zoznam položiek vo vyrovnávacej pamäti aplikácie.
-
-# LOCALIZATION NOTE (AppCacheListManual) A fuller description of the
-# 'appcache list' command, displayed when the user asks for help on what it does.
-appCacheListManual=Zobrazí zoznam všetkých položiek vo vyrovnávacej pamäti aplikácie. Ak je zadaný výraz vyhľadávania, tabuľka zobrazuje položky obsahujúce tento výraz.
-
-# LOCALIZATION NOTE (AppCacheListSearchDesc) A very short string used to describe
-# the function of the "search" parameter of the appcache list" command.
-appCacheListSearchDesc=Filtruje výsledky pomocou výrazu vyhľadávania.
-
-# LOCALIZATION NOTE (AppCacheList*) Row headers for the 'appcache list' command.
-appCacheListKey=Kľúč:
-appCacheListDataSize=Veľkosť údajov:
-appCacheListDeviceID=ID zariadenia:
-appCacheListExpirationTime=Vyprší:
-appCacheListFetchCount=Počet získaní:
-appCacheListLastFetched=Naposledy získané:
-appCacheListLastModified=Naposledy upravené:
-
-# LOCALIZATION NOTE (appCacheListViewEntry) The text for the view entry button
-# of the 'appcache list' command.
-appCacheListViewEntry=Zobraziť položku
-
-# LOCALIZATION NOTE (appCacheViewEntryDesc) A very short string used to describe
-# the function of the "appcache viewentry" command.
-appCacheViewEntryDesc=Otvorí novú kartu obsahujúcu informácie o zadanej položke vyrovnávacej pamäte.
-
-# LOCALIZATION NOTE (appCacheViewEntryManual) A fuller description of the
-# 'appcache viewentry' command, displayed when the user asks for help on what it
-# does.
-appCacheViewEntryManual=Otvorí novú kartu obsahujúcu informácie o zadanej položke vyrovnávacej pamäte.
-
-# LOCALIZATION NOTE (appCacheViewEntryKey) A very short string used to describe
-# the function of the "key" parameter of the 'appcache viewentry' command.
-appCacheViewEntryKey=Kľúč položky na zobrazenie.
-
-# LOCALIZATION NOTE (profilerDesc) A very short string used to describe the
-# function of the profiler command.
-profilerDesc=Správa nástroja na profilovanie
-
-# LOCALIZATION NOTE (profilerManual) A longer description describing the
-# set of commands that control the profiler.
-profilerManual=Príkazy na spustenie alebo zastavenie nástroja na profilovanie JavaScriptu
-
-# LOCALIZATION NOTE (profilerOpen) A very short string used to describe the function
-# of the profiler open command.
-profilerOpenDesc=Otvorí nástroj na profilovanie
-
-# LOCALIZATION NOTE (profilerClose) A very short string used to describe the function
-# of the profiler close command.
-profilerCloseDesc=Zavrie nástroj na profilovanie
-
-# LOCALIZATION NOTE (profilerStart) A very short string used to describe the function
-# of the profiler start command.
-profilerStartDesc=Spustí profilovanie
-
-# LOCALIZATION NOTE (profilerStartManual) A fuller description of the 'profile name'
-# parameter. This parameter is used to name a newly created profile or to lookup
-# an existing profile by its name.
-profilerStartManual=Názov profilu, ktorý chcete spustiť.
-
-# LOCALIZATION NOTE (profilerStop) A very short string used to describe the function
-# of the profiler stop command.
-profilerStopDesc=Zastaví profilovanie
-
-# LOCALIZATION NOTE (profilerStopManual) A fuller description of the 'profile name'
-# parameter. This parameter is used to lookup an existing profile by its name.
-profilerStopManual=Názov profilu, ktorý chcete zastaviť.
-
-# LOCALIZATION NOTE (profilerList) A very short string used to describe the function
-# of the profiler list command.
-profilerListDesc=Zobrazí všetky profily
-
-# LOCALIZATION NOTE (profilerShow) A very short string used to describe the function
-# of the profiler show command.
-profilerShowDesc=Zobrazí individuálny profil
-
-# LOCALIZATION NOTE (profilerShowManual) A fuller description of the 'profile name'
-# parameter. This parameter is used to name a newly created profile or to lookup
-# an existing profile by its name.
-profilerShowManual=Názov profilu.
-
-# LOCALIZATION NOTE (profilerAlreadyStarted2) A message that is displayed whenever
-# an operation cannot be completed because the profile in question has already
-# been started.
-profilerAlreadyStarted2=Profilovanie už beží
-
-# LOCALIZATION NOTE (profilerNotFound) A message that is displayed whenever
-# an operation cannot be completed because the profile in question could not be
-# found.
-profilerNotFound=Profil nebol nájdený
-
-# LOCALIZATION NOTE (profilerNotStarted2) A message that is displayed whenever
-# an operation cannot be completed because the profile in question has not been
-# started yet. It also contains a hint to use the 'profile start' command to
-# start the profiler.
-profilerNotStarted3=Profilovanie zatiaľ nebeží. Ak ho chcete spustiť, použite príkaz 'profile start'
-
-# LOCALIZATION NOTE (profilerStarted2) A very short string that indicates that
-# we have started recording.
-profilerStarted2=Zaznamenáva sa…
-
-# LOCALIZATION NOTE (profilerStopped) A very short string that indicates that
-# we have stopped recording.
-profilerStopped=Zastavené…
-
-# LOCALIZATION NOTE (profilerNotReady) A message that is displayed whenever
-# an operation cannot be completed because the profiler has not been opened yet.
-profilerNotReady=Ak chcete, aby tento príkaz fungoval, musíte najskôr otvoriť nástroj na profilovanie
-
-# LOCALIZATION NOTE (listenDesc) A very short string used to describe the
-# function of the 'listen' command.
-listenDesc=Otvorí vzdialený port ladenia
-
-# LOCALIZATION NOTE (listenManual2) A longer description of the 'listen'
-# command.
-listenManual2=%1$S umožňuje vzdialené ladenie cez pripojenie TCP/IP. Z bezpečnostných dôvodov je toto predvolene zakázané, ale je možné to povoliť týmto príkazom.
-
-# LOCALIZATION NOTE (listenPortDesc) A very short string used to describe the
-# function of 'port' parameter to the 'listen' command.
-listenPortDesc=Port TCP, ktorý sa bude počúvať
-
-# LOCALIZATION NOTE (listenDisabledOutput) Text of a message output during the
-# execution of the 'listen' command.
-listenDisabledOutput=Počúvanie je zakázané pomocou voľby devtools.debugger.remote-enabled
-
-# LOCALIZATION NOTE (listenInitOutput) Text of a message output during the
-# execution of the 'listen' command. %1$S is a port number
-listenInitOutput=Počúva sa na porte %1$S
-
-# LOCALIZATION NOTE (listenNoInitOutput) Text of a message output during the
-# execution of the 'listen' command.
-listenNoInitOutput=Server ladenia nebol inicializovaný
-
-# LOCALIZATION NOTE (mediaDesc, mediaEmulateDesc, mediaEmulateManual,
-# mediaEmulateType, mediaResetDesc) These strings describe
-# the 'media' commands and all available parameters.
-mediaDesc=Emulácia typu média CSS
-mediaEmulateDesc=Emuluje zadaný typ média CSS
-mediaEmulateManual=Zobrazí dokument tak, ako by bol zobrazený na zariadení podporujúcom zadaný typ média (CSS media), vrátane aplikovaných pravidiel špecifických pre daný typ média.
-mediaEmulateType=Typ média na emulovanie
-mediaResetDesc=Zastaví emulovanie typu média CSS
-
-# LOCALIZATION NOTE (injectDesc, injectManual, injectLibraryDesc, injectLoaded,
-# injectFailed) These strings describe the 'inject' commands and all available
-# parameters.
-injectDesc=Zasunie bežné knižnice do stránky
-injectManual2=Zasunie bežné knižnice do obsahu stránky, ku ktorej je možné pristupovať aj z konzoly.
-injectLibraryDesc=Zvoľte, ktorú knižnicu alebo skript chcete zasunúť
-injectLoaded=Načítané: %1$S
-injectFailed=Nepodarilo sa načítať %1$S - neplatná URI
-
-# LOCALIZATION NOTE (folderDesc, folderOpenDesc, folderOpenDir,
-# folderOpenProfileDesc) These strings describe the 'folder' commands and
-# all available parameters.
-folderDesc=Otvorí priečinky
-folderOpenDesc=Otvorí priečinok na zadanej ceste
-folderOpenDir=Cesta k priečinku
-folderOpenProfileDesc=Otvorí priečinok profilu
-
-# LOCALIZATION NOTE (folderInvalidPath) A string displayed as the result
-# of the 'folder open' command with an invalid folder path.
-folderInvalidPath=Zadajte platnú cestu
-
-# LOCALIZATION NOTE (folderOpenDirResult) A very short string used to
-# describe the result of the 'folder open' command.
-# The argument (%1$S) is the folder path.
-folderOpenDirResult=Otvorený %1$S
-
-# LOCALIZATION NOTE (rulersDesc) A very short description of the
-# 'rulers' command. See rulersManual for a fuller description of what
-# it does. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible.
-rulersDesc=Prepne pravítko pre otvorenú stránku
-
-# LOCALIZATION NOTE (rulersManual) A fuller description of the 'rulers'
-# command, displayed when the user asks for help on what it does.
-rulersManual=Prepne horizontálne a vertikálne pravítko pre otvorenú stránku
-
-# LOCALIZATION NOTE (rulersTooltip) A string displayed as the
-# tooltip of button in devtools toolbox which toggles the rulers.
-rulersTooltip=Prepne pravítko pre otvorenú stránku
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/gcli.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/gcli.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/gcli.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/gcli.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,318 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# LOCALIZATION NOTE These strings are used inside the Web Console
-# command line which is available from the Web Developer sub-menu
-# -> 'Web Console'.
-# The correct localization of this file might be to keep it in
-# English, or another language commonly spoken among web developers.
-# You want to make that choice consistent across the developer tools.
-# A good criteria is the language in which you'd find the best
-# documentation on web development on the web.
-
-# For each command there are in general two strings. As an example consider
-# the 'pref' command.
-# commandDesc (e.g. prefDesc for the command 'pref'): this string contains a
-# very short description of the command. It's designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-# commandManual (e.g. prefManual for the command 'pref'): this string will
-# contain a fuller description of the command. It's diplayed when the user
-# asks for help about a specific command (e.g. 'help pref').
-
-# LOCALIZATION NOTE: This message is used to describe any command or command
-# parameter when no description has been provided.
-canonDescNone=(bez popisu)
-
-# LOCALIZATION NOTE: The default name for a group of parameters.
-canonDefaultGroupName=Možnosti
-
-# LOCALIZATION NOTE (canonProxyDesc, canonProxyManual): These commands are
-# used to execute commands on a remote system (using a proxy). Parameters: %S
-# is the name of the remote system.
-canonProxyDesc=Vykoná príkaz na %S
-canonProxyManual=Sada príkazov, ktoré sú vykonávané na vzdialenom systéme. Vzdialený systém je pripojený cez %S
-
-# LOCALIZATION NOTE: This error message is displayed when we try to add a new
-# command (using a proxy) where one already exists with the same name.
-canonProxyExists=Príkaz '%S' už existuje.
-
-# LOCALIZATION NOTE: This message describes the '{' command, which allows
-# entry of JavaScript like traditional developer tool command lines.
-cliEvalJavascript=Vojde priamo do JavaScriptu
-
-# LOCALIZATION NOTE: This message is displayed when the command line has more
-# arguments than the current command can understand.
-cliUnusedArg=Príliš veľa parametrov
-
-# LOCALIZATION NOTE: The title of the dialog which displays the options that
-# are available to the current command.
-cliOptions=Dostupné možnosti
-
-# LOCALIZATION NOTE: The error message when the user types a command that
-# isn't registered
-cliUnknownCommand=Neplatný príkaz
-
-# LOCALIZATION NOTE: A parameter should have a value, but doesn't
-cliIncompleteParam=Pre '%1$S' sa vyžaduje nejaká hodnota.
-
-# LOCALIZATION NOTE: Error message given when a file argument points to a file
-# that does not exist, but should (e.g. for use with File->Open) %1$S is a
-# filename
-fileErrNotExists=Súbor '%1$S' neexistuje
-
-# LOCALIZATION NOTE: Error message given when a file argument points to a file
-# that exists, but should not (e.g. for use with File->Save As) %1$S is a
-# filename
-fileErrExists=Súbor '%1$S' už existuje
-
-# LOCALIZATION NOTE: Error message given when a file argument points to a
-# non-file, when a file is needed. %1$S is a filename
-fileErrIsNotFile='%1$S' nie je súbor
-
-# LOCALIZATION NOTE: Error message given when a file argument points to a
-# non-directory, when a directory is needed (e.g. for use with 'cd') %1$S is a
-# filename
-fileErrIsNotDirectory='%1$S' nie je priečinok
-
-# LOCALIZATION NOTE: Error message given when a file argument does not match
-# the specified regular expression %1$S is a filename %2$S is a regular
-# expression
-fileErrDoesntMatch='%1$S' sa nezhoduje s '%2$S'
-
-# LOCALIZATION NOTE: When the menu has displayed all the matches that it
-# should (i.e. about 10 items) then we display this to alert the user that
-# more matches are available.
-fieldMenuMore=Ďalšie zhody, skúšajte ďalej
-
-# LOCALIZATION NOTE: The command line provides completion for JavaScript
-# commands, however there are times when the scope of what we're completing
-# against can't be used. This error message is displayed when this happens.
-jstypeParseScope=Rozsah stratený
-
-# LOCALIZATION NOTE (jstypeParseMissing, jstypeBeginSyntax,
-# jstypeBeginUnterm): These error messages are displayed when the command line
-# is doing JavaScript completion and encounters errors.
-jstypeParseMissing=Nie je možné nájsť vlastnosť '%S'
-jstypeBeginSyntax=Chyba syntaxe
-jstypeBeginUnterm=Neukončený reťazec
-
-# LOCALIZATION NOTE: This message is displayed if the system for providing
-# JavaScript completions encounters and error it displays this.
-jstypeParseError=Chyba
-
-# LOCALIZATION NOTE (typesNumberNan, typesNumberNotInt2, typesDateNan): These
-# error messages are displayed when the command line is passed a variable
-# which has the wrong format and can't be converted. Parameters: %S is the
-# passed variable.
-typesNumberNan=Nie je možné skonvertovať "%S" na číslo.
-typesNumberNotInt2=Nie je možné konvertovať "%S" na celé číslo.
-typesDateNan=Nie je možné skonvertovať "%S" na dátum.
-
-# LOCALIZATION NOTE (typesNumberMax, typesNumberMin, typesDateMax,
-# typesDateMin): These error messages are displayed when the command line is
-# passed a variable which has a value out of range (number or date).
-# Parameters: %1$S is the passed variable, %2$S is the limit value.
-typesNumberMax=Hodnota %1$S je väčšia ako povolené maximum: %2$S.
-typesNumberMin=Hodnota %1$S je menšia ako povolené minimum: %2$S.
-typesDateMax=%1$S je neskôr ako maximálny povolený dátum %2$S.
-typesDateMin=%1$S je skôr ako minimálny povolený dátum %2$S.
-
-# LOCALIZATION NOTE: This error message is displayed when the command line is
-# passed an option with a limited number of correct values, but the passed
-# value is not one of them.
-typesSelectionNomatch=Nie je možné použiť '%S'.
-
-# LOCALIZATION NOTE: This error message is displayed when the command line is
-# expecting a CSS query string, however the passed string is not valid.
-nodeParseSyntax=Chyba syntaxe v požiadavke CSS
-
-# LOCALIZATION NOTE (nodeParseMultiple, nodeParseNone): These error messages
-# are displayed when the command line is expecting a CSS string that matches a
-# single node, but more nodes (or none) match.
-nodeParseMultiple=Príliš veľa zhodných uzlov (%S)
-nodeParseNone=Žiadne zhodné uzly
-
-# LOCALIZATION NOTE (helpDesc, helpManual, helpSearchDesc, helpSearchManual3):
-# These strings describe the "help" command, used to display a description of
-# a command (e.g. "help pref"), and its parameter 'search'.
-helpDesc=Zobrazí pomocníka k dostupným príkazom
-helpManual=Poskytuje pomocníka pre zadaný príkaz (ak je zadaný výraz vyhľadávania a tento zodpovedá presne) alebo pre dostupné príkazy (ak nie je zadaný výraz vyhľadávania alebo nezodpovedá presne).
-helpSearchDesc=Výraz vyhľadávania
-helpSearchManual3=Výraz vyhľadávania na prefiltrovanie zoznamu príkazov. Regulárne výrazy nie sú podporované.
-
-# LOCALIZATION NOTE: These strings are displayed in the help page for a
-# command in the console.
-helpManSynopsis=Prehľad
-
-# LOCALIZATION NOTE: This message is displayed in the help page if the command
-# has no parameters.
-helpManNone=žiadne
-
-# LOCALIZATION NOTE: This message is displayed in response to the 'help'
-# command when used without a filter, just above the list of known commands.
-helpListAll=Dostupné príkazy:
-
-# LOCALIZATION NOTE (helpListPrefix, helpListNone): These messages are
-# displayed in response to the 'help <search>' command (i.e. with a search
-# string), just above the list of matching commands. Parameters: %S is the
-# search string.
-helpListPrefix=Príkazy začínajúce '%1$S':
-helpListNone=Žiadne príkazy nezačínajú reťazcom '%1$S'
-
-# LOCALIZATION NOTE (helpManRequired, helpManOptional, helpManDefault): When
-# the 'help x' command wants to show the manual for the 'x' command, it needs
-# to be able to describe the parameters as either required or optional, or if
-# they have a default value.
-helpManRequired=vyžadované
-helpManOptional=voliteľné
-helpManDefault=voliteľné, predvolené=%1$S
-
-# LOCALIZATION NOTE: This forms part of the output from the 'help' command.
-# 'GCLI' is a project name and should be left untranslated.
-helpIntro=GCLI je experimentom s cieľom vytvoriť vysoko použiteľný príkazový riadok pre webových vývojárov.
-
-# LOCALIZATION NOTE: Text shown as part of the output of the 'help' command
-# when the command in question has sub-commands, before a list of the matching
-# sub-commands.
-subCommands=Podpríkazy
-
-# LOCALIZATION NOTE: This error message is displayed when the command line is
-# cannot find a match for the parse types.
-commandParseError=Chyba pri spracovaní príkazového riadku
-
-# LOCALIZATION NOTE (contextDesc, contextManual, contextPrefixDesc): These
-# strings are used to describe the 'context' command and its 'prefix'
-# parameter. See localization comment for 'connect' for an explanation about
-# 'prefix'.
-contextDesc=Koncentruje sa na skupinu príkazov
-contextManual=Nastaví predvolený prefix pre budúce príkazy. Napríklad 'context git' by umožnilo zadávať 'commit' namiesto 'git commit'.
-contextPrefixDesc=Prefix príkazu
-
-# LOCALIZATION NOTE: This message message displayed during the processing of
-# the 'context' command, when the found command is not a parent command.
-contextNotParentError=Nie je možné použiť '%1$S' ako prefix, pretože to nie je rodičovský príkaz.
-
-# LOCALIZATION NOTE (contextReply, contextEmptyReply): These messages are
-# displayed during the processing of the 'context' command, to indicate
-# success or that there is no command prefix.
-contextReply=Používa sa %1$S ako prefix príkazu
-contextEmptyReply=Prefix príkazu je zrušený
-
-# LOCALIZATION NOTE (connectDesc, connectManual, connectPrefixDesc,
-# connectMethodDesc, connectUrlDesc, connectDupReply): These strings describe
-# the 'connect' command and all its available parameters. A 'prefix' is an 
-# alias for the remote server (think of it as a "connection name"), and it
-# allows to identify a specific server when connected to multiple remote
-# servers.
-connectDesc=Proxy príkazy na server
-connectManual=Pripojí sa k serveru, vytvára lokálne verzie príkazov na serveri. Vzdialené príkazy majú prefix na ich odlíšenie od lokálnych príkazov (ak sa ho chcete zbaviť, viď príkaz context).
-connectPrefixDesc=Rodičovský prefix pre importované príkazy
-connectMethodDesc=Metóda pripojenia
-connectUrlDesc=Adresa, ku ktorej sa pripája
-connectDupReply=Pripojenie nazvané %S už existuje.
-
-# LOCALIZATION NOTE: The output of the 'connect' command, telling the user
-# what it has done. Parameters: %S is the prefix command. See localization
-# comment for 'connect' for an explanation about 'prefix'.
-connectReply=Pridané príkazy %S.
-
-# LOCALIZATION NOTE (disconnectDesc2, disconnectManual2,
-# disconnectPrefixDesc): These strings describe the 'disconnect' command and
-# all its available parameters. See localization comment for 'connect' for an
-# explanation about 'prefix'.
-disconnectDesc2=Odpojiť zo servera
-disconnectManual2=Zo servera odpojí aktuálne pripojené vzdialené príkazy
-disconnectPrefixDesc=Rodičovský prefix pre importované príkazy
-    
-# LOCALIZATION NOTE: This is the output of the 'disconnect' command,
-# explaining the user what has been done. Parameters: %S is the number of
-# commands removed.
-disconnectReply=Odstránené príkazy %S.
-
-# LOCALIZATION NOTE (globalDesc, globalWindowDesc, globalOutput): These
-# strings describe the 'global' command and its parameters
-globalDesc=Zmeniť JS global
-globalWindowDesc=Nové okno/global
-globalOutput=JS global je teraz %S
-
-# LOCALIZATION NOTE: These strings describe the 'clear' command
-clearDesc=Vymazať výstup
-
-# LOCALIZATION NOTE (langDesc, langOutput): These strings describe the 'lang'
-# command and its parameters
-langDesc=Zadávajte príkazy v iných jazykoch
-langOutput=Práve používate %S
-
-# LOCALIZATION NOTE (prefDesc, prefManual, prefListDesc, prefListManual,
-# prefListSearchDesc, prefListSearchManual, prefShowDesc, prefShowManual,
-# prefShowSettingDesc, prefShowSettingManual): These strings describe the
-# 'pref' command and all its available sub-commands and parameters.
-prefDesc=Príkazy pre nastavenia
-prefManual=Príkazy na zobrazenie a zmenu nastavení pre GCLI a okolité prostredie
-prefListDesc=Zobrazí dostupné predvoľby
-prefListManual=Zobrazí zoznam predvolieb, voliteľne filtrované pomocou parametra 'search'
-prefListSearchDesc=Filter zoznamu zobrazených predvolieb
-prefListSearchManual=Vyhľadá zadaný reťazec v zozname dostupných predvolieb
-prefShowDesc=Zobrazí hodnotu predvoľby
-prefShowManual=Zobrazí hodnotu zadanej predvoľby
-prefShowSettingDesc=Predvoľba na zobrazenie
-prefShowSettingManual=Názov predvoľby na zobrazenie
-
-# LOCALIZATION NOTE: This message is used to show the preference name and the
-# associated preference value. Parameters: %1$S is the preference name, %2$S
-# is the preference value.
-prefShowSettingValue=%1$S: %2$S
-
-# LOCALIZATION NOTE (prefSetDesc, prefSetManual, prefSetSettingDesc,
-# prefSetSettingManual, prefSetValueDesc, prefSetValueManual): These strings
-# describe the 'pref set' command and all its parameters.
-prefSetDesc=Zmení predvoľbu
-prefSetManual=Zmení predvoľby definované prostredím
-prefSetSettingDesc=Predvoľba na zmenu
-prefSetSettingManual=Názov predvoľby, ktorá sa bude meniť.
-prefSetValueDesc=Nová hodnota predvoľby
-prefSetValueManual=Nová hodnota pre zadanú predvoľbu
-
-# LOCALIZATION NOTE (prefResetDesc, prefResetManual, prefResetSettingDesc,
-# prefResetSettingManual): These strings describe the 'pref reset' command and
-# all its parameters.
-prefResetDesc=Nastaví predvoľbu na predvolenú hodnotu
-prefResetManual=Nastaví hodnotu predvoľby na hodnotu predvolenú v systéme
-prefResetSettingDesc=Predvoľba na vynulovanie
-prefResetSettingManual=Názov predvoľby, ktorej hodnota bude nastavená na hodnotu predvolenú v systéme
-
-# LOCALIZATION NOTE: This string is displayed in the output from the 'pref
-# list' command as a label to an input element that allows the user to filter
-# the results.
-prefOutputFilter=Filter
-
-# LOCALIZATION NOTE (prefOutputName, prefOutputValue): These strings are
-# displayed in the output from the 'pref list' command as table headings.
-prefOutputName=Názov
-prefOutputValue=Hodnota
-
-# LOCALIZATION NOTE (introDesc, introManual): These strings describe the
-# 'intro' command. The localization of 'Got it!' should be the same used in
-# introTextGo.
-introDesc=Zobrazí úvodnú správu
-introManual=Opätovne zobrazí správu, ktorá sa zobrazuje novým používateľom až pokiaľ nekliknú na tlačidlo 'Budem opatrný, sľubujem!'
-
-# LOCALIZATION NOTE (introTextOpening3, introTextCommands, introTextKeys2,
-# introTextF1Escape, introTextGo): These strings are displayed when the user
-# first opens the developer toolbar to explain the command line, and is shown
-# each time it is opened until the user clicks the 'Got it!' button.
-introTextOpening3=GCLI je experimentom s cieľom vytvoriť vysoko použiteľný príkazový riadok pre webových vývojárov.
-introTextCommands=Ak chcete zobraziť zoznam príkazov zadajte
-introTextKeys2=, alebo ak chcete zobraziť pomocníka, stlačte
-introTextF1Escape=F1/Esc
-introTextGo=Jasné, rozumiem.
-
-# LOCALIZATION NOTE: This is a short description of the 'hideIntro' setting.
-hideIntroDesc=Zobrazí uvítaciu správu
-
-# LOCALIZATION NOTE: This is a description of the 'eagerHelper' setting. It's
-# displayed when the user asks for help on the settings. eagerHelper allows
-# users to select between showing no tooltips, permanent tooltips, and only
-# important tooltips.
-eagerHelperDesc=Ako často sa zobrazujú tooltipy
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/inspector.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/inspector.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/inspector.dtd	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/inspector.dtd	2015-05-25 20:51:18.000000000 +0000
@@ -68,6 +68,11 @@
 <!ENTITY inspectorHTMLPasteLastChild.label       "Ako posledný potomok">
 <!ENTITY inspectorHTMLPasteLastChild.accesskey   "l">
 
+<!-- LOCALIZATION NOTE (inspectorScrollNodeIntoView.label): This is the label
+     shown in the inspector contextual-menu for the item that lets users scroll
+     the current node into view -->
+<!ENTITY inspectorScrollNodeIntoView.label       "Prejsť do zobrazenia">
+<!ENTITY inspectorScrollNodeIntoView.accesskey   "P">
 
 <!-- LOCALIZATION NOTE (inspectorHTMLDelete.label): This is the label shown in
      the inspector contextual-menu for the item that lets users delete the
@@ -82,6 +87,11 @@
 <!ENTITY inspectorSearchHTML.label2         "Hľadať pomocou selektorov CSS">
 <!ENTITY inspectorSearchHTML.key            "F">
 
+<!-- LOCALIZATION NOTE (inspectorSearchHTML.label3): This is the label that will
+     be shown as the placeholder in the future, once the inspector search box
+     supports the full text HTML search in Bug 835896. -->
+<!ENTITY inspectorSearchHTML.label3 "Hľadať v HTML">
+
 <!-- 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
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/inspector.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/inspector.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/inspector.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/inspector.properties	2015-05-25 20:51:18.000000000 +0000
@@ -55,6 +55,14 @@
 #LOCALIZATION NOTE: Used in the image preview tooltip when the image could not be loaded
 eventsTooltip.openInDebugger=Otvoriť v okne Ladenia
 
+# LOCALIZATION NOTE (docsTooltip.visitMDN): Shown in the tooltip that displays
+# help from MDN. This is a link to the complete MDN documentation page.
+docsTooltip.visitMDN=Navštíviť stránku MDN
+
+# LOCALIZATION NOTE (docsTooltip.visitMDN): Shown in the docs tooltip when the MDN page
+# could not be loaded (for example, because of a connectivity problem).
+docsTooltip.loadDocsError=Stránku s dokumentami nebolo možné načítať.
+
 # LOCALIZATION NOTE (inspector.collapsePane): This is the tooltip for the button
 # that collapses the right panel (rules, computed, box-model, etc...) in the
 # inspector UI.
@@ -64,3 +72,34 @@
 # that expands the right panel (rules, computed, box-model, etc...) in the
 # inspector UI.
 inspector.expandPane=Rozbaliť panel
+
+# LOCALIZATION NOTE (inspector.menu.openUrlInNewTab.label): This is the label of
+# a menu item in the inspector contextual-menu that appears when the user right-
+# clicks on the attribute of a node in the inspector that is a URL, and that
+# allows to open that URL in a new tab.
+inspector.menu.openUrlInNewTab.label=Otvoriť odkaz na novej karte
+
+# LOCALIZATION NOTE (inspector.menu.copyUrlToClipboard.label): This is the label
+# of a menu item in the inspector contextual-menu that appears when the user
+# right-clicks on the attribute of a node in the inspector that is a URL, and
+# that allows to copy that URL in the clipboard.
+inspector.menu.copyUrlToClipboard.label=Kopírovať adresu odkazu
+
+# LOCALIZATION NOTE (inspector.menu.selectElement.label): This is the label of a
+# menu item in the inspector contextual-menu that appears when the user right-
+# clicks on the attribute of a node in the inspector that is the ID of another
+# element in the DOM (like with <label for="input-id">), and that allows to
+# select that element in the inspector.
+inspector.menu.selectElement.label=Zvoliť prvok #%S
+
+# LOCALIZATION NOTE (inspector.searchResultsCount2): This is the label that
+# will show up next to the inspector search box. %1$S is the current result
+# index and %2$S is the total number of search results. For example: "3 of 9".
+# This won't be visible until the search box is updated in Bug 835896.
+inspector.searchResultsCount2=%1$S z %2$S
+
+# LOCALIZATION NOTE (inspector.searchResultsNone): This is the label that
+# will show up next to the inspector search box when no matches were found
+# for the given string.
+# This won't be visible until the search box is updated in Bug 835896.
+inspector.searchResultsNone=Žiadne výsledky
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/jsonview.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/jsonview.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/jsonview.properties	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/jsonview.properties	2015-05-25 20:51:18.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/.
+
+# LOCALIZATION NOTE These strings are used in the JSON View tool
+# that is used to inspect application/json document types loaded
+# in the browser.
+
+# LOCALIZATION NOTE The correct localization of this file might be to keep it
+# in English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best documentation
+# on web development on the web.
+
+# LOCALIZATION NOTE (jsonViewer.tab.JSON, jsonViewer.tab.RawData,
+# jsonViewer.tab.Headers): Label for a panel tab.
+jsonViewer.tab.JSON=JSON
+jsonViewer.tab.RawData=Nespracované dáta
+jsonViewer.tab.Headers=Hlavičky
+
+# LOCALIZATION NOTE (jsonViewer.responseHeaders, jsonViewer.requestHeaders):
+# Label for header groups within the 'Headers' panel.
+jsonViewer.responseHeaders=Hlavičky odpovede
+jsonViewer.requestHeaders=Hlavičky požiadavky
+
+# LOCALIZATION NOTE (jsonViewer.Save): Label for save command
+jsonViewer.Save=Uložiť
+
+# LOCALIZATION NOTE (jsonViewer.Copy): Label for clipboard copy command
+jsonViewer.Copy=Kopírovať
+
+# LOCALIZATION NOTE (jsonViewer.PrettyPrint): Label for JSON
+# pretty print action button.
+jsonViewer.PrettyPrint=Naformátovať
+
+# LOCALIZATION NOTE (jsonViewer.reps.more): Label used in arrays
+# that have more items than displayed.
+jsonViewer.reps.more=ďalšie...
+
+# LOCALIZATION NOTE (jsonViewer.filterJSON): Label used in search box
+# at the top right cornder of the JSON Viewer.
+jsonViewer.filterJSON=Filtrovať JSON
+
+# LOCALIZATION NOTE (jsonViewer.reps.reference): Label used for cycle
+# references in an array.
+jsonViewer.reps.reference=Cyklická referencia
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/netmonitor.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/netmonitor.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/netmonitor.dtd	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/netmonitor.dtd	2015-05-25 20:51:18.000000000 +0000
@@ -124,6 +124,11 @@
   -  in the network details footer for the "Other" filtering button. -->
 <!ENTITY netmonitorUI.footer.filterOther  "Ďalšie">
 
+<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterFreetext): This is the label displayed
+  -  in the network details footer for the url filtering textbox. -->
+<!ENTITY netmonitorUI.footer.filterFreetext.label  "Filtrovať adresy">
+<!ENTITY netmonitorUI.footer.filterFreetext.key  "F">
+
 <!-- LOCALIZATION NOTE (netmonitorUI.footer.clear): This is the label displayed
   -  in the network details footer for the "Clear" button. -->
 <!ENTITY netmonitorUI.footer.clear  "Vymazať">
@@ -243,27 +248,63 @@
   -  in the security tab describing the server certificate section. -->
 <!ENTITY netmonitorUI.security.certificate "Certifikát:">
 
-<!-- LOCALIZATION NOTE (netmonitorUI.context.perfTools): This is the label displayed
-  -  on the context menu that shows the performance analysis tools -->
-<!ENTITY netmonitorUI.context.perfTools   "Spustiť analýzu výkonu…">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.perfTools.accesskey): This is the access key
-  -  for the performance analysis menu item displayed in the context menu for a request -->
-<!ENTITY netmonitorUI.context.perfTools.accesskey "S">
-
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl): This is the label displayed
   -  on the context menu that copies the selected request's url -->
 <!ENTITY netmonitorUI.context.copyUrl      "Kopírovať adresu URL">
 
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl.accesskey): This is the access key
+  -  for the Copy URL menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.context.copyUrl.accesskey  "K">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrlParams): This is the label displayed
+  -  on the context menu that copies the selected request's url parameters -->
+<!ENTITY netmonitorUI.context.copyUrlParams     "Kopírovať parametre adresy">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrlParams.accesskey): This is the access key
+  -  for the Copy URL Parameters menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.context.copyUrlParams.accesskey "m">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyPostData): This is the label displayed
+  -  on the context menu that copies the selected request's post data -->
+<!ENTITY netmonitorUI.context.copyPostData     "Kopírovať údaje POST">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyPostData.accesskey): This is the access key
+  -  for the Copy POST Data menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.context.copyPostData.accesskey "T">
+
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyAsCurl): This is the label displayed
   -  on the context menu that copies the selected request as a cURL command.
   -  The capitalization is part of the official name and should be used throughout all languages.
   -  http://en.wikipedia.org/wiki/CURL -->
 <!ENTITY netmonitorUI.context.copyAsCurl    "Kopírovať ako cURL">
 
-<!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl.accesskey): This is the access key
-  -  for the Copy URL menu item displayed in the context menu for a request -->
-<!ENTITY netmonitorUI.context.copyUrl.accesskey  "K">
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyAsCUrl.accesskey): This is the access key
+  -  for the Copy as cURL menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.context.copyAsCurl.accesskey "c">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyRequestHeaders): This is the label displayed
+  -  on the context menu that copies the selected item's request headers -->
+<!ENTITY netmonitorUI.context.copyRequestHeaders     "Kopírovať hlavičky požiadavky">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyRequestHeaders.accesskey): This is the access key
+  -  for the Copy Request Headers menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.context.copyRequestHeaders.accesskey  "h">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyResponseHeaders): This is the label displayed
+  -  on the context menu that copies the selected item's response headers -->
+<!ENTITY netmonitorUI.context.copyResponseHeaders     "Kopírovať hlavičky odpovede">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyResponseHeaders.accesskey): This is the access key
+  -  for the Copy Response Headers menu item displayed in the context menu for a response -->
+<!ENTITY netmonitorUI.context.copyResponseHeaders.accesskey  "v">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyResponse): This is the label displayed
+  -  on the context menu that copies the selected response as a string -->
+<!ENTITY netmonitorUI.context.copyResponse "Kopírovať odpoveď">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyRespose.accesskey): This is the access key
+  -  for the Copy Response menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.context.copyResponse.accesskey  "d">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyImageAsDataUri): This is the label displayed
   -  on the context menu that copies the selected image as data uri -->
@@ -280,7 +321,7 @@
 
 <!-- LOCALIZATION NOTE (netmonitorUI.summary.editAndResend.accesskey): This is the access key
   -  for the "Edit and Resend" menu item displayed in the context menu for a request -->
-<!ENTITY netmonitorUI.summary.editAndResend.accesskey  "Z">
+<!ENTITY netmonitorUI.summary.editAndResend.accesskey  "z">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.summary.rawHeaders): This is the label displayed
   -  on the button in the headers tab that toggle view for raw request/response headers
@@ -305,6 +346,14 @@
   -  network container -->
 <!ENTITY netmonitorUI.context.newTab.accesskey  "O">
     
+<!-- LOCALIZATION NOTE (netmonitorUI.context.perfTools): This is the label displayed
+  -  on the context menu that shows the performance analysis tools -->
+<!ENTITY netmonitorUI.context.perfTools   "Spustiť analýzu výkonu…">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.perfTools.accesskey): This is the access key
+  -  for the performance analysis menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.context.perfTools.accesskey "S">
+
 <!-- LOCALIZATION NOTE (netmonitorUI.custom.newRequest): This is the label displayed
   -  as the title of the new custom request form -->
 <!ENTITY netmonitorUI.custom.newRequest   "Nová požiadavka">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/profiler.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/profiler.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/profiler.dtd	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/profiler.dtd	2015-05-25 20:51:18.000000000 +0000
@@ -13,22 +13,44 @@
 
 <!-- LOCALIZATION NOTE (profilerUI.emptyNotice1/2): This is the label shown
   -  in the call list view when empty. -->
+<!-- TODO remove -->
 <!ENTITY profilerUI.emptyNotice1    "Kliknutím na tlačidlo">
+<!-- TODO remove -->
 <!ENTITY profilerUI.emptyNotice2    "spustíte záznam volaní funkcií JavaScriptu.">
 
 <!-- LOCALIZATION NOTE (profilerUI.stopNotice1/2): This is the label shown
   -  in the call list view while recording a profile. -->
+<!-- TODO remove -->
 <!ENTITY profilerUI.stopNotice1    "Opätovným kliknutím na tlačidlo">
+<!-- TODO remove -->
 <!ENTITY profilerUI.stopNotice2    "zastavíte profilovanie.">
 
+<!-- LOCALIZATION NOTE (profilerUI.startRecording/profilerUI.stopRecording): These are
+  -  the labels shown on the main recording buttons to start/stop recording. -->
+<!ENTITY profilerUI.startRecording "Spustiť záznam výkonu">
+<!ENTITY profilerUI.stopRecording  "Zastaviť záznam výkonu">
+
+<!-- LOCALIZATION NOTE (profilerUI.bufferStatusTooltip): This string
+  -  is displayed as the tooltip for the buffer capacity during a recording. -->
+<!ENTITY profilerUI.bufferStatusTooltip "Nástroj profilovania ukladá vzorky v cirkulárnom bufferi. Ak sa buffer naplní, najnovšie vzorky prepisujú najstaršie záznamy.">
+
+<!-- LOCALIZATION NOTE (profilerUI.bufferStatusFull): This string
+  -  is displayed when the profiler's circular buffer has started to overlap. -->
+<!ENTITY profilerUI.bufferStatusFull "Buffer je plný. Dochádza k prepisovaniu starých vzoriek.">
+
 <!-- LOCALIZATION NOTE (profilerUI.loadingNotice): This is the label shown
   -  in the call list view while loading a profile. -->
 <!ENTITY profilerUI.loadingNotice "Načítava sa…">
 
 <!-- LOCALIZATION NOTE (profilerUI.recordButton): This string is displayed
   -  on a button that starts a new profile. -->
+<!-- TODO remove -->
 <!ENTITY profilerUI.recordButton.tooltip "Záznam volaní funkcií JavaScriptu">
 
+<!-- LOCALIZATION NOTE (profilerUI.recordButton2): This string is displayed
+  -  on a button that starts a new profile. -->
+<!ENTITY profilerUI.recordButton2.tooltip "Prepína nahrávanie záznamu výkonu">
+
 <!-- LOCALIZATION NOTE (profilerUI.importButton): This string is displayed
   -  on a button that opens a dialog to import a saved profile data file. -->
 <!ENTITY profilerUI.importButton "Importovať…">
@@ -51,16 +73,22 @@
 
 <!-- LOCALIZATION NOTE (profilerUI.table.*): These strings are displayed
   -  in the call tree headers for a recording. -->
-<!ENTITY profilerUI.table.totalDuration2  "Celkový čas">
-<!ENTITY profilerUI.table.selfDuration2   "Vlastný čas">
-<!ENTITY profilerUI.table.totalPercentage "Celkové vyťaženie">
-<!ENTITY profilerUI.table.selfPercentage  "Vlastné vyťaženie">
-<!ENTITY profilerUI.table.samples         "Vzorky">
-<!ENTITY profilerUI.table.function        "Funkcia">
-<!ENTITY profilerUI.table.totalAlloc1       "Celkové zozbierané vyhradenia">
-<!ENTITY profilerUI.table.totalAllocTooltip "Celkový počet vyhradení objektu zozbieraných v tejto lokácii a vo volaniach">
-<!ENTITY profilerUI.table.selfAlloc1        "Zozbierané vlastné vyhradenia">
-<!ENTITY profilerUI.table.selfAllocTooltip  "Počet vyhradení objektu zozbieraných v tejto lokácii">
+<!ENTITY profilerUI.table.totalDuration2           "Celkový čas">
+<!ENTITY profilerUI.table.totalDuration.tooltip    "Množstvo času stráveného v tejto funkcii a vo funkciách, ktoré volá">
+<!ENTITY profilerUI.table.selfDuration2            "Čas vo funkcii">
+<!ENTITY profilerUI.table.selfDuration.tooltip     "Množstvo času stráveného v tejto funkcii">
+<!ENTITY profilerUI.table.totalPercentage          "Celkové vyťaženie">
+<!ENTITY profilerUI.table.totalPercentage.tooltip  "Percento času strávehého v tejto funkcii a vo funkciách, ktoré volá">
+<!ENTITY profilerUI.table.selfPercentage           "Vyťaženie vo funkcii">
+<!ENTITY profilerUI.table.selfPercentage.tooltip   "Percento času strávehého v tejto funkcii">
+<!ENTITY profilerUI.table.samples                  "Vzorky">
+<!ENTITY profilerUI.table.samples.tooltip          "Počet výskytov tejto funkcie v zásobníku v čase, keď nástroj profilovania zaznamenával vzorku">
+<!ENTITY profilerUI.table.function                 "Funkcia">
+<!ENTITY profilerUI.table.function.tooltip         "Názov a umiestnenie zdroja vzorkovanej funkcie">
+<!ENTITY profilerUI.table.totalAlloc1              "Celkové zozbierané vyhradenia">
+<!ENTITY profilerUI.table.totalAlloc.tooltip       "Celkový počet vyhradení objektu zozbieraných v tejto lokácii a vo volaniach">
+<!ENTITY profilerUI.table.selfAlloc1               "Zozbierané vlastné vyhradenia">
+<!ENTITY profilerUI.table.selfAlloc.tooltip        "Počet vyhradení objektu zozbieraných v tejto lokácii">
 
 <!-- LOCALIZATION NOTE (profilerUI.newtab.tooltiptext): The tooltiptext shown
   -  on the "+" (new tab) button for a profile when a selection is available. -->
@@ -117,3 +145,16 @@
 <!-- LOCALIZATION NOTE (profilerUI.JITOptimizationsTitle): This string
   -  is displayed as the title of the JIT Optimizations panel. -->
 <!ENTITY profilerUI.JITOptimizationsTitle "Optimalizácie JIT">
+
+<!-- LOCALIZATION NOTE (profilerUI.console.recordingNoticeStart/recordingNoticeEnd):
+  -  This string is displayed when a recording is selected that started via console.profile.
+  -  Wraps the command used to start, like "Currently recording via console.profile("label")" -->
+<!ENTITY profilerUI.console.recordingNoticeStart "Prebieha záznam cez">
+<!ENTITY profilerUI.console.recordingNoticeEnd   "">
+
+<!-- LOCALIZATION NOTE (profilerUI.console.stopCommandStart/stopCommandEnd):
+  -  This string is displayed when a recording is selected that started via console.profile.
+  -  Indicates how to stop the recording, wrapping the command, like
+  -  "Stop recording by entering console.profilEnd("label") into the console." -->
+<!ENTITY profilerUI.console.stopCommandStart "Záznam zastavíte zadaním">
+<!ENTITY profilerUI.console.stopCommandEnd   "do konzoly.">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/profiler.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/profiler.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/profiler.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/profiler.properties	2015-05-25 20:51:18.000000000 +0000
@@ -136,3 +136,14 @@
 # LOCALIZATION NOTE (jit.empty):
 # This string is displayed when there are no JIT optimizations to display.
 jit.empty=Pre túto vzorku neboli zaznamenané žiadne optimalizácie JIT.
+
+# LOCALIZATION NOTE (consoleProfile.recordingNotice/stopCommand):
+# These strings are displayed when a recording is in progress, that was started from the console.
+# TODO REMOVE
+consoleProfile.recordingNotice=Priebeha záznam profilu "%S".
+# TODO REMOVE
+consoleProfile.stopCommand=Profilovanie zastavíte zadaním reťazca "console.profileEnd('%S')" do konzoly.
+
+# LOCALIZATION NOTE (profiler.bufferStatus):
+# This string is displayed illustrating how full the profiler's circular buffer is.
+profiler.bufferStatus=Kapacita buffera: %S%
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/styleeditor.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/styleeditor.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/styleeditor.dtd	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/styleeditor.dtd	2015-05-25 20:51:18.000000000 +0000
@@ -61,3 +61,7 @@
 <!ENTITY noStyleSheet-tip-action.label "pripojiť nový súbor štýlov">
 <!-- LOCALICATION NOTE  (noStyleSheet-tip-end.label): End of the tip sentence -->
 <!ENTITY noStyleSheet-tip-end.label    "?">
+
+<!-- LOCALIZATION NOTE (openLinkNewTab.label): This is the text for the
+     context menu item that opens a stylesheet in a new tab -->
+<!ENTITY openLinkNewTab.label     "Otvoriť odkaz na novej karte">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/styleinspector.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/styleinspector.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/styleinspector.dtd	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/styleinspector.dtd	2015-05-25 20:51:18.000000000 +0000
@@ -13,9 +13,14 @@
   -  should be displayed or not. -->
 <!ENTITY browserStylesLabel    "Štýly prehliadača">
 
-<!-- LOCALIZATION NOTE (userStylesSearch): This is the placeholder that goes in
+<!-- LOCALIZATION NOTE (filterStylesPlaceholder): This is the placeholder that goes in
   -  the search box when no search term has been entered. -->
-<!ENTITY userStylesSearch      "Hľadať">
+<!ENTITY filterStylesPlaceholder      "Filtrovať štýly">
+
+<!-- LOCALIZATION NOTE (addRuleButtonTooltip): This is the tooltip shown when
+  -  hovering the `Add new rule` button in the rules view toolbar. This should
+  -  match ruleView.contextmenu.addNewRule in styleinspector.properties -->
+<!ENTITY addRuleButtonTooltip  "Pridať nové pravidlo">
 
 <!-- LOCALIZATION NOTE (selectedElementLabel): This is the label for the path of
   -  the highlighted element in the web page. This path is based on the document
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/timeline.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/timeline.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/timeline.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/timeline.properties	2015-05-25 20:51:18.000000000 +0000
@@ -40,8 +40,12 @@
 timeline.label.reflow2=Rozloženie
 timeline.label.paint=Vykreslenie
 timeline.label.javascript2=Volanie funkcie
+timeline.label.parseHTML=Spracovanie HTML
+timeline.label.parseXML=Spracovanie XML
 timeline.label.domevent=Udalosť DOM
 timeline.label.consoleTime=Konzola
+timeline.label.garbageCollection=Udalosť GC
+timeline.label.timestamp=Časová známka
 
 # LOCALIZATION NOTE (graphs.memory):
 # This string is displayed in the memory graph of the Performance tool,
@@ -71,3 +75,4 @@
 timeline.markerDetail.endStack=Zásobník na konci:
 timeline.markerDetail.unknownFrame=<neznáme umiestnenie>
 timeline.markerDetail.asyncStack=(Async: %S)
+timeline.markerDetail.causeName=Príčina:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/toolbox.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/toolbox.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/toolbox.dtd	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/toolbox.dtd	2015-05-25 20:51:18.000000000 +0000
@@ -6,6 +6,9 @@
 <!-- LOCALIZATION NOTE : FILE Do not translate key -->
 
 <!ENTITY closeCmd.key  "W">
+<!ENTITY toggleToolbox.key  "I">
+<!ENTITY toggleToolboxF12.keycode          "VK_F12">
+<!ENTITY toggleToolboxF12.keytext          "F12">
 
 <!ENTITY toolboxCloseButton.tooltip    "Zavrieť Vývojárske nástroje">
 <!ENTITY toolboxOptionsButton.key      "o">
@@ -97,11 +100,11 @@
 <!ENTITY options.disableCache.label2     "Zakázať vyrovnávaciu pamäť (ak sú otvorené Vývojárske nástroje)">
 <!ENTITY options.disableCache.tooltip2   "Označením tejto voľby zakážete používanie vyrovnávacej pamäte pre všetky karty, ktoré majú otvorené Vývojárske nástroje">
 
-<!-- LOCALIZATION NOTE (options.enableServiceWorkersTesting.label,
-  -  options.enableServiceWorkersTesting.tooltip): This is the options panel label and
-  -  tooltip for the checkbox that toggles the service workers testing features on or off. -->
-<!ENTITY options.enableServiceWorkersTesting.label     "Povoliť testovacie funkcie pre Service Workers (ak sú vývojárske nástroje otvorené)">
-<!ENTITY options.enableServiceWorkersTesting.tooltip   "Zapnutie tejto voľby povolí testovacie funkcie pre Service Workers pre všetky karty, ktoré majú otvorené vývojárske nástroje">
+<!-- LOCALIZATION NOTE (options.enableServiceWorkersHTTP.label,
+  -  options.enableServiceWorkersHTTP.tooltip): This is the options panel label and
+  -  tooltip for the checkbox that toggles the service workers testing features on or off. This option enables service workers over HTTP. -->
+<!ENTITY options.enableServiceWorkersHTTP.label     "Povoliť Service Workers cez HTTP (ak sú vývojárske nástroje otvorené)">
+<!ENTITY options.enableServiceWorkersHTTP.tooltip   "Zapnutie tejto voľby povolí service workers cez HTTP pre všetky karty, ktoré majú otvorené vývojárske nástroje">
 
 <!-- LOCALIZATION NOTE (options.selectAdditionalTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the default developer
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/toolbox.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/toolbox.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/toolbox.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/toolbox.properties	2015-05-25 20:51:18.000000000 +0000
@@ -71,11 +71,6 @@
 # This is the tooltip of the pick button in the toolbox toolbar
 pickButton.tooltip=Zvoľte prvok zo stránky
 
-# LOCALIZATION NOTE (sidebar.showAllTabs.label)
-# This is the label shown in the show all tabs button in the tabbed side
-# bar, when there's no enough space to show all tabs at once
-sidebar.showAllTabs.label=…
-
 # LOCALIZATION NOTE (sidebar.showAllTabs.tooltip)
 # This is the tooltip shown when hover over the '…' button in the tabbed side
 # bar, when there's no enough space to show all tabs at once
@@ -93,3 +88,15 @@
 # Used as a message in the alert displayed when trying to open a browser
 # content toolbox and there is no content process running
 toolbox.noContentProcess.message=Nie je spustený žiadny proces s obsahom.
+
+# LOCALIZATION NOTE (toolbox.viewCssSourceInStyleEditor.label)
+# Used as a message in either tooltips or contextual menu items to open the
+# corresponding URL as a css file in the Style-Editor tool.
+# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditor is used.
+toolbox.viewCssSourceInStyleEditor.label=Otvoriť súbor v Editore štýlov
+
+# LOCALIZATION NOTE (toolbox.viewJsSourceInDebugger.label)
+# Used as a message in either tooltips or contextual menu items to open the
+# corresponding URL as a js file in the Debugger tool.
+# DEV NOTE: Mostly used wherever toolbox.viewSourceInDebugger is used.
+toolbox.viewJsSourceInDebugger.label=Otvoriť súbor v Nástroji pre ladenie
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/webConsole.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/webConsole.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/webConsole.dtd	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/webConsole.dtd	2015-05-25 20:51:18.000000000 +0000
@@ -76,6 +76,16 @@
 <!ENTITY btnConsoleXhr          "XHR">
 <!ENTITY btnConsoleReflows      "Prekreslenia">
 
+<!-- LOCALIZATION NODE (btnConsoleSharedWorkers) the term "Shared Workers"
+  -  should not be translated. -->
+<!ENTITY btnConsoleSharedWorkers "Shared Workers">
+<!-- LOCALIZATION NODE (btnConsoleServiceWorkers) the term "Service Workers"
+  -  should not be translated. -->
+<!ENTITY btnConsoleServiceWorkers "Service Workers">
+<!-- LOCALIZATION NODE (btnConsoleWindowlessWorkers) the term "Workers"
+  -  should not be translated. -->
+<!ENTITY btnConsoleWindowlessWorkers "Workers pre dolnky alebo chrome">
+
 <!ENTITY filterOutput.placeholder "Filtrovať výstup">
 <!ENTITY btnClear.label        "Vymazať">
 <!ENTITY btnClear.tooltip      "Vymazať výstup webovej konzoly">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/webide.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/webide.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/webide.dtd	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/webide.dtd	2015-05-25 20:51:18.000000000 +0000
@@ -195,3 +195,16 @@
 
 <!-- Logs panel -->
 <!ENTITY logs_title "Záznamy príkazu Pre-packaging">
+
+<!-- Simulator Options -->
+<!ENTITY simulator_title "Nastavenia simulátora">
+<!ENTITY simulator_remove "Odstrániť simulátor">
+<!ENTITY simulator_reset "Obnoviť predvolené">
+<!ENTITY simulator_name "Názov">
+<!ENTITY simulator_software "Softvér">
+<!ENTITY simulator_version "Verzia">
+<!ENTITY simulator_profile "Profil">
+<!ENTITY simulator_hardware "Hardvér">
+<!ENTITY simulator_device "Zariadenie">
+<!ENTITY simulator_screenSize "Obrazovka">
+<!ENTITY simulator_pixelRatio "Pomer bodov">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/webide.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/webide.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/devtools/webide.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/devtools/webide.properties	2015-05-25 20:51:18.000000000 +0000
@@ -19,6 +19,9 @@
 importHostedApp_title=Otvorenie hostovanej aplikácie
 importHostedApp_header=Zadajte adresu manifestu
 
+selectCustomBinary_title=Zvoľte vlastné binárne zostavenie B2G
+selectCustomProfile_title=Zvoľte vlastný profil Gaia
+
 notification_showTroubleShooting_label=Riešenie problémov
 notification_showTroubleShooting_accesskey=R
 
@@ -43,6 +46,7 @@
 error_cantFetchAddonsJSON=Nie je možné získať zoznam doplnkov: %S
 
 error_appProjectsLoadFailed=Nebolo možné načítať zoznam projektov. Toto sa môže stať, ak ste tento profil použili s novšou verziou Firefoxu.
+error_folderCreationFailed=V zvolenom priečinku nebolo možné vytvoriť projektový priečinok.
 
 addons_stable=stabilný
 addons_unstable=nestabilný
@@ -77,3 +81,9 @@
 
 # Device preferences and settings
 device_reset_default=Nastaviť na predvolené
+
+# Simulator options
+simulator_custom_device=Vlastné
+simulator_custom_binary=Vlastné binárne zostavenie B2G…
+simulator_custom_profile=Vlastný profil Gaia…
+simulator_default_profile=Použiť predvolené
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/loop/loop.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/loop/loop.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/loop/loop.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/loop/loop.properties	2015-05-25 20:51:18.000000000 +0000
@@ -12,6 +12,19 @@
 rooms_tab_button_tooltip=Konverzácie
 contacts_tab_button_tooltip=Kontakty
 
+## LOCALIZATION_NOTE(sign_in_again_title_line_one, sign_in_again_title_line_two2):
+## These are displayed together at the top of the panel when a user is needed to
+## sign-in again. The emphesis is on the first line to get the user to sign-in again,
+## and this is displayed in slightly larger font. Please arrange as necessary for
+## your locale.
+## {{clientShortname2}} will be replaced by the brand name for either string.
+sign_in_again_title_line_one=Ak chcete pokračovať v používaní {{clientShortname2}},
+sign_in_again_title_line_two2=musíte sa znova prihlásiť
+sign_in_again_button=Prihlásiť sa
+## LOCALIZATION_NOTE(sign_in_again_use_as_guest_button2): {{clientSuperShortname}}
+## will be replaced by the super short brandname.
+sign_in_again_use_as_guest_button2=Používať {{clientSuperShortname}} ako hosť
+
 ## LOCALIZATION_NOTE(first_time_experience.title): clientShortname will be
 ## replaced by the brand name
 first_time_experience_title={{clientShortname}} — pripojiť sa k rozhovoru
@@ -108,7 +121,7 @@
 ## LOCALIZATION NOTE (add_or_import_contact_title): This is the subtitle of the
 ## panel.
 add_or_import_contact_title=Pridanie alebo import kontaktu
-import_contacts_button=Importovať
+import_contacts_button2=Importovať z Google
 importing_contacts_progress_button=Importuje sa…
 import_contacts_failure_message=Niektoré kontakty nemohli byť importované. Skúste to znova.
 ## LOCALIZATION NOTE(import_contacts_success_message): Success notification message
@@ -127,10 +140,10 @@
 import_failed_description_some=Niektoré kontakty nebolo možné naimportovať
 import_failed_support_button=Pomocník
 
-## LOCALIZATION NOTE(remove_contact_menu_button): Displayed in the contact list in
+## LOCALIZATION NOTE(remove_contact_menu_button2): Displayed in the contact list in
 ## a pop-up menu next to the contact's name.
 ## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
-remove_contact_menu_button=Odstrániť kontakt
+remove_contact_menu_button2=Odstrániť kontakt…
 ## LOCALIZATION NOTE(confirm_delete_contact_alert): This is an alert that is displayed
 ## to confirm deletion of a contact.
 confirm_delete_contact_alert=Naozaj chcete odstrániť tento kontakt?
@@ -249,6 +262,7 @@
 cannot_start_call_session_not_ready=Nie je možné začať hovor, relácia nie je pripravená.
 network_disconnected=Pripojenie k sieti bolo náhle prerušené.
 connection_error_see_console_notification=Hovor zlyhal. Podrobnejšie informácie nájdete v konzole.
+no_media_failure_message=Nebola nájdená kamera alebo mikrofón.
 
 ## LOCALIZATION NOTE (legal_text_and_links3): In this item, don't translate the
 ## parts between {{..}} because these will be replaced with links with the labels
@@ -305,9 +319,7 @@
 rooms_list_delete_tooltip=Odstrániť konverzáciu
 rooms_list_deleteConfirmation_label=Naozaj?
 rooms_list_no_current_conversations=Žiadne aktuálne konverzácie
-rooms_name_this_room_label=Pomenujte túto konverzáciu
-rooms_name_this_room_tooltip2=Kliknutím upravíte názov konverzácie
-rooms_name_change_failed_label=Konverzáciu nie je možné premenovať
+rooms_change_failed_label=Konverzáciu nie je možné aktualizovať
 rooms_new_room_button_label=Začať konverzáciu
 rooms_only_occupant_label=Ste tu prvý.
 rooms_panel_title=Zvoľte konverzáciu alebo začnite novú
@@ -327,7 +339,7 @@
 infobar_menuitem_dontshowagain_accesskey=N
 
 # Context in conversation strings
-context_offer_label=Poďme sa porozprávať o tejto stránke
+
 # LOCALIZATION NOTE (context_inroom_label): this string is followed by the
 # title/URL of the website you are having a conversation about, displayed on a
 # separate line. If this structure doesn't work for your locale, you might want
@@ -340,3 +352,10 @@
 context_edit_activate_label=Rozhovor o "{{title}}"
 context_edit_name_placeholder=Názov rozhovoru
 context_edit_comments_placeholder=Komentáre
+context_add_some_label=Pridajte kontext
+context_edit_tooltip=Upraviť kontext
+context_hide_tooltip=Skryť kontext
+context_show_tooltip=Zobraziť kontext
+context_save_label=Uložiť kontext
+context_link_modified=Tento odkaz bol zmenený.
+context_learn_more_link_label=Ďalšie informácie
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/newTab.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/newTab.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/newTab.dtd	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/newTab.dtd	2015-05-25 20:51:18.000000000 +0000
@@ -4,6 +4,10 @@
 
 <!-- These strings are used in the about:newtab page -->
 <!ENTITY newtab.pageTitle "Nová karta">
+<!ENTITY newtab.customize.classic "Zobrazovať moje top stránky">
+<!ENTITY newtab.customize.cog.enhanced "Ponúkať navrhované stránky">
+<!ENTITY newtab.customize.cog.title "Nastavenia Novej karty">
+<!ENTITY newtab.customize.cog.learn "Ďalšie informácie o Novej karte">
 <!ENTITY newtab.customize.title "Prispôsobte si svoju stránku Nová karta">
 <!ENTITY newtab.customize.suggested "Zobrazovať návrhy a moje top stránky">
 <!ENTITY newtab.customize.topsites "Zobrazovať moje top stránky">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/newTab.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/newTab.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/newTab.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/newTab.properties	2015-05-25 20:51:18.000000000 +0000
@@ -9,6 +9,10 @@
 # and enhanced tiles on the same line as the tile's title, so prefer short
 # strings to avoid overlap. This string should be uppercase.
 newtab.sponsored.button=SPONZOROVANÁ
+# LOCALIZATION NOTE(newtab.suggested.button): This text appears for sponsored
+# and suggested tiles on the same line as the tile's title, so prefer short
+# strings to avoid overlap. This string should be uppercase.
+newtab.suggested.tag=NAVRHOVANÁ
 # LOCALIZATION NOTE(newtab.suggested.button): %1$S will be replaced inline by
 # one of the user's top 100 sites that triggered this suggested tile.
 # This text appears for suggested tiles under the tile's title, so prefer short
@@ -18,6 +22,10 @@
 # the (X) block icon. %2$S will be replaced by an active link using string
 # newtab.learn.link as text.
 newtab.sponsored.explain=Tento grafický odkaz sa zobrazuje na prianie partnera Mozilly. Kedykoľvek ho môžete odstrániť kliknutím na tlačidlo %1$S. %2$S
+# LOCALIZATION NOTE(newtab.sponsored.explain2): %1$S will be replaced inline by
+# the (X) block icon. %2$S will be replaced by an active link using string
+# newtab.learn.link as text.
+newtab.sponsored.explain2=Túto stránku vám ako návrh ponúka partner Mozilly. Odstránite ju kedykoľvek kliknutím na tlačidlo %1$S. %2$S
 # LOCALIZATION NOTE(newtab.suggested.explain): %1$S will be replaced inline by
 # the (X) block icon. %2$S will be replaced by an active link using string
 # newtab.learn.link as text.
@@ -26,14 +34,40 @@
 # the gear icon used to customize the new tab window. %2$S will be replaced by
 # an active link using string newtab.learn.link as text.
 newtab.enhanced.explain=Partner Mozilly poskytol vizuálne lepší obrázok pre grafický odkaz a nahradil ním snímok stránky. Vylepšené grafické odkazy môžete vypnúť kliknutím na tlačidlo %1$S. %2$S
-# LOCALIZATION NOTE(newtab.intro.paragraph1): %1$S will be replaced inline by
-# active link using string newtab.learn.link as text.
-newtab.intro.paragraph1=Keď otvoríte novú kartu, uvidíte grafické odkazy na vaše najčastejšie navštevované stránky. Zároveň sa zobrazia stránky, o ktorých si myslíme, že by Vás mohli zaujímať. Niektoré z týchto odkazov môžu byť sponzorované partnermi Mozilly. Takéto sponzorované stránky budú vždy viditeľne označené. %1$S
 # LOCALIZATION NOTE(newtab.intro.paragraph2): %1$S will be replaced inline by
 # active link using string newtab.privacy.link as text.
 newtab.intro.paragraph2=Aby bolo možné poskytovať túto službu, Mozilla zbiera a používa analýzy a údaje vzťahujúce sa k vášmu používaniu grafických odkazov v súlade s dokumentom %1$S.
-# LOCALIZATION NOTE(newtab.intro.paragraph3): %1$S will be replaced inline by
-# the gear icon used to customize the new tab window.
-newtab.intro.paragraph3=Službu grafických odkazov môžete vypnúť kliknutím na tlačidlo %1$S.
+# LOCALIZATION NOTE(newtab.intro.paragraph4.2): %1$S will be replaced inline by
+# the gear icon used to customize the new tab window. %2$S will be replaced by
+# newtab.intro.controls as text. The quoted strings should be the same as
+# newtab.customize.cog.enhanced.
+newtab.intro.paragraph4.2=Túto službu môžete vypnúť kliknutím na tlačidlo s logom ozubeného kolesa (%1$S) a zrušením označenia položky "Ponúkať navrhované stránky" v ponuke %2$S.
+newtab.intro.paragraph5=Nová karta zobrazuje stránky, ktoré navštevujete najčastejšie. Takisto sú to stránky, o ktorých si myslíme, že by vás mohli zaujímať. Na začiatok uvidíte niekoľko stránok od Mozilly.
+# LOCALIZATION NOTE(newtab.intro.paragraph6): %1$S will be replaced by
+# newtab.intro.paragraph6.remove as bold text. %2$S will be replaced by
+# newtab.intro.paragraph6.pin as bold text
+newtab.intro.paragraph6=Ktorúkoľvek stránku môžete %1$S alebo %2$S pomocou ovládacích prvkov, ktoré sa zobrazia nad ukážkou stránky.
+newtab.intro.paragraph6.remove=odstrániť
+newtab.intro.paragraph6.pin=pripnúť
+newtab.intro.paragraph7=Niektoré zobrazované stránky môžu byť navrhované Mozillou, prípadne môžu byť sponzorované partnerom Mozilly. Takéto stránky vždy viditeľne označíme.
+# LOCALIZATION NOTE(newtab.intro.paragraph8): %1$S will be replaced by
+# brandShortName as text. %2$S will be replaced inline by an active link using
+# string newtab.learn.link as text.
+newtab.intro.paragraph8=%1$S bude zobrazovať len stránky, ktoré sa čo najviac približujú vašim záujmom na webe. %2$S
+newtab.intro.paragraph9=Keď teraz otvoríte novú kartu, budete vidieť aj stránky, o ktorých si myslíme, že by vás mohli zaujímať.
+# LOCALIZATION NOTE(newtab.intro.controls): the controls in the gear icon
+# menu for customizing the new tab window. Used in newtab.intro.paragraph4
+newtab.intro.controls=Nastavenie Novej karty
 newtab.learn.link=Ďalšie informácie…
 newtab.privacy.link=Zásady ochrany súkromia
+newtab.learn.link2=Ďalšie informácie o Novej karte
+newtab.privacy.link2=O vašom súkromí
+# LOCALIZATION NOTE(newtab.intro.header.welcome): %1$S will be replaced by
+# brandShortName as bold text.
+newtab.intro.header.welcome=Víta vás Nová karta v prehliadači %1$S!
+newtab.intro.header.update=Nová karta bola aktualizovaná!
+newtab.intro.skip=Preskočiť
+newtab.intro.continue=Pokračovať v prehliadke
+newtab.intro.back=Naspäť
+newtab.intro.next=Ďalej
+newtab.intro.gotit=Všetko jasné!
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/places/places.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/places/places.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/places/places.dtd	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/places/places.dtd	2015-05-25 20:51:18.000000000 +0000
@@ -85,7 +85,6 @@
 <!ENTITY col.url.label                      "Adresa">
 <!ENTITY col.mostrecentvisit.label          "Dátum poslednej návštevy">
 <!ENTITY col.visitcount.label               "Počet návštev">
-<!ENTITY col.keyword.label                  "Kľúčové slovo">
 <!ENTITY col.description.label              "Popis">
 <!ENTITY col.dateadded.label                "Pridané">
 <!ENTITY col.lastmodified.label             "Posledná úprava">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/places/places.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/places/places.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/places/places.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/places/places.properties	2015-05-25 20:51:18.000000000 +0000
@@ -36,8 +36,6 @@
 view.sortBy.1.date.accesskey=d
 view.sortBy.1.visitCount.label=Usporiadať podľa počtu návštev
 view.sortBy.1.visitCount.accesskey=t
-view.sortBy.1.keyword.label=Usporiadať podľa kľúčového slova
-view.sortBy.1.keyword.accesskey=k
 view.sortBy.1.description.label=Usporiadať podľa popisu
 view.sortBy.1.description.accesskey=o
 view.sortBy.1.dateAdded.label=Usporiadať podľa času pridania
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/preferences/aboutPermissions.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/preferences/aboutPermissions.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/preferences/aboutPermissions.dtd	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/preferences/aboutPermissions.dtd	2015-05-25 20:51:18.000000000 +0000
@@ -42,5 +42,7 @@
 <!ENTITY popup.label                     "Otváranie vyskakovacích okien">
 
 <!ENTITY fullscreen.label                "Režim Na celú obrazovku">
+
+<!ENTITY push.label                      "Príjem notifikácií typu Push">
 <!ENTITY camera.label                    "Použitie kamery">
 <!ENTITY microphone.label                "Použitie mikrofónu">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/preferences/advanced.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/preferences/advanced.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/preferences/advanced.dtd	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/preferences/advanced.dtd	2015-05-25 20:51:18.000000000 +0000
@@ -74,13 +74,8 @@
 <!ENTITY updateTab.label                 "Aktualizácie">
 
 <!ENTITY updateApp.label                 "Aktualizácie prehliadača &brandShortName;">
-<!-- Note either updateAuto1 is used or (updateAutoMetro and updateAutoDesktop),
-     so re-using accesss key in updateAuto1 is OK. updateAutoDesktop can be found
-     in preferences.properties -->
 <!ENTITY updateAuto1.label               "Automaticky inštalovať aktualizácie (odporúčané z dôvodu zvýšenej bezpečnosti)">
 <!ENTITY updateAuto1.accesskey           "A">
-<!ENTITY updateAutoMetro.label           "Automaticky inštalovať aktualizácie klasického &brandShortName;u aj verzie pre Windows 8">
-<!ENTITY updateAutoMetro.accesskey       "m">
 <!ENTITY updateCheck.label               "Vyhľadávať aktualizácie, ale poskytnúť možnosť zvoliť, či sa nainštalujú">
 <!ENTITY updateCheck.accesskey           "k">
 <!ENTITY updateManual.label              "Nevyhľadávať aktualizácie (neodporúča sa z dôvodu zníženej bezpečnosti)">
@@ -89,8 +84,6 @@
 <!ENTITY updateAutoAddonWarn.label       "Upozorniť, ak by nainštalovanie zakázalo niektoré doplnky">
 <!ENTITY updateAutoAddonWarn.accesskey   "U">
 
-<!ENTITY updateAutoMetroWarn.label       "(verzia &brandShortName;u pre Windows 8 nekontroluje kompatibilitu doplnkov)">
-
 <!ENTITY updateHistory.label             "Zobraziť históriu aktualizácií">
 <!ENTITY updateHistory.accesskey         "h">
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/preferences/main.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/preferences/main.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/preferences/main.dtd	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/preferences/main.dtd	2015-05-25 20:51:18.000000000 +0000
@@ -40,3 +40,5 @@
 <!ENTITY separateProfileMode.label        "Umožniť, aby &brandShortName; a Firefox mohli byť spustené v rovnakom čase">
 <!ENTITY useFirefoxSync.label             "Tip: použijú sa oddelené používateľské profily. Ak chcete medzi nimi zdieľať údaje, môžete využiť službu Sync.">
 <!ENTITY getStarted.label                 "Začať používať službu Sync…">
+
+<!ENTITY e10sEnabled.label                "Zapnúť režim viacerých procesov prehliadača &brandShortName;">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/preferences/preferences.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/preferences/preferences.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/preferences/preferences.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/preferences/preferences.properties	2015-05-25 20:51:18.000000000 +0000
@@ -136,11 +136,6 @@
 #   %2$S = unit (MB, KB, etc.)
 actualAppCacheSize=Vyrovnávacia pamäť aplikácie aktuálne zaberá %1$S %2$S miesta na disku
 
-###Preferences::Advanced::Update
-#LOCALIZATION NOTE: The next string is for updating in Windows 8 only instead of updateAuto1.label.  %S = brandShortName
-updateAutoDesktop.label=Automaticky inštalovať aktualizácie pre klasickú verziu %Su
-updateAutoDesktop.accessKey=A
-
 syncUnlink.title=Chcete zrušiť prepojenie s týmto zariadením?
 syncUnlink.label=Toto zariadenie už nebude prepojené s vašim účtom služby Sync. Všetky vaše osobné údaje v tomto zariadení a takisto na účte služby Sync zostanú nedotknuté.
 syncUnlinkConfirm.label=Zrušiť prepojenie
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd	2015-05-25 20:51:18.000000000 +0000
@@ -12,6 +12,11 @@
 <!ENTITY safeb.blocked.malwarePage.shortDesc "Webová stránka <span id='malware_sitename'/> bola označená ako podvodná a na základe nastavení zabezpečenia bola zablokovaná.">
 <!ENTITY safeb.blocked.malwarePage.longDesc "<p>Škodlivé stránky sa pokúšajú nainštalovať programy, ktoré kradnú súkromné údaje, používajú počítač na útoky na iné počítače alebo poškodzujú systém.</p><p>Niektoré škodlivé stránky rozširujú nebezpečný softvér úmyselne, ale mnoho z nich bolo napadnutých a rozširuje tento softvér bez vedomosti ich majiteľa.</p>">
 
+<!ENTITY safeb.blocked.unwantedPage.title "Nahlásená ako stránka s nevyžiadaným softvérom!">
+<!-- Localization note (safeb.blocked.malware.shortDesc) - Please don't translate the contents of the <span id="unwanted_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
+<!ENTITY safeb.blocked.unwantedPage.shortDesc "Webová stránka <span id='unwanted_sitename'/> bola označená ako stránka s nevyžiadaným softvérom a na základe nastavení zabezpečenia bola zablokovaná.">
+<!ENTITY safeb.blocked.unwantedPage.longDesc "<p>Stránky s nevyžiadaným softvérom sa pokúšajú inštalovať softér, ktorý môže byť klamlivý a môže ovplyvňovať rôznymi spôsobmi celý systém.</p>">
+
 <!ENTITY safeb.blocked.phishingPage.title "Nahlásená podozrivá stránka!">
 <!-- Localization note (safeb.blocked.phishing.shortDesc) - Please don't translate the contents of the <span id="phishing_sitename"/> tag. It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
 <!ENTITY safeb.blocked.phishingPage.shortDesc "Webová stránka <span id='phishing_sitename'/> bola označená ako podozrivá a na základe nastavení zabezpečenia bola zablokovaná.">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/sitePermissions.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/sitePermissions.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/sitePermissions.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/sitePermissions.properties	2015-05-25 20:51:18.000000000 +0000
@@ -18,4 +18,4 @@
 permission.indexedDB.label = Správa úložiska režimu offline
 permission.fullscreen.label = Prechod do režimu Na celú obrazovku
 permission.pointerLock.label = Skrytie kurzora myši
-
+permission.push.label = Príjem notifikácií typu Push
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/syncProgress.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/syncProgress.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/syncProgress.dtd	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/syncProgress.dtd	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY % brandDTD
-    SYSTEM "chrome://branding/locale/brand.dtd">
-    %brandDTD;
-
-<!-- These strings are used in the sync progress upload page -->
-<!ENTITY syncProgress.pageTitle    "Vaša prvá synchronizácia">
-<!ENTITY syncProgress.textBlurb    "Vaše údaje sú práve šifrované a odosielané na pozadí. Túto kartu môžete zavrieť a pokračovať v používaní prehliadača &brandShortName;.">
-<!ENTITY syncProgress.closeButton  "Zavrieť">
-<!ENTITY syncProgress.logoAltText  "Logo prehliadača &brandShortName;">
-<!ENTITY syncProgress.diffText     "&brandShortName; sa teraz automaticky synchronizuje na pozadí. Túto kartu môžete zavrieť a pokračovať v používaní prehliadača &brandShortName;.">
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/syncSetup.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/syncSetup.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/browser/syncSetup.dtd	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/browser/syncSetup.dtd	2015-05-25 20:51:18.000000000 +0000
@@ -33,8 +33,6 @@
 <!ENTITY setup.choosePassword.accesskey  "o">
 <!ENTITY setup.confirmPassword.label  "Potvrdenie hesla">
 <!ENTITY setup.confirmPassword.accesskey  "P">
-<!ENTITY setup.setupMetro.label     "Synchronizovať s prehliadačom &brandShortName; pre Windows 8">
-<!ENTITY setup.setupMetro.accesskey "S">
 
 <!-- LOCALIZATION NOTE: tosAgree1, tosLink, tosAgree2, ppLink, tosAgree3 are
      joined with implicit white space, so spaces in the strings aren't necessary -->
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/overrides/appstrings.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/overrides/appstrings.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/overrides/appstrings.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/overrides/appstrings.properties	2015-05-25 20:51:18.000000000 +0000
@@ -30,6 +30,7 @@
 externalProtocolChkMsg=Zapamätať si nastavenie pre všetky odkazy rovnakého typu.
 externalProtocolLaunchBtn=Spustiť aplikáciu
 malwareBlocked=Stránka %S bola označená ako podvodná a na základe nastavení zabezpečenia bola zablokovaná.
+unwantedBlocked=Stránka %S bola označená ako ponúkajúca nevyžiadaný softvér 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.
 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.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/overrides/netError.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/overrides/netError.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/chrome/overrides/netError.dtd	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/chrome/overrides/netError.dtd	2015-05-25 20:51:18.000000000 +0000
@@ -152,6 +152,11 @@
 <p>Vlastníci stránok, ktorí si myslia, že ich stránky boli označené ako škodlivé neprávom, môžu <a href='http://www.stopbadware.org/home/reviewinfo' >požiadať o prehodnotenie</a>.</p>
 ">
 
+<!ENTITY unwantedBlocked.title "Podozrivá stránka s nevyžiadaným softvérom!">
+<!ENTITY unwantedBlocked.longDesc "
+<p>Stránky s nevyžiadaným softvérom sa pokúšajú inštalovať softér, ktorý môže byť klamlivý a môže ovplyvňovať rôznymi spôsobmi celý systém.</p>
+">
+
 <!ENTITY phishingBlocked.title "Podozrivá stránka!">
 <!ENTITY phishingBlocked.longDesc "
 <p>Ak na tejto stránke zadáte nejaké osobné údaje, môžu byť použité na krádež identity alebo inak zneužité.</p>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/profile/bookmarks.inc firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/profile/bookmarks.inc
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/browser/profile/bookmarks.inc	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/browser/profile/bookmarks.inc	2015-05-25 20:51:18.000000000 +0000
@@ -37,9 +37,4 @@
 # link title for https://www.mozilla.org/en-US/about/
 #define firefox_about O nás
 
-# LOCALIZATION NOTE (firefox_feedback):
-# link title for browser feedback page
-# currently used by Metro only: https://input.mozilla.org/feedback/metrofirefox
-#define firefox_feedback Poskytnúť spätnú väzbu
-
 #unfilter emptyLines
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/dom/chrome/appstrings.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/dom/chrome/appstrings.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/dom/chrome/appstrings.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/dom/chrome/appstrings.properties	2015-05-25 20:51:19.000000000 +0000
@@ -29,6 +29,7 @@
 externalProtocolChkMsg=Zapamätať si nastavenie pre všetky odkazy rovnakého typu.
 externalProtocolLaunchBtn=Spustiť aplikáciu
 malwareBlocked=Stránka %S bola označená ako podvodná a na základe nastavení zabezpečenia bola zablokovaná.
+unwantedBlocked=Stránka %S bola označená ako ponúkajúca nevyžiadaný softvér 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.
 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.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/dom/chrome/dom/dom.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/dom/chrome/dom/dom.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/dom/chrome/dom/dom.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/dom/chrome/dom/dom.properties	2015-05-25 20:51:19.000000000 +0000
@@ -79,7 +79,6 @@
 FullScreenDeniedSubDocFullScreen=Požiadavka na spustenie režimu Na celú obrazovku bola zamietnutá, pretože poddokument dokumentu, ktorý o to požiadal, už je v režime Na celú obrazovku.
 FullScreenDeniedNotDescendant=Požiadavka na spustenie režimu Na celú obrazovku bola zamietnutá, pretože prvok, ktorý o to požiadal, nie je potomkom prvku, ktorý má aktuálne zapnutý režim Na celú obrazovku.
 FullScreenDeniedNotFocusedTab=Požiadavka na spustenie režimu Na celú obrazovku bola zamietnutá, pretože prvok, ktorý o to požiadal, sa nenachádza na práve aktívnej karte.
-FullScreenDeniedContentOnly=Požiadavka na spustenie režimu Na celú obrazovku bola zamietnutá, pretože prvok sa nachádza v chrome dokumentu a API tohto režimu je platné len pre obsah dokumentu.
 RemovedFullScreenElement=Režim Na celú obrazovku bol ukončený, pretože prvok režimu bol odstránený z dokumentu.
 FocusedWindowedPluginWhileFullScreen=Režim Na celú obrazovku bol ukončený, preto zásuvný modul vyžadujúci okno je práve v popredí.
 HTMLSyncXHRWarning=Spracovanie HTML v požiadavke XMLHttpRequest nie je podporované v synchrónnom režime.
@@ -163,3 +162,7 @@
 WillChangeBudgetWarning=Spotreba pamäte will-change je príliš vysoká. Oblasť pokrytia je %1$S bodov, dostupné množstvo je plocha dokumentu vynásobená hodnotou %2$S (%3$S bodov). Všetky výskyty will-change budú v dokuemnte ignorované, ak je dostupné množstvo prekročené.
 # LOCALIZATION NOTE: Do not translate "ServiceWorker".
 HittingMaxWorkersPerDomain=ServiceWorker nemohol byť spustený okamžite, pretože iné dokumenty rovnakého pôvodu už využívajú maximálny povolený počet workerov. Tento ServiceWorker bol pridaný do fronty a bude odštartovaný hneď ako niektorý z predchádzajúcich skončí.
+# LOCALIZATION NOTE: Do no translate "setVelocity", "PannerNode", "AudioListener", "speedOfSound" and "dopplerFactor"
+PannerNodeDopplerWarning=Používanie setVelocity pre PannerNode a AudioListener, a takisto speedOfSound a dopplerFactor pre AudioListener je zavrhnuté a títo členovia budú odstránení. Ďalšie informácie na stránke https://developer.mozilla.org/en-US/docs/Web/API/AudioListener#Deprecated_features
+# LOCALIZATION NOTE: Do not translate "Worker".
+EmptyWorkerSourceWarning=Pokus o vytvorenie Workera z prázdneho zdroja. Toto pravdepodobne nie je chcené.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/dom/chrome/netError.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/dom/chrome/netError.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/dom/chrome/netError.dtd	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/dom/chrome/netError.dtd	2015-05-25 20:51:19.000000000 +0000
@@ -81,6 +81,11 @@
 <p>Autori stránok, ktorí si myslia, že ich stránky boli označené ako škodlivé neprávom, môžu <a href='http://www.stopbadware.org/home/reviewinfo' >požiadať o prehodnotenie</a>.</p>
 ">
 
+<!ENTITY unwantedBlocked.title "Podozrivá stránka s nevyžiadaným softvérom!">
+<!ENTITY unwantedBlocked.longDesc "
+<p>Stránky s nevyžiadaným softvérom sa pokúšajú inštalovať softér, ktorý môže byť klamlivý a môže ovplyvňovať rôznymi spôsobmi celý systém.</p>
+">
+
 <!ENTITY phishingBlocked.title "Podozrivá stránka!">
 <!ENTITY phishingBlocked.longDesc "
 <p>Ak na tejto stránke zadáte nejaké osobné údaje, môžu byť použité na krádež identity alebo inak zneužité.</p>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/security/manager/chrome/pipnss/nsserrors.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/security/manager/chrome/pipnss/nsserrors.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/security/manager/chrome/pipnss/nsserrors.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/security/manager/chrome/pipnss/nsserrors.properties	2015-05-25 20:51:18.000000000 +0000
@@ -318,3 +318,4 @@
 MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE=Server poskytol certifikát, ktorý ešte nie je platný.
 MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE=Na vydanie certifikátu servera bol použitý certifikát, ktorý ešte nie je platný.
 MOZILLA_PKIX_ERROR_SIGNATURE_ALGORITHM_MISMATCH=Algoritmus podpisu sa v podpisovom poli certifikátu nezhoduje s algoritmom v poli signatureAlgorithm.
+MOZILLA_PKIX_ERROR_OCSP_RESPONSE_FOR_CERT_MISSING=Odpoveď OCSP neobsahuje stav pre overovaný certifikát.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/toolkit/chrome/global/aboutServiceWorkers.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/toolkit/chrome/global/aboutServiceWorkers.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/toolkit/chrome/global/aboutServiceWorkers.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/toolkit/chrome/global/aboutServiceWorkers.properties	2015-05-25 20:51:18.000000000 +0000
@@ -4,14 +4,15 @@
 
 title = Pôvod: %S
 
-# LOCALIZATION NOTE the terms "AppId" and "InBrowserElement" should not be translated.
-b2gtitle = Firefox OS AppID %S - InBrowserElement %S
+# LOCALIZATION NOTE: %1$S is brandShortName, %2$2 is the application ID, and $%$3 is true/false value.
+# LOCALIZATION NOTE: the term "InBrowserElement" should not be translated
+b2gtitle = %1$S Application ID %2$S - InBrowserElement %3$S
 
 scope = Rozsah:
 
 scriptSpec = Špecifikácia skriptu:
 
-# LOCALIZATION NOTE the term "Worker" should not be translated.
+# LOCALIZATION NOTE: the term "Worker" should not be translated.
 currentWorkerURL = Aktuálna adresa workera:
 
 activeCacheName = Názov aktívnej vyrovnávacej pamäte:
@@ -22,11 +23,14 @@
 
 false = false
 
+# LOCALIZATION NOTE this term is used as a button label (verb, not noun).
 update = Aktualizovať
 
 unregister = Odregistrovať
 
-waiting = Čaká sa...
+waiting = Čaká sa…
 
-# LOCALIZATION NODE the term "Service Worker" should not translated.
+# LOCALIZATION NOTE: the term "Service Worker" should not translated.
 unregisterError = Tento Service Worker sa nepodarilo odregistrovať.
+
+pushEndpoint = Push Endpoint:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/toolkit/chrome/global/aboutSupport.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/toolkit/chrome/global/aboutSupport.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/toolkit/chrome/global/aboutSupport.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/toolkit/chrome/global/aboutSupport.properties	2015-05-25 20:51:18.000000000 +0000
@@ -37,6 +37,8 @@
 # "GPU Accelerated Windows: 0/2"
 acceleratedWindows = Okná urýchľované pomocou GPU
 
+supportsHardwareH264 = Podporuje hardvérové dekódovanie H264
+
 # LOCALIZATION NOTE (rawDataCopied) Text displayed in a mobile "Toast" to user when the
 # raw data is successfully copied to the clipboard via button press.
 rawDataCopied=Údaje boli skopírované do schránky
@@ -97,6 +99,7 @@
 multiProcessStatus = %1$S/%2$S (predvolené: %3$S)
 
 asyncPanZoom = Asynchrónna lupa/panning
+apzNone = žiadna
 wheelEnabled = vstup kolieskom povolený
 touchEnabled = dotykový vstup povolený
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/toolkit/chrome/global/aboutTelemetry.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/toolkit/chrome/global/aboutTelemetry.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/toolkit/chrome/global/aboutTelemetry.dtd	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/toolkit/chrome/global/aboutTelemetry.dtd	2015-05-25 20:51:18.000000000 +0000
@@ -4,12 +4,38 @@
 
 <!ENTITY aboutTelemetry.pageTitle "Údaje telemetrie">
 
-<!ENTITY aboutTelemetry.telemetryEnabled "Telemetria je <span>zapnutá</span>.">
+<!ENTITY aboutTelemetry.changeDataChoices "Zmeniť">
 
-<!ENTITY aboutTelemetry.telemetryDisabled "Telemetria je <span>vypnutá</span>.">
+<!ENTITY aboutTelemetry.uploadEnabled "Odosielanie údajov FHR je <span>povolené</span>.">
+
+<!ENTITY aboutTelemetry.uploadDisabled "Odosielanie údajov FHR je <span>zakázané</span>.">
+
+<!ENTITY aboutTelemetry.extendedRecordingEnabled "Záznam rozšírenej telemetrie je <span>zapnutý</span>.">
+
+<!ENTITY aboutTelemetry.extendedRecordingDisabled "Záznam rozšírenej telemetrie je <span>vypnutý</span>.">
+
+<!ENTITY aboutTelemetry.pingDataSource "Zdroj údajov pre ping:">
+
+<!ENTITY aboutTelemetry.showCurrentPingData "Aktuálne údaje pingu">
+
+<!ENTITY aboutTelemetry.showArchivedPingData "Archivované údaje pingu">
+
+<!ENTITY aboutTelemetry.showSubsessionData "Zobraziť údaje sub-relácie">
+
+<!ENTITY aboutTelemetry.choosePing "Zvoľte ping:">
+
+<!ENTITY aboutTelemetry.showNewerPing "&lt;&lt; Novší ping">
+
+<!ENTITY aboutTelemetry.showOlderPing "Starší ping &gt;&gt;">
+
+<!ENTITY aboutTelemetry.archiveWeekHeader "Týždeň">
+
+<!ENTITY aboutTelemetry.archivePingHeader "Ping">
 
 <!ENTITY aboutTelemetry.generalDataSection "Všeobecné údaje">
 
+<!ENTITY aboutTelemetry.environmentDataSection "Údaje prostredia">
+
 <!ENTITY aboutTelemetry.telemetryLogSection "Záznamy telemetrie">
 
 <!ENTITY aboutTelemetry.slowSqlSection "Pomalé výrazy SQL">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/toolkit/chrome/global/aboutTelemetry.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/toolkit/chrome/global/aboutTelemetry.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/toolkit/chrome/global/aboutTelemetry.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/toolkit/chrome/global/aboutTelemetry.properties	2015-05-25 20:51:18.000000000 +0000
@@ -13,6 +13,10 @@
 
 generalDataHeadingValue = Hodnota
 
+environmentDataHeadingName = Názov
+
+environmentDataHeadingValue = Hodnota
+
 telemetryLogTitle = Záznamy telemetrie
 
 telemetryLogHeadingId = Identifikátor
@@ -54,10 +58,6 @@
 
 histogramCopy = Kopírovať
 
-disableTelemetry = Vypnúť telemetriu
-
-enableTelemetry = Zapnúť telemetriu
-
 keysHeader = Kľúč
 
 valuesHeader = Hodnota
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/toolkit/chrome/global/console.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/toolkit/chrome/global/console.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/toolkit/chrome/global/console.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/toolkit/chrome/global/console.properties	2015-05-25 20:51:18.000000000 +0000
@@ -4,6 +4,7 @@
 
 typeError=Chyba:
 typeWarning=Upozornenie:
+typeMessage=Správa:
 errFile=Zdrojový súbor: %S
 errLine=Riadok: %S
 errLineCol=Riadok %S, stĺpec %S
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/toolkit/chrome/global/devtools/gclicommands.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/toolkit/chrome/global/devtools/gclicommands.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/toolkit/chrome/global/devtools/gclicommands.properties	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/toolkit/chrome/global/devtools/gclicommands.properties	2015-05-25 20:51:18.000000000 +0000
@@ -0,0 +1,1573 @@
+  # This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE These strings are used inside Web Console commands.
+# The Web Console command line is available from the Web Developer sub-menu
+# -> 'Web Console'.
+#
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# LOCALIZATION NOTE (helpDesc) A very short string used to describe the
+# function of the help command.
+helpDesc=Pomocník pre dostupné príkazy
+
+# LOCALIZATION NOTE (helpAvailable) Used in the output of the help command to
+# explain the contents of the command help table.
+helpAvailable=Dostupné príkazy
+
+# LOCALIZATION NOTE (notAvailableInE10S) Used in the output of any command that
+# is not compatible with multiprocess mode (E10S).
+notAvailableInE10S=Príkaz '%1$S' nie je dostupný v režime viacerých procesov (E10S)
+
+# LOCALIZATION NOTE (consoleDesc) A very short string used to describe the
+# function of the console command.
+consoleDesc=Príkazy na ovládanie konzoly
+
+# LOCALIZATION NOTE (consoleManual) A longer description describing the
+# set of commands that control the console.
+consoleManual=Filtrovanie, vymazanie a zatvorenie webovej konzoly
+
+# LOCALIZATION NOTE (consoleclearDesc) A very short string used to describe the
+# function of the 'console clear' command.
+consoleclearDesc=Vymaže konzolu
+
+# LOCALIZATION NOTE (screenshotDesc) A very short description of the
+# 'screenshot' command. See screenshotManual for a fuller description of what
+# it does. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+screenshotDesc=Uloží snímku stránky
+
+# LOCALIZATION NOTE (screenshotManual) A fuller description of the 'screenshot'
+# command, displayed when the user asks for help on what it does.
+screenshotManual=Uloží snímku celého viditeľného okna ako obrázok PNG (voliteľne s oneskorením)
+
+# LOCALIZATION NOTE (screenshotFilenameDesc) A very short string to describe
+# the 'filename' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotFilenameDesc=Názov cieľového súboru
+
+# LOCALIZATION NOTE (screenshotFilenameManual) A fuller description of the
+# 'filename' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotFilenameManual=Názov súboru (mal by mať príponu '.png'), do ktorého sa obrázok uloží.
+
+# LOCALIZATION NOTE (screenshotClipboardDesc) A very short string to describe
+# the 'clipboard' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotClipboardDesc=Kopírovať snímku do schránky? (true/false)
+
+# LOCALIZATION NOTE (screenshotClipboardManual) A fuller description of the
+# 'clipboard' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotClipboardManual=Zadaním hodnoty true sa snímka skopíruje do schránky namiesto do súboru.
+
+# LOCALIZATION NOTE (screenshotChromeDesc2) A very short string to describe
+# the 'chrome' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+# The argument (%1$S) is the browser name.
+screenshotChromeDesc2=Zachytiť okno prehliadača %1$S? (true/false)
+
+# LOCALIZATION NOTE (screenshotChromeManual2) A fuller description of the
+# 'chrome' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+# The argument (%1$S) is the browser name.
+screenshotChromeManual2=Zadaním hodnoty true sa zosníma celé okno prehliadača %1$S, nie iba obsah webovej stránky.
+
+# LOCALIZATION NOTE (screenshotGroupOptions) A label for the optional options of
+# the screenshot command.
+screenshotGroupOptions=Možnosti
+
+# LOCALIZATION NOTE (screenshotGroupOptions) A label for the advanced options of
+# the screenshot command.
+screenshotAdvancedOptions=Rozšírené možnosti
+
+# LOCALIZATION NOTE (screenshotDelayDesc) A very short string to describe
+# the 'delay' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotDelayDesc=Oneskorenie (v sekundách)
+
+# LOCALIZATION NOTE (screenshotDelayManual) A fuller description of the
+# 'delay' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotDelayManual=Čas (v sekundách) po zhotovenie snímky
+
+# LOCALIZATION NOTE (screenshotFullscreenDesc) A very short string to describe
+# the 'fullscreen' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotFullPageDesc=Celú webovú stránku? (true/false)
+
+# LOCALIZATION NOTE (screenshotFullscreenManual) A fuller description of the
+# 'fullscreen' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotFullPageManual=Nastavte na true, ak má snímok obsahovať aj časti webovej stránky, ktoré aktuálne nie sú viditeľné.
+
+# LOCALIZATION NOTE (screenshotSelectorChromeConflict) Exception thrown when user
+# tries to use 'selector' option along with 'chrome' option of the screenshot
+# command. Refer: https://bugzilla.mozilla.org/show_bug.cgi?id=659268#c7
+screenshotSelectorChromeConflict=Použitie selektora nie je povolené, ak je voľba chrome nastavená na hodnotu true
+
+# LOCALIZATION NOTE (screenshotGeneratedFilename) The auto generated filename
+# when no file name is provided. The first argument (%1$S) is the date string
+# in yyyy-mm-dd format and the second argument (%2$S) is the time string
+# in HH.MM.SS format. Please don't add the extension here.
+screenshotGeneratedFilename=Snimka_%1$S_o_%2$S
+
+# LOCALIZATION NOTE (screenshotErrorSavingToFile) Text displayed to user upon
+# encountering error while saving the screenshot to the file specified.
+screenshotErrorSavingToFile=Chyba pri ukladaní do
+
+# LOCALIZATION NOTE (screenshotSavedToFile) Text displayed to user when the
+# screenshot is successfully saved to the file specified.
+screenshotSavedToFile=Uložené do
+
+# LOCALIZATION NOTE (screenshotErrorCopying) Text displayed to user upon
+# encountering error while copying the screenshot to clipboard.
+screenshotErrorCopying=Počas kopírovania do schránky sa vyskytla chyba.
+
+# LOCALIZATION NOTE (screenshotCopied) Text displayed to user when the
+# screenshot is successfully copied to the clipboard.
+screenshotCopied=Skopírované do schránky.
+
+# LOCALIZATION NOTE (screenshotTooltip) Text displayed as tooltip for screenshot button in devtools ToolBox.
+screenshotTooltip=Vytvorí snímku celej stránky
+
+# LOCALIZATION NOTE (screenshotImgurDesc) A very short string to describe
+# the 'imgur' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotImgurDesc=Nahrať na imgur.com
+
+# LOCALIZATION NOTE (screenshotImgurManual) A fuller description of the
+# 'imgur' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotImgurManual=Použite, ak chcete obrázok nahrať na imgur.com namiesto jeho uloženia na disk
+
+# LOCALIZATION NOTE (screenshotImgurError) Text displayed to user upon
+# encountering error while uploading the screenshot to imgur.com.
+screenshotImgurError=Nebolo možné dosiahnuť na API servera imgur
+
+# LOCALIZATION NOTE (screenshotImgurUploading) Text displayed to user when the
+# screenshot is successfully sent to Imgur but the program is waiting on a response.
+# The argument (%1$S) is a new image URL at Imgur.
+screenshotImgurUploaded=Nahraté ako %1$S
+
+# LOCALIZATION NOTE (highlightDesc) A very short description of the
+# 'highlight' command. See highlightManual for a fuller description of what
+# it does. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+highlightDesc=Zvýrazní uzly
+
+# LOCALIZATION NOTE (highlightManual) A fuller description of the 'highlight'
+# command, displayed when the user asks for help on what it does.
+highlightManual=Zvýrazní uzly, ktoré na stránke zodpovedajú selektoru
+
+# LOCALIZATION NOTE (highlightSelectorDesc) A very short string to describe
+# the 'selector' parameter to the 'highlight' command, which is displayed in
+# a dialog when the user is using this command.
+highlightSelectorDesc=Selektor CSS
+
+# LOCALIZATION NOTE (highlightSelectorManual) A fuller description of the
+# 'selector' parameter to the 'highlight' command, displayed when the user
+# asks for help on what it does.
+highlightSelectorManual=Selektor CSS použitý na vyhľadanie uzlov na stránke
+
+# LOCALIZATION NOTE (highlightOptionsDesc) The title of a set of options to
+# the 'highlight' command, displayed as a heading to the list of option.
+highlightOptionsDesc=Možnosti
+
+# LOCALIZATION NOTE (highlightHideGuidesDesc) A very short string to describe
+# the 'hideguides' option parameter to the 'highlight' command, which is
+# displayed in a dialog when the user is using this command.
+highlightHideGuidesDesc=Skryje okraje
+
+# LOCALIZATION NOTE (highlightHideGuidesManual) A fuller description of the
+# 'hideguides' option parameter to the 'highlight' command, displayed when the
+# user asks for help on what it does.
+highlightHideGuidesManual=Skryje okraje okolo zvýrazneného uzla
+
+# LOCALIZATION NOTE (highlightShowInfoBarDesc) A very short string to describe
+# the 'showinfobar' option parameter to the 'highlight' command, which is
+# displayed in a dialog when the user is using this command.
+highlightShowInfoBarDesc=Zobrazí infopanel uzla
+
+# LOCALIZATION NOTE (highlightShowInfoBarManual) A fuller description of the
+# 'showinfobar' option parameter to the 'highlight' command, displayed when the
+# user asks for help on what it does.
+highlightShowInfoBarManual=Zobrazí infopanel nad zvýrazneným uzlom (infopanel zobrazuje názov značky, atribúty a rozmery)
+
+# LOCALIZATION NOTE (highlightShowAllDesc) A very short string to describe
+# the 'showall' option parameter to the 'highlight' command, which is
+# displayed in a dialog when the user is using this command.
+highlightShowAllDesc=Zobrazí všetky zhody
+
+# LOCALIZATION NOTE (highlightShowAllManual) A fuller description of the
+# 'showall' option parameter to the 'highlight' command, displayed when the
+# user asks for help on what it does.
+highlightShowAllManual=Ak selektoru zodpovedá príliš veľa uzlov, kvôli zabráneniu spomalenia stránky sa zobrazí len prvých 100 uzlov. Použitím tejto voľby zobrazíte všetky uzly
+
+# LOCALIZATION NOTE (highlightRegionDesc) A very short string to describe the
+# 'region' option parameter to the 'highlight' command, which is displayed in a
+# dialog when the user is using this command.
+highlightRegionDesc=Oblasť box modelu
+
+# LOCALIZATION NOTE (highlightRegionManual) A fuller description of the 'region'
+# option parameter to the 'highlight' command, displayed when the user asks for
+# help on what it does.
+highlightRegionManual=Ktorá oblasť box modelu by mala byť zvýraznená: 'content', 'padding', 'border' alebo 'margin'
+
+# LOCALIZATION NOTE (highlightFillDesc) A very short string to describe the
+# 'fill' option parameter to the 'highlight' command, which is displayed in a
+# dialog when the user is using this command.
+highlightFillDesc=Štýl výplne
+
+# LOCALIZATION NOTE (highlightFillManual) A fuller description of the 'fill'
+# option parameter to the 'highlight' command, displayed when the user asks for
+# help on what it does.
+highlightFillManual=Prepíše predvolený štýl výplne oblasti vlastnou farbou
+
+# LOCALIZATION NOTE (highlightKeepDesc) A very short string to describe the
+# 'keep' option parameter to the 'highlight' command, which is displayed in a
+# dialog when the user is using this command.
+highlightKeepDesc=Ponechá existujúce zvýraznenia
+
+# LOCALIZATION NOTE (highlightKeepManual) A fuller description of the 'keep'
+# option parameter to the 'highlight' command, displayed when the user asks for
+# help on what it does.
+highlightKeepManual=Predvolene sú pri spustení príkazu existujúce zvýraznenia skryté. Správanie je možné zmeniť touto voľbou
+
+# LOCALIZATION NOTE (highlightOutputConfirm) A confirmation message for the
+# 'highlight' command, displayed to the user once the command has been entered,
+# informing the user how many nodes have been highlighted successfully and how
+# to turn highlighting off
+highlightOutputConfirm2=%1$S zvýraznený uzol;%1$S zvýraznené uzly;%1$S zvýraznených uzlov
+
+# LOCALIZATION NOTE (highlightOutputMaxReached) A confirmation message for the
+# 'highlight' command, displayed to the user once the command has been entered,
+# informing the user how many nodes have been highlighted successfully and that
+# some nodes could not be highlighted due to the maximum number of nodes being
+# reached, and how to turn highlighting off
+highlightOutputMaxReached=Zodpovedajúcich uzlov: %1$S, z toho zvýraznených: %2$S. Použitím '--showall' zobrazíte všetky uzly
+
+# LOCALIZATION NOTE (unhighlightDesc) A very short description of the
+# 'unhighlight' command. See unhighlightManual for a fuller description of what
+# it does. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+unhighlightDesc=Zruší zvýraznenie všetkých uzlov
+
+# LOCALIZATION NOTE (unhighlightManual) A fuller description of the 'unhighlight'
+# command, displayed when the user asks for help on what it does.
+unhighlightManual=Zruší zvýraznenie všetkých predtým pomocou príkazu 'highlight' zvýrazených uzlov
+
+# LOCALIZATION NOTE (restartBrowserDesc) A very short description of the
+# 'restart' command. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+# The argument (%1$S) is the browser name.
+restartBrowserDesc=Reštartuje %1$S
+
+# LOCALIZATION NOTE (restartBrowserNocacheDesc) A very short string to
+# describe the 'nocache' parameter to the 'restart' command, which is
+# displayed in a dialog when the user is using this command.
+restartBrowserNocacheDesc=Zakáže načítavanie obsahu z vyrovnávacej pamäte až do reštartu prehliadača
+
+# LOCALIZATION NOTE (restartBrowserRequestCancelled) A string displayed to the
+# user when a scheduled restart has been aborted by the user.
+restartBrowserRequestCancelled=Požiadavka na reštartovanie bola používateľom zrušená.
+
+# LOCALIZATION NOTE (restartBrowserRestarting) A string displayed to the
+# user when a restart has been initiated without a delay.
+# The argument (%1$S) is the browser name.
+restartBrowserRestarting=%1$S sa reštartuje…
+
+# LOCALIZATION NOTE (inspectDesc) A very short description of the 'inspect'
+# command. See inspectManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+inspectDesc=Preskúma uzol
+
+# LOCALIZATION NOTE (inspectManual) A fuller description of the 'inspect'
+# command, displayed when the user asks for help on what it does.
+inspectManual=Preskúma rozmery a vlastnosti prvku použitím selektora CSS na otvorenie funkcie DOM highlighter
+
+# LOCALIZATION NOTE (inspectNodeDesc) A very short string to describe the
+# 'node' parameter to the 'inspect' command, which is displayed in a dialog
+# when the user is using this command.
+inspectNodeDesc=Selektor CSS
+
+# LOCALIZATION NOTE (inspectNodeManual) A fuller description of the 'node'
+# parameter to the 'inspect' command, displayed when the user asks for help
+# on what it does.
+inspectNodeManual=Selektor CSS pre metódu document.querySelector, ktorá identifikuje daný prvok
+
+# LOCALIZATION NOTE (eyedropperDesc) A very short description of the 'eyedropper'
+# command. See eyedropperManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+eyedropperDesc=Získa farbu z webovej stránky
+
+# LOCALIZATION NOTE (eyedropperManual) A fuller description of the 'eyedropper'
+# command, displayed when the user asks for help on what it does.
+eyedropperManual=Otvorí panel, ktorý zväčší oblasť stránky s cieľom preskúmať body a skopírovať kódy farieb
+
+# LOCALIZATION NOTE (eyedropperTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles the Eyedropper tool.
+eyedropperTooltip=Získať farbu z webovej stránky
+
+# LOCALIZATION NOTE (tiltDesc) A very short description of the 'tilt'
+# command. See tiltManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltDesc=Vizualizuje webovú stránku v 3D
+
+# LOCALIZATION NOTE (tiltManual) A fuller description of the 'tilt'
+# command, displayed when the user asks for help on what it does.
+tiltManual=Umožňuje preskúmať vzájomné vzťahy medzi rôznymi súčasťami webovej stránky a ich potomkami v 3D prostredí
+
+# LOCALIZATION NOTE (tiltOpenDesc) A very short description of the 'tilt inspect'
+# command. See tiltOpenManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltOpenDesc=Otvorí 3D zobrazenie Prieskumníka
+
+# LOCALIZATION NOTE (tiltOpenManual) A fuller description of the 'tilt translate'
+# command, displayed when the user asks for help on what it does.
+tiltOpenManual=Spustí 3D zobrazenie Prieskumníka a voliteľne zvýrazní uzol použitím selektora CSS
+
+# LOCALIZATION NOTE (tiltToggleTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles Tilt 3D View.
+tiltToggleTooltip=3D zobrazenie
+
+# LOCALIZATION NOTE (tiltTranslateDesc) A very short description of the 'tilt translate'
+# command. See tiltTranslateManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltTranslateDesc=Posunie sieť webovej stránky
+
+# LOCALIZATION NOTE (tiltTranslateManual) A fuller description of the 'tilt translate'
+# command, displayed when the user asks for help on what it does.
+tiltTranslateManual=Posunie sieť webovej stránky o zadanú hodnotu v danom smere
+
+# LOCALIZATION NOTE (tiltTranslateXDesc) A very short string to describe the
+# 'x' parameter to the 'tilt translate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltTranslateXDesc=X (bodov)
+
+# LOCALIZATION NOTE (tiltTranslateXManual) A fuller description of the 'x'
+# parameter to the 'translate' command, displayed when the user asks for help
+# on what it does.
+tiltTranslateXManual=Hodnota v bodoch, o ktorú sa sieť webovej stránky posunie po osi X
+
+# LOCALIZATION NOTE (tiltTranslateYDesc) A very short string to describe the
+# 'y' parameter to the 'tilt translate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltTranslateYDesc=Y (bodov)
+
+# LOCALIZATION NOTE (tiltTranslateYManual) A fuller description of the 'y'
+# parameter to the 'translate' command, displayed when the user asks for help
+# on what it does.
+tiltTranslateYManual=Hodnota v bodoch, o ktorú sa sieť webovej stránky posunie po osi Y
+
+# LOCALIZATION NOTE (tiltRotateDesc) A very short description of the 'tilt rotate'
+# command. See tiltRotateManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltRotateDesc=Otočí sieť webovej stránky
+
+# LOCALIZATION NOTE (tiltRotateManual) A fuller description of the 'tilt rotate'
+# command, displayed when the user asks for help on what it does.
+tiltRotateManual=Otočí sieť webovej stránky o zadaný uhol v danom smere
+
+# LOCALIZATION NOTE (tiltRotateXDesc) A very short string to describe the
+# 'x' parameter to the 'tilt rotate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltRotateXDesc=X (stupňov)
+
+# LOCALIZATION NOTE (tiltRotateXManual) A fuller description of the 'x'
+# parameter to the 'rotate' command, displayed when the user asks for help
+# on what it does.
+tiltRotateXManual=Hodnota v stupňoch, o ktorú sa sieť webovej stránky otočí okolo osi X
+
+# LOCALIZATION NOTE (tiltRotateYDesc) A very short string to describe the
+# 'y' parameter to the 'tilt rotate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltRotateYDesc=Y (stupňov)
+
+# LOCALIZATION NOTE (tiltRotateYManual) A fuller description of the 'y'
+# parameter to the 'rotate' command, displayed when the user asks for help
+# on what it does.
+tiltRotateYManual=Hodnota v stupňoch, o ktorú sa sieť webovej stránky otočí okolo osi Y
+
+# LOCALIZATION NOTE (tiltRotateZDesc) A very short string to describe the
+# 'z' parameter to the 'tilt rotate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltRotateZDesc=Z (stupňov)
+
+# LOCALIZATION NOTE (tiltRotateZManual) A fuller description of the 'z'
+# parameter to the 'rotate' command, displayed when the user asks for help
+# on what it does.
+tiltRotateZManual=Hodnota v stupňoch, o ktorú sa sieť webovej stránky otočí okolo osi Z
+
+# LOCALIZATION NOTE (tiltZoomDesc) A very short description of the 'tilt zoom'
+# command. See tiltZoomManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltZoomDesc=Priblíži alebo oddiali sieť webovej stránky
+
+# LOCALIZATION NOTE (tiltZoomManual) A fuller description of the 'tilt zoom'
+# command, displayed when the user asks for help on what it does.
+tiltZoomManual=Posunie sieť webovej stránky okolo osi Z
+
+# LOCALIZATION NOTE (tiltZoomAmountDesc) A very short string to describe the
+# 'zoom' parameter to the 'tilt zoom' command, which is displayed in a dialog
+# when the user is using this command.
+tiltZoomAmountDesc=Lupa (bodov)
+
+# LOCALIZATION NOTE (tiltZoomAmmuntManual) A fuller description of the 'zoom'
+# parameter to the 'zoom' command, displayed when the user asks for help
+# on what it does.
+tiltZoomAmountManual=Hodnota v bodoch, o ktorú sa sieť webovej stránky posunie po osi Z
+
+# LOCALIZATION NOTE (tiltResetDesc) A very short description of the 'tilt reset'
+# command. See tiltResetManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltResetDesc=Vynuluje posun, otočenie a priblíženie
+
+# LOCALIZATION NOTE (tiltResetManual) A fuller description of the 'tilt reset'
+# command, displayed when the user asks for help on what it does.
+tiltResetManual=Nastaví predvolené hodnoty posunu, otočenia a priblíženia siete webovej stránky
+
+# LOCALIZATION NOTE (tiltCloseDesc) A very short description of the 'tilt close'
+# command. See tiltCloseManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltCloseDesc=Zavrie vizualizáciu, ak je otvorená
+
+# LOCALIZATION NOTE (tiltCloseManual) A fuller description of the 'tilt close'
+# command, displayed when the user asks for help on what it does.
+tiltCloseManual=Zavrie vizualizáciu a prepne sa späť do okna Prieskumníka
+
+# LOCALIZATION NOTE (debuggerClosed) Used in the output of several commands
+# to explain that the debugger must be opened first.
+debuggerClosed=Pred použitím tohto príkazu musí byť otvorené okno ladenia.
+
+# LOCALIZATION NOTE (debuggerStopped) Used in the output of several commands
+# to explain that the debugger must be opened first before setting breakpoints.
+debuggerStopped=Pred nastavením bodu prerušenia musí byť otvorené okno ladenia
+
+# LOCALIZATION NOTE (breakDesc) A very short string used to describe the
+# function of the break command.
+breakDesc=Správa bodov prerušenia
+
+# LOCALIZATION NOTE (breakManual) A longer description describing the
+# set of commands that control breakpoints.
+breakManual=Príkazy na zobrazenie, pridanie a odstránenie bodov prerušenia
+
+# LOCALIZATION NOTE (breaklistDesc) A very short string used to describe the
+# function of the 'break list' command.
+breaklistDesc=Zobrazí známe body prerušení
+
+# LOCALIZATION NOTE (breaklistNone) Used in the output of the 'break list'
+# command to explain that the list is empty.
+breaklistNone=Nie sú nastavené žiadne body prerušenia
+
+# LOCALIZATION NOTE (breaklistOutRemove) A title used in the output from the
+# 'break list' command on a button which can be used to remove breakpoints
+breaklistOutRemove=Odstrániť
+
+# LOCALIZATION NOTE (breakaddAdded) Used in the output of the 'break add'
+# command to explain that a breakpoint was added.
+breakaddAdded=Bod prerušenia pridaný
+
+# LOCALIZATION NOTE (breakaddFailed) Used in the output of the 'break add'
+# command to explain that a breakpoint could not be added.
+breakaddFailed=Nebolo možné nastaviť bod prerušenia: %S
+
+# LOCALIZATION NOTE (breakaddDesc) A very short string used to describe the
+# function of the 'break add' command.
+breakaddDesc=Pridá bod prerušenia
+
+# LOCALIZATION NOTE (breakaddManual) A longer description describing the
+# set of commands that are responsible for adding breakpoints.
+breakaddManual=Podporované typy bodov prerušenia: riadok
+
+# LOCALIZATION NOTE (breakaddlineDesc) A very short string used to describe the
+# function of the 'break add line' command.
+breakaddlineDesc=Pridá bod prerušenia na riadok
+
+# LOCALIZATION NOTE (breakaddlineFileDesc) A very short string used to describe
+# the function of the file parameter in the 'break add line' command.
+breakaddlineFileDesc=Adresa súboru JS
+
+# LOCALIZATION NOTE (breakaddlineLineDesc) A very short string used to describe
+# the function of the line parameter in the 'break add line' command.
+breakaddlineLineDesc=Číslo riadku
+
+# LOCALIZATION NOTE (breakdelDesc) A very short string used to describe the
+# function of the 'break del' command.
+breakdelDesc=Odstráni bod prerušenia
+
+# LOCALIZATION NOTE (breakdelBreakidDesc) A very short string used to describe
+# the function of the index parameter in the 'break del' command.
+breakdelBreakidDesc=Index bodu prerušenia
+
+# LOCALIZATION NOTE (breakdelRemoved) Used in the output of the 'break del'
+# command to explain that a breakpoint was removed.
+breakdelRemoved=Bod prerušenia odstránený
+
+# LOCALIZATION NOTE (dbgDesc) A very short string used to describe the
+# function of the dbg command.
+dbgDesc=Správa ladenia
+
+# LOCALIZATION NOTE (dbgManual) A longer description describing the
+# set of commands that control the debugger.
+dbgManual=Príkazy na prerušenie alebo opätovné spustenie hlavného vlákna či krokovanie riadkov kódu
+
+# LOCALIZATION NOTE (dbgOpen) A very short string used to describe the function
+# of the dbg open command.
+dbgOpen=Otvorí okno ladenia
+
+# LOCALIZATION NOTE (dbgClose) A very short string used to describe the function
+# of the dbg close command.
+dbgClose=Zavrie okno ladenia
+
+# LOCALIZATION NOTE (dbgInterrupt) A very short string used to describe the
+# function of the dbg interrupt command.
+dbgInterrupt=Pozastaví hlavné vlákno
+
+# LOCALIZATION NOTE (dbgContinue) A very short string used to describe the
+# function of the dbg continue command.
+dbgContinue=Opätovne spustí hlavné vlákno a pokračuje vo vykonávaní po ďalší bod prerušenia alebo ukončenie skriptu.
+
+# LOCALIZATION NOTE (dbgStepDesc) A very short string used to describe the
+# function of the dbg step command.
+dbgStepDesc=Správa krokovania
+
+# LOCALIZATION NOTE (dbgStepManual) A longer description describing the
+# set of commands that control stepping.
+dbgStepManual=Príkazy na krokovanie riadkov kódu
+
+# LOCALIZATION NOTE (dbgStepOverDesc) A very short string used to describe the
+# function of the dbg step over command.
+dbgStepOverDesc=Vykoná aktuálny príkaz a zastaví na ďalšom príkaze. Ak je aktuálnym príkazom volanie funkcie, ladenie vykoná celú funkciu a zastaví na ďalšom príkaze po volaní funkcie
+
+# LOCALIZATION NOTE (dbgStepInDesc) A very short string used to describe the
+# function of the dbg step in command.
+dbgStepInDesc=Vykoná aktuálny príkaz a zastaví na ďalšom príkaze. Ak je aktuálnym príkazom volanie funkcie, ladenie vkročí do funkcie, inak zastaví na ďalšom príkaze
+
+# LOCALIZATION NOTE (dbgStepOutDesc) A very short string used to describe the
+# function of the dbg step out command.
+dbgStepOutDesc=Vyjde z aktuálnej funkcie a o úroveň vyššie, ak je funkcia vnorená. Ak sa potom nachádza v hlavnom tele, skript sa vykoná do konca alebo po ďalší bod prerušenia. Príkazy medzi nimi sú vykonané, ale nie sú krokované
+
+# LOCALIZATION NOTE (dbgListSourcesDesc) A very short string used to describe the
+# function of the dbg list command.
+dbgListSourcesDesc=Zobrazí zoznam zdrojových adries URL načítaných v ladení
+
+# LOCALIZATION NOTE (dbgBlackBoxDesc) A very short string used to describe the
+# function of the 'dbg blackbox' command.
+dbgBlackBoxDesc=Pridá zdroje v ladiacom nástroji do black boxu
+
+# LOCALIZATION NOTE (dbgBlackBoxSourceDesc) A very short string used to describe the
+# 'source' parameter to the 'dbg blackbox' command.
+dbgBlackBoxSourceDesc=Zdroj, ktorý bude pridaný do black boxu
+
+# LOCALIZATION NOTE (dbgBlackBoxGlobDesc) A very short string used to describe the
+# 'glob' parameter to the 'dbg blackbox' command.
+dbgBlackBoxGlobDesc=Pridá do black boxu všetky zdroje, ktoré sa zhodujú s výrazom (napríklad "*.min.js")
+
+# LOCALIZATION NOTE (dbgBlackBoxInvertDesc) A very short string used to describe the
+# 'invert' parameter to the 'dbg blackbox' command.
+dbgBlackBoxInvertDesc=Invertuje výber zdrojov, to znamená, že do black box pridá zdroj, ktorý nie je uvedený alebo sa nezhoduje so zadaným výrazom.
+    
+# LOCALIZATION NOTE (dbgBlackBoxEmptyDesc) A very short string used to let the
+# user know that no sources were black boxed.
+dbgBlackBoxEmptyDesc=(v black boxe nie sú žiadne zdroje)
+
+# LOCALIZATION NOTE (dbgBlackBoxNonEmptyDesc) A very short string used to let the
+# user know which sources were black boxed.
+dbgBlackBoxNonEmptyDesc=Nasledovné zdroje boli pridané do black boxu:
+
+# LOCALIZATION NOTE (dbgBlackBoxErrorDesc) A very short string used to let the
+# user know there was an error black boxing a source (whose url follows this
+# text).
+dbgBlackBoxErrorDesc=Chyba black boxu:
+
+# LOCALIZATION NOTE (dbgUnBlackBoxDesc) A very short string used to describe the
+# function of the 'dbg unblackbox' command.
+dbgUnBlackBoxDesc=Zastaví black boxing zdrojov v nástroji ladenia
+
+# LOCALIZATION NOTE (dbgUnBlackBoxSourceDesc) A very short string used to describe the
+# 'source' parameter to the 'dbg unblackbox' command.
+dbgUnBlackBoxSourceDesc=Zdroj, pre ktorý bude zastavený black boxing
+
+# LOCALIZATION NOTE (dbgUnBlackBoxGlobDesc) A very short string used to describe the
+# 'glob' parameter to the 'dbg blackbox' command.
+dbgUnBlackBoxGlobDesc=Zastaví black boxing pre všetky zdroje, ktoré sa zhodujú s výrazom (napríklad "*.min.js")
+
+# LOCALIZATION NOTE (dbgUnBlackBoxEmptyDesc) A very short string used to let the
+# user know that we did not stop black boxing any sources.
+dbgUnBlackBoxEmptyDesc=(black boxing nebol zastavený pre žiadne zdroje)
+
+# LOCALIZATION NOTE (dbgUnBlackBoxNonEmptyDesc) A very short string used to let the
+# user know which sources we stopped black boxing.
+dbgUnBlackBoxNonEmptyDesc=Black boxing zastavený pre nasledovné zdroje:
+
+# LOCALIZATION NOTE (dbgUnBlackBoxErrorDesc) A very short string used to let the
+# user know there was an error black boxing a source (whose url follows this
+# text).
+dbgUnBlackBoxErrorDesc=Chyba pri zastavovaní black boxing:
+
+# LOCALIZATION NOTE (dbgUnBlackBoxInvertDesc) A very short string used to describe the
+# 'invert' parameter to the 'dbg unblackbox' command.
+dbgUnBlackBoxInvertDesc=Invertuje výber zdrojov, to znamená, že zastaví black boxing pre každý zdroj, ktorý nie je uvedený alebo sa nezhoduje so zadaným výrazom.
+
+# LOCALIZATION NOTE (consolecloseDesc) A very short description of the
+# 'console close' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+consolecloseDesc=Zavrie konzolu
+
+# LOCALIZATION NOTE (consoleopenDesc) A very short description of the
+# 'console open' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+consoleopenDesc=Otvorí konzolu
+
+# LOCALIZATION NOTE (editDesc) A very short description of the 'edit'
+# command. See editManual2 for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+editDesc=Upraví zdroj stránky
+
+# LOCALIZATION NOTE (editManual2) A fuller description of the 'edit' command,
+# displayed when the user asks for help on what it does.
+editManual2=Upraví jeden zo zdrojov, ktorý je súčasťou tejto stránky
+
+# LOCALIZATION NOTE (editResourceDesc) A very short string to describe the
+# 'resource' parameter to the 'edit' command, which is displayed in a dialog
+# when the user is using this command.
+editResourceDesc=Adresa na úpravy
+
+# LOCALIZATION NOTE (editLineToJumpToDesc) A very short string to describe the
+# 'line' parameter to the 'edit' command, which is displayed in a dialog
+# when the user is using this command.
+editLineToJumpToDesc=Riadok, na ktorý prejsť
+
+# LOCALIZATION NOTE (resizePageDesc) A very short string to describe the
+# 'resizepage' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizePageDesc=Zmení veľkosť stránky
+
+# LOCALIZATION NOTE (resizePageArgWidthDesc) A very short string to describe the
+# 'width' parameter to the 'resizepage' command, which is displayed in a dialog
+# when the user is using this command.
+resizePageArgWidthDesc=Šírka v bodoch
+
+# LOCALIZATION NOTE (resizePageArgWidthDesc) A very short string to describe the
+# 'height' parameter to the 'resizepage' command, which is displayed in a dialog
+# when the user is using this command.
+resizePageArgHeightDesc=Výška v bodoch
+
+# LOCALIZATION NOTE (resizeModeOnDesc) A very short string to describe the
+# 'resizeon ' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeOnDesc=Prejde do režimu Responsive Design
+
+# LOCALIZATION NOTE (resizeModeOffDesc) A very short string to describe the
+# 'resize off' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeOffDesc=Ukončí režim Responsive Design
+
+# LOCALIZATION NOTE (resizeModeToggleDesc) A very short string to describe the
+# 'resize toggle' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeToggleDesc=Prepne režim Responsive Design
+
+# LOCALIZATION NOTE (resizeModeToggleTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles Responsive Design Mode.
+resizeModeToggleTooltip=Režim Responsive Design
+
+# LOCALIZATION NOTE (resizeModeToDesc) A very short string to describe the
+# 'resize to' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeToDesc=Upraví veľkosť stránky
+
+# LOCALIZATION NOTE (resizeModeDesc) A very short string to describe the
+# 'resize' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+resizeModeDesc=Ovláda režim Responsive Design
+
+# LOCALIZATION NOTE (resizeModeManual2) A fuller description of the 'resize'
+# command, displayed when the user asks for help on what it does.
+# The argument (%1$S) is the browser name.
+resizeModeManual2=Stránky v režime Responsive design reagujú na svoje prostredie, takže vyzerajú dobre na mobilnom zariadení, širokouhlom televíznom prijímači a na všetkých zariadeniach medzi nimi. Režim Responsive Design umožňuje jednoducho otestovať rôzne rozlíšenia stránky priamo v prehliadači %1$S bez nutnosti meniť rozlíšenie celého prehliadača.
+
+# LOCALIZATION NOTE (cmdDesc) A very short description of the 'cmd'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+cmdDesc=Narábanie s príkazmi
+
+# LOCALIZATION NOTE (cmdRefreshDesc) A very short description of the 'cmd refresh'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+cmdRefreshDesc=Opätovne načíta obsah adresára mozcmd
+
+# LOCALIZATION NOTE (cmdStatus3) When the we load new commands from mozcmd
+# directory, we report where we loaded from using %1$S.
+cmdStatus3=Načítané príkazy z priečinka '%1$S'
+
+# LOCALIZATION NOTE (cmdSetdirDesc)  A very short description of the 'cmd setdir'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+cmdSetdirDesc=Nastaví priečinok mozcmd
+
+# LOCALIZATION NOTE (cmdSetdirManual2) A fuller description of the 'cmd setdir'
+cmdSetdirManual2=Priečinok 'mozcmd' je jednoduchá cesta na vytvorenie vlastných príkazov. Podrobnejšie informácie nájdete v <a href="https://developer.mozilla.org/docs/Tools/GCLI/Customization">dokumentácii na MDN</a>.
+
+# LOCALIZATION NOTE (cmdSetdirDirectoryDesc) The description of the directory
+# parameter to the 'cmd setdir' command.
+cmdSetdirDirectoryDesc=Priečinok obsahujúci súbory .mozcmd
+
+# LOCALIZATION NOTE (addonDesc) A very short description of the 'addon'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+addonDesc=Správa doplnkov
+
+# LOCALIZATION NOTE (addonListDesc) A very short description of the 'addon list'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+addonListDesc=Zobrazí nainštalované doplnky
+
+# LOCALIZATION NOTE (addonListTypeDesc) A very short description of the
+# 'addon list <type>' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+addonListTypeDesc=Zvolí typ doplnku
+
+# LOCALIZATION NOTE (addonListDictionaryHeading, addonListExtensionHeading,
+# addonListLocaleHeading, addonListPluginHeading, addonListThemeHeading,
+# addonListUnknownHeading) Used in the output of the 'addon list' command as the
+# first line of output.
+addonListDictionaryHeading=Nainštalované sú nasledovné slovníky:
+addonListExtensionHeading=Nainštalované sú nasledovné rozšírenia:
+addonListLocaleHeading=Nainštalované sú nasledovné jazykové balíky:
+addonListPluginHeading=Nainštalované sú nasledovné zásuvné moduly:
+addonListThemeHeading=Nainštalované sú nasledovné témy:
+addonListAllHeading=Nainštalované sú nasledovné doplnky:
+addonListUnknownHeading=Nainštalované sú nasledovné doplnky zvoleného typu:
+
+# LOCALIZATION NOTE (addonListOutEnable, addonListOutDisable) Used in the
+# output of the 'addon list' command as the labels for the enable/disable
+# action buttons in the listing. This string is designed to be shown in a
+# small action button next to the addon name, which is why it should be as
+# short as possible.
+addonListOutEnable=Povoliť
+addonListOutDisable=Zakázať
+
+# LOCALIZATION NOTE (addonPending, addonPendingEnable, addonPendingDisable,
+# addonPendingUninstall, addonPendingInstall, addonPendingUpgrade) Used in
+# the output of the 'addon list' command as the descriptions of pending
+# addon operations. addonPending is used as a prefix for a list of pending
+# actions (named by the other lookup variables). These strings are designed
+# to be shown alongside addon names, which is why they should be as short
+# as possible.
+addonPending=čaká na
+addonPendingEnable=povolenie
+addonPendingDisable=zakázanie
+addonPendingUninstall=odinštaláciu
+addonPendingInstall=inštaláciu
+addonPendingUpgrade=aktualizáciu
+
+# LOCALIZATION NOTE (addonNameDesc) A very short description of the
+# name parameter of numerous addon commands. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+addonNameDesc=Názov doplnku
+
+# LOCALIZATION NOTE (addonNoneOfType) Used in the output of the 'addon list'
+# command when a search for addons of a particular type were not found.
+addonNoneOfType=Nie sú nainštalované žiadne doplnky zadaného typu.
+
+# LOCALIZATION NOTE (addonEnableDesc) A very short description of the
+# 'addon enable <type>' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+addonEnableDesc=Povolí zadaný doplnok
+
+# LOCALIZATION NOTE (addonAlreadyEnabled) Used in the output of the
+# 'addon enable' command when an attempt is made to enable an add-on that is
+# already enabled.
+addonAlreadyEnabled=Doplnok %S je už povolený.
+
+# LOCALIZATION NOTE (addonEnabled) Used in the output of the 'addon enable'
+# command when an addon is enabled.
+addonEnabled=Doplnok %S povolený.
+
+# LOCALIZATION NOTE (addonDisableDesc) A very short description of the
+# 'addon disable <type>' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+addonDisableDesc=Zakáže zadaný doplnok
+
+# LOCALIZATION NOTE (addonAlreadyDisabled) Used in the output of the
+# 'addon disable' command when an attempt is made to disable an add-on that is
+# already disabled.
+addonAlreadyDisabled=Doplnok %S je už zakázaný.
+
+# LOCALIZATION NOTE (addonDisabled) Used in the output of the 'addon disable'
+# command when an addon is disabled.
+addonDisabled=Doplnok %S zakázaný.
+
+# LOCALIZATION NOTE (exportDesc) A very short description of the 'export'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+exportDesc=Exportuje zdroje
+
+# LOCALIZATION NOTE (exportHtmlDesc) A very short description of the 'export
+# html' command. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+exportHtmlDesc=Exportuje kód HTML zo stránky
+
+# LOCALIZATION NOTE (pagemodDesc) A very short description of the 'pagemod'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
+pagemodDesc=Vykoná zmeny na stránke
+
+# LOCALIZATION NOTE (pagemodReplaceDesc) A very short description of the
+# 'pagemod replace' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+pagemodReplaceDesc=Vyhľadá a nahradí text v prvkoch stránky
+
+# LOCALIZATION NOTE (pagemodReplaceSearchDesc) A very short string to describe
+# the 'search' parameter to the 'pagemod replace' command, which is displayed in
+# a dialog when the user is using this command.
+pagemodReplaceSearchDesc=Výraz vyhľadávania
+
+# LOCALIZATION NOTE (pagemodReplaceReplaceDesc) A very short string to describe
+# the 'replace' parameter to the 'pagemod replace' command, which is displayed in
+# a dialog when the user is using this command.
+pagemodReplaceReplaceDesc=Výraz nahradenia 
+
+# LOCALIZATION NOTE (pagemodReplaceIgnoreCaseDesc) A very short string to
+# describe the 'ignoreCase' parameter to the 'pagemod replace' command, which is
+# displayed in a dialog when the user is using this command.
+pagemodReplaceIgnoreCaseDesc=Nerozlišovať malé a veľké písmená
+
+# LOCALIZATION NOTE (pagemodReplaceRootDesc) A very short string to describe the
+# 'root' parameter to the 'pagemod replace' command, which is displayed in
+# a dialog when the user is using this command.
+pagemodReplaceRootDesc=CSS selektor pre koreň vyhľadávania
+
+# LOCALIZATION NOTE (pagemodReplaceSelectorDesc) A very short string to describe
+# the 'selector' parameter to the 'pagemod replace' command, which is displayed
+# in a dialog when the user is using this command.
+pagemodReplaceSelectorDesc=CSS selektor pre vyhľadávanie
+
+# LOCALIZATION NOTE (pagemodReplaceAttributesDesc) A very short string to
+# describe the 'attributes' parameter to the 'pagemod replace' command, which is
+# displayed in a dialog when the user is using this command.
+pagemodReplaceAttributesDesc=Regulárny výraz na vyhľadávanie atribútov
+
+# LOCALIZATION NOTE (pagemodReplaceAttrOnlyDesc) A very short string to describe
+# the 'attrOnly' parameter to the 'pagemod replace' command, which is displayed
+# in a dialog when the user is using this command.
+pagemodReplaceAttrOnlyDesc=Obmedziť vyhľadávanie na atribúty
+
+# LOCALIZATION NOTE (pagemodReplaceContentOnlyDesc) A very short string to
+# describe the 'contentOnly' parameter to the 'pagemod replace' command, which
+# is displayed in a dialog when the user is using this command.
+pagemodReplaceContentOnlyDesc=Obmedziť vyhľadávanie na textové uzly
+
+# LOCALIZATION NOTE (pagemodReplaceResultMatchedElements) A string displayed as
+# the result of the 'pagemod replace' command.
+pagemodReplaceResult=Prvky zhodné so selektorom: %1$S. Náhrady v textových uzloch: %2$S. Náhrady v atribútoch: %3$S.
+
+# LOCALIZATION NOTE (pagemodRemoveDesc) A very short description of the
+# 'pagemod remove' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+pagemodRemoveDesc=Odstráni prvky a atribúty zo stránky
+
+# LOCALIZATION NOTE (pagemodRemoveElementDesc) A very short description of the
+# 'pagemod remove element' command. This string is designed to be shown in
+# a menu alongside the command name, which is why it should be as short as
+# possible.
+pagemodRemoveElementDesc=Odstráni prvky zo stránky
+
+# LOCALIZATION NOTE (pagemodRemoveElementSearchDesc) A very short string to
+# describe the 'search' parameter to the 'pagemod remove element' command, which
+# is displayed in a dialog when the user is using this command.
+pagemodRemoveElementSearchDesc=CSS selektor určujúci prvky na odstránenie
+
+# LOCALIZATION NOTE (pagemodRemoveElementRootDesc) A very short string to
+# describe the 'root' parameter to the 'pagemod remove element' command, which
+# is displayed in a dialog when the user is using this command.
+pagemodRemoveElementRootDesc=CSS selektor určujúci koreň vyhľadávania
+
+# LOCALIZATION NOTE (pagemodRemoveElementStripOnlyDesc) A very short string to
+# describe the 'stripOnly' parameter to the 'pagemod remove element' command,
+# which is displayed in a dialog when the user is using this command.
+pagemodRemoveElementStripOnlyDesc=Odstráni prvok, ale ponechá obsah
+
+# LOCALIZATION NOTE (pagemodRemoveElementIfEmptyOnlyDesc) A very short string to
+# describe the 'ifEmptyOnly' parameter to the 'pagemod remove element' command,
+# which is displayed in a dialog when the user is using this command.
+pagemodRemoveElementIfEmptyOnlyDesc=Odstráni len prázdne prvky
+
+# LOCALIZATION NOTE (pagemodRemoveElementResultMatchedAndRemovedElements)
+# A string displayed as the result of the 'pagemod remove element' command.
+pagemodRemoveElementResultMatchedAndRemovedElements=Prvky zhodné so selektorom: %1$S. Odstránené prvky: %2$S.
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeDesc) A very short description of the
+# 'pagemod remove attribute' command. This string is designed to be shown in
+# a menu alongside the command name, which is why it should be as short as
+# possible.
+pagemodRemoveAttributeDesc=Odstráni zhodné atribúty
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeSearchAttributesDesc) A very short
+# string to describe the 'searchAttributes' parameter to the 'pagemod remove
+# attribute' command, which is displayed in a dialog when the user is using this
+# command.
+pagemodRemoveAttributeSearchAttributesDesc=Regulárny výraz určujúci atribúty na odstránenie
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeSearchElementsDesc) A very short
+# string to describe the 'searchElements' parameter to the 'pagemod remove
+# attribute' command, which is displayed in a dialog when the user is using this
+# command.
+pagemodRemoveAttributeSearchElementsDesc=CSS selektor určujúci prvky
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeRootDesc) A very short string to
+# describe the 'root' parameter to the 'pagemod remove attribute' command, which
+# is displayed in a dialog when the user is using this command.
+pagemodRemoveAttributeRootDesc=CSS selektor určujúci koreň vyhľadávania
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeIgnoreCaseDesc) A very short string
+# to describe the 'ignoreCase' parameter to the 'pagemod remove attribute'
+# command, which is displayed in a dialog when the user is using this command.
+pagemodRemoveAttributeIgnoreCaseDesc=Nerozlišovať malé a veľké písmená
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeResult) A string displayed as the
+# result of the 'pagemod remove attribute' command.
+pagemodRemoveAttributeResult=Prvky zhodné so selektorom: %1$S. Odstránené atribúty: %2$S.
+
+# LOCALIZATION NOTE (toolsDesc2) A very short description of the 'tools'
+# command, the parent command for tool-hacking commands.
+# The argument (%1$S) is the browser name.
+toolsDesc2=Hackovanie Vývojárskych nástrojov %1$Su
+
+# LOCALIZATION NOTE (toolsManual2) A fuller description of the 'tools'
+# command. The argument (%1$S) is the browser name.
+toolsManual2=Rôzne príkazy týkajúce sa priameho hackovania Vývojárskych nástrojov %1$Su.
+
+# LOCALIZATION NOTE (toolsSrcdirDesc) A very short description of the 'tools srcdir'
+# command, for pointing your developer tools loader at a mozilla-central source tree.
+toolsSrcdirDesc=Načíta nástroje z mozilla-central
+
+# LOCALIZATION NOTE (toolsSrcdirNotFound) Shown when the 'tools srcdir' command was handed
+# an invalid srcdir.
+toolsSrcdirNotFound=%1$s neexistuje alebo nie je mozilla-central checkout.
+
+# LOCALIZATION NOTE (toolsSrcdirReloaded) Displayed when tools have been reloaded by the
+# 'tools srcdir' command.
+toolsSrcdirReloaded=Načítané nástroje z %1$s.
+
+# LOCALIZATION NOTE (toolsSrcdirManual2) A full description of the 'tools srcdir'
+# command. The argument (%1$S) is the browser name.
+toolsSrcdirManual2=Načíta Vývojárske nástroje %1$Su použitím mozilla-central checkout.
+
+# LOCALIZATION NOTE (toolsSrcdirDir) The srcdir argument to the 'tools srcdir' command.
+toolsSrcdirDir=mozilla-central checkout
+
+# LOCALIZATION NOTE (toolsBuiltinDesc) A short description of the 'tools builtin'
+# command, which overrides a previous 'tools srcdir' command.
+toolsBuiltinDesc=Použije vstavané nástroje
+
+# LOCALIZATION NOTE (toolsBuiltinDesc) A fuller description of the 'tools builtin'
+# command.
+toolsBuiltinManual=Použije vstavané nástroje, má prednosť pre akýmkoľvek predchádzajúcim príkazom srcdir.
+
+# LOCALIZATION NOTE (toolsBuiltinReloaded) Displayed when tools are loaded with the
+# 'tools builtin' command.
+toolsBuiltinReloaded=Vstavané nástroje načítané.
+
+# LOCALIZATION NOTE (toolsReloadDesc) A short description of the 'tools reload' command.
+# which will reload the tools from the current srcdir.
+toolsReloadDesc=Opätovne načíta vývojárske nástroje
+
+# LOCALIZATION NOTE (toolsReloaded2) Displayed when tools are reloaded with the 'tools
+# reload' command.
+toolsReloaded2=Nástroje opätovne načítané.
+
+# LOCALIZATION NOTE (cookieDesc) A very short description of the 'cookie'
+# command. See cookieManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+cookieDesc=Zobrazí a upraví cookies
+
+# LOCALIZATION NOTE (cookieManual) A fuller description of the 'cookie'
+# command, displayed when the user asks for help on what it does.
+cookieManual=Príkazy na zobrazenie, vytvorenie, odstránenie a úpravu cookies pre aktuálnu doménu.
+
+# LOCALIZATION NOTE (cookieListDesc) A very short description of the
+# 'cookie list' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+cookieListDesc=Zobrazí cookies
+
+# LOCALIZATION NOTE (cookieListManual) A fuller description of the 'cookie list'
+# command, displayed when the user asks for help on what it does.
+cookieListManual=Zobrazí zoznam cookies relevantných pre aktuálnu stránku.
+
+# LOCALIZATION NOTE (cookieListOutHost,cookieListOutPath,cookieListOutExpires,cookieListOutAttributes):
+# The 'cookie list' command has a number of headings for cookie properties.
+# Particular care should be taken in translating these strings as they have
+# references to names in the cookies spec.
+cookieListOutHost=Server:
+cookieListOutPath=Cesta:
+cookieListOutExpires=Koniec platnosti:
+cookieListOutAttributes=Atribúty:
+
+# LOCALIZATION NOTE (cookieListOutNone) The output of the 'cookie list' command
+# uses this string when no cookie attributes (like httpOnly, secure, etc) apply
+cookieListOutNone=žiadne
+
+# LOCALIZATION NOTE (cookieListOutSession) The output of the 'cookie list'
+# command uses this string to describe a cookie with an expiry value of '0'
+# that is to say it is a session cookie
+cookieListOutSession=Pri ukončení prehliadača (relácie)
+
+# LOCALIZATION NOTE (cookieListOutNonePage) The output of the 'cookie list'
+# command uses this string for pages like 'about:blank' which can't contain
+# cookies
+cookieListOutNonePage=Pre túto stránku neboli nájdené žiadne cookies
+
+# LOCALIZATION NOTE (cookieListOutNoneHost) The output of the 'cookie list'
+# command uses this string when there are no cookies on a given web page
+cookieListOutNoneHost=Pre server %1$S neboli nájdené žiadne cookies
+
+# LOCALIZATION NOTE (cookieListOutEdit) A title used in the output from the
+# 'cookie list' command on a button which can be used to edit cookie values
+cookieListOutEdit=Upraviť
+
+# LOCALIZATION NOTE (cookieListOutRemove) A title used in the output from the
+# 'cookie list' command on a button which can be used to remove cookies
+cookieListOutRemove=Odstrániť
+
+# LOCALIZATION NOTE (cookieRemoveDesc) A very short description of the
+# 'cookie remove' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+cookieRemoveDesc=Odstráni cookie
+
+# LOCALIZATION NOTE (cookieRemoveManual) A fuller description of the 'cookie remove'
+# command, displayed when the user asks for help on what it does.
+cookieRemoveManual=Odstráni cookie na základe jeho kľúča
+
+# LOCALIZATION NOTE (cookieRemoveKeyDesc) A very short string to describe the
+# 'key' parameter to the 'cookie remove' command, which is displayed in a dialog
+# when the user is using this command.
+cookieRemoveKeyDesc=Kľúč súboru cookie, ktorý sa má odstrániť
+
+# LOCALIZATION NOTE (cookieSetDesc) A very short description of the
+# 'cookie set' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+cookieSetDesc=Nastaví cookie
+
+# LOCALIZATION NOTE (cookieSetManual) A fuller description of the 'cookie set'
+# command, displayed when the user asks for help on what it does.
+cookieSetManual=Nastaví cookie určení kľúča, jeho hodnoty a voliteľne jedného alebo viacerých z nasledovných atribútov: expires (maximálny vek v sekundách alebo dátum vypršania vo formáte GMTString), path, domain, secure
+
+# LOCALIZATION NOTE (cookieSetKeyDesc) A very short string to describe the
+# 'key' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetKeyDesc=Kľúč nastavovaného cookie
+
+# LOCALIZATION NOTE (cookieSetValueDesc) A very short string to describe the
+# 'value' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetValueDesc=Hodnota nastavovaného cookie
+
+# LOCALIZATION NOTE (cookieSetOptionsDesc) The title of a set of options to
+# the 'cookie set' command, displayed as a heading to the list of option.
+cookieSetOptionsDesc=Voľby
+
+# LOCALIZATION NOTE (cookieSetPathDesc) A very short string to describe the
+# 'path' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetPathDesc=Cesta k nastavovanému cookie
+
+# LOCALIZATION NOTE (cookieSetDomainDesc) A very short string to describe the
+# 'domain' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetDomainDesc=Doména nastavovaného cookie
+
+# LOCALIZATION NOTE (cookieSetSecureDesc) A very short string to describe the
+# 'secure' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetSecureDesc=Prenášané len cez https
+
+# LOCALIZATION NOTE (cookieSetHttpOnlyDesc) A very short string to describe the
+# 'httpOnly' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetHttpOnlyDesc=Nie je dostupné zo skriptu na strane klienta
+
+# LOCALIZATION NOTE (cookieSetSessionDesc) A very short string to describe the
+# 'session' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetSessionDesc=Platné len pre danú reláciu prehliadača
+
+# LOCALIZATION NOTE (cookieSetExpiresDesc) A very short string to describe the
+# 'expires' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetExpiresDesc=Dátum konca platnosti cookie (formát RFC2822 alebo ISO 8601)
+
+# LOCALIZATION NOTE (jsbDesc) A very short description of the
+# 'jsb' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+jsbDesc=JavaScript beautifier
+
+# LOCALIZATION NOTE (jsbUrlDesc) A very short description of the
+# 'jsb <url>' parameter. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+jsbUrlDesc=Adresa súboru JS na preformátovanie
+
+# LOCALIZATION NOTE (jsbIndentSizeDesc) A very short description of the
+# 'jsb <indentSize>' parameter. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+jsbIndentSizeDesc=Veľkosť odsadenia v znakoch
+
+# LOCALIZATION NOTE (jsbIndentSizeManual) A fuller description of the
+# 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
+# does.
+jsbIndentSizeManual=Počet znakov, ktorými sa odsadí každý riadok
+
+# LOCALIZATION NOTE (jsbIndentCharDesc) A very short description of the
+# 'jsb <indentChar>' parameter. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+jsbIndentCharDesc=Znaky používané na odsadenie každého riadku
+
+# LOCALIZATION NOTE (jsbIndentCharManual) A fuller description of the
+# 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
+# does.
+jsbIndentCharManual=Znaky používané na odsadenie každého riadku, možné voľby sú medzera a tabulátor.
+
+# the 'jsb <doNotPreserveNewlines>' parameter. This string is designed to be
+# shown in a menu alongside the command name, which is why it should be as short
+# as possible.
+jsbDoNotPreserveNewlinesDesc=Nezachovávať zalomenia riadkov
+
+# LOCALIZATION NOTE (jsbPreserveNewlinesManual) A fuller description of the
+# 'jsb <jsbPreserveNewlines>' parameter, displayed when the user asks for help
+# on what it does.
+jsbPreserveNewlinesManual=Majú byť existujúce zalomenia riadkov zachované?
+
+# LOCALIZATION NOTE (jsbPreserveMaxNewlinesDesc) A very short description of the
+# 'jsb <preserveMaxNewlines>' parameter. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+jsbPreserveMaxNewlinesDesc=Maximálny počet zalomení riadkov za sebou
+
+# LOCALIZATION NOTE (jsbPreserveMaxNewlinesManual) A fuller description of the
+# 'jsb <preserveMaxNewlines>' parameter, displayed when the user asks for help
+# on what it does.
+jsbPreserveMaxNewlinesManual=Maximálny počet zalomení riadkov za sebou, ktoré ostanú zachované
+
+# LOCALIZATION NOTE (jsbJslintHappyDesc) A very short description of the
+# 'jsb <jslintHappy>' parameter. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+jsbJslintHappyDesc=Vynútiť režim jslint-stricter?
+
+# LOCALIZATION NOTE (jsbJslintHappyManual) A fuller description of the
+# 'jsb <jslintHappy>' parameter, displayed when the user asks for help
+# on what it does.
+jsbJslintHappyManual=Ak je voľba nastavená na true, použije sa režim jslint-stricter
+
+# LOCALIZATION NOTE (jsbBraceStyleDesc2) A very short description of the
+# 'jsb <braceStyle>' parameter. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+jsbBraceStyleDesc2=Zvoľte štýl kódovania zátvoriek
+
+# LOCALIZATION NOTE (jsbBraceStyleManual2) A fuller description of the
+# 'jsb <braceStyle>' parameter, displayed when the user asks for help
+# on what it does.
+jsbBraceStyleManual2=Zvoľte štýl kódovania zátvoriek: collapse - zátvorky sú na rovnakom riadku ako výraz; expand - zátvorky sú na novom riadku (štýl Allman / ANSI); end-expand - koncové zátvorky na vlastnom riadku; expand-strict - zátvorky na vlastnom riadku aj v prípade, že kód nebude validný.
+
+# LOCALIZATION NOTE (jsbNoSpaceBeforeConditionalDesc) A very short description
+# of the 'jsb <noSpaceBeforeConditional>' parameter. This string is designed to
+# be shown in a menu alongside the command name, which is why it should be as
+# short as possible.
+jsbNoSpaceBeforeConditionalDesc=Bez medzery pred podmienenými príkazmi
+
+# LOCALIZATION NOTE (jsbUnescapeStringsDesc) A very short description of the
+# 'jsb <unescapeStrings>' parameter. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+jsbUnescapeStringsDesc=Odkódovať znaky \\xNN?
+
+# LOCALIZATION NOTE (jsbUnescapeStringsManual) A fuller description of the
+# 'jsb <unescapeStrings>' parameter, displayed when the user asks for help
+# on what it does.
+jsbUnescapeStringsManual=Majú byť tlačiteľné znaky v reťazcoch zakódované v notácii \\xNN odkódované?
+
+# LOCALIZATION NOTE (jsbInvalidURL) Displayed when an invalid URL is passed to
+# the jsb command.
+jsbInvalidURL=Zadajte platnú adresu URL
+
+# LOCALIZATION NOTE (jsbOptionsDesc) The title of a set of options to
+# the 'jsb' command, displayed as a heading to the list of options.
+jsbOptionsDesc=Možnosti
+
+# LOCALIZATION NOTE (calllogDesc) A very short description of the
+# 'calllog' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogDesc=Príkazy na správu zaznamenávania volaní funkcií
+
+# LOCALIZATION NOTE (calllogStartDesc) A very short description of the
+# 'calllog start' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogStartDesc=Spustí zaznamenávanie volaní funkcií do konzoly
+
+# LOCALIZATION NOTE (calllogStartReply) A string displayed as the result of
+# the 'calllog start' command.
+calllogStartReply=Zaznamenávanie volaní funkcií spustené.
+
+# LOCALIZATION NOTE (calllogStopDesc) A very short description of the
+# 'calllog stop' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogStopDesc=Zastaví zaznamenávanie volaní funkcií
+
+# LOCALIZATION NOTE (calllogStopNoLogging) A string displayed as the result of
+# the 'calllog stop' command when there is nothing to stop.
+calllogStopNoLogging=Práve nie je spustené žiadne zaznamenávanie volaní funkcií
+
+# LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
+# the 'calllog stop' command when there are logging actions to stop.
+calllogStopReply=Zaznamenávanie volaní funkcií zastavené. Aktívny kontext: %1$S.
+
+# LOCALIZATION NOTE (calllogStartChromeDesc) A very short description of the
+# 'calllog chromestart' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogChromeStartDesc=Spustí zaznamenávanie volaní funkcií pre kód chrome do konzoly
+
+# LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
+# 'calllog chromestart <sourceType>' parameter. This string is designed to be
+# shown in a menu alongside the command name, which is why it should be as short as possible.
+calllogChromeSourceTypeDesc=Globálny objekt, adresa JSM alebo JS, z ktorej sa získa globálny objekt
+
+# LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
+# 'calllog chromestart' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogChromeSourceTypeManual=Globálny objekt, adresa JSM alebo JS, ktorý sa vykoná v okne chrome, z ktorého sa získa globálny objekt
+
+# LOCALIZATION NOTE (calllogChromeStartReply) A string displayed as the result
+# of the 'calllog chromestart' command.
+calllogChromeStartReply=Zaznamenávanie volaní spustené.
+
+# LOCALIZATION NOTE (calllogChromeStopDesc) A very short description of the
+# 'calllog chromestop' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogChromeStopDesc=Zastaví zaznamenávanie volaní funkcií
+
+# LOCALIZATION NOTE (calllogChromeStopNoLogging) A string displayed as the
+# result of the 'calllog chromestop' command when there is nothing to stop.
+calllogChromeStopNoLogging=Aktuálne nie je aktívne žiadne zaznamenávanie funkcií pre kód chrome
+
+# LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
+# the 'calllog chromestop' command when there are logging actions to stop.
+calllogChromeStopReply=Zaznamenávanie volaní zastavené. Aktívne kontexty: %1$S.
+
+# LOCALIZATION NOTE (callLogChromeAnonFunction) A string displayed as the result
+# of the 'calllog chromestart' command when an anonymouse function is to be
+# logged.
+callLogChromeAnonFunction=<anonymná>
+
+# LOCALIZATION NOTE (callLogChromeMethodCall) A string displayed as the result
+# of the 'calllog chromestart' command to proceed a method name when it is to be
+# logged.
+callLogChromeMethodCall=Volanie metódy
+
+# LOCALIZATION NOTE (callLogChromeInvalidJSM) A string displayed as the result
+# of the 'calllog chromestart' command with an invalid JSM or JSM path.
+callLogChromeInvalidJSM=Neplatné JSM!
+
+# LOCALIZATION NOTE (callLogChromeVarNotFoundContent) A string displayed as the
+# result of the 'calllog chromestart' command with a source type of
+# content-variable and an invalid variable name.
+callLogChromeVarNotFoundContent=Premenná nebola v okne content nájdená.
+
+# LOCALIZATION NOTE (callLogChromeVarNotFoundChrome) A string displayed as the
+# result of the 'calllog chromestart' command with a source type of
+# chrome-variable and an invalid variable name.
+callLogChromeVarNotFoundChrome=Premenná nebola v okne chrome nájdená.
+
+# LOCALIZATION NOTE (callLogChromeEvalException) A string displayed as the
+# result of the 'calllog chromestart' command with a source type of JavaScript
+# and invalid JavaScript code.
+callLogChromeEvalException=Vykonávaný kód JavaScriptu vyhodil nasledovnú výnimku
+
+# LOCALIZATION NOTE (callLogChromeEvalNeedsObject) A string displayed as the
+# result of passing a non-JavaScript object creating source via the
+# 'calllog chromestart javascript' command.
+callLogChromeEvalNeedsObject=Zdroj JavaScriptu sa musí vykonávať v objekte, ktorého volania metód sú zaznamenávané, napr. "({a1: function() {this.a2()},a2: function() {}});"
+
+# LOCALIZATION NOTE (scratchpadOpenTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which opens Scratchpad.
+scratchpadOpenTooltip=Editor JavaScriptu - Scratchpad
+
+# LOCALIZATION NOTE (paintflashingDesc) A very short string used to describe the
+# function of the "paintflashing" command
+paintflashingDesc=Zvýrazňuje oblasť prekreslenia
+
+# LOCALIZATION NOTE (paintflashingOnDesc) A very short string used to describe the
+# function of the "paintflashing on" command.
+paintflashingOnDesc=Zapne funkciu zvýrazňovania prekresľovania
+
+# LOCALIZATION NOTE (paintflashingOffDesc) A very short string used to describe the
+# function of the "paintflashing off" command.
+paintflashingOffDesc=Vypne funkciu zvýrazňovania prekresľovania
+
+# LOCALIZATION NOTE (paintflashingChrome) A very short string used to describe the
+# function of the "paintflashing on/off chrome" command.
+paintflashingChromeDesc=rámce chrome
+
+# LOCALIZATION NOTE (paintflashingManual) A longer description describing the
+# set of commands that control paint flashing.
+paintflashingManual=Vyskresľuje prekreslené oblasti rôznymi farbami
+
+# LOCALIZATION NOTE (paintflashingTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles paint flashing.
+paintflashingTooltip=Zvýrazniť oblasť prekreslenia
+
+# LOCALIZATION NOTE (paintflashingToggleDesc) A very short string used to describe the
+# function of the "paintflashing toggle" command.
+paintflashingToggleDesc=Prepne funkciu zvýrazňovania prekresľovania
+
+# LOCALIZATION NOTE (splitconsoleTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles the split webconsole.
+splitconsoleTooltip=Prepne funkciu rozdelenia konzoly
+
+# LOCALIZATION NOTE (appCacheDesc) A very short string used to describe the
+# function of the "appcache" command
+appCacheDesc=Utility pre vyrovnávaciu pamäť aplikácie
+
+# LOCALIZATION NOTE (appCacheValidateDesc) A very short string used to describe
+# the function of the "appcache validate" command.
+appCacheValidateDesc=Overí platnosť manifestu vyrovnávacej pamäte
+
+# LOCALIZATION NOTE (appCacheValidateManual) A fuller description of the
+# 'validate' parameter to the 'appcache' command, displayed when the user asks
+# for help on what it does.
+appCacheValidateManual=Nájde problémy vzťahujúce sa k manifestu vyrovnávacej pamäte a súborom, na ktoré manifest odkazuje
+
+# LOCALIZATION NOTE (appCacheValidateUriDesc) A very short string used to describe
+# the function of the "uri" parameter of the appcache validate" command.
+appCacheValidateUriDesc=Adresa URI, ktorej platnosť chcete overiť
+
+# LOCALIZATION NOTE (appCacheValidated) Displayed by the "appcache validate"
+# command when it has been successfully validated.
+appCacheValidatedSuccessfully=Vyrovnávacia pamäť aplikácie úspešne overená.
+
+# LOCALIZATION NOTE (appCacheClearDesc) A very short string used to describe
+# the function of the "appcache clear" command.
+appCacheClearDesc=Vymaže položky z vyrovnávacej pamäte aplikácie
+
+# LOCALIZATION NOTE (appCacheClearManual) A fuller description of the
+# 'appcache clear' command, displayed when the user asks for help on what it does.
+appCacheClearManual=Vymaže jednu alebo viac položiek z vyrovnávacej pamäte aplikácie
+
+# LOCALIZATION NOTE (appCacheClearCleared) Displayed by the "appcache clear"
+# command when entries are successfully cleared.
+appCacheClearCleared=Položky úspešne vymazané.
+
+# LOCALIZATION NOTE (AppCacheListDesc) A very short string used to describe
+# the function of the "appcache list" command.
+appCacheListDesc=Zobrazí zoznam položiek vo vyrovnávacej pamäti aplikácie.
+
+# LOCALIZATION NOTE (AppCacheListManual) A fuller description of the
+# 'appcache list' command, displayed when the user asks for help on what it does.
+appCacheListManual=Zobrazí zoznam všetkých položiek vo vyrovnávacej pamäti aplikácie. Ak je zadaný výraz vyhľadávania, tabuľka zobrazuje položky obsahujúce tento výraz.
+
+# LOCALIZATION NOTE (AppCacheListSearchDesc) A very short string used to describe
+# the function of the "search" parameter of the appcache list" command.
+appCacheListSearchDesc=Filtruje výsledky pomocou výrazu vyhľadávania.
+
+# LOCALIZATION NOTE (AppCacheList*) Row headers for the 'appcache list' command.
+appCacheListKey=Kľúč:
+appCacheListDataSize=Veľkosť údajov:
+appCacheListDeviceID=ID zariadenia:
+appCacheListExpirationTime=Vyprší:
+appCacheListFetchCount=Počet získaní:
+appCacheListLastFetched=Naposledy získané:
+appCacheListLastModified=Naposledy upravené:
+
+# LOCALIZATION NOTE (appCacheListViewEntry) The text for the view entry button
+# of the 'appcache list' command.
+appCacheListViewEntry=Zobraziť položku
+
+# LOCALIZATION NOTE (appCacheViewEntryDesc) A very short string used to describe
+# the function of the "appcache viewentry" command.
+appCacheViewEntryDesc=Otvorí novú kartu obsahujúcu informácie o zadanej položke vyrovnávacej pamäte.
+
+# LOCALIZATION NOTE (appCacheViewEntryManual) A fuller description of the
+# 'appcache viewentry' command, displayed when the user asks for help on what it
+# does.
+appCacheViewEntryManual=Otvorí novú kartu obsahujúcu informácie o zadanej položke vyrovnávacej pamäte.
+
+# LOCALIZATION NOTE (appCacheViewEntryKey) A very short string used to describe
+# the function of the "key" parameter of the 'appcache viewentry' command.
+appCacheViewEntryKey=Kľúč položky na zobrazenie.
+
+# LOCALIZATION NOTE (profilerDesc) A very short string used to describe the
+# function of the profiler command.
+profilerDesc=Správa nástroja na profilovanie
+
+# LOCALIZATION NOTE (profilerManual) A longer description describing the
+# set of commands that control the profiler.
+profilerManual=Príkazy na spustenie alebo zastavenie nástroja na profilovanie JavaScriptu
+
+# LOCALIZATION NOTE (profilerOpen) A very short string used to describe the function
+# of the profiler open command.
+profilerOpenDesc=Otvorí nástroj na profilovanie
+
+# LOCALIZATION NOTE (profilerClose) A very short string used to describe the function
+# of the profiler close command.
+profilerCloseDesc=Zavrie nástroj na profilovanie
+
+# LOCALIZATION NOTE (profilerStart) A very short string used to describe the function
+# of the profiler start command.
+profilerStartDesc=Spustí profilovanie
+
+# LOCALIZATION NOTE (profilerStartManual) A fuller description of the 'profile name'
+# parameter. This parameter is used to name a newly created profile or to lookup
+# an existing profile by its name.
+profilerStartManual=Názov profilu, ktorý chcete spustiť.
+
+# LOCALIZATION NOTE (profilerStop) A very short string used to describe the function
+# of the profiler stop command.
+profilerStopDesc=Zastaví profilovanie
+
+# LOCALIZATION NOTE (profilerStopManual) A fuller description of the 'profile name'
+# parameter. This parameter is used to lookup an existing profile by its name.
+profilerStopManual=Názov profilu, ktorý chcete zastaviť.
+
+# LOCALIZATION NOTE (profilerList) A very short string used to describe the function
+# of the profiler list command.
+profilerListDesc=Zobrazí všetky profily
+
+# LOCALIZATION NOTE (profilerShow) A very short string used to describe the function
+# of the profiler show command.
+profilerShowDesc=Zobrazí individuálny profil
+
+# LOCALIZATION NOTE (profilerShowManual) A fuller description of the 'profile name'
+# parameter. This parameter is used to name a newly created profile or to lookup
+# an existing profile by its name.
+profilerShowManual=Názov profilu.
+
+# LOCALIZATION NOTE (profilerAlreadyStarted2) A message that is displayed whenever
+# an operation cannot be completed because the profile in question has already
+# been started.
+profilerAlreadyStarted2=Profilovanie už beží
+
+# LOCALIZATION NOTE (profilerNotFound) A message that is displayed whenever
+# an operation cannot be completed because the profile in question could not be
+# found.
+profilerNotFound=Profil nebol nájdený
+
+# LOCALIZATION NOTE (profilerNotStarted2) A message that is displayed whenever
+# an operation cannot be completed because the profile in question has not been
+# started yet. It also contains a hint to use the 'profile start' command to
+# start the profiler.
+profilerNotStarted3=Profilovanie zatiaľ nebeží. Ak ho chcete spustiť, použite príkaz 'profile start'
+
+# LOCALIZATION NOTE (profilerStarted2) A very short string that indicates that
+# we have started recording.
+profilerStarted2=Zaznamenáva sa…
+
+# LOCALIZATION NOTE (profilerStopped) A very short string that indicates that
+# we have stopped recording.
+profilerStopped=Zastavené…
+
+# LOCALIZATION NOTE (profilerNotReady) A message that is displayed whenever
+# an operation cannot be completed because the profiler has not been opened yet.
+profilerNotReady=Ak chcete, aby tento príkaz fungoval, musíte najskôr otvoriť nástroj na profilovanie
+
+# LOCALIZATION NOTE (listenDesc) A very short string used to describe the
+# function of the 'listen' command.
+listenDesc=Otvorí vzdialený port ladenia
+
+# LOCALIZATION NOTE (listenManual2) A longer description of the 'listen'
+# command.
+listenManual2=%1$S umožňuje vzdialené ladenie cez pripojenie TCP/IP. Z bezpečnostných dôvodov je toto predvolene zakázané, ale je možné to povoliť týmto príkazom.
+
+# LOCALIZATION NOTE (listenPortDesc) A very short string used to describe the
+# function of 'port' parameter to the 'listen' command.
+listenPortDesc=Port TCP, ktorý sa bude počúvať
+
+# LOCALIZATION NOTE (listenDisabledOutput) Text of a message output during the
+# execution of the 'listen' command.
+listenDisabledOutput=Počúvanie je zakázané pomocou voľby devtools.debugger.remote-enabled
+
+# LOCALIZATION NOTE (listenInitOutput) Text of a message output during the
+# execution of the 'listen' command. %1$S is a port number
+listenInitOutput=Počúva sa na porte %1$S
+
+# LOCALIZATION NOTE (listenNoInitOutput) Text of a message output during the
+# execution of the 'listen' command.
+listenNoInitOutput=Server ladenia nebol inicializovaný
+
+# LOCALIZATION NOTE (mediaDesc, mediaEmulateDesc, mediaEmulateManual,
+# mediaEmulateType, mediaResetDesc) These strings describe
+# the 'media' commands and all available parameters.
+mediaDesc=Emulácia typu média CSS
+mediaEmulateDesc=Emuluje zadaný typ média CSS
+mediaEmulateManual=Zobrazí dokument tak, ako by bol zobrazený na zariadení podporujúcom zadaný typ média (CSS media), vrátane aplikovaných pravidiel špecifických pre daný typ média.
+mediaEmulateType=Typ média na emulovanie
+mediaResetDesc=Zastaví emulovanie typu média CSS
+
+# LOCALIZATION NOTE (injectDesc, injectManual, injectLibraryDesc, injectLoaded,
+# injectFailed) These strings describe the 'inject' commands and all available
+# parameters.
+injectDesc=Zasunie bežné knižnice do stránky
+injectManual2=Zasunie bežné knižnice do obsahu stránky, ku ktorej je možné pristupovať aj z konzoly.
+injectLibraryDesc=Zvoľte, ktorú knižnicu alebo skript chcete zasunúť
+injectLoaded=Načítané: %1$S
+injectFailed=Nepodarilo sa načítať %1$S - neplatná URI
+
+# LOCALIZATION NOTE (folderDesc, folderOpenDesc, folderOpenDir,
+# folderOpenProfileDesc) These strings describe the 'folder' commands and
+# all available parameters.
+folderDesc=Otvorí priečinky
+folderOpenDesc=Otvorí priečinok na zadanej ceste
+folderOpenDir=Cesta k priečinku
+folderOpenProfileDesc=Otvorí priečinok profilu
+
+# LOCALIZATION NOTE (folderInvalidPath) A string displayed as the result
+# of the 'folder open' command with an invalid folder path.
+folderInvalidPath=Zadajte platnú cestu
+
+# LOCALIZATION NOTE (folderOpenDirResult) A very short string used to
+# describe the result of the 'folder open' command.
+# The argument (%1$S) is the folder path.
+folderOpenDirResult=Otvorený %1$S
+
+# LOCALIZATION NOTE (security)
+securityDesc=Zobrazí podporované bezpečnostné funkcie
+securityManual=Príkazy na vymenovanie a popis bezpečnostných funkcií pre aktuálnu doménu.
+securityListDesc=Zobrazí bezpečnostné funkcie
+securityListManual=Zobrazí zoznam všetkých relevantných bezpečnostných funkcií aktuálnej stránky.
+# CSP specific
+securityCSPDesc=Zobrazí bezpečnostné funkcie špecifické pre CSP
+securityCSPManual=Zobrazí údaje o CSP aplikovanej pre aktuálnu stránku.
+securityCSPRemWildCard=Môžete odstrániť hviezdičku(*)?
+securityCSPPotentialXSS=Potenciálna zraniteľnosť XSS!
+
+# LOCALIZATION NOTE (rulersDesc) A very short description of the
+# 'rulers' command. See rulersManual for a fuller description of what
+# it does. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+rulersDesc=Prepne pravítko pre otvorenú stránku
+
+# LOCALIZATION NOTE (rulersManual) A fuller description of the 'rulers'
+# command, displayed when the user asks for help on what it does.
+rulersManual=Prepne horizontálne a vertikálne pravítko pre otvorenú stránku
+
+# LOCALIZATION NOTE (rulersTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles the rulers.
+rulersTooltip=Prepne pravítko pre otvorenú stránku
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/toolkit/chrome/global/devtools/gcli.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/toolkit/chrome/global/devtools/gcli.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/toolkit/chrome/global/devtools/gcli.properties	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/toolkit/chrome/global/devtools/gcli.properties	2015-05-25 20:51:18.000000000 +0000
@@ -0,0 +1,318 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE These strings are used inside the Web Console
+# command line which is available from the Web Developer sub-menu
+# -> 'Web Console'.
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# For each command there are in general two strings. As an example consider
+# the 'pref' command.
+# commandDesc (e.g. prefDesc for the command 'pref'): this string contains a
+# very short description of the command. It's designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+# commandManual (e.g. prefManual for the command 'pref'): this string will
+# contain a fuller description of the command. It's diplayed when the user
+# asks for help about a specific command (e.g. 'help pref').
+
+# LOCALIZATION NOTE: This message is used to describe any command or command
+# parameter when no description has been provided.
+canonDescNone=(bez popisu)
+
+# LOCALIZATION NOTE: The default name for a group of parameters.
+canonDefaultGroupName=Možnosti
+
+# LOCALIZATION NOTE (canonProxyDesc, canonProxyManual): These commands are
+# used to execute commands on a remote system (using a proxy). Parameters: %S
+# is the name of the remote system.
+canonProxyDesc=Vykoná príkaz na %S
+canonProxyManual=Sada príkazov, ktoré sú vykonávané na vzdialenom systéme. Vzdialený systém je pripojený cez %S
+
+# LOCALIZATION NOTE: This error message is displayed when we try to add a new
+# command (using a proxy) where one already exists with the same name.
+canonProxyExists=Príkaz '%S' už existuje.
+
+# LOCALIZATION NOTE: This message describes the '{' command, which allows
+# entry of JavaScript like traditional developer tool command lines.
+cliEvalJavascript=Vojde priamo do JavaScriptu
+
+# LOCALIZATION NOTE: This message is displayed when the command line has more
+# arguments than the current command can understand.
+cliUnusedArg=Príliš veľa parametrov
+
+# LOCALIZATION NOTE: The title of the dialog which displays the options that
+# are available to the current command.
+cliOptions=Dostupné možnosti
+
+# LOCALIZATION NOTE: The error message when the user types a command that
+# isn't registered
+cliUnknownCommand2=Neplatný príkaz: '%1$S'.
+
+# LOCALIZATION NOTE: A parameter should have a value, but doesn't
+cliIncompleteParam=Pre '%1$S' sa vyžaduje nejaká hodnota.
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a file
+# that does not exist, but should (e.g. for use with File->Open) %1$S is a
+# filename
+fileErrNotExists=Súbor '%1$S' neexistuje
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a file
+# that exists, but should not (e.g. for use with File->Save As) %1$S is a
+# filename
+fileErrExists=Súbor '%1$S' už existuje
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a
+# non-file, when a file is needed. %1$S is a filename
+fileErrIsNotFile='%1$S' nie je súbor
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a
+# non-directory, when a directory is needed (e.g. for use with 'cd') %1$S is a
+# filename
+fileErrIsNotDirectory='%1$S' nie je priečinok
+
+# LOCALIZATION NOTE: Error message given when a file argument does not match
+# the specified regular expression %1$S is a filename %2$S is a regular
+# expression
+fileErrDoesntMatch='%1$S' sa nezhoduje s '%2$S'
+
+# LOCALIZATION NOTE: When the menu has displayed all the matches that it
+# should (i.e. about 10 items) then we display this to alert the user that
+# more matches are available.
+fieldMenuMore=Ďalšie zhody, skúšajte ďalej
+
+# LOCALIZATION NOTE: The command line provides completion for JavaScript
+# commands, however there are times when the scope of what we're completing
+# against can't be used. This error message is displayed when this happens.
+jstypeParseScope=Rozsah stratený
+
+# LOCALIZATION NOTE (jstypeParseMissing, jstypeBeginSyntax,
+# jstypeBeginUnterm): These error messages are displayed when the command line
+# is doing JavaScript completion and encounters errors.
+jstypeParseMissing=Nie je možné nájsť vlastnosť '%S'
+jstypeBeginSyntax=Chyba syntaxe
+jstypeBeginUnterm=Neukončený reťazec
+
+# LOCALIZATION NOTE: This message is displayed if the system for providing
+# JavaScript completions encounters and error it displays this.
+jstypeParseError=Chyba
+
+# LOCALIZATION NOTE (typesNumberNan, typesNumberNotInt2, typesDateNan): These
+# error messages are displayed when the command line is passed a variable
+# which has the wrong format and can't be converted. Parameters: %S is the
+# passed variable.
+typesNumberNan=Nie je možné skonvertovať "%S" na číslo.
+typesNumberNotInt2=Nie je možné konvertovať "%S" na celé číslo.
+typesDateNan=Nie je možné skonvertovať "%S" na dátum.
+
+# LOCALIZATION NOTE (typesNumberMax, typesNumberMin, typesDateMax,
+# typesDateMin): These error messages are displayed when the command line is
+# passed a variable which has a value out of range (number or date).
+# Parameters: %1$S is the passed variable, %2$S is the limit value.
+typesNumberMax=Hodnota %1$S je väčšia ako povolené maximum: %2$S.
+typesNumberMin=Hodnota %1$S je menšia ako povolené minimum: %2$S.
+typesDateMax=%1$S je neskôr ako maximálny povolený dátum %2$S.
+typesDateMin=%1$S je skôr ako minimálny povolený dátum %2$S.
+
+# LOCALIZATION NOTE: This error message is displayed when the command line is
+# passed an option with a limited number of correct values, but the passed
+# value is not one of them.
+typesSelectionNomatch=Nie je možné použiť '%S'.
+
+# LOCALIZATION NOTE: This error message is displayed when the command line is
+# expecting a CSS query string, however the passed string is not valid.
+nodeParseSyntax=Chyba syntaxe v požiadavke CSS
+
+# LOCALIZATION NOTE (nodeParseMultiple, nodeParseNone): These error messages
+# are displayed when the command line is expecting a CSS string that matches a
+# single node, but more nodes (or none) match.
+nodeParseMultiple=Príliš veľa zhodných uzlov (%S)
+nodeParseNone=Žiadne zhodné uzly
+
+# LOCALIZATION NOTE (helpDesc, helpManual, helpSearchDesc, helpSearchManual3):
+# These strings describe the "help" command, used to display a description of
+# a command (e.g. "help pref"), and its parameter 'search'.
+helpDesc=Zobrazí pomocníka k dostupným príkazom
+helpManual=Poskytuje pomocníka pre zadaný príkaz (ak je zadaný výraz vyhľadávania a tento zodpovedá presne) alebo pre dostupné príkazy (ak nie je zadaný výraz vyhľadávania alebo nezodpovedá presne).
+helpSearchDesc=Výraz vyhľadávania
+helpSearchManual3=Výraz vyhľadávania na prefiltrovanie zoznamu príkazov. Regulárne výrazy nie sú podporované.
+
+# LOCALIZATION NOTE: These strings are displayed in the help page for a
+# command in the console.
+helpManSynopsis=Prehľad
+
+# LOCALIZATION NOTE: This message is displayed in the help page if the command
+# has no parameters.
+helpManNone=žiadne
+
+# LOCALIZATION NOTE: This message is displayed in response to the 'help'
+# command when used without a filter, just above the list of known commands.
+helpListAll=Dostupné príkazy:
+
+# LOCALIZATION NOTE (helpListPrefix, helpListNone): These messages are
+# displayed in response to the 'help <search>' command (i.e. with a search
+# string), just above the list of matching commands. Parameters: %S is the
+# search string.
+helpListPrefix=Príkazy začínajúce '%1$S':
+helpListNone=Žiadne príkazy nezačínajú reťazcom '%1$S'
+
+# LOCALIZATION NOTE (helpManRequired, helpManOptional, helpManDefault): When
+# the 'help x' command wants to show the manual for the 'x' command, it needs
+# to be able to describe the parameters as either required or optional, or if
+# they have a default value.
+helpManRequired=vyžadované
+helpManOptional=voliteľné
+helpManDefault=voliteľné, predvolené=%1$S
+
+# LOCALIZATION NOTE: This forms part of the output from the 'help' command.
+# 'GCLI' is a project name and should be left untranslated.
+helpIntro=GCLI je experimentom s cieľom vytvoriť vysoko použiteľný príkazový riadok pre webových vývojárov.
+
+# LOCALIZATION NOTE: Text shown as part of the output of the 'help' command
+# when the command in question has sub-commands, before a list of the matching
+# sub-commands.
+subCommands=Podpríkazy
+
+# LOCALIZATION NOTE: This error message is displayed when the command line is
+# cannot find a match for the parse types.
+commandParseError=Chyba pri spracovaní príkazového riadku
+
+# LOCALIZATION NOTE (contextDesc, contextManual, contextPrefixDesc): These
+# strings are used to describe the 'context' command and its 'prefix'
+# parameter. See localization comment for 'connect' for an explanation about
+# 'prefix'.
+contextDesc=Koncentruje sa na skupinu príkazov
+contextManual=Nastaví predvolený prefix pre budúce príkazy. Napríklad 'context git' by umožnilo zadávať 'commit' namiesto 'git commit'.
+contextPrefixDesc=Prefix príkazu
+
+# LOCALIZATION NOTE: This message message displayed during the processing of
+# the 'context' command, when the found command is not a parent command.
+contextNotParentError=Nie je možné použiť '%1$S' ako prefix, pretože to nie je rodičovský príkaz.
+
+# LOCALIZATION NOTE (contextReply, contextEmptyReply): These messages are
+# displayed during the processing of the 'context' command, to indicate
+# success or that there is no command prefix.
+contextReply=Používa sa %1$S ako prefix príkazu
+contextEmptyReply=Prefix príkazu je zrušený
+
+# LOCALIZATION NOTE (connectDesc, connectManual, connectPrefixDesc,
+# connectMethodDesc, connectUrlDesc, connectDupReply): These strings describe
+# the 'connect' command and all its available parameters. A 'prefix' is an 
+# alias for the remote server (think of it as a "connection name"), and it
+# allows to identify a specific server when connected to multiple remote
+# servers.
+connectDesc=Proxy príkazy na server
+connectManual=Pripojí sa k serveru, vytvára lokálne verzie príkazov na serveri. Vzdialené príkazy majú prefix na ich odlíšenie od lokálnych príkazov (ak sa ho chcete zbaviť, viď príkaz context).
+connectPrefixDesc=Rodičovský prefix pre importované príkazy
+connectMethodDesc=Metóda pripojenia
+connectUrlDesc=Adresa, ku ktorej sa pripája
+connectDupReply=Pripojenie nazvané %S už existuje.
+
+# LOCALIZATION NOTE: The output of the 'connect' command, telling the user
+# what it has done. Parameters: %S is the prefix command. See localization
+# comment for 'connect' for an explanation about 'prefix'.
+connectReply=Pridané príkazy %S.
+
+# LOCALIZATION NOTE (disconnectDesc2, disconnectManual2,
+# disconnectPrefixDesc): These strings describe the 'disconnect' command and
+# all its available parameters. See localization comment for 'connect' for an
+# explanation about 'prefix'.
+disconnectDesc2=Odpojiť zo servera
+disconnectManual2=Zo servera odpojí aktuálne pripojené vzdialené príkazy
+disconnectPrefixDesc=Rodičovský prefix pre importované príkazy
+    
+# LOCALIZATION NOTE: This is the output of the 'disconnect' command,
+# explaining the user what has been done. Parameters: %S is the number of
+# commands removed.
+disconnectReply=Odstránené príkazy %S.
+
+# LOCALIZATION NOTE (globalDesc, globalWindowDesc, globalOutput): These
+# strings describe the 'global' command and its parameters
+globalDesc=Zmeniť JS global
+globalWindowDesc=Nové okno/global
+globalOutput=JS global je teraz %S
+
+# LOCALIZATION NOTE: These strings describe the 'clear' command
+clearDesc=Vymazať výstup
+
+# LOCALIZATION NOTE (langDesc, langOutput): These strings describe the 'lang'
+# command and its parameters
+langDesc=Zadávajte príkazy v iných jazykoch
+langOutput=Práve používate %S
+
+# LOCALIZATION NOTE (prefDesc, prefManual, prefListDesc, prefListManual,
+# prefListSearchDesc, prefListSearchManual, prefShowDesc, prefShowManual,
+# prefShowSettingDesc, prefShowSettingManual): These strings describe the
+# 'pref' command and all its available sub-commands and parameters.
+prefDesc=Príkazy pre nastavenia
+prefManual=Príkazy na zobrazenie a zmenu nastavení pre GCLI a okolité prostredie
+prefListDesc=Zobrazí dostupné predvoľby
+prefListManual=Zobrazí zoznam predvolieb, voliteľne filtrované pomocou parametra 'search'
+prefListSearchDesc=Filter zoznamu zobrazených predvolieb
+prefListSearchManual=Vyhľadá zadaný reťazec v zozname dostupných predvolieb
+prefShowDesc=Zobrazí hodnotu predvoľby
+prefShowManual=Zobrazí hodnotu zadanej predvoľby
+prefShowSettingDesc=Predvoľba na zobrazenie
+prefShowSettingManual=Názov predvoľby na zobrazenie
+
+# LOCALIZATION NOTE: This message is used to show the preference name and the
+# associated preference value. Parameters: %1$S is the preference name, %2$S
+# is the preference value.
+prefShowSettingValue=%1$S: %2$S
+
+# LOCALIZATION NOTE (prefSetDesc, prefSetManual, prefSetSettingDesc,
+# prefSetSettingManual, prefSetValueDesc, prefSetValueManual): These strings
+# describe the 'pref set' command and all its parameters.
+prefSetDesc=Zmení predvoľbu
+prefSetManual=Zmení predvoľby definované prostredím
+prefSetSettingDesc=Predvoľba na zmenu
+prefSetSettingManual=Názov predvoľby, ktorá sa bude meniť.
+prefSetValueDesc=Nová hodnota predvoľby
+prefSetValueManual=Nová hodnota pre zadanú predvoľbu
+
+# LOCALIZATION NOTE (prefResetDesc, prefResetManual, prefResetSettingDesc,
+# prefResetSettingManual): These strings describe the 'pref reset' command and
+# all its parameters.
+prefResetDesc=Nastaví predvoľbu na predvolenú hodnotu
+prefResetManual=Nastaví hodnotu predvoľby na hodnotu predvolenú v systéme
+prefResetSettingDesc=Predvoľba na vynulovanie
+prefResetSettingManual=Názov predvoľby, ktorej hodnota bude nastavená na hodnotu predvolenú v systéme
+
+# LOCALIZATION NOTE: This string is displayed in the output from the 'pref
+# list' command as a label to an input element that allows the user to filter
+# the results.
+prefOutputFilter=Filter
+
+# LOCALIZATION NOTE (prefOutputName, prefOutputValue): These strings are
+# displayed in the output from the 'pref list' command as table headings.
+prefOutputName=Názov
+prefOutputValue=Hodnota
+
+# LOCALIZATION NOTE (introDesc, introManual): These strings describe the
+# 'intro' command. The localization of 'Got it!' should be the same used in
+# introTextGo.
+introDesc=Zobrazí úvodnú správu
+introManual=Opätovne zobrazí správu, ktorá sa zobrazuje novým používateľom až pokiaľ nekliknú na tlačidlo 'Budem opatrný, sľubujem!'
+
+# LOCALIZATION NOTE (introTextOpening3, introTextCommands, introTextKeys2,
+# introTextF1Escape, introTextGo): These strings are displayed when the user
+# first opens the developer toolbar to explain the command line, and is shown
+# each time it is opened until the user clicks the 'Got it!' button.
+introTextOpening3=GCLI je experimentom s cieľom vytvoriť vysoko použiteľný príkazový riadok pre webových vývojárov.
+introTextCommands=Ak chcete zobraziť zoznam príkazov zadajte
+introTextKeys2=, alebo ak chcete zobraziť pomocníka, stlačte
+introTextF1Escape=F1/Esc
+introTextGo=Jasné, rozumiem.
+
+# LOCALIZATION NOTE: This is a short description of the 'hideIntro' setting.
+hideIntroDesc=Zobrazí uvítaciu správu
+
+# LOCALIZATION NOTE: This is a description of the 'eagerHelper' setting. It's
+# displayed when the user asks for help on the settings. eagerHelper allows
+# users to select between showing no tooltips, permanent tooltips, and only
+# important tooltips.
+eagerHelperDesc=Ako často sa zobrazujú tooltipy
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/toolkit/chrome/global/devtools/styleinspector.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/toolkit/chrome/global/devtools/styleinspector.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/toolkit/chrome/global/devtools/styleinspector.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/toolkit/chrome/global/devtools/styleinspector.properties	2015-05-25 20:51:18.000000000 +0000
@@ -104,13 +104,22 @@
 # the rule view context menu "Show original sources" entry.
 ruleView.contextmenu.showOrigSources.accessKey=o
 
-# LOCALIZATION NOTE (ruleView.contextmenu.addRule): Text displayed in the
+# LOCALIZATION NOTE (ruleView.contextmenu.showMdnDocs): Text displayed in the rule view
+# context menu to display docs from MDN for an item.
+ruleView.contextmenu.showMdnDocs=Zobraziť dokumenty na MDN
+
+# LOCALIZATION NOTE (ruleView.contextmenu.showMdnDocs.accessKey): Access key for
+# the rule view context menu "Show MDN docs" entry.
+ruleView.contextmenu.showMdnDocs.accessKey=N
+
+# LOCALIZATION NOTE (ruleView.contextmenu.addNewRule): Text displayed in the
 # rule view context menu for adding a new rule to the element.
-ruleView.contextmenu.addRule=Pridať pravidlo
+# This should match addRuleButton.tooltip in styleinspector.dtd
+ruleView.contextmenu.addNewRule=Pridať nové pravidlo
 
 # LOCALIZATION NOTE (ruleView.contextmenu.addRule.accessKey): Access key for
 # the rule view context menu "Add rule" entry.
-ruleView.contextmenu.addRule.accessKey=d
+ruleView.contextmenu.addNewRule.accessKey=d
 
 # LOCALIZATION NOTE (computedView.contextmenu.selectAll): Text displayed in the
 # computed view context menu.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/toolkit/chrome/global/viewSource.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/toolkit/chrome/global/viewSource.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/toolkit/chrome/global/viewSource.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/toolkit/chrome/global/viewSource.properties	2015-05-25 20:51:18.000000000 +0000
@@ -11,3 +11,7 @@
 statusBarLineCol=Riadok %1$S, stĺpec %2$S
 viewSelectionSourceTitle = DOM zdrojový kód výberu
 viewMathMLSourceTitle    = DOM zdrojový kód MathML
+
+context_goToLine_label        = Prejsť na riadok…
+context_wrapLongLines_label   = Zalomiť dlhé riadky
+context_highlightSyntax_label = Zvýrazniť syntax
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/toolkit/chrome/mozapps/extensions/extensions.dtd firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/toolkit/chrome/mozapps/extensions/extensions.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-05-25 20:51:18.000000000 +0000
@@ -24,6 +24,9 @@
 <!ENTITY cmd.back.tooltip                     "Prejsť naspäť o jednu stránku">
 <!ENTITY cmd.forward.tooltip                  "Prejsť dopredu o jednu stránku">
 
+<!ENTITY showUnsignedExtensions.button.label  "Niektoré rozšírenia nemohli byť overené">
+<!ENTITY showAllExtensions.button.label       "Zobraziť všetky rozšírenia">
+
 <!-- global warnings -->
 <!ENTITY warning.safemode.label                    "Všetky doplnky boli zakázané núdzovým režimom.">
 <!ENTITY warning.checkcompatibility.label          "Kontrola kompatibility doplnkov je vypnutá. Môžete mať nekompatibilné doplnky.">
@@ -234,3 +237,17 @@
 
 <!ENTITY setting.learnmore "Ďalšie informácie…">
 
+<!ENTITY disabledUnsigned.heading "Niektoré doplnky boli zakázané">
+<!-- LOCALIZATION NOTE (disabledUnsigned.description.start, disabledUnsigned.description.findAddonsLink, disabledUnsigned.description.end):
+     These entities form a sentence, with
+     disabledUnsigned.description.findAddonsLink being a link to an external site. -->
+<!ENTITY disabledUnsigned.description.start "Nasledujúce doplnky neboli overené pre používanie v aplikácii &brandShortName;. Môžete si skúsiť ">
+<!ENTITY disabledUnsigned.description.findAddonsLink "vyhľadať náhradu">
+<!ENTITY disabledUnsigned.description.end " alebo požiadať vývojára o overenie doplnku.">
+<!ENTITY disabledUnsigned.learnMore "Ďalšie informácie o našej snahe udržať vás v bezpečí online.">
+<!-- LOCALIZATION NOTE (disabledUnsigned.devInfo.start, disabledUnsigned.devInfo.linkToManual, disabledUnsigned.devInfo.end):
+     These entities form a sentence, with disabledUnsigned.devInfo.linkToManual
+     being a link to an external site. -->
+<!ENTITY disabledUnsigned.devInfo.start "Vývojári, ktorí si chcú nechať overiť svoje doplnky, si môžu prečítať náš ">
+<!ENTITY disabledUnsigned.devInfo.linkToManual "manuál">
+<!ENTITY disabledUnsigned.devInfo.end ".">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/toolkit/chrome/mozapps/extensions/extensions.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/toolkit/chrome/mozapps/extensions/extensions.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/toolkit/chrome/mozapps/extensions/extensions.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/toolkit/chrome/mozapps/extensions/extensions.properties	2015-05-25 20:51:18.000000000 +0000
@@ -23,6 +23,10 @@
 
 #LOCALIZATION NOTE (notification.incompatible) %1$S is the add-on name, %2$S is brand name, %3$S is application version
 notification.incompatible=Doplnok %1$S nie je kompatibilný s verziou %3$S aplikácie %2$S.
+#LOCALIZATION NOTE (notification.unsigned, notification.unsignedAndDisabled) %1$S is the add-on name, %2$S is brand name
+notification.unsignedAndDisabled=Doplnok %1$S nemohol byť overený pre použitie v aplikácii %2$S a bol preto zakázaný.
+notification.unsigned=Doplnok %1$S nemohol byť overený pre použitie v aplikácii %2$S. Používajte ho opatrne.
+notification.unsigned.link=Ďalšie informácie
 #LOCALIZATION NOTE (notification.blocked) %1$S is the add-on name
 notification.blocked=Doplnok %1$S bol zablokovaný kvôli problémom so stabilitou alebo bezpečnosťou.
 notification.blocked.link=Ďalšie informácie
@@ -74,6 +78,10 @@
 
 #LOCALIZATION NOTE (details.notification.incompatible) %1$S is the add-on name, %2$S is brand name, %3$S is application version
 details.notification.incompatible=Doplnok %1$S nie je kompatibilný s verziou %3$S aplikácie %2$S.
+#LOCALIZATION NOTE (details.notification.unsigned, details.notification.unsignedAndDisabled) %1$S is the add-on name, %2$S is brand name
+details.notification.unsignedAndDisabled=Doplnok %1$S nemohol byť overený pre použitie v prehliadači %2$S a bol preto zakázaný.
+details.notification.unsigned=Doplnok %1$S nemohol byť overený pre použitie v prehliadači %2$S. Pokračujte opatrne.
+details.notification.unsigned.link=Ďalšie informácie
 #LOCALIZATION NOTE (details.notification.blocked) %1$S is the add-on name
 details.notification.blocked=Doplnok %1$S bol zablokovaný kvôli problémom so stabilitou alebo bezpečnosťou.
 details.notification.blocked.link=Ďalšie informácie
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/toolkit/chrome/places/places.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/toolkit/chrome/places/places.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/toolkit/chrome/places/places.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/toolkit/chrome/places/places.properties	2015-05-25 20:51:19.000000000 +0000
@@ -29,8 +29,3 @@
 # %1$S is the file size
 # %2$S is the file size unit
 backupFileSizeText=%1$S %2$S
-
-# LOCALIZATION NOTE (windows8TouchTitle): this is the name of the folder used
-# to store bookmarks created in Metro mode and share bookmarks between Metro
-# and Desktop.
-windows8TouchTitle=Windows 8 Touch
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/webapprt/webapprt/overrides/appstrings.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/webapprt/webapprt/overrides/appstrings.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/webapprt/webapprt/overrides/appstrings.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/webapprt/webapprt/overrides/appstrings.properties	2015-05-25 20:51:19.000000000 +0000
@@ -29,6 +29,7 @@
 externalProtocolChkMsg=Zapamätať si nastavenie pre všetky odkazy rovnakého typu.
 externalProtocolLaunchBtn=Spustiť aplikáciu
 malwareBlocked=Stránka %S bola označená ako podvodná a na základe nastavení zabezpečenia bola zablokovaná.
+unwantedBlocked=Stránka %S bola označená ako ponúkajúca nevyžiadaný softvér 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.
 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.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/webapprt/webapprt/overrides/dom.properties firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/webapprt/webapprt/overrides/dom.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/l10n/sk/webapprt/webapprt/overrides/dom.properties	2015-05-13 18:08:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/l10n/sk/webapprt/webapprt/overrides/dom.properties	2015-05-25 20:51:19.000000000 +0000
@@ -79,7 +79,6 @@
 FullScreenDeniedSubDocFullScreen=Požiadavka na spustenie režimu Na celú obrazovku bola zamietnutá, pretože poddokument dokumentu, ktorý o to požiadal, už je v režime Na celú obrazovku.
 FullScreenDeniedNotDescendant=Požiadavka na spustenie režimu Na celú obrazovku bola zamietnutá, pretože prvok, ktorý o to požiadal, nie je potomkom prvku, ktorý má aktuálne zapnutý režim Na celú obrazovku.
 FullScreenDeniedNotFocusedTab=Požiadavka na spustenie režimu Na celú obrazovku bola zamietnutá, pretože prvok, ktorý o to požiadal, sa nenachádza na práve aktívnej karte.
-FullScreenDeniedContentOnly=Požiadavka na spustenie režimu Na celú obrazovku bola zamietnutá, pretože prvok sa nachádza v chrome dokumentu a API tohto režimu je platné len pre obsah dokumentu.
 RemovedFullScreenElement=Režim Na celú obrazovku bol ukončený, pretože prvok režimu bol odstránený z dokumentu.
 FocusedWindowedPluginWhileFullScreen=Režim Na celú obrazovku bol ukončený, preto zásuvný modul vyžadujúci okno je práve v popredí.
 HTMLSyncXHRWarning=Spracovanie HTML v požiadavke XMLHttpRequest nie je podporované v synchrónnom režime.
@@ -152,3 +151,5 @@
 SyncXMLHttpRequestWarning=Synchrónna požiadavka XMLHttpRequest je v hlavnom vlákne zavrhnutá kvôli jej nežiaducim účinkom na koncového používateľa. Ďalšie informácie na http://xhr.spec.whatwg.org/
 # LOCALIZATION NOTE: Do not translate "DataContainerEvent" or "CustomEvent"
 DataContainerEventWarning=Používanie DataContainerEvent je zavrhnuté. Používajte radšej CustomEvent.
+# LOCALIZATION NOTE: Do not translate "Worker".
+EmptyWorkerSourceWarning=Pokus o vytvorenie Workera z prázdneho zdroja. Toto pravdepodobne nie je chcené.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/AccessibleCaret.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/base/AccessibleCaret.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/AccessibleCaret.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/AccessibleCaret.cpp	2015-05-25 20:43:52.000000000 +0000
@@ -26,6 +26,11 @@
 
 NS_IMPL_ISUPPORTS(AccessibleCaret::DummyTouchListener, nsIDOMEventListener)
 
+float AccessibleCaret::sWidth = 0.0f;
+float AccessibleCaret::sHeight = 0.0f;
+float AccessibleCaret::sMarginLeft = 0.0f;
+float AccessibleCaret::sBarWidth = 0.0f;
+
 // -----------------------------------------------------------------------------
 // Implementation of AccessibleCaret methods
 
@@ -40,6 +45,15 @@
   MOZ_ASSERT(mPresShell->GetCanvasFrame()->GetCustomContentContainer());
 
   InjectCaretElement(mPresShell->GetDocument());
+
+  static bool prefsAdded = false;
+  if (!prefsAdded) {
+    Preferences::AddFloatVarCache(&sWidth, "layout.accessiblecaret.width");
+    Preferences::AddFloatVarCache(&sHeight, "layout.accessiblecaret.height");
+    Preferences::AddFloatVarCache(&sMarginLeft, "layout.accessiblecaret.margin-left");
+    Preferences::AddFloatVarCache(&sBarWidth, "layout.accessiblecaret.bar.width");
+    prefsAdded = true;
+  }
 }
 
 AccessibleCaret::~AccessibleCaret()
@@ -215,13 +229,13 @@
 
   mImaginaryCaretRect = imaginaryCaretRect;
 
-  // SetCaretElementPosition() and SetSelectionBarElementPosition() require the
+  // SetCaretElementStyle() and SetSelectionBarElementStyle() require the
   // input rect relative to container frame.
   nsRect imaginaryCaretRectInContainerFrame = imaginaryCaretRectInFrame;
   nsLayoutUtils::TransformRect(aFrame, CustomContentContainerFrame(),
                                imaginaryCaretRectInContainerFrame);
-  SetCaretElementPosition(imaginaryCaretRectInContainerFrame);
-  SetSelectionBarElementPosition(imaginaryCaretRectInContainerFrame);
+  SetCaretElementStyle(imaginaryCaretRectInContainerFrame);
+  SetSelectionBarElementStyle(imaginaryCaretRectInContainerFrame);
 
   return PositionChangedResult::Changed;
 }
@@ -236,7 +250,7 @@
 }
 
 void
-AccessibleCaret::SetCaretElementPosition(const nsRect& aRect)
+AccessibleCaret::SetCaretElementStyle(const nsRect& aRect)
 {
   nsPoint position = CaretElementPosition(aRect);
   nsAutoString styleStr;
@@ -244,6 +258,12 @@
                         nsPresContext::AppUnitsToIntCSSPixels(position.x),
                         nsPresContext::AppUnitsToIntCSSPixels(position.y));
 
+  float zoomLevel = GetZoomLevel();
+  styleStr.AppendPrintf(" width: %.2fpx; height: %.2fpx; margin-left: %.2fpx",
+                        sWidth / zoomLevel,
+                        sHeight / zoomLevel,
+                        sMarginLeft / zoomLevel);
+
   ErrorResult rv;
   CaretElement()->SetAttribute(NS_LITERAL_STRING("style"), styleStr, rv);
   MOZ_ASSERT(!rv.Failed());
@@ -252,13 +272,16 @@
 }
 
 void
-AccessibleCaret::SetSelectionBarElementPosition(const nsRect& aRect)
+AccessibleCaret::SetSelectionBarElementStyle(const nsRect& aRect)
 {
   int32_t height = nsPresContext::AppUnitsToIntCSSPixels(aRect.height);
   nsAutoString barStyleStr;
   barStyleStr.AppendPrintf("margin-top: -%dpx; height: %dpx;",
                            height, height);
 
+  float zoomLevel = GetZoomLevel();
+  barStyleStr.AppendPrintf(" width: %.2fpx;", sBarWidth / zoomLevel);
+
   ErrorResult rv;
   SelectionBarElement()->SetAttribute(NS_LITERAL_STRING("style"), barStyleStr, rv);
   MOZ_ASSERT(!rv.Failed());
@@ -266,4 +289,16 @@
   AC_LOG("Set bar style: %s", NS_ConvertUTF16toUTF8(barStyleStr).get());
 }
 
+float
+AccessibleCaret::GetZoomLevel()
+{
+  // Full zoom on desktop.
+  float fullZoom = mPresShell->GetPresContext()->GetFullZoom();
+
+  // Pinch-zoom on B2G.
+  float resolution = mPresShell->GetCumulativeResolution();
+
+  return fullZoom * resolution;
+}
+
 } // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/AccessibleCaretEventHub.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/base/AccessibleCaretEventHub.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/AccessibleCaretEventHub.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/AccessibleCaretEventHub.cpp	2015-05-25 20:43:52.000000000 +0000
@@ -20,8 +20,6 @@
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
-
 #undef AC_LOG
 #define AC_LOG(message, ...)                                                   \
   AC_LOG_BASE("AccessibleCaretEventHub (%p): " message, this, ##__VA_ARGS__);
@@ -30,8 +28,6 @@
 #define AC_LOGV(message, ...)                                                  \
   AC_LOGV_BASE("AccessibleCaretEventHub (%p): " message, this, ##__VA_ARGS__);
 
-#endif // #ifdef PR_LOGGING
-
 NS_IMPL_ISUPPORTS(AccessibleCaretEventHub, nsIReflowObserver, nsIScrollObserver,
                   nsISelectionListener, nsISupportsWeakReference);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/AccessibleCaret.h firefox-trunk-41.0~a1~hg20150524r245419/layout/base/AccessibleCaret.h
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/AccessibleCaret.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/AccessibleCaret.h	2015-05-25 20:43:52.000000000 +0000
@@ -129,8 +129,11 @@
 
 private:
   // Argument aRect should be relative to CustomContentContainerFrame().
-  void SetCaretElementPosition(const nsRect& aRect);
-  void SetSelectionBarElementPosition(const nsRect& aRect);
+  void SetCaretElementStyle(const nsRect& aRect);
+  void SetSelectionBarElementStyle(const nsRect& aRect);
+
+  // Get current zoom level.
+  float GetZoomLevel();
 
   // Element which contains the caret image for 'Contains' test.
   dom::Element* CaretImageElement() const
@@ -202,6 +205,12 @@
   // the caret.
   nsRefPtr<DummyTouchListener> mDummyTouchListener{new DummyTouchListener()};
 
+  // Static class variables
+  static float sWidth;
+  static float sHeight;
+  static float sMarginLeft;
+  static float sBarWidth;
+
 }; // class AccessibleCaret
 
 } // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/AccessibleCaretLogger.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/base/AccessibleCaretLogger.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/AccessibleCaretLogger.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/AccessibleCaretLogger.cpp	2015-05-25 20:43:52.000000000 +0000
@@ -8,8 +8,6 @@
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
-
 PRLogModuleInfo*
 GetAccessibleCaretLog()
 {
@@ -22,6 +20,4 @@
   return log;
 }
 
-#endif // PR_LOGGING
-
 } // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/AccessibleCaretLogger.h firefox-trunk-41.0~a1~hg20150524r245419/layout/base/AccessibleCaretLogger.h
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/AccessibleCaretLogger.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/AccessibleCaretLogger.h	2015-05-25 20:43:52.000000000 +0000
@@ -7,34 +7,21 @@
 #ifndef AccessibleCaretLog_h
 #define AccessibleCaretLog_h
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 namespace mozilla {
-#ifdef PR_LOGGING
 
 PRLogModuleInfo* GetAccessibleCaretLog();
 
 #ifndef AC_LOG_BASE
-#define AC_LOG_BASE(...) PR_LOG(GetAccessibleCaretLog(), PR_LOG_DEBUG, (__VA_ARGS__));
+#define AC_LOG_BASE(...) MOZ_LOG(GetAccessibleCaretLog(), PR_LOG_DEBUG, (__VA_ARGS__));
 #endif
 
 #ifndef AC_LOGV_BASE
 #define AC_LOGV_BASE(...)                                                      \
-  PR_LOG(GetAccessibleCaretLog(), PR_LOG_DEBUG + 1, (__VA_ARGS__));
+  MOZ_LOG(GetAccessibleCaretLog(), PR_LOG_DEBUG + 1, (__VA_ARGS__));
 #endif
 
-#else
-
-#ifndef AC_LOGV_BASE
-#define AC_LOGV_BASE(...)
-#endif
-
-#ifndef AC_LOGV_BASE
-#define AC_LOGV_BASE(...)
-#endif
-
-#endif // PR_LOGGING
-
 } // namespace mozilla
 
 #endif // AccessibleCaretLog_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/AccessibleCaretManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/base/AccessibleCaretManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/AccessibleCaretManager.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/AccessibleCaretManager.cpp	2015-05-25 20:43:52.000000000 +0000
@@ -21,8 +21,6 @@
 
 namespace mozilla {
 
-#ifdef PR_LOGGING
-
 #undef AC_LOG
 #define AC_LOG(message, ...)                                                   \
   AC_LOG_BASE("AccessibleCaretManager (%p): " message, this, ##__VA_ARGS__);
@@ -31,8 +29,6 @@
 #define AC_LOGV(message, ...)                                                  \
   AC_LOGV_BASE("AccessibleCaretManager (%p): " message, this, ##__VA_ARGS__);
 
-#endif // #ifdef PR_LOGGING
-
 using namespace dom;
 using Appearance = AccessibleCaret::Appearance;
 using PositionChangedResult = AccessibleCaret::PositionChangedResult;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/FrameLayerBuilder.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/base/FrameLayerBuilder.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/FrameLayerBuilder.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/FrameLayerBuilder.cpp	2015-05-25 20:43:52.000000000 +0000
@@ -350,11 +350,17 @@
   }
 
   /**
-   * If this represents only a nsDisplayImage, and the image type
-   * supports being optimized to an ImageLayer (TYPE_RASTER only) returns
-   * an ImageContainer for the image.
+   * If this represents only a nsDisplayImage, and the image type supports being
+   * optimized to an ImageLayer, returns true.
    */
-  already_AddRefed<ImageContainer> CanOptimizeImageLayer(nsDisplayListBuilder* aBuilder);
+  bool CanOptimizeToImageLayer(nsDisplayListBuilder* aBuilder);
+
+  /**
+   * If this represents only a nsDisplayImage, and the image type supports being
+   * optimized to an ImageLayer, returns an ImageContainer for the underlying
+   * image if one is available.
+   */
+  already_AddRefed<ImageContainer> GetContainerForImageLayer(nsDisplayListBuilder* aBuilder);
 
   bool VisibleAboveRegionIntersects(const nsIntRect& aRect) const
   { return mVisibleAboveRegion.Intersects(aRect); }
@@ -1051,6 +1057,19 @@
                                  const nsIFrame* aReferenceFrame,
                                  const nsPoint& aTopLeft,
                                  bool aDidResetScrollPositionForLayerPixelAlignment);
+
+  /**
+   * Attempt to prepare an ImageLayer based upon the provided PaintedLayerData.
+   * Returns nullptr on failure.
+   */
+  already_AddRefed<Layer> PrepareImageLayer(PaintedLayerData* aData);
+
+  /**
+   * Attempt to prepare a ColorLayer based upon the provided PaintedLayerData.
+   * Returns nullptr on failure.
+   */
+  already_AddRefed<Layer> PrepareColorLayer(PaintedLayerData* aData);
+
   /**
    * Grab the next recyclable ColorLayer, or create one if there are no
    * more recyclable ColorLayers.
@@ -1967,8 +1986,12 @@
     return LayerManager::SCROLLABLE;
   }
   nsIFrame* animatedGeometryRootParent = aAnimatedGeometryRoot->GetParent();
-  if (animatedGeometryRootParent &&
-      animatedGeometryRootParent->GetType() == nsGkAtoms::scrollFrame) {
+  nsIScrollableFrame* scrollable = do_QueryFrame(animatedGeometryRootParent);
+  if (scrollable && scrollable->WantAsyncScroll()) {
+    // WantAsyncScroll() returns false when the frame has overflow:hidden,
+    // so we won't create tiled layers for overflow:hidden frames even if
+    // they have a display port. The main purpose of the WantAsyncScroll check
+    // is to allow the B2G camera app to use hardware composer for compositing.
     return LayerManager::SCROLLABLE;
   }
   return LayerManager::NONE;
@@ -2352,8 +2375,18 @@
   }
 }
 
+bool
+PaintedLayerData::CanOptimizeToImageLayer(nsDisplayListBuilder* aBuilder)
+{
+  if (!mImage) {
+    return false;
+  }
+
+  return mImage->CanOptimizeToImageLayer(mLayer->Manager(), aBuilder);
+}
+
 already_AddRefed<ImageContainer>
-PaintedLayerData::CanOptimizeImageLayer(nsDisplayListBuilder* aBuilder)
+PaintedLayerData::GetContainerForImageLayer(nsDisplayListBuilder* aBuilder)
 {
   if (!mImage) {
     return nullptr;
@@ -2786,6 +2819,58 @@
 }
 #endif
 
+already_AddRefed<Layer>
+ContainerState::PrepareImageLayer(PaintedLayerData* aData)
+{
+  nsRefPtr<ImageContainer> imageContainer =
+    aData->GetContainerForImageLayer(mBuilder);
+  if (!imageContainer) {
+    return nullptr;
+  }
+
+  nsRefPtr<ImageLayer> imageLayer = CreateOrRecycleImageLayer(aData->mLayer);
+  imageLayer->SetContainer(imageContainer);
+  aData->mImage->ConfigureLayer(imageLayer, mParameters);
+  imageLayer->SetPostScale(mParameters.mXScale,
+                           mParameters.mYScale);
+
+  if (aData->mItemClip.HasClip()) {
+    ParentLayerIntRect clip =
+      ViewAs<ParentLayerPixel>(ScaleToNearestPixels(aData->mItemClip.GetClipRect()));
+    clip.MoveBy(ViewAs<ParentLayerPixel>(mParameters.mOffset));
+    imageLayer->SetClipRect(Some(clip));
+  } else {
+    imageLayer->SetClipRect(Nothing());
+  }
+
+  mLayerBuilder->StoreOptimizedLayerForFrame(aData->mImage, imageLayer);
+  FLB_LOG_PAINTED_LAYER_DECISION(aData,
+                                 "  Selected image layer=%p\n", imageLayer.get());
+
+  return imageLayer.forget();
+}
+
+already_AddRefed<Layer>
+ContainerState::PrepareColorLayer(PaintedLayerData* aData)
+{
+  nsRefPtr<ColorLayer> colorLayer = CreateOrRecycleColorLayer(aData->mLayer);
+  colorLayer->SetColor(aData->mSolidColor);
+
+  // Copy transform
+  colorLayer->SetBaseTransform(aData->mLayer->GetBaseTransform());
+  colorLayer->SetPostScale(aData->mLayer->GetPostXScale(),
+                           aData->mLayer->GetPostYScale());
+
+  nsIntRect visibleRect = aData->mVisibleRegion.GetBounds();
+  visibleRect.MoveBy(-GetTranslationForPaintedLayer(aData->mLayer));
+  colorLayer->SetBounds(visibleRect);
+  colorLayer->SetClipRect(Nothing());
+
+  FLB_LOG_PAINTED_LAYER_DECISION(aData,
+                                 "  Selected color layer=%p\n", colorLayer.get());
+
+  return colorLayer.forget();
+}
 
 template<typename FindOpaqueBackgroundColorCallbackType>
 void ContainerState::FinishPaintedLayerData(PaintedLayerData& aData, FindOpaqueBackgroundColorCallbackType aFindOpaqueBackgroundColor)
@@ -2814,72 +2899,46 @@
   NewLayerEntry* newLayerEntry = &mNewChildLayers[data->mNewChildLayersIndex];
 
   nsRefPtr<Layer> layer;
-  nsRefPtr<ImageContainer> imageContainer = data->CanOptimizeImageLayer(mBuilder);
+  bool canOptimizeToImageLayer = data->CanOptimizeToImageLayer(mBuilder);
 
   FLB_LOG_PAINTED_LAYER_DECISION(data, "Selecting layer for pld=%p\n", data);
-  FLB_LOG_PAINTED_LAYER_DECISION(data, "  Solid=%i, hasImage=%i, canOptimizeAwayPaintedLayer=%i\n",
-          data->mIsSolidColorInVisibleRegion, !!imageContainer,
+  FLB_LOG_PAINTED_LAYER_DECISION(data, "  Solid=%i, hasImage=%c, canOptimizeAwayPaintedLayer=%i\n",
+          data->mIsSolidColorInVisibleRegion, canOptimizeToImageLayer ? 'y' : 'n',
           CanOptimizeAwayPaintedLayer(data, mLayerBuilder));
 
-  if ((data->mIsSolidColorInVisibleRegion || imageContainer) &&
+  if ((data->mIsSolidColorInVisibleRegion || canOptimizeToImageLayer) &&
       CanOptimizeAwayPaintedLayer(data, mLayerBuilder)) {
-    NS_ASSERTION(!(data->mIsSolidColorInVisibleRegion && imageContainer),
+    NS_ASSERTION(!(data->mIsSolidColorInVisibleRegion && canOptimizeToImageLayer),
                  "Can't be a solid color as well as an image!");
-    if (imageContainer) {
-      nsRefPtr<ImageLayer> imageLayer = CreateOrRecycleImageLayer(data->mLayer);
-      imageLayer->SetContainer(imageContainer);
-      data->mImage->ConfigureLayer(imageLayer, mParameters);
-      imageLayer->SetPostScale(mParameters.mXScale,
-                               mParameters.mYScale);
-      if (data->mItemClip.HasClip()) {
-        ParentLayerIntRect clip = ViewAs<ParentLayerPixel>(ScaleToNearestPixels(data->mItemClip.GetClipRect()));
-        clip.MoveBy(ViewAs<ParentLayerPixel>(mParameters.mOffset));
-        imageLayer->SetClipRect(Some(clip));
-      } else {
-        imageLayer->SetClipRect(Nothing());
-      }
-      layer = imageLayer;
-      mLayerBuilder->StoreOptimizedLayerForFrame(data->mImage,
-                                                 imageLayer);
-      FLB_LOG_PAINTED_LAYER_DECISION(data, "  Selected image layer=%p\n", layer.get());
-    } else {
-      nsRefPtr<ColorLayer> colorLayer = CreateOrRecycleColorLayer(data->mLayer);
-      colorLayer->SetColor(data->mSolidColor);
-
-      // Copy transform
-      colorLayer->SetBaseTransform(data->mLayer->GetBaseTransform());
-      colorLayer->SetPostScale(data->mLayer->GetPostXScale(), data->mLayer->GetPostYScale());
 
-      nsIntRect visibleRect = data->mVisibleRegion.GetBounds();
-      visibleRect.MoveBy(-GetTranslationForPaintedLayer(data->mLayer));
-      colorLayer->SetBounds(visibleRect);
-      colorLayer->SetClipRect(Nothing());
+    layer = canOptimizeToImageLayer ? PrepareImageLayer(data)
+                                    : PrepareColorLayer(data);
 
-      layer = colorLayer;
-      FLB_LOG_PAINTED_LAYER_DECISION(data, "  Selected color layer=%p\n", layer.get());
+    if (layer) {
+      NS_ASSERTION(FindIndexOfLayerIn(mNewChildLayers, layer) < 0,
+                   "Layer already in list???");
+      NS_ASSERTION(newLayerEntry->mLayer == data->mLayer,
+                   "Painted layer at wrong index");
+      // Store optimized layer in reserved slot
+      newLayerEntry = &mNewChildLayers[data->mNewChildLayersIndex + 1];
+      NS_ASSERTION(!newLayerEntry->mLayer, "Slot already occupied?");
+      newLayerEntry->mLayer = layer;
+      newLayerEntry->mAnimatedGeometryRoot = data->mAnimatedGeometryRoot;
+      newLayerEntry->mFixedPosFrameForLayerData = data->mFixedPosFrameForLayerData;
+
+      // Hide the PaintedLayer. We leave it in the layer tree so that we
+      // can find and recycle it later.
+      ParentLayerIntRect emptyRect;
+      data->mLayer->SetClipRect(Some(emptyRect));
+      data->mLayer->SetVisibleRegion(nsIntRegion());
+      data->mLayer->InvalidateRegion(data->mLayer->GetValidRegion().GetBounds());
+      data->mLayer->SetEventRegions(EventRegions());
     }
-
-    NS_ASSERTION(FindIndexOfLayerIn(mNewChildLayers, layer) < 0,
-                 "Layer already in list???");
-    NS_ASSERTION(newLayerEntry->mLayer == data->mLayer,
-                 "Painted layer at wrong index");
-    // Store optimized layer in reserved slot
-    newLayerEntry = &mNewChildLayers[data->mNewChildLayersIndex + 1];
-    NS_ASSERTION(!newLayerEntry->mLayer, "Slot already occupied?");
-    newLayerEntry->mLayer = layer;
-    newLayerEntry->mAnimatedGeometryRoot = data->mAnimatedGeometryRoot;
-    newLayerEntry->mFixedPosFrameForLayerData = data->mFixedPosFrameForLayerData;
-
-    // Hide the PaintedLayer. We leave it in the layer tree so that we
-    // can find and recycle it later.
-    ParentLayerIntRect emptyRect;
-    data->mLayer->SetClipRect(Some(emptyRect));
-    data->mLayer->SetVisibleRegion(nsIntRegion());
-    data->mLayer->InvalidateRegion(data->mLayer->GetValidRegion().GetBounds());
-    data->mLayer->SetEventRegions(EventRegions());
-  } else {
+  }
+  
+  if (!layer) {
+    // We couldn't optimize to an image layer or a color layer above.
     layer = data->mLayer;
-    imageContainer = nullptr;
     layer->SetClipRect(Nothing());
     FLB_LOG_PAINTED_LAYER_DECISION(data, "  Selected painted layer=%p\n", layer.get());
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsBidi.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsBidi.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsBidi.cpp	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsBidi.cpp	2015-05-25 20:43:54.000000000 +0000
@@ -324,7 +324,7 @@
   if (mIsolateCount <= SIMPLE_ISOLATES_SIZE) {
     mIsolates = mSimpleIsolates;
   } else {
-    if (mIsolateCount <= (int32_t) mIsolatesSize) {
+    if (mIsolateCount * sizeof(Isolate) <= mIsolatesSize) {
       mIsolates = mIsolatesMemory;
     } else {
       if (GETINITIALISOLATESMEMORY(mIsolateCount)) {
@@ -669,7 +669,7 @@
 
     uint16_t stack[NSBIDI_MAX_EXPLICIT_LEVEL + 2];   /* we never push anything >=NSBIDI_MAX_EXPLICIT_LEVEL
                                                         but we need one more entry as base */
-    uint32_t stackLast = 0;
+    int32_t stackLast = 0;
     int32_t overflowIsolateCount = 0;
     int32_t overflowEmbeddingCount = 0;
     int32_t validIsolateCount = 0;
@@ -773,8 +773,14 @@
               /* pop embedding entries        */
               /* until the last isolate entry */
               stackLast--;
+
+              // Since validIsolateCount is true, there must be an isolate entry
+              // on the stack, so the stack is guaranteed to not be empty.
+              // Still, to eliminate a warning from coverity, we use an assertion.
+              MOZ_ASSERT(stackLast > 0);
             }
             stackLast--;  /* pop also the last isolate entry */
+            MOZ_ASSERT(stackLast >= 0);  // For coverity
             validIsolateCount--;
           } else {
             dirProps[i] |= IGNORE_CC;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsCaret.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsCaret.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsCaret.cpp	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsCaret.cpp	2015-05-25 20:43:54.000000000 +0000
@@ -46,6 +46,9 @@
 // an insignificant dot
 static const int32_t kMinBidiIndicatorPixels = 2;
 
+/*static*/ bool nsCaret::sSelectionCaretEnabled = false;
+/*static*/ bool nsCaret::sSelectionCaretsAffectCaret = false;
+
 /**
  * Find the first frame in an in-order traversal of the frame subtree rooted
  * at aFrame which is either a text frame logically at the end of a line,
@@ -144,6 +147,15 @@
     LookAndFeel::GetInt(LookAndFeel::eIntID_ShowCaretDuringSelection,
                         mShowDuringSelection ? 1 : 0) != 0;
 
+  static bool addedCaretPref = false;
+  if (!addedCaretPref) {
+    Preferences::AddBoolVarCache(&sSelectionCaretEnabled,
+      "selectioncaret.enabled");
+    Preferences::AddBoolVarCache(&sSelectionCaretsAffectCaret,
+      "selectioncaret.visibility.affectscaret");
+    addedCaretPref = true;
+  }
+
   // get the selection from the pres shell, and set ourselves up as a selection
   // listener
 
@@ -253,7 +265,8 @@
     return false;
   }
 
-  if (!mShowDuringSelection) {
+  if (!mShowDuringSelection &&
+      !(sSelectionCaretEnabled && sSelectionCaretsAffectCaret)) {
     Selection* selection = GetSelectionInternal();
     if (!selection) {
       return false;
@@ -264,6 +277,20 @@
     }
   }
 
+  // The Android IME can have a visible caret when there is a composition
+  // selection, due to auto-suggest/auto-correct styling (underlining),
+  // but never when the SelectionCarets are visible.
+  if (sSelectionCaretEnabled && sSelectionCaretsAffectCaret) {
+    nsCOMPtr<nsISelectionController> selCon = do_QueryReferent(mPresShell);
+    if (selCon) {
+      bool visible = false;
+      selCon->GetSelectionCaretsVisibility(&visible);
+      if (visible) {
+        return false;
+      }
+    }
+  }
+
   if (IsMenuPopupHidingCaret()) {
     return false;
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsCaret.h firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsCaret.h
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsCaret.h	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsCaret.h	2015-05-25 20:43:55.000000000 +0000
@@ -230,6 +230,10 @@
      * it's in non-user-modifiable content.
      */
     bool                  mIgnoreUserModify;
+
+    // Preference
+    static bool sSelectionCaretEnabled;
+    static bool sSelectionCaretsAffectCaret;
 };
 
 #endif //nsCaret_h__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsCSSFrameConstructor.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsCSSFrameConstructor.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsCSSFrameConstructor.cpp	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsCSSFrameConstructor.cpp	2015-05-25 20:43:54.000000000 +0000
@@ -5130,7 +5130,8 @@
   }
 
   if ((aTag != nsGkAtoms::svg && !parentIsSVG) ||
-      (aTag == nsGkAtoms::desc || aTag == nsGkAtoms::title)) {
+      (aTag == nsGkAtoms::desc || aTag == nsGkAtoms::title ||
+       aTag == nsGkAtoms::metadata)) {
     // Sections 5.1 and G.4 of SVG 1.1 say that SVG elements other than
     // svg:svg not contained within svg:svg are incorrect, although they
     // don't seem to specify error handling.  Ignore them, since many of
@@ -5141,7 +5142,7 @@
     // Style mutation can't change this situation, so don't bother
     // adding to the undisplayed content map.
     //
-    // We don't currently handle any UI for desc/title
+    // We don't currently handle any UI for desc/title/metadata
     return &sSuppressData;
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsCSSRenderingBorders.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsCSSRenderingBorders.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsCSSRenderingBorders.cpp	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsCSSRenderingBorders.cpp	2015-05-25 20:43:54.000000000 +0000
@@ -1092,7 +1092,7 @@
     aPoint2 = tmp;
     gs = gfxGradientCache::GetOrCreateGradientStops(aDT, rawStops, ExtendMode::CLAMP);
   }
-  return gs;
+  return gs.forget();
 }
 
 typedef struct { Float a, b; } twoFloats;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsCSSRendering.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsCSSRendering.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsCSSRendering.cpp	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsCSSRendering.cpp	2015-05-25 20:43:54.000000000 +0000
@@ -5193,14 +5193,30 @@
   return false;
 }
 
-already_AddRefed<mozilla::layers::ImageContainer>
-nsImageRenderer::GetContainer(LayerManager* aManager)
+bool
+nsImageRenderer::IsContainerAvailable(LayerManager* aManager,
+                                      nsDisplayListBuilder* aBuilder)
+{
+  if (mType != eStyleImageType_Image || !mImageContainer) {
+    return false;
+  }
+
+  uint32_t flags = aBuilder->ShouldSyncDecodeImages()
+                 ? imgIContainer::FLAG_SYNC_DECODE
+                 : imgIContainer::FLAG_NONE;
+
+  return mImageContainer->IsImageContainerAvailable(aManager, flags);
+}
+
+already_AddRefed<imgIContainer>
+nsImageRenderer::GetImage()
 {
   if (mType != eStyleImageType_Image || !mImageContainer) {
     return nullptr;
   }
 
-  return mImageContainer->GetImageContainer(aManager, imgIContainer::FLAG_NONE);
+  nsCOMPtr<imgIContainer> image = mImageContainer;
+  return image.forget();
 }
 
 #define MAX_BLUR_RADIUS 300
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsCSSRendering.h firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsCSSRendering.h
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsCSSRendering.h	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsCSSRendering.h	2015-05-25 20:43:54.000000000 +0000
@@ -237,7 +237,19 @@
 
   bool IsRasterImage();
   bool IsAnimatedImage();
-  already_AddRefed<ImageContainer> GetContainer(LayerManager* aManager);
+
+  /**
+   * @return true if this nsImageRenderer wraps an image which has an
+   * ImageContainer available.
+   *
+   * If IsContainerAvailable() returns true, GetImage() will return a non-null
+   * imgIContainer which callers can use to retrieve the ImageContainer.
+   */
+  bool IsContainerAvailable(LayerManager* aManager,
+                            nsDisplayListBuilder* aBuilder);
+
+  /// Retrieves the image associated with this nsImageRenderer, if there is one.
+  already_AddRefed<imgIContainer> GetImage();
 
   bool IsReady() { return mIsReady; }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsDisplayList.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsDisplayList.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsDisplayList.cpp	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsDisplayList.cpp	2015-05-25 20:43:55.000000000 +0000
@@ -2296,11 +2296,12 @@
 }
 
 bool
-nsDisplayBackgroundImage::TryOptimizeToImageLayer(LayerManager* aManager,
+nsDisplayBackgroundImage::CanOptimizeToImageLayer(LayerManager* aManager,
                                                   nsDisplayListBuilder* aBuilder)
 {
-  if (!mBackgroundStyle)
+  if (!mBackgroundStyle) {
     return false;
+  }
 
   nsPresContext* presContext = mFrame->PresContext();
   uint32_t flags = aBuilder->GetBackgroundPaintFlags();
@@ -2320,13 +2321,14 @@
                                            borderArea, borderArea, layer);
   nsImageRenderer* imageRenderer = &state.mImageRenderer;
   // We only care about images here, not gradients.
-  if (!imageRenderer->IsRasterImage())
+  if (!imageRenderer->IsRasterImage()) {
     return false;
+  }
 
-  nsRefPtr<ImageContainer> imageContainer = imageRenderer->GetContainer(aManager);
-  // Image is not ready to be made into a layer yet
-  if (!imageContainer)
+  if (!imageRenderer->IsContainerAvailable(aManager, aBuilder)) {
+    // The image is not ready to be made into a layer yet.
     return false;
+  }
 
   // We currently can't handle tiled or partial backgrounds.
   if (!state.mDestArea.IsEqualEdges(state.mFillArea)) {
@@ -2339,9 +2341,11 @@
   int32_t appUnitsPerDevPixel = presContext->AppUnitsPerDevPixel();
   mDestRect =
     LayoutDeviceRect::FromAppUnits(state.mDestArea, appUnitsPerDevPixel);
-  mImageContainer = imageContainer;
 
   // Ok, we can turn this into a layer if needed.
+  mImage = imageRenderer->GetImage();
+  MOZ_ASSERT(mImage);
+
   return true;
 }
 
@@ -2349,12 +2353,23 @@
 nsDisplayBackgroundImage::GetContainer(LayerManager* aManager,
                                        nsDisplayListBuilder *aBuilder)
 {
-  if (!TryOptimizeToImageLayer(aManager, aBuilder)) {
+  if (!mImage) {
+    MOZ_ASSERT_UNREACHABLE("Must call CanOptimizeToImage() and get true "
+                           "before calling GetContainer()");
     return nullptr;
   }
 
-  nsRefPtr<ImageContainer> container = mImageContainer;
+  if (!mImageContainer) {
+    // We don't have an ImageContainer yet; get it from mImage.
+
+    uint32_t flags = aBuilder->ShouldSyncDecodeImages()
+                   ? imgIContainer::FLAG_SYNC_DECODE
+                   : imgIContainer::FLAG_NONE;
+
+    mImageContainer = mImage->GetImageContainer(aManager, flags);
+  }
 
+  nsRefPtr<ImageContainer> container = mImageContainer;
   return container.forget();
 }
 
@@ -2386,19 +2401,24 @@
     }
   }
 
-  if (!TryOptimizeToImageLayer(aManager, aBuilder)) {
+  if (!CanOptimizeToImageLayer(aManager, aBuilder)) {
     return LAYER_NONE;
   }
 
+  MOZ_ASSERT(mImage);
+
   if (!animated) {
-    mozilla::gfx::IntSize imageSize = mImageContainer->GetCurrentSize();
-    NS_ASSERTION(imageSize.width != 0 && imageSize.height != 0, "Invalid image size!");
+    int32_t imageWidth;
+    int32_t imageHeight;
+    mImage->GetWidth(&imageWidth);
+    mImage->GetHeight(&imageHeight);
+    NS_ASSERTION(imageWidth != 0 && imageHeight != 0, "Invalid image size!");
 
     const LayerRect destLayerRect = mDestRect * aParameters.Scale();
 
     // Calculate the scaling factor for the frame.
-    const gfxSize scale = gfxSize(destLayerRect.width / imageSize.width,
-                                  destLayerRect.height / imageSize.height);
+    const gfxSize scale = gfxSize(destLayerRect.width / imageWidth,
+                                  destLayerRect.height / imageHeight);
 
     // If we are not scaling at all, no point in separating this into a layer.
     if (scale.width == 1.0f && scale.height == 1.0f) {
@@ -2426,7 +2446,8 @@
     if (!layer)
       return nullptr;
   }
-  layer->SetContainer(mImageContainer);
+  nsRefPtr<ImageContainer> imageContainer = GetContainer(aManager, aBuilder);
+  layer->SetContainer(imageContainer);
   ConfigureLayer(layer, aParameters);
   return layer.forget();
 }
@@ -2437,9 +2458,14 @@
 {
   aLayer->SetFilter(nsLayoutUtils::GetGraphicsFilterForFrame(mFrame));
 
-  mozilla::gfx::IntSize imageSize = mImageContainer->GetCurrentSize();
-  NS_ASSERTION(imageSize.width != 0 && imageSize.height != 0, "Invalid image size!");
-  if (imageSize.width > 0 && imageSize.height > 0) {
+  MOZ_ASSERT(mImage);
+  int32_t imageWidth;
+  int32_t imageHeight;
+  mImage->GetWidth(&imageWidth);
+  mImage->GetHeight(&imageHeight);
+  NS_ASSERTION(imageWidth != 0 && imageHeight != 0, "Invalid image size!");
+
+  if (imageWidth > 0 && imageHeight > 0) {
     // We're actually using the ImageContainer. Let our frame know that it
     // should consider itself to have painted successfully.
     nsDisplayBackgroundGeometry::UpdateDrawResult(this, DrawResult::SUCCESS);
@@ -2453,8 +2479,8 @@
 
   const LayoutDevicePoint p = mDestRect.TopLeft();
   Matrix transform = Matrix::Translation(p.x, p.y);
-  transform.PreScale(mDestRect.width / imageSize.width,
-                     mDestRect.height / imageSize.height);
+  transform.PreScale(mDestRect.width / imageWidth,
+                     mDestRect.height / imageHeight);
   aLayer->SetBaseTransform(gfx::Matrix4x4::From2D(transform));
 }
 
@@ -2886,19 +2912,36 @@
 nsDisplayBackgroundColor::Paint(nsDisplayListBuilder* aBuilder,
                                 nsRenderingContext* aCtx)
 {
-  DrawTarget& aDrawTarget = *aCtx->GetDrawTarget();
-
   if (mColor == NS_RGBA(0, 0, 0, 0)) {
     return;
   }
 
   nsRect borderBox = nsRect(ToReferenceFrame(), mFrame->GetSize());
 
+#if 0
+  // See https://bugzilla.mozilla.org/show_bug.cgi?id=1148418#c21 for why this
+  // results in a precision induced rounding issue that makes the rect one
+  // pixel shorter in rare cases. Disabled in favor of the old code for now.
+  // Note that the pref layout.css.devPixelsPerPx needs to be set to 1 to
+  // reproduce the bug.
+  DrawTarget& aDrawTarget = *aCtx->GetDrawTarget();
+
   Rect rect = NSRectToSnappedRect(borderBox,
                                   mFrame->PresContext()->AppUnitsPerDevPixel(),
                                   aDrawTarget);
   ColorPattern color(ToDeviceColor(mColor));
   aDrawTarget.FillRect(rect, color);
+#else
+  gfxContext* ctx = aCtx->ThebesContext();
+
+  gfxRect bounds =
+    nsLayoutUtils::RectToGfxRect(borderBox, mFrame->PresContext()->AppUnitsPerDevPixel());
+
+  ctx->SetColor(mColor);
+  ctx->NewPath();
+  ctx->Rectangle(bounds, true);
+  ctx->Fill();
+#endif
 }
 
 nsRegion
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsDisplayList.h firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsDisplayList.h
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsDisplayList.h	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsDisplayList.h	2015-05-25 20:43:55.000000000 +0000
@@ -1988,6 +1988,14 @@
     : nsDisplayItem(aBuilder, aFrame)
   {}
 
+  /**
+   * @return true if this display item can be optimized into an image layer.
+   * It is an error to call GetContainer() unless you've called
+   * CanOptimizeToImageLayer() first and it returned true.
+   */
+  virtual bool CanOptimizeToImageLayer(LayerManager* aManager,
+                                       nsDisplayListBuilder* aBuilder) = 0;
+
   virtual already_AddRefed<ImageContainer> GetContainer(LayerManager* aManager,
                                                         nsDisplayListBuilder* aBuilder) = 0;
   virtual void ConfigureLayer(ImageLayer* aLayer,
@@ -2336,6 +2344,8 @@
                                          const nsDisplayItemGeometry* aGeometry,
                                          nsRegion* aInvalidRegion) override;
   
+  virtual bool CanOptimizeToImageLayer(LayerManager* aManager,
+                                       nsDisplayListBuilder* aBuilder) override;
   virtual already_AddRefed<ImageContainer> GetContainer(LayerManager* aManager,
                                                         nsDisplayListBuilder *aBuilder) override;
   virtual void ConfigureLayer(ImageLayer* aLayer,
@@ -2362,7 +2372,7 @@
   // Cache the result of nsCSSRendering::FindBackground. Always null if
   // mIsThemed is true or if FindBackground returned false.
   const nsStyleBackground* mBackgroundStyle;
-  /* If this background can be a simple image layer, we store the format here. */
+  nsCOMPtr<imgIContainer> mImage;
   nsRefPtr<ImageContainer> mImageContainer;
   LayoutDeviceRect mDestRect;
   /* Bounds of this display item */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsDocumentViewer.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsDocumentViewer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsDocumentViewer.cpp	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsDocumentViewer.cpp	2015-05-25 20:43:55.000000000 +0000
@@ -131,7 +131,7 @@
 
 //-----------------------------------------------------
 // PR LOGGING
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #ifdef NS_PRINTING
 static PRLogModuleInfo *
@@ -142,7 +142,7 @@
     sLog = PR_NewLogModule("printing");
   return sLog;
 }
-#define PR_PL(_p1)  PR_LOG(GetPrintingLog(), PR_LOG_DEBUG, _p1);
+#define PR_PL(_p1)  MOZ_LOG(GetPrintingLog(), PR_LOG_DEBUG, _p1);
 #endif // NS_PRINTING
 
 #define PRT_YESNO(_p) ((_p)?"YES":"NO")
@@ -2643,8 +2643,7 @@
   NS_ENSURE_SUCCESS(rv, rv);
 
   // copy the href onto the clipboard
-  nsCOMPtr<nsIDOMDocument> doc = do_QueryInterface(mDocument);
-  return clipboard->CopyString(locationText, doc);
+  return clipboard->CopyString(locationText);
 }
 
 NS_IMETHODIMP nsDocumentViewer::CopyImage(int32_t aCopyFlags)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsLayoutUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsLayoutUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsLayoutUtils.cpp	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsLayoutUtils.cpp	2015-05-25 20:43:55.000000000 +0000
@@ -7642,25 +7642,31 @@
   return false;
 }
 
-static bool
-DeflateScrollbarAreaFromCompositionBoundsFor(nsIFrame* aScrollFrame)
+/* static */ nsMargin
+nsLayoutUtils::ScrollbarAreaToExcludeFromCompositionBoundsFor(nsIFrame* aScrollFrame)
 {
   if (!aScrollFrame || !aScrollFrame->GetScrollTargetFrame()) {
-    return false;
+    return nsMargin();
   }
   nsPresContext* presContext = aScrollFrame->PresContext();
   nsIPresShell* presShell = presContext->GetPresShell();
   if (!presShell) {
-    return false;
+    return nsMargin();
   }
   bool isRootScrollFrame = aScrollFrame == presShell->GetRootScrollFrame();
   bool isRootContentDocRootScrollFrame = isRootScrollFrame
                                       && presContext->IsRootContentDocument();
-  // Exclude any non-overlay scroll bars from the composition bounds.
-  // This is only done for the RCD-RSF case, because otherwise the scroll
-  // port size is used and that already excludes the scroll bars.
-  return isRootContentDocRootScrollFrame &&
-         !LookAndFeel::GetInt(LookAndFeel::eIntID_UseOverlayScrollbars);
+  if (!isRootContentDocRootScrollFrame) {
+    return nsMargin();
+  }
+  if (LookAndFeel::GetInt(LookAndFeel::eIntID_UseOverlayScrollbars)) {
+    return nsMargin();
+  }
+  nsIScrollableFrame* scrollableFrame = aScrollFrame->GetScrollTargetFrame();
+  if (!scrollableFrame) {
+    return nsMargin();
+  }
+  return scrollableFrame->GetActualScrollbarSizes();
 }
 
 /* static */ nsSize
@@ -7690,9 +7696,8 @@
     }
   }
 
-  if (aSubtractScrollbars && DeflateScrollbarAreaFromCompositionBoundsFor(aFrame)) {
-    MOZ_ASSERT(scrollableFrame);
-    nsMargin margins = scrollableFrame->GetActualScrollbarSizes();
+  if (aSubtractScrollbars) {
+    nsMargin margins = ScrollbarAreaToExcludeFromCompositionBoundsFor(aFrame);
     size.width -= margins.LeftRight();
     size.height -= margins.TopBottom();
   }
@@ -7748,14 +7753,11 @@
 
   // Adjust composition size for the size of scroll bars.
   nsIFrame* rootRootScrollFrame = rootPresShell ? rootPresShell->GetRootScrollFrame() : nullptr;
-  if (DeflateScrollbarAreaFromCompositionBoundsFor(rootRootScrollFrame)) {
-    nsIScrollableFrame* rootScrollableFrame = rootRootScrollFrame->GetScrollTargetFrame();
-    MOZ_ASSERT(rootScrollableFrame);
-    CSSMargin margins = CSSMargin::FromAppUnits(rootScrollableFrame->GetActualScrollbarSizes());
-    // Scrollbars are not subject to scaling, so CSS pixels = layer pixels for them.
-    rootCompositionSize.width -= margins.LeftRight();
-    rootCompositionSize.height -= margins.TopBottom();
-  }
+  nsMargin scrollbarMargins = ScrollbarAreaToExcludeFromCompositionBoundsFor(rootRootScrollFrame);
+  CSSMargin margins = CSSMargin::FromAppUnits(scrollbarMargins);
+  // Scrollbars are not subject to scaling, so CSS pixels = layer pixels for them.
+  rootCompositionSize.width -= margins.LeftRight();
+  rootCompositionSize.height -= margins.TopBottom();
 
   return rootCompositionSize / aMetrics.DisplayportPixelsPerCSSPixel();
 }
@@ -8275,13 +8277,10 @@
       compositionBounds, true, metrics.GetCumulativeResolution());
   }
 
-  if (DeflateScrollbarAreaFromCompositionBoundsFor(aScrollFrame)) {
-    MOZ_ASSERT(scrollableFrame);
-    nsMargin sizes = scrollableFrame->GetActualScrollbarSizes();
-    // Scrollbars are not subject to scaling, so CSS pixels = layer pixels for them.
-    ParentLayerMargin boundMargins = CSSMargin::FromAppUnits(sizes) * CSSToParentLayerScale(1.0f);
-    frameBounds.Deflate(boundMargins);
-  }
+  nsMargin sizes = ScrollbarAreaToExcludeFromCompositionBoundsFor(aScrollFrame);
+  // Scrollbars are not subject to scaling, so CSS pixels = layer pixels for them.
+  ParentLayerMargin boundMargins = CSSMargin::FromAppUnits(sizes) * CSSToParentLayerScale(1.0f);
+  frameBounds.Deflate(boundMargins);
 
   metrics.SetCompositionBounds(frameBounds);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsLayoutUtils.h firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsLayoutUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsLayoutUtils.h	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsLayoutUtils.h	2015-05-25 20:43:55.000000000 +0000
@@ -2631,6 +2631,19 @@
                                           bool aIsRoot,
                                           const ContainerLayerParameters& aContainerParameters);
 
+  /**
+   * If the given scroll frame needs an area excluded from its composition
+   * bounds due to scrollbars, return that area, otherwise return an empty
+   * margin.
+   * There is no need to exclude scrollbars in the following cases:
+   *   - If the scroll frame is not the RCD-RSF; in that case, the composition
+   *     bounds is calculated based on the scroll port which already excludes
+   *     the scrollbar area.
+   *   - If the scrollbars are overlay, since then they are drawn on top of the
+   *     scrollable content.
+   */
+  static nsMargin ScrollbarAreaToExcludeFromCompositionBoundsFor(nsIFrame* aScrollFrame);
+
 private:
   static uint32_t sFontSizeInflationEmPerLine;
   static uint32_t sFontSizeInflationMinTwips;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsPresContext.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsPresContext.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsPresContext.cpp	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsPresContext.cpp	2015-05-25 20:43:55.000000000 +0000
@@ -68,6 +68,11 @@
 #include "gfxTextRun.h"
 #include "nsFontFaceUtils.h"
 
+#if defined(MOZ_WIDGET_GTK)
+#include "gfxPlatformGtk.h" // xxx - for UseFcFontList
+#endif
+
+
 // Needed for Start/Stop of Image Animation
 #include "imgIContainer.h"
 #include "nsIImageLoadingContent.h"
@@ -2170,8 +2175,10 @@
     return;
 
   bool usePlatformFontList = true;
-#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
-  usePlatformFontList = false;
+#if defined(MOZ_WIDGET_GTK)
+    usePlatformFontList = gfxPlatformGtk::UseFcFontList();
+#elif defined(MOZ_WIDGET_QT)
+    usePlatformFontList = false;
 #endif
 
   // xxx - until the Linux platform font list is always used, use full
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsPresShell.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsPresShell.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsPresShell.cpp	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsPresShell.cpp	2015-05-25 20:43:55.000000000 +0000
@@ -18,7 +18,7 @@
 
 /* a presentation of a document, part 2 */
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/CSSStyleSheet.h"
@@ -899,6 +899,7 @@
   if (TouchCaretPrefEnabled() && !AccessibleCaretEnabled()) {
     // Create touch caret handle
     mTouchCaret = new TouchCaret(this);
+    mTouchCaret->Init();
   }
 
   if (SelectionCaretPrefEnabled() && !AccessibleCaretEnabled()) {
@@ -1028,7 +1029,7 @@
   }
 
   if (aLogType == eLog_loaddone) {
-    PR_LOG(tpLog, logLevel,
+    MOZ_LOG(tpLog, logLevel,
            ("%s reflow: %d chars: %d "
             "[%s] "
             "content-textruns: %d chrome-textruns: %d "
@@ -1048,7 +1049,7 @@
             aCounts.textrunConst, aCounts.textrunDestr,
             aTextPerf->cumulative.textrunDestr));
   } else {
-    PR_LOG(tpLog, logLevel,
+    MOZ_LOG(tpLog, logLevel,
            ("%s reflow: %d chars: %d "
             "content-textruns: %d chrome-textruns: %d "
             "max-textrun-len: %d "
@@ -2554,6 +2555,26 @@
   return NS_OK;
 }
 
+NS_IMETHODIMP
+PresShell::GetSelectionCaretsVisibility(bool* aOutVisibility)
+{
+  *aOutVisibility = (SelectionCaretPrefEnabled() && mSelectionCarets->GetVisibility());
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+PresShell::SetSelectionCaretsVisibility(bool aVisibility)
+{
+  if (SelectionCaretPrefEnabled() && mSelectionCarets) {
+    if (aVisibility) {
+      mSelectionCarets->UpdateSelectionCarets();
+    } else {
+      mSelectionCarets->SetVisibility(false);
+    }
+  }
+  return NS_OK;
+}
+
 //end implementations nsISelectionController
 
 nsIFrame*
@@ -2697,7 +2718,7 @@
     if (uri) {
       uri->GetSpec(spec);
     }
-    PR_LOG(gLog, PR_LOG_DEBUG,
+    MOZ_LOG(gLog, PR_LOG_DEBUG,
            ("(presshell) %p load begin [%s]\n",
             this, spec.get()));
   }
@@ -2731,7 +2752,7 @@
       uri->GetSpec(spec);
     }
     if (shouldLog) {
-      PR_LOG(gLog, PR_LOG_DEBUG,
+      MOZ_LOG(gLog, PR_LOG_DEBUG,
              ("(presshell) %p load done time-ms: %9.2f [%s]\n",
               this, loadTime.ToMilliseconds(), spec.get()));
     }
@@ -8035,10 +8056,10 @@
       case NS_KEY_UP: {
         nsIDocument* doc = GetCurrentEventContent() ?
                            mCurrentEventContent->OwnerDoc() : nullptr;
-        nsIDocument* fullscreenAncestor = nullptr;
         auto keyCode = aEvent->AsKeyboardEvent()->keyCode;
         if (keyCode == NS_VK_ESCAPE) {
-          if ((fullscreenAncestor = nsContentUtils::GetFullscreenAncestor(doc))) {
+          nsIDocument* root = nsContentUtils::GetRootDocument(doc);
+          if (root && root->IsFullScreenDoc()) {
             // Prevent default action on ESC key press when exiting
             // DOM fullscreen mode. This prevents the browser ESC key
             // handler from stopping all loads in the document, which
@@ -8051,16 +8072,9 @@
             if (!mIsLastChromeOnlyEscapeKeyConsumed &&
                 aEvent->message == NS_KEY_UP) {
               // ESC key released while in DOM fullscreen mode.
-              // If fullscreen is running in content-only mode, exit the target
-              // doctree branch from fullscreen, otherwise fully exit all
-              // browser windows and documents from fullscreen mode.
-              // Note: in the content-only fullscreen case, we pass the
-              // fullscreenAncestor since |doc| may not actually be fullscreen
-              // here, and ExitFullscreen() has no affect when passed a
-              // non-fullscreen document.
-              nsIDocument::ExitFullscreen(
-                nsContentUtils::IsFullscreenApiContentOnly() ? fullscreenAncestor : nullptr,
-                /* async */ true);
+              // Fully exit all browser windows and documents from
+              // fullscreen mode.
+              nsIDocument::ExitFullscreen(nullptr, /* async */ true);
             }
           }
           nsCOMPtr<nsIDocument> pointerLockedDoc =
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsPresShell.h firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsPresShell.h
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsPresShell.h	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsPresShell.h	2015-05-25 20:43:55.000000000 +0000
@@ -279,6 +279,9 @@
   virtual nsresult CheckVisibilityContent(nsIContent* aNode, int16_t aStartOffset,
                                           int16_t aEndOffset, bool* aRetval) override;
 
+  NS_IMETHOD GetSelectionCaretsVisibility(bool* aOutVisibility) override;
+  NS_IMETHOD SetSelectionCaretsVisibility(bool aVisibility) override;
+
   // nsIDocumentObserver
   NS_DECL_NSIDOCUMENTOBSERVER_BEGINUPDATE
   NS_DECL_NSIDOCUMENTOBSERVER_ENDUPDATE
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsRefreshDriver.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsRefreshDriver.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/nsRefreshDriver.cpp	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/nsRefreshDriver.cpp	2015-05-25 20:43:55.000000000 +0000
@@ -33,7 +33,7 @@
 #include "nsLayoutUtils.h"
 #include "nsPresContext.h"
 #include "nsComponentManagerUtils.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsAutoPtr.h"
 #include "nsIDocument.h"
 #include "jsapi.h"
@@ -74,7 +74,7 @@
 using namespace mozilla::layout;
 
 static PRLogModuleInfo *gLog = nullptr;
-#define LOG(...) PR_LOG(gLog, PR_LOG_NOTICE, (__VA_ARGS__))
+#define LOG(...) MOZ_LOG(gLog, PR_LOG_NOTICE, (__VA_ARGS__))
 
 #define DEFAULT_FRAME_RATE 60
 #define DEFAULT_THROTTLED_FRAME_RATE 1
@@ -1656,11 +1656,6 @@
           if (!mStyleFlushObservers.Contains(shell))
             continue;
 
-          nsRefPtr<nsDocShell> docShell = GetDocShell(shell->GetPresContext());
-          if (docShell) {
-            docShell->AddProfileTimelineMarker("Styles", TRACING_INTERVAL_START);
-          }
-
           if (!tracingStyleFlush) {
             tracingStyleFlush = true;
             profiler_tracing("Paint", "Styles", mStyleCause, TRACING_INTERVAL_START);
@@ -1679,10 +1674,6 @@
             presContext->NotifyFontFaceSetOnRefresh();
           }
           NS_RELEASE(shell);
-
-          if (docShell) {
-            docShell->AddProfileTimelineMarker("Styles", TRACING_INTERVAL_END);
-          }
         }
 
         if (tracingStyleFlush) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/PositionedEventTargeting.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/base/PositionedEventTargeting.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/PositionedEventTargeting.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/PositionedEventTargeting.cpp	2015-05-25 20:43:53.000000000 +0000
@@ -76,7 +76,7 @@
   bool mRegistered;
   bool mTouchOnly;
   bool mRepositionEventCoords;
-  bool mTouchClusterDetection;
+  bool mTouchClusterDetectionDisabled;
   uint32_t mLimitReadableSize;
 };
 
@@ -125,8 +125,8 @@
     nsPrintfCString repositionPref("ui.%s.radius.reposition", prefBranch);
     Preferences::AddBoolVarCache(&prefs->mRepositionEventCoords, repositionPref.get(), false);
 
-    nsPrintfCString touchClusterPref("ui.zoomedview.enabled", prefBranch);
-    Preferences::AddBoolVarCache(&prefs->mTouchClusterDetection, touchClusterPref.get(), false);
+    nsPrintfCString touchClusterPref("ui.zoomedview.disabled", prefBranch);
+    Preferences::AddBoolVarCache(&prefs->mTouchClusterDetectionDisabled, touchClusterPref.get(), true);
 
     nsPrintfCString limitReadableSizePref("ui.zoomedview.limitReadableSize", prefBranch);
     Preferences::AddUintVarCache(&prefs->mLimitReadableSize, limitReadableSizePref.get(), 8);
@@ -396,7 +396,7 @@
 static bool
 IsElementClickableAndReadable(nsIFrame* aFrame, WidgetGUIEvent* aEvent, const EventRadiusPrefs* aPrefs)
 {
-  if (!aPrefs->mTouchClusterDetection) {
+  if (aPrefs->mTouchClusterDetectionDisabled) {
     return true;
   }
 
@@ -487,7 +487,7 @@
     GetClosest(aRootFrame, aPointRelativeToRootFrame, targetRect, prefs,
                restrictToDescendants, candidates, &elementsInCluster);
   if (closestClickable) {
-    if ((prefs->mTouchClusterDetection && elementsInCluster > 1) ||
+    if ((!prefs->mTouchClusterDetectionDisabled && elementsInCluster > 1) ||
         (!IsElementClickableAndReadable(closestClickable, aEvent, prefs))) {
       if (aEvent->mClass == eMouseEventClass) {
         WidgetMouseEventBase* mouseEventBase = aEvent->AsMouseEventBase();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/RestyleManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/base/RestyleManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/RestyleManager.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/RestyleManager.cpp	2015-05-25 20:43:53.000000000 +0000
@@ -257,7 +257,7 @@
       // painting is suppressed.
       needInvalidatingPaint = true;
       aFrame->InvalidateFrameSubtree();
-      if (aChange & nsChangeHint_UpdateEffects &&
+      if ((aChange & nsChangeHint_UpdateEffects) &&
           aFrame->IsFrameOfType(nsIFrame::eSVG) &&
           !(aFrame->GetStateBits() & NS_STATE_IS_OUTER_SVG)) {
         // Need to update our overflow rects:
@@ -802,7 +802,10 @@
           nsSVGEffects::UpdateEffects(cont);
         }
       }
-      if (hint & nsChangeHint_InvalidateRenderingObservers) {
+      if ((hint & nsChangeHint_InvalidateRenderingObservers) ||
+          ((hint & nsChangeHint_UpdateOpacityLayer) &&
+           frame->IsFrameOfType(nsIFrame::eSVG) &&
+           !(frame->GetStateBits() & NS_STATE_IS_OUTER_SVG))) {
         nsSVGEffects::InvalidateRenderingObservers(frame);
       }
       if (hint & nsChangeHint_NeedReflow) {
@@ -4183,7 +4186,6 @@
 }
 #endif
 
-#ifdef DEBUG
 /* static */ nsCString
 RestyleManager::RestyleHintToString(nsRestyleHint aHint)
 {
@@ -4216,6 +4218,7 @@
   return result;
 }
 
+#ifdef DEBUG
 /* static */ nsCString
 RestyleManager::ChangeHintToString(nsChangeHint aHint)
 {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/RestyleManager.h firefox-trunk-41.0~a1~hg20150524r245419/layout/base/RestyleManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/RestyleManager.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/RestyleManager.h	2015-05-25 20:43:53.000000000 +0000
@@ -348,8 +348,9 @@
     mOverflowChangedTracker.Flush();
   }
 
-#ifdef DEBUG
   static nsCString RestyleHintToString(nsRestyleHint aHint);
+
+#ifdef DEBUG
   static nsCString ChangeHintToString(nsChangeHint aHint);
 #endif
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/RestyleTracker.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/base/RestyleTracker.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/RestyleTracker.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/RestyleTracker.cpp	2015-05-25 20:43:53.000000000 +0000
@@ -96,6 +96,31 @@
 #endif
 };
 
+class RestyleTimelineMarker : public TimelineMarker
+{
+public:
+  RestyleTimelineMarker(nsDocShell* aDocShell,
+                        TracingMetadata aMetaData,
+                        nsRestyleHint aRestyleHint)
+    : TimelineMarker(aDocShell, "Styles", aMetaData)
+  {
+    if (aRestyleHint) {
+      mRestyleHint.AssignWithConversion(RestyleManager::RestyleHintToString(aRestyleHint));
+    }
+  }
+
+  virtual void AddDetails(JSContext* aCx,
+                          mozilla::dom::ProfileTimelineMarker& aMarker) override
+  {
+    if (GetMetaData() == TRACING_INTERVAL_START) {
+      aMarker.mRestyleHint.Construct(mRestyleHint);
+    }
+  }
+
+private:
+  nsAutoString mRestyleHint;
+};
+
 static PLDHashOperator
 CollectRestyles(nsISupports* aElement,
                 nsAutoPtr<RestyleTracker::RestyleData>& aData,
@@ -202,6 +227,13 @@
   PROFILER_LABEL("RestyleTracker", "ProcessRestyles",
     js::ProfileEntry::Category::CSS);
 
+  bool isTimelineRecording = false;
+  nsDocShell* docShell =
+    static_cast<nsDocShell*>(mRestyleManager->PresContext()->GetDocShell());
+  if (docShell) {
+    docShell->GetRecordProfileTimelineMarkers(&isTimelineRecording);
+  }
+
   // Create a ReframingStyleContexts struct on the stack and put it in our
   // mReframingStyleContexts for almost all of the remaining scope of
   // this function.
@@ -311,6 +343,14 @@
           continue;
         }
 
+        if (isTimelineRecording) {
+          mozilla::UniquePtr<TimelineMarker> marker =
+            MakeUnique<RestyleTimelineMarker>(docShell,
+                                              TRACING_INTERVAL_START,
+                                              data->mRestyleHint);
+          docShell->AddProfileTimelineMarker(Move(marker));
+        }
+
 #if defined(MOZ_ENABLE_PROFILER_SPS) && !defined(MOZILLA_XPCOMRT_API)
         Maybe<GeckoProfilerTracingRAII> profilerRAII;
         if (profiler_feature_active("restyle")) {
@@ -319,6 +359,14 @@
 #endif
         ProcessOneRestyle(element, data->mRestyleHint, data->mChangeHint);
         AddRestyleRootsIfAwaitingRestyle(data->mDescendants);
+
+        if (isTimelineRecording) {
+          mozilla::UniquePtr<TimelineMarker> marker =
+            MakeUnique<RestyleTimelineMarker>(docShell,
+                                              TRACING_INTERVAL_END,
+                                              data->mRestyleHint);
+          docShell->AddProfileTimelineMarker(Move(marker));
+        }
       }
 
       if (mHaveLaterSiblingRestyles) {
@@ -359,9 +407,25 @@
             profilerRAII.emplace("Paint", "Styles", Move(currentRestyle->mBacktrace));
           }
 #endif
+          if (isTimelineRecording) {
+            mozilla::UniquePtr<TimelineMarker> marker =
+              MakeUnique<RestyleTimelineMarker>(docShell,
+                                                TRACING_INTERVAL_START,
+                                                currentRestyle->mRestyleHint);
+            docShell->AddProfileTimelineMarker(Move(marker));
+          }
+
           ProcessOneRestyle(currentRestyle->mElement,
                             currentRestyle->mRestyleHint,
                             currentRestyle->mChangeHint);
+
+          if (isTimelineRecording) {
+            mozilla::UniquePtr<TimelineMarker> marker =
+              MakeUnique<RestyleTimelineMarker>(docShell,
+                                                TRACING_INTERVAL_END,
+                                                currentRestyle->mRestyleHint);
+            docShell->AddProfileTimelineMarker(Move(marker));
+          }
         }
       }
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/SelectionCarets.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/base/SelectionCarets.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/SelectionCarets.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/SelectionCarets.cpp	2015-05-25 20:43:53.000000000 +0000
@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "SelectionCarets.h"
 
 #include "gfxPrefs.h"
@@ -45,20 +45,18 @@
 // To enable all the SELECTIONCARETS_LOG print statements, set the environment
 // variable NSPR_LOG_MODULES=SelectionCarets:5
 #define SELECTIONCARETS_LOG(message, ...)                                      \
-  PR_LOG(gSelectionCaretsLog, PR_LOG_DEBUG,                                    \
+  MOZ_LOG(gSelectionCaretsLog, PR_LOG_DEBUG,                                    \
          ("SelectionCarets (%p): %s:%d : " message "\n", this, __FUNCTION__,   \
           __LINE__, ##__VA_ARGS__));
 
 #define SELECTIONCARETS_LOG_STATIC(message, ...)                               \
-  PR_LOG(gSelectionCaretsLog, PR_LOG_DEBUG,                                    \
+  MOZ_LOG(gSelectionCaretsLog, PR_LOG_DEBUG,                                    \
          ("SelectionCarets: %s:%d : " message "\n", __FUNCTION__, __LINE__,    \
           ##__VA_ARGS__));
 
 // We treat mouse/touch move as "REAL" move event once its move distance
 // exceed this value, in CSS pixel.
 static const int32_t kMoveStartTolerancePx = 5;
-// Time for trigger scroll end event, in miliseconds.
-static const int32_t kScrollEndTimerDelay = 300;
 
 NS_IMPL_ISUPPORTS(SelectionCarets,
                   nsIReflowObserver,
@@ -68,6 +66,8 @@
 
 /*static*/ int32_t SelectionCarets::sSelectionCaretsInflateSize = 0;
 /*static*/ bool SelectionCarets::sSelectionCaretDetectsLongTap = true;
+/*static*/ bool SelectionCarets::sCaretManagesAndroidActionbar = false;
+/*static*/ bool SelectionCarets::sSelectionCaretObservesCompositions = false;
 
 SelectionCarets::SelectionCarets(nsIPresShell* aPresShell)
   : mPresShell(aPresShell)
@@ -80,6 +80,7 @@
   , mStartCaretVisible(false)
   , mSelectionVisibleInScrollFrames(true)
   , mVisible(false)
+  , mActionBarViewID(0)
 {
   MOZ_ASSERT(NS_IsMainThread());
 
@@ -95,6 +96,10 @@
                                 "selectioncaret.inflatesize.threshold");
     Preferences::AddBoolVarCache(&sSelectionCaretDetectsLongTap,
                                  "selectioncaret.detects.longtap", true);
+    Preferences::AddBoolVarCache(&sCaretManagesAndroidActionbar,
+                                 "caret.manages-android-actionbar");
+    Preferences::AddBoolVarCache(&sSelectionCaretObservesCompositions,
+                                 "selectioncaret.observes.compositions");
     addedPref = true;
   }
 }
@@ -320,6 +325,11 @@
 
   dom::Element* endElement = mPresShell->GetSelectionCaretsEndElement();
   SetElementVisibility(endElement, mVisible && mEndCaretVisible);
+
+  // Update the Android Actionbar visibility if in use.
+  if (sCaretManagesAndroidActionbar) {
+    TouchCaret::UpdateAndroidActionBarVisibility(mVisible, mActionBarViewID);
+  }
 }
 
 void
@@ -1127,12 +1137,46 @@
     return NS_OK;
   }
 
-  if (!aReason || (aReason & (nsISelectionListener::DRAG_REASON |
-                              nsISelectionListener::KEYPRESS_REASON |
-                              nsISelectionListener::MOUSEDOWN_REASON))) {
-    SetVisibility(false);
+  // Update SelectionCaret visibility.
+  if (sSelectionCaretObservesCompositions) {
+    // When observing selection change notifications generated for example
+    // by Android soft-keyboard compositions, we can only obtain visibility
+    // after mouse-up by long-tap, or final caret-drag.
+    if (!mVisible) {
+      if (aReason & nsISelectionListener::MOUSEUP_REASON) {
+        UpdateSelectionCarets();
+      }
+    } else {
+      // If already visible, we hide immediately for some known
+      // event-reasons: drag, keypress, or mouse down.
+      if (aReason & (nsISelectionListener::DRAG_REASON |
+                     nsISelectionListener::KEYPRESS_REASON |
+                     nsISelectionListener::MOUSEDOWN_REASON)) {
+        SetVisibility(false);
+      } else {
+        // Else we look further at the selection status, as currently
+        // style-composition changes don't provide reason codes.
+        UpdateSelectionCarets();
+      }
+    }
   } else {
-    UpdateSelectionCarets();
+    // Default logic, mainly employed by b2g, isn't aware of soft-keyboard
+    // selection change compositions.
+    if (!aReason || (aReason & (nsISelectionListener::DRAG_REASON |
+                                nsISelectionListener::KEYPRESS_REASON |
+                                nsISelectionListener::MOUSEDOWN_REASON))) {
+      SetVisibility(false);
+    } else {
+      UpdateSelectionCarets();
+    }
+  }
+
+  // Maybe trigger Android ActionBar updates.
+  if (mVisible && sCaretManagesAndroidActionbar) {
+    nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
+    if (os) {
+      os->NotifyObservers(nullptr, "ActionBar:UpdateState", nullptr);
+    }
   }
 
   DispatchSelectionStateChangedEvent(static_cast<Selection*>(aSel),
@@ -1164,7 +1208,10 @@
 {
   if (mVisible) {
     mInAsyncPanZoomGesture = true;
-    SetVisibility(false);
+    // Hide selection carets if not using ActionBar.
+    if (!sCaretManagesAndroidActionbar) {
+      SetVisibility(false);
+    }
 
     SELECTIONCARETS_LOG("Dispatch scroll started");
     DispatchScrollViewChangeEvent(mPresShell, dom::ScrollState::Started);
@@ -1200,7 +1247,11 @@
 {
   if (mVisible) {
     if (!mUseAsyncPanZoom) {
-      SetVisibility(false);
+      // Hide selection carets if not using ActionBar.
+      if (!sCaretManagesAndroidActionbar) {
+        SetVisibility(false);
+      }
+
       //TODO: handling scrolling for selection bubble when APZ is off
       // Dispatch event to notify gaia to hide selection bubble.
       // Positions will be updated when scroll is end, so no need to calculate
@@ -1286,10 +1337,11 @@
 
   MOZ_ASSERT(mScrollEndDetectorTimer);
 
-  SELECTIONCARETS_LOG("Will fire scroll end after %d ms", kScrollEndTimerDelay);
+  SELECTIONCARETS_LOG("Will fire scroll end after %d ms",
+    TouchCaret::sScrollEndTimerDelay);
   mScrollEndDetectorTimer->InitWithFuncCallback(FireScrollEnd,
                                                 this,
-                                                kScrollEndTimerDelay,
+                                                TouchCaret::sScrollEndTimerDelay,
                                                 nsITimer::TYPE_ONE_SHOT);
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/SelectionCarets.h firefox-trunk-41.0~a1~hg20150524r245419/layout/base/SelectionCarets.h
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/SelectionCarets.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/SelectionCarets.h	2015-05-25 20:43:53.000000000 +0000
@@ -101,11 +101,6 @@
     return sSelectionCaretsInflateSize;
   }
 
-private:
-  virtual ~SelectionCarets();
-
-  SelectionCarets() = delete;
-
   /**
    * Set visibility for selection caret.
    */
@@ -116,6 +111,11 @@
    */
   void UpdateSelectionCarets();
 
+private:
+  virtual ~SelectionCarets();
+
+  SelectionCarets() = delete;
+
   /**
    * Select a word base on current position, which activates only if element is
    * selectable. Triggered by long tap event.
@@ -267,6 +267,11 @@
   // Preference
   static int32_t sSelectionCaretsInflateSize;
   static bool sSelectionCaretDetectsLongTap;
+  static bool sCaretManagesAndroidActionbar;
+  static bool sSelectionCaretObservesCompositions;
+
+  // Unique ID of current Mobile ActionBar view.
+  uint32_t mActionBarViewID;
 };
 } // namespace mozilla
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/tests/chrome/printpreview_helper.xul firefox-trunk-41.0~a1~hg20150524r245419/layout/base/tests/chrome/printpreview_helper.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/tests/chrome/printpreview_helper.xul	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/tests/chrome/printpreview_helper.xul	2015-05-25 20:43:56.000000000 +0000
@@ -126,7 +126,7 @@
   window.frames[0].document.body.firstChild.innerHTML = "Print preview";
 
   printpreview();
-  ctx1.drawWindow(window.frames[1], 0, 0, 300, 300, "rgb(256,256,256)");
+  ctx1.drawWindow(window.frames[1], 0, 0, 400, 400, "rgb(256,256,256)");
   window.frames[0].document.body.firstChild.innerHTML = "Galley presentation";
 
   // Add some elements.
@@ -140,7 +140,7 @@
 }
 
 function finalizeTest1() {
-  ctx2.drawWindow(window.frames[1], 0, 0, 300, 300, "rgb(256,256,256)");
+  ctx2.drawWindow(window.frames[1], 0, 0, 400, 400, "rgb(256,256,256)");
   exitprintpreview();
   ok(compareCanvases(), "Canvas should be the same!");
   counter = window.frames[0].counter;
@@ -210,13 +210,13 @@
   window.frames[0].document.body.firstChild.value =
     window.frames[0].document.body.firstChild.getAttribute('value');
   printpreview();
-  ctx1.drawWindow(window.frames[1], 0, 0, 300, 300, "rgb(256,256,256)");
+  ctx1.drawWindow(window.frames[1], 0, 0, 400, 400, "rgb(256,256,256)");
   exitprintpreview();
   window.frames[0].document.body.innerHTML = el2;
   window.frames[0].document.body.firstChild.value =
     window.frames[0].document.body.firstChild.getAttribute('value');
   printpreview();
-  ctx2.drawWindow(window.frames[1], 0, 0, 300, 300, "rgb(256,256,256)");
+  ctx2.drawWindow(window.frames[1], 0, 0, 400, 400, "rgb(256,256,256)");
   exitprintpreview();
   is(compareCanvases(), equals,
      "Comparing print preview didn't succeed [" + el1 + " : " + el2 + "]");
@@ -268,7 +268,7 @@
 <table style="border: 1px solid black;" xmlns="http://www.w3.org/1999/xhtml">
 <tr><th>Print preview canvas 1</th><th>Print preview canvas 2</th></tr>
 <tr>
-<td><canvas height="300" width="300"></canvas></td>
-<td><canvas height="300" width="300"></canvas></td>
+<td><canvas height="400" width="400"></canvas></td>
+<td><canvas height="400" width="400"></canvas></td>
 </tr></table>
 </window>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/tests/marionette/test_selectioncarets2.py firefox-trunk-41.0~a1~hg20150524r245419/layout/base/tests/marionette/test_selectioncarets2.py
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/tests/marionette/test_selectioncarets2.py	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/tests/marionette/test_selectioncarets2.py	2015-05-25 20:43:57.000000000 +0000
@@ -48,15 +48,17 @@
         pref_name = repr(pref_name)
         if isinstance(value, bool):
             value = 'true' if value else 'false'
+            func = 'setBoolPref'
         elif isinstance(value, int):
             value = str(value)
+            func = 'setIntPref'
         else:
             value = repr(value)
+            func = 'setCharPref'
 
-        script = '''SpecialPowers.pushPrefEnv({"set": [[%s, %s]]}, marionetteScriptFinished);''' % (
-            pref_name, value)
-
-        self.marionette.execute_async_script(script)
+        with self.marionette.using_context('chrome'):
+            script = 'Services.prefs.%s(%s, %s)' % (func, pref_name, value)
+            self.marionette.execute_script(script)
 
     def open_test_html(self, enabled=True):
         'Open html for testing and enable selectioncaret and non-editable support'
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/tests/marionette/test_selectioncarets.py firefox-trunk-41.0~a1~hg20150524r245419/layout/base/tests/marionette/test_selectioncarets.py
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/tests/marionette/test_selectioncarets.py	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/tests/marionette/test_selectioncarets.py	2015-05-25 20:43:57.000000000 +0000
@@ -48,15 +48,17 @@
         pref_name = repr(pref_name)
         if isinstance(value, bool):
             value = 'true' if value else 'false'
+            func = 'setBoolPref'
         elif isinstance(value, int):
             value = str(value)
+            func = 'setIntPref'
         else:
             value = repr(value)
+            func = 'setCharPref'
 
-        script = '''SpecialPowers.pushPrefEnv({"set": [[%s, %s]]}, marionetteScriptFinished);''' % (
-            pref_name, value)
-
-        self.marionette.execute_async_script(script)
+        with self.marionette.using_context('chrome'):
+            script = 'Services.prefs.%s(%s, %s)' % (func, pref_name, value)
+            self.marionette.execute_script(script)
 
     def open_test_html(self, enabled=True):
         '''Open html for testing and locate elements, and enable/disable touch
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/tests/marionette/test_touchcaret.py firefox-trunk-41.0~a1~hg20150524r245419/layout/base/tests/marionette/test_touchcaret.py
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/tests/marionette/test_touchcaret.py	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/tests/marionette/test_touchcaret.py	2015-05-25 20:43:57.000000000 +0000
@@ -42,20 +42,23 @@
         pref_name = repr(pref_name)
         if isinstance(value, bool):
             value = 'true' if value else 'false'
+            func = 'setBoolPref'
         elif isinstance(value, int):
             value = str(value)
+            func = 'setIntPref'
         else:
             value = repr(value)
+            func = 'setCharPref'
 
-        script = '''SpecialPowers.pushPrefEnv({"set": [[%s, %s]]}, marionetteScriptFinished);''' % (
-            pref_name, value)
-
-        self.marionette.execute_async_script(script)
+        with self.marionette.using_context('chrome'):
+            script = 'Services.prefs.%s(%s, %s)' % (func, pref_name, value)
+            self.marionette.execute_script(script)
 
     def timeout_ms(self):
         'Return touch caret expiration time in milliseconds.'
-        return self.marionette.execute_script(
-            'return SpecialPowers.getIntPref("%s");' % self.caret_timeout_ms_pref)
+        with self.marionette.using_context('chrome'):
+            return self.marionette.execute_script(
+                'return Services.prefs.getIntPref("%s");' % self.caret_timeout_ms_pref)
 
     def open_test_html(self, enabled=True, timeout_ms=0):
         '''Open html for testing and locate elements, enable/disable touch caret, and
@@ -148,8 +151,8 @@
         # Get touch caret expiration time in millisecond, and convert it to second.
         timeout = self.timeout_ms() / 1000.0
 
-        # Set a 1.5x timeout margin to prevent intermittent test failures.
-        timeout *= 1.5
+        # Set a 3x timeout margin to prevent intermittent test failures.
+        timeout *= 3
 
         # Tap to make touch caret appear. Note: it's strange that when the caret
         # is at the end, the rect of the caret in <textarea> cannot be obtained.
@@ -188,11 +191,15 @@
         dest_x, dest_y = 0, 0
         el_center_x, el_center_y = el.rect['x'], el.rect['y']
         self.marionette.execute_script(
-            '''var utils = SpecialPowers.getDOMWindowUtils(window);
+            '''
+            var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+                              .getInterface(Components.interfaces.nsIDOMWindowUtils);
             utils.sendWheelEvent(arguments[0], arguments[1],
                                  0, 10, 0, WheelEvent.DOM_DELTA_PIXEL,
-                                 0, 0, 0, 0);''',
-            script_args=[el_center_x, el_center_y]
+                                 0, 0, 0, 0);
+            ''',
+            script_args=[el_center_x, el_center_y],
+            sandbox='system'
         )
         self.actions.flick(el, src_x, src_y, dest_x, dest_y).perform()
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/TouchCaret.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/base/TouchCaret.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/TouchCaret.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/TouchCaret.cpp	2015-05-25 20:43:53.000000000 +0000
@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "TouchCaret.h"
 
 #include <algorithm>
@@ -42,12 +42,12 @@
 // To enable all the TOUCHCARET_LOG print statements, set the environment
 // variable NSPR_LOG_MODULES=TouchCaret:5
 #define TOUCHCARET_LOG(message, ...)                                           \
-  PR_LOG(gTouchCaretLog, PR_LOG_DEBUG,                                         \
+  MOZ_LOG(gTouchCaretLog, PR_LOG_DEBUG,                                         \
          ("TouchCaret (%p): %s:%d : " message "\n", this, __FUNCTION__,        \
           __LINE__, ##__VA_ARGS__));
 
 #define TOUCHCARET_LOG_STATIC(message, ...)                                    \
-  PR_LOG(gTouchCaretLog, PR_LOG_DEBUG,                                         \
+  MOZ_LOG(gTouchCaretLog, PR_LOG_DEBUG,                                         \
          ("TouchCaret: %s:%d : " message "\n", __FUNCTION__, __LINE__,         \
           ##__VA_ARGS__));
 
@@ -56,17 +56,26 @@
 // boundary by 61 app units (1 pixel + 1 app unit).
 static const int32_t kBoundaryAppUnits = 61;
 
-NS_IMPL_ISUPPORTS(TouchCaret, nsISelectionListener)
+NS_IMPL_ISUPPORTS(TouchCaret,
+                  nsISelectionListener,
+                  nsIScrollObserver,
+                  nsISupportsWeakReference)
 
 /*static*/ int32_t TouchCaret::sTouchCaretInflateSize = 0;
 /*static*/ int32_t TouchCaret::sTouchCaretExpirationTime = 0;
+/*static*/ bool TouchCaret::sCaretManagesAndroidActionbar = false;
+/*static*/ bool TouchCaret::sTouchcaretExtendedvisibility = false;
+
+/*static*/ uint32_t TouchCaret::sActionBarViewCount = 0;
 
 TouchCaret::TouchCaret(nsIPresShell* aPresShell)
   : mState(TOUCHCARET_NONE),
     mActiveTouchId(-1),
     mCaretCenterToDownPointOffsetY(0),
+    mInAsyncPanZoomGesture(false),
     mVisible(false),
-    mIsValidTap(false)
+    mIsValidTap(false),
+    mActionBarViewID(0)
 {
   MOZ_ASSERT(NS_IsMainThread());
 
@@ -82,6 +91,10 @@
                                 "touchcaret.inflatesize.threshold");
     Preferences::AddIntVarCache(&sTouchCaretExpirationTime,
                                 "touchcaret.expiration.time");
+    Preferences::AddBoolVarCache(&sCaretManagesAndroidActionbar,
+                                 "caret.manages-android-actionbar");
+    Preferences::AddBoolVarCache(&sTouchcaretExtendedvisibility,
+                                 "touchcaret.extendedvisibility");
     addedTouchCaretPref = true;
   }
 
@@ -90,6 +103,43 @@
   MOZ_ASSERT(mPresShell, "Hey, pres shell should support weak refs");
 }
 
+void
+TouchCaret::Init()
+{
+  nsCOMPtr<nsIPresShell> presShell = do_QueryReferent(mPresShell);
+  if (!presShell) {
+    return;
+  }
+
+  nsPresContext* presContext = presShell->GetPresContext();
+  MOZ_ASSERT(presContext, "PresContext should be given in PresShell::Init()");
+
+  nsIDocShell* docShell = presContext->GetDocShell();
+  if (!docShell) {
+    return;
+  }
+
+  docShell->AddWeakScrollObserver(this);
+  mDocShell = static_cast<nsDocShell*>(docShell);
+}
+
+void
+TouchCaret::Terminate()
+{
+  nsRefPtr<nsDocShell> docShell(mDocShell.get());
+  if (docShell) {
+    docShell->RemoveWeakScrollObserver(this);
+  }
+
+  if (mScrollEndDetectorTimer) {
+    mScrollEndDetectorTimer->Cancel();
+    mScrollEndDetectorTimer = nullptr;
+  }
+
+  mDocShell = WeakPtr<nsDocShell>();
+  mPresShell = nullptr;
+}
+
 TouchCaret::~TouchCaret()
 {
   TOUCHCARET_LOG("Destructor");
@@ -174,6 +224,38 @@
 
   // Set touch caret expiration time.
   mVisible ? LaunchExpirationTimer() : CancelExpirationTimer();
+
+  // If after a TouchCaret visibility change we become hidden, ensure
+  // the Android ActionBar handler is notified to close the current view.
+  if (!mVisible && sCaretManagesAndroidActionbar) {
+    UpdateAndroidActionBarVisibility(false, mActionBarViewID);
+  }
+}
+
+/**
+ * Open or close the Android TextSelection ActionBar, based on visibility.
+ * Each time we're called to open the actionbar, we increment / assign a
+ * unique view ID and return it to the caller. The ID is returned on calls
+ * to close the actionbar to ensure we don't close the shared view if it
+ * was already force closed by a subsequent callers open request.
+ */
+/* static */void
+TouchCaret::UpdateAndroidActionBarVisibility(bool aVisibility, uint32_t& aViewID)
+{
+  // Are we openning a new view?
+  if (aVisibility) {
+    // Assign a new view ID.
+    aViewID = ++sActionBarViewCount;
+  }
+
+  nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
+  if (os) {
+    nsString topic = (aVisibility) ?
+      NS_LITERAL_STRING("ActionBar:OpenNew") : NS_LITERAL_STRING("ActionBar:Close");
+    nsAutoString viewCount;
+    viewCount.AppendInt(aViewID);
+    os->NotifyObservers(nullptr, NS_ConvertUTF16toUTF8(topic).get(), viewCount.get());
+  }
 }
 
 nsRect
@@ -362,11 +444,100 @@
     SetVisibility(false);
   } else {
     SyncVisibilityWithCaret();
+
+    // Is the TouchCaret visible and we're showing/hiding the actionbar?
+    if (mVisible && sCaretManagesAndroidActionbar) {
+      // A selection change due to touch tap opens the actionbar.
+      if (aReason & nsISelectionListener::MOUSEUP_REASON) {
+        UpdateAndroidActionBarVisibility(true, mActionBarViewID);
+      } else {
+        // Update the ActionBar state for caret-specific selection changes.
+        // Ignore transient selection composition changes that occur while
+        // the TouchCaret is also visible.
+        bool isCollapsed;
+        if (NS_SUCCEEDED(aSel->GetIsCollapsed(&isCollapsed)) && isCollapsed) {
+          nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
+          if (os) {
+            os->NotifyObservers(nullptr, "ActionBar:UpdateState", nullptr);
+          }
+        }
+      }
+    }
   }
 
   return NS_OK;
 }
 
+/**
+ * Used to update caret position after PanZoom stops for
+ * extended caret visibility. Never needed by MOZ_WIDGET_GONK.
+ */
+void
+TouchCaret::AsyncPanZoomStarted()
+{
+  if (mVisible) {
+    if (sTouchcaretExtendedvisibility) {
+      mInAsyncPanZoomGesture = true;
+    }
+  }
+}
+
+void
+TouchCaret::AsyncPanZoomStopped()
+{
+  if (mInAsyncPanZoomGesture) {
+    mInAsyncPanZoomGesture = false;
+    UpdatePosition();
+  }
+}
+
+/**
+ * Used to update caret position after Scroll stops for
+ * extended caret visibility. Never needed by MOZ_WIDGET_GONK.
+ */
+void
+TouchCaret::ScrollPositionChanged()
+{
+  if (mVisible) {
+    if (sTouchcaretExtendedvisibility) {
+      // Launch scroll end detector.
+      LaunchScrollEndDetector();
+    }
+  }
+}
+
+void
+TouchCaret::LaunchScrollEndDetector()
+{
+  if (!mScrollEndDetectorTimer) {
+    mScrollEndDetectorTimer = do_CreateInstance("@mozilla.org/timer;1");
+  }
+  MOZ_ASSERT(mScrollEndDetectorTimer);
+
+  mScrollEndDetectorTimer->InitWithFuncCallback(FireScrollEnd,
+                                                this,
+                                                sScrollEndTimerDelay,
+                                                nsITimer::TYPE_ONE_SHOT);
+}
+
+void
+TouchCaret::CancelScrollEndDetector()
+{
+  if (mScrollEndDetectorTimer) {
+    mScrollEndDetectorTimer->Cancel();
+  }
+}
+
+
+/* static */void
+TouchCaret::FireScrollEnd(nsITimer* aTimer, void* aTouchCaret)
+{
+  nsRefPtr<TouchCaret> self = static_cast<TouchCaret*>(aTouchCaret);
+  NS_PRECONDITION(aTimer == self->mScrollEndDetectorTimer,
+                  "Unexpected timer");
+  self->UpdatePosition();
+}
+
 void
 TouchCaret::SyncVisibilityWithCaret()
 {
@@ -447,10 +618,6 @@
     TOUCHCARET_LOG("Focus frame is not valid!");
     return false;
   }
-  if (focusRect.IsEmpty()) {
-    TOUCHCARET_LOG("Focus rect is empty!");
-    return false;
-  }
 
   dom::Element* editingHost = focusFrame->GetContent()->GetEditingHost();
   if (!editingHost) {
@@ -458,6 +625,16 @@
     return false;
   }
 
+  // No further checks required if extended TouchCaret visibility.
+  if (sTouchcaretExtendedvisibility) {
+    return true;
+  }
+
+  if (focusRect.IsEmpty()) {
+    TOUCHCARET_LOG("Focus rect is empty!");
+    return false;
+  }
+
   if (!nsContentUtils::HasNonEmptyTextContent(
          editingHost, nsContentUtils::eRecurseIntoChildren)) {
     TOUCHCARET_LOG("The content is empty!");
@@ -837,6 +1014,12 @@
           CancelExpirationTimer();
           status = nsEventStatus_eConsumeNoDefault;
         } else {
+          // Mousedown events that miss HitTest can be caused by soft-keyboard
+          // auto-suggestions. If extended visibility, update the caret position.
+          if (sTouchcaretExtendedvisibility) {
+            UpdatePositionIfNeeded();
+            break;
+          }
           // Set touch caret invisible if HisTest fails. Bypass event.
           SetVisibility(false);
           status = nsEventStatus_eIgnore;
@@ -897,8 +1080,14 @@
         // No touch is on the touch caret. Set touch caret invisible, and bypass
         // the event.
         if (mActiveTouchId == -1) {
-          SetVisibility(false);
-          status = nsEventStatus_eIgnore;
+          // Check touch caret visibility style.
+          if (sTouchcaretExtendedvisibility) {
+            // Update position on events associated with scroll and pan-zoom.
+            UpdatePositionIfNeeded();
+          } else {
+            SetVisibility(false);
+            status = nsEventStatus_eIgnore;
+          }
         }
       }
       break;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/base/TouchCaret.h firefox-trunk-41.0~a1~hg20150524r245419/layout/base/TouchCaret.h
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/base/TouchCaret.h	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/base/TouchCaret.h	2015-05-25 20:43:53.000000000 +0000
@@ -27,7 +27,9 @@
  * TouchCaret is also responsible for touch caret visibility. Touch caret
  * won't be shown when timer expires or while key event causes selection change.
  */
-class TouchCaret final : public nsISelectionListener
+class TouchCaret final : public nsISelectionListener,
+                         public nsIScrollObserver,
+                         public nsSupportsWeakReference
 {
 public:
   explicit TouchCaret(nsIPresShell* aPresShell);
@@ -35,10 +37,15 @@
   NS_DECL_ISUPPORTS
   NS_DECL_NSISELECTIONLISTENER
 
-  void Terminate()
-  {
-    mPresShell = nullptr;
-  }
+  void Init();
+  void Terminate();
+
+  // nsIScrollObserver
+  virtual void ScrollPositionChanged() override;
+
+  // AsyncPanZoom started/stopped callbacks from nsIScrollObserver
+  virtual void AsyncPanZoomStarted() override;
+  virtual void AsyncPanZoomStopped() override;
 
   /**
    * Handle mouse and touch event only.
@@ -60,6 +67,11 @@
     return mVisible;
   }
 
+  /**
+   * Open or close the Android TextSelection ActionBar based on visibility.
+   */
+  static void UpdateAndroidActionBarVisibility(bool aVisibility, uint32_t& aViewID);
+
 private:
   // Hide default constructor.
   TouchCaret() = delete;
@@ -268,7 +280,21 @@
     return sTouchCaretExpirationTime;
   }
 
+  void LaunchScrollEndDetector();
+  void CancelScrollEndDetector();
+  static void FireScrollEnd(nsITimer* aTimer, void* aSelectionCarets);
+
+  // This timer is used for detecting scroll end. We don't have
+  // scroll end event now, so we will fire this event with a
+  // const time when we scroll. So when timer triggers, we treat it
+  // as scroll end event.
+  nsCOMPtr<nsITimer> mScrollEndDetectorTimer;
+
   nsWeakPtr mPresShell;
+  WeakPtr<nsDocShell> mDocShell;
+
+  // True if AsyncPanZoom is started
+  bool mInAsyncPanZoomGesture;
 
   // Touch caret visibility
   bool mVisible;
@@ -280,10 +306,18 @@
   // Preference
   static int32_t sTouchCaretInflateSize;
   static int32_t sTouchCaretExpirationTime;
+  static bool sCaretManagesAndroidActionbar;
+  static bool sTouchcaretExtendedvisibility;
 
   // The auto scroll timer's interval in miliseconds.
   friend class SelectionCarets;
   static const int32_t sAutoScrollTimerDelay = 30;
+  // Time for trigger scroll end event, in miliseconds.
+  static const int32_t sScrollEndTimerDelay = 300;
+
+  // Unique ID of current Mobile ActionBar view.
+  static uint32_t sActionBarViewCount;
+  uint32_t mActionBarViewID;
 };
 } //namespace mozilla
 #endif //mozilla_TouchCaret_h__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/build/nsLayoutModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/build/nsLayoutModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/build/nsLayoutModule.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/build/nsLayoutModule.cpp	2015-05-25 20:43:57.000000000 +0000
@@ -28,6 +28,7 @@
 #include "nsIDocumentEncoder.h"
 #include "nsIFactory.h"
 #include "nsIFrameUtil.h"
+#include "nsIIdleService.h"
 #include "nsHTMLStyleSheet.h"
 #include "nsILayoutDebugger.h"
 #include "nsNameSpaceManager.h"
@@ -1317,6 +1318,7 @@
   { "net-channel-event-sinks", NS_MIXEDCONTENTBLOCKER_CONTRACTID, NS_MIXEDCONTENTBLOCKER_CONTRACTID },
   { "app-startup", "Script Security Manager", "service," NS_SCRIPTSECURITYMANAGER_CONTRACTID },
   { TOPIC_WEB_APP_CLEAR_DATA, "QuotaManager", "service," QUOTA_MANAGER_CONTRACTID },
+  { OBSERVER_TOPIC_IDLE_DAILY, "QuotaManager", QUOTA_MANAGER_CONTRACTID },
 #ifdef MOZ_WIDGET_GONK
   { "app-startup", "Volume Service", "service," NS_VOLUMESERVICE_CONTRACTID },
 #endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/build/nsLayoutStatics.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/build/nsLayoutStatics.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/build/nsLayoutStatics.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/build/nsLayoutStatics.cpp	2015-05-25 20:43:57.000000000 +0000
@@ -139,6 +139,7 @@
 #include "CameraPreferences.h"
 #include "TouchManager.h"
 #include "MediaDecoder.h"
+#include "mozilla/layers/CompositorLRU.h"
 
 using namespace mozilla;
 using namespace mozilla::net;
@@ -320,6 +321,8 @@
 
   PromiseDebugging::Init();
 
+  layers::CompositorLRU::Init();
+
   return NS_OK;
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/nsBlockFrame.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/nsBlockFrame.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/nsBlockFrame.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/nsBlockFrame.cpp	2015-05-25 20:43:59.000000000 +0000
@@ -6147,8 +6147,10 @@
 
   // If there are continued floats, then we may need to continue BR clearance
   if (0 != aState.ClearFloats(0, NS_STYLE_CLEAR_BOTH)) {
-    aState.mFloatBreakType = static_cast<nsBlockFrame*>(GetPrevInFlow())
-                               ->FindTrailingClear();
+    nsBlockFrame* prevBlock = static_cast<nsBlockFrame*>(GetPrevInFlow());
+    if (prevBlock) {
+      aState.mFloatBreakType = prevBlock->FindTrailingClear();
+    }
   }
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/nsFlexContainerFrame.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/nsFlexContainerFrame.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/nsFlexContainerFrame.cpp	2015-05-13 18:06:14.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/nsFlexContainerFrame.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -17,7 +17,7 @@
 #include "nsPresContext.h"
 #include "nsRenderingContext.h"
 #include "nsStyleContext.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include <algorithm>
 #include "mozilla/LinkedList.h"
 #include "mozilla/FloatingPoint.h"
@@ -151,6 +151,13 @@
 #define GET_CROSS_COMPONENT(axisTracker_, width_, height_)  \
   (axisTracker_).IsCrossAxisHorizontal() ? (width_) : (height_)
 
+// Logical versions of helper-macros above:
+#define GET_MAIN_COMPONENT_LOGICAL(axisTracker_, isize_, bsize_)  \
+  (axisTracker_).IsRowOriented() ? (isize_) : (bsize_)
+
+#define GET_CROSS_COMPONENT_LOGICAL(axisTracker_, inline_, block_)  \
+  (axisTracker_).IsRowOriented() ? (block_) : (inline_)
+
 // Encapsulates our flex container's main & cross axes.
 class MOZ_STACK_CLASS nsFlexContainerFrame::FlexboxAxisTracker {
 public:
@@ -185,6 +192,7 @@
   }
 
   bool IsRowOriented() const { return mIsRowOriented; }
+  bool IsColumnOriented() const { return !mIsRowOriented; }
 
   nscoord GetMainComponent(const nsSize& aSize) const {
     return GET_MAIN_COMPONENT(*this, aSize.width, aSize.height);
@@ -1050,15 +1058,15 @@
 
   // MAIN SIZES (flex base size, min/max size)
   // -----------------------------------------
-  nscoord flexBaseSize = GET_MAIN_COMPONENT(aAxisTracker,
-                                            childRS.ComputedWidth(),
-                                            childRS.ComputedHeight());
-  nscoord mainMinSize = GET_MAIN_COMPONENT(aAxisTracker,
-                                           childRS.ComputedMinWidth(),
-                                           childRS.ComputedMinHeight());
-  nscoord mainMaxSize = GET_MAIN_COMPONENT(aAxisTracker,
-                                           childRS.ComputedMaxWidth(),
-                                           childRS.ComputedMaxHeight());
+  nscoord flexBaseSize = GET_MAIN_COMPONENT_LOGICAL(aAxisTracker,
+                                                    childRS.ComputedISize(),
+                                                    childRS.ComputedBSize());
+  nscoord mainMinSize = GET_MAIN_COMPONENT_LOGICAL(aAxisTracker,
+                                                   childRS.ComputedMinISize(),
+                                                   childRS.ComputedMinBSize());
+  nscoord mainMaxSize = GET_MAIN_COMPONENT_LOGICAL(aAxisTracker,
+                                                   childRS.ComputedMaxISize(),
+                                                   childRS.ComputedMaxBSize());
   // This is enforced by the nsHTMLReflowState where these values come from:
   MOZ_ASSERT(mainMinSize <= mainMaxSize, "min size is larger than max size");
 
@@ -1067,15 +1075,18 @@
   // Grab the cross size from the reflow state. This might be the right value,
   // or we might resolve it to something else in SizeItemInCrossAxis(); hence,
   // it's tentative. See comment under "Cross Size Determination" for more.
-  nscoord tentativeCrossSize = GET_CROSS_COMPONENT(aAxisTracker,
-                                                   childRS.ComputedWidth(),
-                                                   childRS.ComputedHeight());
-  nscoord crossMinSize = GET_CROSS_COMPONENT(aAxisTracker,
-                                             childRS.ComputedMinWidth(),
-                                             childRS.ComputedMinHeight());
-  nscoord crossMaxSize = GET_CROSS_COMPONENT(aAxisTracker,
-                                             childRS.ComputedMaxWidth(),
-                                             childRS.ComputedMaxHeight());
+  nscoord tentativeCrossSize =
+    GET_CROSS_COMPONENT_LOGICAL(aAxisTracker,
+                                childRS.ComputedISize(),
+                                childRS.ComputedBSize());
+  nscoord crossMinSize =
+    GET_CROSS_COMPONENT_LOGICAL(aAxisTracker,
+                                childRS.ComputedMinISize(),
+                                childRS.ComputedMinBSize());
+  nscoord crossMaxSize =
+    GET_CROSS_COMPONENT_LOGICAL(aAxisTracker,
+                                childRS.ComputedMaxISize(),
+                                childRS.ComputedMaxBSize());
 
   // SPECIAL-CASE FOR WIDGET-IMPOSED SIZES
   // Check if we're a themed widget, in which case we might have a minimum
@@ -1194,17 +1205,17 @@
 
   if (IsCrossSizeDefinite(aItemReflowState, aAxisTracker)) {
     // Definite cross size.
-    return GET_CROSS_COMPONENT(aAxisTracker,
-                               aItemReflowState.ComputedWidth(),
-                               aItemReflowState.ComputedHeight());
+    return GET_CROSS_COMPONENT_LOGICAL(aAxisTracker,
+                                       aItemReflowState.ComputedISize(),
+                                       aItemReflowState.ComputedBSize());
   }
 
   if (aMinSizeFallback) {
     // Indefinite cross-size, and we're resolving main min-size, so we'll fall
     // back to ussing the cross min-size (which should be definite).
-    return GET_CROSS_COMPONENT(aAxisTracker,
-                               aItemReflowState.ComputedMinWidth(),
-                               aItemReflowState.ComputedMinHeight());
+    return GET_CROSS_COMPONENT_LOGICAL(aAxisTracker,
+                                       aItemReflowState.ComputedMinISize(),
+                                       aItemReflowState.ComputedMinBSize());
   }
 
   // Indefinite cross-size.
@@ -1264,9 +1275,9 @@
 
   // * the computed max-width (max-height), if that value is definite:
   nscoord maxSize =
-    GET_MAIN_COMPONENT(aAxisTracker,
-                       aItemReflowState.ComputedMaxWidth(),
-                       aItemReflowState.ComputedMaxHeight());
+    GET_MAIN_COMPONENT_LOGICAL(aAxisTracker,
+                               aItemReflowState.ComputedMaxISize(),
+                               aItemReflowState.ComputedMaxBSize());
   if (maxSize != NS_UNCONSTRAINEDSIZE) {
     minMainSize = std::min(minMainSize, maxSize);
   }
@@ -1368,9 +1379,9 @@
     // XXXdholbert Maybe this should share logic with ComputeCrossSize()...
     // Alternately, maybe tentative container cross size should be passed down.
     nscoord containerCrossSize =
-      GET_CROSS_COMPONENT(aAxisTracker,
-                          flexContainerRS->ComputedWidth(),
-                          flexContainerRS->ComputedHeight());
+      GET_CROSS_COMPONENT_LOGICAL(aAxisTracker,
+                                  flexContainerRS->ComputedISize(),
+                                  flexContainerRS->ComputedBSize());
     // Is container's cross size "definite"?
     // (Container's cross size is definite if cross-axis is horizontal, or if
     // cross-axis is vertical and the cross-size is not NS_AUTOHEIGHT.)
@@ -1413,10 +1424,10 @@
   // Measure content, if needed (w/ intrinsic-width method or a reflow)
   if (minSizeNeedsToMeasureContent || flexBasisNeedsToMeasureContent) {
     if (aAxisTracker.IsMainAxisHorizontal()) {
-      nsRenderingContext rctx(
-        aPresContext->PresShell()->CreateReferenceRenderingContext());
       if (minSizeNeedsToMeasureContent) {
-        resolvedMinSize = std::min(resolvedMinSize, aFlexItem.Frame()->GetMinISize(&rctx));
+        nscoord frameMinISize =
+          aFlexItem.Frame()->GetMinISize(aItemReflowState.rendContext);
+        resolvedMinSize = std::min(resolvedMinSize, frameMinISize);
       }
       NS_ASSERTION(!flexBasisNeedsToMeasureContent,
                    "flex-basis:auto should have been resolved in the "
@@ -2121,7 +2132,7 @@
 void
 FlexLine::ResolveFlexibleLengths(nscoord aFlexContainerMainSize)
 {
-  PR_LOG(GetFlexContainerLog(), PR_LOG_DEBUG, ("ResolveFlexibleLengths\n"));
+  MOZ_LOG(GetFlexContainerLog(), PR_LOG_DEBUG, ("ResolveFlexibleLengths\n"));
 
   // Determine whether we're going to be growing or shrinking items.
   const bool isUsingFlexGrow =
@@ -2169,7 +2180,7 @@
       availableFreeSpace -= item->GetMainSize();
     }
 
-    PR_LOG(GetFlexContainerLog(), PR_LOG_DEBUG,
+    MOZ_LOG(GetFlexContainerLog(), PR_LOG_DEBUG,
            (" available free space = %d\n", availableFreeSpace));
 
 
@@ -2281,7 +2292,7 @@
           }
         }
 
-        PR_LOG(GetFlexContainerLog(), PR_LOG_DEBUG,
+        MOZ_LOG(GetFlexContainerLog(), PR_LOG_DEBUG,
                (" Distributing available space:"));
         // Since this loop only operates on unfrozen flex items, we can break as
         // soon as we have seen all of them.
@@ -2329,7 +2340,7 @@
             availableFreeSpace -= sizeDelta;
 
             item->SetMainSize(item->GetMainSize() + sizeDelta);
-            PR_LOG(GetFlexContainerLog(), PR_LOG_DEBUG,
+            MOZ_LOG(GetFlexContainerLog(), PR_LOG_DEBUG,
                    ("  child %p receives %d, for a total of %d\n",
                     item, sizeDelta, item->GetMainSize()));
           }
@@ -2339,7 +2350,7 @@
 
     // Fix min/max violations:
     nscoord totalViolation = 0; // keeps track of adjustments for min/max
-    PR_LOG(GetFlexContainerLog(), PR_LOG_DEBUG,
+    MOZ_LOG(GetFlexContainerLog(), PR_LOG_DEBUG,
            (" Checking for violations:"));
 
     // Since this loop only operates on unfrozen flex items, we can break as
@@ -2368,7 +2379,7 @@
     FreezeOrRestoreEachFlexibleSize(totalViolation,
                                     iterationCounter + 1 == mNumItems);
 
-    PR_LOG(GetFlexContainerLog(), PR_LOG_DEBUG,
+    MOZ_LOG(GetFlexContainerLog(), PR_LOG_DEBUG,
            (" Total violation: %d\n", totalViolation));
 
     if (mNumFrozenItems == mNumItems) {
@@ -3070,7 +3081,7 @@
   nsPresContext* aPresContext,
   const nsHTMLReflowState& aReflowState,
   nscoord aContentBoxMainSize,
-  nscoord aAvailableHeightForContent,
+  nscoord aAvailableBSizeForContent,
   const nsTArray<StrutInfo>& aStruts,
   const FlexboxAxisTracker& aAxisTracker,
   LinkedList<FlexLine>& aLines)
@@ -3101,22 +3112,23 @@
     wrapThreshold = aContentBoxMainSize;
 
     // If the flex container doesn't have a definite content-box main-size
-    // (e.g. if we're 'height:auto'), make sure we at least wrap when we hit
-    // its max main-size.
+    // (e.g. if main axis is vertical & 'height' is 'auto'), make sure we at
+    // least wrap when we hit its max main-size.
     if (wrapThreshold == NS_UNCONSTRAINEDSIZE) {
       const nscoord flexContainerMaxMainSize =
-        GET_MAIN_COMPONENT(aAxisTracker,
-                           aReflowState.ComputedMaxWidth(),
-                           aReflowState.ComputedMaxHeight());
+        GET_MAIN_COMPONENT_LOGICAL(aAxisTracker,
+                                   aReflowState.ComputedMaxISize(),
+                                   aReflowState.ComputedMaxBSize());
 
       wrapThreshold = flexContainerMaxMainSize;
     }
 
-    // Also: if we're vertical and paginating, we may need to wrap sooner
-    // (before we run off the end of the page)
-    if (!aAxisTracker.IsMainAxisHorizontal() &&
-        aAvailableHeightForContent != NS_UNCONSTRAINEDSIZE) {
-      wrapThreshold = std::min(wrapThreshold, aAvailableHeightForContent);
+    // Also: if we're column-oriented and paginating in the block dimension,
+    // we may need to wrap to a new flex line sooner (before we grow past the
+    // available BSize, potentially running off the end of the page).
+    if (aAxisTracker.IsColumnOriented() &&
+        aAvailableBSizeForContent != NS_UNCONSTRAINEDSIZE) {
+      wrapThreshold = std::min(wrapThreshold, aAvailableBSizeForContent);
     }
   }
 
@@ -3184,12 +3196,20 @@
   const nsHTMLReflowState& aReflowState,
   const FlexboxAxisTracker& aAxisTracker)
 {
-  if (aAxisTracker.IsMainAxisHorizontal()) {
-    // Horizontal case is easy -- our main size is our computed width
-    // (which is already resolved).
+  if (aAxisTracker.IsRowOriented()) {
+    // Row-oriented --> our main axis is the inline axis, so our main size
+    // is our inline size (which should already be resolved).
+    // XXXdholbert ISize may be (wrongly) unconstrained right now: bug 1163238
+    // Uncomment when that's fixed:
+    /*
+    NS_WARN_IF_FALSE(aReflowState.ComputedISize() != NS_UNCONSTRAINEDSIZE,
+                     "Unconstrained inline size; this should only result from "
+                     "huge sizes (not intrinsic sizing w/ orthogonal flows)");
+    */
     return aReflowState.ComputedISize();
   }
 
+  // Note: This may be unconstrained, if our block size is "auto":
   return GetEffectiveComputedBSize(aReflowState);
 }
 
@@ -3206,113 +3226,134 @@
   return largestLineOuterSize;
 }
 
-// Returns the content-box main-size of our flex container, based on the
-// available height (if appropriate) and the main-sizes of the flex items.
+/* Resolves the content-box main-size of a flex container frame,
+ * primarily based on:
+ * - the "tentative" main size, taken from the reflow state ("tentative"
+ *    because it may be unconstrained or may run off the page).
+ * - the available BSize (needed if the main axis is the block axis).
+ * - the sizes of our lines of flex items.
+ *
+ * Guaranteed to return a definite length, i.e. not NS_UNCONSTRAINEDSIZE,
+ * aside from cases with huge lengths which happen to compute to that value.
+ * XXXdholbert (this^ isn't quite true, if we're row-oriented and in an
+ * orthogonal flow, per mentions of bug 1163238 in GetMainSizeFromReflowState.)
+ *
+ * (Note: This function should be structurally similar to 'ComputeCrossSize()',
+ * except that here, the caller has already grabbed the tentative size from the
+ * reflow state.)
+ */
 static nscoord
-ClampFlexContainerMainSize(const nsHTMLReflowState& aReflowState,
-                           const FlexboxAxisTracker& aAxisTracker,
-                           nscoord aUnclampedMainSize,
-                           nscoord aAvailableHeightForContent,
-                           const FlexLine* aFirstLine,
-                           nsReflowStatus& aStatus)
+ResolveFlexContainerMainSize(const nsHTMLReflowState& aReflowState,
+                             const FlexboxAxisTracker& aAxisTracker,
+                             nscoord aTentativeMainSize,
+                             nscoord aAvailableBSizeForContent,
+                             const FlexLine* aFirstLine,
+                             nsReflowStatus& aStatus)
 {
   MOZ_ASSERT(aFirstLine, "null first line pointer");
 
-  if (aAxisTracker.IsMainAxisHorizontal()) {
-    // Horizontal case is easy -- our main size should already be resolved
-    // before we get a call to Reflow. We don't have to worry about doing
-    // page-breaking or shrinkwrapping in the horizontal axis.
-    return aUnclampedMainSize;
+  if (aAxisTracker.IsRowOriented()) {
+    // Row-oriented --> our main axis is the inline axis, so our main size
+    // is our inline size (which should already be resolved).
+    return aTentativeMainSize;
   }
 
-  if (aUnclampedMainSize != NS_INTRINSICSIZE) {
-    // Vertical case, with fixed height:
-    if (aAvailableHeightForContent == NS_UNCONSTRAINEDSIZE ||
-        aUnclampedMainSize < aAvailableHeightForContent) {
+  if (aTentativeMainSize != NS_INTRINSICSIZE) {
+    // Column-oriented case, with fixed BSize:
+    if (aAvailableBSizeForContent == NS_UNCONSTRAINEDSIZE ||
+        aTentativeMainSize < aAvailableBSizeForContent) {
       // Not in a fragmenting context, OR no need to fragment because we have
-      // more available height than we need. Either way, just use our fixed
-      // height.  (Note that the reflow state has already done the appropriate
-      // min/max-height clamping.)
-      return aUnclampedMainSize;
+      // more available BSize than we need. Either way, we don't need to clamp.
+      // (Note that the reflow state has already done the appropriate
+      // min/max-BSize clamping.)
+      return aTentativeMainSize;
     }
 
-    // Fragmenting *and* our fixed height is too tall for available height:
+    // Fragmenting *and* our fixed BSize is larger than available BSize:
     // Mark incomplete so we get a next-in-flow, and take up all of the
-    // available height (or the amount of height required by our children, if
-    // that's larger; but of course not more than our own computed height).
+    // available BSize (or the amount of BSize required by our children, if
+    // that's larger; but of course not more than our own computed BSize).
     // XXXdholbert For now, we don't support pushing children to our next
-    // continuation or splitting children, so "amount of height required by
-    // our children" is just the main-size (height) of our longest flex line.
+    // continuation or splitting children, so "amount of BSize required by
+    // our children" is just the main-size (BSize) of our longest flex line.
     NS_FRAME_SET_INCOMPLETE(aStatus);
     nscoord largestLineOuterSize = GetLargestLineMainSize(aFirstLine);
 
-    if (largestLineOuterSize <= aAvailableHeightForContent) {
-      return aAvailableHeightForContent;
+    if (largestLineOuterSize <= aAvailableBSizeForContent) {
+      return aAvailableBSizeForContent;
     }
-    return std::min(aUnclampedMainSize, largestLineOuterSize);
+    return std::min(aTentativeMainSize, largestLineOuterSize);
   }
 
-  // Vertical case, with auto-height:
-  // Resolve auto-height to the largest FlexLine-length, clamped to our
-  // computed min/max main-size properties (min-height & max-height).
-  // XXXdholbert Handle constrained-aAvailableHeightForContent case here.
+  // Column-oriented case, with auto BSize:
+  // Resolve auto BSize to the largest FlexLine length, clamped to our
+  // computed min/max main-size properties.
+  // XXXdholbert Handle constrained-aAvailableBSizeForContent case here.
   nscoord largestLineOuterSize = GetLargestLineMainSize(aFirstLine);
   return NS_CSS_MINMAX(largestLineOuterSize,
-                       aReflowState.ComputedMinHeight(),
-                       aReflowState.ComputedMaxHeight());
+                       aReflowState.ComputedMinBSize(),
+                       aReflowState.ComputedMaxBSize());
 }
 
 nscoord
 nsFlexContainerFrame::ComputeCrossSize(const nsHTMLReflowState& aReflowState,
                                        const FlexboxAxisTracker& aAxisTracker,
                                        nscoord aSumLineCrossSizes,
-                                       nscoord aAvailableHeightForContent,
+                                       nscoord aAvailableBSizeForContent,
                                        bool* aIsDefinite,
                                        nsReflowStatus& aStatus)
 {
   MOZ_ASSERT(aIsDefinite, "outparam pointer must be non-null");
 
-  if (aAxisTracker.IsCrossAxisHorizontal()) {
-    // Cross axis is horizontal: our cross size is our computed width
-    // (which is already resolved).
+  if (aAxisTracker.IsColumnOriented()) {
+    // Column-oriented --> our cross axis is the inline axis, so our cross size
+    // is our inline size (which should already be resolved).
+    // XXXdholbert ISize may be (wrongly) unconstrained right now: bug 1163238.
+    // Uncomment when that's fixed:
+    /*
+    NS_WARN_IF_FALSE(aReflowState.ComputedISize() != NS_UNCONSTRAINEDSIZE,
+                     "Unconstrained inline size; this should only result from "
+                     "huge sizes (not intrinsic sizing w/ orthogonal flows)");
+    */
     *aIsDefinite = true;
     return aReflowState.ComputedISize();
   }
 
   nscoord effectiveComputedBSize = GetEffectiveComputedBSize(aReflowState);
   if (effectiveComputedBSize != NS_INTRINSICSIZE) {
-    // Cross-axis is vertical, and we have a fixed height:
+    // Row-oriented case (cross axis is block-axis), with fixed BSize:
     *aIsDefinite = true;
-    if (aAvailableHeightForContent == NS_UNCONSTRAINEDSIZE ||
-        effectiveComputedBSize < aAvailableHeightForContent) {
+    if (aAvailableBSizeForContent == NS_UNCONSTRAINEDSIZE ||
+        effectiveComputedBSize < aAvailableBSizeForContent) {
       // Not in a fragmenting context, OR no need to fragment because we have
-      // more available height than we need. Either way, just use our fixed
-      // height.  (Note that the reflow state has already done the appropriate
-      // min/max-height clamping.)
+      // more available BSize than we need. Either way, just use our fixed
+      // BSize.  (Note that the reflow state has already done the appropriate
+      // min/max-BSize clamping.)
       return effectiveComputedBSize;
     }
 
-    // Fragmenting *and* our fixed height is too tall for available height:
+    // Fragmenting *and* our fixed BSize is too tall for available BSize:
     // Mark incomplete so we get a next-in-flow, and take up all of the
-    // available height (or the amount of height required by our children, if
-    // that's larger; but of course not more than our own computed height).
+    // available BSize (or the amount of BSize required by our children, if
+    // that's larger; but of course not more than our own computed BSize).
     // XXXdholbert For now, we don't support pushing children to our next
-    // continuation or splitting children, so "amount of height required by
-    // our children" is just our line-height.
+    // continuation or splitting children, so "amount of BSize required by
+    // our children" is just the sum of our FlexLines' BSizes (cross sizes).
     NS_FRAME_SET_INCOMPLETE(aStatus);
-    if (aSumLineCrossSizes <= aAvailableHeightForContent) {
-      return aAvailableHeightForContent;
+    if (aSumLineCrossSizes <= aAvailableBSizeForContent) {
+      return aAvailableBSizeForContent;
     }
     return std::min(effectiveComputedBSize, aSumLineCrossSizes);
   }
 
-  // Cross axis is vertical and we have auto-height: shrink-wrap our line(s),
-  // subject to our min-size / max-size constraints in that (vertical) axis.
-  // XXXdholbert Handle constrained-aAvailableHeightForContent case here.
+  // Row-oriented case (cross axis is block axis), with auto BSize:
+  // Shrink-wrap our line(s), subject to our min-size / max-size
+  // constraints in that (block) axis.
+  // XXXdholbert Handle constrained-aAvailableBSizeForContent case here.
   *aIsDefinite = false;
   return NS_CSS_MINMAX(aSumLineCrossSizes,
-                       aReflowState.ComputedMinHeight(),
-                       aReflowState.ComputedMaxHeight());
+                       aReflowState.ComputedMinBSize(),
+                       aReflowState.ComputedMaxBSize());
 }
 
 void
@@ -3487,7 +3528,7 @@
   MarkInReflow();
   DO_GLOBAL_REFLOW_COUNT("nsFlexContainerFrame");
   DISPLAY_REFLOW(aPresContext, this, aReflowState, aDesiredSize, aStatus);
-  PR_LOG(GetFlexContainerLog(), PR_LOG_DEBUG,
+  MOZ_LOG(GetFlexContainerLog(), PR_LOG_DEBUG,
          ("Reflow() for nsFlexContainerFrame %p\n", this));
 
   if (IsFrameTreeTooDeep(aReflowState, aDesiredSize, aStatus)) {
@@ -3533,16 +3574,18 @@
   const FlexboxAxisTracker axisTracker(aReflowState.mStylePosition,
                                        aReflowState.GetWritingMode());
 
-  // If we're being fragmented into a constrained height, subtract off
-  // borderpadding-top from it, to get the available height for our
-  // content box. (Don't subtract if we're skipping top border/padding,
-  // though.)
-  nscoord availableHeightForContent = aReflowState.AvailableHeight();
-  if (availableHeightForContent != NS_UNCONSTRAINEDSIZE &&
-      !GetSkipSides().Top()) {
-    availableHeightForContent -= aReflowState.ComputedPhysicalBorderPadding().top;
-    // (Don't let that push availableHeightForContent below zero, though):
-    availableHeightForContent = std::max(availableHeightForContent, 0);
+  // If we're being fragmented into a constrained BSize, then subtract off
+  // borderpadding BStart from that constrained BSize, to get the available
+  // BSize for our content box. (No need to subtract the borderpadding BStart
+  // if we're already skipping it via GetLogicalSkipSides, though.)
+  nscoord availableBSizeForContent = aReflowState.AvailableBSize();
+  if (availableBSizeForContent != NS_UNCONSTRAINEDSIZE &&
+      !(GetLogicalSkipSides(&aReflowState).BStart())) {
+    WritingMode wm = aReflowState.GetWritingMode();
+    availableBSizeForContent -=
+      aReflowState.ComputedLogicalBorderPadding().BStart(wm);
+    // (Don't let that push availableBSizeForContent below zero, though):
+    availableBSizeForContent = std::max(availableBSizeForContent, 0);
   }
 
   nscoord contentBoxMainSize = GetMainSizeFromReflowState(aReflowState,
@@ -3550,13 +3593,13 @@
 
   nsAutoTArray<StrutInfo, 1> struts;
   DoFlexLayout(aPresContext, aDesiredSize, aReflowState, aStatus,
-               contentBoxMainSize, availableHeightForContent,
+               contentBoxMainSize, availableBSizeForContent,
                struts, axisTracker);
 
   if (!struts.IsEmpty()) {
     // We're restarting flex layout, with new knowledge of collapsed items.
     DoFlexLayout(aPresContext, aDesiredSize, aReflowState, aStatus,
-                 contentBoxMainSize, availableHeightForContent,
+                 contentBoxMainSize, availableBSizeForContent,
                  struts, axisTracker);
   }
 }
@@ -3595,7 +3638,7 @@
                                    const nsHTMLReflowState& aReflowState,
                                    nsReflowStatus&          aStatus,
                                    nscoord aContentBoxMainSize,
-                                   nscoord aAvailableHeightForContent,
+                                   nscoord aAvailableBSizeForContent,
                                    nsTArray<StrutInfo>& aStruts,
                                    const FlexboxAxisTracker& aAxisTracker)
 {
@@ -3606,13 +3649,13 @@
 
   GenerateFlexLines(aPresContext, aReflowState,
                     aContentBoxMainSize,
-                    aAvailableHeightForContent,
+                    aAvailableBSizeForContent,
                     aStruts, aAxisTracker, lines);
 
   aContentBoxMainSize =
-    ClampFlexContainerMainSize(aReflowState, aAxisTracker,
-                               aContentBoxMainSize, aAvailableHeightForContent,
-                               lines.getFirst(), aStatus);
+    ResolveFlexContainerMainSize(aReflowState, aAxisTracker,
+                                 aContentBoxMainSize, aAvailableBSizeForContent,
+                                 lines.getFirst(), aStatus);
 
   for (FlexLine* line = lines.getFirst(); line; line = line->getNext()) {
     line->ResolveFlexibleLengths(aContentBoxMainSize);
@@ -3671,7 +3714,7 @@
   bool isCrossSizeDefinite;
   const nscoord contentBoxCrossSize =
     ComputeCrossSize(aReflowState, aAxisTracker, sumLineCrossSizes,
-                     aAvailableHeightForContent, &isCrossSizeDefinite, aStatus);
+                     aAvailableBSizeForContent, &isCrossSizeDefinite, aStatus);
 
   // Set up state for cross-axis alignment, at a high level (outside the
   // scope of a particular flex line)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/nsFlexContainerFrame.h firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/nsFlexContainerFrame.h
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/nsFlexContainerFrame.h	2015-05-13 18:06:14.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/nsFlexContainerFrame.h	2015-05-25 20:44:00.000000000 +0000
@@ -86,7 +86,7 @@
                     const nsHTMLReflowState& aReflowState,
                     nsReflowStatus&          aStatus,
                     nscoord aContentBoxMainSize,
-                    nscoord aAvailableHeightForContent,
+                    nscoord aAvailableBSizeForContent,
                     nsTArray<StrutInfo>& aStruts,
                     const FlexboxAxisTracker& aAxisTracker);
 
@@ -151,7 +151,7 @@
   void GenerateFlexLines(nsPresContext* aPresContext,
                          const nsHTMLReflowState& aReflowState,
                          nscoord aContentBoxMainSize,
-                         nscoord aAvailableHeightForContent,
+                         nscoord aAvailableBSizeForContent,
                          const nsTArray<StrutInfo>& aStruts,
                          const FlexboxAxisTracker& aAxisTracker,
                          mozilla::LinkedList<FlexLine>& aLines);
@@ -162,7 +162,7 @@
   nscoord ComputeCrossSize(const nsHTMLReflowState& aReflowState,
                            const FlexboxAxisTracker& aAxisTracker,
                            nscoord aSumLineCrossSizes,
-                           nscoord aAvailableHeightForContent,
+                           nscoord aAvailableBSizeForContent,
                            bool* aIsDefinite,
                            nsReflowStatus& aStatus);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/nsFrame.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/nsFrame.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/nsFrame.cpp	2015-05-13 18:06:14.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/nsFrame.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -34,7 +34,7 @@
 #include "nsPresContext.h"
 #include "nsStyleConsts.h"
 #include "nsIPresShell.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prprf.h"
 #include "nsFrameManager.h"
 #include "nsLayoutUtils.h"
@@ -1478,7 +1478,7 @@
   nsIntRect pxRect =
     mVisibleRect.ToOutsidePixels(mFrame->PresContext()->AppUnitsPerDevPixel());
   Rect rect(pxRect.x, pxRect.y, pxRect.width, pxRect.height);
-  MaybeSnapToDevicePixels(rect, aDrawTarget);
+  MaybeSnapToDevicePixels(rect, aDrawTarget, true);
 
   aDrawTarget.FillRect(rect, color);
 }
@@ -9445,6 +9445,8 @@
           mActive = true;
         }
       }
+
+      fclose(inFile);
     }
   }
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/nsFrame.h firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/nsFrame.h
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/nsFrame.h	2015-05-13 18:06:14.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/nsFrame.h	2015-05-25 20:44:00.000000000 +0000
@@ -12,7 +12,7 @@
 #include "mozilla/EventForwards.h"
 #include "mozilla/Likely.h"
 #include "nsBox.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "nsIPresShell.h"
 #include "nsHTMLReflowState.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/nsImageFrame.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/nsImageFrame.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/nsImageFrame.cpp	2015-05-13 18:06:16.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/nsImageFrame.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -1415,6 +1415,17 @@
   nsDisplayImageContainer::ComputeInvalidationRegion(aBuilder, aGeometry, aInvalidRegion);
 }
 
+bool
+nsDisplayImage::CanOptimizeToImageLayer(LayerManager* aManager,
+                                        nsDisplayListBuilder* aBuilder)
+{
+  uint32_t flags = aBuilder->ShouldSyncDecodeImages()
+                 ? imgIContainer::FLAG_SYNC_DECODE
+                 : imgIContainer::FLAG_NONE;
+
+  return mImage->IsImageContainerAvailable(aManager, flags);
+}
+
 already_AddRefed<ImageContainer>
 nsDisplayImage::GetContainer(LayerManager* aManager,
                              nsDisplayListBuilder* aBuilder)
@@ -1503,9 +1514,7 @@
                  ? imgIContainer::FLAG_SYNC_DECODE
                  : imgIContainer::FLAG_NONE;
 
-  nsRefPtr<ImageContainer> container =
-    mImage->GetImageContainer(aManager, flags);
-  if (!container) {
+  if (!mImage->IsImageContainerAvailable(aManager, flags)) {
     return LAYER_NONE;
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/nsImageFrame.h firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/nsImageFrame.h
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/nsImageFrame.h	2015-05-13 18:06:16.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/nsImageFrame.h	2015-05-25 20:44:00.000000000 +0000
@@ -394,6 +394,9 @@
   virtual void Paint(nsDisplayListBuilder* aBuilder,
                      nsRenderingContext* aCtx) override;
 
+  virtual bool CanOptimizeToImageLayer(LayerManager* aManager,
+                                       nsDisplayListBuilder* aBuilder) override;
+
   /**
    * Returns an ImageContainer for this image if the image type
    * supports it (TYPE_RASTER only).
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/nsPageFrame.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/nsPageFrame.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/nsPageFrame.cpp	2015-05-13 18:06:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/nsPageFrame.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -21,9 +21,9 @@
 #include "nsBidiUtils.h"
 #include "nsIPrintSettings.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 extern PRLogModuleInfo *GetLayoutPrintingLog();
-#define PR_PL(_p1)  PR_LOG(GetLayoutPrintingLog(), PR_LOG_DEBUG, _p1)
+#define PR_PL(_p1)  MOZ_LOG(GetLayoutPrintingLog(), PR_LOG_DEBUG, _p1)
 
 using namespace mozilla;
 using namespace mozilla::gfx;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/nsPluginFrame.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/nsPluginFrame.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/nsPluginFrame.cpp	2015-05-13 18:06:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/nsPluginFrame.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -65,7 +65,7 @@
 #ifdef MOZ_LOGGING
 #define FORCE_PR_LOG 1 /* Allow logging in the release build */
 #endif /* MOZ_LOGGING */
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #ifdef XP_MACOSX
 #include "gfxQuartzNativeDrawing.h"
@@ -157,13 +157,13 @@
   : nsPluginFrameSuper(aContext)
   , mReflowCallbackPosted(false)
 {
-  PR_LOG(GetObjectFrameLog(), PR_LOG_DEBUG,
+  MOZ_LOG(GetObjectFrameLog(), PR_LOG_DEBUG,
          ("Created new nsPluginFrame %p\n", this));
 }
 
 nsPluginFrame::~nsPluginFrame()
 {
-  PR_LOG(GetObjectFrameLog(), PR_LOG_DEBUG,
+  MOZ_LOG(GetObjectFrameLog(), PR_LOG_DEBUG,
          ("nsPluginFrame %p deleted\n", this));
 }
 
@@ -193,7 +193,7 @@
                     nsContainerFrame* aParent,
                     nsIFrame*         aPrevInFlow)
 {
-  PR_LOG(GetObjectFrameLog(), PR_LOG_DEBUG,
+  MOZ_LOG(GetObjectFrameLog(), PR_LOG_DEBUG,
          ("Initializing nsPluginFrame %p for content %p\n", this, aContent));
 
   nsPluginFrameSuper::Init(aContent, aParent, aPrevInFlow);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/nsRubyBaseContainerFrame.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/nsRubyBaseContainerFrame.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/nsRubyBaseContainerFrame.cpp	2015-05-13 18:06:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/nsRubyBaseContainerFrame.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -581,10 +581,8 @@
 
   nsAutoString baseText;
   if (aColumn.mBaseFrame) {
-    if (!nsContentUtils::GetNodeTextContent(aColumn.mBaseFrame->GetContent(),
-                                            true, baseText)) {
-      NS_RUNTIMEABORT("OOM");
-    }
+    nsContentUtils::GetNodeTextContent(aColumn.mBaseFrame->GetContent(),
+                                       true, baseText);
   }
 
   // Reflow text frames
@@ -592,10 +590,9 @@
     nsRubyTextFrame* textFrame = aColumn.mTextFrames[i];
     if (textFrame) {
       nsAutoString annotationText;
-      if (!nsContentUtils::GetNodeTextContent(textFrame->GetContent(),
-                                              true, annotationText)) {
-        NS_RUNTIMEABORT("OOM");
-      }
+      nsContentUtils::GetNodeTextContent(textFrame->GetContent(),
+                                         true, annotationText);
+
       // Per CSS Ruby spec, the content comparison for auto-hiding
       // takes place prior to white spaces collapsing (white-space)
       // and text transformation (text-transform), and ignores elements
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/nsSimplePageSequenceFrame.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/nsSimplePageSequenceFrame.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/nsSimplePageSequenceFrame.cpp	2015-05-13 18:06:23.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/nsSimplePageSequenceFrame.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -41,7 +41,7 @@
 
 //
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 PRLogModuleInfo *
 GetLayoutPrintingLog()
 {
@@ -50,7 +50,7 @@
     sLog = PR_NewLogModule("printing-layout");
   return sLog;
 }
-#define PR_PL(_p1)  PR_LOG(GetLayoutPrintingLog(), PR_LOG_DEBUG, _p1)
+#define PR_PL(_p1)  MOZ_LOG(GetLayoutPrintingLog(), PR_LOG_DEBUG, _p1)
 
 nsSimplePageSequenceFrame*
 NS_NewSimplePageSequenceFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/test/chrome.ini firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/test/chrome.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/test/chrome.ini	2015-05-13 18:06:24.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/test/chrome.ini	2015-05-25 20:44:01.000000000 +0000
@@ -7,6 +7,7 @@
   frame_selection_underline.xhtml
 
 [test_backspace_delete.xul]
+skip-if = true # Bug 1163311
 [test_bug348681.html]
 [test_bug469613.xul]
 [test_bug469774.xul]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/WritingModes.h firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/WritingModes.h
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/generic/WritingModes.h	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/generic/WritingModes.h	2015-05-25 20:43:58.000000000 +0000
@@ -30,6 +30,10 @@
 
 namespace mozilla {
 
+namespace widget {
+struct IMENotification;
+} // namespace widget
+
 // Physical axis constants.
 enum PhysicalAxis {
   eAxisVertical      = 0x0,
@@ -475,6 +479,10 @@
   friend class LogicalRect;
 
   friend struct IPC::ParamTraits<WritingMode>;
+  // IMENotification cannot store this class directly since this has some
+  // constructors.  Therefore, it stores mWritingMode and recreate the
+  // instance from it.
+  friend struct widget::IMENotification;
 
   /**
    * Return a WritingMode representing an unknown value.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/mathml/nsMathMLmoFrame.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/mathml/nsMathMLmoFrame.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/mathml/nsMathMLmoFrame.cpp	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/mathml/nsMathMLmoFrame.cpp	2015-05-25 20:44:02.000000000 +0000
@@ -115,9 +115,7 @@
   mFlags = 0;
 
   nsAutoString data;
-  if (!nsContentUtils::GetNodeTextContent(mContent, false, data)) {
-    NS_RUNTIMEABORT("OOM");
-  }
+  nsContentUtils::GetNodeTextContent(mContent, false, data);
 
   data.CompressWhitespace();
   int32_t length = data.Length();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/mathml/nsMathMLTokenFrame.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/mathml/nsMathMLTokenFrame.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/mathml/nsMathMLTokenFrame.cpp	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/mathml/nsMathMLTokenFrame.cpp	2015-05-25 20:44:02.000000000 +0000
@@ -77,9 +77,7 @@
   }
   if (mContent->IsMathMLElement(nsGkAtoms::mi_) && childCount == 1) {
     nsAutoString data;
-    if (!nsContentUtils::GetNodeTextContent(mContent, false, data)) {
-      NS_RUNTIMEABORT("OOM");
-    }
+    nsContentUtils::GetNodeTextContent(mContent, false, data);
 
     data.CompressWhitespace();
     int32_t length = data.Length();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/media/symbols.def.in firefox-trunk-41.0~a1~hg20150524r245419/layout/media/symbols.def.in
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/media/symbols.def.in	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/media/symbols.def.in	2015-05-25 20:44:02.000000000 +0000
@@ -317,10 +317,32 @@
 _moz_cairo_copy_path_flat
 _moz_cairo_create
 _moz_cairo_curve_to
+_moz_cairo_d2d_create_device
+_moz_cairo_d2d_create_device_from_d3d10device
+_moz_cairo_d2d_device_get_device
+_moz_cairo_d2d_get_dc
+_moz_cairo_d2d_get_image_surface_cache_usage
+_moz_cairo_d2d_get_surface_vram_usage
+_moz_cairo_d2d_present_backbuffer
+_moz_cairo_d2d_release_dc
+_moz_cairo_d2d_scroll
+_moz_cairo_d2d_surface_create
+_moz_cairo_d2d_surface_create_for_handle
+_moz_cairo_d2d_surface_create_for_hwnd
+_moz_cairo_d2d_surface_create_for_texture
+_moz_cairo_d2d_surface_get_height
+_moz_cairo_d2d_surface_get_texture
+_moz_cairo_d2d_surface_get_width
 _moz_cairo_debug_reset_static_data
 _moz_cairo_destroy
 _moz_cairo_device_to_user
 _moz_cairo_device_to_user_distance
+_moz_cairo_dwrite_font_face_create_for_dwrite_fontface
+_moz_cairo_dwrite_get_cleartype_rendering_mode
+_moz_cairo_dwrite_scaled_font_allow_manual_show_glyphs
+_moz_cairo_dwrite_scaled_font_get_force_GDI_classic
+_moz_cairo_dwrite_scaled_font_set_force_GDI_classic
+_moz_cairo_dwrite_set_cleartype_params
 _moz_cairo_fill
 _moz_cairo_fill_extents
 _moz_cairo_fill_preserve
@@ -375,6 +397,7 @@
 _moz_cairo_move_to
 _moz_cairo_new_path
 _moz_cairo_new_sub_path
+_moz_cairo_null_surface_create
 _moz_cairo_paint
 _moz_cairo_paint_with_alpha
 _moz_cairo_path_destroy
@@ -408,6 +431,7 @@
 _moz_cairo_rectangle
 _moz_cairo_rectangle_list_destroy
 _moz_cairo_reference
+_moz_cairo_release_device
 _moz_cairo_reset_clip
 _moz_cairo_restore
 _moz_cairo_rotate
@@ -441,6 +465,7 @@
 _moz_cairo_stroke
 _moz_cairo_stroke_extents
 _moz_cairo_stroke_preserve
+_moz_cairo_surface_attach_snapshot
 _moz_cairo_surface_create_similar
 _moz_cairo_surface_destroy
 _moz_cairo_surface_finish
@@ -468,16 +493,22 @@
 _moz_cairo_user_to_device
 _moz_cairo_user_to_device_distance
 _moz_cairo_win32_font_face_create_for_logfontw_hfont
+_moz_cairo_win32_get_dc_with_clip
+_moz_cairo_win32_get_system_text_quality
 #ifdef NS_PRINTING
 _moz_cairo_win32_printing_surface_create
 #endif
 _moz_cairo_win32_scaled_font_select_font
 _moz_cairo_win32_surface_create
+_moz_cairo_win32_surface_create_with_alpha
 _moz_cairo_win32_surface_create_with_d3dsurface9
 _moz_cairo_win32_surface_create_with_ddb
 _moz_cairo_win32_surface_create_with_dib
 _moz_cairo_win32_surface_get_dc
+_moz_cairo_win32_surface_get_height
 _moz_cairo_win32_surface_get_image
+_moz_cairo_win32_surface_get_width
+_moz_cairo_win32_surface_set_can_convert_to_dib
 #ifdef MOZ_TREE_PIXMAN
 _moz_pixman_image_composite32
 _moz_pixman_image_create_bits
@@ -510,37 +541,6 @@
 _moz_pixman_region32_reset
 _moz_pixman_region32_clear
 #endif
-cairo_d2d_create_device
-cairo_d2d_create_device_from_d3d10device
-cairo_d2d_device_get_device
-cairo_d2d_get_dc
-cairo_d2d_get_image_surface_cache_usage
-cairo_d2d_get_surface_vram_usage
-cairo_d2d_present_backbuffer
-cairo_d2d_release_dc
-cairo_d2d_scroll
-cairo_d2d_surface_create
-cairo_d2d_surface_create_for_handle
-cairo_d2d_surface_create_for_hwnd
-cairo_d2d_surface_create_for_texture
-cairo_d2d_surface_get_height
-cairo_d2d_surface_get_texture
-cairo_d2d_surface_get_width
-cairo_dwrite_font_face_create_for_dwrite_fontface
-cairo_dwrite_get_cleartype_rendering_mode
-cairo_dwrite_scaled_font_allow_manual_show_glyphs
-cairo_dwrite_scaled_font_get_force_GDI_classic
-cairo_dwrite_scaled_font_set_force_GDI_classic
-cairo_dwrite_set_cleartype_params
-cairo_null_surface_create
-cairo_release_device
-cairo_surface_attach_snapshot
-cairo_win32_get_dc_with_clip
-cairo_win32_get_system_text_quality
-cairo_win32_surface_create_with_alpha
-cairo_win32_surface_get_height
-cairo_win32_surface_get_width
-cairo_win32_surface_set_can_convert_to_dib
 #endif
 hb_blob_create
 hb_blob_destroy
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/printing/nsPrintData.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/printing/nsPrintData.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/printing/nsPrintData.cpp	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/printing/nsPrintData.cpp	2015-05-25 20:44:02.000000000 +0000
@@ -14,7 +14,7 @@
 
 //-----------------------------------------------------
 // PR LOGGING
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #define DUMP_LAYOUT_LEVEL 9 // this turns on the dumping of each doucment's layout info
 static PRLogModuleInfo *
@@ -25,7 +25,7 @@
     sLog = PR_NewLogModule("printing");
   return sLog;
 }
-#define PR_PL(_p1)  PR_LOG(GetPrintingLog(), PR_LOG_DEBUG, _p1);
+#define PR_PL(_p1)  MOZ_LOG(GetPrintingLog(), PR_LOG_DEBUG, _p1);
 
 //---------------------------------------------------
 //-- nsPrintData Class Impl
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/printing/nsPrintEngine.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/printing/nsPrintEngine.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/printing/nsPrintEngine.cpp	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/printing/nsPrintEngine.cpp	2015-05-25 20:44:02.000000000 +0000
@@ -127,7 +127,7 @@
 
 //-----------------------------------------------------
 // PR LOGGING
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #ifdef DEBUG
 // PR_LOGGING is force to always be on (even in release builds)
@@ -146,7 +146,7 @@
     sLog = PR_NewLogModule("printing");
   return sLog;
 }
-#define PR_PL(_p1)  PR_LOG(GetPrintingLog(), PR_LOG_DEBUG, _p1);
+#define PR_PL(_p1)  MOZ_LOG(GetPrintingLog(), PR_LOG_DEBUG, _p1);
 #endif
 
 #ifdef EXTENDED_DEBUG_PRINTING
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/css-grid/grid-placement-definite-002.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/css-grid/grid-placement-definite-002.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/css-grid/grid-placement-definite-002.html	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/css-grid/grid-placement-definite-002.html	2015-05-25 20:42:36.000000000 +0000
@@ -46,13 +46,13 @@
 
 .test3 {
   grid-template-areas:'. a .';
-  grid-template-columns: (a-start) 20px 20px (a-start-start) 20px (a-start-end);
+  grid-template-columns: [a-start] 20px 20px [a-start-start] 20px [a-start-end];
 }
 .test3 span { grid-column: a-start / 8; }
 
 .test4, .test5 {
   grid-template-areas:'. . . a';
-  grid-template-columns: 20px (a-start) 20px (a-start) 20px (a-end) 20px ;
+  grid-template-columns: 20px [a-start] 20px [a-start] 20px [a-end] 20px ;
 }
 .test4 span { grid-column: a-start 2 / 8; }
 .test5 span { grid-column: a / 8; }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/css-grid/grid-placement-definite-003.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/css-grid/grid-placement-definite-003.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/css-grid/grid-placement-definite-003.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/css-grid/grid-placement-definite-003.html	2015-05-25 20:42:36.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE HTML>
+<html><head>
+    <meta charset="utf-8">
+    <title></title>
+    <style type="text/css">
+html,body {
+  font-size:16px;
+  font-family:monospace;
+}
+.grid {
+  display: grid;
+  border: 1px solid green;
+  grid-template-columns: 20px 20px 20px 20px;
+  grid-template-rows: 20px 20px 20px;
+  grid-auto-flow: row;
+  grid-auto-columns: 20px;
+  grid-auto-rows: 20px;
+}
+
+span {
+  background: lime;
+  border: 1px solid;
+}
+
+.test1 { grid-template-areas:'.. a a-start-.'; }
+.test1 span { grid-column: a-start- / 8; }
+
+.test2 {
+  grid-template-areas:
+    'a a a ... . .'
+    'a a a .   . ..'
+    '.-b b .   . ...'
+  ;
+}
+
+.test2 .a {
+  grid-area: a;
+}
+.test2 .b {
+  grid-column: 2 / span 3;
+  grid-row: b;
+}
+.test2 .c {
+  grid-column: auto / span 3;
+}
+
+.test3 {
+  grid-template-areas:'.a.';
+  grid-template-columns: [a-start] 20px 20px [a-start-start] 20px [a-start-end];
+}
+.test3 span { grid-column: a-start / 8; }
+
+.test4 {
+  grid-template-areas:'. .... .-a';
+  grid-template-columns: 20px [-a-start] 20px [-a-start] 20px [-a-end] 20px ;
+}
+.test4 span { grid-column: -a-start 2 / 8; }
+
+    </style>
+</head>
+<body>
+
+<div class="grid test1"><span>a</span></div>
+
+<div class="grid test2">
+<span class="a">a</span>
+<span class="b">b</span>
+<span class="c">c</span>
+</div>
+
+<div class="grid test3"><span>a</span></div>
+
+<div class="grid test4"><span>a</span></div>
+
+</body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/css-grid/grid-placement-definite-003-ref.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/css-grid/grid-placement-definite-003-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/css-grid/grid-placement-definite-003-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/css-grid/grid-placement-definite-003-ref.html	2015-05-25 20:42:36.000000000 +0000
@@ -0,0 +1,79 @@
+<!DOCTYPE HTML>
+<html><head>
+    <meta charset="utf-8">
+    <title></title>
+    <style type="text/css">
+html,body {
+  font-size:16px;
+  font-family:monospace;
+}
+.grid {
+  height: 60px;
+  border: 1px solid green;
+  position: relative;
+}
+
+span {
+  position: absolute;
+  background: lime;
+  border: 1px solid black;
+  box-sizing: border-box;
+}
+
+.test1 span {
+  top: 0;
+  left: 40px;
+  width: 100px;
+  height: 20px;
+}
+
+.test2 .a {
+  top: 0;
+  left: 0;
+  width: 60px;
+  height: 40px;
+}
+.test2 .b {
+  top: 40px;
+  left: 20px;
+  width: 60px;
+  height: 20px;
+}
+.test2 .c {
+  top: 0;
+  left: 60px;
+  width: 60px;
+  height: 20px;
+}
+
+.test3 span {
+  top: 0;
+  left: 40px;
+  width: 100px;
+  height: 20px;
+}
+
+.test4 span {
+  top: 0;
+  left: 40px;
+  width: 100px;
+  height: 20px;
+}
+    </style>
+</head>
+<body>
+
+<div class="grid test1"><span>a</span></div>
+
+<div class="grid test2">
+<span class="a">a</span>
+<span class="b">b</span>
+<span class="c">c</span>
+</div>
+
+<div class="grid test3"><span>a</span></div>
+
+<div class="grid test4"><span>a</span></div>
+
+</body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/css-grid/grid-placement-definite-implicit-002.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/css-grid/grid-placement-definite-implicit-002.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/css-grid/grid-placement-definite-implicit-002.html	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/css-grid/grid-placement-definite-implicit-002.html	2015-05-25 20:42:36.000000000 +0000
@@ -24,7 +24,7 @@
 
 .grid {
   display: grid;
-  grid-template-columns: (A) 20px (A) 20px;
+  grid-template-columns: [A] 20px [A] 20px;
   grid-template-rows: 20px 20px;
   grid-auto-columns: 20px;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/css-grid/grid-relpos-items-001.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/css-grid/grid-relpos-items-001.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/css-grid/grid-relpos-items-001.html	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/css-grid/grid-relpos-items-001.html	2015-05-25 20:42:36.000000000 +0000
@@ -14,7 +14,7 @@
 
 .grid {
  display: grid;
- grid-template-columns: 20px 20px (A) 20px;
+ grid-template-columns: 20px 20px [A] 20px;
  grid-template-rows: 20px;
  grid-auto-columns: 20px;
  grid-auto-rows: 20px;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/css-grid/reftest.list firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/css-grid/reftest.list
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/css-grid/reftest.list	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/css-grid/reftest.list	2015-05-25 20:42:36.000000000 +0000
@@ -5,6 +5,7 @@
 == grid-whitespace-handling-2.xhtml  grid-whitespace-handling-2-ref.xhtml
 == grid-placement-definite-001.html grid-placement-definite-001-ref.html
 == grid-placement-definite-002.html grid-placement-definite-002-ref.html
+== grid-placement-definite-003.html grid-placement-definite-003-ref.html
 == grid-placement-auto-row-sparse-001.html grid-placement-auto-row-sparse-001-ref.html
 == grid-placement-auto-row-dense-001.html grid-placement-auto-row-dense-001-ref.html
 == grid-placement-auto-col-sparse-001.html grid-placement-auto-col-sparse-001-ref.html
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-1a.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-1a.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-1a.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-1a.html	2015-05-25 20:42:40.000000000 +0000
@@ -5,10 +5,10 @@
 </head>
 <body>
 <div style="width:300px" dir="rtl">
-  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:right;position:relative;"></div>
+  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:right;"></div>
 </div>
 <div style="width:200px">
-  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:right;position:relative;"></div>
+  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:right;"></div>
 </div>
 <div style="background:silver">
 This text should appear to the LEFT of the red and green blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-1b.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-1b.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-1b.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-1b.html	2015-05-25 20:42:40.000000000 +0000
@@ -5,10 +5,10 @@
 </head>
 <body>
 <div style="width:300px">
-  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:right;position:relative;"></div>
+  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:right;"></div>
 </div>
 <div style="width:200px" dir="rtl">
-  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:right;position:relative;"></div>
+  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:right;"></div>
 </div>
 <div style="background:silver">
 This text should appear to the LEFT of the red and green blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-1c.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-1c.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-1c.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-1c.html	2015-05-25 20:42:40.000000000 +0000
@@ -5,10 +5,10 @@
 </head>
 <body>
 <div style="width:300px" dir="rtl">
-  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:right;position:relative;"></div>
+  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:right;"></div>
 </div>
 <div style="width:200px" dir="rtl">
-  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:right;position:relative;"></div>
+  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:right;"></div>
 </div>
 <div style="background:silver">
 This text should appear to the LEFT of the red and green blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-1d.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-1d.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-1d.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-1d.html	2015-05-25 20:42:40.000000000 +0000
@@ -6,10 +6,10 @@
 <body>
 <div dir="rtl" style="width:300px">
   <div style="width:300px">
-    <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:right;position:relative;"></div>
+    <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:right;"></div>
   </div>
   <div style="width:200px">
-    <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:right;position:relative;"></div>
+    <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:right;"></div>
   </div>
 </div>
 <div style="background:silver">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-1-ref.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-1-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-1-ref.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-1-ref.html	2015-05-25 20:42:40.000000000 +0000
@@ -5,13 +5,13 @@
 </head>
 <body>
 <div style="width:0px;height:0px;overflow:visible">
-  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);display:inline-block;position:relative;left:200px;"></div>
+  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);display:inline-block;margin-left:200px;"></div>
 </div>
 <div style="width:0px;height:0px;overflow:visible">
-  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);display:inline-block;position:relative;left:100px;"></div>
+  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);display:inline-block;margin-left:100px;"></div>
 </div>
-<div style="background:silver;padding-right:calc(100% - 100px);">
-This text should appear to the LEFT of the red and green blocks.
+<div style="background:silver;">
+  <div style="width:100px">This text should appear to the LEFT of the red and green blocks.</div>
 </div>
 </body>
 </html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-2a.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-2a.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-2a.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-2a.html	2015-05-25 20:42:40.000000000 +0000
@@ -5,10 +5,10 @@
 </head>
 <body>
 <div dir="rtl" style="width:300px">
-  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:left;position:relative;"></div>
+  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:left;"></div>
 </div>
 <div style="width:200px">
-  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:left;position:relative;"></div>
+  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:left;"></div>
 </div>
 <div style="background:silver">
 This text should appear to the RIGHT of the green and red blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-2b.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-2b.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-2b.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-2b.html	2015-05-25 20:42:40.000000000 +0000
@@ -5,10 +5,10 @@
 </head>
 <body>
 <div style="width:300px">
-  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:left;position:relative;"></div>
+  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:left;"></div>
 </div>
 <div dir="rtl" style="width:200px">
-  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:left;position:relative;"></div>
+  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:left;"></div>
 </div>
 <div style="background:silver">
 This text should appear to the RIGHT of the green and red blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-2c.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-2c.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-2c.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-2c.html	2015-05-25 20:42:40.000000000 +0000
@@ -5,10 +5,10 @@
 </head>
 <body>
 <div dir="rtl" style="width:300px">
-  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:left;position:relative;"></div>
+  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:left;"></div>
 </div>
 <div dir="rtl" style="width:200px">
-  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:left;position:relative;"></div>
+  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:left;"></div>
 </div>
 <div style="background:silver">
 This text should appear to the RIGHT of the green and red blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-2d.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-2d.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-2d.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-2d.html	2015-05-25 20:42:40.000000000 +0000
@@ -6,10 +6,10 @@
 <body>
 <div dir="rtl" style="width:-moz-fit-content">
   <div style="width:300px">
-    <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:left;position:relative;"></div>
+    <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:left;"></div>
   </div>
   <div style="width:200px">
-    <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:left;position:relative;"></div>
+    <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:left;"></div>
   </div>
 </div>
 <div style="background:silver">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-2-ref.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-2-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-2-ref.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-2-ref.html	2015-05-25 20:42:40.000000000 +0000
@@ -5,13 +5,13 @@
 </head>
 <body>
 <div style="width:0px;height:0px;overflow:visible">
-  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);display:inline-block;position:relative;left:0px;"></div>
+  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);display:inline-block;"></div>
 </div>
 <div style="width:0px;height:0px;overflow:visible">
-  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);display:inline-block;position:relative;left:100px;"></div>
+  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);display:inline-block;margin-left:100px;"></div>
 </div>
-<div style="background:silver;padding-left:200px;">
-This text should appear to the RIGHT of the green and red blocks.
+<div style="background:silver;">
+  <div style="margin-left:200px;">This text should appear to the RIGHT of the green and red blocks.</div>
 </div>
 </body>
 </html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-3a.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-3a.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-3a.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-3a.html	2015-05-25 20:42:40.000000000 +0000
@@ -5,10 +5,10 @@
 </head>
 <body dir="rtl">
 <div dir="ltr" style="width:300px">
-  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:left;position:relative;"></div>
+  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:left;"></div>
 </div>
 <div style="width:200px">
-  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:left;position:relative;"></div>
+  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:left;"></div>
 </div>
 <div style="background:silver">
 This text should appear to the RIGHT of the green and red blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-3b.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-3b.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-3b.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-3b.html	2015-05-25 20:42:40.000000000 +0000
@@ -5,10 +5,10 @@
 </head>
 <body dir="rtl">
 <div style="width:300px">
-  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:left;position:relative;"></div>
+  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:left;"></div>
 </div>
 <div dir="ltr" style="width:200px">
-  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:left;position:relative;"></div>
+  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:left;"></div>
 </div>
 <div style="background:silver">
 This text should appear to the RIGHT of the green and red blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-3c.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-3c.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-3c.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-3c.html	2015-05-25 20:42:40.000000000 +0000
@@ -5,7 +5,7 @@
 </head>
 <body dir="rtl">
 <div dir="ltr" style="width:300px">
-  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:left;position:relative;"></div>
+  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:left;"></div>
 </div>
 <div dir="ltr" style="width:200px">
   <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:left"></div>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-3d.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-3d.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-3d.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-3d.html	2015-05-25 20:42:40.000000000 +0000
@@ -6,10 +6,10 @@
 <body dir="rtl">
 <div dir="ltr" style="width:-moz-fit-content">
   <div style="width:300px">
-    <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:left;position:relative;"></div>
+    <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:left;"></div>
   </div>
   <div style="width:200px">
-    <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:left;position:relative;"></div>
+    <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:left;"></div>
   </div>
 </div>
 <div style="background:silver">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-3-ref.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-3-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-3-ref.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-3-ref.html	2015-05-25 20:42:40.000000000 +0000
@@ -5,13 +5,13 @@
 </head>
 <body dir="rtl">
 <div style="width:0px;height:0px;overflow:visible">
-  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);display:inline-block;position:relative;right:200px;"></div>
+  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);display:inline-block;margin-right:200px;"></div>
 </div>
 <div style="width:0px;height:0px;overflow:visible">
-  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);display:inline-block;position:relative;right:100px;"></div>
+  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);display:inline-block;margin-right:100px;"></div>
 </div>
-<div style="background:silver;padding-left:calc(100% - 100px);">
-This text should appear to the RIGHT of the green and red blocks.
+<div style="background:silver;">
+  <div style="width:100px;">This text should appear to the RIGHT of the green and red blocks.</div>
 </div>
 </body>
 </html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-4a.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-4a.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-4a.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-4a.html	2015-05-25 20:42:40.000000000 +0000
@@ -5,10 +5,10 @@
 </head>
 <body dir="rtl">
 <div dir="ltr" style="width:300px">
-  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:right;position:relative;"></div>
+  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:right;"></div>
 </div>
 <div style="width:200px">
-  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:right;position:relative;"></div>
+  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:right;"></div>
 </div>
 <div style="background:silver">
 This text should appear to the LEFT of the red and green blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-4b.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-4b.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-4b.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-4b.html	2015-05-25 20:42:40.000000000 +0000
@@ -5,10 +5,10 @@
 </head>
 <body dir="rtl">
 <div style="width:300px">
-  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:right;position:relative;"></div>
+  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:right;"></div>
 </div>
 <div dir="ltr" style="width:200px">
-  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:right;position:relative;"></div>
+  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:right;"></div>
 </div>
 <div style="background:silver">
 This text should appear to the LEFT of the red and green blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-4c.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-4c.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-4c.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-4c.html	2015-05-25 20:42:40.000000000 +0000
@@ -5,10 +5,10 @@
 </head>
 <body dir="rtl">
 <div dir="ltr" style="width:300px">
-  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:right;position:relative;"></div>
+  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:right;"></div>
 </div>
 <div dir="ltr" style="width:200px">
-  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:right;position:relative;"></div>
+  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:right;"></div>
 </div>
 <div style="background:silver">
 This text should appear to the LEFT of the red and green blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-4d.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-4d.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-4d.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-4d.html	2015-05-25 20:42:40.000000000 +0000
@@ -6,10 +6,10 @@
 <body dir="rtl">
 <div dir="ltr" style="width:-moz-fit-content">
   <div style="width:300px">
-    <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:right;position:relative;"></div>
+    <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);float:right;"></div>
   </div>
   <div style="width:200px">
-    <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:right;position:relative;"></div>
+    <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);float:right;"></div>
   </div>
 </div>
 <div style="background:silver">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-4-ref.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-4-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-4-ref.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-4-ref.html	2015-05-25 20:42:40.000000000 +0000
@@ -5,13 +5,13 @@
 </head>
 <body dir="rtl">
 <div style="width:0px;height:0px;overflow:visible">
-  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);display:inline-block;position:relative;right:0px;"></div>
+  <div style="width:100px;height:120px;background:rgba(0,255,0,0.8);display:inline-block;"></div>
 </div>
 <div style="width:0px;height:0px;overflow:visible">
-  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);display:inline-block;position:relative;right:100px;"></div>
+  <div style="width:100px;height:150px;background:rgba(255,0,0,0.8);display:inline-block;margin-right:100px;"></div>
 </div>
-<div style="background:silver;padding-right:200px;">
-This text should appear to the LEFT of the red and green blocks.
+<div style="background:silver;">
+  <div style="margin-right:200px;">This text should appear to the LEFT of the red and green blocks.</div>
 </div>
 </body>
 </html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-1a.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-1a.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-1a.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-1a.html	2015-05-25 20:42:40.000000000 +0000
@@ -12,10 +12,10 @@
 </head>
 <body>
   <div style="height:300px" dir="rtl">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;position:relative;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;"></div>
   </div>
   <div style="height:200px">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;position:relative;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;"></div>
   </div>
   <div style="background:silver">
 This text should appear ABOVE the red and green blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-1b.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-1b.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-1b.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-1b.html	2015-05-25 20:42:40.000000000 +0000
@@ -12,10 +12,10 @@
 </head>
 <body>
   <div style="height:300px">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;position:relative;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;"></div>
   </div>
   <div style="height:200px" dir="rtl">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;position:relative;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;"></div>
   </div>
   <div style="background:silver">
 This text should appear ABOVE the red and green blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-1c.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-1c.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-1c.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-1c.html	2015-05-25 20:42:40.000000000 +0000
@@ -12,10 +12,10 @@
 </head>
 <body>
   <div style="height:300px" dir="rtl">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;position:relative;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;"></div>
   </div>
   <div style="height:200px" dir="rtl">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;position:relative;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;"></div>
   </div>
   <div style="background:silver">
 This text should appear ABOVE the red and green blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-1d.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-1d.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-1d.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-1d.html	2015-05-25 20:42:40.000000000 +0000
@@ -13,10 +13,10 @@
 <body>
   <div dir="rtl" style="height:300px">
     <div style="height:300px">
-      <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;position:relative;"></div>
+      <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;"></div>
     </div>
     <div style="height:200px">
-      <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;position:relative;"></div>
+      <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;"></div>
     </div>
   </div>
   <div style="background:silver">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-1-ref.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-1-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-1-ref.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-1-ref.html	2015-05-25 20:42:40.000000000 +0000
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="vlr">
+<html>
 <head>
 <title>Bug 1114329 testcase</title>
 <style>
@@ -12,13 +12,13 @@
 </head>
 <body>
   <div style="height:0px;width:0px;overflow:visible">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);display:inline-block;position:relative;top:200px;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);display:inline-block;margin-top:200px;"></div>
   </div>
   <div style="height:0px;width:0px;overflow:visible">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);display:inline-block;position:relative;top:100px;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);display:inline-block;margin-top:100px;"></div>
   </div>
-  <div style="background:silver;padding-bottom:calc(100% - 100px);">
-This text should appear ABOVE the red and green blocks.
+  <div class="vlr" style="background:silver; height: calc(100vh - 16px);">
+    <div style="height:100px;">This text should appear ABOVE the red and green blocks.</div>
   </div>
 </body>
 </html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-2a.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-2a.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-2a.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-2a.html	2015-05-25 20:42:40.000000000 +0000
@@ -12,10 +12,10 @@
 </head>
 <body>
   <div dir="rtl" style="height:300px">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;position:relative;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;"></div>
   </div>
   <div style="height:200px">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;position:relative;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;"></div>
   </div>
   <div style="background:silver">
 This text should appear BELOW the green and red blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-2b.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-2b.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-2b.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-2b.html	2015-05-25 20:42:40.000000000 +0000
@@ -12,10 +12,10 @@
 </head>
 <body>
   <div style="height:300px">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;position:relative;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;"></div>
   </div>
   <div dir="rtl" style="height:200px">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;position:relative;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;"></div>
   </div>
   <div style="background:silver">
 This text should appear BELOW the green and red blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-2c.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-2c.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-2c.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-2c.html	2015-05-25 20:42:40.000000000 +0000
@@ -12,10 +12,10 @@
 </head>
 <body>
   <div dir="rtl" style="height:300px">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;position:relative;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;"></div>
   </div>
   <div dir="rtl" style="height:200px">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;position:relative;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;"></div>
   </div>
   <div style="background:silver">
 This text should appear BELOW the green and red blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-2d.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-2d.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-2d.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-2d.html	2015-05-25 20:42:40.000000000 +0000
@@ -13,10 +13,10 @@
 <body>
   <div dir="rtl" style="inline-size:-moz-fit-content">
     <div style="height:300px">
-      <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;position:relative;"></div>
+      <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;"></div>
     </div>
     <div style="height:200px">
-      <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;position:relative;"></div>
+      <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;"></div>
     </div>
   </div>
   <div style="background:silver">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-2-ref.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-2-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-2-ref.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-2-ref.html	2015-05-25 20:42:40.000000000 +0000
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="vlr">
+<html>
 <head>
 <title>Bug 1114329 testcase</title>
 <style>
@@ -12,13 +12,15 @@
 </head>
 <body>
   <div style="height:0px;width:0px;overflow:visible">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);display:inline-block;position:relative;top:0px;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);display:inline-block;"></div>
   </div>
   <div style="height:0px;width:0px;overflow:visible">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);display:inline-block;position:relative;top:100px;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);display:inline-block;margin-top:100px;"></div>
   </div>
-  <div style="background:silver;padding-top:200px;">
-This text should appear BELOW the green and red blocks.
+  <div style="height:0px;width:0px;overflow:visible">
+    <div class="vlr" style="background:silver; height: calc(100vh - 16px);">
+      <div style="margin-top:200px;">This text should appear BELOW the green and red blocks.</div>
+    </div>
   </div>
 </body>
 </html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-3a.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-3a.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-3a.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-3a.html	2015-05-25 20:42:40.000000000 +0000
@@ -13,10 +13,10 @@
 <body>
  <div style="height:600px; direction: rtl;">
   <div dir="ltr" style="height:300px">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;position:relative;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;"></div>
   </div>
   <div style="height:200px">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;position:relative;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;"></div>
   </div>
   <div style="background:silver">
 This text should appear BELOW the green and red blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-3b.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-3b.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-3b.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-3b.html	2015-05-25 20:42:40.000000000 +0000
@@ -13,10 +13,10 @@
 <body>
  <div style="height:600px; direction: rtl;">
   <div style="height:300px">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;position:relative;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;"></div>
   </div>
   <div dir="ltr" style="height:200px">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;position:relative;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;"></div>
   </div>
   <div style="background:silver">
 This text should appear BELOW the green and red blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-3c.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-3c.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-3c.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-3c.html	2015-05-25 20:42:40.000000000 +0000
@@ -13,7 +13,7 @@
 <body>
  <div style="height:600px; direction: rtl;">
   <div dir="ltr" style="height:300px">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;position:relative;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;"></div>
   </div>
   <div dir="ltr" style="height:200px">
     <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left"></div>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-3d.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-3d.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-3d.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-3d.html	2015-05-25 20:42:40.000000000 +0000
@@ -14,10 +14,10 @@
  <div style="height:600px; direction: rtl;">
   <div dir="ltr" style="inline-size:-moz-fit-content">
     <div style="height:300px">
-      <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;position:relative;"></div>
+      <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;"></div>
     </div>
     <div style="height:200px">
-      <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;position:relative;"></div>
+      <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;"></div>
     </div>
   </div>
   <div style="background:silver">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-3-ref.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-3-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-3-ref.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-3-ref.html	2015-05-25 20:42:40.000000000 +0000
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="vlr">
+<html>
 <head>
 <title>Bug 1114329 testcase</title>
 <style>
@@ -11,15 +11,15 @@
 </style>
 </head>
 <body>
- <div style="height:600px; direction: rtl;">
+ <div style="height:600px;">
   <div style="height:0px;width:0px;overflow:visible">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);display:inline-block;position:relative;bottom: 200px;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);display:inline-block;margin-top:300px;"></div>
   </div>
   <div style="height:0px;width:0px;overflow:visible">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);display:inline-block;position:relative;bottom: 100px);"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);display:inline-block;margin-top:400px;"></div>
   </div>
-  <div style="background:silver;padding-top:calc(100% - 100px);">
-This text should appear BELOW the green and red blocks.
+  <div class="vlr" style="background:silver; height: 100%;">
+    <div style="padding-top:500px; direction:rtl">This text should appear BELOW the green and red blocks.</div>
   </div>
  </div>
 </body>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-4a.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-4a.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-4a.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-4a.html	2015-05-25 20:42:40.000000000 +0000
@@ -13,10 +13,10 @@
 </head>
 <body>
   <div dir="ltr" style="height:300px">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;position:relative;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;"></div>
   </div>
   <div style="height:200px">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;position:relative;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;"></div>
   </div>
   <div style="background:silver">
 This text should appear ABOVE the red and green blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-4b.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-4b.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-4b.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-4b.html	2015-05-25 20:42:40.000000000 +0000
@@ -13,10 +13,10 @@
 </head>
 <body>
   <div style="height:300px">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;position:relative;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;"></div>
   </div>
   <div dir="ltr" style="height:200px">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;position:relative;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;"></div>
   </div>
   <div style="background:silver">
 This text should appear ABOVE the red and green blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-4c.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-4c.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-4c.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-4c.html	2015-05-25 20:42:40.000000000 +0000
@@ -13,10 +13,10 @@
 </head>
 <body>
   <div dir="ltr" style="height:300px">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;position:relative;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;"></div>
   </div>
   <div dir="ltr" style="height:200px">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;position:relative;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;"></div>
   </div>
   <div style="background:silver">
 This text should appear ABOVE the red and green blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-4d.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-4d.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-4d.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-4d.html	2015-05-25 20:42:40.000000000 +0000
@@ -14,10 +14,10 @@
 <body>
   <div dir="ltr" style="inline-size:-moz-fit-content">
     <div style="height:300px">
-      <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;position:relative;"></div>
+      <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;"></div>
     </div>
     <div style="height:200px">
-      <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;position:relative;"></div>
+      <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;"></div>
     </div>
   </div>
   <div style="background:silver">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-4-ref.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-4-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vlr-4-ref.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vlr-4-ref.html	2015-05-25 20:42:40.000000000 +0000
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="vlr">
+<html>
 <head>
 <title>Bug 1114329 testcase</title>
 <style>
@@ -7,19 +7,20 @@
    writing-mode: vertical-lr;
    -webkit-writing-mode: vertical-lr;
    writing-mode: tb-lr;
-   direction: rtl;
 }
 </style>
 </head>
 <body>
+ <div style="height:600px;">
   <div style="height:0px;width:0px;overflow:visible">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);display:inline-block;position:relative;bottom:0px;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);display:inline-block;margin-top:500px;"></div>
   </div>
   <div style="height:0px;width:0px;overflow:visible">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);display:inline-block;position:relative;bottom:100px;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);display:inline-block;margin-top:400px;"></div>
   </div>
-  <div style="background:silver;padding-bottom:200px;">
-This text should appear ABOVE the red and green blocks.
+  <div class="vlr" style="background:silver; height: 100%;">
+    <div style="padding-bottom: 200px; direction:rtl">This text should appear ABOVE the green and red blocks.</div>
   </div>
+ </div>
 </body>
 </html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-1a.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-1a.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-1a.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-1a.html	2015-05-25 20:42:40.000000000 +0000
@@ -13,10 +13,10 @@
 </head>
 <body>
   <div style="height:300px" dir="rtl">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;position:relative;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;"></div>
   </div>
   <div style="height:200px">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;position:relative;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;"></div>
   </div>
   <div style="background:silver">
 This text should appear ABOVE the red and green blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-1b.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-1b.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-1b.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-1b.html	2015-05-25 20:42:40.000000000 +0000
@@ -13,10 +13,10 @@
 </head>
 <body>
   <div style="height:300px">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;position:relative;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;"></div>
   </div>
   <div style="height:200px" dir="rtl">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;position:relative;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;"></div>
   </div>
   <div style="background:silver">
 This text should appear ABOVE the red and green blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-1c.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-1c.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-1c.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-1c.html	2015-05-25 20:42:40.000000000 +0000
@@ -13,10 +13,10 @@
 </head>
 <body>
   <div style="height:300px" dir="rtl">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;position:relative;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;"></div>
   </div>
   <div style="height:200px" dir="rtl">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;position:relative;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;"></div>
   </div>
   <div style="background:silver">
 This text should appear ABOVE the red and green blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-1d.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-1d.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-1d.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-1d.html	2015-05-25 20:42:40.000000000 +0000
@@ -14,10 +14,10 @@
 <body>
   <div dir="rtl" style="height:300px">
     <div style="height:300px">
-      <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;position:relative;"></div>
+      <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;"></div>
     </div>
     <div style="height:200px">
-      <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;position:relative;"></div>
+      <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;"></div>
     </div>
   </div>
   <div style="background:silver">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-1-ref.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-1-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-1-ref.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-1-ref.html	2015-05-25 20:42:40.000000000 +0000
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="vrl">
+<html>
 <head>
 <title>Bug 1114329 testcase</title>
 <style>
@@ -7,20 +7,18 @@
    writing-mode: vertical-rl;
    -webkit-writing-mode: vertical-rl;
    writing-mode: tb-rl;
-   direction: ltr;
 }
 </style>
 </head>
-<body dir="rtl">
-<div dir="ltr">
+<body dir=rtl>
   <div style="height:0px;width:0px;overflow:visible">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);display:inline-block;position:relative;top:200px;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);display:inline-block;margin-top:200px;"></div>
   </div>
   <div style="height:0px;width:0px;overflow:visible">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);display:inline-block;position:relative;top:100px;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);display:inline-block;margin-top:100px;"></div>
   </div>
-  <div style="background:silver;padding-bottom:calc(100% - 100px);">
-This text should appear ABOVE the red and green blocks.
+  <div dir=ltr class="vrl" style="background:silver; height: calc(100vh - 16px);">
+    <div style="height:100px;">This text should appear ABOVE the red and green blocks.</div>
   </div>
 </body>
 </html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-2a.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-2a.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-2a.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-2a.html	2015-05-25 20:42:40.000000000 +0000
@@ -13,10 +13,10 @@
 </head>
 <body>
   <div dir="rtl" style="height:300px">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;position:relative;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;"></div>
   </div>
   <div style="height:200px">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;position:relative;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;"></div>
   </div>
   <div style="background:silver">
 This text should appear BELOW the green and red blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-2b.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-2b.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-2b.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-2b.html	2015-05-25 20:42:40.000000000 +0000
@@ -13,10 +13,10 @@
 </head>
 <body>
   <div style="height:300px">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;position:relative;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;"></div>
   </div>
   <div dir="rtl" style="height:200px">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;position:relative;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;"></div>
   </div>
   <div style="background:silver">
 This text should appear BELOW the green and red blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-2c.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-2c.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-2c.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-2c.html	2015-05-25 20:42:40.000000000 +0000
@@ -13,10 +13,10 @@
 </head>
 <body>
   <div dir="rtl" style="height:300px">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;position:relative;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;"></div>
   </div>
   <div dir="rtl" style="height:200px">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;position:relative;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;"></div>
   </div>
   <div style="background:silver">
 This text should appear BELOW the green and red blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-2d.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-2d.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-2d.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-2d.html	2015-05-25 20:42:40.000000000 +0000
@@ -14,10 +14,10 @@
 <body>
   <div dir="rtl" style="inline-size:-moz-fit-content">
     <div style="height:300px">
-      <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;position:relative;"></div>
+      <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;"></div>
     </div>
     <div style="height:200px">
-      <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;position:relative;"></div>
+      <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;"></div>
     </div>
   </div>
   <div style="background:silver">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-2-ref.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-2-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-2-ref.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-2-ref.html	2015-05-25 20:42:40.000000000 +0000
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="vrl">
+<html>
 <head>
 <title>Bug 1114329 testcase</title>
 <style>
@@ -7,19 +7,20 @@
    writing-mode: vertical-rl;
    -webkit-writing-mode: vertical-rl;
    writing-mode: tb-rl;
-   direction: ltr;
 }
 </style>
 </head>
-<body>
+<body dir=rtl>
   <div style="height:0px;width:0px;overflow:visible">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);display:inline-block;position:relative;top:0px;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);display:inline-block;"></div>
   </div>
   <div style="height:0px;width:0px;overflow:visible">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);display:inline-block;position:relative;top:100px;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);display:inline-block;margin-top:100px;"></div>
   </div>
-  <div style="background:silver;padding-top:200px;">
-This text should appear BELOW the green and red blocks.
+  <div style="height:0px;width:0px;overflow:visible">
+    <div dir=ltr class="vrl" style="background:silver; height: calc(100vh - 16px);">
+      <div style="margin-top:200px;">This text should appear BELOW the green and red blocks.</div>
+    </div>
   </div>
 </body>
 </html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-3a.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-3a.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-3a.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-3a.html	2015-05-25 20:42:40.000000000 +0000
@@ -13,10 +13,10 @@
 <body>
  <div style="height:600px; direction: rtl;">
   <div dir="ltr" style="height:300px">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;position:relative;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;"></div>
   </div>
   <div style="height:200px">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;position:relative;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;"></div>
   </div>
   <div style="background:silver">
 This text should appear BELOW the green and red blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-3b.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-3b.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-3b.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-3b.html	2015-05-25 20:42:40.000000000 +0000
@@ -13,10 +13,10 @@
 <body>
  <div style="height:600px; direction: rtl;">
   <div style="height:300px">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;position:relative;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;"></div>
   </div>
   <div dir="ltr" style="height:200px">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;position:relative;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;"></div>
   </div>
   <div style="background:silver">
 This text should appear BELOW the green and red blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-3c.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-3c.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-3c.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-3c.html	2015-05-25 20:42:40.000000000 +0000
@@ -13,7 +13,7 @@
 <body>
  <div style="height:600px; direction: rtl;">
   <div dir="ltr" style="height:300px">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;position:relative;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;"></div>
   </div>
   <div dir="ltr" style="height:200px">
     <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left"></div>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-3d.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-3d.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-3d.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-3d.html	2015-05-25 20:42:40.000000000 +0000
@@ -14,10 +14,10 @@
  <div style="height:600px; direction: rtl;">
   <div dir="ltr" style="inline-size:-moz-fit-content">
     <div style="height:300px">
-      <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;position:relative;"></div>
+      <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:left;"></div>
     </div>
     <div style="height:200px">
-      <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;position:relative;"></div>
+      <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:left;"></div>
     </div>
   </div>
   <div style="background:silver">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-3-ref.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-3-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-3-ref.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-3-ref.html	2015-05-25 20:42:40.000000000 +0000
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="vrl">
+<html>
 <head>
 <title>Bug 1114329 testcase</title>
 <style>
@@ -10,16 +10,16 @@
 }
 </style>
 </head>
-<body>
- <div style="height:600px; direction: rtl;">
+<body dir=rtl>
+ <div style="height:600px;">
   <div style="height:0px;width:0px;overflow:visible">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);display:inline-block;position:relative;bottom:200px;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);display:inline-block;margin-top:300px;"></div>
   </div>
   <div style="height:0px;width:0px;overflow:visible">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);display:inline-block;position:relative;bottom:100px;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);display:inline-block;margin-top:400px;"></div>
   </div>
-  <div style="background:silver;padding-top:calc(100% - 100px);">
-This text should appear BELOW the green and red blocks.
+  <div dir=ltr class="vrl" style="background:silver; height: 100%;">
+    <div style="padding-top:500px; direction:rtl">This text should appear BELOW the green and red blocks.</div>
   </div>
  </div>
 </body>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-4a.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-4a.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-4a.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-4a.html	2015-05-25 20:42:40.000000000 +0000
@@ -13,10 +13,10 @@
 </head>
 <body>
   <div dir="ltr" style="height:300px">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;position:relative;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;"></div>
   </div>
   <div style="height:200px">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;position:relative;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;"></div>
   </div>
   <div style="background:silver">
 This text should appear ABOVE the red and green blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-4b.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-4b.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-4b.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-4b.html	2015-05-25 20:42:40.000000000 +0000
@@ -13,10 +13,10 @@
 </head>
 <body>
   <div style="height:300px">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;position:relative;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;"></div>
   </div>
   <div dir="ltr" style="height:200px">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;position:relative;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;"></div>
   </div>
   <div style="background:silver">
 This text should appear ABOVE the red and green blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-4c.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-4c.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-4c.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-4c.html	2015-05-25 20:42:40.000000000 +0000
@@ -13,10 +13,10 @@
 </head>
 <body>
   <div dir="ltr" style="height:300px">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;position:relative;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;"></div>
   </div>
   <div dir="ltr" style="height:200px">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;position:relative;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;"></div>
   </div>
   <div style="background:silver">
 This text should appear ABOVE the red and green blocks.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-4d.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-4d.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-4d.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-4d.html	2015-05-25 20:42:40.000000000 +0000
@@ -14,10 +14,10 @@
 <body>
   <div dir="ltr" style="inline-size:-moz-fit-content">
     <div style="height:300px">
-      <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;position:relative;"></div>
+      <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);float:right;"></div>
     </div>
     <div style="height:200px">
-      <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;position:relative;"></div>
+      <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);float:right;"></div>
     </div>
   </div>
   <div style="background:silver">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-4-ref.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-4-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/floats/float-in-rtl-vrl-4-ref.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/floats/float-in-rtl-vrl-4-ref.html	2015-05-25 20:42:40.000000000 +0000
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="vrl">
+<html>
 <head>
 <title>Bug 1114329 testcase</title>
 <style>
@@ -7,19 +7,20 @@
    writing-mode: vertical-rl;
    -webkit-writing-mode: vertical-rl;
    writing-mode: tb-rl;
-   direction: rtl;
 }
 </style>
 </head>
-<body>
+<body dir=rtl>
+ <div style="height:600px;">
   <div style="height:0px;width:0px;overflow:visible">
-    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);display:inline-block;position:relative;bottom:0px;"></div>
+    <div style="height:100px;width:120px;background:rgba(0,255,0,0.8);display:inline-block;margin-top:500px;"></div>
   </div>
   <div style="height:0px;width:0px;overflow:visible">
-    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);display:inline-block;position:relative;bottom:100px;"></div>
+    <div style="height:100px;width:150px;background:rgba(255,0,0,0.8);display:inline-block;margin-top:400px;"></div>
   </div>
-  <div style="background:silver;padding-bottom:200px;">
-This text should appear ABOVE the red and green blocks.
+  <div dir=ltr class="vrl" style="background:silver; height: 100%;">
+    <div style="padding-bottom: 200px; direction:rtl">This text should appear ABOVE the green and red blocks.</div>
   </div>
+ </div>
 </body>
 </html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/font-face/reftest.list firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/font-face/reftest.list
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/font-face/reftest.list	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/font-face/reftest.list	2015-05-25 20:42:40.000000000 +0000
@@ -43,14 +43,15 @@
 # localized full fontnames should *not* match, only English ones (need locale-invariant key)
 skip HTTP(..) == src-list-local-localized.html src-list-local-localized-ref.html # 486787, 486497
 
-# Postscript name lookup only supported on MacOS/Windows currently
-skip-if(B2G||Mulet) fails-if(Android) random-if(gtk2Widget) == src-list-local-ps.html src-list-local-full-ref.html # bug 773482 # Initial mulet triage: parity with B2G/B2G Desktop
+# postscript name lookup
+# fontconfig only supports postscript name lookup from 2.10.92, Android/B2G not supported
+skip-if(B2G||Mulet) fails-if(Android) random-if(gtk2Widget) == src-list-local-ps.html src-list-local-full-ref.html # bug 773482
 # Mac-specific test of 100 weight faces
 random-if(!cocoaWidget) == helveticaneue-ultra.html helveticaneue-ultra-ref.html
 
 HTTP(..) == order-1.html order-1-ref.html
-pref(layout.css.unicode-range.enabled,true) random-if(gtk2Widget) HTTP(..) == order-2.html order-2-ref.html # bug 1056479
-pref(layout.css.unicode-range.enabled,true) random-if(gtk2Widget) HTTP(..) == order-3.html order-3-ref.html # bug 1056479
+pref(layout.css.unicode-range.enabled,true) HTTP(..) == order-2.html order-2-ref.html
+pref(layout.css.unicode-range.enabled,true) HTTP(..) == order-3.html order-3-ref.html
 HTTP(..) == multiple-in-family-1.html multiple-in-family-1-ref.html
 HTTP(..) == multiple-in-family-1b.html multiple-in-family-1-ref.html
 HTTP(..) != multiple-in-family-1.html multiple-in-family-1-notref.html
@@ -59,11 +60,11 @@
 HTTP(..) != prop-order-over-rule-order-1a.html prop-order-over-rule-order-1b.html
 skip-if(B2G||Mulet) HTTP(..) == cross-iframe-1.html cross-iframe-1-ref.html # bug 773482 # Initial mulet triage: parity with B2G/B2G Desktop
 
-# unicode-range (Linux implementation - bug 1056479)
-pref(layout.css.unicode-range.enabled,true) random-if(gtk2Widget) HTTP(..) == unicoderange-1.html unicoderange-1-ref.html
-pref(layout.css.unicode-range.enabled,true) random-if(gtk2Widget) HTTP(..) == unicoderange-2.html unicoderange-2-ref.html
-pref(layout.css.unicode-range.enabled,true) random-if(gtk2Widget) HTTP(..) == unicoderange-3.html unicoderange-3-ref.html
-pref(layout.css.unicode-range.enabled,true) random-if(gtk2Widget) HTTP(..) == unicoderange-4.html unicoderange-4-ref.html
+# unicode-range
+pref(layout.css.unicode-range.enabled,true) HTTP(..) == unicoderange-1.html unicoderange-1-ref.html
+pref(layout.css.unicode-range.enabled,true) HTTP(..) == unicoderange-2.html unicoderange-2-ref.html
+pref(layout.css.unicode-range.enabled,true) HTTP(..) == unicoderange-3.html unicoderange-3-ref.html
+pref(layout.css.unicode-range.enabled,true) HTTP(..) == unicoderange-4.html unicoderange-4-ref.html
 
 # Dynamic changes
 # we need to skip these because of the bug that's causing order-2.html to fail
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/font-face/src-list-local-full.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/font-face/src-list-local-full.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/font-face/src-list-local-full.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/font-face/src-list-local-full.html	2015-05-25 20:42:40.000000000 +0000
@@ -15,18 +15,18 @@
 
 @font-face {
   font-family: test-regular;
-  src: local(Helvetica Neue), local(Bitstream Vera Sans), local(Bitstream Vera Sans Roman), local(Free Sans), local(SwissA), local(DejaVu Sans), local(Arial);
+  src: local(Helvetica Neue), local(Bitstream Vera Sans), local(Bitstream Vera Sans Roman), local(FreeSans), local(Free Sans), local(SwissA), local(DejaVu Sans), local(Arial);
 }
 
 /* use Helvetica on the Mac, since Futura has no bold face on 10.4, 10.5 */
 @font-face {
   font-family: test-bold;
-  src: local(Helvetica Neue Bold), local(Bitstream Vera Sans Bold), local(Free Sans Bold), local(SwissA Bold), local(DejaVu Sans Bold), local(Arial Bold);
+  src: local(Helvetica Neue Bold), local(Bitstream Vera Sans Bold), local(FreeSans Bold), local(Free Sans Bold), local(SwissA Bold), local(DejaVu Sans Bold), local(Arial Bold);
 }
 
 @font-face {
   font-family: test-italic;
-  src: local(Helvetica Neue Italic), local(Bitstream Vera Sans Oblique), local(Free Sans Oblique), local(SwissA Italic), local(DejaVu Sans Oblique), local(Arial Italic);
+  src: local(Helvetica Neue Italic), local(Bitstream Vera Sans Oblique), local(FreeSans Oblique), local(Free Sans Oblique), local(SwissA Italic), local(DejaVu Sans Oblique), local(Arial Italic);
 }
 
 .regular { font-family: test-regular, serif; }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/font-face/src-list-local-full-quotes.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/font-face/src-list-local-full-quotes.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/font-face/src-list-local-full-quotes.html	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/font-face/src-list-local-full-quotes.html	2015-05-25 20:42:40.000000000 +0000
@@ -15,18 +15,18 @@
 
 @font-face {
   font-family: test-regular;
-  src: local("Helvetica Neue"), local("Bitstream Vera Sans"), local("Bitstream Vera Sans Roman"), local("Free Sans"), local("SwissA"), local("DejaVu Sans"), local("Arial");
+  src: local("Helvetica Neue"), local("Bitstream Vera Sans"), local("Bitstream Vera Sans Roman"), local("FreeSans"), local("Free Sans"), local("SwissA"), local("DejaVu Sans"), local("Arial");
 }
 
 /* use Helvetica on the Mac, since Futura has no bold face on 10.4, 10.5 */
 @font-face {
   font-family: test-bold;
-  src: local("Helvetica Neue Bold"), local("Bitstream Vera Sans Bold"), local("Free Sans Bold"), local("SwissA Bold"), local("DejaVu Sans Bold"), local("Arial Bold");
+  src: local("Helvetica Neue Bold"), local("Bitstream Vera Sans Bold"), local("FreeSans Bold"), local("Free Sans Bold"), local("SwissA Bold"), local("DejaVu Sans Bold"), local("Arial Bold");
 }
 
 @font-face {
   font-family: test-italic;
-  src: local("Helvetica Neue Italic"), local("Bitstream Vera Sans Oblique"), local("Free Sans Oblique"), local("SwissA Italic"), local("DejaVu Sans Oblique"), local("Arial Italic");
+  src: local("Helvetica Neue Italic"), local("Bitstream Vera Sans Oblique"), local("FreeSans Oblique"), local("Free Sans Oblique"), local("SwissA Italic"), local("DejaVu Sans Oblique"), local("Arial Italic");
 }
 
 .regular { font-family: test-regular, serif; }
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/fonts/markA-lineheight6000-typolineheight2700.otf and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/fonts/markA-lineheight6000-typolineheight2700.otf differ
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/fonts/markA-lineheight6000-typolineheight2700.ttf and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/fonts/markA-lineheight6000-typolineheight2700.ttf differ
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/fonts/mark-generate.py firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/fonts/mark-generate.py
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/fonts/mark-generate.py	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/fonts/mark-generate.py	2015-05-25 20:42:42.000000000 +0000
@@ -110,3 +110,44 @@
 f.hhea_linegap = lineheight - 800
 
 f.generate("markA-lineheight" + str(lineheight) + ".ttf")
+
+# Fonts with known winHeight and typoLineHeight such that winHeight is much
+# larger than typoLineHeight.
+f = fontforge.font()
+typoLineHeight = 2700
+winHeight = 6000
+n = "MarkA-lineheight" + str(winHeight)
+n = n + "-typolineheight" + str(typoLineHeight)
+f.fontname = n
+f.familyname = n
+f.fullname = n
+f.copyright = "Copyright (c) 2008-2015 Mozilla Corporation"
+
+g = f.createChar(ord(" "), "space")
+g.width = 1000
+g = f.createChar(ord("A"), "A")
+g.importOutlines("mark-glyph.svg")
+g.width = 1500
+
+f.os2_typoascent_add = False
+f.os2_typoascent = 800
+f.os2_typodescent_add = False
+f.os2_typodescent = -200
+f.os2_typolinegap = typoLineHeight - (f.os2_typoascent - f.os2_typodescent)
+
+f.hhea_ascent = winHeight / 2
+f.hhea_ascent_add = False
+f.hhea_descent = winHeight / 2
+f.hhea_descent_add = False
+f.hhea_linegap = 0
+
+f.os2_winascent = winHeight / 2
+f.os2_winascent_add = False
+f.os2_windescent = winHeight / 2
+f.os2_windescent_add = False
+
+f.os2_use_typo_metrics = True
+f.generate("markA-lineheight" + str(winHeight) +
+           "-typolineheight" + str(typoLineHeight) + ".otf")
+f.generate("markA-lineheight" + str(winHeight) +
+           "-typolineheight" + str(typoLineHeight) + ".ttf")
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/mathml/reftest.list firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/mathml/reftest.list
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/mathml/reftest.list	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/mathml/reftest.list	2015-05-25 20:42:49.000000000 +0000
@@ -282,7 +282,7 @@
 fails-if(B2G||Android||/^Windows\x20NT\x205\.1/.test(http.oscpu)||OSX==1006) == mathvariant-1b.html mathvariant-1b-ref.html # Bug 1010679
 fails-if(B2G||Android||/^Windows\x20NT\x205\.1/.test(http.oscpu)||OSX==1006) == mathvariant-1c.html mathvariant-1c-ref.html # Bug 1010679
 == mathvariant-1d.html mathvariant-1d-ref.html
-fails-if(B2G||Android||/^Windows\x20NT\x205\.1/.test(http.oscpu)||OSX) == mathvariant-2.html mathvariant-2-ref.html # Bugs 1010678, 1010679
+fails-if(B2G||Mulet||Android||/^Windows\x20NT\x205\.1/.test(http.oscpu)||OSX) == mathvariant-2.html mathvariant-2-ref.html # Bugs 1010678, 1010679
 == mathvariant-3.html mathvariant-3-ref.html
 == mathvariant-4.html mathvariant-4-ref.html
 == mathvariant-5.html mathvariant-5-ref.html
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/reftest.list firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/reftest.list
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/reftest.list	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/reftest.list	2015-05-25 20:42:52.000000000 +0000
@@ -388,3 +388,6 @@
 
 # encodings
 include ../../dom/encoding/test/reftest/reftest.list
+
+# APZ/async positioning tests
+include ../../gfx/layers/apz/reftests/reftest.list
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/svg/clipPath-basic-07.svg firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/svg/clipPath-basic-07.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/svg/clipPath-basic-07.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/svg/clipPath-basic-07.svg	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <clipPath id="clip">
+      <metadata/>
+      <rect width="100%" height="100%"/>
+    </clipPath>
+  </defs>
+  <rect fill="red" width="100%" height="100%" />
+  <rect fill="lime" clip-path="url(#clip)" width="100%" height="100%" />
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/svg/reftest.list firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/svg/reftest.list
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/svg/reftest.list	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/svg/reftest.list	2015-05-25 20:42:55.000000000 +0000
@@ -41,6 +41,7 @@
 == clipPath-basic-04.svg pass.svg
 == clipPath-basic-05.svg pass.svg
 == clipPath-basic-06.svg pass.svg
+== clipPath-basic-07.svg pass.svg
 == clipPath-winding-01.svg pass.svg
 == clip-surface-clone-01.svg clip-surface-clone-01-ref.svg
 == conditions-01.svg pass.svg
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/svg/smil/anim-opacity-01.svg firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/svg/smil/anim-opacity-01.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/svg/smil/anim-opacity-01.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/svg/smil/anim-opacity-01.svg	2015-05-25 20:42:56.000000000 +0000
@@ -0,0 +1,23 @@
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" class="reftest-wait"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     onload="setTimeAndSnapshot(101, false)">
+  <script xlink:href="smil-util.js" type="text/javascript"/>
+  <title>Testing that opacity changes are reflected in patterns</title>
+
+  <defs>
+    <pattern id="p" width="100%" height="100%">
+      <g>
+        <rect width="100%" height="100%" fill="lime" stroke="lime" stroke-width="1" opacity="0">
+          <animate attributeName="opacity" values="0;1" dur="1s" begin="99s" fill="freeze" />
+        </rect>
+      </g>
+    </pattern>
+  </defs>
+
+  <rect width="100%" height="100%" fill="red"/>
+  <rect width="100%" height="100%" fill="url(#p)"/>
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/svg/smil/reftest.list firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/svg/smil/reftest.list
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/svg/smil/reftest.list	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/svg/smil/reftest.list	2015-05-25 20:42:57.000000000 +0000
@@ -79,6 +79,8 @@
 == anim-fillopacity-1css.svg  anim-standard-ref.svg
 == anim-fillopacity-1xml.svg  anim-standard-ref.svg
 
+== anim-opacity-01.svg lime.svg
+
 == anim-height-done-1a.svg anim-standard-ref.svg
 == anim-height-done-1b.svg anim-standard-ref.svg
 == anim-height-done-2.svg lime.svg
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/text/lineheight-metrics-2a.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/text/lineheight-metrics-2a.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/text/lineheight-metrics-2a.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/text/lineheight-metrics-2a.html	2015-05-25 20:43:02.000000000 +0000
@@ -0,0 +1,29 @@
+<title>Testcase, bug 947650 and 598900</title>
+<style>
+html { background: white; }
+@font-face {
+   font-family: "MarkA-lineheight6000-typolineheight2700";
+   src: url(../fonts/markA-lineheight6000-typolineheight2700.otf);
+}
+body {
+   padding: 1px;
+   background: blue;
+   width: 100px;
+   height: 27px;
+   font-size: 0px; /* remove the effect of the strut ascent and descent */
+}
+div {
+   background: aqua;
+}
+span {
+  /* Choose 10px so that all the metrics are integers and we avoid rounding
+     issues. See lineheight-metrics-1.html for a test with non-integer values.
+   */
+   color: transparent;
+   font-family: MarkA-lineheight6000-typolineheight2700;
+   font-size: 10px;
+}
+</style>
+<body>
+<div><span>A</span></div>
+</body>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/text/lineheight-metrics-2b.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/text/lineheight-metrics-2b.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/text/lineheight-metrics-2b.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/text/lineheight-metrics-2b.html	2015-05-25 20:43:02.000000000 +0000
@@ -0,0 +1,29 @@
+<title>Testcase, bug 947650 and 598900</title>
+<style>
+html { background: white; }
+@font-face {
+   font-family: "MarkA-lineheight6000-typolineheight2700";
+   src: url(../fonts/markA-lineheight6000-typolineheight2700.ttf);
+}
+body {
+   padding: 1px;
+   background: blue;
+   width: 100px;
+   height: 27px;
+   font-size: 0px; /* remove the effect of the strut ascent and descent */
+}
+div {
+   background: aqua;
+}
+span {
+  /* Choose 10px so that all the metrics are integers and we avoid rounding
+     issues. See lineheight-metrics-1.html for a test with non-integer values.
+   */
+   color: transparent;
+   font-family: MarkA-lineheight6000-typolineheight2700;
+   font-size: 10px;
+}
+</style>
+<body>
+<div><span>A</span></div>
+</body>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/text/lineheight-metrics-2-ref.html firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/text/lineheight-metrics-2-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/text/lineheight-metrics-2-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/text/lineheight-metrics-2-ref.html	2015-05-25 20:43:02.000000000 +0000
@@ -0,0 +1,17 @@
+<title>Testcase, bug 947650 and 598900</title>
+<style>
+html { background: white; }
+body {
+   padding: 1px;
+   background: blue;
+   width: 100px;
+   font-size: 0px; /* remove the effect of the strut ascent and descent */
+}
+div {
+   background: aqua;
+   height: 27px;
+}
+</style>
+<body>
+<div></div>
+</body>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/text/reftest.list firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/text/reftest.list
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/text/reftest.list	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/text/reftest.list	2015-05-25 20:43:02.000000000 +0000
@@ -24,7 +24,9 @@
 == line-editing-1c.html line-editing-1-ref.html
 == line-editing-1d.html line-editing-1-ref.html
 == line-editing-1e.html line-editing-1-ref.html
-fails-if(cocoaWidget||winWidget) HTTP(..) == lineheight-metrics-1.html lineheight-metrics-1-ref.html # bug 657864
+fails-if(cocoaWidget||(winWidget&&!/^Windows\x20NT\x205\.1/.test(http.oscpu)&&layersGPUAccelerated)) HTTP(..) == lineheight-metrics-1.html lineheight-metrics-1-ref.html # bug 657864
+HTTP(..) == lineheight-metrics-2a.html lineheight-metrics-2-ref.html
+HTTP(..) == lineheight-metrics-2b.html lineheight-metrics-2-ref.html
 == lineheight-percentage-1.html lineheight-percentage-1-ref.html
 skip-if(B2G||Mulet) == long-1.html long-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 fuzzy-if(Android,255,42) == pre-line-1.html pre-line-1-ref.html
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/w3c-css/submitted/flexbox/reftest.list firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/w3c-css/submitted/flexbox/reftest.list
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/w3c-css/submitted/flexbox/reftest.list	2015-05-13 18:06:04.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/w3c-css/submitted/flexbox/reftest.list	2015-05-25 20:43:04.000000000 +0000
@@ -185,8 +185,8 @@
 
 # Tests for combined influence of 'writing-mode' & 'direction' on flex axes
 test-pref(layout.css.vertical-text.enabled,true) == flexbox-writing-mode-001.html flexbox-writing-mode-001-ref.html
-test-pref(layout.css.vertical-text.enabled,true) fails == flexbox-writing-mode-002.html flexbox-writing-mode-002-ref.html # bug 1149383
-test-pref(layout.css.vertical-text.enabled,true) fails == flexbox-writing-mode-003.html flexbox-writing-mode-003-ref.html # bug 1149383
+test-pref(layout.css.vertical-text.enabled,true) == flexbox-writing-mode-002.html flexbox-writing-mode-002-ref.html
+test-pref(layout.css.vertical-text.enabled,true) == flexbox-writing-mode-003.html flexbox-writing-mode-003-ref.html
 test-pref(layout.css.vertical-text.enabled,true) == flexbox-writing-mode-004.html flexbox-writing-mode-004-ref.html
-test-pref(layout.css.vertical-text.enabled,true) fails == flexbox-writing-mode-005.html flexbox-writing-mode-005-ref.html # bug 1149383
-test-pref(layout.css.vertical-text.enabled,true) fails == flexbox-writing-mode-006.html flexbox-writing-mode-006-ref.html # bug 1149383
+test-pref(layout.css.vertical-text.enabled,true) fails == flexbox-writing-mode-005.html flexbox-writing-mode-005-ref.html # bug 1131451
+test-pref(layout.css.vertical-text.enabled,true) fails == flexbox-writing-mode-006.html flexbox-writing-mode-006-ref.html # bug 1131451
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/reftest.list firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/reftest.list
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/reftest.list	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/reftest.list	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,101 @@
+# This directory contains tests for position:absolute and vertical writing modes.
+# They require the vertical-text pref to be true, otherwise lots of them will fail.
+# (See bug 1079151 for the origin of these testcases by Gérard Talbot.)
+default-preferences pref(layout.css.vertical-text.enabled,true)
+
+fails == s71-abs-pos-non-replaced-vlr-003.xht s71-abs-pos-non-replaced-vlr-003-ref.xht
+fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) == s71-abs-pos-non-replaced-vlr-005.xht s71-abs-pos-non-replaced-vlr-005-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-007.xht s71-abs-pos-non-replaced-vlr-007-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-009.xht s71-abs-pos-non-replaced-vlr-009-ref.xht
+fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) == s71-abs-pos-non-replaced-vlr-011.xht s71-abs-pos-non-replaced-vlr-011-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-013.xht s71-abs-pos-non-replaced-vlr-013-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-015.xht s71-abs-pos-non-replaced-vlr-015-ref.xht
+fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) == s71-abs-pos-non-replaced-vlr-017.xht s71-abs-pos-non-replaced-vlr-017-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-019.xht s71-abs-pos-non-replaced-vlr-019-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-021.xht s71-abs-pos-non-replaced-vlr-021-ref.xht
+fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) == s71-abs-pos-non-replaced-vlr-023.xht s71-abs-pos-non-replaced-vlr-023-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-025.xht s71-abs-pos-non-replaced-vlr-025-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-027.xht s71-abs-pos-non-replaced-vlr-027-ref.xht
+fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) == s71-abs-pos-non-replaced-vlr-029.xht s71-abs-pos-non-replaced-vlr-029-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-031.xht s71-abs-pos-non-replaced-vlr-031-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-033.xht s71-abs-pos-non-replaced-vlr-033-ref.xht
+fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) == s71-abs-pos-non-replaced-vlr-035.xht s71-abs-pos-non-replaced-vlr-035-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-037.xht s71-abs-pos-non-replaced-vlr-037-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-039.xht s71-abs-pos-non-replaced-vlr-039-ref.xht
+fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) == s71-abs-pos-non-replaced-vlr-041.xht s71-abs-pos-non-replaced-vlr-041-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-043.xht s71-abs-pos-non-replaced-vlr-043-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-045.xht s71-abs-pos-non-replaced-vlr-045-ref.xht
+fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) == s71-abs-pos-non-replaced-vlr-047.xht s71-abs-pos-non-replaced-vlr-047-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-049.xht s71-abs-pos-non-replaced-vlr-049-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-051.xht s71-abs-pos-non-replaced-vlr-051-ref.xht
+fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) == s71-abs-pos-non-replaced-vlr-053.xht s71-abs-pos-non-replaced-vlr-053-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-055.xht s71-abs-pos-non-replaced-vlr-055-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-057.xht s71-abs-pos-non-replaced-vlr-057-ref.xht
+fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) == s71-abs-pos-non-replaced-vlr-059.xht s71-abs-pos-non-replaced-vlr-059-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-061.xht s71-abs-pos-non-replaced-vlr-061-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-063.xht s71-abs-pos-non-replaced-vlr-063-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-065.xht s71-abs-pos-non-replaced-vlr-065-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-067.xht s71-abs-pos-non-replaced-vlr-067-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-069.xht s71-abs-pos-non-replaced-vlr-069-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-071.xht s71-abs-pos-non-replaced-vlr-071-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-073.xht s71-abs-pos-non-replaced-vlr-073-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-075.xht s71-abs-pos-non-replaced-vlr-075-ref.xht
+fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) == s71-abs-pos-non-replaced-vlr-077.xht s71-abs-pos-non-replaced-vlr-077-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-079.xht s71-abs-pos-non-replaced-vlr-079-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-081.xht s71-abs-pos-non-replaced-vlr-081-ref.xht
+fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) == s71-abs-pos-non-replaced-vlr-083.xht s71-abs-pos-non-replaced-vlr-083-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-085.xht s71-abs-pos-non-replaced-vlr-085-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-087.xht s71-abs-pos-non-replaced-vlr-087-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-089.xht s71-abs-pos-non-replaced-vlr-089-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-091.xht s71-abs-pos-non-replaced-vlr-091-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-093.xht s71-abs-pos-non-replaced-vlr-093-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-095.xht s71-abs-pos-non-replaced-vlr-095-ref.xht
+fails == s71-abs-pos-non-replaced-vlr-097.xht s71-abs-pos-non-replaced-vlr-097-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-002.xht s71-abs-pos-non-replaced-vrl-002-ref.xht
+fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) == s71-abs-pos-non-replaced-vrl-004.xht s71-abs-pos-non-replaced-vrl-004-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-006.xht s71-abs-pos-non-replaced-vrl-006-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-008.xht s71-abs-pos-non-replaced-vrl-008-ref.xht
+fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) == s71-abs-pos-non-replaced-vrl-010.xht s71-abs-pos-non-replaced-vrl-010-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-012.xht s71-abs-pos-non-replaced-vrl-012-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-014.xht s71-abs-pos-non-replaced-vrl-014-ref.xht
+fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) == s71-abs-pos-non-replaced-vrl-016.xht s71-abs-pos-non-replaced-vrl-016-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-018.xht s71-abs-pos-non-replaced-vrl-018-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-020.xht s71-abs-pos-non-replaced-vrl-020-ref.xht
+fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) == s71-abs-pos-non-replaced-vrl-022.xht s71-abs-pos-non-replaced-vrl-022-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-024.xht s71-abs-pos-non-replaced-vrl-024-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-026.xht s71-abs-pos-non-replaced-vrl-026-ref.xht
+fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) == s71-abs-pos-non-replaced-vrl-028.xht s71-abs-pos-non-replaced-vrl-028-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-030.xht s71-abs-pos-non-replaced-vrl-030-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-032.xht s71-abs-pos-non-replaced-vrl-032-ref.xht
+fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) == s71-abs-pos-non-replaced-vrl-034.xht s71-abs-pos-non-replaced-vrl-034-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-036.xht s71-abs-pos-non-replaced-vrl-036-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-038.xht s71-abs-pos-non-replaced-vrl-038-ref.xht
+fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) == s71-abs-pos-non-replaced-vrl-040.xht s71-abs-pos-non-replaced-vrl-040-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-042.xht s71-abs-pos-non-replaced-vrl-042-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-044.xht s71-abs-pos-non-replaced-vrl-044-ref.xht
+fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) == s71-abs-pos-non-replaced-vrl-046.xht s71-abs-pos-non-replaced-vrl-046-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-048.xht s71-abs-pos-non-replaced-vrl-048-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-050.xht s71-abs-pos-non-replaced-vrl-050-ref.xht
+fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) == s71-abs-pos-non-replaced-vrl-052.xht s71-abs-pos-non-replaced-vrl-052-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-054.xht s71-abs-pos-non-replaced-vrl-054-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-056.xht s71-abs-pos-non-replaced-vrl-056-ref.xht
+fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) == s71-abs-pos-non-replaced-vrl-058.xht s71-abs-pos-non-replaced-vrl-058-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-060.xht s71-abs-pos-non-replaced-vrl-060-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-062.xht s71-abs-pos-non-replaced-vrl-062-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-064.xht s71-abs-pos-non-replaced-vrl-064-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-066.xht s71-abs-pos-non-replaced-vrl-066-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-068.xht s71-abs-pos-non-replaced-vrl-068-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-070.xht s71-abs-pos-non-replaced-vrl-070-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-072.xht s71-abs-pos-non-replaced-vrl-072-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-074.xht s71-abs-pos-non-replaced-vrl-074-ref.xht
+fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) == s71-abs-pos-non-replaced-vrl-076.xht s71-abs-pos-non-replaced-vrl-076-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-078.xht s71-abs-pos-non-replaced-vrl-078-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-080.xht s71-abs-pos-non-replaced-vrl-080-ref.xht
+fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) == s71-abs-pos-non-replaced-vrl-082.xht s71-abs-pos-non-replaced-vrl-082-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-084.xht s71-abs-pos-non-replaced-vrl-084-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-086.xht s71-abs-pos-non-replaced-vrl-086-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-088.xht s71-abs-pos-non-replaced-vrl-088-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-090.xht s71-abs-pos-non-replaced-vrl-090-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-092.xht s71-abs-pos-non-replaced-vrl-092-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-094.xht s71-abs-pos-non-replaced-vrl-094-ref.xht
+fails == s71-abs-pos-non-replaced-vrl-096.xht s71-abs-pos-non-replaced-vrl-096-ref.xht
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-003-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-003-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-003-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-003-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top', 'height' and 'bottom' are 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-003.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-003.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-003.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-003.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,120 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top', 'height' and 'bottom' are 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-003-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'top', 'height' and 'bottom' are 'auto', then the height becomes shrink-to-fit and then solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-3row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+If all three of 'left', 'width', and 'right' are 'auto': First set any 'auto' values for 'margin-left' and 'margin-right' to 0. Then, if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static position and apply rule number three below; otherwise, set 'right' to the static position and apply rule number one below.
+"
+
+"
+3. 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width is shrink-to-fit . Then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+      0px : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+  (solve) : bottom: auto
+    =====================
+    320px : height of containing block
+
+gives us:
+
+      0px : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+  (solve) : bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 240px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-005-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-005-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-005-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-005-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'left', 'width' and 'right' are 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-005.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-005.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-005.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-005.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,114 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'left', 'width' and 'right' are 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-004-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'left', 'width' and 'right' are 'auto', then the width becomes shrink-to-fit and then solve for 'right'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: auto;
+      position: absolute;
+      right: auto;
+      width: auto;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+/*
+"
+If all three of 'left', 'width', and 'right' are 'auto': First set any 'auto' values for 'margin-left' and 'margin-right' to 0. Then, if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static position and apply rule number three below; otherwise, set 'right' to the static position and apply rule number one below.
+"
+
+"
+3. 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width is shrink-to-fit . Then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+      0px : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+  (solve) : right: auto
+    =====================
+    320px : width of containing block
+
+gives us:
+
+      0px : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+  (solve) : right: auto
+    =====================
+    320px : width of containing block
+
+And so computed right value must be 240px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-007-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-007-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-007-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-007-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,57 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top', 'height' and 'bottom' are 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-007.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-007.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-007.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-007.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,125 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top', 'height' and 'bottom' are 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-007-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'top', 'height' and 'bottom' are 'auto', then the height becomes shrink-to-fit and then solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-3row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+If all three of 'left', 'width', and 'right' are 'auto': First set any 'auto' values for 'margin-left' and 'margin-right' to 0. Then, if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static position and apply rule number three below; otherwise, set 'right' to the static position and apply rule number one below.
+"
+
+"
+3. 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width is shrink-to-fit . Then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+      0px : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+  (solve) : bottom: auto
+    =====================
+    320px : height of containing block
+
+gives us:
+
+      0px : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+  (solve) : bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 240px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-009-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-009-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-009-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-009-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top', 'height' and 'bottom' are 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-009.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-009.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-009.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-009.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,120 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top', 'height' and 'bottom' are 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'top', 'height' and 'bottom' are 'auto', then the height becomes shrink-to-fit and then solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+If all three of 'left', 'width', and 'right' are 'auto': First set any 'auto' values for 'margin-left' and 'margin-right' to 0. Then, if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static position and apply rule number three below; otherwise, set 'right' to the static position and apply rule number one below.
+"
+
+"
+3. 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width is shrink-to-fit . Then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+      0px : bottom: auto
+    =====================
+    320px : height of containing block
+
+gives us:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+      0px : bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 240px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-011-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-011-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-011-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-011-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'left', 'width' and 'right' are 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-011.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-011.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-011.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-011.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,114 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'left', 'width' and 'right' are 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'left', 'width' and 'right' are 'auto', then the width becomes shrink-to-fit and then solve for 'left'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: auto;
+      position: absolute;
+      right: auto;
+      width: auto;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+/*
+"
+If all three of 'left', 'width', and 'right' are 'auto': First set any 'auto' values for 'margin-left' and 'margin-right' to 0. Then, if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static position and apply rule number three below; otherwise, set 'right' to the static position and apply rule number one below.
+"
+
+"
+1. 'left' and 'width' are 'auto' and 'right' is not 'auto', then the width is shrink-to-fit. Then solve for 'left'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+  (solve) : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+    160px : right: auto
+    =====================
+    320px : width of containing block
+
+gives us:
+
+  (solve) : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+    160px : right: auto
+    =====================
+    320px : width of containing block
+
+And so computed left value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-013-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-013-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-013-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-013-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top', 'height' and 'bottom' are 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-013.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-013.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-013.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-013.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,124 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top', 'height' and 'bottom' are 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-013-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'top', 'height' and 'bottom' are 'auto', then the height becomes shrink-to-fit and then solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+If all three of 'left', 'width', and 'right' are 'auto': First set any 'auto' values for 'margin-left' and 'margin-right' to 0. Then, if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static position and apply rule number three below; otherwise, set 'right' to the static position and apply rule number one below.
+"
+
+"
+3. 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width is shrink-to-fit . Then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+      0px : bottom: auto
+    =====================
+    320px : height of containing block
+
+gives us:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+      0px : bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 240px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-015-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-015-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-015-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-015-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top', 'height' are 'auto' and bottom is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-015.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-015.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-015.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-015.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,119 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top', 'height' are 'auto' and bottom is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr'  and 'top', 'height' are 'auto' and bottom is not 'auto', then the height becomes shrink-to-fit and then solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 2em;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+set 'auto' values for 'margin-left' and 'margin-right' to 0, and pick the one of the following six rules that applies.
+
+1. 'left' and 'width' are 'auto' and 'right' is not 'auto', then the width is shrink-to-fit. Then solve for 'left'
+"
+
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+gives us:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-017-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-017-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-017-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-017-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'left' and 'width' are 'auto' and 'right' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-017.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-017.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-017.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-017.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,110 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'left' and 'width' are 'auto' and 'right' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'left' and 'width' are 'auto' and 'right' is not 'auto', then the width becomes shrink-to-fit and then solve for 'left'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: auto;
+      position: absolute;
+      right: 2em;
+      width: auto;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+/*
+"
+1. 'left' and 'width' are 'auto' and 'right' is not 'auto', then the width is shrink-to-fit. Then solve for 'left'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+  (solve) : left: auto
+  +
+      0px : margin-left
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right
+  +
+    160px : right
+    =====================
+    320px : width of containing block
+
+gives us:
+
+  (solve) : left: auto
+  +
+      0px : margin-left
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right
+  +
+    160px : right
+    =====================
+    320px : width of containing block
+
+And so computed left value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-019-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-019-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-019-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-019-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,57 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top' and 'height' are 'auto and 'bottom' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-019.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-019.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-019.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-019.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,123 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top' and 'height' are 'auto and 'bottom' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-013-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'top' and 'height' are 'auto and 'bottom' is not 'auto', then the height becomes shrink-to-fit and then solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 2em;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+set 'auto' values for 'margin-left' and 'margin-right' to 0, and pick the one of the following six rules that applies.
+
+1. 'left' and 'width' are 'auto' and 'right' is not 'auto', then the width is shrink-to-fit. Then solve for 'left'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+gives us:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-021-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-021-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-021-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-021-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top' and 'height' are 'auto and 'bottom' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-021.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-021.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-021.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-021.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,118 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top' and 'height' are 'auto and 'bottom' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'top' and 'height' are 'auto and 'bottom' is not 'auto', then the height becomes shrink-to-fit and then solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 2em;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+set 'auto' values for 'margin-left' and 'margin-right' to 0, and pick the one of the following six rules that applies.
+
+1. 'left' and 'width' are 'auto' and 'right' is not 'auto', then the width is shrink-to-fit. Then solve for 'left'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+gives us:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-023-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-023-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-023-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-023-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'left' and 'width' are 'auto' and 'right' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-023.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-023.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-023.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-023.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,112 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'left' and 'width' are 'auto' and 'right' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'left' and 'width' are 'auto' and 'right' is not 'auto', then the width becomes shrink-to-fit and then solve for 'left'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: auto;
+      position: absolute;
+      right: auto;
+      width: auto;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+/*
+"
+set 'auto' values for 'margin-left' and 'margin-right' to 0, and pick the one of the following six rules that applies.
+
+1. 'left' and 'width' are 'auto' and 'right' is not 'auto', then the width is shrink-to-fit. Then solve for 'left'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+  (solve) : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+     160px : right
+    =====================
+    320px : width of containing block
+
+gives us:
+
+  (solve) : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+     160px : right
+    =====================
+    320px : width of containing block
+
+And so computed left value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-025-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-025-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-025-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-025-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top' and 'height' are 'auto' and 'bottom' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-025.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-025.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-025.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-025.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,122 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top' and 'height' are 'auto' and 'bottom' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-013-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'top' and 'height' are 'auto' and 'bottom' is not 'auto', then the height becomes shrink-to-fit and then solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 2em;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+set 'auto' values for 'margin-left' and 'margin-right' to 0, and pick the one of the following six rules that applies.
+
+1. 'left' and 'width' are 'auto' and 'right' is not 'auto', then the width is shrink-to-fit. Then solve for 'left'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+gives us:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-027-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-027-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-027-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-027-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top' and 'bottom are 'auto' and 'height' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      color: transparent;
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-027.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-027.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-027.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-027.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,116 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top' and 'bottom are 'auto' and 'height' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-003-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'top' and 'bottom are 'auto' and 'height' is not 'auto', then set 'top' to static position and solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-3row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: 1em;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+2. 'left' and 'right' are 'auto' and 'width' is not 'auto', then if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static position, otherwise set 'right' to the static position. Then solve for 'left' (if 'direction is 'rtl') or 'right' (if 'direction' is 'ltr').
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+    160px : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    (solve): bottom: auto
+    =====================
+    320px : height of containing block
+
+gives us:
+
+    160px : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    (solve): bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-029-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-029-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-029-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-029-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'left' and 'right' are 'auto' and 'width' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-029.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-029.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-029.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-029.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,110 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'left' and 'right' are 'auto' and 'width' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-004-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'left' and 'right' are 'auto' and 'width' is not 'auto', then set 'left' to the static position and then solve for 'right'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: auto;
+      position: absolute;
+      right: auto;
+      width: 1em;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+/*
+"
+2. 'left' and 'right' are 'auto' and 'width' is not 'auto', then if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static position, otherwise set 'right' to the static position. Then solve for 'left' (if 'direction is 'rtl') or 'right' (if 'direction' is 'ltr').
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+    160px : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : width
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+    (solve): right: auto
+    =====================
+    320px : width of containing block
+
+gives us:
+
+    160px : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : width
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+    (solve): right: auto
+    =====================
+    320px : width of containing block
+
+And so computed right value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-031-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-031-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-031-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-031-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,57 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top' and 'bottom are 'auto' and 'height' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-031.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-031.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-031.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-031.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,121 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top' and 'bottom are 'auto' and 'height' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-007-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'top' and 'bottom are 'auto' and 'height' is not 'auto', then set 'top' to static position and solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-3row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: 1em;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+2. 'left' and 'right' are 'auto' and 'width' is not 'auto', then if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static position, otherwise set 'right' to the static position. Then solve for 'left' (if 'direction is 'rtl') or 'right' (if 'direction' is 'ltr').
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+    160px : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    (solve): bottom: auto
+    =====================
+    320px : height of containing block
+
+gives us:
+
+    160px : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    (solve): bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-033-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-033-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-033-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-033-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top' and 'bottom' are 'auto and 'height' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-033.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-033.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-033.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-033.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,116 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top' and 'bottom' are 'auto and 'height' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'top' and 'bottom' are 'auto' and 'height' is not 'auto', then set 'bottom' to static position and solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: 1em;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+2. 'left' and 'right' are 'auto' and 'width' is not 'auto', then if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static position, otherwise set 'right' to the static position. Then solve for 'left' (if 'direction is 'rtl') or 'right' (if 'direction' is 'ltr').
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    160px : bottom: auto
+    =====================
+    320px : height of containing block
+
+gives us:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    160px : bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-035-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-035-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-035-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-035-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'left' and 'right' are 'auto' and 'width' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-035.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-035.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-035.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-035.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,110 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'left' and 'right' are 'auto' and 'width' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'left' and 'right' are 'auto' and 'width' is not 'auto', then set 'right' to the static position and then solve for 'left'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: auto;
+      position: absolute;
+      right: auto;
+      width: 1em;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+/*
+"
+2. 'left' and 'right' are 'auto' and 'width' is not 'auto', then if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static position, otherwise set 'right' to the static position. Then solve for 'left' (if 'direction is 'rtl') or 'right' (if 'direction' is 'ltr').
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+  (solve) : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : width
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+    160px : right: auto
+    =====================
+    320px : width of containing block
+
+gives us:
+
+  (solve) : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : width
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+    160px : right: auto
+    =====================
+    320px : width of containing block
+
+And so computed left value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-037-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-037-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-037-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-037-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top' and 'bottom' are 'auto' and 'height' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-037.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-037.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-037.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-037.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,120 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top' and 'bottom' are 'auto' and 'height' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-013-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'top' and 'bottom' are 'auto' and 'height' is not 'auto', then set 'bottom' to static position and then solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: 1em;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+2. 'left' and 'right' are 'auto' and 'width' is not 'auto', then if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static position, otherwise set 'right' to the static position. Then solve for 'left' (if 'direction is 'rtl') or 'right' (if 'direction' is 'ltr').
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+gives us:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-039-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-039-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-039-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-039-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'height' and 'bottom' are 'auto' and 'top' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-039.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-039.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-039.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-039.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,117 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'height' and 'bottom' are 'auto' and 'top' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'height' and 'bottom' are 'auto' and 'top' is not 'auto', then the height becomes shrink-to-fit and then solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: 1em;
+    }
+
+/*
+
+"
+3. 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width is shrink-to-fit . Then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+     80px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+   (solve): bottom: auto
+    =====================
+    320px : height of containing block
+
+gives us:
+
+     80px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+   (solve): bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-041-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-041-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-041-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-041-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'width' and 'right' are 'auto' and 'left' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-041.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-041.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-041.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-041.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,111 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'width' and 'right' are 'auto' and 'left' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width becomes shrink-to-fit and then solve for 'right'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: 1em;
+      position: absolute;
+      right: auto;
+      width: auto;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+/*
+
+"
+3. 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width is shrink-to-fit . Then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+     80px : left
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+   (solve): right: auto
+    =====================
+    320px : width of containing block
+
+gives us:
+
+     80px : left
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+   (solve): right: auto
+    =====================
+    320px : width of containing block
+
+And so computed right value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-043-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-043-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-043-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-043-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'height' and 'bottom' are 'auto' and 'top' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-043.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-043.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-043.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-043.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,121 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'height' and 'bottom' are 'auto' and 'top' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-013-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'height' and 'bottom' are 'auto' and 'top' is not 'auto', then the height becomes shrink-to-fit and then solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: 1em;
+    }
+
+/*
+
+"
+3. 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width is shrink-to-fit . Then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+     80px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+   (solve): bottom: auto
+    =====================
+    320px : height of containing block
+
+gives us:
+
+     80px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    (solve): bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-045-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-045-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-045-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-045-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'height' and 'bottom' are 'auto' and 'top' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-045.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-045.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-045.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-045.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,117 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'height' and 'bottom' are 'auto' and 'top' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'top', 'height' and 'bottom' are 'auto' and 'top' is not 'auto', then the height becomes shrink-to-fit and then solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: 1em;
+    }
+
+/*
+
+"
+3. 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width is shrink-to-fit . Then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+     80px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+   (solve): bottom: auto
+    =====================
+    320px : height of containing block
+
+gives us:
+
+     80px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+   (solve): bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-047-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-047-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-047-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-047-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'width' and 'right' are 'auto' and 'left' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-047.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-047.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-047.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-047.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,111 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'width' and 'right' are 'auto' and 'left' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width becomes shrink-to-fit and then solve for 'right'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: 1em;
+      position: absolute;
+      right: auto;
+      width: auto;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+/*
+
+"
+3. 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width is shrink-to-fit . Then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+     80px : left
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+   (solve): right: auto
+    =====================
+    320px : width of containing block
+
+gives us:
+
+     80px : left
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+   (solve): right: auto
+    =====================
+    320px : width of containing block
+
+And so computed right value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-049-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-049-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-049-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-049-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'height' and 'bottom' are 'auto' and 'top' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-049.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-049.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-049.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-049.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,121 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'height' and 'bottom' are 'auto' and 'top' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-013-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'height' and 'bottom' are 'auto' and 'top' is not 'auto', then the height becomes shrink-to-fit and then solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: 1em;
+    }
+
+/*
+
+"
+3. 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width is shrink-to-fit . Then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+      80px: top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+  (solve) : bottom: auto
+    =====================
+    320px : height of containing block
+
+gives us:
+
+      80px: top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+  (solve) : bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-051-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-051-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-051-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-051-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top' is 'auto' and 'height' and 'bottom' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-051.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-051.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-051.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-051.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,95 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top' is 'auto' and 'height' and 'bottom' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-003-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'top' is 'auto' and 'height' and 'bottom' are not 'auto', then  solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-3row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 1em;
+      color: green;
+      height: 1em;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+
+"
+4. 'left' is 'auto', 'width' and 'right' are not 'auto', then solve for 'left'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+     80px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-053-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-053-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-053-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-053-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'left' is 'auto', 'width' and 'right' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-053.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-053.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-053.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-053.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,88 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'left' is 'auto', 'width' and 'right' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-004-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'left' is 'auto', 'width' and 'right' are not 'auto', then solve for 'left'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: auto;
+      position: absolute;
+      right: 1em;
+      width: 1em;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+/*
+"
+4. 'left' is 'auto', 'width' and 'right' are not 'auto', then solve for 'left'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+  (solve) : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+     80px : right
+    =====================
+    320px : width of containing block
+
+And so computed left value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-055-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-055-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-055-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-055-ref.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top' is 'auto' and 'height' and 'bottom' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-055.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-055.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-055.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-055.xht	2015-05-25 20:43:06.000000000 +0000
@@ -0,0 +1,98 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top' is 'auto' and 'height' and 'bottom' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-007-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'top' is 'auto' and 'height' and 'bottom' are not 'auto', then then solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-3row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 1em;
+      color: green;
+      height: 1em;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+4. 'left' is 'auto', 'width' and 'right' are not 'auto', then solve for 'left'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+     80px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-057-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-057-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-057-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-057-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top' is 'auto' and 'height' and 'bottom' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-057.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-057.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-057.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-057.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,94 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top' is 'auto' and 'height' and 'bottom' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-003-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'top' is 'auto' and 'height' and 'bottom' are not 'auto', then solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-3row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 1em;
+      color: green;
+      height: 1em;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+4. 'left' is 'auto', 'width' and 'right' are not 'auto', then solve for 'left'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+     80px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-059-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-059-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-059-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-059-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'left' is 'auto', 'width' and 'right' are not 'auto', then solve for 'left'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-059.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-059.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-059.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-059.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,88 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'left' is 'auto', 'width' and 'right' are not 'auto', then solve for 'left'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-004-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'left' is 'auto', 'width' and 'right' are not 'auto', then solve for 'left', then solve for 'left'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: auto;
+      position: absolute;
+      right: 1em;
+      width: 1em;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+/*
+"
+4.'left' is 'auto', 'width' and 'right' are not 'auto', then solve for 'left'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+  (solve) : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : width
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+     80px : right
+    =====================
+    320px : width of containing block
+
+And so computed left value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-061-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-061-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-061-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-061-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top' is 'auto' and 'height' and 'bottom' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-061.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-061.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-061.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-061.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,98 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top' is 'auto' and 'height' and 'bottom' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-007-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'top' is 'auto' and 'height' and 'bottom' are not 'auto', then solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-3row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 1em;
+      color: green;
+      height: 1em;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+4. 'left' is 'auto', 'width' and 'right' are not 'auto', then solve for 'left'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+     80px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-063-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-063-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-063-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-063-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'height' is 'auto' and 'top' and 'bottom' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-063.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-063.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-063.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-063.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,94 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'height' is 'auto' and 'top' and 'bottom' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-003-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'height' is 'auto' and 'top' and 'bottom' are not 'auto', then then solve for 'height'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-3row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 1em;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: 2em;
+    }
+
+/*
+"
+5. 'width' is 'auto', 'left' and 'right' are not 'auto', then solve for 'width'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+    160px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+  (solve) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+     80px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed height value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-065-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-065-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-065-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-065-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and  'width' is 'auto', 'left' and 'right' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-065.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-065.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-065.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-065.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,88 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and  'width' is 'auto', 'left' and 'right' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-004-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'left', 'width' is 'auto', 'left' and 'right' are not 'auto', then solve for 'width'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: 2em;
+      position: absolute;
+      right: 1em;
+      width: auto;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+/*
+"
+5. 'width' is 'auto', 'left' and 'right' are not 'auto', then solve for 'width'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+    160px : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+  (solve) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+     80px : right: auto
+    =====================
+    320px : width of containing block
+
+And so computed width value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-067-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-067-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-067-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-067-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'height' is 'auto' and 'top' and 'bottom' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-067.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-067.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-067.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-067.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,98 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'height' is 'auto' and 'top' and 'bottom' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-007-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'height' is 'auto' and 'top' and 'bottom' are not 'auto', then solve for 'height'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-3row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 1em;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: 2em;
+    }
+
+/*
+"
+5. 'width' is 'auto', 'left' and 'right' are not 'auto', then solve for 'width'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+    160px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+  (solve) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+     80px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed height value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-069-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-069-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-069-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-069-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'height' is 'auto' and 'top' and 'bottom' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-069.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-069.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-069.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-069.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,94 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'height' is 'auto' and 'top' and 'bottom' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-003-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'height' is 'auto' and 'top' and 'bottom' are not 'auto', then solve for 'height'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-3row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 1em;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: 2em;
+    }
+
+/*
+"
+5. 'width' is 'auto', 'left' and 'right' are not 'auto', then solve for 'width'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+    160px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+  (solve) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+     80px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed height value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-071-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-071-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-071-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-071-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'width' is 'auto', 'left' and 'right' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-071.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-071.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-071.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-071.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,88 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'width' is 'auto', 'left' and 'right' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-004-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'width' is 'auto', 'left' and 'right' are not 'auto', then solve for 'width'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: 2em;
+      position: absolute;
+      right: 1em;
+      width: auto;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+/*
+"
+5. 'width' is 'auto', 'left' and 'right' are not 'auto', then solve for 'width'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+    160px : left
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+  (solve) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+     80px : right
+    =====================
+    320px : width of containing block
+
+And so computed width value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-073-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-073-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-073-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-073-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'height' is 'auto' and 'top' and 'bottom' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-073.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-073.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-073.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-073.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,98 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'height' is 'auto' and 'top' and 'bottom' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-007-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'height' is 'auto' and 'top' and 'bottom' are not 'auto', then then solve for 'height'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-3row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 1em;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: 2em;
+    }
+
+/*
+"
+5. 'width' is 'auto', 'left' and 'right' are not 'auto', then solve for 'width'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+    160px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+  (solve) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+     80px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed height value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-075-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-075-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-075-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-075-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'bottom' is 'auto' and 'top' and 'height' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-075.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-075.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-075.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-075.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,94 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'bottom' is 'auto' and 'top' and 'height' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'bottom' is 'auto' and 'top' and 'height' are not 'auto', then solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: 1em;
+      position: absolute;
+      top: 1em;
+    }
+
+/*
+"
+6. 'right' is 'auto', 'left' and 'width' are not 'auto', then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+     80px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+  (solve) : bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-077-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-077-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-077-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-077-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'right' is 'auto', 'left' and 'width' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-077.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-077.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-077.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-077.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,88 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'right' is 'auto', 'left' and 'width' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'right' is 'auto', 'left' and 'width' are not 'auto', then solve for 'right'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: 1em;
+      position: absolute;
+      right: auto;
+      width: 1em;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+/*
+"
+6. 'right' is 'auto', 'left' and 'width' are not 'auto', then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+     80px : left
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : width
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+  (solve) : right: auto
+    =====================
+    320px : width of containing block
+
+And so computed right value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-079-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-079-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-079-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-079-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'bottom' is 'auto' and 'top' and 'height' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-079.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-079.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-079.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-079.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,98 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'bottom' is 'auto' and 'top' and 'height' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-013-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'bottom' is 'auto' and 'top' and 'height' are not 'auto', then solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: 1em;
+      position: absolute;
+      top: 1em;
+    }
+
+/*
+"
+6. 'right' is 'auto', 'left' and 'width' are not 'auto', then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+     80px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+  (solve) : bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-081-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-081-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-081-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-081-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'bottom' is 'auto' and 'top' and 'height' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-081.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-081.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-081.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-081.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,94 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'bottom' is 'auto' and 'top' and 'height' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'bottom' is 'auto' and 'top' and 'height' are not 'auto', then solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: 1em;
+      position: absolute;
+      top: 1em;
+    }
+
+/*
+"
+6. 'right' is 'auto', 'left' and 'width' are not 'auto', then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+     80px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+  (solve) : bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-083-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-083-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-083-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-083-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'right' is 'auto', 'left' and 'width' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-083.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-083.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-083.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-083.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,88 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'right' is 'auto', 'left' and 'width' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'right' is 'auto', 'left' and 'width' are not 'auto', then solve for 'right'" />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: 1em;
+      position: absolute;
+      right: auto;
+      width: 1em;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+/*
+"
+6. 'right' is 'auto', 'left' and 'width' are not 'auto', then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+     80px : left
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : width
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+  (solve) : right: auto
+    =====================
+    320px : width of containing block
+
+And so computed right value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-085-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-085-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-085-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-085-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'bottom' is 'auto' and 'top' and 'height' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-085.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-085.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-085.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-085.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,98 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'bottom' is 'auto' and 'top' and 'height' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-013-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'bottom' is 'auto' and 'top' and 'height' are not 'auto', then solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: 1em;
+      position: absolute;
+      top: 1em;
+    }
+
+/*
+"
+6. 'right' is 'auto', 'left' and 'width' are not 'auto', then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+     80px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+  (solve) : bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-087-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-087-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-087-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-087-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top', 'height' and 'bottom' are not 'auto' (overconstrained)</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-087.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-087.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-087.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-087.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,118 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top', 'height' and 'bottom' are not 'auto' (overconstrained)</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-003-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'top', 'height' and 'bottom' are not 'auto' and if the values are overconstrained, then ignore 'bottom' and solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-3row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 2em;
+      color: green;
+      height: 1em;
+      margin-bottom: 0em;
+      margin-top: 0em;
+      position: absolute;
+      top: 2em;
+    }
+
+/*
+"
+If none of the three is 'auto': If both 'margin-left' and 'margin-right' are 'auto', solve the equation under the extra constraint that the two margins get equal values, unless this would make them negative, in which case when direction of the containing block is 'ltr' ('rtl'), set 'margin-left' ('margin-right') to zero and solve for 'margin-right' ('margin-left'). If one of 'margin-left' or 'margin-right' is 'auto', solve the equation for that value. If the values are over-constrained, ignore the value for 'left' (in case the 'direction' property of the containing block is 'rtl') or 'right' (in case 'direction' is 'ltr') and solve for that value.
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+     160px : top
+  +
+      0px : margin-top
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+gives us:
+
+     160px : top
+  +
+      0px : margin-top
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom
+  +
+  (solve) : bottom
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-089-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-089-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-089-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-089-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'left', 'width' and 'right' are not 'auto' (overconstrained)</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-089.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-089.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-089.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-089.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,112 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'left', 'width' and 'right' are not 'auto' (overconstrained)</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-004-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'left', 'width' and 'right' are not 'auto' (overconstrained), then ignore 'right' and then solve for 'right'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: 2em;
+      margin-left: 0em;
+      margin-right: 0em;
+      position: absolute;
+      right: 2em;
+      width: 1em;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+/*
+"
+If none of the three is 'auto': If both 'margin-left' and 'margin-right' are 'auto', solve the equation under the extra constraint that the two margins get equal values, unless this would make them negative, in which case when direction of the containing block is 'ltr' ('rtl'), set 'margin-left' ('margin-right') to zero and solve for 'margin-right' ('margin-left'). If one of 'margin-left' or 'margin-right' is 'auto', solve the equation for that value. If the values are over-constrained, ignore the value for 'left' (in case the 'direction' property of the containing block is 'rtl') or 'right' (in case 'direction' is 'ltr') and solve for that value.
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+    160px : left
+  +
+      0px : margin-left
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : width
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right
+  +
+    160px : right
+    =====================
+    320px : width of containing block
+
+gives us:
+
+    160px : left
+  +
+      0px : margin-left
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : width
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right
+  +
+  (solve) : right: auto
+    =====================
+    320px : width of containing block
+
+And so computed right value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-091-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-091-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-091-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-091-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top', 'height' and 'bottom' are not 'auto' (overconstrained)</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-091.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-091.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-091.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-091.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,122 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top', 'height' and 'bottom' are not 'auto' (overconstrained)</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-007-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'top', 'height' and 'bottom' are not 'auto' and if the values are overconstrained, then ignore 'bottom' and solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-3row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 2em;
+      color: green;
+      height: 1em;
+      margin-bottom: 0em;
+      margin-top: 0em;
+      position: absolute;
+      top: 2em;
+    }
+
+/*
+"
+If none of the three is 'auto': If both 'margin-left' and 'margin-right' are 'auto', solve the equation under the extra constraint that the two margins get equal values, unless this would make them negative, in which case when direction of the containing block is 'ltr' ('rtl'), set 'margin-left' ('margin-right') to zero and solve for 'margin-right' ('margin-left'). If one of 'margin-left' or 'margin-right' is 'auto', solve the equation for that value. If the values are over-constrained, ignore the value for 'left' (in case the 'direction' property of the containing block is 'rtl') or 'right' (in case 'direction' is 'ltr') and solve for that value.
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+    160px : top
+  +
+      0px : margin-top
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+gives us:
+
+    160px : top
+  +
+      0px : margin-top
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom
+  +
+  (solve) : bottom
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-093-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-093-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-093-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-093-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top', 'height' and 'bottom' are not 'auto' (overconstrained)</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-093.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-093.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-093.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-093.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,118 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top', 'height' and 'bottom' are not 'auto' (overconstrained)</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'top', 'height' and 'bottom' are not 'auto' and if the values are overconstrained, then ignore 'top' and solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 2em;
+      color: green;
+      height: 1em;
+      margin-bottom: 0em;
+      margin-top: 0em;
+      position: absolute;
+      top: 2em;
+    }
+
+/*
+"
+If none of the three is 'auto': If both 'margin-left' and 'margin-right' are 'auto', solve the equation under the extra constraint that the two margins get equal values, unless this would make them negative, in which case when direction of the containing block is 'ltr' ('rtl'), set 'margin-left' ('margin-right') to zero and solve for 'margin-right' ('margin-left'). If one of 'margin-left' or 'margin-right' is 'auto', solve the equation for that value. If the values are over-constrained, ignore the value for 'left' (in case the 'direction' property of the containing block is 'rtl') or 'right' (in case 'direction' is 'ltr') and solve for that value.
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+    160px : top
+  +
+      0px : margin-top
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+gives us:
+
+  (solve) : top
+  +
+      0px : margin-top
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-095-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-095-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-095-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-095-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'left', 'width' and 'right' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-095.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-095.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-095.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-095.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,112 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'left', 'width' and 'right' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'left', 'width' and 'right' are not 'auto' and if the values are overconstrained, then ignore 'left' and then solve for 'left'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: 2em;
+      margin-left: 0em;
+      margin-right: 0em;
+      position: absolute;
+      right: 2em;
+      width: 1em;
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+/*
+"
+If none of the three is 'auto': If both 'margin-left' and 'margin-right' are 'auto', solve the equation under the extra constraint that the two margins get equal values, unless this would make them negative, in which case when direction of the containing block is 'ltr' ('rtl'), set 'margin-left' ('margin-right') to zero and solve for 'margin-right' ('margin-left'). If one of 'margin-left' or 'margin-right' is 'auto', solve the equation for that value. If the values are over-constrained, ignore the value for 'left' (in case the 'direction' property of the containing block is 'rtl') or 'right' (in case 'direction' is 'ltr') and solve for that value.
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+    160px : left
+  +
+      0px : margin-left
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : width
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right
+  +
+    160px : right
+    =====================
+    320px : width of containing block
+
+gives us:
+
+  (solve) : left
+  +
+      0px : margin-left
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : width
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+    160px : right
+    =====================
+    320px : width of containing block
+
+And so computed left value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-097-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-097-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-097-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-097-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top', 'height' and 'bottom' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-097.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-097.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-097.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vlr-097.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,122 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top', 'height' and 'bottom' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-013-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'top', 'height' and 'bottom' are not 'auto' and if the values are overconstrained, then ignore 'top' and solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-lr;
+      -webkit-writing-mode: vertical-lr;
+      writing-mode: tb-lr; /* IE11 */
+      writing-mode: vertical-lr;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 2em;
+      color: green;
+      height: 1em;
+      margin-bottom: 0em;
+      margin-top: 0em;
+      position: absolute;
+      top: 2em;
+    }
+
+/*
+"
+If none of the three is 'auto': If both 'margin-left' and 'margin-right' are 'auto', solve the equation under the extra constraint that the two margins get equal values, unless this would make them negative, in which case when direction of the containing block is 'ltr' ('rtl'), set 'margin-left' ('margin-right') to zero and solve for 'margin-right' ('margin-left'). If one of 'margin-left' or 'margin-right' is 'auto', solve the equation for that value. If the values are over-constrained, ignore the value for 'left' (in case the 'direction' property of the containing block is 'rtl') or 'right' (in case 'direction' is 'ltr') and solve for that value.
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+    160px : top
+  +
+      0px : margin-top
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+gives us:
+
+  (solve) : top
+  +
+      0px : margin-top
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-002-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-002-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-002-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-002-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top', 'height' and 'bottom' are 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-002.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-002.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-002.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-002.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,120 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top', 'height' and 'bottom' are 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-002-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'top', 'height' and 'bottom' are 'auto', then the height becomes shrink-to-fit and then solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-3row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+If all three of 'left', 'width', and 'right' are 'auto': First set any 'auto' values for 'margin-left' and 'margin-right' to 0. Then, if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static position and apply rule number three below; otherwise, set 'right' to the static position and apply rule number one below.
+"
+
+"
+3. 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width is shrink-to-fit . Then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+      0px : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+  (solve) : bottom: auto
+    =====================
+    320px : height of containing block
+
+gives us:
+
+      0px : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+  (solve) : bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 240px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-004-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-004-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-004-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-004-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'left', 'width' and 'right' are 'auto'</title>
+
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-004.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-004.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-004.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-004.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,115 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'left', 'width' and 'right' are 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-004-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'left', 'width' and 'right' are 'auto', then the width becomes shrink-to-fit and then solve for 'right'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: auto;
+      position: absolute;
+      right: auto;
+      width: auto;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+/*
+"
+If all three of 'left', 'width', and 'right' are 'auto': First set any 'auto' values for 'margin-left' and 'margin-right' to 0. Then, if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static position and apply rule number three below; otherwise, set 'right' to the static position and apply rule number one below.
+"
+
+"
+3. 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width is shrink-to-fit . Then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+      0px : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+  (solve) : right: auto
+    =====================
+    320px : width of containing block
+
+gives us:
+
+      0px : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+  (solve) : right: auto
+    =====================
+    320px : width of containing block
+
+And so computed right value must be 240px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-006-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-006-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-006-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-006-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top', 'height' and 'bottom' are 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-006.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-006.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-006.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-006.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,124 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top', 'height' and 'bottom' are 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-006-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'top', 'height' and 'bottom' are 'auto', then the height becomes shrink-to-fit and then solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-3row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+If all three of 'left', 'width', and 'right' are 'auto': First set any 'auto' values for 'margin-left' and 'margin-right' to 0. Then, if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static position and apply rule number three below; otherwise, set 'right' to the static position and apply rule number one below.
+"
+
+"
+3. 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width is shrink-to-fit . Then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+      0px : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+  (solve) : bottom: auto
+    =====================
+    320px : height of containing block
+
+gives us:
+
+      0px : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+  (solve) : bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 240px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-008-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-008-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-008-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-008-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top', 'height' and 'bottom' are 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-008.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-008.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-008.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-008.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,120 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top', 'height' and 'bottom' are 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-004-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'top', 'height' and 'bottom' are 'auto', then the height becomes shrink-to-fit and then solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+If all three of 'left', 'width', and 'right' are 'auto': First set any 'auto' values for 'margin-left' and 'margin-right' to 0. Then, if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static position and apply rule number three below; otherwise, set 'right' to the static position and apply rule number one below.
+"
+
+"
+3. 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width is shrink-to-fit . Then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+      0px : bottom: auto
+    =====================
+    320px : height of containing block
+
+gives us:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+      0px : bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 240px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-010-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-010-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-010-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-010-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'left', 'width' and 'right' are 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-010.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-010.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-010.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-010.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,114 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'left', 'width' and 'right' are 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'left', 'width' and 'right' are 'auto', then the width becomes shrink-to-fit and then solve for 'left'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: auto;
+      position: absolute;
+      right: auto;
+      width: auto;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+/*
+"
+If all three of 'left', 'width', and 'right' are 'auto': First set any 'auto' values for 'margin-left' and 'margin-right' to 0. Then, if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static position and apply rule number three below; otherwise, set 'right' to the static position and apply rule number one below.
+"
+
+"
+1. 'left' and 'width' are 'auto' and 'right' is not 'auto', then the width is shrink-to-fit. Then solve for 'left'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+  (solve) : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+    160px : right: auto
+    =====================
+    320px : width of containing block
+
+gives us:
+
+  (solve) : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+    160px : right: auto
+    =====================
+    320px : width of containing block
+
+And so computed left value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-012-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-012-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-012-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-012-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top', 'height' and 'bottom' are 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-012.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-012.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-012.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-012.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,124 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top', 'height' and 'bottom' are 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="abs-pos-non-replaced-vrl-012-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'top', 'height' and 'bottom' are 'auto', then the height becomes shrink-to-fit and then solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+If all three of 'left', 'width', and 'right' are 'auto': First set any 'auto' values for 'margin-left' and 'margin-right' to 0. Then, if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static position and apply rule number three below; otherwise, set 'right' to the static position and apply rule number one below.
+"
+
+"
+3. 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width is shrink-to-fit . Then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+      0px : bottom: auto
+    =====================
+    320px : height of containing block
+
+gives us:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+      0px : bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 240px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-014-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-014-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-014-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-014-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top', 'height' are 'auto' and bottom is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-014.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-014.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-014.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-014.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,119 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top', 'height' are 'auto' and bottom is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-004-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'top', 'height' are 'auto' and 'bottom' is not 'auto', then the height becomes shrink-to-fit and then solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 2em;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+set 'auto' values for 'margin-left' and 'margin-right' to 0, and pick the one of the following six rules that applies.
+
+1. 'left' and 'width' are 'auto' and 'right' is not 'auto', then the width is shrink-to-fit. Then solve for 'left'
+"
+
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+gives us:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-016-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-016-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-016-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-016-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'left' and 'width' are 'auto' and 'right' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-016.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-016.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-016.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-016.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,110 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'left' and 'width' are 'auto' and 'right' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'left' and 'width' are 'auto' and 'right' is not 'auto', then the width becomes shrink-to-fit and then solve for 'left'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: auto;
+      position: absolute;
+      right: 2em;
+      width: auto;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+/*
+"
+1. 'left' and 'width' are 'auto' and 'right' is not 'auto', then the width is shrink-to-fit. Then solve for 'left'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+  (solve) : left: auto
+  +
+      0px : margin-left
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right
+  +
+    160px : right
+    =====================
+    320px : width of containing block
+
+gives us:
+
+  (solve) : left: auto
+  +
+      0px : margin-left
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right
+  +
+    160px : right
+    =====================
+    320px : width of containing block
+
+And so computed left value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-018-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-018-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-018-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-018-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top' and 'height' are 'auto and 'bottom' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-018.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-018.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-018.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-018.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,122 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top' and 'height' are 'auto and 'bottom' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-012-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'top' and 'height' are 'auto and 'bottom' is not 'auto', then the height becomes shrink-to-fit and then solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 2em;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+set 'auto' values for 'margin-left' and 'margin-right' to 0, and pick the one of the following six rules that applies.
+
+1. 'left' and 'width' are 'auto' and 'right' is not 'auto', then the width is shrink-to-fit. Then solve for 'left'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+gives us:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-020-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-020-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-020-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-020-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top' and 'height' are 'auto and 'bottom' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-020.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-020.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-020.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-020.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,118 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top' and 'height' are 'auto and 'bottom' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-004-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'top' and 'height' are 'auto and 'bottom' is not 'auto', then the height becomes shrink-to-fit and then solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 2em;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+set 'auto' values for 'margin-left' and 'margin-right' to 0, and pick the one of the following six rules that applies.
+
+1. 'left' and 'width' are 'auto' and 'right' is not 'auto', then the width is shrink-to-fit. Then solve for 'left'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+gives us:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-022-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-022-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-022-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-022-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'left' and 'width' are 'auto' and 'right' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-022.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-022.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-022.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-022.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,112 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'left' and 'width' are 'auto' and 'right' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'left' and 'width' are 'auto' and 'right' is not 'auto', then the width becomes shrink-to-fit and then solve for 'left'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: auto;
+      position: absolute;
+      right: 2em;
+      width: auto;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+/*
+"
+set 'auto' values for 'margin-left' and 'margin-right' to 0, and pick the one of the following six rules that applies.
+
+1. 'left' and 'width' are 'auto' and 'right' is not 'auto', then the width is shrink-to-fit. Then solve for 'left'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+  (solve) : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+     160px : right
+    =====================
+    320px : width of containing block
+
+gives us:
+
+  (solve) : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+     160px : right
+    =====================
+    320px : width of containing block
+
+And so computed left value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-024-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-024-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-024-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-024-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top' and 'height' are 'auto' and 'bottom' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-024.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-024.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-024.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-024.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,122 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top' and 'height' are 'auto' and 'bottom' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-012-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'top' and 'height' are 'auto' and 'bottom' is not 'auto', then the height becomes shrink-to-fit and then solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 2em;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+set 'auto' values for 'margin-left' and 'margin-right' to 0, and pick the one of the following six rules that applies.
+
+1. 'left' and 'width' are 'auto' and 'right' is not 'auto', then the width is shrink-to-fit. Then solve for 'left'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+gives us:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-026-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-026-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-026-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-026-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top' and 'bottom are 'auto' and 'height' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-026.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-026.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-026.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-026.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,116 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top' and 'bottom are 'auto' and 'height' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-002-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'top' and 'bottom are 'auto' and 'height' is not 'auto', then set 'top' to static position and solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-3row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: 1em;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+2. 'left' and 'right' are 'auto' and 'width' is not 'auto', then if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static position, otherwise set 'right' to the static position. Then solve for 'left' (if 'direction is 'rtl') or 'right' (if 'direction' is 'ltr').
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+    160px : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+  (solve) : bottom: auto
+    =====================
+    320px : height of containing block
+
+gives us:
+
+    160px : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+  (solve) : bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-028-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-028-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-028-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-028-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'left' and 'right' are 'auto' and 'width' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-028.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-028.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-028.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-028.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,110 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'left' and 'right' are 'auto' and 'width' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-004-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'left' and 'right' are 'auto' and 'width' is not 'auto', then set 'left' to the static position and then solve for 'right'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: auto;
+      position: absolute;
+      right: auto;
+      width: 1em;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+/*
+"
+2. 'left' and 'right' are 'auto' and 'width' is not 'auto', then if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static position, otherwise set 'right' to the static position. Then solve for 'left' (if 'direction is 'rtl') or 'right' (if 'direction' is 'ltr').
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+    160px : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : width
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+    (solve): right: auto
+    =====================
+    320px : width of containing block
+
+gives us:
+
+    160px : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : width
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+    (solve): right: auto
+    =====================
+    320px : width of containing block
+
+And so computed right value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-030-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-030-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-030-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-030-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top' and 'bottom are 'auto' and 'height' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-030.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-030.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-030.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-030.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,120 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top' and 'bottom are 'auto' and 'height' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-006-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'top' and 'bottom are 'auto' and 'height' is not 'auto', then set 'top' to static position and solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-3row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: 1em;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+2. 'left' and 'right' are 'auto' and 'width' is not 'auto', then if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static position, otherwise set 'right' to the static position. Then solve for 'left' (if 'direction is 'rtl') or 'right' (if 'direction' is 'ltr').
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+    160px : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    (solve): bottom: auto
+    =====================
+    320px : height of containing block
+
+gives us:
+
+    160px : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    (solve): bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-032-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-032-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-032-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-032-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top' and 'bottom' are 'auto and 'height' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-032.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-032.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-032.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-032.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,116 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top' and 'bottom' are 'auto and 'height' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-004-ref.xht-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'top' and 'bottom' are 'auto' and 'height' is not 'auto', then set 'bottom' to static position and solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: 1em;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+2. 'left' and 'right' are 'auto' and 'width' is not 'auto', then if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static position, otherwise set 'right' to the static position. Then solve for 'left' (if 'direction is 'rtl') or 'right' (if 'direction' is 'ltr').
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    160px : bottom: auto
+    =====================
+    320px : height of containing block
+
+gives us:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    160px : bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-034-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-034-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-034-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-034-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'left' and 'right' are 'auto' and 'width' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-034.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-034.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-034.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-034.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,110 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'left' and 'right' are 'auto' and 'width' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'left' and 'right' are 'auto' and 'width' is not 'auto', then set 'right' to the static position and then solve for 'left'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: auto;
+      position: absolute;
+      right: auto;
+      width: 1em;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+/*
+"
+2. 'left' and 'right' are 'auto' and 'width' is not 'auto', then if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static position, otherwise set 'right' to the static position. Then solve for 'left' (if 'direction is 'rtl') or 'right' (if 'direction' is 'ltr').
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+  (solve) : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : width
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+    160px : right: auto
+    =====================
+    320px : width of containing block
+
+gives us:
+
+  (solve) : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : width
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+    160px : right: auto
+    =====================
+    320px : width of containing block
+
+And so computed left value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-036-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-036-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-036-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-036-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top' and 'bottom' are 'auto' and 'height' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-036.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-036.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-036.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-036.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,120 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top' and 'bottom' are 'auto' and 'height' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-012-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'top' and 'bottom' are 'auto' and 'height' is not 'auto', then set 'bottom' to static position and then solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: 1em;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+2. 'left' and 'right' are 'auto' and 'width' is not 'auto', then if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static position, otherwise set 'right' to the static position. Then solve for 'left' (if 'direction is 'rtl') or 'right' (if 'direction' is 'ltr').
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+gives us:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-038-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-038-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-038-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-038-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'height' and 'bottom' are 'auto' and 'top' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-038.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-038.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-038.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-038.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,117 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'height' and 'bottom' are 'auto' and 'top' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-004-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'height' and 'bottom' are 'auto' and 'top' is not 'auto', then the height becomes shrink-to-fit and then solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: 1em;
+    }
+
+/*
+
+"
+3. 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width is shrink-to-fit . Then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+     80px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+   (solve): bottom: auto
+    =====================
+    320px : height of containing block
+
+gives us:
+
+     80px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+   (solve): bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-040-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-040-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-040-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-040-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'width' and 'right' are 'auto' and 'left' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-040.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-040.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-040.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-040.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,111 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'width' and 'right' are 'auto' and 'left' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width becomes shrink-to-fit and then solve for 'right'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: 1em;
+      position: absolute;
+      right: auto;
+      width: auto;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+/*
+
+"
+3. 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width is shrink-to-fit . Then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+     80px : left
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+   (solve): right: auto
+    =====================
+    320px : width of containing block
+
+gives us:
+
+     80px : left
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+   (solve): right: auto
+    =====================
+    320px : width of containing block
+
+And so computed right value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-042-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-042-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-042-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-042-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'height' and 'bottom' are 'auto' and 'top' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-042.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-042.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-042.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-042.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,121 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'height' and 'bottom' are 'auto' and 'top' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-012-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'height' and 'bottom' are 'auto' and 'top' is not 'auto', then the height becomes shrink-to-fit and then solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: 1em;
+    }
+
+/*
+
+"
+3. 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width is shrink-to-fit . Then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+     80px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+   (solve): bottom: auto
+    =====================
+    320px : height of containing block
+
+gives us:
+
+     80px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+   (solve): bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-044-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-044-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-044-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-044-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'height' and 'bottom' are 'auto' and 'top' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-044.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-044.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-044.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-044.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,117 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'height' and 'bottom' are 'auto' and 'top' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-004-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'top', 'height' and 'bottom' are 'auto' and 'top' is not 'auto', then the height becomes shrink-to-fit and then solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: 1em;
+    }
+
+/*
+
+"
+3. 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width is shrink-to-fit . Then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+     80px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+   (solve): bottom: auto
+    =====================
+    320px : height of containing block
+
+gives us:
+
+     80px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+   (solve): bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-046-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-046-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-046-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-046-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'width' and 'right' are 'auto' and 'left' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-046.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-046.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-046.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-046.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,111 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'width' and 'right' are 'auto' and 'left' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width becomes shrink-to-fit and then solve for 'right'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: 1em;
+      position: absolute;
+      right: auto;
+      width: auto;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+/*
+
+"
+3. 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width is shrink-to-fit . Then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+     80px : left
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+   (solve): right: auto
+    =====================
+    320px : width of containing block
+
+gives us:
+
+     80px : left
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+   (solve): right: auto
+    =====================
+    320px : width of containing block
+
+And so computed right value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-048-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-048-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-048-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-048-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'height' and 'bottom' are 'auto' and 'top' is not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-048.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-048.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-048.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-048.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,121 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'height' and 'bottom' are 'auto' and 'top' is not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-012-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'height' and 'bottom' are 'auto' and 'top' is not 'auto', then the height becomes shrink-to-fit and then solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: 1em;
+    }
+
+/*
+
+"
+3. 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width is shrink-to-fit . Then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+      80px: top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+    (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+  (solve) : bottom: auto
+    =====================
+    320px : height of containing block
+
+gives us:
+
+      80px: top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : (shrink-to-fit) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+  (solve) : bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-050-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-050-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-050-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-050-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top' is 'auto' and 'height' and 'bottom' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-050.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-050.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-050.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-050.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,95 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top' is 'auto' and 'height' and 'bottom' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-002-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'top' is 'auto' and 'height' and 'bottom' are not 'auto', then solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-3row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 1em;
+      color: green;
+      height: 1em;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+
+"
+4. 'left' is 'auto', 'width' and 'right' are not 'auto', then solve for 'left'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+     80px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-052-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-052-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-052-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-052-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'left' is 'auto', 'width' and 'right' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-052.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-052.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-052.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-052.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,88 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'left' is 'auto', 'width' and 'right' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-004-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'left' is 'auto', 'width' and 'right' are not 'auto', then solve for 'left'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: auto;
+      position: absolute;
+      right: 1em;
+      width: 1em;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+/*
+"
+4. 'left' is 'auto', 'width' and 'right' are not 'auto', then solve for 'left'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+  (solve) : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+     80px : right
+    =====================
+    320px : width of containing block
+
+And so computed left value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-054-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-054-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-054-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-054-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top' is 'auto' and 'height' and 'bottom' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-054.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-054.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-054.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-054.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,98 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top' is 'auto' and 'height' and 'bottom' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-006-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'top' is 'auto' and 'height' and 'bottom' are not 'auto', then then solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-3row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 1em;
+      color: green;
+      height: 1em;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+4. 'left' is 'auto', 'width' and 'right' are not 'auto', then solve for 'left'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+     80px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-056-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-056-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-056-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-056-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top' is 'auto' and 'height' and 'bottom' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-056.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-056.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-056.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-056.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,94 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top' is 'auto' and 'height' and 'bottom' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-002-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'top' is 'auto' and 'height' and 'bottom' are not 'auto', then solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-3row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 1em;
+      color: green;
+      height: 1em;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+4. 'left' is 'auto', 'width' and 'right' are not 'auto', then solve for 'left'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+     80px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-058-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-058-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-058-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-058-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'left' is 'auto', 'width' and 'right' are not 'auto', then solve for 'left'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-058.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-058.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-058.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-058.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,88 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'left' is 'auto', 'width' and 'right' are not 'auto', then solve for 'left'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-004-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'left' is 'auto', 'width' and 'right' are not 'auto', then solve for 'left', then solve for 'left'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: auto;
+      position: absolute;
+      right: 1em;
+      width: 1em;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+/*
+"
+4.'left' is 'auto', 'width' and 'right' are not 'auto', then solve for 'left'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+  (solve) : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : width
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+     80px : right
+    =====================
+    320px : width of containing block
+
+And so computed left value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-060-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-060-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-060-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-060-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top' is 'auto' and 'height' and 'bottom' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-060.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-060.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-060.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-060.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,98 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top' is 'auto' and 'height' and 'bottom' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-006-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'top' is 'auto' and 'height' and 'bottom' are not 'auto', then solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-3row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 1em;
+      color: green;
+      height: 1em;
+      position: absolute;
+      top: auto;
+    }
+
+/*
+"
+4. 'left' is 'auto', 'width' and 'right' are not 'auto', then solve for 'left'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+  (solve) : top: auto
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+     80px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-062-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-062-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-062-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-062-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'height' is 'auto' and 'top' and 'bottom' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-062.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-062.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-062.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-062.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,94 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'height' is 'auto' and 'top' and 'bottom' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-002-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'height' is 'auto' and 'top' and 'bottom' are not 'auto', then then solve for 'height'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-3row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 1em;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: 2em;
+    }
+
+/*
+"
+5. 'width' is 'auto', 'left' and 'right' are not 'auto', then solve for 'width'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+    160px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+  (solve) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+     80px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed height value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-064-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-064-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-064-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-064-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and  'width' is 'auto', 'left' and 'right' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-064.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-064.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-064.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-064.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,88 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and  'width' is 'auto', 'left' and 'right' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-004-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'left', 'width' is 'auto', 'left' and 'right' are not 'auto', then solve for 'width'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: 2em;
+      position: absolute;
+      right: 1em;
+      width: auto;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+/*
+"
+5. 'width' is 'auto', 'left' and 'right' are not 'auto', then solve for 'width'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+    160px : left: auto
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+  (solve) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+     80px : right: auto
+    =====================
+    320px : width of containing block
+
+And so computed width value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-066-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-066-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-066-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-066-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'height' is 'auto' and 'top' and 'bottom' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-066.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-066.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-066.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-066.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,98 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'height' is 'auto' and 'top' and 'bottom' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-006-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'height' is 'auto' and 'top' and 'bottom' are not 'auto', then solve for 'height'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-3row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 1em;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: 2em;
+    }
+
+/*
+"
+5. 'width' is 'auto', 'left' and 'right' are not 'auto', then solve for 'width'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+    160px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+  (solve) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+     80px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed height value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-068-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-068-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-068-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-068-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'height' is 'auto' and 'top' and 'bottom' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-068.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-068.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-068.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-068.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,94 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'height' is 'auto' and 'top' and 'bottom' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-002-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'height' is 'auto' and 'top' and 'bottom' are not 'auto', then solve for 'height'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-3row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 1em;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: 2em;
+    }
+
+/*
+"
+5. 'width' is 'auto', 'left' and 'right' are not 'auto', then solve for 'width'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+    160px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+  (solve) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+     80px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed height value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-070-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-070-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-070-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-070-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'width' is 'auto', 'left' and 'right' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-070.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-070.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-070.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-070.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,88 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'width' is 'auto', 'left' and 'right' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-004-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'width' is 'auto', 'left' and 'right' are not 'auto', then solve for 'width'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: 2em;
+      position: absolute;
+      right: 1em;
+      width: auto;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+/*
+"
+5. 'width' is 'auto', 'left' and 'right' are not 'auto', then solve for 'width'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+    160px : left
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+  (solve) : width: auto
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+     80px : right
+    =====================
+    320px : width of containing block
+
+And so computed width value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-072-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-072-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-072-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-072-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'height' is 'auto' and 'top' and 'bottom' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-072.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-072.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-072.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-072.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,98 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'height' is 'auto' and 'top' and 'bottom' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-006-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'height' is 'auto' and 'top' and 'bottom' are not 'auto', then then solve for 'height'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-3row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 1em;
+      color: green;
+      height: auto;
+      position: absolute;
+      top: 2em;
+    }
+
+/*
+"
+5. 'width' is 'auto', 'left' and 'right' are not 'auto', then solve for 'width'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+    160px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+  (solve) : height: auto
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+     80px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed height value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-074-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-074-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-074-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-074-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'bottom' is 'auto' and 'top' and 'height' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-074.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-074.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-074.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-074.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,94 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'bottom' is 'auto' and 'top' and 'height' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-004-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'bottom' is 'auto' and 'top' and 'height' are not 'auto', then solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: 1em;
+      position: absolute;
+      top: 1em;
+    }
+
+/*
+"
+6. 'right' is 'auto', 'left' and 'width' are not 'auto', then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+     80px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+  (solve) : bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-076-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-076-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-076-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-076-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'right' is 'auto', 'left' and 'width' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-076.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-076.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-076.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-076.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,88 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'right' is 'auto', 'left' and 'width' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'right' is 'auto', 'left' and 'width' are not 'auto', then solve for 'right'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: 1em;
+      position: absolute;
+      right: auto;
+      width: 1em;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+/*
+"
+6. 'right' is 'auto', 'left' and 'width' are not 'auto', then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+     80px : left
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : width
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+  (solve) : right: auto
+    =====================
+    320px : width of containing block
+
+And so computed right value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-078-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-078-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-078-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-078-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'bottom' is 'auto' and 'top' and 'height' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-078.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-078.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-078.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-078.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,98 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'bottom' is 'auto' and 'top' and 'height' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-012-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'bottom' is 'auto' and 'top' and 'height' are not 'auto', then solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: 1em;
+      position: absolute;
+      top: 1em;
+    }
+
+/*
+"
+6. 'right' is 'auto', 'left' and 'width' are not 'auto', then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+     80px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+  (solve) : bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-080-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-080-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-080-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-080-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'bottom' is 'auto' and 'top' and 'height' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-080.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-080.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-080.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-080.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,94 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'bottom' is 'auto' and 'top' and 'height' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-004-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'bottom' is 'auto' and 'top' and 'height' are not 'auto', then solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: 1em;
+      position: absolute;
+      top: 1em;
+    }
+
+/*
+"
+6. 'right' is 'auto', 'left' and 'width' are not 'auto', then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+     80px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+  (solve) : bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-082-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-082-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-082-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-082-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'right' is 'auto', 'left' and 'width' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-082.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-082.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-082.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-082.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,88 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'right' is 'auto', 'left' and 'width' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'right' is 'auto', 'left' and 'width' are not 'auto', then solve for 'right'" />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: 1em;
+      position: absolute;
+      right: auto;
+      width: 1em;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+/*
+"
+6. 'right' is 'auto', 'left' and 'width' are not 'auto', then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+     80px : left
+  +
+      0px : margin-left: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : width
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+  (solve) : right: auto
+    =====================
+    320px : width of containing block
+
+And so computed right value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-084-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-084-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-084-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-084-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'bottom' is 'auto' and 'top' and 'height' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-084.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-084.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-084.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-084.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,98 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'bottom' is 'auto' and 'top' and 'height' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-012-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'bottom' is 'auto' and 'top' and 'height' are not 'auto', then solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: auto;
+      color: green;
+      height: 1em;
+      position: absolute;
+      top: 1em;
+    }
+
+/*
+"
+6. 'right' is 'auto', 'left' and 'width' are not 'auto', then solve for 'right'
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+     80px : top
+  +
+      0px : margin-top: auto
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom: auto
+  +
+  (solve) : bottom: auto
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 160px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-086-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-086-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-086-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-086-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top', 'height' and 'bottom' are not 'auto' (overconstrained)</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-086.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-086.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-086.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-086.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,118 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top', 'height' and 'bottom' are not 'auto' (overconstrained)</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-002-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'top', 'height' and 'bottom' are not 'auto' and if the values are overconstrained, then ignore 'bottom' and solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-3row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 2em;
+      color: green;
+      height: 1em;
+      margin-bottom: 0em;
+      margin-top: 0em;
+      position: absolute;
+      top: 2em;
+    }
+
+/*
+"
+If none of the three is 'auto': If both 'margin-left' and 'margin-right' are 'auto', solve the equation under the extra constraint that the two margins get equal values, unless this would make them negative, in which case when direction of the containing block is 'ltr' ('rtl'), set 'margin-left' ('margin-right') to zero and solve for 'margin-right' ('margin-left'). If one of 'margin-left' or 'margin-right' is 'auto', solve the equation for that value. If the values are over-constrained, ignore the value for 'left' (in case the 'direction' property of the containing block is 'rtl') or 'right' (in case 'direction' is 'ltr') and solve for that value.
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+    160px : top
+  +
+      0px : margin-top
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+gives us:
+
+    160px : top
+  +
+      0px : margin-top
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom
+  +
+  (solve) : bottom
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-088-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-088-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-088-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-088-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'left', 'width' and 'right' are not 'auto' (overconstrained)</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-088.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-088.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-088.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-088.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,112 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'left', 'width' and 'right' are not 'auto' (overconstrained)</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-004-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'left', 'width' and 'right' are not 'auto' (overconstrained), then ignore 'right' and then solve for 'right'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: 2em;
+      margin-left: 0em;
+      margin-right: 0em;
+      position: absolute;
+      right: 2em;
+      width: 1em;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+/*
+"
+If none of the three is 'auto': If both 'margin-left' and 'margin-right' are 'auto', solve the equation under the extra constraint that the two margins get equal values, unless this would make them negative, in which case when direction of the containing block is 'ltr' ('rtl'), set 'margin-left' ('margin-right') to zero and solve for 'margin-right' ('margin-left'). If one of 'margin-left' or 'margin-right' is 'auto', solve the equation for that value. If the values are over-constrained, ignore the value for 'left' (in case the 'direction' property of the containing block is 'rtl') or 'right' (in case 'direction' is 'ltr') and solve for that value.
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+    160px : left
+  +
+      0px : margin-left
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : width
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right
+  +
+    160px : right
+    =====================
+    320px : width of containing block
+
+gives us:
+
+    160px : left
+  +
+      0px : margin-left
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : width
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right
+  +
+  (solve) : right: auto
+    =====================
+    320px : width of containing block
+
+And so computed right value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-090-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-090-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-090-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-090-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top', 'height' and 'bottom' are not 'auto' (overconstrained)</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 2em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-090.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-090.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-090.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-090.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,122 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: ltr' and 'top', 'height' and 'bottom' are not 'auto' (overconstrained)</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-006-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'ltr' and 'top', 'height' and 'bottom' are not 'auto' and if the values are overconstrained, then ignore 'bottom' and solve for 'bottom'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-3row-320x320.png");
+      color: transparent;
+      direction: ltr;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 2em;
+      color: green;
+      height: 1em;
+      margin-bottom: 0em;
+      margin-top: 0em;
+      position: absolute;
+      top: 2em;
+    }
+
+/*
+"
+If none of the three is 'auto': If both 'margin-left' and 'margin-right' are 'auto', solve the equation under the extra constraint that the two margins get equal values, unless this would make them negative, in which case when direction of the containing block is 'ltr' ('rtl'), set 'margin-left' ('margin-right') to zero and solve for 'margin-right' ('margin-left'). If one of 'margin-left' or 'margin-right' is 'auto', solve the equation for that value. If the values are over-constrained, ignore the value for 'left' (in case the 'direction' property of the containing block is 'rtl') or 'right' (in case 'direction' is 'ltr') and solve for that value.
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+    160px : top
+  +
+      0px : margin-top
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+gives us:
+
+    160px : top
+  +
+      0px : margin-top
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom
+  +
+  (solve) : bottom
+    =====================
+    320px : height of containing block
+
+And so computed bottom value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-092-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-092-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-092-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-092-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top', 'height' and 'bottom' are not 'auto' (overconstrained)</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-092.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-092.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-092.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-092.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,118 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top', 'height' and 'bottom' are not 'auto' (overconstrained)</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-004-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'top', 'height' and 'bottom' are not 'auto' and if the values are overconstrained, then ignore 'top' and solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 2em;
+      color: green;
+      height: 1em;
+      margin-bottom: 0em;
+      margin-top: 0em;
+      position: absolute;
+      top: 2em;
+    }
+
+/*
+"
+If none of the three is 'auto': If both 'margin-left' and 'margin-right' are 'auto', solve the equation under the extra constraint that the two margins get equal values, unless this would make them negative, in which case when direction of the containing block is 'ltr' ('rtl'), set 'margin-left' ('margin-right') to zero and solve for 'margin-right' ('margin-left'). If one of 'margin-left' or 'margin-right' is 'auto', solve the equation for that value. If the values are over-constrained, ignore the value for 'left' (in case the 'direction' property of the containing block is 'rtl') or 'right' (in case 'direction' is 'ltr') and solve for that value.
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+    160px : top
+  +
+      0px : margin-top
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+gives us:
+
+  (solve) : top
+  +
+      0px : margin-top
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-094-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-094-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-094-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-094-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'left', 'width' and 'right' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 1em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-094.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-094.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-094.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-094.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,112 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'left', 'width' and 'right' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vlr-009-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'left', 'width' and 'right' are not 'auto' and if the values are overconstrained, then ignore 'left' and then solve for 'left'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  div#containing-block
+    {
+      background: red url("support/bg-red-2col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      left: 2em;
+      margin-left: 0em;
+      margin-right: 0em;
+      position: absolute;
+      right: 2em;
+      width: 1em;
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+/*
+"
+If none of the three is 'auto': If both 'margin-left' and 'margin-right' are 'auto', solve the equation under the extra constraint that the two margins get equal values, unless this would make them negative, in which case when direction of the containing block is 'ltr' ('rtl'), set 'margin-left' ('margin-right') to zero and solve for 'margin-right' ('margin-left'). If one of 'margin-left' or 'margin-right' is 'auto', solve the equation for that value. If the values are over-constrained, ignore the value for 'left' (in case the 'direction' property of the containing block is 'rtl') or 'right' (in case 'direction' is 'ltr') and solve for that value.
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+So:
+
+    160px : left
+  +
+      0px : margin-left
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : width
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right
+  +
+    160px : right
+    =====================
+    320px : width of containing block
+
+gives us:
+
+  (solve) : left
+  +
+      0px : margin-left
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : width
+  +
+      0px : padding-right
+  +
+      0px : border-right-width
+  +
+      0px : margin-right: auto
+  +
+    160px : right
+    =====================
+    320px : width of containing block
+
+And so computed left value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-096-ref.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-096-ref.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-096-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-096-ref.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top', 'height' and 'bottom' are not 'auto'</title>
+
+
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      -ah-writing-mode: initial;
+      -webkit-writing-mode: initial;
+      writing-mode: initial;
+      direction: ltr;
+      color: transparent;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      color: green;
+      position: absolute;
+      left: 2em; top: 1em;
+    }
+
+
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-096.xht firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-096.xht
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-096.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/s71-abs-pos-non-replaced-vrl-096.xht	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,122 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: absolutely positioned non-replaced element - 'direction: rtl' and 'top', 'height' and 'bottom' are not 'auto'</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width" title="10.3.7 Absolutely positioned, non-replaced elements" />
+  <link rel="match" href="s71-abs-pos-non-replaced-vrl-012-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="When 'direction' is 'rtl' and 'top', 'height' and 'bottom' are not 'auto' and if the values are overconstrained, then ignore 'top' and solve for 'top'." />
+
+  <link type="text/css" rel="stylesheet" href="support/ahem.css" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      -ah-writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      writing-mode: tb-rl; /* IE11 */
+      writing-mode: vertical-rl;
+    }
+
+  div#containing-block
+    {
+      background: red url("support/bg-red-3col-2row-320x320.png");
+      color: transparent;
+      direction: rtl;
+      font: 80px/1 Ahem;
+      height: 320px;
+      position: relative;
+      width: 320px;
+    }
+
+  div#containing-block > span
+    {
+      background-color: red;
+      bottom: 2em;
+      color: green;
+      height: 1em;
+      margin-bottom: 0em;
+      margin-top: 0em;
+      position: absolute;
+      top: 2em;
+    }
+
+/*
+"
+If none of the three is 'auto': If both 'margin-left' and 'margin-right' are 'auto', solve the equation under the extra constraint that the two margins get equal values, unless this would make them negative, in which case when direction of the containing block is 'ltr' ('rtl'), set 'margin-left' ('margin-right') to zero and solve for 'margin-right' ('margin-left'). If one of 'margin-left' or 'margin-right' is 'auto', solve the equation for that value. If the values are over-constrained, ignore the value for 'left' (in case the 'direction' property of the containing block is 'rtl') or 'right' (in case 'direction' is 'ltr') and solve for that value.
+"
+
+'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right' = width of containing block
+
+"
+Layout rules that refer to the *-left and *-right box properties (border, margin, padding) use *-top and *-bottom instead, and vice versa. Which side of the box the property applies to doesn't change: only which values are inputs to which layout calculations changes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+So:
+
+    160px : top
+  +
+      0px : margin-top
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+gives us:
+
+  (solve) : top
+  +
+      0px : margin-top
+  +
+      0px : border-top-width
+  +
+      0px : padding-top
+  +
+     80px : height
+  +
+      0px : padding-bottom
+  +
+      0px : border-bottom-width
+  +
+      0px : margin-bottom
+  +
+    160px : bottom
+    =====================
+    320px : height of containing block
+
+And so computed top value must be 80px;
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+
+  <div id="containing-block">1 2 34<span>X</span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/support/ahem.css firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/support/ahem.css
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/support/ahem.css	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/support/ahem.css	2015-05-25 20:43:07.000000000 +0000
@@ -0,0 +1,4 @@
+@font-face {
+  font-family: Ahem;
+  src: url("Ahem.ttf");
+}
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/support/Ahem.ttf and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/support/Ahem.ttf differ
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/support/bg-red-2col-2row-320x320.png and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/support/bg-red-2col-2row-320x320.png differ
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/support/bg-red-2col-3row-320x320.png and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/support/bg-red-2col-3row-320x320.png differ
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/support/bg-red-3col-2row-320x320.png and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/support/bg-red-3col-2row-320x320.png differ
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/support/bg-red-3col-3row-320x320.png and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/support/bg-red-3col-3row-320x320.png differ
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/abspos/support/pass-cdts-abs-pos-non-replaced.png and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/abspos/support/pass-cdts-abs-pos-non-replaced.png differ
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/reftest.list firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/reftest.list
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/reftests/writing-mode/reftest.list	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/reftests/writing-mode/reftest.list	2015-05-25 20:43:07.000000000 +0000
@@ -133,3 +133,6 @@
 == 1157752-upright-bidi.html 1157752-upright-bidi-ref.html
 == 1157758-1-vertical-arabic.html 1157758-1-vertical-arabic-ref.html
 == 1158549-1-vertical-block-size-constraints.html 1158549-1-vertical-block-size-constraints-ref.html
+
+# Suite of tests from Gérard Talbot in bug 1079151
+include abspos/reftest.list
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/crashtests/1161320-1.html firefox-trunk-41.0~a1~hg20150524r245419/layout/style/crashtests/1161320-1.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/crashtests/1161320-1.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/crashtests/1161320-1.html	2015-05-25 20:43:08.000000000 +0000
@@ -0,0 +1,25 @@
+<!doctype html>
+<html class="reftest-wait">
+<head>
+<meta charset=utf-8>
+<style>
+@keyframes a { }
+body {
+  animation-name: a;
+}
+</style>
+
+<script>
+function boom()
+{
+  var body = document.body;
+  body.style.animationPlayState = 'paused';
+  window.getComputedStyle(body).animationPlayState;
+  body.style.animationPlayState = 'running';
+  document.documentElement.removeAttribute("class");
+}
+</script>
+</head>
+
+<body onload="setTimeout(boom, 100);"></body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/crashtests/1161320-2.html firefox-trunk-41.0~a1~hg20150524r245419/layout/style/crashtests/1161320-2.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/crashtests/1161320-2.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/crashtests/1161320-2.html	2015-05-25 20:43:08.000000000 +0000
@@ -0,0 +1,25 @@
+<!doctype html>
+<html class="reftest-wait">
+<head>
+<meta charset=utf-8>
+<style>
+@keyframes a { }
+body {
+  animation: a 100s;
+}
+</style>
+
+<script>
+function boom()
+{
+  var anim = document.body.getAnimations()[0];
+  anim.finish();
+  anim.pause();
+  anim.play();
+  document.documentElement.removeAttribute("class");
+}
+</script>
+</head>
+
+<body onload="setTimeout(boom, 100);"></body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/crashtests/1164813-1.html firefox-trunk-41.0~a1~hg20150524r245419/layout/style/crashtests/1164813-1.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/crashtests/1164813-1.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/crashtests/1164813-1.html	2015-05-25 20:43:08.000000000 +0000
@@ -0,0 +1,33 @@
+<!doctype html>
+<html class="reftest-wait">
+<style>
+#parent.hidden {
+  display: none;
+}
+.icon {
+  opacity: 0;
+  transition: opacity 0.5s;
+}
+.icon.shrink {
+  animation: shrink 1s;
+}
+@keyframes shrink {
+  to { transform: scale(0); }
+}
+</style>
+<div id="parent">
+  <div class="icon">Searching</div>
+</div>
+<script>
+var icon = document.querySelector('.icon');
+getComputedStyle(icon).opacity;
+icon.style.opacity = 1;
+icon.classList.add('shrink');
+setTimeout(function() {
+  document.getElementById('parent').classList.add('hidden');
+  setTimeout(function() {
+    document.documentElement.removeAttribute('class');
+  }, 500);
+}, 500);
+</script>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/crashtests/crashtests.list firefox-trunk-41.0~a1~hg20150524r245419/layout/style/crashtests/crashtests.list
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/crashtests/crashtests.list	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/crashtests/crashtests.list	2015-05-25 20:43:08.000000000 +0000
@@ -113,7 +113,10 @@
 pref(dom.webcomponents.enabled,true) load 1089463-1.html
 pref(layout.css.expensive-style-struct-assertions.enabled,true) load 1136010-1.html
 load 1153693-1.html
+load 1161320-1.html
+pref(dom.animations-api.core.enabled,true) load 1161320-2.html
 load 1161366-1.html
 load 1163446-1.html
+load 1164813-1.html
 load large_border_image_width.html
 load border-image-visited-link.html
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/Declaration.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/style/Declaration.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/Declaration.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/Declaration.cpp	2015-05-25 20:43:07.000000000 +0000
@@ -1040,10 +1040,10 @@
 
         } else if (unit == eCSSUnit_List || unit == eCSSUnit_ListDep) {
           // Non-empty <line-names>
-          aValue.Append('(');
+          aValue.Append('[');
           rowsItem->mValue.AppendToString(eCSSProperty_grid_template_rows,
                                           aValue, aSerialization);
-          aValue.Append(')');
+          aValue.Append(']');
 
         } else {
           nsStyleUtil::AppendEscapedCSSString(areas->mTemplates[row++], aValue);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/FontFaceSet.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/style/FontFaceSet.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/FontFaceSet.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/FontFaceSet.cpp	2015-05-25 20:43:07.000000000 +0000
@@ -6,7 +6,7 @@
 
 #include "FontFaceSet.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "mozilla/css/Loader.h"
 #include "mozilla/dom/CSSFontFaceLoadEvent.h"
@@ -36,7 +36,7 @@
 using namespace mozilla;
 using namespace mozilla::dom;
 
-#define LOG(args) PR_LOG(gfxUserFontSet::GetUserFontsLog(), PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gfxUserFontSet::GetUserFontsLog(), PR_LOG_DEBUG, args)
 #define LOG_ENABLED() PR_LOG_TEST(gfxUserFontSet::GetUserFontsLog(), \
                                   PR_LOG_DEBUG)
 
@@ -136,15 +136,22 @@
 void
 FontFaceSet::Disconnect()
 {
-  if (mDocument) {
-    mDocument->RemoveSystemEventListener(NS_LITERAL_STRING("DOMContentLoaded"),
-                                         this, false);
+  RemoveDOMContentLoadedListener();
+
+  if (mDocument && mDocument->CSSLoader()) {
     // We're null checking CSSLoader() since FontFaceSet::Disconnect() might be
     // being called during unlink, at which time the loader amy already have
     // been unlinked from the document.
-    if (mDocument->CSSLoader()) {
-      mDocument->CSSLoader()->RemoveObserver(this);
-    }
+    mDocument->CSSLoader()->RemoveObserver(this);
+  }
+}
+
+void
+FontFaceSet::RemoveDOMContentLoadedListener()
+{
+  if (mDocument) {
+    mDocument->RemoveSystemEventListener(NS_LITERAL_STRING("DOMContentLoaded"),
+                                         this, false);
   }
 }
 
@@ -275,7 +282,7 @@
 }
 
 bool
-FontFaceSet::Delete(FontFace& aFontFace, ErrorResult& aRv)
+FontFaceSet::Delete(FontFace& aFontFace)
 {
   mPresContext->FlushUserFontSet();
 
@@ -1557,7 +1564,7 @@
     return NS_ERROR_FAILURE;
   }
 
-  Disconnect();
+  RemoveDOMContentLoadedListener();
   CheckLoadingFinished();
 
   return NS_OK;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/FontFaceSet.h firefox-trunk-41.0~a1~hg20150524r245419/layout/style/FontFaceSet.h
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/FontFaceSet.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/FontFaceSet.h	2015-05-25 20:43:07.000000000 +0000
@@ -175,7 +175,7 @@
 
   FontFaceSet* Add(FontFace& aFontFace, mozilla::ErrorResult& aRv);
   void Clear();
-  bool Delete(FontFace& aFontFace, mozilla::ErrorResult& aRv);
+  bool Delete(FontFace& aFontFace);
   bool Has(FontFace& aFontFace);
   uint32_t Size();
   mozilla::dom::FontFaceSetIterator* Entries();
@@ -197,6 +197,8 @@
    */
   void Disconnect();
 
+  void RemoveDOMContentLoadedListener();
+
   /**
    * Returns whether there might be any pending font loads, which should cause
    * the mReady Promise not to be resolved yet.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/Loader.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/style/Loader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/Loader.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/Loader.cpp	2015-05-25 20:43:08.000000000 +0000
@@ -253,7 +253,7 @@
   void FireLoadEvent(nsIThreadInternal* aThread);
 };
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 static PRLogModuleInfo *
 GetLoaderLog()
@@ -264,10 +264,10 @@
   return sLog;
 }
 
-#define LOG_FORCE(args) PR_LOG(GetLoaderLog(), PR_LOG_ALWAYS, args)
-#define LOG_ERROR(args) PR_LOG(GetLoaderLog(), PR_LOG_ERROR, args)
-#define LOG_WARN(args) PR_LOG(GetLoaderLog(), PR_LOG_WARNING, args)
-#define LOG_DEBUG(args) PR_LOG(GetLoaderLog(), PR_LOG_DEBUG, args)
+#define LOG_FORCE(args) MOZ_LOG(GetLoaderLog(), PR_LOG_ALWAYS, args)
+#define LOG_ERROR(args) MOZ_LOG(GetLoaderLog(), PR_LOG_ERROR, args)
+#define LOG_WARN(args) MOZ_LOG(GetLoaderLog(), PR_LOG_WARNING, args)
+#define LOG_DEBUG(args) MOZ_LOG(GetLoaderLog(), PR_LOG_DEBUG, args)
 #define LOG(args) LOG_DEBUG(args)
 
 #define LOG_FORCE_ENABLED() PR_LOG_TEST(GetLoaderLog(), PR_LOG_ALWAYS)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsAnimationManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsAnimationManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsAnimationManager.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsAnimationManager.cpp	2015-05-25 20:43:08.000000000 +0000
@@ -37,17 +37,17 @@
 }
 
 void
-CSSAnimation::Play(LimitBehavior aLimitBehavior)
+CSSAnimation::Play(ErrorResult &aRv, LimitBehavior aLimitBehavior)
 {
   mPauseShouldStick = false;
-  Animation::Play(aLimitBehavior);
+  Animation::Play(aRv, aLimitBehavior);
 }
 
 void
-CSSAnimation::Pause()
+CSSAnimation::Pause(ErrorResult& aRv)
 {
   mPauseShouldStick = true;
-  Animation::Pause();
+  Animation::Pause(aRv);
 }
 
 AnimationPlayState
@@ -60,12 +60,12 @@
 }
 
 void
-CSSAnimation::PlayFromJS()
+CSSAnimation::PlayFromJS(ErrorResult& aRv)
 {
   // Note that flushing style below might trigger calls to
   // PlayFromStyle()/PauseFromStyle() on this object.
   FlushStyle();
-  Animation::PlayFromJS();
+  Animation::PlayFromJS(aRv);
 }
 
 void
@@ -73,7 +73,10 @@
 {
   mIsStylePaused = false;
   if (!mPauseShouldStick) {
-    DoPlay(Animation::LimitBehavior::Continue);
+    ErrorResult rv;
+    DoPlay(rv, Animation::LimitBehavior::Continue);
+    // play() should not throw when LimitBehavior is Continue
+    MOZ_ASSERT(!rv.Failed(), "Unexpected exception playing animation");
   }
 }
 
@@ -86,7 +89,20 @@
   }
 
   mIsStylePaused = true;
-  DoPause();
+  ErrorResult rv;
+  DoPause(rv);
+  // pause() should only throw when *all* of the following conditions are true:
+  // - we are in the idle state, and
+  // - we have a negative playback rate, and
+  // - we have an infinitely repeating animation
+  // The first two conditions will never happen under regular style processing
+  // but could happen if an author made modifications to the Animation object
+  // and then updated animation-play-state. It's an unusual case and there's
+  // no obvious way to pass on the exception information so we just silently
+  // fail for now.
+  if (rv.Failed()) {
+    NS_WARNING("Unexpected exception pausing animation - silently failing");
+  }
 }
 
 void
@@ -230,13 +246,25 @@
     if (anim->IsInEffect() != anim->mInEffectForCascadeResults) {
       // Update our own cascade results.
       mozilla::dom::Element* element = aCollection->GetElementToRestyle();
+      bool updatedCascadeResults = false;
       if (element) {
         nsIFrame* frame = element->GetPrimaryFrame();
         if (frame) {
           UpdateCascadeResults(frame->StyleContext(), aCollection);
+          updatedCascadeResults = true;
         }
       }
 
+      if (!updatedCascadeResults) {
+        // If we don't have a style context we can't do the work of updating
+        // cascading results but we need to make sure to update
+        // mInEffectForCascadeResults or else we'll keep running this
+        // code every time (potentially leading to infinite recursion due
+        // to the fact that this method both calls and is (indirectly) called
+        // by nsTransitionManager).
+        anim->mInEffectForCascadeResults = anim->IsInEffect();
+      }
+
       // Notify the transition manager, whose results might depend on ours.
       mPresContext->TransitionManager()->
         UpdateCascadeResultsWithAnimations(aCollection);
@@ -532,14 +560,10 @@
                                  src.GetName());
     dest->SetEffect(destEffect);
 
-    // Even in the case where we call PauseFromStyle below, we still need to
-    // call PlayFromStyle first. This is because a newly-created animation is
-    // idle and has no effect until it is played (or otherwise given a start
-    // time).
-    dest->PlayFromStyle();
-
     if (src.GetPlayState() == NS_STYLE_ANIMATION_PLAY_STATE_PAUSED) {
       dest->PauseFromStyle();
+    } else {
+      dest->PlayFromStyle();
     }
 
     // While current drafts of css3-animations say that later keyframes
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsAnimationManager.h firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsAnimationManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsAnimationManager.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsAnimationManager.h	2015-05-25 20:43:08.000000000 +0000
@@ -65,11 +65,11 @@
   virtual CSSAnimation* AsCSSAnimation() override { return this; }
 
   virtual dom::Promise* GetReady(ErrorResult& aRv) override;
-  virtual void Play(LimitBehavior aLimitBehavior) override;
-  virtual void Pause() override;
+  virtual void Play(ErrorResult& aRv, LimitBehavior aLimitBehavior) override;
+  virtual void Pause(ErrorResult& aRv) override;
 
   virtual dom::AnimationPlayState PlayStateFromJS() const override;
-  virtual void PlayFromJS() override;
+  virtual void PlayFromJS(ErrorResult& aRv) override;
 
   void PlayFromStyle();
   void PauseFromStyle();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsComputedDOMStyle.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsComputedDOMStyle.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsComputedDOMStyle.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsComputedDOMStyle.cpp	2015-05-25 20:43:09.000000000 +0000
@@ -2272,7 +2272,7 @@
   nsROCSSPrimitiveValue *val = new nsROCSSPrimitiveValue;
   nsAutoString lineNamesString;
   uint32_t i_end = aLineNames.Length();
-  lineNamesString.Assign('(');
+  lineNamesString.Assign('[');
   if (i_end > 0) {
     for (uint32_t i = 0;;) {
       nsStyleUtil::AppendEscapedCSSIdent(aLineNames[i], lineNamesString);
@@ -2282,7 +2282,7 @@
       lineNamesString.Append(' ');
     }
   }
-  lineNamesString.Append(')');
+  lineNamesString.Append(']');
   val->SetString(lineNamesString);
   return val;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsCSSParser.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsCSSParser.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsCSSParser.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsCSSParser.cpp	2015-05-25 20:43:08.000000000 +0000
@@ -839,7 +839,7 @@
   // to indicate that we parsed the empty list,
   // or set it to a eCSSUnit_List of eCSSUnit_Ident.
   //
-  // To parse an optional <line-names> (ie. if not finding an open paren
+  // To parse an optional <line-names> (ie. if not finding an open bracket
   // is considered the same as an empty list),
   // treat CSSParseResult::NotFound the same as CSSParseResult::Ok.
   //
@@ -1211,12 +1211,6 @@
   // @supports rule.
   bool mSuppressErrors : 1;
 
-  // True if we've parsed "display: -webkit-box" as "display: flex" in an
-  // earlier declaration within the current block of declarations, as part of
-  // emulating support for certain -webkit-prefixed properties on certain
-  // sites.
-  bool mDidUnprefixWebkitBoxInEarlierDecl; // not :1 so we can use AutoRestore
-
   // True if any parsing of URL values requires a sheet principal to have
   // been passed in the nsCSSScanner constructor.  This is usually the case.
   // It can be set to false, for example, when we create an nsCSSParser solely
@@ -1226,6 +1220,25 @@
   // out of the parser.
   bool mSheetPrincipalRequired;
 
+  // This enum helps us track whether we've unprefixed "display: -webkit-box"
+  // (treating it as "display: flex") in an earlier declaration within a series
+  // of declarations.  (This only impacts behavior when the function
+  // "ShouldUseUnprefixingService()" returns true, and that should only happen
+  // for a short whitelist of origins.)
+  enum WebkitBoxUnprefixState : uint8_t {
+    eNotParsingDecls, // We are *not* currently parsing a sequence of
+                      // CSS declarations. (default state)
+
+    // The next two enum values indicate that we *are* currently parsing a
+    // sequence of declarations (in ParseDeclarations or ParseDeclarationBlock)
+    // and...
+    eHaveNotUnprefixed, // ...we have not unprefixed 'display:-webkit-box' in
+                        // this sequence of CSS declarations.
+    eHaveUnprefixed // ...we *have* unprefixed 'display:-webkit-box' earlier in
+                    // this sequence of CSS declarations.
+  };
+  WebkitBoxUnprefixState mWebkitBoxUnprefixState;
+
   // Stack of rule groups; used for @media and such.
   InfallibleTArray<nsRefPtr<css::GroupRule> > mGroupStack;
 
@@ -1302,8 +1315,8 @@
     mInSupportsCondition(false),
     mInFailingSupportsRule(false),
     mSuppressErrors(false),
-    mDidUnprefixWebkitBoxInEarlierDecl(false),
     mSheetPrincipalRequired(true),
+    mWebkitBoxUnprefixState(eNotParsingDecls),
     mNextFree(nullptr)
 {
 }
@@ -1532,9 +1545,10 @@
   css::ErrorReporter reporter(scanner, mSheet, mChildLoader, aSheetURI);
   InitScanner(scanner, reporter, aSheetURI, aBaseURI, aSheetPrincipal);
 
-  MOZ_ASSERT(!mDidUnprefixWebkitBoxInEarlierDecl,
-             "Someone forgot to clear the 'did unprefix webkit-box' flag");
-  AutoRestore<bool> autoRestore(mDidUnprefixWebkitBoxInEarlierDecl);
+  MOZ_ASSERT(mWebkitBoxUnprefixState == eNotParsingDecls,
+             "Someone forgot to clear mWebkitBoxUnprefixState!");
+  AutoRestore<WebkitBoxUnprefixState> autoRestore(mWebkitBoxUnprefixState);
+  mWebkitBoxUnprefixState = eHaveNotUnprefixed;
 
   mSection = eCSSSection_General;
 
@@ -6176,9 +6190,10 @@
 {
   bool checkForBraces = (aFlags & eParseDeclaration_InBraces) != 0;
 
-  MOZ_ASSERT(!mDidUnprefixWebkitBoxInEarlierDecl,
-             "Someone forgot to clear the 'did unprefix webkit-box' flag");
-  AutoRestore<bool> restorer(mDidUnprefixWebkitBoxInEarlierDecl);
+  MOZ_ASSERT(mWebkitBoxUnprefixState == eNotParsingDecls,
+             "Someone forgot to clear mWebkitBoxUnprefixState!");
+  AutoRestore<WebkitBoxUnprefixState> autoRestore(mWebkitBoxUnprefixState);
+  mWebkitBoxUnprefixState = eHaveNotUnprefixed;
 
   if (checkForBraces) {
     if (!ExpectSymbol('{', true)) {
@@ -6600,7 +6615,9 @@
       // Treat "display: -webkit-box" as "display: flex". In simple scenarios,
       // they largely behave the same, as long as we use the CSS Unprefixing
       // Service to also translate the associated properties.
-      mDidUnprefixWebkitBoxInEarlierDecl = true;
+      if (mWebkitBoxUnprefixState == eHaveNotUnprefixed) {
+        mWebkitBoxUnprefixState = eHaveUnprefixed;
+      }
       return eCSSKeyword_flex;
     }
 
@@ -6611,7 +6628,8 @@
     // on our emulation of the earlier -webkit-box display-value, via the CSS
     // cascade. To prevent this problem, we also treat "display: -moz-box" as
     // "display: flex" (but only if we unprefixed an earlier "-webkit-box").
-    if (mDidUnprefixWebkitBoxInEarlierDecl && keyword == eCSSKeyword__moz_box) {
+    if (mWebkitBoxUnprefixState == eHaveUnprefixed &&
+        keyword == eCSSKeyword__moz_box) {
       MOZ_ASSERT(ShouldUseUnprefixingService(),
                  "mDidUnprefixWebkitBoxInEarlierDecl should only be set if "
                  "we're using the unprefixing service on this site");
@@ -8005,10 +8023,10 @@
 CSSParseResult
 CSSParserImpl::ParseGridLineNames(nsCSSValue& aValue)
 {
-  if (!ExpectSymbol('(', true)) {
+  if (!ExpectSymbol('[', true)) {
     return CSSParseResult::NotFound;
   }
-  if (!GetToken(true) || mToken.IsSymbol(')')) {
+  if (!GetToken(true) || mToken.IsSymbol(']')) {
     return CSSParseResult::Ok;
   }
   // 'return' so far leaves aValue untouched, to represent an empty list.
@@ -8035,10 +8053,10 @@
     if (!(eCSSToken_Ident == mToken.mType &&
           ParseCustomIdent(item->mValue, mToken.mIdent))) {
       UngetToken();
-      SkipUntil(')');
+      SkipUntil(']');
       return CSSParseResult::Error;
     }
-    if (!GetToken(true) || mToken.IsSymbol(')')) {
+    if (!GetToken(true) || mToken.IsSymbol(']')) {
       return CSSParseResult::Ok;
     }
     item->mNext = new nsCSSValueList;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsCSSRuleProcessor.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsCSSRuleProcessor.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsCSSRuleProcessor.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsCSSRuleProcessor.cpp	2015-05-25 20:43:08.000000000 +0000
@@ -450,10 +450,10 @@
 
   int32_t     mRuleCount;
 
-  PLDHashTable mIdTable;
-  PLDHashTable mClassTable;
-  PLDHashTable mTagTable;
-  PLDHashTable mNameSpaceTable;
+  PLDHashTable2 mIdTable;
+  PLDHashTable2 mClassTable;
+  PLDHashTable2 mTagTable;
+  PLDHashTable2 mNameSpaceTable;
   RuleValueList mUniversalRules;
 
   struct EnumData {
@@ -489,6 +489,14 @@
 
 RuleHash::RuleHash(bool aQuirksMode)
   : mRuleCount(0),
+    mIdTable(aQuirksMode ? &RuleHash_IdTable_CIOps.ops
+                         : &RuleHash_IdTable_CSOps.ops,
+             sizeof(RuleHashTableEntry)),
+    mClassTable(aQuirksMode ? &RuleHash_ClassTable_CIOps.ops
+                            : &RuleHash_ClassTable_CSOps.ops,
+                sizeof(RuleHashTableEntry)),
+    mTagTable(&RuleHash_TagTable_Ops, sizeof(RuleHashTagTableEntry)),
+    mNameSpaceTable(&RuleHash_NameSpaceTable_Ops, sizeof(RuleHashTableEntry)),
     mUniversalRules(0),
     mEnumList(nullptr), mEnumListSize(0),
     mQuirksMode(aQuirksMode)
@@ -508,20 +516,6 @@
 #endif
 {
   MOZ_COUNT_CTOR(RuleHash);
-
-  PL_DHashTableInit(&mIdTable, aQuirksMode ? &RuleHash_IdTable_CIOps.ops
-                                           : &RuleHash_IdTable_CSOps.ops,
-                    sizeof(RuleHashTableEntry));
-
-  PL_DHashTableInit(&mClassTable, aQuirksMode ? &RuleHash_ClassTable_CIOps.ops
-                                              : &RuleHash_ClassTable_CSOps.ops,
-                    sizeof(RuleHashTableEntry));
-
-  PL_DHashTableInit(&mTagTable, &RuleHash_TagTable_Ops,
-                    sizeof(RuleHashTagTableEntry));
-
-  PL_DHashTableInit(&mNameSpaceTable, &RuleHash_NameSpaceTable_Ops,
-                    sizeof(RuleHashTableEntry));
 }
 
 RuleHash::~RuleHash()
@@ -563,11 +557,6 @@
   if (nullptr != mEnumList) {
     delete [] mEnumList;
   }
-  // delete arena for strings and small objects
-  PL_DHashTableFinish(&mIdTable);
-  PL_DHashTableFinish(&mClassTable);
-  PL_DHashTableFinish(&mTagTable);
-  PL_DHashTableFinish(&mNameSpaceTable);
 }
 
 void RuleHash::AppendRuleToTable(PLDHashTable* aTable, const void* aKey,
@@ -866,42 +855,31 @@
     : mRuleHash(aQuirksMode),
       mStateSelectors(),
       mSelectorDocumentStates(0),
+      mClassSelectors(aQuirksMode ? &AtomSelector_CIOps.ops
+                                  : &AtomSelector_CSOps,
+                      sizeof(AtomSelectorEntry)),
+      mIdSelectors(aQuirksMode ? &AtomSelector_CIOps.ops
+                               : &AtomSelector_CSOps,
+                   sizeof(AtomSelectorEntry)),
+      // mAttributeSelectors is matching on the attribute _name_, not the
+      // value, and we case-fold names at parse-time, so this is a
+      // case-sensitive match.
+      mAttributeSelectors(&AtomSelector_CSOps, sizeof(AtomSelectorEntry)),
+      mAnonBoxRules(&RuleHash_TagTable_Ops, sizeof(RuleHashTagTableEntry)),
+#ifdef MOZ_XUL
+      mXULTreeRules(&RuleHash_TagTable_Ops, sizeof(RuleHashTagTableEntry)),
+#endif
       mKeyframesRuleTable(),
       mCounterStyleRuleTable(),
       mCacheKey(aMedium),
       mNext(nullptr),
       mQuirksMode(aQuirksMode)
   {
-    // mAttributeSelectors is matching on the attribute _name_, not the value,
-    // and we case-fold names at parse-time, so this is a case-sensitive match.
-    PL_DHashTableInit(&mAttributeSelectors, &AtomSelector_CSOps,
-                      sizeof(AtomSelectorEntry));
-    PL_DHashTableInit(&mAnonBoxRules, &RuleHash_TagTable_Ops,
-                      sizeof(RuleHashTagTableEntry));
-    PL_DHashTableInit(&mIdSelectors,
-                      aQuirksMode ? &AtomSelector_CIOps.ops :
-                                    &AtomSelector_CSOps,
-                      sizeof(AtomSelectorEntry));
-    PL_DHashTableInit(&mClassSelectors,
-                      aQuirksMode ? &AtomSelector_CIOps.ops :
-                                    &AtomSelector_CSOps,
-                      sizeof(AtomSelectorEntry));
     memset(mPseudoElementRuleHashes, 0, sizeof(mPseudoElementRuleHashes));
-#ifdef MOZ_XUL
-    PL_DHashTableInit(&mXULTreeRules, &RuleHash_TagTable_Ops,
-                      sizeof(RuleHashTagTableEntry));
-#endif
   }
 
   ~RuleCascadeData()
   {
-    PL_DHashTableFinish(&mAttributeSelectors);
-    PL_DHashTableFinish(&mAnonBoxRules);
-    PL_DHashTableFinish(&mIdSelectors);
-    PL_DHashTableFinish(&mClassSelectors);
-#ifdef MOZ_XUL
-    PL_DHashTableFinish(&mXULTreeRules);
-#endif
     for (uint32_t i = 0; i < ArrayLength(mPseudoElementRuleHashes); ++i) {
       delete mPseudoElementRuleHashes[i];
     }
@@ -914,14 +892,14 @@
     mPseudoElementRuleHashes[nsCSSPseudoElements::ePseudo_PseudoElementCount];
   nsTArray<nsCSSRuleProcessor::StateSelector>  mStateSelectors;
   EventStates              mSelectorDocumentStates;
-  PLDHashTable             mClassSelectors;
-  PLDHashTable             mIdSelectors;
+  PLDHashTable2            mClassSelectors;
+  PLDHashTable2            mIdSelectors;
   nsTArray<nsCSSSelector*> mPossiblyNegatedClassSelectors;
   nsTArray<nsCSSSelector*> mPossiblyNegatedIDSelectors;
-  PLDHashTable             mAttributeSelectors;
-  PLDHashTable             mAnonBoxRules;
+  PLDHashTable2            mAttributeSelectors;
+  PLDHashTable2            mAnonBoxRules;
 #ifdef MOZ_XUL
-  PLDHashTable             mXULTreeRules;
+  PLDHashTable2            mXULTreeRules;
 #endif
 
   nsTArray<nsFontFaceRuleContainer> mFontFaceRules;
@@ -3320,11 +3298,9 @@
       mPageRules(aPageRules),
       mCounterStyleRules(aCounterStyleRules),
       mCacheKey(aKey),
+      mRulesByWeight(&gRulesByWeightOps, sizeof(RuleByWeightEntry), 32),
       mSheetType(aSheetType)
   {
-    PL_DHashTableInit(&mRulesByWeight, &gRulesByWeightOps,
-                      sizeof(RuleByWeightEntry), 32);
-
     // Initialize our arena
     PL_INIT_ARENA_POOL(&mArena, "CascadeEnumDataArena",
                        NS_CASCADEENUMDATA_ARENA_BLOCK_SIZE);
@@ -3332,8 +3308,6 @@
 
   ~CascadeEnumData()
   {
-    if (mRulesByWeight.IsInitialized())
-      PL_DHashTableFinish(&mRulesByWeight);
     PL_FinishArenaPool(&mArena);
   }
 
@@ -3347,7 +3321,7 @@
   PLArenaPool mArena;
   // Hooray, a manual PLDHashTable since nsClassHashtable doesn't
   // provide a getter that gives me a *reference* to the value.
-  PLDHashTable mRulesByWeight; // of PerWeightDataListItem linked lists
+  PLDHashTable2 mRulesByWeight; // of PerWeightDataListItem linked lists
   uint8_t mSheetType;
 };
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsCSSScanner.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsCSSScanner.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsCSSScanner.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsCSSScanner.cpp	2015-05-25 20:43:08.000000000 +0000
@@ -1362,6 +1362,10 @@
     aTokenResult.isTrash = false;
   } else if (ch == '.') {
     // Null cell token
+    // Skip any other '.'
+    while (mOffset < mCount && mBuffer[mOffset] == '.') {
+      mOffset++;
+    }
     aTokenResult.mName.Truncate();
     aTokenResult.isTrash = false;
   } else {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsCSSValue.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsCSSValue.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsCSSValue.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsCSSValue.cpp	2015-05-25 20:43:09.000000000 +0000
@@ -1944,7 +1944,7 @@
     } else if (unit == eCSSUnit_Null) {
       // Empty or omitted <line-names>.
       if (isSubgrid) {
-        aResult.AppendLiteral("()");
+        aResult.AppendLiteral("[]");
       } else {
         // Serializes to nothing.
         addSpaceSeparator = false;  // Avoid a double space.
@@ -1952,10 +1952,10 @@
 
     } else if (unit == eCSSUnit_List || unit == eCSSUnit_ListDep) {
       // Non-empty <line-names>
-      aResult.Append('(');
+      aResult.Append('[');
       AppendValueListToString(val->mValue.GetListValue(), aProperty,
                               aResult, aSerialization);
-      aResult.Append(')');
+      aResult.Append(']');
 
     } else {
       // <track-size>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsFontFaceLoader.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsFontFaceLoader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsFontFaceLoader.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsFontFaceLoader.cpp	2015-05-25 20:43:09.000000000 +0000
@@ -6,7 +6,7 @@
 
 /* code for loading in @font-face defined font data */
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "nsFontFaceLoader.h"
 
@@ -25,7 +25,7 @@
 
 using namespace mozilla;
 
-#define LOG(args) PR_LOG(gfxUserFontSet::GetUserFontsLog(), PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gfxUserFontSet::GetUserFontsLog(), PR_LOG_DEBUG, args)
 #define LOG_ENABLED() PR_LOG_TEST(gfxUserFontSet::GetUserFontsLog(), \
                                   PR_LOG_DEBUG)
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsRuleNode.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsRuleNode.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsRuleNode.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsRuleNode.cpp	2015-05-25 20:43:09.000000000 +0000
@@ -1427,7 +1427,7 @@
   }
 
   if (ChildrenAreHashed()) {
-    PLDHashTable *children = ChildrenHash();
+    PLDHashTable2 *children = ChildrenHash();
     PL_DHashTableEnumerate(children, EnqueueRuleNodeChildren,
                            &destroyQueueTail);
     *destroyQueueTail = nullptr; // ensure null-termination
@@ -1614,9 +1614,9 @@
 {
   NS_ASSERTION(!ChildrenAreHashed() && HaveChildren(),
                "must have a non-empty list of children");
-  PLDHashTable *hash = new PLDHashTable(&ChildrenHashOps,
-                                        sizeof(ChildrenHashEntry),
-                                        aNumKids);
+  PLDHashTable2 *hash = new PLDHashTable2(&ChildrenHashOps,
+                                          sizeof(ChildrenHashEntry),
+                                          aNumKids);
   for (nsRuleNode* curr = ChildrenList(); curr; curr = curr->mNextSibling) {
     // This will never fail because of the initial size we gave the table.
     ChildrenHashEntry *entry = static_cast<ChildrenHashEntry*>(
@@ -9367,7 +9367,7 @@
   uint32_t childrenDestroyed = 0;
   nsRuleNode* survivorsWithChildren = nullptr;
   if (ChildrenAreHashed()) {
-    PLDHashTable* children = ChildrenHash();
+    PLDHashTable2* children = ChildrenHash();
     uint32_t oldChildCount = children->EntryCount();
     PL_DHashTableEnumerate(children, SweepHashEntry, &survivorsWithChildren);
     childrenDestroyed = oldChildCount - children->EntryCount();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsRuleNode.h firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsRuleNode.h
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsRuleNode.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsRuleNode.h	2015-05-25 20:43:09.000000000 +0000
@@ -11,6 +11,7 @@
 #ifndef nsRuleNode_h___
 #define nsRuleNode_h___
 
+#include "mozilla/RangedArray.h"
 #include "nsPresContext.h"
 #include "nsStyleStruct.h"
 
@@ -24,29 +25,11 @@
 class nsStyleCoord;
 struct nsCSSValuePairList;
 
-template <nsStyleStructID MinIndex, nsStyleStructID Count>
-class FixedStyleStructArray
-{
-private:
-  void* mArray[Count];
-public:
-  void*& operator[](nsStyleStructID aIndex) {
-    MOZ_ASSERT(MinIndex <= aIndex && aIndex < (MinIndex + Count),
-               "out of range");
-    return mArray[aIndex - MinIndex];
-  }
-
-  const void* operator[](nsStyleStructID aIndex) const {
-    MOZ_ASSERT(MinIndex <= aIndex && aIndex < (MinIndex + Count),
-               "out of range");
-    return mArray[aIndex - MinIndex];
-  }
-};
-
 struct nsInheritedStyleData
 {
-  FixedStyleStructArray<nsStyleStructID_Inherited_Start,
-                        nsStyleStructID_Inherited_Count> mStyleStructs;
+  mozilla::RangedArray<void*,
+                       nsStyleStructID_Inherited_Start,
+                       nsStyleStructID_Inherited_Count> mStyleStructs;
 
   void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW {
     return aContext->PresShell()->
@@ -83,8 +66,9 @@
 
 struct nsResetStyleData
 {
-  FixedStyleStructArray<nsStyleStructID_Reset_Start,
-                        nsStyleStructID_Reset_Count> mStyleStructs;
+  mozilla::RangedArray<void*,
+                       nsStyleStructID_Reset_Start,
+                       nsStyleStructID_Reset_Count> mStyleStructs;
 
   nsResetStyleData()
   {
@@ -333,7 +317,7 @@
   union {
     void* asVoid;
     nsRuleNode* asList;
-    PLDHashTable* asHash;
+    PLDHashTable2* asHash;
   } mChildren; // Accessed only through the methods below.
 
   enum {
@@ -359,18 +343,18 @@
   nsRuleNode** ChildrenListPtr() {
     return &mChildren.asList;
   }
-  PLDHashTable* ChildrenHash() {
-    return (PLDHashTable*) (intptr_t(mChildren.asHash) & ~intptr_t(kTypeMask));
+  PLDHashTable2* ChildrenHash() {
+    return (PLDHashTable2*) (intptr_t(mChildren.asHash) & ~intptr_t(kTypeMask));
   }
   void SetChildrenList(nsRuleNode *aList) {
     NS_ASSERTION(!(intptr_t(aList) & kTypeMask),
                  "pointer not 2-byte aligned");
     mChildren.asList = aList;
   }
-  void SetChildrenHash(PLDHashTable *aHashtable) {
+  void SetChildrenHash(PLDHashTable2 *aHashtable) {
     NS_ASSERTION(!(intptr_t(aHashtable) & kTypeMask),
                  "pointer not 2-byte aligned");
-    mChildren.asHash = (PLDHashTable*)(intptr_t(aHashtable) | kHashType);
+    mChildren.asHash = (PLDHashTable2*)(intptr_t(aHashtable) | kHashType);
   }
   void ConvertChildrenToHash(int32_t aNumKids);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsStyleStruct.h firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsStyleStruct.h
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsStyleStruct.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsStyleStruct.h	2015-05-25 20:43:09.000000000 +0000
@@ -471,12 +471,12 @@
       return !(*this == aOther);
     }
   };
-  
+
   struct Repeat;
   friend struct Repeat;
   struct Repeat {
     uint8_t mXRepeat, mYRepeat;
-    
+
     // Initialize nothing
     Repeat() {}
 
@@ -1583,7 +1583,7 @@
   nsChangeHint CalcDifference(const nsStyleTextReset& aOther) const;
   static nsChangeHint MaxDifference() {
     return nsChangeHint(
-        NS_STYLE_HINT_REFLOW | 
+        NS_STYLE_HINT_REFLOW |
         nsChangeHint_UpdateSubtreeOverflow);
   }
   static nsChangeHint MaxDifferenceNeverInherited() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsTransitionManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsTransitionManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsTransitionManager.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsTransitionManager.cpp	2015-05-25 20:43:09.000000000 +0000
@@ -52,8 +52,8 @@
 double
 ElementPropertyTransition::CurrentValuePortion() const
 {
-  // It would be easy enough to handle finished transitions by using a time
-  // fraction of 1 but currently we should not be called for finished
+  // It would be easy enough to handle finished transitions by using a
+  // progress of 1 but currently we should not be called for finished
   // transitions.
   MOZ_ASSERT(!IsFinishedTransition(),
              "Getting the value portion of a finished transition");
@@ -62,23 +62,23 @@
              "sampled");
 
   // Transitions use a fill mode of 'backwards' so GetComputedTiming will
-  // never return a null time fraction due to being *before* the animation
+  // never return a null time progress due to being *before* the animation
   // interval. However, it might be possible that we're behind on flushing
   // causing us to get called *after* the animation interval. So, just in
-  // case, we override the fill mode to 'both' to ensure the time fraction
+  // case, we override the fill mode to 'both' to ensure the progress
   // is never null.
   AnimationTiming timingToUse = mTiming;
   timingToUse.mFillMode = NS_STYLE_ANIMATION_FILL_MODE_BOTH;
   ComputedTiming computedTiming = GetComputedTiming(&timingToUse);
 
-  MOZ_ASSERT(computedTiming.mTimeFraction != ComputedTiming::kNullTimeFraction,
-             "Got a null time fraction for a fill mode of 'both'");
+  MOZ_ASSERT(computedTiming.mProgress != ComputedTiming::kNullProgress,
+             "Got a null progress for a fill mode of 'both'");
   MOZ_ASSERT(mProperties.Length() == 1,
              "Should have one animation property for a transition");
   MOZ_ASSERT(mProperties[0].mSegments.Length() == 1,
              "Animation property should have one segment for a transition");
   return mProperties[0].mSegments[0].mTimingFunction
-         .GetValue(computedTiming.mTimeFraction);
+         .GetValue(computedTiming.mProgress);
 }
 
 /*****************************************************************************
@@ -93,10 +93,10 @@
 }
 
 void
-CSSTransition::PlayFromJS()
+CSSTransition::PlayFromJS(ErrorResult& aRv)
 {
   FlushStyle();
-  Animation::PlayFromJS();
+  Animation::PlayFromJS(aRv);
 }
 
 CommonAnimationManager*
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsTransitionManager.h firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsTransitionManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/nsTransitionManager.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/nsTransitionManager.h	2015-05-25 20:43:09.000000000 +0000
@@ -85,11 +85,17 @@
   virtual CSSTransition* AsCSSTransition() override { return this; }
 
   virtual dom::AnimationPlayState PlayStateFromJS() const override;
-  virtual void PlayFromJS() override;
+  virtual void PlayFromJS(ErrorResult& aRv) override;
 
   // A variant of Play() that avoids posting style updates since this method
   // is expected to be called whilst already updating style.
-  void PlayFromStyle() { DoPlay(Animation::LimitBehavior::Continue); }
+  void PlayFromStyle()
+  {
+    ErrorResult rv;
+    DoPlay(rv, Animation::LimitBehavior::Continue);
+    // play() should not throw when LimitBehavior is Continue
+    MOZ_ASSERT(!rv.Failed(), "Unexpected exception playing transition");
+  }
 
 protected:
   virtual ~CSSTransition() { }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/test/property_database.js firefox-trunk-41.0~a1~hg20150524r245419/layout/style/test/property_database.js
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/test/property_database.js	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/test/property_database.js	2015-05-25 20:43:09.000000000 +0000
@@ -5790,32 +5790,32 @@
       "auto",
       "40px",
       "2.5fr",
-      "(normal) 40px () auto ( ) 12%",
-      "(foo) 40px min-content ( bar ) calc(20px + 10%) max-content",
+      "[normal] 40px [] auto [ ] 12%",
+      "[foo] 40px min-content [ bar ] calc(20px + 10%) max-content",
       "40px min-content calc(20px + 10%) max-content",
       "minmax(min-content, auto)",
       "minmax(auto, max-content)",
       "m\\69nmax(20px, 4Fr)",
       "40px MinMax(min-content, calc(20px + 10%)) max-content",
       "40px 2em",
-      "() 40px (-foo) 2em (bar baz This\ is\ one\ ident)",
-      // TODO bug 978478: "(a) repeat(3, (b) 20px (c) 40px (d)) (e)",
+      "[] 40px [-foo] 2em [bar baz This\ is\ one\ ident]",
+      // TODO bug 978478: "[a] repeat(3, [b] 20px [c] 40px [d]) [e]",
       "repeat(1, 20px)",
-      "repeat(1, (a) 20px)",
-      "(a) Repeat(4, (a) 20px () auto (b c)) (d)",
-      "(a) 2.5fr Repeat(4, (a) 20px () auto (b c)) (d)",
-      "(a) 2.5fr (z) Repeat(4, (a) 20px () auto (b c)) (d)",
-      "(a) 2.5fr (z) Repeat(4, (a) 20px () auto) (d)",
-      "(a) 2.5fr (z) Repeat(4, 20px (b c) auto (b c)) (d)",
-      "(a) 2.5fr (z) Repeat(4, 20px auto) (d)",
+      "repeat(1, [a] 20px)",
+      "[a] Repeat(4, [a] 20px [] auto [b c]) [d]",
+      "[a] 2.5fr Repeat(4, [a] 20px [] auto [b c]) [d]",
+      "[a] 2.5fr [z] Repeat(4, [a] 20px [] auto [b c]) [d]",
+      "[a] 2.5fr [z] Repeat(4, [a] 20px [] auto) [d]",
+      "[a] 2.5fr [z] Repeat(4, 20px [b c] auto [b c]) [d]",
+      "[a] 2.5fr [z] Repeat(4, 20px auto) [d]",
 
       // See https://bugzilla.mozilla.org/show_bug.cgi?id=981300
-      "(none auto subgrid min-content max-content foo) 40px",
+      "[none auto subgrid min-content max-content foo] 40px",
 
       "subgrid",
-      "subgrid () (foo bar)",
-      "subgrid repeat(1, ())",
-      "subgrid Repeat(4, (a) (b c) () (d))",
+      "subgrid [] [foo bar]",
+      "subgrid repeat(1, [])",
+      "subgrid Repeat(4, [a] [b c] [] [d])",
     ],
     invalid_values: [
       "",
@@ -5833,7 +5833,7 @@
       "(5th) 40px",
       "(foo() bar) 40px",
       "(foo)) 40px",
-      "[foo] 40px",
+      "(foo) 40px",
       "(foo) (bar) 40px",
       "40px (foo) (bar)",
       "minmax()",
@@ -5888,7 +5888,12 @@
       "'' ''",
       "'1a-é_ .' \"b .\"",
       "' Z\t\\aZ' 'Z Z'",
-      " '. . a b'  '..a b' ",
+      " '. . a b'  '. .a b' ",
+      "'a.b' '. . .'",
+      "'.' '..'",
+      "'...' '.'",
+      "'...-blah' '. .'",
+      "'.. ..' '.. ...'",
     ],
     invalid_values: [
       "'a b' 'a/b'",
@@ -5917,32 +5922,32 @@
       "subgrid",
       // <'grid-template-columns'> / <'grid-template-rows'>
       "40px / 100px",
-      "(foo) 40px (bar) / (baz) 100px (fizz)",
+      "[foo] 40px [bar] / [baz] 100px [fizz]",
       " none/100px",
       "40px/none",
       "subgrid/40px 20px",
-      "subgrid (foo) () (bar baz) / 40px 20px",
+      "subgrid [foo] [] [bar baz] / 40px 20px",
       "40px 20px/subgrid",
-      "40px 20px/subgrid  (foo) () repeat(3, (a) (b)) (bar baz)",
+      "40px 20px/subgrid  [foo] [] repeat(3, [a] [b]) [bar baz]",
       "subgrid/subgrid",
-      "subgrid (foo) () (bar baz)/subgrid (foo) () (bar baz)",
+      "subgrid [foo] [] [bar baz]/subgrid [foo] [] [bar baz]",
       // [ <track-list> / ]? [ <line-names>? <string> <track-size>? <line-names>? ]+
       "'fizz'",
-      "(bar) 'fizz'",
-      "(foo) 40px / 'fizz'",
-      "(foo) 40px / (bar) 'fizz'",
-      "(foo) 40px / 'fizz' 100px",
-      "(foo) 40px / (bar) 'fizz' 100px",
-      "(foo) 40px / (bar) 'fizz' 100px (buzz)",
-      "(foo) 40px / (bar) 'fizz' 100px (buzz) \n (a) '.' 200px (b)",
+      "[bar] 'fizz'",
+      "[foo] 40px / 'fizz'",
+      "[foo] 40px / [bar] 'fizz'",
+      "[foo] 40px / 'fizz' 100px",
+      "[foo] 40px / [bar] 'fizz' 100px",
+      "[foo] 40px / [bar] 'fizz' 100px [buzz]",
+      "[foo] 40px / [bar] 'fizz' 100px [buzz] \n [a] '.' 200px [b]",
     ],
     invalid_values: [
-      "subgrid ()",
-      "subgrid () / 'fizz'",
+      "subgrid []",
+      "subgrid [] / 'fizz'",
       "subgrid / 'fizz'",
-      "(foo) (bar) 40px / 100px",
-      "40px / (fizz) (buzz) 100px",
-      "40px / (fizz) (buzz) 'foo'",
+      "[foo] [bar] 40px / 100px",
+      "40px / [fizz] [buzz] 100px",
+      "40px / [fizz] [buzz] 'foo'",
       "none / 'foo'"
     ]
   };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/test/test_exposed_prop_accessors.html firefox-trunk-41.0~a1~hg20150524r245419/layout/style/test/test_exposed_prop_accessors.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/test/test_exposed_prop_accessors.html	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/test/test_exposed_prop_accessors.html	2015-05-25 20:43:10.000000000 +0000
@@ -23,18 +23,18 @@
 
   var s = document.createElement("div").style;
 
-  ise(s[info.domProp], "", prop + " should not be set yet");
+  is(s[info.domProp], "", prop + " should not be set yet");
   s[info.domProp] = info.initial_values[0];
   isnot(s[info.domProp], "", prop + " should now be set");
   if (prop[0] != "-") {
-    ise(s[prop], s[info.domProp],
-        "Getting " + prop + " via name should work")
+    is(s[prop], s[info.domProp],
+       "Getting " + prop + " via name should work")
     s = document.createElement("div").style;
-    ise(s[info.domProp], "", prop + " should not be set here either");
+    is(s[info.domProp], "", prop + " should not be set here either");
     s[prop] = info.initial_values[0];
     isnot(s[info.prop], "", prop + " should now be set again");
-    ise(s[info.domProp], s[prop],
-        "Setting " + prop + " via name should work");
+    is(s[info.domProp], s[prop],
+       "Setting " + prop + " via name should work");
   }
 }
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/test/test_grid_container_shorthands.html firefox-trunk-41.0~a1~hg20150524r245419/layout/style/test/test_grid_container_shorthands.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/test/test_grid_container_shorthands.html	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/test/test_grid_container_shorthands.html	2015-05-25 20:43:10.000000000 +0000
@@ -34,9 +34,9 @@
         gridTemplateRows: "100px",
     },
     {
-        specified: "(foo) 40px (bar) / (baz) 100px (fizz)",
-        gridTemplateColumns: "(foo) 40px (bar)",
-        gridTemplateRows: "(baz) 100px (fizz)",
+        specified: "[foo] 40px [bar] / [baz] 100px [fizz]",
+        gridTemplateColumns: "[foo] 40px [bar]",
+        gridTemplateRows: "[baz] 100px [fizz]",
     },
     {
         specified: " none/100px",
@@ -54,54 +54,54 @@
         gridTemplateRows: "20px",
     },
     {
-        specified: "40px/(a)repeat(1, 20px)",
+        specified: "40px/[a]repeat(1, 20px)",
         gridTemplateColumns: "40px",
-        gridTemplateRows: "(a) 20px",
+        gridTemplateRows: "[a] 20px",
     },
     {
-        specified: "40px/repeat(1, (a) 20px)",
+        specified: "40px/repeat(1, [a] 20px)",
         gridTemplateColumns: "40px",
-        gridTemplateRows: "(a) 20px",
+        gridTemplateRows: "[a] 20px",
     },
     {
-        specified: "40px/(a)repeat(2, (b)20px)",
+        specified: "40px/[a]repeat(2, [b]20px)",
         gridTemplateColumns: "40px",
-        gridTemplateRows: "(a b) 20px (b) 20px",
+        gridTemplateRows: "[a b] 20px [b] 20px",
     },
     {
-        specified: "40px/(a)repeat(2, 20px)",
+        specified: "40px/[a]repeat(2, 20px)",
         gridTemplateColumns: "40px",
-        gridTemplateRows: "(a) 20px 20px",
+        gridTemplateRows: "[a] 20px 20px",
     },
     {
-        specified: "40px/repeat(2, (a) 20px)",
+        specified: "40px/repeat(2, [a] 20px)",
         gridTemplateColumns: "40px",
-        gridTemplateRows: "(a) 20px (a) 20px",
+        gridTemplateRows: "[a] 20px [a] 20px",
     },
     {
-        specified: "40px/(a)repeat(2, (b)20px)",
+        specified: "40px/[a]repeat(2, [b]20px)",
         gridTemplateColumns: "40px",
-        gridTemplateRows: "(a b) 20px (b) 20px",
+        gridTemplateRows: "[a b] 20px [b] 20px",
     },
     {
-        specified: "40px/repeat(2, 20px(a))",
+        specified: "40px/repeat(2, 20px[a])",
         gridTemplateColumns: "40px",
-        gridTemplateRows: "20px (a) 20px (a)",
+        gridTemplateRows: "20px [a] 20px [a]",
     },
     {
-        specified: "40px/repeat(2, 20px(a)) (b)",
+        specified: "40px/repeat(2, 20px[a]) [b]",
         gridTemplateColumns: "40px",
-        gridTemplateRows: "20px (a) 20px (a b)",
+        gridTemplateRows: "20px [a] 20px [a b]",
     },
     {
-        specified: "40px/repeat(2, (a) 20px(b)) (c)",
+        specified: "40px/repeat(2, [a] 20px[b]) [c]",
         gridTemplateColumns: "40px",
-        gridTemplateRows: "(a) 20px (b a) 20px (b c)",
+        gridTemplateRows: "[a] 20px [b a] 20px [b c]",
     },
     {
-        specified: "40px/(a) repeat(3, (b c) 20px (d) 100px (e f)) (g)",
+        specified: "40px/[a] repeat(3, [b c] 20px [d] 100px [e f]) [g]",
         gridTemplateColumns: "40px",
-        gridTemplateRows: "(a b c) 20px (d) 100px (e f b c) 20px (d) 100px (e f b c) 20px (d) 100px (e f g)",
+        gridTemplateRows: "[a b c] 20px [d] 100px [e f b c] 20px [d] 100px [e f b c] 20px [d] 100px [e f g]",
     },
     {
         specified: "'fizz'",
@@ -109,33 +109,33 @@
         gridTemplateRows: "auto",
     },
     {
-        specified: "(bar) 'fizz'",
+        specified: "[bar] 'fizz'",
         gridTemplateAreas: "\"fizz\"",
-        gridTemplateRows: "(bar) auto",
+        gridTemplateRows: "[bar] auto",
     },
     {
-        specified: "(foo) 40px / 'fizz'",
+        specified: "[foo] 40px / 'fizz'",
         gridTemplateAreas: "\"fizz\"",
-        gridTemplateColumns: "(foo) 40px",
+        gridTemplateColumns: "[foo] 40px",
         gridTemplateRows: "auto",
     },
     {
-        specified: "(foo) 40px / (bar) 'fizz'",
+        specified: "[foo] 40px / [bar] 'fizz'",
         gridTemplateAreas: "\"fizz\"",
-        gridTemplateColumns: "(foo) 40px",
-        gridTemplateRows: "(bar) auto",
+        gridTemplateColumns: "[foo] 40px",
+        gridTemplateRows: "[bar] auto",
     },
     {
-        specified: "(foo) 40px / 'fizz' 100px",
+        specified: "[foo] 40px / 'fizz' 100px",
         gridTemplateAreas: "\"fizz\"",
-        gridTemplateColumns: "(foo) 40px",
+        gridTemplateColumns: "[foo] 40px",
         gridTemplateRows: "100px",
     },
     {
-        specified: "(foo) 40px / (bar) 'fizz' 100px (buzz) \n (a) '.' 200px (b)",
+        specified: "[foo] 40px / [bar] 'fizz' 100px [buzz] \n [a] '.' 200px [b]",
         gridTemplateAreas: "\"fizz\" \".\"",
-        gridTemplateColumns: "(foo) 40px",
-        gridTemplateRows: "(bar) 100px (buzz a) 200px (b)",
+        gridTemplateColumns: "[foo] 40px",
+        gridTemplateRows: "[bar] 100px [buzz a] 200px [b]",
     },
     {
         specified: "subgrid",
@@ -148,28 +148,28 @@
         gridTemplateRows: "subgrid",
     },
     {
-        specified: "subgrid / subgrid (foo)",
+        specified: "subgrid / subgrid [foo]",
         gridTemplateColumns: "subgrid",
-        gridTemplateRows: "subgrid (foo)",
+        gridTemplateRows: "subgrid [foo]",
     },
     {
-        specified: "subgrid / subgrid (foo) repeat(3, () (a b) (c))",
+        specified: "subgrid / subgrid [foo] repeat(3, [] [a b] [c])",
         gridTemplateColumns: "subgrid",
-        gridTemplateRows: "subgrid (foo) () (a b) (c) () (a b) (c) () (a b) (c)",
+        gridTemplateRows: "subgrid [foo] [] [a b] [c] [] [a b] [c] [] [a b] [c]",
     },
     {
         // https://bugzilla.mozilla.org/show_bug.cgi?id=978478#c1
         // The number of repetitions is clamped to
         // #define GRID_TEMPLATE_MAX_REPETITIONS 10000
-        specified: "subgrid / subgrid (foo) repeat(999999999, (a))",
+        specified: "subgrid / subgrid [foo] repeat(999999999, [a])",
         gridTemplateColumns: "subgrid",
         // Array(n + 1).join(s) is a hack for the non-standard s.repeat(n)
-        gridTemplateRows: "subgrid (foo)" + Array(10000 + 1).join(" (a)"),
+        gridTemplateRows: "subgrid [foo]" + Array(10000 + 1).join(" [a]"),
     },
     {
-        specified: "subgrid () (foo)/ subgrid (bar",
-        gridTemplateColumns: "subgrid () (foo)",
-        gridTemplateRows: "subgrid (bar)",
+        specified: "subgrid [] [foo]/ subgrid [bar",
+        gridTemplateColumns: "subgrid [] [foo]",
+        gridTemplateRows: "subgrid [bar]",
     },
 ];
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/test/test_grid_shorthand_serialization.html firefox-trunk-41.0~a1~hg20150524r245419/layout/style/test/test_grid_shorthand_serialization.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/test/test_grid_shorthand_serialization.html	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/test/test_grid_shorthand_serialization.html	2015-05-25 20:43:10.000000000 +0000
@@ -38,9 +38,9 @@
         shorthand: "40px / subgrid",
     },
     {
-        gridTemplateColumns: "(foo) 40px (bar)",
-        gridTemplateRows: "(baz) 100px (fizz)",
-        shorthand: "(foo) 40px (bar) / (baz) 100px (fizz)",
+        gridTemplateColumns: "[foo] 40px [bar]",
+        gridTemplateRows: "[baz] 100px [fizz]",
+        shorthand: "[foo] 40px [bar] / [baz] 100px [fizz]",
     },
     {
         gridTemplateAreas: "\"a\"",
@@ -49,8 +49,8 @@
     },
     {
         gridTemplateAreas: "\"a\"",
-        gridTemplateRows: "(foo) 20px (bar)",
-        shorthand: "(foo) \"a\" 20px (bar)",
+        gridTemplateRows: "[foo] 20px [bar]",
+        shorthand: "[foo] \"a\" 20px [bar]",
     },
     // Combinations of longhands that make the shorthand non-serializable:
     {
@@ -70,7 +70,7 @@
     },
     {
         gridTemplateAreas: "\"a\"",
-        gridTemplateRows: "subgrid (foo)",
+        gridTemplateRows: "subgrid [foo]",
         shorthand: "",
     },
     {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/test/test_setPropertyWithNull.html firefox-trunk-41.0~a1~hg20150524r245419/layout/style/test/test_setPropertyWithNull.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/test/test_setPropertyWithNull.html	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/test/test_setPropertyWithNull.html	2015-05-25 20:43:10.000000000 +0000
@@ -14,21 +14,21 @@
     var div = document.createElement("div");
     div.style.color = "green";
     div.style.color = "null";
-    ise(div.style.color, "green", 'Assigning "null" as a color should not parse');
+    is(div.style.color, "green", 'Assigning "null" as a color should not parse');
     div.style.setProperty("color", "null");
-    ise(div.style.color, "green",
-        'Passing "null" as a color to setProperty should not parse');
+    is(div.style.color, "green",
+       'Passing "null" as a color to setProperty should not parse');
 
     div.style.setProperty("color", null);
-    ise(div.style.color, "",
-        'Passing null as a color to setProperty should remove the property');
+    is(div.style.color, "",
+       'Passing null as a color to setProperty should remove the property');
 
     div.style.color = "green";
-    ise(div.style.color, "green", 'Assigning "green" as a color should parse');
+    is(div.style.color, "green", 'Assigning "green" as a color should parse');
 
     div.style.color = null;
-    ise(div.style.color, "",
-        'Assigning null as a color should remove the property');
+    is(div.style.color, "",
+       'Assigning null as a color should remove the property');
 
 
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/test/test_value_storage.html firefox-trunk-41.0~a1~hg20150524r245419/layout/style/test/test_value_storage.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/test/test_value_storage.html	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/test/test_value_storage.html	2015-05-25 20:43:10.000000000 +0000
@@ -313,7 +313,7 @@
 }
 
 SimpleTest.waitForExplicitFinish();
-SimpleTest.requestLongerTimeout(4);
+SimpleTest.requestLongerTimeout(5);
 
 SpecialPowers.pushPrefEnv({ set: [["layout.css.variables.enabled", true]] },
                           runTest);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/test/unprefixing_service_iframe.html firefox-trunk-41.0~a1~hg20150524r245419/layout/style/test/unprefixing_service_iframe.html
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/test/unprefixing_service_iframe.html	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/test/unprefixing_service_iframe.html	2015-05-25 20:43:10.000000000 +0000
@@ -348,11 +348,35 @@
   is(getComputedStyleWrapper(elem, "display"), initialDisplay,
      "'display:-webkit-box' shouldn't affect computed 'display' " +
      "when CSS Unprefixing Service is inactive");
+
+  elem.style.display = "-webkit-box";
+  is(getComputedStyleWrapper(elem, "display"), initialDisplay,
+     "Setting elem.style.display to '-webkit-box' shouldn't affect computed " +
+     "'display' when CSS Unprefixing Service is inactive");
+}
+
+// Focused test that CSS Unprefixing Service is functioning properly
+// on direct tweaks to elem.style.display:
+function testStyleDisplayDirectly()
+{
+  let elem = document.getElementById("content");
+  elem.style.display = "-webkit-box";
+
+  is(elem.style.display, "flex",
+     "Setting elem.style.display to '-webkit-box' should produce 'flex' " +
+     "in elem.style.display, when CSS Unprefixing Service is active");
+  is(getComputedStyleWrapper(elem, "display"), "flex",
+     "Setting elem.style.display to '-webkit-box' should produce 'flex' " +
+     "in computed style, when CSS Unprefixing Service is active");
+
+  // clean up:
+  elem.style.display = "";
 }
 
 function startTest()
 {
   if (window.location.hash === "#expectEnabled") {
+    testStyleDisplayDirectly();
     gTestcases.forEach(runOneTest);
   } else if (window.location.hash === "#expectDisabled") {
     testUnprefixingDisabled();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/ua.css firefox-trunk-41.0~a1~hg20150524r245419/layout/style/ua.css
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/ua.css	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/ua.css	2015-05-25 20:43:10.000000000 +0000
@@ -321,12 +321,6 @@
   z-index: 2147483647;
 }
 
-div:-moz-native-anonymous.moz-accessiblecaret {
-  width: 44px;
-  height: 47px;
-  margin-left: -23px;
-}
-
 div:-moz-native-anonymous.moz-accessiblecaret > div.image {
   background-position: center center;
   background-size: 100% 100%;
@@ -340,7 +334,6 @@
 
 div:-moz-native-anonymous.moz-accessiblecaret > div.bar {
   margin-left: 49%;
-  width: 2px;
   background-color: #008aa0;
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/style/viewsource.css firefox-trunk-41.0~a1~hg20150524r245419/layout/style/viewsource.css
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/style/viewsource.css	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/style/viewsource.css	2015-05-25 20:43:10.000000000 +0000
@@ -40,45 +40,45 @@
   font-weight: normal;
   font-style: normal;
 }
-.start-tag {
+.highlight .start-tag {
  color: purple;
  font-weight: bold;
 }
-.end-tag {
+.highlight .end-tag {
  color: purple;
  font-weight: bold;
 }
-.comment {
+.highlight .comment {
  color: green;
  font-style: italic;
 }
-.cdata {
+.highlight .cdata {
  color: #CC0066;
 }
-.doctype {
+.highlight .doctype {
  color: steelblue;
  font-style: italic;
 }
-.pi {
+.highlight .pi {
  color: orchid;
  font-style: italic;
 }
-.entity {
- color:#FF4500;
+.highlight .entity {
+ color: #FF4500;
  font-weight: normal;
 }
-.text {
+.highlight .text {
   font-weight: normal;
 }
-.attribute-name {
+.highlight .attribute-name {
  color: black;
  font-weight: bold;
 }
-.attribute-value {
+.highlight .attribute-value {
  color: blue;
  font-weight: normal;
 }
-.markupdeclaration {
+.highlight .markupdeclaration {
  color: steelblue;
  font-style: italic;
 }
@@ -88,9 +88,9 @@
 span[id] {
  unicode-bidi: -moz-isolate;
 }
-.error, 
-.error > :-moz-any(.start-tag, .end-tag, .comment, .cdata, .doctype, .pi,
-                   .entity, .attribute-name, .attribute-value) {
+.highlight .error,
+.highlight .error > :-moz-any(.start-tag, .end-tag, .comment, .cdata, .doctype,
+                              .pi, .entity, .attribute-name, .attribute-value) {
   color: red;
   font-weight: bold;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/svg/nsSVGMaskFrame.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/svg/nsSVGMaskFrame.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/svg/nsSVGMaskFrame.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/svg/nsSVGMaskFrame.cpp	2015-05-25 20:43:11.000000000 +0000
@@ -332,7 +332,7 @@
   }
 
   *aMaskTransform = ToMatrix(maskSurfaceMatrix);
-  return destMaskSurface;
+  return destMaskSurface.forget();
 }
 
 nsresult
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/svg/nsSVGUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/svg/nsSVGUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/svg/nsSVGUtils.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/svg/nsSVGUtils.cpp	2015-05-25 20:43:11.000000000 +0000
@@ -1454,7 +1454,7 @@
 
   } else {
     uint32_t count = style->mStrokeDasharrayLength;
-    if (!count || !aDashes.SetLength(count)) {
+    if (!count || !aDashes.SetLength(count, fallible)) {
       return false;
     }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/tables/nsTableColGroupFrame.h firefox-trunk-41.0~a1~hg20150524r245419/layout/tables/nsTableColGroupFrame.h
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/tables/nsTableColGroupFrame.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/tables/nsTableColGroupFrame.h	2015-05-25 20:43:11.000000000 +0000
@@ -38,6 +38,8 @@
   {
     nsIFrame* parent = GetParent();
     MOZ_ASSERT(parent && parent->GetType() == nsGkAtoms::tableFrame);
+    MOZ_ASSERT(!parent->GetPrevInFlow(),
+               "Col group should always be in a first-in-flow table frame");
     return static_cast<nsTableFrame*>(parent);
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/tables/nsTableFrame.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/tables/nsTableFrame.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/tables/nsTableFrame.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/tables/nsTableFrame.cpp	2015-05-25 20:43:11.000000000 +0000
@@ -371,9 +371,10 @@
   }
 }
 
-void nsTableFrame::AttributeChangedFor(nsIFrame*       aFrame,
-                                       nsIContent*     aContent,
-                                       nsIAtom*        aAttribute)
+void
+nsTableFrame::AttributeChangedFor(nsIFrame*       aFrame,
+                                  nsIContent*     aContent,
+                                  nsIAtom*        aAttribute)
 {
   nsTableCellFrame *cellFrame = do_QueryFrame(aFrame);
   if (cellFrame) {
@@ -403,7 +404,8 @@
 /* ****** CellMap methods ******* */
 
 /* return the effective col count */
-int32_t nsTableFrame::GetEffectiveColCount() const
+int32_t
+nsTableFrame::GetEffectiveColCount() const
 {
   int32_t colCount = GetColCount();
   if (LayoutStrategy()->GetType() == nsITableLayoutStrategy::Auto) {
@@ -422,7 +424,8 @@
   return colCount;
 }
 
-int32_t nsTableFrame::GetIndexOfLastRealCol()
+int32_t
+nsTableFrame::GetIndexOfLastRealCol()
 {
   int32_t numCols = mColFrames.Length();
   if (numCols > 0) {
@@ -452,8 +455,9 @@
   }
 }
 
-int32_t nsTableFrame::GetEffectiveRowSpan(int32_t                 aRowIndex,
-                                          const nsTableCellFrame& aCell) const
+int32_t
+nsTableFrame::GetEffectiveRowSpan(int32_t                 aRowIndex,
+                                  const nsTableCellFrame& aCell) const
 {
   nsTableCellMap* cellMap = GetCellMap();
   NS_PRECONDITION (nullptr != cellMap, "bad call, cellMap not yet allocated.");
@@ -463,8 +467,9 @@
   return cellMap->GetEffectiveRowSpan(aRowIndex, colIndex);
 }
 
-int32_t nsTableFrame::GetEffectiveRowSpan(const nsTableCellFrame& aCell,
-                                          nsCellMap*              aCellMap)
+int32_t
+nsTableFrame::GetEffectiveRowSpan(const nsTableCellFrame& aCell,
+                                  nsCellMap*              aCellMap)
 {
   nsTableCellMap* tableCellMap = GetCellMap(); if (!tableCellMap) ABORT1(1);
 
@@ -478,8 +483,9 @@
     return tableCellMap->GetEffectiveRowSpan(rowIndex, colIndex);
 }
 
-int32_t nsTableFrame::GetEffectiveColSpan(const nsTableCellFrame& aCell,
-                                          nsCellMap*              aCellMap) const
+int32_t
+nsTableFrame::GetEffectiveColSpan(const nsTableCellFrame& aCell,
+                                  nsCellMap*              aCellMap) const
 {
   nsTableCellMap* tableCellMap = GetCellMap(); if (!tableCellMap) ABORT1(1);
 
@@ -494,14 +500,16 @@
     return tableCellMap->GetEffectiveColSpan(rowIndex, colIndex);
 }
 
-bool nsTableFrame::HasMoreThanOneCell(int32_t aRowIndex) const
+bool
+nsTableFrame::HasMoreThanOneCell(int32_t aRowIndex) const
 {
   nsTableCellMap* tableCellMap = GetCellMap(); if (!tableCellMap) ABORT1(1);
   return tableCellMap->HasMoreThanOneCell(aRowIndex);
 }
 
-void nsTableFrame::AdjustRowIndices(int32_t         aRowIndex,
-                                    int32_t         aAdjustment)
+void
+nsTableFrame::AdjustRowIndices(int32_t         aRowIndex,
+                               int32_t         aAdjustment)
 {
   // Iterate over the row groups and adjust the row indices of all rows
   // whose index is >= aRowIndex.
@@ -514,7 +522,8 @@
 }
 
 
-void nsTableFrame::ResetRowIndices(const nsFrameList::Slice& aRowGroupsToExclude)
+void
+nsTableFrame::ResetRowIndices(const nsFrameList::Slice& aRowGroupsToExclude)
 {
   // Iterate over the row groups and adjust the row indices of all rows
   // omit the rowgroups that will be inserted later
@@ -542,8 +551,9 @@
     }
   }
 }
-void nsTableFrame::InsertColGroups(int32_t                   aStartColIndex,
-                                   const nsFrameList::Slice& aColGroups)
+void
+nsTableFrame::InsertColGroups(int32_t                   aStartColIndex,
+                              const nsFrameList::Slice& aColGroups)
 {
   int32_t colIndex = aStartColIndex;
   nsFrameList::Enumerator colGroups(aColGroups);
@@ -574,8 +584,9 @@
   }
 }
 
-void nsTableFrame::InsertCol(nsTableColFrame& aColFrame,
-                             int32_t          aColIndex)
+void
+nsTableFrame::InsertCol(nsTableColFrame& aColFrame,
+                        int32_t          aColIndex)
 {
   mColFrames.InsertElementAt(aColIndex, &aColFrame);
   nsTableColType insertedColType = aColFrame.GetColType();
@@ -618,10 +629,11 @@
   }
 }
 
-void nsTableFrame::RemoveCol(nsTableColGroupFrame* aColGroupFrame,
-                             int32_t               aColIndex,
-                             bool                  aRemoveFromCache,
-                             bool                  aRemoveFromCellMap)
+void
+nsTableFrame::RemoveCol(nsTableColGroupFrame* aColGroupFrame,
+                        int32_t               aColIndex,
+                        bool                  aRemoveFromCache,
+                        bool                  aRemoveFromCellMap)
 {
   if (aRemoveFromCache) {
     mColFrames.RemoveElementAt(aColIndex);
@@ -811,9 +823,10 @@
   }
 }
 
-void nsTableFrame::InsertCells(nsTArray<nsTableCellFrame*>& aCellFrames,
-                               int32_t                      aRowIndex,
-                               int32_t                      aColIndexBefore)
+void
+nsTableFrame::InsertCells(nsTArray<nsTableCellFrame*>& aCellFrames,
+                          int32_t                      aRowIndex,
+                          int32_t                      aColIndexBefore)
 {
   nsTableCellMap* cellMap = GetCellMap();
   if (cellMap) {
@@ -852,8 +865,9 @@
   return (aNumFrames - numColsRemoved);
 }
 
-void nsTableFrame::RemoveCell(nsTableCellFrame* aCellFrame,
-                              int32_t           aRowIndex)
+void
+nsTableFrame::RemoveCell(nsTableCellFrame* aCellFrame,
+                         int32_t           aRowIndex)
 {
   nsTableCellMap* cellMap = GetCellMap();
   if (cellMap) {
@@ -885,9 +899,10 @@
 }
 
 // this cannot extend beyond a single row group
-void nsTableFrame::AppendRows(nsTableRowGroupFrame*       aRowGroupFrame,
-                              int32_t                     aRowIndex,
-                              nsTArray<nsTableRowFrame*>& aRowFrames)
+void
+nsTableFrame::AppendRows(nsTableRowGroupFrame*       aRowGroupFrame,
+                         int32_t                     aRowIndex,
+                         nsTArray<nsTableRowFrame*>& aRowFrames)
 {
   nsTableCellMap* cellMap = GetCellMap();
   if (cellMap) {
@@ -938,7 +953,8 @@
 }
 
 // this cannot extend beyond a single row group
-void nsTableFrame::RemoveRows(nsTableRowFrame& aFirstRowFrame,
+void
+nsTableFrame::RemoveRows(nsTableRowFrame& aFirstRowFrame,
                               int32_t          aNumRowsToRemove,
                               bool             aConsiderSpans)
 {
@@ -1174,7 +1190,8 @@
   nsDisplayTableItemGeometry::UpdateDrawResult(this, result);
 }
 
-static int32_t GetTablePartRank(nsDisplayItem* aItem)
+static int32_t
+GetTablePartRank(nsDisplayItem* aItem)
 {
   nsIAtom* type = aItem->Frame()->GetType();
   if (type == nsGkAtoms::tableFrame)
@@ -2249,11 +2266,17 @@
     const nsStyleDisplay* display = f->StyleDisplay();
 
     if (NS_STYLE_DISPLAY_TABLE_COLUMN_GROUP == display->mDisplay) {
+      if (MOZ_UNLIKELY(GetPrevInFlow())) {
+        nsFrameList colgroupFrame(f, f);
+        auto firstInFlow = static_cast<nsTableFrame*>(FirstInFlow());
+        firstInFlow->AppendFrames(aListID, colgroupFrame);
+        continue;
+      }
       nsTableColGroupFrame* lastColGroup =
         nsTableColGroupFrame::GetLastRealColGroup(this);
       int32_t startColIndex = (lastColGroup)
         ? lastColGroup->GetStartColumnIndex() + lastColGroup->GetColCount() : 0;
-      mColGroups.InsertFrame(nullptr, lastColGroup, f);
+      mColGroups.InsertFrame(this, lastColGroup, f);
       // Insert the colgroup and its cols into the table
       InsertColGroups(startColIndex,
                       nsFrameList::Slice(mColGroups, f, f->GetNextSibling()));
@@ -2347,16 +2370,22 @@
 {
   // See what kind of frame we have
   const nsStyleDisplay* display = aFrameList.FirstChild()->StyleDisplay();
+  bool isColGroup = NS_STYLE_DISPLAY_TABLE_COLUMN_GROUP == display->mDisplay;
 #ifdef DEBUG
   // Verify that either all siblings have display:table-column-group, or they
   // all have display values different from table-column-group.
-  for (nsFrameList::Enumerator e(aFrameList); !e.AtEnd(); e.Next()) {
-    const nsStyleDisplay* nextDisplay = e.get()->StyleDisplay();
-    MOZ_ASSERT((display->mDisplay == NS_STYLE_DISPLAY_TABLE_COLUMN_GROUP) ==
-               (nextDisplay->mDisplay == NS_STYLE_DISPLAY_TABLE_COLUMN_GROUP),
+  for (nsIFrame* frame : aFrameList) {
+    auto nextDisplay = frame->StyleDisplay()->mDisplay;
+    MOZ_ASSERT(isColGroup ==
+               (nextDisplay == NS_STYLE_DISPLAY_TABLE_COLUMN_GROUP),
                "heterogenous childlist");
   }
 #endif
+  if (MOZ_UNLIKELY(isColGroup && GetPrevInFlow())) {
+    auto firstInFlow = static_cast<nsTableFrame*>(FirstInFlow());
+    firstInFlow->AppendFrames(aListID, aFrameList);
+    return;
+  }
   if (aPrevFrame) {
     const nsStyleDisplay* prevDisplay = aPrevFrame->StyleDisplay();
     // Make sure they belong on the same frame list
@@ -2377,8 +2406,6 @@
       if (MOZ_LIKELY(container)) { // XXX need this null-check, see bug 411823.
         int32_t newIndex = container->IndexOf(content);
         nsIFrame* kidFrame;
-        bool isColGroup = (NS_STYLE_DISPLAY_TABLE_COLUMN_GROUP ==
-                             display->mDisplay);
         nsTableColGroupFrame* lastColGroup;
         if (isColGroup) {
           kidFrame = mColGroups.FirstChild();
@@ -2415,7 +2442,7 @@
     NS_ASSERTION(aListID == kColGroupList, "unexpected child list");
     // Insert the column group frames
     const nsFrameList::Slice& newColgroups =
-      mColGroups.InsertFrames(nullptr, aPrevFrame, aFrameList);
+      mColGroups.InsertFrames(this, aPrevFrame, aFrameList);
     // find the starting col index for the first new col group
     int32_t startColIndex = 0;
     if (aPrevFrame) {
@@ -2689,12 +2716,13 @@
 
 // Position and size aKidFrame and update our reflow state. The origin of
 // aKidRect is relative to the upper-left origin of our frame
-void nsTableFrame::PlaceChild(nsTableReflowState&  aReflowState,
-                              nsIFrame*            aKidFrame,
-                              nsPoint              aKidPosition,
-                              nsHTMLReflowMetrics& aKidDesiredSize,
-                              const nsRect&        aOriginalKidRect,
-                              const nsRect&        aOriginalKidVisualOverflow)
+void
+nsTableFrame::PlaceChild(nsTableReflowState&  aReflowState,
+                         nsIFrame*            aKidFrame,
+                         nsPoint              aKidPosition,
+                         nsHTMLReflowMetrics& aKidDesiredSize,
+                         const nsRect&        aOriginalKidRect,
+                         const nsRect&        aOriginalKidVisualOverflow)
 {
   bool isFirstReflow =
     (aKidFrame->GetStateBits() & NS_FRAME_FIRST_REFLOW) != 0;
@@ -3206,7 +3234,8 @@
 }
 
 void
-nsTableFrame::CalcDesiredHeight(const nsHTMLReflowState& aReflowState, nsHTMLReflowMetrics& aDesiredSize)
+nsTableFrame::CalcDesiredHeight(const nsHTMLReflowState& aReflowState,
+                                nsHTMLReflowMetrics& aDesiredSize)
 {
   nsTableCellMap* cellMap = GetCellMap();
   if (!cellMap) {
@@ -3545,7 +3574,8 @@
   ResizeCells(*this);
 }
 
-int32_t nsTableFrame::GetColumnISize(int32_t aColIndex)
+int32_t
+nsTableFrame::GetColumnISize(int32_t aColIndex)
 {
   nsTableFrame* firstInFlow = static_cast<nsTableFrame*>(FirstInFlow());
   if (this == firstInFlow) {
@@ -3555,7 +3585,8 @@
   return firstInFlow->GetColumnISize(aColIndex);
 }
 
-nscoord nsTableFrame::GetColSpacing()
+nscoord
+nsTableFrame::GetColSpacing()
 {
   if (IsBorderCollapse())
     return 0;
@@ -3564,7 +3595,8 @@
 }
 
 // XXX: could cache this.  But be sure to check style changes if you do!
-nscoord nsTableFrame::GetColSpacing(int32_t aColIndex)
+nscoord
+nsTableFrame::GetColSpacing(int32_t aColIndex)
 {
   NS_ASSERTION(aColIndex >= -1 && aColIndex <= GetColCount(),
                "Column index exceeds the bounds of the table");
@@ -3574,8 +3606,9 @@
   return GetColSpacing();
 }
 
-nscoord nsTableFrame::GetColSpacing(int32_t aStartColIndex,
-                                      int32_t aEndColIndex)
+nscoord
+nsTableFrame::GetColSpacing(int32_t aStartColIndex,
+                            int32_t aEndColIndex)
 {
   NS_ASSERTION(aStartColIndex >= -1 && aStartColIndex <= GetColCount(),
                "Start column index exceeds the bounds of the table");
@@ -3588,7 +3621,8 @@
   return GetColSpacing() * (aEndColIndex - aStartColIndex);
 }
 
-nscoord nsTableFrame::GetRowSpacing()
+nscoord
+nsTableFrame::GetRowSpacing()
 {
   if (IsBorderCollapse())
     return 0;
@@ -3597,7 +3631,8 @@
 }
 
 // XXX: could cache this. But be sure to check style changes if you do!
-nscoord nsTableFrame::GetRowSpacing(int32_t aRowIndex)
+nscoord
+nsTableFrame::GetRowSpacing(int32_t aRowIndex)
 {
   NS_ASSERTION(aRowIndex >= -1 && aRowIndex <= GetRowCount(),
                "Row index exceeds the bounds of the table");
@@ -3607,8 +3642,9 @@
   return GetRowSpacing();
 }
 
-nscoord nsTableFrame::GetRowSpacing(int32_t aStartRowIndex,
-                                      int32_t aEndRowIndex)
+nscoord
+nsTableFrame::GetRowSpacing(int32_t aStartRowIndex,
+                            int32_t aEndRowIndex)
 {
   NS_ASSERTION(aStartRowIndex >= -1 && aStartRowIndex <= GetRowCount(),
                "Start row index exceeds the bounds of the table");
@@ -3889,7 +3925,8 @@
   Init(firstChild);
 }
 
-void nsTableIterator::Init(nsIFrame* aFirstChild)
+void
+nsTableIterator::Init(nsIFrame* aFirstChild)
 {
   mFirstListChild = aFirstChild;
   mFirstChild     = aFirstChild;
@@ -3916,13 +3953,15 @@
   }
 }
 
-nsIFrame* nsTableIterator::First()
+nsIFrame*
+nsTableIterator::First()
 {
   mCurrentChild = mFirstChild;
   return mCurrentChild;
 }
 
-nsIFrame* nsTableIterator::Next()
+nsIFrame*
+nsTableIterator::Next()
 {
   if (!mCurrentChild) {
     return nullptr;
@@ -3944,12 +3983,14 @@
   }
 }
 
-bool nsTableIterator::IsLeftToRight()
+bool
+nsTableIterator::IsLeftToRight()
 {
   return mLeftToRight;
 }
 
-int32_t nsTableIterator::Count()
+int32_t
+nsTableIterator::Count()
 {
   if (-1 == mCount) {
     mCount = 0;
@@ -4229,7 +4270,8 @@
   ResetCellInfo();
 }
 
-void BCMapCellInfo::ResetCellInfo()
+void
+BCMapCellInfo::ResetCellInfo()
 {
   mCellData  = nullptr;
   mRowGroup  = nullptr;
@@ -4243,12 +4285,14 @@
   mRgAtStart = mRgAtEnd = mCgAtStart = mCgAtEnd = false;
 }
 
-inline int32_t BCMapCellInfo::GetCellEndRowIndex() const
+inline int32_t
+BCMapCellInfo::GetCellEndRowIndex() const
 {
   return mRowIndex + mRowSpan - 1;
 }
 
-inline int32_t BCMapCellInfo::GetCellEndColIndex() const
+inline int32_t
+BCMapCellInfo::GetCellEndColIndex() const
 {
   return mColIndex + mColSpan - 1;
 }
@@ -4786,7 +4830,7 @@
                const BCCellBorder& aBorder1,
                const BCCellBorder& aBorder2,
                bool                aSecondIsHorizontal,
-               bool*             aFirstDominates = nullptr)
+               bool*               aFirstDominates = nullptr)
 {
   bool firstDominates = true;
 
@@ -4847,8 +4891,8 @@
                const nsIFrame*  aRowGroupFrame,
                const nsIFrame*  aRowFrame,
                const nsIFrame*  aCellFrame,
-               WritingMode aTableWM,
-               LogicalSide aSide,
+               WritingMode      aTableWM,
+               LogicalSide      aSide,
                bool             aAja)
 {
   BCCellBorder border, tempBorder;
@@ -6238,8 +6282,6 @@
 class BCPaintBorderIterator
 {
 public:
-
-
   explicit BCPaintBorderIterator(nsTableFrame* aTable);
   ~BCPaintBorderIterator() { if (mVerInfo) {
                               delete [] mVerInfo;
@@ -6540,7 +6582,7 @@
  */
 void
 BCPaintBorderIterator::SetNewData(int32_t aY,
-                                int32_t aX)
+                                  int32_t aX)
 {
   if (!mTableCellMap || !mTableCellMap->mBCInfo) ABORT0();
 
@@ -7041,9 +7083,9 @@
   +  */
 void
 BCHorizontalSeg::Start(BCPaintBorderIterator& aIter,
-                       BCBorderOwner        aBorderOwner,
-                       BCPixelSize          aBottomVerSegWidth,
-                       BCPixelSize          aHorSegHeight)
+                       BCBorderOwner          aBorderOwner,
+                       BCPixelSize            aBottomVerSegWidth,
+                       BCPixelSize            aHorSegHeight)
 {
   mozilla::css::Side cornerOwnerSide = NS_SIDE_TOP;
   bool bevel     = false;
@@ -7368,7 +7410,7 @@
  */
 void
 nsTableFrame::PaintBCBorders(nsRenderingContext& aRenderingContext,
-                             const nsRect&        aDirtyRect)
+                             const nsRect&       aDirtyRect)
 {
   // We first transfer the aDirtyRect into cellmap coordinates to compute which
   // cell borders need to be painted
@@ -7398,7 +7440,8 @@
   }
 }
 
-bool nsTableFrame::RowHasSpanningCells(int32_t aRowIndex, int32_t aNumEffCols)
+bool
+nsTableFrame::RowHasSpanningCells(int32_t aRowIndex, int32_t aNumEffCols)
 {
   bool result = false;
   nsTableCellMap* cellMap = GetCellMap();
@@ -7409,7 +7452,8 @@
   return result;
 }
 
-bool nsTableFrame::RowIsSpannedInto(int32_t aRowIndex, int32_t aNumEffCols)
+bool
+nsTableFrame::RowIsSpannedInto(int32_t aRowIndex, int32_t aNumEffCols)
 {
   bool result = false;
   nsTableCellMap* cellMap = GetCellMap();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/xul/nsImageBoxFrame.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/xul/nsImageBoxFrame.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/xul/nsImageBoxFrame.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/xul/nsImageBoxFrame.cpp	2015-05-25 20:43:12.000000000 +0000
@@ -437,6 +437,36 @@
   aLayer->SetBaseTransform(gfx::Matrix4x4::From2D(transform));
 }
 
+bool
+nsDisplayXULImage::CanOptimizeToImageLayer(LayerManager* aManager,
+                                           nsDisplayListBuilder* aBuilder)
+{
+  uint32_t flags = aBuilder->ShouldSyncDecodeImages()
+                 ? imgIContainer::FLAG_SYNC_DECODE
+                 : imgIContainer::FLAG_NONE;
+
+  return static_cast<nsImageBoxFrame*>(mFrame)
+    ->IsImageContainerAvailable(aManager, flags);
+}
+
+bool
+nsImageBoxFrame::IsImageContainerAvailable(LayerManager* aManager,
+                                           uint32_t aFlags)
+{
+  bool hasSubRect = !mUseSrcAttr && (mSubRect.width > 0 || mSubRect.height > 0);
+  if (hasSubRect || !mImageRequest) {
+    return false;
+  }
+
+  nsCOMPtr<imgIContainer> imgCon;
+  mImageRequest->GetImage(getter_AddRefs(imgCon));
+  if (!imgCon) {
+    return false;
+  }
+  
+  return imgCon->IsImageContainerAvailable(aManager, aFlags);
+}
+
 already_AddRefed<ImageContainer>
 nsDisplayXULImage::GetContainer(LayerManager* aManager,
                                 nsDisplayListBuilder* aBuilder)
@@ -451,17 +481,23 @@
 already_AddRefed<ImageContainer>
 nsImageBoxFrame::GetContainer(LayerManager* aManager, uint32_t aFlags)
 {
-  bool hasSubRect = !mUseSrcAttr && (mSubRect.width > 0 || mSubRect.height > 0);
-  if (hasSubRect || !mImageRequest) {
+  MOZ_ASSERT(IsImageContainerAvailable(aManager, aFlags),
+             "Should call IsImageContainerAvailable and get true before "
+             "calling GetContainer");
+  if (!mImageRequest) {
+    MOZ_ASSERT_UNREACHABLE("mImageRequest should be available if "
+                           "IsImageContainerAvailable returned true");
     return nullptr;
   }
 
   nsCOMPtr<imgIContainer> imgCon;
   mImageRequest->GetImage(getter_AddRefs(imgCon));
   if (!imgCon) {
+    MOZ_ASSERT_UNREACHABLE("An imgIContainer should be available if "
+                           "IsImageContainerAvailable returned true");
     return nullptr;
   }
-  
+
   return imgCon->GetImageContainer(aManager, aFlags);
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/xul/nsImageBoxFrame.h firefox-trunk-41.0~a1~hg20150524r245419/layout/xul/nsImageBoxFrame.h
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/xul/nsImageBoxFrame.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/xul/nsImageBoxFrame.h	2015-05-25 20:43:12.000000000 +0000
@@ -96,6 +96,7 @@
                         const nsRect& aDirtyRect,
                         nsPoint aPt, uint32_t aFlags);
 
+  bool IsImageContainerAvailable(LayerManager* aManager, uint32_t aFlags);
   already_AddRefed<ImageContainer> GetContainer(LayerManager* aManager,
                                                 uint32_t aFlags);
 
@@ -142,6 +143,8 @@
   }
 #endif
 
+  virtual bool CanOptimizeToImageLayer(LayerManager* aManager,
+                                       nsDisplayListBuilder* aBuilder) override;
   virtual already_AddRefed<ImageContainer> GetContainer(LayerManager* aManager,
                                                         nsDisplayListBuilder* aBuilder) override;
   virtual void ConfigureLayer(ImageLayer* aLayer,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/xul/nsMenuPopupFrame.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/xul/nsMenuPopupFrame.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/xul/nsMenuPopupFrame.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/xul/nsMenuPopupFrame.cpp	2015-05-25 20:43:12.000000000 +0000
@@ -105,7 +105,8 @@
   mIsMenuLocked(false),
   mMouseTransparent(false),
   mHFlip(false),
-  mVFlip(false)
+  mVFlip(false),
+  mAnchorType(MenuPopupAnchorType_Node)
 {
   // the preference name is backwards here. True means that the 'top' level is
   // the default, and false means that the 'parent' level is the default.
@@ -621,6 +622,7 @@
                                   nsIContent* aTriggerContent,
                                   const nsAString& aPosition,
                                   int32_t aXPos, int32_t aYPos,
+                                  MenuPopupAnchorType aAnchorType,
                                   bool aAttributesOverride)
 {
   EnsureWidget();
@@ -635,10 +637,12 @@
   mHFlip = false;
   mAlignmentOffset = 0;
 
+  mAnchorType = aAnchorType;
+
   // if aAttributesOverride is true, then the popupanchor, popupalign and
   // position attributes on the <popup> override those values passed in.
   // If false, those attributes are only used if the values passed in are empty
-  if (aAnchorContent) {
+  if (aAnchorContent || aAnchorType == MenuPopupAnchorType_Rect) {
     nsAutoString anchor, align, position, flip;
     mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::popupanchor, anchor);
     mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::popupalign, align);
@@ -730,8 +734,7 @@
     }
   }
 
-  mScreenXPos = -1;
-  mScreenYPos = -1;
+  mScreenRect = nsIntRect(-1, -1, 0, 0);
 
   if (aAttributesOverride) {
     // Use |left| and |top| dimension attributes to position the popup if
@@ -744,12 +747,12 @@
     if (!left.IsEmpty()) {
       int32_t x = left.ToInteger(&err);
       if (NS_SUCCEEDED(err))
-        mScreenXPos = x;
+        mScreenRect.x = x;
     }
     if (!top.IsEmpty()) {
       int32_t y = top.ToInteger(&err);
       if (NS_SUCCEEDED(err))
-        mScreenYPos = y;
+        mScreenRect.y = y;
     }
   }
 }
@@ -764,13 +767,26 @@
   mPopupState = ePopupShowing;
   mAnchorContent = nullptr;
   mTriggerContent = aTriggerContent;
-  mScreenXPos = aXPos;
-  mScreenYPos = aYPos;
+  mScreenRect = nsIntRect(aXPos, aYPos, 0, 0);
+  mXPos = 0;
+  mYPos = 0;
   mFlip = FlipType_Default;
   mPopupAnchor = POPUPALIGNMENT_NONE;
   mPopupAlignment = POPUPALIGNMENT_NONE;
   mIsContextMenu = aIsContextMenu;
   mAdjustOffsetForContextMenu = aIsContextMenu;
+  mAnchorType = MenuPopupAnchorType_Point;
+}
+
+void
+nsMenuPopupFrame::InitializePopupAtRect(nsIContent* aTriggerContent,
+                                        const nsAString& aPosition,
+                                        const nsIntRect& aRect,
+                                        bool aAttributesOverride)
+{
+  InitializePopup(nullptr, aTriggerContent, aPosition, 0, 0,
+                  MenuPopupAnchorType_Rect, aAttributesOverride);
+  mScreenRect = aRect;
 }
 
 void
@@ -790,18 +806,18 @@
   // but doesn't use both together.
   if (aXPos == -1 && aYPos == -1) {
     mAnchorContent = aAnchorContent;
-    mScreenXPos = -1;
-    mScreenYPos = -1;
+    mAnchorType = MenuPopupAnchorType_Node;
+    mScreenRect = nsIntRect(-1, -1, 0, 0);
     mXPos = 0;
     mYPos = 0;
     InitPositionFromAnchorAlign(aAnchor, aAlign);
   }
   else {
     mAnchorContent = nullptr;
+    mAnchorType = MenuPopupAnchorType_Point;
     mPopupAnchor = POPUPALIGNMENT_NONE;
     mPopupAlignment = POPUPALIGNMENT_NONE;
-    mScreenXPos = aXPos;
-    mScreenYPos = aYPos;
+    mScreenRect = nsIntRect(aXPos, aYPos, 0, 0);
     mXPos = aXPos;
     mYPos = aYPos;
   }
@@ -1211,44 +1227,65 @@
                rootFrame->GetView() == GetView()->GetParent(),
                "rootFrame's view is not our view's parent???");
 
-  // if the frame is not specified, use the anchor node passed to OpenPopup. If
-  // that wasn't specified either, use the root frame. Note that mAnchorContent
-  // might be a different document so its presshell must be used.
-  if (!aAnchorFrame) {
-    if (mAnchorContent) {
-      aAnchorFrame = mAnchorContent->GetPrimaryFrame();
+  // For anchored popups, the anchor rectangle. For non-anchored popups, the
+  // size will be 0.
+  nsRect anchorRect;
+
+  // Width of the parent, used when aSizedToPopup is true.
+  int32_t parentWidth;
+
+  bool anchored = IsAnchored();
+  if (anchored || aSizedToPopup) {
+    // In order to deal with transforms, we need the root prescontext:
+    nsPresContext* rootPresContext = presContext->GetRootPresContext();
+
+    // If we can't reach a root pres context, don't bother continuing:
+    if (!rootPresContext) {
+      return NS_OK;
     }
 
-    if (!aAnchorFrame) {
-      aAnchorFrame = rootFrame;
-      if (!aAnchorFrame)
-        return NS_OK;
+    // If anchored to a rectangle, use that rectangle. Otherwise, determine the
+    // rectangle from the anchor.
+    if (mAnchorType == MenuPopupAnchorType_Rect) {
+      anchorRect = ToAppUnits(mScreenRect, presContext->AppUnitsPerCSSPixel());
     }
-  }
+    else {
+      // if the frame is not specified, use the anchor node passed to OpenPopup. If
+      // that wasn't specified either, use the root frame. Note that mAnchorContent
+      // might be a different document so its presshell must be used.
+      if (!aAnchorFrame) {
+        if (mAnchorContent) {
+          aAnchorFrame = mAnchorContent->GetPrimaryFrame();
+        }
 
-  // In order to deal with transforms, we need the root prescontext:
-  nsPresContext* rootPresContext = presContext->GetRootPresContext();
+        if (!aAnchorFrame) {
+          aAnchorFrame = rootFrame;
+          if (!aAnchorFrame)
+            return NS_OK;
+        }
+      }
 
-  // If we can't reach a root pres context, don't bother continuing:
-  if (!rootPresContext) {
-    return NS_OK;
-  }
+      // And then we need its root frame for a reference
+      nsIFrame* referenceFrame = rootPresContext->FrameManager()->GetRootFrame();
 
-  // And then we need its root frame for a reference
-  nsIFrame* referenceFrame = rootPresContext->FrameManager()->GetRootFrame();
+      // the dimensions of the anchor
+      nsRect parentRect = aAnchorFrame->GetRectRelativeToSelf();
+      // Relative to the root
+      anchorRect = nsLayoutUtils::TransformFrameRectToAncestor(aAnchorFrame,
+                                                               parentRect,
+                                                               referenceFrame);
+      // Relative to the screen
+      anchorRect.MoveBy(referenceFrame->GetScreenRectInAppUnits().TopLeft());
+
+      // In its own app units
+      anchorRect =
+        anchorRect.ScaleToOtherAppUnitsRoundOut(rootPresContext->AppUnitsPerDevPixel(),
+                                                presContext->AppUnitsPerDevPixel());
+    }
 
-  // the dimensions of the anchor
-  nsRect parentRect = aAnchorFrame->GetRectRelativeToSelf();
-  // Relative to the root
-  parentRect = nsLayoutUtils::TransformFrameRectToAncestor(aAnchorFrame,
-                                                           parentRect,
-                                                           referenceFrame);
-  // Relative to the screen
-  parentRect.MoveBy(referenceFrame->GetScreenRectInAppUnits().TopLeft());
-  // In its own app units
-  parentRect =
-    parentRect.ScaleToOtherAppUnitsRoundOut(rootPresContext->AppUnitsPerDevPixel(),
-                                            presContext->AppUnitsPerDevPixel());
+    // The width is needed when aSizedToPopup is true
+    parentWidth = anchorRect.width;
+  }
 
   // Set the popup's size to the preferred size. Below, this size will be
   // adjusted to fit on the screen or within the content area. If the anchor
@@ -1256,16 +1293,12 @@
   // width. The preferred size should already be set by the parent frame.
   NS_ASSERTION(mPrefSize.width >= 0 || mPrefSize.height >= 0,
                "preferred size of popup not set");
-  mRect.width = aSizedToPopup ? parentRect.width : mPrefSize.width;
+  mRect.width = aSizedToPopup ? parentWidth : mPrefSize.width;
   mRect.height = mPrefSize.height;
 
   // the screen position in app units where the popup should appear
   nsPoint screenPoint;
 
-  // For anchored popups, the anchor rectangle. For non-anchored popups, the
-  // size will be 0.
-  nsRect anchorRect = parentRect;
-
   // indicators of whether the popup should be flipped or resized.
   FlipStyle hFlip = FlipStyle_None, vFlip = FlipStyle_None;
 
@@ -1281,14 +1314,14 @@
   bool isNoAutoHide = IsNoAutoHide();
   nsPopupLevel popupLevel = PopupLevel(isNoAutoHide);
 
-  if (IsAnchored()) {
+  if (anchored) {
     // if we are anchored, there are certain things we don't want to do when
     // repositioning the popup to fit on the screen, such as end up positioned
     // over the anchor, for instance a popup appearing over the menu label.
     // When doing this reposition, we want to move the popup to the side with
     // the most room. The combination of anchor and alignment dictate if we 
     // readjust above/below or to the left/right.
-    if (mAnchorContent) {
+    if (mAnchorContent || mAnchorType == MenuPopupAnchorType_Rect) {
       // move the popup according to the anchor and alignment. This will also
       // tell us which axis the popup is flush against in case we have to move
       // it around later. The AdjustPositionForAnchorAlign method accounts for
@@ -1321,18 +1354,20 @@
     // the window is moved. Popups at the parent level follow the parent
     // window as it is moved and remained anchored, so we want to maintain the
     // anchoring instead.
-    if (isNoAutoHide && popupLevel != ePopupLevelParent) {
+    if (isNoAutoHide &&
+        (popupLevel != ePopupLevelParent || mAnchorType == MenuPopupAnchorType_Rect)) {
       // Account for the margin that will end up being added to the screen coordinate
       // the next time SetPopupPosition is called.
-      mScreenXPos = presContext->AppUnitsToIntCSSPixels(screenPoint.x - margin.left);
-      mScreenYPos = presContext->AppUnitsToIntCSSPixels(screenPoint.y - margin.top);
+      mAnchorType = MenuPopupAnchorType_Point;
+      mScreenRect.x = presContext->AppUnitsToIntCSSPixels(screenPoint.x - margin.left);
+      mScreenRect.y = presContext->AppUnitsToIntCSSPixels(screenPoint.y - margin.top);
     }
   }
   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 zoom as mScreenXPos and
-    // mScreenYPos are unzoomed screen coordinates.
+    // The popup is positioned at a screen coordinate.
+    // First convert the screen position in mScreenRect from CSS pixels into
+    // device pixels, ignoring any zoom as mScreenRect holds unzoomed screen
+    // coordinates.
     int32_t factor = devContext->AppUnitsPerDevPixelAtUnitFullZoom();
 
     // context menus should be offset by two pixels so that they don't appear
@@ -1346,9 +1381,9 @@
 
     // next, convert into app units accounting for the zoom
     screenPoint.x = presContext->DevPixelsToAppUnits(
-                      nsPresContext::CSSPixelsToAppUnits(mScreenXPos) / factor);
+                      nsPresContext::CSSPixelsToAppUnits(mScreenRect.x) / factor);
     screenPoint.y = presContext->DevPixelsToAppUnits(
-                      nsPresContext::CSSPixelsToAppUnits(mScreenYPos) / factor);
+                      nsPresContext::CSSPixelsToAppUnits(mScreenRect.y) / factor);
     anchorRect = nsRect(screenPoint, nsSize(0, 0));
 
     // add the margins on the popup
@@ -1448,7 +1483,7 @@
   if (aSizedToPopup) {
     nsBoxLayoutState state(PresContext());
     // XXXndeakin can parentSize.width still extend outside?
-    SetBounds(state, nsRect(mRect.x, mRect.y, parentRect.width, mRect.height));
+    SetBounds(state, nsRect(mRect.x, mRect.y, parentWidth, mRect.height));
   }
 
   return NS_OK;
@@ -1635,6 +1670,87 @@
   }
 }
 
+void nsMenuPopupFrame::ChangeByPage(bool aIsUp)
+{
+  nsIFrame* parentMenu = GetParent();
+  if (parentMenu) {
+    // Only scroll by page within menulists.
+    nsCOMPtr<nsIDOMXULMenuListElement> menulist = do_QueryInterface(parentMenu->GetContent());
+    if (!menulist) {
+      return;
+    }
+  }
+
+  nsMenuFrame* newMenu = nullptr;
+  nsIFrame* currentMenu = mCurrentMenu;
+  if (!currentMenu) {
+    // If there is no current menu item, get the first item. When moving up,
+    // just use this as the newMenu and leave currentMenu null so that no
+    // check for a later element is performed. When moving down, set currentMenu
+    // so that we look for one page down from the first item.
+    newMenu = nsXULPopupManager::GetNextMenuItem(this, nullptr, true);
+    if (!aIsUp) {
+      currentMenu = newMenu;
+    }
+  }
+
+  if (currentMenu) {
+    nscoord scrollHeight = mRect.height;
+    nsIScrollableFrame *scrollframe = GetScrollFrame(this);
+    if (scrollframe) {
+      scrollHeight = scrollframe->GetScrollPortRect().height;
+    }
+
+    // Get the position of the current item and add or subtract one popup's
+    // height to or from it.
+    nscoord targetPosition = aIsUp ? currentMenu->GetRect().YMost() - scrollHeight :
+                                     currentMenu->GetRect().y + scrollHeight;
+
+    // Indicates that the last visible child was a valid menuitem.
+    bool lastWasValid = false;
+
+    // Look for the next child which is just past the target position. This child
+    // will need to be selected.
+    while (currentMenu) {
+      // Only consider menu frames.
+      nsMenuFrame* menuFrame = do_QueryFrame(currentMenu);
+      if (menuFrame &&
+          nsXULPopupManager::IsValidMenuItem(PresContext(), menuFrame->GetContent(), true)) {
+
+        // If the right position was found, break out. Otherwise, look for another item.
+        if ((!aIsUp && currentMenu->GetRect().YMost() > targetPosition) ||
+            (aIsUp && currentMenu->GetRect().y < targetPosition)) {
+
+          // If the last visible child was not a valid menuitem or was disabled,
+          // use this as the menu to select, skipping over any non-valid items at
+          // the edge of the page.
+          if (!lastWasValid) {
+            newMenu = menuFrame;
+          }
+
+          break;
+        }
+
+        // Assign this item to newMenu. This item will be selected in case we
+        // don't find any more. 
+        lastWasValid = true;
+        newMenu = menuFrame;
+      }
+      else {
+        lastWasValid = false;
+      }
+
+      currentMenu = aIsUp ? currentMenu->GetPrevSibling() :
+                            currentMenu->GetNextSibling();
+    }
+  }
+
+  // Select the new menuitem.
+  if (newMenu) {
+    ChangeMenuItem(newMenu, false);
+  }
+}
+
 NS_IMETHODIMP nsMenuPopupFrame::SetCurrentMenuItem(nsMenuFrame* aMenuItem)
 {
   if (mCurrentMenu == aMenuItem)
@@ -2000,7 +2116,7 @@
 nsMenuPopupFrame::MoveTo(int32_t aLeft, int32_t aTop, bool aUpdateAttrs)
 {
   nsIWidget* widget = GetWidget();
-  if ((mScreenXPos == aLeft && mScreenYPos == aTop) &&
+  if ((mScreenRect.x == aLeft && mScreenRect.y == aTop) &&
       (!widget || widget->GetClientOffset() == mLastClientOffset)) {
     return;
   }
@@ -2021,8 +2137,10 @@
   }
 
   nsPresContext* presContext = PresContext();
-  mScreenXPos = aLeft - presContext->AppUnitsToIntCSSPixels(margin.left);
-  mScreenYPos = aTop - presContext->AppUnitsToIntCSSPixels(margin.top);
+  mAnchorType = aLeft == -1 || aTop == -1 ?
+                MenuPopupAnchorType_Node : MenuPopupAnchorType_Point;
+  mScreenRect.x = aLeft - presContext->AppUnitsToIntCSSPixels(margin.left);
+  mScreenRect.y = aTop - presContext->AppUnitsToIntCSSPixels(margin.top);
 
   SetPopupPosition(nullptr, true, false);
 
@@ -2048,7 +2166,7 @@
 
   nsPopupState oldstate = mPopupState;
   InitializePopup(aAnchorContent, mTriggerContent, aPosition,
-                  aXPos, aYPos, aAttributesOverride);
+                  aXPos, aYPos, MenuPopupAnchorType_Node, aAttributesOverride);
   // InitializePopup changed the state so reset it.
   mPopupState = oldstate;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/xul/nsMenuPopupFrame.h firefox-trunk-41.0~a1~hg20150524r245419/layout/xul/nsMenuPopupFrame.h
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/xul/nsMenuPopupFrame.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/xul/nsMenuPopupFrame.h	2015-05-25 20:43:12.000000000 +0000
@@ -86,6 +86,12 @@
   FlipType_Slide = 3    // allow the arrow to "slide" instead of resizing
 };
 
+enum MenuPopupAnchorType {
+  MenuPopupAnchorType_Node = 0, // anchored to a node
+  MenuPopupAnchorType_Point = 1, // unanchored and positioned at a screen point
+  MenuPopupAnchorType_Rect = 2, // anchored at a screen rectangle
+};
+
 // values are selected so that the direction can be flipped just by
 // changing the sign
 #define POPUPALIGNMENT_NONE 0
@@ -242,11 +248,11 @@
 
   nsView* GetRootViewForPopup(nsIFrame* aStartFrame);
 
-  // set the position of the popup either relative to the anchor aAnchorFrame
-  // (or the frame for mAnchorContent if aAnchorFrame is null) or at a specific
-  // point if a screen position (mScreenXPos and mScreenYPos) are set. The popup
-  // will be adjusted so that it is on screen. If aIsMove is true, then the popup
-  // is being moved, and should not be flipped.
+  // Set the position of the popup either relative to the anchor aAnchorFrame
+  // (or the frame for mAnchorContent if aAnchorFrame is null), anchored at a
+  // rectangle, or at a specific point if a screen position is set. The popup
+  // will be adjusted so that it is on screen. If aIsMove is true, then the
+  // popup is being moved, and should not be flipped.
   nsresult SetPopupPosition(nsIFrame* aAnchorFrame, bool aIsMove, bool aSizedToPopup);
 
   bool HasGeneratedChildren() { return mGeneratedChildren; }
@@ -283,8 +289,14 @@
                        nsIContent* aTriggerContent,
                        const nsAString& aPosition,
                        int32_t aXPos, int32_t aYPos,
+                       MenuPopupAnchorType aAnchorType,
                        bool aAttributesOverride);
 
+  void InitializePopupAtRect(nsIContent* aTriggerContent,
+                             const nsAString& aPosition,
+                             const nsIntRect& aRect,
+                             bool aAttributesOverride);
+
   /**
    * @param aIsContextMenu if true, then the popup is
    * positioned at a slight offset from aXPos/aYPos to ensure the
@@ -326,6 +338,8 @@
 
   void EnsureMenuItemIsVisible(nsMenuFrame* aMenuFrame);
 
+  void ChangeByPage(bool aIsUp);
+
   // Move the popup to the screen coordinate (aLeft, aTop) in CSS pixels.
   // If aUpdateAttrs is true, and the popup already has left or top attributes,
   // then those attributes are updated to the new location.
@@ -369,14 +383,14 @@
                       mozilla::LayoutDeviceIntPoint& aChange);
 
   // Return true if the popup is positioned relative to an anchor.
-  bool IsAnchored() const { return mScreenXPos == -1 && mScreenYPos == -1; }
+  bool IsAnchored() const { return mAnchorType != MenuPopupAnchorType_Point; }
 
   // Return the anchor if there is one.
   nsIContent* GetAnchor() const { return mAnchorContent; }
 
   // Return the screen coordinates of the popup, or (-1, -1) if anchored.
   // This position is in CSS pixels.
-  nsIntPoint ScreenPosition() const { return nsIntPoint(mScreenXPos, mScreenYPos); }
+  nsIntPoint ScreenPosition() const { return mScreenRect.TopLeft(); }
 
   nsIntPoint GetLastClientOffset() const { return mLastClientOffset; }
 
@@ -505,8 +519,7 @@
   // override mXPos and mYPos.
   int32_t mXPos;
   int32_t mYPos;
-  int32_t mScreenXPos;
-  int32_t mScreenYPos;
+  nsIntRect mScreenRect;
 
   // If the panel prefers to "slide" rather than resize, then the arrow gets
   // positioned at this offset (along either the x or y axis, depending on
@@ -568,6 +581,9 @@
   bool mHFlip;
   bool mVFlip;
 
+  // How the popup is anchored.
+  MenuPopupAnchorType mAnchorType;
+
   static int8_t sDefaultLevelIsTop;
 
   // If 0, never timed out.  Otherwise, the value is in milliseconds.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/xul/nsXULPopupManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/xul/nsXULPopupManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/xul/nsXULPopupManager.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/xul/nsXULPopupManager.cpp	2015-05-25 20:43:13.000000000 +0000
@@ -672,7 +672,8 @@
 
   // there is no trigger event for menus
   InitTriggerEvent(nullptr, nullptr, nullptr);
-  popupFrame->InitializePopup(menuFrame->GetAnchor(), nullptr, position, 0, 0, true);
+  popupFrame->InitializePopup(menuFrame->GetAnchor(), nullptr, position, 0, 0,
+                              MenuPopupAnchorType_Node, true);
 
   if (aAsynchronous) {
     nsCOMPtr<nsIRunnable> event =
@@ -704,7 +705,7 @@
   InitTriggerEvent(aTriggerEvent, aPopup, getter_AddRefs(triggerContent));
 
   popupFrame->InitializePopup(aAnchorContent, triggerContent, aPosition,
-                              aXPos, aYPos, aAttributesOverride);
+                              aXPos, aYPos, MenuPopupAnchorType_Node, aAttributesOverride);
 
   FirePopupShowingEvent(aPopup, aIsContextMenu, aSelectFirstItem);
 }
@@ -727,6 +728,27 @@
 }
 
 void
+nsXULPopupManager::ShowPopupAtScreenRect(nsIContent* aPopup,
+                                         const nsAString& aPosition,
+                                         const nsIntRect& aRect,
+                                         bool aIsContextMenu,
+                                         bool aAttributesOverride,
+                                         nsIDOMEvent* aTriggerEvent)
+{
+  nsMenuPopupFrame* popupFrame = GetPopupFrameForContent(aPopup, true);
+  if (!popupFrame || !MayShowPopup(popupFrame))
+    return;
+
+  nsCOMPtr<nsIContent> triggerContent;
+  InitTriggerEvent(aTriggerEvent, aPopup, getter_AddRefs(triggerContent));
+
+  popupFrame->InitializePopupAtRect(triggerContent, aPosition,
+                                    aRect, aAttributesOverride);
+
+  FirePopupShowingEvent(aPopup, aIsContextMenu, false);
+}
+
+void
 nsXULPopupManager::ShowTooltipAtScreen(nsIContent* aPopup,
                                        nsIContent* aTriggerContent,
                                        int32_t aXPos, int32_t aYPos)
@@ -2172,6 +2194,13 @@
       HandleKeyboardNavigation(keyCode);
       break;
 
+    case nsIDOMKeyEvent::DOM_VK_PAGE_DOWN:
+    case nsIDOMKeyEvent::DOM_VK_PAGE_UP:
+      if (aTopVisibleMenuItem) {
+        aTopVisibleMenuItem->Frame()->ChangeByPage(keyCode == nsIDOMKeyEvent::DOM_VK_PAGE_UP);
+      }
+      break;
+
     case nsIDOMKeyEvent::DOM_VK_ESCAPE:
       // Pressing Escape hides one level of menus only. If no menu is open,
       // check if a menubar is active and inform it that a menu closed. Even
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/xul/nsXULPopupManager.h firefox-trunk-41.0~a1~hg20150524r245419/layout/xul/nsXULPopupManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/xul/nsXULPopupManager.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/xul/nsXULPopupManager.h	2015-05-25 20:43:13.000000000 +0000
@@ -10,7 +10,7 @@
 #ifndef nsXULPopupManager_h__
 #define nsXULPopupManager_h__
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsIContent.h"
 #include "nsIRollupListener.h"
 #include "nsIDOMEventListener.h"
@@ -405,6 +405,16 @@
                          bool aIsContextMenu,
                          nsIDOMEvent* aTriggerEvent);
 
+  /* Open a popup anchored at a screen rectangle specified by aRect.
+   * The remaining arguments are similar to ShowPopup.
+   */
+  void ShowPopupAtScreenRect(nsIContent* aPopup,
+                             const nsAString& aPosition,
+                             const nsIntRect& aRect,
+                             bool aIsContextMenu,
+                             bool aAttributesOverride,
+                             nsIDOMEvent* aTriggerEvent);
+
   /**
    * Open a tooltip at a specific screen position specified by aXPos and aYPos,
    * measured in CSS pixels.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/xul/PopupBoxObject.cpp firefox-trunk-41.0~a1~hg20150524r245419/layout/xul/PopupBoxObject.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/xul/PopupBoxObject.cpp	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/xul/PopupBoxObject.cpp	2015-05-25 20:43:12.000000000 +0000
@@ -110,6 +110,22 @@
 }
 
 void
+PopupBoxObject::OpenPopupAtScreenRect(const nsAString& aPosition,
+                                      int32_t aXPos, int32_t aYPos,
+                                      int32_t aWidth, int32_t aHeight,
+                                      bool aIsContextMenu,
+                                      bool aAttributesOverride,
+                                      Event* aTriggerEvent)
+{
+  nsXULPopupManager* pm = nsXULPopupManager::GetInstance();
+  if (pm && mContent) {
+    pm->ShowPopupAtScreenRect(mContent, aPosition,
+                              nsIntRect(aXPos, aYPos, aWidth, aHeight),
+                              aIsContextMenu, aAttributesOverride, aTriggerEvent);
+  }
+}
+
+void
 PopupBoxObject::MoveTo(int32_t aLeft, int32_t aTop)
 {
   nsMenuPopupFrame *menuPopupFrame = mContent ? do_QueryFrame(mContent->GetPrimaryFrame()) : nullptr;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/layout/xul/PopupBoxObject.h firefox-trunk-41.0~a1~hg20150524r245419/layout/xul/PopupBoxObject.h
--- firefox-trunk-41.0~a1~hg20150513r243603/layout/xul/PopupBoxObject.h	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/layout/xul/PopupBoxObject.h	2015-05-25 20:43:12.000000000 +0000
@@ -75,6 +75,13 @@
                          bool aIsContextMenu,
                          Event* aTriggerEvent);
 
+  void OpenPopupAtScreenRect(const nsAString& aPosition,
+                             int32_t aXPos, int32_t aYPos,
+                             int32_t aWidth, int32_t aHeight,
+                             bool aIsContextMenu,
+                             bool aAttributesOverride,
+                             Event* aTriggerEvent);
+
   void GetPopupState(nsString& aState);
 
   nsINode* GetTriggerNode() const;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mach firefox-trunk-41.0~a1~hg20150524r245419/mach
--- firefox-trunk-41.0~a1~hg20150513r243603/mach	2015-05-13 18:06:05.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mach	2015-05-25 20:43:13.000000000 +0000
@@ -21,19 +21,28 @@
         if child == "":
             break
 
-def load_mach(topsrcdir):
-    sys.path[0:0] = [os.path.join(topsrcdir, "build")]
+def load_mach(dir_path, mach_path):
+    import imp
+    with open(mach_path, 'r') as fh:
+        imp.load_module('mach_bootstrap', fh, mach_path,
+                        ('.py', 'r', imp.PY_SOURCE))
     import mach_bootstrap
-    return mach_bootstrap.bootstrap(topsrcdir)
+    return mach_bootstrap.bootstrap(dir_path)
 
 
 def check_and_get_mach(dir_path):
-    # If we find the mach bootstrap module, we are in the srcdir.
-    mach_path = os.path.join(dir_path, 'build/mach_bootstrap.py')
-    if os.path.isfile(mach_path):
-        return load_mach(dir_path)
+    bootstrap_paths = (
+        'build/mach_bootstrap.py',
+        # test package bootstrap
+        'tools/mach_bootstrap.py',
+    )
+    for bootstrap_path in bootstrap_paths:
+        mach_path = os.path.join(dir_path, bootstrap_path)
+        if os.path.isfile(mach_path):
+            return load_mach(dir_path, mach_path)
     return None
 
+
 def get_mach():
     # Check whether the current directory is within a mach src or obj dir.
     for dir_path in ancestors(os.getcwd()):
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/Makefile.in firefox-trunk-41.0~a1~hg20150524r245419/Makefile.in
--- firefox-trunk-41.0~a1~hg20150513r243603/Makefile.in	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/Makefile.in	2015-05-25 20:42:33.000000000 +0000
@@ -21,7 +21,7 @@
 
 include $(topsrcdir)/config/config.mk
 
-GARBAGE_DIRS += dist _javagen _profile staticlib
+GARBAGE_DIRS += _javagen _profile staticlib
 DIST_GARBAGE = config.cache config.log config.status* config-defs.h \
    config/autoconf.mk \
    mozilla-config.h \
@@ -141,10 +141,10 @@
 
 include $(topsrcdir)/build/moz-automation.mk
 
-# _tests should be purged during cleaning. However, we don't want it purged
-# during PGO builds because it contains some auto-generated files.
+# dist and _tests should be purged during cleaning. However, we don't want them
+# purged during PGO builds because they contain some auto-generated files.
 ifneq ($(filter-out maybe_clobber_profiledbuild,$(MAKECMDGOALS)),)
-GARBAGE_DIRS += _tests
+GARBAGE_DIRS += dist _tests
 endif
 
 # Windows PGO builds don't perform a clean before the 2nd pass. So, we want
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/libjpeg/moz.build firefox-trunk-41.0~a1~hg20150524r245419/media/libjpeg/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/media/libjpeg/moz.build	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/libjpeg/moz.build	2015-05-25 20:43:14.000000000 +0000
@@ -13,62 +13,6 @@
     'jpeglib.h',
 ]
 
-if CONFIG['LIBJPEG_TURBO_X64_ASM']:
-    SOURCES += [
-        'simd/jccolor-sse2-64.asm',
-        'simd/jcgray-sse2-64.asm',
-        'simd/jcsample-sse2-64.asm',
-        'simd/jdcolor-sse2-64.asm',
-        'simd/jdmerge-sse2-64.asm',
-        'simd/jdsample-sse2-64.asm',
-        'simd/jfdctflt-sse-64.asm',
-        'simd/jfdctfst-sse2-64.asm',
-        'simd/jfdctint-sse2-64.asm',
-        'simd/jidctflt-sse2-64.asm',
-        'simd/jidctfst-sse2-64.asm',
-        'simd/jidctint-sse2-64.asm',
-        'simd/jidctred-sse2-64.asm',
-        'simd/jquantf-sse2-64.asm',
-        'simd/jquanti-sse2-64.asm',
-]
-
-if CONFIG['LIBJPEG_TURBO_X86_ASM']:
-    SOURCES += [
-        'simd/jccolor-mmx.asm',
-        'simd/jccolor-sse2.asm',
-        'simd/jcgray-mmx.asm',
-        'simd/jcgray-sse2.asm',
-        'simd/jcsample-mmx.asm',
-        'simd/jcsample-sse2.asm',
-        'simd/jdcolor-mmx.asm',
-        'simd/jdcolor-sse2.asm',
-        'simd/jdmerge-mmx.asm',
-        'simd/jdmerge-sse2.asm',
-        'simd/jdsample-mmx.asm',
-        'simd/jdsample-sse2.asm',
-        'simd/jfdctflt-3dn.asm',
-        'simd/jfdctflt-sse.asm',
-        'simd/jfdctfst-mmx.asm',
-        'simd/jfdctfst-sse2.asm',
-        'simd/jfdctint-mmx.asm',
-        'simd/jfdctint-sse2.asm',
-        'simd/jidctflt-3dn.asm',
-        'simd/jidctflt-sse.asm',
-        'simd/jidctflt-sse2.asm',
-        'simd/jidctfst-mmx.asm',
-        'simd/jidctfst-sse2.asm',
-        'simd/jidctint-mmx.asm',
-        'simd/jidctint-sse2.asm',
-        'simd/jidctred-mmx.asm',
-        'simd/jidctred-sse2.asm',
-        'simd/jquant-3dn.asm',
-        'simd/jquant-mmx.asm',
-        'simd/jquant-sse.asm',
-        'simd/jquantf-sse2.asm',
-        'simd/jquanti-sse2.asm',
-        'simd/jsimdcpu.asm',
-]
-
 SOURCES += [
     'jcomapi.c',
     'jdapimin.c',
@@ -122,29 +66,78 @@
     'jctrans.c',
 ]
 
-if CONFIG['LIBJPEG_TURBO_ARM_ASM']:
-    SOURCES += [
-        'simd/jsimd_arm.c',
-        'simd/jsimd_arm_neon.S',
-    ]
-elif CONFIG['LIBJPEG_TURBO_ARM64_ASM']:
-    SOURCES += [
-        'simd/jsimd_arm64.c',
-        'simd/jsimd_arm64_neon.S',
-    ]
-elif CONFIG['LIBJPEG_TURBO_MIPS_ASM']:
-    SOURCES += [
-        'simd/jsimd_mips.c',
-        'simd/jsimd_mips_dspr2.S',
-    ]
-elif CONFIG['LIBJPEG_TURBO_X64_ASM']:
-    SOURCES += [
-        'simd/jsimd_x86_64.c',
-    ]
-elif CONFIG['LIBJPEG_TURBO_X86_ASM']:
-    SOURCES += [
-        'simd/jsimd_i386.c',
-    ]
+if CONFIG['LIBJPEG_TURBO_AS']:
+    if CONFIG['CPU_ARCH'] == 'arm':
+        SOURCES += [
+            'simd/jsimd_arm.c',
+            'simd/jsimd_arm_neon.S',
+        ]
+    elif CONFIG['CPU_ARCH'] == 'aarch64':
+        SOURCES += [
+            'simd/jsimd_arm64.c',
+            'simd/jsimd_arm64_neon.S',
+        ]
+    elif CONFIG['CPU_ARCH'] == 'mips':
+        SOURCES += [
+            'simd/jsimd_mips.c',
+            'simd/jsimd_mips_dspr2.S',
+        ]
+    elif CONFIG['CPU_ARCH'] == 'x86_64':
+        SOURCES += [
+            'simd/jccolor-sse2-64.asm',
+            'simd/jcgray-sse2-64.asm',
+            'simd/jcsample-sse2-64.asm',
+            'simd/jdcolor-sse2-64.asm',
+            'simd/jdmerge-sse2-64.asm',
+            'simd/jdsample-sse2-64.asm',
+            'simd/jfdctflt-sse-64.asm',
+            'simd/jfdctfst-sse2-64.asm',
+            'simd/jfdctint-sse2-64.asm',
+            'simd/jidctflt-sse2-64.asm',
+            'simd/jidctfst-sse2-64.asm',
+            'simd/jidctint-sse2-64.asm',
+            'simd/jidctred-sse2-64.asm',
+            'simd/jquantf-sse2-64.asm',
+            'simd/jquanti-sse2-64.asm',
+            'simd/jsimd_x86_64.c',
+        ]
+    elif CONFIG['CPU_ARCH'] == 'x86':
+        SOURCES += [
+            'simd/jccolor-mmx.asm',
+            'simd/jccolor-sse2.asm',
+            'simd/jcgray-mmx.asm',
+            'simd/jcgray-sse2.asm',
+            'simd/jcsample-mmx.asm',
+            'simd/jcsample-sse2.asm',
+            'simd/jdcolor-mmx.asm',
+            'simd/jdcolor-sse2.asm',
+            'simd/jdmerge-mmx.asm',
+            'simd/jdmerge-sse2.asm',
+            'simd/jdsample-mmx.asm',
+            'simd/jdsample-sse2.asm',
+            'simd/jfdctflt-3dn.asm',
+            'simd/jfdctflt-sse.asm',
+            'simd/jfdctfst-mmx.asm',
+            'simd/jfdctfst-sse2.asm',
+            'simd/jfdctint-mmx.asm',
+            'simd/jfdctint-sse2.asm',
+            'simd/jidctflt-3dn.asm',
+            'simd/jidctflt-sse.asm',
+            'simd/jidctflt-sse2.asm',
+            'simd/jidctfst-mmx.asm',
+            'simd/jidctfst-sse2.asm',
+            'simd/jidctint-mmx.asm',
+            'simd/jidctint-sse2.asm',
+            'simd/jidctred-mmx.asm',
+            'simd/jidctred-sse2.asm',
+            'simd/jquant-3dn.asm',
+            'simd/jquant-mmx.asm',
+            'simd/jquant-sse.asm',
+            'simd/jquantf-sse2.asm',
+            'simd/jquanti-sse2.asm',
+            'simd/jsimd_i386.c',
+            'simd/jsimdcpu.asm',
+        ]
 else: # No SIMD support?
     SOURCES += [
         'jsimd_none.c',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/libpng/pnglibconf.h firefox-trunk-41.0~a1~hg20150524r245419/media/libpng/pnglibconf.h
--- firefox-trunk-41.0~a1~hg20150513r243603/media/libpng/pnglibconf.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/libpng/pnglibconf.h	2015-05-25 20:43:16.000000000 +0000
@@ -120,11 +120,9 @@
 #define PNG_SETJMP_SUPPORTED
 #define PNG_STDIO_SUPPORTED
 
-#ifdef PR_LOGGING
 #define PNG_CHECK_cHRM_SUPPORTED
 #define PNG_ERROR_TEXT_SUPPORTED
 #define PNG_WARNINGS_SUPPORTED
-#endif
 
 /* Mangle names of exported libpng functions so different libpng versions
    can coexist. It is recommended that if you do this, you give your
@@ -659,7 +657,6 @@
 #define png_realloc_array                         MOZ_PNG_realloc_array
 #define png_zstream_error                         MOZ_PNG_zstream_error
 
-#if defined(PR_LOGGING)
 #ifndef png_warning
 #  define png_warning                     MOZ_PNG_warning
 #endif
@@ -674,7 +671,6 @@
 #define png_warning_parameter           MOZ_PNG_warn_param
 #define png_warning_parameter_signed    MOZ_PNG_warn_param_signed
 #define png_warning_parameter_unsigned  MOZ_PNG_warn_param_unsigned
-#endif
 
 #if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
 #define png_set_packing  MOZ_PNG_set_packing
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/libstagefright/binding/include/demuxer/TrackDemuxer.h firefox-trunk-41.0~a1~hg20150524r245419/media/libstagefright/binding/include/demuxer/TrackDemuxer.h
--- firefox-trunk-41.0~a1~hg20150513r243603/media/libstagefright/binding/include/demuxer/TrackDemuxer.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/libstagefright/binding/include/demuxer/TrackDemuxer.h	2015-05-25 20:43:16.000000000 +0000
@@ -12,10 +12,10 @@
 class MediaRawData;
 class MediaByteRange;
 
-typedef int64_t Microseconds;
-
 class TrackDemuxer {
 public:
+  typedef int64_t Microseconds;
+
   TrackDemuxer() {}
   virtual ~TrackDemuxer() {}
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/libstagefright/binding/include/mp4_demuxer/DecoderData.h firefox-trunk-41.0~a1~hg20150524r245419/media/libstagefright/binding/include/mp4_demuxer/DecoderData.h
--- firefox-trunk-41.0~a1~hg20150513r243603/media/libstagefright/binding/include/mp4_demuxer/DecoderData.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/libstagefright/binding/include/mp4_demuxer/DecoderData.h	2015-05-25 20:43:16.000000000 +0000
@@ -75,7 +75,6 @@
   virtual bool IsValid() const override;
 };
 
-typedef int64_t Microseconds;
 }
 
 #endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/libstagefright/binding/include/mp4_demuxer/MP3TrackDemuxer.h firefox-trunk-41.0~a1~hg20150524r245419/media/libstagefright/binding/include/mp4_demuxer/MP3TrackDemuxer.h
--- firefox-trunk-41.0~a1~hg20150513r243603/media/libstagefright/binding/include/mp4_demuxer/MP3TrackDemuxer.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/libstagefright/binding/include/mp4_demuxer/MP3TrackDemuxer.h	2015-05-25 20:43:16.000000000 +0000
@@ -0,0 +1,380 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 MP3_TRACK_DEMUXER_H_
+#define MP3_TRACK_DEMUXER_H_
+
+#include "mozilla/Attributes.h"
+#include "demuxer/TrackDemuxer.h"
+
+namespace mp4_demuxer {
+
+// ID3 header parser state machine used by FrameParser.
+// The header contains the following format (one byte per term):
+// 'I' 'D' '3' MajorVersion MinorVersion Flags Size1 Size2 Size3 Size4
+// For more details see http://id3.org/id3v2.3.0.
+class ID3Parser {
+public:
+  // Holds the ID3 header and its parsing state.
+  class ID3Header {
+  public:
+    // The header size is static, see class comment.
+    static const int SIZE = 10;
+
+    // Constructor.
+    ID3Header();
+
+    // Resets the state to allow for a new parsing session.
+    void Reset();
+
+    // The ID3 tags are versioned like this: ID3vMajorVersion.MinorVersion.
+    uint8_t MajorVersion() const;
+    uint8_t MinorVersion() const;
+
+    // The ID3 flags field.
+    uint8_t Flags() const;
+
+    // The derived size based on the provides size fields.
+    uint32_t Size() const;
+
+    // Returns whether the parsed data is a valid ID3 header up to the given
+    // byte position.
+    bool IsValid(int aPos) const;
+
+    // Returns whether the parsed data is a complete and valid ID3 header.
+    bool IsValid() const;
+
+    // Parses the next provided byte.
+    // Returns whether the byte creates a valid sequence up to this point.
+    bool ParseNext(uint8_t c);
+
+  private:
+    // Updates the parser state machine with the provided next byte.
+    // Returns whether the provided byte is a valid next byte in the sequence.
+    bool Update(uint8_t c);
+
+    // The currently parsed byte sequence.
+    uint8_t mRaw[SIZE];
+
+    // The derived size as provided by the size fields.
+    // The header size fields holds a 4 byte sequence with each MSB set to 0,
+    // this bits need to be ignored when deriving the actual size.
+    uint32_t mSize;
+
+    // The current byte position in the parsed sequence. Reset via Reset and
+    // incremented via Update.
+    int mPos;
+  };
+
+  // Returns the parsed ID3 header. Note: check for validity.
+  const ID3Header& Header() const;
+
+  // Parses the given buffer range [aBeg, aEnd) for a valid ID3 header.
+  // Returns the header begin position or aEnd if no valid header was found.
+  const uint8_t* Parse(const uint8_t* aBeg, const uint8_t* aEnd);
+
+  // Resets the state to allow for a new parsing session.
+  void Reset();
+
+private:
+  // The currently parsed ID3 header. Reset via Reset, updated via Parse.
+  ID3Header mHeader;
+};
+
+// MPEG audio frame parser.
+// The MPEG frame header has the following format (one bit per character):
+// 11111111 111VVLLC BBBBSSPR MMEETOHH
+// {   sync   } - 11 sync bits
+//   VV         - MPEG audio version ID (0->2.5, 1->reserved, 2->2, 3->1)
+//   LL         - Layer description (0->reserved, 1->III, 2->II, 3->I)
+//   C          - CRC protection bit (0->protected, 1->not protected)
+//   BBBB       - Bitrate index (see table in implementation)
+//   SS         - Sampling rate index (see table in implementation)
+//   P          - Padding bit (0->not padded, 1->padded by 1 slot size)
+//   R          - Private bit (ignored)
+//   MM         - Channel mode (0->stereo, 1->joint stereo, 2->dual channel,
+//                3->single channel)
+//   EE         - Mode extension for joint stereo (ignored)
+//   T          - Copyright (0->disabled, 1->enabled)
+//   O          - Original (0->copy, 1->original)
+//   HH         - Emphasis (0->none, 1->50/15 ms, 2->reserved, 3->CCIT J.17)
+class FrameParser {
+public:
+  // Holds the frame header and its parsing state.
+  class FrameHeader {
+  public:
+    // The header size is static, see class comments.
+    static const int SIZE = 4;
+
+    // Constructor.
+    FrameHeader();
+
+    // Raw field access, see class comments for details.
+    uint8_t Sync1() const;
+    uint8_t Sync2() const;
+    uint8_t RawVersion() const;
+    uint8_t RawLayer() const;
+    uint8_t RawProtection() const;
+    uint8_t RawBitrate() const;
+    uint8_t RawSampleRate() const;
+    uint8_t Padding() const;
+    uint8_t Private() const;
+    uint8_t RawChannelMode() const;
+
+    // Sampling rate frequency in Hz.
+    int32_t SampleRate() const;
+
+    // Number of audio channels.
+    int32_t Channels() const;
+
+    // Samples per frames, static depending on MPEG version and layer.
+    int32_t SamplesPerFrame() const;
+
+    // Slot size used for padding, static depending on MPEG layer.
+    int32_t SlotSize() const;
+
+    // Bitrate in kbps, can vary between frames.
+    int32_t Bitrate() const;
+
+    // MPEG layer (0->invalid, 1->I, 2->II, 3->III).
+    int32_t Layer() const;
+
+    // Returns whether the parsed data is a valid frame header up to the given
+    // byte position.
+    bool IsValid(const int aPos) const;
+
+    // Returns whether the parsed data is a complete and valid frame header.
+    bool IsValid() const;
+
+    // Resets the state to allow for a new parsing session.
+    void Reset();
+
+    // Parses the next provided byte.
+    // Returns whether the byte creates a valid sequence up to this point.
+    bool ParseNext(const uint8_t c);
+
+  private:
+    // Updates the parser state machine with the provided next byte.
+    // Returns whether the provided byte is a valid next byte in the sequence.
+    bool Update(const uint8_t c);
+
+    // The currently parsed byte sequence.
+    uint8_t mRaw[SIZE];
+
+    // The current byte position in the parsed sequence. Reset via Reset and
+    // incremented via Update.
+    int mPos;
+  };
+
+  // VBR frames may contain Xing or VBRI headers for additional info, we use
+  // this class to parse them and access this info.
+  class VBRHeader {
+  public:
+    enum VBRHeaderType {
+      NONE,
+      XING,
+      VBRI
+    };
+
+    // Constructor.
+    VBRHeader();
+
+    // Returns the parsed VBR header type, or NONE if no valid header found.
+    VBRHeaderType Type() const;
+
+    // Returns the total number of frames expected in the stream/file.
+    int64_t NumFrames() const;
+
+    // Parses given buffer [aBeg, aEnd) for a valid VBR header.
+    // Returns whether a valid VBR header was found in the range.
+    bool Parse(const uint8_t* aBeg, const uint8_t* aEnd);
+
+  private:
+    // Parses given buffer [aBeg, aEnd) for a valid Xing header.
+    // Returns whether a valid Xing header was found in the range.
+    bool ParseXing(const uint8_t* aBeg, const uint8_t* aEnd);
+
+    // Parses given buffer [aBeg, aEnd) for a valid VBRI header.
+    // Returns whether a valid VBRI header was found in the range.
+    bool ParseVBRI(const uint8_t* aBeg, const uint8_t* aEnd);
+
+    // The total number of frames expected as parsed from a VBR header.
+    int64_t mNumFrames;
+
+    // The detected VBR header type.
+    VBRHeaderType mType;
+  };
+
+  // Frame meta container used to parse and hold a frame header and side info.
+  class Frame {
+  public:
+    // Returns the length of the frame excluding the header in bytes.
+    int32_t Length() const;
+
+    // Returns the parsed frame header.
+    const FrameHeader& Header() const;
+
+    // Resets the frame header and data.
+    void Reset();
+
+    // Parses the next provided byte.
+    // Returns whether the byte creates a valid sequence up to this point.
+    bool ParseNext(uint8_t c);
+
+  private:
+    // The currently parsed frame header.
+    FrameHeader mHeader;
+  };
+
+  // Constructor.
+  FrameParser();
+
+  // Returns the currently parsed frame. Reset via Reset or FinishParsing.
+  const Frame& CurrentFrame() const;
+
+#ifdef ENABLE_TESTS
+  // Returns the previously parsed frame. Reset via Reset.
+  const Frame& PrevFrame() const;
+#endif
+
+  // Returns the first parsed frame. Reset via Reset.
+  const Frame& FirstFrame() const;
+
+  // Returns the parsed ID3 header. Note: check for validity.
+  const ID3Parser::ID3Header& ID3Header() const;
+
+  // Returns the parsed VBR header info. Note: check for validity by type.
+  const VBRHeader& VBRInfo() const;
+
+  // Resets the parser. Don't use between frames as first frame data is reset.
+  void Reset();
+
+  // Clear the last parsed frame to allow for next frame parsing, i.e.:
+  // - sets PrevFrame to CurrentFrame
+  // - resets the CurrentFrame
+  // - resets ID3Header if no valid header was parsed yet
+  void FinishParsing();
+
+  // Parses given buffer [aBeg, aEnd) for a valid frame header.
+  // Returns begin of frame header if a frame header was found or aEnd otherwise.
+  const uint8_t* Parse(const uint8_t* aBeg, const uint8_t* aEnd);
+
+  // Parses given buffer [aBeg, aEnd) for a valid VBR header.
+  // Returns whether a valid VBR header was found.
+  bool ParseVBRHeader(const uint8_t* aBeg, const uint8_t* aEnd);
+
+private:
+  // ID3 header parser.
+  ID3Parser mID3Parser;
+
+  // VBR header parser.
+  VBRHeader mVBRHeader;
+
+  // We keep the first parsed frame around for static info access, the
+  // previously parsed frame for debugging and the currently parsed frame.
+  Frame mFirstFrame;
+  Frame mFrame;
+#ifdef ENABLE_TESTS
+  Frame mPrevFrame;
+#endif
+};
+
+// The MP3 demuxer used to extract MPEG frames and side information out of
+// MPEG streams.
+class MP3Demuxer : public mozilla::TrackDemuxer {
+public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MP3Demuxer);
+
+  // Constructor, expecing a valid stream source.
+  explicit MP3Demuxer(Stream* aSource);
+
+  // Initializes the demuxer by reading the expected stream length, if
+  // available. Optional, but recommended.
+  // Currently always returns true.
+  bool Init();
+
+  // Returns the total stream length if known, -1 otherwise.
+  int64_t StreamLength() const;
+
+  // Returns the estimated stream duration in microseconds, or -1 if no
+  // estimation available.
+  int64_t Duration() const;
+
+  // Returns the estimated duration up to the given frames number in microseconds,
+  // or -1 if no estimation available.
+  int64_t Duration(int64_t aNumFrames) const;
+
+#ifdef ENABLE_TESTS
+  const FrameParser::Frame& LastFrame() const;
+#endif
+  const ID3Parser::ID3Header& ID3Header() const;
+  const FrameParser::VBRHeader& VBRInfo() const;
+
+  // TrackDemuxer interface.
+  virtual void Seek(Microseconds aTime) override;
+  virtual already_AddRefed<mozilla::MediaRawData> DemuxSample() override;
+  virtual Microseconds GetNextKeyframeTime() override;
+
+  void UpdateConfig(mozilla::AudioInfo& aConfig) {
+    aConfig.mRate = mSamplesPerSecond;
+    aConfig.mChannels = mChannels;
+    aConfig.mBitDepth = 16;
+    aConfig.mMimeType = "audio/mpeg";
+  }
+
+private:
+  // Destructor.
+  ~MP3Demuxer() {}
+
+  // Fast approximate seeking to given time.
+  void FastSeek(Microseconds aTime);
+
+  // Slow, more accurate approximate seeking to given time.
+  void SlowSeek(Microseconds aTime);
+
+  // Returns the next MPEG frame, if available.
+  already_AddRefed<mozilla::MediaRawData> GetNext();
+
+  // Reads aSize bytes into aBuffer from the source starting at aOffset.
+  // Returns the actual size read.
+  uint32_t Read(uint8_t* aBuffer, uint32_t aOffset, uint32_t aSize);
+
+  // Returns the average frame length derived from the previously parsed frames.
+  double AverageFrameLength() const;
+
+  // The (hopefully) MPEG source stream.
+  nsRefPtr<Stream> mSource;
+
+  // MPEG frame parser used to detect frames and extract side info.
+  FrameParser mParser;
+
+  // Current byte offset in the source stream.
+  uint64_t mOffset;
+
+  // Byte offset of the begin of the first frame, or 0 if none parsed yet.
+  uint64_t mFirstFrameOffset;
+
+  // Total expected stream length, if available, or -1 otherwise.
+  int64_t mStreamLength;
+
+  // Total parsed frames.
+  int64_t mNumParsedFrames;
+  int64_t mFrameIndex;
+
+  // Sum of parsed frames' lengths in bytes.
+  int64_t mTotalFrameLen;
+
+  // Samples per frame metric derived from frame headers or 0 if none available.
+  int32_t mSamplesPerFrame;
+
+  // Samples per second metric derived from frame headers or 0 if none available.
+  int32_t mSamplesPerSecond;
+
+  // Channel count derived from frame headers or 0 if none available.
+  int32_t mChannels;
+};
+
+}
+
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/libstagefright/binding/MoofParser.cpp firefox-trunk-41.0~a1~hg20150524r245419/media/libstagefright/binding/MoofParser.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/media/libstagefright/binding/MoofParser.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/libstagefright/binding/MoofParser.cpp	2015-05-25 20:43:16.000000000 +0000
@@ -7,9 +7,9 @@
 #include "mp4_demuxer/SinfParser.h"
 #include <limits>
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
-#if defined(MOZ_FMP4) && defined(PR_LOGGING)
+#if defined(MOZ_FMP4)
 extern PRLogModuleInfo* GetDemuxerLog();
 
 /* Polyfill __func__ on MSVC to pass to the log. */
@@ -19,7 +19,7 @@
 
 #define STRINGIFY(x) #x
 #define TOSTRING(x) STRINGIFY(x)
-#define LOG(name, arg, ...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (TOSTRING(name) "(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
+#define LOG(name, arg, ...) MOZ_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (TOSTRING(name) "(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
 #else
 #define LOG(...)
 #endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/libstagefright/binding/MP3TrackDemuxer.cpp firefox-trunk-41.0~a1~hg20150524r245419/media/libstagefright/binding/MP3TrackDemuxer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/media/libstagefright/binding/MP3TrackDemuxer.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/libstagefright/binding/MP3TrackDemuxer.cpp	2015-05-25 20:43:16.000000000 +0000
@@ -0,0 +1,755 @@
+/* -*- 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 "mp4_demuxer/MP3TrackDemuxer.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/Endian.h"
+#include "VideoUtils.h"
+
+namespace mp4_demuxer {
+
+// MP3Demuxer
+
+MP3Demuxer::MP3Demuxer(Stream* aSource)
+  : mSource(aSource),
+    mOffset(0),
+    mFirstFrameOffset(0),
+    mStreamLength(-1),
+    mNumParsedFrames(0),
+    mFrameIndex(0),
+    mTotalFrameLen(0),
+    mSamplesPerFrame(0),
+    mSamplesPerSecond(0),
+    mChannels(0)
+{
+}
+
+bool
+MP3Demuxer::Init() {
+  if (!mSource->Length(&mStreamLength)) {
+    // Length is unknown.
+    mStreamLength = -1;
+  }
+  return true;
+}
+
+#ifdef ENABLE_TESTS
+const FrameParser::Frame&
+MP3Demuxer::LastFrame() const {
+  return mParser.PrevFrame();
+}
+#endif
+
+const ID3Parser::ID3Header&
+MP3Demuxer::ID3Header() const {
+  return mParser.ID3Header();
+}
+
+const FrameParser::VBRHeader&
+MP3Demuxer::VBRInfo() const {
+  return mParser.VBRInfo();
+}
+
+void
+MP3Demuxer::Seek(Microseconds aTime) {
+  SlowSeek(aTime);
+}
+
+void
+MP3Demuxer::FastSeek(Microseconds aTime) {
+  if (!aTime) {
+    // Quick seek to the beginning of the stream.
+    mOffset = mFirstFrameOffset;
+    mFrameIndex = 0;
+    mParser.FinishParsing();
+    return;
+  }
+
+  if (!mSamplesPerFrame || !mNumParsedFrames) {
+    return;
+  }
+
+  const int64_t numFrames = static_cast<double>(aTime) / USECS_PER_S *
+                            mSamplesPerSecond / mSamplesPerFrame;
+  mOffset = mFirstFrameOffset + numFrames * AverageFrameLength();
+  mFrameIndex = numFrames;
+  mParser.FinishParsing();
+}
+
+void
+MP3Demuxer::SlowSeek(Microseconds aTime) {
+  if (!aTime) {
+    FastSeek(aTime);
+    return;
+  }
+
+  if (Duration(mFrameIndex) > aTime) {
+    FastSeek(aTime);
+  }
+
+  nsRefPtr<MediaRawData> frameData(GetNext());
+  while (frameData && Duration(mFrameIndex + 1) < aTime) {
+    frameData = GetNext();
+  }
+}
+
+
+already_AddRefed<MediaRawData>
+MP3Demuxer::DemuxSample() {
+  nsRefPtr<MediaRawData> sample(GetNext());
+  if (!sample) {
+    return nullptr;
+  }
+  return sample.forget();
+}
+
+Microseconds
+MP3Demuxer::GetNextKeyframeTime() {
+  return -1;
+}
+
+int64_t
+MP3Demuxer::StreamLength() const {
+  return mStreamLength;
+}
+
+int64_t
+MP3Demuxer::Duration() const {
+  if (!mNumParsedFrames) {
+    return -1;
+  }
+
+  // Assume we know the exact number of frames from the VBR header.
+  int64_t numFrames = mParser.VBRInfo().NumFrames();
+  if (numFrames < 0) {
+    if (mStreamLength < 0) {
+      // Unknown length, we can't estimate duration.
+      return -1;
+    }
+    numFrames = (mStreamLength - mFirstFrameOffset) / AverageFrameLength();
+  }
+  return Duration(numFrames);
+}
+
+int64_t
+MP3Demuxer::Duration(int64_t aNumFrames) const {
+  if (!mSamplesPerSecond) {
+    return -1;
+  }
+
+  const double usPerFrame = USECS_PER_S * mSamplesPerFrame / mSamplesPerSecond;
+  return aNumFrames * usPerFrame;
+}
+
+already_AddRefed<mozilla::MediaRawData>
+MP3Demuxer::GetNext() {
+  static const int BUFFER_SIZE = 4096;
+
+  uint8_t buffer[BUFFER_SIZE];
+  uint32_t read = 0;
+  const uint8_t* frameBeg = nullptr;
+  const uint8_t* bufferEnd = nullptr;
+
+  while (frameBeg == bufferEnd &&
+         (read = Read(buffer, mOffset, BUFFER_SIZE)) > 0) {
+    MOZ_ASSERT(mOffset + read > mOffset);
+    mOffset += read;
+    bufferEnd = buffer + read;
+    frameBeg = mParser.Parse(buffer, bufferEnd);
+  }
+
+  if (frameBeg == bufferEnd || !mParser.CurrentFrame().Length()) {
+    return nullptr;
+  }
+
+  // Valid frame header was fully parsed, let's read the whole frame.
+  const int32_t frameLen = mParser.CurrentFrame().Length();
+  nsRefPtr<MediaRawData> frame = new MediaRawData();
+  frame->mOffset = mOffset - (bufferEnd - frameBeg) + 1;
+
+  nsAutoPtr<MediaRawDataWriter> frameWriter(frame->CreateWriter());
+  if (!frameWriter->SetSize(frameLen)) {
+    return nullptr;
+  }
+
+  read = Read(frameWriter->mData, frame->mOffset, frame->mSize);
+
+  if (read != frame->mSize) {
+    return nullptr;
+  }
+
+  // Prevent overflow.
+  if (mTotalFrameLen + frameLen < 0) {
+    // These variables have a linear dependency and are only used to derive the
+    // average frame length.
+    mTotalFrameLen /= 2;
+    mNumParsedFrames /= 2;
+  }
+
+  // Full frame parsed, move offset to its end.
+  mOffset = frame->mOffset + frame->mSize;
+  MOZ_ASSERT(mOffset > frame->mOffset);
+
+  mTotalFrameLen += frameLen;
+  mSamplesPerFrame = mParser.CurrentFrame().Header().SamplesPerFrame();
+  mSamplesPerSecond = mParser.CurrentFrame().Header().SampleRate();
+  mChannels = mParser.CurrentFrame().Header().Channels();
+  ++mNumParsedFrames;
+  ++mFrameIndex;
+  MOZ_ASSERT(mFrameIndex > 0);
+
+  frame->mTime = Duration(mFrameIndex - 1);
+  frame->mDuration = Duration(1);
+
+  if (mNumParsedFrames == 1) {
+    // First frame parsed, let's read VBR info if available.
+    // TODO: read info that helps with seeking (bug 1163667).
+    mParser.ParseVBRHeader(frame->mData, frame->mData + frame->mSize);
+    mFirstFrameOffset = frame->mOffset;
+  }
+
+  // Prepare the parser for the next frame parsing session.
+  mParser.FinishParsing();
+  return frame.forget();
+}
+
+uint32_t
+MP3Demuxer::Read(uint8_t* aBuffer, uint32_t aOffset, uint32_t aSize) {
+  size_t read = 0;
+  if (!mSource->ReadAt(aOffset, aBuffer, aSize, &read)) {
+    read = 0;
+  }
+  return read;
+}
+
+double
+MP3Demuxer::AverageFrameLength() const {
+  if (!mNumParsedFrames) {
+    return 0.0;
+  }
+  return static_cast<double>(mTotalFrameLen) / mNumParsedFrames;
+}
+
+// FrameParser
+
+namespace frame_header {
+// FrameHeader mRaw byte offsets.
+static const int SYNC1 = 0;
+static const int SYNC2_VERSION_LAYER_PROTECTION = 1;
+static const int BITRATE_SAMPLERATE_PADDING_PRIVATE = 2;
+static const int CHANNELMODE_MODEEXT_COPY_ORIG_EMPH = 3;
+}
+
+FrameParser::FrameParser()
+{
+}
+
+void
+FrameParser::Reset() {
+  mID3Parser.Reset();
+  mFirstFrame.Reset();
+  mFrame.Reset();
+}
+
+void
+FrameParser::FinishParsing() {
+  if (!mID3Parser.Header().IsValid()) {
+    // Reset ID3 tags only if we have not parsed a valid ID3 header yet.
+    mID3Parser.Reset();
+  }
+#ifdef ENABLE_TESTS
+  mPrevFrame = mFrame;
+#endif
+  mFrame.Reset();
+}
+
+const FrameParser::Frame&
+FrameParser::CurrentFrame() const {
+  return mFrame;
+}
+
+#ifdef ENABLE_TESTS
+const FrameParser::Frame&
+FrameParser::PrevFrame() const {
+  return mPrevFrame;
+}
+#endif
+
+const FrameParser::Frame&
+FrameParser::FirstFrame() const {
+  return mFirstFrame;
+}
+
+const ID3Parser::ID3Header&
+FrameParser::ID3Header() const {
+  return mID3Parser.Header();
+}
+
+const FrameParser::VBRHeader&
+FrameParser::VBRInfo() const {
+  return mVBRHeader;
+}
+
+const uint8_t*
+FrameParser::Parse(const uint8_t* aBeg, const uint8_t* aEnd) {
+  if (!aBeg || !aEnd || aBeg >= aEnd) {
+    return aEnd;
+  }
+
+  if (!mID3Parser.Header().Size() && !mFirstFrame.Length()) {
+    // No MP3 frames have been parsed yet, look for ID3v2 headers at file begin.
+    // ID3v1 tags may only be at file end.
+    // TODO: should we try to read ID3 tags at end of file/mid-stream, too?
+    const uint8_t* id3Beg = mID3Parser.Parse(aBeg, aEnd);
+    if (id3Beg != aEnd) {
+      // ID3 headers found, skip past them.
+      aBeg = id3Beg + ID3Parser::ID3Header::SIZE + mID3Parser.Header().Size();
+    }
+  }
+
+  while (aBeg < aEnd && !mFrame.ParseNext(*aBeg)) {
+    ++aBeg;
+  }
+
+  if (mFrame.Length()) {
+    // MP3 frame found.
+    if (!mFirstFrame.Length()) {
+      mFirstFrame = mFrame;
+    }
+    // Move to the frame header begin to allow for whole-frame parsing.
+    aBeg -= FrameHeader::SIZE;
+    return aBeg;
+  }
+  return aEnd;
+}
+
+// FrameParser::Header
+
+FrameParser::FrameHeader::FrameHeader()
+{
+  Reset();
+}
+
+uint8_t
+FrameParser::FrameHeader::Sync1() const {
+  return mRaw[frame_header::SYNC1];
+}
+
+uint8_t
+FrameParser::FrameHeader::Sync2() const {
+  return 0x7 & mRaw[frame_header::SYNC2_VERSION_LAYER_PROTECTION] >> 5;
+}
+
+uint8_t
+FrameParser::FrameHeader::RawVersion() const {
+  return 0x3 & mRaw[frame_header::SYNC2_VERSION_LAYER_PROTECTION] >> 3;
+}
+
+uint8_t
+FrameParser::FrameHeader::RawLayer() const {
+  return 0x3 & mRaw[frame_header::SYNC2_VERSION_LAYER_PROTECTION] >> 1;
+}
+
+uint8_t
+FrameParser::FrameHeader::RawProtection() const {
+  return 0x1 & mRaw[frame_header::SYNC2_VERSION_LAYER_PROTECTION] >> 6;
+}
+
+uint8_t
+FrameParser::FrameHeader::RawBitrate() const {
+  return 0xF & mRaw[frame_header::BITRATE_SAMPLERATE_PADDING_PRIVATE] >> 4;
+}
+
+uint8_t
+FrameParser::FrameHeader::RawSampleRate() const {
+  return 0x3 & mRaw[frame_header::BITRATE_SAMPLERATE_PADDING_PRIVATE] >> 2;
+}
+
+uint8_t
+FrameParser::FrameHeader::Padding() const {
+  return 0x1 & mRaw[frame_header::BITRATE_SAMPLERATE_PADDING_PRIVATE] >> 1;
+}
+
+uint8_t
+FrameParser::FrameHeader::Private() const {
+  return 0x1 & mRaw[frame_header::BITRATE_SAMPLERATE_PADDING_PRIVATE];
+}
+
+uint8_t
+FrameParser::FrameHeader::RawChannelMode() const {
+  return 0xF & mRaw[frame_header::CHANNELMODE_MODEEXT_COPY_ORIG_EMPH] >> 4;
+}
+
+int32_t
+FrameParser::FrameHeader::Layer() const {
+  static const uint8_t LAYERS[4] = { 0, 3, 2, 1 };
+
+  return LAYERS[RawLayer()];
+}
+
+int32_t
+FrameParser::FrameHeader::SampleRate() const {
+  // Sample rates - use [version][srate]
+  static const uint16_t SAMPLE_RATE[4][4] = {
+    { 11025, 12000,  8000, 0 }, // MPEG 2.5
+    {     0,     0,     0, 0 }, // Reserved
+    { 22050, 24000, 16000, 0 }, // MPEG 2
+    { 44100, 48000, 32000, 0 }  // MPEG 1
+  };
+
+  return SAMPLE_RATE[RawVersion()][RawSampleRate()];
+}
+
+int32_t
+FrameParser::FrameHeader::Channels() const {
+  // 3 is single channel (mono), any other value is some variant of dual
+  // channel.
+  return RawChannelMode() == 3 ? 1 : 2;
+}
+
+int32_t
+FrameParser::FrameHeader::SamplesPerFrame() const {
+  // Samples per frame - use [version][layer]
+  static const uint16_t FRAME_SAMPLE[4][4] = {
+    // Layer     3     2     1       Version
+    {      0,  576, 1152,  384 }, // 2.5
+    {      0,    0,    0,    0 }, // Reserved
+    {      0,  576, 1152,  384 }, // 2
+    {      0, 1152, 1152,  384 }  // 1
+  };
+
+  return FRAME_SAMPLE[RawVersion()][RawLayer()];
+}
+
+int32_t
+FrameParser::FrameHeader::Bitrate() const {
+  // Bitrates - use [version][layer][bitrate]
+  static const uint16_t BITRATE[4][4][16] = {
+    { // Version 2.5
+      { 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 0 }, // Reserved
+      { 0,   8,  16,  24,  32,  40,  48,  56,  64,  80,  96, 112, 128, 144, 160, 0 }, // Layer 3
+      { 0,   8,  16,  24,  32,  40,  48,  56,  64,  80,  96, 112, 128, 144, 160, 0 }, // Layer 2
+      { 0,  32,  48,  56,  64,  80,  96, 112, 128, 144, 160, 176, 192, 224, 256, 0 }  // Layer 1
+    },
+    { // Reserved
+      { 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 0 }, // Invalid
+      { 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 0 }, // Invalid
+      { 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 0 }, // Invalid
+      { 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 0 }  // Invalid
+    },
+    { // Version 2
+      { 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 0 }, // Reserved
+      { 0,   8,  16,  24,  32,  40,  48,  56,  64,  80,  96, 112, 128, 144, 160, 0 }, // Layer 3
+      { 0,   8,  16,  24,  32,  40,  48,  56,  64,  80,  96, 112, 128, 144, 160, 0 }, // Layer 2
+      { 0,  32,  48,  56,  64,  80,  96, 112, 128, 144, 160, 176, 192, 224, 256, 0 }  // Layer 1
+    },
+    { // Version 1
+      { 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 0 }, // Reserved
+      { 0,  32,  40,  48,  56,  64,  80,  96, 112, 128, 160, 192, 224, 256, 320, 0 }, // Layer 3
+      { 0,  32,  48,  56,  64,  80,  96, 112, 128, 160, 192, 224, 256, 320, 384, 0 }, // Layer 2
+      { 0,  32,  64,  96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, 0 }, // Layer 1
+    }
+  };
+
+  return 1000 * BITRATE[RawVersion()][RawLayer()][RawBitrate()];
+}
+
+int32_t
+FrameParser::FrameHeader::SlotSize() const {
+  // Slot size (MPEG unit of measurement) - use [layer]
+  static const uint8_t SLOT_SIZE[4] = { 0, 1, 1, 4 }; // Rsvd, 3, 2, 1
+
+  return SLOT_SIZE[RawLayer()];
+}
+
+bool
+FrameParser::FrameHeader::ParseNext(uint8_t c) {
+  if (!Update(c)) {
+    Reset();
+    if (!Update(c)) {
+      Reset();
+    }
+  }
+  return IsValid();
+}
+
+bool
+FrameParser::FrameHeader::IsValid(int aPos) const {
+  if (IsValid()) {
+    return true;
+  }
+  if (aPos == frame_header::SYNC1) {
+    return Sync1() == 0xFF;
+  }
+  if (aPos == frame_header::SYNC2_VERSION_LAYER_PROTECTION) {
+    return Sync2() == 7 &&
+           RawVersion() != 1 &&
+           RawLayer() != 0;
+  }
+  if (aPos == frame_header::BITRATE_SAMPLERATE_PADDING_PRIVATE) {
+    return RawBitrate() != 0xF;
+  }
+  return true;
+}
+
+bool
+FrameParser::FrameHeader::IsValid() const {
+  return mPos >= SIZE;
+}
+
+void
+FrameParser::FrameHeader::Reset() {
+  mPos = 0;
+}
+
+bool
+FrameParser::FrameHeader::Update(uint8_t c) {
+  if (mPos < SIZE) {
+    mRaw[mPos] = c;
+  }
+  return IsValid(mPos++);
+}
+
+// FrameParser::VBRHeader
+
+FrameParser::VBRHeader::VBRHeader()
+  : mNumFrames(-1),
+    mType(NONE)
+{
+}
+
+FrameParser::VBRHeader::VBRHeaderType
+FrameParser::VBRHeader::Type() const {
+  return mType;
+}
+
+int64_t
+FrameParser::VBRHeader::NumFrames() const {
+  return mNumFrames;
+}
+
+bool
+FrameParser::VBRHeader::ParseXing(const uint8_t* aBeg, const uint8_t* aEnd) {
+  static const uint32_t TAG = BigEndian::readUint32("Xing");
+  static const uint32_t FRAME_COUNT_OFFSET = 8;
+
+  enum Flags {
+    NUM_FRAMES = 0x01,
+    NUM_BYTES = 0x02,
+    TOC = 0x04,
+    VBR_SCALE = 0x08
+  };
+
+  if (!aBeg || !aEnd || aBeg >= aEnd) {
+    return false;
+  }
+
+  // We have to search for the Xing header as its position can change.
+  for (; aBeg + sizeof(TAG) < aEnd; ++aBeg) {
+    if (BigEndian::readUint32(aBeg) != TAG) {
+      continue;
+    }
+
+    const uint32_t flags = BigEndian::readUint32(aBeg + sizeof(TAG));
+    if (flags & NUM_FRAMES && aBeg + FRAME_COUNT_OFFSET < aEnd) {
+      mNumFrames = BigEndian::readUint32(aBeg + FRAME_COUNT_OFFSET);
+    }
+    mType = XING;
+    return true;
+  }
+  return false;
+}
+
+bool
+FrameParser::VBRHeader::ParseVBRI(const uint8_t* aBeg, const uint8_t* aEnd) {
+  static const uint32_t TAG = BigEndian::readUint32("VBRI");
+  static const uint32_t OFFSET = 32 - FrameParser::FrameHeader::SIZE;
+  static const uint32_t FRAME_COUNT_OFFSET = OFFSET + 14;
+  static const uint32_t MIN_FRAME_SIZE = OFFSET + 26;
+
+  if (!aBeg || !aEnd || aBeg >= aEnd) {
+    return false;
+  }
+
+  const int64_t frameLen = aEnd - aBeg;
+  // VBRI have a fixed relative position, so let's check for it there.
+  if (frameLen > MIN_FRAME_SIZE &&
+      BigEndian::readUint32(aBeg + OFFSET) == TAG) {
+    mNumFrames = BigEndian::readUint32(aBeg + FRAME_COUNT_OFFSET);
+    mType = VBRI;
+    return true;
+  }
+  return false;
+}
+
+bool
+FrameParser::VBRHeader::Parse(const uint8_t* aBeg, const uint8_t* aEnd) {
+  return ParseVBRI(aBeg, aEnd) || ParseXing(aBeg, aEnd);
+}
+
+// FrameParser::Frame
+
+void
+FrameParser::Frame::Reset() {
+  mHeader.Reset();
+}
+
+int32_t
+FrameParser::Frame::Length() const {
+  if (!mHeader.IsValid() || !mHeader.SampleRate()) {
+    return 0;
+  }
+
+  const float bitsPerSample = mHeader.SamplesPerFrame() / 8.0f;
+  const int32_t frameLen = bitsPerSample * mHeader.Bitrate() /
+                           mHeader.SampleRate() +
+                           mHeader.Padding() * mHeader.SlotSize();
+  return frameLen;
+}
+
+bool
+FrameParser::Frame::ParseNext(uint8_t c) {
+  return mHeader.ParseNext(c);
+}
+
+const FrameParser::FrameHeader&
+FrameParser::Frame::Header() const {
+  return mHeader;
+}
+
+bool
+FrameParser::ParseVBRHeader(const uint8_t* aBeg, const uint8_t* aEnd) {
+  return mVBRHeader.Parse(aBeg, aEnd);
+}
+
+// ID3Parser
+
+// Constants
+namespace id3_header {
+static const int ID_LEN = 3;
+static const int VERSION_LEN = 2;
+static const int FLAGS_LEN = 1;
+static const int SIZE_LEN = 4;
+
+static const int ID_END = ID_LEN;
+static const int VERSION_END = ID_END + VERSION_LEN;
+static const int FLAGS_END = VERSION_END + FLAGS_LEN;
+static const int SIZE_END = FLAGS_END + SIZE_LEN;
+
+static const uint8_t ID[ID_LEN] = {'I', 'D', '3'};
+}
+
+const uint8_t*
+ID3Parser::Parse(const uint8_t* aBeg, const uint8_t* aEnd) {
+  if (!aBeg || !aEnd || aBeg >= aEnd) {
+    return aEnd;
+  }
+
+  while (aBeg < aEnd && !mHeader.ParseNext(*aBeg)) {
+    ++aBeg;
+  }
+
+  if (aBeg < aEnd) {
+    // Header found, move to header begin.
+    aBeg -= ID3Header::SIZE - 1;
+  }
+  return aBeg;
+}
+
+void
+ID3Parser::Reset() {
+  mHeader.Reset();
+}
+
+const ID3Parser::ID3Header&
+ID3Parser::Header() const {
+  return mHeader;
+}
+
+// ID3Parser::Header
+
+ID3Parser::ID3Header::ID3Header()
+{
+  Reset();
+}
+
+void
+ID3Parser::ID3Header::Reset() {
+  mSize = 0;
+  mPos = 0;
+}
+
+uint8_t
+ID3Parser::ID3Header::MajorVersion() const {
+  return mRaw[id3_header::ID_END];
+}
+
+uint8_t
+ID3Parser::ID3Header::MinorVersion() const {
+  return mRaw[id3_header::ID_END + 1];
+}
+
+uint8_t
+ID3Parser::ID3Header::Flags() const {
+  return mRaw[id3_header::FLAGS_END - id3_header::FLAGS_LEN];
+}
+
+uint32_t
+ID3Parser::ID3Header::Size() const {
+  return mSize;
+}
+
+bool
+ID3Parser::ID3Header::ParseNext(uint8_t c) {
+  if (!Update(c)) {
+    Reset();
+    if (!Update(c)) {
+      Reset();
+    }
+  }
+  return IsValid();
+}
+
+bool
+ID3Parser::ID3Header::IsValid(int aPos) const {
+  if (IsValid()) {
+    return true;
+  }
+  const uint8_t c = mRaw[aPos];
+  if (aPos < id3_header::ID_END) {
+    return id3_header::ID[aPos] == c;
+  }
+  if (aPos < id3_header::VERSION_END) {
+    return c < 0xFF;
+  }
+  if (aPos < id3_header::FLAGS_END) {
+    return true;
+  }
+  if (aPos < id3_header::SIZE_END) {
+    return c < 0x80;
+  }
+  return true;
+}
+
+bool
+ID3Parser::ID3Header::IsValid() const {
+  return mPos >= SIZE;
+}
+
+bool
+ID3Parser::ID3Header::Update(uint8_t c) {
+  if (mPos >= id3_header::SIZE_END - id3_header::SIZE_LEN &&
+      mPos < id3_header::SIZE_END) {
+    mSize <<= 7;
+    mSize |= c;
+  }
+  if (mPos < SIZE) {
+    mRaw[mPos] = c;
+  }
+  return IsValid(mPos++);
+}
+
+}  // namespace mp4_demuxer
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/libstagefright/frameworks/av/media/libstagefright/MediaBuffer.cpp firefox-trunk-41.0~a1~hg20150524r245419/media/libstagefright/frameworks/av/media/libstagefright/MediaBuffer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/media/libstagefright/frameworks/av/media/libstagefright/MediaBuffer.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/libstagefright/frameworks/av/media/libstagefright/MediaBuffer.cpp	2015-05-25 20:43:16.000000000 +0000
@@ -204,7 +204,7 @@
     if (!mOwnsData || refcount()) {
         return false;
     }
-    if (!mBufferBackend.SetLength(length)) {
+    if (!mBufferBackend.SetLength(length, mozilla::fallible)) {
         return false;
     }
     mData = mBufferBackend.Elements();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp firefox-trunk-41.0~a1~hg20150524r245419/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp	2015-05-25 20:43:16.000000000 +0000
@@ -2205,7 +2205,7 @@
     }
 
     FallibleTArray<uint8_t> bufferBackend;
-    if (!bufferBackend.SetLength(size + 1)) {
+    if (!bufferBackend.SetLength(size + 1, mozilla::fallible)) {
         // OOM ignore metadata.
         return OK;
     }
@@ -3352,7 +3352,7 @@
     if (mSrcBackend.Length() >= aSize) {
         return true;
     }
-    if (!mSrcBackend.SetLength(aSize)) {
+    if (!mSrcBackend.SetLength(aSize, mozilla::fallible)) {
         ALOGE("Error insufficient memory, requested %u bytes (had:%u)",
               aSize, mSrcBackend.Length());
         return false;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/libstagefright/moz.build firefox-trunk-41.0~a1~hg20150524r245419/media/libstagefright/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/media/libstagefright/moz.build	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/libstagefright/moz.build	2015-05-25 20:43:16.000000000 +0000
@@ -60,6 +60,7 @@
     'binding/include/mp4_demuxer/Index.h',
     'binding/include/mp4_demuxer/Interval.h',
     'binding/include/mp4_demuxer/MoofParser.h',
+    'binding/include/mp4_demuxer/MP3TrackDemuxer.h',
     'binding/include/mp4_demuxer/mp4_demuxer.h',
     'binding/include/mp4_demuxer/MP4Metadata.h',
     'binding/include/mp4_demuxer/MP4TrackDemuxer.h',
@@ -90,6 +91,7 @@
     'binding/H264.cpp',
     'binding/Index.cpp',
     'binding/MoofParser.cpp',
+    'binding/MP3TrackDemuxer.cpp',
     'binding/mp4_demuxer.cpp',
     'binding/MP4Metadata.cpp',
     'binding/MP4TrackDemuxer.cpp',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/libstagefright/system/core/include/utils/TypeHelpers.h firefox-trunk-41.0~a1~hg20150524r245419/media/libstagefright/system/core/include/utils/TypeHelpers.h
--- firefox-trunk-41.0~a1~hg20150513r243603/media/libstagefright/system/core/include/utils/TypeHelpers.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/libstagefright/system/core/include/utils/TypeHelpers.h	2015-05-25 20:43:16.000000000 +0000
@@ -132,9 +132,7 @@
 void construct_type(TYPE* p, size_t n) {
     if (!traits<TYPE>::has_trivial_ctor) {
         while (n--) {
-            // new(p++); causes an internal compiler error in VS2015.
-            new(p) TYPE;
-            ++p;
+            new(p++) TYPE;
         }
     }
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/mtransport/dtlsidentity.cpp firefox-trunk-41.0~a1~hg20150524r245419/media/mtransport/dtlsidentity.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/media/mtransport/dtlsidentity.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/mtransport/dtlsidentity.cpp	2015-05-25 20:43:20.000000000 +0000
@@ -150,7 +150,9 @@
   }
   certificate->derCert = *signedCert;
 
-  return new DtlsIdentity(private_key.forget(), certificate.forget());
+  RefPtr<DtlsIdentity> identity =
+    new DtlsIdentity(private_key.forget(), certificate.forget());
+  return identity.forget();
 }
 
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/mtransport/logging.h firefox-trunk-41.0~a1~hg20150524r245419/media/mtransport/logging.h
--- firefox-trunk-41.0~a1~hg20150513r243603/media/mtransport/logging.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/mtransport/logging.h	2015-05-25 20:43:20.000000000 +0000
@@ -10,9 +10,7 @@
 #define logging_h__
 
 #include <sstream>
-#include <prlog.h>
-
-#if defined(PR_LOGGING)
+#include "mozilla/Logging.h"
 
 #define ML_EMERG            1
 #define ML_ERROR            2
@@ -21,7 +19,6 @@
 #define ML_INFO             5
 #define ML_DEBUG            6
 
-// PR_LOGGING is on --> make useful MTLOG macros
 #define MOZ_MTLOG_MODULE(n) \
   static PRLogModuleInfo* getLogModule() {      \
     static PRLogModuleInfo* log;                \
@@ -32,14 +29,11 @@
 
 #define MOZ_MTLOG(level, b) \
   do {                                                                  \
-    std::stringstream str;                                              \
-    str << b;                                                           \
-    PR_LOG(getLogModule(), level, ("%s", str.str().c_str())); } while(0)
-
-#else
-// PR_LOGGING is off --> make no-op MTLOG macros
-#define MOZ_MTLOG_MODULE(n)
-#define MOZ_MTLOG(level, b)
-#endif // defined(PR_LOGGING)
+    if (PR_LOG_TEST(getLogModule(), level)) {                           \
+      std::stringstream str;                                            \
+      str << b;                                                         \
+      MOZ_LOG(getLogModule(), level, ("%s", str.str().c_str()));         \
+    }                                                                   \
+  } while(0)
 
 #endif // logging_h__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/mtransport/nricemediastream.cpp firefox-trunk-41.0~a1~hg20150524r245419/media/mtransport/nricemediastream.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/media/mtransport/nricemediastream.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/mtransport/nricemediastream.cpp	2015-05-25 20:43:20.000000000 +0000
@@ -347,11 +347,12 @@
 }
 
 nsresult NrIceMediaStream::GetDefaultCandidate(
+    int component,
     NrIceCandidate* candidate) const {
 
   nr_ice_candidate *cand;
 
-  int r = nr_ice_media_stream_get_default_candidate(stream_, 1, &cand);
+  int r = nr_ice_media_stream_get_default_candidate(stream_, component, &cand);
   if (r) {
     MOZ_MTLOG(ML_ERROR, "Couldn't get default ICE candidate for '"
               << name_ << "'");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/mtransport/nricemediastream.h firefox-trunk-41.0~a1~hg20150524r245419/media/mtransport/nricemediastream.h
--- firefox-trunk-41.0~a1~hg20150513r243603/media/mtransport/nricemediastream.h	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/mtransport/nricemediastream.h	2015-05-25 20:43:20.000000000 +0000
@@ -136,9 +136,7 @@
   // queue, in priority order. |out_pairs| is cleared before being filled.
   nsresult GetCandidatePairs(std::vector<NrIceCandidatePair>* out_pairs) const;
 
-  // TODO(bug 1096795): This needs to take a component number, so we can get
-  // default candidates for rtcp.
-  nsresult GetDefaultCandidate(NrIceCandidate* candidate) const;
+  nsresult GetDefaultCandidate(int component, NrIceCandidate* candidate) const;
 
   // Parse remote attributes
   nsresult ParseAttributes(std::vector<std::string>& candidates);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/mtransport/nr_timer.cpp firefox-trunk-41.0~a1~hg20150524r245419/media/mtransport/nr_timer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/media/mtransport/nr_timer.cpp	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/mtransport/nr_timer.cpp	2015-05-25 20:43:20.000000000 +0000
@@ -93,21 +93,24 @@
   NS_DECL_NSITIMERCALLBACK
 
   nrappkitTimerCallback(NR_async_cb cb, void *cb_arg,
-                        const char *function, int line,
-                        nsITimer *timer)
+                        const char *function, int line)
       : nrappkitCallback(cb, cb_arg, function, line),
-        timer_(timer) {}
+      timer_(nullptr) {}
+
+  void SetTimer(already_AddRefed<nsITimer>&& timer) {
+    timer_ = timer;
+  }
 
   virtual void Cancel() override {
     AddRef();  // Cancelling the timer causes the callback it holds to
                // be released. AddRef() keeps us alive.
     timer_->Cancel();
-    timer_->Release();
+    timer_ = nullptr;
     Release(); // Will cause deletion of this object.
   }
 
  private:
-  nsITimer* timer_;
+  nsCOMPtr<nsITimer> timer_;
   virtual ~nrappkitTimerCallback() {}
 };
 
@@ -120,7 +123,7 @@
   cb_(0, 0, cb_arg_);
 
   // Allow the timer to go away.
-  timer->Release();
+  timer_ = nullptr;
   return NS_OK;
 }
 
@@ -201,14 +204,15 @@
   }
 
   nrappkitTimerCallback* callback =
-      new nrappkitTimerCallback(cb, arg, func, l, timer);
+      new nrappkitTimerCallback(cb, arg, func, l);
   rv = timer->InitWithCallback(callback, timeout, nsITimer::TYPE_ONE_SHOT);
   if (NS_FAILED(rv)) {
     return R_FAILED;
   }
 
-  // We need an AddRef here to keep the timer alive, per the spec.
-  timer->AddRef();
+  // Move the ownership of the timer to the callback object, which holds the
+  // timer alive per spec.
+  callback->SetTimer(timer.forget());
 
   *handle = callback;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/mtransport/test/moz.build firefox-trunk-41.0~a1~hg20150524r245419/media/mtransport/test/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/media/mtransport/test/moz.build	2015-05-13 18:06:06.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/mtransport/test/moz.build	2015-05-25 20:43:21.000000000 +0000
@@ -55,7 +55,6 @@
 if CONFIG['OS_TARGET'] in ('DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD'):
     LOCAL_INCLUDES += [
         '/media/mtransport/third_party/nrappkit/src/port/darwin/include',
-        '/media/mtransport/third_party/nrappkit/src/port/generic/include',
     ]
 
 # SCTP DEFINES
@@ -79,6 +78,7 @@
     '/media/mtransport/third_party/nrappkit/src/event',
     '/media/mtransport/third_party/nrappkit/src/log',
     '/media/mtransport/third_party/nrappkit/src/plugin',
+    '/media/mtransport/third_party/nrappkit/src/port/generic/include',
     '/media/mtransport/third_party/nrappkit/src/registry',
     '/media/mtransport/third_party/nrappkit/src/share',
     '/media/mtransport/third_party/nrappkit/src/stats',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/signaling.gyp firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/signaling.gyp
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/signaling.gyp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/signaling.gyp	2015-05-25 20:43:22.000000000 +0000
@@ -1,7 +1,33 @@
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
+# Copyright (c) 2011, The WebRTC project authors. All rights reserved.
 #
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#  *  Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#
+#  *  Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in
+#     the documentation and/or other materials provided with the
+#     distribution.
+#
+#  *  Neither the name of Google nor the names of its contributors may
+#     be used to endorse or promote products derived from this software
+#     without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# 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.
+
 # Indent 2 spaces, no tabs.
 #
 #
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/common/browser_logging/CSFLog.cpp firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/common/browser_logging/CSFLog.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/common/browser_logging/CSFLog.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/common/browser_logging/CSFLog.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -82,7 +82,7 @@
   }
 
   vsnprintf(message, MAX_MESSAGE_LENGTH, format, args);
-  PR_LOG(gLogModuleInfo, level, ("[%s|%s] %s:%d: %s",
+  MOZ_LOG(gLogModuleInfo, level, ("[%s|%s] %s:%d: %s",
                                   threadName, tag, sourceFile, sourceLine,
                                   message));
 #endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/common/browser_logging/CSFLog.h firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/common/browser_logging/CSFLog.h
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/common/browser_logging/CSFLog.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/common/browser_logging/CSFLog.h	2015-05-25 20:43:22.000000000 +0000
@@ -6,7 +6,7 @@
 #define CSFLOG_H
 
 #include <stdarg.h>
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 typedef enum{
     CSF_LOG_CRITICAL =1,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/common/browser_logging/WebRtcLog.cpp firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/common/browser_logging/WebRtcLog.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/common/browser_logging/WebRtcLog.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/common/browser_logging/WebRtcLog.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -4,13 +4,14 @@
 
 #include "WebRtcLog.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prenv.h"
 #include "webrtc/system_wrappers/interface/trace.h"
 
 #include "nscore.h"
 #ifdef MOZILLA_INTERNAL_API
 #include "nsString.h"
+#include "nsXULAppAPI.h"
 #if !defined(MOZILLA_XPCOMRT_API)
 #include "mozilla/Preferences.h"
 #endif // !defined(MOZILLA_XPCOMRT_API)
@@ -47,10 +48,8 @@
 public:
   void Print(webrtc::TraceLevel level, const char* message, int length)
   {
-#ifdef PR_LOGGING
     PRLogModuleInfo *log = GetWebRtcTraceLog();
-    PR_LOG(log, PR_LOG_DEBUG, ("%s", message));
-#endif
+    MOZ_LOG(log, PR_LOG_DEBUG, ("%s", message));
   }
 };
 
@@ -146,9 +145,11 @@
     }
   }
 #if !defined(MOZILLA_EXTERNAL_LINKAGE)
-  // Capture the final choices for the trace settings.
-  mozilla::Preferences::SetCString("media.webrtc.debug.log_file", aLogFile);
-  mozilla::Preferences::SetCString("media.webrtc.debug.aec_log_dir", aAECLogDir);
+  if (XRE_GetProcessType() == GeckoProcessType_Default) {
+    // Capture the final choices for the trace settings.
+    mozilla::Preferences::SetCString("media.webrtc.debug.log_file", aLogFile);
+    mozilla::Preferences::SetCString("media.webrtc.debug.aec_log_dir", aAECLogDir);
+  }
 #endif
   return;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/common/PtrVector.h firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/common/PtrVector.h
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/common/PtrVector.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/common/PtrVector.h	2015-05-25 20:43:22.000000000 +0000
@@ -5,6 +5,7 @@
 #ifndef PtrVector_h
 #define PtrVector_h
 
+#include <mozilla/Move.h>
 #include <vector>
 
 namespace mozilla
@@ -16,6 +17,18 @@
 template <class T> class PtrVector
 {
 public:
+  PtrVector() = default;
+  PtrVector(const PtrVector&) = delete;
+  PtrVector(PtrVector&& aOther)
+    : values(Move(aOther.values))
+  {}
+  PtrVector& operator=(const PtrVector&) = delete;
+  PtrVector& operator=(PtrVector&& aOther)
+  {
+    Swap(values, aOther.values);
+    return *this;
+  }
+
   ~PtrVector()
   {
     for (T* value : values) { delete value; }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/jsep/JsepCodecDescription.h firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/jsep/JsepCodecDescription.h
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/jsep/JsepCodecDescription.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/jsep/JsepCodecDescription.h	2015-05-25 20:43:22.000000000 +0000
@@ -324,8 +324,10 @@
         mDefaultPt, SdpRtcpFbAttributeList::kNack, SdpRtcpFbAttributeList::pli);
     rtcpfb.PushEntry(
         mDefaultPt, SdpRtcpFbAttributeList::kCcm, SdpRtcpFbAttributeList::fir);
-    rtcpfb.PushEntry(
-        mDefaultPt, SdpRtcpFbAttributeList::kCcm, SdpRtcpFbAttributeList::tmmbr);
+    if (mUseTmmbr) {
+      rtcpfb.PushEntry(
+          mDefaultPt, SdpRtcpFbAttributeList::kCcm, SdpRtcpFbAttributeList::tmmbr);
+    }
   }
 
   SdpFmtpAttributeList::H264Parameters
@@ -668,6 +670,7 @@
   uint32_t mMaxCpb;
   uint32_t mMaxDpb;
   uint32_t mMaxBr;
+  bool     mUseTmmbr;
   std::string mSpropParameterSets;
 };
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/jsep/JsepSession.h firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/jsep/JsepSession.h
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/jsep/JsepSession.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/jsep/JsepSession.h	2015-05-25 20:43:22.000000000 +0000
@@ -36,6 +36,7 @@
   kJsepSdpOffer,
   kJsepSdpAnswer,
   kJsepSdpPranswer,
+  kJsepSdpRollback
 };
 
 struct JsepOAOptions {};
@@ -130,9 +131,12 @@
                                         const std::string& mid,
                                         uint16_t level,
                                         bool* skipped) = 0;
-  virtual nsresult EndOfLocalCandidates(const std::string& defaultCandidateAddr,
-                                        uint16_t defaultCandidatePort,
-                                        uint16_t level) = 0;
+  virtual nsresult EndOfLocalCandidates(
+      const std::string& defaultCandidateAddr,
+      uint16_t defaultCandidatePort,
+      const std::string& defaultRtcpCandidateAddr,
+      uint16_t defaultRtcpCandidatePort,
+      uint16_t level) = 0;
   virtual nsresult Close() = 0;
 
   // ICE controlling or controlled
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -111,23 +111,15 @@
 
     if (track->GetSsrcs().empty()) {
       uint32_t ssrc;
-      do {
-        SECStatus rv = PK11_GenerateRandom(
-            reinterpret_cast<unsigned char*>(&ssrc), sizeof(ssrc));
-        if (rv != SECSuccess) {
-          JSEP_SET_ERROR("Failed to generate SSRC, error=" << rv);
-          return NS_ERROR_FAILURE;
-        }
-      } while (mSsrcs.count(ssrc));
-
-      mSsrcs.insert(ssrc);
+      nsresult rv = CreateSsrc(&ssrc);
+      NS_ENSURE_SUCCESS(rv, rv);
       track->AddSsrc(ssrc);
     }
   }
 
   JsepSendingTrack strack;
   strack.mTrack = track;
-  strack.mSetInLocalDescription = false;
+  strack.mNegotiated = false;
 
   mLocalTracks.push_back(strack);
 
@@ -403,12 +395,12 @@
     SdpMediaSection* msection)
 {
   if (msection->GetMediaType() != SdpMediaSection::kApplication) {
-    AddLocalSsrcs(*track->mTrack, msection);
+    SetSsrcs(track->mTrack->GetSsrcs(), msection);
     AddLocalIds(*track->mTrack, msection);
   }
   msection->SetSending(true);
   track->mAssignedMLine = Some(msection->GetLevel());
-  track->mSetInLocalDescription = false;
+  track->mNegotiated = false;
   return NS_OK;
 }
 
@@ -541,7 +533,7 @@
 }
 
 nsresult
-JsepSessionImpl::SetupTransportAttributes(Sdp* offer)
+JsepSessionImpl::FinalizeTransportAttributes(Sdp* offer)
 {
   const Sdp* oldAnswer = GetAnswer();
 
@@ -610,6 +602,11 @@
 
   for (auto i = allMsids.begin(); i != allMsids.end(); ++i) {
     if (allMsidsAreWebrtc || webrtcMsids.count(i->identifier)) {
+      if (i->appdata.empty()) {
+        JSEP_SET_ERROR("Invalid webrtc msid at level " << msection.GetLevel()
+                       << ": Missing track id.");
+        return NS_ERROR_INVALID_ARG;
+      }
       if (!found) {
         *streamId = i->identifier;
         *trackId = i->appdata;
@@ -757,11 +754,10 @@
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
-  // Get rid of all m-line assignments that have not been executed by a call
-  // to SetLocalDescription.
+  // Get rid of all m-line assignments that have not been negotiated
   if (NS_SUCCEEDED(rv)) {
     for (auto i = mLocalTracks.begin(); i != mLocalTracks.end(); ++i) {
-      if (!i->mSetInLocalDescription) {
+      if (!i->mNegotiated) {
         i->mAssignedMLine.reset();
       }
     }
@@ -773,7 +769,7 @@
 
   SetupBundle(sdp.get());
 
-  rv = SetupTransportAttributes(sdp.get());
+  rv = FinalizeTransportAttributes(sdp.get());
   NS_ENSURE_SUCCESS(rv,rv);
 
   *offer = sdp->ToString();
@@ -836,21 +832,24 @@
 }
 
 void
-JsepSessionImpl::AddLocalSsrcs(const JsepTrack& track,
-                               SdpMediaSection* msection) const
+JsepSessionImpl::SetSsrcs(const std::vector<uint32_t>& ssrcs,
+                          SdpMediaSection* msection) const
 {
-  UniquePtr<SdpSsrcAttributeList> ssrcs(new SdpSsrcAttributeList);
-  for (auto i = track.GetSsrcs().begin(); i != track.GetSsrcs().end(); ++i) {
+  if (ssrcs.empty()) {
+    msection->GetAttributeList().RemoveAttribute(SdpAttribute::kSsrcAttribute);
+    return;
+  }
+
+  UniquePtr<SdpSsrcAttributeList> ssrcAttr(new SdpSsrcAttributeList);
+  for (auto ssrc : ssrcs) {
     // When using ssrc attributes, we are required to at least have a cname.
     // (See https://tools.ietf.org/html/rfc5576#section-6.1)
     std::string cnameAttr("cname:");
-    cnameAttr += track.GetCNAME();
-    ssrcs->PushEntry(*i, cnameAttr);
+    cnameAttr += mCNAME;
+    ssrcAttr->PushEntry(ssrc, cnameAttr);
   }
 
-  if (!ssrcs->mSsrcs.empty()) {
-    msection->GetAttributeList().SetAttribute(ssrcs.release());
-  }
+  msection->GetAttributeList().SetAttribute(ssrcAttr.release());
 }
 
 void
@@ -1003,9 +1002,8 @@
       continue;
     }
 
-    // Get rid of all m-line assignments that have not been executed by a call
-    // to SetLocalDescription.
-    if (!i->mSetInLocalDescription) {
+    // Get rid of all m-line assignments that have not been negotiated
+    if (!i->mNegotiated) {
       i->mAssignedMLine.reset();
       continue;
     }
@@ -1019,15 +1017,7 @@
 
   for (size_t i = 0; i < numMsections; ++i) {
     const SdpMediaSection& remoteMsection = offer.GetMediaSection(i);
-    SdpMediaSection& msection =
-        sdp->AddMediaSection(remoteMsection.GetMediaType(),
-                             SdpDirectionAttribute::kInactive,
-                             9,
-                             remoteMsection.GetProtocol(),
-                             sdp::kIPv4,
-                             "0.0.0.0");
-
-    rv = CreateAnswerMSection(options, i, remoteMsection, &msection, sdp.get());
+    rv = CreateAnswerMSection(options, i, remoteMsection, sdp.get());
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
@@ -1096,7 +1086,7 @@
   SdpMediaSection* msection =
       &sdp->AddMediaSection(mediatype, dir, 0, proto, sdp::kIPv4, "0.0.0.0");
 
-  return EnableMsection(msection);
+  return EnableOfferMsection(msection);
 }
 
 nsresult
@@ -1121,7 +1111,7 @@
 
     if (MsectionIsDisabled(msection)) {
       // Was disabled; revive
-      nsresult rv = EnableMsection(&msection);
+      nsresult rv = EnableOfferMsection(&msection);
       NS_ENSURE_SUCCESS(rv, rv);
     }
 
@@ -1143,14 +1133,21 @@
 JsepSessionImpl::CreateAnswerMSection(const JsepAnswerOptions& options,
                                       size_t mlineIndex,
                                       const SdpMediaSection& remoteMsection,
-                                      SdpMediaSection* msection,
                                       Sdp* sdp)
 {
-  nsresult rv = CopyStickyParams(remoteMsection, msection);
+  SdpMediaSection& msection =
+      sdp->AddMediaSection(remoteMsection.GetMediaType(),
+                           SdpDirectionAttribute::kInactive,
+                           9,
+                           remoteMsection.GetProtocol(),
+                           sdp::kIPv4,
+                           "0.0.0.0");
+
+  nsresult rv = CopyStickyParams(remoteMsection, &msection);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (MsectionIsDisabled(remoteMsection)) {
-    DisableMsection(sdp, msection);
+    DisableMsection(sdp, &msection);
     return NS_OK;
   }
 
@@ -1158,18 +1155,21 @@
   rv = DetermineAnswererSetupRole(remoteMsection, &role);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = AddTransportAttributes(msection, role);
+  rv = AddTransportAttributes(&msection, role);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = SetRecvonlySsrc(&msection);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Only attempt to match up local tracks if the offerer has elected to
   // receive traffic.
   if (remoteMsection.IsReceiving()) {
-    rv = BindMatchingLocalTrackForAnswer(msection);
+    rv = BindMatchingLocalTrackForAnswer(&msection);
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
   if (remoteMsection.IsSending()) {
-    msection->SetReceiving(true);
+    msection.SetReceiving(true);
   }
 
   // Now add the codecs.
@@ -1180,7 +1180,7 @@
     UniquePtr<JsepCodecDescription> negotiated(
         codec->MakeNegotiatedCodec(remoteMsection));
     if (negotiated) {
-      negotiated->AddToMediaSection(*msection);
+      negotiated->AddToMediaSection(msection);
       // TODO(bug 1099351): Once bug 1073475 is fixed on all supported
       // versions, we can remove this limitation.
       break;
@@ -1188,18 +1188,35 @@
   }
 
   // Add extmap attributes.
-  AddCommonExtmaps(remoteMsection, msection);
+  AddCommonExtmaps(remoteMsection, &msection);
 
-  if (!msection->IsReceiving() && !msection->IsSending()) {
-    DisableMsection(sdp, msection);
+  if (!msection.IsReceiving() && !msection.IsSending()) {
+    DisableMsection(sdp, &msection);
     return NS_OK;
   }
 
-  if (msection->GetFormats().empty()) {
+  if (msection.GetFormats().empty()) {
     // Could not negotiate anything. Disable m-section.
-    DisableMsection(sdp, msection);
+    DisableMsection(sdp, &msection);
+  }
+
+  return NS_OK;
+}
+
+nsresult
+JsepSessionImpl::SetRecvonlySsrc(SdpMediaSection* msection)
+{
+  // If previous m-sections are disabled, we do not call this function for them
+  while (mRecvonlySsrcs.size() <= msection->GetLevel()) {
+    uint32_t ssrc;
+    nsresult rv = CreateSsrc(&ssrc);
+    NS_ENSURE_SUCCESS(rv, rv);
+    mRecvonlySsrcs.push_back(ssrc);
   }
 
+  std::vector<uint32_t> ssrcs;
+  ssrcs.push_back(mRecvonlySsrcs[msection->GetLevel()]);
+  SetSsrcs(ssrcs, msection);
   return NS_OK;
 }
 
@@ -1302,6 +1319,23 @@
 {
   mLastError.clear();
 
+  MOZ_MTLOG(ML_DEBUG, "SetLocalDescription type=" << type << "\nSDP=\n"
+                                                  << sdp);
+
+  if (type == kJsepSdpRollback) {
+    if (mState != kJsepStateHaveLocalOffer) {
+      JSEP_SET_ERROR("Cannot rollback local description in "
+                     << GetStateStr(mState));
+      return NS_ERROR_UNEXPECTED;
+    }
+
+    mPendingLocalDescription.reset();
+    SetState(kJsepStateStable);
+    mTransports = mOldTransports;
+    mOldTransports.clear();
+    return NS_OK;
+  }
+
   switch (mState) {
     case kJsepStateStable:
       if (type != kJsepSdpOffer) {
@@ -1333,18 +1367,13 @@
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Create transport objects.
-  size_t numMsections = parsed->GetMediaSectionCount();
-  for (size_t t = 0; t < numMsections; ++t) {
-    if (t < mTransports.size()) {
-      mTransports[t]->mState = JsepTransport::kJsepTransportOffered;
-      continue; // This transport already exists (assume we are renegotiating).
+  mOldTransports = mTransports;
+  for (size_t t = 0; t < parsed->GetMediaSectionCount(); ++t) {
+    if (t >= mTransports.size()) {
+      mTransports.push_back(RefPtr<JsepTransport>(new JsepTransport));
     }
 
-    RefPtr<JsepTransport> transport;
-    nsresult rv = CreateTransport(parsed->GetMediaSection(t), &transport);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    mTransports.push_back(transport);
+    UpdateTransport(parsed->GetMediaSection(t), mTransports[t].get());
   }
 
   switch (type) {
@@ -1355,15 +1384,8 @@
     case kJsepSdpPranswer:
       rv = SetLocalDescriptionAnswer(type, Move(parsed));
       break;
-  }
-
-  // Mark all assigned local tracks as added to the local description
-  if (NS_SUCCEEDED(rv)) {
-    for (auto i = mLocalTracks.begin(); i != mLocalTracks.end(); ++i) {
-      if (i->mAssignedMLine.isSome()) {
-        i->mSetInLocalDescription = true;
-      }
-    }
+    case kJsepSdpRollback:
+      MOZ_CRASH(); // Handled above
   }
 
   return rv;
@@ -1409,6 +1431,21 @@
 
   MOZ_MTLOG(ML_DEBUG, "SetRemoteDescription type=" << type << "\nSDP=\n"
                                                    << sdp);
+
+  if (type == kJsepSdpRollback) {
+    if (mState != kJsepStateHaveRemoteOffer) {
+      JSEP_SET_ERROR("Cannot rollback remote description in "
+                     << GetStateStr(mState));
+      return NS_ERROR_UNEXPECTED;
+    }
+
+    mPendingRemoteDescription.reset();
+    SetState(kJsepStateStable);
+
+    // Update the remote tracks to what they were before the SetRemote
+    return SetRemoteTracksFromDescription(mCurrentRemoteDescription.get());
+  }
+
   switch (mState) {
     case kJsepStateStable:
       if (type != kJsepSdpOffer) {
@@ -1457,6 +1494,8 @@
     case kJsepSdpPranswer:
       rv = SetRemoteDescriptionAnswer(type, Move(parsed));
       break;
+    case kJsepSdpRollback:
+      MOZ_CRASH(); // Handled above
   }
 
   if (NS_SUCCEEDED(rv)) {
@@ -1486,11 +1525,18 @@
 
   std::vector<JsepTrackPair> trackPairs;
 
+  if (mTransports.size() < local->GetMediaSectionCount()) {
+    JSEP_SET_ERROR("Fewer transports set up than m-lines");
+    MOZ_ASSERT(false);
+    return NS_ERROR_FAILURE;
+  }
+
   // Now walk through the m-sections, make sure they match, and create
   // track pairs that describe the media to be set up.
   for (size_t i = 0; i < local->GetMediaSectionCount(); ++i) {
     // Skip disabled m-sections.
     if (answer.GetMediaSection(i).GetPort() == 0) {
+      mTransports[i]->Close();
       continue;
     }
 
@@ -1505,20 +1551,16 @@
         if (bundleMids.count(answerMsection.GetAttributeList().GetMid())) {
           transportLevel = bundleMsection->GetLevel();
           usingBundle = true;
+          if (i != transportLevel) {
+            mTransports[i]->Close();
+          }
         }
       }
     }
 
-    // Transports are created in SetLocal.
-    if (mTransports.size() < transportLevel) {
-      JSEP_SET_ERROR("Fewer transports set up than m-lines");
-      MOZ_ASSERT(false);
-      return NS_ERROR_FAILURE;
-    }
-
     RefPtr<JsepTransport> transport = mTransports[transportLevel];
 
-    rv = SetupTransport(
+    rv = FinalizeTransport(
         remote->GetMediaSection(transportLevel).GetAttributeList(),
         answer.GetMediaSection(transportLevel).GetAttributeList(),
         transport);
@@ -1550,12 +1592,16 @@
   // stuff for renegotiation.
   mNegotiatedTrackPairs = trackPairs;
 
-  // Mark transports that weren't accepted as closed
-  for (auto i = mTransports.begin(); i != mTransports.end(); ++i) {
-    if ((*i)->mState != JsepTransport::kJsepTransportAccepted) {
-      (*i)->mState = JsepTransport::kJsepTransportClosed;
+  // Mark all assigned local tracks as negotiated
+  if (NS_SUCCEEDED(rv)) {
+    for (auto i = mLocalTracks.begin(); i != mLocalTracks.end(); ++i) {
+      if (i->mAssignedMLine.isSome()) {
+        i->mNegotiated = true;
+      }
     }
   }
+
+  mGeneratedLocalDescription.reset();
   return NS_OK;
 }
 
@@ -1567,6 +1613,7 @@
                                          size_t transportLevel,
                                          JsepTrackPair* trackPairOut)
 {
+  MOZ_ASSERT(transport->mComponents);
   const SdpMediaSection& answer = mIsOfferer ? remote : local;
 
   bool sending;
@@ -1588,6 +1635,10 @@
 
   trackPairOut->mLevel = local.GetLevel();
 
+  MOZ_ASSERT(mRecvonlySsrcs.size() > local.GetLevel(),
+             "Failed to set the default ssrc for an active m-section");
+  trackPairOut->mRecvonlySsrc = mRecvonlySsrcs[local.GetLevel()];
+
   if (usingBundle) {
     trackPairOut->mBundleLevel = Some(transportLevel);
   }
@@ -1646,20 +1697,11 @@
 
   trackPairOut->mRtpTransport = transport;
 
-  const SdpAttributeList& remoteAttrs(remote.GetAttributeList());
-  const SdpAttributeList& localAttrs(local.GetAttributeList());
-
-  if (HasRtcp(local.GetProtocol())) {
+  if (transport->mComponents == 2) {
     // RTCP MUX or not.
     // TODO(bug 1095743): verify that the PTs are consistent with mux.
-    if (remoteAttrs.HasAttribute(SdpAttribute::kRtcpMuxAttribute) &&
-        localAttrs.HasAttribute(SdpAttribute::kRtcpMuxAttribute)) {
-      trackPairOut->mRtcpTransport = nullptr; // We agree on mux.
-      MOZ_MTLOG(ML_DEBUG, "RTCP-MUX is on");
-    } else {
-      MOZ_MTLOG(ML_DEBUG, "RTCP-MUX is off");
-      trackPairOut->mRtcpTransport = transport;
-    }
+    MOZ_MTLOG(ML_DEBUG, "RTCP-MUX is off");
+    trackPairOut->mRtcpTransport = transport;
   }
 
   return NS_OK;
@@ -1737,36 +1779,34 @@
   return NS_OK;
 }
 
-nsresult
-JsepSessionImpl::CreateTransport(const SdpMediaSection& msection,
-                                 RefPtr<JsepTransport>* transport)
+void
+JsepSessionImpl::UpdateTransport(const SdpMediaSection& msection,
+                                 JsepTransport* transport)
 {
-  size_t components;
+  if (MsectionIsDisabled(msection)) {
+    transport->Close();
+    return;
+  }
 
   if (HasRtcp(msection.GetProtocol())) {
-    components = 2;
+    transport->mComponents = 2;
   } else {
-    components = 1;
+    transport->mComponents = 1;
   }
 
-  std::string id;
   if (msection.GetAttributeList().HasAttribute(SdpAttribute::kMidAttribute)) {
-    id = msection.GetAttributeList().GetMid();
+    transport->mTransportId = msection.GetAttributeList().GetMid();
   } else {
     std::ostringstream os;
     os << "level_" << msection.GetLevel() << "(no mid)";
-    id = os.str();
+    transport->mTransportId = os.str();
   }
-
-  *transport = new JsepTransport(id, components);
-
-  return NS_OK;
 }
 
 nsresult
-JsepSessionImpl::SetupTransport(const SdpAttributeList& remote,
-                                const SdpAttributeList& answer,
-                                const RefPtr<JsepTransport>& transport)
+JsepSessionImpl::FinalizeTransport(const SdpAttributeList& remote,
+                                   const SdpAttributeList& answer,
+                                   const RefPtr<JsepTransport>& transport)
 {
   UniquePtr<JsepIceTransport> ice = MakeUnique<JsepIceTransport>();
 
@@ -1814,8 +1854,6 @@
     transport->mComponents = 1;
   }
 
-  transport->mState = JsepTransport::kJsepTransportAccepted;
-
   return NS_OK;
 }
 
@@ -1996,7 +2034,7 @@
 
   // TODO(bug 1095780): Note that we create remote tracks even when
   // They contain only codecs we can't negotiate or other craziness.
-  nsresult rv = SetRemoteTracksFromDescription(*offer);
+  nsresult rv = SetRemoteTracksFromDescription(offer.get());
   NS_ENSURE_SUCCESS(rv, rv);
 
   mPendingRemoteDescription = Move(offer);
@@ -2020,7 +2058,7 @@
 
   // TODO(bug 1095780): Note that this creates remote tracks even if
   // we offered sendonly and other side offered sendrecv or recvonly.
-  rv = SetRemoteTracksFromDescription(*mPendingRemoteDescription);
+  rv = SetRemoteTracksFromDescription(mPendingRemoteDescription.get());
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = HandleNegotiatedSession(mPendingLocalDescription,
@@ -2035,51 +2073,54 @@
 }
 
 nsresult
-JsepSessionImpl::SetRemoteTracksFromDescription(const Sdp& remoteDescription)
+JsepSessionImpl::SetRemoteTracksFromDescription(const Sdp* remoteDescription)
 {
   // Unassign all remote tracks
   for (auto i = mRemoteTracks.begin(); i != mRemoteTracks.end(); ++i) {
     i->mAssignedMLine.reset();
   }
 
-  size_t numMlines = remoteDescription.GetMediaSectionCount();
-  nsresult rv;
-
-  // Iterate over the sdp, re-assigning or creating remote tracks as we go
-  for (size_t i = 0; i < numMlines; ++i) {
-    const SdpMediaSection& msection = remoteDescription.GetMediaSection(i);
+  // This will not exist if we're rolling back the first remote description
+  if (remoteDescription) {
+    size_t numMlines = remoteDescription->GetMediaSectionCount();
+    nsresult rv;
+
+    // Iterate over the sdp, re-assigning or creating remote tracks as we go
+    for (size_t i = 0; i < numMlines; ++i) {
+      const SdpMediaSection& msection = remoteDescription->GetMediaSection(i);
 
-    if (MsectionIsDisabled(msection) || !msection.IsSending()) {
-      continue;
-    }
+      if (MsectionIsDisabled(msection) || !msection.IsSending()) {
+        continue;
+      }
 
-    std::vector<JsepReceivingTrack>::iterator track;
+      std::vector<JsepReceivingTrack>::iterator track;
 
-    if (msection.GetMediaType() == SdpMediaSection::kApplication) {
-      // Datachannel doesn't have msid, just search by type
-      track = FindUnassignedTrackByType(mRemoteTracks,
-                                        msection.GetMediaType());
-    } else {
-      std::string streamId;
-      std::string trackId;
-      rv = GetRemoteIds(remoteDescription, msection, &streamId, &trackId);
-      NS_ENSURE_SUCCESS(rv, rv);
+      if (msection.GetMediaType() == SdpMediaSection::kApplication) {
+        // Datachannel doesn't have msid, just search by type
+        track = FindUnassignedTrackByType(mRemoteTracks,
+                                          msection.GetMediaType());
+      } else {
+        std::string streamId;
+        std::string trackId;
+        rv = GetRemoteIds(*remoteDescription, msection, &streamId, &trackId);
+        NS_ENSURE_SUCCESS(rv, rv);
 
-      track = FindTrackByIds(mRemoteTracks, streamId, trackId);
-    }
+        track = FindTrackByIds(mRemoteTracks, streamId, trackId);
+      }
 
-    if (track == mRemoteTracks.end()) {
-      RefPtr<JsepTrack> track;
-      rv = CreateReceivingTrack(i, remoteDescription, msection, &track);
-      NS_ENSURE_SUCCESS(rv, rv);
+      if (track == mRemoteTracks.end()) {
+        RefPtr<JsepTrack> track;
+        rv = CreateReceivingTrack(i, *remoteDescription, msection, &track);
+        NS_ENSURE_SUCCESS(rv, rv);
 
-      JsepReceivingTrack rtrack;
-      rtrack.mTrack = track;
-      rtrack.mAssignedMLine = Some(i);
-      mRemoteTracks.push_back(rtrack);
-      mRemoteTracksAdded.push_back(rtrack);
-    } else {
-      track->mAssignedMLine = Some(i);
+        JsepReceivingTrack rtrack;
+        rtrack.mTrack = track;
+        rtrack.mAssignedMLine = Some(i);
+        mRemoteTracks.push_back(rtrack);
+        mRemoteTracksAdded.push_back(rtrack);
+      } else {
+        track->mAssignedMLine = Some(i);
+      }
     }
   }
 
@@ -2100,7 +2141,11 @@
 JsepSessionImpl::ValidateLocalDescription(const Sdp& description)
 {
   // TODO(bug 1095226): Better checking.
-  // (Also, at what point do we clear out the generated offer?)
+  if (!mGeneratedLocalDescription) {
+    JSEP_SET_ERROR("Calling SetLocal without first calling CreateOffer/Answer"
+                   " is not supported.");
+    return NS_ERROR_UNEXPECTED;
+  }
 
   if (description.GetMediaSectionCount() !=
       mGeneratedLocalDescription->GetMediaSectionCount()) {
@@ -2349,6 +2394,22 @@
   return NS_OK;
 }
 
+nsresult
+JsepSessionImpl::CreateSsrc(uint32_t* ssrc)
+{
+  do {
+    SECStatus rv = PK11_GenerateRandom(
+        reinterpret_cast<unsigned char*>(ssrc), sizeof(uint32_t));
+    if (rv != SECSuccess) {
+      JSEP_SET_ERROR("Failed to generate SSRC, error=" << rv);
+      return NS_ERROR_FAILURE;
+    }
+  } while (mSsrcs.count(*ssrc));
+  mSsrcs.insert(*ssrc);
+
+  return NS_OK;
+}
+
 void
 JsepSessionImpl::SetupDefaultCodecs()
 {
@@ -2559,9 +2620,32 @@
   return AddCandidateToSdp(sdp, candidate, mid, level);
 }
 
+static void SetDefaultAddresses(const std::string& defaultCandidateAddr,
+                                uint16_t defaultCandidatePort,
+                                const std::string& defaultRtcpCandidateAddr,
+                                uint16_t defaultRtcpCandidatePort,
+                                SdpMediaSection* msection)
+{
+  msection->GetConnection().SetAddress(defaultCandidateAddr);
+  msection->SetPort(defaultCandidatePort);
+  if (!defaultRtcpCandidateAddr.empty()) {
+    sdp::AddrType ipVersion = sdp::kIPv4;
+    if (defaultRtcpCandidateAddr.find(':') != std::string::npos) {
+      ipVersion = sdp::kIPv6;
+    }
+    msection->GetAttributeList().SetAttribute(new SdpRtcpAttribute(
+          defaultRtcpCandidatePort,
+          sdp::kInternet,
+          ipVersion,
+          defaultRtcpCandidateAddr));
+  }
+}
+
 nsresult
 JsepSessionImpl::EndOfLocalCandidates(const std::string& defaultCandidateAddr,
                                       uint16_t defaultCandidatePort,
+                                      const std::string& defaultRtcpCandidateAddr,
+                                      uint16_t defaultRtcpCandidatePort,
                                       uint16_t level)
 {
   mLastError.clear();
@@ -2604,13 +2688,19 @@
           MOZ_ASSERT(false);
           continue;
         }
-        bundledMsection->GetConnection().SetAddress(defaultCandidateAddr);
-        bundledMsection->SetPort(defaultCandidatePort);
+        SetDefaultAddresses(defaultCandidateAddr,
+                            defaultCandidatePort,
+                            defaultRtcpCandidateAddr,
+                            defaultRtcpCandidatePort,
+                            bundledMsection);
       }
     }
 
-    msection.GetConnection().SetAddress(defaultCandidateAddr);
-    msection.SetPort(defaultCandidatePort);
+    SetDefaultAddresses(defaultCandidateAddr,
+                        defaultCandidatePort,
+                        defaultRtcpCandidateAddr,
+                        defaultRtcpCandidatePort,
+                        &msection);
 
     // TODO(bug 1095793): Will this have an mid someday?
 
@@ -2793,7 +2883,7 @@
 }
 
 nsresult
-JsepSessionImpl::EnableMsection(SdpMediaSection* msection)
+JsepSessionImpl::EnableOfferMsection(SdpMediaSection* msection)
 {
   // We assert here because adding rtcp-mux to a non-disabled m-section that
   // did not already have rtcp-mux can cause problems.
@@ -2812,6 +2902,9 @@
   nsresult rv = AddTransportAttributes(msection, SdpSetupAttribute::kActpass);
   NS_ENSURE_SUCCESS(rv, rv);
 
+  rv = SetRecvonlySsrc(msection);
+  NS_ENSURE_SUCCESS(rv, rv);
+
   AddCodecs(msection);
 
   AddExtmap(msection);
@@ -2969,5 +3062,4 @@
 
   return true;
 }
-
 } // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/jsep/JsepSessionImpl.h firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/jsep/JsepSessionImpl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/jsep/JsepSessionImpl.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/jsep/JsepSessionImpl.h	2015-05-25 20:43:22.000000000 +0000
@@ -120,6 +120,8 @@
 
   virtual nsresult EndOfLocalCandidates(const std::string& defaultCandidateAddr,
                                         uint16_t defaultCandidatePort,
+                                        const std::string& defaultRtcpCandidateAddr,
+                                        uint16_t defaultRtcpCandidatePort,
                                         uint16_t level) override;
 
   virtual nsresult Close() override;
@@ -162,7 +164,7 @@
   struct JsepSendingTrack {
     RefPtr<JsepTrack> mTrack;
     Maybe<size_t> mAssignedMLine;
-    bool mSetInLocalDescription;
+    bool mNegotiated;
   };
 
   struct JsepReceivingTrack {
@@ -175,7 +177,8 @@
   void AddCodecs(SdpMediaSection* msection) const;
   void AddExtmap(SdpMediaSection* msection) const;
   void AddMid(const std::string& mid, SdpMediaSection* msection) const;
-  void AddLocalSsrcs(const JsepTrack& track, SdpMediaSection* msection) const;
+  void SetSsrcs(const std::vector<uint32_t>& ssrcs,
+                SdpMediaSection* msection) const;
   void AddLocalIds(const JsepTrack& track, SdpMediaSection* msection) const;
   JsepCodecDescription* FindMatchingCodec(
       const std::string& pt,
@@ -188,6 +191,7 @@
   void AddCommonExtmaps(const SdpMediaSection& remoteMsection,
                         SdpMediaSection* msection);
   nsresult SetupIds();
+  nsresult CreateSsrc(uint32_t* ssrc);
   void SetupDefaultCodecs();
   void SetupDefaultRtpExtensions();
   void SetState(JsepSignalingState state);
@@ -200,7 +204,7 @@
   nsresult ValidateLocalDescription(const Sdp& description);
   nsresult ValidateRemoteDescription(const Sdp& description);
   nsresult ValidateAnswer(const Sdp& offer, const Sdp& answer);
-  nsresult SetRemoteTracksFromDescription(const Sdp& remoteDescription);
+  nsresult SetRemoteTracksFromDescription(const Sdp* remoteDescription);
   // Non-const because we use our Uuid generator
   nsresult CreateReceivingTrack(size_t mline,
                                 const Sdp& sdp,
@@ -236,7 +240,7 @@
                          const Sdp& oldAnswer,
                          Sdp* newSdp);
   void SetupBundle(Sdp* sdp) const;
-  nsresult SetupTransportAttributes(Sdp* sdp);
+  nsresult FinalizeTransportAttributes(Sdp* sdp);
   void SetupMsidSemantic(const std::vector<std::string>& msids, Sdp* sdp) const;
   nsresult GetIdsFromMsid(const Sdp& sdp,
                           const SdpMediaSection& msection,
@@ -260,8 +264,8 @@
   nsresult CreateAnswerMSection(const JsepAnswerOptions& options,
                                 size_t mlineIndex,
                                 const SdpMediaSection& remoteMsection,
-                                SdpMediaSection* msection,
                                 Sdp* sdp);
+  nsresult SetRecvonlySsrc(SdpMediaSection* msection);
   nsresult BindMatchingLocalTrackForAnswer(SdpMediaSection* msection);
   nsresult DetermineAnswererSetupRole(const SdpMediaSection& remoteMsection,
                                       SdpSetupAttribute::Role* rolep);
@@ -276,12 +280,12 @@
                           JsepTrack::Direction,
                           RefPtr<JsepTrack>* track);
 
-  nsresult CreateTransport(const SdpMediaSection& msection,
-                           RefPtr<JsepTransport>* transport);
+  void UpdateTransport(const SdpMediaSection& msection,
+                       JsepTransport* transport);
 
-  nsresult SetupTransport(const SdpAttributeList& remote,
-                          const SdpAttributeList& answer,
-                          const RefPtr<JsepTransport>& transport);
+  nsresult FinalizeTransport(const SdpAttributeList& remote,
+                             const SdpAttributeList& answer,
+                             const RefPtr<JsepTransport>& transport);
 
   nsresult AddCandidateToSdp(Sdp* sdp,
                              const std::string& candidate,
@@ -306,7 +310,7 @@
   bool IsBundleSlave(const Sdp& localSdp, uint16_t level);
 
   void DisableMsection(Sdp* sdp, SdpMediaSection* msection) const;
-  nsresult EnableMsection(SdpMediaSection* msection);
+  nsresult EnableOfferMsection(SdpMediaSection* msection);
 
   nsresult SetUniquePayloadTypes();
   nsresult GetAllPayloadTypes(const JsepTrackNegotiatedDetails& trackDetails,
@@ -321,6 +325,8 @@
   std::vector<JsepReceivingTrack> mRemoteTracksAdded;
   std::vector<JsepReceivingTrack> mRemoteTracksRemoved;
   std::vector<RefPtr<JsepTransport> > mTransports;
+  // So we can rollback
+  std::vector<RefPtr<JsepTransport> > mOldTransports;
   std::vector<JsepTrackPair> mNegotiatedTrackPairs;
 
   bool mIsOfferer;
@@ -341,6 +347,9 @@
   // Used to prevent duplicate local SSRCs. Not used to prevent local/remote or
   // remote-only duplication, which will be important for EKT but not now.
   std::set<uint32_t> mSsrcs;
+  // When an m-section doesn't have a local track, it still needs an ssrc, which
+  // is stored here.
+  std::vector<uint32_t> mRecvonlySsrcs;
   UniquePtr<Sdp> mGeneratedLocalDescription; // Created but not set.
   UniquePtr<Sdp> mCurrentLocalDescription;
   UniquePtr<Sdp> mCurrentRemoteDescription;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/jsep/JsepTrack.h firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/jsep/JsepTrack.h
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/jsep/JsepTrack.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/jsep/JsepTrack.h	2015-05-25 20:43:22.000000000 +0000
@@ -162,6 +162,7 @@
   size_t mLevel;
   // Is this track pair sharing a transport with another?
   Maybe<size_t> mBundleLevel;
+  uint32_t mRecvonlySsrc;
   RefPtr<JsepTrack> mSending;
   RefPtr<JsepTrack> mReceiving;
   RefPtr<JsepTransport> mRtpTransport;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/jsep/JsepTransport.h firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/jsep/JsepTransport.h
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/jsep/JsepTransport.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/jsep/JsepTransport.h	2015-05-25 20:43:22.000000000 +0000
@@ -82,23 +82,22 @@
 class JsepTransport
 {
 public:
-  JsepTransport(const std::string& id, size_t components)
-      : mTransportId(id), mState(kJsepTransportOffered), mComponents(components)
+  JsepTransport()
+      : mComponents(0)
   {
   }
 
-  enum State {
-    kJsepTransportOffered,
-    kJsepTransportAccepted,
-    kJsepTransportClosed
-  };
+  void Close()
+  {
+    mComponents = 0;
+    mTransportId.clear();
+    mIce.reset();
+    mDtls.reset();
+  }
 
   // Unique identifier for this transport within this call. Group?
   std::string mTransportId;
 
-  // State.
-  State mState;
-
   // ICE stuff.
   UniquePtr<JsepIceTransport> mIce;
   UniquePtr<JsepDtlsTransport> mDtls;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -112,7 +112,31 @@
 
 bool WebrtcAudioConduit::SetLocalSSRC(unsigned int ssrc)
 {
-  return !mPtrRTP->SetLocalSSRC(mChannel, ssrc);
+  unsigned int oldSsrc;
+  if (!GetLocalSSRC(&oldSsrc)) {
+    MOZ_ASSERT(false, "GetLocalSSRC failed");
+    return false;
+  }
+
+  if (oldSsrc == ssrc) {
+    return true;
+  }
+
+  bool wasTransmitting = mEngineTransmitting;
+  if (StopTransmitting() != kMediaConduitNoError) {
+    return false;
+  }
+
+  if (mPtrRTP->SetLocalSSRC(mChannel, ssrc)) {
+    return false;
+  }
+
+  if (wasTransmitting) {
+    if (StartTransmitting() != kMediaConduitNoError) {
+      return false;
+    }
+  }
+  return true;
 }
 
 bool WebrtcAudioConduit::GetLocalSSRC(unsigned int* ssrc) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -163,7 +163,31 @@
 
 bool WebrtcVideoConduit::SetLocalSSRC(unsigned int ssrc)
 {
-  return !mPtrRTP->SetLocalSSRC(mChannel, ssrc);
+  unsigned int oldSsrc;
+  if (!GetLocalSSRC(&oldSsrc)) {
+    MOZ_ASSERT(false, "GetLocalSSRC failed");
+    return false;
+  }
+
+  if (oldSsrc == ssrc) {
+    return true;
+  }
+
+  bool wasTransmitting = mEngineTransmitting;
+  if (StopTransmitting() != kMediaConduitNoError) {
+    return false;
+  }
+
+  if (mPtrRTP->SetLocalSSRC(mChannel, ssrc)) {
+    return false;
+  }
+
+  if (wasTransmitting) {
+    if (StartTransmitting() != kMediaConduitNoError) {
+      return false;
+    }
+  }
+  return true;
 }
 
 bool WebrtcVideoConduit::GetLocalSSRC(unsigned int* ssrc)
@@ -278,7 +302,7 @@
 {
   CSFLogDebug(logTag,  "%s this=%p", __FUNCTION__, this);
 
-#if defined(MOZILLA_INTERNAL_API) && !defined(MOZILLA_INTERNAL_API)
+#if defined(MOZILLA_INTERNAL_API) && !defined(MOZILLA_XPCOMRT_API)
   // already know we must be on MainThread barring unit test weirdness
   MOZ_ASSERT(NS_IsMainThread());
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/media-conduit/VideoTypes.h firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/media-conduit/VideoTypes.h
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/media-conduit/VideoTypes.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/media-conduit/VideoTypes.h	2015-05-25 20:43:22.000000000 +0000
@@ -1,18 +1,33 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-// These constants are picked from WebRTC Implementation. Copyright from the same is
-// given below
-
 /*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *  Copyright (c) 2012, The WebRTC project authors. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in
+ *      the documentation and/or other materials provided with the
+ *      distribution.
+ *
+ *    * Neither the name of Google nor the names of its contributors may
+ *      be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
  *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
+ *  THIS 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.
  */
 
 #ifndef VIDEO_TYPE_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.cpp firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -31,7 +31,6 @@
 #undef LOG
 #endif
 
-#ifdef PR_LOGGING
 #ifdef MOZILLA_INTERNAL_API
 extern PRLogModuleInfo* GetGMPLog();
 #else
@@ -45,12 +44,8 @@
   return sLog;
 }
 #endif
-#define LOGD(msg) PR_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
-#define LOG(level, msg) PR_LOG(GetGMPLog(), (level), msg)
-#else
-#define LOGD(msg)
-#define LOG(level, msg)
-#endif
+#define LOGD(msg) MOZ_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
+#define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)
 
 // Encoder.
 WebrtcGmpVideoEncoder::WebrtcGmpVideoEncoder()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.h firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.h
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.h	2015-05-25 20:43:22.000000000 +0000
@@ -1,19 +1,35 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-// Class templates copied from WebRTC:
 /*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *  Copyright (c) 2012, The WebRTC project authors. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
  *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in
+ *      the documentation and/or other materials provided with the
+ *      distribution.
+ *
+ *    * Neither the name of Google nor the names of its contributors may
+ *      be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  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.
  */
 
-
 #ifndef WEBRTCGMPVIDEOCODEC_H_
 #define WEBRTCGMPVIDEOCODEC_H_
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/media-conduit/WebrtcMediaCodecVP8VideoCodec.cpp firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/media-conduit/WebrtcMediaCodecVP8VideoCodec.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/media-conduit/WebrtcMediaCodecVP8VideoCodec.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/media-conduit/WebrtcMediaCodecVP8VideoCodec.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -195,7 +195,7 @@
                                      &format);
 
       if (NS_FAILED(res)) {
-        CSFLogDebug(logTag, "WebrtcAndroidMediaCodec::%s, CreateVideoFormat failed err = %d", __FUNCTION__, res);
+        CSFLogDebug(logTag, "WebrtcAndroidMediaCodec::%s, CreateVideoFormat failed err = %d", __FUNCTION__, (int)res);
         return NS_ERROR_FAILURE;
       }
 
@@ -203,7 +203,7 @@
         mCoder = CreateEncoder(mime);
 
         if (NS_FAILED(res)) {
-          CSFLogDebug(logTag, "WebrtcAndroidMediaCodec::%s, CreateEncoderByType failed err = %d", __FUNCTION__, res);
+          CSFLogDebug(logTag, "WebrtcAndroidMediaCodec::%s, CreateEncoderByType failed err = %d", __FUNCTION__, (int)res);
           return NS_ERROR_FAILURE;
         }
 
@@ -216,13 +216,13 @@
       } else {
         mCoder = CreateDecoder(mime);
         if (NS_FAILED(res)) {
-          CSFLogDebug(logTag, "WebrtcAndroidMediaCodec::%s, CreateDecoderByType failed err = %d", __FUNCTION__, res);
+          CSFLogDebug(logTag, "WebrtcAndroidMediaCodec::%s, CreateDecoderByType failed err = %d", __FUNCTION__, (int)res);
           return NS_ERROR_FAILURE;
         }
       }
       res = mCoder->Configure(format, nullptr, nullptr, flags);
       if (NS_FAILED(res)) {
-        CSFLogDebug(logTag, "WebrtcAndroidMediaCodec::%s, err = %d", __FUNCTION__, res);
+        CSFLogDebug(logTag, "WebrtcAndroidMediaCodec::%s, err = %d", __FUNCTION__, (int)res);
       }
     }
 
@@ -242,7 +242,7 @@
     res = mCoder->Start();
     if (NS_FAILED(res)) {
       CSFLogDebug(logTag, "WebrtcAndroidMediaCodec::%s, mCoder->start() return err = %d",
-                  __FUNCTION__, res);
+                  __FUNCTION__, (int)res);
       return res;
     }
     isStarted = true;
@@ -361,7 +361,7 @@
     res = BufferInfo::New(&bufferInfo);
     if (NS_FAILED(res)) {
       CSFLogDebug(logTag, "WebrtcAndroidMediaCodec::%s, BufferInfo::New return err = %d",
-                  __FUNCTION__, res);
+                  __FUNCTION__, (int)res);
       return res;
     }
     int32_t outputIndex = DequeueOutputBuffer(bufferInfo);
@@ -421,7 +421,7 @@
 
     if (NS_FAILED(res)) {
       CSFLogDebug(logTag, "WebrtcAndroidMediaCodec::%s, mCoder->DequeueInputBuffer() return err = %d",
-                  __FUNCTION__, res);
+                  __FUNCTION__, (int)res);
       return -1;
     }
     return inputIndex;
@@ -433,7 +433,7 @@
 
     if (NS_FAILED(res)) {
       CSFLogDebug(logTag, "WebrtcAndroidMediaCodec::%s, mCoder->QueueInputBuffer() return err = %d",
-                  __FUNCTION__, res);
+                  __FUNCTION__, (int)res);
     }
   }
 
@@ -445,7 +445,7 @@
 
     if (NS_FAILED(res)) {
       CSFLogDebug(logTag, "WebrtcAndroidMediaCodec::%s, mCoder->DequeueOutputBuffer() return err = %d",
-                  __FUNCTION__, res);
+                  __FUNCTION__, (int)res);
       return -1;
     }
 
@@ -469,7 +469,7 @@
     mInputBuffers = (jobjectArray) env->NewGlobalRef(inputBuffers.Get());
     if (NS_FAILED(res)) {
       CSFLogDebug(logTag, "WebrtcAndroidMediaCodec::%s, GetInputBuffers return err = %d",
-                  __FUNCTION__, res);
+                  __FUNCTION__, (int)res);
       return nullptr;
     }
 
@@ -489,7 +489,7 @@
     mOutputBuffers = (jobjectArray) env->NewGlobalRef(outputBuffers.Get());
     if (NS_FAILED(res)) {
       CSFLogDebug(logTag, "WebrtcAndroidMediaCodec::%s, GetOutputBuffers return err = %d",
-                  __FUNCTION__, res);
+                  __FUNCTION__, (int)res);
       return nullptr;
     }
 
@@ -653,7 +653,7 @@
 
     if (res != NS_OK) {
       CSFLogDebug(logTag,  "%s, encoder configure return err = %d",
-                  __FUNCTION__, res);
+                  __FUNCTION__, (int)res);
       return WEBRTC_VIDEO_CODEC_ERROR;
     }
 
@@ -661,7 +661,7 @@
 
     if (NS_FAILED(res)) {
       mMediaCodecEncoder->isStarted = false;
-      CSFLogDebug(logTag,  "%s start encoder. err = %d", __FUNCTION__, res);
+      CSFLogDebug(logTag,  "%s start encoder. err = %d", __FUNCTION__, (int)res);
       return WEBRTC_VIDEO_CODEC_ERROR;
     }
 
@@ -732,7 +732,7 @@
     res = BufferInfo::New(&bufferInfo);
     if (NS_FAILED(res)) {
       CSFLogDebug(logTag, "WebrtcMediaCodecVP8VideoEncoder::%s, BufferInfo::New return err = %d",
-                  __FUNCTION__, res);
+                  __FUNCTION__, (int)res);
       return -1;
     }
 
@@ -928,7 +928,7 @@
 
     if (res != NS_OK) {
       CSFLogDebug(logTag,  "%s, decoder configure return err = %d",
-                  __FUNCTION__, res);
+                  __FUNCTION__, (int)res);
       return WEBRTC_VIDEO_CODEC_ERROR;
     }
 
@@ -936,7 +936,7 @@
 
     if (NS_FAILED(res)) {
       mMediaCodecDecoder->isStarted = false;
-      CSFLogDebug(logTag,  "%s start decoder. err = %d", __FUNCTION__, res);
+      CSFLogDebug(logTag,  "%s start decoder. err = %d", __FUNCTION__, (int)res);
       return WEBRTC_VIDEO_CODEC_ERROR;
     }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -365,6 +365,20 @@
     return NS_ERROR_FAILURE;
   }
 
+  RefPtr<MediaSessionConduit> conduit;
+  if (aTrack.GetMediaType() == SdpMediaSection::kAudio) {
+    rv = GetOrCreateAudioConduit(aTrackPair, aTrack, &conduit);
+    if (NS_FAILED(rv))
+      return rv;
+  } else if (aTrack.GetMediaType() == SdpMediaSection::kVideo) {
+    rv = GetOrCreateVideoConduit(aTrackPair, aTrack, &conduit);
+    if (NS_FAILED(rv))
+      return rv;
+  } else {
+    // We've created the TransportFlow, nothing else to do here.
+    return NS_OK;
+  }
+
   RefPtr<MediaPipeline> pipeline =
     stream->GetPipelineByTrackId_m(aTrack.GetTrackId());
 
@@ -391,20 +405,6 @@
                 << " type=" << aTrack.GetMediaType()
                 << " direction=" << aTrack.GetDirection());
 
-  RefPtr<MediaSessionConduit> conduit;
-  if (aTrack.GetMediaType() == SdpMediaSection::kAudio) {
-    rv = GetOrCreateAudioConduit(aTrackPair, aTrack, &conduit);
-    if (NS_FAILED(rv))
-      return rv;
-  } else if (aTrack.GetMediaType() == SdpMediaSection::kVideo) {
-    rv = GetOrCreateVideoConduit(aTrackPair, aTrack, &conduit);
-    if (NS_FAILED(rv))
-      return rv;
-  } else {
-    // We've created the TransportFlow, nothing else to do here.
-    return NS_OK;
-  }
-
   if (receiving) {
     rv = CreateMediaPipelineReceiving(aTrackPair, aTrack,
                                       level, rtpFlow, rtcpFlow, filter,
@@ -619,6 +619,15 @@
       MOZ_MTLOG(ML_ERROR, "ConfigureRecvMediaCodecs failed: " << error);
       return NS_ERROR_FAILURE;
     }
+
+    if (!aTrackPair.mSending) {
+      // No send track, but we still need to configure an SSRC for receiver
+      // reports.
+      if (!conduit->SetLocalSSRC(aTrackPair.mRecvonlySsrc)) {
+        MOZ_MTLOG(ML_ERROR, "SetLocalSSRC failed");
+        return NS_ERROR_FAILURE;
+      }
+    }
   } else {
     // For now we only expect to have one ssrc per local track.
     auto ssrcs = aTrack.GetSsrcs();
@@ -740,6 +749,15 @@
       MOZ_MTLOG(ML_ERROR, "ConfigureRecvMediaCodecs failed: " << error);
       return NS_ERROR_FAILURE;
     }
+
+    if (!aTrackPair.mSending) {
+      // No send track, but we still need to configure an SSRC for receiver
+      // reports.
+      if (!conduit->SetLocalSSRC(aTrackPair.mRecvonlySsrc)) {
+        MOZ_MTLOG(ML_ERROR, "SetLocalSSRC failed");
+        return NS_ERROR_FAILURE;
+      }
+    }
   } else {
     // For now we only expect to have one ssrc per local track.
     auto ssrcs = aTrack.GetSsrcs();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -966,6 +966,10 @@
             videoCodec.mMaxFr = maxFr;
 
           }
+
+          videoCodec.mUseTmmbr = false;
+          branch->GetBoolPref("media.navigator.video.use_tmmbr",
+            &videoCodec.mUseTmmbr);
         }
         break;
       case SdpMediaSection::kText:
@@ -1487,6 +1491,9 @@
     case IPeerConnection::kActionPRAnswer:
       sdpType = mozilla::kJsepSdpPranswer;
       break;
+    case IPeerConnection::kActionRollback:
+      sdpType = mozilla::kJsepSdpRollback;
+      break;
     default:
       MOZ_ASSERT(false);
       return NS_ERROR_FAILURE;
@@ -1515,7 +1522,7 @@
     pco->OnSetLocalDescriptionSuccess(rv);
   }
 
-  UpdateSignalingState();
+  UpdateSignalingState(sdpType == mozilla::kJsepSdpRollback);
   return NS_OK;
 }
 
@@ -1583,11 +1590,14 @@
     case IPeerConnection::kActionPRAnswer:
       sdpType = mozilla::kJsepSdpPranswer;
       break;
+    case IPeerConnection::kActionRollback:
+      sdpType = mozilla::kJsepSdpRollback;
+      break;
     default:
       MOZ_ASSERT(false);
       return NS_ERROR_FAILURE;
-
   }
+
   nsresult nrv = mJsepSession->SetRemoteDescription(sdpType,
                                                     mRemoteRequestedSDP);
   if (NS_FAILED(nrv)) {
@@ -1721,7 +1731,7 @@
 #endif
   }
 
-  UpdateSignalingState();
+  UpdateSignalingState(sdpType == mozilla::kJsepSdpRollback);
   return NS_OK;
 }
 
@@ -2405,7 +2415,8 @@
 #endif
 
 void
-PeerConnectionImpl::SetSignalingState_m(PCImplSignalingState aSignalingState)
+PeerConnectionImpl::SetSignalingState_m(PCImplSignalingState aSignalingState,
+                                        bool rollback)
 {
   PC_AUTO_ENTER_API_CALL_NO_CHECK();
   if (mSignalingState == aSignalingState ||
@@ -2413,33 +2424,35 @@
     return;
   }
 
-  bool restartGathering =
-    aSignalingState == PCImplSignalingState::SignalingHaveLocalOffer ||
-    (aSignalingState == PCImplSignalingState::SignalingStable &&
-     mSignalingState == PCImplSignalingState::SignalingHaveRemoteOffer);
+  if (aSignalingState == PCImplSignalingState::SignalingHaveLocalOffer ||
+      (aSignalingState == PCImplSignalingState::SignalingStable &&
+       mSignalingState == PCImplSignalingState::SignalingHaveRemoteOffer &&
+       !rollback)) {
+    mMedia->EnsureTransports(*mJsepSession);
+  }
 
   mSignalingState = aSignalingState;
 
-  if (mSignalingState == PCImplSignalingState::SignalingHaveLocalOffer ||
-      mSignalingState == PCImplSignalingState::SignalingStable) {
-    mMedia->UpdateTransports(*mJsepSession, restartGathering);
-  }
-
   bool fireNegotiationNeeded = false;
 
   if (mSignalingState == PCImplSignalingState::SignalingStable) {
-    mMedia->UpdateMediaPipelines(*mJsepSession);
-    InitializeDataChannel();
-    mMedia->StartIceChecks(*mJsepSession);
-    mShouldSuppressNegotiationNeeded = false;
-    if (!mJsepSession->AllLocalTracksAreAssigned()) {
-      CSFLogInfo(logTag, "Not all local tracks were assigned to an "
-                         "m-section, either because the offerer did not offer"
-                         " to receive enough tracks, or because tracks were "
-                         "added after CreateOffer/Answer, but before "
-                         "offer/answer completed. This requires "
-                         "renegotiation.");
-      fireNegotiationNeeded = true;
+    // If we're rolling back a local offer, we might need to remove some
+    // transports, but nothing further needs to be done.
+    mMedia->ActivateOrRemoveTransports(*mJsepSession);
+    if (!rollback) {
+      mMedia->UpdateMediaPipelines(*mJsepSession);
+      InitializeDataChannel();
+      mMedia->StartIceChecks(*mJsepSession);
+      mShouldSuppressNegotiationNeeded = false;
+      if (!mJsepSession->AllLocalTracksAreAssigned()) {
+        CSFLogInfo(logTag, "Not all local tracks were assigned to an "
+                           "m-section, either because the offerer did not offer"
+                           " to receive enough tracks, or because tracks were "
+                           "added after CreateOffer/Answer, but before "
+                           "offer/answer completed. This requires "
+                           "renegotiation.");
+        fireNegotiationNeeded = true;
+      }
     }
   } else {
     mShouldSuppressNegotiationNeeded = true;
@@ -2462,7 +2475,7 @@
 }
 
 void
-PeerConnectionImpl::UpdateSignalingState() {
+PeerConnectionImpl::UpdateSignalingState(bool rollback) {
   mozilla::JsepSignalingState state =
       mJsepSession->GetState();
 
@@ -2491,7 +2504,7 @@
       MOZ_CRASH();
   }
 
-  SetSignalingState_m(newState);
+  SetSignalingState_m(newState, rollback);
 }
 
 bool
@@ -2788,9 +2801,15 @@
 void
 PeerConnectionImpl::EndOfLocalCandidates(const std::string& defaultAddr,
                                          uint16_t defaultPort,
+                                         const std::string& defaultRtcpAddr,
+                                         uint16_t defaultRtcpPort,
                                          uint16_t level) {
   CSFLogDebug(logTag, "%s", __FUNCTION__);
-  mJsepSession->EndOfLocalCandidates(defaultAddr, defaultPort, level);
+  mJsepSession->EndOfLocalCandidates(defaultAddr,
+                                     defaultPort,
+                                     defaultRtcpAddr,
+                                     defaultRtcpPort,
+                                     level);
 }
 
 #if !defined(MOZILLA_EXTERNAL_LINKAGE)
@@ -3277,6 +3296,10 @@
 //Telemetry for when calls start
 void
 PeerConnectionImpl::startCallTelem() {
+  if (!mStartTime.IsNull()) {
+    return;
+  }
+
   // Start time for calls
   mStartTime = TimeStamp::Now();
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h	2015-05-25 20:43:22.000000000 +0000
@@ -298,9 +298,10 @@
                                 NrIceCtx::ConnectionState state);
   void IceGatheringStateChange(NrIceCtx* ctx,
                                NrIceCtx::GatheringState state);
-  // TODO(bug 1096795): Need a |component| id here for rtcp.
   void EndOfLocalCandidates(const std::string& defaultAddr,
                             uint16_t defaultPort,
+                            const std::string& defaultRtcpAddr,
+                            uint16_t defaultRtcpPort,
                             uint16_t level);
   void IceStreamReady(NrIceMediaStream *aStream);
 
@@ -571,10 +572,11 @@
   const std::vector<std::string> &GetSdpParseErrors();
 
   // Sets the RTC Signaling State
-  void SetSignalingState_m(mozilla::dom::PCImplSignalingState aSignalingState);
+  void SetSignalingState_m(mozilla::dom::PCImplSignalingState aSignalingState,
+                           bool rollback = false);
 
   // Updates the RTC signaling state based on the JsepSession state
-  void UpdateSignalingState();
+  void UpdateSignalingState(bool rollback = false);
 
   bool IsClosed() const;
   // called when DTLS connects; we only need this once
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -162,44 +162,54 @@
                  nsIChannel *aChannel,
                  nsIProxyInfo *proxyinfo,
                  nsresult result) {
+
+  if (result == NS_ERROR_ABORT) {
+    // NS_ERROR_ABORT means that the PeerConnectionMedia is no longer waiting
+    return NS_OK;
+  }
+
   CSFLogInfo(logTag, "%s: Proxy Available: %d", __FUNCTION__, (int)result);
 
   if (NS_SUCCEEDED(result) && proxyinfo) {
-    CSFLogInfo(logTag, "%s: Had proxyinfo", __FUNCTION__);
-    nsresult rv;
-    nsCString httpsProxyHost;
-    int32_t httpsProxyPort;
+    SetProxyOnPcm(*proxyinfo);
+  }
 
-    rv = proxyinfo->GetHost(httpsProxyHost);
-    if (NS_FAILED(rv)) {
-      CSFLogError(logTag, "%s: Failed to get proxy server host", __FUNCTION__);
-      return rv;
-    }
+  pcm_->mProxyResolveCompleted = true;
+  pcm_->FlushIceCtxOperationQueueIfReady();
 
-    rv = proxyinfo->GetPort(&httpsProxyPort);
-    if (NS_FAILED(rv)) {
-      CSFLogError(logTag, "%s: Failed to get proxy server port", __FUNCTION__);
-      return rv;
-    }
+  return NS_OK;
+}
 
-    if (pcm_->mIceCtx.get()) {
-      assert(httpsProxyPort >= 0 && httpsProxyPort < (1 << 16));
-      pcm_->mProxyServer.reset(
-        new NrIceProxyServer(httpsProxyHost.get(),
-                             static_cast<uint16_t>(httpsProxyPort)));
-    } else {
-      CSFLogError(logTag, "%s: Failed to set proxy server (ICE ctx unavailable)",
-          __FUNCTION__);
-    }
+void
+PeerConnectionMedia::ProtocolProxyQueryHandler::SetProxyOnPcm(
+    nsIProxyInfo& proxyinfo)
+{
+  CSFLogInfo(logTag, "%s: Had proxyinfo", __FUNCTION__);
+  nsresult rv;
+  nsCString httpsProxyHost;
+  int32_t httpsProxyPort;
+
+  rv = proxyinfo.GetHost(httpsProxyHost);
+  if (NS_FAILED(rv)) {
+    CSFLogError(logTag, "%s: Failed to get proxy server host", __FUNCTION__);
+    return;
   }
 
-  if (result != NS_ERROR_ABORT) {
-    // NS_ERROR_ABORT means that the PeerConnectionMedia is no longer waiting
-    pcm_->mProxyResolveCompleted = true;
-    pcm_->FlushIceCtxOperationQueueIfReady();
+  rv = proxyinfo.GetPort(&httpsProxyPort);
+  if (NS_FAILED(rv)) {
+    CSFLogError(logTag, "%s: Failed to get proxy server port", __FUNCTION__);
+    return;
   }
 
-  return NS_OK;
+  if (pcm_->mIceCtx.get()) {
+    assert(httpsProxyPort >= 0 && httpsProxyPort < (1 << 16));
+    pcm_->mProxyServer.reset(
+      new NrIceProxyServer(httpsProxyHost.get(),
+                           static_cast<uint16_t>(httpsProxyPort)));
+  } else {
+    CSFLogError(logTag, "%s: Failed to set proxy server (ICE ctx unavailable)",
+        __FUNCTION__);
+  }
 }
 
 NS_IMPL_ISUPPORTS(PeerConnectionMedia::ProtocolProxyQueryHandler, nsIProtocolProxyCallback)
@@ -338,10 +348,55 @@
 }
 
 void
-PeerConnectionMedia::UpdateTransports(const JsepSession& session,
-                                      bool restartGathering) {
+PeerConnectionMedia::EnsureTransports(const JsepSession& aSession)
+{
+  auto transports = aSession.GetTransports();
+  for (size_t i = 0; i < transports.size(); ++i) {
+    RefPtr<JsepTransport> transport = transports[i];
+    RUN_ON_THREAD(
+        GetSTSThread(),
+        WrapRunnable(RefPtr<PeerConnectionMedia>(this),
+                     &PeerConnectionMedia::EnsureTransport_s,
+                     i,
+                     transport->mComponents),
+        NS_DISPATCH_NORMAL);
+  }
 
-  auto transports = session.GetTransports();
+  GatherIfReady();
+}
+
+void
+PeerConnectionMedia::EnsureTransport_s(size_t aLevel, size_t aComponentCount)
+{
+  RefPtr<NrIceMediaStream> stream(mIceCtx->GetStream(aLevel));
+  if (!stream) {
+    CSFLogDebug(logTag, "%s: Creating ICE media stream=%u components=%u",
+                mParentHandle.c_str(),
+                static_cast<unsigned>(aLevel),
+                static_cast<unsigned>(aComponentCount));
+
+    std::ostringstream os;
+    os << mParentName << " aLevel=" << aLevel;
+    RefPtr<NrIceMediaStream> stream = mIceCtx->CreateStream(os.str().c_str(),
+                                                            aComponentCount);
+
+    if (!stream) {
+      CSFLogError(logTag, "Failed to create ICE stream.");
+      return;
+    }
+
+    stream->SetLevel(aLevel);
+    stream->SignalReady.connect(this, &PeerConnectionMedia::IceStreamReady_s);
+    stream->SignalCandidate.connect(this,
+                                    &PeerConnectionMedia::OnCandidateFound_s);
+    mIceCtx->SetStream(aLevel, stream);
+  }
+}
+
+void
+PeerConnectionMedia::ActivateOrRemoveTransports(const JsepSession& aSession)
+{
+  auto transports = aSession.GetTransports();
   for (size_t i = 0; i < transports.size(); ++i) {
     RefPtr<JsepTransport> transport = transports[i];
 
@@ -349,31 +404,93 @@
     std::string pwd;
     std::vector<std::string> candidates;
 
-    bool hasAttrs = false;
-    if (transport->mIce) {
-      CSFLogDebug(logTag, "Transport %u is active",
-                          static_cast<unsigned>(i));
-      hasAttrs = true;
+    if (transport->mComponents) {
+      MOZ_ASSERT(transport->mIce);
+      CSFLogDebug(logTag, "Transport %u is active", static_cast<unsigned>(i));
       ufrag = transport->mIce->GetUfrag();
       pwd = transport->mIce->GetPassword();
       candidates = transport->mIce->GetCandidates();
+    } else {
+      CSFLogDebug(logTag, "Transport %u is disabled", static_cast<unsigned>(i));
+      // Make sure the MediaPipelineFactory doesn't try to use these.
+      RemoveTransportFlow(i, false);
+      RemoveTransportFlow(i, true);
     }
 
-    // Update the transport.
-    RUN_ON_THREAD(GetSTSThread(),
-                  WrapRunnable(RefPtr<PeerConnectionMedia>(this),
-                               &PeerConnectionMedia::UpdateIceMediaStream_s,
-                               i,
-                               transport->mComponents,
-                               hasAttrs,
-                               ufrag,
-                               pwd,
-                               candidates),
-                  NS_DISPATCH_NORMAL);
+    RUN_ON_THREAD(
+        GetSTSThread(),
+        WrapRunnable(RefPtr<PeerConnectionMedia>(this),
+                     &PeerConnectionMedia::ActivateOrRemoveTransport_s,
+                     i,
+                     transport->mComponents,
+                     ufrag,
+                     pwd,
+                     candidates),
+        NS_DISPATCH_NORMAL);
+  }
+
+  // We can have more streams than m-lines due to rollback.
+  RUN_ON_THREAD(
+      GetSTSThread(),
+      WrapRunnable(RefPtr<PeerConnectionMedia>(this),
+                   &PeerConnectionMedia::RemoveTransportsAtOrAfter_s,
+                   transports.size()),
+      NS_DISPATCH_NORMAL);
+}
+
+void
+PeerConnectionMedia::ActivateOrRemoveTransport_s(
+    size_t aMLine,
+    size_t aComponentCount,
+    const std::string& aUfrag,
+    const std::string& aPassword,
+    const std::vector<std::string>& aCandidateList) {
+
+  if (!aComponentCount) {
+    CSFLogDebug(logTag, "%s: Removing ICE media stream=%u",
+                mParentHandle.c_str(),
+                static_cast<unsigned>(aMLine));
+    mIceCtx->SetStream(aMLine, nullptr);
+    return;
   }
 
-  if (restartGathering) {
-    GatherIfReady();
+  RefPtr<NrIceMediaStream> stream(mIceCtx->GetStream(aMLine));
+  if (!stream) {
+    MOZ_ASSERT(false);
+    return;
+  }
+
+  if (!stream->HasParsedAttributes()) {
+    CSFLogDebug(logTag, "%s: Activating ICE media stream=%u components=%u",
+                mParentHandle.c_str(),
+                static_cast<unsigned>(aMLine),
+                static_cast<unsigned>(aComponentCount));
+
+    std::vector<std::string> attrs;
+    for (auto i = aCandidateList.begin(); i != aCandidateList.end(); ++i) {
+      attrs.push_back("candidate:" + *i);
+    }
+    attrs.push_back("ice-ufrag:" + aUfrag);
+    attrs.push_back("ice-pwd:" + aPassword);
+
+    nsresult rv = stream->ParseAttributes(attrs);
+    if (NS_FAILED(rv)) {
+      CSFLogError(logTag, "Couldn't parse ICE attributes, rv=%u",
+                          static_cast<unsigned>(rv));
+    }
+
+    for (size_t c = aComponentCount; c < stream->components(); ++c) {
+      // components are 1-indexed
+      stream->DisableComponent(c + 1);
+    }
+  }
+}
+
+void
+PeerConnectionMedia::RemoveTransportsAtOrAfter_s(size_t aMLine)
+{
+  for (size_t i = aMLine; i < mIceCtx->GetStreamCount(); ++i) {
+    mIceCtx->SetStream(i, nullptr);
   }
 }
 
@@ -409,36 +526,16 @@
 }
 
 void
-PeerConnectionMedia::StartIceChecks(const JsepSession& session) {
-
-  std::vector<size_t> numComponentsByLevel;
-  auto transports = session.GetTransports();
-  for (size_t i = 0; i < transports.size(); ++i) {
-    RefPtr<JsepTransport> transport = transports[i];
-    if (transport->mState == JsepTransport::kJsepTransportClosed) {
-      CSFLogDebug(logTag, "Transport %s is disabled",
-                          transport->mTransportId.c_str());
-      numComponentsByLevel.push_back(0);
-      // Make sure the MediaPipelineFactory doesn't try to use these.
-      RemoveTransportFlow(i, false);
-      RemoveTransportFlow(i, true);
-    } else {
-      CSFLogDebug(logTag, "Transport %s has %u components",
-                          transport->mTransportId.c_str(),
-                          static_cast<unsigned>(transport->mComponents));
-      numComponentsByLevel.push_back(transport->mComponents);
-    }
-  }
-
+PeerConnectionMedia::StartIceChecks(const JsepSession& aSession)
+{
   nsCOMPtr<nsIRunnable> runnable(
       WrapRunnable(
         RefPtr<PeerConnectionMedia>(this),
         &PeerConnectionMedia::StartIceChecks_s,
-        session.IsIceControlling(),
-        session.RemoteIsIceLite(),
+        aSession.IsIceControlling(),
+        aSession.RemoteIsIceLite(),
         // Copy, just in case API changes to return a ref
-        std::vector<std::string>(session.GetIceOptions()),
-        numComponentsByLevel));
+        std::vector<std::string>(aSession.GetIceOptions())));
 
   PerformOrEnqueueIceCtxOperation(runnable);
 }
@@ -447,8 +544,7 @@
 PeerConnectionMedia::StartIceChecks_s(
     bool aIsControlling,
     bool aIsIceLite,
-    const std::vector<std::string>& aIceOptionsList,
-    const std::vector<size_t>& aComponentCountByLevel) {
+    const std::vector<std::string>& aIceOptionsList) {
 
   CSFLogDebug(logTag, "Starting ICE Checking");
 
@@ -473,24 +569,6 @@
                           NrIceCtx::ICE_CONTROLLING :
                           NrIceCtx::ICE_CONTROLLED);
 
-  for (size_t i = 0; i < aComponentCountByLevel.size(); ++i) {
-    RefPtr<NrIceMediaStream> stream(mIceCtx->GetStream(i));
-    if (!stream) {
-      continue;
-    }
-
-    if (!aComponentCountByLevel[i]) {
-      // Inactive stream. Remove.
-      mIceCtx->SetStream(i, nullptr);
-      continue;
-    }
-
-    for (size_t c = aComponentCountByLevel[i]; c < stream->components(); ++c) {
-      // components are 1-indexed
-      stream->DisableComponent(c + 1);
-    }
-  }
-
   mIceCtx->StartChecks();
 }
 
@@ -569,56 +647,19 @@
   if (mProxyServer) {
     mIceCtx->SetProxyServer(*mProxyServer);
   }
-  mIceCtx->StartGathering();
-}
 
-void
-PeerConnectionMedia::UpdateIceMediaStream_s(size_t aMLine,
-                                            size_t aComponentCount,
-                                            bool aHasAttrs,
-                                            const std::string& aUfrag,
-                                            const std::string& aPassword,
-                                            const std::vector<std::string>&
-                                            aCandidateList) {
-  RefPtr<NrIceMediaStream> stream(mIceCtx->GetStream(aMLine));
-  if (!stream) {
-    CSFLogDebug(logTag, "%s: Creating ICE media stream=%u components=%u",
-                mParentHandle.c_str(),
-                static_cast<unsigned>(aMLine),
-                static_cast<unsigned>(aComponentCount));
-
-    std::ostringstream os;
-    os << mParentName << " level=" << aMLine;
-    stream = mIceCtx->CreateStream(os.str().c_str(),
-                                   aComponentCount);
-
-    if (!stream) {
-      CSFLogError(logTag, "Failed to create ICE stream.");
+  // Start gathering, but only if there are streams
+  for (size_t i = 0; i < mIceCtx->GetStreamCount(); ++i) {
+    if (mIceCtx->GetStream(i)) {
+      mIceCtx->StartGathering();
       return;
     }
-
-    stream->SetLevel(aMLine);
-    stream->SignalReady.connect(this, &PeerConnectionMedia::IceStreamReady_s);
-    stream->SignalCandidate.connect(this,
-                                    &PeerConnectionMedia::OnCandidateFound_s);
-
-    mIceCtx->SetStream(aMLine, stream);
   }
 
-  if (aHasAttrs && !stream->HasParsedAttributes()) {
-    std::vector<std::string> attrs;
-    for (auto i = aCandidateList.begin(); i != aCandidateList.end(); ++i) {
-      attrs.push_back("candidate:" + *i);
-    }
-    attrs.push_back("ice-ufrag:" + aUfrag);
-    attrs.push_back("ice-pwd:" + aPassword);
-
-    nsresult rv = stream->ParseAttributes(attrs);
-    if (NS_FAILED(rv)) {
-      CSFLogError(logTag, "Couldn't parse ICE attributes, rv=%u",
-                          static_cast<unsigned>(rv));
-    }
-  }
+  // If there are no streams, we're probably in a situation where we've rolled
+  // back while still waiting for our proxy configuration to come back. Make
+  // sure content knows that the rollback has stuck wrt gathering.
+  IceGatheringStateChange_s(mIceCtx.get(), NrIceCtx::ICE_CTX_GATHER_COMPLETE);
 }
 
 nsresult
@@ -849,10 +890,18 @@
       }
 
       NrIceCandidate candidate;
-      nsresult res = stream->GetDefaultCandidate(&candidate);
+      nsresult res = stream->GetDefaultCandidate(1, &candidate);
+      NrIceCandidate rtcpCandidate;
+      // Optional; component won't exist if doing rtcp-mux
+      if (NS_FAILED(stream->GetDefaultCandidate(2, &rtcpCandidate))) {
+        rtcpCandidate.cand_addr.host.clear();
+        rtcpCandidate.cand_addr.port = 0;
+      }
       if (NS_SUCCEEDED(res)) {
         EndOfLocalCandidates(candidate.cand_addr.host,
                              candidate.cand_addr.port,
+                             rtcpCandidate.cand_addr.host,
+                             rtcpCandidate.cand_addr.port,
                              i);
       } else {
         CSFLogError(logTag, "%s: GetDefaultCandidate failed for level %u, "
@@ -917,12 +966,15 @@
 void
 PeerConnectionMedia::EndOfLocalCandidates(const std::string& aDefaultAddr,
                                           uint16_t aDefaultPort,
+                                          const std::string& aDefaultRtcpAddr,
+                                          uint16_t aDefaultRtcpPort,
                                           uint16_t aMLine) {
   // We will still be around because we have not started teardown yet
   GetMainThread()->Dispatch(
     WrapRunnable(this,
                  &PeerConnectionMedia::EndOfLocalCandidates_m,
-                 aDefaultAddr, aDefaultPort, aMLine),
+                 aDefaultAddr, aDefaultPort,
+                 aDefaultRtcpAddr, aDefaultRtcpPort, aMLine),
     NS_DISPATCH_NORMAL);
 }
 
@@ -961,8 +1013,14 @@
 void
 PeerConnectionMedia::EndOfLocalCandidates_m(const std::string& aDefaultAddr,
                                             uint16_t aDefaultPort,
+                                            const std::string& aDefaultRtcpAddr,
+                                            uint16_t aDefaultRtcpPort,
                                             uint16_t aMLine) {
-  SignalEndOfLocalCandidates(aDefaultAddr, aDefaultPort, aMLine);
+  SignalEndOfLocalCandidates(aDefaultAddr,
+                             aDefaultPort,
+                             aDefaultRtcpAddr,
+                             aDefaultRtcpPort,
+                             aMLine);
 }
 
 void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h	2015-05-25 20:43:22.000000000 +0000
@@ -245,8 +245,12 @@
     return mIceCtx->GetStreamCount();
   }
 
-  // Create and modify transports in response to negotiation events.
-  void UpdateTransports(const JsepSession& session, bool restartGathering);
+  // Ensure ICE transports exist that we might need when offer/answer concludes
+  void EnsureTransports(const JsepSession& aSession);
+
+  // Activate or remove ICE transports at the conclusion of offer/answer,
+  // or when rollback occurs.
+  void ActivateOrRemoveTransports(const JsepSession& aSession);
 
   // Start ICE checks.
   void StartIceChecks(const JsepSession& session);
@@ -389,7 +393,8 @@
   // This passes a candidate:... attribute  and level
   sigslot::signal2<const std::string&, uint16_t> SignalCandidate;
   // This passes address, port, level of the default candidate.
-  sigslot::signal3<const std::string&, uint16_t, uint16_t>
+  sigslot::signal5<const std::string&, uint16_t,
+                   const std::string&, uint16_t, uint16_t>
       SignalEndOfLocalCandidates;
 
  private:
@@ -406,8 +411,9 @@
     NS_DECL_ISUPPORTS
 
    private:
-      RefPtr<PeerConnectionMedia> pcm_;
-      virtual ~ProtocolProxyQueryHandler() {}
+    void SetProxyOnPcm(nsIProxyInfo& proxyinfo);
+    RefPtr<PeerConnectionMedia> pcm_;
+    virtual ~ProtocolProxyQueryHandler() {}
   };
 #endif // !defined(MOZILLA_XPCOMRT_API)
 
@@ -419,19 +425,22 @@
   void SelfDestruct_m();
 
   // Manage ICE transports.
-  void UpdateIceMediaStream_s(size_t aMLine, size_t aComponentCount,
-                              bool aHasAttrs,
-                              const std::string& aUfrag,
-                              const std::string& aPassword,
-                              const std::vector<std::string>& aCandidateList);
+  void EnsureTransport_s(size_t aLevel, size_t aComponentCount);
+  void ActivateOrRemoveTransport_s(
+      size_t aMLine,
+      size_t aComponentCount,
+      const std::string& aUfrag,
+      const std::string& aPassword,
+      const std::vector<std::string>& aCandidateList);
+  void RemoveTransportsAtOrAfter_s(size_t aMLine);
+
   void GatherIfReady();
   void FlushIceCtxOperationQueueIfReady();
   void PerformOrEnqueueIceCtxOperation(nsIRunnable* runnable);
   void EnsureIceGathering_s();
   void StartIceChecks_s(bool aIsControlling,
                         bool aIsIceLite,
-                        const std::vector<std::string>& aIceOptionsList,
-                        const std::vector<size_t>& aComponentCountByLevel);
+                        const std::vector<std::string>& aIceOptionsList);
 
   // Process a trickle ICE candidate.
   void AddIceCandidate_s(const std::string& aCandidate, const std::string& aMid,
@@ -448,6 +457,8 @@
                         const std::string &candidate);
   void EndOfLocalCandidates(const std::string& aDefaultAddr,
                             uint16_t aDefaultPort,
+                            const std::string& aDefaultRtcpAddr,
+                            uint16_t aDefaultRtcpPort,
                             uint16_t aMLine);
 
   void IceGatheringStateChange_m(NrIceCtx* ctx,
@@ -457,6 +468,8 @@
   void OnCandidateFound_m(const std::string &candidate, uint16_t aMLine);
   void EndOfLocalCandidates_m(const std::string& aDefaultAddr,
                               uint16_t aDefaultPort,
+                              const std::string& aDefaultRtcpAddr,
+                              uint16_t aDefaultRtcpPort,
                               uint16_t aMLine);
   bool IsIceCtxReady() const {
     return mProxyResolveCompleted;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/sdp/SdpAttribute.cpp firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/sdp/SdpAttribute.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/sdp/SdpAttribute.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/sdp/SdpAttribute.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -195,7 +195,7 @@
 SdpRtcpAttribute::Serialize(std::ostream& os) const
 {
   os << "a=" << mType << ":" << mPort;
-  if (mNetType != sdp::kNetTypeNone && mAddrType != sdp::kAddrTypeNone) {
+  if (!mAddress.empty()) {
     os << " " << mNetType << " " << mAddrType << " " << mAddress;
   }
   os << CRLF;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/sdp/SdpAttribute.h firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/sdp/SdpAttribute.h
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/sdp/SdpAttribute.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/sdp/SdpAttribute.h	2015-05-25 20:43:22.000000000 +0000
@@ -700,16 +700,26 @@
 class SdpRtcpAttribute : public SdpAttribute
 {
 public:
-  explicit SdpRtcpAttribute(uint16_t port,
-                            sdp::NetType netType = sdp::kNetTypeNone,
-                            sdp::AddrType addrType = sdp::kAddrTypeNone,
-                            const std::string& address = "")
+  explicit SdpRtcpAttribute(uint16_t port)
+    : SdpAttribute(kRtcpAttribute),
+      mPort(port),
+      mNetType(sdp::kNetTypeNone),
+      mAddrType(sdp::kAddrTypeNone)
+  {}
+
+  SdpRtcpAttribute(uint16_t port,
+                   sdp::NetType netType,
+                   sdp::AddrType addrType,
+                   const std::string& address)
       : SdpAttribute(kRtcpAttribute),
         mPort(port),
         mNetType(netType),
         mAddrType(addrType),
         mAddress(address)
   {
+    MOZ_ASSERT(netType != sdp::kNetTypeNone);
+    MOZ_ASSERT(addrType != sdp::kAddrTypeNone);
+    MOZ_ASSERT(!address.empty());
   }
 
   virtual void Serialize(std::ostream& os) const override;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/sdp/sipcc/sdp_attr_access.c firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/sdp/sipcc/sdp_attr_access.c
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/sdp/sipcc/sdp_attr_access.c	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/sdp/sipcc/sdp_attr_access.c	2015-05-25 20:43:23.000000000 +0000
@@ -746,7 +746,6 @@
         (attr_type != SDP_ATTR_TC1_WINDOW_SIZE) &&
         (attr_type != SDP_ATTR_TC2_PAYLOAD_BYTES) &&
         (attr_type != SDP_ATTR_TC2_WINDOW_SIZE) &&
-        (attr_type != SDP_ATTR_RTCP) &&
         (attr_type != SDP_ATTR_FRAMERATE)) {
         return FALSE;
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/sdp/sipcc/sdp_attr.c firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/sdp/sipcc/sdp_attr.c
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/sdp/sipcc/sdp_attr.c	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/sdp/sipcc/sdp_attr.c	2015-05-25 20:43:23.000000000 +0000
@@ -49,6 +49,33 @@
     semicolon = TRUE; \
   }
 
+static int find_token_enum(const char *attr_name,
+                           sdp_t *sdp_p,
+                           const char **ptr,
+                           const sdp_namearray_t *types,
+                           int type_count,
+                           int unknown_value)
+{
+    sdp_result_e  result = SDP_SUCCESS;
+    char          tmp[SDP_MAX_STRING_LEN+1];
+    int           i;
+
+    *ptr = sdp_getnextstrtok(*ptr, tmp, sizeof(tmp), " \t", &result);
+    if (result != SDP_SUCCESS) {
+        sdp_parse_error(sdp_p,
+            "%s Warning: problem parsing %s", sdp_p->debug_str, attr_name);
+        sdp_p->conf_p->num_invalid_param++;
+        return -1;
+    }
+
+    for (i=0; i < type_count; i++) {
+        if (!cpr_strncasecmp(tmp, types[i].name, types[i].strlen)) {
+            return i;
+        }
+    }
+    return unknown_value;
+}
+
 /*
  * Helper function for adding nv-pair where value is string.
  */
@@ -3391,6 +3418,69 @@
     return (SDP_SUCCESS);
 }
 
+sdp_result_e sdp_parse_attr_rtcp (sdp_t *sdp_p, sdp_attr_t *attr_p,
+                                           const char *ptr)
+{
+  sdp_result_e result;
+  char nettype[SDP_MAX_STRING_LEN];
+  sdp_rtcp_t *rtcp_p = &(attr_p->attr.rtcp);
+  int enum_raw;
+
+  memset(rtcp_p, 0, sizeof(sdp_rtcp_t));
+
+  rtcp_p->port = (uint16_t)sdp_getnextnumtok(ptr, &ptr, " \t", &result);
+  if (result != SDP_SUCCESS) {
+    sdp_parse_error(sdp_p,
+                    "%s Warning: could not parse port for rtcp attribute",
+                    sdp_p->debug_str);
+    sdp_p->conf_p->num_invalid_param++;
+
+    return SDP_INVALID_PARAMETER;
+  }
+
+  /* The rest is optional, although it is all-or-nothing */
+  (void)sdp_getnextstrtok(ptr, nettype, sizeof(nettype), " \t", &result);
+  if (result == SDP_EMPTY_TOKEN) {
+    /* Nothing after the port */
+    return SDP_SUCCESS;
+  }
+
+  enum_raw = find_token_enum("Nettype", sdp_p, &ptr, sdp_nettype,
+                             SDP_MAX_NETWORK_TYPES, SDP_NT_UNSUPPORTED);
+  if (enum_raw == -1) {
+    return SDP_INVALID_PARAMETER;
+  }
+  rtcp_p->nettype = (sdp_nettype_e)enum_raw;
+
+  enum_raw = find_token_enum("Addrtype", sdp_p, &ptr, sdp_addrtype,
+                             SDP_MAX_ADDR_TYPES, SDP_AT_UNSUPPORTED);
+  if (enum_raw == -1) {
+    return SDP_INVALID_PARAMETER;
+  }
+  rtcp_p->addrtype = (sdp_addrtype_e)enum_raw;
+
+  ptr = sdp_getnextstrtok(ptr, rtcp_p->addr, sizeof(rtcp_p->addr), " \t",
+                          &result);
+  if (result != SDP_SUCCESS) {
+    sdp_parse_error(sdp_p,
+                    "%s Warning: could not parse addr for rtcp attribute",
+                    sdp_p->debug_str);
+    sdp_p->conf_p->num_invalid_param++;
+
+    return SDP_INVALID_PARAMETER;
+  }
+
+  return SDP_SUCCESS;
+}
+
+sdp_result_e sdp_build_attr_rtcp (sdp_t *sdp_p, sdp_attr_t *attr_p,
+                                           flex_string *fs)
+{
+  /* We should not be serializing SDP anyway, but we need this function until
+   * Bug 1112737 is resolved. */
+  return SDP_FAILURE;
+}
+
 sdp_result_e sdp_parse_attr_rtr (sdp_t *sdp_p, sdp_attr_t *attr_p,
                                            const char *ptr)
 {
@@ -3398,9 +3488,8 @@
     char tmp[SDP_MAX_STRING_LEN];
 
     if (sdp_p->debug_flag[SDP_DEBUG_TRACE]) {
-        SDP_PRINT("%s Parsing a=%s, %s", sdp_p->debug_str,
-                     sdp_get_attr_name(attr_p->type),
-                     tmp);
+        SDP_PRINT("%s Parsing a=%s", sdp_p->debug_str,
+                  sdp_get_attr_name(attr_p->type));
     }
     /*Default confirm to FALSE. */
     attr_p->attr.rtr.confirm = FALSE;
@@ -4878,33 +4967,6 @@
     return SDP_SUCCESS;
 }
 
-static int find_token_enum(const char *attr_name,
-                           sdp_t *sdp_p,
-                           const char **ptr,
-                           const sdp_namearray_t *types,
-                           int type_count,
-                           int unknown_value)
-{
-    sdp_result_e  result = SDP_SUCCESS;
-    char          tmp[SDP_MAX_STRING_LEN+1];
-    int           i;
-
-    *ptr = sdp_getnextstrtok(*ptr, tmp, sizeof(tmp), " \t", &result);
-    if (result != SDP_SUCCESS) {
-        sdp_parse_error(sdp_p,
-            "%s Warning: problem parsing %s", sdp_p->debug_str, attr_name);
-        sdp_p->conf_p->num_invalid_param++;
-        return -1;
-    }
-
-    for (i=0; i < type_count; i++) {
-        if (!cpr_strncasecmp(tmp, types[i].name, types[i].strlen)) {
-            return i;
-        }
-    }
-    return unknown_value;
-}
-
 sdp_result_e sdp_parse_attr_rtcp_fb (sdp_t *sdp_p,
                                      sdp_attr_t *attr_p,
                                      const char *ptr)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/sdp/sipcc/sdp.h firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/sdp/sipcc/sdp.h
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/sdp/sipcc/sdp.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/sdp/sipcc/sdp.h	2015-05-25 20:43:23.000000000 +0000
@@ -877,6 +877,13 @@
                                            fields. */
 } sdp_fmtp_fb_t;
 
+typedef struct sdp_rtcp {
+   sdp_nettype_e     nettype;
+   sdp_addrtype_e    addrtype;
+   char              addr[SDP_MAX_STRING_LEN+1];
+   uint16_t          port;
+} sdp_rtcp_t;
+
 /*
  * b=<bw-modifier>:<val>
  *
@@ -1015,6 +1022,7 @@
         char                  unknown[SDP_MAX_STRING_LEN+1];
         sdp_source_filter_t   source_filter;
         sdp_fmtp_fb_t         rtcp_fb;
+        sdp_rtcp_t            rtcp;
         sdp_setup_type_e      setup;
         sdp_connection_type_e connection;
         sdp_extmap_t          extmap;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/sdp/sipcc/sdp_main.c firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/sdp/sipcc/sdp_main.c
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/sdp/sipcc/sdp_main.c	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/sdp/sipcc/sdp_main.c	2015-05-25 20:43:23.000000000 +0000
@@ -119,7 +119,7 @@
     {"TC2WindowSize", sizeof("TC2WindowSize"),
      sdp_parse_attr_simple_u32, sdp_build_attr_simple_u32 },
     {"rtcp", sizeof("rtcp"),
-     sdp_parse_attr_simple_u32, sdp_build_attr_simple_u32 },
+     sdp_parse_attr_rtcp, sdp_build_attr_rtcp },
     {"rtr", sizeof("rtr"),
      sdp_parse_attr_rtr, sdp_build_attr_rtr},
     {"silenceSupp", sizeof("silenceSupp"),
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/sdp/sipcc/sdp_private.h firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/sdp/sipcc/sdp_private.h
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/sdp/sipcc/sdp_private.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/sdp/sipcc/sdp_private.h	2015-05-25 20:43:23.000000000 +0000
@@ -146,6 +146,10 @@
                                          const char *ptr);
 extern sdp_result_e sdp_build_attr_xcpar(sdp_t *sdp_p, sdp_attr_t *attr_p,
                                          flex_string *fs);
+extern sdp_result_e sdp_parse_attr_rtcp(sdp_t *sdp_p, sdp_attr_t *attr_p,
+                                        const char *ptr);
+extern sdp_result_e sdp_build_attr_rtcp(sdp_t *sdp_p, sdp_attr_t *attr_p,
+                                        flex_string *fs);
 extern sdp_result_e sdp_parse_attr_rtr(sdp_t *sdp_p, sdp_attr_t *attr_p,
                                      const char *ptr);
 extern sdp_result_e sdp_build_attr_rtr(sdp_t *sdp_p, sdp_attr_t *attr_p,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/sdp/SipccSdpAttributeList.cpp firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/sdp/SipccSdpAttributeList.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/sdp/SipccSdpAttributeList.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/sdp/SipccSdpAttributeList.cpp	2015-05-25 20:43:22.000000000 +0000
@@ -858,6 +858,38 @@
   }
 }
 
+void
+SipccSdpAttributeList::LoadRtcp(sdp_t* sdp, uint16_t level,
+                                SdpErrorHolder& errorHolder)
+{
+  sdp_attr_t* attr = sdp_find_attr(sdp, level, 0, SDP_ATTR_RTCP, 1);
+
+  if (!attr) {
+    return;
+  }
+
+  sdp_rtcp_t* rtcp = &attr->attr.rtcp;
+
+  if (rtcp->nettype != SDP_NT_INTERNET) {
+    return;
+  }
+
+  if (rtcp->addrtype != SDP_AT_IP4 && rtcp->addrtype != SDP_AT_IP6) {
+    return;
+  }
+
+  if (!strlen(rtcp->addr)) {
+    SetAttribute(new SdpRtcpAttribute(rtcp->port));
+  } else {
+    SetAttribute(
+        new SdpRtcpAttribute(
+          rtcp->port,
+          sdp::kInternet,
+          rtcp->addrtype == SDP_AT_IP4 ? sdp::kIPv4 : sdp::kIPv6,
+          rtcp->addr));
+  }
+}
+
 bool
 SipccSdpAttributeList::Load(sdp_t* sdp, uint16_t level,
                             SdpErrorHolder& errorHolder)
@@ -891,6 +923,7 @@
     LoadFmtp(sdp, level);
     LoadMsids(sdp, level, errorHolder);
     LoadRtcpFb(sdp, level, errorHolder);
+    LoadRtcp(sdp, level, errorHolder);
     LoadSsrc(sdp, level);
   }
 
@@ -1115,7 +1148,11 @@
 const SdpRtcpAttribute&
 SipccSdpAttributeList::GetRtcp() const
 {
-  MOZ_CRASH("Not yet implemented");
+  if (!HasAttribute(SdpAttribute::kRtcpAttribute)) {
+    MOZ_CRASH();
+  }
+  const SdpAttribute* attr = GetAttribute(SdpAttribute::kRtcpAttribute);
+  return *static_cast<const SdpRtcpAttribute*>(attr);
 }
 
 const SdpRtcpFbAttributeList&
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/sdp/SipccSdpAttributeList.h firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/sdp/SipccSdpAttributeList.h
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/src/sdp/SipccSdpAttributeList.h	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/src/sdp/SipccSdpAttributeList.h	2015-05-25 20:43:22.000000000 +0000
@@ -113,6 +113,7 @@
   void LoadMsids(sdp_t* sdp, uint16_t level, SdpErrorHolder& errorHolder);
   void LoadExtmap(sdp_t* sdp, uint16_t level, SdpErrorHolder& errorHolder);
   void LoadRtcpFb(sdp_t* sdp, uint16_t level, SdpErrorHolder& errorHolder);
+  void LoadRtcp(sdp_t* sdp, uint16_t level, SdpErrorHolder& errorHolder);
   static SdpRtpmapAttributeList::CodecType GetCodecType(rtp_ptype type);
 
   bool
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/test/common.build firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/test/common.build
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/test/common.build	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/test/common.build	2015-05-25 20:43:23.000000000 +0000
@@ -25,6 +25,7 @@
     '/media/mtransport/third_party/nrappkit/src/event',
     '/media/mtransport/third_party/nrappkit/src/log',
     '/media/mtransport/third_party/nrappkit/src/plugin',
+    '/media/mtransport/third_party/nrappkit/src/port/generic/include',
     '/media/mtransport/third_party/nrappkit/src/registry',
     '/media/mtransport/third_party/nrappkit/src/share',
     '/media/mtransport/third_party/nrappkit/src/stats',
@@ -74,7 +75,6 @@
 if CONFIG['OS_TARGET'] in ('DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD'):
     LOCAL_INCLUDES += [
         '/media/mtransport/third_party/nrappkit/src/port/darwin/include',
-        '/media/mtransport/third_party/nrappkit/src/port/generic/include',
     ]
 
 USE_LIBS += [
@@ -123,6 +123,7 @@
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
+    OS_LIBS += CONFIG['XLIBS']
     OS_LIBS += CONFIG['MOZ_GTK3_LIBS']
     USE_LIBS += [
         'freetype',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/test/jsep_session_unittest.cpp firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/test/jsep_session_unittest.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/test/jsep_session_unittest.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/test/jsep_session_unittest.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -36,11 +36,21 @@
   "0 1 UDP 9999 192.168.0.1 2001 typ host",
   "0 1 UDP 9999 192.168.0.2 2002 typ srflx raddr 10.252.34.97 rport 53594",
   // Mix up order
-  "0 1 UDP 9999 192.168.1.2 2012 typ srflx raddr 10.252.34.97 rport 53594",
+  "0 1 UDP 9999 192.168.1.2 2012 typ srflx raddr 10.252.34.97 rport 53595",
   "0 1 UDP 9999 192.168.1.1 2010 typ host",
   "0 1 UDP 9999 192.168.1.1 2011 typ host"
 };
 
+static const char* kRtcpCandidates[] = {
+  "0 2 UDP 9999 192.168.0.1 3000 typ host",
+  "0 2 UDP 9999 192.168.0.1 3001 typ host",
+  "0 2 UDP 9999 192.168.0.2 3002 typ srflx raddr 10.252.34.97 rport 53596",
+  // Mix up order
+  "0 2 UDP 9999 192.168.1.2 3012 typ srflx raddr 10.252.34.97 rport 53597",
+  "0 2 UDP 9999 192.168.1.1 3010 typ host",
+  "0 2 UDP 9999 192.168.1.1 3011 typ host"
+};
+
 static std::string kAEqualsCandidate("a=candidate:");
 
 class JsepSessionTestBase : public ::testing::Test
@@ -387,6 +397,18 @@
   }
 
   void
+  SetPayloadTypeNumber(JsepSession& session,
+                       const std::string& codecName,
+                       const std::string& payloadType)
+  {
+    for (auto* codec : session.Codecs()) {
+      if (codec->mName == codecName) {
+        codec->mDefaultPt = payloadType;
+      }
+    }
+  }
+
+  void
   EnsureNegotiationFailure(SdpMediaSection::MediaType type,
                            const std::string& codecName)
   {
@@ -573,21 +595,21 @@
   GatherCandidates(JsepSession& session)
   {
     bool skipped;
-    session.AddLocalIceCandidate(
-        kAEqualsCandidate + kCandidates[0], "", 0, &skipped);
-    session.AddLocalIceCandidate(
-        kAEqualsCandidate + kCandidates[1], "", 0, &skipped);
-    session.AddLocalIceCandidate(
-        kAEqualsCandidate + kCandidates[2], "", 0, &skipped);
-    session.EndOfLocalCandidates("192.168.0.2", 2002, 0);
-
-    session.AddLocalIceCandidate(
-        kAEqualsCandidate + kCandidates[3], "", 1, &skipped);
-    session.AddLocalIceCandidate(
-        kAEqualsCandidate + kCandidates[4], "", 1, &skipped);
-    session.AddLocalIceCandidate(
-        kAEqualsCandidate + kCandidates[5], "", 1, &skipped);
-    session.EndOfLocalCandidates("192.168.1.2", 2012, 1);
+    for (size_t i = 0; i < 3; ++i) {
+      session.AddLocalIceCandidate(
+          kAEqualsCandidate + kCandidates[i], "", 0, &skipped);
+      session.AddLocalIceCandidate(
+          kAEqualsCandidate + kRtcpCandidates[i], "", 0, &skipped);
+    }
+    session.EndOfLocalCandidates("192.168.0.2", 2002, "192.168.0.2", 3002, 0);
+
+    for (size_t i = 3; i < 6; ++i) {
+      session.AddLocalIceCandidate(
+          kAEqualsCandidate + kCandidates[i], "", 1, &skipped);
+      session.AddLocalIceCandidate(
+          kAEqualsCandidate + kRtcpCandidates[i], "", 1, &skipped);
+    }
+    session.EndOfLocalCandidates("192.168.1.2", 2012, "192.168.1.2", 3012, 1);
 
     std::cerr << "local SDP after candidates: "
               << session.GetLocalDescription();
@@ -596,13 +618,19 @@
   void
   TrickleCandidates(JsepSession& session)
   {
-    session.AddRemoteIceCandidate(kAEqualsCandidate + kCandidates[0], "", 0);
-    session.AddRemoteIceCandidate(kAEqualsCandidate + kCandidates[1], "", 0);
-    session.AddRemoteIceCandidate(kAEqualsCandidate + kCandidates[2], "", 0);
-
-    session.AddRemoteIceCandidate(kAEqualsCandidate + kCandidates[3], "", 1);
-    session.AddRemoteIceCandidate(kAEqualsCandidate + kCandidates[4], "", 1);
-    session.AddRemoteIceCandidate(kAEqualsCandidate + kCandidates[5], "", 1);
+    for (size_t i = 0; i < 3; ++i) {
+      session.AddRemoteIceCandidate(
+          kAEqualsCandidate + kCandidates[i], "", 0);
+      session.AddRemoteIceCandidate(
+          kAEqualsCandidate + kRtcpCandidates[i], "", 0);
+    }
+
+    for (size_t i = 3; i < 6; ++i) {
+      session.AddRemoteIceCandidate(
+          kAEqualsCandidate + kCandidates[i], "", 1);
+      session.AddRemoteIceCandidate(
+          kAEqualsCandidate + kRtcpCandidates[i], "", 1);
+    }
 
     std::cerr << "remote SDP after candidates: "
               << session.GetRemoteDescription();
@@ -650,17 +678,28 @@
     if (local) {
       ASSERT_EQ("192.168.0.2", msection_0.GetConnection().GetAddress());
       ASSERT_EQ(2002U, msection_0.GetPort());
-      // TODO: Check end-of-candidates. Issue 200
+      ASSERT_TRUE(msection_0.GetAttributeList().HasAttribute(
+            SdpAttribute::kRtcpAttribute));
+      auto& rtcpAttr = msection_0.GetAttributeList().GetRtcp();
+      ASSERT_EQ(3002U, rtcpAttr.mPort);
+      ASSERT_EQ(sdp::kInternet, rtcpAttr.mNetType);
+      ASSERT_EQ(sdp::kIPv4, rtcpAttr.mAddrType);
+      ASSERT_EQ("192.168.0.2", rtcpAttr.mAddress);
+      ASSERT_TRUE(msection_0.GetAttributeList().HasAttribute(
+            SdpAttribute::kEndOfCandidatesAttribute));
     }
 
     auto& attrs_0 = msection_0.GetAttributeList();
     ASSERT_TRUE(attrs_0.HasAttribute(SdpAttribute::kCandidateAttribute));
 
     auto& candidates_0 = attrs_0.GetCandidate();
-    ASSERT_EQ(3U, candidates_0.size());
+    ASSERT_EQ(6U, candidates_0.size());
     ASSERT_EQ(kCandidates[0], candidates_0[0]);
-    ASSERT_EQ(kCandidates[1], candidates_0[1]);
-    ASSERT_EQ(kCandidates[2], candidates_0[2]);
+    ASSERT_EQ(kRtcpCandidates[0], candidates_0[1]);
+    ASSERT_EQ(kCandidates[1], candidates_0[2]);
+    ASSERT_EQ(kRtcpCandidates[1], candidates_0[3]);
+    ASSERT_EQ(kCandidates[2], candidates_0[4]);
+    ASSERT_EQ(kRtcpCandidates[2], candidates_0[5]);
 
     if (parsed->GetMediaSectionCount() > 1) {
       auto& msection_1 = parsed->GetMediaSection(1);
@@ -668,17 +707,26 @@
       if (local) {
         ASSERT_EQ("192.168.1.2", msection_1.GetConnection().GetAddress());
         ASSERT_EQ(2012U, msection_1.GetPort());
-        // TODO: Check end-of-candidates. Issue 200
+        auto& rtcpAttr = msection_1.GetAttributeList().GetRtcp();
+        ASSERT_EQ(3012U, rtcpAttr.mPort);
+        ASSERT_EQ(sdp::kInternet, rtcpAttr.mNetType);
+        ASSERT_EQ(sdp::kIPv4, rtcpAttr.mAddrType);
+        ASSERT_EQ("192.168.1.2", rtcpAttr.mAddress);
+        ASSERT_TRUE(msection_0.GetAttributeList().HasAttribute(
+              SdpAttribute::kEndOfCandidatesAttribute));
       }
 
       auto& attrs_1 = msection_1.GetAttributeList();
       ASSERT_TRUE(attrs_1.HasAttribute(SdpAttribute::kCandidateAttribute));
 
       auto& candidates_1 = attrs_1.GetCandidate();
-      ASSERT_EQ(3U, candidates_1.size());
+      ASSERT_EQ(6U, candidates_1.size());
       ASSERT_EQ(kCandidates[3], candidates_1[0]);
-      ASSERT_EQ(kCandidates[4], candidates_1[1]);
-      ASSERT_EQ(kCandidates[5], candidates_1[2]);
+      ASSERT_EQ(kRtcpCandidates[3], candidates_1[1]);
+      ASSERT_EQ(kCandidates[4], candidates_1[2]);
+      ASSERT_EQ(kRtcpCandidates[4], candidates_1[3]);
+      ASSERT_EQ(kCandidates[5], candidates_1[4]);
+      ASSERT_EQ(kRtcpCandidates[5], candidates_1[5]);
     }
   }
 
@@ -1884,10 +1932,8 @@
   ASSERT_LE(1U, mSessionOff.GetTransports().size());
   ASSERT_LE(1U, mSessionAns.GetTransports().size());
 
-  ASSERT_EQ(JsepTransport::kJsepTransportClosed,
-            mSessionOff.GetTransports()[0]->mState);
-  ASSERT_EQ(JsepTransport::kJsepTransportClosed,
-            mSessionAns.GetTransports()[0]->mState);
+  ASSERT_EQ(0U, mSessionOff.GetTransports()[0]->mComponents);
+  ASSERT_EQ(0U, mSessionAns.GetTransports()[0]->mComponents);
 }
 
 TEST_P(JsepSessionTest, RenegotiationAnswererDisablesBundleTransport)
@@ -1994,29 +2040,37 @@
   std::string offer = CreateOffer(Some(options));
 
   SipccSdpParser parser;
-  auto outputSdp = parser.Parse(offer);
-  ASSERT_TRUE(!!outputSdp) << "Should have valid SDP" << std::endl
+  UniquePtr<Sdp> parsedOffer = parser.Parse(offer);
+  ASSERT_TRUE(!!parsedOffer) << "Should have valid SDP" << std::endl
                            << "Errors were: " << GetParseErrors(parser);
 
-  ASSERT_EQ(3U, outputSdp->GetMediaSectionCount());
+  ASSERT_EQ(3U, parsedOffer->GetMediaSectionCount());
   ASSERT_EQ(SdpMediaSection::kAudio,
-            outputSdp->GetMediaSection(0).GetMediaType());
+            parsedOffer->GetMediaSection(0).GetMediaType());
   ASSERT_EQ(SdpDirectionAttribute::kRecvonly,
-            outputSdp->GetMediaSection(0).GetAttributeList().GetDirection());
+            parsedOffer->GetMediaSection(0).GetAttributeList().GetDirection());
+  ASSERT_TRUE(parsedOffer->GetMediaSection(0).GetAttributeList().HasAttribute(
+        SdpAttribute::kSsrcAttribute));
+
   ASSERT_EQ(SdpMediaSection::kVideo,
-            outputSdp->GetMediaSection(1).GetMediaType());
+            parsedOffer->GetMediaSection(1).GetMediaType());
   ASSERT_EQ(SdpDirectionAttribute::kRecvonly,
-            outputSdp->GetMediaSection(1).GetAttributeList().GetDirection());
+            parsedOffer->GetMediaSection(1).GetAttributeList().GetDirection());
+  ASSERT_TRUE(parsedOffer->GetMediaSection(1).GetAttributeList().HasAttribute(
+        SdpAttribute::kSsrcAttribute));
+
   ASSERT_EQ(SdpMediaSection::kVideo,
-            outputSdp->GetMediaSection(2).GetMediaType());
+            parsedOffer->GetMediaSection(2).GetMediaType());
   ASSERT_EQ(SdpDirectionAttribute::kRecvonly,
-            outputSdp->GetMediaSection(2).GetAttributeList().GetDirection());
+            parsedOffer->GetMediaSection(2).GetAttributeList().GetDirection());
+  ASSERT_TRUE(parsedOffer->GetMediaSection(2).GetAttributeList().HasAttribute(
+        SdpAttribute::kSsrcAttribute));
 
-  ASSERT_TRUE(outputSdp->GetMediaSection(0).GetAttributeList().HasAttribute(
+  ASSERT_TRUE(parsedOffer->GetMediaSection(0).GetAttributeList().HasAttribute(
       SdpAttribute::kRtcpMuxAttribute));
-  ASSERT_TRUE(outputSdp->GetMediaSection(1).GetAttributeList().HasAttribute(
+  ASSERT_TRUE(parsedOffer->GetMediaSection(1).GetAttributeList().HasAttribute(
       SdpAttribute::kRtcpMuxAttribute));
-  ASSERT_TRUE(outputSdp->GetMediaSection(2).GetAttributeList().HasAttribute(
+  ASSERT_TRUE(parsedOffer->GetMediaSection(2).GetAttributeList().HasAttribute(
       SdpAttribute::kRtcpMuxAttribute));
 
   SetLocalOffer(offer, CHECK_SUCCESS);
@@ -2025,21 +2079,33 @@
   SetRemoteOffer(offer, CHECK_SUCCESS);
 
   std::string answer = CreateAnswer();
-  outputSdp = parser.Parse(answer);
+  UniquePtr<Sdp> parsedAnswer = parser.Parse(answer);
 
-  ASSERT_EQ(3U, outputSdp->GetMediaSectionCount());
+  ASSERT_EQ(3U, parsedAnswer->GetMediaSectionCount());
   ASSERT_EQ(SdpMediaSection::kAudio,
-            outputSdp->GetMediaSection(0).GetMediaType());
+            parsedAnswer->GetMediaSection(0).GetMediaType());
   ASSERT_EQ(SdpDirectionAttribute::kSendonly,
-            outputSdp->GetMediaSection(0).GetAttributeList().GetDirection());
+            parsedAnswer->GetMediaSection(0).GetAttributeList().GetDirection());
   ASSERT_EQ(SdpMediaSection::kVideo,
-            outputSdp->GetMediaSection(1).GetMediaType());
+            parsedAnswer->GetMediaSection(1).GetMediaType());
   ASSERT_EQ(SdpDirectionAttribute::kSendonly,
-            outputSdp->GetMediaSection(1).GetAttributeList().GetDirection());
+            parsedAnswer->GetMediaSection(1).GetAttributeList().GetDirection());
   ASSERT_EQ(SdpMediaSection::kVideo,
-            outputSdp->GetMediaSection(2).GetMediaType());
+            parsedAnswer->GetMediaSection(2).GetMediaType());
   ASSERT_EQ(SdpDirectionAttribute::kInactive,
-            outputSdp->GetMediaSection(2).GetAttributeList().GetDirection());
+            parsedAnswer->GetMediaSection(2).GetAttributeList().GetDirection());
+
+  SetLocalAnswer(answer, CHECK_SUCCESS);
+  SetRemoteAnswer(answer, CHECK_SUCCESS);
+
+  std::vector<JsepTrackPair> trackPairs(mSessionOff.GetNegotiatedTrackPairs());
+  ASSERT_EQ(2U, trackPairs.size());
+  for (auto pair : trackPairs) {
+    auto ssrcs = parsedOffer->GetMediaSection(pair.mLevel).GetAttributeList()
+                 .GetSsrc().mSsrcs;
+    ASSERT_EQ(1U, ssrcs.size());
+    ASSERT_EQ(pair.mRecvonlySsrc, ssrcs.front().ssrc);
+  }
 }
 
 TEST_F(JsepSessionTest, OfferAnswerSendOnlyLines)
@@ -3122,6 +3188,117 @@
   ASSERT_EQ("H264", codec->mName);
 }
 
+TEST_F(JsepSessionTest, LowDynamicPayloadType)
+{
+  SetPayloadTypeNumber(mSessionOff, "opus", "12");
+  types.push_back(SdpMediaSection::kAudio);
+  AddTracks(mSessionOff, "audio");
+  AddTracks(mSessionAns, "audio");
+
+  OfferAnswer();
+  const JsepCodecDescription* codec;
+  GetCodec(mSessionAns, 0, true, 0, &codec); // sending
+  ASSERT_TRUE(codec);
+  ASSERT_EQ("opus", codec->mName);
+  ASSERT_EQ("12", codec->mDefaultPt);
+  GetCodec(mSessionAns, 0, false, 0, &codec); // receiving
+  ASSERT_TRUE(codec);
+  ASSERT_EQ("opus", codec->mName);
+  ASSERT_EQ("12", codec->mDefaultPt);
+}
+
+TEST_P(JsepSessionTest, TestGlareRollback)
+{
+  AddTracks(mSessionOff);
+  AddTracks(mSessionAns);
+  JsepOfferOptions options;
+
+  std::string offer;
+  ASSERT_EQ(NS_OK, mSessionAns.CreateOffer(options, &offer));
+  ASSERT_EQ(NS_OK,
+            mSessionAns.SetLocalDescription(kJsepSdpOffer, offer));
+  ASSERT_EQ(kJsepStateHaveLocalOffer, mSessionAns.GetState());
+
+  ASSERT_EQ(NS_OK, mSessionOff.CreateOffer(options, &offer));
+  ASSERT_EQ(NS_OK,
+            mSessionOff.SetLocalDescription(kJsepSdpOffer, offer));
+  ASSERT_EQ(kJsepStateHaveLocalOffer, mSessionOff.GetState());
+
+  ASSERT_EQ(NS_ERROR_UNEXPECTED,
+            mSessionAns.SetRemoteDescription(kJsepSdpOffer, offer));
+  ASSERT_EQ(NS_OK,
+            mSessionAns.SetLocalDescription(kJsepSdpRollback, ""));
+  ASSERT_EQ(kJsepStateStable, mSessionAns.GetState());
+
+  SetRemoteOffer(offer);
+
+  std::string answer = CreateAnswer();
+  SetLocalAnswer(answer);
+  SetRemoteAnswer(answer);
+}
+
+TEST_P(JsepSessionTest, TestRejectOfferRollback)
+{
+  AddTracks(mSessionOff);
+  AddTracks(mSessionAns);
+
+  std::string offer = CreateOffer();
+  SetLocalOffer(offer);
+  SetRemoteOffer(offer);
+
+  ASSERT_EQ(NS_OK,
+            mSessionAns.SetRemoteDescription(kJsepSdpRollback, ""));
+  ASSERT_EQ(kJsepStateStable, mSessionAns.GetState());
+  ASSERT_EQ(types.size(), mSessionAns.GetRemoteTracksRemoved().size());
+
+  ASSERT_EQ(NS_OK,
+            mSessionOff.SetLocalDescription(kJsepSdpRollback, ""));
+  ASSERT_EQ(kJsepStateStable, mSessionOff.GetState());
+
+  OfferAnswer();
+}
+
+TEST_P(JsepSessionTest, TestInvalidRollback)
+{
+  AddTracks(mSessionOff);
+  AddTracks(mSessionAns);
+
+  ASSERT_EQ(NS_ERROR_UNEXPECTED,
+            mSessionOff.SetLocalDescription(kJsepSdpRollback, ""));
+  ASSERT_EQ(NS_ERROR_UNEXPECTED,
+            mSessionOff.SetRemoteDescription(kJsepSdpRollback, ""));
+
+  std::string offer = CreateOffer();
+  ASSERT_EQ(NS_ERROR_UNEXPECTED,
+            mSessionOff.SetLocalDescription(kJsepSdpRollback, ""));
+  ASSERT_EQ(NS_ERROR_UNEXPECTED,
+            mSessionOff.SetRemoteDescription(kJsepSdpRollback, ""));
+
+  SetLocalOffer(offer);
+  ASSERT_EQ(NS_ERROR_UNEXPECTED,
+            mSessionOff.SetRemoteDescription(kJsepSdpRollback, ""));
+
+  SetRemoteOffer(offer);
+  ASSERT_EQ(NS_ERROR_UNEXPECTED,
+            mSessionAns.SetLocalDescription(kJsepSdpRollback, ""));
+
+  std::string answer = CreateAnswer();
+  ASSERT_EQ(NS_ERROR_UNEXPECTED,
+            mSessionAns.SetLocalDescription(kJsepSdpRollback, ""));
+
+  SetLocalAnswer(answer);
+  ASSERT_EQ(NS_ERROR_UNEXPECTED,
+            mSessionAns.SetLocalDescription(kJsepSdpRollback, ""));
+  ASSERT_EQ(NS_ERROR_UNEXPECTED,
+            mSessionAns.SetRemoteDescription(kJsepSdpRollback, ""));
+
+  SetRemoteAnswer(answer);
+  ASSERT_EQ(NS_ERROR_UNEXPECTED,
+            mSessionOff.SetLocalDescription(kJsepSdpRollback, ""));
+  ASSERT_EQ(NS_ERROR_UNEXPECTED,
+            mSessionOff.SetRemoteDescription(kJsepSdpRollback, ""));
+}
+
 } // namespace mozilla
 
 int
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/test/mediaconduit_unittests.cpp firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/test/mediaconduit_unittests.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/test/mediaconduit_unittests.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/test/mediaconduit_unittests.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -301,12 +301,15 @@
    FILE* inFile = fopen( iFile.c_str(), "wb+");
    if(!inFile) {
      cerr << "Input File Creation Failed " << endl;
+     free(inbuf);
      return;
    }
 
    FILE* outFile = fopen( oFile.c_str(), "wb+");
    if(!outFile) {
      cerr << "Output File Creation Failed " << endl;
+     free(inbuf);
+     fclose(inFile);
      return;
    }
 
@@ -323,6 +326,8 @@
    {
     if(!memcpy(audioInput.get(), inbuf, sampleLengthInBytes))
     {
+      free(inbuf);
+      fclose(outFile);
       return;
     }
 
@@ -350,6 +355,7 @@
    }while(numSamplesReadFromInput < SAMPLES);
 
    FinishWaveHeader(outFile);
+   free(inbuf);
    fclose(outFile);
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/test/sdp_unittests.cpp firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/test/sdp_unittests.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/test/sdp_unittests.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/test/sdp_unittests.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -1159,6 +1159,7 @@
 "a=candidate:2 2 UDP 1694236670 24.6.134.204 55428 typ srflx raddr 10.0.0.36 rport 55428" CRLF
 "a=candidate:6 2 UDP 16515070 162.222.183.171 50340 typ relay raddr 162.222.183.171 rport 50340" CRLF
 "a=candidate:0 2 UDP 2130379006 10.0.0.36 55428 typ host" CRLF
+"a=rtcp:62454 IN IP4 162.222.183.171" CRLF
 "a=end-of-candidates" CRLF
 "a=ssrc:5150" CRLF
 "m=video 9 RTP/SAVPF 120 121" CRLF
@@ -1188,6 +1189,7 @@
 "a=candidate:2 1 UDP 1694236671 24.6.134.204 59530 typ srflx raddr 10.0.0.36 rport 59530" CRLF
 "a=candidate:3 1 UDP 100401151 162.222.183.171 62935 typ relay raddr 162.222.183.171 rport 62935" CRLF
 "a=candidate:3 2 UDP 100401150 162.222.183.171 61026 typ relay raddr 162.222.183.171 rport 61026" CRLF
+"a=rtcp:61026" CRLF
 "a=end-of-candidates" CRLF
 "a=ssrc:1111 foo" CRLF
 "a=ssrc:1111 foo:bar" CRLF
@@ -1975,6 +1977,31 @@
   CheckRtcpFb(rtcpfbs[18], "*", SdpRtcpFbAttributeList::kCcm, "tmmbr");
 }
 
+TEST_P(NewSdpTest, CheckRtcp) {
+  ParseSdp(kBasicAudioVideoOffer);
+  ASSERT_TRUE(!!mSdp);
+  ASSERT_EQ(3U, mSdp->GetMediaSectionCount()) << "Wrong number of media sections";
+
+  ASSERT_FALSE(mSdp->GetAttributeList().HasAttribute(
+        SdpAttribute::kRtcpAttribute));
+  ASSERT_TRUE(mSdp->GetMediaSection(0).GetAttributeList().HasAttribute(
+        SdpAttribute::kRtcpAttribute));
+  ASSERT_TRUE(mSdp->GetMediaSection(1).GetAttributeList().HasAttribute(
+        SdpAttribute::kRtcpAttribute));
+  ASSERT_FALSE(mSdp->GetMediaSection(2).GetAttributeList().HasAttribute(
+        SdpAttribute::kRtcpAttribute));
+
+  auto& rtcpAttr_0 = mSdp->GetMediaSection(0).GetAttributeList().GetRtcp();
+  ASSERT_EQ(62454U, rtcpAttr_0.mPort);
+  ASSERT_EQ(sdp::kInternet, rtcpAttr_0.mNetType);
+  ASSERT_EQ(sdp::kIPv4, rtcpAttr_0.mAddrType);
+  ASSERT_EQ("162.222.183.171", rtcpAttr_0.mAddress);
+
+  auto& rtcpAttr_1 = mSdp->GetMediaSection(1).GetAttributeList().GetRtcp();
+  ASSERT_EQ(61026U, rtcpAttr_1.mPort);
+  ASSERT_EQ("", rtcpAttr_1.mAddress);
+}
+
 TEST_P(NewSdpTest, CheckSctpmap) {
   ParseSdp(kBasicAudioVideoDataOffer);
   ASSERT_TRUE(!!mSdp) << "Parse failed: " << GetParseErrors();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/test/signaling_unittests.cpp firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/test/signaling_unittests.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/media/webrtc/signaling/test/signaling_unittests.cpp	2015-05-13 18:06:07.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/media/webrtc/signaling/test/signaling_unittests.cpp	2015-05-25 20:43:23.000000000 +0000
@@ -907,7 +907,6 @@
     mBundleEnabled(true),
     mExpectedFrameRequestType(VideoSessionConduit::FrameRequestPli),
     mExpectNack(true),
-    mExpectTmmbr(true),
     mExpectRtcpMuxAudio(true),
     mExpectRtcpMuxVideo(true),
     mRemoteDescriptionSet(false) {
@@ -1202,7 +1201,6 @@
       mozilla::VideoSessionConduit *video_conduit =
         static_cast<mozilla::VideoSessionConduit*>(conduit);
       ASSERT_EQ(mExpectNack, video_conduit->UsingNackBasic());
-      ASSERT_EQ(mExpectTmmbr, video_conduit->UsingTmmbr());
       ASSERT_EQ(mExpectedFrameRequestType,
                 video_conduit->FrameRequestMethod());
       ASSERT_EQ(mExpectRtcpMuxVideo, pipeline->IsDoingRtcpMux())
@@ -1551,7 +1549,6 @@
   bool mBundleEnabled;
   VideoSessionConduit::FrameRequestType mExpectedFrameRequestType;
   bool mExpectNack;
-  bool mExpectTmmbr;
   bool mExpectRtcpMuxAudio;
   bool mExpectRtcpMuxVideo;
   bool mRemoteDescriptionSet;
@@ -1993,7 +1990,6 @@
 
   void TestRtcpFbAnswer(const std::set<std::string>& feedback,
       bool expectNack,
-      bool expectTmmbr,
       VideoSessionConduit::FrameRequestType frameRequestType) {
     EnsureInit();
     OfferOptions options;
@@ -2012,7 +2008,6 @@
 
     a1_->SetExpectedFrameRequestType(frameRequestType);
     a1_->mExpectNack = expectNack;
-    a1_->mExpectTmmbr = expectTmmbr;
 
     WaitForCompleted();
     CheckPipelines();
@@ -2023,7 +2018,6 @@
   void TestRtcpFbOffer(
       const std::set<std::string>& feedback,
       bool expectNack,
-      bool expectTmmbr,
       VideoSessionConduit::FrameRequestType frameRequestType) {
     EnsureInit();
     OfferOptions options;
@@ -2036,7 +2030,6 @@
     a2_->SetRemote(TestObserver::OFFER, modifiedOffer);
     a2_->SetExpectedFrameRequestType(frameRequestType);
     a2_->mExpectNack = expectNack;
-    a2_->mExpectTmmbr = expectTmmbr;
 
     a2_->CreateAnswer(OFFER_AV | ANSWER_AV);
 
@@ -3088,6 +3081,38 @@
   agent(0)->CreateOffer(options, OFFER_AUDIO);
 }
 
+TEST_F(SignalingAgentTest, SetLocalWithoutCreateOffer) {
+  CreateAgent(TestStunServer::GetInstance()->addr(),
+              TestStunServer::GetInstance()->port());
+  CreateAgent(TestStunServer::GetInstance()->addr(),
+              TestStunServer::GetInstance()->port());
+  OfferOptions options;
+  agent(0)->CreateOffer(options, OFFER_AUDIO);
+  agent(1)->SetLocal(TestObserver::OFFER,
+                     agent(0)->offer(),
+                     true,
+                     PCImplSignalingState::SignalingStable);
+}
+
+TEST_F(SignalingAgentTest, SetLocalWithoutCreateAnswer) {
+  CreateAgent(TestStunServer::GetInstance()->addr(),
+              TestStunServer::GetInstance()->port());
+  CreateAgent(TestStunServer::GetInstance()->addr(),
+              TestStunServer::GetInstance()->port());
+  CreateAgent(TestStunServer::GetInstance()->addr(),
+              TestStunServer::GetInstance()->port());
+  OfferOptions options;
+  agent(0)->CreateOffer(options, OFFER_AUDIO);
+  agent(1)->SetRemote(TestObserver::OFFER, agent(0)->offer());
+  agent(1)->CreateAnswer(ANSWER_AUDIO);
+  agent(2)->SetRemote(TestObserver::OFFER, agent(0)->offer());
+  // Use agent 1's answer on agent 2, should fail
+  agent(2)->SetLocal(TestObserver::ANSWER,
+                     agent(1)->answer(),
+                     true,
+                     PCImplSignalingState::SignalingHaveRemoteOffer);
+}
+
 TEST_F(SignalingAgentTest, CreateOfferSetLocalTrickleTestServer) {
   TestStunServer::GetInstance()->SetActive(false);
   TestStunServer::GetInstance()->SetResponseAddr(
@@ -3394,25 +3419,23 @@
   EnsureInit();
   OfferOptions options;
   a1_->CreateOffer(options, OFFER_AV);
-  const char *expected[] = { "nack", "nack pli", "ccm fir", "ccm tmmbr" };
+  const char *expected[] = { "nack", "nack pli", "ccm fir" };
   CheckRtcpFbSdp(a1_->offer(), ARRAY_TO_SET(std::string, expected));
 }
 
 TEST_P(SignalingTest, RtcpFbOfferAll)
 {
-  const char *feedbackTypes[] = { "nack", "nack pli", "ccm fir", "ccm tmmbr" };
+  const char *feedbackTypes[] = { "nack", "nack pli", "ccm fir" };
   TestRtcpFbOffer(ARRAY_TO_SET(std::string, feedbackTypes),
                   true,
-                  true,
                   VideoSessionConduit::FrameRequestPli);
 }
 
 TEST_P(SignalingTest, RtcpFbOfferNoNackBasic)
 {
-  const char *feedbackTypes[] = { "nack pli", "ccm fir", "ccm tmmbr" };
+  const char *feedbackTypes[] = { "nack pli", "ccm fir" };
   TestRtcpFbOffer(ARRAY_TO_SET(std::string, feedbackTypes),
                   false,
-                  true,
                   VideoSessionConduit::FrameRequestPli);
 }
 
@@ -3421,7 +3444,6 @@
   const char *feedbackTypes[] = { "nack", "ccm fir" };
   TestRtcpFbOffer(ARRAY_TO_SET(std::string, feedbackTypes),
                   true,
-                  false,
                   VideoSessionConduit::FrameRequestFir);
 }
 
@@ -3430,7 +3452,6 @@
   const char *feedbackTypes[] = { "nack", "nack pli" };
   TestRtcpFbOffer(ARRAY_TO_SET(std::string, feedbackTypes),
                   true,
-                  false,
                   VideoSessionConduit::FrameRequestPli);
 }
 
@@ -3439,7 +3460,6 @@
   const char *feedbackTypes[] = { "ccm fir" };
   TestRtcpFbOffer(ARRAY_TO_SET(std::string, feedbackTypes),
                   false,
-                  false,
                   VideoSessionConduit::FrameRequestFir);
 }
 
@@ -3448,7 +3468,6 @@
   const char *feedbackTypes[] = { "nack" };
   TestRtcpFbOffer(ARRAY_TO_SET(std::string, feedbackTypes),
                   true,
-                  false,
                   VideoSessionConduit::FrameRequestNone);
 }
 
@@ -3457,7 +3476,6 @@
   const char *feedbackTypes[] = { "nack pli" };
   TestRtcpFbOffer(ARRAY_TO_SET(std::string, feedbackTypes),
                   false,
-                  false,
                   VideoSessionConduit::FrameRequestPli);
 }
 
@@ -3466,7 +3484,6 @@
   const char *feedbackTypes[] = { };
   TestRtcpFbOffer(ARRAY_TO_SET(std::string, feedbackTypes),
                   false,
-                  false,
                   VideoSessionConduit::FrameRequestNone);
 }
 
@@ -3475,7 +3492,6 @@
   const char *feedbackTypes[] = { "nack", "nack pli", "ccm fir" };
   TestRtcpFbAnswer(ARRAY_TO_SET(std::string, feedbackTypes),
                   true,
-                  false,
                   VideoSessionConduit::FrameRequestPli);
 }
 
@@ -3484,7 +3500,6 @@
   const char *feedbackTypes[] = { "nack pli", "ccm fir" };
   TestRtcpFbAnswer(ARRAY_TO_SET(std::string, feedbackTypes),
                   false,
-                  false,
                   VideoSessionConduit::FrameRequestPli);
 }
 
@@ -3493,7 +3508,6 @@
   const char *feedbackTypes[] = { "nack", "ccm fir" };
   TestRtcpFbAnswer(ARRAY_TO_SET(std::string, feedbackTypes),
                   true,
-                  false,
                   VideoSessionConduit::FrameRequestFir);
 }
 
@@ -3502,7 +3516,6 @@
   const char *feedbackTypes[] = { "nack", "nack pli" };
   TestRtcpFbAnswer(ARRAY_TO_SET(std::string, feedbackTypes),
                   true,
-                  false,
                   VideoSessionConduit::FrameRequestPli);
 }
 
@@ -3511,7 +3524,6 @@
   const char *feedbackTypes[] = { "ccm fir" };
   TestRtcpFbAnswer(ARRAY_TO_SET(std::string, feedbackTypes),
                   false,
-                  false,
                   VideoSessionConduit::FrameRequestFir);
 }
 
@@ -3520,7 +3532,6 @@
   const char *feedbackTypes[] = { "nack" };
   TestRtcpFbAnswer(ARRAY_TO_SET(std::string, feedbackTypes),
                   true,
-                  false,
                   VideoSessionConduit::FrameRequestNone);
 }
 
@@ -3528,8 +3539,7 @@
 {
   const char *feedbackTypes[] = { "nack pli" };
   TestRtcpFbAnswer(ARRAY_TO_SET(std::string, feedbackTypes),
-                  false,
-                  false,
+                  0,
                   VideoSessionConduit::FrameRequestPli);
 }
 
@@ -3537,8 +3547,7 @@
 {
   const char *feedbackTypes[] = { };
   TestRtcpFbAnswer(ARRAY_TO_SET(std::string, feedbackTypes),
-                  false,
-                  false,
+                  0,
                   VideoSessionConduit::FrameRequestNone);
 }
 
@@ -4391,12 +4400,6 @@
                  strlen("\r\na=rtcp-fb:121 ccm fir"),
                  "\r\na=rtcp-fb:121 ccm fir");
 
-  match = answer.find("\r\na=rtcp-fb:120 ccm tmmbr");
-  ASSERT_NE(std::string::npos, match);
-  answer.replace(match,
-                 strlen("\r\na=rtcp-fb:121 ccm tmmbr"),
-                 "\r\na=rtcp-fb:121 ccm tmmbr");
-
   std::cout << "Modified SDP " << std::endl
             << indent(answer) << std::endl;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/memory/fallible/moz.build firefox-trunk-41.0~a1~hg20150524r245419/memory/fallible/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/memory/fallible/moz.build	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/memory/fallible/moz.build	2015-05-25 20:43:38.000000000 +0000
@@ -28,3 +28,8 @@
     CXXFLAGS += [
         '-Zl',
     ]
+
+    if CONFIG['_MSC_VER'] >= '1900':
+        # This further prevents the CRT name from getting into the .obj file,
+        # by avoiding pulling in a bunch of string code that uses the CRT.
+        DEFINES['mozilla_Char16_h'] = True
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mfbt/IndexSequence.h firefox-trunk-41.0~a1~hg20150524r245419/mfbt/IndexSequence.h
--- firefox-trunk-41.0~a1~hg20150513r243603/mfbt/IndexSequence.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mfbt/IndexSequence.h	2015-05-25 20:43:39.000000000 +0000
@@ -0,0 +1,143 @@
+/* -*- 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/. */
+
+/* A utility for expanding a tuple into a variadic argument list.
+ * Based on std::index_sequence. */
+
+/**
+ * Example usage:
+ *
+ * Problem:
+ *
+ *   You have a variadic function Foo:
+ *
+ *     template <typename... Args> void Foo(Args...);
+ *
+ *   And a variadic function Bar, which contains a tuple:
+ *
+ *     template <typename... Args>
+ *     void Bar() {
+ *       // ...
+ *       Tuple<Args...> t;
+ *     }
+ *
+ *   And inside Bar, you want to call Foo with the elements of the tuple as
+ *   arguments to Foo.
+ *
+ *   You want to write:
+ *
+ *     Foo(Get<0>(t), Get<1>(t), ..., Get<N>(t))
+ *
+ *   but you can't literally write that, because N is different for different
+ *   instantiations of Bar.
+ *
+ * Solution:
+ *
+ *   Write a helper function which takes the tuple, and an index sequence
+ *   containing indices corresponding to the tuple indices.
+ *
+ *     template <typename... Args, size_t... Indices>
+ *     void Helper(const Tuple<Args...>& t, IndexSequence<Indices>)
+ *     {
+ *       Foo(Get<Indices>(t)...);
+ *     }
+ *
+ *   Assuming 'Indices...' are 0, 1, ..., N - 1, where N is the size of the
+ *   tuple, pack expansion will expand the pack 'Get<Indices>(t)...' to
+ *   'Get<0>(t), Get<1>(t), ..., Get<N>(t)'.
+ *
+ *   Finally, call the helper, creating the index sequence to pass in like so:
+ *
+ *     template <typename... Args>
+ *     void Bar() {
+ *       // ...
+ *       Tuple<Args...> t;
+ *       Helper(t, typename IndexSequenceFor<Args...>::Type());
+ *     }
+ */
+
+#ifndef mozilla_IndexSequence_h
+#define mozilla_IndexSequence_h
+
+#include "mozilla/Attributes.h"
+
+#include <stddef.h>
+
+namespace mozilla {
+
+/**
+ * Represents a compile-time sequence of integer indices.
+ */
+template<size_t... Indices>
+struct IndexSequence
+{
+  static MOZ_CONSTEXPR size_t Size() { return sizeof...(Indices); }
+};
+
+namespace detail {
+
+// Helpers used by MakeIndexSequence.
+
+template<size_t... Indices>
+struct IndexTuple
+{
+  typedef IndexTuple<Indices..., sizeof...(Indices)> Next;
+};
+
+// Builds IndexTuple<0, 1, ..., N - 1>.
+template<size_t N>
+struct BuildIndexTuple
+{
+  typedef typename BuildIndexTuple<N - 1>::Type::Next Type;
+};
+
+template<>
+struct BuildIndexTuple<0>
+{
+  typedef IndexTuple<> Type;
+};
+
+template<size_t N, typename IndexTuple>
+struct MakeIndexSequenceImpl;
+
+template<size_t N, size_t... Indices>
+struct MakeIndexSequenceImpl<N, IndexTuple<Indices...>>
+{
+  typedef IndexSequence<Indices...> Type;
+};
+
+}  // namespace detail
+
+/**
+ * A utility for building an IndexSequence of consecutive indices.
+ * MakeIndexSequence<N>::Type evaluates to IndexSequence<0, 1, .., N - 1>.
+ * Note: unlike std::make_index_sequence, this is not an alias template
+ * to work around bugs in MSVC 2013.
+ */
+template<size_t N>
+struct MakeIndexSequence
+{
+  typedef typename detail::MakeIndexSequenceImpl<N,
+    typename detail::BuildIndexTuple<N>::Type>::Type Type;
+};
+
+/**
+ * A utility for building an IndexSequence of consecutive indices
+ * corresponding to a variadic argument list.
+ * IndexSequenceFor<Types...> evaluates to IndexSequence<0, 1, ..., N - 1>
+ * where N is the number of types in Types.
+ * Note: unlike std::index_sequence_for, this is not an alias template
+ * to work around bugs in MSVC 2013.
+ */
+template<typename... Types>
+struct IndexSequenceFor
+{
+  typedef typename MakeIndexSequence<sizeof...(Types)>::Type Type;
+};
+
+} // namespace mozilla
+
+#endif /* mozilla_IndexSequence_h */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mfbt/moz.build firefox-trunk-41.0~a1~hg20150524r245419/mfbt/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/mfbt/moz.build	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mfbt/moz.build	2015-05-25 20:43:40.000000000 +0000
@@ -37,6 +37,7 @@
     'FloatingPoint.h',
     'GuardObjects.h',
     'HashFunctions.h',
+    'IndexSequence.h',
     'IntegerPrintfMacros.h',
     'IntegerRange.h',
     'IntegerTypeTraits.h',
@@ -58,6 +59,7 @@
     'PodOperations.h',
     'Poison.h',
     'Range.h',
+    'RangedArray.h',
     'RangedPtr.h',
     'RefCountType.h',
     'ReentrancyGuard.h',
@@ -73,6 +75,7 @@
     'TemplateLib.h',
     'ThreadLocal.h',
     'ToString.h',
+    'Tuple.h',
     'TypedEnumBits.h',
     'Types.h',
     'TypeTraits.h',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mfbt/RangedArray.h firefox-trunk-41.0~a1~hg20150524r245419/mfbt/RangedArray.h
--- firefox-trunk-41.0~a1~hg20150513r243603/mfbt/RangedArray.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mfbt/RangedArray.h	2015-05-25 20:43:40.000000000 +0000
@@ -0,0 +1,44 @@
+/* -*- 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/. */
+
+/*
+ * A compile-time constant-length array, with bounds-checking assertions -- but
+ * unlike mozilla::Array, with indexes biased by a constant.
+ *
+ * Thus where mozilla::Array<int, 3> is a three-element array indexed by [0, 3),
+ * mozilla::RangedArray<int, 8, 3> is a three-element array indexed by [8, 11).
+ */
+
+#ifndef mozilla_RangedArray_h
+#define mozilla_RangedArray_h
+
+#include "mozilla/Array.h"
+
+namespace mozilla {
+
+template<typename T, size_t MinIndex, size_t Length>
+class RangedArray
+{
+public:
+  T& operator[](size_t aIndex)
+  {
+    MOZ_ASSERT(aIndex == MinIndex || aIndex > MinIndex);
+    return mArr[aIndex - MinIndex];
+  }
+
+  const T& operator[](size_t aIndex) const
+  {
+    MOZ_ASSERT(aIndex == MinIndex || aIndex > MinIndex);
+    return mArr[aIndex - MinIndex];
+  }
+
+private:
+  Array<T, Length> mArr;
+};
+
+} // namespace mozilla
+
+#endif // mozilla_RangedArray_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mfbt/RefPtr.h firefox-trunk-41.0~a1~hg20150524r245419/mfbt/RefPtr.h
--- firefox-trunk-41.0~a1~hg20150513r243603/mfbt/RefPtr.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mfbt/RefPtr.h	2015-05-25 20:43:40.000000000 +0000
@@ -13,6 +13,7 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/Move.h"
 #include "mozilla/RefCountType.h"
 #include "mozilla/TypeTraits.h"
 #if defined(MOZILLA_INTERNAL_API)
@@ -284,8 +285,6 @@
   operator T*() const { return mPtr; }
   T* operator->() const MOZ_NO_ADDREF_RELEASE_ON_RETURN { return mPtr; }
   T& operator*() const { return *mPtr; }
-  template<typename U>
-  operator TemporaryRef<U>() { return TemporaryRef<U>(mPtr); }
 
 private:
   void assign(T* aVal)
@@ -327,7 +326,13 @@
   typedef typename RefPtr<T>::DontRef DontRef;
 
 public:
-  MOZ_IMPLICIT TemporaryRef(T* aVal) : mPtr(RefPtr<T>::ref(aVal)) {}
+  // Please see already_AddRefed for a description of what these constructors
+  // do.
+  TemporaryRef() : mPtr(nullptr) {}
+  typedef void (TemporaryRef::* MatchNullptr)(double, float);
+  MOZ_IMPLICIT TemporaryRef(MatchNullptr aRawPtr) : mPtr(nullptr) {}
+  explicit TemporaryRef(T* aVal) : mPtr(RefPtr<T>::ref(aVal)) {}
+
   TemporaryRef(const TemporaryRef& aOther) : mPtr(aOther.take()) {}
 
   template<typename U>
@@ -347,7 +352,6 @@
 
   mutable T* MOZ_OWNING_REF mPtr;
 
-  TemporaryRef() = delete;
   void operator=(const TemporaryRef&) = delete;
 };
 
@@ -399,6 +403,28 @@
   return OutParamRef<T>(aPtr);
 }
 
+/**
+ * Helper function to be able to conveniently write things like:
+ *
+ *   TemporaryRef<T>
+ *   f(...)
+ *   {
+ *     return MakeAndAddRef<T>(...);
+ *   }
+ *
+ * since explicitly constructing TemporaryRef is unsightly.  Having an
+ * explicit construction of TemporaryRef from T* also inhibits a future
+ * auto-conversion from TemporaryRef to already_AddRefed, since the semantics
+ * of TemporaryRef(T*) differ from already_AddRefed(T*).
+ */
+template<typename T, typename... Args>
+TemporaryRef<T>
+MakeAndAddRef(Args&&... aArgs)
+{
+  RefPtr<T> p(new T(Forward<Args>(aArgs)...));
+  return p.forget();
+}
+
 } // namespace mozilla
 
 #endif /* mozilla_RefPtr_h */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mfbt/TemplateLib.h firefox-trunk-41.0~a1~hg20150524r245419/mfbt/TemplateLib.h
--- firefox-trunk-41.0~a1~hg20150513r243603/mfbt/TemplateLib.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mfbt/TemplateLib.h	2015-05-25 20:43:40.000000000 +0000
@@ -20,6 +20,8 @@
 #include <limits.h>
 #include <stddef.h>
 
+#include "mozilla/TypeTraits.h"
+
 namespace mozilla {
 
 namespace tl {
@@ -105,6 +107,25 @@
 template<> struct MulOverflowMask<0> { /* Error */ };
 template<> struct MulOverflowMask<1> { static const size_t value = 0; };
 
+/**
+ * And<bool...> computes the logical 'and' of its argument booleans.
+ *
+ * Examples:
+ *   mozilla::t1::And<true, true>::value is true.
+ *   mozilla::t1::And<true, false>::value is false.
+ *   mozilla::t1::And<>::value is true.
+ */
+
+template<bool...>
+struct And;
+
+template<>
+struct And<> : public TrueType { };
+
+template<bool C1, bool... Cn>
+struct And<C1, Cn...>
+  : public Conditional<C1, And<Cn...>, FalseType>::Type { };
+
 } // namespace tl
 
 } // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mfbt/tests/moz.build firefox-trunk-41.0~a1~hg20150524r245419/mfbt/tests/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/mfbt/tests/moz.build	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mfbt/tests/moz.build	2015-05-25 20:43:40.000000000 +0000
@@ -28,6 +28,8 @@
     'TestSegmentedVector',
     'TestSHA1',
     'TestSplayTree',
+    'TestTemplateLib',
+    'TestTuple',
     'TestTypedEnum',
     'TestTypeTraits',
     'TestUniquePtr',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mfbt/tests/TestRefPtr.cpp firefox-trunk-41.0~a1~hg20150524r245419/mfbt/tests/TestRefPtr.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/mfbt/tests/TestRefPtr.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mfbt/tests/TestRefPtr.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -36,13 +36,15 @@
 TemporaryRef<Foo>
 NewFoo()
 {
-  return RefPtr<Foo>(new Foo());
+  RefPtr<Foo> f(new Foo());
+  return f.forget();
 }
 
 TemporaryRef<Foo>
 NewBar()
 {
-  return new Bar();
+  RefPtr<Bar> bar = new Bar();
+  return bar.forget();
 }
 
 void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mfbt/tests/TestTemplateLib.cpp firefox-trunk-41.0~a1~hg20150524r245419/mfbt/tests/TestTemplateLib.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/mfbt/tests/TestTemplateLib.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mfbt/tests/TestTemplateLib.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozilla/TemplateLib.h"
+
+using mozilla::tl::And;
+
+static_assert(And<>::value == true,
+              "And<>::value should be true");
+static_assert(And<true>::value == true,
+              "And<true>::value should be true");
+static_assert(And<false>::value == false,
+              "And<false>::value should be false");
+static_assert(And<false, true>::value == false,
+              "And<false, true>::value should be false");
+static_assert(And<false, false>::value == false,
+              "And<false, false>::value should be false");
+static_assert(And<true, false>::value == false,
+              "And<true, false>::value should be false");
+static_assert(And<true, true>::value == true,
+              "And<true, true>::value should be true");
+static_assert(And<true, true, true>::value == true,
+              "And<true, true, true>::value should be true");
+static_assert(And<true, false, true>::value == false,
+              "And<true, false, true>::value should be false");
+
+int
+main()
+{
+  // Nothing to do here.
+  return 0;
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mfbt/tests/TestTuple.cpp firefox-trunk-41.0~a1~hg20150524r245419/mfbt/tests/TestTuple.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/mfbt/tests/TestTuple.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mfbt/tests/TestTuple.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -0,0 +1,147 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+   /* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozilla/Assertions.h"
+#include "mozilla/Move.h"
+#include "mozilla/Tuple.h"
+#include "mozilla/TypeTraits.h"
+#include "mozilla/UniquePtr.h"
+#include "mozilla/unused.h"
+
+#include <stddef.h>
+
+using mozilla::Get;
+using mozilla::IsSame;
+using mozilla::MakeTuple;
+using mozilla::MakeUnique;
+using mozilla::Move;
+using mozilla::Tuple;
+using mozilla::UniquePtr;
+using mozilla::unused;
+
+#define CHECK(c) \
+  do { \
+    bool cond = !!(c); \
+    MOZ_RELEASE_ASSERT(cond, "Failed assertion: " #c); \
+  } while (false)
+
+// The second argument is the expected type. It's variadic to allow the
+// type to contain commas.
+#define CHECK_TYPE(expression, ...)  \
+  static_assert(IsSame<decltype(expression), __VA_ARGS__>::value, \
+      "Type mismatch!")
+
+struct ConvertibleToInt
+{
+  operator int() { return 42; }
+};
+
+static void
+TestConstruction()
+{
+  // Default construction
+  Tuple<> a;
+  unused << a;
+  Tuple<int> b;
+  unused << b;
+
+  // Construction from elements
+  int x = 1, y = 1;
+  Tuple<int, int> c{x, y};
+  Tuple<int&, const int&> d{x, y};
+  x = 42;
+  y = 42;
+  CHECK(Get<0>(c) == 1);
+  CHECK(Get<1>(c) == 1);
+  CHECK(Get<0>(d) == 42);
+  CHECK(Get<1>(d) == 42);
+
+  // Construction from objects convertible to the element types
+  Tuple<int, int> e{1.0, ConvertibleToInt{}};
+
+  // Copy construction
+  Tuple<int> x1;
+  Tuple<int> x2{x1};
+
+  Tuple<int, int> f(c);
+  CHECK(Get<0>(f) == 1);
+  CHECK(Get<0>(f) == 1);
+
+  // Move construction
+  Tuple<UniquePtr<int>> g{MakeUnique<int>(42)};
+  Tuple<UniquePtr<int>> h{Move(g)};
+  CHECK(Get<0>(g) == nullptr);
+  CHECK(*Get<0>(h) == 42);
+}
+
+static void
+TestAssignment()
+{
+  // Copy assignment
+  Tuple<int> a{0};
+  Tuple<int> b{42};
+  a = b;
+  CHECK(Get<0>(a) == 42);
+
+  // Assignment to reference member
+  int i = 0;
+  int j = 42;
+  Tuple<int&> c{i};
+  Tuple<int&> d{j};
+  c = d;
+  CHECK(i == 42);
+
+  // Move assignment
+  Tuple<UniquePtr<int>> e{MakeUnique<int>(0)};
+  Tuple<UniquePtr<int>> f{MakeUnique<int>(42)};
+  e = Move(f);
+  CHECK(*Get<0>(e) == 42);
+  CHECK(Get<0>(f) == nullptr);
+}
+
+static void
+TestGet()
+{
+  int x = 1;
+  int y = 2;
+  int z = 3;
+  Tuple<int, int&, const int&> tuple(x, y, z);
+
+  // Using Get<>() to read elements
+  CHECK(Get<0>(tuple) == 1);
+  CHECK(Get<1>(tuple) == 2);
+  CHECK(Get<2>(tuple) == 3);
+
+  // Using Get<>() to write to elements
+  Get<0>(tuple) = 41;
+  CHECK(Get<0>(tuple) == 41);
+
+  // Writing through reference elements
+  Get<1>(tuple) = 42;
+  CHECK(Get<1>(tuple) == 42);
+  CHECK(y == 42);
+}
+
+static bool
+TestMakeTuple()
+{
+  auto tuple = MakeTuple(42, 0.5f, 'c');
+  CHECK_TYPE(tuple, Tuple<int, float, char>);
+  CHECK(Get<0>(tuple) == 42);
+  CHECK(Get<1>(tuple) == 1.0f);
+  CHECK(Get<2>(tuple) == 'c');
+  return true;
+}
+
+int
+main()
+{
+  TestConstruction();
+  TestAssignment();
+  TestGet();
+  TestMakeTuple();
+  return 0;
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mfbt/tests/TestTypeTraits.cpp firefox-trunk-41.0~a1~hg20150524r245419/mfbt/tests/TestTypeTraits.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/mfbt/tests/TestTypeTraits.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mfbt/tests/TestTypeTraits.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -8,6 +8,8 @@
 #include "mozilla/TypeTraits.h"
 
 using mozilla::AddLvalueReference;
+using mozilla::AddRvalueReference;
+using mozilla::DeclVal;
 using mozilla::IsArray;
 using mozilla::IsBaseOf;
 using mozilla::IsClass;
@@ -371,6 +373,36 @@
 static_assert(IsSame<AddLvalueReference<struct S1&&>::Type, struct S1&>::value,
               "not reference-collapsing struct S1&& & to struct S1& correctly");
 
+static_assert(IsSame<AddRvalueReference<int>::Type, int&&>::value,
+              "not adding && to int correctly");
+static_assert(IsSame<AddRvalueReference<volatile int&>::Type, volatile int&>::value,
+              "not adding && to volatile int& correctly");
+static_assert(IsSame<AddRvalueReference<const int&&>::Type, const int&&>::value,
+              "not adding && to volatile int& correctly");
+static_assert(IsSame<AddRvalueReference<void*>::Type, void*&&>::value,
+              "not adding && to void* correctly");
+static_assert(IsSame<AddRvalueReference<void>::Type, void>::value,
+              "void shouldn't be transformed by AddRvalueReference");
+static_assert(IsSame<AddRvalueReference<struct S1&>::Type, struct S1&>::value,
+              "not reference-collapsing struct S1& && to struct S1& correctly");
+
+struct TestWithDefaultConstructor
+{
+  int foo() const { return 0; }
+};
+struct TestWithNoDefaultConstructor
+{
+  explicit TestWithNoDefaultConstructor(int) {}
+  int foo() const { return 1; }
+};
+
+static_assert(IsSame<decltype(TestWithDefaultConstructor().foo()), int>::value,
+              "decltype should work using a struct with a default constructor");
+static_assert(IsSame<decltype(DeclVal<TestWithDefaultConstructor>().foo()), int>::value,
+              "decltype should work using a DeclVal'd struct with a default constructor");
+static_assert(IsSame<decltype(DeclVal<TestWithNoDefaultConstructor>().foo()), int>::value,
+              "decltype should work using a DeclVal'd struct without a default constructor");
+
 static_assert(IsSame<MakeSigned<const unsigned char>::Type, const signed char>::value,
               "const unsigned char won't signify correctly");
 static_assert(IsSame<MakeSigned<volatile unsigned short>::Type, volatile signed short>::value,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mfbt/Tuple.h firefox-trunk-41.0~a1~hg20150524r245419/mfbt/Tuple.h
--- firefox-trunk-41.0~a1~hg20150513r243603/mfbt/Tuple.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mfbt/Tuple.h	2015-05-25 20:43:40.000000000 +0000
@@ -0,0 +1,301 @@
+/* -*- 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/. */
+
+/* A variadic tuple class. */
+
+#ifndef mozilla_Tuple_h
+#define mozilla_Tuple_h
+
+#include "mozilla/Move.h"
+#include "mozilla/TemplateLib.h"
+#include "mozilla/TypeTraits.h"
+
+#include <stddef.h>
+
+namespace mozilla {
+
+namespace detail {
+
+/*
+ * A helper class that allows passing around multiple variadic argument lists
+ * by grouping them.
+ */
+template<typename... Ts>
+struct Group;
+
+/*
+ * CheckConvertibility checks whether each type in a source pack of types
+ * is convertible to the corresponding type in a target pack of types.
+ *
+ * It is intended to be invoked like this:
+ *   CheckConvertibility<Group<SourceTypes...>, Group<TargetTypes...>>
+ * 'Group' is used to separate types in the two packs (otherwise if we just
+ * wrote 'CheckConvertibility<SourceTypes..., TargetTypes...', it couldn't
+ * know where the first pack ends and the second begins).
+ *
+ * Note that we need to check explicitly that the two packs are of the same
+ * size, because attempting to simultaneously expand two parameter packs
+ * is an error (and it would be a hard error, because it wouldn't be in the
+ * immediate context of the caller).
+ */
+
+template<typename Source, typename Target, bool SameSize>
+struct CheckConvertibilityImpl;
+
+template<typename Source, typename Target>
+struct CheckConvertibilityImpl<Source, Target, false>
+  : FalseType {};
+
+template<typename... SourceTypes, typename... TargetTypes>
+struct CheckConvertibilityImpl<Group<SourceTypes...>, Group<TargetTypes...>, true>
+  : IntegralConstant<bool, tl::And<IsConvertible<SourceTypes, TargetTypes>::value...>::value> { };
+
+template<typename Source, typename Target>
+struct CheckConvertibility;
+
+template<typename... SourceTypes, typename... TargetTypes>
+struct CheckConvertibility<Group<SourceTypes...>, Group<TargetTypes...>>
+  : CheckConvertibilityImpl<Group<SourceTypes...>, Group<TargetTypes...>,
+        sizeof...(SourceTypes) == sizeof...(TargetTypes)> { };
+
+/*
+ * TupleImpl is a helper class used to implement mozilla::Tuple.
+ * It represents one node in a recursive inheritance hierarchy.
+ * 'Index' is the 0-based index of the tuple element stored in this node;
+ * 'Elements...' are the types of the elements stored in this node and its
+ * base classes.
+ *
+ * Example:
+ *   Tuple<int, float, char> inherits from
+ *   TupleImpl<0, int, float, char>, which stores the 'int' and inherits from
+ *   TupleImpl<1, float, char>, which stores the 'float' and inherits from
+ *   TupleImpl<2, char>, which stores the 'char' and inherits from
+ *   TupleImpl<3>, which stores nothing and terminates the recursion.
+ *
+ * The purpose of the 'Index' parameter is to allow efficient index-based
+ * access to a tuple element: given a tuple, and an index 'I' that we wish to
+ * access, we can cast the tuple to the base which stores the I'th element
+ * by performing template argument deduction against 'TupleImpl<I, E...>',
+ * where 'I' is specified explicitly and 'E...' is deduced (this is what the
+ * non-member 'Get<N>(t)' function does).
+ *
+ * This implementation strategy is borrowed from libstdc++'s std::tuple
+ * implementation.
+ */
+template<std::size_t Index, typename... Elements>
+struct TupleImpl;
+
+/*
+ * The base case of the inheritance recursion (and also the implementation
+ * of an empty tuple).
+ */
+template<std::size_t Index>
+struct TupleImpl<Index> {};
+
+/*
+ * One node of the recursive inheritance hierarchy. It stores the element at
+ * index 'Index' of a tuple, of type 'HeadT', and inherits from the nodes
+ * that store the remaining elements, of types 'TailT...'.
+ */
+template<std::size_t Index, typename HeadT, typename... TailT>
+struct TupleImpl<Index, HeadT, TailT...>
+  : public TupleImpl<Index + 1, TailT...>
+{
+  typedef TupleImpl<Index + 1, TailT...> Base;
+
+  // Accessors for the head and the tail.
+  // These are static, because the intended usage is for the caller to,
+  // given a tuple, obtain the type B of the base class which stores the
+  // element of interest, and then call B::Head(tuple) to access it.
+  // (Tail() is mostly for internal use, but is exposed for consistency.)
+  static HeadT& Head(TupleImpl& aTuple) { return aTuple.mHead; }
+  static const HeadT& Head(const TupleImpl& aTuple) { return aTuple.mHead; }
+  static Base& Tail(TupleImpl& aTuple) { return aTuple; }
+  static const Base& Tail(const TupleImpl& aTuple) { return aTuple; }
+
+  TupleImpl() : Base(), mHead() { }
+
+  // Construct from const references to the elements.
+  explicit TupleImpl(const HeadT& aHead, const TailT&... aTail)
+    : Base(aTail...), mHead(aHead) { }
+
+  // Construct from objects that are convertible to the elements.
+  // This constructor is enabled only when the argument types are actually
+  // convertible to the element types, otherwise it could become a better
+  // match for certain invocations than the copy constructor.
+  template <typename OtherHeadT, typename... OtherTailT,
+            typename = typename EnableIf<
+                CheckConvertibility<
+                    Group<OtherHeadT, OtherTailT...>,
+                    Group<HeadT, TailT...>>::value>::Type>
+  explicit TupleImpl(OtherHeadT&& aHead, OtherTailT&&... aTail)
+    : Base(Forward<OtherTailT>(aTail)...), mHead(Forward<OtherHeadT>(aHead)) { }
+
+  // Copy and move constructors.
+  // We'd like to use '= default' to implement these, but MSVC 2013's support
+  // for '= default' is incomplete and this doesn't work.
+  TupleImpl(const TupleImpl& aOther)
+    : Base(Tail(aOther))
+    , mHead(Head(aOther)) {}
+  TupleImpl(TupleImpl&& aOther)
+    : Base(Move(Tail(aOther)))
+    , mHead(Move(Head(aOther))) {}
+
+  // Copy and move assignment operators.
+  TupleImpl& operator=(const TupleImpl& aOther)
+  {
+    Head(*this) = Head(aOther);
+    Tail(*this) = Tail(aOther);
+    return *this;
+  }
+  TupleImpl& operator=(TupleImpl&& aOther)
+  {
+    Head(*this) = Move(Head(aOther));
+    Tail(*this) = Move(Tail(aOther));
+    return *this;
+  }
+private:
+  HeadT mHead;  // The element stored at this index in the tuple.
+};
+
+}  // namespace detail
+
+/**
+ * Tuple is a class that stores zero or more objects, whose types are specified
+ * as template parameters. It can be thought of as a generalization of Pair,
+ * (which can be thought of as a 2-tuple).
+ *
+ * Tuple allows index-based access to its elements (with the index having to be
+ * known at compile time) via the non-member function 'Get<N>(tuple)'.
+ */
+template<typename... Elements>
+class Tuple : public detail::TupleImpl<0, Elements...>
+{
+  typedef detail::TupleImpl<0, Elements...> Impl;
+public:
+  // The constructors and assignment operators here are simple wrappers
+  // around those in TupleImpl.
+
+  Tuple() : Impl() { }
+  explicit Tuple(const Elements&... aElements) : Impl(aElements...) { }
+  // Here, we can't just use 'typename... OtherElements' because MSVC will give
+  // a warning "C4520: multiple default constructors specified" (even if no one
+  // actually instantiates the constructor with an empty parameter pack -
+  // that's probably a bug) and we compile with warnings-as-errors.
+  template <typename OtherHead, typename... OtherTail,
+            typename = typename EnableIf<
+                detail::CheckConvertibility<
+                    detail::Group<OtherHead, OtherTail...>,
+                    detail::Group<Elements...>>::value>::Type>
+  explicit Tuple(OtherHead&& aHead, OtherTail&&... aTail)
+    : Impl(Forward<OtherHead>(aHead), Forward<OtherTail>(aTail)...) { }
+  Tuple(const Tuple& aOther) : Impl(aOther) { }
+  Tuple(Tuple&& aOther) : Impl(Move(aOther)) { }
+
+  Tuple& operator=(const Tuple& aOther)
+  {
+    static_cast<Impl&>(*this) = aOther;
+    return *this;
+  }
+  Tuple& operator=(Tuple&& aOther)
+  {
+    static_cast<Impl&>(*this) = Move(aOther);
+    return *this;
+  }
+};
+
+/**
+ * Specialization of Tuple for zero arguments.
+ * This is necessary because if the primary template were instantiated with
+ * an empty parameter pack, the 'Tuple(Elements...)' constructors would
+ * become illegal overloads of the default constructor.
+ */
+template <>
+class Tuple<> {};
+
+namespace detail {
+
+/*
+ * Helper functions for implementing Get<N>(tuple).
+ * These functions take a TupleImpl<Index, Elements...>, with Index being
+ * explicitly specified, and Elements being deduced. By passing a Tuple
+ * object as argument, template argument deduction will do its magic and
+ * cast the tuple to the base class which stores the element at Index.
+ */
+
+// Const reference version.
+template<std::size_t Index, typename... Elements>
+auto TupleGetHelper(TupleImpl<Index, Elements...>& aTuple)
+    -> decltype(TupleImpl<Index, Elements...>::Head(aTuple))
+{
+  return TupleImpl<Index, Elements...>::Head(aTuple);
+}
+
+// Non-const reference version.
+template<std::size_t Index, typename... Elements>
+auto TupleGetHelper(const TupleImpl<Index, Elements...>& aTuple)
+    -> decltype(TupleImpl<Index, Elements...>::Head(aTuple))
+{
+  return TupleImpl<Index, Elements...>::Head(aTuple);
+}
+
+}  // namespace detail
+
+/**
+ * Index-based access to an element of a tuple.
+ * The syntax is Get<Index>(tuple). The index is zero-based.
+ *
+ * Example:
+ *
+ * Tuple<int, float, char> t;
+ * ...
+ * float f = Get<1>(t);
+ */
+
+// Non-const reference version.
+template<std::size_t Index, typename... Elements>
+auto Get(Tuple<Elements...>& aTuple)
+    -> decltype(detail::TupleGetHelper<Index>(aTuple))
+{
+  return detail::TupleGetHelper<Index>(aTuple);
+}
+
+// Const reference version.
+template<std::size_t Index, typename... Elements>
+auto Get(const Tuple<Elements...>& aTuple)
+    -> decltype(detail::TupleGetHelper<Index>(aTuple))
+{
+  return detail::TupleGetHelper<Index>(aTuple);
+}
+
+// Rvalue reference version.
+template<std::size_t Index, typename... Elements>
+auto Get(Tuple<Elements...>&& aTuple)
+    -> decltype(Move(mozilla::Get<Index>(aTuple)))
+{
+  // We need a 'mozilla::' qualification here to avoid
+  // name lookup only finding the current function.
+  return Move(mozilla::Get<Index>(aTuple));
+}
+
+/**
+ * A convenience function for constructing a tuple out of a sequence of
+ * values without specifying the type of the tuple.
+ * The type of the tuple is deduced from the types of its elements.
+ *
+ * Example:
+ *
+ * auto tuple = MakeTuple(42, 0.5f, 'c');  // has type Tuple<int, float, char>
+ */
+template<typename... Elements>
+Tuple<Elements...> MakeTuple(Elements&&... aElements)
+{
+  return Tuple<Elements...>(Forward<Elements>(aElements)...);
+}
+
+} // namespace mozilla
+
+#endif /* mozilla_Tuple_h */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mfbt/TypeTraits.h firefox-trunk-41.0~a1~hg20150524r245419/mfbt/TypeTraits.h
--- firefox-trunk-41.0~a1~hg20150513r243603/mfbt/TypeTraits.h	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mfbt/TypeTraits.h	2015-05-25 20:43:40.000000000 +0000
@@ -755,8 +755,8 @@
 
 /**
  * AddLvalueReference adds an lvalue & reference to T if one isn't already
- * present.  (Note: adding an lvalue reference to an rvalue && reference in
- * essence replaces the && with a &&, per C+11 reference collapsing rules.  For
+ * present. (Note: adding an lvalue reference to an rvalue && reference in
+ * essence replaces the && with a &&, per C+11 reference collapsing rules. For
  * example, int&& would become int&.)
  *
  * The final computed type will only *not* be an lvalue reference if T is void.
@@ -772,6 +772,56 @@
   : detail::AddLvalueReferenceHelper<T>
 {};
 
+namespace detail {
+
+template<typename T, Voidness V = IsVoid<T>::value ? TIsVoid : TIsNotVoid>
+struct AddRvalueReferenceHelper;
+
+template<typename T>
+struct AddRvalueReferenceHelper<T, TIsVoid>
+{
+  typedef void Type;
+};
+
+template<typename T>
+struct AddRvalueReferenceHelper<T, TIsNotVoid>
+{
+  typedef T&& Type;
+};
+
+} // namespace detail
+
+/**
+ * AddRvalueReference adds an rvalue && reference to T if one isn't already
+ * present. (Note: adding an rvalue reference to an lvalue & reference in
+ * essence keeps the &, per C+11 reference collapsing rules. For example,
+ * int& would remain int&.)
+ *
+ * The final computed type will only *not* be a reference if T is void.
+ *
+ * mozilla::AddRvalueReference<int>::Type is int&&;
+ * mozilla::AddRvalueRference<volatile int&>::Type is volatile int&;
+ * mozilla::AddRvalueRference<const int&&>::Type is const int&&;
+ * mozilla::AddRvalueReference<void*>::Type is void*&&;
+ * mozilla::AddRvalueReference<void>::Type is void;
+ * mozilla::AddRvalueReference<struct S&>::Type is struct S&.
+ */
+template<typename T>
+struct AddRvalueReference
+  : detail::AddRvalueReferenceHelper<T>
+{};
+
+/* 20.2.4 Function template declval [declval] */
+
+/**
+ * DeclVal simplifies the definition of expressions which occur as unevaluated
+ * operands. It converts T to a reference type, making it possible to use in
+ * decltype expressions even if T does not have a default constructor, e.g.:
+ * decltype(DeclVal<TWithNoDefaultConstructor>().foo())
+ */
+template<typename T>
+typename AddRvalueReference<T>::Type DeclVal();
+
 /* 20.9.7.3 Sign modifications [meta.trans.sign] */
 
 template<bool B, typename T = void>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/app/mobile.js firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/app/mobile.js
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/app/mobile.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/app/mobile.js	2015-05-25 20:43:40.000000000 +0000
@@ -223,6 +223,9 @@
 pref("extensions.blocklist.url", "https://blocklist.addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/");
 pref("extensions.blocklist.detailsURL", "https://www.mozilla.com/%LOCALE%/blocklist/");
 
+/* Don't let XPIProvider install distribution add-ons; we do our own thing on mobile. */
+pref("extensions.installDistroAddons", false);
+
 /* block popups by default, and notify the user about blocked popups */
 pref("dom.disable_open_during_load", true);
 pref("privacy.popups.showBrowserMessage", true);
@@ -400,7 +403,7 @@
 // When true, zooming will be enabled on all sites, even ones that declare user-scalable=no.
 pref("browser.ui.zoom.force-user-scalable", false);
 
-pref("ui.zoomedview.enabled", false);
+pref("ui.zoomedview.disabled", false);
 pref("ui.zoomedview.limitReadableSize", 8);  // value in layer pixels
 
 pref("ui.touch.radius.enabled", false);
@@ -569,6 +572,9 @@
 pref("media.fragmented-mp4.android-media-codec.enabled", true);
 pref("media.fragmented-mp4.android-media-codec.preferred", true);
 
+// Enable MSE
+pref("media.mediasource.enabled", true);
+
 // optimize images memory usage
 pref("image.downscale-during-decode.enabled", true);
 pref("image.decode-only-on-draw.enabled", true);
@@ -785,7 +791,12 @@
 pref("gfx.canvas.azure.backends", "skia");
 pref("gfx.canvas.azure.accelerated", true);
 
-pref("general.useragent.override.youtube.com", "Android; Tablet;#Android; Mobile;");
+// See ua-update.json.in for the packaged UA override list
+// See Bug 1163759 before setting this to true
+pref("general.useragent.updates.enabled", false);
+pref("general.useragent.updates.url", "https://dynamicua.cdn.mozilla.net/0/%APP_ID%");
+pref("general.useragent.updates.interval", 604800); // 1 week
+pref("general.useragent.updates.retry", 86400); // 1 day
 
 // When true, phone number linkification is enabled.
 pref("browser.ui.linkify.phone", false);
@@ -871,10 +882,30 @@
 // Whether to use the unified telemetry behavior, requires a restart.
 pref("toolkit.telemetry.unified", false);
 
+// Turn off selection caret by default
+pref("selectioncaret.enabled", false);
+
 // Selection carets never fall-back to internal LongTap detector.
 pref("selectioncaret.detects.longtap", false);
 
-// Enable Service workers for Android on non-release builds
-#ifdef NIGHTLY_BUILD
-pref("dom.serviceWorkers.enabled", true);
-#endif
+// Selection carets override caret visibility.
+pref("selectioncaret.visibility.affectscaret", true);
+
+// Selection caret visibility observes composition
+// selections generated by soft keyboard managers.
+pref("selectioncaret.observes.compositions", true);
+
+// Turn off touch caret by default.
+pref("touchcaret.enabled", false);
+
+// TouchCaret never auto-hides.
+pref("touchcaret.expiration.time", 0);
+
+// Touch caret stays visible under a wider range of conditions
+// than the default b2g. We can display the caret in empty editables
+// for example, and do not auto-hide until loss of focus.
+pref("touchcaret.extendedvisibility", true);
+
+// The TouchCaret and the SelectionCarets will indicate when the
+// TextSelection actionbar is to be openned or closed.
+pref("caret.manages-android-actionbar", true);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/app/moz.build firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/app/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/app/moz.build	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/app/moz.build	2015-05-25 20:43:40.000000000 +0000
@@ -17,3 +17,6 @@
     'mobile.js',
 ]
 
+DIST_FILES += [
+  'ua-update.json.in',
+]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/app/ua-update.json.in firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/app/ua-update.json.in
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/app/ua-update.json.in	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/app/ua-update.json.in	2015-05-25 20:43:40.000000000 +0000
@@ -0,0 +1,7 @@
+#filter slashslash
+// Everything after the first // on a line will be removed by the preproccesor.
+// Send these sites a custom user-agent. Bugs should be included with an entry.
+{
+  // bug 788422, youtube.com
+  "youtube.com": "Android; Tablet;#Android; Mobile;"
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/AndroidManifest.xml.in firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/AndroidManifest.xml.in
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/AndroidManifest.xml.in	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/AndroidManifest.xml.in	2015-05-25 20:43:40.000000000 +0000
@@ -105,8 +105,6 @@
         <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
 #endif
 
-        <!-- If the windowSoftInputMode adjust* flag changes below, the
-             setSoftInputMode call in BrowserSearch#onStop must also be updated. -->
         <activity android:name="@MOZ_ANDROID_BROWSER_INTENT_CLASS@"
                   android:label="@string/moz_app_displayname"
                   android:taskAffinity="@ANDROID_PACKAGE_NAME@.BROWSER"
@@ -263,6 +261,8 @@
         <activity android:name="org.mozilla.gecko.tabqueue.TabQueueDispatcher"
                   android:label="@MOZ_APP_DISPLAYNAME@"
                   android:launchMode="singleTask"
+                  android:excludeFromRecents="true"
+                  android:taskAffinity="@ANDROID_PACKAGE_NAME@.TABQUEUE"
                   android:theme="@style/TabQueueActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -287,10 +287,6 @@
         </activity>
 #endif
 
-        <activity android:name="org.mozilla.gecko.StartPane"
-                  android:theme="@style/GeckoStartPane"
-                  android:excludeFromRecents="true"/>
-
         <activity android:name="org.mozilla.gecko.webapp.Dispatcher"
             android:noHistory="true" >
             <intent-filter>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/BrowserApp.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/BrowserApp.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/BrowserApp.java	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/BrowserApp.java	2015-05-25 20:43:40.000000000 +0000
@@ -49,6 +49,7 @@
 import org.mozilla.gecko.preferences.GeckoPreferences;
 import org.mozilla.gecko.prompts.Prompt;
 import org.mozilla.gecko.prompts.PromptListItem;
+import org.mozilla.gecko.sync.repositories.android.FennecTabsRepository;
 import org.mozilla.gecko.sync.setup.SyncAccounts;
 import org.mozilla.gecko.tabqueue.TabQueueHelper;
 import org.mozilla.gecko.tabqueue.TabQueuePrompt;
@@ -784,6 +785,7 @@
             "Menu:Remove",
             "Reader:Share",
             "Sanitize:ClearHistory",
+            "Sanitize:ClearSyncedTabs",
             "Settings:Show",
             "Telemetry:Gather",
             "Updater:Launch");
@@ -914,8 +916,9 @@
         checkFirstrun(this, new SafeIntent(getIntent()));
     }
 
-    private void processTabQueue() {
-        if (AppConstants.NIGHTLY_BUILD && AppConstants.MOZ_ANDROID_TAB_QUEUE) {
+    @Override
+    protected void processTabQueue() {
+        if (AppConstants.NIGHTLY_BUILD && AppConstants.MOZ_ANDROID_TAB_QUEUE && mInitialized) {
             ThreadUtils.postToBackgroundThread(new Runnable() {
                 @Override
                 public void run() {
@@ -927,7 +930,8 @@
         }
     }
 
-    private void openQueuedTabs() {
+    @Override
+    protected void openQueuedTabs() {
         ThreadUtils.assertNotOnUiThread();
 
         int queuedTabCount = TabQueueHelper.getTabQueueLength(BrowserApp.this);
@@ -1346,6 +1350,7 @@
             "Menu:Remove",
             "Reader:Share",
             "Sanitize:ClearHistory",
+            "Sanitize:ClearSyncedTabs",
             "Settings:Show",
             "Telemetry:Gather",
             "Updater:Launch");
@@ -1403,6 +1408,15 @@
         });
     }
 
+    private void handleClearSyncedTabs() {
+        ThreadUtils.postToBackgroundThread(new Runnable() {
+            @Override
+            public void run() {
+                FennecTabsRepository.deleteNonLocalClientsAndTabs(getContext());
+            }
+        });
+    }
+
     private void shareCurrentUrl() {
         Tab tab = Tabs.getInstance().getSelectedTab();
         if (tab == null) {
@@ -1683,6 +1697,9 @@
         } else if ("Sanitize:ClearHistory".equals(event)) {
             handleClearHistory(message.optBoolean("clearSearchHistory", false));
             callback.sendSuccess(true);
+        } else if ("Sanitize:ClearSyncedTabs".equals(event)) {
+            handleClearSyncedTabs();
+            callback.sendSuccess(true);
         } else if ("Settings:Show".equals(event)) {
             final String resource =
                     message.optString(GeckoPreferences.INTENT_EXTRA_RESOURCES, null);
@@ -2632,6 +2649,16 @@
 
         fm.beginTransaction().add(R.id.search_container, mBrowserSearch, BROWSER_SEARCH_TAG).commitAllowingStateLoss();
         mBrowserSearch.setUserVisibleHint(true);
+
+        // We want to adjust the window size when the keyboard appears to bring the
+        // SearchEngineBar above the keyboard. However, adjusting the window size
+        // when hiding the keyboard results in graphical glitches where the keyboard was
+        // because nothing was being drawn underneath (bug 933422). This can be
+        // prevented drawing content under the keyboard (i.e. in the Window).
+        //
+        // We do this here because there are glitches when unlocking a device with
+        // BrowserSearch in the foreground if we use BrowserSearch.onStart/Stop.
+        getActivity().getWindow().setBackgroundDrawableResource(android.R.color.white);
     }
 
     private void hideBrowserSearch() {
@@ -2648,6 +2675,8 @@
         getSupportFragmentManager().beginTransaction()
                 .remove(mBrowserSearch).commitAllowingStateLoss();
         mBrowserSearch.setUserVisibleHint(false);
+
+        getWindow().setBackgroundDrawable(null);
     }
 
     /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/GeckoApp.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/GeckoApp.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/GeckoApp.java	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/GeckoApp.java	2015-05-25 20:43:40.000000000 +0000
@@ -5,24 +5,6 @@
 
 package org.mozilla.gecko;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
 import org.mozilla.gecko.AppConstants.Versions;
 import org.mozilla.gecko.GeckoProfileDirectories.NoMozillaDirectoryException;
 import org.mozilla.gecko.db.BrowserDB;
@@ -112,6 +94,24 @@
 import android.widget.SimpleAdapter;
 import android.widget.TextView;
 import android.widget.Toast;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
 
 public abstract class GeckoApp
     extends GeckoActivity
@@ -204,6 +204,10 @@
 
     abstract protected String getDefaultProfileName() throws NoMozillaDirectoryException;
 
+    protected void processTabQueue() {};
+
+    protected void openQueuedTabs() {};
+
     @SuppressWarnings("serial")
     class SessionRestoreException extends Exception {
         public SessionRestoreException(Exception e) {
@@ -1509,17 +1513,24 @@
             // Restore tabs before opening an external URL so that the new tab
             // is animated properly.
             Tabs.getInstance().notifyListeners(null, Tabs.TabEvents.RESTORED);
-            int flags = Tabs.LOADURL_NEW_TAB | Tabs.LOADURL_USER_ENTERED | Tabs.LOADURL_EXTERNAL;
-            if (ACTION_HOMESCREEN_SHORTCUT.equals(action)) {
-                flags |= Tabs.LOADURL_PINNED;
-            }
-            loadStartupTab(passedUri, intent, flags);
+            processActionViewIntent(new Runnable() {
+                @Override
+                public void run() {
+                    int flags = Tabs.LOADURL_NEW_TAB | Tabs.LOADURL_USER_ENTERED | Tabs.LOADURL_EXTERNAL;
+                    if (ACTION_HOMESCREEN_SHORTCUT.equals(action)) {
+                        flags |= Tabs.LOADURL_PINNED;
+                    }
+                    loadStartupTab(passedUri, intent, flags);
+                }
+            });
         } else {
             if (!mIsRestoringActivity) {
                 loadStartupTabWithAboutHome(Tabs.LOADURL_NEW_TAB);
             }
 
             Tabs.getInstance().notifyListeners(null, Tabs.TabEvents.RESTORED);
+
+            processTabQueue();
         }
 
         // If we're not restoring, move the session file so it can be read for
@@ -1566,8 +1577,6 @@
                     rec.recordJavaStartupTime(javaDuration);
                 }
 
-                UpdateServiceHelper.registerForUpdates(GeckoApp.this);
-
                 // Kick off our background services. We do this by invoking the broadcast
                 // receiver, which uses the system alarm infrastructure to perform tasks at
                 // intervals.
@@ -1578,6 +1587,14 @@
             }
         }, 50);
 
+        final int updateServiceDelay = 30 * 1000;
+        ThreadUtils.getBackgroundHandler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                UpdateServiceHelper.registerForUpdates(GeckoApp.this);
+            }
+        }, updateServiceDelay);
+
         if (mIsRestoringActivity) {
             Tab selectedTab = Tabs.getInstance().getSelectedTab();
             if (selectedTab != null) {
@@ -1598,6 +1615,34 @@
         }
     }
 
+    protected void processActionViewIntent(final Runnable openTabsRunnable) {
+        // We need to ensure that if we receive a VIEW action and there are tabs queued then the
+        // site loaded from the intent is on top (last loaded) and selected with all other tabs
+        // being opened behind it. We process the tab queue first and request a callback from the JS - the
+        // listener will open the url from the intent as normal when the tab queue has been processed.
+        ThreadUtils.postToBackgroundThread(new Runnable() {
+            @Override
+            public void run() {
+                if (AppConstants.NIGHTLY_BUILD && AppConstants.MOZ_ANDROID_TAB_QUEUE
+                                               && TabQueueHelper.shouldOpenTabQueueUrls(GeckoApp.this)) {
+
+                    EventDispatcher.getInstance().registerGeckoThreadListener(new NativeEventListener() {
+                        @Override
+                        public void handleMessage(String event, NativeJSObject message, EventCallback callback) {
+                            if ("Tabs:TabsOpened".equals(event)) {
+                                EventDispatcher.getInstance().unregisterGeckoThreadListener(this, "Tabs:TabsOpened");
+                                openTabsRunnable.run();
+                            }
+                        }
+                    }, "Tabs:TabsOpened");
+                    TabQueueHelper.openQueuedUrls(GeckoApp.this, mProfile, TabQueueHelper.FILE_NAME, true);
+                } else {
+                    openTabsRunnable.run();
+                }
+            }
+        });
+    }
+
     private String restoreSessionTabs(final boolean isExternalURL) throws SessionRestoreException {
         try {
             String sessionString = getProfile().readSessionFile(false);
@@ -1802,36 +1847,13 @@
             String uri = intent.getDataString();
             Tabs.getInstance().loadUrl(uri);
         } else if (Intent.ACTION_VIEW.equals(action)) {
-            // We need to ensure that if we receive a VIEW action and there are tabs queued then the
-            // site loaded from the intent is op top (last loaded) and selected with all other tabs
-            // being opened behind it. We process the tab queue first and request a callback from the JS - the
-            // listener will open the url from the intent as normal when the tab queue has been processed.
-            ThreadUtils.postToBackgroundThread(new Runnable() {
+            processActionViewIntent(new Runnable() {
                 @Override
                 public void run() {
-                    if (AppConstants.NIGHTLY_BUILD && AppConstants.MOZ_ANDROID_TAB_QUEUE
-                                && TabQueueHelper.shouldOpenTabQueueUrls(GeckoApp.this)) {
-
-                        EventDispatcher.getInstance().registerGeckoThreadListener(new NativeEventListener() {
-                            @Override
-                            public void handleMessage(String event, NativeJSObject message, EventCallback callback) {
-                                if ("Tabs:TabsOpened".equals(event)) {
-                                    EventDispatcher.getInstance().unregisterGeckoThreadListener(this, "Tabs:TabsOpened");
-                                    String uri = intent.getDataString();
-                                    Tabs.getInstance().loadUrl(uri, Tabs.LOADURL_NEW_TAB |
-                                                                            Tabs.LOADURL_USER_ENTERED |
-                                                                            Tabs.LOADURL_EXTERNAL);
-                                }
-                            }
-                        }, "Tabs:TabsOpened");
-
-                        TabQueueHelper.openQueuedUrls(GeckoApp.this, mProfile, TabQueueHelper.FILE_NAME, true);
-                    } else {
-                        final String url = intent.getDataString();
-                        Tabs.getInstance().loadUrlWithIntentExtras(url, intent, Tabs.LOADURL_NEW_TAB |
-                                Tabs.LOADURL_USER_ENTERED |
-                                Tabs.LOADURL_EXTERNAL);
-                    }
+                    final String url = intent.getDataString();
+                    Tabs.getInstance().loadUrlWithIntentExtras(url, intent, Tabs.LOADURL_NEW_TAB |
+                                                                                    Tabs.LOADURL_USER_ENTERED |
+                                                                                    Tabs.LOADURL_EXTERNAL);
                 }
             });
         } else if (ACTION_HOMESCREEN_SHORTCUT.equals(action)) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/GeckoAppShell.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/GeckoAppShell.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/GeckoAppShell.java	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/GeckoAppShell.java	2015-05-25 20:43:40.000000000 +0000
@@ -15,6 +15,8 @@
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.net.Proxy;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.ByteBuffer;
@@ -1188,6 +1190,22 @@
         }
 
         final String scheme = uri.getScheme();
+        if ("intent".equals(scheme)) {
+            final Intent intent;
+            try {
+                intent = Intent.parseUri(targetURI, Intent.URI_INTENT_SCHEME);
+            } catch (final URISyntaxException e) {
+                Log.e(LOGTAG, "Unable to parse URI - " + e);
+                return null;
+            }
+
+            // We only handle explicit Intents at the moment (see bug 851693 comment 20).
+            if (intent.getPackage() == null) {
+                return null;
+            }
+
+            return intent;
+        }
 
         // Compute our most likely intent, then check to see if there are any
         // custom handlers that would apply.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/gfx/GeckoLayerClient.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/gfx/GeckoLayerClient.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/gfx/GeckoLayerClient.java	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/gfx/GeckoLayerClient.java	2015-05-25 20:43:42.000000000 +0000
@@ -15,6 +15,7 @@
 import org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI;
 import org.mozilla.gecko.EventDispatcher;
 import org.mozilla.gecko.util.FloatUtils;
+import org.mozilla.gecko.AppConstants;
 
 import android.content.Context;
 import android.graphics.PointF;
@@ -346,6 +347,11 @@
     }
 
     private void adjustViewport(DisplayPortMetrics displayPort) {
+        // TODO: APZ For fennec might need margins information to deal with
+        // the dynamic toolbar.
+        if (AppConstants.MOZ_ANDROID_APZ)
+            return;
+
         ImmutableViewportMetrics metrics = getViewportMetrics();
         ImmutableViewportMetrics clampedMetrics = metrics.clamp();
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/gfx/GLController.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/gfx/GLController.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/gfx/GLController.java	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/gfx/GLController.java	2015-05-25 20:43:42.000000000 +0000
@@ -21,48 +21,6 @@
 import javax.microedition.khronos.egl.EGLSurface;
 
 /**
- * EGLPreloadingThread is purely a preloading optimization, not something
- * we rely on for anything else than performance. We will be initializing
- * EGL in GLController::initEGL() when we need it, but having EGL initialization
- * already previously done by EGLPreloadingThread::run() will make it much
- * faster for GLController to do again.
- *
- * For example, here are some timings recorded on two devices:
- *
- * Device                 | EGLPreloadingThread::run() | GLController::initEGL()
- * -----------------------+----------------------------+------------------------
- * Nexus S (Android 2.3)  | ~ 80 ms                    | < 0.1 ms
- * Nexus 10 (Android 4.3) | ~ 35 ms                    | < 0.1 ms
- */
-class EGLPreloadingThread extends Thread
-{
-    private static final String LOGTAG = "EGLPreloadingThread";
-    private EGL10 mEGL;
-    private EGLDisplay mEGLDisplay;
-
-    public EGLPreloadingThread()
-    {
-    }
-
-    @Override
-    public void run()
-    {
-        mEGL = (EGL10)EGLContext.getEGL();
-        mEGLDisplay = mEGL.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
-        if (mEGLDisplay == EGL10.EGL_NO_DISPLAY) {
-            Log.w(LOGTAG, "Can't get EGL display!");
-            return;
-        }
-
-        int[] returnedVersion = new int[2];
-        if (!mEGL.eglInitialize(mEGLDisplay, returnedVersion)) {
-            Log.w(LOGTAG, "eglInitialize failed");
-            return;
-        }
-    }
-}
-
-/**
  * This class is a singleton that tracks EGL and compositor things over
  * the lifetime of Fennec running.
  * We only ever create one C++ compositor over Fennec's lifetime, but
@@ -89,7 +47,6 @@
     private EGL10 mEGL;
     private EGLDisplay mEGLDisplay;
     private EGLConfig mEGLConfig;
-    private final EGLPreloadingThread mEGLPreloadingThread;
     private EGLSurface mEGLSurfaceForCompositor;
 
     private static final int LOCAL_EGL_OPENGL_ES2_BIT = 4;
@@ -113,12 +70,6 @@
     };
 
     private GLController() {
-        if (AppConstants.Versions.preICS) {
-            mEGLPreloadingThread = new EGLPreloadingThread();
-            mEGLPreloadingThread.start();
-        } else {
-            mEGLPreloadingThread = null;
-        }
     }
 
     static GLController getInstance(LayerView view) {
@@ -211,19 +162,6 @@
             return;
         }
 
-        // This join() should not be necessary, but makes this code a bit easier to think about.
-        // The EGLPreloadingThread should long be done by now, and even if it's not,
-        // it shouldn't be a problem to be initializing EGL from two different threads.
-        // Still, having this join() here means that we don't have to wonder about what
-        // kind of caveats might exist with EGL initialization reentrancy on various drivers.
-        if (mEGLPreloadingThread != null) {
-            try {
-                mEGLPreloadingThread.join();
-            } catch (InterruptedException e) {
-                Log.w(LOGTAG, "EGLPreloadingThread interrupted", e);
-            }
-        }
-
         mEGL = (EGL10)EGLContext.getEGL();
 
         mEGLDisplay = mEGL.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
@@ -232,20 +170,18 @@
             return;
         }
 
-        if (AppConstants.Versions.preICS) {
-            // while calling eglInitialize here should not be necessary as it was already called
-            // by the EGLPreloadingThread, it really doesn't cost much to call it again here,
-            // and makes this code easier to think about: EGLPreloadingThread is only a
-            // preloading optimization, not something we rely on for anything else.
-            //
-            // Also note that while calling eglInitialize isn't necessary on Android 4.x
-            // (at least Android's HardwareRenderer does it for us already), it is necessary
-            // on Android 2.x.
-            int[] returnedVersion = new int[2];
-            if (!mEGL.eglInitialize(mEGLDisplay, returnedVersion)) {
-                Log.w(LOGTAG, "eglInitialize failed");
-                return;
-            }
+        // while calling eglInitialize here should not be necessary as it was already called
+        // by the EGLPreloadingThread, it really doesn't cost much to call it again here,
+        // and makes this code easier to think about: EGLPreloadingThread is only a
+        // preloading optimization, not something we rely on for anything else.
+        //
+        // Also note that while calling eglInitialize isn't necessary on Android 4.x
+        // (at least Android's HardwareRenderer does it for us already), it is necessary
+        // on Android 2.x.
+        int[] returnedVersion = new int[2];
+        if (!mEGL.eglInitialize(mEGLDisplay, returnedVersion)) {
+            Log.w(LOGTAG, "eglInitialize failed");
+            return;
         }
 
         mEGLConfig = chooseConfig();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/home/BrowserSearch.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/home/BrowserSearch.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/home/BrowserSearch.java	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/home/BrowserSearch.java	2015-05-25 20:43:42.000000000 +0000
@@ -65,7 +65,8 @@
  * Fragment that displays frecency search results in a ListView.
  */
 public class BrowserSearch extends HomeFragment
-                           implements GeckoEventListener {
+                           implements GeckoEventListener,
+                                      SearchEngineBar.OnSearchBarClickListener {
 
     @RobocopTarget
     public interface SuggestClientFactory {
@@ -124,6 +125,9 @@
     // The list showing search results
     private HomeListView mList;
 
+    // The bar on the bottom of the screen displaying search engine options.
+    private SearchEngineBar mSearchEngineBar;
+
     // Client that performs search suggestion queries.
     // Public for testing.
     @RobocopTarget
@@ -227,23 +231,6 @@
     }
 
     @Override
-    public void onStart() {
-        super.onStart();
-
-        // Adjusting the window size when showing the keyboard results in the underlying
-        // activity being painted when the keyboard is hidden (bug 933422). This can be
-        // prevented by not resizing the window.
-        getActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-
-        getActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
-    }
-
-    @Override
     public void onResume() {
         super.onResume();
 
@@ -268,6 +255,7 @@
         // If the style of the list changes, inflate it from an XML.
         mView = (LinearLayout) inflater.inflate(R.layout.browser_search, container, false);
         mList = (HomeListView) mView.findViewById(R.id.home_list_view);
+        mSearchEngineBar = (SearchEngineBar) mView.findViewById(R.id.search_engine_bar);
 
         return mView;
     }
@@ -279,6 +267,9 @@
         EventDispatcher.getInstance().unregisterGeckoThreadListener(this,
             "SearchEngines:Data");
 
+        mSearchEngineBar.setAdapter(null);
+        mSearchEngineBar = null;
+
         mList.setAdapter(null);
         mList = null;
 
@@ -350,6 +341,12 @@
         registerForContextMenu(mList);
         EventDispatcher.getInstance().registerGeckoThreadListener(this,
             "SearchEngines:Data");
+
+        // If the view backed by this Fragment is being recreated, we will not receive
+        // a new search engine data event so refresh the new search engine bar's data
+        // & Views with the data we have.
+        mSearchEngineBar.setSearchEngines(mSearchEngines);
+        mSearchEngineBar.setOnSearchBarClickListener(this);
     }
 
     @Override
@@ -587,6 +584,8 @@
                 mAdapter.notifyDataSetChanged();
             }
 
+            mSearchEngineBar.setSearchEngines(mSearchEngines);
+
             // Show suggestions opt-in prompt only if suggestions are not enabled yet,
             // user hasn't been prompted and we're not on a private browsing tab.
             if (!mSuggestionsEnabled && !suggestionsPrompted && mSuggestClient != null) {
@@ -599,6 +598,14 @@
         filterSuggestions();
     }
 
+    @Override
+    public void onSearchBarClickListener(final SearchEngine searchEngine) {
+        Telemetry.sendUIEvent(TelemetryContract.Event.LOAD_URL, TelemetryContract.Method.LIST_ITEM,
+                "searchenginebar");
+
+        mSearchListener.onSearch(searchEngine, mSearchTerm);
+    }
+
     private void maybeSetSuggestClient(final String suggestTemplate, final boolean isPrivate) {
         if (mSuggestClient != null || isPrivate) {
             return;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/home/HomeConfig.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/home/HomeConfig.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/home/HomeConfig.java	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/home/HomeConfig.java	2015-05-25 20:43:42.000000000 +0000
@@ -107,6 +107,7 @@
         private final List<ViewConfig> mViews;
         private final AuthConfig mAuthConfig;
         private final EnumSet<Flags> mFlags;
+        private final int mPosition;
 
         static final String JSON_KEY_TYPE = "type";
         static final String JSON_KEY_TITLE = "title";
@@ -116,6 +117,7 @@
         static final String JSON_KEY_AUTH_CONFIG = "authConfig";
         static final String JSON_KEY_DEFAULT = "default";
         static final String JSON_KEY_DISABLED = "disabled";
+        static final String JSON_KEY_POSITION = "position";
 
         public enum Flags {
             DEFAULT_PANEL,
@@ -171,6 +173,8 @@
                 mFlags.add(Flags.DISABLED_PANEL);
             }
 
+            mPosition = json.optInt(JSON_KEY_POSITION, -1);
+
             validate();
         }
 
@@ -187,6 +191,7 @@
             mAuthConfig = (AuthConfig) in.readParcelable(getClass().getClassLoader());
 
             mFlags = (EnumSet<Flags>) in.readSerializable();
+            mPosition = in.readInt();
 
             validate();
         }
@@ -207,6 +212,7 @@
 
             mAuthConfig = panelConfig.mAuthConfig;
             mFlags = panelConfig.mFlags.clone();
+            mPosition = panelConfig.mPosition;
 
             validate();
         }
@@ -216,11 +222,11 @@
         }
 
         public PanelConfig(PanelType type, String title, String id, EnumSet<Flags> flags) {
-            this(type, title, id, null, null, null, flags);
+            this(type, title, id, null, null, null, flags, -1);
         }
 
         public PanelConfig(PanelType type, String title, String id, LayoutType layoutType,
-                List<ViewConfig> views, AuthConfig authConfig, EnumSet<Flags> flags) {
+                List<ViewConfig> views, AuthConfig authConfig, EnumSet<Flags> flags, int position) {
             mType = type;
             mTitle = title;
             mId = id;
@@ -228,6 +234,7 @@
             mViews = views;
             mAuthConfig = authConfig;
             mFlags = flags;
+            mPosition = position;
 
             validate();
         }
@@ -314,6 +321,10 @@
             return mAuthConfig;
         }
 
+        public int getPosition() {
+            return mPosition;
+        }
+
         public JSONObject toJSON() throws JSONException {
             final JSONObject json = new JSONObject();
 
@@ -350,6 +361,8 @@
                 json.put(JSON_KEY_DISABLED, true);
             }
 
+            json.put(JSON_KEY_POSITION, mPosition);
+
             return json;
         }
 
@@ -390,6 +403,7 @@
             dest.writeTypedList(mViews);
             dest.writeParcelable(mAuthConfig, 0);
             dest.writeSerializable(mFlags);
+            dest.writeInt(mPosition);
         }
 
         public static final Creator<PanelConfig> CREATOR = new Creator<PanelConfig>() {
@@ -1272,7 +1286,13 @@
             final String id = panelConfig.getId();
             if (!mConfigMap.containsKey(id)) {
                 mConfigMap.put(id, panelConfig);
-                mConfigOrder.add(id);
+
+                final int position = panelConfig.getPosition();
+                if (position < 0 || position >= mConfigOrder.size()) {
+                    mConfigOrder.add(id);
+                } else {
+                    mConfigOrder.add(position, id);
+                }
 
                 mEnabledCount++;
                 if (mEnabledCount == 1 || panelConfig.isDefault()) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/home/SearchEngineBar.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/home/SearchEngineBar.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/home/SearchEngineBar.java	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/home/SearchEngineBar.java	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,137 @@
+/* -*- 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.home;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.FrameLayout;
+
+import org.mozilla.gecko.R;
+import org.mozilla.gecko.widget.FaviconView;
+import org.mozilla.gecko.widget.TwoWayView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SearchEngineBar extends TwoWayView
+                             implements AdapterView.OnItemClickListener {
+    private static final String LOGTAG = "Gecko" + SearchEngineBar.class.getSimpleName();
+
+    public interface OnSearchBarClickListener {
+        public void onSearchBarClickListener(SearchEngine searchEngine);
+    }
+
+    private final SearchEngineAdapter adapter;
+    private OnSearchBarClickListener onSearchBarClickListener;
+
+    public SearchEngineBar(final Context context, final AttributeSet attrs) {
+        super(context, attrs);
+
+        adapter = new SearchEngineAdapter();
+        setAdapter(adapter);
+        setOnItemClickListener(this);
+    }
+
+    @Override
+    public void onItemClick(final AdapterView<?> parent, final View view, final int position,
+            final long id) {
+        if (onSearchBarClickListener == null) {
+            throw new IllegalStateException(
+                    OnSearchBarClickListener.class.getSimpleName() + " is not initialized");
+        }
+
+        final SearchEngine searchEngine = adapter.getItem(position);
+        onSearchBarClickListener.onSearchBarClickListener(searchEngine);
+    }
+
+    protected void setOnSearchBarClickListener(final OnSearchBarClickListener listener) {
+        onSearchBarClickListener = listener;
+    }
+
+    protected void setSearchEngines(final List<SearchEngine> searchEngines) {
+        adapter.setSearchEngines(searchEngines);
+    }
+
+    public class SearchEngineAdapter extends BaseAdapter {
+        List<SearchEngine> searchEngines = new ArrayList<>();
+
+        public void setSearchEngines(final List<SearchEngine> searchEngines) {
+            this.searchEngines = searchEngines;
+            notifyDataSetChanged();
+        }
+
+        @Override
+        public int getCount() {
+            return searchEngines.size();
+        }
+
+        @Override
+        public SearchEngine getItem(final int position) {
+            return searchEngines.get(position);
+        }
+
+        @Override
+        public long getItemId(final int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(final int position, final View convertView, final ViewGroup parent) {
+            final View view;
+            if (convertView == null) {
+                view = LayoutInflater.from(getContext()).inflate(R.layout.search_engine_bar_item, parent, false);
+            } else {
+                view = convertView;
+            }
+
+            final FaviconView faviconView = (FaviconView) view.findViewById(R.id.search_engine_icon);
+            final SearchEngine searchEngine = searchEngines.get(position);
+            faviconView.updateAndScaleImage(searchEngine.getIcon(), searchEngine.getEngineIdentifier());
+
+            final View container = view.findViewById(R.id.search_engine_icon_container);
+            final String desc = getResources().getString(R.string.search_bar_item_desc, searchEngine.getEngineIdentifier());
+            container.setContentDescription(desc);
+
+            return view;
+        }
+    }
+
+    /**
+     * A Container to surround the SearchEngineBar. This is necessary so we can draw
+     * a divider across the entire width of the screen, but have the inner list layout
+     * not take up the full width of the screen so it can be centered within this container
+     * if there aren't enough items that it needs to scroll.
+     *
+     * Note: a better implementation would have this View inflating an inner layout so
+     * the containing layout doesn't need two "SearchEngineBar" Views but it wasn't
+     * worth the refactor time.
+     */
+    @SuppressWarnings("unused") // via XML
+    public static class SearchEngineBarContainer extends FrameLayout {
+        private final Paint dividerPaint;
+
+        public SearchEngineBarContainer(final Context context, final AttributeSet attrs) {
+            super(context, attrs);
+
+            dividerPaint = new Paint();
+            dividerPaint.setColor(getResources().getColor(R.color.divider_light));
+        }
+
+        @Override
+        public void onDraw(final Canvas canvas) {
+            super.onDraw(canvas);
+
+            canvas.drawLine(0, 0, getWidth(), 0, dividerPaint);
+        }
+    }
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/locales/en-US/android_strings.dtd firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/locales/en-US/android_strings.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/locales/en-US/android_strings.dtd	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/locales/en-US/android_strings.dtd	2015-05-25 20:43:42.000000000 +0000
@@ -260,6 +260,7 @@
 <!ENTITY pref_private_data_offlineApps "Offline website data">
 <!ENTITY pref_private_data_siteSettings2 "Site settings">
 <!ENTITY pref_private_data_downloadFiles2 "Downloads">
+<!ENTITY pref_private_data_syncedTabs "Synced tabs">
 
 
 <!ENTITY pref_about_firefox "About &brandShortName;">
@@ -379,6 +380,11 @@
 <!ENTITY doorhanger_login_edit_password_hint "Password">
 <!ENTITY doorhanger_login_edit_toggle "Show password">
 <!ENTITY doorhanger_login_edit_toast_error "Failed to save login">
+<!ENTITY doorhanger_login_select_message "Copy password from &formatS;?">
+<!ENTITY doorhanger_login_select_toast_copy "Password copied to clipboard">
+<!ENTITY doorhanger_login_select_toast_copy_error "Couldn\'t copy password">
+<!ENTITY doorhanger_login_select_action_text "Select another login">
+<!ENTITY doorhanger_login_select_title "Copy password from">
 
 <!ENTITY pref_titlebar_mode "Title bar">
 <!ENTITY pref_titlebar_mode_title "Show page title">
@@ -439,6 +445,7 @@
 <!ENTITY button_set "Set">
 <!ENTITY button_clear "Clear">
 <!ENTITY button_remember "Remember">
+<!ENTITY button_copy "Copy">
 
 <!ENTITY firstrun_panel_title_welcome "Welcome">
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/moz.build firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/moz.build	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/moz.build	2015-05-25 20:43:42.000000000 +0000
@@ -340,6 +340,7 @@
     'home/RemoteTabsSplitPlaneFragment.java',
     'home/RemoteTabsStaticFragment.java',
     'home/SearchEngine.java',
+    'home/SearchEngineBar.java',
     'home/SearchEngineRow.java',
     'home/SearchLoader.java',
     'home/SimpleCursorLoader.java',
@@ -518,6 +519,7 @@
     'widget/IconTabWidget.java',
     'widget/LoginDoorHanger.java',
     'widget/ResizablePathDrawable.java',
+    'widget/SiteLogins.java',
     'widget/SquaredImageView.java',
     'widget/SwipeDismissListViewTouchListener.java',
     'widget/TabThumbnailWrapper.java',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/color/pressed_about_page_header_grey.xml firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/color/pressed_about_page_header_grey.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/color/pressed_about_page_header_grey.xml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/color/pressed_about_page_header_grey.xml	2015-05-25 20:43:43.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/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"
+          android:drawable="@color/about_page_header_grey" />
+
+    <item android:drawable="@android:color/transparent"/>
+
+</selector>
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/drawable-hdpi/favicon_search_large.png and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/drawable-hdpi/favicon_search_large.png differ
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/drawable-mdpi/favicon_search_large.png and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/drawable-mdpi/favicon_search_large.png differ
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/drawable-xhdpi/favicon_search_large.png and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/drawable-xhdpi/favicon_search_large.png differ
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/drawable-xxhdpi/favicon_search_large.png and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/drawable-xxhdpi/favicon_search_large.png differ
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/layout/browser_search.xml firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/layout/browser_search.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/layout/browser_search.xml	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/layout/browser_search.xml	2015-05-25 20:43:45.000000000 +0000
@@ -19,4 +19,31 @@
             android:layout_height="0dp"
             android:layout_weight="1" />
 
+    <!-- The window background is set to our desired color, #fff, so
+         reduce overdraw by not drawing the background.
+
+         Note: this needs to be transparent and not null because we
+         draw a divider in onDraw. -->
+    <view class="org.mozilla.gecko.home.SearchEngineBar$SearchEngineBarContainer"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:background="@android:color/transparent">
+
+        <!-- We add a marginTop so the outer container can draw a divider.
+
+             listSelector is too slow for showing pressed state
+             so we set the pressed colors on the child. -->
+        <org.mozilla.gecko.home.SearchEngineBar
+              android:id="@+id/search_engine_bar"
+              android:layout_width="wrap_content"
+              android:layout_height="48dp"
+              android:layout_marginTop="1dp"
+              android:orientation="horizontal"
+              android:layout_gravity="center_horizontal"
+              android:choiceMode="singleChoice"
+              android:listSelector="@android:color/transparent"
+              android:cacheColorHint="@android:color/transparent"/>
+
+   </view>
+
 </LinearLayout>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/layout/gecko_app.xml firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/layout/gecko_app.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/layout/gecko_app.xml	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/layout/gecko_app.xml	2015-05-25 20:43:45.000000000 +0000
@@ -77,7 +77,6 @@
                      android:layout_width="match_parent"
                      android:layout_height="match_parent"
                      android:layout_below="@+id/browser_chrome"
-                     android:background="@android:color/white"
                      android:visibility="invisible"/>
 
         <!-- When focus is cleared from from BrowserToolbar's EditText to
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/layout/login_doorhanger.xml firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/layout/login_doorhanger.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/layout/login_doorhanger.xml	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/layout/login_doorhanger.xml	2015-05-25 20:43:45.000000000 +0000
@@ -35,7 +35,7 @@
                       android:paddingBottom="@dimen/doorhanger_section_padding_large"
                       android:textAppearance="@style/TextAppearance.DoorHanger.Medium"/>
 
-            <TextView android:id="@+id/doorhanger_login"
+            <TextView android:id="@+id/doorhanger_link"
                       android:layout_width="match_parent"
                       android:layout_height="wrap_content"
                       android:textAppearance="@style/TextAppearance.DoorHanger.Medium"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/layout/search_engine_bar_item.xml firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/layout/search_engine_bar_item.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/layout/search_engine_bar_item.xml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/layout/search_engine_bar_item.xml	2015-05-25 20:43:45.000000000 +0000
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- TwoWayView doesn't let us set the margin around items (except as
+     gecko:itemMargin, but that doesn't increase the hit area) so we
+     have to surround the main View by a ViewGroup to create a pressable margin.
+
+     Note: the layout_height values are shared with the parent
+     View (browser_search at the time of this writing). -->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:gecko="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/search_engine_icon_container"
+    android:layout_height="match_parent"
+    android:layout_width="72dp"
+    android:background="@color/pressed_about_page_header_grey">
+
+    <!-- Width & height are set to make the Favicons as sharp as possible
+         based on asset size. -->
+    <org.mozilla.gecko.widget.FaviconView
+        android:id="@+id/search_engine_icon"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_gravity="center"
+        gecko:defaultFaviconDrawable="@drawable/favicon_search_large"
+        gecko:defaultFaviconKey="@string/favicon_search_large_key"/>
+
+</FrameLayout>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/layout/search_engine_row.xml firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/layout/search_engine_row.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/layout/search_engine_row.xml	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/layout/search_engine_row.xml	2015-05-25 20:43:45.000000000 +0000
@@ -3,8 +3,10 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
+    <!-- Remove favicon_search_large_key when landing bug 1158275. -->
     <org.mozilla.gecko.widget.FaviconView android:id="@+id/suggestion_icon"
                                           android:layout_width="@dimen/favicon_bg"
                                           android:layout_height="@dimen/favicon_bg"
@@ -12,7 +14,9 @@
                                           android:layout_marginRight="10dip"
                                           android:layout_centerVertical="true"
                                           android:minWidth="@dimen/favicon_bg"
-                                          android:minHeight="@dimen/favicon_bg"/>
+                                          android:minHeight="@dimen/favicon_bg"
+                                          gecko:defaultFaviconDrawable="@drawable/favicon_search_large"
+                                          gecko:defaultFaviconKey="@string/favicon_search_large_key"/>
 
     <org.mozilla.gecko.widget.FlowLayout android:id="@+id/suggestion_layout"
                                          android:layout_toRightOf="@id/suggestion_icon"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/layout/site_identity_unknown.xml firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/layout/site_identity_unknown.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/layout/site_identity_unknown.xml	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/layout/site_identity_unknown.xml	2015-05-25 20:43:45.000000000 +0000
@@ -12,15 +12,13 @@
 
     <TextView android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:textSize="14sp"
-              android:textColor="@color/placeholder_active_grey"
+              android:textAppearance="@style/TextAppearance.DoorHanger.Medium"
               android:text="@string/identity_no_info"/>
 
     <TextView android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:textSize="14sp"
-              android:textColor="@color/placeholder_active_grey"
+              android:textAppearance="@style/TextAppearance.DoorHanger.Medium"
               android:text="@string/identity_not_encrypted"
-              android:paddingTop="12dip"/>
+              android:paddingTop="@dimen/doorhanger_section_padding_small"/>
 
 </LinearLayout>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/layout/site_identity.xml firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/layout/site_identity.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/layout/site_identity.xml	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/layout/site_identity.xml	2015-05-25 20:43:45.000000000 +0000
@@ -34,47 +34,42 @@
 
                 <TextView android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:textSize="14sp"
-                          android:textColor="@color/placeholder_active_grey"
+                          android:textAppearance="@style/TextAppearance.DoorHanger.Medium.Light"
                           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/placeholder_active_grey"
+                          android:textAppearance="@style/TextAppearance.DoorHanger.Medium"
                           android:textStyle="bold"/>
 
                 <TextView android:id="@+id/owner_label"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:textSize="14sp"
-                          android:textColor="@color/placeholder_active_grey"
+                          android:textAppearance="@style/TextAppearance.DoorHanger.Medium.Light"
                           android:text="@string/identity_run_by"
-                          android:paddingTop="12dip"/>
+                          android:paddingTop="@dimen/doorhanger_section_padding_small"/>
 
                 <TextView android:id="@+id/owner"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:textColor="@color/placeholder_active_grey"
-                          android:textSize="16sp"
+                          android:textAppearance="@style/TextAppearance.DoorHanger.Medium"
                           android:textStyle="bold"/>
 
                 <TextView android:id="@+id/verifier"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:textSize="14sp"
-                          android:textColor="@color/placeholder_active_grey"
-                          android:paddingTop="12dip"/>
+                          android:textAppearance="@style/TextAppearance.DoorHanger.Medium.Light"
+                          android:paddingTop="@dimen/doorhanger_section_padding_small"/>
 
             </LinearLayout>
             <TextView android:id="@+id/site_settings_link"
                       android:layout_width="match_parent"
                       android:layout_height="wrap_content"
-                      android:textAppearance="@style/TextAppearance.DoorHanger.Small"
+                      android:textAppearance="@style/TextAppearance.DoorHanger.Medium"
                       android:textColor="@color/link_blue"
-                      android:paddingTop="@dimen/doorhanger_section_padding_small"
-                      android:paddingBottom="@dimen/doorhanger_section_padding_small"
+                      android:paddingTop="@dimen/doorhanger_section_padding_large"
+                      android:paddingBottom="@dimen/doorhanger_padding"
                       android:text="@string/contextmenu_site_settings"/>
          </LinearLayout>
     </LinearLayout>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/values/arrays.xml firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/values/arrays.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/values/arrays.xml	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/values/arrays.xml	2015-05-25 20:43:46.000000000 +0000
@@ -81,6 +81,7 @@
         <item>@string/pref_private_data_cache</item>
         <item>@string/pref_private_data_offlineApps</item>
         <item>@string/pref_private_data_siteSettings</item>
+        <item>@string/pref_private_data_syncedTabs</item>
     </string-array>
     <string-array name="pref_private_data_defaults">
         <item>true</item>
@@ -92,6 +93,7 @@
         <item>true</item>
         <item>true</item>
         <item>true</item>
+        <item>true</item>
     </string-array>
     <string-array name="pref_private_data_values">
         <item>private.data.history</item>
@@ -103,6 +105,7 @@
         <item>private.data.cache</item>
         <item>private.data.offlineApps</item>
         <item>private.data.siteSettings</item>
+        <item>private.data.syncedTabs</item>
     </string-array>
     <string-array name="pref_private_data_keys">
         <item>private.data.history</item>
@@ -114,11 +117,13 @@
         <item>private.data.cache</item>
         <item>private.data.offlineApps</item>
         <item>private.data.siteSettings</item>
+        <item>private.data.syncedTabs</item>
     </string-array>
     <string-array name="pref_clear_on_exit_defaults">
         <item>false</item>
         <item>false</item>
         <item>false</item>
+        <item>false</item>
         <item>false</item>
         <item>false</item>
         <item>false</item>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/values/attrs.xml firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/values/attrs.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/values/attrs.xml	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/values/attrs.xml	2015-05-25 20:43:46.000000000 +0000
@@ -187,6 +187,8 @@
     <declare-styleable name="FaviconView">
         <attr name="dominantBorderEnabled" format="boolean" />
         <attr name="overrideScaleType" format="boolean" />
+        <attr name="defaultFaviconDrawable" format="reference" />
+        <attr name="defaultFaviconKey" format="string" />
     </declare-styleable>
 
     <declare-styleable name="OverlayDialogButton">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/values/styles.xml firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/values/styles.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/values/styles.xml	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/values/styles.xml	2015-05-25 20:43:46.000000000 +0000
@@ -81,7 +81,7 @@
     </style>
 
     <style name="Widget.GeckoMenuListView" parent="Widget.ListView">
-        <item name="android:divider">#FFC9D3DC</item>
+        <item name="android:divider">@color/divider_light</item>
     </style>
 
     <style name="Widget.MenuItemActionBar">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/values/themes.xml firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/values/themes.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/values/themes.xml	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/values/themes.xml	2015-05-25 20:43:46.000000000 +0000
@@ -104,8 +104,6 @@
         <item name="floatingHintEditTextStyle">@style/FloatingHintEditText</item>
     </style>
 
-    <style name="GeckoStartPane" parent="GeckoBase"/>
-
     <!-- Make an activity appear like an overlay. -->
     <style name="OverlayActivity" parent="Gecko">
         <item name="android:windowBackground">@android:color/transparent</item>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/values-large-v11/themes.xml firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/values-large-v11/themes.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/resources/values-large-v11/themes.xml	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/resources/values-large-v11/themes.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <style name="GeckoStartPane" parent="Gecko.Dialog"/>
-    
-</resources>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/strings.xml.in firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/strings.xml.in
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/strings.xml.in	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/strings.xml.in	2015-05-25 20:43:46.000000000 +0000
@@ -229,6 +229,7 @@
   <string name="pref_private_data_offlineApps">&pref_private_data_offlineApps;</string>
   <string name="pref_private_data_siteSettings">&pref_private_data_siteSettings2;</string>
   <string name="pref_private_data_downloadFiles2">&pref_private_data_downloadFiles2;</string>
+  <string name="pref_private_data_syncedTabs">&pref_private_data_syncedTabs;</string>
   <string name="pref_import_android">&pref_import_android;</string>
   <string name="pref_import_android_summary">&pref_import_android_summary;</string>
   <string name="pref_update_autodownload">&pref_update_autodownload2;</string>
@@ -346,6 +347,11 @@
   <string name="doorhanger_login_edit_password_hint">&doorhanger_login_edit_password_hint;</string>
   <string name="doorhanger_login_edit_toggle">&doorhanger_login_edit_toggle;</string>
   <string name="doorhanger_login_edit_toast_error">&doorhanger_login_edit_toast_error;</string>
+  <string name="doorhanger_login_select_message">&doorhanger_login_select_message;</string>
+  <string name="doorhanger_login_select_toast_copy">&doorhanger_login_select_toast_copy;</string>
+  <string name="doorhanger_login_select_toast_copy_error">&doorhanger_login_select_toast_copy_error;</string>
+  <string name="doorhanger_login_select_action_text">&doorhanger_login_select_action_text;</string>
+  <string name="doorhanger_login_select_title">&doorhanger_login_select_title;</string>
 
   <string name="pref_titlebar_mode">&pref_titlebar_mode;</string>
   <string name="pref_titlebar_mode_title">&pref_titlebar_mode_title;</string>
@@ -375,6 +381,7 @@
   <string name="button_yes">&button_yes;</string>
   <string name="button_no">&button_no;</string>
   <string name="button_remember">&button_remember;</string>
+  <string name="button_copy">&button_copy;</string>
 
   <string name="firstrun_panel_title_welcome">&firstrun_panel_title_welcome;</string>
 
@@ -531,4 +538,6 @@
   <string name="percent">&percent;</string>
 
   <string name="remote_tabs_last_synced">&remote_tabs_last_synced;</string>
+
+  <string name="favicon_search_large_key">DefaultFaviconSearch</string>
 </resources>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/Tab.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/Tab.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/Tab.java	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/Tab.java	2015-05-25 20:43:41.000000000 +0000
@@ -23,6 +23,7 @@
 import org.mozilla.gecko.favicons.RemoteFavicon;
 import org.mozilla.gecko.gfx.BitmapUtils;
 import org.mozilla.gecko.gfx.Layer;
+import org.mozilla.gecko.mozglue.RobocopTarget;
 import org.mozilla.gecko.toolbar.BrowserToolbar.TabEditingState;
 import org.mozilla.gecko.util.ThreadUtils;
 
@@ -36,6 +37,7 @@
 import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
+import org.mozilla.gecko.widget.SiteLogins;
 
 public class Tab {
     private static final String LOGTAG = "GeckoTab";
@@ -57,6 +59,7 @@
     private boolean mHasFeeds;
     private boolean mHasOpenSearch;
     private final SiteIdentity mSiteIdentity;
+    private SiteLogins mSiteLogins;
     private BitmapDrawable mThumbnail;
     private final int mParentId;
     private final boolean mExternal;
@@ -144,6 +147,7 @@
         Tabs.getInstance().notifyListeners(this, Tabs.TabEvents.CLOSED);
     }
 
+    @RobocopTarget
     public int getId() {
         return mId;
     }
@@ -280,6 +284,10 @@
         return mSiteIdentity;
     }
 
+    public SiteLogins getSiteLogins() {
+        return mSiteLogins;
+    }
+
     public boolean isBookmark() {
         return mBookmark;
     }
@@ -494,6 +502,10 @@
         mSiteIdentity.update(identityData);
     }
 
+    public void setSiteLogins(SiteLogins siteLogins) {
+        mSiteLogins = siteLogins;
+    }
+
     void updateBookmark() {
         if (getURL() == null) {
             return;
@@ -691,6 +703,7 @@
         setHasFeeds(false);
         setHasOpenSearch(false);
         mSiteIdentity.reset();
+        setSiteLogins(null);
         setZoomConstraints(new ZoomConstraints(true));
         setHasTouchListeners(false);
         setBackgroundColor(DEFAULT_BACKGROUND_COLOR);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/tabqueue/TabQueueDispatcher.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/tabqueue/TabQueueDispatcher.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/tabqueue/TabQueueDispatcher.java	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/tabqueue/TabQueueDispatcher.java	2015-05-25 20:43:47.000000000 +0000
@@ -11,7 +11,6 @@
 import org.mozilla.gecko.Locales;
 import org.mozilla.gecko.mozglue.ContextUtils;
 import org.mozilla.gecko.preferences.GeckoPreferences;
-import org.mozilla.gecko.sync.setup.activities.WebURLFinder;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -33,17 +32,24 @@
 
         GeckoAppShell.ensureCrashHandling();
 
-        ContextUtils.SafeIntent intent = new ContextUtils.SafeIntent(getIntent());
+        // The EXCLUDE_FROM_RECENTS flag is sticky
+        // (see http://grepcode.com/file/repository.grepcode.com/java/ext/com.google.android/android/5.1.0_r1/com/android/server/am/ActivityRecord.java/#468)
+        // So let's remove this whilst keeping all other flags the same, otherwise BrowserApp will vanish from Recents!
+        Intent intent = getIntent();
+        int flags = intent.getFlags() & ~Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;
+        intent.setFlags(flags);
+
+        ContextUtils.SafeIntent safeIntent = new ContextUtils.SafeIntent(intent);
 
         // For the moment lets exit early and start fennec as normal if we're not in nightly with
         // the tab queue build flag.
         if (!AppConstants.MOZ_ANDROID_TAB_QUEUE || !AppConstants.NIGHTLY_BUILD) {
-            loadNormally(intent.getUnsafe());
+            loadNormally(safeIntent.getUnsafe());
             return;
         }
 
         // The URL is usually hiding somewhere in the extra text. Extract it.
-        final String dataString = intent.getDataString();
+        final String dataString = safeIntent.getDataString();
         if (TextUtils.isEmpty(dataString)) {
             abortDueToNoURL(dataString);
             return;
@@ -52,9 +58,9 @@
         boolean shouldShowOpenInBackgroundToast = GeckoSharedPrefs.forApp(this).getBoolean(GeckoPreferences.PREFS_TAB_QUEUE, false);
 
         if (shouldShowOpenInBackgroundToast) {
-            showToast(intent.getUnsafe());
+            showToast(safeIntent.getUnsafe());
         } else {
-            loadNormally(intent.getUnsafe());
+            loadNormally(safeIntent.getUnsafe());
         }
     }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/tabqueue/TabQueueService.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/tabqueue/TabQueueService.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/tabqueue/TabQueueService.java	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/tabqueue/TabQueueService.java	2015-05-25 20:43:47.000000000 +0000
@@ -202,7 +202,13 @@
     }
 
     private void removeView() {
-        windowManager.removeView(toastLayout);
+        try {
+            windowManager.removeView(toastLayout);
+        } catch (IllegalArgumentException | IllegalStateException e) {
+            // This can happen if the Service is killed by the system.  If this happens the View will have already
+            // been removed but the runnable will have been kept alive.
+            Log.e(LOGTAG, "Error removing Tab Queue toast from service", e);
+        }
     }
 
     private void addURLToTabQueue(final Intent intent, final String filename) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/TextSelection.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/TextSelection.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/TextSelection.java	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/TextSelection.java	2015-05-25 20:43:41.000000000 +0000
@@ -37,6 +37,7 @@
 
 class TextSelection extends Layer implements GeckoEventListener {
     private static final String LOGTAG = "GeckoTextSelection";
+    private static final int SHUTDOWN_DELAY_MS = 250;
 
     private final TextSelectionHandle anchorHandle;
     private final TextSelectionHandle caretHandle;
@@ -91,6 +92,9 @@
             Log.e(LOGTAG, "Failed to initialize text selection because at least one handle is null");
         } else {
             EventDispatcher.getInstance().registerGeckoThreadListener(this,
+                "TextSelection:ActionbarInit",
+                "TextSelection:ActionbarStatus",
+                "TextSelection:ActionbarUninit",
                 "TextSelection:ShowHandles",
                 "TextSelection:HideHandles",
                 "TextSelection:PositionHandles",
@@ -101,6 +105,9 @@
 
     void destroy() {
         EventDispatcher.getInstance().unregisterGeckoThreadListener(this,
+            "TextSelection:ActionbarInit",
+            "TextSelection:ActionbarStatus",
+            "TextSelection:ActionbarUninit",
             "TextSelection:ShowHandles",
             "TextSelection:HideHandles",
             "TextSelection:PositionHandles",
@@ -167,7 +174,7 @@
                         }
 
                         mActionModeTimerTask = new ActionModeTimerTask();
-                        mActionModeTimer.schedule(mActionModeTimerTask, 250);
+                        mActionModeTimer.schedule(mActionModeTimerTask, SHUTDOWN_DELAY_MS);
 
                         anchorHandle.setVisibility(View.GONE);
                         caretHandle.setVisibility(View.GONE);
@@ -185,7 +192,28 @@
                             handle.setVisibility(position.getBoolean("hidden") ? View.GONE : View.VISIBLE);
                             handle.positionFromGecko(left, top, rtl);
                         }
+
+                    } else if (event.equals("TextSelection:ActionbarInit")) {
+                        // Init / Open the action bar. Note the current selectionID,
+                        // cancel any pending actionBar close.
+                        selectionID = message.getString("selectionID");
+                        mCurrentItems = null;
+                        if (mActionModeTimerTask != null) {
+                            mActionModeTimerTask.cancel();
+                        }
+
+                    } else if (event.equals("TextSelection:ActionbarStatus")) {
+                        // Update the actionBar actions as provided by Gecko.
+                        showActionMode(message.getJSONArray("actions"));
+
+                    } else if (event.equals("TextSelection:ActionbarUninit")) {
+                        // Uninit the actionbar. Schedule a cancellable close
+                        // action to avoid UI jank. (During SelectionAll for ex).
+                        mCurrentItems = null;
+                        mActionModeTimerTask = new ActionModeTimerTask();
+                        mActionModeTimer.schedule(mActionModeTimerTask, SHUTDOWN_DELAY_MS);
                     }
+
                 } catch (JSONException e) {
                     Log.e(LOGTAG, "JSON exception", e);
                 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/toolbar/BrowserToolbar.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/toolbar/BrowserToolbar.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/toolbar/BrowserToolbar.java	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/toolbar/BrowserToolbar.java	2015-05-25 20:43:47.000000000 +0000
@@ -854,6 +854,7 @@
 
     public void onDestroy() {
         Tabs.unregisterOnTabsChangedListener(this);
+        urlDisplayLayout.destroy();
     }
 
     public boolean openOptionsMenu() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/toolbar/SiteIdentityPopup.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/toolbar/SiteIdentityPopup.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/toolbar/SiteIdentityPopup.java	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/toolbar/SiteIdentityPopup.java	2015-05-25 20:43:47.000000000 +0000
@@ -4,7 +4,14 @@
 
 package org.mozilla.gecko.toolbar;
 
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.widget.Toast;
+import org.json.JSONException;
+import org.json.JSONArray;
 import org.mozilla.gecko.AboutPages;
+import org.mozilla.gecko.AppConstants;
+import org.mozilla.gecko.EventDispatcher;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoEvent;
@@ -14,6 +21,8 @@
 import org.mozilla.gecko.SiteIdentity.TrackingMode;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
+import org.mozilla.gecko.util.GeckoEventListener;
+import org.mozilla.gecko.util.ThreadUtils;
 import org.mozilla.gecko.widget.AnchoredPopup;
 import org.mozilla.gecko.widget.DoorHanger;
 import org.mozilla.gecko.widget.DoorHanger.OnButtonClickListener;
@@ -27,13 +36,15 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import org.mozilla.gecko.widget.DoorhangerConfig;
+import org.mozilla.gecko.widget.SiteLogins;
 
 /**
  * SiteIdentityPopup is a singleton class that displays site identity data in
  * an arrow panel popup hanging from the lock icon in the browser toolbar.
  */
-public class SiteIdentityPopup extends AnchoredPopup {
-    public static enum ButtonType { DISABLE, ENABLE, KEEP_BLOCKING };
+public class SiteIdentityPopup extends AnchoredPopup implements GeckoEventListener {
+
+    public static enum ButtonType { DISABLE, ENABLE, KEEP_BLOCKING, CANCEL, COPY };
 
     private static final String LOGTAG = "GeckoSiteIdentityPopup";
 
@@ -43,6 +54,9 @@
     private static final String TRACKING_CONTENT_SUPPORT_URL =
         "https://support.mozilla.org/kb/firefox-android-tracking-protection";
 
+    // Placeholder string.
+    private final static String FORMAT_S = "%s";
+
     private SiteIdentity mSiteIdentity;
 
     private LinearLayout mIdentity;
@@ -59,13 +73,15 @@
 
     private DoorHanger mMixedContentNotification;
     private DoorHanger mTrackingContentNotification;
+    private DoorHanger mSelectLoginDoorhanger;
 
-    private final OnButtonClickListener mButtonClickListener;
+    private final OnButtonClickListener mContentButtonClickListener;
 
     public SiteIdentityPopup(Context context) {
         super(context);
 
-        mButtonClickListener = new PopupButtonListener();
+        mContentButtonClickListener = new ContentNotificationButtonListener();
+        EventDispatcher.getInstance().registerGeckoThreadListener(this, "Doorhanger:Logins");
     }
 
     @Override
@@ -114,6 +130,133 @@
         }
     }
 
+    @Override
+    public void handleMessage(String event, JSONObject geckoObject) {
+        if ("Doorhanger:Logins".equals(event)) {
+            try {
+                final Tab selectedTab = Tabs.getInstance().getSelectedTab();
+                if (selectedTab != null) {
+                    final JSONObject data = geckoObject.getJSONObject("data");
+                    addLoginsToTab(data);
+                }
+                if (isShowing()) {
+                    addSelectLoginDoorhanger(selectedTab);
+                }
+            } catch (JSONException e) {
+                Log.e(LOGTAG, "Error accessing logins in Doorhanger:Logins message", e);
+            }
+        }
+    }
+
+    private void addLoginsToTab(JSONObject data) throws JSONException {
+        final JSONObject titleObj = data.getJSONObject("title");
+        final JSONArray logins = data.getJSONArray("logins");
+
+        final SiteLogins siteLogins = new SiteLogins(titleObj, logins);
+        Tabs.getInstance().getSelectedTab().setSiteLogins(siteLogins);
+    }
+
+    private void addSelectLoginDoorhanger(Tab tab) throws JSONException {
+        final SiteLogins siteLogins = tab.getSiteLogins();
+        if (siteLogins == null) {
+            return;
+        }
+
+        final JSONArray logins = siteLogins.getLogins();
+        if (logins.length() == 0) {
+            return;
+        }
+
+        final JSONObject login = (JSONObject) logins.get(0);
+
+        // Create button click listener for copying a password to the clipboard.
+        final OnButtonClickListener buttonClickListener = new OnButtonClickListener() {
+            @Override
+            public void onButtonClick(JSONObject response, DoorHanger doorhanger) {
+                try {
+                    final int buttonId = response.getInt("callback");
+                    if (buttonId == ButtonType.COPY.ordinal()) {
+                        final ClipboardManager manager = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
+                        String password;
+                        if (response.has("password")) {
+                            // Click listener being called from List Dialog.
+                            password = response.optString("password");
+                        } else {
+                            password = login.getString("password");
+                        }
+                        if (AppConstants.Versions.feature11Plus) {
+                            manager.setPrimaryClip(ClipData.newPlainText("password", password));
+                        } else {
+                            manager.setText(password);
+                        }
+                        Toast.makeText(mContext, R.string.doorhanger_login_select_toast_copy, Toast.LENGTH_SHORT).show();
+                    }
+                    dismiss();
+                } catch (JSONException e) {
+                    Log.e(LOGTAG, "Error handling Select login button click", e);
+                    Toast.makeText(mContext, R.string.doorhanger_login_select_toast_copy_error, Toast.LENGTH_SHORT).show();
+                }
+            }
+        };
+
+        final DoorhangerConfig config = new DoorhangerConfig(DoorHanger.Type.LOGIN, buttonClickListener);
+
+        // Set buttons.
+        config.appendButton(mContext.getString(R.string.button_cancel), ButtonType.CANCEL.ordinal());
+        config.appendButton(mContext.getString(R.string.button_copy), ButtonType.COPY.ordinal());
+
+        // Set message.
+        String username = ((JSONObject) logins.get(0)).getString("username");
+        if (TextUtils.isEmpty(username)) {
+            username = mContext.getString(R.string.doorhanger_login_no_username);
+        }
+
+        final String message = mContext.getString(R.string.doorhanger_login_select_message).replace(FORMAT_S, username);
+        config.setMessage(message);
+
+        // Set options.
+        final JSONObject options = new JSONObject();
+        final JSONObject titleObj = siteLogins.getTitle();
+        options.put("title", titleObj);
+
+        // Add action text only if there are other logins to select.
+        if (logins.length() > 1) {
+
+            final JSONObject actionText = new JSONObject();
+            actionText.put("type", "SELECT");
+
+            final JSONObject bundle = new JSONObject();
+            bundle.put("logins", logins);
+
+            actionText.put("bundle", bundle);
+            options.put("actionText", actionText);
+        }
+
+        config.setOptions(options);
+
+        ThreadUtils.postToUiThread(new Runnable() {
+            @Override
+            public void run() {
+                if (!mInflated) {
+                    init();
+                }
+
+                removeSelectLoginDoorhanger();
+
+                mSelectLoginDoorhanger = DoorHanger.Get(mContext, config);
+                mContent.addView(mSelectLoginDoorhanger);
+                mDivider.setVisibility(View.VISIBLE);
+            }
+        });
+    }
+
+    private void removeSelectLoginDoorhanger() {
+        if (mSelectLoginDoorhanger != null) {
+            mContent.removeView(mSelectLoginDoorhanger);
+            mSelectLoginDoorhanger = null;
+        }
+    }
+
     private void toggleIdentityKnownContainerVisibility(final boolean isIdentityKnown) {
         if (isIdentityKnown) {
             mIdentityKnownContainer.setVisibility(View.VISIBLE);
@@ -152,7 +295,7 @@
         // Remove any existing mixed content notification.
         removeMixedContentNotification();
 
-        final DoorhangerConfig config = new DoorhangerConfig(DoorHanger.Type.MIXED_CONTENT, mButtonClickListener);
+        final DoorhangerConfig config = new DoorhangerConfig(DoorHanger.Type.MIXED_CONTENT, mContentButtonClickListener);
         int icon;
         if (blocked) {
             icon = R.drawable.shield_enabled_doorhanger;
@@ -169,7 +312,6 @@
         mMixedContentNotification = DoorHanger.Get(mContext, config);
         mMixedContentNotification.setIcon(icon);
 
-
         mContent.addView(mMixedContentNotification);
         mDivider.setVisibility(View.VISIBLE);
     }
@@ -185,7 +327,7 @@
         // Remove any existing tracking content notification.
         removeTrackingContentNotification();
 
-        final DoorhangerConfig config = new DoorhangerConfig(DoorHanger.Type.TRACKING, mButtonClickListener);
+        final DoorhangerConfig config = new DoorhangerConfig(DoorHanger.Type.TRACKING, mContentButtonClickListener);
 
         int icon;
         if (blocked) {
@@ -260,6 +402,12 @@
             addTrackingContentNotification(trackingMode == TrackingMode.TRACKING_CONTENT_BLOCKED);
         }
 
+        try {
+            addSelectLoginDoorhanger(selectedTab);
+        } catch (JSONException e) {
+            Log.e(LOGTAG, "Error adding selectLogin doorhanger", e);
+        }
+
         showDividers();
 
         super.show();
@@ -289,15 +437,20 @@
         }
     }
 
+    void destroy() {
+        EventDispatcher.getInstance().unregisterGeckoThreadListener(this, "Doorhanger:Logins");
+    }
+
     @Override
     public void dismiss() {
         super.dismiss();
         removeMixedContentNotification();
         removeTrackingContentNotification();
+        removeSelectLoginDoorhanger();
         mDivider.setVisibility(View.GONE);
     }
 
-    private class PopupButtonListener implements OnButtonClickListener {
+    private class ContentNotificationButtonListener implements OnButtonClickListener {
         @Override
         public void onButtonClick(JSONObject response, DoorHanger doorhanger) {
             GeckoEvent e = GeckoEvent.createBroadcastEvent("Session:Reload", response.toString());
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/toolbar/ToolbarDisplayLayout.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/toolbar/ToolbarDisplayLayout.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/toolbar/ToolbarDisplayLayout.java	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/toolbar/ToolbarDisplayLayout.java	2015-05-25 20:43:47.000000000 +0000
@@ -616,4 +616,8 @@
 
         return false;
     }
+
+    void destroy() {
+        mSiteIdentityPopup.destroy();
+    }
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/toolbar/ToolbarEditText.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/toolbar/ToolbarEditText.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/toolbar/ToolbarEditText.java	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/toolbar/ToolbarEditText.java	2015-05-25 20:43:47.000000000 +0000
@@ -723,6 +723,8 @@
         @Override
         public boolean onTouch(View v, MotionEvent event) {
             boolean tapped;
+            final int action = event.getActionMasked();
+
             switch (mVoiceSearchIconIndex) {
                 case 0:
                     tapped = event.getX() < (getPaddingLeft() + mVoiceSearchIcon.getIntrinsicWidth());
@@ -733,7 +735,7 @@
                 default:
                     tapped = false;
             }
-            if (tapped) {
+            if (tapped && (action == MotionEvent.ACTION_DOWN)) {
                 launchVoiceRecognizer();
             }
             return tapped;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/widget/DefaultDoorHanger.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/widget/DefaultDoorHanger.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/widget/DefaultDoorHanger.java	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/widget/DefaultDoorHanger.java	2015-05-25 20:43:47.000000000 +0000
@@ -6,7 +6,6 @@
 package org.mozilla.gecko.widget;
 
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.widget.Button;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.prompts.PromptInput;
@@ -112,11 +111,8 @@
     }
 
     @Override
-    protected Button createButtonInstance(final String text, final int id) {
-        final Button button = (Button) LayoutInflater.from(getContext()).inflate(R.layout.doorhanger_button, null);
-        button.setText(text);
-
-        button.setOnClickListener(new Button.OnClickListener() {
+    protected OnClickListener makeOnButtonClickListener(final int id) {
+        return new Button.OnClickListener() {
             @Override
             public void onClick(View v) {
                 final JSONObject response = new JSONObject();
@@ -149,14 +145,13 @@
                                 response.put("inputs", inputs);
                             }
                     }
-                    mOnButtonClickListener.onButtonClick(response, DefaultDoorHanger.this);
                 } catch (JSONException e) {
                     Log.e(LOGTAG, "Error creating onClick response", e);
                 }
-            }
-        });
 
-        return button;
+                mOnButtonClickListener.onButtonClick(response, DefaultDoorHanger.this);
+            }
+        };
     }
 
     private void styleInput(PromptInput input, View view) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/widget/DoorHanger.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/widget/DoorHanger.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/widget/DoorHanger.java	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/widget/DoorHanger.java	2015-05-25 20:43:47.000000000 +0000
@@ -100,11 +100,6 @@
         mIcon = (ImageView) findViewById(R.id.doorhanger_icon);
         mMessage = (TextView) findViewById(R.id.doorhanger_message);
 
-        // TODO: Bug 1149359 - split this into DoorHanger subclasses.
-        if (type == Type.TRACKING || type == Type.MIXED_CONTENT) {
-            mMessage.setTextAppearance(getContext(), R.style.TextAppearance_DoorHanger_Small);
-        }
-
         mType = type;
 
         mButtonsContainer = (LinearLayout) findViewById(R.id.doorhanger_buttons);
@@ -132,7 +127,6 @@
 
     protected void setButtons(DoorhangerConfig config) {
         final JSONArray buttons = config.getButtons();
-        final OnButtonClickListener listener = config.getButtonClickListener();
         for (int i = 0; i < buttons.length(); i++) {
             try {
                 final JSONObject buttonObject = buttons.getJSONObject(i);
@@ -214,7 +208,14 @@
         mButtonsContainer.addView(button, sButtonParams);
     }
 
-    protected abstract Button createButtonInstance(String text, int id);
+    protected Button createButtonInstance(String text, int id) {
+        final Button button = (Button) LayoutInflater.from(getContext()).inflate(R.layout.doorhanger_button, null);
+        button.setText(text);
+        button.setOnClickListener(makeOnButtonClickListener(id));
+        return button;
+    }
+
+    protected abstract OnClickListener makeOnButtonClickListener(final int id);
 
     /*
      * Checks with persistence and timeout options to see if it's okay to remove a doorhanger.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/widget/FaviconView.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/widget/FaviconView.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/widget/FaviconView.java	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/widget/FaviconView.java	2015-05-25 20:43:47.000000000 +0000
@@ -11,6 +11,7 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.RectF;
@@ -20,8 +21,20 @@
  * Special version of ImageView for favicons.
  * Displays solid colour background around Favicon to fill space not occupied by the icon. Colour
  * selected is the dominant colour of the provided Favicon.
+ *
+ * The default favicon can be overridden by both passing a drawable to the
+ * gecko:defaultFaviconDrawable and a String to gecko:defaultFaviconKey. The String should be a
+ * unique identifier to each image - it is automatically namespaced by prepending the class name to
+ * the given value.
  */
 public class FaviconView extends ImageView {
+    // These values will be used unless overridden by the gecko:defaultFavicon* attributes (see class comment).
+    private static String DEFAULT_FAVICON_KEY = "DefaultFavicon";
+    private static int DEFAULT_FAVICON_RES_ID = R.drawable.favicon_globe;
+
+    private int defaultFaviconDrawableId;
+    private String defaultFaviconKey;
+
     private Bitmap mIconBitmap;
 
     // Reference to the unscaled bitmap, if any, to prevent repeated assignments of the same bitmap
@@ -79,10 +92,15 @@
         try {
             isDominantBorderEnabled = a.getBoolean(R.styleable.FaviconView_dominantBorderEnabled, true);
             isOverrideScaleTypeEnabled = a.getBoolean(R.styleable.FaviconView_overrideScaleType, true);
+
+            defaultFaviconDrawableId = a.getResourceId(R.styleable.FaviconView_defaultFaviconDrawable, -1);
+            defaultFaviconKey = a.getString(R.styleable.FaviconView_defaultFaviconKey);
         } finally {
             a.recycle();
         }
 
+        validateAndAdjustDefaultFavicon();
+
         if (isOverrideScaleTypeEnabled) {
             setScaleType(ImageView.ScaleType.CENTER);
         }
@@ -99,6 +117,26 @@
         mBackgroundRect.left = mBackgroundRect.top = sStrokeWidth * 2.0f;
     }
 
+    private void validateAndAdjustDefaultFavicon() {
+        if ((defaultFaviconDrawableId < 0 && defaultFaviconKey != null) ||
+                (defaultFaviconDrawableId >= 0 && defaultFaviconKey == null)) {
+            throw new IllegalStateException("defaultFaviconDrawable and defaultFaviconKey both " +
+                    "either need to be specified or omitted");
+        }
+
+        if (DEFAULT_FAVICON_KEY.equals(defaultFaviconKey)) {
+            throw new IllegalStateException("defaultFaviconKey cannot be " + DEFAULT_FAVICON_KEY);
+        }
+
+        if (defaultFaviconDrawableId < 0) { // key == null too
+            defaultFaviconDrawableId = DEFAULT_FAVICON_RES_ID;
+            defaultFaviconKey = DEFAULT_FAVICON_KEY;
+        }
+
+        // Avoid potential collisions in the favicon cache keys.
+        defaultFaviconKey = FaviconView.class.getSimpleName() + defaultFaviconKey;
+    }
+
     @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh){
         super.onSizeChanged(w, h, oldw, oldh);
@@ -139,7 +177,7 @@
      * in this view with the coloured background.
      */
     private void formatImage() {
-        // If we're called before bitmap is set, or before size is set, show blank.
+        // We're waiting for both onSizeChanged and updateImage to be called before scaling.
         if (mIconBitmap == null || mActualWidth == 0 || mActualHeight == 0) {
             showNoImage();
             return;
@@ -214,8 +252,12 @@
     }
 
     public void showDefaultFavicon() {
-        setImageResource(R.drawable.favicon_globe);
-        mDominantColor = 0;
+        // We handle the default favicon as any other favicon to avoid the complications of special
+        // casing it. This means that the icon can be scaled both up and down, and the dominant
+        // color box can used if it is enabled in XML attrs.
+        final Bitmap defaultFaviconBitmap = BitmapFactory.decodeResource(getResources(),
+                defaultFaviconDrawableId);
+        updateAndScaleImage(defaultFaviconBitmap, defaultFaviconKey);
     }
 
     private void showNoImage() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/widget/LoginDoorHanger.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/widget/LoginDoorHanger.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/widget/LoginDoorHanger.java	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/widget/LoginDoorHanger.java	2015-05-25 20:43:47.000000000 +0000
@@ -7,6 +7,8 @@
 
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.Bitmap;
@@ -24,23 +26,26 @@
 import ch.boye.httpclientandroidlib.util.TextUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.json.JSONArray;
+import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.favicons.Favicons;
 import org.mozilla.gecko.favicons.OnFaviconLoadedListener;
+import org.mozilla.gecko.toolbar.SiteIdentityPopup;
 
 public class LoginDoorHanger extends DoorHanger {
     private static final String LOGTAG = "LoginDoorHanger";
-    private enum ActionType { EDIT };
+    private enum ActionType { EDIT, SELECT }
 
     private final TextView mTitle;
-    private final TextView mLogin;
+    private final TextView mLink;
     private int mCallbackID;
 
     public LoginDoorHanger(Context context, DoorhangerConfig config) {
         super(context, config, Type.LOGIN);
 
         mTitle = (TextView) findViewById(R.id.doorhanger_title);
-        mLogin = (TextView) findViewById(R.id.doorhanger_login);
+        mLink = (TextView) findViewById(R.id.doorhanger_link);
 
         loadConfig(config);
     }
@@ -88,11 +93,12 @@
     protected Button createButtonInstance(final String text, final int id) {
         // HACK: Confirm button will the the rightmost/last button added. Bug 1147064 should add differentiation of the two.
         mCallbackID = id;
+        return super.createButtonInstance(text, id);
+    }
 
-        final Button button = (Button) LayoutInflater.from(getContext()).inflate(R.layout.doorhanger_button, null);
-        button.setText(text);
-
-        button.setOnClickListener(new Button.OnClickListener() {
+    @Override
+    protected OnClickListener makeOnButtonClickListener(final int id) {
+        return new Button.OnClickListener() {
             @Override
             public void onClick(View v) {
                 final JSONObject response = new JSONObject();
@@ -103,9 +109,7 @@
                 }
                 mOnButtonClickListener.onButtonClick(response, LoginDoorHanger.this);
             }
-        });
-
-        return button;
+        };
     }
 
     /**
@@ -117,19 +121,10 @@
      */
     private void addActionText(JSONObject actionTextObj) {
         if (actionTextObj == null) {
-            mLogin.setVisibility(View.GONE);
+            mLink.setVisibility(View.GONE);
             return;
         }
 
-        boolean hasUsername = true;
-        String text = actionTextObj.optString("text");
-        if (TextUtils.isEmpty(text)) {
-            hasUsername = false;
-            text = mResources.getString(R.string.doorhanger_login_no_username);
-        }
-        mLogin.setText(text);
-        mLogin.setVisibility(View.VISIBLE);
-
         // Make action.
         try {
             final JSONObject bundle = actionTextObj.getJSONObject("bundle");
@@ -182,10 +177,60 @@
                             dialog.dismiss();
                         }
                     });
+                    String text = actionTextObj.optString("text");
+                    if (TextUtils.isEmpty(text)) {
+                        text = mResources.getString(R.string.doorhanger_login_no_username);
+                    }
+                    mLink.setText(text);
+                    mLink.setVisibility(View.VISIBLE);
+                    break;
+
+                case SELECT:
+                    try {
+                        builder.setTitle(mResources.getString(R.string.doorhanger_login_select_title));
+                        final JSONArray logins = bundle.getJSONArray("logins");
+                        final int numLogins = logins.length();
+                        final CharSequence[] usernames = new CharSequence[numLogins];
+                        final String[] passwords = new String[numLogins];
+                        final String noUser = mResources.getString(R.string.doorhanger_login_no_username);
+                        for (int i = 0; i < numLogins; i++) {
+                            final JSONObject login = (JSONObject) logins.get(i);
+                            String user = login.getString("username");
+                            if (TextUtils.isEmpty(user)) {
+                                user = noUser;
+                            }
+                            usernames[i] = user;
+                            passwords[i] = login.getString("password");
+                        }
+                        builder.setItems(usernames, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                final JSONObject response = new JSONObject();
+                                try {
+                                    response.put("callback", SiteIdentityPopup.ButtonType.COPY.ordinal());
+                                    response.put("password", passwords[which]);
+                                } catch (JSONException e) {
+                                    Log.e(LOGTAG, "Error making login select dialog JSON", e);
+                                }
+                                mOnButtonClickListener.onButtonClick(response, LoginDoorHanger.this);
+                            }
+                        });
+                        builder.setNegativeButton(R.string.button_cancel, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                dialog.dismiss();
+                            }
+                        });
+                        mLink.setText(R.string.doorhanger_login_select_action_text);
+                        mLink.setVisibility(View.VISIBLE);
+                    } catch (JSONException e) {
+                        Log.e(LOGTAG, "Problem creating list of logins");
+                    }
+                    break;
             }
 
             final Dialog dialog = builder.create();
-            mLogin.setOnClickListener(new OnClickListener() {
+            mLink.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
                     dialog.show();
@@ -193,11 +238,7 @@
             });
 
         } catch (JSONException e) {
-            // Log an error, but leave the text visible if there was a username.
             Log.e(LOGTAG, "Error fetching actionText from JSON", e);
-            if (!hasUsername) {
-                mLogin.setVisibility(View.GONE);
-            }
         }
     }
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/widget/SiteLogins.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/widget/SiteLogins.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/base/widget/SiteLogins.java	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/base/widget/SiteLogins.java	2015-05-25 20:43:47.000000000 +0000
@@ -0,0 +1,22 @@
+package org.mozilla.gecko.widget;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+public class SiteLogins {
+    private final JSONObject titleObj;
+    private final JSONArray logins;
+
+    public SiteLogins(JSONObject titleObj, JSONArray logins) {
+        this.logins = logins;
+        this.titleObj = titleObj;
+    }
+
+    public JSONArray getLogins() {
+        return logins;
+    }
+
+    public JSONObject getTitle() {
+        return titleObj;
+    }
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/chrome/content/ActionBarHandler.js firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/chrome/content/ActionBarHandler.js
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/chrome/content/ActionBarHandler.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/chrome/content/ActionBarHandler.js	2015-05-25 20:43:48.000000000 +0000
@@ -0,0 +1,638 @@
+// -*- 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";
+
+// Notifications we observe.
+const NOTIFICATIONS = [
+    "ActionBar:UpdateState",
+    "TextSelection:Action",
+    "TextSelection:End",
+];
+
+const DEFER_INIT_DELAY_MS = 50; // Delay period before _init() begins.
+const PHONE_REGEX = /^\+?[0-9\s,-.\(\)*#pw]{1,30}$/; // Are we a phone #?
+
+
+/**
+ * ActionBarHandler Object and methods. Interface between Gecko Text Selection code
+ * (TouchCaret, SelectionCarets, etc) and the Mobile ActionBar UI.
+ */
+var ActionBarHandler = {
+  // Error codes returned from _init().
+  START_TOUCH_ERROR: {
+    NO_CONTENT_WINDOW: "No valid content Window found.",
+    NONE: "",
+  },
+
+  _selectionID: null, // Unique Selection ID, assigned each time we _init().
+  _actionBarActions: null, // Most-recent set of actions sent to ActionBar.
+
+  /**
+   * ActionBarHandler notification observers.
+   */
+  observe: function(subject, topic, data) {
+    switch (topic) {
+
+      // Gecko opens the ActionBarHandler.
+      case "ActionBar:OpenNew": {
+        // Always close, then re-open.
+        this._uninit(false);
+        this._init(data);
+        break;
+      }
+
+      // Gecko closes the ActionBarHandler.
+      case "ActionBar:Close": {
+        if (this._selectionID === data) {
+          this._uninit(false);
+        }
+        break;
+      }
+
+      // Update ActionBar when text selection changes.
+      case "ActionBar:UpdateState": {
+        this._sendActionBarActions();
+        break;
+      }
+
+      // User click an ActionBar button.
+      case "TextSelection:Action": {
+        for (let type in this.actions) {
+          let action = this.actions[type];
+          if (action.id == data) {
+            action.action(this._targetElement, this._contentWindow);
+            break;
+          }
+        }
+        break;
+      }
+
+      // Provide selected text to FindInPageBar on request.
+      case "TextSelection:Get": {
+        Messaging.sendRequest({
+          type: "TextSelection:Data",
+          requestId: data,
+          text: this._getSelectedText(),
+        });
+        break;
+      }
+
+      // User closed ActionBar by clicking "checkmark" button.
+      case "TextSelection:End": {
+        // End the requested selection only.
+        if (this._selectionID === JSON.parse(data).selectionID) {
+          this._uninit();
+        }
+        break;
+      }
+    }
+  },
+
+  /**
+   * Called when Gecko TouchCaret or SelectionCarets become visible.
+   */
+  _init: function(actionBarID) {
+    let [element, win] = this._getSelectionTargets();
+    if (!win) {
+      return this.START_TOUCH_ERROR.NO_CONTENT_WINDOW;
+    }
+
+    // Hold the ActionBar ID provided by Gecko.
+    this._selectionID = actionBarID;
+    [this._targetElement, this._contentWindow] = [element, win];
+
+    // Add notification observers.
+    NOTIFICATIONS.forEach(notification => {
+      Services.obs.addObserver(this, notification, false);
+    });
+
+    // Open the ActionBar, send it's initial actions list.
+    Messaging.sendRequest({
+      type: "TextSelection:ActionbarInit",
+      selectionID: this._selectionID,
+    });
+    this._sendActionBarActions(true);
+
+    return this.START_TOUCH_ERROR.NONE;
+  },
+
+  /**
+   * Determines the window containing the selection, and its
+   * editable element if present.
+   */
+  _getSelectionTargets: function() {
+    let [element, win] = [Services.focus.focusedElement, Services.focus.focusedWindow];
+    if (!element) {
+      // No focused editable.
+      return [null, win];
+    }
+
+    // Return focused editable text element and its window.
+    if (((element instanceof HTMLInputElement) && element.mozIsTextField(false)) ||
+        (element instanceof HTMLTextAreaElement) ||
+        element.isContentEditable) {
+      return [element, win];
+    }
+
+    // Focused element can't contain text.
+    return [null, win];
+  },
+
+  /**
+   * Called when Gecko TouchCaret or SelectionCarets become hidden,
+   * ActionBar is closed by user "close" request, or as a result of object
+   * methods such as SELECT_ALL, PASTE, etc.
+   */
+  _uninit: function(clearSelection = true) {
+    // Bail if there's no active selection.
+    if (!this._selectionID) {
+      return;
+    }
+
+    // Remove notification observers.
+    NOTIFICATIONS.forEach(notification => {
+      Services.obs.removeObserver(this, notification);
+    });
+
+    // Close the ActionBar.
+    Messaging.sendRequest({
+      type: "TextSelection:ActionbarUninit",
+    });
+
+    // Clear the selection ID to complete the uninit(), but leave our reference
+    // to selectionTargets (_targetElement, _contentWindow) in case we need
+    // a final clearSelection().
+    this._selectionID = null;
+
+    // Clear selection required if triggered by self, or TextSelection icon
+    // actions. If called by Gecko TouchCaret/SelectionCarets state change,
+    // visibility state is already correct.
+    if (clearSelection) {
+      this._clearSelection();
+    }
+  },
+
+  /**
+   * Final UI cleanup when Actionbar is closed by icon click, or where
+   * we terminate selection state after before/after actionbar actions
+   * (Cut, Copy, Paste, Search, Share, Call).
+   */
+  _clearSelection: function(element = this._targetElement, win = this._contentWindow) {
+    // Commit edit compositions, and clear focus from editables.
+    if (element) {
+      let imeSupport = this._getEditor(element, win).QueryInterface(Ci.nsIEditorIMESupport);
+      if (imeSupport.composing) {
+        imeSupport.forceCompositionEnd();
+      }
+      element.blur();
+    }
+
+    // Remove Selection from non-editables and now-unfocused contentEditables.
+    if (!element || element.isContentEditable) {
+      this._getSelection().removeAllRanges();
+    }
+  },
+
+  /**
+   * Called to determine current ActionBar actions and send to TextSelection
+   * handler. By default we only send if current action state differs from
+   * the previous.
+   * @param By default we only send an ActionBarStatus update message if
+   *        there is a change from the previous state. sendAlways can be
+   *        set by init() for example, where we want to always send the
+   *        current state.
+   */
+  _sendActionBarActions: function(sendAlways) {
+    let actions = this._getActionBarActions();
+
+    if (sendAlways || actions !== this._actionBarActions) {
+      Messaging.sendRequest({
+        type: "TextSelection:ActionbarStatus",
+        actions: actions,
+      });
+    }
+
+    this._actionBarActions = actions;
+  },
+
+  /**
+   * Determine and return current ActionBar state.
+   */
+  _getActionBarActions: function(element = this._targetElement, win = this._contentWindow) {
+    let actions = [];
+
+    for (let type in this.actions) {
+      let action = this.actions[type];
+      if (action.selector.matches(element, win)) {
+        let a = {
+          id: action.id,
+          label: this._getActionValue(action, "label", "", element),
+          icon: this._getActionValue(action, "icon", "drawable://ic_status_logo", element),
+          order: this._getActionValue(action, "order", 0, element),
+          showAsAction: this._getActionValue(action, "showAsAction", true, element),
+        };
+        actions.push(a);
+      }
+    }
+    actions.sort((a, b) => b.order - a.order);
+
+    return actions;
+  },
+
+  /**
+   * Provides a value from an action. If the action defines the value as a function,
+   * we return the result of calling the function. Otherwise, we return the value
+   * itself. If the value isn't defined for this action, will return a default.
+   */
+  _getActionValue: function(obj, name, defaultValue, element) {
+    if (!(name in obj))
+      return defaultValue;
+
+    if (typeof obj[name] == "function")
+      return obj[name](element);
+
+    return obj[name];
+  },
+
+  /**
+   * Actionbar callback methods.
+   */
+  actions: {
+
+    SELECT_ALL: {
+      id: "selectall_action",
+      label: Strings.browser.GetStringFromName("contextmenu.selectAll"),
+      icon: "drawable://ab_select_all",
+      order: 5,
+
+      selector: {
+        matches: function(element, win) {
+          // For editable, check its length. For default contentWindow, assume
+          // true, else there'd been nothing to long-press to open ActionBar.
+          return (element) ? element.textLength != 0 : true;
+        },
+      },
+
+      action: function(element, win) {
+        // Some Mobile keyboards such as SwiftKeyboard, provide auto-suggest
+        // style highlights via composition selections in editables.
+        if (element) {
+          // If we have an active composition string, commit it, and 
+          // ensure proper element focus.
+          let imeSupport = ActionBarHandler._getEditor(element, win).
+            QueryInterface(Ci.nsIEditorIMESupport);
+          if (imeSupport.composing) {
+            element.blur();
+            element.focus();
+          }
+        }
+
+        // Close ActionBarHandler, then selectAll, and display handles.
+        ActionBarHandler._getSelectAllController(element, win).selectAll();
+        ActionBarHandler._getSelectionController(element, win).
+          selectionCaretsVisibility = true;
+
+        UITelemetry.addEvent("action.1", "actionbar", null, "select_all");
+      },
+    },
+
+    CUT: {
+      id: "cut_action",
+      label: Strings.browser.GetStringFromName("contextmenu.cut"),
+      icon: "drawable://ab_cut",
+      order: 4,
+
+      selector: {
+        matches: function(element, win) {
+          // Can't cut from non-editable.
+          if (!element) {
+            return false;
+          }
+          // Don't allow "cut" from password fields.
+          if (element instanceof Ci.nsIDOMHTMLInputElement &&
+              !element.mozIsTextField(true)) {
+            return false;
+          }
+          // Don't allow "cut" from disabled/readonly fields.
+          if (element.disabled || element.readOnly) {
+            return false;
+          }
+          // Allow if selected text exists.
+          return (ActionBarHandler._getSelectedText().length > 0);
+        },
+      },
+
+      action: function(element, win) {
+        // First copy the selection text to the clipboard.
+        let selectedText = ActionBarHandler._getSelectedText();
+        let clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].
+          getService(Ci.nsIClipboardHelper);
+        clipboard.copyString(selectedText);
+
+        let msg = Strings.browser.GetStringFromName("selectionHelper.textCopied");
+        NativeWindow.toast.show(msg, "short");
+
+        // Then cut the selection text.
+        ActionBarHandler._getSelection(element, win).deleteFromDocument();
+
+        ActionBarHandler._uninit();
+        UITelemetry.addEvent("action.1", "actionbar", null, "cut");
+      },
+    },
+
+    COPY: {
+      id: "copy_action",
+      label: Strings.browser.GetStringFromName("contextmenu.copy"),
+      icon: "drawable://ab_copy",
+      order: 3,
+
+      selector: {
+        matches: function(element, win) {
+          // Don't allow "copy" from password fields.
+          if (element instanceof Ci.nsIDOMHTMLInputElement &&
+              !element.mozIsTextField(true)) {
+            return false;
+          }
+          // Allow if selected text exists.
+          return (ActionBarHandler._getSelectedText().length > 0);
+        },
+      },
+
+      action: function(element, win) {
+        let selectedText = ActionBarHandler._getSelectedText();
+        let clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].
+          getService(Ci.nsIClipboardHelper);
+        clipboard.copyString(selectedText);
+
+        let msg = Strings.browser.GetStringFromName("selectionHelper.textCopied");
+        NativeWindow.toast.show(msg, "short");
+
+        ActionBarHandler._uninit();
+        UITelemetry.addEvent("action.1", "actionbar", null, "copy");
+      },
+    },
+
+    PASTE: {
+      id: "paste_action",
+      label: Strings.browser.GetStringFromName("contextmenu.paste"),
+      icon: "drawable://ab_paste",
+      order: 2,
+
+      selector: {
+        matches: function(element, win) {
+          // Can't paste into non-editable.
+          if (!element) {
+            return false;
+          }
+          // Can't paste into disabled/readonly fields.
+          if (element.disabled || element.readOnly) {
+            return false;
+          }
+          // Can't paste if Clipboard empty.
+          let flavors = ["text/unicode"];
+          return Services.clipboard.hasDataMatchingFlavors(flavors, flavors.length,
+            Ci.nsIClipboard.kGlobalClipboard);
+        },
+      },
+
+      action: function(element, win) {
+        // Paste the clipboard, then close the ActionBarHandler and ActionBar.
+        ActionBarHandler._getEditor(element, win).
+          paste(Ci.nsIClipboard.kGlobalClipboard);
+        ActionBarHandler._uninit();
+        UITelemetry.addEvent("action.1", "actionbar", null, "paste");
+      },
+    },
+
+    CALL: {
+      id: "call_action",
+      label: Strings.browser.GetStringFromName("contextmenu.call"),
+      icon: "drawable://phone",
+      order: 1,
+
+      selector: {
+        matches: function(element, win) {
+          return (ActionBarHandler._getSelectedPhoneNumber() != null);
+        },
+      },
+
+      action: function(element, win) {
+        BrowserApp.loadURI("tel:" +
+          ActionBarHandler._getSelectedPhoneNumber());
+
+        ActionBarHandler._uninit();
+        UITelemetry.addEvent("action.1", "actionbar", null, "call");
+      },
+    },
+
+    SEARCH: {
+      id: "search_action",
+      label: Strings.browser.formatStringFromName("contextmenu.search",
+        [Services.search.defaultEngine.name], 1),
+      icon: "drawable://ab_search",
+      order: 1,
+
+      selector: {
+        matches: function(element, win) {
+          // Allow if selected text exists.
+          return (ActionBarHandler._getSelectedText().length > 0);
+        },  
+      },
+
+      action: function(element, win) {
+        let selectedText = ActionBarHandler._getSelectedText();
+        ActionBarHandler._uninit();
+
+        // Set current tab as parent of new tab,
+        // and set new tab as private if the parent is.
+        let searchSubmission = Services.search.defaultEngine.getSubmission(selectedText);
+        let parent = BrowserApp.selectedTab;
+        let isPrivate = PrivateBrowsingUtils.isBrowserPrivate(parent.browser);
+        BrowserApp.addTab(searchSubmission.uri.spec,
+          { parentId: parent.id,
+            selected: true,
+            isPrivate: isPrivate,
+          }
+        );
+
+        UITelemetry.addEvent("action.1", "actionbar", null, "search");
+      },
+    },
+
+    SEARCH_ADD: {
+      id: "search_add_action",
+      label: Strings.browser.GetStringFromName("contextmenu.addSearchEngine2"),
+      icon: "drawable://ab_add_search_engine",
+      order: 0,
+
+      selector: {
+        matches: function(element, win) {
+          if(!(element instanceof HTMLInputElement)) {
+            return false;
+          }
+          let form = element.form;
+          if (!form || element.type == "password") {
+            return false;
+          }
+          let method = form.method.toUpperCase();
+          return (method == "GET" || method == "") ||
+                 (form.enctype != "text/plain") && (form.enctype != "multipart/form-data");
+        },
+      },
+
+      action: function(element, win) {
+        UITelemetry.addEvent("action.1", "actionbar", null, "add_search_engine");
+        SearchEngines.addEngine(element);
+      },
+    },
+
+    SHARE: {
+      id: "share_action",
+      label: Strings.browser.GetStringFromName("contextmenu.share"),
+      icon: "drawable://ic_menu_share",
+      order: 0,
+
+      selector: {
+        matches: function(element, win) {
+          if (!ParentalControls.isAllowed(ParentalControls.SHARE)) {
+            return false;
+          }
+          // Allow if selected text exists.
+          return (ActionBarHandler._getSelectedText().length > 0);
+        },
+      },
+
+      action: function(element, win) {
+        Messaging.sendRequest({
+          type: "Share:Text",
+          text: ActionBarHandler._getSelectedText(),
+        });
+
+        ActionBarHandler._uninit();
+        UITelemetry.addEvent("action.1", "actionbar", null, "share");
+      },
+    },
+  },
+
+  /**
+   * Provides UUID service for generating action ID's.
+   */
+  get _idService() {
+    delete this._idService;
+    return this._idService = Cc["@mozilla.org/uuid-generator;1"].
+      getService(Ci.nsIUUIDGenerator);
+  },
+
+  /**
+   * The targetElement holds an editable element containing a
+   * selection or a caret.
+   */
+  get _targetElement() {
+    if (this._targetElementRef)
+      return this._targetElementRef.get();
+    return null;
+  },
+
+  set _targetElement(element) {
+    this._targetElementRef = Cu.getWeakReference(element);
+  },
+
+  /**
+   * The contentWindow holds the selection, or the targetElement
+   * if it's an editable.
+   */
+  get _contentWindow() {
+    if (this._contentWindowRef)
+      return this._contentWindowRef.get();
+    return null;
+  },
+
+  set _contentWindow(aContentWindow) {
+    this._contentWindowRef = Cu.getWeakReference(aContentWindow);
+  },
+
+  /**
+   * Provides the currently selected text, for either an editable,
+   * or for the default contentWindow.
+   */
+  _getSelectedText: function() {
+    // Can be called from FindInPageBar "TextSelection:Get", when there
+    // is no active selection.
+    if (!this._selectionID) {
+      return "";
+    }
+
+    let selection = this._getSelection();
+
+    // Textarea can contain LF, etc.
+    if (this._targetElement instanceof Ci.nsIDOMHTMLTextAreaElement) {
+      let flags = Ci.nsIDocumentEncoder.OutputPreformatted |
+        Ci.nsIDocumentEncoder.OutputRaw;
+      return selection.QueryInterface(Ci.nsISelectionPrivate).
+        toStringWithFormat("text/plain", flags, 0);
+    }
+
+    // Selection text gets trimmed up.
+    return selection.toString().trim();
+  },
+
+  /**
+   * Provides the nsISelection for either an editor, or from the
+   * default window.
+   */
+  _getSelection: function(element = this._targetElement, win = this._contentWindow) {
+    return (element instanceof Ci.nsIDOMNSEditableElement) ?
+      this._getEditor(element).selection :
+      win.getSelection();
+  },
+
+  /**
+   * Returns an nsEditor or nsHTMLEditor.
+   */
+  _getEditor: function(element = this._targetElement, win = this._contentWindow) {
+    if (element instanceof Ci.nsIDOMNSEditableElement) {
+      return element.QueryInterface(Ci.nsIDOMNSEditableElement).editor;
+    }
+
+    return win.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIWebNavigation).
+               QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIEditingSession).
+               getEditorForWindow(win);
+  },
+
+  /**
+   * Returns a selection controller.
+   */
+  _getSelectionController: function(element = this._targetElement, win = this._contentWindow) {
+    if (element instanceof Ci.nsIDOMNSEditableElement) {
+      return this._getEditor(element, win).selectionController;
+    }
+
+    return win.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIWebNavigation).
+               QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsISelectionDisplay).
+               QueryInterface(Ci.nsISelectionController);
+  },
+
+  /**
+   * For selectAll(), provides the editor, or the default window selection Controller.
+   */
+  _getSelectAllController: function(element = this._targetElement, win = this._contentWindow) {
+    let editor = this._getEditor(element, win);
+    return (editor) ?
+      editor : this._getSelectionController(element, win);
+  },
+
+  /**
+   * Call / Phone Helper methods.
+   */
+  _getSelectedPhoneNumber: function() {
+    let selectedText = this._getSelectedText().trim();
+    return this._isPhoneNumber(selectedText) ?
+      selectedText : null;
+  },
+
+  _isPhoneNumber: function(selectedText) {
+    return (PHONE_REGEX.test(selectedText));
+  },
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/chrome/content/browser.js firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/chrome/content/browser.js
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/chrome/content/browser.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/chrome/content/browser.js	2015-05-25 20:43:48.000000000 +0000
@@ -154,6 +154,12 @@
   ["EmbedRT", ["GeckoView:ImportScript"], "chrome://browser/content/EmbedRT.js"],
   ["Reader", ["Reader:FetchContent", "Reader:Added", "Reader:Removed"], "chrome://browser/content/Reader.js"],
 ];
+if (AppConstants.NIGHTLY_BUILD) {
+  lazilyLoadedObserverScripts.push(
+    ["ActionBarHandler", ["ActionBar:OpenNew", "ActionBar:Close", "TextSelection:Get"],
+      "chrome://browser/content/ActionBarHandler.js"]
+  );
+}
 if (AppConstants.MOZ_WEBRTC) {
   lazilyLoadedObserverScripts.push(
     ["WebrtcUI", ["getUserMedia:request", "recording-device-events"], "chrome://browser/content/WebrtcUI.js"])
@@ -4218,12 +4224,22 @@
           // Update the page action to show the "reader active" icon.
           Reader.updatePageAction(this);
         }
-
         break;
       }
 
       case "DOMFormHasPassword": {
-        LoginManagerContent.onFormPassword(aEvent);
+        LoginManagerContent.onDOMFormHasPassword(aEvent,
+                                                 this.browser.contentWindow);
+
+        // Send logins for this hostname to Java.
+        let hostname = aEvent.target.baseURIObject.prePath;
+        let foundLogins = Services.logins.findLogins({}, hostname, "", "");
+        if (foundLogins.length > 0) {
+          let displayHost = IdentityHandler.getEffectiveHost();
+          let title = { text: displayHost, resource: hostname };
+          let selectObj = { title: title, logins: foundLogins };
+          Messaging.sendRequest({ type: "Doorhanger:Logins", data: selectObj });
+        }
         break;
       }
 
@@ -4365,7 +4381,9 @@
       }
 
       case "pageshow": {
-        // only send pageshow for the top-level document
+        LoginManagerContent.onPageShow(aEvent, this.browser.contentWindow);
+
+        // The rest of this only handles pageshow for the top-level document.
         if (aEvent.originalTarget.defaultView != this.browser.contentWindow)
           return;
 
@@ -4777,6 +4795,18 @@
     let oldBrowserWidth = this.browserWidth;
     this.setBrowserSize(viewportW, viewportH);
 
+    // if this page has not been painted yet, then this must be getting run
+    // because a meta-viewport element was added (via the DOMMetaAdded handler).
+    // in this case, we should not do anything that forces a reflow (see bug 759678)
+    // such as requesting the page size or sending a viewport update. this code
+    // will get run again in the before-first-paint handler and that point we
+    // will run though all of it. the reason we even bother executing up to this
+    // point on the DOMMetaAdded handler is so that scripts that use window.innerWidth
+    // before they are painted have a correct value (bug 771575).
+    if (!this.contentDocumentIsDisplayed) {
+      return;
+    }
+
     // This change to the zoom accounts for all types of changes I can conceive:
     // 1. screen size changes, CSS viewport does not (pages with no meta viewport
     //    or a fixed size viewport)
@@ -4797,18 +4827,6 @@
     this.setResolution(zoom, false);
     this.setScrollClampingSize(zoom);
 
-    // if this page has not been painted yet, then this must be getting run
-    // because a meta-viewport element was added (via the DOMMetaAdded handler).
-    // in this case, we should not do anything that forces a reflow (see bug 759678)
-    // such as requesting the page size or sending a viewport update. this code
-    // will get run again in the before-first-paint handler and that point we
-    // will run though all of it. the reason we even bother executing up to this
-    // point on the DOMMetaAdded handler is so that scripts that use window.innerWidth
-    // before they are painted have a correct value (bug 771575).
-    if (!this.contentDocumentIsDisplayed) {
-      return;
-    }
-
     this.viewportExcludesHorizontalMargins = true;
     this.viewportExcludesVerticalMargins = true;
     let minScale = 1.0;
@@ -5843,9 +5861,10 @@
   // aCallback(array_of_suggestions) is called when results are available.
   _getAutoCompleteSuggestions: function _getAutoCompleteSuggestions(aSearchString, aElement, aCallback) {
     // Cache the form autocomplete service for future use
-    if (!this._formAutoCompleteService)
-      this._formAutoCompleteService = Cc["@mozilla.org/satchel/form-autocomplete;1"].
-                                      getService(Ci.nsIFormAutoComplete);
+    if (!this._formAutoCompleteService) {
+      this._formAutoCompleteService = Cc["@mozilla.org/satchel/form-autocomplete;1"]
+          .getService(Ci.nsIFormAutoComplete);
+    }
 
     let resultsAvailable = function (results) {
       let suggestions = [];
@@ -6247,6 +6266,12 @@
   },
 
   onInstallEnded: function(aInstall, aAddon) {
+    // Don't create a notification for distribution add-ons.
+    if (Distribution.pendingAddonInstalls.has(aInstall)) {
+      Distribution.pendingAddonInstalls.delete(aInstall);
+      return;
+    }
+
     let needsRestart = false;
     if (aInstall.existingAddon && (aInstall.existingAddon.pendingOperations & AddonManager.PENDING_UPGRADE))
       needsRestart = true;
@@ -6271,6 +6296,13 @@
   },
 
   onInstallFailed: function(aInstall) {
+    // Don't create a notification for distribution add-ons.
+    if (Distribution.pendingAddonInstalls.has(aInstall)) {
+      Cu.reportError("Error installing distribution add-on: " + aInstall.addon.id);
+      Distribution.pendingAddonInstalls.delete(aInstall);
+      return;
+    }
+
     NativeWindow.toast.show(Strings.browser.GetStringFromName("alertAddonsFail"), "short");
   },
 
@@ -6359,7 +6391,7 @@
         let document = target.ownerDocument;
         let browser = BrowserApp.getBrowserForDocument(document);
         let tab = BrowserApp.getTabForBrowser(browser);
-        if (tab && tab.contentDocumentIsDisplayed)
+        if (tab)
           this.updateMetadata(tab, false);
         break;
     }
@@ -7680,6 +7712,7 @@
       case "Distribution:Set":
         // Reload the default prefs so we can observe "prefservice:after-app-defaults"
         Services.prefs.QueryInterface(Ci.nsIObserver).observe(null, "reload-default-prefs", null);
+        this.installDistroAddons();
         break;
 
       case "prefservice:after-app-defaults":
@@ -7802,7 +7835,61 @@
         Cu.reportError("Distribution: Could not read from " + aFile.leafName + " file");
       }
     });
-  }
+  },
+
+  // Track pending installs so we can avoid showing notifications for them.
+  pendingAddonInstalls: new Set(),
+
+  installDistroAddons: Task.async(function* () {
+    const PREF_ADDONS_INSTALLED = "distribution.addonsInstalled";
+    try {
+      let installed = Services.prefs.getBoolPref(PREF_ADDONS_INSTALLED);
+      if (installed) {
+        return;
+      }
+    } catch (e) {
+      Services.prefs.setBoolPref(PREF_ADDONS_INSTALLED, true);
+    }
+
+    let distroPath;
+    try {
+      distroPath = FileUtils.getDir("XREAppDist", ["extensions"]).path;
+
+      let info = yield OS.File.stat(distroPath);
+      if (!info.isDir) {
+        return;
+      }
+    } catch (e) {
+      return;
+    }
+
+    let it = new OS.File.DirectoryIterator(distroPath);
+    try {
+      yield it.forEach(entry => {
+        // Only support extensions that are zipped in .xpi files.
+        if (entry.isDir || !entry.name.endsWith(".xpi")) {
+          dump("Ignoring distribution add-on that isn't an XPI: " + entry.path);
+          return;
+        }
+
+        new Promise((resolve, reject) => {
+          AddonManager.getInstallForFile(new FileUtils.File(entry.path), resolve);
+        }).then(install => {
+          let id = entry.name.substring(0, entry.name.length - 4);
+          if (install.addon.id !== id) {
+            Cu.reportError("File entry " + entry.path + " contains an add-on with an incorrect ID");
+            return;
+          }
+          this.pendingAddonInstalls.add(install);
+          install.install();
+        }).catch(e => {
+          Cu.reportError("Error installing distribution add-on: " + entry.path + ": " + e);
+        });
+      });
+    } finally {
+      it.close();
+    }
+  })
 };
 
 var Tabs = {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/chrome/content/content.js firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/chrome/content/content.js
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/chrome/content/content.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/chrome/content/content.js	2015-05-25 20:43:48.000000000 +0000
@@ -10,6 +10,7 @@
 
 XPCOMUtils.defineLazyModuleGetter(this, "AboutReader", "resource://gre/modules/AboutReader.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "ReaderMode", "resource://gre/modules/ReaderMode.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "LoginManagerContent", "resource://gre/modules/LoginManagerContent.jsm");
 
 let dump = Cu.import("resource://gre/modules/AndroidLog.jsm", {}).AndroidLog.d.bind(null, "Content");
 
@@ -87,3 +88,7 @@
   }
 };
 AboutReaderListener.init();
+
+addMessageListener("RemoteLogins:fillForm", function(message) {
+  LoginManagerContent.receiveMessage(message, content);
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/chrome/content/SelectionHandler.js firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/chrome/content/SelectionHandler.js
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/chrome/content/SelectionHandler.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/chrome/content/SelectionHandler.js	2015-05-25 20:43:48.000000000 +0000
@@ -8,6 +8,10 @@
 const PHONE_NUMBER_CONTAINERS = "td,div";
 const DEFER_CLOSE_TRIGGER_MS = 125; // Grace period delay before deferred _closeSelection()
 
+// Gecko TouchCaret/SelectionCaret pref names.
+const PREF_GECKO_TOUCHCARET_ENABLED = "touchcaret.enabled";
+const PREF_GECKO_SELECTIONCARETS_ENABLED = "selectioncaret.enabled";
+
 var SelectionHandler = {
 
   // Successful startSelection() or attachCaret().
@@ -21,9 +25,11 @@
   START_ERROR_SELECT_ALL_PARAGRAPH_FAILED: "Select-All Paragraph failed.",
   START_ERROR_NO_SELECTION: "Selection performed, but nothing resulted.",
   START_ERROR_PROXIMITY: "Selection target and result seem unrelated.",
+  START_ERROR_SELECTIONCARETS_ENABLED: "Native selectionCarets requested while Gecko enabled.",
 
   // Error codes returned during attachCaret().
   ATTACH_ERROR_INCOMPATIBLE: "Element disabled, handled natively, or not editable.",
+  ATTACH_ERROR_TOUCHCARET_ENABLED: "Native touchCaret requested while Gecko enabled.",
 
   HANDLE_TYPE_ANCHOR: "ANCHOR",
   HANDLE_TYPE_CARET: "CARET",
@@ -36,6 +42,10 @@
   SELECT_ALL: 0,
   SELECT_AT_POINT: 1,
 
+  // Gecko TouchCaret/SelectionCaret pref values.
+  _touchCaretEnabledValue: null,
+  _selectionCaretEnabledValue: null,
+
   // Keeps track of data about the dimensions of the selection. Coordinates
   // stored here are relative to the _contentWindow window.
   _cache: { anchorPt: {}, focusPt: {} },
@@ -91,6 +101,30 @@
       getService(Ci.nsIUUIDGenerator);
   },
 
+  // Are we supporting Gecko or Native touchCarets?
+  get _touchCaretEnabled() {
+    if (this._touchCaretEnabledValue == null) {
+      this._touchCaretEnabledValue = Services.prefs.getBoolPref(PREF_GECKO_TOUCHCARET_ENABLED);
+      Services.prefs.addObserver(PREF_GECKO_TOUCHCARET_ENABLED, function() {
+        SelectionHandler._touchCaretEnabledValue =
+          Services.prefs.getBoolPref(PREF_GECKO_TOUCHCARET_ENABLED);
+      }, false);
+    }
+    return this._touchCaretEnabledValue;
+  },
+
+  // Are we supporting Gecko or Native selectionCarets?
+  get _selectionCaretEnabled() {
+    if (this._selectionCaretEnabledValue == null) {
+      this._selectionCaretEnabledValue = Services.prefs.getBoolPref(PREF_GECKO_SELECTIONCARETS_ENABLED);
+      Services.prefs.addObserver(PREF_GECKO_SELECTIONCARETS_ENABLED, function() {
+        SelectionHandler._selectionCaretEnabledValue =
+          Services.prefs.getBoolPref(PREF_GECKO_SELECTIONCARETS_ENABLED);
+      }, false);
+    }
+    return this._selectionCaretEnabledValue;
+  },
+
   _addObservers: function sh_addObservers() {
     Services.obs.addObserver(this, "Gesture:SingleTap", false);
     Services.obs.addObserver(this, "Tab:Selected", false);
@@ -378,6 +412,11 @@
    *                   y    - The y-coordinate for SELECT_AT_POINT.
    */
   startSelection: function sh_startSelection(aElement, aOptions = { mode: SelectionHandler.SELECT_ALL }) {
+    // Disable Native touchCarets if Gecko enabled.
+    if (this._selectionCaretEnabled) {
+      return this.START_ERROR_SELECTIONCARETS_ENABLED;
+    }
+
     // Clear out any existing active selection
     this._closeSelection();
 
@@ -837,6 +876,11 @@
    * @param aX, aY tap location in client coordinates.
    */
   attachCaret: function sh_attachCaret(aElement) {
+    // Disable Native attachCaret() if Gecko touchCarets are enabled.
+    if (this._touchCaretEnabled) {
+      return this.ATTACH_ERROR_TOUCHCARET_ENABLED;
+    }
+
     // Clear out any existing active selection
     this._closeSelection();
 
@@ -1054,7 +1098,7 @@
     let selectedText = this._getSelectedText();
     if (selectedText.length) {
       let clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].getService(Ci.nsIClipboardHelper);
-      clipboard.copyString(selectedText, this._contentWindow.document);
+      clipboard.copyString(selectedText);
       NativeWindow.toast.show(Strings.browser.GetStringFromName("selectionHelper.textCopied"), "short");
     }
     this._closeSelection();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/chrome/jar.mn firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/chrome/jar.mn
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/chrome/jar.mn	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/chrome/jar.mn	2015-05-25 20:43:48.000000000 +0000
@@ -35,6 +35,7 @@
   content/netError.xhtml               (content/netError.xhtml)
   content/SelectHelper.js              (content/SelectHelper.js)
   content/SelectionHandler.js          (content/SelectionHandler.js)
+  content/ActionBarHandler.js          (content/ActionBarHandler.js)
   content/WebappRT.js                  (content/WebappRT.js)
   content/EmbedRT.js                   (content/EmbedRT.js)
   content/InputWidgetHelper.js         (content/InputWidgetHelper.js)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/config/proguard/proguard.cfg firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/config/proguard/proguard.cfg
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/config/proguard/proguard.cfg	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/config/proguard/proguard.cfg	2015-05-25 20:43:48.000000000 +0000
@@ -203,6 +203,9 @@
 -keep class org.mozilla.gecko.AppConstants {
     *;
 }
+-keep class org.mozilla.gecko.AppConstants$Versions {
+    *;
+}
 -keep class org.mozilla.gecko.SysInfo {
     *;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/confvars.sh firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/confvars.sh
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/confvars.sh	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/confvars.sh	2015-05-25 20:43:48.000000000 +0000
@@ -100,7 +100,9 @@
 MOZ_ANDROID_DOWNLOADS_INTEGRATION=1
 
 # Enable Tab Queue
-MOZ_ANDROID_TAB_QUEUE=1
+if test "$NIGHTLY_BUILD"; then
+  MOZ_ANDROID_TAB_QUEUE=1
+fi
 
 # Use the low-memory GC tuning.
 export JS_GC_SMALL_CHUNK_SIZE=1
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/geckoview_library/Makefile.in firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/geckoview_library/Makefile.in
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/geckoview_library/Makefile.in	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/geckoview_library/Makefile.in	2015-05-25 20:43:49.000000000 +0000
@@ -36,8 +36,7 @@
 	$(MKDIR) -p $(_ABS_DIST)/geckoview_library
 
 	# Zip the assets into $(DIST)/geckoview_library/geckoview_assets.zip
-	cd $(_ABS_DIST)/$(MOZ_APP_NAME) && \
-	$(ZIP) -q -r $(_ABS_DIST)/geckoview_library/geckoview_assets.zip assets
+	$(call py_action,zip,-C $(_ABS_DIST)/$(MOZ_APP_NAME) $(_ABS_DIST)/geckoview_library/geckoview_assets.zip assets)
 
 	# Make empty directories to fit an Android project structure
 	$(MKDIR) -p bin gen libs/$(ANDROID_CPU_ARCH) src
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/installer/package-manifest.in firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/installer/package-manifest.in
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/installer/package-manifest.in	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/installer/package-manifest.in	2015-05-25 20:43:49.000000000 +0000
@@ -512,6 +512,7 @@
 @BINPATH@/@PREF_DIR@/mobile.js
 @BINPATH@/@PREF_DIR@/mobile-branding.js
 @BINPATH@/@PREF_DIR@/channel-prefs.js
+@BINPATH@/ua-update.json
 @BINPATH@/greprefs.js
 @BINPATH@/defaults/autoconfig/prefcalls.js
 @BINPATH@/defaults/profile/prefs.js
@@ -546,6 +547,20 @@
 @BINPATH@/res/html/*
 @BINPATH@/res/language.properties
 @BINPATH@/res/entityTables/*
+#ifdef NIGHTLY_BUILD
+@BINPATH@/res/text_caret.png
+@BINPATH@/res/text_caret@1.5x.png
+@BINPATH@/res/text_caret@2.25x.png
+@BINPATH@/res/text_caret@2x.png
+@BINPATH@/res/text_caret_tilt_left.png
+@BINPATH@/res/text_caret_tilt_left@1.5x.png
+@BINPATH@/res/text_caret_tilt_left@2.25x.png
+@BINPATH@/res/text_caret_tilt_left@2x.png
+@BINPATH@/res/text_caret_tilt_right.png
+@BINPATH@/res/text_caret_tilt_right@1.5x.png
+@BINPATH@/res/text_caret_tilt_right@2.25x.png
+@BINPATH@/res/text_caret_tilt_right@2x.png
+#endif
 
 #ifndef MOZ_ANDROID_EXCLUDE_FONTS
 @BINPATH@/res/fonts/*
@@ -560,9 +575,6 @@
 ;
 @BINPATH@/components/pipboot.xpt
 @BINPATH@/components/pipnss.xpt
-@BINPATH@/components/pippki.xpt
-@BINPATH@/chrome/pippki@JAREXT@
-@BINPATH@/chrome/pippki.manifest
 
 ; For process sandboxing
 #if defined(MOZ_SANDBOX)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/locales/jar.mn firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/locales/jar.mn
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/locales/jar.mn	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/locales/jar.mn	2015-05-25 20:43:49.000000000 +0000
@@ -48,6 +48,7 @@
 relativesrcdir toolkit/locales:
   locale/@AB_CD@/browser/overrides/about.dtd                       (%chrome/global/about.dtd)
   locale/@AB_CD@/browser/overrides/aboutAbout.dtd                  (%chrome/global/aboutAbout.dtd)
+  locale/@AB_CD@/browser/overrides/aboutReader.properties          (%chrome/global/aboutReader.properties)
   locale/@AB_CD@/browser/overrides/aboutRights.dtd                 (%chrome/global/aboutRights.dtd)
   locale/@AB_CD@/browser/overrides/charsetMenu.properties          (%chrome/global/charsetMenu.properties)
   locale/@AB_CD@/browser/overrides/commonDialogs.properties        (%chrome/global/commonDialogs.properties)
@@ -74,6 +75,7 @@
 
 % override chrome://global/locale/about.dtd chrome://browser/locale/overrides/about.dtd
 % override chrome://global/locale/aboutAbout.dtd chrome://browser/locale/overrides/aboutAbout.dtd
+% override chrome://global/locale/aboutReader.properties chrome://browser/locale/overrides/aboutReader.properties
 % override chrome://global/locale/aboutRights.dtd chrome://browser/locale/overrides/aboutRights.dtd
 % override chrome://global/locale/charsetMenu.properties chrome://browser/locale/overrides/charsetMenu.properties
 % override chrome://global/locale/commonDialogs.properties chrome://browser/locale/overrides/commonDialogs.properties
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/modules/Home.jsm firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/modules/Home.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/modules/Home.jsm	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/modules/Home.jsm	2015-05-25 20:43:49.000000000 +0000
@@ -315,6 +315,7 @@
     this.title = options.title;
     this.layout = options.layout;
     this.views = options.views;
+    this.default = !!options.default;
 
     if (!this.id || !this.title) {
       throw "Home.panels: Can't create a home panel without an id and title!";
@@ -378,6 +379,10 @@
         this.authConfig.imageUrl = options.auth.imageUrl;
       }
     }
+
+    if (options.position && typeof options.position === "number") {
+      this.position = options.position;
+    }
   }
 
   let _generatePanel = function(id) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/modules/Sanitizer.jsm firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/modules/Sanitizer.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/modules/Sanitizer.jsm	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/modules/Sanitizer.jsm	2015-05-25 20:43:49.000000000 +0000
@@ -15,6 +15,7 @@
 Cu.import("resource://gre/modules/Task.jsm");
 Cu.import("resource://gre/modules/Downloads.jsm");
 Cu.import("resource://gre/modules/osfile.jsm");
+Cu.import("resource://gre/modules/Accounts.jsm");
 
 function dump(a) {
   Services.console.logStringMessage(a);
@@ -266,7 +267,25 @@
       {
         return true;
       }
+    },
+
+    syncedTabs: {
+      clear: function ()
+      {
+        return Messaging.sendRequestForResult({ type: "Sanitize:ClearSyncedTabs" })
+          .catch(e => Cu.reportError("Java-side synced tabs clearing failed: " + e));
+      },
+
+      canClear: function(aCallback)
+      {
+        Accounts.anySyncAccountsExist().then(aCallback)
+          .catch(function(err) {
+            Cu.reportError("Java-side synced tabs clearing failed: " + err)
+            aCallback(false);
+          });
+      }
     }
+
   }
 };
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/uploadthread/AsyncUploader.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/uploadthread/AsyncUploader.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/uploadthread/AsyncUploader.java	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/uploadthread/AsyncUploader.java	2015-05-25 20:43:49.000000000 +0000
@@ -151,7 +151,7 @@
         long uploadedWifis = 0;
 
         if (!mUploadArgs.mShouldIgnoreWifiStatus && mUploadArgs.mUseWifiOnly &&
-               mUploadArgs.mNetworkUtils.isWifiAvailable()) {
+               !mUploadArgs.mNetworkUtils.isWifiAvailable()) {
             if (AppGlobals.isDebug) {
                 Log.d(LOG_TAG, "not on WiFi, not sending");
             }
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/assets/mock-package.zip and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/assets/mock-package.zip differ
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/components/BaseComponent.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/components/BaseComponent.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/components/BaseComponent.java	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/components/BaseComponent.java	2015-05-25 20:43:50.000000000 +0000
@@ -5,6 +5,7 @@
 package org.mozilla.gecko.tests.components;
 
 import org.mozilla.gecko.Actions;
+import org.mozilla.gecko.tests.StringHelper;
 import org.mozilla.gecko.tests.UITestContext;
 
 import android.app.Activity;
@@ -23,11 +24,13 @@
     protected final Activity mActivity;
     protected final Solo mSolo;
     protected final Actions mActions;
+    protected final StringHelper mStringHelper;
 
     public BaseComponent(final UITestContext testContext) {
         mTestContext = testContext;
         mActivity = mTestContext.getActivity();
         mSolo = mTestContext.getSolo();
         mActions = mTestContext.getActions();
+        mStringHelper = mTestContext.getStringHelper();
     }
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/components/ToolbarComponent.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/components/ToolbarComponent.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/components/ToolbarComponent.java	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/components/ToolbarComponent.java	2015-05-25 20:43:50.000000000 +0000
@@ -56,8 +56,8 @@
         final String expected;
         final String absoluteURL = NavigationHelper.adjustUrl(url);
 
-        if (StringHelper.get().ABOUT_HOME_URL.equals(absoluteURL)) {
-            expected = StringHelper.get().ABOUT_HOME_TITLE;
+        if (mStringHelper.ABOUT_HOME_URL.equals(absoluteURL)) {
+            expected = mStringHelper.ABOUT_HOME_TITLE;
         } else if (absoluteURL.startsWith(URL_HTTP_PREFIX)) {
             expected = absoluteURL.substring(URL_HTTP_PREFIX.length());
         } else {
@@ -134,7 +134,7 @@
 
         for (int i = 0; i < count; i++) {
             final View view = pageActionLayout.getChildAt(i);
-            if (StringHelper.get().CONTENT_DESCRIPTION_READER_MODE_BUTTON.equals(view.getContentDescription())) {
+            if (mStringHelper.CONTENT_DESCRIPTION_READER_MODE_BUTTON.equals(view.getContentDescription())) {
                 return (ImageButton) view;
             }
         }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/helpers/WaitHelper.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/helpers/WaitHelper.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/helpers/WaitHelper.java	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/helpers/WaitHelper.java	2015-05-25 20:43:50.000000000 +0000
@@ -128,7 +128,7 @@
      * the invocation of storeState to the invocation of hasStateChanged. A boolean will be
      * returned from hasStateChanged, indicating this change of status.
      */
-    private static interface ChangeVerifier {
+    private interface ChangeVerifier {
         public String getLogTag();
 
         /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/robocop.ini firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/robocop.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/robocop.ini	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/robocop.ini	2015-05-25 20:43:50.000000000 +0000
@@ -53,6 +53,8 @@
 # disabled on 2.3 and 4.3 bug 979552
 skip-if = android_version == "10" || android_version == "18"
 [testInputUrlBar]
+# disabled on 2.3 bug 1165511
+skip-if = android_version == "10"
 [testJarReader]
 [testLinkContextMenu]
 # disabled on 4.3, bug 1083666
@@ -168,6 +170,7 @@
 skip-if = android_version == "18"
 [testStateWhileLoading]
 
+[testSelectionCarets]
 # testSelectionHandler disabled on Android 2.3 by trailing skip-if, due to bug 980074
 # also disabled on Android 4.3, bug 1144882
 [testSelectionHandler]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/roboextender/testSelectionHandler.html firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/roboextender/testSelectionHandler.html
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/roboextender/testSelectionHandler.html	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/roboextender/testSelectionHandler.html	2015-05-25 20:43:50.000000000 +0000
@@ -361,7 +361,7 @@
 function testPaste() {
   let sh = getSelectionHandler();
   let clipboard = getClipboard();
-  clipboard.copyString(PASTE_TEXT, document);
+  clipboard.copyString(PASTE_TEXT);
 
   // Add a contentEditable element to the document.
   let div = document.createElement("div");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/testDistribution.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/testDistribution.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/testDistribution.java	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/testDistribution.java	2015-05-25 20:43:50.000000000 +0000
@@ -53,6 +53,8 @@
  *       locales/
  *         en-US/
  *           suggestedsites.json
+ *     extensions/
+ *       distribution.test@mozilla.org.xpi
  */
 public class testDistribution extends ContentProviderTest {
     private static final String CLASS_REFERRER_RECEIVER = "org.mozilla.gecko.distribution.ReferrerReceiver";
@@ -152,6 +154,7 @@
         checkPreferences();
         checkLocalizedPreferences("en-US");
         checkSearchPlugin();
+        checkAddon();
 
         // Pre-clear distribution pref, and run es-MX localized preferences Test
         clearDistributionPref();
@@ -303,20 +306,7 @@
                                          prefTestString,
                                          prefTestInt };
 
-            Actions.RepeatedEventExpecter eventExpecter = mActions.expectGeckoEvent("Preferences:Data");
-            mActions.sendPreferencesGetEvent(PREF_REQUEST_ID, prefNames);
-
-            JSONObject data = null;
-            int requestId = -1;
-
-            // Wait until we get the correct "Preferences:Data" event
-            while (requestId != PREF_REQUEST_ID) {
-                data = new JSONObject(eventExpecter.blockForEventData());
-                requestId = data.getInt("requestId");
-            }
-            eventExpecter.unregisterListener();
-
-            JSONArray preferences = data.getJSONArray("preferences");
+            final JSONArray preferences = getPrefs(prefNames);
             for (int i = 0; i < preferences.length(); i++) {
                 JSONObject pref = (JSONObject) preferences.get(i);
                 String name = pref.getString("name");
@@ -364,6 +354,34 @@
         }
     }
 
+    private void checkAddon() {
+        try {
+            final String[] prefNames = { "distribution.test.addonEnabled" };
+            final JSONArray preferences = getPrefs(prefNames);
+            final JSONObject pref = (JSONObject) preferences.get(0);
+            mAsserter.is(pref.getBoolean("value"), true, "check distribution add-on is enabled");
+        } catch (JSONException e) {
+            mAsserter.ok(false, "exception getting preferences", e.toString());
+        }
+    }
+
+    private JSONArray getPrefs(String[] prefNames) throws JSONException {
+        Actions.RepeatedEventExpecter eventExpecter = mActions.expectGeckoEvent("Preferences:Data");
+        mActions.sendPreferencesGetEvent(PREF_REQUEST_ID, prefNames);
+
+        JSONObject data = null;
+        int requestId = -1;
+
+        // Wait until we get the correct "Preferences:Data" event
+        while (requestId != PREF_REQUEST_ID) {
+            data = new JSONObject(eventExpecter.blockForEventData());
+            requestId = data.getInt("requestId");
+        }
+        eventExpecter.unregisterListener();
+
+        return data.getJSONArray("preferences"); 
+    }
+
     // Sets the distribution locale preference for the test.
     private void setTestLocale(String locale) {
         BrowserLocaleManager.getInstance().setSelectedLocale(mActivity, locale);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/testOfflinePage.js firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/testOfflinePage.js
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/testOfflinePage.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/testOfflinePage.js	2015-05-25 20:43:50.000000000 +0000
@@ -18,6 +18,37 @@
   do_report_result(lhs === rhs, text, Components.stack.caller, false);
 }
 
+function promiseBrowserEvent(browser, eventType) {
+  return new Promise((resolve) => {
+    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;
+      }
+      do_print("Received event " + eventType + " from browser");
+      browser.removeEventListener(eventType, handle, true);
+      resolve(event);
+    }
+
+    browser.addEventListener(eventType, handle, true);
+    do_print("Now waiting for " + eventType + " event from browser");
+  });
+}
+
+// Provide a helper to yield until we are sure the offline state has changed
+function promiseOffline(isOffline) {
+  return new Promise((resolve, reject) => {
+    function observe(subject, topic, data) {
+      do_print("Received topic: " + topic);
+      Services.obs.removeObserver(observe, "network:offline-status-changed");
+      resolve();
+    }
+    Services.obs.addObserver(observe, "network:offline-status-changed", false);
+    Services.io.offline = isOffline;
+  });
+}
+
 // The chrome window
 let chromeWin;
 
@@ -29,7 +60,7 @@
 
 const kUniqueURI = Services.io.newURI("http://mochi.test:8888/tests/robocop/video_controls.html", null, null);
 
-add_test(function setup_browser() {
+add_task(function* test_offline() {
   // Tests always connect to localhost, and per bug 87717, localhost is now
   // reachable in offline mode.  To avoid this, disable any proxy.
   proxyPrefValue = Services.prefs.getIntPref("network.proxy.type");
@@ -47,29 +78,15 @@
     Services.io.offline = false;
   });
 
-  do_test_pending();
-
   // Add a new tab with a blank page so we can better control the real page load and the offline state
   browser = BrowserApp.addTab("about:blank", { selected: true, parentId: BrowserApp.selectedTab.id }).browser;
 
   // Go offline, expecting the error page.
-  Services.io.offline = true;
+  yield promiseOffline(true);
 
   // Load our test web page
-  browser.addEventListener("DOMContentLoaded", errorListener, true);
   browser.loadURI(kUniqueURI.spec, null, null)
-});
-
-//------------------------------------------------------------------------------
-// listen to loading the neterror page. (offline mode)
-function errorListener() {
-  if (browser.contentWindow.location == "about:blank") {
-    do_print("got about:blank, which is expected once, so return");
-    return;
-  }
-
-  browser.removeEventListener("DOMContentLoaded", errorListener, true);
-  ok(Services.io.offline, "Services.io.offline is true.");
+  yield promiseBrowserEvent(browser, "DOMContentLoaded");
 
   // This is an error page.
   is(browser.contentDocument.documentURI.substring(0, 27), "about:neterror?e=netOffline", "Document URI is the error page.");
@@ -79,29 +96,17 @@
 
   Services.prefs.setIntPref("network.proxy.type", proxyPrefValue);
 
-  // Now press the "Try Again" button, with offline mode off.
-  Services.io.offline = false;
-
-  browser.addEventListener("DOMContentLoaded", reloadListener, true);
+  // Go online and try to load the page again
+  yield promiseOffline(false);
 
   ok(browser.contentDocument.getElementById("errorTryAgain"), "The error page has got a #errorTryAgain element");
-  browser.contentDocument.getElementById("errorTryAgain").click();
-}
-
-
-//------------------------------------------------------------------------------
-// listen to reload of neterror.
-function reloadListener() {
-  browser.removeEventListener("DOMContentLoaded", reloadListener, true);
 
-  ok(!Services.io.offline, "Services.io.offline is false.");
+  // Click "Try Again" button to start the page load
+  browser.contentDocument.getElementById("errorTryAgain").click();
+  yield promiseBrowserEvent(browser, "DOMContentLoaded");
 
   // This is not an error page.
   is(browser.contentDocument.documentURI, kUniqueURI.spec, "Document URI is not the offline-error page, but the original URI.");
-
-  do_test_finished();
-
-  run_next_test();
-}
+});
 
 run_next_test();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/testResourceSubstitutions.js firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/testResourceSubstitutions.js
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/testResourceSubstitutions.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/testResourceSubstitutions.js	2015-05-25 20:43:50.000000000 +0000
@@ -12,17 +12,11 @@
 function readChannel(url) {
   let deferred = Promise.defer();
 
-  let channel = NetUtil.newChannel2(url,
-                                    null,
-                                    null,
-                                    null,      // aLoadingNode
-                                    Services.scriptSecurityManager.getSystemPrincipal(),
-                                    null,      // aTriggeringPrincipal
-                                    Ci.nsILoadInfo.SEC_NORMAL,
-                                    Ci.nsIContentPolicy.TYPE_OTHER);
+  let channel = NetUtil.newChannel({uri: url, loadUsingSystemPrincipal: true});
+
   channel.contentType = "text/plain";
 
-  NetUtil.asyncFetch2(channel, function(inputStream, status) {
+  NetUtil.asyncFetch(channel, function(inputStream, status) {
     if (!Components.isSuccessCode(status)) {
       deferred.reject();
       return;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/testSelectionCarets.html firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/testSelectionCarets.html
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/testSelectionCarets.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/testSelectionCarets.html	2015-05-25 20:43:50.000000000 +0000
@@ -0,0 +1,35 @@
+<html>
+  <head>
+    <title>ActionBar Handler and SelectionCarets tests</title>
+    <meta name="viewport"
+      content="initial-scale=1, allowZoom=no, maximum-scale=1,
+               user-scalable=no, width=device-width">
+  </head>
+
+  <body>
+    <div id="LTRcontenteditable"
+      style="direction: ltr; width: 10em; height: 2em; word-wrap: break-word;
+      overflow: auto; -moz-user-select:text"
+      contenteditable="true">Find my book</div>
+    <div id="RTLcontenteditable"
+      style="direction: rtl; width: 10em; height: 2em; word-wrap: break-word;
+      overflow: auto; -moz-user-select:text"
+      contenteditable="true">איפה האוטו שלי</div>
+
+    <div id="LTRtextContent"
+      style="direction: ltr; width: 10em; height: 2em; word-wrap: break-word;
+      overflow: auto; -moz-user-select:text">Open the door</div>
+    <div id="RTLtextContent"
+      style="direction: rtl; width: 10em; height: 2em; word-wrap: break-word;
+      overflow: auto; -moz-user-select:text">תן לי מים</div>
+
+    <input id="LTRinput" style="direction: ltr;" value="Type something">
+    <input id="RTLinput" style="direction: rtl;" value="לרוץ במעלה הגבעה">
+    <br>
+
+    <textarea id="LTRtextarea" style="direction: ltr;"
+      rows="3" cols="8">Words in a box</textarea>
+    <textarea id="RTLtextarea" style="direction: rtl;"
+      rows="3" cols="8">הספר הוא טוב</textarea>
+  </body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/testSelectionCarets.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/testSelectionCarets.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/testSelectionCarets.java	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/testSelectionCarets.java	2015-05-25 20:43:50.000000000 +0000
@@ -0,0 +1,106 @@
+/**
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.mozilla.gecko.tests;
+
+import org.mozilla.gecko.AppConstants;
+import org.mozilla.gecko.EventDispatcher;
+import org.mozilla.gecko.GeckoAppShell;
+import org.mozilla.gecko.GeckoEvent;
+import org.mozilla.gecko.Tab;
+import org.mozilla.gecko.Tabs;
+import org.mozilla.gecko.util.GeckoEventListener;
+
+import android.os.SystemClock;
+import android.util.Log;
+import android.view.MotionEvent;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class testSelectionCarets extends JavascriptTest implements GeckoEventListener {
+    private static final String LOGTAG = "testSelectionCarets";
+
+    private static final String LONGPRESS_EVENT = "testSelectionCarets:Longpress";
+    private static final String TAB_CHANGE_EVENT = "testSelectionCarets:TabChange";
+
+    private final TabsListener tabsListener;
+
+    public testSelectionCarets() {
+        super("testSelectionCarets.js");
+
+        tabsListener = new TabsListener();
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+
+        Tabs.registerOnTabsChangedListener(tabsListener);
+        EventDispatcher.getInstance().registerGeckoThreadListener(this, LONGPRESS_EVENT);
+    }
+
+    @Override
+    public void testJavascript() throws Exception {
+        // This feature is currently only available in Nightly.
+        if (!AppConstants.NIGHTLY_BUILD) {
+            mAsserter.dumpLog(LOGTAG + " is disabled on non-Nightly builds: returning");
+            return;
+        }
+        super.testJavascript();
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        Tabs.unregisterOnTabsChangedListener(tabsListener);
+        EventDispatcher.getInstance().unregisterGeckoThreadListener(this, LONGPRESS_EVENT);
+
+        super.tearDown();
+    }
+
+    /**
+     * The test script will request us to trigger Longpress AndroidGeckoEvents.
+    */
+    @Override
+    public void handleMessage(String event, final JSONObject message) {
+        switch(event) {
+            case LONGPRESS_EVENT: {
+                final long meTime = SystemClock.uptimeMillis();
+                final int meX = Math.round(message.optInt("x", 0));
+                final int meY = Math.round(message.optInt("y", 0));
+                final MotionEvent motionEvent =
+                    MotionEvent.obtain(meTime, meTime, MotionEvent.ACTION_DOWN, meX, meY, 0);
+
+                final GeckoEvent geckoEvent = GeckoEvent.createLongPressEvent(motionEvent);
+                GeckoAppShell.sendEventToGecko(geckoEvent);
+                break;
+            }
+        }
+    }
+
+    /**
+     * Observes tab change events to broadcast to the test script.
+     */
+    private class TabsListener implements Tabs.OnTabsChangedListener {
+        @Override
+        public void onTabChanged(Tab tab, Tabs.TabEvents msg, Object data) {
+            switch (msg) {
+                case STOP:
+                    final JSONObject args = new JSONObject();
+                    try {
+                        args.put("tabId", tab.getId());
+                        args.put("event", msg.toString());
+                    } catch (JSONException e) {
+                        Log.e(LOGTAG, "Error building JSON arguments for " + TAB_CHANGE_EVENT, e);
+                        return;
+                    }
+                    final GeckoEvent event =
+                        GeckoEvent.createBroadcastEvent(TAB_CHANGE_EVENT, args.toString());
+                    GeckoAppShell.sendEventToGecko(event);
+                    break;
+            }
+        }
+    }
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/testSelectionCarets.js firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/testSelectionCarets.js
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/testSelectionCarets.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/testSelectionCarets.js	2015-05-25 20:43:50.000000000 +0000
@@ -0,0 +1,244 @@
+// -*- 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/Services.jsm");
+Cu.import("resource://gre/modules/Messaging.jsm");
+Cu.import('resource://gre/modules/Geometry.jsm');
+
+const SELECTION_CARETS_PREF = "selectioncaret.enabled";
+const TOUCH_CARET_PREF = "touchcaret.enabled";
+const TEST_URL = "http://mochi.test:8888/tests/robocop/testSelectionCarets.html";
+
+// After longpress, Gecko notifys ActionBarHandler to init then update state.
+// When it does, we'll peek over its shoulder and test status.
+const LONGPRESS_EVENT = "testSelectionCarets:Longpress";
+const STATUS_UPDATE_EVENT = "ActionBar:UpdateState";
+
+// Ensures Tabs are completely loaded, viewport and zoom constraints updated, etc.
+const TAB_CHANGE_EVENT = "testSelectionCarets:TabChange";
+const TAB_STOP_EVENT = "STOP";
+
+const gChromeWin = Services.wm.getMostRecentWindow("navigator:browser");
+
+/**
+ * Robocop test helpers.
+ */
+function ok(passed, text) {
+  do_report_result(passed, text, Components.stack.caller, false);
+}
+
+function is(lhs, rhs, text) {
+  do_report_result(lhs === rhs, "[ " + lhs + " === " + rhs + " ] " + text,
+    Components.stack.caller, false);
+}
+
+/**
+ * Wait for and return, when an expected tab change event occurs.
+ *
+ * @param tabId, The id of the target tab we're observing.
+ * @param eventType, The event type we expect.
+ * @return {Promise}
+ * @resolves The tab change object, including the matched tab id and event.
+ */
+function do_promiseTabChangeEvent(tabId, eventType) {
+  return new Promise(resolve => {
+    let observer = (subject, topic, data) => {
+      let message = JSON.parse(data);
+
+      if (message.event === eventType && message.tabId === tabId) {
+        Services.obs.removeObserver(observer, TAB_CHANGE_EVENT);
+        resolve(data);
+      }
+    }
+
+    Services.obs.addObserver(observer, TAB_CHANGE_EVENT, false);
+  });
+}
+
+/**
+ * Selection methods vary if we have an input / textarea element,
+ * or if we have basic content.
+ */
+function isInputOrTextarea(element) {
+  return ((element instanceof Ci.nsIDOMHTMLInputElement) ||
+          (element instanceof Ci.nsIDOMHTMLTextAreaElement));
+}
+
+/**
+ * Return the selection controller based on element.
+ */
+function elementSelection(element) {
+  return (isInputOrTextarea(element)) ?
+    element.editor.selection :
+    element.ownerDocument.defaultView.getSelection();
+}
+
+/**
+ * Select the first character of a target element, w/o affecting focus.
+ */
+function selectElementFirstChar(doc, element) {
+  if (isInputOrTextarea(element)) {
+    element.setSelectionRange(0, 1);
+    return;
+  }
+
+  // Simple test cases designed firstChild == #text node.
+  let range = doc.createRange();
+  range.setStart(element.firstChild, 0);
+  range.setEnd(element.firstChild, 1);
+
+  let selection = elementSelection(element);
+  selection.removeAllRanges();
+  selection.addRange(range);
+}
+
+/**
+ * Get longpress point. Determine the midpoint in the first character of
+ * the content in the element. X will be midpoint from left to right.
+ * Y will be 1/3 of the height up from the bottom to account for both
+ * LTR and smaller RTL characters. ie: |X| vs. |א|
+ */
+function getFirstCharPressPoint(doc, element, expected) {
+  // Select the first char in the element.
+  selectElementFirstChar(doc, element);
+
+  // Reality check selected char to expected.
+  let selection = elementSelection(element);
+  is(selection.toString(), expected, "Selected char should match expected char.");
+
+  // Return a point where long press should select entire word.
+  let rect = selection.getRangeAt(0).getBoundingClientRect();
+  let r = new Point(rect.left + (rect.width / 2), rect.bottom - (rect.height / 3));
+
+  return r;
+}
+
+/**
+ * Long press an element (RTL/LTR) at its calculated first character
+ * position, and return the result.
+ *
+ * @param midPoint, The screen coord for the longpress.
+ * @return {Promise}
+ * @resolves The ActionBar status, including its target focused element, and
+ *           the selected text that it sees.
+ */
+function do_promiseLongPressResult(midPoint) {
+  return new Promise(resolve => {
+    let observer = (subject, topic, data) => {
+      let ActionBarHandler = gChromeWin.ActionBarHandler;
+      if (topic === STATUS_UPDATE_EVENT) {
+        let text = ActionBarHandler._getSelectedText();
+        if (text !== "") {
+          // Remove notification observer, and resolve.
+          Services.obs.removeObserver(observer, STATUS_UPDATE_EVENT);
+          resolve({
+            focusedElement: ActionBarHandler._targetElement,
+            text: text,
+          });
+        }
+      }
+    };
+
+    // Add notification observer, trigger the longpress and wait.
+    Services.obs.addObserver(observer, STATUS_UPDATE_EVENT, false);
+    Messaging.sendRequestForResult({
+      type: LONGPRESS_EVENT,
+      x: midPoint.x,
+      y: midPoint.y,
+    });
+  });
+}
+
+/**
+ * Main test method.
+ */
+add_task(function* testSelectionCarets() {
+  // Wait to start loading our test page until after the initial browser tab is
+  // completely loaded. This allows each tab to complete its layer initialization,
+  // importantly, its viewport and zoomContraints info.
+  let BrowserApp = gChromeWin.BrowserApp;
+  yield do_promiseTabChangeEvent(BrowserApp.selectedTab.id, TAB_STOP_EVENT);
+
+  // Ensure Gecko Selection and Touch carets are enabled.
+  Services.prefs.setBoolPref(SELECTION_CARETS_PREF, true);
+  Services.prefs.setBoolPref(TOUCH_CARET_PREF, true);
+
+  // Load test page, wait for load completion, register cleanup.
+  let browser = BrowserApp.addTab(TEST_URL).browser;
+  let tab = BrowserApp.getTabForBrowser(browser);
+  yield do_promiseTabChangeEvent(tab.id, TAB_STOP_EVENT);
+
+  do_register_cleanup(function cleanup() {
+    Services.prefs.clearUserPref(SELECTION_CARETS_PREF);
+    Services.prefs.clearUserPref(TOUCH_CARET_PREF);
+    BrowserApp.closeTab(tab);
+  });
+
+  // References to test document elements.
+  let doc = browser.contentDocument;
+  let ce_LTR_elem = doc.getElementById("LTRcontenteditable");
+  let tc_LTR_elem = doc.getElementById("LTRtextContent");
+  let i_LTR_elem = doc.getElementById("LTRinput");
+  let ta_LTR_elem = doc.getElementById("LTRtextarea");
+
+  let ce_RTL_elem = doc.getElementById("RTLcontenteditable");
+  let tc_RTL_elem = doc.getElementById("RTLtextContent");
+  let i_RTL_elem = doc.getElementById("RTLinput");
+  let ta_RTL_elem = doc.getElementById("RTLtextarea");
+
+  // Locate longpress midpoints for test elements, ensure expactations.
+  let ce_LTR_midPoint = getFirstCharPressPoint(doc, ce_LTR_elem, "F");
+  let tc_LTR_midPoint = getFirstCharPressPoint(doc, tc_LTR_elem, "O");
+  let i_LTR_midPoint = getFirstCharPressPoint(doc, i_LTR_elem, "T");
+  let ta_LTR_midPoint = getFirstCharPressPoint(doc, ta_LTR_elem, "W");
+
+  let ce_RTL_midPoint = getFirstCharPressPoint(doc, ce_RTL_elem, "א");
+  let tc_RTL_midPoint = getFirstCharPressPoint(doc, tc_RTL_elem, "ת");
+  let i_RTL_midPoint = getFirstCharPressPoint(doc, i_RTL_elem, "ל");
+  let ta_RTL_midPoint = getFirstCharPressPoint(doc, ta_RTL_elem, "ה");
+
+
+  // Longpress various LTR content elements. Test focused element against
+  // expected, and selected text against expected.
+  let result = yield do_promiseLongPressResult(ce_LTR_midPoint);
+  is(result.focusedElement, ce_LTR_elem, "Focused element should match expected.");
+  is(result.text, "Find", "Selected text should match expected text.");
+
+  result = yield do_promiseLongPressResult(tc_LTR_midPoint);
+  is(result.focusedElement, null, "No focused element is expected.");
+  is(result.text, "Open", "Selected text should match expected text.");
+
+  result = yield do_promiseLongPressResult(i_LTR_midPoint);
+  is(result.focusedElement, i_LTR_elem, "Focused element should match expected.");
+  is(result.text, "Type", "Selected text should match expected text.");
+
+  result = yield do_promiseLongPressResult(ta_LTR_midPoint);
+  is(result.focusedElement, ta_LTR_elem, "Focused element should match expected.");
+  is(result.text, "Words", "Selected text should match expected text.");
+
+  // Longpress various RTL content elements. Test focused element against
+  // expected, and selected text against expected.
+  result = yield do_promiseLongPressResult(ce_RTL_midPoint);
+  is(result.focusedElement, ce_RTL_elem, "Focused element should match expected.");
+  is(result.text, "איפה", "Selected text should match expected text.");
+
+  result = yield do_promiseLongPressResult(tc_RTL_midPoint);
+  is(result.focusedElement, null, "No focused element is expected.");
+  is(result.text, "תן", "Selected text should match expected text.");
+
+  result = yield do_promiseLongPressResult(i_RTL_midPoint);
+  is(result.focusedElement, i_RTL_elem, "Focused element should match expected.");
+  is(result.text, "לרוץ", "Selected text should match expected text.");
+
+  result = yield do_promiseLongPressResult(ta_RTL_midPoint);
+  is(result.focusedElement, ta_RTL_elem, "Focused element should match expected.");
+  is(result.text, "הספר", "Selected text should match expected text.");
+
+  ok(true, "Finished all tests.");
+});
+
+run_next_test();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/UITestContext.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/UITestContext.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/UITestContext.java	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/UITestContext.java	2015-05-25 20:43:50.000000000 +0000
@@ -32,6 +32,7 @@
     public Driver getDriver();
     public Actions getActions();
     public Instrumentation getInstrumentation();
+    public StringHelper getStringHelper();
 
     public void dumpLog(final String logtag, final String message);
     public void dumpLog(final String logtag, final String message, final Throwable t);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/UITest.java firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/UITest.java
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/tests/browser/robocop/UITest.java	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/tests/browser/robocop/UITest.java	2015-05-25 20:43:50.000000000 +0000
@@ -124,6 +124,11 @@
     }
 
     @Override
+    public StringHelper getStringHelper() {
+        return mStringHelper;
+    }
+
+    @Override
     public void dumpLog(final String logtag, final String message) {
         mAsserter.dumpLog(logtag + ": " + message);
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/thirdparty/com/adjust/sdk/LICENSE firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/thirdparty/com/adjust/sdk/LICENSE
--- firefox-trunk-41.0~a1~hg20150513r243603/mobile/android/thirdparty/com/adjust/sdk/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mobile/android/thirdparty/com/adjust/sdk/LICENSE	2015-05-25 20:43:53.000000000 +0000
@@ -0,0 +1,21 @@
+Copyright (c) 2012-2014 adjust GmbH,
+http://www.adjust.com
+
+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.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/modules/libjar/nsJARChannel.cpp firefox-trunk-41.0~a1~hg20150524r245419/modules/libjar/nsJARChannel.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/modules/libjar/nsJARChannel.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/modules/libjar/nsJARChannel.cpp	2015-05-25 20:43:57.000000000 +0000
@@ -43,15 +43,12 @@
 #undef LOG
 #endif
 
-#if defined(PR_LOGGING)
 //
 // set NSPR_LOG_MODULES=nsJarProtocol:5
 //
 static PRLogModuleInfo *gJarProtocolLog = nullptr;
-#endif
 
-// If you ever want to define PR_FORCE_LOGGING in this file, see bug 545995
-#define LOG(args)     PR_LOG(gJarProtocolLog, PR_LOG_DEBUG, args)
+#define LOG(args)     MOZ_LOG(gJarProtocolLog, PR_LOG_DEBUG, args)
 #define LOG_ENABLED() PR_LOG_TEST(gJarProtocolLog, 4)
 
 //-----------------------------------------------------------------------------
@@ -203,10 +200,8 @@
     , mOpeningRemote(false)
     , mEnsureChildFd(false)
 {
-#if defined(PR_LOGGING)
     if (!gJarProtocolLog)
         gJarProtocolLog = PR_NewLogModule("nsJarProtocol");
-#endif
 
     // hold an owning reference to the jar handler
     NS_ADDREF(gJarHandler);
@@ -263,9 +258,7 @@
         return NS_ERROR_INVALID_ARG;
     }
 
-#if defined(PR_LOGGING)
     mJarURI->GetSpec(mSpec);
-#endif
     return rv;
 }
 
@@ -1182,9 +1175,7 @@
                                nsIInputStream *stream,
                                uint64_t offset, uint32_t count)
 {
-#if defined(PR_LOGGING)
     LOG(("nsJARChannel::OnDataAvailable [this=%x %s]\n", this, mSpec.get()));
-#endif
 
     nsresult rv;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/modules/libjar/nsJARChannel.h firefox-trunk-41.0~a1~hg20150524r245419/modules/libjar/nsJARChannel.h
--- firefox-trunk-41.0~a1~hg20150513r243603/modules/libjar/nsJARChannel.h	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/modules/libjar/nsJARChannel.h	2015-05-25 20:43:57.000000000 +0000
@@ -24,7 +24,7 @@
 #include "nsIURI.h"
 #include "nsCOMPtr.h"
 #include "nsString.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 class nsJARInputThunk;
 
@@ -69,9 +69,7 @@
                                     mozilla::net::MemoryDownloader::Data aData)
         override;
 
-#if defined(PR_LOGGING)
     nsCString                       mSpec;
-#endif
 
     bool                            mOpened;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/modules/libjar/nsJAR.h firefox-trunk-41.0~a1~hg20150524r245419/modules/libjar/nsJAR.h
--- firefox-trunk-41.0~a1~hg20150513r243603/modules/libjar/nsJAR.h	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/modules/libjar/nsJAR.h	2015-05-25 20:43:57.000000000 +0000
@@ -9,7 +9,7 @@
 #include "nscore.h"
 #include "prio.h"
 #include "plstr.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prinrval.h"
 
 #include "mozilla/Mutex.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/modules/libjar/nsZipArchive.cpp firefox-trunk-41.0~a1~hg20150524r245419/modules/libjar/nsZipArchive.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/modules/libjar/nsZipArchive.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/modules/libjar/nsZipArchive.cpp	2015-05-25 20:43:57.000000000 +0000
@@ -20,7 +20,7 @@
 #include "nsISupportsUtils.h"
 #include "prio.h"
 #include "plstr.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "stdlib.h"
 #include "nsWildCard.h"
 #include "nsZipArchive.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/modules/libpref/init/all.js firefox-trunk-41.0~a1~hg20150524r245419/modules/libpref/init/all.js
--- firefox-trunk-41.0~a1~hg20150513r243603/modules/libpref/init/all.js	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/modules/libpref/init/all.js	2015-05-25 20:43:58.000000000 +0000
@@ -132,12 +132,6 @@
 // Whether or not Shared Web Workers are enabled.
 pref("dom.workers.sharedWorkers.enabled", true);
 
-// Whether or not WebSockets in workers are enabled.
-// Note: we need this pref because WebSocket in Workers is a new implementation
-// and we want to be able to disable it quickly in case of regressions.
-// When this feature is stable enough we can get rid of this pref: Bug 1159792
-pref("dom.workers.websocket.enabled", true);
-
 // Service workers
 pref("dom.serviceWorkers.enabled", false);
 
@@ -376,7 +370,7 @@
 pref("media.peerconnection.video.max_bitrate", 2000);
 #endif
 pref("media.navigator.permission.disabled", false);
-pref("media.peerconnection.default_iceservers", "[{\"urls\": [\"stun:stun.services.mozilla.com\"]}]");
+pref("media.peerconnection.default_iceservers", "[]");
 pref("media.peerconnection.ice.loopback", false); // Set only for testing in offline environments.
 pref("media.peerconnection.use_document_iceservers", true);
 pref("media.peerconnection.identity.enabled", true);
@@ -459,6 +453,11 @@
 pref("media.mediasource.mp4.enabled", true);
 pref("media.mediasource.webm.enabled", false);
 
+// Enable new MediaFormatReader architecture for mp4 in MSE
+pref("media.mediasource.format-reader.mp4", true);
+// Enable new MediaFormatReader architecture for plain mp4.
+pref("media.format-reader.mp4", true);
+
 #ifdef MOZ_WEBSPEECH
 pref("media.webspeech.recognition.enable", false);
 pref("media.webspeech.synth.enabled", false);
@@ -701,6 +700,8 @@
 pref("canvas.filters.enabled", false);
 // Add support for canvas path objects
 pref("canvas.path.enabled", true);
+// captureStream() on canvas disabled by default
+pref("canvas.capturestream.enabled", false);
 
 // We want the ability to forcibly disable platform a11y, because
 // some non-a11y-related components attempt to bring it up.  See bug
@@ -1342,7 +1343,6 @@
 // Try and use SPDY when using SSL
 pref("network.http.spdy.enabled", true);
 pref("network.http.spdy.enabled.v3-1", true);
-pref("network.http.spdy.enabled.http2draft", true);
 pref("network.http.spdy.enabled.http2", true);
 pref("network.http.spdy.enabled.deps", true);
 pref("network.http.spdy.enforce-tls-profile", true);
@@ -1603,7 +1603,7 @@
 pref("network.dnsCacheExpiration", 60);
 
 // Get TTL; not supported on all platforms; nop on the unsupported ones.
-pref("network.dns.get-ttl", false);
+pref("network.dns.get-ttl", true);
 
 // The grace period allows the DNS cache to use expired entries, while kicking off
 // a revalidation in the background.
@@ -3075,6 +3075,34 @@
 pref("intl.tsf.hack.google_ja_input.do_not_return_no_layout_error_at_caret", true);
 #endif
 
+// If composition_font is set, Gecko sets the font to IME.  IME may use
+// the fonts on their window like candidate window.  If they are empty,
+// Gecko uses the system default font which is set to the IM context.
+// The font name must not start with '@'.  When the writing mode is vertical,
+// Gecko inserts '@' to the start of the font name automatically.
+// FYI: Changing these prefs requires to restart.
+pref("intl.imm.composition_font", "");
+
+// Japanist 2003's candidate window is broken if the font is "@System" which
+// is default composition font for vertical writing mode.
+// You can specify font to use on candidate window of Japanist 2003.
+// This value must not start with '@'.
+// FYI: Changing this pref requires to restart.
+pref("intl.imm.composition_font.japanist_2003", "MS PGothic");
+
+// Even if IME claims that they support vertical writing mode but it may not
+// support vertical writing mode for its candidate window.  This pref allows
+// to ignore the claim.
+// FYI: Changing this pref requires to restart.
+pref("intl.imm.vertical_writing.always_assume_not_supported", false);
+
+// We cannot retrieve active IME name with IMM32 API if a TIP of TSF is active.
+// This pref can specify active IME name when Japanese TIP is active.
+// For example:
+//   Google Japanese Input: "Google 日本語入力 IMM32 モジュール"
+//   ATOK 2011: "ATOK 2011" (similarly, e.g., ATOK 2013 is "ATOK 2013")
+pref("intl.imm.japanese.assume_active_tip_name_as", "");
+
 // See bug 448927, on topmost panel, some IMEs are not usable on Windows.
 pref("ui.panel.default_level_parent", false);
 
@@ -3608,6 +3636,18 @@
 pref("intl.ime.use_simple_context_on_password_field", false);
 #endif
 
+# enable new platform fontlist for linux on GTK platforms
+# temporary pref to allow flipping back to the existing
+# gfxPangoFontGroup/gfxFontconfigUtils code for handling system fonts
+
+#ifdef MOZ_WIDGET_GTK
+#ifdef RELEASE_BUILD
+pref("gfx.font_rendering.fontconfig.fontlist.enabled", false);
+#else
+pref("gfx.font_rendering.fontconfig.fontlist.enabled", true);
+#endif
+#endif
+
 # XP_UNIX
 #endif
 #endif
@@ -3800,6 +3840,7 @@
 pref("signon.autofillForms",                true);
 pref("signon.autologin.proxy",              false);
 pref("signon.storeWhenAutocompleteOff",     true);
+pref("signon.ui.experimental",              false);
 pref("signon.debug",                        false);
 
 // Satchel (Form Manager) prefs
@@ -3959,6 +4000,7 @@
 pref("webgl.enable-privileged-extensions", false);
 pref("webgl.bypass-shader-validation", false);
 pref("webgl.enable-prototype-webgl2", false);
+pref("webgl.disable-fail-if-major-performance-caveat", false);
 pref("gl.require-hardware", false);
 
 #ifdef XP_WIN
@@ -4113,6 +4155,9 @@
 // platform and are the optimal surface type.
 pref("layers.gralloc.disable", false);
 
+// Don't use compositor-lru on this platform
+pref("layers.compositor-lru-size", 0);
+
 // Enable/Disable the geolocation API for content
 pref("geo.enabled", true);
 
@@ -4161,7 +4206,6 @@
 // DOM full-screen API.
 pref("full-screen-api.enabled", false);
 pref("full-screen-api.allow-trusted-requests-only", true);
-pref("full-screen-api.content-only", false);
 pref("full-screen-api.pointer-lock.enabled", true);
 
 // DOM idle observers API
@@ -4553,9 +4597,31 @@
 // Selection carets will fall-back to internal LongTap detector.
 pref("selectioncaret.detects.longtap", true);
 
+// Selection carets do not affect caret visibility.
+pref("selectioncaret.visibility.affectscaret", false);
+
+// Selection caret visibility does not observe composition
+// selections generated by soft keyboard managers.
+pref("selectioncaret.observes.compositions", false);
+
+// The Touch caret by default observes the b2g visibility rules, and
+// not the extended Android visibility rules that allow for touchcaret
+// display in empty editable fields, for example.
+pref("touchcaret.extendedvisibility", false);
+
+// Desktop and b2g don't need to open or close the Android
+// TextSelection (Actionbar) utility.
+pref("caret.manages-android-actionbar", false);
+
 // New implementation to unify touch-caret and selection-carets.
 pref("layout.accessiblecaret.enabled", false);
 
+// CSS attributes of the AccessibleCaret in CSS pixels.
+pref("layout.accessiblecaret.width", "44.0");
+pref("layout.accessiblecaret.height", "47.0");
+pref("layout.accessiblecaret.margin-left", "-23.5");
+pref("layout.accessiblecaret.bar.width", "2.0");
+
 // Timeout in milliseconds to hide the accessiblecaret under cursor mode while
 // no one touches it. Set the value to 0 to disable this feature.
 pref("layout.accessiblecaret.timeout_ms", 3000);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/modules/libpref/nsPrefBranch.cpp firefox-trunk-41.0~a1~hg20150524r245419/modules/libpref/nsPrefBranch.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/modules/libpref/nsPrefBranch.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/modules/libpref/nsPrefBranch.cpp	2015-05-25 20:43:58.000000000 +0000
@@ -555,15 +555,15 @@
   *aChildArray = nullptr;
   *aCount = 0;
 
-  if (!gHashTable.IsInitialized())
+  if (!gHashTable->IsInitialized())
     return NS_ERROR_NOT_INITIALIZED;
 
   // this will contain a list of all the pref name strings
   // allocate on the stack for speed
-  
+
   ed.parent = getPrefName(aStartingAt);
   ed.pref_list = &prefArray;
-  PL_DHashTableEnumerate(&gHashTable, pref_enumChild, &ed);
+  PL_DHashTableEnumerate(gHashTable, pref_enumChild, &ed);
 
   // now that we've built up the list, run the callback on
   // all the matching elements
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/modules/libpref/prefapi.cpp firefox-trunk-41.0~a1~hg20150524r245419/modules/libpref/prefapi.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/modules/libpref/prefapi.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/modules/libpref/prefapi.cpp	2015-05-25 20:43:58.000000000 +0000
@@ -25,7 +25,7 @@
 #include "plstr.h"
 #include "pldhash.h"
 #include "plbase64.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prprf.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/dom/PContent.h"
@@ -68,7 +68,7 @@
     return (strcmp(prefEntry->key, otherKey) == 0);
 }
 
-PLDHashTable        gHashTable;
+PLDHashTable2*      gHashTable;
 static PLArenaPool  gPrefNameArena;
 bool                gDirty = false;
 
@@ -149,9 +149,10 @@
 
 nsresult PREF_Init()
 {
-    if (!gHashTable.IsInitialized()) {
-        PL_DHashTableInit(&gHashTable, &pref_HashTableOps,
-                          sizeof(PrefHashEntry), PREF_HASHTABLE_INITIAL_LENGTH);
+    if (!gHashTable) {
+        gHashTable = new PLDHashTable2(&pref_HashTableOps,
+                                       sizeof(PrefHashEntry),
+                                       PREF_HASHTABLE_INITIAL_LENGTH);
 
         PL_INIT_ARENA_POOL(&gPrefNameArena, "PrefNameArena",
                            PREFNAME_ARENA_SIZE);
@@ -182,8 +183,9 @@
 /* Frees up all the objects except the callback list. */
 void PREF_CleanupPrefs()
 {
-    if (gHashTable.IsInitialized()) {
-        PL_DHashTableFinish(&gHashTable);
+    if (gHashTable) {
+        delete gHashTable;
+        gHashTable = nullptr;
         PL_FinishArenaPool(&gPrefNameArena);
     }
 }
@@ -466,7 +468,7 @@
 
 bool PREF_HasUserPref(const char *pref_name)
 {
-    if (!gHashTable.IsInitialized())
+    if (!gHashTable)
         return false;
 
     PrefHashEntry *pref = pref_HashTableLookup(pref_name);
@@ -480,7 +482,7 @@
 nsresult
 PREF_CopyCharPref(const char *pref_name, char ** return_buffer, bool get_default)
 {
-    if (!gHashTable.IsInitialized())
+    if (!gHashTable)
         return NS_ERROR_NOT_INITIALIZED;
 
     nsresult rv = NS_ERROR_UNEXPECTED;
@@ -504,7 +506,7 @@
 
 nsresult PREF_GetIntPref(const char *pref_name,int32_t * return_int, bool get_default)
 {
-    if (!gHashTable.IsInitialized())
+    if (!gHashTable)
         return NS_ERROR_NOT_INITIALIZED;
 
     nsresult rv = NS_ERROR_UNEXPECTED;
@@ -528,7 +530,7 @@
 
 nsresult PREF_GetBoolPref(const char *pref_name, bool * return_value, bool get_default)
 {
-    if (!gHashTable.IsInitialized())
+    if (!gHashTable)
         return NS_ERROR_NOT_INITIALIZED;
 
     nsresult rv = NS_ERROR_UNEXPECTED;
@@ -579,7 +581,7 @@
 
     int len = (int)strlen(branch_name);
 
-    if (!gHashTable.IsInitialized())
+    if (!gHashTable)
         return NS_ERROR_NOT_INITIALIZED;
 
     /* The following check insures that if the branch name already has a "."
@@ -592,7 +594,7 @@
     if ((len > 1) && branch_name[len - 1] != '.')
         branch_dot += '.';
 
-    PL_DHashTableEnumerate(&gHashTable, pref_DeleteItem,
+    PL_DHashTableEnumerate(gHashTable, pref_DeleteItem,
                            (void*) branch_dot.get());
     gDirty = true;
     return NS_OK;
@@ -602,7 +604,7 @@
 nsresult
 PREF_ClearUserPref(const char *pref_name)
 {
-    if (!gHashTable.IsInitialized())
+    if (!gHashTable)
         return NS_ERROR_NOT_INITIALIZED;
 
     PrefHashEntry* pref = pref_HashTableLookup(pref_name);
@@ -611,7 +613,7 @@
         pref->flags &= ~PREF_USERSET;
 
         if (!(pref->flags & PREF_HAS_DEFAULT)) {
-            PL_DHashTableRemove(&gHashTable, pref_name);
+            PL_DHashTableRemove(gHashTable, pref_name);
         }
 
         pref_DoCallback(pref_name);
@@ -647,11 +649,11 @@
     MOZ_ASSERT(NS_IsMainThread());
 #endif
 
-    if (!gHashTable.IsInitialized())
+    if (!gHashTable)
         return NS_ERROR_NOT_INITIALIZED;
 
     std::vector<std::string> prefStrings;
-    PL_DHashTableEnumerate(&gHashTable, pref_ClearUserPref, static_cast<void*>(&prefStrings));
+    PL_DHashTableEnumerate(gHashTable, pref_ClearUserPref, static_cast<void*>(&prefStrings));
 
     for (std::string& prefString : prefStrings) {
         pref_DoCallback(prefString.c_str());
@@ -663,7 +665,7 @@
 
 nsresult PREF_LockPref(const char *key, bool lockit)
 {
-    if (!gHashTable.IsInitialized())
+    if (!gHashTable)
         return NS_ERROR_NOT_INITIALIZED;
 
     PrefHashEntry* pref = pref_HashTableLookup(key);
@@ -734,7 +736,7 @@
     MOZ_ASSERT(NS_IsMainThread());
 #endif
 
-    return static_cast<PrefHashEntry*>(PL_DHashTableSearch(&gHashTable, key));
+    return static_cast<PrefHashEntry*>(PL_DHashTableSearch(gHashTable, key));
 }
 
 nsresult pref_HashPref(const char *key, PrefValue value, PrefType type, uint32_t flags)
@@ -743,11 +745,11 @@
     MOZ_ASSERT(NS_IsMainThread());
 #endif
 
-    if (!gHashTable.IsInitialized())
+    if (!gHashTable)
         return NS_ERROR_OUT_OF_MEMORY;
 
     PrefHashEntry* pref = static_cast<PrefHashEntry*>
-        (PL_DHashTableAdd(&gHashTable, key, fallible));
+        (PL_DHashTableAdd(gHashTable, key, fallible));
 
     if (!pref)
         return NS_ERROR_OUT_OF_MEMORY;
@@ -839,8 +841,7 @@
 PrefType
 PREF_GetPrefType(const char *pref_name)
 {
-    if (gHashTable.IsInitialized())
-    {
+    if (gHashTable) {
         PrefHashEntry* pref = pref_HashTableLookup(pref_name);
         if (pref)
         {
@@ -861,7 +862,7 @@
 PREF_PrefIsLocked(const char *pref_name)
 {
     bool result = false;
-    if (gIsAnyPrefLocked && gHashTable.IsInitialized()) {
+    if (gIsAnyPrefLocked && gHashTable) {
         PrefHashEntry* pref = pref_HashTableLookup(pref_name);
         if (pref && PREF_IS_LOCKED(pref))
             result = true;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/modules/libpref/prefapi_private_data.h firefox-trunk-41.0~a1~hg20150524r245419/modules/libpref/prefapi_private_data.h
--- firefox-trunk-41.0~a1~hg20150513r243603/modules/libpref/prefapi_private_data.h	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/modules/libpref/prefapi_private_data.h	2015-05-25 20:43:58.000000000 +0000
@@ -10,8 +10,8 @@
 
 #include "mozilla/MemoryReporting.h"
 
-extern PLDHashTable			gHashTable;
-extern bool                 gDirty;
+extern PLDHashTable2* gHashTable;
+extern bool gDirty;
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/modules/libpref/Preferences.cpp firefox-trunk-41.0~a1~hg20150524r245419/modules/libpref/Preferences.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/modules/libpref/Preferences.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/modules/libpref/Preferences.cpp	2015-05-25 20:43:58.000000000 +0000
@@ -235,10 +235,10 @@
   NS_ENSURE_TRUE(InitStaticMembers(), 0);
 
   size_t n = aMallocSizeOf(sPreferences);
-  if (gHashTable.IsInitialized()) {
+  if (gHashTable) {
     // pref keys are allocated in a private arena, which we count elsewhere.
     // pref stringvals are allocated out of the same private arena.
-    n += PL_DHashTableSizeOfExcludingThis(&gHashTable, nullptr, aMallocSizeOf);
+    n += PL_DHashTableSizeOfExcludingThis(gHashTable, nullptr, aMallocSizeOf);
   }
   if (gCacheData) {
     n += gCacheData->SizeOfIncludingThis(aMallocSizeOf);
@@ -738,8 +738,8 @@
 void
 Preferences::GetPreferences(InfallibleTArray<PrefSetting>* aPrefs)
 {
-  aPrefs->SetCapacity(gHashTable.Capacity());
-  PL_DHashTableEnumerate(&gHashTable, pref_GetPrefs, aPrefs);
+  aPrefs->SetCapacity(gHashTable->Capacity());
+  PL_DHashTableEnumerate(gHashTable, pref_GetPrefs, aPrefs);
 }
 
 NS_IMETHODIMP
@@ -944,7 +944,7 @@
   uint32_t                  writeAmount;
   nsresult                  rv;
 
-  if (!gHashTable.IsInitialized())
+  if (!gHashTable)
     return NS_ERROR_NOT_INITIALIZED;
 
   // execute a "safe" save by saving through a tempfile
@@ -958,23 +958,24 @@
   if (NS_FAILED(rv)) 
       return rv;  
 
-  nsAutoArrayPtr<char*> valueArray(new char*[gHashTable.EntryCount()]);
-  memset(valueArray, 0, gHashTable.EntryCount() * sizeof(char*));
+  nsAutoArrayPtr<char*> valueArray(new char*[gHashTable->EntryCount()]);
+  memset(valueArray, 0, gHashTable->EntryCount() * sizeof(char*));
   pref_saveArgs saveArgs;
   saveArgs.prefArray = valueArray;
   saveArgs.saveTypes = SAVE_ALL;
-  
+
   // get the lines that we're supposed to be writing to the file
-  PL_DHashTableEnumerate(&gHashTable, pref_savePref, &saveArgs);
-    
+  PL_DHashTableEnumerate(gHashTable, pref_savePref, &saveArgs);
+
   /* Sort the preferences to make a readable file on disk */
-  NS_QuickSort(valueArray, gHashTable.EntryCount(), sizeof(char *), pref_CompareStrings, nullptr);
-  
+  NS_QuickSort(valueArray, gHashTable->EntryCount(), sizeof(char *),
+               pref_CompareStrings, nullptr);
+
   // write out the file header
   outStream->Write(outHeader, sizeof(outHeader) - 1, &writeAmount);
 
   char** walker = valueArray;
-  for (uint32_t valueIdx = 0; valueIdx < gHashTable.EntryCount(); valueIdx++, walker++) {
+  for (uint32_t valueIdx = 0; valueIdx < gHashTable->EntryCount(); valueIdx++, walker++) {
     if (*walker) {
       outStream->Write(*walker, strlen(*walker), &writeAmount);
       outStream->Write(NS_LINEBREAK, NS_LINEBREAK_LEN, &writeAmount);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/moz.build firefox-trunk-41.0~a1~hg20150524r245419/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/moz.build	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/moz.build	2015-05-25 20:43:58.000000000 +0000
@@ -40,7 +40,7 @@
         'mozglue',
     ]
 
-    if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
+    if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android' and int(CONFIG['MOZ_ANDROID_MIN_SDK_VERSION']) < 11:
         DIRS += ['other-licenses/android']
 
 if not CONFIG['JS_STANDALONE']:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mozglue/linker/BaseElf.cpp firefox-trunk-41.0~a1~hg20150524r245419/mozglue/linker/BaseElf.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/mozglue/linker/BaseElf.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mozglue/linker/BaseElf.cpp	2015-05-25 20:43:58.000000000 +0000
@@ -170,7 +170,7 @@
     static_cast<void *>(elf));
 
   ElfLoader::Singleton.Register(elf);
-  return elf;
+  return elf.forget();
 }
 
 bool
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mozglue/linker/CustomElf.cpp firefox-trunk-41.0~a1~hg20150524r245419/mozglue/linker/CustomElf.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/mozglue/linker/CustomElf.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mozglue/linker/CustomElf.cpp	2015-05-25 20:43:58.000000000 +0000
@@ -263,7 +263,7 @@
   }
   DEBUG_LOG("CustomElf::Load(\"%s\", 0x%x) = %p", path, flags,
             static_cast<void *>(elf));
-  return elf;
+  return elf.forget();
 }
 
 CustomElf::~CustomElf()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mozglue/linker/ElfLoader.cpp firefox-trunk-41.0~a1~hg20150524r245419/mozglue/linker/ElfLoader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/mozglue/linker/ElfLoader.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mozglue/linker/ElfLoader.cpp	2015-05-25 20:43:58.000000000 +0000
@@ -268,7 +268,8 @@
   if (handle) {
     SystemElf *elf = new SystemElf(path, handle);
     ElfLoader::Singleton.Register(elf);
-    return elf;
+    RefPtr<LibHandle> lib(elf);
+    return lib.forget();
   }
   return nullptr;
 }
@@ -345,7 +346,7 @@
   /* Handle dlopen(nullptr) directly. */
   if (!path) {
     handle = SystemElf::Load(nullptr, flags);
-    return handle;
+    return handle.forget();
   }
 
   /* TODO: Handle relative paths correctly */
@@ -355,12 +356,16 @@
    * path is not absolute, compare file names, otherwise compare full paths. */
   if (name == path) {
     for (LibHandleList::iterator it = handles.begin(); it < handles.end(); ++it)
-      if ((*it)->GetName() && (strcmp((*it)->GetName(), name) == 0))
-        return *it;
+      if ((*it)->GetName() && (strcmp((*it)->GetName(), name) == 0)) {
+        handle = *it;
+        return handle.forget();
+      }
   } else {
     for (LibHandleList::iterator it = handles.begin(); it < handles.end(); ++it)
-      if ((*it)->GetPath() && (strcmp((*it)->GetPath(), path) == 0))
-        return *it;
+      if ((*it)->GetPath() && (strcmp((*it)->GetPath(), path) == 0)) {
+        handle = *it;
+        return handle.forget();
+      }
   }
 
   char *abs_path = nullptr;
@@ -398,7 +403,7 @@
             reinterpret_cast<void *>(parent), parent ? parent->GetPath() : "",
             static_cast<void *>(handle));
 
-  return handle;
+  return handle.forget();
 }
 
 mozilla::TemporaryRef<LibHandle>
@@ -406,8 +411,10 @@
 {
   /* Scan the list of handles we already have for a match */
   for (LibHandleList::iterator it = handles.begin(); it < handles.end(); ++it) {
-    if ((*it)->Contains(addr))
-      return *it;
+    if ((*it)->Contains(addr)) {
+      RefPtr<LibHandle> lib = *it;
+      return lib.forget();
+    }
   }
   return nullptr;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/mozglue/linker/Zip.cpp firefox-trunk-41.0~a1~hg20150524r245419/mozglue/linker/Zip.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/mozglue/linker/Zip.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/mozglue/linker/Zip.cpp	2015-05-25 20:43:58.000000000 +0000
@@ -54,7 +54,7 @@
   }
 
   ZipCollection::Singleton.Register(zip);
-  return zip;
+  return zip.forget();
 }
 
 Zip::Zip(const char *filename, void *mapped, size_t size)
@@ -187,8 +187,10 @@
   /* Search the list of Zips we already have for a match */
   for (std::vector<Zip *>::iterator it = Singleton.zips.begin();
        it < Singleton.zips.end(); ++it) {
-    if ((*it)->GetName() && (strcmp((*it)->GetName(), path) == 0))
-      return *it;
+    if ((*it)->GetName() && (strcmp((*it)->GetName(), path) == 0)) {
+      mozilla::RefPtr<Zip> zip = *it;
+      return zip.forget();
+    }
   }
   return Zip::Create(path);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/BackgroundFileSaver.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/BackgroundFileSaver.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/BackgroundFileSaver.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/BackgroundFileSaver.cpp	2015-05-25 20:43:58.000000000 +0000
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "pk11pub.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "ScopedNSSTypes.h"
 #include "secoidt.h"
 
@@ -34,7 +34,7 @@
 
 // NSPR_LOG_MODULES=BackgroundFileSaver:5
 PRLogModuleInfo *BackgroundFileSaver::prlog = nullptr;
-#define LOG(args) PR_LOG(BackgroundFileSaver::prlog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(BackgroundFileSaver::prlog, PR_LOG_DEBUG, args)
 #define LOG_ENABLED() PR_LOG_TEST(BackgroundFileSaver::prlog, 4)
 
 ////////////////////////////////////////////////////////////////////////////////
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/Dashboard.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/Dashboard.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/Dashboard.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/Dashboard.cpp	2015-05-25 20:43:58.000000000 +0000
@@ -387,7 +387,7 @@
     Sequence<mozilla::dom::SocketElement> &sockets = dict.mSockets.Value();
 
     uint32_t length = socketData->mData.Length();
-    if (!sockets.SetCapacity(length)) {
+    if (!sockets.SetCapacity(length, fallible)) {
             JS_ReportOutOfMemory(cx);
             return NS_ERROR_OUT_OF_MEMORY;
     }
@@ -457,7 +457,7 @@
     Sequence<HttpConnectionElement> &connections = dict.mConnections.Value();
 
     uint32_t length = httpData->mData.Length();
-    if (!connections.SetCapacity(length)) {
+    if (!connections.SetCapacity(length, fallible)) {
             JS_ReportOutOfMemory(cx);
             return NS_ERROR_OUT_OF_MEMORY;
     }
@@ -478,9 +478,10 @@
         Sequence<HttpConnInfo> &idle = connection.mIdle.Value();
         Sequence<HalfOpenInfoDict> &halfOpens = connection.mHalfOpens.Value();
 
-        if (!active.SetCapacity(httpData->mData[i].active.Length()) ||
-            !idle.SetCapacity(httpData->mData[i].idle.Length()) ||
-            !halfOpens.SetCapacity(httpData->mData[i].halfOpens.Length())) {
+        if (!active.SetCapacity(httpData->mData[i].active.Length(), fallible) ||
+            !idle.SetCapacity(httpData->mData[i].idle.Length(), fallible) ||
+            !halfOpens.SetCapacity(httpData->mData[i].halfOpens.Length(),
+                                   fallible)) {
                 JS_ReportOutOfMemory(cx);
                 return NS_ERROR_OUT_OF_MEMORY;
         }
@@ -619,7 +620,7 @@
 
     mozilla::MutexAutoLock lock(mWs.lock);
     uint32_t length = mWs.data.Length();
-    if (!websockets.SetCapacity(length)) {
+    if (!websockets.SetCapacity(length, fallible)) {
         JS_ReportOutOfMemory(cx);
         return NS_ERROR_OUT_OF_MEMORY;
     }
@@ -692,7 +693,7 @@
     Sequence<mozilla::dom::DnsCacheEntry> &entries = dict.mEntries.Value();
 
     uint32_t length = dnsData->mData.Length();
-    if (!entries.SetCapacity(length)) {
+    if (!entries.SetCapacity(length, fallible)) {
         JS_ReportOutOfMemory(cx);
         return NS_ERROR_OUT_OF_MEMORY;
     }
@@ -702,7 +703,7 @@
         entry.mHostaddr.Construct();
 
         Sequence<nsString> &addrs = entry.mHostaddr.Value();
-        if (!addrs.SetCapacity(dnsData->mData[i].hostaddr.Length())) {
+        if (!addrs.SetCapacity(dnsData->mData[i].hostaddr.Length(), fallible)) {
             JS_ReportOutOfMemory(cx);
             return NS_ERROR_OUT_OF_MEMORY;
         }
@@ -780,10 +781,6 @@
 {
     if (pv == SPDY_VERSION_31) {
         protocolVersion.AssignLiteral(MOZ_UTF16("spdy/3.1"));
-    } else if (pv == HTTP_VERSION_2_DRAFT_15) {
-        protocolVersion.AssignLiteral(MOZ_UTF16("h2-14/15"));
-    } else if (pv == HTTP_VERSION_2_DRAFT_LATEST) {
-        protocolVersion.Assign(NS_LITERAL_STRING(HTTP2_DRAFT_LATEST_TOKEN));
     } else {
         MOZ_ASSERT (pv == HTTP_VERSION_2);
         protocolVersion.Assign(MOZ_UTF16("h2"));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/NetUtil.jsm firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/NetUtil.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/NetUtil.jsm	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/NetUtil.jsm	2015-05-25 20:43:58.000000000 +0000
@@ -159,98 +159,6 @@
     },
 
     /**
-     * @deprecated Use asyncFecth({ ...options... }, callback) instead.
-     */
-    asyncFetch2: function NetUtil_asyncFetch2(aSource,
-                                              aCallback,
-                                              aLoadingNode,
-                                              aLoadingPrincipal,
-                                              aTriggeringPrincipal,
-                                              aSecurityFlags,
-                                              aContentPolicyType)
-    {
-        if (!aSource || !aCallback) {
-            let exception = new Components.Exception(
-                "Must have a source and a callback",
-                Cr.NS_ERROR_INVALID_ARG,
-                Components.stack.caller
-            );
-            throw exception;
-        }
-
-        // if aSource is an instance of an nsIChannel, all the individual
-        // args to create a loadInfo must be "undefined".
-        if (aSource instanceof Ci.nsIChannel) {
-          if ((typeof aLoadingNode != "undefined") ||
-              (typeof aLoadingPrincipal != "undefined") ||
-              (typeof aTriggeringPrincipal != "undefined") ||
-              (typeof aSecurityFlags != "undefined") ||
-              (typeof aContentPolicyType != "undefined")) {
-
-            let exception = new Components.Exception(
-                "LoadInfo arguments must be undefined",
-                Cr.NS_ERROR_INVALID_ARG,
-                Components.stack.caller
-            );
-            throw exception;
-          }
-        }
-
-        // Create a pipe that will create our output stream that we can use once
-        // we have gotten all the data.
-        let pipe = Cc["@mozilla.org/pipe;1"].
-                   createInstance(Ci.nsIPipe);
-        pipe.init(true, true, 0, PR_UINT32_MAX, null);
-
-        // Create a listener that will give data to the pipe's output stream.
-        let listener = Cc["@mozilla.org/network/simple-stream-listener;1"].
-                       createInstance(Ci.nsISimpleStreamListener);
-        listener.init(pipe.outputStream, {
-            onStartRequest: function(aRequest, aContext) {},
-            onStopRequest: function(aRequest, aContext, aStatusCode) {
-                pipe.outputStream.close();
-                aCallback(pipe.inputStream, aStatusCode, aRequest);
-            }
-        });
-
-        // Input streams are handled slightly differently from everything else.
-        if (aSource instanceof Ci.nsIInputStream) {
-            let pump = Cc["@mozilla.org/network/input-stream-pump;1"].
-                       createInstance(Ci.nsIInputStreamPump);
-            pump.init(aSource, -1, -1, 0, 0, true);
-            pump.asyncRead(listener, null);
-            return;
-        }
-
-        let channel = aSource;
-        if (!(channel instanceof Ci.nsIChannel)) {
-            channel = this.newChannel2(aSource,
-                                       "",   // aOriginCharset
-                                       null, // aBaseURI
-                                       aLoadingNode,
-                                       aLoadingPrincipal,
-                                       aTriggeringPrincipal,
-                                       aSecurityFlags,
-                                       aContentPolicyType);
-
-        }
-
-        try {
-            channel.asyncOpen(listener, null);
-        }
-        catch (e) {
-            let exception = new Components.Exception(
-                "Failed to open input source '" + channel.originalURI.spec + "'",
-                e.result,
-                Components.stack.caller,
-                aSource,
-                e
-            );
-            throw exception;
-        }
-    },
-
-    /**
      * Constructs a new URI for the given spec, character set, and base URI, or
      * an nsIFile.
      *
@@ -472,41 +380,6 @@
     },
 
     /**
-     * @deprecated Use newChannel({ ...options... }) instead.
-     */
-    newChannel2: function NetUtil_newChannel2(aWhatToLoad,
-                                              aOriginCharset,
-                                              aBaseURI,
-                                              aLoadingNode,
-                                              aLoadingPrincipal,
-                                              aTriggeringPrincipal,
-                                              aSecurityFlags,
-                                              aContentPolicyType)
-    {
-        if (!aWhatToLoad) {
-            let exception = new Components.Exception(
-                "Must have a non-null string spec, nsIURI, or nsIFile object",
-                Cr.NS_ERROR_INVALID_ARG,
-                Components.stack.caller
-            );
-            throw exception;
-        }
-
-        let uri = aWhatToLoad;
-        if (!(aWhatToLoad instanceof Ci.nsIURI)) {
-            // We either have a string or an nsIFile that we'll need a URI for.
-            uri = this.newURI(aWhatToLoad, aOriginCharset, aBaseURI);
-        }
-
-        return this.ioService.newChannelFromURI2(uri,
-                                                 aLoadingNode,
-                                                 aLoadingPrincipal,
-                                                 aTriggeringPrincipal,
-                                                 aSecurityFlags,
-                                                 aContentPolicyType);
-    },
-
-    /**
      * Reads aCount bytes from aInputStream into a string.
      *
      * @param aInputStream
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsAsyncRedirectVerifyHelper.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsAsyncRedirectVerifyHelper.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsAsyncRedirectVerifyHelper.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsAsyncRedirectVerifyHelper.cpp	2015-05-25 20:43:58.000000000 +0000
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsAsyncRedirectVerifyHelper.h"
 #include "nsThreadUtils.h"
 #include "nsNetUtil.h"
@@ -22,7 +22,7 @@
         sLog = PR_NewLogModule("nsRedirect");
     return sLog;
 }
-#define LOG(args) PR_LOG(GetRedirectLog(), PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(GetRedirectLog(), PR_LOG_DEBUG, args)
 
 NS_IMPL_ISUPPORTS(nsAsyncRedirectVerifyHelper,
                   nsIAsyncVerifyRedirectCallback,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsAsyncStreamCopier.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsAsyncStreamCopier.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsAsyncStreamCopier.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsAsyncStreamCopier.cpp	2015-05-25 20:43:58.000000000 +0000
@@ -8,7 +8,7 @@
 #include "nsStreamUtils.h"
 #include "nsThreadUtils.h"
 #include "nsNetUtil.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 using namespace mozilla;
 
@@ -17,7 +17,7 @@
 // NSPR_LOG_MODULES=nsStreamCopier:5
 //
 static PRLogModuleInfo *gStreamCopierLog = nullptr;
-#define LOG(args) PR_LOG(gStreamCopierLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gStreamCopierLog, PR_LOG_DEBUG, args)
 
 /**
  * An event used to perform initialization off the main thread.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsAutodialWin.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsAutodialWin.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsAutodialWin.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsAutodialWin.cpp	2015-05-25 20:43:58.000000000 +0000
@@ -12,7 +12,7 @@
 #include <winsvc.h>
 #include "nsString.h"
 #include "nsAutodialWin.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsWindowsHelpers.h"
 
 #define AUTODIAL_DEFAULT AUTODIAL_NEVER
@@ -33,8 +33,8 @@
 
 #undef LOGD
 #undef LOGE
-#define LOGD(args) PR_LOG(gLog, PR_LOG_DEBUG, args)
-#define LOGE(args) PR_LOG(gLog, PR_LOG_ERROR, args)
+#define LOGD(args) MOZ_LOG(gLog, PR_LOG_DEBUG, args)
+#define LOGE(args) MOZ_LOG(gLog, PR_LOG_ERROR, args)
 
 // Don't try to dial again within a few seconds of when user pressed cancel.
 #define NO_RETRY_PERIOD_SEC 5
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsChannelClassifier.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsChannelClassifier.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsChannelClassifier.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsChannelClassifier.cpp	2015-05-25 20:43:58.000000000 +0000
@@ -31,7 +31,7 @@
 
 #include "mozilla/Preferences.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 using mozilla::ArrayLength;
 using mozilla::Preferences;
@@ -41,7 +41,7 @@
 //
 static PRLogModuleInfo *gChannelClassifierLog;
 #undef LOG
-#define LOG(args)     PR_LOG(gChannelClassifierLog, PR_LOG_DEBUG, args)
+#define LOG(args)     MOZ_LOG(gChannelClassifierLog, PR_LOG_DEBUG, args)
 
 NS_IMPL_ISUPPORTS(nsChannelClassifier,
                   nsIURIClassifierCallback)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsDirectoryIndexStream.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsDirectoryIndexStream.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsDirectoryIndexStream.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsDirectoryIndexStream.cpp	2015-05-25 20:43:58.000000000 +0000
@@ -16,7 +16,7 @@
 
 #include "nsEscape.h"
 #include "nsDirectoryIndexStream.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prtime.h"
 static PRLogModuleInfo* gLog;
 
@@ -47,7 +47,7 @@
     if (! gLog)
         gLog = PR_NewLogModule("nsDirectoryIndexStream");
 
-    PR_LOG(gLog, PR_LOG_DEBUG,
+    MOZ_LOG(gLog, PR_LOG_DEBUG,
            ("nsDirectoryIndexStream[%p]: created", this));
 }
 
@@ -95,7 +95,7 @@
     if (PR_LOG_TEST(gLog, PR_LOG_DEBUG)) {
         nsAutoCString path;
         aDir->GetNativePath(path);
-        PR_LOG(gLog, PR_LOG_DEBUG,
+        MOZ_LOG(gLog, PR_LOG_DEBUG,
                ("nsDirectoryIndexStream[%p]: initialized on %s",
                 this, path.get()));
     }
@@ -157,7 +157,7 @@
 
 nsDirectoryIndexStream::~nsDirectoryIndexStream()
 {
-    PR_LOG(gLog, PR_LOG_DEBUG,
+    MOZ_LOG(gLog, PR_LOG_DEBUG,
            ("nsDirectoryIndexStream[%p]: destroyed", this));
 }
 
@@ -242,7 +242,7 @@
             if (PR_LOG_TEST(gLog, PR_LOG_DEBUG)) {
                 nsAutoCString path;
                 current->GetNativePath(path);
-                PR_LOG(gLog, PR_LOG_DEBUG,
+                MOZ_LOG(gLog, PR_LOG_DEBUG,
                        ("nsDirectoryIndexStream[%p]: iterated %s",
                         this, path.get()));
             }
@@ -254,7 +254,7 @@
             bool hidden = false;
             current->IsHidden(&hidden);
             if (hidden) {
-                PR_LOG(gLog, PR_LOG_DEBUG,
+                MOZ_LOG(gLog, PR_LOG_DEBUG,
                        ("nsDirectoryIndexStream[%p]: skipping hidden file/directory",
                         this));
                 continue;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsICacheInfoChannel.idl firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsICacheInfoChannel.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsICacheInfoChannel.idl	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsICacheInfoChannel.idl	2015-05-25 20:43:59.000000000 +0000
@@ -32,11 +32,11 @@
    * for this channel.  Holding a reference to this key does NOT prevent
    * the cached data from being removed.
    *
-   * A cache key retrieved from a particular instance of nsICachingChannel
-   * could be set on another instance of nsICachingChannel provided the
+   * A cache key retrieved from a particular instance of nsICacheInfoChannel
+   * could be set on another instance of nsICacheInfoChannel provided the
    * underlying implementations are compatible and provided the new 
    * channel instance was created with the same URI.  The implementation of
-   * nsICachingChannel would be expected to use the cache entry identified
+   * nsICacheInfoChannel would be expected to use the cache entry identified
    * by the cache token.  Depending on the value of nsIRequest::loadFlags,
    * the cache entry may be validated, overwritten, or simply read.
    *
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsInputStreamPump.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsInputStreamPump.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsInputStreamPump.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsInputStreamPump.cpp	2015-05-25 20:43:59.000000000 +0000
@@ -12,7 +12,7 @@
 #include "nsIThreadRetargetableStreamListener.h"
 #include "nsThreadUtils.h"
 #include "nsCOMPtr.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "GeckoProfiler.h"
 #include "nsIStreamListener.h"
 #include "nsILoadGroup.h"
@@ -26,7 +26,7 @@
 //
 static PRLogModuleInfo *gStreamPumpLog = nullptr;
 #undef LOG
-#define LOG(args) PR_LOG(gStreamPumpLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gStreamPumpLog, PR_LOG_DEBUG, args)
 
 //-----------------------------------------------------------------------------
 // nsInputStreamPump methods
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsIOService.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsIOService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsIOService.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsIOService.cpp	2015-05-25 20:43:59.000000000 +0000
@@ -600,7 +600,7 @@
 NS_IMETHODIMP
 nsIOService::NewChannelFromURI(nsIURI *aURI, nsIChannel **result)
 {
-  NS_WARNING("Deprecated, use NewChannelFromURI2 providing loadInfo arguments!");
+  NS_ASSERTION(false, "Deprecated, use NewChannelFromURI2 providing loadInfo arguments!");
   return NewChannelFromURI2(aURI,
                             nullptr, // aLoadingNode
                             nullptr, // aLoadingPrincipal
@@ -764,10 +764,8 @@
                                        loadingNode,
                                        aSecurityFlags,
                                        aContentPolicyType);
-      if (!loadInfo) {
-        return NS_ERROR_UNEXPECTED;
-      }
     }
+    NS_ASSERTION(loadInfo, "Please pass security info when creating a channel");
     return NewChannelFromURIWithProxyFlagsInternal(aURI,
                                                    aProxyURI,
                                                    aProxyFlags,
@@ -791,7 +789,7 @@
                                              uint32_t aProxyFlags,
                                              nsIChannel **result)
 {
-  NS_WARNING("Deprecated, use NewChannelFromURIWithProxyFlags2 providing loadInfo arguments!");
+  NS_ASSERTION(false, "Deprecated, use NewChannelFromURIWithProxyFlags2 providing loadInfo arguments!");
   return NewChannelFromURIWithProxyFlags2(aURI,
                                           aProxyURI,
                                           aProxyFlags,
@@ -841,7 +839,7 @@
 NS_IMETHODIMP
 nsIOService::NewChannel(const nsACString &aSpec, const char *aCharset, nsIURI *aBaseURI, nsIChannel **result)
 {
-  NS_WARNING("Deprecated, use NewChannel2 providing loadInfo arguments!");
+  NS_ASSERTION(false, "Deprecated, use NewChannel2 providing loadInfo arguments!");
   return NewChannel2(aSpec,
                      aCharset,
                      aBaseURI,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsLoadGroup.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsLoadGroup.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsLoadGroup.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsLoadGroup.cpp	2015-05-25 20:43:59.000000000 +0000
@@ -11,7 +11,7 @@
 #include "nsArrayEnumerator.h"
 #include "nsCOMArray.h"
 #include "nsCOMPtr.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsString.h"
 #include "nsTArray.h"
 #include "mozilla/Atomics.h"
@@ -41,7 +41,7 @@
 static PRLogModuleInfo* gLoadGroupLog = nullptr;
 
 #undef LOG
-#define LOG(args) PR_LOG(gLoadGroupLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gLoadGroupLog, PR_LOG_DEBUG, args)
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsPACMan.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsPACMan.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsPACMan.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsPACMan.cpp	2015-05-25 20:43:59.000000000 +0000
@@ -26,7 +26,7 @@
 using namespace mozilla::net;
 
 #undef LOG
-#define LOG(args) PR_LOG(GetProxyLog(), PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(GetProxyLog(), PR_LOG_DEBUG, args)
 
 // The PAC thread does evaluations of both PAC files and
 // nsISystemProxySettings because they can both block the calling thread and we
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsPACMan.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsPACMan.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsPACMan.h	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsPACMan.h	2015-05-25 20:43:59.000000000 +0000
@@ -19,7 +19,7 @@
 #include "mozilla/LinkedList.h"
 #include "nsAutoPtr.h"
 #include "mozilla/TimeStamp.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 class nsPACMan;
 class nsISystemProxySettings;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsProtocolProxyService.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsProtocolProxyService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsProtocolProxyService.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsProtocolProxyService.cpp	2015-05-25 20:43:59.000000000 +0000
@@ -47,9 +47,9 @@
 
 using namespace mozilla;
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #undef LOG
-#define LOG(args) PR_LOG(net::GetProxyLog(), PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(net::GetProxyLog(), PR_LOG_DEBUG, args)
 
 //----------------------------------------------------------------------------
 
@@ -407,10 +407,17 @@
 NS_IMPL_RELEASE(nsProtocolProxyService)
 NS_IMPL_CLASSINFO(nsProtocolProxyService, nullptr, nsIClassInfo::SINGLETON,
                   NS_PROTOCOLPROXYSERVICE_CID)
-NS_IMPL_QUERY_INTERFACE_CI(nsProtocolProxyService,
-                           nsIProtocolProxyService,
-                           nsIProtocolProxyService2,
-                           nsIObserver)
+
+// NS_IMPL_QUERY_INTERFACE_CI with the nsProtocolProxyService QI change
+NS_INTERFACE_MAP_BEGIN(nsProtocolProxyService)
+NS_INTERFACE_MAP_ENTRY(nsIProtocolProxyService)
+NS_INTERFACE_MAP_ENTRY(nsIProtocolProxyService2)
+NS_INTERFACE_MAP_ENTRY(nsIObserver)
+if ( aIID.Equals(NS_GET_IID(nsProtocolProxyService)) )  foundInterface = static_cast<nsIProtocolProxyService2*>(this); else
+NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIProtocolProxyService)
+NS_IMPL_QUERY_CLASSINFO(nsProtocolProxyService)
+NS_INTERFACE_MAP_END
+
 NS_IMPL_CI_INTERFACE_GETTER(nsProtocolProxyService,
                             nsIProtocolProxyService,
                             nsIProtocolProxyService2)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsRequestObserverProxy.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsRequestObserverProxy.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsRequestObserverProxy.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsRequestObserverProxy.cpp	2015-05-25 20:43:59.000000000 +0000
@@ -9,14 +9,14 @@
 #include "nsRequestObserverProxy.h"
 #include "nsIRequest.h"
 #include "nsAutoPtr.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 using namespace mozilla;
 
 static PRLogModuleInfo *gRequestObserverProxyLog;
 
 #undef LOG
-#define LOG(args) PR_LOG(gRequestObserverProxyLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gRequestObserverProxyLog, PR_LOG_DEBUG, args)
 
 //-----------------------------------------------------------------------------
 // nsARequestObserverEvent internal class...
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsSocketTransport2.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsSocketTransport2.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsSocketTransport2.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsSocketTransport2.cpp	2015-05-25 20:43:59.000000000 +0000
@@ -1922,7 +1922,8 @@
         }
     }
 
-    if (RecoverFromError())
+    // If we are not offline try again.
+    if (!gIOService->IsOffline() && RecoverFromError())
         mCondition = NS_OK;
     else {
         mState = STATE_CLOSED;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsSocketTransportService2.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsSocketTransportService2.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsSocketTransportService2.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsSocketTransportService2.cpp	2015-05-25 20:43:59.000000000 +0000
@@ -753,7 +753,6 @@
     if (IsNuwaProcess()) {
         NuwaMarkCurrentThread(nullptr, nullptr);
     }
-    NS_SetIgnoreStatusOfCurrentThread();
 #endif
 
     SOCKET_LOG(("STS thread init\n"));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsSocketTransportService2.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsSocketTransportService2.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsSocketTransportService2.h	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsSocketTransportService2.h	2015-05-25 20:43:59.000000000 +0000
@@ -12,7 +12,7 @@
 #include "nsEventQueue.h"
 #include "nsCOMPtr.h"
 #include "prinrval.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prinit.h"
 #include "nsIObserver.h"
 #include "mozilla/Mutex.h"
@@ -29,7 +29,7 @@
 // set NSPR_LOG_MODULES=nsSocketTransport:5
 //
 extern PRLogModuleInfo *gSocketTransportLog;
-#define SOCKET_LOG(args)     PR_LOG(gSocketTransportLog, PR_LOG_DEBUG, args)
+#define SOCKET_LOG(args)     MOZ_LOG(gSocketTransportLog, PR_LOG_DEBUG, args)
 #define SOCKET_LOG_ENABLED() PR_LOG_TEST(gSocketTransportLog, PR_LOG_DEBUG)
 
 //-----------------------------------------------------------------------------
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsStandardURL.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsStandardURL.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsStandardURL.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsStandardURL.cpp	2015-05-25 20:43:59.000000000 +0000
@@ -15,7 +15,7 @@
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsIIDNService.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsAutoPtr.h"
 #include "nsIURLParser.h"
 #include "nsNetCID.h"
@@ -44,7 +44,7 @@
 
 // The Chromium code defines its own LOG macro which we don't want
 #undef LOG
-#define LOG(args)     PR_LOG(gStandardURLLog, PR_LOG_DEBUG, args)
+#define LOG(args)     MOZ_LOG(gStandardURLLog, PR_LOG_DEBUG, args)
 #undef LOG_ENABLED
 #define LOG_ENABLED() PR_LOG_TEST(gStandardURLLog, PR_LOG_DEBUG)
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsUDPSocket.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsUDPSocket.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsUDPSocket.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsUDPSocket.cpp	2015-05-25 20:43:59.000000000 +0000
@@ -660,7 +660,9 @@
 
   PRNetAddr prClientAddr;
   uint32_t count;
-  char buff[1500];
+  // Bug 1165423 - using 8k here because the packet could be larger
+  // than the MTU with fragmentation
+  char buff[8 * 1024];
   count = PR_RecvFrom(mFD, buff, sizeof(buff), 0, &prClientAddr, PR_INTERVAL_NO_WAIT);
 
   if (count < 1) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsURLParsers.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsURLParsers.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/nsURLParsers.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/nsURLParsers.cpp	2015-05-25 20:43:59.000000000 +0000
@@ -119,7 +119,6 @@
         // spec = <scheme>:<path-no-slashes>
         //
         if (!net_IsValidScheme(spec, colon - spec) || (*(colon+1) == ':')) {
-            NS_WARNING("malformed uri");
             return NS_ERROR_MALFORMED_URI;
         }
         SET_RESULT(scheme, offset, colon - spec);
@@ -577,7 +576,6 @@
                 break;
             case ' ':
                 // hostname must not contain a space
-                NS_WARNING("malformed hostname");
                 return NS_ERROR_MALFORMED_URI;
         }
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/Predictor.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/Predictor.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/Predictor.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/Predictor.cpp	2015-05-25 20:43:58.000000000 +0000
@@ -32,7 +32,7 @@
 #ifdef MOZ_NUWA_PROCESS
 #include "ipc/Nuwa.h"
 #endif
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "mozilla/Preferences.h"
 #include "mozilla/Telemetry.h"
@@ -54,7 +54,7 @@
 Predictor *Predictor::sSelf = nullptr;
 
 static PRLogModuleInfo *gPredictorLog = nullptr;
-#define PREDICTOR_LOG(args) PR_LOG(gPredictorLog, 4, args)
+#define PREDICTOR_LOG(args) MOZ_LOG(gPredictorLog, 4, args)
 
 #define RETURN_IF_FAILED(_rv) \
   do { \
@@ -128,7 +128,7 @@
 const uint32_t METADATA_VERSION = 1;
 
 // ID Extensions for cache entries
-const char PREDICTOR_ORIGIN_EXTENSION[] = "predictor-origin";
+#define PREDICTOR_ORIGIN_EXTENSION "predictor-origin"
 
 // Get the full origin (scheme, host, port) out of a URI (maybe should be part
 // of nsIURI instead?)
@@ -506,16 +506,16 @@
 
 // Predictor::nsICacheEntryMetaDataVisitor
 
-static const char seenMetaData[] = "predictor::seen";
-static const char metaDataPrefix[] = "predictor::";
+#define SEEN_META_DATA "predictor::seen"
+#define META_DATA_PREFIX "predictor::"
 nsresult
 Predictor::OnMetaDataElement(const char *asciiKey, const char *asciiValue)
 {
   MOZ_ASSERT(NS_IsMainThread());
 
   if (!StringBeginsWith(nsDependentCString(asciiKey),
-                        NS_LITERAL_CSTRING(metaDataPrefix)) ||
-      NS_LITERAL_CSTRING(seenMetaData).Equals(asciiKey)) {
+                        NS_LITERAL_CSTRING(META_DATA_PREFIX)) ||
+      NS_LITERAL_CSTRING(SEEN_META_DATA).Equals(asciiKey)) {
     // This isn't a bit of metadata we care about
     return NS_OK;
   }
@@ -1336,10 +1336,10 @@
 
   nsCString junk;
   if (!fullUri && reason == nsINetworkPredictor::LEARN_LOAD_TOPLEVEL &&
-      NS_FAILED(entry->GetMetaDataElement(seenMetaData, getter_Copies(junk)))) {
+      NS_FAILED(entry->GetMetaDataElement(SEEN_META_DATA, getter_Copies(junk)))) {
     // This is an origin-only entry that we haven't seen before. Let's mark it
     // as seen.
-    entry->SetMetaDataElement(seenMetaData, "1");
+    entry->SetMetaDataElement(SEEN_META_DATA, "1");
 
     // Need to ensure someone else can get to the entry if necessary
     entry->MetaDataReady();
@@ -1376,8 +1376,8 @@
   MOZ_ASSERT(NS_IsMainThread());
 
   if (!StringBeginsWith(nsDependentCString(key),
-                        NS_LITERAL_CSTRING(metaDataPrefix)) ||
-      NS_LITERAL_CSTRING(seenMetaData).Equals(key)) {
+                        NS_LITERAL_CSTRING(META_DATA_PREFIX)) ||
+      NS_LITERAL_CSTRING(SEEN_META_DATA).Equals(key)) {
     // This isn't a bit of metadata we care about
     return NS_OK;
   }
@@ -1420,7 +1420,7 @@
   RETURN_IF_FAILED(rv);
 
   nsCString key;
-  key.AssignASCII(metaDataPrefix);
+  key.AssignLiteral(META_DATA_PREFIX);
   nsCString uri;
   targetURI->GetAsciiSpec(uri);
   key.Append(uri);
@@ -1554,7 +1554,7 @@
   PREDICTOR_LOG(("    flags -> %u", flags));
 
   if (key) {
-    const char *uriStart = key + (sizeof(metaDataPrefix) - 1);
+    const char *uriStart = key + (sizeof(META_DATA_PREFIX) - 1);
     nsresult rv = NS_NewURI(uri, uriStart, nullptr, mIOService);
     if (NS_FAILED(rv)) {
       PREDICTOR_LOG(("    NS_NewURI returned 0x%X", rv));
@@ -1652,7 +1652,7 @@
   MOZ_ASSERT(NS_IsMainThread());
 
   if (!StringBeginsWith(nsDependentCString(asciiKey),
-                        NS_LITERAL_CSTRING(metaDataPrefix))) {
+                        NS_LITERAL_CSTRING(META_DATA_PREFIX))) {
     // Not a metadata entry we care about, carry on
     return NS_OK;
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/ReferrerPolicy.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/ReferrerPolicy.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/base/ReferrerPolicy.h	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/base/ReferrerPolicy.h	2015-05-25 20:43:58.000000000 +0000
@@ -21,7 +21,7 @@
   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 */
+  /* spec tokens: origin-when-cross-origin */
   RP_Origin_When_Crossorigin     = nsIHttpChannel::REFERRER_POLICY_ORIGIN_WHEN_XORIGIN,
 
   /* spec tokens: always unsafe-url */
@@ -44,7 +44,8 @@
       content.LowerCaseEqualsLiteral("no-referrer-when-downgrade")) {
     return RP_No_Referrer_When_Downgrade;
   }
-  if (content.LowerCaseEqualsLiteral("origin-when-crossorigin")) {
+  if (content.LowerCaseEqualsLiteral("origin-when-cross-origin") ||
+      content.LowerCaseEqualsLiteral("origin-when-crossorigin")) {
     return RP_Origin_When_Crossorigin;
   }
   if (content.LowerCaseEqualsLiteral("always") ||
@@ -64,6 +65,7 @@
       || content.LowerCaseEqualsLiteral("origin")
       || content.LowerCaseEqualsLiteral("default")
       || content.LowerCaseEqualsLiteral("no-referrer-when-downgrade")
+      || content.LowerCaseEqualsLiteral("origin-when-cross-origin")
       || content.LowerCaseEqualsLiteral("origin-when-crossorigin")
       || content.LowerCaseEqualsLiteral("always")
       || content.LowerCaseEqualsLiteral("unsafe-url");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/cache/nsCache.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/cache/nsCache.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/cache/nsCache.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/cache/nsCache.cpp	2015-05-25 20:43:59.000000000 +0000
@@ -32,9 +32,9 @@
     nsAutoCString path;
     nsresult rv = item->GetNativePath(path);
     if (NS_SUCCEEDED(rv)) {
-        PR_LOG(gCacheLog, level, (format, path.get()));
+        MOZ_LOG(gCacheLog, level, (format, path.get()));
     } else {
-        PR_LOG(gCacheLog, level, ("GetNativePath failed: %x", rv));
+        MOZ_LOG(gCacheLog, level, ("GetNativePath failed: %x", rv));
     }
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/cache/nsCache.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/cache/nsCache.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/cache/nsCache.h	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/cache/nsCache.h	2015-05-25 20:43:59.000000000 +0000
@@ -11,7 +11,7 @@
 #ifndef _nsCache_h_
 #define _nsCache_h_
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsISupports.h"
 #include "nsIFile.h"
 #include "nsAString.h"
@@ -25,10 +25,10 @@
                          const char *     format,
                          nsIFile *        item);
 #define CACHE_LOG_INIT()        CacheLogInit()
-#define CACHE_LOG_ALWAYS(args)  PR_LOG(gCacheLog, PR_LOG_ALWAYS, args)
-#define CACHE_LOG_ERROR(args)   PR_LOG(gCacheLog, PR_LOG_ERROR, args)
-#define CACHE_LOG_WARNING(args) PR_LOG(gCacheLog, PR_LOG_WARNING, args)
-#define CACHE_LOG_DEBUG(args)   PR_LOG(gCacheLog, PR_LOG_DEBUG, args)
+#define CACHE_LOG_ALWAYS(args)  MOZ_LOG(gCacheLog, PR_LOG_ALWAYS, args)
+#define CACHE_LOG_ERROR(args)   MOZ_LOG(gCacheLog, PR_LOG_ERROR, args)
+#define CACHE_LOG_WARNING(args) MOZ_LOG(gCacheLog, PR_LOG_WARNING, args)
+#define CACHE_LOG_DEBUG(args)   MOZ_LOG(gCacheLog, PR_LOG_DEBUG, args)
 #define CACHE_LOG_PATH(level, format, item) \
                                 CacheLogPrintPath(level, format, item)
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/cache2/CacheFileContextEvictor.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/cache2/CacheFileContextEvictor.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/cache2/CacheFileContextEvictor.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/cache2/CacheFileContextEvictor.cpp	2015-05-25 20:43:59.000000000 +0000
@@ -20,9 +20,9 @@
 namespace mozilla {
 namespace net {
 
-const char kContextEvictionPrefix[] = "ce_";
+#define CONTEXT_EVICTION_PREFIX "ce_"
 const uint32_t kContextEvictionPrefixLength =
-  sizeof(kContextEvictionPrefix) - 1;
+  sizeof(CONTEXT_EVICTION_PREFIX) - 1;
 
 bool CacheFileContextEvictor::sDiskAlreadySearched = false;
 
@@ -56,7 +56,7 @@
     return rv;
   }
 
-  rv = mEntriesDir->AppendNative(NS_LITERAL_CSTRING(kEntriesDir));
+  rv = mEntriesDir->AppendNative(NS_LITERAL_CSTRING(ENTRIES_DIR));
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -346,7 +346,7 @@
       continue;
     }
 
-    if (!StringBeginsWith(leaf, NS_LITERAL_CSTRING(kContextEvictionPrefix))) {
+    if (!StringBeginsWith(leaf, NS_LITERAL_CSTRING(CONTEXT_EVICTION_PREFIX))) {
       continue;
     }
 
@@ -395,7 +395,7 @@
   nsresult rv;
 
   nsAutoCString leafName;
-  leafName.Assign(NS_LITERAL_CSTRING(kContextEvictionPrefix));
+  leafName.AssignLiteral(CONTEXT_EVICTION_PREFIX);
 
   nsAutoCString keyPrefix;
   CacheFileUtils::AppendKeyPrefix(aLoadContextInfo, keyPrefix);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/cache2/CacheFileIOManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/cache2/CacheFileIOManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/cache2/CacheFileIOManager.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/cache2/CacheFileIOManager.cpp	2015-05-25 20:43:59.000000000 +0000
@@ -2802,7 +2802,7 @@
     return rv;
   }
 
-  rv = file->AppendNative(NS_LITERAL_CSTRING(kEntriesDir));
+  rv = file->AppendNative(NS_LITERAL_CSTRING(ENTRIES_DIR));
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -2817,7 +2817,7 @@
   NS_DispatchToMainThread(r);
 
   // Create a new empty entries directory
-  rv = CheckAndCreateDir(mCacheDirectory, kEntriesDir, false);
+  rv = CheckAndCreateDir(mCacheDirectory, ENTRIES_DIR, false);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -3013,7 +3013,7 @@
 
   srand(static_cast<unsigned>(PR_Now()));
   while (true) {
-    leaf = kTrashDir;
+    leaf = TRASH_DIR;
     leaf.AppendInt(rand());
     rv = trash->SetNativeLeafName(leaf);
     NS_ENSURE_SUCCESS(rv, rv);
@@ -3256,11 +3256,11 @@
       continue;
     }
 
-    if (leafName.Length() < strlen(kTrashDir)) {
+    if (leafName.Length() < strlen(TRASH_DIR)) {
       continue;
     }
 
-    if (!StringBeginsWith(leafName, NS_LITERAL_CSTRING(kTrashDir))) {
+    if (!StringBeginsWith(leafName, NS_LITERAL_CSTRING(TRASH_DIR))) {
       continue;
     }
 
@@ -3422,7 +3422,7 @@
   rv = mCacheDirectory->Clone(getter_AddRefs(file));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = file->AppendNative(NS_LITERAL_CSTRING(kEntriesDir));
+  rv = file->AppendNative(NS_LITERAL_CSTRING(ENTRIES_DIR));
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsAutoCString leafName;
@@ -3458,7 +3458,7 @@
   rv = mCacheDirectory->Clone(getter_AddRefs(file));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = file->AppendNative(NS_LITERAL_CSTRING(kDoomedDir));
+  rv = file->AppendNative(NS_LITERAL_CSTRING(DOOMED_DIR));
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = file->AppendNative(NS_LITERAL_CSTRING("dummyleaf"));
@@ -3586,11 +3586,11 @@
   NS_ENSURE_SUCCESS(rv, rv);
 
   // ensure entries directory exists
-  rv = CheckAndCreateDir(mCacheDirectory, kEntriesDir, false);
+  rv = CheckAndCreateDir(mCacheDirectory, ENTRIES_DIR, false);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // ensure doomed directory exists
-  rv = CheckAndCreateDir(mCacheDirectory, kDoomedDir, true);
+  rv = CheckAndCreateDir(mCacheDirectory, DOOMED_DIR, true);
   NS_ENSURE_SUCCESS(rv, rv);
 
   mTreeCreated = true;
@@ -3782,8 +3782,8 @@
 
   nsresult rv;
 
-  SyncRemoveDir(mCacheDirectory, kEntriesDir);
-  SyncRemoveDir(mCacheDirectory, kDoomedDir);
+  SyncRemoveDir(mCacheDirectory, ENTRIES_DIR);
+  SyncRemoveDir(mCacheDirectory, DOOMED_DIR);
 
   // Clear any intermediate state of trash dir enumeration.
   mFailedTrashDirs.Clear();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/cache2/CacheFileIOManager.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/cache2/CacheFileIOManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/cache2/CacheFileIOManager.h	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/cache2/CacheFileIOManager.h	2015-05-25 20:43:59.000000000 +0000
@@ -32,9 +32,9 @@
 class CacheFileHandlesEntry;
 #endif
 
-const char kEntriesDir[] = "entries";
-const char kDoomedDir[]  = "doomed";
-const char kTrashDir[]   = "trash";
+#define ENTRIES_DIR "entries"
+#define DOOMED_DIR  "doomed"
+#define TRASH_DIR   "trash"
 
 
 class CacheFileHandle : public nsISupports
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/cache2/CacheIndex.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/cache2/CacheIndex.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/cache2/CacheIndex.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/cache2/CacheIndex.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -28,9 +28,9 @@
 #define kIndexVersion          0x00000001
 #define kUpdateIndexStartDelay 50000 // in milliseconds
 
-const char kIndexName[]     = "index";
-const char kTempIndexName[] = "index.tmp";
-const char kJournalName[]   = "index.log";
+#define INDEX_NAME      "index"
+#define TEMP_INDEX_NAME "index.tmp"
+#define JOURNAL_NAME    "index.log"
 
 namespace mozilla {
 namespace net {
@@ -1039,7 +1039,7 @@
     } else {
       // We don't have a handle to index file, so get the file here, but delete
       // it outside the lock. Ignore the result since this is not fatal.
-      index->GetFile(NS_LITERAL_CSTRING(kIndexName), getter_AddRefs(file));
+      index->GetFile(NS_LITERAL_CSTRING(INDEX_NAME), getter_AddRefs(file));
     }
 
     if (index->mJournalHandle) {
@@ -1077,6 +1077,17 @@
     index->mIndexStats.Clear();
     index->mFrecencyArray.Clear();
     index->mIndex.Clear();
+
+    for (uint32_t i = 0; i < index->mIterators.Length(); ) {
+      nsresult rv = index->mIterators[i]->CloseInternal(NS_ERROR_NOT_AVAILABLE);
+      if (NS_FAILED(rv)) {
+        // CacheIndexIterator::CloseInternal() removes itself from mIterators
+        // iff it returns success.
+        LOG(("CacheIndex::RemoveAll() - Failed to remove iterator %p. "
+             "[rv=0x%08x]", rv));
+        i++;
+      }
+    }
   }
 
   if (file) {
@@ -1572,7 +1583,7 @@
   mProcessEntries = mIndexStats.ActiveEntriesCount();
 
   mIndexFileOpener = new FileOpenHelper(this);
-  rv = CacheFileIOManager::OpenFile(NS_LITERAL_CSTRING(kTempIndexName),
+  rv = CacheFileIOManager::OpenFile(NS_LITERAL_CSTRING(TEMP_INDEX_NAME),
                                     CacheFileIOManager::SPECIAL_FILE |
                                     CacheFileIOManager::CREATE,
                                     mIndexFileOpener);
@@ -1823,9 +1834,9 @@
 {
   LOG(("CacheIndex::RemoveIndexFromDisk()"));
 
-  RemoveFile(NS_LITERAL_CSTRING(kIndexName));
-  RemoveFile(NS_LITERAL_CSTRING(kTempIndexName));
-  RemoveFile(NS_LITERAL_CSTRING(kJournalName));
+  RemoveFile(NS_LITERAL_CSTRING(INDEX_NAME));
+  RemoveFile(NS_LITERAL_CSTRING(TEMP_INDEX_NAME));
+  RemoveFile(NS_LITERAL_CSTRING(JOURNAL_NAME));
 }
 
 class WriteLogHelper
@@ -1940,14 +1951,14 @@
   MOZ_ASSERT(mPendingUpdates.Count() == 0);
   MOZ_ASSERT(mState == SHUTDOWN);
 
-  RemoveFile(NS_LITERAL_CSTRING(kTempIndexName));
+  RemoveFile(NS_LITERAL_CSTRING(TEMP_INDEX_NAME));
 
   nsCOMPtr<nsIFile> indexFile;
-  rv = GetFile(NS_LITERAL_CSTRING(kIndexName), getter_AddRefs(indexFile));
+  rv = GetFile(NS_LITERAL_CSTRING(INDEX_NAME), getter_AddRefs(indexFile));
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIFile> logFile;
-  rv = GetFile(NS_LITERAL_CSTRING(kJournalName), getter_AddRefs(logFile));
+  rv = GetFile(NS_LITERAL_CSTRING(JOURNAL_NAME), getter_AddRefs(logFile));
   NS_ENSURE_SUCCESS(rv, rv);
 
   mIndexStats.Log();
@@ -2017,36 +2028,36 @@
   ChangeState(READING);
 
   mIndexFileOpener = new FileOpenHelper(this);
-  rv = CacheFileIOManager::OpenFile(NS_LITERAL_CSTRING(kIndexName),
+  rv = CacheFileIOManager::OpenFile(NS_LITERAL_CSTRING(INDEX_NAME),
                                     CacheFileIOManager::SPECIAL_FILE |
                                     CacheFileIOManager::OPEN,
                                     mIndexFileOpener);
   if (NS_FAILED(rv)) {
     LOG(("CacheIndex::ReadIndexFromDisk() - CacheFileIOManager::OpenFile() "
-         "failed [rv=0x%08x, file=%s]", rv, kIndexName));
+         "failed [rv=0x%08x, file=%s]", rv, INDEX_NAME));
     FinishRead(false);
     return;
   }
 
   mJournalFileOpener = new FileOpenHelper(this);
-  rv = CacheFileIOManager::OpenFile(NS_LITERAL_CSTRING(kJournalName),
+  rv = CacheFileIOManager::OpenFile(NS_LITERAL_CSTRING(JOURNAL_NAME),
                                     CacheFileIOManager::SPECIAL_FILE |
                                     CacheFileIOManager::OPEN,
                                     mJournalFileOpener);
   if (NS_FAILED(rv)) {
     LOG(("CacheIndex::ReadIndexFromDisk() - CacheFileIOManager::OpenFile() "
-         "failed [rv=0x%08x, file=%s]", rv, kJournalName));
+         "failed [rv=0x%08x, file=%s]", rv, JOURNAL_NAME));
     FinishRead(false);
   }
 
   mTmpFileOpener = new FileOpenHelper(this);
-  rv = CacheFileIOManager::OpenFile(NS_LITERAL_CSTRING(kTempIndexName),
+  rv = CacheFileIOManager::OpenFile(NS_LITERAL_CSTRING(TEMP_INDEX_NAME),
                                     CacheFileIOManager::SPECIAL_FILE |
                                     CacheFileIOManager::OPEN,
                                     mTmpFileOpener);
   if (NS_FAILED(rv)) {
     LOG(("CacheIndex::ReadIndexFromDisk() - CacheFileIOManager::OpenFile() "
-         "failed [rv=0x%08x, file=%s]", rv, kTempIndexName));
+         "failed [rv=0x%08x, file=%s]", rv, TEMP_INDEX_NAME));
     FinishRead(false);
   }
 }
@@ -2425,8 +2436,8 @@
     (aSucceeded && mIndexOnDiskIsValid && mJournalReadSuccessfully));
 
   if (mState == SHUTDOWN) {
-    RemoveFile(NS_LITERAL_CSTRING(kTempIndexName));
-    RemoveFile(NS_LITERAL_CSTRING(kJournalName));
+    RemoveFile(NS_LITERAL_CSTRING(TEMP_INDEX_NAME));
+    RemoveFile(NS_LITERAL_CSTRING(JOURNAL_NAME));
   } else {
     if (mIndexHandle && !mIndexOnDiskIsValid) {
       CacheFileIOManager::DoomFile(mIndexHandle, nullptr);
@@ -2571,7 +2582,7 @@
   rv = mCacheDirectory->Clone(getter_AddRefs(file));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = file->AppendNative(NS_LITERAL_CSTRING(kEntriesDir));
+  rv = file->AppendNative(NS_LITERAL_CSTRING(ENTRIES_DIR));
   NS_ENSURE_SUCCESS(rv, rv);
 
   bool exists;
@@ -3367,7 +3378,7 @@
         if (mJournalHandle) { // this shouldn't normally happen
           LOG(("CacheIndex::OnFileOpenedInternal() - Unexpected state, all "
                "files [%s, %s, %s] should never exist. Removing whole index.",
-               kIndexName, kJournalName, kTempIndexName));
+               INDEX_NAME, JOURNAL_NAME, TEMP_INDEX_NAME));
           FinishRead(false);
           break;
         }
@@ -3377,7 +3388,7 @@
         // Rename journal to make sure we update index on next start in case
         // firefox crashes
         rv = CacheFileIOManager::RenameFile(
-          mJournalHandle, NS_LITERAL_CSTRING(kTempIndexName), this);
+          mJournalHandle, NS_LITERAL_CSTRING(TEMP_INDEX_NAME), this);
         if (NS_FAILED(rv)) {
           LOG(("CacheIndex::OnFileOpenedInternal() - CacheFileIOManager::"
                "RenameFile() failed synchronously [rv=0x%08x]", rv));
@@ -3435,7 +3446,7 @@
       } else {
         if (mSkipEntries == mProcessEntries) {
           rv = CacheFileIOManager::RenameFile(mIndexHandle,
-                                              NS_LITERAL_CSTRING(kIndexName),
+                                              NS_LITERAL_CSTRING(INDEX_NAME),
                                               this);
           if (NS_FAILED(rv)) {
             LOG(("CacheIndex::OnDataWritten() - CacheFileIOManager::"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/cache2/CacheLog.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/cache2/CacheLog.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/cache2/CacheLog.h	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/cache2/CacheLog.h	2015-05-25 20:44:00.000000000 +0000
@@ -5,13 +5,13 @@
 #ifndef Cache2Log__h__
 #define Cache2Log__h__
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 namespace mozilla {
 namespace net {
 
 extern PRLogModuleInfo* GetCache2Log();
-#define LOG(x)  PR_LOG(GetCache2Log(), PR_LOG_DEBUG, x)
+#define LOG(x)  MOZ_LOG(GetCache2Log(), PR_LOG_DEBUG, x)
 #define LOG_ENABLED() PR_LOG_TEST(GetCache2Log(), PR_LOG_DEBUG)
 
 } // net
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/cookie/nsCookieService.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/cookie/nsCookieService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/cookie/nsCookieService.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/cookie/nsCookieService.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -68,7 +68,7 @@
 
 // XXX_hack. See bug 178993.
 // This is a hack to hide HttpOnly cookies from older browsers
-static const char kHttpOnlyPrefix[] = "#HttpOnly_";
+#define HTTP_ONLY_PREFIX "#HttpOnly_"
 
 #define COOKIES_FILE "cookies.sqlite"
 #define COOKIES_SCHEMA_VERSION 5
@@ -92,7 +92,7 @@
 static const int64_t kCookiePurgeAge =
   int64_t(30 * 24 * 60 * 60) * PR_USEC_PER_SEC; // 30 days in microseconds
 
-static const char kOldCookieFileName[] = "cookies.txt";
+#define OLD_COOKIE_FILE_NAME "cookies.txt"
 
 #undef  LIMIT
 #define LIMIT(x, low, high, default) ((x) >= (low) && (x) <= (high) ? (x) : (default))
@@ -183,7 +183,7 @@
 //    set NSPR_LOG_MODULES=cookie:4 -- shows accepted and rejected cookies
 //    set NSPR_LOG_FILE=cookie.log
 //
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #endif
 
 // define logging macros for convenience
@@ -210,8 +210,8 @@
 
 #define COOKIE_LOGSTRING(lvl, fmt)   \
   PR_BEGIN_MACRO                     \
-    PR_LOG(GetCookieLog(), lvl, fmt);  \
-    PR_LOG(GetCookieLog(), lvl, ("\n")); \
+    MOZ_LOG(GetCookieLog(), lvl, fmt);  \
+    MOZ_LOG(GetCookieLog(), lvl, ("\n")); \
   PR_END_MACRO
 
 static void
@@ -225,20 +225,20 @@
   if (aHostURI)
     aHostURI->GetAsciiSpec(spec);
 
-  PR_LOG(GetCookieLog(), PR_LOG_WARNING,
+  MOZ_LOG(GetCookieLog(), PR_LOG_WARNING,
     ("===== %s =====\n", aSetCookie ? "COOKIE NOT ACCEPTED" : "COOKIE NOT SENT"));
-  PR_LOG(GetCookieLog(), PR_LOG_WARNING,("request URL: %s\n", spec.get()));
+  MOZ_LOG(GetCookieLog(), PR_LOG_WARNING,("request URL: %s\n", spec.get()));
   if (aSetCookie)
-    PR_LOG(GetCookieLog(), PR_LOG_WARNING,("cookie string: %s\n", aCookieString));
+    MOZ_LOG(GetCookieLog(), PR_LOG_WARNING,("cookie string: %s\n", aCookieString));
 
   PRExplodedTime explodedTime;
   PR_ExplodeTime(PR_Now(), PR_GMTParameters, &explodedTime);
   char timeString[40];
   PR_FormatTimeUSEnglish(timeString, 40, "%c GMT", &explodedTime);
 
-  PR_LOG(GetCookieLog(), PR_LOG_WARNING,("current time: %s", timeString));
-  PR_LOG(GetCookieLog(), PR_LOG_WARNING,("rejected because %s\n", aReason));
-  PR_LOG(GetCookieLog(), PR_LOG_WARNING,("\n"));
+  MOZ_LOG(GetCookieLog(), PR_LOG_WARNING,("current time: %s", timeString));
+  MOZ_LOG(GetCookieLog(), PR_LOG_WARNING,("rejected because %s\n", aReason));
+  MOZ_LOG(GetCookieLog(), PR_LOG_WARNING,("\n"));
 }
 
 static void
@@ -249,27 +249,27 @@
   char timeString[40];
   PR_FormatTimeUSEnglish(timeString, 40, "%c GMT", &explodedTime);
 
-  PR_LOG(GetCookieLog(), PR_LOG_DEBUG,("current time: %s", timeString));
+  MOZ_LOG(GetCookieLog(), PR_LOG_DEBUG,("current time: %s", timeString));
 
   if (aCookie) {
-    PR_LOG(GetCookieLog(), PR_LOG_DEBUG,("----------------\n"));
-    PR_LOG(GetCookieLog(), PR_LOG_DEBUG,("name: %s\n", aCookie->Name().get()));
-    PR_LOG(GetCookieLog(), PR_LOG_DEBUG,("value: %s\n", aCookie->Value().get()));
-    PR_LOG(GetCookieLog(), PR_LOG_DEBUG,("%s: %s\n", aCookie->IsDomain() ? "domain" : "host", aCookie->Host().get()));
-    PR_LOG(GetCookieLog(), PR_LOG_DEBUG,("path: %s\n", aCookie->Path().get()));
+    MOZ_LOG(GetCookieLog(), PR_LOG_DEBUG,("----------------\n"));
+    MOZ_LOG(GetCookieLog(), PR_LOG_DEBUG,("name: %s\n", aCookie->Name().get()));
+    MOZ_LOG(GetCookieLog(), PR_LOG_DEBUG,("value: %s\n", aCookie->Value().get()));
+    MOZ_LOG(GetCookieLog(), PR_LOG_DEBUG,("%s: %s\n", aCookie->IsDomain() ? "domain" : "host", aCookie->Host().get()));
+    MOZ_LOG(GetCookieLog(), PR_LOG_DEBUG,("path: %s\n", aCookie->Path().get()));
 
     PR_ExplodeTime(aCookie->Expiry() * int64_t(PR_USEC_PER_SEC),
                    PR_GMTParameters, &explodedTime);
     PR_FormatTimeUSEnglish(timeString, 40, "%c GMT", &explodedTime);
-    PR_LOG(GetCookieLog(), PR_LOG_DEBUG,
+    MOZ_LOG(GetCookieLog(), PR_LOG_DEBUG,
       ("expires: %s%s", timeString, aCookie->IsSession() ? " (at end of session)" : ""));
 
     PR_ExplodeTime(aCookie->CreationTime(), PR_GMTParameters, &explodedTime);
     PR_FormatTimeUSEnglish(timeString, 40, "%c GMT", &explodedTime);
-    PR_LOG(GetCookieLog(), PR_LOG_DEBUG,("created: %s", timeString));
+    MOZ_LOG(GetCookieLog(), PR_LOG_DEBUG,("created: %s", timeString));
 
-    PR_LOG(GetCookieLog(), PR_LOG_DEBUG,("is secure: %s\n", aCookie->IsSecure() ? "true" : "false"));
-    PR_LOG(GetCookieLog(), PR_LOG_DEBUG,("is httpOnly: %s\n", aCookie->IsHttpOnly() ? "true" : "false"));
+    MOZ_LOG(GetCookieLog(), PR_LOG_DEBUG,("is secure: %s\n", aCookie->IsSecure() ? "true" : "false"));
+    MOZ_LOG(GetCookieLog(), PR_LOG_DEBUG,("is httpOnly: %s\n", aCookie->IsHttpOnly() ? "true" : "false"));
   }
 }
 
@@ -285,27 +285,27 @@
   if (aHostURI)
     aHostURI->GetAsciiSpec(spec);
 
-  PR_LOG(GetCookieLog(), PR_LOG_DEBUG,
+  MOZ_LOG(GetCookieLog(), PR_LOG_DEBUG,
     ("===== %s =====\n", aSetCookie ? "COOKIE ACCEPTED" : "COOKIE SENT"));
-  PR_LOG(GetCookieLog(), PR_LOG_DEBUG,("request URL: %s\n", spec.get()));
-  PR_LOG(GetCookieLog(), PR_LOG_DEBUG,("cookie string: %s\n", aCookieString));
+  MOZ_LOG(GetCookieLog(), PR_LOG_DEBUG,("request URL: %s\n", spec.get()));
+  MOZ_LOG(GetCookieLog(), PR_LOG_DEBUG,("cookie string: %s\n", aCookieString));
   if (aSetCookie)
-    PR_LOG(GetCookieLog(), PR_LOG_DEBUG,("replaces existing cookie: %s\n", aReplacing ? "true" : "false"));
+    MOZ_LOG(GetCookieLog(), PR_LOG_DEBUG,("replaces existing cookie: %s\n", aReplacing ? "true" : "false"));
 
   LogCookie(aCookie);
 
-  PR_LOG(GetCookieLog(), PR_LOG_DEBUG,("\n"));
+  MOZ_LOG(GetCookieLog(), PR_LOG_DEBUG,("\n"));
 }
 
 static void
 LogEvicted(nsCookie *aCookie, const char* details)
 {
-  PR_LOG(GetCookieLog(), PR_LOG_DEBUG,("===== COOKIE EVICTED =====\n"));
-  PR_LOG(GetCookieLog(), PR_LOG_DEBUG,("%s\n", details));
+  MOZ_LOG(GetCookieLog(), PR_LOG_DEBUG,("===== COOKIE EVICTED =====\n"));
+  MOZ_LOG(GetCookieLog(), PR_LOG_DEBUG,("%s\n", details));
 
   LogCookie(aCookie);
 
-  PR_LOG(GetCookieLog(), PR_LOG_DEBUG,("\n"));
+  MOZ_LOG(GetCookieLog(), PR_LOG_DEBUG,("\n"));
 }
 
 // inline wrappers to make passing in nsAFlatCStrings easier
@@ -1237,7 +1237,7 @@
   // private browsing mode; otherwise ImportCookies() won't be happy.
   DBState* initialState = mDBState;
   mDBState = mDefaultDBState;
-  oldCookieFile->AppendNative(NS_LITERAL_CSTRING(kOldCookieFileName));
+  oldCookieFile->AppendNative(NS_LITERAL_CSTRING(OLD_COOKIE_FILE_NAME));
   ImportCookies(oldCookieFile);
   oldCookieFile->Remove(false);
   mDBState = initialState;
@@ -2501,9 +2501,9 @@
   }
 
   while (isMore && NS_SUCCEEDED(lineInputStream->ReadLine(buffer, &isMore))) {
-    if (StringBeginsWith(buffer, NS_LITERAL_CSTRING(kHttpOnlyPrefix))) {
+    if (StringBeginsWith(buffer, NS_LITERAL_CSTRING(HTTP_ONLY_PREFIX))) {
       isHttpOnly = true;
-      hostIndex = sizeof(kHttpOnlyPrefix) - 1;
+      hostIndex = sizeof(HTTP_ONLY_PREFIX) - 1;
     } else if (buffer.IsEmpty() || buffer.First() == '#') {
       continue;
     } else {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/dns/GetAddrInfo.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/dns/GetAddrInfo.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/dns/GetAddrInfo.cpp	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/dns/GetAddrInfo.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -22,12 +22,12 @@
 #include <resolv_netid.h>
 #endif
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 static PRLogModuleInfo *gGetAddrInfoLog = PR_NewLogModule("GetAddrInfo");
 #define LOG(msg, ...) \
-  PR_LOG(gGetAddrInfoLog, PR_LOG_DEBUG, ("[DNS]: " msg, ##__VA_ARGS__))
+  MOZ_LOG(gGetAddrInfoLog, PR_LOG_DEBUG, ("[DNS]: " msg, ##__VA_ARGS__))
 #define LOG_WARNING(msg, ...) \
-  PR_LOG(gGetAddrInfoLog, PR_LOG_WARNING, ("[DNS]: " msg, ##__VA_ARGS__))
+  MOZ_LOG(gGetAddrInfoLog, PR_LOG_WARNING, ("[DNS]: " msg, ##__VA_ARGS__))
 
 #if DNSQUERY_AVAILABLE
 // There is a bug in windns.h where the type of parameter ppQueryResultsSet for
@@ -148,56 +148,88 @@
   return NS_OK;
 }
 
+// If successful, returns in aResult a TTL value that is smaller or
+// equal with the one already there. Gets the TTL value by calling
+// to dnsapi->mDnsQueryFunc and iterating through the returned
+// records to find the one with the smallest TTL value.
 static MOZ_ALWAYS_INLINE nsresult
-_GetTTLData_Windows(const char* aHost, uint16_t* aResult)
+_GetMinTTLForRequestType_Windows(DnsapiInfo * dnsapi, const char* aHost,
+                                 uint16_t aRequestType, unsigned int* aResult)
 {
+  MOZ_ASSERT(dnsapi);
   MOZ_ASSERT(aHost);
   MOZ_ASSERT(aResult);
 
-  nsRefPtr<DnsapiInfo> dnsapi = nullptr;
-  {
-    OffTheBooksMutexAutoLock lock(*gDnsapiInfoLock);
-    dnsapi = gDnsapiInfo;
-  }
-
-  if (!dnsapi) {
-    LOG_WARNING("GetAddrInfo has been shutdown or has not been initialized.");
-    return NS_ERROR_NOT_INITIALIZED;
-  }
-
   PDNS_RECORDA dnsData = nullptr;
   DNS_STATUS status = dnsapi->mDnsQueryFunc(
-      aHost,
-      DNS_TYPE_ANY,
-      (DNS_QUERY_STANDARD | DNS_QUERY_NO_NETBT | DNS_QUERY_NO_HOSTS_FILE
-        | DNS_QUERY_NO_MULTICAST | DNS_QUERY_ACCEPT_TRUNCATED_RESPONSE
-        | DNS_QUERY_DONT_RESET_TTL_VALUES),
-      nullptr,
-      &dnsData,
-      nullptr);
+    aHost,
+    aRequestType,
+    (DNS_QUERY_STANDARD | DNS_QUERY_NO_NETBT | DNS_QUERY_NO_HOSTS_FILE
+      | DNS_QUERY_NO_MULTICAST | DNS_QUERY_ACCEPT_TRUNCATED_RESPONSE
+      | DNS_QUERY_DONT_RESET_TTL_VALUES),
+    nullptr,
+    &dnsData,
+    nullptr);
   if (status == DNS_INFO_NO_RECORDS || status == DNS_ERROR_RCODE_NAME_ERROR
       || !dnsData) {
-    LOG("No DNS records found for %s.\n", aHost);
-    return NS_ERROR_UNKNOWN_HOST;
+    LOG("No DNS records found for %s. status=%X. aRequestType = %X\n",
+        aHost, status, aRequestType);
+    return NS_ERROR_FAILURE;
   } else if (status != NOERROR) {
     LOG_WARNING("DnsQuery_A failed with status %X.\n", status);
-    return NS_ERROR_FAILURE;
+    return NS_ERROR_UNEXPECTED;
   }
 
-  unsigned int ttl = -1;
-  PDNS_RECORDA curRecord = dnsData;
-  for (; curRecord; curRecord = curRecord->pNext) {
+  for (PDNS_RECORDA curRecord = dnsData; curRecord; curRecord = curRecord->pNext) {
     // Only records in the answer section are important
     if (curRecord->Flags.S.Section != DnsSectionAnswer) {
       continue;
     }
 
-    if (curRecord->wType == DNS_TYPE_A || curRecord->wType == DNS_TYPE_AAAA) {
-      ttl = std::min<unsigned int>(ttl, curRecord->dwTtl);
+    if (curRecord->wType == aRequestType) {
+      *aResult = std::min<unsigned int>(*aResult, curRecord->dwTtl);
+    } else {
+      LOG("Received unexpected record type %u in response for %s.\n",
+          curRecord->wType, aHost);
     }
   }
 
   dnsapi->mDnsFreeFunc(dnsData, DNS_FREE_TYPE::DnsFreeRecordList);
+  return NS_OK;
+}
+
+static MOZ_ALWAYS_INLINE nsresult
+_GetTTLData_Windows(const char* aHost, uint16_t* aResult, uint16_t aAddressFamily)
+{
+  MOZ_ASSERT(aHost);
+  MOZ_ASSERT(aResult);
+  if (aAddressFamily != PR_AF_UNSPEC &&
+      aAddressFamily != PR_AF_INET &&
+      aAddressFamily != PR_AF_INET6) {
+    return NS_ERROR_UNEXPECTED;
+  }
+
+  nsRefPtr<DnsapiInfo> dnsapi = nullptr;
+  {
+    OffTheBooksMutexAutoLock lock(*gDnsapiInfoLock);
+    dnsapi = gDnsapiInfo;
+  }
+
+  if (!dnsapi) {
+    LOG_WARNING("GetAddrInfo has been shutdown or has not been initialized.");
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+
+  // In order to avoid using ANY records which are not always implemented as a
+  // "Gimme what you have" request in hostname resolvers, we should send A
+  // and/or AAAA requests, based on the address family requested.
+  unsigned int ttl = -1;
+  if (aAddressFamily == PR_AF_UNSPEC || aAddressFamily == PR_AF_INET) {
+    _GetMinTTLForRequestType_Windows(dnsapi, aHost, DNS_TYPE_A, &ttl);
+  }
+  if (aAddressFamily == PR_AF_UNSPEC || aAddressFamily == PR_AF_INET6) {
+    _GetMinTTLForRequestType_Windows(dnsapi, aHost, DNS_TYPE_AAAA, &ttl);
+  }
 
   {
     // dnsapi's destructor is not thread-safe, so we release explicitly here
@@ -398,7 +430,7 @@
 
     LOG("Getting TTL for %s (cname = %s).", aHost, name);
     uint16_t ttl = 0;
-    nsresult ttlRv = _GetTTLData_Windows(name, &ttl);
+    nsresult ttlRv = _GetTTLData_Windows(name, &ttl, aAddressFamily);
     if (NS_SUCCEEDED(ttlRv)) {
       (*aAddrInfo)->ttl = ttl;
       LOG("Got TTL %u for %s (name = %s).", ttl, aHost, name);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/dns/nsHostResolver.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/dns/nsHostResolver.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/dns/nsHostResolver.cpp	2015-05-13 18:06:14.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/dns/nsHostResolver.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -23,7 +23,7 @@
 #include "prthread.h"
 #include "prerror.h"
 #include "prtime.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "pldhash.h"
 #include "plstr.h"
 #include "nsURLHelper.h"
@@ -70,7 +70,7 @@
 //----------------------------------------------------------------------------
 
 static PRLogModuleInfo *gHostResolverLog = nullptr;
-#define LOG(args) PR_LOG(gHostResolverLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gHostResolverLog, PR_LOG_DEBUG, args)
 
 #define LOG_HOST(host, interface) host,                                        \
                  (interface && interface[0] != '\0') ? " on interface " : "",  \
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/ipc/NeckoChannelParams.ipdlh firefox-trunk-41.0~a1~hg20150524r245419/netwerk/ipc/NeckoChannelParams.ipdlh
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/ipc/NeckoChannelParams.ipdlh	2015-05-13 18:06:14.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/ipc/NeckoChannelParams.ipdlh	2015-05-25 20:44:00.000000000 +0000
@@ -30,18 +30,6 @@
   nsHttpResponseHead;
 };
 
-struct HttpChannelCacheKey
-{
-  uint32_t postId;
-  nsCString key;
-};
-
-union OptionalHttpChannelCacheKey
-{
-  void_t;
-  HttpChannelCacheKey;
-};
-
 struct HttpChannelOpenArgs
 {
   URIParams                   uri;
@@ -79,7 +67,7 @@
   uint32_t                    contentPolicyType;
   uint32_t                    innerWindowID;
   OptionalHttpResponseHead    synthesizedResponseHead;
-  OptionalHttpChannelCacheKey cacheKey;
+  uint32_t                    cacheKey;
 };
 
 struct HttpChannelConnectArgs
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/ipc/NeckoParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/ipc/NeckoParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/ipc/NeckoParent.cpp	2015-05-13 18:06:14.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/ipc/NeckoParent.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -603,7 +603,7 @@
     bool themeWhitelist = false;
     if (Preferences::GetBool("dom.mozApps.themable") && appUri) {
       nsAutoCString origin;
-      nsPrincipal::GetOriginForURI(appUri, getter_Copies(origin));
+      nsPrincipal::GetOriginForURI(appUri, origin);
       nsAutoCString themeOrigin;
       themeOrigin = Preferences::GetCString("b2g.theme.origin");
       themeWhitelist = origin.Equals(themeOrigin);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/ipc/RemoteOpenFileChild.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/ipc/RemoteOpenFileChild.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/ipc/RemoteOpenFileChild.cpp	2015-05-13 18:06:14.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/ipc/RemoteOpenFileChild.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -612,6 +612,12 @@
 }
 
 NS_IMETHODIMP
+RemoteOpenFileChild::RenameToNative(nsIFile *newParentDir, const nsACString &newName)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
 RemoteOpenFileChild::Remove(bool recursive)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/app/AppProtocolHandler.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/app/AppProtocolHandler.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/app/AppProtocolHandler.cpp	2015-05-13 18:06:16.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/app/AppProtocolHandler.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -387,7 +387,7 @@
 
   if (Preferences::GetBool("dom.mozApps.themable")) {
     nsAutoCString origin;
-    nsPrincipal::GetOriginForURI(aUri, getter_Copies(origin));
+    nsPrincipal::GetOriginForURI(aUri, origin);
     nsAdoptingCString themeOrigin;
     themeOrigin = Preferences::GetCString("b2g.theme.origin");
     if (themeOrigin.Equals(origin)) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/ftp/FTPChannelChild.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/ftp/FTPChannelChild.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/ftp/FTPChannelChild.cpp	2015-05-13 18:06:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/ftp/FTPChannelChild.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -22,7 +22,7 @@
 using namespace mozilla::ipc;
 
 #undef LOG
-#define LOG(args) PR_LOG(gFTPLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gFTPLog, PR_LOG_DEBUG, args)
 
 namespace mozilla {
 namespace net {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/ftp/FTPChannelParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/ftp/FTPChannelParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/ftp/FTPChannelParent.cpp	2015-05-13 18:06:21.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/ftp/FTPChannelParent.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -24,7 +24,7 @@
 using namespace mozilla::ipc;
 
 #undef LOG
-#define LOG(args) PR_LOG(gFTPLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gFTPLog, PR_LOG_DEBUG, args)
 
 namespace mozilla {
 namespace net {
@@ -465,8 +465,8 @@
 {
   // Only support nsILoadContext if child channel's callbacks did too
   if (uuid.Equals(NS_GET_IID(nsILoadContext)) && mLoadContext) {
-    NS_ADDREF(mLoadContext);
-    *result = static_cast<nsILoadContext*>(mLoadContext);
+    nsCOMPtr<nsILoadContext> copy = mLoadContext;
+    copy.forget(result);
     return NS_OK;
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/ftp/nsFtpConnectionThread.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/ftp/nsFtpConnectionThread.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/ftp/nsFtpConnectionThread.cpp	2015-05-13 18:06:23.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/ftp/nsFtpConnectionThread.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -7,7 +7,7 @@
 #include <ctype.h>
 
 #include "prprf.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prtime.h"
 
 #include "nsIOService.h"
@@ -46,8 +46,8 @@
 #endif
 
 extern PRLogModuleInfo* gFTPLog;
-#define LOG(args)         PR_LOG(gFTPLog, PR_LOG_DEBUG, args)
-#define LOG_ALWAYS(args)  PR_LOG(gFTPLog, PR_LOG_ALWAYS, args)
+#define LOG(args)         MOZ_LOG(gFTPLog, PR_LOG_DEBUG, args)
+#define LOG_ALWAYS(args)  MOZ_LOG(gFTPLog, PR_LOG_ALWAYS, args)
 
 using namespace mozilla::net;
 
@@ -1603,14 +1603,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 // nsIRequest methods:
 
-static inline
-uint32_t GetFtpTime()
-{
-    return uint32_t(PR_Now() / PR_USEC_PER_SEC);
-}
-
-uint32_t nsFtpState::mSessionStartTime = GetFtpTime();
-
 nsresult
 nsFtpState::Init(nsFtpChannel *channel)
 {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/ftp/nsFtpConnectionThread.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/ftp/nsFtpConnectionThread.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/ftp/nsFtpConnectionThread.h	2015-05-13 18:06:23.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/ftp/nsFtpConnectionThread.h	2015-05-25 20:44:00.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 __nsFtpState__h_
-#define __nsFtpState__h_
+#ifndef __nsFtpConnectionThread__h_
+#define __nsFtpConnectionThread__h_
 
 #include "nsBaseContentStream.h"
 
@@ -203,8 +203,6 @@
     bool                    mServerIsIPv6;
     bool                    mUseUTF8;
 
-    static uint32_t         mSessionStartTime;
-
     mozilla::net::NetAddr   mServerAddress;
 
     // ***** control read gvars
@@ -230,4 +228,4 @@
     }
 };
 
-#endif //__nsFtpState__h_
+#endif //__nsFtpConnectionThread__h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/ftp/nsFtpControlConnection.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/ftp/nsFtpControlConnection.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/ftp/nsFtpControlConnection.cpp	2015-05-13 18:06:23.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/ftp/nsFtpControlConnection.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -6,7 +6,7 @@
 #include "nsIOService.h"
 #include "nsFtpControlConnection.h"
 #include "nsFtpProtocolHandler.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsIInputStream.h"
 #include "nsISocketTransportService.h"
 #include "nsISocketTransport.h"
@@ -16,8 +16,8 @@
 #include <algorithm>
 
 extern PRLogModuleInfo* gFTPLog;
-#define LOG(args)         PR_LOG(gFTPLog, PR_LOG_DEBUG, args)
-#define LOG_ALWAYS(args)  PR_LOG(gFTPLog, PR_LOG_ALWAYS, args)
+#define LOG(args)         MOZ_LOG(gFTPLog, PR_LOG_DEBUG, args)
+#define LOG_ALWAYS(args)  MOZ_LOG(gFTPLog, PR_LOG_ALWAYS, args)
 
 //
 // nsFtpControlConnection implementation ...
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/ftp/nsFtpProtocolHandler.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/ftp/nsFtpProtocolHandler.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/ftp/nsFtpProtocolHandler.cpp	2015-05-13 18:06:23.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/ftp/nsFtpProtocolHandler.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -25,7 +25,7 @@
 #include "nsFtpProtocolHandler.h"
 #include "nsFTPChannel.h"
 #include "nsIStandardURL.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsIObserverService.h"
@@ -47,7 +47,7 @@
 //
 PRLogModuleInfo* gFTPLog = nullptr;
 #undef LOG
-#define LOG(args) PR_LOG(gFTPLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gFTPLog, PR_LOG_DEBUG, args)
 
 //-----------------------------------------------------------------------------
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/ASpdySession.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/ASpdySession.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/ASpdySession.cpp	2015-05-13 18:06:23.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/ASpdySession.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -8,7 +8,7 @@
 #include "HttpLog.h"
 
 /*
-  Currently supported are HTTP-draft-[see nshttp.h]/2.0 spdy/3.1
+  Currently supported are h2 and spdy/3.1
 */
 
 #include "nsHttp.h"
@@ -41,9 +41,7 @@
   // This is a necko only interface, so we can enforce version
   // requests as a precondition
   MOZ_ASSERT(version == SPDY_VERSION_31 ||
-             version == HTTP_VERSION_2 ||
-             version == HTTP_VERSION_2_DRAFT_LATEST ||
-             version == HTTP_VERSION_2_DRAFT_15,
+             version == HTTP_VERSION_2,
              "Unsupported spdy version");
 
   // Don't do a runtime check of IsSpdyV?Enabled() here because pref value
@@ -55,8 +53,7 @@
 
   if (version == SPDY_VERSION_31) {
     return new SpdySession31(aTransport);
-  } else if (version == HTTP_VERSION_2_DRAFT_LATEST || version == HTTP_VERSION_2 ||
-             version == HTTP_VERSION_2_DRAFT_15) {
+  } else if (version == HTTP_VERSION_2) {
     return new Http2Session(aTransport, version);
   }
 
@@ -78,18 +75,6 @@
   Version[1] = HTTP_VERSION_2;
   VersionString[1] = NS_LITERAL_CSTRING("h2");
   ALPNCallbacks[1] = Http2Session::ALPNCallback;
-
-  Version[2] = HTTP_VERSION_2_DRAFT_15; // 14 and 15 are aliased
-  VersionString[2] = NS_LITERAL_CSTRING("h2-14");
-  ALPNCallbacks[2] = Http2Session::ALPNCallback;
-
-  Version[3] = HTTP_VERSION_2_DRAFT_15; // 14 and 15 are aliased
-  VersionString[3] = NS_LITERAL_CSTRING("h2-15");
-  ALPNCallbacks[3] = Http2Session::ALPNCallback;
-
-  Version[4] = HTTP_VERSION_2_DRAFT_LATEST;
-  VersionString[4] = NS_LITERAL_CSTRING(HTTP2_DRAFT_LATEST_TOKEN);
-  ALPNCallbacks[4] = Http2Session::ALPNCallback;
 }
 
 bool
@@ -102,10 +87,6 @@
     return gHttpHandler->IsSpdyV31Enabled();
   case 1:
     return gHttpHandler->IsHttp2Enabled();
-  case 2:
-  case 3:
-  case 4:
-    return gHttpHandler->IsHttp2DraftEnabled();
   }
   return false;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/ASpdySession.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/ASpdySession.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/ASpdySession.h	2015-05-13 18:06:23.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/ASpdySession.h	2015-05-25 20:44:00.000000000 +0000
@@ -97,7 +97,7 @@
   SpdyInformation();
   ~SpdyInformation() {}
 
-  static const uint32_t kCount = 5;
+  static const uint32_t kCount = 2;
 
   // 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 firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/Http2Compression.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/Http2Compression.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/Http2Compression.h	2015-05-13 18:06:24.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/Http2Compression.h	2015-05-25 20:44:00.000000000 +0000
@@ -6,8 +6,8 @@
 #ifndef mozilla_net_Http2Compression_Internal_h
 #define mozilla_net_Http2Compression_Internal_h
 
-// HPACK
-// tools.ietf.org/html/draft-ietf-httpbis-header-compression-04
+// HPACK - RFC 7541
+// https://www.rfc-editor.org/rfc/rfc7541.txt
 
 #include "mozilla/Attributes.h"
 #include "nsDeque.h"
@@ -61,7 +61,6 @@
   virtual ~Http2BaseCompressor() { };
 
 protected:
-  // this will become a HTTP/2 SETTINGS value in a future draft
   const static uint32_t kDefaultMaxBuffer = 4096;
 
   virtual void ClearHeaderTable();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/Http2Push.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/Http2Push.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/Http2Push.h	2015-05-13 18:06:24.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/Http2Push.h	2015-05-25 20:44:00.000000000 +0000
@@ -6,6 +6,9 @@
 #ifndef mozilla_net_Http2Push_Internal_h
 #define mozilla_net_Http2Push_Internal_h
 
+// HTTP/2 - RFC 7540
+// https://www.rfc-editor.org/rfc/rfc7540.txt
+
 #include "Http2Session.h"
 #include "Http2Stream.h"
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/Http2Session.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/Http2Session.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/Http2Session.cpp	2015-05-13 18:06:24.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/Http2Session.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -111,7 +111,6 @@
   , mWaitingForSettingsAck(false)
   , mGoAwayOnPush(false)
   , mUseH2Deps(false)
-  , mVersion(version)
 {
   MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
 
@@ -134,8 +133,6 @@
 
   mPingThreshold = gHttpHandler->SpdyPingThreshold();
   mPreviousPingThreshold = mPingThreshold;
-
-  mNegotiatedToken.AssignLiteral(HTTP2_DRAFT_LATEST_TOKEN);
 }
 
 PLDHashOperator
@@ -907,11 +904,7 @@
     LogIO(this, nullptr, "Session Window Bump ", packet, kFrameHeaderBytes + 4);
   }
 
-  // draft-14 and draft-15 are the only versions we support that do not
-  // allow our priority scheme. Blacklist them here - they are aliased
-  // as draft-15
-  if ((mVersion != HTTP_VERSION_2_DRAFT_15) &&
-      gHttpHandler->UseH2Deps() && gHttpHandler->CriticalRequestPrioritization()) {
+  if (gHttpHandler->UseH2Deps() && gHttpHandler->CriticalRequestPrioritization()) {
     mUseH2Deps = true;
     MOZ_ASSERT(mNextStreamID == kLeaderGroupID);
     CreatePriorityNode(kLeaderGroupID, 0, 200, "leader");
@@ -3438,14 +3431,6 @@
    * anyway, so it'll never be on. All the same, see https://bugzil.la/965881
    * for the possibility for an interface to ensure it never gets turned on. */
 
-  nsresult rv = ssl->GetNegotiatedNPN(mNegotiatedToken);
-  if (NS_FAILED(rv)) {
-    // Fallback to showing the draft version, just in case
-    LOG3(("Http2Session::ConfirmTLSProfile %p could not get negotiated token. "
-          "Falling back to draft token.", this));
-    mNegotiatedToken.AssignLiteral(HTTP2_DRAFT_LATEST_TOKEN);
-  }
-
   mTLSProfileConfirmed = true;
   return NS_OK;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/Http2Session.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/Http2Session.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/Http2Session.h	2015-05-13 18:06:24.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/Http2Session.h	2015-05-25 20:44:00.000000000 +0000
@@ -6,7 +6,8 @@
 #ifndef mozilla_net_Http2Session_h
 #define mozilla_net_Http2Session_h
 
-// HTTP/2
+// HTTP/2 - RFC 7540
+// https://www.rfc-editor.org/rfc/rfc7540.txt
 
 #include "ASpdySession.h"
 #include "mozilla/Attributes.h"
@@ -221,7 +222,6 @@
   nsISocketTransport *SocketTransport() { return mSocketTransport; }
   int64_t ServerSessionWindow() { return mServerSessionWindow; }
   void DecrementServerSessionWindow (uint32_t bytes) { mServerSessionWindow -= bytes; }
-  void GetNegotiatedToken(nsACString &s) { s.Assign(mNegotiatedToken); }
 
   void SendPing() override;
   bool MaybeReTunnel(nsAHttpTransaction *) override;
@@ -479,11 +479,7 @@
   bool mWaitingForSettingsAck;
   bool mGoAwayOnPush;
 
-  // For caching whether we negotiated "h2" or "h2-<draft>"
-  nsCString mNegotiatedToken;
-
   bool mUseH2Deps;
-  uint32_t mVersion; // HTTP2_VERSION_ from nsHttp.h remove when draft support removed
 
 private:
 /// connect tunnels
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/Http2Stream.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/Http2Stream.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/Http2Stream.cpp	2015-05-13 18:06:24.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/Http2Stream.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -945,10 +945,7 @@
   // The decoding went ok. Now we can customize and clean up.
 
   aHeadersIn.Truncate();
-  nsAutoCString negotiatedToken;
-  mSession->GetNegotiatedToken(negotiatedToken);
-  aHeadersOut.Append("X-Firefox-Spdy: ");
-  aHeadersOut.Append(negotiatedToken);
+  aHeadersOut.Append("X-Firefox-Spdy: h2");
   aHeadersOut.Append("\r\n\r\n");
   LOG (("decoded response headers are:\n%s", aHeadersOut.BeginReading()));
   if (mIsTunnel && !mPlainTextTunnel) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/Http2Stream.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/Http2Stream.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/Http2Stream.h	2015-05-13 18:06:24.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/Http2Stream.h	2015-05-25 20:44:00.000000000 +0000
@@ -6,6 +6,9 @@
 #ifndef mozilla_net_Http2Stream_h
 #define mozilla_net_Http2Stream_h
 
+// HTTP/2 - RFC7540
+// https://www.rfc-editor.org/rfc/rfc7540.txt
+
 #include "mozilla/Attributes.h"
 #include "nsAHttpTransaction.h"
 #include "nsISupportsPriority.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/HttpBaseChannel.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/HttpBaseChannel.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/HttpBaseChannel.cpp	2015-05-13 18:06:24.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/HttpBaseChannel.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -1106,7 +1106,7 @@
     if (NS_FAILED(rv)) return rv;
 
     // It's ok to send referrer for https-to-http scenarios if the referrer
-    // policy is "unsafe-url", "origin", or "origin-when-crossorigin".
+    // policy is "unsafe-url", "origin", or "origin-when-cross-origin".
     if (referrerPolicy != REFERRER_POLICY_UNSAFE_URL &&
 	referrerPolicy != REFERRER_POLICY_ORIGIN_WHEN_XORIGIN &&
         referrerPolicy != REFERRER_POLICY_ORIGIN) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/HttpBaseChannel.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/HttpBaseChannel.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/HttpBaseChannel.h	2015-05-13 18:06:24.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/HttpBaseChannel.h	2015-05-25 20:44:00.000000000 +0000
@@ -474,7 +474,7 @@
 template <class T>
 nsresult HttpAsyncAborter<T>::AsyncAbort(nsresult status)
 {
-  PR_LOG(gHttpLog, 4,
+  MOZ_LOG(gHttpLog, 4,
          ("HttpAsyncAborter::AsyncAbort [this=%p status=%x]\n", mThis, status));
 
   mThis->mStatus = status;
@@ -491,7 +491,7 @@
   NS_PRECONDITION(!mCallOnResume, "How did that happen?");
 
   if (mThis->mSuspendCount) {
-    PR_LOG(gHttpLog, 4,
+    MOZ_LOG(gHttpLog, 4,
            ("Waiting until resume to do async notification [this=%p]\n", mThis));
     mCallOnResume = &T::HandleAsyncAbort;
     return;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/HttpChannelChild.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/HttpChannelChild.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/HttpChannelChild.cpp	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/HttpChannelChild.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -324,7 +324,7 @@
                     const nsCString& securityInfoSerialization,
                     const NetAddr& selfAddr,
                     const NetAddr& peerAddr,
-                    const HttpChannelCacheKey& cacheKey)
+                    const uint32_t& cacheKey)
   : mChild(child)
   , mChannelStatus(channelStatus)
   , mResponseHead(responseHead)
@@ -362,7 +362,7 @@
   nsCString mSecurityInfoSerialization;
   NetAddr mSelfAddr;
   NetAddr mPeerAddr;
-  HttpChannelCacheKey mCacheKey;
+  uint32_t mCacheKey;
 };
 
 bool
@@ -378,7 +378,7 @@
                                      const NetAddr& selfAddr,
                                      const NetAddr& peerAddr,
                                      const int16_t& redirectCount,
-                                     const HttpChannelCacheKey& cacheKey)
+                                     const uint32_t& cacheKey)
 {
   LOG(("HttpChannelChild::RecvOnStartRequest [this=%p]\n", this));
   // mFlushedForDiversion and mDivertingToParent should NEVER be set at this
@@ -419,7 +419,7 @@
                                  const nsCString& securityInfoSerialization,
                                  const NetAddr& selfAddr,
                                  const NetAddr& peerAddr,
-                                 const HttpChannelCacheKey& cacheKey)
+                                 const uint32_t& cacheKey)
 {
   LOG(("HttpChannelChild::OnStartRequest [this=%p]\n", this));
 
@@ -447,12 +447,23 @@
   mCacheExpirationTime = cacheExpirationTime;
   mCachedCharset = cachedCharset;
 
-  nsRefPtr<nsHttpChannelCacheKey> tmpKey = new nsHttpChannelCacheKey();
-  tmpKey->SetData(cacheKey.postId(), cacheKey.key());
-  CallQueryInterface(tmpKey.get(), getter_AddRefs(mCacheKey));
-
   AutoEventEnqueuer ensureSerialDispatch(mEventQ);
 
+  nsresult rv;
+  nsCOMPtr<nsISupportsPRUint32> container =
+    do_CreateInstance(NS_SUPPORTS_PRUINT32_CONTRACTID, &rv);
+  if (NS_FAILED(rv)) {
+    Cancel(rv);
+    return;
+  }
+
+  rv = container->SetData(cacheKey);
+  if (NS_FAILED(rv)) {
+    Cancel(rv);
+    return;
+  }
+  mCacheKey = container;
+
   // replace our request headers with what actually got sent in the parent
   mRequestHead.Headers() = requestHeaders;
 
@@ -1657,19 +1668,19 @@
   openArgs.allowSpdy() = mAllowSpdy;
   openArgs.allowAltSvc() = mAllowAltSvc;
 
+  uint32_t cacheKey = 0;
   if (mCacheKey) {
-    uint32_t postId;
-    nsAutoCString key;
-    nsresult rv = static_cast<nsHttpChannelCacheKey *>(
-      static_cast<nsISupportsPRUint32 *>(mCacheKey.get()))->GetData(&postId,
-                                                                    key);
+    nsCOMPtr<nsISupportsPRUint32> container = do_QueryInterface(mCacheKey);
+    if (!container) {
+      return NS_ERROR_ILLEGAL_VALUE;
+    }
+
+    nsresult rv = container->GetData(&cacheKey);
     if (NS_FAILED(rv)) {
       return rv;
     }
-    openArgs.cacheKey() = HttpChannelCacheKey(postId, key);
-  } else {
-    openArgs.cacheKey() = mozilla::void_t();
   }
+  openArgs.cacheKey() = cacheKey;
 
   propagateLoadInfo(mLoadInfo, openArgs);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/HttpChannelChild.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/HttpChannelChild.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/HttpChannelChild.h	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/HttpChannelChild.h	2015-05-25 20:44:00.000000000 +0000
@@ -118,7 +118,7 @@
                           const NetAddr& selfAddr,
                           const NetAddr& peerAddr,
                           const int16_t& redirectCount,
-                          const HttpChannelCacheKey& cacheKey) override;
+                          const uint32_t& cacheKey) override;
   bool RecvOnTransportAndData(const nsresult& channelStatus,
                               const nsresult& status,
                               const uint64_t& progress,
@@ -211,7 +211,7 @@
                       const nsCString& securityInfoSerialization,
                       const NetAddr& selfAddr,
                       const NetAddr& peerAddr,
-                      const HttpChannelCacheKey& cacheKey);
+                      const uint32_t& cacheKey);
   void OnTransportAndData(const nsresult& channelStatus,
                           const nsresult& status,
                           const uint64_t progress,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/HttpChannelParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/HttpChannelParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/HttpChannelParent.cpp	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/HttpChannelParent.cpp	2015-05-25 20:44:00.000000000 +0000
@@ -223,8 +223,8 @@
 
   // Only support nsILoadContext if child channel's callbacks did too
   if (aIID.Equals(NS_GET_IID(nsILoadContext)) && mLoadContext) {
-    NS_ADDREF(mLoadContext);
-    *result = static_cast<nsILoadContext*>(mLoadContext);
+    nsCOMPtr<nsILoadContext> copy = mLoadContext;
+    copy.forget(result);
     return NS_OK;
   }
 
@@ -268,7 +268,7 @@
                                  const uint32_t&            aContentPolicyType,
                                  const uint32_t&            aInnerWindowID,
                                  const OptionalHttpResponseHead& aSynthesizedResponseHead,
-                                 const OptionalHttpChannelCacheKey& aCacheKey)
+                                 const uint32_t&            aCacheKey)
 {
   nsCOMPtr<nsIURI> uri = DeserializeURI(aURI);
   if (!uri) {
@@ -390,15 +390,19 @@
     mSynthesizedResponseHead = new nsHttpResponseHead(aSynthesizedResponseHead.get_nsHttpResponseHead());
   }
 
-  if (aCacheKey.type() == OptionalHttpChannelCacheKey::THttpChannelCacheKey) {
-    nsRefPtr<nsHttpChannelCacheKey> cacheKey = new nsHttpChannelCacheKey();
-    cacheKey->SetData(aCacheKey.get_HttpChannelCacheKey().postId(),
-                      aCacheKey.get_HttpChannelCacheKey().key());
-    nsCOMPtr<nsISupports> cacheKeySupp;
-    CallQueryInterface(cacheKey.get(), getter_AddRefs(cacheKeySupp));
-    mChannel->SetCacheKey(cacheKeySupp);
+  nsCOMPtr<nsISupportsPRUint32> cacheKey =
+    do_CreateInstance(NS_SUPPORTS_PRUINT32_CONTRACTID, &rv);
+  if (NS_FAILED(rv)) {
+    return SendFailedAsyncOpen(rv);
   }
 
+  rv = cacheKey->SetData(aCacheKey);
+  if (NS_FAILED(rv)) {
+    return SendFailedAsyncOpen(rv);
+  }
+
+  mChannel->SetCacheKey(cacheKey);
+
   if (priority != nsISupportsPriority::PRIORITY_NORMAL) {
     mChannel->SetPriority(priority);
   }
@@ -815,19 +819,20 @@
   uint16_t redirectCount = 0;
   mChannel->GetRedirectCount(&redirectCount);
 
-  nsCOMPtr<nsISupports> cacheKeySupp;
-  mChannel->GetCacheKey(getter_AddRefs(cacheKeySupp));
-  uint32_t postId = 0;
-  nsAutoCString key;
-  if (cacheKeySupp) {
-    nsresult rv = static_cast<nsHttpChannelCacheKey *>(
-      static_cast<nsISupportsPRUint32 *>(cacheKeySupp.get()))->GetData(&postId,
-                                                                       key);
+  nsCOMPtr<nsISupports> cacheKey;
+  mChannel->GetCacheKey(getter_AddRefs(cacheKey));
+  uint32_t cacheKeyValue = 0;
+  if (cacheKey) {
+    nsCOMPtr<nsISupportsPRUint32> container = do_QueryInterface(cacheKey);
+    if (!container) {
+      return NS_ERROR_ILLEGAL_VALUE;
+    }
+
+    nsresult rv = container->GetData(&cacheKeyValue);
     if (NS_FAILED(rv)) {
       return rv;
     }
   }
-  HttpChannelCacheKey cacheKey = HttpChannelCacheKey(postId, key);
 
   if (mIPCClosed ||
       !SendOnStartRequest(channelStatus,
@@ -839,7 +844,7 @@
                           expirationTime, cachedCharset, secInfoSerialization,
                           mChannel->GetSelfAddr(), mChannel->GetPeerAddr(),
                           redirectCount,
-                          cacheKey))
+                          cacheKeyValue))
   {
     return NS_ERROR_UNEXPECTED;
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/HttpChannelParent.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/HttpChannelParent.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/HttpChannelParent.h	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/HttpChannelParent.h	2015-05-25 20:44:01.000000000 +0000
@@ -122,7 +122,7 @@
                    const uint32_t&            aContentPolicyType,
                    const uint32_t&            aInnerWindowID,
                    const OptionalHttpResponseHead& aSynthesizedResponseHead,
-                   const OptionalHttpChannelCacheKey& aCacheKey);
+                   const uint32_t&            aCacheKey);
 
   virtual bool RecvSetPriority(const uint16_t& priority) override;
   virtual bool RecvSetClassOfService(const uint32_t& cos) override;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/HttpLog.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/HttpLog.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/HttpLog.h	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/HttpLog.h	2015-05-25 20:44:01.000000000 +0000
@@ -37,11 +37,11 @@
 extern PRLogModuleInfo *gHttpLog;
 
 // http logging
-#define LOG1(args) PR_LOG(gHttpLog, 1, args)
-#define LOG2(args) PR_LOG(gHttpLog, 2, args)
-#define LOG3(args) PR_LOG(gHttpLog, 3, args)
-#define LOG4(args) PR_LOG(gHttpLog, 4, args)
-#define LOG5(args) PR_LOG(gHttpLog, 5, args)
+#define LOG1(args) MOZ_LOG(gHttpLog, 1, args)
+#define LOG2(args) MOZ_LOG(gHttpLog, 2, args)
+#define LOG3(args) MOZ_LOG(gHttpLog, 3, args)
+#define LOG4(args) MOZ_LOG(gHttpLog, 4, args)
+#define LOG5(args) MOZ_LOG(gHttpLog, 5, args)
 #define LOG(args) LOG4(args)
 
 #define LOG1_ENABLED() PR_LOG_TEST(gHttpLog, 1)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/nsHttpChannel.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/nsHttpChannel.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/nsHttpChannel.cpp	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/nsHttpChannel.cpp	2015-05-25 20:44:01.000000000 +0000
@@ -4822,6 +4822,8 @@
     return rv;
 }
 
+// On error BeginConnect() should call AsyncAbort() before exiting until
+// ContineBeginConnect after that it should not call it.
 nsresult
 nsHttpChannel::BeginConnect()
 {
@@ -4845,12 +4847,17 @@
         mURI->GetUsername(mUsername);
     if (NS_SUCCEEDED(rv))
         rv = mURI->GetAsciiSpec(mSpec);
-    if (NS_FAILED(rv))
+    if (NS_FAILED(rv)) {
+        AsyncAbort(rv);
         return rv;
+    }
 
     // Reject the URL if it doesn't specify a host
-    if (host.IsEmpty())
-        return NS_ERROR_MALFORMED_URI;
+    if (host.IsEmpty()) {
+        rv = NS_ERROR_MALFORMED_URI;
+        AsyncAbort(rv);
+        return rv;
+    }
     LOG(("host=%s port=%d\n", host.get(), port));
     LOG(("uri=%s\n", mSpec.get()));
 
@@ -4923,8 +4930,10 @@
                           &rv);
     if (NS_SUCCEEDED(rv))
         rv = mAuthProvider->Init(this);
-    if (NS_FAILED(rv))
+    if (NS_FAILED(rv)) {
+        AsyncAbort(rv);
         return rv;
+    }
 
     // check to see if authorization headers should be included
     mAuthProvider->AddAuthorizationHeaders();
@@ -4935,7 +4944,11 @@
     // Check to see if we should redirect this channel elsewhere by
     // nsIHttpChannel.redirectTo API request
     if (mAPIRedirectToURI) {
-        return AsyncCall(&nsHttpChannel::HandleAsyncAPIRedirect);
+        rv = AsyncCall(&nsHttpChannel::HandleAsyncAPIRedirect);
+        if (NS_FAILED(rv)) {
+            AsyncAbort(rv);
+        }
+        return rv;
     }
     // Check to see if this principal exists on local blocklists.
     nsRefPtr<nsChannelClassifier> channelClassifier = new nsChannelClassifier();
@@ -5028,6 +5041,8 @@
         mCaps &= ~NS_HTTP_ALLOW_PIPELINING;
     }
     if (!(mLoadFlags & LOAD_CLASSIFY_URI)) {
+        // On error ContinueBeginConnect() will call AsyncAbort so do not do it
+        // here
         return ContinueBeginConnect();
     }
     // mLocalBlocklist is true only if tracking protection is enabled and the
@@ -5038,6 +5053,8 @@
     if (mCanceled || !mLocalBlocklist) {
        rv = ContinueBeginConnect();
        if (NS_FAILED(rv)) {
+           // On error ContinueBeginConnect() will call AsyncAbort so do not do
+           // it here
            return rv;
        }
        callContinueBeginConnect = false;
@@ -5161,21 +5178,15 @@
         LOG(("nsHttpChannel::OnProxyAvailable [this=%p] "
              "Handler no longer active.\n", this));
         rv = NS_ERROR_NOT_AVAILABLE;
+        AsyncAbort(rv);
     }
     else {
+        // On error BeginConnect() will call AsyncAbort.
         rv = BeginConnect();
     }
 
     if (NS_FAILED(rv)) {
         Cancel(rv);
-        // Calling OnStart/OnStop synchronously here would mean doing it before
-        // returning from AsyncOpen which is a contract violation. Do it async.
-        nsRefPtr<nsRunnableMethod<HttpBaseChannel> > event =
-            NS_NewRunnableMethod(this, &nsHttpChannel::DoNotifyListener);
-        rv = NS_DispatchToCurrentThread(event);
-        if (NS_FAILED(rv)) {
-            NS_WARNING("Failed To Dispatch DoNotifyListener");
-        }
     }
     return rv;
 }
@@ -6037,69 +6048,9 @@
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-NS_IMPL_ADDREF(nsHttpChannelCacheKey)
-NS_IMPL_RELEASE(nsHttpChannelCacheKey)
-NS_INTERFACE_TABLE_HEAD(nsHttpChannelCacheKey)
-NS_INTERFACE_TABLE_BEGIN
-NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(nsHttpChannelCacheKey,
-                                   nsISupports, nsISupportsPRUint32)
-NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(nsHttpChannelCacheKey,
-                                   nsISupportsPrimitive, nsISupportsPRUint32)
-NS_INTERFACE_TABLE_ENTRY(nsHttpChannelCacheKey,
-                         nsISupportsPRUint32)
-NS_INTERFACE_TABLE_ENTRY(nsHttpChannelCacheKey,
-                         nsISupportsCString)
-NS_INTERFACE_TABLE_END
-NS_INTERFACE_TABLE_TAIL
-
-NS_IMETHODIMP nsHttpChannelCacheKey::GetType(uint16_t *aType)
-{
-    NS_ENSURE_ARG_POINTER(aType);
-
-    *aType = TYPE_PRUINT32;
-    return NS_OK;
-}
-
-nsresult nsHttpChannelCacheKey::SetData(uint32_t aPostID,
-                                        const nsACString& aKey)
-{
-    nsresult rv;
-
-    mSupportsCString =
-        do_CreateInstance(NS_SUPPORTS_CSTRING_CONTRACTID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    mSupportsCString->SetData(aKey);
-    if (NS_FAILED(rv)) return rv;
-
-    mSupportsPRUint32 =
-        do_CreateInstance(NS_SUPPORTS_PRUINT32_CONTRACTID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    mSupportsPRUint32->SetData(aPostID);
-    if (NS_FAILED(rv)) return rv;
-
-    return NS_OK;
-}
-
-nsresult nsHttpChannelCacheKey::GetData(uint32_t *aPostID,
-                                        nsACString& aKey)
-{
-    nsresult rv;
-
-    rv = mSupportsPRUint32->GetData(aPostID);
-    if (NS_FAILED(rv)) {
-      return rv;
-    }
-
-    return mSupportsCString->GetData(aKey);
-}
-
 NS_IMETHODIMP
 nsHttpChannel::GetCacheKey(nsISupports **key)
 {
-    // mayhemer: TODO - do we need this API?
-
     nsresult rv;
     NS_ENSURE_ARG_POINTER(key);
 
@@ -6107,17 +6058,13 @@
 
     *key = nullptr;
 
-    nsRefPtr<nsHttpChannelCacheKey> container =
-        new nsHttpChannelCacheKey();
+    nsCOMPtr<nsISupportsPRUint32> container =
+        do_CreateInstance(NS_SUPPORTS_PRUINT32_CONTRACTID, &rv);
 
     if (!container)
         return NS_ERROR_OUT_OF_MEMORY;
 
-    nsAutoCString cacheKey;
-    rv = GenerateCacheKey(mPostID, cacheKey);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = container->SetData(mPostID, cacheKey);
+    rv = container->SetData(mPostID);
     if (NS_FAILED(rv)) return rv;
 
     return CallQueryInterface(container.get(), key);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/nsHttpChannel.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/nsHttpChannel.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/nsHttpChannel.h	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/nsHttpChannel.h	2015-05-25 20:44:01.000000000 +0000
@@ -41,40 +41,6 @@
 };
 
 //-----------------------------------------------------------------------------
-// nsHttpChannelCacheKey
-//-----------------------------------------------------------------------------
-
-class nsHttpChannelCacheKey final : public nsISupportsPRUint32,
-                                    public nsISupportsCString
-{
-    NS_DECL_ISUPPORTS
-
-    NS_DECL_NSISUPPORTSPRIMITIVE
-    NS_FORWARD_NSISUPPORTSPRUINT32(mSupportsPRUint32->)
-
-    // Both interfaces declares toString method with the same signature.
-    // Thus we have to delegate only to nsISupportsPRUint32 implementation.
-    NS_IMETHOD GetData(nsACString & aData) override
-    {
-        return mSupportsCString->GetData(aData);
-    }
-    NS_IMETHOD SetData(const nsACString & aData) override
-    {
-        return mSupportsCString->SetData(aData);
-    }
-
-public:
-    nsresult SetData(uint32_t aPostID, const nsACString& aKey);
-    nsresult GetData(uint32_t *aPostID, nsACString& aKey);
-
-protected:
-    ~nsHttpChannelCacheKey() {}
-
-    nsCOMPtr<nsISupportsPRUint32> mSupportsPRUint32;
-    nsCOMPtr<nsISupportsCString> mSupportsCString;
-};
-
-//-----------------------------------------------------------------------------
 // nsHttpChannel
 //-----------------------------------------------------------------------------
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/nsHttpConnectionInfo.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/nsHttpConnectionInfo.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/nsHttpConnectionInfo.h	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/nsHttpConnectionInfo.h	2015-05-25 20:44:01.000000000 +0000
@@ -53,7 +53,7 @@
 private:
     virtual ~nsHttpConnectionInfo()
     {
-        PR_LOG(gHttpLog, 4, ("Destroying nsHttpConnectionInfo @%x\n", this));
+        MOZ_LOG(gHttpLog, 4, ("Destroying nsHttpConnectionInfo @%x\n", this));
     }
 
     void BuildHashKey();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/nsHttp.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/nsHttp.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/nsHttp.cpp	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/nsHttp.cpp	2015-05-25 20:44:01.000000000 +0000
@@ -40,7 +40,7 @@
     char                 value[1];
 };
 
-static PLDHashTable         sAtomTable;
+static PLDHashTable2       *sAtomTable;
 static struct HttpHeapAtom *sHeapAtoms = nullptr;
 static Mutex               *sLock = nullptr;
 
@@ -94,7 +94,7 @@
 nsresult
 nsHttp::CreateAtomTable()
 {
-    MOZ_ASSERT(!sAtomTable.IsInitialized(), "atom table already initialized");
+    MOZ_ASSERT(!sAtomTable, "atom table already initialized");
 
     if (!sLock) {
         sLock = new Mutex("nsHttp.sLock");
@@ -103,8 +103,8 @@
     // The initial length for this table is a value greater than the number of
     // known atoms (NUM_HTTP_ATOMS) because we expect to encounter a few random
     // headers right off the bat.
-    PL_DHashTableInit(&sAtomTable, &ops, sizeof(PLDHashEntryStub),
-                      NUM_HTTP_ATOMS + 10);
+    sAtomTable = new PLDHashTable2(&ops, sizeof(PLDHashEntryStub),
+                                   NUM_HTTP_ATOMS + 10);
 
     // fill the table with our known atoms
     const char *const atoms[] = {
@@ -116,7 +116,7 @@
 
     for (int i = 0; atoms[i]; ++i) {
         PLDHashEntryStub *stub = reinterpret_cast<PLDHashEntryStub *>
-            (PL_DHashTableAdd(&sAtomTable, atoms[i], fallible));
+            (PL_DHashTableAdd(sAtomTable, atoms[i], fallible));
         if (!stub)
             return NS_ERROR_OUT_OF_MEMORY;
 
@@ -130,9 +130,8 @@
 void
 nsHttp::DestroyAtomTable()
 {
-    if (sAtomTable.IsInitialized()) {
-        PL_DHashTableFinish(&sAtomTable);
-    }
+    delete sAtomTable;
+    sAtomTable = nullptr;
 
     while (sHeapAtoms) {
         HttpHeapAtom *next = sHeapAtoms->next;
@@ -140,10 +139,8 @@
         sHeapAtoms = next;
     }
 
-    if (sLock) {
-        delete sLock;
-        sLock = nullptr;
-    }
+    delete sLock;
+    sLock = nullptr;
 }
 
 Mutex *
@@ -158,13 +155,13 @@
 {
     nsHttpAtom atom = { nullptr };
 
-    if (!str || !sAtomTable.IsInitialized())
+    if (!str || !sAtomTable)
         return atom;
 
     MutexAutoLock lock(*sLock);
 
     PLDHashEntryStub *stub = reinterpret_cast<PLDHashEntryStub *>
-        (PL_DHashTableAdd(&sAtomTable, str, fallible));
+        (PL_DHashTableAdd(sAtomTable, str, fallible));
     if (!stub)
         return atom;  // out of memory
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/nsHttp.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/nsHttp.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/nsHttp.h	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/nsHttp.h	2015-05-25 20:44:01.000000000 +0000
@@ -30,7 +30,7 @@
         // SPDY_VERSION_2 = 2, REMOVED
         // SPDY_VERSION_3 = 3, REMOVED
         SPDY_VERSION_31 = 4,
-        HTTP_VERSION_2 = 5,
+        HTTP_VERSION_2 = 5
 
         // leave room for official versions. telem goes to 48
         // 24 was a internal spdy/3.1
@@ -39,17 +39,12 @@
         // 27 was http/2-draft09, h2-10, and h2-11
         // 28 was http/2-draft12
         // 29 was http/2-draft13
-        // 30 was also h2-14. They're effectively the same, -15 added an
-        // error code. So, we advertise all, but our "default position" is -16.
-        HTTP_VERSION_2_DRAFT_15 = 30,
-        HTTP_VERSION_2_DRAFT_16 = 31
+        // 30 was h2-14 and h2-15
+        // 31 was h2-16
     };
 
 typedef uint8_t nsHttpVersion;
 
-#define HTTP_VERSION_2_DRAFT_LATEST HTTP_VERSION_2_DRAFT_16
-#define HTTP2_DRAFT_LATEST_TOKEN "h2-16"
-
 //-----------------------------------------------------------------------------
 // http connection capabilities
 //-----------------------------------------------------------------------------
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/nsHttpHandler.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/nsHttpHandler.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/nsHttpHandler.cpp	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/nsHttpHandler.cpp	2015-05-25 20:44:01.000000000 +0000
@@ -185,7 +185,6 @@
     , mHandlerActive(false)
     , mEnableSpdy(false)
     , mSpdyV31(true)
-    , mHttp2DraftEnabled(true)
     , mHttp2Enabled(true)
     , mUseH2Deps(true)
     , mEnforceHttp2TlsProfile(true)
@@ -1196,12 +1195,6 @@
             mSpdyV31 = cVar;
     }
 
-    if (PREF_CHANGED(HTTP_PREF("spdy.enabled.http2draft"))) {
-        rv = prefs->GetBoolPref(HTTP_PREF("spdy.enabled.http2draft"), &cVar);
-        if (NS_SUCCEEDED(rv))
-            mHttp2DraftEnabled = cVar;
-    }
-
     if (PREF_CHANGED(HTTP_PREF("spdy.enabled.http2"))) {
         rv = prefs->GetBoolPref(HTTP_PREF("spdy.enabled.http2"), &cVar);
         if (NS_SUCCEEDED(rv))
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/nsHttpHandler.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/nsHttpHandler.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/nsHttpHandler.h	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/nsHttpHandler.h	2015-05-25 20:44:01.000000000 +0000
@@ -103,8 +103,7 @@
 
     bool           IsSpdyEnabled() { return mEnableSpdy; }
     bool           IsSpdyV31Enabled() { return mSpdyV31; }
-    bool           IsHttp2DraftEnabled() { return mHttp2DraftEnabled; }
-    bool           IsHttp2Enabled() { return mHttp2DraftEnabled && mHttp2Enabled; }
+    bool           IsHttp2Enabled() { return mHttp2Enabled; }
     bool           EnforceHttp2TlsProfile() { return mEnforceHttp2TlsProfile; }
     bool           CoalesceSpdy() { return mCoalesceSpdy; }
     bool           UseSpdyPersistentSettings() { return mSpdyPersistentSettings; }
@@ -479,7 +478,6 @@
 
     uint32_t           mEnableSpdy : 1;
     uint32_t           mSpdyV31 : 1;
-    uint32_t           mHttp2DraftEnabled : 1;
     uint32_t           mHttp2Enabled : 1;
     uint32_t           mUseH2Deps : 1;
     uint32_t           mEnforceHttp2TlsProfile : 1;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/PHttpChannel.ipdl firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/PHttpChannel.ipdl
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/http/PHttpChannel.ipdl	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/http/PHttpChannel.ipdl	2015-05-25 20:44:01.000000000 +0000
@@ -8,13 +8,15 @@
 include protocol PNecko;
 include InputStreamParams;
 include URIParams;
-include NeckoChannelParams;
 
 include protocol PBlob; //FIXME: bug #792908
 
 include "mozilla/net/NeckoMessageUtils.h";
 
+using RequestHeaderTuples from "mozilla/net/PHttpChannelParams.h";
 using class nsHttpHeaderArray from "nsHttpHeaderArray.h";
+using class nsHttpResponseHead from "nsHttpResponseHead.h";
+using struct nsHttpAtom from "nsHttp.h";
 using mozilla::net::NetAddr from "mozilla/net/DNS.h";
 using struct mozilla::net::ResourceTimingStruct from "mozilla/net/TimingStruct.h";
 
@@ -92,7 +94,7 @@
                  NetAddr             selfAddr,
                  NetAddr             peerAddr,
                  int16_t             redirectCount,
-                 HttpChannelCacheKey cacheKey);
+                 uint32_t            cacheKey);
 
   // Combines a single OnDataAvailable and its associated OnProgress &
   // OnStatus calls into one IPDL message
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/res/nsResProtocolHandler.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/res/nsResProtocolHandler.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/res/nsResProtocolHandler.cpp	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/res/nsResProtocolHandler.cpp	2015-05-25 20:44:01.000000000 +0000
@@ -450,7 +450,7 @@
     if (PR_LOG_TEST(gResLog, PR_LOG_DEBUG)) {
         nsAutoCString spec;
         uri->GetAsciiSpec(spec);
-        PR_LOG(gResLog, PR_LOG_DEBUG,
+        MOZ_LOG(gResLog, PR_LOG_DEBUG,
                ("%s\n -> %s\n", spec.get(), PromiseFlatCString(result).get()));
     }
     return rv;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/rtsp/controller/RtspControllerChild.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/rtsp/controller/RtspControllerChild.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/rtsp/controller/RtspControllerChild.cpp	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/rtsp/controller/RtspControllerChild.cpp	2015-05-25 20:44:01.000000000 +0000
@@ -14,11 +14,11 @@
 #include "mozilla/ipc/InputStreamUtils.h"
 #include "mozilla/ipc/URIUtils.h"
 #include "nsStringStream.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 PRLogModuleInfo* gRtspChildLog = nullptr;
 #undef LOG
-#define LOG(args) PR_LOG(gRtspChildLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gRtspChildLog, PR_LOG_DEBUG, args)
 
 const uint32_t kRtspTotalTracks = 2;
 const unsigned long kRtspCommandDelayMs = 200;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/rtsp/controller/RtspController.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/rtsp/controller/RtspController.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/rtsp/controller/RtspController.cpp	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/rtsp/controller/RtspController.cpp	2015-05-25 20:44:01.000000000 +0000
@@ -34,7 +34,7 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/TimeStamp.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "plbase64.h"
 #include "prmem.h"
@@ -45,7 +45,7 @@
 
 extern PRLogModuleInfo* gRtspLog;
 #undef LOG
-#define LOG(args) PR_LOG(gRtspLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gRtspLog, PR_LOG_DEBUG, args)
 
 namespace mozilla {
 namespace net {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/rtsp/controller/RtspControllerParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/rtsp/controller/RtspControllerParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/rtsp/controller/RtspControllerParent.cpp	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/rtsp/controller/RtspControllerParent.cpp	2015-05-25 20:44:01.000000000 +0000
@@ -13,13 +13,13 @@
 #include "mozilla/ipc/URIUtils.h"
 #include "mozilla/unused.h"
 #include "nsNetUtil.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include <sys/types.h>
 
 PRLogModuleInfo* gRtspLog;
 #undef LOG
-#define LOG(args) PR_LOG(gRtspLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gRtspLog, PR_LOG_DEBUG, args)
 
 #define SEND_DISCONNECT_IF_ERROR(rv)                         \
   if (NS_FAILED(rv) && mIPCOpen && mTotalTracks > 0ul) {     \
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/rtsp/controller/RtspMetaData.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/rtsp/controller/RtspMetaData.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/rtsp/controller/RtspMetaData.cpp	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/rtsp/controller/RtspMetaData.cpp	2015-05-25 20:44:01.000000000 +0000
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "RtspMetaData.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 using namespace mozilla;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/rtsp/rtsp/RTSPConnectionHandler.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/rtsp/rtsp/RTSPConnectionHandler.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/rtsp/rtsp/RTSPConnectionHandler.h	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/rtsp/rtsp/RTSPConnectionHandler.h	2015-05-25 20:44:01.000000000 +0000
@@ -39,7 +39,7 @@
 #include <netdb.h>
 #include "nsPrintfCString.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "prio.h"
 #include "prnetdb.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/rtsp/rtsp/RtspPrlog.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/rtsp/rtsp/RtspPrlog.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/rtsp/rtsp/RtspPrlog.h	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/rtsp/rtsp/RtspPrlog.h	2015-05-25 20:44:01.000000000 +0000
@@ -7,13 +7,13 @@
 #ifndef RTSPPRLOG_H
 #define RTSPPRLOG_H
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 extern PRLogModuleInfo* gRtspLog;
 
-#define LOGI(msg, ...) PR_LOG(gRtspLog, PR_LOG_ALWAYS, (msg, ##__VA_ARGS__))
-#define LOGV(msg, ...) PR_LOG(gRtspLog, PR_LOG_DEBUG, (msg, ##__VA_ARGS__))
-#define LOGE(msg, ...) PR_LOG(gRtspLog, PR_LOG_ERROR, (msg, ##__VA_ARGS__))
-#define LOGW(msg, ...) PR_LOG(gRtspLog, PR_LOG_WARNING, (msg, ##__VA_ARGS__))
+#define LOGI(msg, ...) MOZ_LOG(gRtspLog, PR_LOG_ALWAYS, (msg, ##__VA_ARGS__))
+#define LOGV(msg, ...) MOZ_LOG(gRtspLog, PR_LOG_DEBUG, (msg, ##__VA_ARGS__))
+#define LOGE(msg, ...) MOZ_LOG(gRtspLog, PR_LOG_ERROR, (msg, ##__VA_ARGS__))
+#define LOGW(msg, ...) MOZ_LOG(gRtspLog, PR_LOG_WARNING, (msg, ##__VA_ARGS__))
 
 #endif  // RTSPPRLOG_H
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/websocket/BaseWebSocketChannel.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/websocket/BaseWebSocketChannel.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/websocket/BaseWebSocketChannel.cpp	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/websocket/BaseWebSocketChannel.cpp	2015-05-25 20:44:01.000000000 +0000
@@ -19,10 +19,10 @@
 namespace net {
 
 BaseWebSocketChannel::BaseWebSocketChannel()
-  : mEncrypted(0)
-  , mWasOpened(0)
+  : mWasOpened(0)
   , mClientSetPingInterval(0)
   , mClientSetPingTimeout(0)
+  , mEncrypted(0)
   , mPingForced(0)
   , mPingInterval(0)
   , mPingResponseTimeout(10000)
@@ -145,6 +145,8 @@
 NS_IMETHODIMP
 BaseWebSocketChannel::SetPingInterval(uint32_t aSeconds)
 {
+  MOZ_ASSERT(NS_IsMainThread());
+
   if (mWasOpened) {
     return NS_ERROR_IN_PROGRESS;
   }
@@ -168,6 +170,8 @@
 NS_IMETHODIMP
 BaseWebSocketChannel::SetPingTimeout(uint32_t aSeconds)
 {
+  MOZ_ASSERT(NS_IsMainThread());
+
   if (mWasOpened) {
     return NS_ERROR_IN_PROGRESS;
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/websocket/BaseWebSocketChannel.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/websocket/BaseWebSocketChannel.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/websocket/BaseWebSocketChannel.h	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/websocket/BaseWebSocketChannel.h	2015-05-25 20:44:01.000000000 +0000
@@ -89,11 +89,12 @@
 
   nsCString                       mNegotiatedExtensions;
 
-  uint32_t                        mEncrypted                 : 1;
   uint32_t                        mWasOpened                 : 1;
   uint32_t                        mClientSetPingInterval     : 1;
   uint32_t                        mClientSetPingTimeout      : 1;
-  uint32_t                        mPingForced                : 1;
+
+  Atomic<bool>                    mEncrypted;
+  bool                            mPingForced;
 
   uint32_t                        mPingInterval;         /* milliseconds */
   uint32_t                        mPingResponseTimeout;  /* milliseconds */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/websocket/WebSocketChannel.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/websocket/WebSocketChannel.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/websocket/WebSocketChannel.cpp	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/websocket/WebSocketChannel.cpp	2015-05-25 20:44:01.000000000 +0000
@@ -281,9 +281,13 @@
       }
     }
 
-    // Delays disabled, or no previous failure, or we're reconnecting after scheduled
-    // delay interval has passed: connect.
-    ws->BeginOpen();
+    // Delays disabled, or no previous failure, or we're reconnecting after
+    // scheduled delay interval has passed: connect.
+    // Post an event to avoid potential re-entering of nsWSAdmissionManager and
+    // its lock.
+    NS_DispatchToMainThread(
+      NS_NewRunnableMethod(ws, &WebSocketChannel::BeginOpen),
+                           NS_DISPATCH_NORMAL);
   }
 
   // Remove() also deletes all expired entries as it iterates: better for
@@ -1110,20 +1114,20 @@
   mMaxConcurrentConnections(200),
   mGotUpgradeOK(0),
   mRecvdHttpUpgradeTransport(0),
+  mAutoFollowRedirects(0),
+  mAllowPMCE(1),
+  mPingOutstanding(0),
+  mReleaseOnTransmit(0),
+  mDataStarted(0),
   mRequestedClose(0),
   mClientClosed(0),
   mServerClosed(0),
   mStopped(0),
   mCalledOnStop(0),
-  mPingOutstanding(0),
-  mAutoFollowRedirects(0),
-  mReleaseOnTransmit(0),
   mTCPClosed(0),
   mOpenedHttpChannel(0),
-  mDataStarted(0),
   mIncrementedSessionCount(0),
   mDecrementedSessionCount(0),
-  mAllowPMCE(1),
   mMaxMessageSize(INT32_MAX),
   mStopOnClose(NS_OK),
   mServerCloseCode(CLOSE_ABNORMAL),
@@ -2224,6 +2228,13 @@
 
   // normally this should be called on socket thread, but it is ok to call it
   // from OnStartRequest before the socket thread machine has gotten underway
+  if (NS_IsMainThread()) {
+    MOZ_DIAGNOSTIC_ASSERT(!mDataStarted);
+  } else {
+    MOZ_DIAGNOSTIC_ASSERT(PR_GetCurrentThread() == gSocketThread,
+                          "Called on unexpected thread!");
+    MOZ_DIAGNOSTIC_ASSERT(mDataStarted);
+  }
 
   mStopped = 1;
 
@@ -2326,10 +2337,17 @@
 WebSocketChannel::AbortSession(nsresult reason)
 {
   LOG(("WebSocketChannel::AbortSession() %p [reason %x] stopped = %d\n",
-       this, reason, mStopped));
+       this, reason, !!mStopped));
 
   // normally this should be called on socket thread, but it is ok to call it
   // from the main thread before StartWebsocketData() has completed
+  if (NS_IsMainThread()) {
+    MOZ_DIAGNOSTIC_ASSERT(!mDataStarted);
+  } else {
+    MOZ_DIAGNOSTIC_ASSERT(PR_GetCurrentThread() == gSocketThread,
+                          "Called on unexpected thread!");
+    MOZ_DIAGNOSTIC_ASSERT(mDataStarted);
+  }
 
   // When we are failing we need to close the TCP connection immediately
   // as per 7.1.1
@@ -2363,7 +2381,7 @@
 WebSocketChannel::ReleaseSession()
 {
   LOG(("WebSocketChannel::ReleaseSession() %p stopped = %d\n",
-       this, mStopped));
+       this, !!mStopped));
   MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread, "not socket thread");
 
   if (mStopped)
@@ -3689,7 +3707,13 @@
     return NS_OK;
   }
 
-  if (mCountRecv <= 0 && mCountSent <= 0) {
+  uint64_t countRecv = 0;
+  uint64_t countSent = 0;
+
+  mCountRecv.exchange(countRecv);
+  mCountSent.exchange(countSent);
+
+  if (countRecv == 0 && countSent == 0) {
     // There is no traffic, no need to save.
     return NS_OK;
   }
@@ -3697,7 +3721,7 @@
   // If |enforce| is false, the traffic amount is saved
   // only when the total amount exceeds the predefined
   // threshold.
-  uint64_t totalBytes = mCountRecv + mCountSent;
+  uint64_t totalBytes = countRecv + countSent;
   if (!enforce && totalBytes < NETWORK_STATS_THRESHOLD) {
     return NS_OK;
   }
@@ -3706,13 +3730,9 @@
   // the event is then dispathed to the main thread.
   nsRefPtr<nsRunnable> event =
     new SaveNetworkStatsEvent(mAppId, mIsInBrowser, mActiveNetwork,
-                              mCountRecv, mCountSent, false);
+                              countRecv, countSent, false);
   NS_DispatchToMainThread(event);
 
-  // Reset the counters after saving.
-  mCountSent = 0;
-  mCountRecv = 0;
-
   return NS_OK;
 #else
   return NS_ERROR_NOT_IMPLEMENTED;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/websocket/WebSocketChannel.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/websocket/WebSocketChannel.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/websocket/WebSocketChannel.h	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/websocket/WebSocketChannel.h	2015-05-25 20:44:01.000000000 +0000
@@ -29,6 +29,7 @@
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nsDeque.h"
+#include "mozilla/Atomics.h"
 
 class nsIAsyncVerifyRedirectCallback;
 class nsIDashboardEventNotifier;
@@ -218,22 +219,28 @@
 
   int32_t                         mMaxConcurrentConnections;
 
+  // following members are accessed only on the main thread
   uint32_t                        mGotUpgradeOK              : 1;
   uint32_t                        mRecvdHttpUpgradeTransport : 1;
-  uint32_t                        mRequestedClose            : 1;
-  uint32_t                        mClientClosed              : 1;
-  uint32_t                        mServerClosed              : 1;
-  uint32_t                        mStopped                   : 1;
-  uint32_t                        mCalledOnStop              : 1;
-  uint32_t                        mPingOutstanding           : 1;
   uint32_t                        mAutoFollowRedirects       : 1;
-  uint32_t                        mReleaseOnTransmit         : 1;
-  uint32_t                        mTCPClosed                 : 1;
-  uint32_t                        mOpenedHttpChannel         : 1;
-  uint32_t                        mDataStarted               : 1;
-  uint32_t                        mIncrementedSessionCount   : 1;
-  uint32_t                        mDecrementedSessionCount   : 1;
   uint32_t                        mAllowPMCE                 : 1;
+  uint32_t                                                   : 0;
+
+  // following members are accessed only on the socket thread
+  uint32_t                        mPingOutstanding           : 1;
+  uint32_t                        mReleaseOnTransmit         : 1;
+  uint32_t                                                   : 0;
+
+  Atomic<bool>                    mDataStarted;
+  Atomic<bool>                    mRequestedClose;
+  Atomic<bool>                    mClientClosed;
+  Atomic<bool>                    mServerClosed;
+  Atomic<bool>                    mStopped;
+  Atomic<bool>                    mCalledOnStop;
+  Atomic<bool>                    mTCPClosed;
+  Atomic<bool>                    mOpenedHttpChannel;
+  Atomic<bool>                    mIncrementedSessionCount;
+  Atomic<bool>                    mDecrementedSessionCount;
 
   int32_t                         mMaxMessageSize;
   nsresult                        mStopOnClose;
@@ -278,8 +285,8 @@
 
 // These members are used for network per-app metering (bug 855949)
 // Currently, they are only available on gonk.
-  uint64_t                        mCountRecv;
-  uint64_t                        mCountSent;
+  Atomic<uint64_t, Relaxed>       mCountRecv;
+  Atomic<uint64_t, Relaxed>       mCountSent;
   uint32_t                        mAppId;
   bool                            mIsInBrowser;
 #ifdef MOZ_WIDGET_GONK
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/websocket/WebSocketChannelParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/websocket/WebSocketChannelParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/websocket/WebSocketChannelParent.cpp	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/websocket/WebSocketChannelParent.cpp	2015-05-25 20:44:01.000000000 +0000
@@ -304,8 +304,8 @@
 
   // Only support nsILoadContext if child channel's callbacks did too
   if (iid.Equals(NS_GET_IID(nsILoadContext)) && mLoadContext) {
-    NS_ADDREF(mLoadContext);
-    *result = static_cast<nsILoadContext*>(mLoadContext);
+    nsCOMPtr<nsILoadContext> copy = mLoadContext;
+    copy.forget(result);
     return NS_OK;
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/websocket/WebSocketLog.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/websocket/WebSocketLog.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/websocket/WebSocketLog.h	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/websocket/WebSocketLog.h	2015-05-25 20:44:01.000000000 +0000
@@ -8,12 +8,12 @@
 #define WebSocketLog_h
 
 #include "base/basictypes.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "mozilla/net/NeckoChild.h"
 
 extern PRLogModuleInfo* webSocketLog;
 
 #undef LOG
-#define LOG(args) PR_LOG(webSocketLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(webSocketLog, PR_LOG_DEBUG, args)
 
 #endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/wyciwyg/nsWyciwyg.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/wyciwyg/nsWyciwyg.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/wyciwyg/nsWyciwyg.h	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/wyciwyg/nsWyciwyg.h	2015-05-25 20:44:02.000000000 +0000
@@ -10,7 +10,7 @@
 // Get rid of chromium's LOG.
 #undef LOG
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 //
 // Log module for HTTP Protocol logging...
@@ -26,10 +26,10 @@
 extern PRLogModuleInfo *gWyciwygLog;
 
 // http logging
-#define LOG1(args) PR_LOG(gWyciwygLog, 1, args)
-#define LOG2(args) PR_LOG(gWyciwygLog, 2, args)
-#define LOG3(args) PR_LOG(gWyciwygLog, 3, args)
-#define LOG4(args) PR_LOG(gWyciwygLog, 4, args)
+#define LOG1(args) MOZ_LOG(gWyciwygLog, 1, args)
+#define LOG2(args) MOZ_LOG(gWyciwygLog, 2, args)
+#define LOG3(args) MOZ_LOG(gWyciwygLog, 3, args)
+#define LOG4(args) MOZ_LOG(gWyciwygLog, 4, args)
 #define LOG(args) LOG4(args)
 
 #define LOG1_ENABLED() PR_LOG_TEST(gWyciwygLog, 1)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp	2015-05-25 20:44:01.000000000 +0000
@@ -341,8 +341,8 @@
 {
   // Only support nsILoadContext if child channel's callbacks did too
   if (uuid.Equals(NS_GET_IID(nsILoadContext)) && mLoadContext) {
-    NS_ADDREF(mLoadContext);
-    *result = static_cast<nsILoadContext*>(mLoadContext);
+    nsCOMPtr<nsILoadContext> copy = mLoadContext;
+    copy.forget(result);
     return NS_OK;
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/sctp/datachannel/DataChannelLog.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/sctp/datachannel/DataChannelLog.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/sctp/datachannel/DataChannelLog.h	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/sctp/datachannel/DataChannelLog.h	2015-05-25 20:44:02.000000000 +0000
@@ -8,12 +8,12 @@
 #define DataChannelLog_h
 
 #include "base/basictypes.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 extern PRLogModuleInfo* GetDataChannelLog();
 extern PRLogModuleInfo* GetSCTPLog();
 
 #undef LOG
-#define LOG(args) PR_LOG(GetDataChannelLog(), PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(GetDataChannelLog(), PR_LOG_DEBUG, args)
 
 #endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/socket/nsSOCKSIOLayer.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/socket/nsSOCKSIOLayer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/socket/nsSOCKSIOLayer.cpp	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/socket/nsSOCKSIOLayer.cpp	2015-05-25 20:44:02.000000000 +0000
@@ -19,6 +19,7 @@
 #include "nsIDNSListener.h"
 #include "nsICancelable.h"
 #include "nsThreadUtils.h"
+#include "mozilla/Logging.h"
 #include "mozilla/net/DNS.h"
 
 using namespace mozilla::net;
@@ -29,8 +30,8 @@
 static bool ipv6Supported = true;
 
 static PRLogModuleInfo *gSOCKSLog;
-#define LOGDEBUG(args) PR_LOG(gSOCKSLog, PR_LOG_DEBUG, args)
-#define LOGERROR(args) PR_LOG(gSOCKSLog, PR_LOG_ERROR , args)
+#define LOGDEBUG(args) MOZ_LOG(gSOCKSLog, PR_LOG_DEBUG, args)
+#define LOGERROR(args) MOZ_LOG(gSOCKSLog, PR_LOG_ERROR , args)
 
 class nsSOCKSSocketInfo : public nsISOCKSSocketInfo
                         , public nsIDNSListener
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/streamconv/converters/nsFTPDirListingConv.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/streamconv/converters/nsFTPDirListingConv.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/streamconv/converters/nsFTPDirListingConv.cpp	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/streamconv/converters/nsFTPDirListingConv.cpp	2015-05-25 20:44:03.000000000 +0000
@@ -6,7 +6,7 @@
 #include "nsFTPDirListingConv.h"
 #include "nsMemory.h"
 #include "plstr.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsCOMPtr.h"
 #include "nsEscape.h"
 #include "nsStringStream.h"
@@ -61,7 +61,7 @@
     mFinalListener = aListener;
     NS_ADDREF(mFinalListener);
 
-    PR_LOG(gFTPDirListConvLog, PR_LOG_DEBUG, 
+    MOZ_LOG(gFTPDirListConvLog, PR_LOG_DEBUG, 
         ("nsFTPDirListingConv::AsyncConvertData() converting FROM raw, TO application/http-index-format\n"));
 
     return NS_OK;
@@ -95,7 +95,7 @@
     // the dir listings are ascii text, null terminate this sucker.
     buffer[streamLen] = '\0';
 
-    PR_LOG(gFTPDirListConvLog, PR_LOG_DEBUG, ("nsFTPDirListingConv::OnData(request = %x, ctxt = %x, inStr = %x, sourceOffset = %llu, count = %u)\n", request, ctxt, inStr, sourceOffset, count));
+    MOZ_LOG(gFTPDirListConvLog, PR_LOG_DEBUG, ("nsFTPDirListingConv::OnData(request = %x, ctxt = %x, inStr = %x, sourceOffset = %llu, count = %u)\n", request, ctxt, inStr, sourceOffset, count));
 
     if (!mBuffer.IsEmpty()) {
         // we have data left over from a previous OnDataAvailable() call.
@@ -110,7 +110,7 @@
     }
 
 #ifndef DEBUG_dougt
-    PR_LOG(gFTPDirListConvLog, PR_LOG_DEBUG, ("::OnData() received the following %d bytes...\n\n%s\n\n", streamLen, buffer.get()) );
+    MOZ_LOG(gFTPDirListConvLog, PR_LOG_DEBUG, ("::OnData() received the following %d bytes...\n\n%s\n\n", streamLen, buffer.get()) );
 #else
     printf("::OnData() received the following %d bytes...\n\n%s\n\n", streamLen, buffer);
 #endif // DEBUG_dougt
@@ -132,7 +132,7 @@
     line = DigestBufferLines(line, indexFormat);
 
 #ifndef DEBUG_dougt
-    PR_LOG(gFTPDirListConvLog, PR_LOG_DEBUG, ("::OnData() sending the following %d bytes...\n\n%s\n\n", 
+    MOZ_LOG(gFTPDirListConvLog, PR_LOG_DEBUG, ("::OnData() sending the following %d bytes...\n\n%s\n\n", 
         indexFormat.Length(), indexFormat.get()) );
 #else
     char *unescData = ToNewCString(indexFormat);
@@ -146,7 +146,7 @@
     // if there's any data left over, buffer it.
     if (line && *line) {
         mBuffer.Append(line);
-        PR_LOG(gFTPDirListConvLog, PR_LOG_DEBUG, ("::OnData() buffering the following %d bytes...\n\n%s\n\n",
+        MOZ_LOG(gFTPDirListConvLog, PR_LOG_DEBUG, ("::OnData() buffering the following %d bytes...\n\n%s\n\n",
             strlen(line), line) );
     }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/system/linux/nsNotifyAddrListener_Linux.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/system/linux/nsNotifyAddrListener_Linux.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/system/linux/nsNotifyAddrListener_Linux.cpp	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/system/linux/nsNotifyAddrListener_Linux.cpp	2015-05-25 20:44:03.000000000 +0000
@@ -19,7 +19,7 @@
 #include "nsNotifyAddrListener_Linux.h"
 #include "nsString.h"
 #include "nsAutoPtr.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "mozilla/Services.h"
 #include "mozilla/Preferences.h"
@@ -39,7 +39,7 @@
 using namespace mozilla;
 
 static PRLogModuleInfo *gNotifyAddrLog = nullptr;
-#define LOG(args) PR_LOG(gNotifyAddrLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gNotifyAddrLog, PR_LOG_DEBUG, args)
 
 #define NETWORK_NOTIFY_CHANGED_PREF "network.notify.changed"
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/system/qt/nsQtNetworkLinkService.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/system/qt/nsQtNetworkLinkService.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/system/qt/nsQtNetworkLinkService.h	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/system/qt/nsQtNetworkLinkService.h	2015-05-25 20:44:03.000000000 +0000
@@ -18,11 +18,12 @@
   NS_DECL_NSIOBSERVER
 
   nsQtNetworkLinkService();
-  virtual ~nsQtNetworkLinkService();
 
   nsresult Init();
   nsresult Shutdown();
 
+private:
+  virtual ~nsQtNetworkLinkService();
 };
 
 #endif /* NSQTNETWORKLINKSERVICE_H_ */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/system/win32/nsNotifyAddrListener.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/system/win32/nsNotifyAddrListener.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/system/win32/nsNotifyAddrListener.cpp	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/system/win32/nsNotifyAddrListener.cpp	2015-05-25 20:44:03.000000000 +0000
@@ -19,7 +19,7 @@
 #include <netioapi.h>
 #include <iprtrmib.h>
 #include "plstr.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsThreadUtils.h"
 #include "nsIObserverService.h"
 #include "nsServiceManagerUtils.h"
@@ -36,7 +36,7 @@
 using namespace mozilla;
 
 static PRLogModuleInfo *gNotifyAddrLog = nullptr;
-#define LOG(args) PR_LOG(gNotifyAddrLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gNotifyAddrLog, PR_LOG_DEBUG, args)
 
 static HMODULE sNetshell;
 static decltype(NcFreeNetconProperties)* sNcFreeNetconProperties;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/browser/browser_NetUtil.js firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/browser/browser_NetUtil.js
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/browser/browser_NetUtil.js	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/browser/browser_NetUtil.js	2015-05-25 20:44:03.000000000 +0000
@@ -28,19 +28,17 @@
 
 function test_asyncFetchBadCert() {
   // Try a load from an untrusted cert, with errors supressed
-  NetUtil.asyncFetch2("https://untrusted.example.com", function (aInputStream, aStatusCode, aRequest) {
+  NetUtil.asyncFetch({
+    uri: "https://untrusted.example.com",
+    loadUsingSystemPrincipal: true
+  }, function (aInputStream, aStatusCode, aRequest) {
     ok(!Components.isSuccessCode(aStatusCode), "request failed");
     ok(aRequest instanceof Ci.nsIHttpChannel, "request is an nsIHttpChannel");
 
     // Now try again with a channel whose notificationCallbacks doesn't suprress errors
-    let channel = NetUtil.newChannel2("https://untrusted.example.com",
-                                      null,
-                                      null,
-                                      null,      // aLoadingNode
-                                      Services.scriptSecurityManager.getSystemPrincipal(),
-                                      null,      // aTriggeringPrincipal
-                                      Ci.nsILoadInfo.SEC_NORMAL,
-                                      Ci.nsIContentPolicy.TYPE_OTHER);
+    let channel = NetUtil.newChannel({
+      uri: "https://untrusted.example.com",
+      loadUsingSystemPrincipal: true});
     channel.notificationCallbacks = {
       QueryInterface: XPCOMUtils.generateQI([Ci.nsIProgressEventSink,
                                              Ci.nsIInterfaceRequestor]),
@@ -48,31 +46,24 @@
       onProgress: function () {},
       onStatus: function () {}
     };
-    NetUtil.asyncFetch2(channel, function (aInputStream, aStatusCode, aRequest) {
+    NetUtil.asyncFetch(channel, function (aInputStream, aStatusCode, aRequest) {
       ok(!Components.isSuccessCode(aStatusCode), "request failed");
       ok(aRequest instanceof Ci.nsIHttpChannel, "request is an nsIHttpChannel");
 
       // Now try a valid request
-      NetUtil.asyncFetch2("https://example.com", function (aInputStream, aStatusCode, aRequest) {
+      NetUtil.asyncFetch({
+        uri: "https://example.com",
+        loadUsingSystemPrincipal: true
+      }, function (aInputStream, aStatusCode, aRequest) {
         info("aStatusCode for valid request: " + aStatusCode);
         ok(Components.isSuccessCode(aStatusCode), "request succeeded");
         ok(aRequest instanceof Ci.nsIHttpChannel, "request is an nsIHttpChannel");
         ok(aRequest.requestSucceeded, "HTTP request succeeded");
-  
+
         nextTest();
-      },
-      null,      // aLoadingNode
-      Services.scriptSecurityManager.getSystemPrincipal(),
-      null,      // aTriggeringPrincipal
-      Ci.nsILoadInfo.SEC_NORMAL,
-      Ci.nsIContentPolicy.TYPE_OTHER);
+      });
     });
-  },
-  null,      // aLoadingNode
-  Services.scriptSecurityManager.getSystemPrincipal(),
-  null,      // aTriggeringPrincipal
-  Ci.nsILoadInfo.SEC_NORMAL,
-  Ci.nsIContentPolicy.TYPE_OTHER);
+  });
 }
 
 function WindowListener(aURL, aCallback) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/httpserver/Makefile.in firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/httpserver/Makefile.in
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/httpserver/Makefile.in	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/httpserver/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-# vim: noexpandtab ts=8 sw=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/.
-
-NO_INTERFACES_MANIFEST = 1
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/httpserver/moz.build firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/httpserver/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/httpserver/moz.build	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/httpserver/moz.build	2015-05-25 20:44:03.000000000 +0000
@@ -10,6 +10,9 @@
 
 XPIDL_MODULE = 'test_necko'
 
+# Don't add our test-only .xpt files to the normal manifests
+XPIDL_NO_MANIFEST = True
+
 XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini']
 
 EXTRA_COMPONENTS += [
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/mochitests/test_rel_preconnect.html firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/mochitests/test_rel_preconnect.html
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/mochitests/test_rel_preconnect.html	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/mochitests/test_rel_preconnect.html	2015-05-25 20:44:03.000000000 +0000
@@ -33,6 +33,7 @@
         try { socket.close(); } catch(e) {}
         try { trans.close(); } catch(e) {}
         ok(true, "received connect");
+        srv.listener.close();
         setTimeout(srv.nextTest, 0);
     },
     onStopListening: function(socket) {}
@@ -54,7 +55,6 @@
 function testHeader()
 {
   // test the http link response header
-  srv.listener.close();
   srv = new TestServer(testDone);
   var xhr = new XMLHttpRequest();
   xhr.open("GET", 'rel_preconnect.sjs', false);
@@ -67,7 +67,6 @@
 {
   SpecialPowers.setIntPref("network.http.speculative-parallel-limit",
                             originalLimit);
-  srv.listener.close();
   SimpleTest.finish();
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/TestBlockingSocket.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/TestBlockingSocket.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/TestBlockingSocket.cpp	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/TestBlockingSocket.cpp	2015-05-25 20:44:03.000000000 +0000
@@ -12,7 +12,7 @@
 #include "nsStringAPI.h"
 #include "nsIFile.h"
 #include "nsNetUtil.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prenv.h"
 #include "prthread.h"
 #include <stdlib.h>
@@ -23,7 +23,7 @@
 // set NSPR_LOG_MODULES=Test:5
 //
 static PRLogModuleInfo *gTestLog = nullptr;
-#define LOG(args) PR_LOG(gTestLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gTestLog, PR_LOG_DEBUG, args)
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/TestIOThreads.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/TestIOThreads.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/TestIOThreads.cpp	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/TestIOThreads.cpp	2015-05-25 20:44:03.000000000 +0000
@@ -9,13 +9,13 @@
 #include "nsIEventTarget.h"
 #include "nsCOMPtr.h"
 #include "nsNetCID.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 //
 // set NSPR_LOG_MODULES=Test:5
 //
 static PRLogModuleInfo *gTestLog = nullptr;
-#define LOG(args) PR_LOG(gTestLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gTestLog, PR_LOG_DEBUG, args)
 
 class nsIOEvent : public nsIRunnable {
 public:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/TestOverlappedIO.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/TestOverlappedIO.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/TestOverlappedIO.cpp	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/TestOverlappedIO.cpp	2015-05-25 20:44:03.000000000 +0000
@@ -27,7 +27,7 @@
 #include "nsIByteArrayInputStream.h"
 
 static PRLogModuleInfo *gTestSocketIOLog;
-#define LOG(args) PR_LOG(gTestSocketIOLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gTestSocketIOLog, PR_LOG_DEBUG, args)
 
 static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID);
 static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/TestProtocols.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/TestProtocols.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/TestProtocols.cpp	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/TestProtocols.cpp	2015-05-25 20:44:03.000000000 +0000
@@ -55,7 +55,7 @@
 #include "nsISimpleEnumerator.h"
 #include "nsStringAPI.h"
 #include "nsNetUtil.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 using namespace mozilla;
 
@@ -65,7 +65,7 @@
 // set NSPR_LOG_MODULES=Test:5
 //
 static PRLogModuleInfo *gTestLog = nullptr;
-#define LOG(args) PR_LOG(gTestLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gTestLog, PR_LOG_DEBUG, args)
 
 static NS_DEFINE_CID(kIOServiceCID,              NS_IOSERVICE_CID);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/TestServ.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/TestServ.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/TestServ.cpp	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/TestServ.cpp	2015-05-25 20:44:03.000000000 +0000
@@ -11,13 +11,13 @@
 #include "nsNetUtil.h"
 #include "nsStringAPI.h"
 #include "nsCOMPtr.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 //
 // set NSPR_LOG_MODULES=Test:5
 //
 static PRLogModuleInfo *gTestLog = nullptr;
-#define LOG(args) PR_LOG(gTestLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gTestLog, PR_LOG_DEBUG, args)
 
 class MySocketListener : public nsIServerSocketListener
 {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/TestSocketIO.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/TestSocketIO.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/TestSocketIO.cpp	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/TestSocketIO.cpp	2015-05-25 20:44:03.000000000 +0000
@@ -26,7 +26,7 @@
 #include "nsIByteArrayInputStream.h"
 
 static PRLogModuleInfo *gTestSocketIOLog;
-#define LOG(args) PR_LOG(gTestSocketIOLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gTestSocketIOLog, PR_LOG_DEBUG, args)
 
 static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID);
 static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/TestSocketTransport.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/TestSocketTransport.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/TestSocketTransport.cpp	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/TestSocketTransport.cpp	2015-05-25 20:44:03.000000000 +0000
@@ -23,7 +23,7 @@
 #include "nsIFile.h"
 #include "nsNetUtil.h"
 #include "nsAutoLock.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -31,7 +31,7 @@
 // set NSPR_LOG_MODULES=Test:5
 //
 static PRLogModuleInfo *gTestLog = nullptr;
-#define LOG(args) PR_LOG(gTestLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gTestLog, PR_LOG_DEBUG, args)
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/TestStreamChannel.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/TestStreamChannel.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/TestStreamChannel.cpp	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/TestStreamChannel.cpp	2015-05-25 20:44:03.000000000 +0000
@@ -20,7 +20,7 @@
 #include "nsIFile.h"
 #include "nsNetUtil.h"
 #include "nsAutoLock.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include <algorithm>
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -29,7 +29,7 @@
 // set NSPR_LOG_MODULES=Test:5
 //
 static PRLogModuleInfo *gTestLog = nullptr;
-#define LOG(args) PR_LOG(gTestLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gTestLog, PR_LOG_DEBUG, args)
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/TestStreamLoader.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/TestStreamLoader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/TestStreamLoader.cpp	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/TestStreamLoader.cpp	2015-05-25 20:44:03.000000000 +0000
@@ -2,7 +2,7 @@
 #include "TestCommon.h"
 #include "nsNetUtil.h"
 #include "nsThreadUtils.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "mozilla/Attributes.h"
 #include "nsIScriptSecurityManager.h"
 
@@ -10,7 +10,7 @@
 // set NSPR_LOG_MODULES=Test:5
 //
 static PRLogModuleInfo *gTestLog = nullptr;
-#define LOG(args) PR_LOG(gTestLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gTestLog, PR_LOG_DEBUG, args)
 
 class MyStreamLoaderObserver final : public nsIStreamLoaderObserver
 {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/TestStreamPump.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/TestStreamPump.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/TestStreamPump.cpp	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/TestStreamPump.cpp	2015-05-25 20:44:03.000000000 +0000
@@ -21,7 +21,7 @@
 #include "nsIFile.h"
 #include "nsNetUtil.h"
 #include "nsAutoLock.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prprf.h"
 #include <algorithm>
 
@@ -31,7 +31,7 @@
 // set NSPR_LOG_MODULES=Test:5
 //
 static PRLogModuleInfo *gTestLog = nullptr;
-#define LOG(args) PR_LOG(gTestLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gTestLog, PR_LOG_DEBUG, args)
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/TestStreamTransport.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/TestStreamTransport.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/TestStreamTransport.cpp	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/TestStreamTransport.cpp	2015-05-25 20:44:03.000000000 +0000
@@ -20,7 +20,7 @@
 #include "nsIFile.h"
 #include "nsNetUtil.h"
 #include "nsAutoLock.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prenv.h"
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -29,7 +29,7 @@
 // set NSPR_LOG_MODULES=Test:5
 //
 static PRLogModuleInfo *gTestLog = nullptr;
-#define LOG(args) PR_LOG(gTestLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gTestLog, PR_LOG_DEBUG, args)
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/TestUpload.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/TestUpload.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/TestUpload.cpp	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/TestUpload.cpp	2015-05-25 20:44:03.000000000 +0000
@@ -15,12 +15,12 @@
 
 #include "nsIUploadChannel.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 //
 // set NSPR_LOG_MODULES=Test:5
 //
 static PRLogModuleInfo *gTestLog = nullptr;
-#define LOG(args) PR_LOG(gTestLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(gTestLog, PR_LOG_DEBUG, args)
 
 //-----------------------------------------------------------------------------
 // InputTestConsumer
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/unit/test_backgroundfilesaver.js firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/unit/test_backgroundfilesaver.js
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/unit/test_backgroundfilesaver.js	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/unit/test_backgroundfilesaver.js	2015-05-25 20:44:04.000000000 +0000
@@ -107,7 +107,10 @@
  */
 function promiseVerifyContents(aFile, aExpectedContents) {
   let deferred = Promise.defer();
-  NetUtil.asyncFetch2(aFile, function(aInputStream, aStatus) {
+  NetUtil.asyncFetch({
+    uri: NetUtil.newURI(aFile),
+    loadUsingSystemPrincipal: true
+  }, function(aInputStream, aStatus) {
     do_check_true(Components.isSuccessCode(aStatus));
     let contents = NetUtil.readInputStreamToString(aInputStream,
                                                    aInputStream.available());
@@ -119,12 +122,7 @@
       do_check_true(contents == aExpectedContents);
     }
     deferred.resolve();
-  },
-  null,      // aLoadingNode
-  Services.scriptSecurityManager.getSystemPrincipal(),
-  null,      // aTriggeringPrincipal
-  Ci.nsILoadInfo.SEC_NORMAL,
-  Ci.nsIContentPolicy.TYPE_OTHER);
+  });
 
   return deferred.promise;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/unit/test_http2.js firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/unit/test_http2.js
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/unit/test_http2.js	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/unit/test_http2.js	2015-05-25 20:44:04.000000000 +0000
@@ -26,7 +26,7 @@
 
 function checkIsHttp2(request) {
   try {
-    if (request.getResponseHeader("X-Firefox-Spdy") == "h2-16") {
+    if (request.getResponseHeader("X-Firefox-Spdy") == "h2") {
       if (request.getResponseHeader("X-Connection-Http2") == "yes") {
         return true;
       }
@@ -859,7 +859,6 @@
 var spdypref;
 var spdy3pref;
 var spdypush;
-var http2draftpref;
 var http2pref;
 var tlspref;
 var altsvcpref1;
@@ -871,7 +870,6 @@
   prefs.setBoolPref("network.http.spdy.enabled", spdypref);
   prefs.setBoolPref("network.http.spdy.enabled.v3-1", spdy3pref);
   prefs.setBoolPref("network.http.spdy.allow-push", spdypush);
-  prefs.setBoolPref("network.http.spdy.enabled.http2draft", http2draftpref);
   prefs.setBoolPref("network.http.spdy.enabled.http2", http2pref);
   prefs.setBoolPref("network.http.spdy.enforce-tls-profile", tlspref);
   prefs.setBoolPref("network.http.altsvc.enabled", altsvcpref1);
@@ -901,7 +899,6 @@
   spdypref = prefs.getBoolPref("network.http.spdy.enabled");
   spdy3pref = prefs.getBoolPref("network.http.spdy.enabled.v3-1");
   spdypush = prefs.getBoolPref("network.http.spdy.allow-push");
-  http2draftpref = prefs.getBoolPref("network.http.spdy.enabled.http2draft");
   http2pref = prefs.getBoolPref("network.http.spdy.enabled.http2");
   tlspref = prefs.getBoolPref("network.http.spdy.enforce-tls-profile");
   altsvcpref1 = prefs.getBoolPref("network.http.altsvc.enabled");
@@ -910,7 +907,6 @@
   prefs.setBoolPref("network.http.spdy.enabled", 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.enabled.http2", true);
   prefs.setBoolPref("network.http.spdy.enforce-tls-profile", false);
   prefs.setBoolPref("network.http.altsvc.enabled", true);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/unit/test_NetUtil.js firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/unit/test_NetUtil.js
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/test/unit/test_NetUtil.js	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/test/unit/test_NetUtil.js	2015-05-25 20:44:03.000000000 +0000
@@ -530,7 +530,10 @@
                                    null,      // aTriggeringPrincipal
                                    Ci.nsILoadInfo.SEC_NORMAL,
                                    Ci.nsIContentPolicy.TYPE_OTHER);
-  let NetUtilChannel = NetUtil.newChannel(TEST_SPEC);
+  let NetUtilChannel = NetUtil.newChannel({
+    uri: TEST_SPEC,
+    loadUsingSystemPrincipal: true
+  });
   do_check_true(iosChannel.URI.equals(NetUtilChannel.URI));
 
   run_next_test();
@@ -549,29 +552,10 @@
                                                         null,      // aTriggeringPrincipal
                                                         Ci.nsILoadInfo.SEC_NORMAL,
                                                         Ci.nsIContentPolicy.TYPE_OTHER);
-  let NetUtilChannel = NetUtil.newChannel(uri);
-  do_check_true(iosChannel.URI.equals(NetUtilChannel.URI));
-
-  run_next_test();
-}
-
-function test_newChannel_with_nsIFile()
-{
-  let file = Cc["@mozilla.org/file/directory_service;1"].
-             getService(Ci.nsIProperties).
-             get("ProfD", Ci.nsIFile);
-  file.append("NetUtil-test-file.tmp");
-
-  // Check that we get the same URI back from channel the IO service creates and
-  // the channel the utility method creates.
-  let uri = NetUtil.newURI(file);
-  let iosChannel = NetUtil.ioService.newChannelFromURI2(uri,
-                                                        null,      // aLoadingNode
-                                                        Services.scriptSecurityManager.getSystemPrincipal(),
-                                                        null,      // aTriggeringPrincipal
-                                                        Ci.nsILoadInfo.SEC_NORMAL,
-                                                        Ci.nsIContentPolicy.TYPE_OTHER);
-  let NetUtilChannel = NetUtil.newChannel(file);
+  let NetUtilChannel = NetUtil.newChannel({
+    uri: uri,
+    loadUsingSystemPrincipal: true
+  });
   do_check_true(iosChannel.URI.equals(NetUtilChannel.URI));
 
   run_next_test();
@@ -802,7 +786,6 @@
   test_newChannel_no_specifier,
   test_newChannel_with_string,
   test_newChannel_with_nsIURI,
-  test_newChannel_with_nsIFile,
   test_newChannel_with_options,
   test_newChannel_with_wrong_options,
   test_readInputStreamToString,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/wifi/nsWifiAccessPoint.cpp firefox-trunk-41.0~a1~hg20150524r245419/netwerk/wifi/nsWifiAccessPoint.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/wifi/nsWifiAccessPoint.cpp	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/wifi/nsWifiAccessPoint.cpp	2015-05-25 20:44:04.000000000 +0000
@@ -5,10 +5,10 @@
 #include "nsWifiAccessPoint.h"
 #include "nsString.h"
 #include "nsMemory.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 extern PRLogModuleInfo *gWifiMonitorLog;
-#define LOG(args)     PR_LOG(gWifiMonitorLog, PR_LOG_DEBUG, args)
+#define LOG(args)     MOZ_LOG(gWifiMonitorLog, PR_LOG_DEBUG, args)
 
 
 NS_IMPL_ISUPPORTS(nsWifiAccessPoint, nsIWifiAccessPoint)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/netwerk/wifi/nsWifiMonitor.h firefox-trunk-41.0~a1~hg20150524r245419/netwerk/wifi/nsWifiMonitor.h
--- firefox-trunk-41.0~a1~hg20150513r243603/netwerk/wifi/nsWifiMonitor.h	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/netwerk/wifi/nsWifiMonitor.h	2015-05-25 20:44:04.000000000 +0000
@@ -15,7 +15,7 @@
 #include "nsIWifiListener.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/ReentrantMonitor.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsIObserver.h"
 #include "nsTArray.h"
 #include "nsITimer.h"
@@ -27,7 +27,7 @@
 #endif
 
 extern PRLogModuleInfo *gWifiMonitorLog;
-#define LOG(args)     PR_LOG(gWifiMonitorLog, PR_LOG_DEBUG, args)
+#define LOG(args)     MOZ_LOG(gWifiMonitorLog, PR_LOG_DEBUG, args)
 
 class nsWifiAccessPoint;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/parser/html/nsHtml5Highlighter.cpp firefox-trunk-41.0~a1~hg20150524r245419/parser/html/nsHtml5Highlighter.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/parser/html/nsHtml5Highlighter.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/parser/html/nsHtml5Highlighter.cpp	2015-05-25 20:44:08.000000000 +0000
@@ -53,8 +53,6 @@
  , mInlinesOpen(0)
  , mInCharacters(false)
  , mBuffer(nullptr)
- , mSyntaxHighlight(Preferences::GetBool("view_source.syntax_highlight",
-                                         true))
  , mOpSink(aOpSink)
  , mCurrentRun(nullptr)
  , mAmpersand(nullptr)
@@ -713,9 +711,6 @@
 void
 nsHtml5Highlighter::AddClass(const char16_t* aClass)
 {
-  if (!mSyntaxHighlight) {
-    return;
-  }
   mOpQueue.AppendElement()->InitAddClass(CurrentNode(), aClass);
 }
 
@@ -751,9 +746,6 @@
 void
 nsHtml5Highlighter::AddErrorToCurrentNode(const char* aMsgId)
 {
-  if (!mSyntaxHighlight) {
-    return;
-  }
   nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement();
   NS_ASSERTION(treeOp, "Tree op allocation failed.");
   treeOp->Init(CurrentNode(), aMsgId);
@@ -762,9 +754,6 @@
 void
 nsHtml5Highlighter::AddErrorToCurrentRun(const char* aMsgId)
 {
-  if (!mSyntaxHighlight) {
-    return;
-  }
   NS_PRECONDITION(mCurrentRun, "Adding error to run without one!");
   nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement();
   NS_ASSERTION(treeOp, "Tree op allocation failed.");
@@ -775,9 +764,6 @@
 nsHtml5Highlighter::AddErrorToCurrentRun(const char* aMsgId,
                                          nsIAtom* aName)
 {
-  if (!mSyntaxHighlight) {
-    return;
-  }
   NS_PRECONDITION(mCurrentRun, "Adding error to run without one!");
   nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement();
   NS_ASSERTION(treeOp, "Tree op allocation failed.");
@@ -789,9 +775,6 @@
                                          nsIAtom* aName,
                                          nsIAtom* aOther)
 {
-  if (!mSyntaxHighlight) {
-    return;
-  }
   NS_PRECONDITION(mCurrentRun, "Adding error to run without one!");
   nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement();
   NS_ASSERTION(treeOp, "Tree op allocation failed.");
@@ -801,9 +784,6 @@
 void
 nsHtml5Highlighter::AddErrorToCurrentAmpersand(const char* aMsgId)
 {
-  if (!mSyntaxHighlight) {
-    return;
-  }
   NS_PRECONDITION(mAmpersand, "Adding error to ampersand without one!");
   nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement();
   NS_ASSERTION(treeOp, "Tree op allocation failed.");
@@ -813,9 +793,6 @@
 void
 nsHtml5Highlighter::AddErrorToCurrentSlash(const char* aMsgId)
 {
-  if (!mSyntaxHighlight) {
-    return;
-  }
   NS_PRECONDITION(mSlash, "Adding error to slash without one!");
   nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement();
   NS_ASSERTION(treeOp, "Tree op allocation failed.");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/parser/html/nsHtml5Highlighter.h firefox-trunk-41.0~a1~hg20150524r245419/parser/html/nsHtml5Highlighter.h
--- firefox-trunk-41.0~a1~hg20150513r243603/parser/html/nsHtml5Highlighter.h	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/parser/html/nsHtml5Highlighter.h	2015-05-25 20:44:08.000000000 +0000
@@ -314,11 +314,6 @@
     nsHtml5UTF16Buffer* mBuffer;
 
     /**
-     * Whether to highlight syntax visibly initially.
-     */
-    bool mSyntaxHighlight;
-
-    /**
      * The outgoing tree op queue.
      */
     nsTArray<nsHtml5TreeOperation> mOpQueue;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/parser/html/nsHtml5NamedCharactersAccel.h firefox-trunk-41.0~a1~hg20150524r245419/parser/html/nsHtml5NamedCharactersAccel.h
--- firefox-trunk-41.0~a1~hg20150513r243603/parser/html/nsHtml5NamedCharactersAccel.h	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/parser/html/nsHtml5NamedCharactersAccel.h	2015-05-25 20:44:08.000000000 +0000
@@ -12,7 +12,7 @@
 #include "jArray.h"
 #include "nscore.h"
 #include "nsDebug.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsMemory.h"
 
 class nsHtml5NamedCharactersAccel
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/parser/html/nsHtml5NamedCharacters.cpp firefox-trunk-41.0~a1~hg20150524r245419/parser/html/nsHtml5NamedCharacters.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/parser/html/nsHtml5NamedCharacters.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/parser/html/nsHtml5NamedCharacters.cpp	2015-05-25 20:44:08.000000000 +0000
@@ -25,7 +25,7 @@
 #include "nscore.h"
 #include "nsDebug.h"
 #include "mozilla/ArrayUtils.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "nsHtml5NamedCharacters.h"
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/parser/html/nsHtml5NamedCharacters.h firefox-trunk-41.0~a1~hg20150524r245419/parser/html/nsHtml5NamedCharacters.h
--- firefox-trunk-41.0~a1~hg20150513r243603/parser/html/nsHtml5NamedCharacters.h	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/parser/html/nsHtml5NamedCharacters.h	2015-05-25 20:44:08.000000000 +0000
@@ -26,7 +26,7 @@
 #include "jArray.h"
 #include "nscore.h"
 #include "nsDebug.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsMemory.h"
 
 struct nsHtml5CharacterName {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/parser/html/nsHtml5SpeculativeLoad.cpp firefox-trunk-41.0~a1~hg20150524r245419/parser/html/nsHtml5SpeculativeLoad.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/parser/html/nsHtml5SpeculativeLoad.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/parser/html/nsHtml5SpeculativeLoad.cpp	2015-05-25 20:44:08.000000000 +0000
@@ -67,6 +67,9 @@
                                                intSource);
       }
       break;
+    case eSpeculativeLoadPreconnect:
+      aExecutor->Preconnect(mUrl);
+      break;
     default:
       NS_NOTREACHED("Bogus speculative load.");
       break;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/parser/html/nsHtml5SpeculativeLoad.h firefox-trunk-41.0~a1~hg20150524r245419/parser/html/nsHtml5SpeculativeLoad.h
--- firefox-trunk-41.0~a1~hg20150513r243603/parser/html/nsHtml5SpeculativeLoad.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/parser/html/nsHtml5SpeculativeLoad.h	2015-05-25 20:44:08.000000000 +0000
@@ -24,7 +24,8 @@
   eSpeculativeLoadScriptFromHead,
   eSpeculativeLoadStyle,
   eSpeculativeLoadManifest,
-  eSpeculativeLoadSetDocumentCharset
+  eSpeculativeLoadSetDocumentCharset,
+  eSpeculativeLoadPreconnect
 };
 
 class nsHtml5SpeculativeLoad {
@@ -163,6 +164,14 @@
       mTypeOrCharsetSource.Assign((char16_t)aCharsetSource);
     }
 
+    inline void InitPreconnect(const nsAString& aUrl)
+    {
+      NS_PRECONDITION(mOpCode == eSpeculativeLoadUninitialized,
+                      "Trying to reinitialize a speculative load!");
+      mOpCode = eSpeculativeLoadPreconnect;
+      mUrl.Assign(aUrl);
+    }
+
     void Perform(nsHtml5TreeOpExecutor* aExecutor);
 
   private:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/parser/html/nsHtml5TreeBuilderCppSupplement.h firefox-trunk-41.0~a1~hg20150524r245419/parser/html/nsHtml5TreeBuilderCppSupplement.h
--- firefox-trunk-41.0~a1~hg20150513r243603/parser/html/nsHtml5TreeBuilderCppSupplement.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/parser/html/nsHtml5TreeBuilderCppSupplement.h	2015-05-25 20:44:09.000000000 +0000
@@ -176,16 +176,24 @@
           nsString* rel = aAttributes->getValue(nsHtml5AttributeName::ATTR_REL);
           // Not splitting on space here is bogus but the old parser didn't even
           // do a case-insensitive check.
-          if (rel && rel->LowerCaseEqualsASCII("stylesheet")) {
-            nsString* url = aAttributes->getValue(nsHtml5AttributeName::ATTR_HREF);
-            if (url) {
-              nsString* charset = aAttributes->getValue(nsHtml5AttributeName::ATTR_CHARSET);
-              nsString* crossOrigin =
-                aAttributes->getValue(nsHtml5AttributeName::ATTR_CROSSORIGIN);
-              mSpeculativeLoadQueue.AppendElement()->
-                InitStyle(*url,
-                          (charset) ? *charset : EmptyString(),
-                          (crossOrigin) ? *crossOrigin : NullString());
+          if (rel) {
+            if (rel->LowerCaseEqualsASCII("stylesheet")) {
+              nsString* url = aAttributes->getValue(nsHtml5AttributeName::ATTR_HREF);
+              if (url) {
+                nsString* charset = aAttributes->getValue(nsHtml5AttributeName::ATTR_CHARSET);
+                nsString* crossOrigin =
+                  aAttributes->getValue(nsHtml5AttributeName::ATTR_CROSSORIGIN);
+                mSpeculativeLoadQueue.AppendElement()->
+                  InitStyle(*url,
+                            (charset) ? *charset : EmptyString(),
+                            (crossOrigin) ? *crossOrigin : NullString());
+              }
+            } else if (rel->LowerCaseEqualsASCII("preconnect")) {
+              nsString* url = aAttributes->getValue(nsHtml5AttributeName::ATTR_HREF);
+              if (url) {
+                mSpeculativeLoadQueue.AppendElement()->
+                  InitPreconnect(*url);
+              }
             }
           }
         } else if (nsHtml5Atoms::video == aName) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/parser/html/nsHtml5ViewSourceUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/parser/html/nsHtml5ViewSourceUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/parser/html/nsHtml5ViewSourceUtils.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/parser/html/nsHtml5ViewSourceUtils.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -15,8 +15,14 @@
   nsString* id = new nsString(NS_LITERAL_STRING("viewsource"));
   bodyAttrs->addAttribute(nsHtml5AttributeName::ATTR_ID, id);
 
+  nsString* klass = new nsString();
   if (mozilla::Preferences::GetBool("view_source.wrap_long_lines", true)) {
-    nsString* klass = new nsString(NS_LITERAL_STRING("wrap"));
+    klass->Append(NS_LITERAL_STRING("wrap "));
+  }
+  if (mozilla::Preferences::GetBool("view_source.syntax_highlight", true)) {
+    klass->Append(NS_LITERAL_STRING("highlight"));
+  }
+  if (!klass->IsEmpty()) {
     bodyAttrs->addAttribute(nsHtml5AttributeName::ATTR_CLASS, klass);
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/parser/htmlparser/nsExpatDriver.cpp firefox-trunk-41.0~a1~hg20150524r245419/parser/htmlparser/nsExpatDriver.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/parser/htmlparser/nsExpatDriver.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/parser/htmlparser/nsExpatDriver.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -33,7 +33,6 @@
 
 static const char16_t kUTF16[] = { 'U', 'T', 'F', '-', '1', '6', '\0' };
 
-#ifdef PR_LOGGING
 static PRLogModuleInfo *
 GetExpatDriverLog()
 {
@@ -42,7 +41,6 @@
     sLog = PR_NewLogModule("expatdriver");
   return sLog;
 }
-#endif
 
 /***************************** EXPAT CALL BACKS ******************************/
 // The callback handlers that get called from the expat parser.
@@ -1060,7 +1058,7 @@
   nsScannerIterator end;
   aScanner.EndReading(end);
 
-  PR_LOG(GetExpatDriverLog(), PR_LOG_DEBUG,
+  MOZ_LOG(GetExpatDriverLog(), PR_LOG_DEBUG,
          ("Remaining in expat's buffer: %i, remaining in scanner: %i.",
           mExpatBuffered, Distance(start, end)));
 
@@ -1080,9 +1078,8 @@
       buffer = nullptr;
       length = 0;
 
-#if defined(PR_LOGGING) || defined (DEBUG)
       if (blocked) {
-        PR_LOG(GetExpatDriverLog(), PR_LOG_DEBUG,
+        MOZ_LOG(GetExpatDriverLog(), PR_LOG_DEBUG,
                ("Resuming Expat, will parse data remaining in Expat's "
                 "buffer.\nContent of Expat's buffer:\n-----\n%s\n-----\n",
                 NS_ConvertUTF16toUTF8(currentExpatPosition.get(),
@@ -1091,19 +1088,18 @@
       else {
         NS_ASSERTION(mExpatBuffered == Distance(currentExpatPosition, end),
                      "Didn't pass all the data to Expat?");
-        PR_LOG(GetExpatDriverLog(), PR_LOG_DEBUG,
+        MOZ_LOG(GetExpatDriverLog(), PR_LOG_DEBUG,
                ("Last call to Expat, will parse data remaining in Expat's "
                 "buffer.\nContent of Expat's buffer:\n-----\n%s\n-----\n",
                 NS_ConvertUTF16toUTF8(currentExpatPosition.get(),
                                       mExpatBuffered).get()));
       }
-#endif
     }
     else {
       buffer = start.get();
       length = uint32_t(start.size_forward());
 
-      PR_LOG(GetExpatDriverLog(), PR_LOG_DEBUG,
+      MOZ_LOG(GetExpatDriverLog(), PR_LOG_DEBUG,
              ("Calling Expat, will parse data remaining in Expat's buffer and "
               "new data.\nContent of Expat's buffer:\n-----\n%s\n-----\nNew "
               "data:\n-----\n%s\n-----\n",
@@ -1143,7 +1139,7 @@
     mExpatBuffered += length - consumed;
 
     if (BlockedOrInterrupted()) {
-      PR_LOG(GetExpatDriverLog(), PR_LOG_DEBUG,
+      MOZ_LOG(GetExpatDriverLog(), PR_LOG_DEBUG,
              ("Blocked or interrupted parser (probably for loading linked "
               "stylesheets or scripts)."));
 
@@ -1204,7 +1200,7 @@
   aScanner.SetPosition(currentExpatPosition, true);
   aScanner.Mark();
 
-  PR_LOG(GetExpatDriverLog(), PR_LOG_DEBUG,
+  MOZ_LOG(GetExpatDriverLog(), PR_LOG_DEBUG,
          ("Remaining in expat's buffer: %i, remaining in scanner: %i.",
           mExpatBuffered, Distance(currentExpatPosition, end)));
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/parser/htmlparser/nsHTMLEntities.cpp firefox-trunk-41.0~a1~hg20150524r245419/parser/htmlparser/nsHTMLEntities.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/parser/htmlparser/nsHTMLEntities.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/parser/htmlparser/nsHTMLEntities.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -7,8 +7,6 @@
 
 #include "nsHTMLEntities.h"
 
-
-
 #include "nsString.h"
 #include "nsCRT.h"
 #include "pldhash.h"
@@ -67,8 +65,8 @@
   nullptr,
 };
 
-static PLDHashTable gEntityToUnicode;
-static PLDHashTable gUnicodeToEntity;
+static PLDHashTable2* gEntityToUnicode;
+static PLDHashTable2* gUnicodeToEntity;
 static nsrefcnt gTableRefCnt = 0;
 
 #define HTML_ENTITY(_name, _value) { #_name, _value },
@@ -83,10 +81,12 @@
 nsHTMLEntities::AddRefTable(void)
 {
   if (!gTableRefCnt) {
-    PL_DHashTableInit(&gEntityToUnicode, &EntityToUnicodeOps,
-                      sizeof(EntityNodeEntry), NS_HTML_ENTITY_COUNT);
-    PL_DHashTableInit(&gUnicodeToEntity, &UnicodeToEntityOps,
-                      sizeof(EntityNodeEntry), NS_HTML_ENTITY_COUNT);
+    gEntityToUnicode = new PLDHashTable2(&EntityToUnicodeOps,
+                                         sizeof(EntityNodeEntry),
+                                         NS_HTML_ENTITY_COUNT);
+    gUnicodeToEntity = new PLDHashTable2(&UnicodeToEntityOps,
+                                         sizeof(EntityNodeEntry),
+                                         NS_HTML_ENTITY_COUNT);
     for (const EntityNode *node = gEntityArray,
                  *node_end = ArrayEnd(gEntityArray);
          node < node_end; ++node) {
@@ -94,7 +94,7 @@
       // add to Entity->Unicode table
       EntityNodeEntry* entry =
         static_cast<EntityNodeEntry*>
-                   (PL_DHashTableAdd(&gEntityToUnicode, node->mStr, fallible));
+                   (PL_DHashTableAdd(gEntityToUnicode, node->mStr, fallible));
       NS_ASSERTION(entry, "Error adding an entry");
       // Prefer earlier entries when we have duplication.
       if (!entry->node)
@@ -102,7 +102,7 @@
 
       // add to Unicode->Entity table
       entry = static_cast<EntityNodeEntry*>
-                         (PL_DHashTableAdd(&gUnicodeToEntity,
+                         (PL_DHashTableAdd(gUnicodeToEntity,
                                            NS_INT32_TO_PTR(node->mUnicode),
                                            fallible));
       NS_ASSERTION(entry, "Error adding an entry");
@@ -111,8 +111,8 @@
         entry->node = node;
     }
 #ifdef DEBUG
-    PL_DHashMarkTableImmutable(&gUnicodeToEntity);
-    PL_DHashMarkTableImmutable(&gEntityToUnicode);
+    PL_DHashMarkTableImmutable(gUnicodeToEntity);
+    PL_DHashMarkTableImmutable(gEntityToUnicode);
 #endif
   }
   ++gTableRefCnt;
@@ -125,20 +125,17 @@
   if (--gTableRefCnt != 0)
     return;
 
-  if (gEntityToUnicode.IsInitialized()) {
-    PL_DHashTableFinish(&gEntityToUnicode);
-  }
-  if (gUnicodeToEntity.IsInitialized()) {
-    PL_DHashTableFinish(&gUnicodeToEntity);
-  }
+  delete gEntityToUnicode;
+  delete gUnicodeToEntity;
+  gEntityToUnicode = nullptr;
+  gUnicodeToEntity = nullptr;
 }
 
 int32_t
 nsHTMLEntities::EntityToUnicode(const nsCString& aEntity)
 {
-  NS_ASSERTION(gEntityToUnicode.IsInitialized(),
-               "no lookup table, needs addref");
-  if (!gEntityToUnicode.IsInitialized())
+  NS_ASSERTION(gEntityToUnicode, "no lookup table, needs addref");
+  if (!gEntityToUnicode)
     return -1;
 
     //this little piece of code exists because entities may or may not have the terminating ';'.
@@ -152,7 +149,7 @@
 
   EntityNodeEntry* entry =
     static_cast<EntityNodeEntry*>
-               (PL_DHashTableSearch(&gEntityToUnicode, aEntity.get()));
+               (PL_DHashTableSearch(gEntityToUnicode, aEntity.get()));
 
   return entry ? entry->node->mUnicode : -1;
 }
@@ -172,11 +169,10 @@
 const char*
 nsHTMLEntities::UnicodeToEntity(int32_t aUnicode)
 {
-  NS_ASSERTION(gUnicodeToEntity.IsInitialized(),
-               "no lookup table, needs addref");
+  NS_ASSERTION(gUnicodeToEntity, "no lookup table, needs addref");
   EntityNodeEntry* entry =
     static_cast<EntityNodeEntry*>
-               (PL_DHashTableSearch(&gUnicodeToEntity, NS_INT32_TO_PTR(aUnicode)));
+               (PL_DHashTableSearch(gUnicodeToEntity, NS_INT32_TO_PTR(aUnicode)));
 
   return entry ? entry->node->mStr : nullptr;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/parser/htmlparser/tests/reftest/bug482921-1-ref.html firefox-trunk-41.0~a1~hg20150524r245419/parser/htmlparser/tests/reftest/bug482921-1-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/parser/htmlparser/tests/reftest/bug482921-1-ref.html	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/parser/htmlparser/tests/reftest/bug482921-1-ref.html	2015-05-25 20:44:09.000000000 +0000
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html><head><title></title><link rel="stylesheet" type="text/css" href="resource://gre-resources/viewsource.css"></head><body id="viewsource" class="wrap"><pre id><span class="doctype">&lt;!DOCTYPE html&gt;</span>
+<!DOCTYPE html><html><head><title></title><link rel="stylesheet" type="text/css" href="resource://gre-resources/viewsource.css"></head><body id="viewsource" class="wrap highlight"><pre id><span class="doctype">&lt;!DOCTYPE html&gt;</span>
 <span id></span><span>&lt;<span class="start-tag">html</span>&gt;</span>
 <span id></span><span>&lt;<span class="start-tag">head</span>&gt;</span>
 <span id></span><span>&lt;<span class="start-tag">title</span>&gt;</span><span>Title</span><span>&lt;/<span class="end-tag">title</span>&gt;</span>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/parser/htmlparser/tests/reftest/bug482921-2-ref.html firefox-trunk-41.0~a1~hg20150524r245419/parser/htmlparser/tests/reftest/bug482921-2-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/parser/htmlparser/tests/reftest/bug482921-2-ref.html	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/parser/htmlparser/tests/reftest/bug482921-2-ref.html	2015-05-25 20:44:09.000000000 +0000
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html><head><title></title><link rel="stylesheet" type="text/css" href="resource://gre-resources/viewsource.css"></head><body id="viewsource" class="wrap"><pre id><span class="pi">&lt;?xml version="1.0" encoding="utf-8"?&gt;</span>
+<!DOCTYPE html><html><head><title></title><link rel="stylesheet" type="text/css" href="resource://gre-resources/viewsource.css"></head><body id="viewsource" class="wrap highlight"><pre id><span class="pi">&lt;?xml version="1.0" encoding="utf-8"?&gt;</span>
 <span id></span><span class="pi">&lt;?foo bar?&gt;</span>
 <span id></span><span>&lt;<span class="start-tag">html</span>&gt;</span>
 <span id></span><span>&lt;<span class="start-tag">head</span>&gt;</span>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/parser/htmlparser/tests/reftest/bug535530-2-ref.html firefox-trunk-41.0~a1~hg20150524r245419/parser/htmlparser/tests/reftest/bug535530-2-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/parser/htmlparser/tests/reftest/bug535530-2-ref.html	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/parser/htmlparser/tests/reftest/bug535530-2-ref.html	2015-05-25 20:44:10.000000000 +0000
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html><head><title></title><link rel="stylesheet" type="text/css" href="resource://gre-resources/viewsource.css"></head><body id="viewsource" class="wrap"><pre id><span class="doctype">&lt;!DOCTYPE html&gt;</span>
+<!DOCTYPE html><html><head><title></title><link rel="stylesheet" type="text/css" href="resource://gre-resources/viewsource.css"></head><body id="viewsource" class="wrap highlight"><pre id><span class="doctype">&lt;!DOCTYPE html&gt;</span>
 <span id></span>XX<span class="error">&amp;</span>XX
 <span id></span>XX<span class="error">&amp;</span>nXX
 <span id></span>XX<span class="error">&amp;</span>noXX
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/parser/htmlparser/tests/reftest/bug704667-1-ref.html firefox-trunk-41.0~a1~hg20150524r245419/parser/htmlparser/tests/reftest/bug704667-1-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/parser/htmlparser/tests/reftest/bug704667-1-ref.html	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/parser/htmlparser/tests/reftest/bug704667-1-ref.html	2015-05-25 20:44:10.000000000 +0000
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html><head><title></title><link rel="stylesheet" type="text/css" href="resource://gre-resources/viewsource.css"></head><body id="viewsource" class="wrap"><pre id><span class="error comment">&lt;!--&gt;</span> <span class="error comment">&lt;!X&gt;</span>
+<!DOCTYPE html><html><head><title></title><link rel="stylesheet" type="text/css" href="resource://gre-resources/viewsource.css"></head><body id="viewsource" class="wrap highlight"><pre id><span class="error comment">&lt;!--&gt;</span> <span class="error comment">&lt;!X&gt;</span>
 <span id></span>
 </pre>
 <!-- View source CSS matches the <pre id> and <span id> elements and produces line numbers. -->
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/parser/htmlparser/tests/reftest/bug731234-1-ref.html firefox-trunk-41.0~a1~hg20150524r245419/parser/htmlparser/tests/reftest/bug731234-1-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/parser/htmlparser/tests/reftest/bug731234-1-ref.html	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/parser/htmlparser/tests/reftest/bug731234-1-ref.html	2015-05-25 20:44:10.000000000 +0000
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html><head><title></title><link rel="stylesheet" type="text/css" href="resource://gre-resources/viewsource.css"></head><body id="viewsource" class="wrap"><pre id><span class="doctype">&lt;!DOCTYPE html&gt;</span><span>
+<!DOCTYPE html><html><head><title></title><link rel="stylesheet" type="text/css" href="resource://gre-resources/viewsource.css"></head><body id="viewsource" class="wrap highlight"><pre id><span class="doctype">&lt;!DOCTYPE html&gt;</span><span>
 <span id></span></span><span>&lt;<span class="start-tag">body</span>&gt;</span><span>
 <span id></span></span><span>&lt;<span class="start-tag">script</span>&gt;</span><span></span><span>&lt;/<span class="end-tag">script</span>&gt;</span><span>X
 <span id></span></span><span>&lt;<span class="start-tag">script</span>&gt;</span><span></span><span>&lt;/<span class="end-tag">script</span> &gt;</span><span>X
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/parser/htmlparser/tests/reftest/bug910588-1-ref.html firefox-trunk-41.0~a1~hg20150524r245419/parser/htmlparser/tests/reftest/bug910588-1-ref.html
--- firefox-trunk-41.0~a1~hg20150513r243603/parser/htmlparser/tests/reftest/bug910588-1-ref.html	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/parser/htmlparser/tests/reftest/bug910588-1-ref.html	2015-05-25 20:44:10.000000000 +0000
@@ -1,2 +1,2 @@
-<!DOCTYPE html><html><head><title></title><link rel="stylesheet" type="text/css" href="resource://gre-resources/viewsource.css"></head><body id="viewsource" style="-moz-tab-size: 4"><pre id="line1"><span></span><span class="doctype">&lt;!DOCTYPE html&gt;</span><span></span><span>&lt;<span class="start-tag">table</span>&gt;</span><span></span><span title="Start tag “input” seen in “table”." class="error">&lt;<span class="start-tag">input</span> <span class="attribute-name">type</span>=<a class="attribute-value">hidden</a>&gt;</span><span></span><span>&lt;/<span class="end-tag">table</span>&gt;</span><span>
+<!DOCTYPE html><html><head><title></title><link rel="stylesheet" type="text/css" href="resource://gre-resources/viewsource.css"></head><body id="viewsource" class="highlight" style="-moz-tab-size: 4"><pre id="line1"><span></span><span class="doctype">&lt;!DOCTYPE html&gt;</span><span></span><span>&lt;<span class="start-tag">table</span>&gt;</span><span></span><span title="Start tag “input” seen in “table”." class="error">&lt;<span class="start-tag">input</span> <span class="attribute-name">type</span>=<a class="attribute-value">hidden</a>&gt;</span><span></span><span>&lt;/<span class="end-tag">table</span>&gt;</span><span>
 <span id="line2"></span></span></pre></body></html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/python/eme/gen-eme-voucher.py firefox-trunk-41.0~a1~hg20150524r245419/python/eme/gen-eme-voucher.py
--- firefox-trunk-41.0~a1~hg20150513r243603/python/eme/gen-eme-voucher.py	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/python/eme/gen-eme-voucher.py	2015-05-25 20:44:10.000000000 +0000
@@ -7,13 +7,20 @@
 # a copy of the MPL was not distributed with this file, You can obtain one
 # at http://mozilla.org/MPL/2.0/.
 #
-# Creates an Adobe Access signed voucher for any executable
+# Creates an Adobe Access signed voucher for x32/x64 windows executables
 #   Notes: This is currently python2.7 due to mozilla build system requirements
 
+from __future__ import print_function
+
 import argparse, bitstring, pprint, hashlib, os, subprocess, sys, tempfile
 from pyasn1.codec.der import encoder as der_encoder
 from pyasn1.type import univ, namedtype, namedval, constraint
 
+# Defined in WinNT.h from the Windows SDK
+IMAGE_SCN_MEM_EXECUTE = 0x20000000
+IMAGE_REL_BASED_HIGHLOW = 3
+IMAGE_REL_BASED_DIR64 = 10
+
 
 # CodeSectionDigest ::= SEQUENCE {
 #   offset				INTEGER --  section's file offset in the signed binary
@@ -28,8 +35,8 @@
 
 
 # CodeSegmentDigest ::= SEQUENCE {
-#	 offset				INTEGER -- TEXT segment's file offset in the signed binary
-#	 codeSectionDigests			SET OF CodeSectionDigests
+#    offset				INTEGER -- TEXT segment's file offset in the signed binary
+#    codeSectionDigests			SET OF CodeSectionDigests
 # }
 
 class SetOfCodeSectionDigest(univ.SetOf):
@@ -99,6 +106,7 @@
 
 
 # return total number of bytes read from items_in excluding leaves
+# TODO: research replacing this with the python built-in struct module
 def parse_items(stream, items_in, items_out):
 	bits_read = 0
 	total_bits_read = 0
@@ -315,17 +323,18 @@
 
 				if offset == 0 and i > 0: continue
 
-				assert(typ == 3)
+				assert(typ == IMAGE_REL_BASED_HIGHLOW or typ == IMAGE_REL_BASED_DIR64)
 
 				cur_pos = stream.bitpos
 				sh, value_bytepos = self.get_rva_section(page_rva + offset)
 				stream.bytepos = value_bytepos
-				value = stream.read('uintle:32')
+				value = stream.read('uintle:32' if typ == IMAGE_REL_BASED_HIGHLOW else 'uintle:64')
 
 				# remove BaseAddress
 				value -= self.OptionalHeader.items['ImageBase']
 
-				stream.overwrite(bitstring.BitArray(uint=value, length=4 * 8), pos=value_bytepos * 8)
+				bit_size = (4 if typ == IMAGE_REL_BASED_HIGHLOW else 8) * 8
+				stream.overwrite(bitstring.BitArray(uint=value, length=bit_size), pos=value_bytepos * 8)
 				stream.pos = cur_pos
 
 		stream.bitpos = orig_pos
@@ -345,15 +354,56 @@
 	fd, path = tempfile.mkstemp(suffix=suffix)
 	os.close(fd)
 	return path
-	
-# TIPS:
-#  How to convert PFX to PEM: openssl pkcs12 -in build/certificates/testPKI/IV.pfx -out build/certificates/testPKI/IV.cert.pem
+
+
+class ExpandPath(argparse.Action):
+	def __call__(self, parser, namespace, values, option_string=None):
+		setattr(namespace, self.dest, os.path.abspath(os.path.expanduser(values)))
+
+
+# this does a naming trick since windows doesn't allow multiple usernames for the same server
+def get_password(service_name, user_name):
+	try:
+		import keyring
+
+		# windows doesn't allow multiple usernames for the same server, argh
+		if sys.platform == "win32":
+			password = keyring.get_password(service_name + "-" + user_name, user_name)
+		else:
+			password = keyring.get_password(service_name, user_name)
+
+		return password
+	except:
+	    # This allows for manual testing where you do not wish to cache the password on the system 
+		print("Missing keyring module...getting password manually")
+
+	return None
+
+
+def openssl_cmd(app_args, args, password_in, password_out):
+	password = get_password(app_args.password_service, app_args.password_user) if (password_in or password_out) else None
+	env = None
+	args = [app_args.openssl_path] + args
+
+	if password is not None:
+		env = os.environ.copy()
+		env["COFF_PW"] = password
+
+		if password_in: args += ["-passin", "env:COFF_PW"]
+		if password_out: args += ["-passout", "env:COFF_PW", "-password", "env:COFF_PW"]
+
+	p = subprocess.Popen(args, env=env)
+	assert p.wait() == 0
+
+
 def main():
 	parser = argparse.ArgumentParser(description='PE/COFF Signer')
-	parser.add_argument('-input', required=True, help="File to parse.")
-	parser.add_argument('-output', required=True, help="File to write to.")
-	parser.add_argument('-openssl_path',help="Path to OpenSSL to create signed voucher")
-	parser.add_argument('-signer_cert',help="Path to certificate to use to sign voucher.  Must be PEM encoded.")
+	parser.add_argument('-input', action=ExpandPath, required=True, help="File to parse.")
+	parser.add_argument('-output', action=ExpandPath, required=True, help="File to write to.")
+	parser.add_argument('-openssl_path', action=ExpandPath, help="Path to OpenSSL to create signed voucher")
+	parser.add_argument('-signer_pfx', action=ExpandPath, help="Path to certificate to use to sign voucher.  Must contain full certificate chain.")
+	parser.add_argument('-password_service', help="Name of Keyring/Wallet service/host")
+	parser.add_argument('-password_user', help="Name of Keyring/Wallet user name")
 	parser.add_argument('-verbose', action='store_true', help="Verbose output.")
 	app_args = parser.parse_args()
 
@@ -385,7 +435,7 @@
 
 	arch_digest.setComponentByName('cpuSubType', CPUSubType('IMAGE_UNUSED'))
 
-	text_section_headers = list(filter(lambda x: (x.items['Characteristics'] & 0x20000000) == 0x20000000, coff_header.section_headers))
+	text_section_headers = list(filter(lambda x: (x.items['Characteristics'] & IMAGE_SCN_MEM_EXECUTE) == IMAGE_SCN_MEM_EXECUTE, coff_header.section_headers))
 
 	code_segment_digests = SetOfCodeSegmentDigest()
 	code_segment_idx = 0
@@ -432,23 +482,38 @@
 
 	# sign with openssl if specified
 	if app_args.openssl_path is not None:
-		assert app_args.signer_cert is not None
-		
+		assert app_args.signer_pfx is not None
+
 		out_base, out_ext = os.path.splitext(app_args.output)
 		signed_path = out_base + ".signed" + out_ext
-		
+
 		# http://stackoverflow.com/questions/12507277/how-to-fix-unable-to-write-random-state-in-openssl
-		temp_file = None
+		temp_files = []
 		if sys.platform == "win32" and "RANDFILE" not in os.environ:
 			temp_file = create_temp_file()
+			temp_files += [temp_file]
 			os.environ["RANDFILE"] = temp_file
-			
+
 		try:
-			subprocess.check_call([app_args.openssl_path, "cms", "-sign", "-nodetach", "-md", "sha256", "-binary", "-in", app_args.output, "-outform", "der", "-out", signed_path, "-signer", app_args.signer_cert], )
+			# create PEM from PFX
+			pfx_pem_path = create_temp_file(".pem")
+			temp_files += [pfx_pem_path]
+			print("Extracting PEM from PFX to:" + pfx_pem_path)
+			openssl_cmd(app_args, ["pkcs12", "-in", app_args.signer_pfx, "-out", pfx_pem_path], True, True)
+
+			# extract CA certs
+			pfx_cert_path = create_temp_file(".cert")
+			temp_files += [pfx_cert_path]
+			print("Extracting cert from PFX to:" + pfx_cert_path)
+			openssl_cmd(app_args, ["pkcs12", "-in", app_args.signer_pfx, "-cacerts", "-nokeys", "-out", pfx_cert_path], True, False)
+
+			# we embed the public keychain for client validation
+			openssl_cmd(app_args, ["cms", "-sign", "-nodetach", "-md", "sha256", "-binary", "-in", app_args.output, "-outform", "der", "-out", signed_path, "-signer", pfx_pem_path, "-certfile", pfx_cert_path], True, False)
 		finally:
-			if temp_file is not None: 
-				del os.environ["RANDFILE"]
-				os.unlink(temp_file)
+			for t in temp_files:
+				if "RANDFILE" in os.environ and t == os.environ["RANDFILE"]:
+					del os.environ["RANDFILE"]
+				os.unlink(t)
 
 if __name__ == '__main__':
 	main()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/python/mozbuild/mozbuild/action/zip.py firefox-trunk-41.0~a1~hg20150524r245419/python/mozbuild/mozbuild/action/zip.py
--- firefox-trunk-41.0~a1~hg20150513r243603/python/mozbuild/mozbuild/action/zip.py	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/python/mozbuild/mozbuild/action/zip.py	2015-05-25 20:44:11.000000000 +0000
@@ -0,0 +1,37 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# This script creates a zip file, but will also strip any binaries
+# it finds before adding them to the zip.
+
+from mozpack.files import FileFinder
+from mozpack.copier import Jarrer
+from mozpack.errors import errors
+
+import argparse
+import mozpack.path as mozpath
+import sys
+
+def main(args):
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-C", metavar='DIR', default=".",
+                        help="Change to given directory before considering "
+                        "other paths")
+    parser.add_argument("zip", help="Path to zip file to write")
+    parser.add_argument("input", nargs="+",
+                        help="Path to files to add to zip")
+    args = parser.parse_args(args)
+
+    jarrer = Jarrer(optimize=False)
+
+    with errors.accumulate():
+        finder = FileFinder(args.C)
+        for path in args.input:
+            for p, f in finder.find(path):
+                jarrer.add(p, f)
+        jarrer.copy(mozpath.join(args.C, args.zip))
+
+
+if __name__ == '__main__':
+    main(sys.argv[1:])
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/python/mozbuild/mozbuild/backend/common.py firefox-trunk-41.0~a1~hg20150524r245419/python/mozbuild/mozbuild/backend/common.py
--- firefox-trunk-41.0~a1~hg20150513r243603/python/mozbuild/mozbuild/backend/common.py	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/python/mozbuild/mozbuild/backend/common.py	2015-05-25 20:44:11.000000000 +0000
@@ -45,29 +45,39 @@
 
         self.idls = {}
         self.modules = {}
+        self.interface_manifests = {}
+        self.chrome_manifests = set()
 
-    def register_idl(self, source, module, install_target, allow_existing=False):
+    def register_idl(self, idl, allow_existing=False):
         """Registers an IDL file with this instance.
 
         The IDL file will be built, installed, etc.
         """
-        basename = mozpath.basename(source)
+        basename = mozpath.basename(idl.source_path)
         root = mozpath.splitext(basename)[0]
+        xpt = '%s.xpt' % idl.module
+        manifest = mozpath.join(idl.install_target, 'components', 'interfaces.manifest')
+        chrome_manifest = mozpath.join(idl.install_target, 'chrome.manifest')
 
         entry = {
-            'source': source,
-            'module': module,
+            'source': idl.source_path,
+            'module': idl.module,
             'basename': basename,
             'root': root,
+            'manifest': manifest,
         }
 
         if not allow_existing and entry['basename'] in self.idls:
             raise Exception('IDL already registered: %s' % entry['basename'])
 
         self.idls[entry['basename']] = entry
-        t = self.modules.setdefault(entry['module'], (install_target, set()))
+        t = self.modules.setdefault(entry['module'], (idl.install_target, set()))
         t[1].add(entry['root'])
 
+        if idl.add_to_manifest:
+            self.interface_manifests.setdefault(manifest, set()).add(xpt)
+            self.chrome_manifests.add(chrome_manifest)
+
 
 class WebIDLCollection(object):
     """Collects WebIDL info referenced during the build."""
@@ -190,8 +200,7 @@
                     topsrcdir=obj.topsrcdir)
 
         elif isinstance(obj, XPIDLFile):
-            self._idl_manager.register_idl(obj.source_path, obj.module,
-                obj.install_target)
+            self._idl_manager.register_idl(obj)
 
         elif isinstance(obj, ConfigFileSubstitution):
             # Do not handle ConfigFileSubstitution for Makefiles. Leave that
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/python/mozbuild/mozbuild/backend/recursivemake.py firefox-trunk-41.0~a1~hg20150524r245419/python/mozbuild/mozbuild/backend/recursivemake.py
--- firefox-trunk-41.0~a1~hg20150513r243603/python/mozbuild/mozbuild/backend/recursivemake.py	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/python/mozbuild/mozbuild/backend/recursivemake.py	2015-05-25 20:44:11.000000000 +0000
@@ -102,6 +102,7 @@
     'MODULE',
     'NO_DIST_INSTALL',
     'NO_EXPAND_LIBS',
+    'NO_INTERFACES_MANIFEST',
     'NO_JS_MANIFEST',
     'OS_LIBS',
     'PARALLEL_DIRS',
@@ -1072,6 +1073,22 @@
         rules = StringIO()
         mk.dump(rules, removal_guard=False)
 
+        # Write out manifests defining interfaces
+        dist_dir = mozpath.join(self.environment.topobjdir, 'dist')
+        for manifest, entries in manager.interface_manifests.items():
+            path = mozpath.join(self.environment.topobjdir, manifest)
+            with self._write_file(path) as fh:
+                for xpt in sorted(entries):
+                    fh.write('interfaces %s\n' % xpt)
+
+            if install_target.startswith('dist/'):
+                path = mozpath.relpath(path, dist_dir)
+                prefix, subpath = path.split('/', 1)
+                key = 'dist_%s' % prefix
+                self._install_manifests[key].add_optional_exists(subpath)
+
+        chrome_manifests = [mozpath.join('$(DEPTH)', m) for m in sorted(manager.chrome_manifests)]
+
         # Create dependency for output header so we force regeneration if the
         # header was deleted. This ideally should not be necessary. However,
         # some processes (such as PGO at the time this was implemented) wipe
@@ -1086,6 +1103,7 @@
         obj.topobjdir = self.environment.topobjdir
         obj.config = self.environment
         self._create_makefile(obj, extra=dict(
+            chrome_manifests = ' '.join(chrome_manifests),
             xpidl_rules=rules.getvalue(),
             xpidl_modules=' '.join(xpt_modules),
             xpt_files=' '.join(sorted(xpt_files)),
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/python/mozbuild/mozbuild/frontend/context.py firefox-trunk-41.0~a1~hg20150524r245419/python/mozbuild/mozbuild/frontend/context.py
--- firefox-trunk-41.0~a1~hg20150513r243603/python/mozbuild/mozbuild/frontend/context.py	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/python/mozbuild/mozbuild/frontend/context.py	2015-05-25 20:44:11.000000000 +0000
@@ -1147,6 +1147,14 @@
         as ``MODULE``.
         """, None),
 
+    'XPIDL_NO_MANIFEST': (bool, bool,
+        """Indicate that the XPIDL module should not be added to a manifest.
+
+        This flag exists primarily to prevent test-only XPIDL modules from being
+        added to the application's chrome manifest. Most XPIDL modules should
+        not use this flag.
+        """, None),
+
     'IPDL_SOURCES': (StrictOrderingOnAppendList, list,
         """IPDL source files.
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/python/mozbuild/mozbuild/frontend/data.py firefox-trunk-41.0~a1~hg20150524r245419/python/mozbuild/mozbuild/frontend/data.py
--- firefox-trunk-41.0~a1~hg20150513r243603/python/mozbuild/mozbuild/frontend/data.py	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/python/mozbuild/mozbuild/frontend/data.py	2015-05-25 20:44:11.000000000 +0000
@@ -160,17 +160,19 @@
     """Describes an XPIDL file to be compiled."""
 
     __slots__ = (
+        'add_to_manifest',
         'basename',
         'install_target',
         'source_path',
     )
 
-    def __init__(self, context, source, module):
+    def __init__(self, context, source, module, add_to_manifest):
         ContextDerived.__init__(self, context)
 
         self.source_path = source
         self.basename = mozpath.basename(source)
         self.module = module
+        self.add_to_manifest = add_to_manifest
 
         self.install_target = context['FINAL_TARGET']
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/python/mozbuild/mozbuild/frontend/emitter.py firefox-trunk-41.0~a1~hg20150524r245419/python/mozbuild/mozbuild/frontend/emitter.py
--- firefox-trunk-41.0~a1~hg20150513r243603/python/mozbuild/mozbuild/frontend/emitter.py	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/python/mozbuild/mozbuild/frontend/emitter.py	2015-05-25 20:44:11.000000000 +0000
@@ -814,7 +814,7 @@
 
         for idl in context['XPIDL_SOURCES']:
             yield XPIDLFile(context, mozpath.join(context.srcdir, idl),
-                xpidl_module)
+                xpidl_module, add_to_manifest=not context['XPIDL_NO_MANIFEST'])
 
     def _process_generated_files(self, context):
         generated_files = context.get('GENERATED_FILES')
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/python/mozbuild/mozbuild/test/backend/test_recursivemake.py firefox-trunk-41.0~a1~hg20150524r245419/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
--- firefox-trunk-41.0~a1~hg20150513r243603/python/mozbuild/mozbuild/test/backend/test_recursivemake.py	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/python/mozbuild/mozbuild/test/backend/test_recursivemake.py	2015-05-25 20:44:11.000000000 +0000
@@ -497,6 +497,7 @@
 
         m = InstallManifest(path=os.path.join(install_dir, 'dist_bin'))
         self.assertIn('components/my_module.xpt', m)
+        self.assertIn('components/interfaces.manifest', m)
 
         m = InstallManifest(path=mozpath.join(install_dir, 'dist_include'))
         self.assertIn('foo.h', m)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/rdf/base/nsCompositeDataSource.cpp firefox-trunk-41.0~a1~hg20150524r245419/rdf/base/nsCompositeDataSource.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/rdf/base/nsCompositeDataSource.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/rdf/base/nsCompositeDataSource.cpp	2015-05-25 20:42:33.000000000 +0000
@@ -42,7 +42,7 @@
 
 #include "nsEnumeratorUtils.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prprf.h"
 #include <stdio.h>
 PRLogModuleInfo* nsRDFLog = nullptr;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/rdf/base/nsContainerEnumerator.cpp firefox-trunk-41.0~a1~hg20150524r245419/rdf/base/nsContainerEnumerator.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/rdf/base/nsContainerEnumerator.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/rdf/base/nsContainerEnumerator.cpp	2015-05-25 20:42:33.000000000 +0000
@@ -30,7 +30,7 @@
 #include "nsRDFCID.h"
 #include "nsString.h"
 #include "nsXPIDLString.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "rdf.h"
 #include "rdfutil.h"
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/rdf/base/nsInMemoryDataSource.cpp firefox-trunk-41.0~a1~hg20150524r245419/rdf/base/nsInMemoryDataSource.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/rdf/base/nsInMemoryDataSource.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/rdf/base/nsInMemoryDataSource.cpp	2015-05-25 20:42:33.000000000 +0000
@@ -63,7 +63,7 @@
 #include "rdfutil.h"
 #include "pldhash.h"
 #include "plstr.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "rdf.h"
 
 #include "rdfIDataSource.h"
@@ -125,7 +125,7 @@
     {
         struct hash
         {
-            PLDHashTable*   mPropertyHash; 
+            PLDHashTable2*  mPropertyHash;
         } hash;
         struct as
         {
@@ -163,7 +163,7 @@
     NS_ADDREF(mSource);
 
     u.hash.mPropertyHash =
-        new PLDHashTable(PL_DHashGetStubOps(), sizeof(Entry));
+        new PLDHashTable2(PL_DHashGetStubOps(), sizeof(Entry));
 }
 
 Assertion::Assertion(nsIRDFResource* aSource,
@@ -809,7 +809,7 @@
     if (mReverseArcs.IsInitialized())
         PL_DHashTableFinish(&mReverseArcs);
 
-    PR_LOG(gLog, PR_LOG_NOTICE,
+    MOZ_LOG(gLog, PR_LOG_NOTICE,
            ("InMemoryDataSource(%p): destroyed.", this));
 
     MOZ_COUNT_DTOR(InMemoryDataSource);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/rdf/base/nsRDFContentSink.cpp firefox-trunk-41.0~a1~hg20150524r245419/rdf/base/nsRDFContentSink.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/rdf/base/nsRDFContentSink.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/rdf/base/nsRDFContentSink.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -53,7 +53,7 @@
 #include "nsRDFCID.h"
 #include "nsTArray.h"
 #include "nsXPIDLString.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "rdf.h"
 #include "rdfutil.h"
 #include "nsReadableUtils.h"
@@ -307,7 +307,7 @@
     NS_IF_RELEASE(mDocumentURL);
 
     if (mContextStack) {
-        PR_LOG(gLog, PR_LOG_WARNING,
+        MOZ_LOG(gLog, PR_LOG_WARNING,
                ("rdfxml: warning! unclosed tag"));
 
         // XXX we should never need to do this, but, we'll write the
@@ -326,7 +326,7 @@
             if (resource && PR_LOG_TEST(gLog, PR_LOG_NOTICE)) {
                 nsXPIDLCString uri;
                 resource->GetValue(getter_Copies(uri));
-                PR_LOG(gLog, PR_LOG_NOTICE,
+                MOZ_LOG(gLog, PR_LOG_NOTICE,
                        ("rdfxml:   uri=%s", (const char*) uri));
             }
 
@@ -421,7 +421,7 @@
       break;
 
   case eRDFContentSinkState_InEpilog:
-      PR_LOG(gLog, PR_LOG_WARNING,
+      MOZ_LOG(gLog, PR_LOG_WARNING,
              ("rdfxml: unexpected content in epilog at line %d",
               aLineNumber));
       break;
@@ -850,7 +850,7 @@
         }
         else if (localName == kAboutEachAtom) {
             // XXX we don't deal with aboutEach...
-            //PR_LOG(gLog, PR_LOG_WARNING,
+            //MOZ_LOG(gLog, PR_LOG_WARNING,
             //       ("rdfxml: ignoring aboutEach at line %d",
             //        aNode.GetSourceLineNumber()));
         }
@@ -1039,7 +1039,7 @@
         SplitExpatName(aName, getter_AddRefs(localName));
 
     if (!nameSpaceURI.EqualsLiteral(RDF_NAMESPACE_URI) || localName != kRDFAtom) {
-       // PR_LOG(gLog, PR_LOG_ALWAYS,
+       // MOZ_LOG(gLog, PR_LOG_ALWAYS,
        //        ("rdfxml: expected RDF:RDF at line %d",
        //         aNode.GetSourceLineNumber()));
 
@@ -1213,7 +1213,7 @@
 
     if (!nameSpaceURI.EqualsLiteral(RDF_NAMESPACE_URI) ||
         localName != kLiAtom) {
-        PR_LOG(gLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gLog, PR_LOG_ALWAYS,
                ("rdfxml: expected RDF:li at line %d",
                 -1)); // XXX pass in line number
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/rdf/base/nsRDFService.cpp firefox-trunk-41.0~a1~hg20150524r245419/rdf/base/nsRDFService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/rdf/base/nsRDFService.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/rdf/base/nsRDFService.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -49,7 +49,7 @@
 #include "pldhash.h"
 #include "plhash.h"
 #include "plstr.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prprf.h"
 #include "prmem.h"
 #include "rdf.h"
@@ -853,7 +853,7 @@
         return NS_ERROR_INVALID_ARG;
 
     const nsAFlatCString& flatURI = PromiseFlatCString(aURI);
-    PR_LOG(gLog, PR_LOG_DEBUG, ("rdfserv get-resource %s", flatURI.get()));
+    MOZ_LOG(gLog, PR_LOG_DEBUG, ("rdfserv get-resource %s", flatURI.get()));
 
     // First, check the cache to see if we've already created and
     // registered this thing.
@@ -1152,7 +1152,7 @@
         // only ever held a weak reference to it. We simply replace
         // it.
 
-        PR_LOG(gLog, PR_LOG_DEBUG,
+        MOZ_LOG(gLog, PR_LOG_DEBUG,
                ("rdfserv   replace-resource [%p] <-- [%p] %s",
                 static_cast<ResourceHashEntry *>(hdr)->mResource,
                 aResource, (const char*) uri));
@@ -1162,7 +1162,7 @@
         if (! hdr)
             return NS_ERROR_OUT_OF_MEMORY;
 
-        PR_LOG(gLog, PR_LOG_DEBUG,
+        MOZ_LOG(gLog, PR_LOG_DEBUG,
                ("rdfserv   register-resource [%p] %s",
                 aResource, (const char*) uri));
     }
@@ -1195,7 +1195,7 @@
     if (! uri)
         return NS_ERROR_UNEXPECTED;
 
-    PR_LOG(gLog, PR_LOG_DEBUG,
+    MOZ_LOG(gLog, PR_LOG_DEBUG,
            ("rdfserv unregister-resource [%p] %s",
             aResource, (const char*) uri));
 
@@ -1231,7 +1231,7 @@
         // N.B., we only hold a weak reference to the datasource, so
         // just replace the old with the new and don't touch any
         // refcounts.
-        PR_LOG(gLog, PR_LOG_NOTICE,
+        MOZ_LOG(gLog, PR_LOG_NOTICE,
                ("rdfserv    replace-datasource [%p] <-- [%p] %s",
                 (*hep)->value, aDataSource, (const char*) uri));
 
@@ -1244,7 +1244,7 @@
 
         PL_HashTableAdd(mNamedDataSources, key, aDataSource);
 
-        PR_LOG(gLog, PR_LOG_NOTICE,
+        MOZ_LOG(gLog, PR_LOG_NOTICE,
                ("rdfserv   register-datasource [%p] %s",
                 aDataSource, (const char*) uri));
 
@@ -1284,7 +1284,7 @@
     // don't release here.
     PL_HashTableRawRemove(mNamedDataSources, hep, *hep);
 
-    PR_LOG(gLog, PR_LOG_NOTICE,
+    MOZ_LOG(gLog, PR_LOG_NOTICE,
            ("rdfserv unregister-datasource [%p] %s",
             aDataSource, (const char*) uri));
 
@@ -1408,7 +1408,7 @@
     entry->mLiteral = aLiteral;
     entry->mKey = value;
 
-    PR_LOG(gLog, PR_LOG_DEBUG,
+    MOZ_LOG(gLog, PR_LOG_DEBUG,
            ("rdfserv   register-literal [%p] %s",
             aLiteral, (const char16_t*) value));
 
@@ -1429,7 +1429,7 @@
 
     // N.B. that we _don't_ release the literal: we only held a weak
     // reference to it in the hashtable.
-    PR_LOG(gLog, PR_LOG_DEBUG,
+    MOZ_LOG(gLog, PR_LOG_DEBUG,
            ("rdfserv unregister-literal [%p] %s",
             aLiteral, (const char16_t*) value));
 
@@ -1460,7 +1460,7 @@
     entry->mInt = aInt;
     entry->mKey = value;
 
-    PR_LOG(gLog, PR_LOG_DEBUG,
+    MOZ_LOG(gLog, PR_LOG_DEBUG,
            ("rdfserv   register-int [%p] %d",
             aInt, value));
 
@@ -1481,7 +1481,7 @@
 
     // N.B. that we _don't_ release the literal: we only held a weak
     // reference to it in the hashtable.
-    PR_LOG(gLog, PR_LOG_DEBUG,
+    MOZ_LOG(gLog, PR_LOG_DEBUG,
            ("rdfserv unregister-int [%p] %d",
             aInt, value));
 
@@ -1512,7 +1512,7 @@
     entry->mDate = aDate;
     entry->mKey = value;
 
-    PR_LOG(gLog, PR_LOG_DEBUG,
+    MOZ_LOG(gLog, PR_LOG_DEBUG,
            ("rdfserv   register-date [%p] %ld",
             aDate, value));
 
@@ -1533,7 +1533,7 @@
 
     // N.B. that we _don't_ release the literal: we only held a weak
     // reference to it in the hashtable.
-    PR_LOG(gLog, PR_LOG_DEBUG,
+    MOZ_LOG(gLog, PR_LOG_DEBUG,
            ("rdfserv unregister-date [%p] %ld",
             aDate, value));
 
@@ -1558,7 +1558,7 @@
     // made will be owned by the callee.
     entry->mBlob = aBlob;
 
-    PR_LOG(gLog, PR_LOG_DEBUG,
+    MOZ_LOG(gLog, PR_LOG_DEBUG,
            ("rdfserv   register-blob [%p] %s",
             aBlob, aBlob->mData.mBytes));
 
@@ -1575,7 +1575,7 @@
 
      // N.B. that we _don't_ release the literal: we only held a weak
      // reference to it in the hashtable.
-    PR_LOG(gLog, PR_LOG_DEBUG,
+    MOZ_LOG(gLog, PR_LOG_DEBUG,
            ("rdfserv unregister-blob [%p] %s",
             aBlob, aBlob->mData.mBytes));
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/rdf/base/nsRDFXMLDataSource.cpp firefox-trunk-41.0~a1~hg20150524r245419/rdf/base/nsRDFXMLDataSource.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/rdf/base/nsRDFXMLDataSource.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/rdf/base/nsRDFXMLDataSource.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -86,7 +86,7 @@
 #include "prthread.h"
 #include "rdf.h"
 #include "rdfutil.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsNameSpaceMap.h"
 #include "nsCRT.h"
 #include "nsCycleCollectionParticipant.h"
@@ -830,7 +830,7 @@
     if (PR_LOG_TEST(gLog, PR_LOG_NOTICE)) {
       nsAutoCString spec;
       mURL->GetSpec(spec);
-      PR_LOG(gLog, PR_LOG_NOTICE,
+      MOZ_LOG(gLog, PR_LOG_NOTICE,
              ("rdfxml[%p] flush(%s)", this, spec.get()));
     }
 
@@ -911,13 +911,13 @@
     if (mURL) {
         mURL->GetSpec(spec);
     }
-    PR_LOG(gLog, PR_LOG_NOTICE,
+    MOZ_LOG(gLog, PR_LOG_NOTICE,
            ("rdfxml[%p] refresh(%s) %sblocking", this, spec.get(), (aBlocking ? "" : "non")));
     
     // If an asynchronous load is already pending, then just let it do
     // the honors.
     if (IsLoading()) {
-        PR_LOG(gLog, PR_LOG_NOTICE,
+        MOZ_LOG(gLog, PR_LOG_NOTICE,
                ("rdfxml[%p] refresh(%s) a load was pending", this, spec.get()));
 
         if (aBlocking) {
@@ -974,7 +974,7 @@
       if (mURL) {
           mURL->GetSpec(spec);
       }
-      PR_LOG(gLog, PR_LOG_NOTICE,
+      MOZ_LOG(gLog, PR_LOG_NOTICE,
              ("rdfxml[%p] begin-load(%s)", this, spec.get()));
     }
     
@@ -1000,7 +1000,7 @@
       if (mURL) {
           mURL->GetSpec(spec);
       }
-      PR_LOG(gLog, PR_LOG_NOTICE,
+      MOZ_LOG(gLog, PR_LOG_NOTICE,
              ("rdfxml[%p] interrupt(%s)", this, spec.get()));
     }
 
@@ -1025,7 +1025,7 @@
       if (mURL) {
           mURL->GetSpec(spec);
       }
-      PR_LOG(gLog, PR_LOG_NOTICE,
+      MOZ_LOG(gLog, PR_LOG_NOTICE,
              ("rdfxml[%p] resume(%s)", this, spec.get()));
     }
     
@@ -1050,7 +1050,7 @@
       if (mURL) {
           mURL->GetSpec(spec);
       }
-      PR_LOG(gLog, PR_LOG_NOTICE,
+      MOZ_LOG(gLog, PR_LOG_NOTICE,
              ("rdfxml[%p] end-load(%s)", this, spec.get()));
     }
     
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/rdf/util/nsRDFResource.cpp firefox-trunk-41.0~a1~hg20150524r245419/rdf/util/nsRDFResource.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/rdf/util/nsRDFResource.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/rdf/util/nsRDFResource.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -8,7 +8,7 @@
 #include "nsIRDFDelegateFactory.h"
 #include "nsIRDFService.h"
 #include "nsRDFCID.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsComponentManagerUtils.h"
 #include "nsServiceManagerUtils.h"
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/apps/AppSignatureVerification.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/apps/AppSignatureVerification.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/apps/AppSignatureVerification.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/apps/AppSignatureVerification.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -30,7 +30,7 @@
 #include "nsString.h"
 #include "nsTHashtable.h"
 #include "plstr.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "pkix/pkix.h"
 #include "pkix/pkixnss.h"
 #include "secmime.h"
@@ -775,7 +775,7 @@
     rv = entries->GetNext(entryFilename);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Verifying digests for %s",
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Verifying digests for %s",
            entryFilename.get()));
 
     // The files that comprise the signature mechanism are not covered by the
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/apps/AppTrustDomain.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/apps/AppTrustDomain.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/apps/AppTrustDomain.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/apps/AppTrustDomain.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -234,7 +234,7 @@
 }
 
 Result
-AppTrustDomain::CheckRevocation(EndEntityOrCA, const CertID&, Time,
+AppTrustDomain::CheckRevocation(EndEntityOrCA, const CertID&, Time, Duration,
                                 /*optional*/ const Input*,
                                 /*optional*/ const Input*)
 {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/apps/AppTrustDomain.h firefox-trunk-41.0~a1~hg20150524r245419/security/apps/AppTrustDomain.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/apps/AppTrustDomain.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/apps/AppTrustDomain.h	2015-05-25 20:42:34.000000000 +0000
@@ -34,6 +34,7 @@
   virtual Result CheckRevocation(mozilla::pkix::EndEntityOrCA endEntityOrCA,
                                  const mozilla::pkix::CertID& certID,
                                  mozilla::pkix::Time time,
+                                 mozilla::pkix::Duration validityDuration,
                     /*optional*/ const mozilla::pkix::Input* stapledOCSPresponse,
                     /*optional*/ const mozilla::pkix::Input* aiaExtension) override;
   virtual Result IsChainValid(const mozilla::pkix::DERArray& certChain,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/certverifier/CertVerifier.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/certverifier/CertVerifier.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/certverifier/CertVerifier.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/certverifier/CertVerifier.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -32,10 +32,12 @@
 CertVerifier::CertVerifier(OcspDownloadConfig odc,
                            OcspStrictConfig osc,
                            OcspGetConfig ogc,
+                           uint32_t certShortLifetimeInDays,
                            PinningMode pinningMode)
   : mOCSPDownloadEnabled(odc == ocspOn)
   , mOCSPStrict(osc == ocspStrict)
   , mOCSPGETEnabled(ogc == ocspGetEnabled)
+  , mCertShortLifetimeInDays(certShortLifetimeInDays)
   , mPinningMode(pinningMode)
 {
 }
@@ -66,7 +68,7 @@
   }
   for (PK11SlotListElement* le = slots->head; le; le = le->next) {
     char* token = PK11_GetTokenName(le->slot);
-    PR_LOG(gCertVerifierLog, PR_LOG_DEBUG,
+    MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG,
            ("BuiltInRoot? subject=%s token=%s",cert->subjectName, token));
     if (strcmp("Builtin Object Token", token) == 0) {
       result = true;
@@ -123,7 +125,7 @@
         /*optional out*/ OCSPStaplingStatus* ocspStaplingStatus,
         /*optional out*/ KeySizeStatus* keySizeStatus)
 {
-  PR_LOG(gCertVerifierLog, PR_LOG_DEBUG, ("Top of VerifyCert\n"));
+  MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG, ("Top of VerifyCert\n"));
 
   PR_ASSERT(cert);
   PR_ASSERT(usage == certificateUsageSSLServer || !(flags & FLAG_MUST_BE_EV));
@@ -193,7 +195,9 @@
       // XXX: We don't really have a trust bit for SSL client authentication so
       // just use trustEmail as it is the closest alternative.
       NSSCertDBTrustDomain trustDomain(trustEmail, ocspFetching, mOCSPCache,
-                                       pinArg, ocspGETConfig, pinningDisabled,
+                                       pinArg, ocspGETConfig,
+                                       mCertShortLifetimeInDays,
+                                       pinningDisabled,
                                        MIN_RSA_BITS_WEAK, nullptr, builtChain);
       rv = BuildCertChain(trustDomain, certDER, time,
                           EndEntityOrCA::MustBeEndEntity,
@@ -219,8 +223,9 @@
                       ocspFetching == NSSCertDBTrustDomain::NeverFetchOCSP
                         ? NSSCertDBTrustDomain::LocalOnlyOCSPForEV
                         : NSSCertDBTrustDomain::FetchOCSPForEV,
-                      mOCSPCache, pinArg, ocspGETConfig, mPinningMode,
-                      MIN_RSA_BITS, hostname, builtChain);
+                      mOCSPCache, pinArg, ocspGETConfig,
+                      mCertShortLifetimeInDays, mPinningMode, MIN_RSA_BITS,
+                      hostname, builtChain);
         rv = BuildCertChainForOneKeyUsage(trustDomain, certDER, time,
                                           KeyUsage::digitalSignature,// (EC)DHE
                                           KeyUsage::keyEncipherment, // RSA
@@ -244,7 +249,8 @@
 
       // Now try non-EV.
       NSSCertDBTrustDomain trustDomain(trustSSL, ocspFetching, mOCSPCache,
-                                       pinArg, ocspGETConfig, mPinningMode,
+                                       pinArg, ocspGETConfig,
+                                       mCertShortLifetimeInDays, mPinningMode,
                                        MIN_RSA_BITS, hostname, builtChain);
       rv = BuildCertChainForOneKeyUsage(trustDomain, certDER, time,
                                         KeyUsage::digitalSignature, // (EC)DHE
@@ -263,9 +269,10 @@
 
       // If that failed, try again with a smaller minimum key size.
       NSSCertDBTrustDomain trustDomainWeak(trustSSL, ocspFetching, mOCSPCache,
-                                           pinArg, ocspGETConfig, mPinningMode,
-                                           MIN_RSA_BITS_WEAK, hostname,
-                                           builtChain);
+                                           pinArg, ocspGETConfig,
+                                           mCertShortLifetimeInDays,
+                                           mPinningMode, MIN_RSA_BITS_WEAK,
+                                           hostname, builtChain);
       rv = BuildCertChainForOneKeyUsage(trustDomainWeak, certDER, time,
                                         KeyUsage::digitalSignature, // (EC)DHE
                                         KeyUsage::keyEncipherment, // RSA
@@ -287,8 +294,10 @@
 
     case certificateUsageSSLCA: {
       NSSCertDBTrustDomain trustDomain(trustSSL, ocspFetching, mOCSPCache,
-                                       pinArg, ocspGETConfig, pinningDisabled,
-                                       MIN_RSA_BITS_WEAK, nullptr, builtChain);
+                                       pinArg, ocspGETConfig,
+                                       mCertShortLifetimeInDays,
+                                       pinningDisabled, MIN_RSA_BITS_WEAK,
+                                       nullptr, builtChain);
       rv = BuildCertChain(trustDomain, certDER, time,
                           EndEntityOrCA::MustBeCA, KeyUsage::keyCertSign,
                           KeyPurposeId::id_kp_serverAuth,
@@ -298,8 +307,10 @@
 
     case certificateUsageEmailSigner: {
       NSSCertDBTrustDomain trustDomain(trustEmail, ocspFetching, mOCSPCache,
-                                       pinArg, ocspGETConfig, pinningDisabled,
-                                       MIN_RSA_BITS_WEAK, nullptr, builtChain);
+                                       pinArg, ocspGETConfig,
+                                       mCertShortLifetimeInDays,
+                                       pinningDisabled, MIN_RSA_BITS_WEAK,
+                                       nullptr, builtChain);
       rv = BuildCertChain(trustDomain, certDER, time,
                           EndEntityOrCA::MustBeEndEntity,
                           KeyUsage::digitalSignature,
@@ -320,8 +331,10 @@
       // usage it is trying to verify for, and base its algorithm choices
       // based on the result of the verification(s).
       NSSCertDBTrustDomain trustDomain(trustEmail, ocspFetching, mOCSPCache,
-                                       pinArg, ocspGETConfig, pinningDisabled,
-                                       MIN_RSA_BITS_WEAK, nullptr, builtChain);
+                                       pinArg, ocspGETConfig,
+                                       mCertShortLifetimeInDays,
+                                       pinningDisabled, MIN_RSA_BITS_WEAK,
+                                       nullptr, builtChain);
       rv = BuildCertChain(trustDomain, certDER, time,
                           EndEntityOrCA::MustBeEndEntity,
                           KeyUsage::keyEncipherment, // RSA
@@ -340,8 +353,9 @@
     case certificateUsageObjectSigner: {
       NSSCertDBTrustDomain trustDomain(trustObjectSigning, ocspFetching,
                                        mOCSPCache, pinArg, ocspGETConfig,
-                                       pinningDisabled,
-                                       MIN_RSA_BITS_WEAK, nullptr, builtChain);
+                                       mCertShortLifetimeInDays,
+                                       pinningDisabled, MIN_RSA_BITS_WEAK,
+                                       nullptr, builtChain);
       rv = BuildCertChain(trustDomain, certDER, time,
                           EndEntityOrCA::MustBeEndEntity,
                           KeyUsage::digitalSignature,
@@ -369,15 +383,18 @@
       }
 
       NSSCertDBTrustDomain sslTrust(trustSSL, ocspFetching, mOCSPCache, pinArg,
-                                    ocspGETConfig, pinningDisabled,
-                                    MIN_RSA_BITS_WEAK, nullptr, builtChain);
+                                    ocspGETConfig, mCertShortLifetimeInDays,
+                                    pinningDisabled, MIN_RSA_BITS_WEAK,
+                                    nullptr, builtChain);
       rv = BuildCertChain(sslTrust, certDER, time, endEntityOrCA,
                           keyUsage, eku, CertPolicyId::anyPolicy,
                           stapledOCSPResponse);
       if (rv == Result::ERROR_UNKNOWN_ISSUER) {
         NSSCertDBTrustDomain emailTrust(trustEmail, ocspFetching, mOCSPCache,
-                                        pinArg, ocspGETConfig, pinningDisabled,
-                                        MIN_RSA_BITS_WEAK, nullptr, builtChain);
+                                        pinArg, ocspGETConfig,
+                                        mCertShortLifetimeInDays,
+                                        pinningDisabled, MIN_RSA_BITS_WEAK,
+                                        nullptr, builtChain);
         rv = BuildCertChain(emailTrust, certDER, time, endEntityOrCA,
                             keyUsage, eku, CertPolicyId::anyPolicy,
                             stapledOCSPResponse);
@@ -385,6 +402,7 @@
           NSSCertDBTrustDomain objectSigningTrust(trustObjectSigning,
                                                   ocspFetching, mOCSPCache,
                                                   pinArg, ocspGETConfig,
+                                                  mCertShortLifetimeInDays,
                                                   pinningDisabled,
                                                   MIN_RSA_BITS_WEAK,
                                                   nullptr, builtChain);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/certverifier/CertVerifier.h firefox-trunk-41.0~a1~hg20150524r245419/security/certverifier/CertVerifier.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/certverifier/CertVerifier.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/certverifier/CertVerifier.h	2015-05-25 20:42:34.000000000 +0000
@@ -82,7 +82,8 @@
   bool IsOCSPDownloadEnabled() const { return mOCSPDownloadEnabled; }
 
   CertVerifier(OcspDownloadConfig odc, OcspStrictConfig osc,
-               OcspGetConfig ogc, PinningMode pinningMode);
+               OcspGetConfig ogc, uint32_t certShortLifetimeInDays,
+               PinningMode pinningMode);
   ~CertVerifier();
 
   void ClearOCSPCache() { mOCSPCache.Clear(); }
@@ -90,6 +91,7 @@
   const bool mOCSPDownloadEnabled;
   const bool mOCSPStrict;
   const bool mOCSPGETEnabled;
+  const uint32_t mCertShortLifetimeInDays;
   const PinningMode mPinningMode;
 
 private:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/certverifier/NSSCertDBTrustDomain.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/certverifier/NSSCertDBTrustDomain.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/certverifier/NSSCertDBTrustDomain.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/certverifier/NSSCertDBTrustDomain.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -45,6 +45,7 @@
                                            OCSPCache& ocspCache,
              /*optional but shouldn't be*/ void* pinArg,
                                            CertVerifier::OcspGetConfig ocspGETConfig,
+                                           uint32_t certShortLifetimeInDays,
                                            CertVerifier::PinningMode pinningMode,
                                            unsigned int minRSABits,
                               /*optional*/ const char* hostname,
@@ -54,6 +55,7 @@
   , mOCSPCache(ocspCache)
   , mPinArg(pinArg)
   , mOCSPGetConfig(ocspGETConfig)
+  , mCertShortLifetimeInDays(certShortLifetimeInDays)
   , mPinningMode(pinningMode)
   , mMinRSABits(minRSABits)
   , mHostname(hostname)
@@ -197,7 +199,7 @@
   }
 
   if (isCertRevoked) {
-    PR_LOG(gCertVerifierLog, PR_LOG_DEBUG,
+    MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG,
            ("NSSCertDBTrustDomain: certificate is in blocklist"));
     return Result::ERROR_REVOKED_CERTIFICATE;
   }
@@ -329,6 +331,7 @@
 Result
 NSSCertDBTrustDomain::CheckRevocation(EndEntityOrCA endEntityOrCA,
                                       const CertID& certID, Time time,
+                                      Duration validityDuration,
                          /*optional*/ const Input* stapledOCSPResponse,
                          /*optional*/ const Input* aiaExtension)
 {
@@ -338,7 +341,7 @@
   // TODO: need to verify that IsRevoked isn't called for trust anchors AND
   // that that fact is documented in mozillapkix.
 
-  PR_LOG(gCertVerifierLog, PR_LOG_DEBUG,
+  MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG,
          ("NSSCertDBTrustDomain: Top of CheckRevocation\n"));
 
   // Bug 991815: The BR allow OCSP for intermediates to be up to one year old.
@@ -372,7 +375,7 @@
     if (stapledOCSPResponseResult == Success) {
       // stapled OCSP response present and good
       mOCSPStaplingStatus = CertVerifier::OCSP_STAPLING_GOOD;
-      PR_LOG(gCertVerifierLog, PR_LOG_DEBUG,
+      MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG,
              ("NSSCertDBTrustDomain: stapled OCSP response: good"));
       return Success;
     }
@@ -380,19 +383,19 @@
         expired) {
       // stapled OCSP response present but expired
       mOCSPStaplingStatus = CertVerifier::OCSP_STAPLING_EXPIRED;
-      PR_LOG(gCertVerifierLog, PR_LOG_DEBUG,
+      MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG,
              ("NSSCertDBTrustDomain: expired stapled OCSP response"));
     } else {
       // stapled OCSP response present but invalid for some reason
       mOCSPStaplingStatus = CertVerifier::OCSP_STAPLING_INVALID;
-      PR_LOG(gCertVerifierLog, PR_LOG_DEBUG,
+      MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG,
              ("NSSCertDBTrustDomain: stapled OCSP response: failure"));
       return stapledOCSPResponseResult;
     }
   } else if (endEntityOrCA == EndEntityOrCA::MustBeEndEntity) {
     // no stapled OCSP response
     mOCSPStaplingStatus = CertVerifier::OCSP_STAPLING_NONE;
-    PR_LOG(gCertVerifierLog, PR_LOG_DEBUG,
+    MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG,
            ("NSSCertDBTrustDomain: no stapled OCSP response"));
   }
 
@@ -403,20 +406,20 @@
                                               cachedResponseValidThrough);
   if (cachedResponsePresent) {
     if (cachedResponseResult == Success && cachedResponseValidThrough >= time) {
-      PR_LOG(gCertVerifierLog, PR_LOG_DEBUG,
+      MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG,
              ("NSSCertDBTrustDomain: cached OCSP response: good"));
       return Success;
     }
     // If we have a cached revoked response, use it.
     if (cachedResponseResult == Result::ERROR_REVOKED_CERTIFICATE) {
-      PR_LOG(gCertVerifierLog, PR_LOG_DEBUG,
+      MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG,
              ("NSSCertDBTrustDomain: cached OCSP response: revoked"));
       return Result::ERROR_REVOKED_CERTIFICATE;
     }
     // The cached response may indicate an unknown certificate or it may be
     // expired. Don't return with either of these statuses yet - we may be
     // able to fetch a more recent one.
-    PR_LOG(gCertVerifierLog, PR_LOG_DEBUG,
+    MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG,
            ("NSSCertDBTrustDomain: cached OCSP response: error %ld valid "
            "until %lld", cachedResponseResult, cachedResponseValidThrough));
     // When a good cached response has expired, it is more convenient
@@ -435,7 +438,7 @@
       cachedResponsePresent = false;
     }
   } else {
-    PR_LOG(gCertVerifierLog, PR_LOG_DEBUG,
+    MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG,
            ("NSSCertDBTrustDomain: no cached OCSP response"));
   }
   // At this point, if and only if cachedErrorResult is Success, there was no
@@ -455,7 +458,10 @@
   // security.OCSP.enable==0 means "I want the default" or "I really never want
   // you to ever fetch OCSP."
 
+  Duration shortLifetime(mCertShortLifetimeInDays * Time::ONE_DAY_IN_SECONDS);
+
   if ((mOCSPFetching == NeverFetchOCSP) ||
+      (validityDuration < shortLifetime) ||
       (endEntityOrCA == EndEntityOrCA::MustBeCA &&
        (mOCSPFetching == FetchOCSPForDVHardFail ||
         mOCSPFetching == FetchOCSPForDVSoftFail ||
@@ -565,25 +571,25 @@
       }
     }
     if (mOCSPFetching != FetchOCSPForDVSoftFail) {
-      PR_LOG(gCertVerifierLog, PR_LOG_DEBUG,
+      MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG,
              ("NSSCertDBTrustDomain: returning SECFailure after "
               "OCSP request failure"));
       return error;
     }
     if (cachedResponseResult == Result::ERROR_OCSP_UNKNOWN_CERT) {
-      PR_LOG(gCertVerifierLog, PR_LOG_DEBUG,
+      MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG,
              ("NSSCertDBTrustDomain: returning SECFailure from cached "
               "response after OCSP request failure"));
       return cachedResponseResult;
     }
     if (stapledOCSPResponseResult != Success) {
-      PR_LOG(gCertVerifierLog, PR_LOG_DEBUG,
+      MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG,
              ("NSSCertDBTrustDomain: returning SECFailure from expired "
               "stapled response after OCSP request failure"));
       return stapledOCSPResponseResult;
     }
 
-    PR_LOG(gCertVerifierLog, PR_LOG_DEBUG,
+    MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG,
            ("NSSCertDBTrustDomain: returning SECSuccess after "
             "OCSP request failure"));
     return Success; // Soft fail -> success :(
@@ -598,7 +604,7 @@
                                               response, ResponseIsFromNetwork,
                                               expired);
   if (rv == Success || mOCSPFetching != FetchOCSPForDVSoftFail) {
-    PR_LOG(gCertVerifierLog, PR_LOG_DEBUG,
+    MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG,
       ("NSSCertDBTrustDomain: returning after VerifyEncodedOCSPResponse"));
     return rv;
   }
@@ -608,13 +614,13 @@
     return rv;
   }
   if (stapledOCSPResponseResult != Success) {
-    PR_LOG(gCertVerifierLog, PR_LOG_DEBUG,
+    MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG,
            ("NSSCertDBTrustDomain: returning SECFailure from expired stapled "
             "response after OCSP request verification failure"));
     return stapledOCSPResponseResult;
   }
 
-  PR_LOG(gCertVerifierLog, PR_LOG_DEBUG,
+  MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG,
          ("NSSCertDBTrustDomain: end of CheckRevocation"));
 
   return Success; // Soft fail -> success :(
@@ -652,7 +658,7 @@
       rv == Success ||
       rv == Result::ERROR_REVOKED_CERTIFICATE ||
       rv == Result::ERROR_OCSP_UNKNOWN_CERT) {
-    PR_LOG(gCertVerifierLog, PR_LOG_DEBUG,
+    MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG,
            ("NSSCertDBTrustDomain: caching OCSP response"));
     Result putRV = mOCSPCache.Put(certID, rv, thisUpdate, validThrough);
     if (putRV != Success) {
@@ -700,7 +706,7 @@
 Result
 NSSCertDBTrustDomain::IsChainValid(const DERArray& certArray, Time time)
 {
-  PR_LOG(gCertVerifierLog, PR_LOG_DEBUG,
+  MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG,
          ("NSSCertDBTrustDomain: IsChainValid"));
 
   ScopedCERTCertList certList;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/certverifier/NSSCertDBTrustDomain.h firefox-trunk-41.0~a1~hg20150524r245419/security/certverifier/NSSCertDBTrustDomain.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/certverifier/NSSCertDBTrustDomain.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/certverifier/NSSCertDBTrustDomain.h	2015-05-25 20:42:34.000000000 +0000
@@ -53,6 +53,7 @@
   NSSCertDBTrustDomain(SECTrustType certDBTrustType, OCSPFetching ocspFetching,
                        OCSPCache& ocspCache, void* pinArg,
                        CertVerifier::OcspGetConfig ocspGETConfig,
+                       uint32_t certShortLifetimeInDays,
                        CertVerifier::PinningMode pinningMode,
                        unsigned int minRSABits,
           /*optional*/ const char* hostname = nullptr,
@@ -96,6 +97,7 @@
                    mozilla::pkix::EndEntityOrCA endEntityOrCA,
                    const mozilla::pkix::CertID& certID,
                    mozilla::pkix::Time time,
+                   mozilla::pkix::Duration validityDuration,
       /*optional*/ const mozilla::pkix::Input* stapledOCSPResponse,
       /*optional*/ const mozilla::pkix::Input* aiaExtension)
                    override;
@@ -127,6 +129,7 @@
   OCSPCache& mOCSPCache; // non-owning!
   void* mPinArg; // non-owning!
   const CertVerifier::OcspGetConfig mOCSPGetConfig;
+  const uint32_t mCertShortLifetimeInDays;
   CertVerifier::PinningMode mPinningMode;
   const unsigned int mMinRSABits;
   const char* mHostname; // non-owning - only used for pinning checks
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/certverifier/OCSPCache.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/certverifier/OCSPCache.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/certverifier/OCSPCache.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/certverifier/OCSPCache.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -138,7 +138,7 @@
 static inline void
 LogWithCertID(const char* aMessage, const CertID& aCertID)
 {
-  PR_LOG(gCertVerifierLog, PR_LOG_DEBUG, (aMessage, &aCertID));
+  MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG, (aMessage, &aCertID));
 }
 
 void
@@ -261,7 +261,7 @@
 OCSPCache::Clear()
 {
   MutexAutoLock lock(mMutex);
-  PR_LOG(gCertVerifierLog, PR_LOG_DEBUG, ("OCSPCache::Clear: clearing cache"));
+  MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG, ("OCSPCache::Clear: clearing cache"));
   // First go through and delete the memory being pointed to by the pointers
   // in the vector.
   for (Entry** entry = mEntries.begin(); entry < mEntries.end();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/certverifier/OCSPRequestor.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/certverifier/OCSPRequestor.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/certverifier/OCSPRequestor.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/certverifier/OCSPRequestor.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -56,7 +56,7 @@
     return rv;
   }
 
-  PR_LOG(gCertVerifierLog, PR_LOG_DEBUG,
+  MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG,
          ("Setting up OCSP GET path, pre path =%s\n",
           PromiseFlatCString(path).get()));
 
@@ -159,7 +159,7 @@
   } else {
     path.Assign("/");
   }
-  PR_LOG(gCertVerifierLog, PR_LOG_DEBUG,
+  MOZ_LOG(gCertVerifierLog, PR_LOG_DEBUG,
          ("Setting up OCSP request: pre all path =%s  pathlen=%d\n", path.get(),
           pathLen));
   nsAutoCString method("POST");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/boot/src/CertBlocklist.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/boot/src/CertBlocklist.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/boot/src/CertBlocklist.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/boot/src/CertBlocklist.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -19,7 +19,7 @@
 #include "nsTHashtable.h"
 #include "nsThreadUtils.h"
 #include "pkix/Input.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 NS_IMPL_ISUPPORTS(CertBlocklist, nsICertBlocklist)
 
@@ -141,11 +141,11 @@
 nsresult
 CertBlocklist::Init()
 {
-  PR_LOG(gCertBlockPRLog, PR_LOG_DEBUG, ("CertBlocklist::Init"));
+  MOZ_LOG(gCertBlockPRLog, PR_LOG_DEBUG, ("CertBlocklist::Init"));
 
   // Init must be on main thread for getting the profile directory
   if (!NS_IsMainThread()) {
-    PR_LOG(gCertBlockPRLog, PR_LOG_DEBUG,
+    MOZ_LOG(gCertBlockPRLog, PR_LOG_DEBUG,
            ("CertBlocklist::Init - called off main thread"));
     return NS_ERROR_NOT_SAME_THREAD;
   }
@@ -169,7 +169,7 @@
   rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
                               getter_AddRefs(mBackingFile));
   if (NS_FAILED(rv) || !mBackingFile) {
-    PR_LOG(gCertBlockPRLog, PR_LOG_DEBUG,
+    MOZ_LOG(gCertBlockPRLog, PR_LOG_DEBUG,
            ("CertBlocklist::Init - couldn't get profile dir"));
     // Since we're returning NS_OK here, set mBackingFile to a safe value.
     // (We need initialization to succeed and CertBlocklist to be in a
@@ -186,7 +186,7 @@
   if (NS_FAILED(rv)) {
     return rv;
   }
-  PR_LOG(gCertBlockPRLog, PR_LOG_DEBUG,
+  MOZ_LOG(gCertBlockPRLog, PR_LOG_DEBUG,
          ("CertBlocklist::Init certList path: %s", path.get()));
 
   return NS_OK;
@@ -195,13 +195,13 @@
 nsresult
 CertBlocklist::EnsureBackingFileInitialized(MutexAutoLock& lock)
 {
-  PR_LOG(gCertBlockPRLog, PR_LOG_DEBUG,
+  MOZ_LOG(gCertBlockPRLog, PR_LOG_DEBUG,
          ("CertBlocklist::EnsureBackingFileInitialized"));
   if (mBackingFileIsInitialized || !mBackingFile) {
     return NS_OK;
   }
 
-  PR_LOG(gCertBlockPRLog, PR_LOG_DEBUG,
+  MOZ_LOG(gCertBlockPRLog, PR_LOG_DEBUG,
          ("CertBlocklist::EnsureBackingFileInitialized - not initialized"));
 
   bool exists = false;
@@ -210,7 +210,7 @@
     return rv;
   }
   if (!exists) {
-    PR_LOG(gCertBlockPRLog, PR_LOG_WARN,
+    MOZ_LOG(gCertBlockPRLog, PR_LOG_WARN,
            ("CertBlocklist::EnsureBackingFileInitialized no revocations file"));
     return NS_OK;
   }
@@ -263,11 +263,11 @@
     if (DN.IsEmpty() || other.IsEmpty()) {
       continue;
     }
-    PR_LOG(gCertBlockPRLog, PR_LOG_DEBUG,
+    MOZ_LOG(gCertBlockPRLog, PR_LOG_DEBUG,
            ("CertBlocklist::EnsureBackingFileInitialized adding: %s %s",
             DN.get(), other.get()));
 
-    PR_LOG(gCertBlockPRLog, PR_LOG_DEBUG,
+    MOZ_LOG(gCertBlockPRLog, PR_LOG_DEBUG,
            ("CertBlocklist::EnsureBackingFileInitialized - pre-decode"));
 
     rv = AddRevokedCertInternal(DN, other, mechanism, CertOldFromLocalCache,
@@ -276,7 +276,7 @@
     if (NS_FAILED(rv)) {
       // we warn here, rather than abandoning, since we need to
       // ensure that as many items as possible are read
-      PR_LOG(gCertBlockPRLog, PR_LOG_WARN,
+      MOZ_LOG(gCertBlockPRLog, PR_LOG_WARN,
              ("CertBlocklist::EnsureBackingFileInitialized adding revoked cert "
               "failed"));
     }
@@ -290,7 +290,7 @@
 CertBlocklist::RevokeCertBySubjectAndPubKey(const char* aSubject,
                                             const char* aPubKeyHash)
 {
-  PR_LOG(gCertBlockPRLog, PR_LOG_DEBUG,
+  MOZ_LOG(gCertBlockPRLog, PR_LOG_DEBUG,
          ("CertBlocklist::RevokeCertBySubjectAndPubKey - subject is: %s and pubKeyHash: %s",
           aSubject, aPubKeyHash));
   MutexAutoLock lock(mMutex);
@@ -306,7 +306,7 @@
 CertBlocklist::RevokeCertByIssuerAndSerial(const char* aIssuer,
                                            const char* aSerialNumber)
 {
-  PR_LOG(gCertBlockPRLog, PR_LOG_DEBUG,
+  MOZ_LOG(gCertBlockPRLog, PR_LOG_DEBUG,
          ("CertBlocklist::RevokeCertByIssuerAndSerial - issuer is: %s and serial: %s",
           aIssuer, aSerialNumber));
   MutexAutoLock lock(mMutex);
@@ -481,7 +481,7 @@
 NS_IMETHODIMP
 CertBlocklist::SaveEntries()
 {
-  PR_LOG(gCertBlockPRLog, PR_LOG_DEBUG,
+  MOZ_LOG(gCertBlockPRLog, PR_LOG_DEBUG,
       ("CertBlocklist::SaveEntries - not initialized"));
   MutexAutoLock lock(mMutex);
   if (!mModified) {
@@ -495,7 +495,7 @@
 
   if (!mBackingFile) {
     // We allow this to succeed with no profile directory for tests
-    PR_LOG(gCertBlockPRLog, PR_LOG_WARN,
+    MOZ_LOG(gCertBlockPRLog, PR_LOG_WARN,
            ("CertBlocklist::SaveEntries no file in profile to write to"));
     return NS_OK;
   }
@@ -516,14 +516,14 @@
 
   mBlocklist.EnumerateEntries(ProcessEntry, &saveInfo);
   if (!saveInfo.success) {
-    PR_LOG(gCertBlockPRLog, PR_LOG_WARN,
+    MOZ_LOG(gCertBlockPRLog, PR_LOG_WARN,
            ("CertBlocklist::SaveEntries writing revocation data failed"));
     return NS_ERROR_FAILURE;
   }
 
   saveInfo.issuers.EnumerateEntries(WriteIssuer, &saveInfo);
   if (!saveInfo.success) {
-    PR_LOG(gCertBlockPRLog, PR_LOG_WARN,
+    MOZ_LOG(gCertBlockPRLog, PR_LOG_WARN,
            ("CertBlocklist::SaveEntries writing revocation data failed"));
     return NS_ERROR_FAILURE;
   }
@@ -536,7 +536,7 @@
   }
   rv = safeStream->Finish();
   if (NS_FAILED(rv)) {
-    PR_LOG(gCertBlockPRLog, PR_LOG_WARN,
+    MOZ_LOG(gCertBlockPRLog, PR_LOG_WARN,
            ("CertBlocklist::SaveEntries saving revocation data failed"));
     return rv;
   }
@@ -627,12 +627,12 @@
 
   if (now > sLastBlocklistUpdate) {
     int64_t interval = now - sLastBlocklistUpdate;
-    PR_LOG(gCertBlockPRLog, PR_LOG_WARN,
+    MOZ_LOG(gCertBlockPRLog, PR_LOG_WARN,
            ("CertBlocklist::IsBlocklistFresh we're after the last BlocklistUpdate "
             "interval is %i, staleness %u", interval, sMaxStaleness));
     *_retval = sMaxStaleness > interval;
   }
-  PR_LOG(gCertBlockPRLog, PR_LOG_WARN,
+  MOZ_LOG(gCertBlockPRLog, PR_LOG_WARN,
          ("CertBlocklist::IsBlocklistFresh ? %s", *_retval ? "true" : "false"));
   return NS_OK;
 }
@@ -646,7 +646,7 @@
   CertBlocklist* blocklist = reinterpret_cast<CertBlocklist*>(aClosure);
   MutexAutoLock lock(blocklist->mMutex);
 
-  PR_LOG(gCertBlockPRLog, PR_LOG_WARN,
+  MOZ_LOG(gCertBlockPRLog, PR_LOG_WARN,
          ("CertBlocklist::PreferenceChanged %s changed", aPref));
   if (strcmp(aPref, PREF_BACKGROUND_UPDATE_TIMER) == 0) {
     sLastBlocklistUpdate = Preferences::GetUint(PREF_BACKGROUND_UPDATE_TIMER,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/boot/src/nsEntropyCollector.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/boot/src/nsEntropyCollector.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/boot/src/nsEntropyCollector.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/boot/src/nsEntropyCollector.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsEntropyCollector.h"
 #include "nsAlgorithm.h"
 #include <algorithm>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/boot/src/nsSecureBrowserUIImpl.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/boot/src/nsSecureBrowserUIImpl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/boot/src/nsSecureBrowserUIImpl.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/boot/src/nsSecureBrowserUIImpl.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nspr.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "nsISecureBrowserUI.h"
 #include "nsSecureBrowserUIImpl.h"
@@ -137,7 +137,7 @@
   if (PR_LOG_TEST(gSecureDocLog, PR_LOG_DEBUG)) {
     nsCOMPtr<nsIDOMWindow> window(do_QueryReferent(mWindow));
 
-    PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+    MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
            ("SecureUI:%p: Init: mWindow: %p, aWindow: %p\n", this,
             window.get(), aWindow));
   }
@@ -316,16 +316,16 @@
 
   nsCOMPtr<nsITransportSecurityInfo> psmInfo(do_QueryInterface(info));
   if (!psmInfo) {
-    PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI: GetSecurityState: - no nsITransportSecurityInfo for %p\n",
+    MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI: GetSecurityState: - no nsITransportSecurityInfo for %p\n",
                                          (nsISupports *)info));
     return nsIWebProgressListener::STATE_IS_INSECURE;
   }
-  PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI: GetSecurityState: - info is %p\n", 
+  MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI: GetSecurityState: - info is %p\n", 
                                        (nsISupports *)info));
   
   res = psmInfo->GetSecurityState(&securityState);
   if (NS_FAILED(res)) {
-    PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI: GetSecurityState: - GetSecurityState failed: %d\n",
+    MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI: GetSecurityState: - GetSecurityState failed: %d\n",
                                          res));
     securityState = nsIWebProgressListener::STATE_IS_BROKEN;
   }
@@ -348,14 +348,14 @@
       bool isHttp, isFtp;
       if ((NS_SUCCEEDED(uri->SchemeIs("http", &isHttp)) && isHttp) ||
           (NS_SUCCEEDED(uri->SchemeIs("ftp", &isFtp)) && isFtp)) {
-        PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI: GetSecurityState: - "
+        MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI: GetSecurityState: - "
                                              "channel scheme is insecure.\n"));
         securityState = nsIWebProgressListener::STATE_IS_INSECURE;
       }
     }
   }
 
-  PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI: GetSecurityState: - Returning %d\n", 
+  MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI: GetSecurityState: - Returning %d\n", 
                                        securityState));
   return securityState;
 }
@@ -404,7 +404,7 @@
     temp_NewToplevelSecurityState =
       GetSecurityStateFromSecurityInfoAndRequest(info, aRequest);
 
-    PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+    MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
            ("SecureUI:%p: OnStateChange: remember mNewToplevelSecurityState => %x\n", this,
             temp_NewToplevelSecurityState));
 
@@ -432,7 +432,7 @@
     if (updateStatus) {
       mSSLStatus = temp_SSLStatus;
     }
-    PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+    MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
            ("SecureUI:%p: remember securityInfo %p\n", this,
             info));
     nsCOMPtr<nsIAssociatedContentSecurity> associatedContentSecurityFromRequest =
@@ -466,11 +466,11 @@
   if (reqState & STATE_IS_SECURE) {
     // do nothing
   } else if (reqState & STATE_IS_BROKEN) {
-    PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+    MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
            ("SecureUI:%p: OnStateChange: subreq BROKEN\n", this));
     ++mSubRequestsBrokenSecurity;
   } else {
-    PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+    MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
            ("SecureUI:%p: OnStateChange: subreq INSECURE\n", this));
     ++mSubRequestsNoSecurity;
   }
@@ -617,22 +617,22 @@
   {
     if (isToplevelProgress)
     {
-      PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+      MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
              ("SecureUI:%p: OnStateChange: progress: for toplevel\n", this));
     }
     else
     {
-      PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+      MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
              ("SecureUI:%p: OnStateChange: progress: for something else\n", this));
     }
   }
   else
   {
-      PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+      MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
              ("SecureUI:%p: OnStateChange: progress: no window known\n", this));
   }
 
-  PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+  MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
          ("SecureUI:%p: OnStateChange\n", this));
 
   if (isViewSource)
@@ -640,7 +640,7 @@
 
   if (!aRequest)
   {
-    PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+    MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
            ("SecureUI:%p: OnStateChange with null request\n", this));
     return NS_ERROR_NULL_POINTER;
   }
@@ -648,7 +648,7 @@
   if (PR_LOG_TEST(gSecureDocLog, PR_LOG_DEBUG)) {
     nsXPIDLCString reqname;
     aRequest->GetName(reqname);
-    PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+    MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
            ("SecureUI:%p: %p %p OnStateChange %x %s\n", this, aWebProgress,
             aRequest, aProgressStateFlags, reqname.get()));
   }
@@ -688,7 +688,7 @@
       &&
       loadFlags & nsIChannel::LOAD_DOCUMENT_URI)
   {
-    PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+    MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
            ("SecureUI:%p: OnStateChange: SOMETHING STARTS FOR TOPMOST DOCUMENT\n", this));
   }
 
@@ -700,7 +700,7 @@
       &&
       loadFlags & nsIChannel::LOAD_DOCUMENT_URI)
   {
-    PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+    MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
            ("SecureUI:%p: OnStateChange: SOMETHING STOPS FOR TOPMOST DOCUMENT\n", this));
   }
 
@@ -716,7 +716,7 @@
         if (!wyciwygRequest) {
           nsCOMPtr<nsIFTPChannel> ftpRequest(do_QueryInterface(aRequest));
           if (!ftpRequest) {
-            PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+            MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
                    ("SecureUI:%p: OnStateChange: not relevant for sub content\n", this));
             isSubDocumentRelevant = false;
           }
@@ -838,7 +838,7 @@
     info.AppendLiteral("f contains unknown flag!");
   }
 
-  PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+  MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
          ("SecureUI:%p: OnStateChange: %s %s -- %s\n", this, _status, 
           info.get(), info2.get()));
 
@@ -846,7 +846,7 @@
       &&
       channel)
   {
-    PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+    MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
            ("SecureUI:%p: OnStateChange: seeing STOP with security state: %d\n", this,
             GetSecurityStateFromSecurityInfoAndRequest(securityInfo, aRequest)
             ));
@@ -937,13 +937,13 @@
 
     if (allowSecurityStateChange && !inProgress)
     {
-      PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+      MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
              ("SecureUI:%p: OnStateChange: start for toplevel document\n", this
               ));
 
       if (prevContentSecurity)
       {
-        PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+        MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
                ("SecureUI:%p: OnStateChange: start, saving current sub state\n", this
                 ));
   
@@ -952,7 +952,7 @@
         prevContentSecurity->SetCountSubRequestsBrokenSecurity(saveSubBroken);
         prevContentSecurity->SetCountSubRequestsNoSecurity(saveSubNo);
         prevContentSecurity->Flush();
-        PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI:%p: Saving subs in START to %p as %d,%d\n", 
+        MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI:%p: Saving subs in START to %p as %d,%d\n", 
           this, prevContentSecurity.get(), saveSubBroken, saveSubNo));      
       }
 
@@ -979,13 +979,13 @@
     
         if (newContentSecurity)
         {
-          PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+          MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
                  ("SecureUI:%p: OnStateChange: start, loading old sub state\n", this
                   ));
     
           newContentSecurity->GetCountSubRequestsBrokenSecurity(&newSubBroken);
           newContentSecurity->GetCountSubRequestsNoSecurity(&newSubNo);
-          PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI:%p: Restoring subs in START from %p to %d,%d\n", 
+          MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI:%p: Restoring subs in START from %p to %d,%d\n", 
             this, newContentSecurity.get(), newSubBroken, newSubNo));      
         }
       }
@@ -1014,7 +1014,7 @@
       // By using a counter, this code also works when the toplevel
       // document get's redirected, but the STOP request for the 
       // previous toplevel document has not yet have been received.
-      PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+      MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
              ("SecureUI:%p: OnStateChange: ++mDocumentRequestsInProgress\n", this
               ));
       ++mDocumentRequestsInProgress;
@@ -1050,7 +1050,7 @@
       return NS_OK;
     }
 
-    PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+    MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
            ("SecureUI:%p: OnStateChange: --mDocumentRequestsInProgress\n", this
             ));
 
@@ -1120,7 +1120,7 @@
       {
         currentContentSecurity->GetCountSubRequestsBrokenSecurity(&subBroken);
         currentContentSecurity->GetCountSubRequestsNoSecurity(&subNo);
-        PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI:%p: Restoring subs in STOP from %p to %d,%d\n", 
+        MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI:%p: Restoring subs in STOP from %p to %d,%d\n", 
           this, currentContentSecurity.get(), subBroken, subNo));      
       }
 
@@ -1204,7 +1204,7 @@
     newSecurityState = lis_broken_security;
   }
 
-  PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+  MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
          ("SecureUI:%p: UpdateSecurityState:  old-new  %d - %d\n", this,
           mNotifiedSecurityState, newSecurityState));
 
@@ -1242,13 +1242,13 @@
   }
 
   if (toplevelEventSink) {
-    PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+    MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
            ("SecureUI:%p: UpdateSecurityState: calling OnSecurityChange\n",
             this));
 
     toplevelEventSink->OnSecurityChange(aRequest, state);
   } else {
-    PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+    MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
            ("SecureUI:%p: UpdateSecurityState: NO mToplevelEventSink!\n",
             this));
 
@@ -1266,7 +1266,7 @@
   NS_ASSERTION(mOnStateLocationChangeReentranceDetection == 1,
                "unexpected parallel nsIWebProgress OnStateChange and/or OnLocationChange notification");
 #endif
-  PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+  MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
          ("SecureUI:%p: OnLocationChange\n", this));
 
   bool updateIsViewSource = false;
@@ -1281,7 +1281,7 @@
     NS_ENSURE_SUCCESS(rv, rv);
 
     if (vs) {
-      PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+      MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
              ("SecureUI:%p: OnLocationChange: view-source\n", this));
     }
 
@@ -1378,7 +1378,7 @@
   if (aURI) {
     nsAutoCString temp;
     aURI->GetSpec(temp);
-    PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+    MOZ_LOG(gSecureDocLog, PR_LOG_DEBUG,
            ("SecureUI:%p: OnSecurityChange: (%x) %s\n", this,
             state, temp.get()));
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/boot/src/nsSecurityHeaderParser.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/boot/src/nsSecurityHeaderParser.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/boot/src/nsSecurityHeaderParser.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/boot/src/nsSecurityHeaderParser.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsSecurityHeaderParser.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 // The character classes in this file are informed by [RFC2616], Section 2.2.
 // signed char is a signed data type one byte (8 bits) wide, so its value can
@@ -56,7 +56,7 @@
   return sSHParserLog;
 }
 
-#define SHPARSERLOG(args) PR_LOG(GetSHParserLog(), PR_LOG_DEBUG, args)
+#define SHPARSERLOG(args) MOZ_LOG(GetSHParserLog(), PR_LOG_DEBUG, args)
 
 nsSecurityHeaderParser::nsSecurityHeaderParser(const char *aHeader)
   : mCursor(aHeader)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/boot/src/nsSiteSecurityService.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/boot/src/nsSiteSecurityService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/boot/src/nsSiteSecurityService.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/boot/src/nsSiteSecurityService.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -21,7 +21,7 @@
 #include "nsXULAppAPI.h"
 #include "pkix/pkixtypes.h"
 #include "plstr.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prnetdb.h"
 #include "prprf.h"
 #include "PublicKeyPinningService.h"
@@ -49,7 +49,7 @@
   return gSSSLog;
 }
 
-#define SSSLOG(args) PR_LOG(GetSSSLog(), 4, args)
+#define SSSLOG(args) MOZ_LOG(GetSSSLog(), 4, args)
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/boot/src/nsSTSPreloadList.errors firefox-trunk-41.0~a1~hg20150524r245419/security/manager/boot/src/nsSTSPreloadList.errors
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/boot/src/nsSTSPreloadList.errors	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/boot/src/nsSTSPreloadList.errors	2015-05-25 20:42:34.000000000 +0000
@@ -1,12 +1,13 @@
 300651.ru: did not receive HSTS header
 56ct.com: could not connect to host
 9point6.com: could not connect to host
+adamkostecki.de: could not connect to host
 admin.google.com: did not receive HSTS header (error ignored - included regardless)
 adsfund.org: could not connect to host
 afp548.tk: could not connect to host
 airbnb.com: did not receive HSTS header
 aiticon.de: did not receive HSTS header
-alpha.irccloud.com: could not connect to host
+alpha.irccloud.com: did not receive HSTS header
 alphabit-secure.com: did not receive HSTS header
 altmv.com: max-age too low: 7776000
 amigogeek.net: could not connect to host
@@ -18,12 +19,13 @@
 app.manilla.com: could not connect to host
 appengine.google.com: did not receive HSTS header (error ignored - included regardless)
 appseccalifornia.org: could not connect to host
-astaxi.net: did not receive HSTS header
+astaxi.net: could not connect to host
 at.search.yahoo.com: did not receive HSTS header
 atavio.at: could not connect to host
 atavio.ch: could not connect to host
 atavio.de: did not receive HSTS header
 au.search.yahoo.com: did not receive HSTS header
+aurainfosec.com.au: could not connect to host
 auth.mail.ru: did not receive HSTS header
 auto4trade.nl: did not receive HSTS header
 az.search.yahoo.com: did not receive HSTS header
@@ -35,6 +37,7 @@
 bccx.com: could not connect to host
 bcm.com.au: max-age too low: 0
 be.search.yahoo.com: did not receive HSTS header
+bedeta.de: could not connect to host
 betnet.fr: could not connect to host
 bi.search.yahoo.com: did not receive HSTS header
 bidon.ca: did not receive HSTS header
@@ -45,13 +48,13 @@
 bizon.sk: did not receive HSTS header
 blacklane.com: did not receive HSTS header
 blog.lookout.com: did not receive HSTS header
+bonigo.de: did not receive HSTS header
 br.search.yahoo.com: did not receive HSTS header
-brainfork.ml: did not receive HSTS header
 braintreepayments.com: did not receive HSTS header
 brainvation.de: did not receive HSTS header
 bran.cc: could not connect to host
 browserid.org: did not receive HSTS header
-business.medbank.com.mt: could not connect to host
+business.medbank.com.mt: did not receive HSTS header
 buttercoin.com: did not receive HSTS header
 ca.search.yahoo.com: did not receive HSTS header
 cake.care: could not connect to host
@@ -68,6 +71,7 @@
 changelab.cc: max-age too low: 0
 chatbot.me: could not connect to host
 checkout.google.com: did not receive HSTS header (error ignored - included regardless)
+cheesetart.my: did not receive HSTS header
 chfr.search.yahoo.com: did not receive HSTS header
 chit.search.yahoo.com: did not receive HSTS header
 chm.vn: did not receive HSTS header
@@ -77,6 +81,7 @@
 cimballa.com: did not receive HSTS header
 cl.search.yahoo.com: did not receive HSTS header
 climaprecio.es: did not receive HSTS header
+cloudns.com.au: could not connect to host
 cn.search.yahoo.com: did not receive HSTS header
 co.search.yahoo.com: did not receive HSTS header
 code.google.com: did not receive HSTS header (error ignored - included regardless)
@@ -96,6 +101,8 @@
 cujanovic.com: did not receive HSTS header
 cyanogenmod.xxx: could not connect to host
 cybershambles.com: could not connect to host
+darknode.in: did not receive HSTS header
+darkserver.fedoraproject.org: could not connect to host
 datasnitch.co.uk: could not connect to host
 daylightcompany.com: did not receive HSTS header
 de.search.yahoo.com: did not receive HSTS header
@@ -115,6 +122,7 @@
 dropcam.com: did not receive HSTS header
 dzlibs.io: could not connect to host
 e-aut.net: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 134"  data: no]
+edelsteincosmetic.com: did not receive HSTS header
 edmodo.com: did not receive HSTS header
 egit.co: could not connect to host
 elnutricionista.es: did not receive HSTS header
@@ -140,6 +148,7 @@
 fm83.nl: did not receive HSTS header
 fonetiq.io: could not connect to host
 fr.search.yahoo.com: did not receive HSTS header
+freeshell.de: did not receive HSTS header
 fsma.pl: did not receive HSTS header
 gamesdepartment.co.uk: did not receive HSTS header
 geekandi.com: max-age too low: 7776000
@@ -159,7 +168,6 @@
 greplin.com: could not connect to host
 groups.google.com: did not receive HSTS header (error ignored - included regardless)
 guidetoiceland.is: did not receive HSTS header
-gwijaya.com: did not receive HSTS header
 hackerone-user-content.com: could not connect to host
 hangouts.google.com: did not receive HSTS header (error ignored - included regardless)
 hatoko.net: could not connect to host
@@ -185,21 +193,22 @@
 inertianetworks.com: did not receive HSTS header
 iniiter.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]
 intercom.io: did not receive HSTS header
-interserved.com: did not receive HSTS header
 ionas-law.ro: did not receive HSTS header
 iop.intuit.com: max-age too low: 86400
+ipmimagazine.com: did not receive HSTS header
 irccloud.com: did not receive HSTS header
 it.search.yahoo.com: did not receive HSTS header
 itshost.ru: could not connect to host
 j0s.at: did not receive HSTS header
 jamesdoylephoto.com: did not receive HSTS header
-janus-engineering.de: could not connect to host
+janus-engineering.de: did not receive HSTS header
 jelmer.co.uk: could not connect to host
 johners.me: could not connect to host
 jottit.com: could not connect to host
 julian-kipka.de: did not receive HSTS header
 k-dev.de: could not connect to host
 kamikano.com: did not receive HSTS header
+karaoketonight.com: could not connect to host
 keeley.gq: could not connect to host
 keeley.ml: could not connect to host
 keepclean.me: could not connect to host
@@ -210,19 +219,21 @@
 kiwiirc.com: max-age too low: 5256000
 klaxn.com: could not connect to host
 klaxn.org: could not connect to host
+koenvdheuvel.me: did not receive HSTS header
 komandakovalchuk.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]
 koop-bremen.de: [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]
 kr.search.yahoo.com: did not receive HSTS header
 krouzkyliduska.cz: [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]
 kryptera.se: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 134"  data: no]
+kura.io: could not connect to host
 kz.search.yahoo.com: did not receive HSTS header
 labina.com.tr: did not receive HSTS header
 landscape.canonical.com: max-age too low: 2592000
+ledgerscope.net: max-age too low: 86400
 li.search.yahoo.com: did not receive HSTS header
 library.linode.com: did not receive HSTS header
 libraryfreedomproject.org: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 134"  data: no]
 lifeguard.aecom.com: max-age too low: 86400
-linorman1997.me: could not connect to host
 lists.fedoraproject.org: did not receive HSTS header
 lockify.com: could not connect to host
 login.corp.google.com: max-age too low: 7776000 (error ignored - included regardless)
@@ -243,8 +254,8 @@
 market.android.com: did not receive HSTS header (error ignored - included regardless)
 marshut.net: could not connect to host
 matatall.com: could not connect to host
-mattmccutchen.net: could not connect to host
 mccrypto.de: could not connect to host
+mdfnet.se: could not connect to host
 mediacru.sh: could not connect to host
 megashur.se: did not receive HSTS header
 megaxchange.com: did not receive HSTS header
@@ -252,6 +263,7 @@
 micropple.net: could not connect to host
 minikneet.nl: could not connect to host
 mirindadomo.ru: did not receive HSTS header
+mirrorx.com: did not receive HSTS header
 mnemotiv.com: could not connect to host
 mobilethreat.net: could not connect to host
 mobilethreatnetwork.net: could not connect to host
@@ -307,6 +319,7 @@
 play.google.com: did not receive HSTS header (error ignored - included regardless)
 polymathematician.com: could not connect to host
 popcorntime.ws: max-age too low: 2592000
+powerplannerapp.com: did not receive HSTS header
 pr.search.yahoo.com: did not receive HSTS header
 pressfreedomfoundation.org: did not receive HSTS header
 prodpad.com: did not receive HSTS header
@@ -321,12 +334,14 @@
 redports.org: did not receive HSTS header
 regar42.fr: could not connect to host
 reserve-online.net: did not receive HSTS header
+rid-wan.com: could not connect to host
 riseup.net: did not receive HSTS header
 rme.li: did not receive HSTS header
 ro.search.yahoo.com: did not receive HSTS header
+roan24.pl: did not receive HSTS header
 roddis.net: did not receive HSTS header
+rpavlik.cz: did not receive HSTS header
 ru.search.yahoo.com: did not receive HSTS header
-rubyshop.nl: did not receive HSTS header
 rw.search.yahoo.com: did not receive HSTS header
 sah3.net: could not connect to host
 saturngames.co.uk: could not connect to host
@@ -349,6 +364,7 @@
 sistemy48.ru: did not receive HSTS header
 sites.google.com: did not receive HSTS header (error ignored - included regardless)
 smartlend.se: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 134"  data: no]
+sockeye.cc: could not connect to host
 sol.io: could not connect to host
 souyar.de: could not connect to host
 souyar.net: could not connect to host
@@ -358,6 +374,8 @@
 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
+stevegrav.es: did not receive HSTS header
+stillyarts.com: did not receive HSTS header
 stocktrade.de: could not connect to host
 suite73.org: could not connect to host
 sunshinepress.org: could not connect to host
@@ -374,7 +392,6 @@
 tapka.cz: did not receive HSTS header
 taxsquirrel.com: did not receive HSTS header
 tc-bonito.de: did not receive HSTS header
-techllage.com: could not connect to host
 tektoria.de: did not receive HSTS header
 temehu.com: did not receive HSTS header
 terrax.berlin: could not connect to host
@@ -382,6 +399,7 @@
 the-sky-of-valkyries.com: could not connect to host
 thomasgriffin.io: did not receive HSTS header
 thorncreek.net: did not receive HSTS header
+tipsyk.ru: [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]
 tomfisher.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]
 tr.search.yahoo.com: did not receive HSTS header
 tradingcentre.com.au: did not receive HSTS header
@@ -392,6 +410,7 @@
 tw.search.yahoo.com: did not receive HSTS header
 ua.search.yahoo.com: did not receive HSTS header
 uk.search.yahoo.com: did not receive HSTS header
+unbanthe.net: did not receive HSTS header
 uonstaffhub.com: could not connect to host
 uprotect.it: could not connect to host
 ustr.gov: max-age too low: 86400
@@ -402,10 +421,11 @@
 viennan.net: did not receive HSTS header
 vn.search.yahoo.com: did not receive HSTS header
 vyncke.org: did not receive HSTS header
-wallet.google.com: did not receive HSTS header (error ignored - included regardless)
 webmail.mayfirst.org: did not receive HSTS header
+wf-training-master.appspot.com: could not connect to host
+wf-training-master.appspot.com: could not connect to host (error ignored - included regardless)
 wideup.net: did not receive HSTS header
-wikidsystems.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]
+wikidsystems.com: did not receive HSTS header
 withustrading.com: did not receive HSTS header
 wiz.biz: could not connect to host
 wohnungsbau-ludwigsburg.de: did not receive HSTS header
@@ -418,6 +438,7 @@
 www.googlemail.com: did not receive HSTS header (error ignored - included regardless)
 www.greplin.com: could not connect to host
 www.jitsi.org: did not receive HSTS header
+www.ledgerscope.net: max-age too low: 86400
 www.logentries.com: did not receive HSTS header
 www.moneybookers.com: did not receive HSTS header
 www.neonisi.com: could not connect to host
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/boot/src/nsSTSPreloadList.inc firefox-trunk-41.0~a1~hg20150524r245419/security/manager/boot/src/nsSTSPreloadList.inc
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/boot/src/nsSTSPreloadList.inc	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/boot/src/nsSTSPreloadList.inc	2015-05-25 20:42:34.000000000 +0000
@@ -8,7 +8,7 @@
 /*****************************************************************************/
 
 #include <stdint.h>
-const PRTime gPreloadListExpirationTime = INT64_C(1442053337830000);
+const PRTime gPreloadListExpirationTime = INT64_C(1443262889968000);
 
 class nsSTSPreload
 {
@@ -81,7 +81,6 @@
   { "alexsexton.com", true },
   { "alexyang.me", true },
   { "allinonecyprus.com", true },
-  { "alpha.irccloud.com", false },
   { "alza.cz", true },
   { "alza.de", true },
   { "alza.sk", true },
@@ -234,16 +233,16 @@
   { "blog.linode.com", false },
   { "blog.torproject.org", false },
   { "blubbablasen.de", true },
-  { "bodo-wolff.de", true },
+  { "bodo-wolff.de", false },
   { "bohramt.de", true },
   { "boiseonlinemall.com", true },
-  { "bonigo.de", true },
   { "bonitabrazilian.co.nz", true },
   { "bookingapp.nl", true },
   { "boxcryptor.com", true },
   { "boypoint.de", true },
   { "bradkovach.com", true },
   { "brage.info", false },
+  { "brainfork.ml", true },
   { "braintreegateway.com", true },
   { "brakemanpro.com", true },
   { "bran.cc", true },
@@ -294,7 +293,6 @@
   { "chatbot.me", true },
   { "check.torproject.org", false },
   { "checkout.google.com", true },
-  { "cheesetart.my", true },
   { "chrisirwin.ca", true },
   { "chrisjean.com", true },
   { "chrome-devtools-frontend.appspot.com", true },
@@ -339,6 +337,7 @@
   { "conrad-kostecki.de", true },
   { "console.support", true },
   { "consumersentinel.gov", true },
+  { "contributor.google.com", true },
   { "controlcenter.gigahost.dk", true },
   { "copperhead.co", true },
   { "cor-ser.es", true },
@@ -384,7 +383,6 @@
   { "danw.io", true },
   { "daphne.informatik.uni-freiburg.de", true },
   { "darchoods.net", false },
-  { "darknode.in", true },
   { "darkpony.ru", true },
   { "darkserver.fedoraproject.org", true },
   { "darkserver.stg.fedoraproject.org", true },
@@ -470,7 +468,6 @@
   { "ecosystem.atlassian.net", true },
   { "ectora.com", true },
   { "ed.gs", true },
-  { "edelsteincosmetic.com", true },
   { "edge-cloud.net", true },
   { "edit.yahoo.com", false },
   { "edix.ru", true },
@@ -546,7 +543,7 @@
   { "fiken.no", true },
   { "filedir.com", false },
   { "filip-prochazka.com", true },
-  { "finn.io", true },
+  { "finn.io", false },
   { "firebaseio-demo.com", true },
   { "firebaseio.com", true },
   { "firebirdrangecookers.com", true },
@@ -579,7 +576,6 @@
   { "fralef.me", false },
   { "frederik-braun.com", true },
   { "freenetproject.org", true },
-  { "freeshell.de", true },
   { "freesounding.com", true },
   { "freesounding.ru", true },
   { "freethought.org.au", true },
@@ -663,6 +659,7 @@
   { "gurusupe.com", true },
   { "guthabenkarten-billiger.de", true },
   { "gw2treasures.com", true },
+  { "gwijaya.com", true },
   { "haber1903.com", true },
   { "hachre.de", false },
   { "hack.li", true },
@@ -759,8 +756,8 @@
   { "instasex.ch", true },
   { "integromat.com", true },
   { "interasistmen.se", true },
+  { "interserved.com", true },
   { "iostips.ru", true },
-  { "ipmimagazine.com", true },
   { "ipomue.com", false },
   { "ipsec.pl", true },
   { "iranianlawschool.com", true },
@@ -783,7 +780,6 @@
   { "jahliveradio.com", false },
   { "jakub-boucek.cz", true },
   { "janoberst.com", true },
-  { "janus-engineering.de", true },
   { "jbn.mx", true },
   { "jelmer.co.uk", true },
   { "jelmer.uk", true },
@@ -791,7 +787,7 @@
   { "jetaprices.com", true },
   { "jettshome.org", true },
   { "jfreitag.de", true },
-  { "jh-media.eu", true },
+  { "jh-media.eu", false },
   { "jimshaver.net", true },
   { "jira.com", true },
   { "jitsi.org", false },
@@ -864,7 +860,6 @@
   { "knowledgehook.com", true },
   { "koen.io", true },
   { "koenrouwhorst.nl", true },
-  { "koenvdheuvel.me", true },
   { "kojipkgs.fedoraproject.org", true },
   { "kollawat.me", true },
   { "komandakovalchuk.com", false },
@@ -894,7 +889,6 @@
   { "leadbook.ru", true },
   { "leakedminecraft.net", true },
   { "leanclub.org", true },
-  { "ledgerscope.net", false },
   { "ledhouse.sk", true },
   { "leibniz-remscheid.de", true },
   { "leifdreizler.com", true },
@@ -1028,12 +1022,11 @@
   { "mindoktor.se", true },
   { "minecraftvoter.com", true },
   { "mineover.es", true },
-  { "minez-nightswatch.com", true },
+  { "minez-nightswatch.com", false },
   { "minikneet.com", true },
   { "minnesotadata.com", true },
   { "minora.io", true },
   { "mironet.cz", true },
-  { "mirrorx.com", true },
   { "miskatonic.org", true },
   { "miss-inventory.co.uk", true },
   { "mister.hosting", true },
@@ -1079,6 +1072,7 @@
   { "mwe.st", true },
   { "my.onlime.ch", false },
   { "my.xero.com", false },
+  { "myaccount.google.com", true },
   { "mygadgetguardian.lookout.com", false },
   { "mykontool.de", true },
   { "mylookout.com", false },
@@ -1250,7 +1244,6 @@
   { "portal.tirol.gv.at", true },
   { "posteo.de", false },
   { "postfinance.ch", true },
-  { "powerplannerapp.com", true },
   { "prakharprasad.com", true },
   { "prefontaine.name", true },
   { "preissler.co.uk", true },
@@ -1322,7 +1315,6 @@
   { "rippleunion.com", true },
   { "rischard.org", true },
   { "rlalique.com", true },
-  { "roan24.pl", true },
   { "robertof.ovh", true },
   { "robinadr.com", true },
   { "robinsonyu.com", true },
@@ -1340,12 +1332,12 @@
   { "rotunneling.net", true },
   { "roundcube.mayfirst.org", false },
   { "royalacademy.org.uk", true },
-  { "rpavlik.cz", true },
   { "rpy.xyz", true },
   { "rssr.se", true },
   { "ru-sprachstudio.ch", true },
   { "rubecodeberg.com", true },
   { "rubendv.be", true },
+  { "rubyshop.nl", true },
   { "rudloff.pro", true },
   { "rusadmin.biz", true },
   { "ruudkoot.nl", true },
@@ -1360,7 +1352,7 @@
   { "sale4ru.ru", true },
   { "salserocafe.com", true },
   { "samba.org", true },
-  { "samfunnet.no", true },
+  { "samfunnet.no", false },
   { "samizdat.cz", true },
   { "samuelkeeley.com", true },
   { "sanatfilan.com", false },
@@ -1448,7 +1440,6 @@
   { "smith.is", true },
   { "snakehosting.dk", true },
   { "sneezry.com", true },
-  { "snowflake.ch", false },
   { "sockeye.cc", true },
   { "soia.ca", true },
   { "sorz.org", true },
@@ -1483,10 +1474,8 @@
   { "stationary-traveller.eu", true },
   { "stereo.lu", true },
   { "stesti.cz", true },
-  { "stevegrav.es", true },
   { "steventress.com", true },
   { "sticklerjs.org", true },
-  { "stillyarts.com", true },
   { "stirling.co", true },
   { "stocktrade.de", false },
   { "storedsafe.com", true },
@@ -1662,7 +1651,6 @@
   { "ukdefencejournal.org.uk", true },
   { "ukhas.net", true },
   { "ukrainians.ch", true },
-  { "unbanthe.net", true },
   { "unison.com", true },
   { "unitedadmins.com", true },
   { "unknownphenomena.net", true },
@@ -1794,7 +1782,6 @@
   { "www.intercom.io", false },
   { "www.irccloud.com", false },
   { "www.lastpass.com", false },
-  { "www.ledgerscope.net", false },
   { "www.linode.com", false },
   { "www.lookout.com", false },
   { "www.makeyourlaws.org", true },
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/boot/src/PublicKeyPinningService.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/boot/src/PublicKeyPinningService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/boot/src/PublicKeyPinningService.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/boot/src/PublicKeyPinningService.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -11,7 +11,7 @@
 #include "nsSiteSecurityService.h"
 #include "nssb64.h"
 #include "pkix/pkixtypes.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "RootCertificateTelemetryUtils.h"
 #include "ScopedNSSTypes.h"
 #include "seccomon.h"
@@ -59,7 +59,7 @@
 {
   certMatchesPinset = false;
   if (!fingerprints && !dynamicFingerprints) {
-    PR_LOG(gPublicKeyPinningLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPublicKeyPinningLog, PR_LOG_DEBUG,
            ("pkpin: No hashes found for hash type: %d\n", hashType));
     return NS_ERROR_INVALID_ARG;
   }
@@ -67,7 +67,7 @@
   nsAutoCString base64Out;
   nsresult rv = GetBase64HashSPKI(cert, hashType, base64Out);
   if (NS_FAILED(rv)) {
-    PR_LOG(gPublicKeyPinningLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPublicKeyPinningLog, PR_LOG_DEBUG,
            ("pkpin: GetBase64HashSPKI failed!\n"));
     return rv;
   }
@@ -75,7 +75,7 @@
   if (fingerprints) {
     for (size_t i = 0; i < fingerprints->size; i++) {
       if (base64Out.Equals(fingerprints->data[i])) {
-        PR_LOG(gPublicKeyPinningLog, PR_LOG_DEBUG,
+        MOZ_LOG(gPublicKeyPinningLog, PR_LOG_DEBUG,
                ("pkpin: found pin base_64 ='%s'\n", base64Out.get()));
         certMatchesPinset = true;
         return NS_OK;
@@ -85,7 +85,7 @@
   if (dynamicFingerprints) {
     for (size_t i = 0; i < dynamicFingerprints->Length(); i++) {
       if (base64Out.Equals((*dynamicFingerprints)[i])) {
-        PR_LOG(gPublicKeyPinningLog, PR_LOG_DEBUG,
+        MOZ_LOG(gPublicKeyPinningLog, PR_LOG_DEBUG,
                ("pkpin: found pin base_64 ='%s'\n", base64Out.get()));
         certMatchesPinset = true;
         return NS_OK;
@@ -126,9 +126,9 @@
   for (node = CERT_LIST_HEAD(certList); !CERT_LIST_END(node, certList);
        node = CERT_LIST_NEXT(node)) {
     currentCert = node->cert;
-    PR_LOG(gPublicKeyPinningLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPublicKeyPinningLog, PR_LOG_DEBUG,
            ("pkpin: certArray subject: '%s'\n", currentCert->subjectName));
-    PR_LOG(gPublicKeyPinningLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPublicKeyPinningLog, PR_LOG_DEBUG,
            ("pkpin: certArray issuer: '%s'\n", currentCert->issuerName));
     nsresult rv = EvalCertWithHashType(currentCert, hashType, fingerprints,
                                        dynamicFingerprints,
@@ -140,7 +140,7 @@
       return NS_OK;
     }
   }
-  PR_LOG(gPublicKeyPinningLog, PR_LOG_DEBUG, ("pkpin: no matches found\n"));
+  MOZ_LOG(gPublicKeyPinningLog, PR_LOG_DEBUG, ("pkpin: no matches found\n"));
   return NS_OK;
 }
 
@@ -212,7 +212,7 @@
   char *evalPart;
   // Notice how the (xx = strchr) prevents pins for unqualified domain names.
   while (!foundEntry && (evalPart = strchr(evalHost, '.'))) {
-    PR_LOG(gPublicKeyPinningLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPublicKeyPinningLog, PR_LOG_DEBUG,
            ("pkpin: Querying pinsets for host: '%s'\n", evalHost));
     // Attempt dynamic pins first
     nsresult rv;
@@ -225,7 +225,7 @@
       return rv;
     }
     if (found && (evalHost == hostname || includeSubdomains)) {
-      PR_LOG(gPublicKeyPinningLog, PR_LOG_DEBUG,
+      MOZ_LOG(gPublicKeyPinningLog, PR_LOG_DEBUG,
              ("pkpin: Found dyn match for host: '%s'\n", evalHost));
       dynamicFingerprints = pinArray;
       return NS_OK;
@@ -237,7 +237,7 @@
       sizeof(TransportSecurityPreload),
       TransportSecurityPreloadCompare);
     if (foundEntry) {
-      PR_LOG(gPublicKeyPinningLog, PR_LOG_DEBUG,
+      MOZ_LOG(gPublicKeyPinningLog, PR_LOG_DEBUG,
              ("pkpin: Found pinset for host: '%s'\n", evalHost));
       if (evalHost != hostname) {
         if (!foundEntry->mIncludeSubdomains) {
@@ -246,7 +246,7 @@
         }
       }
     } else {
-      PR_LOG(gPublicKeyPinningLog, PR_LOG_DEBUG,
+      MOZ_LOG(gPublicKeyPinningLog, PR_LOG_DEBUG,
              ("pkpin: Didn't find pinset for host: '%s'\n", evalHost));
     }
     // Add one for '.'
@@ -335,7 +335,7 @@
       }
     }
 
-    PR_LOG(gPublicKeyPinningLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPublicKeyPinningLog, PR_LOG_DEBUG,
            ("pkpin: Pin check %s for %s host '%s' (mode=%s)\n",
             enforceTestModeResult ? "passed" : "failed",
             staticFingerprints->mIsMoz ? "mozilla" : "non-mozilla",
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/boot/src/RootCertificateTelemetryUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/boot/src/RootCertificateTelemetryUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/boot/src/RootCertificateTelemetryUtils.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/boot/src/RootCertificateTelemetryUtils.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -6,7 +6,7 @@
 
 #include "RootCertificateTelemetryUtils.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "RootHashes.inc" // Note: Generated by genRootCAHashes.js
 #include "ScopedNSSTypes.h"
 #include "mozilla/ArrayUtils.h"
@@ -60,7 +60,7 @@
   // Compare against list of stored hashes
   size_t idx;
 
-  PR_LOG(gPublicKeyPinningTelemetryLog, PR_LOG_DEBUG,
+  MOZ_LOG(gPublicKeyPinningTelemetryLog, PR_LOG_DEBUG,
            ("pkpinTelem: First bytes %02hx %02hx %02hx %02hx\n",
             digest.get().data[0], digest.get().data[1], digest.get().data[2], digest.get().data[3]));
 
@@ -69,7 +69,7 @@
             reinterpret_cast<const uint8_t*>(digest.get().data), digest.get().len),
          &idx)) {
 
-    PR_LOG(gPublicKeyPinningTelemetryLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPublicKeyPinningTelemetryLog, PR_LOG_DEBUG,
           ("pkpinTelem: Telemetry index was %lu, bin is %d\n",
            idx, ROOT_TABLE[idx].binNumber));
     return (int32_t) ROOT_TABLE[idx].binNumber;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/boot/src/StaticHPKPins.h firefox-trunk-41.0~a1~hg20150524r245419/security/manager/boot/src/StaticHPKPins.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/boot/src/StaticHPKPins.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/boot/src/StaticHPKPins.h	2015-05-25 20:42:34.000000000 +0000
@@ -769,6 +769,7 @@
   { "code.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "codereview.appspot.com", true, false, false, -1, &kPinset_google_root_pems },
   { "codereview.chromium.org", true, false, false, -1, &kPinset_google_root_pems },
+  { "contributor.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "dev.twitter.com", true, false, false, -1, &kPinset_twitterCom },
   { "developers.facebook.com", true, false, false, -1, &kPinset_facebook },
   { "dist.torproject.org", true, false, false, -1, &kPinset_tor },
@@ -1029,6 +1030,7 @@
   { "mbasic.facebook.com", true, false, false, -1, &kPinset_facebook },
   { "mobile.twitter.com", true, false, false, -1, &kPinset_twitterCom },
   { "mtouch.facebook.com", true, false, false, -1, &kPinset_facebook },
+  { "myaccount.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "oauth.twitter.com", true, false, false, -1, &kPinset_twitterCom },
   { "passwords.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "pinningtest.appspot.com", true, false, false, -1, &kPinset_test },
@@ -1087,8 +1089,8 @@
   { "ytimg.com", true, false, false, -1, &kPinset_google_root_pems },
 };
 
-// Pinning Preload List Length = 348;
+// Pinning Preload List Length = 350;
 
 static const int32_t kUnknownId = -1;
 
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1439634142984000);
+static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1440843695456000);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/locales/en-US/chrome/pipnss/nsserrors.properties firefox-trunk-41.0~a1~hg20150524r245419/security/manager/locales/en-US/chrome/pipnss/nsserrors.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/locales/en-US/chrome/pipnss/nsserrors.properties	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/locales/en-US/chrome/pipnss/nsserrors.properties	2015-05-25 20:42:34.000000000 +0000
@@ -318,3 +318,4 @@
 MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE=The server presented a certificate that is not yet valid.
 MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE=A certificate that is not yet valid was used to issue the server's certificate.
 MOZILLA_PKIX_ERROR_SIGNATURE_ALGORITHM_MISMATCH=The signature algorithm in the signature field of the certificate does not match the algorithm in its signatureAlgorithm field.
+MOZILLA_PKIX_ERROR_OCSP_RESPONSE_FOR_CERT_MISSING=The OCSP response does not include a status for the certificate being verified.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/moz.build firefox-trunk-41.0~a1~hg20150524r245419/security/manager/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/moz.build	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/moz.build	2015-05-25 20:42:34.000000000 +0000
@@ -6,5 +6,5 @@
 
 DIRS += ['boot', 'ssl', 'locales']
 
-if CONFIG['MOZ_XUL']:
+if CONFIG['MOZ_XUL'] and CONFIG['MOZ_BUILD_APP'] != 'mobile/android':
     DIRS += ['pki']
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/moz.build firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/moz.build	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/moz.build	2015-05-25 20:42:34.000000000 +0000
@@ -4,5 +4,27 @@
 # License, v. 2.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 += ['public', 'resources', 'src']
+DIRS += ['resources']
 
+XPIDL_SOURCES += [
+    'nsIASN1Tree.idl',
+    'nsIPKIParamBlock.idl',
+]
+
+XPIDL_MODULE = 'pippki'
+
+UNIFIED_SOURCES += [
+    'nsASN1Tree.cpp',
+    'nsNSSDialogHelper.cpp',
+    'nsNSSDialogs.cpp',
+    'nsPKIModule.cpp',
+    'nsPKIParamBlock.cpp',
+]
+
+GENERATED_INCLUDES += [
+    '/dist/public/nss',
+]
+
+FAIL_ON_WARNINGS = True
+
+FINAL_LIBRARY = 'xul'
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/nsASN1Tree.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/nsASN1Tree.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/nsASN1Tree.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/nsASN1Tree.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -0,0 +1,577 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 "nsASN1Tree.h"
+#include "nsIComponentManager.h"
+#include "nsString.h"
+#include "nsCRT.h"
+#include "nsIMutableArray.h"
+#include "nsArrayUtils.h"
+
+NS_IMPL_ISUPPORTS(nsNSSASN1Tree, nsIASN1Tree, nsITreeView)
+
+nsNSSASN1Tree::nsNSSASN1Tree() 
+:mTopNode(nullptr)
+{
+}
+
+nsNSSASN1Tree::~nsNSSASN1Tree()
+{
+  ClearNodes();
+}
+
+void nsNSSASN1Tree::ClearNodesRecursively(myNode *n)
+{
+  myNode *walk = n;
+  while (walk) {
+    myNode *kill = walk;
+
+    if (walk->child) {
+      ClearNodesRecursively(walk->child);
+    }
+    
+    walk = walk->next;
+    delete kill;
+  }
+}
+
+void nsNSSASN1Tree::ClearNodes()
+{
+  ClearNodesRecursively(mTopNode);
+  mTopNode = nullptr;
+}
+
+void nsNSSASN1Tree::InitChildsRecursively(myNode *n)
+{
+  if (!n->obj)
+    return;
+
+  n->seq = do_QueryInterface(n->obj);
+  if (!n->seq)
+    return;
+
+  // If the object is a sequence, there might still be a reason
+  // why it should not be displayed as a container.
+  // If we decide that it has all the properties to justify
+  // displaying as a container, we will create a new child chain.
+  // If we decide, it does not make sense to display as a container,
+  // we forget that it is a sequence by erasing n->seq.
+  // That way, n->seq and n->child will be either both set or both null.
+
+  bool isContainer;
+  n->seq->GetIsValidContainer(&isContainer);
+  if (!isContainer) {
+    n->seq = nullptr;
+    return;
+  }
+
+  nsCOMPtr<nsIMutableArray> asn1Objects;
+  n->seq->GetASN1Objects(getter_AddRefs(asn1Objects));
+  uint32_t numObjects;
+  asn1Objects->GetLength(&numObjects);
+  
+  if (!numObjects) {
+    n->seq = nullptr;
+    return;
+  }
+  
+  myNode *walk = nullptr;
+  myNode *prev = nullptr;
+  
+  uint32_t i;
+  nsCOMPtr<nsISupports> isupports;
+  for (i=0; i<numObjects; i++) {
+    if (0 == i) {
+      n->child = walk = new myNode;
+    }
+    else {
+      walk = new myNode;
+    }
+
+    walk->parent = n;
+    if (prev) {
+      prev->next = walk;
+    }
+  
+    walk->obj = do_QueryElementAt(asn1Objects, i);
+
+    InitChildsRecursively(walk);
+
+    prev = walk;
+  }
+}
+
+void nsNSSASN1Tree::InitNodes()
+{
+  ClearNodes();
+
+  mTopNode = new myNode;
+  mTopNode->obj = mASN1Object;
+
+  InitChildsRecursively(mTopNode);
+}
+
+/* void loadASN1Structure (in nsIASN1Object asn1Object); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::LoadASN1Structure(nsIASN1Object *asn1Object)
+{
+  //
+  // The tree won't automatically re-draw if the contents
+  // have been changed.  So I do a quick test here to let
+  // me know if I should forced the tree to redraw itself
+  // by calling RowCountChanged on it.
+  //
+  bool redraw = (mASN1Object && mTree);
+  int32_t rowsToDelete = 0;
+
+  if (redraw) {
+    // This is the number of rows we will be deleting after
+    // the contents have changed.
+    rowsToDelete = 0-CountVisibleNodes(mTopNode);
+  }
+
+  mASN1Object = asn1Object;
+  InitNodes();
+
+  if (redraw) {
+    // The number of rows in the new content.
+    int32_t newRows = CountVisibleNodes(mTopNode);
+    mTree->BeginUpdateBatch();
+    // Erase all of the old rows.
+    mTree->RowCountChanged(0, rowsToDelete);
+    // Replace them with the new contents
+    mTree->RowCountChanged(0, newRows);
+    mTree->EndUpdateBatch();
+  }
+
+  return NS_OK;
+}
+
+/* readonly attribute long rowCount; */
+NS_IMETHODIMP 
+nsNSSASN1Tree::GetRowCount(int32_t *aRowCount)
+{
+  if (mASN1Object) {
+    *aRowCount = CountVisibleNodes(mTopNode);
+  } else {
+    *aRowCount = 0;
+  }
+  return NS_OK;
+}
+
+/* attribute nsITreeSelection selection; */
+NS_IMETHODIMP 
+nsNSSASN1Tree::GetSelection(nsITreeSelection * *aSelection)
+{
+  *aSelection = mSelection;
+  NS_IF_ADDREF(*aSelection);
+  return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsNSSASN1Tree::SetSelection(nsITreeSelection * aSelection)
+{
+  mSelection = aSelection;
+  return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsNSSASN1Tree::GetRowProperties(int32_t index, nsAString& aProps)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsNSSASN1Tree::GetCellProperties(int32_t row, nsITreeColumn* col, 
+                                 nsAString& aProps)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsNSSASN1Tree::GetColumnProperties(nsITreeColumn* col, nsAString& aProps)
+{
+  return NS_OK;
+}
+
+/* boolean isContainer (in long index); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::IsContainer(int32_t index, bool *_retval)
+{
+  myNode *n = FindNodeFromIndex(index);
+  if (!n)
+    return NS_ERROR_FAILURE;
+
+  *_retval = (n->seq != nullptr);
+  return NS_OK; 
+}
+
+/* boolean isContainerOpen (in long index); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::IsContainerOpen(int32_t index, bool *_retval)
+{
+  myNode *n = FindNodeFromIndex(index);
+  if (!n || !n->seq)
+    return NS_ERROR_FAILURE;
+
+  n->seq->GetIsExpanded(_retval);
+  return NS_OK;
+}
+
+/* boolean isContainerEmpty (in long index); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::IsContainerEmpty(int32_t index, bool *_retval)
+{
+  *_retval = false;
+  return NS_OK;
+}
+
+/* boolean isSeparator (in long index); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::IsSeparator(int32_t index, bool *_retval)
+{
+  *_retval = false;
+  return NS_OK; 
+}
+
+/* long getLevel (in long index); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::GetLevel(int32_t index, int32_t *_retval)
+{
+  int32_t parentIndex;
+  int32_t nodeLevel;
+
+  myNode *n = FindNodeFromIndex(index, &parentIndex, &nodeLevel);
+  if (!n)
+    return NS_ERROR_FAILURE;
+
+  *_retval = nodeLevel;
+  return NS_OK; 
+}
+
+/* Astring getImageSrc (in long row, in nsITreeColumn col); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::GetImageSrc(int32_t row, nsITreeColumn* col, 
+                           nsAString& _retval)
+{
+  return NS_OK;
+}
+
+/* long getProgressMode (in long row, in nsITreeColumn col); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::GetProgressMode(int32_t row, nsITreeColumn* col, int32_t* _retval)
+{
+  return NS_OK;
+}
+
+/* Astring getCellValue (in long row, in nsITreeColumn col); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::GetCellValue(int32_t row, nsITreeColumn* col, 
+                            nsAString& _retval)
+{
+  return NS_OK;
+}
+
+/* Astring getCellText (in long row, in nsITreeColumn col); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::GetCellText(int32_t row, nsITreeColumn* col, 
+                           nsAString& _retval)
+{
+  _retval.Truncate();
+
+  myNode* n = FindNodeFromIndex(row);
+  if (!n)
+    return NS_ERROR_FAILURE;
+
+  // There's only one column for ASN1 dump.
+  return n->obj->GetDisplayName(_retval);
+}
+
+/* wstring getDisplayData (in unsigned long index); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::GetDisplayData(uint32_t index, nsAString &_retval)
+{
+  myNode *n = FindNodeFromIndex(index);
+  if (!n)
+    return NS_ERROR_FAILURE;
+
+  n->obj->GetDisplayValue(_retval);
+  return NS_OK;
+}
+
+/* void setTree (in nsITreeBoxObject tree); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::SetTree(nsITreeBoxObject *tree)
+{
+  mTree = tree;
+  return NS_OK;
+}
+
+/* void toggleOpenState (in long index); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::ToggleOpenState(int32_t index)
+{
+  myNode *n = FindNodeFromIndex(index);
+  if (!n)
+    return NS_ERROR_FAILURE;
+
+  if (!n->seq)
+    return NS_ERROR_FAILURE;
+
+  bool IsExpanded;
+  n->seq->GetIsExpanded(&IsExpanded);
+  int32_t rowCountChange;
+  if (IsExpanded) {
+    rowCountChange = -CountVisibleNodes(n->child);
+    n->seq->SetIsExpanded(false);
+  } else {
+    n->seq->SetIsExpanded(true);
+    rowCountChange = CountVisibleNodes(n->child);
+  }
+  if (mTree)
+    mTree->RowCountChanged(index, rowCountChange);
+  return NS_OK;
+}
+
+/* void cycleHeader (in nsITreeColumn col); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::CycleHeader(nsITreeColumn* col)
+{
+  return NS_OK;
+}
+
+/* void selectionChanged (); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::SelectionChanged()
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void cycleCell (in long row, in nsITreeColumn col); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::CycleCell(int32_t row, nsITreeColumn* col)
+{
+  return NS_OK;
+}
+
+/* boolean isEditable (in long row, in nsITreeColumn col); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::IsEditable(int32_t row, nsITreeColumn* col, 
+                          bool *_retval)
+{
+  *_retval = false;
+  return NS_OK;
+}
+
+/* boolean isSelectable (in long row, in nsITreeColumn col); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::IsSelectable(int32_t row, nsITreeColumn* col, 
+                            bool *_retval)
+{
+  *_retval = false;
+  return NS_OK;
+}
+
+/* void setCellValue (in long row, in nsITreeColumn col, in AString value); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::SetCellValue(int32_t row, nsITreeColumn* col, 
+                            const nsAString& value)
+{
+  return NS_OK;
+}
+
+/* void setCellText (in long row, in nsITreeColumn col, in AString value); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::SetCellText(int32_t row, nsITreeColumn* col, 
+                           const nsAString& value)
+{
+  return NS_OK;
+}
+
+/* void performAction (in wstring action); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::PerformAction(const char16_t *action)
+{
+  return NS_OK;
+}
+
+/* void performActionOnRow (in wstring action, in long row); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::PerformActionOnRow(const char16_t *action, int32_t row)
+{
+  return NS_OK;
+}
+
+/* void performActionOnCell (in wstring action, in long row, in nsITreeColumn col); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::PerformActionOnCell(const char16_t *action, int32_t row, 
+                                   nsITreeColumn* col)
+{
+  return NS_OK;
+}
+
+//
+// CanDrop
+//
+NS_IMETHODIMP nsNSSASN1Tree::CanDrop(int32_t index, int32_t orientation,
+                                     nsIDOMDataTransfer* aDataTransfer, bool *_retval)
+{
+  NS_ENSURE_ARG_POINTER(_retval);
+  *_retval = false;
+  
+  return NS_OK;
+}
+
+
+//
+// Drop
+//
+NS_IMETHODIMP nsNSSASN1Tree::Drop(int32_t row, int32_t orient, nsIDOMDataTransfer* aDataTransfer)
+{
+  return NS_OK;
+}
+
+
+//
+// IsSorted
+//
+// ...
+//
+NS_IMETHODIMP nsNSSASN1Tree::IsSorted(bool *_retval)
+{
+  *_retval = false;
+  return NS_OK;
+}
+
+
+/* long getParentIndex (in long rowIndex); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::GetParentIndex(int32_t rowIndex, int32_t *_retval)
+{
+  int32_t parentIndex = -1;
+
+  myNode *n = FindNodeFromIndex(rowIndex, &parentIndex);
+  if (!n)
+    return NS_ERROR_FAILURE;
+
+  *_retval = parentIndex;
+  return NS_OK; 
+}
+
+/* boolean hasNextSibling (in long rowIndex, in long afterIndex); */
+NS_IMETHODIMP 
+nsNSSASN1Tree::HasNextSibling(int32_t rowIndex, int32_t afterIndex, 
+                              bool *_retval)
+{
+  myNode *n = FindNodeFromIndex(rowIndex);
+  if (!n)
+    return NS_ERROR_FAILURE;
+
+  if (!n->next) {
+    *_retval = false;
+  }
+  else {
+    int32_t nTotalSize = CountVisibleNodes(n);
+    int32_t nLastChildPos = rowIndex + nTotalSize -1;
+    int32_t nextSiblingPos = nLastChildPos +1;
+    *_retval = (nextSiblingPos > afterIndex);
+  }
+
+  return NS_OK; 
+}
+
+int32_t nsNSSASN1Tree::CountVisibleNodes(myNode *n)
+{
+  if (!n)
+    return 0;
+
+  myNode *walk = n;
+  int32_t count = 0;
+  
+  while (walk) {
+    ++count;
+
+    if (walk->seq) {
+      bool IsExpanded;
+      walk->seq->GetIsExpanded(&IsExpanded);
+      if (IsExpanded) {
+        count += CountVisibleNodes(walk->child);
+      }
+    }
+
+    walk = walk->next;
+  }
+
+  return count;
+}
+
+// Entry point for find
+nsNSSASN1Tree::myNode *
+nsNSSASN1Tree::FindNodeFromIndex(int32_t wantedIndex, 
+                                 int32_t *optionalOutParentIndex, int32_t *optionalOutLevel)
+{
+  if (0 == wantedIndex) {
+    if (optionalOutLevel) {
+      *optionalOutLevel = 0;
+    }
+    if (optionalOutParentIndex) {
+      *optionalOutParentIndex = -1;
+    }
+    return mTopNode;
+  }
+  else {
+    int32_t index = 0;
+    int32_t level = 0;
+    return FindNodeFromIndex(mTopNode, wantedIndex, index, level, 
+                             optionalOutParentIndex, optionalOutLevel);
+  }
+}
+
+// Internal recursive helper function
+nsNSSASN1Tree::myNode *
+nsNSSASN1Tree::FindNodeFromIndex(myNode *n, int32_t wantedIndex,
+                                 int32_t &index_counter, int32_t &level_counter,
+                                 int32_t *optionalOutParentIndex, int32_t *optionalOutLevel)
+{
+  if (!n)
+    return nullptr;
+
+  myNode *walk = n;
+  int32_t parentIndex = index_counter-1;
+  
+  while (walk) {
+    if (index_counter == wantedIndex) {
+      if (optionalOutLevel) {
+        *optionalOutLevel = level_counter;
+      }
+      if (optionalOutParentIndex) {
+        *optionalOutParentIndex = parentIndex;
+      }
+      return walk;
+    }
+
+    if (walk->seq) {
+      bool IsExpanded;
+      walk->seq->GetIsExpanded(&IsExpanded);
+      if (IsExpanded) {
+        ++index_counter; // set to walk->child
+
+        ++level_counter;
+        myNode *found = FindNodeFromIndex(walk->child, wantedIndex, index_counter, level_counter,
+                                          optionalOutParentIndex, optionalOutLevel);
+        --level_counter;
+
+        if (found)
+          return found;
+      }
+    }
+
+    walk = walk->next;
+    if (walk) {
+      ++index_counter;
+    }
+  }
+
+  return nullptr;
+}
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/nsASN1Tree.h firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/nsASN1Tree.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/nsASN1Tree.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/nsASN1Tree.h	2015-05-25 20:42:34.000000000 +0000
@@ -0,0 +1,72 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#ifndef _NSSASNTREE_H_
+#define _NSSASNTREE_H_
+
+#include "nscore.h"
+#include "nsIX509Cert.h"
+#include "nsIASN1Tree.h"
+#include "nsIASN1Object.h"
+#include "nsIASN1Sequence.h"
+#include "nsITreeView.h"
+#include "nsITreeBoxObject.h"
+#include "nsITreeSelection.h"
+#include "nsCOMPtr.h"
+
+//4bfaa9f0-1dd2-11b2-afae-a82cbaa0b606
+#define NS_NSSASN1OUTINER_CID  {             \
+   0x4bfaa9f0,                               \
+   0x1dd2,                                   \
+   0x11b2,                                   \
+   {0xaf,0xae,0xa8,0x2c,0xba,0xa0,0xb6,0x06} \
+  }
+  
+
+class nsNSSASN1Tree : public nsIASN1Tree
+{
+public:
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_NSIASN1TREE
+  NS_DECL_NSITREEVIEW
+  
+  nsNSSASN1Tree();
+protected:
+  virtual ~nsNSSASN1Tree();
+
+  class myNode
+  {
+  public:
+    nsCOMPtr<nsIASN1Object> obj;
+    nsCOMPtr<nsIASN1Sequence> seq;
+    myNode *child;
+    myNode *next;
+    myNode *parent;
+    
+    myNode() {
+      child = next = parent = nullptr;
+    }
+  };
+
+  myNode *mTopNode;
+
+  nsCOMPtr<nsIASN1Object> mASN1Object;
+  nsCOMPtr<nsITreeSelection> mSelection;
+  nsCOMPtr<nsITreeBoxObject> mTree;
+
+  void InitNodes();
+  void InitChildsRecursively(myNode *n);
+
+  void ClearNodes();
+  void ClearNodesRecursively(myNode *n);
+
+  int32_t CountVisibleNodes(myNode *n);
+  myNode *FindNodeFromIndex(myNode *n, int32_t wantedIndex,
+                            int32_t &index_counter, int32_t &level_counter,
+                            int32_t *optionalOutParentIndex, int32_t *optionalOutLevel);
+  myNode *FindNodeFromIndex(int32_t wantedIndex, 
+                            int32_t *optionalOutParentIndex = nullptr, 
+                            int32_t *optionalOutLevel = nullptr);
+
+};
+#endif //_NSSASNTREE_H_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/nsIASN1Tree.idl firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/nsIASN1Tree.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/nsIASN1Tree.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/nsIASN1Tree.idl	2015-05-25 20:42:34.000000000 +0000
@@ -0,0 +1,25 @@
+/* -*- 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 "nsISupports.idl"
+#include "nsITreeView.idl"
+#include "nsIX509Cert.idl"
+
+[scriptable, uuid(de142307-7b88-4e0a-b232-250f310e25d8)]
+interface nsIASN1Tree : nsITreeView {
+
+  void loadASN1Structure(in nsIASN1Object asn1Object);
+
+  AString getDisplayData(in unsigned long index);
+
+};
+
+%{C++
+
+#define NS_ASN1TREE_CONTRACTID "@mozilla.org/security/nsASN1Tree;1"
+
+%}
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/nsIPKIParamBlock.idl firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/nsIPKIParamBlock.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/nsIPKIParamBlock.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/nsIPKIParamBlock.idl	2015-05-25 20:42:34.000000000 +0000
@@ -0,0 +1,14 @@
+/* -*- 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 "nsISupports.idl"
+
+[scriptable, uuid(b6fe3d78-1dd1-11b2-9058-ced9016984c8)]
+interface nsIPKIParamBlock : nsISupports {
+
+  void setISupportAtIndex(in long index, in nsISupports object);
+  nsISupports getISupportAtIndex(in long index);
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/nsNSSDialogHelper.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/nsNSSDialogHelper.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/nsNSSDialogHelper.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/nsNSSDialogHelper.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -0,0 +1,61 @@
+/* -*- 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 "nsNSSDialogHelper.h"
+#include "nsIWindowWatcher.h"
+#include "nsCOMPtr.h"
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+#include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
+#include "mozilla/dom/ScriptSettings.h"
+
+static const char kOpenDialogParam[] = "centerscreen,chrome,modal,titlebar";
+static const char kOpenWindowParam[] = "centerscreen,chrome,titlebar";
+
+nsresult
+nsNSSDialogHelper::openDialog(
+    nsIDOMWindow *window,
+    const char *url,
+    nsISupports *params,
+    bool modal)
+{
+#ifdef MOZ_WIDGET_GONK
+  // On b2g devices, we need to proxy the dialog creation & management
+  // to Gaia.
+  return NS_ERROR_NOT_IMPLEMENTED;
+#endif
+
+  nsresult rv;
+  nsCOMPtr<nsIWindowWatcher> windowWatcher = 
+           do_GetService(NS_WINDOWWATCHER_CONTRACTID, &rv);
+  if (NS_FAILED(rv)) return rv;
+
+  nsCOMPtr<nsIDOMWindow> parent = window;
+
+  if (!parent) {
+    windowWatcher->GetActiveWindow(getter_AddRefs(parent));
+  }
+
+  // We're loading XUL into this window, and it's happening on behalf of the
+  // system, not on behalf of content. Make sure the initial about:blank window
+  // gets a system principal, otherwise we'll bork when trying to wrap the
+  // nsIKeyGenThread |arguments| property into the unprivileged scoope.
+  MOZ_ASSERT(!strncmp("chrome://", url, strlen("chrome://")));
+  mozilla::dom::AutoNoJSAPI nojsapi;
+
+  nsCOMPtr<nsIDOMWindow> newWindow;
+  rv = windowWatcher->OpenWindow(parent,
+                                 url,
+                                 "_blank",
+                                 modal
+                                 ? kOpenDialogParam
+                                 : kOpenWindowParam,
+                                 params,
+                                 getter_AddRefs(newWindow));
+  return rv;
+}
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/nsNSSDialogHelper.h firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/nsNSSDialogHelper.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/nsNSSDialogHelper.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/nsNSSDialogHelper.h	2015-05-25 20:42:34.000000000 +0000
@@ -0,0 +1,30 @@
+/* -*- 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 nsNSSDialogHelper_h
+#define nsNSSDialogHelper_h
+
+#include "nsIDOMWindow.h"
+
+/**
+ * Common class that uses the window watcher service to open a
+ * standard dialog, with or without a parent context. The params
+ * parameter can be an nsISupportsArray so any number of additional
+ * arguments can be used.
+ */
+class nsNSSDialogHelper
+{
+public:
+  //The params is going to be either a nsIPKIParamBlock or
+  //nsIDialogParamBlock
+  static nsresult openDialog(
+                  nsIDOMWindow *window,
+                  const char *url,
+                  nsISupports *params,
+                  bool modal = true);
+};
+
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/nsNSSDialogs.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/nsNSSDialogs.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/nsNSSDialogs.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/nsNSSDialogs.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -0,0 +1,493 @@
+/* -*- 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/. */
+
+/*
+ * Dialog services for PIP.
+ */
+#include "nsCOMPtr.h"
+#include "nsString.h"
+#include "nsXPIDLString.h"
+#include "nsReadableUtils.h"
+#include "nsIDOMWindow.h"
+#include "nsIDialogParamBlock.h"
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+#include "nsIStringBundle.h"
+#include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
+#include "nsIX509Cert.h"
+#include "nsIX509CertDB.h"
+#include "nsIDateTimeFormat.h"
+#include "nsDateTimeFormatCID.h"
+#include "nsPromiseFlatString.h"
+
+#include "nsNSSDialogs.h"
+#include "nsPKIParamBlock.h"
+#include "nsIKeygenThread.h"
+#include "nsIProtectedAuthThread.h"
+#include "nsNSSDialogHelper.h"
+#include "nsIWindowWatcher.h"
+#include "nsIX509CertValidity.h"
+
+#include "nsEmbedCID.h"
+#include "nsIPromptService.h"
+
+#define PIPSTRING_BUNDLE_URL "chrome://pippki/locale/pippki.properties"
+
+/* ==== */
+
+nsNSSDialogs::nsNSSDialogs()
+{
+}
+
+nsNSSDialogs::~nsNSSDialogs()
+{
+}
+
+NS_IMPL_ISUPPORTS(nsNSSDialogs, nsITokenPasswordDialogs,
+                  nsICertificateDialogs,
+                  nsIClientAuthDialogs,
+                  nsICertPickDialogs,
+                  nsITokenDialogs,
+                  nsIGeneratingKeypairInfoDialogs)
+
+nsresult
+nsNSSDialogs::Init()
+{
+  nsresult rv;
+
+  nsCOMPtr<nsIStringBundleService> service =
+           do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
+  if (NS_FAILED(rv)) return rv;
+  
+  rv = service->CreateBundle(PIPSTRING_BUNDLE_URL,
+                             getter_AddRefs(mPIPStringBundle));
+  return rv;
+}
+
+nsresult
+nsNSSDialogs::SetPassword(nsIInterfaceRequestor *ctx,
+                          const char16_t *tokenName, bool* _canceled)
+{
+  nsresult rv;
+
+  *_canceled = false;
+
+  // Get the parent window for the dialog
+  nsCOMPtr<nsIDOMWindow> parent = do_GetInterface(ctx);
+
+  nsCOMPtr<nsIDialogParamBlock> block =
+           do_CreateInstance(NS_DIALOGPARAMBLOCK_CONTRACTID);
+  if (!block) return NS_ERROR_FAILURE;
+
+  // void ChangePassword(in wstring tokenName, out int status);
+  rv = block->SetString(1, tokenName);
+  if (NS_FAILED(rv)) return rv;
+
+  rv = nsNSSDialogHelper::openDialog(parent,
+                                "chrome://pippki/content/changepassword.xul",
+                                block);
+
+  if (NS_FAILED(rv)) return rv;
+
+  int32_t status;
+
+  rv = block->GetInt(1, &status);
+  if (NS_FAILED(rv)) return rv;
+
+  *_canceled = (status == 0)?true:false;
+
+  return rv;
+}
+
+NS_IMETHODIMP 
+nsNSSDialogs::ConfirmDownloadCACert(nsIInterfaceRequestor *ctx, 
+                                    nsIX509Cert *cert,
+                                    uint32_t *_trust,
+                                    bool *_retval)
+{
+  nsresult rv;
+
+  *_retval = true;
+
+  // Get the parent window for the dialog
+  nsCOMPtr<nsIDOMWindow> parent = do_GetInterface(ctx);
+
+  nsCOMPtr<nsIPKIParamBlock> block =
+           do_CreateInstance(NS_PKIPARAMBLOCK_CONTRACTID);
+  if (!block)
+    return NS_ERROR_FAILURE;
+
+  rv = block->SetISupportAtIndex(1, cert);
+  if (NS_FAILED(rv))
+    return rv;
+
+  rv = nsNSSDialogHelper::openDialog(parent, 
+                                     "chrome://pippki/content/downloadcert.xul",
+                                     block);
+  if (NS_FAILED(rv)) return rv;
+
+  int32_t status;
+  int32_t ssl, email, objsign;
+
+  nsCOMPtr<nsIDialogParamBlock> dlgParamBlock = do_QueryInterface(block);
+  
+  rv = dlgParamBlock->GetInt(1, &status);
+  if (NS_FAILED(rv)) return rv;
+  rv = dlgParamBlock->GetInt(2, &ssl);
+  if (NS_FAILED(rv)) return rv;
+  rv = dlgParamBlock->GetInt(3, &email);
+  if (NS_FAILED(rv)) return rv;
+  rv = dlgParamBlock->GetInt(4, &objsign);
+  if (NS_FAILED(rv)) return rv;
+ 
+  *_trust = nsIX509CertDB::UNTRUSTED;
+  *_trust |= (ssl) ? nsIX509CertDB::TRUSTED_SSL : 0;
+  *_trust |= (email) ? nsIX509CertDB::TRUSTED_EMAIL : 0;
+  *_trust |= (objsign) ? nsIX509CertDB::TRUSTED_OBJSIGN : 0;
+
+  *_retval = (status == 0)?false:true;
+
+  return rv;
+}
+
+
+NS_IMETHODIMP 
+nsNSSDialogs::NotifyCACertExists(nsIInterfaceRequestor *ctx)
+{
+  nsresult rv;
+
+  nsCOMPtr<nsIPromptService> promptSvc(do_GetService(NS_PROMPTSERVICE_CONTRACTID));
+  if (!promptSvc)
+    return NS_ERROR_FAILURE;
+
+  // Get the parent window for the dialog
+  nsCOMPtr<nsIDOMWindow> parent = do_GetInterface(ctx);
+
+  nsAutoString title;
+  rv = mPIPStringBundle->GetStringFromName(MOZ_UTF16("caCertExistsTitle"),
+                                           getter_Copies(title));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsAutoString msg;
+  rv = mPIPStringBundle->GetStringFromName(MOZ_UTF16("caCertExistsMessage"),
+                                           getter_Copies(msg));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = promptSvc->Alert(parent, title.get(), msg.get());
+
+  return rv;
+}
+
+
+NS_IMETHODIMP
+nsNSSDialogs::ChooseCertificate(nsIInterfaceRequestor *ctx, const char16_t *cn, const char16_t *organization, const char16_t *issuer, const char16_t **certNickList, const char16_t **certDetailsList, uint32_t count, int32_t *selectedIndex, bool *canceled) 
+{
+  nsresult rv;
+  uint32_t i;
+
+  *canceled = false;
+
+  // Get the parent window for the dialog
+  nsCOMPtr<nsIDOMWindow> parent = do_GetInterface(ctx);
+
+  nsCOMPtr<nsIDialogParamBlock> block =
+           do_CreateInstance(NS_DIALOGPARAMBLOCK_CONTRACTID);
+  if (!block) return NS_ERROR_FAILURE;
+
+  block->SetNumberStrings(4+count*2);
+
+  rv = block->SetString(0, cn);
+  if (NS_FAILED(rv)) return rv;
+
+  rv = block->SetString(1, organization);
+  if (NS_FAILED(rv)) return rv;
+
+  rv = block->SetString(2, issuer);
+  if (NS_FAILED(rv)) return rv;
+
+  for (i = 0; i < count; i++) {
+    rv = block->SetString(i+3, certNickList[i]);
+    if (NS_FAILED(rv)) return rv;
+  }
+
+  for (i = 0; i < count; i++) {
+    rv = block->SetString(i+count+3, certDetailsList[i]);
+    if (NS_FAILED(rv)) return rv;
+  }
+
+  rv = block->SetInt(0, count);
+  if (NS_FAILED(rv)) return rv;
+
+  rv = nsNSSDialogHelper::openDialog(nullptr,
+                                "chrome://pippki/content/clientauthask.xul",
+                                block);
+  if (NS_FAILED(rv)) return rv;
+
+  int32_t status;
+  rv = block->GetInt(0, &status);
+  if (NS_FAILED(rv)) return rv;
+
+  nsCOMPtr<nsIClientAuthUserDecision> extraResult = do_QueryInterface(ctx);
+  if (extraResult) {
+    int32_t rememberSelection;
+    rv = block->GetInt(2, &rememberSelection);
+    if (NS_SUCCEEDED(rv)) {
+      extraResult->SetRememberClientAuthCertificate(rememberSelection!=0);
+    }
+  }
+
+  *canceled = (status == 0)?true:false;
+  if (!*canceled) {
+    // retrieve the nickname
+    rv = block->GetInt(1, selectedIndex);
+  }
+  return rv;
+}
+
+
+NS_IMETHODIMP
+nsNSSDialogs::PickCertificate(nsIInterfaceRequestor *ctx, 
+                              const char16_t **certNickList, 
+                              const char16_t **certDetailsList, 
+                              uint32_t count, 
+                              int32_t *selectedIndex, 
+                              bool *canceled) 
+{
+  nsresult rv;
+  uint32_t i;
+
+  *canceled = false;
+
+  // Get the parent window for the dialog
+  nsCOMPtr<nsIDOMWindow> parent = do_GetInterface(ctx);
+
+  nsCOMPtr<nsIDialogParamBlock> block =
+           do_CreateInstance(NS_DIALOGPARAMBLOCK_CONTRACTID);
+  if (!block) return NS_ERROR_FAILURE;
+
+  block->SetNumberStrings(1+count*2);
+
+  for (i = 0; i < count; i++) {
+    rv = block->SetString(i, certNickList[i]);
+    if (NS_FAILED(rv)) return rv;
+  }
+
+  for (i = 0; i < count; i++) {
+    rv = block->SetString(i+count, certDetailsList[i]);
+    if (NS_FAILED(rv)) return rv;
+  }
+
+  rv = block->SetInt(0, count);
+  if (NS_FAILED(rv)) return rv;
+
+  rv = block->SetInt(1, *selectedIndex);
+  if (NS_FAILED(rv)) return rv;
+
+  rv = nsNSSDialogHelper::openDialog(nullptr,
+                                "chrome://pippki/content/certpicker.xul",
+                                block);
+  if (NS_FAILED(rv)) return rv;
+
+  int32_t status;
+
+  rv = block->GetInt(0, &status);
+  if (NS_FAILED(rv)) return rv;
+
+  *canceled = (status == 0)?true:false;
+  if (!*canceled) {
+    rv = block->GetInt(1, selectedIndex);
+  }
+  return rv;
+}
+
+
+NS_IMETHODIMP 
+nsNSSDialogs::SetPKCS12FilePassword(nsIInterfaceRequestor *ctx, 
+                                    nsAString &_password,
+                                    bool *_retval)
+{
+  nsresult rv;
+  *_retval = true;
+  // Get the parent window for the dialog
+  nsCOMPtr<nsIDOMWindow> parent = do_GetInterface(ctx);
+  nsCOMPtr<nsIDialogParamBlock> block =
+           do_CreateInstance(NS_DIALOGPARAMBLOCK_CONTRACTID);
+  if (!block) return NS_ERROR_FAILURE;
+  // open up the window
+  rv = nsNSSDialogHelper::openDialog(parent,
+                                  "chrome://pippki/content/setp12password.xul",
+                                  block);
+  if (NS_FAILED(rv)) return rv;
+  // see if user canceled
+  int32_t status;
+  rv = block->GetInt(1, &status);
+  if (NS_FAILED(rv)) return rv;
+  *_retval = (status == 0) ? false : true;
+  if (*_retval) {
+    // retrieve the password
+    char16_t *pw;
+    rv = block->GetString(2, &pw);
+    if (NS_SUCCEEDED(rv)) {
+      _password = pw;
+      free(pw);
+    }
+  }
+  return rv;
+}
+
+NS_IMETHODIMP
+nsNSSDialogs::GetPKCS12FilePassword(nsIInterfaceRequestor* ctx,
+                                    nsAString& _password,
+                                    bool* _retval)
+{
+  *_retval = false;
+
+  nsCOMPtr<nsIPromptService> promptSvc(
+    do_GetService(NS_PROMPTSERVICE_CONTRACTID));
+  if (!promptSvc) {
+    return NS_ERROR_FAILURE;
+  }
+
+  nsAutoString msg;
+  nsresult rv = mPIPStringBundle->GetStringFromName(
+    MOZ_UTF16("getPKCS12FilePasswordMessage"), getter_Copies(msg));
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  // Get the parent window for the dialog
+  nsCOMPtr<nsIDOMWindow> parent = do_GetInterface(ctx);
+  bool ignored = false;
+  char16_t* pwTemp = nullptr;
+  rv = promptSvc->PromptPassword(parent, nullptr, msg.get(), &pwTemp, nullptr,
+                                 &ignored, _retval);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  if (*_retval) {
+    _password.Assign(pwTemp);
+    free(pwTemp);
+  }
+
+  return NS_OK;
+}
+
+/* void viewCert (in nsIX509Cert cert); */
+NS_IMETHODIMP 
+nsNSSDialogs::ViewCert(nsIInterfaceRequestor *ctx, 
+                       nsIX509Cert *cert)
+{
+  nsresult rv;
+
+  nsCOMPtr<nsIPKIParamBlock> block =
+           do_CreateInstance(NS_PKIPARAMBLOCK_CONTRACTID);
+  if (!block)
+    return NS_ERROR_FAILURE;
+
+  rv = block->SetISupportAtIndex(1, cert);
+  if (NS_FAILED(rv))
+    return rv;
+
+  // Get the parent window for the dialog
+  nsCOMPtr<nsIDOMWindow> parent = do_GetInterface(ctx);
+
+  rv = nsNSSDialogHelper::openDialog(parent,
+                                     "chrome://pippki/content/certViewer.xul",
+                                     block,
+                                     false);
+  return rv;
+}
+
+NS_IMETHODIMP
+nsNSSDialogs::DisplayGeneratingKeypairInfo(nsIInterfaceRequestor *aCtx, nsIKeygenThread *runnable) 
+{
+  nsresult rv;
+
+  // Get the parent window for the dialog
+  nsCOMPtr<nsIDOMWindow> parent = do_GetInterface(aCtx);
+
+  rv = nsNSSDialogHelper::openDialog(parent,
+                                     "chrome://pippki/content/createCertInfo.xul",
+                                     runnable);
+  return rv;
+}
+
+NS_IMETHODIMP
+nsNSSDialogs::ChooseToken(nsIInterfaceRequestor *aCtx, const char16_t **aTokenList, uint32_t aCount, char16_t **aTokenChosen, bool *aCanceled) {
+  nsresult rv;
+  uint32_t i;
+
+  *aCanceled = false;
+
+  // Get the parent window for the dialog
+  nsCOMPtr<nsIDOMWindow> parent = do_GetInterface(aCtx);
+
+  nsCOMPtr<nsIDialogParamBlock> block =
+           do_CreateInstance(NS_DIALOGPARAMBLOCK_CONTRACTID);
+  if (!block) return NS_ERROR_FAILURE;
+
+  block->SetNumberStrings(aCount);
+
+  for (i = 0; i < aCount; i++) {
+    rv = block->SetString(i, aTokenList[i]);
+    if (NS_FAILED(rv)) return rv;
+  }
+
+  rv = block->SetInt(0, aCount);
+  if (NS_FAILED(rv)) return rv;
+
+  rv = nsNSSDialogHelper::openDialog(nullptr,
+                                "chrome://pippki/content/choosetoken.xul",
+                                block);
+  if (NS_FAILED(rv)) return rv;
+
+  int32_t status;
+
+  rv = block->GetInt(0, &status);
+  if (NS_FAILED(rv)) return rv;
+
+  *aCanceled = (status == 0)?true:false;
+  if (!*aCanceled) {
+    // retrieve the nickname
+    rv = block->GetString(0, aTokenChosen);
+  }
+  return rv;
+}
+
+NS_IMETHODIMP
+nsNSSDialogs::DisplayProtectedAuth(nsIInterfaceRequestor *aCtx, nsIProtectedAuthThread *runnable)
+{
+    // We cannot use nsNSSDialogHelper here. We cannot allow close widget
+    // in the window because protected authentication is interruptible
+    // from user interface and changing nsNSSDialogHelper's static variable
+    // would not be thread-safe
+    
+    nsresult rv = NS_ERROR_FAILURE;
+    
+    // Get the parent window for the dialog
+    nsCOMPtr<nsIDOMWindow> parent = do_GetInterface(aCtx);
+    
+    nsCOMPtr<nsIWindowWatcher> windowWatcher = 
+        do_GetService("@mozilla.org/embedcomp/window-watcher;1", &rv);
+    if (NS_FAILED(rv))
+        return rv;
+    
+    if (!parent) {
+        windowWatcher->GetActiveWindow(getter_AddRefs(parent));
+    }
+    
+    nsCOMPtr<nsIDOMWindow> newWindow;
+    rv = windowWatcher->OpenWindow(parent,
+        "chrome://pippki/content/protectedAuth.xul",
+        "_blank",
+        "centerscreen,chrome,modal,titlebar,close=no",
+        runnable,
+        getter_AddRefs(newWindow));
+    
+    return rv;
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/nsNSSDialogs.h firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/nsNSSDialogs.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/nsNSSDialogs.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/nsNSSDialogs.h	2015-05-25 20:42:34.000000000 +0000
@@ -0,0 +1,49 @@
+/* -*- 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 __NS_NSSDIALOGS_H__
+#define __NS_NSSDIALOGS_H__
+
+#include "nsITokenPasswordDialogs.h"
+#include "nsICertificateDialogs.h"
+#include "nsIClientAuthDialogs.h"
+#include "nsICertPickDialogs.h"
+#include "nsITokenDialogs.h"
+#include "nsIGenKeypairInfoDlg.h"
+
+#include "nsCOMPtr.h"
+#include "nsIStringBundle.h"
+
+#define NS_NSSDIALOGS_CID \
+  { 0x518e071f, 0x1dd2, 0x11b2, \
+    { 0x93, 0x7e, 0xc4, 0x5f, 0x14, 0xde, 0xf7, 0x78 }}
+
+class nsNSSDialogs
+: public nsITokenPasswordDialogs,
+  public nsICertificateDialogs,
+  public nsIClientAuthDialogs,
+  public nsICertPickDialogs,
+  public nsITokenDialogs,
+  public nsIGeneratingKeypairInfoDialogs
+{
+public:
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_NSITOKENPASSWORDDIALOGS
+  NS_DECL_NSICERTIFICATEDIALOGS
+  NS_DECL_NSICLIENTAUTHDIALOGS
+  NS_DECL_NSICERTPICKDIALOGS
+  NS_DECL_NSITOKENDIALOGS
+  NS_DECL_NSIGENERATINGKEYPAIRINFODIALOGS
+  nsNSSDialogs();
+
+  nsresult Init();
+
+protected:
+  virtual ~nsNSSDialogs();
+  nsCOMPtr<nsIStringBundle> mPIPStringBundle;
+};
+
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/nsPKIModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/nsPKIModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/nsPKIModule.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/nsPKIModule.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -0,0 +1,47 @@
+/* -*- 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/ModuleUtils.h"
+
+#include "nsNSSDialogs.h"
+#include "nsPKIParamBlock.h"
+#include "nsASN1Tree.h"
+
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsNSSDialogs, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPKIParamBlock, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsNSSASN1Tree)
+
+NS_DEFINE_NAMED_CID(NS_NSSDIALOGS_CID);
+NS_DEFINE_NAMED_CID(NS_NSSASN1OUTINER_CID);
+NS_DEFINE_NAMED_CID(NS_PKIPARAMBLOCK_CID);
+
+
+static const mozilla::Module::CIDEntry kPKICIDs[] = {
+  { &kNS_NSSDIALOGS_CID, false, nullptr, nsNSSDialogsConstructor },
+  { &kNS_NSSASN1OUTINER_CID, false, nullptr, nsNSSASN1TreeConstructor },
+  { &kNS_PKIPARAMBLOCK_CID, false, nullptr, nsPKIParamBlockConstructor },
+  { nullptr }
+};
+
+static const mozilla::Module::ContractIDEntry kPKIContracts[] = {
+  { NS_TOKENPASSWORDSDIALOG_CONTRACTID, &kNS_NSSDIALOGS_CID },
+  { NS_CERTIFICATEDIALOGS_CONTRACTID, &kNS_NSSDIALOGS_CID },
+  { NS_CLIENTAUTHDIALOGS_CONTRACTID, &kNS_NSSDIALOGS_CID },
+  { NS_CERTPICKDIALOGS_CONTRACTID, &kNS_NSSDIALOGS_CID },
+  { NS_TOKENDIALOGS_CONTRACTID, &kNS_NSSDIALOGS_CID },
+  { NS_GENERATINGKEYPAIRINFODIALOGS_CONTRACTID, &kNS_NSSDIALOGS_CID },
+  { NS_ASN1TREE_CONTRACTID, &kNS_NSSASN1OUTINER_CID },
+  { NS_PKIPARAMBLOCK_CONTRACTID, &kNS_PKIPARAMBLOCK_CID },
+  { nullptr }
+};
+
+static const mozilla::Module kPKIModule = {
+  mozilla::Module::kVersion,
+  kPKICIDs,
+  kPKIContracts
+};
+
+NSMODULE_DEFN(PKI) = &kPKIModule;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/nsPKIParamBlock.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/nsPKIParamBlock.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/nsPKIParamBlock.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/nsPKIParamBlock.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -0,0 +1,99 @@
+/* -*- 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 "nsPKIParamBlock.h"
+#include "nsIServiceManager.h"
+#include "nsIDialogParamBlock.h"
+#include "nsIMutableArray.h"
+
+NS_IMPL_ISUPPORTS(nsPKIParamBlock, nsIPKIParamBlock, nsIDialogParamBlock)
+
+nsPKIParamBlock::nsPKIParamBlock()
+{
+}
+
+nsresult
+nsPKIParamBlock::Init()
+{
+  mDialogParamBlock = do_CreateInstance(NS_DIALOGPARAMBLOCK_CONTRACTID);
+  return !mDialogParamBlock ? NS_ERROR_OUT_OF_MEMORY : NS_OK;
+}
+
+nsPKIParamBlock::~nsPKIParamBlock()
+{
+}
+
+
+NS_IMETHODIMP 
+nsPKIParamBlock::SetNumberStrings( int32_t inNumStrings )
+{
+  return mDialogParamBlock->SetNumberStrings(inNumStrings);
+}
+
+NS_IMETHODIMP 
+nsPKIParamBlock::SetInt(int32_t inIndex, int32_t inInt)
+{
+  return mDialogParamBlock->SetInt(inIndex, inInt);
+}
+
+NS_IMETHODIMP 
+nsPKIParamBlock::GetInt(int32_t inIndex, int32_t *outInt)
+{
+  return mDialogParamBlock->GetInt(inIndex, outInt);
+}
+
+
+NS_IMETHODIMP 
+nsPKIParamBlock::GetString(int32_t inIndex, char16_t **_retval)
+{
+  return mDialogParamBlock->GetString(inIndex, _retval);
+}
+
+NS_IMETHODIMP 
+nsPKIParamBlock::SetString(int32_t inIndex, const char16_t *inString)
+{
+  return mDialogParamBlock->SetString(inIndex, inString);
+}
+
+NS_IMETHODIMP
+nsPKIParamBlock::GetObjects(nsIMutableArray * *aObjects)
+{
+  return mDialogParamBlock->GetObjects(aObjects);
+}
+
+NS_IMETHODIMP
+nsPKIParamBlock::SetObjects(nsIMutableArray * aObjects)
+{
+  return mDialogParamBlock->SetObjects(aObjects);
+}
+
+
+
+/* void setISupportAtIndex (in int32_t index, in nsISupports object); */
+NS_IMETHODIMP 
+nsPKIParamBlock::SetISupportAtIndex(int32_t index, nsISupports *object)
+{
+  if (!mSupports) {
+    mSupports = do_CreateInstance(NS_SUPPORTSARRAY_CONTRACTID);
+    if (!mSupports) {
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
+  }
+  // Ignore any InsertElementAt error, because this function always did that
+  mSupports->InsertElementAt(object, index-1);
+  return NS_OK;
+}
+
+/* nsISupports getISupportAtIndex (in int32_t index); */
+NS_IMETHODIMP 
+nsPKIParamBlock::GetISupportAtIndex(int32_t index, nsISupports **_retval)
+{
+  NS_ENSURE_ARG(_retval);
+
+  return mSupports->GetElementAt(index - 1, _retval);
+}
+
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/nsPKIParamBlock.h firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/nsPKIParamBlock.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/nsPKIParamBlock.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/nsPKIParamBlock.h	2015-05-25 20:42:34.000000000 +0000
@@ -0,0 +1,36 @@
+/* -*- 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 _NSPKIPARAMBLOCK_
+#define _NSPKIPARAMBLOCK_
+#include "nsCOMPtr.h"
+#include "nsIPKIParamBlock.h"
+#include "nsIDialogParamBlock.h"
+#include "nsISupportsArray.h"
+
+#define NS_PKIPARAMBLOCK_CID \
+  { 0x0bec75a8, 0x1dd2, 0x11b2, \
+    { 0x86, 0x3a, 0xf6, 0x9f, 0x77, 0xc3, 0x13, 0x71 }}
+
+#define NS_PKIPARAMBLOCK_CONTRACTID "@mozilla.org/security/pkiparamblock;1"
+
+class nsPKIParamBlock : public nsIPKIParamBlock,
+                        public nsIDialogParamBlock
+{
+public:
+ 
+  nsPKIParamBlock();
+  nsresult Init();
+
+  NS_DECL_NSIPKIPARAMBLOCK
+  NS_DECL_NSIDIALOGPARAMBLOCK
+  NS_DECL_THREADSAFE_ISUPPORTS
+private:
+  virtual ~nsPKIParamBlock();
+  nsCOMPtr<nsIDialogParamBlock> mDialogParamBlock;
+  nsCOMPtr<nsISupportsArray>    mSupports;
+};
+
+#endif //_NSPKIPARAMBLOCK_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/public/moz.build firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/public/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/public/moz.build	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/public/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/.
-
-XPIDL_SOURCES += [
-    'nsIASN1Tree.idl',
-    'nsIPKIParamBlock.idl',
-]
-
-XPIDL_MODULE = 'pippki'
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/public/nsIASN1Tree.idl firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/public/nsIASN1Tree.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/public/nsIASN1Tree.idl	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/public/nsIASN1Tree.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +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 "nsISupports.idl"
-#include "nsITreeView.idl"
-#include "nsIX509Cert.idl"
-
-[scriptable, uuid(de142307-7b88-4e0a-b232-250f310e25d8)]
-interface nsIASN1Tree : nsITreeView {
-
-  void loadASN1Structure(in nsIASN1Object asn1Object);
-
-  AString getDisplayData(in unsigned long index);
-
-};
-
-%{C++
-
-#define NS_ASN1TREE_CONTRACTID "@mozilla.org/security/nsASN1Tree;1"
-
-%}
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/public/nsIPKIParamBlock.idl firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/public/nsIPKIParamBlock.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/public/nsIPKIParamBlock.idl	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/public/nsIPKIParamBlock.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +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 "nsISupports.idl"
-
-[scriptable, uuid(b6fe3d78-1dd1-11b2-9058-ced9016984c8)]
-interface nsIPKIParamBlock : nsISupports {
-
-  void setISupportAtIndex(in long index, in nsISupports object);
-  nsISupports getISupportAtIndex(in long index);
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/src/moz.build firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/src/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/src/moz.build	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/src/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +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 += [
-    'nsASN1Tree.cpp',
-    'nsNSSDialogHelper.cpp',
-    'nsNSSDialogs.cpp',
-    'nsPKIModule.cpp',
-    'nsPKIParamBlock.cpp',
-]
-
-GENERATED_INCLUDES += [
-    '/dist/public/nss',
-]
-
-FAIL_ON_WARNINGS = True
-
-FINAL_LIBRARY = 'xul'
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/src/nsASN1Tree.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/src/nsASN1Tree.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/src/nsASN1Tree.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/src/nsASN1Tree.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,577 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "nsASN1Tree.h"
-#include "nsIComponentManager.h"
-#include "nsString.h"
-#include "nsCRT.h"
-#include "nsIMutableArray.h"
-#include "nsArrayUtils.h"
-
-NS_IMPL_ISUPPORTS(nsNSSASN1Tree, nsIASN1Tree, nsITreeView)
-
-nsNSSASN1Tree::nsNSSASN1Tree() 
-:mTopNode(nullptr)
-{
-}
-
-nsNSSASN1Tree::~nsNSSASN1Tree()
-{
-  ClearNodes();
-}
-
-void nsNSSASN1Tree::ClearNodesRecursively(myNode *n)
-{
-  myNode *walk = n;
-  while (walk) {
-    myNode *kill = walk;
-
-    if (walk->child) {
-      ClearNodesRecursively(walk->child);
-    }
-    
-    walk = walk->next;
-    delete kill;
-  }
-}
-
-void nsNSSASN1Tree::ClearNodes()
-{
-  ClearNodesRecursively(mTopNode);
-  mTopNode = nullptr;
-}
-
-void nsNSSASN1Tree::InitChildsRecursively(myNode *n)
-{
-  if (!n->obj)
-    return;
-
-  n->seq = do_QueryInterface(n->obj);
-  if (!n->seq)
-    return;
-
-  // If the object is a sequence, there might still be a reason
-  // why it should not be displayed as a container.
-  // If we decide that it has all the properties to justify
-  // displaying as a container, we will create a new child chain.
-  // If we decide, it does not make sense to display as a container,
-  // we forget that it is a sequence by erasing n->seq.
-  // That way, n->seq and n->child will be either both set or both null.
-
-  bool isContainer;
-  n->seq->GetIsValidContainer(&isContainer);
-  if (!isContainer) {
-    n->seq = nullptr;
-    return;
-  }
-
-  nsCOMPtr<nsIMutableArray> asn1Objects;
-  n->seq->GetASN1Objects(getter_AddRefs(asn1Objects));
-  uint32_t numObjects;
-  asn1Objects->GetLength(&numObjects);
-  
-  if (!numObjects) {
-    n->seq = nullptr;
-    return;
-  }
-  
-  myNode *walk = nullptr;
-  myNode *prev = nullptr;
-  
-  uint32_t i;
-  nsCOMPtr<nsISupports> isupports;
-  for (i=0; i<numObjects; i++) {
-    if (0 == i) {
-      n->child = walk = new myNode;
-    }
-    else {
-      walk = new myNode;
-    }
-
-    walk->parent = n;
-    if (prev) {
-      prev->next = walk;
-    }
-  
-    walk->obj = do_QueryElementAt(asn1Objects, i);
-
-    InitChildsRecursively(walk);
-
-    prev = walk;
-  }
-}
-
-void nsNSSASN1Tree::InitNodes()
-{
-  ClearNodes();
-
-  mTopNode = new myNode;
-  mTopNode->obj = mASN1Object;
-
-  InitChildsRecursively(mTopNode);
-}
-
-/* void loadASN1Structure (in nsIASN1Object asn1Object); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::LoadASN1Structure(nsIASN1Object *asn1Object)
-{
-  //
-  // The tree won't automatically re-draw if the contents
-  // have been changed.  So I do a quick test here to let
-  // me know if I should forced the tree to redraw itself
-  // by calling RowCountChanged on it.
-  //
-  bool redraw = (mASN1Object && mTree);
-  int32_t rowsToDelete = 0;
-
-  if (redraw) {
-    // This is the number of rows we will be deleting after
-    // the contents have changed.
-    rowsToDelete = 0-CountVisibleNodes(mTopNode);
-  }
-
-  mASN1Object = asn1Object;
-  InitNodes();
-
-  if (redraw) {
-    // The number of rows in the new content.
-    int32_t newRows = CountVisibleNodes(mTopNode);
-    mTree->BeginUpdateBatch();
-    // Erase all of the old rows.
-    mTree->RowCountChanged(0, rowsToDelete);
-    // Replace them with the new contents
-    mTree->RowCountChanged(0, newRows);
-    mTree->EndUpdateBatch();
-  }
-
-  return NS_OK;
-}
-
-/* readonly attribute long rowCount; */
-NS_IMETHODIMP 
-nsNSSASN1Tree::GetRowCount(int32_t *aRowCount)
-{
-  if (mASN1Object) {
-    *aRowCount = CountVisibleNodes(mTopNode);
-  } else {
-    *aRowCount = 0;
-  }
-  return NS_OK;
-}
-
-/* attribute nsITreeSelection selection; */
-NS_IMETHODIMP 
-nsNSSASN1Tree::GetSelection(nsITreeSelection * *aSelection)
-{
-  *aSelection = mSelection;
-  NS_IF_ADDREF(*aSelection);
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsNSSASN1Tree::SetSelection(nsITreeSelection * aSelection)
-{
-  mSelection = aSelection;
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsNSSASN1Tree::GetRowProperties(int32_t index, nsAString& aProps)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsNSSASN1Tree::GetCellProperties(int32_t row, nsITreeColumn* col, 
-                                 nsAString& aProps)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsNSSASN1Tree::GetColumnProperties(nsITreeColumn* col, nsAString& aProps)
-{
-  return NS_OK;
-}
-
-/* boolean isContainer (in long index); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::IsContainer(int32_t index, bool *_retval)
-{
-  myNode *n = FindNodeFromIndex(index);
-  if (!n)
-    return NS_ERROR_FAILURE;
-
-  *_retval = (n->seq != nullptr);
-  return NS_OK; 
-}
-
-/* boolean isContainerOpen (in long index); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::IsContainerOpen(int32_t index, bool *_retval)
-{
-  myNode *n = FindNodeFromIndex(index);
-  if (!n || !n->seq)
-    return NS_ERROR_FAILURE;
-
-  n->seq->GetIsExpanded(_retval);
-  return NS_OK;
-}
-
-/* boolean isContainerEmpty (in long index); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::IsContainerEmpty(int32_t index, bool *_retval)
-{
-  *_retval = false;
-  return NS_OK;
-}
-
-/* boolean isSeparator (in long index); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::IsSeparator(int32_t index, bool *_retval)
-{
-  *_retval = false;
-  return NS_OK; 
-}
-
-/* long getLevel (in long index); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::GetLevel(int32_t index, int32_t *_retval)
-{
-  int32_t parentIndex;
-  int32_t nodeLevel;
-
-  myNode *n = FindNodeFromIndex(index, &parentIndex, &nodeLevel);
-  if (!n)
-    return NS_ERROR_FAILURE;
-
-  *_retval = nodeLevel;
-  return NS_OK; 
-}
-
-/* Astring getImageSrc (in long row, in nsITreeColumn col); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::GetImageSrc(int32_t row, nsITreeColumn* col, 
-                           nsAString& _retval)
-{
-  return NS_OK;
-}
-
-/* long getProgressMode (in long row, in nsITreeColumn col); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::GetProgressMode(int32_t row, nsITreeColumn* col, int32_t* _retval)
-{
-  return NS_OK;
-}
-
-/* Astring getCellValue (in long row, in nsITreeColumn col); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::GetCellValue(int32_t row, nsITreeColumn* col, 
-                            nsAString& _retval)
-{
-  return NS_OK;
-}
-
-/* Astring getCellText (in long row, in nsITreeColumn col); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::GetCellText(int32_t row, nsITreeColumn* col, 
-                           nsAString& _retval)
-{
-  _retval.Truncate();
-
-  myNode* n = FindNodeFromIndex(row);
-  if (!n)
-    return NS_ERROR_FAILURE;
-
-  // There's only one column for ASN1 dump.
-  return n->obj->GetDisplayName(_retval);
-}
-
-/* wstring getDisplayData (in unsigned long index); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::GetDisplayData(uint32_t index, nsAString &_retval)
-{
-  myNode *n = FindNodeFromIndex(index);
-  if (!n)
-    return NS_ERROR_FAILURE;
-
-  n->obj->GetDisplayValue(_retval);
-  return NS_OK;
-}
-
-/* void setTree (in nsITreeBoxObject tree); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::SetTree(nsITreeBoxObject *tree)
-{
-  mTree = tree;
-  return NS_OK;
-}
-
-/* void toggleOpenState (in long index); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::ToggleOpenState(int32_t index)
-{
-  myNode *n = FindNodeFromIndex(index);
-  if (!n)
-    return NS_ERROR_FAILURE;
-
-  if (!n->seq)
-    return NS_ERROR_FAILURE;
-
-  bool IsExpanded;
-  n->seq->GetIsExpanded(&IsExpanded);
-  int32_t rowCountChange;
-  if (IsExpanded) {
-    rowCountChange = -CountVisibleNodes(n->child);
-    n->seq->SetIsExpanded(false);
-  } else {
-    n->seq->SetIsExpanded(true);
-    rowCountChange = CountVisibleNodes(n->child);
-  }
-  if (mTree)
-    mTree->RowCountChanged(index, rowCountChange);
-  return NS_OK;
-}
-
-/* void cycleHeader (in nsITreeColumn col); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::CycleHeader(nsITreeColumn* col)
-{
-  return NS_OK;
-}
-
-/* void selectionChanged (); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::SelectionChanged()
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void cycleCell (in long row, in nsITreeColumn col); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::CycleCell(int32_t row, nsITreeColumn* col)
-{
-  return NS_OK;
-}
-
-/* boolean isEditable (in long row, in nsITreeColumn col); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::IsEditable(int32_t row, nsITreeColumn* col, 
-                          bool *_retval)
-{
-  *_retval = false;
-  return NS_OK;
-}
-
-/* boolean isSelectable (in long row, in nsITreeColumn col); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::IsSelectable(int32_t row, nsITreeColumn* col, 
-                            bool *_retval)
-{
-  *_retval = false;
-  return NS_OK;
-}
-
-/* void setCellValue (in long row, in nsITreeColumn col, in AString value); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::SetCellValue(int32_t row, nsITreeColumn* col, 
-                            const nsAString& value)
-{
-  return NS_OK;
-}
-
-/* void setCellText (in long row, in nsITreeColumn col, in AString value); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::SetCellText(int32_t row, nsITreeColumn* col, 
-                           const nsAString& value)
-{
-  return NS_OK;
-}
-
-/* void performAction (in wstring action); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::PerformAction(const char16_t *action)
-{
-  return NS_OK;
-}
-
-/* void performActionOnRow (in wstring action, in long row); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::PerformActionOnRow(const char16_t *action, int32_t row)
-{
-  return NS_OK;
-}
-
-/* void performActionOnCell (in wstring action, in long row, in nsITreeColumn col); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::PerformActionOnCell(const char16_t *action, int32_t row, 
-                                   nsITreeColumn* col)
-{
-  return NS_OK;
-}
-
-//
-// CanDrop
-//
-NS_IMETHODIMP nsNSSASN1Tree::CanDrop(int32_t index, int32_t orientation,
-                                     nsIDOMDataTransfer* aDataTransfer, bool *_retval)
-{
-  NS_ENSURE_ARG_POINTER(_retval);
-  *_retval = false;
-  
-  return NS_OK;
-}
-
-
-//
-// Drop
-//
-NS_IMETHODIMP nsNSSASN1Tree::Drop(int32_t row, int32_t orient, nsIDOMDataTransfer* aDataTransfer)
-{
-  return NS_OK;
-}
-
-
-//
-// IsSorted
-//
-// ...
-//
-NS_IMETHODIMP nsNSSASN1Tree::IsSorted(bool *_retval)
-{
-  *_retval = false;
-  return NS_OK;
-}
-
-
-/* long getParentIndex (in long rowIndex); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::GetParentIndex(int32_t rowIndex, int32_t *_retval)
-{
-  int32_t parentIndex = -1;
-
-  myNode *n = FindNodeFromIndex(rowIndex, &parentIndex);
-  if (!n)
-    return NS_ERROR_FAILURE;
-
-  *_retval = parentIndex;
-  return NS_OK; 
-}
-
-/* boolean hasNextSibling (in long rowIndex, in long afterIndex); */
-NS_IMETHODIMP 
-nsNSSASN1Tree::HasNextSibling(int32_t rowIndex, int32_t afterIndex, 
-                              bool *_retval)
-{
-  myNode *n = FindNodeFromIndex(rowIndex);
-  if (!n)
-    return NS_ERROR_FAILURE;
-
-  if (!n->next) {
-    *_retval = false;
-  }
-  else {
-    int32_t nTotalSize = CountVisibleNodes(n);
-    int32_t nLastChildPos = rowIndex + nTotalSize -1;
-    int32_t nextSiblingPos = nLastChildPos +1;
-    *_retval = (nextSiblingPos > afterIndex);
-  }
-
-  return NS_OK; 
-}
-
-int32_t nsNSSASN1Tree::CountVisibleNodes(myNode *n)
-{
-  if (!n)
-    return 0;
-
-  myNode *walk = n;
-  int32_t count = 0;
-  
-  while (walk) {
-    ++count;
-
-    if (walk->seq) {
-      bool IsExpanded;
-      walk->seq->GetIsExpanded(&IsExpanded);
-      if (IsExpanded) {
-        count += CountVisibleNodes(walk->child);
-      }
-    }
-
-    walk = walk->next;
-  }
-
-  return count;
-}
-
-// Entry point for find
-nsNSSASN1Tree::myNode *
-nsNSSASN1Tree::FindNodeFromIndex(int32_t wantedIndex, 
-                                 int32_t *optionalOutParentIndex, int32_t *optionalOutLevel)
-{
-  if (0 == wantedIndex) {
-    if (optionalOutLevel) {
-      *optionalOutLevel = 0;
-    }
-    if (optionalOutParentIndex) {
-      *optionalOutParentIndex = -1;
-    }
-    return mTopNode;
-  }
-  else {
-    int32_t index = 0;
-    int32_t level = 0;
-    return FindNodeFromIndex(mTopNode, wantedIndex, index, level, 
-                             optionalOutParentIndex, optionalOutLevel);
-  }
-}
-
-// Internal recursive helper function
-nsNSSASN1Tree::myNode *
-nsNSSASN1Tree::FindNodeFromIndex(myNode *n, int32_t wantedIndex,
-                                 int32_t &index_counter, int32_t &level_counter,
-                                 int32_t *optionalOutParentIndex, int32_t *optionalOutLevel)
-{
-  if (!n)
-    return nullptr;
-
-  myNode *walk = n;
-  int32_t parentIndex = index_counter-1;
-  
-  while (walk) {
-    if (index_counter == wantedIndex) {
-      if (optionalOutLevel) {
-        *optionalOutLevel = level_counter;
-      }
-      if (optionalOutParentIndex) {
-        *optionalOutParentIndex = parentIndex;
-      }
-      return walk;
-    }
-
-    if (walk->seq) {
-      bool IsExpanded;
-      walk->seq->GetIsExpanded(&IsExpanded);
-      if (IsExpanded) {
-        ++index_counter; // set to walk->child
-
-        ++level_counter;
-        myNode *found = FindNodeFromIndex(walk->child, wantedIndex, index_counter, level_counter,
-                                          optionalOutParentIndex, optionalOutLevel);
-        --level_counter;
-
-        if (found)
-          return found;
-      }
-    }
-
-    walk = walk->next;
-    if (walk) {
-      ++index_counter;
-    }
-  }
-
-  return nullptr;
-}
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/src/nsASN1Tree.h firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/src/nsASN1Tree.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/src/nsASN1Tree.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/src/nsASN1Tree.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifndef _NSSASNTREE_H_
-#define _NSSASNTREE_H_
-
-#include "nscore.h"
-#include "nsIX509Cert.h"
-#include "nsIASN1Tree.h"
-#include "nsIASN1Object.h"
-#include "nsIASN1Sequence.h"
-#include "nsITreeView.h"
-#include "nsITreeBoxObject.h"
-#include "nsITreeSelection.h"
-#include "nsCOMPtr.h"
-
-//4bfaa9f0-1dd2-11b2-afae-a82cbaa0b606
-#define NS_NSSASN1OUTINER_CID  {             \
-   0x4bfaa9f0,                               \
-   0x1dd2,                                   \
-   0x11b2,                                   \
-   {0xaf,0xae,0xa8,0x2c,0xba,0xa0,0xb6,0x06} \
-  }
-  
-
-class nsNSSASN1Tree : public nsIASN1Tree
-{
-public:
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_NSIASN1TREE
-  NS_DECL_NSITREEVIEW
-  
-  nsNSSASN1Tree();
-protected:
-  virtual ~nsNSSASN1Tree();
-
-  class myNode
-  {
-  public:
-    nsCOMPtr<nsIASN1Object> obj;
-    nsCOMPtr<nsIASN1Sequence> seq;
-    myNode *child;
-    myNode *next;
-    myNode *parent;
-    
-    myNode() {
-      child = next = parent = nullptr;
-    }
-  };
-
-  myNode *mTopNode;
-
-  nsCOMPtr<nsIASN1Object> mASN1Object;
-  nsCOMPtr<nsITreeSelection> mSelection;
-  nsCOMPtr<nsITreeBoxObject> mTree;
-
-  void InitNodes();
-  void InitChildsRecursively(myNode *n);
-
-  void ClearNodes();
-  void ClearNodesRecursively(myNode *n);
-
-  int32_t CountVisibleNodes(myNode *n);
-  myNode *FindNodeFromIndex(myNode *n, int32_t wantedIndex,
-                            int32_t &index_counter, int32_t &level_counter,
-                            int32_t *optionalOutParentIndex, int32_t *optionalOutLevel);
-  myNode *FindNodeFromIndex(int32_t wantedIndex, 
-                            int32_t *optionalOutParentIndex = nullptr, 
-                            int32_t *optionalOutLevel = nullptr);
-
-};
-#endif //_NSSASNTREE_H_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/src/nsNSSDialogHelper.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/src/nsNSSDialogHelper.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/src/nsNSSDialogHelper.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/src/nsNSSDialogHelper.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +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 "nsNSSDialogHelper.h"
-#include "nsIWindowWatcher.h"
-#include "nsCOMPtr.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "mozilla/dom/ScriptSettings.h"
-
-static const char kOpenDialogParam[] = "centerscreen,chrome,modal,titlebar";
-static const char kOpenWindowParam[] = "centerscreen,chrome,titlebar";
-
-nsresult
-nsNSSDialogHelper::openDialog(
-    nsIDOMWindow *window,
-    const char *url,
-    nsISupports *params,
-    bool modal)
-{
-#ifdef MOZ_WIDGET_GONK
-  // On b2g devices, we need to proxy the dialog creation & management
-  // to Gaia.
-  return NS_ERROR_NOT_IMPLEMENTED;
-#endif
-
-  nsresult rv;
-  nsCOMPtr<nsIWindowWatcher> windowWatcher = 
-           do_GetService(NS_WINDOWWATCHER_CONTRACTID, &rv);
-  if (NS_FAILED(rv)) return rv;
-
-  nsCOMPtr<nsIDOMWindow> parent = window;
-
-  if (!parent) {
-    windowWatcher->GetActiveWindow(getter_AddRefs(parent));
-  }
-
-  // We're loading XUL into this window, and it's happening on behalf of the
-  // system, not on behalf of content. Make sure the initial about:blank window
-  // gets a system principal, otherwise we'll bork when trying to wrap the
-  // nsIKeyGenThread |arguments| property into the unprivileged scoope.
-  MOZ_ASSERT(!strncmp("chrome://", url, strlen("chrome://")));
-  mozilla::dom::AutoNoJSAPI nojsapi;
-
-  nsCOMPtr<nsIDOMWindow> newWindow;
-  rv = windowWatcher->OpenWindow(parent,
-                                 url,
-                                 "_blank",
-                                 modal
-                                 ? kOpenDialogParam
-                                 : kOpenWindowParam,
-                                 params,
-                                 getter_AddRefs(newWindow));
-  return rv;
-}
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/src/nsNSSDialogHelper.h firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/src/nsNSSDialogHelper.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/src/nsNSSDialogHelper.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/src/nsNSSDialogHelper.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +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 nsNSSDialogHelper_h
-#define nsNSSDialogHelper_h
-
-#include "nsIDOMWindow.h"
-
-/**
- * Common class that uses the window watcher service to open a
- * standard dialog, with or without a parent context. The params
- * parameter can be an nsISupportsArray so any number of additional
- * arguments can be used.
- */
-class nsNSSDialogHelper
-{
-public:
-  //The params is going to be either a nsIPKIParamBlock or
-  //nsIDialogParamBlock
-  static nsresult openDialog(
-                  nsIDOMWindow *window,
-                  const char *url,
-                  nsISupports *params,
-                  bool modal = true);
-};
-
-#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/src/nsNSSDialogs.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/src/nsNSSDialogs.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/src/nsNSSDialogs.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/src/nsNSSDialogs.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,493 +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/. */
-
-/*
- * Dialog services for PIP.
- */
-#include "nsCOMPtr.h"
-#include "nsString.h"
-#include "nsXPIDLString.h"
-#include "nsReadableUtils.h"
-#include "nsIDOMWindow.h"
-#include "nsIDialogParamBlock.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsIStringBundle.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsIX509Cert.h"
-#include "nsIX509CertDB.h"
-#include "nsIDateTimeFormat.h"
-#include "nsDateTimeFormatCID.h"
-#include "nsPromiseFlatString.h"
-
-#include "nsNSSDialogs.h"
-#include "nsPKIParamBlock.h"
-#include "nsIKeygenThread.h"
-#include "nsIProtectedAuthThread.h"
-#include "nsNSSDialogHelper.h"
-#include "nsIWindowWatcher.h"
-#include "nsIX509CertValidity.h"
-
-#include "nsEmbedCID.h"
-#include "nsIPromptService.h"
-
-#define PIPSTRING_BUNDLE_URL "chrome://pippki/locale/pippki.properties"
-
-/* ==== */
-
-nsNSSDialogs::nsNSSDialogs()
-{
-}
-
-nsNSSDialogs::~nsNSSDialogs()
-{
-}
-
-NS_IMPL_ISUPPORTS(nsNSSDialogs, nsITokenPasswordDialogs,
-                  nsICertificateDialogs,
-                  nsIClientAuthDialogs,
-                  nsICertPickDialogs,
-                  nsITokenDialogs,
-                  nsIGeneratingKeypairInfoDialogs)
-
-nsresult
-nsNSSDialogs::Init()
-{
-  nsresult rv;
-
-  nsCOMPtr<nsIStringBundleService> service =
-           do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
-  if (NS_FAILED(rv)) return rv;
-  
-  rv = service->CreateBundle(PIPSTRING_BUNDLE_URL,
-                             getter_AddRefs(mPIPStringBundle));
-  return rv;
-}
-
-nsresult
-nsNSSDialogs::SetPassword(nsIInterfaceRequestor *ctx,
-                          const char16_t *tokenName, bool* _canceled)
-{
-  nsresult rv;
-
-  *_canceled = false;
-
-  // Get the parent window for the dialog
-  nsCOMPtr<nsIDOMWindow> parent = do_GetInterface(ctx);
-
-  nsCOMPtr<nsIDialogParamBlock> block =
-           do_CreateInstance(NS_DIALOGPARAMBLOCK_CONTRACTID);
-  if (!block) return NS_ERROR_FAILURE;
-
-  // void ChangePassword(in wstring tokenName, out int status);
-  rv = block->SetString(1, tokenName);
-  if (NS_FAILED(rv)) return rv;
-
-  rv = nsNSSDialogHelper::openDialog(parent,
-                                "chrome://pippki/content/changepassword.xul",
-                                block);
-
-  if (NS_FAILED(rv)) return rv;
-
-  int32_t status;
-
-  rv = block->GetInt(1, &status);
-  if (NS_FAILED(rv)) return rv;
-
-  *_canceled = (status == 0)?true:false;
-
-  return rv;
-}
-
-NS_IMETHODIMP 
-nsNSSDialogs::ConfirmDownloadCACert(nsIInterfaceRequestor *ctx, 
-                                    nsIX509Cert *cert,
-                                    uint32_t *_trust,
-                                    bool *_retval)
-{
-  nsresult rv;
-
-  *_retval = true;
-
-  // Get the parent window for the dialog
-  nsCOMPtr<nsIDOMWindow> parent = do_GetInterface(ctx);
-
-  nsCOMPtr<nsIPKIParamBlock> block =
-           do_CreateInstance(NS_PKIPARAMBLOCK_CONTRACTID);
-  if (!block)
-    return NS_ERROR_FAILURE;
-
-  rv = block->SetISupportAtIndex(1, cert);
-  if (NS_FAILED(rv))
-    return rv;
-
-  rv = nsNSSDialogHelper::openDialog(parent, 
-                                     "chrome://pippki/content/downloadcert.xul",
-                                     block);
-  if (NS_FAILED(rv)) return rv;
-
-  int32_t status;
-  int32_t ssl, email, objsign;
-
-  nsCOMPtr<nsIDialogParamBlock> dlgParamBlock = do_QueryInterface(block);
-  
-  rv = dlgParamBlock->GetInt(1, &status);
-  if (NS_FAILED(rv)) return rv;
-  rv = dlgParamBlock->GetInt(2, &ssl);
-  if (NS_FAILED(rv)) return rv;
-  rv = dlgParamBlock->GetInt(3, &email);
-  if (NS_FAILED(rv)) return rv;
-  rv = dlgParamBlock->GetInt(4, &objsign);
-  if (NS_FAILED(rv)) return rv;
- 
-  *_trust = nsIX509CertDB::UNTRUSTED;
-  *_trust |= (ssl) ? nsIX509CertDB::TRUSTED_SSL : 0;
-  *_trust |= (email) ? nsIX509CertDB::TRUSTED_EMAIL : 0;
-  *_trust |= (objsign) ? nsIX509CertDB::TRUSTED_OBJSIGN : 0;
-
-  *_retval = (status == 0)?false:true;
-
-  return rv;
-}
-
-
-NS_IMETHODIMP 
-nsNSSDialogs::NotifyCACertExists(nsIInterfaceRequestor *ctx)
-{
-  nsresult rv;
-
-  nsCOMPtr<nsIPromptService> promptSvc(do_GetService(NS_PROMPTSERVICE_CONTRACTID));
-  if (!promptSvc)
-    return NS_ERROR_FAILURE;
-
-  // Get the parent window for the dialog
-  nsCOMPtr<nsIDOMWindow> parent = do_GetInterface(ctx);
-
-  nsAutoString title;
-  rv = mPIPStringBundle->GetStringFromName(MOZ_UTF16("caCertExistsTitle"),
-                                           getter_Copies(title));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsAutoString msg;
-  rv = mPIPStringBundle->GetStringFromName(MOZ_UTF16("caCertExistsMessage"),
-                                           getter_Copies(msg));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = promptSvc->Alert(parent, title.get(), msg.get());
-
-  return rv;
-}
-
-
-NS_IMETHODIMP
-nsNSSDialogs::ChooseCertificate(nsIInterfaceRequestor *ctx, const char16_t *cn, const char16_t *organization, const char16_t *issuer, const char16_t **certNickList, const char16_t **certDetailsList, uint32_t count, int32_t *selectedIndex, bool *canceled) 
-{
-  nsresult rv;
-  uint32_t i;
-
-  *canceled = false;
-
-  // Get the parent window for the dialog
-  nsCOMPtr<nsIDOMWindow> parent = do_GetInterface(ctx);
-
-  nsCOMPtr<nsIDialogParamBlock> block =
-           do_CreateInstance(NS_DIALOGPARAMBLOCK_CONTRACTID);
-  if (!block) return NS_ERROR_FAILURE;
-
-  block->SetNumberStrings(4+count*2);
-
-  rv = block->SetString(0, cn);
-  if (NS_FAILED(rv)) return rv;
-
-  rv = block->SetString(1, organization);
-  if (NS_FAILED(rv)) return rv;
-
-  rv = block->SetString(2, issuer);
-  if (NS_FAILED(rv)) return rv;
-
-  for (i = 0; i < count; i++) {
-    rv = block->SetString(i+3, certNickList[i]);
-    if (NS_FAILED(rv)) return rv;
-  }
-
-  for (i = 0; i < count; i++) {
-    rv = block->SetString(i+count+3, certDetailsList[i]);
-    if (NS_FAILED(rv)) return rv;
-  }
-
-  rv = block->SetInt(0, count);
-  if (NS_FAILED(rv)) return rv;
-
-  rv = nsNSSDialogHelper::openDialog(nullptr,
-                                "chrome://pippki/content/clientauthask.xul",
-                                block);
-  if (NS_FAILED(rv)) return rv;
-
-  int32_t status;
-  rv = block->GetInt(0, &status);
-  if (NS_FAILED(rv)) return rv;
-
-  nsCOMPtr<nsIClientAuthUserDecision> extraResult = do_QueryInterface(ctx);
-  if (extraResult) {
-    int32_t rememberSelection;
-    rv = block->GetInt(2, &rememberSelection);
-    if (NS_SUCCEEDED(rv)) {
-      extraResult->SetRememberClientAuthCertificate(rememberSelection!=0);
-    }
-  }
-
-  *canceled = (status == 0)?true:false;
-  if (!*canceled) {
-    // retrieve the nickname
-    rv = block->GetInt(1, selectedIndex);
-  }
-  return rv;
-}
-
-
-NS_IMETHODIMP
-nsNSSDialogs::PickCertificate(nsIInterfaceRequestor *ctx, 
-                              const char16_t **certNickList, 
-                              const char16_t **certDetailsList, 
-                              uint32_t count, 
-                              int32_t *selectedIndex, 
-                              bool *canceled) 
-{
-  nsresult rv;
-  uint32_t i;
-
-  *canceled = false;
-
-  // Get the parent window for the dialog
-  nsCOMPtr<nsIDOMWindow> parent = do_GetInterface(ctx);
-
-  nsCOMPtr<nsIDialogParamBlock> block =
-           do_CreateInstance(NS_DIALOGPARAMBLOCK_CONTRACTID);
-  if (!block) return NS_ERROR_FAILURE;
-
-  block->SetNumberStrings(1+count*2);
-
-  for (i = 0; i < count; i++) {
-    rv = block->SetString(i, certNickList[i]);
-    if (NS_FAILED(rv)) return rv;
-  }
-
-  for (i = 0; i < count; i++) {
-    rv = block->SetString(i+count, certDetailsList[i]);
-    if (NS_FAILED(rv)) return rv;
-  }
-
-  rv = block->SetInt(0, count);
-  if (NS_FAILED(rv)) return rv;
-
-  rv = block->SetInt(1, *selectedIndex);
-  if (NS_FAILED(rv)) return rv;
-
-  rv = nsNSSDialogHelper::openDialog(nullptr,
-                                "chrome://pippki/content/certpicker.xul",
-                                block);
-  if (NS_FAILED(rv)) return rv;
-
-  int32_t status;
-
-  rv = block->GetInt(0, &status);
-  if (NS_FAILED(rv)) return rv;
-
-  *canceled = (status == 0)?true:false;
-  if (!*canceled) {
-    rv = block->GetInt(1, selectedIndex);
-  }
-  return rv;
-}
-
-
-NS_IMETHODIMP 
-nsNSSDialogs::SetPKCS12FilePassword(nsIInterfaceRequestor *ctx, 
-                                    nsAString &_password,
-                                    bool *_retval)
-{
-  nsresult rv;
-  *_retval = true;
-  // Get the parent window for the dialog
-  nsCOMPtr<nsIDOMWindow> parent = do_GetInterface(ctx);
-  nsCOMPtr<nsIDialogParamBlock> block =
-           do_CreateInstance(NS_DIALOGPARAMBLOCK_CONTRACTID);
-  if (!block) return NS_ERROR_FAILURE;
-  // open up the window
-  rv = nsNSSDialogHelper::openDialog(parent,
-                                  "chrome://pippki/content/setp12password.xul",
-                                  block);
-  if (NS_FAILED(rv)) return rv;
-  // see if user canceled
-  int32_t status;
-  rv = block->GetInt(1, &status);
-  if (NS_FAILED(rv)) return rv;
-  *_retval = (status == 0) ? false : true;
-  if (*_retval) {
-    // retrieve the password
-    char16_t *pw;
-    rv = block->GetString(2, &pw);
-    if (NS_SUCCEEDED(rv)) {
-      _password = pw;
-      free(pw);
-    }
-  }
-  return rv;
-}
-
-NS_IMETHODIMP
-nsNSSDialogs::GetPKCS12FilePassword(nsIInterfaceRequestor* ctx,
-                                    nsAString& _password,
-                                    bool* _retval)
-{
-  *_retval = false;
-
-  nsCOMPtr<nsIPromptService> promptSvc(
-    do_GetService(NS_PROMPTSERVICE_CONTRACTID));
-  if (!promptSvc) {
-    return NS_ERROR_FAILURE;
-  }
-
-  nsAutoString msg;
-  nsresult rv = mPIPStringBundle->GetStringFromName(
-    MOZ_UTF16("getPKCS12FilePasswordMessage"), getter_Copies(msg));
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  // Get the parent window for the dialog
-  nsCOMPtr<nsIDOMWindow> parent = do_GetInterface(ctx);
-  bool ignored = false;
-  char16_t* pwTemp = nullptr;
-  rv = promptSvc->PromptPassword(parent, nullptr, msg.get(), &pwTemp, nullptr,
-                                 &ignored, _retval);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  if (*_retval) {
-    _password.Assign(pwTemp);
-    free(pwTemp);
-  }
-
-  return NS_OK;
-}
-
-/* void viewCert (in nsIX509Cert cert); */
-NS_IMETHODIMP 
-nsNSSDialogs::ViewCert(nsIInterfaceRequestor *ctx, 
-                       nsIX509Cert *cert)
-{
-  nsresult rv;
-
-  nsCOMPtr<nsIPKIParamBlock> block =
-           do_CreateInstance(NS_PKIPARAMBLOCK_CONTRACTID);
-  if (!block)
-    return NS_ERROR_FAILURE;
-
-  rv = block->SetISupportAtIndex(1, cert);
-  if (NS_FAILED(rv))
-    return rv;
-
-  // Get the parent window for the dialog
-  nsCOMPtr<nsIDOMWindow> parent = do_GetInterface(ctx);
-
-  rv = nsNSSDialogHelper::openDialog(parent,
-                                     "chrome://pippki/content/certViewer.xul",
-                                     block,
-                                     false);
-  return rv;
-}
-
-NS_IMETHODIMP
-nsNSSDialogs::DisplayGeneratingKeypairInfo(nsIInterfaceRequestor *aCtx, nsIKeygenThread *runnable) 
-{
-  nsresult rv;
-
-  // Get the parent window for the dialog
-  nsCOMPtr<nsIDOMWindow> parent = do_GetInterface(aCtx);
-
-  rv = nsNSSDialogHelper::openDialog(parent,
-                                     "chrome://pippki/content/createCertInfo.xul",
-                                     runnable);
-  return rv;
-}
-
-NS_IMETHODIMP
-nsNSSDialogs::ChooseToken(nsIInterfaceRequestor *aCtx, const char16_t **aTokenList, uint32_t aCount, char16_t **aTokenChosen, bool *aCanceled) {
-  nsresult rv;
-  uint32_t i;
-
-  *aCanceled = false;
-
-  // Get the parent window for the dialog
-  nsCOMPtr<nsIDOMWindow> parent = do_GetInterface(aCtx);
-
-  nsCOMPtr<nsIDialogParamBlock> block =
-           do_CreateInstance(NS_DIALOGPARAMBLOCK_CONTRACTID);
-  if (!block) return NS_ERROR_FAILURE;
-
-  block->SetNumberStrings(aCount);
-
-  for (i = 0; i < aCount; i++) {
-    rv = block->SetString(i, aTokenList[i]);
-    if (NS_FAILED(rv)) return rv;
-  }
-
-  rv = block->SetInt(0, aCount);
-  if (NS_FAILED(rv)) return rv;
-
-  rv = nsNSSDialogHelper::openDialog(nullptr,
-                                "chrome://pippki/content/choosetoken.xul",
-                                block);
-  if (NS_FAILED(rv)) return rv;
-
-  int32_t status;
-
-  rv = block->GetInt(0, &status);
-  if (NS_FAILED(rv)) return rv;
-
-  *aCanceled = (status == 0)?true:false;
-  if (!*aCanceled) {
-    // retrieve the nickname
-    rv = block->GetString(0, aTokenChosen);
-  }
-  return rv;
-}
-
-NS_IMETHODIMP
-nsNSSDialogs::DisplayProtectedAuth(nsIInterfaceRequestor *aCtx, nsIProtectedAuthThread *runnable)
-{
-    // We cannot use nsNSSDialogHelper here. We cannot allow close widget
-    // in the window because protected authentication is interruptible
-    // from user interface and changing nsNSSDialogHelper's static variable
-    // would not be thread-safe
-    
-    nsresult rv = NS_ERROR_FAILURE;
-    
-    // Get the parent window for the dialog
-    nsCOMPtr<nsIDOMWindow> parent = do_GetInterface(aCtx);
-    
-    nsCOMPtr<nsIWindowWatcher> windowWatcher = 
-        do_GetService("@mozilla.org/embedcomp/window-watcher;1", &rv);
-    if (NS_FAILED(rv))
-        return rv;
-    
-    if (!parent) {
-        windowWatcher->GetActiveWindow(getter_AddRefs(parent));
-    }
-    
-    nsCOMPtr<nsIDOMWindow> newWindow;
-    rv = windowWatcher->OpenWindow(parent,
-        "chrome://pippki/content/protectedAuth.xul",
-        "_blank",
-        "centerscreen,chrome,modal,titlebar,close=no",
-        runnable,
-        getter_AddRefs(newWindow));
-    
-    return rv;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/src/nsNSSDialogs.h firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/src/nsNSSDialogs.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/src/nsNSSDialogs.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/src/nsNSSDialogs.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +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 __NS_NSSDIALOGS_H__
-#define __NS_NSSDIALOGS_H__
-
-#include "nsITokenPasswordDialogs.h"
-#include "nsICertificateDialogs.h"
-#include "nsIClientAuthDialogs.h"
-#include "nsICertPickDialogs.h"
-#include "nsITokenDialogs.h"
-#include "nsIGenKeypairInfoDlg.h"
-
-#include "nsCOMPtr.h"
-#include "nsIStringBundle.h"
-
-#define NS_NSSDIALOGS_CID \
-  { 0x518e071f, 0x1dd2, 0x11b2, \
-    { 0x93, 0x7e, 0xc4, 0x5f, 0x14, 0xde, 0xf7, 0x78 }}
-
-class nsNSSDialogs
-: public nsITokenPasswordDialogs,
-  public nsICertificateDialogs,
-  public nsIClientAuthDialogs,
-  public nsICertPickDialogs,
-  public nsITokenDialogs,
-  public nsIGeneratingKeypairInfoDialogs
-{
-public:
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_NSITOKENPASSWORDDIALOGS
-  NS_DECL_NSICERTIFICATEDIALOGS
-  NS_DECL_NSICLIENTAUTHDIALOGS
-  NS_DECL_NSICERTPICKDIALOGS
-  NS_DECL_NSITOKENDIALOGS
-  NS_DECL_NSIGENERATINGKEYPAIRINFODIALOGS
-  nsNSSDialogs();
-
-  nsresult Init();
-
-protected:
-  virtual ~nsNSSDialogs();
-  nsCOMPtr<nsIStringBundle> mPIPStringBundle;
-};
-
-#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/src/nsPKIModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/src/nsPKIModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/src/nsPKIModule.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/src/nsPKIModule.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +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 "mozilla/ModuleUtils.h"
-
-#include "nsNSSDialogs.h"
-#include "nsPKIParamBlock.h"
-#include "nsASN1Tree.h"
-
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsNSSDialogs, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPKIParamBlock, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsNSSASN1Tree)
-
-NS_DEFINE_NAMED_CID(NS_NSSDIALOGS_CID);
-NS_DEFINE_NAMED_CID(NS_NSSASN1OUTINER_CID);
-NS_DEFINE_NAMED_CID(NS_PKIPARAMBLOCK_CID);
-
-
-static const mozilla::Module::CIDEntry kPKICIDs[] = {
-  { &kNS_NSSDIALOGS_CID, false, nullptr, nsNSSDialogsConstructor },
-  { &kNS_NSSASN1OUTINER_CID, false, nullptr, nsNSSASN1TreeConstructor },
-  { &kNS_PKIPARAMBLOCK_CID, false, nullptr, nsPKIParamBlockConstructor },
-  { nullptr }
-};
-
-static const mozilla::Module::ContractIDEntry kPKIContracts[] = {
-  { NS_TOKENPASSWORDSDIALOG_CONTRACTID, &kNS_NSSDIALOGS_CID },
-  { NS_CERTIFICATEDIALOGS_CONTRACTID, &kNS_NSSDIALOGS_CID },
-  { NS_CLIENTAUTHDIALOGS_CONTRACTID, &kNS_NSSDIALOGS_CID },
-  { NS_CERTPICKDIALOGS_CONTRACTID, &kNS_NSSDIALOGS_CID },
-  { NS_TOKENDIALOGS_CONTRACTID, &kNS_NSSDIALOGS_CID },
-  { NS_GENERATINGKEYPAIRINFODIALOGS_CONTRACTID, &kNS_NSSDIALOGS_CID },
-  { NS_ASN1TREE_CONTRACTID, &kNS_NSSASN1OUTINER_CID },
-  { NS_PKIPARAMBLOCK_CONTRACTID, &kNS_PKIPARAMBLOCK_CID },
-  { nullptr }
-};
-
-static const mozilla::Module kPKIModule = {
-  mozilla::Module::kVersion,
-  kPKICIDs,
-  kPKIContracts
-};
-
-NSMODULE_DEFN(PKI) = &kPKIModule;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/src/nsPKIParamBlock.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/src/nsPKIParamBlock.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/src/nsPKIParamBlock.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/src/nsPKIParamBlock.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,99 +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 "nsPKIParamBlock.h"
-#include "nsIServiceManager.h"
-#include "nsIDialogParamBlock.h"
-#include "nsIMutableArray.h"
-
-NS_IMPL_ISUPPORTS(nsPKIParamBlock, nsIPKIParamBlock, nsIDialogParamBlock)
-
-nsPKIParamBlock::nsPKIParamBlock()
-{
-}
-
-nsresult
-nsPKIParamBlock::Init()
-{
-  mDialogParamBlock = do_CreateInstance(NS_DIALOGPARAMBLOCK_CONTRACTID);
-  return !mDialogParamBlock ? NS_ERROR_OUT_OF_MEMORY : NS_OK;
-}
-
-nsPKIParamBlock::~nsPKIParamBlock()
-{
-}
-
-
-NS_IMETHODIMP 
-nsPKIParamBlock::SetNumberStrings( int32_t inNumStrings )
-{
-  return mDialogParamBlock->SetNumberStrings(inNumStrings);
-}
-
-NS_IMETHODIMP 
-nsPKIParamBlock::SetInt(int32_t inIndex, int32_t inInt)
-{
-  return mDialogParamBlock->SetInt(inIndex, inInt);
-}
-
-NS_IMETHODIMP 
-nsPKIParamBlock::GetInt(int32_t inIndex, int32_t *outInt)
-{
-  return mDialogParamBlock->GetInt(inIndex, outInt);
-}
-
-
-NS_IMETHODIMP 
-nsPKIParamBlock::GetString(int32_t inIndex, char16_t **_retval)
-{
-  return mDialogParamBlock->GetString(inIndex, _retval);
-}
-
-NS_IMETHODIMP 
-nsPKIParamBlock::SetString(int32_t inIndex, const char16_t *inString)
-{
-  return mDialogParamBlock->SetString(inIndex, inString);
-}
-
-NS_IMETHODIMP
-nsPKIParamBlock::GetObjects(nsIMutableArray * *aObjects)
-{
-  return mDialogParamBlock->GetObjects(aObjects);
-}
-
-NS_IMETHODIMP
-nsPKIParamBlock::SetObjects(nsIMutableArray * aObjects)
-{
-  return mDialogParamBlock->SetObjects(aObjects);
-}
-
-
-
-/* void setISupportAtIndex (in int32_t index, in nsISupports object); */
-NS_IMETHODIMP 
-nsPKIParamBlock::SetISupportAtIndex(int32_t index, nsISupports *object)
-{
-  if (!mSupports) {
-    mSupports = do_CreateInstance(NS_SUPPORTSARRAY_CONTRACTID);
-    if (!mSupports) {
-      return NS_ERROR_OUT_OF_MEMORY;
-    }
-  }
-  // Ignore any InsertElementAt error, because this function always did that
-  mSupports->InsertElementAt(object, index-1);
-  return NS_OK;
-}
-
-/* nsISupports getISupportAtIndex (in int32_t index); */
-NS_IMETHODIMP 
-nsPKIParamBlock::GetISupportAtIndex(int32_t index, nsISupports **_retval)
-{
-  NS_ENSURE_ARG(_retval);
-
-  return mSupports->GetElementAt(index - 1, _retval);
-}
-
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/src/nsPKIParamBlock.h firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/src/nsPKIParamBlock.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/pki/src/nsPKIParamBlock.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/pki/src/nsPKIParamBlock.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/. */
-#ifndef _NSPKIPARAMBLOCK_
-#define _NSPKIPARAMBLOCK_
-#include "nsCOMPtr.h"
-#include "nsIPKIParamBlock.h"
-#include "nsIDialogParamBlock.h"
-#include "nsISupportsArray.h"
-
-#define NS_PKIPARAMBLOCK_CID \
-  { 0x0bec75a8, 0x1dd2, 0x11b2, \
-    { 0x86, 0x3a, 0xf6, 0x9f, 0x77, 0xc3, 0x13, 0x71 }}
-
-#define NS_PKIPARAMBLOCK_CONTRACTID "@mozilla.org/security/pkiparamblock;1"
-
-class nsPKIParamBlock : public nsIPKIParamBlock,
-                        public nsIDialogParamBlock
-{
-public:
- 
-  nsPKIParamBlock();
-  nsresult Init();
-
-  NS_DECL_NSIPKIPARAMBLOCK
-  NS_DECL_NSIDIALOGPARAMBLOCK
-  NS_DECL_THREADSAFE_ISUPPORTS
-private:
-  virtual ~nsPKIParamBlock();
-  nsCOMPtr<nsIDialogParamBlock> mDialogParamBlock;
-  nsCOMPtr<nsISupportsArray>    mSupports;
-};
-
-#endif //_NSPKIPARAMBLOCK_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/CryptoTask.h firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/CryptoTask.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/CryptoTask.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/CryptoTask.h	2015-05-25 20:42:34.000000000 +0000
@@ -50,7 +50,7 @@
   {
     static_assert(LEN <= 15,
                   "Thread name must be no more than 15 characters");
-    return Dispatch(NS_LITERAL_CSTRING(taskThreadName));
+    return Dispatch(nsDependentCString(taskThreadName, LEN - 1));
   }
 
   nsresult Dispatch(const nsACString& taskThreadName);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsCertOverrideService.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsCertOverrideService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsCertOverrideService.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsCertOverrideService.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -29,7 +29,7 @@
 using namespace mozilla;
 using namespace mozilla::psm;
 
-static const char kCertOverrideFileName[] = "cert_override.txt";
+#define CERT_OVERRIDE_FILE_NAME "cert_override.txt"
 
 void
 nsCertOverride::convertBitsToString(OverrideBits ob, nsACString &str)
@@ -144,7 +144,7 @@
 
     nsresult rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(mSettingsFile));
     if (NS_SUCCEEDED(rv)) {
-      mSettingsFile->AppendNative(NS_LITERAL_CSTRING(kCertOverrideFileName));
+      mSettingsFile->AppendNative(NS_LITERAL_CSTRING(CERT_OVERRIDE_FILE_NAME));
     } else {
       mSettingsFile = nullptr;
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsCertTree.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsCertTree.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsCertTree.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsCertTree.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -22,7 +22,7 @@
 #include "nsTHashtable.h"
 #include "nsHashKeys.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 using namespace mozilla;
 
@@ -438,7 +438,7 @@
                                        nsCertCompareFunc  aCertCmpFn,
                                        void *aCertCmpFnArg)
 {
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("GetCertsByTypeFromCertList"));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("GetCertsByTypeFromCertList"));
   if (!aCertList)
     return NS_ERROR_FAILURE;
 
@@ -1360,23 +1360,23 @@
 {
   for (int i=0; i<mNumOrgs; i++) {
     nsAutoString org(mTreeArray[i].orgName);
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("ORG[%s]", NS_LossyConvertUTF16toASCII(org).get()));
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("OPEN[%d]", mTreeArray[i].open));
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("INDEX[%d]", mTreeArray[i].certIndex));
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NCHILD[%d]", mTreeArray[i].numChildren));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("ORG[%s]", NS_LossyConvertUTF16toASCII(org).get()));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("OPEN[%d]", mTreeArray[i].open));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("INDEX[%d]", mTreeArray[i].certIndex));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NCHILD[%d]", mTreeArray[i].numChildren));
   }
   for (int i=0; i<mNumRows; i++) {
     treeArrayEl *el = GetThreadDescAtIndex(i);
     if (el) {
       nsAutoString td(el->orgName);
-      PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("thread desc[%d]: %s", i, NS_LossyConvertUTF16toASCII(td).get()));
+      MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("thread desc[%d]: %s", i, NS_LossyConvertUTF16toASCII(td).get()));
     }
     nsCOMPtr<nsIX509Cert> ct = GetCertAtIndex(i);
     if (ct) {
       char16_t *goo;
       ct->GetCommonName(&goo);
       nsAutoString doo(goo);
-      PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("cert [%d]: %s", i, NS_LossyConvertUTF16toASCII(doo).get()));
+      MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("cert [%d]: %s", i, NS_LossyConvertUTF16toASCII(doo).get()));
     }
   }
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsNSSCallbacks.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsNSSCallbacks.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsNSSCallbacks.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsNSSCallbacks.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -275,7 +275,7 @@
                                                         const char **http_response_data, 
                                                         uint32_t *http_response_data_len)
 {
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
          ("nsNSSHttpRequestSession::trySendAndReceiveFcn to %s\n", mURL.get()));
 
   bool onSTSThread;
@@ -313,7 +313,7 @@
     {
       if (retryable_error)
       {
-        PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+        MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
                ("nsNSSHttpRequestSession::trySendAndReceiveFcn - sleeping and retrying: %d of %d\n",
                 retry_count, max_retries));
       }
@@ -335,10 +335,10 @@
   if (retry_count > 1)
   {
     if (retryable_error)
-      PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+      MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
              ("nsNSSHttpRequestSession::trySendAndReceiveFcn - still failing, giving up...\n"));
     else
-      PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+      MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
              ("nsNSSHttpRequestSession::trySendAndReceiveFcn - success at attempt %d\n",
               retry_count));
   }
@@ -660,7 +660,7 @@
   
   if (NS_FAILED(aStatus))
   {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("nsHTTPListener::OnStreamComplete status failed %d", aStatus));
   }
 
@@ -953,7 +953,7 @@
   SSLCipherSuiteInfo cipherInfo;
   if (SSL_GetCipherSuiteInfo(channelInfo.cipherSuite, &cipherInfo,
                              sizeof (cipherInfo)) != SECSuccess) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("CanFalseStartCallback [%p] failed - "
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("CanFalseStartCallback [%p] failed - "
                                       " KEA %d\n", fd,
                                       static_cast<int32_t>(cipherInfo.keaType)));
     return SECSuccess;
@@ -964,7 +964,7 @@
   // Prevent version downgrade attacks from TLS 1.2, and avoid False Start for
   // TLS 1.3 and later. See Bug 861310 for all the details as to why.
   if (channelInfo.protocolVersion != SSL_LIBRARY_VERSION_TLS_1_2) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("CanFalseStartCallback [%p] failed - "
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("CanFalseStartCallback [%p] failed - "
                                       "SSL Version must be TLS 1.2, was %x\n", fd,
                                       static_cast<int32_t>(channelInfo.protocolVersion)));
     reasonsForNotFalseStarting |= POSSIBLE_VERSION_DOWNGRADE;
@@ -972,7 +972,7 @@
 
   // See bug 952863 for why ECDHE is allowed, but DHE (and RSA) are not.
   if (cipherInfo.keaType != ssl_kea_ecdh) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("CanFalseStartCallback [%p] failed - "
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("CanFalseStartCallback [%p] failed - "
                                       "unsupported KEA %d\n", fd,
                                       static_cast<int32_t>(cipherInfo.keaType)));
     reasonsForNotFalseStarting |= KEA_NOT_SUPPORTED;
@@ -982,7 +982,7 @@
   // mode due to BEAST, POODLE, and other attacks on the MAC-then-Encrypt
   // design. See bug 1109766 for more details.
   if (cipherInfo.symCipher != ssl_calg_aes_gcm) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("CanFalseStartCallback [%p] failed - Symmetric cipher used, %d, "
             "is not supported with False Start.\n", fd,
             static_cast<int32_t>(cipherInfo.symCipher)));
@@ -1001,7 +1001,7 @@
     nsAutoCString negotiatedNPN;
     if (NS_FAILED(infoObject->GetNegotiatedNPN(negotiatedNPN)) ||
         !negotiatedNPN.Length()) {
-      PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("CanFalseStartCallback [%p] failed - "
+      MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("CanFalseStartCallback [%p] failed - "
                                         "NPN cannot be verified\n", fd));
       reasonsForNotFalseStarting |= NPN_NOT_NEGOTIATED;
     }
@@ -1014,7 +1014,7 @@
     *canFalseStart = PR_TRUE;
     infoObject->SetFalseStarted();
     infoObject->NoteTimeUntilReady();
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("CanFalseStartCallback [%p] ok\n", fd));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("CanFalseStartCallback [%p] ok\n", fd));
   }
 
   return SECSuccess;
@@ -1124,7 +1124,7 @@
 
   SSLVersionRange versions(infoObject->GetTLSVersionRange());
 
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
          ("[%p] HandshakeCallback: succeeded using TLS version range (0x%04x,0x%04x)\n",
           fd, static_cast<unsigned int>(versions.min),
               static_cast<unsigned int>(versions.max)));
@@ -1269,12 +1269,12 @@
                                                              status);
 
   if (status->HasServerCert()) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("HandshakeCallback KEEPING existing cert\n"));
   } else {
     ScopedCERTCertificate serverCert(SSL_PeerCertificate(fd));
     RefPtr<nsNSSCertificate> nssc(nsNSSCertificate::Create(serverCert.get()));
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("HandshakeCallback using NEW cert %p\n", nssc.get()));
     status->SetServerCert(nssc, nsNSSCertificate::ev_status_unknown);
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsNSSCertificate.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsNSSCertificate.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsNSSCertificate.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsNSSCertificate.cpp	2015-05-25 20:42:35.000000000 +0000
@@ -822,7 +822,7 @@
 
   NS_ENSURE_ARG(_rvChain);
   nsresult rv;
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Getting chain for \"%s\"\n", mCert->nickname));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Getting chain for \"%s\"\n", mCert->nickname));
 
   mozilla::pkix::Time now(mozilla::pkix::Now());
 
@@ -856,7 +856,7 @@
     if ((usage & otherUsagesToTest) == 0) {
       continue;
     }
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("pipnss: PKIX attempting chain(%d) for '%s'\n",
             usage, mCert->nickname));
     if (certVerifier->VerifyCert(mCert.get(), usage, now,
@@ -874,7 +874,7 @@
     // There is not verified path for the chain, howeever we still want to 
     // present to the user as much of a possible chain as possible, in the case
     // where there was a problem with the cert or the issuers.
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("pipnss: getchain :CertVerify failed to get chain for '%s'\n",
             mCert->nickname));
     nssChain = CERT_GetCertChainFromCert(mCert.get(), PR_Now(),
@@ -895,7 +895,7 @@
   for (node = CERT_LIST_HEAD(nssChain.get());
        !CERT_LIST_END(node, nssChain.get());
        node = CERT_LIST_NEXT(node)) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("adding %s to chain\n", node->cert->nickname));
     nsCOMPtr<nsIX509Cert> cert = nsNSSCertificate::Create(node->cert);
     array->AppendElement(cert, false);
@@ -921,7 +921,7 @@
 
   // Get the slots from NSS
   ScopedPK11SlotList slots;
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Getting slots for \"%s\"\n", mCert->nickname));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Getting slots for \"%s\"\n", mCert->nickname));
   slots = PK11_GetAllSlotsForCert(mCert.get(), nullptr);
   if (!slots) {
     if (PORT_GetError() == SEC_ERROR_NO_TOKEN)
@@ -1148,7 +1148,7 @@
 
   ScopedNSSCMSMessage cmsg(NSS_CMSMessage_Create(nullptr));
   if (!cmsg) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("nsNSSCertificate::ExportAsCMS - can't create CMS message\n"));
     return NS_ERROR_OUT_OF_MEMORY;
   }
@@ -1157,7 +1157,7 @@
   ScopedNSSCMSSignedData sigd(
     NSS_CMSSignedData_CreateCertsOnly(cmsg, mCert.get(), false));
   if (!sigd) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("nsNSSCertificate::ExportAsCMS - can't create SignedData\n"));
     return NS_ERROR_FAILURE;
   }
@@ -1183,7 +1183,7 @@
           certChain.forget();
         }
         else {
-          PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+          MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
                  ("nsNSSCertificate::ExportAsCMS - can't add chain\n"));
           return NS_ERROR_FAILURE;
         }
@@ -1195,7 +1195,7 @@
           issuerCert.forget();
         }
         else {
-          PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+          MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
                  ("nsNSSCertificate::ExportAsCMS - can't add issuer cert\n"));
           return NS_ERROR_FAILURE;
         }
@@ -1209,14 +1209,14 @@
     sigd.forget();
   }
   else {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("nsNSSCertificate::ExportAsCMS - can't attach SignedData\n"));
     return NS_ERROR_FAILURE;
   }
 
   ScopedPLArenaPool arena(PORT_NewArena(1024));
   if (!arena) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("nsNSSCertificate::ExportAsCMS - out of memory\n"));
     return NS_ERROR_OUT_OF_MEMORY;
   }
@@ -1227,13 +1227,13 @@
                                                    nullptr, nullptr, nullptr,
                                                    nullptr, nullptr);
   if (!ecx) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("nsNSSCertificate::ExportAsCMS - can't create encoder context\n"));
     return NS_ERROR_FAILURE;
   }
 
   if (NSS_CMSEncoder_Finish(ecx) != SECSuccess) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("nsNSSCertificate::ExportAsCMS - failed to add encoded data\n"));
     return NS_ERROR_FAILURE;
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsNSSCertificateDB.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsNSSCertificateDB.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsNSSCertificateDB.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsNSSCertificateDB.cpp	2015-05-25 20:42:35.000000000 +0000
@@ -106,13 +106,13 @@
   char *asciiname = nullptr;
   NS_ConvertUTF16toUTF8 aUtf8Nickname(nickname);
   asciiname = const_cast<char*>(aUtf8Nickname.get());
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Getting \"%s\"\n", asciiname));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Getting \"%s\"\n", asciiname));
   cert = PK11_FindCertFromNickname(asciiname, nullptr);
   if (!cert) {
     cert = CERT_FindCertByNickname(CERT_GetDefaultCertDB(), asciiname);
   }
   if (cert) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("got it\n"));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("got it\n"));
     nsCOMPtr<nsIX509Cert> pCert = nsNSSCertificate::Create(cert.get());
     if (pCert) {
       pCert.forget(_rvCert);
@@ -345,7 +345,7 @@
   if (NS_FAILED(rv))
     return rv;
 
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Creating temp cert\n"));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Creating temp cert\n"));
   CERTCertDBHandle *certdb = CERT_GetDefaultCertDB();
   ScopedCERTCertificate tmpCert(CERT_FindCertByDERCert(certdb, &der));
   if (!tmpCert) {
@@ -380,11 +380,11 @@
   if (!allows)
     return NS_ERROR_NOT_AVAILABLE;
 
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("trust is %d\n", trustBits));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("trust is %d\n", trustBits));
   nsXPIDLCString nickname;
   nickname.Adopt(CERT_MakeCANickname(tmpCert.get()));
 
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Created nick \"%s\"\n", nickname.get()));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Created nick \"%s\"\n", nickname.get()));
 
   nsNSSCertTrust trust;
   trust.SetValidCA();
@@ -966,7 +966,7 @@
     srv = CERT_ChangeCertTrust(CERT_GetDefaultCertDB(), 
                                cert.get(), trust.GetTrust());
   }
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("cert deleted: %d", srv));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("cert deleted: %d", srv));
   return (srv) ? NS_ERROR_FAILURE : NS_OK;
 }
 
@@ -1220,7 +1220,7 @@
   uint32_t numcerts = 0, i=0;
   char16_t **tmpArray = nullptr;
 
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("List of certs %d:\n", type));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("List of certs %d:\n", type));
   for (node = CERT_LIST_HEAD(certList);
        !CERT_LIST_END(node, certList);
        node = CERT_LIST_NEXT(node)) {
@@ -1228,7 +1228,7 @@
       numcerts++;
     }
   }
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("num certs: %d\n", numcerts));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("num certs: %d\n", numcerts));
   int nc = (numcerts == 0) ? 1 : numcerts;
   tmpArray = (char16_t **)moz_xmalloc(sizeof(char16_t *) * nc);
   if (numcerts == 0) goto finish;
@@ -1611,7 +1611,7 @@
   rv = newCert->GetRawDER(&der.len, (uint8_t **)&der.data);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Creating temp cert\n"));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Creating temp cert\n"));
   CERTCertDBHandle *certdb = CERT_GetDefaultCertDB();
   ScopedCERTCertificate tmpCert(CERT_FindCertByDERCert(certdb, &der));
   if (!tmpCert)
@@ -1635,7 +1635,7 @@
   nsXPIDLCString nickname;
   nickname.Adopt(CERT_MakeCANickname(tmpCert.get()));
 
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Created nick \"%s\"\n", nickname.get()));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Created nick \"%s\"\n", nickname.get()));
 
   rv = attemptToLogInWithDefaultPassword();
   if (NS_WARN_IF(rv != NS_OK)) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsNSSComponent.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsNSSComponent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsNSSComponent.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsNSSComponent.cpp	2015-05-25 20:42:35.000000000 +0000
@@ -181,15 +181,17 @@
 }
 
 static void
-GetOCSPBehaviorFromPrefs(/*out*/ CertVerifier::OcspDownloadConfig* odc,
-                         /*out*/ CertVerifier::OcspStrictConfig* osc,
-                         /*out*/ CertVerifier::OcspGetConfig* ogc,
-                         const MutexAutoLock& /*proofOfLock*/)
+GetRevocationBehaviorFromPrefs(/*out*/ CertVerifier::OcspDownloadConfig* odc,
+                               /*out*/ CertVerifier::OcspStrictConfig* osc,
+                               /*out*/ CertVerifier::OcspGetConfig* ogc,
+                               /*out*/ uint32_t* certShortLifetimeInDays,
+                               const MutexAutoLock& /*proofOfLock*/)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(odc);
   MOZ_ASSERT(osc);
   MOZ_ASSERT(ogc);
+  MOZ_ASSERT(certShortLifetimeInDays);
 
   // 0 = disabled, otherwise enabled
   *odc = Preferences::GetInt("security.OCSP.enabled", 1)
@@ -205,6 +207,13 @@
        ? CertVerifier::ocspGetEnabled
        : CertVerifier::ocspGetDisabled;
 
+  // If we pass in just 0 as the second argument to Preferences::GetUint, there
+  // are two function signatures that match (given that 0 can be intepreted as
+  // a null pointer). Thus the compiler will complain without the cast.
+  *certShortLifetimeInDays =
+    Preferences::GetUint("security.pki.cert_short_lifetime_in_days",
+                         static_cast<uint32_t>(0));
+
   SSL_ClearSessionCache();
 }
 
@@ -218,7 +227,7 @@
 {
   if (!gPIPNSSLog)
     gPIPNSSLog = PR_NewLogModule("pipnss");
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent::ctor\n"));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent::ctor\n"));
   mObserversRegistered = false;
 
   NS_ASSERTION( (0 == mInstanceCount), "nsNSSComponent is a singleton, but instantiated multiple times!");
@@ -256,7 +265,7 @@
 
 nsNSSComponent::~nsNSSComponent()
 {
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent::dtor\n"));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent::dtor\n"));
 
   deleteBackgroundThreads();
 
@@ -272,7 +281,7 @@
   // potential nss initialization later.
   EnsureNSSInitialized(nssShutdown);
 
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent::dtor finished\n"));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent::dtor finished\n"));
 }
 
 NS_IMETHODIMP
@@ -362,7 +371,7 @@
     SECMODModuleList* list;
     SECMODListLock* lock = SECMOD_GetDefaultModuleListLock();
     if (!lock) {
-        PR_LOG(gPIPNSSLog, PR_LOG_ERROR,
+        MOZ_LOG(gPIPNSSLog, PR_LOG_ERROR,
                ("Couldn't get the module list lock, can't launch smart card threads\n"));
         return;
     }
@@ -430,7 +439,7 @@
     SECMODModuleList* list;
     SECMODListLock* lock = SECMOD_GetDefaultModuleListLock();
     if (!lock) {
-        PR_LOG(gPIPNSSLog, PR_LOG_ERROR,
+        MOZ_LOG(gPIPNSSLog, PR_LOG_ERROR,
                ("Couldn't get the module list lock, can't install loadable roots\n"));
         return;
     }
@@ -875,9 +884,13 @@
   CertVerifier::OcspDownloadConfig odc;
   CertVerifier::OcspStrictConfig osc;
   CertVerifier::OcspGetConfig ogc;
+  uint32_t certShortLifetimeInDays;
 
-  GetOCSPBehaviorFromPrefs(&odc, &osc, &ogc, lock);
-  mDefaultCertVerifier = new SharedCertVerifier(odc, osc, ogc, pinningMode);
+  GetRevocationBehaviorFromPrefs(&odc, &osc, &ogc, &certShortLifetimeInDays,
+                                 lock);
+  mDefaultCertVerifier = new SharedCertVerifier(odc, osc, ogc,
+                                                certShortLifetimeInDays,
+                                                pinningMode);
 }
 
 // Enable the TLS versions given in the prefs, defaulting to TLS 1.0 (min) and
@@ -917,7 +930,7 @@
   aProfilePath.Truncate();
   const char* dbDirOverride = getenv("MOZPSM_NSSDBDIR_OVERRIDE");
   if (dbDirOverride && strlen(dbDirOverride) > 0) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("Using specified MOZPSM_NSSDBDIR_OVERRIDE as NSS DB dir: %s\n",
             dbDirOverride));
     aProfilePath.Assign(dbDirOverride);
@@ -928,7 +941,7 @@
   nsresult rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
                                        getter_AddRefs(profileFile));
   if (NS_FAILED(rv)) {
-    PR_LOG(gPIPNSSLog, PR_LOG_ERROR,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_ERROR,
            ("Unable to get profile directory - continuing with no NSS DB\n"));
     return NS_OK;
   }
@@ -938,7 +951,7 @@
   // codepage, using short (canonical) path as workaround.
   nsCOMPtr<nsILocalFileWin> profileFileWin(do_QueryInterface(profileFile));
   if (!profileFileWin) {
-    PR_LOG(gPIPNSSLog, PR_LOG_ERROR,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_ERROR,
            ("Could not get nsILocalFileWin for profile directory.\n"));
     return NS_ERROR_FAILURE;
   }
@@ -947,7 +960,7 @@
   rv = profileFile->GetNativePath(aProfilePath);
 #endif
   if (NS_FAILED(rv)) {
-    PR_LOG(gPIPNSSLog, PR_LOG_ERROR,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_ERROR,
            ("Could not get native path for profile directory.\n"));
     return rv;
   }
@@ -961,7 +974,7 @@
   // Can be called both during init and profile change.
   // Needs mutex protection.
 
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent::InitializeNSS\n"));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent::InitializeNSS\n"));
 
   static_assert(nsINSSErrorsService::NSS_SEC_ERROR_BASE == SEC_ERROR_BASE &&
                 nsINSSErrorsService::NSS_SEC_ERROR_LIMIT == SEC_ERROR_LIMIT &&
@@ -978,7 +991,7 @@
     return NS_ERROR_FAILURE;
   }
 
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NSS Initialization beginning\n"));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NSS Initialization beginning\n"));
 
   // The call to ConfigureInternalPKCS11Token needs to be done before NSS is initialized,
   // but affects only static data.
@@ -1001,11 +1014,11 @@
     SECStatus init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false);
     // If that fails, attempt read-only mode.
     if (init_rv != SECSuccess) {
-      PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init NSS r/w in %s\n", profileStr.get()));
+      MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init NSS r/w in %s\n", profileStr.get()));
       init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), true);
     }
     if (init_rv != SECSuccess) {
-      PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n"));
+      MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n"));
     }
   }
   // If we haven't succeeded in initializing the DB in our profile
@@ -1015,7 +1028,7 @@
     init_rv = NSS_NoDB_Init(nullptr);
   }
   if (init_rv != SECSuccess) {
-    PR_LOG(gPIPNSSLog, PR_LOG_ERROR, ("could not initialize NSS - panicking\n"));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_ERROR, ("could not initialize NSS - panicking\n"));
     nsPSMInitPanic::SetPanic();
     return NS_ERROR_NOT_AVAILABLE;
   }
@@ -1068,7 +1081,7 @@
                                             ALPN_ENABLED_DEFAULT));
 
   if (NS_FAILED(InitializeCipherSuite())) {
-    PR_LOG(gPIPNSSLog, PR_LOG_ERROR, ("Unable to initialize cipher suite settings\n"));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_ERROR, ("Unable to initialize cipher suite settings\n"));
     return NS_ERROR_FAILURE;
   }
 
@@ -1093,12 +1106,12 @@
   nsCOMPtr<nsISiteSecurityService> sssService =
     do_GetService(NS_SSSERVICE_CONTRACTID);
   if (!sssService) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Cannot initialize site security service\n"));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Cannot initialize site security service\n"));
     return NS_ERROR_FAILURE;
   }
 
 
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NSS Initialization done\n"));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NSS Initialization done\n"));
   return NS_OK;
 }
 
@@ -1108,7 +1121,7 @@
   // Can be called both during init and profile change,
   // needs mutex protection.
 
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent::ShutdownNSS\n"));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent::ShutdownNSS\n"));
 
   MutexAutoLock lock(mutex);
 
@@ -1119,7 +1132,7 @@
 
     Preferences::RemoveObserver(this, "security.");
     if (NS_FAILED(CipherSuiteChangeObserver::StopObserve())) {
-      PR_LOG(gPIPNSSLog, PR_LOG_ERROR, ("nsNSSComponent::ShutdownNSS cannot stop observing cipher suite change\n"));
+      MOZ_LOG(gPIPNSSLog, PR_LOG_ERROR, ("nsNSSComponent::ShutdownNSS cannot stop observing cipher suite change\n"));
     }
 
 #ifndef MOZ_NO_SMART_CARDS
@@ -1130,14 +1143,14 @@
 #ifndef MOZ_NO_EV_CERTS
     CleanupIdentityInfo();
 #endif
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("evaporating psm resources\n"));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("evaporating psm resources\n"));
     mShutdownObjectList->evaporateAllNSSResources();
     EnsureNSSInitialized(nssShutdown);
     if (SECSuccess != ::NSS_Shutdown()) {
-      PR_LOG(gPIPNSSLog, PR_LOG_ALWAYS, ("NSS SHUTDOWN FAILURE\n"));
+      MOZ_LOG(gPIPNSSLog, PR_LOG_ALWAYS, ("NSS SHUTDOWN FAILURE\n"));
     }
     else {
-      PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NSS shutdown =====>> OK <<=====\n"));
+      MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NSS shutdown =====>> OK <<=====\n"));
     }
   }
 }
@@ -1150,17 +1163,17 @@
 
   nsresult rv = NS_OK;
 
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Beginning NSS initialization\n"));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Beginning NSS initialization\n"));
 
   if (!mShutdownObjectList)
   {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NSS init, out of memory in constructor\n"));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NSS init, out of memory in constructor\n"));
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
   rv = InitializePIPNSSBundle();
   if (NS_FAILED(rv)) {
-    PR_LOG(gPIPNSSLog, PR_LOG_ERROR, ("Unable to create pipnss bundle.\n"));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_ERROR, ("Unable to create pipnss bundle.\n"));
     return rv;
   }
 
@@ -1182,7 +1195,7 @@
 
   rv = InitializeNSS();
   if (NS_FAILED(rv)) {
-    PR_LOG(gPIPNSSLog, PR_LOG_ERROR, ("Unable to Initialize NSS.\n"));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_ERROR, ("Unable to Initialize NSS.\n"));
 
     DeregisterObservers();
     mPIPNSSBundle = nullptr;
@@ -1194,7 +1207,7 @@
   createBackgroundThreads();
   if (!mCertVerificationThread)
   {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NSS init, could not create threads\n"));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NSS init, could not create threads\n"));
 
     DeregisterObservers();
     mPIPNSSBundle = nullptr;
@@ -1257,11 +1270,11 @@
                         const char16_t* someData)
 {
   if (nsCRT::strcmp(aTopic, PROFILE_CHANGE_TEARDOWN_TOPIC) == 0) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("in PSM code, receiving change-teardown\n"));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("in PSM code, receiving change-teardown\n"));
     DoProfileChangeTeardown(aSubject);
   }
   else if (nsCRT::strcmp(aTopic, PROFILE_BEFORE_CHANGE_TOPIC) == 0) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("receiving profile change topic\n"));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("receiving profile change topic\n"));
     DoProfileBeforeChange(aSubject);
   }
   else if (nsCRT::strcmp(aTopic, PROFILE_DO_CHANGE_TOPIC) == 0) {
@@ -1293,13 +1306,13 @@
 
     if (needsInit) {
       if (NS_FAILED(InitializeNSS())) {
-        PR_LOG(gPIPNSSLog, PR_LOG_ERROR, ("Unable to Initialize NSS after profile switch.\n"));
+        MOZ_LOG(gPIPNSSLog, PR_LOG_ERROR, ("Unable to Initialize NSS after profile switch.\n"));
       }
     }
   }
   else if (nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID) == 0) {
 
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent: XPCom shutdown observed\n"));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent: XPCom shutdown observed\n"));
 
     // Cleanup code that requires services, it's too late in destructor.
 
@@ -1344,6 +1357,7 @@
     } else if (prefName.EqualsLiteral("security.OCSP.enabled") ||
                prefName.EqualsLiteral("security.OCSP.require") ||
                prefName.EqualsLiteral("security.OCSP.GET.enabled") ||
+               prefName.EqualsLiteral("security.pki.cert_short_lifetime_in_days") ||
                prefName.EqualsLiteral("security.ssl.enable_ocsp_stapling") ||
                prefName.EqualsLiteral("security.cert_pinning.enforcement_level")) {
       MutexAutoLock lock(mutex);
@@ -1355,11 +1369,11 @@
       SSL_ClearSessionCache();
   }
   else if (nsCRT::strcmp(aTopic, PROFILE_CHANGE_NET_TEARDOWN_TOPIC) == 0) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("receiving network teardown topic\n"));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("receiving network teardown topic\n"));
     DoProfileChangeNetTeardown();
   }
   else if (nsCRT::strcmp(aTopic, PROFILE_CHANGE_NET_RESTORE_TOPIC) == 0) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("receiving network restore topic\n"));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("receiving network restore topic\n"));
     DoProfileChangeNetRestore();
   }
 
@@ -1443,7 +1457,7 @@
   NS_ASSERTION(observerService, "could not get observer service");
   if (observerService) {
     mObserversRegistered = true;
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent: adding observers\n"));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent: adding observers\n"));
 
     // We are a service.
     // Once we are loaded, don't allow being removed from memory.
@@ -1473,7 +1487,7 @@
   NS_ASSERTION(observerService, "could not get observer service");
   if (observerService) {
     mObserversRegistered = false;
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent: removing observers\n"));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent: removing observers\n"));
 
     observerService->RemoveObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID);
 
@@ -1548,7 +1562,8 @@
 {
   MutexAutoLock lock(mutex);
   MOZ_ASSERT(mNSSInitialized);
-  return mDefaultCertVerifier;
+  RefPtr<SharedCertVerifier> certVerifier(mDefaultCertVerifier);
+  return certVerifier.forget();
 }
 
 namespace mozilla { namespace psm {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsNSSIOLayer.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsNSSIOLayer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsNSSIOLayer.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsNSSIOLayer.cpp	2015-05-25 20:42:35.000000000 +0000
@@ -14,7 +14,7 @@
 #include "mozilla/UniquePtr.h"
 #include "mozilla/Telemetry.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prmem.h"
 #include "prnetdb.h"
 #include "nsIPrefService.h"
@@ -243,7 +243,7 @@
   // This will include TCP and proxy tunnel wait time
   Telemetry::AccumulateTimeDelta(Telemetry::SSL_TIME_UNTIL_READY,
                                  mSocketCreationTimestamp, TimeStamp::Now());
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
          ("[%p] nsNSSSocketInfo::NoteTimeUntilReady\n", mFd));
 }
 
@@ -287,7 +287,7 @@
 
     mHandshakeCompleted = true;
 
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("[%p] nsNSSSocketInfo::SetHandshakeCompleted\n", (void*) mFd));
 
     mIsFullHandshake = false; // reset for next handshake on this connection
@@ -651,7 +651,7 @@
 nsSSLIOLayerConnect(PRFileDesc* fd, const PRNetAddr* addr,
                     PRIntervalTime timeout)
 {
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("[%p] connecting SSL socket\n",
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("[%p] connecting SSL socket\n",
          (void*) fd));
   nsNSSShutDownPreventionLock locker;
   if (!getSocketInfoIfRunning(fd, not_reading_or_writing, locker))
@@ -659,12 +659,12 @@
 
   PRStatus status = fd->lower->methods->connect(fd->lower, addr, timeout);
   if (status != PR_SUCCESS) {
-    PR_LOG(gPIPNSSLog, PR_LOG_ERROR, ("[%p] Lower layer connect error: %d\n",
+    MOZ_LOG(gPIPNSSLog, PR_LOG_ERROR, ("[%p] Lower layer connect error: %d\n",
                                       (void*) fd, PR_GetError()));
     return status;
   }
 
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("[%p] Connect\n", (void*) fd));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("[%p] Connect\n", (void*) fd));
   return status;
 }
 
@@ -915,7 +915,7 @@
   if (!fd)
     return PR_FAILURE;
 
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("[%p] Shutting down socket\n",
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("[%p] Shutting down socket\n",
          (void*) fd));
 
   nsNSSSocketInfo* socketInfo = (nsNSSSocketInfo*) fd->secret;
@@ -989,7 +989,7 @@
     ch = buf[i];
 
     if (l == DUMPBUF_LINESIZE) {
-      PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("%s%s\n", hexbuf, chrbuf));
+      MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("%s%s\n", hexbuf, chrbuf));
       (void) memset(hexbuf, 0x20, DUMPBUF_LINESIZE*3);
       (void) memset(chrbuf, 0x20, DUMPBUF_LINESIZE);
       h = hexbuf;
@@ -1010,7 +1010,7 @@
     }
     i++; l++;
   }
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("%s%s\n", hexbuf, chrbuf));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("%s%s\n", hexbuf, chrbuf));
 }
 
 #define DEBUG_DUMP_BUFFER(buf,len) nsDumpBuffer(buf,len)
@@ -1234,7 +1234,7 @@
   }
 
   if (wantRetry) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("[%p] checkHandshake: will retry with lower max TLS version\n",
             ssl_layer_fd));
     // We want to cause the network layer to retry the connection.
@@ -1285,7 +1285,7 @@
   if (!socketInfo) {
     // If we get here, it is probably because certificate validation failed
     // and this is the first I/O operation after the failure.
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
             ("[%p] polling SSL socket right after certificate verification failed "
                   "or NSS shutdown or SDR logout %d\n",
              fd, (int) in_flags));
@@ -1299,7 +1299,7 @@
     return in_flags;
   }
 
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
          (socketInfo->IsWaitingForCertVerification()
             ?  "[%p] polling SSL socket during certificate verification using lower %d\n"
             :  "[%p] poll SSL socket using lower %d\n",
@@ -1310,7 +1310,7 @@
   // it reaches any point that would be unsafe to send/receive something before
   // cert validation is complete.
   int16_t result = fd->lower->methods->poll(fd->lower, in_flags, out_flags);
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("[%p] poll SSL socket returned %d\n",
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("[%p] poll SSL socket returned %d\n",
                                     (void*) fd, (int) result));
   return result;
 }
@@ -1416,7 +1416,7 @@
   int32_t bytesRead = fd->lower->methods->recv(fd->lower, buf, amount, flags,
                                                timeout);
 
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("[%p] read %d bytes\n", (void*) fd,
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("[%p] read %d bytes\n", (void*) fd,
          bytesRead));
 
 #ifdef DEBUG_SSL_VERBOSE
@@ -1447,7 +1447,7 @@
   int32_t bytesWritten = fd->lower->methods->send(fd->lower, buf, amount,
                                                   flags, timeout);
 
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("[%p] wrote %d bytes\n",
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("[%p] wrote %d bytes\n",
          fd, bytesWritten));
 
   return checkHandshake(bytesWritten, false, fd, socketInfo);
@@ -2037,7 +2037,7 @@
     // joined on this connection, because we only show the user one hostname
     // (mHostName) in the client certificate UI.
 
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("[%p] Not returning client cert due to previous join\n", socket));
     *pRetCert = nullptr;
     *pRetKey = nullptr;
@@ -2470,7 +2470,7 @@
                             infoObject);
   }
   if (flags & nsISocketProvider::MITM_OK) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("[%p] nsSSLIOLayerImportFD: bypass authentication flag\n", fd));
     infoObject->SetBypassAuthentication(true);
   }
@@ -2519,7 +2519,7 @@
   infoObject->SharedState().IOLayerHelpers()
     .adjustForTLSIntolerance(infoObject->GetHostName(), infoObject->GetPort(),
                              range, strongCiphersStatus);
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
          ("[%p] nsSSLIOLayerSetOptions: using TLS version range (0x%04x,0x%04x)%s\n",
           fd, static_cast<unsigned int>(range.min),
               static_cast<unsigned int>(range.max),
@@ -2537,7 +2537,7 @@
   // when adjustForTLSIntolerance tweaks the maximum version downward,
   // we tell the server using this SCSV so they can detect a downgrade attack
   if (range.max < maxEnabledVersion) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("[%p] nsSSLIOLayerSetOptions: enabling TLS_FALLBACK_SCSV\n", fd));
     if (SECSuccess != SSL_OptionSet(fd, SSL_ENABLE_FALLBACK_SCSV, true)) {
       return NS_ERROR_FAILURE;
@@ -2645,7 +2645,7 @@
 
   nsNSSShutDownList::trackSSLSocketCreate();
 
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("[%p] Socket set up\n", (void*) sslSock));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("[%p] Socket set up\n", (void*) sslSock));
   infoObject->QueryInterface(NS_GET_IID(nsISupports), (void**) (info));
 
   // We are going use a clear connection first //
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsNSSShutDown.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsNSSShutDown.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsNSSShutDown.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsNSSShutDown.cpp	2015-05-25 20:42:35.000000000 +0000
@@ -39,22 +39,15 @@
 nsNSSShutDownList *nsNSSShutDownList::singleton = nullptr;
 
 nsNSSShutDownList::nsNSSShutDownList()
-:mListLock("nsNSSShutDownList.mListLock")
+  : mListLock("nsNSSShutDownList.mListLock")
+  , mActiveSSLSockets(0)
+  , mObjects(&gSetOps, sizeof(ObjectHashEntry))
+  , mPK11LogoutCancelObjects(&gSetOps, sizeof(ObjectHashEntry))
 {
-  mActiveSSLSockets = 0;
-  PL_DHashTableInit(&mObjects, &gSetOps, sizeof(ObjectHashEntry));
-  PL_DHashTableInit(&mPK11LogoutCancelObjects, &gSetOps,
-                    sizeof(ObjectHashEntry));
 }
 
 nsNSSShutDownList::~nsNSSShutDownList()
 {
-  if (mObjects.IsInitialized()) {
-    PL_DHashTableFinish(&mObjects);
-  }
-  if (mPK11LogoutCancelObjects.IsInitialized()) {
-    PL_DHashTableFinish(&mPK11LogoutCancelObjects);
-  }
   PR_ASSERT(this == singleton);
   singleton = nullptr;
 }
@@ -133,7 +126,7 @@
 
 nsresult nsNSSShutDownList::doPK11Logout()
 {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("canceling all open SSL sockets to disallow future IO\n"));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("canceling all open SSL sockets to disallow future IO\n"));
   // During our iteration we will set a bunch of PRBools to true.
   // Nobody else ever modifies that bool, only we do.
   // We only must ensure that our objects do not go away.
@@ -182,11 +175,11 @@
 nsresult nsNSSShutDownList::evaporateAllNSSResources()
 {
   if (PR_SUCCESS != mActivityState.restrictActivityToCurrentThread()) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("failed to restrict activity to current thread\n"));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("failed to restrict activity to current thread\n"));
     return NS_ERROR_FAILURE;
   }
 
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("now evaporating NSS resources\n"));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("now evaporating NSS resources\n"));
   int removedCount;
   do {
     MutexAutoLock lock(mListLock);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsNSSShutDown.h firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsNSSShutDown.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsNSSShutDown.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsNSSShutDown.h	2015-05-25 20:42:35.000000000 +0000
@@ -157,9 +157,9 @@
 protected:
   mozilla::Mutex mListLock;
   static nsNSSShutDownList *singleton;
-  PLDHashTable mObjects;
   uint32_t mActiveSSLSockets;
-  PLDHashTable mPK11LogoutCancelObjects;
+  PLDHashTable2 mObjects;
+  PLDHashTable2 mPK11LogoutCancelObjects;
   nsNSSActivityState mActivityState;
 };
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsNTLMAuthModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsNTLMAuthModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsNTLMAuthModule.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsNTLMAuthModule.cpp	2015-05-25 20:42:35.000000000 +0000
@@ -24,7 +24,7 @@
 #include "nsNSSShutDown.h"
 #include "nsUnicharUtils.h"
 #include "pk11pub.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prsystem.h"
 
 static bool sNTLMv1Forced = false;
@@ -38,7 +38,7 @@
   return sNTLMLog;
 }
 
-#define LOG(x) PR_LOG(GetNTLMLog(), PR_LOG_DEBUG, x)
+#define LOG(x) MOZ_LOG(GetNTLMLog(), PR_LOG_DEBUG, x)
 #define LOG_ENABLED() PR_LOG_TEST(GetNTLMLog(), PR_LOG_DEBUG)
 
 static void des_makekey(const uint8_t *raw, uint8_t *key);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsPKCS11Slot.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsPKCS11Slot.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsPKCS11Slot.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsPKCS11Slot.cpp	2015-05-25 20:42:35.000000000 +0000
@@ -294,7 +294,7 @@
     return NS_ERROR_NOT_AVAILABLE;
 
   char *asciiname = ToNewUTF8String(nsDependentString(aName));
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Getting \"%s\"\n", asciiname));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Getting \"%s\"\n", asciiname));
   PK11SlotInfo *slotinfo = nullptr;
   PK11SlotList *slotList = PK11_FindSlotsByNames(mModule->dllName, 
         asciiname /* slotName */, nullptr /* token Name */, false);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsPKCS12Blob.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsPKCS12Blob.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsPKCS12Blob.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsPKCS12Blob.cpp	2015-05-25 20:42:35.000000000 +0000
@@ -726,8 +726,8 @@
   }
 
   int prerr = PORT_GetError();
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("PKCS12: NSS/NSPR error(%d)", prerr));
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("PKCS12: I called(%d)", myerr));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("PKCS12: NSS/NSPR error(%d)", prerr));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("PKCS12: I called(%d)", myerr));
 
   const char * msgID = nullptr;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsUsageArrayHelper.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsUsageArrayHelper.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/nsUsageArrayHelper.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/nsUsageArrayHelper.cpp	2015-05-25 20:42:35.000000000 +0000
@@ -129,7 +129,7 @@
       result = previousCheckResult;
   }
 
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
           ("error validating certificate for usage %s: %s (%d) -> %ud \n",
           typestr.get(), PR_ErrorToName(error), (int) error, (int) result));
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/PSMContentListener.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/PSMContentListener.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/PSMContentListener.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/PSMContentListener.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -24,7 +24,7 @@
 #include "nsNetUtil.h"
 #include "nsNSSHelper.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 extern PRLogModuleInfo* gPIPNSSLog;
 
@@ -109,7 +109,7 @@
 NS_IMETHODIMP
 PSMContentStreamListener::OnStartRequest(nsIRequest* request, nsISupports* context)
 {
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("CertDownloader::OnStartRequest\n"));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("CertDownloader::OnStartRequest\n"));
 
   int64_t contentLength = ComputeContentLength(request);
   if (contentLength < 0) {
@@ -127,7 +127,7 @@
                                           uint64_t aSourceOffset,
                                           uint32_t aLength)
 {
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("CertDownloader::OnDataAvailable\n"));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("CertDownloader::OnDataAvailable\n"));
 
   nsCString chunk;
   nsresult rv = NS_ReadInputStreamToString(aIStream, chunk, aLength);
@@ -144,7 +144,7 @@
                                         nsISupports* context,
                                         nsresult aStatus)
 {
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("CertDownloader::OnStopRequest\n"));
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("CertDownloader::OnStopRequest\n"));
 
   // Because importing the cert can spin the event loop (via alerts), we can't
   // do it here. Do it off the event loop instead.
@@ -398,7 +398,7 @@
   uint32_t type;
   type = getPSMContentType(PromiseFlatCString(aContentType).get());
   if (gPIPNSSLog) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("PSMContentListener::DoContent\n"));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("PSMContentListener::DoContent\n"));
   }
   if (type != UNKNOWN_TYPE) {
     nsCOMPtr<nsIStreamListener> downloader;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/SharedCertVerifier.h firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/SharedCertVerifier.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/SharedCertVerifier.h	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/SharedCertVerifier.h	2015-05-25 20:42:34.000000000 +0000
@@ -20,8 +20,10 @@
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(SharedCertVerifier)
 
   SharedCertVerifier(OcspDownloadConfig odc, OcspStrictConfig osc,
-                     OcspGetConfig ogc, PinningMode pinningMode)
-    : mozilla::psm::CertVerifier(odc, osc, ogc, pinningMode)
+                     OcspGetConfig ogc, uint32_t certShortLifetimeInDays,
+                     PinningMode pinningMode)
+    : mozilla::psm::CertVerifier(odc, osc, ogc, certShortLifetimeInDays,
+                                 pinningMode)
   {
   }
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/SSLServerCertVerification.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/SSLServerCertVerification.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/src/SSLServerCertVerification.cpp	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/src/SSLServerCertVerification.cpp	2015-05-25 20:42:34.000000000 +0000
@@ -448,7 +448,7 @@
 SSLServerCertVerificationResult*
 CertErrorRunnable::CheckCertOverrides()
 {
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("[%p][%p] top of CheckCertOverrides\n",
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("[%p][%p] top of CheckCertOverrides\n",
                                     mFdForLogging, this));
   // "Use" mFdForLogging in non-PR_LOGGING builds, too, to suppress
   // clang's -Wunused-private-field build warning for this variable:
@@ -464,7 +464,7 @@
     NS_ISUPPORTS_CAST(nsITransportSecurityInfo*, mInfoObject));
   if (sslSocketControl &&
       sslSocketControl->GetBypassAuthentication()) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("[%p][%p] Bypass Auth in CheckCertOverrides\n",
             mFdForLogging, this));
     return new SSLServerCertVerificationResult(mInfoObject, 0);
@@ -487,7 +487,7 @@
   bool hasPinningInformation = false;
   nsCOMPtr<nsISiteSecurityService> sss(do_GetService(NS_SSSERVICE_CONTRACTID));
   if (!sss) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("[%p][%p] couldn't get nsISiteSecurityService to check for HSTS/HPKP\n",
             mFdForLogging, this));
     return new SSLServerCertVerificationResult(mInfoObject,
@@ -498,7 +498,7 @@
                                     mProviderFlags,
                                     &strictTransportSecurityEnabled);
   if (NS_FAILED(nsrv)) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("[%p][%p] checking for HSTS failed\n", mFdForLogging, this));
     return new SSLServerCertVerificationResult(mInfoObject,
                                                mDefaultErrorCodeToReport);
@@ -508,14 +508,14 @@
                            mProviderFlags,
                            &hasPinningInformation);
   if (NS_FAILED(nsrv)) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("[%p][%p] checking for HPKP failed\n", mFdForLogging, this));
     return new SSLServerCertVerificationResult(mInfoObject,
                                                mDefaultErrorCodeToReport);
   }
 
   if (!strictTransportSecurityEnabled && !hasPinningInformation) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("[%p][%p] no HSTS or HPKP - overrides allowed\n",
             mFdForLogging, this));
     nsCOMPtr<nsICertOverrideService> overrideService =
@@ -559,18 +559,18 @@
       }
 
       // all errors are covered by override rules, so let's accept the cert
-      PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+      MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
              ("[%p][%p] All errors covered by override rules\n",
              mFdForLogging, this));
       return new SSLServerCertVerificationResult(mInfoObject, 0);
     }
   } else {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("[%p][%p] HSTS or HPKP - no overrides allowed\n",
             mFdForLogging, this));
   }
 
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
          ("[%p][%p] Certificate error was not overridden\n",
          mFdForLogging, this));
 
@@ -668,7 +668,7 @@
   if (!collected_errors) {
     // This will happen when CERT_*Verify* only returned error(s) that are
     // not on our whitelist of overridable certificate errors.
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("[%p] !collected_errors: %d\n",
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("[%p] !collected_errors: %d\n",
            fdForLogging, static_cast<int>(defaultErrorCodeToReport)));
     PR_SetError(defaultErrorCodeToReport, 0);
     return nullptr;
@@ -818,7 +818,7 @@
   }
   // If GetNegotiatedNPN() failed we will assume spdy for safety's safe
   if (NS_FAILED(rv)) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("BlockServerCertChangeForSpdy failed GetNegotiatedNPN() call."
             " Assuming spdy.\n"));
   }
@@ -832,7 +832,7 @@
   }
 
   // Report an error - changed cert is confirmed
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
          ("SPDY Refused to allow new cert during renegotiation\n"));
   PR_SetError(SSL_ERROR_RENEGOTIATION_NOT_ALLOWED, 0);
   return SECFailure;
@@ -846,7 +846,7 @@
     // 1 means no common name present
     Telemetry::Accumulate(Telemetry::BR_9_2_2_SUBJECT_COMMON_NAME, 1);
   } else if (!commonNameInSubjectAltNames) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("BR telemetry: common name '%s' not in subject alt. names "
             "(or the subject alt. names extension is not present)\n",
             commonName));
@@ -893,23 +893,32 @@
     return;
   }
   CERTCertificate* cert = endEntityNode->cert;
+  PR_ASSERT(cert);
+  if (!cert) {
+    return;
+  }
   UniquePtr<char, void(&)(void*)>
     commonName(CERT_GetCommonName(&cert->subject), PORT_Free);
   // This only applies to certificates issued by authorities in our root
   // program.
+  CERTCertificate* rootCert = rootNode->cert;
+  PR_ASSERT(rootCert);
+  if (!rootCert) {
+    return;
+  }
   bool isBuiltIn = false;
-  SECStatus rv = IsCertBuiltInRoot(rootNode->cert, isBuiltIn);
+  SECStatus rv = IsCertBuiltInRoot(rootCert, isBuiltIn);
   if (rv != SECSuccess || !isBuiltIn) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
-           ("BR telemetry: '%s' not a built-in root (or IsCertBuiltInRoot "
-            "failed)\n", commonName.get()));
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+           ("BR telemetry: root certificate for '%s' is not a built-in root "
+            "(or IsCertBuiltInRoot failed)\n", commonName.get()));
     return;
   }
   SECItem altNameExtension;
   rv = CERT_FindCertExtension(cert, SEC_OID_X509_SUBJECT_ALT_NAME,
                               &altNameExtension);
   if (rv != SECSuccess) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("BR telemetry: no subject alt names extension for '%s'\n",
             commonName.get()));
     // 1 means there is no subject alt names extension
@@ -927,7 +936,7 @@
   // manually reach in and free the memory.
   PORT_Free(altNameExtension.data);
   if (!subjectAltNames) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+    MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
            ("BR telemetry: could not decode subject alt names for '%s'\n",
             commonName.get()));
     // 2 means the subject alt names extension could not be decoded
@@ -959,7 +968,7 @@
       if (!net_IsValidHostName(altNameWithoutWildcard) ||
           net_IsValidIPv4Addr(altName.get(), altName.Length()) ||
           net_IsValidIPv6Addr(altName.get(), altName.Length())) {
-        PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+        MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
                ("BR telemetry: DNSName '%s' not valid (for '%s')\n",
                 altName.get(), commonName.get()));
         malformedDNSNameOrIPAddressPresent = true;
@@ -976,7 +985,7 @@
         memcpy(&addr.inet.ip, currentName->name.other.data,
                currentName->name.other.len);
         if (PR_NetAddrToString(&addr, buf, sizeof(buf) - 1) != PR_SUCCESS) {
-        PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+        MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
                ("BR telemetry: IPAddress (v4) not valid (for '%s')\n",
                 commonName.get()));
           malformedDNSNameOrIPAddressPresent = true;
@@ -988,7 +997,7 @@
         memcpy(&addr.ipv6.ip, currentName->name.other.data,
                currentName->name.other.len);
         if (PR_NetAddrToString(&addr, buf, sizeof(buf) - 1) != PR_SUCCESS) {
-        PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+        MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
                ("BR telemetry: IPAddress (v6) not valid (for '%s')\n",
                 commonName.get()));
           malformedDNSNameOrIPAddressPresent = true;
@@ -996,13 +1005,13 @@
           altName.Assign(buf);
         }
       } else {
-        PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+        MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
                ("BR telemetry: IPAddress not valid (for '%s')\n",
                 commonName.get()));
         malformedDNSNameOrIPAddressPresent = true;
       }
     } else {
-      PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+      MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
              ("BR telemetry: non-DNSName, non-IPAddress present for '%s'\n",
               commonName.get()));
       nonDNSNameOrIPAddressPresent = true;
@@ -1049,10 +1058,19 @@
     return;
   }
   CERTCertificate* endEntityCert = endEntityNode->cert;
+  PR_ASSERT(endEntityCert);
+  if (!endEntityCert) {
+    return;
+  }
 
   // Only log telemetry if the root CA is built-in
+  CERTCertificate* rootCert = rootNode->cert;
+  PR_ASSERT(rootCert);
+  if (!rootCert) {
+    return;
+  }
   bool isBuiltIn = false;
-  SECStatus rv = IsCertBuiltInRoot(rootNode->cert, isBuiltIn);
+  SECStatus rv = IsCertBuiltInRoot(rootCert, isBuiltIn);
   if (rv != SECSuccess || !isBuiltIn) {
     return;
   }
@@ -1061,7 +1079,8 @@
   bool foundEKU = false;
   SECOidTag oidTag;
   CERTCertExtension* ekuExtension = nullptr;
-  for (size_t i = 0; endEntityCert->extensions[i]; i++) {
+  for (size_t i = 0; endEntityCert->extensions && endEntityCert->extensions[i];
+       i++) {
     oidTag = SECOID_FindOIDTag(&endEntityCert->extensions[i]->id);
     if (oidTag == SEC_OID_X509_EXT_KEY_USAGE) {
       foundEKU = true;
@@ -1117,12 +1136,17 @@
   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);
+  PR_ASSERT(!CERT_LIST_END(rootNode, certList));
+  if (CERT_LIST_END(rootNode, certList)) {
+    return;
+  }
+  CERTCertificate* rootCert = rootNode->cert;
+  PR_ASSERT(rootCert);
+  if (!rootCert) {
+    return;
   }
+  AccumulateTelemetryForRootCA(Telemetry::CERT_VALIDATION_SUCCESS_BY_CA,
+                               rootCert);
 }
 
 // There are various things that we want to measure about certificate
@@ -1227,7 +1251,7 @@
       }
 
       status->SetServerCert(nsc, evStatus);
-      PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+      MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
              ("AuthCertificate setting NEW cert %p\n", nsc.get()));
     }
   }
@@ -1305,7 +1329,7 @@
 {
   // Runs on a cert verification thread
 
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
           ("[%p] SSLServerCertVerificationJob::Run\n", mInfoObject.get()));
 
   PRErrorCode error;
@@ -1357,7 +1381,7 @@
         // will dispatch the result asynchronously, so we don't have to block
         // this thread waiting for it.
 
-        PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+        MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
                 ("[%p][%p] Before dispatching CertErrorRunnable\n",
                 mFdForLogging, runnable.get()));
 
@@ -1405,7 +1429,7 @@
 
   // Runs on the socket transport thread
 
-  PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
+  MOZ_LOG(gPIPNSSLog, PR_LOG_DEBUG,
          ("[%p] starting AuthCertificateHook\n", fd));
 
   // Modern libssl always passes PR_TRUE for checkSig, and we have no means of
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/mochitest/mixedcontent/test_bug383369.html firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/mochitest/mixedcontent/test_bug383369.html
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/mochitest/mixedcontent/test_bug383369.html	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/mochitest/mixedcontent/test_bug383369.html	2015-05-25 20:42:35.000000000 +0000
@@ -44,60 +44,20 @@
   
     var theWindow = window;
 
-    var useJSTransfer = false;
-    try {
-      // This method throws an exception if the old Download Manager is disabled.
-      Services.downloads.activeDownloadCount;
-    } catch (ex) {
-      useJSTransfer = true;
-    }
-
-    if (useJSTransfer) {
-      var Downloads = SpecialPowers.Cu.import("resource://gre/modules/Downloads.jsm").Downloads;
-      Downloads.getList(Downloads.PUBLIC).then(list => {
-        list = SpecialPowers.wrap(list);
-        list.addView({
-          onDownloadAdded: function (aDownload) {
-            list.removeView(this);
-            SpecialPowers.wrap(aDownload).whenSucceeded().then(() => {
-              list.removeFinished();
-              theWindow.location = "bug383369step2.html";
-            });
-          },
-        });
-        window.location = "download.auto";
-      }).then(null, SpecialPowers.Cu.reportError);
-
-      return;
-    }
-
-    var downloadManager = SpecialPowers.Cc["@mozilla.org/download-manager;1"]
-      .getService(SpecialPowers.Ci.nsIDownloadManager);
-    var observer = {
-      observe: function(subject, topic, data) {
-        switch (topic) {
-        case "dl-done":
-        case "dl-failed":
-        case "dl-blocked":
-        case "dl-dirty":
-          downloadManager.cleanUp();
-          theWindow.location = "bug383369step2.html";
-          observerService.removeObserver(this, "dl-done");
-          observerService.removeObserver(this, "dl-failed");
-          observerService.removeObserver(this, "dl-blocked");
-          observerService.removeObserver(this, "dl-dirty");
-          break;
-        }
-      }
-    };
-    var observerService = SpecialPowers.Cc["@mozilla.org/observer-service;1"]
-      .getService(SpecialPowers.Ci.nsIObserverService);
-    observerService.addObserver(observer, "dl-done", false);
-    observerService.addObserver(observer, "dl-failed", false);
-    observerService.addObserver(observer, "dl-blocked", false);
-    observerService.addObserver(observer, "dl-dirty", false);
-
-    window.location = "download.auto";
+    var Downloads = SpecialPowers.Cu.import("resource://gre/modules/Downloads.jsm").Downloads;
+    Downloads.getList(Downloads.PUBLIC).then(list => {
+      list = SpecialPowers.wrap(list);
+      list.addView({
+        onDownloadAdded: function (aDownload) {
+          list.removeView(this);
+          SpecialPowers.wrap(aDownload).whenSucceeded().then(() => {
+            list.removeFinished();
+            theWindow.location = "bug383369step2.html";
+          });
+        },
+      });
+      window.location = "download.auto";
+    }).then(null, SpecialPowers.Cu.reportError);
   }
 
   function afterNavigationTest()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/head_psm.js firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/head_psm.js
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/head_psm.js	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/head_psm.js	2015-05-25 20:42:35.000000000 +0000
@@ -35,20 +35,15 @@
 const PRErrorCodeSuccess = 0;
 
 // Sort in numerical order
-const SEC_ERROR_INVALID_ARGS                            = SEC_ERROR_BASE +   5; // -8187
 const SEC_ERROR_INVALID_TIME                            = SEC_ERROR_BASE +   8;
 const SEC_ERROR_BAD_DER                                 = SEC_ERROR_BASE +   9;
 const SEC_ERROR_EXPIRED_CERTIFICATE                     = SEC_ERROR_BASE +  11;
 const SEC_ERROR_REVOKED_CERTIFICATE                     = SEC_ERROR_BASE +  12; // -8180
 const SEC_ERROR_UNKNOWN_ISSUER                          = SEC_ERROR_BASE +  13;
-const SEC_ERROR_BAD_DATABASE                            = SEC_ERROR_BASE +  18;
 const SEC_ERROR_UNTRUSTED_ISSUER                        = SEC_ERROR_BASE +  20; // -8172
 const SEC_ERROR_UNTRUSTED_CERT                          = SEC_ERROR_BASE +  21; // -8171
 const SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE              = SEC_ERROR_BASE +  30; // -8162
-const SEC_ERROR_EXTENSION_VALUE_INVALID                 = SEC_ERROR_BASE +  34; // -8158
-const SEC_ERROR_EXTENSION_NOT_FOUND                     = SEC_ERROR_BASE +  35; // -8157
 const SEC_ERROR_CA_CERT_INVALID                         = SEC_ERROR_BASE +  36;
-const SEC_ERROR_INVALID_KEY                             = SEC_ERROR_BASE +  40; // -8152
 const SEC_ERROR_UNKNOWN_CRITICAL_EXTENSION              = SEC_ERROR_BASE +  41;
 const SEC_ERROR_INADEQUATE_KEY_USAGE                    = SEC_ERROR_BASE +  90; // -8102
 const SEC_ERROR_INADEQUATE_CERT_TYPE                    = SEC_ERROR_BASE +  91; // -8101
@@ -68,10 +63,10 @@
 const SEC_ERROR_POLICY_VALIDATION_FAILED                = SEC_ERROR_BASE + 160; // -8032
 const SEC_ERROR_OCSP_BAD_SIGNATURE                      = SEC_ERROR_BASE + 157;
 const SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED       = SEC_ERROR_BASE + 176;
-const SEC_ERROR_APPLICATION_CALLBACK_ERROR              = SEC_ERROR_BASE + 178;
 
 const SSL_ERROR_BAD_CERT_DOMAIN                         = SSL_ERROR_BASE +  12;
 const SSL_ERROR_BAD_CERT_ALERT                          = SSL_ERROR_BASE +  17;
+const SSL_ERROR_WEAK_SERVER_CERT_KEY                    = SSL_ERROR_BASE + 132;
 
 const MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE            = MOZILLA_PKIX_ERROR_BASE +   0;
 const MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY     = MOZILLA_PKIX_ERROR_BASE +   1;
@@ -79,6 +74,7 @@
 const MOZILLA_PKIX_ERROR_V1_CERT_USED_AS_CA             = MOZILLA_PKIX_ERROR_BASE +   3;
 const MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE      = MOZILLA_PKIX_ERROR_BASE +   5;
 const MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE = MOZILLA_PKIX_ERROR_BASE + 6;
+const MOZILLA_PKIX_ERROR_OCSP_RESPONSE_FOR_CERT_MISSING = MOZILLA_PKIX_ERROR_BASE +   8;
 
 // Supported Certificate Usages
 const certificateUsageSSLClient              = 0x0001;
@@ -129,15 +125,27 @@
 
 // certdb implements nsIX509CertDB. See nsIX509CertDB.idl for documentation.
 // In particular, hostname is optional.
-function checkCertErrorGeneric(certdb, cert, expectedError, usage, hostname) {
-  let hasEVPolicy = {};
+function checkCertErrorGeneric(certdb, cert, expectedError, usage,
+                               /*optional*/ hasEVPolicy,
+                               /*optional*/ hostname) {
+  do_print(`cert cn=${cert.commonName}`);
+  do_print(`cert issuer cn=${cert.issuerCommonName}`);
   let verifiedChain = {};
   let error = certdb.verifyCertNow(cert, usage, NO_FLAGS, hostname,
-                                   verifiedChain, hasEVPolicy);
+                                   verifiedChain, hasEVPolicy || {});
   Assert.equal(error, expectedError,
                "Actual and expected error should match");
 }
 
+function checkEVStatus(certDB, cert, usage, isEVExpected) {
+  do_print(`cert o=${cert.organization}`);
+  do_print(`cert issuer o=${cert.issuerOrganization}`);
+  let hasEVPolicy = {};
+  checkCertErrorGeneric(certDB, cert, PRErrorCodeSuccess, usage, hasEVPolicy);
+  Assert.equal(hasEVPolicy.value, isEVExpected,
+               "Actual and expected EV status should match");
+}
+
 function _getLibraryFunctionWithNoArguments(functionName, libraryName) {
   // Open the NSS library. copied from services/crypto/modules/WeaveCrypto.js
   let path = ctypes.libraryName(libraryName);
@@ -393,8 +401,8 @@
                  .getService(Ci.nsIEnvironment);
   let greBinDir = directoryService.get("GreBinD", Ci.nsIFile);
   envSvc.set("DYLD_LIBRARY_PATH", greBinDir.path);
-  // Android libraries are in /data/local/xpcb, but "GreBinD" does not return
-  // this path on Android, so hard code it here.
+  // TODO(bug 1107794): Android libraries are in /data/local/xpcb, but "GreBinD"
+  // does not return this path on Android, so hard code it here.
   envSvc.set("LD_LIBRARY_PATH", greBinDir.path + ":/data/local/xpcb");
   envSvc.set("MOZ_TLS_SERVER_DEBUG_LEVEL", "3");
   envSvc.set("MOZ_TLS_SERVER_CALLBACK_PORT", CALLBACK_PORT);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/psm_common_py/CertUtils.py firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/psm_common_py/CertUtils.py
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/psm_common_py/CertUtils.py	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/psm_common_py/CertUtils.py	2015-05-25 20:42:35.000000000 +0000
@@ -10,6 +10,15 @@
 import time
 import sys
 
+aia_prefix = 'authorityInfoAccess = OCSP;URI:http://www.example.com:8888/'
+aia_suffix = '/\n'
+
+mozilla_testing_ev_policy = ('certificatePolicies = @v3_ca_ev_cp\n\n' +
+                             '[ v3_ca_ev_cp ]\n' +
+                             'policyIdentifier = ' +
+                             '1.3.6.1.4.1.13769.666.666.666.1.500.9.1\n\n' +
+                             'CPS.1 = "http://mytestdomain.local/cps"')
+
 def generate_cert_generic(db_dir, dest_dir, serial_num,  key_type, name,
                           ext_text, signer_key_filename = "",
                           signer_cert_filename = "",
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_add_preexisting_cert.js firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_add_preexisting_cert.js
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_add_preexisting_cert.js	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_add_preexisting_cert.js	2015-05-25 20:42:35.000000000 +0000
@@ -28,11 +28,8 @@
   let file = "test_intermediate_basic_usage_constraints/ee-int-limited-depth.der";
   let cert_der = readFile(do_get_file(file));
   let ee = certDB.constructX509(cert_der, cert_der.length);
-  let hasEVPolicy = {};
-  let verifiedChain = {};
-  equal(PRErrorCodeSuccess, certDB.verifyCertNow(ee, certificateUsageSSLServer,
-                                                 NO_FLAGS, null, verifiedChain,
-                                                 hasEVPolicy));
+  checkCertErrorGeneric(certDB, ee, PRErrorCodeSuccess,
+                        certificateUsageSSLServer);
   // Change the already existing intermediate certificate's trust using
   // addCertFromBase64(). We use findCertByNickname first to ensure that the
   // certificate already exists.
@@ -40,8 +37,6 @@
   ok(int_cert);
   let base64_cert = btoa(getDERString(int_cert));
   certDB.addCertFromBase64(base64_cert, "p,p,p", "ignored_argument");
-  equal(SEC_ERROR_UNTRUSTED_ISSUER, certDB.verifyCertNow(ee,
-                                                         certificateUsageSSLServer,
-                                                         NO_FLAGS, null, verifiedChain,
-                                                         hasEVPolicy));
+  checkCertErrorGeneric(certDB, ee, SEC_ERROR_UNTRUSTED_ISSUER,
+                        certificateUsageSSLServer);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_cert_blocklist.js firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_cert_blocklist.js
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_cert_blocklist.js	2015-05-13 18:05:56.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_cert_blocklist.js	2015-05-25 20:42:35.000000000 +0000
@@ -138,8 +138,7 @@
 function verify_cert(file, expectedError) {
   let cert_der = readFile(do_get_file(file));
   let ee = certDB.constructX509(cert_der, cert_der.length);
-  equal(expectedError, certDB.verifyCertNow(ee, certificateUsageSSLServer,
-                                            NO_FLAGS, null, {}, {}));
+  checkCertErrorGeneric(certDB, ee, expectedError, certificateUsageSSLServer);
 }
 
 function load_cert(cert, trust) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_cert_overrides.js firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_cert_overrides.js
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_cert_overrides.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_cert_overrides.js	2015-05-25 20:42:37.000000000 +0000
@@ -42,7 +42,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
+  do_check_eq(histogram.counts[13], 0); // MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE
   do_check_eq(histogram.counts[14], 2); // MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE
   do_check_eq(histogram.counts[15], 1); // MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE
   do_check_eq(histogram.counts[16], 2); // SEC_ERROR_INVALID_TIME
@@ -54,7 +54,7 @@
   do_check_eq(keySizeHistogram.counts[0], 0);
   do_check_eq(keySizeHistogram.counts[1], 0); // 0 successful verifications of 2048-bit keys
   do_check_eq(keySizeHistogram.counts[2], 4); // 4 successful verifications of 1024-bit keys
-  do_check_eq(keySizeHistogram.counts[3], 49); // 49 verification failures
+  do_check_eq(keySizeHistogram.counts[3], 48); // 48 verification failures
 
   run_next_test();
 }
@@ -179,9 +179,10 @@
                          Ci.nsICertOverrideService.ERROR_UNTRUSTED,
                          SEC_ERROR_CA_CERT_INVALID);
 
-  add_cert_override_test("inadequate-key-size-ee.example.com",
-                         Ci.nsICertOverrideService.ERROR_UNTRUSTED,
-                         MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE);
+  // This host presents a 1008-bit RSA key. NSS determines this key is too
+  // small and terminates the connection. The error is not overridable.
+  add_non_overridable_test("inadequate-key-size-ee.example.com",
+                           SSL_ERROR_WEAK_SERVER_CERT_KEY);
 }
 
 function add_combo_tests() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_cert_trust.js firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_cert_trust.js
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_cert_trust.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_cert_trust.js	2015-05-25 20:42:37.000000000 +0000
@@ -13,7 +13,7 @@
   'ee',
   'int',
   'ca',
-]
+];
 
 function load_cert(cert_name, trust_string) {
   let cert_filename = cert_name + ".der";
@@ -29,178 +29,162 @@
   certdb.setCertTrust(int_cert, Ci.nsIX509Cert.CA_CERT, 0);
 }
 
-function check_cert_err_generic(cert, expected_error, usage) {
-  do_print("cert cn=" + cert.commonName);
-  do_print("cert issuer cn=" + cert.issuerCommonName);
-  let hasEVPolicy = {};
-  let verifiedChain = {};
-  let error = certdb.verifyCertNow(cert, usage, NO_FLAGS, null, verifiedChain,
-                                   hasEVPolicy);
-  do_check_eq(error,  expected_error);
-};
-
 function test_ca_distrust(ee_cert, cert_to_modify_trust, isRootCA) {
   // On reset most usages are successful
-  check_cert_err_generic(ee_cert, PRErrorCodeSuccess,
-                         certificateUsageSSLServer);
-  check_cert_err_generic(ee_cert, PRErrorCodeSuccess,
-                         certificateUsageSSLClient);
-  check_cert_err_generic(ee_cert, SEC_ERROR_CA_CERT_INVALID,
-                         certificateUsageSSLCA);  // expected no bc
-  check_cert_err_generic(ee_cert, PRErrorCodeSuccess,
-                         certificateUsageEmailSigner);
-  check_cert_err_generic(ee_cert, PRErrorCodeSuccess,
-                         certificateUsageEmailRecipient);
-  check_cert_err_generic(ee_cert, PRErrorCodeSuccess,
-                         certificateUsageObjectSigner); // expected
-  check_cert_err_generic(ee_cert, SEC_ERROR_CA_CERT_INVALID,
-                         certificateUsageVerifyCA);
-  // mozilla::pkix enforces that certificase must have a basic constraints
-  // extension with cA:true to be a CA certificate,  whereas classic does not
-  check_cert_err_generic(ee_cert, SEC_ERROR_INADEQUATE_CERT_TYPE,
-                         certificateUsageStatusResponder); //expected
+  checkCertErrorGeneric(certdb, ee_cert, PRErrorCodeSuccess,
+                        certificateUsageSSLServer);
+  checkCertErrorGeneric(certdb, ee_cert, PRErrorCodeSuccess,
+                        certificateUsageSSLClient);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_CA_CERT_INVALID,
+                        certificateUsageSSLCA);
+  checkCertErrorGeneric(certdb, ee_cert, PRErrorCodeSuccess,
+                        certificateUsageEmailSigner);
+  checkCertErrorGeneric(certdb, ee_cert, PRErrorCodeSuccess,
+                        certificateUsageEmailRecipient);
+  checkCertErrorGeneric(certdb, ee_cert, PRErrorCodeSuccess,
+                        certificateUsageObjectSigner);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_CA_CERT_INVALID,
+                        certificateUsageVerifyCA);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_INADEQUATE_CERT_TYPE,
+                        certificateUsageStatusResponder);
 
 
   // Test of active distrust. No usage should pass.
   setCertTrust(cert_to_modify_trust, 'p,p,p');
-  check_cert_err_generic(ee_cert, SEC_ERROR_UNTRUSTED_ISSUER,
-                         certificateUsageSSLServer);
-  check_cert_err_generic(ee_cert, SEC_ERROR_UNTRUSTED_ISSUER,
-                         certificateUsageSSLClient);
-  check_cert_err_generic(ee_cert, SEC_ERROR_CA_CERT_INVALID,
-                         certificateUsageSSLCA);
-  check_cert_err_generic(ee_cert, SEC_ERROR_UNTRUSTED_ISSUER,
-                         certificateUsageEmailSigner);
-  check_cert_err_generic(ee_cert, SEC_ERROR_UNTRUSTED_ISSUER,
-                         certificateUsageEmailRecipient);
-  check_cert_err_generic(ee_cert, SEC_ERROR_UNTRUSTED_ISSUER,
-                         certificateUsageObjectSigner);
-  check_cert_err_generic(ee_cert, SEC_ERROR_CA_CERT_INVALID,
-                         certificateUsageVerifyCA);
-  // In mozilla::pkix (but not classic verification), certificate chain
-  // properties are checked before the end-entity. Thus, if we're using
-  // mozilla::pkix and the root certificate has been distrusted, the error
-  // will be "untrusted issuer" and not "inadequate cert type".
-  check_cert_err_generic(ee_cert,
-                         !isRootCA ? SEC_ERROR_UNTRUSTED_ISSUER
-                                   : SEC_ERROR_INADEQUATE_CERT_TYPE,
-                         certificateUsageStatusResponder);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_UNTRUSTED_ISSUER,
+                        certificateUsageSSLServer);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_UNTRUSTED_ISSUER,
+                        certificateUsageSSLClient);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_CA_CERT_INVALID,
+                        certificateUsageSSLCA);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_UNTRUSTED_ISSUER,
+                        certificateUsageEmailSigner);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_UNTRUSTED_ISSUER,
+                        certificateUsageEmailRecipient);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_UNTRUSTED_ISSUER,
+                        certificateUsageObjectSigner);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_CA_CERT_INVALID,
+                        certificateUsageVerifyCA);
+  checkCertErrorGeneric(certdb, ee_cert,
+                        !isRootCA ? SEC_ERROR_UNTRUSTED_ISSUER
+                                  : SEC_ERROR_INADEQUATE_CERT_TYPE,
+                        certificateUsageStatusResponder);
 
   // Trust set to T  -  trusted CA to issue client certs, where client cert is
   // usageSSLClient.
   setCertTrust(cert_to_modify_trust, 'T,T,T');
-  check_cert_err_generic(ee_cert, isRootCA ? SEC_ERROR_UNKNOWN_ISSUER
-                                           : PRErrorCodeSuccess,
-                         certificateUsageSSLServer);
+  checkCertErrorGeneric(certdb, ee_cert, isRootCA ? SEC_ERROR_UNKNOWN_ISSUER
+                                                  : PRErrorCodeSuccess,
+                        certificateUsageSSLServer);
 
   // XXX(Bug 982340)
-  check_cert_err_generic(ee_cert, isRootCA ? SEC_ERROR_UNKNOWN_ISSUER
-                                           : PRErrorCodeSuccess,
-                         certificateUsageSSLClient);
-
-  check_cert_err_generic(ee_cert, SEC_ERROR_CA_CERT_INVALID,
-                         certificateUsageSSLCA);
-
-  check_cert_err_generic(ee_cert, isRootCA ? SEC_ERROR_UNKNOWN_ISSUER
-                                           : PRErrorCodeSuccess,
-                         certificateUsageEmailSigner);
-  check_cert_err_generic(ee_cert, isRootCA ? SEC_ERROR_UNKNOWN_ISSUER
-                                           : PRErrorCodeSuccess,
-                         certificateUsageEmailRecipient);
-  check_cert_err_generic(ee_cert, isRootCA ? SEC_ERROR_UNKNOWN_ISSUER
-                                           : PRErrorCodeSuccess,
-                         certificateUsageObjectSigner);
-  check_cert_err_generic(ee_cert, SEC_ERROR_CA_CERT_INVALID,
-                         certificateUsageVerifyCA);
-  check_cert_err_generic(ee_cert, SEC_ERROR_INADEQUATE_CERT_TYPE,
-                         certificateUsageStatusResponder);
+  checkCertErrorGeneric(certdb, ee_cert, isRootCA ? SEC_ERROR_UNKNOWN_ISSUER
+                                                  : PRErrorCodeSuccess,
+                        certificateUsageSSLClient);
+
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_CA_CERT_INVALID,
+                        certificateUsageSSLCA);
+
+  checkCertErrorGeneric(certdb, ee_cert, isRootCA ? SEC_ERROR_UNKNOWN_ISSUER
+                                                  : PRErrorCodeSuccess,
+                        certificateUsageEmailSigner);
+  checkCertErrorGeneric(certdb, ee_cert, isRootCA ? SEC_ERROR_UNKNOWN_ISSUER
+                                                  : PRErrorCodeSuccess,
+                        certificateUsageEmailRecipient);
+  checkCertErrorGeneric(certdb, ee_cert, isRootCA ? SEC_ERROR_UNKNOWN_ISSUER
+                                                  : PRErrorCodeSuccess,
+                        certificateUsageObjectSigner);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_CA_CERT_INVALID,
+                        certificateUsageVerifyCA);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_INADEQUATE_CERT_TYPE,
+                        certificateUsageStatusResponder);
 
 
   // Now tests on the SSL trust bit
   setCertTrust(cert_to_modify_trust, 'p,C,C');
-  check_cert_err_generic(ee_cert, SEC_ERROR_UNTRUSTED_ISSUER,
-                         certificateUsageSSLServer);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_UNTRUSTED_ISSUER,
+                        certificateUsageSSLServer);
 
   //XXX(Bug 982340)
-  check_cert_err_generic(ee_cert, PRErrorCodeSuccess,
-                         certificateUsageSSLClient);
-  check_cert_err_generic(ee_cert, SEC_ERROR_CA_CERT_INVALID,
-                         certificateUsageSSLCA);
-  check_cert_err_generic(ee_cert, PRErrorCodeSuccess,
-                         certificateUsageEmailSigner);
-  check_cert_err_generic(ee_cert, PRErrorCodeSuccess,
-                         certificateUsageEmailRecipient);
-  check_cert_err_generic(ee_cert, PRErrorCodeSuccess,
-                         certificateUsageObjectSigner);
-  check_cert_err_generic(ee_cert, SEC_ERROR_CA_CERT_INVALID,
-                         certificateUsageVerifyCA);
-  check_cert_err_generic(ee_cert,
-                         isRootCA ? SEC_ERROR_INADEQUATE_CERT_TYPE
-                                  : SEC_ERROR_UNTRUSTED_ISSUER,
-                         certificateUsageStatusResponder);
+  checkCertErrorGeneric(certdb, ee_cert, PRErrorCodeSuccess,
+                        certificateUsageSSLClient);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_CA_CERT_INVALID,
+                        certificateUsageSSLCA);
+  checkCertErrorGeneric(certdb, ee_cert, PRErrorCodeSuccess,
+                        certificateUsageEmailSigner);
+  checkCertErrorGeneric(certdb, ee_cert, PRErrorCodeSuccess,
+                        certificateUsageEmailRecipient);
+  checkCertErrorGeneric(certdb, ee_cert, PRErrorCodeSuccess,
+                        certificateUsageObjectSigner);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_CA_CERT_INVALID,
+                        certificateUsageVerifyCA);
+  checkCertErrorGeneric(certdb, ee_cert,
+                        isRootCA ? SEC_ERROR_INADEQUATE_CERT_TYPE
+                                 : SEC_ERROR_UNTRUSTED_ISSUER,
+                        certificateUsageStatusResponder);
 
   // Inherited trust SSL
   setCertTrust(cert_to_modify_trust, ',C,C');
-  check_cert_err_generic(ee_cert, isRootCA ? SEC_ERROR_UNKNOWN_ISSUER
-                                           : PRErrorCodeSuccess,
-                         certificateUsageSSLServer);
+  checkCertErrorGeneric(certdb, ee_cert, isRootCA ? SEC_ERROR_UNKNOWN_ISSUER
+                                                  : PRErrorCodeSuccess,
+                        certificateUsageSSLServer);
   // XXX(Bug 982340)
-  check_cert_err_generic(ee_cert, PRErrorCodeSuccess,
-                         certificateUsageSSLClient);
-  check_cert_err_generic(ee_cert, SEC_ERROR_CA_CERT_INVALID,
-                         certificateUsageSSLCA);
-  check_cert_err_generic(ee_cert, PRErrorCodeSuccess,
-                         certificateUsageEmailSigner);
-  check_cert_err_generic(ee_cert, PRErrorCodeSuccess,
-                         certificateUsageEmailRecipient);
-  check_cert_err_generic(ee_cert, PRErrorCodeSuccess,
-                         certificateUsageObjectSigner);
-  check_cert_err_generic(ee_cert, SEC_ERROR_CA_CERT_INVALID,
-                         certificateUsageVerifyCA);
-  check_cert_err_generic(ee_cert, SEC_ERROR_INADEQUATE_CERT_TYPE,
-                         certificateUsageStatusResponder);
+  checkCertErrorGeneric(certdb, ee_cert, PRErrorCodeSuccess,
+                        certificateUsageSSLClient);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_CA_CERT_INVALID,
+                        certificateUsageSSLCA);
+  checkCertErrorGeneric(certdb, ee_cert, PRErrorCodeSuccess,
+                        certificateUsageEmailSigner);
+  checkCertErrorGeneric(certdb, ee_cert, PRErrorCodeSuccess,
+                        certificateUsageEmailRecipient);
+  checkCertErrorGeneric(certdb, ee_cert, PRErrorCodeSuccess,
+                        certificateUsageObjectSigner);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_CA_CERT_INVALID,
+                        certificateUsageVerifyCA);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_INADEQUATE_CERT_TYPE,
+                        certificateUsageStatusResponder);
 
   // Now tests on the EMAIL trust bit
   setCertTrust(cert_to_modify_trust, 'C,p,C');
-  check_cert_err_generic(ee_cert, PRErrorCodeSuccess,
-                         certificateUsageSSLServer);
-  check_cert_err_generic(ee_cert, SEC_ERROR_UNTRUSTED_ISSUER,
-                         certificateUsageSSLClient);
-  check_cert_err_generic(ee_cert, SEC_ERROR_CA_CERT_INVALID,
-                         certificateUsageSSLCA);
-  check_cert_err_generic(ee_cert, SEC_ERROR_UNTRUSTED_ISSUER,
-                         certificateUsageEmailSigner);
-  check_cert_err_generic(ee_cert, SEC_ERROR_UNTRUSTED_ISSUER,
-                         certificateUsageEmailRecipient);
-  check_cert_err_generic(ee_cert, PRErrorCodeSuccess,
-                         certificateUsageObjectSigner);
-  check_cert_err_generic(ee_cert, SEC_ERROR_CA_CERT_INVALID,
-                         certificateUsageVerifyCA);
-  check_cert_err_generic(ee_cert, SEC_ERROR_INADEQUATE_CERT_TYPE,
-                         certificateUsageStatusResponder);
+  checkCertErrorGeneric(certdb, ee_cert, PRErrorCodeSuccess,
+                        certificateUsageSSLServer);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_UNTRUSTED_ISSUER,
+                        certificateUsageSSLClient);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_CA_CERT_INVALID,
+                        certificateUsageSSLCA);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_UNTRUSTED_ISSUER,
+                        certificateUsageEmailSigner);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_UNTRUSTED_ISSUER,
+                        certificateUsageEmailRecipient);
+  checkCertErrorGeneric(certdb, ee_cert, PRErrorCodeSuccess,
+                        certificateUsageObjectSigner);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_CA_CERT_INVALID,
+                        certificateUsageVerifyCA);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_INADEQUATE_CERT_TYPE,
+                        certificateUsageStatusResponder);
 
 
   //inherited EMAIL Trust
   setCertTrust(cert_to_modify_trust, 'C,,C');
-  check_cert_err_generic(ee_cert, PRErrorCodeSuccess,
-                         certificateUsageSSLServer);
-  check_cert_err_generic(ee_cert, isRootCA ? SEC_ERROR_UNKNOWN_ISSUER
-                                           : PRErrorCodeSuccess,
-                         certificateUsageSSLClient);
-  check_cert_err_generic(ee_cert, SEC_ERROR_CA_CERT_INVALID,
-                         certificateUsageSSLCA);
-  check_cert_err_generic(ee_cert, isRootCA ? SEC_ERROR_UNKNOWN_ISSUER
-                                           : PRErrorCodeSuccess,
-                         certificateUsageEmailSigner);
-  check_cert_err_generic(ee_cert, isRootCA ? SEC_ERROR_UNKNOWN_ISSUER
-                                           : PRErrorCodeSuccess,
-                         certificateUsageEmailRecipient);
-  check_cert_err_generic(ee_cert, PRErrorCodeSuccess,
-                         certificateUsageObjectSigner);
-  check_cert_err_generic(ee_cert, SEC_ERROR_CA_CERT_INVALID,
-                         certificateUsageVerifyCA);
-  check_cert_err_generic(ee_cert, SEC_ERROR_INADEQUATE_CERT_TYPE,
-                         certificateUsageStatusResponder);
+  checkCertErrorGeneric(certdb, ee_cert, PRErrorCodeSuccess,
+                        certificateUsageSSLServer);
+  checkCertErrorGeneric(certdb, ee_cert, isRootCA ? SEC_ERROR_UNKNOWN_ISSUER
+                                                  : PRErrorCodeSuccess,
+                        certificateUsageSSLClient);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_CA_CERT_INVALID,
+                        certificateUsageSSLCA);
+  checkCertErrorGeneric(certdb, ee_cert, isRootCA ? SEC_ERROR_UNKNOWN_ISSUER
+                                                  : PRErrorCodeSuccess,
+                        certificateUsageEmailSigner);
+  checkCertErrorGeneric(certdb, ee_cert, isRootCA ? SEC_ERROR_UNKNOWN_ISSUER
+                                                  : PRErrorCodeSuccess,
+                        certificateUsageEmailRecipient);
+  checkCertErrorGeneric(certdb, ee_cert, PRErrorCodeSuccess,
+                        certificateUsageObjectSigner);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_CA_CERT_INVALID,
+                        certificateUsageVerifyCA);
+  checkCertErrorGeneric(certdb, ee_cert, SEC_ERROR_INADEQUATE_CERT_TYPE,
+                        certificateUsageStatusResponder);
 }
 
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_cert_version.js firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_cert_version.js
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_cert_version.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_cert_version.js	2015-05-25 20:42:37.000000000 +0000
@@ -18,22 +18,12 @@
   addCertFromFile(certdb, "test_cert_version/" + cert_filename, trust_string);
 }
 
-function check_cert_err_generic(cert, expected_error, usage) {
-  do_print("cert cn=" + cert.commonName);
-  do_print("cert issuer cn=" + cert.issuerCommonName);
-  let hasEVPolicy = {};
-  let verifiedChain = {};
-  let error = certdb.verifyCertNow(cert, usage, NO_FLAGS, null, verifiedChain,
-                                   hasEVPolicy);
-  do_check_eq(error, expected_error);
-}
-
 function check_cert_err(cert, expected_error) {
-  check_cert_err_generic(cert, expected_error, certificateUsageSSLServer)
+  checkCertErrorGeneric(certdb, cert, expected_error, certificateUsageSSLServer);
 }
 
 function check_ca_err(cert, expected_error) {
-  check_cert_err_generic(cert, expected_error, certificateUsageSSLCA)
+  checkCertErrorGeneric(certdb, cert, expected_error, certificateUsageSSLCA);
 }
 
 function check_ok(x) {
@@ -41,7 +31,7 @@
 }
 
 function check_ok_ca(x) {
-  return check_cert_err_generic(x, PRErrorCodeSuccess, certificateUsageSSLCA);
+  checkCertErrorGeneric(certdb, x, PRErrorCodeSuccess, certificateUsageSSLCA);
 }
 
 function run_test() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_ev_certs/generate.py firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_ev_certs/generate.py
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_ev_certs/generate.py	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_ev_certs/generate.py	2015-05-25 20:42:38.000000000 +0000
@@ -15,19 +15,11 @@
 CA_extensions  = ("basicConstraints = critical, CA:TRUE\n"
                   "keyUsage = keyCertSign, cRLSign\n")
 
-aia_prefix = "authorityInfoAccess = OCSP;URI:http://www.example.com:8888/"
-aia_suffix ="/\n"
 intermediate_crl = ("crlDistributionPoints = " +
                     "URI:http://crl.example.com:8888/root-ev.crl\n")
 endentity_crl = ("crlDistributionPoints = " +
                  "URI:http://crl.example.com:8888/ee-crl.crl\n")
 
-mozilla_testing_ev_policy = ("certificatePolicies = @v3_ca_ev_cp\n\n" +
-                             "[ v3_ca_ev_cp ]\n" +
-                             "policyIdentifier = " +
-                               "1.3.6.1.4.1.13769.666.666.666.1.500.9.1\n\n" +
-                             "CPS.1 = \"http://mytestdomain.local/cps\"")
-
 anypolicy_policy = ("certificatePolicies = @v3_ca_ev_cp\n\n" +
                     "[ v3_ca_ev_cp ]\n" +
                     "policyIdentifier = " +
@@ -44,10 +36,11 @@
     ca_key = 'evroot.key'
     prefix = "ev-valid"
     key_type = 'rsa'
-    ee_ext_text = (aia_prefix + prefix + aia_suffix +
-                   endentity_crl + mozilla_testing_ev_policy)
-    int_ext_text = (CA_extensions + aia_prefix + "int-" + prefix + aia_suffix +
-                    intermediate_crl + mozilla_testing_ev_policy)
+    ee_ext_text = (CertUtils.aia_prefix + prefix + CertUtils.aia_suffix +
+                   endentity_crl + CertUtils.mozilla_testing_ev_policy)
+    int_ext_text = (CA_extensions + CertUtils.aia_prefix + "int-" + prefix +
+                    CertUtils.aia_suffix + intermediate_crl +
+                    CertUtils.mozilla_testing_ev_policy)
 
     CertUtils.init_nss_db(srcdir)
     CertUtils.import_cert_and_pkcs12(srcdir, ca_cert, 'evroot.p12', 'evroot',
@@ -76,16 +69,16 @@
                                       key_type,
                                       'no-ocsp-url-cert',
                                       no_ocsp_url_ext_aia + endentity_crl +
-                                      mozilla_testing_ev_policy,
+                                      CertUtils.mozilla_testing_ev_policy,
                                       int_key, int_cert);
     import_untrusted_cert(no_ocsp_cert, 'no-ocsp-url-cert');
 
     # add an ev cert whose intermediate has a anypolicy oid
     prefix = "ev-valid-anypolicy-int"
-    ee_ext_text = (aia_prefix + prefix + aia_suffix +
-                   endentity_crl + mozilla_testing_ev_policy)
-    int_ext_text = (CA_extensions + aia_prefix + "int-" + prefix + aia_suffix +
-                    intermediate_crl + anypolicy_policy)
+    ee_ext_text = (CertUtils.aia_prefix + prefix + CertUtils.aia_suffix +
+                   endentity_crl + CertUtils.mozilla_testing_ev_policy)
+    int_ext_text = (CA_extensions + CertUtils.aia_prefix + "int-" + prefix +
+                    CertUtils.aia_suffix + intermediate_crl + anypolicy_policy)
 
     [int_key, int_cert, ee_key, ee_cert] = CertUtils.generate_int_and_ee(db,
                                              srcdir,
@@ -113,10 +106,11 @@
     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)
-    int_ext_text = (CA_extensions + aia_prefix + "int-" + prefix + aia_suffix +
-                    intermediate_crl + mozilla_testing_ev_policy)
+    ee_ext_text = (CertUtils.aia_prefix + prefix  + CertUtils.aia_suffix +
+                   endentity_crl + CertUtils.mozilla_testing_ev_policy)
+    int_ext_text = (CA_extensions + CertUtils.aia_prefix + "int-" + prefix +
+                    CertUtils.aia_suffix + intermediate_crl +
+                    CertUtils.mozilla_testing_ev_policy)
     [int_key, int_cert, ee_key, ee_cert] = CertUtils.generate_int_and_ee(db,
                                       srcdir,
                                       bad_ca_key,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_ev_certs.js firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_ev_certs.js
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_ev_certs.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_ev_certs.js	2015-05-25 20:42:38.000000000 +0000
@@ -48,22 +48,13 @@
 
 function check_cert_err(cert_name, expected_error) {
   let cert = certdb.findCertByNickname(null, cert_name);
-  let hasEVPolicy = {};
-  let verifiedChain = {};
-  let error = certdb.verifyCertNow(cert, certificateUsageSSLServer, NO_FLAGS,
-                                   null, verifiedChain, hasEVPolicy);
-  do_check_eq(error,  expected_error);
+  checkCertErrorGeneric(certdb, cert, expected_error, certificateUsageSSLServer);
 }
 
 
 function check_ee_for_ev(cert_name, expected_ev) {
-    let cert = certdb.findCertByNickname(null, cert_name);
-    let hasEVPolicy = {};
-    let verifiedChain = {};
-    let error = certdb.verifyCertNow(cert, certificateUsageSSLServer, NO_FLAGS,
-                                     null, verifiedChain, hasEVPolicy);
-    do_check_eq(hasEVPolicy.value, expected_ev);
-    do_check_eq(error, PRErrorCodeSuccess);
+  let cert = certdb.findCertByNickname(null, cert_name);
+  checkEVStatus(certdb, cert, certificateUsageSSLServer, expected_ev);
 }
 
 function run_test() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_hmac.js firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_hmac.js
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_hmac.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_hmac.js	2015-05-25 20:42:38.000000000 +0000
@@ -1,53 +1,54 @@
-var ScriptableUnicodeConverter =
+"use strict";
+
+let ScriptableUnicodeConverter =
   Components.Constructor("@mozilla.org/intl/scriptableunicodeconverter",
-                         "nsIScriptableUnicodeConverter"); 
-                         
-function getHMAC(data, key, alg)
-{
-  var converter = new ScriptableUnicodeConverter(); 
-  converter.charset = 'utf8'; 
-  var dataarray = converter.convertToByteArray(data);
-  
-  var keyObject = Components.classes["@mozilla.org/security/keyobjectfactory;1"]
-    .getService(Components.interfaces.nsIKeyObjectFactory)
-      .keyFromString(Components.interfaces.nsIKeyObject.HMAC, key);
-  
-  var cryptoHMAC = Components.classes["@mozilla.org/security/hmac;1"]
-    .createInstance(Components.interfaces.nsICryptoHMAC);
-    
+                         "nsIScriptableUnicodeConverter");
+
+function getHMAC(data, key, alg) {
+  let converter = new ScriptableUnicodeConverter();
+  converter.charset = "utf8";
+  let dataArray = converter.convertToByteArray(data);
+
+  let keyObject = Cc["@mozilla.org/security/keyobjectfactory;1"]
+                    .getService(Ci.nsIKeyObjectFactory)
+                    .keyFromString(Ci.nsIKeyObject.HMAC, key);
+
+  let cryptoHMAC = Cc["@mozilla.org/security/hmac;1"]
+                     .createInstance(Ci.nsICryptoHMAC);
+
   cryptoHMAC.init(alg, keyObject);
-  cryptoHMAC.update(dataarray, dataarray.length);
-  var digest1 = cryptoHMAC.finish(false);
-  
+  cryptoHMAC.update(dataArray, dataArray.length);
+  let digest1 = cryptoHMAC.finish(false);
+
   cryptoHMAC.reset();
-  cryptoHMAC.update(dataarray, dataarray.length);
-  var digest2 = cryptoHMAC.finish(false);
-  
-  do_check_eq(digest1, digest2);
-  
+  cryptoHMAC.update(dataArray, dataArray.length);
+  let digest2 = cryptoHMAC.finish(false);
+
+  equal(digest1, digest2,
+        "Initial digest and digest after calling reset() should match");
+
   return digest1;
 }
 
 function testHMAC(alg) {
   const key1 = 'MyKey_ABCDEFGHIJKLMN';
   const key2 = 'MyKey_01234567890123';
-  
+
   const dataA = "Secret message";
   const dataB = "Secres message";
-  
-  var diegest1a = getHMAC(key1, dataA, alg);
-  var diegest2 = getHMAC(key2, dataA, alg);
-  var diegest1b = getHMAC(key1, dataA, alg);
-  
-  do_check_eq(diegest1a, diegest1b);
-  do_check_neq(diegest1a, diegest2);
-  
-  var diegest1 = getHMAC(key1, dataA, alg);
-  diegest2 = getHMAC(key1, dataB, alg);
-  
-  do_check_neq(diegest1, diegest2);
-  
-  return diegest1;
+
+  let digest1a = getHMAC(key1, dataA, alg);
+  let digest2 = getHMAC(key2, dataA, alg);
+  let digest1b = getHMAC(key1, dataA, alg);
+
+  equal(digest1a, digest1b,
+        "The digests for the same key, data and algorithm should match");
+  notEqual(digest1a, digest2, "The digests for different keys should not match");
+
+  let digest1 = getHMAC(key1, dataA, alg);
+  digest2 = getHMAC(key1, dataB, alg);
+
+  notEqual(digest1, digest2, "The digests for different data should not match");
 }
 
 function hexdigest(data) {
@@ -56,35 +57,32 @@
 
 function testVectors() {
   // These are test vectors taken from RFC 4231, section 4.3. (Test Case 2)
-  
   const keyTestVector = "Jefe";
   const dataTestVector = "what do ya want for nothing?";
 
-  var diegest;
-  /*
-  Bug 356713    
-  diegest = hexdigest(getHMAC(dataTestVector, keyTestVector, 
-          Components.interfaces.nsICryptoHMAC.SHA224));
-  do_check_eq(diegest, "a30e01098bc6dbbf45690f3a7e9e6d0f8bbea2a39e6148008fd05e44");
-  */
-
-  diegest = hexdigest(getHMAC(dataTestVector, keyTestVector, 
-          Components.interfaces.nsICryptoHMAC.SHA256));
-  do_check_eq(diegest, "5bdcc146bf60754e6a042426089575c75a003f089d2739839dec58b964ec3843"); 
-
-  diegest = hexdigest(getHMAC(dataTestVector, keyTestVector, 
-          Components.interfaces.nsICryptoHMAC.SHA384));
-  do_check_eq(diegest, "af45d2e376484031617f78d2b58a6b1b9c7ef464f5a01b47e42ec3736322445e8e2240ca5e69e2c78b3239ecfab21649"); 
-
-  diegest = hexdigest(getHMAC(dataTestVector, keyTestVector, 
-          Components.interfaces.nsICryptoHMAC.SHA512));
-  do_check_eq(diegest, "164b7a7bfcf819e2e395fbe73b56e0a387bd64222e831fd610270cd7ea2505549758bf75c05a994a6d034f65f8f0e6fdcaeab1a34d4a6b4b636e070a38bce737"); 
+  let digest = hexdigest(getHMAC(dataTestVector, keyTestVector,
+                                 Ci.nsICryptoHMAC.SHA256));
+  equal(digest,
+        "5bdcc146bf60754e6a042426089575c75a003f089d2739839dec58b964ec3843",
+        "Actual and expected SHA-256 digests should match");
+
+  digest = hexdigest(getHMAC(dataTestVector, keyTestVector,
+                             Ci.nsICryptoHMAC.SHA384));
+  equal(digest,
+        "af45d2e376484031617f78d2b58a6b1b9c7ef464f5a01b47e42ec3736322445e8e2240ca5e69e2c78b3239ecfab21649",
+        "Actual and expected SHA-384 digests should match");
+
+  digest = hexdigest(getHMAC(dataTestVector, keyTestVector,
+                             Ci.nsICryptoHMAC.SHA512));
+  equal(digest,
+        "164b7a7bfcf819e2e395fbe73b56e0a387bd64222e831fd610270cd7ea2505549758bf75c05a994a6d034f65f8f0e6fdcaeab1a34d4a6b4b636e070a38bce737",
+        "Actual and expected SHA-512 digests should match");
 }
 
 function run_test() {
   testVectors();
 
-  testHMAC(Components.interfaces.nsICryptoHMAC.SHA1);
-  testHMAC(Components.interfaces.nsICryptoHMAC.SHA512);
-  testHMAC(Components.interfaces.nsICryptoHMAC.MD5);
+  testHMAC(Ci.nsICryptoHMAC.SHA1);
+  testHMAC(Ci.nsICryptoHMAC.SHA512);
+  testHMAC(Ci.nsICryptoHMAC.MD5);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_keysize/generate.py firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_keysize/generate.py
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_keysize/generate.py	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_keysize/generate.py	2015-05-25 20:42:38.000000000 +0000
@@ -20,15 +20,6 @@
                'keyUsage = keyCertSign, cRLSign\n')
 ee_ext_text = ''
 
-aia_prefix = 'authorityInfoAccess = OCSP;URI:http://www.example.com:8888/'
-aia_suffix = '/\n'
-
-mozilla_testing_ev_policy = ('certificatePolicies = @v3_ca_ev_cp\n\n' +
-                             '[ v3_ca_ev_cp ]\n' +
-                             'policyIdentifier = ' +
-                             '1.3.6.1.4.1.13769.666.666.666.1.500.9.1\n\n' +
-                             'CPS.1 = "http://mytestdomain.local/cps"')
-
 generated_ev_root_filenames = []
 generated_certs = []
 
@@ -73,8 +64,8 @@
                       (key_type, key_size))
     if generate_ev:
         cert_name = 'ev_' + cert_name
-        ev_ext_text = (aia_prefix + cert_name + aia_suffix +
-                       mozilla_testing_ev_policy)
+        ev_ext_text = (CertUtils.aia_prefix + cert_name + CertUtils.aia_suffix +
+                       CertUtils.mozilla_testing_ev_policy)
         subject_string += ' (EV)'
 
     # Use the organization field to store the cert nickname for easier debugging
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_keysize_ev.js firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_keysize_ev.js
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_keysize_ev.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_keysize_ev.js	2015-05-25 20:42:38.000000000 +0000
@@ -29,19 +29,6 @@
   return certFromFile(certFilename);
 }
 
-function checkEVStatus(cert, usage, isEVExpected) {
-  do_print("cert cn=" + cert.commonName);
-  do_print("cert o=" + cert.organization);
-  do_print("cert issuer cn=" + cert.issuerCommonName);
-  do_print("cert issuer o=" + cert.issuerOrganization);
-  let hasEVPolicy = {};
-  let verifiedChain = {};
-  let error = certDB.verifyCertNow(cert, usage, NO_FLAGS, null, verifiedChain,
-                                   hasEVPolicy);
-  equal(hasEVPolicy.value, isEVExpected);
-  equal(error, PRErrorCodeSuccess);
-}
-
 /**
  * Adds a single EV key size test.
  *
@@ -69,7 +56,7 @@
     for (let intCertFileName of intCertFileNames) {
       loadCert(intCertFileName, ",,");
     }
-    checkEVStatus(certFromFile(endEntityCertFileName + ".der"),
+    checkEVStatus(certDB, certFromFile(endEntityCertFileName + ".der"),
                   certificateUsageSSLServer, expectedResult);
 
     ocspResponder.stop(run_next_test);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_keysize.js firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_keysize.js
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_keysize.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_keysize.js	2015-05-25 20:42:38.000000000 +0000
@@ -49,9 +49,7 @@
   loadCert(intFullName, ",,");
   let eeCert = certFromFile(eeFullName + ".der");
 
-  do_print("cert cn=" + eeCert.commonName);
   do_print("cert o=" + eeCert.organization);
-  do_print("cert issuer cn=" + eeCert.issuerCommonName);
   do_print("cert issuer o=" + eeCert.issuerOrganization);
   checkCertErrorGeneric(certdb, eeCert, eeExpectedError,
                         certificateUsageSSLServer);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_name_constraints.js firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_name_constraints.js
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_name_constraints.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_name_constraints.js	2015-05-25 20:42:38.000000000 +0000
@@ -20,18 +20,8 @@
   return certFromFile(cert_filename);
 }
 
-function check_cert_err_generic(cert, expected_error, usage) {
-  do_print("cert cn=" + cert.commonName);
-  do_print("cert issuer cn=" + cert.issuerCommonName);
-  let hasEVPolicy = {};
-  let verifiedChain = {};
-  let error = certdb.verifyCertNow(cert, usage, NO_FLAGS, null, verifiedChain,
-                                   hasEVPolicy);
-  do_check_eq(error,  expected_error);
-}
-
 function check_cert_err(cert, expected_error) {
-  check_cert_err_generic(cert, expected_error, certificateUsageSSLServer)
+  checkCertErrorGeneric(certdb, cert, expected_error, certificateUsageSSLServer);
 }
 
 function check_ok(x) {
@@ -39,7 +29,7 @@
 }
 
 function check_ok_ca (x) {
-  return check_cert_err_generic(x, PRErrorCodeSuccess, certificateUsageSSLCA);
+  checkCertErrorGeneric(certdb, x, PRErrorCodeSuccess, certificateUsageSSLCA);
 }
 
 function check_fail(x) {
@@ -47,7 +37,8 @@
 }
 
 function check_fail_ca(x) {
-  return check_cert_err_generic(x, SEC_ERROR_CERT_NOT_IN_NAME_SPACE, certificateUsageSSLCA);
+  checkCertErrorGeneric(certdb, x, SEC_ERROR_CERT_NOT_IN_NAME_SPACE,
+                        certificateUsageSSLCA);
 }
 
 function run_test() {
@@ -266,8 +257,10 @@
   // NSS get it right.
   {
     let cert = certFromFile('cn-www.foo.org-int-nc-perm-foo.com-ca-nc.der');
-    check_cert_err_generic(cert, SEC_ERROR_CERT_NOT_IN_NAME_SPACE, certificateUsageSSLServer);
-    check_cert_err_generic(cert, PRErrorCodeSuccess, certificateUsageSSLClient);
+    checkCertErrorGeneric(certdb, cert, SEC_ERROR_CERT_NOT_IN_NAME_SPACE,
+                          certificateUsageSSLServer);
+    checkCertErrorGeneric(certdb, cert, PRErrorCodeSuccess,
+                          certificateUsageSSLClient);
   }
 
   // DCISS tests
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_ocsp_caching.js firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_ocsp_caching.js
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_ocsp_caching.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_ocsp_caching.js	2015-05-25 20:42:38.000000000 +0000
@@ -47,6 +47,39 @@
 }
 
 function add_tests() {
+  // Test that verifying a certificate with a "short lifetime" doesn't result
+  // in OCSP fetching. Due to longevity requirements in our testing
+  // infrastructure, the certificate we encounter is valid for a very long
+  // time, so we have to define a "short lifetime" as something very long.
+  add_test(function() {
+    Services.prefs.setIntPref("security.pki.cert_short_lifetime_in_days",
+                              12000);
+    run_next_test();
+  });
+  add_connection_test("ocsp-stapling-none.example.com", PRErrorCodeSuccess,
+                      clearSessionCache);
+  add_test(function() {
+    Assert.equal(0, gFetchCount,
+                 "expected zero OCSP requests for a short-lived certificate");
+    Services.prefs.setIntPref("security.pki.cert_short_lifetime_in_days", 100);
+    run_next_test();
+  });
+  // If a "short lifetime" is something more reasonable, ensure that we do OCSP
+  // fetching for this long-lived certificate.
+  add_connection_test("ocsp-stapling-none.example.com", PRErrorCodeSuccess,
+                      clearSessionCache);
+  add_test(function() {
+    Assert.equal(1, gFetchCount,
+                 "expected one OCSP request for a long-lived certificate");
+    Services.prefs.clearUserPref("security.pki.cert_short_lifetime_in_days");
+    run_next_test();
+  });
+
+  //---------------------------------------------------------------------------
+
+  // Reset state
+  add_test(function() { clearOCSPCache(); gFetchCount = 0; run_next_test(); });
+
   // This test assumes that OCSPStaplingServer uses the same cert for
   // ocsp-stapling-unknown.example.com and ocsp-stapling-none.example.com.
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_ocsp_stapling.js firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_ocsp_stapling.js
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_ocsp_stapling.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_ocsp_stapling.js	2015-05-25 20:42:38.000000000 +0000
@@ -109,7 +109,7 @@
   add_ocsp_test("ocsp-stapling-unknown.example.com",
                 SEC_ERROR_OCSP_UNKNOWN_CERT, true);
   add_ocsp_test("ocsp-stapling-good-other.example.com",
-                SEC_ERROR_OCSP_UNKNOWN_CERT, true);
+                MOZILLA_PKIX_ERROR_OCSP_RESPONSE_FOR_CERT_MISSING, true);
   // If the server doesn't staple an OCSP response, we continue as normal
   // (this means that even though stapling is enabled, we expect an OCSP
   // request).
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_pinning_dynamic.js firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_pinning_dynamic.js
--- firefox-trunk-41.0~a1~hg20150513r243603/security/manager/ssl/tests/unit/test_pinning_dynamic.js	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/manager/ssl/tests/unit/test_pinning_dynamic.js	2015-05-25 20:42:39.000000000 +0000
@@ -27,12 +27,12 @@
 
 function checkOK(cert, hostname) {
   return checkCertErrorGeneric(certdb, cert, PRErrorCodeSuccess,
-                               certificateUsageSSLServer, hostname);
+                               certificateUsageSSLServer, {}, hostname);
 }
 
 function checkFail(cert, hostname) {
   return checkCertErrorGeneric(certdb, cert, MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE,
-                               certificateUsageSSLServer, hostname);
+                               certificateUsageSSLServer, {}, hostname);
 }
 
 const NON_ISSUED_KEY_HASH = "KHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAN=";
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/nss/cmd/certutil/certutil.c firefox-trunk-41.0~a1~hg20150524r245419/security/nss/cmd/certutil/certutil.c
--- firefox-trunk-41.0~a1~hg20150513r243603/security/nss/cmd/certutil/certutil.c	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/nss/cmd/certutil/certutil.c	2015-05-25 20:42:41.000000000 +0000
@@ -180,7 +180,7 @@
 
 static SECStatus
 CertReq(SECKEYPrivateKey *privk, SECKEYPublicKey *pubk, KeyType keyType,
-        SECOidTag hashAlgTag, CERTName *subject, char *phone, int ascii, 
+        SECOidTag hashAlgTag, CERTName *subject, const char *phone, int ascii,
 	const char *emailAddrs, const char *dnsNames,
         certutilExtnList extnList, const char *extGeneric,
         /*out*/ SECItem *result)
@@ -270,7 +270,7 @@
 	}
 
 	if (!phone)
-	    phone = strdup("(not specified)");
+	    phone = "(not specified)";
 
 	email = CERT_GetCertEmailAddress(subject);
 	if (!email)
@@ -323,6 +323,7 @@
 	    }
 	    PR_smprintf_free(header);
 	}
+	PORT_Free(obuf);
     } else {
 	(void) SECITEM_CopyItem(NULL, result, &signedReq);
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/nss/coreconf/coreconf.dep firefox-trunk-41.0~a1~hg20150524r245419/security/nss/coreconf/coreconf.dep
--- firefox-trunk-41.0~a1~hg20150513r243603/security/nss/coreconf/coreconf.dep	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/nss/coreconf/coreconf.dep	2015-05-25 20:42:42.000000000 +0000
@@ -10,3 +10,4 @@
  */
 
 #error "Do not include this header file."
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/ckfw/builtins/config.mk firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/ckfw/builtins/config.mk
--- firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/ckfw/builtins/config.mk	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/ckfw/builtins/config.mk	2015-05-25 20:42:44.000000000 +0000
@@ -30,8 +30,5 @@
 # To create a loadable module on Darwin, we must use -bundle.
 #
 ifeq ($(OS_TARGET),Darwin)
-ifndef USE_64
 DSO_LDOPTS = -bundle
 endif
-endif
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/ckfw/capi/config.mk firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/ckfw/capi/config.mk
--- firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/ckfw/capi/config.mk	2015-05-13 18:05:58.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/ckfw/capi/config.mk	2015-05-25 20:42:44.000000000 +0000
@@ -27,8 +27,5 @@
 # To create a loadable module on Darwin, we must use -bundle.
 #
 ifeq ($(OS_TARGET),Darwin)
-ifndef USE_64
 DSO_LDOPTS = -bundle
 endif
-endif
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/cryptohi/keyhi.h firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/cryptohi/keyhi.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/cryptohi/keyhi.h	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/cryptohi/keyhi.h	2015-05-25 20:42:44.000000000 +0000
@@ -37,6 +37,11 @@
 extern SECStatus
 SECKEY_UpdateCertPQG(CERTCertificate * subjectCert);
 
+/*
+** Return the number of bits in the provided big integer.  This assumes that the
+** SECItem contains a big-endian number and counts from the first non-zero bit.
+*/
+extern unsigned SECKEY_BigIntegerBitLength(const SECItem *number);
 
 /*
 ** Return the strength of the public key in bytes
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/cryptohi/seckey.c firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/cryptohi/seckey.c
--- firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/cryptohi/seckey.c	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/cryptohi/seckey.c	2015-05-25 20:42:44.000000000 +0000
@@ -178,8 +178,8 @@
     PK11SlotInfo *slot;
 
     if (!param || !param->base.data || !param->prime.data ||
-        param->prime.len < 512/8 || param->base.len == 0 || 
-        param->base.len > param->prime.len + 1 || 
+        SECKEY_BigIntegerBitLength(&param->prime) < DH_MIN_P_BITS ||
+        param->base.len == 0 || param->base.len > param->prime.len + 1 ||
 	(param->base.len == 1 && param->base.data[0] == 0)) {
 	PORT_SetError(SEC_ERROR_INVALID_ARGS);
 	return NULL;
@@ -941,61 +941,76 @@
     }
 }
 
+/* The number of bits in the number from the first non-zero bit onward. */
+unsigned
+SECKEY_BigIntegerBitLength(const SECItem *number)
+{
+    const unsigned char *p;
+    unsigned octets;
+    unsigned bits;
+
+    if (!number || !number->data) {
+        PORT_SetError(SEC_ERROR_INVALID_KEY);
+        return 0;
+    }
+
+    p = number->data;
+    octets = number->len;
+    while (octets > 0 && !*p) {
+        ++p;
+        --octets;
+    }
+    if (octets == 0) {
+        return 0;
+    }
+    /* bits = 7..1 because we know at least one bit is set already */
+    /* Note: This could do a binary search, but this is faster for keys if we
+     * assume that good keys will have the MSB set. */
+    for (bits = 7; bits > 0; --bits) {
+        if (*p & (1 << bits)) {
+            break;
+        }
+    }
+    return octets * 8 + bits - 7;
+}
+
 /* returns key strength in bytes (not bits) */
 unsigned
 SECKEY_PublicKeyStrength(const SECKEYPublicKey *pubk)
 {
-    unsigned char b0;
-    unsigned size;
-
-    /* interpret modulus length as key strength */
-    if (!pubk)
-    	goto loser;
-    switch (pubk->keyType) {
-    case rsaKey:
-	if (!pubk->u.rsa.modulus.data) break;
-    	b0 = pubk->u.rsa.modulus.data[0];
-    	return b0 ? pubk->u.rsa.modulus.len : pubk->u.rsa.modulus.len - 1;
-    case dsaKey:
-	if (!pubk->u.dsa.publicValue.data) break;
-    	b0 = pubk->u.dsa.publicValue.data[0];
-    	return b0 ? pubk->u.dsa.publicValue.len :
-	    pubk->u.dsa.publicValue.len - 1;
-    case dhKey:
-	if (!pubk->u.dh.publicValue.data) break;
-    	b0 = pubk->u.dh.publicValue.data[0];
-    	return b0 ? pubk->u.dh.publicValue.len :
-	    pubk->u.dh.publicValue.len - 1;
-    case ecKey:
-	/* Get the key size in bits and adjust */
-	size =	SECKEY_ECParamsToKeySize(&pubk->u.ec.DEREncodedParams);
-	return (size + 7)/8;
-    default:
-	break;
-    }
-loser:
-    PORT_SetError(SEC_ERROR_INVALID_KEY);
-    return 0;
+    return (SECKEY_PublicKeyStrengthInBits(pubk) + 7) / 8;
 }
 
 /* returns key strength in bits */
 unsigned
 SECKEY_PublicKeyStrengthInBits(const SECKEYPublicKey *pubk)
 {
-    unsigned size;
+    unsigned bitSize = 0;
+
+    if (!pubk) {
+        PORT_SetError(SEC_ERROR_INVALID_KEY);
+        return 0;
+    }
+
+    /* interpret modulus length as key strength */
     switch (pubk->keyType) {
     case rsaKey:
+        bitSize = SECKEY_BigIntegerBitLength(&pubk->u.rsa.modulus);
+        break;
     case dsaKey:
+        bitSize = SECKEY_BigIntegerBitLength(&pubk->u.dsa.publicValue);
+        break;
     case dhKey:
-	return SECKEY_PublicKeyStrength(pubk) * 8; /* 1 byte = 8 bits */
+        bitSize = SECKEY_BigIntegerBitLength(&pubk->u.dh.publicValue);
+        break;
     case ecKey:
-	size = SECKEY_ECParamsToKeySize(&pubk->u.ec.DEREncodedParams);
-	return size;
+        bitSize = SECKEY_ECParamsToKeySize(&pubk->u.ec.DEREncodedParams);
+        break;
     default:
-	break;
+        PORT_SetError(SEC_ERROR_INVALID_KEY);
+        break;
     }
-    PORT_SetError(SEC_ERROR_INVALID_KEY);
-    return 0;
+    return bitSize;
 }
 
 /* returns signature length in bytes (not bits) */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/freebl/blapit.h firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/freebl/blapit.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/freebl/blapit.h	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/freebl/blapit.h	2015-05-25 20:42:44.000000000 +0000
@@ -138,10 +138,13 @@
  * These values come from the initial key size limits from the PKCS #11
  * module. They may be arbitrarily adjusted to any value freebl supports.
  */
-#define RSA_MIN_MODULUS_BITS   128
+#define RSA_MIN_MODULUS_BITS   512
 #define RSA_MAX_MODULUS_BITS 16384
 #define RSA_MAX_EXPONENT_BITS   64
-#define DH_MIN_P_BITS	       128
+/* 1023 to avoid cases where p = 2q+1 for a 512-bit q turns out to be
+ * only 1023 bits and similar.  We don't have good data on whether this
+ * happens because NSS used to count bit lengths incorrectly. */
+#define DH_MIN_P_BITS	      1023
 #define DH_MAX_P_BITS        16384
 
 /*
@@ -181,7 +184,7 @@
 
 #define DSA1_Q_BITS      160
 #define DSA_MAX_P_BITS	3072
-#define DSA_MIN_P_BITS	 512
+#define DSA_MIN_P_BITS  1023
 #define DSA_MAX_Q_BITS   256
 #define DSA_MIN_Q_BITS   160
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/freebl/ecl/ecp_jac.c firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/freebl/ecl/ecp_jac.c
--- firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/freebl/ecl/ecp_jac.c	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/freebl/ecl/ecp_jac.c	2015-05-25 20:42:45.000000000 +0000
@@ -144,6 +144,20 @@
 	MP_CHECKOK(group->meth->field_sub(&A, px, &C, group->meth));
 	MP_CHECKOK(group->meth->field_sub(&B, py, &D, group->meth));
 
+	if (mp_cmp_z(&C) == 0) {
+		/* P == Q or P == -Q */
+		if (mp_cmp_z(&D) == 0) {
+			/* P == Q */
+			/* It is cheaper to double (qx, qy, 1) than (px, py, pz). */
+			MP_DIGIT(&D, 0) = 1; /* Set D to 1. */
+			MP_CHECKOK(ec_GFp_pt_dbl_jac(qx, qy, &D, rx, ry, rz, group));
+		} else {
+			/* P == -Q */
+			MP_CHECKOK(ec_GFp_pt_set_inf_jac(rx, ry, rz));
+		}
+		goto CLEANUP;
+	}
+
 	/* C2 = C^2, C3 = C^3 */
 	MP_CHECKOK(group->meth->field_sqr(&C, &C2, group->meth));
 	MP_CHECKOK(group->meth->field_mul(&C, &C2, &C3, group->meth));
@@ -205,7 +219,8 @@
 	MP_CHECKOK(mp_init(&M));
 	MP_CHECKOK(mp_init(&S));
 
-	if (ec_GFp_pt_is_inf_jac(px, py, pz) == MP_YES) {
+	/* P == inf or P == -P */
+	if (ec_GFp_pt_is_inf_jac(px, py, pz) == MP_YES || mp_cmp_z(py) == 0) {
 		MP_CHECKOK(ec_GFp_pt_set_inf_jac(rx, ry, rz));
 		goto CLEANUP;
 	}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/freebl/ecl/ecp_jm.c firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/freebl/ecl/ecp_jm.c
--- firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/freebl/ecl/ecp_jm.c	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/freebl/ecl/ecp_jm.c	2015-05-25 20:42:45.000000000 +0000
@@ -16,7 +16,7 @@
  * output that is still field-encoded.
  *
  */
-mp_err
+static mp_err
 ec_GFp_pt_dbl_jm(const mp_int *px, const mp_int *py, const mp_int *pz,
 				 const mp_int *paz4, mp_int *rx, mp_int *ry, mp_int *rz,
 				 mp_int *raz4, mp_int scratch[], const ECGroup *group)
@@ -86,7 +86,7 @@
  * Uses mixed Modified_Jacobian-affine coordinates. Assumes input is
  * already field-encoded using field_enc, and returns output that is still
  * field-encoded. */
-mp_err
+static mp_err
 ec_GFp_pt_add_jm_aff(const mp_int *px, const mp_int *py, const mp_int *pz,
 					 const mp_int *paz4, const mp_int *qx,
 					 const mp_int *qy, mp_int *rx, mp_int *ry, mp_int *rz,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/nss/nss.def firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/nss/nss.def
--- firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/nss/nss.def	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/nss/nss.def	2015-05-25 20:42:46.000000000 +0000
@@ -1076,3 +1076,9 @@
 ;+    local:
 ;+       *;
 ;+};
+;+NSS_3.19.1 { 	# NSS 3.19.1 release
+;+    global:
+SECKEY_BigIntegerBitLength;
+;+    local:
+;+       *;
+;+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/nss/nss.h firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/nss/nss.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/nss/nss.h	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/nss/nss.h	2015-05-25 20:42:46.000000000 +0000
@@ -33,12 +33,12 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define NSS_VERSION  "3.19" _NSS_ECC_STRING _NSS_CUSTOMIZED
+#define NSS_VERSION  "3.19.1" _NSS_ECC_STRING _NSS_CUSTOMIZED " Beta"
 #define NSS_VMAJOR   3
 #define NSS_VMINOR   19
-#define NSS_VPATCH   0
+#define NSS_VPATCH   1
 #define NSS_VBUILD   0
-#define NSS_BETA     PR_FALSE
+#define NSS_BETA     PR_TRUE
 
 #ifndef RC_INVOKED
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/softoken/sftkpwd.c firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/softoken/sftkpwd.c
--- firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/softoken/sftkpwd.c	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/softoken/sftkpwd.c	2015-05-25 20:42:47.000000000 +0000
@@ -1247,7 +1247,7 @@
 	PORT_ZFree(newKey.data,newKey.len);
     }
     if (result) {
-	SECITEM_FreeItem(result, PR_FALSE);
+	SECITEM_FreeItem(result, PR_TRUE);
     }
     if (rv != SECSuccess) {
         (*keydb->db->sdb_Abort)(keydb->db);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/softoken/softkver.h firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/softoken/softkver.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/softoken/softkver.h	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/softoken/softkver.h	2015-05-25 20:42:47.000000000 +0000
@@ -25,11 +25,11 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define SOFTOKEN_VERSION  "3.19" SOFTOKEN_ECC_STRING
+#define SOFTOKEN_VERSION  "3.19.1" SOFTOKEN_ECC_STRING " Beta"
 #define SOFTOKEN_VMAJOR   3
 #define SOFTOKEN_VMINOR   19
-#define SOFTOKEN_VPATCH   0
+#define SOFTOKEN_VPATCH   1
 #define SOFTOKEN_VBUILD   0
-#define SOFTOKEN_BETA     PR_FALSE
+#define SOFTOKEN_BETA     PR_TRUE
 
 #endif /* _SOFTKVER_H_ */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/ssl/ssl3con.c firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/ssl/ssl3con.c
--- firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/ssl/ssl3con.c	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/ssl/ssl3con.c	2015-05-25 20:42:48.000000000 +0000
@@ -5401,9 +5401,7 @@
 	return SECFailure;
     }
     if (ss->opt.enableRenegotiation == SSL_RENEGOTIATE_NEVER) {
-	ssl_GetXmitBufLock(ss);
-	rv = SSL3_SendAlert(ss, alert_warning, no_renegotiation);
-	ssl_ReleaseXmitBufLock(ss);
+	(void)SSL3_SendAlert(ss, alert_warning, no_renegotiation);
 	PORT_SetError(SSL_ERROR_RENEGOTIATION_NOT_ALLOWED);
 	return SECFailure;
     }
@@ -6601,29 +6599,6 @@
     return SECFailure;
 }
 
-/* ssl3_BigIntGreaterThanOne returns true iff |mpint|, taken as an unsigned,
- * big-endian integer is > 1 */
-static PRBool
-ssl3_BigIntGreaterThanOne(const SECItem* mpint) {
-    unsigned char firstNonZeroByte = 0;
-    unsigned int i;
-
-    for (i = 0; i < mpint->len; i++) {
-	if (mpint->data[i]) {
-	    firstNonZeroByte = mpint->data[i];
-	    break;
-	}
-    }
-
-    if (firstNonZeroByte == 0)
-	return PR_FALSE;
-    if (firstNonZeroByte > 1)
-	return PR_TRUE;
-
-    /* firstNonZeroByte == 1, therefore mpint > 1 iff the first non-zero byte
-     * is followed by another byte. */
-    return (i < mpint->len - 1);
-}
 
 /* Called from ssl3_HandleHandshakeMessage() when it has deciphered a complete
  * ssl3 ServerKeyExchange message.
@@ -6668,6 +6643,12 @@
     	if (rv != SECSuccess) {
 	    goto loser;		/* malformed. */
 	}
+        /* This exchange method is only used by export cipher suites.
+         * Those are broken and so this code will eventually be removed. */
+        if (SECKEY_BigIntegerBitLength(&modulus) < 512) {
+            desc = isTLS ? insufficient_security : illegal_parameter;
+            goto alert_loser;
+        }
     	rv = ssl3_ConsumeHandshakeVariable(ss, &exponent, 2, &b, &length);
     	if (rv != SECSuccess) {
 	    goto loser;		/* malformed. */
@@ -6753,12 +6734,16 @@
 	SECItem          dh_p      = {siBuffer, NULL, 0};
 	SECItem          dh_g      = {siBuffer, NULL, 0};
 	SECItem          dh_Ys     = {siBuffer, NULL, 0};
+        unsigned dh_p_bits;
+        unsigned dh_g_bits;
+        unsigned dh_Ys_bits;
 
     	rv = ssl3_ConsumeHandshakeVariable(ss, &dh_p, 2, &b, &length);
     	if (rv != SECSuccess) {
 	    goto loser;		/* malformed. */
 	}
-	if (dh_p.len < 512/8) {
+        dh_p_bits = SECKEY_BigIntegerBitLength(&dh_p);
+        if (dh_p_bits < DH_MIN_P_BITS) {
 	    errCode = SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY;
 	    goto alert_loser;
 	}
@@ -6766,13 +6751,16 @@
     	if (rv != SECSuccess) {
 	    goto loser;		/* malformed. */
 	}
-	if (dh_g.len > dh_p.len || !ssl3_BigIntGreaterThanOne(&dh_g))
+        /* Abort if dh_g is 0, 1, or obviously too big. */
+        dh_g_bits = SECKEY_BigIntegerBitLength(&dh_g);
+        if (dh_g_bits > dh_p_bits || dh_g_bits <= 1)
 	    goto alert_loser;
     	rv = ssl3_ConsumeHandshakeVariable(ss, &dh_Ys, 2, &b, &length);
     	if (rv != SECSuccess) {
 	    goto loser;		/* malformed. */
 	}
-	if (dh_Ys.len > dh_p.len || !ssl3_BigIntGreaterThanOne(&dh_Ys))
+        dh_Ys_bits = SECKEY_BigIntegerBitLength(&dh_Ys);
+        if (dh_Ys_bits > dh_p_bits || dh_Ys_bits <= 1)
 	    goto alert_loser;
 	if (isTLS12) {
 	    rv = ssl3_ConsumeSignatureAndHashAlgorithm(ss, &b, &length,
@@ -8881,6 +8869,10 @@
 	         2 + sdPub->u.rsa.publicExponent.len +
 	         2 + signed_hash.len;
 
+	if (ss->ssl3.pwSpec->version >= SSL_LIBRARY_VERSION_TLS_1_2) {
+	    length += 2;
+	}
+
 	rv = ssl3_AppendHandshakeHeader(ss, server_key_exchange, length);
 	if (rv != SECSuccess) {
 	    goto loser; 	/* err set by AppendHandshake. */
@@ -10055,33 +10047,25 @@
 	if (pubKey) {
 	    ss->sec.keaKeyBits = ss->sec.authKeyBits =
 		SECKEY_PublicKeyStrengthInBits(pubKey);
-#ifndef NSS_DISABLE_ECC
-	    if (ss->sec.keaType == kt_ecdh) {
-		/* Get authKeyBits from signing key.
-		 * XXX The code below uses a quick approximation of
-		 * key size based on cert->signatureWrap.signature.data
-		 * (which contains the DER encoded signature). The field
-		 * cert->signatureWrap.signature.len contains the
-		 * length of the encoded signature in bits.
-		 */
-		if (ss->ssl3.hs.kea_def->kea == kea_ecdh_ecdsa) {
-		    ss->sec.authKeyBits = 
-			cert->signatureWrap.signature.data[3]*8;
-		    if (cert->signatureWrap.signature.data[4] == 0x00)
-			    ss->sec.authKeyBits -= 8;
-		    /* 
-		     * XXX: if cert is not signed by ecdsa we should
-		     * destroy pubKey and goto bad_cert
-		     */
-		} else if (ss->ssl3.hs.kea_def->kea == kea_ecdh_rsa) {
-		    ss->sec.authKeyBits = cert->signatureWrap.signature.len;
-		    /* 
-		     * XXX: if cert is not signed by rsa we should
-		     * destroy pubKey and goto bad_cert
-		     */
-		}
-	    }
-#endif /* NSS_DISABLE_ECC */
+            KeyType pubKeyType = SECKEY_GetPublicKeyType(pubKey);
+            /* Too small: not good enough. Send a fatal alert. */
+            /* TODO: Use 1023 for RSA because a higher RSA_MIN_MODULUS_BITS
+             * breaks export cipher suites, not 1024 to be conservative; when
+             * export removed, increase RSA_MIN_MODULUS_BITS and use that. */
+            /* We aren't checking EC here on the understanding that we only
+             * support curves we like, a decision that might need revisiting. */
+            if (((pubKeyType == rsaKey || pubKeyType == rsaPssKey ||
+                  pubKeyType == rsaOaepKey) && ss->sec.authKeyBits < 1023) ||
+                (pubKeyType == dsaKey && ss->sec.authKeyBits < DSA_MIN_P_BITS) ||
+                (pubKeyType == dhKey && ss->sec.authKeyBits < DH_MIN_P_BITS)) {
+                PORT_SetError(SSL_ERROR_WEAK_SERVER_CERT_KEY);
+                (void)SSL3_SendAlert(ss, alert_fatal,
+                                     ss->version >= SSL_LIBRARY_VERSION_TLS_1_0
+                                     ? insufficient_security
+                                     : illegal_parameter);
+                SECKEY_DestroyPublicKey(pubKey);
+                return SECFailure;
+            }
 	    SECKEY_DestroyPublicKey(pubKey); 
 	    pubKey = NULL;
     	}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/ssl/ssl3ext.c firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/ssl/ssl3ext.c
--- firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/ssl/ssl3ext.c	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/ssl/ssl3ext.c	2015-05-25 20:42:48.000000000 +0000
@@ -625,8 +625,8 @@
 
     rv = ssl3_ValidateNextProtoNego(data->data, data->len);
     if (rv != SECSuccess) {
-        PORT_SetError(SSL_ERROR_NEXT_PROTOCOL_DATA_INVALID);
         (void)SSL3_SendAlert(ss, alert_fatal, decode_error);
+        PORT_SetError(SSL_ERROR_NEXT_PROTOCOL_DATA_INVALID);
         return rv;
     }
 
@@ -653,8 +653,8 @@
         ss->ssl3.nextProtoState != SSL_NEXT_PROTO_NEGOTIATED) {
         /* The callback might say OK, but then it picks a default value - one
          * that was not listed.  That's OK for NPN, but not ALPN. */
-        PORT_SetError(SSL_ERROR_NEXT_PROTOCOL_NO_PROTOCOL);
         (void)SSL3_SendAlert(ss, alert_fatal, no_application_protocol);
+        PORT_SetError(SSL_ERROR_NEXT_PROTOCOL_NO_PROTOCOL);
         return SECFailure;
     }
 
@@ -673,8 +673,8 @@
      * despite it being permitted by the spec. */
     if (ss->firstHsDone || data->len == 0) {
         /* Clients MUST send a non-empty ALPN extension. */
-        PORT_SetError(SSL_ERROR_NEXT_PROTOCOL_DATA_INVALID);
         (void)SSL3_SendAlert(ss, alert_fatal, illegal_parameter);
+        PORT_SetError(SSL_ERROR_NEXT_PROTOCOL_DATA_INVALID);
         return SECFailure;
     }
 
@@ -701,8 +701,8 @@
         rv = ssl3_RegisterServerHelloExtensionSender(
             ss, ex_type, ssl3_ServerSendAppProtoXtn);
         if (rv != SECSuccess) {
-            PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);
             (void)SSL3_SendAlert(ss, alert_fatal, internal_error);
+            PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);
             return rv;
         }
     }
@@ -722,8 +722,8 @@
          * we've negotiated NPN then we're required to send the NPN handshake
          * message. Thus, these two extensions cannot both be negotiated on the
          * same connection. */
-        PORT_SetError(SSL_ERROR_BAD_SERVER);
         (void)SSL3_SendAlert(ss, alert_fatal, illegal_parameter);
+        PORT_SetError(SSL_ERROR_BAD_SERVER);
         return SECFailure;
     }
 
@@ -733,8 +733,8 @@
      * we sent the ClientHello and now. */
     if (!ss->nextProtoCallback) {
         PORT_Assert(0);
-        PORT_SetError(SSL_ERROR_NEXT_PROTOCOL_NO_CALLBACK);
         (void)SSL3_SendAlert(ss, alert_fatal, internal_error);
+        PORT_SetError(SSL_ERROR_NEXT_PROTOCOL_NO_CALLBACK);
         return SECFailure;
     }
 
@@ -758,16 +758,16 @@
      *   uint8 len;  // where len >= 1
      *   uint8 protocol_name[len]; */
     if (data->len < 4 || data->len > 2 + 1 + 255) {
-        PORT_SetError(SSL_ERROR_NEXT_PROTOCOL_DATA_INVALID);
         (void)SSL3_SendAlert(ss, alert_fatal, decode_error);
+        PORT_SetError(SSL_ERROR_NEXT_PROTOCOL_DATA_INVALID);
         return SECFailure;
     }
 
     list_len = ssl3_ConsumeHandshakeNumber(ss, 2, &data->data, &data->len);
     /* The list has to be the entire extension. */
     if (list_len != data->len) {
-        PORT_SetError(SSL_ERROR_NEXT_PROTOCOL_DATA_INVALID);
         (void)SSL3_SendAlert(ss, alert_fatal, decode_error);
+        PORT_SetError(SSL_ERROR_NEXT_PROTOCOL_DATA_INVALID);
         return SECFailure;
     }
 
@@ -775,8 +775,8 @@
                                        &data->data, &data->len);
     /* The list must have exactly one value. */
     if (rv != SECSuccess || data->len != 0) {
-        PORT_SetError(SSL_ERROR_NEXT_PROTOCOL_DATA_INVALID);
         (void)SSL3_SendAlert(ss, alert_fatal, decode_error);
+        PORT_SetError(SSL_ERROR_NEXT_PROTOCOL_DATA_INVALID);
         return SECFailure;
     }
 
@@ -2063,8 +2063,8 @@
     }
     if (len && NSS_SecureMemcmp(ss->ssl3.hs.finishedMsgs.data,
                                 data->data + 1, len)) {
-        PORT_SetError(SSL_ERROR_BAD_HANDSHAKE_HASH_VALUE);
         (void)SSL3_SendAlert(ss, alert_fatal, handshake_failure);
+        PORT_SetError(SSL_ERROR_BAD_HANDSHAKE_HASH_VALUE);
         return SECFailure;
     }
     /* remember that we got this extension and it was correct. */
@@ -2188,8 +2188,8 @@
     }
 
     if (!found) {
-        PORT_SetError(SSL_ERROR_RX_MALFORMED_SERVER_HELLO);
         (void)SSL3_SendAlert(ss, alert_fatal, illegal_parameter);
+        PORT_SetError(SSL_ERROR_RX_MALFORMED_SERVER_HELLO);
         return SECFailure;
     }
 
@@ -2202,8 +2202,8 @@
 
     /* We didn't offer an MKI, so this must be 0 length */
     if (litem.len != 0) {
-        PORT_SetError(SSL_ERROR_RX_MALFORMED_SERVER_HELLO);
         (void)SSL3_SendAlert(ss, alert_fatal, illegal_parameter);
+        PORT_SetError(SSL_ERROR_RX_MALFORMED_SERVER_HELLO);
         return SECFailure;
     }
 
@@ -2313,8 +2313,8 @@
     }
     /* Trailing data, empty value, or odd-length value is invalid. */
     if (data->len != 0 || algorithms.len == 0 || (algorithms.len & 1) != 0) {
-        PORT_SetError(SSL_ERROR_RX_MALFORMED_CLIENT_HELLO);
         (void)SSL3_SendAlert(ss, alert_fatal, decode_error);
+        PORT_SetError(SSL_ERROR_RX_MALFORMED_CLIENT_HELLO);
         return SECFailure;
     }
 
@@ -2328,8 +2328,8 @@
     ss->ssl3.hs.clientSigAndHash =
             PORT_NewArray(SSL3SignatureAndHashAlgorithm, numAlgorithms);
     if (!ss->ssl3.hs.clientSigAndHash) {
-        PORT_SetError(SSL_ERROR_RX_MALFORMED_CLIENT_HELLO);
         (void)SSL3_SendAlert(ss, alert_fatal, internal_error);
+        PORT_SetError(SSL_ERROR_RX_MALFORMED_CLIENT_HELLO);
         return SECFailure;
     }
     ss->ssl3.hs.numClientSigAndHash = 0;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/ssl/sslerr.h firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/ssl/sslerr.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/ssl/sslerr.h	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/ssl/sslerr.h	2015-05-25 20:42:48.000000000 +0000
@@ -198,6 +198,8 @@
 
 SSL_ERROR_INAPPROPRIATE_FALLBACK_ALERT  = (SSL_ERROR_BASE + 131),
 
+SSL_ERROR_WEAK_SERVER_CERT_KEY          = (SSL_ERROR_BASE + 132),
+
 SSL_ERROR_END_OF_LIST   /* let the c compiler determine the value of this. */
 } SSLErrorCodes;
 #endif /* NO_SECURITY_ERROR_ENUM */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/ssl/SSLerrs.h firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/ssl/SSLerrs.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/ssl/SSLerrs.h	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/ssl/SSLerrs.h	2015-05-25 20:42:47.000000000 +0000
@@ -422,3 +422,6 @@
 ER3(SSL_ERROR_INAPPROPRIATE_FALLBACK_ALERT, (SSL_ERROR_BASE + 131),
 "The server rejected the handshake because the client downgraded to a lower "
 "TLS version than the server supports.")
+
+ER3(SSL_ERROR_WEAK_SERVER_CERT_KEY, (SSL_ERROR_BASE + 132),
+"The server certificate included a public key that was too weak.")
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/util/nssutil.h firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/util/nssutil.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/nss/lib/util/nssutil.h	2015-05-13 18:05:59.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/nss/lib/util/nssutil.h	2015-05-25 20:42:48.000000000 +0000
@@ -19,12 +19,12 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
  */
-#define NSSUTIL_VERSION  "3.19"
+#define NSSUTIL_VERSION  "3.19.1 Beta"
 #define NSSUTIL_VMAJOR   3
 #define NSSUTIL_VMINOR   19
-#define NSSUTIL_VPATCH   0
+#define NSSUTIL_VPATCH   1
 #define NSSUTIL_VBUILD   0
-#define NSSUTIL_BETA     PR_FALSE
+#define NSSUTIL_BETA     PR_TRUE
 
 SEC_BEGIN_PROTOS
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/nss/TAG-INFO firefox-trunk-41.0~a1~hg20150524r245419/security/nss/TAG-INFO
--- firefox-trunk-41.0~a1~hg20150513r243603/security/nss/TAG-INFO	2015-05-13 18:05:57.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/nss/TAG-INFO	2015-05-25 20:42:39.000000000 +0000
@@ -1 +1 @@
-NSS_3_19_RTM
+NSS_3_19_1_BETA1
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/include/pkix/pkixnss.h firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/include/pkix/pkixnss.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/include/pkix/pkixnss.h	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/include/pkix/pkixnss.h	2015-05-25 20:42:50.000000000 +0000
@@ -82,6 +82,7 @@
   MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE = ERROR_BASE + 5,
   MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE = ERROR_BASE + 6,
   MOZILLA_PKIX_ERROR_SIGNATURE_ALGORITHM_MISMATCH = ERROR_BASE + 7,
+  MOZILLA_PKIX_ERROR_OCSP_RESPONSE_FOR_CERT_MISSING = ERROR_BASE + 8,
 };
 
 void RegisterErrorTable();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/include/pkix/pkixtypes.h firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/include/pkix/pkixtypes.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/include/pkix/pkixtypes.h	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/include/pkix/pkixtypes.h	2015-05-25 20:42:50.000000000 +0000
@@ -268,6 +268,7 @@
 
   virtual Result CheckRevocation(EndEntityOrCA endEntityOrCA,
                                  const CertID& certID, Time time,
+                                 Duration validityDuration,
                     /*optional*/ const Input* stapledOCSPresponse,
                     /*optional*/ const Input* aiaExtension) = 0;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/include/pkix/Result.h firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/include/pkix/Result.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/include/pkix/Result.h	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/include/pkix/Result.h	2015-05-25 20:42:50.000000000 +0000
@@ -181,6 +181,8 @@
                      SEC_ERROR_UNSUPPORTED_EC_POINT_FORM) \
     MOZILLA_PKIX_MAP(ERROR_SIGNATURE_ALGORITHM_MISMATCH, 48, \
                      MOZILLA_PKIX_ERROR_SIGNATURE_ALGORITHM_MISMATCH) \
+    MOZILLA_PKIX_MAP(ERROR_OCSP_RESPONSE_FOR_CERT_MISSING, 49, \
+                     MOZILLA_PKIX_ERROR_OCSP_RESPONSE_FOR_CERT_MISSING) \
     MOZILLA_PKIX_MAP(FATAL_ERROR_INVALID_ARGS, FATAL_ERROR_FLAG | 1, \
                      SEC_ERROR_INVALID_ARGS) \
     MOZILLA_PKIX_MAP(FATAL_ERROR_INVALID_STATE, FATAL_ERROR_FLAG | 2, \
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/include/pkix/Time.h firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/include/pkix/Time.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/include/pkix/Time.h	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/include/pkix/Time.h	2015-05-25 20:42:50.000000000 +0000
@@ -107,6 +107,7 @@
   {
   }
   friend Time TimeFromElapsedSecondsAD(uint64_t);
+  friend class Duration;
 
   uint64_t elapsedSecondsAD;
 };
@@ -121,6 +122,30 @@
 // Note the epoch is the unix epoch (ie 00:00:00 UTC, 1 January 1970)
 Time TimeFromEpochInSeconds(uint64_t secondsSinceEpoch);
 
+class Duration final
+{
+public:
+  Duration(Time timeA, Time timeB)
+    : durationInSeconds(timeA < timeB
+                        ? timeB.elapsedSecondsAD - timeA.elapsedSecondsAD
+                        : timeA.elapsedSecondsAD - timeB.elapsedSecondsAD)
+  {
+  }
+
+  explicit Duration(uint64_t durationInSeconds)
+    : durationInSeconds(durationInSeconds)
+  {
+  }
+
+  bool operator<(const Duration& other) const
+  {
+    return durationInSeconds < other.durationInSeconds;
+  }
+
+private:
+  uint64_t durationInSeconds;
+};
+
 } } // namespace mozilla::pkix
 
 #endif // mozilla_pkix_Time_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/lib/pkixbuild.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/lib/pkixbuild.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/lib/pkixbuild.cpp	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/lib/pkixbuild.cpp	2015-05-25 20:42:50.000000000 +0000
@@ -224,8 +224,17 @@
   if (deferredSubjectError != Result::ERROR_EXPIRED_CERTIFICATE) {
     CertID certID(subject.GetIssuer(), potentialIssuer.GetSubjectPublicKeyInfo(),
                   subject.GetSerialNumber());
+    Time notBefore(Time::uninitialized);
+    Time notAfter(Time::uninitialized);
+    // This should never fail. If we're here, we've already checked that the
+    // given time is in the certificate's validity period.
+    rv = CheckValidity(subject.GetValidity(), time, &notBefore, &notAfter);
+    if (rv != Success) {
+      return rv;
+    }
+    Duration validityDuration(notAfter, notBefore);
     rv = trustDomain.CheckRevocation(subject.endEntityOrCA, certID, time,
-                                     stapledOCSPResponse,
+                                     validityDuration, stapledOCSPResponse,
                                      subject.GetAuthorityInfoAccess());
     if (rv != Success) {
       return RecordResult(rv, keepGoing);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/lib/pkixcheck.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/lib/pkixcheck.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/lib/pkixcheck.cpp	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/lib/pkixcheck.cpp	2015-05-25 20:42:50.000000000 +0000
@@ -125,7 +125,9 @@
 // 4.1.2.5 Validity
 
 Result
-CheckValidity(Input encodedValidity, Time time)
+CheckValidity(Input encodedValidity, Time time,
+              /*optional out*/ Time* notBeforeOut,
+              /*optional out*/ Time* notAfterOut)
 {
   Reader validity(encodedValidity);
   Time notBefore(Time::uninitialized);
@@ -154,6 +156,12 @@
     return Result::ERROR_EXPIRED_CERTIFICATE;
   }
 
+  if (notBeforeOut) {
+    *notBeforeOut = notBefore;
+  }
+  if (notAfterOut) {
+    *notAfterOut = notAfter;
+  }
   return Success;
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/lib/pkixcheck.h firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/lib/pkixcheck.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/lib/pkixcheck.h	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/lib/pkixcheck.h	2015-05-25 20:42:50.000000000 +0000
@@ -45,6 +45,10 @@
                             const BackCert& firstChild,
                             KeyPurposeId requiredEKUIfPresent);
 
+Result CheckValidity(Input encodedValidity, Time time,
+                     /*optional out*/ Time* notBeforeOut = nullptr,
+                     /*optional out*/ Time* notAfterOut = nullptr);
+
 } } // namespace mozilla::pkix
 
 #endif // mozilla_pkix_pkixcheck_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/lib/pkixnss.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/lib/pkixnss.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/lib/pkixnss.cpp	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/lib/pkixnss.cpp	2015-05-25 20:42:50.000000000 +0000
@@ -197,6 +197,9 @@
     { "MOZILLA_PKIX_ERROR_SIGNATURE_ALGORITHM_MISMATCH",
       "The signature algorithm in the signature field of the certificate does "
       "not match the algorithm in its signatureAlgorithm field." },
+    { "MOZILLA_PKIX_ERROR_OCSP_RESPONSE_FOR_CERT_MISSING",
+      "The OCSP response does not include a status for the certificate being "
+      "verified." },
   };
   // Note that these error strings are not localizable.
   // When these strings change, update the localization information too.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/lib/pkixocsp.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/lib/pkixocsp.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/lib/pkixocsp.cpp	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/lib/pkixocsp.cpp	2015-05-25 20:42:50.000000000 +0000
@@ -57,6 +57,7 @@
     , thisUpdate(thisUpdate)
     , validThrough(validThrough)
     , expired(false)
+    , matchFound(false)
   {
     if (thisUpdate) {
       *thisUpdate = TimeFromElapsedSecondsAD(0);
@@ -75,6 +76,12 @@
   Time* validThrough;
   bool expired;
 
+  // Keep track of whether the OCSP response contains the status of the
+  // certificate we're interested in. Responders might reply without
+  // including the status of any of the requested certs, we should
+  // indicate a server failure in those cases.
+  bool matchFound;
+
   Context(const Context&) = delete;
   void operator=(const Context&) = delete;
 };
@@ -312,6 +319,9 @@
   if (rv != Success) {
     return MapBadDERToMalformedOCSPResponse(rv);
   }
+  if (!context.matchFound) {
+    return Result::ERROR_OCSP_RESPONSE_FOR_CERT_MISSING;
+  }
 
   expired = context.expired;
 
@@ -528,6 +538,9 @@
     return Success;
   }
 
+  // We found a response for the cert we're interested in.
+  context.matchFound = true;
+
   // CertStatus ::= CHOICE {
   //     good        [0]     IMPLICIT NULL,
   //     revoked     [1]     IMPLICIT RevokedInfo,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/test/gtest/pkixbuild_tests.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/test/gtest/pkixbuild_tests.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/test/gtest/pkixbuild_tests.cpp	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/test/gtest/pkixbuild_tests.cpp	2015-05-25 20:42:50.000000000 +0000
@@ -139,7 +139,7 @@
     return Success;
   }
 
-  Result CheckRevocation(EndEntityOrCA, const CertID&, Time,
+  Result CheckRevocation(EndEntityOrCA, const CertID&, Time, Duration,
                          /*optional*/ const Input*, /*optional*/ const Input*)
                          override
   {
@@ -403,7 +403,7 @@
     return Success;
   }
 
-  Result CheckRevocation(EndEntityOrCA, const CertID&, Time,
+  Result CheckRevocation(EndEntityOrCA, const CertID&, Time, Duration,
                          /*optional*/ const Input*, /*optional*/ const Input*)
                          override
   {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/test/gtest/pkixcert_extension_tests.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/test/gtest/pkixcert_extension_tests.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/test/gtest/pkixcert_extension_tests.cpp	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/test/gtest/pkixcert_extension_tests.cpp	2015-05-25 20:42:50.000000000 +0000
@@ -68,7 +68,7 @@
     return Success;
   }
 
-  Result CheckRevocation(EndEntityOrCA, const CertID&, Time,
+  Result CheckRevocation(EndEntityOrCA, const CertID&, Time, Duration,
                          /*optional*/ const Input*, /*optional*/ const Input*)
                          override
   {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/test/gtest/pkixcert_signature_algorithm_tests.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/test/gtest/pkixcert_signature_algorithm_tests.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/test/gtest/pkixcert_signature_algorithm_tests.cpp	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/test/gtest/pkixcert_signature_algorithm_tests.cpp	2015-05-25 20:42:50.000000000 +0000
@@ -91,8 +91,8 @@
     return checker.Check(issuerCert, nullptr, keepGoing);
   }
 
-  Result CheckRevocation(EndEntityOrCA, const CertID&, Time, const Input*,
-                         const Input*) override
+  Result CheckRevocation(EndEntityOrCA, const CertID&, Time, Duration,
+                         const Input*, const Input*) override
   {
     return Success;
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/test/gtest/pkixcheck_CheckSignatureAlgorithm_tests.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/test/gtest/pkixcheck_CheckSignatureAlgorithm_tests.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/test/gtest/pkixcheck_CheckSignatureAlgorithm_tests.cpp	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/test/gtest/pkixcheck_CheckSignatureAlgorithm_tests.cpp	2015-05-25 20:42:50.000000000 +0000
@@ -292,7 +292,7 @@
     return Success;
   }
 
-  Result CheckRevocation(EndEntityOrCA, const CertID&, Time,
+  Result CheckRevocation(EndEntityOrCA, const CertID&, Time, Duration,
                          /*optional*/ const Input*,
                          /*optional*/ const Input*) override
   {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/test/gtest/pkixcheck_CheckValidity_tests.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/test/gtest/pkixcheck_CheckValidity_tests.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/test/gtest/pkixcheck_CheckValidity_tests.cpp	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/test/gtest/pkixcheck_CheckValidity_tests.cpp	2015-05-25 20:42:50.000000000 +0000
@@ -22,17 +22,12 @@
  * limitations under the License.
  */
 
+#include "pkixcheck.h"
 #include "pkixgtest.h"
 
 using namespace mozilla::pkix;
 using namespace mozilla::pkix::test;
 
-namespace mozilla { namespace pkix {
-
-Result CheckValidity(const Input encodedValidity, Time time);
-
-} } // namespace mozilla::pkix
-
 static const Time PAST_TIME(YMDHMS(1998, 12, 31, 12, 23, 56));
 
 #define OLDER_GENERALIZEDTIME \
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/test/gtest/pkixgtest.h firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/test/gtest/pkixgtest.h
--- firefox-trunk-41.0~a1~hg20150513r243603/security/pkix/test/gtest/pkixgtest.h	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/pkix/test/gtest/pkixgtest.h	2015-05-25 20:42:50.000000000 +0000
@@ -102,7 +102,7 @@
                       Result::FATAL_ERROR_LIBRARY_FAILURE);
   }
 
-  Result CheckRevocation(EndEntityOrCA, const CertID&, Time,
+  Result CheckRevocation(EndEntityOrCA, const CertID&, Time, Duration,
                           /*optional*/ const Input*,
                           /*optional*/ const Input*) override
   {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/sandbox/linux/SandboxChroot.cpp firefox-trunk-41.0~a1~hg20150524r245419/security/sandbox/linux/SandboxChroot.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/security/sandbox/linux/SandboxChroot.cpp	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/sandbox/linux/SandboxChroot.cpp	2015-05-25 20:42:51.000000000 +0000
@@ -78,8 +78,19 @@
   // the program (nor need it to be cleaned up if something goes wrong
   // here, because mkdtemp will choose a fresh name), so /tmp as
   // specified by FHS is adequate.
-  char path[] = "/tmp/mozsandbox.XXXXXX";
-  if (!mkdtemp(path)) {
+  //
+  // However, this needs a filesystem where a deleted directory can
+  // still be used, and /tmp is sometimes not that; e.g., aufs(5),
+  // often used for containers, will cause the chroot() to fail with
+  // ESTALE (bug 1162965).  So this uses /dev/shm if possible instead.
+  char tmpPath[] = "/tmp/mozsandbox.XXXXXX";
+  char shmPath[] = "/dev/shm/mozsandbox.XXXXXX";
+  char* path;
+  if (mkdtemp(shmPath)) {
+    path = shmPath;
+  } else if (mkdtemp(tmpPath)) {
+    path = tmpPath;
+  } else {
     SANDBOX_LOG_ERROR("mkdtemp: %s", strerror(errno));
     return -1;
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/security/sandbox/win/wow_helper/Makefile.in firefox-trunk-41.0~a1~hg20150524r245419/security/sandbox/win/wow_helper/Makefile.in
--- firefox-trunk-41.0~a1~hg20150513r243603/security/sandbox/win/wow_helper/Makefile.in	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/security/sandbox/win/wow_helper/Makefile.in	2015-05-25 20:42:51.000000000 +0000
@@ -30,7 +30,7 @@
 # Munge the LIB variable to contain paths to the x64 CRT and system libraries.
 # Unconveniently, none of the paths have the same convention, including the
 # compiler path above.
-LIB = $(call lazy,LIB,$$(shell python -c 'import os; print ";".join(s.lower().replace(os.sep, "/").replace("/vc/lib", "/vc/lib/amd64").replace("/um/x86", "/um/x64") for s in os.environ["LIB"].split(";"))'))
+LIB = $(call lazy,LIB,$$(shell python -c 'import os; print ";".join(s.lower().replace(os.sep, "/").replace("/vc/lib", "/vc/lib/amd64").replace("/um/x86", "/um/x64").replace("/ucrt/x86", "/ucrt/x64") for s in os.environ["LIB"].split(";"))'))
 
 CXXFLAGS := $(filter-out -arch:IA32,$(CXXFLAGS))
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/services/cloudsync/tests/mochitest/browser_tabEvents.js firefox-trunk-41.0~a1~hg20150524r245419/services/cloudsync/tests/mochitest/browser_tabEvents.js
--- firefox-trunk-41.0~a1~hg20150513r243603/services/cloudsync/tests/mochitest/browser_tabEvents.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/services/cloudsync/tests/mochitest/browser_tabEvents.js	2015-05-25 20:42:51.000000000 +0000
@@ -7,7 +7,7 @@
   let local = {};
 
   Components.utils.import("resource://gre/modules/CloudSync.jsm", local);
-  Components.utils.import("resource:///modules/sessionstore/TabState.jsm", local);
+  Components.utils.import("resource:///modules/sessionstore/TabStateFlusher.jsm", local);
 
   let cloudSync = local.CloudSync();
   let opentabs = [];
@@ -58,11 +58,11 @@
 
     function flush() {
       tab.linkedBrowser.removeEventListener("load", flush, true);
-      local.TabState.flush(tab.linkedBrowser);
-      ++ nflushed;
-      info("flushed " + nflushed);
-
-      next();
+      local.TabStateFlusher.flush(tab.linkedBrowser).then(() => {
+        ++ nflushed;
+        info("flushed " + nflushed);
+        next();
+      });
     }
 
     tab.linkedBrowser.addEventListener("load", flush, true);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/services/common/async.js firefox-trunk-41.0~a1~hg20150524r245419/services/common/async.js
--- firefox-trunk-41.0~a1~hg20150513r243603/services/common/async.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/services/common/async.js	2015-05-25 20:42:51.000000000 +0000
@@ -194,9 +194,9 @@
 
   querySpinningly: function querySpinningly(query, names) {
     // 'Synchronously' asyncExecute, fetching all results by name.
-    let storageCallback = {names: names,
-                           syncCb: Async.makeSyncCallback()};
-    storageCallback.__proto__ = Async._storageCallbackPrototype;
+    let storageCallback = Object.create(Async._storageCallbackPrototype);
+    storageCallback.names = names;
+    storageCallback.syncCb = Async.makeSyncCallback();
     query.executeAsync(storageCallback);
     return Async.waitForSyncCallback(storageCallback.syncCb);
   },
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/services/common/logmanager.js firefox-trunk-41.0~a1~hg20150524r245419/services/common/logmanager.js
--- firefox-trunk-41.0~a1~hg20150513r243603/services/common/logmanager.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/services/common/logmanager.js	2015-05-25 20:42:51.000000000 +0000
@@ -45,15 +45,97 @@
 // A set of all preference roots used by all instances.
 let allBranches = new Set();
 
+// A storage appender that is flushable to a file on disk.  Policies for
+// when to flush, to what file, log rotation etc are up to the consumer
+// (although it does maintain a .sawError property to help the consumer decide
+// based on its policies)
+function FlushableStorageAppender(formatter) {
+  Log.StorageStreamAppender.call(this, formatter);
+  this.sawError = false;
+}
+
+FlushableStorageAppender.prototype = {
+  __proto__: Log.StorageStreamAppender.prototype,
+
+  append(message) {
+    if (message.level >= Log.Level.Error) {
+      this.sawError = true;
+    }
+    Log.StorageStreamAppender.prototype.append.call(this, message);
+  },
+
+  reset() {
+    Log.StorageStreamAppender.prototype.reset.call(this);
+    this.sawError = false;
+  },
+
+  // Flush the current stream to a file. Somewhat counter-intuitively, you
+  // must pass a log which will be written to with details of the operation.
+  flushToFile: Task.async(function* (subdirArray, filename, log) {
+    let inStream = this.getInputStream();
+    this.reset();
+    if (!inStream) {
+      log.debug("Failed to flush log to a file - no input stream");
+      return;
+    }
+    log.debug("Flushing file log");
+    log.trace("Beginning stream copy to " + filename + ": " + Date.now());
+    try {
+      yield this._copyStreamToFile(inStream, subdirArray, filename, log);
+      log.trace("onCopyComplete", Date.now());
+    } catch (ex) {
+      log.error("Failed to copy log stream to file", ex);
+    }
+  }),
+
+  /**
+   * Copy an input stream to the named file, doing everything off the main
+   * thread.
+   * subDirArray is an array of path components, relative to the profile
+   * directory, where the file will be created.
+   * outputFileName is the filename to create.
+   * Returns a promise that is resolved on completion or rejected with an error.
+   */
+  _copyStreamToFile: Task.async(function* (inputStream, subdirArray, outputFileName, log) {
+    // The log data could be large, so we don't want to pass it all in a single
+    // message, so use BUFFER_SIZE chunks.
+    const BUFFER_SIZE = 8192;
+
+    // get a binary stream
+    let binaryStream = Cc["@mozilla.org/binaryinputstream;1"].createInstance(Ci.nsIBinaryInputStream);
+    binaryStream.setInputStream(inputStream);
+
+    let outputDirectory = OS.Path.join(OS.Constants.Path.profileDir, ...subdirArray);
+    yield OS.File.makeDir(outputDirectory, { ignoreExisting: true, from: OS.Constants.Path.profileDir });
+    let fullOutputFileName = OS.Path.join(outputDirectory, outputFileName);
+    let output = yield OS.File.open(fullOutputFileName, { write: true} );
+    try {
+      while (true) {
+        let available = binaryStream.available();
+        if (!available) {
+          break;
+        }
+        let chunk = binaryStream.readByteArray(Math.min(available, BUFFER_SIZE));
+        yield output.write(new Uint8Array(chunk));
+      }
+    } finally {
+      try {
+        binaryStream.close(); // inputStream is closed by the binaryStream
+        yield output.close();
+      } catch (ex) {
+        log.error("Failed to close the input stream", ex);
+      }
+    }
+    log.trace("finished copy to", fullOutputFileName);
+  }),
+}
+
 // The public LogManager object.
 function LogManager(prefRoot, logNames, logFilePrefix) {
   this.init(prefRoot, logNames, logFilePrefix);
 }
 
 LogManager.prototype = {
-  REASON_SUCCESS: "success",
-  REASON_ERROR: "error",
-
   _cleaningUpFileLogs: false,
 
   _prefObservers: [],
@@ -102,11 +184,11 @@
       return observer;
     }
 
-    this._observeConsolePref = setupAppender(consoleAppender, "log.appender.console", Log.Level.Error, true);
+    this._observeConsolePref = setupAppender(consoleAppender, "log.appender.console", Log.Level.Fatal, true);
     this._observeDumpPref = setupAppender(dumpAppender, "log.appender.dump", Log.Level.Error, true);
 
     // The file appender doesn't get the special singleton behaviour.
-    let fapp = this._fileAppender = new Log.StorageStreamAppender(formatter);
+    let fapp = this._fileAppender = new FlushableStorageAppender(formatter);
     // the stream gets a default of Debug as the user must go out of their way
     // to see the stuff spewed to it.
     this._observeStreamPref = setupAppender(fapp, "log.appender.file.level", Log.Level.Debug);
@@ -150,109 +232,62 @@
     return ["weave", "logs"];
   },
 
-  /**
-   * Copy an input stream to the named file, doing everything off the main
-   * thread.
-   * outputFileName is a string with the tail of the filename - the file will
-   * be created in the log directory.
-   * Returns a promise that is resolved<undefined> on completion or rejected if
-   * there is an error.
-   */
-  _copyStreamToFile: Task.async(function* (inputStream, outputFileName) {
-    // The log data could be large, so we don't want to pass it all in a single
-    // message, so use BUFFER_SIZE chunks.
-    const BUFFER_SIZE = 8192;
-
-    // get a binary stream
-    let binaryStream = Cc["@mozilla.org/binaryinputstream;1"].createInstance(Ci.nsIBinaryInputStream);
-    binaryStream.setInputStream(inputStream);
-    // We assume the profile directory exists, but not that the dirs under it do.
-    let profd = FileUtils.getDir("ProfD", []);
-    let outputFile = FileUtils.getDir("ProfD", this._logFileSubDirectoryEntries);
-    yield OS.File.makeDir(outputFile.path, { ignoreExisting: true, from: profd.path });
-    outputFile.append(outputFileName);
-    let output = yield OS.File.open(outputFile.path, { write: true} );
-    try {
-      while (true) {
-        let available = binaryStream.available();
-        if (!available) {
-          break;
-        }
-        let chunk = binaryStream.readByteArray(Math.min(available, BUFFER_SIZE));
-        yield output.write(new Uint8Array(chunk));
-      }
-    } finally {
-      try {
-        binaryStream.close(); // inputStream is closed by the binaryStream
-        yield output.close();
-      } catch (ex) {
-        this._log.error("Failed to close the input stream", ex);
-      }
-    }
-    this._log.trace("finished copy to", outputFile.path);
-  }),
+  // Result values for resetFileLog.
+  SUCCESS_LOG_WRITTEN: "success-log-written",
+  ERROR_LOG_WRITTEN: "error-log-written",
 
   /**
    * Possibly generate a log file for all accumulated log messages and refresh
    * the input & output streams.
-   * Returns a promise that resolves on completion or rejects if the file could
-   * not be written.
+   * Whether a "success" or "error" log is written is determined based on
+   * whether an "Error" log entry was written to any of the logs.
+   * Returns a promise that resolves on completion with either null (for no
+   * file written or on error), SUCCESS_LOG_WRITTEN if a "success" log was
+   * written, or ERROR_LOG_WRITTEN if an "error" log was written.
    */
-  resetFileLog: Task.async(function* (reason) {
+  resetFileLog: Task.async(function* () {
     try {
       let flushToFile;
       let reasonPrefix;
-      switch (reason) {
-        case this.REASON_SUCCESS:
-          flushToFile = this._prefs.get("log.appender.file.logOnSuccess", false);
-          reasonPrefix = "success";
-          break;
-        case this.REASON_ERROR:
-          flushToFile = this._prefs.get("log.appender.file.logOnError", true);
-          reasonPrefix = "error";
-          break;
-        default:
-          throw new Error("Invalid reason");
+      let reason;
+      if (this._fileAppender.sawError) {
+        reason = this.ERROR_LOG_WRITTEN;
+        flushToFile = this._prefs.get("log.appender.file.logOnError", true);
+        reasonPrefix = "error";
+      } else {
+        reason = this.SUCCESS_LOG_WRITTEN;
+        flushToFile = this._prefs.get("log.appender.file.logOnSuccess", false);
+        reasonPrefix = "success";
       }
 
       // might as well avoid creating an input stream if we aren't going to use it.
       if (!flushToFile) {
         this._fileAppender.reset();
-        return;
+        return null;
       }
 
-      let inStream = this._fileAppender.getInputStream();
-      this._fileAppender.reset();
-      if (inStream) {
-        this._log.debug("Flushing file log");
-        // We have reasonPrefix at the start of the filename so all "error"
-        // logs are grouped in about:sync-log.
-        let filename = reasonPrefix + "-" + this.logFilePrefix + "-" + Date.now() + ".txt";
-        this._log.trace("Beginning stream copy to " + filename + ": " +
-                        Date.now());
-        try {
-          yield this._copyStreamToFile(inStream, filename);
-          this._log.trace("onCopyComplete", Date.now());
-        } catch (ex) {
-          this._log.error("Failed to copy log stream to file", ex);
-          return;
-        }
-        // It's not completely clear to markh why we only do log cleanups
-        // for errors, but for now the Sync semantics have been copied...
-        // (one theory is that only cleaning up on error makes it less
-        // likely old error logs would be removed, but that's not true if
-        // there are occasional errors - let's address this later!)
-        if (reason == this.REASON_ERROR && !this._cleaningUpFileLogs) {
-          this._log.trace("Scheduling cleanup.");
-          // Note we don't return/yield or otherwise wait on this promise - it
-          // continues in the background
-          this.cleanupLogs().catch(err => {
-            this._log.error("Failed to cleanup logs", err);
-          });
-        }
+      // We have reasonPrefix at the start of the filename so all "error"
+      // logs are grouped in about:sync-log.
+      let filename = reasonPrefix + "-" + this.logFilePrefix + "-" + Date.now() + ".txt";
+      yield this._fileAppender.flushToFile(this._logFileSubDirectoryEntries, filename, this._log);
+
+      // It's not completely clear to markh why we only do log cleanups
+      // for errors, but for now the Sync semantics have been copied...
+      // (one theory is that only cleaning up on error makes it less
+      // likely old error logs would be removed, but that's not true if
+      // there are occasional errors - let's address this later!)
+      if (reason == this.ERROR_LOG_WRITTEN && !this._cleaningUpFileLogs) {
+        this._log.trace("Scheduling cleanup.");
+        // Note we don't return/yield or otherwise wait on this promise - it
+        // continues in the background
+        this.cleanupLogs().catch(err => {
+          this._log.error("Failed to cleanup logs", err);
+        });
       }
+      return reason;
     } catch (ex) {
-      this._log.error("Failed to resetFileLog", ex)
+      this._log.error("Failed to resetFileLog", ex);
+      return null;
     }
   }),
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/services/common/tests/unit/test_logmanager.js firefox-trunk-41.0~a1~hg20150524r245419/services/common/tests/unit/test_logmanager.js
--- firefox-trunk-41.0~a1~hg20150513r243603/services/common/tests/unit/test_logmanager.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/services/common/tests/unit/test_logmanager.js	2015-05-25 20:42:52.000000000 +0000
@@ -30,10 +30,10 @@
 
   let log = Log.repository.getLogger("TestLog");
   let [capp, dapp, fapps] = getAppenders(log);
-  // the "dump" and "console" appenders should get Error level
-  equal(capp.level, Log.Level.Error);
+  // The console appender gets "Fatal" while the "dump" appender gets "Error" levels
+  equal(capp.level, Log.Level.Fatal);
   equal(dapp.level, Log.Level.Error);
-  // and the file (stream) appender gets Dump by default
+  // and the file (stream) appender gets Debug by default
   equal(fapps.length, 1, "only 1 file appender");
   equal(fapps[0].level, Log.Level.Debug);
   lm.finalize();
@@ -62,7 +62,7 @@
   Services.prefs.setCharPref("log-manager.test.log.appender.console", "xxx");
   Services.prefs.setCharPref("log-manager.test.log.appender.dump", "xxx");
   Services.prefs.setCharPref("log-manager.test.log.appender.file.level", "xxx");
-  equal(capp.level, Log.Level.Error);
+  equal(capp.level, Log.Level.Fatal);
   equal(dapp.level, Log.Level.Error);
   equal(fapp.level, Log.Level.Debug);
   lm.finalize();
@@ -131,5 +131,99 @@
   yield lm.resetFileLog(lm.REASON_ERROR);
   // One error log file exists.
   checkLogFile("error");
+
+  lm.finalize();
+});
+
+// Test that we correctly write success logs.
+add_task(function* test_logFileSuccess() {
+  Services.prefs.setBoolPref("log-manager.test.log.appender.file.logOnError", false);
+  Services.prefs.setBoolPref("log-manager.test.log.appender.file.logOnSuccess", false);
+
+  let lm = new LogManager("log-manager.test.", ["TestLog2"], "test");
+
+  let log = Log.repository.getLogger("TestLog2");
+  log.info("an info message");
+  yield lm.resetFileLog();
+  // Zero log files exist.
+  checkLogFile(null);
+
+  // Reset logOnSuccess and do it again - log should appear.
+  Services.prefs.setBoolPref("log-manager.test.log.appender.file.logOnSuccess", true);
+  log.info("an info message");
+  yield lm.resetFileLog();
+
+  checkLogFile("success");
+
+  // Now test with no "reason" specified and no "error" record.
+  log.info("an info message");
+  yield lm.resetFileLog();
+  // should get a "success" entry.
+  checkLogFile("success");
+
+  // With no "reason" and an error record - should get no success log.
+  log.error("an error message");
+  yield lm.resetFileLog();
+  // should get no entry
+  checkLogFile(null);
+
+  // And finally now with no error, to ensure that the fact we had an error
+  // previously doesn't persist after the .resetFileLog call.
+  log.info("an info message");
+  yield lm.resetFileLog();
+  checkLogFile("success");
+
+  lm.finalize();
+});
+
+// Test that we correctly write error logs.
+add_task(function* test_logFileError() {
+  Services.prefs.setBoolPref("log-manager.test.log.appender.file.logOnError", false);
+  Services.prefs.setBoolPref("log-manager.test.log.appender.file.logOnSuccess", false);
+
+  let lm = new LogManager("log-manager.test.", ["TestLog2"], "test");
+
+  let log = Log.repository.getLogger("TestLog2");
+  log.info("an info message");
+  let reason = yield lm.resetFileLog();
+  Assert.equal(reason, null, "null returned when no file created.");
+  // Zero log files exist.
+  checkLogFile(null);
+
+  // Reset logOnSuccess - success logs should appear if no error records.
+  Services.prefs.setBoolPref("log-manager.test.log.appender.file.logOnSuccess", true);
+  log.info("an info message");
+  reason = yield lm.resetFileLog();
+  Assert.equal(reason, lm.SUCCESS_LOG_WRITTEN);
+  checkLogFile("success");
+
+  // Set logOnError and unset logOnSuccess - error logs should appear.
+  Services.prefs.setBoolPref("log-manager.test.log.appender.file.logOnSuccess", false);
+  Services.prefs.setBoolPref("log-manager.test.log.appender.file.logOnError", true);
+  log.error("an error message");
+  reason = yield lm.resetFileLog();
+  Assert.equal(reason, lm.ERROR_LOG_WRITTEN);
+  checkLogFile("error");
+
+  // Now test with no "error" record.
+  log.info("an info message");
+  reason = yield lm.resetFileLog();
+  // should get no file
+  Assert.equal(reason, null);
+  checkLogFile(null);
+
+  // With an error record we should get an error log.
+  log.error("an error message");
+  reason = yield lm.resetFileLog();
+  // should get en error log
+  Assert.equal(reason, lm.ERROR_LOG_WRITTEN);
+  checkLogFile("error");
+
+  // And finally now with success, to ensure that the fact we had an error
+  // previously doesn't persist after the .resetFileLog call.
+  log.info("an info message");
+  yield lm.resetFileLog();
+  checkLogFile(null);
+
   lm.finalize();
 });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/services/fxaccounts/FxAccounts.jsm firefox-trunk-41.0~a1~hg20150524r245419/services/fxaccounts/FxAccounts.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/services/fxaccounts/FxAccounts.jsm	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/services/fxaccounts/FxAccounts.jsm	2015-05-25 20:42:52.000000000 +0000
@@ -1200,7 +1200,7 @@
   // the current account's profile image.
   // if settingToEdit is set, the profile page should hightlight that setting
   // for the user to edit.
-  promiseAccountsChangeProfileURI: function(settingToEdit = null) {
+  promiseAccountsChangeProfileURI: function(entrypoint, settingToEdit = null) {
     let url = Services.urlFormatter.formatURLPref("identity.fxaccounts.settings.uri");
 
     if (settingToEdit) {
@@ -1220,13 +1220,16 @@
       let newQueryPortion = url.indexOf("?") == -1 ? "?" : "&";
       newQueryPortion += "email=" + encodeURIComponent(accountData.email);
       newQueryPortion += "&uid=" + encodeURIComponent(accountData.uid);
+      if (entrypoint) {
+        newQueryPortion += "&entrypoint=" + encodeURIComponent(entrypoint);
+      }
       return url + newQueryPortion;
     }).then(result => currentState.resolve(result));
   },
 
   // Returns a promise that resolves with the URL to use to manage the current
   // user's FxA acct.
-  promiseAccountsManageURI: function() {
+  promiseAccountsManageURI: function(entrypoint) {
     let url = Services.urlFormatter.formatURLPref("identity.fxaccounts.settings.uri");
     if (this._requireHttps() && !/^https:/.test(url)) { // Comment to un-break emacs js-mode highlighting
       throw new Error("Firefox Accounts server must use HTTPS");
@@ -1242,6 +1245,9 @@
       let newQueryPortion = url.indexOf("?") == -1 ? "?" : "&";
       newQueryPortion += "uid=" + encodeURIComponent(accountData.uid) +
                          "&email=" + encodeURIComponent(accountData.email);
+      if (entrypoint) {
+        newQueryPortion += "&entrypoint=" + encodeURIComponent(entrypoint);
+      }
       return url + newQueryPortion;
     }).then(result => currentState.resolve(result));
   },
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/services/fxaccounts/FxAccountsManager.jsm firefox-trunk-41.0~a1~hg20150524r245419/services/fxaccounts/FxAccountsManager.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/services/fxaccounts/FxAccountsManager.jsm	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/services/fxaccounts/FxAccountsManager.jsm	2015-05-25 20:42:52.000000000 +0000
@@ -510,14 +510,9 @@
       return this._error(ERROR_INVALID_AUDIENCE);
     }
 
-    let secMan = Cc["@mozilla.org/scriptsecuritymanager;1"]
-                   .getService(Ci.nsIScriptSecurityManager);
-    let uri = Services.io.newURI(aPrincipal.origin, null, null);
+    let principal = aPrincipal;
     log.debug("FxAccountsManager.getAssertion() aPrincipal: ",
-              aPrincipal.origin, aPrincipal.appId,
-              aPrincipal.isInBrowserElement);
-    let principal = secMan.getAppCodebasePrincipal(uri,
-      aPrincipal.appId, aPrincipal.isInBrowserElement);
+              principal.origin, principal.appId, principal.isInBrowserElement);
 
     return this.getAccount().then(
       user => {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/services/fxaccounts/tests/xpcshell/test_manager.js firefox-trunk-41.0~a1~hg20150524r245419/services/fxaccounts/tests/xpcshell/test_manager.js
--- firefox-trunk-41.0~a1~hg20150513r243603/services/fxaccounts/tests/xpcshell/test_manager.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/services/fxaccounts/tests/xpcshell/test_manager.js	2015-05-25 20:42:52.000000000 +0000
@@ -21,7 +21,13 @@
 let certExpired = false;
 
 // Mock RP
-let principal = {origin: 'app://settings.gaiamobile.org', appId: 27}
+function makePrincipal(origin, appId) {
+  let secMan = Cc["@mozilla.org/scriptsecuritymanager;1"]
+                 .getService(Ci.nsIScriptSecurityManager);
+  let uri = Services.io.newURI(origin, null, null);
+  return secMan.getAppCodebasePrincipal(uri, appId, false);
+}
+let principal = makePrincipal('app://settings.gaiamobile.org', 27, false);
 
 // For override FxAccountsUIGlue.
 let fakeFxAccountsUIGlueCID;
@@ -443,15 +449,10 @@
 add_test(function(test_getAssertion_no_permissions) {
   do_print("= getAssertion no permissions =");
 
-  let noPermissionsPrincipal = {origin: 'app://dummy', appId: 28};
-  let secMan = Cc["@mozilla.org/scriptsecuritymanager;1"]
-                 .getService(Ci.nsIScriptSecurityManager);
-  let uri = Services.io.newURI(noPermissionsPrincipal.origin, null, null);
-  let _principal = secMan.getAppCodebasePrincipal(uri,
-    noPermissionsPrincipal.appId, false);
+  let noPermissionsPrincipal = makePrincipal('app://dummy', 28);
   let permMan = Cc["@mozilla.org/permissionmanager;1"]
                   .getService(Ci.nsIPermissionManager);
-  permMan.addFromPrincipal(_principal, FXACCOUNTS_PERMISSION,
+  permMan.addFromPrincipal(noPermissionsPrincipal, FXACCOUNTS_PERMISSION,
                            Ci.nsIPermissionManager.DENY_ACTION);
 
   FxAccountsUIGlue._activeSession = {
@@ -477,15 +478,10 @@
 add_test(function(test_getAssertion_permission_prompt_action) {
   do_print("= getAssertion PROMPT_ACTION permission =");
 
-  let promptPermissionsPrincipal = {origin: 'app://dummy-prompt', appId: 29};
-  let secMan = Cc["@mozilla.org/scriptsecuritymanager;1"]
-                 .getService(Ci.nsIScriptSecurityManager);
-  let uri = Services.io.newURI(promptPermissionsPrincipal.origin, null, null);
-  let _principal = secMan.getAppCodebasePrincipal(uri,
-    promptPermissionsPrincipal.appId, false);
+  let promptPermissionsPrincipal = makePrincipal('app://dummy-prompt', 29);
   let permMan = Cc["@mozilla.org/permissionmanager;1"]
                   .getService(Ci.nsIPermissionManager);
-  permMan.addFromPrincipal(_principal, FXACCOUNTS_PERMISSION,
+  permMan.addFromPrincipal(promptPermissionsPrincipal, FXACCOUNTS_PERMISSION,
                            Ci.nsIPermissionManager.PROMPT_ACTION);
 
   FxAccountsUIGlue._activeSession = {
@@ -501,7 +497,7 @@
       do_check_eq(result, "assertion");
 
       let permission = permMan.testPermissionFromPrincipal(
-        _principal,
+        promptPermissionsPrincipal,
         FXACCOUNTS_PERMISSION
       );
       do_check_eq(permission, Ci.nsIPermissionManager.ALLOW_ACTION);
@@ -518,15 +514,10 @@
 add_test(function(test_getAssertion_permission_prompt_action_refreshing) {
   do_print("= getAssertion PROMPT_ACTION permission already refreshing =");
 
-  let promptPermissionsPrincipal = {origin: 'app://dummy-prompt-2', appId: 30};
-  let secMan = Cc["@mozilla.org/scriptsecuritymanager;1"]
-                 .getService(Ci.nsIScriptSecurityManager);
-  let uri = Services.io.newURI(promptPermissionsPrincipal.origin, null, null);
-  let _principal = secMan.getAppCodebasePrincipal(uri,
-    promptPermissionsPrincipal.appId, false);
+  let promptPermissionsPrincipal = makePrincipal('app://dummy-prompt-2', 30);
   let permMan = Cc["@mozilla.org/permissionmanager;1"]
                   .getService(Ci.nsIPermissionManager);
-  permMan.addFromPrincipal(_principal, FXACCOUNTS_PERMISSION,
+  permMan.addFromPrincipal(promptPermissionsPrincipal, FXACCOUNTS_PERMISSION,
                            Ci.nsIPermissionManager.PROMPT_ACTION);
 
   FxAccountsUIGlue._activeSession = {
@@ -544,7 +535,7 @@
       do_check_null(result);
 
       let permission = permMan.testPermissionFromPrincipal(
-        _principal,
+        promptPermissionsPrincipal,
         FXACCOUNTS_PERMISSION
       );
       do_check_eq(permission, Ci.nsIPermissionManager.PROMPT_ACTION);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/services/fxaccounts/tests/xpcshell/xpcshell.ini firefox-trunk-41.0~a1~hg20150524r245419/services/fxaccounts/tests/xpcshell/xpcshell.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/services/fxaccounts/tests/xpcshell/xpcshell.ini	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/services/fxaccounts/tests/xpcshell/xpcshell.ini	2015-05-25 20:42:52.000000000 +0000
@@ -19,5 +19,5 @@
 [test_oauth_token_storage.js]
 [test_profile_client.js]
 [test_web_channel.js]
-skip-if = appname == 'b2g' # fxa web channels only used on desktop
+skip-if = (appname == 'b2g' || appname == 'thunderbird') # fxa web channels only used on desktop
 [test_profile.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/services/mobileid/MobileIdentityManager.jsm firefox-trunk-41.0~a1~hg20150524r245419/services/mobileid/MobileIdentityManager.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/services/mobileid/MobileIdentityManager.jsm	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/services/mobileid/MobileIdentityManager.jsm	2015-05-25 20:42:52.000000000 +0000
@@ -233,8 +233,9 @@
     }
 
     return this._iccInfo;
-#endif
+#else
     return null;
+#endif
   },
 
   get iccIds() {
@@ -253,8 +254,9 @@
     }
 
     return this._iccIds;
-#endif
+#else
     return null;
+#endif
   },
 
   get credStore() {
@@ -784,7 +786,7 @@
         if (promptResult.serviceId) {
           let creds = this.iccInfo[promptResult.serviceId].credentials;
           if (creds) {
-            this.credStore.add(creds.iccId, creds.msisdn, aPrincipal.origin,
+            this.credStore.add(creds.iccId, creds.msisdn, aPrincipal.originNoSuffix,
                                creds.sessionToken, this.iccIds);
             return creds;
           }
@@ -797,13 +799,13 @@
         .then(
           (creds) => {
             if (creds) {
-              this.credStore.add(creds.iccId, creds.msisdn, aPrincipal.origin,
+              this.credStore.add(creds.iccId, creds.msisdn, aPrincipal.originNoSuffix,
                                  creds.sessionToken, this.iccIds);
               return creds;
             }
             // Otherwise, we need to verify the new number selected by the
             // user.
-            return this.verificationFlow(promptResult, aPrincipal.origin);
+            return this.verificationFlow(promptResult, aPrincipal.originNoSuffix);
           }
         );
       }
@@ -916,11 +918,11 @@
     // First of all we look if we already have credentials for this origin.
     // If we don't have credentials it means that it is the first time that
     // the caller requested an assertion.
-    this.credStore.getByOrigin(aPrincipal.origin)
+    this.credStore.getByOrigin(aPrincipal.originNoSuffix)
     .then(
       (creds) => {
         log.debug("creds ${creds} - ${origin}", { creds: creds,
-                                                  origin: aPrincipal.origin });
+                                                  origin: aPrincipal.originNoSuffix });
         if (!creds || !creds.sessionToken) {
           log.debug("No credentials");
           return;
@@ -935,7 +937,7 @@
           .then(
             (newCreds) => {
               return this.checkNewCredentials(creds, newCreds,
-                                              principal.origin);
+                                              principal.originNoSuffix);
             }
           );
         }
@@ -979,7 +981,7 @@
         .then(
           (newCreds) => {
             return this.checkNewCredentials(creds, newCreds,
-                                            principal.origin);
+                                            principal.originNoSuffix);
           }
         );
       }
@@ -1009,7 +1011,7 @@
     .then(
       (creds) => {
         if (creds) {
-          return this.generateAssertion(creds, principal.origin);
+          return this.generateAssertion(creds, principal.originNoSuffix);
         }
         return Promise.reject(ERROR_INTERNAL_CANNOT_GENERATE_ASSERTION);
       }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/services/sync/modules/engines/bookmarks.js firefox-trunk-41.0~a1~hg20150524r245419/services/sync/modules/engines/bookmarks.js
--- firefox-trunk-41.0~a1~hg20150513r243603/services/sync/modules/engines/bookmarks.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/services/sync/modules/engines/bookmarks.js	2015-05-25 20:42:52.000000000 +0000
@@ -771,7 +771,10 @@
                          guid: record.id};
       PlacesUtils.livemarks.addLivemark(livemarkObj).then(
         aLivemark => { spinningCb(null, [Components.results.NS_OK, aLivemark]) },
-        () => { spinningCb(null, [Components.results.NS_ERROR_UNEXPECTED, aLivemark]) }
+        ex => {
+          this._log.error("creating livemark failed: " + ex);
+          spinningCb(null, [Components.results.NS_ERROR_UNEXPECTED, null])
+        }
       );
 
       let [status, livemark] = spinningCb.wait();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/services/sync/modules/policies.js firefox-trunk-41.0~a1~hg20150524r245419/services/sync/modules/policies.js
--- firefox-trunk-41.0~a1~hg20150513r243603/services/sync/modules/policies.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/services/sync/modules/policies.js	2015-05-25 20:42:52.000000000 +0000
@@ -602,7 +602,8 @@
         this._log.debug(engine_name + " failed: " + Utils.exceptionStr(exception));
         break;
       case "weave:service:login:error":
-        this.resetFileLog(this._logManager.REASON_ERROR);
+        this._log.error("Sync encountered a login error");
+        this.resetFileLog();
 
         if (this.shouldReportError()) {
           this.notifyOnNextTick("weave:ui:login:error");
@@ -617,7 +618,8 @@
           this.service.logout();
         }
 
-        this.resetFileLog(this._logManager.REASON_ERROR);
+        this._log.error("Sync encountered an error");
+        this.resetFileLog();
 
         if (this.shouldReportError()) {
           this.notifyOnNextTick("weave:ui:sync:error");
@@ -642,8 +644,8 @@
         }
 
         if (Status.service == SYNC_FAILED_PARTIAL) {
-          this._log.debug("Some engines did not sync correctly.");
-          this.resetFileLog(this._logManager.REASON_ERROR);
+          this._log.error("Some engines did not sync correctly.");
+          this.resetFileLog();
 
           if (this.shouldReportError()) {
             this.dontIgnoreErrors = false;
@@ -651,7 +653,7 @@
             break;
           }
         } else {
-          this.resetFileLog(this._logManager.REASON_SUCCESS);
+          this.resetFileLog();
         }
         this.dontIgnoreErrors = false;
         this.notifyOnNextTick("weave:ui:sync:finish");
@@ -681,19 +683,18 @@
   /**
    * Generate a log file for the sync that just completed
    * and refresh the input & output streams.
-   *
-   * @param reason
-   *        A constant from the LogManager that indicates the reason for the
-   *        reset.
    */
-  resetFileLog: function resetFileLog(reason) {
-    let onComplete = () => {
+  resetFileLog: function resetFileLog() {
+    let onComplete = logType => {
       Svc.Obs.notify("weave:service:reset-file-log");
       this._log.trace("Notified: " + Date.now());
+      if (logType == this._logManager.ERROR_LOG_WRITTEN) {
+        Cu.reportError("Sync encountered an error - see about:sync-log for the log file.");
+      }
     };
     // Note we do not return the promise here - the caller doesn't need to wait
     // for this to complete.
-    this._logManager.resetFileLog(reason).then(onComplete, onComplete);
+    this._logManager.resetFileLog().then(onComplete, onComplete);
   },
 
   /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/services/sync/services-sync.js firefox-trunk-41.0~a1~hg20150524r245419/services/sync/services-sync.js
--- firefox-trunk-41.0~a1~hg20150513r243603/services/sync/services-sync.js	2015-05-13 18:06:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/services/sync/services-sync.js	2015-05-25 20:42:52.000000000 +0000
@@ -54,7 +54,7 @@
 // Comma-delimited list of hostnames to trust for add-on install.
 pref("services.sync.addons.trustedSourceHostnames", "addons.mozilla.org");
 
-pref("services.sync.log.appender.console", "Warn");
+pref("services.sync.log.appender.console", "Fatal");
 pref("services.sync.log.appender.dump", "Error");
 pref("services.sync.log.appender.file.level", "Trace");
 pref("services.sync.log.appender.file.logOnError", true);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/services/sync/tests/unit/test_errorhandler_filelog.js firefox-trunk-41.0~a1~hg20150524r245419/services/sync/tests/unit/test_errorhandler_filelog.js
--- firefox-trunk-41.0~a1~hg20150513r243603/services/sync/tests/unit/test_errorhandler_filelog.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/services/sync/tests/unit/test_errorhandler_filelog.js	2015-05-25 20:42:53.000000000 +0000
@@ -81,16 +81,14 @@
 });
 
 function readFile(file, callback) {
-  NetUtil.asyncFetch2(file, function (inputStream, statusCode, request) {
+  NetUtil.asyncFetch({
+    uri: NetUtil.newURI(file),
+    loadUsingSystemPrincipal: true
+  }, function (inputStream, statusCode, request) {
     let data = NetUtil.readInputStreamToString(inputStream,
                                                inputStream.available());
     callback(statusCode, data);
-  },
-  null,      // aLoadingNode
-  Services.scriptSecurityManager.getSystemPrincipal(),
-  null,      // aTriggeringPrincipal
-  Ci.nsILoadInfo.SEC_NORMAL,
-  Ci.nsIContentPolicy.TYPE_OTHER);
+  });
 }
 
 add_test(function test_logOnSuccess_true() {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/startupcache/StartupCache.cpp firefox-trunk-41.0~a1~hg20150524r245419/startupcache/StartupCache.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/startupcache/StartupCache.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/startupcache/StartupCache.cpp	2015-05-25 20:42:53.000000000 +0000
@@ -81,7 +81,7 @@
   return NS_OK;
 }
 
-static const char sStartupCacheName[] = "startupCache." SC_WORDSIZE "." SC_ENDIAN;
+#define STARTUP_CACHE_NAME "startupCache." SC_WORDSIZE "." SC_ENDIAN
 
 StartupCache*
 StartupCache::GetSingleton()
@@ -196,7 +196,7 @@
     if (NS_FAILED(rv) && rv != NS_ERROR_FILE_ALREADY_EXISTS)
       return rv;
 
-    rv = file->AppendNative(NS_LITERAL_CSTRING(sStartupCacheName));
+    rv = file->AppendNative(NS_LITERAL_CSTRING(STARTUP_CACHE_NAME));
 
     NS_ENSURE_SUCCESS(rv, rv);
 
@@ -347,22 +347,26 @@
   nsAutoArrayPtr<char> data(new char[len]);
   memcpy(data, inbuf, len);
 
-  nsDependentCString idStr(id);
+  nsCString idStr(id);
   // Cache it for now, we'll write all together later.
   CacheEntry* entry; 
   
+  if (mTable.Get(idStr)) {
+    NS_ASSERTION(false, "Existing entry in StartupCache.");
+    // Double-caching is undesirable but not an error.
+    return NS_OK;
+  }
+
 #ifdef DEBUG
-  mTable.Get(idStr, &entry);
-  NS_ASSERTION(entry == nullptr, "Existing entry in StartupCache.");
-  
   if (mArchive) {
     nsZipItem* zipItem = mArchive->GetItem(id);
     NS_ASSERTION(zipItem == nullptr, "Existing entry in disk StartupCache.");
   }
 #endif
-  
+
   entry = new CacheEntry(data.forget(), len);
   mTable.Put(idStr, entry);
+  mPendingWrites.AppendElement(idStr);
   return ResetStartupWriteTimer();
 }
 
@@ -378,7 +382,8 @@
     // This function could measure more members, but they haven't been found by
     // DMD to be significant.  They can be added later if necessary.
     return aMallocSizeOf(this) +
-           mTable.SizeOfExcludingThis(SizeOfEntryExcludingThis, aMallocSizeOf);
+           mTable.SizeOfExcludingThis(SizeOfEntryExcludingThis, aMallocSizeOf) +
+           mPendingWrites.SizeOfExcludingThis(aMallocSizeOf);
 }
 
 /* static */ size_t
@@ -395,13 +400,13 @@
   PRTime time;
 };
 
-PLDHashOperator
-CacheCloseHelper(const nsACString& key, nsAutoPtr<CacheEntry>& data, 
-                 void* closure) 
+static void
+CacheCloseHelper(const nsACString& key, const CacheEntry* data,
+                 const CacheWriteHolder* holder)
 {
+  MOZ_ASSERT(data); // assert key was found in mTable.
+
   nsresult rv;
- 
-  CacheWriteHolder* holder = (CacheWriteHolder*) closure;  
   nsIStringInputStream* stream = holder->stream;
   nsIZipWriter* writer = holder->writer;
 
@@ -414,11 +419,10 @@
                "Existing entry in disk StartupCache.");
 #endif
   rv = writer->AddEntryStream(key, holder->time, true, stream, false);
-  
+
   if (NS_FAILED(rv)) {
     NS_WARNING("cache entry deleted but not written to disk.");
   }
-  return PL_DHASH_REMOVE;
 }
 
 
@@ -468,7 +472,11 @@
   holder.writer = zipW;
   holder.time = now;
 
-  mTable.Enumerate(CacheCloseHelper, &holder);
+  for (auto key = mPendingWrites.begin(); key != mPendingWrites.end(); key++) {
+    CacheCloseHelper(*key, mTable.Get(*key), &holder);
+  }
+  mPendingWrites.Clear();
+  mTable.Clear();
 
   // Close the archive so Windows doesn't choke.
   mArchive = nullptr;
@@ -487,6 +495,7 @@
 StartupCache::InvalidateCache() 
 {
   WaitOnWriteThread();
+  mPendingWrites.Clear();
   mTable.Clear();
   mArchive = nullptr;
   nsresult rv = mFile->Remove(false);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/startupcache/StartupCache.h firefox-trunk-41.0~a1~hg20150524r245419/startupcache/StartupCache.h
--- firefox-trunk-41.0~a1~hg20150513r243603/startupcache/StartupCache.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/startupcache/StartupCache.h	2015-05-25 20:42:53.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "nsClassHashtable.h"
 #include "nsComponentManagerUtils.h"
+#include "nsTArray.h"
 #include "nsZipArchive.h"
 #include "nsIStartupCache.h"
 #include "nsITimer.h"
@@ -164,6 +165,7 @@
                                          void *);
 
   nsClassHashtable<nsCStringHashKey, CacheEntry> mTable;
+  nsTArray<nsCString> mPendingWrites;
   nsRefPtr<nsZipArchive> mArchive;
   nsCOMPtr<nsIFile> mFile;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/build/moz.build firefox-trunk-41.0~a1~hg20150524r245419/storage/build/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/build/moz.build	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/build/moz.build	2015-05-25 20:42:53.000000000 +0000
@@ -16,6 +16,8 @@
 
 FINAL_LIBRARY = 'xul'
 
-LOCAL_INCLUDES += ['../src']
+LOCAL_INCLUDES += [
+    '..',
+]
 
 CXXFLAGS += CONFIG['SQLITE_CFLAGS']
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/FileSystemModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/FileSystemModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/FileSystemModule.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/FileSystemModule.cpp	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,304 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 "FileSystemModule.h"
+
+#include "sqlite3.h"
+#include "nsString.h"
+#include "nsISimpleEnumerator.h"
+#include "nsIFile.h"
+
+namespace {
+
+struct VirtualTableCursorBase
+{
+  VirtualTableCursorBase()
+  {
+    memset(&mBase, 0, sizeof(mBase));
+  }
+
+  sqlite3_vtab_cursor mBase;
+};
+
+struct VirtualTableCursor : public VirtualTableCursorBase
+{
+public:
+  VirtualTableCursor()
+  : mRowId(-1)
+  {
+    mCurrentFileName.SetIsVoid(true);
+  }
+
+  const nsString& DirectoryPath() const
+  {
+    return mDirectoryPath;
+  }
+
+  const nsString& CurrentFileName() const
+  {
+    return mCurrentFileName;
+  }
+
+  int64_t RowId() const
+  {
+    return mRowId;
+  }
+
+  nsresult Init(const nsAString& aPath);
+  nsresult NextFile();
+
+private:
+  nsCOMPtr<nsISimpleEnumerator> mEntries;
+
+  nsString mDirectoryPath;
+  nsString mCurrentFileName;
+
+  int64_t mRowId;
+};
+
+nsresult
+VirtualTableCursor::Init(const nsAString& aPath)
+{
+  nsCOMPtr<nsIFile> directory =
+    do_CreateInstance(NS_LOCAL_FILE_CONTRACTID);
+  NS_ENSURE_TRUE(directory, NS_ERROR_FAILURE);
+
+  nsresult rv = directory->InitWithPath(aPath);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = directory->GetPath(mDirectoryPath);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = directory->GetDirectoryEntries(getter_AddRefs(mEntries));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = NextFile();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
+nsresult
+VirtualTableCursor::NextFile()
+{
+  bool hasMore;
+  nsresult rv = mEntries->HasMoreElements(&hasMore);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  if (!hasMore) {
+    mCurrentFileName.SetIsVoid(true);
+    return NS_OK;
+  }
+
+  nsCOMPtr<nsISupports> entry;
+  rv = mEntries->GetNext(getter_AddRefs(entry));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<nsIFile> file = do_QueryInterface(entry);
+  NS_ENSURE_TRUE(file, NS_ERROR_FAILURE);
+
+  rv = file->GetLeafName(mCurrentFileName);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  mRowId++;
+
+  return NS_OK;
+}
+
+int Connect(sqlite3* aDB, void* aAux, int aArgc, const char* const* aArgv,
+            sqlite3_vtab** aVtab, char** aErr)
+{
+  static const char virtualTableSchema[] =
+    "CREATE TABLE fs ("
+      "name TEXT, "
+      "path TEXT"
+    ")";
+
+  int rc = sqlite3_declare_vtab(aDB, virtualTableSchema);
+  if (rc != SQLITE_OK) {
+    return rc;
+  }
+
+  sqlite3_vtab* vt = new sqlite3_vtab();
+  memset(vt, 0, sizeof(*vt));
+
+  *aVtab = vt;
+
+  return SQLITE_OK;
+}
+
+int Disconnect(sqlite3_vtab* aVtab )
+{
+  delete aVtab;
+
+  return SQLITE_OK;
+}
+
+int BestIndex(sqlite3_vtab* aVtab, sqlite3_index_info* aInfo)
+{
+  // Here we specify what index constraints we want to handle. That is, there
+  // might be some columns with particular constraints in which we can help
+  // SQLite narrow down the result set.
+  //
+  // For example, take the "path = x" where x is a directory. In this case,
+  // we can narrow our search to just this directory instead of the entire file
+  // system. This can be a significant optimization. So, we want to handle that
+  // constraint. To do so, we would look for two specific input conditions:
+  //
+  // 1. aInfo->aConstraint[i].iColumn == 1
+  // 2. aInfo->aConstraint[i].op == SQLITE_INDEX_CONSTRAINT_EQ
+  //
+  // The first states that the path column is being used in one of the input
+  // constraints and the second states that the constraint involves the equal
+  // operator.
+  //
+  // An even more specific search would be for name='xxx', in which case we
+  // can limit the search to a single file, if it exists.
+  //
+  // What we have to do here is look for all of our index searches and select
+  // the narrowest. We can only pick one, so obviously we want the one that
+  // is the most specific, which leads to the smallest result set.
+
+  for(int i = 0; i < aInfo->nConstraint; i++) {
+    if (aInfo->aConstraint[i].iColumn == 1 && aInfo->aConstraint[i].usable) {
+      if (aInfo->aConstraint[i].op & SQLITE_INDEX_CONSTRAINT_EQ) {
+        aInfo->aConstraintUsage[i].argvIndex = 1;
+      }
+      break;
+    }
+
+    // TODO: handle single files (constrained also by the name column)
+  }
+
+  return SQLITE_OK;
+}
+
+int Open(sqlite3_vtab* aVtab, sqlite3_vtab_cursor** aCursor)
+{
+  VirtualTableCursor* cursor = new VirtualTableCursor();
+
+  *aCursor = reinterpret_cast<sqlite3_vtab_cursor*>(cursor);
+
+  return SQLITE_OK;
+}
+
+int Close(sqlite3_vtab_cursor* aCursor)
+{
+  VirtualTableCursor* cursor = reinterpret_cast<VirtualTableCursor*>(aCursor);
+
+  delete cursor;
+
+  return SQLITE_OK;
+}
+
+int Filter(sqlite3_vtab_cursor* aCursor, int aIdxNum, const char* aIdxStr,
+           int aArgc, sqlite3_value** aArgv)
+{
+  VirtualTableCursor* cursor = reinterpret_cast<VirtualTableCursor*>(aCursor);
+
+  if(aArgc <= 0) {
+    return SQLITE_OK;
+  }
+
+  nsDependentString path(
+    reinterpret_cast<const char16_t*>(::sqlite3_value_text16(aArgv[0])));
+
+  nsresult rv = cursor->Init(path);
+  NS_ENSURE_SUCCESS(rv, SQLITE_ERROR);
+
+  return SQLITE_OK;
+}
+
+int Next(sqlite3_vtab_cursor* aCursor)
+{
+  VirtualTableCursor* cursor = reinterpret_cast<VirtualTableCursor*>(aCursor);
+
+  nsresult rv = cursor->NextFile();
+  NS_ENSURE_SUCCESS(rv, SQLITE_ERROR);
+
+  return SQLITE_OK;
+}
+
+int Eof(sqlite3_vtab_cursor* aCursor)
+{
+  VirtualTableCursor* cursor = reinterpret_cast<VirtualTableCursor*>(aCursor);
+  return cursor->CurrentFileName().IsVoid() ? 1 : 0;
+}
+
+int Column(sqlite3_vtab_cursor* aCursor, sqlite3_context* aContext,
+           int aColumnIndex)
+{
+  VirtualTableCursor* cursor = reinterpret_cast<VirtualTableCursor*>(aCursor);
+
+  switch (aColumnIndex) {
+    // name
+    case 0: {
+      const nsString& name = cursor->CurrentFileName();
+      sqlite3_result_text16(aContext, name.get(),
+                            name.Length() * sizeof(char16_t),
+                            SQLITE_TRANSIENT);
+      break;
+    }
+
+    // path
+    case 1: {
+      const nsString& path = cursor->DirectoryPath();
+      sqlite3_result_text16(aContext, path.get(),
+                            path.Length() * sizeof(char16_t),
+                            SQLITE_TRANSIENT);
+      break;
+    }
+    default:
+      NS_NOTREACHED("Unsupported column!");
+  }
+
+  return SQLITE_OK;
+}
+
+int RowId(sqlite3_vtab_cursor* aCursor, sqlite3_int64* aRowid)
+{
+  VirtualTableCursor* cursor = reinterpret_cast<VirtualTableCursor*>(aCursor);
+
+  *aRowid = cursor->RowId();
+
+  return SQLITE_OK;
+}
+
+} // anonymous namespace
+
+namespace mozilla {
+namespace storage {
+
+int RegisterFileSystemModule(sqlite3* aDB, const char* aName)
+{
+  static sqlite3_module module = {
+    1,
+    Connect,
+    Connect,
+    BestIndex,
+    Disconnect,
+    Disconnect,
+    Open,
+    Close,
+    Filter,
+    Next,
+    Eof,
+    Column,
+    RowId,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr
+  };
+
+  return sqlite3_create_module(aDB, aName, &module, nullptr);
+}
+
+} // namespace storage
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/FileSystemModule.h firefox-trunk-41.0~a1~hg20150524r245419/storage/FileSystemModule.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/FileSystemModule.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/FileSystemModule.h	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,22 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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_storage_FileSystemModule_h
+#define mozilla_storage_FileSystemModule_h
+
+#include "nscore.h"
+
+struct sqlite3;
+
+namespace mozilla {
+namespace storage {
+
+int RegisterFileSystemModule(sqlite3* aDB, const char* aName);
+
+} // namespace storage
+} // namespace mozilla
+
+#endif // mozilla_storage_FileSystemModule_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/IStorageBindingParamsInternal.h firefox-trunk-41.0~a1~hg20150524r245419/storage/IStorageBindingParamsInternal.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/IStorageBindingParamsInternal.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/IStorageBindingParamsInternal.h	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 sts=2 expandtab
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_storage_IStorageBindingParamsInternal_h_
+#define mozilla_storage_IStorageBindingParamsInternal_h_
+
+#include "nsISupports.h"
+
+struct sqlite3_stmt;
+class mozIStorageError;
+
+namespace mozilla {
+namespace storage {
+
+#define ISTORAGEBINDINGPARAMSINTERNAL_IID \
+  {0x4c43d33a, 0xc620, 0x41b8, {0xba, 0x1d, 0x50, 0xc5, 0xb1, 0xe9, 0x1a, 0x04}}
+
+/**
+ * Implementation-only interface for mozIStorageBindingParams.  This defines the
+ * set of methods required by the asynchronous execution code in order to
+ * consume the contents stored in mozIStorageBindingParams instances.
+ */
+class IStorageBindingParamsInternal : public nsISupports
+{
+public:
+  NS_DECLARE_STATIC_IID_ACCESSOR(ISTORAGEBINDINGPARAMSINTERNAL_IID)
+
+  /**
+   * Binds our stored data to the statement.
+   *
+   * @param aStatement
+   *        The statement to bind our data to.
+   * @return nullptr on success, or a mozIStorageError object if an error
+   *         occurred.
+   */
+  virtual already_AddRefed<mozIStorageError> bind(sqlite3_stmt *aStatement) = 0;
+};
+
+NS_DEFINE_STATIC_IID_ACCESSOR(IStorageBindingParamsInternal,
+                              ISTORAGEBINDINGPARAMSINTERNAL_IID)
+
+#define NS_DECL_ISTORAGEBINDINGPARAMSINTERNAL \
+  already_AddRefed<mozIStorageError> bind(sqlite3_stmt *aStatement) override;
+
+} // storage
+} // mozilla
+
+#endif // mozilla_storage_IStorageBindingParamsInternal_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/moz.build firefox-trunk-41.0~a1~hg20150524r245419/storage/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/moz.build	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/moz.build	2015-05-25 20:42:53.000000000 +0000
@@ -4,7 +4,112 @@
 # License, v. 2.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 += ['public', 'src', 'build']
+DIRS += ['build']
 
 TEST_DIRS += ['test']
 
+XPIDL_SOURCES += [
+    'mozIStorageAggregateFunction.idl',
+    'mozIStorageAsyncConnection.idl',
+    'mozIStorageAsyncStatement.idl',
+    'mozIStorageBaseStatement.idl',
+    'mozIStorageBindingParams.idl',
+    'mozIStorageBindingParamsArray.idl',
+    'mozIStorageCompletionCallback.idl',
+    'mozIStorageConnection.idl',
+    'mozIStorageError.idl',
+    'mozIStorageFunction.idl',
+    'mozIStoragePendingStatement.idl',
+    'mozIStorageProgressHandler.idl',
+    'mozIStorageResultSet.idl',
+    'mozIStorageRow.idl',
+    'mozIStorageService.idl',
+    'mozIStorageStatement.idl',
+    'mozIStorageStatementCallback.idl',
+    'mozIStorageStatementParams.idl',
+    'mozIStorageStatementRow.idl',
+    'mozIStorageVacuumParticipant.idl',
+    'mozIStorageValueArray.idl',
+]
+
+XPIDL_MODULE = 'storage'
+
+EXPORTS += [
+    'mozStorageHelper.h',
+]
+
+EXPORTS.mozilla += [
+    'storage.h',
+]
+
+# NOTE When adding something to this list, you probably need to add it to the
+#      storage.h file too.
+EXPORTS.mozilla.storage += [
+    'StatementCache.h',
+    'Variant.h',
+    'Variant_inl.h',
+]
+# SEE ABOVE NOTE!
+
+UNIFIED_SOURCES += [
+    'FileSystemModule.cpp',
+    'mozStorageArgValueArray.cpp',
+    'mozStorageAsyncStatement.cpp',
+    'mozStorageAsyncStatementExecution.cpp',
+    'mozStorageAsyncStatementJSHelper.cpp',
+    'mozStorageAsyncStatementParams.cpp',
+    'mozStorageBindingParamsArray.cpp',
+    'mozStorageError.cpp',
+    'mozStoragePrivateHelpers.cpp',
+    'mozStorageResultSet.cpp',
+    'mozStorageRow.cpp',
+    'mozStorageService.cpp',
+    'mozStorageSQLFunctions.cpp',
+    'mozStorageStatement.cpp',
+    'mozStorageStatementJSHelper.cpp',
+    'mozStorageStatementParams.cpp',
+    'mozStorageStatementRow.cpp',
+    'SQLCollations.cpp',
+    'StorageBaseStatementInternal.cpp',
+    'TelemetryVFS.cpp',
+    'VacuumManager.cpp',
+]
+
+# These files need to be built separately because they #include variantToSQLiteT_impl.h.
+SOURCES += [
+    'mozStorageBindingParams.cpp',
+    'mozStorageConnection.cpp',
+]
+
+FAIL_ON_WARNINGS = True
+
+FINAL_LIBRARY = 'xul'
+
+# Don't use the jemalloc allocator on Android, because we can't guarantee
+# that Gecko will configure sqlite before it is first used (bug 730495).
+#
+# Don't use the jemalloc allocator when using system sqlite. Linked in libraries
+# (such as NSS) might trigger an initialization of sqlite and allocation
+# of memory using the default allocator, prior to the storage service
+# registering its allocator, causing memory management failures (bug 938730).
+# However, this is not an issue if both the jemalloc allocator and the default
+# allocator are the same thing.
+#
+# Note: On Windows our sqlite build assumes we use jemalloc.  If you disable
+# MOZ_STORAGE_MEMORY on Windows, you will also need to change the "ifdef
+# MOZ_MEMORY" options in db/sqlite3/src/Makefile.in.
+if CONFIG['MOZ_MEMORY'] and (not CONFIG['MOZ_NATIVE_SQLITE']
+                             or CONFIG['MOZ_NATIVE_JEMALLOC']):
+    if CONFIG['OS_TARGET'] != 'Android':
+        DEFINES['MOZ_STORAGE_MEMORY'] = True
+
+# This is the default value.  If we ever change it when compiling sqlite, we
+# will need to change it here as well.
+DEFINES['SQLITE_MAX_LIKE_PATTERN_LENGTH'] = 50000
+
+LOCAL_INCLUDES += [
+    '/db/sqlite3/src',
+    '/dom/base',
+]
+
+CXXFLAGS += CONFIG['SQLITE_CFLAGS']
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageAggregateFunction.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageAggregateFunction.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageAggregateFunction.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageAggregateFunction.idl	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,38 @@
+/* -*- 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 "nsISupports.idl"
+
+interface mozIStorageConnection;
+interface mozIStorageValueArray;
+interface nsIArray;
+interface nsIVariant;
+
+/**
+ * mozIStorageAggregateFunction represents aggregate SQL function.
+ * Common examples of aggregate functions are SUM() and COUNT().
+ *
+ * An aggregate function calculates one result for a given set of data, where
+ * a set of data is a group of tuples. There can be one group
+ * per request or many of them, if GROUP BY clause is used or not.
+ */
+[scriptable, uuid(763217b7-3123-11da-918d-000347412e16)]
+interface mozIStorageAggregateFunction : nsISupports {
+  /**
+   * onStep is called when next value should be passed to
+   * a custom function.
+   * 
+   * @param aFunctionArguments    The arguments passed in to the function
+   */
+  void onStep(in mozIStorageValueArray aFunctionArguments);
+
+  /**
+   * Called when all tuples in a group have been processed and the engine
+   * needs the aggregate function's value.
+   *
+   * @returns aggregate result as Variant.
+   */
+  nsIVariant onFinal();
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageAsyncConnection.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageAsyncConnection.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageAsyncConnection.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageAsyncConnection.idl	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,214 @@
+/* -*- 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"
+
+interface mozIStorageAggregateFunction;
+interface mozIStorageCompletionCallback;
+interface mozIStorageFunction;
+interface mozIStorageProgressHandler;
+interface mozIStorageBaseStatement;
+interface mozIStorageStatement;
+interface mozIStorageAsyncStatement;
+interface mozIStorageStatementCallback;
+interface mozIStoragePendingStatement;
+interface nsIFile;
+
+/**
+ * mozIStorageAsyncConnection represents an asynchronous database
+ * connection attached to a specific file or to an in-memory data
+ * storage.  It is the primary interface for interacting with a
+ * database from the main thread, including creating prepared
+ * statements, executing SQL, and examining database errors.
+ */
+[scriptable, uuid(8bfd34d5-4ddf-4e4b-89dd-9b14f33534c6)]
+interface mozIStorageAsyncConnection : nsISupports {
+  /**
+   * Close this database connection, allowing all pending statements
+   * to complete first.
+   *
+   * @param aCallback [optional]
+   *        A callback that will be notified when the close is completed,
+   *        with the following arguments:
+   *        - status: the status of the call
+   *        - value: |null|
+   *
+   * @throws NS_ERROR_NOT_SAME_THREAD
+   *         If is called on a thread other than the one that opened it.
+   */
+  void asyncClose([optional] in mozIStorageCompletionCallback aCallback);
+
+  /**
+   * Clone a database and make the clone read only if needed.
+   *
+   * @param aReadOnly
+   *        If true, the returned database should be put into read-only mode.
+   *
+   * @param aCallback
+   *        A callback that will be notified when the operation is complete,
+   *        with the following arguments:
+   *        - status: the status of the operation
+   *        - value: in case of success, an intance of
+   *             mozIStorageAsyncConnection cloned from this one.
+   *
+   * @throws NS_ERROR_NOT_SAME_THREAD
+   *         If is called on a thread other than the one that opened it.
+   * @throws NS_ERROR_UNEXPECTED
+   *         If this connection is a memory database.
+   *
+   * @note If your connection is already read-only, you will get a read-only
+   *       clone.
+   * @note Due to a bug in SQLite, if you use the shared cache
+   *       (see mozIStorageService), you end up with the same privileges as the
+   *       first connection opened regardless of what is specified in aReadOnly.
+   * @note The following pragmas are copied over to a read-only clone:
+   *        - cache_size
+   *        - temp_store
+   *       The following pragmas are copied over to a writeable clone:
+   *        - cache_size
+   *        - temp_store
+   *        - foreign_keys
+   *        - journal_size_limit
+   *        - synchronous
+   *        - wal_autocheckpoint
+   */
+  void asyncClone(in boolean aReadOnly,
+                  in mozIStorageCompletionCallback aCallback);
+
+  /**
+   * The current database nsIFile.  Null if the database
+   * connection refers to an in-memory database.
+   */
+  readonly attribute nsIFile databaseFile;
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// Statement creation
+
+  /**
+   * Create an asynchronous statement for the given SQL. An
+   * asynchronous statement can only be used to dispatch asynchronous
+   * requests to the asynchronous execution thread and cannot be used
+   * to take any synchronous actions on the database.
+   *
+   * The expression may use ? to indicate sequential numbered arguments,
+   * ?1, ?2 etc. to indicate specific numbered arguments or :name and
+   * $var to indicate named arguments.
+   *
+   * @param aSQLStatement
+   *        The SQL statement to execute.
+   * @return a new mozIStorageAsyncStatement
+   * @note The statement is created lazily on first execution.
+   */
+  mozIStorageAsyncStatement createAsyncStatement(in AUTF8String aSQLStatement);
+
+  /**
+   * Execute an array of statements created with this connection using
+   * any currently bound parameters. When the array contains multiple
+   * statements, the execution is wrapped in a single
+   * transaction. These statements can be reused immediately, and
+   * reset does not need to be called.
+   *
+   * @param aStatements
+   *        The array of statements to execute asynchronously, in the order they
+   *        are given in the array.
+   * @param aNumStatements
+   *        The number of statements in aStatements.
+   * @param aCallback [optional]
+   *        The callback object that will be notified of progress, errors, and
+   *        completion.
+   * @return an object that can be used to cancel the statements execution.
+   *
+   * @note If you have any custom defined functions, they must be
+   *        re-entrant since they can be called on multiple threads.
+   */
+  mozIStoragePendingStatement executeAsync(
+    [array, size_is(aNumStatements)] in mozIStorageBaseStatement aStatements,
+    in unsigned long aNumStatements,
+    [optional] in mozIStorageStatementCallback aCallback
+  );
+
+  /**
+   * Execute asynchronously an SQL expression, expecting no arguments.
+   *
+   * @param aSQLStatement
+   *        The SQL statement to execute
+   * @param aCallback [optional]
+   *        The callback object that will be notified of progress, errors, and
+   *        completion.
+   * @return an object that can be used to cancel the statement execution.
+   */
+  mozIStoragePendingStatement executeSimpleSQLAsync(
+    in AUTF8String aSQLStatement,
+    [optional] in mozIStorageStatementCallback aCallback);
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// Functions
+
+  /**
+   * Create a new SQL function.  If you use your connection on multiple threads,
+   * your function needs to be threadsafe, or it should only be called on one
+   * thread.
+   *
+   * @param aFunctionName
+   *        The name of function to create, as seen in SQL.
+   * @param aNumArguments
+   *        The number of arguments the function takes. Pass -1 for
+   *        variable-argument functions.
+   * @param aFunction
+   *        The instance of mozIStorageFunction, which implements the function
+   *        in question.
+   */
+  void createFunction(in AUTF8String aFunctionName,
+                      in long aNumArguments,
+                      in mozIStorageFunction aFunction);
+
+  /**
+   * Create a new SQL aggregate function.  If you use your connection on
+   * multiple threads, your function needs to be threadsafe, or it should only
+   * be called on one thread.
+   *
+   * @param aFunctionName
+   *        The name of aggregate function to create, as seen in SQL.
+   * @param aNumArguments
+   *        The number of arguments the function takes. Pass -1 for
+   *        variable-argument functions.
+   * @param aFunction
+   *        The instance of mozIStorageAggreagteFunction, which implements the
+   *        function in question.
+   */
+  void createAggregateFunction(in AUTF8String aFunctionName,
+                               in long aNumArguments,
+                               in mozIStorageAggregateFunction aFunction);
+  /**
+   * Delete custom SQL function (simple or aggregate one).
+   *
+   * @param aFunctionName
+   *        The name of function to remove.
+   */
+  void removeFunction(in AUTF8String aFunctionName);
+
+  /**
+   * Sets a progress handler. Only one handler can be registered at a time.
+   * If you need more than one, you need to chain them yourself.  This progress
+   * handler should be threadsafe if you use this connection object on more than
+   * one thread.
+   *
+   * @param aGranularity
+   *        The number of SQL virtual machine steps between progress handler
+   *        callbacks.
+   * @param aHandler
+   *        The instance of mozIStorageProgressHandler.
+   * @return previous registered handler.
+   */
+  mozIStorageProgressHandler setProgressHandler(in int32_t aGranularity,
+                                                in mozIStorageProgressHandler aHandler);
+
+  /**
+   * Remove a progress handler.
+   *
+   * @return previous registered handler.
+   */
+  mozIStorageProgressHandler removeProgressHandler();
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageAsyncStatement.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageAsyncStatement.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageAsyncStatement.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageAsyncStatement.idl	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 sts=2 expandtab
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozIStorageBaseStatement.idl"
+
+/**
+ * An asynchronous SQL statement.  This differs from mozIStorageStatement by
+ * only being usable for asynchronous execution.  (mozIStorageStatement can
+ * be used for both synchronous and asynchronous purposes.)  This specialization
+ * for asynchronous operation allows us to avoid needing to acquire
+ * synchronization primitives also used by the asynchronous execution thread.
+ * In contrast, mozIStorageStatement may need to acquire the primitives and
+ * consequently can cause the main thread to lock for extended intervals while
+ * the asynchronous thread performs some long-running operation.
+ */
+[scriptable, uuid(52e49370-3b2e-4a27-a3fc-79e20ad4056b)]
+interface mozIStorageAsyncStatement : mozIStorageBaseStatement {
+  /*
+   * 'params' provides a magic JS helper that lets you assign parameters by
+   * name.  Unlike the helper on mozIStorageStatement, you cannot enumerate
+   * in order to find out what parameters are legal.
+   *
+   * This does not work for BLOBs.  You must use an explicit binding API for
+   * that.
+   *
+   * example:
+   *  stmt.params.foo = 1;
+   *  stmt.params["bar"] = 2;
+   *  let argName = "baz";
+   *  stmt.params[argName] = 3;
+   *
+   * readonly attribute nsIMagic params;
+   */
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageBaseStatement.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageBaseStatement.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageBaseStatement.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageBaseStatement.idl	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,158 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=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/. */
+
+#include "nsISupports.idl"
+#include "mozIStorageBindingParams.idl"
+
+interface mozIStorageConnection;
+interface mozIStorageStatementCallback;
+interface mozIStoragePendingStatement;
+interface mozIStorageBindingParams;
+interface mozIStorageBindingParamsArray;
+
+/**
+ * The base interface for both pure asynchronous storage statements 
+ * (mozIStorageAsyncStatement) and 'classic' storage statements
+ * (mozIStorageStatement) that can be used for both synchronous and asynchronous
+ * purposes.
+ */
+[scriptable, uuid(16ca67aa-1325-43e2-aac7-859afd1590b2)]
+interface mozIStorageBaseStatement : mozIStorageBindingParams {
+  /**
+   * Finalizes a statement so you can successfully close a database connection.
+   * Once a statement has been finalized it can no longer be used for any
+   * purpose.
+   * 
+   * Statements are implicitly finalized when their reference counts hits zero.
+   * If you are a native (C++) caller this is accomplished by setting all of
+   * your nsCOMPtr instances to be NULL.  If you are operating from JavaScript
+   * code then you cannot rely on this behavior because of the involvement of
+   * garbage collection.
+   *
+   * When finalizing an asynchronous statement you do not need to worry about
+   * whether the statement has actually been executed by the asynchronous
+   * thread; you just need to call finalize after your last call to executeAsync
+   * involving the statement.  However, you do need to use asyncClose instead of
+   * close on the connection if any statements have been used asynchronously.
+   */
+  void finalize();
+
+  /**
+   * Bind the given value at the given numeric index.
+   *
+   * @param aParamIndex
+   *        0-based index, 0 corresponding to the first numbered argument or
+   *        "?1".
+   * @param aValue
+   *        Argument value.
+   * @param aValueSize
+   *        Length of aValue in bytes.
+   * @{
+   */
+  [deprecated] void bindUTF8StringParameter(in unsigned long aParamIndex,
+                                            in AUTF8String aValue);
+  [deprecated] void bindStringParameter(in unsigned long aParamIndex,
+                                        in AString aValue);
+  [deprecated] void bindDoubleParameter(in unsigned long aParamIndex,
+                                        in double aValue);
+  [deprecated] void bindInt32Parameter(in unsigned long aParamIndex,
+                                       in long aValue);
+  [deprecated] void bindInt64Parameter(in unsigned long aParamIndex,
+                                       in long long aValue);
+  [deprecated] void bindNullParameter(in unsigned long aParamIndex);
+  [deprecated] void bindBlobParameter(
+    in unsigned long aParamIndex,
+    [array,const,size_is(aValueSize)] in octet aValue,
+    in unsigned long aValueSize);
+  [deprecated] void bindStringAsBlobParameter(
+    in unsigned long aParamIndex,
+    in AString aValue);
+  [deprecated] void bindUTF8StringAsBlobParameter(
+    in unsigned long aParamIndex,
+    in AUTF8String aValue);
+  [deprecated] void bindAdoptedBlobParameter(
+    in unsigned long aParamIndex,
+    [array,size_is(aValueSize)] in octet aValue,
+    in unsigned long aValueSize);
+  /**@}*/
+
+  /**
+   * Binds the array of parameters to the statement.  When executeAsync is
+   * called, all the parameters in aParameters are bound and then executed.
+   *
+   * @param aParameters
+   *        The array of parameters to bind to the statement upon execution.
+   *
+   * @note This is only works on statements being used asynchronously.
+   */
+  void bindParameters(in mozIStorageBindingParamsArray aParameters);
+
+  /**
+   * Creates a new mozIStorageBindingParamsArray that can be used to bind
+   * multiple sets of data to a statement with bindParameters.
+   *
+   * @return a mozIStorageBindingParamsArray that multiple sets of parameters
+   *         can be bound to.
+   *
+   * @note This is only useful for statements being used asynchronously.
+   */
+  mozIStorageBindingParamsArray newBindingParamsArray();
+
+  /**
+   * Execute a query asynchronously using any currently bound parameters.  This
+   * statement can be reused immediately, and reset does not need to be called.
+   *
+   * @note If you have any custom defined functions, they must be re-entrant
+   *       since they can be called on multiple threads.
+   *
+   * @param aCallback [optional]
+   *        The callback object that will be notified of progress, errors, and
+   *        completion.
+   * @return an object that can be used to cancel the statements execution.
+   */
+  mozIStoragePendingStatement executeAsync(
+    [optional] in mozIStorageStatementCallback aCallback
+  );
+
+  /**
+   * The statement is not usable, either because it failed to initialize or
+   * was explicitly finalized.
+   */
+  const long MOZ_STORAGE_STATEMENT_INVALID = 0;
+  /**
+   * The statement is usable.
+   */
+  const long MOZ_STORAGE_STATEMENT_READY = 1;
+  /**
+   * Indicates that the statement is executing and the row getters may be used.
+   *
+   * @note This is only relevant for mozIStorageStatement instances being used
+   *       in a synchronous fashion.
+   */
+  const long MOZ_STORAGE_STATEMENT_EXECUTING = 2;
+
+  /**
+   * Find out whether the statement is usable (has not been finalized).
+   */
+  readonly attribute long state;
+
+  /**
+   * Escape a string for SQL LIKE search.
+   *
+   * @note Consumers will have to use same escape char when doing statements
+   *       such as:   ...LIKE '?1' ESCAPE '/'...
+   *
+   * @param aValue
+   *        The string to escape for SQL LIKE.
+   * @param aEscapeChar
+   *        The escape character.
+   * @return an AString of an escaped version of aValue
+   *         (%, _ and the escape char are escaped with the escape char)
+   *         For example, we will convert "foo/bar_baz%20cheese" 
+   *         into "foo//bar/_baz/%20cheese" (if the escape char is '/').
+   */
+  AString escapeStringForLIKE(in AString aValue, in wchar aEscapeChar);
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageBindingParamsArray.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageBindingParamsArray.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageBindingParamsArray.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageBindingParamsArray.idl	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=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/. */
+
+#include "nsISupports.idl"
+
+interface mozIStorageBindingParams;
+
+[scriptable, uuid(67eea5c3-4881-41ff-b0fe-09f2356aeadb)]
+interface mozIStorageBindingParamsArray : nsISupports {
+  /**
+   * Creates a new mozIStorageBindingParams object that can be added to this
+   * array.
+   *
+   * @return a mozIStorageBindingParams object that can be used to specify
+   *         parameters that need to be bound.
+   */
+  mozIStorageBindingParams newBindingParams();
+
+  /**
+   * Adds the parameters to the end of this array.
+   *
+   * @param aParameters
+   *        The parameters to add to this array.
+   */
+  void addParams(in mozIStorageBindingParams aParameters);
+
+  /**
+   * The number of mozIStorageBindingParams this object contains.
+   */
+  readonly attribute unsigned long length;
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageBindingParams.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageBindingParams.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageBindingParams.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageBindingParams.idl	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,86 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=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/. */
+
+#include "nsISupports.idl"
+
+interface nsIVariant;
+
+[scriptable, uuid(2d09f42f-966e-4663-b4b3-b0c8676bf2bf)]
+interface mozIStorageBindingParams : nsISupports {
+  /**
+   * Binds aValue to the parameter with the name aName.
+   *
+   * @param aName
+   *        The name of the parameter to bind aValue to.
+   * @param aValue
+   *        The value to bind.
+   */
+   void bindByName(in AUTF8String aName,
+                   in nsIVariant aValue);
+   [noscript] void bindUTF8StringByName(in AUTF8String aName,
+                                        in AUTF8String aValue);
+   [noscript] void bindStringByName(in AUTF8String aName,
+                                    in AString aValue);
+   [noscript] void bindDoubleByName(in AUTF8String aName,
+                                    in double aValue);
+   [noscript] void bindInt32ByName(in AUTF8String aName,
+                                   in long aValue);
+   [noscript] void bindInt64ByName(in AUTF8String aName,
+                                   in long long aValue);
+   [noscript] void bindNullByName(in AUTF8String aName);
+   void bindBlobByName(in AUTF8String aName,
+                       [array, const, size_is(aValueSize)] in octet aValue,
+                       in unsigned long aValueSize);
+
+   // Convenience routines for storing strings as blobs.
+   void bindStringAsBlobByName(in AUTF8String aName, in AString aValue);
+   void bindUTF8StringAsBlobByName(in AUTF8String aName, in AUTF8String aValue);
+
+   // The function adopts the storage for the provided blob.  After calling
+   // this function, mozStorage will ensure that free is called on the
+   // underlying pointer.
+   [noscript]
+   void bindAdoptedBlobByName(in AUTF8String aName,
+                              [array, size_is(aValueSize)] in octet aValue,
+                              in unsigned long aValueSize);
+
+   /**
+    * Binds aValue to the parameter with the index aIndex.
+    *
+    * @param aIndex
+    *        The zero-based index of the parameter to bind aValue to.
+    * @param aValue
+    *        The value to bind.
+    */
+   void bindByIndex(in unsigned long aIndex,
+                    in nsIVariant aValue);
+   [noscript] void bindUTF8StringByIndex(in unsigned long aIndex,
+                                         in AUTF8String aValue);
+   [noscript] void bindStringByIndex(in unsigned long aIndex,
+                                     in AString aValue);
+   [noscript] void bindDoubleByIndex(in unsigned long aIndex,
+                                     in double aValue);
+   [noscript] void bindInt32ByIndex(in unsigned long aIndex,
+                                    in long aValue);
+   [noscript] void bindInt64ByIndex(in unsigned long aIndex,
+                                    in long long aValue);
+   [noscript] void bindNullByIndex(in unsigned long aIndex);
+   void bindBlobByIndex(in unsigned long aIndex,
+                        [array, const, size_is(aValueSize)] in octet aValue,
+                        in unsigned long aValueSize);
+
+   // Convenience routines for storing strings as blobs.
+   void bindStringAsBlobByIndex(in unsigned long aIndex, in AString aValue);
+   void bindUTF8StringAsBlobByIndex(in unsigned long aIndex, in AUTF8String aValue);
+
+   // The function adopts the storage for the provided blob.  After calling
+   // this function, mozStorage will ensure that free is called on the
+   // underlying pointer.
+   [noscript]
+   void bindAdoptedBlobByIndex(in unsigned long aIndex,
+                               [array, size_is(aValueSize)] in octet aValue,
+                               in unsigned long aValueSize);
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageCompletionCallback.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageCompletionCallback.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageCompletionCallback.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageCompletionCallback.idl	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,24 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+  vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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, function, uuid(8cbf2dc2-91e0-44bc-984f-553638412071)]
+interface mozIStorageCompletionCallback : nsISupports {
+  /**
+   * Indicates that the event this callback was passed in for has completed.
+   *
+   * @param status
+   *        The status of the call. Generally NS_OK if the operation
+   *        completed successfully.
+   * @param value
+   *        If the operation produces a result, the result. Otherwise,
+   *        |null|.
+   *
+   * @see The calling method for expected values.
+   */
+  void complete(in nsresult status, [optional] in nsISupports value);
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageConnection.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageConnection.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageConnection.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageConnection.idl	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,241 @@
+/* -*- 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"
+#include "mozIStorageAsyncConnection.idl"
+
+interface mozIStorageAggregateFunction;
+interface mozIStorageCompletionCallback;
+interface mozIStorageFunction;
+interface mozIStorageProgressHandler;
+interface mozIStorageBaseStatement;
+interface mozIStorageStatement;
+interface mozIStorageAsyncStatement;
+interface mozIStorageStatementCallback;
+interface mozIStoragePendingStatement;
+interface nsIFile;
+
+/**
+ * mozIStorageConnection represents a database connection attached to
+ * a specific file or to the in-memory data storage.  It is the
+ * primary interface for interacting with a database, including
+ * creating prepared statements, executing SQL, and examining database
+ * errors.
+ *
+ * @note From the main thread, you should rather use mozIStorageAsyncConnection.
+ *
+ * @threadsafe
+ */
+[scriptable, uuid(4aa2ac47-8d24-4004-9b31-ec0bd85f0cc3)]
+interface mozIStorageConnection : mozIStorageAsyncConnection {
+  /**
+   * Closes a database connection.  Callers must finalize all statements created
+   * for this connection prior to calling this method.  It is illegal to use
+   * call this method if any asynchronous statements have been executed on this
+   * connection.
+   *
+   * @throws NS_ERROR_UNEXPECTED
+   *         If any statement has been executed asynchronously on this object.
+   * @throws NS_ERROR_UNEXPECTED
+   *         If is called on a thread other than the one that opened it.
+   */
+  void close();
+
+  /**
+   * Clones a database connection and makes the clone read only if needed.
+   *
+   * @param aReadOnly
+   *        If true, the returned database should be put into read-only mode.
+   *        Defaults to false.
+   * @return the cloned database connection.
+   *
+   * @throws NS_ERROR_UNEXPECTED
+   *         If this connection is a memory database.
+   * @note If your connection is already read-only, you will get a read-only
+   *       clone.
+   * @note Due to a bug in SQLite, if you use the shared cache (openDatabase),
+   *       you end up with the same privileges as the first connection opened
+   *       regardless of what is specified in aReadOnly.
+   * @note The following pragmas are copied over to a read-only clone:
+   *        - cache_size
+   *        - temp_store
+   *       The following pragmas are copied over to a writeable clone:
+   *        - cache_size
+   *        - temp_store
+   *        - foreign_keys
+   *        - journal_size_limit
+   *        - synchronous
+   *        - wal_autocheckpoint
+   *
+   */
+  mozIStorageConnection clone([optional] in boolean aReadOnly);
+
+  /**
+   * The default size for SQLite database pages used by mozStorage for new
+   * databases.
+   */
+  readonly attribute long defaultPageSize;
+
+  /**
+   * Indicates if the connection is open and ready to use.  This will be false
+   * if the connection failed to open, or it has been closed.
+   */
+  readonly attribute boolean connectionReady;
+
+  /**
+   * lastInsertRowID returns the row ID from the last INSERT
+   * operation.
+   */
+  readonly attribute long long lastInsertRowID;
+
+  /**
+   * affectedRows returns the number of database rows that were changed or
+   * inserted or deleted by last operation.
+   */
+  readonly attribute long affectedRows;
+
+  /**
+   * The last error SQLite error code.
+   */
+  readonly attribute long lastError;
+
+  /**
+   * The last SQLite error as a string (in english, straight from the
+   * sqlite library).
+   */
+  readonly attribute AUTF8String lastErrorString;
+
+  /**
+   * The schema version of the database.  This should not be used until the 
+   * database is ready.  The schema will be reported as zero if it is not set.
+   */
+  attribute long schemaVersion;
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// Statement creation
+
+  /**
+   * Create a mozIStorageStatement for the given SQL expression.  The
+   * expression may use ? to indicate sequential numbered arguments,
+   * ?1, ?2 etc. to indicate specific numbered arguments or :name and 
+   * $var to indicate named arguments.
+   *
+   * @param aSQLStatement
+   *        The SQL statement to execute.
+   * @return a new mozIStorageStatement
+   */
+  mozIStorageStatement createStatement(in AUTF8String aSQLStatement);
+
+  /**
+   * Execute a SQL expression, expecting no arguments.
+   *
+   * @param aSQLStatement  The SQL statement to execute
+   */
+  void executeSimpleSQL(in AUTF8String aSQLStatement);
+
+  /**
+   * Check if the given table exists.
+   *
+   * @param aTableName
+   *        The table to check
+   * @return TRUE if table exists, FALSE otherwise.
+   */
+  boolean tableExists(in AUTF8String aTableName);
+
+  /**
+   * Check if the given index exists.
+   *
+   * @param aIndexName   The index to check
+   * @return TRUE if the index exists, FALSE otherwise.
+   */
+  boolean indexExists(in AUTF8String aIndexName);
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// Transactions
+
+  /**
+   * Returns true if a transaction is active on this connection.
+   */
+  readonly attribute boolean transactionInProgress;
+
+  /**
+   * Begin a new transaction.  sqlite default transactions are deferred.
+   * If a transaction is active, throws an error.
+   */
+  void beginTransaction();
+
+  /**
+   * Begins a new transaction with the given type.
+   */
+  const int32_t TRANSACTION_DEFERRED = 0;
+  const int32_t TRANSACTION_IMMEDIATE = 1;
+  const int32_t TRANSACTION_EXCLUSIVE = 2;
+  void beginTransactionAs(in int32_t transactionType);
+
+  /**
+   * Commits the current transaction.  If no transaction is active,
+   * @throws NS_ERROR_UNEXPECTED.
+   * @throws NS_ERROR_NOT_INITIALIZED.
+   */
+  void commitTransaction();
+
+  /**
+   * Rolls back the current transaction.  If no transaction is active,
+   * @throws NS_ERROR_UNEXPECTED.
+   * @throws NS_ERROR_NOT_INITIALIZED.
+   */
+  void rollbackTransaction();
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// Tables
+
+  /**
+   * Create the table with the given name and schema.
+   *
+   * If the table already exists, NS_ERROR_FAILURE is thrown.
+   * (XXX at some point in the future it will check if the schema is
+   * the same as what is specified, but that doesn't happen currently.)
+   *
+   * @param aTableName
+   *        The table name to be created, consisting of [A-Za-z0-9_], and
+   *        beginning with a letter.
+   * @param aTableSchema
+   *        The schema of the table; what would normally go between the parens
+   *        in a CREATE TABLE statement: e.g., "foo  INTEGER, bar STRING".
+   *
+   * @throws NS_ERROR_FAILURE
+   *         If the table already exists or could not be created for any other
+   *         reason.
+   */
+  void createTable(in string aTableName,
+                   in string aTableSchema);
+
+  /**
+   * Controls SQLITE_FCNTL_CHUNK_SIZE setting in sqlite. This helps avoid fragmentation
+   * by growing/shrinking the database file in SQLITE_FCNTL_CHUNK_SIZE increments. To
+   * conserve memory on systems short on storage space, this function will have no effect
+   * on mobile devices or if less than 500MiB of space is left available.
+   *
+   * @param aIncrement
+   *        The database file will grow in multiples of chunkSize.
+   * @param aDatabaseName
+   *        Sqlite database name. "" means pass NULL for zDbName to sqlite3_file_control.
+   *        See http://sqlite.org/c3ref/file_control.html for more details.
+   * @throws NS_ERROR_FILE_TOO_BIG
+   *         If the system is short on storage space.
+   */
+  void setGrowthIncrement(in int32_t aIncrement, in AUTF8String aDatabaseName);
+
+  /**
+   * Enable a predefined virtual table implementation.
+   *
+   * @param aModuleName
+   *        The module to enable. Only "filesystem" is currently supported.
+   *
+   * @throws NS_ERROR_FAILURE
+   *         For unknown module names.
+   */
+  [noscript] void enableModule(in ACString aModuleName);
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageError.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageError.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageError.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageError.idl	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,149 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 sts=2 expandtab 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsISupports.idl"
+
+%{C++
+#ifdef ERROR
+#undef ERROR
+#endif
+%}
+
+[scriptable, uuid(1f350f96-7023-434a-8864-40a1c493aac1)]
+interface mozIStorageError : nsISupports {
+
+  /**
+   * General SQL error or missing database.
+   */
+  const long ERROR = 1;
+
+  /**
+   * Internal logic error.
+   */
+  const long INTERNAL = 2;
+
+  /**
+   * Access permission denied.
+   */
+  const long PERM = 3;
+
+  /**
+   * A callback routine requested an abort.
+   */
+  const long ABORT = 4;
+
+  /**
+   * The database file is locked.
+   */
+  const long BUSY = 5;
+
+  /**
+   * A table in the database is locked.
+   */
+  const long LOCKED = 6;
+
+  /**
+   * An allocation failed.
+   */
+  const long NOMEM = 7;
+
+  /**
+   * Attempt to write to a readonly database.
+   */
+  const long READONLY = 8;
+
+  /**
+   * Operation was terminated by an interrupt.
+   */
+  const long INTERRUPT = 9;
+
+  /**
+   * Some kind of disk I/O error occurred.
+   */
+  const long IOERR = 10;
+
+  /**
+   * The database disk image is malformed.
+   */
+  const long CORRUPT = 11;
+
+  /**
+   * An insertion failed because the database is full.
+   */
+  const long FULL = 13;
+
+  /**
+   * Unable to open the database file.
+   */
+  const long CANTOPEN = 14;
+
+  /**
+   * The database is empty.
+   */
+  const long EMPTY = 16;
+
+  /**
+   * The database scheme changed.
+   */
+  const long SCHEMA = 17;
+
+  /**
+   * A string or blob exceeds the size limit.
+   */
+  const long TOOBIG = 18;
+
+  /**
+   * Abort due to a constraint violation.
+   */
+  const long CONSTRAINT = 19;
+
+  /**
+   * Data type mismatch.
+   */
+  const long MISMATCH = 20;
+
+  /**
+   * Library used incorrectly.
+   */
+  const long MISUSE = 21;
+
+  /**
+   * Uses OS features not supported on the host system.
+   */
+  const long NOLFS = 22;
+
+  /**
+   * Authorization denied.
+   */
+  const long AUTH = 23;
+
+  /**
+   * Auxiliary database format error.
+   */
+  const long FORMAT = 24;
+
+  /**
+   * Attempt to bind a parameter using an out-of-range index or nonexistent
+   * named parameter name.
+   */
+  const long RANGE = 25;
+
+  /**
+   * File opened that is not a database file.
+   */
+  const long NOTADB = 26;
+
+
+  /**
+   * Indicates what type of error occurred.
+   */
+  readonly attribute long result;
+
+  /**
+   * An error string the gives more details, if available.
+   */
+  readonly attribute AUTF8String message;
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageFunction.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageFunction.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageFunction.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageFunction.idl	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,40 @@
+/* -*- 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 "nsISupports.idl"
+
+#include "mozIStorageValueArray.idl"
+
+interface mozIStorageConnection;
+interface nsIArray;
+interface nsIVariant;
+
+/**
+ * mozIStorageFunction is to be implemented by storage consumers that
+ * wish to receive callbacks during the request execution.
+ *
+ * SQL can apply functions to values from tables. Examples of
+ * such functions are MIN(a1,a2) or SQRT(num). Many functions are
+ * implemented in SQL engine.
+ *
+ * This interface allows consumers to implement their own,
+ * problem-specific functions.
+ * These functions can be called from triggers, too.
+ *
+ */
+[scriptable, function, uuid(9ff02465-21cb-49f3-b975-7d5b38ceec73)]
+interface mozIStorageFunction : nsISupports {
+  /**
+   * onFunctionCall is called when execution of a custom
+   * function should occur.
+   * 
+   * @param aNumArguments         The number of arguments
+   * @param aFunctionArguments    The arguments passed in to the function
+   *
+   * @returns any value as Variant type.
+   */
+
+  nsIVariant onFunctionCall(in mozIStorageValueArray aFunctionArguments);
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStoragePendingStatement.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStoragePendingStatement.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStoragePendingStatement.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStoragePendingStatement.idl	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,20 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 sts=2 expandtab 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(00da7d20-3768-4398-bedc-e310c324b3f0)]
+interface mozIStoragePendingStatement : nsISupports {
+
+  /**
+   * Cancels a pending statement, if possible.  This will only fail if you try
+   * cancel more than once.
+   *
+   * @note For read statements (such as SELECT), you will no longer receive any
+   *       notifications about results once cancel is called.
+   */
+   void cancel();
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageProgressHandler.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageProgressHandler.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageProgressHandler.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageProgressHandler.idl	2015-05-25 20:42:53.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/. */
+
+#include "nsISupports.idl"
+
+interface mozIStorageConnection;
+
+/**
+ * mozIProgressHandler is to be implemented by storage consumers that
+ * wish to receive callbacks during the request execution.
+ */
+[scriptable, uuid(a3a6fcd4-bf89-4208-a837-bf2a73afd30c)]
+interface mozIStorageProgressHandler : nsISupports {
+  /**
+   * onProgress is invoked periodically during long running calls.
+   * 
+   * @param aConnection    connection, for which progress handler is
+   *                       invoked.
+   *
+   * @return true to abort request, false to continue work.
+   */
+
+  boolean onProgress(in mozIStorageConnection aConnection);
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageResultSet.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageResultSet.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageResultSet.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageResultSet.idl	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,21 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 sts=2 expandtab 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsISupports.idl"
+interface mozIStorageRow;
+
+[scriptable, uuid(18dd7953-076d-4598-8105-3e32ad26ab24)]
+interface mozIStorageResultSet : nsISupports {
+
+  /**
+   * Obtains the next row from the result set from the statement that was
+   * executed.
+   *
+   * @returns the next row from the result set.  This will be null when there
+   *          are no more results.
+   */
+  mozIStorageRow getNextRow();
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageRow.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageRow.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageRow.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageRow.idl	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 sts=2 expandtab 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozIStorageValueArray.idl"
+interface nsIVariant;
+
+[scriptable, uuid(62d1b6bd-cbfe-4f9b-aee1-0ead4af4e6dc)]
+interface mozIStorageRow : mozIStorageValueArray {
+
+  /**
+   * Obtains the result of a given column specified by aIndex.
+   *
+   * @param aIndex
+   *        Zero-based index of the result to get from the tuple.
+   * @returns the result of the specified column.
+   */
+  nsIVariant getResultByIndex(in unsigned long aIndex);
+
+  /**
+   * Obtains the result of a given column specified by aName.
+   *
+   * @param aName
+   *        Name of the result to get from the tuple.
+   * @returns the result of the specified column.
+   * @note The name of a result column is the value of the "AS" clause for that
+   *       column.  If there is no AS clause then the name of the column is
+   *       unspecified and may change from one release to the next.
+   */
+  nsIVariant getResultByName(in AUTF8String aName);
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageService.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageService.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageService.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageService.idl	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,193 @@
+/* -*- 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"
+
+interface mozIStorageConnection;
+interface nsIFile;
+interface nsIFileURL;
+interface nsIPropertyBag2;
+interface nsIVariant;
+interface mozIStorageCompletionCallback;
+
+/**
+ * The mozIStorageService interface is intended to be implemented by
+ * a service that can create storage connections (mozIStorageConnection)
+ * to either a well-known profile database or to a specific database file.
+ *
+ * This is the only way to open a database connection.
+ *
+ * @note The first reference to mozIStorageService must be made on the main
+ * thread.
+ */
+[scriptable, uuid(07b6b2f5-6d97-47b4-9584-e65bc467fe9e)]
+interface mozIStorageService : nsISupports {
+  /**
+   * Open an asynchronous connection to a database.
+   *
+   * This method MUST be called from the main thread. The connection object
+   * returned by this function is not threadsafe. You MUST use it only from
+   * the main thread.
+   *
+   * If you have more than one connection to a file, you MUST use the EXACT
+   * SAME NAME for the file each time, including case. The sqlite code uses
+   * a simple string compare to see if there is already a connection. Opening
+   * a connection to "Foo.sqlite" and "foo.sqlite" will CORRUPT YOUR DATABASE.
+   *
+   * @param aDatabaseStore Either a nsIFile representing the file that contains
+   * the database or a special string to open a special database. The special
+   * string may be:
+   * - "memory" to open an in-memory database.
+   *
+   * @param aOptions A set of options (may be null). Options may contain:
+   * - bool shared (defaults to |false|).
+   *   -- If |true|, opens the database with a shared-cache. The
+   *     shared-cache mode is more memory-efficient when many
+   *     connections to the same database are expected, though, the
+   *     connections will contend the cache resource. In any cases
+   *     where performance matter, working without a shared-cache will
+   *     improve concurrency.  @see openUnsharedDatabase
+   *
+   * - int growthIncrement (defaults to none).
+   *   -- Set the growth increment for the main database.  This hints SQLite to
+   *      grow the database file by a given chunk size and may reduce
+   *      filesystem fragmentation on large databases.
+   *      @see mozIStorageConnection::setGrowthIncrement
+   *
+   * @param aCallback A callback that will receive the result of the operation.
+   *  In case of error, it may receive as status:
+   *  - NS_ERROR_OUT_OF_MEMORY if allocating a new storage object fails.
+   *  - NS_ERROR_FILE_CORRUPTED if the database file is corrupted.
+   *  In case of success, it receives as argument the new database
+   *  connection, as an instance of |mozIStorageAsyncConnection|.
+   *
+   * @throws NS_ERROR_INVALID_ARG if |aDatabaseStore| is neither a file nor
+   *         one of the special strings understood by this method, or if one of
+   *         the options passed through |aOptions| does not have the right type.
+   * @throws NS_ERROR_NOT_SAME_THREAD if called from a thread other than the
+   *         main thread.
+   */
+  void openAsyncDatabase(in nsIVariant aDatabaseStore,
+                         [optional] in nsIPropertyBag2 aOptions,
+                         in mozIStorageCompletionCallback aCallback);
+  /**
+   * Get a connection to a named special database storage.
+   *
+   * @param aStorageKey a string key identifying the type of storage
+   * requested.  Valid values include: "memory".
+   *
+   * @see openDatabase for restrictions on how database connections may be
+   * used. For the profile database, you should only access it from the main
+   * thread since other callers may also have connections.
+   *
+   * @returns a new mozIStorageConnection for the requested
+   * storage database.
+   *
+   * @throws NS_ERROR_INVALID_ARG if aStorageKey is invalid.
+   */
+  mozIStorageConnection openSpecialDatabase(in string aStorageKey);
+
+  /**
+   * Open a connection to the specified file.
+   *
+   * Consumers should check mozIStorageConnection::connectionReady to ensure
+   * that they can use the database.  If this value is false, it is strongly
+   * recommended that the database be backed up with
+   * mozIStorageConnection::backupDB so user data is not lost.
+   *
+   * ==========
+   *   DANGER
+   * ==========
+   *
+   * If you have more than one connection to a file, you MUST use the EXACT
+   * SAME NAME for the file each time, including case. The sqlite code uses
+   * a simple string compare to see if there is already a connection. Opening
+   * a connection to "Foo.sqlite" and "foo.sqlite" will CORRUPT YOUR DATABASE.
+   *
+   * The connection object returned by this function is not threadsafe. You must
+   * use it only from the thread you created it from.
+   *
+   * @param aDatabaseFile
+   *        A nsIFile that represents the database that is to be opened..
+   *
+   * @returns a mozIStorageConnection for the requested database file.
+   *
+   * @throws NS_ERROR_OUT_OF_MEMORY
+   *         If allocating a new storage object fails.
+   * @throws NS_ERROR_FILE_CORRUPTED
+   *         If the database file is corrupted.
+   */
+  mozIStorageConnection openDatabase(in nsIFile aDatabaseFile);
+
+  /**
+   * Open a connection to the specified file that doesn't share a sqlite cache.
+   *
+   * Without a shared-cache, each connection uses its own pages cache, which
+   * may be memory inefficient with a large number of connections, in such a
+   * case so you should use openDatabase instead.  On the other side, if cache
+   * contention may be an issue, for instance when concurrency is important to
+   * ensure responsiveness, using unshared connections may be a performance win.
+   *
+   * ==========
+   *   DANGER
+   * ==========
+   *
+   * If you have more than one connection to a file, you MUST use the EXACT
+   * SAME NAME for the file each time, including case. The sqlite code uses
+   * a simple string compare to see if there is already a connection. Opening
+   * a connection to "Foo.sqlite" and "foo.sqlite" will CORRUPT YOUR DATABASE.
+   *
+   * The connection object returned by this function is not threadsafe. You must
+   * use it only from the thread you created it from.
+   *
+   * @param aDatabaseFile
+   *        A nsIFile that represents the database that is to be opened.
+   *
+   * @returns a mozIStorageConnection for the requested database file.
+   *
+   * @throws NS_ERROR_OUT_OF_MEMORY
+   *         If allocating a new storage object fails.
+   * @throws NS_ERROR_FILE_CORRUPTED
+   *         If the database file is corrupted.
+   */
+  mozIStorageConnection openUnsharedDatabase(in nsIFile aDatabaseFile);
+
+  /**
+   * See openDatabase(). Exactly the same only initialized with a file URL.
+   * Custom parameters can be passed to SQLite and VFS implementations through
+   * the query part of the URL.
+   *
+   * @param aURL
+   *        A nsIFileURL that represents the database that is to be opened.
+   */
+  mozIStorageConnection openDatabaseWithFileURL(in nsIFileURL aFileURL);
+
+  /*
+   * Utilities
+   */
+
+  /**
+   * Copies the specified database file to the specified parent directory with
+   * the specified file name.  If the parent directory is not specified, it
+   * places the backup in the same directory as the current file.  This function
+   * ensures that the file being created is unique.
+   *
+   * @param aDBFile
+   *        The database file that will be backed up.
+   * @param aBackupFileName
+   *        The name of the new backup file to create.
+   * @param [optional] aBackupParentDirectory
+   *        The directory you'd like the backup file to be placed.
+   * @return The nsIFile representing the backup file.
+   */
+  nsIFile backupDatabaseFile(in nsIFile aDBFile, in AString aBackupFileName,
+                             [optional] in nsIFile aBackupParentDirectory);
+};
+
+%{C++
+
+#define MOZ_STORAGE_MEMORY_STORAGE_KEY    "memory"
+
+%}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageStatementCallback.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageStatementCallback.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageStatementCallback.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageStatementCallback.idl	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,48 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 sts=2 expandtab 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsISupports.idl"
+
+interface mozIStorageResultSet;
+interface mozIStorageError;
+
+[scriptable, uuid(29383d00-d8c4-4ddd-9f8b-c2feb0f2fcfa)]
+interface mozIStorageStatementCallback : nsISupports {
+
+  /**
+   * Called when some result is obtained from the database.  This function can
+   * be called more than once with a different storageIResultSet each time for
+   * any given asynchronous statement.
+   *
+   * @param aResultSet
+   *        The result set containing the data from the database.
+   */
+  void handleResult(in mozIStorageResultSet aResultSet);
+
+  /**
+   * Called when some error occurs while executing the statement.  This function
+   * may be called more than once with a different storageIError each time for
+   * any given asynchronous statement.
+   *
+   * @param aError
+   *        An object containing information about the error.
+   */
+  void handleError(in mozIStorageError aError);
+
+  /**
+   * Called when the statement has finished executing.  This function will only
+   * be called once for any given asynchronous statement.
+   *
+   * @param aReason
+   *        Indicates if the statement is no longer executing because it either
+   *        finished (REASON_FINISHED), was canceled (REASON_CANCELED), or
+   *        a fatal error occurred (REASON_ERROR).
+   */
+  const unsigned short REASON_FINISHED = 0;
+  const unsigned short REASON_CANCELED = 1;
+  const unsigned short REASON_ERROR = 2;
+  void handleCompletion(in unsigned short aReason);
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageStatement.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageStatement.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageStatement.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageStatement.idl	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,317 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 sts=2 expandtab
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozIStorageBaseStatement.idl"
+%{C++
+#include "mozilla/DebugOnly.h"
+%}
+
+[ptr] native octetPtr(uint8_t);
+
+/**
+ * A SQL statement that can be used for both synchronous and asynchronous
+ * purposes.
+ */
+[scriptable, uuid(5f567c35-6c32-4140-828c-683ea49cfd3a)]
+interface mozIStorageStatement : mozIStorageBaseStatement {
+  /**
+   * Create a clone of this statement, by initializing a new statement
+   * with the same connection and same SQL statement as this one.  It
+   * does not preserve statement state; that is, if a statement is
+   * being executed when it is cloned, the new statement will not be
+   * executing.
+   */
+  mozIStorageStatement clone();
+
+  /*
+   * Number of parameters
+   */
+  readonly attribute unsigned long parameterCount;
+
+  /**
+   * Name of nth parameter, if given
+   */
+  AUTF8String getParameterName(in unsigned long aParamIndex);
+
+  /**
+   * Returns the index of the named parameter.
+   *
+   * @param aName
+   *        The name of the parameter you want the index for.  This does not
+   *        include the leading ':'.
+   * @return the index of the named parameter.
+   */
+  unsigned long getParameterIndex(in AUTF8String aName);
+
+  /**
+   * Number of columns returned
+   */
+  readonly attribute unsigned long columnCount;
+
+  /**
+   * Name of nth column
+   */
+  AUTF8String getColumnName(in unsigned long aColumnIndex);
+
+  /**
+   * Obtains the index of the column with the specified name.
+   *
+   * @param aName
+   *        The name of the column.
+   * @return The index of the column with the specified name.
+   */
+  unsigned long getColumnIndex(in AUTF8String aName);
+
+  /**
+   * Obtains the declared column type of a prepared statement.
+   *
+   * @param aParamIndex
+   *        The zero-based index of the column who's declared type we are
+   *        interested in.
+   * @return the declared index type.
+   */
+  AUTF8String getColumnDecltype(in unsigned long aParamIndex);
+
+  /**
+   * Reset parameters/statement execution
+   */
+  void reset();
+
+  /**
+   * Execute the query, ignoring any results.  This is accomplished by
+   * calling executeStep() once, and then calling reset().
+   *
+   * Error and last insert info, etc. are available from
+   * the mozStorageConnection.
+   */
+  void execute();
+
+  /**
+   * Execute a query, using any currently-bound parameters.  Reset
+   * must be called on the statement after the last call of
+   * executeStep.
+   *
+   * @return a boolean indicating whether there are more rows or not;
+   *         row data may be accessed using mozIStorageValueArray methods on
+   *         the statement.
+   */
+  boolean executeStep();
+
+  /**
+   * Execute a query, using any currently-bound parameters.  Reset is called
+   * when no more data is returned.  This method is only available to JavaScript
+   * consumers.
+   *
+   * @deprecated As of Mozilla 1.9.2 in favor of executeStep().
+   *
+   * @return a boolean indicating whether there are more rows or not.
+   *
+   * [deprecated] boolean step();
+   */
+
+  /**
+   * Obtains the current list of named parameters, which are settable.  This
+   * property is only available to JavaScript consumers.
+   *
+   * readonly attribute mozIStorageStatementParams params;
+   */
+
+  /**
+   * Obtains the current row, with access to all the data members by name.  This
+   * property is only available to JavaScript consumers.
+   *
+   * readonly attribute mozIStorageStatementRow row;
+   */
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// Copied contents of mozIStorageValueArray
+
+  /**
+   * These type values are returned by getTypeOfIndex
+   * to indicate what type of value is present at
+   * a given column.
+   */
+  const long VALUE_TYPE_NULL = 0;
+  const long VALUE_TYPE_INTEGER = 1;
+  const long VALUE_TYPE_FLOAT = 2;
+  const long VALUE_TYPE_TEXT = 3;
+  const long VALUE_TYPE_BLOB = 4;
+
+  /**
+   * The number of entries in the array (each corresponding to a column in the
+   * database row)
+   */
+  readonly attribute unsigned long numEntries;
+
+  /**
+   * Indicate the data type of the current result row for the the given column.
+   * SQLite will perform type conversion if you ask for a value as a different
+   * type than it is stored as.
+   *
+   * @param aIndex
+   *        0-based column index.
+   * @return The type of the value at the given column index; one of
+   *         VALUE_TYPE_NULL, VALUE_TYPE_INTEGER, VALUE_TYPE_FLOAT,
+   *         VALUE_TYPE_TEXT, VALUE_TYPE_BLOB.
+   */
+  long getTypeOfIndex(in unsigned long aIndex);
+
+  /**
+   * Retrieve the contents of a column from the current result row as an
+   * integer.
+   *
+   * @param aIndex
+   *        0-based colummn index.
+   * @return Column value interpreted as an integer per type conversion rules.
+   * @{
+   */
+  long getInt32(in unsigned long aIndex);
+  long long getInt64(in unsigned long aIndex);
+  /** @} */
+  /**
+   * Retrieve the contents of a column from the current result row as a
+   * floating point double.
+   *
+   * @param aIndex
+   *        0-based colummn index.
+   * @return Column value interpreted as a double per type conversion rules.
+   */
+  double getDouble(in unsigned long aIndex);
+  /**
+   * Retrieve the contents of a column from the current result row as a
+   * string.
+   *
+   * @param aIndex
+   *        0-based colummn index.
+   * @return The value for the result column interpreted as a string.  If the
+   *         stored value was NULL, you will get an empty string with IsVoid set
+   *         to distinguish it from an explicitly set empty string.
+   * @{
+   */
+  AUTF8String getUTF8String(in unsigned long aIndex);
+  AString getString(in unsigned long aIndex);
+  /** @} */
+
+  /**
+   * Retrieve the contents of a column from the current result row as a
+   * blob.
+   *
+   * @param aIndex
+   *        0-based colummn index.
+   * @param[out] aDataSize
+   *             The number of bytes in the blob.
+   * @param[out] aData
+   *             The contents of the BLOB.  This will be NULL if aDataSize == 0.
+   */
+  void getBlob(in unsigned long aIndex, out unsigned long aDataSize, [array,size_is(aDataSize)] out octet aData);
+
+  /**
+   * Retrieve the contents of a Blob column from the current result row as a
+   * string.
+   *
+   * @param aIndex
+   *        0-based colummn index.
+   * @return The value for the result Blob column interpreted as a String.
+   *         No encoding conversion is performed.
+   */
+  AString getBlobAsString(in unsigned long aIndex);
+
+  /**
+   * Retrieve the contents of a Blob column from the current result row as a
+   * UTF8 string.
+   *
+   * @param aIndex
+   *        0-based colummn index.
+   * @return The value for the result Blob column interpreted as a UTF8 String.
+   *         No encoding conversion is performed.
+   */
+  AUTF8String getBlobAsUTF8String(in unsigned long aIndex);
+
+  /**
+   * Check whether the given column in the current result row is NULL.
+   *
+   * @param aIndex
+   *        0-based colummn index.
+   * @return true if the value for the result column is null.
+   */
+  boolean getIsNull(in unsigned long aIndex);
+
+  /**
+   * Returns a shared string pointer
+   */
+  [noscript] void getSharedUTF8String(in unsigned long aIndex, out unsigned long aLength, [shared,retval] out string aResult);
+  [noscript] void getSharedString(in unsigned long aIndex, out unsigned long aLength, [shared,retval] out wstring aResult);
+  [noscript] void getSharedBlob(in unsigned long aIndex, out unsigned long aLength, [shared,retval] out octetPtr aResult);
+
+%{C++
+  /**
+   * Getters for native code that return their values as
+   * the return type, for convenience and sanity.
+   *
+   * Not virtual; no vtable bloat.
+   */
+
+  inline int32_t AsInt32(uint32_t idx) {
+    int32_t v = 0;
+    mozilla::DebugOnly<nsresult> rv = GetInt32(idx, &v);
+    MOZ_ASSERT(NS_SUCCEEDED(rv) || IsNull(idx),
+               "Getting value failed, wrong column index?");
+    return v;
+  }
+
+  inline int64_t AsInt64(uint32_t idx) {
+    int64_t v = 0;
+    mozilla::DebugOnly<nsresult> rv = GetInt64(idx, &v);
+    MOZ_ASSERT(NS_SUCCEEDED(rv) || IsNull(idx),
+               "Getting value failed, wrong column index?");
+    return v;
+  }
+
+  inline double AsDouble(uint32_t idx) {
+    double v = 0.0;
+    mozilla::DebugOnly<nsresult> rv = GetDouble(idx, &v);
+    MOZ_ASSERT(NS_SUCCEEDED(rv) || IsNull(idx),
+               "Getting value failed, wrong column index?");
+    return v;
+  }
+
+  inline const char* AsSharedUTF8String(uint32_t idx, uint32_t *len) {
+    const char *str = nullptr;
+    *len = 0;
+    mozilla::DebugOnly<nsresult> rv = GetSharedUTF8String(idx, len, &str);
+    MOZ_ASSERT(NS_SUCCEEDED(rv) || IsNull(idx),
+               "Getting value failed, wrong column index?");
+    return str;
+  }
+
+  inline const char16_t* AsSharedWString(uint32_t idx, uint32_t *len) {
+    const char16_t *str = nullptr;
+    *len = 0;
+    mozilla::DebugOnly<nsresult> rv = GetSharedString(idx, len, &str);
+    MOZ_ASSERT(NS_SUCCEEDED(rv) || IsNull(idx),
+               "Getting value failed, wrong column index?");
+    return str;
+  }
+
+  inline const uint8_t* AsSharedBlob(uint32_t idx, uint32_t *len) {
+    const uint8_t *blob = nullptr;
+    *len = 0;
+    mozilla::DebugOnly<nsresult> rv = GetSharedBlob(idx, len, &blob);
+    MOZ_ASSERT(NS_SUCCEEDED(rv) || IsNull(idx),
+               "Getting value failed, wrong column index?");
+    return blob;
+  }
+
+  inline bool IsNull(uint32_t idx) {
+    bool b = false;
+    mozilla::DebugOnly<nsresult> rv = GetIsNull(idx, &b);
+    MOZ_ASSERT(NS_SUCCEEDED(rv),
+               "Getting value failed, wrong column index?");
+    return b;
+  }
+
+%}
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageStatementParams.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageStatementParams.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageStatementParams.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageStatementParams.idl	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,11 @@
+/* -*- 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 "nsISupports.idl"
+
+[scriptable, uuid(e65fe6e2-2643-463c-97e2-27665efe2386)]
+interface mozIStorageStatementParams : nsISupports {
+  // Magic interface for parameter setting that implements nsIXPCScriptable.
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageStatementRow.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageStatementRow.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageStatementRow.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageStatementRow.idl	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,12 @@
+/* -*- 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 "nsISupports.idl"
+
+[scriptable, uuid(02eeaf95-c3db-4182-9340-222c29f68f02)]
+interface mozIStorageStatementRow : nsISupports {
+  // Magic interface we return that implements nsIXPCScriptable, to allow
+  // for by-name access to rows.
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageVacuumParticipant.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageVacuumParticipant.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageVacuumParticipant.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageVacuumParticipant.idl	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,57 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsISupports.idl"
+
+interface mozIStorageConnection;
+
+/**
+ * This interface contains the information that the Storage service needs to
+ * vacuum a database.  This interface is created as a service through the
+ * category manager with the category "vacuum-participant".
+ * Please see https://developer.mozilla.org/en/mozIStorageVacuumParticipant for
+ * more information.
+ */
+[scriptable, uuid(8f367508-1d9a-4d3f-be0c-ac11b6dd7dbf)]
+interface mozIStorageVacuumParticipant : nsISupports {
+  /**
+   * The expected page size in bytes for the database.  The vacuum manager will
+   * try to correct the page size during idle based on this value.
+   *
+   * @note If the database is using the WAL journal mode, the page size won't
+  *        be changed to the requested value.  See bug 634374.
+   * @note Valid page size values are powers of 2 between 512 and 65536.
+   *       The suggested value is mozIStorageConnection::defaultPageSize.
+   */
+  readonly attribute long expectedDatabasePageSize;
+
+  /**
+   * Connection to the database file to be vacuumed.
+   */
+  readonly attribute mozIStorageConnection databaseConnection;
+
+  /**
+   * Notifies when a vacuum operation begins.  Listeners should avoid using the
+   * database till onEndVacuum is received.
+   *
+   * @return true to proceed with the vacuum, false if the participant wants to
+   *         opt-out for now, it will be retried later.  Useful when participant
+   *         is running some other heavy operation that can't be interrupted.
+   *
+   * @note When a vacuum operation starts or ends it will also dispatch a global
+   *       "heavy-io-task" notification through the observer service with the
+   *       data argument being either "vacuum-begin" or "vacuum-end".
+   */
+  boolean onBeginVacuum();
+
+  /**
+   * Notifies when a vacuum operation ends.
+   *
+   * @param aSucceeded
+   *        reports if the vacuum succeeded or failed.
+   */
+  void onEndVacuum(in boolean aSucceeded);
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageValueArray.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageValueArray.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozIStorageValueArray.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozIStorageValueArray.idl	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,145 @@
+/* -*- 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 "nsISupports.idl"
+%{C++
+#include "mozilla/DebugOnly.h"
+%}
+
+[ptr] native octetPtr(uint8_t);
+
+/**
+ * mozIStorageValueArray wraps an array of SQL values, such as a single database
+ * row.
+ */
+[scriptable, uuid(6e6306f4-ffa7-40f5-96ca-36159ce8f431)]
+interface mozIStorageValueArray : nsISupports {
+  /**
+   * These type values are returned by getTypeOfIndex
+   * to indicate what type of value is present at
+   * a given column.
+   */
+  const long VALUE_TYPE_NULL = 0;
+  const long VALUE_TYPE_INTEGER = 1;
+  const long VALUE_TYPE_FLOAT = 2;
+  const long VALUE_TYPE_TEXT = 3;
+  const long VALUE_TYPE_BLOB = 4;
+
+  /**
+   * numEntries
+   *
+   * number of entries in the array (each corresponding to a column
+   * in the database row)
+   */
+  readonly attribute unsigned long numEntries;
+
+  /**
+   * Returns the type of the value at the given column index;
+   * one of VALUE_TYPE_NULL, VALUE_TYPE_INTEGER, VALUE_TYPE_FLOAT,
+   * VALUE_TYPE_TEXT, VALUE_TYPE_BLOB.
+   */
+  long getTypeOfIndex(in unsigned long aIndex);
+
+  /**
+   * Obtain a value for the given entry (column) index.
+   * Due to SQLite's type conversion rules, any of these are valid
+   * for any column regardless of the column's data type.  However,
+   * if the specific type matters, getTypeOfIndex should be used
+   * first to identify the column type, and then the appropriate
+   * get method should be called.
+   *
+   * If you ask for a string value for a NULL column, you will get an empty
+   * string with IsVoid set to distinguish it from an explicitly set empty
+   * string.
+   */
+  long getInt32(in unsigned long aIndex);
+  long long getInt64(in unsigned long aIndex);
+  double getDouble(in unsigned long aIndex);
+  AUTF8String getUTF8String(in unsigned long aIndex);
+  AString getString(in unsigned long aIndex);
+
+  // data will be NULL if dataSize = 0
+  void getBlob(in unsigned long aIndex, out unsigned long aDataSize, [array,size_is(aDataSize)] out octet aData);
+  AString getBlobAsString(in unsigned long aIndex);
+  AUTF8String getBlobAsUTF8String(in unsigned long aIndex);
+  boolean getIsNull(in unsigned long aIndex);
+
+  /**
+   * Returns a shared string pointer
+   */
+  [noscript] void getSharedUTF8String(in unsigned long aIndex, out unsigned long aLength, [shared,retval] out string aResult);
+  [noscript] void getSharedString(in unsigned long aIndex, out unsigned long aLength, [shared,retval] out wstring aResult);
+  [noscript] void getSharedBlob(in unsigned long aIndex, out unsigned long aLength, [shared,retval] out octetPtr aResult);
+
+%{C++
+  /**
+   * Getters for native code that return their values as
+   * the return type, for convenience and sanity.
+   *
+   * Not virtual; no vtable bloat.
+   */
+
+  inline int32_t AsInt32(uint32_t idx) {
+    int32_t v = 0;
+    mozilla::DebugOnly<nsresult> rv = GetInt32(idx, &v);
+    MOZ_ASSERT(NS_SUCCEEDED(rv) || IsNull(idx),
+               "Getting value failed, wrong column index?");
+    return v;
+  }
+
+  inline int64_t AsInt64(uint32_t idx) {
+    int64_t v = 0;
+    mozilla::DebugOnly<nsresult> rv = GetInt64(idx, &v);
+    MOZ_ASSERT(NS_SUCCEEDED(rv) || IsNull(idx),
+               "Getting value failed, wrong column index?");
+    return v;
+  }
+
+  inline double AsDouble(uint32_t idx) {
+    double v = 0.0;
+    mozilla::DebugOnly<nsresult> rv = GetDouble(idx, &v);
+    MOZ_ASSERT(NS_SUCCEEDED(rv) || IsNull(idx),
+               "Getting value failed, wrong column index?");
+    return v;
+  }
+
+  inline const char* AsSharedUTF8String(uint32_t idx, uint32_t *len) {
+    const char *str = nullptr;
+    *len = 0;
+    mozilla::DebugOnly<nsresult> rv = GetSharedUTF8String(idx, len, &str);
+    MOZ_ASSERT(NS_SUCCEEDED(rv) || IsNull(idx),
+               "Getting value failed, wrong column index?");
+    return str;
+  }
+
+  inline const char16_t* AsSharedWString(uint32_t idx, uint32_t *len) {
+    const char16_t *str = nullptr;
+    *len = 0;
+    mozilla::DebugOnly<nsresult> rv = GetSharedString(idx, len, &str);
+    MOZ_ASSERT(NS_SUCCEEDED(rv) || IsNull(idx),
+               "Getting value failed, wrong column index?");
+    return str;
+  }
+
+  inline const uint8_t* AsSharedBlob(uint32_t idx, uint32_t *len) {
+    const uint8_t *blob = nullptr;
+    *len = 0;
+    mozilla::DebugOnly<nsresult> rv = GetSharedBlob(idx, len, &blob);
+    MOZ_ASSERT(NS_SUCCEEDED(rv) || IsNull(idx),
+               "Getting value failed, wrong column index?");
+    return blob;
+  }
+
+  inline bool IsNull(uint32_t idx) {
+    bool b = false;
+    mozilla::DebugOnly<nsresult> rv = GetIsNull(idx, &b);
+    MOZ_ASSERT(NS_SUCCEEDED(rv),
+               "Getting value failed, wrong column index?");
+    return b;
+  }
+
+%}
+
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageArgValueArray.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageArgValueArray.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageArgValueArray.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageArgValueArray.cpp	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,215 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 "nsError.h"
+#include "nsMemory.h"
+#include "nsString.h"
+
+#include "mozStoragePrivateHelpers.h"
+#include "mozStorageArgValueArray.h"
+
+namespace mozilla {
+namespace storage {
+
+////////////////////////////////////////////////////////////////////////////////
+//// ArgValueArray
+
+ArgValueArray::ArgValueArray(int32_t aArgc,
+                             sqlite3_value **aArgv)
+: mArgc(aArgc)
+, mArgv(aArgv)
+{
+}
+
+NS_IMPL_ISUPPORTS(
+  ArgValueArray,
+  mozIStorageValueArray
+)
+
+////////////////////////////////////////////////////////////////////////////////
+//// mozIStorageValueArray
+
+NS_IMETHODIMP
+ArgValueArray::GetNumEntries(uint32_t *_size)
+{
+  *_size = mArgc;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+ArgValueArray::GetTypeOfIndex(uint32_t aIndex,
+                              int32_t *_type)
+{
+  ENSURE_INDEX_VALUE(aIndex, mArgc);
+
+  int t = ::sqlite3_value_type(mArgv[aIndex]);
+  switch (t) {
+    case SQLITE_INTEGER:
+      *_type = VALUE_TYPE_INTEGER;
+      break;
+    case SQLITE_FLOAT:
+      *_type = VALUE_TYPE_FLOAT;
+      break;
+    case SQLITE_TEXT:
+      *_type = VALUE_TYPE_TEXT;
+      break;
+    case SQLITE_BLOB:
+      *_type = VALUE_TYPE_BLOB;
+      break;
+    case SQLITE_NULL:
+      *_type = VALUE_TYPE_NULL;
+      break;
+    default:
+      return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+ArgValueArray::GetInt32(uint32_t aIndex,
+                        int32_t *_value)
+{
+  ENSURE_INDEX_VALUE(aIndex, mArgc);
+
+  *_value = ::sqlite3_value_int(mArgv[aIndex]);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+ArgValueArray::GetInt64(uint32_t aIndex,
+                        int64_t *_value)
+{
+  ENSURE_INDEX_VALUE(aIndex, mArgc);
+
+  *_value = ::sqlite3_value_int64(mArgv[aIndex]);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+ArgValueArray::GetDouble(uint32_t aIndex,
+                         double *_value)
+{
+  ENSURE_INDEX_VALUE(aIndex, mArgc);
+
+  *_value = ::sqlite3_value_double(mArgv[aIndex]);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+ArgValueArray::GetUTF8String(uint32_t aIndex,
+                             nsACString &_value)
+{
+  ENSURE_INDEX_VALUE(aIndex, mArgc);
+
+  if (::sqlite3_value_type(mArgv[aIndex]) == SQLITE_NULL) {
+    // NULL columns should have IsVoid set to distinguish them from an empty
+    // string.
+    _value.Truncate(0);
+    _value.SetIsVoid(true);
+  }
+  else {
+    _value.Assign(reinterpret_cast<const char *>(::sqlite3_value_text(mArgv[aIndex])),
+                  ::sqlite3_value_bytes(mArgv[aIndex]));
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+ArgValueArray::GetString(uint32_t aIndex,
+                         nsAString &_value)
+{
+  ENSURE_INDEX_VALUE(aIndex, mArgc);
+
+  if (::sqlite3_value_type(mArgv[aIndex]) == SQLITE_NULL) {
+    // NULL columns should have IsVoid set to distinguish them from an empty
+    // string.
+    _value.Truncate(0);
+    _value.SetIsVoid(true);
+  } else {
+    _value.Assign(static_cast<const char16_t *>(::sqlite3_value_text16(mArgv[aIndex])),
+                  ::sqlite3_value_bytes16(mArgv[aIndex]) / 2);
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+ArgValueArray::GetBlob(uint32_t aIndex,
+                       uint32_t *_size,
+                       uint8_t **_blob)
+{
+  ENSURE_INDEX_VALUE(aIndex, mArgc);
+
+  int size = ::sqlite3_value_bytes(mArgv[aIndex]);
+  void *blob = nsMemory::Clone(::sqlite3_value_blob(mArgv[aIndex]), size);
+  NS_ENSURE_TRUE(blob, NS_ERROR_OUT_OF_MEMORY);
+
+  *_blob = static_cast<uint8_t *>(blob);
+  *_size = size;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+ArgValueArray::GetBlobAsString(uint32_t aIndex, nsAString& aValue)
+{
+  return DoGetBlobAsString(this, aIndex, aValue);
+}
+
+NS_IMETHODIMP
+ArgValueArray::GetBlobAsUTF8String(uint32_t aIndex, nsACString& aValue)
+{
+  return DoGetBlobAsString(this, aIndex, aValue);
+}
+
+NS_IMETHODIMP
+ArgValueArray::GetIsNull(uint32_t aIndex,
+                         bool *_isNull)
+{
+  // GetTypeOfIndex will check aIndex for us, so we don't have to.
+  int32_t type;
+  nsresult rv = GetTypeOfIndex(aIndex, &type);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  *_isNull = (type == VALUE_TYPE_NULL);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+ArgValueArray::GetSharedUTF8String(uint32_t aIndex,
+                                   uint32_t *_length,
+                                   const char **_string)
+{
+  if (_length)
+    *_length = ::sqlite3_value_bytes(mArgv[aIndex]);
+
+  *_string = reinterpret_cast<const char *>(::sqlite3_value_text(mArgv[aIndex]));
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+ArgValueArray::GetSharedString(uint32_t aIndex,
+                               uint32_t *_length,
+                               const char16_t **_string)
+{
+  if (_length)
+    *_length = ::sqlite3_value_bytes(mArgv[aIndex]);
+
+  *_string = static_cast<const char16_t *>(::sqlite3_value_text16(mArgv[aIndex]));
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+ArgValueArray::GetSharedBlob(uint32_t aIndex,
+                             uint32_t *_size,
+                             const uint8_t **_blob)
+{
+  *_size = ::sqlite3_value_bytes(mArgv[aIndex]);
+  *_blob = static_cast<const uint8_t *>(::sqlite3_value_blob(mArgv[aIndex]));
+  return NS_OK;
+}
+
+} // namespace storage
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageArgValueArray.h firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageArgValueArray.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageArgValueArray.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageArgValueArray.h	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 mozStorageArgValueArray_h
+#define mozStorageArgValueArray_h
+
+#include "mozIStorageValueArray.h"
+#include "mozilla/Attributes.h"
+
+#include "sqlite3.h"
+
+namespace mozilla {
+namespace storage {
+
+class ArgValueArray final : public mozIStorageValueArray
+{
+public:
+  ArgValueArray(int32_t aArgc, sqlite3_value **aArgv);
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_MOZISTORAGEVALUEARRAY
+
+private:
+  ~ArgValueArray() {}
+
+  uint32_t mArgc;
+  sqlite3_value **mArgv;
+};
+
+} // namespace storage
+} // namespace mozilla
+
+#endif // mozStorageArgValueArray_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageAsyncStatement.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageAsyncStatement.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageAsyncStatement.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageAsyncStatement.cpp	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,385 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 <limits.h>
+#include <stdio.h>
+
+#include "nsError.h"
+#include "nsMemory.h"
+#include "nsProxyRelease.h"
+#include "nsThreadUtils.h"
+#include "nsIClassInfoImpl.h"
+#include "Variant.h"
+
+#include "mozIStorageError.h"
+
+#include "mozStorageBindingParams.h"
+#include "mozStorageConnection.h"
+#include "mozStorageAsyncStatementJSHelper.h"
+#include "mozStorageAsyncStatementParams.h"
+#include "mozStoragePrivateHelpers.h"
+#include "mozStorageStatementRow.h"
+#include "mozStorageStatement.h"
+#include "nsDOMClassInfo.h"
+
+#include "mozilla/Logging.h"
+
+extern PRLogModuleInfo *gStorageLog;
+
+namespace mozilla {
+namespace storage {
+
+////////////////////////////////////////////////////////////////////////////////
+//// nsIClassInfo
+
+NS_IMPL_CI_INTERFACE_GETTER(AsyncStatement,
+                            mozIStorageAsyncStatement,
+                            mozIStorageBaseStatement,
+                            mozIStorageBindingParams,
+                            mozilla::storage::StorageBaseStatementInternal)
+
+class AsyncStatementClassInfo : public nsIClassInfo
+{
+public:
+  MOZ_CONSTEXPR AsyncStatementClassInfo() {}
+
+  NS_DECL_ISUPPORTS_INHERITED
+
+  NS_IMETHODIMP
+  GetInterfaces(uint32_t *_count, nsIID ***_array) override
+  {
+    return NS_CI_INTERFACE_GETTER_NAME(AsyncStatement)(_count, _array);
+  }
+
+  NS_IMETHODIMP
+  GetScriptableHelper(nsIXPCScriptable **_helper) override
+  {
+    static AsyncStatementJSHelper sJSHelper;
+    *_helper = &sJSHelper;
+    return NS_OK;
+  }
+
+  NS_IMETHODIMP
+  GetContractID(char **_contractID) override
+  {
+    *_contractID = nullptr;
+    return NS_OK;
+  }
+
+  NS_IMETHODIMP
+  GetClassDescription(char **_desc) override
+  {
+    *_desc = nullptr;
+    return NS_OK;
+  }
+
+  NS_IMETHODIMP
+  GetClassID(nsCID **_id) override
+  {
+    *_id = nullptr;
+    return NS_OK;
+  }
+
+  NS_IMETHODIMP
+  GetFlags(uint32_t *_flags) override
+  {
+    *_flags = 0;
+    return NS_OK;
+  }
+
+  NS_IMETHODIMP
+  GetClassIDNoAlloc(nsCID *_cid) override
+  {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+};
+
+NS_IMETHODIMP_(MozExternalRefCountType) AsyncStatementClassInfo::AddRef() { return 2; }
+NS_IMETHODIMP_(MozExternalRefCountType) AsyncStatementClassInfo::Release() { return 1; }
+NS_IMPL_QUERY_INTERFACE(AsyncStatementClassInfo, nsIClassInfo)
+
+static AsyncStatementClassInfo sAsyncStatementClassInfo;
+
+////////////////////////////////////////////////////////////////////////////////
+//// AsyncStatement
+
+AsyncStatement::AsyncStatement()
+: StorageBaseStatementInternal()
+, mFinalized(false)
+{
+}
+
+nsresult
+AsyncStatement::initialize(Connection *aDBConnection,
+                           sqlite3 *aNativeConnection,
+                           const nsACString &aSQLStatement)
+{
+  MOZ_ASSERT(aDBConnection, "No database connection given!");
+  MOZ_ASSERT(!aDBConnection->isClosed(), "Database connection should be valid");
+  MOZ_ASSERT(aNativeConnection, "No native connection given!");
+
+  mDBConnection = aDBConnection;
+  mNativeConnection = aNativeConnection;
+  mSQLString = aSQLStatement;
+
+  MOZ_LOG(gStorageLog, PR_LOG_NOTICE, ("Inited async statement '%s' (0x%p)",
+                                      mSQLString.get()));
+
+#ifdef DEBUG
+  // We want to try and test for LIKE and that consumers are using
+  // escapeStringForLIKE instead of just trusting user input.  The idea to
+  // check to see if they are binding a parameter after like instead of just
+  // using a string.  We only do this in debug builds because it's expensive!
+  const nsCaseInsensitiveCStringComparator c;
+  nsACString::const_iterator start, end, e;
+  aSQLStatement.BeginReading(start);
+  aSQLStatement.EndReading(end);
+  e = end;
+  while (::FindInReadable(NS_LITERAL_CSTRING(" LIKE"), start, e, c)) {
+    // We have a LIKE in here, so we perform our tests
+    // FindInReadable moves the iterator, so we have to get a new one for
+    // each test we perform.
+    nsACString::const_iterator s1, s2, s3;
+    s1 = s2 = s3 = start;
+
+    if (!(::FindInReadable(NS_LITERAL_CSTRING(" LIKE ?"), s1, end, c) ||
+          ::FindInReadable(NS_LITERAL_CSTRING(" LIKE :"), s2, end, c) ||
+          ::FindInReadable(NS_LITERAL_CSTRING(" LIKE @"), s3, end, c))) {
+      // At this point, we didn't find a LIKE statement followed by ?, :,
+      // or @, all of which are valid characters for binding a parameter.
+      // We will warn the consumer that they may not be safely using LIKE.
+      NS_WARNING("Unsafe use of LIKE detected!  Please ensure that you "
+                 "are using mozIStorageAsyncStatement::escapeStringForLIKE "
+                 "and that you are binding that result to the statement "
+                 "to prevent SQL injection attacks.");
+    }
+
+    // resetting start and e
+    start = e;
+    e = end;
+  }
+#endif
+
+  return NS_OK;
+}
+
+mozIStorageBindingParams *
+AsyncStatement::getParams()
+{
+  nsresult rv;
+
+  // If we do not have an array object yet, make it.
+  if (!mParamsArray) {
+    nsCOMPtr<mozIStorageBindingParamsArray> array;
+    rv = NewBindingParamsArray(getter_AddRefs(array));
+    NS_ENSURE_SUCCESS(rv, nullptr);
+
+    mParamsArray = static_cast<BindingParamsArray *>(array.get());
+  }
+
+  // If there isn't already any rows added, we'll have to add one to use.
+  if (mParamsArray->length() == 0) {
+    nsRefPtr<AsyncBindingParams> params(new AsyncBindingParams(mParamsArray));
+    NS_ENSURE_TRUE(params, nullptr);
+
+    rv = mParamsArray->AddParams(params);
+    NS_ENSURE_SUCCESS(rv, nullptr);
+
+    // We have to unlock our params because AddParams locks them.  This is safe
+    // because no reference to the params object was, or ever will be given out.
+    params->unlock(nullptr);
+
+    // We also want to lock our array at this point - we don't want anything to
+    // be added to it.
+    mParamsArray->lock();
+  }
+
+  return *mParamsArray->begin();
+}
+
+/**
+ * If we are here then we know there are no pending async executions relying on
+ * us (StatementData holds a reference to us; this also goes for our own
+ * AsyncStatementFinalizer which proxies its release to the calling thread) and
+ * so it is always safe to destroy our sqlite3_stmt if one exists.  We can be
+ * destroyed on the caller thread by garbage-collection/reference counting or on
+ * the async thread by the last execution of a statement that already lost its
+ * main-thread refs.
+ */
+AsyncStatement::~AsyncStatement()
+{
+  destructorAsyncFinalize();
+
+  // If we are getting destroyed on the wrong thread, proxy the connection
+  // release to the right thread.  I'm not sure why we do this.
+  bool onCallingThread = false;
+  (void)mDBConnection->threadOpenedOn->IsOnCurrentThread(&onCallingThread);
+  if (!onCallingThread) {
+    // NS_ProxyRelase only magic forgets for us if mDBConnection is an
+    // nsCOMPtr.  Which it is not; it's an nsRefPtr.
+    Connection *forgottenConn = nullptr;
+    mDBConnection.swap(forgottenConn);
+    (void)::NS_ProxyRelease(forgottenConn->threadOpenedOn,
+                            static_cast<mozIStorageConnection *>(forgottenConn));
+  }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// nsISupports
+
+NS_IMPL_ADDREF(AsyncStatement)
+NS_IMPL_RELEASE(AsyncStatement)
+
+NS_INTERFACE_MAP_BEGIN(AsyncStatement)
+  NS_INTERFACE_MAP_ENTRY(mozIStorageAsyncStatement)
+  NS_INTERFACE_MAP_ENTRY(mozIStorageBaseStatement)
+  NS_INTERFACE_MAP_ENTRY(mozIStorageBindingParams)
+  NS_INTERFACE_MAP_ENTRY(mozilla::storage::StorageBaseStatementInternal)
+  if (aIID.Equals(NS_GET_IID(nsIClassInfo))) {
+    foundInterface = static_cast<nsIClassInfo *>(&sAsyncStatementClassInfo);
+  }
+  else
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, mozIStorageAsyncStatement)
+NS_INTERFACE_MAP_END
+
+
+////////////////////////////////////////////////////////////////////////////////
+//// StorageBaseStatementInternal
+
+Connection *
+AsyncStatement::getOwner()
+{
+  return mDBConnection;
+}
+
+int
+AsyncStatement::getAsyncStatement(sqlite3_stmt **_stmt)
+{
+#ifdef DEBUG
+  // Make sure we are never called on the connection's owning thread.
+  bool onOpenedThread = false;
+  (void)mDBConnection->threadOpenedOn->IsOnCurrentThread(&onOpenedThread);
+  NS_ASSERTION(!onOpenedThread,
+               "We should only be called on the async thread!");
+#endif
+
+  if (!mAsyncStatement) {
+    int rc = mDBConnection->prepareStatement(mNativeConnection, mSQLString,
+                                             &mAsyncStatement);
+    if (rc != SQLITE_OK) {
+      MOZ_LOG(gStorageLog, PR_LOG_ERROR,
+             ("Sqlite statement prepare error: %d '%s'", rc,
+              ::sqlite3_errmsg(mNativeConnection)));
+      MOZ_LOG(gStorageLog, PR_LOG_ERROR,
+             ("Statement was: '%s'", mSQLString.get()));
+      *_stmt = nullptr;
+      return rc;
+    }
+    MOZ_LOG(gStorageLog, PR_LOG_NOTICE, ("Initialized statement '%s' (0x%p)",
+                                        mSQLString.get(),
+                                        mAsyncStatement));
+  }
+
+  *_stmt = mAsyncStatement;
+  return SQLITE_OK;
+}
+
+nsresult
+AsyncStatement::getAsynchronousStatementData(StatementData &_data)
+{
+  if (mFinalized)
+    return NS_ERROR_UNEXPECTED;
+
+  // Pass null for the sqlite3_stmt; it will be requested on demand from the
+  // async thread.
+  _data = StatementData(nullptr, bindingParamsArray(), this);
+
+  return NS_OK;
+}
+
+already_AddRefed<mozIStorageBindingParams>
+AsyncStatement::newBindingParams(mozIStorageBindingParamsArray *aOwner)
+{
+  if (mFinalized)
+    return nullptr;
+
+  nsCOMPtr<mozIStorageBindingParams> params(new AsyncBindingParams(aOwner));
+  return params.forget();
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+//// mozIStorageAsyncStatement
+
+// (nothing is specific to mozIStorageAsyncStatement)
+
+////////////////////////////////////////////////////////////////////////////////
+//// StorageBaseStatementInternal
+
+// proxy to StorageBaseStatementInternal using its define helper.
+MIXIN_IMPL_STORAGEBASESTATEMENTINTERNAL(
+  AsyncStatement,
+  if (mFinalized) return NS_ERROR_UNEXPECTED;)
+
+NS_IMETHODIMP
+AsyncStatement::Finalize()
+{
+  if (mFinalized)
+    return NS_OK;
+
+  mFinalized = true;
+
+  MOZ_LOG(gStorageLog, PR_LOG_NOTICE, ("Finalizing statement '%s'",
+                                      mSQLString.get()));
+
+  asyncFinalize();
+
+  // Release the params holder, so it can release the reference to us.
+  mStatementParamsHolder = nullptr;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+AsyncStatement::BindParameters(mozIStorageBindingParamsArray *aParameters)
+{
+  if (mFinalized)
+    return NS_ERROR_UNEXPECTED;
+
+  BindingParamsArray *array = static_cast<BindingParamsArray *>(aParameters);
+  if (array->getOwner() != this)
+    return NS_ERROR_UNEXPECTED;
+
+  if (array->length() == 0)
+    return NS_ERROR_UNEXPECTED;
+
+  mParamsArray = array;
+  mParamsArray->lock();
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+AsyncStatement::GetState(int32_t *_state)
+{
+  if (mFinalized)
+    *_state = MOZ_STORAGE_STATEMENT_INVALID;
+  else
+    *_state = MOZ_STORAGE_STATEMENT_READY;
+
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// mozIStorageBindingParams
+
+BOILERPLATE_BIND_PROXIES(
+  AsyncStatement, 
+  if (mFinalized) return NS_ERROR_UNEXPECTED;
+)
+
+} // namespace storage
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageAsyncStatementExecution.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageAsyncStatementExecution.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageAsyncStatementExecution.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageAsyncStatementExecution.cpp	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,648 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 "sqlite3.h"
+
+#include "mozIStorageStatementCallback.h"
+#include "mozStorageBindingParams.h"
+#include "mozStorageHelper.h"
+#include "mozStorageResultSet.h"
+#include "mozStorageRow.h"
+#include "mozStorageConnection.h"
+#include "mozStorageError.h"
+#include "mozStoragePrivateHelpers.h"
+#include "mozStorageStatementData.h"
+#include "mozStorageAsyncStatementExecution.h"
+
+#include "mozilla/DebugOnly.h"
+#include "mozilla/Telemetry.h"
+
+namespace mozilla {
+namespace storage {
+
+/**
+ * The following constants help batch rows into result sets.
+ * MAX_MILLISECONDS_BETWEEN_RESULTS was chosen because any user-based task that
+ * takes less than 200 milliseconds is considered to feel instantaneous to end
+ * users.  MAX_ROWS_PER_RESULT was arbitrarily chosen to reduce the number of
+ * dispatches to calling thread, while also providing reasonably-sized sets of
+ * data for consumers.  Both of these constants are used because we assume that
+ * consumers are trying to avoid blocking their execution thread for long
+ * periods of time, and dispatching many small events to the calling thread will
+ * end up blocking it.
+ */
+#define MAX_MILLISECONDS_BETWEEN_RESULTS 75
+#define MAX_ROWS_PER_RESULT 15
+
+////////////////////////////////////////////////////////////////////////////////
+//// Local Classes
+
+namespace {
+
+typedef AsyncExecuteStatements::ExecutionState ExecutionState;
+typedef AsyncExecuteStatements::StatementDataArray StatementDataArray;
+
+/**
+ * Notifies a callback with a result set.
+ */
+class CallbackResultNotifier : public nsRunnable
+{
+public:
+  CallbackResultNotifier(mozIStorageStatementCallback *aCallback,
+                         mozIStorageResultSet *aResults,
+                         AsyncExecuteStatements *aEventStatus) :
+      mCallback(aCallback)
+    , mResults(aResults)
+    , mEventStatus(aEventStatus)
+  {
+  }
+
+  NS_IMETHOD Run()
+  {
+    NS_ASSERTION(mCallback, "Trying to notify about results without a callback!");
+
+    if (mEventStatus->shouldNotify()) {
+      // Hold a strong reference to the callback while notifying it, so that if
+      // it spins the event loop, the callback won't be released and freed out
+      // from under us.
+      nsCOMPtr<mozIStorageStatementCallback> callback =
+        do_QueryInterface(mCallback);
+
+      (void)mCallback->HandleResult(mResults);
+    }
+
+    return NS_OK;
+  }
+
+private:
+  mozIStorageStatementCallback *mCallback;
+  nsCOMPtr<mozIStorageResultSet> mResults;
+  nsRefPtr<AsyncExecuteStatements> mEventStatus;
+};
+
+/**
+ * Notifies the calling thread that an error has occurred.
+ */
+class ErrorNotifier : public nsRunnable
+{
+public:
+  ErrorNotifier(mozIStorageStatementCallback *aCallback,
+                mozIStorageError *aErrorObj,
+                AsyncExecuteStatements *aEventStatus) :
+      mCallback(aCallback)
+    , mErrorObj(aErrorObj)
+    , mEventStatus(aEventStatus)
+  {
+  }
+
+  NS_IMETHOD Run()
+  {
+    if (mEventStatus->shouldNotify() && mCallback) {
+      // Hold a strong reference to the callback while notifying it, so that if
+      // it spins the event loop, the callback won't be released and freed out
+      // from under us.
+      nsCOMPtr<mozIStorageStatementCallback> callback =
+        do_QueryInterface(mCallback);
+
+      (void)mCallback->HandleError(mErrorObj);
+    }
+
+    return NS_OK;
+  }
+
+private:
+  mozIStorageStatementCallback *mCallback;
+  nsCOMPtr<mozIStorageError> mErrorObj;
+  nsRefPtr<AsyncExecuteStatements> mEventStatus;
+};
+
+/**
+ * Notifies the calling thread that the statement has finished executing.  Takes
+ * ownership of the StatementData so it is released on the proper thread.
+ */
+class CompletionNotifier : public nsRunnable
+{
+public:
+  /**
+   * This takes ownership of the callback and the StatementData.  They are
+   * released on the thread this is dispatched to (which should always be the
+   * calling thread).
+   */
+  CompletionNotifier(mozIStorageStatementCallback *aCallback,
+                     ExecutionState aReason)
+    : mCallback(aCallback)
+    , mReason(aReason)
+  {
+  }
+
+  NS_IMETHOD Run()
+  {
+    if (mCallback) {
+      (void)mCallback->HandleCompletion(mReason);
+      NS_RELEASE(mCallback);
+    }
+
+    return NS_OK;
+  }
+
+private:
+  mozIStorageStatementCallback *mCallback;
+  ExecutionState mReason;
+};
+
+} // anonymous namespace
+
+////////////////////////////////////////////////////////////////////////////////
+//// AsyncExecuteStatements
+
+/* static */
+nsresult
+AsyncExecuteStatements::execute(StatementDataArray &aStatements,
+                                Connection *aConnection,
+                                sqlite3 *aNativeConnection,
+                                mozIStorageStatementCallback *aCallback,
+                                mozIStoragePendingStatement **_stmt)
+{
+  // Create our event to run in the background
+  nsRefPtr<AsyncExecuteStatements> event =
+    new AsyncExecuteStatements(aStatements, aConnection, aNativeConnection,
+                               aCallback);
+  NS_ENSURE_TRUE(event, NS_ERROR_OUT_OF_MEMORY);
+
+  // Dispatch it to the background
+  nsIEventTarget *target = aConnection->getAsyncExecutionTarget();
+
+  // If we don't have a valid target, this is a bug somewhere else. In the past,
+  // this assert found cases where a Run method would schedule a new statement
+  // without checking if asyncClose had been called. The caller must prevent
+  // that from happening or, if the work is not critical, just avoid creating
+  // the new statement during shutdown. See bug 718449 for an example.
+  MOZ_ASSERT(target);
+  if (!target) {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+
+  nsresult rv = target->Dispatch(event, NS_DISPATCH_NORMAL);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // Return it as the pending statement object and track it.
+  NS_ADDREF(*_stmt = event);
+  return NS_OK;
+}
+
+AsyncExecuteStatements::AsyncExecuteStatements(StatementDataArray &aStatements,
+                                               Connection *aConnection,
+                                               sqlite3 *aNativeConnection,
+                                               mozIStorageStatementCallback *aCallback)
+: mConnection(aConnection)
+, mNativeConnection(aNativeConnection)
+, mHasTransaction(false)
+, mCallback(aCallback)
+, mCallingThread(::do_GetCurrentThread())
+, mMaxWait(TimeDuration::FromMilliseconds(MAX_MILLISECONDS_BETWEEN_RESULTS))
+, mIntervalStart(TimeStamp::Now())
+, mState(PENDING)
+, mCancelRequested(false)
+, mMutex(aConnection->sharedAsyncExecutionMutex)
+, mDBMutex(aConnection->sharedDBMutex)
+  , mRequestStartDate(TimeStamp::Now())
+{
+  (void)mStatements.SwapElements(aStatements);
+  NS_ASSERTION(mStatements.Length(), "We weren't given any statements!");
+  NS_IF_ADDREF(mCallback);
+}
+
+AsyncExecuteStatements::~AsyncExecuteStatements()
+{
+  MOZ_ASSERT(!mHasTransaction, "There should be no transaction at this point");
+}
+
+bool
+AsyncExecuteStatements::shouldNotify()
+{
+#ifdef DEBUG
+  mMutex.AssertNotCurrentThreadOwns();
+
+  bool onCallingThread = false;
+  (void)mCallingThread->IsOnCurrentThread(&onCallingThread);
+  NS_ASSERTION(onCallingThread, "runEvent not running on the calling thread!");
+#endif
+
+  // We do not need to acquire mMutex here because it can only ever be written
+  // to on the calling thread, and the only thread that can call us is the
+  // calling thread, so we know that our access is serialized.
+  return !mCancelRequested;
+}
+
+bool
+AsyncExecuteStatements::bindExecuteAndProcessStatement(StatementData &aData,
+                                                       bool aLastStatement)
+{
+  mMutex.AssertNotCurrentThreadOwns();
+
+  sqlite3_stmt *aStatement = nullptr;
+  // This cannot fail; we are only called if it's available.
+  (void)aData.getSqliteStatement(&aStatement);
+  NS_ASSERTION(aStatement, "You broke the code; do not call here like that!");
+  BindingParamsArray *paramsArray(aData);
+
+  // Iterate through all of our parameters, bind them, and execute.
+  bool continueProcessing = true;
+  BindingParamsArray::iterator itr = paramsArray->begin();
+  BindingParamsArray::iterator end = paramsArray->end();
+  while (itr != end && continueProcessing) {
+    // Bind the data to our statement.
+    nsCOMPtr<IStorageBindingParamsInternal> bindingInternal = 
+      do_QueryInterface(*itr);
+    nsCOMPtr<mozIStorageError> error = bindingInternal->bind(aStatement);
+    if (error) {
+      // Set our error state.
+      mState = ERROR;
+
+      // And notify.
+      (void)notifyError(error);
+      return false;
+    }
+
+    // Advance our iterator, execute, and then process the statement.
+    itr++;
+    bool lastStatement = aLastStatement && itr == end;
+    continueProcessing = executeAndProcessStatement(aStatement, lastStatement);
+
+    // Always reset our statement.
+    (void)::sqlite3_reset(aStatement);
+  }
+
+  return continueProcessing;
+}
+
+bool
+AsyncExecuteStatements::executeAndProcessStatement(sqlite3_stmt *aStatement,
+                                                   bool aLastStatement)
+{
+  mMutex.AssertNotCurrentThreadOwns();
+
+  // Execute our statement
+  bool hasResults;
+  do {
+    hasResults = executeStatement(aStatement);
+
+    // If we had an error, bail.
+    if (mState == ERROR)
+      return false;
+
+    // If we have been canceled, there is no point in going on...
+    {
+      MutexAutoLock lockedScope(mMutex);
+      if (mCancelRequested) {
+        mState = CANCELED;
+        return false;
+      }
+    }
+
+    // Build our result set and notify if we got anything back and have a
+    // callback to notify.
+    if (mCallback && hasResults &&
+        NS_FAILED(buildAndNotifyResults(aStatement))) {
+      // We had an error notifying, so we notify on error and stop processing.
+      mState = ERROR;
+
+      // Notify, and stop processing statements.
+      (void)notifyError(mozIStorageError::ERROR,
+                        "An error occurred while notifying about results");
+
+      return false;
+    }
+  } while (hasResults);
+
+#ifdef DEBUG
+  // Check to make sure that this statement was smart about what it did.
+  checkAndLogStatementPerformance(aStatement);
+#endif
+
+  // If we are done, we need to set our state accordingly while we still hold
+  // our mutex.  We would have already returned if we were canceled or had
+  // an error at this point.
+  if (aLastStatement)
+    mState = COMPLETED;
+
+  return true;
+}
+
+bool
+AsyncExecuteStatements::executeStatement(sqlite3_stmt *aStatement)
+{
+  mMutex.AssertNotCurrentThreadOwns();
+  Telemetry::AutoTimer<Telemetry::MOZ_STORAGE_ASYNC_REQUESTS_MS> finallySendExecutionDuration(mRequestStartDate);
+  while (true) {
+    // lock the sqlite mutex so sqlite3_errmsg cannot change
+    SQLiteMutexAutoLock lockedScope(mDBMutex);
+
+    int rc = mConnection->stepStatement(mNativeConnection, aStatement);
+    // Stop if we have no more results.
+    if (rc == SQLITE_DONE)
+    {
+      Telemetry::Accumulate(Telemetry::MOZ_STORAGE_ASYNC_REQUESTS_SUCCESS, true);
+      return false;
+    }
+
+    // If we got results, we can return now.
+    if (rc == SQLITE_ROW)
+    {
+      Telemetry::Accumulate(Telemetry::MOZ_STORAGE_ASYNC_REQUESTS_SUCCESS, true);
+      return true;
+    }
+
+    // Some errors are not fatal, and we can handle them and continue.
+    if (rc == SQLITE_BUSY) {
+      // Don't hold the lock while we call outside our module.
+      SQLiteMutexAutoUnlock unlockedScope(mDBMutex);
+
+      // Yield, and try again
+      (void)::PR_Sleep(PR_INTERVAL_NO_WAIT);
+      continue;
+    }
+
+    // Set an error state.
+    mState = ERROR;
+    Telemetry::Accumulate(Telemetry::MOZ_STORAGE_ASYNC_REQUESTS_SUCCESS, false);
+
+    // Construct the error message before giving up the mutex (which we cannot
+    // hold during the call to notifyError).
+    nsCOMPtr<mozIStorageError> errorObj(
+      new Error(rc, ::sqlite3_errmsg(mNativeConnection))
+    );
+    // We cannot hold the DB mutex while calling notifyError.
+    SQLiteMutexAutoUnlock unlockedScope(mDBMutex);
+    (void)notifyError(errorObj);
+
+    // Finally, indicate that we should stop processing.
+    return false;
+  }
+}
+
+nsresult
+AsyncExecuteStatements::buildAndNotifyResults(sqlite3_stmt *aStatement)
+{
+  NS_ASSERTION(mCallback, "Trying to dispatch results without a callback!");
+  mMutex.AssertNotCurrentThreadOwns();
+
+  // Build result object if we need it.
+  if (!mResultSet)
+    mResultSet = new ResultSet();
+  NS_ENSURE_TRUE(mResultSet, NS_ERROR_OUT_OF_MEMORY);
+
+  nsRefPtr<Row> row(new Row());
+  NS_ENSURE_TRUE(row, NS_ERROR_OUT_OF_MEMORY);
+
+  nsresult rv = row->initialize(aStatement);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = mResultSet->add(row);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // If we have hit our maximum number of allowed results, or if we have hit
+  // the maximum amount of time we want to wait for results, notify the
+  // calling thread about it.
+  TimeStamp now = TimeStamp::Now();
+  TimeDuration delta = now - mIntervalStart;
+  if (mResultSet->rows() >= MAX_ROWS_PER_RESULT || delta > mMaxWait) {
+    // Notify the caller
+    rv = notifyResults();
+    if (NS_FAILED(rv))
+      return NS_OK; // we'll try again with the next result
+
+    // Reset our start time
+    mIntervalStart = now;
+  }
+
+  return NS_OK;
+}
+
+nsresult
+AsyncExecuteStatements::notifyComplete()
+{
+  mMutex.AssertNotCurrentThreadOwns();
+  NS_ASSERTION(mState != PENDING,
+               "Still in a pending state when calling Complete!");
+
+  // Reset our statements before we try to commit or rollback.  If we are
+  // canceling and have statements that think they have pending work, the
+  // rollback will fail.
+  for (uint32_t i = 0; i < mStatements.Length(); i++)
+    mStatements[i].reset();
+
+  // Release references to the statement data as soon as possible. If this
+  // is the last reference, statements will be finalized immediately on the
+  // async thread, hence avoiding several bounces between threads and possible
+  // race conditions with AsyncClose().
+  mStatements.Clear();
+
+  // Handle our transaction, if we have one
+  if (mHasTransaction) {
+    if (mState == COMPLETED) {
+      nsresult rv = mConnection->commitTransactionInternal(mNativeConnection);
+      if (NS_FAILED(rv)) {
+        mState = ERROR;
+        (void)notifyError(mozIStorageError::ERROR,
+                          "Transaction failed to commit");
+      }
+    }
+    else {
+      DebugOnly<nsresult> rv =
+        mConnection->rollbackTransactionInternal(mNativeConnection);
+      NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "Transaction failed to rollback");
+    }
+    mHasTransaction = false;
+  }
+
+  // Always generate a completion notification; it is what guarantees that our
+  // destruction does not happen here on the async thread.
+  nsRefPtr<CompletionNotifier> completionEvent =
+    new CompletionNotifier(mCallback, mState);
+
+  // We no longer own mCallback (the CompletionNotifier takes ownership).
+  mCallback = nullptr;
+
+  (void)mCallingThread->Dispatch(completionEvent, NS_DISPATCH_NORMAL);
+
+  return NS_OK;
+}
+
+nsresult
+AsyncExecuteStatements::notifyError(int32_t aErrorCode,
+                                    const char *aMessage)
+{
+  mMutex.AssertNotCurrentThreadOwns();
+  mDBMutex.assertNotCurrentThreadOwns();
+
+  if (!mCallback)
+    return NS_OK;
+
+  nsCOMPtr<mozIStorageError> errorObj(new Error(aErrorCode, aMessage));
+  NS_ENSURE_TRUE(errorObj, NS_ERROR_OUT_OF_MEMORY);
+
+  return notifyError(errorObj);
+}
+
+nsresult
+AsyncExecuteStatements::notifyError(mozIStorageError *aError)
+{
+  mMutex.AssertNotCurrentThreadOwns();
+  mDBMutex.assertNotCurrentThreadOwns();
+
+  if (!mCallback)
+    return NS_OK;
+
+  nsRefPtr<ErrorNotifier> notifier =
+    new ErrorNotifier(mCallback, aError, this);
+  NS_ENSURE_TRUE(notifier, NS_ERROR_OUT_OF_MEMORY);
+
+  return mCallingThread->Dispatch(notifier, NS_DISPATCH_NORMAL);
+}
+
+nsresult
+AsyncExecuteStatements::notifyResults()
+{
+  mMutex.AssertNotCurrentThreadOwns();
+  NS_ASSERTION(mCallback, "notifyResults called without a callback!");
+
+  nsRefPtr<CallbackResultNotifier> notifier =
+    new CallbackResultNotifier(mCallback, mResultSet, this);
+  NS_ENSURE_TRUE(notifier, NS_ERROR_OUT_OF_MEMORY);
+
+  nsresult rv = mCallingThread->Dispatch(notifier, NS_DISPATCH_NORMAL);
+  if (NS_SUCCEEDED(rv))
+    mResultSet = nullptr; // we no longer own it on success
+  return rv;
+}
+
+NS_IMPL_ISUPPORTS(
+  AsyncExecuteStatements,
+  nsIRunnable,
+  mozIStoragePendingStatement
+)
+
+bool
+AsyncExecuteStatements::statementsNeedTransaction()
+{
+  // If there is more than one write statement, run in a transaction.
+  // Additionally, if we have only one statement but it needs a transaction, due
+  // to multiple BindingParams, we will wrap it in one.
+  for (uint32_t i = 0, transactionsCount = 0; i < mStatements.Length(); ++i) {
+    transactionsCount += mStatements[i].needsTransaction();
+    if (transactionsCount > 1) {
+      return true;
+    }
+  }
+  return false;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// mozIStoragePendingStatement
+
+NS_IMETHODIMP
+AsyncExecuteStatements::Cancel()
+{
+#ifdef DEBUG
+  bool onCallingThread = false;
+  (void)mCallingThread->IsOnCurrentThread(&onCallingThread);
+  NS_ASSERTION(onCallingThread, "Not canceling from the calling thread!");
+#endif
+
+  // If we have already canceled, we have an error, but always indicate that
+  // we are trying to cancel.
+  NS_ENSURE_FALSE(mCancelRequested, NS_ERROR_UNEXPECTED);
+
+  {
+    MutexAutoLock lockedScope(mMutex);
+
+    // We need to indicate that we want to try and cancel now.
+    mCancelRequested = true;
+  }
+
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// nsIRunnable
+
+NS_IMETHODIMP
+AsyncExecuteStatements::Run()
+{
+  MOZ_ASSERT(!mConnection->isClosed());
+
+  // Do not run if we have been canceled.
+  {
+    MutexAutoLock lockedScope(mMutex);
+    if (mCancelRequested)
+      mState = CANCELED;
+  }
+  if (mState == CANCELED)
+    return notifyComplete();
+
+  if (statementsNeedTransaction() && mConnection->getAutocommit()) {
+    if (NS_SUCCEEDED(mConnection->beginTransactionInternal(mNativeConnection,
+                                                           mozIStorageConnection::TRANSACTION_IMMEDIATE))) {
+      mHasTransaction = true;
+    }
+#ifdef DEBUG
+    else {
+      NS_WARNING("Unable to create a transaction for async execution.");
+    }
+#endif
+  }
+
+  // Execute each statement, giving the callback results if it returns any.
+  for (uint32_t i = 0; i < mStatements.Length(); i++) {
+    bool finished = (i == (mStatements.Length() - 1));
+
+    sqlite3_stmt *stmt;
+    { // lock the sqlite mutex so sqlite3_errmsg cannot change
+      SQLiteMutexAutoLock lockedScope(mDBMutex);
+
+      int rc = mStatements[i].getSqliteStatement(&stmt);
+      if (rc != SQLITE_OK) {
+        // Set our error state.
+        mState = ERROR;
+
+        // Build the error object; can't call notifyError with the lock held
+        nsCOMPtr<mozIStorageError> errorObj(
+          new Error(rc, ::sqlite3_errmsg(mNativeConnection))
+        );
+        {
+          // We cannot hold the DB mutex and call notifyError.
+          SQLiteMutexAutoUnlock unlockedScope(mDBMutex);
+          (void)notifyError(errorObj);
+        }
+        break;
+      }
+    }
+
+    // If we have parameters to bind, bind them, execute, and process.
+    if (mStatements[i].hasParametersToBeBound()) {
+      if (!bindExecuteAndProcessStatement(mStatements[i], finished))
+        break;
+    }
+    // Otherwise, just execute and process the statement.
+    else if (!executeAndProcessStatement(stmt, finished)) {
+      break;
+    }
+  }
+
+  // If we still have results that we haven't notified about, take care of
+  // them now.
+  if (mResultSet)
+    (void)notifyResults();
+
+  // Notify about completion
+  return notifyComplete();
+}
+
+} // namespace storage
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageAsyncStatementExecution.h firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageAsyncStatementExecution.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageAsyncStatementExecution.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageAsyncStatementExecution.h	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,242 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 mozStorageAsyncStatementExecution_h
+#define mozStorageAsyncStatementExecution_h
+
+#include "nscore.h"
+#include "nsTArray.h"
+#include "nsAutoPtr.h"
+#include "mozilla/Mutex.h"
+#include "mozilla/TimeStamp.h"
+#include "mozilla/Attributes.h"
+#include "nsIRunnable.h"
+
+#include "SQLiteMutex.h"
+#include "mozIStoragePendingStatement.h"
+#include "mozIStorageStatementCallback.h"
+#include "mozStorageHelper.h"
+
+struct sqlite3_stmt;
+
+namespace mozilla {
+namespace storage {
+
+class Connection;
+class ResultSet;
+class StatementData;
+
+class AsyncExecuteStatements final : public nsIRunnable
+                                   , public mozIStoragePendingStatement
+{
+public:
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_NSIRUNNABLE
+  NS_DECL_MOZISTORAGEPENDINGSTATEMENT
+
+  /**
+   * Describes the state of execution.
+   */
+  enum ExecutionState {
+    PENDING = -1,
+    COMPLETED = mozIStorageStatementCallback::REASON_FINISHED,
+    CANCELED = mozIStorageStatementCallback::REASON_CANCELED,
+    ERROR = mozIStorageStatementCallback::REASON_ERROR
+  };
+
+  typedef nsTArray<StatementData> StatementDataArray;
+
+  /**
+   * Executes a statement in the background, and passes results back to the
+   * caller.
+   *
+   * @param aStatements
+   *        The statements to execute and possibly bind in the background.
+   *        Ownership is transfered from the caller.
+   * @param aConnection
+   *        The connection that created the statements to execute.
+   * @param aNativeConnection
+   *        The native Sqlite connection that created the statements to execute.
+   * @param aCallback
+   *        The callback that is notified of results, completion, and errors.
+   * @param _stmt
+   *        The handle to control the execution of the statements.
+   */
+  static nsresult execute(StatementDataArray &aStatements,
+                          Connection *aConnection,
+                          sqlite3 *aNativeConnection,
+                          mozIStorageStatementCallback *aCallback,
+                          mozIStoragePendingStatement **_stmt);
+
+  /**
+   * Indicates when events on the calling thread should run or not.  Certain
+   * events posted back to the calling thread should call this see if they
+   * should run or not.
+   *
+   * @pre mMutex is not held
+   *
+   * @returns true if the event should notify still, false otherwise.
+   */
+  bool shouldNotify();
+
+private:
+  AsyncExecuteStatements(StatementDataArray &aStatements,
+                         Connection *aConnection,
+                         sqlite3 *aNativeConnection,
+                         mozIStorageStatementCallback *aCallback);
+  ~AsyncExecuteStatements();
+
+  /**
+   * Binds and then executes a given statement until completion, an error
+   * occurs, or we are canceled.  If aLastStatement is true, we should set
+   * mState accordingly.
+   *
+   * @pre mMutex is not held
+   *
+   * @param aData
+   *        The StatementData to bind, execute, and then process.
+   * @param aLastStatement
+   *        Indicates if this is the last statement or not.  If it is, we have
+   *        to set the proper state.
+   * @returns true if we should continue to process statements, false otherwise.
+   */
+  bool bindExecuteAndProcessStatement(StatementData &aData,
+                                      bool aLastStatement);
+
+  /**
+   * Executes a given statement until completion, an error occurs, or we are
+   * canceled.  If aLastStatement is true, we should set mState accordingly.
+   *
+   * @pre mMutex is not held
+   *
+   * @param aStatement
+   *        The statement to execute and then process.
+   * @param aLastStatement
+   *        Indicates if this is the last statement or not.  If it is, we have
+   *        to set the proper state.
+   * @returns true if we should continue to process statements, false otherwise.
+   */
+  bool executeAndProcessStatement(sqlite3_stmt *aStatement,
+                                  bool aLastStatement);
+
+  /**
+   * Executes a statement to completion, properly handling any error conditions.
+   *
+   * @pre mMutex is not held
+   *
+   * @param aStatement
+   *        The statement to execute to completion.
+   * @returns true if results were obtained, false otherwise.
+   */
+  bool executeStatement(sqlite3_stmt *aStatement);
+
+  /**
+   * Builds a result set up with a row from a given statement.  If we meet the
+   * right criteria, go ahead and notify about this results too.
+   *
+   * @pre mMutex is not held
+   *
+   * @param aStatement
+   *        The statement to get the row data from.
+   */
+  nsresult buildAndNotifyResults(sqlite3_stmt *aStatement);
+
+  /**
+   * Notifies callback about completion, and does any necessary cleanup.
+   *
+   * @pre mMutex is not held
+   */
+  nsresult notifyComplete();
+
+  /**
+   * Notifies callback about an error.
+   *
+   * @pre mMutex is not held
+   * @pre mDBMutex is not held
+   *
+   * @param aErrorCode
+   *        The error code defined in mozIStorageError for the error.
+   * @param aMessage
+   *        The error string, if any.
+   * @param aError
+   *        The error object to notify the caller with.
+   */
+  nsresult notifyError(int32_t aErrorCode, const char *aMessage);
+  nsresult notifyError(mozIStorageError *aError);
+
+  /**
+   * Notifies the callback about a result set.
+   *
+   * @pre mMutex is not held
+   */
+  nsresult notifyResults();
+
+  /**
+   * Tests whether the current statements should be wrapped in an explicit
+   * transaction.
+   *
+   * @return true if an explicit transaction is needed, false otherwise.
+   */
+  bool statementsNeedTransaction();
+
+  StatementDataArray mStatements;
+  nsRefPtr<Connection> mConnection;
+  sqlite3 *mNativeConnection;
+  bool mHasTransaction;
+  mozIStorageStatementCallback *mCallback;
+  nsCOMPtr<nsIThread> mCallingThread;
+  nsRefPtr<ResultSet> mResultSet;
+
+  /**
+   * The maximum amount of time we want to wait between results.  Defined by
+   * MAX_MILLISECONDS_BETWEEN_RESULTS and set at construction.
+   */
+  const TimeDuration mMaxWait;
+
+  /**
+   * The start time since our last set of results.
+   */
+  TimeStamp mIntervalStart;
+
+  /**
+   * Indicates our state of execution.
+   */
+  ExecutionState mState;
+
+  /**
+   * Indicates if we should try to cancel at a cancelation point.
+   */
+  bool mCancelRequested;
+
+  /**
+   * This is the mutex that protects our state from changing between threads.
+   * This includes the following variables:
+   *   - mCancelRequested is only set on the calling thread while the lock is
+   *     held.  It is always read from within the lock on the background thread,
+   *     but not on the calling thread (see shouldNotify for why).
+   */
+  Mutex &mMutex;
+
+  /**
+   * The wrapped SQLite recursive connection mutex.  We use it whenever we call
+   * sqlite3_step and care about having reliable error messages.  By taking it
+   * prior to the call and holding it until the point where we no longer care
+   * about the error message, the user gets reliable error messages.
+   */
+  SQLiteMutex &mDBMutex;
+  
+  /**
+   * The instant at which the request was started.
+   *
+   * Used by telemetry.
+   */
+  TimeStamp mRequestStartDate;
+};
+
+} // namespace storage
+} // namespace mozilla
+
+#endif // mozStorageAsyncStatementExecution_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageAsyncStatement.h firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageAsyncStatement.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageAsyncStatement.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageAsyncStatement.h	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,107 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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_storage_mozStorageAsyncStatement_h_
+#define mozilla_storage_mozStorageAsyncStatement_h_
+
+#include "nsAutoPtr.h"
+#include "nsString.h"
+
+#include "nsTArray.h"
+
+#include "mozStorageBindingParamsArray.h"
+#include "mozStorageStatementData.h"
+#include "mozIStorageAsyncStatement.h"
+#include "StorageBaseStatementInternal.h"
+#include "mozilla/Attributes.h"
+
+class nsIXPConnectJSObjectHolder;
+
+namespace mozilla {
+namespace storage {
+
+class AsyncStatementJSHelper;
+class Connection;
+
+class AsyncStatement final : public mozIStorageAsyncStatement
+                           , public StorageBaseStatementInternal
+{
+public:
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_MOZISTORAGEASYNCSTATEMENT
+  NS_DECL_MOZISTORAGEBASESTATEMENT
+  NS_DECL_MOZISTORAGEBINDINGPARAMS
+  NS_DECL_STORAGEBASESTATEMENTINTERNAL
+
+  AsyncStatement();
+
+  /**
+   * Initializes the object on aDBConnection by preparing the SQL statement
+   * given by aSQLStatement.
+   *
+   * @param aDBConnection
+   *        The Connection object this statement is associated with.
+   * @param aNativeConnection
+   *        The native Sqlite connection this statement is associated with.
+   * @param aSQLStatement
+   *        The SQL statement to prepare that this object will represent.
+   */
+  nsresult initialize(Connection *aDBConnection,
+                      sqlite3 *aNativeConnection,
+                      const nsACString &aSQLStatement);
+
+  /**
+   * Obtains and transfers ownership of the array of parameters that are bound
+   * to this statment.  This can be null.
+   */
+  inline already_AddRefed<BindingParamsArray> bindingParamsArray()
+  {
+    return mParamsArray.forget();
+  }
+
+
+private:
+  ~AsyncStatement();
+
+  /**
+   * @return a pointer to the BindingParams object to use with our Bind*
+   *         method.
+   */
+  mozIStorageBindingParams *getParams();
+
+  /**
+   * The SQL string as passed by the user.  We store it because we create the
+   * async statement on-demand on the async thread.
+   */
+  nsCString mSQLString;
+
+  /**
+   * Holds the array of parameters to bind to this statement when we execute
+   * it asynchronously.
+   */
+  nsRefPtr<BindingParamsArray> mParamsArray;
+
+  /**
+   * Caches the JS 'params' helper for this statement.
+   */
+  nsMainThreadPtrHandle<nsIXPConnectJSObjectHolder> mStatementParamsHolder;
+
+  /**
+   * Have we been explicitly finalized by the user?
+   */
+  bool mFinalized;
+
+  /**
+   * Required for access to private mStatementParamsHolder field by
+   * AsyncStatementJSHelper::getParams.
+   */
+  friend class AsyncStatementJSHelper;
+};
+
+} // storage
+} // mozilla
+
+#endif // mozilla_storage_mozStorageAsyncStatement_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageAsyncStatementJSHelper.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageAsyncStatementJSHelper.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageAsyncStatementJSHelper.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageAsyncStatementJSHelper.cpp	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,151 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 "nsIXPConnect.h"
+#include "mozStorageAsyncStatement.h"
+#include "mozStorageService.h"
+
+#include "nsMemory.h"
+#include "nsString.h"
+#include "nsServiceManagerUtils.h"
+
+#include "mozStorageAsyncStatementJSHelper.h"
+
+#include "mozStorageAsyncStatementParams.h"
+
+#include "jsapi.h"
+
+namespace mozilla {
+namespace storage {
+
+////////////////////////////////////////////////////////////////////////////////
+//// AsyncStatementJSHelper
+
+nsresult
+AsyncStatementJSHelper::getParams(AsyncStatement *aStatement,
+                                  JSContext *aCtx,
+                                  JSObject *aScopeObj,
+                                  jsval *_params)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  nsresult rv;
+
+#ifdef DEBUG
+  int32_t state;
+  (void)aStatement->GetState(&state);
+  NS_ASSERTION(state == mozIStorageAsyncStatement::MOZ_STORAGE_STATEMENT_READY,
+               "Invalid state to get the params object - all calls will fail!");
+#endif
+
+  if (!aStatement->mStatementParamsHolder) {
+    nsCOMPtr<mozIStorageStatementParams> params =
+      new AsyncStatementParams(aStatement);
+    NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);
+
+    JS::RootedObject scope(aCtx, aScopeObj);
+    nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
+    nsCOMPtr<nsIXPConnect> xpc(Service::getXPConnect());
+    rv = xpc->WrapNative(
+      aCtx,
+      ::JS_GetGlobalForObject(aCtx, scope),
+      params,
+      NS_GET_IID(mozIStorageStatementParams),
+      getter_AddRefs(holder)
+    );
+    NS_ENSURE_SUCCESS(rv, rv);
+    nsRefPtr<AsyncStatementParamsHolder> paramsHolder =
+      new AsyncStatementParamsHolder(holder);
+    aStatement->mStatementParamsHolder =
+      new nsMainThreadPtrHolder<nsIXPConnectJSObjectHolder>(paramsHolder);
+  }
+
+  JS::Rooted<JSObject*> obj(aCtx);
+  obj = aStatement->mStatementParamsHolder->GetJSObject();
+  NS_ENSURE_STATE(obj);
+
+  *_params = OBJECT_TO_JSVAL(obj);
+  return NS_OK;
+}
+
+NS_IMETHODIMP_(MozExternalRefCountType) AsyncStatementJSHelper::AddRef() { return 2; }
+NS_IMETHODIMP_(MozExternalRefCountType) AsyncStatementJSHelper::Release() { return 1; }
+NS_INTERFACE_MAP_BEGIN(AsyncStatementJSHelper)
+  NS_INTERFACE_MAP_ENTRY(nsIXPCScriptable)
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
+NS_INTERFACE_MAP_END
+
+////////////////////////////////////////////////////////////////////////////////
+//// nsIXPCScriptable
+
+#define XPC_MAP_CLASSNAME AsyncStatementJSHelper
+#define XPC_MAP_QUOTED_CLASSNAME "AsyncStatementJSHelper"
+#define XPC_MAP_WANT_GETPROPERTY
+#define XPC_MAP_FLAGS nsIXPCScriptable::ALLOW_PROP_MODS_DURING_RESOLVE
+#include "xpc_map_end.h"
+
+NS_IMETHODIMP
+AsyncStatementJSHelper::GetProperty(nsIXPConnectWrappedNative *aWrapper,
+                                    JSContext *aCtx,
+                                    JSObject *aScopeObj,
+                                    jsid aId,
+                                    jsval *_result,
+                                    bool *_retval)
+{
+  if (!JSID_IS_STRING(aId))
+    return NS_OK;
+
+  // Cast to async via mozI* since direct from nsISupports is ambiguous.
+  JS::RootedObject scope(aCtx, aScopeObj);
+  JS::RootedId id(aCtx, aId);
+  mozIStorageAsyncStatement *iAsyncStmt =
+    static_cast<mozIStorageAsyncStatement *>(aWrapper->Native());
+  AsyncStatement *stmt = static_cast<AsyncStatement *>(iAsyncStmt);
+
+#ifdef DEBUG
+  {
+    nsISupports *supp = aWrapper->Native();
+    nsCOMPtr<mozIStorageAsyncStatement> isStatement(do_QueryInterface(supp));
+    NS_ASSERTION(isStatement, "How is this not an async statement?!");
+  }
+#endif
+
+  if (::JS_FlatStringEqualsAscii(JSID_TO_FLAT_STRING(id), "params"))
+    return getParams(stmt, aCtx, scope, _result);
+
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// AsyncStatementParamsHolder
+
+NS_IMPL_ISUPPORTS(AsyncStatementParamsHolder, nsIXPConnectJSObjectHolder);
+
+JSObject*
+AsyncStatementParamsHolder::GetJSObject()
+{
+  return mHolder->GetJSObject();
+}
+
+AsyncStatementParamsHolder::AsyncStatementParamsHolder(nsIXPConnectJSObjectHolder* aHolder)
+  : mHolder(aHolder)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(mHolder);
+}
+
+AsyncStatementParamsHolder::~AsyncStatementParamsHolder()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  // We are considered dead at this point, so any wrappers for row or params
+  // need to lose their reference to the statement.
+  nsCOMPtr<nsIXPConnectWrappedNative> wrapper = do_QueryInterface(mHolder);
+  nsCOMPtr<mozIStorageStatementParams> iObj = do_QueryWrappedNative(wrapper);
+  AsyncStatementParams *obj = static_cast<AsyncStatementParams *>(iObj.get());
+  obj->mStatement = nullptr;
+}
+
+} // namespace storage
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageAsyncStatementJSHelper.h firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageAsyncStatementJSHelper.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageAsyncStatementJSHelper.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageAsyncStatementJSHelper.h	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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_storage_mozStorageAsyncStatementJSHelper_h_
+#define mozilla_storage_mozStorageAsyncStatementJSHelper_h_
+
+#include "nsIXPCScriptable.h"
+#include "nsIXPConnect.h"
+
+class AsyncStatement;
+
+namespace mozilla {
+namespace storage {
+
+/**
+ * A modified version of StatementJSHelper that only exposes the async-specific
+ * 'params' helper.  We do not expose 'row' or 'step' as they do not apply to
+ * us.
+ */
+class AsyncStatementJSHelper : public nsIXPCScriptable
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIXPCSCRIPTABLE
+
+private:
+  nsresult getParams(AsyncStatement *, JSContext *, JSObject *, JS::Value *);
+};
+
+/**
+ * Wrapper used to clean up the references JS helpers hold to the statement.
+ * For cycle-avoidance reasons they do not hold reference-counted references,
+ * so it is important we do this.
+ */
+class AsyncStatementParamsHolder final : public nsIXPConnectJSObjectHolder
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIXPCONNECTJSOBJECTHOLDER
+
+  explicit AsyncStatementParamsHolder(nsIXPConnectJSObjectHolder* aHolder);
+
+private:
+  virtual ~AsyncStatementParamsHolder();
+  nsCOMPtr<nsIXPConnectJSObjectHolder> mHolder;
+};
+
+} // namespace storage
+} // namespace mozilla
+
+#endif // mozilla_storage_mozStorageAsyncStatementJSHelper_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageAsyncStatementParams.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageAsyncStatementParams.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageAsyncStatementParams.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageAsyncStatementParams.cpp	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,127 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 "nsMemory.h"
+#include "nsString.h"
+#include "nsCOMPtr.h"
+#include "nsJSUtils.h"
+
+#include "jsapi.h"
+
+#include "mozStoragePrivateHelpers.h"
+#include "mozStorageAsyncStatement.h"
+#include "mozStorageAsyncStatementParams.h"
+#include "mozIStorageStatement.h"
+
+namespace mozilla {
+namespace storage {
+
+////////////////////////////////////////////////////////////////////////////////
+//// AsyncStatementParams
+
+AsyncStatementParams::AsyncStatementParams(AsyncStatement *aStatement)
+: mStatement(aStatement)
+{
+  NS_ASSERTION(mStatement != nullptr, "mStatement is null");
+}
+
+NS_IMPL_ISUPPORTS(
+  AsyncStatementParams
+, mozIStorageStatementParams
+, nsIXPCScriptable
+)
+
+////////////////////////////////////////////////////////////////////////////////
+//// nsIXPCScriptable
+
+#define XPC_MAP_CLASSNAME AsyncStatementParams
+#define XPC_MAP_QUOTED_CLASSNAME "AsyncStatementParams"
+#define XPC_MAP_WANT_SETPROPERTY
+#define XPC_MAP_WANT_RESOLVE
+#define XPC_MAP_FLAGS nsIXPCScriptable::ALLOW_PROP_MODS_DURING_RESOLVE
+#include "xpc_map_end.h"
+
+NS_IMETHODIMP
+AsyncStatementParams::SetProperty(
+  nsIXPConnectWrappedNative *aWrapper,
+  JSContext *aCtx,
+  JSObject *aScopeObj,
+  jsid aId,
+  JS::Value *_vp,
+  bool *_retval
+)
+{
+  NS_ENSURE_TRUE(mStatement, NS_ERROR_NOT_INITIALIZED);
+
+  if (JSID_IS_INT(aId)) {
+    int idx = JSID_TO_INT(aId);
+
+    nsCOMPtr<nsIVariant> variant(convertJSValToVariant(aCtx, *_vp));
+    NS_ENSURE_TRUE(variant, NS_ERROR_UNEXPECTED);
+    nsresult rv = mStatement->BindByIndex(idx, variant);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+  else if (JSID_IS_STRING(aId)) {
+    JSString *str = JSID_TO_STRING(aId);
+    nsAutoJSString autoStr;
+    if (!autoStr.init(aCtx, str)) {
+      return NS_ERROR_FAILURE;
+    }
+
+    NS_ConvertUTF16toUTF8 name(autoStr);
+
+    nsCOMPtr<nsIVariant> variant(convertJSValToVariant(aCtx, *_vp));
+    NS_ENSURE_TRUE(variant, NS_ERROR_UNEXPECTED);
+    nsresult rv = mStatement->BindByName(name, variant);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+  else {
+    return NS_ERROR_INVALID_ARG;
+  }
+
+  *_retval = true;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+AsyncStatementParams::Resolve(nsIXPConnectWrappedNative *aWrapper,
+                              JSContext *aCtx,
+                              JSObject *aScopeObj,
+                              jsid aId,
+                              bool *aResolvedp,
+                              bool *_retval)
+{
+  JS::Rooted<JSObject*> scopeObj(aCtx, aScopeObj);
+
+  NS_ENSURE_TRUE(mStatement, NS_ERROR_NOT_INITIALIZED);
+  // We do not throw at any point after this because we want to allow the
+  // prototype chain to be checked for the property.
+
+  bool resolved = false;
+  bool ok = true;
+  if (JSID_IS_INT(aId)) {
+    uint32_t idx = JSID_TO_INT(aId);
+    // All indexes are good because we don't know how many parameters there
+    // really are.
+    ok = ::JS_DefineElement(aCtx, scopeObj, idx, JS::UndefinedHandleValue, 0);
+    resolved = true;
+  }
+  else if (JSID_IS_STRING(aId)) {
+    // We are unable to tell if there's a parameter with this name and so
+    // we must assume that there is.  This screws the rest of the prototype
+    // chain, but people really shouldn't be depending on this anyways.
+    JS::Rooted<jsid> id(aCtx, aId);
+    ok = ::JS_DefinePropertyById(aCtx, scopeObj, id, JS::UndefinedHandleValue, 0);
+    resolved = true;
+  }
+
+  *_retval = ok;
+  *aResolvedp = resolved && ok;
+  return NS_OK;
+}
+
+} // namespace storage
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageAsyncStatementParams.h firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageAsyncStatementParams.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageAsyncStatementParams.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageAsyncStatementParams.h	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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_storage_mozStorageAsyncStatementParams_h_
+#define mozilla_storage_mozStorageAsyncStatementParams_h_
+
+#include "mozIStorageStatementParams.h"
+#include "nsIXPCScriptable.h"
+#include "mozilla/Attributes.h"
+
+namespace mozilla {
+namespace storage {
+
+class AsyncStatement;
+
+/*
+ * Since mozIStorageStatementParams is just a tagging interface we do not have
+ * an async variant.
+ */
+class AsyncStatementParams final : public mozIStorageStatementParams
+                                 , public nsIXPCScriptable
+{
+public:
+  explicit AsyncStatementParams(AsyncStatement *aStatement);
+
+  // interfaces
+  NS_DECL_ISUPPORTS
+  NS_DECL_MOZISTORAGESTATEMENTPARAMS
+  NS_DECL_NSIXPCSCRIPTABLE
+
+protected:
+  virtual ~AsyncStatementParams() {}
+
+  AsyncStatement *mStatement;
+
+  friend class AsyncStatementParamsHolder;
+};
+
+} // namespace storage
+} // namespace mozilla
+
+#endif // mozilla_storage_mozStorageAsyncStatementParams_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageBindingParamsArray.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageBindingParamsArray.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageBindingParamsArray.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageBindingParamsArray.cpp	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,90 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 "mozStorageBindingParamsArray.h"
+#include "mozStorageBindingParams.h"
+#include "StorageBaseStatementInternal.h"
+
+namespace mozilla {
+namespace storage {
+
+////////////////////////////////////////////////////////////////////////////////
+//// BindingParamsArray
+
+BindingParamsArray::BindingParamsArray(
+  StorageBaseStatementInternal *aOwningStatement
+)
+: mOwningStatement(aOwningStatement)
+, mLocked(false)
+{
+}
+
+void
+BindingParamsArray::lock()
+{
+  NS_ASSERTION(mLocked == false, "Array has already been locked!");
+  mLocked = true;
+
+  // We also no longer need to hold a reference to our statement since it owns
+  // us.
+  mOwningStatement = nullptr;
+}
+
+const StorageBaseStatementInternal *
+BindingParamsArray::getOwner() const
+{
+  return mOwningStatement;
+}
+
+NS_IMPL_ISUPPORTS(
+  BindingParamsArray,
+  mozIStorageBindingParamsArray
+)
+
+///////////////////////////////////////////////////////////////////////////////
+//// mozIStorageBindingParamsArray
+
+NS_IMETHODIMP
+BindingParamsArray::NewBindingParams(mozIStorageBindingParams **_params)
+{
+  NS_ENSURE_FALSE(mLocked, NS_ERROR_UNEXPECTED);
+
+  nsCOMPtr<mozIStorageBindingParams> params(
+    mOwningStatement->newBindingParams(this));
+  NS_ENSURE_TRUE(params, NS_ERROR_UNEXPECTED);
+
+  params.forget(_params);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+BindingParamsArray::AddParams(mozIStorageBindingParams *aParameters)
+{
+  NS_ENSURE_FALSE(mLocked, NS_ERROR_UNEXPECTED);
+
+  BindingParams *params = static_cast<BindingParams *>(aParameters);
+
+  // Check to make sure that this set of parameters was created with us.
+  if (params->getOwner() != this)
+    return NS_ERROR_UNEXPECTED;
+
+  NS_ENSURE_TRUE(mArray.AppendElement(params), NS_ERROR_OUT_OF_MEMORY);
+
+  // Lock the parameters only after we've successfully added them.
+  params->lock();
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+BindingParamsArray::GetLength(uint32_t *_length)
+{
+  *_length = length();
+  return NS_OK;
+}
+
+} // namespace storage
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageBindingParamsArray.h firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageBindingParamsArray.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageBindingParamsArray.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageBindingParamsArray.h	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,116 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 mozStorageBindingParamsArray_h
+#define mozStorageBindingParamsArray_h
+
+#include "nsAutoPtr.h"
+#include "nsTArray.h"
+#include "mozilla/Attributes.h"
+
+#include "mozIStorageBindingParamsArray.h"
+
+namespace mozilla {
+namespace storage {
+
+class StorageBaseStatementInternal;
+
+class BindingParamsArray final : public mozIStorageBindingParamsArray
+{
+  typedef nsTArray< nsCOMPtr<mozIStorageBindingParams> > array_type;
+
+  ~BindingParamsArray() {}
+
+public:
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_MOZISTORAGEBINDINGPARAMSARRAY
+
+  explicit BindingParamsArray(StorageBaseStatementInternal *aOwningStatement);
+
+  typedef array_type::size_type size_type;
+
+  /**
+   * Locks the array and prevents further modification to it (such as adding
+   * more elements to it).
+   */
+  void lock();
+
+  /**
+   * @return the pointer to the owning BindingParamsArray.
+   */
+  const StorageBaseStatementInternal *getOwner() const;
+
+  /**
+   * @return the number of elemets the array contains.
+   */
+  const size_type length() const { return mArray.Length(); }
+
+  class iterator {
+  public:
+    iterator(BindingParamsArray *aArray,
+             uint32_t aIndex)
+    : mArray(aArray)
+    , mIndex(aIndex)
+    {
+    }
+
+    iterator &operator++(int)
+    {
+      mIndex++;
+      return *this;
+    }
+
+    bool operator==(const iterator &aOther) const
+    {
+      return mIndex == aOther.mIndex;
+    }
+    bool operator!=(const iterator &aOther) const
+    {
+      return !(*this == aOther);
+    }
+    mozIStorageBindingParams *operator*()
+    {
+      NS_ASSERTION(mIndex < mArray->length(),
+                   "Dereferenceing an invalid value!");
+      return mArray->mArray[mIndex].get();
+    }
+  private:
+    void operator--() { }
+    BindingParamsArray *mArray;
+    uint32_t mIndex;
+  };
+
+  /**
+   * Obtains an iterator pointing to the beginning of the array.
+   */
+  inline iterator begin()
+  {
+    NS_ASSERTION(length() != 0,
+                 "Obtaining an iterator to the beginning with no elements!");
+    return iterator(this, 0);
+  }
+
+  /**
+   * Obtains an iterator pointing to the end of the array.
+   */
+  inline iterator end()
+  {
+    NS_ASSERTION(mLocked,
+                 "Obtaining an iterator to the end when we are not locked!");
+    return iterator(this, length());
+  }
+private:
+  nsCOMPtr<StorageBaseStatementInternal> mOwningStatement;
+  array_type mArray;
+  bool mLocked;
+
+  friend class iterator;
+};
+
+} // namespace storage
+} // namespace mozilla
+
+#endif // mozStorageBindingParamsArray_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageBindingParams.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageBindingParams.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageBindingParams.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageBindingParams.cpp	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,539 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 <limits.h>
+
+#include "nsString.h"
+
+#include "mozStorageError.h"
+#include "mozStoragePrivateHelpers.h"
+#include "mozStorageBindingParams.h"
+#include "mozStorageBindingParamsArray.h"
+#include "Variant.h"
+
+namespace mozilla {
+namespace storage {
+
+////////////////////////////////////////////////////////////////////////////////
+//// Local Helper Objects
+
+namespace {
+
+struct BindingColumnData
+{
+  BindingColumnData(sqlite3_stmt *aStmt,
+                    int aColumn)
+  : stmt(aStmt)
+  , column(aColumn)
+  {
+  }
+  sqlite3_stmt *stmt;
+  int column;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+//// Variant Specialization Functions (variantToSQLiteT)
+
+int
+sqlite3_T_int(BindingColumnData aData,
+              int aValue)
+{
+  return ::sqlite3_bind_int(aData.stmt, aData.column + 1, aValue);
+}
+
+int
+sqlite3_T_int64(BindingColumnData aData,
+                sqlite3_int64 aValue)
+{
+  return ::sqlite3_bind_int64(aData.stmt, aData.column + 1, aValue);
+}
+
+int
+sqlite3_T_double(BindingColumnData aData,
+                 double aValue)
+{
+  return ::sqlite3_bind_double(aData.stmt, aData.column + 1, aValue);
+}
+
+int
+sqlite3_T_text(BindingColumnData aData,
+               const nsCString& aValue)
+{
+  return ::sqlite3_bind_text(aData.stmt,
+                             aData.column + 1,
+                             aValue.get(),
+                             aValue.Length(),
+                             SQLITE_TRANSIENT);
+}
+
+int
+sqlite3_T_text16(BindingColumnData aData,
+                 const nsString& aValue)
+{
+  return ::sqlite3_bind_text16(aData.stmt,
+                               aData.column + 1,
+                               aValue.get(),
+                               aValue.Length() * 2, // Length in bytes!
+                               SQLITE_TRANSIENT);
+}
+
+int
+sqlite3_T_null(BindingColumnData aData)
+{
+  return ::sqlite3_bind_null(aData.stmt, aData.column + 1);
+}
+
+int
+sqlite3_T_blob(BindingColumnData aData,
+               const void *aBlob,
+               int aSize)
+{
+  return ::sqlite3_bind_blob(aData.stmt, aData.column + 1, aBlob, aSize,
+                             free);
+
+}
+
+#include "variantToSQLiteT_impl.h"
+
+} // anonymous namespace
+
+////////////////////////////////////////////////////////////////////////////////
+//// BindingParams
+
+BindingParams::BindingParams(mozIStorageBindingParamsArray *aOwningArray,
+                             Statement *aOwningStatement)
+: mLocked(false)
+, mOwningArray(aOwningArray)
+, mOwningStatement(aOwningStatement)
+{
+  (void)mOwningStatement->GetParameterCount(&mParamCount);
+  (void)mParameters.SetCapacity(mParamCount);
+}
+
+BindingParams::BindingParams(mozIStorageBindingParamsArray *aOwningArray)
+: mLocked(false)
+, mOwningArray(aOwningArray)
+, mOwningStatement(nullptr)
+, mParamCount(0)
+{
+}
+
+AsyncBindingParams::AsyncBindingParams(
+  mozIStorageBindingParamsArray *aOwningArray
+)
+: BindingParams(aOwningArray)
+{
+}
+
+void
+BindingParams::lock()
+{
+  NS_ASSERTION(mLocked == false, "Parameters have already been locked!");
+  mLocked = true;
+
+  // We no longer need to hold a reference to our statement or our owning array.
+  // The array owns us at this point, and it will own a reference to the
+  // statement.
+  mOwningStatement = nullptr;
+  mOwningArray = nullptr;
+}
+
+void
+BindingParams::unlock(Statement *aOwningStatement)
+{
+  NS_ASSERTION(mLocked == true, "Parameters were not yet locked!");
+  mLocked = false;
+  mOwningStatement = aOwningStatement;
+}
+
+const mozIStorageBindingParamsArray *
+BindingParams::getOwner() const
+{
+  return mOwningArray;
+}
+
+PLDHashOperator
+AsyncBindingParams::iterateOverNamedParameters(const nsACString &aName,
+                                               nsIVariant *aValue,
+                                               void *voidClosureThunk)
+{
+  NamedParameterIterationClosureThunk *closureThunk =
+    static_cast<NamedParameterIterationClosureThunk *>(voidClosureThunk);
+
+  // We do not accept any forms of names other than ":name", but we need to add
+  // the colon for SQLite.
+  nsAutoCString name(":");
+  name.Append(aName);
+  int oneIdx = ::sqlite3_bind_parameter_index(closureThunk->statement,
+                                              name.get());
+
+  if (oneIdx == 0) {
+    nsAutoCString errMsg(aName);
+    errMsg.AppendLiteral(" is not a valid named parameter.");
+    closureThunk->err = new Error(SQLITE_RANGE, errMsg.get());
+    return PL_DHASH_STOP;
+  }
+
+  // XPCVariant's AddRef and Release are not thread-safe and so we must not do
+  // anything that would invoke them here on the async thread.  As such we can't
+  // cram aValue into self->mParameters using ReplaceObjectAt so that we can
+  // freeload off of the BindingParams::Bind implementation.
+  int rc = variantToSQLiteT(BindingColumnData(closureThunk->statement,
+                                              oneIdx - 1),
+                            aValue);
+  if (rc != SQLITE_OK) {
+    // We had an error while trying to bind.  Now we need to create an error
+    // object with the right message.  Note that we special case
+    // SQLITE_MISMATCH, but otherwise get the message from SQLite.
+    const char *msg = "Could not covert nsIVariant to SQLite type.";
+    if (rc != SQLITE_MISMATCH)
+      msg = ::sqlite3_errmsg(::sqlite3_db_handle(closureThunk->statement));
+
+    closureThunk->err = new Error(rc, msg);
+    return PL_DHASH_STOP;
+  }
+  return PL_DHASH_NEXT;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// nsISupports
+
+NS_IMPL_ISUPPORTS(
+  BindingParams
+, mozIStorageBindingParams
+, IStorageBindingParamsInternal
+)
+
+
+////////////////////////////////////////////////////////////////////////////////
+//// IStorageBindingParamsInternal
+
+already_AddRefed<mozIStorageError>
+BindingParams::bind(sqlite3_stmt *aStatement)
+{
+  // Iterate through all of our stored data, and bind it.
+  for (size_t i = 0; i < mParameters.Length(); i++) {
+    int rc = variantToSQLiteT(BindingColumnData(aStatement, i), mParameters[i]);
+    if (rc != SQLITE_OK) {
+      // We had an error while trying to bind.  Now we need to create an error
+      // object with the right message.  Note that we special case
+      // SQLITE_MISMATCH, but otherwise get the message from SQLite.
+      const char *msg = "Could not covert nsIVariant to SQLite type.";
+      if (rc != SQLITE_MISMATCH)
+        msg = ::sqlite3_errmsg(::sqlite3_db_handle(aStatement));
+
+      nsCOMPtr<mozIStorageError> err(new Error(rc, msg));
+      return err.forget();
+    }
+  }
+
+  return nullptr;
+}
+
+already_AddRefed<mozIStorageError>
+AsyncBindingParams::bind(sqlite3_stmt * aStatement)
+{
+  // We should bind by index using the super-class if there is nothing in our
+  // hashtable.
+  if (!mNamedParameters.Count())
+    return BindingParams::bind(aStatement);
+
+  // Enumerate over everyone in the map, propagating them into mParameters if
+  // we can and creating an error immediately when we cannot.
+  NamedParameterIterationClosureThunk closureThunk = {this, aStatement, nullptr};
+  (void)mNamedParameters.EnumerateRead(iterateOverNamedParameters,
+                                       (void *)&closureThunk);
+
+  return closureThunk.err.forget();
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+//// mozIStorageBindingParams
+
+NS_IMETHODIMP
+BindingParams::BindByName(const nsACString &aName,
+                          nsIVariant *aValue)
+{
+  NS_ENSURE_FALSE(mLocked, NS_ERROR_UNEXPECTED);
+
+  // Get the column index that we need to store this at.
+  uint32_t index;
+  nsresult rv = mOwningStatement->GetParameterIndex(aName, &index);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return BindByIndex(index, aValue);
+}
+
+NS_IMETHODIMP
+AsyncBindingParams::BindByName(const nsACString &aName,
+                               nsIVariant *aValue)
+{
+  NS_ENSURE_FALSE(mLocked, NS_ERROR_UNEXPECTED);
+
+  nsRefPtr<Variant_base> variant = convertVariantToStorageVariant(aValue);
+  if (!variant)
+    return NS_ERROR_UNEXPECTED;
+
+  mNamedParameters.Put(aName, variant);
+  return NS_OK;
+}
+
+
+NS_IMETHODIMP
+BindingParams::BindUTF8StringByName(const nsACString &aName,
+                                    const nsACString &aValue)
+{
+  nsCOMPtr<nsIVariant> value(new UTF8TextVariant(aValue));
+  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
+
+  return BindByName(aName, value);
+}
+
+NS_IMETHODIMP
+BindingParams::BindStringByName(const nsACString &aName,
+                                const nsAString &aValue)
+{
+  nsCOMPtr<nsIVariant> value(new TextVariant(aValue));
+  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
+
+  return BindByName(aName, value);
+}
+
+NS_IMETHODIMP
+BindingParams::BindDoubleByName(const nsACString &aName,
+                                double aValue)
+{
+  nsCOMPtr<nsIVariant> value(new FloatVariant(aValue));
+  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
+
+  return BindByName(aName, value);
+}
+
+NS_IMETHODIMP
+BindingParams::BindInt32ByName(const nsACString &aName,
+                               int32_t aValue)
+{
+  nsCOMPtr<nsIVariant> value(new IntegerVariant(aValue));
+  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
+
+  return BindByName(aName, value);
+}
+
+NS_IMETHODIMP
+BindingParams::BindInt64ByName(const nsACString &aName,
+                               int64_t aValue)
+{
+  nsCOMPtr<nsIVariant> value(new IntegerVariant(aValue));
+  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
+
+  return BindByName(aName, value);
+}
+
+NS_IMETHODIMP
+BindingParams::BindNullByName(const nsACString &aName)
+{
+  nsCOMPtr<nsIVariant> value(new NullVariant());
+  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
+
+  return BindByName(aName, value);
+}
+
+NS_IMETHODIMP
+BindingParams::BindBlobByName(const nsACString &aName,
+                              const uint8_t *aValue,
+                              uint32_t aValueSize)
+{
+  NS_ENSURE_ARG_MAX(aValueSize, INT_MAX);
+  std::pair<const void *, int> data(
+    static_cast<const void *>(aValue),
+    int(aValueSize)
+  );
+  nsCOMPtr<nsIVariant> value(new BlobVariant(data));
+  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
+
+  return BindByName(aName, value);
+}
+
+NS_IMETHODIMP
+BindingParams::BindStringAsBlobByName(const nsACString& aName,
+                                      const nsAString& aValue)
+{
+  return DoBindStringAsBlobByName(this, aName, aValue);
+}
+
+NS_IMETHODIMP
+BindingParams::BindUTF8StringAsBlobByName(const nsACString& aName,
+                                          const nsACString& aValue)
+{
+  return DoBindStringAsBlobByName(this, aName, aValue);
+}
+
+
+NS_IMETHODIMP
+BindingParams::BindAdoptedBlobByName(const nsACString &aName,
+                                     uint8_t *aValue,
+                                     uint32_t aValueSize)
+{
+  NS_ENSURE_ARG_MAX(aValueSize, INT_MAX);
+  std::pair<uint8_t *, int> data(
+    aValue,
+    int(aValueSize)
+  );
+  nsCOMPtr<nsIVariant> value(new AdoptedBlobVariant(data));
+
+  return BindByName(aName, value);
+}
+
+NS_IMETHODIMP
+BindingParams::BindByIndex(uint32_t aIndex,
+                           nsIVariant *aValue)
+{
+  NS_ENSURE_FALSE(mLocked, NS_ERROR_UNEXPECTED);
+  ENSURE_INDEX_VALUE(aIndex, mParamCount);
+
+  // Store the variant for later use.
+  nsRefPtr<Variant_base> variant = convertVariantToStorageVariant(aValue);
+  if (!variant)
+    return NS_ERROR_UNEXPECTED;
+  if (mParameters.Length() <= aIndex) {
+    (void)mParameters.SetLength(aIndex);
+    (void)mParameters.AppendElement(variant);
+  }
+  else {
+    NS_ENSURE_TRUE(mParameters.ReplaceElementAt(aIndex, variant),
+                   NS_ERROR_OUT_OF_MEMORY);
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+AsyncBindingParams::BindByIndex(uint32_t aIndex,
+                                nsIVariant *aValue)
+{
+  NS_ENSURE_FALSE(mLocked, NS_ERROR_UNEXPECTED);
+  // In the asynchronous case we do not know how many parameters there are to
+  // bind to, so we cannot check the validity of aIndex.
+
+  nsRefPtr<Variant_base> variant = convertVariantToStorageVariant(aValue);
+  if (!variant)
+    return NS_ERROR_UNEXPECTED;
+  if (mParameters.Length() <= aIndex) {
+    mParameters.SetLength(aIndex);
+    mParameters.AppendElement(variant);
+  }
+  else {
+    NS_ENSURE_TRUE(mParameters.ReplaceElementAt(aIndex, variant),
+                   NS_ERROR_OUT_OF_MEMORY);
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+BindingParams::BindUTF8StringByIndex(uint32_t aIndex,
+                                     const nsACString &aValue)
+{
+  nsCOMPtr<nsIVariant> value(new UTF8TextVariant(aValue));
+  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
+
+  return BindByIndex(aIndex, value);
+}
+
+NS_IMETHODIMP
+BindingParams::BindStringByIndex(uint32_t aIndex,
+                                 const nsAString &aValue)
+{
+  nsCOMPtr<nsIVariant> value(new TextVariant(aValue));
+  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
+
+  return BindByIndex(aIndex, value);
+}
+
+NS_IMETHODIMP
+BindingParams::BindDoubleByIndex(uint32_t aIndex,
+                                 double aValue)
+{
+  nsCOMPtr<nsIVariant> value(new FloatVariant(aValue));
+  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
+
+  return BindByIndex(aIndex, value);
+}
+
+NS_IMETHODIMP
+BindingParams::BindInt32ByIndex(uint32_t aIndex,
+                                int32_t aValue)
+{
+  nsCOMPtr<nsIVariant> value(new IntegerVariant(aValue));
+  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
+
+  return BindByIndex(aIndex, value);
+}
+
+NS_IMETHODIMP
+BindingParams::BindInt64ByIndex(uint32_t aIndex,
+                                int64_t aValue)
+{
+  nsCOMPtr<nsIVariant> value(new IntegerVariant(aValue));
+  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
+
+  return BindByIndex(aIndex, value);
+}
+
+NS_IMETHODIMP
+BindingParams::BindNullByIndex(uint32_t aIndex)
+{
+  nsCOMPtr<nsIVariant> value(new NullVariant());
+  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
+
+  return BindByIndex(aIndex, value);
+}
+
+NS_IMETHODIMP
+BindingParams::BindBlobByIndex(uint32_t aIndex,
+                               const uint8_t *aValue,
+                               uint32_t aValueSize)
+{
+  NS_ENSURE_ARG_MAX(aValueSize, INT_MAX);
+  std::pair<const void *, int> data(
+    static_cast<const void *>(aValue),
+    int(aValueSize)
+  );
+  nsCOMPtr<nsIVariant> value(new BlobVariant(data));
+  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
+
+  return BindByIndex(aIndex, value);
+}
+
+NS_IMETHODIMP
+BindingParams::BindStringAsBlobByIndex(uint32_t aIndex, const nsAString& aValue)
+{
+  return DoBindStringAsBlobByIndex(this, aIndex, aValue);
+}
+
+NS_IMETHODIMP
+BindingParams::BindUTF8StringAsBlobByIndex(uint32_t aIndex,
+                                           const nsACString& aValue)
+{
+  return DoBindStringAsBlobByIndex(this, aIndex, aValue);
+}
+
+NS_IMETHODIMP
+BindingParams::BindAdoptedBlobByIndex(uint32_t aIndex,
+                                      uint8_t *aValue,
+                                      uint32_t aValueSize)
+{
+  NS_ENSURE_ARG_MAX(aValueSize, INT_MAX);
+  std::pair<uint8_t *, int> data(
+    static_cast<uint8_t *>(aValue),
+    int(aValueSize)
+  );
+  nsCOMPtr<nsIVariant> value(new AdoptedBlobVariant(data));
+
+  return BindByIndex(aIndex, value);
+}
+
+} // namespace storage
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageBindingParams.h firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageBindingParams.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageBindingParams.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageBindingParams.h	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,124 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 mozStorageBindingParams_h
+#define mozStorageBindingParams_h
+
+#include "nsCOMArray.h"
+#include "nsIVariant.h"
+#include "nsInterfaceHashtable.h"
+
+#include "mozStorageBindingParamsArray.h"
+#include "mozStorageStatement.h"
+#include "mozStorageAsyncStatement.h"
+#include "Variant.h"
+
+#include "mozIStorageBindingParams.h"
+#include "IStorageBindingParamsInternal.h"
+
+namespace mozilla {
+namespace storage {
+
+class BindingParams : public mozIStorageBindingParams
+                    , public IStorageBindingParamsInternal
+{
+public:
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_MOZISTORAGEBINDINGPARAMS
+  NS_DECL_ISTORAGEBINDINGPARAMSINTERNAL
+
+  /**
+   * Locks the parameters and prevents further modification to it (such as
+   * binding more elements to it).
+   */
+  void lock();
+
+  /**
+   * Unlocks the parameters and allows modification to it again.
+   *
+   * @param aOwningStatement
+   *        The statement that owns us.  We cleared this when we were locked,
+   *        and our invariant requires us to have this, so you need to tell us
+   *        again.
+   */
+  void unlock(Statement *aOwningStatement);
+
+  /**
+   * @returns the pointer to the owning BindingParamsArray.  Used by a
+   *          BindingParamsArray to verify that we belong to it when added.
+   */
+  const mozIStorageBindingParamsArray *getOwner() const;
+
+  BindingParams(mozIStorageBindingParamsArray *aOwningArray,
+                Statement *aOwningStatement);
+protected:
+  virtual ~BindingParams() {}
+
+  explicit BindingParams(mozIStorageBindingParamsArray *aOwningArray);
+  // Note that this is managed as a sparse array, so particular caution should
+  // be used for out-of-bounds usage.
+  nsTArray<nsRefPtr<Variant_base> > mParameters;
+  bool mLocked;
+
+private:
+
+  /**
+   * Track the BindingParamsArray that created us until we are added to it.
+   * (Once we are added we are locked and no one needs to look up our owner.)
+   * Ref-counted since there is no invariant that guarantees it stays alive
+   * otherwise.  This keeps mOwningStatement alive for us too since the array
+   * also holds a reference.
+   */
+  nsCOMPtr<mozIStorageBindingParamsArray> mOwningArray;
+  /**
+   * Used in the synchronous binding case to map parameter names to indices.
+   * Not reference-counted because this is only non-null as long as mOwningArray
+   * is non-null and mOwningArray also holds a statement reference.
+   */
+  Statement *mOwningStatement;
+  uint32_t mParamCount;
+};
+
+/**
+ * Adds late resolution of named parameters so they don't get resolved until we
+ * try and bind the parameters on the async thread.  We also stop checking
+ * parameter indices for being too big since we just just don't know how many
+ * there are.
+ *
+ * We support *either* binding by name or binding by index.  Trying to do both
+ * results in only binding by name at sqlite3_stmt bind time.
+ */
+class AsyncBindingParams : public BindingParams
+{
+public:
+  NS_IMETHOD BindByName(const nsACString & aName,
+                                      nsIVariant *aValue);
+  NS_IMETHOD BindByIndex(uint32_t aIndex, nsIVariant *aValue);
+
+  virtual already_AddRefed<mozIStorageError> bind(sqlite3_stmt * aStatement);
+
+  explicit AsyncBindingParams(mozIStorageBindingParamsArray *aOwningArray);
+  virtual ~AsyncBindingParams() {}
+
+private:
+  nsInterfaceHashtable<nsCStringHashKey, nsIVariant> mNamedParameters;
+
+  struct NamedParameterIterationClosureThunk
+  {
+    AsyncBindingParams *self;
+    sqlite3_stmt *statement;
+    nsCOMPtr<mozIStorageError> err;
+  };
+
+  static PLDHashOperator iterateOverNamedParameters(const nsACString &aName,
+                                                    nsIVariant *aValue,
+                                                    void *voidClosureThunk);
+};
+
+} // namespace storage
+} // namespace mozilla
+
+#endif // mozStorageBindingParams_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageConnection.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageConnection.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageConnection.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageConnection.cpp	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,1841 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 <stdio.h>
+
+#include "nsError.h"
+#include "nsIMutableArray.h"
+#include "nsAutoPtr.h"
+#include "nsIMemoryReporter.h"
+#include "nsThreadUtils.h"
+#include "nsIFile.h"
+#include "nsIFileURL.h"
+#include "mozilla/Telemetry.h"
+#include "mozilla/Mutex.h"
+#include "mozilla/CondVar.h"
+#include "mozilla/Attributes.h"
+
+#include "mozIStorageAggregateFunction.h"
+#include "mozIStorageCompletionCallback.h"
+#include "mozIStorageFunction.h"
+
+#include "mozStorageAsyncStatementExecution.h"
+#include "mozStorageSQLFunctions.h"
+#include "mozStorageConnection.h"
+#include "mozStorageService.h"
+#include "mozStorageStatement.h"
+#include "mozStorageAsyncStatement.h"
+#include "mozStorageArgValueArray.h"
+#include "mozStoragePrivateHelpers.h"
+#include "mozStorageStatementData.h"
+#include "StorageBaseStatementInternal.h"
+#include "SQLCollations.h"
+#include "FileSystemModule.h"
+#include "mozStorageHelper.h"
+#include "GeckoProfiler.h"
+
+#include "mozilla/Logging.h"
+#include "prprf.h"
+#include "nsProxyRelease.h"
+#include <algorithm>
+
+#define MIN_AVAILABLE_BYTES_PER_CHUNKED_GROWTH 524288000 // 500 MiB
+
+// Maximum size of the pages cache per connection.
+#define MAX_CACHE_SIZE_KIBIBYTES 2048 // 2 MiB
+
+PRLogModuleInfo* gStorageLog = nullptr;
+
+// Checks that the protected code is running on the main-thread only if the
+// connection was also opened on it.
+#ifdef DEBUG
+#define CHECK_MAINTHREAD_ABUSE() \
+  do { \
+    nsCOMPtr<nsIThread> mainThread = do_GetMainThread(); \
+    NS_WARN_IF_FALSE(threadOpenedOn == mainThread || !NS_IsMainThread(), \
+               "Using Storage synchronous API on main-thread, but the connection was opened on another thread."); \
+  } while(0)
+#else
+#define CHECK_MAINTHREAD_ABUSE() do { /* Nothing */ } while(0)
+#endif
+
+namespace mozilla {
+namespace storage {
+
+namespace {
+
+////////////////////////////////////////////////////////////////////////////////
+//// Variant Specialization Functions (variantToSQLiteT)
+
+int
+sqlite3_T_int(sqlite3_context *aCtx,
+              int aValue)
+{
+  ::sqlite3_result_int(aCtx, aValue);
+  return SQLITE_OK;
+}
+
+int
+sqlite3_T_int64(sqlite3_context *aCtx,
+                sqlite3_int64 aValue)
+{
+  ::sqlite3_result_int64(aCtx, aValue);
+  return SQLITE_OK;
+}
+
+int
+sqlite3_T_double(sqlite3_context *aCtx,
+                 double aValue)
+{
+  ::sqlite3_result_double(aCtx, aValue);
+  return SQLITE_OK;
+}
+
+int
+sqlite3_T_text(sqlite3_context *aCtx,
+               const nsCString &aValue)
+{
+  ::sqlite3_result_text(aCtx,
+                        aValue.get(),
+                        aValue.Length(),
+                        SQLITE_TRANSIENT);
+  return SQLITE_OK;
+}
+
+int
+sqlite3_T_text16(sqlite3_context *aCtx,
+                 const nsString &aValue)
+{
+  ::sqlite3_result_text16(aCtx,
+                          aValue.get(),
+                          aValue.Length() * 2, // Number of bytes.
+                          SQLITE_TRANSIENT);
+  return SQLITE_OK;
+}
+
+int
+sqlite3_T_null(sqlite3_context *aCtx)
+{
+  ::sqlite3_result_null(aCtx);
+  return SQLITE_OK;
+}
+
+int
+sqlite3_T_blob(sqlite3_context *aCtx,
+               const void *aData,
+               int aSize)
+{
+  ::sqlite3_result_blob(aCtx, aData, aSize, free);
+  return SQLITE_OK;
+}
+
+#include "variantToSQLiteT_impl.h"
+
+////////////////////////////////////////////////////////////////////////////////
+//// Modules
+
+struct Module
+{
+  const char* name;
+  int (*registerFunc)(sqlite3*, const char*);
+};
+
+Module gModules[] = {
+  { "filesystem", RegisterFileSystemModule }
+};
+
+////////////////////////////////////////////////////////////////////////////////
+//// Local Functions
+
+void tracefunc (void *aClosure, const char *aStmt)
+{
+  MOZ_LOG(gStorageLog, PR_LOG_DEBUG, ("sqlite3_trace on %p for '%s'", aClosure,
+                                     aStmt));
+}
+
+struct FFEArguments
+{
+    nsISupports *target;
+    bool found;
+};
+PLDHashOperator
+findFunctionEnumerator(const nsACString &aKey,
+                       Connection::FunctionInfo aData,
+                       void *aUserArg)
+{
+  FFEArguments *args = static_cast<FFEArguments *>(aUserArg);
+  if (aData.function == args->target) {
+    args->found = true;
+    return PL_DHASH_STOP;
+  }
+  return PL_DHASH_NEXT;
+}
+
+PLDHashOperator
+copyFunctionEnumerator(const nsACString &aKey,
+                       Connection::FunctionInfo aData,
+                       void *aUserArg)
+{
+  NS_PRECONDITION(aData.type == Connection::FunctionInfo::SIMPLE ||
+                  aData.type == Connection::FunctionInfo::AGGREGATE,
+                  "Invalid function type!");
+
+  Connection *connection = static_cast<Connection *>(aUserArg);
+  if (aData.type == Connection::FunctionInfo::SIMPLE) {
+    mozIStorageFunction *function =
+      static_cast<mozIStorageFunction *>(aData.function.get());
+    (void)connection->CreateFunction(aKey, aData.numArgs, function);
+  }
+  else {
+    mozIStorageAggregateFunction *function =
+      static_cast<mozIStorageAggregateFunction *>(aData.function.get());
+    (void)connection->CreateAggregateFunction(aKey, aData.numArgs, function);
+  }
+
+  return PL_DHASH_NEXT;
+}
+
+void
+basicFunctionHelper(sqlite3_context *aCtx,
+                    int aArgc,
+                    sqlite3_value **aArgv)
+{
+  void *userData = ::sqlite3_user_data(aCtx);
+
+  mozIStorageFunction *func = static_cast<mozIStorageFunction *>(userData);
+
+  nsRefPtr<ArgValueArray> arguments(new ArgValueArray(aArgc, aArgv));
+  if (!arguments)
+      return;
+
+  nsCOMPtr<nsIVariant> result;
+  if (NS_FAILED(func->OnFunctionCall(arguments, getter_AddRefs(result)))) {
+    NS_WARNING("User function returned error code!");
+    ::sqlite3_result_error(aCtx,
+                           "User function returned error code",
+                           -1);
+    return;
+  }
+  int retcode = variantToSQLiteT(aCtx, result);
+  if (retcode == SQLITE_IGNORE) {
+    ::sqlite3_result_int(aCtx, SQLITE_IGNORE);
+  } else if (retcode != SQLITE_OK) {
+    NS_WARNING("User function returned invalid data type!");
+    ::sqlite3_result_error(aCtx,
+                           "User function returned invalid data type",
+                           -1);
+  }
+}
+
+void
+aggregateFunctionStepHelper(sqlite3_context *aCtx,
+                            int aArgc,
+                            sqlite3_value **aArgv)
+{
+  void *userData = ::sqlite3_user_data(aCtx);
+  mozIStorageAggregateFunction *func =
+    static_cast<mozIStorageAggregateFunction *>(userData);
+
+  nsRefPtr<ArgValueArray> arguments(new ArgValueArray(aArgc, aArgv));
+  if (!arguments)
+    return;
+
+  if (NS_FAILED(func->OnStep(arguments)))
+    NS_WARNING("User aggregate step function returned error code!");
+}
+
+void
+aggregateFunctionFinalHelper(sqlite3_context *aCtx)
+{
+  void *userData = ::sqlite3_user_data(aCtx);
+  mozIStorageAggregateFunction *func =
+    static_cast<mozIStorageAggregateFunction *>(userData);
+
+  nsRefPtr<nsIVariant> result;
+  if (NS_FAILED(func->OnFinal(getter_AddRefs(result)))) {
+    NS_WARNING("User aggregate final function returned error code!");
+    ::sqlite3_result_error(aCtx,
+                           "User aggregate final function returned error code",
+                           -1);
+    return;
+  }
+
+  if (variantToSQLiteT(aCtx, result) != SQLITE_OK) {
+    NS_WARNING("User aggregate final function returned invalid data type!");
+    ::sqlite3_result_error(aCtx,
+                           "User aggregate final function returned invalid data type",
+                           -1);
+  }
+}
+
+/**
+ * This code is heavily based on the sample at:
+ *   http://www.sqlite.org/unlock_notify.html
+ */
+class UnlockNotification
+{
+public:
+  UnlockNotification()
+  : mMutex("UnlockNotification mMutex")
+  , mCondVar(mMutex, "UnlockNotification condVar")
+  , mSignaled(false)
+  {
+  }
+
+  void Wait()
+  {
+    MutexAutoLock lock(mMutex);
+    while (!mSignaled) {
+      (void)mCondVar.Wait();
+    }
+  }
+
+  void Signal()
+  {
+    MutexAutoLock lock(mMutex);
+    mSignaled = true;
+    (void)mCondVar.Notify();
+  }
+
+private:
+  Mutex mMutex;
+  CondVar mCondVar;
+  bool mSignaled;
+};
+
+void
+UnlockNotifyCallback(void **aArgs,
+                     int aArgsSize)
+{
+  for (int i = 0; i < aArgsSize; i++) {
+    UnlockNotification *notification =
+      static_cast<UnlockNotification *>(aArgs[i]);
+    notification->Signal();
+  }
+}
+
+int
+WaitForUnlockNotify(sqlite3* aDatabase)
+{
+  UnlockNotification notification;
+  int srv = ::sqlite3_unlock_notify(aDatabase, UnlockNotifyCallback,
+                                    &notification);
+  MOZ_ASSERT(srv == SQLITE_LOCKED || srv == SQLITE_OK);
+  if (srv == SQLITE_OK) {
+    notification.Wait();
+  }
+
+  return srv;
+}
+
+} // anonymous namespace
+
+////////////////////////////////////////////////////////////////////////////////
+//// Local Classes
+
+namespace {
+
+class AsyncCloseConnection final: public nsRunnable
+{
+public:
+  AsyncCloseConnection(Connection *aConnection,
+                       sqlite3 *aNativeConnection,
+                       nsIRunnable *aCallbackEvent,
+                       already_AddRefed<nsIThread> aAsyncExecutionThread)
+  : mConnection(aConnection)
+  , mNativeConnection(aNativeConnection)
+  , mCallbackEvent(aCallbackEvent)
+  , mAsyncExecutionThread(aAsyncExecutionThread)
+  {
+  }
+
+  NS_METHOD Run()
+  {
+#ifdef DEBUG
+    // This code is executed on the background thread
+    bool onAsyncThread = false;
+    (void)mAsyncExecutionThread->IsOnCurrentThread(&onAsyncThread);
+    MOZ_ASSERT(onAsyncThread);
+#endif // DEBUG
+
+    nsCOMPtr<nsIRunnable> event = NS_NewRunnableMethodWithArg<nsCOMPtr<nsIThread>>
+      (mConnection, &Connection::shutdownAsyncThread, mAsyncExecutionThread);
+    (void)NS_DispatchToMainThread(event);
+
+    // Internal close.
+    (void)mConnection->internalClose(mNativeConnection);
+
+    // Callback
+    if (mCallbackEvent) {
+      nsCOMPtr<nsIThread> thread;
+      (void)NS_GetMainThread(getter_AddRefs(thread));
+      (void)thread->Dispatch(mCallbackEvent, NS_DISPATCH_NORMAL);
+    }
+
+    return NS_OK;
+  }
+
+  ~AsyncCloseConnection() {
+    nsCOMPtr<nsIThread> thread;
+    (void)NS_GetMainThread(getter_AddRefs(thread));
+    // Handle ambiguous nsISupports inheritance.
+    Connection *rawConnection = nullptr;
+    mConnection.swap(rawConnection);
+    (void)NS_ProxyRelease(thread,
+                          NS_ISUPPORTS_CAST(mozIStorageConnection *,
+                                            rawConnection));
+    (void)NS_ProxyRelease(thread, mCallbackEvent);
+  }
+private:
+  nsRefPtr<Connection> mConnection;
+  sqlite3 *mNativeConnection;
+  nsCOMPtr<nsIRunnable> mCallbackEvent;
+  nsCOMPtr<nsIThread> mAsyncExecutionThread;
+};
+
+/**
+ * An event used to initialize the clone of a connection.
+ *
+ * Must be executed on the clone's async execution thread.
+ */
+class AsyncInitializeClone final: public nsRunnable
+{
+public:
+  /**
+   * @param aConnection The connection being cloned.
+   * @param aClone The clone.
+   * @param aReadOnly If |true|, the clone is read only.
+   * @param aCallback A callback to trigger once initialization
+   *                  is complete. This event will be called on
+   *                  aClone->threadOpenedOn.
+   */
+  AsyncInitializeClone(Connection* aConnection,
+                       Connection* aClone,
+                       const bool aReadOnly,
+                       mozIStorageCompletionCallback* aCallback)
+    : mConnection(aConnection)
+    , mClone(aClone)
+    , mReadOnly(aReadOnly)
+    , mCallback(aCallback)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+  }
+
+  NS_IMETHOD Run() {
+    MOZ_ASSERT (NS_GetCurrentThread() == mClone->getAsyncExecutionTarget());
+
+    nsresult rv = mConnection->initializeClone(mClone, mReadOnly);
+    if (NS_FAILED(rv)) {
+      return Dispatch(rv, nullptr);
+    }
+    return Dispatch(NS_OK,
+                    NS_ISUPPORTS_CAST(mozIStorageAsyncConnection*, mClone));
+  }
+
+private:
+  nsresult Dispatch(nsresult aResult, nsISupports* aValue) {
+    nsRefPtr<CallbackComplete> event = new CallbackComplete(aResult,
+                                                            aValue,
+                                                            mCallback.forget());
+    return mClone->threadOpenedOn->Dispatch(event, NS_DISPATCH_NORMAL);
+  }
+
+  ~AsyncInitializeClone() {
+    nsCOMPtr<nsIThread> thread;
+    DebugOnly<nsresult> rv = NS_GetMainThread(getter_AddRefs(thread));
+    MOZ_ASSERT(NS_SUCCEEDED(rv));
+
+    // Handle ambiguous nsISupports inheritance.
+    Connection *rawConnection = nullptr;
+    mConnection.swap(rawConnection);
+    (void)NS_ProxyRelease(thread, NS_ISUPPORTS_CAST(mozIStorageConnection *,
+                                                    rawConnection));
+
+    Connection *rawClone = nullptr;
+    mClone.swap(rawClone);
+    (void)NS_ProxyRelease(thread, NS_ISUPPORTS_CAST(mozIStorageConnection *,
+                                                    rawClone));
+
+    // Generally, the callback will be released by CallbackComplete.
+    // However, if for some reason Run() is not executed, we still
+    // need to ensure that it is released here.
+    mozIStorageCompletionCallback *rawCallback = nullptr;
+    mCallback.swap(rawCallback);
+    (void)NS_ProxyRelease(thread, rawCallback);
+  }
+
+  nsRefPtr<Connection> mConnection;
+  nsRefPtr<Connection> mClone;
+  const bool mReadOnly;
+  nsCOMPtr<mozIStorageCompletionCallback> mCallback;
+};
+
+} // anonymous namespace
+
+////////////////////////////////////////////////////////////////////////////////
+//// Connection
+
+Connection::Connection(Service *aService,
+                       int aFlags,
+                       bool aAsyncOnly)
+: sharedAsyncExecutionMutex("Connection::sharedAsyncExecutionMutex")
+, sharedDBMutex("Connection::sharedDBMutex")
+, threadOpenedOn(do_GetCurrentThread())
+, mDBConn(nullptr)
+, mAsyncExecutionThreadShuttingDown(false)
+, mAsyncExecutionThreadIsAlive(false)
+, mConnectionClosed(false)
+, mTransactionInProgress(false)
+, mProgressHandler(nullptr)
+, mFlags(aFlags)
+, mStorageService(aService)
+, mAsyncOnly(aAsyncOnly)
+{
+  mStorageService->registerConnection(this);
+}
+
+Connection::~Connection()
+{
+  (void)Close();
+
+  MOZ_ASSERT(!mAsyncExecutionThread,
+             "AsyncClose has not been invoked on this connection!");
+  MOZ_ASSERT(!mAsyncExecutionThreadIsAlive,
+             "The async execution thread should have been shutdown!");
+}
+
+NS_IMPL_ADDREF(Connection)
+
+NS_INTERFACE_MAP_BEGIN(Connection)
+  NS_INTERFACE_MAP_ENTRY(mozIStorageAsyncConnection)
+  NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
+  NS_INTERFACE_MAP_ENTRY_CONDITIONAL(mozIStorageConnection, !mAsyncOnly)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, mozIStorageConnection)
+NS_INTERFACE_MAP_END
+
+// This is identical to what NS_IMPL_RELEASE provides, but with the
+// extra |1 == count| case.
+NS_IMETHODIMP_(MozExternalRefCountType) Connection::Release(void)
+{
+  NS_PRECONDITION(0 != mRefCnt, "dup release");
+  nsrefcnt count = --mRefCnt;
+  NS_LOG_RELEASE(this, count, "Connection");
+  if (1 == count) {
+    // If the refcount is 1, the single reference must be from
+    // gService->mConnections (in class |Service|).  Which means we can
+    // unregister it safely.
+    mStorageService->unregisterConnection(this);
+  } else if (0 == count) {
+    mRefCnt = 1; /* stabilize */
+#if 0 /* enable this to find non-threadsafe destructors: */
+    NS_ASSERT_OWNINGTHREAD(Connection);
+#endif
+    delete (this);
+    return 0;
+  }
+  return count;
+}
+
+int32_t
+Connection::getSqliteRuntimeStatus(int32_t aStatusOption, int32_t* aMaxValue)
+{
+  MOZ_ASSERT(mDBConn, "A connection must exist at this point");
+  int curr = 0, max = 0;
+  DebugOnly<int> rc = ::sqlite3_db_status(mDBConn, aStatusOption, &curr, &max, 0);
+  MOZ_ASSERT(NS_SUCCEEDED(convertResultCode(rc)));
+  if (aMaxValue)
+    *aMaxValue = max;
+  return curr;
+}
+
+nsIEventTarget *
+Connection::getAsyncExecutionTarget()
+{
+  MutexAutoLock lockedScope(sharedAsyncExecutionMutex);
+
+  // If we are shutting down the asynchronous thread, don't hand out any more
+  // references to the thread.
+  if (mAsyncExecutionThreadShuttingDown)
+    return nullptr;
+
+  if (!mAsyncExecutionThread) {
+    nsresult rv = ::NS_NewThread(getter_AddRefs(mAsyncExecutionThread));
+    if (NS_FAILED(rv)) {
+      NS_WARNING("Failed to create async thread.");
+      return nullptr;
+    }
+    static nsThreadPoolNaming naming;
+    naming.SetThreadPoolName(NS_LITERAL_CSTRING("mozStorage"),
+                             mAsyncExecutionThread);
+  }
+
+  mAsyncExecutionThreadIsAlive = true;
+  return mAsyncExecutionThread;
+}
+
+nsresult
+Connection::initialize()
+{
+  NS_ASSERTION (!mDBConn, "Initialize called on already opened database!");
+  PROFILER_LABEL("mozStorageConnection", "initialize",
+    js::ProfileEntry::Category::STORAGE);
+
+  // in memory database requested, sqlite uses a magic file name
+  int srv = ::sqlite3_open_v2(":memory:", &mDBConn, mFlags, nullptr);
+  if (srv != SQLITE_OK) {
+    mDBConn = nullptr;
+    return convertResultCode(srv);
+  }
+
+  // Do not set mDatabaseFile or mFileURL here since this is a "memory"
+  // database.
+
+  nsresult rv = initializeInternal();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
+nsresult
+Connection::initialize(nsIFile *aDatabaseFile)
+{
+  NS_ASSERTION (aDatabaseFile, "Passed null file!");
+  NS_ASSERTION (!mDBConn, "Initialize called on already opened database!");
+  PROFILER_LABEL("mozStorageConnection", "initialize",
+    js::ProfileEntry::Category::STORAGE);
+
+  mDatabaseFile = aDatabaseFile;
+
+  nsAutoString path;
+  nsresult rv = aDatabaseFile->GetPath(path);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  int srv = ::sqlite3_open_v2(NS_ConvertUTF16toUTF8(path).get(), &mDBConn,
+                              mFlags, nullptr);
+  if (srv != SQLITE_OK) {
+    mDBConn = nullptr;
+    return convertResultCode(srv);
+  }
+
+  // Do not set mFileURL here since this is database does not have an associated
+  // URL.
+  mDatabaseFile = aDatabaseFile;
+
+  rv = initializeInternal();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
+nsresult
+Connection::initialize(nsIFileURL *aFileURL)
+{
+  NS_ASSERTION (aFileURL, "Passed null file URL!");
+  NS_ASSERTION (!mDBConn, "Initialize called on already opened database!");
+  PROFILER_LABEL("mozStorageConnection", "initialize",
+    js::ProfileEntry::Category::STORAGE);
+
+  nsCOMPtr<nsIFile> databaseFile;
+  nsresult rv = aFileURL->GetFile(getter_AddRefs(databaseFile));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsAutoCString spec;
+  rv = aFileURL->GetSpec(spec);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  int srv = ::sqlite3_open_v2(spec.get(), &mDBConn, mFlags, nullptr);
+  if (srv != SQLITE_OK) {
+    mDBConn = nullptr;
+    return convertResultCode(srv);
+  }
+
+  // Set both mDatabaseFile and mFileURL here.
+  mFileURL = aFileURL;
+  mDatabaseFile = databaseFile;
+
+  rv = initializeInternal();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
+nsresult
+Connection::initializeInternal()
+{
+  MOZ_ASSERT(mDBConn);
+
+  if (mFileURL) {
+    const char* dbPath = ::sqlite3_db_filename(mDBConn, "main");
+    MOZ_ASSERT(dbPath);
+
+    const char* telemetryFilename =
+      ::sqlite3_uri_parameter(dbPath, "telemetryFilename");
+    if (telemetryFilename) {
+      if (NS_WARN_IF(*telemetryFilename == '\0')) {
+        return NS_ERROR_INVALID_ARG;
+      }
+      mTelemetryFilename = telemetryFilename;
+    }
+  }
+
+  if (mTelemetryFilename.IsEmpty()) {
+    mTelemetryFilename = getFilename();
+    MOZ_ASSERT(!mTelemetryFilename.IsEmpty());
+  }
+
+  // Properly wrap the database handle's mutex.
+  sharedDBMutex.initWithMutex(sqlite3_db_mutex(mDBConn));
+
+  if (!gStorageLog)
+    gStorageLog = ::PR_NewLogModule("mozStorage");
+
+  // SQLite tracing can slow down queries (especially long queries)
+  // significantly. Don't trace unless the user is actively monitoring SQLite.
+  if (PR_LOG_TEST(gStorageLog, PR_LOG_DEBUG)) {
+    ::sqlite3_trace(mDBConn, tracefunc, this);
+
+    MOZ_LOG(gStorageLog, PR_LOG_NOTICE, ("Opening connection to '%s' (%p)",
+                                        mTelemetryFilename.get(), this));
+  }
+
+  int64_t pageSize = Service::getDefaultPageSize();
+
+  // Set page_size to the preferred default value.  This is effective only if
+  // the database has just been created, otherwise, if the database does not
+  // use WAL journal mode, a VACUUM operation will updated its page_size.
+  nsAutoCString pageSizeQuery(MOZ_STORAGE_UNIQUIFY_QUERY_STR
+                              "PRAGMA page_size = ");
+  pageSizeQuery.AppendInt(pageSize);
+  nsresult rv = ExecuteSimpleSQL(pageSizeQuery);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // Setting the cache_size forces the database open, verifying if it is valid
+  // or corrupt.  So this is executed regardless it being actually needed.
+  // The cache_size is calculated from the actual page_size, to save memory.
+  nsAutoCString cacheSizeQuery(MOZ_STORAGE_UNIQUIFY_QUERY_STR
+                               "PRAGMA cache_size = ");
+  cacheSizeQuery.AppendInt(-MAX_CACHE_SIZE_KIBIBYTES);
+  int srv = executeSql(mDBConn, cacheSizeQuery.get());
+  if (srv != SQLITE_OK) {
+    ::sqlite3_close(mDBConn);
+    mDBConn = nullptr;
+    return convertResultCode(srv);
+  }
+
+  // Register our built-in SQL functions.
+  srv = registerFunctions(mDBConn);
+  if (srv != SQLITE_OK) {
+    ::sqlite3_close(mDBConn);
+    mDBConn = nullptr;
+    return convertResultCode(srv);
+  }
+
+  // Register our built-in SQL collating sequences.
+  srv = registerCollations(mDBConn, mStorageService);
+  if (srv != SQLITE_OK) {
+    ::sqlite3_close(mDBConn);
+    mDBConn = nullptr;
+    return convertResultCode(srv);
+  }
+
+  // Set the synchronous PRAGMA, according to the preference.
+  switch (Service::getSynchronousPref()) {
+    case 2:
+      (void)ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+          "PRAGMA synchronous = FULL;"));
+      break;
+    case 0:
+      (void)ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+          "PRAGMA synchronous = OFF;"));
+      break;
+    case 1:
+    default:
+      (void)ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+          "PRAGMA synchronous = NORMAL;"));
+      break;
+  }
+
+  return NS_OK;
+}
+
+nsresult
+Connection::databaseElementExists(enum DatabaseElementType aElementType,
+                                  const nsACString &aElementName,
+                                  bool *_exists)
+{
+  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
+
+  // When constructing the query, make sure to SELECT the correct db's sqlite_master
+  // if the user is prefixing the element with a specific db. ex: sample.test
+  nsCString query("SELECT name FROM (SELECT * FROM ");
+  nsDependentCSubstring element;
+  int32_t ind = aElementName.FindChar('.');
+  if (ind == kNotFound) {
+    element.Assign(aElementName);
+  }
+  else {
+    nsDependentCSubstring db(Substring(aElementName, 0, ind + 1));
+    element.Assign(Substring(aElementName, ind + 1, aElementName.Length()));
+    query.Append(db);
+  }
+  query.AppendLiteral("sqlite_master UNION ALL SELECT * FROM sqlite_temp_master) WHERE type = '");
+
+  switch (aElementType) {
+    case INDEX:
+      query.AppendLiteral("index");
+      break;
+    case TABLE:
+      query.AppendLiteral("table");
+      break;
+  }
+  query.AppendLiteral("' AND name ='");
+  query.Append(element);
+  query.Append('\'');
+
+  sqlite3_stmt *stmt;
+  int srv = prepareStatement(mDBConn, query, &stmt);
+  if (srv != SQLITE_OK)
+    return convertResultCode(srv);
+
+  srv = stepStatement(mDBConn, stmt);
+  // we just care about the return value from step
+  (void)::sqlite3_finalize(stmt);
+
+  if (srv == SQLITE_ROW) {
+    *_exists = true;
+    return NS_OK;
+  }
+  if (srv == SQLITE_DONE) {
+    *_exists = false;
+    return NS_OK;
+  }
+
+  return convertResultCode(srv);
+}
+
+bool
+Connection::findFunctionByInstance(nsISupports *aInstance)
+{
+  sharedDBMutex.assertCurrentThreadOwns();
+  FFEArguments args = { aInstance, false };
+  (void)mFunctions.EnumerateRead(findFunctionEnumerator, &args);
+  return args.found;
+}
+
+/* static */ int
+Connection::sProgressHelper(void *aArg)
+{
+  Connection *_this = static_cast<Connection *>(aArg);
+  return _this->progressHandler();
+}
+
+int
+Connection::progressHandler()
+{
+  sharedDBMutex.assertCurrentThreadOwns();
+  if (mProgressHandler) {
+    bool result;
+    nsresult rv = mProgressHandler->OnProgress(this, &result);
+    if (NS_FAILED(rv)) return 0; // Don't break request
+    return result ? 1 : 0;
+  }
+  return 0;
+}
+
+nsresult
+Connection::setClosedState()
+{
+  // Ensure that we are on the correct thread to close the database.
+  bool onOpenedThread;
+  nsresult rv = threadOpenedOn->IsOnCurrentThread(&onOpenedThread);
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (!onOpenedThread) {
+    NS_ERROR("Must close the database on the thread that you opened it with!");
+    return NS_ERROR_UNEXPECTED;
+  }
+
+  // Flag that we are shutting down the async thread, so that
+  // getAsyncExecutionTarget knows not to expose/create the async thread.
+  {
+    MutexAutoLock lockedScope(sharedAsyncExecutionMutex);
+    NS_ENSURE_FALSE(mAsyncExecutionThreadShuttingDown, NS_ERROR_UNEXPECTED);
+    mAsyncExecutionThreadShuttingDown = true;
+  }
+
+  // Set the property to null before closing the connection, otherwise the other
+  // functions in the module may try to use the connection after it is closed.
+  mDBConn = nullptr;
+
+  return NS_OK;
+}
+
+bool
+Connection::connectionReady()
+{
+  return mDBConn != nullptr;
+}
+
+bool
+Connection::isClosing()
+{
+  bool shuttingDown = false;
+  {
+    MutexAutoLock lockedScope(sharedAsyncExecutionMutex);
+    shuttingDown = mAsyncExecutionThreadShuttingDown;
+  }
+  return shuttingDown && !isClosed();
+}
+
+bool
+Connection::isClosed()
+{
+  MutexAutoLock lockedScope(sharedAsyncExecutionMutex);
+  return mConnectionClosed;
+}
+
+void
+Connection::shutdownAsyncThread(nsIThread *aThread) {
+  MOZ_ASSERT(!mAsyncExecutionThread);
+  MOZ_ASSERT(mAsyncExecutionThreadIsAlive);
+  MOZ_ASSERT(mAsyncExecutionThreadShuttingDown);
+
+  DebugOnly<nsresult> rv = aThread->Shutdown();
+  MOZ_ASSERT(NS_SUCCEEDED(rv));
+  mAsyncExecutionThreadIsAlive = false;
+}
+
+nsresult
+Connection::internalClose(sqlite3 *aNativeConnection)
+{
+  // Sanity checks to make sure we are in the proper state before calling this.
+  // aNativeConnection can be null if OpenAsyncDatabase failed and is now just
+  // cleaning up the async thread.
+  MOZ_ASSERT(!isClosed());
+
+#ifdef DEBUG
+  { // Make sure we have marked our async thread as shutting down.
+    MutexAutoLock lockedScope(sharedAsyncExecutionMutex);
+    NS_ASSERTION(mAsyncExecutionThreadShuttingDown,
+                 "Did not call setClosedState!");
+  }
+#endif // DEBUG
+
+  if (PR_LOG_TEST(gStorageLog, PR_LOG_NOTICE)) {
+    nsAutoCString leafName(":memory");
+    if (mDatabaseFile)
+        (void)mDatabaseFile->GetNativeLeafName(leafName);
+    MOZ_LOG(gStorageLog, PR_LOG_NOTICE, ("Closing connection to '%s'",
+                                        leafName.get()));
+  }
+
+  // At this stage, we may still have statements that need to be
+  // finalized. Attempt to close the database connection. This will
+  // always disconnect any virtual tables and cleanly finalize their
+  // internal statements. Once this is done, closing may fail due to
+  // unfinalized client statements, in which case we need to finalize
+  // these statements and close again.
+  {
+    MutexAutoLock lockedScope(sharedAsyncExecutionMutex);
+    mConnectionClosed = true;
+  }
+
+  // Nothing else needs to be done if we don't have a connection here.
+  if (!aNativeConnection)
+    return NS_OK;
+
+  int srv = sqlite3_close(aNativeConnection);
+
+  if (srv == SQLITE_BUSY) {
+    // We still have non-finalized statements. Finalize them.
+
+    sqlite3_stmt *stmt = nullptr;
+    while ((stmt = ::sqlite3_next_stmt(aNativeConnection, stmt))) {
+      MOZ_LOG(gStorageLog, PR_LOG_NOTICE,
+             ("Auto-finalizing SQL statement '%s' (%x)",
+              ::sqlite3_sql(stmt),
+              stmt));
+
+#ifdef DEBUG
+      char *msg = ::PR_smprintf("SQL statement '%s' (%x) should have been finalized before closing the connection",
+                                ::sqlite3_sql(stmt),
+                                stmt);
+      NS_WARNING(msg);
+      ::PR_smprintf_free(msg);
+#endif // DEBUG
+
+      srv = ::sqlite3_finalize(stmt);
+
+#ifdef DEBUG
+      if (srv != SQLITE_OK) {
+        char *msg = ::PR_smprintf("Could not finalize SQL statement '%s' (%x)",
+                                  ::sqlite3_sql(stmt),
+                                  stmt);
+        NS_WARNING(msg);
+        ::PR_smprintf_free(msg);
+      }
+#endif // DEBUG
+
+      // Ensure that the loop continues properly, whether closing has succeeded
+      // or not.
+      if (srv == SQLITE_OK) {
+        stmt = nullptr;
+      }
+    }
+
+    // Now that all statements have been finalized, we
+    // should be able to close.
+    srv = ::sqlite3_close(aNativeConnection);
+
+  }
+
+  if (srv != SQLITE_OK) {
+    MOZ_ASSERT(srv == SQLITE_OK,
+               "sqlite3_close failed. There are probably outstanding statements that are listed above!");
+  }
+
+  return convertResultCode(srv);
+}
+
+nsCString
+Connection::getFilename()
+{
+  nsCString leafname(":memory:");
+  if (mDatabaseFile) {
+    (void)mDatabaseFile->GetNativeLeafName(leafname);
+  }
+  return leafname;
+}
+
+int
+Connection::stepStatement(sqlite3 *aNativeConnection, sqlite3_stmt *aStatement)
+{
+  MOZ_ASSERT(aStatement);
+  bool checkedMainThread = false;
+  TimeStamp startTime = TimeStamp::Now();
+
+  // The connection may have been closed if the executing statement has been
+  // created and cached after a call to asyncClose() but before the actual
+  // sqlite3_close().  This usually happens when other tasks using cached
+  // statements are asynchronously scheduled for execution and any of them ends
+  // up after asyncClose. See bug 728653 for details.
+  if (isClosed())
+    return SQLITE_MISUSE;
+
+  (void)::sqlite3_extended_result_codes(aNativeConnection, 1);
+
+  int srv;
+  while ((srv = ::sqlite3_step(aStatement)) == SQLITE_LOCKED_SHAREDCACHE) {
+    if (!checkedMainThread) {
+      checkedMainThread = true;
+      if (::NS_IsMainThread()) {
+        NS_WARNING("We won't allow blocking on the main thread!");
+        break;
+      }
+    }
+
+    srv = WaitForUnlockNotify(aNativeConnection);
+    if (srv != SQLITE_OK) {
+      break;
+    }
+
+    ::sqlite3_reset(aStatement);
+  }
+
+  // Report very slow SQL statements to Telemetry
+  TimeDuration duration = TimeStamp::Now() - startTime;
+  const uint32_t threshold =
+    NS_IsMainThread() ? Telemetry::kSlowSQLThresholdForMainThread
+                      : Telemetry::kSlowSQLThresholdForHelperThreads;
+  if (duration.ToMilliseconds() >= threshold) {
+    nsDependentCString statementString(::sqlite3_sql(aStatement));
+    Telemetry::RecordSlowSQLStatement(statementString, mTelemetryFilename,
+                                      duration.ToMilliseconds());
+  }
+
+  (void)::sqlite3_extended_result_codes(aNativeConnection, 0);
+  // Drop off the extended result bits of the result code.
+  return srv & 0xFF;
+}
+
+int
+Connection::prepareStatement(sqlite3 *aNativeConnection, const nsCString &aSQL,
+                             sqlite3_stmt **_stmt)
+{
+  // We should not even try to prepare statements after the connection has
+  // been closed.
+  if (isClosed())
+    return SQLITE_MISUSE;
+
+  bool checkedMainThread = false;
+
+  (void)::sqlite3_extended_result_codes(aNativeConnection, 1);
+
+  int srv;
+  while((srv = ::sqlite3_prepare_v2(aNativeConnection,
+                                    aSQL.get(),
+                                    -1,
+                                    _stmt,
+                                    nullptr)) == SQLITE_LOCKED_SHAREDCACHE) {
+    if (!checkedMainThread) {
+      checkedMainThread = true;
+      if (::NS_IsMainThread()) {
+        NS_WARNING("We won't allow blocking on the main thread!");
+        break;
+      }
+    }
+
+    srv = WaitForUnlockNotify(aNativeConnection);
+    if (srv != SQLITE_OK) {
+      break;
+    }
+  }
+
+  if (srv != SQLITE_OK) {
+    nsCString warnMsg;
+    warnMsg.AppendLiteral("The SQL statement '");
+    warnMsg.Append(aSQL);
+    warnMsg.AppendLiteral("' could not be compiled due to an error: ");
+    warnMsg.Append(::sqlite3_errmsg(aNativeConnection));
+
+#ifdef DEBUG
+    NS_WARNING(warnMsg.get());
+#endif
+    MOZ_LOG(gStorageLog, PR_LOG_ERROR, ("%s", warnMsg.get()));
+  }
+
+  (void)::sqlite3_extended_result_codes(aNativeConnection, 0);
+  // Drop off the extended result bits of the result code.
+  int rc = srv & 0xFF;
+  // sqlite will return OK on a comment only string and set _stmt to nullptr.
+  // The callers of this function are used to only checking the return value,
+  // so it is safer to return an error code.
+  if (rc == SQLITE_OK && *_stmt == nullptr) {
+    return SQLITE_MISUSE;
+  }
+
+  return rc;
+}
+
+
+int
+Connection::executeSql(sqlite3 *aNativeConnection, const char *aSqlString)
+{
+  if (isClosed())
+    return SQLITE_MISUSE;
+
+  TimeStamp startTime = TimeStamp::Now();
+  int srv = ::sqlite3_exec(aNativeConnection, aSqlString, nullptr, nullptr,
+                           nullptr);
+
+  // Report very slow SQL statements to Telemetry
+  TimeDuration duration = TimeStamp::Now() - startTime;
+  const uint32_t threshold =
+    NS_IsMainThread() ? Telemetry::kSlowSQLThresholdForMainThread
+                      : Telemetry::kSlowSQLThresholdForHelperThreads;
+  if (duration.ToMilliseconds() >= threshold) {
+    nsDependentCString statementString(aSqlString);
+    Telemetry::RecordSlowSQLStatement(statementString, mTelemetryFilename,
+                                      duration.ToMilliseconds());
+  }
+
+  return srv;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// nsIInterfaceRequestor
+
+NS_IMETHODIMP
+Connection::GetInterface(const nsIID &aIID,
+                         void **_result)
+{
+  if (aIID.Equals(NS_GET_IID(nsIEventTarget))) {
+    nsIEventTarget *background = getAsyncExecutionTarget();
+    NS_IF_ADDREF(background);
+    *_result = background;
+    return NS_OK;
+  }
+  return NS_ERROR_NO_INTERFACE;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// mozIStorageConnection
+
+NS_IMETHODIMP
+Connection::Close()
+{
+  if (!mDBConn)
+    return NS_ERROR_NOT_INITIALIZED;
+
+  { // Make sure we have not executed any asynchronous statements.
+    // If this fails, the mDBConn will be left open, resulting in a leak.
+    // Ideally we'd schedule some code to destroy the mDBConn once all its
+    // async statements have finished executing;  see bug 704030.
+    MutexAutoLock lockedScope(sharedAsyncExecutionMutex);
+    bool asyncCloseWasCalled = !mAsyncExecutionThread;
+    NS_ENSURE_TRUE(asyncCloseWasCalled, NS_ERROR_UNEXPECTED);
+  }
+
+  // setClosedState nullifies our connection pointer, so we take a raw pointer
+  // off it, to pass it through the close procedure.
+  sqlite3 *nativeConn = mDBConn;
+  nsresult rv = setClosedState();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return internalClose(nativeConn);
+}
+
+NS_IMETHODIMP
+Connection::AsyncClose(mozIStorageCompletionCallback *aCallback)
+{
+  if (!NS_IsMainThread()) {
+    return NS_ERROR_NOT_SAME_THREAD;
+  }
+
+  // It's possible to get here with a null mDBConn but a non-null async
+  // execution target if OpenAsyncDatabase failed somehow, so don't exit early
+  // in that case.
+  nsIEventTarget *asyncThread = getAsyncExecutionTarget();
+
+  if (!mDBConn && !asyncThread)
+    return NS_ERROR_NOT_INITIALIZED;
+
+  // setClosedState nullifies our connection pointer, so we take a raw pointer
+  // off it, to pass it through the close procedure.
+  sqlite3 *nativeConn = mDBConn;
+  nsresult rv = setClosedState();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // Create our callback event if we were given a callback.
+  nsCOMPtr<nsIRunnable> completeEvent;
+  if (aCallback) {
+    completeEvent = newCompletionEvent(aCallback);
+  }
+
+  // Create and dispatch our close event to the background thread.
+  nsCOMPtr<nsIRunnable> closeEvent;
+  {
+    // We need to lock because we're modifying mAsyncExecutionThread
+    MutexAutoLock lockedScope(sharedAsyncExecutionMutex);
+    closeEvent = new AsyncCloseConnection(this,
+                                          nativeConn,
+                                          completeEvent,
+                                          mAsyncExecutionThread.forget());
+  }
+
+  rv = asyncThread->Dispatch(closeEvent, NS_DISPATCH_NORMAL);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Connection::AsyncClone(bool aReadOnly,
+                       mozIStorageCompletionCallback *aCallback)
+{
+  PROFILER_LABEL("mozStorageConnection", "AsyncClone",
+    js::ProfileEntry::Category::STORAGE);
+
+  if (!NS_IsMainThread()) {
+    return NS_ERROR_NOT_SAME_THREAD;
+  }
+  if (!mDBConn)
+    return NS_ERROR_NOT_INITIALIZED;
+  if (!mDatabaseFile)
+    return NS_ERROR_UNEXPECTED;
+
+  int flags = mFlags;
+  if (aReadOnly) {
+    // Turn off SQLITE_OPEN_READWRITE, and set SQLITE_OPEN_READONLY.
+    flags = (~SQLITE_OPEN_READWRITE & flags) | SQLITE_OPEN_READONLY;
+    // Turn off SQLITE_OPEN_CREATE.
+    flags = (~SQLITE_OPEN_CREATE & flags);
+  }
+
+  nsRefPtr<Connection> clone = new Connection(mStorageService, flags,
+                                              mAsyncOnly);
+
+  nsRefPtr<AsyncInitializeClone> initEvent =
+    new AsyncInitializeClone(this, clone, aReadOnly, aCallback);
+  nsCOMPtr<nsIEventTarget> target = clone->getAsyncExecutionTarget();
+  if (!target) {
+    return NS_ERROR_UNEXPECTED;
+  }
+  return target->Dispatch(initEvent, NS_DISPATCH_NORMAL);
+}
+
+nsresult
+Connection::initializeClone(Connection* aClone, bool aReadOnly)
+{
+  nsresult rv = mFileURL ? aClone->initialize(mFileURL)
+                         : aClone->initialize(mDatabaseFile);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  // Copy over pragmas from the original connection.
+  static const char * pragmas[] = {
+    "cache_size",
+    "temp_store",
+    "foreign_keys",
+    "journal_size_limit",
+    "synchronous",
+    "wal_autocheckpoint",
+    "busy_timeout"
+  };
+  for (uint32_t i = 0; i < ArrayLength(pragmas); ++i) {
+    // Read-only connections just need cache_size and temp_store pragmas.
+    if (aReadOnly && ::strcmp(pragmas[i], "cache_size") != 0 &&
+                     ::strcmp(pragmas[i], "temp_store") != 0) {
+      continue;
+    }
+
+    nsAutoCString pragmaQuery("PRAGMA ");
+    pragmaQuery.Append(pragmas[i]);
+    nsCOMPtr<mozIStorageStatement> stmt;
+    rv = CreateStatement(pragmaQuery, getter_AddRefs(stmt));
+    MOZ_ASSERT(NS_SUCCEEDED(rv));
+    bool hasResult = false;
+    if (stmt && NS_SUCCEEDED(stmt->ExecuteStep(&hasResult)) && hasResult) {
+      pragmaQuery.AppendLiteral(" = ");
+      pragmaQuery.AppendInt(stmt->AsInt32(0));
+      rv = aClone->ExecuteSimpleSQL(pragmaQuery);
+      MOZ_ASSERT(NS_SUCCEEDED(rv));
+    }
+  }
+
+  // Copy any functions that have been added to this connection.
+  SQLiteMutexAutoLock lockedScope(sharedDBMutex);
+  (void)mFunctions.EnumerateRead(copyFunctionEnumerator, aClone);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Connection::Clone(bool aReadOnly,
+                  mozIStorageConnection **_connection)
+{
+  MOZ_ASSERT(threadOpenedOn == NS_GetCurrentThread());
+
+  PROFILER_LABEL("mozStorageConnection", "Clone",
+    js::ProfileEntry::Category::STORAGE);
+
+  if (!mDBConn)
+    return NS_ERROR_NOT_INITIALIZED;
+  if (!mDatabaseFile)
+    return NS_ERROR_UNEXPECTED;
+
+  int flags = mFlags;
+  if (aReadOnly) {
+    // Turn off SQLITE_OPEN_READWRITE, and set SQLITE_OPEN_READONLY.
+    flags = (~SQLITE_OPEN_READWRITE & flags) | SQLITE_OPEN_READONLY;
+    // Turn off SQLITE_OPEN_CREATE.
+    flags = (~SQLITE_OPEN_CREATE & flags);
+  }
+
+  nsRefPtr<Connection> clone = new Connection(mStorageService, flags,
+                                              mAsyncOnly);
+
+  nsresult rv = initializeClone(clone, aReadOnly);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  NS_IF_ADDREF(*_connection = clone);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Connection::GetDefaultPageSize(int32_t *_defaultPageSize)
+{
+  *_defaultPageSize = Service::getDefaultPageSize();
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Connection::GetConnectionReady(bool *_ready)
+{
+  *_ready = connectionReady();
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Connection::GetDatabaseFile(nsIFile **_dbFile)
+{
+  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
+
+  NS_IF_ADDREF(*_dbFile = mDatabaseFile);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Connection::GetLastInsertRowID(int64_t *_id)
+{
+  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
+
+  sqlite_int64 id = ::sqlite3_last_insert_rowid(mDBConn);
+  *_id = id;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Connection::GetAffectedRows(int32_t *_rows)
+{
+  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
+
+  *_rows = ::sqlite3_changes(mDBConn);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Connection::GetLastError(int32_t *_error)
+{
+  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
+
+  *_error = ::sqlite3_errcode(mDBConn);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Connection::GetLastErrorString(nsACString &_errorString)
+{
+  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
+
+  const char *serr = ::sqlite3_errmsg(mDBConn);
+  _errorString.Assign(serr);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Connection::GetSchemaVersion(int32_t *_version)
+{
+  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
+
+  nsCOMPtr<mozIStorageStatement> stmt;
+  (void)CreateStatement(NS_LITERAL_CSTRING("PRAGMA user_version"),
+                        getter_AddRefs(stmt));
+  NS_ENSURE_TRUE(stmt, NS_ERROR_OUT_OF_MEMORY);
+
+  *_version = 0;
+  bool hasResult;
+  if (NS_SUCCEEDED(stmt->ExecuteStep(&hasResult)) && hasResult)
+    *_version = stmt->AsInt32(0);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Connection::SetSchemaVersion(int32_t aVersion)
+{
+  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
+
+  nsAutoCString stmt(NS_LITERAL_CSTRING("PRAGMA user_version = "));
+  stmt.AppendInt(aVersion);
+
+  return ExecuteSimpleSQL(stmt);
+}
+
+NS_IMETHODIMP
+Connection::CreateStatement(const nsACString &aSQLStatement,
+                            mozIStorageStatement **_stmt)
+{
+  NS_ENSURE_ARG_POINTER(_stmt);
+  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
+
+  nsRefPtr<Statement> statement(new Statement());
+  NS_ENSURE_TRUE(statement, NS_ERROR_OUT_OF_MEMORY);
+
+  nsresult rv = statement->initialize(this, mDBConn, aSQLStatement);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  Statement *rawPtr;
+  statement.forget(&rawPtr);
+  *_stmt = rawPtr;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Connection::CreateAsyncStatement(const nsACString &aSQLStatement,
+                                 mozIStorageAsyncStatement **_stmt)
+{
+  NS_ENSURE_ARG_POINTER(_stmt);
+  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
+
+  nsRefPtr<AsyncStatement> statement(new AsyncStatement());
+  NS_ENSURE_TRUE(statement, NS_ERROR_OUT_OF_MEMORY);
+
+  nsresult rv = statement->initialize(this, mDBConn, aSQLStatement);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  AsyncStatement *rawPtr;
+  statement.forget(&rawPtr);
+  *_stmt = rawPtr;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Connection::ExecuteSimpleSQL(const nsACString &aSQLStatement)
+{
+  CHECK_MAINTHREAD_ABUSE();
+  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
+
+  int srv = executeSql(mDBConn, PromiseFlatCString(aSQLStatement).get());
+  return convertResultCode(srv);
+}
+
+NS_IMETHODIMP
+Connection::ExecuteAsync(mozIStorageBaseStatement **aStatements,
+                         uint32_t aNumStatements,
+                         mozIStorageStatementCallback *aCallback,
+                         mozIStoragePendingStatement **_handle)
+{
+  nsTArray<StatementData> stmts(aNumStatements);
+  for (uint32_t i = 0; i < aNumStatements; i++) {
+    nsCOMPtr<StorageBaseStatementInternal> stmt = 
+      do_QueryInterface(aStatements[i]);
+
+    // Obtain our StatementData.
+    StatementData data;
+    nsresult rv = stmt->getAsynchronousStatementData(data);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    NS_ASSERTION(stmt->getOwner() == this,
+                 "Statement must be from this database connection!");
+
+    // Now append it to our array.
+    NS_ENSURE_TRUE(stmts.AppendElement(data), NS_ERROR_OUT_OF_MEMORY);
+  }
+
+  // Dispatch to the background
+  return AsyncExecuteStatements::execute(stmts, this, mDBConn, aCallback,
+                                         _handle);
+}
+
+NS_IMETHODIMP
+Connection::ExecuteSimpleSQLAsync(const nsACString &aSQLStatement,
+                                  mozIStorageStatementCallback *aCallback,
+                                  mozIStoragePendingStatement **_handle)
+{
+  if (!NS_IsMainThread()) {
+    return NS_ERROR_NOT_SAME_THREAD;
+  }
+
+  nsCOMPtr<mozIStorageAsyncStatement> stmt;
+  nsresult rv = CreateAsyncStatement(aSQLStatement, getter_AddRefs(stmt));
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  nsCOMPtr<mozIStoragePendingStatement> pendingStatement;
+  rv = stmt->ExecuteAsync(aCallback, getter_AddRefs(pendingStatement));
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  NS_ADDREF(*_handle = pendingStatement);
+  return rv;
+}
+
+NS_IMETHODIMP
+Connection::TableExists(const nsACString &aTableName,
+                        bool *_exists)
+{
+    return databaseElementExists(TABLE, aTableName, _exists);
+}
+
+NS_IMETHODIMP
+Connection::IndexExists(const nsACString &aIndexName,
+                        bool* _exists)
+{
+    return databaseElementExists(INDEX, aIndexName, _exists);
+}
+
+NS_IMETHODIMP
+Connection::GetTransactionInProgress(bool *_inProgress)
+{
+  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
+
+  SQLiteMutexAutoLock lockedScope(sharedDBMutex);
+  *_inProgress = mTransactionInProgress;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Connection::BeginTransaction()
+{
+  return BeginTransactionAs(mozIStorageConnection::TRANSACTION_DEFERRED);
+}
+
+NS_IMETHODIMP
+Connection::BeginTransactionAs(int32_t aTransactionType)
+{
+  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
+
+  return beginTransactionInternal(mDBConn, aTransactionType);
+}
+
+nsresult
+Connection::beginTransactionInternal(sqlite3 *aNativeConnection,
+                                     int32_t aTransactionType)
+{
+  SQLiteMutexAutoLock lockedScope(sharedDBMutex);
+  if (mTransactionInProgress)
+    return NS_ERROR_FAILURE;
+  nsresult rv;
+  switch(aTransactionType) {
+    case TRANSACTION_DEFERRED:
+      rv = convertResultCode(executeSql(aNativeConnection, "BEGIN DEFERRED"));
+      break;
+    case TRANSACTION_IMMEDIATE:
+      rv = convertResultCode(executeSql(aNativeConnection, "BEGIN IMMEDIATE"));
+      break;
+    case TRANSACTION_EXCLUSIVE:
+      rv = convertResultCode(executeSql(aNativeConnection, "BEGIN EXCLUSIVE"));
+      break;
+    default:
+      return NS_ERROR_ILLEGAL_VALUE;
+  }
+  if (NS_SUCCEEDED(rv))
+    mTransactionInProgress = true;
+  return rv;
+}
+
+NS_IMETHODIMP
+Connection::CommitTransaction()
+{
+  if (!mDBConn)
+    return NS_ERROR_NOT_INITIALIZED;
+
+  return commitTransactionInternal(mDBConn);
+}
+
+nsresult
+Connection::commitTransactionInternal(sqlite3 *aNativeConnection)
+{
+  SQLiteMutexAutoLock lockedScope(sharedDBMutex);
+  if (!mTransactionInProgress)
+    return NS_ERROR_UNEXPECTED;
+  nsresult rv =
+    convertResultCode(executeSql(aNativeConnection, "COMMIT TRANSACTION"));
+  if (NS_SUCCEEDED(rv))
+    mTransactionInProgress = false;
+  return rv;
+}
+
+NS_IMETHODIMP
+Connection::RollbackTransaction()
+{
+  if (!mDBConn)
+    return NS_ERROR_NOT_INITIALIZED;
+
+  return rollbackTransactionInternal(mDBConn);
+}
+
+nsresult
+Connection::rollbackTransactionInternal(sqlite3 *aNativeConnection)
+{
+  SQLiteMutexAutoLock lockedScope(sharedDBMutex);
+  if (!mTransactionInProgress)
+    return NS_ERROR_UNEXPECTED;
+
+  nsresult rv =
+    convertResultCode(executeSql(aNativeConnection, "ROLLBACK TRANSACTION"));
+  if (NS_SUCCEEDED(rv))
+    mTransactionInProgress = false;
+  return rv;
+}
+
+NS_IMETHODIMP
+Connection::CreateTable(const char *aTableName,
+                        const char *aTableSchema)
+{
+  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
+
+  char *buf = ::PR_smprintf("CREATE TABLE %s (%s)", aTableName, aTableSchema);
+  if (!buf)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  int srv = executeSql(mDBConn, buf);
+  ::PR_smprintf_free(buf);
+
+  return convertResultCode(srv);
+}
+
+NS_IMETHODIMP
+Connection::CreateFunction(const nsACString &aFunctionName,
+                           int32_t aNumArguments,
+                           mozIStorageFunction *aFunction)
+{
+  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
+
+  // Check to see if this function is already defined.  We only check the name
+  // because a function can be defined with the same body but different names.
+  SQLiteMutexAutoLock lockedScope(sharedDBMutex);
+  NS_ENSURE_FALSE(mFunctions.Get(aFunctionName, nullptr), NS_ERROR_FAILURE);
+
+  int srv = ::sqlite3_create_function(mDBConn,
+                                      nsPromiseFlatCString(aFunctionName).get(),
+                                      aNumArguments,
+                                      SQLITE_ANY,
+                                      aFunction,
+                                      basicFunctionHelper,
+                                      nullptr,
+                                      nullptr);
+  if (srv != SQLITE_OK)
+    return convertResultCode(srv);
+
+  FunctionInfo info = { aFunction,
+                        Connection::FunctionInfo::SIMPLE,
+                        aNumArguments };
+  mFunctions.Put(aFunctionName, info);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Connection::CreateAggregateFunction(const nsACString &aFunctionName,
+                                    int32_t aNumArguments,
+                                    mozIStorageAggregateFunction *aFunction)
+{
+  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
+
+  // Check to see if this function name is already defined.
+  SQLiteMutexAutoLock lockedScope(sharedDBMutex);
+  NS_ENSURE_FALSE(mFunctions.Get(aFunctionName, nullptr), NS_ERROR_FAILURE);
+
+  // Because aggregate functions depend on state across calls, you cannot have
+  // the same instance use the same name.  We want to enumerate all functions
+  // and make sure this instance is not already registered.
+  NS_ENSURE_FALSE(findFunctionByInstance(aFunction), NS_ERROR_FAILURE);
+
+  int srv = ::sqlite3_create_function(mDBConn,
+                                      nsPromiseFlatCString(aFunctionName).get(),
+                                      aNumArguments,
+                                      SQLITE_ANY,
+                                      aFunction,
+                                      nullptr,
+                                      aggregateFunctionStepHelper,
+                                      aggregateFunctionFinalHelper);
+  if (srv != SQLITE_OK)
+    return convertResultCode(srv);
+
+  FunctionInfo info = { aFunction,
+                        Connection::FunctionInfo::AGGREGATE,
+                        aNumArguments };
+  mFunctions.Put(aFunctionName, info);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Connection::RemoveFunction(const nsACString &aFunctionName)
+{
+  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
+
+  SQLiteMutexAutoLock lockedScope(sharedDBMutex);
+  NS_ENSURE_TRUE(mFunctions.Get(aFunctionName, nullptr), NS_ERROR_FAILURE);
+
+  int srv = ::sqlite3_create_function(mDBConn,
+                                      nsPromiseFlatCString(aFunctionName).get(),
+                                      0,
+                                      SQLITE_ANY,
+                                      nullptr,
+                                      nullptr,
+                                      nullptr,
+                                      nullptr);
+  if (srv != SQLITE_OK)
+    return convertResultCode(srv);
+
+  mFunctions.Remove(aFunctionName);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Connection::SetProgressHandler(int32_t aGranularity,
+                               mozIStorageProgressHandler *aHandler,
+                               mozIStorageProgressHandler **_oldHandler)
+{
+  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
+
+  // Return previous one
+  SQLiteMutexAutoLock lockedScope(sharedDBMutex);
+  NS_IF_ADDREF(*_oldHandler = mProgressHandler);
+
+  if (!aHandler || aGranularity <= 0) {
+    aHandler = nullptr;
+    aGranularity = 0;
+  }
+  mProgressHandler = aHandler;
+  ::sqlite3_progress_handler(mDBConn, aGranularity, sProgressHelper, this);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Connection::RemoveProgressHandler(mozIStorageProgressHandler **_oldHandler)
+{
+  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
+
+  // Return previous one
+  SQLiteMutexAutoLock lockedScope(sharedDBMutex);
+  NS_IF_ADDREF(*_oldHandler = mProgressHandler);
+
+  mProgressHandler = nullptr;
+  ::sqlite3_progress_handler(mDBConn, 0, nullptr, nullptr);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Connection::SetGrowthIncrement(int32_t aChunkSize, const nsACString &aDatabaseName)
+{
+  // Bug 597215: Disk space is extremely limited on Android
+  // so don't preallocate space. This is also not effective
+  // on log structured file systems used by Android devices
+#if !defined(ANDROID) && !defined(MOZ_PLATFORM_MAEMO)
+  // Don't preallocate if less than 500MiB is available.
+  int64_t bytesAvailable;
+  nsresult rv = mDatabaseFile->GetDiskSpaceAvailable(&bytesAvailable);
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (bytesAvailable < MIN_AVAILABLE_BYTES_PER_CHUNKED_GROWTH) {
+    return NS_ERROR_FILE_TOO_BIG;
+  }
+
+  (void)::sqlite3_file_control(mDBConn,
+                               aDatabaseName.Length() ? nsPromiseFlatCString(aDatabaseName).get()
+                                                      : nullptr,
+                               SQLITE_FCNTL_CHUNK_SIZE,
+                               &aChunkSize);
+#endif
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Connection::EnableModule(const nsACString& aModuleName)
+{
+  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
+
+  for (size_t i = 0; i < ArrayLength(gModules); i++) {
+    struct Module* m = &gModules[i];
+    if (aModuleName.Equals(m->name)) {
+      int srv = m->registerFunc(mDBConn, m->name);
+      if (srv != SQLITE_OK)
+        return convertResultCode(srv);
+
+      return NS_OK;
+    }
+  }
+
+  return NS_ERROR_FAILURE;
+}
+
+} // namespace storage
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageConnection.h firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageConnection.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageConnection.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageConnection.h	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,414 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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_storage_Connection_h
+#define mozilla_storage_Connection_h
+
+#include "nsAutoPtr.h"
+#include "nsCOMPtr.h"
+#include "mozilla/Mutex.h"
+#include "nsProxyRelease.h"
+#include "nsThreadUtils.h"
+#include "nsIInterfaceRequestor.h"
+
+#include "nsDataHashtable.h"
+#include "mozIStorageProgressHandler.h"
+#include "SQLiteMutex.h"
+#include "mozIStorageConnection.h"
+#include "mozStorageService.h"
+#include "mozIStorageAsyncConnection.h"
+#include "mozIStorageCompletionCallback.h"
+
+#include "nsIMutableArray.h"
+#include "mozilla/Attributes.h"
+
+#include "sqlite3.h"
+
+class nsIFile;
+class nsIFileURL;
+class nsIEventTarget;
+class nsIThread;
+
+namespace mozilla {
+namespace storage {
+
+class Connection final : public mozIStorageConnection
+                       , public nsIInterfaceRequestor
+{
+public:
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_MOZISTORAGEASYNCCONNECTION
+  NS_DECL_MOZISTORAGECONNECTION
+  NS_DECL_NSIINTERFACEREQUESTOR
+
+  /**
+   * Structure used to describe user functions on the database connection.
+   */
+  struct FunctionInfo {
+    enum FunctionType {
+      SIMPLE,
+      AGGREGATE
+    };
+
+    nsCOMPtr<nsISupports> function;
+    FunctionType type;
+    int32_t numArgs;
+  };
+
+  /**
+   * @param aService
+   *        Pointer to the storage service.  Held onto for the lifetime of the
+   *        connection.
+   * @param aFlags
+   *        The flags to pass to sqlite3_open_v2.
+   * @param aAsyncOnly
+   *        If |true|, the Connection only implements asynchronous interface:
+   *        - |mozIStorageAsyncConnection|;
+   *        If |false|, the result also implements synchronous interface:
+   *        - |mozIStorageConnection|.
+   */
+  Connection(Service *aService, int aFlags, bool aAsyncOnly);
+
+  /**
+   * Creates the connection to an in-memory database.
+   */
+  nsresult initialize();
+
+  /**
+   * Creates the connection to the database.
+   *
+   * @param aDatabaseFile
+   *        The nsIFile of the location of the database to open, or create if it
+   *        does not exist.
+   */
+  nsresult initialize(nsIFile *aDatabaseFile);
+
+  /**
+   * Creates the connection to the database.
+   *
+   * @param aFileURL
+   *        The nsIFileURL of the location of the database to open, or create if it
+   *        does not exist.
+   */
+  nsresult initialize(nsIFileURL *aFileURL);
+
+  /**
+   * Fetches runtime status information for this connection.
+   *
+   * @param aStatusOption One of the SQLITE_DBSTATUS options defined at
+   *        http://www.sqlite.org/c3ref/c_dbstatus_options.html
+   * @param [optional] aMaxValue if provided, will be set to the highest
+   *        istantaneous value.
+   * @return the current value for the specified option.
+   */
+  int32_t getSqliteRuntimeStatus(int32_t aStatusOption,
+                                 int32_t* aMaxValue=nullptr);
+  /**
+   * Registers/unregisters a commit hook callback.
+   *
+   * @param aCallbackFn a callback function to be invoked on transactions
+   *        commit.  Pass nullptr to unregister the current callback.
+   * @param [optional] aData if provided, will be passed to the callback.
+   * @see http://sqlite.org/c3ref/commit_hook.html
+   */
+  void setCommitHook(int (*aCallbackFn)(void *) , void *aData=nullptr) {
+    MOZ_ASSERT(mDBConn, "A connection must exist at this point");
+    ::sqlite3_commit_hook(mDBConn, aCallbackFn, aData);
+  };
+
+  /**
+   * Gets autocommit status.
+   */
+  bool getAutocommit() {
+    return mDBConn && static_cast<bool>(::sqlite3_get_autocommit(mDBConn));
+  };
+
+  /**
+   * Lazily creates and returns a background execution thread.  In the future,
+   * the thread may be re-claimed if left idle, so you should call this
+   * method just before you dispatch and not save the reference.
+   *
+   * @returns an event target suitable for asynchronous statement execution.
+   */
+  nsIEventTarget *getAsyncExecutionTarget();
+
+  /**
+   * Mutex used by asynchronous statements to protect state.  The mutex is
+   * declared on the connection object because there is no contention between
+   * asynchronous statements (they are serialized on mAsyncExecutionThread).
+   * Currently protects:
+   *  - Connection.mAsyncExecutionThreadShuttingDown
+   *  - Connection.mAsyncExecutionThread
+   *  - Connection.mConnectionClosed
+   *  - AsyncExecuteStatements.mCancelRequested
+   */
+  Mutex sharedAsyncExecutionMutex;
+
+  /**
+   * Wraps the mutex that SQLite gives us from sqlite3_db_mutex.  This is public
+   * because we already expose the sqlite3* native connection and proper
+   * operation of the deadlock detector requires everyone to use the same single
+   * SQLiteMutex instance for correctness.
+   */
+  SQLiteMutex sharedDBMutex;
+
+  /**
+   * References the thread this database was opened on.  This MUST be thread it is
+   * closed on.
+   */
+  const nsCOMPtr<nsIThread> threadOpenedOn;
+
+  /**
+   * Closes the SQLite database, and warns about any non-finalized statements.
+   */
+  nsresult internalClose(sqlite3 *aDBConn);
+
+  /**
+   * Shuts down the passed-in async thread.
+   */
+  void shutdownAsyncThread(nsIThread *aAsyncThread);
+
+  /**
+   * Obtains the filename of the connection.  Useful for logging.
+   */
+  nsCString getFilename();
+
+  /**
+   * Creates an sqlite3 prepared statement object from an SQL string.
+   *
+   * @param aNativeConnection
+   *        The underlying Sqlite connection to prepare the statement with.
+   * @param aSQL
+   *        The SQL statement string to compile.
+   * @param _stmt
+   *        New sqlite3_stmt object.
+   * @return the result from sqlite3_prepare_v2.
+   */
+  int prepareStatement(sqlite3* aNativeConnection,
+                       const nsCString &aSQL, sqlite3_stmt **_stmt);
+
+  /**
+   * Performs a sqlite3_step on aStatement, while properly handling SQLITE_LOCKED
+   * when not on the main thread by waiting until we are notified.
+   *
+   * @param aNativeConnection
+   *        The underlying Sqlite connection to step the statement with.
+   * @param aStatement
+   *        A pointer to a sqlite3_stmt object.
+   * @return the result from sqlite3_step.
+   */
+  int stepStatement(sqlite3* aNativeConnection, sqlite3_stmt* aStatement);
+
+  /**
+   * Raw connection transaction management.
+   *
+   * @see BeginTransactionAs, CommitTransaction, RollbackTransaction.
+   */
+  nsresult beginTransactionInternal(sqlite3 *aNativeConnection,
+                                    int32_t aTransactionType=TRANSACTION_DEFERRED);
+  nsresult commitTransactionInternal(sqlite3 *aNativeConnection);
+  nsresult rollbackTransactionInternal(sqlite3 *aNativeConnection);
+
+  bool connectionReady();
+
+  /**
+   * True if this connection is shutting down but not yet closed.
+   */
+  bool isClosing();
+
+  /**
+   * True if the underlying connection is closed.
+   * Any sqlite resources may be lost when this returns true, so nothing should
+   * try to use them.
+   */
+  bool isClosed();
+
+  nsresult initializeClone(Connection *aClone, bool aReadOnly);
+
+private:
+  ~Connection();
+  nsresult initializeInternal();
+
+  /**
+   * Sets the database into a closed state so no further actions can be
+   * performed.
+   *
+   * @note mDBConn is set to nullptr in this method.
+   */
+  nsresult setClosedState();
+
+  /**
+   * Helper for calls to sqlite3_exec. Reports long delays to Telemetry.
+   *
+   * @param aNativeConnection
+   *        The underlying Sqlite connection to execute the query with.
+   * @param aSqlString
+   *        SQL string to execute
+   * @return the result from sqlite3_exec.
+   */
+  int executeSql(sqlite3 *aNativeConnection, const char *aSqlString);
+
+  /**
+   * Describes a certain primitive type in the database.
+   *
+   * Possible Values Are:
+   *  INDEX - To check for the existence of an index
+   *  TABLE - To check for the existence of a table
+   */
+  enum DatabaseElementType {
+    INDEX,
+    TABLE
+  };
+
+  /**
+   * Determines if the specified primitive exists.
+   *
+   * @param aElementType
+   *        The type of element to check the existence of
+   * @param aElementName
+   *        The name of the element to check for
+   * @returns true if element exists, false otherwise
+   */
+  nsresult databaseElementExists(enum DatabaseElementType aElementType,
+                                 const nsACString& aElementName,
+                                 bool *_exists);
+
+  bool findFunctionByInstance(nsISupports *aInstance);
+
+  static int sProgressHelper(void *aArg);
+  // Generic progress handler
+  // Dispatch call to registered progress handler,
+  // if there is one. Do nothing in other cases.
+  int progressHandler();
+
+  sqlite3 *mDBConn;
+  nsCOMPtr<nsIFileURL> mFileURL;
+  nsCOMPtr<nsIFile> mDatabaseFile;
+
+  /**
+   * The filename that will be reported to telemetry for this connection. By
+   * default this will be the leaf of the path to the database file.
+  */
+  nsCString mTelemetryFilename;
+
+  /**
+   * Lazily created thread for asynchronous statement execution.  Consumers
+   * should use getAsyncExecutionTarget rather than directly accessing this
+   * field.
+   */
+  nsCOMPtr<nsIThread> mAsyncExecutionThread;
+
+  /**
+   * Set to true by Close() or AsyncClose() prior to shutdown.
+   *
+   * If false, we guarantee both that the underlying sqlite3 database
+   * connection is still open and that getAsyncExecutionTarget() can
+   * return a thread. Once true, either the sqlite3 database
+   * connection is being shutdown or it has been
+   * shutdown. Additionally, once true, getAsyncExecutionTarget()
+   * returns null.
+   *
+   * This variable should be accessed while holding the
+   * sharedAsyncExecutionMutex.
+   */
+  bool mAsyncExecutionThreadShuttingDown;
+
+  /**
+   * Tracks whether the async thread has been initialized and Shutdown() has
+   * not yet been invoked on it.
+   */
+  DebugOnly<bool> mAsyncExecutionThreadIsAlive;
+
+  /**
+   * Set to true just prior to calling sqlite3_close on the
+   * connection.
+   *
+   * This variable should be accessed while holding the
+   * sharedAsyncExecutionMutex.
+   */
+  bool mConnectionClosed;
+
+  /**
+   * Tracks if we have a transaction in progress or not.  Access protected by
+   * sharedDBMutex.
+   */
+  bool mTransactionInProgress;
+
+  /**
+   * Stores the mapping of a given function by name to its instance.  Access is
+   * protected by sharedDBMutex.
+   */
+  nsDataHashtable<nsCStringHashKey, FunctionInfo> mFunctions;
+
+  /**
+   * Stores the registered progress handler for the database connection.  Access
+   * is protected by sharedDBMutex.
+   */
+  nsCOMPtr<mozIStorageProgressHandler> mProgressHandler;
+
+  /**
+   * Stores the flags we passed to sqlite3_open_v2.
+   */
+  const int mFlags;
+
+  // This is here for two reasons: 1) It's used to make sure that the
+  // connections do not outlive the service.  2) Our custom collating functions
+  // call its localeCompareStrings() method.
+  nsRefPtr<Service> mStorageService;
+
+  /**
+   * If |false|, this instance supports synchronous operations
+   * and it can be cast to |mozIStorageConnection|.
+   */
+  const bool mAsyncOnly;
+};
+
+
+/**
+ * A Runnable designed to call a mozIStorageCompletionCallback on
+ * the appropriate thread.
+ */
+class CallbackComplete final : public nsRunnable
+{
+public:
+  /**
+   * @param aValue The result to pass to the callback. It must
+   *               already be owned by the main thread.
+   * @param aCallback The callback. It must already be owned by the
+   *                  main thread.
+   */
+  CallbackComplete(nsresult aStatus,
+                   nsISupports* aValue,
+                   already_AddRefed<mozIStorageCompletionCallback> aCallback)
+    : mStatus(aStatus)
+    , mValue(aValue)
+    , mCallback(aCallback)
+  {
+  }
+
+  NS_IMETHOD Run() {
+    MOZ_ASSERT(NS_IsMainThread());
+    nsresult rv = mCallback->Complete(mStatus, mValue);
+
+    // Ensure that we release on the main thread
+    mValue = nullptr;
+    mCallback = nullptr;
+    return rv;
+  }
+
+private:
+  nsresult mStatus;
+  nsCOMPtr<nsISupports> mValue;
+  // This is a nsRefPtr<T> and not a nsCOMPtr<T> because
+  // nsCOMP<T> would cause an off-main thread QI, which
+  // is not a good idea (and crashes XPConnect).
+  nsRefPtr<mozIStorageCompletionCallback> mCallback;
+};
+
+} // namespace storage
+} // namespace mozilla
+
+#endif // mozilla_storage_Connection_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageError.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageError.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageError.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageError.cpp	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,49 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 "mozStorageError.h"
+
+namespace mozilla {
+namespace storage {
+
+////////////////////////////////////////////////////////////////////////////////
+//// Error
+
+Error::Error(int aResult,
+             const char *aMessage)
+: mResult(aResult)
+, mMessage(aMessage)
+{
+}
+
+/**
+ * Note:  This object is only ever accessed on one thread at a time.  It it not
+ *        threadsafe, but it does need threadsafe AddRef and Release.
+ */
+NS_IMPL_ISUPPORTS(
+  Error,
+  mozIStorageError
+)
+
+////////////////////////////////////////////////////////////////////////////////
+//// mozIStorageError
+
+NS_IMETHODIMP
+Error::GetResult(int32_t *_result)
+{
+  *_result = mResult;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Error::GetMessage(nsACString &_message)
+{
+  _message = mMessage;
+  return NS_OK;
+}
+
+} // namespace storage
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageError.h firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageError.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageError.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageError.h	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 mozStorageError_h
+#define mozStorageError_h
+
+#include "mozIStorageError.h"
+#include "nsString.h"
+#include "mozilla/Attributes.h"
+
+namespace mozilla {
+namespace storage {
+
+class Error final : public mozIStorageError
+{
+public:
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_MOZISTORAGEERROR
+
+  Error(int aResult, const char *aMessage);
+
+private:
+  ~Error() {}
+
+  int mResult;
+  nsCString mMessage;
+};
+
+} // namespace stoarge
+} // namespace mozilla
+
+#endif // mozStorageError_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageHelper.h firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageHelper.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageHelper.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageHelper.h	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,209 @@
+/* -*- 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 MOZSTORAGEHELPER_H
+#define MOZSTORAGEHELPER_H
+
+#include "nsAutoPtr.h"
+#include "nsStringGlue.h"
+#include "mozilla/DebugOnly.h"
+
+#include "mozIStorageAsyncConnection.h"
+#include "mozIStorageConnection.h"
+#include "mozIStorageStatement.h"
+#include "mozIStoragePendingStatement.h"
+#include "nsError.h"
+
+/**
+ * This class wraps a transaction inside a given C++ scope, guaranteeing that
+ * the transaction will be completed even if you have an exception or
+ * return early.
+ *
+ * A common use is to create an instance with aCommitOnComplete = false (rollback),
+ * then call Commit() on this object manually when your function completes
+ * successfully.
+ *
+ * @note nested transactions are not supported by Sqlite, so if a transaction
+ * is already in progress, this object does nothing.  Note that in this case,
+ * you may not get the transaction type you asked for, and you won't be able
+ * to rollback.
+ *
+ * @param aConnection
+ *        The connection to create the transaction on.
+ * @param aCommitOnComplete
+ *        Controls whether the transaction is committed or rolled back when
+ *        this object goes out of scope.
+ * @param aType [optional]
+ *        The transaction type, as defined in mozIStorageConnection.  Defaults
+ *        to TRANSACTION_DEFERRED.
+ * @param aAsyncCommit [optional]
+ *        Whether commit should be executed asynchronously on the helper thread.
+ *        This is a special option introduced as an interim solution to reduce
+ *        main-thread fsyncs in Places.  Can only be used on main-thread.
+ *
+ *        WARNING: YOU SHOULD _NOT_ WRITE NEW MAIN-THREAD CODE USING THIS!
+ *
+ *        Notice that async commit might cause synchronous statements to fail
+ *        with SQLITE_BUSY.  A possible mitigation strategy is to use
+ *        PRAGMA busy_timeout, but notice that might cause main-thread jank.
+ *        Finally, if the database is using WAL journaling mode, other
+ *        connections won't see the changes done in async committed transactions
+ *        until commit is complete.
+ *
+ *        For all of the above reasons, this should only be used as an interim
+ *        solution and avoided completely if possible.
+ */
+class mozStorageTransaction
+{
+public:
+  mozStorageTransaction(mozIStorageConnection* aConnection,
+                        bool aCommitOnComplete,
+                        int32_t aType = mozIStorageConnection::TRANSACTION_DEFERRED,
+                        bool aAsyncCommit = false)
+    : mConnection(aConnection),
+      mHasTransaction(false),
+      mCommitOnComplete(aCommitOnComplete),
+      mCompleted(false),
+      mAsyncCommit(aAsyncCommit)
+  {
+    if (mConnection) {
+      nsAutoCString query("BEGIN");
+      switch(aType) {
+        case mozIStorageConnection::TRANSACTION_IMMEDIATE:
+          query.AppendLiteral(" IMMEDIATE");
+          break;
+        case mozIStorageConnection::TRANSACTION_EXCLUSIVE:
+          query.AppendLiteral(" EXCLUSIVE");
+          break;
+        case mozIStorageConnection::TRANSACTION_DEFERRED:
+          query.AppendLiteral(" DEFERRED");
+          break;
+        default:
+          MOZ_ASSERT(false, "Unknown transaction type");
+      }
+      // If a transaction is already in progress, this will fail, since Sqlite
+      // doesn't support nested transactions.
+      mHasTransaction = NS_SUCCEEDED(mConnection->ExecuteSimpleSQL(query));
+    }
+  }
+
+  ~mozStorageTransaction()
+  {
+    if (mConnection && mHasTransaction && !mCompleted) {
+      if (mCommitOnComplete) {
+        mozilla::DebugOnly<nsresult> rv = Commit();
+        NS_WARN_IF_FALSE(NS_SUCCEEDED(rv),
+                         "A transaction didn't commit correctly");
+      }
+      else {
+        mozilla::DebugOnly<nsresult> rv = Rollback();
+        NS_WARN_IF_FALSE(NS_SUCCEEDED(rv),
+                         "A transaction didn't rollback correctly");
+      }
+    }
+  }
+
+  /**
+   * Commits the transaction if one is in progress. If one is not in progress,
+   * this is a NOP since the actual owner of the transaction outside of our
+   * scope is in charge of finally committing or rolling back the transaction.
+   */
+  nsresult Commit()
+  {
+    if (!mConnection || mCompleted || !mHasTransaction)
+      return NS_OK;
+    mCompleted = true;
+
+    // TODO (bug 559659): this might fail with SQLITE_BUSY, but we don't handle
+    // it, thus the transaction might stay open until the next COMMIT.
+    nsresult rv;
+    if (mAsyncCommit) {
+      nsCOMPtr<mozIStoragePendingStatement> ps;
+      rv = mConnection->ExecuteSimpleSQLAsync(NS_LITERAL_CSTRING("COMMIT"),
+                                              nullptr, getter_AddRefs(ps));
+    }
+    else {
+      rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING("COMMIT"));
+    }
+
+    if (NS_SUCCEEDED(rv))
+      mHasTransaction = false;
+
+    return rv;
+  }
+
+  /**
+   * Rolls back the transaction if one is in progress. If one is not in progress,
+   * this is a NOP since the actual owner of the transaction outside of our
+   * scope is in charge of finally rolling back the transaction.
+   */
+  nsresult Rollback()
+  {
+    if (!mConnection || mCompleted || !mHasTransaction)
+      return NS_OK;
+    mCompleted = true;
+
+    // TODO (bug 1062823): from Sqlite 3.7.11 on, rollback won't ever return
+    // a busy error, so this handling can be removed.
+    nsresult rv = NS_OK;
+    do {
+      rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING("ROLLBACK"));
+      if (rv == NS_ERROR_STORAGE_BUSY)
+        (void)PR_Sleep(PR_INTERVAL_NO_WAIT);
+    } while (rv == NS_ERROR_STORAGE_BUSY);
+
+    if (NS_SUCCEEDED(rv))
+      mHasTransaction = false;
+
+    return rv;
+  }
+
+protected:
+  nsCOMPtr<mozIStorageConnection> mConnection;
+  bool mHasTransaction;
+  bool mCommitOnComplete;
+  bool mCompleted;
+  bool mAsyncCommit;
+};
+
+/**
+ * This class wraps a statement so that it is guaraneed to be reset when
+ * this object goes out of scope.
+ *
+ * Note that this always just resets the statement. If the statement doesn't
+ * need resetting, the reset operation is inexpensive.
+ */
+class MOZ_STACK_CLASS mozStorageStatementScoper
+{
+public:
+  explicit mozStorageStatementScoper(mozIStorageStatement* aStatement)
+      : mStatement(aStatement)
+  {
+  }
+  ~mozStorageStatementScoper()
+  {
+    if (mStatement)
+      mStatement->Reset();
+  }
+
+  /**
+   * Call this to make the statement not reset. You might do this if you know
+   * that the statement has been reset.
+   */
+  void Abandon()
+  {
+    mStatement = nullptr;
+  }
+
+protected:
+  nsCOMPtr<mozIStorageStatement> mStatement;
+};
+
+// Use this to make queries uniquely identifiable in telemetry
+// statistics, especially PRAGMAs.  We don't include __LINE__ so that
+// queries are stable in the face of source code changes.
+#define MOZ_STORAGE_UNIQUIFY_QUERY_STR "/* " __FILE__ " */ "
+
+#endif /* MOZSTORAGEHELPER_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStoragePrivateHelpers.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStoragePrivateHelpers.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStoragePrivateHelpers.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStoragePrivateHelpers.cpp	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,270 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 "sqlite3.h"
+
+#include "jsfriendapi.h"
+
+#include "nsPrintfCString.h"
+#include "nsString.h"
+#include "nsError.h"
+#include "mozilla/Mutex.h"
+#include "mozilla/CondVar.h"
+#include "nsQueryObject.h"
+#include "nsThreadUtils.h"
+#include "nsJSUtils.h"
+
+#include "Variant.h"
+#include "mozStoragePrivateHelpers.h"
+#include "mozIStorageStatement.h"
+#include "mozIStorageCompletionCallback.h"
+#include "mozIStorageBindingParams.h"
+
+#include "mozilla/Logging.h"
+extern PRLogModuleInfo* gStorageLog;
+
+namespace mozilla {
+namespace storage {
+
+nsresult
+convertResultCode(int aSQLiteResultCode)
+{
+  // Drop off the extended result bits of the result code.
+  int rc = aSQLiteResultCode & 0xFF;
+
+  switch (rc) {
+    case SQLITE_OK:
+    case SQLITE_ROW:
+    case SQLITE_DONE:
+      return NS_OK;
+    case SQLITE_CORRUPT:
+    case SQLITE_NOTADB:
+      return NS_ERROR_FILE_CORRUPTED;
+    case SQLITE_PERM:
+    case SQLITE_CANTOPEN:
+      return NS_ERROR_FILE_ACCESS_DENIED;
+    case SQLITE_BUSY:
+      return NS_ERROR_STORAGE_BUSY;
+    case SQLITE_LOCKED:
+      return NS_ERROR_FILE_IS_LOCKED;
+    case SQLITE_READONLY:
+      return NS_ERROR_FILE_READ_ONLY;
+    case SQLITE_IOERR:
+      return NS_ERROR_STORAGE_IOERR;
+    case SQLITE_FULL:
+    case SQLITE_TOOBIG:
+      return NS_ERROR_FILE_NO_DEVICE_SPACE;
+    case SQLITE_NOMEM:
+      return NS_ERROR_OUT_OF_MEMORY;
+    case SQLITE_MISUSE:
+      return NS_ERROR_UNEXPECTED;
+    case SQLITE_ABORT:
+    case SQLITE_INTERRUPT:
+      return NS_ERROR_ABORT;
+    case SQLITE_CONSTRAINT:
+      return NS_ERROR_STORAGE_CONSTRAINT;
+  }
+
+  // generic error
+#ifdef DEBUG
+  nsAutoCString message;
+  message.AppendLiteral("SQLite returned error code ");
+  message.AppendInt(rc);
+  message.AppendLiteral(" , Storage will convert it to NS_ERROR_FAILURE");
+  NS_WARN_IF_FALSE(rc == SQLITE_ERROR, message.get());
+#endif
+  return NS_ERROR_FAILURE;
+}
+
+void
+checkAndLogStatementPerformance(sqlite3_stmt *aStatement)
+{
+  // Check to see if the query performed sorting operations or not.  If it
+  // did, it may need to be optimized!
+  int count = ::sqlite3_stmt_status(aStatement, SQLITE_STMTSTATUS_SORT, 1);
+  if (count <= 0)
+    return;
+
+  const char *sql = ::sqlite3_sql(aStatement);
+
+  // Check to see if this is marked to not warn
+  if (::strstr(sql, "/* do not warn (bug "))
+    return;
+
+  nsAutoCString message("Suboptimal indexes for the SQL statement ");
+#ifdef MOZ_STORAGE_SORTWARNING_SQL_DUMP
+  message.Append('`');
+  message.Append(sql);
+  message.AppendLiteral("` [");
+  message.AppendInt(count);
+  message.AppendLiteral(" sort operation(s)]");
+#else
+  nsPrintfCString address("0x%p", aStatement);
+  message.Append(address);
+#endif
+  message.AppendLiteral(" (http://mzl.la/1FuID0j).");
+  NS_WARNING(message.get());
+}
+
+nsIVariant *
+convertJSValToVariant(
+  JSContext *aCtx,
+  JS::Value aValue)
+{
+  if (aValue.isInt32())
+    return new IntegerVariant(aValue.toInt32());
+
+  if (aValue.isDouble())
+    return new FloatVariant(aValue.toDouble());
+
+  if (aValue.isString()) {
+    nsAutoJSString value;
+    if (!value.init(aCtx, aValue.toString()))
+        return nullptr;
+    return new TextVariant(value);
+  }
+
+  if (aValue.isBoolean())
+    return new IntegerVariant(aValue.isTrue() ? 1 : 0);
+
+  if (aValue.isNull())
+    return new NullVariant();
+
+  if (aValue.isObject()) {
+    JS::Rooted<JSObject*> obj(aCtx, &aValue.toObject());
+    // We only support Date instances, all others fail.
+    if (!js::DateIsValid(aCtx, obj))
+      return nullptr;
+
+    double msecd = js::DateGetMsecSinceEpoch(aCtx, obj);
+    msecd *= 1000.0;
+    int64_t msec = msecd;
+
+    return new IntegerVariant(msec);
+  }
+
+  return nullptr;
+}
+
+Variant_base *
+convertVariantToStorageVariant(nsIVariant* aVariant)
+{
+  nsRefPtr<Variant_base> variant = do_QueryObject(aVariant);
+  if (variant) {
+    // JS helpers already convert the JS representation to a Storage Variant,
+    // in such a case there's nothing left to do here, so just pass-through.
+    return variant;
+  }
+
+  if (!aVariant)
+    return new NullVariant();
+
+  uint16_t dataType;
+  nsresult rv = aVariant->GetDataType(&dataType);
+  NS_ENSURE_SUCCESS(rv, nullptr);
+
+  switch (dataType) {
+    case nsIDataType::VTYPE_BOOL:
+    case nsIDataType::VTYPE_INT8:
+    case nsIDataType::VTYPE_INT16:
+    case nsIDataType::VTYPE_INT32:
+    case nsIDataType::VTYPE_UINT8:
+    case nsIDataType::VTYPE_UINT16:
+    case nsIDataType::VTYPE_UINT32:
+    case nsIDataType::VTYPE_INT64:
+    case nsIDataType::VTYPE_UINT64: {
+      int64_t v;
+      rv = aVariant->GetAsInt64(&v);
+      NS_ENSURE_SUCCESS(rv, nullptr);
+      return new IntegerVariant(v);
+    }
+    case nsIDataType::VTYPE_FLOAT:
+    case nsIDataType::VTYPE_DOUBLE: {
+      double v;
+      rv = aVariant->GetAsDouble(&v);
+      NS_ENSURE_SUCCESS(rv, nullptr);
+      return new FloatVariant(v);
+    }
+    case nsIDataType::VTYPE_CHAR:
+    case nsIDataType::VTYPE_CHAR_STR:
+    case nsIDataType::VTYPE_STRING_SIZE_IS:
+    case nsIDataType::VTYPE_UTF8STRING:
+    case nsIDataType::VTYPE_CSTRING: {
+      nsCString v;
+      rv = aVariant->GetAsAUTF8String(v);
+      NS_ENSURE_SUCCESS(rv, nullptr);
+      return new UTF8TextVariant(v);
+    }
+    case nsIDataType::VTYPE_WCHAR:
+    case nsIDataType::VTYPE_DOMSTRING:
+    case nsIDataType::VTYPE_WCHAR_STR:
+    case nsIDataType::VTYPE_WSTRING_SIZE_IS:
+    case nsIDataType::VTYPE_ASTRING: {
+      nsString v;
+      rv = aVariant->GetAsAString(v);
+      NS_ENSURE_SUCCESS(rv, nullptr);
+      return new TextVariant(v);
+    }
+    case nsIDataType::VTYPE_ARRAY: {
+      uint16_t type;
+      nsIID iid;
+      uint32_t len;
+      void *rawArray;
+      // Note this copies the array data.
+      rv = aVariant->GetAsArray(&type, &iid, &len, &rawArray);
+      NS_ENSURE_SUCCESS(rv, nullptr);
+      if (type == nsIDataType::VTYPE_UINT8) {
+        std::pair<uint8_t *, int> v(static_cast<uint8_t *>(rawArray), len);
+        // Take ownership of the data avoiding a further copy.
+        return new AdoptedBlobVariant(v);
+      }
+    }
+    case nsIDataType::VTYPE_EMPTY:
+    case nsIDataType::VTYPE_EMPTY_ARRAY:
+    case nsIDataType::VTYPE_VOID:
+      return new NullVariant();
+    case nsIDataType::VTYPE_ID:
+    case nsIDataType::VTYPE_INTERFACE:
+    case nsIDataType::VTYPE_INTERFACE_IS:
+    default:
+      NS_WARNING("Unsupported variant type");
+      return nullptr;
+  }
+
+  return nullptr;
+
+}
+
+namespace {
+class CallbackEvent : public nsRunnable
+{
+public:
+  explicit CallbackEvent(mozIStorageCompletionCallback *aCallback)
+  : mCallback(aCallback)
+  {
+  }
+
+  NS_IMETHOD Run()
+  {
+    (void)mCallback->Complete(NS_OK, nullptr);
+    return NS_OK;
+  }
+private:
+  nsCOMPtr<mozIStorageCompletionCallback> mCallback;
+};
+} // anonymous namespace
+already_AddRefed<nsIRunnable>
+newCompletionEvent(mozIStorageCompletionCallback *aCallback)
+{
+  NS_ASSERTION(aCallback, "Passing a null callback is a no-no!");
+  nsCOMPtr<nsIRunnable> event = new CallbackEvent(aCallback);
+  return event.forget();
+}
+
+
+
+} // namespace storage
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStoragePrivateHelpers.h firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStoragePrivateHelpers.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStoragePrivateHelpers.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStoragePrivateHelpers.h	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,142 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 mozStoragePrivateHelpers_h
+#define mozStoragePrivateHelpers_h
+
+/**
+ * This file contains convenience methods for mozStorage.
+ */
+
+#include "sqlite3.h"
+#include "nsIVariant.h"
+#include "nsError.h"
+#include "nsAutoPtr.h"
+#include "js/TypeDecls.h"
+#include "Variant.h"
+
+class mozIStorageCompletionCallback;
+class nsIRunnable;
+
+namespace mozilla {
+namespace storage {
+
+////////////////////////////////////////////////////////////////////////////////
+//// Macros
+
+#define ENSURE_INDEX_VALUE(aIndex, aCount) \
+  NS_ENSURE_TRUE(aIndex < aCount, NS_ERROR_INVALID_ARG)
+
+////////////////////////////////////////////////////////////////////////////////
+//// Functions
+
+/**
+ * Converts a SQLite return code to an nsresult return code.
+ *
+ * @param aSQLiteResultCode
+ *        The SQLite return code to convert.
+ * @returns the corresponding nsresult code for aSQLiteResultCode.
+ */
+nsresult convertResultCode(int aSQLiteResultCode);
+
+/**
+ * Checks the performance of a SQLite statement and logs a warning with
+ * NS_WARNING.  Currently this only checks the number of sort operations done
+ * on a statement, and if more than zero have been done, the statement can be
+ * made faster with the careful use of an index.
+ *
+ * @param aStatement
+ *        The sqlite3_stmt object to check.
+ */
+void checkAndLogStatementPerformance(sqlite3_stmt *aStatement);
+
+/**
+ * Convert the provided JS::Value into a variant representation if possible.
+ *
+ * @param aCtx
+ *        The JSContext the value is from.
+ * @param aValue
+ *        The JavaScript value to convert.  All primitive types are supported,
+ *        but only Date objects are supported from the Date family.  Date
+ *        objects are coerced to PRTime (nanoseconds since epoch) values.
+ * @return the variant if conversion was successful, nullptr if conversion
+ *         failed.  The caller is responsible for addref'ing if non-null.
+ */
+nsIVariant *convertJSValToVariant(JSContext *aCtx, JS::Value aValue);
+
+/**
+ * Convert a provided nsIVariant implementation to our own thread-safe
+ * refcounting implementation, if needed.
+ *
+ * @param aValue
+ *        The original nsIVariant to be converted.
+ * @return a thread-safe refcounting nsIVariant implementation.
+ */
+Variant_base *convertVariantToStorageVariant(nsIVariant *aVariant);
+
+/**
+ * Obtains an event that will notify a completion callback about completion.
+ *
+ * @param aCallback
+ *        The callback to be notified.
+ * @return an nsIRunnable that can be dispatched to the calling thread.
+ */
+already_AddRefed<nsIRunnable> newCompletionEvent(
+  mozIStorageCompletionCallback *aCallback
+);
+
+/**
+ * Utility method to get a Blob as a string value.  The string expects
+ * the interface exposed by nsAString/nsACString/etc.
+ */
+template<class T, class V>
+nsresult
+DoGetBlobAsString(T* aThis, uint32_t aIndex, V& aValue)
+{
+  typedef typename V::char_type char_type;
+
+  uint32_t size;
+  char_type* blob;
+  nsresult rv =
+    aThis->GetBlob(aIndex, &size, reinterpret_cast<uint8_t**>(&blob));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  aValue.Adopt(blob, size / sizeof(char_type));
+  return NS_OK;
+}
+
+/**
+ * Utility method to bind a string value as a Blob.  The string expects
+ * the interface exposed by nsAString/nsACString/etc.
+ */
+template<class T, class V>
+nsresult
+DoBindStringAsBlobByName(T* aThis, const nsACString& aName, const V& aValue)
+{
+  typedef typename V::char_type char_type;
+  return aThis->BindBlobByName(aName,
+                        reinterpret_cast<const uint8_t*>(aValue.BeginReading()),
+                        aValue.Length() * sizeof(char_type));
+}
+
+/**
+ * Utility method to bind a string value as a Blob.  The string expects
+ * the interface exposed by nsAString/nsACString/etc.
+ */
+template<class T, class V>
+nsresult
+DoBindStringAsBlobByIndex(T* aThis, uint32_t aIndex, const V& aValue)
+{
+  typedef typename V::char_type char_type;
+  return aThis->BindBlobByIndex(aIndex,
+                        reinterpret_cast<const uint8_t*>(aValue.BeginReading()),
+                        aValue.Length() * sizeof(char_type));
+}
+
+} // namespace storage
+} // namespace mozilla
+
+#endif // mozStoragePrivateHelpers_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageResultSet.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageResultSet.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageResultSet.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageResultSet.cpp	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,59 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 "mozStorageRow.h"
+#include "mozStorageResultSet.h"
+
+namespace mozilla {
+namespace storage {
+
+////////////////////////////////////////////////////////////////////////////////
+//// ResultSet
+
+ResultSet::ResultSet()
+: mCurrentIndex(0)
+{
+}
+
+ResultSet::~ResultSet()
+{
+  mData.Clear();
+}
+
+nsresult
+ResultSet::add(mozIStorageRow *aRow)
+{
+  return mData.AppendObject(aRow) ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+}
+
+/**
+ * Note:  This object is only ever accessed on one thread at a time.  It it not
+ *        threadsafe, but it does need threadsafe AddRef and Release.
+ */
+NS_IMPL_ISUPPORTS(
+  ResultSet,
+  mozIStorageResultSet
+)
+
+////////////////////////////////////////////////////////////////////////////////
+//// mozIStorageResultSet
+
+NS_IMETHODIMP
+ResultSet::GetNextRow(mozIStorageRow **_row)
+{
+  NS_ENSURE_ARG_POINTER(_row);
+
+  if (mCurrentIndex >= mData.Count()) {
+    // Just return null here
+    return NS_OK;
+  }
+
+  NS_ADDREF(*_row = mData.ObjectAt(mCurrentIndex++));
+  return NS_OK;
+}
+
+} // namespace storage
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageResultSet.h firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageResultSet.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageResultSet.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageResultSet.h	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 mozStorageResultSet_h
+#define mozStorageResultSet_h
+
+#include "mozIStorageResultSet.h"
+#include "nsCOMArray.h"
+#include "mozilla/Attributes.h"
+class mozIStorageRow;
+
+namespace mozilla {
+namespace storage {
+
+class ResultSet final : public mozIStorageResultSet
+{
+public:
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_MOZISTORAGERESULTSET
+
+  ResultSet();
+
+  /**
+   * Adds a tuple to this result set.
+   */
+  nsresult add(mozIStorageRow *aTuple);
+
+  /**
+   * @returns the number of rows this result set holds.
+   */
+  int32_t rows() const { return mData.Count(); }
+
+private:
+  ~ResultSet();
+
+  /**
+   * Stores the current index of the active result set.
+   */
+  int32_t mCurrentIndex;
+
+  /**
+   * Stores the tuples.
+   */
+  nsCOMArray<mozIStorageRow> mData;
+};
+
+} // namespace storage
+} // namespace mozilla
+
+#endif // mozStorageResultSet_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageRow.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageRow.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageRow.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageRow.cpp	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,247 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 "nsString.h"
+
+#include "sqlite3.h"
+#include "mozStoragePrivateHelpers.h"
+#include "Variant.h"
+#include "mozStorageRow.h"
+
+namespace mozilla {
+namespace storage {
+
+////////////////////////////////////////////////////////////////////////////////
+//// Row
+
+nsresult
+Row::initialize(sqlite3_stmt *aStatement)
+{
+  // Get the number of results
+  mNumCols = ::sqlite3_column_count(aStatement);
+
+  // Start copying over values
+  for (uint32_t i = 0; i < mNumCols; i++) {
+    // Store the value
+    nsIVariant *variant = nullptr;
+    int type = ::sqlite3_column_type(aStatement, i);
+    switch (type) {
+      case SQLITE_INTEGER:
+        variant = new IntegerVariant(::sqlite3_column_int64(aStatement, i));
+        break;
+      case SQLITE_FLOAT:
+        variant = new FloatVariant(::sqlite3_column_double(aStatement, i));
+        break;
+      case SQLITE_TEXT:
+      {
+        nsDependentString str(
+          static_cast<const char16_t *>(::sqlite3_column_text16(aStatement, i))
+        );
+        variant = new TextVariant(str);
+        break;
+      }
+      case SQLITE_NULL:
+        variant = new NullVariant();
+        break;
+      case SQLITE_BLOB:
+      {
+        int size = ::sqlite3_column_bytes(aStatement, i);
+        const void *data = ::sqlite3_column_blob(aStatement, i);
+        variant = new BlobVariant(std::pair<const void *, int>(data, size));
+        break;
+      }
+      default:
+        return NS_ERROR_UNEXPECTED;
+    }
+    NS_ENSURE_TRUE(variant, NS_ERROR_OUT_OF_MEMORY);
+
+    // Insert into our storage array
+    NS_ENSURE_TRUE(mData.InsertObjectAt(variant, i), NS_ERROR_OUT_OF_MEMORY);
+
+    // Associate the name (if any) with the index
+    const char *name = ::sqlite3_column_name(aStatement, i);
+    if (!name) break;
+    nsAutoCString colName(name);
+    mNameHashtable.Put(colName, i);
+  }
+
+  return NS_OK;
+}
+
+/**
+ * Note:  This object is only ever accessed on one thread at a time.  It it not
+ *        threadsafe, but it does need threadsafe AddRef and Release.
+ */
+NS_IMPL_ISUPPORTS(
+  Row,
+  mozIStorageRow,
+  mozIStorageValueArray
+)
+
+////////////////////////////////////////////////////////////////////////////////
+//// mozIStorageRow
+
+NS_IMETHODIMP
+Row::GetResultByIndex(uint32_t aIndex,
+                      nsIVariant **_result)
+{
+  ENSURE_INDEX_VALUE(aIndex, mNumCols);
+  NS_ADDREF(*_result = mData.ObjectAt(aIndex));
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Row::GetResultByName(const nsACString &aName,
+                     nsIVariant **_result)
+{
+  uint32_t index;
+  NS_ENSURE_TRUE(mNameHashtable.Get(aName, &index), NS_ERROR_NOT_AVAILABLE);
+  return GetResultByIndex(index, _result);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// mozIStorageValueArray
+
+NS_IMETHODIMP
+Row::GetNumEntries(uint32_t *_entries)
+{
+  *_entries = mNumCols;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Row::GetTypeOfIndex(uint32_t aIndex,
+                    int32_t *_type)
+{
+  ENSURE_INDEX_VALUE(aIndex, mNumCols);
+
+  uint16_t type;
+  (void)mData.ObjectAt(aIndex)->GetDataType(&type);
+  switch (type) {
+    case nsIDataType::VTYPE_INT32:
+    case nsIDataType::VTYPE_INT64:
+      *_type = mozIStorageValueArray::VALUE_TYPE_INTEGER;
+      break;
+    case nsIDataType::VTYPE_DOUBLE:
+      *_type = mozIStorageValueArray::VALUE_TYPE_FLOAT;
+      break;
+    case nsIDataType::VTYPE_ASTRING:
+      *_type = mozIStorageValueArray::VALUE_TYPE_TEXT;
+      break;
+    case nsIDataType::VTYPE_ARRAY:
+      *_type = mozIStorageValueArray::VALUE_TYPE_BLOB;
+      break;
+    default:
+      *_type = mozIStorageValueArray::VALUE_TYPE_NULL;
+      break;
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Row::GetInt32(uint32_t aIndex,
+              int32_t *_value)
+{
+  ENSURE_INDEX_VALUE(aIndex, mNumCols);
+  return mData.ObjectAt(aIndex)->GetAsInt32(_value);
+}
+
+NS_IMETHODIMP
+Row::GetInt64(uint32_t aIndex,
+              int64_t *_value)
+{
+  ENSURE_INDEX_VALUE(aIndex, mNumCols);
+  return mData.ObjectAt(aIndex)->GetAsInt64(_value);
+}
+
+NS_IMETHODIMP
+Row::GetDouble(uint32_t aIndex,
+               double *_value)
+{
+  ENSURE_INDEX_VALUE(aIndex, mNumCols);
+  return mData.ObjectAt(aIndex)->GetAsDouble(_value);
+}
+
+NS_IMETHODIMP
+Row::GetUTF8String(uint32_t aIndex,
+                   nsACString &_value)
+{
+  ENSURE_INDEX_VALUE(aIndex, mNumCols);
+  return mData.ObjectAt(aIndex)->GetAsAUTF8String(_value);
+}
+
+NS_IMETHODIMP
+Row::GetString(uint32_t aIndex,
+               nsAString &_value)
+{
+  ENSURE_INDEX_VALUE(aIndex, mNumCols);
+  return mData.ObjectAt(aIndex)->GetAsAString(_value);
+}
+
+NS_IMETHODIMP
+Row::GetBlob(uint32_t aIndex,
+             uint32_t *_size,
+             uint8_t **_blob)
+{
+  ENSURE_INDEX_VALUE(aIndex, mNumCols);
+
+  uint16_t type;
+  nsIID interfaceIID;
+  return mData.ObjectAt(aIndex)->GetAsArray(&type, &interfaceIID, _size,
+                                            reinterpret_cast<void **>(_blob));
+}
+
+NS_IMETHODIMP
+Row::GetBlobAsString(uint32_t aIndex, nsAString& aValue)
+{
+  return DoGetBlobAsString(this, aIndex, aValue);
+}
+
+NS_IMETHODIMP
+Row::GetBlobAsUTF8String(uint32_t aIndex, nsACString& aValue)
+{
+  return DoGetBlobAsString(this, aIndex, aValue);
+}
+
+NS_IMETHODIMP
+Row::GetIsNull(uint32_t aIndex,
+               bool *_isNull)
+{
+  ENSURE_INDEX_VALUE(aIndex, mNumCols);
+  NS_ENSURE_ARG_POINTER(_isNull);
+
+  uint16_t type;
+  (void)mData.ObjectAt(aIndex)->GetDataType(&type);
+  *_isNull = type == nsIDataType::VTYPE_EMPTY;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Row::GetSharedUTF8String(uint32_t,
+                         uint32_t *,
+                         char const **)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+Row::GetSharedString(uint32_t,
+                     uint32_t *,
+                     const char16_t **)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+Row::GetSharedBlob(uint32_t,
+                   uint32_t *,
+                   const uint8_t **)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+} // namespace storage
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageRow.h firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageRow.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageRow.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageRow.h	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,58 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 mozStorageRow_h
+#define mozStorageRow_h
+
+#include "mozIStorageRow.h"
+#include "nsCOMArray.h"
+#include "nsDataHashtable.h"
+#include "mozilla/Attributes.h"
+class nsIVariant;
+struct sqlite3_stmt;
+
+namespace mozilla {
+namespace storage {
+
+class Row final : public mozIStorageRow
+{
+public:
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_MOZISTORAGEROW
+  NS_DECL_MOZISTORAGEVALUEARRAY
+
+  /**
+   * Initializes the object with the given statement.  Copies the values from
+   * the statement.
+   *
+   * @param aStatement
+   *        The sqlite statement to pull results from.
+   */
+  nsresult initialize(sqlite3_stmt *aStatement);
+
+private:
+  ~Row() {}
+
+  /**
+   * The number of columns in this tuple.
+   */
+  uint32_t mNumCols;
+
+  /**
+   * Stores the data in the tuple.
+   */
+  nsCOMArray<nsIVariant> mData;
+
+  /**
+   * Maps a given name to a column index.
+   */
+  nsDataHashtable<nsCStringHashKey, uint32_t> mNameHashtable;
+};
+
+} // namespace storage
+} // namespace mozilla
+
+#endif // mozStorageRow_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageService.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageService.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageService.cpp	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,976 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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/Attributes.h"
+#include "mozilla/DebugOnly.h"
+
+#include "mozStorageService.h"
+#include "mozStorageConnection.h"
+#include "prinit.h"
+#include "nsAutoPtr.h"
+#include "nsCollationCID.h"
+#include "nsEmbedCID.h"
+#include "nsThreadUtils.h"
+#include "mozStoragePrivateHelpers.h"
+#include "nsILocale.h"
+#include "nsILocaleService.h"
+#include "nsIXPConnect.h"
+#include "nsIObserverService.h"
+#include "nsIPropertyBag2.h"
+#include "mozilla/Services.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/LateWriteChecks.h"
+#include "mozIStorageCompletionCallback.h"
+#include "mozIStoragePendingStatement.h"
+
+#include "sqlite3.h"
+
+#ifdef SQLITE_OS_WIN
+// "windows.h" was included and it can #define lots of things we care about...
+#undef CompareString
+#endif
+
+#include "nsIPromptService.h"
+
+#ifdef MOZ_STORAGE_MEMORY
+#  include "mozmemory.h"
+#  ifdef MOZ_DMD
+#    include "DMD.h"
+#  endif
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+//// Defines
+
+#define PREF_TS_SYNCHRONOUS "toolkit.storage.synchronous"
+#define PREF_TS_SYNCHRONOUS_DEFAULT 1
+
+#define PREF_TS_PAGESIZE "toolkit.storage.pageSize"
+
+// This value must be kept in sync with the value of SQLITE_DEFAULT_PAGE_SIZE in
+// db/sqlite3/src/Makefile.in.
+#define PREF_TS_PAGESIZE_DEFAULT 32768
+
+namespace mozilla {
+namespace storage {
+
+////////////////////////////////////////////////////////////////////////////////
+//// Memory Reporting
+
+#ifdef MOZ_DMD
+static mozilla::Atomic<size_t> gSqliteMemoryUsed;
+#endif
+
+static int64_t
+StorageSQLiteDistinguishedAmount()
+{
+  return ::sqlite3_memory_used();
+}
+
+/**
+ * Passes a single SQLite memory statistic to a memory reporter callback.
+ *
+ * @param aHandleReport
+ *        The callback.
+ * @param aData
+ *        The data for the callback.
+ * @param aConn
+ *        The SQLite connection.
+ * @param aPathHead
+ *        Head of the path for the memory report.
+ * @param aKind
+ *        The memory report statistic kind, one of "stmt", "cache" or
+ *        "schema".
+ * @param aDesc
+ *        The memory report description.
+ * @param aOption
+ *        The SQLite constant for getting the measurement.
+ * @param aTotal
+ *        The accumulator for the measurement.
+ */
+nsresult
+ReportConn(nsIHandleReportCallback *aHandleReport,
+           nsISupports *aData,
+           Connection *aConn,
+           const nsACString &aPathHead,
+           const nsACString &aKind,
+           const nsACString &aDesc,
+           int32_t aOption,
+           size_t *aTotal)
+{
+  nsCString path(aPathHead);
+  path.Append(aKind);
+  path.AppendLiteral("-used");
+
+  int32_t val = aConn->getSqliteRuntimeStatus(aOption);
+  nsresult rv = aHandleReport->Callback(EmptyCString(), path,
+                                        nsIMemoryReporter::KIND_HEAP,
+                                        nsIMemoryReporter::UNITS_BYTES,
+                                        int64_t(val), aDesc, aData);
+  NS_ENSURE_SUCCESS(rv, rv);
+  *aTotal += val;
+
+  return NS_OK;
+}
+
+// Warning: To get a Connection's measurements requires holding its lock.
+// There may be a delay getting the lock if another thread is accessing the
+// Connection.  This isn't very nice if CollectReports is called from the main
+// thread!  But at the time of writing this function is only called when
+// about:memory is loaded (not, for example, when telemetry pings occur) and
+// any delays in that case aren't so bad.
+NS_IMETHODIMP
+Service::CollectReports(nsIHandleReportCallback *aHandleReport,
+                        nsISupports *aData, bool aAnonymize)
+{
+  nsresult rv;
+  size_t totalConnSize = 0;
+  {
+    nsTArray<nsRefPtr<Connection> > connections;
+    getConnections(connections);
+
+    for (uint32_t i = 0; i < connections.Length(); i++) {
+      nsRefPtr<Connection> &conn = connections[i];
+
+      // Someone may have closed the Connection, in which case we skip it.
+      bool isReady;
+      (void)conn->GetConnectionReady(&isReady);
+      if (!isReady) {
+          continue;
+      }
+
+      nsCString pathHead("explicit/storage/sqlite/");
+      // This filename isn't privacy-sensitive, and so is never anonymized.
+      pathHead.Append(conn->getFilename());
+      pathHead.Append('/');
+
+      SQLiteMutexAutoLock lockedScope(conn->sharedDBMutex);
+
+      NS_NAMED_LITERAL_CSTRING(stmtDesc,
+        "Memory (approximate) used by all prepared statements used by "
+        "connections to this database.");
+      rv = ReportConn(aHandleReport, aData, conn, pathHead,
+                      NS_LITERAL_CSTRING("stmt"), stmtDesc,
+                      SQLITE_DBSTATUS_STMT_USED, &totalConnSize);
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      NS_NAMED_LITERAL_CSTRING(cacheDesc,
+        "Memory (approximate) used by all pager caches used by connections "
+        "to this database.");
+      rv = ReportConn(aHandleReport, aData, conn, pathHead,
+                      NS_LITERAL_CSTRING("cache"), cacheDesc,
+                      SQLITE_DBSTATUS_CACHE_USED, &totalConnSize);
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      NS_NAMED_LITERAL_CSTRING(schemaDesc,
+        "Memory (approximate) used to store the schema for all databases "
+        "associated with connections to this database.");
+      rv = ReportConn(aHandleReport, aData, conn, pathHead,
+                      NS_LITERAL_CSTRING("schema"), schemaDesc,
+                      SQLITE_DBSTATUS_SCHEMA_USED, &totalConnSize);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+
+#ifdef MOZ_DMD
+    if (::sqlite3_memory_used() != int64_t(gSqliteMemoryUsed)) {
+      NS_WARNING("memory consumption reported by SQLite doesn't match "
+                 "our measurements");
+    }
+#endif
+  }
+
+  int64_t other = ::sqlite3_memory_used() - totalConnSize;
+
+  rv = aHandleReport->Callback(
+          EmptyCString(),
+          NS_LITERAL_CSTRING("explicit/storage/sqlite/other"),
+          KIND_HEAP, UNITS_BYTES, other,
+          NS_LITERAL_CSTRING("All unclassified sqlite memory."),
+          aData);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// Service
+
+NS_IMPL_ISUPPORTS(
+  Service,
+  mozIStorageService,
+  nsIObserver,
+  nsIMemoryReporter
+)
+
+Service *Service::gService = nullptr;
+
+Service *
+Service::getSingleton()
+{
+  if (gService) {
+    NS_ADDREF(gService);
+    return gService;
+  }
+
+  // Ensure that we are using the same version of SQLite that we compiled with
+  // or newer.  Our configure check ensures we are using a new enough version
+  // at compile time.
+  if (SQLITE_VERSION_NUMBER > ::sqlite3_libversion_number()) {
+    nsCOMPtr<nsIPromptService> ps(do_GetService(NS_PROMPTSERVICE_CONTRACTID));
+    if (ps) {
+      nsAutoString title, message;
+      title.AppendLiteral("SQLite Version Error");
+      message.AppendLiteral("The application has been updated, but your version "
+                          "of SQLite is too old and the application cannot "
+                          "run.");
+      (void)ps->Alert(nullptr, title.get(), message.get());
+    }
+    ::PR_Abort();
+  }
+
+  // The first reference to the storage service must be obtained on the
+  // main thread.
+  NS_ENSURE_TRUE(NS_IsMainThread(), nullptr);
+  gService = new Service();
+  if (gService) {
+    NS_ADDREF(gService);
+    if (NS_FAILED(gService->initialize()))
+      NS_RELEASE(gService);
+  }
+
+  return gService;
+}
+
+nsIXPConnect *Service::sXPConnect = nullptr;
+
+// static
+already_AddRefed<nsIXPConnect>
+Service::getXPConnect()
+{
+  NS_PRECONDITION(NS_IsMainThread(),
+                  "Must only get XPConnect on the main thread!");
+  NS_PRECONDITION(gService,
+                  "Can not get XPConnect without an instance of our service!");
+
+  // If we've been shutdown, sXPConnect will be null.  To prevent leaks, we do
+  // not cache the service after this point.
+  nsCOMPtr<nsIXPConnect> xpc(sXPConnect);
+  if (!xpc)
+    xpc = do_GetService(nsIXPConnect::GetCID());
+  NS_ASSERTION(xpc, "Could not get XPConnect!");
+  return xpc.forget();
+}
+
+int32_t Service::sSynchronousPref;
+
+// static
+int32_t
+Service::getSynchronousPref()
+{
+  return sSynchronousPref;
+}
+
+int32_t Service::sDefaultPageSize = PREF_TS_PAGESIZE_DEFAULT;
+
+Service::Service()
+: mMutex("Service::mMutex")
+, mSqliteVFS(nullptr)
+, mRegistrationMutex("Service::mRegistrationMutex")
+, mConnections()
+{
+}
+
+Service::~Service()
+{
+  mozilla::UnregisterWeakMemoryReporter(this);
+  mozilla::UnregisterStorageSQLiteDistinguishedAmount();
+
+  int rc = sqlite3_vfs_unregister(mSqliteVFS);
+  if (rc != SQLITE_OK)
+    NS_WARNING("Failed to unregister sqlite vfs wrapper.");
+
+  // Shutdown the sqlite3 API.  Warn if shutdown did not turn out okay, but
+  // there is nothing actionable we can do in that case.
+  rc = ::sqlite3_shutdown();
+  if (rc != SQLITE_OK)
+    NS_WARNING("sqlite3 did not shutdown cleanly.");
+
+  DebugOnly<bool> shutdownObserved = !sXPConnect;
+  NS_ASSERTION(shutdownObserved, "Shutdown was not observed!");
+
+  gService = nullptr;
+  delete mSqliteVFS;
+  mSqliteVFS = nullptr;
+}
+
+void
+Service::registerConnection(Connection *aConnection)
+{
+  mRegistrationMutex.AssertNotCurrentThreadOwns();
+  MutexAutoLock mutex(mRegistrationMutex);
+  (void)mConnections.AppendElement(aConnection);
+}
+
+void
+Service::unregisterConnection(Connection *aConnection)
+{
+  // If this is the last Connection it might be the only thing keeping Service
+  // alive.  So ensure that Service is destroyed only after the Connection is
+  // cleanly unregistered and destroyed.
+  nsRefPtr<Service> kungFuDeathGrip(this);
+  {
+    mRegistrationMutex.AssertNotCurrentThreadOwns();
+    MutexAutoLock mutex(mRegistrationMutex);
+
+    for (uint32_t i = 0 ; i < mConnections.Length(); ++i) {
+      if (mConnections[i] == aConnection) {
+        nsCOMPtr<nsIThread> thread = mConnections[i]->threadOpenedOn;
+
+        // Ensure the connection is released on its opening thread.  Note, we
+        // must use .forget().take() so that we can manually cast to an
+        // unambiguous nsISupports type.
+        NS_ProxyRelease(thread,
+          static_cast<mozIStorageConnection*>(mConnections[i].forget().take()));
+
+        mConnections.RemoveElementAt(i);
+        return;
+      }
+    }
+
+    MOZ_ASSERT_UNREACHABLE("Attempt to unregister unknown storage connection!");
+  }
+}
+
+void
+Service::getConnections(/* inout */ nsTArray<nsRefPtr<Connection> >& aConnections)
+{
+  mRegistrationMutex.AssertNotCurrentThreadOwns();
+  MutexAutoLock mutex(mRegistrationMutex);
+  aConnections.Clear();
+  aConnections.AppendElements(mConnections);
+}
+
+void
+Service::minimizeMemory()
+{
+  nsTArray<nsRefPtr<Connection> > connections;
+  getConnections(connections);
+
+  for (uint32_t i = 0; i < connections.Length(); i++) {
+    nsRefPtr<Connection> conn = connections[i];
+    if (!conn->connectionReady())
+      continue;
+
+    NS_NAMED_LITERAL_CSTRING(shrinkPragma, "PRAGMA shrink_memory");
+    nsCOMPtr<mozIStorageConnection> syncConn = do_QueryInterface(
+      NS_ISUPPORTS_CAST(mozIStorageAsyncConnection*, conn));
+    bool onOpenedThread = false;
+
+    if (!syncConn) {
+      // This is a mozIStorageAsyncConnection, it can only be used on the main
+      // thread, so we can do a straight API call.
+      nsCOMPtr<mozIStoragePendingStatement> ps;
+      DebugOnly<nsresult> rv =
+        conn->ExecuteSimpleSQLAsync(shrinkPragma, nullptr, getter_AddRefs(ps));
+      MOZ_ASSERT(NS_SUCCEEDED(rv), "Should have purged sqlite caches");
+    } else if (NS_SUCCEEDED(conn->threadOpenedOn->IsOnCurrentThread(&onOpenedThread)) &&
+               onOpenedThread) {
+      // We are on the opener thread, so we can just proceed.
+      conn->ExecuteSimpleSQL(shrinkPragma);
+    } else {
+      // We are on the wrong thread, the query should be executed on the
+      // opener thread, so we must dispatch to it.
+      nsCOMPtr<nsIRunnable> event =
+        NS_NewRunnableMethodWithArg<const nsCString>(
+          conn, &Connection::ExecuteSimpleSQL, shrinkPragma);
+      conn->threadOpenedOn->Dispatch(event, NS_DISPATCH_NORMAL);
+    }
+  }
+}
+
+void
+Service::shutdown()
+{
+  NS_IF_RELEASE(sXPConnect);
+}
+
+sqlite3_vfs *ConstructTelemetryVFS();
+
+#ifdef MOZ_STORAGE_MEMORY
+
+namespace {
+
+// By default, SQLite tracks the size of all its heap blocks by adding an extra
+// 8 bytes at the start of the block to hold the size.  Unfortunately, this
+// causes a lot of 2^N-sized allocations to be rounded up by jemalloc
+// allocator, wasting memory.  For example, a request for 1024 bytes has 8
+// bytes added, becoming a request for 1032 bytes, and jemalloc rounds this up
+// to 2048 bytes, wasting 1012 bytes.  (See bug 676189 for more details.)
+//
+// So we register jemalloc as the malloc implementation, which avoids this
+// 8-byte overhead, and thus a lot of waste.  This requires us to provide a
+// function, sqliteMemRoundup(), which computes the actual size that will be
+// allocated for a given request.  SQLite uses this function before all
+// allocations, and may be able to use any excess bytes caused by the rounding.
+//
+// Note: the wrappers for malloc, realloc and moz_malloc_usable_size are
+// necessary because the sqlite_mem_methods type signatures differ slightly
+// from the standard ones -- they use int instead of size_t.  But we don't need
+// a wrapper for free.
+
+#ifdef MOZ_DMD
+
+// sqlite does its own memory accounting, and we use its numbers in our memory
+// reporters.  But we don't want sqlite's heap blocks to show up in DMD's
+// output as unreported, so we mark them as reported when they're allocated and
+// mark them as unreported when they are freed.
+//
+// In other words, we are marking all sqlite heap blocks as reported even
+// though we're not reporting them ourselves.  Instead we're trusting that
+// sqlite is fully and correctly accounting for all of its heap blocks via its
+// own memory accounting.  Well, we don't have to trust it entirely, because
+// it's easy to keep track (while doing this DMD-specific marking) of exactly
+// how much memory SQLite is using.  And we can compare that against what
+// SQLite reports it is using.
+
+MOZ_DEFINE_MALLOC_SIZE_OF_ON_ALLOC(SqliteMallocSizeOfOnAlloc)
+MOZ_DEFINE_MALLOC_SIZE_OF_ON_FREE(SqliteMallocSizeOfOnFree)
+
+#endif
+
+static void *sqliteMemMalloc(int n)
+{
+  void* p = ::malloc(n);
+#ifdef MOZ_DMD
+  gSqliteMemoryUsed += SqliteMallocSizeOfOnAlloc(p);
+#endif
+  return p;
+}
+
+static void sqliteMemFree(void *p)
+{
+#ifdef MOZ_DMD
+  gSqliteMemoryUsed -= SqliteMallocSizeOfOnFree(p);
+#endif
+  ::free(p);
+}
+
+static void *sqliteMemRealloc(void *p, int n)
+{
+#ifdef MOZ_DMD
+  gSqliteMemoryUsed -= SqliteMallocSizeOfOnFree(p);
+  void *pnew = ::realloc(p, n);
+  if (pnew) {
+    gSqliteMemoryUsed += SqliteMallocSizeOfOnAlloc(pnew);
+  } else {
+    // realloc failed;  undo the SqliteMallocSizeOfOnFree from above
+    gSqliteMemoryUsed += SqliteMallocSizeOfOnAlloc(p);
+  }
+  return pnew;
+#else
+  return ::realloc(p, n);
+#endif
+}
+
+static int sqliteMemSize(void *p)
+{
+  return ::moz_malloc_usable_size(p);
+}
+
+static int sqliteMemRoundup(int n)
+{
+  n = malloc_good_size(n);
+
+  // jemalloc can return blocks of size 2 and 4, but SQLite requires that all
+  // allocations be 8-aligned.  So we round up sub-8 requests to 8.  This
+  // wastes a small amount of memory but is obviously safe.
+  return n <= 8 ? 8 : n;
+}
+
+static int sqliteMemInit(void *p)
+{
+  return 0;
+}
+
+static void sqliteMemShutdown(void *p)
+{
+}
+
+const sqlite3_mem_methods memMethods = {
+  &sqliteMemMalloc,
+  &sqliteMemFree,
+  &sqliteMemRealloc,
+  &sqliteMemSize,
+  &sqliteMemRoundup,
+  &sqliteMemInit,
+  &sqliteMemShutdown,
+  nullptr
+};
+
+} // anonymous namespace
+
+#endif  // MOZ_STORAGE_MEMORY
+
+static const char* sObserverTopics[] = {
+  "memory-pressure",
+  "xpcom-shutdown",
+  "xpcom-shutdown-threads"
+};
+
+nsresult
+Service::initialize()
+{
+  MOZ_ASSERT(NS_IsMainThread(), "Must be initialized on the main thread");
+
+  int rc;
+
+#ifdef MOZ_STORAGE_MEMORY
+  rc = ::sqlite3_config(SQLITE_CONFIG_MALLOC, &memMethods);
+  if (rc != SQLITE_OK)
+    return convertResultCode(rc);
+#endif
+
+  // Explicitly initialize sqlite3.  Although this is implicitly called by
+  // various sqlite3 functions (and the sqlite3_open calls in our case),
+  // the documentation suggests calling this directly.  So we do.
+  rc = ::sqlite3_initialize();
+  if (rc != SQLITE_OK)
+    return convertResultCode(rc);
+
+  mSqliteVFS = ConstructTelemetryVFS();
+  if (mSqliteVFS) {
+    rc = sqlite3_vfs_register(mSqliteVFS, 1);
+    if (rc != SQLITE_OK)
+      return convertResultCode(rc);
+  } else {
+    NS_WARNING("Failed to register telemetry VFS");
+  }
+
+  // Register for xpcom-shutdown so we can cleanup after ourselves.  The
+  // observer service can only be used on the main thread.
+  nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
+  NS_ENSURE_TRUE(os, NS_ERROR_FAILURE);
+
+  for (size_t i = 0; i < ArrayLength(sObserverTopics); ++i) {
+    nsresult rv = os->AddObserver(this, sObserverTopics[i], false);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+  }
+
+  // We cache XPConnect for our language helpers.  XPConnect can only be
+  // used on the main thread.
+  (void)CallGetService(nsIXPConnect::GetCID(), &sXPConnect);
+
+  // We need to obtain the toolkit.storage.synchronous preferences on the main
+  // thread because the preference service can only be accessed there.  This
+  // is cached in the service for all future Open[Unshared]Database calls.
+  sSynchronousPref =
+    Preferences::GetInt(PREF_TS_SYNCHRONOUS, PREF_TS_SYNCHRONOUS_DEFAULT);
+
+  // We need to obtain the toolkit.storage.pageSize preferences on the main
+  // thread because the preference service can only be accessed there.  This
+  // is cached in the service for all future Open[Unshared]Database calls.
+  sDefaultPageSize =
+      Preferences::GetInt(PREF_TS_PAGESIZE, PREF_TS_PAGESIZE_DEFAULT);
+
+  mozilla::RegisterWeakMemoryReporter(this);
+  mozilla::RegisterStorageSQLiteDistinguishedAmount(StorageSQLiteDistinguishedAmount);
+
+  return NS_OK;
+}
+
+int
+Service::localeCompareStrings(const nsAString &aStr1,
+                              const nsAString &aStr2,
+                              int32_t aComparisonStrength)
+{
+  // The implementation of nsICollation.CompareString() is platform-dependent.
+  // On Linux it's not thread-safe.  It may not be on Windows and OS X either,
+  // but it's more difficult to tell.  We therefore synchronize this method.
+  MutexAutoLock mutex(mMutex);
+
+  nsICollation *coll = getLocaleCollation();
+  if (!coll) {
+    NS_ERROR("Storage service has no collation");
+    return 0;
+  }
+
+  int32_t res;
+  nsresult rv = coll->CompareString(aComparisonStrength, aStr1, aStr2, &res);
+  if (NS_FAILED(rv)) {
+    NS_ERROR("Collation compare string failed");
+    return 0;
+  }
+
+  return res;
+}
+
+nsICollation *
+Service::getLocaleCollation()
+{
+  mMutex.AssertCurrentThreadOwns();
+
+  if (mLocaleCollation)
+    return mLocaleCollation;
+
+  nsCOMPtr<nsILocaleService> svc(do_GetService(NS_LOCALESERVICE_CONTRACTID));
+  if (!svc) {
+    NS_WARNING("Could not get locale service");
+    return nullptr;
+  }
+
+  nsCOMPtr<nsILocale> appLocale;
+  nsresult rv = svc->GetApplicationLocale(getter_AddRefs(appLocale));
+  if (NS_FAILED(rv)) {
+    NS_WARNING("Could not get application locale");
+    return nullptr;
+  }
+
+  nsCOMPtr<nsICollationFactory> collFact =
+    do_CreateInstance(NS_COLLATIONFACTORY_CONTRACTID);
+  if (!collFact) {
+    NS_WARNING("Could not create collation factory");
+    return nullptr;
+  }
+
+  rv = collFact->CreateCollation(appLocale, getter_AddRefs(mLocaleCollation));
+  if (NS_FAILED(rv)) {
+    NS_WARNING("Could not create collation");
+    return nullptr;
+  }
+
+  return mLocaleCollation;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// mozIStorageService
+
+
+NS_IMETHODIMP
+Service::OpenSpecialDatabase(const char *aStorageKey,
+                             mozIStorageConnection **_connection)
+{
+  nsresult rv;
+
+  nsCOMPtr<nsIFile> storageFile;
+  if (::strcmp(aStorageKey, "memory") == 0) {
+    // just fall through with nullptr storageFile, this will cause the storage
+    // connection to use a memory DB.
+  }
+  else {
+    return NS_ERROR_INVALID_ARG;
+  }
+
+  nsRefPtr<Connection> msc = new Connection(this, SQLITE_OPEN_READWRITE, false);
+
+  rv = storageFile ? msc->initialize(storageFile) : msc->initialize();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  msc.forget(_connection);
+  return NS_OK;
+
+}
+
+namespace {
+
+class AsyncInitDatabase final : public nsRunnable
+{
+public:
+  AsyncInitDatabase(Connection* aConnection,
+                    nsIFile* aStorageFile,
+                    int32_t aGrowthIncrement,
+                    mozIStorageCompletionCallback* aCallback)
+    : mConnection(aConnection)
+    , mStorageFile(aStorageFile)
+    , mGrowthIncrement(aGrowthIncrement)
+    , mCallback(aCallback)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+  }
+
+  NS_IMETHOD Run()
+  {
+    MOZ_ASSERT(!NS_IsMainThread());
+    nsresult rv = mStorageFile ? mConnection->initialize(mStorageFile)
+                               : mConnection->initialize();
+    if (NS_FAILED(rv)) {
+      nsCOMPtr<nsIRunnable> closeRunnable =
+        NS_NewRunnableMethodWithArg<mozIStorageCompletionCallback*>(
+          mConnection.get(),
+          &Connection::AsyncClose,
+          nullptr);
+      MOZ_ASSERT(closeRunnable);
+      MOZ_ALWAYS_TRUE(NS_SUCCEEDED(NS_DispatchToMainThread(closeRunnable)));
+
+      return DispatchResult(rv, nullptr);
+    }
+
+    if (mGrowthIncrement >= 0) {
+      // Ignore errors. In the future, we might wish to log them.
+      (void)mConnection->SetGrowthIncrement(mGrowthIncrement, EmptyCString());
+    }
+
+    return DispatchResult(NS_OK, NS_ISUPPORTS_CAST(mozIStorageAsyncConnection*,
+                          mConnection));
+  }
+
+private:
+  nsresult DispatchResult(nsresult aStatus, nsISupports* aValue) {
+    nsRefPtr<CallbackComplete> event =
+      new CallbackComplete(aStatus,
+                           aValue,
+                           mCallback.forget());
+    return NS_DispatchToMainThread(event);
+  }
+
+  ~AsyncInitDatabase()
+  {
+    nsCOMPtr<nsIThread> thread;
+    DebugOnly<nsresult> rv = NS_GetMainThread(getter_AddRefs(thread));
+    MOZ_ASSERT(NS_SUCCEEDED(rv));
+    (void)NS_ProxyRelease(thread, mStorageFile);
+
+    // Handle ambiguous nsISupports inheritance.
+    Connection *rawConnection = nullptr;
+    mConnection.swap(rawConnection);
+    (void)NS_ProxyRelease(thread, NS_ISUPPORTS_CAST(mozIStorageConnection *,
+                                                    rawConnection));
+
+    // Generally, the callback will be released by CallbackComplete.
+    // However, if for some reason Run() is not executed, we still
+    // need to ensure that it is released here.
+    mozIStorageCompletionCallback *rawCallback = nullptr;
+    mCallback.swap(rawCallback);
+    (void)NS_ProxyRelease(thread, rawCallback);
+  }
+
+  nsRefPtr<Connection> mConnection;
+  nsCOMPtr<nsIFile> mStorageFile;
+  int32_t mGrowthIncrement;
+  nsRefPtr<mozIStorageCompletionCallback> mCallback;
+};
+
+} // anonymous namespace
+
+NS_IMETHODIMP
+Service::OpenAsyncDatabase(nsIVariant *aDatabaseStore,
+                           nsIPropertyBag2 *aOptions,
+                           mozIStorageCompletionCallback *aCallback)
+{
+  if (!NS_IsMainThread()) {
+    return NS_ERROR_NOT_SAME_THREAD;
+  }
+  NS_ENSURE_ARG(aDatabaseStore);
+  NS_ENSURE_ARG(aCallback);
+
+  nsCOMPtr<nsIFile> storageFile;
+  int flags = SQLITE_OPEN_READWRITE;
+
+  nsCOMPtr<nsISupports> dbStore;
+  nsresult rv = aDatabaseStore->GetAsISupports(getter_AddRefs(dbStore));
+  if (NS_SUCCEEDED(rv)) {
+    // Generally, aDatabaseStore holds the database nsIFile.
+    storageFile = do_QueryInterface(dbStore, &rv);
+    if (NS_FAILED(rv)) {
+      return NS_ERROR_INVALID_ARG;
+    }
+
+    rv = storageFile->Clone(getter_AddRefs(storageFile));
+    MOZ_ASSERT(NS_SUCCEEDED(rv));
+
+    // Ensure that SQLITE_OPEN_CREATE is passed in for compatibility reasons.
+    flags |= SQLITE_OPEN_CREATE;
+
+    // Extract and apply the shared-cache option.
+    bool shared = false;
+    if (aOptions) {
+      rv = aOptions->GetPropertyAsBool(NS_LITERAL_STRING("shared"), &shared);
+      if (NS_FAILED(rv) && rv != NS_ERROR_NOT_AVAILABLE) {
+        return NS_ERROR_INVALID_ARG;
+      }
+    }
+    flags |= shared ? SQLITE_OPEN_SHAREDCACHE : SQLITE_OPEN_PRIVATECACHE;
+  } else {
+    // Sometimes, however, it's a special database name.
+    nsAutoCString keyString;
+    rv = aDatabaseStore->GetAsACString(keyString);
+    if (NS_FAILED(rv) || !keyString.EqualsLiteral("memory")) {
+      return NS_ERROR_INVALID_ARG;
+    }
+
+    // Just fall through with nullptr storageFile, this will cause the storage
+    // connection to use a memory DB.
+  }
+
+  int32_t growthIncrement = -1;
+  if (aOptions && storageFile) {
+    rv = aOptions->GetPropertyAsInt32(NS_LITERAL_STRING("growthIncrement"),
+                                      &growthIncrement);
+    if (NS_FAILED(rv) && rv != NS_ERROR_NOT_AVAILABLE) {
+      return NS_ERROR_INVALID_ARG;
+    }
+  }
+
+  // Create connection on this thread, but initialize it on its helper thread.
+  nsRefPtr<Connection> msc = new Connection(this, flags, true);
+  nsCOMPtr<nsIEventTarget> target = msc->getAsyncExecutionTarget();
+  MOZ_ASSERT(target, "Cannot initialize a connection that has been closed already");
+
+  nsRefPtr<AsyncInitDatabase> asyncInit =
+    new AsyncInitDatabase(msc,
+                          storageFile,
+                          growthIncrement,
+                          aCallback);
+  return target->Dispatch(asyncInit, nsIEventTarget::DISPATCH_NORMAL);
+}
+
+NS_IMETHODIMP
+Service::OpenDatabase(nsIFile *aDatabaseFile,
+                      mozIStorageConnection **_connection)
+{
+  NS_ENSURE_ARG(aDatabaseFile);
+
+  // Always ensure that SQLITE_OPEN_CREATE is passed in for compatibility
+  // reasons.
+  int flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_SHAREDCACHE |
+              SQLITE_OPEN_CREATE;
+  nsRefPtr<Connection> msc = new Connection(this, flags, false);
+
+  nsresult rv = msc->initialize(aDatabaseFile);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  msc.forget(_connection);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Service::OpenUnsharedDatabase(nsIFile *aDatabaseFile,
+                              mozIStorageConnection **_connection)
+{
+  NS_ENSURE_ARG(aDatabaseFile);
+
+  // Always ensure that SQLITE_OPEN_CREATE is passed in for compatibility
+  // reasons.
+  int flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_PRIVATECACHE |
+              SQLITE_OPEN_CREATE;
+  nsRefPtr<Connection> msc = new Connection(this, flags, false);
+
+  nsresult rv = msc->initialize(aDatabaseFile);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  msc.forget(_connection);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Service::OpenDatabaseWithFileURL(nsIFileURL *aFileURL,
+                                 mozIStorageConnection **_connection)
+{
+  NS_ENSURE_ARG(aFileURL);
+
+  // Always ensure that SQLITE_OPEN_CREATE is passed in for compatibility
+  // reasons.
+  int flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_SHAREDCACHE |
+              SQLITE_OPEN_CREATE | SQLITE_OPEN_URI;
+  nsRefPtr<Connection> msc = new Connection(this, flags, false);
+
+  nsresult rv = msc->initialize(aFileURL);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  msc.forget(_connection);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Service::BackupDatabaseFile(nsIFile *aDBFile,
+                            const nsAString &aBackupFileName,
+                            nsIFile *aBackupParentDirectory,
+                            nsIFile **backup)
+{
+  nsresult rv;
+  nsCOMPtr<nsIFile> parentDir = aBackupParentDirectory;
+  if (!parentDir) {
+    // This argument is optional, and defaults to the same parent directory
+    // as the current file.
+    rv = aDBFile->GetParent(getter_AddRefs(parentDir));
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  nsCOMPtr<nsIFile> backupDB;
+  rv = parentDir->Clone(getter_AddRefs(backupDB));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = backupDB->Append(aBackupFileName);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = backupDB->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0600);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsAutoString fileName;
+  rv = backupDB->GetLeafName(fileName);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = backupDB->Remove(false);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  backupDB.forget(backup);
+
+  return aDBFile->CopyTo(parentDir, fileName);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// nsIObserver
+
+NS_IMETHODIMP
+Service::Observe(nsISupports *, const char *aTopic, const char16_t *)
+{
+  if (strcmp(aTopic, "memory-pressure") == 0) {
+    minimizeMemory();
+  } else if (strcmp(aTopic, "xpcom-shutdown") == 0) {
+    shutdown();
+  } else if (strcmp(aTopic, "xpcom-shutdown-threads") == 0) {
+    nsCOMPtr<nsIObserverService> os =
+      mozilla::services::GetObserverService();
+
+    for (size_t i = 0; i < ArrayLength(sObserverTopics); ++i) {
+      (void)os->RemoveObserver(this, sObserverTopics[i]);
+    }
+
+    bool anyOpen = false;
+    do {
+      nsTArray<nsRefPtr<Connection> > connections;
+      getConnections(connections);
+      anyOpen = false;
+      for (uint32_t i = 0; i < connections.Length(); i++) {
+        nsRefPtr<Connection> &conn = connections[i];
+        if (conn->isClosing()) {
+          anyOpen = true;
+          break;
+        }
+      }
+      if (anyOpen) {
+        nsCOMPtr<nsIThread> thread = do_GetCurrentThread();
+        NS_ProcessNextEvent(thread);
+      }
+    } while (anyOpen);
+
+    if (gShutdownChecks == SCM_CRASH) {
+      nsTArray<nsRefPtr<Connection> > connections;
+      getConnections(connections);
+      for (uint32_t i = 0, n = connections.Length(); i < n; i++) {
+        if (!connections[i]->isClosed()) {
+          MOZ_CRASH();
+        }
+      }
+    }
+  }
+
+  return NS_OK;
+}
+
+} // namespace storage
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageService.h firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageService.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageService.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageService.h	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,197 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 MOZSTORAGESERVICE_H
+#define MOZSTORAGESERVICE_H
+
+#include "nsCOMPtr.h"
+#include "nsICollation.h"
+#include "nsIFile.h"
+#include "nsIMemoryReporter.h"
+#include "nsIObserver.h"
+#include "nsTArray.h"
+#include "mozilla/Mutex.h"
+
+#include "mozIStorageService.h"
+
+class nsIMemoryReporter;
+class nsIXPConnect;
+struct sqlite3_vfs;
+
+namespace mozilla {
+namespace storage {
+
+class Connection;
+class Service : public mozIStorageService
+              , public nsIObserver
+              , public nsIMemoryReporter
+{
+public:
+  /**
+   * Initializes the service.  This must be called before any other function!
+   */
+  nsresult initialize();
+
+  /**
+   * Compares two strings using the Service's locale-aware collation.
+   *
+   * @param  aStr1
+   *         The string to be compared against aStr2.
+   * @param  aStr2
+   *         The string to be compared against aStr1.
+   * @param  aComparisonStrength
+   *         The sorting strength, one of the nsICollation constants.
+   * @return aStr1 - aStr2.  That is, if aStr1 < aStr2, returns a negative
+   *         number.  If aStr1 > aStr2, returns a positive number.  If
+   *         aStr1 == aStr2, returns 0.
+   */
+  int localeCompareStrings(const nsAString &aStr1,
+                           const nsAString &aStr2,
+                           int32_t aComparisonStrength);
+
+  static Service *getSingleton();
+
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_MOZISTORAGESERVICE
+  NS_DECL_NSIOBSERVER
+  NS_DECL_NSIMEMORYREPORTER
+
+  /**
+   * Obtains an already AddRefed pointer to XPConnect.  This is used by
+   * language helpers.
+   */
+  static already_AddRefed<nsIXPConnect> getXPConnect();
+
+  /**
+   * Obtains the cached data for the toolkit.storage.synchronous preference.
+   */
+  static int32_t getSynchronousPref();
+
+  /**
+   * Obtains the default page size for this platform. The default value is
+   * specified in the SQLite makefile (SQLITE_DEFAULT_PAGE_SIZE) but it may be
+   * overriden with the PREF_TS_PAGESIZE hidden preference.
+   */
+  static int32_t getDefaultPageSize()
+  {
+    return sDefaultPageSize;
+  }
+
+  /**
+   * Returns a boolean value indicating whether or not the given page size is
+   * valid (currently understood as a power of 2 between 512 and 65536).
+   */
+  static bool pageSizeIsValid(int32_t aPageSize)
+  {
+    return aPageSize == 512 || aPageSize == 1024 || aPageSize == 2048 ||
+           aPageSize == 4096 || aPageSize == 8192 || aPageSize == 16384 ||
+           aPageSize == 32768 || aPageSize == 65536;
+  }
+
+  /**
+   * Registers the connection with the storage service.  Connections are
+   * registered so they can be iterated over.
+   *
+   * @pre mRegistrationMutex is not held
+   *
+   * @param  aConnection
+   *         The connection to register.
+   */
+  void registerConnection(Connection *aConnection);
+
+  /**
+   * Unregisters the connection with the storage service.
+   *
+   * @pre mRegistrationMutex is not held
+   *
+   * @param  aConnection
+   *         The connection to unregister.
+   */
+  void unregisterConnection(Connection *aConnection);
+
+  /**
+   * Gets the list of open connections.  Note that you must test each
+   * connection with mozIStorageConnection::connectionReady before doing
+   * anything with it, and skip it if it's not ready.
+   *
+   * @pre mRegistrationMutex is not held
+   *
+   * @param  aConnections
+   *         An inout param;  it is cleared and the connections are appended to
+   *         it.
+   * @return The open connections.
+   */
+  void getConnections(nsTArray<nsRefPtr<Connection> >& aConnections);
+
+private:
+  Service();
+  virtual ~Service();
+
+  /**
+   * Used for 1) locking around calls when initializing connections so that we
+   * can ensure that the state of sqlite3_enable_shared_cache is sane and 2)
+   * synchronizing access to mLocaleCollation.
+   */
+  Mutex mMutex;
+  
+  sqlite3_vfs *mSqliteVFS;
+
+  /**
+   * Protects mConnections.
+   */
+  Mutex mRegistrationMutex;
+
+  /**
+   * The list of connections we have created.  Modifications to it are
+   * protected by |mRegistrationMutex|.
+   */
+  nsTArray<nsRefPtr<Connection> > mConnections;
+
+  /**
+   * Frees as much heap memory as possible from all of the known open
+   * connections.
+   */
+  void minimizeMemory();
+
+  /**
+   * Shuts down the storage service, freeing all of the acquired resources.
+   */
+  void shutdown();
+
+  /**
+   * Lazily creates and returns a collation created from the application's
+   * locale that all statements of all Connections of this Service may use.
+   * Since the collation's lifetime is that of the Service and no statement may
+   * execute outside the lifetime of the Service, this method returns a raw
+   * pointer.
+   */
+  nsICollation *getLocaleCollation();
+
+  /**
+   * Lazily created collation that all statements of all Connections of this
+   * Service may use.  The collation is created from the application's locale.
+   *
+   * @note Collation implementations are platform-dependent and in general not
+   *       thread-safe.  Access to this collation should be synchronized.
+   */
+  nsCOMPtr<nsICollation> mLocaleCollation;
+
+  nsCOMPtr<nsIFile> mProfileStorageFile;
+
+  nsCOMPtr<nsIMemoryReporter> mStorageSQLiteReporter;
+
+  static Service *gService;
+
+  static nsIXPConnect *sXPConnect;
+
+  static int32_t sSynchronousPref;
+  static int32_t sDefaultPageSize;
+};
+
+} // namespace storage
+} // namespace mozilla
+
+#endif /* MOZSTORAGESERVICE_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageSQLFunctions.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageSQLFunctions.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageSQLFunctions.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageSQLFunctions.cpp	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,452 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 "mozStorageSQLFunctions.h"
+#include "nsUnicharUtils.h"
+#include <algorithm>
+
+namespace mozilla {
+namespace storage {
+
+////////////////////////////////////////////////////////////////////////////////
+//// Local Helper Functions
+
+namespace {
+
+/**
+ * Performs the LIKE comparison of a string against a pattern.  For more detail
+ * see http://www.sqlite.org/lang_expr.html#like.
+ *
+ * @param aPatternItr
+ *        An iterator at the start of the pattern to check for.
+ * @param aPatternEnd
+ *        An iterator at the end of the pattern to check for.
+ * @param aStringItr
+ *        An iterator at the start of the string to check for the pattern.
+ * @param aStringEnd
+ *        An iterator at the end of the string to check for the pattern.
+ * @param aEscapeChar
+ *        The character to use for escaping symbols in the pattern.
+ * @return 1 if the pattern is found, 0 otherwise.
+ */
+int
+likeCompare(nsAString::const_iterator aPatternItr,
+            nsAString::const_iterator aPatternEnd,
+            nsAString::const_iterator aStringItr,
+            nsAString::const_iterator aStringEnd,
+            char16_t aEscapeChar)
+{
+  const char16_t MATCH_ALL('%');
+  const char16_t MATCH_ONE('_');
+
+  bool lastWasEscape = false;
+  while (aPatternItr != aPatternEnd) {
+    /**
+     * What we do in here is take a look at each character from the input
+     * pattern, and do something with it.  There are 4 possibilities:
+     * 1) character is an un-escaped match-all character
+     * 2) character is an un-escaped match-one character
+     * 3) character is an un-escaped escape character
+     * 4) character is not any of the above
+     */
+    if (!lastWasEscape && *aPatternItr == MATCH_ALL) {
+      // CASE 1
+      /**
+       * Now we need to skip any MATCH_ALL or MATCH_ONE characters that follow a
+       * MATCH_ALL character.  For each MATCH_ONE character, skip one character
+       * in the pattern string.
+       */
+      while (*aPatternItr == MATCH_ALL || *aPatternItr == MATCH_ONE) {
+        if (*aPatternItr == MATCH_ONE) {
+          // If we've hit the end of the string we are testing, no match
+          if (aStringItr == aStringEnd)
+            return 0;
+          aStringItr++;
+        }
+        aPatternItr++;
+      }
+
+      // If we've hit the end of the pattern string, match
+      if (aPatternItr == aPatternEnd)
+        return 1;
+
+      while (aStringItr != aStringEnd) {
+        if (likeCompare(aPatternItr, aPatternEnd, aStringItr, aStringEnd,
+                        aEscapeChar)) {
+          // we've hit a match, so indicate this
+          return 1;
+        }
+        aStringItr++;
+      }
+
+      // No match
+      return 0;
+    }
+    else if (!lastWasEscape && *aPatternItr == MATCH_ONE) {
+      // CASE 2
+      if (aStringItr == aStringEnd) {
+        // If we've hit the end of the string we are testing, no match
+        return 0;
+      }
+      aStringItr++;
+      lastWasEscape = false;
+    }
+    else if (!lastWasEscape && *aPatternItr == aEscapeChar) {
+      // CASE 3
+      lastWasEscape = true;
+    }
+    else {
+      // CASE 4
+      if (::ToUpperCase(*aStringItr) != ::ToUpperCase(*aPatternItr)) {
+        // If we've hit a point where the strings don't match, there is no match
+        return 0;
+      }
+      aStringItr++;
+      lastWasEscape = false;
+    }
+
+    aPatternItr++;
+  }
+
+  return aStringItr == aStringEnd;
+}
+
+/**
+ * This class manages a dynamic array.  It can represent an array of any 
+ * reasonable size, but if the array is "N" elements or smaller, it will be
+ * stored using fixed space inside the auto array itself.  If the auto array
+ * is a local variable, this internal storage will be allocated cheaply on the
+ * stack, similar to nsAutoString.  If a larger size is requested, the memory
+ * will be dynamically allocated from the heap.  Since the destructor will
+ * free any heap-allocated memory, client code doesn't need to care where the
+ * memory came from.
+ */
+template <class T, size_t N> class AutoArray
+{
+
+public:
+
+  explicit AutoArray(size_t size)
+  : mBuffer(size <= N ? mAutoBuffer : new T[size])
+  {
+  }
+
+  ~AutoArray()
+  { 
+    if (mBuffer != mAutoBuffer)
+      delete[] mBuffer; 
+  }
+
+  /**
+   * Return the pointer to the allocated array.
+   * @note If the array allocation failed, get() will return nullptr!
+   *
+   * @return the pointer to the allocated array
+   */
+  T *get() 
+  {
+    return mBuffer; 
+  }
+
+private:
+  T *mBuffer;           // Points to mAutoBuffer if we can use it, heap otherwise.
+  T mAutoBuffer[N];     // The internal memory buffer that we use if we can.
+};
+
+/**
+ * Compute the Levenshtein Edit Distance between two strings.
+ * 
+ * @param aStringS
+ *        a string
+ * @param aStringT
+ *        another string
+ * @param _result
+ *        an outparam that will receive the edit distance between the arguments
+ * @return a Sqlite result code, e.g. SQLITE_OK, SQLITE_NOMEM, etc.
+ */
+int
+levenshteinDistance(const nsAString &aStringS,
+                    const nsAString &aStringT,
+                    int *_result)
+{
+    // Set the result to a non-sensical value in case we encounter an error.
+    *_result = -1;
+
+    const uint32_t sLen = aStringS.Length();
+    const uint32_t tLen = aStringT.Length();
+
+    if (sLen == 0) {
+      *_result = tLen;
+      return SQLITE_OK;
+    }
+    if (tLen == 0) {
+      *_result = sLen;
+      return SQLITE_OK;
+    }
+
+    // Notionally, Levenshtein Distance is computed in a matrix.  If we 
+    // assume s = "span" and t = "spam", the matrix would look like this:
+    //    s -->
+    //  t          s   p   a   n
+    //  |      0   1   2   3   4
+    //  V  s   1   *   *   *   *
+    //     p   2   *   *   *   *
+    //     a   3   *   *   *   *
+    //     m   4   *   *   *   *
+    //
+    // Note that the row width is sLen + 1 and the column height is tLen + 1,
+    // where sLen is the length of the string "s" and tLen is the length of "t".
+    // The first row and the first column are initialized as shown, and
+    // the algorithm computes the remaining cells row-by-row, and
+    // left-to-right within each row.  The computation only requires that
+    // we be able to see the current row and the previous one.
+
+    // Allocate memory for two rows.  Use AutoArray's to manage the memory
+    // so we don't have to explicitly free it, and so we can avoid the expense
+    // of memory allocations for relatively small strings.
+    AutoArray<int, nsAutoString::kDefaultStorageSize> row1(sLen + 1);
+    AutoArray<int, nsAutoString::kDefaultStorageSize> row2(sLen + 1);
+
+    // Declare the raw pointers that will actually be used to access the memory.
+    int *prevRow = row1.get();
+    NS_ENSURE_TRUE(prevRow, SQLITE_NOMEM);
+    int *currRow = row2.get();
+    NS_ENSURE_TRUE(currRow, SQLITE_NOMEM);
+
+    // Initialize the first row.
+    for (uint32_t i = 0; i <= sLen; i++)
+        prevRow[i] = i;
+
+    const char16_t *s = aStringS.BeginReading();
+    const char16_t *t = aStringT.BeginReading();
+
+    // Compute the empty cells in the "matrix" row-by-row, starting with
+    // the second row.
+    for (uint32_t ti = 1; ti <= tLen; ti++) {
+
+        // Initialize the first cell in this row.
+        currRow[0] = ti;
+
+        // Get the character from "t" that corresponds to this row.
+        const char16_t tch = t[ti - 1];
+
+        // Compute the remaining cells in this row, left-to-right,
+        // starting at the second column (and first character of "s").
+        for (uint32_t si = 1; si <= sLen; si++) {
+            
+            // Get the character from "s" that corresponds to this column,
+            // compare it to the t-character, and compute the "cost".
+            const char16_t sch = s[si - 1];
+            int cost = (sch == tch) ? 0 : 1;
+
+            // ............ We want to calculate the value of cell "d" from
+            // ...ab....... the previously calculated (or initialized) cells
+            // ...cd....... "a", "b", and "c", where d = min(a', b', c').
+            // ............ 
+            int aPrime = prevRow[si - 1] + cost;
+            int bPrime = prevRow[si] + 1;
+            int cPrime = currRow[si - 1] + 1;
+            currRow[si] = std::min(aPrime, std::min(bPrime, cPrime));
+        }
+
+        // Advance to the next row.  The current row becomes the previous
+        // row and we recycle the old previous row as the new current row.
+        // We don't need to re-initialize the new current row since we will
+        // rewrite all of its cells anyway.
+        int *oldPrevRow = prevRow;
+        prevRow = currRow;
+        currRow = oldPrevRow;
+    }
+
+    // The final result is the value of the last cell in the last row.
+    // Note that that's now in the "previous" row, since we just swapped them.
+    *_result = prevRow[sLen];
+    return SQLITE_OK;
+}
+
+// This struct is used only by registerFunctions below, but ISO C++98 forbids
+// instantiating a template dependent on a locally-defined type.  Boo-urns!
+struct Functions {
+  const char *zName;
+  int nArg;
+  int enc;
+  void *pContext;
+  void (*xFunc)(::sqlite3_context*, int, sqlite3_value**);
+};
+
+} // anonymous namespace
+
+////////////////////////////////////////////////////////////////////////////////
+//// Exposed Functions
+
+int
+registerFunctions(sqlite3 *aDB)
+{
+  Functions functions[] = {
+    {"lower",               
+      1, 
+      SQLITE_UTF16, 
+      0,        
+      caseFunction},
+    {"lower",               
+      1, 
+      SQLITE_UTF8,  
+      0,        
+      caseFunction},
+    {"upper",               
+      1, 
+      SQLITE_UTF16, 
+      (void*)1, 
+      caseFunction},
+    {"upper",               
+      1, 
+      SQLITE_UTF8,  
+      (void*)1, 
+      caseFunction},
+
+    {"like",                
+      2, 
+      SQLITE_UTF16, 
+      0,        
+      likeFunction},
+    {"like",                
+      2, 
+      SQLITE_UTF8,  
+      0,        
+      likeFunction},
+    {"like",                
+      3, 
+      SQLITE_UTF16, 
+      0,        
+      likeFunction},
+    {"like",                
+      3, 
+      SQLITE_UTF8,  
+      0,        
+      likeFunction},
+
+    {"levenshteinDistance", 
+      2, 
+      SQLITE_UTF16, 
+      0,        
+      levenshteinDistanceFunction},
+    {"levenshteinDistance", 
+      2, 
+      SQLITE_UTF8,  
+      0,        
+      levenshteinDistanceFunction},
+  };
+
+  int rv = SQLITE_OK;
+  for (size_t i = 0; SQLITE_OK == rv && i < ArrayLength(functions); ++i) {
+    struct Functions *p = &functions[i];
+    rv = ::sqlite3_create_function(aDB, p->zName, p->nArg, p->enc, p->pContext,
+                                   p->xFunc, nullptr, nullptr);
+  }
+
+  return rv;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// SQL Functions
+
+void
+caseFunction(sqlite3_context *aCtx,
+             int aArgc,
+             sqlite3_value **aArgv)
+{
+  NS_ASSERTION(1 == aArgc, "Invalid number of arguments!");
+
+  nsAutoString data(static_cast<const char16_t *>(::sqlite3_value_text16(aArgv[0])));
+  bool toUpper = ::sqlite3_user_data(aCtx) ? true : false;
+
+  if (toUpper)
+    ::ToUpperCase(data);
+  else
+    ::ToLowerCase(data);
+
+  // Set the result.
+  ::sqlite3_result_text16(aCtx, data.get(), -1, SQLITE_TRANSIENT);
+}
+
+/**
+ * This implements the like() SQL function.  This is used by the LIKE operator.
+ * The SQL statement 'A LIKE B' is implemented as 'like(B, A)', and if there is
+ * an escape character, say E, it is implemented as 'like(B, A, E)'.
+ */
+void
+likeFunction(sqlite3_context *aCtx,
+             int aArgc,
+             sqlite3_value **aArgv)
+{
+  NS_ASSERTION(2 == aArgc || 3 == aArgc, "Invalid number of arguments!");
+
+  if (::sqlite3_value_bytes(aArgv[0]) > SQLITE_MAX_LIKE_PATTERN_LENGTH) {
+    ::sqlite3_result_error(aCtx, "LIKE or GLOB pattern too complex",
+                           SQLITE_TOOBIG);
+    return;
+  }
+
+  if (!::sqlite3_value_text16(aArgv[0]) || !::sqlite3_value_text16(aArgv[1]))
+    return;
+
+  nsDependentString A(static_cast<const char16_t *>(::sqlite3_value_text16(aArgv[1])));
+  nsDependentString B(static_cast<const char16_t *>(::sqlite3_value_text16(aArgv[0])));
+  NS_ASSERTION(!B.IsEmpty(), "LIKE string must not be null!");
+
+  char16_t E = 0;
+  if (3 == aArgc)
+    E = static_cast<const char16_t *>(::sqlite3_value_text16(aArgv[2]))[0];
+
+  nsAString::const_iterator itrString, endString;
+  A.BeginReading(itrString);
+  A.EndReading(endString);
+  nsAString::const_iterator itrPattern, endPattern;
+  B.BeginReading(itrPattern);
+  B.EndReading(endPattern);
+  ::sqlite3_result_int(aCtx, likeCompare(itrPattern, endPattern, itrString,
+                                         endString, E));
+}
+
+void levenshteinDistanceFunction(sqlite3_context *aCtx,
+                                 int aArgc,
+                                 sqlite3_value **aArgv)
+{
+  NS_ASSERTION(2 == aArgc, "Invalid number of arguments!");
+
+  // If either argument is a SQL NULL, then return SQL NULL.
+  if (::sqlite3_value_type(aArgv[0]) == SQLITE_NULL ||
+      ::sqlite3_value_type(aArgv[1]) == SQLITE_NULL) {
+    ::sqlite3_result_null(aCtx);
+    return;
+  }
+
+  int aLen = ::sqlite3_value_bytes16(aArgv[0]) / sizeof(char16_t);
+  const char16_t *a = static_cast<const char16_t *>(::sqlite3_value_text16(aArgv[0]));
+
+  int bLen = ::sqlite3_value_bytes16(aArgv[1]) / sizeof(char16_t);
+  const char16_t *b = static_cast<const char16_t *>(::sqlite3_value_text16(aArgv[1]));
+
+  // Compute the Levenshtein Distance, and return the result (or error).
+  int distance = -1;
+  const nsDependentString A(a, aLen);
+  const nsDependentString B(b, bLen);
+  int status = levenshteinDistance(A, B, &distance);
+  if (status == SQLITE_OK) {
+    ::sqlite3_result_int(aCtx, distance);    
+  }
+  else if (status == SQLITE_NOMEM) {
+    ::sqlite3_result_error_nomem(aCtx);
+  }
+  else {
+    ::sqlite3_result_error(aCtx, "User function returned error code", -1);
+  }
+}
+
+} // namespace storage
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageSQLFunctions.h firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageSQLFunctions.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageSQLFunctions.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageSQLFunctions.h	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,76 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 mozStorageSQLFunctions_h
+#define mozStorageSQLFunctions_h
+
+#include "sqlite3.h"
+#include "nscore.h"
+
+namespace mozilla {
+namespace storage {
+
+/**
+ * Registers the functions declared here with the specified database.
+ *
+ * @param aDB
+ *        The database we'll be registering the functions with.
+ * @return the SQLite status code indicating success or failure.
+ */
+int registerFunctions(sqlite3 *aDB);
+
+////////////////////////////////////////////////////////////////////////////////
+//// Predefined Functions
+
+/**
+ * Overridden function to perform the SQL functions UPPER and LOWER.  These
+ * support unicode, which the default implementations do not do.
+ *
+ * @param aCtx
+ *        The sqlite_context that this function is being called on.
+ * @param aArgc
+ *        The number of arguments the function is being called with.
+ * @param aArgv
+ *        An array of the arguments the functions is being called with.
+ */
+void caseFunction(sqlite3_context *aCtx,
+                              int aArgc,
+                              sqlite3_value **aArgv);
+
+/**
+ * Overridden function to perform the SQL function LIKE.  This supports unicode,
+ * which the default implementation does not do.
+ *
+ * @param aCtx
+ *        The sqlite_context that this function is being called on.
+ * @param aArgc
+ *        The number of arguments the function is being called with.
+ * @param aArgv
+ *        An array of the arguments the functions is being called with.
+ */
+void likeFunction(sqlite3_context *aCtx,
+                              int aArgc,
+                              sqlite3_value **aArgv);
+
+/**
+ * An implementation of the Levenshtein Edit Distance algorithm for use in
+ * Sqlite queries.
+ * 
+ * @param aCtx
+ *        The sqlite_context that this function is being called on.
+ * @param aArgc
+ *        The number of arguments the function is being called with.
+ * @param aArgv
+ *        An array of the arguments the functions is being called with.
+ */
+void levenshteinDistanceFunction(sqlite3_context *aCtx,
+                                             int aArgc,
+                                             sqlite3_value **aArgv);
+
+} // namespace storage
+} // namespace mozilla
+
+#endif // mozStorageSQLFunctions_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageStatement.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageStatement.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageStatement.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageStatement.cpp	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,901 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 <limits.h>
+#include <stdio.h>
+
+#include "nsError.h"
+#include "nsMemory.h"
+#include "nsThreadUtils.h"
+#include "nsIClassInfoImpl.h"
+#include "Variant.h"
+
+#include "mozIStorageError.h"
+
+#include "mozStorageBindingParams.h"
+#include "mozStorageConnection.h"
+#include "mozStorageStatementJSHelper.h"
+#include "mozStoragePrivateHelpers.h"
+#include "mozStorageStatementParams.h"
+#include "mozStorageStatementRow.h"
+#include "mozStorageStatement.h"
+#include "GeckoProfiler.h"
+#include "nsDOMClassInfo.h"
+
+#include "mozilla/Logging.h"
+
+
+extern PRLogModuleInfo* gStorageLog;
+
+namespace mozilla {
+namespace storage {
+
+////////////////////////////////////////////////////////////////////////////////
+//// nsIClassInfo
+
+NS_IMPL_CI_INTERFACE_GETTER(Statement,
+                            mozIStorageStatement,
+                            mozIStorageBaseStatement,
+                            mozIStorageBindingParams,
+                            mozIStorageValueArray,
+                            mozilla::storage::StorageBaseStatementInternal)
+
+class StatementClassInfo : public nsIClassInfo
+{
+public:
+  MOZ_CONSTEXPR StatementClassInfo() {}
+
+  NS_DECL_ISUPPORTS_INHERITED
+
+  NS_IMETHODIMP
+  GetInterfaces(uint32_t *_count, nsIID ***_array) override
+  {
+    return NS_CI_INTERFACE_GETTER_NAME(Statement)(_count, _array);
+  }
+
+  NS_IMETHODIMP
+  GetScriptableHelper(nsIXPCScriptable **_helper) override
+  {
+    static StatementJSHelper sJSHelper;
+    *_helper = &sJSHelper;
+    return NS_OK;
+  }
+
+  NS_IMETHODIMP
+  GetContractID(char **_contractID) override
+  {
+    *_contractID = nullptr;
+    return NS_OK;
+  }
+
+  NS_IMETHODIMP
+  GetClassDescription(char **_desc) override
+  {
+    *_desc = nullptr;
+    return NS_OK;
+  }
+
+  NS_IMETHODIMP
+  GetClassID(nsCID **_id) override
+  {
+    *_id = nullptr;
+    return NS_OK;
+  }
+
+  NS_IMETHODIMP
+  GetFlags(uint32_t *_flags) override
+  {
+    *_flags = 0;
+    return NS_OK;
+  }
+
+  NS_IMETHODIMP
+  GetClassIDNoAlloc(nsCID *_cid) override
+  {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+};
+
+NS_IMETHODIMP_(MozExternalRefCountType) StatementClassInfo::AddRef() { return 2; }
+NS_IMETHODIMP_(MozExternalRefCountType) StatementClassInfo::Release() { return 1; }
+NS_IMPL_QUERY_INTERFACE(StatementClassInfo, nsIClassInfo)
+
+static StatementClassInfo sStatementClassInfo;
+
+////////////////////////////////////////////////////////////////////////////////
+//// Statement
+
+Statement::Statement()
+: StorageBaseStatementInternal()
+, mDBStatement(nullptr)
+, mColumnNames()
+, mExecuting(false)
+{
+}
+
+nsresult
+Statement::initialize(Connection *aDBConnection,
+                      sqlite3 *aNativeConnection,
+                      const nsACString &aSQLStatement)
+{
+  MOZ_ASSERT(aDBConnection, "No database connection given!");
+  MOZ_ASSERT(!aDBConnection->isClosed(), "Database connection should be valid");
+  MOZ_ASSERT(!mDBStatement, "Statement already initialized!");
+  MOZ_ASSERT(aNativeConnection, "No native connection given!");
+
+  int srv = aDBConnection->prepareStatement(aNativeConnection,
+                                            PromiseFlatCString(aSQLStatement),
+                                            &mDBStatement);
+  if (srv != SQLITE_OK) {
+      MOZ_LOG(gStorageLog, PR_LOG_ERROR,
+             ("Sqlite statement prepare error: %d '%s'", srv,
+              ::sqlite3_errmsg(aNativeConnection)));
+      MOZ_LOG(gStorageLog, PR_LOG_ERROR,
+             ("Statement was: '%s'", PromiseFlatCString(aSQLStatement).get()));
+      return NS_ERROR_FAILURE;
+    }
+
+  MOZ_LOG(gStorageLog, PR_LOG_NOTICE, ("Initialized statement '%s' (0x%p)",
+                                      PromiseFlatCString(aSQLStatement).get(),
+                                      mDBStatement));
+
+  mDBConnection = aDBConnection;
+  mNativeConnection = aNativeConnection;
+  mParamCount = ::sqlite3_bind_parameter_count(mDBStatement);
+  mResultColumnCount = ::sqlite3_column_count(mDBStatement);
+  mColumnNames.Clear();
+
+  for (uint32_t i = 0; i < mResultColumnCount; i++) {
+      const char *name = ::sqlite3_column_name(mDBStatement, i);
+      (void)mColumnNames.AppendElement(nsDependentCString(name));
+  }
+
+#ifdef DEBUG
+  // We want to try and test for LIKE and that consumers are using
+  // escapeStringForLIKE instead of just trusting user input.  The idea to
+  // check to see if they are binding a parameter after like instead of just
+  // using a string.  We only do this in debug builds because it's expensive!
+  const nsCaseInsensitiveCStringComparator c;
+  nsACString::const_iterator start, end, e;
+  aSQLStatement.BeginReading(start);
+  aSQLStatement.EndReading(end);
+  e = end;
+  while (::FindInReadable(NS_LITERAL_CSTRING(" LIKE"), start, e, c)) {
+    // We have a LIKE in here, so we perform our tests
+    // FindInReadable moves the iterator, so we have to get a new one for
+    // each test we perform.
+    nsACString::const_iterator s1, s2, s3;
+    s1 = s2 = s3 = start;
+
+    if (!(::FindInReadable(NS_LITERAL_CSTRING(" LIKE ?"), s1, end, c) ||
+          ::FindInReadable(NS_LITERAL_CSTRING(" LIKE :"), s2, end, c) ||
+          ::FindInReadable(NS_LITERAL_CSTRING(" LIKE @"), s3, end, c))) {
+      // At this point, we didn't find a LIKE statement followed by ?, :,
+      // or @, all of which are valid characters for binding a parameter.
+      // We will warn the consumer that they may not be safely using LIKE.
+      NS_WARNING("Unsafe use of LIKE detected!  Please ensure that you "
+                 "are using mozIStorageStatement::escapeStringForLIKE "
+                 "and that you are binding that result to the statement "
+                 "to prevent SQL injection attacks.");
+    }
+
+    // resetting start and e
+    start = e;
+    e = end;
+  }
+#endif
+
+  return NS_OK;
+}
+
+mozIStorageBindingParams *
+Statement::getParams()
+{
+  nsresult rv;
+
+  // If we do not have an array object yet, make it.
+  if (!mParamsArray) {
+    nsCOMPtr<mozIStorageBindingParamsArray> array;
+    rv = NewBindingParamsArray(getter_AddRefs(array));
+    NS_ENSURE_SUCCESS(rv, nullptr);
+
+    mParamsArray = static_cast<BindingParamsArray *>(array.get());
+  }
+
+  // If there isn't already any rows added, we'll have to add one to use.
+  if (mParamsArray->length() == 0) {
+    nsRefPtr<BindingParams> params(new BindingParams(mParamsArray, this));
+    NS_ENSURE_TRUE(params, nullptr);
+
+    rv = mParamsArray->AddParams(params);
+    NS_ENSURE_SUCCESS(rv, nullptr);
+
+    // We have to unlock our params because AddParams locks them.  This is safe
+    // because no reference to the params object was, or ever will be given out.
+    params->unlock(this);
+
+    // We also want to lock our array at this point - we don't want anything to
+    // be added to it.  Nothing has, or will ever get a reference to it, but we
+    // will get additional safety checks via assertions by doing this.
+    mParamsArray->lock();
+  }
+
+  return *mParamsArray->begin();
+}
+
+Statement::~Statement()
+{
+  (void)internalFinalize(true);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// nsISupports
+
+NS_IMPL_ADDREF(Statement)
+NS_IMPL_RELEASE(Statement)
+
+NS_INTERFACE_MAP_BEGIN(Statement)
+  NS_INTERFACE_MAP_ENTRY(mozIStorageStatement)
+  NS_INTERFACE_MAP_ENTRY(mozIStorageBaseStatement)
+  NS_INTERFACE_MAP_ENTRY(mozIStorageBindingParams)
+  NS_INTERFACE_MAP_ENTRY(mozIStorageValueArray)
+  NS_INTERFACE_MAP_ENTRY(mozilla::storage::StorageBaseStatementInternal)
+  if (aIID.Equals(NS_GET_IID(nsIClassInfo))) {
+    foundInterface = static_cast<nsIClassInfo *>(&sStatementClassInfo);
+  }
+  else
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, mozIStorageStatement)
+NS_INTERFACE_MAP_END
+
+
+////////////////////////////////////////////////////////////////////////////////
+//// StorageBaseStatementInternal
+
+Connection *
+Statement::getOwner()
+{
+  return mDBConnection;
+}
+
+int
+Statement::getAsyncStatement(sqlite3_stmt **_stmt)
+{
+  // If we have no statement, we shouldn't be calling this method!
+  NS_ASSERTION(mDBStatement != nullptr, "We have no statement to clone!");
+
+  // If we do not yet have a cached async statement, clone our statement now.
+  if (!mAsyncStatement) {
+    nsDependentCString sql(::sqlite3_sql(mDBStatement));
+    int rc = mDBConnection->prepareStatement(mNativeConnection, sql,
+                                             &mAsyncStatement);
+    if (rc != SQLITE_OK) {
+      *_stmt = nullptr;
+      return rc;
+    }
+
+    MOZ_LOG(gStorageLog, PR_LOG_NOTICE,
+           ("Cloned statement 0x%p to 0x%p", mDBStatement, mAsyncStatement));
+  }
+
+  *_stmt = mAsyncStatement;
+  return SQLITE_OK;
+}
+
+nsresult
+Statement::getAsynchronousStatementData(StatementData &_data)
+{
+  if (!mDBStatement)
+    return NS_ERROR_UNEXPECTED;
+
+  sqlite3_stmt *stmt;
+  int rc = getAsyncStatement(&stmt);
+  if (rc != SQLITE_OK)
+    return convertResultCode(rc);
+
+  _data = StatementData(stmt, bindingParamsArray(), this);
+
+  return NS_OK;
+}
+
+already_AddRefed<mozIStorageBindingParams>
+Statement::newBindingParams(mozIStorageBindingParamsArray *aOwner)
+{
+  nsCOMPtr<mozIStorageBindingParams> params = new BindingParams(aOwner, this);
+  return params.forget();
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+//// mozIStorageStatement
+
+// proxy to StorageBaseStatementInternal using its define helper.
+MIXIN_IMPL_STORAGEBASESTATEMENTINTERNAL(Statement, (void)0;)
+
+NS_IMETHODIMP
+Statement::Clone(mozIStorageStatement **_statement)
+{
+  nsRefPtr<Statement> statement(new Statement());
+  NS_ENSURE_TRUE(statement, NS_ERROR_OUT_OF_MEMORY);
+
+  nsAutoCString sql(::sqlite3_sql(mDBStatement));
+  nsresult rv = statement->initialize(mDBConnection, mNativeConnection, sql);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  statement.forget(_statement);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Statement::Finalize()
+{
+  return internalFinalize(false);
+}
+
+nsresult
+Statement::internalFinalize(bool aDestructing)
+{
+  if (!mDBStatement)
+    return NS_OK;
+
+  int srv = SQLITE_OK;
+
+  if (!mDBConnection->isClosed()) {
+    //
+    // The connection is still open. While statement finalization and
+    // closing may, in some cases, take place in two distinct threads,
+    // we have a guarantee that the connection will remain open until
+    // this method terminates:
+    //
+    // a. The connection will be closed synchronously. In this case,
+    // there is no race condition, as everything takes place on the
+    // same thread.
+    //
+    // b. The connection is closed asynchronously and this code is
+    // executed on the opener thread. In this case, asyncClose() has
+    // not been called yet and will not be called before we return
+    // from this function.
+    //
+    // c. The connection is closed asynchronously and this code is
+    // executed on the async execution thread. In this case,
+    // AsyncCloseConnection::Run() has not been called yet and will
+    // not be called before we return from this function.
+    //
+    // In either case, the connection is still valid, hence closing
+    // here is safe.
+    //
+    MOZ_LOG(gStorageLog, PR_LOG_NOTICE, ("Finalizing statement '%s' during garbage-collection",
+                                        ::sqlite3_sql(mDBStatement)));
+    srv = ::sqlite3_finalize(mDBStatement);
+  }
+#ifdef DEBUG
+  else {
+    //
+    // The database connection is either closed or closing. The sqlite
+    // statement has either been finalized already by the connection
+    // or is about to be finalized by the connection.
+    //
+    // Finalizing it here would be useless and segfaultish.
+    //
+
+    char *msg = ::PR_smprintf("SQL statement (%x) should have been finalized"
+      " before garbage-collection. For more details on this statement, set"
+      " NSPR_LOG_MESSAGES=mozStorage:5 .",
+      mDBStatement);
+
+    //
+    // Note that we can't display the statement itself, as the data structure
+    // is not valid anymore. However, the address shown here should help
+    // developers correlate with the more complete debug message triggered
+    // by AsyncClose().
+    //
+
+#if 0
+    // Deactivate the warning until we have fixed the exising culprit
+    // (see bug 914070).
+    NS_WARNING(msg);
+#endif // 0
+
+    MOZ_LOG(gStorageLog, PR_LOG_WARNING, (msg));
+
+    ::PR_smprintf_free(msg);
+  }
+
+#endif
+
+  mDBStatement = nullptr;
+
+  if (mAsyncStatement) {
+    // If the destructor called us, there are no pending async statements (they
+    // hold a reference to us) and we can/must just kill the statement directly.
+    if (aDestructing)
+      destructorAsyncFinalize();
+    else
+      asyncFinalize();
+  }
+
+  // Release the holders, so they can release the reference to us.
+  mStatementParamsHolder = nullptr;
+  mStatementRowHolder = nullptr;
+
+  return convertResultCode(srv);
+}
+
+NS_IMETHODIMP
+Statement::GetParameterCount(uint32_t *_parameterCount)
+{
+  if (!mDBStatement)
+    return NS_ERROR_NOT_INITIALIZED;
+
+  *_parameterCount = mParamCount;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Statement::GetParameterName(uint32_t aParamIndex,
+                            nsACString &_name)
+{
+  if (!mDBStatement)
+    return NS_ERROR_NOT_INITIALIZED;
+  ENSURE_INDEX_VALUE(aParamIndex, mParamCount);
+
+  const char *name = ::sqlite3_bind_parameter_name(mDBStatement,
+                                                   aParamIndex + 1);
+  if (name == nullptr) {
+    // this thing had no name, so fake one
+    nsAutoCString name(":");
+    name.AppendInt(aParamIndex);
+    _name.Assign(name);
+  }
+  else {
+    _name.Assign(nsDependentCString(name));
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Statement::GetParameterIndex(const nsACString &aName,
+                             uint32_t *_index)
+{
+  if (!mDBStatement)
+    return NS_ERROR_NOT_INITIALIZED;
+
+  // We do not accept any forms of names other than ":name", but we need to add
+  // the colon for SQLite.
+  nsAutoCString name(":");
+  name.Append(aName);
+  int ind = ::sqlite3_bind_parameter_index(mDBStatement, name.get());
+  if (ind  == 0) // Named parameter not found.
+    return NS_ERROR_INVALID_ARG;
+
+  *_index = ind - 1; // SQLite indexes are 1-based, we are 0-based.
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Statement::GetColumnCount(uint32_t *_columnCount)
+{
+  if (!mDBStatement)
+    return NS_ERROR_NOT_INITIALIZED;
+
+  *_columnCount = mResultColumnCount;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Statement::GetColumnName(uint32_t aColumnIndex,
+                         nsACString &_name)
+{
+  if (!mDBStatement)
+    return NS_ERROR_NOT_INITIALIZED;
+  ENSURE_INDEX_VALUE(aColumnIndex, mResultColumnCount);
+
+  const char *cname = ::sqlite3_column_name(mDBStatement, aColumnIndex);
+  _name.Assign(nsDependentCString(cname));
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Statement::GetColumnIndex(const nsACString &aName,
+                          uint32_t *_index)
+{
+  if (!mDBStatement)
+      return NS_ERROR_NOT_INITIALIZED;
+
+  // Surprisingly enough, SQLite doesn't provide an API for this.  We have to
+  // determine it ourselves sadly.
+  for (uint32_t i = 0; i < mResultColumnCount; i++) {
+    if (mColumnNames[i].Equals(aName)) {
+      *_index = i;
+      return NS_OK;
+    }
+  }
+
+  return NS_ERROR_INVALID_ARG;
+}
+
+NS_IMETHODIMP
+Statement::Reset()
+{
+  if (!mDBStatement)
+    return NS_ERROR_NOT_INITIALIZED;
+
+#ifdef DEBUG
+  MOZ_LOG(gStorageLog, PR_LOG_DEBUG, ("Resetting statement: '%s'",
+                                     ::sqlite3_sql(mDBStatement)));
+
+  checkAndLogStatementPerformance(mDBStatement);
+#endif
+
+  mParamsArray = nullptr;
+  (void)sqlite3_reset(mDBStatement);
+  (void)sqlite3_clear_bindings(mDBStatement);
+
+  mExecuting = false;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Statement::BindParameters(mozIStorageBindingParamsArray *aParameters)
+{
+  if (!mDBStatement)
+    return NS_ERROR_NOT_INITIALIZED;
+
+  BindingParamsArray *array = static_cast<BindingParamsArray *>(aParameters);
+  if (array->getOwner() != this)
+    return NS_ERROR_UNEXPECTED;
+
+  if (array->length() == 0)
+    return NS_ERROR_UNEXPECTED;
+
+  mParamsArray = array;
+  mParamsArray->lock();
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Statement::Execute()
+{
+  if (!mDBStatement)
+    return NS_ERROR_NOT_INITIALIZED;
+
+  bool ret;
+  nsresult rv = ExecuteStep(&ret);
+  nsresult rv2 = Reset();
+
+  return NS_FAILED(rv) ? rv : rv2;
+}
+
+NS_IMETHODIMP
+Statement::ExecuteStep(bool *_moreResults)
+{
+  PROFILER_LABEL("Statement", "ExecuteStep",
+    js::ProfileEntry::Category::STORAGE);
+
+  if (!mDBStatement)
+    return NS_ERROR_NOT_INITIALIZED;
+
+  // Bind any parameters first before executing.
+  if (mParamsArray) {
+    // If we have more than one row of parameters to bind, they shouldn't be
+    // calling this method (and instead use executeAsync).
+    if (mParamsArray->length() != 1)
+      return NS_ERROR_UNEXPECTED;
+
+    BindingParamsArray::iterator row = mParamsArray->begin();
+    nsCOMPtr<IStorageBindingParamsInternal> bindingInternal = 
+      do_QueryInterface(*row);
+    nsCOMPtr<mozIStorageError> error = bindingInternal->bind(mDBStatement);
+    if (error) {
+      int32_t srv;
+      (void)error->GetResult(&srv);
+      return convertResultCode(srv);
+    }
+
+    // We have bound, so now we can clear our array.
+    mParamsArray = nullptr;
+  }
+  int srv = mDBConnection->stepStatement(mNativeConnection, mDBStatement);
+
+  if (srv != SQLITE_ROW && srv != SQLITE_DONE && PR_LOG_TEST(gStorageLog, PR_LOG_DEBUG)) {
+      nsAutoCString errStr;
+      (void)mDBConnection->GetLastErrorString(errStr);
+      MOZ_LOG(gStorageLog, PR_LOG_DEBUG,
+             ("Statement::ExecuteStep error: %s", errStr.get()));
+  }
+
+  // SQLITE_ROW and SQLITE_DONE are non-errors
+  if (srv == SQLITE_ROW) {
+    // we got a row back
+    mExecuting = true;
+    *_moreResults = true;
+    return NS_OK;
+  }
+  else if (srv == SQLITE_DONE) {
+    // statement is done (no row returned)
+    mExecuting = false;
+    *_moreResults = false;
+    return NS_OK;
+  }
+  else if (srv == SQLITE_BUSY || srv == SQLITE_MISUSE) {
+    mExecuting = false;
+  }
+  else if (mExecuting) {
+    MOZ_LOG(gStorageLog, PR_LOG_ERROR,
+           ("SQLite error after mExecuting was true!"));
+    mExecuting = false;
+  }
+
+  return convertResultCode(srv);
+}
+
+NS_IMETHODIMP
+Statement::GetState(int32_t *_state)
+{
+  if (!mDBStatement)
+    *_state = MOZ_STORAGE_STATEMENT_INVALID;
+  else if (mExecuting)
+    *_state = MOZ_STORAGE_STATEMENT_EXECUTING;
+  else
+    *_state = MOZ_STORAGE_STATEMENT_READY;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Statement::GetColumnDecltype(uint32_t aParamIndex,
+                             nsACString &_declType)
+{
+  if (!mDBStatement)
+    return NS_ERROR_NOT_INITIALIZED;
+
+  ENSURE_INDEX_VALUE(aParamIndex, mResultColumnCount);
+
+  _declType.Assign(::sqlite3_column_decltype(mDBStatement, aParamIndex));
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// mozIStorageValueArray (now part of mozIStorageStatement too)
+
+NS_IMETHODIMP
+Statement::GetNumEntries(uint32_t *_length)
+{
+  *_length = mResultColumnCount;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Statement::GetTypeOfIndex(uint32_t aIndex,
+                          int32_t *_type)
+{
+  if (!mDBStatement)
+    return NS_ERROR_NOT_INITIALIZED;
+
+  ENSURE_INDEX_VALUE(aIndex, mResultColumnCount);
+
+  if (!mExecuting)
+    return NS_ERROR_UNEXPECTED;
+
+  int t = ::sqlite3_column_type(mDBStatement, aIndex);
+  switch (t) {
+    case SQLITE_INTEGER:
+      *_type = mozIStorageStatement::VALUE_TYPE_INTEGER;
+      break;
+    case SQLITE_FLOAT:
+      *_type = mozIStorageStatement::VALUE_TYPE_FLOAT;
+      break;
+    case SQLITE_TEXT:
+      *_type = mozIStorageStatement::VALUE_TYPE_TEXT;
+      break;
+    case SQLITE_BLOB:
+      *_type = mozIStorageStatement::VALUE_TYPE_BLOB;
+      break;
+    case SQLITE_NULL:
+      *_type = mozIStorageStatement::VALUE_TYPE_NULL;
+      break;
+    default:
+      return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Statement::GetInt32(uint32_t aIndex,
+                    int32_t *_value)
+{
+  if (!mDBStatement)
+    return NS_ERROR_NOT_INITIALIZED;
+
+  ENSURE_INDEX_VALUE(aIndex, mResultColumnCount);
+
+  if (!mExecuting)
+    return NS_ERROR_UNEXPECTED;
+
+  *_value = ::sqlite3_column_int(mDBStatement, aIndex);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Statement::GetInt64(uint32_t aIndex,
+                    int64_t *_value)
+{
+  if (!mDBStatement)
+    return NS_ERROR_NOT_INITIALIZED;
+
+  ENSURE_INDEX_VALUE(aIndex, mResultColumnCount);
+
+  if (!mExecuting)
+    return NS_ERROR_UNEXPECTED;
+
+  *_value = ::sqlite3_column_int64(mDBStatement, aIndex);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Statement::GetDouble(uint32_t aIndex,
+                     double *_value)
+{
+  if (!mDBStatement)
+    return NS_ERROR_NOT_INITIALIZED;
+
+  ENSURE_INDEX_VALUE(aIndex, mResultColumnCount);
+
+  if (!mExecuting)
+    return NS_ERROR_UNEXPECTED;
+
+  *_value = ::sqlite3_column_double(mDBStatement, aIndex);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Statement::GetUTF8String(uint32_t aIndex,
+                         nsACString &_value)
+{
+  // Get type of Index will check aIndex for us, so we don't have to.
+  int32_t type;
+  nsresult rv = GetTypeOfIndex(aIndex, &type);
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (type == mozIStorageStatement::VALUE_TYPE_NULL) {
+    // NULL columns should have IsVoid set to distinguish them from the empty
+    // string.
+    _value.Truncate(0);
+    _value.SetIsVoid(true);
+  }
+  else {
+    const char *value =
+      reinterpret_cast<const char *>(::sqlite3_column_text(mDBStatement,
+                                                           aIndex));
+    _value.Assign(value, ::sqlite3_column_bytes(mDBStatement, aIndex));
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Statement::GetString(uint32_t aIndex,
+                     nsAString &_value)
+{
+  // Get type of Index will check aIndex for us, so we don't have to.
+  int32_t type;
+  nsresult rv = GetTypeOfIndex(aIndex, &type);
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (type == mozIStorageStatement::VALUE_TYPE_NULL) {
+    // NULL columns should have IsVoid set to distinguish them from the empty
+    // string.
+    _value.Truncate(0);
+    _value.SetIsVoid(true);
+  } else {
+    const char16_t *value =
+      static_cast<const char16_t *>(::sqlite3_column_text16(mDBStatement,
+                                                             aIndex));
+    _value.Assign(value, ::sqlite3_column_bytes16(mDBStatement, aIndex) / 2);
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Statement::GetBlob(uint32_t aIndex,
+                   uint32_t *_size,
+                   uint8_t **_blob)
+{
+  if (!mDBStatement)
+    return NS_ERROR_NOT_INITIALIZED;
+
+  ENSURE_INDEX_VALUE(aIndex, mResultColumnCount);
+
+  if (!mExecuting)
+     return NS_ERROR_UNEXPECTED;
+
+  int size = ::sqlite3_column_bytes(mDBStatement, aIndex);
+  void *blob = nullptr;
+  if (size) {
+    blob = nsMemory::Clone(::sqlite3_column_blob(mDBStatement, aIndex), size);
+    NS_ENSURE_TRUE(blob, NS_ERROR_OUT_OF_MEMORY);
+  }
+
+  *_blob = static_cast<uint8_t *>(blob);
+  *_size = size;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Statement::GetBlobAsString(uint32_t aIndex, nsAString& aValue)
+{
+  return DoGetBlobAsString(this, aIndex, aValue);
+}
+
+NS_IMETHODIMP
+Statement::GetBlobAsUTF8String(uint32_t aIndex, nsACString& aValue)
+{
+  return DoGetBlobAsString(this, aIndex, aValue);
+}
+
+NS_IMETHODIMP
+Statement::GetSharedUTF8String(uint32_t aIndex,
+                               uint32_t *_length,
+                               const char **_value)
+{
+  if (_length)
+    *_length = ::sqlite3_column_bytes(mDBStatement, aIndex);
+
+  *_value = reinterpret_cast<const char *>(::sqlite3_column_text(mDBStatement,
+                                                                 aIndex));
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Statement::GetSharedString(uint32_t aIndex,
+                           uint32_t *_length,
+                           const char16_t **_value)
+{
+  if (_length)
+    *_length = ::sqlite3_column_bytes16(mDBStatement, aIndex);
+
+  *_value = static_cast<const char16_t *>(::sqlite3_column_text16(mDBStatement,
+                                                                   aIndex));
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Statement::GetSharedBlob(uint32_t aIndex,
+                         uint32_t *_size,
+                         const uint8_t **_blob)
+{
+  *_size = ::sqlite3_column_bytes(mDBStatement, aIndex);
+  *_blob = static_cast<const uint8_t *>(::sqlite3_column_blob(mDBStatement,
+                                                              aIndex));
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Statement::GetIsNull(uint32_t aIndex,
+                     bool *_isNull)
+{
+  // Get type of Index will check aIndex for us, so we don't have to.
+  int32_t type;
+  nsresult rv = GetTypeOfIndex(aIndex, &type);
+  NS_ENSURE_SUCCESS(rv, rv);
+  *_isNull = (type == mozIStorageStatement::VALUE_TYPE_NULL);
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// mozIStorageBindingParams
+
+BOILERPLATE_BIND_PROXIES(
+  Statement, 
+  if (!mDBStatement) return NS_ERROR_NOT_INITIALIZED;
+)
+
+} // namespace storage
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageStatementData.h firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageStatementData.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageStatementData.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageStatementData.h	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,150 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=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/. */
+
+#ifndef mozStorageStatementData_h
+#define mozStorageStatementData_h
+
+#include "sqlite3.h"
+
+#include "nsAutoPtr.h"
+#include "nsTArray.h"
+#include "nsIEventTarget.h"
+#include "MainThreadUtils.h"
+
+#include "mozStorageBindingParamsArray.h"
+#include "mozIStorageBaseStatement.h"
+#include "mozStorageConnection.h"
+#include "StorageBaseStatementInternal.h"
+
+struct sqlite3_stmt;
+
+namespace mozilla {
+namespace storage {
+
+class StatementData
+{
+public:
+  StatementData(sqlite3_stmt *aStatement,
+                already_AddRefed<BindingParamsArray> aParamsArray,
+                StorageBaseStatementInternal *aStatementOwner)
+  : mStatement(aStatement)
+  , mParamsArray(aParamsArray)
+  , mStatementOwner(aStatementOwner)
+  {
+    NS_PRECONDITION(mStatementOwner, "Must have a statement owner!");
+  }
+  StatementData(const StatementData &aSource)
+  : mStatement(aSource.mStatement)
+  , mParamsArray(aSource.mParamsArray)
+  , mStatementOwner(aSource.mStatementOwner)
+  {
+    NS_PRECONDITION(mStatementOwner, "Must have a statement owner!");
+  }
+  StatementData()
+  {
+  }
+  ~StatementData()
+  {
+    // We need to ensure that mParamsArray is released on the main thread,
+    // as the binding arguments may be XPConnect values, which are safe
+    // to release only on the main thread.
+    nsCOMPtr<nsIThread> mainThread = do_GetMainThread();
+    (void)NS_ProxyRelease(mainThread, mParamsArray);
+  }
+
+  /**
+   * Return the sqlite statement, fetching it from the storage statement.  In
+   * the case of AsyncStatements this may actually create the statement 
+   */
+  inline int getSqliteStatement(sqlite3_stmt **_stmt)
+  {
+    if (!mStatement) {
+      int rc = mStatementOwner->getAsyncStatement(&mStatement);
+      NS_ENSURE_TRUE(rc == SQLITE_OK, rc);
+    }
+    *_stmt = mStatement;
+    return SQLITE_OK;
+  }
+
+  operator BindingParamsArray *() const { return mParamsArray; }
+
+  /**
+   * NULLs out our sqlite3_stmt (it is held by the owner) after reseting it and
+   * clear all bindings to it.  This is expected to occur on the async thread.
+   */
+  inline void reset()
+  {
+    NS_PRECONDITION(mStatementOwner, "Must have a statement owner!");
+#ifdef DEBUG
+    {
+      nsCOMPtr<nsIEventTarget> asyncThread =
+        mStatementOwner->getOwner()->getAsyncExecutionTarget();
+      // It's possible that we are shutting down the async thread, and this
+      // method would return nullptr as a result.
+      if (asyncThread) {
+        bool onAsyncThread;
+        NS_ASSERTION(NS_SUCCEEDED(asyncThread->IsOnCurrentThread(&onAsyncThread)) && onAsyncThread,
+                     "This should only be running on the async thread!");
+      }
+    }
+#endif
+    // In the AsyncStatement case we may never have populated mStatement if the
+    // AsyncExecuteStatements got canceled or a failure occurred in constructing
+    // the statement.
+    if (mStatement) {
+      (void)::sqlite3_reset(mStatement);
+      (void)::sqlite3_clear_bindings(mStatement);
+      mStatement = nullptr;
+    }
+  }
+
+  /**
+   * Indicates if this statement has parameters to be bound before it is
+   * executed.
+   *
+   * @return true if the statement has parameters to bind against, false
+   *         otherwise.
+   */
+  inline bool hasParametersToBeBound() const { return !!mParamsArray; }
+  /**
+   * Indicates the number of implicit statements generated by this statement
+   * requiring a transaction for execution.  For example a single statement
+   * with N BindingParams will execute N implicit staments.
+   *
+   * @return number of statements requiring a transaction for execution.
+   *
+   * @note In the case of AsyncStatements this may actually create the
+   *       statement.
+   */
+  inline uint32_t needsTransaction()
+  {
+    MOZ_ASSERT(!NS_IsMainThread());
+    // Be sure to use the getSqliteStatement helper, since sqlite3_stmt_readonly
+    // can only analyze prepared statements and AsyncStatements are prepared
+    // lazily.
+    sqlite3_stmt *stmt;
+    int rc = getSqliteStatement(&stmt);
+    if (SQLITE_OK != rc || ::sqlite3_stmt_readonly(stmt)) {
+      return 0;
+    }
+    return mParamsArray ? mParamsArray->length() : 1;
+  }
+
+private:
+  sqlite3_stmt *mStatement;
+  nsRefPtr<BindingParamsArray> mParamsArray;
+
+  /**
+   * We hold onto a reference of the statement's owner so it doesn't get
+   * destroyed out from under us.
+   */
+  nsCOMPtr<StorageBaseStatementInternal> mStatementOwner;
+};
+
+} // namespace storage
+} // namespace mozilla
+
+#endif // mozStorageStatementData_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageStatement.h firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageStatement.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageStatement.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageStatement.h	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,118 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 mozStorageStatement_h
+#define mozStorageStatement_h
+
+#include "nsAutoPtr.h"
+#include "nsString.h"
+
+#include "nsTArray.h"
+
+#include "mozStorageBindingParamsArray.h"
+#include "mozStorageStatementData.h"
+#include "mozIStorageStatement.h"
+#include "mozIStorageValueArray.h"
+#include "StorageBaseStatementInternal.h"
+#include "mozilla/Attributes.h"
+
+class nsIXPConnectJSObjectHolder;
+struct sqlite3_stmt;
+
+namespace mozilla {
+namespace storage {
+class StatementJSHelper;
+class Connection;
+
+class Statement final : public mozIStorageStatement
+                      , public mozIStorageValueArray
+                      , public StorageBaseStatementInternal
+{
+public:
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_MOZISTORAGESTATEMENT
+  NS_DECL_MOZISTORAGEBASESTATEMENT
+  NS_DECL_MOZISTORAGEBINDINGPARAMS
+  // NS_DECL_MOZISTORAGEVALUEARRAY (methods in mozIStorageStatement)
+  NS_DECL_STORAGEBASESTATEMENTINTERNAL
+
+  Statement();
+
+  /**
+   * Initializes the object on aDBConnection by preparing the SQL statement
+   * given by aSQLStatement.
+   *
+   * @param aDBConnection
+   *        The Connection object this statement is associated with.
+   * @param aNativeConnection
+   *        The native Sqlite connection this statement is associated with.
+   * @param aSQLStatement
+   *        The SQL statement to prepare that this object will represent.
+   */
+  nsresult initialize(Connection *aDBConnection,
+                      sqlite3* aNativeConnection,
+                      const nsACString &aSQLStatement);
+
+
+  /**
+   * Obtains the native statement pointer.
+   */
+  inline sqlite3_stmt *nativeStatement() { return mDBStatement; }
+
+  /**
+   * Obtains and transfers ownership of the array of parameters that are bound
+   * to this statment.  This can be null.
+   */
+  inline already_AddRefed<BindingParamsArray> bindingParamsArray()
+  {
+    return mParamsArray.forget();
+  }
+
+private:
+    ~Statement();
+
+    sqlite3_stmt *mDBStatement;
+    uint32_t mParamCount;
+    uint32_t mResultColumnCount;
+    nsTArray<nsCString> mColumnNames;
+    bool mExecuting;
+
+    /**
+     * @return a pointer to the BindingParams object to use with our Bind*
+     *         method.
+     */
+    mozIStorageBindingParams *getParams();
+
+    /**
+     * Holds the array of parameters to bind to this statement when we execute
+     * it asynchronously.
+     */
+    nsRefPtr<BindingParamsArray> mParamsArray;
+
+    /**
+     * The following two members are only used with the JS helper.  They cache
+     * the row and params objects.
+     */
+    nsMainThreadPtrHandle<nsIXPConnectJSObjectHolder> mStatementParamsHolder;
+    nsMainThreadPtrHandle<nsIXPConnectJSObjectHolder> mStatementRowHolder;
+
+  /**
+   * Internal version of finalize that allows us to tell it if it is being
+   * called from the destructor so it can know not to dispatch events that
+   * require a reference to us.
+   *
+   * @param aDestructing
+   *        Is the destructor calling?
+   */
+  nsresult internalFinalize(bool aDestructing);
+
+  friend class StatementJSHelper;
+};
+
+} // storage
+} // mozilla
+
+#endif // mozStorageStatement_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageStatementJSHelper.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageStatementJSHelper.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageStatementJSHelper.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageStatementJSHelper.cpp	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,285 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 "nsIXPConnect.h"
+#include "mozStorageStatement.h"
+#include "mozStorageService.h"
+
+#include "nsMemory.h"
+#include "nsString.h"
+#include "nsServiceManagerUtils.h"
+
+#include "mozStorageStatementJSHelper.h"
+
+#include "mozStorageStatementRow.h"
+#include "mozStorageStatementParams.h"
+
+#include "jsapi.h"
+
+namespace mozilla {
+namespace storage {
+
+////////////////////////////////////////////////////////////////////////////////
+//// Global Functions
+
+static
+bool
+stepFunc(JSContext *aCtx,
+         uint32_t,
+         jsval *_vp)
+{
+  nsCOMPtr<nsIXPConnect> xpc(Service::getXPConnect());
+  nsCOMPtr<nsIXPConnectWrappedNative> wrapper;
+  JSObject *obj = JS_THIS_OBJECT(aCtx, _vp);
+  if (!obj) {
+    return false;
+  }
+
+  nsresult rv =
+    xpc->GetWrappedNativeOfJSObject(aCtx, obj, getter_AddRefs(wrapper));
+  if (NS_FAILED(rv)) {
+    ::JS_ReportError(aCtx, "mozIStorageStatement::step() could not obtain native statement");
+    return false;
+  }
+
+#ifdef DEBUG
+  {
+    nsCOMPtr<mozIStorageStatement> isStatement(
+      do_QueryInterface(wrapper->Native())
+    );
+    NS_ASSERTION(isStatement, "How is this not a statement?!");
+  }
+#endif
+
+  Statement *stmt = static_cast<Statement *>(
+    static_cast<mozIStorageStatement *>(wrapper->Native())
+  );
+
+  bool hasMore = false;
+  rv = stmt->ExecuteStep(&hasMore);
+  if (NS_SUCCEEDED(rv) && !hasMore) {
+    *_vp = JSVAL_FALSE;
+    (void)stmt->Reset();
+    return true;
+  }
+
+  if (NS_FAILED(rv)) {
+    ::JS_ReportError(aCtx, "mozIStorageStatement::step() returned an error");
+    return false;
+  }
+
+  *_vp = BOOLEAN_TO_JSVAL(hasMore);
+  return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// StatementJSHelper
+
+nsresult
+StatementJSHelper::getRow(Statement *aStatement,
+                          JSContext *aCtx,
+                          JSObject *aScopeObj,
+                          jsval *_row)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  nsresult rv;
+
+#ifdef DEBUG
+  int32_t state;
+  (void)aStatement->GetState(&state);
+  NS_ASSERTION(state == mozIStorageStatement::MOZ_STORAGE_STATEMENT_EXECUTING,
+               "Invalid state to get the row object - all calls will fail!");
+#endif
+
+  if (!aStatement->mStatementRowHolder) {
+    JS::RootedObject scope(aCtx, aScopeObj);
+    nsCOMPtr<mozIStorageStatementRow> row(new StatementRow(aStatement));
+    NS_ENSURE_TRUE(row, NS_ERROR_OUT_OF_MEMORY);
+
+    nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
+    nsCOMPtr<nsIXPConnect> xpc(Service::getXPConnect());
+    rv = xpc->WrapNative(
+      aCtx,
+      ::JS_GetGlobalForObject(aCtx, scope),
+      row,
+      NS_GET_IID(mozIStorageStatementRow),
+      getter_AddRefs(holder)
+    );
+    NS_ENSURE_SUCCESS(rv, rv);
+    nsRefPtr<StatementRowHolder> rowHolder = new StatementRowHolder(holder);
+    aStatement->mStatementRowHolder =
+      new nsMainThreadPtrHolder<nsIXPConnectJSObjectHolder>(rowHolder);
+  }
+
+  JS::Rooted<JSObject*> obj(aCtx);
+  obj = aStatement->mStatementRowHolder->GetJSObject();
+  NS_ENSURE_STATE(obj);
+
+  *_row = OBJECT_TO_JSVAL(obj);
+  return NS_OK;
+}
+
+nsresult
+StatementJSHelper::getParams(Statement *aStatement,
+                             JSContext *aCtx,
+                             JSObject *aScopeObj,
+                             jsval *_params)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  nsresult rv;
+
+#ifdef DEBUG
+  int32_t state;
+  (void)aStatement->GetState(&state);
+  NS_ASSERTION(state == mozIStorageStatement::MOZ_STORAGE_STATEMENT_READY,
+               "Invalid state to get the params object - all calls will fail!");
+#endif
+
+  if (!aStatement->mStatementParamsHolder) {
+    JS::RootedObject scope(aCtx, aScopeObj);
+    nsCOMPtr<mozIStorageStatementParams> params =
+      new StatementParams(aStatement);
+    NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);
+
+    nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
+    nsCOMPtr<nsIXPConnect> xpc(Service::getXPConnect());
+    rv = xpc->WrapNative(
+      aCtx,
+      ::JS_GetGlobalForObject(aCtx, scope),
+      params,
+      NS_GET_IID(mozIStorageStatementParams),
+      getter_AddRefs(holder)
+    );
+    NS_ENSURE_SUCCESS(rv, rv);
+    nsRefPtr<StatementParamsHolder> paramsHolder =
+      new StatementParamsHolder(holder);
+    aStatement->mStatementParamsHolder =
+      new nsMainThreadPtrHolder<nsIXPConnectJSObjectHolder>(paramsHolder);
+  }
+
+  JS::Rooted<JSObject*> obj(aCtx);
+  obj = aStatement->mStatementParamsHolder->GetJSObject();
+  NS_ENSURE_STATE(obj);
+
+  *_params = OBJECT_TO_JSVAL(obj);
+  return NS_OK;
+}
+
+NS_IMETHODIMP_(MozExternalRefCountType) StatementJSHelper::AddRef() { return 2; }
+NS_IMETHODIMP_(MozExternalRefCountType) StatementJSHelper::Release() { return 1; }
+NS_INTERFACE_MAP_BEGIN(StatementJSHelper)
+  NS_INTERFACE_MAP_ENTRY(nsIXPCScriptable)
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
+NS_INTERFACE_MAP_END
+
+////////////////////////////////////////////////////////////////////////////////
+//// nsIXPCScriptable
+
+#define XPC_MAP_CLASSNAME StatementJSHelper
+#define XPC_MAP_QUOTED_CLASSNAME "StatementJSHelper"
+#define XPC_MAP_WANT_GETPROPERTY
+#define XPC_MAP_WANT_RESOLVE
+#define XPC_MAP_FLAGS nsIXPCScriptable::ALLOW_PROP_MODS_DURING_RESOLVE
+#include "xpc_map_end.h"
+
+NS_IMETHODIMP
+StatementJSHelper::GetProperty(nsIXPConnectWrappedNative *aWrapper,
+                               JSContext *aCtx,
+                               JSObject *aScopeObj,
+                               jsid aId,
+                               jsval *_result,
+                               bool *_retval)
+{
+  if (!JSID_IS_STRING(aId))
+    return NS_OK;
+
+  JS::Rooted<JSObject*> scope(aCtx, aScopeObj);
+  JS::Rooted<jsid> id(aCtx, aId);
+
+#ifdef DEBUG
+  {
+    nsCOMPtr<mozIStorageStatement> isStatement(
+                                     do_QueryInterface(aWrapper->Native()));
+    NS_ASSERTION(isStatement, "How is this not a statement?!");
+  }
+#endif
+
+  Statement *stmt = static_cast<Statement *>(
+    static_cast<mozIStorageStatement *>(aWrapper->Native())
+  );
+
+  JSFlatString *str = JSID_TO_FLAT_STRING(id);
+  if (::JS_FlatStringEqualsAscii(str, "row"))
+    return getRow(stmt, aCtx, scope, _result);
+
+  if (::JS_FlatStringEqualsAscii(str, "params"))
+    return getParams(stmt, aCtx, scope, _result);
+
+  return NS_OK;
+}
+
+
+NS_IMETHODIMP
+StatementJSHelper::Resolve(nsIXPConnectWrappedNative *aWrapper,
+                           JSContext *aCtx, JSObject *aScopeObj,
+                           jsid aId, bool *aResolvedp,
+                           bool *_retval)
+{
+  if (!JSID_IS_STRING(aId))
+    return NS_OK;
+
+  JS::RootedObject scope(aCtx, aScopeObj);
+  if (::JS_FlatStringEqualsAscii(JSID_TO_FLAT_STRING(aId), "step")) {
+    *_retval = ::JS_DefineFunction(aCtx, scope, "step", stepFunc,
+                                   0, 0) != nullptr;
+    *aResolvedp = true;
+    return NS_OK;
+  }
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// StatementJSObjectHolder
+
+NS_IMPL_ISUPPORTS(StatementJSObjectHolder, nsIXPConnectJSObjectHolder);
+
+JSObject*
+StatementJSObjectHolder::GetJSObject()
+{
+  return mHolder->GetJSObject();
+}
+
+StatementJSObjectHolder::StatementJSObjectHolder(nsIXPConnectJSObjectHolder* aHolder)
+  : mHolder(aHolder)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(mHolder);
+}
+
+StatementParamsHolder::~StatementParamsHolder()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  // We are considered dead at this point, so any wrappers for row or params
+  // need to lose their reference to the statement.
+  nsCOMPtr<nsIXPConnectWrappedNative> wrapper = do_QueryInterface(mHolder);
+  nsCOMPtr<mozIStorageStatementParams> iObj = do_QueryWrappedNative(wrapper);
+  StatementParams *obj = static_cast<StatementParams *>(iObj.get());
+  obj->mStatement = nullptr;
+}
+
+StatementRowHolder::~StatementRowHolder()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  // We are considered dead at this point, so any wrappers for row or params
+  // need to lose their reference to the statement.
+  nsCOMPtr<nsIXPConnectWrappedNative> wrapper = do_QueryInterface(mHolder);
+  nsCOMPtr<mozIStorageStatementRow> iObj = do_QueryWrappedNative(wrapper);
+  StatementRow *obj = static_cast<StatementRow *>(iObj.get());
+  obj->mStatement = nullptr;
+}
+
+} // namespace storage
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageStatementJSHelper.h firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageStatementJSHelper.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageStatementJSHelper.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageStatementJSHelper.h	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,70 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 MOZSTORAGESTATEMENTJSHELPER_H
+#define MOZSTORAGESTATEMENTJSHELPER_H
+
+#include "nsIXPCScriptable.h"
+#include "nsIXPConnect.h"
+
+class Statement;
+
+namespace mozilla {
+namespace storage {
+
+class StatementJSHelper : public nsIXPCScriptable
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIXPCSCRIPTABLE
+
+private:
+  nsresult getRow(Statement *, JSContext *, JSObject *, JS::Value *);
+  nsresult getParams(Statement *, JSContext *, JSObject *, JS::Value *);
+};
+
+/**
+ * Wrappers used to clean up the references JS helpers hold to the statement.
+ * For cycle-avoidance reasons they do not hold reference-counted references,
+ * so it is important we do this.
+ */
+class StatementJSObjectHolder : public nsIXPConnectJSObjectHolder
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIXPCONNECTJSOBJECTHOLDER
+
+  explicit StatementJSObjectHolder(nsIXPConnectJSObjectHolder* aHolder);
+
+protected:
+  virtual ~StatementJSObjectHolder() {};
+  nsCOMPtr<nsIXPConnectJSObjectHolder> mHolder;
+};
+
+class StatementParamsHolder final: public StatementJSObjectHolder {
+public:
+  explicit StatementParamsHolder(nsIXPConnectJSObjectHolder* aHolder)
+    : StatementJSObjectHolder(aHolder) {
+  }
+
+private:
+  virtual ~StatementParamsHolder();
+};
+
+class StatementRowHolder final: public StatementJSObjectHolder {
+public:
+  explicit StatementRowHolder(nsIXPConnectJSObjectHolder* aHolder)
+    : StatementJSObjectHolder(aHolder) {
+  }
+
+private:
+  virtual ~StatementRowHolder();
+};
+
+} // namespace storage
+} // namespace mozilla
+
+#endif // MOZSTORAGESTATEMENTJSHELPER_H
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageStatementParams.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageStatementParams.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageStatementParams.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageStatementParams.cpp	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,179 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 "nsJSUtils.h"
+#include "nsMemory.h"
+#include "nsString.h"
+
+#include "jsapi.h"
+
+#include "mozStoragePrivateHelpers.h"
+#include "mozStorageStatementParams.h"
+#include "mozIStorageStatement.h"
+
+namespace mozilla {
+namespace storage {
+
+////////////////////////////////////////////////////////////////////////////////
+//// StatementParams
+
+StatementParams::StatementParams(mozIStorageStatement *aStatement) :
+    mStatement(aStatement)
+{
+  NS_ASSERTION(mStatement != nullptr, "mStatement is null");
+  (void)mStatement->GetParameterCount(&mParamCount);
+}
+
+NS_IMPL_ISUPPORTS(
+  StatementParams,
+  mozIStorageStatementParams,
+  nsIXPCScriptable
+)
+
+////////////////////////////////////////////////////////////////////////////////
+//// nsIXPCScriptable
+
+#define XPC_MAP_CLASSNAME StatementParams
+#define XPC_MAP_QUOTED_CLASSNAME "StatementParams"
+#define XPC_MAP_WANT_SETPROPERTY
+#define XPC_MAP_WANT_NEWENUMERATE
+#define XPC_MAP_WANT_RESOLVE
+#define XPC_MAP_FLAGS nsIXPCScriptable::ALLOW_PROP_MODS_DURING_RESOLVE
+#include "xpc_map_end.h"
+
+NS_IMETHODIMP
+StatementParams::SetProperty(nsIXPConnectWrappedNative *aWrapper,
+                             JSContext *aCtx,
+                             JSObject *aScopeObj,
+                             jsid aId,
+                             JS::Value *_vp,
+                             bool *_retval)
+{
+  NS_ENSURE_TRUE(mStatement, NS_ERROR_NOT_INITIALIZED);
+
+  if (JSID_IS_INT(aId)) {
+    int idx = JSID_TO_INT(aId);
+
+    nsCOMPtr<nsIVariant> variant(convertJSValToVariant(aCtx, *_vp));
+    NS_ENSURE_TRUE(variant, NS_ERROR_UNEXPECTED);
+    nsresult rv = mStatement->BindByIndex(idx, variant);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+  else if (JSID_IS_STRING(aId)) {
+    JSString *str = JSID_TO_STRING(aId);
+    nsAutoJSString autoStr;
+    if (!autoStr.init(aCtx, str)) {
+      return NS_ERROR_FAILURE;
+    }
+
+    NS_ConvertUTF16toUTF8 name(autoStr);
+
+    // check to see if there's a parameter with this name
+    nsCOMPtr<nsIVariant> variant(convertJSValToVariant(aCtx, *_vp));
+    NS_ENSURE_TRUE(variant, NS_ERROR_UNEXPECTED);
+    nsresult rv = mStatement->BindByName(name, variant);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+  else {
+    return NS_ERROR_INVALID_ARG;
+  }
+
+  *_retval = true;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+StatementParams::NewEnumerate(nsIXPConnectWrappedNative *aWrapper,
+                              JSContext *aCtx,
+                              JSObject *aScopeObj,
+                              JS::AutoIdVector &aProperties,
+                              bool *_retval)
+{
+  NS_ENSURE_TRUE(mStatement, NS_ERROR_NOT_INITIALIZED);
+  JS::RootedObject scope(aCtx, aScopeObj);
+
+  if (!aProperties.reserve(mParamCount)) {
+    *_retval = false;
+    return NS_OK;
+  }
+
+  for (uint32_t i = 0; i < mParamCount; i++) {
+    // Get the name of our parameter.
+    nsAutoCString name;
+    nsresult rv = mStatement->GetParameterName(i, name);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    // But drop the first character, which is going to be a ':'.
+    JS::RootedString jsname(aCtx, ::JS_NewStringCopyN(aCtx, &(name.get()[1]),
+                                                      name.Length() - 1));
+    NS_ENSURE_TRUE(jsname, NS_ERROR_OUT_OF_MEMORY);
+
+    // Set our name.
+    JS::Rooted<jsid> id(aCtx);
+    if (!::JS_StringToId(aCtx, jsname, &id)) {
+      *_retval = false;
+      return NS_OK;
+    }
+
+    aProperties.infallibleAppend(id);
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+StatementParams::Resolve(nsIXPConnectWrappedNative *aWrapper,
+                         JSContext *aCtx,
+                         JSObject *aScopeObj,
+                         jsid aId,
+                         bool *resolvedp,
+                         bool *_retval)
+{
+  NS_ENSURE_TRUE(mStatement, NS_ERROR_NOT_INITIALIZED);
+  // We do not throw at any point after this unless our index is out of range
+  // because we want to allow the prototype chain to be checked for the
+  // property.
+
+  JS::RootedObject scope(aCtx, aScopeObj);
+  JS::RootedId id(aCtx, aId);
+  bool resolved = false;
+  bool ok = true;
+  if (JSID_IS_INT(id)) {
+    uint32_t idx = JSID_TO_INT(id);
+
+    // Ensure that our index is within range.  We do not care about the
+    // prototype chain being checked here.
+    if (idx >= mParamCount)
+      return NS_ERROR_INVALID_ARG;
+
+    ok = ::JS_DefineElement(aCtx, scope, idx, JS::UndefinedHandleValue, JSPROP_ENUMERATE);
+    resolved = true;
+  }
+  else if (JSID_IS_STRING(id)) {
+    JSString *str = JSID_TO_STRING(id);
+    nsAutoJSString autoStr;
+    if (!autoStr.init(aCtx, str)) {
+      return NS_ERROR_FAILURE;
+    }
+
+    // Check to see if there's a parameter with this name, and if not, let
+    // the rest of the prototype chain be checked.
+    NS_ConvertUTF16toUTF8 name(autoStr);
+    uint32_t idx;
+    nsresult rv = mStatement->GetParameterIndex(name, &idx);
+    if (NS_SUCCEEDED(rv)) {
+      ok = ::JS_DefinePropertyById(aCtx, scope, id, JS::UndefinedHandleValue, JSPROP_ENUMERATE);
+      resolved = true;
+    }
+  }
+
+  *_retval = ok;
+  *resolvedp = resolved && ok;
+  return NS_OK;
+}
+
+} // namespace storage
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageStatementParams.h firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageStatementParams.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageStatementParams.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageStatementParams.h	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,43 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 MOZSTORAGESTATEMENTPARAMS_H
+#define MOZSTORAGESTATEMENTPARAMS_H
+
+#include "mozIStorageStatementParams.h"
+#include "nsIXPCScriptable.h"
+#include "mozilla/Attributes.h"
+
+class mozIStorageStatement;
+
+namespace mozilla {
+namespace storage {
+
+class StatementParams final : public mozIStorageStatementParams
+                            , public nsIXPCScriptable
+{
+public:
+  explicit StatementParams(mozIStorageStatement *aStatement);
+
+  // interfaces
+  NS_DECL_ISUPPORTS
+  NS_DECL_MOZISTORAGESTATEMENTPARAMS
+  NS_DECL_NSIXPCSCRIPTABLE
+
+protected:
+  ~StatementParams() {}
+
+  mozIStorageStatement *mStatement;
+  uint32_t mParamCount;
+
+  friend class StatementParamsHolder;
+  friend class StatementRowHolder;
+};
+
+} // namespace storage
+} // namespace mozilla
+
+#endif /* MOZSTORAGESTATEMENTPARAMS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageStatementRow.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageStatementRow.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageStatementRow.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageStatementRow.cpp	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,154 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 "nsMemory.h"
+#include "nsString.h"
+
+#include "mozStorageStatementRow.h"
+#include "mozStorageStatement.h"
+
+#include "jsapi.h"
+
+namespace mozilla {
+namespace storage {
+
+////////////////////////////////////////////////////////////////////////////////
+//// StatementRow
+
+StatementRow::StatementRow(Statement *aStatement)
+: mStatement(aStatement)
+{
+}
+
+NS_IMPL_ISUPPORTS(
+  StatementRow,
+  mozIStorageStatementRow,
+  nsIXPCScriptable
+)
+
+////////////////////////////////////////////////////////////////////////////////
+//// nsIXPCScriptable
+
+#define XPC_MAP_CLASSNAME StatementRow
+#define XPC_MAP_QUOTED_CLASSNAME "StatementRow"
+#define XPC_MAP_WANT_GETPROPERTY
+#define XPC_MAP_WANT_RESOLVE
+#define XPC_MAP_FLAGS nsIXPCScriptable::ALLOW_PROP_MODS_DURING_RESOLVE
+#include "xpc_map_end.h"
+
+NS_IMETHODIMP
+StatementRow::GetProperty(nsIXPConnectWrappedNative *aWrapper,
+                          JSContext *aCtx,
+                          JSObject *aScopeObj,
+                          jsid aId,
+                          jsval *_vp,
+                          bool *_retval)
+{
+  NS_ENSURE_TRUE(mStatement, NS_ERROR_NOT_INITIALIZED);
+
+  JS::RootedObject scope(aCtx, aScopeObj);
+  if (JSID_IS_STRING(aId)) {
+    ::JSAutoByteString idBytes(aCtx, JSID_TO_STRING(aId));
+    NS_ENSURE_TRUE(!!idBytes, NS_ERROR_OUT_OF_MEMORY);
+    nsDependentCString jsid(idBytes.ptr());
+
+    uint32_t idx;
+    nsresult rv = mStatement->GetColumnIndex(jsid, &idx);
+    NS_ENSURE_SUCCESS(rv, rv);
+    int32_t type;
+    rv = mStatement->GetTypeOfIndex(idx, &type);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    if (type == mozIStorageValueArray::VALUE_TYPE_INTEGER ||
+        type == mozIStorageValueArray::VALUE_TYPE_FLOAT) {
+      double dval;
+      rv = mStatement->GetDouble(idx, &dval);
+      NS_ENSURE_SUCCESS(rv, rv);
+      *_vp = ::JS_NumberValue(dval);
+    }
+    else if (type == mozIStorageValueArray::VALUE_TYPE_TEXT) {
+      uint32_t bytes;
+      const char16_t *sval = reinterpret_cast<const char16_t *>(
+        static_cast<mozIStorageStatement *>(mStatement)->
+          AsSharedWString(idx, &bytes)
+      );
+      JSString *str = ::JS_NewUCStringCopyN(aCtx, sval, bytes / 2);
+      if (!str) {
+        *_retval = false;
+        return NS_OK;
+      }
+      *_vp = STRING_TO_JSVAL(str);
+    }
+    else if (type == mozIStorageValueArray::VALUE_TYPE_BLOB) {
+      uint32_t length;
+      const uint8_t *blob = static_cast<mozIStorageStatement *>(mStatement)->
+        AsSharedBlob(idx, &length);
+      JSObject *obj = ::JS_NewArrayObject(aCtx, length);
+      if (!obj) {
+        *_retval = false;
+        return NS_OK;
+      }
+      *_vp = OBJECT_TO_JSVAL(obj);
+
+      // Copy the blob over to the JS array.
+      for (uint32_t i = 0; i < length; i++) {
+        if (!::JS_DefineElement(aCtx, scope, i, blob[i], JSPROP_ENUMERATE)) {
+          *_retval = false;
+          return NS_OK;
+        }
+      }
+    }
+    else if (type == mozIStorageValueArray::VALUE_TYPE_NULL) {
+      *_vp = JSVAL_NULL;
+    }
+    else {
+      NS_ERROR("unknown column type returned, what's going on?");
+    }
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+StatementRow::Resolve(nsIXPConnectWrappedNative *aWrapper,
+                      JSContext *aCtx,
+                      JSObject *aScopeObj,
+                      jsid aId,
+                      bool *aResolvedp,
+                      bool *_retval)
+{
+  JS::Rooted<JSObject*> scopeObj(aCtx, aScopeObj);
+
+  NS_ENSURE_TRUE(mStatement, NS_ERROR_NOT_INITIALIZED);
+  // We do not throw at any point after this because we want to allow the
+  // prototype chain to be checked for the property.
+
+  if (JSID_IS_STRING(aId)) {
+    ::JSAutoByteString idBytes(aCtx, JSID_TO_STRING(aId));
+    NS_ENSURE_TRUE(!!idBytes, NS_ERROR_OUT_OF_MEMORY);
+    nsDependentCString name(idBytes.ptr());
+
+    uint32_t idx;
+    nsresult rv = mStatement->GetColumnIndex(name, &idx);
+    if (NS_FAILED(rv)) {
+      // It's highly likely that the name doesn't exist, so let the JS engine
+      // check the prototype chain and throw if that doesn't have the property
+      // either.
+      *aResolvedp = false;
+      return NS_OK;
+    }
+
+    JS::Rooted<jsid> id(aCtx, aId);
+    *_retval = ::JS_DefinePropertyById(aCtx, scopeObj, id, JS::UndefinedHandleValue, 0);
+    *aResolvedp = true;
+    return NS_OK;
+  }
+
+  return NS_OK;
+}
+
+} // namespace storage
+} // namescape mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageStatementRow.h firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageStatementRow.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/mozStorageStatementRow.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/mozStorageStatementRow.h	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 MOZSTORAGESTATEMENTROW_H
+#define MOZSTORAGESTATEMENTROW_H
+
+#include "mozIStorageStatementRow.h"
+#include "nsIXPCScriptable.h"
+#include "mozilla/Attributes.h"
+
+namespace mozilla {
+namespace storage {
+
+class Statement;
+
+class StatementRow final : public mozIStorageStatementRow
+                         , public nsIXPCScriptable
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_MOZISTORAGESTATEMENTROW
+  NS_DECL_NSIXPCSCRIPTABLE
+
+  explicit StatementRow(Statement *aStatement);
+protected:
+
+  ~StatementRow() {}
+
+  Statement *mStatement;
+
+  friend class StatementRowHolder;
+};
+
+} // namespace storage
+} // namespace mozilla
+
+#endif /* MOZSTORAGESTATEMENTROW_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/moz.build firefox-trunk-41.0~a1~hg20150524r245419/storage/public/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/moz.build	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPIDL_SOURCES += [
-    'mozIStorageAggregateFunction.idl',
-    'mozIStorageAsyncConnection.idl',
-    'mozIStorageAsyncStatement.idl',
-    'mozIStorageBaseStatement.idl',
-    'mozIStorageBindingParams.idl',
-    'mozIStorageBindingParamsArray.idl',
-    'mozIStorageCompletionCallback.idl',
-    'mozIStorageConnection.idl',
-    'mozIStorageError.idl',
-    'mozIStorageFunction.idl',
-    'mozIStoragePendingStatement.idl',
-    'mozIStorageProgressHandler.idl',
-    'mozIStorageResultSet.idl',
-    'mozIStorageRow.idl',
-    'mozIStorageService.idl',
-    'mozIStorageStatement.idl',
-    'mozIStorageStatementCallback.idl',
-    'mozIStorageStatementParams.idl',
-    'mozIStorageStatementRow.idl',
-    'mozIStorageVacuumParticipant.idl',
-    'mozIStorageValueArray.idl',
-]
-
-XPIDL_MODULE = 'storage'
-
-EXPORTS += [
-    'mozStorageHelper.h',
-]
-
-EXPORTS.mozilla += [
-    'storage.h',
-]
-
-# NOTE When adding something to this list, you probably need to add it to the
-#      storage.h file too.
-EXPORTS.mozilla.storage += [
-    'StatementCache.h',
-]
-# SEE ABOVE NOTE!
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageAggregateFunction.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageAggregateFunction.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageAggregateFunction.idl	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageAggregateFunction.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +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 "nsISupports.idl"
-
-interface mozIStorageConnection;
-interface mozIStorageValueArray;
-interface nsIArray;
-interface nsIVariant;
-
-/**
- * mozIStorageAggregateFunction represents aggregate SQL function.
- * Common examples of aggregate functions are SUM() and COUNT().
- *
- * An aggregate function calculates one result for a given set of data, where
- * a set of data is a group of tuples. There can be one group
- * per request or many of them, if GROUP BY clause is used or not.
- */
-[scriptable, uuid(763217b7-3123-11da-918d-000347412e16)]
-interface mozIStorageAggregateFunction : nsISupports {
-  /**
-   * onStep is called when next value should be passed to
-   * a custom function.
-   * 
-   * @param aFunctionArguments    The arguments passed in to the function
-   */
-  void onStep(in mozIStorageValueArray aFunctionArguments);
-
-  /**
-   * Called when all tuples in a group have been processed and the engine
-   * needs the aggregate function's value.
-   *
-   * @returns aggregate result as Variant.
-   */
-  nsIVariant onFinal();
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageAsyncConnection.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageAsyncConnection.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageAsyncConnection.idl	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageAsyncConnection.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,214 +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 "nsISupports.idl"
-
-interface mozIStorageAggregateFunction;
-interface mozIStorageCompletionCallback;
-interface mozIStorageFunction;
-interface mozIStorageProgressHandler;
-interface mozIStorageBaseStatement;
-interface mozIStorageStatement;
-interface mozIStorageAsyncStatement;
-interface mozIStorageStatementCallback;
-interface mozIStoragePendingStatement;
-interface nsIFile;
-
-/**
- * mozIStorageAsyncConnection represents an asynchronous database
- * connection attached to a specific file or to an in-memory data
- * storage.  It is the primary interface for interacting with a
- * database from the main thread, including creating prepared
- * statements, executing SQL, and examining database errors.
- */
-[scriptable, uuid(8bfd34d5-4ddf-4e4b-89dd-9b14f33534c6)]
-interface mozIStorageAsyncConnection : nsISupports {
-  /**
-   * Close this database connection, allowing all pending statements
-   * to complete first.
-   *
-   * @param aCallback [optional]
-   *        A callback that will be notified when the close is completed,
-   *        with the following arguments:
-   *        - status: the status of the call
-   *        - value: |null|
-   *
-   * @throws NS_ERROR_NOT_SAME_THREAD
-   *         If is called on a thread other than the one that opened it.
-   */
-  void asyncClose([optional] in mozIStorageCompletionCallback aCallback);
-
-  /**
-   * Clone a database and make the clone read only if needed.
-   *
-   * @param aReadOnly
-   *        If true, the returned database should be put into read-only mode.
-   *
-   * @param aCallback
-   *        A callback that will be notified when the operation is complete,
-   *        with the following arguments:
-   *        - status: the status of the operation
-   *        - value: in case of success, an intance of
-   *             mozIStorageAsyncConnection cloned from this one.
-   *
-   * @throws NS_ERROR_NOT_SAME_THREAD
-   *         If is called on a thread other than the one that opened it.
-   * @throws NS_ERROR_UNEXPECTED
-   *         If this connection is a memory database.
-   *
-   * @note If your connection is already read-only, you will get a read-only
-   *       clone.
-   * @note Due to a bug in SQLite, if you use the shared cache
-   *       (see mozIStorageService), you end up with the same privileges as the
-   *       first connection opened regardless of what is specified in aReadOnly.
-   * @note The following pragmas are copied over to a read-only clone:
-   *        - cache_size
-   *        - temp_store
-   *       The following pragmas are copied over to a writeable clone:
-   *        - cache_size
-   *        - temp_store
-   *        - foreign_keys
-   *        - journal_size_limit
-   *        - synchronous
-   *        - wal_autocheckpoint
-   */
-  void asyncClone(in boolean aReadOnly,
-                  in mozIStorageCompletionCallback aCallback);
-
-  /**
-   * The current database nsIFile.  Null if the database
-   * connection refers to an in-memory database.
-   */
-  readonly attribute nsIFile databaseFile;
-
-  //////////////////////////////////////////////////////////////////////////////
-  //// Statement creation
-
-  /**
-   * Create an asynchronous statement for the given SQL. An
-   * asynchronous statement can only be used to dispatch asynchronous
-   * requests to the asynchronous execution thread and cannot be used
-   * to take any synchronous actions on the database.
-   *
-   * The expression may use ? to indicate sequential numbered arguments,
-   * ?1, ?2 etc. to indicate specific numbered arguments or :name and
-   * $var to indicate named arguments.
-   *
-   * @param aSQLStatement
-   *        The SQL statement to execute.
-   * @return a new mozIStorageAsyncStatement
-   * @note The statement is created lazily on first execution.
-   */
-  mozIStorageAsyncStatement createAsyncStatement(in AUTF8String aSQLStatement);
-
-  /**
-   * Execute an array of statements created with this connection using
-   * any currently bound parameters. When the array contains multiple
-   * statements, the execution is wrapped in a single
-   * transaction. These statements can be reused immediately, and
-   * reset does not need to be called.
-   *
-   * @param aStatements
-   *        The array of statements to execute asynchronously, in the order they
-   *        are given in the array.
-   * @param aNumStatements
-   *        The number of statements in aStatements.
-   * @param aCallback [optional]
-   *        The callback object that will be notified of progress, errors, and
-   *        completion.
-   * @return an object that can be used to cancel the statements execution.
-   *
-   * @note If you have any custom defined functions, they must be
-   *        re-entrant since they can be called on multiple threads.
-   */
-  mozIStoragePendingStatement executeAsync(
-    [array, size_is(aNumStatements)] in mozIStorageBaseStatement aStatements,
-    in unsigned long aNumStatements,
-    [optional] in mozIStorageStatementCallback aCallback
-  );
-
-  /**
-   * Execute asynchronously an SQL expression, expecting no arguments.
-   *
-   * @param aSQLStatement
-   *        The SQL statement to execute
-   * @param aCallback [optional]
-   *        The callback object that will be notified of progress, errors, and
-   *        completion.
-   * @return an object that can be used to cancel the statement execution.
-   */
-  mozIStoragePendingStatement executeSimpleSQLAsync(
-    in AUTF8String aSQLStatement,
-    [optional] in mozIStorageStatementCallback aCallback);
-
-  //////////////////////////////////////////////////////////////////////////////
-  //// Functions
-
-  /**
-   * Create a new SQL function.  If you use your connection on multiple threads,
-   * your function needs to be threadsafe, or it should only be called on one
-   * thread.
-   *
-   * @param aFunctionName
-   *        The name of function to create, as seen in SQL.
-   * @param aNumArguments
-   *        The number of arguments the function takes. Pass -1 for
-   *        variable-argument functions.
-   * @param aFunction
-   *        The instance of mozIStorageFunction, which implements the function
-   *        in question.
-   */
-  void createFunction(in AUTF8String aFunctionName,
-                      in long aNumArguments,
-                      in mozIStorageFunction aFunction);
-
-  /**
-   * Create a new SQL aggregate function.  If you use your connection on
-   * multiple threads, your function needs to be threadsafe, or it should only
-   * be called on one thread.
-   *
-   * @param aFunctionName
-   *        The name of aggregate function to create, as seen in SQL.
-   * @param aNumArguments
-   *        The number of arguments the function takes. Pass -1 for
-   *        variable-argument functions.
-   * @param aFunction
-   *        The instance of mozIStorageAggreagteFunction, which implements the
-   *        function in question.
-   */
-  void createAggregateFunction(in AUTF8String aFunctionName,
-                               in long aNumArguments,
-                               in mozIStorageAggregateFunction aFunction);
-  /**
-   * Delete custom SQL function (simple or aggregate one).
-   *
-   * @param aFunctionName
-   *        The name of function to remove.
-   */
-  void removeFunction(in AUTF8String aFunctionName);
-
-  /**
-   * Sets a progress handler. Only one handler can be registered at a time.
-   * If you need more than one, you need to chain them yourself.  This progress
-   * handler should be threadsafe if you use this connection object on more than
-   * one thread.
-   *
-   * @param aGranularity
-   *        The number of SQL virtual machine steps between progress handler
-   *        callbacks.
-   * @param aHandler
-   *        The instance of mozIStorageProgressHandler.
-   * @return previous registered handler.
-   */
-  mozIStorageProgressHandler setProgressHandler(in int32_t aGranularity,
-                                                in mozIStorageProgressHandler aHandler);
-
-  /**
-   * Remove a progress handler.
-   *
-   * @return previous registered handler.
-   */
-  mozIStorageProgressHandler removeProgressHandler();
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageAsyncStatement.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageAsyncStatement.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageAsyncStatement.idl	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageAsyncStatement.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 sts=2 expandtab
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "mozIStorageBaseStatement.idl"
-
-/**
- * An asynchronous SQL statement.  This differs from mozIStorageStatement by
- * only being usable for asynchronous execution.  (mozIStorageStatement can
- * be used for both synchronous and asynchronous purposes.)  This specialization
- * for asynchronous operation allows us to avoid needing to acquire
- * synchronization primitives also used by the asynchronous execution thread.
- * In contrast, mozIStorageStatement may need to acquire the primitives and
- * consequently can cause the main thread to lock for extended intervals while
- * the asynchronous thread performs some long-running operation.
- */
-[scriptable, uuid(52e49370-3b2e-4a27-a3fc-79e20ad4056b)]
-interface mozIStorageAsyncStatement : mozIStorageBaseStatement {
-  /*
-   * 'params' provides a magic JS helper that lets you assign parameters by
-   * name.  Unlike the helper on mozIStorageStatement, you cannot enumerate
-   * in order to find out what parameters are legal.
-   *
-   * This does not work for BLOBs.  You must use an explicit binding API for
-   * that.
-   *
-   * example:
-   *  stmt.params.foo = 1;
-   *  stmt.params["bar"] = 2;
-   *  let argName = "baz";
-   *  stmt.params[argName] = 3;
-   *
-   * readonly attribute nsIMagic params;
-   */
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageBaseStatement.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageBaseStatement.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageBaseStatement.idl	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageBaseStatement.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,158 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=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/. */
-
-#include "nsISupports.idl"
-#include "mozIStorageBindingParams.idl"
-
-interface mozIStorageConnection;
-interface mozIStorageStatementCallback;
-interface mozIStoragePendingStatement;
-interface mozIStorageBindingParams;
-interface mozIStorageBindingParamsArray;
-
-/**
- * The base interface for both pure asynchronous storage statements 
- * (mozIStorageAsyncStatement) and 'classic' storage statements
- * (mozIStorageStatement) that can be used for both synchronous and asynchronous
- * purposes.
- */
-[scriptable, uuid(16ca67aa-1325-43e2-aac7-859afd1590b2)]
-interface mozIStorageBaseStatement : mozIStorageBindingParams {
-  /**
-   * Finalizes a statement so you can successfully close a database connection.
-   * Once a statement has been finalized it can no longer be used for any
-   * purpose.
-   * 
-   * Statements are implicitly finalized when their reference counts hits zero.
-   * If you are a native (C++) caller this is accomplished by setting all of
-   * your nsCOMPtr instances to be NULL.  If you are operating from JavaScript
-   * code then you cannot rely on this behavior because of the involvement of
-   * garbage collection.
-   *
-   * When finalizing an asynchronous statement you do not need to worry about
-   * whether the statement has actually been executed by the asynchronous
-   * thread; you just need to call finalize after your last call to executeAsync
-   * involving the statement.  However, you do need to use asyncClose instead of
-   * close on the connection if any statements have been used asynchronously.
-   */
-  void finalize();
-
-  /**
-   * Bind the given value at the given numeric index.
-   *
-   * @param aParamIndex
-   *        0-based index, 0 corresponding to the first numbered argument or
-   *        "?1".
-   * @param aValue
-   *        Argument value.
-   * @param aValueSize
-   *        Length of aValue in bytes.
-   * @{
-   */
-  [deprecated] void bindUTF8StringParameter(in unsigned long aParamIndex,
-                                            in AUTF8String aValue);
-  [deprecated] void bindStringParameter(in unsigned long aParamIndex,
-                                        in AString aValue);
-  [deprecated] void bindDoubleParameter(in unsigned long aParamIndex,
-                                        in double aValue);
-  [deprecated] void bindInt32Parameter(in unsigned long aParamIndex,
-                                       in long aValue);
-  [deprecated] void bindInt64Parameter(in unsigned long aParamIndex,
-                                       in long long aValue);
-  [deprecated] void bindNullParameter(in unsigned long aParamIndex);
-  [deprecated] void bindBlobParameter(
-    in unsigned long aParamIndex,
-    [array,const,size_is(aValueSize)] in octet aValue,
-    in unsigned long aValueSize);
-  [deprecated] void bindStringAsBlobParameter(
-    in unsigned long aParamIndex,
-    in AString aValue);
-  [deprecated] void bindUTF8StringAsBlobParameter(
-    in unsigned long aParamIndex,
-    in AUTF8String aValue);
-  [deprecated] void bindAdoptedBlobParameter(
-    in unsigned long aParamIndex,
-    [array,size_is(aValueSize)] in octet aValue,
-    in unsigned long aValueSize);
-  /**@}*/
-
-  /**
-   * Binds the array of parameters to the statement.  When executeAsync is
-   * called, all the parameters in aParameters are bound and then executed.
-   *
-   * @param aParameters
-   *        The array of parameters to bind to the statement upon execution.
-   *
-   * @note This is only works on statements being used asynchronously.
-   */
-  void bindParameters(in mozIStorageBindingParamsArray aParameters);
-
-  /**
-   * Creates a new mozIStorageBindingParamsArray that can be used to bind
-   * multiple sets of data to a statement with bindParameters.
-   *
-   * @return a mozIStorageBindingParamsArray that multiple sets of parameters
-   *         can be bound to.
-   *
-   * @note This is only useful for statements being used asynchronously.
-   */
-  mozIStorageBindingParamsArray newBindingParamsArray();
-
-  /**
-   * Execute a query asynchronously using any currently bound parameters.  This
-   * statement can be reused immediately, and reset does not need to be called.
-   *
-   * @note If you have any custom defined functions, they must be re-entrant
-   *       since they can be called on multiple threads.
-   *
-   * @param aCallback [optional]
-   *        The callback object that will be notified of progress, errors, and
-   *        completion.
-   * @return an object that can be used to cancel the statements execution.
-   */
-  mozIStoragePendingStatement executeAsync(
-    [optional] in mozIStorageStatementCallback aCallback
-  );
-
-  /**
-   * The statement is not usable, either because it failed to initialize or
-   * was explicitly finalized.
-   */
-  const long MOZ_STORAGE_STATEMENT_INVALID = 0;
-  /**
-   * The statement is usable.
-   */
-  const long MOZ_STORAGE_STATEMENT_READY = 1;
-  /**
-   * Indicates that the statement is executing and the row getters may be used.
-   *
-   * @note This is only relevant for mozIStorageStatement instances being used
-   *       in a synchronous fashion.
-   */
-  const long MOZ_STORAGE_STATEMENT_EXECUTING = 2;
-
-  /**
-   * Find out whether the statement is usable (has not been finalized).
-   */
-  readonly attribute long state;
-
-  /**
-   * Escape a string for SQL LIKE search.
-   *
-   * @note Consumers will have to use same escape char when doing statements
-   *       such as:   ...LIKE '?1' ESCAPE '/'...
-   *
-   * @param aValue
-   *        The string to escape for SQL LIKE.
-   * @param aEscapeChar
-   *        The escape character.
-   * @return an AString of an escaped version of aValue
-   *         (%, _ and the escape char are escaped with the escape char)
-   *         For example, we will convert "foo/bar_baz%20cheese" 
-   *         into "foo//bar/_baz/%20cheese" (if the escape char is '/').
-   */
-  AString escapeStringForLIKE(in AString aValue, in wchar aEscapeChar);
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageBindingParamsArray.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageBindingParamsArray.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageBindingParamsArray.idl	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageBindingParamsArray.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=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/. */
-
-#include "nsISupports.idl"
-
-interface mozIStorageBindingParams;
-
-[scriptable, uuid(67eea5c3-4881-41ff-b0fe-09f2356aeadb)]
-interface mozIStorageBindingParamsArray : nsISupports {
-  /**
-   * Creates a new mozIStorageBindingParams object that can be added to this
-   * array.
-   *
-   * @return a mozIStorageBindingParams object that can be used to specify
-   *         parameters that need to be bound.
-   */
-  mozIStorageBindingParams newBindingParams();
-
-  /**
-   * Adds the parameters to the end of this array.
-   *
-   * @param aParameters
-   *        The parameters to add to this array.
-   */
-  void addParams(in mozIStorageBindingParams aParameters);
-
-  /**
-   * The number of mozIStorageBindingParams this object contains.
-   */
-  readonly attribute unsigned long length;
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageBindingParams.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageBindingParams.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageBindingParams.idl	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageBindingParams.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=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/. */
-
-#include "nsISupports.idl"
-
-interface nsIVariant;
-
-[scriptable, uuid(2d09f42f-966e-4663-b4b3-b0c8676bf2bf)]
-interface mozIStorageBindingParams : nsISupports {
-  /**
-   * Binds aValue to the parameter with the name aName.
-   *
-   * @param aName
-   *        The name of the parameter to bind aValue to.
-   * @param aValue
-   *        The value to bind.
-   */
-   void bindByName(in AUTF8String aName,
-                   in nsIVariant aValue);
-   [noscript] void bindUTF8StringByName(in AUTF8String aName,
-                                        in AUTF8String aValue);
-   [noscript] void bindStringByName(in AUTF8String aName,
-                                    in AString aValue);
-   [noscript] void bindDoubleByName(in AUTF8String aName,
-                                    in double aValue);
-   [noscript] void bindInt32ByName(in AUTF8String aName,
-                                   in long aValue);
-   [noscript] void bindInt64ByName(in AUTF8String aName,
-                                   in long long aValue);
-   [noscript] void bindNullByName(in AUTF8String aName);
-   void bindBlobByName(in AUTF8String aName,
-                       [array, const, size_is(aValueSize)] in octet aValue,
-                       in unsigned long aValueSize);
-
-   // Convenience routines for storing strings as blobs.
-   void bindStringAsBlobByName(in AUTF8String aName, in AString aValue);
-   void bindUTF8StringAsBlobByName(in AUTF8String aName, in AUTF8String aValue);
-
-   // The function adopts the storage for the provided blob.  After calling
-   // this function, mozStorage will ensure that free is called on the
-   // underlying pointer.
-   [noscript]
-   void bindAdoptedBlobByName(in AUTF8String aName,
-                              [array, size_is(aValueSize)] in octet aValue,
-                              in unsigned long aValueSize);
-
-   /**
-    * Binds aValue to the parameter with the index aIndex.
-    *
-    * @param aIndex
-    *        The zero-based index of the parameter to bind aValue to.
-    * @param aValue
-    *        The value to bind.
-    */
-   void bindByIndex(in unsigned long aIndex,
-                    in nsIVariant aValue);
-   [noscript] void bindUTF8StringByIndex(in unsigned long aIndex,
-                                         in AUTF8String aValue);
-   [noscript] void bindStringByIndex(in unsigned long aIndex,
-                                     in AString aValue);
-   [noscript] void bindDoubleByIndex(in unsigned long aIndex,
-                                     in double aValue);
-   [noscript] void bindInt32ByIndex(in unsigned long aIndex,
-                                    in long aValue);
-   [noscript] void bindInt64ByIndex(in unsigned long aIndex,
-                                    in long long aValue);
-   [noscript] void bindNullByIndex(in unsigned long aIndex);
-   void bindBlobByIndex(in unsigned long aIndex,
-                        [array, const, size_is(aValueSize)] in octet aValue,
-                        in unsigned long aValueSize);
-
-   // Convenience routines for storing strings as blobs.
-   void bindStringAsBlobByIndex(in unsigned long aIndex, in AString aValue);
-   void bindUTF8StringAsBlobByIndex(in unsigned long aIndex, in AUTF8String aValue);
-
-   // The function adopts the storage for the provided blob.  After calling
-   // this function, mozStorage will ensure that free is called on the
-   // underlying pointer.
-   [noscript]
-   void bindAdoptedBlobByIndex(in unsigned long aIndex,
-                               [array, size_is(aValueSize)] in octet aValue,
-                               in unsigned long aValueSize);
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageCompletionCallback.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageCompletionCallback.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageCompletionCallback.idl	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageCompletionCallback.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-  vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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, function, uuid(8cbf2dc2-91e0-44bc-984f-553638412071)]
-interface mozIStorageCompletionCallback : nsISupports {
-  /**
-   * Indicates that the event this callback was passed in for has completed.
-   *
-   * @param status
-   *        The status of the call. Generally NS_OK if the operation
-   *        completed successfully.
-   * @param value
-   *        If the operation produces a result, the result. Otherwise,
-   *        |null|.
-   *
-   * @see The calling method for expected values.
-   */
-  void complete(in nsresult status, [optional] in nsISupports value);
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageConnection.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageConnection.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageConnection.idl	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageConnection.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,241 +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 "nsISupports.idl"
-#include "mozIStorageAsyncConnection.idl"
-
-interface mozIStorageAggregateFunction;
-interface mozIStorageCompletionCallback;
-interface mozIStorageFunction;
-interface mozIStorageProgressHandler;
-interface mozIStorageBaseStatement;
-interface mozIStorageStatement;
-interface mozIStorageAsyncStatement;
-interface mozIStorageStatementCallback;
-interface mozIStoragePendingStatement;
-interface nsIFile;
-
-/**
- * mozIStorageConnection represents a database connection attached to
- * a specific file or to the in-memory data storage.  It is the
- * primary interface for interacting with a database, including
- * creating prepared statements, executing SQL, and examining database
- * errors.
- *
- * @note From the main thread, you should rather use mozIStorageAsyncConnection.
- *
- * @threadsafe
- */
-[scriptable, uuid(4aa2ac47-8d24-4004-9b31-ec0bd85f0cc3)]
-interface mozIStorageConnection : mozIStorageAsyncConnection {
-  /**
-   * Closes a database connection.  Callers must finalize all statements created
-   * for this connection prior to calling this method.  It is illegal to use
-   * call this method if any asynchronous statements have been executed on this
-   * connection.
-   *
-   * @throws NS_ERROR_UNEXPECTED
-   *         If any statement has been executed asynchronously on this object.
-   * @throws NS_ERROR_UNEXPECTED
-   *         If is called on a thread other than the one that opened it.
-   */
-  void close();
-
-  /**
-   * Clones a database connection and makes the clone read only if needed.
-   *
-   * @param aReadOnly
-   *        If true, the returned database should be put into read-only mode.
-   *        Defaults to false.
-   * @return the cloned database connection.
-   *
-   * @throws NS_ERROR_UNEXPECTED
-   *         If this connection is a memory database.
-   * @note If your connection is already read-only, you will get a read-only
-   *       clone.
-   * @note Due to a bug in SQLite, if you use the shared cache (openDatabase),
-   *       you end up with the same privileges as the first connection opened
-   *       regardless of what is specified in aReadOnly.
-   * @note The following pragmas are copied over to a read-only clone:
-   *        - cache_size
-   *        - temp_store
-   *       The following pragmas are copied over to a writeable clone:
-   *        - cache_size
-   *        - temp_store
-   *        - foreign_keys
-   *        - journal_size_limit
-   *        - synchronous
-   *        - wal_autocheckpoint
-   *
-   */
-  mozIStorageConnection clone([optional] in boolean aReadOnly);
-
-  /**
-   * The default size for SQLite database pages used by mozStorage for new
-   * databases.
-   */
-  readonly attribute long defaultPageSize;
-
-  /**
-   * Indicates if the connection is open and ready to use.  This will be false
-   * if the connection failed to open, or it has been closed.
-   */
-  readonly attribute boolean connectionReady;
-
-  /**
-   * lastInsertRowID returns the row ID from the last INSERT
-   * operation.
-   */
-  readonly attribute long long lastInsertRowID;
-
-  /**
-   * affectedRows returns the number of database rows that were changed or
-   * inserted or deleted by last operation.
-   */
-  readonly attribute long affectedRows;
-
-  /**
-   * The last error SQLite error code.
-   */
-  readonly attribute long lastError;
-
-  /**
-   * The last SQLite error as a string (in english, straight from the
-   * sqlite library).
-   */
-  readonly attribute AUTF8String lastErrorString;
-
-  /**
-   * The schema version of the database.  This should not be used until the 
-   * database is ready.  The schema will be reported as zero if it is not set.
-   */
-  attribute long schemaVersion;
-
-  //////////////////////////////////////////////////////////////////////////////
-  //// Statement creation
-
-  /**
-   * Create a mozIStorageStatement for the given SQL expression.  The
-   * expression may use ? to indicate sequential numbered arguments,
-   * ?1, ?2 etc. to indicate specific numbered arguments or :name and 
-   * $var to indicate named arguments.
-   *
-   * @param aSQLStatement
-   *        The SQL statement to execute.
-   * @return a new mozIStorageStatement
-   */
-  mozIStorageStatement createStatement(in AUTF8String aSQLStatement);
-
-  /**
-   * Execute a SQL expression, expecting no arguments.
-   *
-   * @param aSQLStatement  The SQL statement to execute
-   */
-  void executeSimpleSQL(in AUTF8String aSQLStatement);
-
-  /**
-   * Check if the given table exists.
-   *
-   * @param aTableName
-   *        The table to check
-   * @return TRUE if table exists, FALSE otherwise.
-   */
-  boolean tableExists(in AUTF8String aTableName);
-
-  /**
-   * Check if the given index exists.
-   *
-   * @param aIndexName   The index to check
-   * @return TRUE if the index exists, FALSE otherwise.
-   */
-  boolean indexExists(in AUTF8String aIndexName);
-
-  //////////////////////////////////////////////////////////////////////////////
-  //// Transactions
-
-  /**
-   * Returns true if a transaction is active on this connection.
-   */
-  readonly attribute boolean transactionInProgress;
-
-  /**
-   * Begin a new transaction.  sqlite default transactions are deferred.
-   * If a transaction is active, throws an error.
-   */
-  void beginTransaction();
-
-  /**
-   * Begins a new transaction with the given type.
-   */
-  const int32_t TRANSACTION_DEFERRED = 0;
-  const int32_t TRANSACTION_IMMEDIATE = 1;
-  const int32_t TRANSACTION_EXCLUSIVE = 2;
-  void beginTransactionAs(in int32_t transactionType);
-
-  /**
-   * Commits the current transaction.  If no transaction is active,
-   * @throws NS_ERROR_UNEXPECTED.
-   * @throws NS_ERROR_NOT_INITIALIZED.
-   */
-  void commitTransaction();
-
-  /**
-   * Rolls back the current transaction.  If no transaction is active,
-   * @throws NS_ERROR_UNEXPECTED.
-   * @throws NS_ERROR_NOT_INITIALIZED.
-   */
-  void rollbackTransaction();
-
-  //////////////////////////////////////////////////////////////////////////////
-  //// Tables
-
-  /**
-   * Create the table with the given name and schema.
-   *
-   * If the table already exists, NS_ERROR_FAILURE is thrown.
-   * (XXX at some point in the future it will check if the schema is
-   * the same as what is specified, but that doesn't happen currently.)
-   *
-   * @param aTableName
-   *        The table name to be created, consisting of [A-Za-z0-9_], and
-   *        beginning with a letter.
-   * @param aTableSchema
-   *        The schema of the table; what would normally go between the parens
-   *        in a CREATE TABLE statement: e.g., "foo  INTEGER, bar STRING".
-   *
-   * @throws NS_ERROR_FAILURE
-   *         If the table already exists or could not be created for any other
-   *         reason.
-   */
-  void createTable(in string aTableName,
-                   in string aTableSchema);
-
-  /**
-   * Controls SQLITE_FCNTL_CHUNK_SIZE setting in sqlite. This helps avoid fragmentation
-   * by growing/shrinking the database file in SQLITE_FCNTL_CHUNK_SIZE increments. To
-   * conserve memory on systems short on storage space, this function will have no effect
-   * on mobile devices or if less than 500MiB of space is left available.
-   *
-   * @param aIncrement
-   *        The database file will grow in multiples of chunkSize.
-   * @param aDatabaseName
-   *        Sqlite database name. "" means pass NULL for zDbName to sqlite3_file_control.
-   *        See http://sqlite.org/c3ref/file_control.html for more details.
-   * @throws NS_ERROR_FILE_TOO_BIG
-   *         If the system is short on storage space.
-   */
-  void setGrowthIncrement(in int32_t aIncrement, in AUTF8String aDatabaseName);
-
-  /**
-   * Enable a predefined virtual table implementation.
-   *
-   * @param aModuleName
-   *        The module to enable. Only "filesystem" is currently supported.
-   *
-   * @throws NS_ERROR_FAILURE
-   *         For unknown module names.
-   */
-  [noscript] void enableModule(in ACString aModuleName);
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageError.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageError.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageError.idl	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageError.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,149 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 sts=2 expandtab 
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-
-%{C++
-#ifdef ERROR
-#undef ERROR
-#endif
-%}
-
-[scriptable, uuid(1f350f96-7023-434a-8864-40a1c493aac1)]
-interface mozIStorageError : nsISupports {
-
-  /**
-   * General SQL error or missing database.
-   */
-  const long ERROR = 1;
-
-  /**
-   * Internal logic error.
-   */
-  const long INTERNAL = 2;
-
-  /**
-   * Access permission denied.
-   */
-  const long PERM = 3;
-
-  /**
-   * A callback routine requested an abort.
-   */
-  const long ABORT = 4;
-
-  /**
-   * The database file is locked.
-   */
-  const long BUSY = 5;
-
-  /**
-   * A table in the database is locked.
-   */
-  const long LOCKED = 6;
-
-  /**
-   * An allocation failed.
-   */
-  const long NOMEM = 7;
-
-  /**
-   * Attempt to write to a readonly database.
-   */
-  const long READONLY = 8;
-
-  /**
-   * Operation was terminated by an interrupt.
-   */
-  const long INTERRUPT = 9;
-
-  /**
-   * Some kind of disk I/O error occurred.
-   */
-  const long IOERR = 10;
-
-  /**
-   * The database disk image is malformed.
-   */
-  const long CORRUPT = 11;
-
-  /**
-   * An insertion failed because the database is full.
-   */
-  const long FULL = 13;
-
-  /**
-   * Unable to open the database file.
-   */
-  const long CANTOPEN = 14;
-
-  /**
-   * The database is empty.
-   */
-  const long EMPTY = 16;
-
-  /**
-   * The database scheme changed.
-   */
-  const long SCHEMA = 17;
-
-  /**
-   * A string or blob exceeds the size limit.
-   */
-  const long TOOBIG = 18;
-
-  /**
-   * Abort due to a constraint violation.
-   */
-  const long CONSTRAINT = 19;
-
-  /**
-   * Data type mismatch.
-   */
-  const long MISMATCH = 20;
-
-  /**
-   * Library used incorrectly.
-   */
-  const long MISUSE = 21;
-
-  /**
-   * Uses OS features not supported on the host system.
-   */
-  const long NOLFS = 22;
-
-  /**
-   * Authorization denied.
-   */
-  const long AUTH = 23;
-
-  /**
-   * Auxiliary database format error.
-   */
-  const long FORMAT = 24;
-
-  /**
-   * Attempt to bind a parameter using an out-of-range index or nonexistent
-   * named parameter name.
-   */
-  const long RANGE = 25;
-
-  /**
-   * File opened that is not a database file.
-   */
-  const long NOTADB = 26;
-
-
-  /**
-   * Indicates what type of error occurred.
-   */
-  readonly attribute long result;
-
-  /**
-   * An error string the gives more details, if available.
-   */
-  readonly attribute AUTF8String message;
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageFunction.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageFunction.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageFunction.idl	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageFunction.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +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 "nsISupports.idl"
-
-#include "mozIStorageValueArray.idl"
-
-interface mozIStorageConnection;
-interface nsIArray;
-interface nsIVariant;
-
-/**
- * mozIStorageFunction is to be implemented by storage consumers that
- * wish to receive callbacks during the request execution.
- *
- * SQL can apply functions to values from tables. Examples of
- * such functions are MIN(a1,a2) or SQRT(num). Many functions are
- * implemented in SQL engine.
- *
- * This interface allows consumers to implement their own,
- * problem-specific functions.
- * These functions can be called from triggers, too.
- *
- */
-[scriptable, function, uuid(9ff02465-21cb-49f3-b975-7d5b38ceec73)]
-interface mozIStorageFunction : nsISupports {
-  /**
-   * onFunctionCall is called when execution of a custom
-   * function should occur.
-   * 
-   * @param aNumArguments         The number of arguments
-   * @param aFunctionArguments    The arguments passed in to the function
-   *
-   * @returns any value as Variant type.
-   */
-
-  nsIVariant onFunctionCall(in mozIStorageValueArray aFunctionArguments);
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStoragePendingStatement.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStoragePendingStatement.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStoragePendingStatement.idl	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStoragePendingStatement.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 sts=2 expandtab 
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-
-[scriptable, uuid(00da7d20-3768-4398-bedc-e310c324b3f0)]
-interface mozIStoragePendingStatement : nsISupports {
-
-  /**
-   * Cancels a pending statement, if possible.  This will only fail if you try
-   * cancel more than once.
-   *
-   * @note For read statements (such as SELECT), you will no longer receive any
-   *       notifications about results once cancel is called.
-   */
-   void cancel();
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageProgressHandler.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageProgressHandler.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageProgressHandler.idl	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageProgressHandler.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +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 "nsISupports.idl"
-
-interface mozIStorageConnection;
-
-/**
- * mozIProgressHandler is to be implemented by storage consumers that
- * wish to receive callbacks during the request execution.
- */
-[scriptable, uuid(a3a6fcd4-bf89-4208-a837-bf2a73afd30c)]
-interface mozIStorageProgressHandler : nsISupports {
-  /**
-   * onProgress is invoked periodically during long running calls.
-   * 
-   * @param aConnection    connection, for which progress handler is
-   *                       invoked.
-   *
-   * @return true to abort request, false to continue work.
-   */
-
-  boolean onProgress(in mozIStorageConnection aConnection);
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageResultSet.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageResultSet.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageResultSet.idl	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageResultSet.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 sts=2 expandtab 
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-interface mozIStorageRow;
-
-[scriptable, uuid(18dd7953-076d-4598-8105-3e32ad26ab24)]
-interface mozIStorageResultSet : nsISupports {
-
-  /**
-   * Obtains the next row from the result set from the statement that was
-   * executed.
-   *
-   * @returns the next row from the result set.  This will be null when there
-   *          are no more results.
-   */
-  mozIStorageRow getNextRow();
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageRow.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageRow.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageRow.idl	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageRow.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 sts=2 expandtab 
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "mozIStorageValueArray.idl"
-interface nsIVariant;
-
-[scriptable, uuid(62d1b6bd-cbfe-4f9b-aee1-0ead4af4e6dc)]
-interface mozIStorageRow : mozIStorageValueArray {
-
-  /**
-   * Obtains the result of a given column specified by aIndex.
-   *
-   * @param aIndex
-   *        Zero-based index of the result to get from the tuple.
-   * @returns the result of the specified column.
-   */
-  nsIVariant getResultByIndex(in unsigned long aIndex);
-
-  /**
-   * Obtains the result of a given column specified by aName.
-   *
-   * @param aName
-   *        Name of the result to get from the tuple.
-   * @returns the result of the specified column.
-   * @note The name of a result column is the value of the "AS" clause for that
-   *       column.  If there is no AS clause then the name of the column is
-   *       unspecified and may change from one release to the next.
-   */
-  nsIVariant getResultByName(in AUTF8String aName);
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageService.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageService.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageService.idl	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageService.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,193 +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 "nsISupports.idl"
-
-interface mozIStorageConnection;
-interface nsIFile;
-interface nsIFileURL;
-interface nsIPropertyBag2;
-interface nsIVariant;
-interface mozIStorageCompletionCallback;
-
-/**
- * The mozIStorageService interface is intended to be implemented by
- * a service that can create storage connections (mozIStorageConnection)
- * to either a well-known profile database or to a specific database file.
- *
- * This is the only way to open a database connection.
- *
- * @note The first reference to mozIStorageService must be made on the main
- * thread.
- */
-[scriptable, uuid(07b6b2f5-6d97-47b4-9584-e65bc467fe9e)]
-interface mozIStorageService : nsISupports {
-  /**
-   * Open an asynchronous connection to a database.
-   *
-   * This method MUST be called from the main thread. The connection object
-   * returned by this function is not threadsafe. You MUST use it only from
-   * the main thread.
-   *
-   * If you have more than one connection to a file, you MUST use the EXACT
-   * SAME NAME for the file each time, including case. The sqlite code uses
-   * a simple string compare to see if there is already a connection. Opening
-   * a connection to "Foo.sqlite" and "foo.sqlite" will CORRUPT YOUR DATABASE.
-   *
-   * @param aDatabaseStore Either a nsIFile representing the file that contains
-   * the database or a special string to open a special database. The special
-   * string may be:
-   * - "memory" to open an in-memory database.
-   *
-   * @param aOptions A set of options (may be null). Options may contain:
-   * - bool shared (defaults to |false|).
-   *   -- If |true|, opens the database with a shared-cache. The
-   *     shared-cache mode is more memory-efficient when many
-   *     connections to the same database are expected, though, the
-   *     connections will contend the cache resource. In any cases
-   *     where performance matter, working without a shared-cache will
-   *     improve concurrency.  @see openUnsharedDatabase
-   *
-   * - int growthIncrement (defaults to none).
-   *   -- Set the growth increment for the main database.  This hints SQLite to
-   *      grow the database file by a given chunk size and may reduce
-   *      filesystem fragmentation on large databases.
-   *      @see mozIStorageConnection::setGrowthIncrement
-   *
-   * @param aCallback A callback that will receive the result of the operation.
-   *  In case of error, it may receive as status:
-   *  - NS_ERROR_OUT_OF_MEMORY if allocating a new storage object fails.
-   *  - NS_ERROR_FILE_CORRUPTED if the database file is corrupted.
-   *  In case of success, it receives as argument the new database
-   *  connection, as an instance of |mozIStorageAsyncConnection|.
-   *
-   * @throws NS_ERROR_INVALID_ARG if |aDatabaseStore| is neither a file nor
-   *         one of the special strings understood by this method, or if one of
-   *         the options passed through |aOptions| does not have the right type.
-   * @throws NS_ERROR_NOT_SAME_THREAD if called from a thread other than the
-   *         main thread.
-   */
-  void openAsyncDatabase(in nsIVariant aDatabaseStore,
-                         [optional] in nsIPropertyBag2 aOptions,
-                         in mozIStorageCompletionCallback aCallback);
-  /**
-   * Get a connection to a named special database storage.
-   *
-   * @param aStorageKey a string key identifying the type of storage
-   * requested.  Valid values include: "memory".
-   *
-   * @see openDatabase for restrictions on how database connections may be
-   * used. For the profile database, you should only access it from the main
-   * thread since other callers may also have connections.
-   *
-   * @returns a new mozIStorageConnection for the requested
-   * storage database.
-   *
-   * @throws NS_ERROR_INVALID_ARG if aStorageKey is invalid.
-   */
-  mozIStorageConnection openSpecialDatabase(in string aStorageKey);
-
-  /**
-   * Open a connection to the specified file.
-   *
-   * Consumers should check mozIStorageConnection::connectionReady to ensure
-   * that they can use the database.  If this value is false, it is strongly
-   * recommended that the database be backed up with
-   * mozIStorageConnection::backupDB so user data is not lost.
-   *
-   * ==========
-   *   DANGER
-   * ==========
-   *
-   * If you have more than one connection to a file, you MUST use the EXACT
-   * SAME NAME for the file each time, including case. The sqlite code uses
-   * a simple string compare to see if there is already a connection. Opening
-   * a connection to "Foo.sqlite" and "foo.sqlite" will CORRUPT YOUR DATABASE.
-   *
-   * The connection object returned by this function is not threadsafe. You must
-   * use it only from the thread you created it from.
-   *
-   * @param aDatabaseFile
-   *        A nsIFile that represents the database that is to be opened..
-   *
-   * @returns a mozIStorageConnection for the requested database file.
-   *
-   * @throws NS_ERROR_OUT_OF_MEMORY
-   *         If allocating a new storage object fails.
-   * @throws NS_ERROR_FILE_CORRUPTED
-   *         If the database file is corrupted.
-   */
-  mozIStorageConnection openDatabase(in nsIFile aDatabaseFile);
-
-  /**
-   * Open a connection to the specified file that doesn't share a sqlite cache.
-   *
-   * Without a shared-cache, each connection uses its own pages cache, which
-   * may be memory inefficient with a large number of connections, in such a
-   * case so you should use openDatabase instead.  On the other side, if cache
-   * contention may be an issue, for instance when concurrency is important to
-   * ensure responsiveness, using unshared connections may be a performance win.
-   *
-   * ==========
-   *   DANGER
-   * ==========
-   *
-   * If you have more than one connection to a file, you MUST use the EXACT
-   * SAME NAME for the file each time, including case. The sqlite code uses
-   * a simple string compare to see if there is already a connection. Opening
-   * a connection to "Foo.sqlite" and "foo.sqlite" will CORRUPT YOUR DATABASE.
-   *
-   * The connection object returned by this function is not threadsafe. You must
-   * use it only from the thread you created it from.
-   *
-   * @param aDatabaseFile
-   *        A nsIFile that represents the database that is to be opened.
-   *
-   * @returns a mozIStorageConnection for the requested database file.
-   *
-   * @throws NS_ERROR_OUT_OF_MEMORY
-   *         If allocating a new storage object fails.
-   * @throws NS_ERROR_FILE_CORRUPTED
-   *         If the database file is corrupted.
-   */
-  mozIStorageConnection openUnsharedDatabase(in nsIFile aDatabaseFile);
-
-  /**
-   * See openDatabase(). Exactly the same only initialized with a file URL.
-   * Custom parameters can be passed to SQLite and VFS implementations through
-   * the query part of the URL.
-   *
-   * @param aURL
-   *        A nsIFileURL that represents the database that is to be opened.
-   */
-  mozIStorageConnection openDatabaseWithFileURL(in nsIFileURL aFileURL);
-
-  /*
-   * Utilities
-   */
-
-  /**
-   * Copies the specified database file to the specified parent directory with
-   * the specified file name.  If the parent directory is not specified, it
-   * places the backup in the same directory as the current file.  This function
-   * ensures that the file being created is unique.
-   *
-   * @param aDBFile
-   *        The database file that will be backed up.
-   * @param aBackupFileName
-   *        The name of the new backup file to create.
-   * @param [optional] aBackupParentDirectory
-   *        The directory you'd like the backup file to be placed.
-   * @return The nsIFile representing the backup file.
-   */
-  nsIFile backupDatabaseFile(in nsIFile aDBFile, in AString aBackupFileName,
-                             [optional] in nsIFile aBackupParentDirectory);
-};
-
-%{C++
-
-#define MOZ_STORAGE_MEMORY_STORAGE_KEY    "memory"
-
-%}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageStatementCallback.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageStatementCallback.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageStatementCallback.idl	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageStatementCallback.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 sts=2 expandtab 
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-
-interface mozIStorageResultSet;
-interface mozIStorageError;
-
-[scriptable, uuid(29383d00-d8c4-4ddd-9f8b-c2feb0f2fcfa)]
-interface mozIStorageStatementCallback : nsISupports {
-
-  /**
-   * Called when some result is obtained from the database.  This function can
-   * be called more than once with a different storageIResultSet each time for
-   * any given asynchronous statement.
-   *
-   * @param aResultSet
-   *        The result set containing the data from the database.
-   */
-  void handleResult(in mozIStorageResultSet aResultSet);
-
-  /**
-   * Called when some error occurs while executing the statement.  This function
-   * may be called more than once with a different storageIError each time for
-   * any given asynchronous statement.
-   *
-   * @param aError
-   *        An object containing information about the error.
-   */
-  void handleError(in mozIStorageError aError);
-
-  /**
-   * Called when the statement has finished executing.  This function will only
-   * be called once for any given asynchronous statement.
-   *
-   * @param aReason
-   *        Indicates if the statement is no longer executing because it either
-   *        finished (REASON_FINISHED), was canceled (REASON_CANCELED), or
-   *        a fatal error occurred (REASON_ERROR).
-   */
-  const unsigned short REASON_FINISHED = 0;
-  const unsigned short REASON_CANCELED = 1;
-  const unsigned short REASON_ERROR = 2;
-  void handleCompletion(in unsigned short aReason);
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageStatement.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageStatement.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageStatement.idl	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageStatement.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,317 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 sts=2 expandtab
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "mozIStorageBaseStatement.idl"
-%{C++
-#include "mozilla/DebugOnly.h"
-%}
-
-[ptr] native octetPtr(uint8_t);
-
-/**
- * A SQL statement that can be used for both synchronous and asynchronous
- * purposes.
- */
-[scriptable, uuid(5f567c35-6c32-4140-828c-683ea49cfd3a)]
-interface mozIStorageStatement : mozIStorageBaseStatement {
-  /**
-   * Create a clone of this statement, by initializing a new statement
-   * with the same connection and same SQL statement as this one.  It
-   * does not preserve statement state; that is, if a statement is
-   * being executed when it is cloned, the new statement will not be
-   * executing.
-   */
-  mozIStorageStatement clone();
-
-  /*
-   * Number of parameters
-   */
-  readonly attribute unsigned long parameterCount;
-
-  /**
-   * Name of nth parameter, if given
-   */
-  AUTF8String getParameterName(in unsigned long aParamIndex);
-
-  /**
-   * Returns the index of the named parameter.
-   *
-   * @param aName
-   *        The name of the parameter you want the index for.  This does not
-   *        include the leading ':'.
-   * @return the index of the named parameter.
-   */
-  unsigned long getParameterIndex(in AUTF8String aName);
-
-  /**
-   * Number of columns returned
-   */
-  readonly attribute unsigned long columnCount;
-
-  /**
-   * Name of nth column
-   */
-  AUTF8String getColumnName(in unsigned long aColumnIndex);
-
-  /**
-   * Obtains the index of the column with the specified name.
-   *
-   * @param aName
-   *        The name of the column.
-   * @return The index of the column with the specified name.
-   */
-  unsigned long getColumnIndex(in AUTF8String aName);
-
-  /**
-   * Obtains the declared column type of a prepared statement.
-   *
-   * @param aParamIndex
-   *        The zero-based index of the column who's declared type we are
-   *        interested in.
-   * @return the declared index type.
-   */
-  AUTF8String getColumnDecltype(in unsigned long aParamIndex);
-
-  /**
-   * Reset parameters/statement execution
-   */
-  void reset();
-
-  /**
-   * Execute the query, ignoring any results.  This is accomplished by
-   * calling executeStep() once, and then calling reset().
-   *
-   * Error and last insert info, etc. are available from
-   * the mozStorageConnection.
-   */
-  void execute();
-
-  /**
-   * Execute a query, using any currently-bound parameters.  Reset
-   * must be called on the statement after the last call of
-   * executeStep.
-   *
-   * @return a boolean indicating whether there are more rows or not;
-   *         row data may be accessed using mozIStorageValueArray methods on
-   *         the statement.
-   */
-  boolean executeStep();
-
-  /**
-   * Execute a query, using any currently-bound parameters.  Reset is called
-   * when no more data is returned.  This method is only available to JavaScript
-   * consumers.
-   *
-   * @deprecated As of Mozilla 1.9.2 in favor of executeStep().
-   *
-   * @return a boolean indicating whether there are more rows or not.
-   *
-   * [deprecated] boolean step();
-   */
-
-  /**
-   * Obtains the current list of named parameters, which are settable.  This
-   * property is only available to JavaScript consumers.
-   *
-   * readonly attribute mozIStorageStatementParams params;
-   */
-
-  /**
-   * Obtains the current row, with access to all the data members by name.  This
-   * property is only available to JavaScript consumers.
-   *
-   * readonly attribute mozIStorageStatementRow row;
-   */
-
-  //////////////////////////////////////////////////////////////////////////////
-  //// Copied contents of mozIStorageValueArray
-
-  /**
-   * These type values are returned by getTypeOfIndex
-   * to indicate what type of value is present at
-   * a given column.
-   */
-  const long VALUE_TYPE_NULL = 0;
-  const long VALUE_TYPE_INTEGER = 1;
-  const long VALUE_TYPE_FLOAT = 2;
-  const long VALUE_TYPE_TEXT = 3;
-  const long VALUE_TYPE_BLOB = 4;
-
-  /**
-   * The number of entries in the array (each corresponding to a column in the
-   * database row)
-   */
-  readonly attribute unsigned long numEntries;
-
-  /**
-   * Indicate the data type of the current result row for the the given column.
-   * SQLite will perform type conversion if you ask for a value as a different
-   * type than it is stored as.
-   *
-   * @param aIndex
-   *        0-based column index.
-   * @return The type of the value at the given column index; one of
-   *         VALUE_TYPE_NULL, VALUE_TYPE_INTEGER, VALUE_TYPE_FLOAT,
-   *         VALUE_TYPE_TEXT, VALUE_TYPE_BLOB.
-   */
-  long getTypeOfIndex(in unsigned long aIndex);
-
-  /**
-   * Retrieve the contents of a column from the current result row as an
-   * integer.
-   *
-   * @param aIndex
-   *        0-based colummn index.
-   * @return Column value interpreted as an integer per type conversion rules.
-   * @{
-   */
-  long getInt32(in unsigned long aIndex);
-  long long getInt64(in unsigned long aIndex);
-  /** @} */
-  /**
-   * Retrieve the contents of a column from the current result row as a
-   * floating point double.
-   *
-   * @param aIndex
-   *        0-based colummn index.
-   * @return Column value interpreted as a double per type conversion rules.
-   */
-  double getDouble(in unsigned long aIndex);
-  /**
-   * Retrieve the contents of a column from the current result row as a
-   * string.
-   *
-   * @param aIndex
-   *        0-based colummn index.
-   * @return The value for the result column interpreted as a string.  If the
-   *         stored value was NULL, you will get an empty string with IsVoid set
-   *         to distinguish it from an explicitly set empty string.
-   * @{
-   */
-  AUTF8String getUTF8String(in unsigned long aIndex);
-  AString getString(in unsigned long aIndex);
-  /** @} */
-
-  /**
-   * Retrieve the contents of a column from the current result row as a
-   * blob.
-   *
-   * @param aIndex
-   *        0-based colummn index.
-   * @param[out] aDataSize
-   *             The number of bytes in the blob.
-   * @param[out] aData
-   *             The contents of the BLOB.  This will be NULL if aDataSize == 0.
-   */
-  void getBlob(in unsigned long aIndex, out unsigned long aDataSize, [array,size_is(aDataSize)] out octet aData);
-
-  /**
-   * Retrieve the contents of a Blob column from the current result row as a
-   * string.
-   *
-   * @param aIndex
-   *        0-based colummn index.
-   * @return The value for the result Blob column interpreted as a String.
-   *         No encoding conversion is performed.
-   */
-  AString getBlobAsString(in unsigned long aIndex);
-
-  /**
-   * Retrieve the contents of a Blob column from the current result row as a
-   * UTF8 string.
-   *
-   * @param aIndex
-   *        0-based colummn index.
-   * @return The value for the result Blob column interpreted as a UTF8 String.
-   *         No encoding conversion is performed.
-   */
-  AUTF8String getBlobAsUTF8String(in unsigned long aIndex);
-
-  /**
-   * Check whether the given column in the current result row is NULL.
-   *
-   * @param aIndex
-   *        0-based colummn index.
-   * @return true if the value for the result column is null.
-   */
-  boolean getIsNull(in unsigned long aIndex);
-
-  /**
-   * Returns a shared string pointer
-   */
-  [noscript] void getSharedUTF8String(in unsigned long aIndex, out unsigned long aLength, [shared,retval] out string aResult);
-  [noscript] void getSharedString(in unsigned long aIndex, out unsigned long aLength, [shared,retval] out wstring aResult);
-  [noscript] void getSharedBlob(in unsigned long aIndex, out unsigned long aLength, [shared,retval] out octetPtr aResult);
-
-%{C++
-  /**
-   * Getters for native code that return their values as
-   * the return type, for convenience and sanity.
-   *
-   * Not virtual; no vtable bloat.
-   */
-
-  inline int32_t AsInt32(uint32_t idx) {
-    int32_t v = 0;
-    mozilla::DebugOnly<nsresult> rv = GetInt32(idx, &v);
-    MOZ_ASSERT(NS_SUCCEEDED(rv) || IsNull(idx),
-               "Getting value failed, wrong column index?");
-    return v;
-  }
-
-  inline int64_t AsInt64(uint32_t idx) {
-    int64_t v = 0;
-    mozilla::DebugOnly<nsresult> rv = GetInt64(idx, &v);
-    MOZ_ASSERT(NS_SUCCEEDED(rv) || IsNull(idx),
-               "Getting value failed, wrong column index?");
-    return v;
-  }
-
-  inline double AsDouble(uint32_t idx) {
-    double v = 0.0;
-    mozilla::DebugOnly<nsresult> rv = GetDouble(idx, &v);
-    MOZ_ASSERT(NS_SUCCEEDED(rv) || IsNull(idx),
-               "Getting value failed, wrong column index?");
-    return v;
-  }
-
-  inline const char* AsSharedUTF8String(uint32_t idx, uint32_t *len) {
-    const char *str = nullptr;
-    *len = 0;
-    mozilla::DebugOnly<nsresult> rv = GetSharedUTF8String(idx, len, &str);
-    MOZ_ASSERT(NS_SUCCEEDED(rv) || IsNull(idx),
-               "Getting value failed, wrong column index?");
-    return str;
-  }
-
-  inline const char16_t* AsSharedWString(uint32_t idx, uint32_t *len) {
-    const char16_t *str = nullptr;
-    *len = 0;
-    mozilla::DebugOnly<nsresult> rv = GetSharedString(idx, len, &str);
-    MOZ_ASSERT(NS_SUCCEEDED(rv) || IsNull(idx),
-               "Getting value failed, wrong column index?");
-    return str;
-  }
-
-  inline const uint8_t* AsSharedBlob(uint32_t idx, uint32_t *len) {
-    const uint8_t *blob = nullptr;
-    *len = 0;
-    mozilla::DebugOnly<nsresult> rv = GetSharedBlob(idx, len, &blob);
-    MOZ_ASSERT(NS_SUCCEEDED(rv) || IsNull(idx),
-               "Getting value failed, wrong column index?");
-    return blob;
-  }
-
-  inline bool IsNull(uint32_t idx) {
-    bool b = false;
-    mozilla::DebugOnly<nsresult> rv = GetIsNull(idx, &b);
-    MOZ_ASSERT(NS_SUCCEEDED(rv),
-               "Getting value failed, wrong column index?");
-    return b;
-  }
-
-%}
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageStatementParams.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageStatementParams.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageStatementParams.idl	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageStatementParams.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +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 "nsISupports.idl"
-
-[scriptable, uuid(e65fe6e2-2643-463c-97e2-27665efe2386)]
-interface mozIStorageStatementParams : nsISupports {
-  // Magic interface for parameter setting that implements nsIXPCScriptable.
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageStatementRow.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageStatementRow.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageStatementRow.idl	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageStatementRow.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +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 "nsISupports.idl"
-
-[scriptable, uuid(02eeaf95-c3db-4182-9340-222c29f68f02)]
-interface mozIStorageStatementRow : nsISupports {
-  // Magic interface we return that implements nsIXPCScriptable, to allow
-  // for by-name access to rows.
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageVacuumParticipant.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageVacuumParticipant.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageVacuumParticipant.idl	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageVacuumParticipant.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-
-interface mozIStorageConnection;
-
-/**
- * This interface contains the information that the Storage service needs to
- * vacuum a database.  This interface is created as a service through the
- * category manager with the category "vacuum-participant".
- * Please see https://developer.mozilla.org/en/mozIStorageVacuumParticipant for
- * more information.
- */
-[scriptable, uuid(8f367508-1d9a-4d3f-be0c-ac11b6dd7dbf)]
-interface mozIStorageVacuumParticipant : nsISupports {
-  /**
-   * The expected page size in bytes for the database.  The vacuum manager will
-   * try to correct the page size during idle based on this value.
-   *
-   * @note If the database is using the WAL journal mode, the page size won't
-  *        be changed to the requested value.  See bug 634374.
-   * @note Valid page size values are powers of 2 between 512 and 65536.
-   *       The suggested value is mozIStorageConnection::defaultPageSize.
-   */
-  readonly attribute long expectedDatabasePageSize;
-
-  /**
-   * Connection to the database file to be vacuumed.
-   */
-  readonly attribute mozIStorageConnection databaseConnection;
-
-  /**
-   * Notifies when a vacuum operation begins.  Listeners should avoid using the
-   * database till onEndVacuum is received.
-   *
-   * @return true to proceed with the vacuum, false if the participant wants to
-   *         opt-out for now, it will be retried later.  Useful when participant
-   *         is running some other heavy operation that can't be interrupted.
-   *
-   * @note When a vacuum operation starts or ends it will also dispatch a global
-   *       "heavy-io-task" notification through the observer service with the
-   *       data argument being either "vacuum-begin" or "vacuum-end".
-   */
-  boolean onBeginVacuum();
-
-  /**
-   * Notifies when a vacuum operation ends.
-   *
-   * @param aSucceeded
-   *        reports if the vacuum succeeded or failed.
-   */
-  void onEndVacuum(in boolean aSucceeded);
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageValueArray.idl firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageValueArray.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozIStorageValueArray.idl	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozIStorageValueArray.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,145 +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 "nsISupports.idl"
-%{C++
-#include "mozilla/DebugOnly.h"
-%}
-
-[ptr] native octetPtr(uint8_t);
-
-/**
- * mozIStorageValueArray wraps an array of SQL values, such as a single database
- * row.
- */
-[scriptable, uuid(6e6306f4-ffa7-40f5-96ca-36159ce8f431)]
-interface mozIStorageValueArray : nsISupports {
-  /**
-   * These type values are returned by getTypeOfIndex
-   * to indicate what type of value is present at
-   * a given column.
-   */
-  const long VALUE_TYPE_NULL = 0;
-  const long VALUE_TYPE_INTEGER = 1;
-  const long VALUE_TYPE_FLOAT = 2;
-  const long VALUE_TYPE_TEXT = 3;
-  const long VALUE_TYPE_BLOB = 4;
-
-  /**
-   * numEntries
-   *
-   * number of entries in the array (each corresponding to a column
-   * in the database row)
-   */
-  readonly attribute unsigned long numEntries;
-
-  /**
-   * Returns the type of the value at the given column index;
-   * one of VALUE_TYPE_NULL, VALUE_TYPE_INTEGER, VALUE_TYPE_FLOAT,
-   * VALUE_TYPE_TEXT, VALUE_TYPE_BLOB.
-   */
-  long getTypeOfIndex(in unsigned long aIndex);
-
-  /**
-   * Obtain a value for the given entry (column) index.
-   * Due to SQLite's type conversion rules, any of these are valid
-   * for any column regardless of the column's data type.  However,
-   * if the specific type matters, getTypeOfIndex should be used
-   * first to identify the column type, and then the appropriate
-   * get method should be called.
-   *
-   * If you ask for a string value for a NULL column, you will get an empty
-   * string with IsVoid set to distinguish it from an explicitly set empty
-   * string.
-   */
-  long getInt32(in unsigned long aIndex);
-  long long getInt64(in unsigned long aIndex);
-  double getDouble(in unsigned long aIndex);
-  AUTF8String getUTF8String(in unsigned long aIndex);
-  AString getString(in unsigned long aIndex);
-
-  // data will be NULL if dataSize = 0
-  void getBlob(in unsigned long aIndex, out unsigned long aDataSize, [array,size_is(aDataSize)] out octet aData);
-  AString getBlobAsString(in unsigned long aIndex);
-  AUTF8String getBlobAsUTF8String(in unsigned long aIndex);
-  boolean getIsNull(in unsigned long aIndex);
-
-  /**
-   * Returns a shared string pointer
-   */
-  [noscript] void getSharedUTF8String(in unsigned long aIndex, out unsigned long aLength, [shared,retval] out string aResult);
-  [noscript] void getSharedString(in unsigned long aIndex, out unsigned long aLength, [shared,retval] out wstring aResult);
-  [noscript] void getSharedBlob(in unsigned long aIndex, out unsigned long aLength, [shared,retval] out octetPtr aResult);
-
-%{C++
-  /**
-   * Getters for native code that return their values as
-   * the return type, for convenience and sanity.
-   *
-   * Not virtual; no vtable bloat.
-   */
-
-  inline int32_t AsInt32(uint32_t idx) {
-    int32_t v = 0;
-    mozilla::DebugOnly<nsresult> rv = GetInt32(idx, &v);
-    MOZ_ASSERT(NS_SUCCEEDED(rv) || IsNull(idx),
-               "Getting value failed, wrong column index?");
-    return v;
-  }
-
-  inline int64_t AsInt64(uint32_t idx) {
-    int64_t v = 0;
-    mozilla::DebugOnly<nsresult> rv = GetInt64(idx, &v);
-    MOZ_ASSERT(NS_SUCCEEDED(rv) || IsNull(idx),
-               "Getting value failed, wrong column index?");
-    return v;
-  }
-
-  inline double AsDouble(uint32_t idx) {
-    double v = 0.0;
-    mozilla::DebugOnly<nsresult> rv = GetDouble(idx, &v);
-    MOZ_ASSERT(NS_SUCCEEDED(rv) || IsNull(idx),
-               "Getting value failed, wrong column index?");
-    return v;
-  }
-
-  inline const char* AsSharedUTF8String(uint32_t idx, uint32_t *len) {
-    const char *str = nullptr;
-    *len = 0;
-    mozilla::DebugOnly<nsresult> rv = GetSharedUTF8String(idx, len, &str);
-    MOZ_ASSERT(NS_SUCCEEDED(rv) || IsNull(idx),
-               "Getting value failed, wrong column index?");
-    return str;
-  }
-
-  inline const char16_t* AsSharedWString(uint32_t idx, uint32_t *len) {
-    const char16_t *str = nullptr;
-    *len = 0;
-    mozilla::DebugOnly<nsresult> rv = GetSharedString(idx, len, &str);
-    MOZ_ASSERT(NS_SUCCEEDED(rv) || IsNull(idx),
-               "Getting value failed, wrong column index?");
-    return str;
-  }
-
-  inline const uint8_t* AsSharedBlob(uint32_t idx, uint32_t *len) {
-    const uint8_t *blob = nullptr;
-    *len = 0;
-    mozilla::DebugOnly<nsresult> rv = GetSharedBlob(idx, len, &blob);
-    MOZ_ASSERT(NS_SUCCEEDED(rv) || IsNull(idx),
-               "Getting value failed, wrong column index?");
-    return blob;
-  }
-
-  inline bool IsNull(uint32_t idx) {
-    bool b = false;
-    mozilla::DebugOnly<nsresult> rv = GetIsNull(idx, &b);
-    MOZ_ASSERT(NS_SUCCEEDED(rv),
-               "Getting value failed, wrong column index?");
-    return b;
-  }
-
-%}
-
-};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozStorageHelper.h firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozStorageHelper.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/mozStorageHelper.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/mozStorageHelper.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,209 +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 MOZSTORAGEHELPER_H
-#define MOZSTORAGEHELPER_H
-
-#include "nsAutoPtr.h"
-#include "nsStringGlue.h"
-#include "mozilla/DebugOnly.h"
-
-#include "mozIStorageAsyncConnection.h"
-#include "mozIStorageConnection.h"
-#include "mozIStorageStatement.h"
-#include "mozIStoragePendingStatement.h"
-#include "nsError.h"
-
-/**
- * This class wraps a transaction inside a given C++ scope, guaranteeing that
- * the transaction will be completed even if you have an exception or
- * return early.
- *
- * A common use is to create an instance with aCommitOnComplete = false (rollback),
- * then call Commit() on this object manually when your function completes
- * successfully.
- *
- * @note nested transactions are not supported by Sqlite, so if a transaction
- * is already in progress, this object does nothing.  Note that in this case,
- * you may not get the transaction type you asked for, and you won't be able
- * to rollback.
- *
- * @param aConnection
- *        The connection to create the transaction on.
- * @param aCommitOnComplete
- *        Controls whether the transaction is committed or rolled back when
- *        this object goes out of scope.
- * @param aType [optional]
- *        The transaction type, as defined in mozIStorageConnection.  Defaults
- *        to TRANSACTION_DEFERRED.
- * @param aAsyncCommit [optional]
- *        Whether commit should be executed asynchronously on the helper thread.
- *        This is a special option introduced as an interim solution to reduce
- *        main-thread fsyncs in Places.  Can only be used on main-thread.
- *
- *        WARNING: YOU SHOULD _NOT_ WRITE NEW MAIN-THREAD CODE USING THIS!
- *
- *        Notice that async commit might cause synchronous statements to fail
- *        with SQLITE_BUSY.  A possible mitigation strategy is to use
- *        PRAGMA busy_timeout, but notice that might cause main-thread jank.
- *        Finally, if the database is using WAL journaling mode, other
- *        connections won't see the changes done in async committed transactions
- *        until commit is complete.
- *
- *        For all of the above reasons, this should only be used as an interim
- *        solution and avoided completely if possible.
- */
-class mozStorageTransaction
-{
-public:
-  mozStorageTransaction(mozIStorageConnection* aConnection,
-                        bool aCommitOnComplete,
-                        int32_t aType = mozIStorageConnection::TRANSACTION_DEFERRED,
-                        bool aAsyncCommit = false)
-    : mConnection(aConnection),
-      mHasTransaction(false),
-      mCommitOnComplete(aCommitOnComplete),
-      mCompleted(false),
-      mAsyncCommit(aAsyncCommit)
-  {
-    if (mConnection) {
-      nsAutoCString query("BEGIN");
-      switch(aType) {
-        case mozIStorageConnection::TRANSACTION_IMMEDIATE:
-          query.AppendLiteral(" IMMEDIATE");
-          break;
-        case mozIStorageConnection::TRANSACTION_EXCLUSIVE:
-          query.AppendLiteral(" EXCLUSIVE");
-          break;
-        case mozIStorageConnection::TRANSACTION_DEFERRED:
-          query.AppendLiteral(" DEFERRED");
-          break;
-        default:
-          MOZ_ASSERT(false, "Unknown transaction type");
-      }
-      // If a transaction is already in progress, this will fail, since Sqlite
-      // doesn't support nested transactions.
-      mHasTransaction = NS_SUCCEEDED(mConnection->ExecuteSimpleSQL(query));
-    }
-  }
-
-  ~mozStorageTransaction()
-  {
-    if (mConnection && mHasTransaction && !mCompleted) {
-      if (mCommitOnComplete) {
-        mozilla::DebugOnly<nsresult> rv = Commit();
-        NS_WARN_IF_FALSE(NS_SUCCEEDED(rv),
-                         "A transaction didn't commit correctly");
-      }
-      else {
-        mozilla::DebugOnly<nsresult> rv = Rollback();
-        NS_WARN_IF_FALSE(NS_SUCCEEDED(rv),
-                         "A transaction didn't rollback correctly");
-      }
-    }
-  }
-
-  /**
-   * Commits the transaction if one is in progress. If one is not in progress,
-   * this is a NOP since the actual owner of the transaction outside of our
-   * scope is in charge of finally committing or rolling back the transaction.
-   */
-  nsresult Commit()
-  {
-    if (!mConnection || mCompleted || !mHasTransaction)
-      return NS_OK;
-    mCompleted = true;
-
-    // TODO (bug 559659): this might fail with SQLITE_BUSY, but we don't handle
-    // it, thus the transaction might stay open until the next COMMIT.
-    nsresult rv;
-    if (mAsyncCommit) {
-      nsCOMPtr<mozIStoragePendingStatement> ps;
-      rv = mConnection->ExecuteSimpleSQLAsync(NS_LITERAL_CSTRING("COMMIT"),
-                                              nullptr, getter_AddRefs(ps));
-    }
-    else {
-      rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING("COMMIT"));
-    }
-
-    if (NS_SUCCEEDED(rv))
-      mHasTransaction = false;
-
-    return rv;
-  }
-
-  /**
-   * Rolls back the transaction if one is in progress. If one is not in progress,
-   * this is a NOP since the actual owner of the transaction outside of our
-   * scope is in charge of finally rolling back the transaction.
-   */
-  nsresult Rollback()
-  {
-    if (!mConnection || mCompleted || !mHasTransaction)
-      return NS_OK;
-    mCompleted = true;
-
-    // TODO (bug 1062823): from Sqlite 3.7.11 on, rollback won't ever return
-    // a busy error, so this handling can be removed.
-    nsresult rv = NS_OK;
-    do {
-      rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING("ROLLBACK"));
-      if (rv == NS_ERROR_STORAGE_BUSY)
-        (void)PR_Sleep(PR_INTERVAL_NO_WAIT);
-    } while (rv == NS_ERROR_STORAGE_BUSY);
-
-    if (NS_SUCCEEDED(rv))
-      mHasTransaction = false;
-
-    return rv;
-  }
-
-protected:
-  nsCOMPtr<mozIStorageConnection> mConnection;
-  bool mHasTransaction;
-  bool mCommitOnComplete;
-  bool mCompleted;
-  bool mAsyncCommit;
-};
-
-/**
- * This class wraps a statement so that it is guaraneed to be reset when
- * this object goes out of scope.
- *
- * Note that this always just resets the statement. If the statement doesn't
- * need resetting, the reset operation is inexpensive.
- */
-class MOZ_STACK_CLASS mozStorageStatementScoper
-{
-public:
-  explicit mozStorageStatementScoper(mozIStorageStatement* aStatement)
-      : mStatement(aStatement)
-  {
-  }
-  ~mozStorageStatementScoper()
-  {
-    if (mStatement)
-      mStatement->Reset();
-  }
-
-  /**
-   * Call this to make the statement not reset. You might do this if you know
-   * that the statement has been reset.
-   */
-  void Abandon()
-  {
-    mStatement = nullptr;
-  }
-
-protected:
-  nsCOMPtr<mozIStorageStatement> mStatement;
-};
-
-// Use this to make queries uniquely identifiable in telemetry
-// statistics, especially PRAGMAs.  We don't include __LINE__ so that
-// queries are stable in the face of source code changes.
-#define MOZ_STORAGE_UNIQUIFY_QUERY_STR "/* " __FILE__ " */ "
-
-#endif /* MOZSTORAGEHELPER_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/StatementCache.h firefox-trunk-41.0~a1~hg20150524r245419/storage/public/StatementCache.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/StatementCache.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/StatementCache.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,148 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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_storage_StatementCache_h
-#define mozilla_storage_StatementCache_h
-
-#include "mozIStorageConnection.h"
-#include "mozIStorageStatement.h"
-#include "mozIStorageAsyncStatement.h"
-
-#include "nsAutoPtr.h"
-#include "nsHashKeys.h"
-#include "nsInterfaceHashtable.h"
-
-namespace mozilla {
-namespace storage {
-
-/**
- * Class used to cache statements (mozIStorageStatement or
- * mozIStorageAsyncStatement).
- */
-template<typename StatementType>
-class StatementCache {
-public:
-  /**
-   * Constructor for the cache.
-   *
-   * @note a connection can have more than one cache.
-   *
-   * @param aConnection
-   *        A reference to the nsCOMPtr for the connection this cache is to be
-   *        used for.  This nsCOMPtr must at least live as long as this class,
-   *        otherwise crashes will happen.
-   */
-  explicit StatementCache(nsCOMPtr<mozIStorageConnection>& aConnection)
-  : mConnection(aConnection)
-  {
-  }
-
-  /**
-   * Obtains a cached statement.  If this statement is not yet created, it will
-   * be created and stored for later use.
-   *
-   * @param aQuery
-   *        The SQL string (either a const char [] or nsACString) to get a
-   *        cached query for.
-   * @return the cached statement, or null upon error.
-   */
-  inline
-  already_AddRefed<StatementType>
-  GetCachedStatement(const nsACString& aQuery)
-  {
-    nsCOMPtr<StatementType> stmt;
-    if (!mCachedStatements.Get(aQuery, getter_AddRefs(stmt))) {
-      stmt = CreateStatement(aQuery);
-      NS_ENSURE_TRUE(stmt, nullptr);
-
-      mCachedStatements.Put(aQuery, stmt);
-    }
-    return stmt.forget();
-  }
-
-  template<int N>
-  MOZ_ALWAYS_INLINE already_AddRefed<StatementType>
-  GetCachedStatement(const char (&aQuery)[N])
-  {
-    nsDependentCString query(aQuery, N - 1);
-    return GetCachedStatement(query);
-  }
-
-  /**
-   * Finalizes all cached statements so the database can be safely closed.  The
-   * behavior of this cache is unspecified after this method is called.
-   */
-  inline
-  void
-  FinalizeStatements()
-  {
-    (void)mCachedStatements.Enumerate(FinalizeCachedStatements, nullptr);
-
-    // Clear the cache at this time too!
-    (void)mCachedStatements.Clear();
-  }
-
-private:
-  inline
-  already_AddRefed<StatementType>
-  CreateStatement(const nsACString& aQuery);
-  static
-  PLDHashOperator
-  FinalizeCachedStatements(const nsACString& aKey,
-                           nsCOMPtr<StatementType>& aStatement,
-                           void*)
-  {
-    (void)aStatement->Finalize();
-    return PL_DHASH_NEXT;
-  }
-
-  nsInterfaceHashtable<nsCStringHashKey, StatementType> mCachedStatements;
-  nsCOMPtr<mozIStorageConnection>& mConnection;
-};
-
-template< >
-inline
-already_AddRefed<mozIStorageStatement>
-StatementCache<mozIStorageStatement>::CreateStatement(const nsACString& aQuery)
-{
-  NS_ENSURE_TRUE(mConnection, nullptr);
-
-  nsCOMPtr<mozIStorageStatement> stmt;
-  nsresult rv = mConnection->CreateStatement(aQuery, getter_AddRefs(stmt));
-  if (NS_FAILED(rv)) {
-    nsCString error;
-    error.AppendLiteral("The statement '");
-    error.Append(aQuery);
-    error.AppendLiteral("' failed to compile with the error message '");
-    nsCString msg;
-    (void)mConnection->GetLastErrorString(msg);
-    error.Append(msg);
-    error.AppendLiteral("'.");
-    NS_ERROR(error.get());
-  }
-  NS_ENSURE_SUCCESS(rv, nullptr);
-
-  return stmt.forget();
-}
-
-template< >
-inline
-already_AddRefed<mozIStorageAsyncStatement>
-StatementCache<mozIStorageAsyncStatement>::CreateStatement(const nsACString& aQuery)
-{
-  NS_ENSURE_TRUE(mConnection, nullptr);
-
-  nsCOMPtr<mozIStorageAsyncStatement> stmt;
-  nsresult rv = mConnection->CreateAsyncStatement(aQuery, getter_AddRefs(stmt));
-  NS_ENSURE_SUCCESS(rv, nullptr);
-
-  return stmt.forget();
-}
-
-} // namespace storage
-} // namespace mozilla
-
-#endif // mozilla_storage_StatementCache_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/public/storage.h firefox-trunk-41.0~a1~hg20150524r245419/storage/public/storage.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/public/storage.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/public/storage.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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_storage_h_
-#define mozilla_storage_h_
-
-////////////////////////////////////////////////////////////////////////////////
-//// Public Interfaces
-
-#include "mozStorageCID.h"
-#include "mozIStorageAggregateFunction.h"
-#include "mozIStorageConnection.h"
-#include "mozIStorageError.h"
-#include "mozIStorageFunction.h"
-#include "mozIStoragePendingStatement.h"
-#include "mozIStorageProgressHandler.h"
-#include "mozIStorageResultSet.h"
-#include "mozIStorageRow.h"
-#include "mozIStorageService.h"
-#include "mozIStorageStatement.h"
-#include "mozIStorageStatementCallback.h"
-#include "mozIStorageBindingParamsArray.h"
-#include "mozIStorageBindingParams.h"
-#include "mozIStorageVacuumParticipant.h"
-#include "mozIStorageCompletionCallback.h"
-#include "mozIStorageAsyncStatement.h"
-#include "mozIStorageAsyncConnection.h"
-
-////////////////////////////////////////////////////////////////////////////////
-//// Native Language Helpers
-
-#include "mozStorageHelper.h"
-#include "mozilla/storage/StatementCache.h"
-#include "mozilla/storage/Variant.h"
-
-#endif // mozilla_storage_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/SQLCollations.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/SQLCollations.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/SQLCollations.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/SQLCollations.cpp	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,242 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 "SQLCollations.h"
+
+namespace mozilla {
+namespace storage {
+
+////////////////////////////////////////////////////////////////////////////////
+//// Local Helper Functions
+
+namespace {
+
+/**
+ * Helper function for the UTF-8 locale collations.
+ *
+ * @param  aService
+ *         The Service that owns the nsICollation used by this collation.
+ * @param  aLen1
+ *         The number of bytes in aStr1.
+ * @param  aStr1
+ *         The string to be compared against aStr2 as provided by SQLite.  It
+ *         must be a non-null-terminated char* buffer.
+ * @param  aLen2
+ *         The number of bytes in aStr2.
+ * @param  aStr2
+ *         The string to be compared against aStr1 as provided by SQLite.  It
+ *         must be a non-null-terminated char* buffer.
+ * @param  aComparisonStrength
+ *         The sorting strength, one of the nsICollation constants.
+ * @return aStr1 - aStr2.  That is, if aStr1 < aStr2, returns a negative number.
+ *         If aStr1 > aStr2, returns a positive number.  If aStr1 == aStr2,
+ *         returns 0.
+ */
+int
+localeCollationHelper8(void *aService,
+                       int aLen1,
+                       const void *aStr1,
+                       int aLen2,
+                       const void *aStr2,
+                       int32_t aComparisonStrength)
+{
+  NS_ConvertUTF8toUTF16 str1(static_cast<const char *>(aStr1), aLen1);
+  NS_ConvertUTF8toUTF16 str2(static_cast<const char *>(aStr2), aLen2);
+  Service *serv = static_cast<Service *>(aService);
+  return serv->localeCompareStrings(str1, str2, aComparisonStrength);
+}
+
+/**
+ * Helper function for the UTF-16 locale collations.
+ *
+ * @param  aService
+ *         The Service that owns the nsICollation used by this collation.
+ * @param  aLen1
+ *         The number of bytes (not characters) in aStr1.
+ * @param  aStr1
+ *         The string to be compared against aStr2 as provided by SQLite.  It
+ *         must be a non-null-terminated char16_t* buffer.
+ * @param  aLen2
+ *         The number of bytes (not characters) in aStr2.
+ * @param  aStr2
+ *         The string to be compared against aStr1 as provided by SQLite.  It
+ *         must be a non-null-terminated char16_t* buffer.
+ * @param  aComparisonStrength
+ *         The sorting strength, one of the nsICollation constants.
+ * @return aStr1 - aStr2.  That is, if aStr1 < aStr2, returns a negative number.
+ *         If aStr1 > aStr2, returns a positive number.  If aStr1 == aStr2,
+ *         returns 0.
+ */
+int
+localeCollationHelper16(void *aService,
+                        int aLen1,
+                        const void *aStr1,
+                        int aLen2,
+                        const void *aStr2,
+                        int32_t aComparisonStrength)
+{
+  const char16_t *buf1 = static_cast<const char16_t *>(aStr1);
+  const char16_t *buf2 = static_cast<const char16_t *>(aStr2);
+
+  // The second argument to the nsDependentSubstring constructor is exclusive:
+  // It points to the char16_t immediately following the last one in the target
+  // substring.  Since aLen1 and aLen2 are in bytes, divide by sizeof(char16_t)
+  // so that the pointer arithmetic is correct.
+  nsDependentSubstring str1(buf1, buf1 + (aLen1 / sizeof(char16_t)));
+  nsDependentSubstring str2(buf2, buf2 + (aLen2 / sizeof(char16_t)));
+  Service *serv = static_cast<Service *>(aService);
+  return serv->localeCompareStrings(str1, str2, aComparisonStrength);
+}
+
+// This struct is used only by registerCollations below, but ISO C++98 forbids
+// instantiating a template dependent on a locally-defined type.  Boo-urns!
+struct Collations {
+  const char *zName;
+  int enc;
+  int(*xCompare)(void*, int, const void*, int, const void*);
+};
+
+} // anonymous namespace
+
+////////////////////////////////////////////////////////////////////////////////
+//// Exposed Functions
+
+int
+registerCollations(sqlite3 *aDB,
+                   Service *aService)
+{
+  Collations collations[] = {
+    {"locale",
+     SQLITE_UTF8,
+     localeCollation8},
+    {"locale_case_sensitive",
+     SQLITE_UTF8,
+     localeCollationCaseSensitive8},
+    {"locale_accent_sensitive",
+     SQLITE_UTF8,
+     localeCollationAccentSensitive8},
+    {"locale_case_accent_sensitive",
+     SQLITE_UTF8,
+     localeCollationCaseAccentSensitive8},
+    {"locale",
+     SQLITE_UTF16,
+     localeCollation16},
+    {"locale_case_sensitive",
+     SQLITE_UTF16,
+     localeCollationCaseSensitive16},
+    {"locale_accent_sensitive",
+     SQLITE_UTF16,
+     localeCollationAccentSensitive16},
+    {"locale_case_accent_sensitive",
+     SQLITE_UTF16,
+     localeCollationCaseAccentSensitive16},
+  };
+
+  int rv = SQLITE_OK;
+  for (size_t i = 0; SQLITE_OK == rv && i < ArrayLength(collations); ++i) {
+    struct Collations *p = &collations[i];
+    rv = ::sqlite3_create_collation(aDB, p->zName, p->enc, aService,
+                                    p->xCompare);
+  }
+
+  return rv;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// SQL Collations
+
+int
+localeCollation8(void *aService,
+                 int aLen1,
+                 const void *aStr1,
+                 int aLen2,
+                 const void *aStr2)
+{
+  return localeCollationHelper8(aService, aLen1, aStr1, aLen2, aStr2,
+                                nsICollation::kCollationCaseInSensitive);
+}
+
+int
+localeCollationCaseSensitive8(void *aService,
+                              int aLen1,
+                              const void *aStr1,
+                              int aLen2,
+                              const void *aStr2)
+{
+  return localeCollationHelper8(aService, aLen1, aStr1, aLen2, aStr2,
+                                nsICollation::kCollationAccentInsenstive);
+}
+
+int
+localeCollationAccentSensitive8(void *aService,
+                                int aLen1,
+                                const void *aStr1,
+                                int aLen2,
+                                const void *aStr2)
+{
+  return localeCollationHelper8(aService, aLen1, aStr1, aLen2, aStr2,
+                                nsICollation::kCollationCaseInsensitiveAscii);
+}
+
+int
+localeCollationCaseAccentSensitive8(void *aService,
+                                    int aLen1,
+                                    const void *aStr1,
+                                    int aLen2,
+                                    const void *aStr2)
+{
+  return localeCollationHelper8(aService, aLen1, aStr1, aLen2, aStr2,
+                                nsICollation::kCollationCaseSensitive);
+}
+
+int
+localeCollation16(void *aService,
+                  int aLen1,
+                  const void *aStr1,
+                  int aLen2,
+                  const void *aStr2)
+{
+  return localeCollationHelper16(aService, aLen1, aStr1, aLen2, aStr2,
+                                 nsICollation::kCollationCaseInSensitive);
+}
+
+int
+localeCollationCaseSensitive16(void *aService,
+                               int aLen1,
+                               const void *aStr1,
+                               int aLen2,
+                               const void *aStr2)
+{
+  return localeCollationHelper16(aService, aLen1, aStr1, aLen2, aStr2,
+                                 nsICollation::kCollationAccentInsenstive);
+}
+
+int
+localeCollationAccentSensitive16(void *aService,
+                                 int aLen1,
+                                 const void *aStr1,
+                                 int aLen2,
+                                 const void *aStr2)
+{
+  return localeCollationHelper16(aService, aLen1, aStr1, aLen2, aStr2,
+                                 nsICollation::kCollationCaseInsensitiveAscii);
+}
+
+int
+localeCollationCaseAccentSensitive16(void *aService,
+                                     int aLen1,
+                                     const void *aStr1,
+                                     int aLen2,
+                                     const void *aStr2)
+{
+  return localeCollationHelper16(aService, aLen1, aStr1, aLen2, aStr2,
+                                 nsICollation::kCollationCaseSensitive);
+}
+
+} // namespace storage
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/SQLCollations.h firefox-trunk-41.0~a1~hg20150524r245419/storage/SQLCollations.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/SQLCollations.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/SQLCollations.h	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,249 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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_storage_SQLCollations_h
+#define mozilla_storage_SQLCollations_h
+
+#include "mozStorageService.h"
+#include "nscore.h"
+#include "nsString.h"
+
+#include "sqlite3.h"
+
+namespace mozilla {
+namespace storage {
+
+/**
+ * Registers the collating sequences declared here with the specified
+ * database and Service.
+ *
+ * @param  aDB
+ *         The database we'll be registering the collations with.
+ * @param  aService
+ *         The Service that owns the nsICollation used by our collations.
+ * @return the SQLite status code indicating success or failure.
+ */
+int registerCollations(sqlite3 *aDB, Service *aService);
+
+////////////////////////////////////////////////////////////////////////////////
+//// Predefined Functions
+
+/**
+ * Custom UTF-8 collating sequence that respects the application's locale.
+ * Comparison is case- and accent-insensitive.  This is called by SQLite.
+ *
+ * @param  aService
+ *         The Service that owns the nsICollation used by this collation.
+ * @param  aLen1
+ *         The number of bytes in aStr1.
+ * @param  aStr1
+ *         The string to be compared against aStr2.  It will be passed in by
+ *         SQLite as a non-null-terminated char* buffer.
+ * @param  aLen2
+ *         The number of bytes in aStr2.
+ * @param  aStr2
+ *         The string to be compared against aStr1.  It will be passed in by
+ *         SQLite as a non-null-terminated char* buffer.
+ * @return aStr1 - aStr2.  That is, if aStr1 < aStr2, returns a negative number.
+ *         If aStr1 > aStr2, returns a positive number.  If aStr1 == aStr2,
+ *         returns 0.
+ */
+int localeCollation8(void *aService,
+                                 int aLen1,
+                                 const void *aStr1,
+                                 int aLen2,
+                                 const void *aStr2);
+
+/**
+ * Custom UTF-8 collating sequence that respects the application's locale.
+ * Comparison is case-sensitive and accent-insensitive.  This is called by
+ * SQLite.
+ *
+ * @param  aService
+ *         The Service that owns the nsICollation used by this collation.
+ * @param  aLen1
+ *         The number of bytes in aStr1.
+ * @param  aStr1
+ *         The string to be compared against aStr2.  It will be passed in by
+ *         SQLite as a non-null-terminated char* buffer.
+ * @param  aLen2
+ *         The number of bytes in aStr2.
+ * @param  aStr2
+ *         The string to be compared against aStr1.  It will be passed in by
+ *         SQLite as a non-null-terminated char* buffer.
+ * @return aStr1 - aStr2.  That is, if aStr1 < aStr2, returns a negative number.
+ *         If aStr1 > aStr2, returns a positive number.  If aStr1 == aStr2,
+ *         returns 0.
+ */
+int localeCollationCaseSensitive8(void *aService,
+                                              int aLen1,
+                                              const void *aStr1,
+                                              int aLen2,
+                                              const void *aStr2);
+
+/**
+ * Custom UTF-8 collating sequence that respects the application's locale.
+ * Comparison is case-insensitive and accent-sensitive.  This is called by
+ * SQLite.
+ *
+ * @param  aService
+ *         The Service that owns the nsICollation used by this collation.
+ * @param  aLen1
+ *         The number of bytes in aStr1.
+ * @param  aStr1
+ *         The string to be compared against aStr2.  It will be passed in by
+ *         SQLite as a non-null-terminated char* buffer.
+ * @param  aLen2
+ *         The number of bytes in aStr2.
+ * @param  aStr2
+ *         The string to be compared against aStr1.  It will be passed in by
+ *         SQLite as a non-null-terminated char* buffer.
+ * @return aStr1 - aStr2.  That is, if aStr1 < aStr2, returns a negative number.
+ *         If aStr1 > aStr2, returns a positive number.  If aStr1 == aStr2,
+ *         returns 0.
+ */
+int localeCollationAccentSensitive8(void *aService,
+                                                int aLen1,
+                                                const void *aStr1,
+                                                int aLen2,
+                                                const void *aStr2);
+
+/**
+ * Custom UTF-8 collating sequence that respects the application's locale.
+ * Comparison is case- and accent-sensitive.  This is called by SQLite.
+ *
+ * @param  aService
+ *         The Service that owns the nsICollation used by this collation.
+ * @param  aLen1
+ *         The number of bytes in aStr1.
+ * @param  aStr1
+ *         The string to be compared against aStr2.  It will be passed in by
+ *         SQLite as a non-null-terminated char* buffer.
+ * @param  aLen2
+ *         The number of bytes in aStr2.
+ * @param  aStr2
+ *         The string to be compared against aStr1.  It will be passed in by
+ *         SQLite as a non-null-terminated char* buffer.
+ * @return aStr1 - aStr2.  That is, if aStr1 < aStr2, returns a negative number.
+ *         If aStr1 > aStr2, returns a positive number.  If aStr1 == aStr2,
+ *         returns 0.
+ */
+int localeCollationCaseAccentSensitive8(void *aService,
+                                                    int aLen1,
+                                                    const void *aStr1,
+                                                    int aLen2,
+                                                    const void *aStr2);
+
+/**
+ * Custom UTF-16 collating sequence that respects the application's locale.
+ * Comparison is case- and accent-insensitive.  This is called by SQLite.
+ *
+ * @param  aService
+ *         The Service that owns the nsICollation used by this collation.
+ * @param  aLen1
+ *         The number of bytes (not characters) in aStr1.
+ * @param  aStr1
+ *         The string to be compared against aStr2.  It will be passed in by
+ *         SQLite as a non-null-terminated char16_t* buffer.
+ * @param  aLen2
+ *         The number of bytes (not characters) in aStr2.
+ * @param  aStr2
+ *         The string to be compared against aStr1.  It will be passed in by
+ *         SQLite as a non-null-terminated char16_t* buffer.
+ * @return aStr1 - aStr2.  That is, if aStr1 < aStr2, returns a negative number.
+ *         If aStr1 > aStr2, returns a positive number.  If aStr1 == aStr2,
+ *         returns 0.
+ */
+int localeCollation16(void *aService,
+                                  int aLen1,
+                                  const void *aStr1,
+                                  int aLen2,
+                                  const void *aStr2);
+
+/**
+ * Custom UTF-16 collating sequence that respects the application's locale.
+ * Comparison is case-sensitive and accent-insensitive.  This is called by
+ * SQLite.
+ *
+ * @param  aService
+ *         The Service that owns the nsICollation used by this collation.
+ * @param  aLen1
+ *         The number of bytes (not characters) in aStr1.
+ * @param  aStr1
+ *         The string to be compared against aStr2.  It will be passed in by
+ *         SQLite as a non-null-terminated char16_t* buffer.
+ * @param  aLen2
+ *         The number of bytes (not characters) in aStr2.
+ * @param  aStr2
+ *         The string to be compared against aStr1.  It will be passed in by
+ *         SQLite as a non-null-terminated char16_t* buffer.
+ * @return aStr1 - aStr2.  That is, if aStr1 < aStr2, returns a negative number.
+ *         If aStr1 > aStr2, returns a positive number.  If aStr1 == aStr2,
+ *         returns 0.
+ */
+int localeCollationCaseSensitive16(void *aService,
+                                               int aLen1,
+                                               const void *aStr1,
+                                               int aLen2,
+                                               const void *aStr2);
+
+/**
+ * Custom UTF-16 collating sequence that respects the application's locale.
+ * Comparison is case-insensitive and accent-sensitive.  This is called by
+ * SQLite.
+ *
+ * @param  aService
+ *         The Service that owns the nsICollation used by this collation.
+ * @param  aLen1
+ *         The number of bytes (not characters) in aStr1.
+ * @param  aStr1
+ *         The string to be compared against aStr2.  It will be passed in by
+ *         SQLite as a non-null-terminated char16_t* buffer.
+ * @param  aLen2
+ *         The number of bytes (not characters) in aStr2.
+ * @param  aStr2
+ *         The string to be compared against aStr1.  It will be passed in by
+ *         SQLite as a non-null-terminated char16_t* buffer.
+ * @return aStr1 - aStr2.  That is, if aStr1 < aStr2, returns a negative number.
+ *         If aStr1 > aStr2, returns a positive number.  If aStr1 == aStr2,
+ *         returns 0.
+ */
+int localeCollationAccentSensitive16(void *aService,
+                                                 int aLen1,
+                                                 const void *aStr1,
+                                                 int aLen2,
+                                                 const void *aStr2);
+
+/**
+ * Custom UTF-16 collating sequence that respects the application's locale.
+ * Comparison is case- and accent-sensitive.  This is called by SQLite.
+ *
+ * @param  aService
+ *         The Service that owns the nsICollation used by this collation.
+ * @param  aLen1
+ *         The number of bytes (not characters) in aStr1.
+ * @param  aStr1
+ *         The string to be compared against aStr2.  It will be passed in by
+ *         SQLite as a non-null-terminated char16_t* buffer.
+ * @param  aLen2
+ *         The number of bytes (not characters) in aStr2.
+ * @param  aStr2
+ *         The string to be compared against aStr1.  It will be passed in by
+ *         SQLite as a non-null-terminated char16_t* buffer.
+ * @return aStr1 - aStr2.  That is, if aStr1 < aStr2, returns a negative number.
+ *         If aStr1 > aStr2, returns a positive number.  If aStr1 == aStr2,
+ *         returns 0.
+ */
+int localeCollationCaseAccentSensitive16(void *aService,
+                                                     int aLen1,
+                                                     const void *aStr1,
+                                                     int aLen2,
+                                                     const void *aStr2);
+
+} // namespace storage
+} // namespace mozilla
+
+#endif // mozilla_storage_SQLCollations_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/SQLiteMutex.h firefox-trunk-41.0~a1~hg20150524r245419/storage/SQLiteMutex.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/SQLiteMutex.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/SQLiteMutex.h	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,173 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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_storage_SQLiteMutex_h_
+#define mozilla_storage_SQLiteMutex_h_
+
+#include "mozilla/BlockingResourceBase.h"
+#include "sqlite3.h"
+
+namespace mozilla {
+namespace storage {
+
+/**
+ * Wrapper class for sqlite3_mutexes.  To be used whenever we want to use a
+ * sqlite3_mutex.
+ *
+ * @warning Never EVER wrap the same sqlite3_mutex with a different SQLiteMutex.
+ *          If you do this, you void the deadlock detector's warranty!
+ */
+class SQLiteMutex : private BlockingResourceBase
+{
+public:
+  /**
+   * Constructs a wrapper for a sqlite3_mutex that has deadlock detecting.
+   *
+   * @param aName
+   *        A name which can be used to reference this mutex.
+   */
+  explicit SQLiteMutex(const char *aName)
+  : BlockingResourceBase(aName, eMutex)
+  , mMutex(nullptr)
+  {
+  }
+
+  /**
+   * Sets the mutex that we are wrapping.  We generally do not have access to
+   * our mutex at class construction, so we have to set it once we get access to
+   * it.
+   *
+   * @param aMutex
+   *        The sqlite3_mutex that we are going to wrap.
+   */
+  void initWithMutex(sqlite3_mutex *aMutex)
+  {
+    NS_ASSERTION(aMutex, "You must pass in a valid mutex!");
+    NS_ASSERTION(!mMutex, "A mutex has already been set for this!");
+    mMutex = aMutex;
+  }
+
+#if !defined(DEBUG) || defined(MOZ_NATIVE_SQLITE)
+  /**
+   * Acquires the mutex.
+   */
+  void lock()
+  {
+    sqlite3_mutex_enter(mMutex);
+  }
+
+  /**
+   * Releases the mutex.
+   */
+  void unlock()
+  {
+    sqlite3_mutex_leave(mMutex);
+  }
+
+  /**
+   * Asserts that the current thread owns the mutex.
+   */
+  void assertCurrentThreadOwns()
+  {
+  }
+
+  /**
+   * Asserts that the current thread does not own the mutex.
+   */
+  void assertNotCurrentThreadOwns()
+  {
+  }
+
+#else
+  void lock()
+  {
+    NS_ASSERTION(mMutex, "No mutex associated with this wrapper!");
+
+    // While SQLite Mutexes may be recursive, in our own code we do not want to
+    // treat them as such.
+
+    CheckAcquire();
+    sqlite3_mutex_enter(mMutex);
+    Acquire(); // Call is protected by us holding the mutex.
+  }
+
+  void unlock()
+  {
+    NS_ASSERTION(mMutex, "No mutex associated with this wrapper!");
+
+    // While SQLite Mutexes may be recursive, in our own code we do not want to
+    // treat them as such.
+    Release(); // Call is protected by us holding the mutex.
+    sqlite3_mutex_leave(mMutex);
+  }
+
+  void assertCurrentThreadOwns()
+  {
+    NS_ASSERTION(mMutex, "No mutex associated with this wrapper!");
+    NS_ASSERTION(sqlite3_mutex_held(mMutex),
+                 "Mutex is not held, but we expect it to be!");
+  }
+
+  void assertNotCurrentThreadOwns()
+  {
+    NS_ASSERTION(mMutex, "No mutex associated with this wrapper!");
+    NS_ASSERTION(sqlite3_mutex_notheld(mMutex),
+                 "Mutex is held, but we expect it to not be!");
+  }
+#endif // ifndef DEBUG
+
+private:
+  sqlite3_mutex *mMutex;
+};
+
+/**
+ * Automatically acquires the mutex when it enters scope, and releases it when
+ * it leaves scope.
+ */
+class MOZ_STACK_CLASS SQLiteMutexAutoLock
+{
+public:
+  explicit SQLiteMutexAutoLock(SQLiteMutex &aMutex)
+  : mMutex(aMutex)
+  {
+    mMutex.lock();
+  }
+
+  ~SQLiteMutexAutoLock()
+  {
+    mMutex.unlock();
+  }
+
+private:
+  SQLiteMutex &mMutex;
+};
+
+/**
+ * Automatically releases the mutex when it enters scope, and acquires it when
+ * it leaves scope.
+ */
+class MOZ_STACK_CLASS SQLiteMutexAutoUnlock
+{
+public:
+  explicit SQLiteMutexAutoUnlock(SQLiteMutex &aMutex)
+  : mMutex(aMutex)
+  {
+    mMutex.unlock();
+  }
+
+  ~SQLiteMutexAutoUnlock()
+  {
+    mMutex.lock();
+  }
+
+private:
+  SQLiteMutex &mMutex;
+};
+
+} // namespace storage
+} // namespace mozilla
+
+#endif // mozilla_storage_SQLiteMutex_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/FileSystemModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/src/FileSystemModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/FileSystemModule.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/FileSystemModule.cpp	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 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 "FileSystemModule.h"
-
-#include "sqlite3.h"
-#include "nsString.h"
-#include "nsISimpleEnumerator.h"
-#include "nsIFile.h"
-
-namespace {
-
-struct VirtualTableCursorBase
-{
-  VirtualTableCursorBase()
-  {
-    memset(&mBase, 0, sizeof(mBase));
-  }
-
-  sqlite3_vtab_cursor mBase;
-};
-
-struct VirtualTableCursor : public VirtualTableCursorBase
-{
-public:
-  VirtualTableCursor()
-  : mRowId(-1)
-  {
-    mCurrentFileName.SetIsVoid(true);
-  }
-
-  const nsString& DirectoryPath() const
-  {
-    return mDirectoryPath;
-  }
-
-  const nsString& CurrentFileName() const
-  {
-    return mCurrentFileName;
-  }
-
-  int64_t RowId() const
-  {
-    return mRowId;
-  }
-
-  nsresult Init(const nsAString& aPath);
-  nsresult NextFile();
-
-private:
-  nsCOMPtr<nsISimpleEnumerator> mEntries;
-
-  nsString mDirectoryPath;
-  nsString mCurrentFileName;
-
-  int64_t mRowId;
-};
-
-nsresult
-VirtualTableCursor::Init(const nsAString& aPath)
-{
-  nsCOMPtr<nsIFile> directory =
-    do_CreateInstance(NS_LOCAL_FILE_CONTRACTID);
-  NS_ENSURE_TRUE(directory, NS_ERROR_FAILURE);
-
-  nsresult rv = directory->InitWithPath(aPath);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = directory->GetPath(mDirectoryPath);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = directory->GetDirectoryEntries(getter_AddRefs(mEntries));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = NextFile();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-nsresult
-VirtualTableCursor::NextFile()
-{
-  bool hasMore;
-  nsresult rv = mEntries->HasMoreElements(&hasMore);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (!hasMore) {
-    mCurrentFileName.SetIsVoid(true);
-    return NS_OK;
-  }
-
-  nsCOMPtr<nsISupports> entry;
-  rv = mEntries->GetNext(getter_AddRefs(entry));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsCOMPtr<nsIFile> file = do_QueryInterface(entry);
-  NS_ENSURE_TRUE(file, NS_ERROR_FAILURE);
-
-  rv = file->GetLeafName(mCurrentFileName);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  mRowId++;
-
-  return NS_OK;
-}
-
-int Connect(sqlite3* aDB, void* aAux, int aArgc, const char* const* aArgv,
-            sqlite3_vtab** aVtab, char** aErr)
-{
-  static const char virtualTableSchema[] =
-    "CREATE TABLE fs ("
-      "name TEXT, "
-      "path TEXT"
-    ")";
-
-  int rc = sqlite3_declare_vtab(aDB, virtualTableSchema);
-  if (rc != SQLITE_OK) {
-    return rc;
-  }
-
-  sqlite3_vtab* vt = new sqlite3_vtab();
-  memset(vt, 0, sizeof(*vt));
-
-  *aVtab = vt;
-
-  return SQLITE_OK;
-}
-
-int Disconnect(sqlite3_vtab* aVtab )
-{
-  delete aVtab;
-
-  return SQLITE_OK;
-}
-
-int BestIndex(sqlite3_vtab* aVtab, sqlite3_index_info* aInfo)
-{
-  // Here we specify what index constraints we want to handle. That is, there
-  // might be some columns with particular constraints in which we can help
-  // SQLite narrow down the result set.
-  //
-  // For example, take the "path = x" where x is a directory. In this case,
-  // we can narrow our search to just this directory instead of the entire file
-  // system. This can be a significant optimization. So, we want to handle that
-  // constraint. To do so, we would look for two specific input conditions:
-  //
-  // 1. aInfo->aConstraint[i].iColumn == 1
-  // 2. aInfo->aConstraint[i].op == SQLITE_INDEX_CONSTRAINT_EQ
-  //
-  // The first states that the path column is being used in one of the input
-  // constraints and the second states that the constraint involves the equal
-  // operator.
-  //
-  // An even more specific search would be for name='xxx', in which case we
-  // can limit the search to a single file, if it exists.
-  //
-  // What we have to do here is look for all of our index searches and select
-  // the narrowest. We can only pick one, so obviously we want the one that
-  // is the most specific, which leads to the smallest result set.
-
-  for(int i = 0; i < aInfo->nConstraint; i++) {
-    if (aInfo->aConstraint[i].iColumn == 1 && aInfo->aConstraint[i].usable) {
-      if (aInfo->aConstraint[i].op & SQLITE_INDEX_CONSTRAINT_EQ) {
-        aInfo->aConstraintUsage[i].argvIndex = 1;
-      }
-      break;
-    }
-
-    // TODO: handle single files (constrained also by the name column)
-  }
-
-  return SQLITE_OK;
-}
-
-int Open(sqlite3_vtab* aVtab, sqlite3_vtab_cursor** aCursor)
-{
-  VirtualTableCursor* cursor = new VirtualTableCursor();
-
-  *aCursor = reinterpret_cast<sqlite3_vtab_cursor*>(cursor);
-
-  return SQLITE_OK;
-}
-
-int Close(sqlite3_vtab_cursor* aCursor)
-{
-  VirtualTableCursor* cursor = reinterpret_cast<VirtualTableCursor*>(aCursor);
-
-  delete cursor;
-
-  return SQLITE_OK;
-}
-
-int Filter(sqlite3_vtab_cursor* aCursor, int aIdxNum, const char* aIdxStr,
-           int aArgc, sqlite3_value** aArgv)
-{
-  VirtualTableCursor* cursor = reinterpret_cast<VirtualTableCursor*>(aCursor);
-
-  if(aArgc <= 0) {
-    return SQLITE_OK;
-  }
-
-  nsDependentString path(
-    reinterpret_cast<const char16_t*>(::sqlite3_value_text16(aArgv[0])));
-
-  nsresult rv = cursor->Init(path);
-  NS_ENSURE_SUCCESS(rv, SQLITE_ERROR);
-
-  return SQLITE_OK;
-}
-
-int Next(sqlite3_vtab_cursor* aCursor)
-{
-  VirtualTableCursor* cursor = reinterpret_cast<VirtualTableCursor*>(aCursor);
-
-  nsresult rv = cursor->NextFile();
-  NS_ENSURE_SUCCESS(rv, SQLITE_ERROR);
-
-  return SQLITE_OK;
-}
-
-int Eof(sqlite3_vtab_cursor* aCursor)
-{
-  VirtualTableCursor* cursor = reinterpret_cast<VirtualTableCursor*>(aCursor);
-  return cursor->CurrentFileName().IsVoid() ? 1 : 0;
-}
-
-int Column(sqlite3_vtab_cursor* aCursor, sqlite3_context* aContext,
-           int aColumnIndex)
-{
-  VirtualTableCursor* cursor = reinterpret_cast<VirtualTableCursor*>(aCursor);
-
-  switch (aColumnIndex) {
-    // name
-    case 0: {
-      const nsString& name = cursor->CurrentFileName();
-      sqlite3_result_text16(aContext, name.get(),
-                            name.Length() * sizeof(char16_t),
-                            SQLITE_TRANSIENT);
-      break;
-    }
-
-    // path
-    case 1: {
-      const nsString& path = cursor->DirectoryPath();
-      sqlite3_result_text16(aContext, path.get(),
-                            path.Length() * sizeof(char16_t),
-                            SQLITE_TRANSIENT);
-      break;
-    }
-    default:
-      NS_NOTREACHED("Unsupported column!");
-  }
-
-  return SQLITE_OK;
-}
-
-int RowId(sqlite3_vtab_cursor* aCursor, sqlite3_int64* aRowid)
-{
-  VirtualTableCursor* cursor = reinterpret_cast<VirtualTableCursor*>(aCursor);
-
-  *aRowid = cursor->RowId();
-
-  return SQLITE_OK;
-}
-
-} // anonymous namespace
-
-namespace mozilla {
-namespace storage {
-
-int RegisterFileSystemModule(sqlite3* aDB, const char* aName)
-{
-  static sqlite3_module module = {
-    1,
-    Connect,
-    Connect,
-    BestIndex,
-    Disconnect,
-    Disconnect,
-    Open,
-    Close,
-    Filter,
-    Next,
-    Eof,
-    Column,
-    RowId,
-    nullptr,
-    nullptr,
-    nullptr,
-    nullptr,
-    nullptr,
-    nullptr,
-    nullptr
-  };
-
-  return sqlite3_create_module(aDB, aName, &module, nullptr);
-}
-
-} // namespace storage
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/FileSystemModule.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/FileSystemModule.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/FileSystemModule.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/FileSystemModule.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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_storage_FileSystemModule_h
-#define mozilla_storage_FileSystemModule_h
-
-#include "nscore.h"
-
-struct sqlite3;
-
-namespace mozilla {
-namespace storage {
-
-int RegisterFileSystemModule(sqlite3* aDB, const char* aName);
-
-} // namespace storage
-} // namespace mozilla
-
-#endif // mozilla_storage_FileSystemModule_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/IStorageBindingParamsInternal.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/IStorageBindingParamsInternal.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/IStorageBindingParamsInternal.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/IStorageBindingParamsInternal.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 sts=2 expandtab
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef mozilla_storage_IStorageBindingParamsInternal_h_
-#define mozilla_storage_IStorageBindingParamsInternal_h_
-
-#include "nsISupports.h"
-
-struct sqlite3_stmt;
-class mozIStorageError;
-
-namespace mozilla {
-namespace storage {
-
-#define ISTORAGEBINDINGPARAMSINTERNAL_IID \
-  {0x4c43d33a, 0xc620, 0x41b8, {0xba, 0x1d, 0x50, 0xc5, 0xb1, 0xe9, 0x1a, 0x04}}
-
-/**
- * Implementation-only interface for mozIStorageBindingParams.  This defines the
- * set of methods required by the asynchronous execution code in order to
- * consume the contents stored in mozIStorageBindingParams instances.
- */
-class IStorageBindingParamsInternal : public nsISupports
-{
-public:
-  NS_DECLARE_STATIC_IID_ACCESSOR(ISTORAGEBINDINGPARAMSINTERNAL_IID)
-
-  /**
-   * Binds our stored data to the statement.
-   *
-   * @param aStatement
-   *        The statement to bind our data to.
-   * @return nullptr on success, or a mozIStorageError object if an error
-   *         occurred.
-   */
-  virtual already_AddRefed<mozIStorageError> bind(sqlite3_stmt *aStatement) = 0;
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(IStorageBindingParamsInternal,
-                              ISTORAGEBINDINGPARAMSINTERNAL_IID)
-
-#define NS_DECL_ISTORAGEBINDINGPARAMSINTERNAL \
-  already_AddRefed<mozIStorageError> bind(sqlite3_stmt *aStatement) override;
-
-} // storage
-} // mozilla
-
-#endif // mozilla_storage_IStorageBindingParamsInternal_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/moz.build firefox-trunk-41.0~a1~hg20150524r245419/storage/src/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/moz.build	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +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.mozilla.storage += [
-    'Variant.h',
-    'Variant_inl.h',
-]
-
-UNIFIED_SOURCES += [
-    'FileSystemModule.cpp',
-    'mozStorageArgValueArray.cpp',
-    'mozStorageAsyncStatement.cpp',
-    'mozStorageAsyncStatementExecution.cpp',
-    'mozStorageAsyncStatementJSHelper.cpp',
-    'mozStorageAsyncStatementParams.cpp',
-    'mozStorageBindingParamsArray.cpp',
-    'mozStorageError.cpp',
-    'mozStoragePrivateHelpers.cpp',
-    'mozStorageResultSet.cpp',
-    'mozStorageRow.cpp',
-    'mozStorageService.cpp',
-    'mozStorageSQLFunctions.cpp',
-    'mozStorageStatement.cpp',
-    'mozStorageStatementJSHelper.cpp',
-    'mozStorageStatementParams.cpp',
-    'mozStorageStatementRow.cpp',
-    'SQLCollations.cpp',
-    'StorageBaseStatementInternal.cpp',
-    'TelemetryVFS.cpp',
-    'VacuumManager.cpp',
-]
-
-# These files need to be built separately because they #include variantToSQLiteT_impl.h.
-SOURCES += [
-    'mozStorageBindingParams.cpp',
-    'mozStorageConnection.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-FINAL_LIBRARY = 'xul'
-
-# Don't use the jemalloc allocator on Android, because we can't guarantee
-# that Gecko will configure sqlite before it is first used (bug 730495).
-#
-# Don't use the jemalloc allocator when using system sqlite. Linked in libraries
-# (such as NSS) might trigger an initialization of sqlite and allocation
-# of memory using the default allocator, prior to the storage service
-# registering its allocator, causing memory management failures (bug 938730).
-# However, this is not an issue if both the jemalloc allocator and the default
-# allocator are the same thing.
-#
-# Note: On Windows our sqlite build assumes we use jemalloc.  If you disable
-# MOZ_STORAGE_MEMORY on Windows, you will also need to change the "ifdef
-# MOZ_MEMORY" options in db/sqlite3/src/Makefile.in.
-if CONFIG['MOZ_MEMORY'] and (not CONFIG['MOZ_NATIVE_SQLITE']
-                             or CONFIG['MOZ_NATIVE_JEMALLOC']):
-    if CONFIG['OS_TARGET'] != 'Android':
-        DEFINES['MOZ_STORAGE_MEMORY'] = True
-
-# This is the default value.  If we ever change it when compiling sqlite, we
-# will need to change it here as well.
-DEFINES['SQLITE_MAX_LIKE_PATTERN_LENGTH'] = 50000
-
-LOCAL_INCLUDES += [
-    '/db/sqlite3/src',
-    '/dom/base',
-]
-
-CXXFLAGS += CONFIG['SQLITE_CFLAGS']
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageArgValueArray.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageArgValueArray.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageArgValueArray.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageArgValueArray.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,215 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 "nsError.h"
-#include "nsMemory.h"
-#include "nsString.h"
-
-#include "mozStoragePrivateHelpers.h"
-#include "mozStorageArgValueArray.h"
-
-namespace mozilla {
-namespace storage {
-
-////////////////////////////////////////////////////////////////////////////////
-//// ArgValueArray
-
-ArgValueArray::ArgValueArray(int32_t aArgc,
-                             sqlite3_value **aArgv)
-: mArgc(aArgc)
-, mArgv(aArgv)
-{
-}
-
-NS_IMPL_ISUPPORTS(
-  ArgValueArray,
-  mozIStorageValueArray
-)
-
-////////////////////////////////////////////////////////////////////////////////
-//// mozIStorageValueArray
-
-NS_IMETHODIMP
-ArgValueArray::GetNumEntries(uint32_t *_size)
-{
-  *_size = mArgc;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-ArgValueArray::GetTypeOfIndex(uint32_t aIndex,
-                              int32_t *_type)
-{
-  ENSURE_INDEX_VALUE(aIndex, mArgc);
-
-  int t = ::sqlite3_value_type(mArgv[aIndex]);
-  switch (t) {
-    case SQLITE_INTEGER:
-      *_type = VALUE_TYPE_INTEGER;
-      break;
-    case SQLITE_FLOAT:
-      *_type = VALUE_TYPE_FLOAT;
-      break;
-    case SQLITE_TEXT:
-      *_type = VALUE_TYPE_TEXT;
-      break;
-    case SQLITE_BLOB:
-      *_type = VALUE_TYPE_BLOB;
-      break;
-    case SQLITE_NULL:
-      *_type = VALUE_TYPE_NULL;
-      break;
-    default:
-      return NS_ERROR_FAILURE;
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-ArgValueArray::GetInt32(uint32_t aIndex,
-                        int32_t *_value)
-{
-  ENSURE_INDEX_VALUE(aIndex, mArgc);
-
-  *_value = ::sqlite3_value_int(mArgv[aIndex]);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-ArgValueArray::GetInt64(uint32_t aIndex,
-                        int64_t *_value)
-{
-  ENSURE_INDEX_VALUE(aIndex, mArgc);
-
-  *_value = ::sqlite3_value_int64(mArgv[aIndex]);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-ArgValueArray::GetDouble(uint32_t aIndex,
-                         double *_value)
-{
-  ENSURE_INDEX_VALUE(aIndex, mArgc);
-
-  *_value = ::sqlite3_value_double(mArgv[aIndex]);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-ArgValueArray::GetUTF8String(uint32_t aIndex,
-                             nsACString &_value)
-{
-  ENSURE_INDEX_VALUE(aIndex, mArgc);
-
-  if (::sqlite3_value_type(mArgv[aIndex]) == SQLITE_NULL) {
-    // NULL columns should have IsVoid set to distinguish them from an empty
-    // string.
-    _value.Truncate(0);
-    _value.SetIsVoid(true);
-  }
-  else {
-    _value.Assign(reinterpret_cast<const char *>(::sqlite3_value_text(mArgv[aIndex])),
-                  ::sqlite3_value_bytes(mArgv[aIndex]));
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-ArgValueArray::GetString(uint32_t aIndex,
-                         nsAString &_value)
-{
-  ENSURE_INDEX_VALUE(aIndex, mArgc);
-
-  if (::sqlite3_value_type(mArgv[aIndex]) == SQLITE_NULL) {
-    // NULL columns should have IsVoid set to distinguish them from an empty
-    // string.
-    _value.Truncate(0);
-    _value.SetIsVoid(true);
-  } else {
-    _value.Assign(static_cast<const char16_t *>(::sqlite3_value_text16(mArgv[aIndex])),
-                  ::sqlite3_value_bytes16(mArgv[aIndex]) / 2);
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-ArgValueArray::GetBlob(uint32_t aIndex,
-                       uint32_t *_size,
-                       uint8_t **_blob)
-{
-  ENSURE_INDEX_VALUE(aIndex, mArgc);
-
-  int size = ::sqlite3_value_bytes(mArgv[aIndex]);
-  void *blob = nsMemory::Clone(::sqlite3_value_blob(mArgv[aIndex]), size);
-  NS_ENSURE_TRUE(blob, NS_ERROR_OUT_OF_MEMORY);
-
-  *_blob = static_cast<uint8_t *>(blob);
-  *_size = size;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-ArgValueArray::GetBlobAsString(uint32_t aIndex, nsAString& aValue)
-{
-  return DoGetBlobAsString(this, aIndex, aValue);
-}
-
-NS_IMETHODIMP
-ArgValueArray::GetBlobAsUTF8String(uint32_t aIndex, nsACString& aValue)
-{
-  return DoGetBlobAsString(this, aIndex, aValue);
-}
-
-NS_IMETHODIMP
-ArgValueArray::GetIsNull(uint32_t aIndex,
-                         bool *_isNull)
-{
-  // GetTypeOfIndex will check aIndex for us, so we don't have to.
-  int32_t type;
-  nsresult rv = GetTypeOfIndex(aIndex, &type);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  *_isNull = (type == VALUE_TYPE_NULL);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-ArgValueArray::GetSharedUTF8String(uint32_t aIndex,
-                                   uint32_t *_length,
-                                   const char **_string)
-{
-  if (_length)
-    *_length = ::sqlite3_value_bytes(mArgv[aIndex]);
-
-  *_string = reinterpret_cast<const char *>(::sqlite3_value_text(mArgv[aIndex]));
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-ArgValueArray::GetSharedString(uint32_t aIndex,
-                               uint32_t *_length,
-                               const char16_t **_string)
-{
-  if (_length)
-    *_length = ::sqlite3_value_bytes(mArgv[aIndex]);
-
-  *_string = static_cast<const char16_t *>(::sqlite3_value_text16(mArgv[aIndex]));
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-ArgValueArray::GetSharedBlob(uint32_t aIndex,
-                             uint32_t *_size,
-                             const uint8_t **_blob)
-{
-  *_size = ::sqlite3_value_bytes(mArgv[aIndex]);
-  *_blob = static_cast<const uint8_t *>(::sqlite3_value_blob(mArgv[aIndex]));
-  return NS_OK;
-}
-
-} // namespace storage
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageArgValueArray.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageArgValueArray.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageArgValueArray.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageArgValueArray.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 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 mozStorageArgValueArray_h
-#define mozStorageArgValueArray_h
-
-#include "mozIStorageValueArray.h"
-#include "mozilla/Attributes.h"
-
-#include "sqlite3.h"
-
-namespace mozilla {
-namespace storage {
-
-class ArgValueArray final : public mozIStorageValueArray
-{
-public:
-  ArgValueArray(int32_t aArgc, sqlite3_value **aArgv);
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_MOZISTORAGEVALUEARRAY
-
-private:
-  ~ArgValueArray() {}
-
-  uint32_t mArgc;
-  sqlite3_value **mArgv;
-};
-
-} // namespace storage
-} // namespace mozilla
-
-#endif // mozStorageArgValueArray_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageAsyncStatement.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageAsyncStatement.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageAsyncStatement.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageAsyncStatement.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,387 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 <limits.h>
-#include <stdio.h>
-
-#include "nsError.h"
-#include "nsMemory.h"
-#include "nsProxyRelease.h"
-#include "nsThreadUtils.h"
-#include "nsIClassInfoImpl.h"
-#include "Variant.h"
-
-#include "mozIStorageError.h"
-
-#include "mozStorageBindingParams.h"
-#include "mozStorageConnection.h"
-#include "mozStorageAsyncStatementJSHelper.h"
-#include "mozStorageAsyncStatementParams.h"
-#include "mozStoragePrivateHelpers.h"
-#include "mozStorageStatementRow.h"
-#include "mozStorageStatement.h"
-#include "nsDOMClassInfo.h"
-
-#include "prlog.h"
-
-#ifdef PR_LOGGING
-extern PRLogModuleInfo *gStorageLog;
-#endif
-
-namespace mozilla {
-namespace storage {
-
-////////////////////////////////////////////////////////////////////////////////
-//// nsIClassInfo
-
-NS_IMPL_CI_INTERFACE_GETTER(AsyncStatement,
-                            mozIStorageAsyncStatement,
-                            mozIStorageBaseStatement,
-                            mozIStorageBindingParams,
-                            mozilla::storage::StorageBaseStatementInternal)
-
-class AsyncStatementClassInfo : public nsIClassInfo
-{
-public:
-  MOZ_CONSTEXPR AsyncStatementClassInfo() {}
-
-  NS_DECL_ISUPPORTS_INHERITED
-
-  NS_IMETHODIMP
-  GetInterfaces(uint32_t *_count, nsIID ***_array) override
-  {
-    return NS_CI_INTERFACE_GETTER_NAME(AsyncStatement)(_count, _array);
-  }
-
-  NS_IMETHODIMP
-  GetScriptableHelper(nsIXPCScriptable **_helper) override
-  {
-    static AsyncStatementJSHelper sJSHelper;
-    *_helper = &sJSHelper;
-    return NS_OK;
-  }
-
-  NS_IMETHODIMP
-  GetContractID(char **_contractID) override
-  {
-    *_contractID = nullptr;
-    return NS_OK;
-  }
-
-  NS_IMETHODIMP
-  GetClassDescription(char **_desc) override
-  {
-    *_desc = nullptr;
-    return NS_OK;
-  }
-
-  NS_IMETHODIMP
-  GetClassID(nsCID **_id) override
-  {
-    *_id = nullptr;
-    return NS_OK;
-  }
-
-  NS_IMETHODIMP
-  GetFlags(uint32_t *_flags) override
-  {
-    *_flags = 0;
-    return NS_OK;
-  }
-
-  NS_IMETHODIMP
-  GetClassIDNoAlloc(nsCID *_cid) override
-  {
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-};
-
-NS_IMETHODIMP_(MozExternalRefCountType) AsyncStatementClassInfo::AddRef() { return 2; }
-NS_IMETHODIMP_(MozExternalRefCountType) AsyncStatementClassInfo::Release() { return 1; }
-NS_IMPL_QUERY_INTERFACE(AsyncStatementClassInfo, nsIClassInfo)
-
-static AsyncStatementClassInfo sAsyncStatementClassInfo;
-
-////////////////////////////////////////////////////////////////////////////////
-//// AsyncStatement
-
-AsyncStatement::AsyncStatement()
-: StorageBaseStatementInternal()
-, mFinalized(false)
-{
-}
-
-nsresult
-AsyncStatement::initialize(Connection *aDBConnection,
-                           sqlite3 *aNativeConnection,
-                           const nsACString &aSQLStatement)
-{
-  MOZ_ASSERT(aDBConnection, "No database connection given!");
-  MOZ_ASSERT(!aDBConnection->isClosed(), "Database connection should be valid");
-  MOZ_ASSERT(aNativeConnection, "No native connection given!");
-
-  mDBConnection = aDBConnection;
-  mNativeConnection = aNativeConnection;
-  mSQLString = aSQLStatement;
-
-  PR_LOG(gStorageLog, PR_LOG_NOTICE, ("Inited async statement '%s' (0x%p)",
-                                      mSQLString.get()));
-
-#ifdef DEBUG
-  // We want to try and test for LIKE and that consumers are using
-  // escapeStringForLIKE instead of just trusting user input.  The idea to
-  // check to see if they are binding a parameter after like instead of just
-  // using a string.  We only do this in debug builds because it's expensive!
-  const nsCaseInsensitiveCStringComparator c;
-  nsACString::const_iterator start, end, e;
-  aSQLStatement.BeginReading(start);
-  aSQLStatement.EndReading(end);
-  e = end;
-  while (::FindInReadable(NS_LITERAL_CSTRING(" LIKE"), start, e, c)) {
-    // We have a LIKE in here, so we perform our tests
-    // FindInReadable moves the iterator, so we have to get a new one for
-    // each test we perform.
-    nsACString::const_iterator s1, s2, s3;
-    s1 = s2 = s3 = start;
-
-    if (!(::FindInReadable(NS_LITERAL_CSTRING(" LIKE ?"), s1, end, c) ||
-          ::FindInReadable(NS_LITERAL_CSTRING(" LIKE :"), s2, end, c) ||
-          ::FindInReadable(NS_LITERAL_CSTRING(" LIKE @"), s3, end, c))) {
-      // At this point, we didn't find a LIKE statement followed by ?, :,
-      // or @, all of which are valid characters for binding a parameter.
-      // We will warn the consumer that they may not be safely using LIKE.
-      NS_WARNING("Unsafe use of LIKE detected!  Please ensure that you "
-                 "are using mozIStorageAsyncStatement::escapeStringForLIKE "
-                 "and that you are binding that result to the statement "
-                 "to prevent SQL injection attacks.");
-    }
-
-    // resetting start and e
-    start = e;
-    e = end;
-  }
-#endif
-
-  return NS_OK;
-}
-
-mozIStorageBindingParams *
-AsyncStatement::getParams()
-{
-  nsresult rv;
-
-  // If we do not have an array object yet, make it.
-  if (!mParamsArray) {
-    nsCOMPtr<mozIStorageBindingParamsArray> array;
-    rv = NewBindingParamsArray(getter_AddRefs(array));
-    NS_ENSURE_SUCCESS(rv, nullptr);
-
-    mParamsArray = static_cast<BindingParamsArray *>(array.get());
-  }
-
-  // If there isn't already any rows added, we'll have to add one to use.
-  if (mParamsArray->length() == 0) {
-    nsRefPtr<AsyncBindingParams> params(new AsyncBindingParams(mParamsArray));
-    NS_ENSURE_TRUE(params, nullptr);
-
-    rv = mParamsArray->AddParams(params);
-    NS_ENSURE_SUCCESS(rv, nullptr);
-
-    // We have to unlock our params because AddParams locks them.  This is safe
-    // because no reference to the params object was, or ever will be given out.
-    params->unlock(nullptr);
-
-    // We also want to lock our array at this point - we don't want anything to
-    // be added to it.
-    mParamsArray->lock();
-  }
-
-  return *mParamsArray->begin();
-}
-
-/**
- * If we are here then we know there are no pending async executions relying on
- * us (StatementData holds a reference to us; this also goes for our own
- * AsyncStatementFinalizer which proxies its release to the calling thread) and
- * so it is always safe to destroy our sqlite3_stmt if one exists.  We can be
- * destroyed on the caller thread by garbage-collection/reference counting or on
- * the async thread by the last execution of a statement that already lost its
- * main-thread refs.
- */
-AsyncStatement::~AsyncStatement()
-{
-  destructorAsyncFinalize();
-
-  // If we are getting destroyed on the wrong thread, proxy the connection
-  // release to the right thread.  I'm not sure why we do this.
-  bool onCallingThread = false;
-  (void)mDBConnection->threadOpenedOn->IsOnCurrentThread(&onCallingThread);
-  if (!onCallingThread) {
-    // NS_ProxyRelase only magic forgets for us if mDBConnection is an
-    // nsCOMPtr.  Which it is not; it's an nsRefPtr.
-    Connection *forgottenConn = nullptr;
-    mDBConnection.swap(forgottenConn);
-    (void)::NS_ProxyRelease(forgottenConn->threadOpenedOn,
-                            static_cast<mozIStorageConnection *>(forgottenConn));
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//// nsISupports
-
-NS_IMPL_ADDREF(AsyncStatement)
-NS_IMPL_RELEASE(AsyncStatement)
-
-NS_INTERFACE_MAP_BEGIN(AsyncStatement)
-  NS_INTERFACE_MAP_ENTRY(mozIStorageAsyncStatement)
-  NS_INTERFACE_MAP_ENTRY(mozIStorageBaseStatement)
-  NS_INTERFACE_MAP_ENTRY(mozIStorageBindingParams)
-  NS_INTERFACE_MAP_ENTRY(mozilla::storage::StorageBaseStatementInternal)
-  if (aIID.Equals(NS_GET_IID(nsIClassInfo))) {
-    foundInterface = static_cast<nsIClassInfo *>(&sAsyncStatementClassInfo);
-  }
-  else
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, mozIStorageAsyncStatement)
-NS_INTERFACE_MAP_END
-
-
-////////////////////////////////////////////////////////////////////////////////
-//// StorageBaseStatementInternal
-
-Connection *
-AsyncStatement::getOwner()
-{
-  return mDBConnection;
-}
-
-int
-AsyncStatement::getAsyncStatement(sqlite3_stmt **_stmt)
-{
-#ifdef DEBUG
-  // Make sure we are never called on the connection's owning thread.
-  bool onOpenedThread = false;
-  (void)mDBConnection->threadOpenedOn->IsOnCurrentThread(&onOpenedThread);
-  NS_ASSERTION(!onOpenedThread,
-               "We should only be called on the async thread!");
-#endif
-
-  if (!mAsyncStatement) {
-    int rc = mDBConnection->prepareStatement(mNativeConnection, mSQLString,
-                                             &mAsyncStatement);
-    if (rc != SQLITE_OK) {
-      PR_LOG(gStorageLog, PR_LOG_ERROR,
-             ("Sqlite statement prepare error: %d '%s'", rc,
-              ::sqlite3_errmsg(mNativeConnection)));
-      PR_LOG(gStorageLog, PR_LOG_ERROR,
-             ("Statement was: '%s'", mSQLString.get()));
-      *_stmt = nullptr;
-      return rc;
-    }
-    PR_LOG(gStorageLog, PR_LOG_NOTICE, ("Initialized statement '%s' (0x%p)",
-                                        mSQLString.get(),
-                                        mAsyncStatement));
-  }
-
-  *_stmt = mAsyncStatement;
-  return SQLITE_OK;
-}
-
-nsresult
-AsyncStatement::getAsynchronousStatementData(StatementData &_data)
-{
-  if (mFinalized)
-    return NS_ERROR_UNEXPECTED;
-
-  // Pass null for the sqlite3_stmt; it will be requested on demand from the
-  // async thread.
-  _data = StatementData(nullptr, bindingParamsArray(), this);
-
-  return NS_OK;
-}
-
-already_AddRefed<mozIStorageBindingParams>
-AsyncStatement::newBindingParams(mozIStorageBindingParamsArray *aOwner)
-{
-  if (mFinalized)
-    return nullptr;
-
-  nsCOMPtr<mozIStorageBindingParams> params(new AsyncBindingParams(aOwner));
-  return params.forget();
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-//// mozIStorageAsyncStatement
-
-// (nothing is specific to mozIStorageAsyncStatement)
-
-////////////////////////////////////////////////////////////////////////////////
-//// StorageBaseStatementInternal
-
-// proxy to StorageBaseStatementInternal using its define helper.
-MIXIN_IMPL_STORAGEBASESTATEMENTINTERNAL(
-  AsyncStatement,
-  if (mFinalized) return NS_ERROR_UNEXPECTED;)
-
-NS_IMETHODIMP
-AsyncStatement::Finalize()
-{
-  if (mFinalized)
-    return NS_OK;
-
-  mFinalized = true;
-
-  PR_LOG(gStorageLog, PR_LOG_NOTICE, ("Finalizing statement '%s'",
-                                      mSQLString.get()));
-
-  asyncFinalize();
-
-  // Release the params holder, so it can release the reference to us.
-  mStatementParamsHolder = nullptr;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-AsyncStatement::BindParameters(mozIStorageBindingParamsArray *aParameters)
-{
-  if (mFinalized)
-    return NS_ERROR_UNEXPECTED;
-
-  BindingParamsArray *array = static_cast<BindingParamsArray *>(aParameters);
-  if (array->getOwner() != this)
-    return NS_ERROR_UNEXPECTED;
-
-  if (array->length() == 0)
-    return NS_ERROR_UNEXPECTED;
-
-  mParamsArray = array;
-  mParamsArray->lock();
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-AsyncStatement::GetState(int32_t *_state)
-{
-  if (mFinalized)
-    *_state = MOZ_STORAGE_STATEMENT_INVALID;
-  else
-    *_state = MOZ_STORAGE_STATEMENT_READY;
-
-  return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//// mozIStorageBindingParams
-
-BOILERPLATE_BIND_PROXIES(
-  AsyncStatement, 
-  if (mFinalized) return NS_ERROR_UNEXPECTED;
-)
-
-} // namespace storage
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageAsyncStatementExecution.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageAsyncStatementExecution.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageAsyncStatementExecution.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageAsyncStatementExecution.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,648 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 "sqlite3.h"
-
-#include "mozIStorageStatementCallback.h"
-#include "mozStorageBindingParams.h"
-#include "mozStorageHelper.h"
-#include "mozStorageResultSet.h"
-#include "mozStorageRow.h"
-#include "mozStorageConnection.h"
-#include "mozStorageError.h"
-#include "mozStoragePrivateHelpers.h"
-#include "mozStorageStatementData.h"
-#include "mozStorageAsyncStatementExecution.h"
-
-#include "mozilla/DebugOnly.h"
-#include "mozilla/Telemetry.h"
-
-namespace mozilla {
-namespace storage {
-
-/**
- * The following constants help batch rows into result sets.
- * MAX_MILLISECONDS_BETWEEN_RESULTS was chosen because any user-based task that
- * takes less than 200 milliseconds is considered to feel instantaneous to end
- * users.  MAX_ROWS_PER_RESULT was arbitrarily chosen to reduce the number of
- * dispatches to calling thread, while also providing reasonably-sized sets of
- * data for consumers.  Both of these constants are used because we assume that
- * consumers are trying to avoid blocking their execution thread for long
- * periods of time, and dispatching many small events to the calling thread will
- * end up blocking it.
- */
-#define MAX_MILLISECONDS_BETWEEN_RESULTS 75
-#define MAX_ROWS_PER_RESULT 15
-
-////////////////////////////////////////////////////////////////////////////////
-//// Local Classes
-
-namespace {
-
-typedef AsyncExecuteStatements::ExecutionState ExecutionState;
-typedef AsyncExecuteStatements::StatementDataArray StatementDataArray;
-
-/**
- * Notifies a callback with a result set.
- */
-class CallbackResultNotifier : public nsRunnable
-{
-public:
-  CallbackResultNotifier(mozIStorageStatementCallback *aCallback,
-                         mozIStorageResultSet *aResults,
-                         AsyncExecuteStatements *aEventStatus) :
-      mCallback(aCallback)
-    , mResults(aResults)
-    , mEventStatus(aEventStatus)
-  {
-  }
-
-  NS_IMETHOD Run()
-  {
-    NS_ASSERTION(mCallback, "Trying to notify about results without a callback!");
-
-    if (mEventStatus->shouldNotify()) {
-      // Hold a strong reference to the callback while notifying it, so that if
-      // it spins the event loop, the callback won't be released and freed out
-      // from under us.
-      nsCOMPtr<mozIStorageStatementCallback> callback =
-        do_QueryInterface(mCallback);
-
-      (void)mCallback->HandleResult(mResults);
-    }
-
-    return NS_OK;
-  }
-
-private:
-  mozIStorageStatementCallback *mCallback;
-  nsCOMPtr<mozIStorageResultSet> mResults;
-  nsRefPtr<AsyncExecuteStatements> mEventStatus;
-};
-
-/**
- * Notifies the calling thread that an error has occurred.
- */
-class ErrorNotifier : public nsRunnable
-{
-public:
-  ErrorNotifier(mozIStorageStatementCallback *aCallback,
-                mozIStorageError *aErrorObj,
-                AsyncExecuteStatements *aEventStatus) :
-      mCallback(aCallback)
-    , mErrorObj(aErrorObj)
-    , mEventStatus(aEventStatus)
-  {
-  }
-
-  NS_IMETHOD Run()
-  {
-    if (mEventStatus->shouldNotify() && mCallback) {
-      // Hold a strong reference to the callback while notifying it, so that if
-      // it spins the event loop, the callback won't be released and freed out
-      // from under us.
-      nsCOMPtr<mozIStorageStatementCallback> callback =
-        do_QueryInterface(mCallback);
-
-      (void)mCallback->HandleError(mErrorObj);
-    }
-
-    return NS_OK;
-  }
-
-private:
-  mozIStorageStatementCallback *mCallback;
-  nsCOMPtr<mozIStorageError> mErrorObj;
-  nsRefPtr<AsyncExecuteStatements> mEventStatus;
-};
-
-/**
- * Notifies the calling thread that the statement has finished executing.  Takes
- * ownership of the StatementData so it is released on the proper thread.
- */
-class CompletionNotifier : public nsRunnable
-{
-public:
-  /**
-   * This takes ownership of the callback and the StatementData.  They are
-   * released on the thread this is dispatched to (which should always be the
-   * calling thread).
-   */
-  CompletionNotifier(mozIStorageStatementCallback *aCallback,
-                     ExecutionState aReason)
-    : mCallback(aCallback)
-    , mReason(aReason)
-  {
-  }
-
-  NS_IMETHOD Run()
-  {
-    if (mCallback) {
-      (void)mCallback->HandleCompletion(mReason);
-      NS_RELEASE(mCallback);
-    }
-
-    return NS_OK;
-  }
-
-private:
-  mozIStorageStatementCallback *mCallback;
-  ExecutionState mReason;
-};
-
-} // anonymous namespace
-
-////////////////////////////////////////////////////////////////////////////////
-//// AsyncExecuteStatements
-
-/* static */
-nsresult
-AsyncExecuteStatements::execute(StatementDataArray &aStatements,
-                                Connection *aConnection,
-                                sqlite3 *aNativeConnection,
-                                mozIStorageStatementCallback *aCallback,
-                                mozIStoragePendingStatement **_stmt)
-{
-  // Create our event to run in the background
-  nsRefPtr<AsyncExecuteStatements> event =
-    new AsyncExecuteStatements(aStatements, aConnection, aNativeConnection,
-                               aCallback);
-  NS_ENSURE_TRUE(event, NS_ERROR_OUT_OF_MEMORY);
-
-  // Dispatch it to the background
-  nsIEventTarget *target = aConnection->getAsyncExecutionTarget();
-
-  // If we don't have a valid target, this is a bug somewhere else. In the past,
-  // this assert found cases where a Run method would schedule a new statement
-  // without checking if asyncClose had been called. The caller must prevent
-  // that from happening or, if the work is not critical, just avoid creating
-  // the new statement during shutdown. See bug 718449 for an example.
-  MOZ_ASSERT(target);
-  if (!target) {
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-
-  nsresult rv = target->Dispatch(event, NS_DISPATCH_NORMAL);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // Return it as the pending statement object and track it.
-  NS_ADDREF(*_stmt = event);
-  return NS_OK;
-}
-
-AsyncExecuteStatements::AsyncExecuteStatements(StatementDataArray &aStatements,
-                                               Connection *aConnection,
-                                               sqlite3 *aNativeConnection,
-                                               mozIStorageStatementCallback *aCallback)
-: mConnection(aConnection)
-, mNativeConnection(aNativeConnection)
-, mHasTransaction(false)
-, mCallback(aCallback)
-, mCallingThread(::do_GetCurrentThread())
-, mMaxWait(TimeDuration::FromMilliseconds(MAX_MILLISECONDS_BETWEEN_RESULTS))
-, mIntervalStart(TimeStamp::Now())
-, mState(PENDING)
-, mCancelRequested(false)
-, mMutex(aConnection->sharedAsyncExecutionMutex)
-, mDBMutex(aConnection->sharedDBMutex)
-  , mRequestStartDate(TimeStamp::Now())
-{
-  (void)mStatements.SwapElements(aStatements);
-  NS_ASSERTION(mStatements.Length(), "We weren't given any statements!");
-  NS_IF_ADDREF(mCallback);
-}
-
-AsyncExecuteStatements::~AsyncExecuteStatements()
-{
-  MOZ_ASSERT(!mHasTransaction, "There should be no transaction at this point");
-}
-
-bool
-AsyncExecuteStatements::shouldNotify()
-{
-#ifdef DEBUG
-  mMutex.AssertNotCurrentThreadOwns();
-
-  bool onCallingThread = false;
-  (void)mCallingThread->IsOnCurrentThread(&onCallingThread);
-  NS_ASSERTION(onCallingThread, "runEvent not running on the calling thread!");
-#endif
-
-  // We do not need to acquire mMutex here because it can only ever be written
-  // to on the calling thread, and the only thread that can call us is the
-  // calling thread, so we know that our access is serialized.
-  return !mCancelRequested;
-}
-
-bool
-AsyncExecuteStatements::bindExecuteAndProcessStatement(StatementData &aData,
-                                                       bool aLastStatement)
-{
-  mMutex.AssertNotCurrentThreadOwns();
-
-  sqlite3_stmt *aStatement = nullptr;
-  // This cannot fail; we are only called if it's available.
-  (void)aData.getSqliteStatement(&aStatement);
-  NS_ASSERTION(aStatement, "You broke the code; do not call here like that!");
-  BindingParamsArray *paramsArray(aData);
-
-  // Iterate through all of our parameters, bind them, and execute.
-  bool continueProcessing = true;
-  BindingParamsArray::iterator itr = paramsArray->begin();
-  BindingParamsArray::iterator end = paramsArray->end();
-  while (itr != end && continueProcessing) {
-    // Bind the data to our statement.
-    nsCOMPtr<IStorageBindingParamsInternal> bindingInternal = 
-      do_QueryInterface(*itr);
-    nsCOMPtr<mozIStorageError> error = bindingInternal->bind(aStatement);
-    if (error) {
-      // Set our error state.
-      mState = ERROR;
-
-      // And notify.
-      (void)notifyError(error);
-      return false;
-    }
-
-    // Advance our iterator, execute, and then process the statement.
-    itr++;
-    bool lastStatement = aLastStatement && itr == end;
-    continueProcessing = executeAndProcessStatement(aStatement, lastStatement);
-
-    // Always reset our statement.
-    (void)::sqlite3_reset(aStatement);
-  }
-
-  return continueProcessing;
-}
-
-bool
-AsyncExecuteStatements::executeAndProcessStatement(sqlite3_stmt *aStatement,
-                                                   bool aLastStatement)
-{
-  mMutex.AssertNotCurrentThreadOwns();
-
-  // Execute our statement
-  bool hasResults;
-  do {
-    hasResults = executeStatement(aStatement);
-
-    // If we had an error, bail.
-    if (mState == ERROR)
-      return false;
-
-    // If we have been canceled, there is no point in going on...
-    {
-      MutexAutoLock lockedScope(mMutex);
-      if (mCancelRequested) {
-        mState = CANCELED;
-        return false;
-      }
-    }
-
-    // Build our result set and notify if we got anything back and have a
-    // callback to notify.
-    if (mCallback && hasResults &&
-        NS_FAILED(buildAndNotifyResults(aStatement))) {
-      // We had an error notifying, so we notify on error and stop processing.
-      mState = ERROR;
-
-      // Notify, and stop processing statements.
-      (void)notifyError(mozIStorageError::ERROR,
-                        "An error occurred while notifying about results");
-
-      return false;
-    }
-  } while (hasResults);
-
-#ifdef DEBUG
-  // Check to make sure that this statement was smart about what it did.
-  checkAndLogStatementPerformance(aStatement);
-#endif
-
-  // If we are done, we need to set our state accordingly while we still hold
-  // our mutex.  We would have already returned if we were canceled or had
-  // an error at this point.
-  if (aLastStatement)
-    mState = COMPLETED;
-
-  return true;
-}
-
-bool
-AsyncExecuteStatements::executeStatement(sqlite3_stmt *aStatement)
-{
-  mMutex.AssertNotCurrentThreadOwns();
-  Telemetry::AutoTimer<Telemetry::MOZ_STORAGE_ASYNC_REQUESTS_MS> finallySendExecutionDuration(mRequestStartDate);
-  while (true) {
-    // lock the sqlite mutex so sqlite3_errmsg cannot change
-    SQLiteMutexAutoLock lockedScope(mDBMutex);
-
-    int rc = mConnection->stepStatement(mNativeConnection, aStatement);
-    // Stop if we have no more results.
-    if (rc == SQLITE_DONE)
-    {
-      Telemetry::Accumulate(Telemetry::MOZ_STORAGE_ASYNC_REQUESTS_SUCCESS, true);
-      return false;
-    }
-
-    // If we got results, we can return now.
-    if (rc == SQLITE_ROW)
-    {
-      Telemetry::Accumulate(Telemetry::MOZ_STORAGE_ASYNC_REQUESTS_SUCCESS, true);
-      return true;
-    }
-
-    // Some errors are not fatal, and we can handle them and continue.
-    if (rc == SQLITE_BUSY) {
-      // Don't hold the lock while we call outside our module.
-      SQLiteMutexAutoUnlock unlockedScope(mDBMutex);
-
-      // Yield, and try again
-      (void)::PR_Sleep(PR_INTERVAL_NO_WAIT);
-      continue;
-    }
-
-    // Set an error state.
-    mState = ERROR;
-    Telemetry::Accumulate(Telemetry::MOZ_STORAGE_ASYNC_REQUESTS_SUCCESS, false);
-
-    // Construct the error message before giving up the mutex (which we cannot
-    // hold during the call to notifyError).
-    nsCOMPtr<mozIStorageError> errorObj(
-      new Error(rc, ::sqlite3_errmsg(mNativeConnection))
-    );
-    // We cannot hold the DB mutex while calling notifyError.
-    SQLiteMutexAutoUnlock unlockedScope(mDBMutex);
-    (void)notifyError(errorObj);
-
-    // Finally, indicate that we should stop processing.
-    return false;
-  }
-}
-
-nsresult
-AsyncExecuteStatements::buildAndNotifyResults(sqlite3_stmt *aStatement)
-{
-  NS_ASSERTION(mCallback, "Trying to dispatch results without a callback!");
-  mMutex.AssertNotCurrentThreadOwns();
-
-  // Build result object if we need it.
-  if (!mResultSet)
-    mResultSet = new ResultSet();
-  NS_ENSURE_TRUE(mResultSet, NS_ERROR_OUT_OF_MEMORY);
-
-  nsRefPtr<Row> row(new Row());
-  NS_ENSURE_TRUE(row, NS_ERROR_OUT_OF_MEMORY);
-
-  nsresult rv = row->initialize(aStatement);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = mResultSet->add(row);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // If we have hit our maximum number of allowed results, or if we have hit
-  // the maximum amount of time we want to wait for results, notify the
-  // calling thread about it.
-  TimeStamp now = TimeStamp::Now();
-  TimeDuration delta = now - mIntervalStart;
-  if (mResultSet->rows() >= MAX_ROWS_PER_RESULT || delta > mMaxWait) {
-    // Notify the caller
-    rv = notifyResults();
-    if (NS_FAILED(rv))
-      return NS_OK; // we'll try again with the next result
-
-    // Reset our start time
-    mIntervalStart = now;
-  }
-
-  return NS_OK;
-}
-
-nsresult
-AsyncExecuteStatements::notifyComplete()
-{
-  mMutex.AssertNotCurrentThreadOwns();
-  NS_ASSERTION(mState != PENDING,
-               "Still in a pending state when calling Complete!");
-
-  // Reset our statements before we try to commit or rollback.  If we are
-  // canceling and have statements that think they have pending work, the
-  // rollback will fail.
-  for (uint32_t i = 0; i < mStatements.Length(); i++)
-    mStatements[i].reset();
-
-  // Release references to the statement data as soon as possible. If this
-  // is the last reference, statements will be finalized immediately on the
-  // async thread, hence avoiding several bounces between threads and possible
-  // race conditions with AsyncClose().
-  mStatements.Clear();
-
-  // Handle our transaction, if we have one
-  if (mHasTransaction) {
-    if (mState == COMPLETED) {
-      nsresult rv = mConnection->commitTransactionInternal(mNativeConnection);
-      if (NS_FAILED(rv)) {
-        mState = ERROR;
-        (void)notifyError(mozIStorageError::ERROR,
-                          "Transaction failed to commit");
-      }
-    }
-    else {
-      DebugOnly<nsresult> rv =
-        mConnection->rollbackTransactionInternal(mNativeConnection);
-      NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "Transaction failed to rollback");
-    }
-    mHasTransaction = false;
-  }
-
-  // Always generate a completion notification; it is what guarantees that our
-  // destruction does not happen here on the async thread.
-  nsRefPtr<CompletionNotifier> completionEvent =
-    new CompletionNotifier(mCallback, mState);
-
-  // We no longer own mCallback (the CompletionNotifier takes ownership).
-  mCallback = nullptr;
-
-  (void)mCallingThread->Dispatch(completionEvent, NS_DISPATCH_NORMAL);
-
-  return NS_OK;
-}
-
-nsresult
-AsyncExecuteStatements::notifyError(int32_t aErrorCode,
-                                    const char *aMessage)
-{
-  mMutex.AssertNotCurrentThreadOwns();
-  mDBMutex.assertNotCurrentThreadOwns();
-
-  if (!mCallback)
-    return NS_OK;
-
-  nsCOMPtr<mozIStorageError> errorObj(new Error(aErrorCode, aMessage));
-  NS_ENSURE_TRUE(errorObj, NS_ERROR_OUT_OF_MEMORY);
-
-  return notifyError(errorObj);
-}
-
-nsresult
-AsyncExecuteStatements::notifyError(mozIStorageError *aError)
-{
-  mMutex.AssertNotCurrentThreadOwns();
-  mDBMutex.assertNotCurrentThreadOwns();
-
-  if (!mCallback)
-    return NS_OK;
-
-  nsRefPtr<ErrorNotifier> notifier =
-    new ErrorNotifier(mCallback, aError, this);
-  NS_ENSURE_TRUE(notifier, NS_ERROR_OUT_OF_MEMORY);
-
-  return mCallingThread->Dispatch(notifier, NS_DISPATCH_NORMAL);
-}
-
-nsresult
-AsyncExecuteStatements::notifyResults()
-{
-  mMutex.AssertNotCurrentThreadOwns();
-  NS_ASSERTION(mCallback, "notifyResults called without a callback!");
-
-  nsRefPtr<CallbackResultNotifier> notifier =
-    new CallbackResultNotifier(mCallback, mResultSet, this);
-  NS_ENSURE_TRUE(notifier, NS_ERROR_OUT_OF_MEMORY);
-
-  nsresult rv = mCallingThread->Dispatch(notifier, NS_DISPATCH_NORMAL);
-  if (NS_SUCCEEDED(rv))
-    mResultSet = nullptr; // we no longer own it on success
-  return rv;
-}
-
-NS_IMPL_ISUPPORTS(
-  AsyncExecuteStatements,
-  nsIRunnable,
-  mozIStoragePendingStatement
-)
-
-bool
-AsyncExecuteStatements::statementsNeedTransaction()
-{
-  // If there is more than one write statement, run in a transaction.
-  // Additionally, if we have only one statement but it needs a transaction, due
-  // to multiple BindingParams, we will wrap it in one.
-  for (uint32_t i = 0, transactionsCount = 0; i < mStatements.Length(); ++i) {
-    transactionsCount += mStatements[i].needsTransaction();
-    if (transactionsCount > 1) {
-      return true;
-    }
-  }
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//// mozIStoragePendingStatement
-
-NS_IMETHODIMP
-AsyncExecuteStatements::Cancel()
-{
-#ifdef DEBUG
-  bool onCallingThread = false;
-  (void)mCallingThread->IsOnCurrentThread(&onCallingThread);
-  NS_ASSERTION(onCallingThread, "Not canceling from the calling thread!");
-#endif
-
-  // If we have already canceled, we have an error, but always indicate that
-  // we are trying to cancel.
-  NS_ENSURE_FALSE(mCancelRequested, NS_ERROR_UNEXPECTED);
-
-  {
-    MutexAutoLock lockedScope(mMutex);
-
-    // We need to indicate that we want to try and cancel now.
-    mCancelRequested = true;
-  }
-
-  return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//// nsIRunnable
-
-NS_IMETHODIMP
-AsyncExecuteStatements::Run()
-{
-  MOZ_ASSERT(!mConnection->isClosed());
-
-  // Do not run if we have been canceled.
-  {
-    MutexAutoLock lockedScope(mMutex);
-    if (mCancelRequested)
-      mState = CANCELED;
-  }
-  if (mState == CANCELED)
-    return notifyComplete();
-
-  if (statementsNeedTransaction() && mConnection->getAutocommit()) {
-    if (NS_SUCCEEDED(mConnection->beginTransactionInternal(mNativeConnection,
-                                                           mozIStorageConnection::TRANSACTION_IMMEDIATE))) {
-      mHasTransaction = true;
-    }
-#ifdef DEBUG
-    else {
-      NS_WARNING("Unable to create a transaction for async execution.");
-    }
-#endif
-  }
-
-  // Execute each statement, giving the callback results if it returns any.
-  for (uint32_t i = 0; i < mStatements.Length(); i++) {
-    bool finished = (i == (mStatements.Length() - 1));
-
-    sqlite3_stmt *stmt;
-    { // lock the sqlite mutex so sqlite3_errmsg cannot change
-      SQLiteMutexAutoLock lockedScope(mDBMutex);
-
-      int rc = mStatements[i].getSqliteStatement(&stmt);
-      if (rc != SQLITE_OK) {
-        // Set our error state.
-        mState = ERROR;
-
-        // Build the error object; can't call notifyError with the lock held
-        nsCOMPtr<mozIStorageError> errorObj(
-          new Error(rc, ::sqlite3_errmsg(mNativeConnection))
-        );
-        {
-          // We cannot hold the DB mutex and call notifyError.
-          SQLiteMutexAutoUnlock unlockedScope(mDBMutex);
-          (void)notifyError(errorObj);
-        }
-        break;
-      }
-    }
-
-    // If we have parameters to bind, bind them, execute, and process.
-    if (mStatements[i].hasParametersToBeBound()) {
-      if (!bindExecuteAndProcessStatement(mStatements[i], finished))
-        break;
-    }
-    // Otherwise, just execute and process the statement.
-    else if (!executeAndProcessStatement(stmt, finished)) {
-      break;
-    }
-  }
-
-  // If we still have results that we haven't notified about, take care of
-  // them now.
-  if (mResultSet)
-    (void)notifyResults();
-
-  // Notify about completion
-  return notifyComplete();
-}
-
-} // namespace storage
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageAsyncStatementExecution.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageAsyncStatementExecution.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageAsyncStatementExecution.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageAsyncStatementExecution.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,242 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 mozStorageAsyncStatementExecution_h
-#define mozStorageAsyncStatementExecution_h
-
-#include "nscore.h"
-#include "nsTArray.h"
-#include "nsAutoPtr.h"
-#include "mozilla/Mutex.h"
-#include "mozilla/TimeStamp.h"
-#include "mozilla/Attributes.h"
-#include "nsIRunnable.h"
-
-#include "SQLiteMutex.h"
-#include "mozIStoragePendingStatement.h"
-#include "mozIStorageStatementCallback.h"
-#include "mozStorageHelper.h"
-
-struct sqlite3_stmt;
-
-namespace mozilla {
-namespace storage {
-
-class Connection;
-class ResultSet;
-class StatementData;
-
-class AsyncExecuteStatements final : public nsIRunnable
-                                   , public mozIStoragePendingStatement
-{
-public:
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_NSIRUNNABLE
-  NS_DECL_MOZISTORAGEPENDINGSTATEMENT
-
-  /**
-   * Describes the state of execution.
-   */
-  enum ExecutionState {
-    PENDING = -1,
-    COMPLETED = mozIStorageStatementCallback::REASON_FINISHED,
-    CANCELED = mozIStorageStatementCallback::REASON_CANCELED,
-    ERROR = mozIStorageStatementCallback::REASON_ERROR
-  };
-
-  typedef nsTArray<StatementData> StatementDataArray;
-
-  /**
-   * Executes a statement in the background, and passes results back to the
-   * caller.
-   *
-   * @param aStatements
-   *        The statements to execute and possibly bind in the background.
-   *        Ownership is transfered from the caller.
-   * @param aConnection
-   *        The connection that created the statements to execute.
-   * @param aNativeConnection
-   *        The native Sqlite connection that created the statements to execute.
-   * @param aCallback
-   *        The callback that is notified of results, completion, and errors.
-   * @param _stmt
-   *        The handle to control the execution of the statements.
-   */
-  static nsresult execute(StatementDataArray &aStatements,
-                          Connection *aConnection,
-                          sqlite3 *aNativeConnection,
-                          mozIStorageStatementCallback *aCallback,
-                          mozIStoragePendingStatement **_stmt);
-
-  /**
-   * Indicates when events on the calling thread should run or not.  Certain
-   * events posted back to the calling thread should call this see if they
-   * should run or not.
-   *
-   * @pre mMutex is not held
-   *
-   * @returns true if the event should notify still, false otherwise.
-   */
-  bool shouldNotify();
-
-private:
-  AsyncExecuteStatements(StatementDataArray &aStatements,
-                         Connection *aConnection,
-                         sqlite3 *aNativeConnection,
-                         mozIStorageStatementCallback *aCallback);
-  ~AsyncExecuteStatements();
-
-  /**
-   * Binds and then executes a given statement until completion, an error
-   * occurs, or we are canceled.  If aLastStatement is true, we should set
-   * mState accordingly.
-   *
-   * @pre mMutex is not held
-   *
-   * @param aData
-   *        The StatementData to bind, execute, and then process.
-   * @param aLastStatement
-   *        Indicates if this is the last statement or not.  If it is, we have
-   *        to set the proper state.
-   * @returns true if we should continue to process statements, false otherwise.
-   */
-  bool bindExecuteAndProcessStatement(StatementData &aData,
-                                      bool aLastStatement);
-
-  /**
-   * Executes a given statement until completion, an error occurs, or we are
-   * canceled.  If aLastStatement is true, we should set mState accordingly.
-   *
-   * @pre mMutex is not held
-   *
-   * @param aStatement
-   *        The statement to execute and then process.
-   * @param aLastStatement
-   *        Indicates if this is the last statement or not.  If it is, we have
-   *        to set the proper state.
-   * @returns true if we should continue to process statements, false otherwise.
-   */
-  bool executeAndProcessStatement(sqlite3_stmt *aStatement,
-                                  bool aLastStatement);
-
-  /**
-   * Executes a statement to completion, properly handling any error conditions.
-   *
-   * @pre mMutex is not held
-   *
-   * @param aStatement
-   *        The statement to execute to completion.
-   * @returns true if results were obtained, false otherwise.
-   */
-  bool executeStatement(sqlite3_stmt *aStatement);
-
-  /**
-   * Builds a result set up with a row from a given statement.  If we meet the
-   * right criteria, go ahead and notify about this results too.
-   *
-   * @pre mMutex is not held
-   *
-   * @param aStatement
-   *        The statement to get the row data from.
-   */
-  nsresult buildAndNotifyResults(sqlite3_stmt *aStatement);
-
-  /**
-   * Notifies callback about completion, and does any necessary cleanup.
-   *
-   * @pre mMutex is not held
-   */
-  nsresult notifyComplete();
-
-  /**
-   * Notifies callback about an error.
-   *
-   * @pre mMutex is not held
-   * @pre mDBMutex is not held
-   *
-   * @param aErrorCode
-   *        The error code defined in mozIStorageError for the error.
-   * @param aMessage
-   *        The error string, if any.
-   * @param aError
-   *        The error object to notify the caller with.
-   */
-  nsresult notifyError(int32_t aErrorCode, const char *aMessage);
-  nsresult notifyError(mozIStorageError *aError);
-
-  /**
-   * Notifies the callback about a result set.
-   *
-   * @pre mMutex is not held
-   */
-  nsresult notifyResults();
-
-  /**
-   * Tests whether the current statements should be wrapped in an explicit
-   * transaction.
-   *
-   * @return true if an explicit transaction is needed, false otherwise.
-   */
-  bool statementsNeedTransaction();
-
-  StatementDataArray mStatements;
-  nsRefPtr<Connection> mConnection;
-  sqlite3 *mNativeConnection;
-  bool mHasTransaction;
-  mozIStorageStatementCallback *mCallback;
-  nsCOMPtr<nsIThread> mCallingThread;
-  nsRefPtr<ResultSet> mResultSet;
-
-  /**
-   * The maximum amount of time we want to wait between results.  Defined by
-   * MAX_MILLISECONDS_BETWEEN_RESULTS and set at construction.
-   */
-  const TimeDuration mMaxWait;
-
-  /**
-   * The start time since our last set of results.
-   */
-  TimeStamp mIntervalStart;
-
-  /**
-   * Indicates our state of execution.
-   */
-  ExecutionState mState;
-
-  /**
-   * Indicates if we should try to cancel at a cancelation point.
-   */
-  bool mCancelRequested;
-
-  /**
-   * This is the mutex that protects our state from changing between threads.
-   * This includes the following variables:
-   *   - mCancelRequested is only set on the calling thread while the lock is
-   *     held.  It is always read from within the lock on the background thread,
-   *     but not on the calling thread (see shouldNotify for why).
-   */
-  Mutex &mMutex;
-
-  /**
-   * The wrapped SQLite recursive connection mutex.  We use it whenever we call
-   * sqlite3_step and care about having reliable error messages.  By taking it
-   * prior to the call and holding it until the point where we no longer care
-   * about the error message, the user gets reliable error messages.
-   */
-  SQLiteMutex &mDBMutex;
-  
-  /**
-   * The instant at which the request was started.
-   *
-   * Used by telemetry.
-   */
-  TimeStamp mRequestStartDate;
-};
-
-} // namespace storage
-} // namespace mozilla
-
-#endif // mozStorageAsyncStatementExecution_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageAsyncStatement.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageAsyncStatement.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageAsyncStatement.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageAsyncStatement.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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_storage_mozStorageAsyncStatement_h_
-#define mozilla_storage_mozStorageAsyncStatement_h_
-
-#include "nsAutoPtr.h"
-#include "nsString.h"
-
-#include "nsTArray.h"
-
-#include "mozStorageBindingParamsArray.h"
-#include "mozStorageStatementData.h"
-#include "mozIStorageAsyncStatement.h"
-#include "StorageBaseStatementInternal.h"
-#include "mozilla/Attributes.h"
-
-class nsIXPConnectJSObjectHolder;
-
-namespace mozilla {
-namespace storage {
-
-class AsyncStatementJSHelper;
-class Connection;
-
-class AsyncStatement final : public mozIStorageAsyncStatement
-                           , public StorageBaseStatementInternal
-{
-public:
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_MOZISTORAGEASYNCSTATEMENT
-  NS_DECL_MOZISTORAGEBASESTATEMENT
-  NS_DECL_MOZISTORAGEBINDINGPARAMS
-  NS_DECL_STORAGEBASESTATEMENTINTERNAL
-
-  AsyncStatement();
-
-  /**
-   * Initializes the object on aDBConnection by preparing the SQL statement
-   * given by aSQLStatement.
-   *
-   * @param aDBConnection
-   *        The Connection object this statement is associated with.
-   * @param aNativeConnection
-   *        The native Sqlite connection this statement is associated with.
-   * @param aSQLStatement
-   *        The SQL statement to prepare that this object will represent.
-   */
-  nsresult initialize(Connection *aDBConnection,
-                      sqlite3 *aNativeConnection,
-                      const nsACString &aSQLStatement);
-
-  /**
-   * Obtains and transfers ownership of the array of parameters that are bound
-   * to this statment.  This can be null.
-   */
-  inline already_AddRefed<BindingParamsArray> bindingParamsArray()
-  {
-    return mParamsArray.forget();
-  }
-
-
-private:
-  ~AsyncStatement();
-
-  /**
-   * @return a pointer to the BindingParams object to use with our Bind*
-   *         method.
-   */
-  mozIStorageBindingParams *getParams();
-
-  /**
-   * The SQL string as passed by the user.  We store it because we create the
-   * async statement on-demand on the async thread.
-   */
-  nsCString mSQLString;
-
-  /**
-   * Holds the array of parameters to bind to this statement when we execute
-   * it asynchronously.
-   */
-  nsRefPtr<BindingParamsArray> mParamsArray;
-
-  /**
-   * Caches the JS 'params' helper for this statement.
-   */
-  nsMainThreadPtrHandle<nsIXPConnectJSObjectHolder> mStatementParamsHolder;
-
-  /**
-   * Have we been explicitly finalized by the user?
-   */
-  bool mFinalized;
-
-  /**
-   * Required for access to private mStatementParamsHolder field by
-   * AsyncStatementJSHelper::getParams.
-   */
-  friend class AsyncStatementJSHelper;
-};
-
-} // storage
-} // mozilla
-
-#endif // mozilla_storage_mozStorageAsyncStatement_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageAsyncStatementJSHelper.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageAsyncStatementJSHelper.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageAsyncStatementJSHelper.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageAsyncStatementJSHelper.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,151 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 "nsIXPConnect.h"
-#include "mozStorageAsyncStatement.h"
-#include "mozStorageService.h"
-
-#include "nsMemory.h"
-#include "nsString.h"
-#include "nsServiceManagerUtils.h"
-
-#include "mozStorageAsyncStatementJSHelper.h"
-
-#include "mozStorageAsyncStatementParams.h"
-
-#include "jsapi.h"
-
-namespace mozilla {
-namespace storage {
-
-////////////////////////////////////////////////////////////////////////////////
-//// AsyncStatementJSHelper
-
-nsresult
-AsyncStatementJSHelper::getParams(AsyncStatement *aStatement,
-                                  JSContext *aCtx,
-                                  JSObject *aScopeObj,
-                                  jsval *_params)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  nsresult rv;
-
-#ifdef DEBUG
-  int32_t state;
-  (void)aStatement->GetState(&state);
-  NS_ASSERTION(state == mozIStorageAsyncStatement::MOZ_STORAGE_STATEMENT_READY,
-               "Invalid state to get the params object - all calls will fail!");
-#endif
-
-  if (!aStatement->mStatementParamsHolder) {
-    nsCOMPtr<mozIStorageStatementParams> params =
-      new AsyncStatementParams(aStatement);
-    NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);
-
-    JS::RootedObject scope(aCtx, aScopeObj);
-    nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
-    nsCOMPtr<nsIXPConnect> xpc(Service::getXPConnect());
-    rv = xpc->WrapNative(
-      aCtx,
-      ::JS_GetGlobalForObject(aCtx, scope),
-      params,
-      NS_GET_IID(mozIStorageStatementParams),
-      getter_AddRefs(holder)
-    );
-    NS_ENSURE_SUCCESS(rv, rv);
-    nsRefPtr<AsyncStatementParamsHolder> paramsHolder =
-      new AsyncStatementParamsHolder(holder);
-    aStatement->mStatementParamsHolder =
-      new nsMainThreadPtrHolder<nsIXPConnectJSObjectHolder>(paramsHolder);
-  }
-
-  JS::Rooted<JSObject*> obj(aCtx);
-  obj = aStatement->mStatementParamsHolder->GetJSObject();
-  NS_ENSURE_STATE(obj);
-
-  *_params = OBJECT_TO_JSVAL(obj);
-  return NS_OK;
-}
-
-NS_IMETHODIMP_(MozExternalRefCountType) AsyncStatementJSHelper::AddRef() { return 2; }
-NS_IMETHODIMP_(MozExternalRefCountType) AsyncStatementJSHelper::Release() { return 1; }
-NS_INTERFACE_MAP_BEGIN(AsyncStatementJSHelper)
-  NS_INTERFACE_MAP_ENTRY(nsIXPCScriptable)
-  NS_INTERFACE_MAP_ENTRY(nsISupports)
-NS_INTERFACE_MAP_END
-
-////////////////////////////////////////////////////////////////////////////////
-//// nsIXPCScriptable
-
-#define XPC_MAP_CLASSNAME AsyncStatementJSHelper
-#define XPC_MAP_QUOTED_CLASSNAME "AsyncStatementJSHelper"
-#define XPC_MAP_WANT_GETPROPERTY
-#define XPC_MAP_FLAGS nsIXPCScriptable::ALLOW_PROP_MODS_DURING_RESOLVE
-#include "xpc_map_end.h"
-
-NS_IMETHODIMP
-AsyncStatementJSHelper::GetProperty(nsIXPConnectWrappedNative *aWrapper,
-                                    JSContext *aCtx,
-                                    JSObject *aScopeObj,
-                                    jsid aId,
-                                    jsval *_result,
-                                    bool *_retval)
-{
-  if (!JSID_IS_STRING(aId))
-    return NS_OK;
-
-  // Cast to async via mozI* since direct from nsISupports is ambiguous.
-  JS::RootedObject scope(aCtx, aScopeObj);
-  JS::RootedId id(aCtx, aId);
-  mozIStorageAsyncStatement *iAsyncStmt =
-    static_cast<mozIStorageAsyncStatement *>(aWrapper->Native());
-  AsyncStatement *stmt = static_cast<AsyncStatement *>(iAsyncStmt);
-
-#ifdef DEBUG
-  {
-    nsISupports *supp = aWrapper->Native();
-    nsCOMPtr<mozIStorageAsyncStatement> isStatement(do_QueryInterface(supp));
-    NS_ASSERTION(isStatement, "How is this not an async statement?!");
-  }
-#endif
-
-  if (::JS_FlatStringEqualsAscii(JSID_TO_FLAT_STRING(id), "params"))
-    return getParams(stmt, aCtx, scope, _result);
-
-  return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//// AsyncStatementParamsHolder
-
-NS_IMPL_ISUPPORTS(AsyncStatementParamsHolder, nsIXPConnectJSObjectHolder);
-
-JSObject*
-AsyncStatementParamsHolder::GetJSObject()
-{
-  return mHolder->GetJSObject();
-}
-
-AsyncStatementParamsHolder::AsyncStatementParamsHolder(nsIXPConnectJSObjectHolder* aHolder)
-  : mHolder(aHolder)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(mHolder);
-}
-
-AsyncStatementParamsHolder::~AsyncStatementParamsHolder()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  // We are considered dead at this point, so any wrappers for row or params
-  // need to lose their reference to the statement.
-  nsCOMPtr<nsIXPConnectWrappedNative> wrapper = do_QueryInterface(mHolder);
-  nsCOMPtr<mozIStorageStatementParams> iObj = do_QueryWrappedNative(wrapper);
-  AsyncStatementParams *obj = static_cast<AsyncStatementParams *>(iObj.get());
-  obj->mStatement = nullptr;
-}
-
-} // namespace storage
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageAsyncStatementJSHelper.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageAsyncStatementJSHelper.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageAsyncStatementJSHelper.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageAsyncStatementJSHelper.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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_storage_mozStorageAsyncStatementJSHelper_h_
-#define mozilla_storage_mozStorageAsyncStatementJSHelper_h_
-
-#include "nsIXPCScriptable.h"
-#include "nsIXPConnect.h"
-
-class AsyncStatement;
-
-namespace mozilla {
-namespace storage {
-
-/**
- * A modified version of StatementJSHelper that only exposes the async-specific
- * 'params' helper.  We do not expose 'row' or 'step' as they do not apply to
- * us.
- */
-class AsyncStatementJSHelper : public nsIXPCScriptable
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIXPCSCRIPTABLE
-
-private:
-  nsresult getParams(AsyncStatement *, JSContext *, JSObject *, JS::Value *);
-};
-
-/**
- * Wrapper used to clean up the references JS helpers hold to the statement.
- * For cycle-avoidance reasons they do not hold reference-counted references,
- * so it is important we do this.
- */
-class AsyncStatementParamsHolder final : public nsIXPConnectJSObjectHolder
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIXPCONNECTJSOBJECTHOLDER
-
-  explicit AsyncStatementParamsHolder(nsIXPConnectJSObjectHolder* aHolder);
-
-private:
-  virtual ~AsyncStatementParamsHolder();
-  nsCOMPtr<nsIXPConnectJSObjectHolder> mHolder;
-};
-
-} // namespace storage
-} // namespace mozilla
-
-#endif // mozilla_storage_mozStorageAsyncStatementJSHelper_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageAsyncStatementParams.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageAsyncStatementParams.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageAsyncStatementParams.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageAsyncStatementParams.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,127 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 "nsMemory.h"
-#include "nsString.h"
-#include "nsCOMPtr.h"
-#include "nsJSUtils.h"
-
-#include "jsapi.h"
-
-#include "mozStoragePrivateHelpers.h"
-#include "mozStorageAsyncStatement.h"
-#include "mozStorageAsyncStatementParams.h"
-#include "mozIStorageStatement.h"
-
-namespace mozilla {
-namespace storage {
-
-////////////////////////////////////////////////////////////////////////////////
-//// AsyncStatementParams
-
-AsyncStatementParams::AsyncStatementParams(AsyncStatement *aStatement)
-: mStatement(aStatement)
-{
-  NS_ASSERTION(mStatement != nullptr, "mStatement is null");
-}
-
-NS_IMPL_ISUPPORTS(
-  AsyncStatementParams
-, mozIStorageStatementParams
-, nsIXPCScriptable
-)
-
-////////////////////////////////////////////////////////////////////////////////
-//// nsIXPCScriptable
-
-#define XPC_MAP_CLASSNAME AsyncStatementParams
-#define XPC_MAP_QUOTED_CLASSNAME "AsyncStatementParams"
-#define XPC_MAP_WANT_SETPROPERTY
-#define XPC_MAP_WANT_RESOLVE
-#define XPC_MAP_FLAGS nsIXPCScriptable::ALLOW_PROP_MODS_DURING_RESOLVE
-#include "xpc_map_end.h"
-
-NS_IMETHODIMP
-AsyncStatementParams::SetProperty(
-  nsIXPConnectWrappedNative *aWrapper,
-  JSContext *aCtx,
-  JSObject *aScopeObj,
-  jsid aId,
-  JS::Value *_vp,
-  bool *_retval
-)
-{
-  NS_ENSURE_TRUE(mStatement, NS_ERROR_NOT_INITIALIZED);
-
-  if (JSID_IS_INT(aId)) {
-    int idx = JSID_TO_INT(aId);
-
-    nsCOMPtr<nsIVariant> variant(convertJSValToVariant(aCtx, *_vp));
-    NS_ENSURE_TRUE(variant, NS_ERROR_UNEXPECTED);
-    nsresult rv = mStatement->BindByIndex(idx, variant);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-  else if (JSID_IS_STRING(aId)) {
-    JSString *str = JSID_TO_STRING(aId);
-    nsAutoJSString autoStr;
-    if (!autoStr.init(aCtx, str)) {
-      return NS_ERROR_FAILURE;
-    }
-
-    NS_ConvertUTF16toUTF8 name(autoStr);
-
-    nsCOMPtr<nsIVariant> variant(convertJSValToVariant(aCtx, *_vp));
-    NS_ENSURE_TRUE(variant, NS_ERROR_UNEXPECTED);
-    nsresult rv = mStatement->BindByName(name, variant);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-  else {
-    return NS_ERROR_INVALID_ARG;
-  }
-
-  *_retval = true;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-AsyncStatementParams::Resolve(nsIXPConnectWrappedNative *aWrapper,
-                              JSContext *aCtx,
-                              JSObject *aScopeObj,
-                              jsid aId,
-                              bool *aResolvedp,
-                              bool *_retval)
-{
-  JS::Rooted<JSObject*> scopeObj(aCtx, aScopeObj);
-
-  NS_ENSURE_TRUE(mStatement, NS_ERROR_NOT_INITIALIZED);
-  // We do not throw at any point after this because we want to allow the
-  // prototype chain to be checked for the property.
-
-  bool resolved = false;
-  bool ok = true;
-  if (JSID_IS_INT(aId)) {
-    uint32_t idx = JSID_TO_INT(aId);
-    // All indexes are good because we don't know how many parameters there
-    // really are.
-    ok = ::JS_DefineElement(aCtx, scopeObj, idx, JS::UndefinedHandleValue, 0);
-    resolved = true;
-  }
-  else if (JSID_IS_STRING(aId)) {
-    // We are unable to tell if there's a parameter with this name and so
-    // we must assume that there is.  This screws the rest of the prototype
-    // chain, but people really shouldn't be depending on this anyways.
-    JS::Rooted<jsid> id(aCtx, aId);
-    ok = ::JS_DefinePropertyById(aCtx, scopeObj, id, JS::UndefinedHandleValue, 0);
-    resolved = true;
-  }
-
-  *_retval = ok;
-  *aResolvedp = resolved && ok;
-  return NS_OK;
-}
-
-} // namespace storage
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageAsyncStatementParams.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageAsyncStatementParams.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageAsyncStatementParams.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageAsyncStatementParams.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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_storage_mozStorageAsyncStatementParams_h_
-#define mozilla_storage_mozStorageAsyncStatementParams_h_
-
-#include "mozIStorageStatementParams.h"
-#include "nsIXPCScriptable.h"
-#include "mozilla/Attributes.h"
-
-namespace mozilla {
-namespace storage {
-
-class AsyncStatement;
-
-/*
- * Since mozIStorageStatementParams is just a tagging interface we do not have
- * an async variant.
- */
-class AsyncStatementParams final : public mozIStorageStatementParams
-                                 , public nsIXPCScriptable
-{
-public:
-  explicit AsyncStatementParams(AsyncStatement *aStatement);
-
-  // interfaces
-  NS_DECL_ISUPPORTS
-  NS_DECL_MOZISTORAGESTATEMENTPARAMS
-  NS_DECL_NSIXPCSCRIPTABLE
-
-protected:
-  virtual ~AsyncStatementParams() {}
-
-  AsyncStatement *mStatement;
-
-  friend class AsyncStatementParamsHolder;
-};
-
-} // namespace storage
-} // namespace mozilla
-
-#endif // mozilla_storage_mozStorageAsyncStatementParams_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageBindingParamsArray.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageBindingParamsArray.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageBindingParamsArray.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageBindingParamsArray.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 "mozStorageBindingParamsArray.h"
-#include "mozStorageBindingParams.h"
-#include "StorageBaseStatementInternal.h"
-
-namespace mozilla {
-namespace storage {
-
-////////////////////////////////////////////////////////////////////////////////
-//// BindingParamsArray
-
-BindingParamsArray::BindingParamsArray(
-  StorageBaseStatementInternal *aOwningStatement
-)
-: mOwningStatement(aOwningStatement)
-, mLocked(false)
-{
-}
-
-void
-BindingParamsArray::lock()
-{
-  NS_ASSERTION(mLocked == false, "Array has already been locked!");
-  mLocked = true;
-
-  // We also no longer need to hold a reference to our statement since it owns
-  // us.
-  mOwningStatement = nullptr;
-}
-
-const StorageBaseStatementInternal *
-BindingParamsArray::getOwner() const
-{
-  return mOwningStatement;
-}
-
-NS_IMPL_ISUPPORTS(
-  BindingParamsArray,
-  mozIStorageBindingParamsArray
-)
-
-///////////////////////////////////////////////////////////////////////////////
-//// mozIStorageBindingParamsArray
-
-NS_IMETHODIMP
-BindingParamsArray::NewBindingParams(mozIStorageBindingParams **_params)
-{
-  NS_ENSURE_FALSE(mLocked, NS_ERROR_UNEXPECTED);
-
-  nsCOMPtr<mozIStorageBindingParams> params(
-    mOwningStatement->newBindingParams(this));
-  NS_ENSURE_TRUE(params, NS_ERROR_UNEXPECTED);
-
-  params.forget(_params);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-BindingParamsArray::AddParams(mozIStorageBindingParams *aParameters)
-{
-  NS_ENSURE_FALSE(mLocked, NS_ERROR_UNEXPECTED);
-
-  BindingParams *params = static_cast<BindingParams *>(aParameters);
-
-  // Check to make sure that this set of parameters was created with us.
-  if (params->getOwner() != this)
-    return NS_ERROR_UNEXPECTED;
-
-  NS_ENSURE_TRUE(mArray.AppendElement(params), NS_ERROR_OUT_OF_MEMORY);
-
-  // Lock the parameters only after we've successfully added them.
-  params->lock();
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-BindingParamsArray::GetLength(uint32_t *_length)
-{
-  *_length = length();
-  return NS_OK;
-}
-
-} // namespace storage
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageBindingParamsArray.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageBindingParamsArray.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageBindingParamsArray.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageBindingParamsArray.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 mozStorageBindingParamsArray_h
-#define mozStorageBindingParamsArray_h
-
-#include "nsAutoPtr.h"
-#include "nsTArray.h"
-#include "mozilla/Attributes.h"
-
-#include "mozIStorageBindingParamsArray.h"
-
-namespace mozilla {
-namespace storage {
-
-class StorageBaseStatementInternal;
-
-class BindingParamsArray final : public mozIStorageBindingParamsArray
-{
-  typedef nsTArray< nsCOMPtr<mozIStorageBindingParams> > array_type;
-
-  ~BindingParamsArray() {}
-
-public:
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_MOZISTORAGEBINDINGPARAMSARRAY
-
-  explicit BindingParamsArray(StorageBaseStatementInternal *aOwningStatement);
-
-  typedef array_type::size_type size_type;
-
-  /**
-   * Locks the array and prevents further modification to it (such as adding
-   * more elements to it).
-   */
-  void lock();
-
-  /**
-   * @return the pointer to the owning BindingParamsArray.
-   */
-  const StorageBaseStatementInternal *getOwner() const;
-
-  /**
-   * @return the number of elemets the array contains.
-   */
-  const size_type length() const { return mArray.Length(); }
-
-  class iterator {
-  public:
-    iterator(BindingParamsArray *aArray,
-             uint32_t aIndex)
-    : mArray(aArray)
-    , mIndex(aIndex)
-    {
-    }
-
-    iterator &operator++(int)
-    {
-      mIndex++;
-      return *this;
-    }
-
-    bool operator==(const iterator &aOther) const
-    {
-      return mIndex == aOther.mIndex;
-    }
-    bool operator!=(const iterator &aOther) const
-    {
-      return !(*this == aOther);
-    }
-    mozIStorageBindingParams *operator*()
-    {
-      NS_ASSERTION(mIndex < mArray->length(),
-                   "Dereferenceing an invalid value!");
-      return mArray->mArray[mIndex].get();
-    }
-  private:
-    void operator--() { }
-    BindingParamsArray *mArray;
-    uint32_t mIndex;
-  };
-
-  /**
-   * Obtains an iterator pointing to the beginning of the array.
-   */
-  inline iterator begin()
-  {
-    NS_ASSERTION(length() != 0,
-                 "Obtaining an iterator to the beginning with no elements!");
-    return iterator(this, 0);
-  }
-
-  /**
-   * Obtains an iterator pointing to the end of the array.
-   */
-  inline iterator end()
-  {
-    NS_ASSERTION(mLocked,
-                 "Obtaining an iterator to the end when we are not locked!");
-    return iterator(this, length());
-  }
-private:
-  nsCOMPtr<StorageBaseStatementInternal> mOwningStatement;
-  array_type mArray;
-  bool mLocked;
-
-  friend class iterator;
-};
-
-} // namespace storage
-} // namespace mozilla
-
-#endif // mozStorageBindingParamsArray_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageBindingParams.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageBindingParams.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageBindingParams.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageBindingParams.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,539 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 <limits.h>
-
-#include "nsString.h"
-
-#include "mozStorageError.h"
-#include "mozStoragePrivateHelpers.h"
-#include "mozStorageBindingParams.h"
-#include "mozStorageBindingParamsArray.h"
-#include "Variant.h"
-
-namespace mozilla {
-namespace storage {
-
-////////////////////////////////////////////////////////////////////////////////
-//// Local Helper Objects
-
-namespace {
-
-struct BindingColumnData
-{
-  BindingColumnData(sqlite3_stmt *aStmt,
-                    int aColumn)
-  : stmt(aStmt)
-  , column(aColumn)
-  {
-  }
-  sqlite3_stmt *stmt;
-  int column;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-//// Variant Specialization Functions (variantToSQLiteT)
-
-int
-sqlite3_T_int(BindingColumnData aData,
-              int aValue)
-{
-  return ::sqlite3_bind_int(aData.stmt, aData.column + 1, aValue);
-}
-
-int
-sqlite3_T_int64(BindingColumnData aData,
-                sqlite3_int64 aValue)
-{
-  return ::sqlite3_bind_int64(aData.stmt, aData.column + 1, aValue);
-}
-
-int
-sqlite3_T_double(BindingColumnData aData,
-                 double aValue)
-{
-  return ::sqlite3_bind_double(aData.stmt, aData.column + 1, aValue);
-}
-
-int
-sqlite3_T_text(BindingColumnData aData,
-               const nsCString& aValue)
-{
-  return ::sqlite3_bind_text(aData.stmt,
-                             aData.column + 1,
-                             aValue.get(),
-                             aValue.Length(),
-                             SQLITE_TRANSIENT);
-}
-
-int
-sqlite3_T_text16(BindingColumnData aData,
-                 const nsString& aValue)
-{
-  return ::sqlite3_bind_text16(aData.stmt,
-                               aData.column + 1,
-                               aValue.get(),
-                               aValue.Length() * 2, // Length in bytes!
-                               SQLITE_TRANSIENT);
-}
-
-int
-sqlite3_T_null(BindingColumnData aData)
-{
-  return ::sqlite3_bind_null(aData.stmt, aData.column + 1);
-}
-
-int
-sqlite3_T_blob(BindingColumnData aData,
-               const void *aBlob,
-               int aSize)
-{
-  return ::sqlite3_bind_blob(aData.stmt, aData.column + 1, aBlob, aSize,
-                             free);
-
-}
-
-#include "variantToSQLiteT_impl.h"
-
-} // anonymous namespace
-
-////////////////////////////////////////////////////////////////////////////////
-//// BindingParams
-
-BindingParams::BindingParams(mozIStorageBindingParamsArray *aOwningArray,
-                             Statement *aOwningStatement)
-: mLocked(false)
-, mOwningArray(aOwningArray)
-, mOwningStatement(aOwningStatement)
-{
-  (void)mOwningStatement->GetParameterCount(&mParamCount);
-  (void)mParameters.SetCapacity(mParamCount);
-}
-
-BindingParams::BindingParams(mozIStorageBindingParamsArray *aOwningArray)
-: mLocked(false)
-, mOwningArray(aOwningArray)
-, mOwningStatement(nullptr)
-, mParamCount(0)
-{
-}
-
-AsyncBindingParams::AsyncBindingParams(
-  mozIStorageBindingParamsArray *aOwningArray
-)
-: BindingParams(aOwningArray)
-{
-}
-
-void
-BindingParams::lock()
-{
-  NS_ASSERTION(mLocked == false, "Parameters have already been locked!");
-  mLocked = true;
-
-  // We no longer need to hold a reference to our statement or our owning array.
-  // The array owns us at this point, and it will own a reference to the
-  // statement.
-  mOwningStatement = nullptr;
-  mOwningArray = nullptr;
-}
-
-void
-BindingParams::unlock(Statement *aOwningStatement)
-{
-  NS_ASSERTION(mLocked == true, "Parameters were not yet locked!");
-  mLocked = false;
-  mOwningStatement = aOwningStatement;
-}
-
-const mozIStorageBindingParamsArray *
-BindingParams::getOwner() const
-{
-  return mOwningArray;
-}
-
-PLDHashOperator
-AsyncBindingParams::iterateOverNamedParameters(const nsACString &aName,
-                                               nsIVariant *aValue,
-                                               void *voidClosureThunk)
-{
-  NamedParameterIterationClosureThunk *closureThunk =
-    static_cast<NamedParameterIterationClosureThunk *>(voidClosureThunk);
-
-  // We do not accept any forms of names other than ":name", but we need to add
-  // the colon for SQLite.
-  nsAutoCString name(":");
-  name.Append(aName);
-  int oneIdx = ::sqlite3_bind_parameter_index(closureThunk->statement,
-                                              name.get());
-
-  if (oneIdx == 0) {
-    nsAutoCString errMsg(aName);
-    errMsg.AppendLiteral(" is not a valid named parameter.");
-    closureThunk->err = new Error(SQLITE_RANGE, errMsg.get());
-    return PL_DHASH_STOP;
-  }
-
-  // XPCVariant's AddRef and Release are not thread-safe and so we must not do
-  // anything that would invoke them here on the async thread.  As such we can't
-  // cram aValue into self->mParameters using ReplaceObjectAt so that we can
-  // freeload off of the BindingParams::Bind implementation.
-  int rc = variantToSQLiteT(BindingColumnData(closureThunk->statement,
-                                              oneIdx - 1),
-                            aValue);
-  if (rc != SQLITE_OK) {
-    // We had an error while trying to bind.  Now we need to create an error
-    // object with the right message.  Note that we special case
-    // SQLITE_MISMATCH, but otherwise get the message from SQLite.
-    const char *msg = "Could not covert nsIVariant to SQLite type.";
-    if (rc != SQLITE_MISMATCH)
-      msg = ::sqlite3_errmsg(::sqlite3_db_handle(closureThunk->statement));
-
-    closureThunk->err = new Error(rc, msg);
-    return PL_DHASH_STOP;
-  }
-  return PL_DHASH_NEXT;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//// nsISupports
-
-NS_IMPL_ISUPPORTS(
-  BindingParams
-, mozIStorageBindingParams
-, IStorageBindingParamsInternal
-)
-
-
-////////////////////////////////////////////////////////////////////////////////
-//// IStorageBindingParamsInternal
-
-already_AddRefed<mozIStorageError>
-BindingParams::bind(sqlite3_stmt *aStatement)
-{
-  // Iterate through all of our stored data, and bind it.
-  for (size_t i = 0; i < mParameters.Length(); i++) {
-    int rc = variantToSQLiteT(BindingColumnData(aStatement, i), mParameters[i]);
-    if (rc != SQLITE_OK) {
-      // We had an error while trying to bind.  Now we need to create an error
-      // object with the right message.  Note that we special case
-      // SQLITE_MISMATCH, but otherwise get the message from SQLite.
-      const char *msg = "Could not covert nsIVariant to SQLite type.";
-      if (rc != SQLITE_MISMATCH)
-        msg = ::sqlite3_errmsg(::sqlite3_db_handle(aStatement));
-
-      nsCOMPtr<mozIStorageError> err(new Error(rc, msg));
-      return err.forget();
-    }
-  }
-
-  return nullptr;
-}
-
-already_AddRefed<mozIStorageError>
-AsyncBindingParams::bind(sqlite3_stmt * aStatement)
-{
-  // We should bind by index using the super-class if there is nothing in our
-  // hashtable.
-  if (!mNamedParameters.Count())
-    return BindingParams::bind(aStatement);
-
-  // Enumerate over everyone in the map, propagating them into mParameters if
-  // we can and creating an error immediately when we cannot.
-  NamedParameterIterationClosureThunk closureThunk = {this, aStatement, nullptr};
-  (void)mNamedParameters.EnumerateRead(iterateOverNamedParameters,
-                                       (void *)&closureThunk);
-
-  return closureThunk.err.forget();
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-//// mozIStorageBindingParams
-
-NS_IMETHODIMP
-BindingParams::BindByName(const nsACString &aName,
-                          nsIVariant *aValue)
-{
-  NS_ENSURE_FALSE(mLocked, NS_ERROR_UNEXPECTED);
-
-  // Get the column index that we need to store this at.
-  uint32_t index;
-  nsresult rv = mOwningStatement->GetParameterIndex(aName, &index);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return BindByIndex(index, aValue);
-}
-
-NS_IMETHODIMP
-AsyncBindingParams::BindByName(const nsACString &aName,
-                               nsIVariant *aValue)
-{
-  NS_ENSURE_FALSE(mLocked, NS_ERROR_UNEXPECTED);
-
-  nsRefPtr<Variant_base> variant = convertVariantToStorageVariant(aValue);
-  if (!variant)
-    return NS_ERROR_UNEXPECTED;
-
-  mNamedParameters.Put(aName, variant);
-  return NS_OK;
-}
-
-
-NS_IMETHODIMP
-BindingParams::BindUTF8StringByName(const nsACString &aName,
-                                    const nsACString &aValue)
-{
-  nsCOMPtr<nsIVariant> value(new UTF8TextVariant(aValue));
-  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
-
-  return BindByName(aName, value);
-}
-
-NS_IMETHODIMP
-BindingParams::BindStringByName(const nsACString &aName,
-                                const nsAString &aValue)
-{
-  nsCOMPtr<nsIVariant> value(new TextVariant(aValue));
-  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
-
-  return BindByName(aName, value);
-}
-
-NS_IMETHODIMP
-BindingParams::BindDoubleByName(const nsACString &aName,
-                                double aValue)
-{
-  nsCOMPtr<nsIVariant> value(new FloatVariant(aValue));
-  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
-
-  return BindByName(aName, value);
-}
-
-NS_IMETHODIMP
-BindingParams::BindInt32ByName(const nsACString &aName,
-                               int32_t aValue)
-{
-  nsCOMPtr<nsIVariant> value(new IntegerVariant(aValue));
-  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
-
-  return BindByName(aName, value);
-}
-
-NS_IMETHODIMP
-BindingParams::BindInt64ByName(const nsACString &aName,
-                               int64_t aValue)
-{
-  nsCOMPtr<nsIVariant> value(new IntegerVariant(aValue));
-  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
-
-  return BindByName(aName, value);
-}
-
-NS_IMETHODIMP
-BindingParams::BindNullByName(const nsACString &aName)
-{
-  nsCOMPtr<nsIVariant> value(new NullVariant());
-  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
-
-  return BindByName(aName, value);
-}
-
-NS_IMETHODIMP
-BindingParams::BindBlobByName(const nsACString &aName,
-                              const uint8_t *aValue,
-                              uint32_t aValueSize)
-{
-  NS_ENSURE_ARG_MAX(aValueSize, INT_MAX);
-  std::pair<const void *, int> data(
-    static_cast<const void *>(aValue),
-    int(aValueSize)
-  );
-  nsCOMPtr<nsIVariant> value(new BlobVariant(data));
-  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
-
-  return BindByName(aName, value);
-}
-
-NS_IMETHODIMP
-BindingParams::BindStringAsBlobByName(const nsACString& aName,
-                                      const nsAString& aValue)
-{
-  return DoBindStringAsBlobByName(this, aName, aValue);
-}
-
-NS_IMETHODIMP
-BindingParams::BindUTF8StringAsBlobByName(const nsACString& aName,
-                                          const nsACString& aValue)
-{
-  return DoBindStringAsBlobByName(this, aName, aValue);
-}
-
-
-NS_IMETHODIMP
-BindingParams::BindAdoptedBlobByName(const nsACString &aName,
-                                     uint8_t *aValue,
-                                     uint32_t aValueSize)
-{
-  NS_ENSURE_ARG_MAX(aValueSize, INT_MAX);
-  std::pair<uint8_t *, int> data(
-    aValue,
-    int(aValueSize)
-  );
-  nsCOMPtr<nsIVariant> value(new AdoptedBlobVariant(data));
-
-  return BindByName(aName, value);
-}
-
-NS_IMETHODIMP
-BindingParams::BindByIndex(uint32_t aIndex,
-                           nsIVariant *aValue)
-{
-  NS_ENSURE_FALSE(mLocked, NS_ERROR_UNEXPECTED);
-  ENSURE_INDEX_VALUE(aIndex, mParamCount);
-
-  // Store the variant for later use.
-  nsRefPtr<Variant_base> variant = convertVariantToStorageVariant(aValue);
-  if (!variant)
-    return NS_ERROR_UNEXPECTED;
-  if (mParameters.Length() <= aIndex) {
-    (void)mParameters.SetLength(aIndex);
-    (void)mParameters.AppendElement(variant);
-  }
-  else {
-    NS_ENSURE_TRUE(mParameters.ReplaceElementAt(aIndex, variant),
-                   NS_ERROR_OUT_OF_MEMORY);
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-AsyncBindingParams::BindByIndex(uint32_t aIndex,
-                                nsIVariant *aValue)
-{
-  NS_ENSURE_FALSE(mLocked, NS_ERROR_UNEXPECTED);
-  // In the asynchronous case we do not know how many parameters there are to
-  // bind to, so we cannot check the validity of aIndex.
-
-  nsRefPtr<Variant_base> variant = convertVariantToStorageVariant(aValue);
-  if (!variant)
-    return NS_ERROR_UNEXPECTED;
-  if (mParameters.Length() <= aIndex) {
-    mParameters.SetLength(aIndex);
-    mParameters.AppendElement(variant);
-  }
-  else {
-    NS_ENSURE_TRUE(mParameters.ReplaceElementAt(aIndex, variant),
-                   NS_ERROR_OUT_OF_MEMORY);
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-BindingParams::BindUTF8StringByIndex(uint32_t aIndex,
-                                     const nsACString &aValue)
-{
-  nsCOMPtr<nsIVariant> value(new UTF8TextVariant(aValue));
-  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
-
-  return BindByIndex(aIndex, value);
-}
-
-NS_IMETHODIMP
-BindingParams::BindStringByIndex(uint32_t aIndex,
-                                 const nsAString &aValue)
-{
-  nsCOMPtr<nsIVariant> value(new TextVariant(aValue));
-  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
-
-  return BindByIndex(aIndex, value);
-}
-
-NS_IMETHODIMP
-BindingParams::BindDoubleByIndex(uint32_t aIndex,
-                                 double aValue)
-{
-  nsCOMPtr<nsIVariant> value(new FloatVariant(aValue));
-  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
-
-  return BindByIndex(aIndex, value);
-}
-
-NS_IMETHODIMP
-BindingParams::BindInt32ByIndex(uint32_t aIndex,
-                                int32_t aValue)
-{
-  nsCOMPtr<nsIVariant> value(new IntegerVariant(aValue));
-  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
-
-  return BindByIndex(aIndex, value);
-}
-
-NS_IMETHODIMP
-BindingParams::BindInt64ByIndex(uint32_t aIndex,
-                                int64_t aValue)
-{
-  nsCOMPtr<nsIVariant> value(new IntegerVariant(aValue));
-  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
-
-  return BindByIndex(aIndex, value);
-}
-
-NS_IMETHODIMP
-BindingParams::BindNullByIndex(uint32_t aIndex)
-{
-  nsCOMPtr<nsIVariant> value(new NullVariant());
-  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
-
-  return BindByIndex(aIndex, value);
-}
-
-NS_IMETHODIMP
-BindingParams::BindBlobByIndex(uint32_t aIndex,
-                               const uint8_t *aValue,
-                               uint32_t aValueSize)
-{
-  NS_ENSURE_ARG_MAX(aValueSize, INT_MAX);
-  std::pair<const void *, int> data(
-    static_cast<const void *>(aValue),
-    int(aValueSize)
-  );
-  nsCOMPtr<nsIVariant> value(new BlobVariant(data));
-  NS_ENSURE_TRUE(value, NS_ERROR_OUT_OF_MEMORY);
-
-  return BindByIndex(aIndex, value);
-}
-
-NS_IMETHODIMP
-BindingParams::BindStringAsBlobByIndex(uint32_t aIndex, const nsAString& aValue)
-{
-  return DoBindStringAsBlobByIndex(this, aIndex, aValue);
-}
-
-NS_IMETHODIMP
-BindingParams::BindUTF8StringAsBlobByIndex(uint32_t aIndex,
-                                           const nsACString& aValue)
-{
-  return DoBindStringAsBlobByIndex(this, aIndex, aValue);
-}
-
-NS_IMETHODIMP
-BindingParams::BindAdoptedBlobByIndex(uint32_t aIndex,
-                                      uint8_t *aValue,
-                                      uint32_t aValueSize)
-{
-  NS_ENSURE_ARG_MAX(aValueSize, INT_MAX);
-  std::pair<uint8_t *, int> data(
-    static_cast<uint8_t *>(aValue),
-    int(aValueSize)
-  );
-  nsCOMPtr<nsIVariant> value(new AdoptedBlobVariant(data));
-
-  return BindByIndex(aIndex, value);
-}
-
-} // namespace storage
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageBindingParams.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageBindingParams.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageBindingParams.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageBindingParams.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,124 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 mozStorageBindingParams_h
-#define mozStorageBindingParams_h
-
-#include "nsCOMArray.h"
-#include "nsIVariant.h"
-#include "nsInterfaceHashtable.h"
-
-#include "mozStorageBindingParamsArray.h"
-#include "mozStorageStatement.h"
-#include "mozStorageAsyncStatement.h"
-#include "Variant.h"
-
-#include "mozIStorageBindingParams.h"
-#include "IStorageBindingParamsInternal.h"
-
-namespace mozilla {
-namespace storage {
-
-class BindingParams : public mozIStorageBindingParams
-                    , public IStorageBindingParamsInternal
-{
-public:
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_MOZISTORAGEBINDINGPARAMS
-  NS_DECL_ISTORAGEBINDINGPARAMSINTERNAL
-
-  /**
-   * Locks the parameters and prevents further modification to it (such as
-   * binding more elements to it).
-   */
-  void lock();
-
-  /**
-   * Unlocks the parameters and allows modification to it again.
-   *
-   * @param aOwningStatement
-   *        The statement that owns us.  We cleared this when we were locked,
-   *        and our invariant requires us to have this, so you need to tell us
-   *        again.
-   */
-  void unlock(Statement *aOwningStatement);
-
-  /**
-   * @returns the pointer to the owning BindingParamsArray.  Used by a
-   *          BindingParamsArray to verify that we belong to it when added.
-   */
-  const mozIStorageBindingParamsArray *getOwner() const;
-
-  BindingParams(mozIStorageBindingParamsArray *aOwningArray,
-                Statement *aOwningStatement);
-protected:
-  virtual ~BindingParams() {}
-
-  explicit BindingParams(mozIStorageBindingParamsArray *aOwningArray);
-  // Note that this is managed as a sparse array, so particular caution should
-  // be used for out-of-bounds usage.
-  nsTArray<nsRefPtr<Variant_base> > mParameters;
-  bool mLocked;
-
-private:
-
-  /**
-   * Track the BindingParamsArray that created us until we are added to it.
-   * (Once we are added we are locked and no one needs to look up our owner.)
-   * Ref-counted since there is no invariant that guarantees it stays alive
-   * otherwise.  This keeps mOwningStatement alive for us too since the array
-   * also holds a reference.
-   */
-  nsCOMPtr<mozIStorageBindingParamsArray> mOwningArray;
-  /**
-   * Used in the synchronous binding case to map parameter names to indices.
-   * Not reference-counted because this is only non-null as long as mOwningArray
-   * is non-null and mOwningArray also holds a statement reference.
-   */
-  Statement *mOwningStatement;
-  uint32_t mParamCount;
-};
-
-/**
- * Adds late resolution of named parameters so they don't get resolved until we
- * try and bind the parameters on the async thread.  We also stop checking
- * parameter indices for being too big since we just just don't know how many
- * there are.
- *
- * We support *either* binding by name or binding by index.  Trying to do both
- * results in only binding by name at sqlite3_stmt bind time.
- */
-class AsyncBindingParams : public BindingParams
-{
-public:
-  NS_IMETHOD BindByName(const nsACString & aName,
-                                      nsIVariant *aValue);
-  NS_IMETHOD BindByIndex(uint32_t aIndex, nsIVariant *aValue);
-
-  virtual already_AddRefed<mozIStorageError> bind(sqlite3_stmt * aStatement);
-
-  explicit AsyncBindingParams(mozIStorageBindingParamsArray *aOwningArray);
-  virtual ~AsyncBindingParams() {}
-
-private:
-  nsInterfaceHashtable<nsCStringHashKey, nsIVariant> mNamedParameters;
-
-  struct NamedParameterIterationClosureThunk
-  {
-    AsyncBindingParams *self;
-    sqlite3_stmt *statement;
-    nsCOMPtr<mozIStorageError> err;
-  };
-
-  static PLDHashOperator iterateOverNamedParameters(const nsACString &aName,
-                                                    nsIVariant *aValue,
-                                                    void *voidClosureThunk);
-};
-
-} // namespace storage
-} // namespace mozilla
-
-#endif // mozStorageBindingParams_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageConnection.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageConnection.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageConnection.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageConnection.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,1821 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 <stdio.h>
-
-#include "nsError.h"
-#include "nsIMutableArray.h"
-#include "nsAutoPtr.h"
-#include "nsIMemoryReporter.h"
-#include "nsThreadUtils.h"
-#include "nsIFile.h"
-#include "nsIFileURL.h"
-#include "mozilla/Telemetry.h"
-#include "mozilla/Mutex.h"
-#include "mozilla/CondVar.h"
-#include "mozilla/Attributes.h"
-
-#include "mozIStorageAggregateFunction.h"
-#include "mozIStorageCompletionCallback.h"
-#include "mozIStorageFunction.h"
-
-#include "mozStorageAsyncStatementExecution.h"
-#include "mozStorageSQLFunctions.h"
-#include "mozStorageConnection.h"
-#include "mozStorageService.h"
-#include "mozStorageStatement.h"
-#include "mozStorageAsyncStatement.h"
-#include "mozStorageArgValueArray.h"
-#include "mozStoragePrivateHelpers.h"
-#include "mozStorageStatementData.h"
-#include "StorageBaseStatementInternal.h"
-#include "SQLCollations.h"
-#include "FileSystemModule.h"
-#include "mozStorageHelper.h"
-#include "GeckoProfiler.h"
-
-#include "prlog.h"
-#include "prprf.h"
-#include "nsProxyRelease.h"
-#include <algorithm>
-
-#define MIN_AVAILABLE_BYTES_PER_CHUNKED_GROWTH 524288000 // 500 MiB
-
-// Maximum size of the pages cache per connection.
-#define MAX_CACHE_SIZE_KIBIBYTES 2048 // 2 MiB
-
-#ifdef PR_LOGGING
-PRLogModuleInfo* gStorageLog = nullptr;
-#endif
-
-// Checks that the protected code is running on the main-thread only if the
-// connection was also opened on it.
-#ifdef DEBUG
-#define CHECK_MAINTHREAD_ABUSE() \
-  do { \
-    nsCOMPtr<nsIThread> mainThread = do_GetMainThread(); \
-    NS_WARN_IF_FALSE(threadOpenedOn == mainThread || !NS_IsMainThread(), \
-               "Using Storage synchronous API on main-thread, but the connection was opened on another thread."); \
-  } while(0)
-#else
-#define CHECK_MAINTHREAD_ABUSE() do { /* Nothing */ } while(0)
-#endif
-
-namespace mozilla {
-namespace storage {
-
-namespace {
-
-////////////////////////////////////////////////////////////////////////////////
-//// Variant Specialization Functions (variantToSQLiteT)
-
-int
-sqlite3_T_int(sqlite3_context *aCtx,
-              int aValue)
-{
-  ::sqlite3_result_int(aCtx, aValue);
-  return SQLITE_OK;
-}
-
-int
-sqlite3_T_int64(sqlite3_context *aCtx,
-                sqlite3_int64 aValue)
-{
-  ::sqlite3_result_int64(aCtx, aValue);
-  return SQLITE_OK;
-}
-
-int
-sqlite3_T_double(sqlite3_context *aCtx,
-                 double aValue)
-{
-  ::sqlite3_result_double(aCtx, aValue);
-  return SQLITE_OK;
-}
-
-int
-sqlite3_T_text(sqlite3_context *aCtx,
-               const nsCString &aValue)
-{
-  ::sqlite3_result_text(aCtx,
-                        aValue.get(),
-                        aValue.Length(),
-                        SQLITE_TRANSIENT);
-  return SQLITE_OK;
-}
-
-int
-sqlite3_T_text16(sqlite3_context *aCtx,
-                 const nsString &aValue)
-{
-  ::sqlite3_result_text16(aCtx,
-                          aValue.get(),
-                          aValue.Length() * 2, // Number of bytes.
-                          SQLITE_TRANSIENT);
-  return SQLITE_OK;
-}
-
-int
-sqlite3_T_null(sqlite3_context *aCtx)
-{
-  ::sqlite3_result_null(aCtx);
-  return SQLITE_OK;
-}
-
-int
-sqlite3_T_blob(sqlite3_context *aCtx,
-               const void *aData,
-               int aSize)
-{
-  ::sqlite3_result_blob(aCtx, aData, aSize, free);
-  return SQLITE_OK;
-}
-
-#include "variantToSQLiteT_impl.h"
-
-////////////////////////////////////////////////////////////////////////////////
-//// Modules
-
-struct Module
-{
-  const char* name;
-  int (*registerFunc)(sqlite3*, const char*);
-};
-
-Module gModules[] = {
-  { "filesystem", RegisterFileSystemModule }
-};
-
-////////////////////////////////////////////////////////////////////////////////
-//// Local Functions
-
-#ifdef PR_LOGGING
-void tracefunc (void *aClosure, const char *aStmt)
-{
-  PR_LOG(gStorageLog, PR_LOG_DEBUG, ("sqlite3_trace on %p for '%s'", aClosure,
-                                     aStmt));
-}
-#endif
-
-struct FFEArguments
-{
-    nsISupports *target;
-    bool found;
-};
-PLDHashOperator
-findFunctionEnumerator(const nsACString &aKey,
-                       Connection::FunctionInfo aData,
-                       void *aUserArg)
-{
-  FFEArguments *args = static_cast<FFEArguments *>(aUserArg);
-  if (aData.function == args->target) {
-    args->found = true;
-    return PL_DHASH_STOP;
-  }
-  return PL_DHASH_NEXT;
-}
-
-PLDHashOperator
-copyFunctionEnumerator(const nsACString &aKey,
-                       Connection::FunctionInfo aData,
-                       void *aUserArg)
-{
-  NS_PRECONDITION(aData.type == Connection::FunctionInfo::SIMPLE ||
-                  aData.type == Connection::FunctionInfo::AGGREGATE,
-                  "Invalid function type!");
-
-  Connection *connection = static_cast<Connection *>(aUserArg);
-  if (aData.type == Connection::FunctionInfo::SIMPLE) {
-    mozIStorageFunction *function =
-      static_cast<mozIStorageFunction *>(aData.function.get());
-    (void)connection->CreateFunction(aKey, aData.numArgs, function);
-  }
-  else {
-    mozIStorageAggregateFunction *function =
-      static_cast<mozIStorageAggregateFunction *>(aData.function.get());
-    (void)connection->CreateAggregateFunction(aKey, aData.numArgs, function);
-  }
-
-  return PL_DHASH_NEXT;
-}
-
-void
-basicFunctionHelper(sqlite3_context *aCtx,
-                    int aArgc,
-                    sqlite3_value **aArgv)
-{
-  void *userData = ::sqlite3_user_data(aCtx);
-
-  mozIStorageFunction *func = static_cast<mozIStorageFunction *>(userData);
-
-  nsRefPtr<ArgValueArray> arguments(new ArgValueArray(aArgc, aArgv));
-  if (!arguments)
-      return;
-
-  nsCOMPtr<nsIVariant> result;
-  if (NS_FAILED(func->OnFunctionCall(arguments, getter_AddRefs(result)))) {
-    NS_WARNING("User function returned error code!");
-    ::sqlite3_result_error(aCtx,
-                           "User function returned error code",
-                           -1);
-    return;
-  }
-  int retcode = variantToSQLiteT(aCtx, result);
-  if (retcode == SQLITE_IGNORE) {
-    ::sqlite3_result_int(aCtx, SQLITE_IGNORE);
-  } else if (retcode != SQLITE_OK) {
-    NS_WARNING("User function returned invalid data type!");
-    ::sqlite3_result_error(aCtx,
-                           "User function returned invalid data type",
-                           -1);
-  }
-}
-
-void
-aggregateFunctionStepHelper(sqlite3_context *aCtx,
-                            int aArgc,
-                            sqlite3_value **aArgv)
-{
-  void *userData = ::sqlite3_user_data(aCtx);
-  mozIStorageAggregateFunction *func =
-    static_cast<mozIStorageAggregateFunction *>(userData);
-
-  nsRefPtr<ArgValueArray> arguments(new ArgValueArray(aArgc, aArgv));
-  if (!arguments)
-    return;
-
-  if (NS_FAILED(func->OnStep(arguments)))
-    NS_WARNING("User aggregate step function returned error code!");
-}
-
-void
-aggregateFunctionFinalHelper(sqlite3_context *aCtx)
-{
-  void *userData = ::sqlite3_user_data(aCtx);
-  mozIStorageAggregateFunction *func =
-    static_cast<mozIStorageAggregateFunction *>(userData);
-
-  nsRefPtr<nsIVariant> result;
-  if (NS_FAILED(func->OnFinal(getter_AddRefs(result)))) {
-    NS_WARNING("User aggregate final function returned error code!");
-    ::sqlite3_result_error(aCtx,
-                           "User aggregate final function returned error code",
-                           -1);
-    return;
-  }
-
-  if (variantToSQLiteT(aCtx, result) != SQLITE_OK) {
-    NS_WARNING("User aggregate final function returned invalid data type!");
-    ::sqlite3_result_error(aCtx,
-                           "User aggregate final function returned invalid data type",
-                           -1);
-  }
-}
-
-/**
- * This code is heavily based on the sample at:
- *   http://www.sqlite.org/unlock_notify.html
- */
-class UnlockNotification
-{
-public:
-  UnlockNotification()
-  : mMutex("UnlockNotification mMutex")
-  , mCondVar(mMutex, "UnlockNotification condVar")
-  , mSignaled(false)
-  {
-  }
-
-  void Wait()
-  {
-    MutexAutoLock lock(mMutex);
-    while (!mSignaled) {
-      (void)mCondVar.Wait();
-    }
-  }
-
-  void Signal()
-  {
-    MutexAutoLock lock(mMutex);
-    mSignaled = true;
-    (void)mCondVar.Notify();
-  }
-
-private:
-  Mutex mMutex;
-  CondVar mCondVar;
-  bool mSignaled;
-};
-
-void
-UnlockNotifyCallback(void **aArgs,
-                     int aArgsSize)
-{
-  for (int i = 0; i < aArgsSize; i++) {
-    UnlockNotification *notification =
-      static_cast<UnlockNotification *>(aArgs[i]);
-    notification->Signal();
-  }
-}
-
-int
-WaitForUnlockNotify(sqlite3* aDatabase)
-{
-  UnlockNotification notification;
-  int srv = ::sqlite3_unlock_notify(aDatabase, UnlockNotifyCallback,
-                                    &notification);
-  MOZ_ASSERT(srv == SQLITE_LOCKED || srv == SQLITE_OK);
-  if (srv == SQLITE_OK) {
-    notification.Wait();
-  }
-
-  return srv;
-}
-
-} // anonymous namespace
-
-////////////////////////////////////////////////////////////////////////////////
-//// Local Classes
-
-namespace {
-
-class AsyncCloseConnection final: public nsRunnable
-{
-public:
-  AsyncCloseConnection(Connection *aConnection,
-                       sqlite3 *aNativeConnection,
-                       nsIRunnable *aCallbackEvent,
-                       already_AddRefed<nsIThread> aAsyncExecutionThread)
-  : mConnection(aConnection)
-  , mNativeConnection(aNativeConnection)
-  , mCallbackEvent(aCallbackEvent)
-  , mAsyncExecutionThread(aAsyncExecutionThread)
-  {
-  }
-
-  NS_METHOD Run()
-  {
-#ifdef DEBUG
-    // This code is executed on the background thread
-    bool onAsyncThread = false;
-    (void)mAsyncExecutionThread->IsOnCurrentThread(&onAsyncThread);
-    MOZ_ASSERT(onAsyncThread);
-#endif // DEBUG
-
-    nsCOMPtr<nsIRunnable> event = NS_NewRunnableMethodWithArg<nsCOMPtr<nsIThread>>
-      (mConnection, &Connection::shutdownAsyncThread, mAsyncExecutionThread);
-    (void)NS_DispatchToMainThread(event);
-
-    // Internal close.
-    (void)mConnection->internalClose(mNativeConnection);
-
-    // Callback
-    if (mCallbackEvent) {
-      nsCOMPtr<nsIThread> thread;
-      (void)NS_GetMainThread(getter_AddRefs(thread));
-      (void)thread->Dispatch(mCallbackEvent, NS_DISPATCH_NORMAL);
-    }
-
-    return NS_OK;
-  }
-
-  ~AsyncCloseConnection() {
-    nsCOMPtr<nsIThread> thread;
-    (void)NS_GetMainThread(getter_AddRefs(thread));
-    // Handle ambiguous nsISupports inheritance.
-    Connection *rawConnection = nullptr;
-    mConnection.swap(rawConnection);
-    (void)NS_ProxyRelease(thread,
-                          NS_ISUPPORTS_CAST(mozIStorageConnection *,
-                                            rawConnection));
-    (void)NS_ProxyRelease(thread, mCallbackEvent);
-  }
-private:
-  nsRefPtr<Connection> mConnection;
-  sqlite3 *mNativeConnection;
-  nsCOMPtr<nsIRunnable> mCallbackEvent;
-  nsCOMPtr<nsIThread> mAsyncExecutionThread;
-};
-
-/**
- * An event used to initialize the clone of a connection.
- *
- * Must be executed on the clone's async execution thread.
- */
-class AsyncInitializeClone final: public nsRunnable
-{
-public:
-  /**
-   * @param aConnection The connection being cloned.
-   * @param aClone The clone.
-   * @param aReadOnly If |true|, the clone is read only.
-   * @param aCallback A callback to trigger once initialization
-   *                  is complete. This event will be called on
-   *                  aClone->threadOpenedOn.
-   */
-  AsyncInitializeClone(Connection* aConnection,
-                       Connection* aClone,
-                       const bool aReadOnly,
-                       mozIStorageCompletionCallback* aCallback)
-    : mConnection(aConnection)
-    , mClone(aClone)
-    , mReadOnly(aReadOnly)
-    , mCallback(aCallback)
-  {
-    MOZ_ASSERT(NS_IsMainThread());
-  }
-
-  NS_IMETHOD Run() {
-    MOZ_ASSERT (NS_GetCurrentThread() == mClone->getAsyncExecutionTarget());
-
-    nsresult rv = mConnection->initializeClone(mClone, mReadOnly);
-    if (NS_FAILED(rv)) {
-      return Dispatch(rv, nullptr);
-    }
-    return Dispatch(NS_OK,
-                    NS_ISUPPORTS_CAST(mozIStorageAsyncConnection*, mClone));
-  }
-
-private:
-  nsresult Dispatch(nsresult aResult, nsISupports* aValue) {
-    nsRefPtr<CallbackComplete> event = new CallbackComplete(aResult,
-                                                            aValue,
-                                                            mCallback.forget());
-    return mClone->threadOpenedOn->Dispatch(event, NS_DISPATCH_NORMAL);
-  }
-
-  ~AsyncInitializeClone() {
-    nsCOMPtr<nsIThread> thread;
-    DebugOnly<nsresult> rv = NS_GetMainThread(getter_AddRefs(thread));
-    MOZ_ASSERT(NS_SUCCEEDED(rv));
-
-    // Handle ambiguous nsISupports inheritance.
-    Connection *rawConnection = nullptr;
-    mConnection.swap(rawConnection);
-    (void)NS_ProxyRelease(thread, NS_ISUPPORTS_CAST(mozIStorageConnection *,
-                                                    rawConnection));
-
-    Connection *rawClone = nullptr;
-    mClone.swap(rawClone);
-    (void)NS_ProxyRelease(thread, NS_ISUPPORTS_CAST(mozIStorageConnection *,
-                                                    rawClone));
-
-    // Generally, the callback will be released by CallbackComplete.
-    // However, if for some reason Run() is not executed, we still
-    // need to ensure that it is released here.
-    mozIStorageCompletionCallback *rawCallback = nullptr;
-    mCallback.swap(rawCallback);
-    (void)NS_ProxyRelease(thread, rawCallback);
-  }
-
-  nsRefPtr<Connection> mConnection;
-  nsRefPtr<Connection> mClone;
-  const bool mReadOnly;
-  nsCOMPtr<mozIStorageCompletionCallback> mCallback;
-};
-
-} // anonymous namespace
-
-////////////////////////////////////////////////////////////////////////////////
-//// Connection
-
-Connection::Connection(Service *aService,
-                       int aFlags,
-                       bool aAsyncOnly)
-: sharedAsyncExecutionMutex("Connection::sharedAsyncExecutionMutex")
-, sharedDBMutex("Connection::sharedDBMutex")
-, threadOpenedOn(do_GetCurrentThread())
-, mDBConn(nullptr)
-, mAsyncExecutionThreadShuttingDown(false)
-, mAsyncExecutionThreadIsAlive(false)
-, mConnectionClosed(false)
-, mTransactionInProgress(false)
-, mProgressHandler(nullptr)
-, mFlags(aFlags)
-, mStorageService(aService)
-, mAsyncOnly(aAsyncOnly)
-{
-  mStorageService->registerConnection(this);
-}
-
-Connection::~Connection()
-{
-  (void)Close();
-
-  MOZ_ASSERT(!mAsyncExecutionThread,
-             "AsyncClose has not been invoked on this connection!");
-  MOZ_ASSERT(!mAsyncExecutionThreadIsAlive,
-             "The async execution thread should have been shutdown!");
-}
-
-NS_IMPL_ADDREF(Connection)
-
-NS_INTERFACE_MAP_BEGIN(Connection)
-  NS_INTERFACE_MAP_ENTRY(mozIStorageAsyncConnection)
-  NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
-  NS_INTERFACE_MAP_ENTRY_CONDITIONAL(mozIStorageConnection, !mAsyncOnly)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, mozIStorageConnection)
-NS_INTERFACE_MAP_END
-
-// This is identical to what NS_IMPL_RELEASE provides, but with the
-// extra |1 == count| case.
-NS_IMETHODIMP_(MozExternalRefCountType) Connection::Release(void)
-{
-  NS_PRECONDITION(0 != mRefCnt, "dup release");
-  nsrefcnt count = --mRefCnt;
-  NS_LOG_RELEASE(this, count, "Connection");
-  if (1 == count) {
-    // If the refcount is 1, the single reference must be from
-    // gService->mConnections (in class |Service|).  Which means we can
-    // unregister it safely.
-    mStorageService->unregisterConnection(this);
-  } else if (0 == count) {
-    mRefCnt = 1; /* stabilize */
-#if 0 /* enable this to find non-threadsafe destructors: */
-    NS_ASSERT_OWNINGTHREAD(Connection);
-#endif
-    delete (this);
-    return 0;
-  }
-  return count;
-}
-
-int32_t
-Connection::getSqliteRuntimeStatus(int32_t aStatusOption, int32_t* aMaxValue)
-{
-  MOZ_ASSERT(mDBConn, "A connection must exist at this point");
-  int curr = 0, max = 0;
-  DebugOnly<int> rc = ::sqlite3_db_status(mDBConn, aStatusOption, &curr, &max, 0);
-  MOZ_ASSERT(NS_SUCCEEDED(convertResultCode(rc)));
-  if (aMaxValue)
-    *aMaxValue = max;
-  return curr;
-}
-
-nsIEventTarget *
-Connection::getAsyncExecutionTarget()
-{
-  MutexAutoLock lockedScope(sharedAsyncExecutionMutex);
-
-  // If we are shutting down the asynchronous thread, don't hand out any more
-  // references to the thread.
-  if (mAsyncExecutionThreadShuttingDown)
-    return nullptr;
-
-  if (!mAsyncExecutionThread) {
-    nsresult rv = ::NS_NewThread(getter_AddRefs(mAsyncExecutionThread));
-    if (NS_FAILED(rv)) {
-      NS_WARNING("Failed to create async thread.");
-      return nullptr;
-    }
-    static nsThreadPoolNaming naming;
-    naming.SetThreadPoolName(NS_LITERAL_CSTRING("mozStorage"),
-                             mAsyncExecutionThread);
-  }
-
-  mAsyncExecutionThreadIsAlive = true;
-  return mAsyncExecutionThread;
-}
-
-nsresult
-Connection::initialize()
-{
-  NS_ASSERTION (!mDBConn, "Initialize called on already opened database!");
-  PROFILER_LABEL("mozStorageConnection", "initialize",
-    js::ProfileEntry::Category::STORAGE);
-
-  // in memory database requested, sqlite uses a magic file name
-  int srv = ::sqlite3_open_v2(":memory:", &mDBConn, mFlags, nullptr);
-  if (srv != SQLITE_OK) {
-    mDBConn = nullptr;
-    return convertResultCode(srv);
-  }
-
-  return initializeInternal(nullptr);
-}
-
-nsresult
-Connection::initialize(nsIFile *aDatabaseFile)
-{
-  NS_ASSERTION (aDatabaseFile, "Passed null file!");
-  NS_ASSERTION (!mDBConn, "Initialize called on already opened database!");
-  PROFILER_LABEL("mozStorageConnection", "initialize",
-    js::ProfileEntry::Category::STORAGE);
-
-  mDatabaseFile = aDatabaseFile;
-
-  nsAutoString path;
-  nsresult rv = aDatabaseFile->GetPath(path);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  int srv = ::sqlite3_open_v2(NS_ConvertUTF16toUTF8(path).get(), &mDBConn,
-                              mFlags, nullptr);
-  if (srv != SQLITE_OK) {
-    mDBConn = nullptr;
-    return convertResultCode(srv);
-  }
-
-  rv = initializeInternal(aDatabaseFile);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  mDatabaseFile = aDatabaseFile;
-
-  return NS_OK;
-}
-
-nsresult
-Connection::initialize(nsIFileURL *aFileURL)
-{
-  NS_ASSERTION (aFileURL, "Passed null file URL!");
-  NS_ASSERTION (!mDBConn, "Initialize called on already opened database!");
-  PROFILER_LABEL("mozStorageConnection", "initialize",
-    js::ProfileEntry::Category::STORAGE);
-
-  nsCOMPtr<nsIFile> databaseFile;
-  nsresult rv = aFileURL->GetFile(getter_AddRefs(databaseFile));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsAutoCString spec;
-  rv = aFileURL->GetSpec(spec);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  int srv = ::sqlite3_open_v2(spec.get(), &mDBConn, mFlags, nullptr);
-  if (srv != SQLITE_OK) {
-    mDBConn = nullptr;
-    return convertResultCode(srv);
-  }
-
-  rv = initializeInternal(databaseFile);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  mFileURL = aFileURL;
-  mDatabaseFile = databaseFile;
-
-  return NS_OK;
-}
-
-
-nsresult
-Connection::initializeInternal(nsIFile* aDatabaseFile)
-{
-  // Properly wrap the database handle's mutex.
-  sharedDBMutex.initWithMutex(sqlite3_db_mutex(mDBConn));
-
-#ifdef PR_LOGGING
-  if (!gStorageLog)
-    gStorageLog = ::PR_NewLogModule("mozStorage");
-
-  // SQLite tracing can slow down queries (especially long queries)
-  // significantly. Don't trace unless the user is actively monitoring SQLite.
-  if (PR_LOG_TEST(gStorageLog, PR_LOG_DEBUG)) {
-    ::sqlite3_trace(mDBConn, tracefunc, this);
-
-    nsAutoCString leafName(":memory");
-    if (aDatabaseFile)
-      (void)aDatabaseFile->GetNativeLeafName(leafName);
-    PR_LOG(gStorageLog, PR_LOG_NOTICE, ("Opening connection to '%s' (%p)",
-                                        leafName.get(), this));
-  }
-#endif
-
-  int64_t pageSize = Service::getDefaultPageSize();
-
-  // Set page_size to the preferred default value.  This is effective only if
-  // the database has just been created, otherwise, if the database does not
-  // use WAL journal mode, a VACUUM operation will updated its page_size.
-  nsAutoCString pageSizeQuery(MOZ_STORAGE_UNIQUIFY_QUERY_STR
-                              "PRAGMA page_size = ");
-  pageSizeQuery.AppendInt(pageSize);
-  nsresult rv = ExecuteSimpleSQL(pageSizeQuery);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // Setting the cache_size forces the database open, verifying if it is valid
-  // or corrupt.  So this is executed regardless it being actually needed.
-  // The cache_size is calculated from the actual page_size, to save memory.
-  nsAutoCString cacheSizeQuery(MOZ_STORAGE_UNIQUIFY_QUERY_STR
-                               "PRAGMA cache_size = ");
-  cacheSizeQuery.AppendInt(-MAX_CACHE_SIZE_KIBIBYTES);
-  int srv = executeSql(mDBConn, cacheSizeQuery.get());
-  if (srv != SQLITE_OK) {
-    ::sqlite3_close(mDBConn);
-    mDBConn = nullptr;
-    return convertResultCode(srv);
-  }
-
-  // Register our built-in SQL functions.
-  srv = registerFunctions(mDBConn);
-  if (srv != SQLITE_OK) {
-    ::sqlite3_close(mDBConn);
-    mDBConn = nullptr;
-    return convertResultCode(srv);
-  }
-
-  // Register our built-in SQL collating sequences.
-  srv = registerCollations(mDBConn, mStorageService);
-  if (srv != SQLITE_OK) {
-    ::sqlite3_close(mDBConn);
-    mDBConn = nullptr;
-    return convertResultCode(srv);
-  }
-
-  // Set the synchronous PRAGMA, according to the preference.
-  switch (Service::getSynchronousPref()) {
-    case 2:
-      (void)ExecuteSimpleSQL(NS_LITERAL_CSTRING(
-          "PRAGMA synchronous = FULL;"));
-      break;
-    case 0:
-      (void)ExecuteSimpleSQL(NS_LITERAL_CSTRING(
-          "PRAGMA synchronous = OFF;"));
-      break;
-    case 1:
-    default:
-      (void)ExecuteSimpleSQL(NS_LITERAL_CSTRING(
-          "PRAGMA synchronous = NORMAL;"));
-      break;
-  }
-
-  return NS_OK;
-}
-
-nsresult
-Connection::databaseElementExists(enum DatabaseElementType aElementType,
-                                  const nsACString &aElementName,
-                                  bool *_exists)
-{
-  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
-
-  // When constructing the query, make sure to SELECT the correct db's sqlite_master
-  // if the user is prefixing the element with a specific db. ex: sample.test
-  nsCString query("SELECT name FROM (SELECT * FROM ");
-  nsDependentCSubstring element;
-  int32_t ind = aElementName.FindChar('.');
-  if (ind == kNotFound) {
-    element.Assign(aElementName);
-  }
-  else {
-    nsDependentCSubstring db(Substring(aElementName, 0, ind + 1));
-    element.Assign(Substring(aElementName, ind + 1, aElementName.Length()));
-    query.Append(db);
-  }
-  query.AppendLiteral("sqlite_master UNION ALL SELECT * FROM sqlite_temp_master) WHERE type = '");
-
-  switch (aElementType) {
-    case INDEX:
-      query.AppendLiteral("index");
-      break;
-    case TABLE:
-      query.AppendLiteral("table");
-      break;
-  }
-  query.AppendLiteral("' AND name ='");
-  query.Append(element);
-  query.Append('\'');
-
-  sqlite3_stmt *stmt;
-  int srv = prepareStatement(mDBConn, query, &stmt);
-  if (srv != SQLITE_OK)
-    return convertResultCode(srv);
-
-  srv = stepStatement(mDBConn, stmt);
-  // we just care about the return value from step
-  (void)::sqlite3_finalize(stmt);
-
-  if (srv == SQLITE_ROW) {
-    *_exists = true;
-    return NS_OK;
-  }
-  if (srv == SQLITE_DONE) {
-    *_exists = false;
-    return NS_OK;
-  }
-
-  return convertResultCode(srv);
-}
-
-bool
-Connection::findFunctionByInstance(nsISupports *aInstance)
-{
-  sharedDBMutex.assertCurrentThreadOwns();
-  FFEArguments args = { aInstance, false };
-  (void)mFunctions.EnumerateRead(findFunctionEnumerator, &args);
-  return args.found;
-}
-
-/* static */ int
-Connection::sProgressHelper(void *aArg)
-{
-  Connection *_this = static_cast<Connection *>(aArg);
-  return _this->progressHandler();
-}
-
-int
-Connection::progressHandler()
-{
-  sharedDBMutex.assertCurrentThreadOwns();
-  if (mProgressHandler) {
-    bool result;
-    nsresult rv = mProgressHandler->OnProgress(this, &result);
-    if (NS_FAILED(rv)) return 0; // Don't break request
-    return result ? 1 : 0;
-  }
-  return 0;
-}
-
-nsresult
-Connection::setClosedState()
-{
-  // Ensure that we are on the correct thread to close the database.
-  bool onOpenedThread;
-  nsresult rv = threadOpenedOn->IsOnCurrentThread(&onOpenedThread);
-  NS_ENSURE_SUCCESS(rv, rv);
-  if (!onOpenedThread) {
-    NS_ERROR("Must close the database on the thread that you opened it with!");
-    return NS_ERROR_UNEXPECTED;
-  }
-
-  // Flag that we are shutting down the async thread, so that
-  // getAsyncExecutionTarget knows not to expose/create the async thread.
-  {
-    MutexAutoLock lockedScope(sharedAsyncExecutionMutex);
-    NS_ENSURE_FALSE(mAsyncExecutionThreadShuttingDown, NS_ERROR_UNEXPECTED);
-    mAsyncExecutionThreadShuttingDown = true;
-  }
-
-  // Set the property to null before closing the connection, otherwise the other
-  // functions in the module may try to use the connection after it is closed.
-  mDBConn = nullptr;
-
-  return NS_OK;
-}
-
-bool
-Connection::connectionReady()
-{
-  return mDBConn != nullptr;
-}
-
-bool
-Connection::isClosing()
-{
-  bool shuttingDown = false;
-  {
-    MutexAutoLock lockedScope(sharedAsyncExecutionMutex);
-    shuttingDown = mAsyncExecutionThreadShuttingDown;
-  }
-  return shuttingDown && !isClosed();
-}
-
-bool
-Connection::isClosed()
-{
-  MutexAutoLock lockedScope(sharedAsyncExecutionMutex);
-  return mConnectionClosed;
-}
-
-void
-Connection::shutdownAsyncThread(nsIThread *aThread) {
-  MOZ_ASSERT(!mAsyncExecutionThread);
-  MOZ_ASSERT(mAsyncExecutionThreadIsAlive);
-  MOZ_ASSERT(mAsyncExecutionThreadShuttingDown);
-
-  DebugOnly<nsresult> rv = aThread->Shutdown();
-  MOZ_ASSERT(NS_SUCCEEDED(rv));
-  mAsyncExecutionThreadIsAlive = false;
-}
-
-nsresult
-Connection::internalClose(sqlite3 *aNativeConnection)
-{
-  // Sanity checks to make sure we are in the proper state before calling this.
-  // aNativeConnection can be null if OpenAsyncDatabase failed and is now just
-  // cleaning up the async thread.
-  MOZ_ASSERT(!isClosed());
-
-#ifdef DEBUG
-  { // Make sure we have marked our async thread as shutting down.
-    MutexAutoLock lockedScope(sharedAsyncExecutionMutex);
-    NS_ASSERTION(mAsyncExecutionThreadShuttingDown,
-                 "Did not call setClosedState!");
-  }
-#endif // DEBUG
-
-#ifdef PR_LOGGING
-  nsAutoCString leafName(":memory");
-  if (mDatabaseFile)
-      (void)mDatabaseFile->GetNativeLeafName(leafName);
-  PR_LOG(gStorageLog, PR_LOG_NOTICE, ("Closing connection to '%s'",
-                                      leafName.get()));
-#endif
-
-  // At this stage, we may still have statements that need to be
-  // finalized. Attempt to close the database connection. This will
-  // always disconnect any virtual tables and cleanly finalize their
-  // internal statements. Once this is done, closing may fail due to
-  // unfinalized client statements, in which case we need to finalize
-  // these statements and close again.
-  {
-    MutexAutoLock lockedScope(sharedAsyncExecutionMutex);
-    mConnectionClosed = true;
-  }
-
-  // Nothing else needs to be done if we don't have a connection here.
-  if (!aNativeConnection)
-    return NS_OK;
-
-  int srv = sqlite3_close(aNativeConnection);
-
-  if (srv == SQLITE_BUSY) {
-    // We still have non-finalized statements. Finalize them.
-
-    sqlite3_stmt *stmt = nullptr;
-    while ((stmt = ::sqlite3_next_stmt(aNativeConnection, stmt))) {
-      PR_LOG(gStorageLog, PR_LOG_NOTICE,
-             ("Auto-finalizing SQL statement '%s' (%x)",
-              ::sqlite3_sql(stmt),
-              stmt));
-
-#ifdef DEBUG
-      char *msg = ::PR_smprintf("SQL statement '%s' (%x) should have been finalized before closing the connection",
-                                ::sqlite3_sql(stmt),
-                                stmt);
-      NS_WARNING(msg);
-      ::PR_smprintf_free(msg);
-#endif // DEBUG
-
-      srv = ::sqlite3_finalize(stmt);
-
-#ifdef DEBUG
-      if (srv != SQLITE_OK) {
-        char *msg = ::PR_smprintf("Could not finalize SQL statement '%s' (%x)",
-                                  ::sqlite3_sql(stmt),
-                                  stmt);
-        NS_WARNING(msg);
-        ::PR_smprintf_free(msg);
-      }
-#endif // DEBUG
-
-      // Ensure that the loop continues properly, whether closing has succeeded
-      // or not.
-      if (srv == SQLITE_OK) {
-        stmt = nullptr;
-      }
-    }
-
-    // Now that all statements have been finalized, we
-    // should be able to close.
-    srv = ::sqlite3_close(aNativeConnection);
-
-  }
-
-  if (srv != SQLITE_OK) {
-    MOZ_ASSERT(srv == SQLITE_OK,
-               "sqlite3_close failed. There are probably outstanding statements that are listed above!");
-  }
-
-  return convertResultCode(srv);
-}
-
-nsCString
-Connection::getFilename()
-{
-  nsCString leafname(":memory:");
-  if (mDatabaseFile) {
-    (void)mDatabaseFile->GetNativeLeafName(leafname);
-  }
-  return leafname;
-}
-
-int
-Connection::stepStatement(sqlite3 *aNativeConnection, sqlite3_stmt *aStatement)
-{
-  MOZ_ASSERT(aStatement);
-  bool checkedMainThread = false;
-  TimeStamp startTime = TimeStamp::Now();
-
-  // The connection may have been closed if the executing statement has been
-  // created and cached after a call to asyncClose() but before the actual
-  // sqlite3_close().  This usually happens when other tasks using cached
-  // statements are asynchronously scheduled for execution and any of them ends
-  // up after asyncClose. See bug 728653 for details.
-  if (isClosed())
-    return SQLITE_MISUSE;
-
-  (void)::sqlite3_extended_result_codes(aNativeConnection, 1);
-
-  int srv;
-  while ((srv = ::sqlite3_step(aStatement)) == SQLITE_LOCKED_SHAREDCACHE) {
-    if (!checkedMainThread) {
-      checkedMainThread = true;
-      if (::NS_IsMainThread()) {
-        NS_WARNING("We won't allow blocking on the main thread!");
-        break;
-      }
-    }
-
-    srv = WaitForUnlockNotify(aNativeConnection);
-    if (srv != SQLITE_OK) {
-      break;
-    }
-
-    ::sqlite3_reset(aStatement);
-  }
-
-  // Report very slow SQL statements to Telemetry
-  TimeDuration duration = TimeStamp::Now() - startTime;
-  const uint32_t threshold =
-    NS_IsMainThread() ? Telemetry::kSlowSQLThresholdForMainThread
-                      : Telemetry::kSlowSQLThresholdForHelperThreads;
-  if (duration.ToMilliseconds() >= threshold) {
-    nsDependentCString statementString(::sqlite3_sql(aStatement));
-    Telemetry::RecordSlowSQLStatement(statementString, getFilename(),
-                                      duration.ToMilliseconds());
-  }
-
-  (void)::sqlite3_extended_result_codes(aNativeConnection, 0);
-  // Drop off the extended result bits of the result code.
-  return srv & 0xFF;
-}
-
-int
-Connection::prepareStatement(sqlite3 *aNativeConnection, const nsCString &aSQL,
-                             sqlite3_stmt **_stmt)
-{
-  // We should not even try to prepare statements after the connection has
-  // been closed.
-  if (isClosed())
-    return SQLITE_MISUSE;
-
-  bool checkedMainThread = false;
-
-  (void)::sqlite3_extended_result_codes(aNativeConnection, 1);
-
-  int srv;
-  while((srv = ::sqlite3_prepare_v2(aNativeConnection,
-                                    aSQL.get(),
-                                    -1,
-                                    _stmt,
-                                    nullptr)) == SQLITE_LOCKED_SHAREDCACHE) {
-    if (!checkedMainThread) {
-      checkedMainThread = true;
-      if (::NS_IsMainThread()) {
-        NS_WARNING("We won't allow blocking on the main thread!");
-        break;
-      }
-    }
-
-    srv = WaitForUnlockNotify(aNativeConnection);
-    if (srv != SQLITE_OK) {
-      break;
-    }
-  }
-
-  if (srv != SQLITE_OK) {
-    nsCString warnMsg;
-    warnMsg.AppendLiteral("The SQL statement '");
-    warnMsg.Append(aSQL);
-    warnMsg.AppendLiteral("' could not be compiled due to an error: ");
-    warnMsg.Append(::sqlite3_errmsg(aNativeConnection));
-
-#ifdef DEBUG
-    NS_WARNING(warnMsg.get());
-#endif
-    PR_LOG(gStorageLog, PR_LOG_ERROR, ("%s", warnMsg.get()));
-  }
-
-  (void)::sqlite3_extended_result_codes(aNativeConnection, 0);
-  // Drop off the extended result bits of the result code.
-  int rc = srv & 0xFF;
-  // sqlite will return OK on a comment only string and set _stmt to nullptr.
-  // The callers of this function are used to only checking the return value,
-  // so it is safer to return an error code.
-  if (rc == SQLITE_OK && *_stmt == nullptr) {
-    return SQLITE_MISUSE;
-  }
-
-  return rc;
-}
-
-
-int
-Connection::executeSql(sqlite3 *aNativeConnection, const char *aSqlString)
-{
-  if (isClosed())
-    return SQLITE_MISUSE;
-
-  TimeStamp startTime = TimeStamp::Now();
-  int srv = ::sqlite3_exec(aNativeConnection, aSqlString, nullptr, nullptr,
-                           nullptr);
-
-  // Report very slow SQL statements to Telemetry
-  TimeDuration duration = TimeStamp::Now() - startTime;
-  const uint32_t threshold =
-    NS_IsMainThread() ? Telemetry::kSlowSQLThresholdForMainThread
-                      : Telemetry::kSlowSQLThresholdForHelperThreads;
-  if (duration.ToMilliseconds() >= threshold) {
-    nsDependentCString statementString(aSqlString);
-    Telemetry::RecordSlowSQLStatement(statementString, getFilename(),
-                                      duration.ToMilliseconds());
-  }
-
-  return srv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//// nsIInterfaceRequestor
-
-NS_IMETHODIMP
-Connection::GetInterface(const nsIID &aIID,
-                         void **_result)
-{
-  if (aIID.Equals(NS_GET_IID(nsIEventTarget))) {
-    nsIEventTarget *background = getAsyncExecutionTarget();
-    NS_IF_ADDREF(background);
-    *_result = background;
-    return NS_OK;
-  }
-  return NS_ERROR_NO_INTERFACE;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//// mozIStorageConnection
-
-NS_IMETHODIMP
-Connection::Close()
-{
-  if (!mDBConn)
-    return NS_ERROR_NOT_INITIALIZED;
-
-  { // Make sure we have not executed any asynchronous statements.
-    // If this fails, the mDBConn will be left open, resulting in a leak.
-    // Ideally we'd schedule some code to destroy the mDBConn once all its
-    // async statements have finished executing;  see bug 704030.
-    MutexAutoLock lockedScope(sharedAsyncExecutionMutex);
-    bool asyncCloseWasCalled = !mAsyncExecutionThread;
-    NS_ENSURE_TRUE(asyncCloseWasCalled, NS_ERROR_UNEXPECTED);
-  }
-
-  // setClosedState nullifies our connection pointer, so we take a raw pointer
-  // off it, to pass it through the close procedure.
-  sqlite3 *nativeConn = mDBConn;
-  nsresult rv = setClosedState();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return internalClose(nativeConn);
-}
-
-NS_IMETHODIMP
-Connection::AsyncClose(mozIStorageCompletionCallback *aCallback)
-{
-  if (!NS_IsMainThread()) {
-    return NS_ERROR_NOT_SAME_THREAD;
-  }
-
-  // It's possible to get here with a null mDBConn but a non-null async
-  // execution target if OpenAsyncDatabase failed somehow, so don't exit early
-  // in that case.
-  nsIEventTarget *asyncThread = getAsyncExecutionTarget();
-
-  if (!mDBConn && !asyncThread)
-    return NS_ERROR_NOT_INITIALIZED;
-
-  // setClosedState nullifies our connection pointer, so we take a raw pointer
-  // off it, to pass it through the close procedure.
-  sqlite3 *nativeConn = mDBConn;
-  nsresult rv = setClosedState();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // Create our callback event if we were given a callback.
-  nsCOMPtr<nsIRunnable> completeEvent;
-  if (aCallback) {
-    completeEvent = newCompletionEvent(aCallback);
-  }
-
-  // Create and dispatch our close event to the background thread.
-  nsCOMPtr<nsIRunnable> closeEvent;
-  {
-    // We need to lock because we're modifying mAsyncExecutionThread
-    MutexAutoLock lockedScope(sharedAsyncExecutionMutex);
-    closeEvent = new AsyncCloseConnection(this,
-                                          nativeConn,
-                                          completeEvent,
-                                          mAsyncExecutionThread.forget());
-  }
-
-  rv = asyncThread->Dispatch(closeEvent, NS_DISPATCH_NORMAL);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Connection::AsyncClone(bool aReadOnly,
-                       mozIStorageCompletionCallback *aCallback)
-{
-  PROFILER_LABEL("mozStorageConnection", "AsyncClone",
-    js::ProfileEntry::Category::STORAGE);
-
-  if (!NS_IsMainThread()) {
-    return NS_ERROR_NOT_SAME_THREAD;
-  }
-  if (!mDBConn)
-    return NS_ERROR_NOT_INITIALIZED;
-  if (!mDatabaseFile)
-    return NS_ERROR_UNEXPECTED;
-
-  int flags = mFlags;
-  if (aReadOnly) {
-    // Turn off SQLITE_OPEN_READWRITE, and set SQLITE_OPEN_READONLY.
-    flags = (~SQLITE_OPEN_READWRITE & flags) | SQLITE_OPEN_READONLY;
-    // Turn off SQLITE_OPEN_CREATE.
-    flags = (~SQLITE_OPEN_CREATE & flags);
-  }
-
-  nsRefPtr<Connection> clone = new Connection(mStorageService, flags,
-                                              mAsyncOnly);
-
-  nsRefPtr<AsyncInitializeClone> initEvent =
-    new AsyncInitializeClone(this, clone, aReadOnly, aCallback);
-  nsCOMPtr<nsIEventTarget> target = clone->getAsyncExecutionTarget();
-  if (!target) {
-    return NS_ERROR_UNEXPECTED;
-  }
-  return target->Dispatch(initEvent, NS_DISPATCH_NORMAL);
-}
-
-nsresult
-Connection::initializeClone(Connection* aClone, bool aReadOnly)
-{
-  nsresult rv = mFileURL ? aClone->initialize(mFileURL)
-                         : aClone->initialize(mDatabaseFile);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  // Copy over pragmas from the original connection.
-  static const char * pragmas[] = {
-    "cache_size",
-    "temp_store",
-    "foreign_keys",
-    "journal_size_limit",
-    "synchronous",
-    "wal_autocheckpoint",
-    "busy_timeout"
-  };
-  for (uint32_t i = 0; i < ArrayLength(pragmas); ++i) {
-    // Read-only connections just need cache_size and temp_store pragmas.
-    if (aReadOnly && ::strcmp(pragmas[i], "cache_size") != 0 &&
-                     ::strcmp(pragmas[i], "temp_store") != 0) {
-      continue;
-    }
-
-    nsAutoCString pragmaQuery("PRAGMA ");
-    pragmaQuery.Append(pragmas[i]);
-    nsCOMPtr<mozIStorageStatement> stmt;
-    rv = CreateStatement(pragmaQuery, getter_AddRefs(stmt));
-    MOZ_ASSERT(NS_SUCCEEDED(rv));
-    bool hasResult = false;
-    if (stmt && NS_SUCCEEDED(stmt->ExecuteStep(&hasResult)) && hasResult) {
-      pragmaQuery.AppendLiteral(" = ");
-      pragmaQuery.AppendInt(stmt->AsInt32(0));
-      rv = aClone->ExecuteSimpleSQL(pragmaQuery);
-      MOZ_ASSERT(NS_SUCCEEDED(rv));
-    }
-  }
-
-  // Copy any functions that have been added to this connection.
-  SQLiteMutexAutoLock lockedScope(sharedDBMutex);
-  (void)mFunctions.EnumerateRead(copyFunctionEnumerator, aClone);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Connection::Clone(bool aReadOnly,
-                  mozIStorageConnection **_connection)
-{
-  MOZ_ASSERT(threadOpenedOn == NS_GetCurrentThread());
-
-  PROFILER_LABEL("mozStorageConnection", "Clone",
-    js::ProfileEntry::Category::STORAGE);
-
-  if (!mDBConn)
-    return NS_ERROR_NOT_INITIALIZED;
-  if (!mDatabaseFile)
-    return NS_ERROR_UNEXPECTED;
-
-  int flags = mFlags;
-  if (aReadOnly) {
-    // Turn off SQLITE_OPEN_READWRITE, and set SQLITE_OPEN_READONLY.
-    flags = (~SQLITE_OPEN_READWRITE & flags) | SQLITE_OPEN_READONLY;
-    // Turn off SQLITE_OPEN_CREATE.
-    flags = (~SQLITE_OPEN_CREATE & flags);
-  }
-
-  nsRefPtr<Connection> clone = new Connection(mStorageService, flags,
-                                              mAsyncOnly);
-
-  nsresult rv = initializeClone(clone, aReadOnly);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  NS_IF_ADDREF(*_connection = clone);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Connection::GetDefaultPageSize(int32_t *_defaultPageSize)
-{
-  *_defaultPageSize = Service::getDefaultPageSize();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Connection::GetConnectionReady(bool *_ready)
-{
-  *_ready = connectionReady();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Connection::GetDatabaseFile(nsIFile **_dbFile)
-{
-  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
-
-  NS_IF_ADDREF(*_dbFile = mDatabaseFile);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Connection::GetLastInsertRowID(int64_t *_id)
-{
-  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
-
-  sqlite_int64 id = ::sqlite3_last_insert_rowid(mDBConn);
-  *_id = id;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Connection::GetAffectedRows(int32_t *_rows)
-{
-  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
-
-  *_rows = ::sqlite3_changes(mDBConn);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Connection::GetLastError(int32_t *_error)
-{
-  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
-
-  *_error = ::sqlite3_errcode(mDBConn);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Connection::GetLastErrorString(nsACString &_errorString)
-{
-  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
-
-  const char *serr = ::sqlite3_errmsg(mDBConn);
-  _errorString.Assign(serr);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Connection::GetSchemaVersion(int32_t *_version)
-{
-  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
-
-  nsCOMPtr<mozIStorageStatement> stmt;
-  (void)CreateStatement(NS_LITERAL_CSTRING("PRAGMA user_version"),
-                        getter_AddRefs(stmt));
-  NS_ENSURE_TRUE(stmt, NS_ERROR_OUT_OF_MEMORY);
-
-  *_version = 0;
-  bool hasResult;
-  if (NS_SUCCEEDED(stmt->ExecuteStep(&hasResult)) && hasResult)
-    *_version = stmt->AsInt32(0);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Connection::SetSchemaVersion(int32_t aVersion)
-{
-  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
-
-  nsAutoCString stmt(NS_LITERAL_CSTRING("PRAGMA user_version = "));
-  stmt.AppendInt(aVersion);
-
-  return ExecuteSimpleSQL(stmt);
-}
-
-NS_IMETHODIMP
-Connection::CreateStatement(const nsACString &aSQLStatement,
-                            mozIStorageStatement **_stmt)
-{
-  NS_ENSURE_ARG_POINTER(_stmt);
-  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
-
-  nsRefPtr<Statement> statement(new Statement());
-  NS_ENSURE_TRUE(statement, NS_ERROR_OUT_OF_MEMORY);
-
-  nsresult rv = statement->initialize(this, mDBConn, aSQLStatement);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  Statement *rawPtr;
-  statement.forget(&rawPtr);
-  *_stmt = rawPtr;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Connection::CreateAsyncStatement(const nsACString &aSQLStatement,
-                                 mozIStorageAsyncStatement **_stmt)
-{
-  NS_ENSURE_ARG_POINTER(_stmt);
-  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
-
-  nsRefPtr<AsyncStatement> statement(new AsyncStatement());
-  NS_ENSURE_TRUE(statement, NS_ERROR_OUT_OF_MEMORY);
-
-  nsresult rv = statement->initialize(this, mDBConn, aSQLStatement);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  AsyncStatement *rawPtr;
-  statement.forget(&rawPtr);
-  *_stmt = rawPtr;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Connection::ExecuteSimpleSQL(const nsACString &aSQLStatement)
-{
-  CHECK_MAINTHREAD_ABUSE();
-  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
-
-  int srv = executeSql(mDBConn, PromiseFlatCString(aSQLStatement).get());
-  return convertResultCode(srv);
-}
-
-NS_IMETHODIMP
-Connection::ExecuteAsync(mozIStorageBaseStatement **aStatements,
-                         uint32_t aNumStatements,
-                         mozIStorageStatementCallback *aCallback,
-                         mozIStoragePendingStatement **_handle)
-{
-  nsTArray<StatementData> stmts(aNumStatements);
-  for (uint32_t i = 0; i < aNumStatements; i++) {
-    nsCOMPtr<StorageBaseStatementInternal> stmt = 
-      do_QueryInterface(aStatements[i]);
-
-    // Obtain our StatementData.
-    StatementData data;
-    nsresult rv = stmt->getAsynchronousStatementData(data);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    NS_ASSERTION(stmt->getOwner() == this,
-                 "Statement must be from this database connection!");
-
-    // Now append it to our array.
-    NS_ENSURE_TRUE(stmts.AppendElement(data), NS_ERROR_OUT_OF_MEMORY);
-  }
-
-  // Dispatch to the background
-  return AsyncExecuteStatements::execute(stmts, this, mDBConn, aCallback,
-                                         _handle);
-}
-
-NS_IMETHODIMP
-Connection::ExecuteSimpleSQLAsync(const nsACString &aSQLStatement,
-                                  mozIStorageStatementCallback *aCallback,
-                                  mozIStoragePendingStatement **_handle)
-{
-  if (!NS_IsMainThread()) {
-    return NS_ERROR_NOT_SAME_THREAD;
-  }
-
-  nsCOMPtr<mozIStorageAsyncStatement> stmt;
-  nsresult rv = CreateAsyncStatement(aSQLStatement, getter_AddRefs(stmt));
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  nsCOMPtr<mozIStoragePendingStatement> pendingStatement;
-  rv = stmt->ExecuteAsync(aCallback, getter_AddRefs(pendingStatement));
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  NS_ADDREF(*_handle = pendingStatement);
-  return rv;
-}
-
-NS_IMETHODIMP
-Connection::TableExists(const nsACString &aTableName,
-                        bool *_exists)
-{
-    return databaseElementExists(TABLE, aTableName, _exists);
-}
-
-NS_IMETHODIMP
-Connection::IndexExists(const nsACString &aIndexName,
-                        bool* _exists)
-{
-    return databaseElementExists(INDEX, aIndexName, _exists);
-}
-
-NS_IMETHODIMP
-Connection::GetTransactionInProgress(bool *_inProgress)
-{
-  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
-
-  SQLiteMutexAutoLock lockedScope(sharedDBMutex);
-  *_inProgress = mTransactionInProgress;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Connection::BeginTransaction()
-{
-  return BeginTransactionAs(mozIStorageConnection::TRANSACTION_DEFERRED);
-}
-
-NS_IMETHODIMP
-Connection::BeginTransactionAs(int32_t aTransactionType)
-{
-  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
-
-  return beginTransactionInternal(mDBConn, aTransactionType);
-}
-
-nsresult
-Connection::beginTransactionInternal(sqlite3 *aNativeConnection,
-                                     int32_t aTransactionType)
-{
-  SQLiteMutexAutoLock lockedScope(sharedDBMutex);
-  if (mTransactionInProgress)
-    return NS_ERROR_FAILURE;
-  nsresult rv;
-  switch(aTransactionType) {
-    case TRANSACTION_DEFERRED:
-      rv = convertResultCode(executeSql(aNativeConnection, "BEGIN DEFERRED"));
-      break;
-    case TRANSACTION_IMMEDIATE:
-      rv = convertResultCode(executeSql(aNativeConnection, "BEGIN IMMEDIATE"));
-      break;
-    case TRANSACTION_EXCLUSIVE:
-      rv = convertResultCode(executeSql(aNativeConnection, "BEGIN EXCLUSIVE"));
-      break;
-    default:
-      return NS_ERROR_ILLEGAL_VALUE;
-  }
-  if (NS_SUCCEEDED(rv))
-    mTransactionInProgress = true;
-  return rv;
-}
-
-NS_IMETHODIMP
-Connection::CommitTransaction()
-{
-  if (!mDBConn)
-    return NS_ERROR_NOT_INITIALIZED;
-
-  return commitTransactionInternal(mDBConn);
-}
-
-nsresult
-Connection::commitTransactionInternal(sqlite3 *aNativeConnection)
-{
-  SQLiteMutexAutoLock lockedScope(sharedDBMutex);
-  if (!mTransactionInProgress)
-    return NS_ERROR_UNEXPECTED;
-  nsresult rv =
-    convertResultCode(executeSql(aNativeConnection, "COMMIT TRANSACTION"));
-  if (NS_SUCCEEDED(rv))
-    mTransactionInProgress = false;
-  return rv;
-}
-
-NS_IMETHODIMP
-Connection::RollbackTransaction()
-{
-  if (!mDBConn)
-    return NS_ERROR_NOT_INITIALIZED;
-
-  return rollbackTransactionInternal(mDBConn);
-}
-
-nsresult
-Connection::rollbackTransactionInternal(sqlite3 *aNativeConnection)
-{
-  SQLiteMutexAutoLock lockedScope(sharedDBMutex);
-  if (!mTransactionInProgress)
-    return NS_ERROR_UNEXPECTED;
-
-  nsresult rv =
-    convertResultCode(executeSql(aNativeConnection, "ROLLBACK TRANSACTION"));
-  if (NS_SUCCEEDED(rv))
-    mTransactionInProgress = false;
-  return rv;
-}
-
-NS_IMETHODIMP
-Connection::CreateTable(const char *aTableName,
-                        const char *aTableSchema)
-{
-  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
-
-  char *buf = ::PR_smprintf("CREATE TABLE %s (%s)", aTableName, aTableSchema);
-  if (!buf)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  int srv = executeSql(mDBConn, buf);
-  ::PR_smprintf_free(buf);
-
-  return convertResultCode(srv);
-}
-
-NS_IMETHODIMP
-Connection::CreateFunction(const nsACString &aFunctionName,
-                           int32_t aNumArguments,
-                           mozIStorageFunction *aFunction)
-{
-  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
-
-  // Check to see if this function is already defined.  We only check the name
-  // because a function can be defined with the same body but different names.
-  SQLiteMutexAutoLock lockedScope(sharedDBMutex);
-  NS_ENSURE_FALSE(mFunctions.Get(aFunctionName, nullptr), NS_ERROR_FAILURE);
-
-  int srv = ::sqlite3_create_function(mDBConn,
-                                      nsPromiseFlatCString(aFunctionName).get(),
-                                      aNumArguments,
-                                      SQLITE_ANY,
-                                      aFunction,
-                                      basicFunctionHelper,
-                                      nullptr,
-                                      nullptr);
-  if (srv != SQLITE_OK)
-    return convertResultCode(srv);
-
-  FunctionInfo info = { aFunction,
-                        Connection::FunctionInfo::SIMPLE,
-                        aNumArguments };
-  mFunctions.Put(aFunctionName, info);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Connection::CreateAggregateFunction(const nsACString &aFunctionName,
-                                    int32_t aNumArguments,
-                                    mozIStorageAggregateFunction *aFunction)
-{
-  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
-
-  // Check to see if this function name is already defined.
-  SQLiteMutexAutoLock lockedScope(sharedDBMutex);
-  NS_ENSURE_FALSE(mFunctions.Get(aFunctionName, nullptr), NS_ERROR_FAILURE);
-
-  // Because aggregate functions depend on state across calls, you cannot have
-  // the same instance use the same name.  We want to enumerate all functions
-  // and make sure this instance is not already registered.
-  NS_ENSURE_FALSE(findFunctionByInstance(aFunction), NS_ERROR_FAILURE);
-
-  int srv = ::sqlite3_create_function(mDBConn,
-                                      nsPromiseFlatCString(aFunctionName).get(),
-                                      aNumArguments,
-                                      SQLITE_ANY,
-                                      aFunction,
-                                      nullptr,
-                                      aggregateFunctionStepHelper,
-                                      aggregateFunctionFinalHelper);
-  if (srv != SQLITE_OK)
-    return convertResultCode(srv);
-
-  FunctionInfo info = { aFunction,
-                        Connection::FunctionInfo::AGGREGATE,
-                        aNumArguments };
-  mFunctions.Put(aFunctionName, info);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Connection::RemoveFunction(const nsACString &aFunctionName)
-{
-  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
-
-  SQLiteMutexAutoLock lockedScope(sharedDBMutex);
-  NS_ENSURE_TRUE(mFunctions.Get(aFunctionName, nullptr), NS_ERROR_FAILURE);
-
-  int srv = ::sqlite3_create_function(mDBConn,
-                                      nsPromiseFlatCString(aFunctionName).get(),
-                                      0,
-                                      SQLITE_ANY,
-                                      nullptr,
-                                      nullptr,
-                                      nullptr,
-                                      nullptr);
-  if (srv != SQLITE_OK)
-    return convertResultCode(srv);
-
-  mFunctions.Remove(aFunctionName);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Connection::SetProgressHandler(int32_t aGranularity,
-                               mozIStorageProgressHandler *aHandler,
-                               mozIStorageProgressHandler **_oldHandler)
-{
-  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
-
-  // Return previous one
-  SQLiteMutexAutoLock lockedScope(sharedDBMutex);
-  NS_IF_ADDREF(*_oldHandler = mProgressHandler);
-
-  if (!aHandler || aGranularity <= 0) {
-    aHandler = nullptr;
-    aGranularity = 0;
-  }
-  mProgressHandler = aHandler;
-  ::sqlite3_progress_handler(mDBConn, aGranularity, sProgressHelper, this);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Connection::RemoveProgressHandler(mozIStorageProgressHandler **_oldHandler)
-{
-  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
-
-  // Return previous one
-  SQLiteMutexAutoLock lockedScope(sharedDBMutex);
-  NS_IF_ADDREF(*_oldHandler = mProgressHandler);
-
-  mProgressHandler = nullptr;
-  ::sqlite3_progress_handler(mDBConn, 0, nullptr, nullptr);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Connection::SetGrowthIncrement(int32_t aChunkSize, const nsACString &aDatabaseName)
-{
-  // Bug 597215: Disk space is extremely limited on Android
-  // so don't preallocate space. This is also not effective
-  // on log structured file systems used by Android devices
-#if !defined(ANDROID) && !defined(MOZ_PLATFORM_MAEMO)
-  // Don't preallocate if less than 500MiB is available.
-  int64_t bytesAvailable;
-  nsresult rv = mDatabaseFile->GetDiskSpaceAvailable(&bytesAvailable);
-  NS_ENSURE_SUCCESS(rv, rv);
-  if (bytesAvailable < MIN_AVAILABLE_BYTES_PER_CHUNKED_GROWTH) {
-    return NS_ERROR_FILE_TOO_BIG;
-  }
-
-  (void)::sqlite3_file_control(mDBConn,
-                               aDatabaseName.Length() ? nsPromiseFlatCString(aDatabaseName).get()
-                                                      : nullptr,
-                               SQLITE_FCNTL_CHUNK_SIZE,
-                               &aChunkSize);
-#endif
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Connection::EnableModule(const nsACString& aModuleName)
-{
-  if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
-
-  for (size_t i = 0; i < ArrayLength(gModules); i++) {
-    struct Module* m = &gModules[i];
-    if (aModuleName.Equals(m->name)) {
-      int srv = m->registerFunc(mDBConn, m->name);
-      if (srv != SQLITE_OK)
-        return convertResultCode(srv);
-
-      return NS_OK;
-    }
-  }
-
-  return NS_ERROR_FAILURE;
-}
-
-} // namespace storage
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageConnection.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageConnection.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageConnection.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageConnection.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,408 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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_storage_Connection_h
-#define mozilla_storage_Connection_h
-
-#include "nsAutoPtr.h"
-#include "nsCOMPtr.h"
-#include "mozilla/Mutex.h"
-#include "nsProxyRelease.h"
-#include "nsThreadUtils.h"
-#include "nsIInterfaceRequestor.h"
-
-#include "nsDataHashtable.h"
-#include "mozIStorageProgressHandler.h"
-#include "SQLiteMutex.h"
-#include "mozIStorageConnection.h"
-#include "mozStorageService.h"
-#include "mozIStorageAsyncConnection.h"
-#include "mozIStorageCompletionCallback.h"
-
-#include "nsIMutableArray.h"
-#include "mozilla/Attributes.h"
-
-#include "sqlite3.h"
-
-class nsIFile;
-class nsIFileURL;
-class nsIEventTarget;
-class nsIThread;
-
-namespace mozilla {
-namespace storage {
-
-class Connection final : public mozIStorageConnection
-                       , public nsIInterfaceRequestor
-{
-public:
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_MOZISTORAGEASYNCCONNECTION
-  NS_DECL_MOZISTORAGECONNECTION
-  NS_DECL_NSIINTERFACEREQUESTOR
-
-  /**
-   * Structure used to describe user functions on the database connection.
-   */
-  struct FunctionInfo {
-    enum FunctionType {
-      SIMPLE,
-      AGGREGATE
-    };
-
-    nsCOMPtr<nsISupports> function;
-    FunctionType type;
-    int32_t numArgs;
-  };
-
-  /**
-   * @param aService
-   *        Pointer to the storage service.  Held onto for the lifetime of the
-   *        connection.
-   * @param aFlags
-   *        The flags to pass to sqlite3_open_v2.
-   * @param aAsyncOnly
-   *        If |true|, the Connection only implements asynchronous interface:
-   *        - |mozIStorageAsyncConnection|;
-   *        If |false|, the result also implements synchronous interface:
-   *        - |mozIStorageConnection|.
-   */
-  Connection(Service *aService, int aFlags, bool aAsyncOnly);
-
-  /**
-   * Creates the connection to an in-memory database.
-   */
-  nsresult initialize();
-
-  /**
-   * Creates the connection to the database.
-   *
-   * @param aDatabaseFile
-   *        The nsIFile of the location of the database to open, or create if it
-   *        does not exist.
-   */
-  nsresult initialize(nsIFile *aDatabaseFile);
-
-  /**
-   * Creates the connection to the database.
-   *
-   * @param aFileURL
-   *        The nsIFileURL of the location of the database to open, or create if it
-   *        does not exist.
-   */
-  nsresult initialize(nsIFileURL *aFileURL);
-
-  /**
-   * Fetches runtime status information for this connection.
-   *
-   * @param aStatusOption One of the SQLITE_DBSTATUS options defined at
-   *        http://www.sqlite.org/c3ref/c_dbstatus_options.html
-   * @param [optional] aMaxValue if provided, will be set to the highest
-   *        istantaneous value.
-   * @return the current value for the specified option.
-   */
-  int32_t getSqliteRuntimeStatus(int32_t aStatusOption,
-                                 int32_t* aMaxValue=nullptr);
-  /**
-   * Registers/unregisters a commit hook callback.
-   *
-   * @param aCallbackFn a callback function to be invoked on transactions
-   *        commit.  Pass nullptr to unregister the current callback.
-   * @param [optional] aData if provided, will be passed to the callback.
-   * @see http://sqlite.org/c3ref/commit_hook.html
-   */
-  void setCommitHook(int (*aCallbackFn)(void *) , void *aData=nullptr) {
-    MOZ_ASSERT(mDBConn, "A connection must exist at this point");
-    ::sqlite3_commit_hook(mDBConn, aCallbackFn, aData);
-  };
-
-  /**
-   * Gets autocommit status.
-   */
-  bool getAutocommit() {
-    return mDBConn && static_cast<bool>(::sqlite3_get_autocommit(mDBConn));
-  };
-
-  /**
-   * Lazily creates and returns a background execution thread.  In the future,
-   * the thread may be re-claimed if left idle, so you should call this
-   * method just before you dispatch and not save the reference.
-   *
-   * @returns an event target suitable for asynchronous statement execution.
-   */
-  nsIEventTarget *getAsyncExecutionTarget();
-
-  /**
-   * Mutex used by asynchronous statements to protect state.  The mutex is
-   * declared on the connection object because there is no contention between
-   * asynchronous statements (they are serialized on mAsyncExecutionThread).
-   * Currently protects:
-   *  - Connection.mAsyncExecutionThreadShuttingDown
-   *  - Connection.mAsyncExecutionThread
-   *  - Connection.mConnectionClosed
-   *  - AsyncExecuteStatements.mCancelRequested
-   */
-  Mutex sharedAsyncExecutionMutex;
-
-  /**
-   * Wraps the mutex that SQLite gives us from sqlite3_db_mutex.  This is public
-   * because we already expose the sqlite3* native connection and proper
-   * operation of the deadlock detector requires everyone to use the same single
-   * SQLiteMutex instance for correctness.
-   */
-  SQLiteMutex sharedDBMutex;
-
-  /**
-   * References the thread this database was opened on.  This MUST be thread it is
-   * closed on.
-   */
-  const nsCOMPtr<nsIThread> threadOpenedOn;
-
-  /**
-   * Closes the SQLite database, and warns about any non-finalized statements.
-   */
-  nsresult internalClose(sqlite3 *aDBConn);
-
-  /**
-   * Shuts down the passed-in async thread.
-   */
-  void shutdownAsyncThread(nsIThread *aAsyncThread);
-
-  /**
-   * Obtains the filename of the connection.  Useful for logging.
-   */
-  nsCString getFilename();
-
-  /**
-   * Creates an sqlite3 prepared statement object from an SQL string.
-   *
-   * @param aNativeConnection
-   *        The underlying Sqlite connection to prepare the statement with.
-   * @param aSQL
-   *        The SQL statement string to compile.
-   * @param _stmt
-   *        New sqlite3_stmt object.
-   * @return the result from sqlite3_prepare_v2.
-   */
-  int prepareStatement(sqlite3* aNativeConnection,
-                       const nsCString &aSQL, sqlite3_stmt **_stmt);
-
-  /**
-   * Performs a sqlite3_step on aStatement, while properly handling SQLITE_LOCKED
-   * when not on the main thread by waiting until we are notified.
-   *
-   * @param aNativeConnection
-   *        The underlying Sqlite connection to step the statement with.
-   * @param aStatement
-   *        A pointer to a sqlite3_stmt object.
-   * @return the result from sqlite3_step.
-   */
-  int stepStatement(sqlite3* aNativeConnection, sqlite3_stmt* aStatement);
-
-  /**
-   * Raw connection transaction management.
-   *
-   * @see BeginTransactionAs, CommitTransaction, RollbackTransaction.
-   */
-  nsresult beginTransactionInternal(sqlite3 *aNativeConnection,
-                                    int32_t aTransactionType=TRANSACTION_DEFERRED);
-  nsresult commitTransactionInternal(sqlite3 *aNativeConnection);
-  nsresult rollbackTransactionInternal(sqlite3 *aNativeConnection);
-
-  bool connectionReady();
-
-  /**
-   * True if this connection is shutting down but not yet closed.
-   */
-  bool isClosing();
-
-  /**
-   * True if the underlying connection is closed.
-   * Any sqlite resources may be lost when this returns true, so nothing should
-   * try to use them.
-   */
-  bool isClosed();
-
-  nsresult initializeClone(Connection *aClone, bool aReadOnly);
-
-private:
-  ~Connection();
-  nsresult initializeInternal(nsIFile *aDatabaseFile);
-
-  /**
-   * Sets the database into a closed state so no further actions can be
-   * performed.
-   *
-   * @note mDBConn is set to nullptr in this method.
-   */
-  nsresult setClosedState();
-
-  /**
-   * Helper for calls to sqlite3_exec. Reports long delays to Telemetry.
-   *
-   * @param aNativeConnection
-   *        The underlying Sqlite connection to execute the query with.
-   * @param aSqlString
-   *        SQL string to execute
-   * @return the result from sqlite3_exec.
-   */
-  int executeSql(sqlite3 *aNativeConnection, const char *aSqlString);
-
-  /**
-   * Describes a certain primitive type in the database.
-   *
-   * Possible Values Are:
-   *  INDEX - To check for the existence of an index
-   *  TABLE - To check for the existence of a table
-   */
-  enum DatabaseElementType {
-    INDEX,
-    TABLE
-  };
-
-  /**
-   * Determines if the specified primitive exists.
-   *
-   * @param aElementType
-   *        The type of element to check the existence of
-   * @param aElementName
-   *        The name of the element to check for
-   * @returns true if element exists, false otherwise
-   */
-  nsresult databaseElementExists(enum DatabaseElementType aElementType,
-                                 const nsACString& aElementName,
-                                 bool *_exists);
-
-  bool findFunctionByInstance(nsISupports *aInstance);
-
-  static int sProgressHelper(void *aArg);
-  // Generic progress handler
-  // Dispatch call to registered progress handler,
-  // if there is one. Do nothing in other cases.
-  int progressHandler();
-
-  sqlite3 *mDBConn;
-  nsCOMPtr<nsIFileURL> mFileURL;
-  nsCOMPtr<nsIFile> mDatabaseFile;
-
-  /**
-   * Lazily created thread for asynchronous statement execution.  Consumers
-   * should use getAsyncExecutionTarget rather than directly accessing this
-   * field.
-   */
-  nsCOMPtr<nsIThread> mAsyncExecutionThread;
-
-  /**
-   * Set to true by Close() or AsyncClose() prior to shutdown.
-   *
-   * If false, we guarantee both that the underlying sqlite3 database
-   * connection is still open and that getAsyncExecutionTarget() can
-   * return a thread. Once true, either the sqlite3 database
-   * connection is being shutdown or it has been
-   * shutdown. Additionally, once true, getAsyncExecutionTarget()
-   * returns null.
-   *
-   * This variable should be accessed while holding the
-   * sharedAsyncExecutionMutex.
-   */
-  bool mAsyncExecutionThreadShuttingDown;
-
-  /**
-   * Tracks whether the async thread has been initialized and Shutdown() has
-   * not yet been invoked on it.
-   */
-  DebugOnly<bool> mAsyncExecutionThreadIsAlive;
-
-  /**
-   * Set to true just prior to calling sqlite3_close on the
-   * connection.
-   *
-   * This variable should be accessed while holding the
-   * sharedAsyncExecutionMutex.
-   */
-  bool mConnectionClosed;
-
-  /**
-   * Tracks if we have a transaction in progress or not.  Access protected by
-   * sharedDBMutex.
-   */
-  bool mTransactionInProgress;
-
-  /**
-   * Stores the mapping of a given function by name to its instance.  Access is
-   * protected by sharedDBMutex.
-   */
-  nsDataHashtable<nsCStringHashKey, FunctionInfo> mFunctions;
-
-  /**
-   * Stores the registered progress handler for the database connection.  Access
-   * is protected by sharedDBMutex.
-   */
-  nsCOMPtr<mozIStorageProgressHandler> mProgressHandler;
-
-  /**
-   * Stores the flags we passed to sqlite3_open_v2.
-   */
-  const int mFlags;
-
-  // This is here for two reasons: 1) It's used to make sure that the
-  // connections do not outlive the service.  2) Our custom collating functions
-  // call its localeCompareStrings() method.
-  nsRefPtr<Service> mStorageService;
-
-  /**
-   * If |false|, this instance supports synchronous operations
-   * and it can be cast to |mozIStorageConnection|.
-   */
-  const bool mAsyncOnly;
-};
-
-
-/**
- * A Runnable designed to call a mozIStorageCompletionCallback on
- * the appropriate thread.
- */
-class CallbackComplete final : public nsRunnable
-{
-public:
-  /**
-   * @param aValue The result to pass to the callback. It must
-   *               already be owned by the main thread.
-   * @param aCallback The callback. It must already be owned by the
-   *                  main thread.
-   */
-  CallbackComplete(nsresult aStatus,
-                   nsISupports* aValue,
-                   already_AddRefed<mozIStorageCompletionCallback> aCallback)
-    : mStatus(aStatus)
-    , mValue(aValue)
-    , mCallback(aCallback)
-  {
-  }
-
-  NS_IMETHOD Run() {
-    MOZ_ASSERT(NS_IsMainThread());
-    nsresult rv = mCallback->Complete(mStatus, mValue);
-
-    // Ensure that we release on the main thread
-    mValue = nullptr;
-    mCallback = nullptr;
-    return rv;
-  }
-
-private:
-  nsresult mStatus;
-  nsCOMPtr<nsISupports> mValue;
-  // This is a nsRefPtr<T> and not a nsCOMPtr<T> because
-  // nsCOMP<T> would cause an off-main thread QI, which
-  // is not a good idea (and crashes XPConnect).
-  nsRefPtr<mozIStorageCompletionCallback> mCallback;
-};
-
-} // namespace storage
-} // namespace mozilla
-
-#endif // mozilla_storage_Connection_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageError.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageError.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageError.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageError.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 "mozStorageError.h"
-
-namespace mozilla {
-namespace storage {
-
-////////////////////////////////////////////////////////////////////////////////
-//// Error
-
-Error::Error(int aResult,
-             const char *aMessage)
-: mResult(aResult)
-, mMessage(aMessage)
-{
-}
-
-/**
- * Note:  This object is only ever accessed on one thread at a time.  It it not
- *        threadsafe, but it does need threadsafe AddRef and Release.
- */
-NS_IMPL_ISUPPORTS(
-  Error,
-  mozIStorageError
-)
-
-////////////////////////////////////////////////////////////////////////////////
-//// mozIStorageError
-
-NS_IMETHODIMP
-Error::GetResult(int32_t *_result)
-{
-  *_result = mResult;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Error::GetMessage(nsACString &_message)
-{
-  _message = mMessage;
-  return NS_OK;
-}
-
-} // namespace storage
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageError.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageError.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageError.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageError.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 mozStorageError_h
-#define mozStorageError_h
-
-#include "mozIStorageError.h"
-#include "nsString.h"
-#include "mozilla/Attributes.h"
-
-namespace mozilla {
-namespace storage {
-
-class Error final : public mozIStorageError
-{
-public:
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_MOZISTORAGEERROR
-
-  Error(int aResult, const char *aMessage);
-
-private:
-  ~Error() {}
-
-  int mResult;
-  nsCString mMessage;
-};
-
-} // namespace stoarge
-} // namespace mozilla
-
-#endif // mozStorageError_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStoragePrivateHelpers.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStoragePrivateHelpers.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStoragePrivateHelpers.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStoragePrivateHelpers.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,272 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 "sqlite3.h"
-
-#include "jsfriendapi.h"
-
-#include "nsPrintfCString.h"
-#include "nsString.h"
-#include "nsError.h"
-#include "mozilla/Mutex.h"
-#include "mozilla/CondVar.h"
-#include "nsQueryObject.h"
-#include "nsThreadUtils.h"
-#include "nsJSUtils.h"
-
-#include "Variant.h"
-#include "mozStoragePrivateHelpers.h"
-#include "mozIStorageStatement.h"
-#include "mozIStorageCompletionCallback.h"
-#include "mozIStorageBindingParams.h"
-
-#include "prlog.h"
-#ifdef PR_LOGGING
-extern PRLogModuleInfo* gStorageLog;
-#endif
-
-namespace mozilla {
-namespace storage {
-
-nsresult
-convertResultCode(int aSQLiteResultCode)
-{
-  // Drop off the extended result bits of the result code.
-  int rc = aSQLiteResultCode & 0xFF;
-
-  switch (rc) {
-    case SQLITE_OK:
-    case SQLITE_ROW:
-    case SQLITE_DONE:
-      return NS_OK;
-    case SQLITE_CORRUPT:
-    case SQLITE_NOTADB:
-      return NS_ERROR_FILE_CORRUPTED;
-    case SQLITE_PERM:
-    case SQLITE_CANTOPEN:
-      return NS_ERROR_FILE_ACCESS_DENIED;
-    case SQLITE_BUSY:
-      return NS_ERROR_STORAGE_BUSY;
-    case SQLITE_LOCKED:
-      return NS_ERROR_FILE_IS_LOCKED;
-    case SQLITE_READONLY:
-      return NS_ERROR_FILE_READ_ONLY;
-    case SQLITE_IOERR:
-      return NS_ERROR_STORAGE_IOERR;
-    case SQLITE_FULL:
-    case SQLITE_TOOBIG:
-      return NS_ERROR_FILE_NO_DEVICE_SPACE;
-    case SQLITE_NOMEM:
-      return NS_ERROR_OUT_OF_MEMORY;
-    case SQLITE_MISUSE:
-      return NS_ERROR_UNEXPECTED;
-    case SQLITE_ABORT:
-    case SQLITE_INTERRUPT:
-      return NS_ERROR_ABORT;
-    case SQLITE_CONSTRAINT:
-      return NS_ERROR_STORAGE_CONSTRAINT;
-  }
-
-  // generic error
-#ifdef DEBUG
-  nsAutoCString message;
-  message.AppendLiteral("SQLite returned error code ");
-  message.AppendInt(rc);
-  message.AppendLiteral(" , Storage will convert it to NS_ERROR_FAILURE");
-  NS_WARN_IF_FALSE(rc == SQLITE_ERROR, message.get());
-#endif
-  return NS_ERROR_FAILURE;
-}
-
-void
-checkAndLogStatementPerformance(sqlite3_stmt *aStatement)
-{
-  // Check to see if the query performed sorting operations or not.  If it
-  // did, it may need to be optimized!
-  int count = ::sqlite3_stmt_status(aStatement, SQLITE_STMTSTATUS_SORT, 1);
-  if (count <= 0)
-    return;
-
-  const char *sql = ::sqlite3_sql(aStatement);
-
-  // Check to see if this is marked to not warn
-  if (::strstr(sql, "/* do not warn (bug "))
-    return;
-
-  nsAutoCString message("Suboptimal indexes for the SQL statement ");
-#ifdef MOZ_STORAGE_SORTWARNING_SQL_DUMP
-  message.Append('`');
-  message.Append(sql);
-  message.AppendLiteral("` [");
-  message.AppendInt(count);
-  message.AppendLiteral(" sort operation(s)]");
-#else
-  nsPrintfCString address("0x%p", aStatement);
-  message.Append(address);
-#endif
-  message.AppendLiteral(" (http://mzl.la/1FuID0j).");
-  NS_WARNING(message.get());
-}
-
-nsIVariant *
-convertJSValToVariant(
-  JSContext *aCtx,
-  JS::Value aValue)
-{
-  if (aValue.isInt32())
-    return new IntegerVariant(aValue.toInt32());
-
-  if (aValue.isDouble())
-    return new FloatVariant(aValue.toDouble());
-
-  if (aValue.isString()) {
-    nsAutoJSString value;
-    if (!value.init(aCtx, aValue.toString()))
-        return nullptr;
-    return new TextVariant(value);
-  }
-
-  if (aValue.isBoolean())
-    return new IntegerVariant(aValue.isTrue() ? 1 : 0);
-
-  if (aValue.isNull())
-    return new NullVariant();
-
-  if (aValue.isObject()) {
-    JS::Rooted<JSObject*> obj(aCtx, &aValue.toObject());
-    // We only support Date instances, all others fail.
-    if (!js::DateIsValid(aCtx, obj))
-      return nullptr;
-
-    double msecd = js::DateGetMsecSinceEpoch(aCtx, obj);
-    msecd *= 1000.0;
-    int64_t msec = msecd;
-
-    return new IntegerVariant(msec);
-  }
-
-  return nullptr;
-}
-
-Variant_base *
-convertVariantToStorageVariant(nsIVariant* aVariant)
-{
-  nsRefPtr<Variant_base> variant = do_QueryObject(aVariant);
-  if (variant) {
-    // JS helpers already convert the JS representation to a Storage Variant,
-    // in such a case there's nothing left to do here, so just pass-through.
-    return variant;
-  }
-
-  if (!aVariant)
-    return new NullVariant();
-
-  uint16_t dataType;
-  nsresult rv = aVariant->GetDataType(&dataType);
-  NS_ENSURE_SUCCESS(rv, nullptr);
-
-  switch (dataType) {
-    case nsIDataType::VTYPE_BOOL:
-    case nsIDataType::VTYPE_INT8:
-    case nsIDataType::VTYPE_INT16:
-    case nsIDataType::VTYPE_INT32:
-    case nsIDataType::VTYPE_UINT8:
-    case nsIDataType::VTYPE_UINT16:
-    case nsIDataType::VTYPE_UINT32:
-    case nsIDataType::VTYPE_INT64:
-    case nsIDataType::VTYPE_UINT64: {
-      int64_t v;
-      rv = aVariant->GetAsInt64(&v);
-      NS_ENSURE_SUCCESS(rv, nullptr);
-      return new IntegerVariant(v);
-    }
-    case nsIDataType::VTYPE_FLOAT:
-    case nsIDataType::VTYPE_DOUBLE: {
-      double v;
-      rv = aVariant->GetAsDouble(&v);
-      NS_ENSURE_SUCCESS(rv, nullptr);
-      return new FloatVariant(v);
-    }
-    case nsIDataType::VTYPE_CHAR:
-    case nsIDataType::VTYPE_CHAR_STR:
-    case nsIDataType::VTYPE_STRING_SIZE_IS:
-    case nsIDataType::VTYPE_UTF8STRING:
-    case nsIDataType::VTYPE_CSTRING: {
-      nsCString v;
-      rv = aVariant->GetAsAUTF8String(v);
-      NS_ENSURE_SUCCESS(rv, nullptr);
-      return new UTF8TextVariant(v);
-    }
-    case nsIDataType::VTYPE_WCHAR:
-    case nsIDataType::VTYPE_DOMSTRING:
-    case nsIDataType::VTYPE_WCHAR_STR:
-    case nsIDataType::VTYPE_WSTRING_SIZE_IS:
-    case nsIDataType::VTYPE_ASTRING: {
-      nsString v;
-      rv = aVariant->GetAsAString(v);
-      NS_ENSURE_SUCCESS(rv, nullptr);
-      return new TextVariant(v);
-    }
-    case nsIDataType::VTYPE_ARRAY: {
-      uint16_t type;
-      nsIID iid;
-      uint32_t len;
-      void *rawArray;
-      // Note this copies the array data.
-      rv = aVariant->GetAsArray(&type, &iid, &len, &rawArray);
-      NS_ENSURE_SUCCESS(rv, nullptr);
-      if (type == nsIDataType::VTYPE_UINT8) {
-        std::pair<uint8_t *, int> v(static_cast<uint8_t *>(rawArray), len);
-        // Take ownership of the data avoiding a further copy.
-        return new AdoptedBlobVariant(v);
-      }
-    }
-    case nsIDataType::VTYPE_EMPTY:
-    case nsIDataType::VTYPE_EMPTY_ARRAY:
-    case nsIDataType::VTYPE_VOID:
-      return new NullVariant();
-    case nsIDataType::VTYPE_ID:
-    case nsIDataType::VTYPE_INTERFACE:
-    case nsIDataType::VTYPE_INTERFACE_IS:
-    default:
-      NS_WARNING("Unsupported variant type");
-      return nullptr;
-  }
-
-  return nullptr;
-
-}
-
-namespace {
-class CallbackEvent : public nsRunnable
-{
-public:
-  explicit CallbackEvent(mozIStorageCompletionCallback *aCallback)
-  : mCallback(aCallback)
-  {
-  }
-
-  NS_IMETHOD Run()
-  {
-    (void)mCallback->Complete(NS_OK, nullptr);
-    return NS_OK;
-  }
-private:
-  nsCOMPtr<mozIStorageCompletionCallback> mCallback;
-};
-} // anonymous namespace
-already_AddRefed<nsIRunnable>
-newCompletionEvent(mozIStorageCompletionCallback *aCallback)
-{
-  NS_ASSERTION(aCallback, "Passing a null callback is a no-no!");
-  nsCOMPtr<nsIRunnable> event = new CallbackEvent(aCallback);
-  return event.forget();
-}
-
-
-
-} // namespace storage
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStoragePrivateHelpers.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStoragePrivateHelpers.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStoragePrivateHelpers.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStoragePrivateHelpers.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,142 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 mozStoragePrivateHelpers_h
-#define mozStoragePrivateHelpers_h
-
-/**
- * This file contains convenience methods for mozStorage.
- */
-
-#include "sqlite3.h"
-#include "nsIVariant.h"
-#include "nsError.h"
-#include "nsAutoPtr.h"
-#include "js/TypeDecls.h"
-#include "Variant.h"
-
-class mozIStorageCompletionCallback;
-class nsIRunnable;
-
-namespace mozilla {
-namespace storage {
-
-////////////////////////////////////////////////////////////////////////////////
-//// Macros
-
-#define ENSURE_INDEX_VALUE(aIndex, aCount) \
-  NS_ENSURE_TRUE(aIndex < aCount, NS_ERROR_INVALID_ARG)
-
-////////////////////////////////////////////////////////////////////////////////
-//// Functions
-
-/**
- * Converts a SQLite return code to an nsresult return code.
- *
- * @param aSQLiteResultCode
- *        The SQLite return code to convert.
- * @returns the corresponding nsresult code for aSQLiteResultCode.
- */
-nsresult convertResultCode(int aSQLiteResultCode);
-
-/**
- * Checks the performance of a SQLite statement and logs a warning with
- * NS_WARNING.  Currently this only checks the number of sort operations done
- * on a statement, and if more than zero have been done, the statement can be
- * made faster with the careful use of an index.
- *
- * @param aStatement
- *        The sqlite3_stmt object to check.
- */
-void checkAndLogStatementPerformance(sqlite3_stmt *aStatement);
-
-/**
- * Convert the provided JS::Value into a variant representation if possible.
- *
- * @param aCtx
- *        The JSContext the value is from.
- * @param aValue
- *        The JavaScript value to convert.  All primitive types are supported,
- *        but only Date objects are supported from the Date family.  Date
- *        objects are coerced to PRTime (nanoseconds since epoch) values.
- * @return the variant if conversion was successful, nullptr if conversion
- *         failed.  The caller is responsible for addref'ing if non-null.
- */
-nsIVariant *convertJSValToVariant(JSContext *aCtx, JS::Value aValue);
-
-/**
- * Convert a provided nsIVariant implementation to our own thread-safe
- * refcounting implementation, if needed.
- *
- * @param aValue
- *        The original nsIVariant to be converted.
- * @return a thread-safe refcounting nsIVariant implementation.
- */
-Variant_base *convertVariantToStorageVariant(nsIVariant *aVariant);
-
-/**
- * Obtains an event that will notify a completion callback about completion.
- *
- * @param aCallback
- *        The callback to be notified.
- * @return an nsIRunnable that can be dispatched to the calling thread.
- */
-already_AddRefed<nsIRunnable> newCompletionEvent(
-  mozIStorageCompletionCallback *aCallback
-);
-
-/**
- * Utility method to get a Blob as a string value.  The string expects
- * the interface exposed by nsAString/nsACString/etc.
- */
-template<class T, class V>
-nsresult
-DoGetBlobAsString(T* aThis, uint32_t aIndex, V& aValue)
-{
-  typedef typename V::char_type char_type;
-
-  uint32_t size;
-  char_type* blob;
-  nsresult rv =
-    aThis->GetBlob(aIndex, &size, reinterpret_cast<uint8_t**>(&blob));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  aValue.Adopt(blob, size / sizeof(char_type));
-  return NS_OK;
-}
-
-/**
- * Utility method to bind a string value as a Blob.  The string expects
- * the interface exposed by nsAString/nsACString/etc.
- */
-template<class T, class V>
-nsresult
-DoBindStringAsBlobByName(T* aThis, const nsACString& aName, const V& aValue)
-{
-  typedef typename V::char_type char_type;
-  return aThis->BindBlobByName(aName,
-                        reinterpret_cast<const uint8_t*>(aValue.BeginReading()),
-                        aValue.Length() * sizeof(char_type));
-}
-
-/**
- * Utility method to bind a string value as a Blob.  The string expects
- * the interface exposed by nsAString/nsACString/etc.
- */
-template<class T, class V>
-nsresult
-DoBindStringAsBlobByIndex(T* aThis, uint32_t aIndex, const V& aValue)
-{
-  typedef typename V::char_type char_type;
-  return aThis->BindBlobByIndex(aIndex,
-                        reinterpret_cast<const uint8_t*>(aValue.BeginReading()),
-                        aValue.Length() * sizeof(char_type));
-}
-
-} // namespace storage
-} // namespace mozilla
-
-#endif // mozStoragePrivateHelpers_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageResultSet.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageResultSet.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageResultSet.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageResultSet.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 "mozStorageRow.h"
-#include "mozStorageResultSet.h"
-
-namespace mozilla {
-namespace storage {
-
-////////////////////////////////////////////////////////////////////////////////
-//// ResultSet
-
-ResultSet::ResultSet()
-: mCurrentIndex(0)
-{
-}
-
-ResultSet::~ResultSet()
-{
-  mData.Clear();
-}
-
-nsresult
-ResultSet::add(mozIStorageRow *aRow)
-{
-  return mData.AppendObject(aRow) ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
-}
-
-/**
- * Note:  This object is only ever accessed on one thread at a time.  It it not
- *        threadsafe, but it does need threadsafe AddRef and Release.
- */
-NS_IMPL_ISUPPORTS(
-  ResultSet,
-  mozIStorageResultSet
-)
-
-////////////////////////////////////////////////////////////////////////////////
-//// mozIStorageResultSet
-
-NS_IMETHODIMP
-ResultSet::GetNextRow(mozIStorageRow **_row)
-{
-  NS_ENSURE_ARG_POINTER(_row);
-
-  if (mCurrentIndex >= mData.Count()) {
-    // Just return null here
-    return NS_OK;
-  }
-
-  NS_ADDREF(*_row = mData.ObjectAt(mCurrentIndex++));
-  return NS_OK;
-}
-
-} // namespace storage
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageResultSet.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageResultSet.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageResultSet.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageResultSet.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 mozStorageResultSet_h
-#define mozStorageResultSet_h
-
-#include "mozIStorageResultSet.h"
-#include "nsCOMArray.h"
-#include "mozilla/Attributes.h"
-class mozIStorageRow;
-
-namespace mozilla {
-namespace storage {
-
-class ResultSet final : public mozIStorageResultSet
-{
-public:
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_MOZISTORAGERESULTSET
-
-  ResultSet();
-
-  /**
-   * Adds a tuple to this result set.
-   */
-  nsresult add(mozIStorageRow *aTuple);
-
-  /**
-   * @returns the number of rows this result set holds.
-   */
-  int32_t rows() const { return mData.Count(); }
-
-private:
-  ~ResultSet();
-
-  /**
-   * Stores the current index of the active result set.
-   */
-  int32_t mCurrentIndex;
-
-  /**
-   * Stores the tuples.
-   */
-  nsCOMArray<mozIStorageRow> mData;
-};
-
-} // namespace storage
-} // namespace mozilla
-
-#endif // mozStorageResultSet_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageRow.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageRow.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageRow.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageRow.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,247 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 "nsString.h"
-
-#include "sqlite3.h"
-#include "mozStoragePrivateHelpers.h"
-#include "Variant.h"
-#include "mozStorageRow.h"
-
-namespace mozilla {
-namespace storage {
-
-////////////////////////////////////////////////////////////////////////////////
-//// Row
-
-nsresult
-Row::initialize(sqlite3_stmt *aStatement)
-{
-  // Get the number of results
-  mNumCols = ::sqlite3_column_count(aStatement);
-
-  // Start copying over values
-  for (uint32_t i = 0; i < mNumCols; i++) {
-    // Store the value
-    nsIVariant *variant = nullptr;
-    int type = ::sqlite3_column_type(aStatement, i);
-    switch (type) {
-      case SQLITE_INTEGER:
-        variant = new IntegerVariant(::sqlite3_column_int64(aStatement, i));
-        break;
-      case SQLITE_FLOAT:
-        variant = new FloatVariant(::sqlite3_column_double(aStatement, i));
-        break;
-      case SQLITE_TEXT:
-      {
-        nsDependentString str(
-          static_cast<const char16_t *>(::sqlite3_column_text16(aStatement, i))
-        );
-        variant = new TextVariant(str);
-        break;
-      }
-      case SQLITE_NULL:
-        variant = new NullVariant();
-        break;
-      case SQLITE_BLOB:
-      {
-        int size = ::sqlite3_column_bytes(aStatement, i);
-        const void *data = ::sqlite3_column_blob(aStatement, i);
-        variant = new BlobVariant(std::pair<const void *, int>(data, size));
-        break;
-      }
-      default:
-        return NS_ERROR_UNEXPECTED;
-    }
-    NS_ENSURE_TRUE(variant, NS_ERROR_OUT_OF_MEMORY);
-
-    // Insert into our storage array
-    NS_ENSURE_TRUE(mData.InsertObjectAt(variant, i), NS_ERROR_OUT_OF_MEMORY);
-
-    // Associate the name (if any) with the index
-    const char *name = ::sqlite3_column_name(aStatement, i);
-    if (!name) break;
-    nsAutoCString colName(name);
-    mNameHashtable.Put(colName, i);
-  }
-
-  return NS_OK;
-}
-
-/**
- * Note:  This object is only ever accessed on one thread at a time.  It it not
- *        threadsafe, but it does need threadsafe AddRef and Release.
- */
-NS_IMPL_ISUPPORTS(
-  Row,
-  mozIStorageRow,
-  mozIStorageValueArray
-)
-
-////////////////////////////////////////////////////////////////////////////////
-//// mozIStorageRow
-
-NS_IMETHODIMP
-Row::GetResultByIndex(uint32_t aIndex,
-                      nsIVariant **_result)
-{
-  ENSURE_INDEX_VALUE(aIndex, mNumCols);
-  NS_ADDREF(*_result = mData.ObjectAt(aIndex));
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Row::GetResultByName(const nsACString &aName,
-                     nsIVariant **_result)
-{
-  uint32_t index;
-  NS_ENSURE_TRUE(mNameHashtable.Get(aName, &index), NS_ERROR_NOT_AVAILABLE);
-  return GetResultByIndex(index, _result);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//// mozIStorageValueArray
-
-NS_IMETHODIMP
-Row::GetNumEntries(uint32_t *_entries)
-{
-  *_entries = mNumCols;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Row::GetTypeOfIndex(uint32_t aIndex,
-                    int32_t *_type)
-{
-  ENSURE_INDEX_VALUE(aIndex, mNumCols);
-
-  uint16_t type;
-  (void)mData.ObjectAt(aIndex)->GetDataType(&type);
-  switch (type) {
-    case nsIDataType::VTYPE_INT32:
-    case nsIDataType::VTYPE_INT64:
-      *_type = mozIStorageValueArray::VALUE_TYPE_INTEGER;
-      break;
-    case nsIDataType::VTYPE_DOUBLE:
-      *_type = mozIStorageValueArray::VALUE_TYPE_FLOAT;
-      break;
-    case nsIDataType::VTYPE_ASTRING:
-      *_type = mozIStorageValueArray::VALUE_TYPE_TEXT;
-      break;
-    case nsIDataType::VTYPE_ARRAY:
-      *_type = mozIStorageValueArray::VALUE_TYPE_BLOB;
-      break;
-    default:
-      *_type = mozIStorageValueArray::VALUE_TYPE_NULL;
-      break;
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Row::GetInt32(uint32_t aIndex,
-              int32_t *_value)
-{
-  ENSURE_INDEX_VALUE(aIndex, mNumCols);
-  return mData.ObjectAt(aIndex)->GetAsInt32(_value);
-}
-
-NS_IMETHODIMP
-Row::GetInt64(uint32_t aIndex,
-              int64_t *_value)
-{
-  ENSURE_INDEX_VALUE(aIndex, mNumCols);
-  return mData.ObjectAt(aIndex)->GetAsInt64(_value);
-}
-
-NS_IMETHODIMP
-Row::GetDouble(uint32_t aIndex,
-               double *_value)
-{
-  ENSURE_INDEX_VALUE(aIndex, mNumCols);
-  return mData.ObjectAt(aIndex)->GetAsDouble(_value);
-}
-
-NS_IMETHODIMP
-Row::GetUTF8String(uint32_t aIndex,
-                   nsACString &_value)
-{
-  ENSURE_INDEX_VALUE(aIndex, mNumCols);
-  return mData.ObjectAt(aIndex)->GetAsAUTF8String(_value);
-}
-
-NS_IMETHODIMP
-Row::GetString(uint32_t aIndex,
-               nsAString &_value)
-{
-  ENSURE_INDEX_VALUE(aIndex, mNumCols);
-  return mData.ObjectAt(aIndex)->GetAsAString(_value);
-}
-
-NS_IMETHODIMP
-Row::GetBlob(uint32_t aIndex,
-             uint32_t *_size,
-             uint8_t **_blob)
-{
-  ENSURE_INDEX_VALUE(aIndex, mNumCols);
-
-  uint16_t type;
-  nsIID interfaceIID;
-  return mData.ObjectAt(aIndex)->GetAsArray(&type, &interfaceIID, _size,
-                                            reinterpret_cast<void **>(_blob));
-}
-
-NS_IMETHODIMP
-Row::GetBlobAsString(uint32_t aIndex, nsAString& aValue)
-{
-  return DoGetBlobAsString(this, aIndex, aValue);
-}
-
-NS_IMETHODIMP
-Row::GetBlobAsUTF8String(uint32_t aIndex, nsACString& aValue)
-{
-  return DoGetBlobAsString(this, aIndex, aValue);
-}
-
-NS_IMETHODIMP
-Row::GetIsNull(uint32_t aIndex,
-               bool *_isNull)
-{
-  ENSURE_INDEX_VALUE(aIndex, mNumCols);
-  NS_ENSURE_ARG_POINTER(_isNull);
-
-  uint16_t type;
-  (void)mData.ObjectAt(aIndex)->GetDataType(&type);
-  *_isNull = type == nsIDataType::VTYPE_EMPTY;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Row::GetSharedUTF8String(uint32_t,
-                         uint32_t *,
-                         char const **)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-Row::GetSharedString(uint32_t,
-                     uint32_t *,
-                     const char16_t **)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-Row::GetSharedBlob(uint32_t,
-                   uint32_t *,
-                   const uint8_t **)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-} // namespace storage
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageRow.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageRow.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageRow.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageRow.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 mozStorageRow_h
-#define mozStorageRow_h
-
-#include "mozIStorageRow.h"
-#include "nsCOMArray.h"
-#include "nsDataHashtable.h"
-#include "mozilla/Attributes.h"
-class nsIVariant;
-struct sqlite3_stmt;
-
-namespace mozilla {
-namespace storage {
-
-class Row final : public mozIStorageRow
-{
-public:
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_MOZISTORAGEROW
-  NS_DECL_MOZISTORAGEVALUEARRAY
-
-  /**
-   * Initializes the object with the given statement.  Copies the values from
-   * the statement.
-   *
-   * @param aStatement
-   *        The sqlite statement to pull results from.
-   */
-  nsresult initialize(sqlite3_stmt *aStatement);
-
-private:
-  ~Row() {}
-
-  /**
-   * The number of columns in this tuple.
-   */
-  uint32_t mNumCols;
-
-  /**
-   * Stores the data in the tuple.
-   */
-  nsCOMArray<nsIVariant> mData;
-
-  /**
-   * Maps a given name to a column index.
-   */
-  nsDataHashtable<nsCStringHashKey, uint32_t> mNameHashtable;
-};
-
-} // namespace storage
-} // namespace mozilla
-
-#endif // mozStorageRow_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageService.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageService.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageService.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,976 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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/Attributes.h"
-#include "mozilla/DebugOnly.h"
-
-#include "mozStorageService.h"
-#include "mozStorageConnection.h"
-#include "prinit.h"
-#include "nsAutoPtr.h"
-#include "nsCollationCID.h"
-#include "nsEmbedCID.h"
-#include "nsThreadUtils.h"
-#include "mozStoragePrivateHelpers.h"
-#include "nsILocale.h"
-#include "nsILocaleService.h"
-#include "nsIXPConnect.h"
-#include "nsIObserverService.h"
-#include "nsIPropertyBag2.h"
-#include "mozilla/Services.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/LateWriteChecks.h"
-#include "mozIStorageCompletionCallback.h"
-#include "mozIStoragePendingStatement.h"
-
-#include "sqlite3.h"
-
-#ifdef SQLITE_OS_WIN
-// "windows.h" was included and it can #define lots of things we care about...
-#undef CompareString
-#endif
-
-#include "nsIPromptService.h"
-
-#ifdef MOZ_STORAGE_MEMORY
-#  include "mozmemory.h"
-#  ifdef MOZ_DMD
-#    include "DMD.h"
-#  endif
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-//// Defines
-
-#define PREF_TS_SYNCHRONOUS "toolkit.storage.synchronous"
-#define PREF_TS_SYNCHRONOUS_DEFAULT 1
-
-#define PREF_TS_PAGESIZE "toolkit.storage.pageSize"
-
-// This value must be kept in sync with the value of SQLITE_DEFAULT_PAGE_SIZE in
-// db/sqlite3/src/Makefile.in.
-#define PREF_TS_PAGESIZE_DEFAULT 32768
-
-namespace mozilla {
-namespace storage {
-
-////////////////////////////////////////////////////////////////////////////////
-//// Memory Reporting
-
-#ifdef MOZ_DMD
-static mozilla::Atomic<size_t> gSqliteMemoryUsed;
-#endif
-
-static int64_t
-StorageSQLiteDistinguishedAmount()
-{
-  return ::sqlite3_memory_used();
-}
-
-/**
- * Passes a single SQLite memory statistic to a memory reporter callback.
- *
- * @param aHandleReport
- *        The callback.
- * @param aData
- *        The data for the callback.
- * @param aConn
- *        The SQLite connection.
- * @param aPathHead
- *        Head of the path for the memory report.
- * @param aKind
- *        The memory report statistic kind, one of "stmt", "cache" or
- *        "schema".
- * @param aDesc
- *        The memory report description.
- * @param aOption
- *        The SQLite constant for getting the measurement.
- * @param aTotal
- *        The accumulator for the measurement.
- */
-nsresult
-ReportConn(nsIHandleReportCallback *aHandleReport,
-           nsISupports *aData,
-           Connection *aConn,
-           const nsACString &aPathHead,
-           const nsACString &aKind,
-           const nsACString &aDesc,
-           int32_t aOption,
-           size_t *aTotal)
-{
-  nsCString path(aPathHead);
-  path.Append(aKind);
-  path.AppendLiteral("-used");
-
-  int32_t val = aConn->getSqliteRuntimeStatus(aOption);
-  nsresult rv = aHandleReport->Callback(EmptyCString(), path,
-                                        nsIMemoryReporter::KIND_HEAP,
-                                        nsIMemoryReporter::UNITS_BYTES,
-                                        int64_t(val), aDesc, aData);
-  NS_ENSURE_SUCCESS(rv, rv);
-  *aTotal += val;
-
-  return NS_OK;
-}
-
-// Warning: To get a Connection's measurements requires holding its lock.
-// There may be a delay getting the lock if another thread is accessing the
-// Connection.  This isn't very nice if CollectReports is called from the main
-// thread!  But at the time of writing this function is only called when
-// about:memory is loaded (not, for example, when telemetry pings occur) and
-// any delays in that case aren't so bad.
-NS_IMETHODIMP
-Service::CollectReports(nsIHandleReportCallback *aHandleReport,
-                        nsISupports *aData, bool aAnonymize)
-{
-  nsresult rv;
-  size_t totalConnSize = 0;
-  {
-    nsTArray<nsRefPtr<Connection> > connections;
-    getConnections(connections);
-
-    for (uint32_t i = 0; i < connections.Length(); i++) {
-      nsRefPtr<Connection> &conn = connections[i];
-
-      // Someone may have closed the Connection, in which case we skip it.
-      bool isReady;
-      (void)conn->GetConnectionReady(&isReady);
-      if (!isReady) {
-          continue;
-      }
-
-      nsCString pathHead("explicit/storage/sqlite/");
-      // This filename isn't privacy-sensitive, and so is never anonymized.
-      pathHead.Append(conn->getFilename());
-      pathHead.Append('/');
-
-      SQLiteMutexAutoLock lockedScope(conn->sharedDBMutex);
-
-      NS_NAMED_LITERAL_CSTRING(stmtDesc,
-        "Memory (approximate) used by all prepared statements used by "
-        "connections to this database.");
-      rv = ReportConn(aHandleReport, aData, conn, pathHead,
-                      NS_LITERAL_CSTRING("stmt"), stmtDesc,
-                      SQLITE_DBSTATUS_STMT_USED, &totalConnSize);
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      NS_NAMED_LITERAL_CSTRING(cacheDesc,
-        "Memory (approximate) used by all pager caches used by connections "
-        "to this database.");
-      rv = ReportConn(aHandleReport, aData, conn, pathHead,
-                      NS_LITERAL_CSTRING("cache"), cacheDesc,
-                      SQLITE_DBSTATUS_CACHE_USED, &totalConnSize);
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      NS_NAMED_LITERAL_CSTRING(schemaDesc,
-        "Memory (approximate) used to store the schema for all databases "
-        "associated with connections to this database.");
-      rv = ReportConn(aHandleReport, aData, conn, pathHead,
-                      NS_LITERAL_CSTRING("schema"), schemaDesc,
-                      SQLITE_DBSTATUS_SCHEMA_USED, &totalConnSize);
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
-
-#ifdef MOZ_DMD
-    if (::sqlite3_memory_used() != int64_t(gSqliteMemoryUsed)) {
-      NS_WARNING("memory consumption reported by SQLite doesn't match "
-                 "our measurements");
-    }
-#endif
-  }
-
-  int64_t other = ::sqlite3_memory_used() - totalConnSize;
-
-  rv = aHandleReport->Callback(
-          EmptyCString(),
-          NS_LITERAL_CSTRING("explicit/storage/sqlite/other"),
-          KIND_HEAP, UNITS_BYTES, other,
-          NS_LITERAL_CSTRING("All unclassified sqlite memory."),
-          aData);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//// Service
-
-NS_IMPL_ISUPPORTS(
-  Service,
-  mozIStorageService,
-  nsIObserver,
-  nsIMemoryReporter
-)
-
-Service *Service::gService = nullptr;
-
-Service *
-Service::getSingleton()
-{
-  if (gService) {
-    NS_ADDREF(gService);
-    return gService;
-  }
-
-  // Ensure that we are using the same version of SQLite that we compiled with
-  // or newer.  Our configure check ensures we are using a new enough version
-  // at compile time.
-  if (SQLITE_VERSION_NUMBER > ::sqlite3_libversion_number()) {
-    nsCOMPtr<nsIPromptService> ps(do_GetService(NS_PROMPTSERVICE_CONTRACTID));
-    if (ps) {
-      nsAutoString title, message;
-      title.AppendLiteral("SQLite Version Error");
-      message.AppendLiteral("The application has been updated, but your version "
-                          "of SQLite is too old and the application cannot "
-                          "run.");
-      (void)ps->Alert(nullptr, title.get(), message.get());
-    }
-    ::PR_Abort();
-  }
-
-  // The first reference to the storage service must be obtained on the
-  // main thread.
-  NS_ENSURE_TRUE(NS_IsMainThread(), nullptr);
-  gService = new Service();
-  if (gService) {
-    NS_ADDREF(gService);
-    if (NS_FAILED(gService->initialize()))
-      NS_RELEASE(gService);
-  }
-
-  return gService;
-}
-
-nsIXPConnect *Service::sXPConnect = nullptr;
-
-// static
-already_AddRefed<nsIXPConnect>
-Service::getXPConnect()
-{
-  NS_PRECONDITION(NS_IsMainThread(),
-                  "Must only get XPConnect on the main thread!");
-  NS_PRECONDITION(gService,
-                  "Can not get XPConnect without an instance of our service!");
-
-  // If we've been shutdown, sXPConnect will be null.  To prevent leaks, we do
-  // not cache the service after this point.
-  nsCOMPtr<nsIXPConnect> xpc(sXPConnect);
-  if (!xpc)
-    xpc = do_GetService(nsIXPConnect::GetCID());
-  NS_ASSERTION(xpc, "Could not get XPConnect!");
-  return xpc.forget();
-}
-
-int32_t Service::sSynchronousPref;
-
-// static
-int32_t
-Service::getSynchronousPref()
-{
-  return sSynchronousPref;
-}
-
-int32_t Service::sDefaultPageSize = PREF_TS_PAGESIZE_DEFAULT;
-
-Service::Service()
-: mMutex("Service::mMutex")
-, mSqliteVFS(nullptr)
-, mRegistrationMutex("Service::mRegistrationMutex")
-, mConnections()
-{
-}
-
-Service::~Service()
-{
-  mozilla::UnregisterWeakMemoryReporter(this);
-  mozilla::UnregisterStorageSQLiteDistinguishedAmount();
-
-  int rc = sqlite3_vfs_unregister(mSqliteVFS);
-  if (rc != SQLITE_OK)
-    NS_WARNING("Failed to unregister sqlite vfs wrapper.");
-
-  // Shutdown the sqlite3 API.  Warn if shutdown did not turn out okay, but
-  // there is nothing actionable we can do in that case.
-  rc = ::sqlite3_shutdown();
-  if (rc != SQLITE_OK)
-    NS_WARNING("sqlite3 did not shutdown cleanly.");
-
-  DebugOnly<bool> shutdownObserved = !sXPConnect;
-  NS_ASSERTION(shutdownObserved, "Shutdown was not observed!");
-
-  gService = nullptr;
-  delete mSqliteVFS;
-  mSqliteVFS = nullptr;
-}
-
-void
-Service::registerConnection(Connection *aConnection)
-{
-  mRegistrationMutex.AssertNotCurrentThreadOwns();
-  MutexAutoLock mutex(mRegistrationMutex);
-  (void)mConnections.AppendElement(aConnection);
-}
-
-void
-Service::unregisterConnection(Connection *aConnection)
-{
-  // If this is the last Connection it might be the only thing keeping Service
-  // alive.  So ensure that Service is destroyed only after the Connection is
-  // cleanly unregistered and destroyed.
-  nsRefPtr<Service> kungFuDeathGrip(this);
-  {
-    mRegistrationMutex.AssertNotCurrentThreadOwns();
-    MutexAutoLock mutex(mRegistrationMutex);
-
-    for (uint32_t i = 0 ; i < mConnections.Length(); ++i) {
-      if (mConnections[i] == aConnection) {
-        nsCOMPtr<nsIThread> thread = mConnections[i]->threadOpenedOn;
-
-        // Ensure the connection is released on its opening thread.  Note, we
-        // must use .forget().take() so that we can manually cast to an
-        // unambiguous nsISupports type.
-        NS_ProxyRelease(thread,
-          static_cast<mozIStorageConnection*>(mConnections[i].forget().take()));
-
-        mConnections.RemoveElementAt(i);
-        return;
-      }
-    }
-
-    MOZ_ASSERT_UNREACHABLE("Attempt to unregister unknown storage connection!");
-  }
-}
-
-void
-Service::getConnections(/* inout */ nsTArray<nsRefPtr<Connection> >& aConnections)
-{
-  mRegistrationMutex.AssertNotCurrentThreadOwns();
-  MutexAutoLock mutex(mRegistrationMutex);
-  aConnections.Clear();
-  aConnections.AppendElements(mConnections);
-}
-
-void
-Service::minimizeMemory()
-{
-  nsTArray<nsRefPtr<Connection> > connections;
-  getConnections(connections);
-
-  for (uint32_t i = 0; i < connections.Length(); i++) {
-    nsRefPtr<Connection> conn = connections[i];
-    if (!conn->connectionReady())
-      continue;
-
-    NS_NAMED_LITERAL_CSTRING(shrinkPragma, "PRAGMA shrink_memory");
-    nsCOMPtr<mozIStorageConnection> syncConn = do_QueryInterface(
-      NS_ISUPPORTS_CAST(mozIStorageAsyncConnection*, conn));
-    bool onOpenedThread = false;
-
-    if (!syncConn) {
-      // This is a mozIStorageAsyncConnection, it can only be used on the main
-      // thread, so we can do a straight API call.
-      nsCOMPtr<mozIStoragePendingStatement> ps;
-      DebugOnly<nsresult> rv =
-        conn->ExecuteSimpleSQLAsync(shrinkPragma, nullptr, getter_AddRefs(ps));
-      MOZ_ASSERT(NS_SUCCEEDED(rv), "Should have purged sqlite caches");
-    } else if (NS_SUCCEEDED(conn->threadOpenedOn->IsOnCurrentThread(&onOpenedThread)) &&
-               onOpenedThread) {
-      // We are on the opener thread, so we can just proceed.
-      conn->ExecuteSimpleSQL(shrinkPragma);
-    } else {
-      // We are on the wrong thread, the query should be executed on the
-      // opener thread, so we must dispatch to it.
-      nsCOMPtr<nsIRunnable> event =
-        NS_NewRunnableMethodWithArg<const nsCString>(
-          conn, &Connection::ExecuteSimpleSQL, shrinkPragma);
-      conn->threadOpenedOn->Dispatch(event, NS_DISPATCH_NORMAL);
-    }
-  }
-}
-
-void
-Service::shutdown()
-{
-  NS_IF_RELEASE(sXPConnect);
-}
-
-sqlite3_vfs *ConstructTelemetryVFS();
-
-#ifdef MOZ_STORAGE_MEMORY
-
-namespace {
-
-// By default, SQLite tracks the size of all its heap blocks by adding an extra
-// 8 bytes at the start of the block to hold the size.  Unfortunately, this
-// causes a lot of 2^N-sized allocations to be rounded up by jemalloc
-// allocator, wasting memory.  For example, a request for 1024 bytes has 8
-// bytes added, becoming a request for 1032 bytes, and jemalloc rounds this up
-// to 2048 bytes, wasting 1012 bytes.  (See bug 676189 for more details.)
-//
-// So we register jemalloc as the malloc implementation, which avoids this
-// 8-byte overhead, and thus a lot of waste.  This requires us to provide a
-// function, sqliteMemRoundup(), which computes the actual size that will be
-// allocated for a given request.  SQLite uses this function before all
-// allocations, and may be able to use any excess bytes caused by the rounding.
-//
-// Note: the wrappers for malloc, realloc and moz_malloc_usable_size are
-// necessary because the sqlite_mem_methods type signatures differ slightly
-// from the standard ones -- they use int instead of size_t.  But we don't need
-// a wrapper for free.
-
-#ifdef MOZ_DMD
-
-// sqlite does its own memory accounting, and we use its numbers in our memory
-// reporters.  But we don't want sqlite's heap blocks to show up in DMD's
-// output as unreported, so we mark them as reported when they're allocated and
-// mark them as unreported when they are freed.
-//
-// In other words, we are marking all sqlite heap blocks as reported even
-// though we're not reporting them ourselves.  Instead we're trusting that
-// sqlite is fully and correctly accounting for all of its heap blocks via its
-// own memory accounting.  Well, we don't have to trust it entirely, because
-// it's easy to keep track (while doing this DMD-specific marking) of exactly
-// how much memory SQLite is using.  And we can compare that against what
-// SQLite reports it is using.
-
-MOZ_DEFINE_MALLOC_SIZE_OF_ON_ALLOC(SqliteMallocSizeOfOnAlloc)
-MOZ_DEFINE_MALLOC_SIZE_OF_ON_FREE(SqliteMallocSizeOfOnFree)
-
-#endif
-
-static void *sqliteMemMalloc(int n)
-{
-  void* p = ::malloc(n);
-#ifdef MOZ_DMD
-  gSqliteMemoryUsed += SqliteMallocSizeOfOnAlloc(p);
-#endif
-  return p;
-}
-
-static void sqliteMemFree(void *p)
-{
-#ifdef MOZ_DMD
-  gSqliteMemoryUsed -= SqliteMallocSizeOfOnFree(p);
-#endif
-  ::free(p);
-}
-
-static void *sqliteMemRealloc(void *p, int n)
-{
-#ifdef MOZ_DMD
-  gSqliteMemoryUsed -= SqliteMallocSizeOfOnFree(p);
-  void *pnew = ::realloc(p, n);
-  if (pnew) {
-    gSqliteMemoryUsed += SqliteMallocSizeOfOnAlloc(pnew);
-  } else {
-    // realloc failed;  undo the SqliteMallocSizeOfOnFree from above
-    gSqliteMemoryUsed += SqliteMallocSizeOfOnAlloc(p);
-  }
-  return pnew;
-#else
-  return ::realloc(p, n);
-#endif
-}
-
-static int sqliteMemSize(void *p)
-{
-  return ::moz_malloc_usable_size(p);
-}
-
-static int sqliteMemRoundup(int n)
-{
-  n = malloc_good_size(n);
-
-  // jemalloc can return blocks of size 2 and 4, but SQLite requires that all
-  // allocations be 8-aligned.  So we round up sub-8 requests to 8.  This
-  // wastes a small amount of memory but is obviously safe.
-  return n <= 8 ? 8 : n;
-}
-
-static int sqliteMemInit(void *p)
-{
-  return 0;
-}
-
-static void sqliteMemShutdown(void *p)
-{
-}
-
-const sqlite3_mem_methods memMethods = {
-  &sqliteMemMalloc,
-  &sqliteMemFree,
-  &sqliteMemRealloc,
-  &sqliteMemSize,
-  &sqliteMemRoundup,
-  &sqliteMemInit,
-  &sqliteMemShutdown,
-  nullptr
-};
-
-} // anonymous namespace
-
-#endif  // MOZ_STORAGE_MEMORY
-
-static const char* sObserverTopics[] = {
-  "memory-pressure",
-  "xpcom-shutdown",
-  "xpcom-shutdown-threads"
-};
-
-nsresult
-Service::initialize()
-{
-  MOZ_ASSERT(NS_IsMainThread(), "Must be initialized on the main thread");
-
-  int rc;
-
-#ifdef MOZ_STORAGE_MEMORY
-  rc = ::sqlite3_config(SQLITE_CONFIG_MALLOC, &memMethods);
-  if (rc != SQLITE_OK)
-    return convertResultCode(rc);
-#endif
-
-  // Explicitly initialize sqlite3.  Although this is implicitly called by
-  // various sqlite3 functions (and the sqlite3_open calls in our case),
-  // the documentation suggests calling this directly.  So we do.
-  rc = ::sqlite3_initialize();
-  if (rc != SQLITE_OK)
-    return convertResultCode(rc);
-
-  mSqliteVFS = ConstructTelemetryVFS();
-  if (mSqliteVFS) {
-    rc = sqlite3_vfs_register(mSqliteVFS, 1);
-    if (rc != SQLITE_OK)
-      return convertResultCode(rc);
-  } else {
-    NS_WARNING("Failed to register telemetry VFS");
-  }
-
-  // Register for xpcom-shutdown so we can cleanup after ourselves.  The
-  // observer service can only be used on the main thread.
-  nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
-  NS_ENSURE_TRUE(os, NS_ERROR_FAILURE);
-
-  for (size_t i = 0; i < ArrayLength(sObserverTopics); ++i) {
-    nsresult rv = os->AddObserver(this, sObserverTopics[i], false);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-  }
-
-  // We cache XPConnect for our language helpers.  XPConnect can only be
-  // used on the main thread.
-  (void)CallGetService(nsIXPConnect::GetCID(), &sXPConnect);
-
-  // We need to obtain the toolkit.storage.synchronous preferences on the main
-  // thread because the preference service can only be accessed there.  This
-  // is cached in the service for all future Open[Unshared]Database calls.
-  sSynchronousPref =
-    Preferences::GetInt(PREF_TS_SYNCHRONOUS, PREF_TS_SYNCHRONOUS_DEFAULT);
-
-  // We need to obtain the toolkit.storage.pageSize preferences on the main
-  // thread because the preference service can only be accessed there.  This
-  // is cached in the service for all future Open[Unshared]Database calls.
-  sDefaultPageSize =
-      Preferences::GetInt(PREF_TS_PAGESIZE, PREF_TS_PAGESIZE_DEFAULT);
-
-  mozilla::RegisterWeakMemoryReporter(this);
-  mozilla::RegisterStorageSQLiteDistinguishedAmount(StorageSQLiteDistinguishedAmount);
-
-  return NS_OK;
-}
-
-int
-Service::localeCompareStrings(const nsAString &aStr1,
-                              const nsAString &aStr2,
-                              int32_t aComparisonStrength)
-{
-  // The implementation of nsICollation.CompareString() is platform-dependent.
-  // On Linux it's not thread-safe.  It may not be on Windows and OS X either,
-  // but it's more difficult to tell.  We therefore synchronize this method.
-  MutexAutoLock mutex(mMutex);
-
-  nsICollation *coll = getLocaleCollation();
-  if (!coll) {
-    NS_ERROR("Storage service has no collation");
-    return 0;
-  }
-
-  int32_t res;
-  nsresult rv = coll->CompareString(aComparisonStrength, aStr1, aStr2, &res);
-  if (NS_FAILED(rv)) {
-    NS_ERROR("Collation compare string failed");
-    return 0;
-  }
-
-  return res;
-}
-
-nsICollation *
-Service::getLocaleCollation()
-{
-  mMutex.AssertCurrentThreadOwns();
-
-  if (mLocaleCollation)
-    return mLocaleCollation;
-
-  nsCOMPtr<nsILocaleService> svc(do_GetService(NS_LOCALESERVICE_CONTRACTID));
-  if (!svc) {
-    NS_WARNING("Could not get locale service");
-    return nullptr;
-  }
-
-  nsCOMPtr<nsILocale> appLocale;
-  nsresult rv = svc->GetApplicationLocale(getter_AddRefs(appLocale));
-  if (NS_FAILED(rv)) {
-    NS_WARNING("Could not get application locale");
-    return nullptr;
-  }
-
-  nsCOMPtr<nsICollationFactory> collFact =
-    do_CreateInstance(NS_COLLATIONFACTORY_CONTRACTID);
-  if (!collFact) {
-    NS_WARNING("Could not create collation factory");
-    return nullptr;
-  }
-
-  rv = collFact->CreateCollation(appLocale, getter_AddRefs(mLocaleCollation));
-  if (NS_FAILED(rv)) {
-    NS_WARNING("Could not create collation");
-    return nullptr;
-  }
-
-  return mLocaleCollation;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//// mozIStorageService
-
-
-NS_IMETHODIMP
-Service::OpenSpecialDatabase(const char *aStorageKey,
-                             mozIStorageConnection **_connection)
-{
-  nsresult rv;
-
-  nsCOMPtr<nsIFile> storageFile;
-  if (::strcmp(aStorageKey, "memory") == 0) {
-    // just fall through with nullptr storageFile, this will cause the storage
-    // connection to use a memory DB.
-  }
-  else {
-    return NS_ERROR_INVALID_ARG;
-  }
-
-  nsRefPtr<Connection> msc = new Connection(this, SQLITE_OPEN_READWRITE, false);
-
-  rv = storageFile ? msc->initialize(storageFile) : msc->initialize();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  msc.forget(_connection);
-  return NS_OK;
-
-}
-
-namespace {
-
-class AsyncInitDatabase final : public nsRunnable
-{
-public:
-  AsyncInitDatabase(Connection* aConnection,
-                    nsIFile* aStorageFile,
-                    int32_t aGrowthIncrement,
-                    mozIStorageCompletionCallback* aCallback)
-    : mConnection(aConnection)
-    , mStorageFile(aStorageFile)
-    , mGrowthIncrement(aGrowthIncrement)
-    , mCallback(aCallback)
-  {
-    MOZ_ASSERT(NS_IsMainThread());
-  }
-
-  NS_IMETHOD Run()
-  {
-    MOZ_ASSERT(!NS_IsMainThread());
-    nsresult rv = mStorageFile ? mConnection->initialize(mStorageFile)
-                               : mConnection->initialize();
-    if (NS_FAILED(rv)) {
-      nsCOMPtr<nsIRunnable> closeRunnable =
-        NS_NewRunnableMethodWithArg<mozIStorageCompletionCallback*>(
-          mConnection.get(),
-          &Connection::AsyncClose,
-          nullptr);
-      MOZ_ASSERT(closeRunnable);
-      MOZ_ALWAYS_TRUE(NS_SUCCEEDED(NS_DispatchToMainThread(closeRunnable)));
-
-      return DispatchResult(rv, nullptr);
-    }
-
-    if (mGrowthIncrement >= 0) {
-      // Ignore errors. In the future, we might wish to log them.
-      (void)mConnection->SetGrowthIncrement(mGrowthIncrement, EmptyCString());
-    }
-
-    return DispatchResult(NS_OK, NS_ISUPPORTS_CAST(mozIStorageAsyncConnection*,
-                          mConnection));
-  }
-
-private:
-  nsresult DispatchResult(nsresult aStatus, nsISupports* aValue) {
-    nsRefPtr<CallbackComplete> event =
-      new CallbackComplete(aStatus,
-                           aValue,
-                           mCallback.forget());
-    return NS_DispatchToMainThread(event);
-  }
-
-  ~AsyncInitDatabase()
-  {
-    nsCOMPtr<nsIThread> thread;
-    DebugOnly<nsresult> rv = NS_GetMainThread(getter_AddRefs(thread));
-    MOZ_ASSERT(NS_SUCCEEDED(rv));
-    (void)NS_ProxyRelease(thread, mStorageFile);
-
-    // Handle ambiguous nsISupports inheritance.
-    Connection *rawConnection = nullptr;
-    mConnection.swap(rawConnection);
-    (void)NS_ProxyRelease(thread, NS_ISUPPORTS_CAST(mozIStorageConnection *,
-                                                    rawConnection));
-
-    // Generally, the callback will be released by CallbackComplete.
-    // However, if for some reason Run() is not executed, we still
-    // need to ensure that it is released here.
-    mozIStorageCompletionCallback *rawCallback = nullptr;
-    mCallback.swap(rawCallback);
-    (void)NS_ProxyRelease(thread, rawCallback);
-  }
-
-  nsRefPtr<Connection> mConnection;
-  nsCOMPtr<nsIFile> mStorageFile;
-  int32_t mGrowthIncrement;
-  nsRefPtr<mozIStorageCompletionCallback> mCallback;
-};
-
-} // anonymous namespace
-
-NS_IMETHODIMP
-Service::OpenAsyncDatabase(nsIVariant *aDatabaseStore,
-                           nsIPropertyBag2 *aOptions,
-                           mozIStorageCompletionCallback *aCallback)
-{
-  if (!NS_IsMainThread()) {
-    return NS_ERROR_NOT_SAME_THREAD;
-  }
-  NS_ENSURE_ARG(aDatabaseStore);
-  NS_ENSURE_ARG(aCallback);
-
-  nsCOMPtr<nsIFile> storageFile;
-  int flags = SQLITE_OPEN_READWRITE;
-
-  nsCOMPtr<nsISupports> dbStore;
-  nsresult rv = aDatabaseStore->GetAsISupports(getter_AddRefs(dbStore));
-  if (NS_SUCCEEDED(rv)) {
-    // Generally, aDatabaseStore holds the database nsIFile.
-    storageFile = do_QueryInterface(dbStore, &rv);
-    if (NS_FAILED(rv)) {
-      return NS_ERROR_INVALID_ARG;
-    }
-
-    rv = storageFile->Clone(getter_AddRefs(storageFile));
-    MOZ_ASSERT(NS_SUCCEEDED(rv));
-
-    // Ensure that SQLITE_OPEN_CREATE is passed in for compatibility reasons.
-    flags |= SQLITE_OPEN_CREATE;
-
-    // Extract and apply the shared-cache option.
-    bool shared = false;
-    if (aOptions) {
-      rv = aOptions->GetPropertyAsBool(NS_LITERAL_STRING("shared"), &shared);
-      if (NS_FAILED(rv) && rv != NS_ERROR_NOT_AVAILABLE) {
-        return NS_ERROR_INVALID_ARG;
-      }
-    }
-    flags |= shared ? SQLITE_OPEN_SHAREDCACHE : SQLITE_OPEN_PRIVATECACHE;
-  } else {
-    // Sometimes, however, it's a special database name.
-    nsAutoCString keyString;
-    rv = aDatabaseStore->GetAsACString(keyString);
-    if (NS_FAILED(rv) || !keyString.EqualsLiteral("memory")) {
-      return NS_ERROR_INVALID_ARG;
-    }
-
-    // Just fall through with nullptr storageFile, this will cause the storage
-    // connection to use a memory DB.
-  }
-
-  int32_t growthIncrement = -1;
-  if (aOptions && storageFile) {
-    rv = aOptions->GetPropertyAsInt32(NS_LITERAL_STRING("growthIncrement"),
-                                      &growthIncrement);
-    if (NS_FAILED(rv) && rv != NS_ERROR_NOT_AVAILABLE) {
-      return NS_ERROR_INVALID_ARG;
-    }
-  }
-
-  // Create connection on this thread, but initialize it on its helper thread.
-  nsRefPtr<Connection> msc = new Connection(this, flags, true);
-  nsCOMPtr<nsIEventTarget> target = msc->getAsyncExecutionTarget();
-  MOZ_ASSERT(target, "Cannot initialize a connection that has been closed already");
-
-  nsRefPtr<AsyncInitDatabase> asyncInit =
-    new AsyncInitDatabase(msc,
-                          storageFile,
-                          growthIncrement,
-                          aCallback);
-  return target->Dispatch(asyncInit, nsIEventTarget::DISPATCH_NORMAL);
-}
-
-NS_IMETHODIMP
-Service::OpenDatabase(nsIFile *aDatabaseFile,
-                      mozIStorageConnection **_connection)
-{
-  NS_ENSURE_ARG(aDatabaseFile);
-
-  // Always ensure that SQLITE_OPEN_CREATE is passed in for compatibility
-  // reasons.
-  int flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_SHAREDCACHE |
-              SQLITE_OPEN_CREATE;
-  nsRefPtr<Connection> msc = new Connection(this, flags, false);
-
-  nsresult rv = msc->initialize(aDatabaseFile);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  msc.forget(_connection);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Service::OpenUnsharedDatabase(nsIFile *aDatabaseFile,
-                              mozIStorageConnection **_connection)
-{
-  NS_ENSURE_ARG(aDatabaseFile);
-
-  // Always ensure that SQLITE_OPEN_CREATE is passed in for compatibility
-  // reasons.
-  int flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_PRIVATECACHE |
-              SQLITE_OPEN_CREATE;
-  nsRefPtr<Connection> msc = new Connection(this, flags, false);
-
-  nsresult rv = msc->initialize(aDatabaseFile);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  msc.forget(_connection);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Service::OpenDatabaseWithFileURL(nsIFileURL *aFileURL,
-                                 mozIStorageConnection **_connection)
-{
-  NS_ENSURE_ARG(aFileURL);
-
-  // Always ensure that SQLITE_OPEN_CREATE is passed in for compatibility
-  // reasons.
-  int flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_SHAREDCACHE |
-              SQLITE_OPEN_CREATE | SQLITE_OPEN_URI;
-  nsRefPtr<Connection> msc = new Connection(this, flags, false);
-
-  nsresult rv = msc->initialize(aFileURL);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  msc.forget(_connection);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Service::BackupDatabaseFile(nsIFile *aDBFile,
-                            const nsAString &aBackupFileName,
-                            nsIFile *aBackupParentDirectory,
-                            nsIFile **backup)
-{
-  nsresult rv;
-  nsCOMPtr<nsIFile> parentDir = aBackupParentDirectory;
-  if (!parentDir) {
-    // This argument is optional, and defaults to the same parent directory
-    // as the current file.
-    rv = aDBFile->GetParent(getter_AddRefs(parentDir));
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  nsCOMPtr<nsIFile> backupDB;
-  rv = parentDir->Clone(getter_AddRefs(backupDB));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = backupDB->Append(aBackupFileName);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = backupDB->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0600);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsAutoString fileName;
-  rv = backupDB->GetLeafName(fileName);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = backupDB->Remove(false);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  backupDB.forget(backup);
-
-  return aDBFile->CopyTo(parentDir, fileName);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//// nsIObserver
-
-NS_IMETHODIMP
-Service::Observe(nsISupports *, const char *aTopic, const char16_t *)
-{
-  if (strcmp(aTopic, "memory-pressure") == 0) {
-    minimizeMemory();
-  } else if (strcmp(aTopic, "xpcom-shutdown") == 0) {
-    shutdown();
-  } else if (strcmp(aTopic, "xpcom-shutdown-threads") == 0) {
-    nsCOMPtr<nsIObserverService> os =
-      mozilla::services::GetObserverService();
-
-    for (size_t i = 0; i < ArrayLength(sObserverTopics); ++i) {
-      (void)os->RemoveObserver(this, sObserverTopics[i]);
-    }
-
-    bool anyOpen = false;
-    do {
-      nsTArray<nsRefPtr<Connection> > connections;
-      getConnections(connections);
-      anyOpen = false;
-      for (uint32_t i = 0; i < connections.Length(); i++) {
-        nsRefPtr<Connection> &conn = connections[i];
-        if (conn->isClosing()) {
-          anyOpen = true;
-          break;
-        }
-      }
-      if (anyOpen) {
-        nsCOMPtr<nsIThread> thread = do_GetCurrentThread();
-        NS_ProcessNextEvent(thread);
-      }
-    } while (anyOpen);
-
-    if (gShutdownChecks == SCM_CRASH) {
-      nsTArray<nsRefPtr<Connection> > connections;
-      getConnections(connections);
-      for (uint32_t i = 0, n = connections.Length(); i < n; i++) {
-        if (!connections[i]->isClosed()) {
-          MOZ_CRASH();
-        }
-      }
-    }
-  }
-
-  return NS_OK;
-}
-
-} // namespace storage
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageService.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageService.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageService.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageService.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,197 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 MOZSTORAGESERVICE_H
-#define MOZSTORAGESERVICE_H
-
-#include "nsCOMPtr.h"
-#include "nsICollation.h"
-#include "nsIFile.h"
-#include "nsIMemoryReporter.h"
-#include "nsIObserver.h"
-#include "nsTArray.h"
-#include "mozilla/Mutex.h"
-
-#include "mozIStorageService.h"
-
-class nsIMemoryReporter;
-class nsIXPConnect;
-struct sqlite3_vfs;
-
-namespace mozilla {
-namespace storage {
-
-class Connection;
-class Service : public mozIStorageService
-              , public nsIObserver
-              , public nsIMemoryReporter
-{
-public:
-  /**
-   * Initializes the service.  This must be called before any other function!
-   */
-  nsresult initialize();
-
-  /**
-   * Compares two strings using the Service's locale-aware collation.
-   *
-   * @param  aStr1
-   *         The string to be compared against aStr2.
-   * @param  aStr2
-   *         The string to be compared against aStr1.
-   * @param  aComparisonStrength
-   *         The sorting strength, one of the nsICollation constants.
-   * @return aStr1 - aStr2.  That is, if aStr1 < aStr2, returns a negative
-   *         number.  If aStr1 > aStr2, returns a positive number.  If
-   *         aStr1 == aStr2, returns 0.
-   */
-  int localeCompareStrings(const nsAString &aStr1,
-                           const nsAString &aStr2,
-                           int32_t aComparisonStrength);
-
-  static Service *getSingleton();
-
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_MOZISTORAGESERVICE
-  NS_DECL_NSIOBSERVER
-  NS_DECL_NSIMEMORYREPORTER
-
-  /**
-   * Obtains an already AddRefed pointer to XPConnect.  This is used by
-   * language helpers.
-   */
-  static already_AddRefed<nsIXPConnect> getXPConnect();
-
-  /**
-   * Obtains the cached data for the toolkit.storage.synchronous preference.
-   */
-  static int32_t getSynchronousPref();
-
-  /**
-   * Obtains the default page size for this platform. The default value is
-   * specified in the SQLite makefile (SQLITE_DEFAULT_PAGE_SIZE) but it may be
-   * overriden with the PREF_TS_PAGESIZE hidden preference.
-   */
-  static int32_t getDefaultPageSize()
-  {
-    return sDefaultPageSize;
-  }
-
-  /**
-   * Returns a boolean value indicating whether or not the given page size is
-   * valid (currently understood as a power of 2 between 512 and 65536).
-   */
-  static bool pageSizeIsValid(int32_t aPageSize)
-  {
-    return aPageSize == 512 || aPageSize == 1024 || aPageSize == 2048 ||
-           aPageSize == 4096 || aPageSize == 8192 || aPageSize == 16384 ||
-           aPageSize == 32768 || aPageSize == 65536;
-  }
-
-  /**
-   * Registers the connection with the storage service.  Connections are
-   * registered so they can be iterated over.
-   *
-   * @pre mRegistrationMutex is not held
-   *
-   * @param  aConnection
-   *         The connection to register.
-   */
-  void registerConnection(Connection *aConnection);
-
-  /**
-   * Unregisters the connection with the storage service.
-   *
-   * @pre mRegistrationMutex is not held
-   *
-   * @param  aConnection
-   *         The connection to unregister.
-   */
-  void unregisterConnection(Connection *aConnection);
-
-  /**
-   * Gets the list of open connections.  Note that you must test each
-   * connection with mozIStorageConnection::connectionReady before doing
-   * anything with it, and skip it if it's not ready.
-   *
-   * @pre mRegistrationMutex is not held
-   *
-   * @param  aConnections
-   *         An inout param;  it is cleared and the connections are appended to
-   *         it.
-   * @return The open connections.
-   */
-  void getConnections(nsTArray<nsRefPtr<Connection> >& aConnections);
-
-private:
-  Service();
-  virtual ~Service();
-
-  /**
-   * Used for 1) locking around calls when initializing connections so that we
-   * can ensure that the state of sqlite3_enable_shared_cache is sane and 2)
-   * synchronizing access to mLocaleCollation.
-   */
-  Mutex mMutex;
-  
-  sqlite3_vfs *mSqliteVFS;
-
-  /**
-   * Protects mConnections.
-   */
-  Mutex mRegistrationMutex;
-
-  /**
-   * The list of connections we have created.  Modifications to it are
-   * protected by |mRegistrationMutex|.
-   */
-  nsTArray<nsRefPtr<Connection> > mConnections;
-
-  /**
-   * Frees as much heap memory as possible from all of the known open
-   * connections.
-   */
-  void minimizeMemory();
-
-  /**
-   * Shuts down the storage service, freeing all of the acquired resources.
-   */
-  void shutdown();
-
-  /**
-   * Lazily creates and returns a collation created from the application's
-   * locale that all statements of all Connections of this Service may use.
-   * Since the collation's lifetime is that of the Service and no statement may
-   * execute outside the lifetime of the Service, this method returns a raw
-   * pointer.
-   */
-  nsICollation *getLocaleCollation();
-
-  /**
-   * Lazily created collation that all statements of all Connections of this
-   * Service may use.  The collation is created from the application's locale.
-   *
-   * @note Collation implementations are platform-dependent and in general not
-   *       thread-safe.  Access to this collation should be synchronized.
-   */
-  nsCOMPtr<nsICollation> mLocaleCollation;
-
-  nsCOMPtr<nsIFile> mProfileStorageFile;
-
-  nsCOMPtr<nsIMemoryReporter> mStorageSQLiteReporter;
-
-  static Service *gService;
-
-  static nsIXPConnect *sXPConnect;
-
-  static int32_t sSynchronousPref;
-  static int32_t sDefaultPageSize;
-};
-
-} // namespace storage
-} // namespace mozilla
-
-#endif /* MOZSTORAGESERVICE_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageSQLFunctions.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageSQLFunctions.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageSQLFunctions.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageSQLFunctions.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,452 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 "mozStorageSQLFunctions.h"
-#include "nsUnicharUtils.h"
-#include <algorithm>
-
-namespace mozilla {
-namespace storage {
-
-////////////////////////////////////////////////////////////////////////////////
-//// Local Helper Functions
-
-namespace {
-
-/**
- * Performs the LIKE comparison of a string against a pattern.  For more detail
- * see http://www.sqlite.org/lang_expr.html#like.
- *
- * @param aPatternItr
- *        An iterator at the start of the pattern to check for.
- * @param aPatternEnd
- *        An iterator at the end of the pattern to check for.
- * @param aStringItr
- *        An iterator at the start of the string to check for the pattern.
- * @param aStringEnd
- *        An iterator at the end of the string to check for the pattern.
- * @param aEscapeChar
- *        The character to use for escaping symbols in the pattern.
- * @return 1 if the pattern is found, 0 otherwise.
- */
-int
-likeCompare(nsAString::const_iterator aPatternItr,
-            nsAString::const_iterator aPatternEnd,
-            nsAString::const_iterator aStringItr,
-            nsAString::const_iterator aStringEnd,
-            char16_t aEscapeChar)
-{
-  const char16_t MATCH_ALL('%');
-  const char16_t MATCH_ONE('_');
-
-  bool lastWasEscape = false;
-  while (aPatternItr != aPatternEnd) {
-    /**
-     * What we do in here is take a look at each character from the input
-     * pattern, and do something with it.  There are 4 possibilities:
-     * 1) character is an un-escaped match-all character
-     * 2) character is an un-escaped match-one character
-     * 3) character is an un-escaped escape character
-     * 4) character is not any of the above
-     */
-    if (!lastWasEscape && *aPatternItr == MATCH_ALL) {
-      // CASE 1
-      /**
-       * Now we need to skip any MATCH_ALL or MATCH_ONE characters that follow a
-       * MATCH_ALL character.  For each MATCH_ONE character, skip one character
-       * in the pattern string.
-       */
-      while (*aPatternItr == MATCH_ALL || *aPatternItr == MATCH_ONE) {
-        if (*aPatternItr == MATCH_ONE) {
-          // If we've hit the end of the string we are testing, no match
-          if (aStringItr == aStringEnd)
-            return 0;
-          aStringItr++;
-        }
-        aPatternItr++;
-      }
-
-      // If we've hit the end of the pattern string, match
-      if (aPatternItr == aPatternEnd)
-        return 1;
-
-      while (aStringItr != aStringEnd) {
-        if (likeCompare(aPatternItr, aPatternEnd, aStringItr, aStringEnd,
-                        aEscapeChar)) {
-          // we've hit a match, so indicate this
-          return 1;
-        }
-        aStringItr++;
-      }
-
-      // No match
-      return 0;
-    }
-    else if (!lastWasEscape && *aPatternItr == MATCH_ONE) {
-      // CASE 2
-      if (aStringItr == aStringEnd) {
-        // If we've hit the end of the string we are testing, no match
-        return 0;
-      }
-      aStringItr++;
-      lastWasEscape = false;
-    }
-    else if (!lastWasEscape && *aPatternItr == aEscapeChar) {
-      // CASE 3
-      lastWasEscape = true;
-    }
-    else {
-      // CASE 4
-      if (::ToUpperCase(*aStringItr) != ::ToUpperCase(*aPatternItr)) {
-        // If we've hit a point where the strings don't match, there is no match
-        return 0;
-      }
-      aStringItr++;
-      lastWasEscape = false;
-    }
-
-    aPatternItr++;
-  }
-
-  return aStringItr == aStringEnd;
-}
-
-/**
- * This class manages a dynamic array.  It can represent an array of any 
- * reasonable size, but if the array is "N" elements or smaller, it will be
- * stored using fixed space inside the auto array itself.  If the auto array
- * is a local variable, this internal storage will be allocated cheaply on the
- * stack, similar to nsAutoString.  If a larger size is requested, the memory
- * will be dynamically allocated from the heap.  Since the destructor will
- * free any heap-allocated memory, client code doesn't need to care where the
- * memory came from.
- */
-template <class T, size_t N> class AutoArray
-{
-
-public:
-
-  explicit AutoArray(size_t size)
-  : mBuffer(size <= N ? mAutoBuffer : new T[size])
-  {
-  }
-
-  ~AutoArray()
-  { 
-    if (mBuffer != mAutoBuffer)
-      delete[] mBuffer; 
-  }
-
-  /**
-   * Return the pointer to the allocated array.
-   * @note If the array allocation failed, get() will return nullptr!
-   *
-   * @return the pointer to the allocated array
-   */
-  T *get() 
-  {
-    return mBuffer; 
-  }
-
-private:
-  T *mBuffer;           // Points to mAutoBuffer if we can use it, heap otherwise.
-  T mAutoBuffer[N];     // The internal memory buffer that we use if we can.
-};
-
-/**
- * Compute the Levenshtein Edit Distance between two strings.
- * 
- * @param aStringS
- *        a string
- * @param aStringT
- *        another string
- * @param _result
- *        an outparam that will receive the edit distance between the arguments
- * @return a Sqlite result code, e.g. SQLITE_OK, SQLITE_NOMEM, etc.
- */
-int
-levenshteinDistance(const nsAString &aStringS,
-                    const nsAString &aStringT,
-                    int *_result)
-{
-    // Set the result to a non-sensical value in case we encounter an error.
-    *_result = -1;
-
-    const uint32_t sLen = aStringS.Length();
-    const uint32_t tLen = aStringT.Length();
-
-    if (sLen == 0) {
-      *_result = tLen;
-      return SQLITE_OK;
-    }
-    if (tLen == 0) {
-      *_result = sLen;
-      return SQLITE_OK;
-    }
-
-    // Notionally, Levenshtein Distance is computed in a matrix.  If we 
-    // assume s = "span" and t = "spam", the matrix would look like this:
-    //    s -->
-    //  t          s   p   a   n
-    //  |      0   1   2   3   4
-    //  V  s   1   *   *   *   *
-    //     p   2   *   *   *   *
-    //     a   3   *   *   *   *
-    //     m   4   *   *   *   *
-    //
-    // Note that the row width is sLen + 1 and the column height is tLen + 1,
-    // where sLen is the length of the string "s" and tLen is the length of "t".
-    // The first row and the first column are initialized as shown, and
-    // the algorithm computes the remaining cells row-by-row, and
-    // left-to-right within each row.  The computation only requires that
-    // we be able to see the current row and the previous one.
-
-    // Allocate memory for two rows.  Use AutoArray's to manage the memory
-    // so we don't have to explicitly free it, and so we can avoid the expense
-    // of memory allocations for relatively small strings.
-    AutoArray<int, nsAutoString::kDefaultStorageSize> row1(sLen + 1);
-    AutoArray<int, nsAutoString::kDefaultStorageSize> row2(sLen + 1);
-
-    // Declare the raw pointers that will actually be used to access the memory.
-    int *prevRow = row1.get();
-    NS_ENSURE_TRUE(prevRow, SQLITE_NOMEM);
-    int *currRow = row2.get();
-    NS_ENSURE_TRUE(currRow, SQLITE_NOMEM);
-
-    // Initialize the first row.
-    for (uint32_t i = 0; i <= sLen; i++)
-        prevRow[i] = i;
-
-    const char16_t *s = aStringS.BeginReading();
-    const char16_t *t = aStringT.BeginReading();
-
-    // Compute the empty cells in the "matrix" row-by-row, starting with
-    // the second row.
-    for (uint32_t ti = 1; ti <= tLen; ti++) {
-
-        // Initialize the first cell in this row.
-        currRow[0] = ti;
-
-        // Get the character from "t" that corresponds to this row.
-        const char16_t tch = t[ti - 1];
-
-        // Compute the remaining cells in this row, left-to-right,
-        // starting at the second column (and first character of "s").
-        for (uint32_t si = 1; si <= sLen; si++) {
-            
-            // Get the character from "s" that corresponds to this column,
-            // compare it to the t-character, and compute the "cost".
-            const char16_t sch = s[si - 1];
-            int cost = (sch == tch) ? 0 : 1;
-
-            // ............ We want to calculate the value of cell "d" from
-            // ...ab....... the previously calculated (or initialized) cells
-            // ...cd....... "a", "b", and "c", where d = min(a', b', c').
-            // ............ 
-            int aPrime = prevRow[si - 1] + cost;
-            int bPrime = prevRow[si] + 1;
-            int cPrime = currRow[si - 1] + 1;
-            currRow[si] = std::min(aPrime, std::min(bPrime, cPrime));
-        }
-
-        // Advance to the next row.  The current row becomes the previous
-        // row and we recycle the old previous row as the new current row.
-        // We don't need to re-initialize the new current row since we will
-        // rewrite all of its cells anyway.
-        int *oldPrevRow = prevRow;
-        prevRow = currRow;
-        currRow = oldPrevRow;
-    }
-
-    // The final result is the value of the last cell in the last row.
-    // Note that that's now in the "previous" row, since we just swapped them.
-    *_result = prevRow[sLen];
-    return SQLITE_OK;
-}
-
-// This struct is used only by registerFunctions below, but ISO C++98 forbids
-// instantiating a template dependent on a locally-defined type.  Boo-urns!
-struct Functions {
-  const char *zName;
-  int nArg;
-  int enc;
-  void *pContext;
-  void (*xFunc)(::sqlite3_context*, int, sqlite3_value**);
-};
-
-} // anonymous namespace
-
-////////////////////////////////////////////////////////////////////////////////
-//// Exposed Functions
-
-int
-registerFunctions(sqlite3 *aDB)
-{
-  Functions functions[] = {
-    {"lower",               
-      1, 
-      SQLITE_UTF16, 
-      0,        
-      caseFunction},
-    {"lower",               
-      1, 
-      SQLITE_UTF8,  
-      0,        
-      caseFunction},
-    {"upper",               
-      1, 
-      SQLITE_UTF16, 
-      (void*)1, 
-      caseFunction},
-    {"upper",               
-      1, 
-      SQLITE_UTF8,  
-      (void*)1, 
-      caseFunction},
-
-    {"like",                
-      2, 
-      SQLITE_UTF16, 
-      0,        
-      likeFunction},
-    {"like",                
-      2, 
-      SQLITE_UTF8,  
-      0,        
-      likeFunction},
-    {"like",                
-      3, 
-      SQLITE_UTF16, 
-      0,        
-      likeFunction},
-    {"like",                
-      3, 
-      SQLITE_UTF8,  
-      0,        
-      likeFunction},
-
-    {"levenshteinDistance", 
-      2, 
-      SQLITE_UTF16, 
-      0,        
-      levenshteinDistanceFunction},
-    {"levenshteinDistance", 
-      2, 
-      SQLITE_UTF8,  
-      0,        
-      levenshteinDistanceFunction},
-  };
-
-  int rv = SQLITE_OK;
-  for (size_t i = 0; SQLITE_OK == rv && i < ArrayLength(functions); ++i) {
-    struct Functions *p = &functions[i];
-    rv = ::sqlite3_create_function(aDB, p->zName, p->nArg, p->enc, p->pContext,
-                                   p->xFunc, nullptr, nullptr);
-  }
-
-  return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//// SQL Functions
-
-void
-caseFunction(sqlite3_context *aCtx,
-             int aArgc,
-             sqlite3_value **aArgv)
-{
-  NS_ASSERTION(1 == aArgc, "Invalid number of arguments!");
-
-  nsAutoString data(static_cast<const char16_t *>(::sqlite3_value_text16(aArgv[0])));
-  bool toUpper = ::sqlite3_user_data(aCtx) ? true : false;
-
-  if (toUpper)
-    ::ToUpperCase(data);
-  else
-    ::ToLowerCase(data);
-
-  // Set the result.
-  ::sqlite3_result_text16(aCtx, data.get(), -1, SQLITE_TRANSIENT);
-}
-
-/**
- * This implements the like() SQL function.  This is used by the LIKE operator.
- * The SQL statement 'A LIKE B' is implemented as 'like(B, A)', and if there is
- * an escape character, say E, it is implemented as 'like(B, A, E)'.
- */
-void
-likeFunction(sqlite3_context *aCtx,
-             int aArgc,
-             sqlite3_value **aArgv)
-{
-  NS_ASSERTION(2 == aArgc || 3 == aArgc, "Invalid number of arguments!");
-
-  if (::sqlite3_value_bytes(aArgv[0]) > SQLITE_MAX_LIKE_PATTERN_LENGTH) {
-    ::sqlite3_result_error(aCtx, "LIKE or GLOB pattern too complex",
-                           SQLITE_TOOBIG);
-    return;
-  }
-
-  if (!::sqlite3_value_text16(aArgv[0]) || !::sqlite3_value_text16(aArgv[1]))
-    return;
-
-  nsDependentString A(static_cast<const char16_t *>(::sqlite3_value_text16(aArgv[1])));
-  nsDependentString B(static_cast<const char16_t *>(::sqlite3_value_text16(aArgv[0])));
-  NS_ASSERTION(!B.IsEmpty(), "LIKE string must not be null!");
-
-  char16_t E = 0;
-  if (3 == aArgc)
-    E = static_cast<const char16_t *>(::sqlite3_value_text16(aArgv[2]))[0];
-
-  nsAString::const_iterator itrString, endString;
-  A.BeginReading(itrString);
-  A.EndReading(endString);
-  nsAString::const_iterator itrPattern, endPattern;
-  B.BeginReading(itrPattern);
-  B.EndReading(endPattern);
-  ::sqlite3_result_int(aCtx, likeCompare(itrPattern, endPattern, itrString,
-                                         endString, E));
-}
-
-void levenshteinDistanceFunction(sqlite3_context *aCtx,
-                                 int aArgc,
-                                 sqlite3_value **aArgv)
-{
-  NS_ASSERTION(2 == aArgc, "Invalid number of arguments!");
-
-  // If either argument is a SQL NULL, then return SQL NULL.
-  if (::sqlite3_value_type(aArgv[0]) == SQLITE_NULL ||
-      ::sqlite3_value_type(aArgv[1]) == SQLITE_NULL) {
-    ::sqlite3_result_null(aCtx);
-    return;
-  }
-
-  int aLen = ::sqlite3_value_bytes16(aArgv[0]) / sizeof(char16_t);
-  const char16_t *a = static_cast<const char16_t *>(::sqlite3_value_text16(aArgv[0]));
-
-  int bLen = ::sqlite3_value_bytes16(aArgv[1]) / sizeof(char16_t);
-  const char16_t *b = static_cast<const char16_t *>(::sqlite3_value_text16(aArgv[1]));
-
-  // Compute the Levenshtein Distance, and return the result (or error).
-  int distance = -1;
-  const nsDependentString A(a, aLen);
-  const nsDependentString B(b, bLen);
-  int status = levenshteinDistance(A, B, &distance);
-  if (status == SQLITE_OK) {
-    ::sqlite3_result_int(aCtx, distance);    
-  }
-  else if (status == SQLITE_NOMEM) {
-    ::sqlite3_result_error_nomem(aCtx);
-  }
-  else {
-    ::sqlite3_result_error(aCtx, "User function returned error code", -1);
-  }
-}
-
-} // namespace storage
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageSQLFunctions.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageSQLFunctions.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageSQLFunctions.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageSQLFunctions.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 mozStorageSQLFunctions_h
-#define mozStorageSQLFunctions_h
-
-#include "sqlite3.h"
-#include "nscore.h"
-
-namespace mozilla {
-namespace storage {
-
-/**
- * Registers the functions declared here with the specified database.
- *
- * @param aDB
- *        The database we'll be registering the functions with.
- * @return the SQLite status code indicating success or failure.
- */
-int registerFunctions(sqlite3 *aDB);
-
-////////////////////////////////////////////////////////////////////////////////
-//// Predefined Functions
-
-/**
- * Overridden function to perform the SQL functions UPPER and LOWER.  These
- * support unicode, which the default implementations do not do.
- *
- * @param aCtx
- *        The sqlite_context that this function is being called on.
- * @param aArgc
- *        The number of arguments the function is being called with.
- * @param aArgv
- *        An array of the arguments the functions is being called with.
- */
-void caseFunction(sqlite3_context *aCtx,
-                              int aArgc,
-                              sqlite3_value **aArgv);
-
-/**
- * Overridden function to perform the SQL function LIKE.  This supports unicode,
- * which the default implementation does not do.
- *
- * @param aCtx
- *        The sqlite_context that this function is being called on.
- * @param aArgc
- *        The number of arguments the function is being called with.
- * @param aArgv
- *        An array of the arguments the functions is being called with.
- */
-void likeFunction(sqlite3_context *aCtx,
-                              int aArgc,
-                              sqlite3_value **aArgv);
-
-/**
- * An implementation of the Levenshtein Edit Distance algorithm for use in
- * Sqlite queries.
- * 
- * @param aCtx
- *        The sqlite_context that this function is being called on.
- * @param aArgc
- *        The number of arguments the function is being called with.
- * @param aArgv
- *        An array of the arguments the functions is being called with.
- */
-void levenshteinDistanceFunction(sqlite3_context *aCtx,
-                                             int aArgc,
-                                             sqlite3_value **aArgv);
-
-} // namespace storage
-} // namespace mozilla
-
-#endif // mozStorageSQLFunctions_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageStatement.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageStatement.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageStatement.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageStatement.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,905 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 <limits.h>
-#include <stdio.h>
-
-#include "nsError.h"
-#include "nsMemory.h"
-#include "nsThreadUtils.h"
-#include "nsIClassInfoImpl.h"
-#include "Variant.h"
-
-#include "mozIStorageError.h"
-
-#include "mozStorageBindingParams.h"
-#include "mozStorageConnection.h"
-#include "mozStorageStatementJSHelper.h"
-#include "mozStoragePrivateHelpers.h"
-#include "mozStorageStatementParams.h"
-#include "mozStorageStatementRow.h"
-#include "mozStorageStatement.h"
-#include "GeckoProfiler.h"
-#include "nsDOMClassInfo.h"
-
-#include "prlog.h"
-
-
-#ifdef PR_LOGGING
-extern PRLogModuleInfo* gStorageLog;
-#endif
-
-namespace mozilla {
-namespace storage {
-
-////////////////////////////////////////////////////////////////////////////////
-//// nsIClassInfo
-
-NS_IMPL_CI_INTERFACE_GETTER(Statement,
-                            mozIStorageStatement,
-                            mozIStorageBaseStatement,
-                            mozIStorageBindingParams,
-                            mozIStorageValueArray,
-                            mozilla::storage::StorageBaseStatementInternal)
-
-class StatementClassInfo : public nsIClassInfo
-{
-public:
-  MOZ_CONSTEXPR StatementClassInfo() {}
-
-  NS_DECL_ISUPPORTS_INHERITED
-
-  NS_IMETHODIMP
-  GetInterfaces(uint32_t *_count, nsIID ***_array) override
-  {
-    return NS_CI_INTERFACE_GETTER_NAME(Statement)(_count, _array);
-  }
-
-  NS_IMETHODIMP
-  GetScriptableHelper(nsIXPCScriptable **_helper) override
-  {
-    static StatementJSHelper sJSHelper;
-    *_helper = &sJSHelper;
-    return NS_OK;
-  }
-
-  NS_IMETHODIMP
-  GetContractID(char **_contractID) override
-  {
-    *_contractID = nullptr;
-    return NS_OK;
-  }
-
-  NS_IMETHODIMP
-  GetClassDescription(char **_desc) override
-  {
-    *_desc = nullptr;
-    return NS_OK;
-  }
-
-  NS_IMETHODIMP
-  GetClassID(nsCID **_id) override
-  {
-    *_id = nullptr;
-    return NS_OK;
-  }
-
-  NS_IMETHODIMP
-  GetFlags(uint32_t *_flags) override
-  {
-    *_flags = 0;
-    return NS_OK;
-  }
-
-  NS_IMETHODIMP
-  GetClassIDNoAlloc(nsCID *_cid) override
-  {
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-};
-
-NS_IMETHODIMP_(MozExternalRefCountType) StatementClassInfo::AddRef() { return 2; }
-NS_IMETHODIMP_(MozExternalRefCountType) StatementClassInfo::Release() { return 1; }
-NS_IMPL_QUERY_INTERFACE(StatementClassInfo, nsIClassInfo)
-
-static StatementClassInfo sStatementClassInfo;
-
-////////////////////////////////////////////////////////////////////////////////
-//// Statement
-
-Statement::Statement()
-: StorageBaseStatementInternal()
-, mDBStatement(nullptr)
-, mColumnNames()
-, mExecuting(false)
-{
-}
-
-nsresult
-Statement::initialize(Connection *aDBConnection,
-                      sqlite3 *aNativeConnection,
-                      const nsACString &aSQLStatement)
-{
-  MOZ_ASSERT(aDBConnection, "No database connection given!");
-  MOZ_ASSERT(!aDBConnection->isClosed(), "Database connection should be valid");
-  MOZ_ASSERT(!mDBStatement, "Statement already initialized!");
-  MOZ_ASSERT(aNativeConnection, "No native connection given!");
-
-  int srv = aDBConnection->prepareStatement(aNativeConnection,
-                                            PromiseFlatCString(aSQLStatement),
-                                            &mDBStatement);
-  if (srv != SQLITE_OK) {
-      PR_LOG(gStorageLog, PR_LOG_ERROR,
-             ("Sqlite statement prepare error: %d '%s'", srv,
-              ::sqlite3_errmsg(aNativeConnection)));
-      PR_LOG(gStorageLog, PR_LOG_ERROR,
-             ("Statement was: '%s'", PromiseFlatCString(aSQLStatement).get()));
-      return NS_ERROR_FAILURE;
-    }
-
-  PR_LOG(gStorageLog, PR_LOG_NOTICE, ("Initialized statement '%s' (0x%p)",
-                                      PromiseFlatCString(aSQLStatement).get(),
-                                      mDBStatement));
-
-  mDBConnection = aDBConnection;
-  mNativeConnection = aNativeConnection;
-  mParamCount = ::sqlite3_bind_parameter_count(mDBStatement);
-  mResultColumnCount = ::sqlite3_column_count(mDBStatement);
-  mColumnNames.Clear();
-
-  for (uint32_t i = 0; i < mResultColumnCount; i++) {
-      const char *name = ::sqlite3_column_name(mDBStatement, i);
-      (void)mColumnNames.AppendElement(nsDependentCString(name));
-  }
-
-#ifdef DEBUG
-  // We want to try and test for LIKE and that consumers are using
-  // escapeStringForLIKE instead of just trusting user input.  The idea to
-  // check to see if they are binding a parameter after like instead of just
-  // using a string.  We only do this in debug builds because it's expensive!
-  const nsCaseInsensitiveCStringComparator c;
-  nsACString::const_iterator start, end, e;
-  aSQLStatement.BeginReading(start);
-  aSQLStatement.EndReading(end);
-  e = end;
-  while (::FindInReadable(NS_LITERAL_CSTRING(" LIKE"), start, e, c)) {
-    // We have a LIKE in here, so we perform our tests
-    // FindInReadable moves the iterator, so we have to get a new one for
-    // each test we perform.
-    nsACString::const_iterator s1, s2, s3;
-    s1 = s2 = s3 = start;
-
-    if (!(::FindInReadable(NS_LITERAL_CSTRING(" LIKE ?"), s1, end, c) ||
-          ::FindInReadable(NS_LITERAL_CSTRING(" LIKE :"), s2, end, c) ||
-          ::FindInReadable(NS_LITERAL_CSTRING(" LIKE @"), s3, end, c))) {
-      // At this point, we didn't find a LIKE statement followed by ?, :,
-      // or @, all of which are valid characters for binding a parameter.
-      // We will warn the consumer that they may not be safely using LIKE.
-      NS_WARNING("Unsafe use of LIKE detected!  Please ensure that you "
-                 "are using mozIStorageStatement::escapeStringForLIKE "
-                 "and that you are binding that result to the statement "
-                 "to prevent SQL injection attacks.");
-    }
-
-    // resetting start and e
-    start = e;
-    e = end;
-  }
-#endif
-
-  return NS_OK;
-}
-
-mozIStorageBindingParams *
-Statement::getParams()
-{
-  nsresult rv;
-
-  // If we do not have an array object yet, make it.
-  if (!mParamsArray) {
-    nsCOMPtr<mozIStorageBindingParamsArray> array;
-    rv = NewBindingParamsArray(getter_AddRefs(array));
-    NS_ENSURE_SUCCESS(rv, nullptr);
-
-    mParamsArray = static_cast<BindingParamsArray *>(array.get());
-  }
-
-  // If there isn't already any rows added, we'll have to add one to use.
-  if (mParamsArray->length() == 0) {
-    nsRefPtr<BindingParams> params(new BindingParams(mParamsArray, this));
-    NS_ENSURE_TRUE(params, nullptr);
-
-    rv = mParamsArray->AddParams(params);
-    NS_ENSURE_SUCCESS(rv, nullptr);
-
-    // We have to unlock our params because AddParams locks them.  This is safe
-    // because no reference to the params object was, or ever will be given out.
-    params->unlock(this);
-
-    // We also want to lock our array at this point - we don't want anything to
-    // be added to it.  Nothing has, or will ever get a reference to it, but we
-    // will get additional safety checks via assertions by doing this.
-    mParamsArray->lock();
-  }
-
-  return *mParamsArray->begin();
-}
-
-Statement::~Statement()
-{
-  (void)internalFinalize(true);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//// nsISupports
-
-NS_IMPL_ADDREF(Statement)
-NS_IMPL_RELEASE(Statement)
-
-NS_INTERFACE_MAP_BEGIN(Statement)
-  NS_INTERFACE_MAP_ENTRY(mozIStorageStatement)
-  NS_INTERFACE_MAP_ENTRY(mozIStorageBaseStatement)
-  NS_INTERFACE_MAP_ENTRY(mozIStorageBindingParams)
-  NS_INTERFACE_MAP_ENTRY(mozIStorageValueArray)
-  NS_INTERFACE_MAP_ENTRY(mozilla::storage::StorageBaseStatementInternal)
-  if (aIID.Equals(NS_GET_IID(nsIClassInfo))) {
-    foundInterface = static_cast<nsIClassInfo *>(&sStatementClassInfo);
-  }
-  else
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, mozIStorageStatement)
-NS_INTERFACE_MAP_END
-
-
-////////////////////////////////////////////////////////////////////////////////
-//// StorageBaseStatementInternal
-
-Connection *
-Statement::getOwner()
-{
-  return mDBConnection;
-}
-
-int
-Statement::getAsyncStatement(sqlite3_stmt **_stmt)
-{
-  // If we have no statement, we shouldn't be calling this method!
-  NS_ASSERTION(mDBStatement != nullptr, "We have no statement to clone!");
-
-  // If we do not yet have a cached async statement, clone our statement now.
-  if (!mAsyncStatement) {
-    nsDependentCString sql(::sqlite3_sql(mDBStatement));
-    int rc = mDBConnection->prepareStatement(mNativeConnection, sql,
-                                             &mAsyncStatement);
-    if (rc != SQLITE_OK) {
-      *_stmt = nullptr;
-      return rc;
-    }
-
-    PR_LOG(gStorageLog, PR_LOG_NOTICE,
-           ("Cloned statement 0x%p to 0x%p", mDBStatement, mAsyncStatement));
-  }
-
-  *_stmt = mAsyncStatement;
-  return SQLITE_OK;
-}
-
-nsresult
-Statement::getAsynchronousStatementData(StatementData &_data)
-{
-  if (!mDBStatement)
-    return NS_ERROR_UNEXPECTED;
-
-  sqlite3_stmt *stmt;
-  int rc = getAsyncStatement(&stmt);
-  if (rc != SQLITE_OK)
-    return convertResultCode(rc);
-
-  _data = StatementData(stmt, bindingParamsArray(), this);
-
-  return NS_OK;
-}
-
-already_AddRefed<mozIStorageBindingParams>
-Statement::newBindingParams(mozIStorageBindingParamsArray *aOwner)
-{
-  nsCOMPtr<mozIStorageBindingParams> params = new BindingParams(aOwner, this);
-  return params.forget();
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-//// mozIStorageStatement
-
-// proxy to StorageBaseStatementInternal using its define helper.
-MIXIN_IMPL_STORAGEBASESTATEMENTINTERNAL(Statement, (void)0;)
-
-NS_IMETHODIMP
-Statement::Clone(mozIStorageStatement **_statement)
-{
-  nsRefPtr<Statement> statement(new Statement());
-  NS_ENSURE_TRUE(statement, NS_ERROR_OUT_OF_MEMORY);
-
-  nsAutoCString sql(::sqlite3_sql(mDBStatement));
-  nsresult rv = statement->initialize(mDBConnection, mNativeConnection, sql);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  statement.forget(_statement);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Statement::Finalize()
-{
-  return internalFinalize(false);
-}
-
-nsresult
-Statement::internalFinalize(bool aDestructing)
-{
-  if (!mDBStatement)
-    return NS_OK;
-
-  int srv = SQLITE_OK;
-
-  if (!mDBConnection->isClosed()) {
-    //
-    // The connection is still open. While statement finalization and
-    // closing may, in some cases, take place in two distinct threads,
-    // we have a guarantee that the connection will remain open until
-    // this method terminates:
-    //
-    // a. The connection will be closed synchronously. In this case,
-    // there is no race condition, as everything takes place on the
-    // same thread.
-    //
-    // b. The connection is closed asynchronously and this code is
-    // executed on the opener thread. In this case, asyncClose() has
-    // not been called yet and will not be called before we return
-    // from this function.
-    //
-    // c. The connection is closed asynchronously and this code is
-    // executed on the async execution thread. In this case,
-    // AsyncCloseConnection::Run() has not been called yet and will
-    // not be called before we return from this function.
-    //
-    // In either case, the connection is still valid, hence closing
-    // here is safe.
-    //
-    PR_LOG(gStorageLog, PR_LOG_NOTICE, ("Finalizing statement '%s' during garbage-collection",
-                                        ::sqlite3_sql(mDBStatement)));
-    srv = ::sqlite3_finalize(mDBStatement);
-  }
-#ifdef DEBUG
-  else {
-    //
-    // The database connection is either closed or closing. The sqlite
-    // statement has either been finalized already by the connection
-    // or is about to be finalized by the connection.
-    //
-    // Finalizing it here would be useless and segfaultish.
-    //
-
-    char *msg = ::PR_smprintf("SQL statement (%x) should have been finalized"
-      " before garbage-collection. For more details on this statement, set"
-      " NSPR_LOG_MESSAGES=mozStorage:5 .",
-      mDBStatement);
-
-    //
-    // Note that we can't display the statement itself, as the data structure
-    // is not valid anymore. However, the address shown here should help
-    // developers correlate with the more complete debug message triggered
-    // by AsyncClose().
-    //
-
-#if 0
-    // Deactivate the warning until we have fixed the exising culprit
-    // (see bug 914070).
-    NS_WARNING(msg);
-#endif // 0
-
-    PR_LOG(gStorageLog, PR_LOG_WARNING, (msg));
-
-    ::PR_smprintf_free(msg);
-  }
-
-#endif
-
-  mDBStatement = nullptr;
-
-  if (mAsyncStatement) {
-    // If the destructor called us, there are no pending async statements (they
-    // hold a reference to us) and we can/must just kill the statement directly.
-    if (aDestructing)
-      destructorAsyncFinalize();
-    else
-      asyncFinalize();
-  }
-
-  // Release the holders, so they can release the reference to us.
-  mStatementParamsHolder = nullptr;
-  mStatementRowHolder = nullptr;
-
-  return convertResultCode(srv);
-}
-
-NS_IMETHODIMP
-Statement::GetParameterCount(uint32_t *_parameterCount)
-{
-  if (!mDBStatement)
-    return NS_ERROR_NOT_INITIALIZED;
-
-  *_parameterCount = mParamCount;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Statement::GetParameterName(uint32_t aParamIndex,
-                            nsACString &_name)
-{
-  if (!mDBStatement)
-    return NS_ERROR_NOT_INITIALIZED;
-  ENSURE_INDEX_VALUE(aParamIndex, mParamCount);
-
-  const char *name = ::sqlite3_bind_parameter_name(mDBStatement,
-                                                   aParamIndex + 1);
-  if (name == nullptr) {
-    // this thing had no name, so fake one
-    nsAutoCString name(":");
-    name.AppendInt(aParamIndex);
-    _name.Assign(name);
-  }
-  else {
-    _name.Assign(nsDependentCString(name));
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Statement::GetParameterIndex(const nsACString &aName,
-                             uint32_t *_index)
-{
-  if (!mDBStatement)
-    return NS_ERROR_NOT_INITIALIZED;
-
-  // We do not accept any forms of names other than ":name", but we need to add
-  // the colon for SQLite.
-  nsAutoCString name(":");
-  name.Append(aName);
-  int ind = ::sqlite3_bind_parameter_index(mDBStatement, name.get());
-  if (ind  == 0) // Named parameter not found.
-    return NS_ERROR_INVALID_ARG;
-
-  *_index = ind - 1; // SQLite indexes are 1-based, we are 0-based.
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Statement::GetColumnCount(uint32_t *_columnCount)
-{
-  if (!mDBStatement)
-    return NS_ERROR_NOT_INITIALIZED;
-
-  *_columnCount = mResultColumnCount;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Statement::GetColumnName(uint32_t aColumnIndex,
-                         nsACString &_name)
-{
-  if (!mDBStatement)
-    return NS_ERROR_NOT_INITIALIZED;
-  ENSURE_INDEX_VALUE(aColumnIndex, mResultColumnCount);
-
-  const char *cname = ::sqlite3_column_name(mDBStatement, aColumnIndex);
-  _name.Assign(nsDependentCString(cname));
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Statement::GetColumnIndex(const nsACString &aName,
-                          uint32_t *_index)
-{
-  if (!mDBStatement)
-      return NS_ERROR_NOT_INITIALIZED;
-
-  // Surprisingly enough, SQLite doesn't provide an API for this.  We have to
-  // determine it ourselves sadly.
-  for (uint32_t i = 0; i < mResultColumnCount; i++) {
-    if (mColumnNames[i].Equals(aName)) {
-      *_index = i;
-      return NS_OK;
-    }
-  }
-
-  return NS_ERROR_INVALID_ARG;
-}
-
-NS_IMETHODIMP
-Statement::Reset()
-{
-  if (!mDBStatement)
-    return NS_ERROR_NOT_INITIALIZED;
-
-#ifdef DEBUG
-  PR_LOG(gStorageLog, PR_LOG_DEBUG, ("Resetting statement: '%s'",
-                                     ::sqlite3_sql(mDBStatement)));
-
-  checkAndLogStatementPerformance(mDBStatement);
-#endif
-
-  mParamsArray = nullptr;
-  (void)sqlite3_reset(mDBStatement);
-  (void)sqlite3_clear_bindings(mDBStatement);
-
-  mExecuting = false;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Statement::BindParameters(mozIStorageBindingParamsArray *aParameters)
-{
-  if (!mDBStatement)
-    return NS_ERROR_NOT_INITIALIZED;
-
-  BindingParamsArray *array = static_cast<BindingParamsArray *>(aParameters);
-  if (array->getOwner() != this)
-    return NS_ERROR_UNEXPECTED;
-
-  if (array->length() == 0)
-    return NS_ERROR_UNEXPECTED;
-
-  mParamsArray = array;
-  mParamsArray->lock();
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Statement::Execute()
-{
-  if (!mDBStatement)
-    return NS_ERROR_NOT_INITIALIZED;
-
-  bool ret;
-  nsresult rv = ExecuteStep(&ret);
-  nsresult rv2 = Reset();
-
-  return NS_FAILED(rv) ? rv : rv2;
-}
-
-NS_IMETHODIMP
-Statement::ExecuteStep(bool *_moreResults)
-{
-  PROFILER_LABEL("Statement", "ExecuteStep",
-    js::ProfileEntry::Category::STORAGE);
-
-  if (!mDBStatement)
-    return NS_ERROR_NOT_INITIALIZED;
-
-  // Bind any parameters first before executing.
-  if (mParamsArray) {
-    // If we have more than one row of parameters to bind, they shouldn't be
-    // calling this method (and instead use executeAsync).
-    if (mParamsArray->length() != 1)
-      return NS_ERROR_UNEXPECTED;
-
-    BindingParamsArray::iterator row = mParamsArray->begin();
-    nsCOMPtr<IStorageBindingParamsInternal> bindingInternal = 
-      do_QueryInterface(*row);
-    nsCOMPtr<mozIStorageError> error = bindingInternal->bind(mDBStatement);
-    if (error) {
-      int32_t srv;
-      (void)error->GetResult(&srv);
-      return convertResultCode(srv);
-    }
-
-    // We have bound, so now we can clear our array.
-    mParamsArray = nullptr;
-  }
-  int srv = mDBConnection->stepStatement(mNativeConnection, mDBStatement);
-
-#ifdef PR_LOGGING
-  if (srv != SQLITE_ROW && srv != SQLITE_DONE) {
-      nsAutoCString errStr;
-      (void)mDBConnection->GetLastErrorString(errStr);
-      PR_LOG(gStorageLog, PR_LOG_DEBUG,
-             ("Statement::ExecuteStep error: %s", errStr.get()));
-  }
-#endif
-
-  // SQLITE_ROW and SQLITE_DONE are non-errors
-  if (srv == SQLITE_ROW) {
-    // we got a row back
-    mExecuting = true;
-    *_moreResults = true;
-    return NS_OK;
-  }
-  else if (srv == SQLITE_DONE) {
-    // statement is done (no row returned)
-    mExecuting = false;
-    *_moreResults = false;
-    return NS_OK;
-  }
-  else if (srv == SQLITE_BUSY || srv == SQLITE_MISUSE) {
-    mExecuting = false;
-  }
-  else if (mExecuting) {
-    PR_LOG(gStorageLog, PR_LOG_ERROR,
-           ("SQLite error after mExecuting was true!"));
-    mExecuting = false;
-  }
-
-  return convertResultCode(srv);
-}
-
-NS_IMETHODIMP
-Statement::GetState(int32_t *_state)
-{
-  if (!mDBStatement)
-    *_state = MOZ_STORAGE_STATEMENT_INVALID;
-  else if (mExecuting)
-    *_state = MOZ_STORAGE_STATEMENT_EXECUTING;
-  else
-    *_state = MOZ_STORAGE_STATEMENT_READY;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Statement::GetColumnDecltype(uint32_t aParamIndex,
-                             nsACString &_declType)
-{
-  if (!mDBStatement)
-    return NS_ERROR_NOT_INITIALIZED;
-
-  ENSURE_INDEX_VALUE(aParamIndex, mResultColumnCount);
-
-  _declType.Assign(::sqlite3_column_decltype(mDBStatement, aParamIndex));
-  return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//// mozIStorageValueArray (now part of mozIStorageStatement too)
-
-NS_IMETHODIMP
-Statement::GetNumEntries(uint32_t *_length)
-{
-  *_length = mResultColumnCount;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Statement::GetTypeOfIndex(uint32_t aIndex,
-                          int32_t *_type)
-{
-  if (!mDBStatement)
-    return NS_ERROR_NOT_INITIALIZED;
-
-  ENSURE_INDEX_VALUE(aIndex, mResultColumnCount);
-
-  if (!mExecuting)
-    return NS_ERROR_UNEXPECTED;
-
-  int t = ::sqlite3_column_type(mDBStatement, aIndex);
-  switch (t) {
-    case SQLITE_INTEGER:
-      *_type = mozIStorageStatement::VALUE_TYPE_INTEGER;
-      break;
-    case SQLITE_FLOAT:
-      *_type = mozIStorageStatement::VALUE_TYPE_FLOAT;
-      break;
-    case SQLITE_TEXT:
-      *_type = mozIStorageStatement::VALUE_TYPE_TEXT;
-      break;
-    case SQLITE_BLOB:
-      *_type = mozIStorageStatement::VALUE_TYPE_BLOB;
-      break;
-    case SQLITE_NULL:
-      *_type = mozIStorageStatement::VALUE_TYPE_NULL;
-      break;
-    default:
-      return NS_ERROR_FAILURE;
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Statement::GetInt32(uint32_t aIndex,
-                    int32_t *_value)
-{
-  if (!mDBStatement)
-    return NS_ERROR_NOT_INITIALIZED;
-
-  ENSURE_INDEX_VALUE(aIndex, mResultColumnCount);
-
-  if (!mExecuting)
-    return NS_ERROR_UNEXPECTED;
-
-  *_value = ::sqlite3_column_int(mDBStatement, aIndex);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Statement::GetInt64(uint32_t aIndex,
-                    int64_t *_value)
-{
-  if (!mDBStatement)
-    return NS_ERROR_NOT_INITIALIZED;
-
-  ENSURE_INDEX_VALUE(aIndex, mResultColumnCount);
-
-  if (!mExecuting)
-    return NS_ERROR_UNEXPECTED;
-
-  *_value = ::sqlite3_column_int64(mDBStatement, aIndex);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Statement::GetDouble(uint32_t aIndex,
-                     double *_value)
-{
-  if (!mDBStatement)
-    return NS_ERROR_NOT_INITIALIZED;
-
-  ENSURE_INDEX_VALUE(aIndex, mResultColumnCount);
-
-  if (!mExecuting)
-    return NS_ERROR_UNEXPECTED;
-
-  *_value = ::sqlite3_column_double(mDBStatement, aIndex);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Statement::GetUTF8String(uint32_t aIndex,
-                         nsACString &_value)
-{
-  // Get type of Index will check aIndex for us, so we don't have to.
-  int32_t type;
-  nsresult rv = GetTypeOfIndex(aIndex, &type);
-  NS_ENSURE_SUCCESS(rv, rv);
-  if (type == mozIStorageStatement::VALUE_TYPE_NULL) {
-    // NULL columns should have IsVoid set to distinguish them from the empty
-    // string.
-    _value.Truncate(0);
-    _value.SetIsVoid(true);
-  }
-  else {
-    const char *value =
-      reinterpret_cast<const char *>(::sqlite3_column_text(mDBStatement,
-                                                           aIndex));
-    _value.Assign(value, ::sqlite3_column_bytes(mDBStatement, aIndex));
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Statement::GetString(uint32_t aIndex,
-                     nsAString &_value)
-{
-  // Get type of Index will check aIndex for us, so we don't have to.
-  int32_t type;
-  nsresult rv = GetTypeOfIndex(aIndex, &type);
-  NS_ENSURE_SUCCESS(rv, rv);
-  if (type == mozIStorageStatement::VALUE_TYPE_NULL) {
-    // NULL columns should have IsVoid set to distinguish them from the empty
-    // string.
-    _value.Truncate(0);
-    _value.SetIsVoid(true);
-  } else {
-    const char16_t *value =
-      static_cast<const char16_t *>(::sqlite3_column_text16(mDBStatement,
-                                                             aIndex));
-    _value.Assign(value, ::sqlite3_column_bytes16(mDBStatement, aIndex) / 2);
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Statement::GetBlob(uint32_t aIndex,
-                   uint32_t *_size,
-                   uint8_t **_blob)
-{
-  if (!mDBStatement)
-    return NS_ERROR_NOT_INITIALIZED;
-
-  ENSURE_INDEX_VALUE(aIndex, mResultColumnCount);
-
-  if (!mExecuting)
-     return NS_ERROR_UNEXPECTED;
-
-  int size = ::sqlite3_column_bytes(mDBStatement, aIndex);
-  void *blob = nullptr;
-  if (size) {
-    blob = nsMemory::Clone(::sqlite3_column_blob(mDBStatement, aIndex), size);
-    NS_ENSURE_TRUE(blob, NS_ERROR_OUT_OF_MEMORY);
-  }
-
-  *_blob = static_cast<uint8_t *>(blob);
-  *_size = size;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Statement::GetBlobAsString(uint32_t aIndex, nsAString& aValue)
-{
-  return DoGetBlobAsString(this, aIndex, aValue);
-}
-
-NS_IMETHODIMP
-Statement::GetBlobAsUTF8String(uint32_t aIndex, nsACString& aValue)
-{
-  return DoGetBlobAsString(this, aIndex, aValue);
-}
-
-NS_IMETHODIMP
-Statement::GetSharedUTF8String(uint32_t aIndex,
-                               uint32_t *_length,
-                               const char **_value)
-{
-  if (_length)
-    *_length = ::sqlite3_column_bytes(mDBStatement, aIndex);
-
-  *_value = reinterpret_cast<const char *>(::sqlite3_column_text(mDBStatement,
-                                                                 aIndex));
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Statement::GetSharedString(uint32_t aIndex,
-                           uint32_t *_length,
-                           const char16_t **_value)
-{
-  if (_length)
-    *_length = ::sqlite3_column_bytes16(mDBStatement, aIndex);
-
-  *_value = static_cast<const char16_t *>(::sqlite3_column_text16(mDBStatement,
-                                                                   aIndex));
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Statement::GetSharedBlob(uint32_t aIndex,
-                         uint32_t *_size,
-                         const uint8_t **_blob)
-{
-  *_size = ::sqlite3_column_bytes(mDBStatement, aIndex);
-  *_blob = static_cast<const uint8_t *>(::sqlite3_column_blob(mDBStatement,
-                                                              aIndex));
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Statement::GetIsNull(uint32_t aIndex,
-                     bool *_isNull)
-{
-  // Get type of Index will check aIndex for us, so we don't have to.
-  int32_t type;
-  nsresult rv = GetTypeOfIndex(aIndex, &type);
-  NS_ENSURE_SUCCESS(rv, rv);
-  *_isNull = (type == mozIStorageStatement::VALUE_TYPE_NULL);
-  return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//// mozIStorageBindingParams
-
-BOILERPLATE_BIND_PROXIES(
-  Statement, 
-  if (!mDBStatement) return NS_ERROR_NOT_INITIALIZED;
-)
-
-} // namespace storage
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageStatementData.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageStatementData.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageStatementData.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageStatementData.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,150 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=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/. */
-
-#ifndef mozStorageStatementData_h
-#define mozStorageStatementData_h
-
-#include "sqlite3.h"
-
-#include "nsAutoPtr.h"
-#include "nsTArray.h"
-#include "nsIEventTarget.h"
-#include "MainThreadUtils.h"
-
-#include "mozStorageBindingParamsArray.h"
-#include "mozIStorageBaseStatement.h"
-#include "mozStorageConnection.h"
-#include "StorageBaseStatementInternal.h"
-
-struct sqlite3_stmt;
-
-namespace mozilla {
-namespace storage {
-
-class StatementData
-{
-public:
-  StatementData(sqlite3_stmt *aStatement,
-                already_AddRefed<BindingParamsArray> aParamsArray,
-                StorageBaseStatementInternal *aStatementOwner)
-  : mStatement(aStatement)
-  , mParamsArray(aParamsArray)
-  , mStatementOwner(aStatementOwner)
-  {
-    NS_PRECONDITION(mStatementOwner, "Must have a statement owner!");
-  }
-  StatementData(const StatementData &aSource)
-  : mStatement(aSource.mStatement)
-  , mParamsArray(aSource.mParamsArray)
-  , mStatementOwner(aSource.mStatementOwner)
-  {
-    NS_PRECONDITION(mStatementOwner, "Must have a statement owner!");
-  }
-  StatementData()
-  {
-  }
-  ~StatementData()
-  {
-    // We need to ensure that mParamsArray is released on the main thread,
-    // as the binding arguments may be XPConnect values, which are safe
-    // to release only on the main thread.
-    nsCOMPtr<nsIThread> mainThread = do_GetMainThread();
-    (void)NS_ProxyRelease(mainThread, mParamsArray);
-  }
-
-  /**
-   * Return the sqlite statement, fetching it from the storage statement.  In
-   * the case of AsyncStatements this may actually create the statement 
-   */
-  inline int getSqliteStatement(sqlite3_stmt **_stmt)
-  {
-    if (!mStatement) {
-      int rc = mStatementOwner->getAsyncStatement(&mStatement);
-      NS_ENSURE_TRUE(rc == SQLITE_OK, rc);
-    }
-    *_stmt = mStatement;
-    return SQLITE_OK;
-  }
-
-  operator BindingParamsArray *() const { return mParamsArray; }
-
-  /**
-   * NULLs out our sqlite3_stmt (it is held by the owner) after reseting it and
-   * clear all bindings to it.  This is expected to occur on the async thread.
-   */
-  inline void reset()
-  {
-    NS_PRECONDITION(mStatementOwner, "Must have a statement owner!");
-#ifdef DEBUG
-    {
-      nsCOMPtr<nsIEventTarget> asyncThread =
-        mStatementOwner->getOwner()->getAsyncExecutionTarget();
-      // It's possible that we are shutting down the async thread, and this
-      // method would return nullptr as a result.
-      if (asyncThread) {
-        bool onAsyncThread;
-        NS_ASSERTION(NS_SUCCEEDED(asyncThread->IsOnCurrentThread(&onAsyncThread)) && onAsyncThread,
-                     "This should only be running on the async thread!");
-      }
-    }
-#endif
-    // In the AsyncStatement case we may never have populated mStatement if the
-    // AsyncExecuteStatements got canceled or a failure occurred in constructing
-    // the statement.
-    if (mStatement) {
-      (void)::sqlite3_reset(mStatement);
-      (void)::sqlite3_clear_bindings(mStatement);
-      mStatement = nullptr;
-    }
-  }
-
-  /**
-   * Indicates if this statement has parameters to be bound before it is
-   * executed.
-   *
-   * @return true if the statement has parameters to bind against, false
-   *         otherwise.
-   */
-  inline bool hasParametersToBeBound() const { return !!mParamsArray; }
-  /**
-   * Indicates the number of implicit statements generated by this statement
-   * requiring a transaction for execution.  For example a single statement
-   * with N BindingParams will execute N implicit staments.
-   *
-   * @return number of statements requiring a transaction for execution.
-   *
-   * @note In the case of AsyncStatements this may actually create the
-   *       statement.
-   */
-  inline uint32_t needsTransaction()
-  {
-    MOZ_ASSERT(!NS_IsMainThread());
-    // Be sure to use the getSqliteStatement helper, since sqlite3_stmt_readonly
-    // can only analyze prepared statements and AsyncStatements are prepared
-    // lazily.
-    sqlite3_stmt *stmt;
-    int rc = getSqliteStatement(&stmt);
-    if (SQLITE_OK != rc || ::sqlite3_stmt_readonly(stmt)) {
-      return 0;
-    }
-    return mParamsArray ? mParamsArray->length() : 1;
-  }
-
-private:
-  sqlite3_stmt *mStatement;
-  nsRefPtr<BindingParamsArray> mParamsArray;
-
-  /**
-   * We hold onto a reference of the statement's owner so it doesn't get
-   * destroyed out from under us.
-   */
-  nsCOMPtr<StorageBaseStatementInternal> mStatementOwner;
-};
-
-} // namespace storage
-} // namespace mozilla
-
-#endif // mozStorageStatementData_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageStatement.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageStatement.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageStatement.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageStatement.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 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 mozStorageStatement_h
-#define mozStorageStatement_h
-
-#include "nsAutoPtr.h"
-#include "nsString.h"
-
-#include "nsTArray.h"
-
-#include "mozStorageBindingParamsArray.h"
-#include "mozStorageStatementData.h"
-#include "mozIStorageStatement.h"
-#include "mozIStorageValueArray.h"
-#include "StorageBaseStatementInternal.h"
-#include "mozilla/Attributes.h"
-
-class nsIXPConnectJSObjectHolder;
-struct sqlite3_stmt;
-
-namespace mozilla {
-namespace storage {
-class StatementJSHelper;
-class Connection;
-
-class Statement final : public mozIStorageStatement
-                      , public mozIStorageValueArray
-                      , public StorageBaseStatementInternal
-{
-public:
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_MOZISTORAGESTATEMENT
-  NS_DECL_MOZISTORAGEBASESTATEMENT
-  NS_DECL_MOZISTORAGEBINDINGPARAMS
-  // NS_DECL_MOZISTORAGEVALUEARRAY (methods in mozIStorageStatement)
-  NS_DECL_STORAGEBASESTATEMENTINTERNAL
-
-  Statement();
-
-  /**
-   * Initializes the object on aDBConnection by preparing the SQL statement
-   * given by aSQLStatement.
-   *
-   * @param aDBConnection
-   *        The Connection object this statement is associated with.
-   * @param aNativeConnection
-   *        The native Sqlite connection this statement is associated with.
-   * @param aSQLStatement
-   *        The SQL statement to prepare that this object will represent.
-   */
-  nsresult initialize(Connection *aDBConnection,
-                      sqlite3* aNativeConnection,
-                      const nsACString &aSQLStatement);
-
-
-  /**
-   * Obtains the native statement pointer.
-   */
-  inline sqlite3_stmt *nativeStatement() { return mDBStatement; }
-
-  /**
-   * Obtains and transfers ownership of the array of parameters that are bound
-   * to this statment.  This can be null.
-   */
-  inline already_AddRefed<BindingParamsArray> bindingParamsArray()
-  {
-    return mParamsArray.forget();
-  }
-
-private:
-    ~Statement();
-
-    sqlite3_stmt *mDBStatement;
-    uint32_t mParamCount;
-    uint32_t mResultColumnCount;
-    nsTArray<nsCString> mColumnNames;
-    bool mExecuting;
-
-    /**
-     * @return a pointer to the BindingParams object to use with our Bind*
-     *         method.
-     */
-    mozIStorageBindingParams *getParams();
-
-    /**
-     * Holds the array of parameters to bind to this statement when we execute
-     * it asynchronously.
-     */
-    nsRefPtr<BindingParamsArray> mParamsArray;
-
-    /**
-     * The following two members are only used with the JS helper.  They cache
-     * the row and params objects.
-     */
-    nsMainThreadPtrHandle<nsIXPConnectJSObjectHolder> mStatementParamsHolder;
-    nsMainThreadPtrHandle<nsIXPConnectJSObjectHolder> mStatementRowHolder;
-
-  /**
-   * Internal version of finalize that allows us to tell it if it is being
-   * called from the destructor so it can know not to dispatch events that
-   * require a reference to us.
-   *
-   * @param aDestructing
-   *        Is the destructor calling?
-   */
-  nsresult internalFinalize(bool aDestructing);
-
-  friend class StatementJSHelper;
-};
-
-} // storage
-} // mozilla
-
-#endif // mozStorageStatement_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageStatementJSHelper.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageStatementJSHelper.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageStatementJSHelper.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageStatementJSHelper.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,285 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 "nsIXPConnect.h"
-#include "mozStorageStatement.h"
-#include "mozStorageService.h"
-
-#include "nsMemory.h"
-#include "nsString.h"
-#include "nsServiceManagerUtils.h"
-
-#include "mozStorageStatementJSHelper.h"
-
-#include "mozStorageStatementRow.h"
-#include "mozStorageStatementParams.h"
-
-#include "jsapi.h"
-
-namespace mozilla {
-namespace storage {
-
-////////////////////////////////////////////////////////////////////////////////
-//// Global Functions
-
-static
-bool
-stepFunc(JSContext *aCtx,
-         uint32_t,
-         jsval *_vp)
-{
-  nsCOMPtr<nsIXPConnect> xpc(Service::getXPConnect());
-  nsCOMPtr<nsIXPConnectWrappedNative> wrapper;
-  JSObject *obj = JS_THIS_OBJECT(aCtx, _vp);
-  if (!obj) {
-    return false;
-  }
-
-  nsresult rv =
-    xpc->GetWrappedNativeOfJSObject(aCtx, obj, getter_AddRefs(wrapper));
-  if (NS_FAILED(rv)) {
-    ::JS_ReportError(aCtx, "mozIStorageStatement::step() could not obtain native statement");
-    return false;
-  }
-
-#ifdef DEBUG
-  {
-    nsCOMPtr<mozIStorageStatement> isStatement(
-      do_QueryInterface(wrapper->Native())
-    );
-    NS_ASSERTION(isStatement, "How is this not a statement?!");
-  }
-#endif
-
-  Statement *stmt = static_cast<Statement *>(
-    static_cast<mozIStorageStatement *>(wrapper->Native())
-  );
-
-  bool hasMore = false;
-  rv = stmt->ExecuteStep(&hasMore);
-  if (NS_SUCCEEDED(rv) && !hasMore) {
-    *_vp = JSVAL_FALSE;
-    (void)stmt->Reset();
-    return true;
-  }
-
-  if (NS_FAILED(rv)) {
-    ::JS_ReportError(aCtx, "mozIStorageStatement::step() returned an error");
-    return false;
-  }
-
-  *_vp = BOOLEAN_TO_JSVAL(hasMore);
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//// StatementJSHelper
-
-nsresult
-StatementJSHelper::getRow(Statement *aStatement,
-                          JSContext *aCtx,
-                          JSObject *aScopeObj,
-                          jsval *_row)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  nsresult rv;
-
-#ifdef DEBUG
-  int32_t state;
-  (void)aStatement->GetState(&state);
-  NS_ASSERTION(state == mozIStorageStatement::MOZ_STORAGE_STATEMENT_EXECUTING,
-               "Invalid state to get the row object - all calls will fail!");
-#endif
-
-  if (!aStatement->mStatementRowHolder) {
-    JS::RootedObject scope(aCtx, aScopeObj);
-    nsCOMPtr<mozIStorageStatementRow> row(new StatementRow(aStatement));
-    NS_ENSURE_TRUE(row, NS_ERROR_OUT_OF_MEMORY);
-
-    nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
-    nsCOMPtr<nsIXPConnect> xpc(Service::getXPConnect());
-    rv = xpc->WrapNative(
-      aCtx,
-      ::JS_GetGlobalForObject(aCtx, scope),
-      row,
-      NS_GET_IID(mozIStorageStatementRow),
-      getter_AddRefs(holder)
-    );
-    NS_ENSURE_SUCCESS(rv, rv);
-    nsRefPtr<StatementRowHolder> rowHolder = new StatementRowHolder(holder);
-    aStatement->mStatementRowHolder =
-      new nsMainThreadPtrHolder<nsIXPConnectJSObjectHolder>(rowHolder);
-  }
-
-  JS::Rooted<JSObject*> obj(aCtx);
-  obj = aStatement->mStatementRowHolder->GetJSObject();
-  NS_ENSURE_STATE(obj);
-
-  *_row = OBJECT_TO_JSVAL(obj);
-  return NS_OK;
-}
-
-nsresult
-StatementJSHelper::getParams(Statement *aStatement,
-                             JSContext *aCtx,
-                             JSObject *aScopeObj,
-                             jsval *_params)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  nsresult rv;
-
-#ifdef DEBUG
-  int32_t state;
-  (void)aStatement->GetState(&state);
-  NS_ASSERTION(state == mozIStorageStatement::MOZ_STORAGE_STATEMENT_READY,
-               "Invalid state to get the params object - all calls will fail!");
-#endif
-
-  if (!aStatement->mStatementParamsHolder) {
-    JS::RootedObject scope(aCtx, aScopeObj);
-    nsCOMPtr<mozIStorageStatementParams> params =
-      new StatementParams(aStatement);
-    NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);
-
-    nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
-    nsCOMPtr<nsIXPConnect> xpc(Service::getXPConnect());
-    rv = xpc->WrapNative(
-      aCtx,
-      ::JS_GetGlobalForObject(aCtx, scope),
-      params,
-      NS_GET_IID(mozIStorageStatementParams),
-      getter_AddRefs(holder)
-    );
-    NS_ENSURE_SUCCESS(rv, rv);
-    nsRefPtr<StatementParamsHolder> paramsHolder =
-      new StatementParamsHolder(holder);
-    aStatement->mStatementParamsHolder =
-      new nsMainThreadPtrHolder<nsIXPConnectJSObjectHolder>(paramsHolder);
-  }
-
-  JS::Rooted<JSObject*> obj(aCtx);
-  obj = aStatement->mStatementParamsHolder->GetJSObject();
-  NS_ENSURE_STATE(obj);
-
-  *_params = OBJECT_TO_JSVAL(obj);
-  return NS_OK;
-}
-
-NS_IMETHODIMP_(MozExternalRefCountType) StatementJSHelper::AddRef() { return 2; }
-NS_IMETHODIMP_(MozExternalRefCountType) StatementJSHelper::Release() { return 1; }
-NS_INTERFACE_MAP_BEGIN(StatementJSHelper)
-  NS_INTERFACE_MAP_ENTRY(nsIXPCScriptable)
-  NS_INTERFACE_MAP_ENTRY(nsISupports)
-NS_INTERFACE_MAP_END
-
-////////////////////////////////////////////////////////////////////////////////
-//// nsIXPCScriptable
-
-#define XPC_MAP_CLASSNAME StatementJSHelper
-#define XPC_MAP_QUOTED_CLASSNAME "StatementJSHelper"
-#define XPC_MAP_WANT_GETPROPERTY
-#define XPC_MAP_WANT_RESOLVE
-#define XPC_MAP_FLAGS nsIXPCScriptable::ALLOW_PROP_MODS_DURING_RESOLVE
-#include "xpc_map_end.h"
-
-NS_IMETHODIMP
-StatementJSHelper::GetProperty(nsIXPConnectWrappedNative *aWrapper,
-                               JSContext *aCtx,
-                               JSObject *aScopeObj,
-                               jsid aId,
-                               jsval *_result,
-                               bool *_retval)
-{
-  if (!JSID_IS_STRING(aId))
-    return NS_OK;
-
-  JS::Rooted<JSObject*> scope(aCtx, aScopeObj);
-  JS::Rooted<jsid> id(aCtx, aId);
-
-#ifdef DEBUG
-  {
-    nsCOMPtr<mozIStorageStatement> isStatement(
-                                     do_QueryInterface(aWrapper->Native()));
-    NS_ASSERTION(isStatement, "How is this not a statement?!");
-  }
-#endif
-
-  Statement *stmt = static_cast<Statement *>(
-    static_cast<mozIStorageStatement *>(aWrapper->Native())
-  );
-
-  JSFlatString *str = JSID_TO_FLAT_STRING(id);
-  if (::JS_FlatStringEqualsAscii(str, "row"))
-    return getRow(stmt, aCtx, scope, _result);
-
-  if (::JS_FlatStringEqualsAscii(str, "params"))
-    return getParams(stmt, aCtx, scope, _result);
-
-  return NS_OK;
-}
-
-
-NS_IMETHODIMP
-StatementJSHelper::Resolve(nsIXPConnectWrappedNative *aWrapper,
-                           JSContext *aCtx, JSObject *aScopeObj,
-                           jsid aId, bool *aResolvedp,
-                           bool *_retval)
-{
-  if (!JSID_IS_STRING(aId))
-    return NS_OK;
-
-  JS::RootedObject scope(aCtx, aScopeObj);
-  if (::JS_FlatStringEqualsAscii(JSID_TO_FLAT_STRING(aId), "step")) {
-    *_retval = ::JS_DefineFunction(aCtx, scope, "step", stepFunc,
-                                   0, 0) != nullptr;
-    *aResolvedp = true;
-    return NS_OK;
-  }
-  return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//// StatementJSObjectHolder
-
-NS_IMPL_ISUPPORTS(StatementJSObjectHolder, nsIXPConnectJSObjectHolder);
-
-JSObject*
-StatementJSObjectHolder::GetJSObject()
-{
-  return mHolder->GetJSObject();
-}
-
-StatementJSObjectHolder::StatementJSObjectHolder(nsIXPConnectJSObjectHolder* aHolder)
-  : mHolder(aHolder)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(mHolder);
-}
-
-StatementParamsHolder::~StatementParamsHolder()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  // We are considered dead at this point, so any wrappers for row or params
-  // need to lose their reference to the statement.
-  nsCOMPtr<nsIXPConnectWrappedNative> wrapper = do_QueryInterface(mHolder);
-  nsCOMPtr<mozIStorageStatementParams> iObj = do_QueryWrappedNative(wrapper);
-  StatementParams *obj = static_cast<StatementParams *>(iObj.get());
-  obj->mStatement = nullptr;
-}
-
-StatementRowHolder::~StatementRowHolder()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  // We are considered dead at this point, so any wrappers for row or params
-  // need to lose their reference to the statement.
-  nsCOMPtr<nsIXPConnectWrappedNative> wrapper = do_QueryInterface(mHolder);
-  nsCOMPtr<mozIStorageStatementRow> iObj = do_QueryWrappedNative(wrapper);
-  StatementRow *obj = static_cast<StatementRow *>(iObj.get());
-  obj->mStatement = nullptr;
-}
-
-} // namespace storage
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageStatementJSHelper.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageStatementJSHelper.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageStatementJSHelper.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageStatementJSHelper.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 MOZSTORAGESTATEMENTJSHELPER_H
-#define MOZSTORAGESTATEMENTJSHELPER_H
-
-#include "nsIXPCScriptable.h"
-#include "nsIXPConnect.h"
-
-class Statement;
-
-namespace mozilla {
-namespace storage {
-
-class StatementJSHelper : public nsIXPCScriptable
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIXPCSCRIPTABLE
-
-private:
-  nsresult getRow(Statement *, JSContext *, JSObject *, JS::Value *);
-  nsresult getParams(Statement *, JSContext *, JSObject *, JS::Value *);
-};
-
-/**
- * Wrappers used to clean up the references JS helpers hold to the statement.
- * For cycle-avoidance reasons they do not hold reference-counted references,
- * so it is important we do this.
- */
-class StatementJSObjectHolder : public nsIXPConnectJSObjectHolder
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIXPCONNECTJSOBJECTHOLDER
-
-  explicit StatementJSObjectHolder(nsIXPConnectJSObjectHolder* aHolder);
-
-protected:
-  virtual ~StatementJSObjectHolder() {};
-  nsCOMPtr<nsIXPConnectJSObjectHolder> mHolder;
-};
-
-class StatementParamsHolder final: public StatementJSObjectHolder {
-public:
-  explicit StatementParamsHolder(nsIXPConnectJSObjectHolder* aHolder)
-    : StatementJSObjectHolder(aHolder) {
-  }
-
-private:
-  virtual ~StatementParamsHolder();
-};
-
-class StatementRowHolder final: public StatementJSObjectHolder {
-public:
-  explicit StatementRowHolder(nsIXPConnectJSObjectHolder* aHolder)
-    : StatementJSObjectHolder(aHolder) {
-  }
-
-private:
-  virtual ~StatementRowHolder();
-};
-
-} // namespace storage
-} // namespace mozilla
-
-#endif // MOZSTORAGESTATEMENTJSHELPER_H
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageStatementParams.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageStatementParams.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageStatementParams.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageStatementParams.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,179 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 "nsJSUtils.h"
-#include "nsMemory.h"
-#include "nsString.h"
-
-#include "jsapi.h"
-
-#include "mozStoragePrivateHelpers.h"
-#include "mozStorageStatementParams.h"
-#include "mozIStorageStatement.h"
-
-namespace mozilla {
-namespace storage {
-
-////////////////////////////////////////////////////////////////////////////////
-//// StatementParams
-
-StatementParams::StatementParams(mozIStorageStatement *aStatement) :
-    mStatement(aStatement)
-{
-  NS_ASSERTION(mStatement != nullptr, "mStatement is null");
-  (void)mStatement->GetParameterCount(&mParamCount);
-}
-
-NS_IMPL_ISUPPORTS(
-  StatementParams,
-  mozIStorageStatementParams,
-  nsIXPCScriptable
-)
-
-////////////////////////////////////////////////////////////////////////////////
-//// nsIXPCScriptable
-
-#define XPC_MAP_CLASSNAME StatementParams
-#define XPC_MAP_QUOTED_CLASSNAME "StatementParams"
-#define XPC_MAP_WANT_SETPROPERTY
-#define XPC_MAP_WANT_NEWENUMERATE
-#define XPC_MAP_WANT_RESOLVE
-#define XPC_MAP_FLAGS nsIXPCScriptable::ALLOW_PROP_MODS_DURING_RESOLVE
-#include "xpc_map_end.h"
-
-NS_IMETHODIMP
-StatementParams::SetProperty(nsIXPConnectWrappedNative *aWrapper,
-                             JSContext *aCtx,
-                             JSObject *aScopeObj,
-                             jsid aId,
-                             JS::Value *_vp,
-                             bool *_retval)
-{
-  NS_ENSURE_TRUE(mStatement, NS_ERROR_NOT_INITIALIZED);
-
-  if (JSID_IS_INT(aId)) {
-    int idx = JSID_TO_INT(aId);
-
-    nsCOMPtr<nsIVariant> variant(convertJSValToVariant(aCtx, *_vp));
-    NS_ENSURE_TRUE(variant, NS_ERROR_UNEXPECTED);
-    nsresult rv = mStatement->BindByIndex(idx, variant);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-  else if (JSID_IS_STRING(aId)) {
-    JSString *str = JSID_TO_STRING(aId);
-    nsAutoJSString autoStr;
-    if (!autoStr.init(aCtx, str)) {
-      return NS_ERROR_FAILURE;
-    }
-
-    NS_ConvertUTF16toUTF8 name(autoStr);
-
-    // check to see if there's a parameter with this name
-    nsCOMPtr<nsIVariant> variant(convertJSValToVariant(aCtx, *_vp));
-    NS_ENSURE_TRUE(variant, NS_ERROR_UNEXPECTED);
-    nsresult rv = mStatement->BindByName(name, variant);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-  else {
-    return NS_ERROR_INVALID_ARG;
-  }
-
-  *_retval = true;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-StatementParams::NewEnumerate(nsIXPConnectWrappedNative *aWrapper,
-                              JSContext *aCtx,
-                              JSObject *aScopeObj,
-                              JS::AutoIdVector &aProperties,
-                              bool *_retval)
-{
-  NS_ENSURE_TRUE(mStatement, NS_ERROR_NOT_INITIALIZED);
-  JS::RootedObject scope(aCtx, aScopeObj);
-
-  if (!aProperties.reserve(mParamCount)) {
-    *_retval = false;
-    return NS_OK;
-  }
-
-  for (uint32_t i = 0; i < mParamCount; i++) {
-    // Get the name of our parameter.
-    nsAutoCString name;
-    nsresult rv = mStatement->GetParameterName(i, name);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    // But drop the first character, which is going to be a ':'.
-    JS::RootedString jsname(aCtx, ::JS_NewStringCopyN(aCtx, &(name.get()[1]),
-                                                      name.Length() - 1));
-    NS_ENSURE_TRUE(jsname, NS_ERROR_OUT_OF_MEMORY);
-
-    // Set our name.
-    JS::Rooted<jsid> id(aCtx);
-    if (!::JS_StringToId(aCtx, jsname, &id)) {
-      *_retval = false;
-      return NS_OK;
-    }
-
-    aProperties.infallibleAppend(id);
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-StatementParams::Resolve(nsIXPConnectWrappedNative *aWrapper,
-                         JSContext *aCtx,
-                         JSObject *aScopeObj,
-                         jsid aId,
-                         bool *resolvedp,
-                         bool *_retval)
-{
-  NS_ENSURE_TRUE(mStatement, NS_ERROR_NOT_INITIALIZED);
-  // We do not throw at any point after this unless our index is out of range
-  // because we want to allow the prototype chain to be checked for the
-  // property.
-
-  JS::RootedObject scope(aCtx, aScopeObj);
-  JS::RootedId id(aCtx, aId);
-  bool resolved = false;
-  bool ok = true;
-  if (JSID_IS_INT(id)) {
-    uint32_t idx = JSID_TO_INT(id);
-
-    // Ensure that our index is within range.  We do not care about the
-    // prototype chain being checked here.
-    if (idx >= mParamCount)
-      return NS_ERROR_INVALID_ARG;
-
-    ok = ::JS_DefineElement(aCtx, scope, idx, JS::UndefinedHandleValue, JSPROP_ENUMERATE);
-    resolved = true;
-  }
-  else if (JSID_IS_STRING(id)) {
-    JSString *str = JSID_TO_STRING(id);
-    nsAutoJSString autoStr;
-    if (!autoStr.init(aCtx, str)) {
-      return NS_ERROR_FAILURE;
-    }
-
-    // Check to see if there's a parameter with this name, and if not, let
-    // the rest of the prototype chain be checked.
-    NS_ConvertUTF16toUTF8 name(autoStr);
-    uint32_t idx;
-    nsresult rv = mStatement->GetParameterIndex(name, &idx);
-    if (NS_SUCCEEDED(rv)) {
-      ok = ::JS_DefinePropertyById(aCtx, scope, id, JS::UndefinedHandleValue, JSPROP_ENUMERATE);
-      resolved = true;
-    }
-  }
-
-  *_retval = ok;
-  *resolvedp = resolved && ok;
-  return NS_OK;
-}
-
-} // namespace storage
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageStatementParams.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageStatementParams.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageStatementParams.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageStatementParams.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 MOZSTORAGESTATEMENTPARAMS_H
-#define MOZSTORAGESTATEMENTPARAMS_H
-
-#include "mozIStorageStatementParams.h"
-#include "nsIXPCScriptable.h"
-#include "mozilla/Attributes.h"
-
-class mozIStorageStatement;
-
-namespace mozilla {
-namespace storage {
-
-class StatementParams final : public mozIStorageStatementParams
-                            , public nsIXPCScriptable
-{
-public:
-  explicit StatementParams(mozIStorageStatement *aStatement);
-
-  // interfaces
-  NS_DECL_ISUPPORTS
-  NS_DECL_MOZISTORAGESTATEMENTPARAMS
-  NS_DECL_NSIXPCSCRIPTABLE
-
-protected:
-  ~StatementParams() {}
-
-  mozIStorageStatement *mStatement;
-  uint32_t mParamCount;
-
-  friend class StatementParamsHolder;
-  friend class StatementRowHolder;
-};
-
-} // namespace storage
-} // namespace mozilla
-
-#endif /* MOZSTORAGESTATEMENTPARAMS_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageStatementRow.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageStatementRow.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageStatementRow.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageStatementRow.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,154 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 "nsMemory.h"
-#include "nsString.h"
-
-#include "mozStorageStatementRow.h"
-#include "mozStorageStatement.h"
-
-#include "jsapi.h"
-
-namespace mozilla {
-namespace storage {
-
-////////////////////////////////////////////////////////////////////////////////
-//// StatementRow
-
-StatementRow::StatementRow(Statement *aStatement)
-: mStatement(aStatement)
-{
-}
-
-NS_IMPL_ISUPPORTS(
-  StatementRow,
-  mozIStorageStatementRow,
-  nsIXPCScriptable
-)
-
-////////////////////////////////////////////////////////////////////////////////
-//// nsIXPCScriptable
-
-#define XPC_MAP_CLASSNAME StatementRow
-#define XPC_MAP_QUOTED_CLASSNAME "StatementRow"
-#define XPC_MAP_WANT_GETPROPERTY
-#define XPC_MAP_WANT_RESOLVE
-#define XPC_MAP_FLAGS nsIXPCScriptable::ALLOW_PROP_MODS_DURING_RESOLVE
-#include "xpc_map_end.h"
-
-NS_IMETHODIMP
-StatementRow::GetProperty(nsIXPConnectWrappedNative *aWrapper,
-                          JSContext *aCtx,
-                          JSObject *aScopeObj,
-                          jsid aId,
-                          jsval *_vp,
-                          bool *_retval)
-{
-  NS_ENSURE_TRUE(mStatement, NS_ERROR_NOT_INITIALIZED);
-
-  JS::RootedObject scope(aCtx, aScopeObj);
-  if (JSID_IS_STRING(aId)) {
-    ::JSAutoByteString idBytes(aCtx, JSID_TO_STRING(aId));
-    NS_ENSURE_TRUE(!!idBytes, NS_ERROR_OUT_OF_MEMORY);
-    nsDependentCString jsid(idBytes.ptr());
-
-    uint32_t idx;
-    nsresult rv = mStatement->GetColumnIndex(jsid, &idx);
-    NS_ENSURE_SUCCESS(rv, rv);
-    int32_t type;
-    rv = mStatement->GetTypeOfIndex(idx, &type);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    if (type == mozIStorageValueArray::VALUE_TYPE_INTEGER ||
-        type == mozIStorageValueArray::VALUE_TYPE_FLOAT) {
-      double dval;
-      rv = mStatement->GetDouble(idx, &dval);
-      NS_ENSURE_SUCCESS(rv, rv);
-      *_vp = ::JS_NumberValue(dval);
-    }
-    else if (type == mozIStorageValueArray::VALUE_TYPE_TEXT) {
-      uint32_t bytes;
-      const char16_t *sval = reinterpret_cast<const char16_t *>(
-        static_cast<mozIStorageStatement *>(mStatement)->
-          AsSharedWString(idx, &bytes)
-      );
-      JSString *str = ::JS_NewUCStringCopyN(aCtx, sval, bytes / 2);
-      if (!str) {
-        *_retval = false;
-        return NS_OK;
-      }
-      *_vp = STRING_TO_JSVAL(str);
-    }
-    else if (type == mozIStorageValueArray::VALUE_TYPE_BLOB) {
-      uint32_t length;
-      const uint8_t *blob = static_cast<mozIStorageStatement *>(mStatement)->
-        AsSharedBlob(idx, &length);
-      JSObject *obj = ::JS_NewArrayObject(aCtx, length);
-      if (!obj) {
-        *_retval = false;
-        return NS_OK;
-      }
-      *_vp = OBJECT_TO_JSVAL(obj);
-
-      // Copy the blob over to the JS array.
-      for (uint32_t i = 0; i < length; i++) {
-        if (!::JS_DefineElement(aCtx, scope, i, blob[i], JSPROP_ENUMERATE)) {
-          *_retval = false;
-          return NS_OK;
-        }
-      }
-    }
-    else if (type == mozIStorageValueArray::VALUE_TYPE_NULL) {
-      *_vp = JSVAL_NULL;
-    }
-    else {
-      NS_ERROR("unknown column type returned, what's going on?");
-    }
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-StatementRow::Resolve(nsIXPConnectWrappedNative *aWrapper,
-                      JSContext *aCtx,
-                      JSObject *aScopeObj,
-                      jsid aId,
-                      bool *aResolvedp,
-                      bool *_retval)
-{
-  JS::Rooted<JSObject*> scopeObj(aCtx, aScopeObj);
-
-  NS_ENSURE_TRUE(mStatement, NS_ERROR_NOT_INITIALIZED);
-  // We do not throw at any point after this because we want to allow the
-  // prototype chain to be checked for the property.
-
-  if (JSID_IS_STRING(aId)) {
-    ::JSAutoByteString idBytes(aCtx, JSID_TO_STRING(aId));
-    NS_ENSURE_TRUE(!!idBytes, NS_ERROR_OUT_OF_MEMORY);
-    nsDependentCString name(idBytes.ptr());
-
-    uint32_t idx;
-    nsresult rv = mStatement->GetColumnIndex(name, &idx);
-    if (NS_FAILED(rv)) {
-      // It's highly likely that the name doesn't exist, so let the JS engine
-      // check the prototype chain and throw if that doesn't have the property
-      // either.
-      *aResolvedp = false;
-      return NS_OK;
-    }
-
-    JS::Rooted<jsid> id(aCtx, aId);
-    *_retval = ::JS_DefinePropertyById(aCtx, scopeObj, id, JS::UndefinedHandleValue, 0);
-    *aResolvedp = true;
-    return NS_OK;
-  }
-
-  return NS_OK;
-}
-
-} // namespace storage
-} // namescape mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageStatementRow.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageStatementRow.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/mozStorageStatementRow.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/mozStorageStatementRow.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 MOZSTORAGESTATEMENTROW_H
-#define MOZSTORAGESTATEMENTROW_H
-
-#include "mozIStorageStatementRow.h"
-#include "nsIXPCScriptable.h"
-#include "mozilla/Attributes.h"
-
-namespace mozilla {
-namespace storage {
-
-class Statement;
-
-class StatementRow final : public mozIStorageStatementRow
-                         , public nsIXPCScriptable
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_MOZISTORAGESTATEMENTROW
-  NS_DECL_NSIXPCSCRIPTABLE
-
-  explicit StatementRow(Statement *aStatement);
-protected:
-
-  ~StatementRow() {}
-
-  Statement *mStatement;
-
-  friend class StatementRowHolder;
-};
-
-} // namespace storage
-} // namespace mozilla
-
-#endif /* MOZSTORAGESTATEMENTROW_H */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/SQLCollations.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/src/SQLCollations.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/SQLCollations.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/SQLCollations.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,242 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 "SQLCollations.h"
-
-namespace mozilla {
-namespace storage {
-
-////////////////////////////////////////////////////////////////////////////////
-//// Local Helper Functions
-
-namespace {
-
-/**
- * Helper function for the UTF-8 locale collations.
- *
- * @param  aService
- *         The Service that owns the nsICollation used by this collation.
- * @param  aLen1
- *         The number of bytes in aStr1.
- * @param  aStr1
- *         The string to be compared against aStr2 as provided by SQLite.  It
- *         must be a non-null-terminated char* buffer.
- * @param  aLen2
- *         The number of bytes in aStr2.
- * @param  aStr2
- *         The string to be compared against aStr1 as provided by SQLite.  It
- *         must be a non-null-terminated char* buffer.
- * @param  aComparisonStrength
- *         The sorting strength, one of the nsICollation constants.
- * @return aStr1 - aStr2.  That is, if aStr1 < aStr2, returns a negative number.
- *         If aStr1 > aStr2, returns a positive number.  If aStr1 == aStr2,
- *         returns 0.
- */
-int
-localeCollationHelper8(void *aService,
-                       int aLen1,
-                       const void *aStr1,
-                       int aLen2,
-                       const void *aStr2,
-                       int32_t aComparisonStrength)
-{
-  NS_ConvertUTF8toUTF16 str1(static_cast<const char *>(aStr1), aLen1);
-  NS_ConvertUTF8toUTF16 str2(static_cast<const char *>(aStr2), aLen2);
-  Service *serv = static_cast<Service *>(aService);
-  return serv->localeCompareStrings(str1, str2, aComparisonStrength);
-}
-
-/**
- * Helper function for the UTF-16 locale collations.
- *
- * @param  aService
- *         The Service that owns the nsICollation used by this collation.
- * @param  aLen1
- *         The number of bytes (not characters) in aStr1.
- * @param  aStr1
- *         The string to be compared against aStr2 as provided by SQLite.  It
- *         must be a non-null-terminated char16_t* buffer.
- * @param  aLen2
- *         The number of bytes (not characters) in aStr2.
- * @param  aStr2
- *         The string to be compared against aStr1 as provided by SQLite.  It
- *         must be a non-null-terminated char16_t* buffer.
- * @param  aComparisonStrength
- *         The sorting strength, one of the nsICollation constants.
- * @return aStr1 - aStr2.  That is, if aStr1 < aStr2, returns a negative number.
- *         If aStr1 > aStr2, returns a positive number.  If aStr1 == aStr2,
- *         returns 0.
- */
-int
-localeCollationHelper16(void *aService,
-                        int aLen1,
-                        const void *aStr1,
-                        int aLen2,
-                        const void *aStr2,
-                        int32_t aComparisonStrength)
-{
-  const char16_t *buf1 = static_cast<const char16_t *>(aStr1);
-  const char16_t *buf2 = static_cast<const char16_t *>(aStr2);
-
-  // The second argument to the nsDependentSubstring constructor is exclusive:
-  // It points to the char16_t immediately following the last one in the target
-  // substring.  Since aLen1 and aLen2 are in bytes, divide by sizeof(char16_t)
-  // so that the pointer arithmetic is correct.
-  nsDependentSubstring str1(buf1, buf1 + (aLen1 / sizeof(char16_t)));
-  nsDependentSubstring str2(buf2, buf2 + (aLen2 / sizeof(char16_t)));
-  Service *serv = static_cast<Service *>(aService);
-  return serv->localeCompareStrings(str1, str2, aComparisonStrength);
-}
-
-// This struct is used only by registerCollations below, but ISO C++98 forbids
-// instantiating a template dependent on a locally-defined type.  Boo-urns!
-struct Collations {
-  const char *zName;
-  int enc;
-  int(*xCompare)(void*, int, const void*, int, const void*);
-};
-
-} // anonymous namespace
-
-////////////////////////////////////////////////////////////////////////////////
-//// Exposed Functions
-
-int
-registerCollations(sqlite3 *aDB,
-                   Service *aService)
-{
-  Collations collations[] = {
-    {"locale",
-     SQLITE_UTF8,
-     localeCollation8},
-    {"locale_case_sensitive",
-     SQLITE_UTF8,
-     localeCollationCaseSensitive8},
-    {"locale_accent_sensitive",
-     SQLITE_UTF8,
-     localeCollationAccentSensitive8},
-    {"locale_case_accent_sensitive",
-     SQLITE_UTF8,
-     localeCollationCaseAccentSensitive8},
-    {"locale",
-     SQLITE_UTF16,
-     localeCollation16},
-    {"locale_case_sensitive",
-     SQLITE_UTF16,
-     localeCollationCaseSensitive16},
-    {"locale_accent_sensitive",
-     SQLITE_UTF16,
-     localeCollationAccentSensitive16},
-    {"locale_case_accent_sensitive",
-     SQLITE_UTF16,
-     localeCollationCaseAccentSensitive16},
-  };
-
-  int rv = SQLITE_OK;
-  for (size_t i = 0; SQLITE_OK == rv && i < ArrayLength(collations); ++i) {
-    struct Collations *p = &collations[i];
-    rv = ::sqlite3_create_collation(aDB, p->zName, p->enc, aService,
-                                    p->xCompare);
-  }
-
-  return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//// SQL Collations
-
-int
-localeCollation8(void *aService,
-                 int aLen1,
-                 const void *aStr1,
-                 int aLen2,
-                 const void *aStr2)
-{
-  return localeCollationHelper8(aService, aLen1, aStr1, aLen2, aStr2,
-                                nsICollation::kCollationCaseInSensitive);
-}
-
-int
-localeCollationCaseSensitive8(void *aService,
-                              int aLen1,
-                              const void *aStr1,
-                              int aLen2,
-                              const void *aStr2)
-{
-  return localeCollationHelper8(aService, aLen1, aStr1, aLen2, aStr2,
-                                nsICollation::kCollationAccentInsenstive);
-}
-
-int
-localeCollationAccentSensitive8(void *aService,
-                                int aLen1,
-                                const void *aStr1,
-                                int aLen2,
-                                const void *aStr2)
-{
-  return localeCollationHelper8(aService, aLen1, aStr1, aLen2, aStr2,
-                                nsICollation::kCollationCaseInsensitiveAscii);
-}
-
-int
-localeCollationCaseAccentSensitive8(void *aService,
-                                    int aLen1,
-                                    const void *aStr1,
-                                    int aLen2,
-                                    const void *aStr2)
-{
-  return localeCollationHelper8(aService, aLen1, aStr1, aLen2, aStr2,
-                                nsICollation::kCollationCaseSensitive);
-}
-
-int
-localeCollation16(void *aService,
-                  int aLen1,
-                  const void *aStr1,
-                  int aLen2,
-                  const void *aStr2)
-{
-  return localeCollationHelper16(aService, aLen1, aStr1, aLen2, aStr2,
-                                 nsICollation::kCollationCaseInSensitive);
-}
-
-int
-localeCollationCaseSensitive16(void *aService,
-                               int aLen1,
-                               const void *aStr1,
-                               int aLen2,
-                               const void *aStr2)
-{
-  return localeCollationHelper16(aService, aLen1, aStr1, aLen2, aStr2,
-                                 nsICollation::kCollationAccentInsenstive);
-}
-
-int
-localeCollationAccentSensitive16(void *aService,
-                                 int aLen1,
-                                 const void *aStr1,
-                                 int aLen2,
-                                 const void *aStr2)
-{
-  return localeCollationHelper16(aService, aLen1, aStr1, aLen2, aStr2,
-                                 nsICollation::kCollationCaseInsensitiveAscii);
-}
-
-int
-localeCollationCaseAccentSensitive16(void *aService,
-                                     int aLen1,
-                                     const void *aStr1,
-                                     int aLen2,
-                                     const void *aStr2)
-{
-  return localeCollationHelper16(aService, aLen1, aStr1, aLen2, aStr2,
-                                 nsICollation::kCollationCaseSensitive);
-}
-
-} // namespace storage
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/SQLCollations.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/SQLCollations.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/SQLCollations.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/SQLCollations.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,249 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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_storage_SQLCollations_h
-#define mozilla_storage_SQLCollations_h
-
-#include "mozStorageService.h"
-#include "nscore.h"
-#include "nsString.h"
-
-#include "sqlite3.h"
-
-namespace mozilla {
-namespace storage {
-
-/**
- * Registers the collating sequences declared here with the specified
- * database and Service.
- *
- * @param  aDB
- *         The database we'll be registering the collations with.
- * @param  aService
- *         The Service that owns the nsICollation used by our collations.
- * @return the SQLite status code indicating success or failure.
- */
-int registerCollations(sqlite3 *aDB, Service *aService);
-
-////////////////////////////////////////////////////////////////////////////////
-//// Predefined Functions
-
-/**
- * Custom UTF-8 collating sequence that respects the application's locale.
- * Comparison is case- and accent-insensitive.  This is called by SQLite.
- *
- * @param  aService
- *         The Service that owns the nsICollation used by this collation.
- * @param  aLen1
- *         The number of bytes in aStr1.
- * @param  aStr1
- *         The string to be compared against aStr2.  It will be passed in by
- *         SQLite as a non-null-terminated char* buffer.
- * @param  aLen2
- *         The number of bytes in aStr2.
- * @param  aStr2
- *         The string to be compared against aStr1.  It will be passed in by
- *         SQLite as a non-null-terminated char* buffer.
- * @return aStr1 - aStr2.  That is, if aStr1 < aStr2, returns a negative number.
- *         If aStr1 > aStr2, returns a positive number.  If aStr1 == aStr2,
- *         returns 0.
- */
-int localeCollation8(void *aService,
-                                 int aLen1,
-                                 const void *aStr1,
-                                 int aLen2,
-                                 const void *aStr2);
-
-/**
- * Custom UTF-8 collating sequence that respects the application's locale.
- * Comparison is case-sensitive and accent-insensitive.  This is called by
- * SQLite.
- *
- * @param  aService
- *         The Service that owns the nsICollation used by this collation.
- * @param  aLen1
- *         The number of bytes in aStr1.
- * @param  aStr1
- *         The string to be compared against aStr2.  It will be passed in by
- *         SQLite as a non-null-terminated char* buffer.
- * @param  aLen2
- *         The number of bytes in aStr2.
- * @param  aStr2
- *         The string to be compared against aStr1.  It will be passed in by
- *         SQLite as a non-null-terminated char* buffer.
- * @return aStr1 - aStr2.  That is, if aStr1 < aStr2, returns a negative number.
- *         If aStr1 > aStr2, returns a positive number.  If aStr1 == aStr2,
- *         returns 0.
- */
-int localeCollationCaseSensitive8(void *aService,
-                                              int aLen1,
-                                              const void *aStr1,
-                                              int aLen2,
-                                              const void *aStr2);
-
-/**
- * Custom UTF-8 collating sequence that respects the application's locale.
- * Comparison is case-insensitive and accent-sensitive.  This is called by
- * SQLite.
- *
- * @param  aService
- *         The Service that owns the nsICollation used by this collation.
- * @param  aLen1
- *         The number of bytes in aStr1.
- * @param  aStr1
- *         The string to be compared against aStr2.  It will be passed in by
- *         SQLite as a non-null-terminated char* buffer.
- * @param  aLen2
- *         The number of bytes in aStr2.
- * @param  aStr2
- *         The string to be compared against aStr1.  It will be passed in by
- *         SQLite as a non-null-terminated char* buffer.
- * @return aStr1 - aStr2.  That is, if aStr1 < aStr2, returns a negative number.
- *         If aStr1 > aStr2, returns a positive number.  If aStr1 == aStr2,
- *         returns 0.
- */
-int localeCollationAccentSensitive8(void *aService,
-                                                int aLen1,
-                                                const void *aStr1,
-                                                int aLen2,
-                                                const void *aStr2);
-
-/**
- * Custom UTF-8 collating sequence that respects the application's locale.
- * Comparison is case- and accent-sensitive.  This is called by SQLite.
- *
- * @param  aService
- *         The Service that owns the nsICollation used by this collation.
- * @param  aLen1
- *         The number of bytes in aStr1.
- * @param  aStr1
- *         The string to be compared against aStr2.  It will be passed in by
- *         SQLite as a non-null-terminated char* buffer.
- * @param  aLen2
- *         The number of bytes in aStr2.
- * @param  aStr2
- *         The string to be compared against aStr1.  It will be passed in by
- *         SQLite as a non-null-terminated char* buffer.
- * @return aStr1 - aStr2.  That is, if aStr1 < aStr2, returns a negative number.
- *         If aStr1 > aStr2, returns a positive number.  If aStr1 == aStr2,
- *         returns 0.
- */
-int localeCollationCaseAccentSensitive8(void *aService,
-                                                    int aLen1,
-                                                    const void *aStr1,
-                                                    int aLen2,
-                                                    const void *aStr2);
-
-/**
- * Custom UTF-16 collating sequence that respects the application's locale.
- * Comparison is case- and accent-insensitive.  This is called by SQLite.
- *
- * @param  aService
- *         The Service that owns the nsICollation used by this collation.
- * @param  aLen1
- *         The number of bytes (not characters) in aStr1.
- * @param  aStr1
- *         The string to be compared against aStr2.  It will be passed in by
- *         SQLite as a non-null-terminated char16_t* buffer.
- * @param  aLen2
- *         The number of bytes (not characters) in aStr2.
- * @param  aStr2
- *         The string to be compared against aStr1.  It will be passed in by
- *         SQLite as a non-null-terminated char16_t* buffer.
- * @return aStr1 - aStr2.  That is, if aStr1 < aStr2, returns a negative number.
- *         If aStr1 > aStr2, returns a positive number.  If aStr1 == aStr2,
- *         returns 0.
- */
-int localeCollation16(void *aService,
-                                  int aLen1,
-                                  const void *aStr1,
-                                  int aLen2,
-                                  const void *aStr2);
-
-/**
- * Custom UTF-16 collating sequence that respects the application's locale.
- * Comparison is case-sensitive and accent-insensitive.  This is called by
- * SQLite.
- *
- * @param  aService
- *         The Service that owns the nsICollation used by this collation.
- * @param  aLen1
- *         The number of bytes (not characters) in aStr1.
- * @param  aStr1
- *         The string to be compared against aStr2.  It will be passed in by
- *         SQLite as a non-null-terminated char16_t* buffer.
- * @param  aLen2
- *         The number of bytes (not characters) in aStr2.
- * @param  aStr2
- *         The string to be compared against aStr1.  It will be passed in by
- *         SQLite as a non-null-terminated char16_t* buffer.
- * @return aStr1 - aStr2.  That is, if aStr1 < aStr2, returns a negative number.
- *         If aStr1 > aStr2, returns a positive number.  If aStr1 == aStr2,
- *         returns 0.
- */
-int localeCollationCaseSensitive16(void *aService,
-                                               int aLen1,
-                                               const void *aStr1,
-                                               int aLen2,
-                                               const void *aStr2);
-
-/**
- * Custom UTF-16 collating sequence that respects the application's locale.
- * Comparison is case-insensitive and accent-sensitive.  This is called by
- * SQLite.
- *
- * @param  aService
- *         The Service that owns the nsICollation used by this collation.
- * @param  aLen1
- *         The number of bytes (not characters) in aStr1.
- * @param  aStr1
- *         The string to be compared against aStr2.  It will be passed in by
- *         SQLite as a non-null-terminated char16_t* buffer.
- * @param  aLen2
- *         The number of bytes (not characters) in aStr2.
- * @param  aStr2
- *         The string to be compared against aStr1.  It will be passed in by
- *         SQLite as a non-null-terminated char16_t* buffer.
- * @return aStr1 - aStr2.  That is, if aStr1 < aStr2, returns a negative number.
- *         If aStr1 > aStr2, returns a positive number.  If aStr1 == aStr2,
- *         returns 0.
- */
-int localeCollationAccentSensitive16(void *aService,
-                                                 int aLen1,
-                                                 const void *aStr1,
-                                                 int aLen2,
-                                                 const void *aStr2);
-
-/**
- * Custom UTF-16 collating sequence that respects the application's locale.
- * Comparison is case- and accent-sensitive.  This is called by SQLite.
- *
- * @param  aService
- *         The Service that owns the nsICollation used by this collation.
- * @param  aLen1
- *         The number of bytes (not characters) in aStr1.
- * @param  aStr1
- *         The string to be compared against aStr2.  It will be passed in by
- *         SQLite as a non-null-terminated char16_t* buffer.
- * @param  aLen2
- *         The number of bytes (not characters) in aStr2.
- * @param  aStr2
- *         The string to be compared against aStr1.  It will be passed in by
- *         SQLite as a non-null-terminated char16_t* buffer.
- * @return aStr1 - aStr2.  That is, if aStr1 < aStr2, returns a negative number.
- *         If aStr1 > aStr2, returns a positive number.  If aStr1 == aStr2,
- *         returns 0.
- */
-int localeCollationCaseAccentSensitive16(void *aService,
-                                                     int aLen1,
-                                                     const void *aStr1,
-                                                     int aLen2,
-                                                     const void *aStr2);
-
-} // namespace storage
-} // namespace mozilla
-
-#endif // mozilla_storage_SQLCollations_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/SQLiteMutex.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/SQLiteMutex.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/SQLiteMutex.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/SQLiteMutex.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,173 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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_storage_SQLiteMutex_h_
-#define mozilla_storage_SQLiteMutex_h_
-
-#include "mozilla/BlockingResourceBase.h"
-#include "sqlite3.h"
-
-namespace mozilla {
-namespace storage {
-
-/**
- * Wrapper class for sqlite3_mutexes.  To be used whenever we want to use a
- * sqlite3_mutex.
- *
- * @warning Never EVER wrap the same sqlite3_mutex with a different SQLiteMutex.
- *          If you do this, you void the deadlock detector's warranty!
- */
-class SQLiteMutex : private BlockingResourceBase
-{
-public:
-  /**
-   * Constructs a wrapper for a sqlite3_mutex that has deadlock detecting.
-   *
-   * @param aName
-   *        A name which can be used to reference this mutex.
-   */
-  explicit SQLiteMutex(const char *aName)
-  : BlockingResourceBase(aName, eMutex)
-  , mMutex(nullptr)
-  {
-  }
-
-  /**
-   * Sets the mutex that we are wrapping.  We generally do not have access to
-   * our mutex at class construction, so we have to set it once we get access to
-   * it.
-   *
-   * @param aMutex
-   *        The sqlite3_mutex that we are going to wrap.
-   */
-  void initWithMutex(sqlite3_mutex *aMutex)
-  {
-    NS_ASSERTION(aMutex, "You must pass in a valid mutex!");
-    NS_ASSERTION(!mMutex, "A mutex has already been set for this!");
-    mMutex = aMutex;
-  }
-
-#if !defined(DEBUG) || defined(MOZ_NATIVE_SQLITE)
-  /**
-   * Acquires the mutex.
-   */
-  void lock()
-  {
-    sqlite3_mutex_enter(mMutex);
-  }
-
-  /**
-   * Releases the mutex.
-   */
-  void unlock()
-  {
-    sqlite3_mutex_leave(mMutex);
-  }
-
-  /**
-   * Asserts that the current thread owns the mutex.
-   */
-  void assertCurrentThreadOwns()
-  {
-  }
-
-  /**
-   * Asserts that the current thread does not own the mutex.
-   */
-  void assertNotCurrentThreadOwns()
-  {
-  }
-
-#else
-  void lock()
-  {
-    NS_ASSERTION(mMutex, "No mutex associated with this wrapper!");
-
-    // While SQLite Mutexes may be recursive, in our own code we do not want to
-    // treat them as such.
-
-    CheckAcquire();
-    sqlite3_mutex_enter(mMutex);
-    Acquire(); // Call is protected by us holding the mutex.
-  }
-
-  void unlock()
-  {
-    NS_ASSERTION(mMutex, "No mutex associated with this wrapper!");
-
-    // While SQLite Mutexes may be recursive, in our own code we do not want to
-    // treat them as such.
-    Release(); // Call is protected by us holding the mutex.
-    sqlite3_mutex_leave(mMutex);
-  }
-
-  void assertCurrentThreadOwns()
-  {
-    NS_ASSERTION(mMutex, "No mutex associated with this wrapper!");
-    NS_ASSERTION(sqlite3_mutex_held(mMutex),
-                 "Mutex is not held, but we expect it to be!");
-  }
-
-  void assertNotCurrentThreadOwns()
-  {
-    NS_ASSERTION(mMutex, "No mutex associated with this wrapper!");
-    NS_ASSERTION(sqlite3_mutex_notheld(mMutex),
-                 "Mutex is held, but we expect it to not be!");
-  }
-#endif // ifndef DEBUG
-
-private:
-  sqlite3_mutex *mMutex;
-};
-
-/**
- * Automatically acquires the mutex when it enters scope, and releases it when
- * it leaves scope.
- */
-class MOZ_STACK_CLASS SQLiteMutexAutoLock
-{
-public:
-  explicit SQLiteMutexAutoLock(SQLiteMutex &aMutex)
-  : mMutex(aMutex)
-  {
-    mMutex.lock();
-  }
-
-  ~SQLiteMutexAutoLock()
-  {
-    mMutex.unlock();
-  }
-
-private:
-  SQLiteMutex &mMutex;
-};
-
-/**
- * Automatically releases the mutex when it enters scope, and acquires it when
- * it leaves scope.
- */
-class MOZ_STACK_CLASS SQLiteMutexAutoUnlock
-{
-public:
-  explicit SQLiteMutexAutoUnlock(SQLiteMutex &aMutex)
-  : mMutex(aMutex)
-  {
-    mMutex.unlock();
-  }
-
-  ~SQLiteMutexAutoUnlock()
-  {
-    mMutex.lock();
-  }
-
-private:
-  SQLiteMutex &mMutex;
-};
-
-} // namespace storage
-} // namespace mozilla
-
-#endif // mozilla_storage_SQLiteMutex_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/StorageBaseStatementInternal.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/src/StorageBaseStatementInternal.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/StorageBaseStatementInternal.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/StorageBaseStatementInternal.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,224 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 sts=2 expandtab
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "StorageBaseStatementInternal.h"
-
-#include "nsProxyRelease.h"
-
-#include "mozStorageBindingParamsArray.h"
-#include "mozStorageStatementData.h"
-#include "mozStorageAsyncStatementExecution.h"
-
-namespace mozilla {
-namespace storage {
-
-////////////////////////////////////////////////////////////////////////////////
-//// Local Classes
-
-/**
- * Used to finalize an asynchronous statement on the background thread.
- */
-class AsyncStatementFinalizer : public nsRunnable
-{
-public:
-  /**
-   * Constructor for the event.
-   *
-   * @param aStatement
-   *        We need the AsyncStatement to be able to get at the sqlite3_stmt;
-   *        we only access/create it on the async thread.
-   * @param aConnection
-   *        We need the connection to know what thread to release the statement
-   *        on.  We release the statement on that thread since releasing the
-   *        statement might end up releasing the connection too.
-   */
-  AsyncStatementFinalizer(StorageBaseStatementInternal *aStatement,
-                          Connection *aConnection)
-  : mStatement(aStatement)
-  , mConnection(aConnection)
-  {
-  }
-
-  NS_IMETHOD Run()
-  {
-    if (mStatement->mAsyncStatement) {
-      (void)::sqlite3_finalize(mStatement->mAsyncStatement);
-      mStatement->mAsyncStatement = nullptr;
-    }
-    (void)::NS_ProxyRelease(mConnection->threadOpenedOn, mStatement);
-    return NS_OK;
-  }
-private:
-  nsRefPtr<StorageBaseStatementInternal> mStatement;
-  nsRefPtr<Connection> mConnection;
-};
-
-/**
- * Finalize a sqlite3_stmt on the background thread for a statement whose
- * destructor was invoked and the statement was non-null.
- */
-class LastDitchSqliteStatementFinalizer : public nsRunnable
-{
-public:
-  /**
-   * Event constructor.
-   *
-   * @param aConnection
-   *        Used to keep the connection alive.  If we failed to do this, it
-   *        is possible that the statement going out of scope invoking us
-   *        might have the last reference to the connection and so trigger
-   *        an attempt to close the connection which is doomed to fail
-   *        (because the asynchronous execution thread must exist which will
-   *        trigger the failure case).
-   * @param aStatement
-   *        The sqlite3_stmt to finalize.  This object takes ownership /
-   *        responsibility for the instance and all other references to it
-   *        should be forgotten.
-   */
-  LastDitchSqliteStatementFinalizer(nsRefPtr<Connection> &aConnection,
-                                    sqlite3_stmt *aStatement)
-  : mConnection(aConnection)
-  , mAsyncStatement(aStatement)
-  {
-    NS_PRECONDITION(aConnection, "You must provide a Connection");
-  }
-
-  NS_IMETHOD Run()
-  {
-    (void)::sqlite3_finalize(mAsyncStatement);
-    mAsyncStatement = nullptr;
-
-    // Because of our ambiguous nsISupports we cannot use the NS_ProxyRelease
-    // template helpers.
-    Connection *rawConnection = nullptr;
-    mConnection.swap(rawConnection);
-    (void)::NS_ProxyRelease(
-      rawConnection->threadOpenedOn,
-      NS_ISUPPORTS_CAST(mozIStorageConnection *, rawConnection));
-    return NS_OK;
-  }
-private:
-  nsRefPtr<Connection> mConnection;
-  sqlite3_stmt *mAsyncStatement;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-//// StorageBaseStatementInternal
-
-StorageBaseStatementInternal::StorageBaseStatementInternal()
-: mAsyncStatement(nullptr)
-{
-}
-
-void
-StorageBaseStatementInternal::asyncFinalize()
-{
-  nsIEventTarget *target = mDBConnection->getAsyncExecutionTarget();
-  if (target) {
-    // Attempt to finalize asynchronously
-    nsCOMPtr<nsIRunnable> event =
-      new AsyncStatementFinalizer(this, mDBConnection);
-
-    // Dispatch. Note that dispatching can fail, typically if
-    // we have a race condition with asyncClose(). It's ok,
-    // let asyncClose() win.
-    (void)target->Dispatch(event, NS_DISPATCH_NORMAL);
-  }
-  // If we cannot get the background thread,
-  // mozStorageConnection::AsyncClose() has already been called and
-  // the statement either has been or will be cleaned up by
-  // internalClose().
-}
-
-void
-StorageBaseStatementInternal::destructorAsyncFinalize()
-{
-  if (!mAsyncStatement)
-    return;
-
-  // If we reach this point, our owner has not finalized this
-  // statement, yet we are being destructed. If possible, we want to
-  // auto-finalize it early, to release the resources early.
-  nsIEventTarget *target = mDBConnection->getAsyncExecutionTarget();
-  if (target) {
-    // If we can get the async execution target, we can indeed finalize
-    // the statement, as the connection is still open.
-    bool isAsyncThread = false;
-    (void)target->IsOnCurrentThread(&isAsyncThread);
-
-    nsCOMPtr<nsIRunnable> event =
-      new LastDitchSqliteStatementFinalizer(mDBConnection, mAsyncStatement);
-    if (isAsyncThread) {
-      (void)event->Run();
-    } else {
-      (void)target->Dispatch(event, NS_DISPATCH_NORMAL);
-    }
-  }
-
-  // We might not be able to dispatch to the background thread,
-  // presumably because it is being shutdown. Since said shutdown will
-  // finalize the statement, we just need to clean-up around here.
-  mAsyncStatement = nullptr;
-}
-
-NS_IMETHODIMP
-StorageBaseStatementInternal::NewBindingParamsArray(
-  mozIStorageBindingParamsArray **_array
-)
-{
-  nsCOMPtr<mozIStorageBindingParamsArray> array = new BindingParamsArray(this);
-  NS_ENSURE_TRUE(array, NS_ERROR_OUT_OF_MEMORY);
-
-  array.forget(_array);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-StorageBaseStatementInternal::ExecuteAsync(
-  mozIStorageStatementCallback *aCallback,
-  mozIStoragePendingStatement **_stmt
-)
-{
-  // We used to call Connection::ExecuteAsync but it takes a
-  // mozIStorageBaseStatement signature because it is also a public API.  Since
-  // our 'this' has no static concept of mozIStorageBaseStatement and Connection
-  // would just QI it back across to a StorageBaseStatementInternal and the
-  // actual logic is very simple, we now roll our own.
-  nsTArray<StatementData> stmts(1);
-  StatementData data;
-  nsresult rv = getAsynchronousStatementData(data);
-  NS_ENSURE_SUCCESS(rv, rv);
-  NS_ENSURE_TRUE(stmts.AppendElement(data), NS_ERROR_OUT_OF_MEMORY);
-
-  // Dispatch to the background
-  return AsyncExecuteStatements::execute(stmts, mDBConnection,
-                                         mNativeConnection, aCallback, _stmt);
-}
-
-NS_IMETHODIMP
-StorageBaseStatementInternal::EscapeStringForLIKE(
-  const nsAString &aValue,
-  const char16_t aEscapeChar,
-  nsAString &_escapedString
-)
-{
-  const char16_t MATCH_ALL('%');
-  const char16_t MATCH_ONE('_');
-
-  _escapedString.Truncate(0);
-
-  for (uint32_t i = 0; i < aValue.Length(); i++) {
-    if (aValue[i] == aEscapeChar || aValue[i] == MATCH_ALL ||
-        aValue[i] == MATCH_ONE) {
-      _escapedString += aEscapeChar;
-    }
-    _escapedString += aValue[i];
-  }
-  return NS_OK;
-}
-
-} // namespace storage
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/StorageBaseStatementInternal.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/StorageBaseStatementInternal.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/StorageBaseStatementInternal.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/StorageBaseStatementInternal.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,353 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 sts=2 expandtab
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef mozilla_storage_StorageBaseStatementInternal_h_
-#define mozilla_storage_StorageBaseStatementInternal_h_
-
-#include "nsISupports.h"
-#include "nsCOMPtr.h"
-#include "nsAutoPtr.h"
-
-struct sqlite3;
-struct sqlite3_stmt;
-class mozIStorageBindingParamsArray;
-class mozIStorageBindingParams;
-class mozIStorageStatementCallback;
-class mozIStoragePendingStatement;
-
-namespace mozilla {
-namespace storage {
-
-#define STORAGEBASESTATEMENTINTERNAL_IID \
-  {0xd18856c9, 0xbf07, 0x4ae2, {0x94, 0x5b, 0x1a, 0xdd, 0x49, 0x19, 0x55, 0x2a}}
-
-class Connection;
-class StatementData;
-
-class AsyncStatementFinalizer;
-
-/**
- * Implementation-only interface and shared logix mix-in corresponding to
- * mozIStorageBaseStatement.  Both Statement and AsyncStatement inherit from
- * this. The interface aspect makes them look the same to implementation innards
- * that aren't publicly accessible.  The mix-in avoids code duplication in
- * common implementations of mozIStorageBaseStatement, albeit with some minor
- * performance/space overhead because we have to use defines to officially
- * implement the methods on Statement/AsyncStatement (and proxy to this base
- * class.)
- */
-class StorageBaseStatementInternal : public nsISupports
-{
-public:
-  NS_DECLARE_STATIC_IID_ACCESSOR(STORAGEBASESTATEMENTINTERNAL_IID)
-
-  /**
-   * @return the connection that this statement belongs to.
-   */
-  Connection *getOwner()
-  {
-    return mDBConnection;
-  }
-
-  /**
-   * Return the asynchronous statement, creating it if required.
-   *
-   * This is for use by the asynchronous execution code for StatementData
-   * created by AsyncStatements.  Statement internally uses this method to
-   * prepopulate StatementData with the sqlite3_stmt.
-   *
-   * @param[out] stmt
-   *             The sqlite3_stmt for asynchronous use.
-   * @return The SQLite result code for creating the statement if created,
-   *         SQLITE_OK if creation was not required.
-   */
-  virtual int getAsyncStatement(sqlite3_stmt **_stmt) = 0;
-
-  /**
-   * Obtains the StatementData needed for asynchronous execution.
-   *
-   * This is for use by Connection to retrieve StatementData from statements
-   * when executeAsync is invoked.
-   *
-   * @param[out] _data
-   *             A reference to a StatementData object that will be populated
-   *             upon successful execution of this method.
-   * @return NS_OK if we were able to assemble the data, failure otherwise.
-   */
-  virtual nsresult getAsynchronousStatementData(StatementData &_data) = 0;
-
-  /**
-   * Construct a new BindingParams to be owned by the provided binding params
-   * array.  This method exists so that BindingParamsArray does not need
-   * factory logic to determine what type of BindingParams to instantiate.
-   *
-   * @param aOwner
-   *        The binding params array to own the newly created binding params.
-   * @return The new mozIStorageBindingParams instance appropriate to the
-   *         underlying statement type.
-   */
-  virtual already_AddRefed<mozIStorageBindingParams> newBindingParams(
-    mozIStorageBindingParamsArray *aOwner
-  ) = 0;
-
-protected: // mix-in bits are protected
-  StorageBaseStatementInternal();
-
-  nsRefPtr<Connection> mDBConnection;
-  sqlite3 *mNativeConnection;
-
-  /**
-   * Our asynchronous statement.
-   *
-   * For Statement this is populated by the first invocation to
-   * getAsyncStatement.
-   *
-   * For AsyncStatement, this is null at creation time and initialized by the
-   * async thread when it calls getAsyncStatement the first time the statement
-   * is executed.  (Or in the event of badly formed SQL, every time.)
-   */
-  sqlite3_stmt *mAsyncStatement;
-
-  /**
-   * Initiate asynchronous finalization by dispatching an event to the
-   * asynchronous thread to finalize mAsyncStatement.  This acquires a reference
-   * to this statement and proxies it back to the connection's owning thread
-   * for release purposes.
-   *
-   * In the event the asynchronous thread is already gone or we otherwise fail
-   * to dispatch an event to it we failover to invoking internalAsyncFinalize
-   * directly.  (That's what the asynchronous finalizer would have called.)
-   *
-   * @note You must not call this method from your destructor because its
-   *       operation assumes we are still alive.  Call internalAsyncFinalize
-   *       directly in that case.
-   */
-  void asyncFinalize();
-
-  /**
-   * Cleanup the async sqlite3_stmt stored in mAsyncStatement if it exists by
-   * attempting to dispatch to the asynchronous thread if available, finalizing
-   * on this thread if it is not.
-   *
-   * @note Call this from your destructor, call asyncFinalize otherwise.
-   */
-  void destructorAsyncFinalize();
-
-  NS_IMETHOD NewBindingParamsArray(mozIStorageBindingParamsArray **_array);
-  NS_IMETHOD ExecuteAsync(mozIStorageStatementCallback *aCallback,
-                          mozIStoragePendingStatement **_stmt);
-  NS_IMETHOD EscapeStringForLIKE(const nsAString &aValue,
-                                 char16_t aEscapeChar,
-                                 nsAString &_escapedString);
-
-  // Needs access to internalAsyncFinalize
-  friend class AsyncStatementFinalizer;
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(StorageBaseStatementInternal,
-                              STORAGEBASESTATEMENTINTERNAL_IID)
-
-#define NS_DECL_STORAGEBASESTATEMENTINTERNAL \
-  virtual Connection *getOwner(); \
-  virtual int getAsyncStatement(sqlite3_stmt **_stmt) override; \
-  virtual nsresult getAsynchronousStatementData(StatementData &_data) override; \
-  virtual already_AddRefed<mozIStorageBindingParams> newBindingParams( \
-    mozIStorageBindingParamsArray *aOwner) override;
-
-/**
- * Helper macro to implement the proxying implementations.  Because we are
- * implementing methods that are part of mozIStorageBaseStatement and the
- * implementation classes already use NS_DECL_MOZISTORAGEBASESTATEMENT we don't
- * need to provide declaration support.
- */
-#define MIX_IMPL(_class, _optionalGuard, _method, _declArgs, _invokeArgs) \
-  NS_IMETHODIMP _class::_method _declArgs                                 \
-  {                                                                       \
-    _optionalGuard                                                        \
-    return StorageBaseStatementInternal::_method _invokeArgs;             \
-  }
-
-
-/**
- * Define proxying implementation for the given _class.  If a state invariant
- * needs to be checked and an early return possibly performed, pass the clause
- * to use as _optionalGuard.
- */
-#define MIXIN_IMPL_STORAGEBASESTATEMENTINTERNAL(_class, _optionalGuard) \
-  MIX_IMPL(_class, _optionalGuard,                                      \
-           NewBindingParamsArray,                                       \
-           (mozIStorageBindingParamsArray **_array),                    \
-           (_array))                                                    \
-  MIX_IMPL(_class, _optionalGuard,                                      \
-           ExecuteAsync,                                                \
-           (mozIStorageStatementCallback *aCallback,                    \
-            mozIStoragePendingStatement **_stmt),                       \
-           (aCallback, _stmt))                                          \
-  MIX_IMPL(_class, _optionalGuard,                                      \
-           EscapeStringForLIKE,                                         \
-           (const nsAString &aValue, char16_t aEscapeChar,              \
-            nsAString &_escapedString),                                 \
-           (aValue, aEscapeChar, _escapedString))
-
-/**
- * Name-building helper for BIND_GEN_IMPL.
- */
-#define BIND_NAME_CONCAT(_nameBit, _concatBit) \
-  Bind##_nameBit##_concatBit
-
-/**
- * We have type-specific convenience methods for C++ implementations in
- * 3 different forms; 2 by index, 1 by name.  The following macro allows
- * us to avoid having to define repetitive things by hand.
- *
- * Because of limitations of macros and our desire to avoid requiring special
- * permutations for the null and blob cases (whose argument count varies),
- * we require that the argument declarations and corresponding invocation
- * usages are passed in.
- *
- * @param _class
- *        The class name.
- * @param _guard
- *        The guard clause to inject.
- * @param _declName
- *        The argument list (with parens) for the ByName variants.
- * @param _declIndex
- *        The argument list (with parens) for the index variants.
- * @param _invArgs
- *        The invocation argumment list.
- */
-#define BIND_GEN_IMPL(_class, _guard, _name, _declName, _declIndex, _invArgs) \
-  NS_IMETHODIMP _class::BIND_NAME_CONCAT(_name, ByName) _declName             \
-  {                                                                           \
-    _guard                                                                    \
-    mozIStorageBindingParams *params = getParams();                           \
-    NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);                           \
-    return params->BIND_NAME_CONCAT(_name, ByName) _invArgs;                  \
-  }                                                                           \
-  NS_IMETHODIMP _class::BIND_NAME_CONCAT(_name, ByIndex) _declIndex           \
-  {                                                                           \
-    _guard                                                                    \
-    mozIStorageBindingParams *params = getParams();                           \
-    NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);                           \
-    return params->BIND_NAME_CONCAT(_name, ByIndex) _invArgs;                 \
-  }                                                                           \
-  NS_IMETHODIMP _class::BIND_NAME_CONCAT(_name, Parameter) _declIndex         \
-  {                                                                           \
-    _guard                                                                    \
-    mozIStorageBindingParams *params = getParams();                           \
-    NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);                           \
-    return params->BIND_NAME_CONCAT(_name, ByIndex) _invArgs;                 \
-  }
-
-/**
- * Implement BindByName/BindByIndex for the given class.
- *
- * @param _class The class name.
- * @param _optionalGuard The guard clause to inject.
- */
-#define BIND_BASE_IMPLS(_class, _optionalGuard)             \
-  NS_IMETHODIMP _class::BindByName(const nsACString &aName, \
-                                   nsIVariant *aValue)      \
-  {                                                         \
-    _optionalGuard                                          \
-    mozIStorageBindingParams *params = getParams();         \
-    NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);         \
-    return params->BindByName(aName, aValue);               \
-  }                                                         \
-  NS_IMETHODIMP _class::BindByIndex(uint32_t aIndex,        \
-                                    nsIVariant *aValue)     \
-  {                                                         \
-    _optionalGuard                                          \
-    mozIStorageBindingParams *params = getParams();         \
-    NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);         \
-    return params->BindByIndex(aIndex, aValue);             \
-  }
-
-/**
- * Define the various Bind*Parameter, Bind*ByIndex, Bind*ByName stubs that just
- * end up proxying to the params object.
- */
-#define BOILERPLATE_BIND_PROXIES(_class, _optionalGuard) \
-  BIND_BASE_IMPLS(_class, _optionalGuard)                \
-  BIND_GEN_IMPL(_class, _optionalGuard,                  \
-                UTF8String,                              \
-                (const nsACString &aWhere,               \
-                 const nsACString &aValue),              \
-                (uint32_t aWhere,                        \
-                 const nsACString &aValue),              \
-                (aWhere, aValue))                        \
-  BIND_GEN_IMPL(_class, _optionalGuard,                  \
-                String,                                  \
-                (const nsACString &aWhere,               \
-                 const nsAString  &aValue),              \
-                (uint32_t aWhere,                        \
-                 const nsAString  &aValue),              \
-                (aWhere, aValue))                        \
-  BIND_GEN_IMPL(_class, _optionalGuard,                  \
-                Double,                                  \
-                (const nsACString &aWhere,               \
-                 double aValue),                         \
-                (uint32_t aWhere,                        \
-                 double aValue),                         \
-                (aWhere, aValue))                        \
-  BIND_GEN_IMPL(_class, _optionalGuard,                  \
-                Int32,                                   \
-                (const nsACString &aWhere,               \
-                 int32_t aValue),                        \
-                (uint32_t aWhere,                        \
-                 int32_t aValue),                        \
-                (aWhere, aValue))                        \
-  BIND_GEN_IMPL(_class, _optionalGuard,                  \
-                Int64,                                   \
-                (const nsACString &aWhere,               \
-                 int64_t aValue),                        \
-                (uint32_t aWhere,                        \
-                 int64_t aValue),                        \
-                (aWhere, aValue))                        \
-  BIND_GEN_IMPL(_class, _optionalGuard,                  \
-                Null,                                    \
-                (const nsACString &aWhere),              \
-                (uint32_t aWhere),                       \
-                (aWhere))                                \
-  BIND_GEN_IMPL(_class, _optionalGuard,                  \
-                Blob,                                    \
-                (const nsACString &aWhere,               \
-                 const uint8_t *aValue,                  \
-                 uint32_t aValueSize),                   \
-                (uint32_t aWhere,                        \
-                 const uint8_t *aValue,                  \
-                 uint32_t aValueSize),                   \
-                (aWhere, aValue, aValueSize))            \
-  BIND_GEN_IMPL(_class, _optionalGuard,                  \
-                StringAsBlob,                            \
-                (const nsACString &aWhere,               \
-                 const nsAString& aValue),               \
-                (uint32_t aWhere,                        \
-                 const nsAString& aValue),               \
-                (aWhere, aValue))                        \
-  BIND_GEN_IMPL(_class, _optionalGuard,                  \
-                UTF8StringAsBlob,                        \
-                (const nsACString &aWhere,               \
-                 const nsACString& aValue),              \
-                (uint32_t aWhere,                        \
-                 const nsACString& aValue),              \
-                (aWhere, aValue))                        \
-  BIND_GEN_IMPL(_class, _optionalGuard,                  \
-                AdoptedBlob,                             \
-                (const nsACString &aWhere,               \
-                 uint8_t *aValue,                        \
-                 uint32_t aValueSize),                   \
-                (uint32_t aWhere,                        \
-                 uint8_t *aValue,                        \
-                 uint32_t aValueSize),                   \
-                (aWhere, aValue, aValueSize))
-
-  
-
-} // storage
-} // mozilla
-
-#endif // mozilla_storage_StorageBaseStatementInternal_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/TelemetryVFS.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/src/TelemetryVFS.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/TelemetryVFS.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/TelemetryVFS.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,892 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 <string.h>
-#include "mozilla/Telemetry.h"
-#include "mozilla/Preferences.h"
-#include "sqlite3.h"
-#include "nsThreadUtils.h"
-#include "mozilla/dom/quota/PersistenceType.h"
-#include "mozilla/dom/quota/QuotaManager.h"
-#include "mozilla/dom/quota/QuotaObject.h"
-#include "mozilla/IOInterposer.h"
-
-// The last VFS version for which this file has been updated.
-#define LAST_KNOWN_VFS_VERSION 3
-
-// The last io_methods version for which this file has been updated.
-#define LAST_KNOWN_IOMETHODS_VERSION 3
-
-/**
- * This preference is a workaround to allow users/sysadmins to identify
- * that the profile exists on an NFS share whose implementation
- * is incompatible with SQLite's default locking implementation.
- * Bug 433129 attempted to automatically identify such file-systems, 
- * but a reliable way was not found and it was determined that the fallback 
- * locking is slower than POSIX locking, so we do not want to do it by default.
-*/
-#define PREF_NFS_FILESYSTEM   "storage.nfs_filesystem"
-
-namespace {
-
-using namespace mozilla;
-using namespace mozilla::dom::quota;
-
-struct Histograms {
-  const char *name;
-  const Telemetry::ID readB;
-  const Telemetry::ID writeB;
-  const Telemetry::ID readMS;
-  const Telemetry::ID writeMS;
-  const Telemetry::ID syncMS;
-};
-
-#define SQLITE_TELEMETRY(FILENAME, HGRAM) \
-  { FILENAME, \
-    Telemetry::MOZ_SQLITE_ ## HGRAM ## _READ_B, \
-    Telemetry::MOZ_SQLITE_ ## HGRAM ## _WRITE_B, \
-    Telemetry::MOZ_SQLITE_ ## HGRAM ## _READ_MS, \
-    Telemetry::MOZ_SQLITE_ ## HGRAM ## _WRITE_MS, \
-    Telemetry::MOZ_SQLITE_ ## HGRAM ## _SYNC_MS \
-  }
-
-Histograms gHistograms[] = {
-  SQLITE_TELEMETRY("places.sqlite", PLACES),
-  SQLITE_TELEMETRY("cookies.sqlite", COOKIES),
-  SQLITE_TELEMETRY("webappsstore.sqlite", WEBAPPS),
-  SQLITE_TELEMETRY(nullptr, OTHER)
-};
-#undef SQLITE_TELEMETRY
-
-/** RAII class for measuring how long io takes on/off main thread
- */
-class IOThreadAutoTimer {
-public:
-  /** 
-   * IOThreadAutoTimer measures time spent in IO. Additionally it
-   * automatically determines whether IO is happening on the main
-   * thread and picks an appropriate histogram.
-   *
-   * @param id takes a telemetry histogram id. The id+1 must be an
-   * equivalent histogram for the main thread. Eg, MOZ_SQLITE_OPEN_MS 
-   * is followed by MOZ_SQLITE_OPEN_MAIN_THREAD_MS.
-   *
-   * @param aOp optionally takes an IO operation to report through the
-   * IOInterposer. Filename will be reported as NULL, and reference will be
-   * either "sqlite-mainthread" or "sqlite-otherthread".
-   */
-  explicit IOThreadAutoTimer(Telemetry::ID id,
-    IOInterposeObserver::Operation aOp = IOInterposeObserver::OpNone)
-    : start(TimeStamp::Now()),
-      id(id),
-      op(aOp)
-  {
-  }
-
-  /**
-   * This constructor is for when we want to report an operation to
-   * IOInterposer but do not require a telemetry probe.
-   *
-   * @param aOp IO Operation to report through the IOInterposer.
-   */
-  explicit IOThreadAutoTimer(IOInterposeObserver::Operation aOp)
-    : start(TimeStamp::Now()),
-      id(Telemetry::HistogramCount),
-      op(aOp)
-  {
-  }
-
-  ~IOThreadAutoTimer()
-  {
-    TimeStamp end(TimeStamp::Now());
-    uint32_t mainThread = NS_IsMainThread() ? 1 : 0;
-    if (id != Telemetry::HistogramCount) {
-      Telemetry::AccumulateTimeDelta(static_cast<Telemetry::ID>(id + mainThread),
-                                     start, end);
-    }
-    // We don't report SQLite I/O on Windows because we have a comprehensive
-    // mechanism for intercepting I/O on that platform that captures a superset
-    // of the data captured here.
-#if defined(MOZ_ENABLE_PROFILER_SPS) && !defined(XP_WIN)
-    if (IOInterposer::IsObservedOperation(op)) {
-      const char* main_ref  = "sqlite-mainthread";
-      const char* other_ref = "sqlite-otherthread";
-
-      // Create observation
-      IOInterposeObserver::Observation ob(op, start, end,
-                                          (mainThread ? main_ref : other_ref));
-      // Report observation
-      IOInterposer::Report(ob);
-    }
-#endif /* defined(MOZ_ENABLE_PROFILER_SPS) && !defined(XP_WIN) */
-  }
-
-private:
-  const TimeStamp start;
-  const Telemetry::ID id;
-  IOInterposeObserver::Operation op;
-};
-
-struct telemetry_file {
-  // Base class.  Must be first
-  sqlite3_file base;
-
-  // histograms pertaining to this file
-  Histograms *histograms;
-
-  // quota object for this file
-  nsRefPtr<QuotaObject> quotaObject;
-
-  // The chunk size for this file. See the documentation for
-  // sqlite3_file_control() and FCNTL_CHUNK_SIZE.
-  int fileChunkSize;
-
-  // This contains the vfs that actually does work
-  sqlite3_file pReal[1];
-};
-
-const char*
-DatabasePathFromWALPath(const char *zWALName)
-{
-  /**
-   * Do some sketchy pointer arithmetic to find the parameter key. The WAL
-   * filename is in the middle of a big allocated block that contains:
-   *
-   *   - Random Values
-   *   - Main Database Path
-   *   - \0
-   *   - Multiple URI components consisting of:
-   *     - Key
-   *     - \0
-   *     - Value
-   *     - \0
-   *   - \0
-   *   - Journal Path
-   *   - \0
-   *   - WAL Path (zWALName)
-   *   - \0
-   *
-   * Because the main database path is preceded by a random value we have to be
-   * careful when trying to figure out when we should terminate this loop.
-   */
-  MOZ_ASSERT(zWALName);
-
-  nsDependentCSubstring dbPath(zWALName, strlen(zWALName));
-
-  // Chop off the "-wal" suffix.
-  NS_NAMED_LITERAL_CSTRING(kWALSuffix, "-wal");
-  MOZ_ASSERT(StringEndsWith(dbPath, kWALSuffix));
-
-  dbPath.Rebind(zWALName, dbPath.Length() - kWALSuffix.Length());
-  MOZ_ASSERT(!dbPath.IsEmpty());
-
-  // We want to scan to the end of the key/value URI pairs. Skip the preceding
-  // null and go to the last char of the journal path.
-  const char* cursor = zWALName - 2;
-
-  // Make sure we just skipped a null.
-  MOZ_ASSERT(!*(cursor + 1));
-
-  // Walk backwards over the journal path.
-  while (*cursor) {
-    cursor--;
-  }
-
-  // There should be another null here.
-  cursor--;
-  MOZ_ASSERT(!*cursor);
-
-  // Back up one more char to the last char of the previous string. It may be
-  // the database path or it may be a key/value URI pair.
-  cursor--;
-
-#ifdef DEBUG
-  {
-    // Verify that we just walked over the journal path. Account for the two
-    // nulls we just skipped.
-    const char *journalStart = cursor + 3;
-
-    nsDependentCSubstring journalPath(journalStart,
-                                      strlen(journalStart));
-
-    // Chop off the "-journal" suffix.
-    NS_NAMED_LITERAL_CSTRING(kJournalSuffix, "-journal");
-    MOZ_ASSERT(StringEndsWith(journalPath, kJournalSuffix));
-
-    journalPath.Rebind(journalStart,
-                        journalPath.Length() - kJournalSuffix.Length());
-    MOZ_ASSERT(!journalPath.IsEmpty());
-
-    // Make sure that the database name is a substring of the journal name.
-    MOZ_ASSERT(journalPath == dbPath);
-  }
-#endif
-
-  // Now we're either at the end of the key/value URI pairs or we're at the
-  // end of the database path. Carefully walk backwards one character at a
-  // time to do this safely without running past the beginning of the database
-  // path.
-  const char *const dbPathStart = dbPath.BeginReading();
-  const char *dbPathCursor = dbPath.EndReading() - 1;
-  bool isDBPath = true;
-
-  while (true) {
-    MOZ_ASSERT(*dbPathCursor, "dbPathCursor should never see a null char!");
-
-    if (isDBPath) {
-      isDBPath = dbPathStart <= dbPathCursor &&
-                 *dbPathCursor == *cursor &&
-                 *cursor;
-    }
-
-    if (!isDBPath) {
-      // This isn't the database path so it must be a value. Scan past it and
-      // the key also.
-      for (size_t stringCount = 0; stringCount < 2; stringCount++) {
-        // Scan past the string to the preceding null character.
-        while (*cursor) {
-          cursor--;
-        }
-
-        // Back up one more char to the last char of preceding string.
-        cursor--;
-      }
-
-      // Reset and start again.
-      dbPathCursor = dbPath.EndReading() - 1;
-      isDBPath = true;
-
-      continue;
-    }
-
-    MOZ_ASSERT(isDBPath);
-    MOZ_ASSERT(*cursor);
-
-    if (dbPathStart == dbPathCursor) {
-      // Found the full database path, we're all done.
-      MOZ_ASSERT(nsDependentCString(cursor) == dbPath);
-      return cursor;
-    }
-
-    // Change the cursors and go through the loop again.
-    cursor--;
-    dbPathCursor--;
-  }
-
-  MOZ_CRASH("Should never get here!");
-}
-
-already_AddRefed<QuotaObject>
-GetQuotaObjectFromNameAndParameters(const char *zName,
-                                    const char *zURIParameterKey)
-{
-  MOZ_ASSERT(zName);
-  MOZ_ASSERT(zURIParameterKey);
-
-  const char *persistenceType =
-    sqlite3_uri_parameter(zURIParameterKey, "persistenceType");
-  if (!persistenceType) {
-    return nullptr;
-  }
-
-  const char *group = sqlite3_uri_parameter(zURIParameterKey, "group");
-  if (!group) {
-    NS_WARNING("SQLite URI had 'persistenceType' but not 'group'?!");
-    return nullptr;
-  }
-
-  const char *origin = sqlite3_uri_parameter(zURIParameterKey, "origin");
-  if (!origin) {
-    NS_WARNING("SQLite URI had 'persistenceType' and 'group' but not "
-               "'origin'?!");
-    return nullptr;
-  }
-
-  QuotaManager *quotaManager = QuotaManager::Get();
-  MOZ_ASSERT(quotaManager);
-
-  return quotaManager->GetQuotaObject(
-    PersistenceTypeFromText(nsDependentCString(persistenceType)),
-    nsDependentCString(group),
-    nsDependentCString(origin),
-    NS_ConvertUTF8toUTF16(zName));
-}
-
-void
-MaybeEstablishQuotaControl(const char *zName,
-                           telemetry_file *pFile,
-                           int flags)
-{
-  MOZ_ASSERT(pFile);
-  MOZ_ASSERT(!pFile->quotaObject);
-
-  if (!(flags & (SQLITE_OPEN_URI | SQLITE_OPEN_WAL))) {
-    return;
-  }
-
-  MOZ_ASSERT(zName);
-
-  const char *zURIParameterKey = (flags & SQLITE_OPEN_WAL) ?
-                                 DatabasePathFromWALPath(zName) :
-                                 zName;
-
-  MOZ_ASSERT(zURIParameterKey);
-
-  pFile->quotaObject =
-    GetQuotaObjectFromNameAndParameters(zName, zURIParameterKey);
-}
-
-/*
-** Close a telemetry_file.
-*/
-int
-xClose(sqlite3_file *pFile)
-{
-  telemetry_file *p = (telemetry_file *)pFile;
-  int rc;
-  { // Scope for IOThreadAutoTimer
-    IOThreadAutoTimer ioTimer(IOInterposeObserver::OpClose);
-    rc = p->pReal->pMethods->xClose(p->pReal);
-  }
-  if( rc==SQLITE_OK ){
-    delete p->base.pMethods;
-    p->base.pMethods = nullptr;
-    p->quotaObject = nullptr;
-#ifdef DEBUG
-    p->fileChunkSize = 0;
-#endif
-  }
-  return rc;
-}
-
-/*
-** Read data from a telemetry_file.
-*/
-int
-xRead(sqlite3_file *pFile, void *zBuf, int iAmt, sqlite_int64 iOfst)
-{
-  telemetry_file *p = (telemetry_file *)pFile;
-  IOThreadAutoTimer ioTimer(p->histograms->readMS, IOInterposeObserver::OpRead);
-  int rc;
-  rc = p->pReal->pMethods->xRead(p->pReal, zBuf, iAmt, iOfst);
-  // sqlite likes to read from empty files, this is normal, ignore it.
-  if (rc != SQLITE_IOERR_SHORT_READ)
-    Telemetry::Accumulate(p->histograms->readB, rc == SQLITE_OK ? iAmt : 0);
-  return rc;
-}
-
-/*
-** Return the current file-size of a telemetry_file.
-*/
-int
-xFileSize(sqlite3_file *pFile, sqlite_int64 *pSize)
-{
-  IOThreadAutoTimer ioTimer(IOInterposeObserver::OpStat);
-  telemetry_file *p = (telemetry_file *)pFile;
-  int rc;
-  rc = p->pReal->pMethods->xFileSize(p->pReal, pSize);
-  return rc;
-}
-
-/*
-** Write data to a telemetry_file.
-*/
-int
-xWrite(sqlite3_file *pFile, const void *zBuf, int iAmt, sqlite_int64 iOfst)
-{
-  telemetry_file *p = (telemetry_file *)pFile;
-  IOThreadAutoTimer ioTimer(p->histograms->writeMS, IOInterposeObserver::OpWrite);
-  int rc;
-  if (p->quotaObject) {
-    MOZ_ASSERT(INT64_MAX - iOfst >= iAmt);
-    if (!p->quotaObject->MaybeUpdateSize(iOfst + iAmt, /* aTruncate */ false)) {
-      return SQLITE_FULL;
-    }
-  }
-  rc = p->pReal->pMethods->xWrite(p->pReal, zBuf, iAmt, iOfst);
-  Telemetry::Accumulate(p->histograms->writeB, rc == SQLITE_OK ? iAmt : 0);
-  if (p->quotaObject && rc != SQLITE_OK) {
-    NS_WARNING("xWrite failed on a quota-controlled file, attempting to "
-               "update its current size...");
-    sqlite_int64 currentSize;
-    if (xFileSize(pFile, &currentSize) == SQLITE_OK) {
-      p->quotaObject->MaybeUpdateSize(currentSize, /* aTruncate */ true);
-    }
-  }
-  return rc;
-}
-
-/*
-** Truncate a telemetry_file.
-*/
-int
-xTruncate(sqlite3_file *pFile, sqlite_int64 size)
-{
-  IOThreadAutoTimer ioTimer(Telemetry::MOZ_SQLITE_TRUNCATE_MS);
-  telemetry_file *p = (telemetry_file *)pFile;
-  int rc;
-  Telemetry::AutoTimer<Telemetry::MOZ_SQLITE_TRUNCATE_MS> timer;
-  if (p->quotaObject) {
-    if (p->fileChunkSize > 0) {
-      // Round up to the smallest multiple of the chunk size that will hold all
-      // the data.
-      size =
-        ((size + p->fileChunkSize - 1) / p->fileChunkSize) * p->fileChunkSize;
-    }
-    if (!p->quotaObject->MaybeUpdateSize(size, /* aTruncate */ true)) {
-      return SQLITE_FULL;
-    }
-  }
-  rc = p->pReal->pMethods->xTruncate(p->pReal, size);
-  if (p->quotaObject) {
-    if (rc == SQLITE_OK) {
-#ifdef DEBUG
-      // Make sure xTruncate set the size exactly as we calculated above.
-      sqlite_int64 newSize;
-      MOZ_ASSERT(xFileSize(pFile, &newSize) == SQLITE_OK);
-      MOZ_ASSERT(newSize == size);
-#endif
-    } else {
-      NS_WARNING("xTruncate failed on a quota-controlled file, attempting to "
-                 "update its current size...");
-      if (xFileSize(pFile, &size) == SQLITE_OK) {
-        p->quotaObject->MaybeUpdateSize(size, /* aTruncate */ true);
-      }
-    }
-  }
-  return rc;
-}
-
-/*
-** Sync a telemetry_file.
-*/
-int
-xSync(sqlite3_file *pFile, int flags)
-{
-  telemetry_file *p = (telemetry_file *)pFile;
-  IOThreadAutoTimer ioTimer(p->histograms->syncMS, IOInterposeObserver::OpFSync);
-  return p->pReal->pMethods->xSync(p->pReal, flags);
-}
-
-/*
-** Lock a telemetry_file.
-*/
-int
-xLock(sqlite3_file *pFile, int eLock)
-{
-  telemetry_file *p = (telemetry_file *)pFile;
-  int rc;
-  rc = p->pReal->pMethods->xLock(p->pReal, eLock);
-  return rc;
-}
-
-/*
-** Unlock a telemetry_file.
-*/
-int
-xUnlock(sqlite3_file *pFile, int eLock)
-{
-  telemetry_file *p = (telemetry_file *)pFile;
-  int rc;
-  rc = p->pReal->pMethods->xUnlock(p->pReal, eLock);
-  return rc;
-}
-
-/*
-** Check if another file-handle holds a RESERVED lock on a telemetry_file.
-*/
-int
-xCheckReservedLock(sqlite3_file *pFile, int *pResOut)
-{
-  telemetry_file *p = (telemetry_file *)pFile;
-  int rc = p->pReal->pMethods->xCheckReservedLock(p->pReal, pResOut);
-  return rc;
-}
-
-/*
-** File control method. For custom operations on a telemetry_file.
-*/
-int
-xFileControl(sqlite3_file *pFile, int op, void *pArg)
-{
-  telemetry_file *p = (telemetry_file *)pFile;
-  int rc;
-  // Hook SQLITE_FCNTL_SIZE_HINT for quota-controlled files and do the necessary
-  // work before passing to the SQLite VFS.
-  if (op == SQLITE_FCNTL_SIZE_HINT && p->quotaObject) {
-    sqlite3_int64 hintSize = *static_cast<sqlite3_int64*>(pArg);
-    sqlite3_int64 currentSize;
-    rc = xFileSize(pFile, &currentSize);
-    if (rc != SQLITE_OK) {
-      return rc;
-    }
-    if (hintSize > currentSize) {
-      rc = xTruncate(pFile, hintSize);
-      if (rc != SQLITE_OK) {
-        return rc;
-      }
-    }
-  }
-  rc = p->pReal->pMethods->xFileControl(p->pReal, op, pArg);
-  // Grab the file chunk size after the SQLite VFS has approved.
-  if (op == SQLITE_FCNTL_CHUNK_SIZE && rc == SQLITE_OK) {
-    p->fileChunkSize = *static_cast<int*>(pArg);
-  }
-#ifdef DEBUG
-  if (op == SQLITE_FCNTL_SIZE_HINT && p->quotaObject && rc == SQLITE_OK) {
-    sqlite3_int64 hintSize = *static_cast<sqlite3_int64*>(pArg);
-    if (p->fileChunkSize > 0) {
-      hintSize =
-        ((hintSize + p->fileChunkSize - 1) / p->fileChunkSize) *
-          p->fileChunkSize;
-    }
-    sqlite3_int64 currentSize;
-    MOZ_ASSERT(xFileSize(pFile, &currentSize) == SQLITE_OK);
-    MOZ_ASSERT(currentSize >= hintSize);
-  }
-#endif
-  return rc;
-}
-
-/*
-** Return the sector-size in bytes for a telemetry_file.
-*/
-int
-xSectorSize(sqlite3_file *pFile)
-{
-  telemetry_file *p = (telemetry_file *)pFile;
-  int rc;
-  rc = p->pReal->pMethods->xSectorSize(p->pReal);
-  return rc;
-}
-
-/*
-** Return the device characteristic flags supported by a telemetry_file.
-*/
-int
-xDeviceCharacteristics(sqlite3_file *pFile)
-{
-  telemetry_file *p = (telemetry_file *)pFile;
-  int rc;
-  rc = p->pReal->pMethods->xDeviceCharacteristics(p->pReal);
-  return rc;
-}
-
-/*
-** Shared-memory operations.
-*/
-int
-xShmLock(sqlite3_file *pFile, int ofst, int n, int flags)
-{
-  telemetry_file *p = (telemetry_file *)pFile;
-  return p->pReal->pMethods->xShmLock(p->pReal, ofst, n, flags);
-}
-
-int
-xShmMap(sqlite3_file *pFile, int iRegion, int szRegion, int isWrite, void volatile **pp)
-{
-  telemetry_file *p = (telemetry_file *)pFile;
-  int rc;
-  rc = p->pReal->pMethods->xShmMap(p->pReal, iRegion, szRegion, isWrite, pp);
-  return rc;
-}
-
-void
-xShmBarrier(sqlite3_file *pFile){
-  telemetry_file *p = (telemetry_file *)pFile;
-  p->pReal->pMethods->xShmBarrier(p->pReal);
-}
-
-int
-xShmUnmap(sqlite3_file *pFile, int delFlag){
-  telemetry_file *p = (telemetry_file *)pFile;
-  int rc;
-  rc = p->pReal->pMethods->xShmUnmap(p->pReal, delFlag);
-  return rc;
-}
-
-int
-xFetch(sqlite3_file *pFile, sqlite3_int64 iOff, int iAmt, void **pp)
-{
-  telemetry_file *p = (telemetry_file *)pFile;
-  MOZ_ASSERT(p->pReal->pMethods->iVersion >= 3);
-  return p->pReal->pMethods->xFetch(p->pReal, iOff, iAmt, pp);
-}
-
-int
-xUnfetch(sqlite3_file *pFile, sqlite3_int64 iOff, void *pResOut)
-{
-  telemetry_file *p = (telemetry_file *)pFile;
-  MOZ_ASSERT(p->pReal->pMethods->iVersion >= 3);
-  return p->pReal->pMethods->xUnfetch(p->pReal, iOff, pResOut);
-}
-
-int
-xOpen(sqlite3_vfs* vfs, const char *zName, sqlite3_file* pFile,
-          int flags, int *pOutFlags)
-{
-  IOThreadAutoTimer ioTimer(Telemetry::MOZ_SQLITE_OPEN_MS,
-                            IOInterposeObserver::OpCreateOrOpen);
-  Telemetry::AutoTimer<Telemetry::MOZ_SQLITE_OPEN_MS> timer;
-  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
-  int rc;
-  telemetry_file *p = (telemetry_file *)pFile;
-  Histograms *h = nullptr;
-  // check if the filename is one we are probing for
-  for(size_t i = 0;i < sizeof(gHistograms)/sizeof(gHistograms[0]);i++) {
-    h = &gHistograms[i];
-    // last probe is the fallback probe
-    if (!h->name)
-      break;
-    if (!zName)
-      continue;
-    const char *match = strstr(zName, h->name);
-    if (!match)
-      continue;
-    char c = match[strlen(h->name)];
-    // include -wal/-journal too
-    if (!c || c == '-')
-      break;
-  }
-  p->histograms = h;
-
-  MaybeEstablishQuotaControl(zName, p, flags);
-
-  rc = orig_vfs->xOpen(orig_vfs, zName, p->pReal, flags, pOutFlags);
-  if( rc != SQLITE_OK )
-    return rc;
-  if( p->pReal->pMethods ){
-    sqlite3_io_methods *pNew = new sqlite3_io_methods;
-    const sqlite3_io_methods *pSub = p->pReal->pMethods;
-    memset(pNew, 0, sizeof(*pNew));
-    // If the io_methods version is higher than the last known one, you should
-    // update this VFS adding appropriate IO methods for any methods added in
-    // the version change.
-    pNew->iVersion = pSub->iVersion;
-    MOZ_ASSERT(pNew->iVersion <= LAST_KNOWN_IOMETHODS_VERSION);
-    pNew->xClose = xClose;
-    pNew->xRead = xRead;
-    pNew->xWrite = xWrite;
-    pNew->xTruncate = xTruncate;
-    pNew->xSync = xSync;
-    pNew->xFileSize = xFileSize;
-    pNew->xLock = xLock;
-    pNew->xUnlock = xUnlock;
-    pNew->xCheckReservedLock = xCheckReservedLock;
-    pNew->xFileControl = xFileControl;
-    pNew->xSectorSize = xSectorSize;
-    pNew->xDeviceCharacteristics = xDeviceCharacteristics;
-    if (pNew->iVersion >= 2) {
-      // Methods added in version 2.
-      pNew->xShmMap = pSub->xShmMap ? xShmMap : 0;
-      pNew->xShmLock = pSub->xShmLock ? xShmLock : 0;
-      pNew->xShmBarrier = pSub->xShmBarrier ? xShmBarrier : 0;
-      pNew->xShmUnmap = pSub->xShmUnmap ? xShmUnmap : 0;
-    }
-    if (pNew->iVersion >= 3) {
-      // Methods added in version 3.
-      // SQLite 3.7.17 calls these methods without checking for nullptr first,
-      // so we always define them.  Verify that we're not going to call
-      // nullptrs, though.
-      MOZ_ASSERT(pSub->xFetch);
-      pNew->xFetch = xFetch;
-      MOZ_ASSERT(pSub->xUnfetch);
-      pNew->xUnfetch = xUnfetch;
-    }
-    pFile->pMethods = pNew;
-  }
-  return rc;
-}
-
-int
-xDelete(sqlite3_vfs* vfs, const char *zName, int syncDir)
-{
-  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
-  int rc;
-  nsRefPtr<QuotaObject> quotaObject;
-
-  if (StringEndsWith(nsDependentCString(zName), NS_LITERAL_CSTRING("-wal"))) {
-    const char *zURIParameterKey = DatabasePathFromWALPath(zName);
-    MOZ_ASSERT(zURIParameterKey);
-
-    quotaObject = GetQuotaObjectFromNameAndParameters(zName, zURIParameterKey);
-  }
-
-  rc = orig_vfs->xDelete(orig_vfs, zName, syncDir);
-  if (rc == SQLITE_OK && quotaObject) {
-    MOZ_ALWAYS_TRUE(quotaObject->MaybeUpdateSize(0, /* aTruncate */ true));
-  }
-
-  return rc;
-}
-
-int
-xAccess(sqlite3_vfs *vfs, const char *zName, int flags, int *pResOut)
-{
-  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
-  return orig_vfs->xAccess(orig_vfs, zName, flags, pResOut);
-}
-
-int
-xFullPathname(sqlite3_vfs *vfs, const char *zName, int nOut, char *zOut)
-{
-  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
-  return orig_vfs->xFullPathname(orig_vfs, zName, nOut, zOut);
-}
-
-void*
-xDlOpen(sqlite3_vfs *vfs, const char *zFilename)
-{
-  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
-  return orig_vfs->xDlOpen(orig_vfs, zFilename);
-}
-
-void
-xDlError(sqlite3_vfs *vfs, int nByte, char *zErrMsg)
-{
-  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
-  orig_vfs->xDlError(orig_vfs, nByte, zErrMsg);
-}
-
-void 
-(*xDlSym(sqlite3_vfs *vfs, void *pHdle, const char *zSym))(void){
-  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
-  return orig_vfs->xDlSym(orig_vfs, pHdle, zSym);
-}
-
-void
-xDlClose(sqlite3_vfs *vfs, void *pHandle)
-{
-  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
-  orig_vfs->xDlClose(orig_vfs, pHandle);
-}
-
-int
-xRandomness(sqlite3_vfs *vfs, int nByte, char *zOut)
-{
-  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
-  return orig_vfs->xRandomness(orig_vfs, nByte, zOut);
-}
-
-int
-xSleep(sqlite3_vfs *vfs, int microseconds)
-{
-  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
-  return orig_vfs->xSleep(orig_vfs, microseconds);
-}
-
-int
-xCurrentTime(sqlite3_vfs *vfs, double *prNow)
-{
-  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
-  return orig_vfs->xCurrentTime(orig_vfs, prNow);
-}
-
-int
-xGetLastError(sqlite3_vfs *vfs, int nBuf, char *zBuf)
-{
-  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
-  return orig_vfs->xGetLastError(orig_vfs, nBuf, zBuf);
-}
-
-int
-xCurrentTimeInt64(sqlite3_vfs *vfs, sqlite3_int64 *piNow)
-{
-  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
-  return orig_vfs->xCurrentTimeInt64(orig_vfs, piNow);
-}
-
-static
-int
-xSetSystemCall(sqlite3_vfs *vfs, const char *zName, sqlite3_syscall_ptr pFunc)
-{
-  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
-  return orig_vfs->xSetSystemCall(orig_vfs, zName, pFunc);
-}
-
-static
-sqlite3_syscall_ptr
-xGetSystemCall(sqlite3_vfs *vfs, const char *zName)
-{
-  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
-  return orig_vfs->xGetSystemCall(orig_vfs, zName);
-}
-
-static
-const char *
-xNextSystemCall(sqlite3_vfs *vfs, const char *zName)
-{
-  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
-  return orig_vfs->xNextSystemCall(orig_vfs, zName);
-}
-
-}
-
-namespace mozilla {
-namespace storage {
-
-sqlite3_vfs* ConstructTelemetryVFS()
-{
-#if defined(XP_WIN)
-#define EXPECTED_VFS     "win32"
-#define EXPECTED_VFS_NFS "win32"
-#else
-#define EXPECTED_VFS     "unix"
-#define EXPECTED_VFS_NFS "unix-excl"
-#endif
-  
-  bool expected_vfs;
-  sqlite3_vfs *vfs;
-  if (Preferences::GetBool(PREF_NFS_FILESYSTEM)) {
-    vfs = sqlite3_vfs_find(EXPECTED_VFS_NFS);
-    expected_vfs = (vfs != nullptr);
-  }
-  else {
-    vfs = sqlite3_vfs_find(nullptr);
-    expected_vfs = vfs->zName && !strcmp(vfs->zName, EXPECTED_VFS);
-  }
-  if (!expected_vfs) {
-    return nullptr;
-  }
-
-  sqlite3_vfs *tvfs = new ::sqlite3_vfs;
-  memset(tvfs, 0, sizeof(::sqlite3_vfs));
-  // If the VFS version is higher than the last known one, you should update
-  // this VFS adding appropriate methods for any methods added in the version
-  // change.
-  tvfs->iVersion = vfs->iVersion;
-  MOZ_ASSERT(vfs->iVersion <= LAST_KNOWN_VFS_VERSION);
-  tvfs->szOsFile = sizeof(telemetry_file) - sizeof(sqlite3_file) + vfs->szOsFile;
-  tvfs->mxPathname = vfs->mxPathname;
-  tvfs->zName = "telemetry-vfs";
-  tvfs->pAppData = vfs;
-  tvfs->xOpen = xOpen;
-  tvfs->xDelete = xDelete;
-  tvfs->xAccess = xAccess;
-  tvfs->xFullPathname = xFullPathname;
-  tvfs->xDlOpen = xDlOpen;
-  tvfs->xDlError = xDlError;
-  tvfs->xDlSym = xDlSym;
-  tvfs->xDlClose = xDlClose;
-  tvfs->xRandomness = xRandomness;
-  tvfs->xSleep = xSleep;
-  tvfs->xCurrentTime = xCurrentTime;
-  tvfs->xGetLastError = xGetLastError;
-  if (tvfs->iVersion >= 2) {
-    // Methods added in version 2.
-    tvfs->xCurrentTimeInt64 = xCurrentTimeInt64;
-  }
-  if (tvfs->iVersion >= 3) {
-    // Methods added in version 3.
-    tvfs->xSetSystemCall = xSetSystemCall;
-    tvfs->xGetSystemCall = xGetSystemCall;
-    tvfs->xNextSystemCall = xNextSystemCall;
-  }
-  return tvfs;
-}
-
-}
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/VacuumManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/src/VacuumManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/VacuumManager.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/VacuumManager.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,392 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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/DebugOnly.h"
-
-#include "VacuumManager.h"
-
-#include "mozilla/Services.h"
-#include "mozilla/Preferences.h"
-#include "nsIObserverService.h"
-#include "nsIFile.h"
-#include "nsThreadUtils.h"
-#include "prlog.h"
-#include "prtime.h"
-
-#include "mozStorageConnection.h"
-#include "mozIStorageStatement.h"
-#include "mozIStorageAsyncStatement.h"
-#include "mozIStoragePendingStatement.h"
-#include "mozIStorageError.h"
-#include "mozStorageHelper.h"
-#include "nsXULAppAPI.h"
-
-#define OBSERVER_TOPIC_IDLE_DAILY "idle-daily"
-#define OBSERVER_TOPIC_XPCOM_SHUTDOWN "xpcom-shutdown"
-
-// Used to notify begin and end of a heavy IO task.
-#define OBSERVER_TOPIC_HEAVY_IO "heavy-io-task"
-#define OBSERVER_DATA_VACUUM_BEGIN NS_LITERAL_STRING("vacuum-begin")
-#define OBSERVER_DATA_VACUUM_END NS_LITERAL_STRING("vacuum-end")
-
-// This preferences root will contain last vacuum timestamps (in seconds) for
-// each database.  The database filename is used as a key.
-#define PREF_VACUUM_BRANCH "storage.vacuum.last."
-
-// Time between subsequent vacuum calls for a certain database.
-#define VACUUM_INTERVAL_SECONDS 30 * 86400 // 30 days.
-
-#ifdef PR_LOGGING
-extern PRLogModuleInfo *gStorageLog;
-#endif
-
-namespace mozilla {
-namespace storage {
-
-namespace {
-
-////////////////////////////////////////////////////////////////////////////////
-//// BaseCallback
-
-class BaseCallback : public mozIStorageStatementCallback
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_MOZISTORAGESTATEMENTCALLBACK
-  BaseCallback() {}
-protected:
-  virtual ~BaseCallback() {}
-};
-
-NS_IMETHODIMP
-BaseCallback::HandleError(mozIStorageError *aError)
-{
-#ifdef DEBUG
-  int32_t result;
-  nsresult rv = aError->GetResult(&result);
-  NS_ENSURE_SUCCESS(rv, rv);
-  nsAutoCString message;
-  rv = aError->GetMessage(message);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsAutoCString warnMsg;
-  warnMsg.AppendLiteral("An error occured during async execution: ");
-  warnMsg.AppendInt(result);
-  warnMsg.Append(' ');
-  warnMsg.Append(message);
-  NS_WARNING(warnMsg.get());
-#endif
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-BaseCallback::HandleResult(mozIStorageResultSet *aResultSet)
-{
-  // We could get results from PRAGMA statements, but we don't mind them.
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-BaseCallback::HandleCompletion(uint16_t aReason)
-{
-  // By default BaseCallback will just be silent on completion.
-  return NS_OK;
-}
-
-NS_IMPL_ISUPPORTS(
-  BaseCallback
-, mozIStorageStatementCallback
-)
-
-//////////////////////////////////////////////////////////////////////////////// 
-//// Vacuumer declaration.
-
-class Vacuumer : public BaseCallback
-{
-public:
-  NS_DECL_MOZISTORAGESTATEMENTCALLBACK
-
-  explicit Vacuumer(mozIStorageVacuumParticipant *aParticipant);
-
-  bool execute();
-  nsresult notifyCompletion(bool aSucceeded);
-
-private:
-  nsCOMPtr<mozIStorageVacuumParticipant> mParticipant;
-  nsCString mDBFilename;
-  nsCOMPtr<mozIStorageConnection> mDBConn;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-//// Vacuumer implementation.
-
-Vacuumer::Vacuumer(mozIStorageVacuumParticipant *aParticipant)
-  : mParticipant(aParticipant)
-{
-}
-
-bool
-Vacuumer::execute()
-{
-  MOZ_ASSERT(NS_IsMainThread(), "Must be running on the main thread!");
-
-  // Get the connection and check its validity.
-  nsresult rv = mParticipant->GetDatabaseConnection(getter_AddRefs(mDBConn));
-  NS_ENSURE_SUCCESS(rv, false);
-  bool ready = false;
-  if (!mDBConn || NS_FAILED(mDBConn->GetConnectionReady(&ready)) || !ready) {
-    NS_WARNING("Unable to get a connection to vacuum database");
-    return false;
-  }
-
-  // Ask for the expected page size.  Vacuum can change the page size, unless
-  // the database is using WAL journaling.
-  // TODO Bug 634374: figure out a strategy to fix page size with WAL.
-  int32_t expectedPageSize = 0;
-  rv = mParticipant->GetExpectedDatabasePageSize(&expectedPageSize);
-  if (NS_FAILED(rv) || !Service::pageSizeIsValid(expectedPageSize)) {
-    NS_WARNING("Invalid page size requested for database, will use default ");
-    NS_WARNING(mDBFilename.get());
-    expectedPageSize = Service::getDefaultPageSize();
-  }
-
-  // Get the database filename.  Last vacuum time is stored under this name
-  // in PREF_VACUUM_BRANCH.
-  nsCOMPtr<nsIFile> databaseFile;
-  mDBConn->GetDatabaseFile(getter_AddRefs(databaseFile));
-  if (!databaseFile) {
-    NS_WARNING("Trying to vacuum a in-memory database!");
-    return false;
-  }
-  nsAutoString databaseFilename;
-  rv = databaseFile->GetLeafName(databaseFilename);
-  NS_ENSURE_SUCCESS(rv, false);
-  mDBFilename = NS_ConvertUTF16toUTF8(databaseFilename);
-  MOZ_ASSERT(!mDBFilename.IsEmpty(), "Database filename cannot be empty");
-
-  // Check interval from last vacuum.
-  int32_t now = static_cast<int32_t>(PR_Now() / PR_USEC_PER_SEC);
-  int32_t lastVacuum;
-  nsAutoCString prefName(PREF_VACUUM_BRANCH);
-  prefName += mDBFilename;
-  rv = Preferences::GetInt(prefName.get(), &lastVacuum);
-  if (NS_SUCCEEDED(rv) && (now - lastVacuum) < VACUUM_INTERVAL_SECONDS) {
-    // This database was vacuumed recently, skip it.
-    return false;
-  }
-
-  // Notify that we are about to start vacuuming.  The participant can opt-out
-  // if it cannot handle a vacuum at this time, and then we'll move to the next
-  // one.
-  bool vacuumGranted = false;
-  rv = mParticipant->OnBeginVacuum(&vacuumGranted);
-  NS_ENSURE_SUCCESS(rv, false);
-  if (!vacuumGranted) {
-    return false;
-  }
-
-  // Notify a heavy IO task is about to start.
-  nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
-  if (os) {
-    DebugOnly<nsresult> rv =
-      os->NotifyObservers(nullptr, OBSERVER_TOPIC_HEAVY_IO,
-                          OBSERVER_DATA_VACUUM_BEGIN.get());
-    MOZ_ASSERT(NS_SUCCEEDED(rv), "Should be able to notify");
-  }
-
-  // Execute the statements separately, since the pragma may conflict with the
-  // vacuum, if they are executed in the same transaction.
-  nsCOMPtr<mozIStorageAsyncStatement> pageSizeStmt;
-  nsAutoCString pageSizeQuery(MOZ_STORAGE_UNIQUIFY_QUERY_STR
-                              "PRAGMA page_size = ");
-  pageSizeQuery.AppendInt(expectedPageSize);
-  rv = mDBConn->CreateAsyncStatement(pageSizeQuery,
-                                     getter_AddRefs(pageSizeStmt));
-  NS_ENSURE_SUCCESS(rv, false);
-  nsRefPtr<BaseCallback> callback = new BaseCallback();
-  nsCOMPtr<mozIStoragePendingStatement> ps;
-  rv = pageSizeStmt->ExecuteAsync(callback, getter_AddRefs(ps));
-  NS_ENSURE_SUCCESS(rv, false);
-
-  nsCOMPtr<mozIStorageAsyncStatement> stmt;
-  rv = mDBConn->CreateAsyncStatement(NS_LITERAL_CSTRING(
-    "VACUUM"
-  ), getter_AddRefs(stmt));
-  NS_ENSURE_SUCCESS(rv, false);
-  rv = stmt->ExecuteAsync(this, getter_AddRefs(ps));
-  NS_ENSURE_SUCCESS(rv, false);
-
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//// mozIStorageStatementCallback
-
-NS_IMETHODIMP
-Vacuumer::HandleError(mozIStorageError *aError)
-{
-#ifdef DEBUG
-  int32_t result;
-  nsresult rv = aError->GetResult(&result);
-  NS_ENSURE_SUCCESS(rv, rv);
-  nsAutoCString message;
-  rv = aError->GetMessage(message);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsAutoCString warnMsg;
-  warnMsg.AppendLiteral("Unable to vacuum database: ");
-  warnMsg.Append(mDBFilename);
-  warnMsg.AppendLiteral(" - ");
-  warnMsg.AppendInt(result);
-  warnMsg.Append(' ');
-  warnMsg.Append(message);
-  NS_WARNING(warnMsg.get());
-#endif
-
-#ifdef PR_LOGGING
-  {
-    int32_t result;
-    nsresult rv = aError->GetResult(&result);
-    NS_ENSURE_SUCCESS(rv, rv);
-    nsAutoCString message;
-    rv = aError->GetMessage(message);
-    NS_ENSURE_SUCCESS(rv, rv);
-    PR_LOG(gStorageLog, PR_LOG_ERROR,
-           ("Vacuum failed with error: %d '%s'. Database was: '%s'",
-            result, message.get(), mDBFilename.get()));
-  }
-#endif
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Vacuumer::HandleResult(mozIStorageResultSet *aResultSet)
-{
-  NS_NOTREACHED("Got a resultset from a vacuum?");
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Vacuumer::HandleCompletion(uint16_t aReason)
-{
-  if (aReason == REASON_FINISHED) {
-    // Update last vacuum time.
-    int32_t now = static_cast<int32_t>(PR_Now() / PR_USEC_PER_SEC);
-    MOZ_ASSERT(!mDBFilename.IsEmpty(), "Database filename cannot be empty");
-    nsAutoCString prefName(PREF_VACUUM_BRANCH);
-    prefName += mDBFilename;
-    DebugOnly<nsresult> rv = Preferences::SetInt(prefName.get(), now);
-    MOZ_ASSERT(NS_SUCCEEDED(rv), "Should be able to set a preference"); 
-  }
-
-  notifyCompletion(aReason == REASON_FINISHED);
-
-  return NS_OK;
-}
-
-nsresult
-Vacuumer::notifyCompletion(bool aSucceeded)
-{
-  nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
-  if (os) {
-    os->NotifyObservers(nullptr, OBSERVER_TOPIC_HEAVY_IO,
-                        OBSERVER_DATA_VACUUM_END.get());
-  }
-
-  nsresult rv = mParticipant->OnEndVacuum(aSucceeded);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-} // Anonymous namespace.
-
-////////////////////////////////////////////////////////////////////////////////
-//// VacuumManager
-
-NS_IMPL_ISUPPORTS(
-  VacuumManager
-, nsIObserver
-)
-
-VacuumManager *
-VacuumManager::gVacuumManager = nullptr;
-
-VacuumManager *
-VacuumManager::getSingleton()
-{
-  //Don't allocate it in the child Process.
-  if (XRE_GetProcessType() != GeckoProcessType_Default) {
-    return nullptr;
-  }
-
-  if (gVacuumManager) {
-    NS_ADDREF(gVacuumManager);
-    return gVacuumManager;
-  }
-  gVacuumManager = new VacuumManager();
-  if (gVacuumManager) {
-    NS_ADDREF(gVacuumManager);
-  }
-  return gVacuumManager;
-}
-
-VacuumManager::VacuumManager()
-  : mParticipants("vacuum-participant")
-{
-  MOZ_ASSERT(!gVacuumManager,
-             "Attempting to create two instances of the service!");
-  gVacuumManager = this;
-}
-
-VacuumManager::~VacuumManager()
-{
-  // Remove the static reference to the service.  Check to make sure its us
-  // in case somebody creates an extra instance of the service.
-  MOZ_ASSERT(gVacuumManager == this,
-             "Deleting a non-singleton instance of the service");
-  if (gVacuumManager == this) {
-    gVacuumManager = nullptr;
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//// nsIObserver
-
-NS_IMETHODIMP
-VacuumManager::Observe(nsISupports *aSubject,
-                       const char *aTopic,
-                       const char16_t *aData)
-{
-  if (strcmp(aTopic, OBSERVER_TOPIC_IDLE_DAILY) == 0) {
-    // Try to run vacuum on all registered entries.  Will stop at the first
-    // successful one.
-    nsCOMArray<mozIStorageVacuumParticipant> entries;
-    mParticipants.GetEntries(entries);
-    // If there are more entries than what a month can contain, we could end up
-    // skipping some, since we run daily.  So we use a starting index.
-    static const char* kPrefName = PREF_VACUUM_BRANCH "index";
-    int32_t startIndex = Preferences::GetInt(kPrefName, 0);
-    if (startIndex >= entries.Count()) {
-      startIndex = 0;
-    }
-    int32_t index;
-    for (index = startIndex; index < entries.Count(); ++index) {
-      nsRefPtr<Vacuumer> vacuum = new Vacuumer(entries[index]);
-      // Only vacuum one database per day.
-      if (vacuum->execute()) {
-        break;
-      }
-    }
-    DebugOnly<nsresult> rv = Preferences::SetInt(kPrefName, index);
-    MOZ_ASSERT(NS_SUCCEEDED(rv), "Should be able to set a preference");
-  }
-
-  return NS_OK;
-}
-
-} // namespace storage
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/VacuumManager.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/VacuumManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/VacuumManager.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/VacuumManager.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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_storage_VacuumManager_h__
-#define mozilla_storage_VacuumManager_h__
-
-#include "nsCOMPtr.h"
-#include "nsIObserver.h"
-#include "mozIStorageStatementCallback.h"
-#include "mozIStorageVacuumParticipant.h"
-#include "nsCategoryCache.h"
-#include "mozilla/Attributes.h"
-
-namespace mozilla {
-namespace storage {
-
-class VacuumManager final : public nsIObserver
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIOBSERVER
-
-  VacuumManager();
-
-  /**
-   * Obtains the VacuumManager object.
-   */
-  static VacuumManager * getSingleton();
-
-private:
-  ~VacuumManager();
-
-  static VacuumManager *gVacuumManager;
-
-  // Cache of components registered in "vacuum-participant" category.
-  nsCategoryCache<mozIStorageVacuumParticipant> mParticipants;
-};
-
-} // namespace storage
-} // namespace mozilla
-
-#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/Variant.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/Variant.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/Variant.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/Variant.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,449 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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_storage_Variant_h__
-#define mozilla_storage_Variant_h__
-
-#include <utility>
-
-#include "nsIVariant.h"
-#include "nsString.h"
-#include "nsTArray.h"
-
-#define VARIANT_BASE_IID                                   \
-{ /* 78888042-0fa3-4f7a-8b19-7996f99bf1aa */               \
-  0x78888042, 0x0fa3, 0x4f7a,                              \
-  { 0x8b, 0x19, 0x79, 0x96, 0xf9, 0x9b, 0xf1, 0xaa }       \
-}
-
-/**
- * This class is used by the storage module whenever an nsIVariant needs to be
- * returned.  We provide traits for the basic sqlite types to make use easier.
- * The following types map to the indicated sqlite type:
- * int64_t   -> INTEGER (use IntegerVariant)
- * double    -> FLOAT (use FloatVariant)
- * nsString  -> TEXT (use TextVariant)
- * nsCString -> TEXT (use UTF8TextVariant)
- * uint8_t[] -> BLOB (use BlobVariant)
- * nullptr   -> NULL (use NullVariant)
- */
-
-namespace mozilla {
-namespace storage {
-
-////////////////////////////////////////////////////////////////////////////////
-//// Base Class
-
-class Variant_base : public nsIVariant
-{
-public:
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_NSIVARIANT
-  NS_DECLARE_STATIC_IID_ACCESSOR(VARIANT_BASE_IID)
-
-protected:
-  virtual ~Variant_base() { }
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(Variant_base,
-                              VARIANT_BASE_IID)
-
-////////////////////////////////////////////////////////////////////////////////
-//// Traits
-
-/**
- * Generics
- */
-
-template <typename DataType>
-struct variant_traits
-{
-  static inline uint16_t type() { return nsIDataType::VTYPE_EMPTY; }
-};
-
-template <typename DataType, bool Adopting=false>
-struct variant_storage_traits
-{
-  typedef DataType ConstructorType;
-  typedef DataType StorageType;
-  static inline void storage_conversion(const ConstructorType aData, StorageType* _storage)
-  {
-    *_storage = aData;
-  }
-
-  static inline void destroy(const StorageType& _storage)
-  { }
-};
-
-#define NO_CONVERSION return NS_ERROR_CANNOT_CONVERT_DATA;
-
-template <typename DataType, bool Adopting=false>
-struct variant_integer_traits
-{
-  typedef typename variant_storage_traits<DataType, Adopting>::StorageType StorageType;
-  static inline nsresult asInt32(const StorageType &, int32_t *) { NO_CONVERSION }
-  static inline nsresult asInt64(const StorageType &, int64_t *) { NO_CONVERSION }
-};
-
-template <typename DataType, bool Adopting=false>
-struct variant_float_traits
-{
-  typedef typename variant_storage_traits<DataType, Adopting>::StorageType StorageType;
-  static inline nsresult asDouble(const StorageType &, double *) { NO_CONVERSION }
-};
-
-template <typename DataType, bool Adopting=false>
-struct variant_text_traits
-{
-  typedef typename variant_storage_traits<DataType, Adopting>::StorageType StorageType;
-  static inline nsresult asUTF8String(const StorageType &, nsACString &) { NO_CONVERSION }
-  static inline nsresult asString(const StorageType &, nsAString &) { NO_CONVERSION }
-};
-
-template <typename DataType, bool Adopting=false>
-struct variant_blob_traits
-{
-  typedef typename variant_storage_traits<DataType, Adopting>::StorageType StorageType;
-  static inline nsresult asArray(const StorageType &, uint16_t *, uint32_t *, void **)
-  { NO_CONVERSION }
-};
-
-#undef NO_CONVERSION
-
-/**
- * INTEGER types
- */
-
-template < >
-struct variant_traits<int64_t>
-{
-  static inline uint16_t type() { return nsIDataType::VTYPE_INT64; }
-};
-template < >
-struct variant_integer_traits<int64_t>
-{
-  static inline nsresult asInt32(int64_t aValue,
-                                 int32_t *_result)
-  {
-    if (aValue > INT32_MAX || aValue < INT32_MIN)
-      return NS_ERROR_CANNOT_CONVERT_DATA;
-
-    *_result = static_cast<int32_t>(aValue);
-    return NS_OK;
-  }
-  static inline nsresult asInt64(int64_t aValue,
-                                 int64_t *_result)
-  {
-    *_result = aValue;
-    return NS_OK;
-  }
-};
-// xpcvariant just calls get double for integers...
-template < >
-struct variant_float_traits<int64_t>
-{
-  static inline nsresult asDouble(int64_t aValue,
-                                  double *_result)
-  {
-    *_result = double(aValue);
-    return NS_OK;
-  }
-};
-
-/**
- * FLOAT types
- */
-
-template < >
-struct variant_traits<double>
-{
-  static inline uint16_t type() { return nsIDataType::VTYPE_DOUBLE; }
-};
-template < >
-struct variant_float_traits<double>
-{
-  static inline nsresult asDouble(double aValue,
-                                  double *_result)
-  {
-    *_result = aValue;
-    return NS_OK;
-  }
-};
-
-/**
- * TEXT types
- */
-
-template < >
-struct variant_traits<nsString>
-{
-  static inline uint16_t type() { return nsIDataType::VTYPE_ASTRING; }
-};
-template < >
-struct variant_storage_traits<nsString>
-{
-  typedef const nsAString & ConstructorType;
-  typedef nsString StorageType;
-  static inline void storage_conversion(ConstructorType aText, StorageType* _outData)
-  {
-    *_outData = aText;
-  }
-  static inline void destroy(const StorageType& _outData)
-  { }
-};
-template < >
-struct variant_text_traits<nsString>
-{
-  static inline nsresult asUTF8String(const nsString &aValue,
-                                      nsACString &_result)
-  {
-    CopyUTF16toUTF8(aValue, _result);
-    return NS_OK;
-  }
-  static inline nsresult asString(const nsString &aValue,
-                                  nsAString &_result)
-  {
-    _result = aValue;
-    return NS_OK;
-  }
-};
-
-template < >
-struct variant_traits<nsCString>
-{
-  static inline uint16_t type() { return nsIDataType::VTYPE_UTF8STRING; }
-};
-template < >
-struct variant_storage_traits<nsCString>
-{
-  typedef const nsACString & ConstructorType;
-  typedef nsCString StorageType;
-  static inline void storage_conversion(ConstructorType aText, StorageType* _outData)
-  {
-    *_outData = aText;
-  }
-  static inline void destroy(const StorageType &aData)
-  { }
-};
-template < >
-struct variant_text_traits<nsCString>
-{
-  static inline nsresult asUTF8String(const nsCString &aValue,
-                                      nsACString &_result)
-  {
-    _result = aValue;
-    return NS_OK;
-  }
-  static inline nsresult asString(const nsCString &aValue,
-                                  nsAString &_result)
-  {
-    CopyUTF8toUTF16(aValue, _result);
-    return NS_OK;
-  }
-};
-
-/**
- * BLOB types
- */
-
-template < >
-struct variant_traits<uint8_t[]>
-{
-  static inline uint16_t type() { return nsIDataType::VTYPE_ARRAY; }
-};
-template < >
-struct variant_storage_traits<uint8_t[], false>
-{
-  typedef std::pair<const void *, int> ConstructorType;
-  typedef FallibleTArray<uint8_t> StorageType;
-  static inline void storage_conversion(ConstructorType aBlob, StorageType* _outData)
-  {
-    _outData->Clear();
-    _outData->SetCapacity(aBlob.second);
-    (void)_outData->AppendElements(static_cast<const uint8_t *>(aBlob.first),
-                                   aBlob.second);
-  }
-  static inline void destroy(const StorageType& _outData)
-  { }
-};
-template < >
-struct variant_storage_traits<uint8_t[], true>
-{
-  typedef std::pair<uint8_t *, int> ConstructorType;
-  typedef std::pair<uint8_t *, int> StorageType;
-  static inline void storage_conversion(ConstructorType aBlob, StorageType* _outData)
-  {
-    *_outData = aBlob;
-  }
-  static inline void destroy(StorageType &aData)
-  {
-    if (aData.first) {
-      free(aData.first);
-      aData.first = nullptr;
-    }
-  }
-};
-template < >
-struct variant_blob_traits<uint8_t[], false>
-{
-  static inline nsresult asArray(FallibleTArray<uint8_t> &aData,
-                                 uint16_t *_type,
-                                 uint32_t *_size,
-                                 void **_result)
-  {
-    // For empty blobs, we return nullptr.
-    if (aData.Length() == 0) {
-      *_result = nullptr;
-      *_type = nsIDataType::VTYPE_UINT8;
-      *_size = 0;
-      return NS_OK;
-    }
-
-    // Otherwise, we copy the array.
-    *_result = nsMemory::Clone(aData.Elements(), aData.Length() * sizeof(uint8_t));
-    NS_ENSURE_TRUE(*_result, NS_ERROR_OUT_OF_MEMORY);
-
-    // Set type and size
-    *_type = nsIDataType::VTYPE_UINT8;
-    *_size = aData.Length();
-    return NS_OK;
-  }
-};
-
-template < >
-struct variant_blob_traits<uint8_t[], true>
-{
-  static inline nsresult asArray(std::pair<uint8_t *, int> &aData,
-                                 uint16_t *_type,
-                                 uint32_t *_size,
-                                 void **_result)
-  {
-    // For empty blobs, we return nullptr.
-    if (aData.second == 0) {
-      *_result = nullptr;
-      *_type = nsIDataType::VTYPE_UINT8;
-      *_size = 0;
-      return NS_OK;
-    }
-
-    // Otherwise, transfer the data out.
-    *_result = aData.first;
-    aData.first = nullptr;
-    MOZ_ASSERT(*_result); // We asked for it twice, better not use adopting!
-
-    // Set type and size
-    *_type = nsIDataType::VTYPE_UINT8;
-    *_size = aData.second;
-    return NS_OK;
-  }
-};
-
-/**
- * nullptr type
- */
-
-class NullVariant : public Variant_base
-{
-public:
-  NS_IMETHOD GetDataType(uint16_t *_type)
-  {
-    NS_ENSURE_ARG_POINTER(_type);
-    *_type = nsIDataType::VTYPE_EMPTY;
-    return NS_OK;
-  }
-
-  NS_IMETHOD GetAsAUTF8String(nsACString &_str)
-  {
-    // Return a void string.
-    _str.Truncate(0);
-    _str.SetIsVoid(true);
-    return NS_OK;
-  }
-
-  NS_IMETHOD GetAsAString(nsAString &_str)
-  {
-    // Return a void string.
-    _str.Truncate(0);
-    _str.SetIsVoid(true);
-    return NS_OK;
-  }
-};
-
-////////////////////////////////////////////////////////////////////////////////
-//// Template Implementation
-
-template <typename DataType, bool Adopting=false>
-class Variant final : public Variant_base
-{
-  ~Variant()
-  {
-    variant_storage_traits<DataType, Adopting>::destroy(mData);
-  }
-
-public:
-  explicit Variant(const typename variant_storage_traits<DataType, Adopting>::ConstructorType aData)
-  {
-    variant_storage_traits<DataType, Adopting>::storage_conversion(aData, &mData);
-  }
-
-  NS_IMETHOD GetDataType(uint16_t *_type)
-  {
-    *_type = variant_traits<DataType>::type();
-    return NS_OK;
-  }
-  NS_IMETHOD GetAsInt32(int32_t *_integer)
-  {
-    return variant_integer_traits<DataType, Adopting>::asInt32(mData, _integer);
-  }
-
-  NS_IMETHOD GetAsInt64(int64_t *_integer)
-  {
-    return variant_integer_traits<DataType, Adopting>::asInt64(mData, _integer);
-  }
-
-  NS_IMETHOD GetAsDouble(double *_double)
-  {
-    return variant_float_traits<DataType, Adopting>::asDouble(mData, _double);
-  }
-
-  NS_IMETHOD GetAsAUTF8String(nsACString &_str)
-  {
-    return variant_text_traits<DataType, Adopting>::asUTF8String(mData, _str);
-  }
-
-  NS_IMETHOD GetAsAString(nsAString &_str)
-  {
-    return variant_text_traits<DataType, Adopting>::asString(mData, _str);
-  }
-
-  NS_IMETHOD GetAsArray(uint16_t *_type,
-                        nsIID *,
-                        uint32_t *_size,
-                        void **_data)
-  {
-    return variant_blob_traits<DataType, Adopting>::asArray(mData, _type, _size, _data);
-  }
-
-private:
-  typename variant_storage_traits<DataType, Adopting>::StorageType mData;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-//// Handy typedefs!  Use these for the right mapping.
-
-typedef Variant<int64_t> IntegerVariant;
-typedef Variant<double> FloatVariant;
-typedef Variant<nsString> TextVariant;
-typedef Variant<nsCString> UTF8TextVariant;
-typedef Variant<uint8_t[], false> BlobVariant;
-typedef Variant<uint8_t[], true> AdoptedBlobVariant;
-
-} // namespace storage
-} // namespace mozilla
-
-#include "Variant_inl.h"
-
-#endif // mozilla_storage_Variant_h__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/Variant_inl.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/Variant_inl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/Variant_inl.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/Variant_inl.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,229 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Note: This file is included by Variant.h.
- */
-
-#ifndef mozilla_storage_Variant_h__
-#error "Do not include this file directly!"
-#endif
-
-namespace mozilla {
-namespace storage {
-
-////////////////////////////////////////////////////////////////////////////////
-//// Variant_base
-
-inline NS_IMPL_ADDREF(Variant_base)
-inline NS_IMPL_RELEASE(Variant_base)
-inline NS_IMPL_QUERY_INTERFACE(
-  Variant_base,
-  nsIVariant
-)
-
-////////////////////////////////////////////////////////////////////////////////
-//// nsIVariant
-
-inline
-NS_IMETHODIMP
-Variant_base::GetDataType(uint16_t *_type)
-{
-  NS_ENSURE_ARG_POINTER(_type);
-  *_type = nsIDataType::VTYPE_VOID;
-  return NS_OK;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsInt32(int32_t *)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsInt64(int64_t *)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsDouble(double *)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsAUTF8String(nsACString &)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsAString(nsAString &)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsArray(uint16_t *,
-                         nsIID *,
-                         uint32_t *,
-                         void **)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsInt8(uint8_t *)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsInt16(int16_t *)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsUint8(uint8_t *)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsUint16(uint16_t *)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsUint32(uint32_t *)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsUint64(uint64_t *)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsFloat(float *)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsBool(bool *)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsChar(char *)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsWChar(char16_t *)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsID(nsID *)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsDOMString(nsAString &)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsString(char **)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsWString(char16_t **)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsISupports(nsISupports **)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsInterface(nsIID **,
-                             void **)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsACString(nsACString &)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsStringWithSize(uint32_t *,
-                                  char **)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsWStringWithSize(uint32_t *,
-                                   char16_t **)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-inline
-NS_IMETHODIMP
-Variant_base::GetAsJSVal(JS::MutableHandle<JS::Value>)
-{
-  return NS_ERROR_CANNOT_CONVERT_DATA;
-}
-
-} // namespace storage
-} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/src/variantToSQLiteT_impl.h firefox-trunk-41.0~a1~hg20150524r245419/storage/src/variantToSQLiteT_impl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/src/variantToSQLiteT_impl.h	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/src/variantToSQLiteT_impl.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,127 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-// Note: we are already in the namepace mozilla::storage
-
-// Note 2: whoever #includes this file must provide implementations of
-// sqlite3_T_* prior.
-
-////////////////////////////////////////////////////////////////////////////////
-//// variantToSQLiteT Implementation
-
-template <typename T>
-int
-variantToSQLiteT(T aObj,
-                 nsIVariant *aValue)
-{
-  // Allow to return nullptr not wrapped to nsIVariant for speed.
-  if (!aValue)
-    return sqlite3_T_null(aObj);
-
-  uint16_t type;
-  (void)aValue->GetDataType(&type);
-  switch (type) {
-    case nsIDataType::VTYPE_INT8:
-    case nsIDataType::VTYPE_INT16:
-    case nsIDataType::VTYPE_INT32:
-    case nsIDataType::VTYPE_UINT8:
-    case nsIDataType::VTYPE_UINT16:
-    {
-      int32_t value;
-      nsresult rv = aValue->GetAsInt32(&value);
-      NS_ENSURE_SUCCESS(rv, SQLITE_MISMATCH);
-      return sqlite3_T_int(aObj, value);
-    }
-    case nsIDataType::VTYPE_UINT32: // Try to preserve full range
-    case nsIDataType::VTYPE_INT64:
-    // Data loss possible, but there is no unsigned types in SQLite
-    case nsIDataType::VTYPE_UINT64:
-    {
-      int64_t value;
-      nsresult rv = aValue->GetAsInt64(&value);
-      NS_ENSURE_SUCCESS(rv, SQLITE_MISMATCH);
-      return sqlite3_T_int64(aObj, value);
-    }
-    case nsIDataType::VTYPE_FLOAT:
-    case nsIDataType::VTYPE_DOUBLE:
-    {
-      double value;
-      nsresult rv = aValue->GetAsDouble(&value);
-      NS_ENSURE_SUCCESS(rv, SQLITE_MISMATCH);
-      return sqlite3_T_double(aObj, value);
-    }
-    case nsIDataType::VTYPE_BOOL:
-    {
-      bool value;
-      nsresult rv = aValue->GetAsBool(&value);
-      NS_ENSURE_SUCCESS(rv, SQLITE_MISMATCH);
-      return sqlite3_T_int(aObj, value ? 1 : 0);
-    }
-    case nsIDataType::VTYPE_CHAR:
-    case nsIDataType::VTYPE_CHAR_STR:
-    case nsIDataType::VTYPE_STRING_SIZE_IS:
-    case nsIDataType::VTYPE_UTF8STRING:
-    case nsIDataType::VTYPE_CSTRING:
-    {
-      nsAutoCString value;
-      // GetAsAUTF8String should never perform conversion when coming from
-      // 8-bit string types, and thus can accept strings with arbitrary encoding
-      // (including UTF8 and ASCII).
-      nsresult rv = aValue->GetAsAUTF8String(value);
-      NS_ENSURE_SUCCESS(rv, SQLITE_MISMATCH);
-      return sqlite3_T_text(aObj, value);
-    }
-    case nsIDataType::VTYPE_WCHAR:
-    case nsIDataType::VTYPE_DOMSTRING:
-    case nsIDataType::VTYPE_WCHAR_STR:
-    case nsIDataType::VTYPE_WSTRING_SIZE_IS:
-    case nsIDataType::VTYPE_ASTRING:
-    {
-      nsAutoString value;
-      // GetAsAString does proper conversion to UCS2 from all string-like types.
-      // It can be used universally without problems (unless someone implements
-      // their own variant, but that's their problem).
-      nsresult rv = aValue->GetAsAString(value);
-      NS_ENSURE_SUCCESS(rv, SQLITE_MISMATCH);
-      return sqlite3_T_text16(aObj, value);
-    }
-    case nsIDataType::VTYPE_VOID:
-    case nsIDataType::VTYPE_EMPTY:
-    case nsIDataType::VTYPE_EMPTY_ARRAY:
-      return sqlite3_T_null(aObj);
-    case nsIDataType::VTYPE_ARRAY:
-    {
-      uint16_t type;
-      nsIID iid;
-      uint32_t count;
-      void *data;
-      nsresult rv = aValue->GetAsArray(&type, &iid, &count, &data);
-      NS_ENSURE_SUCCESS(rv, SQLITE_MISMATCH);
-
-      // Check to make sure it's a supported type.
-      NS_ASSERTION(type == nsIDataType::VTYPE_UINT8,
-                   "Invalid type passed!  You may leak!");
-      if (type != nsIDataType::VTYPE_UINT8) {
-        // Technically this could leak with certain data types, but somebody was
-        // being stupid passing us this anyway.
-        free(data);
-        return SQLITE_MISMATCH;
-      }
-
-      // Finally do our thing.  The function should free the array accordingly!
-      int rc = sqlite3_T_blob(aObj, data, count);
-      return rc;
-    }
-    // Maybe, it'll be possible to convert these
-    // in future too.
-    case nsIDataType::VTYPE_ID:
-    case nsIDataType::VTYPE_INTERFACE:
-    case nsIDataType::VTYPE_INTERFACE_IS:
-    default:
-      return SQLITE_MISMATCH;
-  }
-  return SQLITE_OK;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/StatementCache.h firefox-trunk-41.0~a1~hg20150524r245419/storage/StatementCache.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/StatementCache.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/StatementCache.h	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,148 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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_storage_StatementCache_h
+#define mozilla_storage_StatementCache_h
+
+#include "mozIStorageConnection.h"
+#include "mozIStorageStatement.h"
+#include "mozIStorageAsyncStatement.h"
+
+#include "nsAutoPtr.h"
+#include "nsHashKeys.h"
+#include "nsInterfaceHashtable.h"
+
+namespace mozilla {
+namespace storage {
+
+/**
+ * Class used to cache statements (mozIStorageStatement or
+ * mozIStorageAsyncStatement).
+ */
+template<typename StatementType>
+class StatementCache {
+public:
+  /**
+   * Constructor for the cache.
+   *
+   * @note a connection can have more than one cache.
+   *
+   * @param aConnection
+   *        A reference to the nsCOMPtr for the connection this cache is to be
+   *        used for.  This nsCOMPtr must at least live as long as this class,
+   *        otherwise crashes will happen.
+   */
+  explicit StatementCache(nsCOMPtr<mozIStorageConnection>& aConnection)
+  : mConnection(aConnection)
+  {
+  }
+
+  /**
+   * Obtains a cached statement.  If this statement is not yet created, it will
+   * be created and stored for later use.
+   *
+   * @param aQuery
+   *        The SQL string (either a const char [] or nsACString) to get a
+   *        cached query for.
+   * @return the cached statement, or null upon error.
+   */
+  inline
+  already_AddRefed<StatementType>
+  GetCachedStatement(const nsACString& aQuery)
+  {
+    nsCOMPtr<StatementType> stmt;
+    if (!mCachedStatements.Get(aQuery, getter_AddRefs(stmt))) {
+      stmt = CreateStatement(aQuery);
+      NS_ENSURE_TRUE(stmt, nullptr);
+
+      mCachedStatements.Put(aQuery, stmt);
+    }
+    return stmt.forget();
+  }
+
+  template<int N>
+  MOZ_ALWAYS_INLINE already_AddRefed<StatementType>
+  GetCachedStatement(const char (&aQuery)[N])
+  {
+    nsDependentCString query(aQuery, N - 1);
+    return GetCachedStatement(query);
+  }
+
+  /**
+   * Finalizes all cached statements so the database can be safely closed.  The
+   * behavior of this cache is unspecified after this method is called.
+   */
+  inline
+  void
+  FinalizeStatements()
+  {
+    (void)mCachedStatements.Enumerate(FinalizeCachedStatements, nullptr);
+
+    // Clear the cache at this time too!
+    (void)mCachedStatements.Clear();
+  }
+
+private:
+  inline
+  already_AddRefed<StatementType>
+  CreateStatement(const nsACString& aQuery);
+  static
+  PLDHashOperator
+  FinalizeCachedStatements(const nsACString& aKey,
+                           nsCOMPtr<StatementType>& aStatement,
+                           void*)
+  {
+    (void)aStatement->Finalize();
+    return PL_DHASH_NEXT;
+  }
+
+  nsInterfaceHashtable<nsCStringHashKey, StatementType> mCachedStatements;
+  nsCOMPtr<mozIStorageConnection>& mConnection;
+};
+
+template< >
+inline
+already_AddRefed<mozIStorageStatement>
+StatementCache<mozIStorageStatement>::CreateStatement(const nsACString& aQuery)
+{
+  NS_ENSURE_TRUE(mConnection, nullptr);
+
+  nsCOMPtr<mozIStorageStatement> stmt;
+  nsresult rv = mConnection->CreateStatement(aQuery, getter_AddRefs(stmt));
+  if (NS_FAILED(rv)) {
+    nsCString error;
+    error.AppendLiteral("The statement '");
+    error.Append(aQuery);
+    error.AppendLiteral("' failed to compile with the error message '");
+    nsCString msg;
+    (void)mConnection->GetLastErrorString(msg);
+    error.Append(msg);
+    error.AppendLiteral("'.");
+    NS_ERROR(error.get());
+  }
+  NS_ENSURE_SUCCESS(rv, nullptr);
+
+  return stmt.forget();
+}
+
+template< >
+inline
+already_AddRefed<mozIStorageAsyncStatement>
+StatementCache<mozIStorageAsyncStatement>::CreateStatement(const nsACString& aQuery)
+{
+  NS_ENSURE_TRUE(mConnection, nullptr);
+
+  nsCOMPtr<mozIStorageAsyncStatement> stmt;
+  nsresult rv = mConnection->CreateAsyncStatement(aQuery, getter_AddRefs(stmt));
+  NS_ENSURE_SUCCESS(rv, nullptr);
+
+  return stmt.forget();
+}
+
+} // namespace storage
+} // namespace mozilla
+
+#endif // mozilla_storage_StatementCache_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/StorageBaseStatementInternal.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/StorageBaseStatementInternal.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/StorageBaseStatementInternal.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/StorageBaseStatementInternal.cpp	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,224 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 sts=2 expandtab
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "StorageBaseStatementInternal.h"
+
+#include "nsProxyRelease.h"
+
+#include "mozStorageBindingParamsArray.h"
+#include "mozStorageStatementData.h"
+#include "mozStorageAsyncStatementExecution.h"
+
+namespace mozilla {
+namespace storage {
+
+////////////////////////////////////////////////////////////////////////////////
+//// Local Classes
+
+/**
+ * Used to finalize an asynchronous statement on the background thread.
+ */
+class AsyncStatementFinalizer : public nsRunnable
+{
+public:
+  /**
+   * Constructor for the event.
+   *
+   * @param aStatement
+   *        We need the AsyncStatement to be able to get at the sqlite3_stmt;
+   *        we only access/create it on the async thread.
+   * @param aConnection
+   *        We need the connection to know what thread to release the statement
+   *        on.  We release the statement on that thread since releasing the
+   *        statement might end up releasing the connection too.
+   */
+  AsyncStatementFinalizer(StorageBaseStatementInternal *aStatement,
+                          Connection *aConnection)
+  : mStatement(aStatement)
+  , mConnection(aConnection)
+  {
+  }
+
+  NS_IMETHOD Run()
+  {
+    if (mStatement->mAsyncStatement) {
+      (void)::sqlite3_finalize(mStatement->mAsyncStatement);
+      mStatement->mAsyncStatement = nullptr;
+    }
+    (void)::NS_ProxyRelease(mConnection->threadOpenedOn, mStatement);
+    return NS_OK;
+  }
+private:
+  nsRefPtr<StorageBaseStatementInternal> mStatement;
+  nsRefPtr<Connection> mConnection;
+};
+
+/**
+ * Finalize a sqlite3_stmt on the background thread for a statement whose
+ * destructor was invoked and the statement was non-null.
+ */
+class LastDitchSqliteStatementFinalizer : public nsRunnable
+{
+public:
+  /**
+   * Event constructor.
+   *
+   * @param aConnection
+   *        Used to keep the connection alive.  If we failed to do this, it
+   *        is possible that the statement going out of scope invoking us
+   *        might have the last reference to the connection and so trigger
+   *        an attempt to close the connection which is doomed to fail
+   *        (because the asynchronous execution thread must exist which will
+   *        trigger the failure case).
+   * @param aStatement
+   *        The sqlite3_stmt to finalize.  This object takes ownership /
+   *        responsibility for the instance and all other references to it
+   *        should be forgotten.
+   */
+  LastDitchSqliteStatementFinalizer(nsRefPtr<Connection> &aConnection,
+                                    sqlite3_stmt *aStatement)
+  : mConnection(aConnection)
+  , mAsyncStatement(aStatement)
+  {
+    NS_PRECONDITION(aConnection, "You must provide a Connection");
+  }
+
+  NS_IMETHOD Run()
+  {
+    (void)::sqlite3_finalize(mAsyncStatement);
+    mAsyncStatement = nullptr;
+
+    // Because of our ambiguous nsISupports we cannot use the NS_ProxyRelease
+    // template helpers.
+    Connection *rawConnection = nullptr;
+    mConnection.swap(rawConnection);
+    (void)::NS_ProxyRelease(
+      rawConnection->threadOpenedOn,
+      NS_ISUPPORTS_CAST(mozIStorageConnection *, rawConnection));
+    return NS_OK;
+  }
+private:
+  nsRefPtr<Connection> mConnection;
+  sqlite3_stmt *mAsyncStatement;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+//// StorageBaseStatementInternal
+
+StorageBaseStatementInternal::StorageBaseStatementInternal()
+: mAsyncStatement(nullptr)
+{
+}
+
+void
+StorageBaseStatementInternal::asyncFinalize()
+{
+  nsIEventTarget *target = mDBConnection->getAsyncExecutionTarget();
+  if (target) {
+    // Attempt to finalize asynchronously
+    nsCOMPtr<nsIRunnable> event =
+      new AsyncStatementFinalizer(this, mDBConnection);
+
+    // Dispatch. Note that dispatching can fail, typically if
+    // we have a race condition with asyncClose(). It's ok,
+    // let asyncClose() win.
+    (void)target->Dispatch(event, NS_DISPATCH_NORMAL);
+  }
+  // If we cannot get the background thread,
+  // mozStorageConnection::AsyncClose() has already been called and
+  // the statement either has been or will be cleaned up by
+  // internalClose().
+}
+
+void
+StorageBaseStatementInternal::destructorAsyncFinalize()
+{
+  if (!mAsyncStatement)
+    return;
+
+  // If we reach this point, our owner has not finalized this
+  // statement, yet we are being destructed. If possible, we want to
+  // auto-finalize it early, to release the resources early.
+  nsIEventTarget *target = mDBConnection->getAsyncExecutionTarget();
+  if (target) {
+    // If we can get the async execution target, we can indeed finalize
+    // the statement, as the connection is still open.
+    bool isAsyncThread = false;
+    (void)target->IsOnCurrentThread(&isAsyncThread);
+
+    nsCOMPtr<nsIRunnable> event =
+      new LastDitchSqliteStatementFinalizer(mDBConnection, mAsyncStatement);
+    if (isAsyncThread) {
+      (void)event->Run();
+    } else {
+      (void)target->Dispatch(event, NS_DISPATCH_NORMAL);
+    }
+  }
+
+  // We might not be able to dispatch to the background thread,
+  // presumably because it is being shutdown. Since said shutdown will
+  // finalize the statement, we just need to clean-up around here.
+  mAsyncStatement = nullptr;
+}
+
+NS_IMETHODIMP
+StorageBaseStatementInternal::NewBindingParamsArray(
+  mozIStorageBindingParamsArray **_array
+)
+{
+  nsCOMPtr<mozIStorageBindingParamsArray> array = new BindingParamsArray(this);
+  NS_ENSURE_TRUE(array, NS_ERROR_OUT_OF_MEMORY);
+
+  array.forget(_array);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+StorageBaseStatementInternal::ExecuteAsync(
+  mozIStorageStatementCallback *aCallback,
+  mozIStoragePendingStatement **_stmt
+)
+{
+  // We used to call Connection::ExecuteAsync but it takes a
+  // mozIStorageBaseStatement signature because it is also a public API.  Since
+  // our 'this' has no static concept of mozIStorageBaseStatement and Connection
+  // would just QI it back across to a StorageBaseStatementInternal and the
+  // actual logic is very simple, we now roll our own.
+  nsTArray<StatementData> stmts(1);
+  StatementData data;
+  nsresult rv = getAsynchronousStatementData(data);
+  NS_ENSURE_SUCCESS(rv, rv);
+  NS_ENSURE_TRUE(stmts.AppendElement(data), NS_ERROR_OUT_OF_MEMORY);
+
+  // Dispatch to the background
+  return AsyncExecuteStatements::execute(stmts, mDBConnection,
+                                         mNativeConnection, aCallback, _stmt);
+}
+
+NS_IMETHODIMP
+StorageBaseStatementInternal::EscapeStringForLIKE(
+  const nsAString &aValue,
+  const char16_t aEscapeChar,
+  nsAString &_escapedString
+)
+{
+  const char16_t MATCH_ALL('%');
+  const char16_t MATCH_ONE('_');
+
+  _escapedString.Truncate(0);
+
+  for (uint32_t i = 0; i < aValue.Length(); i++) {
+    if (aValue[i] == aEscapeChar || aValue[i] == MATCH_ALL ||
+        aValue[i] == MATCH_ONE) {
+      _escapedString += aEscapeChar;
+    }
+    _escapedString += aValue[i];
+  }
+  return NS_OK;
+}
+
+} // namespace storage
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/StorageBaseStatementInternal.h firefox-trunk-41.0~a1~hg20150524r245419/storage/StorageBaseStatementInternal.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/StorageBaseStatementInternal.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/StorageBaseStatementInternal.h	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,353 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 sts=2 expandtab
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_storage_StorageBaseStatementInternal_h_
+#define mozilla_storage_StorageBaseStatementInternal_h_
+
+#include "nsISupports.h"
+#include "nsCOMPtr.h"
+#include "nsAutoPtr.h"
+
+struct sqlite3;
+struct sqlite3_stmt;
+class mozIStorageBindingParamsArray;
+class mozIStorageBindingParams;
+class mozIStorageStatementCallback;
+class mozIStoragePendingStatement;
+
+namespace mozilla {
+namespace storage {
+
+#define STORAGEBASESTATEMENTINTERNAL_IID \
+  {0xd18856c9, 0xbf07, 0x4ae2, {0x94, 0x5b, 0x1a, 0xdd, 0x49, 0x19, 0x55, 0x2a}}
+
+class Connection;
+class StatementData;
+
+class AsyncStatementFinalizer;
+
+/**
+ * Implementation-only interface and shared logix mix-in corresponding to
+ * mozIStorageBaseStatement.  Both Statement and AsyncStatement inherit from
+ * this. The interface aspect makes them look the same to implementation innards
+ * that aren't publicly accessible.  The mix-in avoids code duplication in
+ * common implementations of mozIStorageBaseStatement, albeit with some minor
+ * performance/space overhead because we have to use defines to officially
+ * implement the methods on Statement/AsyncStatement (and proxy to this base
+ * class.)
+ */
+class StorageBaseStatementInternal : public nsISupports
+{
+public:
+  NS_DECLARE_STATIC_IID_ACCESSOR(STORAGEBASESTATEMENTINTERNAL_IID)
+
+  /**
+   * @return the connection that this statement belongs to.
+   */
+  Connection *getOwner()
+  {
+    return mDBConnection;
+  }
+
+  /**
+   * Return the asynchronous statement, creating it if required.
+   *
+   * This is for use by the asynchronous execution code for StatementData
+   * created by AsyncStatements.  Statement internally uses this method to
+   * prepopulate StatementData with the sqlite3_stmt.
+   *
+   * @param[out] stmt
+   *             The sqlite3_stmt for asynchronous use.
+   * @return The SQLite result code for creating the statement if created,
+   *         SQLITE_OK if creation was not required.
+   */
+  virtual int getAsyncStatement(sqlite3_stmt **_stmt) = 0;
+
+  /**
+   * Obtains the StatementData needed for asynchronous execution.
+   *
+   * This is for use by Connection to retrieve StatementData from statements
+   * when executeAsync is invoked.
+   *
+   * @param[out] _data
+   *             A reference to a StatementData object that will be populated
+   *             upon successful execution of this method.
+   * @return NS_OK if we were able to assemble the data, failure otherwise.
+   */
+  virtual nsresult getAsynchronousStatementData(StatementData &_data) = 0;
+
+  /**
+   * Construct a new BindingParams to be owned by the provided binding params
+   * array.  This method exists so that BindingParamsArray does not need
+   * factory logic to determine what type of BindingParams to instantiate.
+   *
+   * @param aOwner
+   *        The binding params array to own the newly created binding params.
+   * @return The new mozIStorageBindingParams instance appropriate to the
+   *         underlying statement type.
+   */
+  virtual already_AddRefed<mozIStorageBindingParams> newBindingParams(
+    mozIStorageBindingParamsArray *aOwner
+  ) = 0;
+
+protected: // mix-in bits are protected
+  StorageBaseStatementInternal();
+
+  nsRefPtr<Connection> mDBConnection;
+  sqlite3 *mNativeConnection;
+
+  /**
+   * Our asynchronous statement.
+   *
+   * For Statement this is populated by the first invocation to
+   * getAsyncStatement.
+   *
+   * For AsyncStatement, this is null at creation time and initialized by the
+   * async thread when it calls getAsyncStatement the first time the statement
+   * is executed.  (Or in the event of badly formed SQL, every time.)
+   */
+  sqlite3_stmt *mAsyncStatement;
+
+  /**
+   * Initiate asynchronous finalization by dispatching an event to the
+   * asynchronous thread to finalize mAsyncStatement.  This acquires a reference
+   * to this statement and proxies it back to the connection's owning thread
+   * for release purposes.
+   *
+   * In the event the asynchronous thread is already gone or we otherwise fail
+   * to dispatch an event to it we failover to invoking internalAsyncFinalize
+   * directly.  (That's what the asynchronous finalizer would have called.)
+   *
+   * @note You must not call this method from your destructor because its
+   *       operation assumes we are still alive.  Call internalAsyncFinalize
+   *       directly in that case.
+   */
+  void asyncFinalize();
+
+  /**
+   * Cleanup the async sqlite3_stmt stored in mAsyncStatement if it exists by
+   * attempting to dispatch to the asynchronous thread if available, finalizing
+   * on this thread if it is not.
+   *
+   * @note Call this from your destructor, call asyncFinalize otherwise.
+   */
+  void destructorAsyncFinalize();
+
+  NS_IMETHOD NewBindingParamsArray(mozIStorageBindingParamsArray **_array);
+  NS_IMETHOD ExecuteAsync(mozIStorageStatementCallback *aCallback,
+                          mozIStoragePendingStatement **_stmt);
+  NS_IMETHOD EscapeStringForLIKE(const nsAString &aValue,
+                                 char16_t aEscapeChar,
+                                 nsAString &_escapedString);
+
+  // Needs access to internalAsyncFinalize
+  friend class AsyncStatementFinalizer;
+};
+
+NS_DEFINE_STATIC_IID_ACCESSOR(StorageBaseStatementInternal,
+                              STORAGEBASESTATEMENTINTERNAL_IID)
+
+#define NS_DECL_STORAGEBASESTATEMENTINTERNAL \
+  virtual Connection *getOwner(); \
+  virtual int getAsyncStatement(sqlite3_stmt **_stmt) override; \
+  virtual nsresult getAsynchronousStatementData(StatementData &_data) override; \
+  virtual already_AddRefed<mozIStorageBindingParams> newBindingParams( \
+    mozIStorageBindingParamsArray *aOwner) override;
+
+/**
+ * Helper macro to implement the proxying implementations.  Because we are
+ * implementing methods that are part of mozIStorageBaseStatement and the
+ * implementation classes already use NS_DECL_MOZISTORAGEBASESTATEMENT we don't
+ * need to provide declaration support.
+ */
+#define MIX_IMPL(_class, _optionalGuard, _method, _declArgs, _invokeArgs) \
+  NS_IMETHODIMP _class::_method _declArgs                                 \
+  {                                                                       \
+    _optionalGuard                                                        \
+    return StorageBaseStatementInternal::_method _invokeArgs;             \
+  }
+
+
+/**
+ * Define proxying implementation for the given _class.  If a state invariant
+ * needs to be checked and an early return possibly performed, pass the clause
+ * to use as _optionalGuard.
+ */
+#define MIXIN_IMPL_STORAGEBASESTATEMENTINTERNAL(_class, _optionalGuard) \
+  MIX_IMPL(_class, _optionalGuard,                                      \
+           NewBindingParamsArray,                                       \
+           (mozIStorageBindingParamsArray **_array),                    \
+           (_array))                                                    \
+  MIX_IMPL(_class, _optionalGuard,                                      \
+           ExecuteAsync,                                                \
+           (mozIStorageStatementCallback *aCallback,                    \
+            mozIStoragePendingStatement **_stmt),                       \
+           (aCallback, _stmt))                                          \
+  MIX_IMPL(_class, _optionalGuard,                                      \
+           EscapeStringForLIKE,                                         \
+           (const nsAString &aValue, char16_t aEscapeChar,              \
+            nsAString &_escapedString),                                 \
+           (aValue, aEscapeChar, _escapedString))
+
+/**
+ * Name-building helper for BIND_GEN_IMPL.
+ */
+#define BIND_NAME_CONCAT(_nameBit, _concatBit) \
+  Bind##_nameBit##_concatBit
+
+/**
+ * We have type-specific convenience methods for C++ implementations in
+ * 3 different forms; 2 by index, 1 by name.  The following macro allows
+ * us to avoid having to define repetitive things by hand.
+ *
+ * Because of limitations of macros and our desire to avoid requiring special
+ * permutations for the null and blob cases (whose argument count varies),
+ * we require that the argument declarations and corresponding invocation
+ * usages are passed in.
+ *
+ * @param _class
+ *        The class name.
+ * @param _guard
+ *        The guard clause to inject.
+ * @param _declName
+ *        The argument list (with parens) for the ByName variants.
+ * @param _declIndex
+ *        The argument list (with parens) for the index variants.
+ * @param _invArgs
+ *        The invocation argumment list.
+ */
+#define BIND_GEN_IMPL(_class, _guard, _name, _declName, _declIndex, _invArgs) \
+  NS_IMETHODIMP _class::BIND_NAME_CONCAT(_name, ByName) _declName             \
+  {                                                                           \
+    _guard                                                                    \
+    mozIStorageBindingParams *params = getParams();                           \
+    NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);                           \
+    return params->BIND_NAME_CONCAT(_name, ByName) _invArgs;                  \
+  }                                                                           \
+  NS_IMETHODIMP _class::BIND_NAME_CONCAT(_name, ByIndex) _declIndex           \
+  {                                                                           \
+    _guard                                                                    \
+    mozIStorageBindingParams *params = getParams();                           \
+    NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);                           \
+    return params->BIND_NAME_CONCAT(_name, ByIndex) _invArgs;                 \
+  }                                                                           \
+  NS_IMETHODIMP _class::BIND_NAME_CONCAT(_name, Parameter) _declIndex         \
+  {                                                                           \
+    _guard                                                                    \
+    mozIStorageBindingParams *params = getParams();                           \
+    NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);                           \
+    return params->BIND_NAME_CONCAT(_name, ByIndex) _invArgs;                 \
+  }
+
+/**
+ * Implement BindByName/BindByIndex for the given class.
+ *
+ * @param _class The class name.
+ * @param _optionalGuard The guard clause to inject.
+ */
+#define BIND_BASE_IMPLS(_class, _optionalGuard)             \
+  NS_IMETHODIMP _class::BindByName(const nsACString &aName, \
+                                   nsIVariant *aValue)      \
+  {                                                         \
+    _optionalGuard                                          \
+    mozIStorageBindingParams *params = getParams();         \
+    NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);         \
+    return params->BindByName(aName, aValue);               \
+  }                                                         \
+  NS_IMETHODIMP _class::BindByIndex(uint32_t aIndex,        \
+                                    nsIVariant *aValue)     \
+  {                                                         \
+    _optionalGuard                                          \
+    mozIStorageBindingParams *params = getParams();         \
+    NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);         \
+    return params->BindByIndex(aIndex, aValue);             \
+  }
+
+/**
+ * Define the various Bind*Parameter, Bind*ByIndex, Bind*ByName stubs that just
+ * end up proxying to the params object.
+ */
+#define BOILERPLATE_BIND_PROXIES(_class, _optionalGuard) \
+  BIND_BASE_IMPLS(_class, _optionalGuard)                \
+  BIND_GEN_IMPL(_class, _optionalGuard,                  \
+                UTF8String,                              \
+                (const nsACString &aWhere,               \
+                 const nsACString &aValue),              \
+                (uint32_t aWhere,                        \
+                 const nsACString &aValue),              \
+                (aWhere, aValue))                        \
+  BIND_GEN_IMPL(_class, _optionalGuard,                  \
+                String,                                  \
+                (const nsACString &aWhere,               \
+                 const nsAString  &aValue),              \
+                (uint32_t aWhere,                        \
+                 const nsAString  &aValue),              \
+                (aWhere, aValue))                        \
+  BIND_GEN_IMPL(_class, _optionalGuard,                  \
+                Double,                                  \
+                (const nsACString &aWhere,               \
+                 double aValue),                         \
+                (uint32_t aWhere,                        \
+                 double aValue),                         \
+                (aWhere, aValue))                        \
+  BIND_GEN_IMPL(_class, _optionalGuard,                  \
+                Int32,                                   \
+                (const nsACString &aWhere,               \
+                 int32_t aValue),                        \
+                (uint32_t aWhere,                        \
+                 int32_t aValue),                        \
+                (aWhere, aValue))                        \
+  BIND_GEN_IMPL(_class, _optionalGuard,                  \
+                Int64,                                   \
+                (const nsACString &aWhere,               \
+                 int64_t aValue),                        \
+                (uint32_t aWhere,                        \
+                 int64_t aValue),                        \
+                (aWhere, aValue))                        \
+  BIND_GEN_IMPL(_class, _optionalGuard,                  \
+                Null,                                    \
+                (const nsACString &aWhere),              \
+                (uint32_t aWhere),                       \
+                (aWhere))                                \
+  BIND_GEN_IMPL(_class, _optionalGuard,                  \
+                Blob,                                    \
+                (const nsACString &aWhere,               \
+                 const uint8_t *aValue,                  \
+                 uint32_t aValueSize),                   \
+                (uint32_t aWhere,                        \
+                 const uint8_t *aValue,                  \
+                 uint32_t aValueSize),                   \
+                (aWhere, aValue, aValueSize))            \
+  BIND_GEN_IMPL(_class, _optionalGuard,                  \
+                StringAsBlob,                            \
+                (const nsACString &aWhere,               \
+                 const nsAString& aValue),               \
+                (uint32_t aWhere,                        \
+                 const nsAString& aValue),               \
+                (aWhere, aValue))                        \
+  BIND_GEN_IMPL(_class, _optionalGuard,                  \
+                UTF8StringAsBlob,                        \
+                (const nsACString &aWhere,               \
+                 const nsACString& aValue),              \
+                (uint32_t aWhere,                        \
+                 const nsACString& aValue),              \
+                (aWhere, aValue))                        \
+  BIND_GEN_IMPL(_class, _optionalGuard,                  \
+                AdoptedBlob,                             \
+                (const nsACString &aWhere,               \
+                 uint8_t *aValue,                        \
+                 uint32_t aValueSize),                   \
+                (uint32_t aWhere,                        \
+                 uint8_t *aValue,                        \
+                 uint32_t aValueSize),                   \
+                (aWhere, aValue, aValueSize))
+
+  
+
+} // storage
+} // mozilla
+
+#endif // mozilla_storage_StorageBaseStatementInternal_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/storage.h firefox-trunk-41.0~a1~hg20150524r245419/storage/storage.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/storage.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/storage.h	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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_storage_h_
+#define mozilla_storage_h_
+
+////////////////////////////////////////////////////////////////////////////////
+//// Public Interfaces
+
+#include "mozStorageCID.h"
+#include "mozIStorageAggregateFunction.h"
+#include "mozIStorageConnection.h"
+#include "mozIStorageError.h"
+#include "mozIStorageFunction.h"
+#include "mozIStoragePendingStatement.h"
+#include "mozIStorageProgressHandler.h"
+#include "mozIStorageResultSet.h"
+#include "mozIStorageRow.h"
+#include "mozIStorageService.h"
+#include "mozIStorageStatement.h"
+#include "mozIStorageStatementCallback.h"
+#include "mozIStorageBindingParamsArray.h"
+#include "mozIStorageBindingParams.h"
+#include "mozIStorageVacuumParticipant.h"
+#include "mozIStorageCompletionCallback.h"
+#include "mozIStorageAsyncStatement.h"
+#include "mozIStorageAsyncConnection.h"
+
+////////////////////////////////////////////////////////////////////////////////
+//// Native Language Helpers
+
+#include "mozStorageHelper.h"
+#include "mozilla/storage/StatementCache.h"
+#include "mozilla/storage/Variant.h"
+
+#endif // mozilla_storage_h_
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/TelemetryVFS.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/TelemetryVFS.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/TelemetryVFS.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/TelemetryVFS.cpp	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,892 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 <string.h>
+#include "mozilla/Telemetry.h"
+#include "mozilla/Preferences.h"
+#include "sqlite3.h"
+#include "nsThreadUtils.h"
+#include "mozilla/dom/quota/PersistenceType.h"
+#include "mozilla/dom/quota/QuotaManager.h"
+#include "mozilla/dom/quota/QuotaObject.h"
+#include "mozilla/IOInterposer.h"
+
+// The last VFS version for which this file has been updated.
+#define LAST_KNOWN_VFS_VERSION 3
+
+// The last io_methods version for which this file has been updated.
+#define LAST_KNOWN_IOMETHODS_VERSION 3
+
+/**
+ * This preference is a workaround to allow users/sysadmins to identify
+ * that the profile exists on an NFS share whose implementation
+ * is incompatible with SQLite's default locking implementation.
+ * Bug 433129 attempted to automatically identify such file-systems, 
+ * but a reliable way was not found and it was determined that the fallback 
+ * locking is slower than POSIX locking, so we do not want to do it by default.
+*/
+#define PREF_NFS_FILESYSTEM   "storage.nfs_filesystem"
+
+namespace {
+
+using namespace mozilla;
+using namespace mozilla::dom::quota;
+
+struct Histograms {
+  const char *name;
+  const Telemetry::ID readB;
+  const Telemetry::ID writeB;
+  const Telemetry::ID readMS;
+  const Telemetry::ID writeMS;
+  const Telemetry::ID syncMS;
+};
+
+#define SQLITE_TELEMETRY(FILENAME, HGRAM) \
+  { FILENAME, \
+    Telemetry::MOZ_SQLITE_ ## HGRAM ## _READ_B, \
+    Telemetry::MOZ_SQLITE_ ## HGRAM ## _WRITE_B, \
+    Telemetry::MOZ_SQLITE_ ## HGRAM ## _READ_MS, \
+    Telemetry::MOZ_SQLITE_ ## HGRAM ## _WRITE_MS, \
+    Telemetry::MOZ_SQLITE_ ## HGRAM ## _SYNC_MS \
+  }
+
+Histograms gHistograms[] = {
+  SQLITE_TELEMETRY("places.sqlite", PLACES),
+  SQLITE_TELEMETRY("cookies.sqlite", COOKIES),
+  SQLITE_TELEMETRY("webappsstore.sqlite", WEBAPPS),
+  SQLITE_TELEMETRY(nullptr, OTHER)
+};
+#undef SQLITE_TELEMETRY
+
+/** RAII class for measuring how long io takes on/off main thread
+ */
+class IOThreadAutoTimer {
+public:
+  /** 
+   * IOThreadAutoTimer measures time spent in IO. Additionally it
+   * automatically determines whether IO is happening on the main
+   * thread and picks an appropriate histogram.
+   *
+   * @param id takes a telemetry histogram id. The id+1 must be an
+   * equivalent histogram for the main thread. Eg, MOZ_SQLITE_OPEN_MS 
+   * is followed by MOZ_SQLITE_OPEN_MAIN_THREAD_MS.
+   *
+   * @param aOp optionally takes an IO operation to report through the
+   * IOInterposer. Filename will be reported as NULL, and reference will be
+   * either "sqlite-mainthread" or "sqlite-otherthread".
+   */
+  explicit IOThreadAutoTimer(Telemetry::ID id,
+    IOInterposeObserver::Operation aOp = IOInterposeObserver::OpNone)
+    : start(TimeStamp::Now()),
+      id(id),
+      op(aOp)
+  {
+  }
+
+  /**
+   * This constructor is for when we want to report an operation to
+   * IOInterposer but do not require a telemetry probe.
+   *
+   * @param aOp IO Operation to report through the IOInterposer.
+   */
+  explicit IOThreadAutoTimer(IOInterposeObserver::Operation aOp)
+    : start(TimeStamp::Now()),
+      id(Telemetry::HistogramCount),
+      op(aOp)
+  {
+  }
+
+  ~IOThreadAutoTimer()
+  {
+    TimeStamp end(TimeStamp::Now());
+    uint32_t mainThread = NS_IsMainThread() ? 1 : 0;
+    if (id != Telemetry::HistogramCount) {
+      Telemetry::AccumulateTimeDelta(static_cast<Telemetry::ID>(id + mainThread),
+                                     start, end);
+    }
+    // We don't report SQLite I/O on Windows because we have a comprehensive
+    // mechanism for intercepting I/O on that platform that captures a superset
+    // of the data captured here.
+#if defined(MOZ_ENABLE_PROFILER_SPS) && !defined(XP_WIN)
+    if (IOInterposer::IsObservedOperation(op)) {
+      const char* main_ref  = "sqlite-mainthread";
+      const char* other_ref = "sqlite-otherthread";
+
+      // Create observation
+      IOInterposeObserver::Observation ob(op, start, end,
+                                          (mainThread ? main_ref : other_ref));
+      // Report observation
+      IOInterposer::Report(ob);
+    }
+#endif /* defined(MOZ_ENABLE_PROFILER_SPS) && !defined(XP_WIN) */
+  }
+
+private:
+  const TimeStamp start;
+  const Telemetry::ID id;
+  IOInterposeObserver::Operation op;
+};
+
+struct telemetry_file {
+  // Base class.  Must be first
+  sqlite3_file base;
+
+  // histograms pertaining to this file
+  Histograms *histograms;
+
+  // quota object for this file
+  nsRefPtr<QuotaObject> quotaObject;
+
+  // The chunk size for this file. See the documentation for
+  // sqlite3_file_control() and FCNTL_CHUNK_SIZE.
+  int fileChunkSize;
+
+  // This contains the vfs that actually does work
+  sqlite3_file pReal[1];
+};
+
+const char*
+DatabasePathFromWALPath(const char *zWALName)
+{
+  /**
+   * Do some sketchy pointer arithmetic to find the parameter key. The WAL
+   * filename is in the middle of a big allocated block that contains:
+   *
+   *   - Random Values
+   *   - Main Database Path
+   *   - \0
+   *   - Multiple URI components consisting of:
+   *     - Key
+   *     - \0
+   *     - Value
+   *     - \0
+   *   - \0
+   *   - Journal Path
+   *   - \0
+   *   - WAL Path (zWALName)
+   *   - \0
+   *
+   * Because the main database path is preceded by a random value we have to be
+   * careful when trying to figure out when we should terminate this loop.
+   */
+  MOZ_ASSERT(zWALName);
+
+  nsDependentCSubstring dbPath(zWALName, strlen(zWALName));
+
+  // Chop off the "-wal" suffix.
+  NS_NAMED_LITERAL_CSTRING(kWALSuffix, "-wal");
+  MOZ_ASSERT(StringEndsWith(dbPath, kWALSuffix));
+
+  dbPath.Rebind(zWALName, dbPath.Length() - kWALSuffix.Length());
+  MOZ_ASSERT(!dbPath.IsEmpty());
+
+  // We want to scan to the end of the key/value URI pairs. Skip the preceding
+  // null and go to the last char of the journal path.
+  const char* cursor = zWALName - 2;
+
+  // Make sure we just skipped a null.
+  MOZ_ASSERT(!*(cursor + 1));
+
+  // Walk backwards over the journal path.
+  while (*cursor) {
+    cursor--;
+  }
+
+  // There should be another null here.
+  cursor--;
+  MOZ_ASSERT(!*cursor);
+
+  // Back up one more char to the last char of the previous string. It may be
+  // the database path or it may be a key/value URI pair.
+  cursor--;
+
+#ifdef DEBUG
+  {
+    // Verify that we just walked over the journal path. Account for the two
+    // nulls we just skipped.
+    const char *journalStart = cursor + 3;
+
+    nsDependentCSubstring journalPath(journalStart,
+                                      strlen(journalStart));
+
+    // Chop off the "-journal" suffix.
+    NS_NAMED_LITERAL_CSTRING(kJournalSuffix, "-journal");
+    MOZ_ASSERT(StringEndsWith(journalPath, kJournalSuffix));
+
+    journalPath.Rebind(journalStart,
+                        journalPath.Length() - kJournalSuffix.Length());
+    MOZ_ASSERT(!journalPath.IsEmpty());
+
+    // Make sure that the database name is a substring of the journal name.
+    MOZ_ASSERT(journalPath == dbPath);
+  }
+#endif
+
+  // Now we're either at the end of the key/value URI pairs or we're at the
+  // end of the database path. Carefully walk backwards one character at a
+  // time to do this safely without running past the beginning of the database
+  // path.
+  const char *const dbPathStart = dbPath.BeginReading();
+  const char *dbPathCursor = dbPath.EndReading() - 1;
+  bool isDBPath = true;
+
+  while (true) {
+    MOZ_ASSERT(*dbPathCursor, "dbPathCursor should never see a null char!");
+
+    if (isDBPath) {
+      isDBPath = dbPathStart <= dbPathCursor &&
+                 *dbPathCursor == *cursor &&
+                 *cursor;
+    }
+
+    if (!isDBPath) {
+      // This isn't the database path so it must be a value. Scan past it and
+      // the key also.
+      for (size_t stringCount = 0; stringCount < 2; stringCount++) {
+        // Scan past the string to the preceding null character.
+        while (*cursor) {
+          cursor--;
+        }
+
+        // Back up one more char to the last char of preceding string.
+        cursor--;
+      }
+
+      // Reset and start again.
+      dbPathCursor = dbPath.EndReading() - 1;
+      isDBPath = true;
+
+      continue;
+    }
+
+    MOZ_ASSERT(isDBPath);
+    MOZ_ASSERT(*cursor);
+
+    if (dbPathStart == dbPathCursor) {
+      // Found the full database path, we're all done.
+      MOZ_ASSERT(nsDependentCString(cursor) == dbPath);
+      return cursor;
+    }
+
+    // Change the cursors and go through the loop again.
+    cursor--;
+    dbPathCursor--;
+  }
+
+  MOZ_CRASH("Should never get here!");
+}
+
+already_AddRefed<QuotaObject>
+GetQuotaObjectFromNameAndParameters(const char *zName,
+                                    const char *zURIParameterKey)
+{
+  MOZ_ASSERT(zName);
+  MOZ_ASSERT(zURIParameterKey);
+
+  const char *persistenceType =
+    sqlite3_uri_parameter(zURIParameterKey, "persistenceType");
+  if (!persistenceType) {
+    return nullptr;
+  }
+
+  const char *group = sqlite3_uri_parameter(zURIParameterKey, "group");
+  if (!group) {
+    NS_WARNING("SQLite URI had 'persistenceType' but not 'group'?!");
+    return nullptr;
+  }
+
+  const char *origin = sqlite3_uri_parameter(zURIParameterKey, "origin");
+  if (!origin) {
+    NS_WARNING("SQLite URI had 'persistenceType' and 'group' but not "
+               "'origin'?!");
+    return nullptr;
+  }
+
+  QuotaManager *quotaManager = QuotaManager::Get();
+  MOZ_ASSERT(quotaManager);
+
+  return quotaManager->GetQuotaObject(
+    PersistenceTypeFromText(nsDependentCString(persistenceType)),
+    nsDependentCString(group),
+    nsDependentCString(origin),
+    NS_ConvertUTF8toUTF16(zName));
+}
+
+void
+MaybeEstablishQuotaControl(const char *zName,
+                           telemetry_file *pFile,
+                           int flags)
+{
+  MOZ_ASSERT(pFile);
+  MOZ_ASSERT(!pFile->quotaObject);
+
+  if (!(flags & (SQLITE_OPEN_URI | SQLITE_OPEN_WAL))) {
+    return;
+  }
+
+  MOZ_ASSERT(zName);
+
+  const char *zURIParameterKey = (flags & SQLITE_OPEN_WAL) ?
+                                 DatabasePathFromWALPath(zName) :
+                                 zName;
+
+  MOZ_ASSERT(zURIParameterKey);
+
+  pFile->quotaObject =
+    GetQuotaObjectFromNameAndParameters(zName, zURIParameterKey);
+}
+
+/*
+** Close a telemetry_file.
+*/
+int
+xClose(sqlite3_file *pFile)
+{
+  telemetry_file *p = (telemetry_file *)pFile;
+  int rc;
+  { // Scope for IOThreadAutoTimer
+    IOThreadAutoTimer ioTimer(IOInterposeObserver::OpClose);
+    rc = p->pReal->pMethods->xClose(p->pReal);
+  }
+  if( rc==SQLITE_OK ){
+    delete p->base.pMethods;
+    p->base.pMethods = nullptr;
+    p->quotaObject = nullptr;
+#ifdef DEBUG
+    p->fileChunkSize = 0;
+#endif
+  }
+  return rc;
+}
+
+/*
+** Read data from a telemetry_file.
+*/
+int
+xRead(sqlite3_file *pFile, void *zBuf, int iAmt, sqlite_int64 iOfst)
+{
+  telemetry_file *p = (telemetry_file *)pFile;
+  IOThreadAutoTimer ioTimer(p->histograms->readMS, IOInterposeObserver::OpRead);
+  int rc;
+  rc = p->pReal->pMethods->xRead(p->pReal, zBuf, iAmt, iOfst);
+  // sqlite likes to read from empty files, this is normal, ignore it.
+  if (rc != SQLITE_IOERR_SHORT_READ)
+    Telemetry::Accumulate(p->histograms->readB, rc == SQLITE_OK ? iAmt : 0);
+  return rc;
+}
+
+/*
+** Return the current file-size of a telemetry_file.
+*/
+int
+xFileSize(sqlite3_file *pFile, sqlite_int64 *pSize)
+{
+  IOThreadAutoTimer ioTimer(IOInterposeObserver::OpStat);
+  telemetry_file *p = (telemetry_file *)pFile;
+  int rc;
+  rc = p->pReal->pMethods->xFileSize(p->pReal, pSize);
+  return rc;
+}
+
+/*
+** Write data to a telemetry_file.
+*/
+int
+xWrite(sqlite3_file *pFile, const void *zBuf, int iAmt, sqlite_int64 iOfst)
+{
+  telemetry_file *p = (telemetry_file *)pFile;
+  IOThreadAutoTimer ioTimer(p->histograms->writeMS, IOInterposeObserver::OpWrite);
+  int rc;
+  if (p->quotaObject) {
+    MOZ_ASSERT(INT64_MAX - iOfst >= iAmt);
+    if (!p->quotaObject->MaybeUpdateSize(iOfst + iAmt, /* aTruncate */ false)) {
+      return SQLITE_FULL;
+    }
+  }
+  rc = p->pReal->pMethods->xWrite(p->pReal, zBuf, iAmt, iOfst);
+  Telemetry::Accumulate(p->histograms->writeB, rc == SQLITE_OK ? iAmt : 0);
+  if (p->quotaObject && rc != SQLITE_OK) {
+    NS_WARNING("xWrite failed on a quota-controlled file, attempting to "
+               "update its current size...");
+    sqlite_int64 currentSize;
+    if (xFileSize(pFile, &currentSize) == SQLITE_OK) {
+      p->quotaObject->MaybeUpdateSize(currentSize, /* aTruncate */ true);
+    }
+  }
+  return rc;
+}
+
+/*
+** Truncate a telemetry_file.
+*/
+int
+xTruncate(sqlite3_file *pFile, sqlite_int64 size)
+{
+  IOThreadAutoTimer ioTimer(Telemetry::MOZ_SQLITE_TRUNCATE_MS);
+  telemetry_file *p = (telemetry_file *)pFile;
+  int rc;
+  Telemetry::AutoTimer<Telemetry::MOZ_SQLITE_TRUNCATE_MS> timer;
+  if (p->quotaObject) {
+    if (p->fileChunkSize > 0) {
+      // Round up to the smallest multiple of the chunk size that will hold all
+      // the data.
+      size =
+        ((size + p->fileChunkSize - 1) / p->fileChunkSize) * p->fileChunkSize;
+    }
+    if (!p->quotaObject->MaybeUpdateSize(size, /* aTruncate */ true)) {
+      return SQLITE_FULL;
+    }
+  }
+  rc = p->pReal->pMethods->xTruncate(p->pReal, size);
+  if (p->quotaObject) {
+    if (rc == SQLITE_OK) {
+#ifdef DEBUG
+      // Make sure xTruncate set the size exactly as we calculated above.
+      sqlite_int64 newSize;
+      MOZ_ASSERT(xFileSize(pFile, &newSize) == SQLITE_OK);
+      MOZ_ASSERT(newSize == size);
+#endif
+    } else {
+      NS_WARNING("xTruncate failed on a quota-controlled file, attempting to "
+                 "update its current size...");
+      if (xFileSize(pFile, &size) == SQLITE_OK) {
+        p->quotaObject->MaybeUpdateSize(size, /* aTruncate */ true);
+      }
+    }
+  }
+  return rc;
+}
+
+/*
+** Sync a telemetry_file.
+*/
+int
+xSync(sqlite3_file *pFile, int flags)
+{
+  telemetry_file *p = (telemetry_file *)pFile;
+  IOThreadAutoTimer ioTimer(p->histograms->syncMS, IOInterposeObserver::OpFSync);
+  return p->pReal->pMethods->xSync(p->pReal, flags);
+}
+
+/*
+** Lock a telemetry_file.
+*/
+int
+xLock(sqlite3_file *pFile, int eLock)
+{
+  telemetry_file *p = (telemetry_file *)pFile;
+  int rc;
+  rc = p->pReal->pMethods->xLock(p->pReal, eLock);
+  return rc;
+}
+
+/*
+** Unlock a telemetry_file.
+*/
+int
+xUnlock(sqlite3_file *pFile, int eLock)
+{
+  telemetry_file *p = (telemetry_file *)pFile;
+  int rc;
+  rc = p->pReal->pMethods->xUnlock(p->pReal, eLock);
+  return rc;
+}
+
+/*
+** Check if another file-handle holds a RESERVED lock on a telemetry_file.
+*/
+int
+xCheckReservedLock(sqlite3_file *pFile, int *pResOut)
+{
+  telemetry_file *p = (telemetry_file *)pFile;
+  int rc = p->pReal->pMethods->xCheckReservedLock(p->pReal, pResOut);
+  return rc;
+}
+
+/*
+** File control method. For custom operations on a telemetry_file.
+*/
+int
+xFileControl(sqlite3_file *pFile, int op, void *pArg)
+{
+  telemetry_file *p = (telemetry_file *)pFile;
+  int rc;
+  // Hook SQLITE_FCNTL_SIZE_HINT for quota-controlled files and do the necessary
+  // work before passing to the SQLite VFS.
+  if (op == SQLITE_FCNTL_SIZE_HINT && p->quotaObject) {
+    sqlite3_int64 hintSize = *static_cast<sqlite3_int64*>(pArg);
+    sqlite3_int64 currentSize;
+    rc = xFileSize(pFile, &currentSize);
+    if (rc != SQLITE_OK) {
+      return rc;
+    }
+    if (hintSize > currentSize) {
+      rc = xTruncate(pFile, hintSize);
+      if (rc != SQLITE_OK) {
+        return rc;
+      }
+    }
+  }
+  rc = p->pReal->pMethods->xFileControl(p->pReal, op, pArg);
+  // Grab the file chunk size after the SQLite VFS has approved.
+  if (op == SQLITE_FCNTL_CHUNK_SIZE && rc == SQLITE_OK) {
+    p->fileChunkSize = *static_cast<int*>(pArg);
+  }
+#ifdef DEBUG
+  if (op == SQLITE_FCNTL_SIZE_HINT && p->quotaObject && rc == SQLITE_OK) {
+    sqlite3_int64 hintSize = *static_cast<sqlite3_int64*>(pArg);
+    if (p->fileChunkSize > 0) {
+      hintSize =
+        ((hintSize + p->fileChunkSize - 1) / p->fileChunkSize) *
+          p->fileChunkSize;
+    }
+    sqlite3_int64 currentSize;
+    MOZ_ASSERT(xFileSize(pFile, &currentSize) == SQLITE_OK);
+    MOZ_ASSERT(currentSize >= hintSize);
+  }
+#endif
+  return rc;
+}
+
+/*
+** Return the sector-size in bytes for a telemetry_file.
+*/
+int
+xSectorSize(sqlite3_file *pFile)
+{
+  telemetry_file *p = (telemetry_file *)pFile;
+  int rc;
+  rc = p->pReal->pMethods->xSectorSize(p->pReal);
+  return rc;
+}
+
+/*
+** Return the device characteristic flags supported by a telemetry_file.
+*/
+int
+xDeviceCharacteristics(sqlite3_file *pFile)
+{
+  telemetry_file *p = (telemetry_file *)pFile;
+  int rc;
+  rc = p->pReal->pMethods->xDeviceCharacteristics(p->pReal);
+  return rc;
+}
+
+/*
+** Shared-memory operations.
+*/
+int
+xShmLock(sqlite3_file *pFile, int ofst, int n, int flags)
+{
+  telemetry_file *p = (telemetry_file *)pFile;
+  return p->pReal->pMethods->xShmLock(p->pReal, ofst, n, flags);
+}
+
+int
+xShmMap(sqlite3_file *pFile, int iRegion, int szRegion, int isWrite, void volatile **pp)
+{
+  telemetry_file *p = (telemetry_file *)pFile;
+  int rc;
+  rc = p->pReal->pMethods->xShmMap(p->pReal, iRegion, szRegion, isWrite, pp);
+  return rc;
+}
+
+void
+xShmBarrier(sqlite3_file *pFile){
+  telemetry_file *p = (telemetry_file *)pFile;
+  p->pReal->pMethods->xShmBarrier(p->pReal);
+}
+
+int
+xShmUnmap(sqlite3_file *pFile, int delFlag){
+  telemetry_file *p = (telemetry_file *)pFile;
+  int rc;
+  rc = p->pReal->pMethods->xShmUnmap(p->pReal, delFlag);
+  return rc;
+}
+
+int
+xFetch(sqlite3_file *pFile, sqlite3_int64 iOff, int iAmt, void **pp)
+{
+  telemetry_file *p = (telemetry_file *)pFile;
+  MOZ_ASSERT(p->pReal->pMethods->iVersion >= 3);
+  return p->pReal->pMethods->xFetch(p->pReal, iOff, iAmt, pp);
+}
+
+int
+xUnfetch(sqlite3_file *pFile, sqlite3_int64 iOff, void *pResOut)
+{
+  telemetry_file *p = (telemetry_file *)pFile;
+  MOZ_ASSERT(p->pReal->pMethods->iVersion >= 3);
+  return p->pReal->pMethods->xUnfetch(p->pReal, iOff, pResOut);
+}
+
+int
+xOpen(sqlite3_vfs* vfs, const char *zName, sqlite3_file* pFile,
+          int flags, int *pOutFlags)
+{
+  IOThreadAutoTimer ioTimer(Telemetry::MOZ_SQLITE_OPEN_MS,
+                            IOInterposeObserver::OpCreateOrOpen);
+  Telemetry::AutoTimer<Telemetry::MOZ_SQLITE_OPEN_MS> timer;
+  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
+  int rc;
+  telemetry_file *p = (telemetry_file *)pFile;
+  Histograms *h = nullptr;
+  // check if the filename is one we are probing for
+  for(size_t i = 0;i < sizeof(gHistograms)/sizeof(gHistograms[0]);i++) {
+    h = &gHistograms[i];
+    // last probe is the fallback probe
+    if (!h->name)
+      break;
+    if (!zName)
+      continue;
+    const char *match = strstr(zName, h->name);
+    if (!match)
+      continue;
+    char c = match[strlen(h->name)];
+    // include -wal/-journal too
+    if (!c || c == '-')
+      break;
+  }
+  p->histograms = h;
+
+  MaybeEstablishQuotaControl(zName, p, flags);
+
+  rc = orig_vfs->xOpen(orig_vfs, zName, p->pReal, flags, pOutFlags);
+  if( rc != SQLITE_OK )
+    return rc;
+  if( p->pReal->pMethods ){
+    sqlite3_io_methods *pNew = new sqlite3_io_methods;
+    const sqlite3_io_methods *pSub = p->pReal->pMethods;
+    memset(pNew, 0, sizeof(*pNew));
+    // If the io_methods version is higher than the last known one, you should
+    // update this VFS adding appropriate IO methods for any methods added in
+    // the version change.
+    pNew->iVersion = pSub->iVersion;
+    MOZ_ASSERT(pNew->iVersion <= LAST_KNOWN_IOMETHODS_VERSION);
+    pNew->xClose = xClose;
+    pNew->xRead = xRead;
+    pNew->xWrite = xWrite;
+    pNew->xTruncate = xTruncate;
+    pNew->xSync = xSync;
+    pNew->xFileSize = xFileSize;
+    pNew->xLock = xLock;
+    pNew->xUnlock = xUnlock;
+    pNew->xCheckReservedLock = xCheckReservedLock;
+    pNew->xFileControl = xFileControl;
+    pNew->xSectorSize = xSectorSize;
+    pNew->xDeviceCharacteristics = xDeviceCharacteristics;
+    if (pNew->iVersion >= 2) {
+      // Methods added in version 2.
+      pNew->xShmMap = pSub->xShmMap ? xShmMap : 0;
+      pNew->xShmLock = pSub->xShmLock ? xShmLock : 0;
+      pNew->xShmBarrier = pSub->xShmBarrier ? xShmBarrier : 0;
+      pNew->xShmUnmap = pSub->xShmUnmap ? xShmUnmap : 0;
+    }
+    if (pNew->iVersion >= 3) {
+      // Methods added in version 3.
+      // SQLite 3.7.17 calls these methods without checking for nullptr first,
+      // so we always define them.  Verify that we're not going to call
+      // nullptrs, though.
+      MOZ_ASSERT(pSub->xFetch);
+      pNew->xFetch = xFetch;
+      MOZ_ASSERT(pSub->xUnfetch);
+      pNew->xUnfetch = xUnfetch;
+    }
+    pFile->pMethods = pNew;
+  }
+  return rc;
+}
+
+int
+xDelete(sqlite3_vfs* vfs, const char *zName, int syncDir)
+{
+  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
+  int rc;
+  nsRefPtr<QuotaObject> quotaObject;
+
+  if (StringEndsWith(nsDependentCString(zName), NS_LITERAL_CSTRING("-wal"))) {
+    const char *zURIParameterKey = DatabasePathFromWALPath(zName);
+    MOZ_ASSERT(zURIParameterKey);
+
+    quotaObject = GetQuotaObjectFromNameAndParameters(zName, zURIParameterKey);
+  }
+
+  rc = orig_vfs->xDelete(orig_vfs, zName, syncDir);
+  if (rc == SQLITE_OK && quotaObject) {
+    MOZ_ALWAYS_TRUE(quotaObject->MaybeUpdateSize(0, /* aTruncate */ true));
+  }
+
+  return rc;
+}
+
+int
+xAccess(sqlite3_vfs *vfs, const char *zName, int flags, int *pResOut)
+{
+  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
+  return orig_vfs->xAccess(orig_vfs, zName, flags, pResOut);
+}
+
+int
+xFullPathname(sqlite3_vfs *vfs, const char *zName, int nOut, char *zOut)
+{
+  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
+  return orig_vfs->xFullPathname(orig_vfs, zName, nOut, zOut);
+}
+
+void*
+xDlOpen(sqlite3_vfs *vfs, const char *zFilename)
+{
+  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
+  return orig_vfs->xDlOpen(orig_vfs, zFilename);
+}
+
+void
+xDlError(sqlite3_vfs *vfs, int nByte, char *zErrMsg)
+{
+  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
+  orig_vfs->xDlError(orig_vfs, nByte, zErrMsg);
+}
+
+void 
+(*xDlSym(sqlite3_vfs *vfs, void *pHdle, const char *zSym))(void){
+  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
+  return orig_vfs->xDlSym(orig_vfs, pHdle, zSym);
+}
+
+void
+xDlClose(sqlite3_vfs *vfs, void *pHandle)
+{
+  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
+  orig_vfs->xDlClose(orig_vfs, pHandle);
+}
+
+int
+xRandomness(sqlite3_vfs *vfs, int nByte, char *zOut)
+{
+  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
+  return orig_vfs->xRandomness(orig_vfs, nByte, zOut);
+}
+
+int
+xSleep(sqlite3_vfs *vfs, int microseconds)
+{
+  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
+  return orig_vfs->xSleep(orig_vfs, microseconds);
+}
+
+int
+xCurrentTime(sqlite3_vfs *vfs, double *prNow)
+{
+  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
+  return orig_vfs->xCurrentTime(orig_vfs, prNow);
+}
+
+int
+xGetLastError(sqlite3_vfs *vfs, int nBuf, char *zBuf)
+{
+  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
+  return orig_vfs->xGetLastError(orig_vfs, nBuf, zBuf);
+}
+
+int
+xCurrentTimeInt64(sqlite3_vfs *vfs, sqlite3_int64 *piNow)
+{
+  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
+  return orig_vfs->xCurrentTimeInt64(orig_vfs, piNow);
+}
+
+static
+int
+xSetSystemCall(sqlite3_vfs *vfs, const char *zName, sqlite3_syscall_ptr pFunc)
+{
+  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
+  return orig_vfs->xSetSystemCall(orig_vfs, zName, pFunc);
+}
+
+static
+sqlite3_syscall_ptr
+xGetSystemCall(sqlite3_vfs *vfs, const char *zName)
+{
+  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
+  return orig_vfs->xGetSystemCall(orig_vfs, zName);
+}
+
+static
+const char *
+xNextSystemCall(sqlite3_vfs *vfs, const char *zName)
+{
+  sqlite3_vfs *orig_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
+  return orig_vfs->xNextSystemCall(orig_vfs, zName);
+}
+
+}
+
+namespace mozilla {
+namespace storage {
+
+sqlite3_vfs* ConstructTelemetryVFS()
+{
+#if defined(XP_WIN)
+#define EXPECTED_VFS     "win32"
+#define EXPECTED_VFS_NFS "win32"
+#else
+#define EXPECTED_VFS     "unix"
+#define EXPECTED_VFS_NFS "unix-excl"
+#endif
+  
+  bool expected_vfs;
+  sqlite3_vfs *vfs;
+  if (Preferences::GetBool(PREF_NFS_FILESYSTEM)) {
+    vfs = sqlite3_vfs_find(EXPECTED_VFS_NFS);
+    expected_vfs = (vfs != nullptr);
+  }
+  else {
+    vfs = sqlite3_vfs_find(nullptr);
+    expected_vfs = vfs->zName && !strcmp(vfs->zName, EXPECTED_VFS);
+  }
+  if (!expected_vfs) {
+    return nullptr;
+  }
+
+  sqlite3_vfs *tvfs = new ::sqlite3_vfs;
+  memset(tvfs, 0, sizeof(::sqlite3_vfs));
+  // If the VFS version is higher than the last known one, you should update
+  // this VFS adding appropriate methods for any methods added in the version
+  // change.
+  tvfs->iVersion = vfs->iVersion;
+  MOZ_ASSERT(vfs->iVersion <= LAST_KNOWN_VFS_VERSION);
+  tvfs->szOsFile = sizeof(telemetry_file) - sizeof(sqlite3_file) + vfs->szOsFile;
+  tvfs->mxPathname = vfs->mxPathname;
+  tvfs->zName = "telemetry-vfs";
+  tvfs->pAppData = vfs;
+  tvfs->xOpen = xOpen;
+  tvfs->xDelete = xDelete;
+  tvfs->xAccess = xAccess;
+  tvfs->xFullPathname = xFullPathname;
+  tvfs->xDlOpen = xDlOpen;
+  tvfs->xDlError = xDlError;
+  tvfs->xDlSym = xDlSym;
+  tvfs->xDlClose = xDlClose;
+  tvfs->xRandomness = xRandomness;
+  tvfs->xSleep = xSleep;
+  tvfs->xCurrentTime = xCurrentTime;
+  tvfs->xGetLastError = xGetLastError;
+  if (tvfs->iVersion >= 2) {
+    // Methods added in version 2.
+    tvfs->xCurrentTimeInt64 = xCurrentTimeInt64;
+  }
+  if (tvfs->iVersion >= 3) {
+    // Methods added in version 3.
+    tvfs->xSetSystemCall = xSetSystemCall;
+    tvfs->xGetSystemCall = xGetSystemCall;
+    tvfs->xNextSystemCall = xNextSystemCall;
+  }
+  return tvfs;
+}
+
+}
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/test/moz.build firefox-trunk-41.0~a1~hg20150524r245419/storage/test/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/test/moz.build	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/test/moz.build	2015-05-25 20:42:54.000000000 +0000
@@ -29,7 +29,7 @@
     ])
 
 LOCAL_INCLUDES += [
-    '../src',
+    '..',
 ]
 
 FAIL_ON_WARNINGS = True
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/test/unit/test_statement_wrapper_automatically.js firefox-trunk-41.0~a1~hg20150524r245419/storage/test/unit/test_statement_wrapper_automatically.js
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/test/unit/test_statement_wrapper_automatically.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/test/unit/test_statement_wrapper_automatically.js	2015-05-25 20:42:54.000000000 +0000
@@ -146,7 +146,7 @@
   setup();
 
   // function JSValStorageStatementBinder in
-  // storage/src/mozStorageStatementParams.cpp tells us that the following types
+  // storage/mozStorageStatementParams.cpp tells us that the following types
   // and only the following types are valid as statement parameters:
   var vals = [
     1337,       // int
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/VacuumManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/storage/VacuumManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/VacuumManager.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/VacuumManager.cpp	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,388 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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/DebugOnly.h"
+
+#include "VacuumManager.h"
+
+#include "mozilla/Services.h"
+#include "mozilla/Preferences.h"
+#include "nsIObserverService.h"
+#include "nsIFile.h"
+#include "nsThreadUtils.h"
+#include "mozilla/Logging.h"
+#include "prtime.h"
+
+#include "mozStorageConnection.h"
+#include "mozIStorageStatement.h"
+#include "mozIStorageAsyncStatement.h"
+#include "mozIStoragePendingStatement.h"
+#include "mozIStorageError.h"
+#include "mozStorageHelper.h"
+#include "nsXULAppAPI.h"
+
+#define OBSERVER_TOPIC_IDLE_DAILY "idle-daily"
+#define OBSERVER_TOPIC_XPCOM_SHUTDOWN "xpcom-shutdown"
+
+// Used to notify begin and end of a heavy IO task.
+#define OBSERVER_TOPIC_HEAVY_IO "heavy-io-task"
+#define OBSERVER_DATA_VACUUM_BEGIN NS_LITERAL_STRING("vacuum-begin")
+#define OBSERVER_DATA_VACUUM_END NS_LITERAL_STRING("vacuum-end")
+
+// This preferences root will contain last vacuum timestamps (in seconds) for
+// each database.  The database filename is used as a key.
+#define PREF_VACUUM_BRANCH "storage.vacuum.last."
+
+// Time between subsequent vacuum calls for a certain database.
+#define VACUUM_INTERVAL_SECONDS 30 * 86400 // 30 days.
+
+extern PRLogModuleInfo *gStorageLog;
+
+namespace mozilla {
+namespace storage {
+
+namespace {
+
+////////////////////////////////////////////////////////////////////////////////
+//// BaseCallback
+
+class BaseCallback : public mozIStorageStatementCallback
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_MOZISTORAGESTATEMENTCALLBACK
+  BaseCallback() {}
+protected:
+  virtual ~BaseCallback() {}
+};
+
+NS_IMETHODIMP
+BaseCallback::HandleError(mozIStorageError *aError)
+{
+#ifdef DEBUG
+  int32_t result;
+  nsresult rv = aError->GetResult(&result);
+  NS_ENSURE_SUCCESS(rv, rv);
+  nsAutoCString message;
+  rv = aError->GetMessage(message);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsAutoCString warnMsg;
+  warnMsg.AppendLiteral("An error occured during async execution: ");
+  warnMsg.AppendInt(result);
+  warnMsg.Append(' ');
+  warnMsg.Append(message);
+  NS_WARNING(warnMsg.get());
+#endif
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+BaseCallback::HandleResult(mozIStorageResultSet *aResultSet)
+{
+  // We could get results from PRAGMA statements, but we don't mind them.
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+BaseCallback::HandleCompletion(uint16_t aReason)
+{
+  // By default BaseCallback will just be silent on completion.
+  return NS_OK;
+}
+
+NS_IMPL_ISUPPORTS(
+  BaseCallback
+, mozIStorageStatementCallback
+)
+
+//////////////////////////////////////////////////////////////////////////////// 
+//// Vacuumer declaration.
+
+class Vacuumer : public BaseCallback
+{
+public:
+  NS_DECL_MOZISTORAGESTATEMENTCALLBACK
+
+  explicit Vacuumer(mozIStorageVacuumParticipant *aParticipant);
+
+  bool execute();
+  nsresult notifyCompletion(bool aSucceeded);
+
+private:
+  nsCOMPtr<mozIStorageVacuumParticipant> mParticipant;
+  nsCString mDBFilename;
+  nsCOMPtr<mozIStorageConnection> mDBConn;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+//// Vacuumer implementation.
+
+Vacuumer::Vacuumer(mozIStorageVacuumParticipant *aParticipant)
+  : mParticipant(aParticipant)
+{
+}
+
+bool
+Vacuumer::execute()
+{
+  MOZ_ASSERT(NS_IsMainThread(), "Must be running on the main thread!");
+
+  // Get the connection and check its validity.
+  nsresult rv = mParticipant->GetDatabaseConnection(getter_AddRefs(mDBConn));
+  NS_ENSURE_SUCCESS(rv, false);
+  bool ready = false;
+  if (!mDBConn || NS_FAILED(mDBConn->GetConnectionReady(&ready)) || !ready) {
+    NS_WARNING("Unable to get a connection to vacuum database");
+    return false;
+  }
+
+  // Ask for the expected page size.  Vacuum can change the page size, unless
+  // the database is using WAL journaling.
+  // TODO Bug 634374: figure out a strategy to fix page size with WAL.
+  int32_t expectedPageSize = 0;
+  rv = mParticipant->GetExpectedDatabasePageSize(&expectedPageSize);
+  if (NS_FAILED(rv) || !Service::pageSizeIsValid(expectedPageSize)) {
+    NS_WARNING("Invalid page size requested for database, will use default ");
+    NS_WARNING(mDBFilename.get());
+    expectedPageSize = Service::getDefaultPageSize();
+  }
+
+  // Get the database filename.  Last vacuum time is stored under this name
+  // in PREF_VACUUM_BRANCH.
+  nsCOMPtr<nsIFile> databaseFile;
+  mDBConn->GetDatabaseFile(getter_AddRefs(databaseFile));
+  if (!databaseFile) {
+    NS_WARNING("Trying to vacuum a in-memory database!");
+    return false;
+  }
+  nsAutoString databaseFilename;
+  rv = databaseFile->GetLeafName(databaseFilename);
+  NS_ENSURE_SUCCESS(rv, false);
+  mDBFilename = NS_ConvertUTF16toUTF8(databaseFilename);
+  MOZ_ASSERT(!mDBFilename.IsEmpty(), "Database filename cannot be empty");
+
+  // Check interval from last vacuum.
+  int32_t now = static_cast<int32_t>(PR_Now() / PR_USEC_PER_SEC);
+  int32_t lastVacuum;
+  nsAutoCString prefName(PREF_VACUUM_BRANCH);
+  prefName += mDBFilename;
+  rv = Preferences::GetInt(prefName.get(), &lastVacuum);
+  if (NS_SUCCEEDED(rv) && (now - lastVacuum) < VACUUM_INTERVAL_SECONDS) {
+    // This database was vacuumed recently, skip it.
+    return false;
+  }
+
+  // Notify that we are about to start vacuuming.  The participant can opt-out
+  // if it cannot handle a vacuum at this time, and then we'll move to the next
+  // one.
+  bool vacuumGranted = false;
+  rv = mParticipant->OnBeginVacuum(&vacuumGranted);
+  NS_ENSURE_SUCCESS(rv, false);
+  if (!vacuumGranted) {
+    return false;
+  }
+
+  // Notify a heavy IO task is about to start.
+  nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
+  if (os) {
+    DebugOnly<nsresult> rv =
+      os->NotifyObservers(nullptr, OBSERVER_TOPIC_HEAVY_IO,
+                          OBSERVER_DATA_VACUUM_BEGIN.get());
+    MOZ_ASSERT(NS_SUCCEEDED(rv), "Should be able to notify");
+  }
+
+  // Execute the statements separately, since the pragma may conflict with the
+  // vacuum, if they are executed in the same transaction.
+  nsCOMPtr<mozIStorageAsyncStatement> pageSizeStmt;
+  nsAutoCString pageSizeQuery(MOZ_STORAGE_UNIQUIFY_QUERY_STR
+                              "PRAGMA page_size = ");
+  pageSizeQuery.AppendInt(expectedPageSize);
+  rv = mDBConn->CreateAsyncStatement(pageSizeQuery,
+                                     getter_AddRefs(pageSizeStmt));
+  NS_ENSURE_SUCCESS(rv, false);
+  nsRefPtr<BaseCallback> callback = new BaseCallback();
+  nsCOMPtr<mozIStoragePendingStatement> ps;
+  rv = pageSizeStmt->ExecuteAsync(callback, getter_AddRefs(ps));
+  NS_ENSURE_SUCCESS(rv, false);
+
+  nsCOMPtr<mozIStorageAsyncStatement> stmt;
+  rv = mDBConn->CreateAsyncStatement(NS_LITERAL_CSTRING(
+    "VACUUM"
+  ), getter_AddRefs(stmt));
+  NS_ENSURE_SUCCESS(rv, false);
+  rv = stmt->ExecuteAsync(this, getter_AddRefs(ps));
+  NS_ENSURE_SUCCESS(rv, false);
+
+  return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// mozIStorageStatementCallback
+
+NS_IMETHODIMP
+Vacuumer::HandleError(mozIStorageError *aError)
+{
+#ifdef DEBUG
+  int32_t result;
+  nsresult rv = aError->GetResult(&result);
+  NS_ENSURE_SUCCESS(rv, rv);
+  nsAutoCString message;
+  rv = aError->GetMessage(message);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsAutoCString warnMsg;
+  warnMsg.AppendLiteral("Unable to vacuum database: ");
+  warnMsg.Append(mDBFilename);
+  warnMsg.AppendLiteral(" - ");
+  warnMsg.AppendInt(result);
+  warnMsg.Append(' ');
+  warnMsg.Append(message);
+  NS_WARNING(warnMsg.get());
+#endif
+
+  if (PR_LOG_TEST(gStorageLog, PR_LOG_ERROR)) {
+    int32_t result;
+    nsresult rv = aError->GetResult(&result);
+    NS_ENSURE_SUCCESS(rv, rv);
+    nsAutoCString message;
+    rv = aError->GetMessage(message);
+    NS_ENSURE_SUCCESS(rv, rv);
+    MOZ_LOG(gStorageLog, PR_LOG_ERROR,
+           ("Vacuum failed with error: %d '%s'. Database was: '%s'",
+            result, message.get(), mDBFilename.get()));
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Vacuumer::HandleResult(mozIStorageResultSet *aResultSet)
+{
+  NS_NOTREACHED("Got a resultset from a vacuum?");
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Vacuumer::HandleCompletion(uint16_t aReason)
+{
+  if (aReason == REASON_FINISHED) {
+    // Update last vacuum time.
+    int32_t now = static_cast<int32_t>(PR_Now() / PR_USEC_PER_SEC);
+    MOZ_ASSERT(!mDBFilename.IsEmpty(), "Database filename cannot be empty");
+    nsAutoCString prefName(PREF_VACUUM_BRANCH);
+    prefName += mDBFilename;
+    DebugOnly<nsresult> rv = Preferences::SetInt(prefName.get(), now);
+    MOZ_ASSERT(NS_SUCCEEDED(rv), "Should be able to set a preference"); 
+  }
+
+  notifyCompletion(aReason == REASON_FINISHED);
+
+  return NS_OK;
+}
+
+nsresult
+Vacuumer::notifyCompletion(bool aSucceeded)
+{
+  nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
+  if (os) {
+    os->NotifyObservers(nullptr, OBSERVER_TOPIC_HEAVY_IO,
+                        OBSERVER_DATA_VACUUM_END.get());
+  }
+
+  nsresult rv = mParticipant->OnEndVacuum(aSucceeded);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
+} // Anonymous namespace.
+
+////////////////////////////////////////////////////////////////////////////////
+//// VacuumManager
+
+NS_IMPL_ISUPPORTS(
+  VacuumManager
+, nsIObserver
+)
+
+VacuumManager *
+VacuumManager::gVacuumManager = nullptr;
+
+VacuumManager *
+VacuumManager::getSingleton()
+{
+  //Don't allocate it in the child Process.
+  if (XRE_GetProcessType() != GeckoProcessType_Default) {
+    return nullptr;
+  }
+
+  if (gVacuumManager) {
+    NS_ADDREF(gVacuumManager);
+    return gVacuumManager;
+  }
+  gVacuumManager = new VacuumManager();
+  if (gVacuumManager) {
+    NS_ADDREF(gVacuumManager);
+  }
+  return gVacuumManager;
+}
+
+VacuumManager::VacuumManager()
+  : mParticipants("vacuum-participant")
+{
+  MOZ_ASSERT(!gVacuumManager,
+             "Attempting to create two instances of the service!");
+  gVacuumManager = this;
+}
+
+VacuumManager::~VacuumManager()
+{
+  // Remove the static reference to the service.  Check to make sure its us
+  // in case somebody creates an extra instance of the service.
+  MOZ_ASSERT(gVacuumManager == this,
+             "Deleting a non-singleton instance of the service");
+  if (gVacuumManager == this) {
+    gVacuumManager = nullptr;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// nsIObserver
+
+NS_IMETHODIMP
+VacuumManager::Observe(nsISupports *aSubject,
+                       const char *aTopic,
+                       const char16_t *aData)
+{
+  if (strcmp(aTopic, OBSERVER_TOPIC_IDLE_DAILY) == 0) {
+    // Try to run vacuum on all registered entries.  Will stop at the first
+    // successful one.
+    nsCOMArray<mozIStorageVacuumParticipant> entries;
+    mParticipants.GetEntries(entries);
+    // If there are more entries than what a month can contain, we could end up
+    // skipping some, since we run daily.  So we use a starting index.
+    static const char* kPrefName = PREF_VACUUM_BRANCH "index";
+    int32_t startIndex = Preferences::GetInt(kPrefName, 0);
+    if (startIndex >= entries.Count()) {
+      startIndex = 0;
+    }
+    int32_t index;
+    for (index = startIndex; index < entries.Count(); ++index) {
+      nsRefPtr<Vacuumer> vacuum = new Vacuumer(entries[index]);
+      // Only vacuum one database per day.
+      if (vacuum->execute()) {
+        break;
+      }
+    }
+    DebugOnly<nsresult> rv = Preferences::SetInt(kPrefName, index);
+    MOZ_ASSERT(NS_SUCCEEDED(rv), "Should be able to set a preference");
+  }
+
+  return NS_OK;
+}
+
+} // namespace storage
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/VacuumManager.h firefox-trunk-41.0~a1~hg20150524r245419/storage/VacuumManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/VacuumManager.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/VacuumManager.h	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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_storage_VacuumManager_h__
+#define mozilla_storage_VacuumManager_h__
+
+#include "nsCOMPtr.h"
+#include "nsIObserver.h"
+#include "mozIStorageStatementCallback.h"
+#include "mozIStorageVacuumParticipant.h"
+#include "nsCategoryCache.h"
+#include "mozilla/Attributes.h"
+
+namespace mozilla {
+namespace storage {
+
+class VacuumManager final : public nsIObserver
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIOBSERVER
+
+  VacuumManager();
+
+  /**
+   * Obtains the VacuumManager object.
+   */
+  static VacuumManager * getSingleton();
+
+private:
+  ~VacuumManager();
+
+  static VacuumManager *gVacuumManager;
+
+  // Cache of components registered in "vacuum-participant" category.
+  nsCategoryCache<mozIStorageVacuumParticipant> mParticipants;
+};
+
+} // namespace storage
+} // namespace mozilla
+
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/Variant.h firefox-trunk-41.0~a1~hg20150524r245419/storage/Variant.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/Variant.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/Variant.h	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,448 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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_storage_Variant_h__
+#define mozilla_storage_Variant_h__
+
+#include <utility>
+
+#include "nsIVariant.h"
+#include "nsString.h"
+#include "nsTArray.h"
+
+#define VARIANT_BASE_IID                                   \
+{ /* 78888042-0fa3-4f7a-8b19-7996f99bf1aa */               \
+  0x78888042, 0x0fa3, 0x4f7a,                              \
+  { 0x8b, 0x19, 0x79, 0x96, 0xf9, 0x9b, 0xf1, 0xaa }       \
+}
+
+/**
+ * This class is used by the storage module whenever an nsIVariant needs to be
+ * returned.  We provide traits for the basic sqlite types to make use easier.
+ * The following types map to the indicated sqlite type:
+ * int64_t   -> INTEGER (use IntegerVariant)
+ * double    -> FLOAT (use FloatVariant)
+ * nsString  -> TEXT (use TextVariant)
+ * nsCString -> TEXT (use UTF8TextVariant)
+ * uint8_t[] -> BLOB (use BlobVariant)
+ * nullptr   -> NULL (use NullVariant)
+ */
+
+namespace mozilla {
+namespace storage {
+
+////////////////////////////////////////////////////////////////////////////////
+//// Base Class
+
+class Variant_base : public nsIVariant
+{
+public:
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_NSIVARIANT
+  NS_DECLARE_STATIC_IID_ACCESSOR(VARIANT_BASE_IID)
+
+protected:
+  virtual ~Variant_base() { }
+};
+
+NS_DEFINE_STATIC_IID_ACCESSOR(Variant_base,
+                              VARIANT_BASE_IID)
+
+////////////////////////////////////////////////////////////////////////////////
+//// Traits
+
+/**
+ * Generics
+ */
+
+template <typename DataType>
+struct variant_traits
+{
+  static inline uint16_t type() { return nsIDataType::VTYPE_EMPTY; }
+};
+
+template <typename DataType, bool Adopting=false>
+struct variant_storage_traits
+{
+  typedef DataType ConstructorType;
+  typedef DataType StorageType;
+  static inline void storage_conversion(const ConstructorType aData, StorageType* _storage)
+  {
+    *_storage = aData;
+  }
+
+  static inline void destroy(const StorageType& _storage)
+  { }
+};
+
+#define NO_CONVERSION return NS_ERROR_CANNOT_CONVERT_DATA;
+
+template <typename DataType, bool Adopting=false>
+struct variant_integer_traits
+{
+  typedef typename variant_storage_traits<DataType, Adopting>::StorageType StorageType;
+  static inline nsresult asInt32(const StorageType &, int32_t *) { NO_CONVERSION }
+  static inline nsresult asInt64(const StorageType &, int64_t *) { NO_CONVERSION }
+};
+
+template <typename DataType, bool Adopting=false>
+struct variant_float_traits
+{
+  typedef typename variant_storage_traits<DataType, Adopting>::StorageType StorageType;
+  static inline nsresult asDouble(const StorageType &, double *) { NO_CONVERSION }
+};
+
+template <typename DataType, bool Adopting=false>
+struct variant_text_traits
+{
+  typedef typename variant_storage_traits<DataType, Adopting>::StorageType StorageType;
+  static inline nsresult asUTF8String(const StorageType &, nsACString &) { NO_CONVERSION }
+  static inline nsresult asString(const StorageType &, nsAString &) { NO_CONVERSION }
+};
+
+template <typename DataType, bool Adopting=false>
+struct variant_blob_traits
+{
+  typedef typename variant_storage_traits<DataType, Adopting>::StorageType StorageType;
+  static inline nsresult asArray(const StorageType &, uint16_t *, uint32_t *, void **)
+  { NO_CONVERSION }
+};
+
+#undef NO_CONVERSION
+
+/**
+ * INTEGER types
+ */
+
+template < >
+struct variant_traits<int64_t>
+{
+  static inline uint16_t type() { return nsIDataType::VTYPE_INT64; }
+};
+template < >
+struct variant_integer_traits<int64_t>
+{
+  static inline nsresult asInt32(int64_t aValue,
+                                 int32_t *_result)
+  {
+    if (aValue > INT32_MAX || aValue < INT32_MIN)
+      return NS_ERROR_CANNOT_CONVERT_DATA;
+
+    *_result = static_cast<int32_t>(aValue);
+    return NS_OK;
+  }
+  static inline nsresult asInt64(int64_t aValue,
+                                 int64_t *_result)
+  {
+    *_result = aValue;
+    return NS_OK;
+  }
+};
+// xpcvariant just calls get double for integers...
+template < >
+struct variant_float_traits<int64_t>
+{
+  static inline nsresult asDouble(int64_t aValue,
+                                  double *_result)
+  {
+    *_result = double(aValue);
+    return NS_OK;
+  }
+};
+
+/**
+ * FLOAT types
+ */
+
+template < >
+struct variant_traits<double>
+{
+  static inline uint16_t type() { return nsIDataType::VTYPE_DOUBLE; }
+};
+template < >
+struct variant_float_traits<double>
+{
+  static inline nsresult asDouble(double aValue,
+                                  double *_result)
+  {
+    *_result = aValue;
+    return NS_OK;
+  }
+};
+
+/**
+ * TEXT types
+ */
+
+template < >
+struct variant_traits<nsString>
+{
+  static inline uint16_t type() { return nsIDataType::VTYPE_ASTRING; }
+};
+template < >
+struct variant_storage_traits<nsString>
+{
+  typedef const nsAString & ConstructorType;
+  typedef nsString StorageType;
+  static inline void storage_conversion(ConstructorType aText, StorageType* _outData)
+  {
+    *_outData = aText;
+  }
+  static inline void destroy(const StorageType& _outData)
+  { }
+};
+template < >
+struct variant_text_traits<nsString>
+{
+  static inline nsresult asUTF8String(const nsString &aValue,
+                                      nsACString &_result)
+  {
+    CopyUTF16toUTF8(aValue, _result);
+    return NS_OK;
+  }
+  static inline nsresult asString(const nsString &aValue,
+                                  nsAString &_result)
+  {
+    _result = aValue;
+    return NS_OK;
+  }
+};
+
+template < >
+struct variant_traits<nsCString>
+{
+  static inline uint16_t type() { return nsIDataType::VTYPE_UTF8STRING; }
+};
+template < >
+struct variant_storage_traits<nsCString>
+{
+  typedef const nsACString & ConstructorType;
+  typedef nsCString StorageType;
+  static inline void storage_conversion(ConstructorType aText, StorageType* _outData)
+  {
+    *_outData = aText;
+  }
+  static inline void destroy(const StorageType &aData)
+  { }
+};
+template < >
+struct variant_text_traits<nsCString>
+{
+  static inline nsresult asUTF8String(const nsCString &aValue,
+                                      nsACString &_result)
+  {
+    _result = aValue;
+    return NS_OK;
+  }
+  static inline nsresult asString(const nsCString &aValue,
+                                  nsAString &_result)
+  {
+    CopyUTF8toUTF16(aValue, _result);
+    return NS_OK;
+  }
+};
+
+/**
+ * BLOB types
+ */
+
+template < >
+struct variant_traits<uint8_t[]>
+{
+  static inline uint16_t type() { return nsIDataType::VTYPE_ARRAY; }
+};
+template < >
+struct variant_storage_traits<uint8_t[], false>
+{
+  typedef std::pair<const void *, int> ConstructorType;
+  typedef FallibleTArray<uint8_t> StorageType;
+  static inline void storage_conversion(ConstructorType aBlob, StorageType* _outData)
+  {
+    _outData->Clear();
+    (void)_outData->AppendElements(static_cast<const uint8_t *>(aBlob.first),
+                                   aBlob.second);
+  }
+  static inline void destroy(const StorageType& _outData)
+  { }
+};
+template < >
+struct variant_storage_traits<uint8_t[], true>
+{
+  typedef std::pair<uint8_t *, int> ConstructorType;
+  typedef std::pair<uint8_t *, int> StorageType;
+  static inline void storage_conversion(ConstructorType aBlob, StorageType* _outData)
+  {
+    *_outData = aBlob;
+  }
+  static inline void destroy(StorageType &aData)
+  {
+    if (aData.first) {
+      free(aData.first);
+      aData.first = nullptr;
+    }
+  }
+};
+template < >
+struct variant_blob_traits<uint8_t[], false>
+{
+  static inline nsresult asArray(FallibleTArray<uint8_t> &aData,
+                                 uint16_t *_type,
+                                 uint32_t *_size,
+                                 void **_result)
+  {
+    // For empty blobs, we return nullptr.
+    if (aData.Length() == 0) {
+      *_result = nullptr;
+      *_type = nsIDataType::VTYPE_UINT8;
+      *_size = 0;
+      return NS_OK;
+    }
+
+    // Otherwise, we copy the array.
+    *_result = nsMemory::Clone(aData.Elements(), aData.Length() * sizeof(uint8_t));
+    NS_ENSURE_TRUE(*_result, NS_ERROR_OUT_OF_MEMORY);
+
+    // Set type and size
+    *_type = nsIDataType::VTYPE_UINT8;
+    *_size = aData.Length();
+    return NS_OK;
+  }
+};
+
+template < >
+struct variant_blob_traits<uint8_t[], true>
+{
+  static inline nsresult asArray(std::pair<uint8_t *, int> &aData,
+                                 uint16_t *_type,
+                                 uint32_t *_size,
+                                 void **_result)
+  {
+    // For empty blobs, we return nullptr.
+    if (aData.second == 0) {
+      *_result = nullptr;
+      *_type = nsIDataType::VTYPE_UINT8;
+      *_size = 0;
+      return NS_OK;
+    }
+
+    // Otherwise, transfer the data out.
+    *_result = aData.first;
+    aData.first = nullptr;
+    MOZ_ASSERT(*_result); // We asked for it twice, better not use adopting!
+
+    // Set type and size
+    *_type = nsIDataType::VTYPE_UINT8;
+    *_size = aData.second;
+    return NS_OK;
+  }
+};
+
+/**
+ * nullptr type
+ */
+
+class NullVariant : public Variant_base
+{
+public:
+  NS_IMETHOD GetDataType(uint16_t *_type)
+  {
+    NS_ENSURE_ARG_POINTER(_type);
+    *_type = nsIDataType::VTYPE_EMPTY;
+    return NS_OK;
+  }
+
+  NS_IMETHOD GetAsAUTF8String(nsACString &_str)
+  {
+    // Return a void string.
+    _str.Truncate(0);
+    _str.SetIsVoid(true);
+    return NS_OK;
+  }
+
+  NS_IMETHOD GetAsAString(nsAString &_str)
+  {
+    // Return a void string.
+    _str.Truncate(0);
+    _str.SetIsVoid(true);
+    return NS_OK;
+  }
+};
+
+////////////////////////////////////////////////////////////////////////////////
+//// Template Implementation
+
+template <typename DataType, bool Adopting=false>
+class Variant final : public Variant_base
+{
+  ~Variant()
+  {
+    variant_storage_traits<DataType, Adopting>::destroy(mData);
+  }
+
+public:
+  explicit Variant(const typename variant_storage_traits<DataType, Adopting>::ConstructorType aData)
+  {
+    variant_storage_traits<DataType, Adopting>::storage_conversion(aData, &mData);
+  }
+
+  NS_IMETHOD GetDataType(uint16_t *_type)
+  {
+    *_type = variant_traits<DataType>::type();
+    return NS_OK;
+  }
+  NS_IMETHOD GetAsInt32(int32_t *_integer)
+  {
+    return variant_integer_traits<DataType, Adopting>::asInt32(mData, _integer);
+  }
+
+  NS_IMETHOD GetAsInt64(int64_t *_integer)
+  {
+    return variant_integer_traits<DataType, Adopting>::asInt64(mData, _integer);
+  }
+
+  NS_IMETHOD GetAsDouble(double *_double)
+  {
+    return variant_float_traits<DataType, Adopting>::asDouble(mData, _double);
+  }
+
+  NS_IMETHOD GetAsAUTF8String(nsACString &_str)
+  {
+    return variant_text_traits<DataType, Adopting>::asUTF8String(mData, _str);
+  }
+
+  NS_IMETHOD GetAsAString(nsAString &_str)
+  {
+    return variant_text_traits<DataType, Adopting>::asString(mData, _str);
+  }
+
+  NS_IMETHOD GetAsArray(uint16_t *_type,
+                        nsIID *,
+                        uint32_t *_size,
+                        void **_data)
+  {
+    return variant_blob_traits<DataType, Adopting>::asArray(mData, _type, _size, _data);
+  }
+
+private:
+  typename variant_storage_traits<DataType, Adopting>::StorageType mData;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+//// Handy typedefs!  Use these for the right mapping.
+
+typedef Variant<int64_t> IntegerVariant;
+typedef Variant<double> FloatVariant;
+typedef Variant<nsString> TextVariant;
+typedef Variant<nsCString> UTF8TextVariant;
+typedef Variant<uint8_t[], false> BlobVariant;
+typedef Variant<uint8_t[], true> AdoptedBlobVariant;
+
+} // namespace storage
+} // namespace mozilla
+
+#include "Variant_inl.h"
+
+#endif // mozilla_storage_Variant_h__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/Variant_inl.h firefox-trunk-41.0~a1~hg20150524r245419/storage/Variant_inl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/Variant_inl.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/Variant_inl.h	2015-05-25 20:42:53.000000000 +0000
@@ -0,0 +1,229 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Note: This file is included by Variant.h.
+ */
+
+#ifndef mozilla_storage_Variant_h__
+#error "Do not include this file directly!"
+#endif
+
+namespace mozilla {
+namespace storage {
+
+////////////////////////////////////////////////////////////////////////////////
+//// Variant_base
+
+inline NS_IMPL_ADDREF(Variant_base)
+inline NS_IMPL_RELEASE(Variant_base)
+inline NS_IMPL_QUERY_INTERFACE(
+  Variant_base,
+  nsIVariant
+)
+
+////////////////////////////////////////////////////////////////////////////////
+//// nsIVariant
+
+inline
+NS_IMETHODIMP
+Variant_base::GetDataType(uint16_t *_type)
+{
+  NS_ENSURE_ARG_POINTER(_type);
+  *_type = nsIDataType::VTYPE_VOID;
+  return NS_OK;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsInt32(int32_t *)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsInt64(int64_t *)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsDouble(double *)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsAUTF8String(nsACString &)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsAString(nsAString &)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsArray(uint16_t *,
+                         nsIID *,
+                         uint32_t *,
+                         void **)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsInt8(uint8_t *)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsInt16(int16_t *)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsUint8(uint8_t *)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsUint16(uint16_t *)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsUint32(uint32_t *)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsUint64(uint64_t *)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsFloat(float *)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsBool(bool *)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsChar(char *)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsWChar(char16_t *)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsID(nsID *)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsDOMString(nsAString &)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsString(char **)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsWString(char16_t **)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsISupports(nsISupports **)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsInterface(nsIID **,
+                             void **)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsACString(nsACString &)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsStringWithSize(uint32_t *,
+                                  char **)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsWStringWithSize(uint32_t *,
+                                   char16_t **)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+inline
+NS_IMETHODIMP
+Variant_base::GetAsJSVal(JS::MutableHandle<JS::Value>)
+{
+  return NS_ERROR_CANNOT_CONVERT_DATA;
+}
+
+} // namespace storage
+} // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/storage/variantToSQLiteT_impl.h firefox-trunk-41.0~a1~hg20150524r245419/storage/variantToSQLiteT_impl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/storage/variantToSQLiteT_impl.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/storage/variantToSQLiteT_impl.h	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,127 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// Note: we are already in the namepace mozilla::storage
+
+// Note 2: whoever #includes this file must provide implementations of
+// sqlite3_T_* prior.
+
+////////////////////////////////////////////////////////////////////////////////
+//// variantToSQLiteT Implementation
+
+template <typename T>
+int
+variantToSQLiteT(T aObj,
+                 nsIVariant *aValue)
+{
+  // Allow to return nullptr not wrapped to nsIVariant for speed.
+  if (!aValue)
+    return sqlite3_T_null(aObj);
+
+  uint16_t type;
+  (void)aValue->GetDataType(&type);
+  switch (type) {
+    case nsIDataType::VTYPE_INT8:
+    case nsIDataType::VTYPE_INT16:
+    case nsIDataType::VTYPE_INT32:
+    case nsIDataType::VTYPE_UINT8:
+    case nsIDataType::VTYPE_UINT16:
+    {
+      int32_t value;
+      nsresult rv = aValue->GetAsInt32(&value);
+      NS_ENSURE_SUCCESS(rv, SQLITE_MISMATCH);
+      return sqlite3_T_int(aObj, value);
+    }
+    case nsIDataType::VTYPE_UINT32: // Try to preserve full range
+    case nsIDataType::VTYPE_INT64:
+    // Data loss possible, but there is no unsigned types in SQLite
+    case nsIDataType::VTYPE_UINT64:
+    {
+      int64_t value;
+      nsresult rv = aValue->GetAsInt64(&value);
+      NS_ENSURE_SUCCESS(rv, SQLITE_MISMATCH);
+      return sqlite3_T_int64(aObj, value);
+    }
+    case nsIDataType::VTYPE_FLOAT:
+    case nsIDataType::VTYPE_DOUBLE:
+    {
+      double value;
+      nsresult rv = aValue->GetAsDouble(&value);
+      NS_ENSURE_SUCCESS(rv, SQLITE_MISMATCH);
+      return sqlite3_T_double(aObj, value);
+    }
+    case nsIDataType::VTYPE_BOOL:
+    {
+      bool value;
+      nsresult rv = aValue->GetAsBool(&value);
+      NS_ENSURE_SUCCESS(rv, SQLITE_MISMATCH);
+      return sqlite3_T_int(aObj, value ? 1 : 0);
+    }
+    case nsIDataType::VTYPE_CHAR:
+    case nsIDataType::VTYPE_CHAR_STR:
+    case nsIDataType::VTYPE_STRING_SIZE_IS:
+    case nsIDataType::VTYPE_UTF8STRING:
+    case nsIDataType::VTYPE_CSTRING:
+    {
+      nsAutoCString value;
+      // GetAsAUTF8String should never perform conversion when coming from
+      // 8-bit string types, and thus can accept strings with arbitrary encoding
+      // (including UTF8 and ASCII).
+      nsresult rv = aValue->GetAsAUTF8String(value);
+      NS_ENSURE_SUCCESS(rv, SQLITE_MISMATCH);
+      return sqlite3_T_text(aObj, value);
+    }
+    case nsIDataType::VTYPE_WCHAR:
+    case nsIDataType::VTYPE_DOMSTRING:
+    case nsIDataType::VTYPE_WCHAR_STR:
+    case nsIDataType::VTYPE_WSTRING_SIZE_IS:
+    case nsIDataType::VTYPE_ASTRING:
+    {
+      nsAutoString value;
+      // GetAsAString does proper conversion to UCS2 from all string-like types.
+      // It can be used universally without problems (unless someone implements
+      // their own variant, but that's their problem).
+      nsresult rv = aValue->GetAsAString(value);
+      NS_ENSURE_SUCCESS(rv, SQLITE_MISMATCH);
+      return sqlite3_T_text16(aObj, value);
+    }
+    case nsIDataType::VTYPE_VOID:
+    case nsIDataType::VTYPE_EMPTY:
+    case nsIDataType::VTYPE_EMPTY_ARRAY:
+      return sqlite3_T_null(aObj);
+    case nsIDataType::VTYPE_ARRAY:
+    {
+      uint16_t type;
+      nsIID iid;
+      uint32_t count;
+      void *data;
+      nsresult rv = aValue->GetAsArray(&type, &iid, &count, &data);
+      NS_ENSURE_SUCCESS(rv, SQLITE_MISMATCH);
+
+      // Check to make sure it's a supported type.
+      NS_ASSERTION(type == nsIDataType::VTYPE_UINT8,
+                   "Invalid type passed!  You may leak!");
+      if (type != nsIDataType::VTYPE_UINT8) {
+        // Technically this could leak with certain data types, but somebody was
+        // being stupid passing us this anyway.
+        free(data);
+        return SQLITE_MISMATCH;
+      }
+
+      // Finally do our thing.  The function should free the array accordingly!
+      int rc = sqlite3_T_blob(aObj, data, count);
+      return rc;
+    }
+    // Maybe, it'll be possible to convert these
+    // in future too.
+    case nsIDataType::VTYPE_ID:
+    case nsIDataType::VTYPE_INTERFACE:
+    case nsIDataType::VTYPE_INTERFACE_IS:
+    default:
+      return SQLITE_MISMATCH;
+  }
+  return SQLITE_OK;
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/b2g-build/Dockerfile firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/b2g-build/Dockerfile
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/b2g-build/Dockerfile	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/b2g-build/Dockerfile	2015-05-25 20:42:54.000000000 +0000
@@ -8,6 +8,8 @@
   yum makecache && \
   yum install -y \
   # From Building B2G docs
+  # cmake \
+  # cmake: is disabled intentionally to work around: bug 1141417
   GConf2-devel \
   alsa-lib-devel \
   autoconf213 \
@@ -15,22 +17,21 @@
   bison \
   bzip2 \
   ccache \
-  # cmake: is disabled intentionally to work around: bug 1141417
-  # cmake \
   curl \
   curl-devel \
   dbus-devel \
   dbus-glib-devel \
   dbus-glib-devel \
   dbus-python \
+  expat-devel \
   file \
   flex \
   gawk \
   gcc473_0moz1 \
+  gettext-devel \
   glibc-devel \
   glibc-devel.i686 \
   glibc-static \
-  glibc-static \
   gstreamer-devel \
   gstreamer-plugins-base-devel \
   gtk2-devel \
@@ -48,7 +49,6 @@
   make \
   mesa-libGL-devel \
   mesa-libGL-devel.i686 \
-  mozilla-git \
   mozilla-python27 \
   mozilla-python27-mercurial \
   mpfr-devel.x86_64 \
@@ -56,9 +56,11 @@
   ncurses:-devel \
   openssh-clients \
   openssl-devel \
+  openssl-devel \
   patch \
   perl-DBI \
   perl-Digest-SHA \
+  perl-ExtUtils-MakeMaker \
   pulseaudio-libs-devel \
   readline-devel.i686 \
   rsync \
@@ -99,6 +101,14 @@
 # Terrible symlink hacks so cc points to the gcc version we intend to use...
 RUN ls -lah /tools/gcc-4.7.3-0moz1/bin && ln -s /tools/gcc-4.7.3-0moz1/bin/gcc /tools/gcc-4.7.3-0moz1/bin/cc
 
+# Terrible Hack to correctly install git-2.4.1
+RUN mkdir -p /tmp/git && cd /tmp/git && \
+    curl -L https://s3-us-west-2.amazonaws.com/test-caching/git-2.4.1.tar.gz | tar -xz && \
+    cd git* && \
+    make prefix=/usr/local/ all -j10 && \
+    make prefix=/usr/local/ install && \
+    rm -Rf /tmp/git
+
 # Install node from node's own dist...
 ENV NODE_VERSION v0.10.36
 RUN cd /usr/local/ && \
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/b2g-build/VERSION firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/b2g-build/VERSION
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/b2g-build/VERSION	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/b2g-build/VERSION	2015-05-25 20:42:54.000000000 +0000
@@ -1 +1 @@
-0.2.7
+0.2.8
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/builder/Dockerfile firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/builder/Dockerfile
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/builder/Dockerfile	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/builder/Dockerfile	2015-05-25 20:42:54.000000000 +0000
@@ -1,4 +1,4 @@
-FROM          quay.io/mozilla/b2g-build:0.2.7
+FROM          quay.io/mozilla/b2g-build:0.2.8
 MAINTAINER    Dustin J. Mitchell <dustin@mozilla.com>
 
 ENV PYTHONPATH /tools/tools/lib/python:$PYTHONPATH
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/builder/REGISTRY firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/builder/REGISTRY
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/builder/REGISTRY	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/builder/REGISTRY	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1 @@
+taskcluster
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/builder/VERSION firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/builder/VERSION
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/builder/VERSION	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/builder/VERSION	2015-05-25 20:42:54.000000000 +0000
@@ -1 +1 @@
-0.5.4
+0.5.5
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/desktop-build/bin/build.sh firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/desktop-build/bin/build.sh
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/desktop-build/bin/build.sh	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/desktop-build/bin/build.sh	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,151 @@
+#! /bin/bash -vex
+
+set -v -x -e
+
+# Inputs, with defaults
+
+: MOZHARNESS_SCRIPT             ${MOZHARNESS_SCRIPT}
+: MOZHARNESS_CONFIG             ${MOZHARNESS_CONFIG}
+
+: GECKO_BASE_REPOSITORY         ${GECKO_BASE_REPOSITORY:=https://hg.mozilla.org/mozilla-central}
+: GECKO_HEAD_REPOSITORY         ${GECKO_HEAD_REPOSITORY:=https://hg.mozilla.org/mozilla-central}
+: GECKO_REV                     ${GECKO_REV:=default}
+
+: MOZHARNESS_BASE_REPOSITORY    ${MOZHARNESS_BASE_REPOSITORY:=https://hg.mozilla.org/build/mozharness}
+: MOZHARNESS_HEAD_REPOSITORY    ${MOZHARNESS_HEAD_REPOSITORY:=https://hg.mozilla.org/build/mozharness}
+: MOZHARNESS_REV                ${MOZHARNESS_REV:=production}
+
+: TOOLS_BASE_REPOSITORY         ${TOOLS_BASE_REPOSITORY:=https://hg.mozilla.org/build/tools}
+: TOOLS_HEAD_REPOSITORY         ${TOOLS_HEAD_REPOSITORY:=https://hg.mozilla.org/build/tools}
+: TOOLS_REV                     ${TOOLS_REV:=default}
+
+: TOOLTOOL_CACHE                ${TOOLTOOL_CACHE:=/home/worker/tooltool-cache}
+
+: RELENGAPI_TOKEN               ${RELENGAPI_TOKEN+HIDDEN}
+
+: NEED_XVFB                     ${NEED_XVFB:=false}
+
+: MH_CUSTOM_BUILD_VARIANT_CFG   ${MH_CUSTOM_BUILD_VARIANT_CFG}
+: MH_BRANCH                     ${MH_BRANCH:=mozilla-central}
+: MH_BUILD_POOL                 ${MH_BUILD_POOL:=staging}
+
+: MOZ_SIGNING_SERVERS           ${MOZ_SIGNING_SERVERS}
+: MOZ_SIGN_CMD                  ${MOZ_SIGN_CMD}
+
+: WORKSPACE                     ${WORKSPACE:=/home/worker/workspace}
+
+# buildbot
+export CCACHE_COMPRESS=1
+export CCACHE_DIR=/builds/ccache
+export CCACHE_HASHDIR=
+export CCACHE_UMASK=002
+
+export MOZ_AUTOMATION=1
+export MOZ_CRASHREPORTER_NO_REPORT=1
+export MOZ_OBJDIR=obj-firefox
+export MOZ_SYMBOLS_EXTRA_BUILDID=linux64
+export POST_SYMBOL_UPLOAD_CMD=/usr/local/bin/post-symbol-upload.py
+export TINDERBOX_OUTPUT=1
+
+# Ensure that in tree libraries can be found
+export LIBRARY_PATH=$LIBRARY_PATH:$WORKSPACE/src/obj-firefox:$WORKSPACE/src/gcc/lib64
+
+# test required parameters are supplied
+if [[ -z ${MOZHARNESS_SCRIPT} ]]; then exit 1; fi
+if [[ -z ${MOZHARNESS_CONFIG} ]]; then exit 1; fi
+
+cleanup() {
+    [ -n "$xvfb_pid" ] && kill $xvfb_pid
+}
+trap cleanup EXIT INT
+
+# check out mozharness
+tc-vcs checkout mozharness $MOZHARNESS_BASE_REPOSITORY $MOZHARNESS_HEAD_REPOSITORY $MOZHARNESS_REV
+
+# check out tools where mozharness expects it to be ($PWD/build/tools and $WORKSPACE/build/tools)
+tc-vcs checkout $WORKSPACE/build/tools $TOOLS_BASE_REPOSITORY $TOOLS_HEAD_REPOSITORY $TOOLS_REV
+if [ ! -d build ]; then
+    mkdir -p build
+    ln -s $WORKSPACE/build/tools build/tools
+fi
+
+# and check out mozilla-central where mozharness will use it as a cache (/builds/hg-shared)
+tc-vcs checkout /builds/hg-shared/mozilla-central $GECKO_BASE_REPOSITORY $GECKO_HEAD_REPOSITORY $GECKO_REV
+
+# run mozharness in XVfb, if necessary; this is an array to maintain the quoting in the -s argument
+if $NEED_XVFB; then
+    # Some mozharness scripts set DISPLAY=:2
+    Xvfb :2 -screen 0 1024x768x24 &
+    export DISPLAY=:2
+    xvfb_pid=$!
+    # Only error code 255 matters, because it signifies that no
+    # display could be opened. As long as we can open the display
+    # tests should work. We'll retry a few times with a sleep before
+    # failing.
+    retry_count=0
+    max_retries=2
+    xvfb_test=0
+    until [ $retry_count -gt $max_retries ]; do
+        xvinfo || xvfb_test=$?
+        if [ $xvfb_test != 255 ]; then
+            retry_count=$(($max_retries + 1))
+        else
+            retry_count=$(($retry_count + 1))
+            echo "Failed to start Xvfb, retry: $retry_count"
+            sleep 2
+        fi done
+    if [ $xvfb_test == 255 ]; then exit 255; fi
+fi
+
+# set up mozharness configuration, via command line, env, etc.
+
+debug_flag=""
+if [ 0$DEBUG -ne 0 ]; then
+  debug_flag='--debug'
+fi
+
+custom_build_variant_cfg_flag=""
+if [ -n "${MH_CUSTOM_BUILD_VARIANT_CFG}" ]; then
+    custom_build_variant_cfg_flag="--custom-build-variant-cfg=${MH_CUSTOM_BUILD_VARIANT_CFG}"
+fi
+
+set +x
+# mozharness scripts look for the relengapi token at this location, so put it there,
+# if specified
+if [ -n "${RELENGAPI_TOKEN}" ]; then
+    echo 'Storing $RELENGAPI_TOKEN in /builds/relengapi.tok'
+    echo ${RELENGAPI_TOKEN} > /builds/relengapi.tok
+    # unset it so that mozharness doesn't "helpfully" log it
+    unset RELENGAPI_TOKEN
+fi
+set -x
+
+# $TOOLTOOL_CACHE bypasses mozharness completely and is read by tooltool_wrapper.sh to set the
+# cache.  However, only some mozharness scripts use tooltool_wrapper.sh, so this may not be
+# entirely effective.
+export TOOLTOOL_CACHE
+
+# support multiple, space delimited, config files
+config_cmds=""
+for cfg in $MOZHARNESS_CONFIG; do
+  config_cmds="${config_cmds} --config ${cfg}"
+done
+
+./${MOZHARNESS_SCRIPT} ${config_cmds} \
+  $debug_flag \
+  $custom_build_variant_cfg_flag \
+  --disable-mock \
+  --no-setup-mock \
+  --no-clone-tools \
+  --no-clobber \
+  --no-update \
+  --log-level=debug \
+  --work-dir=$WORKSPACE/build \
+  --no-action=generate-build-stats \
+  --branch=${MH_BRANCH} \
+  --build-pool=${MH_BUILD_POOL}
+
+# if mozharness has created an "upload" directory, copy all of that into artifacts
+if [ -d $WORKSPACE/build/upload ]; then
+    cp -r $WORKSPACE/build/upload/* $HOME/artifacts/
+fi
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/desktop-build/buildprops.json firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/desktop-build/buildprops.json
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/desktop-build/buildprops.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/desktop-build/buildprops.json	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,9 @@
+{
+  "properties": {
+    "buildername": ""
+  },
+  "sourcestamp": {
+    "changes": []
+  },
+  "comments": "TaskCluster Job"
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/desktop-build/Dockerfile firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/desktop-build/Dockerfile
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/desktop-build/Dockerfile	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/desktop-build/Dockerfile	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,34 @@
+FROM          quay.io/mozilla/ubuntu-build:0.0.1
+MAINTAINER    Morgan Reece Phillips <winter2718@gmail.com>
+
+# Add build scripts; these are the entry points from the taskcluster worker, and
+# operate on environment variables
+ADD             bin /home/worker/bin
+RUN             chmod +x /home/worker/bin/*
+
+# Add custom mozharness configs
+ADD             configs /home/worker/configs
+
+## COMPILER HACKS
+
+# So that the compiler can find installed libs
+ENV           LIBRARY_PATH  /usr/lib/x86_64-linux-gnu:$LIBRARY_PATH
+
+# a.out.h needs to exist one directory lower, or the compiler will not find it
+RUN ln -s /usr/include/linux/a.out.h /usr/include/a.out.h
+
+# Without this, zlib.h can't find zconf.h, so hey, symlinks to the rescue, right?
+RUN ln -s /usr/include/x86_64-linux-gnu/zconf.h /usr/include/zconf.h
+
+# Stubbed out credentials, which will force the upload step to be skipped.
+# Note that this needs to be in the parent of the workspace directory and in
+# the directory where mozharness is run (not its --work-dir)
+ADD           oauth.txt /home/worker/
+
+# stubbed out buildprops, which keeps mozharness from choking
+# Note that this needs to be in the parent of the workspace directory and in
+# the directory where mozharness is run (not its --work-dir)
+ADD           buildprops.json /home/worker/
+
+# Set a default command useful for debugging
+CMD ["/bin/bash", "--login"]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/desktop-build/oauth.txt firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/desktop-build/oauth.txt
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/desktop-build/oauth.txt	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/desktop-build/oauth.txt	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,2 @@
+taskcluster_clientId = None
+taskcluster_accessToken = None
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/desktop-build/VERSION firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/desktop-build/VERSION
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/desktop-build/VERSION	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/desktop-build/VERSION	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1 @@
+0.0.7
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/phone-builder/build.sh firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/phone-builder/build.sh
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/phone-builder/build.sh	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/phone-builder/build.sh	2015-05-25 20:42:54.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/bash -e
 
-while getopts "t:i:k:" arg; do
+while getopts "t:i:k:s:" arg; do
   case $arg in
     t)
       TAG=$OPTARG
@@ -11,6 +11,9 @@
     k)
       SECRET_KEY=$OPTARG
       ;;
+    s)
+      SOCORRO_TOKEN=$OPTARG
+      ;;
   esac
 done
 
@@ -19,12 +22,16 @@
 test $TAG
 test $KEY_ID
 test $SECRET_KEY
+test $SOCORRO_TOKEN
 
 (echo '[default]'
 echo "aws_access_key_id = $KEY_ID"
 echo "aws_secret_access_key = $SECRET_KEY") > config
 
+echo $SOCORRO_TOKEN > socorro.token
+
 docker build -t $TAG .
 rm -f config
+rm -f socorro.token
 
 popd
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/phone-builder/Dockerfile firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/phone-builder/Dockerfile
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/phone-builder/Dockerfile	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/phone-builder/Dockerfile	2015-05-25 20:42:54.000000000 +0000
@@ -1,9 +1,12 @@
-FROM          quay.io/mozilla/builder:0.5.4
+FROM          quay.io/mozilla/builder:0.5.5
 MAINTAINER    Wander Lairson Costa <wcosta@mozilla.com>
 
+ENV           SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE /home/worker/socorro.token
+
 # Add utilities and configuration
 ADD           bin                   /home/worker/bin
 ADD           config                /home/worker/.aws/config
+ADD           socorro.token         /home/worker/socorro.token
 
 RUN           yum install -y bc lzop
 RUN           pip install awscli
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/phone-builder/VERSION firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/phone-builder/VERSION
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/phone-builder/VERSION	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/phone-builder/VERSION	2015-05-25 20:42:54.000000000 +0000
@@ -1 +1 @@
-0.0.13
+0.0.14
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/tester/bin/entrypoint firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/tester/bin/entrypoint
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/tester/bin/entrypoint	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/tester/bin/entrypoint	2015-05-25 20:42:54.000000000 +0000
@@ -10,9 +10,10 @@
 
 # XXX: Note that all tests could be faster at smaller bit depth
 Xvfb :0 -nolisten tcp -screen 0 1600x1200x24 2>/dev/null &
-
 export DISPLAY=:0
 
+pulseaudio --start
+
 # First check if the mozharness directory is available. This is intended to be
 # used locally in development to test mozharness changes:
 #
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/tester/Dockerfile firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/tester/Dockerfile
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/tester/Dockerfile	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/tester/Dockerfile	2015-05-25 20:42:54.000000000 +0000
@@ -12,17 +12,21 @@
 ADD            https://raw.githubusercontent.com/taskcluster/buildbot-step/master/buildbot_step /home/worker/bin/buildbot_step
 COPY           tc-vcs-config.yml /etc/taskcluster-vcs.yml
 
-
 # Run test setup script
 RUN chmod u+x /home/worker/bin/buildbot_step
 RUN chmod u+x /usr/local/bin/linux64-minidump_stackwalk
 RUN apt-get install -y python-pip && pip install virtualenv;
 RUN mkdir Documents; mkdir Pictures; mkdir Music; mkdir Videos; mkdir artifacts
-RUN chown -R worker:worker /home/worker/* /home/worker/.*
 RUN npm install -g taskcluster-vcs@2.3.4
+RUN npm install -g taskcluster-npm-cache@1.1.12
 RUN rm -Rf .cache && mkdir -p .cache
 ENV PATH $PATH:/home/worker/bin
 
+# Remove once running under 'worker' user.  This is necessary for pulseaudio to start
+# XXX: change this back to worker:worker once permissions issues are resolved
+RUN            chown -R root:root /home/worker
+
+
 # TODO Re-enable worker when bug 1093833 lands
 #USER          worker
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/tester/mozharness_configs/linux_mulet_config.py firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/tester/mozharness_configs/linux_mulet_config.py
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/tester/mozharness_configs/linux_mulet_config.py	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/tester/mozharness_configs/linux_mulet_config.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-config = {
-    # Override buildbot specific exes for python and virtualenv
-    "exes": {},
-    # Use taskcluster specified config until Bug 1099057 lands
-    "in_tree_config": "config/mozharness/taskcluster_linux_config.py"
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/tester/REGISTRY firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/tester/REGISTRY
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/tester/REGISTRY	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/tester/REGISTRY	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1 @@
+taskcluster
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/tester/VERSION firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/tester/VERSION
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/tester/VERSION	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/tester/VERSION	2015-05-25 20:42:54.000000000 +0000
@@ -1 +1 @@
-0.2.14
+0.3.3
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/tester-device/REGISTRY firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/tester-device/REGISTRY
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/tester-device/REGISTRY	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/tester-device/REGISTRY	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1 @@
+taskclusterprivate
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/ubuntu-build/build-setup.sh firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/ubuntu-build/build-setup.sh
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/ubuntu-build/build-setup.sh	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/ubuntu-build/build-setup.sh	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+set -ve
+
+test `whoami` == 'root';
+
+# run mozbootstrap to install build specific dependencies
+wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py
+python bootstrap.py --application-choice=desktop --no-interactive
+
+# note that TC will replace workspace with a cache mount; there's no sense
+# creating anything inside there
+mkdir -p /home/worker/workspace
+chown worker:worker /home/worker/workspace
+
+# /builds is *not* replaced with a mount in the docker container. The worker
+# user writes to lots of subdirectories, though, so it's owned by that user
+mkdir -p /builds
+chown worker:worker /builds
+
+# install tooltool directly from github where tooltool_wrapper.sh et al. expect
+# to find it
+wget -O /builds/tooltool.py https://raw.githubusercontent.com/mozilla/build-tooltool/master/tooltool.py
+chmod +x /builds/tooltool.py
+
+# check out the tools repo; this will be updated as necessary in each container
+# but it changes infrequently so it makes sense to cache in place
+tc-vcs checkout /builds/tools https://hg.mozilla.org/build/tools
+chown -R worker:worker /builds/tools
+
+rm /tmp/build-setup.sh
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/ubuntu-build/Dockerfile firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/ubuntu-build/Dockerfile
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/ubuntu-build/Dockerfile	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/ubuntu-build/Dockerfile	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,36 @@
+FROM          ubuntu:14.04
+MAINTAINER    Morgan Reece Phillips <winter2718@gmail.com>
+
+### add worker user and setup its workspace
+RUN useradd -d /home/worker -s /bin/bash -m worker
+
+# install non-build specific dependencies in a single layer
+ADD           system-setup.sh   /tmp/system-setup.sh
+RUN           bash /tmp/system-setup.sh
+
+# configure git and install tc-vcs
+RUN git config --global user.email "nobody@mozilla.com" && \
+    git config --global user.name "mozilla"
+RUN npm install -g taskcluster-vcs@2.3.5 || true
+
+# Ensure that build specific dependencies live in a single layer
+ADD           build-setup.sh   /tmp/build-setup.sh
+RUN           bash /tmp/build-setup.sh
+
+# Builds need the share module enabled
+ADD           hgrc /home/worker/.hgrc
+
+# Set variable normally configured at login, by the shells parent process, these
+# are taken from GNU su manual
+ENV           HOME          /home/worker
+ENV           SHELL         /bin/bash
+ENV           USER          worker
+ENV           LOGNAME       worker
+ENV           HOSTNAME      taskcluster-worker
+
+# Declare default working folder
+RUN chown -R worker:worker /home/worker/* /home/worker/.*
+WORKDIR       /home/worker
+
+# Set a default command useful for debugging
+CMD ["/bin/bash", "--login"]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/ubuntu-build/hgrc firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/ubuntu-build/hgrc
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/ubuntu-build/hgrc	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/ubuntu-build/hgrc	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,2 @@
+[extensions]
+share =
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/ubuntu-build/system-setup.sh firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/ubuntu-build/system-setup.sh
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/ubuntu-build/system-setup.sh	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/ubuntu-build/system-setup.sh	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+set -ve
+
+test `whoami` == 'root';
+
+apt-get update -y
+apt-get install -y \
+    wget \
+    python g++-multilib \
+    git\
+    nodejs-legacy \
+    npm \
+    curl \
+    x11-utils \
+    python-virtualenv
+
+# see https://bugzilla.mozilla.org/show_bug.cgi?id=1161075
+apt-get install -y openjdk-7-jdk
+
+# the Android SDK contains some 32-bit binaries (aapt among them) that require this
+apt-get install -y lib32z1
+
+rm /tmp/system-setup.sh
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/ubuntu-build/VERSION firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/ubuntu-build/VERSION
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/docker/ubuntu-build/VERSION	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/docker/ubuntu-build/VERSION	2015-05-25 20:42:54.000000000 +0000
@@ -0,0 +1 @@
+0.0.1
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/mach_commands.py firefox-trunk-41.0~a1~hg20150524r245419/testing/mach_commands.py
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/mach_commands.py	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/mach_commands.py	2015-05-25 20:42:54.000000000 +0000
@@ -289,6 +289,9 @@
 
         return 0 if result else 1
 
+def executable_name(name):
+    return name + '.exe' if sys.platform.startswith('win') else name
+
 @CommandProvider
 class CheckSpiderMonkeyCommand(MachCommandBase):
     @Command('check-spidermonkey', category='testing', description='Run SpiderMonkey tests (JavaScript engine).')
@@ -298,11 +301,7 @@
         import subprocess
         import sys
 
-        bin_suffix = ''
-        if sys.platform.startswith('win'):
-            bin_suffix = '.exe'
-
-        js = os.path.join(self.bindir, 'js%s' % bin_suffix)
+        js = os.path.join(self.bindir, executable_name('js'))
 
         print('Running jit-tests')
         jittest_cmd = [os.path.join(self.topsrcdir, 'js', 'src', 'jit-test', 'jit_test.py'),
@@ -318,7 +317,7 @@
         jstest_result = subprocess.call(jstest_cmd)
 
         print('running jsapi-tests')
-        jsapi_tests_cmd = [os.path.join(self.bindir, 'jsapi-tests%s' % bin_suffix)]
+        jsapi_tests_cmd = [os.path.join(self.bindir, executable_name('jsapi-tests'))]
         jsapi_tests_result = subprocess.call(jsapi_tests_cmd)
 
         print('running check-style')
@@ -328,3 +327,26 @@
         all_passed = jittest_result and jstest_result and jsapi_tests_result and check_style_result
 
         return all_passed
+
+@CommandProvider
+class JsapiTestsCommand(MachCommandBase):
+    @Command('jsapi-tests', category='testing', description='Run jsapi tests (JavaScript engine).')
+    @CommandArgument('test_name', nargs='?', metavar='N',
+        help='Test to run. Can be a prefix or omitted. If omitted, the entire ' \
+             'test suite is executed.')
+
+    def run_jsapitests(self, **params):
+        import subprocess
+
+        bin_suffix = ''
+        if sys.platform.startswith('win'):
+            bin_suffix = '.exe'
+
+        print('running jsapi-tests')
+        jsapi_tests_cmd = [os.path.join(self.bindir, executable_name('jsapi-tests'))]
+        if params['test_name']:
+            jsapi_tests_cmd.append(params['test_name'])
+
+        jsapi_tests_result = subprocess.call(jsapi_tests_cmd)
+
+        return jsapi_tests_result
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/client/marionette/b2g_update_test.py firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/client/marionette/b2g_update_test.py
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/client/marionette/b2g_update_test.py	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/client/marionette/b2g_update_test.py	2015-05-25 20:42:54.000000000 +0000
@@ -238,8 +238,7 @@
         self.print_status(status, os.path.basename(path))
 
         results = self.marionette.execute_async_script(data,
-                                                       script_args=[self.testvars],
-                                                       special_powers=True)
+                                                       script_args=[self.testvars])
         self.handle_results(path, stage, results)
 
     def handle_results(self, path, stage, results):
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/client/marionette/marionette_test.py firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/client/marionette/marionette_test.py
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/client/marionette/marionette_test.py	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/client/marionette/marionette_test.py	2015-05-25 20:42:54.000000000 +0000
@@ -502,6 +502,24 @@
             'iframe[src*="app://test-container.gaiamobile.org/index.html"]'
         ))
 
+    def setup_SpecialPowers_observer(self):
+        self.marionette.set_context("chrome")
+        self.marionette.execute_script("""
+            let SECURITY_PREF = "security.turn_off_all_security_so_that_viruses_can_take_over_this_computer";
+            Components.utils.import("resource://gre/modules/Services.jsm");
+            Services.prefs.setBoolPref(SECURITY_PREF, true);
+
+            if (!testUtils.hasOwnProperty("specialPowersObserver")) {
+              let loader = Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
+                .getService(Components.interfaces.mozIJSSubScriptLoader);
+              loader.loadSubScript("chrome://specialpowers/content/SpecialPowersObserver.js",
+                testUtils);
+              testUtils.specialPowersObserver = new testUtils.SpecialPowersObserver();
+              testUtils.specialPowersObserver.init();
+              testUtils.specialPowersObserver._loadFrameScript();
+            }
+            """)
+
     def run_js_test(self, filename, marionette=None):
         '''
         Run a JavaScript test file and collect its set of assertions
@@ -537,6 +555,23 @@
             context = context.group(3)
         else:
             context = 'content'
+
+        if 'SpecialPowers' in js:
+            self.setup_SpecialPowers_observer()
+
+            if context == 'content':
+                js = "var SpecialPowers = window.wrappedJSObject.SpecialPowers;\n" + js
+            else:
+                marionette.execute_script("""
+                if (typeof(SpecialPowers) == 'undefined') {
+                  let loader = Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
+                    .getService(Components.interfaces.mozIJSSubScriptLoader);
+                  loader.loadSubScript("chrome://specialpowers/content/specialpowersAPI.js");
+                  loader.loadSubScript("chrome://specialpowers/content/SpecialPowersObserverAPI.js");
+                  loader.loadSubScript("chrome://specialpowers/content/ChromePowers.js");
+                }
+                """)
+
         marionette.set_context(context)
 
         if context != 'chrome':
@@ -555,7 +590,6 @@
             results = marionette.execute_js_script(
                 js,
                 args,
-                special_powers=True,
                 inactivity_timeout=inactivity_timeout,
                 filename=os.path.basename(filename)
             )
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/client/marionette/tests/unit/test_getactiveframe_oop.py firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/client/marionette/tests/unit/test_getactiveframe_oop.py
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/client/marionette/tests/unit/test_getactiveframe_oop.py	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/client/marionette/tests/unit/test_getactiveframe_oop.py	2015-05-25 20:42:55.000000000 +0000
@@ -3,29 +3,31 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette import MarionetteTestCase
+from marionette_driver.by import By
 
 
 class TestGetActiveFrameOOP(MarionetteTestCase):
     def setUp(self):
         super(TestGetActiveFrameOOP, self).setUp()
-        self.oop_by_default = self.marionette.execute_script("""
-            try {
-              return SpecialPowers.getBoolPref('dom.ipc.browser_frames.oop_by_default');
-            }
-            catch(e) {}
-            """)
-        self.mozBrowserFramesEnabled = self.marionette.execute_script("""
-            try {
-              return SpecialPowers.getBoolPref('dom.mozBrowserFramesEnabled');
-            }
-            catch(e) {}
-            """)
-        self.marionette.execute_script("""
-            SpecialPowers.setBoolPref('dom.ipc.browser_frames.oop_by_default', true);
-            """)
-        self.marionette.execute_script("""
-            SpecialPowers.setBoolPref('dom.mozBrowserFramesEnabled', true);
-            """)
+        with self.marionette.using_context('chrome'):
+            self.oop_by_default = self.marionette.execute_script("""
+                try {
+                  return Services.prefs.getBoolPref('dom.ipc.browser_frames.oop_by_default');
+                }
+                catch(e) {}
+                """)
+            self.mozBrowserFramesEnabled = self.marionette.execute_script("""
+                try {
+                  return Services.prefs.getBoolPref('dom.mozBrowserFramesEnabled');
+                }
+                catch(e) {}
+                """)
+            self.marionette.execute_script("""
+                Services.prefs.setBoolPref('dom.ipc.browser_frames.oop_by_default', true);
+                """)
+            self.marionette.execute_script("""
+                Services.prefs.setBoolPref('dom.mozBrowserFramesEnabled', true);
+                """)
 
     def test_active_frame_oop(self):
         self.marionette.navigate(self.marionette.absolute_url("test.html"))
@@ -34,9 +36,9 @@
         # Create first OOP frame
         self.marionette.execute_script("""
             let iframe1 = document.createElement("iframe");
-            SpecialPowers.wrap(iframe1).mozbrowser = true;
-            SpecialPowers.wrap(iframe1).remote = true;
             iframe1.id = "remote_iframe1";
+            iframe1.setAttribute('remote', true);
+            iframe1.setAttribute('mozbrowser', true);
             iframe1.style.height = "100px";
             iframe1.style.width = "100%%";
             iframe1.src = "%s";
@@ -48,7 +50,8 @@
         self.assertTrue("test.html" in self.marionette.get_url())
 
         # Switch to iframe1, get active frame
-        self.marionette.switch_to_frame('remote_iframe1')
+        frame = self.marionette.find_element(By.ID, 'remote_iframe1')
+        self.marionette.switch_to_frame(frame)
         active_frame1 = self.marionette.get_active_frame()
         self.assertNotEqual(active_frame1.id, None)
 
@@ -61,8 +64,8 @@
         self.marionette.switch_to_frame()
         self.marionette.execute_script("""
             let iframe2 = document.createElement("iframe");
-            SpecialPowers.wrap(iframe2).mozbrowser = true;
-            SpecialPowers.wrap(iframe2).remote = true;
+            iframe2.setAttribute('mozbrowser', true);
+            iframe2.setAttribute('remote', true);
             iframe2.id = "remote_iframe2";
             iframe2.style.height = "100px";
             iframe2.style.width = "100%%";
@@ -71,7 +74,8 @@
             """ % self.marionette.absolute_url("test_oop_2.html"))
 
         # Switch to iframe2, get active frame
-        self.marionette.switch_to_frame('remote_iframe2')
+        frame2 = self.marionette.find_element(By.ID, 'remote_iframe2')
+        self.marionette.switch_to_frame(frame2)
         active_frame2 = self.marionette.get_active_frame()
         self.assertNotEqual(active_frame2.id, None)
 
@@ -92,19 +96,20 @@
         # print self.marionette.page_source
 
     def tearDown(self):
-        if self.oop_by_default is None:
-            self.marionette.execute_script("""
-                SpecialPowers.clearUserPref('dom.ipc.browser_frames.oop_by_default');
-                """)
-        else:
-            self.marionette.execute_script("""
-                SpecialPowers.setBoolPref('dom.ipc.browser_frames.oop_by_default', %s);
-                """ % 'true' if self.oop_by_default else 'false')
-        if self.mozBrowserFramesEnabled is None:
-            self.marionette.execute_script("""
-                SpecialPowers.clearUserPref('dom.mozBrowserFramesEnabled');
-                """)
-        else:
-            self.marionette.execute_script("""
-                SpecialPowers.setBoolPref('dom.mozBrowserFramesEnabled', %s);
-                """ % 'true' if self.mozBrowserFramesEnabled else 'false')
+        with self.marionette.using_context('chrome'):
+            if self.oop_by_default is None:
+                self.marionette.execute_script("""
+                    Services.prefs.clearUserPref('dom.ipc.browser_frames.oop_by_default');
+                    """)
+            else:
+                self.marionette.execute_script("""
+                    Services.prefs.setBoolPref('dom.ipc.browser_frames.oop_by_default', %s);
+                    """ % 'true' if self.oop_by_default else 'false')
+            if self.mozBrowserFramesEnabled is None:
+                self.marionette.execute_script("""
+                    Services.prefs.clearUserPref('dom.mozBrowserFramesEnabled');
+                    """)
+            else:
+                self.marionette.execute_script("""
+                    Services.prefs.setBoolPref('dom.mozBrowserFramesEnabled', %s);
+                    """ % 'true' if self.mozBrowserFramesEnabled else 'false')
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/client/marionette/tests/unit/test_import_script.py firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/client/marionette/tests/unit/test_import_script.py
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/client/marionette/tests/unit/test_import_script.py	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/client/marionette/tests/unit/test_import_script.py	2015-05-25 20:42:55.000000000 +0000
@@ -17,17 +17,17 @@
 
     def check_file_exists(self):
         return self.marionette.execute_script("""
-          let FileUtils = SpecialPowers.Cu.import("resource://gre/modules/FileUtils.jsm", {}).FileUtils;
+          let FileUtils = Components.utils.import("resource://gre/modules/FileUtils.jsm", {}).FileUtils;
           let importedScripts = FileUtils.getFile('TmpD', ['marionetteContentScripts']);
           return importedScripts.exists();
-        """, special_powers=True)
+        """, sandbox='system')
 
     def get_file_size(self):
         return self.marionette.execute_script("""
-          let FileUtils = SpecialPowers.Cu.import("resource://gre/modules/FileUtils.jsm", {}).FileUtils;
+          let FileUtils = Components.utils.import("resource://gre/modules/FileUtils.jsm", {}).FileUtils;
           let importedScripts = FileUtils.getFile('TmpD', ['marionetteContentScripts']);
           return importedScripts.fileSize;
-        """, special_powers=True)
+        """, sandbox='system')
 
     def test_import_script(self):
         js = os.path.abspath(os.path.join(__file__, os.path.pardir, "importscript.js"))
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/client/marionette/tests/unit/test_profile_management.py firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/client/marionette/tests/unit/test_profile_management.py
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/client/marionette/tests/unit/test_profile_management.py	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/client/marionette/tests/unit/test_profile_management.py	2015-05-25 20:42:55.000000000 +0000
@@ -10,46 +10,51 @@
     def setUp(self):
         MarionetteTestCase.setUp(self)
         self.marionette.enforce_gecko_prefs({"marionette.test.bool": True, "marionette.test.string": "testing", "marionette.test.int": 3})
+        self.marionette.set_context('chrome')
 
     def test_preferences_are_set(self):
-        bool_value = self.marionette.execute_script("return SpecialPowers.getBoolPref('marionette.test.bool');")
-        string_value = self.marionette.execute_script("return SpecialPowers.getCharPref('marionette.test.string');")
-        int_value = self.marionette.execute_script("return SpecialPowers.getIntPref('marionette.test.int');")
+        bool_value = self.marionette.execute_script("return Services.prefs.getBoolPref('marionette.test.bool');")
+        string_value = self.marionette.execute_script("return Services.prefs.getCharPref('marionette.test.string');")
+        int_value = self.marionette.execute_script("return Services.prefs.getIntPref('marionette.test.int');")
         self.assertTrue(bool_value)
         self.assertEqual(string_value, "testing")
         self.assertEqual(int_value, 3)
 
     def test_change_preset(self):
-        bool_value = self.marionette.execute_script("return SpecialPowers.getBoolPref('marionette.test.bool');")
+        bool_value = self.marionette.execute_script("return Services.prefs.getBoolPref('marionette.test.bool');")
         self.assertTrue(bool_value)
         self.marionette.enforce_gecko_prefs({"marionette.test.bool": False})
-        bool_value = self.marionette.execute_script("return SpecialPowers.getBoolPref('marionette.test.bool');")
+        self.marionette.set_context('chrome')
+        bool_value = self.marionette.execute_script("return Services.prefs.getBoolPref('marionette.test.bool');")
         self.assertFalse(bool_value)
 
     def test_clean_profile(self):
         self.marionette.restart(clean=True)
-        with self.assertRaisesRegexp(JavascriptException, "Error getting pref"):
-            bool_value = self.marionette.execute_script("return SpecialPowers.getBoolPref('marionette.test.bool');")
+        self.marionette.set_context('chrome')
+        with self.assertRaisesRegexp(JavascriptException, "NS_ERROR_UNEXPECTED"):
+            bool_value = self.marionette.execute_script("return Services.prefs.getBoolPref('marionette.test.bool');")
 
     def test_can_restart_the_browser(self):
         self.marionette.enforce_gecko_prefs({"marionette.test.restart": True})
         self.marionette.restart()
-        bool_value = self.marionette.execute_script("return SpecialPowers.getBoolPref('marionette.test.restart');")
+        self.marionette.set_context('chrome')
+        bool_value = self.marionette.execute_script("return Services.prefs.getBoolPref('marionette.test.restart');")
         self.assertTrue(bool_value)
 
     def test_in_app_restart_the_browser(self):
-        self.marionette.execute_script("SpecialPowers.setBoolPref('marionette.test.restart', true);")
+        self.marionette.execute_script("Services.prefs.setBoolPref('marionette.test.restart', true);")
 
         # A "soft" restart initiated inside the application should keep track of this pref.
         self.marionette.restart(in_app=True)
+        self.marionette.set_context('chrome')
         bool_value = self.marionette.execute_script("""
-          return SpecialPowers.getBoolPref('marionette.test.restart');
+          return Services.prefs.getBoolPref('marionette.test.restart');
         """)
         self.assertTrue(bool_value)
 
         bool_value = self.marionette.execute_script("""
-          SpecialPowers.setBoolPref('marionette.test.restart', false);
-          return SpecialPowers.getBoolPref('marionette.test.restart');
+          Services.prefs.setBoolPref('marionette.test.restart', false);
+          return Services.prefs.getBoolPref('marionette.test.restart');
         """)
         self.assertFalse(bool_value)
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/client/marionette/tests/unit/test_specialpowers.py firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/client/marionette/tests/unit/test_specialpowers.py
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/client/marionette/tests/unit/test_specialpowers.py	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/client/marionette/tests/unit/test_specialpowers.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
-from marionette import MarionetteTestCase
-
-
-class TestSpecialPowersContent(MarionetteTestCase):
-
-    testpref = "testing.marionette.contentcharpref"
-    testvalue = "blabla"
-
-    def test_prefs(self):
-        result = self.marionette.execute_script("""
-        SpecialPowers.setCharPref("%(pref)s", "%(value)s");
-        return SpecialPowers.getCharPref("%(pref)s")
-        """ % {'pref': self.testpref, 'value': self.testvalue}, special_powers=True);
-        self.assertEqual(result, self.testvalue)
-
-    def test_prefs_after_navigate(self):
-        test_html = self.marionette.absolute_url("test.html")
-        self.marionette.navigate(test_html)
-        self.test_prefs()
-
-class TestSpecialPowersChrome(TestSpecialPowersContent):
-
-    testpref = "testing.marionette.chromecharpref"
-    testvalue = "blabla"
-
-    def setUp(self):
-        super(TestSpecialPowersChrome, self).setUp()
-        self.marionette.set_context("chrome")
-
-    def test_prefs_after_navigate(self):
-        pass
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/client/marionette/tests/unit/test_switch_remote_frame.py firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/client/marionette/tests/unit/test_switch_remote_frame.py
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/client/marionette/tests/unit/test_switch_remote_frame.py	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/client/marionette/tests/unit/test_switch_remote_frame.py	2015-05-25 20:42:55.000000000 +0000
@@ -8,22 +8,24 @@
 class TestSwitchRemoteFrame(MarionetteTestCase):
     def setUp(self):
         super(TestSwitchRemoteFrame, self).setUp()
-        self.oop_by_default = self.marionette.execute_script("""
-            try {
-              return SpecialPowers.getBoolPref('dom.ipc.browser_frames.oop_by_default');
-            }
-            catch(e) {}
-            """)
-        self.mozBrowserFramesEnabled = self.marionette.execute_script("""
-            try {
-              return SpecialPowers.getBoolPref('dom.mozBrowserFramesEnabled');
-            }
-            catch(e) {}
-            """)
-        self.marionette.execute_async_script(
-            'SpecialPowers.pushPrefEnv({"set": [["dom.ipc.browser_frames.oop_by_default", true], ["dom.mozBrowserFramesEnabled", true]]}, marionetteScriptFinished);')
-
         with self.marionette.using_context('chrome'):
+            self.oop_by_default = self.marionette.execute_script("""
+                try {
+                  return Services.prefs.getBoolPref('dom.ipc.browser_frames.oop_by_default');
+                }
+                catch(e) {}
+                """)
+            self.mozBrowserFramesEnabled = self.marionette.execute_script("""
+                try {
+                  return Services.prefs.getBoolPref('dom.mozBrowserFramesEnabled');
+                }
+                catch(e) {}
+                """)
+            self.marionette.execute_script("""
+                Services.prefs.setBoolPref("dom.ipc.browser_frames.oop_by_default", true);
+                Services.prefs.setBoolPref("dom.mozBrowserFramesEnabled", true);
+                """)
+
             self.multi_process_browser = self.marionette.execute_script("""
                 try {
                   return Services.appinfo.browserTabsRemoteAutostart;
@@ -31,13 +33,20 @@
                   return false;
                 }""")
 
+    def is_main_process(self):
+        return self.marionette.execute_script("""
+            return Components.classes["@mozilla.org/xre/app-info;1"].
+                getService(Components.interfaces.nsIXULRuntime).
+                processType == Components.interfaces.nsIXULRuntime.PROCESS_TYPE_DEFAULT;
+        """, sandbox='system')
+
     def test_remote_frame(self):
         self.marionette.navigate(self.marionette.absolute_url("test.html"))
         self.marionette.push_permission('browser', True)
         self.marionette.execute_script("""
             let iframe = document.createElement("iframe");
-            SpecialPowers.wrap(iframe).mozbrowser = true;
-            SpecialPowers.wrap(iframe).remote = true;
+            iframe.setAttribute('mozbrowser', true);
+            iframe.setAttribute('remote', true);
             iframe.id = "remote_iframe";
             iframe.style.height = "100px";
             iframe.style.width = "100%%";
@@ -46,9 +55,7 @@
             """ % self.marionette.absolute_url("test.html"))
         remote_iframe = self.marionette.find_element("id", "remote_iframe")
         self.marionette.switch_to_frame(remote_iframe)
-        main_process = self.marionette.execute_script("""
-            return SpecialPowers.isMainProcess();
-            """)
+        main_process = self.is_main_process()
         self.assertFalse(main_process)
 
     def test_remote_frame_revisit(self):
@@ -57,8 +64,8 @@
         self.marionette.push_permission('browser', True)
         self.marionette.execute_script("""
             let iframe = document.createElement("iframe");
-            SpecialPowers.wrap(iframe).mozbrowser = true;
-            SpecialPowers.wrap(iframe).remote = true;
+            iframe.setAttribute('mozbrowser', true);
+            iframe.setAttribute('remote', true);
             iframe.id = "remote_iframe";
             iframe.style.height = "100px";
             iframe.style.width = "100%%";
@@ -67,21 +74,15 @@
             """ % self.marionette.absolute_url("test.html"))
         self.marionette.switch_to_frame(self.marionette.find_element("id",
                                                                      "remote_iframe"))
-        main_process = self.marionette.execute_script("""
-            return SpecialPowers.isMainProcess();
-            """)
+        main_process = self.is_main_process()
         self.assertFalse(main_process)
         self.marionette.switch_to_frame()
-        main_process = self.marionette.execute_script("""
-            return SpecialPowers.isMainProcess();
-            """)
+        main_process = self.is_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("""
-            return SpecialPowers.isMainProcess();
-            """)
+        main_process = self.is_main_process()
         self.assertFalse(main_process)
 
     def test_we_can_switch_to_a_remote_frame_by_index(self):
@@ -90,8 +91,8 @@
         self.marionette.push_permission('browser', True)
         self.marionette.execute_script("""
             let iframe = document.createElement("iframe");
-            SpecialPowers.wrap(iframe).mozbrowser = true;
-            SpecialPowers.wrap(iframe).remote = true;
+            iframe.setAttribute('mozbrowser', true);
+            iframe.setAttribute('remote', true);
             iframe.id = "remote_iframe";
             iframe.style.height = "100px";
             iframe.style.width = "100%%";
@@ -99,36 +100,31 @@
             document.body.appendChild(iframe);
             """ % self.marionette.absolute_url("test.html"))
         self.marionette.switch_to_frame(0)
-        main_process = self.marionette.execute_script("""
-            return SpecialPowers.isMainProcess();
-            """)
+        main_process = self.is_main_process()
         self.assertFalse(main_process)
         self.marionette.switch_to_frame()
-        main_process = self.marionette.execute_script("""
-            return SpecialPowers.isMainProcess();
-            """)
+        main_process = self.is_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();
-            """)
+        main_process = self.is_main_process()
         self.assertFalse(main_process)
 
     def tearDown(self):
-        if self.oop_by_default is None:
-            self.marionette.execute_script("""
-                SpecialPowers.clearUserPref('dom.ipc.browser_frames.oop_by_default');
-                """)
-        else:
-             self.marionette.execute_async_script(
-            'SpecialPowers.pushPrefEnv({"set": [["dom.ipc.browser_frames.oop_by_default", %s]]}, marionetteScriptFinished);' %
-            ('true' if self.oop_by_default else 'false'))
-        if self.mozBrowserFramesEnabled is None:
-            self.marionette.execute_script("""
-                SpecialPowers.clearUserPref('dom.mozBrowserFramesEnabled');
-                """)
-        else:
-            self.marionette.execute_async_script(
-            'SpecialPowers.pushPrefEnv({"set": [["dom.mozBrowserFramesEnabled", %s]]}, marionetteScriptFinished);' %
-            ('true' if self.mozBrowserFramesEnabled else 'false'))
+        with self.marionette.using_context('chrome'):
+            if self.oop_by_default is None:
+                self.marionette.execute_script("""
+                    Services.prefs.clearUserPref('dom.ipc.browser_frames.oop_by_default');
+                    """)
+            else:
+                self.marionette.execute_async_script(
+                    "Services.prefs.setBoolPref('dom.ipc.browser_frames.oop_by_default', %s);" %
+                    ('true' if self.oop_by_default else 'false'))
+            if self.mozBrowserFramesEnabled is None:
+                self.marionette.execute_script("""
+                    Services.prefs.clearUserPref('dom.mozBrowserFramesEnabled');
+                    """)
+            else:
+                self.marionette.execute_async_script(
+                    "Services.prefs.setBoolPref('dom.mozBrowserFramesEnabled', %s);" %
+                    ('true' if self.mozBrowserFramesEnabled else 'false'))
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/client/marionette/tests/unit/test_using_permissions.py firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/client/marionette/tests/unit/test_using_permissions.py
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/client/marionette/tests/unit/test_using_permissions.py	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/client/marionette/tests/unit/test_using_permissions.py	2015-05-25 20:42:55.000000000 +0000
@@ -0,0 +1,41 @@
+from marionette import MarionetteTestCase
+from marionette_driver.errors import JavascriptException
+
+
+class TestUsingPermssions(MarionetteTestCase):
+
+    def test_using_permissions(self):
+        # Test that multiple permissions can be set with 'using_permissions',
+        # and that they are set correctly and unset correctly after leaving
+        # the context manager.
+        original_perm = self.marionette.get_permission('systemXHR')
+        original_alarm = self.marionette.get_permission('alarms')
+        new_perm = True if original_perm != 1 else False
+        new_alarm = True if original_alarm != 1 else False
+        with self.marionette.using_permissions({'systemXHR': new_perm,
+                                                'alarms': new_alarm}):
+            now_perm = self.marionette.get_permission('systemXHR')
+            now_alarm = self.marionette.get_permission('alarms')
+            self.assertEquals(new_perm, now_perm)
+            self.assertNotEquals(now_perm, original_perm)
+            self.assertEquals(new_alarm, now_alarm)
+            self.assertNotEquals(now_alarm, original_alarm)
+        self.assertEquals(original_perm,
+                          self.marionette.get_permission('systemXHR'))
+        self.assertEquals(original_alarm,
+                          self.marionette.get_permission('alarms'))
+
+    def test_exception_using_permissions(self):
+        # Test that throwing an exception inside the context manager doesn't
+        # prevent the permissions from being restored at context manager exit.
+        original_perm = self.marionette.get_permission('systemXHR')
+        new_perm = True if original_perm != 1 else False
+        with self.marionette.using_permissions({'systemXHR': new_perm}):
+            now_perm = self.marionette.get_permission('systemXHR')
+            self.assertEquals(new_perm, now_perm)
+            self.assertNotEquals(now_perm, original_perm)
+            self.assertRaises(JavascriptException,
+                              self.marionette.execute_script,
+                              "return foo.bar.baz;")
+        self.assertEquals(original_perm,
+                          self.marionette.get_permission('systemXHR'))
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/client/marionette/tests/unit/unit-tests.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/client/marionette/tests/unit/unit-tests.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/client/marionette/tests/unit/unit-tests.ini	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/client/marionette/tests/unit/unit-tests.ini	2015-05-25 20:42:55.000000000 +0000
@@ -94,7 +94,6 @@
 [test_simpletest_sanity.py]
 [test_simpletest_chrome.js]
 [test_simpletest_timeout.js]
-[test_specialpowers.py]
 [test_anonymous_content.py]
 b2g = false
 [test_switch_frame.py]
@@ -158,3 +157,4 @@
 skip-if = os == "win" # http://bugs.python.org/issue14574
 
 [test_execute_sandboxes.py]
+[test_using_permissions.py]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/driver/marionette_driver/marionette.py firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/driver/marionette_driver/marionette.py
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/driver/marionette_driver/marionette.py	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/driver/marionette_driver/marionette.py	2015-05-25 20:42:55.000000000 +0000
@@ -787,15 +787,43 @@
                     typing.append(val[i])
         return typing
 
-    def push_permission(self, perm_type, allow):
+    def get_permission(self, perm):
+        with self.using_context('content'):
+            value = self.execute_script("""
+                let value = {
+                              'url': document.nodePrincipal.URI.spec,
+                              'appId': document.nodePrincipal.appId,
+                              'isInBrowserElement': document.nodePrincipal.isInBrowserElement,
+                              'type': arguments[0]
+                            };
+                return value;
+                """, script_args=[perm], sandbox='system')
+
+        with self.using_context('chrome'):
+            permission = self.execute_script("""
+                Components.utils.import("resource://gre/modules/Services.jsm");
+                let perm = arguments[0];
+                let secMan = Services.scriptSecurityManager;
+                let principal = secMan.getAppCodebasePrincipal(
+                                Services.io.newURI(perm.url, null, null),
+                                perm.appId, perm.isInBrowserElement);
+                let testPerm = Services.perms.testPermissionFromPrincipal(
+                               principal, perm.type);
+                return testPerm;
+                """, script_args=[value])
+        return permission
+
+    def push_permission(self, perm, allow):
         with self.using_context('content'):
             perm = self.execute_script("""
                 let allow = arguments[0];
-                if (allow) {
-                  allow = Components.interfaces.nsIPermissionManager.ALLOW_ACTION;
-                }
-                else {
-                  allow = Components.interfaces.nsIPermissionManager.DENY_ACTION;
+                if (typeof(allow) == "boolean") {
+                    if (allow) {
+                      allow = Components.interfaces.nsIPermissionManager.ALLOW_ACTION;
+                    }
+                    else {
+                      allow = Components.interfaces.nsIPermissionManager.DENY_ACTION;
+                    }
                 }
                 let perm_type = arguments[1];
 
@@ -821,35 +849,59 @@
                               'action': allow
                             };
                 return value;
-                """, script_args=[allow, perm_type], sandbox='system')
+                """, script_args=[allow, perm], sandbox='system')
+
+        current_perm = self.get_permission(perm['type'])
+        if current_perm == perm['action']:
+            with self.using_context('content'):
+                self.execute_script("""
+                    Components.utils.import("resource://gre/modules/Services.jsm");
+                    Services.obs.removeObserver(window.wrappedJSObject.permObserver, "perm-changed");
+                    """, sandbox='system')
+            return
 
         with self.using_context('chrome'):
-            waiting = self.execute_script("""
+            self.execute_script("""
                 Components.utils.import("resource://gre/modules/Services.jsm");
                 let perm = arguments[0];
                 let secMan = Services.scriptSecurityManager;
                 let principal = secMan.getAppCodebasePrincipal(Services.io.newURI(perm.url, null, null),
                                 perm.appId, perm.isInBrowserElement);
-                let testPerm = Services.perms.testPermissionFromPrincipal(principal, perm.type, perm.action);
-                if (testPerm == perm.action) {
-                  return false;
-                }
                 Services.perms.addFromPrincipal(principal, perm.type, perm.action);
                 return true;
                 """, script_args=[perm])
 
         with self.using_context('content'):
-            if waiting:
-                self.execute_async_script("""
-                    waitFor(marionetteScriptFinished, function() {
-                      return window.wrappedJSObject.permChanged;
-                    });
-                    """, sandbox='system')
-            else:
-                self.execute_script("""
-                    Components.utils.import("resource://gre/modules/Services.jsm");
-                    Services.obs.removeObserver(window.wrappedJSObject.permObserver, "perm-changed");
-                    """, sandbox='system')
+            self.execute_async_script("""
+                waitFor(marionetteScriptFinished, function() {
+                  return window.wrappedJSObject.permChanged;
+                });
+                """, sandbox='system')
+
+    @contextmanager
+    def using_permissions(self, perms):
+        '''
+        Sets permissions for code being executed in a `with` block,
+        and restores them on exit.
+
+        :param perms: A dict containing one or more perms and their
+        values to be set.
+
+        Usage example::
+
+          with marionette.using_permissions({'systemXHR': True}):
+              ... do stuff ...
+        '''
+        original_perms = {}
+        for perm in perms:
+            original_perms[perm] = self.get_permission(perm)
+            self.push_permission(perm, perms[perm])
+
+        try:
+            yield
+        finally:
+            for perm in original_perms:
+                self.push_permission(perm, original_perms[perm])
 
     def enforce_gecko_prefs(self, prefs):
         """
@@ -1349,9 +1401,9 @@
         return unwrapped
 
     def execute_js_script(self, script, script_args=None, async=True,
-                          new_sandbox=True, special_powers=False,
-                          script_timeout=None, inactivity_timeout=None,
-                          filename=None, sandbox='default'):
+                          new_sandbox=True, script_timeout=None,
+                          inactivity_timeout=None, filename=None,
+                          sandbox='default'):
         if script_args is None:
             script_args = []
         args = self.wrapArguments(script_args)
@@ -1361,7 +1413,6 @@
                                       args=args,
                                       async=async,
                                       newSandbox=new_sandbox,
-                                      specialPowers=special_powers,
                                       scriptTimeout=script_timeout,
                                       inactivityTimeout=inactivity_timeout,
                                       filename=filename,
@@ -1369,7 +1420,7 @@
         return self.unwrapValue(response)
 
     def execute_script(self, script, script_args=None, new_sandbox=True,
-                       special_powers=False, sandbox='default', script_timeout=None):
+                       sandbox='default', script_timeout=None):
         '''
         Executes a synchronous JavaScript script, and returns the result (or None if the script does return a value).
 
@@ -1379,11 +1430,6 @@
 
         :param script: A string containing the JavaScript to execute.
         :param script_args: A list of arguments to pass to the script.
-        :param special_powers: Whether or not you want access to SpecialPowers
-         in your script. Set to False by default because it shouldn't really
-         be used, since you already have access to chrome-level commands if you
-         set context to chrome and do an execute_script. This method was added
-         only to help us run existing Mochitests.
         :param sandbox: A tag referring to the sandbox you wish to use; if
          you specify a new tag, a new sandbox will be created.  If you use the
          special tag 'system', the sandbox will be created using the system
@@ -1446,7 +1492,6 @@
                                       args=args,
                                       newSandbox=new_sandbox,
                                       sandbox=sandbox,
-                                      specialPowers=special_powers,
                                       scriptTimeout=script_timeout,
                                       line=int(frame[1]),
                                       filename=os.path.basename(frame[0]))
@@ -1454,7 +1499,7 @@
 
     def execute_async_script(self, script, script_args=None, new_sandbox=True,
                              sandbox='default', script_timeout=None,
-                             special_powers=False, debug_script=False):
+                             debug_script=False):
         '''
         Executes an asynchronous JavaScript script, and returns the result (or None if the script does return a value).
 
@@ -1464,11 +1509,6 @@
 
         :param script: A string containing the JavaScript to execute.
         :param script_args: A list of arguments to pass to the script.
-        :param special_powers: Whether or not you want access to SpecialPowers
-         in your script. Set to False by default because it shouldn't really
-         be used, since you already have access to chrome-level commands if you
-         set context to chrome and do an execute_script. This method was added
-         only to help us run existing Mochitests.
         :param sandbox: A tag referring to the sandbox you wish to use; if
          you specify a new tag, a new sandbox will be created.  If you use the
          special tag 'system', the sandbox will be created using the system
@@ -1503,7 +1543,6 @@
                                       args=args,
                                       newSandbox=new_sandbox,
                                       sandbox=sandbox,
-                                      specialPowers=special_powers,
                                       scriptTimeout=script_timeout,
                                       line=int(frame[1]),
                                       filename=os.path.basename(frame[0]),
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/driver/marionette_driver/selection.py firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/driver/marionette_driver/selection.py
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/driver/marionette_driver/selection.py	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/driver/marionette_driver/selection.py	2015-05-25 20:42:55.000000000 +0000
@@ -37,8 +37,7 @@
         if self._input_or_textarea():
             # We must unwrap sel so that DOMRect could be returned to Python
             # side.
-            return '''var sel = SpecialPowers.wrap(arguments[0]).editor.selection;
-                   sel = SpecialPowers.unwrap(sel);'''
+            return '''var sel = arguments[0].editor.selection;'''
         else:
             return '''var sel = window.getSelection();'''
 
@@ -50,7 +49,8 @@
 
         for i in range(offset):
             self.element.marionette.execute_script(
-                cmd, script_args=[self.element, direction])
+                cmd, script_args=[self.element, direction],
+                sandbox='system')
 
     def move_caret_to_front(self):
         '''Move caret in the element to the front of the content.'''
@@ -83,13 +83,17 @@
         '''
         cmd = self.js_selection_cmd() +\
             '''return sel.getRangeAt(%d).getClientRects();''' % idx
-        return self.element.marionette.execute_script(cmd, script_args=[self.element])
+        return self.element.marionette.execute_script(cmd,
+                                                      script_args=[self.element],
+                                                      sandbox='system')
 
     def range_count(self):
         '''Get selection's range count'''
         cmd = self.js_selection_cmd() +\
             '''return sel.rangeCount;'''
-        return self.element.marionette.execute_script(cmd, script_args=[self.element])
+        return self.element.marionette.execute_script(cmd,
+                                                      script_args=[self.element],
+                                                      sandbox='system')
 
     def _selection_location_helper(self, location_type):
         '''Return the start and end location of the selection in the element.
@@ -200,4 +204,6 @@
         '''Return the selected portion of the content in the element.'''
         cmd = self.js_selection_cmd() +\
             '''return sel.toString();'''
-        return self.element.marionette.execute_script(cmd, script_args=[self.element])
+        return self.element.marionette.execute_script(cmd,
+                                                      script_args=[self.element],
+                                                      sandbox='system')
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/driver.js firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/driver.js
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/driver.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/driver.js	2015-05-25 20:42:55.000000000 +0000
@@ -45,7 +45,6 @@
 const FRAME_SCRIPT = "chrome://marionette/content/listener.js";
 const BROWSER_STARTUP_FINISHED = "browser-delayed-startup-finished";
 const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-const SECURITY_PREF = "security.turn_off_all_security_so_that_viruses_can_take_over_this_computer";
 const CLICK_TO_START_PREF = "marionette.debugging.clicktostart";
 const CONTENT_LISTENER_PREF = "marionette.contentListener";
 
@@ -53,7 +52,6 @@
 const uuidGen = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator);
 const globalMessageManager = Cc["@mozilla.org/globalmessagemanager;1"]
     .getService(Ci.nsIMessageBroadcaster);
-let specialpowers = {};
 
 // This is used to prevent newSession from returning before the telephony
 // API's are ready; see bug 792647.  This assumes that marionette-server.js
@@ -130,7 +128,6 @@
   this.currentFrameElement = null;
   this.testName = null;
   this.mozBrowserClose = null;
-  this.enabled_security_pref = false;
   this.sandboxes = {};
   // frame ID of the current remote frame, used for mozbrowserclose events
   this.oopFrameId = null;
@@ -510,25 +507,6 @@
   this.setSessionCapabilities(cmd.parameters.capabilities);
   this.scriptTimeout = 10000;
 
-  // SpecialPowers requires insecure automation-only features that we
-  // put behind a pref
-  let sec = false;
-  try {
-    sec = Services.prefs.getBoolPref(SECURITY_PREF);
-  } catch (e) {}
-  if (!sec) {
-    this.enabled_security_pref = true;
-    Services.prefs.setBoolPref(SECURITY_PREF, true);
-  }
-
-  if (!specialpowers.hasOwnProperty("specialPowersObserver")) {
-    loader.loadSubScript("chrome://specialpowers/content/SpecialPowersObserver.js",
-        specialpowers);
-    specialpowers.specialPowersObserver = new specialpowers.SpecialPowersObserver();
-    specialpowers.specialPowersObserver.init();
-    specialpowers.specialPowersObserver._loadFrameScript();
-  }
-
   let registerBrowsers = this.registerPromise();
   let browserListening = this.listeningPromise();
 
@@ -705,15 +683,14 @@
  *     Window in which we will execute code.
  * @param {Marionette} mn
  *     Marionette test instance.
- * @param {Object} args
- *     Arguments given by client.
- * @param {boolean} sp
- *     True to enable special powers in the sandbox, false not to.
+ * @param {string} sandboxName
+ *     The name for the sandbox.  If 'system', create the sandbox
+ *     with elevated privileges.
  *
  * @return {nsIXPCComponents_utils_Sandbox}
  *     Returns the sandbox.
  */
-GeckoDriver.prototype.createExecuteSandbox = function(win, mn, sp, sandboxName) {
+GeckoDriver.prototype.createExecuteSandbox = function(win, mn, sandboxName) {
   let principal = win;
   if (sandboxName == 'system') {
     principal = Cc["@mozilla.org/systemprincipal;1"].
@@ -735,15 +712,6 @@
 
   sb.isSystemMessageListenerReady = () => systemMessageListenerReady;
 
-  if (sp) {
-    let pow = [
-      "chrome://specialpowers/content/specialpowersAPI.js",
-      "chrome://specialpowers/content/SpecialPowersObserverAPI.js",
-      "chrome://specialpowers/content/ChromePowers.js",
-    ];
-    pow.map(s => loader.loadSubScript(s, sb));
-  }
-
   this.sandboxes[sandboxName] = sb;
 };
 
@@ -821,7 +789,6 @@
        script,
        newSandbox,
        args,
-       specialPowers,
        filename,
        line} = cmd.parameters;
   let sandboxName = cmd.parameters.sandbox || 'default';
@@ -839,7 +806,6 @@
       args: args,
       newSandbox: newSandbox,
       timeout: scriptTimeout,
-      specialPowers: specialPowers,
       filename: filename,
       line: line,
       sandboxName: sandboxName
@@ -880,7 +846,6 @@
     this.createExecuteSandbox(
         win,
         marionette,
-        specialPowers,
         sandboxName);
     if (!this.sandboxes[sandboxName]) {
       return;
@@ -957,7 +922,6 @@
         timeout: cmd.parameters.scriptTimeout ?
             cmd.parameters.scriptTimeout : this.scriptTimeout,
         inactivityTimeout: cmd.parameters.inactivityTimeout,
-        specialPowers: cmd.parameters.specialPowers,
         filename: cmd.parameters.filename,
         line: cmd.parameters.line,
         sandboxName: cmd.parameters.sandbox || 'default',
@@ -987,7 +951,6 @@
       newSandbox,
       inactivityTimeout,
       scriptTimeout,
-      specialPowers,
       filename,
       line} = cmd.parameters;
   let sandboxName = cmd.parameters.sandbox || 'default';
@@ -1007,7 +970,6 @@
       newSandbox: newSandbox,
       timeout: scriptTimeout,
       inactivityTimeout: inactivityTimeout,
-      specialPowers: specialPowers,
       filename: filename,
       line: line,
       sandboxName: sandboxName,
@@ -1085,8 +1047,7 @@
           scriptTimeout,
           this.heartbeatCallback,
           this.testName);
-      this.createExecuteSandbox(win, marionette,
-                                specialPowers, sandboxName);
+      this.createExecuteSandbox(win, marionette, sandboxName);
     }
     if (!this.sandboxes[sandboxName]) {
       return;
@@ -2439,7 +2400,6 @@
       winEn.getNext().messageManager.removeDelayedFrameScript(FRAME_SCRIPT);
     }
 
-    this.curBrowser.frameManager.removeSpecialPowers();
     this.curBrowser.frameManager.removeMessageManagerListeners(
         globalMessageManager);
   }
@@ -2879,6 +2839,23 @@
           false);
       return true;
 
+    case "Marionette:getFiles":
+      // Generates file objects to send back to the content script
+      // for handling file uploads.
+      let val = message.json.value;
+      let command_id = message.json.command_id;
+      Cu.importGlobalProperties(["File"]);
+      try {
+        let file = new File(val);
+        this.sendAsync("receiveFiles",
+                       {file: file, command_id: command_id});
+      } catch (e) {
+        let err = `File not found: ${val}`;
+        this.sendAsync("receiveFiles",
+                       {error: err, command_id: command_id});
+      }
+      break;
+
     case "Marionette:emitTouchEvent":
       globalMessageManager.broadcastAsyncMessage(
           "MarionetteMainListener:emitTouchEvent", message.json);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/frame-manager.js firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/frame-manager.js
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/frame-manager.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/frame-manager.js	2015-05-25 20:42:55.000000000 +0000
@@ -13,7 +13,6 @@
 
 let loader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
                .getService(Ci.mozIJSSubScriptLoader);
-let specialpowers = {};
 
 //list of OOP frames that has the frame script loaded
 let remoteFrames = [];
@@ -120,11 +119,6 @@
     let oopFrame = this.getOopFrame(winId, frameId);
     let mm = this.getFrameMM(winId, frameId);
 
-    if (!specialpowers.hasOwnProperty("specialPowersObserver")) {
-      loader.loadSubScript("chrome://specialpowers/content/SpecialPowersObserver.js",
-          specialpowers);
-    }
-
     // See if this frame already has our frame script loaded in it;
     // if so, just wake it up.
     for (let i = 0; i < remoteFrames.length; i++) {
@@ -134,7 +128,7 @@
         frameMessageManager.sendAsyncMessage("aliveCheck", {});
       } catch (e) {
         if (e.result ==  Components.results.NS_ERROR_NOT_INITIALIZED) {
-          remoteFrames.splice(i, 1);
+          remoteFrames.splice(i--, 1);
           continue;
         }
       }
@@ -142,11 +136,6 @@
         this.currentRemoteFrame = frame;
         this.addMessageManagerListeners(mm);
 
-        if (!frame.specialPowersObserver) {
-          frame.specialPowersObserver = new specialpowers.SpecialPowersObserver();
-          frame.specialPowersObserver.init(mm);
-        }
-
         mm.sendAsyncMessage("Marionette:restart");
         return oopFrame.id;
       }
@@ -163,9 +152,6 @@
 
     mm.loadFrameScript(FRAME_SCRIPT, true, true);
 
-    aFrame.specialPowersObserver = new specialpowers.SpecialPowersObserver();
-    aFrame.specialPowersObserver.init(mm);
-
     return oopFrame.id;
   },
 
@@ -183,20 +169,6 @@
   },
 
   /**
-   * This function removes any SpecialPowersObservers from OOP frames.
-   */
-  removeSpecialPowers: function FM_removeSpecialPowers() {
-    for (let i = 0; i < remoteFrames.length; i++) {
-      let frame = remoteFrames[i];
-
-      if (frame.specialPowersObserver) {
-        frame.specialPowersObserver.uninit();
-        frame.specialPowersObserver = null;
-      }
-    }
-  },
-
-  /**
    * Adds message listeners to the server, 
    * listening for messages from content frame scripts.
    * It also adds a MarionetteFrame:getInterruptedState
@@ -220,6 +192,7 @@
     mm.addWeakMessageListener("Marionette:deleteCookie", this.server);
     mm.addWeakMessageListener("Marionette:register", this.server);
     mm.addWeakMessageListener("Marionette:listenersAttached", this.server);
+    mm.addWeakMessageListener("Marionette:getFiles", this.server);
     mm.addWeakMessageListener("MarionetteFrame:handleModal", this);
     mm.addWeakMessageListener("MarionetteFrame:getCurrentFrameId", this);
     mm.addWeakMessageListener("MarionetteFrame:getInterruptedState", this);
@@ -248,6 +221,7 @@
     mm.removeWeakMessageListener("Marionette:deleteCookie", this.server);
     mm.removeWeakMessageListener("Marionette:listenersAttached", this.server);
     mm.removeWeakMessageListener("Marionette:register", this.server);
+    mm.removeWeakMessageListener("Marionette:getFiles", this.server);
     mm.removeWeakMessageListener("MarionetteFrame:handleModal", this);
     mm.removeWeakMessageListener("MarionetteFrame:getCurrentFrameId", this);
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/listener.js firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/listener.js
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/listener.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/listener.js	2015-05-25 20:42:55.000000000 +0000
@@ -27,9 +27,6 @@
 loader.loadSubScript("chrome://marionette/content/atoms.js", utils);
 loader.loadSubScript("chrome://marionette/content/sendkeys.js", utils);
 
-loader.loadSubScript("chrome://specialpowers/content/specialpowersAPI.js");
-loader.loadSubScript("chrome://specialpowers/content/specialpowers.js");
-
 let marionetteLogObj = new MarionetteLogObj();
 
 let isB2G = false;
@@ -46,6 +43,10 @@
 let actions = new ActionChain(utils, checkForInterrupted);
 let importedScripts = null;
 
+// Contains the last file input element that was the target of
+// sendKeysToElement.
+let fileInputElement;
+
 // A dict of sandboxes used this session
 let sandboxes = {};
 // The name of the current sandbox
@@ -196,6 +197,7 @@
  * Start all message listeners
  */
 function startListeners() {
+  addMessageListenerId("Marionette:receiveFiles", receiveFiles);
   addMessageListenerId("Marionette:newSession", newSession);
   addMessageListenerId("Marionette:executeScript", executeScript);
   addMessageListenerId("Marionette:executeAsyncScript", executeAsyncScript);
@@ -300,6 +302,7 @@
  * Removes all listeners
  */
 function deleteSession(msg) {
+  removeMessageListenerId("Marionette:receiveFiles", receiveFiles);
   removeMessageListenerId("Marionette:newSession", newSession);
   removeMessageListenerId("Marionette:executeScript", executeScript);
   removeMessageListenerId("Marionette:executeAsyncScript", executeAsyncScript);
@@ -487,14 +490,6 @@
     }
   });
 
-  let specialPowersFn;
-  if (typeof win.wrappedJSObject.SpecialPowers != "undefined") {
-    specialPowersFn = () => win.wrappedJSObject.SpecialPowers;
-  } else {
-    specialPowersFn = () => new SpecialPowers(win);
-  }
-  XPCOMUtils.defineLazyGetter(sandbox, "SpecialPowers", specialPowersFn);
-
   sandbox.asyncComplete = (obj, id) => {
     if (id == asyncTestCommandId) {
       curFrame.removeEventListener("unload", onunload, false);
@@ -651,6 +646,28 @@
 }
 
 /**
+ * Receive file objects from chrome in order to complete a
+ * sendKeysToElement action on a file input element.
+ */
+function receiveFiles(msg) {
+  if ('error' in msg.json) {
+    let err = new InvalidArgumentError(msg.json.error);
+    sendError(err, msg.json.command_id);
+    return;
+  }
+  if (!fileInputElement) {
+    let err = new InvalidElementStateError("receiveFiles called with no valid fileInputElement");
+    sendError(err, msg.json.command_id);
+    return;
+  }
+  let fs = Array.prototype.slice.call(fileInputElement.files);
+  fs.push(msg.json.file);
+  fileInputElement.mozSetFileArray(fs);
+  fileInputElement = null;
+  sendOk(msg.json.command_id);
+}
+
+/**
  * Execute pure JS test. Handles both async and sync cases.
  */
 function executeJSScript(msg) {
@@ -1537,31 +1554,12 @@
   let el = elementManager.getKnownElement(msg.json.id, curFrame);
   if (el.type == "file") {
     let p = val.join("");
-
-    // for some reason using mozSetFileArray doesn't work with e10s
-    // enabled (probably a bug), but a workaround is to elevate the element's
-    // privileges with SpecialPowers
-    //
-    // this extra branch can be removed when the e10s bug 1149998 is fixed
-    if (isRemoteBrowser()) {
-      let fs = Array.prototype.slice.call(el.files);
-      let file;
-      try {
-        file = new File(p);
-      } catch (e) {
-        let err = new InvalidArgumentError(`File not found: ${val}`);
-        sendError(err, command_id);
-        return;
-      }
-      fs.push(file);
-
-      let wel = new SpecialPowers(utils.window).wrap(el);
-      wel.mozSetFileArray(fs);
-    } else {
-      sendSyncMessage("Marionette:setElementValue", {value: p}, {element: el});
-    }
-
-    sendOk(command_id);
+    fileInputElement = el;
+    // In e10s, we can only construct File objects in the parent process,
+    // so pass the filename to driver.js, which in turn passes them back
+    // to this frame script in receiveFiles.
+    sendSyncMessage("Marionette:getFiles",
+                    {value: p, command_id: command_id});
   } else {
     utils.sendKeysToElement(curFrame, el, val, sendOk, sendError, command_id);
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/server.js firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/server.js
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/marionette/server.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/marionette/server.js	2015-05-25 20:42:55.000000000 +0000
@@ -29,7 +29,6 @@
 const logger = Log.repository.getLogger("Marionette");
 
 this.EXPORTED_SYMBOLS = ["MarionetteServer"];
-const SPECIAL_POWERS_PREF = "security.turn_off_all_security_so_that_viruses_can_take_over_this_computer";
 const CONTENT_LISTENER_PREF = "marionette.contentListener";
 
 /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/mochitest/b2g_start_script.js firefox-trunk-41.0~a1~hg20150524r245419/testing/mochitest/b2g_start_script.js
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/mochitest/b2g_start_script.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/mochitest/b2g_start_script.js	2015-05-25 20:42:55.000000000 +0000
@@ -29,6 +29,10 @@
   cm.deleteCategoryEntry("update-timer", "nsUpdateService", false);
 }
 
+let SECURITY_PREF = "security.turn_off_all_security_so_that_viruses_can_take_over_this_computer";
+Components.utils.import("resource://gre/modules/Services.jsm");
+Services.prefs.setBoolPref(SECURITY_PREF, true);
+
 function openWindow(aEvent) {
   var popupIframe = aEvent.detail.frameElement;
   popupIframe.id = 'popupiframe';
@@ -97,6 +101,11 @@
 
 if (chrome) {
   let loader = Cc["@mozilla.org/moz/jssubscript-loader;1"].getService(Ci.mozIJSSubScriptLoader);
+  if (typeof(SpecialPowers) == 'undefined') {
+    loader.loadSubScript("chrome://specialpowers/content/specialpowersAPI.js");
+    loader.loadSubScript("chrome://specialpowers/content/SpecialPowersObserverAPI.js");
+    loader.loadSubScript("chrome://specialpowers/content/ChromePowers.js");
+  }
   loader.loadSubScript("chrome://mochikit/content/browser-test.js");
   b2gStart();
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/mochitest/browser-test.js firefox-trunk-41.0~a1~hg20150524r245419/testing/mochitest/browser-test.js
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/mochitest/browser-test.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/mochitest/browser-test.js	2015-05-25 20:42:55.000000000 +0000
@@ -30,7 +30,7 @@
   "resource:///modules/SelfSupportBackend.jsm");
 
 const SIMPLETEST_OVERRIDES =
-  ["ok", "is", "isnot", "ise", "todo", "todo_is", "todo_isnot", "info", "expectAssertions", "requestCompleteLog"];
+  ["ok", "is", "isnot", "todo", "todo_is", "todo_isnot", "info", "expectAssertions", "requestCompleteLog"];
 
 window.addEventListener("load", function testOnLoad() {
   window.removeEventListener("load", testOnLoad);
@@ -929,10 +929,6 @@
     self.ok(a != b, name, "Didn't expect " + a + ", but got it", false,
             Components.stack.caller);
   };
-  this.ise = function test_ise(a, b, name) {
-    self.ok(a === b, name, "Got " + a + ", strictly expected " + b, false,
-            Components.stack.caller);
-  };
   this.todo = function test_todo(condition, name, diag, stack) {
     aTest.addResult(new testResult(!condition, name, diag, true,
                                    stack ? stack : Components.stack.caller));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/mochitest/runtestsb2g.py firefox-trunk-41.0~a1~hg20150524r245419/testing/mochitest/runtestsb2g.py
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/mochitest/runtestsb2g.py	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/mochitest/runtestsb2g.py	2015-05-25 20:42:56.000000000 +0000
@@ -220,6 +220,21 @@
                 Services.io.offline = false;
                 """)
 
+            self.marionette.execute_script("""
+                let SECURITY_PREF = "security.turn_off_all_security_so_that_viruses_can_take_over_this_computer";
+                Services.prefs.setBoolPref(SECURITY_PREF, true);
+
+                if (!testUtils.hasOwnProperty("specialPowersObserver")) {
+                  let loader = Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
+                    .getService(Components.interfaces.mozIJSSubScriptLoader);
+                  loader.loadSubScript("chrome://specialpowers/content/SpecialPowersObserver.js",
+                    testUtils);
+                  testUtils.specialPowersObserver = new testUtils.SpecialPowersObserver();
+                  testUtils.specialPowersObserver.init();
+                  testUtils.specialPowersObserver._loadFrameScript();
+                }
+                """)
+
             if options.chrome:
                 self.app_ctx.dm.removeDir(self.remote_chrome_test_dir)
                 self.app_ctx.dm.mkDir(self.remote_chrome_test_dir)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/mochitest/ssltunnel/moz.build firefox-trunk-41.0~a1~hg20150524r245419/testing/mochitest/ssltunnel/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/mochitest/ssltunnel/moz.build	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/mochitest/ssltunnel/moz.build	2015-05-25 20:42:56.000000000 +0000
@@ -18,3 +18,5 @@
 # This isn't XPCOM code, but it wants to use STL, so disable the STL
 # wrappers
 DISABLE_STL_WRAPPING = True
+
+FAIL_ON_WARNINGS = True
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/mochitest/ssltunnel/ssltunnel.cpp firefox-trunk-41.0~a1~hg20150524r245419/testing/mochitest/ssltunnel/ssltunnel.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/mochitest/ssltunnel/ssltunnel.cpp	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/mochitest/ssltunnel/ssltunnel.cpp	2015-05-25 20:42:56.000000000 +0000
@@ -1252,6 +1252,7 @@
       else
       {
         LOG_ERROR(("Incorrect client auth option modifier for host '%s'", hostname));
+        delete authoption;
         return 1;
       }
 
@@ -1260,6 +1261,7 @@
       char *hostname_copy = new char[strlen(hostname)+strlen(hostportstring)+2];
       if (!hostname_copy) {
         LOG_ERROR(("Out of memory"));
+        delete authoption;
         return 1;
       }
 
@@ -1270,6 +1272,7 @@
       PLHashEntry* entry = PL_HashTableAdd(existingServer->host_clientauth_table, hostname_copy, authoption);
       if (!entry) {
         LOG_ERROR(("Out of memory"));
+        delete authoption;
         return 1;
       }
     }
@@ -1315,6 +1318,8 @@
       PLHashEntry* entry = PL_HashTableAdd(existingServer->host_redir_table, hostname_copy, redir_copy);
       if (!entry) {
         LOG_ERROR(("Out of memory"));
+        delete[] hostname_copy;
+        delete[] redir_copy;
         return 1;
       }
     }
@@ -1366,7 +1371,10 @@
     case '\n':
       *b++ = 0;
       if (processConfigLine(buffer))
+      {
+        fclose(f);
         return 1;
+      }
       b = buffer;
     case '\r':
       continue;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/mochitest/tests/browser/browser_pass.js firefox-trunk-41.0~a1~hg20150524r245419/testing/mochitest/tests/browser/browser_pass.js
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/mochitest/tests/browser/browser_pass.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/mochitest/tests/browser/browser_pass.js	2015-05-25 20:42:56.000000000 +0000
@@ -3,7 +3,6 @@
   ok(true, "pass ok");
   is(true, true, "pass is");
   isnot(false, true, "pass isnot");
-  ise(true, true, "pass ise");
   todo(false, "pass todo");
   todo_is(false, true, "pass todo_is");
   todo_isnot(true, true, "pass todo_isnot");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/mochitest/tests/SimpleTest/ChromeUtils.js firefox-trunk-41.0~a1~hg20150524r245419/testing/mochitest/tests/SimpleTest/ChromeUtils.js
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/mochitest/tests/SimpleTest/ChromeUtils.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/mochitest/tests/SimpleTest/ChromeUtils.js	2015-05-25 20:42:56.000000000 +0000
@@ -164,108 +164,183 @@
 }
 
 /**
- * Emulate a drop by emulating a dragstart and firing events dragenter, dragover, and drop.
- *  srcElement - the element to use to start the drag, usually the same as destElement
- *               but if destElement isn't suitable to start a drag on pass a suitable
- *               element for srcElement
- *  destElement - the element to fire the dragover, dragleave and drop events
- *  dragData - the data to supply for the data transfer
- *                     This data is in the format:
- *                       [ [ {type: value, data: value}, ...], ... ]
- *               pass null to avoid modifying dataTransfer
- *  dropEffect - the drop effect to set during the dragstart event, or 'move' if null
- *  aWindow - optional; defaults to the current window object.
- *  aDestWindow - optional; defaults to aWindow.
- *                Used when destElement is in a different window than srcElement.
- *  aDragEvent - optional; defaults to empty object.
- *                overwrite a event object passed to EventUtils.sendDragEvent
+ * INTERNAL USE ONLY
+ * Create an event object to pass to EventUtils.sendDragEvent.
  *
- * Returns the drop effect that was desired.
+ * @param aType          The string represents drag event type.
+ * @param aDestElement   The element to fire the drag event, used to calculate
+ *                       screenX/Y and clientX/Y.
+ * @param aDestWindow    Optional; Defaults to the current window object.
+ * @param aDataTransfer  dataTransfer for current drag session.
+ * @param aDragEvent     The object contains properties to override the event
+ *                       object
+ * @return               An object to pass to EventUtils.sendDragEvent.
  */
-function synthesizeDrop(srcElement, destElement, dragData, dropEffect, aWindow, aDestWindow, aDragEvent={})
+function createDragEventObject(aType, aDestElement, aDestWindow, aDataTransfer,
+                               aDragEvent)
+{
+  var destRect = aDestElement.getBoundingClientRect();
+  var destClientX = destRect.left + destRect.width / 2;
+  var destClientY = destRect.top + destRect.height / 2;
+  var destScreenX = aDestWindow.mozInnerScreenX + destClientX;
+  var destScreenY = aDestWindow.mozInnerScreenY + destClientY;
+  if ("clientX" in aDragEvent && !("screenX" in aDragEvent)) {
+    aDragEvent.screenX = aDestWindow.mozInnerScreenX + aDragEvent.clientX;
+  }
+  if ("clientY" in aDragEvent && !("screenY" in aDragEvent)) {
+    aDragEvent.screenY = aDestWindow.mozInnerScreenY + aDragEvent.clientY;
+  }
+  return Object.assign({ type: aType,
+                         screenX: destScreenX, screenY: destScreenY,
+                         clientX: destClientX, clientY: destClientY,
+                         dataTransfer: aDataTransfer }, aDragEvent);
+}
+
+/**
+ * Emulate a event sequence of dragstart, dragenter, and dragover.
+ *
+ * @param aSrcElement   The element to use to start the drag.
+ * @param aDestElement  The element to fire the dragover, dragenter events
+ * @param aDragData     The data to supply for the data transfer.
+ *                      This data is in the format:
+ *                        [ [ {type: value, data: value}, ...], ... ]
+ *                      Pass null to avoid modifying dataTransfer.
+ * @param aDropEffect   The drop effect to set during the dragstart event, or
+ *                      'move' if null.
+ * @param aWindow       Optional; Defaults to the current window object.
+ * @param aDestWindow   Optional; Defaults to aWindow.
+ *                      Used when aDestElement is in a different window than
+ *                      aSrcElement.
+ * @param aDragEvent    Optional; Defaults to empty object. Overwrites an object
+ *                      passed to EventUtils.sendDragEvent.
+ * @return              A two element array, where the first element is the
+ *                      value returned from EventUtils.sendDragEvent for
+ *                      dragover event, and the second element is the
+ *                      dataTransfer for the current drag session.
+ */
+function synthesizeDragOver(aSrcElement, aDestElement, aDragData, aDropEffect, aWindow, aDestWindow, aDragEvent={})
 {
   if (!aWindow)
     aWindow = window;
   if (!aDestWindow)
     aDestWindow = aWindow;
 
-  var ds = Components.classes["@mozilla.org/widget/dragservice;1"].
-           getService(Components.interfaces.nsIDragService);
-
   var dataTransfer;
   var trapDrag = function(event) {
     dataTransfer = event.dataTransfer;
-    if (dragData) {
-      for (var i = 0; i < dragData.length; i++) {
-        var item = dragData[i];
+    if (aDragData) {
+      for (var i = 0; i < aDragData.length; i++) {
+        var item = aDragData[i];
         for (var j = 0; j < item.length; j++) {
           dataTransfer.mozSetDataAt(item[j].type, item[j].data, i);
         }
       }
     }
-    dataTransfer.dropEffect = dropEffect || "move";
+    dataTransfer.dropEffect = aDropEffect || "move";
     event.preventDefault();
-    if (dragData) {
-      event.stopPropagation();
-    }
+  };
+
+  // need to use real mouse action
+  aWindow.addEventListener("dragstart", trapDrag, true);
+  EventUtils.synthesizeMouseAtCenter(aSrcElement, { type: "mousedown" }, aWindow);
+
+  var rect = aSrcElement.getBoundingClientRect();
+  var x = rect.width / 2;
+  var y = rect.height / 2;
+  EventUtils.synthesizeMouse(aSrcElement, x, y, { type: "mousemove" }, aWindow);
+  EventUtils.synthesizeMouse(aSrcElement, x+10, y+10, { type: "mousemove" }, aWindow);
+  aWindow.removeEventListener("dragstart", trapDrag, true);
+
+  var event = createDragEventObject("dragenter", aDestElement, aDestWindow,
+                                    dataTransfer, aDragEvent);
+  EventUtils.sendDragEvent(event, aDestElement, aDestWindow);
+
+  event = createDragEventObject("dragover", aDestElement, aDestWindow,
+                                dataTransfer, aDragEvent);
+  var result = EventUtils.sendDragEvent(event, aDestElement, aDestWindow);
+
+  return [result, dataTransfer];
+}
+
+/**
+ * Emulate the drop event and mouseup event.
+ * This should be called after synthesizeDragOver.
+ *
+ * @param aResult        The first element of the array returned from
+ *                       synthesizeDragOver.
+ * @param aDataTransfer  The second element of the array returned from
+ *                       synthesizeDragOver.
+ * @param aDestElement   The element to fire the drop event.
+ * @param aDestWindow    Optional; Defaults to the current window object.
+ * @param aDragEvent     Optional; Defaults to empty object. Overwrites an
+ *                       object passed to EventUtils.sendDragEvent.
+ * @return               "none" if aResult is true,
+ *                       aDataTransfer.dropEffect otherwise.
+ */
+function synthesizeDropAfterDragOver(aResult, aDataTransfer, aDestElement, aDestWindow, aDragEvent={})
+{
+  if (!aDestWindow)
+    aDestWindow = window;
+
+  var effect = aDataTransfer.dropEffect;
+  var event;
+
+  if (aResult) {
+    effect = "none";
+  } else if (effect != "none") {
+    event = createDragEventObject("drop", aDestElement, aDestWindow,
+                                  aDataTransfer, aDragEvent);
+    EventUtils.sendDragEvent(event, aDestElement, aDestWindow);
   }
 
-  ds.startDragSession();
+  EventUtils.synthesizeMouseAtCenter(aDestElement, { type: "mouseup" }, aDestWindow);
 
-  try {
-    // need to use real mouse action
-    aWindow.addEventListener("dragstart", trapDrag, true);
-    EventUtils.synthesizeMouseAtCenter(srcElement, { type: "mousedown" }, aWindow);
-
-    var rect = srcElement.getBoundingClientRect();
-    var x = rect.width / 2;
-    var y = rect.height / 2;
-    EventUtils.synthesizeMouse(srcElement, x, y, { type: "mousemove" }, aWindow);
-    EventUtils.synthesizeMouse(srcElement, x+10, y+10, { type: "mousemove" }, aWindow);
-    aWindow.removeEventListener("dragstart", trapDrag, true);
-
-    var destRect = destElement.getBoundingClientRect();
-    var destClientX = destRect.left + destRect.width / 2;
-    var destClientY = destRect.top + destRect.height / 2;
-    var destScreenX = aDestWindow.mozInnerScreenX + destClientX;
-    var destScreenY = aDestWindow.mozInnerScreenY + destClientY;
-    if ("clientX" in aDragEvent && !("screenX" in aDragEvent)) {
-      aDragEvent.screenX = aDestWindow.mozInnerScreenX + aDragEvent.clientX;
-    }
-    if ("clientY" in aDragEvent && !("screenY" in aDragEvent)) {
-      aDragEvent.screenY = aDestWindow.mozInnerScreenY + aDragEvent.clientY;
-    }
+  return effect;
+}
 
-    var event = Object.assign({ type: "dragenter",
-                                screenX: destScreenX, screenY: destScreenY,
-                                clientX: destClientX, clientY: destClientY,
-                                dataTransfer: dataTransfer }, aDragEvent);
-    EventUtils.sendDragEvent(event, destElement, aDestWindow);
-
-    event = Object.assign({ type: "dragover",
-                            screenX: destScreenX, screenY: destScreenY,
-                            clientX: destClientX, clientY: destClientY,
-                            dataTransfer: dataTransfer }, aDragEvent);
-    if (EventUtils.sendDragEvent(event, destElement, aDestWindow)) {
-      EventUtils.synthesizeMouseAtCenter(destElement, { type: "mouseup" }, aDestWindow);
-      return "none";
-    }
+/**
+ * Emulate a drag and drop by emulating a dragstart and firing events dragenter,
+ * dragover, and drop.
+ *
+ * @param aSrcElement   The element to use to start the drag.
+ * @param aDestElement  The element to fire the dragover, dragenter events
+ * @param aDragData     The data to supply for the data transfer.
+ *                      This data is in the format:
+ *                        [ [ {type: value, data: value}, ...], ... ]
+ *                      Pass null to avoid modifying dataTransfer.
+ * @param aDropEffect   The drop effect to set during the dragstart event, or
+ *                      'move' if null.
+ * @param aWindow       Optional; Defaults to the current window object.
+ * @param aDestWindow   Optional; Defaults to aWindow.
+ *                      Used when aDestElement is in a different window than
+ *                      aSrcElement.
+ * @param aDragEvent    Optional; Defaults to empty object. Overwrites an object
+ *                      passed to EventUtils.sendDragEvent.
+ * @return              The drop effect that was desired.
+ */
+function synthesizeDrop(aSrcElement, aDestElement, aDragData, aDropEffect, aWindow, aDestWindow, aDragEvent={})
+{
+  if (!aWindow)
+    aWindow = window;
+  if (!aDestWindow)
+    aDestWindow = aWindow;
 
-    if (dataTransfer.dropEffect != "none") {
-      event = Object.assign({ type: "drop",
-                              screenX: destScreenX, screenY: destScreenY,
-                              clientX: destClientX, clientY: destClientY,
-                              dataTransfer: dataTransfer }, aDragEvent);
-      EventUtils.sendDragEvent(event, destElement, aDestWindow);
-    }
+  var ds = Components.classes["@mozilla.org/widget/dragservice;1"].
+           getService(Components.interfaces.nsIDragService);
 
-    EventUtils.synthesizeMouseAtCenter(destElement, { type: "mouseup" }, aDestWindow);
+  ds.startDragSession();
 
-    return dataTransfer.dropEffect;
+  try {
+    var [result, dataTransfer] = synthesizeDragOver(aSrcElement, aDestElement,
+                                                    aDragData, aDropEffect,
+                                                    aWindow, aDestWindow,
+                                                    aDragEvent);
+    return synthesizeDropAfterDragOver(result, dataTransfer, aDestElement,
+                                       aDestWindow, aDragEvent);
   } finally {
     ds.endDragSession(true);
   }
-};
+}
 
 var PluginUtils =
 {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/mochitest/tests/SimpleTest/SimpleTest.js firefox-trunk-41.0~a1~hg20150524r245419/testing/mochitest/tests/SimpleTest/SimpleTest.js
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/mochitest/tests/SimpleTest/SimpleTest.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/mochitest/tests/SimpleTest/SimpleTest.js	2015-05-25 20:42:56.000000000 +0000
@@ -277,7 +277,6 @@
     var diag = pass ? "" : "got " + repr(a) + ", expected " + repr(b)
     SimpleTest.ok(pass, name, diag);
 };
-SimpleTest.ise = SimpleTest.is;
 
 SimpleTest.isfuzzy = function (a, b, epsilon, name) {
   var pass = (a >= b - epsilon) && (a <= b + epsilon);
@@ -1466,7 +1465,6 @@
 var is = SimpleTest.is;
 var isfuzzy = SimpleTest.isfuzzy;
 var isnot = SimpleTest.isnot;
-var ise = SimpleTest.ise;
 var todo = SimpleTest.todo;
 var todo_is = SimpleTest.todo_is;
 var todo_isnot = SimpleTest.todo_isnot;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/modules/tests/browser/browser_test_assert.js firefox-trunk-41.0~a1~hg20150524r245419/testing/modules/tests/browser/browser_test_assert.js
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/modules/tests/browser/browser_test_assert.js	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/modules/tests/browser/browser_test_assert.js	2015-05-25 20:42:56.000000000 +0000
@@ -7,7 +7,6 @@
   ok(true, "pass ok");
   is(true, true, "pass is");
   isnot(false, true, "pass isnot");
-  ise(true, true, "pass ise");
   todo(false, "pass todo");
   todo_is(false, true, "pass todo_is");
   todo_isnot(true, true, "pass todo_isnot");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/mozbase/docs/mozrunner.rst firefox-trunk-41.0~a1~hg20150524r245419/testing/mozbase/docs/mozrunner.rst
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/mozbase/docs/mozrunner.rst	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/mozbase/docs/mozrunner.rst	2015-05-25 20:42:56.000000000 +0000
@@ -27,16 +27,16 @@
 
 .. code-block:: python
 
-    from mozprofile import Profile
+    from mozprofile import FirefoxProfile
     from mozrunner import FirefoxRunner
     import os
 
     binary = 'path/to/firefox/binary'
     profile_path = 'path/to/profile'
     if os.path.exists(profile_path):
-        profile = Profile.clone(path_from=profile_path)
+        profile = FirefoxProfile.clone(path_from=profile_path)
     else:
-        profile = Profile(profile=profile_path)
+        profile = FirefoxProfile(profile=profile_path)
     runner = FirefoxRunner(binary=binary, profile=profile)
     runner.start()
     runner.wait()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/mozbase/mozinstall/mozinstall/mozinstall.py firefox-trunk-41.0~a1~hg20150524r245419/testing/mozbase/mozinstall/mozinstall/mozinstall.py
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/mozbase/mozinstall/mozinstall/mozinstall.py	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/mozbase/mozinstall/mozinstall/mozinstall.py	2015-05-25 20:42:57.000000000 +0000
@@ -82,10 +82,7 @@
                     break
 
     if not binary:
-        # The expected binary has not been found. Make sure we clean the
-        # install folder to remove any traces
-        mozfile.remove(path)
-
+        # The expected binary has not been found.
         raise InvalidBinary('"%s" does not contain a valid binary.' % path)
 
     return binary
@@ -105,7 +102,9 @@
     if not is_installer(src):
         raise InvalidSource(src + ' is not valid installer file.')
 
+    did_we_create = False
     if not os.path.exists(dest):
+        did_we_create = True
         os.makedirs(dest)
 
     trbk = None
@@ -120,10 +119,24 @@
 
         return install_dir
 
-    except Exception, ex:
+    except:
         cls, exc, trbk = sys.exc_info()
-        error = InstallError('Failed to install "%s (%s)"' % (src, str(ex)))
-        raise InstallError, error, trbk
+        if did_we_create:
+            try:
+                # try to uninstall this properly
+                uninstall(dest)
+            except:
+                # uninstall may fail, let's just try to clean the folder
+                # in this case
+                try:
+                    mozfile.remove(dest)
+                except:
+                    pass
+        if issubclass(cls, Exception):
+            error = InstallError('Failed to install "%s (%s)"' % (src, str(exc)))
+            raise InstallError, error, trbk
+        # any other kind of exception like KeyboardInterrupt is just re-raised.
+        raise cls, exc, trbk
 
     finally:
         # trbk won't get GC'ed due to circular reference
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/mozbase/moznetwork/moznetwork/moznetwork.py firefox-trunk-41.0~a1~hg20150524r245419/testing/mozbase/moznetwork/moznetwork/moznetwork.py
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/mozbase/moznetwork/moznetwork/moznetwork.py	2015-05-13 18:06:01.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/mozbase/moznetwork/moznetwork/moznetwork.py	2015-05-25 20:42:57.000000000 +0000
@@ -120,8 +120,11 @@
             ips = socket.gethostbyname_ex(hostname)[2]
         if len(ips) == 1:
             ip = ips[0]
-        else:
+        elif len(ips) > 1:
             logger.debug('Multiple addresses found: %s' % ips)
+            # no fallback on Windows so take the first address
+            ip = ips[0] if mozinfo.isWin else None
+        else:
             ip = None
     except socket.gaierror:
         # sometimes the hostname doesn't resolve to an ip address, in which
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/mozharness/mozharness.json firefox-trunk-41.0~a1~hg20150524r245419/testing/mozharness/mozharness.json
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/mozharness/mozharness.json	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/mozharness/mozharness.json	2015-05-25 20:42:57.000000000 +0000
@@ -1,4 +1,4 @@
 {
     "repo": "https://hg.mozilla.org/build/mozharness",
-    "revision": "4d260376921f"
+    "revision": "66c655a58460"
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/profiles/prefs_general.js firefox-trunk-41.0~a1~hg20150524r245419/testing/profiles/prefs_general.js
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/profiles/prefs_general.js	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/profiles/prefs_general.js	2015-05-25 20:42:57.000000000 +0000
@@ -192,6 +192,7 @@
 // Assume the about:newtab page's intro panels have been shown to not depend on
 // which test runs first and happens to open about:newtab
 user_pref("browser.newtabpage.introShown", true);
+user_pref("browser.newtabpage.updateIntroShown", true);
 
 // Tell the PBackground infrastructure to run a test at startup.
 user_pref("pbackground.testing", true);
@@ -318,3 +319,6 @@
 
 // Disable periodic updates of service workers.
 user_pref("dom.serviceWorkers.periodic-updates.enabled", false);
+
+// Enable speech synth test service, and disable built in platform services.
+user_pref("media.webspeech.synth.test", true);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/specialpowers/components/SpecialPowersObserver.js firefox-trunk-41.0~a1~hg20150524r245419/testing/specialpowers/components/SpecialPowersObserver.js
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/specialpowers/components/SpecialPowersObserver.js	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/specialpowers/components/SpecialPowersObserver.js	2015-05-25 20:42:57.000000000 +0000
@@ -12,8 +12,10 @@
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 Components.utils.import("resource://gre/modules/Services.jsm");
 
-const Cc = Components.classes;
-const Ci = Components.interfaces;
+if (typeof(Cc) == "undefined") {
+  const Cc = Components.classes;
+  const Ci = Components.interfaces;
+}
 
 const CHILD_SCRIPT = "chrome://specialpowers/content/specialpowers.js"
 const CHILD_SCRIPT_API = "chrome://specialpowers/content/specialpowersAPI.js"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/specialpowers/content/specialpowersAPI.js firefox-trunk-41.0~a1~hg20150524r245419/testing/specialpowers/content/specialpowersAPI.js
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/specialpowers/content/specialpowersAPI.js	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/specialpowers/content/specialpowersAPI.js	2015-05-25 20:42:57.000000000 +0000
@@ -1135,6 +1135,23 @@
     });
   },
 
+  // Force-registering an app in the registry
+  injectApp: function(aAppId, aApp) {
+    this._sendSyncMessage("SPWebAppService", {
+      op: "inject-app",
+      appId: aAppId,
+      app: aApp
+    });
+  },
+
+  // Removing app from the registry
+  rejectApp: function(aAppId) {
+    this._sendSyncMessage("SPWebAppService", {
+      op: "reject-app",
+      appId: aAppId
+    });
+  },
+
   _proxiedObservers: {
     "specialpowers-http-notify-request": function(aMessage) {
       let uri = aMessage.json.uri;
@@ -1550,12 +1567,6 @@
       deleteCategoryEntry(category, entry, persists);
   },
 
-  copyString: function(str, doc) {
-    Components.classes["@mozilla.org/widget/clipboardhelper;1"].
-      getService(Components.interfaces.nsIClipboardHelper).
-      copyString(str, doc);
-  },
-
   openDialog: function(win, args) {
     return win.openDialog.apply(win, args);
   },
@@ -1634,10 +1645,10 @@
     return data.QueryInterface(Components.interfaces.nsISupportsString).data;
   },
 
-  clipboardCopyString: function(preExpectedVal, doc) {
-    var cbHelperSvc = Components.classes["@mozilla.org/widget/clipboardhelper;1"].
-                      getService(Components.interfaces.nsIClipboardHelper);
-    cbHelperSvc.copyString(preExpectedVal, doc);
+  clipboardCopyString: function(str) {
+    Cc["@mozilla.org/widget/clipboardhelper;1"].
+      getService(Ci.nsIClipboardHelper).
+      copyString(str);
   },
 
   supportsSelectionClipboard: function() {
@@ -1872,6 +1883,13 @@
     this._quotaManagerRequest('getUsage', uri, appId, inBrowser, callback);
   },
 
+  // Technically this restarts the QuotaManager for all URIs, but we need
+  // a specific one to perform the synchronized callback when the reset is
+  // complete.
+  resetStorageForURI: function(uri, callback, appId, inBrowser) {
+    this._quotaManagerRequest('reset', uri, appId, inBrowser, callback);
+  },
+
   _quotaManagerRequest: function(op, uri, appId, inBrowser, callback) {
     const messageTopic = "SPQuotaManager";
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/specialpowers/content/SpecialPowersObserverAPI.js firefox-trunk-41.0~a1~hg20150524r245419/testing/specialpowers/content/SpecialPowersObserverAPI.js
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/specialpowers/content/SpecialPowersObserverAPI.js	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/specialpowers/content/SpecialPowersObserverAPI.js	2015-05-25 20:42:57.000000000 +0000
@@ -375,6 +375,33 @@
               scope.UserCustomizations._debug = aMessage.json.value;
               return;
             }
+          case "inject-app":
+            {
+              let aAppId = aMessage.json.appId;
+              let aApp   = aMessage.json.app;
+
+              let keys = Object.keys(Webapps.DOMApplicationRegistry.webapps);
+              let exists = keys.indexOf(aAppId) !== -1;
+              if (exists) {
+                return false;
+              }
+
+              Webapps.DOMApplicationRegistry.webapps[aAppId] = aApp;
+              return true;
+            }
+          case "reject-app":
+            {
+              let aAppId = aMessage.json.appId;
+
+              let keys = Object.keys(Webapps.DOMApplicationRegistry.webapps);
+              let exists = keys.indexOf(aAppId) !== -1;
+              if (!exists) {
+                return false;
+              }
+
+              delete Webapps.DOMApplicationRegistry.webapps[aAppId];
+              return true;
+            }
           default:
             throw new SpecialPowersError("Invalid operation for SPWebAppsService");
         }
@@ -470,7 +497,7 @@
         let msg = aMessage.data;
         let op = msg.op;
 
-        if (op != 'clear' && op != 'getUsage') {
+        if (op != 'clear' && op != 'getUsage' && op != 'reset') {
           throw new SpecialPowersError('Invalid operation for SPQuotaManager');
         }
 
@@ -484,6 +511,8 @@
           } else {
             qm.clearStoragesForURI(uri);
           }
+        } else if (op == 'reset') {
+          qm.reset();
         }
 
         // We always use the getUsageForURI callback even if we're clearing
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/talos/talos.json firefox-trunk-41.0~a1~hg20150524r245419/testing/talos/talos.json
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/talos/talos.json	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/talos/talos.json	2015-05-25 20:42:57.000000000 +0000
@@ -1,11 +1,11 @@
 {
     "talos.zip": {
-        "url": "http://talos-bundles.pvt.build.mozilla.org/zips/talos.3dc0c42bd761.zip",
+        "url": "http://talos-bundles.pvt.build.mozilla.org/zips/talos.a6052c33d420.zip",
         "path": ""
     },
     "global": {
         "talos_repo": "https://hg.mozilla.org/build/talos",
-        "talos_revision": "c1da803b295e"
+        "talos_revision": "a6052c33d420"
     },
     "extra_options": {
         "android": [ "--apkPath=%(apk_path)s" ]
@@ -14,14 +14,11 @@
         "chromez": {
             "tests": ["tresize", "tcanvasmark"]
         },
-        "chromez-snow": {
-            "tests": ["tresize", "tcanvasmark"]
-        },
         "chromez-e10s": {
             "tests": ["tresize", "tcanvasmark"],
             "talos_options": ["--e10s"]
         },
-        "chromez-snow-e10s": {
+        "chromez-osx-e10s": {
             "tests": ["tresize", "tcanvasmark"],
             "talos_options": ["--e10s"]
         },
@@ -35,11 +32,8 @@
         "other": {
             "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore"]
         },
-        "other-snow": {
-            "tests": ["tpaint"]
-        },
-        "other-snow-e10s": {
-            "tests": ["tpaint"],
+        "other-osx-e10s": {
+            "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore"],
             "talos_options": ["--e10s"]
         },
         "other_nol64": {
@@ -77,11 +71,8 @@
                 "64": "http://talos-bundles.pvt.build.mozilla.org/zips/flash64_11_0_d1_98.zip"
             }
         },
-        "g1-snow": {
-            "tests": ["glterrain"]
-        },
-        "g1-snow-e10s": {
-            "tests": ["glterrain"],
+        "g1-osx-e10s": {
+            "tests": ["tp5o_scroll", "glterrain"],
             "talos_options": ["--e10s"]
         },
         "g2": {
@@ -90,6 +81,20 @@
             "pagesets_parent_dir_path": "talos/page_load_test/",
             "pagesets_manifest_path": "talos/page_load_test/tp5n/tp5o.manifest"
         },
+        "g2-e10s": {
+            "tests": ["damp"],
+            "talos_options": ["--e10s"],
+            "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
+            "pagesets_parent_dir_path": "talos/page_load_test/",
+            "pagesets_manifest_path": "talos/page_load_test/tp5n/tp5o.manifest"
+        },
+        "g2-osx-e10s": {
+            "tests": ["damp"],
+            "talos_options": ["--e10s"],
+            "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
+            "pagesets_parent_dir_path": "talos/page_load_test/",
+            "pagesets_manifest_path": "talos/page_load_test/tp5n/tp5o.manifest"
+        },
         "svgr": {
             "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "cart"]
         },
@@ -97,11 +102,8 @@
             "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "cart"],
             "talos_options": ["--e10s"]
         },
-        "svgr-snow": {
-            "tests": ["tsvgx", "tscrollx"]
-        },
-        "svgr-snow-e10s": {
-            "tests": ["tsvgx", "tscrollx"],
+        "svgr-osx-e10s": {
+            "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "cart"],
             "talos_options": ["--e10s"]
         },
         "tp5o": {
@@ -125,6 +127,17 @@
                 "64": "http://talos-bundles.pvt.build.mozilla.org/zips/flash64_11_0_d1_98.zip"
             }
         },
+        "tp5o-osx-e10s": {
+            "tests": ["tp5o"],
+            "talos_options": ["--e10s"],
+            "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
+            "pagesets_parent_dir_path": "talos/page_load_test/",
+            "pagesets_manifest_path": "talos/page_load_test/tp5n/tp5o.manifest",
+            "plugins": {
+                "32": "http://talos-bundles.pvt.build.mozilla.org/zips/flash32_10_3_183_5.zip",
+                "64": "http://talos-bundles.pvt.build.mozilla.org/zips/flash64_11_0_d1_98.zip"
+            }
+        },
         "xperf": {
             "tests": ["tp5n"],
             "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
@@ -158,32 +171,11 @@
         }
     },
     "mobile-suites": {
-        "remote-tspaint": {
-            "tests": ["ts_paint"]
-        },
         "remote-tsvgx": {
-            "tests": ["tsvgx"],
+            "tests": ["tsvgm"],
             "talos_options": [
                 "--noChrome",
-                "--tppagecycles", "10"
-            ]
-        },
-        "remote-tcanvasmark": {
-            "tests": ["tcanvasmark"],
-            "talos_options": [
-                "--noChrome"
-            ]
-        },
-        "remote-trobopan": {
-            "tests": ["trobopan"],
-            "talos_options": [
-                "--fennecIDs", "../fennec_ids.txt"
-            ]
-        },
-        "remote-troboprovider": {
-            "tests": ["tprovider"],
-            "talos_options": [
-                "--fennecIDs", "../fennec_ids.txt"
+                "--tppagecycles", "7"
             ]
         },
         "remote-trobocheck2": {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/mach_commands.py firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/mach_commands.py
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/mach_commands.py	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/mach_commands.py	2015-05-25 20:42:57.000000000 +0000
@@ -54,7 +54,7 @@
 
 def docker_image(name):
     ''' Determine the docker tag/revision from an in tree docker file '''
-    repository_path = os.path.join(DOCKER_ROOT, name, 'REPOSITORY')
+    repository_path = os.path.join(DOCKER_ROOT, name, 'REGISTRY')
     repository = REGISTRY
 
     version = open(os.path.join(DOCKER_ROOT, name, 'VERSION')).read().strip()
@@ -386,3 +386,76 @@
             graph.pop('metadata', None)
 
         print(json.dumps(graph, indent=4))
+
+@CommandProvider
+class CIBuild(object):
+    @Command('taskcluster-build', category='ci',
+        description="Create taskcluster try server build task")
+    @CommandArgument('--base-repository',
+        help='URL for "base" repository to clone')
+    @CommandArgument('--head-repository',
+        required=True,
+        help='URL for "head" repository to fetch revision from')
+    @CommandArgument('--head-ref',
+        help='Reference (this is same as rev usually for hg)')
+    @CommandArgument('--head-rev',
+        required=True,
+        help='Commit revision to use')
+    @CommandArgument('--mozharness-repository',
+        help='URL for custom mozharness repo')
+    @CommandArgument('--mozharness-rev',
+        help='Commit revision to use from mozharness repository')
+    @CommandArgument('--owner',
+        default='foobar@mozilla.com',
+        help='email address of who owns this graph')
+    @CommandArgument('build_task',
+        help='path to build task definition')
+    def create_ci_build(self, **params):
+        templates = Templates(ROOT)
+        # TODO handle git repos
+        head_repository = params['head_repository']
+        if not head_repository:
+            head_repository = get_hg_url()
+
+        head_rev = params['head_rev']
+        if not head_rev:
+            head_rev = get_latest_hg_revision(head_repository)
+
+        head_ref = params['head_ref'] or head_rev
+
+        mozharness = load_mozharness_info()
+
+        mozharness_repo = params['mozharness_repository']
+        if mozharness_repo is None:
+            mozharness_repo = mozharness['repo']
+
+        mozharness_rev = params['mozharness_rev']
+        if mozharness_rev is None:
+            mozharness_rev = mozharness['revision']
+
+        build_parameters = dict(gaia_info().items() + {
+            'docker_image': docker_image,
+            'owner': params['owner'],
+            'from_now': json_time_from_now,
+            'now': current_json_time(),
+            'base_repository': params['base_repository'] or head_repository,
+            'head_repository': head_repository,
+            'head_rev': head_rev,
+            'head_ref': head_ref,
+            'mozharness_repository': mozharness_repo,
+            'mozharness_ref': mozharness_rev,
+            'mozharness_rev': mozharness_rev
+        }.items())
+
+        try:
+            build_task = templates.load(params['build_task'], build_parameters)
+        except IOError:
+            sys.stderr.write(
+                "Could not load build task file.  Ensure path is a relative " \
+                "path from testing/taskcluster"
+            )
+            sys.exit(1)
+
+        taskcluster_graph.build_task.validate(build_task)
+
+        print(json.dumps(build_task['task'], indent=4))
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/scripts/phone-builder/build-lightsaber-nightly.sh firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/scripts/phone-builder/build-lightsaber-nightly.sh
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/scripts/phone-builder/build-lightsaber-nightly.sh	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/scripts/phone-builder/build-lightsaber-nightly.sh	2015-05-25 20:42:57.000000000 +0000
@@ -50,9 +50,13 @@
 
 mv $WORKSPACE/B2G/upload-public/$mar_file $HOME/artifacts-public/
 mv $WORKSPACE/B2G/upload/sources.xml $HOME/artifacts/sources.xml
-#mv $WORKSPACE/B2G/upload/b2g-*.crashreporter-symbols.zip $HOME/artifacts/b2g-crashreporter-symbols.zip
 mv $WORKSPACE/B2G/upload/b2g-*.android-arm.tar.gz $HOME/artifacts/b2g-android-arm.tar.gz
 mv $WORKSPACE/B2G/upload/${TARGET}.zip $HOME/artifacts/${TARGET}.zip
 mv $WORKSPACE/B2G/upload/gaia.zip $HOME/artifacts/gaia.zip
+
+if [ -f $WORKSPACE/B2G/upload/b2g-*.crashreporter-symbols.zip ]; then
+  mv $WORKSPACE/B2G/upload/b2g-*.crashreporter-symbols.zip $HOME/artifacts/b2g-crashreporter-symbols.zip
+fi
+
 ccache -s
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/scripts/phone-builder/build-phone-nightly.sh firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/scripts/phone-builder/build-phone-nightly.sh
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/scripts/phone-builder/build-phone-nightly.sh	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/scripts/phone-builder/build-phone-nightly.sh	2015-05-25 20:42:57.000000000 +0000
@@ -10,7 +10,17 @@
     mkdir $HOME/.ssh
 fi
 
+PLATFORM=${TARGET%%-*}
+
 aws s3 cp s3://b2g-nightly-credentials/balrog_credentials .
+mar_file=b2g-$PLATFORM-gecko-update.mar
+
+# We need different platform names for each variant (user, userdebug and
+# eng). We do not append variant suffix for "user" to keep compability with
+# verions already installed in the phones.
+if [ $VARIANT != "user" ]; then
+  PLATFORM=$PLATFORM-$VARIANT
+fi
 
 ./mozharness/scripts/b2g_build.py \
   --config b2g/taskcluster-phone-nightly.py \
@@ -26,8 +36,8 @@
   --checkout-revision=$GECKO_HEAD_REV \
   --base-repo=$GECKO_BASE_REPOSITORY \
   --repo=$GECKO_HEAD_REPOSITORY \
-  --platform $TARGET \
-  --complete-mar-url https://queue.taskcluster.net/v1/task/$TASK_ID/runs/$RUN_ID/artifacts/public/build/b2g-${TARGET%%-*}-gecko-update.mar \
+  --platform $PLATFORM \
+  --complete-mar-url https://queue.taskcluster.net/v1/task/$TASK_ID/runs/$RUN_ID/artifacts/public/build/$mar_file
 
 # Don't cache backups
 rm -rf $WORKSPACE/B2G/backup-*
@@ -36,11 +46,15 @@
 mkdir -p $HOME/artifacts
 mkdir -p $HOME/artifacts-public
 
-mv $WORKSPACE/B2G/upload-public/b2g-flame-gecko-update.mar $HOME/artifacts-public/b2g-flame-gecko-update.mar
+mv $WORKSPACE/B2G/upload-public/$mar_file $HOME/artifacts-public/
 mv $WORKSPACE/B2G/upload/sources.xml $HOME/artifacts/sources.xml
-#mv $WORKSPACE/B2G/upload/b2g-*.crashreporter-symbols.zip $HOME/artifacts/b2g-crashreporter-symbols.zip
 mv $WORKSPACE/B2G/upload/b2g-*.android-arm.tar.gz $HOME/artifacts/b2g-android-arm.tar.gz
 mv $WORKSPACE/B2G/upload/${TARGET}.zip $HOME/artifacts/${TARGET}.zip
 mv $WORKSPACE/B2G/upload/gaia.zip $HOME/artifacts/gaia.zip
+
+if [ -f $WORKSPACE/B2G/upload/b2g-*.crashreporter-symbols.zip ]; then
+  mv $WORKSPACE/B2G/upload/b2g-*.crashreporter-symbols.zip $HOME/artifacts/b2g-crashreporter-symbols.zip
+fi
+
 ccache -s
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml	2015-05-25 20:42:57.000000000 +0000
@@ -3,36 +3,162 @@
 # see <gecko>/testing/taskcluster/tasks/job_flags.yml
 
 $inherits:
-  from: tasks/branches/mozilla-central/job_flags.yml
+  from: tasks/branches/base_job_flags.yml
 
 builds:
-  flame-kk:
+  linux64_gecko:
     platforms:
       - b2g
     types:
       opt:
-        task: tasks/builds/b2g_flame_kk_opt.yml
+        task: tasks/builds/b2g_desktop_opt.yml
+      debug:
+        task: tasks/builds/b2g_desktop_debug.yml
+  linux64-mulet:
+    platforms:
+      - Mulet Linux
+    types:
+      opt:
+        task: tasks/builds/mulet_linux.yml
+  emulator-kk:
+    platfoms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_emulator_kk_opt.yml
+      debug:
+        task: tasks/builds/b2g_emulator_kk_debug.yml
+  emulator-l:
+    platfoms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_emulator_l_opt.yml
+      debug:
+        task: tasks/builds/b2g_emulator_l_debug.yml
+  emulator-jb:
+    platfoms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_emulator_jb_opt.yml
+      debug:
+        task: tasks/builds/b2g_emulator_jb_debug.yml
+  emulator:
+    platfoms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_emulator_ics_opt.yml
+      debug:
+        task: tasks/builds/b2g_emulator_ics_debug.yml
   flame-kk-eng:
     platforms:
       - b2g
     types:
       opt:
         task: tasks/builds/b2g_flame_kk_eng.yml
+  flame-kk:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_flame_kk_opt.yml
 
 tests:
-  gaia-ui-test-sanity:
+  cppunit:
     allowed_build_tasks:
-      tasks/builds/b2g_flame_kk_eng.yml:
-        task: tasks/tests/flame_kk_gaia_ui_test_sanity.yml
+      tasks/builds/b2g_emulator_ics_opt.yml:
+        task: tasks/tests/b2g_emulator_cpp_unit.yml
+      tasks/builds/b2g_emulator_ics_debug.yml:
+        task: tasks/tests/b2g_emulator_cpp_unit.yml
+  crashtest:
+    allowed_build_tasks:
+      tasks/builds/b2g_emulator_ics_opt.yml:
+        task: tasks/tests/b2g_emulator_crashtest.yml
+  gaia-build:
+    allowed_build_tasks:
+      tasks/builds/b2g_desktop_opt.yml:
+        task: tasks/tests/b2g_build_test.yml
+  gaia-build-unit:
+    allowed_build_tasks:
+      tasks/builds/b2g_desktop_opt.yml:
+        task: tasks/tests/b2g_build_unit.yml
+  gaia-js-integration:
+    allowed_build_tasks:
+      tasks/builds/b2g_desktop_opt.yml:
+        task: tasks/tests/b2g_gaia_js_integration_tests.yml
+  gaia-linter:
+    allowed_build_tasks:
+      tasks/builds/b2g_desktop_opt.yml:
+        task: tasks/tests/b2g_linter.yml
+  gaia-ui-test-accessibility:
+    allowed_build_tasks:
+      tasks/builds/b2g_desktop_opt.yml:
+        task: tasks/tests/b2g_gaia_ui_test_accessibility.yml
+      tasks/builds/b2g_desktop_debug.yml:
+        task: tasks/tests/b2g_gaia_ui_test_accessibility.yml
   gaia-ui-test-functional:
     allowed_build_tasks:
       tasks/builds/b2g_flame_kk_eng.yml:
         task: tasks/tests/flame_kk_gaia_ui_test_functional.yml
+      tasks/builds/b2g_desktop_opt.yml:
+        task: tasks/tests/b2g_gaia_ui_test_functional.yml
+      tasks/builds/b2g_desktop_debug.yml:
+        task: tasks/tests/b2g_gaia_ui_test_functional.yml
   gaia-ui-test-functional-dsds:
     allowed_build_tasks:
       tasks/builds/b2g_flame_kk_eng.yml:
         task: tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml
+  gaia-ui-test-sanity:
+    allowed_build_tasks:
+      tasks/builds/b2g_flame_kk_eng.yml:
+        task: tasks/tests/flame_kk_gaia_ui_test_sanity.yml
   gaia-ui-test-unit:
     allowed_build_tasks:
       tasks/builds/b2g_flame_kk_eng.yml:
         task: tasks/tests/flame_kk_gaia_ui_test_unit.yml
+      tasks/builds/b2g_desktop_opt.yml:
+        task: tasks/tests/b2g_gaia_ui_test_unit.yml
+      tasks/builds/b2g_desktop_debug.yml:
+        task: tasks/tests/b2g_gaia_ui_test_unit.yml
+  gaia-unit:
+    allowed_build_tasks:
+      tasks/builds/b2g_desktop_opt.yml:
+        task: tasks/tests/b2g_gaia_unit.yml
+  marionette:
+    allowed_build_tasks:
+      tasks/builds/b2g_emulator_ics_opt.yml:
+        task: tasks/tests/b2g_emulator_marionette.yml
+  marionette-webapi:
+    allowed_build_tasks:
+      tasks/builds/b2g_emulator_ics_opt.yml:
+        task: tasks/tests/b2g_emulator_marionette_webapi.yml
+  mochitest:
+    allowed_build_tasks:
+      tasks/builds/b2g_emulator_ics_opt.yml:
+        task: tasks/tests/b2g_emulator_mochitest.yml
+      tasks/builds/b2g_emulator_ics_debug.yml:
+        task: tasks/tests/b2g_emulator_mochitest.yml
+      tasks/builds/mulet_linux.yml:
+        task: tasks/tests/mulet_mochitests.yml
+  mochitest-oop:
+    allowed_build_tasks:
+      tasks/builds/b2g_desktop_opt.yml:
+        task: tasks/tests/b2g_mochitest_oop.yml
+  reftest:
+    allowed_build_tasks:
+      tasks/builds/mulet_linux.yml:
+        task: tasks/tests/mulet_reftests.yml
+      tasks/builds/b2g_emulator_ics_opt.yml:
+        task: tasks/tests/b2g_emulator_reftest.yml
+  reftest-sanity-oop:
+    allowed_build_tasks:
+      tasks/builds/b2g_desktop_opt.yml:
+        task: tasks/tests/b2g_reftests_sanity_oop.yml
+  xpcshell:
+    allowed_build_tasks:
+      tasks/builds/b2g_emulator_ics_opt.yml:
+        task: tasks/tests/b2g_emulator_xpcshell_chunked.yml
+      tasks/builds/b2g_emulator_ics_debug.yml:
+        task: tasks/tests/b2g_emulator_xpcshell_chunked.yml
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/branches/base_job_flags.yml firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/branches/base_job_flags.yml
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/branches/base_job_flags.yml	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/branches/base_job_flags.yml	2015-05-25 20:42:58.000000000 +0000
@@ -16,6 +16,7 @@
     - linux64-mulet  # Firefox desktop - b2g gecko linux 64 bit
     - macosx64_gecko # b2g desktop osx 64 bit
     - win32_gecko    # b2g desktop win 32 bit
+    - flame-kk-nightly
     - flame-kk       # b2g flame kitkat
     - flame-kk-eng   # b2g flame eng build
     - dolphin
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/branches/cypress/job_flags.yml firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/branches/cypress/job_flags.yml
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/branches/cypress/job_flags.yml	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/branches/cypress/job_flags.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
----
-# For complete sample of all build and test jobs,
-# see <gecko>/testing/taskcluster/tasks/job_flags.yml
-
-$inherits:
-  from: tasks/branches/mozilla-central/job_flags.yml
-
-builds:
-  flame-kk:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_flame_kk_opt.yml
-  flame-kk-eng:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_flame_kk_eng.yml
-  aries-nightly:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_aries_lightsaber_nightly_opt.yml
-      debug:
-        task: tasks/builds/b2g_aries_lightsaber_nightly_debug.yml
-  aries-eng:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_aries_lightsaber_eng.yml
-
-tests:
-  gaia-build:
-    allowed_build_tasks:
-      tasks/builds/b2g_flame_kk_opt.yml:
-        task: tasks/tests/b2g_build_test.yml
-      tasks/builds/b2g_flame_kk_eng.yml:
-        task: tasks/tests/b2g_build_test.yml
-  gaia-linter:
-    allowed_build_tasks:
-      tasks/builds/b2g_flame_kk_opt.yml:
-        task: tasks/tests/b2g_linter.yml
-      tasks/builds/b2g_flame_kk_eng.yml:
-        task: tasks/tests/b2g_linter.yml
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml	2015-05-25 20:42:58.000000000 +0000
@@ -52,6 +52,34 @@
         task: tasks/builds/b2g_emulator_ics_opt.yml
       debug:
         task: tasks/builds/b2g_emulator_ics_debug.yml
+  aries-nightly:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_aries_lightsaber_nightly_opt.yml
+      debug:
+        task: tasks/builds/b2g_aries_lightsaber_nightly_debug.yml
+  aries-eng:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_aries_lightsaber_eng.yml
+  flame-kk-nightly:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_flame_kk_nightly_opt.yml
+      debug:
+        task: tasks/builds/b2g_flame_kk_nightly_debug.yml
+  flame-kk-eng:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_flame_kk_eng.yml
 
 tests:
   cppunit:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/branches/try/job_flags.yml firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/branches/try/job_flags.yml
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/branches/try/job_flags.yml	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/branches/try/job_flags.yml	2015-05-25 20:42:58.000000000 +0000
@@ -21,7 +21,7 @@
       opt:
         task: tasks/builds/mulet_linux.yml
   emulator-l:
-    platfoms:
+    platforms:
       - b2g
     types:
       opt:
@@ -29,7 +29,7 @@
       debug:
         task: tasks/builds/b2g_emulator_l_debug.yml
   emulator-kk:
-    platfoms:
+    platforms:
       - b2g
     types:
       opt:
@@ -37,19 +37,19 @@
       debug:
         task: tasks/builds/b2g_emulator_kk_debug.yml
   emulator-x86-l:
-    platfoms:
+    platforms:
       - b2g
     types:
       opt:
         task: tasks/builds/b2g_emulator_x86_l_opt.yml
   emulator-x86-kk:
-    platfoms:
+    platforms:
       - b2g
     types:
       opt:
         task: tasks/builds/b2g_emulator_x86_kk_opt.yml
   emulator-jb:
-    platfoms:
+    platforms:
       - b2g
     types:
       opt:
@@ -57,7 +57,7 @@
       debug:
         task: tasks/builds/b2g_emulator_jb_debug.yml
   emulator:
-    platfoms:
+    platforms:
       - b2g
     types:
       opt:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_eng.yml firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_eng.yml
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_eng.yml	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_eng.yml	2015-05-25 20:42:58.000000000 +0000
@@ -25,6 +25,9 @@
         cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
         buildbot_step 'Build' ./build-lightsaber.sh $HOME/workspace
   extra:
+    treeherderEnv:
+      - production
+      - staging
     treeherder:
       symbol: Be
       groupSymbol: Aries
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_base.yml firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_base.yml
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_base.yml	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_base.yml	2015-05-25 20:42:58.000000000 +0000
@@ -18,6 +18,9 @@
         buildbot_step 'Build' ./build-lightsaber-nightly.sh $HOME/workspace
 
   extra:
+    treeherderEnv:
+      - production
+      - staging
     treeherder:
       symbol: B
       groupSymbol: Aries
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_debug.yml firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_debug.yml
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_debug.yml	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_debug.yml	2015-05-25 20:42:58.000000000 +0000
@@ -2,13 +2,16 @@
   from: 'tasks/builds/b2g_aries_lightsaber_nightly_base.yml'
   variables:
     build_name: 'aries'
-    build_type: 'nightly-debug'
+    build_type: 'debug'
 task:
   metadata:
     name: '[TC] B2G Aries Nightly (userdebug)'
   scopes:
     - 'docker-worker:cache:build-aries-lightsaber-nightly-debug'
-
+  extra:
+    treeherder:
+      collection:
+        debug: true
   payload:
     cache:
       build-aries-lightsaber-nightly-debug: /home/worker/workspace
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_opt.yml firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_opt.yml
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_opt.yml	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_opt.yml	2015-05-25 20:42:58.000000000 +0000
@@ -2,7 +2,7 @@
   from: 'tasks/builds/b2g_aries_lightsaber_nightly_base.yml'
   variables:
     build_name: 'aries'
-    build_type: 'nightly-user'
+    build_type: 'opt'
 task:
   metadata:
     name: '[TC] B2G Aries Nightly (user)'
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml	2015-05-25 20:42:58.000000000 +0000
@@ -19,7 +19,6 @@
       VARIANT: eng
       GAIA_OPTIMIZE: '1'
       B2G_SYSTEM_APPS: '1'
-      B2G_UPDATER: '1'
     command:
       - >
         checkout-gecko workspace &&
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_base.yml firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_base.yml
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_base.yml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_base.yml	2015-05-25 20:42:58.000000000 +0000
@@ -0,0 +1,30 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_base.yml'
+task:
+  workerType: balrog
+  scopes:
+    - 'docker-worker:feature:balrogVPNProxy'
+
+  payload:
+    features:
+      balrogVPNProxy: true
+    env:
+      TARGET: 'flame-kk'
+      DEBUG: 0
+    command:
+      - >
+        checkout-gecko workspace &&
+        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
+        buildbot_step 'Build' ./build-phone-nightly.sh $HOME/workspace
+
+  extra:
+    treeherder:
+      symbol: B
+      groupSymbol: Flame-KK
+      groupName: Flame KitKat Device Image
+      machine:
+        platform: b2g-device-image
+    locations:
+      img: 'private/build/flame-kk.zip'
+      mar: 'public/build/b2g-flame-gecko-update.mar'
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_debug.yml firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_debug.yml
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_debug.yml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_debug.yml	2015-05-25 20:42:58.000000000 +0000
@@ -0,0 +1,18 @@
+$inherits:
+  from: 'tasks/builds/b2g_flame_kk_nightly_base.yml'
+  variables:
+    build_name: 'flame-kk'
+    build_type: 'debug'
+task:
+  metadata:
+    name: '[TC] B2G Flame KK Nightly (userdebug)'
+  workerType: balrog
+  scopes:
+    - 'docker-worker:cache:build-flame-kk-nightly-debug'
+
+  payload:
+    cache:
+        build-flame-kk-nightly-debug: /home/worker/workspace
+    env:
+      VARIANT: userdebug
+      B2G_DEBUG: 1
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_opt.yml firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_opt.yml
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_opt.yml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_opt.yml	2015-05-25 20:42:58.000000000 +0000
@@ -0,0 +1,17 @@
+$inherits:
+  from: 'tasks/builds/b2g_flame_kk_nightly_base.yml'
+  variables:
+    build_name: 'flame-kk'
+    build_type: 'opt'
+task:
+  metadata:
+    name: '[TC] B2G Flame KK Nightly (user)'
+  workerType: balrog
+  scopes:
+    - 'docker-worker:cache:build-flame-kk-nightly-user'
+
+  payload:
+    cache:
+        build-flame-kk-nightly-user: /home/worker/workspace
+    env:
+      VARIANT: user
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly.yml firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly.yml
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly.yml	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_phone_base.yml'
-  variables:
-    build_name: 'flame-kk-nightly'
-    build_type: 'opt'
-task:
-  workerType: balrog
-  scopes:
-    - 'docker-worker:cache:build-flame-kk-nightly'
-    - 'docker-worker:feature:balrogVPNProxy'
-  metadata:
-    name: '[TC] B2G Flame KK Nightly'
-
-  payload:
-    features:
-      balrogVPNProxy: true
-    cache:
-      build-flame-kk-nightly: /home/worker/object-folder
-    env:
-      TARGET: 'flame-kk'
-      DEBUG: 0
-    command:
-      - >
-        checkout-gecko workspace &&
-        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
-        buildbot_step 'Build' ./build-phone-nightly.sh $HOME/workspace
-
-  extra:
-    treeherder:
-      symbol: B
-      groupSymbol: Flame-KK
-      groupName: Flame KitKat Device Image
-      machine:
-        platform: b2g-device-image
-    locations:
-      img: 'private/build/flame-kk.zip'
-      mar: 'public/build/b2g-flame-gecko-update.mar'
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/build.yml firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/build.yml
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/build.yml	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/build.yml	2015-05-25 20:42:58.000000000 +0000
@@ -25,8 +25,8 @@
     # the board.
     - 'docker-worker:cache:tc-vcs'
     - 'docker-worker:image:{{#docker_image}}builder{{/docker_image}}'
-    - 'queue:define-task:aws-provisioner/build-c4-2xlarge'
-    - 'queue:create-task:aws-provisioner/build-c4-2xlarge'
+    - 'queue:define-task:aws-provisioner-v1/build-c4-2xlarge'
+    - 'queue:create-task:aws-provisioner-v1/build-c4-2xlarge'
 
 
   payload:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/phone_test.yml firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/phone_test.yml
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/phone_test.yml	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/phone_test.yml	2015-05-25 20:42:58.000000000 +0000
@@ -13,7 +13,7 @@
 
   scopes:
     - 'docker-worker:image:{{#docker_image}}tester-device{{/docker_image}}'
-    - 'queue:create-task:aws-provisioner/testdroid-device'
+    - 'queue:create-task:aws-provisioner-v1/testdroid-device'
     - 'docker-worker:cache:tc-vcs'
 
   payload:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/tests/mulet_mochitests.yml firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/tests/mulet_mochitests.yml
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/tests/mulet_mochitests.yml	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/tests/mulet_mochitests.yml	2015-05-25 20:42:58.000000000 +0000
@@ -5,7 +5,6 @@
   metadata:
     name: '[TC] Mulet Mochitests ( {{chunk}} )'
     description: Mulet Mochitest run {{chunk}}
-
   payload:
     command:
       - entrypoint # entrypoint ensures we are running in xvfb
@@ -13,7 +12,6 @@
         python ./mozharness/scripts/desktop_unittest.py
         --no-read-buildbot-config
         --config-file ./mozharness/configs/unittests/linux_unittest.py
-        --config-file ./mozharness_configs/linux_mulet_config.py
         --config-file ./mozharness_configs/remove_executables.py
         --installer-url {{build_url}}
         --test-url {{tests_url}}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/test.yml firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/test.yml
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/taskcluster/tasks/test.yml	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/taskcluster/tasks/test.yml	2015-05-25 20:42:58.000000000 +0000
@@ -13,12 +13,18 @@
 
   scopes:
     - 'docker-worker:image:{{#docker_image}}tester{{/docker_image}}'
-    - 'queue:define-task:aws-provisioner/test-c4-2xlarge'
-    - 'queue:create-task:aws-provisioner/test-c4-2xlarge'
+    - 'queue:define-task:aws-provisioner-v1/test-c4-2xlarge'
+    - 'queue:create-task:aws-provisioner-v1/test-c4-2xlarge'
     - 'docker-worker:cache:tc-vcs'
     - 'docker-worker:cache:linux-cache'
+    - 'docker-worker:capability:device:loopbackVideo'
+    - 'docker-worker:capability:device:loopbackAudio'
 
   payload:
+    capabilities:
+      devices:
+        loopbackVideo: true
+        loopbackAudio: true
     image: '{{#docker_image}}tester{{/docker_image}}'
     maxRunTime: 3600
     cache:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/testsuite-targets.mk firefox-trunk-41.0~a1~hg20150524r245419/testing/testsuite-targets.mk
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/testsuite-targets.mk	2015-05-13 18:06:02.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/testsuite-targets.mk	2015-05-25 20:42:58.000000000 +0000
@@ -393,6 +393,7 @@
 PKG_STAGE = $(DIST)/test-stage
 package-tests: \
   stage-config \
+  stage-mach \
   stage-mochitest \
   stage-reftest \
   stage-xpcshell \
@@ -406,6 +407,7 @@
   stage-jittest \
   stage-web-platform-tests \
   stage-luciddream \
+  test-packages-manifest \
   $(NULL)
 ifdef MOZ_WEBRTC
 package-tests: stage-steeplechase
@@ -415,6 +417,10 @@
 PKG_STAGE = $(DIST)/universal/test-stage
 endif
 
+test-packages-manifest:
+	@rm -f $(MOZ_TEST_PACKAGES_FILE)
+	$(PYTHON) $(topsrcdir)/build/gen_test_packages_manifest.py --common $(TEST_PACKAGE) --jsshell $(JSSHELL_NAME) --dest-file $(MOZ_TEST_PACKAGES_FILE)
+
 package-tests:
 	@rm -f '$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)'
 ifndef UNIVERSAL_BINARY
@@ -444,6 +450,7 @@
 	$(NSINSTALL) -D $(PKG_STAGE)/jetpack
 	$(NSINSTALL) -D $(PKG_STAGE)/mozbase
 	$(NSINSTALL) -D $(PKG_STAGE)/modules
+	$(NSINSTALL) -D $(PKG_STAGE)/tools/mach
 
 stage-b2g: make-stage-dir
 	$(NSINSTALL) $(topsrcdir)/b2g/test/b2g-unittest-requirements.txt $(PKG_STAGE)/b2g
@@ -452,6 +459,11 @@
 	$(NSINSTALL) -D $(PKG_STAGE)/config
 	@(cd $(topsrcdir)/testing/config && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/config && tar -xf -)
 
+stage-mach: make-stage-dir
+	@(cd $(topsrcdir)/python/mach && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/tools/mach && tar -xf -)
+	cp $(topsrcdir)/testing/tools/mach_test_package_bootstrap.py $(PKG_STAGE)/tools/mach_bootstrap.py
+	cp $(topsrcdir)/mach $(PKG_STAGE)
+
 stage-mochitest: make-stage-dir
 	$(MAKE) -C $(DEPTH)/testing/mochitest stage-package
 ifeq ($(MOZ_BUILD_APP),mobile/android)
@@ -594,5 +606,6 @@
   stage-web-platform-tests \
   stage-instrumentation-tests \
   stage-luciddream \
+  test-packages-manifest \
   $(NULL)
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/tools/mach_test_package_bootstrap.py firefox-trunk-41.0~a1~hg20150524r245419/testing/tools/mach_test_package_bootstrap.py
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/tools/mach_test_package_bootstrap.py	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/tools/mach_test_package_bootstrap.py	2015-05-25 20:42:58.000000000 +0000
@@ -0,0 +1,75 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.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 os
+import platform
+import sys
+import time
+
+
+SEARCH_PATHS = [
+    'tools/mach',
+]
+
+# Individual files providing mach commands.
+MACH_MODULES = [
+    'tools/mach/mach/commands/commandinfo.py',
+]
+
+
+CATEGORIES = {
+    'testing': {
+        'short': 'Testing',
+        'long': 'Run tests.',
+        'priority': 30,
+    },
+    'devenv': {
+        'short': 'Development Environment',
+        'long': 'Set up and configure your development environment.',
+        'priority': 20,
+    },
+    'misc': {
+        'short': 'Potpourri',
+        'long': 'Potent potables and assorted snacks.',
+        'priority': 10,
+    },
+    'disabled': {
+        'short': 'Disabled',
+        'long': 'The disabled commands are hidden by default. Use -v to display them. These commands are unavailable for your current context, run "mach <command>" to see why.',
+        'priority': 0,
+    }
+}
+
+
+def bootstrap(test_package_root):
+    # Ensure we are running Python 2.7+. We put this check here so we generate a
+    # user-friendly error message rather than a cryptic stack trace on module
+    # import.
+    if sys.version_info[0] != 2 or sys.version_info[1] < 7:
+        print('Python 2.7 or above (but not Python 3) is required to run mach.')
+        print('You are running Python', platform.python_version())
+        sys.exit(1)
+
+    try:
+        import mach.main
+    except ImportError:
+        sys.path[0:0] = [os.path.join(test_package_root, path) for path in SEARCH_PATHS]
+        import mach.main
+
+    def populate_context(context, key=None):
+        return context
+
+    mach = mach.main.Mach(os.getcwd())
+    mach.populate_context_handler = populate_context
+
+    for category, meta in CATEGORIES.items():
+        mach.define_category(category, meta['short'], meta['long'],
+            meta['priority'])
+
+    for path in MACH_MODULES:
+        mach.load_commands_from_file(os.path.join(test_package_root, path))
+
+    return mach
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/media-source/mediasource-buffered.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/media-source/mediasource-buffered.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/media-source/mediasource-buffered.html.ini	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/media-source/mediasource-buffered.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -10,8 +10,11 @@
     expected: FAIL
 
   [Demuxed content with an empty buffered range on one SourceBuffer]
-    expected: FAIL
+    expected:
+      if os == "linux": FAIL
+      if (os == "win") and (version == "5.1.2600"): FAIL
 
   [Muxed content empty buffered ranges.]
-    expected: FAIL
+    expected:
+      if os == "linux": FAIL
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/media-source/mediasource-redundant-seek.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/media-source/mediasource-redundant-seek.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/media-source/mediasource-redundant-seek.html.ini	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/media-source/mediasource-redundant-seek.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -2,12 +2,7 @@
   type: testharness
   prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   expected:
-    if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
     if not debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
   [Test redundant fully prebuffered seek]
-    expected:
-      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154881
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/media-source/mediasource-remove.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/media-source/mediasource-remove.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/media-source/mediasource-remove.html.ini	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/media-source/mediasource-remove.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -2,7 +2,9 @@
   type: testharness
   prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   [Test removing all appended data.]
-    expected: FAIL
+    expected:
+      if os == "mac": FAIL
+      if (os == "win") and (version != "5.1.2600"): FAIL
 
   [Test removing beginning of appended data.]
     expected: FAIL
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/pointerlock/constructor.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/pointerlock/constructor.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/pointerlock/constructor.html.ini	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/pointerlock/constructor.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-[constructor.html]
-  type: testharness
-  [Default event values for mouse event interface and its pointer lock extensions.]
-    expected: FAIL
-
-  [Default event values for pointerlockerror using a dictionary]
-    expected: FAIL
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/pointerlock/idlharness.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/pointerlock/idlharness.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/pointerlock/idlharness.html.ini	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/pointerlock/idlharness.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -42,21 +42,3 @@
   [Document interface: window.document must inherit property "exitPointerLock" with the proper type (3)]
     expected: FAIL
 
-  [MouseEvent interface: attribute movementX]
-    expected: FAIL
-
-  [MouseEvent interface: attribute movementY]
-    expected: FAIL
-
-  [MouseEvent interface: new MouseEvent('mousemove') must inherit property "movementX" with the proper type (0)]
-    expected: FAIL
-
-  [MouseEvent interface: new MouseEvent('mousemove') must inherit property "movementY" with the proper type (1)]
-    expected: FAIL
-
-  [MouseEvent interface: new MouseEvent('pointerlockchange') must inherit property "movementX" with the proper type (0)]
-    expected: FAIL
-
-  [MouseEvent interface: new MouseEvent('pointerlockchange') must inherit property "movementY" with the proper type (1)]
-    expected: FAIL
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/common.https.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/common.https.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/common.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/common.https.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[common.https.html]
+  type: testharness
+  prefs: [dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-add.https.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-add.https.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-add.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-add.https.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[cache-add.https.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-delete.https.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-delete.https.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-delete.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-delete.https.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[cache-delete.https.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-match.https.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-match.https.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-match.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-match.https.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[cache-match.https.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-put.https.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-put.https.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-put.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-put.https.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[cache-put.https.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-storage.https.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-storage.https.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-storage.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-storage.https.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[cache-storage.https.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-storage-keys.https.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-storage-keys.https.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-storage-keys.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-storage-keys.https.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[cache-storage-keys.https.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-storage-match.https.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-storage-match.https.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-storage-match.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-storage-match.https.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[cache-storage-match.https.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/window/cache-add.https.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/window/cache-add.https.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/window/cache-add.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/window/cache-add.https.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[cache-add.https.html]
+  type: testharness
+  prefs: [dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/window/cache-delete.https.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/window/cache-delete.https.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/window/cache-delete.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/window/cache-delete.https.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[cache-delete.https.html]
+  type: testharness
+  prefs: [dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/window/cache-match.https.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/window/cache-match.https.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/window/cache-match.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/window/cache-match.https.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[cache-match.https.html]
+  type: testharness
+  prefs: [dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/window/cache-put.https.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/window/cache-put.https.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/window/cache-put.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/window/cache-put.https.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[cache-put.https.html]
+  type: testharness
+  prefs: [dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/window/cache-storage.https.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/window/cache-storage.https.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/window/cache-storage.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/window/cache-storage.https.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[cache-storage.https.html]
+  type: testharness
+  prefs: [dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/window/cache-storage-keys.https.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/window/cache-storage-keys.https.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/window/cache-storage-keys.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/window/cache-storage-keys.https.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[cache-storage-keys.https.html]
+  type: testharness
+  prefs: [dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/window/cache-storage-match.https.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/window/cache-storage-match.https.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/window/cache-storage-match.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/window/cache-storage-match.https.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[cache-storage-match.https.html]
+  type: testharness
+  prefs: [dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/window/sandboxed-iframes.https.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/window/sandboxed-iframes.https.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/window/sandboxed-iframes.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/window/sandboxed-iframes.https.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[sandboxed-iframes.https.html]
+  type: testharness
+  prefs: [dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/worker/cache-add.https.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/worker/cache-add.https.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/worker/cache-add.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/worker/cache-add.https.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[cache-add.https.html]
+  type: testharness
+  prefs: [dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/worker/cache-delete.https.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/worker/cache-delete.https.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/worker/cache-delete.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/worker/cache-delete.https.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[cache-delete.https.html]
+  type: testharness
+  prefs: [dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/worker/cache-match.https.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/worker/cache-match.https.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/worker/cache-match.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/worker/cache-match.https.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[cache-match.https.html]
+  type: testharness
+  prefs: [dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/worker/cache-put.https.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/worker/cache-put.https.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/worker/cache-put.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/worker/cache-put.https.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[cache-put.https.html]
+  type: testharness
+  prefs: [dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/worker/cache-storage.https.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/worker/cache-storage.https.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/worker/cache-storage.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/worker/cache-storage.https.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[cache-storage.https.html]
+  type: testharness
+  prefs: [dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/worker/cache-storage-keys.https.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/worker/cache-storage-keys.https.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/worker/cache-storage-keys.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/worker/cache-storage-keys.https.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[cache-storage-keys.https.html]
+  type: testharness
+  prefs: [dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/worker/cache-storage-match.https.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/worker/cache-storage-match.https.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/cache-storage/worker/cache-storage-match.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/cache-storage/worker/cache-storage-match.https.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[cache-storage-match.https.html]
+  type: testharness
+  prefs: [dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.1.1-service-worker-scope.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.1.1-service-worker-scope.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.1.1-service-worker-scope.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.1.1-service-worker-scope.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-3.1.1-service-worker-scope.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.1.2-service-worker-url.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.1.2-service-worker-url.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.1.2-service-worker-url.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.1.2-service-worker-url.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-3.1.2-service-worker-url.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.1.3-service-worker-state.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.1.3-service-worker-state.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.1.3-service-worker-state.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.1.3-service-worker-state.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-3.1.3-service-worker-state.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.1.4-service-worker-on-state-change.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.1.4-service-worker-on-state-change.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.1.4-service-worker-on-state-change.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.1.4-service-worker-on-state-change.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-3.1.4-service-worker-on-state-change.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.1-service-worker-obj.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.1-service-worker-obj.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.1-service-worker-obj.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.1-service-worker-obj.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-3.1-service-worker-obj.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2.10-navigator-service-worker-oncontrollerchange.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2.10-navigator-service-worker-oncontrollerchange.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2.10-navigator-service-worker-oncontrollerchange.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2.10-navigator-service-worker-oncontrollerchange.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-3.2.10-navigator-service-worker-oncontrollerchange.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2.11-navigator-service-worker-onreloadpage.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2.11-navigator-service-worker-onreloadpage.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2.11-navigator-service-worker-onreloadpage.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2.11-navigator-service-worker-onreloadpage.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-3.2.11-navigator-service-worker-onreloadpage.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2.12-navigator-service-worker-onerror.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2.12-navigator-service-worker-onerror.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2.12-navigator-service-worker-onerror.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2.12-navigator-service-worker-onerror.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-3.2.12-navigator-service-worker-onerror.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2.1-navigator-service-worker-installing.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2.1-navigator-service-worker-installing.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2.1-navigator-service-worker-installing.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2.1-navigator-service-worker-installing.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-3.2.1-navigator-service-worker-installing.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2.2-navigator-service-worker-waiting.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2.2-navigator-service-worker-waiting.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2.2-navigator-service-worker-waiting.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2.2-navigator-service-worker-waiting.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-3.2.2-navigator-service-worker-waiting.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2.3-navigator-service-worker-active.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2.3-navigator-service-worker-active.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2.3-navigator-service-worker-active.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2.3-navigator-service-worker-active.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-3.2.3-navigator-service-worker-active.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2.4-navigator-service-worker-controller.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2.4-navigator-service-worker-controller.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2.4-navigator-service-worker-controller.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2.4-navigator-service-worker-controller.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-3.2.4-navigator-service-worker-controller.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2.5-navigator-service-worker-ready.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2.5-navigator-service-worker-ready.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2.5-navigator-service-worker-ready.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2.5-navigator-service-worker-ready.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-3.2.5-navigator-service-worker-ready.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2.6-navigator-service-worker-getAll.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2.6-navigator-service-worker-getAll.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2.6-navigator-service-worker-getAll.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2.6-navigator-service-worker-getAll.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-3.2.6-navigator-service-worker-getAll.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2.7-navigator-service-worker-register.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2.7-navigator-service-worker-register.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2.7-navigator-service-worker-register.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2.7-navigator-service-worker-register.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-3.2.7-navigator-service-worker-register.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2.8-navigator-service-worker-unregister.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2.8-navigator-service-worker-unregister.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2.8-navigator-service-worker-unregister.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2.8-navigator-service-worker-unregister.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-3.2.8-navigator-service-worker-unregister.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2.9-navigator-service-worker-onupdatefound.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2.9-navigator-service-worker-onupdatefound.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2.9-navigator-service-worker-onupdatefound.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2.9-navigator-service-worker-onupdatefound.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-3.2.9-navigator-service-worker-onupdatefound.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2-navigator-service-worker.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2-navigator-service-worker.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-3.2-navigator-service-worker.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-3.2-navigator-service-worker.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-3.2-navigator-service-worker.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.1.1-service-worker-global-scope-caches.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.1.1-service-worker-global-scope-caches.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.1.1-service-worker-global-scope-caches.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.1.1-service-worker-global-scope-caches.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.1.1-service-worker-global-scope-caches.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.1.2-service-worker-global-scope-clients.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.1.2-service-worker-global-scope-clients.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.1.2-service-worker-global-scope-clients.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.1.2-service-worker-global-scope-clients.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.1.2-service-worker-global-scope-clients.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.1.3-service-worker-global-scope-scope.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.1.3-service-worker-global-scope-scope.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.1.3-service-worker-global-scope-scope.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.1.3-service-worker-global-scope-scope.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.1.3-service-worker-global-scope-scope.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.1.4-service-worker-global-scope-fetch.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.1.4-service-worker-global-scope-fetch.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.1.4-service-worker-global-scope-fetch.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.1.4-service-worker-global-scope-fetch.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.1.4-service-worker-global-scope-fetch.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.1.5-service-worker-global-scope-update.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.1.5-service-worker-global-scope-update.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.1.5-service-worker-global-scope-update.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.1.5-service-worker-global-scope-update.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.1.5-service-worker-global-scope-update.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.1.6-service-worker-global-scope-unregister.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.1.6-service-worker-global-scope-unregister.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.1.6-service-worker-global-scope-unregister.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.1.6-service-worker-global-scope-unregister.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.1.6-service-worker-global-scope-unregister.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.1.7-service-worker-global-scope-onmessage.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.1.7-service-worker-global-scope-onmessage.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.1.7-service-worker-global-scope-onmessage.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.1.7-service-worker-global-scope-onmessage.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.1.7-service-worker-global-scope-onmessage.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.1-service-worker-global-scope.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.1-service-worker-global-scope.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.1-service-worker-global-scope.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.1-service-worker-global-scope.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.1-service-worker-global-scope.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.2-client.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.2-client.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.2-client.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.2-client.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.2-client.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.3.1-get-serviced-method.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.3.1-get-serviced-method.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.3.1-get-serviced-method.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.3.1-get-serviced-method.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.3.1-get-serviced-method.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.3.2-reloadall-method.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.3.2-reloadall-method.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.3.2-reloadall-method.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.3.2-reloadall-method.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.3.2-reloadall-method.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.3-service-worker-clients.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.3-service-worker-clients.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.3-service-worker-clients.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.3-service-worker-clients.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.3-service-worker-clients.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.4-request-objects.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.4-request-objects.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.4-request-objects.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.4-request-objects.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.4-request-objects.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.5.2-response.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.5.2-response.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.5.2-response.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.5.2-response.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.5.2-response.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.5.4-opaque-response.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.5.4-opaque-response.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.5.4-opaque-response.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.5.4-opaque-response.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.5.4-opaque-response.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.5-response-objects.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.5-response-objects.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.5-response-objects.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.5-response-objects.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.5-response-objects.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.6.1-cache-lifetimes.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.6.1-cache-lifetimes.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.6.1-cache-lifetimes.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.6.1-cache-lifetimes.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.6.1-cache-lifetimes.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.6.2-cache.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.6.2-cache.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.6.2-cache.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.6.2-cache.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.6.2-cache.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.6.3-cache-storage.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.6.3-cache-storage.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.6.3-cache-storage.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.6.3-cache-storage.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.6.3-cache-storage.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.6-cache-objects.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.6-cache-objects.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.6-cache-objects.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.6-cache-objects.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.6-cache-objects.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.7.1.1-wait-until-method.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.7.1.1-wait-until-method.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.7.1.1-wait-until-method.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.7.1.1-wait-until-method.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.7.1.1-wait-until-method.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.7.1-install-phase-event.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.7.1-install-phase-event.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.7.1-install-phase-event.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.7.1-install-phase-event.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.7.1-install-phase-event.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.7.2.1-install-event-section.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.7.2.1-install-event-section.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.7.2.1-install-event-section.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.7.2.1-install-event-section.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.7.2.1-install-event-section.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.7.2.2-replace-method.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.7.2.2-replace-method.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.7.2.2-replace-method.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.7.2.2-replace-method.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.7.2.2-replace-method.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.7.2-install-event.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.7.2-install-event.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.7.2-install-event.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.7.2-install-event.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.7.2-install-event.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.7.3-activate-event.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.7.3-activate-event.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.7.3-activate-event.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.7.3-activate-event.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.7.3-activate-event.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.7.4.1-fetch-event-section.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.7.4.1-fetch-event-section.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.7.4.1-fetch-event-section.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.7.4.1-fetch-event-section.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.7.4.1-fetch-event-section.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.7.4.2-respond-with-method.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.7.4.2-respond-with-method.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.7.4.2-respond-with-method.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.7.4.2-respond-with-method.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.7.4.2-respond-with-method.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.7.4.3-default-method.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.7.4.3-default-method.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.7.4.3-default-method.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.7.4.3-default-method.html.ini	2015-05-25 20:43:00.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.7.4.3-default-method.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.7.4.4-is-reload-attribute.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.7.4.4-is-reload-attribute.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-4.7.4.4-is-reload-attribute.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-4.7.4.4-is-reload-attribute.html.ini	2015-05-25 20:43:01.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-4.7.4.4-is-reload-attribute.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-5.1-origin-relativity.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-5.1-origin-relativity.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-5.1-origin-relativity.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-5.1-origin-relativity.html.ini	2015-05-25 20:43:01.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-5.1-origin-relativity.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-5.2-cross-origin-resources.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-5.2-cross-origin-resources.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/service-workers/stub-5.2-cross-origin-resources.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/service-workers/stub-5.2-cross-origin-resources.html.ini	2015-05-25 20:43:01.000000000 +0000
@@ -0,0 +1,3 @@
+[stub-5.2-cross-origin-resources.html]
+  type: testharness
+  prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/websockets/interfaces/CloseEvent/historical.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/websockets/interfaces/CloseEvent/historical.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/websockets/interfaces/CloseEvent/historical.html.ini	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/websockets/interfaces/CloseEvent/historical.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-[historical.html]
-  type: testharness
-  [createEvent("CloseEvent")]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1161950
-    expected: FAIL
-
-  [initCloseEvent]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1161950
-    expected: FAIL
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/message-event.html.ini firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/message-event.html.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/meta/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/message-event.html.ini	2015-05-13 18:06:03.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/meta/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/message-event.html.ini	2015-05-25 20:43:02.000000000 +0000
@@ -2,4 +2,5 @@
   type: testharness
   [Properties of the 'message' event]
     expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1164834
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/tests/websockets/interfaces/CloseEvent/historical.html firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/tests/websockets/interfaces/CloseEvent/historical.html
--- firefox-trunk-41.0~a1~hg20150513r243603/testing/web-platform/tests/websockets/interfaces/CloseEvent/historical.html	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/testing/web-platform/tests/websockets/interfaces/CloseEvent/historical.html	2015-05-25 20:43:36.000000000 +0000
@@ -13,6 +13,6 @@
 
 test(function() {
   assert_false("initCloseEvent" in CloseEvent.prototype);
-  assert_false("initCloseEvent" in new CloseEvent());
+  assert_false("initCloseEvent" in new CloseEvent('close'));
 }, "initCloseEvent");
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/addoncompat/RemoteAddonsParent.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/addoncompat/RemoteAddonsParent.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/addoncompat/RemoteAddonsParent.jsm	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/addoncompat/RemoteAddonsParent.jsm	2015-05-25 20:43:39.000000000 +0000
@@ -259,14 +259,7 @@
     let securityFlags = msg.data.securityFlags;
     let contentPolicyType = msg.data.contentPolicyType;
     try {
-      let channel = NetUtil.newChannel2(uri,
-                                        null,
-                                        null,
-                                        null,  // aLoadingNode
-                                        loadingPrincipal,
-                                        null,  // aTriggeringPrincipal
-                                        securityFlags,
-                                        contentPolicyType);
+      let channel = NetUtil.newChannel({uri, loadingPrincipal, securityFlags, contentPolicyType});
 
       // We're not allowed to set channel.notificationCallbacks to a
       // CPOW, since the setter for notificationCallbacks is in C++,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/asyncshutdown/AsyncShutdown.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/asyncshutdown/AsyncShutdown.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/asyncshutdown/AsyncShutdown.jsm	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/asyncshutdown/AsyncShutdown.jsm	2015-05-25 20:43:39.000000000 +0000
@@ -51,7 +51,7 @@
 XPCOMUtils.defineLazyModuleGetter(this, "Task",
   "resource://gre/modules/Task.jsm");
 XPCOMUtils.defineLazyServiceGetter(this, "gDebug",
-  "@mozilla.org/xpcom/debug;1", "nsIDebug");
+  "@mozilla.org/xpcom/debug;1", "nsIDebug2");
 Object.defineProperty(this, "gCrashReporter", {
   get: function() {
     delete this.gCrashReporter;
@@ -889,7 +889,7 @@
           }
 
           // To help sorting out bugs, we want to make sure that the
-          // call to nsIDebug.abort points to a guilty client, rather
+          // call to nsIDebug2.abort points to a guilty client, rather
           // than to AsyncShutdown itself. We pick a client that is
           // still blocking and use its filename/lineNumber,
           // which have been determined during the call to `addBlocker`.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/console/content/consoleBindings.xml firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/console/content/consoleBindings.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/console/content/consoleBindings.xml	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/console/content/consoleBindings.xml	2015-05-25 20:43:39.000000000 +0000
@@ -295,7 +295,7 @@
             const clipI = Components.interfaces.nsIClipboardHelper;
             var clipboard = Components.classes[clipURI].getService(clipI);
 
-            clipboard.copyString(this.mSelectedItem.toString(), document);
+            clipboard.copyString(this.mSelectedItem.toString());
           } catch (ex) {
             // Unable to copy anything, die quietly
           }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/downloads/ApplicationReputation.cpp firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/downloads/ApplicationReputation.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/downloads/ApplicationReputation.cpp	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/downloads/ApplicationReputation.cpp	2015-05-25 20:43:40.000000000 +0000
@@ -65,14 +65,9 @@
 #define PREF_DOWNLOAD_ALLOW_TABLE "urlclassifier.downloadAllowTable"
 
 // NSPR_LOG_MODULES=ApplicationReputation:5
-#if defined(PR_LOGGING)
 PRLogModuleInfo *ApplicationReputationService::prlog = nullptr;
-#define LOG(args) PR_LOG(ApplicationReputationService::prlog, PR_LOG_DEBUG, args)
-#define LOG_ENABLED() PR_LOG_TEST(ApplicationReputationService::prlog, 4)
-#else
-#define LOG(args)
-#define LOG_ENABLED() (false)
-#endif
+#define LOG(args) MOZ_LOG(ApplicationReputationService::prlog, PR_LOG_DEBUG, args)
+#define LOG_ENABLED() PR_LOG_TEST(ApplicationReputationService::prlog, PR_LOG_DEBUG)
 
 class PendingDBLookup;
 
@@ -379,6 +374,10 @@
        NS_ConvertUTF16toUTF8(fileName).get(), this));
   return
     // From https://code.google.com/p/chromium/codesearch#chromium/src/chrome/common/safe_browsing/download_protection_util.cc&l=14
+    // Archives _may_ contain binaries
+#ifdef XP_WIN // disable on Mac/Linux, see 1167493
+    StringEndsWith(fileName, NS_LITERAL_STRING(".zip")) ||
+#endif
     // Android extensions
     StringEndsWith(fileName, NS_LITERAL_STRING(".apk")) ||
     // Windows extensions
@@ -399,9 +398,7 @@
     StringEndsWith(fileName, NS_LITERAL_STRING(".app")) ||
     StringEndsWith(fileName, NS_LITERAL_STRING(".dmg")) ||
     StringEndsWith(fileName, NS_LITERAL_STRING(".osx")) ||
-    StringEndsWith(fileName, NS_LITERAL_STRING(".pkg")) ||
-    // Archives _may_ contain binaries
-    StringEndsWith(fileName, NS_LITERAL_STRING(".zip"));
+    StringEndsWith(fileName, NS_LITERAL_STRING(".pkg"));
 }
 
 ClientDownloadRequest::DownloadType
@@ -746,9 +743,7 @@
 {
   Accumulate(mozilla::Telemetry::APPLICATION_REPUTATION_SHOULD_BLOCK,
     shouldBlock);
-#if defined(PR_LOGGING)
   double t = (TimeStamp::Now() - mStartTime).ToMilliseconds();
-#endif
   if (shouldBlock) {
     LOG(("Application Reputation check failed, blocking bad binary in %f ms "
          "[this = %p]", t, this));
@@ -1103,11 +1098,9 @@
 
 ApplicationReputationService::ApplicationReputationService()
 {
-#if defined(PR_LOGGING)
   if (!prlog) {
     prlog = PR_NewLogModule("ApplicationReputation");
   }
-#endif
   LOG(("Application reputation service started up"));
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/downloads/test/unit/test_cancel_download_files_removed.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/downloads/test/unit/test_cancel_download_files_removed.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/downloads/test/unit/test_cancel_download_files_removed.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/downloads/test/unit/test_cancel_download_files_removed.js	2015-05-25 20:43:40.000000000 +0000
@@ -90,14 +90,7 @@
   let uri = "http://localhost:" +
              httpserver.identity.primaryPort +
              set.serverPath;
-  let channel = NetUtil.newChannel2(uri,
-                                    null,
-                                    null,
-                                    null,      // aLoadingNode
-                                    Services.scriptSecurityManager.getSystemPrincipal(),
-                                    null,      // aTriggeringPrincipal
-                                    Ci.nsILoadInfo.SEC_NORMAL,
-                                    Ci.nsIContentPolicy.TYPE_OTHER);
+  let channel = NetUtil.newChannel({uri, loadUsingSystemPrincipal: true});
   let uriloader = Cc["@mozilla.org/uriloader;1"].getService(Ci.nsIURILoader);
   uriloader.openURI(channel, Ci.nsIURILoader.IS_CONTENT_PREFERRED,
                     new WindowContext());
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/downloads/test/unit/test_download_samename.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/downloads/test/unit/test_download_samename.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/downloads/test/unit/test_download_samename.js	2015-05-13 18:06:09.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/downloads/test/unit/test_download_samename.js	2015-05-25 20:43:40.000000000 +0000
@@ -112,14 +112,7 @@
   let uri = "http://localhost:" +
             httpserver.identity.primaryPort +
             set.serverURL;
-  let channel = NetUtil.newChannel2(uri,
-                                    null,
-                                    null,
-                                    null,      // aLoadingNode
-                                    Services.scriptSecurityManager.getSystemPrincipal(),
-                                    null,      // aTriggeringPrincipal
-                                    Ci.nsILoadInfo.SEC_NORMAL,
-                                    Ci.nsIContentPolicy.TYPE_OTHER);
+  let channel = NetUtil.newChannel({uri, loadUsingSystemPrincipal: true});
   let uriloader = Cc["@mozilla.org/uriloader;1"].getService(Ci.nsIURILoader);
   uriloader.openURI(channel, Ci.nsIURILoader.IS_CONTENT_PREFERRED,
                     new WindowContext());
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/filepicker/nsFilePicker.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/filepicker/nsFilePicker.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/filepicker/nsFilePicker.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/filepicker/nsFilePicker.js	2015-05-25 20:43:41.000000000 +0000
@@ -93,7 +93,7 @@
   /* readonly attribute nsISimpleEnumerator files; */
   get files()  { return this.mFilesEnumerator; },
 
-  /* readonly attribute nsIDOMFile domfile; */
+  /* readonly attribute DOM File domfile; */
   get domfile()  {
     let enumerator = this.domfiles;
     return enumerator ? enumerator.mFiles[0] : null;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/filewatcher/NativeFileWatcherWin.cpp firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/filewatcher/NativeFileWatcherWin.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/filewatcher/NativeFileWatcherWin.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/filewatcher/NativeFileWatcherWin.cpp	2015-05-25 20:43:41.000000000 +0000
@@ -15,7 +15,7 @@
 #include "nsIObserverService.h"
 #include "nsProxyRelease.h"
 #include "nsTArray.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 namespace mozilla {
 
@@ -130,7 +130,6 @@
   nsString mChangedResource;
 };
 
-#if defined(PR_LOGGING)
 static PRLogModuleInfo* GetFileWatcherContextLog()
 {
   static PRLogModuleInfo *gNativeWatcherPRLog;
@@ -139,9 +138,8 @@
   }
   return gNativeWatcherPRLog;
 }
-#endif
 
-#define FILEWATCHERLOG(...) PR_LOG(GetFileWatcherContextLog(), PR_LOG_DEBUG, (__VA_ARGS__))
+#define FILEWATCHERLOG(...) MOZ_LOG(GetFileWatcherContextLog(), PR_LOG_DEBUG, (__VA_ARGS__))
 
 // The number of notifications to store within WatchedResourceDescriptor:mNotificationBuffer.
 // If the buffer overflows, its contents are discarded and a change callback is dispatched
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/jsdownloads/test/unit/head.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/jsdownloads/test/unit/head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/jsdownloads/test/unit/head.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/jsdownloads/test/unit/head.js	2015-05-25 20:43:41.000000000 +0000
@@ -534,7 +534,7 @@
 
     let deferred = Promise.defer();
     NetUtil.asyncFetch(
-      file,
+      { uri: NetUtil.newURI(file), loadUsingSystemPrincipal: true },
       function(aInputStream, aStatus) {
         do_check_true(Components.isSuccessCode(aStatus));
         let contents = NetUtil.readInputStreamToString(aInputStream,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/osfile/modules/osfile_async_front.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/osfile/modules/osfile_async_front.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/osfile/modules/osfile_async_front.jsm	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/osfile/modules/osfile_async_front.jsm	2015-05-25 20:43:42.000000000 +0000
@@ -1012,10 +1012,15 @@
  * Remove an existing file.
  *
  * @param {string} path The name of the file.
+ * @param {*=} options Additional options.
+ *   - {bool} ignoreAbsent If |false|, throw an error if the file does
+ *     not exist. |true| by default.
+ *
+ * @throws {OS.File.Error} In case of I/O error.
  */
-File.remove = function remove(path) {
+File.remove = function remove(path, options) {
   return Scheduler.post("remove",
-    [Type.path.toMsg(path)]);
+    [Type.path.toMsg(path), options], path);
 };
 
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/osfile/modules/osfile_async_worker.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/osfile/modules/osfile_async_worker.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/osfile/modules/osfile_async_worker.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/osfile/modules/osfile_async_worker.js	2015-05-25 20:43:42.000000000 +0000
@@ -217,8 +217,8 @@
    removeEmptyDir: function removeEmptyDir(path, options) {
      return File.removeEmptyDir(Type.path.fromMsg(path), options);
    },
-   remove: function remove(path) {
-     return File.remove(Type.path.fromMsg(path));
+   remove: function remove(path, options) {
+     return File.remove(Type.path.fromMsg(path), options);
    },
    open: function open(path, mode, options) {
      let filePath = Type.path.fromMsg(path);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/osfile/tests/mochi/main_test_osfile_async.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/osfile/tests/mochi/main_test_osfile_async.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/osfile/tests/mochi/main_test_osfile_async.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/osfile/tests/mochi/main_test_osfile_async.js	2015-05-25 20:43:42.000000000 +0000
@@ -89,9 +89,10 @@
   test.info("Fetching file " + path);
   let promise = Promise.defer();
   let file = new FileUtils.File(path);
-  NetUtil.asyncFetch2(
-    file,
-    function(stream, status) {
+  NetUtil.asyncFetch({
+    uri: NetUtil.newURI(file),
+    loadUsingSystemPrincipal: true
+  }, function(stream, status) {
       if (!Components.isSuccessCode(status)) {
         promise.reject(status);
         return;
@@ -108,12 +109,7 @@
       } else {
         promise.resolve(result);
       }
-    },
-    null,      // aLoadingNode
-    Services.scriptSecurityManager.getSystemPrincipal(),
-    null,      // aTriggeringPrincipal
-    Ci.nsILoadInfo.SEC_NORMAL,
-    Ci.nsIContentPolicy.TYPE_OTHER);
+    });
 
   return promise.promise;
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/osfile/tests/xpcshell/head.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/osfile/tests/xpcshell/head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/osfile/tests/xpcshell/head.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/osfile/tests/xpcshell/head.js	2015-05-25 20:43:42.000000000 +0000
@@ -54,9 +54,10 @@
   do_print("Fetching file " + path);
   let deferred = Promise.defer();
   let file = new FileUtils.File(path);
-  NetUtil.asyncFetch2(
-    file,
-    function(stream, status) {
+  NetUtil.asyncFetch({
+    uri: NetUtil.newURI(file),
+    loadUsingSystemPrincipal: true
+  }, function(stream, status) {
       if (!Components.isSuccessCode(status)) {
         deferred.reject(status);
         return;
@@ -73,12 +74,7 @@
       } else {
         deferred.resolve(result);
       }
-    },
-    null,      // aLoadingNode
-    Services.scriptSecurityManager.getSystemPrincipal(),
-    null,      // aTriggeringPrincipal
-    Ci.nsILoadInfo.SEC_NORMAL,
-    Ci.nsIContentPolicy.TYPE_OTHER);
+    });
 
   return deferred.promise;
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/osfile/tests/xpcshell/test_osfile_async_copy.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/osfile/tests/xpcshell/test_osfile_async_copy.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/osfile/tests/xpcshell/test_osfile_async_copy.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/osfile/tests/xpcshell/test_osfile_async_copy.js	2015-05-25 20:43:42.000000000 +0000
@@ -29,9 +29,10 @@
 let reference_fetch_file = function reference_fetch_file(path) {
   let promise = Promise.defer();
   let file = new FileUtils.File(path);
-  NetUtil.asyncFetch2(
-    file,
-    function(stream, status) {
+  NetUtil.asyncFetch({
+    uri: NetUtil.newURI(file),
+    loadUsingSystemPrincipal: true
+  }, function(stream, status) {
       if (!Components.isSuccessCode(status)) {
         promise.reject(status);
         return;
@@ -48,12 +49,7 @@
       } else {
         promise.resolve(result);
       }
-    },
-    null,      // aLoadingNode
-    Services.scriptSecurityManager.getSystemPrincipal(),
-    null,      // aTriggeringPrincipal
-    Ci.nsILoadInfo.SEC_NORMAL,
-    Ci.nsIContentPolicy.TYPE_OTHER);
+    });
 
   return promise.promise;
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/osfile/tests/xpcshell/test_remove.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/osfile/tests/xpcshell/test_remove.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/osfile/tests/xpcshell/test_remove.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/osfile/tests/xpcshell/test_remove.js	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,37 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+Components.utils.import("resource://gre/modules/osfile.jsm");
+Components.utils.import("resource://gre/modules/Task.jsm");
+Components.utils.import("resource://gre/modules/Services.jsm");
+
+do_register_cleanup(function() {
+  Services.prefs.setBoolPref("toolkit.osfile.log", false);
+});
+
+function run_test() {
+  Services.prefs.setBoolPref("toolkit.osfile.log", true);
+  run_next_test();
+}
+
+add_task(function* test_ignoreAbsent() {
+  let absent_file_name = "test_osfile_front_absent.tmp";
+
+  // Removing absent files should throw if "ignoreAbsent" is true.
+  yield Assert.rejects(OS.File.remove(absent_file_name, {ignoreAbsent: false}),
+                       "OS.File.remove throws if there is no such file.");
+
+  // Removing absent files should not throw if "ignoreAbsent" is true or not
+  // defined.
+  let exception = null;
+  try {
+    yield OS.File.remove(absent_file_name, {ignoreAbsent: true});
+    yield OS.File.remove(absent_file_name);
+  } catch (ex) {
+    exception = ex;
+  }
+  Assert.ok(!exception, "OS.File.remove should not throw when not requested.");
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/osfile/tests/xpcshell/xpcshell.ini firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/osfile/tests/xpcshell/xpcshell.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/osfile/tests/xpcshell/xpcshell.ini	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/osfile/tests/xpcshell/xpcshell.ini	2015-05-25 20:43:42.000000000 +0000
@@ -24,6 +24,7 @@
 [test_creationDate.js]
 [test_exception.js]
 [test_path_constants.js]
+[test_remove.js]
 [test_removeDir.js]
 [test_reset.js]
 [test_shutdown.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/passwordmgr/content/passwordManager.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/passwordmgr/content/passwordManager.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/passwordmgr/content/passwordManager.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/passwordmgr/content/passwordManager.js	2015-05-25 20:43:42.000000000 +0000
@@ -363,7 +363,7 @@
                   getService(Components.interfaces.nsIClipboardHelper);
   var row = document.getElementById("signonsTree").currentIndex;
   var password = signonsTreeView.getCellText(row, {id : "passwordCol" });
-  clipboard.copyString(password, document);
+  clipboard.copyString(password);
   Services.telemetry.getHistogramById("PWMGR_MANAGE_COPIED_PASSWORD").add(1);
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/passwordmgr/LoginDoorhangers.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/passwordmgr/LoginDoorhangers.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/passwordmgr/LoginDoorhangers.jsm	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/passwordmgr/LoginDoorhangers.jsm	2015-05-25 20:43:42.000000000 +0000
@@ -11,6 +11,7 @@
 const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
 
 Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/LoginManagerParent.jsm");
 
 const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
@@ -27,10 +28,8 @@
   this.onListDblClick = this.onListDblClick.bind(this);
   this.onListKeyPress = this.onListKeyPress.bind(this);
 
-  this.filterString = properties.filterString;
-
-  if (properties.browser) {
-    this.browser = properties.browser;
+  for (let name of Object.getOwnPropertyNames(properties)) {
+    this[name] = properties[name];
   }
 };
 
@@ -48,20 +47,25 @@
    * web page is moved to a different chrome window by the swapDocShells method.
    */
   set browser(browser) {
+    const MAX_DATE_VALUE = new Date(8640000000000000);
+
     this._browser = browser;
 
     let doorhanger = this;
     let PopupNotifications = this.chomeDocument.defaultView.PopupNotifications;
     let notification = PopupNotifications.show(
       browser,
-      "password-fill",
+      "login-fill",
       "",
-      "password-notification-icon",
+      "login-fill-notification-icon",
       null,
       null,
       {
         dismissed: true,
-        persistWhileVisible: true,
+        // This will make the anchor persist forever even if the popup is not
+        // visible. We'll remove the notification manually when the page
+        // changes, after we had time to check its final state asynchronously.
+        timeout: MAX_DATE_VALUE,
         eventCallback: function (topic, otherBrowser) {
           switch (topic) {
             case "shown":
@@ -69,6 +73,8 @@
               // be called after the "show" method returns, so the reference to
               // "this.notification" will be available at this point.
               doorhanger.bound = true;
+              doorhanger.promiseHidden =
+                         new Promise(resolve => doorhanger.onUnbind = resolve);
               doorhanger.bind();
               break;
 
@@ -76,11 +82,12 @@
             case "removed":
               if (doorhanger.bound) {
                 doorhanger.unbind();
+                doorhanger.onUnbind();
               }
               break;
 
             case "swapping":
-              this._browser = otherBrowser;
+              doorhanger._browser = otherBrowser;
               return true;
           }
           return false;
@@ -117,6 +124,11 @@
   },
 
   /**
+   * Promise resolved as soon as the notification is hidden.
+   */
+  promiseHidden: Promise.resolve(),
+
+  /**
    * Removes the doorhanger from the browser.
    */
   remove() {
@@ -160,6 +172,18 @@
   },
 
   /**
+   * Origin for which the manual fill UI should be displayed, for example
+   * "http://www.example.com".
+   */
+  loginFormOrigin: "",
+
+  /**
+   * When no login form is present on the page, we may still display a list of
+   * logins, but we cannot offer manual filling.
+   */
+  loginFormPresent: false,
+
+  /**
    * User-editable string used to filter the list of all logins.
    */
   filterString: "",
@@ -192,6 +216,12 @@
       item.classList.add("login-fill-item");
       item.setAttribute("hostname", hostname);
       item.setAttribute("username", username);
+      if (hostname != this.loginFormOrigin) {
+        item.classList.add("different-hostname");
+      }
+      if (!this.loginFormPresent) {
+        item.setAttribute("disabled", "true");
+      }
       this.list.appendChild(item);
     }
   },
@@ -222,6 +252,23 @@
     this.fillLogin();
   },
   fillLogin() {
+    if (this.list.selectedItem.hasAttribute("disabled")) {
+      return;
+    }
+    let formLogins = Services.logins.findLogins({}, "", "", null);
+    let login = formLogins.find(login => {
+      return login.hostname == this.list.selectedItem.getAttribute("hostname") &&
+             login.username == this.list.selectedItem.getAttribute("username");
+    });
+    if (login) {
+      LoginManagerParent.fillForm({
+        browser: this.browser,
+        loginFormOrigin: this.loginFormOrigin,
+        login,
+      }).catch(Cu.reportError);
+    } else {
+      Cu.reportError("The selected login has been removed in the meantime.");
+    }
     this.hide();
   },
 };
@@ -238,7 +285,7 @@
  */
 this.LoginDoorhangers.FillDoorhanger.find = function ({ browser }) {
   let PopupNotifications = browser.ownerDocument.defaultView.PopupNotifications;
-  let notification = PopupNotifications.getNotification("password-fill",
+  let notification = PopupNotifications.getNotification("login-fill",
                                                         browser);
   return notification && notification.doorhanger;
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/passwordmgr/LoginManagerContent.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/passwordmgr/LoginManagerContent.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/passwordmgr/LoginManagerContent.jsm	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/passwordmgr/LoginManagerContent.jsm	2015-05-25 20:43:42.000000000 +0000
@@ -164,7 +164,7 @@
     return deferred.promise;
   },
 
-  receiveMessage: function (msg) {
+  receiveMessage: function (msg, window) {
     // Convert an array of logins in simple JS-object form to an array of
     // nsILoginInfo objects.
     function jsLoginsToXPCOM(logins) {
@@ -179,6 +179,16 @@
       });
     }
 
+    if (msg.name == "RemoteLogins:fillForm") {
+      this.fillForm({
+        topDocument: window.document,
+        loginFormOrigin: msg.data.loginFormOrigin,
+        loginsFound: jsLoginsToXPCOM(msg.data.logins),
+        recipes: msg.data.recipes,
+      });
+      return;
+    }
+
     let request = this._takeRequest(msg);
     switch (msg.name) {
       case "RemoteLogins:loginsFound": {
@@ -253,35 +263,145 @@
                              messageData);
   },
 
-  /*
-   * onFormPassword
-   *
-   * Called when an <input type="password"> element is added to the page
-   */
-  onFormPassword: function (event) {
-    if (!event.isTrusted)
+  onDOMFormHasPassword(event, window) {
+    if (!event.isTrusted) {
       return;
+    }
+
     let form = event.target;
 
-    let doc = form.ownerDocument;
-    let win = doc.defaultView;
-    let messageManager = messageManagerFromWindow(win);
+    // Always record the most recently added form with a password field.
+    this.stateForDocument(form.ownerDocument).loginForm = form;
+
+    this._updateLoginFormPresence(window);
+
+    let messageManager = messageManagerFromWindow(window);
     messageManager.sendAsyncMessage("LoginStats:LoginEncountered");
 
-    if (!gEnabled)
+    if (!gEnabled) {
       return;
+    }
 
-    log("onFormPassword for", form.ownerDocument.documentURI);
+    log("onDOMFormHasPassword for", form.ownerDocument.documentURI);
     this._getLoginDataFromParent(form, { showMasterPassword: true })
         .then(this.loginsFound.bind(this))
         .then(null, Cu.reportError);
   },
 
+  onPageShow(event, window) {
+    this._updateLoginFormPresence(window);
+  },
+
+  /**
+   * Maps all DOM content documents in this content process, including those in
+   * frames, to the current state used by the Login Manager.
+   */
+  loginFormStateByDocument: new WeakMap(),
+
+  /**
+   * Retrieves a reference to the state object associated with the given
+   * document. This is initialized to an empty object.
+   */
+  stateForDocument(document) {
+    let loginFormState = this.loginFormStateByDocument.get(document);
+    if (!loginFormState) {
+      loginFormState = {};
+      this.loginFormStateByDocument.set(document, loginFormState);
+    }
+    return loginFormState;
+  },
+
+  /**
+   * Compute whether there is a login form on any frame of the current page, and
+   * notify the parent process. This is one of the factors used to control the
+   * visibility of the password fill doorhanger anchor.
+   */
+  _updateLoginFormPresence(topWindow) {
+    // For the login form presence notification, we currently support only one
+    // origin for each browser, so the form origin will always match the origin
+    // of the top level document.
+    let loginFormOrigin =
+        LoginUtils._getPasswordOrigin(topWindow.document.documentURI);
+
+    // Returns the first known loginForm present in this window or in any
+    // same-origin subframes. Returns null if no loginForm is currently present.
+    let getFirstLoginForm = thisWindow => {
+      let loginForm = this.stateForDocument(thisWindow.document).loginForm;
+      if (loginForm) {
+        return loginForm;
+      }
+      for (let i = 0; i < thisWindow.frames.length; i++) {
+        let frame = thisWindow.frames[i];
+        if (LoginUtils._getPasswordOrigin(frame.document.documentURI) !=
+            loginFormOrigin) {
+          continue;
+        }
+        let loginForm = getFirstLoginForm(frame);
+        if (loginForm) {
+          return loginForm;
+        }
+      }
+      return null;
+    };
+
+    // Store the actual form to use on the state for the top-level document.
+    let topState = this.stateForDocument(topWindow.document);
+    topState.loginFormForFill = getFirstLoginForm(topWindow);
+
+    // Determine whether to show the anchor icon for the current tab.
+    let messageManager = messageManagerFromWindow(topWindow);
+    messageManager.sendAsyncMessage("RemoteLogins:updateLoginFormPresence", {
+      loginFormOrigin,
+      loginFormPresent: !!topState.loginFormForFill,
+    });
+  },
+
+  /**
+   * Perform a password fill upon user request coming from the parent process.
+   * The fill will be in the form previously identified during page navigation.
+   *
+   * @param An object with the following properties:
+   *        {
+   *          topDocument:
+   *            DOM document currently associated to the the top-level window
+   *            for which the fill is requested. This may be different from the
+   *            document that originally caused the login UI to be displayed.
+   *          loginFormOrigin:
+   *            String with the origin for which the login UI was displayed.
+   *            This must match the origin of the form used for the fill.
+   *          loginsFound:
+   *            Array containing the login to fill. While other messages may
+   *            have more logins, for this use case this is expected to have
+   *            exactly one element. The origin of the login may be different
+   *            from the origin of the form used for the fill.
+   *          recipes:
+   *            Fill recipes transmitted together with the original message.
+   *        }
+   */
+  fillForm({ topDocument, loginFormOrigin, loginsFound, recipes }) {
+    let topState = this.stateForDocument(topDocument);
+    if (!topState.loginFormForFill) {
+      log("fillForm: There is no login form anymore. The form may have been",
+          "removed or the document may have changed.");
+      return;
+    }
+    if (LoginUtils._getPasswordOrigin(topDocument.documentURI) !=
+        loginFormOrigin) {
+      log("fillForm: The requested origin doesn't match the one form the",
+          "document. This may mean we navigated to a document from a different",
+          "site before we had a chance to indicate this change in the user",
+          "interface.");
+      return;
+    }
+    this._fillForm(topState.loginFormForFill, true, true, true, true,
+                   loginsFound, recipes);
+  },
+
   loginsFound: function({ form, loginsFound, recipes }) {
     let doc = form.ownerDocument;
     let autofillForm = gAutofillForms && !PrivateBrowsingUtils.isContentWindowPrivate(doc.defaultView);
 
-    this._fillForm(form, autofillForm, false, false, loginsFound, recipes);
+    this._fillForm(form, autofillForm, false, false, false, loginsFound, recipes);
   },
 
   /*
@@ -324,7 +444,7 @@
     if (usernameField == acInputField && passwordField) {
       this._getLoginDataFromParent(acForm, { showMasterPassword: false })
           .then(({ form, loginsFound, recipes }) => {
-            this._fillForm(form, true, true, true, loginsFound, recipes);
+            this._fillForm(form, true, false, true, true, loginsFound, recipes);
           })
           .then(null, Cu.reportError);
     } else {
@@ -534,11 +654,8 @@
     return false;
   },
 
-
-  /*
-   * _onFormSubmit
-   *
-   * Called by the our observer when notified of a form submission.
+  /**
+   * Called by our observer when notified of a form submission.
    * [Note that this happens before any DOM onsubmit handlers are invoked.]
    * Looks for a password change in the submitted form, so we can update
    * our stored password.
@@ -572,11 +689,17 @@
       return;
     }
 
-    var formSubmitURL = LoginUtils._getActionOrigin(form)
+    let formSubmitURL = LoginUtils._getActionOrigin(form);
+    let messageManager = messageManagerFromWindow(win);
+
+    let recipesArray = messageManager.sendSyncMessage("RemoteLogins:findRecipes", {
+      formOrigin: hostname,
+    })[0];
+    let recipes = new Set(recipesArray);
 
     // Get the appropriate fields from the form.
     var [usernameField, newPasswordField, oldPasswordField] =
-        this._getFormFields(form, true);
+          this._getFormFields(form, true, recipes);
 
     // Need at least 1 valid password field to do anything.
     if (newPasswordField == null)
@@ -610,7 +733,6 @@
     // Make sure to pass the opener's top in case it was in a frame.
     let opener = win.opener ? win.opener.top : null;
 
-    let messageManager = messageManagerFromWindow(win);
     messageManager.sendAsyncMessage("RemoteLogins:onFormSubmit",
                                     { hostname: hostname,
                                       formSubmitURL: formSubmitURL,
@@ -626,6 +748,8 @@
    *
    * @param {HTMLFormElement} form
    * @param {bool} autofillForm denotes if we should fill the form in automatically
+   * @param {bool} clobberUsername controls if an existing username can be
+   *                               overwritten
    * @param {bool} clobberPassword controls if an existing password value can be
    *                               overwritten
    * @param {bool} userTriggered is an indication of whether this filling was triggered by
@@ -633,7 +757,7 @@
    * @param {nsILoginInfo[]} foundLogins is an array of nsILoginInfo that could be used for the form
    * @param {Set} recipes that could be used to affect how the form is filled
    */
-  _fillForm : function (form, autofillForm, clobberPassword,
+  _fillForm : function (form, autofillForm, clobberUsername, clobberPassword,
                         userTriggered, foundLogins, recipes) {
     let ignoreAutocomplete = true;
     const AUTOFILL_RESULT = {
@@ -737,7 +861,9 @@
 
       // Select a login to use for filling in the form.
       var selectedLogin;
-      if (usernameField && (usernameField.value || usernameField.disabled || usernameField.readOnly)) {
+      if (!clobberUsername && usernameField && (usernameField.value ||
+                                                usernameField.disabled ||
+                                                usernameField.readOnly)) {
         // If username was specified in the field, it's disabled or it's readOnly, only fill in the
         // password if we find a matching login.
         var username = usernameField.value.toLowerCase();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/passwordmgr/LoginManagerParent.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/passwordmgr/LoginManagerParent.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/passwordmgr/LoginManagerParent.jsm	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/passwordmgr/LoginManagerParent.jsm	2015-05-25 20:43:42.000000000 +0000
@@ -15,6 +15,10 @@
                                   "resource://gre/modules/LoginManagerContent.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "AutoCompleteE10S",
                                   "resource://gre/modules/AutoCompleteE10S.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "DeferredTask",
+                                  "resource://gre/modules/DeferredTask.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "LoginDoorhangers",
+                                  "resource://gre/modules/LoginDoorhangers.jsm");
 
 this.EXPORTED_SYMBOLS = [ "LoginManagerParent", "PasswordsMetricsProvider" ];
 
@@ -162,20 +166,32 @@
 prefChanged();
 
 var LoginManagerParent = {
+  /**
+   * Reference to the default LoginRecipesParent (instead of the initialization promise) for
+   * synchronous access. This is a temporary hack and new consumers should yield on
+   * recipeParentPromise instead.
+   *
+   * @type LoginRecipesParent
+   * @deprecated
+   */
+  _recipeManager: null,
+
   init: function() {
     let mm = Cc["@mozilla.org/globalmessagemanager;1"]
                .getService(Ci.nsIMessageListenerManager);
     mm.addMessageListener("RemoteLogins:findLogins", this);
+    mm.addMessageListener("RemoteLogins:findRecipes", this);
     mm.addMessageListener("RemoteLogins:onFormSubmit", this);
     mm.addMessageListener("RemoteLogins:autoCompleteLogins", this);
+    mm.addMessageListener("RemoteLogins:updateLoginFormPresence", this);
     mm.addMessageListener("LoginStats:LoginEncountered", this);
     mm.addMessageListener("LoginStats:LoginFillSuccessful", this);
     Services.obs.addObserver(this, "LoginStats:NewSavedPassword", false);
 
     XPCOMUtils.defineLazyGetter(this, "recipeParentPromise", () => {
       const { LoginRecipesParent } = Cu.import("resource://gre/modules/LoginRecipes.jsm", {});
-      let parent = new LoginRecipesParent();
-      return parent.initializationPromise;
+      this._recipeManager = new LoginRecipesParent();
+      return this._recipeManager.initializationPromise;
     });
 
   },
@@ -204,6 +220,11 @@
         break;
       }
 
+      case "RemoteLogins:findRecipes": {
+        let formHost = (new URL(data.formOrigin)).host;
+        return this._recipeManager.getRecipesForHost(formHost);
+      }
+
       case "RemoteLogins:onFormSubmit": {
         // TODO Verify msg.target's principals against the formOrigin?
         this.onFormSubmit(data.hostname,
@@ -216,6 +237,11 @@
         break;
       }
 
+      case "RemoteLogins:updateLoginFormPresence": {
+        this.updateLoginFormPresence(msg.target, data);
+        break;
+      }
+
       case "RemoteLogins:autoCompleteLogins": {
         this.doAutocompleteSearch(data, msg.target);
         break;
@@ -242,6 +268,33 @@
   },
 
   /**
+   * Trigger a login form fill and send relevant data (e.g. logins and recipes)
+   * to the child process (LoginManagerContent).
+   */
+  fillForm: Task.async(function* ({ browser, loginFormOrigin, login }) {
+    let recipes = [];
+    if (loginFormOrigin) {
+      let formHost;
+      try {
+        formHost = (new URL(loginFormOrigin)).host;
+        let recipeManager = yield this.recipeParentPromise;
+        recipes = recipeManager.getRecipesForHost(formHost);
+      } catch (ex) {
+        // Some schemes e.g. chrome aren't supported by URL
+      }
+    }
+
+    // Convert the array of nsILoginInfo to vanilla JS objects since nsILoginInfo
+    // doesn't support structured cloning.
+    let jsLogins = JSON.parse(JSON.stringify([login]));
+    browser.messageManager.sendAsyncMessage("RemoteLogins:fillForm", {
+      loginFormOrigin,
+      logins: jsLogins,
+      recipes,
+    });
+  }),
+
+  /**
    * Send relevant data (e.g. logins and recipes) to the child process (LoginManagerContent).
    */
   sendLoginDataToChild: Task.async(function*(showMasterPassword, formOrigin, actionOrigin,
@@ -281,14 +334,14 @@
     // If we're currently displaying a master password prompt, defer
     // processing this form until the user handles the prompt.
     if (Services.logins.uiBusy) {
-      log("deferring onFormPassword for", formOrigin);
+      log("deferring sendLoginDataToChild for", formOrigin);
       let self = this;
       let observer = {
         QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
                                                Ci.nsISupportsWeakReference]),
 
         observe: function (subject, topic, data) {
-          log("Got deferred onFormPassword notification:", topic);
+          log("Got deferred sendLoginDataToChild notification:", topic);
           // Only run observer once.
           Services.obs.removeObserver(this, "passwordmgr-crypto-login");
           Services.obs.removeObserver(this, "passwordmgr-crypto-loginCanceled");
@@ -507,5 +560,101 @@
     // Prompt user to save login (via dialog or notification bar)
     prompter = getPrompter();
     prompter.promptToSavePassword(formLogin);
-  }
+  },
+
+  /**
+   * Maps all the <browser> elements for tabs in the parent process to the
+   * current state used to display tab-specific UI.
+   *
+   * This mapping is not updated in case a web page is moved to a different
+   * chrome window by the swapDocShells method. In this case, it is possible
+   * that a UI update just requested for the login fill doorhanger and then
+   * delayed by a few hundred milliseconds will be lost. Later requests would
+   * use the new browser reference instead.
+   *
+   * Given that the case above is rare, and it would not cause any origin
+   * mismatch at the time of filling because the origin is checked later in the
+   * content process, this case is left unhandled.
+   */
+  loginFormStateByBrowser: new WeakMap(),
+
+  /**
+   * Retrieves a reference to the state object associated with the given
+   * browser. This is initialized to an empty object.
+   */
+  stateForBrowser(browser) {
+    let loginFormState = this.loginFormStateByBrowser.get(browser);
+    if (!loginFormState) {
+      loginFormState = {};
+      this.loginFormStateByBrowser.set(browser, loginFormState);
+    }
+    return loginFormState;
+  },
+
+  /**
+   * Called to indicate whether a login form on the currently loaded page is
+   * present or not. This is one of the factors used to control the visibility
+   * of the password fill doorhanger.
+   */
+  updateLoginFormPresence(browser, { loginFormOrigin, loginFormPresent }) {
+    const ANCHOR_DELAY_MS = 200;
+
+    let state = this.stateForBrowser(browser);
+
+    // Update the data to use to the latest known values. Since messages are
+    // processed in order, this will always be the latest version to use.
+    state.loginFormOrigin = loginFormOrigin;
+    state.loginFormPresent = loginFormPresent;
+
+    // Apply the data to the currently displayed icon later.
+    if (!state.anchorDeferredTask) {
+      state.anchorDeferredTask = new DeferredTask(
+        () => this.updateLoginAnchor(browser),
+        ANCHOR_DELAY_MS
+      );
+    }
+    state.anchorDeferredTask.arm();
+  },
+  updateLoginAnchor: Task.async(function* (browser) {
+    // Copy the state to use for this execution of the task. These will not
+    // change during this execution of the asynchronous function, but in case a
+    // change happens in the state, the function will be retriggered.
+    let { loginFormOrigin, loginFormPresent } = this.stateForBrowser(browser);
+
+    yield Services.logins.initializationPromise;
+
+    // Check if there are form logins for the site, ignoring formSubmitURL.
+    let hasLogins = loginFormOrigin &&
+                    Services.logins.countLogins(loginFormOrigin, "", null) > 0;
+
+    // Once this preference is removed, this version of the fill doorhanger
+    // should be enabled for Desktop only, and not for Android or B2G.
+    if (!Services.prefs.getBoolPref("signon.ui.experimental")) {
+      return;
+    }
+
+    let showLoginAnchor = loginFormPresent || hasLogins;
+
+    let fillDoorhanger = LoginDoorhangers.FillDoorhanger.find({ browser });
+    if (fillDoorhanger) {
+      if (!showLoginAnchor) {
+        fillDoorhanger.remove();
+        return;
+      }
+      // We should only update the state of the doorhanger while it is hidden.
+      yield fillDoorhanger.promiseHidden;
+      fillDoorhanger.loginFormPresent = loginFormPresent;
+      fillDoorhanger.loginFormOrigin = loginFormOrigin;
+      fillDoorhanger.filterString = loginFormOrigin;
+      return;
+    }
+    if (showLoginAnchor) {
+      fillDoorhanger = new LoginDoorhangers.FillDoorhanger({
+        browser,
+        loginFormPresent,
+        loginFormOrigin,
+        filterString: loginFormOrigin,
+      });
+    }
+  }),
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/passwordmgr/nsLoginManager.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/passwordmgr/nsLoginManager.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/passwordmgr/nsLoginManager.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/passwordmgr/nsLoginManager.js	2015-05-25 20:43:42.000000000 +0000
@@ -120,8 +120,6 @@
     // Form submit observer checks forms for new logins and pw changes.
     Services.obs.addObserver(this._observer, "xpcom-shutdown", false);
 
-    // TODO: Make this class useful in the child process (in addition to
-    // autoCompleteSearchAsync and fillForm).
     if (Services.appinfo.processType ===
         Services.appinfo.PROCESS_TYPE_DEFAULT) {
       Services.obs.addObserver(this._observer, "passwordmgr-storage-replace",
@@ -577,21 +575,6 @@
 
     return this._getPasswordOrigin(uriString, true);
   },
-
-
-  /*
-   * fillForm
-   *
-   * Fill the form with login information if we can find it.
-   */
-  fillForm : function (form) {
-    log("fillForm processing form[ id:", form.id, "]");
-    return LoginManagerContent._asyncFindLogins(form, { showMasterPassword: true })
-                              .then(function({ form, loginsFound }) {
-      return LoginManagerContent._fillForm(form, true, false, false, loginsFound)[0];
-    });
-  },
-
 }; // end of LoginManager implementation
 
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([LoginManager]);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/passwordmgr/test/browser/browser_filldoorhanger.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/passwordmgr/test/browser/browser_filldoorhanger.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/passwordmgr/test/browser/browser_filldoorhanger.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/passwordmgr/test/browser/browser_filldoorhanger.js	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,75 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+Cu.import("resource://testing-common/LoginTestUtils.jsm", this);
+
+/**
+ * All these tests require the experimental login fill UI to be enabled. We also
+ * disable autofill for login forms for easier testing of manual fill.
+ */
+add_task(function* test_initialize() {
+  Services.prefs.setBoolPref("signon.ui.experimental", true);
+  Services.prefs.setBoolPref("signon.autofillForms", false);
+  registerCleanupFunction(function () {
+    Services.prefs.clearUserPref("signon.ui.experimental");
+    Services.prefs.clearUserPref("signon.autofillForms");
+  });
+});
+
+/**
+ * Tests manual fill when the page has a login form.
+ */
+add_task(function* test_fill() {
+  Services.logins.addLogin(LoginTestUtils.testData.formLogin({
+    hostname: "https://example.com",
+    formSubmitURL: "https://example.com",
+    username: "username",
+    password: "password",
+  }));
+
+  // The anchor icon may be shown during the initial page load in the new tab,
+  // so we have to set up the observers first. When we receive the notification
+  // from PopupNotifications.jsm, we check it is the one for the right anchor.
+  let anchor = document.getElementById("login-fill-notification-icon");
+  let promiseAnchorShown =
+      TestUtils.topicObserved("PopupNotifications-updateNotShowing",
+                              () => anchor.hasAttribute("showing"));
+
+  yield BrowserTestUtils.withNewTab({
+    gBrowser,
+    url: "https://example.com/browser/toolkit/components/" +
+         "passwordmgr/test/browser/form_basic.html",
+  }, function* (browser) {
+    yield promiseAnchorShown;
+
+    let promiseShown = BrowserTestUtils.waitForEvent(PopupNotifications.panel,
+                                                     "Shown");
+    anchor.click();
+    yield promiseShown;
+
+    let list = document.getElementById("login-fill-list");
+    Assert.equal(list.childNodes.length, 1,
+                 "list.childNodes.length === 1");
+
+    let promiseHidden = BrowserTestUtils.waitForEvent(PopupNotifications.panel,
+                                                      "popuphidden");
+    list.focus();
+    EventUtils.sendMouseEvent({ type: "dblclick" }, list.childNodes[0]);
+    yield promiseHidden;
+
+    let result = yield ContentTask.spawn(browser, null, function* () {
+      let doc = content.document;
+      return {
+        username: doc.getElementById("form-basic-username").value,
+        password: doc.getElementById("form-basic-password").value,
+      }
+    });
+
+    Assert.equal(result.username, "username",
+                 'result.username === "username"');
+    Assert.equal(result.password, "password",
+                 'result.password === "password"');
+  });
+
+  Services.logins.removeAllLogins();
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/passwordmgr/test/browser/browser.ini firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/passwordmgr/test/browser/browser.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/passwordmgr/test/browser/browser.ini	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/passwordmgr/test/browser/browser.ini	2015-05-25 20:43:42.000000000 +0000
@@ -3,6 +3,7 @@
   authenticate.sjs
   form_basic.html
 
+[browser_filldoorhanger.js]
 [browser_notifications.js]
 [browser_passwordmgr_fields.js]
 [browser_passwordmgr_observers.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/passwordmgr/test/mochitest.ini firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/passwordmgr/test/mochitest.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/passwordmgr/test/mochitest.ini	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/passwordmgr/test/mochitest.ini	2015-05-25 20:43:42.000000000 +0000
@@ -14,6 +14,7 @@
   subtst_notifications_11_popup.html
   subtst_notifications_2.html
   subtst_notifications_2pw_0un.html
+  subtst_notifications_2pw_1un_1text.html
   subtst_notifications_3.html
   subtst_notifications_4.html
   subtst_notifications_5.html
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/passwordmgr/test/subtst_notifications_2pw_1un_1text.html firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/passwordmgr/test/subtst_notifications_2pw_1un_1text.html
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/passwordmgr/test/subtst_notifications_2pw_1un_1text.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/passwordmgr/test/subtst_notifications_2pw_1un_1text.html	2015-05-25 20:43:42.000000000 +0000
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Subtest for Login Manager notifications with 2 password fields and 1 username field and one other text field before the first password field</title>
+</head>
+<body>
+<h2>1 username field followed by a text field followed by 2 username fields</h2>
+<form id="form" action="formsubmit.sjs">
+  <input id="user"  name="user"  value="staticpw">
+  <input id="city"  name="city"  value="city">
+  <input id="pass"  name="pass"  type="password">
+  <input id="pin"   name="pin"   type="password" value="static-pin">
+  <button type="submit">Submit</button>
+</form>
+
+<script>
+function submitForm() {
+  userField.value = "notifyu1";
+  passField.value = "notifyp1";
+  form.submit();
+}
+
+window.onload = submitForm;
+var form      = document.getElementById("form");
+var userField = document.getElementById("user");
+var passField = document.getElementById("pass");
+
+</script>
+</body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/passwordmgr/test/test_input_events.html firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/passwordmgr/test/test_input_events.html
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/passwordmgr/test/test_input_events.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/passwordmgr/test/test_input_events.html	2015-05-25 20:43:42.000000000 +0000
@@ -28,22 +28,22 @@
     onloadFired = true;
   } else if (e.type == "input") {
     if (e.target.name == "uname") {
-      ise(e.target.value, "testuser", "Should get 'testuser' as username");
+      is(e.target.value, "testuser", "Should get 'testuser' as username");
       ok(!usernameInputFired, "Should not have gotten an input event for the username field yet.");
       usernameInputFired = true;
     } else if (e.target.name == "pword") {
-      ise(e.target.value, "testpass", "Should get 'testpass' as password");
+      is(e.target.value, "testpass", "Should get 'testpass' as password");
       ok(!passwordInputFired, "Should not have gotten an input event for the password field yet.");
       passwordInputFired = true;
     }
   } else if (e.type == "change") {
     if (e.target.name == "uname") {
-      ise(e.target.value, "testuser", "Should get 'testuser' as username");
+      is(e.target.value, "testuser", "Should get 'testuser' as username");
       ok(usernameInputFired, "Should get input event before change event for username field.");
       ok(!usernameChangeFired, "Should not have gotten a change event for the username field yet.");
       usernameChangeFired = true;
     } else if (e.target.name == "pword") {
-      ise(e.target.value, "testpass", "Should get 'testpass' as password");
+      is(e.target.value, "testpass", "Should get 'testpass' as password");
       ok(passwordInputFired, "Should get input event before change event for password field.");
       ok(!passwordChangeFired, "Should not have gotten a change event for the password field yet.");
       passwordChangeFired = true;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/passwordmgr/test/test_notifications.html firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/passwordmgr/test/test_notifications.html
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/passwordmgr/test/test_notifications.html	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/passwordmgr/test/test_notifications.html	2015-05-25 20:43:42.000000000 +0000
@@ -1,8 +1,9 @@
 <!DOCTYPE HTML>
 <html>
 <head>
+  <meta charset="utf-8">
   <title>Test for Login Manager</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <script type="text/javascript" src="notification_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
@@ -16,7 +17,7 @@
 </div>
 
 <pre id="test">
-<script class="testbody" type="text/javascript">
+<script class="testbody" type="application/javascript;version=1.8">
 
 /** Test for Login Manager: notifications. **/
 
@@ -53,6 +54,8 @@
                    "subtst_notifications_2pw_0un.html",  // 26
                    "subtst_notifications_2pw_0un.html",  // 27
                    "subtst_notifications_2pw_0un.html",  // 28
+                   "http://example.org" + testpath + "subtst_notifications_2pw_1un_1text.html", // 29
+                   "http://example.org" + testpath + "subtst_notifications_2pw_1un_1text.html", // 30
                ];
 
 
@@ -472,6 +475,44 @@
         pwmgr.removeLogin(login2);
         break;
 
+      case 29: {
+        // Check that we capture the proper fields when a field recipe is in use.
+        is(gotUser, "notifyu1", "Checking submitted username");
+        is(gotPass, "notifyp1", "Checking submitted password");
+        popup = getPopup(popupNotifications, "password-save");
+        ok(popup, "got notification popup");
+
+        // Sanity check, no logins should exist yet.
+        let logins = pwmgr.getAllLogins();
+        is(logins.length, 0, "Should not have any logins yet");
+
+        clickPopupButton(popup, kRememberButton);
+        break;
+      }
+
+      case 30: {
+        // Same subtest, make sure we didn't prompt for an existing login.
+        is(gotUser, "notifyu1", "Checking submitted username");
+        is(gotPass, "notifyp1", "Checking submitted password");
+        popup = getPopup(popupNotifications, "password-save");
+        ok(!popup, "checking for no notification popup");
+
+        // Check to make sure we updated the timestamps and use count on the
+        // existing login that was submitted for this form.
+        let logins = pwmgr.getAllLogins();
+        is(logins.length, 1, "Should only have 1 login");
+        ok(SpecialPowers.call_Instanceof(logins[0], Ci.nsILoginMetaInfo), "metainfo QI");
+        is(logins[0].username, "notifyu1", "check .username for existing login submission");
+        is(logins[0].password, "notifyp1", "check .password for existing login submission");
+        is(logins[0].timesUsed, 2, "check .timesUsed for existing login submission");
+        ok(logins[0].timeLastUsed > logins[0].timeCreated, "timeLastUsed bumped");
+        ok(logins[0].timeCreated == logins[0].timePasswordChanged, "timeChanged not updated");
+
+        // remove the added login
+        pwmgr.removeAllLogins();
+        break;
+      }
+
       default:
         ok(false, "Unexpected call to checkTest for test #" + testNum);
 
@@ -509,6 +550,9 @@
 var login2B = new nsLoginInfo("http://mochi.test:8888", "http://mochi.test:8888", null,
                               "", "notifyp1B", "", "pass");
 
+var parentScriptURL = SimpleTest.getTestFileURL("pwmgr_common.js");
+var mm = SpecialPowers.loadChromeScript(parentScriptURL);
+
 var iframe = document.getElementById("iframe");
 iframe.onload = handleLoad;
 
@@ -518,8 +562,20 @@
 ok(popupNotifications, "Got popupNotifications");
 
 var testNum = 1;
-ok(true, "Starting test #" + testNum);
-iframe.src = subtests[testNum-1];
+
+// Load recipes for this test.
+mm.sendAsyncMessage("loadRecipes", {
+  siteRecipes: [{
+    hosts: ["example.org"],
+    usernameSelector: "#user",
+    passwordSelector: "#pass",
+  }],
+});
+
+mm.addMessageListener("loadedRecipes", function loadedRecipes() {
+  ok(true, "Starting test #" + testNum);
+  iframe.src = subtests[testNum-1];
+})
 
 SimpleTest.waitForExplicitFinish();
 </script>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/perfmonitoring/AddonWatcher.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/perfmonitoring/AddonWatcher.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/perfmonitoring/AddonWatcher.jsm	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/perfmonitoring/AddonWatcher.jsm	2015-05-25 20:43:43.000000000 +0000
@@ -134,6 +134,9 @@
         longestDuration: Math.round(Math.log2(Preferences.get("browser.addon-watch.limits.longestDuration", 128))),
       };
 
+      // By default, warn only after an add-on has been spotted misbehaving 3 times.
+      let tolerance = Preferences.get("browser.addon-watch.tolerance", 3);
+
       for (let item of snapshot.componentsData) {
         let addonId = item.addonId;
         if (!item.isSystem || !addonId) {
@@ -192,6 +195,10 @@
 
           stats.alerts[filter] = (stats.alerts[filter] || 0) + 1;
 
+          if (stats.alerts[filter] % tolerance != 0) {
+            continue;
+          }
+
           try {
             this._callback(addonId, filter);
           } catch (ex) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/places/BookmarkJSONUtils.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/places/BookmarkJSONUtils.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/places/BookmarkJSONUtils.jsm	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/places/BookmarkJSONUtils.jsm	2015-05-25 20:43:43.000000000 +0000
@@ -462,9 +462,16 @@
           this._importPromises.push(kwPromise);
         }
         if (aData.tags) {
-          let tags = aData.tags.split(",");
-          if (tags.length)
-            PlacesUtils.tagging.tagURI(NetUtil.newURI(aData.uri), tags);
+          let tags = aData.tags.split(",").filter(aTag =>
+            aTag.length <= Ci.nsITaggingService.MAX_TAG_LENGTH);
+          if (tags.length) {
+            try {
+              PlacesUtils.tagging.tagURI(NetUtil.newURI(aData.uri), tags);
+            } catch (ex) {
+              // Invalid tag child, skip it.
+              Cu.reportError(`Unable to set tags "${tags.join(", ")}" for ${aData.uri}: ${ex}`);
+            }
+          }
         }
         if (aData.charset) {
           PlacesUtils.annotations.setPageAnnotation(
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/places/nsPlacesAutoComplete.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/places/nsPlacesAutoComplete.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/places/nsPlacesAutoComplete.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/places/nsPlacesAutoComplete.js	2015-05-25 20:43:43.000000000 +0000
@@ -318,7 +318,7 @@
 
     // Autocomplete often fallbacks to a table scan due to lack of text indices.
     // In such cases a larger cache helps reducing IO.  The default Storage
-    // value is MAX_CACHE_SIZE_BYTES in storage/src/mozStorageConnection.cpp.
+    // value is MAX_CACHE_SIZE_BYTES in storage/mozStorageConnection.cpp.
     let stmt = db.createAsyncStatement("PRAGMA cache_size = -6144"); // 6MiB
     stmt.executeAsync();
     stmt.finalize();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/places/nsPlacesMacros.h firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/places/nsPlacesMacros.h
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/places/nsPlacesMacros.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/places/nsPlacesMacros.h	2015-05-25 20:43:43.000000000 +0000
@@ -46,7 +46,7 @@
 
 #define PLACES_WARN_DEPRECATED()                                               \
   PR_BEGIN_MACRO                                                               \
-  nsCString msg = NS_LITERAL_CSTRING(__FUNCTION__);                            \
+  nsCString msg(__FUNCTION__);                                                 \
   msg.AppendLiteral(" is deprecated and will be removed in the next version.");\
   NS_WARNING(msg.get());                                                       \
   nsCOMPtr<nsIConsoleService> cs = do_GetService(NS_CONSOLESERVICE_CONTRACTID);\
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/places/PlacesTransactions.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/places/PlacesTransactions.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/places/PlacesTransactions.jsm	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/places/PlacesTransactions.jsm	2015-05-25 20:43:43.000000000 +0000
@@ -199,10 +199,12 @@
   get undoPosition() this._undoPosition,
 
   // Handy shortcuts
-  get topUndoEntry() this.undoPosition < this.length ?
-                     this[this.undoPosition] : null,
-  get topRedoEntry() this.undoPosition > 0 ?
-                     this[this.undoPosition - 1] : null,
+  get topUndoEntry() {
+    return this.undoPosition < this.length ? this[this.undoPosition] : null;
+  },
+  get topRedoEntry() {
+    return this.undoPosition > 0 ? this[this.undoPosition - 1] : null;
+  },
 
   // Outside of this module, the API of transactions is inaccessible, and so
   // are any internal properties.  To achieve that, transactions are proxified
@@ -219,7 +221,9 @@
    */
   proxifyTransaction: function (aRawTransaction) {
     let proxy = Object.freeze({
-      transact() TransactionsManager.transact(this)
+      transact() {
+        return TransactionsManager.transact(this);
+      }
     });
     this.proxifiedToRaw.set(proxy, aRawTransaction);
     return proxy;
@@ -232,8 +236,9 @@
    * @return true if aValue is the proxy object for some transaction, false
    * otherwise.
    */
-  isProxifiedTransactionObject:
-  function (aValue) this.proxifiedToRaw.has(aValue),
+  isProxifiedTransactionObject(aValue) {
+    return this.proxifiedToRaw.has(aValue);
+  },
 
   /**
    * Get the raw transaction for the given proxy.
@@ -242,7 +247,9 @@
    * @return the transaction proxified by aProxy; |undefined| is returned if
    * aProxy is not a proxified transaction.
    */
-  getRawTransaction(aProxy) this.proxifiedToRaw.get(aProxy),
+  getRawTransaction(aProxy) {
+    return this.proxifiedToRaw.get(aProxy);
+  },
 
   /**
    * Add a transaction either as a new entry, if forced or if there are no undo
@@ -340,7 +347,9 @@
    * @note All undo manager operations are queued. This means that transactions
    * history may change by the time your request is fulfilled.
    */
-  undo() TransactionsManager.undo(),
+  undo() {
+    return TransactionsManager.undo();
+  },
 
   /**
    * Asynchronously redo the transaction immediately before the current undo
@@ -351,7 +360,9 @@
    * @note All undo manager operations are queued. This means that transactions
    * history may change by the time your request is fulfilled.
    */
-  redo() TransactionsManager.redo(),
+  redo() {
+    return TransactionsManager.redo();
+  },
 
   /**
    * Asynchronously clear the undo, redo, or all entries from the transactions
@@ -367,13 +378,16 @@
    * @note All undo manager operations are queued. This means that transactions
    * history may change by the time your request is fulfilled.
    */
-  clearTransactionsHistory(aUndoEntries = true, aRedoEntries = true)
-    TransactionsManager.clearTransactionsHistory(aUndoEntries, aRedoEntries),
+  clearTransactionsHistory(aUndoEntries = true, aRedoEntries = true) {
+    return TransactionsManager.clearTransactionsHistory(aUndoEntries, aRedoEntries);
+  },
 
   /**
    * The numbers of entries in the transactions history.
    */
-  get length() TransactionsHistory.length,
+  get length() {
+    return TransactionsHistory.length;
+  },
 
   /**
    * Get the transaction history entry at a given index.  Each entry consists
@@ -400,17 +414,23 @@
    * Entries past this point
    * Entries at and past this point are redo entries.
    */
-  get undoPosition() TransactionsHistory.undoPosition,
+  get undoPosition() {
+    return TransactionsHistory.undoPosition;
+  },
 
   /**
    * Shortcut for accessing the top undo entry in the transaction history.
    */
-  get topUndoEntry() TransactionsHistory.topUndoEntry,
+  get topUndoEntry() {
+    return TransactionsHistory.topUndoEntry;
+  },
 
   /**
    * Shortcut for accessing the top redo entry in the transaction history.
    */
-  get topRedoEntry() TransactionsHistory.topRedoEntry
+  get topRedoEntry() {
+    return TransactionsHistory.topRedoEntry;
+  }
 };
 
 /**
@@ -461,7 +481,9 @@
   /**
    * The promise for this queue.
    */
-  get promise() this._promise
+  get promise() {
+    return this._promise;
+  }
 };
 
 let TransactionsManager = {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/places/PlacesUtils.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/places/PlacesUtils.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/places/PlacesUtils.jsm	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/places/PlacesUtils.jsm	2015-05-25 20:43:43.000000000 +0000
@@ -121,6 +121,89 @@
   gIgnoreKeywordNotifications = false;
 }
 
+/**
+ * Serializes the given node in JSON format.
+ *
+ * @param aNode
+ *        An nsINavHistoryResultNode
+ * @param aIsLivemark
+ *        Whether the node represents a livemark.
+ */
+function serializeNode(aNode, aIsLivemark) {
+  let data = {};
+
+  data.title = aNode.title;
+  data.id = aNode.itemId;
+  data.livemark = aIsLivemark;
+
+  let guid = aNode.bookmarkGuid;
+  if (guid) {
+    data.itemGuid = guid;
+    if (aNode.parent)
+      data.parent = aNode.parent.itemId;
+    let grandParent = aNode.parent && aNode.parent.parent;
+    if (grandParent)
+      data.grandParentId = grandParent.itemId;
+
+    data.dateAdded = aNode.dateAdded;
+    data.lastModified = aNode.lastModified;
+
+    let annos = PlacesUtils.getAnnotationsForItem(data.id);
+    if (annos.length > 0)
+      data.annos = annos;
+  }
+
+  if (PlacesUtils.nodeIsURI(aNode)) {
+    // Check for url validity.
+    NetUtil.newURI(aNode.uri);
+
+    // Tag root accepts only folder nodes, not URIs.
+    if (data.parent == PlacesUtils.tagsFolderId)
+      throw new Error("Unexpected node type");
+
+    data.type = PlacesUtils.TYPE_X_MOZ_PLACE;
+    data.uri = aNode.uri;
+
+    if (aNode.tags)
+      data.tags = aNode.tags;
+  }
+  else if (PlacesUtils.nodeIsContainer(aNode)) {
+    // Tag containers accept only uri nodes.
+    if (data.grandParentId == PlacesUtils.tagsFolderId)
+      throw new Error("Unexpected node type");
+
+    let concreteId = PlacesUtils.getConcreteItemId(aNode);
+    if (concreteId != -1) {
+      // This is a bookmark or a tag container.
+      if (PlacesUtils.nodeIsQuery(aNode) || concreteId != aNode.itemId) {
+        // This is a folder shortcut.
+        data.type = PlacesUtils.TYPE_X_MOZ_PLACE;
+        data.uri = aNode.uri;
+        data.concreteId = concreteId;
+      }
+      else {
+        // This is a bookmark folder.
+        data.type = PlacesUtils.TYPE_X_MOZ_PLACE_CONTAINER;
+      }
+    }
+    else {
+      // This is a grouped container query, dynamically generated.
+      data.type = PlacesUtils.TYPE_X_MOZ_PLACE;
+      data.uri = aNode.uri;
+    }
+  }
+  else if (PlacesUtils.nodeIsSeparator(aNode)) {
+    // Tag containers don't accept separators.
+    if (data.parent == PlacesUtils.tagsFolderId ||
+        data.grandParentId == PlacesUtils.tagsFolderId)
+      throw new Error("Unexpected node type");
+
+    data.type = PlacesUtils.TYPE_X_MOZ_PLACE_SEPARATOR;
+  }
+
+  return JSON.stringify(data);
+}
+
 this.PlacesUtils = {
   // Place entries that are containers, e.g. bookmark folders or queries.
   TYPE_X_MOZ_PLACE_CONTAINER: "text/x-moz-place-container",
@@ -463,181 +546,131 @@
    *        the URL to generate a rev host for.
    * @return the reversed host string.
    */
-  getReversedHost(url)
-    url.host.split("").reverse().join("") + ".",
+  getReversedHost(url) {
+    return url.host.split("").reverse().join("") + ".";
+  },
 
   /**
    * String-wraps a result node according to the rules of the specified
-   * content type.
+   * content type for copy or move operations.
+   *
    * @param   aNode
    *          The Result node to wrap (serialize)
    * @param   aType
    *          The content type to serialize as
-   * @param   [optional] aOverrideURI
+   * @param   [optional] aFeedURI
    *          Used instead of the node's URI if provided.
-   *          This is useful for wrapping a container as TYPE_X_MOZ_URL,
+   *          This is useful for wrapping a livemark as TYPE_X_MOZ_URL,
    *          TYPE_HTML or TYPE_UNICODE.
    * @return  A string serialization of the node
    */
-  wrapNode: function PU_wrapNode(aNode, aType, aOverrideURI) {
+  wrapNode(aNode, aType, aFeedURI) {
     // when wrapping a node, we want all the items, even if the original
     // query options are excluding them.
-    // this can happen when copying from the left hand pane of the bookmarks
-    // organizer
+    // This can happen when copying from the left hand pane of the bookmarks
+    // organizer.
     // @return [node, shouldClose]
-    function convertNode(cNode) {
-      if (PlacesUtils.nodeIsFolder(cNode) &&
-          cNode.type != Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT &&
-          asQuery(cNode).queryOptions.excludeItems) {
-        return [PlacesUtils.getFolderContents(cNode.itemId, false, true).root, true];
-      }
-
-      // If we didn't create our own query, do not alter the node's open state.
-      return [cNode, false];
-    }
-
-    function gatherLivemarkUrl(aNode) {
-      try {
-        return PlacesUtils.annotations
-                          .getItemAnnotation(aNode.itemId,
-                                             PlacesUtils.LMANNO_SITEURI);
-      } catch (ex) {
-        return PlacesUtils.annotations
-                          .getItemAnnotation(aNode.itemId,
-                                             PlacesUtils.LMANNO_FEEDURI);
+    function gatherDataFromNode(node, gatherDataFunc) {
+      if (PlacesUtils.nodeIsFolder(node) &&
+          node.type != Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT &&
+          asQuery(node).queryOptions.excludeItems) {
+        let node = PlacesUtils.getFolderContents(node.itemId, false, true).root;
+        try {
+          return gatherDataFunc(node);
+        } finally {
+          node.containerOpen = false;
+        }
       }
+      // If we didn't create our own query, do not alter the node's state.
+      return gatherDataFunc(node);
     }
 
-    function isLivemark(aNode) {
-      return PlacesUtils.nodeIsFolder(aNode) &&
-             PlacesUtils.annotations
-                        .itemHasAnnotation(aNode.itemId,
-                                           PlacesUtils.LMANNO_FEEDURI);
-    }
+    function gatherDataHtml(node) {
+      let htmlEscape = s => s.replace(/&/g, "&amp;")
+                             .replace(/>/g, "&gt;")
+                             .replace(/</g, "&lt;")
+                             .replace(/"/g, "&quot;")
+                             .replace(/'/g, "&apos;");
 
-    switch (aType) {
-      case this.TYPE_X_MOZ_PLACE:
-      case this.TYPE_X_MOZ_PLACE_SEPARATOR:
-      case this.TYPE_X_MOZ_PLACE_CONTAINER: {
-        let writer = {
-          value: "",
-          write: function PU_wrapNode__write(aStr, aLen) {
-            this.value += aStr;
-          }
-        };
+      // escape out potential HTML in the title
+      let escapedTitle = node.title ? htmlEscape(node.title) : "";
 
-        let [node, shouldClose] = convertNode(aNode);
-        this._serializeNodeAsJSONToOutputStream(node, writer);
-        if (shouldClose)
-          node.containerOpen = false;
-
-        return writer.value;
+      if (aFeedURI) {
+        return `<A HREF="${aFeedURI}">${escapedTitle}</A>${NEWLINE}`;
       }
-      case this.TYPE_X_MOZ_URL: {
-        let gatherDataUrl = function (bNode) {
-          if (isLivemark(bNode)) {
-            return gatherLivemarkUrl(bNode) + NEWLINE + bNode.title;
-          }
 
-          if (PlacesUtils.nodeIsURI(bNode))
-            return (aOverrideURI || bNode.uri) + NEWLINE + bNode.title;
-          // ignore containers and separators - items without valid URIs
-          return "";
-        };
-
-        let [node, shouldClose] = convertNode(aNode);
-        let dataUrl = gatherDataUrl(node);
-        if (shouldClose)
-          node.containerOpen = false;
-
-        return dataUrl;
-      }
-      case this.TYPE_HTML: {
-        let gatherDataHtml = function (bNode) {
-          let htmlEscape = function (s) {
-            s = s.replace(/&/g, "&amp;");
-            s = s.replace(/>/g, "&gt;");
-            s = s.replace(/</g, "&lt;");
-            s = s.replace(/"/g, "&quot;");
-            s = s.replace(/'/g, "&apos;");
-            return s;
-          };
-          // escape out potential HTML in the title
-          let escapedTitle = bNode.title ? htmlEscape(bNode.title) : "";
-
-          if (isLivemark(bNode)) {
-            return "<A HREF=\"" + gatherLivemarkUrl(bNode) + "\">" + escapedTitle + "</A>" + NEWLINE;
-          }
-
-          if (PlacesUtils.nodeIsContainer(bNode)) {
-            asContainer(bNode);
-            let wasOpen = bNode.containerOpen;
-            if (!wasOpen)
-              bNode.containerOpen = true;
-
-            let childString = "<DL><DT>" + escapedTitle + "</DT>" + NEWLINE;
-            let cc = bNode.childCount;
-            for (let i = 0; i < cc; ++i)
-              childString += "<DD>"
-                             + NEWLINE
-                             + gatherDataHtml(bNode.getChild(i))
-                             + "</DD>"
-                             + NEWLINE;
-            bNode.containerOpen = wasOpen;
-            return childString + "</DL>" + NEWLINE;
-          }
-          if (PlacesUtils.nodeIsURI(bNode))
-            return "<A HREF=\"" + bNode.uri + "\">" + escapedTitle + "</A>" + NEWLINE;
-          if (PlacesUtils.nodeIsSeparator(bNode))
-            return "<HR>" + NEWLINE;
-          return "";
-        }
-
-        let [node, shouldClose] = convertNode(aNode);
-        let dataHtml = gatherDataHtml(node);
-        if (shouldClose)
-          node.containerOpen = false;
+      if (PlacesUtils.nodeIsContainer(node)) {
+        asContainer(node);
+        let wasOpen = node.containerOpen;
+        if (!wasOpen)
+          node.containerOpen = true;
 
-        return dataHtml;
-      }
+        let childString = "<DL><DT>" + escapedTitle + "</DT>" + NEWLINE;
+        let cc = node.childCount;
+        for (let i = 0; i < cc; ++i) {
+          childString += "<DD>"
+                         + NEWLINE
+                         + gatherDataHtml(node.getChild(i))
+                         + "</DD>"
+                         + NEWLINE;
+        }
+        node.containerOpen = wasOpen;
+        return childString + "</DL>" + NEWLINE;
+      }
+      if (PlacesUtils.nodeIsURI(node))
+        return `<A HREF="${node.uri}">${escapedTitle}</A>${NEWLINE}`;
+      if (PlacesUtils.nodeIsSeparator(node))
+        return "<HR>" + NEWLINE;
+      return "";
     }
 
-    // Otherwise, we wrap as TYPE_UNICODE.
-    function gatherDataText(bNode) {
-      if (isLivemark(bNode)) {
-        return gatherLivemarkUrl(bNode);
+    function gatherDataText(node) {
+      if (aFeedURI) {
+        return aFeedURI;
       }
 
-      if (PlacesUtils.nodeIsContainer(bNode)) {
-        asContainer(bNode);
-        let wasOpen = bNode.containerOpen;
+      if (PlacesUtils.nodeIsContainer(node)) {
+        asContainer(node);
+        let wasOpen = node.containerOpen;
         if (!wasOpen)
-          bNode.containerOpen = true;
+          node.containerOpen = true;
 
-        let childString = bNode.title + NEWLINE;
-        let cc = bNode.childCount;
+        let childString = node.title + NEWLINE;
+        let cc = node.childCount;
         for (let i = 0; i < cc; ++i) {
-          let child = bNode.getChild(i);
+          let child = node.getChild(i);
           let suffix = i < (cc - 1) ? NEWLINE : "";
           childString += gatherDataText(child) + suffix;
         }
-        bNode.containerOpen = wasOpen;
+        node.containerOpen = wasOpen;
         return childString;
       }
-      if (PlacesUtils.nodeIsURI(bNode))
-        return (aOverrideURI || bNode.uri);
-      if (PlacesUtils.nodeIsSeparator(bNode))
+      if (PlacesUtils.nodeIsURI(node))
+        return node.uri;
+      if (PlacesUtils.nodeIsSeparator(node))
         return "--------------------";
       return "";
     }
 
-    let [node, shouldClose] = convertNode(aNode);
-    let dataText = gatherDataText(node);
-    // Convert node could pass an open container node.
-    if (shouldClose)
-      node.containerOpen = false;
+    switch (aType) {
+      case this.TYPE_X_MOZ_PLACE:
+      case this.TYPE_X_MOZ_PLACE_SEPARATOR:
+      case this.TYPE_X_MOZ_PLACE_CONTAINER: {
+        // Serialize the node to JSON.
+        return serializeNode(aNode, aFeedURI);
+      }
+      case this.TYPE_X_MOZ_URL: {
+        if (aFeedURI || PlacesUtils.nodeIsURI(aNode))
+          return (aFeedURI || aNode.uri) + NEWLINE + aNode.title;
+        return "";
+      }
+      case this.TYPE_HTML: {
+        return gatherDataFromNode(aNode, gatherDataHtml);
+      }
+    }
 
-    return dataText;
+    // Otherwise, we wrap as TYPE_UNICODE.
+    return gatherDataFromNode(aNode, gatherDataText);
   },
 
   /**
@@ -1142,207 +1175,6 @@
   },
 
   /**
-   * Serializes the given node (and all its descendents) as JSON
-   * and writes the serialization to the given output stream.
-   * 
-   * @param   aNode
-   *          An nsINavHistoryResultNode
-   * @param   aStream
-   *          An nsIOutputStream. NOTE: it only uses the write(str, len)
-   *          method of nsIOutputStream. The caller is responsible for
-   *          closing the stream.
-   */
-  _serializeNodeAsJSONToOutputStream: function (aNode, aStream) {
-    function addGenericProperties(aPlacesNode, aJSNode) {
-      aJSNode.title = aPlacesNode.title;
-      aJSNode.id = aPlacesNode.itemId;
-      let guid = aPlacesNode.bookmarkGuid;
-      if (guid) {
-        aJSNode.itemGuid = guid;
-        var parent = aPlacesNode.parent;
-        if (parent)
-          aJSNode.parent = parent.itemId;
-
-        var dateAdded = aPlacesNode.dateAdded;
-        if (dateAdded)
-          aJSNode.dateAdded = dateAdded;
-        var lastModified = aPlacesNode.lastModified;
-        if (lastModified)
-          aJSNode.lastModified = lastModified;
-
-        // XXX need a hasAnnos api
-        var annos = [];
-        try {
-          annos = PlacesUtils.getAnnotationsForItem(aJSNode.id).filter(function(anno) {
-            // XXX should whitelist this instead, w/ a pref for
-            // backup/restore of non-whitelisted annos
-            // XXX causes JSON encoding errors, so utf-8 encode
-            //anno.value = unescape(encodeURIComponent(anno.value));
-            if (anno.name == PlacesUtils.LMANNO_FEEDURI)
-              aJSNode.livemark = 1;
-            return true;
-          });
-        } catch(ex) {}
-        if (annos.length != 0)
-          aJSNode.annos = annos;
-      }
-      // XXXdietrich - store annos for non-bookmark items
-    }
-
-    function addURIProperties(aPlacesNode, aJSNode) {
-      aJSNode.type = PlacesUtils.TYPE_X_MOZ_PLACE;
-      aJSNode.uri = aPlacesNode.uri;
-      if (aJSNode.id && aJSNode.id != -1) {
-        // harvest bookmark-specific properties
-        var keyword = PlacesUtils.bookmarks.getKeywordForBookmark(aJSNode.id);
-        if (keyword)
-          aJSNode.keyword = keyword;
-      }
-
-      if (aPlacesNode.tags)
-        aJSNode.tags = aPlacesNode.tags;
-
-      // last character-set
-      var uri = PlacesUtils._uri(aPlacesNode.uri);
-      try {
-        var lastCharset = PlacesUtils.annotations.getPageAnnotation(
-                            uri, PlacesUtils.CHARSET_ANNO);
-        aJSNode.charset = lastCharset;
-      } catch (e) {}
-    }
-
-    function addSeparatorProperties(aPlacesNode, aJSNode) {
-      aJSNode.type = PlacesUtils.TYPE_X_MOZ_PLACE_SEPARATOR;
-    }
-
-    function addContainerProperties(aPlacesNode, aJSNode) {
-      var concreteId = PlacesUtils.getConcreteItemId(aPlacesNode);
-      if (concreteId != -1) {
-        // This is a bookmark or a tag container.
-        if (PlacesUtils.nodeIsQuery(aPlacesNode) ||
-            concreteId != aPlacesNode.itemId) {
-          aJSNode.type = PlacesUtils.TYPE_X_MOZ_PLACE;
-          aJSNode.uri = aPlacesNode.uri;
-          // folder shortcut
-          aJSNode.concreteId = concreteId;
-        }
-        else { // Bookmark folder or a shortcut we should convert to folder.
-          aJSNode.type = PlacesUtils.TYPE_X_MOZ_PLACE_CONTAINER;
-
-          // Mark root folders.
-          if (aJSNode.id == PlacesUtils.placesRootId)
-            aJSNode.root = "placesRoot";
-          else if (aJSNode.id == PlacesUtils.bookmarksMenuFolderId)
-            aJSNode.root = "bookmarksMenuFolder";
-          else if (aJSNode.id == PlacesUtils.tagsFolderId)
-            aJSNode.root = "tagsFolder";
-          else if (aJSNode.id == PlacesUtils.unfiledBookmarksFolderId)
-            aJSNode.root = "unfiledBookmarksFolder";
-          else if (aJSNode.id == PlacesUtils.toolbarFolderId)
-            aJSNode.root = "toolbarFolder";
-        }
-      }
-      else {
-        // This is a grouped container query, generated on the fly.
-        aJSNode.type = PlacesUtils.TYPE_X_MOZ_PLACE;
-        aJSNode.uri = aPlacesNode.uri;
-      }
-    }
-
-    function appendConvertedComplexNode(aNode, aSourceNode, aArray) {
-      var repr = {};
-
-      for (let [name, value] in Iterator(aNode))
-        repr[name] = value;
-
-      // write child nodes
-      var children = repr.children = [];
-      if (!aNode.livemark) {
-        asContainer(aSourceNode);
-        var wasOpen = aSourceNode.containerOpen;
-        if (!wasOpen)
-          aSourceNode.containerOpen = true;
-        var cc = aSourceNode.childCount;
-        for (var i = 0; i < cc; ++i) {
-          var childNode = aSourceNode.getChild(i);
-          appendConvertedNode(aSourceNode.getChild(i), i, children);
-        }
-        if (!wasOpen)
-          aSourceNode.containerOpen = false;
-      }
-
-      aArray.push(repr);
-      return true;
-    }
-
-    function appendConvertedNode(bNode, aIndex, aArray) {
-      var node = {};
-
-      // set index in order received
-      // XXX handy shortcut, but are there cases where we don't want
-      // to export using the sorting provided by the query?
-      if (aIndex)
-        node.index = aIndex;
-
-      addGenericProperties(bNode, node);
-
-      var parent = bNode.parent;
-      var grandParent = parent ? parent.parent : null;
-      if (grandParent)
-        node.grandParentId = grandParent.itemId;
-
-      if (PlacesUtils.nodeIsURI(bNode)) {
-        // Tag root accept only folder nodes
-        if (parent && parent.itemId == PlacesUtils.tagsFolderId)
-          return false;
-
-        // Check for url validity, since we can't halt while writing a backup.
-        // This will throw if we try to serialize an invalid url and it does
-        // not make sense saving a wrong or corrupt uri node.
-        try {
-          PlacesUtils._uri(bNode.uri);
-        } catch (ex) {
-          return false;
-        }
-
-        addURIProperties(bNode, node);
-      }
-      else if (PlacesUtils.nodeIsContainer(bNode)) {
-        // Tag containers accept only uri nodes
-        if (grandParent && grandParent.itemId == PlacesUtils.tagsFolderId)
-          return false;
-
-        addContainerProperties(bNode, node);
-      }
-      else if (PlacesUtils.nodeIsSeparator(bNode)) {
-        // Tag root accept only folder nodes
-        // Tag containers accept only uri nodes
-        if ((parent && parent.itemId == PlacesUtils.tagsFolderId) ||
-            (grandParent && grandParent.itemId == PlacesUtils.tagsFolderId))
-          return false;
-
-        addSeparatorProperties(bNode, node);
-      }
-
-      if (!node.feedURI && node.type == PlacesUtils.TYPE_X_MOZ_PLACE_CONTAINER)
-        return appendConvertedComplexNode(node, bNode, aArray);
-
-      aArray.push(node);
-      return true;
-    }
-
-    // serialize to stream
-    var array = [];
-    if (appendConvertedNode(aNode, null, array)) {
-      var json = JSON.stringify(array[0]);
-      aStream.write(json, json.length);
-    }
-    else {
-      throw Cr.NS_ERROR_UNEXPECTED;
-    }
-  },
-
-  /**
    * Gets the shared Sqlite.jsm readonly connection to the Places database.
    * This is intended to be used mostly internally, and by other Places modules.
    * Outside the Places component, it should be used only as a last resort.
@@ -3126,7 +2958,7 @@
     PlacesUtils.bookmarks.changeBookmarkURI(this.item.id, this.new.uri);
     // move tags from old URI to new URI
     this.item.tags = PlacesUtils.tagging.getTagsForURI(this.item.uri);
-    if (this.item.tags.length != 0) {
+    if (this.item.tags.length > 0) {
       // only untag the old URI if this is the only bookmark
       if (PlacesUtils.getBookmarksForURI(this.item.uri, {}).length == 0)
         PlacesUtils.tagging.untagURI(this.item.uri, this.item.tags);
@@ -3138,7 +2970,7 @@
   {
     PlacesUtils.bookmarks.changeBookmarkURI(this.item.id, this.item.uri);
     // move tags from new URI to old URI 
-    if (this.item.tags.length != 0) {
+    if (this.item.tags.length > 0) {
       // only untag the new URI if this is the only bookmark
       if (PlacesUtils.getBookmarksForURI(this.new.uri, {}).length == 0)
         PlacesUtils.tagging.untagURI(this.new.uri, this.item.tags);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/places/tests/bookmarks/test_1129529.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/places/tests/bookmarks/test_1129529.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/places/tests/bookmarks/test_1129529.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/places/tests/bookmarks/test_1129529.js	2015-05-25 20:43:43.000000000 +0000
@@ -0,0 +1,76 @@
+let now = Date.now() * 1000;
+
+// Test that importing bookmark data where a bookmark has a tag longer than 100
+// chars imports everything except the tags for that bookmark.
+add_task(function* () {
+  let aData = {
+    guid: "root________",
+    index: 0,
+    id: 1,
+    type: "text/x-moz-place-container",
+    dateAdded: now,
+    lastModified: now,
+    root: "placesRoot",
+    children: [{
+      guid: "unfiled_____",
+      index: 0,
+      id: 2,
+      type: "text/x-moz-place-container",
+      dateAdded: now,
+      lastModified: now,
+      root: "unfiledBookmarksFolder",
+      children: [
+        {
+          guid: "guid1",
+          index: 0,
+          id: 3,
+          charset: "UTF-8",
+          tags: "tag0",
+          type: "text/x-moz-place",
+          dateAdded: now,
+          lastModified: now,
+          uri: "http://test0.com/"
+        },
+        {
+          guid: "guid2",
+          index: 1,
+          id: 4,
+          charset: "UTF-8",
+          tags: "tag1," + "a" + "0123456789".repeat(10), // 101 chars
+          type: "text/x-moz-place",
+          dateAdded: now,
+          lastModified: now,
+          uri: "http://test1.com/"
+        },
+        {
+          guid: "guid3",
+          index: 2,
+          id: 5,
+          charset: "UTF-8",
+          tags: "tag2",
+          type: "text/x-moz-place",
+          dateAdded: now,
+          lastModified: now,
+          uri: "http://test2.com/"
+        }
+      ]
+    }]
+  };
+
+  let contentType = "application/json";
+  let uri = "data:" + contentType + "," + JSON.stringify(aData);
+  yield BookmarkJSONUtils.importFromURL(uri, false);
+
+  let [bookmarks, count] = yield PlacesBackups.getBookmarksTree();
+  let unsortedBookmarks = bookmarks.children[2].children;
+  Assert.equal(unsortedBookmarks.length, 3);
+
+  for (let i = 0; i < unsortedBookmarks.length; ++i) {
+    let bookmark = unsortedBookmarks[i];
+    Assert.equal(bookmark.charset, "UTF-8");
+    Assert.equal(bookmark.dateAdded, now);
+    Assert.equal(bookmark.lastModified, now);
+    Assert.equal(bookmark.uri, "http://test" + i + ".com/");
+    Assert.equal(bookmark.tags, "tag" + i);
+  }
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/places/tests/bookmarks/xpcshell.ini firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/places/tests/bookmarks/xpcshell.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/places/tests/bookmarks/xpcshell.ini	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/places/tests/bookmarks/xpcshell.ini	2015-05-25 20:43:43.000000000 +0000
@@ -1,6 +1,6 @@
 [DEFAULT]
 head = head_bookmarks.js
-tail = 
+tail =
 skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_1016953-renaming-uncompressed.js]
@@ -26,6 +26,7 @@
 [test_818593-store-backup-metadata.js]
 [test_992901-backup-unsorted-hierarchy.js]
 [test_997030-bookmarks-html-encode.js]
+[test_1129529.js]
 [test_async_observers.js]
 [test_bmindex.js]
 [test_bookmarks.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/places/tests/browser/browser_favicon_setAndFetchFaviconForPage.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/places/tests/browser/browser_favicon_setAndFetchFaviconForPage.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/places/tests/browser/browser_favicon_setAndFetchFaviconForPage.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/places/tests/browser/browser_favicon_setAndFetchFaviconForPage.js	2015-05-25 20:43:43.000000000 +0000
@@ -30,9 +30,11 @@
   });
 
   function getIconFile(aCallback) {
-    NetUtil.asyncFetch2(
-      favIconLocation,
-      function(inputStream, status) {
+    NetUtil.asyncFetch({
+      uri: favIconLocation,
+      loadUsingSystemPrincipal: true,
+      contentPolicyType: Ci.nsIContentPolicy.TYPE_IMAGE
+    }, function(inputStream, status) {
         if (!Components.isSuccessCode(status)) {
           ok(false, "Could not get the icon file");
           // Handle error.
@@ -51,12 +53,7 @@
         } else {
           finish();
         }
-      },
-      null,      // aLoadingNode
-      Services.scriptSecurityManager.getSystemPrincipal(),
-      null,      // aTriggeringPrincipal
-      Ci.nsILoadInfo.SEC_NORMAL,
-      Ci.nsIContentPolicy.TYPE_IMAGE);
+      });
   }
 
   function testNormal(aWindow, aCallback) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/places/UnifiedComplete.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/places/UnifiedComplete.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/places/UnifiedComplete.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/places/UnifiedComplete.js	2015-05-25 20:43:43.000000000 +0000
@@ -1572,7 +1572,7 @@
         // Autocomplete often fallbacks to a table scan due to lack of text
         // indices.  A larger cache helps reducing IO and improving performance.
         // The value used here is larger than the default Storage value defined
-        // as MAX_CACHE_SIZE_BYTES in storage/src/mozStorageConnection.cpp.
+        // as MAX_CACHE_SIZE_BYTES in storage/mozStorageConnection.cpp.
         yield conn.execute("PRAGMA cache_size = -6144"); // 6MiB
 
         yield SwitchToTabStorage.initDatabase(conn);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/reader/ReaderMode.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/reader/ReaderMode.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/reader/ReaderMode.jsm	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/reader/ReaderMode.jsm	2015-05-25 20:43:45.000000000 +0000
@@ -282,6 +282,13 @@
       dump("Reader: " + msg);
   },
 
+  _blockedHosts: [
+    "twitter.com",
+    "mail.google.com",
+    "github.com",
+    "reddit.com",
+  ],
+
   _shouldCheckUri: function (uri) {
     if (!(uri.schemeIs("http") || uri.schemeIs("https") || uri.schemeIs("file"))) {
       this.log("Not parsing URI scheme: " + uri.scheme);
@@ -294,6 +301,12 @@
       // If this doesn't work, presumably the URL is not well-formed or something
       return false;
     }
+    // Sadly, some high-profile pages have false positives, so bail early for those:
+    let asciiHost = uri.asciiHost;
+    if (this._blockedHosts.some(blockedHost => asciiHost.endsWith(blockedHost))) {
+      return false;
+    }
+
     if (!uri.filePath || uri.filePath == "/") {
       this.log("Not parsing home page: " + uri.spec);
       return false;
@@ -334,7 +347,7 @@
     let serializer = Cc["@mozilla.org/xmlextras/xmlserializer;1"].
                      createInstance(Ci.nsIDOMSerializer);
     let serializedDoc = serializer.serializeToString(doc);
-    TelemetryStopwatch.finish("READER_MOD_SERIALIZE_DOM_MS");
+    TelemetryStopwatch.finish("READER_MODE_SERIALIZE_DOM_MS");
 
     TelemetryStopwatch.start("READER_MODE_WORKER_PARSE_MS");
     let article = null;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/nsSearchService.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/nsSearchService.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/nsSearchService.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/nsSearchService.js	2015-05-25 20:43:46.000000000 +0000
@@ -2861,10 +2861,14 @@
   },
 
   get searchForm() {
+    return this._getSearchFormWithPurpose();
+  },
+
+  _getSearchFormWithPurpose(aPurpose = "") {
     // First look for a <Url rel="searchform">
     var searchFormURL = this._getURLOfType(URLTYPE_SEARCH_HTML, "searchform");
     if (searchFormURL) {
-      let submission = searchFormURL.getSubmission("", this);
+      let submission = searchFormURL.getSubmission("", this, aPurpose);
 
       // If the rel=searchform URL is not type="get" (i.e. has postData),
       // ignore it, since we can only return a URL.
@@ -2947,7 +2951,7 @@
 
     if (!aData) {
       // Return a dummy submission object with our searchForm attribute
-      return new Submission(makeURI(this.searchForm), null);
+      return new Submission(makeURI(this._getSearchFormWithPurpose(aPurpose)), null);
     }
 
     LOG("getSubmission: In data: \"" + aData + "\"; Purpose: \"" + aPurpose + "\"");
@@ -3405,20 +3409,26 @@
         cache = this._readCacheFile(cacheFile);
     }
 
-    let loadDirs = [];
+    let loadDirs = [], chromeURIs = [], chromeFiles = [];
+
+    let loadFromJARs = false;
+    try {
+      loadFromJARs = Services.prefs.getDefaultBranch(BROWSER_SEARCH_PREF)
+                             .getBoolPref("loadFromJars");
+    } catch (ex) {}
+
+    if (loadFromJARs)
+      [chromeFiles, chromeURIs] = this._findJAREngines();
+
     let locations = getDir(NS_APP_SEARCH_DIR_LIST, Ci.nsISimpleEnumerator);
     while (locations.hasMoreElements()) {
       let dir = locations.getNext().QueryInterface(Ci.nsIFile);
+      if (loadFromJARs && dir.equals(getDir(NS_APP_SEARCH_DIR)))
+        continue;
       if (dir.directoryEntries.hasMoreElements())
         loadDirs.push(dir);
     }
 
-    let loadFromJARs = getBoolPref(BROWSER_SEARCH_PREF + "loadFromJars", false);
-    let chromeURIs = [];
-    let chromeFiles = [];
-    if (loadFromJARs)
-      [chromeFiles, chromeURIs] = this._findJAREngines();
-
     let toLoad = chromeFiles.concat(loadDirs);
 
     function modifiedDir(aDir) {
@@ -3475,12 +3485,29 @@
         cache = yield checkForSyncCompletion(this._asyncReadCacheFile(cacheFilePath));
       }
 
-      // Add all the non-empty directories of NS_APP_SEARCH_DIR_LIST to
-      // loadDirs.
-      let loadDirs = [];
+      let loadDirs = [], chromeURIs = [], chromeFiles = [];
+
+      let loadFromJARs = false;
+      try {
+        loadFromJARs = Services.prefs.getDefaultBranch(BROWSER_SEARCH_PREF)
+                               .getBoolPref("loadFromJars");
+      } catch (ex) {}
+
+      if (loadFromJARs) {
+        Services.obs.notifyObservers(null, SEARCH_SERVICE_TOPIC, "find-jar-engines");
+        [chromeFiles, chromeURIs] =
+          yield checkForSyncCompletion(this._asyncFindJAREngines());
+      }
+
+      // Add the non-empty directories of NS_APP_SEARCH_DIR_LIST to
+      // loadDirs...
       let locations = getDir(NS_APP_SEARCH_DIR_LIST, Ci.nsISimpleEnumerator);
       while (locations.hasMoreElements()) {
         let dir = locations.getNext().QueryInterface(Ci.nsIFile);
+        // ... but skip the application directory if we are loading from JAR.
+        if (loadFromJARs && dir.equals(getDir(NS_APP_SEARCH_DIR)))
+          continue;
+
         let iterator = new OS.File.DirectoryIterator(dir.path,
                                                      { winPattern: "*.xml" });
         try {
@@ -3494,15 +3521,6 @@
         }
       }
 
-      let loadFromJARs = getBoolPref(BROWSER_SEARCH_PREF + "loadFromJars", false);
-      let chromeURIs = [];
-      let chromeFiles = [];
-      if (loadFromJARs) {
-        Services.obs.notifyObservers(null, SEARCH_SERVICE_TOPIC, "find-jar-engines");
-        [chromeFiles, chromeURIs] =
-          yield checkForSyncCompletion(this._asyncFindJAREngines());
-      }
-
       let toLoad = chromeFiles.concat(loadDirs);
       function hasModifiedDir(aList) {
         return Task.spawn(function() {
@@ -3867,7 +3885,8 @@
 
     let rootURIPref = ""
     try {
-      rootURIPref = Services.prefs.getCharPref(BROWSER_SEARCH_PREF + "jarURIs");
+      rootURIPref = Services.prefs.getDefaultBranch(BROWSER_SEARCH_PREF)
+                            .getCharPref("jarURIs");
     } catch (ex) {}
 
     if (!rootURIPref) {
@@ -3883,27 +3902,25 @@
     rootURIs.forEach(function (root) {
       // Find the underlying JAR file for this chrome package (_loadEngines uses
       // it to determine whether it needs to invalidate the cache)
-      let chromeFile;
+      let jarPackaging = false;
       try {
         let chromeURI = gChromeReg.convertChromeURL(makeURI(root));
-        let fileURI = chromeURI; // flat packaging
-        while (fileURI instanceof Ci.nsIJARURI)
-          fileURI = fileURI.JARFile; // JAR packaging
-        fileURI.QueryInterface(Ci.nsIFileURL);
-        chromeFile = fileURI.file;
+        if (chromeURI instanceof Ci.nsIJARURI) {
+          let fileURI = chromeURI;
+          while (fileURI instanceof Ci.nsIJARURI)
+            fileURI = fileURI.JARFile;
+          fileURI.QueryInterface(Ci.nsIFileURL);
+          chromeFiles.push(fileURI.file);
+          jarPackaging = true;
+        }
       } catch (ex) {
         LOG("_findJAREngines: failed to get chromeFile for " + root + ": " + ex);
-      }
-
-      if (!chromeFile)
         return;
-
-      chromeFiles.push(chromeFile);
+      }
 
       // Read list.txt from the chrome package to find the engines we need to
       // load
       let listURL = root + "list.txt";
-      let names = [];
       try {
         let chan = NetUtil.ioService.newChannelFromURI2(makeURI(listURL),
                                                         null,      // aLoadingNode
@@ -3915,14 +3932,22 @@
                   createInstance(Ci.nsIScriptableInputStream);
         sis.init(chan.open());
         let list = sis.read(sis.available());
-        names = list.split("\n").filter(function (n) !!n);
+        let names = list.split("\n").filter(function (n) !!n);
+        for (let name of names) {
+          let uri = root + name + ".xml";
+          uris.push(uri);
+          if (!jarPackaging) {
+            // Flat packaging requires that _loadEngines checks the modification
+            // time of each engine file.
+            uri = gChromeReg.convertChromeURL(makeURI(uri));
+            chromeFiles.push(uri.QueryInterface(Ci.nsIFileURL).file);
+          }
+        }
       } catch (ex) {
         LOG("_findJAREngines: failed to retrieve list.txt from " + listURL + ": " + ex);
 
         return;
       }
-
-      names.forEach(function (n) uris.push(root + n + ".xml"));
     });
 
     return [chromeFiles, uris];
@@ -3940,7 +3965,8 @@
 
       let rootURIPref = "";
       try {
-        rootURIPref = Services.prefs.getCharPref(BROWSER_SEARCH_PREF + "jarURIs");
+        rootURIPref = Services.prefs.getDefaultBranch(BROWSER_SEARCH_PREF)
+                              .getCharPref("jarURIs");
       } catch (ex) {}
 
       if (!rootURIPref) {
@@ -3955,24 +3981,22 @@
       for (let root of rootURIs) {
         // Find the underlying JAR file for this chrome package (_loadEngines uses
         // it to determine whether it needs to invalidate the cache)
-        let chromeFile;
+        let jarPackaging = false;
         try {
           let chromeURI = gChromeReg.convertChromeURL(makeURI(root));
-          let fileURI = chromeURI; // flat packaging
-          while (fileURI instanceof Ci.nsIJARURI)
-            fileURI = fileURI.JARFile; // JAR packaging
-          fileURI.QueryInterface(Ci.nsIFileURL);
-          chromeFile = fileURI.file;
+          if (chromeURI instanceof Ci.nsIJARURI) {
+            let fileURI = chromeURI;
+            while (fileURI instanceof Ci.nsIJARURI)
+              fileURI = fileURI.JARFile;
+            fileURI.QueryInterface(Ci.nsIFileURL);
+            chromeFiles.push(fileURI.file);
+            jarPackaging = true;
+          }
         } catch (ex) {
           LOG("_asyncFindJAREngines: failed to get chromeFile for " + root + ": " + ex);
-        }
-
-        if (!chromeFile) {
           return;
         }
 
-        chromeFiles.push(chromeFile);
-
         // Read list.txt from the chrome package to find the engines we need to
         // load
         let listURL = root + "list.txt";
@@ -3993,7 +4017,16 @@
 
         let names = [];
         names = list.split("\n").filter(function (n) !!n);
-        names.forEach(function (n) uris.push(root + n + ".xml"));
+        for (let name of names) {
+          let uri = root + name + ".xml";
+          uris.push(uri);
+          if (!jarPackaging) {
+            // Flat packaging requires that _loadEngines checks the modification
+            // time of each engine file.
+            uri = gChromeReg.convertChromeURL(makeURI(uri));
+            chromeFiles.push(uri.QueryInterface(Ci.nsIFileURL).file);
+          }
+        }
       }
       throw new Task.Result([chromeFiles, uris]);
     });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/data/engine-app.xml firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/data/engine-app.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/data/engine-app.xml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/data/engine-app.xml	2015-05-25 20:43:46.000000000 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+<ShortName>TestEngineApp</ShortName>
+<Description>A test search engine installed in the application directory</Description>
+<InputEncoding>ISO-8859-1</InputEncoding>
+<Url type="text/html" method="GET" template="http://localhost/" resultdomain="localhost">
+  <Param name="q" value="{searchTerms}"/>
+</Url>
+</SearchPlugin>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/data/engine-rel-searchform-purpose.xml firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/data/engine-rel-searchform-purpose.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/data/engine-rel-searchform-purpose.xml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/data/engine-rel-searchform-purpose.xml	2015-05-25 20:43:46.000000000 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+<ShortName>engine-rel-searchform-purpose</ShortName>
+<Url type="text/html" method="GET" template="http://www.google.com/search" resultdomain="google.com" rel="searchform">
+  <Param name="q" value="{searchTerms}"/>
+  <!-- Dynamic parameters -->
+  <MozParam name="channel" condition="purpose" purpose="contextmenu" value="rcs"/>
+  <MozParam name="channel" condition="purpose" purpose="keyword" value="fflb"/>
+  <MozParam name="channel" condition="purpose" purpose="searchbar" value="sb"/>
+</Url>
+</SearchPlugin>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/head_search.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/head_search.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/head_search.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/head_search.js	2015-05-25 20:43:46.000000000 +0000
@@ -72,6 +72,31 @@
 }
 
 /**
+ * Configure preferences to load engines from
+ * chrome://testsearchplugin/locale/searchplugins/
+ * unless the loadFromJars parameter is set to false.
+ */
+function configureToLoadJarEngines(loadFromJars = true)
+{
+  let defaultBranch = Services.prefs.getDefaultBranch(null);
+
+  let url = "chrome://testsearchplugin/locale/searchplugins/";
+  defaultBranch.setCharPref("browser.search.jarURIs", url);
+
+  defaultBranch.setBoolPref("browser.search.loadFromJars", loadFromJars);
+
+  // Give the pref a user set value that is the opposite of the default,
+  // to ensure user set values are ignored.
+  Services.prefs.setBoolPref("browser.search.loadFromJars", !loadFromJars)
+
+  // Ensure a test engine exists in the app dir anyway.
+  let dir = Services.dirsvc.get(NS_APP_SEARCH_DIR, Ci.nsIFile);
+  if (!dir.exists())
+    dir.create(dir.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
+  do_get_file("data/engine-app.xml").copyTo(dir, "app.xml");
+}
+
+/**
  * Clean the profile of any metadata files left from a previous run.
  */
 function removeMetadata()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/test_645970.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/test_645970.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/test_645970.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/test_645970.js	2015-05-25 20:43:46.000000000 +0000
@@ -12,10 +12,7 @@
 
   do_load_manifest("data/chrome.manifest");
 
-  let url  = "chrome://testsearchplugin/locale/searchplugins/";
-  Services.prefs.setCharPref("browser.search.jarURIs", url);
-
-  Services.prefs.setBoolPref("browser.search.loadFromJars", true);
+  configureToLoadJarEngines();
 
   // The search service needs to be started after the jarURIs pref has been
   // set in order to initiate it correctly
@@ -23,4 +20,3 @@
   do_check_neq(engine, null);
   Services.obs.notifyObservers(null, "quit-application", null);
 }
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/test_async_app.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/test_async_app.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/test_async_app.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/test_async_app.js	2015-05-25 20:43:46.000000000 +0000
@@ -0,0 +1,30 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function run_test() {
+  do_test_pending();
+
+  removeMetadata();
+  removeCacheFile();
+
+  do_load_manifest("data/chrome.manifest");
+
+  configureToLoadJarEngines(false);
+
+  do_check_false(Services.search.isInitialized);
+
+  Services.search.init(function search_initialized(aStatus) {
+    do_check_true(Components.isSuccessCode(aStatus));
+    do_check_true(Services.search.isInitialized);
+
+    // test engine from dir is loaded.
+    let engine = Services.search.getEngineByName("TestEngineApp");
+    do_check_neq(engine, null);
+
+    // test jar engine is not loaded.
+    engine = Services.search.getEngineByName("bug645970");
+    do_check_eq(engine, null);
+
+    do_test_finished();
+  });
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/test_async.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/test_async.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/test_async.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/test_async.js	2015-05-25 20:43:46.000000000 +0000
@@ -9,9 +9,7 @@
 
   do_load_manifest("data/chrome.manifest");
 
-  let url  = "chrome://testsearchplugin/locale/searchplugins/";
-  Services.prefs.setCharPref("browser.search.jarURIs", url);
-  Services.prefs.setBoolPref("browser.search.loadFromJars", true);
+  configureToLoadJarEngines();
 
   do_check_false(Services.search.isInitialized);
 
@@ -19,18 +17,14 @@
     do_check_true(Components.isSuccessCode(aStatus));
     do_check_true(Services.search.isInitialized);
 
-    // test engines from dir are loaded.
+    // test engines from dir are not loaded.
     let engines = Services.search.getEngines();
-    do_check_true(engines.length > 1);
+    do_check_eq(engines.length, 1);
 
     // test jar engine is loaded ok.
     let engine = Services.search.getEngineByName("bug645970");
     do_check_neq(engine, null);
 
-    Services.prefs.clearUserPref("browser.search.jarURIs");
-    Services.prefs.clearUserPref("browser.search.loadFromJars");
-
     do_test_finished();
   });
 }
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/test_identifiers.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/test_identifiers.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/test_identifiers.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/test_identifiers.js	2015-05-25 20:43:46.000000000 +0000
@@ -14,9 +14,7 @@
   removeCacheFile();
   do_load_manifest("data/chrome.manifest");
 
-  let url  = "chrome://testsearchplugin/locale/searchplugins/";
-  Services.prefs.setCharPref("browser.search.jarURIs", url);
-  Services.prefs.setBoolPref("browser.search.loadFromJars", true);
+  configureToLoadJarEngines();
 
   updateAppInfo();
 
@@ -56,4 +54,3 @@
     run_next_test();
   });
 });
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/test_json_cache.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/test_json_cache.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/test_json_cache.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/test_json_cache.js	2015-05-25 20:43:46.000000000 +0000
@@ -28,6 +28,10 @@
   return _dirSvc.get(aKey, aIFace || Ci.nsIFile);
 }
 
+function makeURI(uri) {
+  return Services.io.newURI(uri, null, null);
+}
+
 let cacheTemplate, appPluginsPath, profPlugins;
 
 /**
@@ -51,12 +55,59 @@
   let engineTemplateFile = do_get_file("data/engine.xml");
   engineTemplateFile.copyTo(engineFile.parent, "test-search-engine.xml");
 
-  // Add the app's searchplugins directory to the cache so it won't be ignored.
-  let appSearchPlugins = getDir(NS_APP_SEARCH_DIR);
-  appPluginsPath = appSearchPlugins.path;
-  cacheTemplate.directories[appPluginsPath] = {};
-  cacheTemplate.directories[appPluginsPath].lastModifiedTime = appSearchPlugins.lastModifiedTime;
-  cacheTemplate.directories[appPluginsPath].engines = [];
+  // Add the application's built-in plugin locations to the cache so it won't be ignored.
+  let filesToIgnore = []
+  let defaultBranch = Services.prefs.getDefaultBranch(BROWSER_SEARCH_PREF);
+
+  let loadFromJARs = false;
+  try {
+    loadFromJARs = defaultBranch.getBoolPref("loadFromJars");
+  } catch (ex) {}
+
+  if (!loadFromJARs) {
+    filesToIgnore.push(getDir(NS_APP_SEARCH_DIR));
+  } else {
+    let rootURIPref = defaultBranch.getCharPref("jarURIs");
+    let rootURIs = rootURIPref.split(",");
+    for (let root of rootURIs) {
+      let chromeReg = Cc["@mozilla.org/chrome/chrome-registry;1"].
+                        getService(Ci.nsIChromeRegistry);
+      let chromeURI = chromeReg.convertChromeURL(makeURI(root));
+      if (chromeURI instanceof Ci.nsIJARURI) {
+        // JAR packaging, we only need the parent jar file.
+        let fileURI = chromeURI; // flat packaging
+        while (fileURI instanceof Ci.nsIJARURI)
+          fileURI = fileURI.JARFile;
+        fileURI.QueryInterface(Ci.nsIFileURL);
+        filesToIgnore.push(fileURI.file);
+      } else {
+        // flat packaging, we need to find each .xml file.
+        let listURL = root + "list.txt";
+        let chan = NetUtil.ioService.newChannelFromURI2(makeURI(listURL),
+                                                        null, // aLoadingNode
+                                                        Services.scriptSecurityManager.getSystemPrincipal(),
+                                                        null, // aTriggeringPrincipal
+                                                        Ci.nsILoadInfo.SEC_NORMAL,
+                                                        Ci.nsIContentPolicy.TYPE_OTHER);
+        let sis = Cc["@mozilla.org/scriptableinputstream;1"].
+                  createInstance(Ci.nsIScriptableInputStream);
+        sis.init(chan.open());
+        let list = sis.read(sis.available());
+        let names = list.split("\n").filter(n => !!n);
+        for (let name of names) {
+          let uri = chromeReg.convertChromeURL(makeURI(root + name + ".xml"));
+          filesToIgnore.push(uri.QueryInterface(Ci.nsIFileURL).file);
+        }
+      }
+    }
+  }
+
+  for (let file of filesToIgnore) {
+    cacheTemplate.directories[file.path] = {
+      lastModifiedTime: file.lastModifiedTime,
+      engines: []
+    };
+  }
 
   // Replace the profile placeholder with the correct path.
   profPlugins = engineFile.parent.path;
@@ -160,8 +211,12 @@
         // Check that the search.json cache matches the template
 
         let cacheWritten = readJSONFile(cache);
-        // Delete the app search plugins directory from the template since it's not currently written out.
-        delete cacheTemplate.directories[appPluginsPath];
+
+        // Delete the empty dirs from the template since they are not written out.
+        for (let dir of Object.keys(cacheTemplate.directories)) {
+          if (!cacheTemplate.directories[dir].engines.length)
+            delete cacheTemplate.directories[dir];
+        }
 
         do_print("Check search.json");
         isSubObjectOf(cacheTemplate, cacheWritten);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/test_purpose.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/test_purpose.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/test_purpose.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/test_purpose.js	2015-05-25 20:43:46.000000000 +0000
@@ -46,5 +46,13 @@
   check_submission("&channel=fflb", "foo", "application/x-moz-default-purpose", "keyword");
   check_submission("",              "foo", "application/x-moz-default-purpose", "invalid");
 
+  // Tests for a purpose on the search form (ie. empty query).
+  [engine] = yield addTestEngines([
+    { name: "engine-rel-searchform-purpose", xmlFileName: "engine-rel-searchform-purpose.xml" }
+  ]);
+  base = "http://www.google.com/search?q=";
+  check_submission("&channel=sb", "", null,        "searchbar");
+  check_submission("&channel=sb", "", "text/html", "searchbar");
+
   do_test_finished();
 });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/test_serialize_file.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/test_serialize_file.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/test_serialize_file.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/test_serialize_file.js	2015-05-25 20:43:46.000000000 +0000
@@ -38,19 +38,16 @@
   engine.addParam("param-name", "param-value", null);
 
   function readAsyncFile(aFile, aCallback) {
-    NetUtil.asyncFetch2(
-      aFile,
-      function(inputStream, status) {
+    NetUtil.asyncFetch({
+      uri: NetUtil.newURI(aFile),
+      loadUsingSystemPrincipal: true,
+      contentPolicyType: Ci.nsIContentPolicy.TYPE_DATAREQUEST
+    }, function(inputStream, status) {
         do_check_true(Components.isSuccessCode(status));
 
         let data = NetUtil.readInputStreamToString(inputStream, inputStream.available());
         aCallback(data);
-      },
-      null,      // aLoadingNode
-      Services.scriptSecurityManager.getSystemPrincipal(),
-      null,      // aTriggeringPrincipal
-      Ci.nsILoadInfo.SEC_NORMAL,
-      Ci.nsIContentPolicy.TYPE_DATAREQUEST);
+      });
   }
 
   let observer = function(aSubject, aTopic, aData) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/test_sync_app.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/test_sync_app.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/test_sync_app.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/test_sync_app.js	2015-05-25 20:43:46.000000000 +0000
@@ -0,0 +1,23 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function run_test() {
+  removeMetadata();
+  removeCacheFile();
+
+  do_load_manifest("data/chrome.manifest");
+
+  configureToLoadJarEngines(false);
+
+  do_check_false(Services.search.isInitialized);
+
+  // test engine from dir is loaded.
+  let engine = Services.search.getEngineByName("TestEngineApp");
+  do_check_neq(engine, null);
+
+  do_check_true(Services.search.isInitialized);
+
+  // test jar engine is not loaded.
+  engine = Services.search.getEngineByName("bug645970");
+  do_check_eq(engine, null);
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/test_sync_delay_fallback.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/test_sync_delay_fallback.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/test_sync_delay_fallback.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/test_sync_delay_fallback.js	2015-05-25 20:43:46.000000000 +0000
@@ -9,9 +9,7 @@
 
   do_load_manifest("data/chrome.manifest");
 
-  let url  = "chrome://testsearchplugin/locale/searchplugins/";
-  Services.prefs.setCharPref("browser.search.jarURIs", url);
-  Services.prefs.setBoolPref("browser.search.loadFromJars", true);
+  configureToLoadJarEngines();
 
   do_check_false(Services.search.isInitialized);
   let fallback = false;
@@ -21,17 +19,14 @@
     do_check_true(Components.isSuccessCode(aStatus));
     do_check_true(Services.search.isInitialized);
 
-    // test engines from dir are loaded.
+    // test engines from dir are not loaded.
     let engines = Services.search.getEngines();
-    do_check_true(engines.length > 1);
+    do_check_eq(engines.length, 1);
 
     // test jar engine is loaded ok.
     let engine = Services.search.getEngineByName("bug645970");
     do_check_neq(engine, null);
 
-    Services.prefs.clearUserPref("browser.search.jarURIs");
-    Services.prefs.clearUserPref("browser.search.loadFromJars");
-
     do_test_finished();
   });
 
@@ -43,9 +38,9 @@
 
       do_check_false(Services.search.isInitialized);
 
-      // test engines from dir are loaded.
+      // test engines from dir are not loaded.
       let engines = Services.search.getEngines();
-      do_check_true(engines.length > 1);
+      do_check_eq(engines.length, 1);
 
       // test jar engine is loaded ok.
       let engine = Services.search.getEngineByName("bug645970");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/test_sync_fallback.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/test_sync_fallback.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/test_sync_fallback.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/test_sync_fallback.js	2015-05-25 20:43:46.000000000 +0000
@@ -9,9 +9,7 @@
 
   do_load_manifest("data/chrome.manifest");
 
-  let url  = "chrome://testsearchplugin/locale/searchplugins/";
-  Services.prefs.setCharPref("browser.search.jarURIs", url);
-  Services.prefs.setBoolPref("browser.search.loadFromJars", true);
+  configureToLoadJarEngines();
 
   do_check_false(Services.search.isInitialized);
 
@@ -19,25 +17,22 @@
     do_check_true(Components.isSuccessCode(aStatus));
     do_check_true(Services.search.isInitialized);
 
-    // test engines from dir are loaded.
+    // test engines from dir are not loaded.
     let engines = Services.search.getEngines();
-    do_check_true(engines.length > 1);
+    do_check_eq(engines.length, 1);
 
     // test jar engine is loaded ok.
     let engine = Services.search.getEngineByName("bug645970");
     do_check_neq(engine, null);
 
-    Services.prefs.clearUserPref("browser.search.jarURIs");
-    Services.prefs.clearUserPref("browser.search.loadFromJars");
-
     do_test_finished();
   });
 
   do_check_false(Services.search.isInitialized);
 
-  // test engines from dir are loaded.
+  // test engines from dir are not loaded.
   let engines = Services.search.getEngines();
-  do_check_true(engines.length > 1);
+  do_check_eq(engines.length, 1);
 
   do_check_true(Services.search.isInitialized);
 
@@ -45,4 +40,3 @@
   let engine = Services.search.getEngineByName("bug645970");
   do_check_neq(engine, null);
 }
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/test_sync.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/test_sync.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/test_sync.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/test_sync.js	2015-05-25 20:43:46.000000000 +0000
@@ -7,23 +7,17 @@
 
   do_load_manifest("data/chrome.manifest");
 
-  let url  = "chrome://testsearchplugin/locale/searchplugins/";
-  Services.prefs.setCharPref("browser.search.jarURIs", url);
-  Services.prefs.setBoolPref("browser.search.loadFromJars", true);
+  configureToLoadJarEngines();
 
   do_check_false(Services.search.isInitialized);
 
-  // test engines from dir are loaded.
+  // test engines from dir are not loaded.
   let engines = Services.search.getEngines();
-  do_check_true(engines.length > 1);
+  do_check_eq(engines.length, 1);
 
   do_check_true(Services.search.isInitialized);
 
   // test jar engine is loaded ok.
   let engine = Services.search.getEngineByName("bug645970");
   do_check_neq(engine, null);
-
-  Services.prefs.clearUserPref("browser.search.jarURIs");
-  Services.prefs.clearUserPref("browser.search.loadFromJars");
 }
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/xpcshell.ini firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/xpcshell.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/search/tests/xpcshell/xpcshell.ini	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/search/tests/xpcshell/xpcshell.ini	2015-05-25 20:43:46.000000000 +0000
@@ -8,10 +8,12 @@
   data/engine.src
   data/engine.xml
   data/engine2.xml
+  data/engine-app.xml
   data/engine-fr.xml
   data/engineMaker.sjs
   data/engine-rel-searchform.xml
   data/engine-rel-searchform-post.xml
+  data/engine-rel-searchform-purpose.xml
   data/engineImages.xml
   data/ico-size-16x16-png.ico
   data/invalid-engine.xml
@@ -53,7 +55,9 @@
 [test_serialize_file.js]
 [test_searchSuggest.js]
 [test_async.js]
+[test_async_app.js]
 [test_sync.js]
+[test_sync_app.js]
 [test_sync_fallback.js]
 [test_sync_delay_fallback.js]
 [test_rel_searchform.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/social/MozSocialAPI.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/social/MozSocialAPI.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/social/MozSocialAPI.jsm	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/social/MozSocialAPI.jsm	2015-05-25 20:43:46.000000000 +0000
@@ -298,16 +298,8 @@
     return;
   }
 
-  let thisCallback = function(chatbox) {
-    // All social chat windows get a special error listener.
-    Social.setErrorListener(chatbox.content, function(aBrowser) {
-      aBrowser.webNavigation.loadURI("about:socialerror?mode=compactInfo&origin=" +
-                             encodeURIComponent(aBrowser.getAttribute("origin")),
-                             null, null, null, null);
-    });
-  }
   let chatbox = Chat.open(contentWindow, provider.origin, provider.name,
-                          fullURI.spec, mode, undefined, thisCallback);
+                          fullURI.spec, mode);
   if (callback) {
     chatbox.promiseChatLoaded.then(() => {
       callback(chatbox.contentWindow);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/docs/environment.rst firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/docs/environment.rst
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/docs/environment.rst	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/docs/environment.rst	2015-05-25 20:43:46.000000000 +0000
@@ -34,6 +34,7 @@
       settings: {
         blocklistEnabled: <bool>, // true on failure
         isDefaultBrowser: <bool>, // null on failure, not available on Android
+        defaultSearchEngine: <string>, // e.g. "yahoo"
         e10sEnabled: <bool>, // false on failure
         telemetryEnabled: <bool>, // false on failure
         locale: <string>, // e.g. "it", null on failure
@@ -189,3 +190,16 @@
         persona: <string>, // id of the current persona, null on GONK
       },
     }
+
+Settings
+--------
+
+defaultSearchEngine
+~~~~~~~~~~~~~~~~~~~
+Contains the string identifier or name of the default search engine provider. This will not be present in environment data collected before the Search Service initialization.
+
+The special value ``NONE`` could occur if there is no default search engine.
+
+The special value ``UNDEFINED`` could occur if a default search engine exists but its identifier could not be determined.
+
+This field's contents are ``Services.search.defaultEngine.identifier`` (if defined) or ``"other-"`` + ``Services.search.defaultEngine.name`` if not. In other words, search engines without an ``.identifier`` are prefixed with ``other-``.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/gen-histogram-bucket-ranges.py firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/gen-histogram-bucket-ranges.py
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/gen-histogram-bucket-ranges.py	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/gen-histogram-bucket-ranges.py	2015-05-25 20:43:46.000000000 +0000
@@ -17,10 +17,11 @@
 startup_histogram_re = re.compile("SQLITE|HTTP|SPDY|CACHE|DNS")
 
 def main(argv):
-    filename = argv[0]
+    filenames = argv
+
     all_histograms = OrderedDict()
 
-    for histogram in histogram_tools.from_file(filename):
+    for histogram in histogram_tools.from_files(filenames):
         name = histogram.name()
         parameters = OrderedDict()
         table = {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/gen-histogram-data.py firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/gen-histogram-data.py
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/gen-histogram-data.py	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/gen-histogram-data.py	2015-05-25 20:43:46.000000000 +0000
@@ -187,9 +187,9 @@
     print "#endif"
 
 def main(argv):
-    filename = argv[0]
+    filenames = argv
 
-    histograms = list(histogram_tools.from_file(filename))
+    histograms = list(histogram_tools.from_files(filenames))
 
     print banner
     write_histogram_table(histograms)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/gen-histogram-enum.py firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/gen-histogram-enum.py
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/gen-histogram-enum.py	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/gen-histogram-enum.py	2015-05-25 20:43:46.000000000 +0000
@@ -3,28 +3,63 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Write out a C++ enum definition whose members are the names of
-# histograms.  The histograms are defined in a file provided as a
-# command-line argument.
+# histograms as well as the following other members:
+#
+#   - HistogramCount
+#   - HistogramFirstUseCounter
+#   - HistogramLastUseCounter
+#   - HistogramUseCounterCount
+#
+# The histograms are defined in files provided as command-line arguments.
 
-import sys
 import histogram_tools
+import itertools
+import sys
 
 banner = """/* This file is auto-generated, see gen-histogram-enum.py.  */
 """
 
 def main(argv):
-    filename = argv[0]
+    filenames = argv
 
     print banner
     print "enum ID : uint32_t {"
-    for histogram in histogram_tools.from_file(filename):
-        cpp_guard = histogram.cpp_guard()
-        if cpp_guard:
-            print "#if defined(%s)" % cpp_guard
-        print "  %s," % histogram.name()
-        if cpp_guard:
-            print "#endif"
-    print "  HistogramCount"
+
+    groups = itertools.groupby(histogram_tools.from_files(filenames),
+                               lambda h: h.name().startswith("USE_COUNTER_"))
+    seen_use_counters = False
+
+    # Note that histogram_tools.py guarantees that all of the USE_COUNTER_*
+    # histograms are defined in a contiguous block.  We therefore assume
+    # that there's at most one group for which use_counter_group is true.
+    for (use_counter_group, histograms) in groups:
+        if use_counter_group:
+            seen_use_counters = True
+
+        # The HistogramDUMMY* enum variables are used to make the computation
+        # of Histogram{First,Last}UseCounter easier.  Otherwise, we'd have to
+        # special case the first and last histogram in the group.
+        if use_counter_group:
+            print "  HistogramFirstUseCounter,"
+            print "  HistogramDUMMY1 = HistogramFirstUseCounter - 1,"
+
+        for histogram in histograms:
+            cpp_guard = histogram.cpp_guard()
+            if cpp_guard:
+                print "#if defined(%s)" % cpp_guard
+            print "  %s," % histogram.name()
+            if cpp_guard:
+                print "#endif"
+
+        if use_counter_group:
+            print "  HistogramDUMMY2,"
+            print "  HistogramLastUseCounter = HistogramDUMMY2 - 1,"
+
+    print "  HistogramCount,"
+    if seen_use_counters:
+        print "  HistogramUseCounterCount = HistogramLastUseCounter - HistogramFirstUseCounter + 1"
+    else:
+        print "  HistogramUseCounterCount = 0"
     print "};"
 
 main(sys.argv[1:])
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/Histograms.json firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/Histograms.json
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/Histograms.json	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/Histograms.json	2015-05-25 20:43:46.000000000 +0000
@@ -331,6 +331,25 @@
     "n_buckets": 50,
     "description": "Time spent sweeping slowest compartment SCC (ms)"
   },
+  "GC_MINOR_REASON": {
+    "expires_in_version": "never",
+    "kind": "enumerated",
+    "n_values": "JS::gcreason::NUM_TELEMETRY_REASONS",
+    "description": "Reason (enum value) for initiating a minor GC"
+  },
+  "GC_MINOR_REASON_LONG": {
+    "expires_in_version": "never",
+    "kind": "enumerated",
+    "n_values": "JS::gcreason::NUM_TELEMETRY_REASONS",
+    "description": "Reason (enum value) that caused a long (>1ms) minor GC"
+  },
+  "GC_MINOR_US": {
+    "expires_in_version": "never",
+    "kind": "exponential",
+    "high": "1000000",
+    "n_buckets": 100,
+    "description": "Time spent running JS minor GC (us)"
+  },
   "GEOLOCATION_ACCURACY_EXPONENTIAL": {
     "expires_in_version": "default",
     "kind": "exponential",
@@ -359,19 +378,6 @@
     "n_values": 10,
     "description": "Use of SpiderMonkey's deprecated language extensions in web content: ForEach=0, DestructuringForIn=1, LegacyGenerator=2, ExpressionClosure=3, LetBlock=4, LetExpression=5, NoSuchMethod=6, FlagsArgument=7, RegExpSourceProp=8"
   },
-  "TELEMETRY_PING": {
-    "expires_in_version": "never",
-    "kind": "exponential",
-    "high": "3000",
-    "n_buckets": 10,
-    "extended_statistics_ok": true,
-    "description": "Time taken to submit telemetry info (ms)"
-  },
-  "TELEMETRY_SUCCESS": {
-    "expires_in_version": "never",
-    "kind": "boolean",
-    "description": "Successful telemetry submission"
-  },
   "XUL_CACHE_DISABLED": {
     "expires_in_version": "default",
     "kind": "flag",
@@ -1197,7 +1203,7 @@
     "description": "Whether a HTTP transaction routed via Alt-Svc was scheme=http"
   },
   "HTTP_WAP_CONTENT_TYPE_RECEIVED": {
-    "expires_in_version": "40",
+    "expires_in_version": "45",
     "kind": "boolean",
     "description": "Whether a WAP content type response is served to the browser."
   },
@@ -4401,6 +4407,50 @@
     "n_values": 30,
     "description": "Number of telemetry pings evicted at startup"
   },
+  "TELEMETRY_COMPRESS": {
+    "expires_in_version": "never",
+    "kind": "exponential",
+    "high": "3000",
+    "n_buckets": 10,
+    "extended_statistics_ok": true,
+    "description": "Time taken to compress telemetry object (ms)"
+  },
+  "TELEMETRY_PING": {
+    "expires_in_version": "never",
+    "kind": "exponential",
+    "high": "3000",
+    "n_buckets": 10,
+    "extended_statistics_ok": true,
+    "description": "Time taken to submit telemetry info (ms)"
+  },
+  "TELEMETRY_SEND" : {
+    "expires_in_version": "never",
+    "kind": "exponential",
+    "high": "3000",
+    "n_buckets": 10,
+    "extended_statistics_ok": true,
+    "description": "Time to send the compressed string to the Telemetry servers and get a reply back (ms)"
+  },
+  "TELEMETRY_STRINGIFY" : {
+    "expires_in_version": "never",
+    "kind": "exponential",
+    "high": "3000",
+    "n_buckets": 10,
+    "extended_statistics_ok": true,
+    "description": "Time to stringify telemetry object (ms)"
+  },
+  "TELEMETRY_SUCCESS": {
+    "expires_in_version": "never",
+    "kind": "boolean",
+    "description": "Successful telemetry submission"
+  },
+  "TELEMETRY_INVALID_PING_TYPE_SUBMITTED": {
+    "alert_emails": ["telemetry-client-dev@mozilla.com"],
+    "expires_in_version": "never",
+    "kind": "count",
+    "keyed": true,
+    "description": "Count of individual invalid ping types that were submitted to Telemetry."
+  },
   "TELEMETRY_TEST_FLAG": {
     "expires_in_version": "never",
     "kind": "flag",
@@ -4672,13 +4722,6 @@
     "releaseChannelCollection": "opt-out",
     "description": "Record the search counts for search engines"
   },
-  "SEARCH_DEFAULT_ENGINE": {
-    "expires_in_version": "never",
-    "kind": "flag",
-    "keyed": true,
-    "releaseChannelCollection": "opt-out",
-    "description": "Record the default search engine."
-  },
   "SEARCH_SERVICE_INIT_MS": {
     "expires_in_version": "never",
     "kind": "exponential",
@@ -5498,6 +5541,20 @@
     "n_buckets": "1000",
     "description": "The time (in milliseconds) that it took a 'detach' request to go round trip."
   },
+  "DEVTOOLS_DEBUGGER_RDP_LOCAL_WORKERDETACH_MS": {
+    "expires_in_version": "never",
+    "kind": "exponential",
+    "high": "10000",
+    "n_buckets": "1000",
+    "description": "The time (in milliseconds) that it took a 'detach' request to go round trip."
+  },
+  "DEVTOOLS_DEBUGGER_RDP_REMOTE_WORKERDETACH_MS": {
+    "expires_in_version": "never",
+    "kind": "exponential",
+    "high": "10000",
+    "n_buckets": "1000",
+    "description": "The time (in milliseconds) that it took a 'detach' request to go round trip."
+  },
   "DEVTOOLS_DEBUGGER_DISPLAY_SOURCE_LOCAL_MS": {
     "expires_in_version": "never",
     "kind": "exponential",
@@ -5554,6 +5611,12 @@
     "n_buckets": "1000",
     "description": "The time (in milliseconds) that it took a 'reconfigure thread' request to go round trip."
   },
+  "MEDIA_WMF_DECODE_ERROR": {
+    "expires_in_version": "50",
+    "kind": "enumerated",
+    "n_values": 256,
+    "description": "WMF media decoder error or success (0) codes."
+  },
   "VIDEO_CANPLAYTYPE_H264_CONSTRAINT_SET_FLAG": {
     "expires_in_version": "50",
     "kind": "enumerated",
@@ -7533,6 +7596,20 @@
     "n_values": 5,
     "description": "MSE video state when unloading. ended = 0, paused = 1, stalled = 2, seeking = 3, other = 4"
   },
+  "VIDEO_ADOBE_GMP_DISAPPEARED": {
+    "alert_emails": ["cpearce@mozilla.com"],
+    "expires_in_version": "42",
+    "kind": "flag",
+    "description": "Whether or not the Adobe EME GMP was expected to be resident on disk but mysteriously isn't.",
+    "releaseChannelCollection": "opt-out"
+  },
+  "VIDEO_OPENH264_GMP_DISAPPEARED": {
+    "alert_emails": ["cpearce@mozilla.com", "rjesup@mozilla.com"],
+    "expires_in_version": "42",
+    "kind": "flag",
+    "description": "Whether or not the OpenH264 GMP was expected to be resident on disk but mysteriously isn't.",
+    "releaseChannelCollection": "opt-out"
+  },
   "FX_SANITIZE_TOTAL": {
     "alert_emails": ["firefox-dev@mozilla.org", "gavin@mozilla.com"],
     "expires_in_version": "50",
@@ -7846,5 +7923,15 @@
     "kind": "enumerated",
     "n_values": 5,
     "description": "The result of trying to download a document to show in reader view (0=Success, 1=Error XHR, 2=Error no document)"
+  },
+  "PERMISSIONS_SQL_CORRUPTED": {
+    "expires_in_version": "never",
+    "kind": "count",
+    "description": "Record the permissions.sqlite init failure"
+  },
+  "DEFECTIVE_PERMISSIONS_SQL_REMOVED": {
+    "expires_in_version": "never",
+    "kind": "count",
+    "description": "Record the removal of defective permissions.sqlite"
   }
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/histogram_tools.py firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/histogram_tools.py
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/histogram_tools.py	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/histogram_tools.py	2015-05-25 20:43:46.000000000 +0000
@@ -2,9 +2,16 @@
 # License, v. 2.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 buildconfig
 import json
 import math
+import os
 import re
+import sys
+
+# Need to update sys.path to be able to find usecounters.
+sys.path.append(os.path.join(buildconfig.topsrcdir, 'dom/base/'))
+import usecounters
 
 from collections import OrderedDict
 
@@ -246,11 +253,57 @@
                 definition['high'],
                 definition['n_buckets'])
 
-def from_file(filename):
+# We support generating histograms from multiple different input files, not
+# just Histograms.json.  For each file's basename, we have a specific
+# routine to parse that file, and return a dictionary mapping histogram
+# names to histogram parameters.
+def from_Histograms_json(filename):
+    with open(filename, 'r') as f:
+        try:
+            histograms = json.load(f, object_pairs_hook=OrderedDict)
+        except ValueError, e:
+            raise BaseException, "error parsing histograms in %s: %s" % (filename, e.message)
+    return histograms
+
+def from_UseCounters_conf(filename):
+    return usecounters.generate_histograms(filename)
+
+FILENAME_PARSERS = {
+    'Histograms.json': from_Histograms_json,
+    'UseCounters.conf': from_UseCounters_conf,
+}
+
+def from_files(filenames):
     """Return an iterator that provides a sequence of Histograms for
-the histograms defined in filename.
+the histograms defined in filenames.
     """
-    with open(filename, 'r') as f:
-        histograms = json.load(f, object_pairs_hook=OrderedDict)
+    all_histograms = OrderedDict()
+    for filename in filenames:
+        parser = FILENAME_PARSERS[os.path.basename(filename)]
+        histograms = parser(filename)
+
+        # OrderedDicts are important, because then the iteration order over
+        # the parsed histograms is stable, which makes the insertion into
+        # all_histograms stable, which makes ordering in generated files
+        # stable, which makes builds more deterministic.
+        if not isinstance(histograms, OrderedDict):
+            raise BaseException, "histogram parser didn't provide an OrderedDict"
+
         for (name, definition) in histograms.iteritems():
-            yield Histogram(name, definition)
+            if all_histograms.has_key(name):
+                raise DefinitionException, "duplicate histogram name %s" % name
+            all_histograms[name] = definition
+
+    # We require that all USE_COUNTER_* histograms be defined in a contiguous
+    # block.
+    use_counter_indices = filter(lambda x: x[1].startswith("USE_COUNTER_"),
+                                 enumerate(all_histograms.iterkeys()));
+    if use_counter_indices:
+        lower_bound = use_counter_indices[0][0]
+        upper_bound = use_counter_indices[-1][0]
+        n_counters = upper_bound - lower_bound + 1
+        if n_counters != len(use_counter_indices):
+            raise DefinitionException, "use counter histograms must be defined in a contiguous block"
+
+    for (name, definition) in all_histograms.iteritems():
+        yield Histogram(name, definition)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/Makefile.in firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/Makefile.in
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/Makefile.in	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/Makefile.in	2015-05-25 20:43:46.000000000 +0000
@@ -22,7 +22,7 @@
 
 include $(topsrcdir)/config/rules.mk
 
-histograms_file := $(srcdir)/Histograms.json
+histogram_files := $(srcdir)/Histograms.json $(topsrcdir)/dom/base/UseCounters.conf
 histogram_enum_file := TelemetryHistogramEnums.h
 histogram_data_file := TelemetryHistogramData.inc
 
@@ -36,10 +36,10 @@
   $(srcdir)/histogram_tools.py \
   $(NULL)
 
-$(histogram_enum_file): $(histograms_file) $(enum_python_deps)
-	$(PYTHON) $(srcdir)/gen-histogram-enum.py $< > $@
-$(histogram_data_file): $(histograms_file) $(data_python_deps)
-	$(PYTHON) $(srcdir)/gen-histogram-data.py $< > $@
+$(histogram_enum_file): $(histogram_files) $(enum_python_deps)
+	$(PYTHON) $(srcdir)/gen-histogram-enum.py $(histogram_files) > $@
+$(histogram_data_file): $(histogram_files) $(data_python_deps)
+	$(PYTHON) $(srcdir)/gen-histogram-data.py $(histogram_files) > $@
 
 GARBAGE += $(histogram_enum_file)
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/TelemetryArchive.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/TelemetryArchive.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/TelemetryArchive.jsm	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/TelemetryArchive.jsm	2015-05-25 20:43:46.000000000 +0000
@@ -60,13 +60,6 @@
   promiseArchivePing: function(ping) {
     return TelemetryArchiveImpl.promiseArchivePing(ping);
   },
-
-  /**
-   * Used in tests only to fake a restart of the module.
-   */
-  _testReset: function() {
-    TelemetryArchiveImpl._testReset();
-  },
 };
 
 /**
@@ -81,12 +74,6 @@
 let TelemetryArchiveImpl = {
   _logger: null,
 
-  // Tracks the archived pings in a Map of (id -> {timestampCreated, type}).
-  // We use this to cache info on archived pings to avoid scanning the disk more than once.
-  _archivedPings: new Map(),
-  // Whether we already scanned the archived pings on disk.
-  _scannedArchiveDirectory: false,
-
   get _log() {
     if (!this._logger) {
       this._logger = Log.repository.getLoggerWithMessagePrefix(LOGGER_NAME, LOGGER_PREFIX);
@@ -95,11 +82,6 @@
     return this._logger;
   },
 
-  _testReset: function() {
-    this._archivedPings = new Map();
-    this._scannedArchiveDirectory = false;
-  },
-
   promiseArchivePing: function(ping) {
     if (!shouldArchivePings()) {
       this._log.trace("promiseArchivePing - archiving is disabled");
@@ -113,27 +95,11 @@
       }
     }
 
-    const creationDate = new Date(ping.creationDate);
-    if (this._archivedPings.has(ping.id)) {
-      const data = this._archivedPings.get(ping.id);
-      if (data.timestampCreated > creationDate.getTime()) {
-        this._log.error("promiseArchivePing - trying to overwrite newer ping with the same id");
-        return Promise.reject(new Error("trying to overwrite newer ping with the same id"));
-      } else {
-        this._log.warn("promiseArchivePing - overwriting older ping with the same id");
-      }
-    }
-
-    this._archivedPings.set(ping.id, {
-      timestampCreated: creationDate.getTime(),
-      type: ping.type,
-    });
-
     return TelemetryStorage.saveArchivedPing(ping);
   },
 
-  _buildArchivedPingList: function() {
-    let list = [for (p of this._archivedPings) {
+  _buildArchivedPingList: function(archivedPingsMap) {
+    let list = [for (p of archivedPingsMap) {
       id: p[0],
       timestampCreated: p[1].timestampCreated,
       type: p[1].type,
@@ -147,34 +113,13 @@
   promiseArchivedPingList: function() {
     this._log.trace("promiseArchivedPingList");
 
-    if (this._scannedArchiveDirectory) {
-      return Promise.resolve(this._buildArchivedPingList())
-    }
-
-    return TelemetryStorage.loadArchivedPingList().then((loadedInfo) => {
-      // Add the ping info from scanning to the existing info.
-      // We might have pings added before lazily loading this list.
-      for (let [id, info] of loadedInfo) {
-        this._log.trace("promiseArchivedPingList - id: " + id + ", info: " + info);
-        this._archivedPings.set(id, {
-          timestampCreated: info.timestampCreated,
-          type: info.type,
-        });
-      }
-
-      this._scannedArchiveDirectory = true;
-      return this._buildArchivedPingList();
+    return TelemetryStorage.loadArchivedPingList().then(loadedInfo => {
+      return this._buildArchivedPingList(loadedInfo);
     });
   },
 
   promiseArchivedPingById: function(id) {
     this._log.trace("promiseArchivedPingById - id: " + id);
-    const data = this._archivedPings.get(id);
-    if (!data) {
-      this._log.trace("promiseArchivedPingById - no ping with id: " + id);
-      return Promise.reject(new Error("TelemetryArchive.promiseArchivedPingById - no ping with id " + id));
-    }
-
-    return TelemetryStorage.loadArchivedPing(id, data.timestampCreated, data.type);
+    return TelemetryStorage.loadArchivedPing(id);
   },
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/TelemetryController.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/TelemetryController.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/TelemetryController.jsm	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/TelemetryController.jsm	2015-05-25 20:43:46.000000000 +0000
@@ -24,6 +24,8 @@
 Cu.import("resource://gre/modules/Timer.jsm");
 Cu.import("resource://gre/modules/TelemetryUtils.jsm", this);
 
+const Utils = TelemetryUtils;
+
 const LOGGER_NAME = "Toolkit.Telemetry";
 const LOGGER_PREFIX = "TelemetryController::";
 
@@ -44,25 +46,28 @@
 const IS_UNIFIED_TELEMETRY = Preferences.get(PREF_UNIFIED, false);
 
 const PING_FORMAT_VERSION = 4;
-const PING_TYPE_MAIN = "main";
 
 // Delay before intializing telemetry (ms)
 const TELEMETRY_DELAY = 60000;
 // Delay before initializing telemetry if we're testing (ms)
 const TELEMETRY_TEST_DELAY = 100;
-// The number of days to keep pings serialised on the disk in case of failures.
-const DEFAULT_RETENTION_DAYS = 14;
 // Timeout after which we consider a ping submission failed.
 const PING_SUBMIT_TIMEOUT_MS = 2 * 60 * 1000;
 
-// We treat pings before midnight as happening "at midnight" with this tolerance.
-const MIDNIGHT_TOLERANCE_MS = 15 * 60 * 1000;
 // For midnight fuzzing we want to affect pings around midnight with this tolerance.
 const MIDNIGHT_TOLERANCE_FUZZ_MS = 5 * 60 * 1000;
 // We try to spread "midnight" pings out over this interval.
 const MIDNIGHT_FUZZING_INTERVAL_MS = 60 * 60 * 1000;
+// We delay sending "midnight" pings on this client by this interval.
 const MIDNIGHT_FUZZING_DELAY_MS = Math.random() * MIDNIGHT_FUZZING_INTERVAL_MS;
 
+// Ping types.
+const PING_TYPE_MAIN = "main";
+
+// Session ping reasons.
+const REASON_GATHER_PAYLOAD = "gather-payload";
+const REASON_GATHER_SUBSESSION_PAYLOAD = "gather-subsession-payload";
+
 XPCOMUtils.defineLazyModuleGetter(this, "ClientID",
                                   "resource://gre/modules/ClientID.jsm");
 XPCOMUtils.defineLazyServiceGetter(this, "Telemetry",
@@ -82,6 +87,8 @@
                                   "resource://gre/modules/UpdateChannel.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "TelemetryArchive",
                                   "resource://gre/modules/TelemetryArchive.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "TelemetrySession",
+                                  "resource://gre/modules/TelemetrySession.jsm");
 
 /**
  * Setup Telemetry logging. This function also gets called when loggin related
@@ -166,6 +173,7 @@
    */
   reset: function() {
     Impl._clientID = null;
+    TelemetryStorage.reset();
     return this.setup();
   },
   /**
@@ -195,6 +203,11 @@
    * Depending on configuration, the ping will be sent to the server (immediately or later)
    * and archived locally.
    *
+   * To identify the different pings and to be able to query them pings have a type.
+   * A type is a string identifier that should be unique to the type ping that is being submitted,
+   * it should only contain alphanumeric characters and '-' for separation, i.e. satisfy:
+   * /^[a-z0-9][a-z0-9-]+[a-z0-9]$/i
+   *
    * @param {String} aType The type of the ping.
    * @param {Object} aPayload The actual data payload for the ping.
    * @param {Object} [aOptions] Options object.
@@ -213,13 +226,21 @@
   },
 
   /**
+   * Get the current session ping data as it would be sent out or stored.
+   *
+   * @param {bool} aSubsession Whether to get subsession data. Optional, defaults to false.
+   * @return {object} The current ping data in object form.
+   */
+  getCurrentPingData: function(aSubsession = false) {
+    return Impl.getCurrentPingData(aSubsession);
+  },
+
+  /**
    * Add the ping to the pending ping list and save all pending pings.
    *
    * @param {String} aType The type of the ping.
    * @param {Object} aPayload The actual data payload for the ping.
    * @param {Object} [aOptions] Options object.
-   * @param {Number} [aOptions.retentionDays=14] The number of days to keep the ping on disk
-   *                 if sending fails.
    * @param {Boolean} [aOptions.addClientId=false] true if the ping should contain the client
    *                  id, false otherwise.
    * @param {Boolean} [aOptions.addEnvironment=false] true if the ping should contain the
@@ -229,7 +250,6 @@
    */
   savePendingPings: function(aType, aPayload, aOptions = {}) {
     let options = aOptions;
-    options.retentionDays = aOptions.retentionDays || DEFAULT_RETENTION_DAYS;
     options.addClientId = aOptions.addClientId || false;
     options.addEnvironment = aOptions.addEnvironment || false;
 
@@ -242,8 +262,6 @@
    * @param {String} aType The type of the ping.
    * @param {Object} aPayload The actual data payload for the ping.
    * @param {Object} [aOptions] Options object.
-   * @param {Number} [aOptions.retentionDays=14] The number of days to keep the ping on disk
-   *                 if sending fails.
    * @param {Boolean} [aOptions.addClientId=false] true if the ping should contain the client
    *                  id, false otherwise.
    * @param {Boolean} [aOptions.addEnvironment=false] true if the ping should contain the
@@ -257,7 +275,6 @@
    */
   addPendingPing: function(aType, aPayload, aOptions = {}) {
     let options = aOptions;
-    options.retentionDays = aOptions.retentionDays || DEFAULT_RETENTION_DAYS;
     options.addClientId = aOptions.addClientId || false;
     options.addEnvironment = aOptions.addEnvironment || false;
     options.overwrite = aOptions.overwrite || false;
@@ -302,8 +319,6 @@
    * @param {Object} aPayload The actual data payload for the ping.
    * @param {String} aFilePath The path to save the ping to.
    * @param {Object} [aOptions] Options object.
-   * @param {Number} [aOptions.retentionDays=14] The number of days to keep the ping on disk
-   *                 if sending fails.
    * @param {Boolean} [aOptions.addClientId=false] true if the ping should contain the client
    *                  id, false otherwise.
    * @param {Boolean} [aOptions.addEnvironment=false] true if the ping should contain the
@@ -317,7 +332,6 @@
    */
   savePing: function(aType, aPayload, aFilePath, aOptions = {}) {
     let options = aOptions;
-    options.retentionDays = aOptions.retentionDays || DEFAULT_RETENTION_DAYS;
     options.addClientId = aOptions.addClientId || false;
     options.addEnvironment = aOptions.addEnvironment || false;
     options.overwrite = aOptions.overwrite || false;
@@ -519,7 +533,16 @@
    * @return Number The next time (ms from UNIX epoch) when we can send pings.
    */
   _getNextPingSendTime: function(now) {
-    const midnight = TelemetryUtils.getNearestMidnight(now, MIDNIGHT_FUZZING_INTERVAL_MS);
+    // 1. First we check if the time is between 11pm and 1am. If it's not, we send
+    // immediately.
+    // 2. If we confirmed the time is indeed between 11pm and 1am in step 1, we
+    // then check if the time is also 11:55pm or later. If it's not, we send
+    // immediately.
+    // 3. Finally, if the time is between 11:55pm and 1am, we disallow sending
+    // before (midnight + fuzzing delay), which is a random time between 12am-1am
+    // (decided at startup).
+
+    const midnight = Utils.getNearestMidnight(now, MIDNIGHT_FUZZING_INTERVAL_MS);
 
     // Don't delay ping if we are not close to midnight.
     if (!midnight) {
@@ -558,6 +581,15 @@
     this._log.trace("submitExternalPing - type: " + aType + ", server: " + this._server +
                     ", aOptions: " + JSON.stringify(aOptions));
 
+    // Enforce the type string to only contain sane characters.
+    const typeUuid = /^[a-z0-9][a-z0-9-]+[a-z0-9]$/i;
+    if (!typeUuid.test(aType)) {
+      this._log.error("submitExternalPing - invalid ping type: " + aType);
+      let histogram = Telemetry.getKeyedHistogramById("TELEMETRY_INVALID_PING_TYPE_SUBMITTED");
+      histogram.add(aType, 1);
+      return Promise.reject(new Error("Invalid type string submitted."));
+    }
+
     const pingData = this.assemblePing(aType, aPayload, aOptions);
     this._log.trace("submitExternalPing - ping assembled, id: " + pingData.id);
 
@@ -633,8 +665,6 @@
    * @param {String} aType The type of the ping.
    * @param {Object} aPayload The actual data payload for the ping.
    * @param {Object} aOptions Options object.
-   * @param {Number} aOptions.retentionDays The number of days to keep the ping on disk
-   *                 if sending fails.
    * @param {Boolean} aOptions.addClientId true if the ping should contain the client id,
    *                  false otherwise.
    * @param {Boolean} aOptions.addEnvironment true if the ping should contain the
@@ -657,8 +687,6 @@
    * @param {String} aType The type of the ping.
    * @param {Object} aPayload The actual data payload for the ping.
    * @param {Object} aOptions Options object.
-   * @param {Number} aOptions.retentionDays The number of days to keep the ping on disk
-   *                 if sending fails.
    * @param {Boolean} aOptions.addClientId true if the ping should contain the client id,
    *                  false otherwise.
    * @param {Boolean} aOptions.addEnvironment true if the ping should contain the
@@ -696,8 +724,6 @@
    * @param {Object} aPayload The actual data payload for the ping.
    * @param {String} aFilePath The path to save the ping to.
    * @param {Object} aOptions Options object.
-   * @param {Number} aOptions.retentionDays The number of days to keep the ping on disk
-   *                 if sending fails.
    * @param {Boolean} aOptions.addClientId true if the ping should contain the client id,
    *                  false otherwise.
    * @param {Boolean} aOptions.addEnvironment true if the ping should contain the
@@ -758,6 +784,7 @@
   onPingRequestFinished: function(success, startTime, ping, isPersisted) {
     this._log.trace("onPingRequestFinished - success: " + success + ", persisted: " + isPersisted);
 
+    Telemetry.getHistogramById("TELEMETRY_SEND").add(new Date() - startTime);
     let hping = Telemetry.getHistogramById("TELEMETRY_PING");
     let hsuccess = Telemetry.getHistogramById("TELEMETRY_SUCCESS");
 
@@ -891,11 +918,16 @@
     let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
                     .createInstance(Ci.nsIScriptableUnicodeConverter);
     converter.charset = "UTF-8";
+    startTime = new Date();
     let utf8Payload = converter.ConvertFromUnicode(JSON.stringify(networkPayload));
     utf8Payload += converter.Finish();
+    Telemetry.getHistogramById("TELEMETRY_STRINGIFY").add(new Date() - startTime);
     let payloadStream = Cc["@mozilla.org/io/string-input-stream;1"]
                         .createInstance(Ci.nsIStringInputStream);
+    startTime = new Date();
     payloadStream.data = this.gzipCompressString(utf8Payload);
+    Telemetry.getHistogramById("TELEMETRY_COMPRESS").add(new Date() - startTime);
+    startTime = new Date();
     request.send(payloadStream);
 
     return deferred.promise;
@@ -1029,6 +1061,10 @@
         this._clientID = yield ClientID.getClientID();
         Preferences.set(PREF_CACHED_CLIENTID, this._clientID);
 
+        // Purge the pings archive by removing outdated pings. We don't wait for this
+        // task to complete, but TelemetryStorage blocks on it during shutdown.
+        TelemetryStorage.runCleanPingArchiveTask();
+
         Telemetry.asyncFetchTelemetryData(function () {});
         this._delayedInitTaskDeferred.resolve();
       } catch (e) {
@@ -1147,12 +1183,23 @@
    * Check if pings can be sent to the server. If FHR is not allowed to upload,
    * pings are not sent to the server (Telemetry is a sub-feature of FHR).
    * If unified telemetry is off, don't send pings if Telemetry is disabled.
+   *
    * @return {Boolean} True if pings can be send to the servers, false otherwise.
    */
   _canSend: function() {
-    return (Telemetry.isOfficialTelemetry || this._testMode) &&
-           Preferences.get(PREF_FHR_UPLOAD_ENABLED, false) &&
-           (IS_UNIFIED_TELEMETRY || Preferences.get(PREF_ENABLED));
+    // We only send pings from official builds, but allow overriding this for tests.
+    if (!Telemetry.isOfficialTelemetry && !this._testMode) {
+      return false;
+    }
+
+    // With unified Telemetry, the FHR upload setting controls whether we can send pings.
+    // The Telemetry pref enables sending extended data sets instead.
+    if (IS_UNIFIED_TELEMETRY) {
+      return Preferences.get(PREF_FHR_UPLOAD_ENABLED, false);
+    }
+
+    // Without unified Telemetry, the Telemetry enabled pref controls ping sending.
+    return Preferences.get(PREF_ENABLED, false);
   },
 
   /**
@@ -1189,4 +1236,16 @@
   promiseInitialized: function() {
     return this._delayedInitTaskDeferred.promise;
   },
+
+  getCurrentPingData: function(aSubsession) {
+    this._log.trace("getCurrentPingData - subsession: " + aSubsession)
+
+    const reason = aSubsession ? REASON_GATHER_SUBSESSION_PAYLOAD : REASON_GATHER_PAYLOAD;
+    const type = PING_TYPE_MAIN;
+    const payload = TelemetrySession.getPayload(reason);
+    const options = { addClientId: true, addEnvironment: true };
+    const ping = this.assemblePing(type, payload, options);
+
+    return ping;
+  },
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/Telemetry.cpp firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/Telemetry.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/Telemetry.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/Telemetry.cpp	2015-05-25 20:43:46.000000000 +0000
@@ -84,10 +84,8 @@
 using base::LinearHistogram;
 using base::StatisticsRecorder;
 
-const char KEYED_HISTOGRAM_NAME_SEPARATOR[] = "#";
-#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
-const char SUBSESSION_HISTOGRAM_PREFIX[] = "sub#";
-#endif
+#define KEYED_HISTOGRAM_NAME_SEPARATOR "#"
+#define SUBSESSION_HISTOGRAM_PREFIX "sub#"
 
 enum reflectStatus {
   REFLECT_OK,
@@ -738,9 +736,6 @@
   static TelemetryImpl *sTelemetry;
   AutoHashtable<SlowSQLEntryType> mPrivateSQL;
   AutoHashtable<SlowSQLEntryType> mSanitizedSQL;
-  // This gets marked immutable in debug builds, so we can't use
-  // AutoHashtable here.
-  nsTHashtable<nsCStringHashKey> mTrackedDBs;
   Mutex mHashMutex;
   HangReports mHangReports;
   Mutex mHangReportsMutex;
@@ -871,7 +866,7 @@
 bool
 IsValidHistogramName(const nsACString& name)
 {
-  return !FindInReadable(nsCString(KEYED_HISTOGRAM_NAME_SEPARATOR), name);
+  return !FindInReadable(NS_LITERAL_CSTRING(KEYED_HISTOGRAM_NAME_SEPARATOR), name);
 }
 
 bool
@@ -1864,35 +1859,6 @@
 mLastShutdownTime(0),
 mFailedLockCount(0)
 {
-  // A whitelist to prevent Telemetry reporting on Addon & Thunderbird DBs
-  const char *trackedDBs[] = {
-    "818200132aebmoouht.sqlite", // IndexedDB for about:home, see aboutHome.js
-    "addons.sqlite",
-    "content-prefs.sqlite",
-    "cookies.sqlite",
-    "downloads.sqlite",
-    "extensions.sqlite",
-    "formhistory.sqlite",
-    "healthreport.sqlite",
-    "index.sqlite",
-    "netpredictions.sqlite",
-    "permissions.sqlite",
-    "places.sqlite",
-    "reading-list.sqlite",
-    "search.sqlite",
-    "signons.sqlite",
-    "urlclassifier3.sqlite",
-    "webappsstore.sqlite"
-  };
-
-  for (size_t i = 0; i < ArrayLength(trackedDBs); i++)
-    mTrackedDBs.PutEntry(nsDependentCString(trackedDBs[i]));
-
-#ifdef DEBUG
-  // Mark immutable to prevent asserts on simultaneous access from multiple threads
-  mTrackedDBs.MarkImmutable();
-#endif
-
   // Populate the static histogram name->id cache.
   // Note that the histogram names are statically allocated.
   for (uint32_t i = 0; i < Telemetry::HistogramCount; i++) {
@@ -3428,6 +3394,57 @@
   return output;
 }
 
+// A whitelist mechanism to prevent Telemetry reporting on Addon & Thunderbird
+// DBs.
+struct TrackedDBEntry
+{
+  const char* mName;
+  const uint32_t mNameLength;
+
+  // This struct isn't meant to be used beyond the static arrays below.
+  MOZ_CONSTEXPR
+  TrackedDBEntry(const char* aName, uint32_t aNameLength)
+    : mName(aName)
+    , mNameLength(aNameLength)
+  { }
+
+  TrackedDBEntry() = delete;
+  TrackedDBEntry(TrackedDBEntry&) = delete;
+};
+
+#define TRACKEDDB_ENTRY(_name) { _name, (sizeof(_name) - 1) }
+
+// A whitelist of database names. If the database name exactly matches one of
+// these then its SQL statements will always be recorded.
+static MOZ_CONSTEXPR_VAR TrackedDBEntry kTrackedDBs[] = {
+  // IndexedDB for about:home, see aboutHome.js
+  TRACKEDDB_ENTRY("818200132aebmoouht.sqlite"),
+  TRACKEDDB_ENTRY("addons.sqlite"),
+  TRACKEDDB_ENTRY("content-prefs.sqlite"),
+  TRACKEDDB_ENTRY("cookies.sqlite"),
+  TRACKEDDB_ENTRY("downloads.sqlite"),
+  TRACKEDDB_ENTRY("extensions.sqlite"),
+  TRACKEDDB_ENTRY("formhistory.sqlite"),
+  TRACKEDDB_ENTRY("healthreport.sqlite"),
+  TRACKEDDB_ENTRY("index.sqlite"),
+  TRACKEDDB_ENTRY("netpredictions.sqlite"),
+  TRACKEDDB_ENTRY("permissions.sqlite"),
+  TRACKEDDB_ENTRY("places.sqlite"),
+  TRACKEDDB_ENTRY("reading-list.sqlite"),
+  TRACKEDDB_ENTRY("search.sqlite"),
+  TRACKEDDB_ENTRY("signons.sqlite"),
+  TRACKEDDB_ENTRY("urlclassifier3.sqlite"),
+  TRACKEDDB_ENTRY("webappsstore.sqlite")
+};
+
+// A whitelist of database name prefixes. If the database name begins with
+// one of these prefixes then its SQL statements will always be recorded.
+static const TrackedDBEntry kTrackedDBPrefixes[] = {
+  TRACKEDDB_ENTRY("indexedDB-")
+};
+
+#undef TRACKEDDB_ENTRY
+
 // Slow SQL statements will be automatically
 // trimmed to kMaxSlowStatementLength characters.
 // This limit doesn't include the ellipsis and DB name,
@@ -3439,11 +3456,36 @@
                                    const nsACString &dbName,
                                    uint32_t delay)
 {
+  MOZ_ASSERT(!sql.IsEmpty());
+  MOZ_ASSERT(!dbName.IsEmpty());
+
   if (!sTelemetry || !sTelemetry->mCanRecordExtended)
     return;
 
-  bool isFirefoxDB = sTelemetry->mTrackedDBs.Contains(dbName);
-  if (isFirefoxDB) {
+  bool recordStatement = false;
+
+  for (const TrackedDBEntry& nameEntry : kTrackedDBs) {
+    MOZ_ASSERT(nameEntry.mNameLength);
+    const nsDependentCString name(nameEntry.mName, nameEntry.mNameLength);
+    if (dbName == name) {
+      recordStatement = true;
+      break;
+    }
+  }
+
+  if (!recordStatement) {
+    for (const TrackedDBEntry& prefixEntry : kTrackedDBPrefixes) {
+      MOZ_ASSERT(prefixEntry.mNameLength);
+      const nsDependentCString prefix(prefixEntry.mName,
+                                      prefixEntry.mNameLength);
+      if (StringBeginsWith(dbName, prefix)) {
+        recordStatement = true;
+        break;
+      }
+    }
+  }
+
+  if (recordStatement) {
     nsAutoCString sanitizedSQL(SanitizeSQL(sql));
     if (sanitizedSQL.Length() > kMaxSlowStatementLength) {
       sanitizedSQL.SetLength(kMaxSlowStatementLength);
@@ -3573,7 +3615,6 @@
     n += mPrivateSQL.SizeOfExcludingThis(aMallocSizeOf);
     n += mSanitizedSQL.SizeOfExcludingThis(aMallocSizeOf);
   }
-  n += mTrackedDBs.SizeOfExcludingThis(aMallocSizeOf);
   { // Scope for mHangReportsMutex lock
     MutexAutoLock lock(mHangReportsMutex);
     n += mHangReports.SizeOfExcludingThis(aMallocSizeOf);
@@ -4148,11 +4189,11 @@
   nsCString histogramName;
 #if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
   if (subsession) {
-    histogramName.Append(SUBSESSION_HISTOGRAM_PREFIX);
+    histogramName.AppendLiteral(SUBSESSION_HISTOGRAM_PREFIX);
   }
 #endif
   histogramName.Append(mName);
-  histogramName.Append(KEYED_HISTOGRAM_NAME_SEPARATOR);
+  histogramName.AppendLiteral(KEYED_HISTOGRAM_NAME_SEPARATOR);
   histogramName.Append(key);
 
   Histogram* h;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/TelemetryEnvironment.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/TelemetryEnvironment.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/TelemetryEnvironment.jsm	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/TelemetryEnvironment.jsm	2015-05-25 20:43:46.000000000 +0000
@@ -11,7 +11,6 @@
 const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 const myScope = this;
 
-Cu.import("resource://gre/modules/AddonManager.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
 Cu.import("resource://gre/modules/Task.jsm");
 Cu.import("resource://gre/modules/Log.jsm");
@@ -23,6 +22,7 @@
 XPCOMUtils.defineLazyModuleGetter(this, "ctypes",
                                   "resource://gre/modules/ctypes.jsm");
 #ifndef MOZ_WIDGET_GONK
+Cu.import("resource://gre/modules/AddonManager.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "LightweightThemeManager",
                                   "resource://gre/modules/LightweightThemeManager.jsm");
 #endif
@@ -48,7 +48,7 @@
   return gGlobalEnvironment;
 }
 
-const TelemetryEnvironment = {
+this.TelemetryEnvironment = {
   get currentEnvironment() {
     return getGlobal().currentEnvironment;
   },
@@ -154,6 +154,8 @@
 const MILLISECONDS_PER_DAY = 24 * 60 * 60 * 1000;
 
 const EXPERIMENTS_CHANGED_TOPIC = "experiments-changed";
+const SEARCH_ENGINE_MODIFIED_TOPIC = "browser-search-engine-modified";
+const SEARCH_SERVICE_TOPIC = "browser-search-service";
 
 /**
  * Turn a millisecond timestamp into a day timestamp.
@@ -651,33 +653,42 @@
   };
 
   this._updateSettings();
+  // Fill in the default search engine, if the search provider is already initialized.
+  this._updateSearchEngine();
 
   // Build the remaining asynchronous parts of the environment. Don't register change listeners
   // until the initial environment has been built.
 
+#ifdef MOZ_WIDGET_GONK
+  this._addonBuilder = {
+    watchForChanges: function() {}
+  }
+  let p = [];
+#else
   this._addonBuilder = new EnvironmentAddonBuilder(this);
 
   let p = [ this._addonBuilder.init() ];
+#endif
 #ifndef MOZ_WIDGET_ANDROID
   this._currentEnvironment.profile = {};
   p.push(this._updateProfile());
 #endif
 
+  let setup = () => {
+    this._initTask = null;
+    this._startWatchingPrefs();
+    this._addonBuilder.watchForChanges();
+    this._addObservers();
+    return this.currentEnvironment;
+  };
+
   this._initTask = Promise.all(p)
     .then(
-      () => {
-        this._initTask = null;
-        this._startWatchingPrefs();
-        this._addonBuilder.watchForChanges();
-        return this.currentEnvironment;
-      },
+      () => setup(),
       (err) => {
         // log errors but eat them for consumers
         this._log.error("EnvironmentCache - error while initializing", err);
-        this._initTask = null;
-        this._startWatchingPrefs();
-        this._addonBuilder.watchForChanges();
-        return this.currentEnvironment;
+        return setup();
       });
 }
 EnvironmentCache.prototype = {
@@ -799,6 +810,90 @@
     }
   },
 
+  _addObservers: function () {
+    // Watch the search engine change and service topics.
+    Services.obs.addObserver(this, SEARCH_ENGINE_MODIFIED_TOPIC, false);
+    Services.obs.addObserver(this, SEARCH_SERVICE_TOPIC, false);
+  },
+
+  _removeObservers: function () {
+    // Remove the search engine change and service observers.
+    Services.obs.removeObserver(this, SEARCH_ENGINE_MODIFIED_TOPIC);
+    Services.obs.removeObserver(this, SEARCH_SERVICE_TOPIC);
+  },
+
+  observe: function (aSubject, aTopic, aData) {
+    this._log.trace("observe - aTopic: " + aTopic + ", aData: " + aData);
+    switch (aTopic) {
+      case SEARCH_ENGINE_MODIFIED_TOPIC:
+        if (aData != "engine-default" && aData != "engine-current") {
+          return;
+        }
+        // Record the new default search choice and send the change notification.
+        this._onSearchEngineChange();
+        break;
+      case SEARCH_SERVICE_TOPIC:
+        if (aData != "init-complete") {
+          return;
+        }
+        // Now that the search engine init is complete, record the default search choice.
+        this._updateSearchEngine();
+        break;
+    }
+  },
+
+  /**
+   * Get the default search engine.
+   * @return {String} Returns the search engine identifier, "NONE" if no default search
+   *         engine is defined or "UNDEFINED" if no engine identifier or name can be found.
+   */
+  _getDefaultSearchEngine: function () {
+    let engine;
+    try {
+      engine = Services.search.defaultEngine;
+    } catch (e) {}
+
+    let name;
+    if (!engine) {
+      name = "NONE";
+    } else if (engine.identifier) {
+      name = engine.identifier;
+    } else if (engine.name) {
+      name = "other-" + engine.name;
+    } else {
+      name = "UNDEFINED";
+    }
+
+    return name;
+  },
+
+  /**
+   * Update the default search engine value.
+   */
+  _updateSearchEngine: function () {
+    this._log.trace("_updateSearchEngine - isInitialized: " + Services.search.isInitialized);
+    if (!Services.search.isInitialized) {
+      return;
+    }
+
+    // Make sure we have a settings section.
+    this._currentEnvironment.settings = this._currentEnvironment.settings || {};
+    // Update the search engine entry in the current environment.
+    this._currentEnvironment.settings.defaultSearchEngine = this._getDefaultSearchEngine();
+  },
+
+  /**
+   * Update the default search engine value and trigger the environment change.
+   */
+  _onSearchEngineChange: function () {
+    this._log.trace("_onSearchEngineChange");
+
+    // Finally trigger the environment change notification.
+    let oldEnvironment = Cu.cloneInto(this._currentEnvironment, myScope);
+    this._updateSearchEngine();
+    this._onEnvironmentChange("search-engine-changed", oldEnvironment);
+  },
+
   /**
    * Get the build data in object form.
    * @return Object containing the build data.
@@ -832,6 +927,9 @@
    * @returns null on error, true if we are the default browser, or false otherwise.
    */
   _isDefaultBrowser: function () {
+#ifdef MOZ_WIDGET_GONK
+    return true;
+#else
     if (!("@mozilla.org/browser/shell-service;1" in Cc)) {
       this._log.error("_isDefaultBrowser - Could not obtain shell service");
       return null;
@@ -857,6 +955,7 @@
     }
 
     return null;
+#endif
   },
 
   /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/TelemetrySession.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/TelemetrySession.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/TelemetrySession.jsm	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/TelemetrySession.jsm	2015-05-25 20:43:46.000000000 +0000
@@ -22,6 +22,8 @@
 Cu.import("resource://gre/modules/Timer.jsm");
 Cu.import("resource://gre/modules/TelemetryUtils.jsm", this);
 
+const Utils = TelemetryUtils;
+
 const myScope = this;
 
 const IS_CONTENT_PROCESS = (function() {
@@ -35,12 +37,12 @@
 const PAYLOAD_VERSION = 4;
 const PING_TYPE_MAIN = "main";
 const PING_TYPE_SAVED_SESSION = "saved-session";
-const RETENTION_DAYS = 14;
 
 const REASON_ABORTED_SESSION = "aborted-session";
 const REASON_DAILY = "daily";
 const REASON_SAVED_SESSION = "saved-session";
 const REASON_GATHER_PAYLOAD = "gather-payload";
+const REASON_GATHER_SUBSESSION_PAYLOAD = "gather-subsession-payload";
 const REASON_TEST_PING = "test-ping";
 const REASON_ENVIRONMENT_CHANGE = "environment-change";
 const REASON_SHUTDOWN = "shutdown";
@@ -108,6 +110,8 @@
 // in case of aborted sessions (currently 5 minutes).
 const ABORTED_SESSION_UPDATE_INTERVAL_MS = 5 * 60 * 1000;
 
+const TOPIC_CYCLE_COLLECTOR_BEGIN = "cycle-collector-begin";
+
 var gLastMemoryPoll = null;
 
 let gWasDebuggerAttached = false;
@@ -422,7 +426,7 @@
       timeout = SCHEDULER_TICK_IDLE_INTERVAL_MS;
       // We need to make sure though that we don't miss sending pings around
       // midnight when we use the longer idle intervals.
-      const nextMidnight = TelemetryUtils.getNextMidnight(now);
+      const nextMidnight = Utils.getNextMidnight(now);
       timeout = Math.min(timeout, nextMidnight.getTime() - now.getTime());
     }
 
@@ -433,8 +437,8 @@
 
   _sentDailyPingToday: function(nowDate) {
     // This is today's date and also the previous midnight (0:00).
-    const todayDate = TelemetryUtils.truncateToDays(nowDate);
-    const nearestMidnight = TelemetryUtils.getNearestMidnight(nowDate, SCHEDULER_MIDNIGHT_TOLERANCE_MS);
+    const todayDate = Utils.truncateToDays(nowDate);
+    const nearestMidnight = Utils.getNearestMidnight(nowDate, SCHEDULER_MIDNIGHT_TOLERANCE_MS);
     // If we are close to midnight, we check against that, otherwise against the last midnight.
     const checkDate = nearestMidnight || todayDate;
     // We consider a ping sent for today if it occured after midnight, or prior within the tolerance.
@@ -455,7 +459,7 @@
       return false;
     }
 
-    const nearestMidnight = TelemetryUtils.getNearestMidnight(nowDate, SCHEDULER_MIDNIGHT_TOLERANCE_MS);
+    const nearestMidnight = Utils.getNearestMidnight(nowDate, SCHEDULER_MIDNIGHT_TOLERANCE_MS);
     if (!sentPingToday && !nearestMidnight) {
       // Computer must have gone to sleep, the daily ping is overdue.
       this._log.trace("_isDailyPingDue - daily ping is overdue... computer went to sleep?");
@@ -565,7 +569,7 @@
     let nextSessionCheckpoint =
       this._lastSessionCheckpointTime + ABORTED_SESSION_UPDATE_INTERVAL_MS;
     let combineActions = (shouldSendDaily && isAbortedPingDue) || (shouldSendDaily &&
-                          TelemetryUtils.areTimesClose(now, nextSessionCheckpoint,
+                          Utils.areTimesClose(now, nextSessionCheckpoint,
                                                        SCHEDULER_COALESCE_THRESHOLD_MS));
 
     if (combineActions) {
@@ -611,7 +615,7 @@
       // update the schedules.
       this._saveAbortedPing(now.getTime(), competingPayload);
       // If we're close to midnight, skip today's daily ping and reschedule it for tomorrow.
-      let nearestMidnight = TelemetryUtils.getNearestMidnight(now, SCHEDULER_MIDNIGHT_TOLERANCE_MS);
+      let nearestMidnight = Utils.getNearestMidnight(now, SCHEDULER_MIDNIGHT_TOLERANCE_MS);
       if (nearestMidnight) {
         this._lastDailyPingTime = now.getTime();
       }
@@ -1100,8 +1104,8 @@
   getMetadata: function getMetadata(reason) {
     this._log.trace("getMetadata - Reason " + reason);
 
-    let sessionStartDate = toLocalTimeISOString(TelemetryUtils.truncateToDays(this._sessionStartDate));
-    let subsessionStartDate = toLocalTimeISOString(TelemetryUtils.truncateToDays(this._subsessionStartDate));
+    let sessionStartDate = toLocalTimeISOString(Utils.truncateToDays(this._sessionStartDate));
+    let subsessionStartDate = toLocalTimeISOString(Utils.truncateToDays(this._subsessionStartDate));
     // Compute the subsession length in milliseconds, then convert to seconds.
     let subsessionLength =
       Math.floor((Policy.now() - this._subsessionStartDate.getTime()) / 1000);
@@ -1389,7 +1393,6 @@
     const isSubsession = !this._isClassicReason(reason);
     let payload = this.getSessionPayload(reason, isSubsession);
     let options = {
-      retentionDays: RETENTION_DAYS,
       addClientId: true,
       addEnvironment: true,
     };
@@ -1399,15 +1402,23 @@
   attachObservers: function attachObservers() {
     if (!this._initialized)
       return;
-    Services.obs.addObserver(this, "cycle-collector-begin", false);
     Services.obs.addObserver(this, "idle-daily", false);
+    if (Telemetry.canRecordExtended) {
+      Services.obs.addObserver(this, TOPIC_CYCLE_COLLECTOR_BEGIN, false);
+    }
   },
 
   detachObservers: function detachObservers() {
     if (!this._initialized)
       return;
     Services.obs.removeObserver(this, "idle-daily");
-    Services.obs.removeObserver(this, "cycle-collector-begin");
+    try {
+      // Tests may flip Telemetry.canRecordExtended on and off. Just try to remove this
+      // observer and catch if it fails because the observer was not added.
+      Services.obs.removeObserver(this, TOPIC_CYCLE_COLLECTOR_BEGIN);
+    } catch (e) {
+      this._log.warn("detachObservers - Failed to remove " + TOPIC_CYCLE_COLLECTOR_BEGIN, e);
+    }
   },
 
   /**
@@ -1620,7 +1631,6 @@
     }
 
     let options = {
-      retentionDays: RETENTION_DAYS,
       addClientId: true,
       addEnvironment: true,
       overwrite: true,
@@ -1641,7 +1651,6 @@
     this._log.trace("savePendingPingsClassic");
     let payload = this.getSessionPayload(REASON_SAVED_SESSION, false);
     let options = {
-      retentionDays: RETENTION_DAYS,
       addClientId: true,
       addEnvironment: true,
     };
@@ -1652,7 +1661,6 @@
     this._log.trace("testSaveHistograms - Path: " + file.path);
     let payload = this.getSessionPayload(REASON_SAVED_SESSION, false);
     let options = {
-      retentionDays: RETENTION_DAYS,
       addClientId: true,
       addEnvironment: true,
       overwrite: true,
@@ -1723,7 +1731,10 @@
       this._log = Log.repository.getLoggerWithMessagePrefix(LOGGER_NAME, LOGGER_PREFIX);
     }
 
-    this._log.trace("observe - " + aTopic + " notified.");
+    // Prevent the cycle collector begin topic from cluttering the log.
+    if (aTopic != TOPIC_CYCLE_COLLECTOR_BEGIN) {
+      this._log.trace("observe - " + aTopic + " notified.");
+    }
 
     switch (aTopic) {
     case "profile-after-change":
@@ -1741,7 +1752,7 @@
         this.sendContentProcessPing(REASON_SAVED_SESSION);
       }
       break;
-    case "cycle-collector-begin":
+    case TOPIC_CYCLE_COLLECTOR_BEGIN:
       let now = new Date();
       if (!gLastMemoryPoll
           || (TELEMETRY_INTERVAL <= now - gLastMemoryPoll)) {
@@ -1800,7 +1811,6 @@
       if (Telemetry.isOfficialTelemetry) {
         let payload = this.getSessionPayload(REASON_SAVED_SESSION, false);
         let options = {
-          retentionDays: RETENTION_DAYS,
           addClientId: true,
           addEnvironment: true,
           overwrite: true,
@@ -1882,7 +1892,6 @@
     let payload = this.getSessionPayload(REASON_DAILY, true);
 
     let options = {
-      retentionDays: RETENTION_DAYS,
       addClientId: true,
       addEnvironment: true,
     };
@@ -1958,7 +1967,6 @@
     TelemetryScheduler.reschedulePings(REASON_ENVIRONMENT_CHANGE, payload);
 
     let options = {
-      retentionDays: RETENTION_DAYS,
       addClientId: true,
       addEnvironment: true,
       overrideEnvironment: oldEnvironment,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/TelemetryStorage.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/TelemetryStorage.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/TelemetryStorage.jsm	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/TelemetryStorage.jsm	2015-05-25 20:43:46.000000000 +0000
@@ -17,6 +17,7 @@
 Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
 Cu.import("resource://gre/modules/osfile.jsm", this);
 Cu.import("resource://gre/modules/Task.jsm", this);
+Cu.import("resource://gre/modules/TelemetryUtils.jsm", this);
 Cu.import("resource://gre/modules/Promise.jsm", this);
 
 XPCOMUtils.defineLazyModuleGetter(this, 'Deprecated',
@@ -52,6 +53,9 @@
 // Maximum number of pings to save.
 const MAX_LRU_PINGS = 50;
 
+// Maxmimum time, in milliseconds, archive pings should be retained.
+const MAX_ARCHIVED_PINGS_RETENTION_MS = 180 * 24 * 60 * 60 * 1000;  // 180 days
+
 // The number of outstanding saved pings that we have issued loading
 // requests for.
 let pingsLoaded = 0;
@@ -69,6 +73,13 @@
 
 let isPingDirectoryCreated = false;
 
+/**
+ * This is a policy object used to override behavior for testing.
+ */
+let Policy = {
+  now: () => new Date(),
+};
+
 this.TelemetryStorage = {
   get MAX_PING_FILE_AGE() {
     return MAX_PING_FILE_AGE;
@@ -109,12 +120,34 @@
    * Load an archived ping from disk.
    *
    * @param {string} id The pings id.
-   * @param {number} timestampCreated The pings creation timestamp.
-   * @param {string} type The pings type.
    * @return {promise<object>} Promise that is resolved with the ping data.
    */
-  loadArchivedPing: function(id, timestampCreated, type) {
-    return TelemetryStorageImpl.loadArchivedPing(id, timestampCreated, type);
+  loadArchivedPing: function(id) {
+    return TelemetryStorageImpl.loadArchivedPing(id);
+  },
+
+  /**
+   * Clean the pings archive by removing old pings.
+   * This will scan the archive directory.
+   *
+   * @return {Promise} Resolved when the cleanup task completes.
+   */
+  runCleanPingArchiveTask: function() {
+    return TelemetryStorageImpl.runCleanPingArchiveTask();
+  },
+
+  /**
+   * Reset the storage state in tests.
+   */
+  reset: function() {
+    return TelemetryStorageImpl.reset();
+  },
+
+  /**
+   * Test method that allows waiting on the archive clean task to finish.
+   */
+  testCleanupTaskPromise: function() {
+    return (TelemetryStorageImpl._archiveCleanTask || Promise.resolve());
   },
 
   /**
@@ -398,6 +431,19 @@
   // Used to serialize aborted session ping writes to disk.
   _abortedSessionSerializer: new SaveSerializer(),
 
+  // Tracks the archived pings in a Map of (id -> {timestampCreated, type}).
+  // We use this to cache info on archived pings to avoid scanning the disk more than once.
+  _archivedPings: new Map(),
+  // Track the archive loading task to prevent multiple tasks from being executed.
+  _archiveCleanTaskArchiveLoadingTask: null,
+  // Track the archive cleanup task.
+  _archiveCleanTask: null,
+  // Whether we already scanned the archived pings on disk.
+  _scannedArchiveDirectory: false,
+
+  // Track the shutdown process to bail out of the clean up task quickly.
+  _shutdown: false,
+
   get _log() {
     if (!this._logger) {
       this._logger = Log.repository.getLoggerWithMessagePrefix(LOGGER_NAME, LOGGER_PREFIX);
@@ -412,7 +458,11 @@
    * @return {Promise} Promise that is resolved when shutdown is complete.
    */
   shutdown: Task.async(function*() {
+    this._shutdown = true;
     yield this._abortedSessionSerializer.flushTasks();
+    // If the archive cleaning task is running, block on it. It should bail out as soon
+    // as possible.
+    yield this._archiveCleanTask;
   }),
 
   /**
@@ -423,24 +473,44 @@
    */
   saveArchivedPing: Task.async(function*(ping) {
     const creationDate = new Date(ping.creationDate);
+    if (this._archivedPings.has(ping.id)) {
+      const data = this._archivedPings.get(ping.id);
+      if (data.timestampCreated > creationDate.getTime()) {
+        this._log.error("saveArchivedPing - trying to overwrite newer ping with the same id");
+        return Promise.reject(new Error("trying to overwrite newer ping with the same id"));
+      } else {
+        this._log.warn("saveArchivedPing - overwriting older ping with the same id");
+      }
+    }
+
     // Get the archived ping path and append the lz4 suffix to it (so we have 'jsonlz4').
     const filePath = getArchivedPingPath(ping.id, creationDate, ping.type) + "lz4";
     yield OS.File.makeDir(OS.Path.dirname(filePath), { ignoreExisting: true,
                                                        from: OS.Constants.Path.profileDir });
     yield this.savePingToFile(ping, filePath, /*overwrite*/ true, /*compressed*/ true);
+
+    this._archivedPings.set(ping.id, {
+      timestampCreated: creationDate.getTime(),
+      type: ping.type,
+    });
   }),
 
   /**
    * Load an archived ping from disk.
    *
    * @param {string} id The pings id.
-   * @param {number} timestampCreated The pings creation timestamp.
-   * @param {string} type The pings type.
    * @return {promise<object>} Promise that is resolved with the ping data.
    */
-  loadArchivedPing: Task.async(function*(id, timestampCreated, type) {
-    this._log.trace("loadArchivedPing - id: " + id + ", timestampCreated: " + timestampCreated + ", type: " + type);
-    const path = getArchivedPingPath(id, new Date(timestampCreated), type);
+  loadArchivedPing: Task.async(function*(id) {
+    this._log.trace("loadArchivedPing - id: " + id);
+
+    const data = this._archivedPings.get(id);
+    if (!data) {
+      this._log.trace("loadArchivedPing - no ping with id: " + id);
+      return Promise.reject(new Error("TelemetryStorage.loadArchivedPing - no ping with id " + id));
+    }
+
+    const path = getArchivedPingPath(id, new Date(data.timestampCreated), data.type);
     const pathCompressed = path + "lz4";
 
     try {
@@ -473,32 +543,140 @@
   }),
 
   /**
+   * Clean the pings archive by removing old pings.
+   *
+   * @return {Promise} Resolved when the cleanup task completes.
+   */
+  runCleanPingArchiveTask: function() {
+    // If there's an archive cleaning task already running, return it.
+    if (this._archiveCleanTask) {
+      return this._archiveCleanTask;
+    }
+
+    // Make sure to clear |_archiveCleanTask| once done.
+    let clear = () => this._archiveCleanTask = null;
+    // Since there's no archive cleaning task running, start it.
+    this._archiveCleanTask = this.cleanArchiveTask().then(clear, clear);
+    return this._archiveCleanTask;
+  },
+
+  cleanArchiveTask: Task.async(function*() {
+    this._log.trace("cleanArchiveTask");
+
+    if (!(yield OS.File.exists(gPingsArchivePath))) {
+      return;
+    }
+
+    const now = Policy.now().getTime();
+    let dirIterator = new OS.File.DirectoryIterator(gPingsArchivePath);
+    let subdirs = (yield dirIterator.nextBatch()).filter(e => e.isDir);
+
+    // Keep track of the newest removed month to update the cache, if needed.
+    let newestRemovedMonth = null;
+
+    // Walk through the monthly subdirs of the form <YYYY-MM>/
+    for (let dir of subdirs) {
+      if (this._shutdown) {
+        this._log.trace("cleanArchiveTask - Terminating the clean up task due to shutdown");
+        return;
+      }
+
+      if (!isValidArchiveDir(dir.name)) {
+        this._log.warn("cleanArchiveTask - skipping invalidly named subdirectory " + dir.path);
+        continue;
+      }
+
+      const archiveDate = getDateFromArchiveDir(dir.name);
+      if (!archiveDate) {
+        this._log.warn("cleanArchiveTask - skipping invalid subdirectory date " + dir.path);
+        continue;
+      }
+
+      // If this archive directory is older than 180 days, remove it.
+      if (!TelemetryUtils.areTimesClose(archiveDate.getTime(), now,
+                                        MAX_ARCHIVED_PINGS_RETENTION_MS)) {
+        try {
+          yield OS.File.removeDir(dir.path);
+
+          // Update the newest removed month.
+          if (archiveDate > newestRemovedMonth) {
+            newestRemovedMonth = archiveDate;
+          }
+        } catch (ex) {
+          this._log.error("cleanArchiveTask - Unable to remove " + dir.path, ex);
+        }
+      }
+    }
+
+    // If the archive directory was already scanned, filter the ping archive cache.
+    if (this._scannedArchiveDirectory && newestRemovedMonth) {
+      // Scan the archive cache for pings older than the newest directory pruned above.
+      for (let [id, info] of this._archivedPings) {
+        const timestampCreated = new Date(info.timestampCreated);
+        if (timestampCreated.getTime() > newestRemovedMonth.getTime()) {
+          continue;
+        }
+        // Remove outdated pings from the cache.
+        this._archivedPings.delete(id);
+      }
+    }
+  }),
+
+  /**
+   * Reset the storage state in tests.
+   */
+  reset: function() {
+    this._shutdown = false;
+    this._scannedArchiveDirectory = false;
+    this._archivedPings = new Map();
+  },
+
+  /**
    * Get a list of info on the archived pings.
    * This will scan the archive directory and grab basic data about the existing
    * pings out of their filename.
    *
    * @return {promise<sequence<object>>}
    */
-  loadArchivedPingList: Task.async(function*() {
-    this._log.trace("loadArchivedPingList");
+  loadArchivedPingList: function() {
+    // If there's an archive loading task already running, return it.
+    if (this._archiveScanningTask) {
+      return this._archiveScanningTask;
+    }
+
+    if (this._scannedArchiveDirectory) {
+      this._log.trace("loadArchivedPingList - Archive already scanned, hitting cache.");
+      return Promise.resolve(this._archivedPings);
+    }
+
+    // Make sure to clear |_archiveScanningTask| once done.
+    let clear = pingList => {
+      this._archiveScanningTask = null;
+      return pingList;
+    };
+    // Since there's no archive loading task running, start it.
+    this._archiveScanningTask = this._scanArchive().then(clear, clear);
+    return this._archiveScanningTask;
+  },
+
+  _scanArchive: Task.async(function*() {
+    this._log.trace("_scanArchive");
 
     if (!(yield OS.File.exists(gPingsArchivePath))) {
       return new Map();
     }
 
-    let archivedPings = new Map();
     let dirIterator = new OS.File.DirectoryIterator(gPingsArchivePath);
     let subdirs = (yield dirIterator.nextBatch()).filter(e => e.isDir);
 
     // Walk through the monthly subdirs of the form <YYYY-MM>/
     for (let dir of subdirs) {
-      const dirRegEx = /^[0-9]{4}-[0-9]{2}$/;
-      if (!dirRegEx.test(dir.name)) {
-        this._log.warn("loadArchivedPingList - skipping invalidly named subdirectory " + dir.path);
+      if (!isValidArchiveDir(dir.name)) {
+        this._log.warn("_scanArchive - skipping invalidly named subdirectory " + dir.path);
         continue;
       }
 
-      this._log.trace("loadArchivedPingList - checking in subdir: " + dir.path);
+      this._log.trace("_scanArchive - checking in subdir: " + dir.path);
       let pingIterator = new OS.File.DirectoryIterator(dir.path);
       let pings = (yield pingIterator.nextBatch()).filter(e => !e.isDir);
 
@@ -511,26 +689,28 @@
         }
 
         // In case of conflicts, overwrite only with newer pings.
-        if (archivedPings.has(data.id)) {
-          const overwrite = data.timestamp > archivedPings.get(data.id).timestampCreated;
-          this._log.warn("loadArchivedPingList - have seen this id before: " + data.id +
+        if (this._archivedPings.has(data.id)) {
+          const overwrite = data.timestamp > this._archivedPings.get(data.id).timestampCreated;
+          this._log.warn("_scanArchive - have seen this id before: " + data.id +
                          ", overwrite: " + overwrite);
           if (!overwrite) {
             continue;
           }
 
           yield this._removeArchivedPing(data.id, data.timestampCreated, data.type)
-                    .catch((e) => this._log.warn("loadArchivedPingList - failed to remove ping", e));
+                    .catch((e) => this._log.warn("_scanArchive - failed to remove ping", e));
         }
 
-        archivedPings.set(data.id, {
+        this._archivedPings.set(data.id, {
           timestampCreated: data.timestamp,
           type: data.type,
         });
       }
     }
 
-    return archivedPings;
+    // Mark the archive as scanned, so we no longer hit the disk.
+    this._scannedArchiveDirectory = true;
+    return this._archivedPings;
   }),
 
   /**
@@ -849,8 +1029,8 @@
   removeAbortedSessionPing: function() {
     return this._abortedSessionSerializer.enqueueTask(Task.async(function*() {
       try {
+        yield OS.File.remove(gAbortedSessionFilePath, { ignoreAbsent: false });
         this._log.trace("removeAbortedSessionPing - success");
-        yield OS.File.remove(gAbortedSessionFilePath);
       } catch (ex if ex.becauseNoSuchFile) {
         this._log.trace("removeAbortedSessionPing - no such file");
       } catch (ex) {
@@ -915,3 +1095,30 @@
   let fileName = [aDate.getTime(), aPingId, aType, "json"].join(".");
   return OS.Path.join(archivedPingDir, fileName);
 }
+
+/**
+ * Check if a directory name is in the "YYYY-MM" format.
+ * @param {String} aDirName The name of the pings archive directory.
+ * @return {Boolean} True if the directory name is in the right format, false otherwise.
+ */
+function isValidArchiveDir(aDirName) {
+  const dirRegEx = /^[0-9]{4}-[0-9]{2}$/;
+  return dirRegEx.test(aDirName);
+}
+
+/**
+ * Gets a date object from an archive directory name.
+ * @param {String} aDirName The name of the pings archive directory. Must be in the YYYY-MM
+ *        format.
+ * @return {Object} A Date object or null if the dir name is not valid.
+ */
+function getDateFromArchiveDir(aDirName) {
+  let [year, month] = aDirName.split("-");
+  year = parseInt(year);
+  month = parseInt(month);
+  // Make sure to have sane numbers.
+  if (!Number.isFinite(month) || !Number.isFinite(year) || month < 1 || month > 12) {
+    return null;
+  }
+  return new Date(year, month - 1, 1, 0, 0, 0);
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/tests/search/chrome.manifest firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/tests/search/chrome.manifest
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/tests/search/chrome.manifest	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/tests/search/chrome.manifest	2015-05-25 20:43:46.000000000 +0000
@@ -0,0 +1,3 @@
+locale testsearchplugin ar jar:jar:searchTest.jar!/chrome/searchTest.jar!/
+content testsearchplugin ./
+
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/tests/search/searchTest.jar and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/tests/search/searchTest.jar differ
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/tests/unit/head.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/tests/unit/head.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/tests/unit/head.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/tests/unit/head.js	2015-05-25 20:43:46.000000000 +0000
@@ -148,6 +148,7 @@
     Cu.import("resource://gre/modules/TelemetrySession.jsm"),
     Cu.import("resource://gre/modules/TelemetryEnvironment.jsm"),
     Cu.import("resource://gre/modules/TelemetryController.jsm"),
+    Cu.import("resource://gre/modules/TelemetryStorage.jsm"),
   ];
 
   for (let m of modules) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/tests/unit/test_PingAPI.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/tests/unit/test_PingAPI.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/tests/unit/test_PingAPI.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/tests/unit/test_PingAPI.js	2015-05-25 20:43:46.000000000 +0000
@@ -7,6 +7,7 @@
 "use strict";
 
 Cu.import("resource://gre/modules/TelemetryController.jsm", this);
+Cu.import("resource://gre/modules/TelemetrySession.jsm", this);
 Cu.import("resource://gre/modules/TelemetryArchive.jsm", this);
 Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
 Cu.import("resource://gre/modules/osfile.jsm", this);
@@ -17,9 +18,12 @@
   return OS.Path.join(OS.Constants.Path.profileDir, "datareporting", "archived");
 });
 
+const PREF_TELEMETRY_ENABLED = "toolkit.telemetry.enabled";
+const Telemetry = Cc["@mozilla.org/base/telemetry;1"].getService(Ci.nsITelemetry);
 
 function run_test() {
   do_get_profile(true);
+  Services.prefs.setBoolPref(PREF_TELEMETRY_ENABLED, true);
   run_next_test();
 }
 
@@ -71,7 +75,7 @@
   yield checkLoadingPings();
 
   // Check that we find the archived pings again by scanning after a restart.
-  TelemetryArchive._testReset();
+  TelemetryController.reset();
 
   let pingList = yield TelemetryArchive.promiseArchivedPingList();
   Assert.deepEqual(expectedPingList, pingList,
@@ -125,7 +129,7 @@
   expectedPingList.sort((a, b) => a.timestampCreated - b.timestampCreated);
 
   // Reset the TelemetryArchive so we scan the archived dir again.
-  yield TelemetryArchive._testReset();
+  yield TelemetryController.reset();
 
   // Check that we are still picking up the valid archived pings on disk,
   // plus the valid ones above.
@@ -140,6 +144,53 @@
             "Should have rejected invalid ping");
 });
 
+add_task(function* test_archiveCleanup() {
+  const PING_TYPE = "foo";
+
+  // Create a ping which should be pruned because it is past the retention period.
+  fakeNow(2010, 1, 1, 1, 0, 0);
+  const PING_ID1 = yield TelemetryController.submitExternalPing(PING_TYPE, {}, {});
+  // Create a ping which should be kept because it is within the retention period.
+  fakeNow(2010, 2, 1, 1, 0, 0);
+  const PING_ID2 = yield TelemetryController.submitExternalPing(PING_TYPE, {}, {});
+  // Create a ping which should be kept because it is within the retention period.
+  fakeNow(2010, 3, 1, 1, 0, 0);
+  const PING_ID3 = yield TelemetryController.submitExternalPing(PING_TYPE, {}, {});
+
+  // Move the current date 180 days ahead of the PING_ID1 ping.
+  fakeNow(2010, 7, 1, 1, 0, 0);
+  // Reset TelemetryArchive and TelemetryController to start the startup cleanup.
+  yield TelemetryController.reset();
+  // Wait for the cleanup to finish.
+  yield TelemetryStorage.testCleanupTaskPromise();
+  // Then scan the archived dir.
+  let pingList = yield TelemetryArchive.promiseArchivedPingList();
+
+  // The PING_ID1 ping should be removed and the other 2 kept.
+  Assert.ok((yield promiseRejects(TelemetryArchive.promiseArchivedPingById(PING_ID1))),
+            "Old pings should be removed from the archive");
+  Assert.ok((yield TelemetryArchive.promiseArchivedPingById(PING_ID2)),
+            "Recent pings should be kept in the archive");
+  Assert.ok((yield TelemetryArchive.promiseArchivedPingById(PING_ID3)),
+            "Recent pings should be kept in the archive");
+
+  // Move the current date 180 days ahead of the PING_ID2 ping.
+  fakeNow(2010, 8, 1, 1, 0, 0);
+  // Reset TelemetryController but not the TelemetryArchive: the cleanup task will update
+  // the existing archive cache.
+  yield TelemetryController.reset();
+  // Wait for the cleanup to finish.
+  yield TelemetryStorage.testCleanupTaskPromise();
+  // Then scan the archived dir again.
+  pingList = yield TelemetryArchive.promiseArchivedPingList();
+
+  // The PING_ID2 ping should be removed and PING_ID3 kept.
+  Assert.ok((yield promiseRejects(TelemetryArchive.promiseArchivedPingById(PING_ID2))),
+            "Old pings should be removed from the archive");
+  Assert.ok((yield TelemetryArchive.promiseArchivedPingById(PING_ID3)),
+            "Recent pings should be kept in the archive");
+});
+
 add_task(function* test_clientId() {
   // Check that a ping submitted after the delayed telemetry initialization completed
   // should get a valid client id.
@@ -165,3 +216,55 @@
   // Finish setup.
   yield promiseSetup;
 });
+
+add_task(function* test_InvalidPingType() {
+  const TYPES = [
+    "a",
+    "-",
+    "¿€€€?",
+    "-foo-",
+    "-moo",
+    "zoo-",
+    ".bar",
+    "asfd.asdf",
+  ];
+
+  for (let type of TYPES) {
+    let histogram = Telemetry.getKeyedHistogramById("TELEMETRY_INVALID_PING_TYPE_SUBMITTED");
+    Assert.equal(histogram.snapshot(type).sum, 0,
+                 "Should not have counted this invalid ping yet: " + type);
+    Assert.ok(promiseRejects(TelemetryController.submitExternalPing(type, {})),
+              "Ping type should have been rejected.");
+    Assert.equal(histogram.snapshot(type).sum, 1,
+                 "Should have counted this as an invalid ping type.");
+  }
+});
+
+add_task(function* test_currentPingData() {
+  yield TelemetrySession.setup();
+
+  // Setup test data.
+  let h = Telemetry.getHistogramById("TELEMETRY_TEST_RELEASE_OPTOUT");
+  h.clear();
+  h.add(1);
+  let k = Telemetry.getKeyedHistogramById("TELEMETRY_TEST_KEYED_RELEASE_OPTOUT");
+  k.clear();
+  k.add("a", 1);
+
+  // Get current ping data objects and check that their data is sane.
+  for (let subsession of [true, false]) {
+    let ping = TelemetryController.getCurrentPingData(subsession);
+
+    Assert.ok(!!ping, "Should have gotten a ping.");
+    Assert.equal(ping.type, "main", "Ping should have correct type.");
+    const expectedReason = subsession ? "gather-subsession-payload" : "gather-payload";
+    Assert.equal(ping.payload.info.reason, expectedReason, "Ping should have the correct reason.");
+
+    let id = "TELEMETRY_TEST_RELEASE_OPTOUT";
+    Assert.ok(id in ping.payload.histograms, "Payload should have test count histogram.");
+    Assert.equal(ping.payload.histograms[id].sum, 1, "Test count value should match.");
+    id = "TELEMETRY_TEST_KEYED_RELEASE_OPTOUT";
+    Assert.ok(id in ping.payload.keyedHistograms, "Payload should have keyed test histogram.");
+    Assert.equal(ping.payload.keyedHistograms[id]["a"].sum, 1, "Keyed test value should match.");
+  }
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/tests/unit/test_TelemetryController.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/tests/unit/test_TelemetryController.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/tests/unit/test_TelemetryController.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/tests/unit/test_TelemetryController.js	2015-05-25 20:43:46.000000000 +0000
@@ -21,7 +21,6 @@
 
 const PING_FORMAT_VERSION = 4;
 const TEST_PING_TYPE = "test-ping-type";
-const TEST_PING_RETENTION = 180;
 
 const PLATFORM_VERSION = "1.9.2";
 const APP_VERSION = "1";
@@ -32,6 +31,7 @@
 const PREF_ARCHIVE_ENABLED = PREF_BRANCH + "archive.enabled";
 const PREF_FHR_UPLOAD_ENABLED = "datareporting.healthreport.uploadEnabled";
 const PREF_FHR_SERVICE_ENABLED = "datareporting.healthreport.service.enabled";
+const PREF_UNIFIED = PREF_BRANCH + "unified";
 
 const Telemetry = Cc["@mozilla.org/base/telemetry;1"].getService(Ci.nsITelemetry);
 
@@ -50,7 +50,6 @@
   let options = {
     addClientId: aSendClientId,
     addEnvironment: aSendEnvironment,
-    retentionDays: TEST_PING_RETENTION,
   };
   return TelemetryController.submitExternalPing(TEST_PING_TYPE, {}, options);
 }
@@ -224,8 +223,12 @@
   let now = new Date(2009, 10, 18, 12, 0, 0);
   fakeNow(now);
 
-  // Disable FHR upload so that pings don't get sent.
-  Preferences.set(PREF_FHR_UPLOAD_ENABLED, false);
+  // Disable ping upload so that pings don't get sent.
+  // With unified telemetry the FHR upload pref controls this,
+  // with non-unified telemetry the Telemetry enabled pref.
+  const isUnified = Preferences.get(PREF_UNIFIED, false);
+  const uploadPref = isUnified ? PREF_FHR_UPLOAD_ENABLED : PREF_ENABLED;
+  Preferences.set(uploadPref, false);
 
   // Register a new Ping Handler that asserts if a ping is received, then send a ping.
   registerPingHandler(() => Assert.ok(false, "Telemetry must not send pings if not allowed to."));
@@ -233,7 +236,7 @@
 
   // Check that the ping was archived, even with upload disabled.
   let ping = yield TelemetryArchive.promiseArchivedPingById(pingId);
-  Assert.equal(ping.id, pingId, "TelemetryController must archive pings if FHR is enabled.");
+  Assert.equal(ping.id, pingId, "TelemetryController should still archive pings.");
 
   // Check that pings don't get archived if not allowed to.
   now = new Date(2010, 10, 18, 12, 0, 0);
@@ -242,10 +245,10 @@
   pingId = yield sendPing(true, true);
   let promise = TelemetryArchive.promiseArchivedPingById(pingId);
   Assert.ok((yield promiseRejects(promise)),
-            "TelemetryController must not archive pings if the archive pref is disabled.");
+    "TelemetryController should not archive pings if the archive pref is disabled.");
 
   // Enable archiving and the upload so that pings get sent and archived again.
-  Preferences.set(PREF_FHR_UPLOAD_ENABLED, true);
+  Preferences.set(uploadPref, true);
   Preferences.set(PREF_ARCHIVE_ENABLED, true);
 
   now = new Date(2014, 06, 18, 22, 0, 0);
@@ -257,7 +260,8 @@
   // Check that we archive pings when successfully sending them.
   yield gRequestIterator.next();
   ping = yield TelemetryArchive.promiseArchivedPingById(pingId);
-  Assert.equal(ping.id, pingId, "TelemetryController must archive pings if FHR is enabled.");
+  Assert.equal(ping.id, pingId,
+    "TelemetryController should still archive pings if ping upload is enabled.");
 });
 
 // Test that we fuzz the submission time around midnight properly
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js	2015-05-25 20:43:46.000000000 +0000
@@ -280,6 +280,11 @@
   Assert.ok(checkNullOrString(update.channel));
   Assert.equal(typeof update.enabled, "boolean");
   Assert.equal(typeof update.autoDownload, "boolean");
+
+  // Check "defaultSearchEngine" separately, as it can either be undefined or string.
+  if ("defaultSearchEngine" in data.settings) {
+    checkString(data.settings.defaultSearchEngine);
+  }
 }
 
 function checkProfileSection(data) {
@@ -561,6 +566,8 @@
 }
 
 function run_test() {
+  // Load a custom manifest to provide search engine loading from JAR files.
+  do_load_manifest("chrome.manifest");
   do_test_pending();
   spoofGfxAdapter();
   do_get_profile();
@@ -936,6 +943,64 @@
   TelemetryEnvironment.unregisterChangeListener("testWatchPrefs_throttling");
 });
 
+add_task(function* test_defaultSearchEngine() {
+  // Check that no default engine is in the environment before the search service is
+  // initialized.
+  let data = TelemetryEnvironment.currentEnvironment;
+  checkEnvironmentData(data);
+  Assert.ok(!("defaultSearchEngine" in data.settings));
+
+  // Load the engines definitions from a custom JAR file: that's needed so that
+  // the search provider reports an engine identifier.
+  let defaultBranch = Services.prefs.getDefaultBranch(null);
+  defaultBranch.setCharPref("browser.search.jarURIs", "chrome://testsearchplugin/locale/searchplugins/");
+  defaultBranch.setBoolPref("browser.search.loadFromJars", true);
+
+  // Initialize the search service and disable geoip lookup, so we don't get unwanted
+  // network connections.
+  Preferences.set("browser.search.geoip.url", "");
+  yield new Promise(resolve => Services.search.init(resolve));
+
+  // Our default engine from the JAR file has an identifier. Check if it is correctly
+  // reported.
+  data = TelemetryEnvironment.currentEnvironment;
+  checkEnvironmentData(data);
+  Assert.equal(data.settings.defaultSearchEngine, "telemetrySearchIdentifier");
+
+  // Remove all the search engines.
+  for (let engine of Services.search.getEngines()) {
+    Services.search.removeEngine(engine);
+  }
+  // The search service does not notify "engine-default" when removing a default engine.
+  // Manually force the notification.
+  // TODO: remove this when bug 1165341 is resolved.
+  Services.obs.notifyObservers(null, "browser-search-engine-modified", "engine-default");
+
+  // Then check that no default engine is reported if none is available.
+  data = TelemetryEnvironment.currentEnvironment;
+  checkEnvironmentData(data);
+  Assert.equal(data.settings.defaultSearchEngine, "NONE");
+
+  // Add a new search engine (this will have no engine identifier).
+  const SEARCH_ENGINE_ID = "telemetry_default";
+  const SEARCH_ENGINE_URL = "http://www.example.org/?search={searchTerms}";
+  Services.search.addEngineWithDetails(SEARCH_ENGINE_ID, "", null, "", "get", SEARCH_ENGINE_URL);
+
+  // Set the clock in the future so our changes don't get throttled.
+  gNow = fakeNow(futureDate(gNow, 10 * MILLISECONDS_PER_MINUTE));
+  // Register a new change listener and then wait for the search engine change to be notified.
+  let deferred = PromiseUtils.defer();
+  TelemetryEnvironment.registerChangeListener("testWatch_SearchDefault", deferred.resolve);
+  Services.search.defaultEngine = Services.search.getEngineByName(SEARCH_ENGINE_ID);
+  yield deferred.promise;
+
+  data = TelemetryEnvironment.currentEnvironment;
+  checkEnvironmentData(data);
+
+  const EXPECTED_SEARCH_ENGINE = "other-" + SEARCH_ENGINE_ID;
+  Assert.equal(data.settings.defaultSearchEngine, EXPECTED_SEARCH_ENGINE);
+});
+
 add_task(function*() {
   do_test_finished();
 });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js	2015-05-25 20:43:46.000000000 +0000
@@ -1363,6 +1363,39 @@
   yield TelemetrySession.shutdown();
 });
 
+add_task(function* test_abortedSession_Shutdown() {
+  if (gIsAndroid || gIsGonk) {
+    // We don't have the aborted session ping here.
+    return;
+  }
+
+  const ABORTED_FILE = OS.Path.join(DATAREPORTING_PATH, ABORTED_PING_FILE_NAME);
+
+  let schedulerTickCallback = null;
+  let now = fakeNow(2040, 1, 1, 0, 0, 0);
+  // Fake scheduler functions to control aborted-session flow in tests.
+  fakeSchedulerTimer(callback => schedulerTickCallback = callback, () => {});
+  yield TelemetrySession.reset();
+
+  Assert.ok((yield OS.File.exists(DATAREPORTING_PATH)),
+            "Telemetry must create the aborted session directory when starting.");
+
+  // Fake now again so that the scheduled aborted-session save takes place.
+  now = fakeNow(futureDate(now, ABORTED_SESSION_UPDATE_INTERVAL_MS));
+  // The first aborted session checkpoint must take place right after the initialisation.
+  Assert.ok(!!schedulerTickCallback);
+  // Execute one scheduler tick.
+  yield schedulerTickCallback();
+  // Check that the aborted session is due at the correct time.
+  Assert.ok((yield OS.File.exists(ABORTED_FILE)), "There must be an aborted session ping.");
+
+  // Remove the aborted session file and then shut down to make sure exceptions (e.g file
+  // not found) do not compromise the shutdown.
+  yield OS.File.remove(ABORTED_FILE);
+
+  yield TelemetrySession.shutdown();
+});
+
 add_task(function* test_abortedDailyCoalescing() {
   if (gIsAndroid || gIsGonk) {
     // We don't have the aborted session or the daily ping here.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/tests/unit/xpcshell.ini firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/tests/unit/xpcshell.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/telemetry/tests/unit/xpcshell.ini	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/telemetry/tests/unit/xpcshell.ini	2015-05-25 20:43:46.000000000 +0000
@@ -5,6 +5,8 @@
 # The *.xpi files are only needed for test_TelemetryEnvironment.js, but
 # xpcshell fails to install tests if we move them under the test entry.
 support-files =
+  ../search/chrome.manifest
+  ../search/searchTest.jar
   dictionary.xpi
   experiment.xpi
   extension.xpi
@@ -25,6 +27,7 @@
 # Bug 1144395: crash on Android 4.3
 skip-if = android_version == "18"
 [test_PingAPI.js]
+skip-if = os == "android"
 [test_TelemetryFlagClear.js]
 [test_TelemetryLateWrites.js]
 [test_TelemetryLockCount.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/thumbnails/PageThumbsProtocol.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/thumbnails/PageThumbsProtocol.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/thumbnails/PageThumbsProtocol.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/thumbnails/PageThumbsProtocol.js	2015-05-25 20:43:47.000000000 +0000
@@ -79,7 +79,9 @@
     let {url} = parseURI(aURI);
     let file = PageThumbsStorage.getFilePathForURL(url);
     let fileuri = Services.io.newFileURI(new FileUtils.File(file));
-    return Services.io.newChannelFromURIWithLoadInfo(fileuri, aLoadInfo);
+    let channel = Services.io.newChannelFromURIWithLoadInfo(fileuri, aLoadInfo);
+    channel.originalURI = aURI;
+    return channel;
   },
 
   newChannel: function Proto_newChannel(aURI) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/url-classifier/ChunkSet.cpp firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/url-classifier/ChunkSet.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/url-classifier/ChunkSet.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/url-classifier/ChunkSet.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -81,7 +81,7 @@
     }
   }
 
-  if (!mChunks.SetLength(addIter - mChunks.Elements())) {
+  if (!mChunks.SetLength(addIter - mChunks.Elements(), fallible)) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/url-classifier/Classifier.cpp firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/url-classifier/Classifier.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/url-classifier/Classifier.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/url-classifier/Classifier.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -13,17 +13,12 @@
 #include "nsIFile.h"
 #include "nsThreadUtils.h"
 #include "mozilla/Telemetry.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 // NSPR_LOG_MODULES=UrlClassifierDbService:5
 extern PRLogModuleInfo *gUrlClassifierDbServiceLog;
-#if defined(PR_LOGGING)
-#define LOG(args) PR_LOG(gUrlClassifierDbServiceLog, PR_LOG_DEBUG, args)
-#define LOG_ENABLED() PR_LOG_TEST(gUrlClassifierDbServiceLog, 4)
-#else
-#define LOG(args)
-#define LOG_ENABLED() (false)
-#endif
+#define LOG(args) MOZ_LOG(gUrlClassifierDbServiceLog, PR_LOG_DEBUG, args)
+#define LOG_ENABLED() PR_LOG_TEST(gUrlClassifierDbServiceLog, PR_LOG_DEBUG)
 
 #define STORE_DIRECTORY      NS_LITERAL_CSTRING("safebrowsing")
 #define TO_DELETE_DIR_SUFFIX NS_LITERAL_CSTRING("-to_delete")
@@ -255,7 +250,7 @@
       continue;
     }
 
-#if DEBUG && defined(PR_LOGGING)
+#if DEBUG
     if (LOG_ENABLED()) {
       nsAutoCString checking;
       lookupHash.ToHexString(checking);
@@ -263,6 +258,7 @@
            checking.get(), lookupHash.ToUint32()));
     }
 #endif
+
     for (uint32_t i = 0; i < cacheArray.Length(); i++) {
       LookupCache *cache = cacheArray[i];
       bool has, complete;
@@ -304,12 +300,10 @@
 {
   Telemetry::AutoTimer<Telemetry::URLCLASSIFIER_CL_UPDATE_TIME> timer;
 
-#if defined(PR_LOGGING)
   PRIntervalTime clockStart = 0;
-  if (LOG_ENABLED() || true) {
+  if (LOG_ENABLED()) {
     clockStart = PR_IntervalNow();
   }
-#endif
 
   LOG(("Backup before update."));
 
@@ -350,13 +344,11 @@
 
   LOG(("Done applying updates."));
 
-#if defined(PR_LOGGING)
-  if (LOG_ENABLED() || true) {
+  if (LOG_ENABLED()) {
     PRIntervalTime clockEnd = PR_IntervalNow();
     LOG(("update took %dms\n",
          PR_IntervalToMilliseconds(clockEnd - clockStart)));
   }
-#endif
 
   return NS_OK;
 }
@@ -676,7 +668,7 @@
   rv = prefixSet->Build(store.AddPrefixes(), store.AddCompletes());
   NS_ENSURE_SUCCESS(rv, rv);
 
-#if defined(DEBUG) && defined(PR_LOGGING)
+#if defined(DEBUG)
   prefixSet->Dump();
 #endif
   rv = prefixSet->WriteFile();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/url-classifier/Entries.h firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/url-classifier/Entries.h
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/url-classifier/Entries.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/url-classifier/Entries.h	2015-05-25 20:43:47.000000000 +0000
@@ -289,7 +289,7 @@
 nsresult
 ReadTArray(nsIInputStream* aStream, FallibleTArray<T>* aArray, uint32_t aNumElements)
 {
-  if (!aArray->SetLength(aNumElements))
+  if (!aArray->SetLength(aNumElements, fallible))
     return NS_ERROR_OUT_OF_MEMORY;
 
   void *buffer = aArray->Elements();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/url-classifier/HashStore.cpp firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/url-classifier/HashStore.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/url-classifier/HashStore.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/url-classifier/HashStore.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -35,7 +35,7 @@
 #include "nsIStreamConverterService.h"
 #include "nsNetUtil.h"
 #include "nsCheckSummedOutputStream.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "zlib.h"
 
 // Main store for SafeBrowsing protocol data. We store
@@ -93,13 +93,8 @@
 
 // NSPR_LOG_MODULES=UrlClassifierDbService:5
 extern PRLogModuleInfo *gUrlClassifierDbServiceLog;
-#if defined(PR_LOGGING)
-#define LOG(args) PR_LOG(gUrlClassifierDbServiceLog, PR_LOG_DEBUG, args)
-#define LOG_ENABLED() PR_LOG_TEST(gUrlClassifierDbServiceLog, 4)
-#else
-#define LOG(args)
-#define LOG_ENABLED() (false)
-#endif
+#define LOG(args) MOZ_LOG(gUrlClassifierDbServiceLog, PR_LOG_DEBUG, args)
+#define LOG_ENABLED() PR_LOG_TEST(gUrlClassifierDbServiceLog, PR_LOG_DEBUG)
 
 // Either the return was successful or we call the Reset function (unless we
 // hit an OOM).  Used while reading in the store.
@@ -584,7 +579,7 @@
   uLongf insize = aIn.Length() * sizeof(T);
   uLongf outsize = compressBound(insize);
   FallibleTArray<char> outBuff;
-  if (!outBuff.SetLength(outsize)) {
+  if (!outBuff.SetLength(outsize, fallible)) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
@@ -627,7 +622,7 @@
   NS_ASSERTION(read == sizeof(inLen), "Error reading inflate length");
 
   FallibleTArray<char> inBuff;
-  if (!inBuff.SetLength(inLen)) {
+  if (!inBuff.SetLength(inLen, fallible)) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
@@ -636,7 +631,7 @@
 
   uLongf insize = inLen;
   uLongf outsize = aExpectedSize * sizeof(T);
-  if (!aOut->SetLength(aExpectedSize)) {
+  if (!aOut->SetLength(aExpectedSize, fallible)) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
@@ -709,7 +704,7 @@
   rv = ReadTArray(aInStream, &slice4, count);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  if (!aData->SetCapacity(count)) {
+  if (!aData->SetCapacity(count, fallible)) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
@@ -730,7 +725,7 @@
   nsresult rv = ByteSliceRead(mInputStream, &chunks, count);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  if (!mAddPrefixes.SetCapacity(count)) {
+  if (!mAddPrefixes.SetCapacity(count, fallible)) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
   for (uint32_t i = 0; i < count; i++) {
@@ -759,7 +754,7 @@
   rv = ByteSliceRead(mInputStream, &prefixes, count);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  if (!mSubPrefixes.SetCapacity(count)) {
+  if (!mSubPrefixes.SetCapacity(count, fallible)) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
   for (uint32_t i = 0; i < count; i++) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/url-classifier/LookupCache.cpp firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/url-classifier/LookupCache.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/url-classifier/LookupCache.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/url-classifier/LookupCache.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -7,7 +7,7 @@
 #include "HashStore.h"
 #include "nsISeekableStream.h"
 #include "mozilla/Telemetry.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prprf.h"
 
 // We act as the main entry point for all the real lookups,
@@ -34,13 +34,8 @@
 
 // NSPR_LOG_MODULES=UrlClassifierDbService:5
 extern PRLogModuleInfo *gUrlClassifierDbServiceLog;
-#if defined(PR_LOGGING)
-#define LOG(args) PR_LOG(gUrlClassifierDbServiceLog, PR_LOG_DEBUG, args)
-#define LOG_ENABLED() PR_LOG_TEST(gUrlClassifierDbServiceLog, 4)
-#else
-#define LOG(args)
-#define LOG_ENABLED() (false)
-#endif
+#define LOG(args) MOZ_LOG(gUrlClassifierDbServiceLog, PR_LOG_DEBUG, args)
+#define LOG_ENABLED() PR_LOG_TEST(gUrlClassifierDbServiceLog, PR_LOG_DEBUG)
 
 namespace mozilla {
 namespace safebrowsing {
@@ -172,7 +167,7 @@
   return NS_OK;
 }
 
-#if defined(DEBUG) && defined(PR_LOGGING)
+#if defined(DEBUG)
 void
 LookupCache::Dump()
 {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/url-classifier/LookupCache.h firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/url-classifier/LookupCache.h
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/url-classifier/LookupCache.h	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/url-classifier/LookupCache.h	2015-05-25 20:43:47.000000000 +0000
@@ -13,7 +13,7 @@
 #include "nsIFile.h"
 #include "nsIFileStreams.h"
 #include "nsUrlClassifierPrefixSet.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 namespace mozilla {
 namespace safebrowsing {
@@ -101,7 +101,7 @@
   nsresult GetPrefixes(FallibleTArray<uint32_t>& aAddPrefixes);
   void ClearCompleteCache();
 
-#if DEBUG && defined(PR_LOGGING)
+#if DEBUG
   void Dump();
 #endif
   nsresult WriteFile();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -38,7 +38,7 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/Telemetry.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prprf.h"
 #include "prnetdb.h"
 #include "Entries.h"
@@ -55,14 +55,9 @@
 using namespace mozilla::safebrowsing;
 
 // NSPR_LOG_MODULES=UrlClassifierDbService:5
-#if defined(PR_LOGGING)
 PRLogModuleInfo *gUrlClassifierDbServiceLog = nullptr;
-#define LOG(args) PR_LOG(gUrlClassifierDbServiceLog, PR_LOG_DEBUG, args)
-#define LOG_ENABLED() PR_LOG_TEST(gUrlClassifierDbServiceLog, 4)
-#else
-#define LOG(args)
-#define LOG_ENABLED() (false)
-#endif
+#define LOG(args) MOZ_LOG(gUrlClassifierDbServiceLog, PR_LOG_DEBUG, args)
+#define LOG_ENABLED() PR_LOG_TEST(gUrlClassifierDbServiceLog, PR_LOG_DEBUG)
 
 // Prefs for implementing nsIURIClassifier to block page loads
 #define CHECK_MALWARE_PREF      "browser.safebrowsing.malware.enabled"
@@ -237,12 +232,10 @@
     return NS_ERROR_NOT_INITIALIZED;
   }
 
-#if defined(PR_LOGGING)
   PRIntervalTime clockStart = 0;
   if (LOG_ENABLED()) {
     clockStart = PR_IntervalNow();
   }
-#endif
 
   nsAutoPtr<LookupResultArray> results(new LookupResultArray());
   if (!results) {
@@ -259,13 +252,11 @@
   LOG(("Found %d results.", results->Length()));
 
 
-#if defined(PR_LOGGING)
   if (LOG_ENABLED()) {
     PRIntervalTime clockEnd = PR_IntervalNow();
     LOG(("query took %dms\n",
          PR_IntervalToMilliseconds(clockEnd - clockStart)));
   }
-#endif
 
   nsAutoPtr<LookupResultArray> completes(new LookupResultArray());
 
@@ -1089,10 +1080,8 @@
 nsresult
 nsUrlClassifierDBService::Init()
 {
-#if defined(PR_LOGGING)
   if (!gUrlClassifierDbServiceLog)
     gUrlClassifierDbServiceLog = PR_NewLogModule("UrlClassifierDbService");
-#endif
   MOZ_ASSERT(NS_IsMainThread(), "Must initialize DB service on main thread");
   nsCOMPtr<nsIXULRuntime> appInfo = do_GetService("@mozilla.org/xre/app-info;1");
   if (appInfo) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -18,19 +18,14 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/FileUtils.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 using namespace mozilla;
 
 // NSPR_LOG_MODULES=UrlClassifierPrefixSet:5
-#if defined(PR_LOGGING)
 static const PRLogModuleInfo *gUrlClassifierPrefixSetLog = nullptr;
-#define LOG(args) PR_LOG(gUrlClassifierPrefixSetLog, PR_LOG_DEBUG, args)
-#define LOG_ENABLED() PR_LOG_TEST(gUrlClassifierPrefixSetLog, 4)
-#else
-#define LOG(args)
-#define LOG_ENABLED() (false)
-#endif
+#define LOG(args) MOZ_LOG(gUrlClassifierPrefixSetLog, PR_LOG_DEBUG, args)
+#define LOG_ENABLED() PR_LOG_TEST(gUrlClassifierPrefixSetLog, PR_LOG_DEBUG)
 
 NS_IMPL_ISUPPORTS(
   nsUrlClassifierPrefixSet, nsIUrlClassifierPrefixSet, nsIMemoryReporter)
@@ -42,10 +37,8 @@
   , mMemoryInUse(0)
   , mMemoryReportPath()
 {
-#if defined(PR_LOGGING)
   if (!gUrlClassifierPrefixSetLog)
     gUrlClassifierPrefixSetLog = PR_NewLogModule("UrlClassifierPrefixSet");
-#endif
 }
 
 NS_IMETHODIMP
@@ -140,7 +133,7 @@
 nsresult
 nsUrlClassifierPrefixSet::GetPrefixesNative(FallibleTArray<uint32_t>& outArray)
 {
-  if (!outArray.SetLength(mTotalPrefixes)) {
+  if (!outArray.SetLength(mTotalPrefixes, fallible)) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.cpp firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -14,7 +14,7 @@
 #include "nsStringStream.h"
 #include "nsToolkitCompsCID.h"
 #include "nsUrlClassifierStreamUpdater.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsIInterfaceRequestor.h"
 #include "mozilla/LoadContext.h"
 #include "nsContentUtils.h"
@@ -24,13 +24,8 @@
 #undef LOG
 
 // NSPR_LOG_MODULES=UrlClassifierStreamUpdater:5
-#if defined(PR_LOGGING)
 static const PRLogModuleInfo *gUrlClassifierStreamUpdaterLog = nullptr;
-#define LOG(args) PR_LOG(gUrlClassifierStreamUpdaterLog, PR_LOG_DEBUG, args)
-#else
-#define LOG(args)
-#endif
-
+#define LOG(args) MOZ_LOG(gUrlClassifierStreamUpdaterLog, PR_LOG_DEBUG, args)
 
 // This class does absolutely nothing, except pass requests onto the DBService.
 
@@ -42,10 +37,8 @@
   : mIsUpdating(false), mInitialized(false), mDownloadError(false),
     mBeganStream(false), mChannel(nullptr)
 {
-#if defined(PR_LOGGING)
   if (!gUrlClassifierStreamUpdaterLog)
     gUrlClassifierStreamUpdaterLog = PR_NewLogModule("UrlClassifierStreamUpdater");
-#endif
   LOG(("nsUrlClassifierStreamUpdater init [this=%p]", this));
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/url-classifier/ProtocolParser.cpp firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/url-classifier/ProtocolParser.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/url-classifier/ProtocolParser.cpp	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/url-classifier/ProtocolParser.cpp	2015-05-25 20:43:47.000000000 +0000
@@ -6,7 +6,7 @@
 #include "ProtocolParser.h"
 #include "LookupCache.h"
 #include "nsNetCID.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prnetdb.h"
 #include "prprf.h"
 
@@ -14,13 +14,8 @@
 
 // NSPR_LOG_MODULES=UrlClassifierDbService:5
 extern PRLogModuleInfo *gUrlClassifierDbServiceLog;
-#if defined(PR_LOGGING)
-#define LOG(args) PR_LOG(gUrlClassifierDbServiceLog, PR_LOG_DEBUG, args)
-#define LOG_ENABLED() PR_LOG_TEST(gUrlClassifierDbServiceLog, 4)
-#else
-#define LOG(args)
-#define LOG_ENABLED() (false)
-#endif
+#define LOG(args) MOZ_LOG(gUrlClassifierDbServiceLog, PR_LOG_DEBUG, args)
+#define LOG_ENABLED() PR_LOG_TEST(gUrlClassifierDbServiceLog, PR_LOG_DEBUG)
 
 namespace mozilla {
 namespace safebrowsing {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/viewconfig/content/config.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/viewconfig/content/config.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/viewconfig/content/config.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/viewconfig/content/config.js	2015-05-25 20:43:47.000000000 +0000
@@ -535,17 +535,17 @@
 function copyPref()
 {
   var pref = gPrefView[view.selection.currentIndex];
-  gClipboardHelper.copyString(pref.prefCol + ';' + pref.valueCol, document);
+  gClipboardHelper.copyString(pref.prefCol + ';' + pref.valueCol);
 }
 
 function copyName()
 {
-  gClipboardHelper.copyString(gPrefView[view.selection.currentIndex].prefCol, document);
+  gClipboardHelper.copyString(gPrefView[view.selection.currentIndex].prefCol);
 }
 
 function copyValue()
 {
-  gClipboardHelper.copyString(gPrefView[view.selection.currentIndex].valueCol, document);
+  gClipboardHelper.copyString(gPrefView[view.selection.currentIndex].valueCol);
 }
 
 function ModifySelected()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/viewsource/content/viewPartialSource.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/viewsource/content/viewPartialSource.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/viewsource/content/viewPartialSource.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/viewsource/content/viewPartialSource.js	2015-05-25 20:43:47.000000000 +0000
@@ -6,479 +6,20 @@
 
 Components.utils.import("resource://gre/modules/Services.jsm");
 
-var gDebug = 0;
-var gLineCount = 0;
-var gStartTargetLine = 0;
-var gEndTargetLine = 0;
-var gTargetNode = null;
-
-var gEntityConverter = null;
-var gWrapLongLines = false;
-const gViewSourceCSS = 'resource://gre-resources/viewsource.css';
-const NS_XHTML = 'http://www.w3.org/1999/xhtml';
-
-// These are markers used to delimit the selection during processing. They
-// are removed from the final rendering.
-// We use noncharacter Unicode codepoints to minimize the risk of clashing
-// with anything that might legitimately be present in the document.
-// U+FDD0..FDEF <noncharacters>
-const MARK_SELECTION_START = '\uFDD0';
-const MARK_SELECTION_END = '\uFDEF';
-
-function onLoadViewPartialSource()
-{
+function onLoadViewPartialSource() {
   // check the view_source.wrap_long_lines pref
   // and set the menuitem's checked attribute accordingly
-  gWrapLongLines = Services.prefs.getBoolPref("view_source.wrap_long_lines");
-  document.getElementById("menu_wrapLongLines").setAttribute("checked", gWrapLongLines);
+  let wrapLongLines = Services.prefs.getBoolPref("view_source.wrap_long_lines");
+  document.getElementById("menu_wrapLongLines")
+          .setAttribute("checked", wrapLongLines);
   document.getElementById("menu_highlightSyntax")
           .setAttribute("checked",
                         Services.prefs.getBoolPref("view_source.syntax_highlight"));
 
   if (window.arguments[3] == 'selection')
-    viewPartialSourceForSelection(window.arguments[2]);
+    viewSourceChrome.loadViewSourceFromSelection(window.arguments[2]);
   else
-    viewPartialSourceForFragment(window.arguments[2], window.arguments[3]);
-
-  gBrowser.droppedLinkHandler = function (event, url, name) {
-    viewSource(url)
-    event.preventDefault();
-  }
+    viewSourceChrome.loadViewSourceFromFragment(window.arguments[2], window.arguments[3]);
 
   window.content.focus();
 }
-
-////////////////////////////////////////////////////////////////////////////////
-// view-source of a selection with the special effect of remapping the selection
-// to the underlying view-source output
-function viewPartialSourceForSelection(selection)
-{
-  var range = selection.getRangeAt(0);
-  var ancestorContainer = range.commonAncestorContainer;
-  var doc = ancestorContainer.ownerDocument;
-
-  var startContainer = range.startContainer;
-  var endContainer = range.endContainer;
-  var startOffset = range.startOffset;
-  var endOffset = range.endOffset;
-
-  // let the ancestor be an element
-  if (ancestorContainer.nodeType == Node.TEXT_NODE ||
-      ancestorContainer.nodeType == Node.CDATA_SECTION_NODE)
-    ancestorContainer = ancestorContainer.parentNode;
-
-  // for selectAll, let's use the entire document, including <html>...</html>
-  // @see nsDocumentViewer::SelectAll() for how selectAll is implemented
-  try {
-    if (ancestorContainer == doc.body)
-      ancestorContainer = doc.documentElement;
-  } catch (e) { }
-
-  // each path is a "child sequence" (a.k.a. "tumbler") that
-  // descends from the ancestor down to the boundary point
-  var startPath = getPath(ancestorContainer, startContainer);
-  var endPath = getPath(ancestorContainer, endContainer);
-
-  // clone the fragment of interest and reset everything to be relative to it
-  // note: it is with the clone that we operate/munge from now on.  Also note
-  // that we clone into a data document to prevent images in the fragment from
-  // loading and the like.  The use of importNode here, as opposed to adoptNode,
-  // is _very_ important.
-  // XXXbz wish there were a less hacky way to create an untrusted document here
-  var isHTML = (doc.createElement("div").tagName == "DIV");
-  var dataDoc = isHTML ? 
-    ancestorContainer.ownerDocument.implementation.createHTMLDocument("") :
-    ancestorContainer.ownerDocument.implementation.createDocument("", "", null);
-  ancestorContainer = dataDoc.importNode(ancestorContainer, true);
-  startContainer = ancestorContainer;
-  endContainer = ancestorContainer;
-
-  // Only bother with the selection if it can be remapped. Don't mess with
-  // leaf elements (such as <isindex>) that secretly use anynomous content
-  // for their display appearance.
-  var canDrawSelection = ancestorContainer.hasChildNodes();
-  if (canDrawSelection) {
-    var i;
-    for (i = startPath ? startPath.length-1 : -1; i >= 0; i--) {
-      startContainer = startContainer.childNodes.item(startPath[i]);
-    }
-    for (i = endPath ? endPath.length-1 : -1; i >= 0; i--) {
-      endContainer = endContainer.childNodes.item(endPath[i]);
-    }
-
-    // add special markers to record the extent of the selection
-    // note: |startOffset| and |endOffset| are interpreted either as
-    // offsets in the text data or as child indices (see the Range spec)
-    // (here, munging the end point first to keep the start point safe...)
-    var tmpNode;
-    if (endContainer.nodeType == Node.TEXT_NODE ||
-        endContainer.nodeType == Node.CDATA_SECTION_NODE) {
-      // do some extra tweaks to try to avoid the view-source output to look like
-      // ...<tag>]... or ...]</tag>... (where ']' marks the end of the selection).
-      // To get a neat output, the idea here is to remap the end point from:
-      // 1. ...<tag>]...   to   ...]<tag>...
-      // 2. ...]</tag>...  to   ...</tag>]...
-      if ((endOffset > 0 && endOffset < endContainer.data.length) ||
-          !endContainer.parentNode || !endContainer.parentNode.parentNode)
-        endContainer.insertData(endOffset, MARK_SELECTION_END);
-      else {
-        tmpNode = dataDoc.createTextNode(MARK_SELECTION_END);
-        endContainer = endContainer.parentNode;
-        if (endOffset == 0)
-          endContainer.parentNode.insertBefore(tmpNode, endContainer);
-        else
-          endContainer.parentNode.insertBefore(tmpNode, endContainer.nextSibling);
-      }
-    }
-    else {
-      tmpNode = dataDoc.createTextNode(MARK_SELECTION_END);
-      endContainer.insertBefore(tmpNode, endContainer.childNodes.item(endOffset));
-    }
-
-    if (startContainer.nodeType == Node.TEXT_NODE ||
-        startContainer.nodeType == Node.CDATA_SECTION_NODE) {
-      // do some extra tweaks to try to avoid the view-source output to look like
-      // ...<tag>[... or ...[</tag>... (where '[' marks the start of the selection).
-      // To get a neat output, the idea here is to remap the start point from:
-      // 1. ...<tag>[...   to   ...[<tag>...
-      // 2. ...[</tag>...  to   ...</tag>[...
-      if ((startOffset > 0 && startOffset < startContainer.data.length) ||
-          !startContainer.parentNode || !startContainer.parentNode.parentNode ||
-          startContainer != startContainer.parentNode.lastChild)
-        startContainer.insertData(startOffset, MARK_SELECTION_START);
-      else {
-        tmpNode = dataDoc.createTextNode(MARK_SELECTION_START);
-        startContainer = startContainer.parentNode;
-        if (startOffset == 0)
-          startContainer.parentNode.insertBefore(tmpNode, startContainer);
-        else
-          startContainer.parentNode.insertBefore(tmpNode, startContainer.nextSibling);
-      }
-    }
-    else {
-      tmpNode = dataDoc.createTextNode(MARK_SELECTION_START);
-      startContainer.insertBefore(tmpNode, startContainer.childNodes.item(startOffset));
-    }
-  }
-
-  // now extract and display the syntax highlighted source
-  tmpNode = dataDoc.createElementNS(NS_XHTML, 'div');
-  tmpNode.appendChild(ancestorContainer);
-
-  // the load is aynchronous and so we will wait until the view-source DOM is done
-  // before drawing the selection.
-  if (canDrawSelection) {
-    window.document.getElementById("content").addEventListener("load", drawSelection, true);
-  }
-
-  // all our content is held by the data:URI and URIs are internally stored as utf-8 (see nsIURI.idl)
-  var loadFlags = Components.interfaces.nsIWebNavigation.LOAD_FLAGS_NONE;
-  var referrerPolicy = Components.interfaces.nsIHttpChannel.REFERRER_POLICY_DEFAULT;
-  ViewSourceChrome.webNav.loadURIWithOptions((isHTML ?
-                                              "view-source:data:text/html;charset=utf-8," :
-                                              "view-source:data:application/xml;charset=utf-8,")
-                                             + encodeURIComponent(tmpNode.innerHTML),
-                                             loadFlags,
-                                             null, referrerPolicy,  // referrer
-                                             null, null,  // postData, headers
-                                             Services.io.newURI(doc.baseURI, null, null));
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// helper to get a path like FIXptr, but with an array instead of the "tumbler" notation
-// see FIXptr: http://lists.w3.org/Archives/Public/www-xml-linking-comments/2001AprJun/att-0074/01-NOTE-FIXptr-20010425.htm
-function getPath(ancestor, node)
-{
-  var n = node;
-  var p = n.parentNode;
-  if (n == ancestor || !p)
-    return null;
-  var path = new Array();
-  if (!path)
-    return null;
-  do {
-    for (var i = 0; i < p.childNodes.length; i++) {
-      if (p.childNodes.item(i) == n) {
-        path.push(i);
-        break;
-      }
-    }
-    n = p;
-    p = n.parentNode;
-  } while (n != ancestor && p);
-  return path;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// using special markers left in the serialized source, this helper makes the
-// underlying markup of the selected fragment to automatically appear as selected
-// on the inflated view-source DOM
-function drawSelection()
-{
-  gBrowser.contentDocument.title =
-    gViewSourceBundle.getString("viewSelectionSourceTitle");
-
-  // find the special selection markers that we added earlier, and
-  // draw the selection between the two...
-  var findService = null;
-  try {
-    // get the find service which stores the global find state
-    findService = Components.classes["@mozilla.org/find/find_service;1"]
-                            .getService(Components.interfaces.nsIFindService);
-  } catch(e) { }
-  if (!findService)
-    return;
-
-  // cache the current global find state
-  var matchCase     = findService.matchCase;
-  var entireWord    = findService.entireWord;
-  var wrapFind      = findService.wrapFind;
-  var findBackwards = findService.findBackwards;
-  var searchString  = findService.searchString;
-  var replaceString = findService.replaceString;
-
-  // setup our find instance
-  var findInst = gBrowser.webBrowserFind;
-  findInst.matchCase = true;
-  findInst.entireWord = false;
-  findInst.wrapFind = true;
-  findInst.findBackwards = false;
-
-  // ...lookup the start mark
-  findInst.searchString = MARK_SELECTION_START;
-  var startLength = MARK_SELECTION_START.length;
-  findInst.findNext();
-
-  var selection = content.getSelection();
-  if (!selection.rangeCount)
-    return;
-
-  var range = selection.getRangeAt(0);
-
-  var startContainer = range.startContainer;
-  var startOffset = range.startOffset;
-
-  // ...lookup the end mark
-  findInst.searchString = MARK_SELECTION_END;
-  var endLength = MARK_SELECTION_END.length;
-  findInst.findNext();
-
-  var endContainer = selection.anchorNode;
-  var endOffset = selection.anchorOffset;
-
-  // reset the selection that find has left
-  selection.removeAllRanges();
-
-  // delete the special markers now...
-  endContainer.deleteData(endOffset, endLength);
-  startContainer.deleteData(startOffset, startLength);
-  if (startContainer == endContainer)
-    endOffset -= startLength; // has shrunk if on same text node...
-  range.setEnd(endContainer, endOffset);
-
-  // show the selection and scroll it into view
-  selection.addRange(range);
-  // the default behavior of the selection is to scroll at the end of
-  // the selection, whereas in this situation, it is more user-friendly
-  // to scroll at the beginning. So we override the default behavior here
-  try {
-    getSelectionController().scrollSelectionIntoView(
-                               Ci.nsISelectionController.SELECTION_NORMAL,
-                               Ci.nsISelectionController.SELECTION_ANCHOR_REGION,
-                               true);
-  }
-  catch(e) { }
-
-  // restore the current find state
-  findService.matchCase     = matchCase;
-  findService.entireWord    = entireWord;
-  findService.wrapFind      = wrapFind;
-  findService.findBackwards = findBackwards;
-  findService.searchString  = searchString;
-  findService.replaceString = replaceString;
-
-  findInst.matchCase     = matchCase;
-  findInst.entireWord    = entireWord;
-  findInst.wrapFind      = wrapFind;
-  findInst.findBackwards = findBackwards;
-  findInst.searchString  = searchString;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// special handler for markups such as MathML where reformatting the output is
-// helpful
-function viewPartialSourceForFragment(node, context)
-{
-  gTargetNode = node;
-  if (gTargetNode && gTargetNode.nodeType == Node.TEXT_NODE)
-    gTargetNode = gTargetNode.parentNode;
-
-  // walk up the tree to the top-level element (e.g., <math>, <svg>)
-  var topTag;
-  if (context == 'mathml')
-    topTag = 'math';
-  else
-    throw 'not reached';
-  var topNode = gTargetNode;
-  while (topNode && topNode.localName != topTag)
-    topNode = topNode.parentNode;
-  if (!topNode)
-    return;
-
-  // serialize
-  var title = gViewSourceBundle.getString("viewMathMLSourceTitle");
-  var wrapClass = gWrapLongLines ? ' class="wrap"' : '';
-  var source =
-    '<!DOCTYPE html>'
-  + '<html>'
-  + '<head><title>' + title + '</title>'
-  + '<link rel="stylesheet" type="text/css" href="' + gViewSourceCSS + '">'
-  + '<style type="text/css">'
-  + '#target { border: dashed 1px; background-color: lightyellow; }'
-  + '</style>'
-  + '</head>'
-  + '<body id="viewsource"' + wrapClass
-  +        ' onload="document.title=\''+title+'\';document.getElementById(\'target\').scrollIntoView(true)">'
-  + '<pre>'
-  + getOuterMarkup(topNode, 0)
-  + '</pre></body></html>'
-  ; // end
-
-  // display
-  gBrowser.loadURI("data:text/html;charset=utf-8," + encodeURIComponent(source));
-}
-
-////////////////////////////////////////////////////////////////////////////////
-function getInnerMarkup(node, indent) {
-  var str = '';
-  for (var i = 0; i < node.childNodes.length; i++) {
-    str += getOuterMarkup(node.childNodes.item(i), indent);
-  }
-  return str;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-function getOuterMarkup(node, indent) {
-  var newline = '';
-  var padding = '';
-  var str = '';
-  if (node == gTargetNode) {
-    gStartTargetLine = gLineCount;
-    str += '</pre><pre id="target">';
-  }
-
-  switch (node.nodeType) {
-  case Node.ELEMENT_NODE: // Element
-    // to avoid the wide gap problem, '\n' is not emitted on the first
-    // line and the lines before & after the <pre id="target">...</pre>
-    if (gLineCount > 0 &&
-        gLineCount != gStartTargetLine &&
-        gLineCount != gEndTargetLine) {
-      newline = '\n';
-    }
-    gLineCount++;
-    if (gDebug) {
-      newline += gLineCount;
-    }
-    for (var k = 0; k < indent; k++) {
-      padding += ' ';
-    }
-    str += newline + padding
-        +  '&lt;<span class="start-tag">' + node.nodeName + '</span>';
-    for (var i = 0; i < node.attributes.length; i++) {
-      var attr = node.attributes.item(i);
-      if (!gDebug && attr.nodeName.match(/^[-_]moz/)) {
-        continue;
-      }
-      str += ' <span class="attribute-name">'
-          +  attr.nodeName
-          +  '</span>=<span class="attribute-value">"'
-          +  unicodeTOentity(attr.nodeValue)
-          +  '"</span>';
-    }
-    if (!node.hasChildNodes()) {
-      str += '/&gt;';
-    }
-    else {
-      str += '&gt;';
-      var oldLine = gLineCount;
-      str += getInnerMarkup(node, indent + 2);
-      if (oldLine == gLineCount) {
-        newline = '';
-        padding = '';
-      }
-      else {
-        newline = (gLineCount == gEndTargetLine) ? '' : '\n';
-        gLineCount++;
-        if (gDebug) {
-          newline += gLineCount;
-        }
-      }
-      str += newline + padding
-          +  '&lt;/<span class="end-tag">' + node.nodeName + '</span>&gt;';
-    }
-    break;
-  case Node.TEXT_NODE: // Text
-    var tmp = node.nodeValue;
-    tmp = tmp.replace(/(\n|\r|\t)+/g, " ");
-    tmp = tmp.replace(/^ +/, "");
-    tmp = tmp.replace(/ +$/, "");
-    if (tmp.length != 0) {
-      str += '<span class="text">' + unicodeTOentity(tmp) + '</span>';
-    }
-    break;
-  default:
-    break;
-  }
-
-  if (node == gTargetNode) {
-    gEndTargetLine = gLineCount;
-    str += '</pre><pre>';
-  }
-  return str;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-function unicodeTOentity(text)
-{
-  const charTable = {
-    '&': '&amp;<span class="entity">amp;</span>',
-    '<': '&amp;<span class="entity">lt;</span>',
-    '>': '&amp;<span class="entity">gt;</span>',
-    '"': '&amp;<span class="entity">quot;</span>'
-  };
-
-  function charTableLookup(letter) {
-    return charTable[letter];
-  }
-
-  function convertEntity(letter) {
-    try {
-      var unichar = gEntityConverter.ConvertToEntity(letter, entityVersion);
-      var entity = unichar.substring(1); // extract '&'
-      return '&amp;<span class="entity">' + entity + '</span>';
-    } catch (ex) {
-      return letter;
-    }
-  }
-
-  if (!gEntityConverter) {
-    try {
-      gEntityConverter =
-        Components.classes["@mozilla.org/intl/entityconverter;1"]
-                  .createInstance(Components.interfaces.nsIEntityConverter);
-    } catch(e) { }
-  }
-
-  const entityVersion = Components.interfaces.nsIEntityConverter.entityW3C;
-
-  var str = text;
-
-  // replace chars in our charTable
-  str = str.replace(/[<>&"]/g, charTableLookup);
-
-  // replace chars > 0x7f via nsIEntityConverter
-  str = str.replace(/[^\0-\u007f]/g, convertEntity);
-
-  return str;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/viewsource/content/viewPartialSource.xul firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/viewsource/content/viewPartialSource.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/viewsource/content/viewPartialSource.xul	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/viewsource/content/viewPartialSource.xul	2015-05-25 20:43: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/.
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
-<?xml-stylesheet href="chrome://global/content/viewSource.css" type="text/css"?> 
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/content/viewSource.css" type="text/css"?>
 <?xml-stylesheet href="chrome://mozapps/skin/viewsource/viewsource.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 
@@ -20,10 +20,10 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="onLoadViewPartialSource();"
         contenttitlesetting="true"
-        title="&mainWindow.title;" 
-        titlemodifier="&mainWindow.titlemodifier;" 
+        title="&mainWindow.title;"
+        titlemodifier="&mainWindow.titlemodifier;"
         titlepreface=""
-        titlemenuseparator ="&mainWindow.titlemodifierseparator;"  
+        titlemenuseparator ="&mainWindow.titlemodifierseparator;"
         windowtype="navigator:view-source"
         width="500" height="300"
         screenX="10" screenY="10"
@@ -50,9 +50,9 @@
            oncommand="document.getElementById('FindToolbar').onFindAgainCommand(false);"/>
   <command id="cmd_findPrevious"
            oncommand="document.getElementById('FindToolbar').onFindAgainCommand(true);"/>
-  <command id="cmd_goToLine" oncommand="ViewSourceChrome.promptAndGoToLine();" disabled="true"/>
-  <command id="cmd_highlightSyntax" oncommand="ViewSourceChrome.toggleSyntaxHighlighting();"/>
-  <command id="cmd_wrapLongLines" oncommand="ViewSourceChrome.toggleWrapping();"/>
+  <command id="cmd_goToLine" oncommand="viewSourceChrome.promptAndGoToLine();" disabled="true"/>
+  <command id="cmd_highlightSyntax" oncommand="viewSourceChrome.toggleSyntaxHighlighting();"/>
+  <command id="cmd_wrapLongLines" oncommand="viewSourceChrome.toggleWrapping();"/>
   <command id="cmd_textZoomReduce" oncommand="ZoomManager.reduce();"/>
   <command id="cmd_textZoomEnlarge" oncommand="ZoomManager.enlarge();"/>
   <command id="cmd_textZoomReset" oncommand="ZoomManager.reset();"/>
@@ -80,16 +80,16 @@
     <menuitem id="context-copyLink"
               label="&copyLinkCmd.label;"
               accesskey="&copyLinkCmd.accesskey;"
-              oncommand="ViewSourceChrome.onContextMenuCopyLinkOrEmail();"/>
+              oncommand="viewSourceChrome.onContextMenuCopyLinkOrEmail();"/>
     <menuitem id="context-copyEmail"
               label="&copyEmailCmd.label;"
               accesskey="&copyEmailCmd.accesskey;"
-              oncommand="ViewSourceChrome.onContextMenuCopyLinkOrEmail();"/>
+              oncommand="viewSourceChrome.onContextMenuCopyLinkOrEmail();"/>
     <menuseparator/>
     <menuitem id="cMenu_selectAll"/>
   </menupopup>
 
-  <!-- Menu --> 
+  <!-- Menu -->
   <toolbox id="viewSource-toolbox">
     <menubar id="viewSource-main-menubar">
 
@@ -131,11 +131,11 @@
       <menu id="menu_view" label="&viewMenu.label;" accesskey="&viewMenu.accesskey;">
         <menupopup id="viewmenu-popup">
           <menu id="viewTextZoomMenu" label="&menu_textSize.label;" accesskey="&menu_textSize.accesskey;">
-            <menupopup>                    
-              <menuitem id="menu_textEnlarge" command="cmd_textZoomEnlarge" 
+            <menupopup>
+              <menuitem id="menu_textEnlarge" command="cmd_textZoomEnlarge"
                         label="&menu_textEnlarge.label;" accesskey="&menu_textEnlarge.accesskey;"
                         key="key_textZoomEnlarge"/>
-              <menuitem id="menu_textReduce" command="cmd_textZoomReduce" 
+              <menuitem id="menu_textReduce" command="cmd_textZoomReduce"
                         label="&menu_textReduce.label;" accesskey="&menu_textReduce.accesskey;"
                         key="key_textZoomReduce"/>
               <menuseparator/>
@@ -151,7 +151,7 @@
                     label="&menu_highlightSyntax.label;" accesskey="&menu_highlightSyntax.accesskey;"/>
         </menupopup>
       </menu>
-    </menubar>  
+    </menubar>
   </toolbox>
 
   <vbox id="appcontent" flex="1">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/viewsource/content/viewSource-content.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/viewsource/content/viewSource-content.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/viewsource/content/viewSource-content.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/viewsource/content/viewSource-content.js	2015-05-25 20:43:47.000000000 +0000
@@ -12,8 +12,17 @@
 XPCOMUtils.defineLazyModuleGetter(this, "DeferredTask",
   "resource://gre/modules/DeferredTask.jsm");
 
+const NS_XHTML = "http://www.w3.org/1999/xhtml";
 const BUNDLE_URL = "chrome://global/locale/viewSource.properties";
 
+// These are markers used to delimit the selection during processing. They
+// are removed from the final rendering.
+// We use noncharacter Unicode codepoints to minimize the risk of clashing
+// with anything that might legitimately be present in the document.
+// U+FDD0..FDEF <noncharacters>
+const MARK_SELECTION_START = "\uFDD0";
+const MARK_SELECTION_END = "\uFDEF";
+
 let global = this;
 
 /**
@@ -39,9 +48,17 @@
     "ViewSource:ToggleWrapping",
     "ViewSource:ToggleSyntaxHighlighting",
     "ViewSource:SetCharacterSet",
+    "ViewSource:ScheduleDrawSelection",
   ],
 
   /**
+   * When showing selection source, chrome will construct a page fragment to
+   * show, and then instruct content to draw a selection after load.  This is
+   * set true when there is a pending request to draw selection.
+   */
+  needsDrawSelection: false,
+
+  /**
    * ViewSourceContent is attached as an nsISelectionListener on pageshow,
    * and removed on pagehide. When the initial about:blank is transitioned
    * away from, a pagehide is fired without us having attached ourselves
@@ -51,6 +68,17 @@
    */
   selectionListenerAttached: false,
 
+  get isViewSource() {
+    let uri = content.document.documentURI;
+    return uri.startsWith("view-source:") ||
+           (uri.startsWith("data:") && uri.includes("MathML"));
+  },
+
+  get isAboutBlank() {
+    let uri = content.document.documentURI;
+    return uri == "about:blank";
+  },
+
   /**
    * This should be called as soon as this frame script has loaded.
    */
@@ -93,6 +121,9 @@
    * get dispatched to a specific function for the message name.
    */
   receiveMessage(msg) {
+    if (!this.isViewSource && !this.isAboutBlank) {
+      return;
+    }
     let data = msg.data;
     let objects = msg.objects;
     switch(msg.name) {
@@ -116,6 +147,9 @@
       case "ViewSource:SetCharacterSet":
         this.setCharacterSet(data.charset, data.doPageLoad);
         break;
+      case "ViewSource:ScheduleDrawSelection":
+        this.scheduleDrawSelection();
+        break;
     }
   },
 
@@ -124,6 +158,9 @@
    * a specific function for the event type.
    */
   handleEvent(event) {
+    if (!this.isViewSource) {
+      return;
+    }
     switch(event.type) {
       case "pagehide":
         this.onPageHide(event);
@@ -162,6 +199,14 @@
   },
 
   /**
+   * A shortcut to the nsIWebBrowserFind for the content.
+   */
+  get webBrowserFind() {
+    return docShell.QueryInterface(Ci.nsIInterfaceRequestor)
+                   .getInterface(Ci.nsIWebBrowserFind);
+  },
+
+  /**
    * Called when the parent sends a message to view some source code.
    *
    * @param URL (required)
@@ -250,8 +295,13 @@
       docShell.charset = forcedCharSet;
     }
 
-    if (lineNumber) {
+    if (lineNumber && lineNumber > 0) {
       let doneLoading = (event) => {
+        // Ignore possible initial load of about:blank
+        if (this.isAboutBlank ||
+            !content.document.body) {
+          return;
+        }
         this.goToLine(lineNumber);
         removeEventListener("pageshow", doneLoading);
       };
@@ -300,16 +350,28 @@
   },
 
   /**
-   * This handler is specifically for click events bubbling up from
-   * error page content, which can show up if the user attempts to
-   * view the source of an attack page.
+   * This handler is for click events from:
+   *   * error page content, which can show up if the user attempts to view the
+   *     source of an attack page.
+   *   * in-page context menu actions
    */
   onClick(event) {
+    let target = event.originalTarget;
+    // Check for content menu actions
+    if (target.id) {
+      this.contextMenuItems.forEach(itemSpec => {
+        if (itemSpec.id !== target.id) {
+          return;
+        }
+        itemSpec.handler.call(this, event);
+        event.stopPropagation();
+      });
+    }
+
     // Don't trust synthetic events
     if (!event.isTrusted || event.target.localName != "button")
       return;
 
-    let target = event.originalTarget;
     let errorDoc = target.ownerDocument;
 
     if (/^about:blocked/.test(errorDoc.documentURI)) {
@@ -341,12 +403,26 @@
    *        The pageshow event being handled.
    */
   onPageShow(event) {
-    content.getSelection()
-           .QueryInterface(Ci.nsISelectionPrivate)
-           .addSelectionListener(this);
-    this.selectionListenerAttached = true;
-
+    let selection = content.getSelection();
+    if (selection) {
+      selection.QueryInterface(Ci.nsISelectionPrivate)
+               .addSelectionListener(this);
+      this.selectionListenerAttached = true;
+    }
     content.focus();
+
+    // If we need to draw the selection, wait until an actual view source page
+    // has loaded, instead of about:blank.
+    if (this.needsDrawSelection &&
+        content.document.documentURI.startsWith("view-source:")) {
+      this.needsDrawSelection = false;
+      this.drawSelection();
+    }
+
+    if (content.document.body) {
+      this.injectContextMenu();
+    }
+
     sendAsyncMessage("ViewSource:SourceLoaded");
   },
 
@@ -604,13 +680,12 @@
   },
 
   /**
-   * Called when the parent has changed the syntax highlighting pref.
+   * Toggles the "highlight" class on the document body, which sets whether
+   * or not syntax highlighting is displayed.
    */
   toggleSyntaxHighlighting() {
-    // The parent process should have set the view_source.syntax_highlight
-    // pref to the desired value. The reload brings that setting into
-    // effect.
-    this.reload();
+    let body = content.document.body;
+    body.classList.toggle("highlight");
   },
 
   /**
@@ -699,5 +774,184 @@
 
     this.updateStatusTask.arm();
   },
+
+  /**
+   * Chrome has requested that we draw a selection once the content loads.
+   * We set a flag, and wait for the load event, where drawSelection() will be
+   * called to do the real work.
+   */
+  scheduleDrawSelection() {
+    this.needsDrawSelection = true;
+  },
+
+  /**
+   * Using special markers left in the serialized source, this helper makes the
+   * underlying markup of the selected fragment to automatically appear as
+   * selected on the inflated view-source DOM.
+   */
+  drawSelection() {
+    content.document.title =
+      this.bundle.GetStringFromName("viewSelectionSourceTitle");
+
+    // find the special selection markers that we added earlier, and
+    // draw the selection between the two...
+    var findService = null;
+    try {
+      // get the find service which stores the global find state
+      findService = Cc["@mozilla.org/find/find_service;1"]
+                    .getService(Ci.nsIFindService);
+    } catch(e) { }
+    if (!findService)
+      return;
+
+    // cache the current global find state
+    var matchCase     = findService.matchCase;
+    var entireWord    = findService.entireWord;
+    var wrapFind      = findService.wrapFind;
+    var findBackwards = findService.findBackwards;
+    var searchString  = findService.searchString;
+    var replaceString = findService.replaceString;
+
+    // setup our find instance
+    var findInst = this.webBrowserFind;
+    findInst.matchCase = true;
+    findInst.entireWord = false;
+    findInst.wrapFind = true;
+    findInst.findBackwards = false;
+
+    // ...lookup the start mark
+    findInst.searchString = MARK_SELECTION_START;
+    var startLength = MARK_SELECTION_START.length;
+    findInst.findNext();
+
+    var selection = content.getSelection();
+    if (!selection.rangeCount)
+      return;
+
+    var range = selection.getRangeAt(0);
+
+    var startContainer = range.startContainer;
+    var startOffset = range.startOffset;
+
+    // ...lookup the end mark
+    findInst.searchString = MARK_SELECTION_END;
+    var endLength = MARK_SELECTION_END.length;
+    findInst.findNext();
+
+    var endContainer = selection.anchorNode;
+    var endOffset = selection.anchorOffset;
+
+    // reset the selection that find has left
+    selection.removeAllRanges();
+
+    // delete the special markers now...
+    endContainer.deleteData(endOffset, endLength);
+    startContainer.deleteData(startOffset, startLength);
+    if (startContainer == endContainer)
+      endOffset -= startLength; // has shrunk if on same text node...
+    range.setEnd(endContainer, endOffset);
+
+    // show the selection and scroll it into view
+    selection.addRange(range);
+    // the default behavior of the selection is to scroll at the end of
+    // the selection, whereas in this situation, it is more user-friendly
+    // to scroll at the beginning. So we override the default behavior here
+    try {
+      this.selectionController.scrollSelectionIntoView(
+                                 Ci.nsISelectionController.SELECTION_NORMAL,
+                                 Ci.nsISelectionController.SELECTION_ANCHOR_REGION,
+                                 true);
+    }
+    catch(e) { }
+
+    // restore the current find state
+    findService.matchCase     = matchCase;
+    findService.entireWord    = entireWord;
+    findService.wrapFind      = wrapFind;
+    findService.findBackwards = findBackwards;
+    findService.searchString  = searchString;
+    findService.replaceString = replaceString;
+
+    findInst.matchCase     = matchCase;
+    findInst.entireWord    = entireWord;
+    findInst.wrapFind      = wrapFind;
+    findInst.findBackwards = findBackwards;
+    findInst.searchString  = searchString;
+  },
+
+  /**
+   * In-page context menu items that are injected after page load.
+   */
+  contextMenuItems: [
+    {
+      id: "goToLine",
+      handler() {
+        sendAsyncMessage("ViewSource:PromptAndGoToLine");
+      }
+    },
+    {
+      id: "wrapLongLines",
+      get checked() {
+        return Services.prefs.getBoolPref("view_source.wrap_long_lines");
+      },
+      handler() {
+        this.toggleWrapping();
+      }
+    },
+    {
+      id: "highlightSyntax",
+      get checked() {
+        return Services.prefs.getBoolPref("view_source.syntax_highlight");
+      },
+      handler() {
+        this.toggleSyntaxHighlighting();
+      }
+    },
+  ],
+
+  /**
+   * Add context menu items for view source specific actions.
+   */
+  injectContextMenu() {
+    let doc = content.document;
+
+    let menu = doc.createElementNS(NS_XHTML, "menu");
+    menu.setAttribute("type", "context");
+    menu.setAttribute("id", "actions");
+    doc.body.appendChild(menu);
+    doc.body.setAttribute("contextmenu", "actions");
+
+    this.contextMenuItems.forEach(itemSpec => {
+      let item = doc.createElementNS(NS_XHTML, "menuitem");
+      item.setAttribute("id", itemSpec.id);
+      let labelName = `context_${itemSpec.id}_label`;
+      let label = this.bundle.GetStringFromName(labelName);
+      item.setAttribute("label", label);
+      if ("checked" in itemSpec) {
+        item.setAttribute("type", "checkbox");
+      }
+      menu.appendChild(item);
+    });
+
+    this.updateContextMenu();
+  },
+
+  /**
+   * Update state of checkbox-style context menu items.
+   */
+  updateContextMenu() {
+    let doc = content.document;
+    this.contextMenuItems.forEach(itemSpec => {
+      if (!("checked" in itemSpec)) {
+        return;
+      }
+      let item = doc.getElementById(itemSpec.id);
+      if (itemSpec.checked) {
+        item.setAttribute("checked", true);
+      } else {
+        item.removeAttribute("checked");
+      }
+    });
+  },
 };
 ViewSourceContent.init();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/viewsource/content/viewSource.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/viewsource/content/viewSource.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/viewsource/content/viewSource.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/viewsource/content/viewSource.js	2015-05-25 20:43:47.000000000 +0000
@@ -7,6 +7,7 @@
 const { utils: Cu, interfaces: Ci, classes: Cc } = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/ViewSourceBrowser.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "Services",
   "resource://gre/modules/Services.jsm");
@@ -31,15 +32,24 @@
 
 /**
  * ViewSourceChrome is the primary interface for interacting with
- * the view source browser. It initializes itself on script load.
+ * the view source browser from a self-contained window.  It extends
+ * ViewSourceBrowser with additional things needed inside the special window.
+ *
+ * It initializes itself on script load.
  */
-let ViewSourceChrome = {
+function ViewSourceChrome() {
+  ViewSourceBrowser.call(this);
+}
+
+ViewSourceChrome.prototype = {
+  __proto__: ViewSourceBrowser.prototype,
+
   /**
-   * Holds the value of the last line found via the "Go to line"
-   * command, to pre-populate the prompt the next time it is
-   * opened.
+   * The <browser> that will be displaying the view source content.
    */
-  lastLineFound: null,
+  get browser() {
+    return gBrowser;
+  },
 
   /**
    * The context menu, when opened from the content process, sends
@@ -55,31 +65,22 @@
    * will automatically have ViewSourceChrome listen for those messages,
    * and remove the listeners on teardown.
    */
-  messages: [
+  messages: ViewSourceBrowser.prototype.messages.concat([
     "ViewSource:SourceLoaded",
     "ViewSource:SourceUnloaded",
     "ViewSource:Close",
     "ViewSource:OpenURL",
-    "ViewSource:GoToLine:Success",
-    "ViewSource:GoToLine:Failed",
     "ViewSource:UpdateStatus",
     "ViewSource:ContextMenuOpening",
-  ],
+  ]),
 
   /**
-   * This should be called as soon as the script loads. When this function
-   * executes, we can assume the DOM content has not yet loaded.
+   * This called via ViewSourceBrowser's constructor.  This should be called as
+   * soon as the script loads.  When this function executes, we can assume the
+   * DOM content has not yet loaded.
    */
   init() {
-    // We use the window message manager so that if we switch remoteness of the
-    // browser (which we might do if we're attempting to load the document
-    // source out of the network cache), we automatically re-load the frame
-    // script.
-    let wMM = window.messageManager;
-    wMM.loadFrameScript("chrome://global/content/viewSource-content.js", true);
-    this.messages.forEach((msgName) => {
-      wMM.addMessageListener(msgName, this);
-    });
+    this.mm.loadFrameScript("chrome://global/content/viewSource-content.js", true);
 
     this.shouldWrap = Services.prefs.getBoolPref("view_source.wrap_long_lines");
     this.shouldHighlight =
@@ -89,6 +90,8 @@
     addEventListener("unload", this);
     addEventListener("AppCommand", this, true);
     addEventListener("MozSwipeGesture", this, true);
+
+    ViewSourceBrowser.prototype.init.call(this);
   },
 
   /**
@@ -96,10 +99,7 @@
    * clean up event and message listeners.
    */
   uninit() {
-    let wMM = window.messageManager;
-    this.messages.forEach((msgName) => {
-      wMM.removeMessageListener(msgName, this);
-    });
+    ViewSourceBrowser.prototype.uninit.call(this);
 
     // "load" event listener is removed in its handler, to
     // ensure we only fire it once.
@@ -108,8 +108,9 @@
     removeEventListener("MozSwipeGesture", this, true);
     gContextMenu.removeEventListener("popupshowing", this);
     gContextMenu.removeEventListener("popuphidden", this);
-    Services.els.removeSystemEventListener(gBrowser, "dragover", this, true);
-    Services.els.removeSystemEventListener(gBrowser, "drop", this, true);
+    Services.els.removeSystemEventListener(this.browser, "dragover", this,
+                                           true);
+    Services.els.removeSystemEventListener(this.browser, "drop", this, true);
   },
 
   /**
@@ -120,6 +121,17 @@
     let data = message.data;
 
     switch(message.name) {
+      // Begin messages from super class
+      case "ViewSource:PromptAndGoToLine":
+        this.promptAndGoToLine();
+        break;
+      case "ViewSource:GoToLine:Success":
+        this.onGoToLineSuccess(data.lineNumber);
+        break;
+      case "ViewSource:GoToLine:Failed":
+        this.onGoToLineFailed();
+        break;
+      // End messages from super class
       case "ViewSource:SourceLoaded":
         this.onSourceLoaded();
         break;
@@ -132,18 +144,12 @@
       case "ViewSource:OpenURL":
         this.openURL(data.URL);
         break;
-      case "ViewSource:GoToLine:Failed":
-        this.onGoToLineFailed();
-        break;
-      case "ViewSource:GoToLine:Success":
-        this.onGoToLineSuccess(data.lineNumber);
-        break;
       case "ViewSource:UpdateStatus":
         this.updateStatus(data.label);
         break;
       case "ViewSource:ContextMenuOpening":
         this.onContextMenuOpening(data.isLink, data.isEmail, data.href);
-        if (gBrowser.isRemoteBrowser) {
+        if (this.browser.isRemoteBrowser) {
           this.openContextMenu(data.screenX, data.screenY);
         }
         break;
@@ -188,35 +194,35 @@
    * has history enabled on it.
    */
   get historyEnabled() {
-    return !gBrowser.hasAttribute("disablehistory");
+    return !this.browser.hasAttribute("disablehistory");
   },
 
   /**
-   * Getter for the message manager of the view source browser.
+   * Getter for the message manager used to communicate with the view source
+   * browser.
+   *
+   * In this window version of view source, we use the window message manager
+   * for loading scripts and listening for messages so that if we switch
+   * remoteness of the browser (which we might do if we're attempting to load
+   * the document source out of the network cache), we automatically re-load
+   * the frame script.
    */
   get mm() {
-    return gBrowser.messageManager;
-  },
-
-  /**
-   * Getter for the nsIWebNavigation of the view source browser.
-   */
-  get webNav() {
-    return gBrowser.webNavigation;
+    return window.messageManager;
   },
 
   /**
    * Send the browser forward in its history.
    */
   goForward() {
-    gBrowser.goForward();
+    this.browser.goForward();
   },
 
   /**
    * Send the browser backward in its history.
    */
   goBack() {
-    gBrowser.goBack();
+    this.browser.goBack();
   },
 
   /**
@@ -267,8 +273,8 @@
     gContextMenu.addEventListener("popupshowing", this);
     gContextMenu.addEventListener("popuphidden", this);
 
-    Services.els.addSystemEventListener(gBrowser, "dragover", this, true);
-    Services.els.addSystemEventListener(gBrowser, "drop", this, true);
+    Services.els.addSystemEventListener(this.browser, "dragover", this, true);
+    Services.els.addSystemEventListener(this.browser, "drop", this, true);
 
     if (!this.historyEnabled) {
       // Disable the BACK and FORWARD commands and hide the related menu items.
@@ -279,12 +285,6 @@
       }
     }
 
-    // This will only work with non-remote browsers. See bug 1158377.
-    gBrowser.droppedLinkHandler = function (event, url, name) {
-      ViewSourceChrome.loadURL(url);
-      event.preventDefault();
-    };
-
     // We require the first argument to do any loading of source.
     // otherwise, we're done.
     if (!window.arguments[0]) {
@@ -293,42 +293,23 @@
 
     if (typeof window.arguments[0] == "string") {
       // We're using the deprecated API
-      return ViewSourceChrome._loadViewSourceDeprecated();
+      return this._loadViewSourceDeprecated(window.arguments);
     }
 
     // We're using the modern API, which allows us to view the
     // source of documents from out of process browsers.
     let args = window.arguments[0];
-
-    if (!args.URL) {
-      throw new Error("Must supply a URL when opening view source.");
-    }
-
-    if (args.browser) {
-      // If we're dealing with a remote browser, then the browser
-      // for view source needs to be remote as well.
-      this.updateBrowserRemoteness(args.browser.isRemoteBrowser);
-    } else {
-      if (args.outerWindowID) {
-        throw new Error("Must supply the browser if passing the outerWindowID");
-      }
-    }
-
-    this.mm.sendAsyncMessage("ViewSource:LoadSource", {
-      URL: args.URL,
-      outerWindowID: args.outerWindowID,
-      lineNumber: args.lineNumber,
-    });
+    this.loadViewSource(args);
   },
 
   /**
    * This is the deprecated API for viewSource.xul, for old-timer consumers.
    * This API might eventually go away.
    */
-  _loadViewSourceDeprecated() {
+  _loadViewSourceDeprecated(aArguments) {
     Deprecated.warning("The arguments you're passing to viewSource.xul " +
                        "are using an out-of-date API.",
-                       "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/ViewSource");
+                       "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/View_Source_for_XUL_Applications");
     // Parse the 'arguments' supplied with the dialog.
     //    arg[0] - URL string.
     //    arg[1] - Charset value in the form 'charset=xxx'.
@@ -336,34 +317,34 @@
     //    arg[3] - Line number to go to.
     //    arg[4] - Whether charset was forced by the user
 
-    if (window.arguments[3] == "selection" ||
-        window.arguments[3] == "mathml") {
+    if (aArguments[3] == "selection" ||
+        aArguments[3] == "mathml") {
       // viewPartialSource.js will take care of loading the content.
       return;
     }
 
-    if (window.arguments[2]) {
-      let pageDescriptor = window.arguments[2];
+    if (aArguments[2]) {
+      let pageDescriptor = aArguments[2];
       if (Cu.isCrossProcessWrapper(pageDescriptor)) {
         throw new Error("Cannot pass a CPOW as the page descriptor to viewSource.xul.");
       }
     }
 
-    if (gBrowser.isRemoteBrowser) {
+    if (this.browser.isRemoteBrowser) {
       throw new Error("Deprecated view source API should not use a remote browser.");
     }
 
     let forcedCharSet;
-    if (window.arguments[4] && window.arguments[1].startsWith("charset=")) {
-      forcedCharSet = window.arguments[1].split("=")[1];
+    if (aArguments[4] && aArguments[1].startsWith("charset=")) {
+      forcedCharSet = aArguments[1].split("=")[1];
     }
 
-    gBrowser.messageManager.sendAsyncMessage("ViewSource:LoadSourceDeprecated", {
-      URL: window.arguments[0],
-      lineNumber: window.arguments[3],
+    this.sendAsyncMessage("ViewSource:LoadSourceDeprecated", {
+      URL: aArguments[0],
+      lineNumber: aArguments[3],
       forcedCharSet,
     }, {
-      pageDescriptor: window.arguments[2],
+      pageDescriptor: aArguments[2],
     });
   },
 
@@ -420,7 +401,7 @@
       this.updateCommands();
     }
 
-    gBrowser.focus();
+    this.browser.focus();
   },
 
   /**
@@ -446,13 +427,14 @@
 
       // If we don't have history enabled, we have to do a reload in order to
       // show the character set change. See bug 136322.
-      this.mm.sendAsyncMessage("ViewSource:SetCharacterSet", {
+      this.sendAsyncMessage("ViewSource:SetCharacterSet", {
         charset: charset,
         doPageLoad: this.historyEnabled,
       });
 
-      if (this.historyEnabled) {
-        gBrowser.reloadWithFlags(Ci.nsIWebNavigation.LOAD_FLAGS_CHARSET_CHANGE);
+      if (!this.historyEnabled) {
+        this.browser
+            .reloadWithFlags(Ci.nsIWebNavigation.LOAD_FLAGS_CHARSET_CHANGE);
       }
     }
   },
@@ -498,7 +480,7 @@
 
     let clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"]
                       .getService(Ci.nsIClipboardHelper);
-    clipboard.copyString(this.contextMenuData.href, document);
+    clipboard.copyString(this.contextMenuData.href);
   },
 
   /**
@@ -583,7 +565,7 @@
    *        A URL string to be opened in the view source browser.
    */
   loadURL(URL) {
-    this.mm.sendAsyncMessage("ViewSource:LoadSource", { URL });
+    this.sendAsyncMessage("ViewSource:LoadSource", { URL });
   },
 
   /**
@@ -619,47 +601,6 @@
   },
 
   /**
-   * Opens the "Go to line" prompt for a user to hop to a particular line
-   * of the source code they're viewing. This will keep prompting until the
-   * user either cancels out of the prompt, or enters a valid line number.
-   */
-  promptAndGoToLine() {
-    let input = { value: this.lastLineFound };
-
-    let ok = Services.prompt.prompt(
-        window,
-        gViewSourceBundle.getString("goToLineTitle"),
-        gViewSourceBundle.getString("goToLineText"),
-        input,
-        null,
-        {value:0});
-
-    if (!ok)
-      return;
-
-    let line = parseInt(input.value, 10);
-
-    if (!(line > 0)) {
-      Services.prompt.alert(window,
-                            gViewSourceBundle.getString("invalidInputTitle"),
-                            gViewSourceBundle.getString("invalidInputText"));
-      this.promptAndGoToLine();
-    } else {
-      this.goToLine(line);
-    }
-  },
-
-  /**
-   * Go to a particular line of the source code. This act is asynchronous.
-   *
-   * @param lineNumber
-   *        The line number to try to go to to.
-   */
-  goToLine(lineNumber) {
-    this.mm.sendAsyncMessage("ViewSource:GoToLine", { lineNumber });
-  },
-
-  /**
    * Called when the frame script reports that a line was successfully gotten
    * to.
    *
@@ -667,31 +608,17 @@
    *        The line number that we successfully got to.
    */
   onGoToLineSuccess(lineNumber) {
-    // We'll pre-populate the "Go to line" prompt with this value the next
-    // time it comes up.
-    this.lastLineFound = lineNumber;
+    ViewSourceBrowser.prototype.onGoToLineSuccess.call(this, lineNumber);
     document.getElementById("statusbar-line-col").label =
       gViewSourceBundle.getFormattedString("statusBarLineCol", [lineNumber, 1]);
   },
 
   /**
-   * Called when the frame script reports that we failed to go to a particular
-   * line. This informs the user that their selection was likely out of range,
-   * and then reprompts the user to try again.
-   */
-  onGoToLineFailed() {
-    Services.prompt.alert(window,
-                          gViewSourceBundle.getString("outOfRangeTitle"),
-                          gViewSourceBundle.getString("outOfRangeText"));
-    this.promptAndGoToLine();
-  },
-
-  /**
    * Reloads the browser, bypassing the network cache.
    */
   reload() {
-    gBrowser.reloadWithFlags(Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_PROXY |
-                             Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE);
+    this.browser.reloadWithFlags(Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_PROXY |
+                                 Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE);
   },
 
   /**
@@ -710,7 +637,7 @@
     this.shouldWrap = !this.shouldWrap;
     Services.prefs.setBoolPref("view_source.wrap_long_lines",
                                this.shouldWrap);
-    this.mm.sendAsyncMessage("ViewSource:ToggleWrapping");
+    this.sendAsyncMessage("ViewSource:ToggleWrapping");
   },
 
   /**
@@ -721,11 +648,10 @@
   toggleSyntaxHighlighting() {
     this.shouldHighlight = !this.shouldHighlight;
     // We can't flip this value in the child, since prefs are read-only there.
-    // We flip it here, and then cause a reload in the child to make the change
-    // occur.
+    // We flip it here, and then toggle a class in the child.
     Services.prefs.setBoolPref("view_source.syntax_highlight",
                                this.shouldHighlight);
-    this.mm.sendAsyncMessage("ViewSource:ToggleSyntaxHighlighting");
+    this.sendAsyncMessage("ViewSource:ToggleSyntaxHighlighting");
   },
 
   /**
@@ -739,22 +665,22 @@
    *        nothing.
    */
   updateBrowserRemoteness(shouldBeRemote) {
-    if (gBrowser.isRemoteBrowser == shouldBeRemote) {
+    if (this.browser.isRemoteBrowser == shouldBeRemote) {
       return;
     }
 
-    let parentNode = gBrowser.parentNode;
-    let nextSibling = gBrowser.nextSibling;
+    let parentNode = this.browser.parentNode;
+    let nextSibling = this.browser.nextSibling;
 
-    gBrowser.remove();
+    this.browser.remove();
     if (shouldBeRemote) {
-      gBrowser.setAttribute("remote", "true");
+      this.browser.setAttribute("remote", "true");
     } else {
-      gBrowser.removeAttribute("remote");
+      this.browser.removeAttribute("remote");
     }
     // If nextSibling was null, this will put the browser at
     // the end of the list.
-    parentNode.insertBefore(gBrowser, nextSibling);
+    parentNode.insertBefore(this.browser, nextSibling);
 
     if (shouldBeRemote) {
       // We're going to send a message down to the remote browser
@@ -764,14 +690,14 @@
       // RemoteWebProgress, which is lazily loaded. We only need
       // contentWindowAsCPOW for the printing support, and this
       // should go away once bug 1146454 is fixed, since we can
-      // then just pass the outerWindowID of the gBrowser to
+      // then just pass the outerWindowID of the this.browser to
       // PrintUtils.
-      gBrowser.webProgress;
+      this.browser.webProgress;
     }
   },
 };
 
-ViewSourceChrome.init();
+let viewSourceChrome = new ViewSourceChrome();
 
 /**
  * PrintUtils uses this to make Print Preview work.
@@ -820,7 +746,7 @@
 }
 
 this.__defineGetter__("gPageLoader", function () {
-  var webnav = ViewSourceChrome.webNav;
+  var webnav = viewSourceChrome.webNav;
   if (!webnav)
     return null;
   delete this.gPageLoader;
@@ -843,48 +769,48 @@
 
 this.__defineGetter__("gLastLineFound", function () {
   Deprecated.warning("gLastLineFound is deprecated - please use " +
-                     "ViewSourceChrome.lastLineFound instead.",
-                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/ViewSource");
-  return ViewSourceChrome.lastLineFound;
+                     "viewSourceChrome.lastLineFound instead.",
+                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/View_Source_for_XUL_Applications");
+  return viewSourceChrome.lastLineFound;
 });
 
 function onLoadViewSource() {
   Deprecated.warning("onLoadViewSource() is deprecated - please use " +
-                     "ViewSourceChrome.onXULLoaded() instead.",
-                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/ViewSource");
-  ViewSourceChrome.onXULLoaded();
+                     "viewSourceChrome.onXULLoaded() instead.",
+                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/View_Source_for_XUL_Applications");
+  viewSourceChrome.onXULLoaded();
 }
 
 function isHistoryEnabled() {
   Deprecated.warning("isHistoryEnabled() is deprecated - please use " +
-                     "ViewSourceChrome.historyEnabled instead.",
-                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/ViewSource");
-  return ViewSourceChrome.historyEnabled;
+                     "viewSourceChrome.historyEnabled instead.",
+                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/View_Source_for_XUL_Applications");
+  return viewSourceChrome.historyEnabled;
 }
 
 function ViewSourceClose() {
   Deprecated.warning("ViewSourceClose() is deprecated - please use " +
-                     "ViewSourceChrome.close() instead.",
-                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/ViewSource");
-  ViewSourceChrome.close();
+                     "viewSourceChrome.close() instead.",
+                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/View_Source_for_XUL_Applications");
+  viewSourceChrome.close();
 }
 
 function ViewSourceReload() {
   Deprecated.warning("ViewSourceReload() is deprecated - please use " +
-                     "ViewSourceChrome.reload() instead.",
-                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/ViewSource");
-  ViewSourceChrome.reload();
+                     "viewSourceChrome.reload() instead.",
+                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/View_Source_for_XUL_Applications");
+  viewSourceChrome.reload();
 }
 
 function getWebNavigation()
 {
   Deprecated.warning("getWebNavigation() is deprecated - please use " +
-                     "ViewSourceChrome.webNav instead.",
-                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/ViewSource");
+                     "viewSourceChrome.webNav instead.",
+                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/View_Source_for_XUL_Applications");
   // The original implementation returned null if anything threw during
   // the getting of the webNavigation.
   try {
-    return ViewSourceChrome.webNav;
+    return viewSourceChrome.webNav;
   } catch (e) {
     return null;
   }
@@ -892,44 +818,44 @@
 
 function viewSource(url) {
   Deprecated.warning("viewSource() is deprecated - please use " +
-                     "ViewSourceChrome.loadURL() instead.",
-                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/ViewSource");
-  ViewSourceChrome.loadURL(url);
+                     "viewSourceChrome.loadURL() instead.",
+                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/View_Source_for_XUL_Applications");
+  viewSourceChrome.loadURL(url);
 }
 
 function ViewSourceGoToLine()
 {
   Deprecated.warning("ViewSourceGoToLine() is deprecated - please use " +
-                     "ViewSourceChrome.promptAndGoToLine() instead.",
-                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/ViewSource");
-  ViewSourceChrome.promptAndGoToLine();
+                     "viewSourceChrome.promptAndGoToLine() instead.",
+                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/View_Source_for_XUL_Applications");
+  viewSourceChrome.promptAndGoToLine();
 }
 
 function goToLine(line)
 {
   Deprecated.warning("goToLine() is deprecated - please use " +
-                     "ViewSourceChrome.goToLine() instead.",
-                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/ViewSource");
-  ViewSourceChrome.goToLine(line);
+                     "viewSourceChrome.goToLine() instead.",
+                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/View_Source_for_XUL_Applications");
+  viewSourceChrome.goToLine(line);
 }
 
 function BrowserForward(aEvent) {
   Deprecated.warning("BrowserForward() is deprecated - please use " +
-                     "ViewSourceChrome.goForward() instead.",
-                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/ViewSource");
-  ViewSourceChrome.goForward();
+                     "viewSourceChrome.goForward() instead.",
+                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/View_Source_for_XUL_Applications");
+  viewSourceChrome.goForward();
 }
 
 function BrowserBack(aEvent) {
   Deprecated.warning("BrowserBack() is deprecated - please use " +
-                     "ViewSourceChrome.goBack() instead.",
-                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/ViewSource");
-  ViewSourceChrome.goBack();
+                     "viewSourceChrome.goBack() instead.",
+                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/View_Source_for_XUL_Applications");
+  viewSourceChrome.goBack();
 }
 
 function UpdateBackForwardCommands() {
   Deprecated.warning("UpdateBackForwardCommands() is deprecated - please use " +
-                     "ViewSourceChrome.updateCommands() instead.",
-                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/ViewSource");
-  ViewSourceChrome.updateCommands();
+                     "viewSourceChrome.updateCommands() instead.",
+                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/View_Source_for_XUL_Applications");
+  viewSourceChrome.updateCommands();
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/viewsource/content/viewSourceUtils.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/viewsource/content/viewSourceUtils.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/viewsource/content/viewSourceUtils.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/viewsource/content/viewSourceUtils.js	2015-05-25 20:43:47.000000000 +0000
@@ -5,13 +5,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
- * To keep the global namespace safe, don't define global variables and 
+ * To keep the global namespace safe, don't define global variables and
  * functions in this file.
  *
  * This file silently depends on contentAreaUtils.js for
  * getDefaultFileName, getNormalizedLeafName and getDefaultExtension
  */
 
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "ViewSourceBrowser",
+  "resource://gre/modules/ViewSourceBrowser.jsm");
+
 var gViewSourceUtils = {
 
   mnsIWebBrowserPersist: Components.interfaces.nsIWebBrowserPersist,
@@ -60,6 +64,72 @@
     }
   },
 
+  /**
+   * Displays view source in the provided <browser>.  This allows for non-window
+   * display methods, such as a tab from Firefox.  The caller that manages
+   * the <browser> is responsible for ensuring the companion frame script,
+   * viewSource-content.js, has been loaded for the <browser>.
+   *
+   * @param aArgs
+   *        An object with the following properties:
+   *
+   *        URL (required):
+   *          A string URL for the page we'd like to view the source of.
+   *        viewSourceBrowser (required):
+   *          The browser to display the view source in.
+   *        browser (optional):
+   *          The browser containing the document that we would like to view the
+   *          source of. This is required if outerWindowID is passed.
+   *        outerWindowID (optional):
+   *          The outerWindowID of the content window containing the document that
+   *          we want to view the source of. Pass this if you want to attempt to
+   *          load the document source out of the network cache.
+   *        lineNumber (optional):
+   *          The line number to focus on once the source is loaded.
+   */
+  viewSourceInBrowser: function(aArgs) {
+    let viewSourceBrowser = new ViewSourceBrowser(aArgs.viewSourceBrowser);
+    viewSourceBrowser.loadViewSource(aArgs);
+  },
+
+  /**
+   * Displays view source for a selection from some document in the provided
+   * <browser>.  This allows for non-window display methods, such as a tab from
+   * Firefox.  The caller that manages the <browser> is responsible for ensuring
+   * the companion frame script, viewSource-content.js, has been loaded for the
+   * <browser>.
+   *
+   * @param aSelection
+   *        A Selection object for the content of interest.
+   * @param aViewSourceInBrowser
+   *        The browser to display the view source in.
+   */
+  viewSourceFromSelectionInBrowser: function(aSelection, aViewSourceInBrowser) {
+    let viewSourceBrowser = new ViewSourceBrowser(aViewSourceInBrowser);
+    viewSourceBrowser.loadViewSourceFromSelection(aSelection);
+  },
+
+  /**
+   * Displays view source for a MathML fragment from some document in the
+   * provided <browser>.  This allows for non-window display methods,  such as a
+   * tab from Firefox.  The caller that manages the <browser> is responsible for
+   * ensuring the companion frame script, viewSource-content.js, has been loaded
+   * for the <browser>.
+   *
+   * @param aNode
+   *        Some element within the fragment of interest.
+   * @param aContext
+   *        A string denoting the type of fragment.  Currently, "mathml" is the
+   *        only accepted value.
+   * @param aViewSourceInBrowser
+   *        The browser to display the view source in.
+   */
+  viewSourceFromFragmentInBrowser: function(aNode, aContext,
+                                            aViewSourceInBrowser) {
+    let viewSourceBrowser = new ViewSourceBrowser(aViewSourceInBrowser);
+    viewSourceBrowser.loadViewSourceFromFragment(aNode, aContext);
+  },
+
   // Opens the interval view source viewer
   _openInInternalViewer: function(aArgsOrURL, aPageDescriptor, aDocument, aLineNumber)
   {
@@ -114,7 +184,7 @@
                 lineNumber: aLineNumber};
 
     try {
-      var editor = this.getExternalViewSourceEditor();    
+      var editor = this.getExternalViewSourceEditor();
       if (!editor) {
         this.handleCallBack(aCallBack, false, data);
         return;
@@ -129,7 +199,7 @@
 
       var path;
       var contentType = aDocument ? aDocument.contentType : null;
-      if (uri.scheme == "file") {    
+      if (uri.scheme == "file") {
         // it's a local file; we can open it directly
         path = uri.QueryInterface(Components.interfaces.nsIFileURL).file.path;
 
@@ -140,7 +210,7 @@
         // set up the progress listener with what we know so far
         this.viewSourceProgressListener.editor = editor;
         this.viewSourceProgressListener.callBack = aCallBack;
-        this.viewSourceProgressListener.data = data;      
+        this.viewSourceProgressListener.data = data;
         if (!aPageDescriptor) {
           // without a page descriptor, loadPage has no chance of working. download the file.
           var file = this.getTemporaryFile(uri, aDocument, contentType);
@@ -189,7 +259,7 @@
           var progress = webShell.QueryInterface(this.mnsIWebProgress);
           progress.addProgressListener(this.viewSourceProgressListener,
                                        this.mnsIWebProgress.NOTIFY_STATE_DOCUMENT);
-          var pageLoader = webShell.QueryInterface(this.mnsIWebPageDescriptor);    
+          var pageLoader = webShell.QueryInterface(this.mnsIWebPageDescriptor);
           pageLoader.loadPage(aPageDescriptor, this.mnsIWebPageDescriptor.DISPLAY_AS_SOURCE);
         }
       }
@@ -205,7 +275,7 @@
   internalViewerFallback: function(result, data)
   {
     if (!result) {
-      this.openInInternalViewer(data.url, data.pageDescriptor, data.doc, data.lineNumber);
+      this._openInInternalViewer(data.url, data.pageDescriptor, data.doc, data.lineNumber);
     }
   },
 
@@ -296,7 +366,7 @@
 
           // get a temporary filename using the attributes from the data object that
           // openInExternalEditor gave us
-          this.file = gViewSourceUtils.getTemporaryFile(this.data.uri, this.data.doc, 
+          this.file = gViewSourceUtils.getTemporaryFile(this.data.uri, this.data.doc,
                                                         this.data.doc.contentType);
 
           // we have to convert from the source charset.
@@ -310,7 +380,7 @@
 
           // write the source to the file
           coStream.writeString(webNavigation.document.body.textContent);
-          
+
           // clean up
           coStream.close();
           foStream.close();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/viewsource/content/viewSource.xul firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/viewsource/content/viewSource.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/viewsource/content/viewSource.xul	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/viewsource/content/viewSource.xul	2015-05-25 20:43:47.000000000 +0000
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://global/content/viewSource.css" type="text/css"?>
 <?xml-stylesheet href="chrome://mozapps/skin/viewsource/viewsource.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
@@ -21,10 +21,10 @@
 <window id="viewSource"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         contenttitlesetting="true"
-        title="&mainWindow.title;" 
-        titlemodifier="&mainWindow.titlemodifier;" 
+        title="&mainWindow.title;"
+        titlemodifier="&mainWindow.titlemodifier;"
         titlepreface="&mainWindow.preface;"
-        titlemenuseparator ="&mainWindow.titlemodifierseparator;"  
+        titlemenuseparator ="&mainWindow.titlemodifierseparator;"
         windowtype="navigator:view-source"
         width="640" height="480"
         screenX="10" screenY="10"
@@ -35,7 +35,7 @@
   <script type="application/javascript" src="chrome://global/content/viewSource.js"/>
   <script type="application/javascript" src="chrome://global/content/viewZoomOverlay.js"/>
   <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
-  
+
   <stringbundle id="viewSourceBundle" src="chrome://global/locale/viewSource.properties"/>
 
   <command id="cmd_savePage" oncommand="ViewSourceSavePage();"/>
@@ -54,16 +54,16 @@
   <command id="cmd_findSelection"
            oncommand="document.getElementById('FindToolbar').onFindSelectionCommand();"/>
 #endif
-  <command id="cmd_reload" oncommand="ViewSourceChrome.reload();"/>
-  <command id="cmd_goToLine" oncommand="ViewSourceChrome.promptAndGoToLine();" disabled="true"/>
-  <command id="cmd_highlightSyntax" oncommand="ViewSourceChrome.toggleSyntaxHighlighting();"/>
-  <command id="cmd_wrapLongLines" oncommand="ViewSourceChrome.toggleWrapping();"/>
+  <command id="cmd_reload" oncommand="viewSourceChrome.reload();"/>
+  <command id="cmd_goToLine" oncommand="viewSourceChrome.promptAndGoToLine();" disabled="true"/>
+  <command id="cmd_highlightSyntax" oncommand="viewSourceChrome.toggleSyntaxHighlighting();"/>
+  <command id="cmd_wrapLongLines" oncommand="viewSourceChrome.toggleWrapping();"/>
   <command id="cmd_textZoomReduce" oncommand="ZoomManager.reduce();"/>
   <command id="cmd_textZoomEnlarge" oncommand="ZoomManager.enlarge();"/>
   <command id="cmd_textZoomReset" oncommand="ZoomManager.reset();"/>
 
-  <command id="Browser:Back" oncommand="ViewSourceChrome.goBack()" observes="viewSourceNavigation"/>
-  <command id="Browser:Forward" oncommand="ViewSourceChrome.goForward()" observes="viewSourceNavigation"/>
+  <command id="Browser:Back" oncommand="viewSourceChrome.goBack()" observes="viewSourceNavigation"/>
+  <command id="Browser:Forward" oncommand="viewSourceChrome.goForward()" observes="viewSourceNavigation"/>
 
   <broadcaster id="viewSourceNavigation"/>
 
@@ -110,7 +110,7 @@
 #endif
 
   </keyset>
-  
+
   <tooltip id="aHTMLTooltip" page="true"/>
 
   <menupopup id="viewSourceContextMenu">
@@ -131,16 +131,16 @@
     <menuitem id="context-copyLink"
               label="&copyLinkCmd.label;"
               accesskey="&copyLinkCmd.accesskey;"
-              oncommand="ViewSourceChrome.onContextMenuCopyLinkOrEmail();"/>
+              oncommand="viewSourceChrome.onContextMenuCopyLinkOrEmail();"/>
     <menuitem id="context-copyEmail"
               label="&copyEmailCmd.label;"
               accesskey="&copyEmailCmd.accesskey;"
-              oncommand="ViewSourceChrome.onContextMenuCopyLinkOrEmail();"/>
+              oncommand="viewSourceChrome.onContextMenuCopyLinkOrEmail();"/>
     <menuseparator/>
     <menuitem id="cMenu_selectAll"/>
   </menupopup>
 
-  <!-- Menu --> 
+  <!-- Menu -->
   <toolbox id="viewSource-toolbox">
     <menubar id="viewSource-main-menubar">
 
@@ -188,11 +188,11 @@
                     label="&reloadCmd.label;" key="key_reload"/>
           <menuseparator />
           <menu id="viewTextZoomMenu" label="&menu_textSize.label;" accesskey="&menu_textSize.accesskey;">
-            <menupopup>                    
-              <menuitem id="menu_textEnlarge" command="cmd_textZoomEnlarge" 
+            <menupopup>
+              <menuitem id="menu_textEnlarge" command="cmd_textZoomEnlarge"
                         label="&menu_textEnlarge.label;" accesskey="&menu_textEnlarge.accesskey;"
                         key="key_textZoomEnlarge"/>
-              <menuitem id="menu_textReduce" command="cmd_textZoomReduce" 
+              <menuitem id="menu_textReduce" command="cmd_textZoomReduce"
                         label="&menu_textReduce.label;" accesskey="&menu_textReduce.accesskey;"
                         key="key_textZoomReduce"/>
               <menuseparator/>
@@ -206,7 +206,7 @@
           <menu id="charsetMenu"
                 label="&charsetMenu2.label;"
                 accesskey="&charsetMenu2.accesskey;"
-                oncommand="ViewSourceChrome.onSetCharacterSet(event);"
+                oncommand="viewSourceChrome.onSetCharacterSet(event);"
                 onpopupshowing="CharsetMenu.build(event.target);"
                 onpopupshown="CharsetMenu.update(event.target, content.document.characterSet);">
             <menupopup/>
@@ -218,7 +218,7 @@
                     label="&menu_highlightSyntax.label;" accesskey="&menu_highlightSyntax.accesskey;"/>
         </menupopup>
       </menu>
-    </menubar>  
+    </menubar>
   </toolbox>
 
   <vbox id="appcontent" flex="1">
@@ -226,7 +226,7 @@
     <browser id="content" type="content-primary" name="content" src="about:blank" flex="1"
              context="viewSourceContextMenu" showcaret="true" tooltip="aHTMLTooltip" />
     <findbar id="FindToolbar" browserid="content"/>
-  </vbox> 
+  </vbox>
 
   <statusbar id="status-bar" class="chromeclass-status">
     <statusbarpanel id="statusbar-line-col" label="" flex="1"/>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/viewsource/jar.mn firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/viewsource/jar.mn
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/viewsource/jar.mn	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/viewsource/jar.mn	2015-05-25 20:43:47.000000000 +0000
@@ -9,4 +9,4 @@
   content/global/viewPartialSource.js       (content/viewPartialSource.js)
 * content/global/viewPartialSource.xul      (content/viewPartialSource.xul)
   content/global/viewSourceUtils.js         (content/viewSourceUtils.js)
-  content/global/viewSource-content.js      (content/viewSource-content.js)
\ No newline at end of file
+  content/global/viewSource-content.js      (content/viewSource-content.js)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/viewsource/moz.build firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/viewsource/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/viewsource/moz.build	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/viewsource/moz.build	2015-05-25 20:43:47.000000000 +0000
@@ -9,5 +9,9 @@
 
 JAR_MANIFESTS += ['jar.mn']
 
+EXTRA_JS_MODULES += [
+    'ViewSourceBrowser.jsm',
+]
+
 with Files('**'):
     BUG_COMPONENT = ('Toolkit', 'View Source')
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/viewsource/test/browser/browser_gotoline.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/viewsource/test/browser/browser_gotoline.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/viewsource/test/browser/browser_gotoline.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/viewsource/test/browser/browser_gotoline.js	2015-05-25 20:43:47.000000000 +0000
@@ -24,7 +24,7 @@
   is(statusPanel.getAttribute("label"), "", "Correct status bar text");
 
   for (let i = 1; i <= 3; i++) {
-    aWindow.ViewSourceChrome.goToLine(i);
+    aWindow.viewSourceChrome.goToLine(i);
     let result = yield ContentTask.spawn(aWindow.gBrowser, i, function*(i) {
       let selection = content.getSelection();
       return (selection.toString() == "line " + i);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/viewsource/test/browser/browser_viewsourceprefs.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/viewsource/test/browser/browser_viewsourceprefs.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/viewsource/test/browser/browser_viewsourceprefs.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/viewsource/test/browser/browser_viewsourceprefs.js	2015-05-25 20:43:47.000000000 +0000
@@ -53,21 +53,14 @@
   yield checkStyle(win, "white-space", "pre");
 
   // Check that the Syntax Highlighting menu item works.
-  let pageShowPromise = BrowserTestUtils.waitForEvent(win.gBrowser, "pageshow");
   simulateClick(syntaxMenuItem);
-  yield pageShowPromise;
-
   is(syntaxMenuItem.hasAttribute("checked"), false, "Syntax menu item unchecked");
   is(SpecialPowers.getBoolPref("view_source.syntax_highlight"), false, "Syntax highlighting pref set");
   yield checkHighlight(win, false);
 
-  pageShowPromise = BrowserTestUtils.waitForEvent(win.gBrowser, "pageshow");
   simulateClick(syntaxMenuItem);
-  yield pageShowPromise;
-
   is(syntaxMenuItem.hasAttribute("checked"), true, "Syntax menu item checked");
   is(SpecialPowers.getBoolPref("view_source.syntax_highlight"), true, "Syntax highlighting pref set");
-
   yield checkHighlight(win, highlightable);
   yield BrowserTestUtils.closeWindow(win);
 
@@ -127,7 +120,8 @@
   let highlighted = yield ContentTask.spawn(browser, {}, function* () {
     let spans = content.document.getElementsByTagName("span");
     return Array.some(spans, (span) => {
-      return span.className != "";
+      let style = content.getComputedStyle(span, null);
+      return style.getPropertyValue("color") !== "rgb(0, 0, 0)";
     });
   });
   is(highlighted, expected, "Syntax highlighting " + (expected ? "on" : "off"));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/viewsource/ViewSourceBrowser.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/viewsource/ViewSourceBrowser.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/components/viewsource/ViewSourceBrowser.jsm	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/components/viewsource/ViewSourceBrowser.jsm	2015-05-25 20:43:47.000000000 +0000
@@ -0,0 +1,627 @@
+// -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const { utils: Cu, interfaces: Ci, classes: Cc } = Components;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "Services",
+  "resource://gre/modules/Services.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Deprecated",
+  "resource://gre/modules/Deprecated.jsm");
+
+const NS_XHTML = "http://www.w3.org/1999/xhtml";
+const VIEW_SOURCE_CSS = "resource://gre-resources/viewsource.css";
+const BUNDLE_URL = "chrome://global/locale/viewSource.properties";
+
+// These are markers used to delimit the selection during processing. They
+// are removed from the final rendering.
+// We use noncharacter Unicode codepoints to minimize the risk of clashing
+// with anything that might legitimately be present in the document.
+// U+FDD0..FDEF <noncharacters>
+const MARK_SELECTION_START = "\uFDD0";
+const MARK_SELECTION_END = "\uFDEF";
+
+this.EXPORTED_SYMBOLS = ["ViewSourceBrowser"];
+
+/**
+ * ViewSourceBrowser manages the view source <browser> from the chrome side.
+ * It's companion frame script, viewSource-content.js, needs to be loaded as a
+ * frame script into the browser being managed.
+ *
+ * For a view source window using viewSource.xul, the script viewSource.js in
+ * the window extends an instance of this with more window specific functions.
+ * The page script takes care of loading the companion frame script.
+ *
+ * For a view source tab (or some other non-window case), an instance of this is
+ * created by viewSourceUtils.js to wrap the <browser>.  The caller that manages
+ * the <browser> is responsible for ensuring the companion frame script has been
+ * loaded.
+ */
+this.ViewSourceBrowser = function ViewSourceBrowser(aBrowser) {
+  this._browser = aBrowser;
+  this.init();
+}
+
+ViewSourceBrowser.prototype = {
+  /**
+   * The <browser> that will be displaying the view source content.
+   */
+  get browser() {
+    return this._browser;
+  },
+
+  /**
+   * Holds the value of the last line found via the "Go to line"
+   * command, to pre-populate the prompt the next time it is
+   * opened.
+   */
+  lastLineFound: null,
+
+  /**
+   * These are the messages that ViewSourceBrowser will listen for
+   * from the frame script it injects. Any message names added here
+   * will automatically have ViewSourceBrowser listen for those messages,
+   * and remove the listeners on teardown.
+   */
+  messages: [
+    "ViewSource:PromptAndGoToLine",
+    "ViewSource:GoToLine:Success",
+    "ViewSource:GoToLine:Failed",
+  ],
+
+  /**
+   * This should be called as soon as the script loads. When this function
+   * executes, we can assume the DOM content has not yet loaded.
+   */
+  init() {
+    this.messages.forEach((msgName) => {
+      this.mm.addMessageListener(msgName, this);
+    });
+  },
+
+  /**
+   * This should be called when the window is closing. This function should
+   * clean up event and message listeners.
+   */
+  uninit() {
+    this.messages.forEach((msgName) => {
+      this.mm.removeMessageListener(msgName, this);
+    });
+  },
+
+  /**
+   * Anything added to the messages array will get handled here, and should
+   * get dispatched to a specific function for the message name.
+   */
+  receiveMessage(message) {
+    let data = message.data;
+
+    switch(message.name) {
+      case "ViewSource:PromptAndGoToLine":
+        this.promptAndGoToLine();
+        break;
+      case "ViewSource:GoToLine:Success":
+        this.onGoToLineSuccess(data.lineNumber);
+        break;
+      case "ViewSource:GoToLine:Failed":
+        this.onGoToLineFailed();
+        break;
+    }
+  },
+
+  /**
+   * Getter for the message manager of the view source browser.
+   */
+  get mm() {
+    return this.browser.messageManager;
+  },
+
+  /**
+   * Send a message to the view source browser.
+   */
+  sendAsyncMessage(...args) {
+    this.browser.messageManager.sendAsyncMessage(...args);
+  },
+
+  /**
+   * Getter for the nsIWebNavigation of the view source browser.
+   */
+  get webNav() {
+    return this.browser.webNavigation;
+  },
+
+  /**
+   * Getter for whether long lines should be wrapped.
+   */
+  get wrapLongLines() {
+    return Services.prefs.getBoolPref("view_source.wrap_long_lines");
+  },
+
+  /**
+   * A getter for the view source string bundle.
+   */
+  get bundle() {
+    if (this._bundle) {
+      return this._bundle;
+    }
+    return this._bundle = Services.strings.createBundle(BUNDLE_URL);
+  },
+
+  /**
+   * Loads the source for a URL while applying some optional features if
+   * enabled.
+   *
+   * For the viewSource.xul window, this is called by onXULLoaded above.
+   * For view source in a specific browser, this is manually called after
+   * this object is constructed.
+   *
+   * This takes a single object argument containing:
+   *
+   *   URL (required):
+   *     A string URL for the page we'd like to view the source of.
+   *   browser:
+   *     The browser containing the document that we would like to view the
+   *     source of. This argument is optional if outerWindowID is not passed.
+   *   outerWindowID (optional):
+   *     The outerWindowID of the content window containing the document that
+   *     we want to view the source of. This is the only way of attempting to
+   *     load the source out of the network cache.
+   *   lineNumber (optional):
+   *     The line number to focus on once the source is loaded.
+   */
+  loadViewSource({ URL, browser, outerWindowID, lineNumber }) {
+    if (!URL) {
+      throw new Error("Must supply a URL when opening view source.");
+    }
+
+    if (browser) {
+      // If we're dealing with a remote browser, then the browser
+      // for view source needs to be remote as well.
+      this.updateBrowserRemoteness(browser.isRemoteBrowser);
+    } else {
+      if (outerWindowID) {
+        throw new Error("Must supply the browser if passing the outerWindowID");
+      }
+    }
+
+    this.sendAsyncMessage("ViewSource:LoadSource",
+                          { URL, outerWindowID, lineNumber });
+  },
+
+  /**
+   * Updates the "remote" attribute of the view source browser. This
+   * will remove the browser from the DOM, and then re-add it in the
+   * same place it was taken from.
+   *
+   * @param shouldBeRemote
+   *        True if the browser should be made remote. If the browsers
+   *        remoteness already matches this value, this function does
+   *        nothing.
+   */
+  updateBrowserRemoteness(shouldBeRemote) {
+    if (this.browser.isRemoteBrowser != shouldBeRemote) {
+      // In this base case, where we are handed a <browser> someone else is
+      // managing, we don't know for sure that it's safe to toggle remoteness.
+      // For view source in a window, this is overridden to actually do the
+      // flip if needed.
+      throw new Error("View source browser's remoteness mismatch");
+    }
+  },
+
+  /**
+   * Load the view source browser from a selection in some document.
+   *
+   * @param selection
+   *        A Selection object for the content of interest.
+   */
+  loadViewSourceFromSelection(selection) {
+    var range = selection.getRangeAt(0);
+    var ancestorContainer = range.commonAncestorContainer;
+    var doc = ancestorContainer.ownerDocument;
+
+    var startContainer = range.startContainer;
+    var endContainer = range.endContainer;
+    var startOffset = range.startOffset;
+    var endOffset = range.endOffset;
+
+    // let the ancestor be an element
+    var Node = doc.defaultView.Node;
+    if (ancestorContainer.nodeType == Node.TEXT_NODE ||
+        ancestorContainer.nodeType == Node.CDATA_SECTION_NODE)
+      ancestorContainer = ancestorContainer.parentNode;
+
+    // for selectAll, let's use the entire document, including <html>...</html>
+    // @see nsDocumentViewer::SelectAll() for how selectAll is implemented
+    try {
+      if (ancestorContainer == doc.body)
+        ancestorContainer = doc.documentElement;
+    } catch (e) { }
+
+    // each path is a "child sequence" (a.k.a. "tumbler") that
+    // descends from the ancestor down to the boundary point
+    var startPath = this._getPath(ancestorContainer, startContainer);
+    var endPath = this._getPath(ancestorContainer, endContainer);
+
+    // clone the fragment of interest and reset everything to be relative to it
+    // note: it is with the clone that we operate/munge from now on.  Also note
+    // that we clone into a data document to prevent images in the fragment from
+    // loading and the like.  The use of importNode here, as opposed to adoptNode,
+    // is _very_ important.
+    // XXXbz wish there were a less hacky way to create an untrusted document here
+    var isHTML = (doc.createElement("div").tagName == "DIV");
+    var dataDoc = isHTML ?
+      ancestorContainer.ownerDocument.implementation.createHTMLDocument("") :
+      ancestorContainer.ownerDocument.implementation.createDocument("", "", null);
+    ancestorContainer = dataDoc.importNode(ancestorContainer, true);
+    startContainer = ancestorContainer;
+    endContainer = ancestorContainer;
+
+    // Only bother with the selection if it can be remapped. Don't mess with
+    // leaf elements (such as <isindex>) that secretly use anynomous content
+    // for their display appearance.
+    var canDrawSelection = ancestorContainer.hasChildNodes();
+    var tmpNode;
+    if (canDrawSelection) {
+      var i;
+      for (i = startPath ? startPath.length-1 : -1; i >= 0; i--) {
+        startContainer = startContainer.childNodes.item(startPath[i]);
+      }
+      for (i = endPath ? endPath.length-1 : -1; i >= 0; i--) {
+        endContainer = endContainer.childNodes.item(endPath[i]);
+      }
+
+      // add special markers to record the extent of the selection
+      // note: |startOffset| and |endOffset| are interpreted either as
+      // offsets in the text data or as child indices (see the Range spec)
+      // (here, munging the end point first to keep the start point safe...)
+      if (endContainer.nodeType == Node.TEXT_NODE ||
+          endContainer.nodeType == Node.CDATA_SECTION_NODE) {
+        // do some extra tweaks to try to avoid the view-source output to look like
+        // ...<tag>]... or ...]</tag>... (where ']' marks the end of the selection).
+        // To get a neat output, the idea here is to remap the end point from:
+        // 1. ...<tag>]...   to   ...]<tag>...
+        // 2. ...]</tag>...  to   ...</tag>]...
+        if ((endOffset > 0 && endOffset < endContainer.data.length) ||
+            !endContainer.parentNode || !endContainer.parentNode.parentNode)
+          endContainer.insertData(endOffset, MARK_SELECTION_END);
+        else {
+          tmpNode = dataDoc.createTextNode(MARK_SELECTION_END);
+          endContainer = endContainer.parentNode;
+          if (endOffset === 0)
+            endContainer.parentNode.insertBefore(tmpNode, endContainer);
+          else
+            endContainer.parentNode.insertBefore(tmpNode, endContainer.nextSibling);
+        }
+      }
+      else {
+        tmpNode = dataDoc.createTextNode(MARK_SELECTION_END);
+        endContainer.insertBefore(tmpNode, endContainer.childNodes.item(endOffset));
+      }
+
+      if (startContainer.nodeType == Node.TEXT_NODE ||
+          startContainer.nodeType == Node.CDATA_SECTION_NODE) {
+        // do some extra tweaks to try to avoid the view-source output to look like
+        // ...<tag>[... or ...[</tag>... (where '[' marks the start of the selection).
+        // To get a neat output, the idea here is to remap the start point from:
+        // 1. ...<tag>[...   to   ...[<tag>...
+        // 2. ...[</tag>...  to   ...</tag>[...
+        if ((startOffset > 0 && startOffset < startContainer.data.length) ||
+            !startContainer.parentNode || !startContainer.parentNode.parentNode ||
+            startContainer != startContainer.parentNode.lastChild)
+          startContainer.insertData(startOffset, MARK_SELECTION_START);
+        else {
+          tmpNode = dataDoc.createTextNode(MARK_SELECTION_START);
+          startContainer = startContainer.parentNode;
+          if (startOffset === 0)
+            startContainer.parentNode.insertBefore(tmpNode, startContainer);
+          else
+            startContainer.parentNode.insertBefore(tmpNode, startContainer.nextSibling);
+        }
+      }
+      else {
+        tmpNode = dataDoc.createTextNode(MARK_SELECTION_START);
+        startContainer.insertBefore(tmpNode, startContainer.childNodes.item(startOffset));
+      }
+    }
+
+    // now extract and display the syntax highlighted source
+    tmpNode = dataDoc.createElementNS(NS_XHTML, "div");
+    tmpNode.appendChild(ancestorContainer);
+
+    // Tell content to draw a selection after the load below
+    if (canDrawSelection) {
+      this.sendAsyncMessage("ViewSource:ScheduleDrawSelection");
+    }
+
+    // all our content is held by the data:URI and URIs are internally stored as utf-8 (see nsIURI.idl)
+    var loadFlags = Components.interfaces.nsIWebNavigation.LOAD_FLAGS_NONE;
+    var referrerPolicy = Components.interfaces.nsIHttpChannel.REFERRER_POLICY_DEFAULT;
+    this.webNav.loadURIWithOptions((isHTML ?
+                                    "view-source:data:text/html;charset=utf-8," :
+                                    "view-source:data:application/xml;charset=utf-8,")
+                                   + encodeURIComponent(tmpNode.innerHTML),
+                                   loadFlags,
+                                   null, referrerPolicy,  // referrer
+                                   null, null,  // postData, headers
+                                   Services.io.newURI(doc.baseURI, null, null));
+  },
+
+  /**
+   * A helper to get a path like FIXptr, but with an array instead of the
+   * "tumbler" notation.
+   * See FIXptr: http://lists.w3.org/Archives/Public/www-xml-linking-comments/2001AprJun/att-0074/01-NOTE-FIXptr-20010425.htm
+   */
+  _getPath(ancestor, node) {
+    var n = node;
+    var p = n.parentNode;
+    if (n == ancestor || !p)
+      return null;
+    var path = new Array();
+    if (!path)
+      return null;
+    do {
+      for (var i = 0; i < p.childNodes.length; i++) {
+        if (p.childNodes.item(i) == n) {
+          path.push(i);
+          break;
+        }
+      }
+      n = p;
+      p = n.parentNode;
+    } while (n != ancestor && p);
+    return path;
+  },
+
+  /**
+   * Load the view source browser from a fragment of some document, as in
+   * markups such as MathML where reformatting the output is helpful.
+   *
+   * @param aNode
+   *        Some element within the fragment of interest.
+   * @param aContext
+   *        A string denoting the type of fragment.  Currently, "mathml" is the
+   *        only accepted value.
+   */
+  loadViewSourceFromFragment(node, context) {
+    var Node = node.ownerDocument.defaultView.Node;
+    this._lineCount = 0;
+    this._startTargetLine = 0;
+    this._endTargetLine = 0;
+    this._targetNode = node;
+    if (this._targetNode && this._targetNode.nodeType == Node.TEXT_NODE)
+      this._targetNode = this._targetNode.parentNode;
+
+    // walk up the tree to the top-level element (e.g., <math>, <svg>)
+    var topTag;
+    if (context == "mathml")
+      topTag = "math";
+    else
+      throw "not reached";
+    var topNode = this._targetNode;
+    while (topNode && topNode.localName != topTag)
+      topNode = topNode.parentNode;
+    if (!topNode)
+      return;
+
+    // serialize
+    var title = this.bundle.GetStringFromName("viewMathMLSourceTitle");
+    var wrapClass = this.wrapLongLines ? ' class="wrap"' : '';
+    var source =
+      '<!DOCTYPE html>'
+    + '<html>'
+    + '<head><title>' + title + '</title>'
+    + '<link rel="stylesheet" type="text/css" href="' + VIEW_SOURCE_CSS + '">'
+    + '<style type="text/css">'
+    + '#target { border: dashed 1px; background-color: lightyellow; }'
+    + '</style>'
+    + '</head>'
+    + '<body id="viewsource"' + wrapClass
+    +        ' onload="document.title=\''+title+'\'; document.getElementById(\'target\').scrollIntoView(true)">'
+    + '<pre>'
+    + this._getOuterMarkup(topNode, 0)
+    + '</pre></body></html>'
+    ; // end
+
+    // display
+    this.browser.loadURI("data:text/html;charset=utf-8," +
+                         encodeURIComponent(source));
+  },
+
+  _getInnerMarkup(node, indent) {
+    var str = '';
+    for (var i = 0; i < node.childNodes.length; i++) {
+      str += this._getOuterMarkup(node.childNodes.item(i), indent);
+    }
+    return str;
+  },
+
+  _getOuterMarkup(node, indent) {
+    var Node = node.ownerDocument.defaultView.Node;
+    var newline = "";
+    var padding = "";
+    var str = "";
+    if (node == this._targetNode) {
+      this._startTargetLine = this._lineCount;
+      str += '</pre><pre id="target">';
+    }
+
+    switch (node.nodeType) {
+    case Node.ELEMENT_NODE: // Element
+      // to avoid the wide gap problem, '\n' is not emitted on the first
+      // line and the lines before & after the <pre id="target">...</pre>
+      if (this._lineCount > 0 &&
+          this._lineCount != this._startTargetLine &&
+          this._lineCount != this._endTargetLine) {
+        newline = "\n";
+      }
+      this._lineCount++;
+      for (var k = 0; k < indent; k++) {
+        padding += " ";
+      }
+      str += newline + padding
+          +  '&lt;<span class="start-tag">' + node.nodeName + '</span>';
+      for (var i = 0; i < node.attributes.length; i++) {
+        var attr = node.attributes.item(i);
+        if (attr.nodeName.match(/^[-_]moz/)) {
+          continue;
+        }
+        str += ' <span class="attribute-name">'
+            +  attr.nodeName
+            +  '</span>=<span class="attribute-value">"'
+            +  this._unicodeToEntity(attr.nodeValue)
+            +  '"</span>';
+      }
+      if (!node.hasChildNodes()) {
+        str += "/&gt;";
+      }
+      else {
+        str += "&gt;";
+        var oldLine = this._lineCount;
+        str += this._getInnerMarkup(node, indent + 2);
+        if (oldLine == this._lineCount) {
+          newline = "";
+          padding = "";
+        }
+        else {
+          newline = (this._lineCount == this._endTargetLine) ? "" : "\n";
+          this._lineCount++;
+        }
+        str += newline + padding
+            +  '&lt;/<span class="end-tag">' + node.nodeName + '</span>&gt;';
+      }
+      break;
+    case Node.TEXT_NODE: // Text
+      var tmp = node.nodeValue;
+      tmp = tmp.replace(/(\n|\r|\t)+/g, " ");
+      tmp = tmp.replace(/^ +/, "");
+      tmp = tmp.replace(/ +$/, "");
+      if (tmp.length != 0) {
+        str += '<span class="text">' + this._unicodeToEntity(tmp) + '</span>';
+      }
+      break;
+    default:
+      break;
+    }
+
+    if (node == this._targetNode) {
+      this._endTargetLine = this._lineCount;
+      str += '</pre><pre>';
+    }
+    return str;
+  },
+
+  _unicodeToEntity(text) {
+    const charTable = {
+      '&': '&amp;<span class="entity">amp;</span>',
+      '<': '&amp;<span class="entity">lt;</span>',
+      '>': '&amp;<span class="entity">gt;</span>',
+      '"': '&amp;<span class="entity">quot;</span>'
+    };
+
+    function charTableLookup(letter) {
+      return charTable[letter];
+    }
+
+    function convertEntity(letter) {
+      try {
+        var unichar = this._entityConverter
+                          .ConvertToEntity(letter, entityVersion);
+        var entity = unichar.substring(1); // extract '&'
+        return '&amp;<span class="entity">' + entity + '</span>';
+      } catch (ex) {
+        return letter;
+      }
+    }
+
+    if (!this._entityConverter) {
+      try {
+        this._entityConverter = Cc["@mozilla.org/intl/entityconverter;1"]
+                                  .createInstance(Ci.nsIEntityConverter);
+      } catch(e) { }
+    }
+
+    const entityVersion = Ci.nsIEntityConverter.entityW3C;
+
+    var str = text;
+
+    // replace chars in our charTable
+    str = str.replace(/[<>&"]/g, charTableLookup);
+
+    // replace chars > 0x7f via nsIEntityConverter
+    str = str.replace(/[^\0-\u007f]/g, convertEntity);
+
+    return str;
+  },
+
+  /**
+   * Opens the "Go to line" prompt for a user to hop to a particular line
+   * of the source code they're viewing. This will keep prompting until the
+   * user either cancels out of the prompt, or enters a valid line number.
+   */
+  promptAndGoToLine() {
+    let input = { value: this.lastLineFound };
+    let window = Services.wm.getMostRecentWindow(null);
+
+    let ok = Services.prompt.prompt(
+        window,
+        this.bundle.GetStringFromName("goToLineTitle"),
+        this.bundle.GetStringFromName("goToLineText"),
+        input,
+        null,
+        {value:0});
+
+    if (!ok)
+      return;
+
+    let line = parseInt(input.value, 10);
+
+    if (!(line > 0)) {
+      Services.prompt.alert(window,
+                            this.bundle.GetStringFromName("invalidInputTitle"),
+                            this.bundle.GetStringFromName("invalidInputText"));
+      this.promptAndGoToLine();
+    } else {
+      this.goToLine(line);
+    }
+  },
+
+  /**
+   * Go to a particular line of the source code. This act is asynchronous.
+   *
+   * @param lineNumber
+   *        The line number to try to go to to.
+   */
+  goToLine(lineNumber) {
+    this.sendAsyncMessage("ViewSource:GoToLine", { lineNumber });
+  },
+
+  /**
+   * Called when the frame script reports that a line was successfully gotten
+   * to.
+   *
+   * @param lineNumber
+   *        The line number that we successfully got to.
+   */
+  onGoToLineSuccess(lineNumber) {
+    // We'll pre-populate the "Go to line" prompt with this value the next
+    // time it comes up.
+    this.lastLineFound = lineNumber;
+  },
+
+  /**
+   * Called when the frame script reports that we failed to go to a particular
+   * line. This informs the user that their selection was likely out of range,
+   * and then reprompts the user to try again.
+   */
+  onGoToLineFailed() {
+    let window = Services.wm.getMostRecentWindow(null);
+    Services.prompt.alert(window,
+                          this.bundle.GetStringFromName("outOfRangeTitle"),
+                          this.bundle.GetStringFromName("outOfRangeText"));
+    this.promptAndGoToLine();
+  },
+};
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/aboutSupport.xhtml firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/aboutSupport.xhtml
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/aboutSupport.xhtml	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/aboutSupport.xhtml	2015-05-25 20:43:47.000000000 +0000
@@ -18,6 +18,8 @@
 
     <link rel="icon" type="image/png" id="favicon"
           href="chrome://branding/content/icon32.png"/>
+    <link rel="stylesheet" href="chrome://global/skin/in-content/common.css"
+          type="text/css"/>
     <link rel="stylesheet" href="chrome://global/skin/aboutSupport.css"
           type="text/css"/>
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/aboutTelemetry.css firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/aboutTelemetry.css
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/aboutTelemetry.css	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/aboutTelemetry.css	2015-05-25 20:43:47.000000000 +0000
@@ -27,14 +27,35 @@
   padding: 10px;
 }
 
-#description-enabled > span {
+#settings {
+  border: 1px solid lightgrey;
+  padding: 5px;
+}
+
+.description-enabled,
+.description-disabled {
+  margin: 0px;
+}
+
+.description-enabled > span {
   color: green;
 }
 
-#description-disabled > span {
+.description-disabled > span {
   color: red;
 }
 
+#ping-picker {
+  margin-top: 10px;
+  border: 1px solid lightgrey;
+  padding: 5px;
+}
+
+#ping-source-picker {
+  margin-left: 5px;
+  margin-bottom: 10px;
+}
+
 .data-section {
   background-color: -moz-Field;
   color: -moz-FieldText;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/aboutTelemetry.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/aboutTelemetry.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/aboutTelemetry.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/aboutTelemetry.js	2015-05-25 20:43:47.000000000 +0000
@@ -12,7 +12,10 @@
 Cu.import("resource://gre/modules/TelemetryTimestamps.jsm");
 Cu.import("resource://gre/modules/TelemetryController.jsm");
 Cu.import("resource://gre/modules/TelemetrySession.jsm");
+Cu.import("resource://gre/modules/TelemetryArchive.jsm");
+Cu.import("resource://gre/modules/TelemetryUtils.jsm");
 Cu.import("resource://gre/modules/TelemetryLog.jsm");
+Cu.import("resource://gre/modules/Preferences.jsm");
 
 const Telemetry = Services.telemetry;
 const bundle = Services.strings.createBundle(
@@ -28,95 +31,415 @@
 const PREF_DEBUG_SLOW_SQL = "toolkit.telemetry.debugSlowSql";
 const PREF_SYMBOL_SERVER_URI = "profiler.symbolicationUrl";
 const DEFAULT_SYMBOL_SERVER_URI = "http://symbolapi.mozilla.org";
+const PREF_FHR_UPLOAD_ENABLED = "datareporting.healthreport.uploadEnabled";
 
 // ms idle before applying the filter (allow uninterrupted typing)
 const FILTER_IDLE_TIMEOUT = 500;
 
-#ifdef XP_WIN
-const EOL = "\r\n";
-#else
-const EOL = "\n";
-#endif
+const isWindows = (Services.appinfo.OS == "WINNT");
+const EOL = isWindows ? "\r\n" : "\n";
+
+// This is the ping object currently displayed in the page.
+let gPingData = null;
 
 // Cached value of document's RTL mode
 let documentRTLMode = "";
 
 /**
- * Helper function for fetching a config pref
+ * Helper function for determining whether the document direction is RTL.
+ * Caches result of check on first invocation.
+ */
+function isRTL() {
+  if (!documentRTLMode)
+    documentRTLMode = window.getComputedStyle(document.body).direction;
+  return (documentRTLMode == "rtl");
+}
+
+function isArray(arg) {
+  return Object.prototype.toString.call(arg) === '[object Array]';
+}
+
+function isFlatArray(obj) {
+  if (!isArray(obj)) {
+    return false;
+  }
+  return !obj.some(e => typeof(e) == "object");
+}
+
+/**
+ * This is a helper function for explodeObject.
+ */
+function flattenObject(obj, map, path, array) {
+  for (let k of Object.keys(obj)) {
+    let newPath = [...path, array ? "[" + k + "]" : k];
+    let v = obj[k];
+    if (!v || (typeof(v) != "object")) {
+      map.set(newPath.join("."), v);
+    } else if (isFlatArray(v)) {
+      map.set(newPath.join("."), "[" + v.join(", ") + "]");
+    } else {
+      flattenObject(v, map, newPath, isArray(v));
+    }
+  }
+}
+
+/**
+ * This turns a JSON object into a "flat" stringified form.
  *
- * @param aPrefName Name of config pref to fetch.
- * @param aDefault Default value to return if pref isn't set.
- * @return Value of pref
+ * For an object like {a: "1", b: {c: "2", d: "3"}} it returns a Map of the
+ * form Map(["a","1"], ["b.c", "2"], ["b.d", "3"]).
  */
-function getPref(aPrefName, aDefault) {
-  let result = aDefault;
+function explodeObject(obj) {
+  let map = new Map();
+  flattenObject(obj, map, []);
+  return map;
+}
 
-  try {
-    let prefType = Services.prefs.getPrefType(aPrefName);
-    if (prefType == Ci.nsIPrefBranch.PREF_BOOL) {
-      result = Services.prefs.getBoolPref(aPrefName);
-    } else if (prefType == Ci.nsIPrefBranch.PREF_STRING) {
-      result = Services.prefs.getCharPref(aPrefName);
+function filterObject(obj, filterOut) {
+  let ret = {};
+  for (let k of Object.keys(obj)) {
+    if (filterOut.indexOf(k) == -1) {
+      ret[k] = obj[k];
     }
-  } catch (e) {
-    // Return default if Prefs service throws exception
   }
+  return ret;
+}
 
-  return result;
+
+/**
+ * This turns a JSON object into a "flat" stringified form, separated into top-level sections.
+ *
+ * For an object like:
+ *   {
+ *     a: {b: "1"},
+ *     c: {d: "2", e: {f: "3"}}
+ *   }
+ * it returns a Map of the form:
+ *   Map([
+ *     ["a", Map(["b","1"])],
+ *     ["c", Map([["d", "2"], ["e.f", "3"]])]
+ *   ])
+ */
+function sectionalizeObject(obj) {
+  let map = new Map();
+  for (let k of Object.keys(obj)) {
+    map.set(k, explodeObject(obj[k]));
+  }
+  return map;
 }
 
 /**
- * Helper function for determining whether the document direction is RTL.
- * Caches result of check on first invocation.
+ * Obtain the main DOMWindow for the current context.
  */
-function isRTL() {
-  if (!documentRTLMode)
-    documentRTLMode = window.getComputedStyle(document.body).direction;
-  return (documentRTLMode == "rtl");
+function getMainWindow() {
+  return window.QueryInterface(Ci.nsIInterfaceRequestor)
+               .getInterface(Ci.nsIWebNavigation)
+               .QueryInterface(Ci.nsIDocShellTreeItem)
+               .rootTreeItem
+               .QueryInterface(Ci.nsIInterfaceRequestor)
+               .getInterface(Ci.nsIDOMWindow);
 }
 
-let observer = {
+/**
+ * Obtain the DOMWindow that can open a preferences pane.
+ *
+ * This is essentially "get the browser chrome window" with the added check
+ * that the supposed browser chrome window is capable of opening a preferences
+ * pane.
+ *
+ * This may return null if we can't find the browser chrome window.
+ */
+function getMainWindowWithPreferencesPane() {
+  let mainWindow = getMainWindow();
+  if (mainWindow && "openAdvancedPreferences" in mainWindow) {
+    return mainWindow;
+  } else {
+    return null;
+  }
+}
 
-  enableTelemetry: bundle.GetStringFromName("enableTelemetry"),
+/**
+ * Remove all child nodes of a document node.
+ */
+function removeAllChildNodes(node) {
+  while (node.hasChildNodes()) {
+    node.removeChild(node.lastChild);
+  }
+}
 
-  disableTelemetry: bundle.GetStringFromName("disableTelemetry"),
+/**
+ * Pad a number to two digits with leading "0".
+ */
+function padToTwoDigits(n) {
+  return (n > 9) ? n: "0" + n;
+}
 
-  /**
-   * Observer is called whenever Telemetry is enabled or disabled
-   */
-  observe: function observe(aSubject, aTopic, aData) {
-    if (aData == PREF_TELEMETRY_ENABLED) {
-      this.updatePrefStatus();
+/**
+ * Return yesterdays date with the same time.
+ */
+function yesterday(date) {
+  let d = new Date(date);
+  d.setDate(d.getDate() - 1);
+  return d;
+}
+
+/**
+ * This returns a short date string of the form YYYY/MM/DD.
+ */
+function shortDateString(date) {
+  return date.getFullYear()
+         + "/" + padToTwoDigits(date.getMonth() + 1)
+         + "/" + padToTwoDigits(date.getDate());
+}
+
+/**
+ * This returns a short time string of the form hh:mm:ss.
+ */
+function shortTimeString(date) {
+  return padToTwoDigits(date.getHours())
+         + ":" + padToTwoDigits(date.getMinutes())
+         + ":" + padToTwoDigits(date.getSeconds());
+}
+
+let Settings = {
+  SETTINGS: [
+    // data upload
+    {
+      pref: PREF_FHR_UPLOAD_ENABLED,
+      defaultPrefValue: false,
+      descriptionEnabledId: "description-upload-enabled",
+      descriptionDisabledId: "description-upload-disabled",
+    },
+    // extended "Telemetry" recording
+    {
+      pref: PREF_TELEMETRY_ENABLED,
+      defaultPrefValue: false,
+      descriptionEnabledId: "description-extended-recording-enabled",
+      descriptionDisabledId: "description-extended-recording-disabled",
+    },
+  ],
+
+  attachObservers: function() {
+    for (let s of this.SETTINGS) {
+      let setting = s;
+      Preferences.observe(setting.pref, this.render, this);
+    }
+
+    let elements = document.getElementsByClassName("change-data-choices-link");
+    for (let el of elements) {
+      el.addEventListener("click", function() {
+        let mainWindow = getMainWindowWithPreferencesPane();
+        mainWindow.openAdvancedPreferences("dataChoicesTab");
+      }, false);
+    }
+  },
+
+  detachObservers: function() {
+    for (let setting of this.SETTINGS) {
+      Preferences.ignore(setting.pref, this.render, this);
     }
   },
 
   /**
    * Updates the button & text at the top of the page to reflect Telemetry state.
    */
-  updatePrefStatus: function updatePrefStatus() {
-    // Notify user whether Telemetry is enabled
-    let enabledElement = document.getElementById("description-enabled");
-    let disabledElement = document.getElementById("description-disabled");
-    let toggleElement = document.getElementById("toggle-telemetry");
-    if (getPref(PREF_TELEMETRY_ENABLED, false)) {
-      enabledElement.classList.remove("hidden");
-      disabledElement.classList.add("hidden");
-      toggleElement.innerHTML = this.disableTelemetry;
-    } else {
-      enabledElement.classList.add("hidden");
-      disabledElement.classList.remove("hidden");
-      toggleElement.innerHTML = this.enableTelemetry;
+  render: function() {
+    for (let setting of this.SETTINGS) {
+      let enabledElement = document.getElementById(setting.descriptionEnabledId);
+      let disabledElement = document.getElementById(setting.descriptionDisabledId);
+
+      if (Preferences.get(setting.pref, setting.defaultPrefValue)) {
+        enabledElement.classList.remove("hidden");
+        disabledElement.classList.add("hidden");
+      } else {
+        enabledElement.classList.add("hidden");
+        disabledElement.classList.remove("hidden");
+      }
     }
   }
 };
 
+let PingPicker = {
+  viewCurrentPingData: true,
+  _archivedPings: null,
+
+  attachObservers: function() {
+    let elements = document.getElementsByName("choose-ping-source");
+    for (let el of elements) {
+      el.addEventListener("change", () => this.onPingSourceChanged(), false);
+    }
+
+    document.getElementById("show-subsession-data").addEventListener("change", () => {
+      this._updateCurrentPingData();
+    });
+
+    document.getElementById("choose-ping-week").addEventListener("change", () => {
+      this._renderPingList();
+      this._updateArchivedPingData();
+    }, false);
+    document.getElementById("choose-ping-id").addEventListener("change", () => {
+      this._updateArchivedPingData()
+    }, false);
+
+    document.getElementById("newer-ping")
+            .addEventListener("click", () => this._movePingIndex(-1), false);
+    document.getElementById("older-ping")
+            .addEventListener("click", () => this._movePingIndex(1), false);
+  },
+
+  onPingSourceChanged: function() {
+    this.update();
+  },
+
+  update: function() {
+    let el = document.getElementById("ping-source-current");
+    this.viewCurrentPingData = el.checked;
+
+    if (this.viewCurrentPingData) {
+      document.getElementById("current-ping-picker").classList.remove("hidden");
+      document.getElementById("archived-ping-picker").classList.add("hidden");
+      this._updateCurrentPingData();
+    } else {
+      document.getElementById("current-ping-picker").classList.add("hidden");
+      this._updateArchivedPingList().then(() =>
+        document.getElementById("archived-ping-picker").classList.remove("hidden"));
+    }
+  },
+
+  _updateCurrentPingData: function() {
+    const subsession = document.getElementById("show-subsession-data").checked;
+    const ping = TelemetryController.getCurrentPingData(subsession);
+    displayPingData(ping);
+  },
+
+  _updateArchivedPingData: function() {
+    let id = this._getSelectedPingId();
+    TelemetryArchive.promiseArchivedPingById(id)
+                    .then((ping) => displayPingData(ping));
+  },
+
+  _updateArchivedPingList: function() {
+    return TelemetryArchive.promiseArchivedPingList().then((pingList) => {
+      // The archived ping list is sorted in ascending timestamp order,
+      // but descending is more practical for the operations we do here.
+      pingList.reverse();
+
+      // Currently about:telemetry can only handle the Telemetry session pings,
+      // so we have to filter out everything else.
+      pingList = pingList.filter(
+        (p) => ["main", "saved-session"].indexOf(p.type) != -1);
+      this._archivedPings = pingList;
+
+      // Collect the start dates for all the weeks we have pings for.
+      let weekStart = (date) => {
+        let weekDay = (date.getDay() + 6) % 7;
+        let monday = new Date(date);
+        monday.setDate(date.getDate() - weekDay);
+        return TelemetryUtils.truncateToDays(monday);
+      };
+
+      let weekStartDates = new Set();
+      for (let p of pingList) {
+        weekStartDates.add(weekStart(new Date(p.timestampCreated)).getTime());
+      }
+
+      // Build a list of the week date ranges we have ping data for.
+      let plusOneWeek = (date) => {
+        let d = date;
+        d.setDate(d.getDate() + 7);
+        return d;
+      };
+
+      this._weeks = [for (startTime of weekStartDates.values()) {
+        startDate: new Date(startTime),
+        endDate: plusOneWeek(new Date(startTime)),
+      }];
+
+      // Render the archive data.
+      this._renderWeeks();
+      this._renderPingList();
+
+      // Update the displayed ping.
+      this._updateArchivedPingData();
+    });
+  },
+
+  _renderWeeks: function() {
+    let weekSelector = document.getElementById("choose-ping-week");
+    removeAllChildNodes(weekSelector);
+
+    let index = 0;
+    for (let week of this._weeks) {
+      let text = shortDateString(week.startDate)
+                 + " - " + shortDateString(yesterday(week.endDate));
+
+      let option = document.createElement("option");
+      let content = document.createTextNode(text);
+      option.appendChild(content);
+      weekSelector.appendChild(option);
+    }
+  },
+
+  _getSelectedWeek: function() {
+    let weekSelector = document.getElementById("choose-ping-week");
+    return this._weeks[weekSelector.selectedIndex];
+  },
+
+  _renderPingList: function(id = null) {
+    let pingSelector = document.getElementById("choose-ping-id");
+    removeAllChildNodes(pingSelector);
+
+    let weekRange = this._getSelectedWeek();
+    let pings = this._archivedPings.filter(
+      (p) => p.timestampCreated >= weekRange.startDate.getTime() &&
+             p.timestampCreated < weekRange.endDate.getTime());
+
+    for (let p of pings) {
+      let date = new Date(p.timestampCreated);
+      let text = shortDateString(date)
+                 + " " + shortTimeString(date)
+                 + " - " + p.type;
+
+      let option = document.createElement("option");
+      let content = document.createTextNode(text);
+      option.appendChild(content);
+      option.setAttribute("value", p.id);
+      if (id && p.id == id) {
+        option.selected = true;
+      }
+      pingSelector.appendChild(option);
+    }
+  },
+
+  _getSelectedPingId: function() {
+    let pingSelector = document.getElementById("choose-ping-id");
+    let selected = pingSelector.selectedOptions.item(0);
+    return selected.getAttribute("value");
+  },
+
+  _movePingIndex: function(offset) {
+    const id = this._getSelectedPingId();
+    const index = this._archivedPings.findIndex((p) => p.id == id);
+    const newIndex = Math.min(Math.max(index + offset, 0), this._archivedPings.length - 1);
+    const ping = this._archivedPings[newIndex];
+
+    const weekIndex = this._weeks.findIndex(
+      (week) => ping.timestampCreated >= week.startDate.getTime() &&
+                ping.timestampCreated < week.endDate.getTime());
+    const options = document.getElementById("choose-ping-week").options;
+    options.item(weekIndex).selected = true;
+
+    this._renderPingList(ping.id);
+    this._updateArchivedPingData();
+  },
+};
+
 let GeneralData = {
   /**
    * Renders the general data
    */
-  render: function() {
+  render: function(aPing) {
     setHasData("general-data-section", true);
-
     let table = document.createElement("table");
 
     let caption = document.createElement("caption");
@@ -129,12 +452,19 @@
     this.appendColumn(headings, "th", bundle.GetStringFromName("generalDataHeadingValue") + "\t");
     table.appendChild(headings);
 
-    let row = document.createElement("tr");
-    this.appendColumn(row, "td", "Client ID\t");
-    this.appendColumn(row, "td", TelemetryController.clientID + "\t");
-    table.appendChild(row);
+    // The payload & environment parts are handled by other renderers.
+    let ignoreSections = ["payload", "environment"];
+    let data = explodeObject(filterObject(aPing, ignoreSections));
+
+    for (let [path, value] of data) {
+        let row = document.createElement("tr");
+        this.appendColumn(row, "td", path + "\t");
+        this.appendColumn(row, "td", value + "\t");
+        table.appendChild(row);
+    }
 
     let dataDiv = document.getElementById("general-data");
+    removeAllChildNodes(dataDiv);
     dataDiv.appendChild(table);
   },
 
@@ -153,17 +483,70 @@
   },
 };
 
+let EnvironmentData = {
+  /**
+   * Renders the environment data
+   */
+  render: function(ping) {
+    let dataDiv = document.getElementById("environment-data");
+    removeAllChildNodes(dataDiv);
+    const hasData = !!ping.environment;
+    setHasData("environment-data-section", hasData);
+    if (!hasData) {
+      return;
+    }
+
+    let data = sectionalizeObject(ping.environment);
+
+    for (let [section, sectionData] of data) {
+      let table = document.createElement("table");
+      let caption = document.createElement("caption");
+      caption.appendChild(document.createTextNode(section + "\n"));
+      table.appendChild(caption);
+
+      let headings = document.createElement("tr");
+      this.appendColumn(headings, "th", bundle.GetStringFromName("environmentDataHeadingName") + "\t");
+      this.appendColumn(headings, "th", bundle.GetStringFromName("environmentDataHeadingValue") + "\t");
+      table.appendChild(headings);
+
+      for (let [path, value] of sectionData) {
+          let row = document.createElement("tr");
+          this.appendColumn(row, "td", path + "\t");
+          this.appendColumn(row, "td", value + "\t");
+          table.appendChild(row);
+      }
+
+      dataDiv.appendChild(table);
+    }
+  },
+
+  /**
+   * Helper function for appending a column to the data table.
+   *
+   * @param aRowElement Parent row element
+   * @param aColType Column's tag name
+   * @param aColText Column contents
+   */
+  appendColumn: function(aRowElement, aColType, aColText) {
+    let colElement = document.createElement(aColType);
+    let colTextElement = document.createTextNode(aColText);
+    colElement.appendChild(colTextElement);
+    aRowElement.appendChild(colElement);
+  },
+};
+
 let TelLog = {
   /**
    * Renders the telemetry log
    */
-  render: function() {
-    let entries =  TelemetryLog.entries();
-
-    if(entries.length == 0) {
-        return;
+  render: function(aPing) {
+    let entries = aPing.payload.log;
+    const hasData = entries && entries.length > 0;
+    setHasData("telemetry-log-section", hasData);
+    if (!hasData) {
+      return;
     }
-    setHasData("telemetry-log-section", true);
+
     let table = document.createElement("table");
 
     let caption = document.createElement("caption");
@@ -186,6 +569,7 @@
     }
 
     let dataDiv = document.getElementById("telemetry-log");
+    removeAllChildNodes(dataDiv);
     dataDiv.appendChild(table);
   },
 
@@ -219,24 +603,36 @@
   /**
    * Render slow SQL statistics
    */
-  render: function SlowSQL_render() {
-    let debugSlowSql = getPref(PREF_DEBUG_SLOW_SQL, false);
+  render: function SlowSQL_render(aPing) {
+    // We can add the debug SQL data to the current ping later.
+    // However, we need to be careful to never send that debug data
+    // out due to privacy concerns.
+    // We want to show the actual ping data for archived pings,
+    // so skip this there.
+    let debugSlowSql = PingPicker.viewCurrentPingData && Preferences.get(PREF_DEBUG_SLOW_SQL, false);
+    let slowSql = debugSlowSql ? Telemetry.debugSlowSQL : aPing.payload.slowSQL;
+    if (!slowSql) {
+      setHasData("slow-sql-section", false);
+      return;
+    }
+
     let {mainThread, otherThreads} =
-      Telemetry[debugSlowSql ? "debugSlowSQL" : "slowSQL"];
+      debugSlowSql ? Telemetry.debugSlowSQL : aPing.payload.slowSQL;
 
     let mainThreadCount = Object.keys(mainThread).length;
     let otherThreadCount = Object.keys(otherThreads).length;
     if (mainThreadCount == 0 && otherThreadCount == 0) {
+      setHasData("slow-sql-section", false);
       return;
     }
 
     setHasData("slow-sql-section", true);
-
     if (debugSlowSql) {
       document.getElementById("sql-warning").classList.remove("hidden");
     }
 
     let slowSqlDiv = document.getElementById("slow-sql-tables");
+    removeAllChildNodes(slowSqlDiv);
 
     // Main thread
     if (mainThreadCount > 0) {
@@ -314,17 +710,6 @@
   }
 };
 
-/**
- * Removes child elements from the supplied div
- *
- * @param aDiv Element to be cleared
- */
-function clearDivData(aDiv) {
-  while (aDiv.hasChildNodes()) {
-    aDiv.removeChild(aDiv.lastChild);
-  }
-};
-
 let StackRenderer = {
 
   stackTitle: bundle.GetStringFromName("stackTitle"),
@@ -365,7 +750,7 @@
   renderStacks: function StackRenderer_renderStacks(aPrefix, aStacks,
                                                     aMemoryMap, aRenderHeader) {
     let div = document.getElementById(aPrefix + '-data');
-    clearDivData(div);
+    removeAllChildNodes(div);
 
     let fetchE = document.getElementById(aPrefix + '-fetch-symbols');
     if (fetchE) {
@@ -432,7 +817,7 @@
   let hideElement = document.getElementById(this.prefix + "-hide-symbols");
   hideElement.classList.remove("hidden");
   let div = document.getElementById(this.prefix + "-data");
-  clearDivData(div);
+  removeAllChildNodes(div);
   let errorMessage = bundle.GetStringFromName("errorFetchingSymbols");
 
   if (this.symbolRequest.status != 200) {
@@ -465,7 +850,7 @@
 SymbolicationRequest.prototype.fetchSymbols =
 function SymbolicationRequest_fetchSymbols() {
   let symbolServerURI =
-    getPref(PREF_SYMBOL_SERVER_URI, DEFAULT_SYMBOL_SERVER_URI);
+    Preferences.get(PREF_SYMBOL_SERVER_URI, DEFAULT_SYMBOL_SERVER_URI);
   let request = {"memoryMap" : this.memoryMap, "stacks" : this.stacks,
                  "version" : 3};
   let requestJSON = JSON.stringify(request);
@@ -487,17 +872,22 @@
   /**
    * Renders raw chrome hang data
    */
-  render: function ChromeHangs_render() {
-    let hangs = Telemetry.chromeHangs;
+  render: function ChromeHangs_render(aPing) {
+    let hangs = aPing.payload.chromeHangs;
+    setHasData("chrome-hangs-section", !!hangs);
+    if (!hangs) {
+      return;
+    }
+
     let stacks = hangs.stacks;
     let memoryMap = hangs.memoryMap;
 
     StackRenderer.renderStacks("chrome-hangs", stacks, memoryMap,
-			       this.renderHangHeader);
+			       (index) => this.renderHangHeader(aPing, index));
   },
 
-  renderHangHeader: function ChromeHangs_renderHangHeader(aIndex) {
-    let durations = Telemetry.chromeHangs.durations;
+  renderHangHeader: function ChromeHangs_renderHangHeader(aPing, aIndex) {
+    let durations = aPing.payload.chromeHangs.durations;
     StackRenderer.renderHeader("chrome-hangs", [aIndex + 1, durations[aIndex]]);
   }
 };
@@ -507,17 +897,19 @@
   /**
    * Renders raw thread hang stats data
    */
-  render: function() {
+  render: function(aPing) {
     let div = document.getElementById("thread-hang-stats");
-    clearDivData(div);
+    removeAllChildNodes(div);
+
+    let stats = aPing.payload.threadHangStats;
+    setHasData("thread-hang-stats-section", stats && (stats.length > 0));
+    if (!stats) {
+      return;
+    }
 
-    let stats = Telemetry.threadHangStats;
     stats.forEach((thread) => {
       div.appendChild(this.renderThread(thread));
     });
-    if (stats.length) {
-      setHasData("thread-hang-stats-section", true);
-    }
   },
 
   /**
@@ -572,8 +964,8 @@
    *                 * exponential: bars follow logarithmic scale
    */
   render: function Histogram_render(aParent, aName, aHgram, aOptions) {
-    let hgram = this.unpack(aHgram);
     let options = aOptions || {};
+    let hgram = this.processHistogram(aHgram, aName);
 
     let outerDiv = document.createElement("div");
     outerDiv.className = "histogram";
@@ -592,11 +984,12 @@
     divStats.appendChild(document.createTextNode(stats));
     outerDiv.appendChild(divStats);
 
-    if (isRTL())
+    if (isRTL()) {
+      hgram.buckets.reverse();
       hgram.values.reverse();
+    }
 
-    let textData = this.renderValues(outerDiv, hgram.values, hgram.max,
-                                     hgram.sample_count, options);
+    let textData = this.renderValues(outerDiv, hgram, options);
 
     // The 'Copy' button contains the textual data, copied to clipboard on click
     let copyButton = document.createElement("button");
@@ -613,45 +1006,28 @@
     return outerDiv;
   },
 
-  /**
-   * Unpacks histogram values
-   *
-   * @param aHgram Packed histogram
-   *
-   * @return Unpacked histogram representation
-   */
-  unpack: function Histogram_unpack(aHgram) {
-    let sample_count = aHgram.counts.reduceRight((a, b) => a + b);
-    let buckets = [0, 1];
-    if (aHgram.histogram_type != Telemetry.HISTOGRAM_BOOLEAN) {
-      buckets = aHgram.ranges;
-    }
-
-    let average =  Math.round(aHgram.sum * 10 / sample_count) / 10;
-    let max_value = Math.max.apply(Math, aHgram.counts);
-
-    let first = true;
-    let last = 0;
-    let values = [];
-    for (let i = 0; i < buckets.length; i++) {
-      let count = aHgram.counts[i];
-      if (!count)
-        continue;
-      if (first) {
-        first = false;
-        if (i) {
-          values.push([buckets[i - 1], 0]);
-        }
-      }
-      last = i + 1;
-      values.push([buckets[i], count]);
-    }
-    if (last && last < buckets.length) {
-      values.push([buckets[last], 0]);
-    }
+  processHistogram: function(aHgram, aName) {
+    const values = [for (k of Object.keys(aHgram.values)) aHgram.values[k]];
+    if (!values.length) {
+      // If we have no values collected for this histogram, just return
+      // zero values so we still render it.
+      return {
+        values: [],
+        pretty_average: 0,
+        max: 0,
+        sample_count: 0,
+        sum: 0
+      };
+    }
+
+    const sample_count = values.reduceRight((a, b) => a + b);
+    const average = Math.round(aHgram.sum * 10 / sample_count) / 10;
+    const max_value = Math.max(...values);
+
+    const labelledValues = [for (k of Object.keys(aHgram.values)) [Number(k), aHgram.values[k]]];
 
     let result = {
-      values: values,
+      values: labelledValues,
       pretty_average: average,
       max: max_value,
       sample_count: sample_count,
@@ -677,18 +1053,19 @@
    * Values are assumed to use 0 as baseline.
    *
    * @param aDiv Outer parent div
-   * @param aValues Histogram values
-   * @param aMaxValue Value of the longest bar (length, not label)
-   * @param aSumValues Sum of all bar values
+   * @param aHgram The histogram data
    * @param aOptions Object with render options (@see #render)
    */
-  renderValues: function Histogram_renderValues(aDiv, aValues, aMaxValue, aSumValues, aOptions) {
+  renderValues: function Histogram_renderValues(aDiv, aHgram, aOptions) {
     let text = "";
     // If the last label is not the longest string, alignment will break a little
-    let labelPadTo = String(aValues[aValues.length -1][0]).length;
-    let maxBarValue = aOptions.exponential ? this.getLogValue(aMaxValue) : aMaxValue;
+    let labelPadTo = 0;
+    if (aHgram.values.length) {
+      labelPadTo = String(aHgram.values[aHgram.values.length - 1][0]).length;
+    }
+    let maxBarValue = aOptions.exponential ? this.getLogValue(aHgram.max_value) : aHgram.max;
 
-    for (let [label, value] of aValues) {
+    for (let [label, value] of aHgram.values) {
       let barValue = aOptions.exponential ? this.getLogValue(value) : value;
 
       // Create a text representation: <right-aligned-label> |<bar-of-#><value>  <percentage>
@@ -696,7 +1073,7 @@
               + " ".repeat(Math.max(0, labelPadTo - String(label).length)) + label // Right-aligned label
               + " |" + "#".repeat(Math.round(MAX_BAR_CHARS * barValue / maxBarValue)) // Bar
               + "  " + value // Value
-              + "  " + Math.round(100 * value / aSumValues) + "%"; // Percentage
+              + "  " + Math.round(100 * value / aHgram.sum) + "%"; // Percentage
 
       // Construct the HTML labels + bars
       let belowEm = Math.round(MAX_BAR_HEIGHT * (barValue / maxBarValue) * 10) / 10;
@@ -912,17 +1289,25 @@
 
   /**
    * Render the addon details section as a series of headers followed by key/value tables
-   * @param aSections Object containing the details sections to render
+   * @param aPing A ping object to render the data from.
    */
-  render: function AddonDetails_render(aSections) {
+  render: function AddonDetails_render(aPing) {
     let addonSection = document.getElementById("addon-details");
-    for (let provider in aSections) {
+    removeAllChildNodes(addonSection);
+    let addonDetails = aPing.payload.addonDetails;
+    const hasData = addonDetails && Object.keys(addonDetails).length > 0;
+    setHasData("addon-details-section", hasData);
+    if (!hasData) {
+      return;
+    }
+
+    for (let provider in addonDetails) {
       let providerSection = document.createElement("h2");
       let titleText = bundle.formatStringFromName("addonProvider", [provider], 1);
       providerSection.appendChild(document.createTextNode(titleText));
       addonSection.appendChild(providerSection);
       addonSection.appendChild(
-        KeyValueTable.render(aSections[provider],
+        KeyValueTable.render(addonDetails[provider],
                              this.tableIDTitle, this.tableDetailsTitle));
     }
   }
@@ -961,7 +1346,7 @@
  */
 function setupPageHeader()
 {
-  let serverOwner = getPref(PREF_TELEMETRY_SERVER_OWNER, "Mozilla");
+  let serverOwner = Preferences.get(PREF_TELEMETRY_SERVER_OWNER, "Mozilla");
   let brandName = brandBundle.GetStringFromName("brandFullName");
   let subtitleText = bundle.formatStringFromName(
     "pageSubtitle", [serverOwner, brandName], 2);
@@ -974,25 +1359,23 @@
  * Initializes load/unload, pref change and mouse-click listeners
  */
 function setupListeners() {
-  Services.prefs.addObserver(PREF_TELEMETRY_ENABLED, observer, false);
-  observer.updatePrefStatus();
+  Settings.attachObservers();
+  PingPicker.attachObservers();
 
   // Clean up observers when page is closed
   window.addEventListener("unload",
     function unloadHandler(aEvent) {
       window.removeEventListener("unload", unloadHandler);
-      Services.prefs.removeObserver(PREF_TELEMETRY_ENABLED, observer);
-  }, false);
-
-  document.getElementById("toggle-telemetry").addEventListener("click",
-    function () {
-      let value = getPref(PREF_TELEMETRY_ENABLED, false);
-      Services.prefs.setBoolPref(PREF_TELEMETRY_ENABLED, !value);
+      Settings.detachObservers();
   }, false);
 
   document.getElementById("chrome-hangs-fetch-symbols").addEventListener("click",
     function () {
-      let hangs = Telemetry.chromeHangs;
+      if (!gPingData) {
+        return;
+      }
+
+      let hangs = gPingData.payload.chromeHangs;
       let req = new SymbolicationRequest("chrome-hangs",
                                          ChromeHangs.renderHangHeader,
                                          hangs.memoryMap, hangs.stacks);
@@ -1001,12 +1384,20 @@
 
   document.getElementById("chrome-hangs-hide-symbols").addEventListener("click",
     function () {
-      ChromeHangs.render();
+      if (!gPingData) {
+        return;
+      }
+
+      ChromeHangs.render(gPingData);
   }, false);
 
   document.getElementById("late-writes-fetch-symbols").addEventListener("click",
     function () {
-      let lateWrites = TelemetrySession.getPayload().lateWrites;
+      if (!gPingData) {
+        return;
+      }
+
+      let lateWrites = gPingData.payload.lateWrites;
       let req = new SymbolicationRequest("late-writes",
                                          LateWritesSingleton.renderHeader,
                                          lateWrites.memoryMap,
@@ -1016,8 +1407,11 @@
 
   document.getElementById("late-writes-hide-symbols").addEventListener("click",
     function () {
-      let ping = TelemetrySession.getPayload();
-      LateWritesSingleton.renderLateWrites(ping.lateWrites);
+      if (!gPingData) {
+        return;
+      }
+
+      LateWritesSingleton.renderLateWrites(gPingData.payload.lateWrites);
   }, false);
 
   // Clicking on the section name will toggle its state
@@ -1042,66 +1436,11 @@
   // Set up event listeners
   setupListeners();
 
-  // Show general data.
-  GeneralData.render();
-
-  // Show telemetry log.
-  TelLog.render();
-
-  // Show slow SQL stats
-  SlowSQL.render();
-
-  // Show chrome hang stacks
-  ChromeHangs.render();
-
-  // Show thread hang stats
-  ThreadHangStats.render();
-
-  // Show histogram data
-  let histograms = Telemetry.histogramSnapshots;
-  if (Object.keys(histograms).length) {
-    let hgramDiv = document.getElementById("histograms");
-    for (let [name, hgram] of Iterator(histograms)) {
-      Histogram.render(hgramDiv, name, hgram);
-    }
-
-    let filterBox = document.getElementById("histograms-filter");
-    filterBox.addEventListener("input", Histogram.histogramFilterChanged, false);
-    if (filterBox.value.trim() != "") { // on load, no need to filter if empty
-      Histogram.filterHistograms(hgramDiv, filterBox.value);
-    }
-
-    setHasData("histograms-section", true);
-  }
-
-  // Show keyed histogram data
-  let keyedHistograms = Telemetry.keyedHistogramSnapshots;
-  if (Object.keys(keyedHistograms).length) {
-    let keyedDiv = document.getElementById("keyed-histograms");
-    for (let [id, keyed] of Iterator(keyedHistograms)) {
-      KeyedHistogram.render(keyedDiv, id, keyed);
-    }
-
-    setHasData("keyed-histograms-section", true);
-  }
-
-  // Show addon histogram data
-  let addonDiv = document.getElementById("addon-histograms");
-  let addonHistogramsRendered = false;
-  let addonData = Telemetry.addonHistogramSnapshots;
-  for (let [addon, histograms] of Iterator(addonData)) {
-    for (let [name, hgram] of Iterator(histograms)) {
-      addonHistogramsRendered = true;
-      Histogram.render(addonDiv, addon + ": " + name, hgram);
-    }
-  }
-
-  if (addonHistogramsRendered) {
-   setHasData("addon-histograms-section", true);
-  }
+  // Render settings.
+  Settings.render();
 
-  // Get the Telemetry Ping payload
-  Telemetry.asyncFetchTelemetryData(displayPingData);
+  // Update ping data when async Telemetry init is finished.
+  Telemetry.asyncFetchTelemetryData(() => PingPicker.update());
 
   // Restore sections states
   let stateboxes = document.getElementsByClassName("statebox");
@@ -1118,6 +1457,11 @@
   },
 
   renderLateWrites: function LateWritesSingleton_renderLateWrites(lateWrites) {
+    setHasData("late-writes-section", !!lateWrites);
+    if (!lateWrites) {
+      return;
+    }
+
     let stacks = lateWrites.stacks;
     let memoryMap = lateWrites.memoryMap;
     StackRenderer.renderStacks('late-writes', stacks, memoryMap,
@@ -1170,36 +1514,111 @@
   return result;
 }
 
-function displayPingData() {
-  let ping = TelemetrySession.getPayload();
+function displayPingData(ping) {
+  gPingData = ping;
 
-  let keysHeader = bundle.GetStringFromName("keysHeader");
-  let valuesHeader = bundle.GetStringFromName("valuesHeader");
+  const keysHeader = bundle.GetStringFromName("keysHeader");
+  const valuesHeader = bundle.GetStringFromName("valuesHeader");
+
+  // Show general data.
+  GeneralData.render(ping);
+
+  // Show environment data.
+  EnvironmentData.render(ping);
+
+  // Show telemetry log.
+  TelLog.render(ping);
+
+  // Show slow SQL stats
+  SlowSQL.render(ping);
+
+  // Show chrome hang stacks
+  ChromeHangs.render(ping);
+
+  // Show thread hang stats
+  ThreadHangStats.render(ping);
+
+  // Render Addon details.
+  AddonDetails.render(ping);
 
   // Show simple measurements
-  let simpleMeasurements = sortStartupMilestones(ping.simpleMeasurements);
-  if (Object.keys(simpleMeasurements).length) {
-    let simpleSection = document.getElementById("simple-measurements");
+  let payload = ping.payload;
+  let simpleMeasurements = sortStartupMilestones(payload.simpleMeasurements);
+  let hasData = Object.keys(simpleMeasurements).length > 0;
+  setHasData("simple-measurements-section", hasData);
+  let simpleSection = document.getElementById("simple-measurements");
+  removeAllChildNodes(simpleSection);
+
+  if (hasData) {
     simpleSection.appendChild(KeyValueTable.render(simpleMeasurements,
                                                    keysHeader, valuesHeader));
-    setHasData("simple-measurements-section", true);
   }
 
-  LateWritesSingleton.renderLateWrites(ping.lateWrites);
+  LateWritesSingleton.renderLateWrites(payload.lateWrites);
 
   // Show basic system info gathered
-  if (Object.keys(ping.info).length) {
-    let infoSection = document.getElementById("system-info");
-    infoSection.appendChild(KeyValueTable.render(ping.info,
+  hasData = Object.keys(payload.info).length > 0;
+  setHasData("system-info-section", hasData);
+  let infoSection = document.getElementById("system-info");
+  removeAllChildNodes(infoSection);
+
+  if (hasData) {
+    infoSection.appendChild(KeyValueTable.render(payload.info,
                                                  keysHeader, valuesHeader));
-    setHasData("system-info-section", true);
   }
 
-  let addonDetails = ping.addonDetails;
-  if (Object.keys(addonDetails).length) {
-    AddonDetails.render(addonDetails);
-    setHasData("addon-details-section", true);
+  // Show histogram data
+  let hgramDiv = document.getElementById("histograms");
+  removeAllChildNodes(hgramDiv);
+
+  let histograms = payload.histograms;
+  hasData = Object.keys(histograms).length > 0;
+  setHasData("histograms-section", hasData);
+
+  if (hasData) {
+    for (let [name, hgram] of Iterator(histograms)) {
+      Histogram.render(hgramDiv, name, hgram, {unpacked: true});
+    }
+
+    let filterBox = document.getElementById("histograms-filter");
+    filterBox.addEventListener("input", Histogram.histogramFilterChanged, false);
+    if (filterBox.value.trim() != "") { // on load, no need to filter if empty
+      Histogram.filterHistograms(hgramDiv, filterBox.value);
+    }
+
+    setHasData("histograms-section", true);
   }
+
+  // Show keyed histogram data
+  let keyedDiv = document.getElementById("keyed-histograms");
+  removeAllChildNodes(keyedDiv);
+
+  let keyedHistograms = payload.keyedHistograms;
+  hasData = Object.keys(keyedHistograms).length > 0;
+  setHasData("keyed-histograms-section", hasData);
+
+  if (hasData) {
+    for (let [id, keyed] of Iterator(keyedHistograms)) {
+      KeyedHistogram.render(keyedDiv, id, keyed, {unpacked: true});
+    }
+  }
+
+  // Show addon histogram data
+  let addonDiv = document.getElementById("addon-histograms");
+  removeAllChildNodes(addonDiv);
+
+  let addonHistogramsRendered = false;
+  let addonData = payload.addonHistograms;
+  if (addonData) {
+    for (let [addon, histograms] of Iterator(addonData)) {
+      for (let [name, hgram] of Iterator(histograms)) {
+        addonHistogramsRendered = true;
+        Histogram.render(addonDiv, addon + ": " + name, hgram, {unpacked: true});
+      }
+    }
+  }
+
+  setHasData("addon-histograms-section", addonHistogramsRendered);
 }
 
 window.addEventListener("load", onLoad, false);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/aboutTelemetry.xhtml firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/aboutTelemetry.xhtml
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/aboutTelemetry.xhtml	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/aboutTelemetry.xhtml	2015-05-25 20:43:47.000000000 +0000
@@ -29,10 +29,60 @@
 
       <h2 id="page-subtitle"></h2>
 
-      <p id="description-enabled">&aboutTelemetry.telemetryEnabled;</p>
-      <p id="description-disabled">&aboutTelemetry.telemetryDisabled;</p>
+      <table id="settings">
+        <tr>
+          <td>
+            <p id="description-upload-enabled" class="description-enabled">&aboutTelemetry.uploadEnabled;</p>
+            <p id="description-upload-disabled" class="description-disabled">&aboutTelemetry.uploadDisabled;</p>
+          </td>
+          <td>
+            <a href="" class="change-data-choices-link">&aboutTelemetry.changeDataChoices;</a>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <p id="description-extended-recording-enabled" class="description-enabled">&aboutTelemetry.extendedRecordingEnabled;</p>
+            <p id="description-extended-recording-disabled" class="description-disabled">&aboutTelemetry.extendedRecordingDisabled;</p>
+          </td>
+          <td>
+            <a href="" class="change-data-choices-link">&aboutTelemetry.changeDataChoices;</a>
+          </td>
+        </tr>
+      </table>
 
-      <button id="toggle-telemetry" type="button"/>
+      <div id="ping-picker">
+        <div id="ping-source-picker">
+          &aboutTelemetry.pingDataSource;<br/>
+          <input type="radio" id="ping-source-current" name="choose-ping-source" value="current" checked="checked" />
+          &aboutTelemetry.showCurrentPingData;<br />
+          <input type="radio" id="ping-source-archive" name="choose-ping-source" value="archive" />
+          &aboutTelemetry.showArchivedPingData;<br />
+        </div>
+        <div id="current-ping-picker">
+          <input id="show-subsession-data" type="checkbox" />&aboutTelemetry.showSubsessionData;
+        </div>
+        <div id="archived-ping-picker" class="hidden">
+          &aboutTelemetry.choosePing;<br />
+          <button id="newer-ping" type="button">&aboutTelemetry.showNewerPing;</button>
+          <button id="older-ping" type="button">&aboutTelemetry.showOlderPing;</button><br />
+          <table>
+            <tr>
+                <th>&aboutTelemetry.archiveWeekHeader;</th>
+                <th>&aboutTelemetry.archivePingHeader;</th>
+            </tr>
+            <tr>
+                <td>
+                    <select id="choose-ping-week">
+                    </select>
+                </td>
+                <td>
+                    <select id="choose-ping-id">
+                    </select>
+                </td>
+            </tr>
+          </table>
+        </div>
+      </div>
     </header>
 
     <section id="general-data-section" class="data-section">
@@ -44,6 +94,15 @@
       </div>
     </section>
 
+    <section id="environment-data-section" class="data-section">
+      <input type="checkbox" class="statebox"/>
+      <h1 class="section-name">&aboutTelemetry.environmentDataSection;</h1>
+      <span class="toggle-caption">&aboutTelemetry.toggle;</span>
+      <span class="empty-caption">&aboutTelemetry.emptySection;</span>
+      <div id="environment-data" class="data">
+      </div>
+    </section>
+
     <section id="telemetry-log-section" class="data-section">
       <input type="checkbox" class="statebox"/>
       <h1 class="section-name">&aboutTelemetry.telemetryLogSection;</h1>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/browser-child.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/browser-child.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/browser-child.js	2015-05-13 18:06:10.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/browser-child.js	2015-05-25 20:43:47.000000000 +0000
@@ -147,6 +147,15 @@
       json.mayEnableCharacterEncodingMenu = docShell.mayEnableCharacterEncodingMenu;
       json.principal = content.document.nodePrincipal;
       json.synthetic = content.document.mozSyntheticDocument;
+
+      if (AppConstants.MOZ_CRASHREPORTER && CrashReporter.enabled) {
+        let uri = aLocationURI.clone();
+        try {
+          // If the current URI contains a username/password, remove it.
+          uri.userPass = "";
+        } catch (ex) { /* Ignore failures on about: URIs. */ }
+        CrashReporter.annotateCrashReport("URL", uri.spec);
+      }
     }
 
     this._send("Content:LocationChange", json, objects);
@@ -261,8 +270,17 @@
   },
 
   loadURI: function(uri, flags, referrer, referrerPolicy, baseURI) {
-    if (AppConstants.MOZ_CRASHREPORTER && CrashReporter.enabled)
-      CrashReporter.annotateCrashReport("URL", uri);
+    if (AppConstants.MOZ_CRASHREPORTER && CrashReporter.enabled) {
+      let annotation = uri;
+      try {
+        let url = Services.io.newURI(uri, null, null);
+        // If the current URI contains a username/password, remove it.
+        url.userPass = "";
+        annotation = url.spec;
+      } catch (ex) { /* Ignore failures to parse and failures
+                      on about: URIs. */ }
+      CrashReporter.annotateCrashReport("URL", annotation);
+    }
     if (referrer)
       referrer = Services.io.newURI(referrer, null, null);
     if (baseURI)
@@ -483,48 +501,6 @@
   loadGroup.adjustPriority(msg.data.adjustment);
 });
 
-let DOMFullscreenManager = {
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
-                                         Ci.nsISupportsWeakReference]),
-
-  init: function() {
-    Services.obs.addObserver(this, "ask-parent-to-exit-fullscreen", false);
-    Services.obs.addObserver(this, "ask-parent-to-rollback-fullscreen", false);
-    addMessageListener("DOMFullscreen:ChildrenMustExit", () => {
-      let utils = content.QueryInterface(Ci.nsIInterfaceRequestor)
-                         .getInterface(Ci.nsIDOMWindowUtils);
-      utils.exitFullscreen();
-    });
-    addEventListener("unload", () => {
-      Services.obs.removeObserver(this, "ask-parent-to-exit-fullscreen");
-      Services.obs.removeObserver(this, "ask-parent-to-rollback-fullscreen");
-    });
-  },
-
-  observe: function(aSubject, aTopic, aData) {
-    // Observer notifications are global, which means that these notifications
-    // might be coming from elements that are not actually children within this
-    // windows' content. We should ignore those. This will not be necessary once
-    // we fix bug 1053413 and stop using observer notifications for this stuff.
-    if (aSubject.defaultView.top !== content) {
-      return;
-    }
-
-    switch (aTopic) {
-      case "ask-parent-to-exit-fullscreen": {
-        sendAsyncMessage("DOMFullscreen:RequestExit");
-        break;
-      }
-      case "ask-parent-to-rollback-fullscreen": {
-        sendAsyncMessage("DOMFullscreen:RequestRollback");
-        break;
-      }
-    }
-  },
-};
-
-DOMFullscreenManager.init();
-
 let AutoCompletePopup = {
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompletePopup]),
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/jar.mn firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/jar.mn
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/jar.mn	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/jar.mn	2015-05-25 20:43:47.000000000 +0000
@@ -27,7 +27,7 @@
    content/global/aboutwebrtc/aboutWebrtc.xhtml (aboutwebrtc/aboutWebrtc.xhtml)
 *  content/global/aboutSupport.js
 *  content/global/aboutSupport.xhtml
-*  content/global/aboutTelemetry.js
+   content/global/aboutTelemetry.js
    content/global/aboutTelemetry.xhtml
    content/global/aboutTelemetry.css          (aboutTelemetry.css)
    content/global/directionDetector.html
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/license.html firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/license.html
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/license.html	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/license.html	2015-05-25 20:43:47.000000000 +0000
@@ -64,13 +64,16 @@
       </li>
       <li><a href="about:license#ACE">ACE License</a></li>
       <li><a href="about:license#acorn">acorn License</a></li>
+#ifdef MOZ_INSTALL_TRACKING
+      <li><a href="about:license#adjust">Adjust SDK License</a></li>
+#endif
       <li><a href="about:license#adobecmap">Adobe CMap License</a></li>
       <li><a href="about:license#android">Android Open Source License</a></li>
       <li><a href="about:license#angle">ANGLE License</a></li>
       <li><a href="about:license#apache">Apache License 2.0</a></li>
       <li><a href="about:license#apple">Apple License</a></li>
       <li><a href="about:license#apple-mozilla">Apple/Mozilla NPRuntime License</a></li>
-      <li><a href="about:license#apple-torch">Apple/Torch Mobile License</a></li>
+      <li><a href="about:license#arm">ARM License</a></li>
       <li><a href="about:license#backbone">Backbone License</a></li>
       <li><a href="about:license#bspatch">bspatch License</a></li>
       <li><a href="about:license#cairo">Cairo Component Licenses</a></li>
@@ -81,8 +84,6 @@
       <li><a href="about:license#dagre-d3">Dagre-D3 License</a></li>
       <li><a href="about:license#dtoa">dtoa License</a></li>
       <li><a href="about:license#hunspell-nl">Dutch Spellchecking Dictionary License</a></li>
-      <li><a href="about:license#edl">Eclipse Distribution License</a></li>
-      <li><a href="about:license#escodegen">Escodegen License</a></li>
       <li><a href="about:license#hunspell-ee">Estonian Spellchecking Dictionary License</a></li>
       <li><a href="about:license#expat">Expat License</a></li>
       <li><a href="about:license#firebug">Firebug License</a></li>
@@ -106,11 +107,9 @@
       <li><a href="about:license#libjingle">libjingle License</a></li>
       <li><a href="about:license#libnestegg">libnestegg License</a></li>
       <li><a href="about:license#libsoundtouch">libsoundtouch License</a></li>
-      <li><a href="about:license#libsrtp">libsrtp License</a></li>
       <li><a href="about:license#libyuv">libyuv License</a></li>
       <li><a href="about:license#hunspell-lt">Lithuanian Spellchecking Dictionary License</a></li>
       <li><a href="about:license#lodash">Lodash License</a></li>
-      <li><a href="about:license#maattachedwindow">MAAttachedWindow License</a></li>
       <li><a href="about:license#myspell">MySpell License</a></li>
       <li><a href="about:license#nicer">nICEr License</a></li>
       <li><a href="about:license#nrappkit">nrappkit License</a></li>
@@ -126,16 +125,13 @@
       <li><a href="about:license#sctp">SCTP Licenses</a></li>
       <li><a href="about:license#skia">Skia License</a></li>
       <li><a href="about:license#snappy">Snappy License</a></li>
-      <li><a href="about:license#sparkle">Sparkle License</a></li>
 #ifdef USE_STLPORT
       <li><a href="about:license#stlport">STLport License</a></li>
 #endif
-      <li><a href="about:license#suitable">Suitable Systems License</a></li>
       <li><a href="about:license#sunsoft">SunSoft License</a></li>
       <li><a href="about:license#superfasthash">SuperFastHash License</a></li>
       <li><a href="about:license#unicode">Unicode License</a></li>
       <li><a href="about:license#ucal">University of California License</a></li>
-      <li><a href="about:license#uszeged">University of Szeged License</a></li>
       <li><a href="about:license#hunspell-en-US">US English Spellchecking Dictionary Licenses</a></li>
       <li><a href="about:license#v8">V8 License</a></li>
       <li><a href="about:license#vtune">VTune License</a></li>
@@ -1348,7 +1344,7 @@
     <h1><a id="ACE"></a>ACE License</h1>
 
     <p>This license applies to the file
-    <span class="path">media/webrtc/trunk/src/system_wrappers/source/condition_variable_win.cc</span>.</p>
+    <span class="path">media/webrtc/trunk/webrtc/system_wrappers/source/condition_variable_event_win.cc</span>.</p>
 
 <pre>
 ACE(TM), TAO(TM), CIAO(TM), DAnCE(TM), and CoSMIC(TM)
@@ -1524,6 +1520,39 @@
 
     <hr>
 
+#ifdef MOZ_INSTALL_TRACKING
+    <h1><a id="adjust"></a>Adjust SDK License</h1>
+
+    <p>This license applies to all files in the directory
+    <span class="path">mobile/android/thirdparty/com/adjust/sdk</span>.</p>
+
+<pre>
+Copyright (c) 2012-2014 adjust GmbH,
+http://www.adjust.com
+
+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.
+</pre>
+
+    <hr>
+
+#endif
     <h1><a id="apache"></a>Apache License 2.0</h1>
 
     <p>This license applies to various files in the Mozilla codebase.</p>
@@ -1713,7 +1742,7 @@
 
     <h1><a id="apple"></a>Apple License</h1>
 
-    <p>This license applies to certain files in the directories <span class="path">js/src/assembler/assembler/</span>, <span class="path">js/src/assembler/wtf/</span>, <span class="path">js/src/yarr</span>, <span class="path">dom/media/webaudio/blink</span>, and <span class="path">widget/cocoa</span>.</p>
+    <p>This license applies to certain files in the directories <span class="path">dom/media/webaudio/blink</span>, and <span class="path">widget/cocoa</span>.</p>
 
 <pre>
 Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
@@ -1782,38 +1811,35 @@
 
     <hr>
 
-    <h1><a id="apple-torch"></a>Apple/Torch Mobile License</h1>
+    <h1><a id="arm"></a>ARM License</h1>
 
-    <p>This license applies to the following files:</p>
-
-    <ul>
-      <li class="path">js/src/assembler/wtf/Assertions.cpp</li>
-      <li class="path">js/src/assembler/wtf/Platform.h</li>
-    </ul>
+    <p>This license applies to files in the directory <span class="path">js/src/jit/arm64/vixl/</span>.</p>
 
 <pre>
-Copyright (C) 2003, 2006, 2007 Apple Inc.  All rights reserved.
-Copyright (C) 2007-2009 Torch Mobile, Inc.
+Copyright 2013, ARM Limited
+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.
+modification, are permitted provided that the following conditions are met:
 
-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
+  * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+  * Neither the name of ARM Limited nor the names of its contributors may be
+    used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
 </pre>
 
@@ -1949,7 +1975,7 @@
       and also some files in the directories
       <span class="path">ipc/chromium/</span>,
       <span class="path">dom/plugins/</span>,
-      <span class="path">tools/profiler/sps/</span>,
+      <span class="path">tools/profiler/</span>,
       <span class="path">gfx/ots/</span>,
       <span class="path">media/openmax_dl/</span>,
       <span class="path">gfx/ycbcr</span> and
@@ -2156,8 +2182,7 @@
 
     <h1><a id="hunspell-nl"></a>Dutch Spellchecking Dictionary License</h1>
 
-    <p>This license applies to certain files in the directory
-      <span class="path">l10n/nl/extensions/spellcheck/hunspell/</span>. (This
+    <p>This license applies to the Dutch Spellchecking Dictionary. (This
       code only ships in some localized versions of this product.)</p>
 
 <pre>
@@ -2196,82 +2221,10 @@
 
     <hr>
 
-    <h1><a id="edl"></a>Eclipse Distribution License</h1>
-
-    <p>This license applies to certain files in the directory
-    <span class="path">browser/devtools/sourceeditor/orion/</span>.</p>
-
-<pre>
-Eclipse Distribution License - v 1.0
-
-Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
-* Neither the name of the Eclipse Foundation, Inc. nor the names of its
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-</pre>
-
-
-    <hr>
-
-    <h1><a id="escodegen"></a>Escodegen License</h1>
-
-    <p>This license applies to all files in
-      <span class="path">toolkit/devtools/escodegen</span>.
-    </p>
-<pre>
-Copyright (C) 2012 Yusuke Suzuki (twitter: @Constellation) and other contributors.
-
-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 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.
-</pre>
-
-
-    <hr>
-
     <h1><a id="hunspell-ee"></a>Estonian Spellchecking Dictionary License</h1>
 
-    <p>This license applies to precursor works to certain files in the directory
-      <span class="path">l10n/ee/extensions/spellcheck/hunspell/</span>. The
+    <p>This license applies to precursor works to certain files which are
+      part of the Estonian Spellchecking Dictionary. The
       shipped versions are under the GNU Lesser General Public License. (This
       code only ships in some localized versions of this product.)</p>
 
@@ -2439,8 +2392,7 @@
     <h1><a id="google-bsd"></a>Google BSD License</h1>
 
     <p>This license applies to files in the directories
-    <span class="path">toolkit/crashreporter/google-breakpad/</span>,
-    <span class="path">camino/google-breakpad/</span> and
+    <span class="path">toolkit/crashreporter/google-breakpad/</span> and
     <span class="path">toolkit/components/protobuf/</span>.</p>
 
 <pre>
@@ -2764,7 +2716,7 @@
     <h1><a id="jpnic"></a>Japan Network Information Center License</h1>
 
     <p>This license applies to certain files in the
-    directory <span class="path">netwerk/dns/src/</span>.</p>
+    directory <span class="path">netwerk/dns/</span>.</p>
 
 <pre>
 Copyright (c) 2001,2002 Japan Network Information Center.
@@ -2854,9 +2806,8 @@
 
     <h1><a id="jquery"></a>jQuery License</h1>
 
-    <p>This license applies to files in the directory
-      <span class="path">mail/jquery/</span>.
-      Furthermore, the file <span class="path">browser/base/content/tabview/iq.js</span>
+    <p>This license applies to all copies of jQuery in the code.
+      Furthermore, the file <span class="path">browser/components/tabview/iq.js</span>
       incorporates work from jQuery.</p>
 
 <pre>
@@ -3020,7 +2971,7 @@
     <h1><a id="libffi"></a>libffi License</h1>
 
     <p>This license applies to files in the directory
-    <span class="path">js/ctypes/libffi/</span>.
+    <span class="path">js/src/ctypes/libffi/</span>.
     </p>
 
 <pre>
@@ -3139,53 +3090,11 @@
 
     <hr>
 
-    <h1><a id="libsrtp"></a>libsrtp License</h1>
-
-    <p>This license applies to files in the directory
-    <span class="path">media/webrtc/trunk/third_party/libsrtp</span>.
-    </p>
-
-<pre>
-Copyright (c) 2001-2006 Cisco Systems, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-  Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-
-  Redistributions in binary form must reproduce the above
-  copyright notice, this list of conditions and the following
-  disclaimer in the documentation and/or other materials provided
-  with the distribution.
-
-  Neither the name of the Cisco Systems, Inc. nor the names of its
-  contributors may be used to endorse or promote products derived
-  from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDERS 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.
-</pre>
-
-    <hr>
-
     <h1><a id="libyuv"></a>libyuv License</h1>
 
     <p>This license applies to files in the directory
-    <span class="path">media/webrtc/trunk/third_party/libyuv</span> except
-    for the file <span class="path">media/webrtc/trunk/third_party/libyuv/source/x86inc.asm</span>.
+    <span class="path">media/libyuv</span> except
+    for the file <span class="path">media/libyuv/source/x86inc.asm</span>.
     </p>
 
 <pre>
@@ -3224,8 +3133,7 @@
 
     <h1><a id="hunspell-lt"></a>Lithuanian Spellchecking Dictionary License</h1>
 
-    <p>This license applies to certain files in the directory
-      <span class="path">l10n/lt/extensions/spellcheck/hunspell/</span>. (This
+    <p>This license applies to the Lithuanian Spellchecking Dictionary. (This
       code only ships in some localized versions of this product.)</p>
 
 <pre>
@@ -3293,55 +3201,6 @@
 
     <hr>
 
-    <h1><a id="maattachedwindow"></a>MAAttachedWindow License</h1>
-
-    <p>This license applies to the files
-    <span class="path">camino/src/extensions/MAAttachedWindow.h</span> and
-    <span class="path">camino/src/extensions/MAAttachedWindow.mm</span>. (This
-    code only ships in the Camino browser or products based on it.)</p>
-
-<pre>
-        This software is supplied to you by Matt Gemmell in consideration of
-your agreement to the following terms, and your use, installation, modification
-or redistribution of this software constitutes acceptance of these terms. If
-you do not agree with these terms, please do not use, install, modify or
-redistribute this software.
-
-        In consideration of your agreement to abide by the following terms, and
-subject to these terms, Matt Gemmell grants you a personal, non-exclusive
-license, to use, reproduce, modify and redistribute the software, with or
-without modifications, in source and/or binary forms; provided that if you
-redistribute the software in its entirety and without modifications, you must
-retain this notice and the following text and disclaimers in all such
-redistributions of the software, and that in all cases attribution of Matt
-Gemmell as the original author of the source code shall be included in all such
-resulting software products or distributions.
-Neither the name, trademarks, service marks or logos of Matt Gemmell may be
-used to endorse or promote products derived from the software without specific
-prior written permission from Matt Gemmell. Except as expressly stated in this
-notice, no other rights or licenses, express or implied, are granted by Matt
-Gemmell herein, including but not limited to any patent rights that may be
-infringed by your derivative works or by other works in which the software may
-be incorporated.
-
-        The software is provided by Matt Gemmell on an "AS IS" basis. MATT
-GEMMELL MAKES NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION
-THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE, REGARDING THE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
-COMBINATION WITH YOUR PRODUCTS.
-
-        IN NO EVENT SHALL MATT GEMMELL BE LIABLE FOR ANY SPECIAL, INDIRECT,
-INCIDENTAL OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION
-AND/OR DISTRIBUTION OF THE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF
-CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
-MATT GEMMELL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-</pre>
-
-
-    <hr>
-
     <h1><a id="myspell"></a>MySpell License</h1>
 
     <p>This license applies to some files in the directory
@@ -3468,9 +3327,7 @@
 
     <p>This license applies to the file
     <span class="path">browser/components/loop/content/shared/libs/sdk.js</span>
-    and the files in
-    <span class="path">browser/components/loop/content/shared/libs/otcdn</span>
-    and its subdirectories.</p>
+    and a couple of others nearby.</p>
 
 <pre>
 Copyright (c) 2014 TokBox, Inc.
@@ -3609,9 +3466,7 @@
    files included in this distribution. it does not apply to any other
    part of ssldump not included in this distribution.</p>
 
-    <p>This license applies to each copy of the file
-  <span class="path">sys/queue.h</span>
-  in <span class="path">media/mtransport/third_party/nrappkit/</span>.</p>
+    <p>This license applies to the file <span class="path">media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h</span>.</p>
 
 <pre>
 Copyright (c) 1991, 1993
@@ -3878,8 +3733,7 @@
 
     <h1><a id="hunspell-ru"></a>Russian Spellchecking Dictionary License</h1>
 
-    <p>This license applies to certain files in the directory
-      <span class="path">l10n/ru/extensions/spellcheck/hunspell/</span>. (This
+    <p>This license applies to the Russian Spellchecking Dictionary. (This
       code only ships in some localized versions of this product.)</p>
 
 <pre>
@@ -4061,35 +3915,6 @@
 
     <hr>
 
-    <h1><a id="sparkle"></a>Sparkle License</h1>
-
-    <p>This license applies to certain files in the directory
-    <span class="path">camino/sparkle/</span>. (This code only ships in the
-    Camino browser or products based on it.)</p>
-
-<pre>
-Copyright (c) 2006 Andy Matuschak
-
-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.
-</pre>
-
-    <hr>
-
 #ifdef USE_STLPORT
     <h1><a id="stlport"></a>STLport License</h1>
 
@@ -4159,59 +3984,6 @@
     <hr>
 
 #endif
-    <h1><a id="suitable"></a>Suitable Systems License</h1>
-
-    <p>This license applies to certain files in the directory
-    <span class="path">dom/system/cocoa/</span>.</p>
-
-<pre>
-SMSLib Sudden Motion Sensor Access Library
-Copyright (c) 2010 Suitable Systems
-All rights reserved.
-
-Developed by: Daniel Griscom
-              Suitable Systems
-              http://www.suitable.com
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal with 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:
-
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimers.
-
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimers in the
-documentation and/or other materials provided with the distribution.
-
-- Neither the names of Suitable Systems nor the names of its
-contributors may be used to endorse or promote products derived from
-this Software without specific prior written permission.
-
-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 CONTRIBUTORS 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 WITH THE SOFTWARE.
-
-For more information about SMSLib, see
-	<http://www.suitable.com/tools/smslib.html>
-or contact
-	Daniel Griscom
-	Suitable Systems
-	1 Centre Street, Suite 204
-	Wakefield, MA 01880
-	(781) 665-0053
-</pre>
-
-
-    <hr>
 
     <h1><a id="sunsoft"></a>SunSoft License</h1>
 
@@ -4380,39 +4152,6 @@
 
     <hr>
 
-    <h1><a id="uszeged"></a>University of Szeged License</h1>
-
-    <p>This license applies to certain files in the directory <span class="path">js/src/assembler/assembler/</span>.</p>
-
-<pre>
-Copyright (C) 2009 University of Szeged
-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 UNIVERSITY OF SZEGED ``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 UNIVERSITY OF SZEGED 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.
-</pre>
-
-
-    <hr>
-
     <h1><a id="hunspell-en-US"></a>US English Spellchecking Dictionary Licenses</h1>
 
     <p>These licenses apply to certain files in the directory
@@ -4513,7 +4252,6 @@
     <h1><a id="v8"></a>V8 License</h1>
 
     <p>This license applies to certain files in the directories
-      <span class="path">js/src/v8-dtoa</span>,
       <span class="path">js/src/irregexp</span>,
       <span class="path">js/src/builtin</span>,
       <span class="path">js/src/jit/arm</span> and
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/browser/browser_content_url_annotation.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/browser/browser_content_url_annotation.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/browser/browser_content_url_annotation.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/browser/browser_content_url_annotation.js	2015-05-25 20:43:47.000000000 +0000
@@ -0,0 +1,139 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+/*global Services, requestLongerTimeout, TestUtils, BrowserTestUtils,
+ ok, info, dump, is, Ci, Cu, Components, ctypes, privateNoteIntentionalCrash,
+ gBrowser, add_task, addEventListener, removeEventListener, ContentTask */
+
+"use strict";
+
+// Running this test in ASAN is slow.
+requestLongerTimeout(2);
+
+/**
+ * Returns a Promise that resolves once a remote <xul:browser> has experienced
+ * a crash. Resolves with the data from the .extra file (the crash annotations).
+ *
+ * @param browser
+ *        The <xul:browser> that will crash
+ * @return Promise
+ */
+function crashBrowser(browser) {
+  let kv = {};
+  Cu.import("resource://gre/modules/KeyValueParser.jsm", kv);
+  // This frame script is injected into the remote browser, and used to
+  // intentionally crash the tab. We crash by using js-ctypes and dereferencing
+  // a bad pointer. The crash should happen immediately upon loading this
+  // frame script.
+  let frame_script = () => {
+    const Cu = Components.utils;
+    Cu.import("resource://gre/modules/ctypes.jsm");
+
+    let dies = function() {
+      privateNoteIntentionalCrash();
+      let zero = new ctypes.intptr_t(8);
+      let badptr = ctypes.cast(zero, ctypes.PointerType(ctypes.int32_t));
+      let crash = badptr.contents;
+    };
+
+    dump("Et tu, Brute?");
+    dies();
+  };
+
+  function checkSubject(subject, data) {
+    return subject instanceof Ci.nsIPropertyBag2 &&
+      subject.hasKey("abnormal");
+  };
+  let crashPromise = TestUtils.topicObserved('ipc:content-shutdown',
+                                             checkSubject);
+  let crashDataPromise = crashPromise.then(([subject, data]) => {
+    ok(subject instanceof Ci.nsIPropertyBag2);
+
+    let dumpID;
+    if ('nsICrashReporter' in Ci) {
+      dumpID = subject.getPropertyAsAString('dumpID');
+      ok(dumpID, "dumpID is present and not an empty string");
+    }
+
+    let extra = null;
+    if (dumpID) {
+      let minidumpDirectory = getMinidumpDirectory();
+      let extrafile = minidumpDirectory.clone();
+      extrafile.append(dumpID + '.extra');
+      ok(extrafile.exists(), 'found .extra file');
+      extra = kv.parseKeyValuePairsFromFile(extrafile);
+      removeFile(minidumpDirectory, dumpID + '.dmp');
+      removeFile(minidumpDirectory, dumpID + '.extra');
+    }
+
+    return extra;
+  });
+
+  // This frame script will crash the remote browser as soon as it is
+  // evaluated.
+  let mm = browser.messageManager;
+  mm.loadFrameScript("data:,(" + frame_script.toString() + ")();", false);
+  return crashDataPromise;
+}
+
+/**
+ * Removes a file from a directory. This is a no-op if the file does not
+ * exist.
+ *
+ * @param directory
+ *        The nsIFile representing the directory to remove from.
+ * @param filename
+ *        A string for the file to remove from the directory.
+ */
+function removeFile(directory, filename) {
+  let file = directory.clone();
+  file.append(filename);
+  if (file.exists()) {
+    file.remove(false);
+  }
+}
+
+/**
+ * Returns the directory where crash dumps are stored.
+ *
+ * @return nsIFile
+ */
+function getMinidumpDirectory() {
+  let dir = Services.dirsvc.get('ProfD', Ci.nsIFile);
+  dir.append("minidumps");
+  return dir;
+}
+
+/**
+ * Checks that the URL is correctly annotated on a content process crash.
+ */
+add_task(function* test_content_url_annotation() {
+  let url = "https://example.com/browser/toolkit/content/tests/browser/file_redirect.html";
+  let redirect_url = "https://example.com/browser/toolkit/content/tests/browser/file_redirect_to.html";
+
+  yield BrowserTestUtils.withNewTab({
+    gBrowser: gBrowser
+  }, function* (browser) {
+    ok(browser.isRemoteBrowser, "Should be a remote browser");
+
+    // file_redirect.html should send us to file_redirect_to.html
+    let promise = ContentTask.spawn(browser, {}, function* () {
+      dump('ContentTask starting...\n');
+      yield new Promise((resolve) => {
+        addEventListener("RedirectDone", function listener() {
+          dump('Got RedirectDone\n');
+          removeEventListener("RedirectDone", listener);
+          resolve();
+        }, true, true);
+      });
+    });
+    browser.loadURI(url);
+    yield promise;
+
+    // Crash the tab
+    let annotations = yield crashBrowser(browser);
+
+    ok("URL" in annotations, "annotated a URL");
+    is(annotations.URL, redirect_url,
+       "Should have annotated the URL after redirect");
+  });
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/browser/browser.ini firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/browser/browser.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/browser/browser.ini	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/browser/browser.ini	2015-05-25 20:43:47.000000000 +0000
@@ -31,3 +31,8 @@
   data/post_form_inner.sjs
   data/post_form_outer.sjs
 skip-if = e10s # Bug ?????? - test directly manipulates content (gBrowser.contentDocument.getElementById("postForm").submit();)
+[browser_content_url_annotation.js]
+skip-if = !e10s || !crashreporter
+support-files =
+  file_redirect.html
+  file_redirect_to.html
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/browser/file_redirect.html firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/browser/file_redirect.html
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/browser/file_redirect.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/browser/file_redirect.html	2015-05-25 20:43:48.000000000 +0000
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>redirecting...</title>
+<script>
+window.addEventListener("load",
+  () => window.location = "file_redirect_to.html");
+</script>
+<body>
+redirectin u bro
+</body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/browser/file_redirect_to.html firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/browser/file_redirect_to.html
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/browser/file_redirect_to.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/browser/file_redirect_to.html	2015-05-25 20:43:48.000000000 +0000
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>redirected!</title>
+<script>
+window.addEventListener("load", () => {
+  var event = new Event("RedirectDone");
+  document.dispatchEvent(event);
+});
+</script>
+<body>
+u got redirected, bro
+</body>
+</html>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/chrome/chrome.ini firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/chrome/chrome.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/chrome/chrome.ini	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/chrome/chrome.ini	2015-05-25 20:43:48.000000000 +0000
@@ -29,6 +29,7 @@
   window_largemenu.xul
   window_panel.xul
   window_popup_anchor.xul
+  window_popup_anchoratrect.xul
   window_popup_attribute.xul
   window_popup_button.xul
   window_popup_preventdefault_chrome.xul
@@ -116,6 +117,7 @@
 skip-if = buildapp == 'mulet'
 [test_menulist_keynav.xul]
 [test_menulist_null_value.xul]
+[test_menulist_paging.xul]
 [test_mousecapture.xul]
 skip-if = buildapp == 'mulet'
 [test_mousescroll.xul]
@@ -126,6 +128,7 @@
 [test_panelfrommenu.xul]
 skip-if = buildapp == 'mulet'
 [test_popup_anchor.xul]
+[test_popup_anchoratrect.xul]
 [test_popup_attribute.xul]
 [test_popup_button.xul]
 [test_popup_coords.xul]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/chrome/test_autocomplete_delayOnPaste.xul firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/chrome/test_autocomplete_delayOnPaste.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/chrome/test_autocomplete_delayOnPaste.xul	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/chrome/test_autocomplete_delayOnPaste.xul	2015-05-25 20:43:48.000000000 +0000
@@ -110,7 +110,7 @@
     gACTimer = Date.now();
     Components.classes["@mozilla.org/widget/clipboardhelper;1"]
       .getService(Components.interfaces.nsIClipboardHelper)
-      .copyStringToClipboard(SEARCH_STRING, Components.interfaces.nsIClipboard.kGlobalClipboard, document);
+      .copyStringToClipboard(SEARCH_STRING, Components.interfaces.nsIClipboard.kGlobalClipboard);
   }, cbCallback, cbCallback);
 }
 ]]>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/chrome/test_bug253481.xul firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/chrome/test_bug253481.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/chrome/test_bug253481.xul	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/chrome/test_bug253481.xul	2015-05-25 20:43:48.000000000 +0000
@@ -69,7 +69,7 @@
 SimpleTest.waitForClipboard(testString, function() {
   var clip = Components.classes["@mozilla.org/widget/clipboardhelper;1"]
                        .getService(Components.interfaces.nsIClipboardHelper);
-  clip.copyString(testString, document);
+  clip.copyString(testString);
 }, function() {
   for (let [item, expected] in Iterator(expectedResults)) {
      testPaste(item, $(item), expected);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/chrome/test_menulist_paging.xul firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/chrome/test_menulist_paging.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/chrome/test_menulist_paging.xul	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/chrome/test_menulist_paging.xul	2015-05-25 20:43:48.000000000 +0000
@@ -0,0 +1,133 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
+
+<window title="Menulist Tests"
+        onload="setTimeout(startTest, 0);"
+        onpopupshown="menulistShown()" onpopuphidden="runTest()"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>      
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>      
+
+<menulist id="menulist1">
+  <menupopup id="menulist-popup1">
+    <menuitem label="One"/>
+    <menuitem label="Two"/>
+    <menuitem label="Three"/>
+    <menuitem label="Four"/>
+    <menuitem label="Five"/>
+    <menuitem label="Six"/>
+    <menuitem label="Seven"/>
+    <menuitem label="Eight"/>
+    <menuitem label="Nine"/>
+    <menuitem label="Ten"/>
+  </menupopup>
+</menulist>
+
+<menulist id="menulist2">
+  <menupopup id="menulist-popup2">
+    <menuitem label="One" disabled="true"/>
+    <menuitem label="Two" selected="true"/>
+    <menuitem label="Three"/>
+    <menuitem label="Four"/>
+    <menuitem label="Five"/>
+    <menuitem label="Six"/>
+    <menuitem label="Seven"/>
+    <menuitem label="Eight"/>
+    <menuitem label="Nine"/>
+    <menuitem label="Ten" disabled="true"/>
+  </menupopup>
+</menulist>
+
+<menulist id="menulist3">
+  <menupopup id="menulist-popup3">
+    <label value="One"/>
+    <menuitem label="Two" selected="true"/>
+    <menuitem label="Three"/>
+    <menuitem label="Four"/>
+    <menuitem label="Five" disabled="true"/>
+    <menuitem label="Six" disabled="true"/>
+    <menuitem label="Seven"/>
+    <menuitem label="Eight"/>
+    <menuitem label="Nine"/>
+    <label value="Ten"/>
+  </menupopup>
+</menulist>
+
+<script class="testbody" type="application/javascript">
+<![CDATA[
+
+SimpleTest.waitForExplicitFinish();
+
+let test;
+
+// Windows allows disabled items to be selected.
+let isWindows = navigator.platform.indexOf("Win") >= 0;
+
+let tests = [
+  { list: "menulist1", initial: 0, downs: [3, 6, 9, 9],
+                                   ups: [6, 3, 0, 0] },
+  { list: "menulist2", initial: 1, downs: [4, 7, isWindows ? 9 : 8, isWindows ? 9 : 8],
+                                   ups: [isWindows ? 6 : 5, isWindows ? 3 : 2, isWindows ? 0 : 1] },
+  { list: "menulist3", initial: 1, downs: [isWindows ? 4 : 6, isWindows ? 7 : 8, 8],
+                                   ups: [isWindows ? 5 : 3, isWindows ? 2 : 1, 1] }
+];
+
+function startTest()
+{
+  let popup = document.getElementById("menulist-popup1");
+  let menupopupHeight = popup.getBoundingClientRect().height;
+  let menuitemHeight = popup.firstChild.getBoundingClientRect().height;
+
+  // First, set the height of each popup to the height of four menuitems plus
+  // any padding and border on the menupopup.
+  let height = menuitemHeight * 4 + (menupopupHeight - menuitemHeight * 10);
+  popup.height = height;
+  document.getElementById("menulist-popup2").height = height;
+  document.getElementById("menulist-popup3").height = height;
+
+  runTest();
+}
+
+function runTest()
+{
+  if (!tests.length) {
+    SimpleTest.finish();
+    return;
+  }
+
+  test = tests.shift();
+  document.getElementById(test.list).open = true;
+}
+
+function menulistShown()
+{
+  let menulist = document.getElementById(test.list);
+  is(menulist.menuBoxObject.activeChild.label, menulist.getItemAtIndex(test.initial).label, test.list + " initial selection");
+
+  for (let i = 0; i < test.downs.length; i++) {
+    sendKey("PAGE_DOWN");
+    is(menulist.menuBoxObject.activeChild.label, menulist.getItemAtIndex(test.downs[i]).label, test.list + " page down " + i);
+  }
+
+  for (let i = 0; i < test.ups.length; i++) {
+    sendKey("PAGE_UP");
+    is(menulist.menuBoxObject.activeChild.label, menulist.getItemAtIndex(test.ups[i]).label, test.list + " page up " + i);
+  }
+
+  menulist.open = false;
+}
+]]>
+</script>
+
+<body xmlns="http://www.w3.org/1999/xhtml">
+<p id="display">
+</p>
+<div id="content" style="display: none">
+</div>
+<pre id="test">
+</pre>
+</body>
+
+</window>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/chrome/test_notificationbox.xul firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/chrome/test_notificationbox.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/chrome/test_notificationbox.xul	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/chrome/test_notificationbox.xul	2015-05-25 20:43:48.000000000 +0000
@@ -39,10 +39,10 @@
 {
   testtag_notificationbox_State(nb, "initial", null, 0);
 
-  SimpleTest.ise(nb.notificationsHidden, false, "initial notificationsHidden");
-  SimpleTest.ise(nb.removeAllNotifications(false), undefined, "initial removeAllNotifications");
+  SimpleTest.is(nb.notificationsHidden, false, "initial notificationsHidden");
+  SimpleTest.is(nb.removeAllNotifications(false), undefined, "initial removeAllNotifications");
   testtag_notificationbox_State(nb, "initial removeAllNotifications", null, 0);
-  SimpleTest.ise(nb.removeAllNotifications(true), undefined, "initial removeAllNotifications immediate");
+  SimpleTest.is(nb.removeAllNotifications(true), undefined, "initial removeAllNotifications immediate");
   testtag_notificationbox_State(nb, "initial removeAllNotifications immediate", null, 0);
 
   runTimedTests(tests, -1, nb, null);
@@ -73,7 +73,7 @@
       // append a new notification
       var ntf = nb.appendNotification("Notification", "note", "happy.png",
                                       nb.PRIORITY_INFO_LOW, testtag_notificationbox_buttons);
-      SimpleTest.ise(ntf && ntf.localName == "notification", true, "append notification");
+      SimpleTest.is(ntf && ntf.localName == "notification", true, "append notification");
       return ntf;
     },
     result: function(nb, ntf) {
@@ -83,10 +83,10 @@
 
       // check the getNotificationWithValue method
       var ntf_found = nb.getNotificationWithValue("note");
-      SimpleTest.ise(ntf, ntf_found, "getNotificationWithValue note");
+      SimpleTest.is(ntf, ntf_found, "getNotificationWithValue note");
 
       var none_found = nb.getNotificationWithValue("notenone");
-      SimpleTest.ise(none_found, null, "getNotificationWithValue null");
+      SimpleTest.is(none_found, null, "getNotificationWithValue null");
       return ntf;
     }
   },
@@ -104,7 +104,7 @@
       try {
         nb.removeNotification(ntf);
       } catch (ex) { exh = true; }
-      SimpleTest.ise(exh, true, "removeNotification again");
+      SimpleTest.is(exh, true, "removeNotification again");
       testtag_notificationbox_State(nb, "removeNotification again", null, 0);
 
     }
@@ -116,7 +116,7 @@
                                       nb.PRIORITY_INFO_LOW,
                                       testtag_notificationbox_buttons,
                                       notification_eventCallback);
-      SimpleTest.ise(ntf && ntf.localName == "notification", true, "append notification with callback");
+      SimpleTest.is(ntf && ntf.localName == "notification", true, "append notification with callback");
       return ntf;
     },
     result: function(nb, ntf) {
@@ -162,12 +162,12 @@
       testtag_notification_State(nb, ntf, "append", "Notification", "note",
                                  "happy.png", nb.PRIORITY_WARNING_LOW);
       var button = ntf.querySelector(".notification-button");
-      SimpleTest.ise(button.type, "menu-button", "Button type should be set");
+      SimpleTest.is(button.type, "menu-button", "Button type should be set");
       var menuPopup = button.getElementsByTagNameNS(NSXUL, "menupopup");
-      SimpleTest.ise(menuPopup.length, 1, "There should be a menu attached");
+      SimpleTest.is(menuPopup.length, 1, "There should be a menu attached");
       var menuItem = menuPopup[0].firstChild;
-      SimpleTest.ise(menuItem.localName, "menuitem", "There should be a menu item");
-      SimpleTest.ise(menuItem.getAttribute("label"), "Menu Item", "Label should match");
+      SimpleTest.is(menuItem.localName, "menuitem", "There should be a menu item");
+      SimpleTest.is(menuItem.getAttribute("label"), "Menu Item", "Label should match");
       // Clean up.
       nb.removeNotification(ntf);
 
@@ -184,7 +184,7 @@
           // append a new notification
           ntf = nb.appendNotification("Notification", "note", "happy.png",
                             nb.PRIORITY_INFO_LOW, testtag_notificationbox_buttons);
-          SimpleTest.ise(ntf && ntf.localName == "notification", true, "append notification");
+          SimpleTest.is(ntf && ntf.localName == "notification", true, "append notification");
 
           // Test persistence
           ntf.persistence++;
@@ -205,14 +205,14 @@
           testtag_notificationbox_State(nb, "notification added", ntf, 1);
           testtag_notification_State(nb, ntf, "append", "Notification", "note",
                                      "happy.png", nb.PRIORITY_INFO_LOW);
-          SimpleTest.ise(ntf.persistence, 1, "persistence is 1");
+          SimpleTest.is(ntf.persistence, 1, "persistence is 1");
 
           return [++idx, ntf];
         case 2:
           testtag_notificationbox_State(nb, "first removeTransientNotifications", ntf, 1);
           testtag_notification_State(nb, ntf, "append", "Notification", "note",
                                      "happy.png", nb.PRIORITY_INFO_LOW);
-          SimpleTest.ise(ntf.persistence, 0, "persistence is now 0");
+          SimpleTest.is(ntf.persistence, 0, "persistence is now 0");
 
           return [++idx, ntf];
         case 3:
@@ -227,7 +227,7 @@
       // append another notification
       var ntf = nb.appendNotification("Notification", "note", "happy.png",
                                       nb.PRIORITY_INFO_MEDIUM, testtag_notificationbox_buttons);
-      SimpleTest.ise(ntf && ntf.localName == "notification", true, "append notification again");
+      SimpleTest.is(ntf && ntf.localName == "notification", true, "append notification again");
       return ntf;
     },
     result: function(nb, ntf) {
@@ -257,9 +257,9 @@
     result: function(nb, ntf) {
       // test the removeAllNotifications method
       testtag_notificationbox_State(nb, "append info_high", ntf, 1);
-      SimpleTest.ise(ntf.priority, nb.PRIORITY_INFO_HIGH,
+      SimpleTest.is(ntf.priority, nb.PRIORITY_INFO_HIGH,
                     "notification.priority " + nb.PRIORITY_INFO_HIGH);
-      SimpleTest.ise(nb.removeAllNotifications(false), undefined, "removeAllNotifications");
+      SimpleTest.is(nb.removeAllNotifications(false), undefined, "removeAllNotifications");
     }
   },
   {
@@ -278,7 +278,7 @@
       return ntf;
     },
     result: function(nb, ntf) {
-      SimpleTest.ise(nb.currentNotification == ntf ?
+      SimpleTest.is(nb.currentNotification == ntf ?
                     nb.currentNotification.value : null, "10", "appendNotification order");
       return 1;
     }
@@ -310,8 +310,8 @@
     },
     result: function(nb, arr) {
       // arr is [testindex, expectedvalue]
-      SimpleTest.ise(nb.currentNotification.value, "" + arr[1], "close order " + arr[0]);
-      SimpleTest.ise(nb.allNotifications.length, 10 - arr[0], "close order " + arr[0] + " count");
+      SimpleTest.is(nb.currentNotification.value, "" + arr[1], "close order " + arr[0]);
+      SimpleTest.is(nb.allNotifications.length, 10 - arr[0], "close order " + arr[0] + " count");
       if (arr[0] == 6)
         this.repeat = false;
       return ++arr[0];
@@ -323,13 +323,13 @@
       try {
         nb.appendNotification("no", "no", "no", 0, null);
       } catch (ex) { exh = true; }
-      SimpleTest.ise(exh, true, "appendNotification priority too low");
+      SimpleTest.is(exh, true, "appendNotification priority too low");
 
       exh = false;
       try {
         nb.appendNotification("no", "no", "no", 11, null);
       } catch (ex) { exh = true; }
-      SimpleTest.ise(exh, true, "appendNotification priority too high");
+      SimpleTest.is(exh, true, "appendNotification priority too high");
 
       // check that the other priority types work properly
       runTimedTests(appendPriorityTests, -1, nb, nb.PRIORITY_WARNING_LOW);
@@ -342,11 +342,11 @@
     test: function(nb, priority) {
       var ntf = nb.appendNotification("Notification", "note", "happy.png",
                                       priority, testtag_notificationbox_buttons);
-      SimpleTest.ise(ntf && ntf.localName == "notification", true, "append notification " + priority);
+      SimpleTest.is(ntf && ntf.localName == "notification", true, "append notification " + priority);
       return [ntf, priority];
     },
     result: function(nb, obj) {
-      SimpleTest.ise(obj[0].priority, obj[1], "notification.priority " + obj[1]);
+      SimpleTest.is(obj[0].priority, obj[1], "notification.priority " + obj[1]);
       return obj[1];
     }
   },
@@ -370,18 +370,18 @@
 
 function testtag_notificationbox_State(nb, testid, expecteditem, expectedcount)
 {
-  SimpleTest.ise(nb.currentNotification, expecteditem, testid + " currentNotification");
-  SimpleTest.ise(nb.allNotifications ? nb.allNotifications.length : "no value",
+  SimpleTest.is(nb.currentNotification, expecteditem, testid + " currentNotification");
+  SimpleTest.is(nb.allNotifications ? nb.allNotifications.length : "no value",
                 expectedcount, testid + " allNotifications");
 }
 
 function testtag_notification_State(nb, ntf, testid, label, value, image, priority)
 {
-  SimpleTest.ise(ntf.control, nb, testid + " notification.control");
-  SimpleTest.ise(ntf.label, label, testid + " notification.label");
-  SimpleTest.ise(ntf.value, value, testid + " notification.value");
-  SimpleTest.ise(ntf.image, image, testid + " notification.image");
-  SimpleTest.ise(ntf.priority, priority, testid + " notification.priority");
+  SimpleTest.is(ntf.control, nb, testid + " notification.control");
+  SimpleTest.is(ntf.label, label, testid + " notification.label");
+  SimpleTest.is(ntf.value, value, testid + " notification.value");
+  SimpleTest.is(ntf.image, image, testid + " notification.image");
+  SimpleTest.is(ntf.priority, priority, testid + " notification.priority");
 
   var type;
   switch (priority) {
@@ -403,7 +403,7 @@
       break;
   }
 
-  SimpleTest.ise(ntf.type, type, testid + " notification.type");
+  SimpleTest.is(ntf.type, type, testid + " notification.type");
 }
 
 function checkPopupTest(nb, ntf)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/chrome/test_popup_anchoratrect.xul firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/chrome/test_popup_anchoratrect.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/chrome/test_popup_anchoratrect.xul	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/chrome/test_popup_anchoratrect.xul	2015-05-25 20:43:48.000000000 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
+
+<window title="Menu Button Popup Tests"
+  onload="setTimeout(runTest, 0);"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>      
+
+<script>
+SimpleTest.waitForExplicitFinish();
+function runTest()
+{
+  window.open("window_popup_anchoratrect.xul", "_blank", "chrome,width=200,height=200");
+}
+</script>
+
+<body xmlns="http://www.w3.org/1999/xhtml">
+<p id="display">
+</p>
+<div id="content" style="display: none">
+</div>
+<pre id="test">
+</pre>
+</body>
+
+</window>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/chrome/test_progressmeter.xul firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/chrome/test_progressmeter.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/chrome/test_progressmeter.xul	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/chrome/test_progressmeter.xul	2015-05-25 20:43:48.000000000 +0000
@@ -23,27 +23,27 @@
   var n1 = document.getElementById("n1");
   var n2 = document.getElementById("n2");
 
-  SimpleTest.ise(n1.mode, "", "mode determined");
-  SimpleTest.ise(n2.mode, "undetermined", "mode undetermined");
+  SimpleTest.is(n1.mode, "", "mode determined");
+  SimpleTest.is(n2.mode, "undetermined", "mode undetermined");
 
-  SimpleTest.ise(n1.value, "0", "determined value");
-  SimpleTest.ise(n2.value, "0", "undetermined value");
+  SimpleTest.is(n1.value, "0", "determined value");
+  SimpleTest.is(n2.value, "0", "undetermined value");
 
   // values can only be incremented in multiples of 4
   n1.value = 2;
-  SimpleTest.ise(n1.value, "0", "determined value set 2");
+  SimpleTest.is(n1.value, "0", "determined value set 2");
   n1.value = -1;
-  SimpleTest.ise(n1.value, "0", "determined value set -1");
+  SimpleTest.is(n1.value, "0", "determined value set -1");
   n1.value = 125;
-  SimpleTest.ise(n1.value, "100", "determined value set 125");
+  SimpleTest.is(n1.value, "100", "determined value set 125");
   n1.value = 7;
-  SimpleTest.ise(n1.value, "7", "determined value set 7");
+  SimpleTest.is(n1.value, "7", "determined value set 7");
   n1.value = "17";
-  SimpleTest.ise(n1.value, "17", "determined value set 17 string");
+  SimpleTest.is(n1.value, "17", "determined value set 17 string");
   n1.value = 18;
-  SimpleTest.ise(n1.value, "17", "determined value set 18");
+  SimpleTest.is(n1.value, "17", "determined value set 18");
   n1.value = "Cat";
-  SimpleTest.ise(n1.value, "17", "determined value set invalid");
+  SimpleTest.is(n1.value, "17", "determined value set invalid");
 
   n1.max = 200;
   is(n1.max, "200", "max changed");
@@ -52,19 +52,19 @@
   is(n1.value, "120", "max lowered below value");
 
   n2.value = 2;
-  SimpleTest.ise(n2.value, "0", "undetermined value set 2");
+  SimpleTest.is(n2.value, "0", "undetermined value set 2");
   n2.value = -1;
-  SimpleTest.ise(n2.value, "0", "undetermined value set -1");
+  SimpleTest.is(n2.value, "0", "undetermined value set -1");
   n2.value = 125;
-  SimpleTest.ise(n2.value, "100", "undetermined value set 125");
+  SimpleTest.is(n2.value, "100", "undetermined value set 125");
   n2.value = 7;
-  SimpleTest.ise(n2.value, "7", "undetermined value set 7");
+  SimpleTest.is(n2.value, "7", "undetermined value set 7");
   n2.value = "17";
-  SimpleTest.ise(n2.value, "17", "undetermined value set 17 string");
+  SimpleTest.is(n2.value, "17", "undetermined value set 17 string");
   n2.value = 18;
-  SimpleTest.ise(n2.value, "17", "undetermined value set 18");
+  SimpleTest.is(n2.value, "17", "undetermined value set 18");
   n2.value = "Cat";
-  SimpleTest.ise(n2.value, "17", "determined value set invalid");
+  SimpleTest.is(n2.value, "17", "determined value set invalid");
 
   SimpleTest.finish();
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/chrome/test_textbox_number.xul firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/chrome/test_textbox_number.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/chrome/test_textbox_number.xul	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/chrome/test_textbox_number.xul	2015-05-25 20:43:48.000000000 +0000
@@ -61,14 +61,14 @@
   ok(n1.spinButtons != null && n1.spinButtons.localName == "spinbuttons", "spinButtons set");
   isnot(n1.decimalSymbol, "", "n1.decimalSymbol is set to something");
   n1.decimalSymbol = ".";
-  SimpleTest.ise(n1.decimalSymbol, ".", "n1.decimalSymbol set to '.'");
-  SimpleTest.ise(n1.wrapAround, false, "wrapAround defaults to false");
-  SimpleTest.ise(n1.increment, 1, "increment defaults to 1");
-  SimpleTest.ise(n1.decimalPlaces, 0, "decimalPlaces defaults to 0");
-
-  SimpleTest.ise(n2.wrapAround, true, "wrapAround when set to true");
-  SimpleTest.ise(n3.increment, 3, "increment when set to 1");
-  SimpleTest.ise(n7.decimalPlaces, 2, "decimalPlaces when set to 2");
+  SimpleTest.is(n1.decimalSymbol, ".", "n1.decimalSymbol set to '.'");
+  SimpleTest.is(n1.wrapAround, false, "wrapAround defaults to false");
+  SimpleTest.is(n1.increment, 1, "increment defaults to 1");
+  SimpleTest.is(n1.decimalPlaces, 0, "decimalPlaces defaults to 0");
+
+  SimpleTest.is(n2.wrapAround, true, "wrapAround when set to true");
+  SimpleTest.is(n3.increment, 3, "increment when set to 1");
+  SimpleTest.is(n7.decimalPlaces, 2, "decimalPlaces when set to 2");
 
   // test changing the value
   n1.value = "1700";
@@ -139,7 +139,7 @@
   n7.min = 2.7;
   n7.value = 10.1;
   n7.increment = 4.3;
-  SimpleTest.ise(n7.increment, 4.3, "increment changed");
+  SimpleTest.is(n7.increment, 4.3, "increment changed");
   testIncreaseDecrease(n7, "integer with increment", 4.3, 2, 2.7, 10.1);
 
   n2.value = n2.min;
@@ -149,7 +149,7 @@
   testVals(n2, "integer wraparound decrease method", n2.min);
 
   n7.wrapAround = true;
-  SimpleTest.ise(n7.wrapAround, true, "change wrapAround");
+  SimpleTest.is(n7.wrapAround, true, "change wrapAround");
   n7.value = n7.min + 0.01;
   n7.decrease();
   testVals(n7, "decimal wraparound decrease method", n7.max, n7.max.toFixed(2));
@@ -168,12 +168,12 @@
   testVals(n1, "set decimalPlaces Infinity set value,", 10.678123);
 
   n1.decimalSymbol = ",";
-  SimpleTest.ise(n1.decimalSymbol, ",", "n1.decimalSymbol set to ','");
+  SimpleTest.is(n1.decimalSymbol, ",", "n1.decimalSymbol set to ','");
   n1.value = "9.67";
   testVals(n1, "set decimalPlaces set value,", 9.67);
 
   n1.decimalSymbol = ".";
-  SimpleTest.ise(n1.decimalSymbol, ".", "n1.decimalSymbol set back to '.'");
+  SimpleTest.is(n1.decimalSymbol, ".", "n1.decimalSymbol set back to '.'");
   n1.decimalPlaces = 0;
 
   // UI tests
@@ -285,19 +285,19 @@
   if (valueFieldNumber === undefined)
     valueFieldNumber = "" + valueNumber;
 
-  SimpleTest.ise(nb.value, "" + valueNumber, name + " value is '" + valueNumber + "'");
-  SimpleTest.ise(nb.valueNumber, valueNumber, name + " valueNumber is " + valueNumber);
+  SimpleTest.is(nb.value, "" + valueNumber, name + " value is '" + valueNumber + "'");
+  SimpleTest.is(nb.valueNumber, valueNumber, name + " valueNumber is " + valueNumber);
 
   // This value format depends on the localized decimal symbol.
   var localizedValue = valueFieldNumber.replace(/\./, nb.decimalSymbol);
-  SimpleTest.ise(nb.inputField.value, localizedValue,
+  SimpleTest.is(nb.inputField.value, localizedValue,
       name + " inputField value is '" + localizedValue + "'");
 }
 
 function testValsMinMax(nb, name, valueNumber, min, max, valueFieldNumber) {
   testVals(nb, name, valueNumber, valueFieldNumber);
-  SimpleTest.ise(nb.min, min, name + " min is " + min);
-  SimpleTest.ise(nb.max, max, name + " max is " + max);
+  SimpleTest.is(nb.min, min, name + " min is " + min);
+  SimpleTest.is(nb.max, max, name + " max is " + max);
 }
 
 function testIncreaseDecrease(nb, testid, increment, fixedCount, min, max)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/chrome/window_popup_anchoratrect.xul firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/chrome/window_popup_anchoratrect.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/tests/chrome/window_popup_anchoratrect.xul	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/tests/chrome/window_popup_anchoratrect.xul	2015-05-25 20:43:48.000000000 +0000
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onpopupshown="popupshown(event.target)" onpopuphidden="nextTest()">
+
+<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>      
+
+<label value="Popup Test"/>
+
+<menupopup id="popup">
+  <menuitem label="One"/>
+  <menuitem label="Two"/>
+</menupopup>
+
+<panel id="panel" noautohide="true" height="20">
+  <label value="OK"/>
+</panel>
+
+<script>
+<![CDATA[
+
+let menupopup;
+
+let tests = [
+  {
+    test: () => menupopup.openPopupAtScreenRect("after_start", 150, 250, 30, 40),
+    verify: popup => {
+      let rect = popup.getOuterScreenRect();
+      is(rect.left, 150, "popup at screen position x");
+      is(rect.top, 290, "popup at screen position y");
+    }
+  },
+  {
+    test: () => menupopup.openPopupAtScreenRect("after_start", 150, 350, 30, 9000),
+    verify: popup => {
+      let rect = popup.getOuterScreenRect();
+      is(rect.left, 150, "flipped popup at screen position x");
+      is(rect.bottom, 350, "flipped popup at screen position y");
+    }
+  },
+  {
+    test: () => menupopup.openPopupAtScreenRect("end_before", 150, 250, 30, 40),
+    verify: popup => {
+      let rect = popup.getOuterScreenRect();
+      is(rect.left, 180, "popup at end_before screen position x");
+      is(rect.top, 250, "popup at end_before screen position y");
+    }
+  },
+  {
+    test: () => $("panel").openPopupAtScreenRect("after_start", 150, 250, 30, 40),
+    verify: popup => {
+      let rect = popup.getOuterScreenRect();
+      is(rect.left, 150, "panel at screen position x");
+      is(rect.top, 290, "panel at screen position y");
+    }
+  },
+  {
+    test: () => $("panel").openPopupAtScreenRect("before_start", 150, 250, 30, 40),
+    verify: popup => {
+      let rect = popup.getOuterScreenRect();
+      is(rect.left, 150, "panel at before_start screen position x");
+      is(rect.bottom, 250, "panel at before_start screen position y");
+    }
+  },
+];
+
+function runTest(id)
+{
+  menupopup = $("popup");
+  nextTest();
+}
+
+function nextTest()
+{
+  if (!tests.length) {
+    window.close();
+    window.opener.SimpleTest.finish();
+    return;
+  }
+
+  tests[0].test();
+}
+
+function popupshown(popup)
+{
+  tests[0].verify(popup);
+  tests.shift();
+  popup.hidePopup();
+}
+
+function is(left, right, message)
+{
+  window.opener.SimpleTest.is(left, right, message);
+}
+
+function ok(value, message)
+{
+  window.opener.SimpleTest.ok(value, message);
+}
+
+window.opener.wrappedJSObject.SimpleTest.waitForFocus(runTest, window);
+
+]]>
+</script>
+
+<body xmlns="http://www.w3.org/1999/xhtml">
+<p id="display">
+</p>
+<div id="content" style="display: none">
+</div>
+<pre id="test">
+</pre>
+</body>
+
+</window>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/widgets/autocomplete.xml firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/widgets/autocomplete.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/widgets/autocomplete.xml	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/widgets/autocomplete.xml	2015-05-25 20:43:48.000000000 +0000
@@ -485,7 +485,7 @@
             case KeyEvent.DOM_VK_BACK_SPACE:
               if (aEvent.shiftKey)
 #endif
-              cancel = this.mController.handleDelete();
+              cancel = this.handleDelete();
               break;
             case KeyEvent.DOM_VK_DOWN:
             case KeyEvent.DOM_VK_UP:
@@ -514,6 +514,12 @@
         ]]></body>
       </method>
 
+      <method name="handleDelete">
+        <body><![CDATA[
+          return this.mController.handleDelete();
+        ]]></body>
+      </method>
+
       <!-- ::::::::::::: miscellaneous ::::::::::::: -->
 
       <method name="initSearchNames">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/widgets/browser.xml firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/widgets/browser.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/widgets/browser.xml	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/widgets/browser.xml	2015-05-25 20:43:48.000000000 +0000
@@ -503,6 +503,12 @@
         ]]></getter>
       </property>
 
+      <property name="hasContentOpener">
+        <getter><![CDATA[
+          return !!this.contentWindow.opener;
+        ]]></getter>
+      </property>
+
       <field name="mPrefs" readonly="true">
         Components.classes['@mozilla.org/preferences-service;1']
                   .getService(Components.interfaces.nsIPrefBranch);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/widgets/notification.xml firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/widgets/notification.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/widgets/notification.xml	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/widgets/notification.xml	2015-05-25 20:43:48.000000000 +0000
@@ -475,12 +475,12 @@
         <xul:image class="popup-notification-icon"
                    xbl:inherits="popupid,src=icon"/>
       </xul:vbox>
-      <xul:vbox>
+      <xul:vbox class="popup-notification-body" xbl:inherits="popupid">
         <xul:hbox align="start">
           <xul:vbox flex="1">
-            <xul:label class="popup-notification-originHost header"
-                       xbl:inherits="value=originhost"
-                       crop="end"/>
+            <xul:label class="popup-notification-origin header"
+                       xbl:inherits="value=origin,tooltiptext=origin"
+                       crop="center"/>
             <xul:description class="popup-notification-description"
                              xbl:inherits="xbl:text=label,popupid"/>
           </xul:vbox>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/widgets/popup.xml firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/widgets/popup.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/widgets/popup.xml	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/widgets/popup.xml	2015-05-25 20:43:48.000000000 +0000
@@ -69,7 +69,28 @@
         ]]>
         </body>
       </method>
-      
+
+      <method name="openPopupAtScreenRect">
+        <parameter name="aPosition"/>
+        <parameter name="aX"/>
+        <parameter name="aY"/>
+        <parameter name="aWidth"/>
+        <parameter name="aHeight"/>
+        <parameter name="aIsContextMenu"/>
+        <parameter name="aAttributesOverride"/>
+        <parameter name="aTriggerEvent"/>
+        <body>
+        <![CDATA[
+          try {
+            var popupBox = this.popupBoxObject;
+            if (popupBox)
+              popupBox.openPopupAtScreenRect(aPosition, aX, aY, aWidth, aHeight,
+                                             aIsContextMenu, aAttributesOverride, aTriggerEvent);
+          } catch(e) {}
+        ]]>
+        </body>
+      </method>
+
       <method name="showPopup">
         <parameter name="element"/>
         <parameter name="xpos"/>
@@ -94,7 +115,7 @@
         ]]>
         </body>
       </method>
-      
+
       <method name="hidePopup">
         <parameter name="cancel"/>
         <body>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/widgets/preferences.xml firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/widgets/preferences.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/widgets/preferences.xml	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/widgets/preferences.xml	2015-05-25 20:43:48.000000000 +0000
@@ -1183,6 +1183,10 @@
         <body>
         <![CDATA[
           // Write all values to preferences.
+          if (this._deferredValueUpdateElements.size) {
+            this._finalizeDeferredElements();
+          }
+
           var preferences = this.preferences;
           for (var i = 0; i < preferences.length; ++i) {
             var preference = preferences[i];
@@ -1259,15 +1263,57 @@
         </body>
       </method>
       
+      <field name="DeferredTask" readonly="true">
+        let targetObj = {};
+        Components.utils.import("resource://gre/modules/DeferredTask.jsm", targetObj);
+        targetObj.DeferredTask;
+      </field>
+      <method name="_deferredValueUpdate">
+        <parameter name="aElement"/>
+        <body>
+        <![CDATA[
+          delete aElement._deferredValueUpdateTask;
+          let preference = document.getElementById(aElement.getAttribute("preference"));
+          let prefVal = preference.getElementValue(aElement);
+          preference.value = prefVal;
+          this._deferredValueUpdateElements.delete(aElement);
+        ]]>
+        </body>
+      </method>
+      <field name="_deferredValueUpdateElements">
+        new Set();
+      </field>
+      <method name="_finalizeDeferredElements">
+        <body>
+        <![CDATA[
+          for (let el of this._deferredValueUpdateElements) {
+            if (el._deferredValueUpdateTask) {
+              el._deferredValueUpdateTask.finalize();
+            }
+          }
+        ]]>
+        </body>
+      </method>
       <method name="userChangedValue">
         <parameter name="aElement"/>
         <body>
         <![CDATA[
-          var element = this.getPreferenceElement(aElement);
+          let element = this.getPreferenceElement(aElement);
           if (element.hasAttribute("preference")) {
-            var preference = document.getElementById(element.getAttribute("preference"));
-            var prefVal = preference.getElementValue(element);
-            preference.value = prefVal;
+            if (element.getAttribute("delayprefsave") != "true") {
+              var preference = document.getElementById(element.getAttribute("preference"));
+              var prefVal = preference.getElementValue(element);
+              preference.value = prefVal;
+            } else {
+              if (!element._deferredValueUpdateTask) {
+                element._deferredValueUpdateTask = new this.DeferredTask(this._deferredValueUpdate.bind(this, element), 1000);
+                this._deferredValueUpdateElements.add(element);
+              } else {
+                // Each time the preference is changed, restart the delay.
+                element._deferredValueUpdateTask.disarm();
+                element._deferredValueUpdateTask.arm();
+              }
+            }
           }
         ]]>
         </body>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/widgets/remote-browser.xml firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/widgets/remote-browser.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/widgets/remote-browser.xml	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/widgets/remote-browser.xml	2015-05-25 20:43:48.000000000 +0000
@@ -198,6 +198,13 @@
         ]]></getter>
       </property>
 
+      <property name="hasContentOpener">
+        <getter><![CDATA[
+          let {frameLoader} = this.QueryInterface(Ci.nsIFrameLoaderOwner);
+          return frameLoader.tabParent.hasContentOpener;
+        ]]></getter>
+      </property>
+
       <field name="_outerWindowID">null</field>
       <property name="outerWindowID"
                 onget="return this._outerWindowID"
@@ -256,8 +263,6 @@
           let RemoteController = Components.utils.import(jsm, {}).RemoteController;
           this._controller = new RemoteController(this);
           this.controllers.appendController(this._controller);
-
-          Services.obs.addObserver(this, "ask-children-to-exit-fullscreen", false);
         ]]>
       </constructor>
 
@@ -276,8 +281,6 @@
           this.mDestroyed = true;
 
           this.controllers.removeController(this._controller);
-
-          Services.obs.removeObserver(this, "ask-children-to-exit-fullscreen");
         ]]></body>
       </method>
 
@@ -362,19 +365,6 @@
           }
         ]]></body>
       </method>
-
-      <method name="observe">
-        <parameter name="aSubject"/>
-        <parameter name="aTopic"/>
-        <parameter name="aData"/>
-        <body><![CDATA[
-          if (aTopic == "ask-children-to-exit-fullscreen") {
-            if (aSubject == window.document) {
-              this.messageManager.sendAsyncMessage("DOMFullscreen:ChildrenMustExit");
-            }
-          }
-        ]]></body>
-      </method>
 
       <method name="enableDisableCommands">
         <parameter name="aAction"/>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/widgets/toolbarbutton.xml firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/widgets/toolbarbutton.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/widgets/toolbarbutton.xml	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/widgets/toolbarbutton.xml	2015-05-25 20:43:49.000000000 +0000
@@ -67,7 +67,7 @@
       <children includes="observes|template|menupopup|panel|tooltip"/>
       <xul:toolbarbutton class="box-inherit toolbarbutton-menubutton-button"
                          anonid="button" flex="1" allowevents="true"
-                         xbl:inherits="disabled,crop,image,label,accesskey,command,wrap,
+                         xbl:inherits="disabled,crop,image,label,accesskey,command,wrap,badge,
                                        align,dir,pack,orient,tooltiptext=buttontooltiptext"/>
       <xul:dropmarker type="menu-button" class="toolbarbutton-menubutton-dropmarker"
                       anonid="dropmarker" xbl:inherits="align,dir,pack,orient,disabled,label,open"/>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/xul.css firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/xul.css
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/content/xul.css	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/content/xul.css	2015-05-25 20:43:49.000000000 +0000
@@ -129,6 +129,15 @@
   -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton");
 }
 
+toolbarbutton.badged-button > toolbarbutton,
+toolbarbutton.badged-button {
+  -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton-badged");
+}
+
+.toolbarbutton-badge[badge]:not([badge=""])::after {
+  content: attr(badge);
+}
+
 toolbarbutton[type="menu"],
 toolbarbutton[type="panel"] {
   -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu");
@@ -138,14 +147,6 @@
   -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu-button");
 }
 
-toolbarbutton.badged-button {
-  -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton-badged");
-}
-
-toolbarbutton.badged-button .toolbarbutton-badge[badge]:not([badge=""])::after {
-  content: attr(badge);
-}
-
 toolbar[mode="icons"] .toolbarbutton-text,
 toolbar[mode="icons"] .toolbarbutton-multiline-text,
 toolbar[mode="text"] .toolbarbutton-icon {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/crashreporter/client/crashreporter_osx.mm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/crashreporter/client/crashreporter_osx.mm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/crashreporter/client/crashreporter_osx.mm	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/crashreporter/client/crashreporter_osx.mm	2015-05-25 20:43:49.000000000 +0000
@@ -570,7 +570,14 @@
        i++) {
     NSString* key = NSSTR(i->first);
     NSString* value = NSSTR(i->second);
-    [parameters setObject: value forKey: key];
+    if (key && value) {
+      [parameters setObject: value forKey: key];
+    } else {
+      ostringstream message;
+      message << "Warning: skipping annotation '" << i->first
+              << "' due to malformed UTF-8 encoding";
+      LogMessage(message.str());
+    }
   }
 
   for (StringTable::const_iterator i = gFiles.begin();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/crashreporter/test/dumputils.cpp firefox-trunk-41.0~a1~hg20150524r245419/toolkit/crashreporter/test/dumputils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/crashreporter/test/dumputils.cpp	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/crashreporter/test/dumputils.cpp	2015-05-25 20:43:53.000000000 +0000
@@ -73,8 +73,10 @@
   FILE *fp = fopen("crash-addr", "r");
   if (!fp)
     return false;
-  if (fscanf(fp, "%p", &addr) != 1)
+  if (fscanf(fp, "%p", &addr) != 1) {
+    fclose(fp);
     return false;
+  }
   fclose(fp);
 
   remove("crash-addr");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/crashreporter/test/unit/test_crashreporter_crash.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/crashreporter/test/unit/test_crashreporter_crash.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/crashreporter/test/unit/test_crashreporter_crash.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/crashreporter/test/unit/test_crashreporter_crash.js	2015-05-25 20:43:53.000000000 +0000
@@ -39,11 +39,13 @@
   // check setting some basic data
   do_crash(function() {
              crashReporter.annotateCrashReport("TestKey", "TestValue");
+             crashReporter.annotateCrashReport("\u2665", "\u{1F4A9}");
              crashReporter.appendAppNotesToCrashReport("Junk");
              crashReporter.appendAppNotesToCrashReport("MoreJunk");
            },
            function(mdump, extra) {
              do_check_eq(extra.TestKey, "TestValue");
+             do_check_eq(extra["\u2665"], "\u{1F4A9}");
              do_check_eq(extra.Notes, "JunkMoreJunk");
            });
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/crashreporter/tools/symbolstore.py firefox-trunk-41.0~a1~hg20150524r245419/toolkit/crashreporter/tools/symbolstore.py
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/crashreporter/tools/symbolstore.py	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/crashreporter/tools/symbolstore.py	2015-05-25 20:43:53.000000000 +0000
@@ -14,7 +14,8 @@
 #
 #   Parameters accepted:
 #     -c           : Copy debug info files to the same directory structure
-#                    as sym files
+#                    as sym files. On Windows, this will also copy
+#                    binaries into the symbol store.
 #     -a "<archs>" : Run dump_syms -a <arch> for each space separated
 #                    cpu architecture in <archs> (only on OS X)
 #     -s <srcdir>  : Use <srcdir> as the top source directory to
@@ -535,7 +536,7 @@
         return ""
 
     # subclasses override this if they want to support this
-    def CopyDebug(self, file, debug_file, guid):
+    def CopyDebug(self, file, debug_file, guid, code_file, code_id):
         pass
 
     def Finish(self, stop_pool=True):
@@ -609,6 +610,7 @@
         result = { 'status' : False, 'after' : after, 'after_arg' : after_arg, 'files' : files }
 
         sourceFileStream = ''
+        code_id, code_file = None, None
         for file in files:
             # files is a tuple of files, containing fallbacks in case the first file doesn't process successfully
             try:
@@ -638,9 +640,10 @@
                             # FILE index filename
                             (x, index, filename) = line.rstrip().split(None, 2)
                             filename = os.path.normpath(self.FixFilenameCase(filename))
+                            # We want original file paths for the source server.
+                            sourcepath = filename
                             if filename in self.file_mapping:
                                 filename = self.file_mapping[filename]
-                            sourcepath = filename
                             if self.vcsinfo:
                                 (filename, rootname) = GetVCSFilename(filename, self.srcdirs)
                                 # sets vcs_root in case the loop through files were to end on an empty rootname
@@ -652,6 +655,14 @@
                                 (ver, checkout, source_file, revision) = filename.split(":", 3)
                                 sourceFileStream += sourcepath + "*" + source_file + '*' + revision + "\r\n"
                             f.write("FILE %s %s\n" % (index, filename))
+                        elif line.startswith("INFO CODE_ID "):
+                            # INFO CODE_ID code_id code_file
+                            # This gives some info we can use to
+                            # store binaries in the symbol store.
+                            bits = line.rstrip().split(None, 3)
+                            if len(bits) == 4:
+                                code_id, code_file = bits[2:]
+                            f.write(line)
                         else:
                             # pass through all other lines unchanged
                             f.write(line)
@@ -667,7 +678,8 @@
                         self.SourceServerIndexing(file, guid, sourceFileStream, vcs_root)
                     # only copy debug the first time if we have multiple architectures
                     if self.copy_debug and arch_num == 0:
-                        self.CopyDebug(file, debug_file, guid)
+                        self.CopyDebug(file, debug_file, guid,
+                                       code_file, code_id)
             except StopIteration:
                 pass
             except Exception as e:
@@ -719,26 +731,53 @@
         self.fixedFilenameCaseCache[file] = result
         return result
 
-    def CopyDebug(self, file, debug_file, guid):
+    def CopyDebug(self, file, debug_file, guid, code_file, code_id):
+        def compress(path):
+            compressed_file = path[:-1] + '_'
+            # ignore makecab's output
+            success = subprocess.call(["makecab.exe", "/D",
+                                       "CompressionType=LZX", "/D",
+                                       "CompressionMemory=21",
+                                       path, compressed_file],
+                                      stdout=open("NUL:","w"),
+                                      stderr=subprocess.STDOUT)
+            if success == 0 and os.path.exists(compressed_file):
+                os.unlink(path)
+                return True
+            return False
+
         rel_path = os.path.join(debug_file,
                                 guid,
                                 debug_file).replace("\\", "/")
         full_path = os.path.normpath(os.path.join(self.symbol_path,
                                                   rel_path))
         shutil.copyfile(file, full_path)
-        # try compressing it
-        compressed_file = os.path.splitext(full_path)[0] + ".pd_"
-        # ignore makecab's output
-        success = subprocess.call(["makecab.exe", "/D", "CompressionType=LZX", "/D",
-                                   "CompressionMemory=21",
-                                   full_path, compressed_file],
-                                  stdout=open("NUL:","w"), stderr=subprocess.STDOUT)
-        if success == 0 and os.path.exists(compressed_file):
-            os.unlink(full_path)
-            self.output(sys.stdout, os.path.splitext(rel_path)[0] + ".pd_")
+        if compress(full_path):
+            self.output(sys.stdout, rel_path[:-1] + '_')
         else:
             self.output(sys.stdout, rel_path)
-        
+
+        # Copy the binary file as well
+        if code_file and code_id:
+            full_code_path = os.path.join(os.path.dirname(file),
+                                          code_file)
+            if os.path.exists(full_code_path):
+                rel_path = os.path.join(code_file,
+                                        code_id,
+                                        code_file).replace("\\", "/")
+                full_path = os.path.normpath(os.path.join(self.symbol_path,
+                                                          rel_path))
+                try:
+                    os.makedirs(os.path.dirname(full_path))
+                except OSError as e:
+                    if e.errno != errno.EEXIST:
+                        raise
+                shutil.copyfile(full_code_path, full_path)
+                if compress(full_path):
+                    self.output(sys.stdout, rel_path[:-1] + '_')
+                else:
+                    self.output(sys.stdout, rel_path)
+
     def SourceServerIndexing(self, debug_file, guid, sourceFileStream, vcs_root):
         # Creates a .pdb.stream file in the mozilla\objdir to be used for source indexing
         debug_file = os.path.abspath(debug_file)
@@ -769,7 +808,7 @@
             return self.RunFileCommand(file).startswith("ELF")
         return False
 
-    def CopyDebug(self, file, debug_file, guid):
+    def CopyDebug(self, file, debug_file, guid, code_file, code_id):
         # We want to strip out the debug info, and add a
         # .gnu_debuglink section to the object, so the debugger can
         # actually load our debug info later.
@@ -880,7 +919,7 @@
         result['files'] = (dsymbundle, file)
         return result
 
-    def CopyDebug(self, file, debug_file, guid):
+    def CopyDebug(self, file, debug_file, guid, code_file, code_id):
         """ProcessFiles has already produced a dSYM bundle, so we should just
         copy that to the destination directory. However, we'll package it
         into a .tar.bz2 because the debug symbols are pretty huge, and
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/crashreporter/tools/unit-symbolstore.py firefox-trunk-41.0~a1~hg20150524r245419/toolkit/crashreporter/tools/unit-symbolstore.py
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/crashreporter/tools/unit-symbolstore.py	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/crashreporter/tools/unit-symbolstore.py	2015-05-25 20:43:53.000000000 +0000
@@ -105,54 +105,33 @@
         expected.sort()
         self.assertEqual(processed, expected)
 
-def popen_factory(stdouts):
-    """
-    Generate a class that can mock subprocess.Popen. |stdouts| is an iterable that
-    should return an iterable for the stdout of each process in turn.
-    """
-    class mock_popen(object):
-        def __init__(self, args, *args_rest, **kwargs):
-            self.stdout = stdouts.next()
-
-        def wait(self):
-            return 0
-    return mock_popen
-
-def mock_dump_syms(module_id, filename):
-    return ["MODULE os x86 %s %s" % (module_id, filename),
+def mock_dump_syms(module_id, filename, extra=[]):
+    return ["MODULE os x86 %s %s" % (module_id, filename)
+            ] + extra + [
             "FILE 0 foo.c",
             "PUBLIC xyz 123"]
 
-class TestCopyDebugUniversal(HelperMixin, unittest.TestCase):
-    """
-    Test that CopyDebug does the right thing when dumping multiple architectures.
-    """
+
+class TestCopyDebug(HelperMixin, unittest.TestCase):
     def setUp(self):
         HelperMixin.setUp(self)
         self.symbol_dir = tempfile.mkdtemp()
-        self._subprocess_call = subprocess.call
-        subprocess.call = self.mock_call
-        self._subprocess_popen = subprocess.Popen
-        subprocess.Popen = popen_factory(self.next_mock_stdout())
+        self.mock_call = patch("subprocess.call").start()
         self.stdouts = []
-        self._shutil_rmtree = shutil.rmtree
-        shutil.rmtree = self.mock_rmtree
+        self.mock_popen = patch("subprocess.Popen").start()
+        stdout_iter = self.next_mock_stdout()
+        def next_popen(*args, **kwargs):
+            m = mock.MagicMock()
+            m.stdout = stdout_iter.next()
+            m.wait.return_value = 0
+            return m
+        self.mock_popen.side_effect = next_popen
+        shutil.rmtree = patch("shutil.rmtree").start()
 
     def tearDown(self):
         HelperMixin.tearDown(self)
-        shutil.rmtree = self._shutil_rmtree
+        patch.stopall()
         shutil.rmtree(self.symbol_dir)
-        subprocess.call = self._subprocess_call
-        subprocess.Popen = self._subprocess_popen
-
-    def mock_rmtree(self, path):
-        pass
-
-    def mock_call(self, args, **kwargs):
-        if args[0].endswith("dsymutil"):
-            filename = args[-1]
-            os.makedirs(filename + ".dSYM")
-        return 0
 
     def next_mock_stdout(self):
         if not self.stdouts:
@@ -166,11 +145,16 @@
         per file.
         """
         copied = []
-        def mock_copy_debug(filename, debug_file, guid):
+        def mock_copy_debug(filename, debug_file, guid, code_file, code_id):
             copied.append(filename[len(self.symbol_dir):] if filename.startswith(self.symbol_dir) else filename)
         self.add_test_files(add_extension(["foo"]))
         self.stdouts.append(mock_dump_syms("X" * 33, add_extension(["foo"])[0]))
         self.stdouts.append(mock_dump_syms("Y" * 33, add_extension(["foo"])[0]))
+        def mock_dsymutil(args, **kwargs):
+            filename = args[-1]
+            os.makedirs(filename + ".dSYM")
+            return 0
+        self.mock_call.side_effect = mock_dsymutil
         d = symbolstore.GetPlatformSpecificDumper(dump_syms="dump_syms",
                                                   symbol_path=self.symbol_dir,
                                                   copy_debug=True,
@@ -180,6 +164,29 @@
         d.Finish(stop_pool=False)
         self.assertEqual(1, len(copied))
 
+    def test_copy_debug_copies_binaries(self):
+        """
+        Test that CopyDebug copies binaries as well on Windows.
+        """
+        test_file = os.path.join(self.test_dir, 'foo.pdb')
+        write_pdb(test_file)
+        code_file = 'foo.dll'
+        code_id = 'abc123'
+        self.stdouts.append(mock_dump_syms('X' * 33, 'foo.pdb',
+                                           ['INFO CODE_ID %s %s' % (code_id, code_file)]))
+        def mock_compress(args, **kwargs):
+            filename = args[-1]
+            open(filename, 'w').write('stuff')
+            return 0
+        self.mock_call.side_effect = mock_compress
+        d = symbolstore.Dumper_Win32(dump_syms='dump_syms',
+                                     symbol_path=self.symbol_dir,
+                                     copy_debug=True)
+        d.FixFilenameCase = lambda f: f
+        d.Process(self.test_dir)
+        d.Finish(stop_pool=False)
+        self.assertTrue(os.path.isfile(os.path.join(self.symbol_dir, code_file, code_id, code_file[:-1] + '_')))
+
 class TestGetVCSFilename(HelperMixin, unittest.TestCase):
     def setUp(self):
         HelperMixin.setUp(self)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/crashreporter/tools/upload_symbols.py firefox-trunk-41.0~a1~hg20150524r245419/toolkit/crashreporter/tools/upload_symbols.py
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/crashreporter/tools/upload_symbols.py	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/crashreporter/tools/upload_symbols.py	2015-05-25 20:43:53.000000000 +0000
@@ -15,6 +15,7 @@
 from __future__ import print_function
 
 import os
+import redo
 import requests
 import sys
 
@@ -46,13 +47,15 @@
     print('Uploading symbol file "{0}" to "{1}"...'.format(sys.argv[1], url))
 
     try:
-        r = requests.post(
-            url,
-            files={'symbols.zip': open(sys.argv[1], 'rb')},
-            headers={'Auth-Token': auth_token},
-            allow_redirects=False,
-            timeout=120,
-        )
+        with redo.retrying(requests.post,
+                           cleanup=lambda: print('Retrying...'),
+                           retry_exceptions=(requests.exceptions.RequestException,)) as post:
+            r = post(
+                url,
+                files={'symbols.zip': open(sys.argv[1], 'rb')},
+                headers={'Auth-Token': auth_token},
+                allow_redirects=False,
+                timeout=120)
     except requests.exceptions.RequestException as e:
         print('Error: {0}'.format(e))
         return 1
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/apps/app-actor-front.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/apps/app-actor-front.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/apps/app-actor-front.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/apps/app-actor-front.js	2015-05-25 20:43:53.000000000 +0000
@@ -188,9 +188,10 @@
     });
 
     request.on("bulk-send-ready", ({copyFrom}) => {
-      NetUtil.asyncFetch2(
-        packageFile,
-        function(inputStream) {
+      NetUtil.asyncFetch({
+        uri: NetUtil.newURI(packageFile),
+        loadUsingSystemPrincipal: true
+      }, function(inputStream) {
           let copying = copyFrom(inputStream);
           copying.on("progress", (e, progress) => {
             progressCallback(progress);
@@ -200,12 +201,7 @@
             inputStream.close();
             deferred.resolve(actor);
           });
-        },
-        null,      // aLoadingNode
-        Services.scriptSecurityManager.getSystemPrincipal(),
-        null,      // aTriggeringPrincipal
-        Ci.nsILoadInfo.SEC_NORMAL,
-        Ci.nsIContentPolicy.TYPE_OTHER);
+        });
     });
   }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/client/dbg-client.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/client/dbg-client.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/client/dbg-client.jsm	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/client/dbg-client.jsm	2015-05-25 20:43:53.000000000 +0000
@@ -51,6 +51,7 @@
 });
 
 Components.utils.import("resource://gre/modules/devtools/DevToolsUtils.jsm");
+this.executeSoon = DevToolsUtils.executeSoon;
 this.makeInfallible = DevToolsUtils.makeInfallible;
 this.values = DevToolsUtils.values;
 
@@ -505,6 +506,29 @@
     });
   },
 
+  attachWorker: function DC_attachWorker(aWorkerActor, aOnResponse = noop) {
+    let workerClient = this._clients.get(aWorkerActor);
+    if (workerClient !== undefined) {
+      executeSoon(() => aOnResponse({
+        from: workerClient.actor,
+        type: "attached",
+        isFrozen: workerClient.isFrozen
+      }, workerClient));
+      return;
+    }
+
+    this.request({ to: aWorkerActor, type: "attach" }, (aResponse) => {
+      if (aResponse.error) {
+        aOnResponse(aResponse, null);
+        return;
+      }
+
+      let workerClient = new WorkerClient(this, aResponse);
+      this.registerClient(workerClient);
+      aOnResponse(aResponse, workerClient);
+    });
+  },
+
   /**
    * Attach to an addon actor.
    *
@@ -1326,11 +1350,82 @@
     type: "listWorkers"
   }, {
     telemetry: "LISTWORKERS"
-  })
+  }),
+
+  attachWorker: function (aWorkerActor, aOnResponse) {
+    this.client.attachWorker(aWorkerActor, aOnResponse);
+  }
 };
 
 eventSource(TabClient.prototype);
 
+function WorkerClient(aClient, aForm) {
+  this._client = aClient;
+  this._actor = aForm.from;
+  this._isClosed = false;
+  this._isFrozen = aForm.isFrozen;
+
+  this._onClose = this._onClose.bind(this);
+  this._onFreeze = this._onFreeze.bind(this);
+  this._onThaw = this._onThaw.bind(this);
+
+  this.addListener("close", this._onClose);
+  this.addListener("freeze", this._onFreeze);
+  this.addListener("thaw", this._onThaw);
+}
+
+WorkerClient.prototype = {
+  get _transport() {
+    return this._client._transport;
+  },
+
+  get request() {
+    return this._client.request;
+  },
+
+  get actor() {
+    return this._actor;
+  },
+
+  get isClosed() {
+    return this._isClosed;
+  },
+
+  get isFrozen() {
+    return this._isFrozen;
+  },
+
+  detach: DebuggerClient.requester({ type: "detach" }, {
+    after: function (aResponse) {
+      this._client.unregisterClient(this);
+      return aResponse;
+    },
+
+    telemetry: "WORKERDETACH"
+  }),
+
+  _onClose: function () {
+    this.removeListener("close", this._onClose);
+    this.removeListener("freeze", this._onFreeze);
+    this.removeListener("thaw", this._onThaw);
+
+    this._client.unregisterClient(this);
+    this._closed = true;
+  },
+
+  _onFreeze: function () {
+    this._isFrozen = true;
+  },
+
+  _onThaw: function () {
+    this._isFrozen = false;
+  },
+
+  events: ["close", "freeze", "thaw"]
+};
+
+eventSource(WorkerClient.prototype);
+
 function AddonClient(aClient, aActor) {
   this._client = aClient;
   this._actor = aActor;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/css-color.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/css-color.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/css-color.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/css-color.js	2015-05-25 20:43:53.000000000 +0000
@@ -9,25 +9,6 @@
 
 const COLOR_UNIT_PREF = "devtools.defaultColorUnit";
 
-const REGEX_JUST_QUOTES  = /^""$/;
-const REGEX_HSL_3_TUPLE  = /^\bhsl\(([\d.]+),\s*([\d.]+%),\s*([\d.]+%)\)$/i;
-
-/**
- * This regex matches:
- *  - #F00
- *  - #FF0000
- *  - hsl()
- *  - hsla()
- *  - rgb()
- *  - rgba()
- *  - red
- *
- *  It also matches css keywords e.g. "background-color" otherwise
- *  "background" would be replaced with #6363CE ("background" is a platform
- *  color).
- */
-const REGEX_ALL_COLORS = /#[0-9a-fA-F]{3}\b|#[0-9a-fA-F]{6}\b|hsl\(.*?\)|hsla\(.*?\)|rgba?\(.*?\)|\b[a-zA-Z-]+\b/g;
-
 const SPECIALVALUES = new Set([
   "currentcolor",
   "initial",
@@ -66,9 +47,6 @@
  *   // Color objects can be reused
  *   color.newColor("green") === "#0F0"; // true
  *
- *   let processed = colorUtils.processCSSString("color:red; background-color:green;");
- *   // Returns "color:#F00; background-color:#0F0;"
- *
  *   Valid values for COLOR_UNIT_PREF are contained in CssColor.COLORUNIT.
  */
 
@@ -78,7 +56,6 @@
 
 module.exports.colorUtils = {
   CssColor: CssColor,
-  processCSSString: processCSSString,
   rgbToHsl: rgbToHsl,
   setAlpha: setAlpha
 };
@@ -183,9 +160,9 @@
     if (this.hasAlpha) {
       return this.rgba;
     }
-    return this.rgb.replace(/\brgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)/gi, function(_, r, g, b) {
-      return "#" + ((1 << 24) + (r << 16) + (g << 8) + (b << 0)).toString(16).substr(-6).toUpperCase();
-    });
+
+    let tuple = this._getRGBATuple();
+    return "#" + ((1 << 24) + (tuple.r << 16) + (tuple.g << 8) + (tuple.b << 0)).toString(16).substr(-6).toUpperCase();
   },
 
   get rgb() {
@@ -232,7 +209,7 @@
     if (this.hasAlpha) {
       return this.hsla;
     }
-    return this._hslNoAlpha();
+    return this._hsl();
   },
 
   get hsla() {
@@ -246,9 +223,9 @@
     }
     if (this.hasAlpha) {
       let a = this._getRGBATuple().a;
-      return this._hslNoAlpha().replace("hsl", "hsla").replace(")", ", " + a + ")");
+      return this._hsl(a);
     }
-    return this._hslNoAlpha().replace("hsl", "hsla").replace(")", ", 1)");
+    return this._hsl(1);
   },
 
   /**
@@ -341,19 +318,19 @@
     return tuple;
   },
 
-  _hslNoAlpha: function() {
-    let {r, g, b} = this._getRGBATuple();
-
-    if (this.authored.startsWith("hsl(")) {
-      // We perform string manipulations on our output so let's ensure that it
-      // is formatted as we expect.
-      let [, h, s, l] = this.authored.match(REGEX_HSL_3_TUPLE);
-      return "hsl(" + h + ", " + s + ", " + l + ")";
+  _hsl: function(maybeAlpha) {
+    if (this.authored.startsWith("hsl(") && maybeAlpha === undefined) {
+      // We can use it as-is.
+      return this.authored;
     }
 
+    let {r, g, b} = this._getRGBATuple();
     let [h,s,l] = rgbToHsl([r,g,b]);
-
-    return "hsl(" + h + ", " + s + "%, " + l + "%)";
+    if (maybeAlpha !== undefined) {
+      return "hsla(" + h + ", " + s + "%, " + l + "%, " + maybeAlpha + ")";
+    } else {
+      return "hsl(" + h + ", " + s + "%, " + l + "%)";
+    }
   },
 
   /**
@@ -365,31 +342,6 @@
 };
 
 /**
- * Process a CSS string
- *
- * @param  {String} value
- *         CSS string e.g. "color:red; background-color:green;"
- * @return {String}
- *         Converted CSS String e.g. "color:#F00; background-color:#0F0;"
- */
-function processCSSString(value) {
-  if (value && REGEX_JUST_QUOTES.test(value)) {
-    return value;
-  }
-
-  let colorPattern = REGEX_ALL_COLORS;
-
-  value = value.replace(colorPattern, function(match) {
-    let color = new CssColor(match);
-    if (color.valid) {
-      return color;
-    }
-    return match;
-  });
-  return value;
-}
-
-/**
  * Convert rgb value to hsl
  *
  * @param {array} rgb
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/DevToolsUtils.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/DevToolsUtils.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/DevToolsUtils.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/DevToolsUtils.js	2015-05-25 20:43:53.000000000 +0000
@@ -434,6 +434,9 @@
  *        An object with the following optional properties:
  *        - loadFromCache: if false, will bypass the cache and
  *          always load fresh from the network (default: true)
+ *        - policy: the nsIContentPolicy type to apply when fetching the URL
+ *        - window: the window to get the loadGroup from
+ *        - charset: the charset to use if the channel doesn't provide one
  * @returns Promise
  *        A promise of the document at that URL, as a string.
  *
@@ -441,7 +444,10 @@
  * without relying on caching when we can (not for eval, etc.):
  * http://www.softwareishard.com/blog/firebug/nsitraceablechannel-intercept-http-traffic/
  */
-exports.fetch = function fetch(aURL, aOptions={ loadFromCache: true }) {
+exports.fetch = function fetch(aURL, aOptions={ loadFromCache: true,
+                                                policy: Ci.nsIContentPolicy.TYPE_OTHER,
+                                                window: null,
+                                                charset: null }) {
   let deferred = promise.defer();
   let scheme;
   let url = aURL.split(" -> ").pop();
@@ -463,13 +469,14 @@
     case "chrome":
     case "resource":
       try {
-        NetUtil.asyncFetch2(
-          url,
-          function onFetch(aStream, aStatus, aRequest) {
+        NetUtil.asyncFetch({
+          uri: url,
+          loadUsingSystemPrincipal: true
+        }, function onFetch(aStream, aStatus, aRequest) {
             if (!components.isSuccessCode(aStatus)) {
               deferred.reject(new Error("Request failed with status code = "
                                         + aStatus
-                                        + " after NetUtil.asyncFetch2 for url = "
+                                        + " after NetUtil.asyncFetch for url = "
                                         + url));
               return;
             }
@@ -478,19 +485,14 @@
             contentType = aRequest.contentType;
             deferred.resolve(source);
             aStream.close();
-          },
-          null,      // aLoadingNode
-          Services.scriptSecurityManager.getSystemPrincipal(),
-          null,      // aTriggeringPrincipal
-          Ci.nsILoadInfo.SEC_NORMAL,
-          Ci.nsIContentPolicy.TYPE_OTHER);
+          });
       } catch (ex) {
         deferred.reject(ex);
       }
       break;
 
     default:
-    let channel;
+      let channel;
       try {
         channel = Services.io.newChannel2(url,
                                           null,
@@ -499,7 +501,7 @@
                                           Services.scriptSecurityManager.getSystemPrincipal(),
                                           null,      // aTriggeringPrincipal
                                           Ci.nsILoadInfo.SEC_NORMAL,
-                                          Ci.nsIContentPolicy.TYPE_OTHER);
+                                          aOptions.policy);
       } catch (e if e.name == "NS_ERROR_UNKNOWN_PROTOCOL") {
         // On Windows xpcshell tests, c:/foo/bar can pass as a valid URL, but
         // newChannel won't be able to handle it.
@@ -511,7 +513,7 @@
                                           Services.scriptSecurityManager.getSystemPrincipal(),
                                           null,      // aTriggeringPrincipal
                                           Ci.nsILoadInfo.SEC_NORMAL,
-                                          Ci.nsIContentPolicy.TYPE_OTHER);
+                                          aOptions.policy);
       }
       let chunks = [];
       let streamListener = {
@@ -535,12 +537,19 @@
             return;
           }
 
-          charset = channel.contentCharset;
+          charset = channel.contentCharset || aOptions.charset;
           contentType = channel.contentType;
           deferred.resolve(chunks.join(""));
         }
       };
 
+      if (aOptions.window) {
+        // Respect private browsing.
+        channel.loadGroup = aOptions.window.QueryInterface(Ci.nsIInterfaceRequestor)
+                              .getInterface(Ci.nsIWebNavigation)
+                              .QueryInterface(Ci.nsIDocumentLoader)
+                              .loadGroup;
+      }
       channel.loadFlags = aOptions.loadFromCache
         ? channel.LOAD_FROM_CACHE
         : channel.LOAD_BYPASS_CACHE;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/gcli/commands/index.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/gcli/commands/index.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/gcli/commands/index.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/gcli/commands/index.js	2015-05-25 20:43:53.000000000 +0000
@@ -71,6 +71,7 @@
   "gcli/commands/restart",
   "gcli/commands/rulers",
   "gcli/commands/screenshot",
+  "gcli/commands/security",
   "gcli/commands/tools",
 ];
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/gcli/commands/security.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/gcli/commands/security.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/gcli/commands/security.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/gcli/commands/security.js	2015-05-25 20:43:53.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/. */
+
+/**
+ * The Security devtool supports the following arguments:
+ * * Security CSP
+ *   Provides feedback about the current CSP
+ */
+
+"use strict";
+
+const { Cc, Ci, Cu, CC } = require("chrome");
+const l10n = require("gcli/l10n");
+const CSP = Cc["@mozilla.org/cspcontext;1"].getService(Ci.nsIContentSecurityPolicy);
+
+const GOOD_IMG_SRC = "chrome://browser/content/gcli_sec_good.svg";
+const MOD_IMG_SRC = "chrome://browser/content/gcli_sec_moderate.svg";
+const BAD_IMG_SRC = "chrome://browser/content/gcli_sec_bad.svg";
+
+const CONTENT_SECURITY_POLICY = "Content-Security-Policy";
+const CONTENT_SECURITY_POLICY_REPORT_ONLY = "Content-Security-Policy-Report-Only";
+
+const DIR_UNSAFE_INLINE = "'unsafe-inline'";
+const DIR_UNSAFE_EVAL = "'unsafe-eval'";
+const POLICY_REPORT_ONLY = "report-only"
+
+const WILDCARD_MSG = l10n.lookup("securityCSPRemWildCard");
+const XSS_WARNING_MSG = l10n.lookup("securityCSPPotentialXSS");
+
+exports.items = [
+  {
+    // --- General Security information
+    name: "security",
+    description: l10n.lookup("securityDesc"),
+    manual: l10n.lookup("securityManual")
+  },
+  {
+    // --- CSP specific Security information
+    item: "command",
+    runAt: "server",
+    name: "security csp",
+    description: l10n.lookup("securityCSPDesc"),
+    manual: l10n.lookup("securityCSPManual"),
+    returnType: "securityCSPInfo",
+    exec: function(args, context) {
+
+      var cspJSON = context.environment.document.nodePrincipal.cspJSON;
+      var cspOBJ = JSON.parse(cspJSON);
+
+      var outPolicies = [];
+
+      var policies = cspOBJ["csp-policies"];
+
+      // loop over all the different policies
+      for (var csp in policies) {
+        var curPolicy = policies[csp];
+
+        // loop over all the directive-values within that policy
+        var outDirectives = [];
+        var outHeader = CONTENT_SECURITY_POLICY;
+        for (var dir in curPolicy) {
+          var curDir = curPolicy[dir];
+
+          // when iterating properties within the obj we might also
+          // encounter the 'report-only' flag, which is not a csp directive.
+          if (dir === POLICY_REPORT_ONLY) {
+            outHeader = curPolicy[POLICY_REPORT_ONLY] === true ?
+                          CONTENT_SECURITY_POLICY :
+                          CONTENT_SECURITY_POLICY_REPORT_ONLY;
+            continue;
+          }
+
+          // loop over all the directive-sources within that directive
+          var outSrcs = [];
+          for (var src in curDir) {
+            var curSrc = curDir[src];
+
+            // the default icon and descritpion of the directive-src
+            var outIcon = GOOD_IMG_SRC;
+            var outDesc = "";
+
+            if (curSrc.indexOf("*") > -1) {
+              outIcon = MOD_IMG_SRC;
+              outDesc = WILDCARD_MSG;
+            }
+            if (curSrc == DIR_UNSAFE_INLINE || curSrc == DIR_UNSAFE_EVAL) {
+              outIcon = BAD_IMG_SRC;
+              outDesc = XSS_WARNING_MSG;
+            }
+            outSrcs.push({
+              icon: outIcon,
+              src: curSrc,
+              desc: outDesc
+            });
+          }
+          // append info about that directive to the directives array
+          outDirectives.push({
+            dirValue: dir,
+            dirSrc: outSrcs
+          });
+        }
+        // append info about the policy to the policies array
+        outPolicies.push({
+          header: outHeader,
+          directives: outDirectives
+        });
+      }
+      return outPolicies;
+    }
+  },
+  {
+    item: "converter",
+    from: "securityCSPInfo",
+    to: "view",
+    exec: function(cspInfo, context) {
+      var uri = context.environment.document.documentURI;
+
+      if (cspInfo.length == 0) {
+        return context.createView({
+          html:
+            "<table class='gcli-csp-detail' cellspacing='10' valign='top'>" +
+            "  <tr>" +
+            "    <td> <img src='chrome://browser/content/gcli_sec_bad.svg' width='20px' /> </td> " +
+            "    <td> Could not find any 'Content-Security-Policy' for <b>" + uri + "</b></td>" +
+            "  </tr>" +
+            "</table>"});
+      }
+
+      return context.createView({
+        html:
+          "<table class='gcli-csp-detail' cellspacing='10' valign='top'>" +
+          // iterate all policies
+          "  <tr foreach='csp in ${cspinfo}' >" +
+          "    <td> ${csp.header} for: <b>" + uri + "</b><br/><br/>" +
+          "      <table class='gcli-csp-dir-detail' valign='top'>" +
+          // >> iterate all directives
+          "        <tr foreach='dir in ${csp.directives}' >" +
+          "          <td valign='top'> ${dir.dirValue} </td>" +
+          "          <td valign='top'>" +
+          "            <table class='gcli-csp-src-detail' valign='top'>" +
+          // >> >> iterate all srs
+          "              <tr foreach='src in ${dir.dirSrc}' >" +
+          "                <td valign='center' width='20px'> <img src= \"${src.icon}\" width='20px' /> </td> " +
+          "                <td valign='center' width='200px'> ${src.src} </td>" +
+          "                <td valign='center'> ${src.desc} </td>" +
+          "              </tr>" +
+          "            </table>" +
+          "          </td>" +
+          "        </tr>" +
+          "      </table>" +
+          "    </td>" +
+          "  </tr>" +
+          "</table>",
+          data: {
+            cspinfo: cspInfo,
+          }
+        });
+    }
+  },
+];
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/gcli/moz.build firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/gcli/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/gcli/moz.build	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/gcli/moz.build	2015-05-25 20:43:53.000000000 +0000
@@ -23,6 +23,7 @@
     'commands/restart.js',
     'commands/rulers.js',
     'commands/screenshot.js',
+    'commands/security.js',
     'commands/tools.js',
 ]
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/Loader.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/Loader.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/Loader.jsm	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/Loader.jsm	2015-05-25 20:43:53.000000000 +0000
@@ -202,21 +202,17 @@
   _readFile: function(filename) {
     let deferred = promise.defer();
     let file = new FileUtils.File(filename);
-    NetUtil.asyncFetch2(
-      file,
-      (inputStream, status) => {
+    NetUtil.asyncFetch({
+      uri: NetUtil.newURI(file),
+      loadUsingSystemPrincipal: true
+    }, (inputStream, status) => {
         if (!Components.isSuccessCode(status)) {
           deferred.reject(new Error("Couldn't load manifest: " + filename + "\n"));
           return;
         }
         var data = NetUtil.readInputStreamToString(inputStream, inputStream.available());
         deferred.resolve(data);
-      },
-      null,      // aLoadingNode
-      Services.scriptSecurityManager.getSystemPrincipal(),
-      null,      // aTriggeringPrincipal
-      Ci.nsILoadInfo.SEC_NORMAL,
-      Ci.nsIContentPolicy.TYPE_OTHER);
+      });
 
     return deferred.promise;
   },
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/moz.build firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/moz.build	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/moz.build	2015-05-25 20:43:53.000000000 +0000
@@ -20,7 +20,7 @@
     'styleinspector',
     'tern',
     'transport',
-    'webconsole',
+    'webconsole'
 ]
 
 MOCHITEST_CHROME_MANIFESTS += ['tests/mochitest/chrome.ini']
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/output-parser.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/output-parser.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/output-parser.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/output-parser.js	2015-05-25 20:43:53.000000000 +0000
@@ -11,28 +11,18 @@
 const HTML_NS = "http://www.w3.org/1999/xhtml";
 
 const MAX_ITERATIONS = 100;
-const REGEX_QUOTES = /^".*?"|^".*|^'.*?'|^'.*/;
-const REGEX_WHITESPACE = /^\s+/;
-const REGEX_FIRST_WORD_OR_CHAR = /^\w+|^./;
-const REGEX_CUBIC_BEZIER = /^linear|^ease-in-out|^ease-in|^ease-out|^ease|^cubic-bezier\(([0-9.\- ]+,){3}[0-9.\- ]+\)/;
-
-// CSS variable names are identifiers which the spec defines as follows:
-//   In CSS, identifiers (including element names, classes, and IDs in
-//   selectors) can contain only the characters [a-zA-Z0-9] and ISO 10646
-//   characters U+00A0 and higher, plus the hyphen (-) and the underscore (_).
-const REGEX_CSS_VAR = /^\bvar\(\s*--[-_a-zA-Z0-9\u00A0-\u10FFFF]+\s*\)/;
 
-/**
- * This regex matches:
- *  - #F00
- *  - #FF0000
- *  - hsl()
- *  - hsla()
- *  - rgb()
- *  - rgba()
- *  - color names
- */
-const REGEX_ALL_COLORS = /^#[0-9a-fA-F]{3}\b|^#[0-9a-fA-F]{6}\b|^hsl\(.*?\)|^hsla\(.*?\)|^rgba?\(.*?\)|^[a-zA-Z-]+/;
+const BEZIER_KEYWORDS = ["linear", "ease-in-out", "ease-in", "ease-out", "ease"];
+
+// Functions that accept a color argument.
+const COLOR_TAKING_FUNCTIONS = ["linear-gradient",
+                                "-moz-linear-gradient",
+                                "repeating-linear-gradient",
+                                "-moz-repeating-linear-gradient",
+                                "radial-gradient",
+                                "-moz-radial-gradient",
+                                "repeating-radial-gradient",
+                                "-moz-repeating-radial-gradient"];
 
 loader.lazyGetter(this, "DOMUtils", function () {
   return Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils);
@@ -94,29 +84,44 @@
   },
 
   /**
-   * Matches the beginning of the provided string to a css background-image url
-   * and return both the whole url(...) match and the url itself.
-   * This isn't handled via a regular expression to make sure we can match urls
-   * that contain parenthesis easily
+   * Given an initial FUNCTION token, read tokens from |tokenStream|
+   * and collect all the (non-comment) text.  Return the collected
+   * text.  The function token and the close paren are included in the
+   * result.
+   *
+   * @param  {CSSToken} initialToken
+   *         The FUNCTION token.
+   * @param  {String} text
+   *         The original CSS text.
+   * @param  {CSSLexer} tokenStream
+   *         The token stream from which to read.
+   * @return {String}
+   *         The text of body of the function call.
    */
-  _matchBackgroundUrl: function(text) {
-    let startToken = "url(";
-    if (text.indexOf(startToken) !== 0) {
-      return null;
-    }
-
-    let uri = text.substring(startToken.length).trim();
-    let quote = uri.substring(0, 1);
-    if (quote === "'" || quote === '"') {
-      uri = uri.substring(1, uri.search(new RegExp(quote + "\\s*\\)")));
-    } else {
-      uri = uri.substring(0, uri.indexOf(")"));
-      quote = "";
+  _collectFunctionText: function(initialToken, text, tokenStream) {
+    let result = text.substring(initialToken.startOffset,
+                                initialToken.endOffset);
+    let depth = 1;
+    while (depth > 0) {
+      let token = tokenStream.nextToken();
+      if (!token) {
+        break;
+      }
+      if (token.tokenType === "comment") {
+        continue;
+      }
+      result += text.substring(token.startOffset, token.endOffset);
+      if (token.tokenType === "symbol") {
+        if (token.text === "(") {
+          ++depth;
+        } else if (token.text === ")") {
+          --depth;
+        }
+      } else if (token.tokenType === "function") {
+        ++depth;
+      }
     }
-    let end = startToken + quote + uri;
-    text = text.substring(0, text.indexOf(")", end.length) + 1);
-
-    return [text, uri.trim()];
+    return result;
   },
 
   /**
@@ -133,91 +138,90 @@
   _parse: function(text, options={}) {
     text = text.trim();
     this.parsed.length = 0;
-    let i = 0;
-
-    while (text.length > 0) {
-      let matched = null;
-
-      // Prevent this loop from slowing down the browser with too
-      // many nodes being appended into output. In practice it is very unlikely
-      // that this will ever happen.
-      i++;
-      if (i > MAX_ITERATIONS) {
-        this._appendTextNode(text);
-        text = "";
-        break;
-      }
-
-      if (options.expectFilter) {
-        this._appendFilter(text, options);
-        break;
-      }
-
-      matched = text.match(REGEX_QUOTES);
-      if (matched) {
-        let match = matched[0];
-
-        text = this._trimMatchFromStart(text, match);
-        this._appendTextNode(match);
-        continue;
-      }
-
-      matched = text.match(REGEX_CSS_VAR);
-      if (matched) {
-        let match = matched[0];
-
-        text = this._trimMatchFromStart(text, match);
-        this._appendTextNode(match);
-        continue;
-      }
-
-      matched = text.match(REGEX_WHITESPACE);
-      if (matched) {
-        let match = matched[0];
-
-        text = this._trimMatchFromStart(text, match);
-        this._appendTextNode(match);
-        continue;
-      }
-
-      matched = this._matchBackgroundUrl(text);
-      if (matched) {
-        let [match, url] = matched;
-        text = this._trimMatchFromStart(text, match);
-
-        this._appendURL(match, url, options);
-        continue;
-      }
 
-      if (options.expectCubicBezier) {
-        matched = text.match(REGEX_CUBIC_BEZIER);
-        if (matched) {
-          let match = matched[0];
-          text = this._trimMatchFromStart(text, match);
-
-          this._appendCubicBezier(match, options);
+    if (options.expectFilter) {
+      this._appendFilter(text, options);
+    } else {
+      let tokenStream = DOMUtils.getCSSLexer(text);
+      let i = 0;
+      while (true) {
+        let token = tokenStream.nextToken();
+        if (!token)
+          break;
+        if (token.tokenType === "comment") {
           continue;
         }
-      }
-
-      if (options.supportsColor) {
-        let dirty;
 
-        [text, dirty] = this._appendColorOnMatch(text, options);
-
-        if (dirty) {
+        // Prevent this loop from slowing down the browser with too
+        // many nodes being appended into output. In practice it is very unlikely
+        // that this will ever happen.
+        i++;
+        if (i > MAX_ITERATIONS) {
+          this._appendTextNode(text.substring(token.startOffset,
+                                              token.endOffset));
           continue;
         }
-      }
 
-      // This test must always be last as it indicates use of an unknown
-      // character that needs to be removed to prevent infinite loops.
-      matched = text.match(REGEX_FIRST_WORD_OR_CHAR);
-      if (matched) {
-        let match = matched[0];
-
-        text = this._trimMatchFromStart(text, match);
-        this._appendTextNode(match);
+        switch (token.tokenType) {
+          case "function": {
+            if (COLOR_TAKING_FUNCTIONS.indexOf(token.text) >= 0) {
+              // The function can accept a color argument, and we know
+              // it isn't special in some other way.  So, we let it
+              // through to the ordinary parsing loop so that colors
+              // can be handled in a single place.
+              this._appendTextNode(text.substring(token.startOffset,
+                                                  token.endOffset));
+            } else {
+              let functionText = this._collectFunctionText(token, text,
+                                                           tokenStream);
+
+              if (options.expectCubicBezier && token.text === "cubic-bezier") {
+                this._appendCubicBezier(functionText, options);
+              } else if (options.supportsColor &&
+                         DOMUtils.isValidCSSColor(functionText)) {
+                this._appendColor(functionText, options);
+              } else {
+                this._appendTextNode(functionText);
+              }
+            }
+            break;
+          }
+
+          case "ident":
+            if (options.expectCubicBezier &&
+                BEZIER_KEYWORDS.indexOf(token.text) >= 0) {
+              this._appendCubicBezier(token.text, options);
+            } else if (options.supportsColor &&
+                       DOMUtils.isValidCSSColor(token.text)) {
+              this._appendColor(token.text, options);
+            } else {
+              this._appendTextNode(text.substring(token.startOffset,
+                                                  token.endOffset));
+            }
+            break;
+
+          case "id":
+          case "hash": {
+            let original = text.substring(token.startOffset, token.endOffset);
+            if (options.supportsColor && DOMUtils.isValidCSSColor(original)) {
+              this._appendColor(original, options);
+            } else {
+              this._appendTextNode(original);
+            }
+            break;
+          }
+
+          case "url":
+          case "bad_url":
+            this._appendURL(text.substring(token.startOffset, token.endOffset),
+                            token.text, options);
+            break;
+
+          default:
+            this._appendTextNode(text.substring(token.startOffset,
+                                                token.endOffset));
+            break;
+        }
       }
     }
 
@@ -225,51 +229,6 @@
   },
 
   /**
-   * Convenience function to make the parser a little more readable.
-   *
-   * @param  {String} text
-   *         Main text
-   * @param  {String} match
-   *         Text to remove from the beginning
-   *
-   * @return {String}
-   *         The string passed as 'text' with 'match' stripped from the start.
-   */
-  _trimMatchFromStart: function(text, match) {
-    return text.substr(match.length);
-  },
-
-  /**
-   * Check if there is a color match and append it if it is valid.
-   *
-   * @param  {String} text
-   *         Main text
-   * @param  {Object} options
-   *         Options object. For valid options and default values see
-   *         _mergeOptions().
-   *
-   * @return {Array}
-   *         An array containing the remaining text and a dirty flag. This array
-   *         is designed for deconstruction using [text, dirty].
-   */
-  _appendColorOnMatch: function(text, options) {
-    let dirty;
-    let matched = text.match(REGEX_ALL_COLORS);
-
-    if (matched) {
-      let match = matched[0];
-      if (this._appendColor(match, options)) {
-        text = this._trimMatchFromStart(text, match);
-        dirty = true;
-      }
-    } else {
-      dirty = false;
-    }
-
-    return [text, dirty];
-  },
-
-  /**
    * Append a cubic-bezier timing function value to the output
    *
    * @param {String} bezier
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/actors/inspector.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/actors/inspector.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/actors/inspector.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/actors/inspector.js	2015-05-25 20:43:54.000000000 +0000
@@ -227,6 +227,7 @@
     }
 
     let parentNode = this.walker.parentNode(this);
+    let singleTextChild = this.walker.singleTextChild(this);
 
     let form = {
       actor: this.actorID,
@@ -236,6 +237,7 @@
       namespaceURI: this.rawNode.namespaceURI,
       nodeName: this.rawNode.nodeName,
       numChildren: this.numChildren,
+      singleTextChild: singleTextChild ? singleTextChild.form() : undefined,
 
       // doctype attributes
       name: this.rawNode.name,
@@ -753,6 +755,13 @@
       let parentNodeFront = ctx.marshallPool().ensureParentFront(form.parent);
       this.reparent(parentNodeFront);
     }
+
+    if (form.singleTextChild) {
+      this.singleTextChild =
+        types.getType("domnode").read(form.singleTextChild, ctx);
+    } else {
+      this.singleTextChild = undefined;
+    }
   },
 
   /**
@@ -1455,6 +1464,35 @@
   },
 
   /**
+   * If the given NodeActor only has a single text node as a child,
+   * return that child's NodeActor.
+   *
+   * @param NodeActor node
+   */
+  singleTextChild: function(node) {
+    // Quick checks to prevent creating a new walker if possible.
+    if (node.isBeforePseudoElement ||
+        node.isAfterPseudoElement ||
+        node.rawNode.nodeType != Ci.nsIDOMNode.ELEMENT_NODE ||
+        node.rawNode.children.length > 0) {
+      return undefined;
+    }
+
+    let docWalker = this.getDocumentWalker(node.rawNode);
+    let firstChild = docWalker.firstChild();
+
+    // If the first child isn't a text node, or there are multiple children
+    // then bail out
+    if (!firstChild ||
+        firstChild.nodeType !== Ci.nsIDOMNode.TEXT_NODE ||
+        docWalker.nextSibling()) {
+      return undefined;
+    }
+
+    return this._ref(firstChild);
+  },
+
+  /**
    * Mark a node as 'retained'.
    *
    * A retained node is not released when `releaseNode` is called on its
@@ -2570,6 +2608,8 @@
    *     seen by the client* that were added to the target node.
    *   removed: array of <domnode actor ID> The list of actors *previously
    *     seen by the client* that were removed from the target node.
+   *   singleTextChild: If the node now has a single text child, it will
+   *     be sent here.
    *
    * Actors that are included in a MutationRecord's `removed` but
    * not in an `added` have been removed from the client's ownership
@@ -2708,6 +2748,11 @@
 
         mutation.removed = removedActors;
         mutation.added = addedActors;
+
+        let singleTextChild = this.singleTextChild(targetActor);
+        if (singleTextChild) {
+          mutation.singleTextChild = singleTextChild.form();
+        }
       }
       this.queueMutation(mutation);
     }
@@ -3200,6 +3245,14 @@
             this._orphaned.delete(addedFront);
             addedFronts.push(addedFront);
           }
+
+          if (change.singleTextChild) {
+            targetFront.singleTextChild =
+              types.getType("domnode").read(change.singleTextChild, this);
+          } else {
+            targetFront.singleTextChild = undefined;
+          }
+
           // Before passing to users, replace the added and removed actor
           // ids with front in the mutation record.
           emittedMutation.added = addedFronts;
@@ -3368,6 +3421,16 @@
     this.tabActor = tabActor;
   },
 
+  destroy: function () {
+    protocol.Actor.prototype.destroy.call(this);
+  },
+
+  // Forces destruction of the actor and all its children
+  // like highlighter, walker and style actors.
+  disconnect: function() {
+    this.destroy();
+  },
+
   get window() this.tabActor.window,
 
   getWalker: method(function(options={}) {
@@ -3441,7 +3504,9 @@
     }
 
     this._highlighterPromise = this.getWalker().then(walker => {
-      return HighlighterActor(this, autohide);
+      let highlighter = HighlighterActor(this, autohide);
+      this.manage(highlighter);
+      return highlighter;
     });
     return this._highlighterPromise;
   }, {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/actors/pretty-print-worker.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/actors/pretty-print-worker.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/actors/pretty-print-worker.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/actors/pretty-print-worker.js	2015-05-25 20:43:54.000000000 +0000
@@ -27,27 +27,24 @@
  *     { id, error }
  */
 
+importScripts("resource://gre/modules/devtools/shared/worker-helper.js");
 importScripts("resource://gre/modules/devtools/acorn/acorn.js");
 importScripts("resource://gre/modules/devtools/source-map.js");
 importScripts("resource://gre/modules/devtools/pretty-fast.js");
 
-self.onmessage = (event) => {
-  const { data: { id, url, indent, source } } = event;
+workerHelper.createTask(self, "pretty-print", ({ url, indent, source }) => {
   try {
     const prettified = prettyFast(source, {
       url: url,
       indent: " ".repeat(indent)
     });
 
-    self.postMessage({
-      id: id,
+    return {
       code: prettified.code,
       mappings: prettified.map._mappings
-    });
-  } catch (e) {
-    self.postMessage({
-      id: id,
-      error: e.message + "\n" + e.stack
-    });
+    };
+  }
+  catch(e) {
+    return new Error(e.message + "\n" + e.stack);
   }
-};
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/actors/script.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/actors/script.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/actors/script.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/actors/script.js	2015-05-25 20:43:54.000000000 +0000
@@ -17,6 +17,9 @@
 const PromiseDebugging = require("PromiseDebugging");
 const xpcInspector = require("xpcInspector");
 const ScriptStore = require("./utils/ScriptStore");
+const {DevToolsWorker} = require("devtools/toolkit/shared/worker.js");
+
+const { defer, resolve, reject, all } = require("devtools/toolkit/deprecated-sync-thenables");
 
 loader.lazyGetter(this, "Debugger", () => {
   let Debugger = require("Debugger");
@@ -530,35 +533,15 @@
   _prettyPrintWorker: null,
   get prettyPrintWorker() {
     if (!this._prettyPrintWorker) {
-      this._prettyPrintWorker = new ChromeWorker(
-        "resource://gre/modules/devtools/server/actors/pretty-print-worker.js");
-
-      this._prettyPrintWorker.addEventListener(
-        "error", this._onPrettyPrintError, false);
-
-      if (dumpn.wantLogging) {
-        this._prettyPrintWorker.addEventListener("message", this._onPrettyPrintMsg, false);
-
-        const postMsg = this._prettyPrintWorker.postMessage;
-        this._prettyPrintWorker.postMessage = data => {
-          dumpn("Sending message to prettyPrintWorker: "
-                + JSON.stringify(data, null, 2) + "\n");
-          return postMsg.call(this._prettyPrintWorker, data);
-        };
-      }
+      this._prettyPrintWorker = new DevToolsWorker(
+        "resource://gre/modules/devtools/server/actors/pretty-print-worker.js",
+        { name: "pretty-print",
+          verbose: dumpn.wantLogging }
+      );
     }
     return this._prettyPrintWorker;
   },
 
-  _onPrettyPrintError: function ({ message, filename, lineno }) {
-    reportError(new Error(message + " @ " + filename + ":" + lineno));
-  },
-
-  _onPrettyPrintMsg: function ({ data }) {
-    dumpn("Received message from prettyPrintWorker: "
-          + JSON.stringify(data, null, 2) + "\n");
-  },
-
   /**
    * Keep track of all of the nested event loops we use to pause the debuggee
    * when we hit a breakpoint/debugger statement/etc in one place so we can
@@ -621,11 +604,7 @@
     this._threadLifetimePool = null;
 
     if (this._prettyPrintWorker) {
-      this._prettyPrintWorker.removeEventListener(
-        "error", this._onPrettyPrintError, false);
-      this._prettyPrintWorker.removeEventListener(
-        "message", this._onPrettyPrintMsg, false);
-      this._prettyPrintWorker.terminate();
+      this._prettyPrintWorker.destroy();
       this._prettyPrintWorker = null;
     }
 
@@ -764,7 +743,7 @@
           line: originalLocation.originalLine,
           column: originalLocation.originalColumn
         };
-        Promise.resolve(onPacket(packet))
+        resolve(onPacket(packet))
           .then(null, error => {
             reportError(error);
             return {
@@ -939,8 +918,8 @@
   _handleResumeLimit: function (aRequest) {
     let steppingType = aRequest.resumeLimit.type;
     if (["break", "step", "next", "finish"].indexOf(steppingType) == -1) {
-      return Promise.reject({ error: "badParameterType",
-                              message: "Unknown resumeLimit type" });
+      return reject({ error: "badParameterType",
+                      message: "Unknown resumeLimit type" });
     }
 
     const generatedLocation = this.sources.getFrameLocation(this.youngestFrame);
@@ -1053,7 +1032,7 @@
       resumeLimitHandled = this._handleResumeLimit(aRequest)
     } else {
       this._clearSteppingHooks(this.youngestFrame);
-      resumeLimitHandled = Promise.resolve(true);
+      resumeLimitHandled = resolve(true);
     }
 
     return resumeLimitHandled.then(() => {
@@ -1315,7 +1294,7 @@
       promises.push(promise);
     }
 
-    return Promise.all(promises).then(function () {
+    return all(promises).then(function () {
       return { frames: frames };
     });
   },
@@ -1355,8 +1334,8 @@
       }
     }
 
-    return Promise.all([this.sources.createSourceActors(script.source)
-                       for (script of sourcesToScripts.values())]);
+    return all([this.sources.createSourceActors(script.source)
+                for (script of sourcesToScripts.values())]);
   },
 
   onSources: function (aRequest) {
@@ -2508,7 +2487,7 @@
    * Handler for the "source" packet.
    */
   onSource: function () {
-    return Promise.resolve(this._init)
+    return resolve(this._init)
       .then(this._getSourceText)
       .then(({ content, contentType }) => {
         return {
@@ -2522,7 +2501,7 @@
         reportError(aError, "Got an exception during SA_onSource: ");
         return {
           "from": this.actorID,
-          "error": "loadSourceError",
+          "error": this.url,
           "message": "Could not load the source for " + this.url + ".\n"
             + DevToolsUtils.safeErrorString(aError)
         };
@@ -2569,31 +2548,11 @@
    */
   _sendToPrettyPrintWorker: function (aIndent) {
     return ({ content }) => {
-      const deferred = promise.defer();
-      const id = Math.random();
-
-      const onReply = ({ data }) => {
-        if (data.id !== id) {
-          return;
-        }
-        this.prettyPrintWorker.removeEventListener("message", onReply, false);
-
-        if (data.error) {
-          deferred.reject(new Error(data.error));
-        } else {
-          deferred.resolve(data);
-        }
-      };
-
-      this.prettyPrintWorker.addEventListener("message", onReply, false);
-      this.prettyPrintWorker.postMessage({
-        id: id,
+      return this.prettyPrintWorker.performTask("pretty-print", {
         url: this.url,
         indent: aIndent,
         source: content
-      });
-
-      return deferred.promise;
+      })
     };
   },
 
@@ -3863,10 +3822,6 @@
   }],
 
   Date: [function({obj, threadActor}, aGrip) {
-    if (!obj.proto || obj.proto.class != "Date") {
-      return false;
-    }
-
     let time = Date.prototype.getTime.call(obj.unsafeDereference());
 
     aGrip.preview = {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/actors/settings.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/actors/settings.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/actors/settings.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/actors/settings.js	2015-05-25 20:43:54.000000000 +0000
@@ -23,14 +23,9 @@
 };
 
 function getDefaultSettings() {
-  let chan = NetUtil.newChannel2(settingsFile,
-                                 null,
-                                 null,
-                                 null,      // aLoadingNode
-                                 Services.scriptSecurityManager.getSystemPrincipal(),
-                                 null,      // aTriggeringPrincipal
-                                 Ci.nsILoadInfo.SEC_NORMAL,
-                                 Ci.nsIContentPolicy.TYPE_OTHER);
+  let chan = NetUtil.newChannel({
+    uri: NetUtil.newURI(settingsFile),
+    loadUsingSystemPrincipal: true});
   let stream = chan.open();
   // Obtain a converter to read from a UTF-8 encoded input stream.
   let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/actors/styleeditor.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/actors/styleeditor.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/actors/styleeditor.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/actors/styleeditor.js	2015-05-25 20:43:54.000000000 +0000
@@ -17,6 +17,7 @@
 const protocol = require("devtools/server/protocol");
 const {Arg, Option, method, RetVal, types} = protocol;
 const {LongStringActor, ShortLongString} = require("devtools/server/actors/string");
+const {fetch} = require("devtools/toolkit/DevToolsUtils");
 
 loader.lazyGetter(this, "CssLogic", () => require("devtools/styleinspector/css-logic").CssLogic);
 
@@ -445,6 +446,7 @@
     }
 
     let options = {
+      policy: Ci.nsIContentPolicy.TYPE_STYLESHEET,
       window: this.window,
       charset: this._getCSSCharset()
     };
@@ -637,157 +639,6 @@
 
 
 /**
- * Performs a request to load the desired URL and returns a promise.
- *
- * @param aURL String
- *        The URL we will request.
- * @returns Promise
- *        A promise of the document at that URL, as a string.
- */
-function fetch(aURL, aOptions={ loadFromCache: true, window: null,
-                                charset: null}) {
-  let deferred = promise.defer();
-  let scheme;
-  let url = aURL.split(" -> ").pop();
-  let charset;
-  let contentType;
-
-  try {
-    scheme = Services.io.extractScheme(url);
-  } catch (e) {
-    // In the xpcshell tests, the script url is the absolute path of the test
-    // file, which will make a malformed URI error be thrown. Add the file
-    // scheme prefix ourselves.
-    url = "file://" + url;
-    scheme = Services.io.extractScheme(url);
-  }
-
-  switch (scheme) {
-    case "file":
-    case "chrome":
-    case "resource":
-      try {
-        NetUtil.asyncFetch2(
-          url,
-          function onFetch(aStream, aStatus, aRequest) {
-            if (!components.isSuccessCode(aStatus)) {
-              deferred.reject(new Error("Request failed with status code = "
-                                        + aStatus
-                                        + " after NetUtil.asyncFetch2 for url = "
-                                        + url));
-              return;
-            }
-
-            let source = NetUtil.readInputStreamToString(aStream, aStream.available());
-            contentType = aRequest.contentType;
-            deferred.resolve(source);
-            aStream.close();
-          },
-          null,      // aLoadingNode
-          Services.scriptSecurityManager.getSystemPrincipal(),
-          null,      // aTriggeringPrincipal
-          Ci.nsILoadInfo.SEC_NORMAL,
-          Ci.nsIContentPolicy.TYPE_STYLESHEET);
-      } catch (ex) {
-        deferred.reject(ex);
-      }
-      break;
-
-    default:
-      let channel;
-      try {
-        channel = Services.io.newChannel2(url,
-                                          null,
-                                          null,
-                                          null,      // aLoadingNode
-                                          Services.scriptSecurityManager.getSystemPrincipal(),
-                                          null,      // aTriggeringPrincipal
-                                          Ci.nsILoadInfo.SEC_NORMAL,
-                                          Ci.nsIContentPolicy.TYPE_STYLESHEET);
-      } catch (e if e.name == "NS_ERROR_UNKNOWN_PROTOCOL") {
-        // On Windows xpcshell tests, c:/foo/bar can pass as a valid URL, but
-        // newChannel won't be able to handle it.
-        url = "file:///" + url;
-        channel = Services.io.newChannel2(url,
-                                          null,
-                                          null,
-                                          null,      // aLoadingNode
-                                          Services.scriptSecurityManager.getSystemPrincipal(),
-                                          null,      // aTriggeringPrincipal
-                                          Ci.nsILoadInfo.SEC_NORMAL,
-                                          Ci.nsIContentPolicy.TYPE_STYLESHEET);
-      }
-      let chunks = [];
-      let streamListener = {
-        onStartRequest: function(aRequest, aContext, aStatusCode) {
-          if (!components.isSuccessCode(aStatusCode)) {
-            deferred.reject(new Error("Request failed with status code = "
-                                      + aStatusCode
-                                      + " in onStartRequest handler for url = "
-                                      + url));
-          }
-        },
-        onDataAvailable: function(aRequest, aContext, aStream, aOffset, aCount) {
-          chunks.push(NetUtil.readInputStreamToString(aStream, aCount));
-        },
-        onStopRequest: function(aRequest, aContext, aStatusCode) {
-          if (!components.isSuccessCode(aStatusCode)) {
-            deferred.reject(new Error("Request failed with status code = "
-                                      + aStatusCode
-                                      + " in onStopRequest handler for url = "
-                                      + url));
-            return;
-          }
-
-          charset = channel.contentCharset || charset;
-          contentType = channel.contentType;
-          deferred.resolve(chunks.join(""));
-        }
-      };
-
-      if (aOptions.window) {
-        // respect private browsing
-        channel.loadGroup = aOptions.window.QueryInterface(Ci.nsIInterfaceRequestor)
-                              .getInterface(Ci.nsIWebNavigation)
-                              .QueryInterface(Ci.nsIDocumentLoader)
-                              .loadGroup;
-      }
-      channel.loadFlags = aOptions.loadFromCache
-        ? channel.LOAD_FROM_CACHE
-        : channel.LOAD_BYPASS_CACHE;
-      channel.asyncOpen(streamListener, null);
-      break;
-  }
-
-  return deferred.promise.then(source => {
-    return {
-      content: convertToUnicode(source, charset),
-      contentType: contentType
-    };
-  });
-}
-
-/**
- * Convert a given string, encoded in a given character set, to unicode.
- *
- * @param string aString
- *        A string.
- * @param string aCharset
- *        A character set.
- */
-function convertToUnicode(aString, aCharset=null) {
-  // Decoding primitives.
-  let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
-    .createInstance(Ci.nsIScriptableUnicodeConverter);
-  try {
-    converter.charset = aCharset || "UTF-8";
-    return converter.ConvertToUnicode(aString);
-  } catch(e) {
-    return aString;
-  }
-}
-
-/**
  * Normalize multiple relative paths towards the base paths on the right.
  */
 function normalize(...aURLs) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/actors/stylesheets.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/actors/stylesheets.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/actors/stylesheets.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/actors/stylesheets.js	2015-05-25 20:43:54.000000000 +0000
@@ -18,6 +18,7 @@
 const protocol = require("devtools/server/protocol");
 const {Arg, Option, method, RetVal, types} = protocol;
 const {LongStringActor, ShortLongString} = require("devtools/server/actors/string");
+const {fetch} = require("devtools/toolkit/DevToolsUtils");
 
 loader.lazyGetter(this, "CssLogic", () => require("devtools/styleinspector/css-logic").CssLogic);
 
@@ -589,8 +590,9 @@
     }
 
     let options = {
-      window: this.window,
       loadFromCache: true,
+      policy: Ci.nsIContentPolicy.TYPE_STYLESHEET,
+      window: this.window,
       charset: this._getCSSCharset()
     };
 
@@ -673,8 +675,12 @@
       };
 
       url = normalize(url, this.href);
-
-      let map = fetch(url, { loadFromCache: false, window: this.window })
+      let options = {
+        loadFromCache: false,
+        policy: Ci.nsIContentPolicy.TYPE_STYLESHEET,
+        window: this.window
+      };
+      let map = fetch(url, options)
         .then(({content}) => {
           let map = new SourceMapConsumer(content);
           this._setSourceMapRoot(map, url, this.href);
@@ -1031,7 +1037,11 @@
       this.text = content;
       return promise.resolve(content);
     }
-    return fetch(this.url, { window: this.window }).then(({content}) => {
+    let options = {
+      policy: Ci.nsIContentPolicy.TYPE_STYLESHEET,
+      window: this.window
+    };
+    return fetch(this.url, options).then(({content}) => {
       this.text = content;
       return content;
     });
@@ -1087,157 +1097,6 @@
 
 
 /**
- * Performs a request to load the desired URL and returns a promise.
- *
- * @param aURL String
- *        The URL we will request.
- * @returns Promise
- *        A promise of the document at that URL, as a string.
- */
-function fetch(aURL, aOptions={ loadFromCache: true, window: null,
-                                charset: null}) {
-  let deferred = promise.defer();
-  let scheme;
-  let url = aURL.split(" -> ").pop();
-  let charset;
-  let contentType;
-
-  try {
-    scheme = Services.io.extractScheme(url);
-  } catch (e) {
-    // In the xpcshell tests, the script url is the absolute path of the test
-    // file, which will make a malformed URI error be thrown. Add the file
-    // scheme prefix ourselves.
-    url = "file://" + url;
-    scheme = Services.io.extractScheme(url);
-  }
-
-  switch (scheme) {
-    case "file":
-    case "chrome":
-    case "resource":
-      try {
-        NetUtil.asyncFetch2(
-          url,
-          function onFetch(aStream, aStatus, aRequest) {
-            if (!components.isSuccessCode(aStatus)) {
-              deferred.reject(new Error("Request failed with status code = "
-                                        + aStatus
-                                        + " after NetUtil.asyncFetch2 for url = "
-                                        + url));
-              return;
-            }
-
-            let source = NetUtil.readInputStreamToString(aStream, aStream.available());
-            contentType = aRequest.contentType;
-            deferred.resolve(source);
-            aStream.close();
-          },
-          null,      // aLoadingNode
-          Services.scriptSecurityManager.getSystemPrincipal(),
-          null,      // aTriggeringPrincipal
-          Ci.nsILoadInfo.SEC_NORMAL,
-          Ci.nsIContentPolicy.TYPE_STYLESHEET);
-      } catch (ex) {
-        deferred.reject(ex);
-      }
-      break;
-
-    default:
-      let channel;
-      try {
-        channel = Services.io.newChannel2(url,
-                                          null,
-                                          null,
-                                          null,      // aLoadingNode
-                                          Services.scriptSecurityManager.getSystemPrincipal(),
-                                          null,      // aTriggeringPrincipal
-                                          Ci.nsILoadInfo.SEC_NORMAL,
-                                          Ci.nsIContentPolicy.TYPE_STYLESHEET);
-      } catch (e if e.name == "NS_ERROR_UNKNOWN_PROTOCOL") {
-        // On Windows xpcshell tests, c:/foo/bar can pass as a valid URL, but
-        // newChannel won't be able to handle it.
-        url = "file:///" + url;
-        channel = Services.io.newChannel2(url,
-                                          null,
-                                          null,
-                                          null,      // aLoadingNode
-                                          Services.scriptSecurityManager.getSystemPrincipal(),
-                                          null,      // aTriggeringPrincipal
-                                          Ci.nsILoadInfo.SEC_NORMAL,
-                                          Ci.nsIContentPolicy.TYPE_STYLESHEET);
-      }
-      let chunks = [];
-      let streamListener = {
-        onStartRequest: function(aRequest, aContext, aStatusCode) {
-          if (!components.isSuccessCode(aStatusCode)) {
-            deferred.reject(new Error("Request failed with status code = "
-                                      + aStatusCode
-                                      + " in onStartRequest handler for url = "
-                                      + url));
-          }
-        },
-        onDataAvailable: function(aRequest, aContext, aStream, aOffset, aCount) {
-          chunks.push(NetUtil.readInputStreamToString(aStream, aCount));
-        },
-        onStopRequest: function(aRequest, aContext, aStatusCode) {
-          if (!components.isSuccessCode(aStatusCode)) {
-            deferred.reject(new Error("Request failed with status code = "
-                                      + aStatusCode
-                                      + " in onStopRequest handler for url = "
-                                      + url));
-            return;
-          }
-
-          charset = channel.contentCharset || charset;
-          contentType = channel.contentType;
-          deferred.resolve(chunks.join(""));
-        }
-      };
-
-      if (aOptions.window) {
-        // respect private browsing
-        channel.loadGroup = aOptions.window.QueryInterface(Ci.nsIInterfaceRequestor)
-                              .getInterface(Ci.nsIWebNavigation)
-                              .QueryInterface(Ci.nsIDocumentLoader)
-                              .loadGroup;
-      }
-      channel.loadFlags = aOptions.loadFromCache
-        ? channel.LOAD_FROM_CACHE
-        : channel.LOAD_BYPASS_CACHE;
-      channel.asyncOpen(streamListener, null);
-      break;
-  }
-
-  return deferred.promise.then(source => {
-    return {
-      content: convertToUnicode(source, charset),
-      contentType: contentType
-    };
-  });
-}
-
-/**
- * Convert a given string, encoded in a given character set, to unicode.
- *
- * @param string aString
- *        A string.
- * @param string aCharset
- *        A character set.
- */
-function convertToUnicode(aString, aCharset=null) {
-  // Decoding primitives.
-  let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
-    .createInstance(Ci.nsIScriptableUnicodeConverter);
-  try {
-    converter.charset = aCharset || "UTF-8";
-    return converter.ConvertToUnicode(aString);
-  } catch(e) {
-    return aString;
-  }
-}
-
-/**
  * Normalize multiple relative paths towards the base paths on the right.
  */
 function normalize(...aURLs) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/actors/styles.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/actors/styles.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/actors/styles.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/actors/styles.js	2015-05-25 20:43:54.000000000 +0000
@@ -851,7 +851,7 @@
     if (rawNode.id) {
       selector = "#" + rawNode.id;
     } else if (rawNode.className) {
-      selector = "." + rawNode.className.split(" ")[0];
+      selector = "." + rawNode.className.split(" ").join(".");
     } else {
       selector = rawNode.tagName.toLowerCase();
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/actors/webbrowser.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/actors/webbrowser.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/actors/webbrowser.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/actors/webbrowser.js	2015-05-25 20:43:54.000000000 +0000
@@ -725,7 +725,15 @@
   // Used on b2g to catch activity frames and in chrome to list all frames
   this.listenForNewDocShells = Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT;
 
-  this.traits = { reconfigure: true, frames: true };
+  this.traits = {
+    reconfigure: true,
+    // Supports frame listing via `listFrames` request and `frameUpdate` events
+    // as well as frame switching via `switchToFrame` request
+    frames: true,
+    // Do not require to send reconfigure request to reset the document state
+    // to what it was before using the TabActor
+    noTabReconfigureOnClose: true
+  };
 
   this._workerActorList = null;
   this._workerActorPool = null;
@@ -970,7 +978,6 @@
     });
 
     this._extraActors = null;
-    this._styleSheetActors.clear();
 
     this._exited = true;
   },
@@ -1300,6 +1307,7 @@
     // during Firefox shutdown.
     if (this.docShell) {
       this._progressListener.unwatch(this.docShell);
+      this._restoreDocumentSettings();
     }
     if (this._progressListener) {
       this._progressListener.destroy();
@@ -1316,6 +1324,10 @@
     this._popContext();
 
     // Shut down actors that belong to this tab's pool.
+    for (let sheetActor of this._styleSheetActors.values()) {
+      this._tabPool.removeActor(sheetActor);
+    }
+    this._styleSheetActors.clear();
     this.conn.removeActorPool(this._tabPool);
     this._tabPool = null;
     if (this._tabActorPool) {
@@ -1390,14 +1402,19 @@
   onReconfigure: function (aRequest) {
     let options = aRequest.options || {};
 
-    this._toggleDevtoolsSettings(options);
+    if (!this.docShell) {
+      // The tab is already closed.
+      return {};
+    }
+    this._toggleDevToolsSettings(options);
+
     return {};
   },
 
   /**
    * Handle logic to enable/disable JS/cache/Service Worker testing.
    */
-  _toggleDevtoolsSettings: function(options) {
+  _toggleDevToolsSettings: function(options) {
     // Wait a tick so that the response packet can be dispatched before the
     // subsequent navigation event packet.
     let reload = false;
@@ -1430,6 +1447,16 @@
   },
 
   /**
+   * Opposite of the _toggleDevToolsSettings method, that reset document state
+   * when closing the toolbox.
+   */
+  _restoreDocumentSettings: function () {
+    this._restoreJavascript();
+    this._setCacheDisabled(false);
+    this._setServiceWorkersTestingEnabled(false);
+  },
+
+  /**
    * Disable or enable the cache via docShell.
    */
   _setCacheDisabled: function(disabled) {
@@ -1437,29 +1464,46 @@
     let disable = Ci.nsIRequest.LOAD_BYPASS_CACHE |
                   Ci.nsIRequest.INHIBIT_CACHING;
 
-    if (this.docShell) {
-      this.docShell.defaultLoadFlags = disabled ? disable : enable;
-    }
+    this.docShell.defaultLoadFlags = disabled ? disable : enable;
   },
 
   /**
    * Disable or enable JS via docShell.
    */
+  _wasJavascriptEnabled: null,
   _setJavascriptEnabled: function(allow) {
-    if (this.docShell) {
-      this.docShell.allowJavascript = allow;
+    if (this._wasJavascriptEnabled === null) {
+      this._wasJavascriptEnabled = this.docShell.allowJavascript;
     }
+    this.docShell.allowJavascript = allow;
   },
 
   /**
-   * Disable or enable the service workers testing features.
+   * Restore JS state, before the actor modified it.
    */
-  _setServiceWorkersTestingEnabled: function(enabled) {
+  _restoreJavascript: function () {
+    if (this._wasJavascriptEnabled !== null) {
+      this._setJavascriptEnabled(this._wasJavascriptEnabled);
+      this._wasJavascriptEnabled = null;
+    }
+  },
+
+  /**
+   * Return JS allowed status.
+   */
+  _getJavascriptEnabled: function() {
     if (!this.docShell) {
       // The tab is already closed.
       return null;
     }
 
+    return this.docShell.allowJavascript;
+  },
+
+  /**
+   * Disable or enable the service workers testing features.
+   */
+  _setServiceWorkersTestingEnabled: function(enabled) {
     let windowUtils = this.window.QueryInterface(Ci.nsIInterfaceRequestor)
                                  .getInterface(Ci.nsIDOMWindowUtils);
     windowUtils.serviceWorkersTestingEnabled = enabled;
@@ -1480,18 +1524,6 @@
   },
 
   /**
-   * Return JS allowed status.
-   */
-  _getJavascriptEnabled: function() {
-    if (!this.docShell) {
-      // The tab is already closed.
-      return null;
-    }
-
-    return this.docShell.allowJavascript;
-  },
-
-  /**
    * Return service workers testing allowed status.
    */
   _getServiceWorkersTestingEnabled: function() {
@@ -1613,12 +1645,6 @@
       threadActor.global = window;
     }
 
-    for (let sheetActor of this._styleSheetActors.values()) {
-      this._tabPool.removeActor(sheetActor);
-    }
-    this._styleSheetActors.clear();
-
-
     // Refresh the debuggee list when a new window object appears (top window or
     // iframe).
     if (threadActor.attached) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/actors/worker.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/actors/worker.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/actors/worker.js	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/actors/worker.js	2015-05-25 20:43:54.000000000 +0000
@@ -27,6 +27,7 @@
 
 function WorkerActor(dbg) {
   this._dbg = dbg;
+  this._isAttached = false;
 }
 
 WorkerActor.prototype = {
@@ -37,9 +38,61 @@
       actor: this.actorID,
       url: this._dbg.url
     };
+  },
+
+  onAttach: function () {
+    if (this._dbg.isClosed) {
+      return { error: "closed" };
+    }
+
+    if (!this._isAttached) {
+      this._dbg.addListener(this);
+      this._isAttached = true;
+    }
+
+    return {
+      type: "attached",
+      isFrozen: this._dbg.isFrozen
+    };
+  },
+
+  onDetach: function () {
+    if (!this._isAttached) {
+      return { error: "wrongState" };
+    }
+
+    this._detach();
+
+    return { type: "detached" };
+  },
+
+  onClose: function () {
+    if (this._isAttached) {
+      this._detach();
+    }
+
+    this.conn.sendActorEvent(this.actorID, "close");
+  },
+
+  onFreeze: function () {
+    this.conn.sendActorEvent(this.actorID, "freeze");
+  },
+
+  onThaw: function () {
+    this.conn.sendActorEvent(this.actorID, "thaw");
+  },
+
+  _detach: function () {
+    this._dbg.removeListener(this);
+    this._isAttached = false;
   }
 };
 
+WorkerActor.prototype.requestTypes = {
+  "attach": WorkerActor.prototype.onAttach,
+  "detach": WorkerActor.prototype.onDetach
+};
+
 exports.WorkerActor = WorkerActor;
 
 function WorkerActorList(options) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html	2015-05-13 18:06:11.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html	2015-05-25 20:43:54.000000000 +0000
@@ -104,8 +104,8 @@
   var fnDO = iframeDO.getOwnPropertyDescriptor('auddie').value;
   var AuddieDO = iframeDO.makeDebuggeeValue(doc.getElementById('Auddie'));
 
-  ise(fnDO.class, 'Function',
-      "Script element 'Auddie' defined function 'auddie'.");
+  is(fnDO.class, 'Function',
+     "Script element 'Auddie' defined function 'auddie'.");
   ok(fnDO.script.source.element === AuddieDO,
      "Function auddie's script belongs to script element 'Auddie'");
   is(fnDO.script.source.elementAttributeName, undefined,
@@ -159,18 +159,18 @@
     var xulDoc = xulFrame.contentWindow.document;
     var xulieDO = xulFrameDO.makeDebuggeeValue(xulDoc.getElementById('xulie'));
     var xulFnDO = xulFrameDO.getOwnPropertyDescriptor('xulScriptFunc').value;
-    ise(typeof xulFnDO, 'object', "XUL script element defined 'xulScriptFunc'");
-    ise(xulFnDO.class, 'Function',
-        "XUL global 'xulScriptFunc' is indeed a function");
+    is(typeof xulFnDO, 'object', "XUL script element defined 'xulScriptFunc'");
+    is(xulFnDO.class, 'Function',
+       "XUL global 'xulScriptFunc' is indeed a function");
 
     // A XUL document's script elements' code gets shared amongst all
     // instantiations of the document, so there's no specific DOM element
     // we can attribute the code to.
-    ise(xulFnDO.script.source.element, undefined,
-        "XUL script code should not be attributed to any individual element");
+    is(xulFnDO.script.source.element, undefined,
+       "XUL script code should not be attributed to any individual element");
 
-    ise(xulFnDO.script.source.introductionType, 'scriptElement',
-        "xulScriptFunc's introduction type is 'scriptElement'");
+    is(xulFnDO.script.source.introductionType, 'scriptElement',
+       "xulScriptFunc's introduction type is 'scriptElement'");
     runNextTest();
   }
 });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-childlist.html firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-childlist.html
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-childlist.html	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-childlist.html	2015-05-25 20:43:54.000000000 +0000
@@ -233,7 +233,7 @@
     is(change.removed.length, 1, "Should have removed a child.");
     let ownership = clientOwnershipTree(gWalker);
     is(ownership.orphaned.length, 1, "Should have one orphaned subtree.");
-    is(ownershipTreeSize(ownership.orphaned[0]), 27, "Should have orphaned longlist and 26 children.");
+    is(ownershipTreeSize(ownership.orphaned[0]), 1 + 26 + 26, "Should have orphaned longlist, and 26 children, and 26 singleTextChilds");
   }
 }));
 
@@ -268,7 +268,7 @@
     is(change.removed.length, 1, "Should have removed a child.");
     let ownership = clientOwnershipTree(gWalker);
     is(ownership.orphaned.length, 1, "Should have one orphaned subtree.");
-    is(ownershipTreeSize(ownership.orphaned[0]), 27, "Should have orphaned longlist and 26 children.");
+    is(ownershipTreeSize(ownership.orphaned[0]), 1 + 26 + 26, "Should have orphaned longlist, 26 children, and 26 singleTextChilds.");
   }
 }));
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/tests/mochitest/test_inspector-release.html firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/tests/mochitest/test_inspector-release.html
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/tests/mochitest/test_inspector-release.html	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/tests/mochitest/test_inspector-release.html	2015-05-25 20:43:54.000000000 +0000
@@ -52,7 +52,18 @@
     return list.items();
   }).then((items)=> {
     originalOwnershipSize = assertOwnership();
-    ok(originalOwnershipSize > 26, "Should have at least 26 items in our ownership tree");
+
+    // Here is how the ownership tree is summed up:
+    // #document                      1
+    //   <html>                       1
+    //     <body>                     1
+    //       <div id=longlist>        1
+    //         <div id=a>a</div>   26*2 (each child plus it's singleTextChild)
+    //         ...
+    //         <div id=z>z</div>
+    //                             -----
+    //                               56
+    is(originalOwnershipSize, 56, "Correct number of items in ownership tree");
     firstChild = items[0].actorID;
   }).then(() => {
     // Now get the longlist and release it from the ownership tree.
@@ -61,9 +72,10 @@
     longlist = node.actorID;
     return gWalker.releaseNode(node);
   }).then(() => {
-    // Our ownership size should now be 27 fewer (we forgot about #longlist + 26 children)
+    // Our ownership size should now be 53 fewer (we forgot about #longlist + 26 children + 26 singleTextChild nodes)
     let newOwnershipSize = assertOwnership();
-    is(newOwnershipSize, originalOwnershipSize - 27, "Ownership tree should have dropped by 27 nodes");
+    is(newOwnershipSize, originalOwnershipSize - 53,
+      "Ownership tree should be lower");
     // Now verify that some nodes have gone away
     return checkMissing(gClient, longlist);
   }).then(() => {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/tests/mochitest/test_inspector-remove.html firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/tests/mochitest/test_inspector-remove.html
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/server/tests/mochitest/test_inspector-remove.html	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/server/tests/mochitest/test_inspector-remove.html	2015-05-25 20:43:54.000000000 +0000
@@ -70,16 +70,29 @@
     return gWalker.children(longlist);
   }).then((items)=> {
     originalOwnershipSize = assertOwnership();
-    ok(originalOwnershipSize > 26, "Should have at least 26 items in our ownership tree");
+    // Here is how the ownership tree is summed up:
+    // #document                      1
+    //   <html>                       1
+    //     <body>                     1
+    //       <div id=longlist>        1
+    //         <div id=a>a</div>   26*2 (each child plus it's singleTextChild)
+    //         ...
+    //         <div id=z>z</div>
+    //                             -----
+    //                               56
+    is(originalOwnershipSize, 56, "Correct number of items in ownership tree");
     return gWalker.removeNode(longlist);
   }).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 25 fewer (we forgot about #longlist + 26 children, but learned about #longlist's prev/next sibling)
+    // Our ownership size should now be 51 fewer (we forgot about #longlist + 26
+    // children + 26 singleTextChild nodes, but learned about #longlist's
+    // prev/next sibling)
     let newOwnershipSize = assertOwnership();
-    is(newOwnershipSize, originalOwnershipSize - 25, "Ownership tree should have dropped by 25 nodes");
+    is(newOwnershipSize, originalOwnershipSize - 51,
+      "Ownership tree should be lower");
     // Now verify that some nodes have gone away
     return checkMissing(gClient, longlistID);
   }).then(runNextTest));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/shared/moz.build firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/shared/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/shared/moz.build	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/shared/moz.build	2015-05-25 20:43:55.000000000 +0000
@@ -7,5 +7,7 @@
 BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
 
 EXTRA_JS_MODULES.devtools.shared += [
-  'async-storage.js'
+  'async-storage.js',
+  'worker-helper.js',
+  'worker.js'
 ]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/shared/tests/browser/browser.ini firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/shared/tests/browser/browser.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/shared/tests/browser/browser.ini	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/shared/tests/browser/browser.ini	2015-05-25 20:43:55.000000000 +0000
@@ -5,3 +5,6 @@
   ../../../server/tests/browser/head.js
 
 [browser_async_storage.js]
+[browser_worker-01.js]
+[browser_worker-02.js]
+[browser_worker-03.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/shared/tests/browser/browser_worker-01.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/shared/tests/browser/browser_worker-01.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/shared/tests/browser/browser_worker-01.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/shared/tests/browser/browser_worker-01.js	2015-05-25 20:43:55.000000000 +0000
@@ -0,0 +1,44 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Tests that the devtools/shared/worker communicates properly
+// as both CommonJS module and as a JSM.
+
+const WORKER_URL = "resource:///modules/devtools/GraphsWorker.js";
+
+const count = 100000;
+const WORKER_DATA = (function () {
+  let timestamps = [];
+  for (let i = 0; i < count; i++) {
+    timestamps.push(i);
+  }
+  return timestamps;
+})();
+const INTERVAL = 100;
+const DURATION = 1000;
+
+add_task(function*() {
+  // Test both CJS and JSM versions
+
+  yield testWorker("JSM", () => Cu.import("resource://gre/modules/devtools/shared/worker.js", {}));
+  yield testWorker("CommonJS", () => require("devtools/toolkit/shared/worker"));
+});
+
+function *testWorker (context, workerFactory) {
+  let { DevToolsWorker, workerify } = workerFactory();
+  let worker = new DevToolsWorker(WORKER_URL);
+  let results = yield worker.performTask("plotTimestampsGraph", {
+    timestamps: WORKER_DATA,
+    interval: INTERVAL,
+    duration: DURATION
+  });
+
+  ok(results.plottedData.length,
+    `worker should have returned an object with array properties in ${context}`);
+
+  let fn = workerify(function (x) { return x * x });
+  is((yield fn(5)), 25, `workerify works in ${context}`);
+  fn.destroy();
+
+  worker.destroy();
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/shared/tests/browser/browser_worker-02.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/shared/tests/browser/browser_worker-02.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/shared/tests/browser/browser_worker-02.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/shared/tests/browser/browser_worker-02.js	2015-05-25 20:43:55.000000000 +0000
@@ -0,0 +1,46 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Tests errors are handled properly by the DevToolsWorker.
+
+const { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+const { DevToolsWorker } = devtools.require("devtools/toolkit/shared/worker");
+const WORKER_URL = "resource:///modules/devtools/GraphsWorker.js";
+
+add_task(function*() {
+  try {
+    let workerNotFound = new DevToolsWorker("resource://i/dont/exist.js");
+    ok(false, "Creating a DevToolsWorker with an invalid URL throws");
+  } catch (e) {
+    ok(true, "Creating a DevToolsWorker with an invalid URL throws");
+  }
+
+  let worker = new DevToolsWorker(WORKER_URL);
+  try {
+    // plotTimestampsGraph requires timestamp, interval an duration props on the object
+    // passed in so there should be an error thrown in the worker
+    let results = yield worker.performTask("plotTimestampsGraph", {});
+    ok(false, "DevToolsWorker returns a rejected promise when an error occurs in the worker");
+  } catch (e) {
+    ok(true, "DevToolsWorker returns a rejected promise when an error occurs in the worker");
+  }
+
+  try {
+    let results = yield worker.performTask("not a real task");
+    ok(false, "DevToolsWorker returns a rejected promise when task does not exist");
+  } catch (e) {
+    ok(true, "DevToolsWorker returns a rejected promise when task does not exist");
+  }
+
+  worker.destroy();
+  try {
+    let results = yield worker.performTask("plotTimestampsGraph", {
+      timestamps: [0,1,2,3,4,5,6,7,8,9],
+      interval: 1,
+      duration: 1
+    });
+    ok(false, "DevToolsWorker rejects when performing a task on a destroyed worker");
+  } catch (e) {
+    ok(true, "DevToolsWorker rejects when performing a task on a destroyed worker");
+  };
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/shared/tests/browser/browser_worker-03.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/shared/tests/browser/browser_worker-03.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/shared/tests/browser/browser_worker-03.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/shared/tests/browser/browser_worker-03.js	2015-05-25 20:43:55.000000000 +0000
@@ -0,0 +1,52 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Tests that the devtools/shared/worker can handle:
+// returned primitives (or promise or Error)
+//
+// And tests `workerify` by doing so.
+
+const { DevToolsWorker, workerify } = require("devtools/toolkit/shared/worker");
+function square (x) {
+  return x * x;
+}
+
+function squarePromise (x) {
+  return new Promise((resolve) => resolve(x*x));
+}
+
+function squareError (x) {
+  return new Error("Nope");
+}
+
+function squarePromiseReject (x) {
+  return new Promise((_, reject) => reject("Nope"));
+}
+
+add_task(function*() {
+  let fn = workerify(square);
+  is((yield fn(5)), 25, "return primitives successful");
+  fn.destroy();
+
+  fn = workerify(squarePromise);
+  is((yield fn(5)), 25, "promise primitives successful");
+  fn.destroy();
+
+  fn = workerify(squareError);
+  try {
+    yield fn(5);
+    ok(false, "return error should reject");
+  } catch (e) {
+    ok(true, "return error should reject");
+  }
+  fn.destroy();
+
+  fn = workerify(squarePromiseReject);
+  try {
+    yield fn(5);
+    ok(false, "returned rejected promise rejects");
+  } catch (e) {
+    ok(true, "returned rejected promise rejects");
+  }
+  fn.destroy();
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/shared/worker-helper.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/shared/worker-helper.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/shared/worker-helper.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/shared/worker-helper.js	2015-05-25 20:43:55.000000000 +0000
@@ -0,0 +1,112 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 (root, factory) {
+  "use strict";
+
+  if (typeof define === "function" && define.amd) {
+    define(factory);
+  } else if (typeof exports === "object") {
+    module.exports = factory();
+  } else {
+    root.workerHelper = factory();
+  }
+}(this, function () {
+  "use strict";
+
+  /**
+   * This file is to only be included by ChromeWorkers. This exposes
+   * a `createTask` function to workers to register tasks for communication
+   * back to `devtools/toolkit/shared/worker`.
+   *
+   * Tasks can be send their responses via a return value, either a primitive
+   * or a promise.
+   *
+   * createTask(self, "average", function (data) {
+   *   return data.reduce((sum, val) => sum + val, 0) / data.length;
+   * });
+   *
+   * createTask(self, "average", function (data) {
+   *   return new Promise((resolve, reject) => {
+   *     resolve(data.reduce((sum, val) => sum + val, 0) / data.length);
+   *   });
+   * });
+   *
+   *
+   * Errors:
+   *
+   * Returning an Error value, or if the returned promise is rejected, this
+   * propagates to the DevToolsWorker as a rejected promise. If an error is
+   * thrown in a synchronous function, that error is also propagated.
+   */
+
+  /**
+   * Takes a worker's `self` object, a task name, and a function to
+   * be called when that task is called. The task is called with the
+   * passed in data as the first argument
+   *
+   * @param {object} self
+   * @param {string} name
+   * @param {function} fn
+   */
+  function createTask (self, name, fn) {
+    // Store a hash of task name to function on the Worker
+    if (!self._tasks) {
+      self._tasks = {};
+    }
+
+    // Create the onmessage handler if not yet created.
+    if (!self.onmessage) {
+      self.onmessage = createHandler(self);
+    }
+
+    // Store the task on the worker.
+    self._tasks[name] = fn;
+  }
+
+  /**
+   * Creates the `self.onmessage` handler for a Worker.
+   *
+   * @param {object} self
+   * @return {function}
+   */
+  function createHandler (self) {
+    return function (e) {
+      let { id, task, data } = e.data;
+      let taskFn = self._tasks[task];
+
+      if (!taskFn) {
+        self.postMessage({ id, error: `Task "${task}" not found in worker.` });
+        return;
+      }
+
+      try {
+        let results;
+        handleResponse(taskFn(data));
+      } catch (e) {
+        handleError(e);
+      }
+
+      function handleResponse (response) {
+        // If a promise
+        if (response && typeof response.then === "function") {
+          response.then(val => self.postMessage({ id, response: val }), handleError);
+        }
+        // If an error object
+        else if (response instanceof Error) {
+          handleError(response);
+        }
+        // If anything else
+        else {
+          self.postMessage({ id, response });
+        }
+      }
+
+      function handleError (e="Error") {
+        self.postMessage({ id, error: e.message || e });
+      }
+    }
+  }
+
+  return { createTask: createTask };
+}.bind(this)));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/shared/worker.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/shared/worker.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/shared/worker.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/shared/worker.js	2015-05-25 20:43:55.000000000 +0000
@@ -0,0 +1,168 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+(function (factory) { // Module boilerplate
+  if (this.module && module.id.indexOf("worker") >= 0) { // require
+    const { Cc, Ci, Cu, ChromeWorker } = require("chrome");
+    const dumpn = require("devtools/toolkit/DevToolsUtils").dumpn;
+    factory.call(this, require, exports, module, { Cc, Ci, Cu }, ChromeWorker, dumpn);
+  } else { // Cu.import
+    const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+    const { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+    this.isWorker = false;
+    this.Promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
+    this.console = Cu.import("resource://gre/modules/devtools/Console.jsm", {}).console;
+    factory.call(
+      this, devtools.require, this, { exports: this },
+      { Cc, Ci, Cu }, ChromeWorker, null
+    );
+    this.EXPORTED_SYMBOLS = ["DevToolsWorker"];
+  }
+}).call(this, function (require, exports, module, { Ci, Cc }, ChromeWorker, dumpn) {
+
+let MESSAGE_COUNTER = 0;
+
+/**
+ * Creates a wrapper around a ChromeWorker, providing easy
+ * communication to offload demanding tasks. The corresponding URL
+ * must implement the interface provided by `devtools/toolkit/shared/worker-helper`.
+ *
+ * @see `./browser/devtools/shared/widgets/GraphsWorker.js`
+ *
+ * @param {string} url
+ *        The URL of the worker.
+ * @param Object opts
+ *        An option with the following optional fields:
+ *        - name: a name that will be printed with logs
+ *        - verbose: log incoming and outgoing messages
+ */
+function DevToolsWorker (url, opts) {
+  opts = opts || {};
+  this._worker = new ChromeWorker(url);
+  this._verbose = opts.verbose;
+  this._name = opts.name;
+
+  this._worker.addEventListener("error", this.onError, false);
+}
+exports.DevToolsWorker = DevToolsWorker;
+
+/**
+ * Performs the given task in a chrome worker, passing in data.
+ * Returns a promise that resolves when the task is completed, resulting in
+ * the return value of the task.
+ *
+ * @param {string} task
+ *        The name of the task to execute in the worker.
+ * @param {any} data
+ *        Data to be passed into the task implemented by the worker.
+ * @return {Promise}
+ */
+DevToolsWorker.prototype.performTask = function (task, data) {
+  if (this._destroyed) {
+    return Promise.reject("Cannot call performTask on a destroyed DevToolsWorker");
+  }
+  let worker = this._worker;
+  let id = ++MESSAGE_COUNTER;
+  let payload = { task, id, data };
+
+  if(this._verbose && dumpn) {
+    dumpn("Sending message to worker" +
+          (this._name ? (" (" + this._name + ")") : "" ) +
+          ": " +
+          JSON.stringify(payload, null, 2));
+  }
+  worker.postMessage(payload);
+
+  return new Promise((resolve, reject) => {
+    let listener = ({ data }) => {
+      if(this._verbose && dumpn) {
+        dumpn("Received message from worker" +
+              (this._name ? (" (" + this._name + ")") : "" ) +
+              ": " +
+              JSON.stringify(data, null, 2));
+      }
+
+      if (data.id !== id) {
+        return;
+      }
+      worker.removeEventListener("message", listener);
+      if (data.error) {
+        reject(data.error);
+      } else {
+        resolve(data.response);
+      }
+    };
+
+    worker.addEventListener("message", listener);
+  });
+}
+
+/**
+ * Terminates the underlying worker. Use when no longer needing the worker.
+ */
+DevToolsWorker.prototype.destroy = function () {
+  this._worker.terminate();
+  this._worker = null;
+  this._destroyed = true;
+};
+
+DevToolsWorker.prototype.onError = function({ message, filename, lineno }) {
+  dump(new Error(message + " @ " + filename + ":" + lineno) + "\n");
+}
+
+/**
+ * Takes a function and returns a Worker-wrapped version of the same function.
+ * Returns a promise upon resolution.
+ * @see `./toolkit/devtools/shared/tests/browser/browser_devtools-worker-03.js
+ *
+ * * * * ! ! ! This should only be used for tests or A/B testing performance ! ! ! * * * * * *
+ *
+ * The original function must:
+ *
+ * Be a pure function, that is, not use any variables not declared within the
+ * function, or its arguments.
+ *
+ * Return a value or a promise.
+ *
+ * Note any state change in the worker will not affect the callee's context.
+ *
+ * @param {function} fn
+ * @return {function}
+ */
+function workerify (fn) {
+  console.warn(`\`workerify\` should only be used in tests or measuring performance.
+  This creates an object URL on the browser window, and should not be used in production.`)
+  // Fetch via window/utils here as we don't want to include
+  // this module normally.
+  let { getMostRecentBrowserWindow } = require("sdk/window/utils");
+  let { URL, Blob } = getMostRecentBrowserWindow();
+  let stringifiedFn = createWorkerString(fn);
+  let blob = new Blob([stringifiedFn]);
+  let url = URL.createObjectURL(blob);
+  let worker = new DevToolsWorker(url);
+
+  let wrapperFn = data => worker.performTask("workerifiedTask", data);
+
+  wrapperFn.destroy = function () {
+    URL.revokeObjectURL(url);
+    worker.destroy();
+  };
+
+  return wrapperFn;
+}
+exports.workerify = workerify;
+
+/**
+ * Takes a function, and stringifies it, attaching the worker-helper.js
+ * boilerplate hooks.
+ */
+function createWorkerString (fn) {
+  return `importScripts("resource://gre/modules/workers/require.js");
+    const { createTask } = require("resource://gre/modules/devtools/shared/worker-helper");
+    createTask(self, "workerifiedTask", ${fn.toString()});
+  `;
+}
+
+});
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/styleinspector/css-logic.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/styleinspector/css-logic.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/styleinspector/css-logic.js	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/styleinspector/css-logic.js	2015-05-25 20:43:55.000000000 +0000
@@ -42,14 +42,6 @@
 const Services = require("Services");
 const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 
-const RX_UNIVERSAL_SELECTOR = /\s*\*\s*/g;
-const RX_NOT = /:not\((.*?)\)/g;
-const RX_PSEUDO_CLASS_OR_ELT = /(:[\w-]+\().*?\)/g;
-const RX_CONNECTORS = /\s*[\s>+~]\s*/g;
-const RX_ID = /\s*#\w+\s*/g;
-const RX_CLASS_OR_ATTRIBUTE = /\s*(?:\.\w+|\[.+?\])\s*/g;
-const RX_PSEUDO = /\s*:?:([\w-]+)(\(?\)?)\s*/g;
-
 // This should be ok because none of the functions that use this should be used
 // on the worker thread, where Cu is not available.
 if (Cu) {
@@ -1003,50 +995,172 @@
     return text;
   }
 
-  let parts = [];    // indented parts
-  let partStart = 0; // start offset of currently parsed part
+  // We reformat the text using a simple state machine.  The
+  // reformatting preserves most of the input text, changing only
+  // whitespace.  The rules are:
+  //
+  // * After a "{" or ";" symbol, ensure there is a newline and
+  //   indentation before the next non-comment, non-whitespace token.
+  // * Additionally after a "{" symbol, increase the indentation.
+  // * A "}" symbol ensures there is a preceding newline, and
+  //   decreases the indentation level.
+  // * Ensure there is whitespace before a "{".
+  //
+  // This approach can be confused sometimes, but should do ok on a
+  // minified file.
   let indent = "";
   let indentLevel = 0;
+  let tokens = domUtils.getCSSLexer(text);
+  let result = "";
+  let pushbackToken = undefined;
+
+  // A helper function that reads tokens, looking for the next
+  // non-comment, non-whitespace token.  Comment and whitespace tokens
+  // are appended to |result|.  If this encounters EOF, it returns
+  // null.  Otherwise it returns the last whitespace token that was
+  // seen.  This function also updates |pushbackToken|.
+  let readUntilSignificantToken = () => {
+    while (true) {
+      let token = tokens.nextToken();
+      if (!token || token.tokenType !== "whitespace") {
+        pushbackToken = token;
+        return token;
+      }
+      // Saw whitespace.  Before committing to it, check the next
+      // token.
+      let nextToken = tokens.nextToken();
+      if (!nextToken || nextToken.tokenType !== "comment") {
+        pushbackToken = nextToken;
+        return token;
+      }
+      // Saw whitespace + comment.  Update the result and continue.
+      result = result + text.substring(token.startOffset, nextToken.endOffset);
+    }
+  };
 
-  for (let i = 0; i < text.length; i++) {
-    let c = text[i];
-    let shouldIndent = false;
-
-    switch (c) {
-      case "}":
-        if (i - partStart > 1) {
-          // there's more than just } on the line, add line
-          parts.push(indent + text.substring(partStart, i));
-          partStart = i;
-        }
-        indent = TAB_CHARS.repeat(--indentLevel);
-        /* fallthrough */
-      case ";":
-      case "{":
-        shouldIndent = true;
+  // State variables for readUntilNewlineNeeded.
+  //
+  // Starting index of the accumulated tokens.
+  let startIndex;
+  // Ending index of the accumulated tokens.
+  let endIndex;
+  // True if any non-whitespace token was seen.
+  let anyNonWS;
+  // True if the terminating token is "}".
+  let isCloseBrace;
+  // True if the token just before the terminating token was
+  // whitespace.
+  let lastWasWS;
+
+  // A helper function that reads tokens until there is a reason to
+  // insert a newline.  This updates the state variables as needed.
+  // If this encounters EOF, it returns null.  Otherwise it returns
+  // the final token read.  Note that if the returned token is "{",
+  // then it will not be included in the computed start/end token
+  // range.  This is used to handle whitespace insertion before a "{".
+  let readUntilNewlineNeeded = () => {
+    let token;
+    while (true) {
+      if (pushbackToken) {
+        token = pushbackToken;
+        pushbackToken = undefined;
+      } else {
+        token = tokens.nextToken();
+      }
+      if (!token) {
+        endIndex = text.length;
+        break;
+      }
+
+      // A "}" symbol must be inserted later, to deal with indentation
+      // and newline.
+      if (token.tokenType === "symbol" && token.text === "}") {
+        isCloseBrace = true;
+        break;
+      } else if (token.tokenType === "symbol" && token.text === "{") {
         break;
+      }
+
+      if (token.tokenType !== "whitespace") {
+        anyNonWS = true;
+      }
+
+      if (startIndex === undefined) {
+        startIndex = token.startOffset;
+      }
+      endIndex = token.endOffset;
+
+      if (token.tokenType === "symbol" && token.text === ';') {
+        break;
+      }
+
+      lastWasWS = token.tokenType === "whitespace";
     }
+    return token;
+  };
 
-    if (shouldIndent) {
-      let la = text[i+1]; // one-character lookahead
-      if (!/\n/.test(la) || /^\s+$/.test(text.substring(i+1, text.length))) {
-        // following character should be a new line, but isn't,
-        // or it's whitespace at the end of the file
-        parts.push(indent + text.substring(partStart, i + 1));
-        if (c == "}") {
-          parts.push(""); // for extra line separator
-        }
-        partStart = i + 1;
+  while (true) {
+    // Set the initial state.
+    startIndex = undefined;
+    endIndex = undefined;
+    anyNonWS = false;
+    isCloseBrace = false;
+    lastWasWS = false;
+
+    // Read tokens until we see a reason to insert a newline.
+    let token = readUntilNewlineNeeded();
+
+    // Append any saved up text to the result, applying indentation.
+    if (startIndex !== undefined) {
+      if (isCloseBrace && !anyNonWS) {
+        // If we saw only whitespace followed by a "}", then we don't
+        // need anything here.
       } else {
-        return text; // assume it is not minified, early exit
+        result = result + indent + text.substring(startIndex, endIndex);
+        if (isCloseBrace)
+          result += CssLogic.LINE_SEPARATOR;
       }
     }
 
-    if (c == "{") {
+    if (isCloseBrace) {
+      indent = TAB_CHARS.repeat(--indentLevel);
+      result = result + indent + '}';
+    }
+
+    if (!token) {
+      break;
+    }
+
+    if (token.tokenType === "symbol" && token.text === '{') {
+      if (!lastWasWS) {
+        result += ' ';
+      }
+      result += '{';
       indent = TAB_CHARS.repeat(++indentLevel);
     }
+
+    // Now it is time to insert a newline.  However first we want to
+    // deal with any trailing comments.
+    token = readUntilSignificantToken();
+
+    // "Early" bail-out if the text does not appear to be minified.
+    // Here we ignore the case where whitespace appears at the end of
+    // the text.
+    if (pushbackToken && token && token.tokenType === "whitespace" &&
+        /\n/g.test(text.substring(token.startOffset, token.endOffset))) {
+      return text;
+    }
+
+    // Finally time for that newline.
+    result = result + CssLogic.LINE_SEPARATOR;
+
+    // Maybe we hit EOF.
+    if (!pushbackToken) {
+      break;
+    }
   }
-  return parts.join(CssLogic.LINE_SEPARATOR);
+
+  return result;
 };
 
 /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/tests/unit/test_prettifyCSS.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/tests/unit/test_prettifyCSS.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/tests/unit/test_prettifyCSS.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/tests/unit/test_prettifyCSS.js	2015-05-25 20:43:55.000000000 +0000
@@ -0,0 +1,64 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Test prettifyCSS.
+
+"use strict";
+
+const loader = new DevToolsLoader();
+const require = loader.require;
+const {CssLogic} = require("devtools/styleinspector/css-logic");
+
+
+const TESTS = [
+  { name: "simple test",
+    input: "div { font-family:'Arial Black', Arial, sans-serif; }",
+    expected: [
+      "div {",
+      "\tfont-family:'Arial Black', Arial, sans-serif;",
+      "}"
+    ]
+  },
+
+  { name: "whitespace before open brace",
+    input: "div{}",
+    expected: [
+      "div {",
+      "}"
+    ]
+  },
+
+  { name: "minified with trailing newline",
+    input: "\nbody{background:white;}div{font-size:4em;color:red}span{color:green;}\n",
+    expected: [
+      "",
+      "body {",
+      "\tbackground:white;",
+      "}",
+      "div {",
+      "\tfont-size:4em;",
+      "\tcolor:red",
+      "}",
+      "span {",
+      "\tcolor:green;",
+      "}"
+    ]
+  },
+
+];
+
+function run_test() {
+  // Note that CssLogic.LINE_SEPARATOR is computed lazily, so we
+  // ensure it is set.
+  CssLogic.prettifyCSS("");
+
+  for (let test of TESTS) {
+    do_print(test.name);
+
+    let input = test.input.split("\n").join(CssLogic.LINE_SEPARATOR);
+    let output = CssLogic.prettifyCSS(input);
+    let expected = test.expected.join(CssLogic.LINE_SEPARATOR) +
+        CssLogic.LINE_SEPARATOR;
+    equal(output, expected, test.name);
+  }
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/tests/unit/xpcshell.ini firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/tests/unit/xpcshell.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/tests/unit/xpcshell.ini	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/tests/unit/xpcshell.ini	2015-05-25 20:43:55.000000000 +0000
@@ -12,6 +12,7 @@
 [test_defineLazyPrototypeGetter.js]
 [test_async-utils.js]
 [test_consoleID.js]
+[test_prettifyCSS.js]
 [test_require_lazy.js]
 [test_require.js]
 [test_stack.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/transport/tests/unit/test_client_server_bulk.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/transport/tests/unit/test_client_server_bulk.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/transport/tests/unit/test_client_server_bulk.js	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/transport/tests/unit/test_client_server_bulk.js	2015-05-25 20:43:55.000000000 +0000
@@ -62,18 +62,14 @@
       type: type,
       length: really_long().length
     }).then(({copyFrom}) => {
-      NetUtil.asyncFetch2(
-        getTestTempFile("bulk-input"),
-        input => {
+      NetUtil.asyncFetch({
+        uri: NetUtil.newURI(getTestTempFile("bulk-input")),
+        loadUsingSystemPrincipal: true
+      }, input => {
           copyFrom(input).then(() => {
             input.close();
           });
-        },
-        null,      // aLoadingNode
-        Services.scriptSecurityManager.getSystemPrincipal(),
-        null,      // aTriggeringPrincipal
-        Ci.nsILoadInfo.SEC_NORMAL,
-        Ci.nsIContentPolicy.TYPE_OTHER);
+        });
     });
   },
 
@@ -168,19 +164,15 @@
 
     // Send bulk data to server
     request.on("bulk-send-ready", ({copyFrom}) => {
-      NetUtil.asyncFetch2(
-        getTestTempFile("bulk-input"),
-        input => {
+      NetUtil.asyncFetch({
+        uri: NetUtil.newURI(getTestTempFile("bulk-input")),
+        loadUsingSystemPrincipal: true
+      }, input => {
           copyFrom(input).then(() => {
             input.close();
             bulkCopyDeferred.resolve();
           });
-        },
-        null,      // aLoadingNode
-        Services.scriptSecurityManager.getSystemPrincipal(),
-        null,      // aTriggeringPrincipal
-        Ci.nsILoadInfo.SEC_NORMAL,
-        Ci.nsIContentPolicy.TYPE_OTHER);
+        });
     });
 
     // Set up reply handling for this type
@@ -257,20 +249,16 @@
 
   // Ensure output file contents actually match
   let compareDeferred = promise.defer();
-  NetUtil.asyncFetch2(
-    getTestTempFile("bulk-output"),
-    input => {
+  NetUtil.asyncFetch({
+    uri: NetUtil.newURI(getTestTempFile("bulk-output")),
+    loadUsingSystemPrincipal: true
+  }, input => {
       let outputData = NetUtil.readInputStreamToString(input, reallyLong.length);
       // Avoid do_check_eq here so we don't log the contents
       do_check_true(outputData === reallyLong);
       input.close();
       compareDeferred.resolve();
-    },
-    null,      // aLoadingNode
-    Services.scriptSecurityManager.getSystemPrincipal(),
-    null,      // aTriggeringPrincipal
-    Ci.nsILoadInfo.SEC_NORMAL,
-    Ci.nsIContentPolicy.TYPE_OTHER);
+    });
 
   return compareDeferred.promise.then(cleanup_files);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/transport/tests/unit/test_queue.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/transport/tests/unit/test_queue.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/transport/tests/unit/test_queue.js	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/transport/tests/unit/test_queue.js	2015-05-25 20:43:55.000000000 +0000
@@ -40,18 +40,14 @@
 
   // Sending from client to server
   function write_data({copyFrom}) {
-    NetUtil.asyncFetch2(
-      getTestTempFile("bulk-input"),
-      function(input, status) {
+    NetUtil.asyncFetch({
+      uri: NetUtil.newURI(getTestTempFile("bulk-input")),
+      loadUsingSystemPrincipal: true
+    }, function(input, status) {
         copyFrom(input).then(() => {
           input.close();
         });
-      },
-      null,      // aLoadingNode
-      Services.scriptSecurityManager.getSystemPrincipal(),
-      null,      // aTriggeringPrincipal
-      Ci.nsILoadInfo.SEC_NORMAL,
-      Ci.nsIContentPolicy.TYPE_OTHER);
+      });
   }
 
   // Receiving on server from client
@@ -155,20 +151,16 @@
 
   // Ensure output file contents actually match
   let compareDeferred = promise.defer();
-  NetUtil.asyncFetch2(
-    getTestTempFile("bulk-output"),
-    input => {
+  NetUtil.asyncFetch({
+    uri: NetUtil.newURI(getTestTempFile("bulk-output")),
+    loadUsingSystemPrincipal: true
+  }, input => {
       let outputData = NetUtil.readInputStreamToString(input, reallyLong.length);
       // Avoid do_check_eq here so we don't log the contents
       do_check_true(outputData === reallyLong);
       input.close();
       compareDeferred.resolve();
-    },
-    null,      // aLoadingNode
-    Services.scriptSecurityManager.getSystemPrincipal(),
-    null,      // aTriggeringPrincipal
-    Ci.nsILoadInfo.SEC_NORMAL,
-    Ci.nsIContentPolicy.TYPE_OTHER);
+    });
 
   return compareDeferred.promise.then(cleanup_files);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/transport/tests/unit/test_transport_bulk.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/transport/tests/unit/test_transport_bulk.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/transport/tests/unit/test_transport_bulk.js	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/transport/tests/unit/test_transport_bulk.js	2015-05-25 20:43:55.000000000 +0000
@@ -41,18 +41,14 @@
 
   // Sending from client to server
   function write_data({copyFrom}) {
-    NetUtil.asyncFetch2(
-      getTestTempFile("bulk-input"),
-      function(input, status) {
+    NetUtil.asyncFetch({
+      uri: NetUtil.newURI(getTestTempFile("bulk-input")),
+      loadUsingSystemPrincipal: true
+    }, function(input, status) {
         copyFrom(input).then(() => {
           input.close();
         });
-      },
-      null,      // aLoadingNode
-      Services.scriptSecurityManager.getSystemPrincipal(),
-      null,      // aTriggeringPrincipal
-      Ci.nsILoadInfo.SEC_NORMAL,
-      Ci.nsIContentPolicy.TYPE_OTHER);
+      });
   }
 
   // Receiving on server from client
@@ -127,20 +123,16 @@
 
   // Ensure output file contents actually match
   let compareDeferred = promise.defer();
-  NetUtil.asyncFetch2(
-    getTestTempFile("bulk-output"),
-    input => {
+  NetUtil.asyncFetch({
+    uri: NetUtil.newURI(getTestTempFile("bulk-output")),
+    loadUsingSystemPrincipal: true
+  }, input => {
       let outputData = NetUtil.readInputStreamToString(input, reallyLong.length);
       // Avoid do_check_eq here so we don't log the contents
       do_check_true(outputData === reallyLong);
       input.close();
       compareDeferred.resolve();
-    },
-    null,      // aLoadingNode
-    Services.scriptSecurityManager.getSystemPrincipal(),
-    null,      // aTriggeringPrincipal
-    Ci.nsILoadInfo.SEC_NORMAL,
-    Ci.nsIContentPolicy.TYPE_OTHER);
+    });
 
   return compareDeferred.promise.then(cleanup_files);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/webconsole/network-helper.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/webconsole/network-helper.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/webconsole/network-helper.js	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/webconsole/network-helper.js	2015-05-25 20:43:55.000000000 +0000
@@ -275,21 +275,14 @@
    */
   loadFromCache: function NH_loadFromCache(aUrl, aCharset, aCallback)
   {
-    let channel = NetUtil.newChannel2(aUrl,
-                                      null,
-                                      null,
-                                      null,      // aLoadingNode
-                                      Services.scriptSecurityManager.getSystemPrincipal(),
-                                      null,      // aTriggeringPrincipal
-                                      Ci.nsILoadInfo.SEC_NORMAL,
-                                      Ci.nsIContentPolicy.TYPE_OTHER);
+    let channel = NetUtil.newChannel({uri: aUrl, loadUsingSystemPrincipal: true});
 
     // Ensure that we only read from the cache and not the server.
     channel.loadFlags = Ci.nsIRequest.LOAD_FROM_CACHE |
       Ci.nsICachingChannel.LOAD_ONLY_FROM_CACHE |
       Ci.nsICachingChannel.LOAD_BYPASS_LOCAL_CACHE_IF_BUSY;
 
-    NetUtil.asyncFetch2(
+    NetUtil.asyncFetch(
       channel,
       (aInputStream, aStatusCode, aRequest) => {
         if (!components.isSuccessCode(aStatusCode)) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/webconsole/network-monitor.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/webconsole/network-monitor.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/webconsole/network-monitor.js	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/webconsole/network-monitor.js	2015-05-25 20:43:55.000000000 +0000
@@ -735,6 +735,17 @@
       return true;
     }
 
+    // Ignore requests from chrome or add-on code when we are monitoring
+    // content.
+    // TODO: one particular test (browser_styleeditor_fetch-from-cache.js) needs
+    // the gDevTools.testing check. We will move to a better way to serve its
+    // needs in bug 1167188, where this check should be removed.
+    if (!gDevTools.testing && aChannel.loadInfo &&
+        aChannel.loadInfo.loadingDocument === null &&
+        aChannel.loadInfo.loadingPrincipal === Services.scriptSecurityManager.getSystemPrincipal()) {
+      return false;
+    }
+
     if (this.window) {
       // Since frames support, this.window may not be the top level content
       // frame, so that we can't only compare with win.top.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/webconsole/test/test_throw.html firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/webconsole/test/test_throw.html
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/devtools/webconsole/test/test_throw.html	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/devtools/webconsole/test/test_throw.html	2015-05-25 20:43:55.000000000 +0000
@@ -40,7 +40,7 @@
     tests.push(function() {
       aState.client.evaluateJS("throw " + value + ";", function(aResponse) {
         let exception = aResponse.exception;
-        ise(exception, value, "response.exception for throw " + value);
+        is(exception, value, "response.exception for throw " + value);
         nextTest();
       });
     });
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/library/moz.build firefox-trunk-41.0~a1~hg20150524r245419/toolkit/library/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/library/moz.build	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/library/moz.build	2015-05-25 20:43:56.000000000 +0000
@@ -253,6 +253,11 @@
         'mtp',
     ]
 
+    if int(CONFIG['ANDROID_VERSION']) >= 17:
+        OS_LIBS += [
+            'sync',
+        ]
+
 if 'rtsp' in CONFIG['NECKO_PROTOCOLS']:
     OS_LIBS += [
         'stagefright_foundation',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/locales/en-US/chrome/global/aboutTelemetry.dtd firefox-trunk-41.0~a1~hg20150524r245419/toolkit/locales/en-US/chrome/global/aboutTelemetry.dtd
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/locales/en-US/chrome/global/aboutTelemetry.dtd	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/locales/en-US/chrome/global/aboutTelemetry.dtd	2015-05-25 20:43:57.000000000 +0000
@@ -4,18 +4,70 @@
 
 <!ENTITY aboutTelemetry.pageTitle "Telemetry Data">
 
-<!ENTITY aboutTelemetry.telemetryEnabled "
-  Telemetry is <span>enabled</span>.
+<!ENTITY aboutTelemetry.changeDataChoices "
+  Change
 ">
 
-<!ENTITY aboutTelemetry.telemetryDisabled "
-  Telemetry is <span>disabled</span>.
+<!ENTITY aboutTelemetry.uploadEnabled "
+  FHR data upload is <span>enabled</span>.
+">
+
+<!ENTITY aboutTelemetry.uploadDisabled "
+  FHR data upload is <span>disabled</span>.
+">
+
+<!ENTITY aboutTelemetry.extendedRecordingEnabled "
+  Extended Telemetry recording is <span>enabled</span>.
+">
+
+<!ENTITY aboutTelemetry.extendedRecordingDisabled "
+  Extended Telemetry recording is <span>disabled</span>.
+">
+
+<!ENTITY aboutTelemetry.pingDataSource "
+Ping data source:
+">
+
+<!ENTITY aboutTelemetry.showCurrentPingData "
+Current ping data
+">
+
+<!ENTITY aboutTelemetry.showArchivedPingData "
+Archived ping data
+">
+
+<!ENTITY aboutTelemetry.showSubsessionData "
+Show subsession data
+">
+
+<!ENTITY aboutTelemetry.choosePing "
+Choose ping:
+">
+
+<!ENTITY aboutTelemetry.showNewerPing "
+&lt;&lt; Newer ping
+">
+
+<!ENTITY aboutTelemetry.showOlderPing "
+Older ping &gt;&gt;
+">
+
+<!ENTITY aboutTelemetry.archiveWeekHeader "
+Week
+">
+
+<!ENTITY aboutTelemetry.archivePingHeader "
+Ping
 ">
 
 <!ENTITY aboutTelemetry.generalDataSection "
   General Data
 ">
 
+<!ENTITY aboutTelemetry.environmentDataSection "
+  Environment Data
+">
+
 <!ENTITY aboutTelemetry.telemetryLogSection "
   Telemetry Log
 ">
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties firefox-trunk-41.0~a1~hg20150524r245419/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties	2015-05-25 20:43:57.000000000 +0000
@@ -13,6 +13,10 @@
 
 generalDataHeadingValue = Value
 
+environmentDataHeadingName = Name
+
+environmentDataHeadingValue = Value
+
 telemetryLogTitle = Telemetry Log
 
 telemetryLogHeadingId = Id
@@ -54,10 +58,6 @@
 
 histogramCopy = Copy
 
-disableTelemetry = Disable Telemetry
-
-enableTelemetry = Enable Telemetry
-
 keysHeader = Property
 
 valuesHeader = Value
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/locales/en-US/chrome/global/devtools/gclicommands.properties firefox-trunk-41.0~a1~hg20150524r245419/toolkit/locales/en-US/chrome/global/devtools/gclicommands.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/locales/en-US/chrome/global/devtools/gclicommands.properties	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/locales/en-US/chrome/global/devtools/gclicommands.properties	2015-05-25 20:43:57.000000000 +0000
@@ -1552,6 +1552,17 @@
 # The argument (%1$S) is the folder path.
 folderOpenDirResult=Opened %1$S
 
+# LOCALIZATION NOTE (security)
+securityDesc=Display supported security features
+securityManual=Commands to list and get suggestions about security features for the current domain.
+securityListDesc=Display security features
+securityListManual=Display a list of all relevant security features of the current page.
+# CSP specific
+securityCSPDesc=Display CSP specific security features
+securityCSPManual=Display feedback about the CSP applied to the current page.
+securityCSPRemWildCard=Can you remove the wildcard(*)?
+securityCSPPotentialXSS=Potential XSS vulnerability!
+
 # LOCALIZATION NOTE (rulersDesc) A very short description of the
 # 'rulers' command. See rulersManual for a fuller description of what
 # it does. This string is designed to be shown in a menu alongside the
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/locales/en-US/chrome/global/devtools/styleinspector.properties firefox-trunk-41.0~a1~hg20150524r245419/toolkit/locales/en-US/chrome/global/devtools/styleinspector.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/locales/en-US/chrome/global/devtools/styleinspector.properties	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/locales/en-US/chrome/global/devtools/styleinspector.properties	2015-05-25 20:43:57.000000000 +0000
@@ -112,13 +112,14 @@
 # the rule view context menu "Show MDN docs" entry.
 ruleView.contextmenu.showMdnDocs.accessKey=D
 
-# LOCALIZATION NOTE (ruleView.contextmenu.addRule): Text displayed in the
+# LOCALIZATION NOTE (ruleView.contextmenu.addNewRule): Text displayed in the
 # rule view context menu for adding a new rule to the element.
-ruleView.contextmenu.addRule=Add rule
+# This should match addRuleButton.tooltip in styleinspector.dtd
+ruleView.contextmenu.addNewRule=Add new rule
 
 # LOCALIZATION NOTE (ruleView.contextmenu.addRule.accessKey): Access key for
 # the rule view context menu "Add rule" entry.
-ruleView.contextmenu.addRule.accessKey=R
+ruleView.contextmenu.addNewRule.accessKey=R
 
 # LOCALIZATION NOTE (computedView.contextmenu.selectAll): Text displayed in the
 # computed view context menu.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/locales/en-US/chrome/global/viewSource.properties firefox-trunk-41.0~a1~hg20150524r245419/toolkit/locales/en-US/chrome/global/viewSource.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/locales/en-US/chrome/global/viewSource.properties	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/locales/en-US/chrome/global/viewSource.properties	2015-05-25 20:43:57.000000000 +0000
@@ -11,3 +11,7 @@
 statusBarLineCol  = Line %1$S, Col %2$S
 viewSelectionSourceTitle = DOM Source of Selection
 viewMathMLSourceTitle    = DOM Source of MathML
+
+context_goToLine_label        = Go to Line…
+context_wrapLongLines_label   = Wrap Long Lines
+context_highlightSyntax_label = Syntax Highlighting
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/locales/l10n.mk firefox-trunk-41.0~a1~hg20150524r245419/toolkit/locales/l10n.mk
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/locales/l10n.mk	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/locales/l10n.mk	2015-05-25 20:43:57.000000000 +0000
@@ -170,8 +170,7 @@
 	$(NSINSTALL) -D $(DIST)/$(PKG_LANGPACK_PATH)
 	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) \
 	  -I$(TK_DEFINES) -I$(APP_DEFINES) $(srcdir)/generic/install.rdf -o $(DIST)/xpi-stage/$(XPI_NAME)/install.rdf)
-	cd $(DIST)/xpi-stage/locale-$(AB_CD) && \
-	  $(ZIP) -r9D $(LANGPACK_FILE) install.rdf $(PKG_ZIP_DIRS) chrome.manifest
+	$(call py_action,zip,-C $(DIST)/xpi-stage/locale-$(AB_CD) $(LANGPACK_FILE) install.rdf $(PKG_ZIP_DIRS) chrome.manifest)
 
 # This variable is to allow the wget-en-US target to know which ftp server to download from
 ifndef EN_US_BINARY_URL 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/AppConstants.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/AppConstants.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/AppConstants.jsm	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/AppConstants.jsm	2015-05-25 20:43:57.000000000 +0000
@@ -158,6 +158,9 @@
   false,
 #endif
 
+  DLL_PREFIX: "@DLL_PREFIX@",
+  DLL_SUFFIX: "@DLL_SUFFIX@",
+
   MOZ_APP_NAME: "@MOZ_APP_NAME@",
   MOZ_APP_VERSION: "@MOZ_APP_VERSION@",
   MOZ_BUILD_APP: "@MOZ_BUILD_APP@",
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/BrowserUtils.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/BrowserUtils.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/BrowserUtils.jsm	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/BrowserUtils.jsm	2015-05-25 20:43:57.000000000 +0000
@@ -10,6 +10,7 @@
 const {interfaces: Ci, utils: Cu, classes: Cc} = Components;
 
 Cu.import("resource://gre/modules/Services.jsm");
+Cu.importGlobalProperties(['URL']);
 
 this.BrowserUtils = {
 
@@ -93,6 +94,30 @@
     return Services.io.newURI(aCPOWURI.spec, aCPOWURI.originCharset, null);
   },
 
+  // Creates a codebase principal from a canonical origin string. This is
+  // the inverse operation of .origin on a codebase principal.
+  principalFromOrigin: function(aOriginString) {
+    if (aOriginString.startsWith('[')) {
+      throw new Error("principalFromOrigin does not support System and Expanded principals");
+    }
+
+    if (aOriginString.startsWith("moz-nullprincipal:")) {
+      throw new Error("principalFromOrigin does not support nsNullPrincipal");
+    }
+
+    var parts = aOriginString.split('!');
+    if (parts.length > 2) {
+      throw new Error("bad origin string: " + aOriginString);
+    }
+
+    var uri = Services.io.newURI(parts[0], null, null);
+    var attrs = {};
+    // Parse the parameters string into a dictionary.
+    (parts[1] || "").split("&").map((x) => x.split('=')).forEach((x) => attrs[x[0]] = x[1]);
+
+    return Services.scriptSecurityManager.createCodebasePrincipal(uri, attrs);
+  },
+
   /**
    * For a given DOM element, returns its position in "screen"
    * coordinates. In a content process, the coordinates returned will
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/Finder.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/Finder.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/Finder.jsm	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/Finder.jsm	2015-05-25 20:43:57.000000000 +0000
@@ -103,8 +103,7 @@
       return;
 
     ClipboardHelper.copyStringToClipboard(aSearchString,
-                                          Ci.nsIClipboard.kFindClipboard,
-                                          this._getWindow().document);
+                                          Ci.nsIClipboard.kFindClipboard);
   },
 
   set caseSensitive(aSensitive) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/GMPUtils.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/GMPUtils.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/GMPUtils.jsm	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/GMPUtils.jsm	2015-05-25 20:43:57.000000000 +0000
@@ -89,8 +89,8 @@
   KEY_CERTS_BRANCH:             "media.gmp-manager.certs.",
   KEY_PROVIDER_ENABLED:         "media.gmp-provider.enabled",
   KEY_LOG_BASE:                 "media.gmp.log.",
-  KEY_LOGGING_LEVEL:            this.KEY_LOG_BASE + "level",
-  KEY_LOGGING_DUMP:             this.KEY_LOG_BASE + "dump",
+  KEY_LOGGING_LEVEL:            "media.gmp.log.level",
+  KEY_LOGGING_DUMP:             "media.gmp.log.dump",
 
   /**
    * Obtains the specified preference in relation to the specified plugin.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/moz.build firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/moz.build	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/moz.build	2015-05-25 20:43:57.000000000 +0000
@@ -97,7 +97,9 @@
 for var in ('ANDROID_PACKAGE_NAME',
             'MOZ_APP_NAME',
             'MOZ_APP_VERSION',
-            'MOZ_WIDGET_TOOLKIT'):
+            'MOZ_WIDGET_TOOLKIT',
+            'DLL_PREFIX',
+            'DLL_SUFFIX'):
             DEFINES[var] = CONFIG[var]
 
 for var in ('MOZILLA_OFFICIAL',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/NewTabUtils.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/NewTabUtils.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/NewTabUtils.jsm	2015-05-13 18:06:12.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/NewTabUtils.jsm	2015-05-25 20:43:57.000000000 +0000
@@ -405,8 +405,14 @@
     // Clear the link's old position, if any.
     this.unpin(aLink);
 
+    // change pinned link into a history link
+    // update all pages on link change
+    let updatePages = this._makeHistoryLink(aLink);
     this.links[aIndex] = aLink;
     this.save();
+    if (updatePages) {
+      AllPages.update();
+    }
   },
 
   /**
@@ -464,7 +470,37 @@
 
     // The given link is unpinned.
     return -1;
-  }
+  },
+
+  /**
+   * Transforms link into a "history" link
+   * @param aLink The link to change
+   * @return true if link changes, false otherwise
+   */
+  _makeHistoryLink: function PinnedLinks_makeHistoryLink(aLink) {
+    if (!aLink.type || aLink.type == "history") {
+      return false;
+    }
+    aLink.type = "history";
+    // always remove targetedSite
+    delete aLink.targetedSite;
+    return true;
+  },
+
+  /**
+   * Replaces existing link with another link.
+   * @param aUrl The url of existing link
+   * @param aLink The replacement link
+   */
+  replace: function PinnedLinks_replace(aUrl, aLink) {
+    let index = this._indexOfLink({url: aUrl});
+    if (index == -1) {
+      return;
+    }
+    this.links[index] = aLink;
+    this.save();
+  },
+
 };
 
 /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/PopupNotifications.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/PopupNotifications.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/PopupNotifications.jsm	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/PopupNotifications.jsm	2015-05-25 20:43:57.000000000 +0000
@@ -270,8 +270,9 @@
    *                     A string URL. Setting this property will make the
    *                     prompt display a "Learn More" link that, when clicked,
    *                     opens the URL in a new tab.
-   *        originHost:  The host name of the page the notification came from.
-   *                     If present, this will be displayed above the message.
+   *        displayOrigin:
+   *                     The host name or file path of the page the notification came
+   *                     from. If present, this will be displayed above the message.
    * @returns the Notification object corresponding to the added notification.
    */
   show: function PopupNotifications_show(browser, id, message, anchorID,
@@ -567,10 +568,10 @@
       else
         popupnotification.removeAttribute("learnmoreurl");
 
-      if (n.options.originHost)
-        popupnotification.setAttribute("originhost", n.options.originHost);
+      if (n.options.displayOrigin)
+        popupnotification.setAttribute("origin", n.options.displayOrigin);
       else
-        popupnotification.removeAttribute("originhost");
+        popupnotification.removeAttribute("origin");
 
       popupnotification.notification = n;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/PropertyListUtils.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/PropertyListUtils.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/PropertyListUtils.jsm	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/PropertyListUtils.jsm	2015-05-25 20:43:57.000000000 +0000
@@ -83,7 +83,7 @@
    *        The reaon for failure is reported to the Error Console.
    */
   read: function PLU_read(aFile, aCallback) {
-    if (!(aFile instanceof Ci.nsILocalFile || aFile instanceof Ci.nsIDOMFile))
+    if (!(aFile instanceof Ci.nsILocalFile || aFile instanceof File))
       throw new Error("aFile is not a file object");
     if (typeof(aCallback) != "function")
       throw new Error("Invalid value for aCallback");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/SelectParentHelper.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/SelectParentHelper.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/SelectParentHelper.jsm	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/SelectParentHelper.jsm	2015-05-25 20:43:57.000000000 +0000
@@ -22,7 +22,7 @@
     currentBrowser = browser;
     this._registerListeners(menulist.menupopup);
 
-    menulist.menupopup.openPopupAtScreen(rect.left, rect.top + rect.height);
+    menulist.menupopup.openPopupAtScreenRect("after_start", rect.left, rect.top, rect.width, rect.height, false, false);
     menulist.selectedItem.scrollIntoView();
   },
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/tests/browser/browser_Troubleshoot.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/tests/browser/browser_Troubleshoot.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/tests/browser/browser_Troubleshoot.js	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/tests/browser/browser_Troubleshoot.js	2015-05-25 20:43:57.000000000 +0000
@@ -68,6 +68,22 @@
       done();
     });
   },
+
+  function unicodePreferences(done) {
+    let name = "font.name.sans-serif.x-western";
+    let utf8Value = "\xc4\x8capk\xc5\xafv Krasopis"
+    let unicodeValue = "\u010Capk\u016Fv Krasopis";
+
+    // set/getCharPref work with 8bit strings (utf8)
+    Services.prefs.setCharPref(name, utf8Value);
+
+    Troubleshoot.snapshot(function (snapshot) {
+      let p = snapshot.modifiedPreferences;
+      is(p[name], unicodeValue, "The pref should have correct Unicode value.");
+      Services.prefs.deleteBranch(name);
+      done();
+    });
+  }
 ];
 
 // This is inspired by JSON Schema, or by the example on its Wikipedia page
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/tests/xpcshell/test_ZipUtils.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/tests/xpcshell/test_ZipUtils.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/tests/xpcshell/test_ZipUtils.js	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/tests/xpcshell/test_ZipUtils.js	2015-05-25 20:43:57.000000000 +0000
@@ -5,11 +5,12 @@
 
 const ARCHIVE = "zips/zen.zip";
 const SUBDIR = "zen";
-const ENTRIES = ["beyond.txt", "waterwood.txt"];
+const SYMLINK = "beyond_link";
+const ENTRIES = ["beyond.txt", SYMLINK, "waterwood.txt"];
 
 Components.utils.import("resource://gre/modules/ZipUtils.jsm");
 Components.utils.import("resource://gre/modules/FileUtils.jsm");
-
+Components.utils.import("resource://gre/modules/Services.jsm");
 
 const archive = do_get_file(ARCHIVE, false);
 const dir = do_get_profile().clone();
@@ -31,6 +32,19 @@
   }
 }
 
+function ensureHasSymlink(target) {
+  // Just bail out if running on Windows, since symlinks do not exists there.
+  if (Services.appinfo.OS === "WINNT") {
+    return;
+  }
+
+  let entry = target.clone();
+  entry.append(SYMLINK);
+
+  do_print("ENTRY " + entry.path);
+  do_check_true(entry.exists());
+  do_check_true(entry.isSymlink());
+}
 
 add_task(function test_extractFiles() {
   let target = dir.clone();
@@ -43,6 +57,7 @@
   }
 
   ensureExtracted(target);
+  ensureHasSymlink(target);
 });
 
 add_task(function test_extractFilesAsync() {
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/tests/xpcshell/zips/zen.zip and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/tests/xpcshell/zips/zen.zip differ
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/Troubleshoot.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/Troubleshoot.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/Troubleshoot.jsm	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/Troubleshoot.jsm	2015-05-25 20:43:57.000000000 +0000
@@ -100,6 +100,34 @@
   /^print[.]macosx[.]pagesetup/,
 ];
 
+// Table of getters for various preference types.
+// It's important to use getComplexValue for strings: it returns Unicode (wchars), getCharPref returns UTF-8 encoded chars.
+const PREFS_GETTERS = {};
+
+PREFS_GETTERS[Ci.nsIPrefBranch.PREF_STRING] = (prefs, name) => prefs.getComplexValue(name, Ci.nsISupportsString).data;
+PREFS_GETTERS[Ci.nsIPrefBranch.PREF_INT] = (prefs, name) => prefs.getIntPref(name);
+PREFS_GETTERS[Ci.nsIPrefBranch.PREF_BOOL] = (prefs, name) => prefs.getBoolPref(name);
+
+// Return the preferences filtered by PREFS_BLACKLIST and PREFS_WHITELIST lists
+// and also by the custom 'filter'-ing function.
+function getPrefList(filter) {
+  filter = filter || (name => true);
+  function getPref(name) {
+    let type = Services.prefs.getPrefType(name);
+    if (!(type in PREFS_GETTERS))
+      throw new Error("Unknown preference type " + type + " for " + name);
+    return PREFS_GETTERS[type](Services.prefs, name);
+  }
+
+  return PREFS_WHITELIST.reduce(function(prefs, branch) {
+    Services.prefs.getChildList(branch).forEach(function(name) {
+      if (filter(name) && !PREFS_BLACKLIST.some(re => re.test(name)))
+        prefs[name] = getPref(name);
+    });
+    return prefs;
+  }, {});
+}
+
 this.Troubleshoot = {
 
   /**
@@ -220,45 +248,11 @@
   },
 
   modifiedPreferences: function modifiedPreferences(done) {
-    function getPref(name) {
-      let table = {};
-      table[Ci.nsIPrefBranch.PREF_STRING] = "getCharPref";
-      table[Ci.nsIPrefBranch.PREF_INT] = "getIntPref";
-      table[Ci.nsIPrefBranch.PREF_BOOL] = "getBoolPref";
-      let type = Services.prefs.getPrefType(name);
-      if (!(type in table))
-        throw new Error("Unknown preference type " + type + " for " + name);
-      return Services.prefs[table[type]](name);
-    }
-    done(PREFS_WHITELIST.reduce(function (prefs, branch) {
-      Services.prefs.getChildList(branch).forEach(function (name) {
-        if (Services.prefs.prefHasUserValue(name) &&
-            !PREFS_BLACKLIST.some(function (re) re.test(name)))
-          prefs[name] = getPref(name);
-      });
-      return prefs;
-    }, {}));
+    done(getPrefList(name => Services.prefs.prefHasUserValue(name)));
   },
 
   lockedPreferences: function lockedPreferences(done) {
-    function getPref(name) {
-      let table = {};
-      table[Ci.nsIPrefBranch.PREF_STRING] = "getCharPref";
-      table[Ci.nsIPrefBranch.PREF_INT] = "getIntPref";
-      table[Ci.nsIPrefBranch.PREF_BOOL] = "getBoolPref";
-      let type = Services.prefs.getPrefType(name);
-      if (!(type in table))
-        throw new Error("Unknown preference type " + type + " for " + name);
-      return Services.prefs[table[type]](name);
-    }
-    done(PREFS_WHITELIST.reduce(function (prefs, branch) {
-      Services.prefs.getChildList(branch).forEach(function (name) {
-        if (Services.prefs.prefIsLocked(name) &&
-            !PREFS_BLACKLIST.some(function (re) re.test(name)))
-          prefs[name] = getPref(name);
-      });
-      return prefs;
-    }, {}));
+    done(getPrefList(name => Services.prefs.prefIsLocked(name)));
   },
 
   graphics: function graphics(done) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/ZipUtils.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/ZipUtils.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/modules/ZipUtils.jsm	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/modules/ZipUtils.jsm	2015-05-25 20:43:57.000000000 +0000
@@ -211,7 +211,7 @@
           target.permissions |= FileUtils.PERMS_FILE;
         }
         catch (e) {
-          dump("Failed to set permissions " + aPermissions.toString(8) + " on " + target.path + "\n");
+          dump("Failed to set permissions " + FileUtils.PERMS_FILE.toString(8) + " on " + target.path + " " + e + "\n");
         }
       }
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/downloads/content/downloads.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/downloads/content/downloads.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/downloads/content/downloads.js	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/downloads/content/downloads.js	2015-05-25 20:43:57.000000000 +0000
@@ -321,7 +321,7 @@
   if (gPerformAllCallback === null) {
     let uris = [];
     gPerformAllCallback = function(aURI) aURI ? uris.push(aURI) :
-      clipboard.copyString(uris.join("\n"), document);
+      clipboard.copyString(uris.join("\n"));
   }
 
   // We have a callback to use, so use it to add a uri
@@ -329,7 +329,7 @@
     gPerformAllCallback(uri);
   else {
     // It's a plain copy source, so copy it
-    clipboard.copyString(uri, document);
+    clipboard.copyString(uri);
   }
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/AddonManager.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/AddonManager.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/AddonManager.jsm	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/AddonManager.jsm	2015-05-25 20:43:58.000000000 +0000
@@ -180,6 +180,19 @@
 }
 
 /**
+ * Creates a function that will call the passed callback catching and logging
+ * any exceptions.
+ *
+ * @param  aCallback
+ *         The callback method to call
+ */
+function makeSafe(aCallback) {
+  return function(...aArgs) {
+    safeCall(aCallback, ...aArgs);
+  }
+}
+
+/**
  * Report an exception thrown by a provider API method.
  */
 function reportProviderError(aProvider, aMethod, aError) {
@@ -244,6 +257,26 @@
 }
 
 /**
+ * Calls a method on a provider if it exists and consumes any thrown exception.
+ * Parameters after aMethod are passed to aProvider.aMethod() and an additional
+ * callback is added for the provider to return a result to.
+ *
+ * @param  aProvider
+ *         The provider to call
+ * @param  aMethod
+ *         The method name to call
+ * @return {Promise}
+ * @resolves The result the provider returns, or |undefined| if the provider
+ *           does not implement the method or the method throws.
+ * @rejects  Never
+ */
+function promiseCallProvider(aProvider, aMethod, ...aArgs) {
+  return new Promise(resolve => {
+    callProviderAsync(aProvider, aMethod, ...aArgs, resolve);
+  });
+}
+
+/**
  * Gets the currently selected locale for display.
  * @return  the selected locale or "en-US" if none is selected
  */
@@ -2101,11 +2134,12 @@
    *
    * @param  aID
    *         The ID of the add-on to retrieve
-   * @param  aCallback
-   *         The callback to pass the retrieved add-on to
-   * @throws if the aID or aCallback arguments are not specified
+   * @return {Promise}
+   * @resolves The found Addon or null if no such add-on exists.
+   * @rejects  Never
+   * @throws if the aID argument is not specified
    */
-  getAddonByID: function AMI_getAddonByID(aID, aCallback) {
+  getAddonByID: function AMI_getAddonByID(aID) {
     if (!gStarted)
       throw Components.Exception("AddonManager is not initialized",
                                  Cr.NS_ERROR_NOT_INITIALIZED);
@@ -2114,24 +2148,9 @@
       throw Components.Exception("aID must be a non-empty string",
                                  Cr.NS_ERROR_INVALID_ARG);
 
-    if (typeof aCallback != "function")
-      throw Components.Exception("aCallback must be a function",
-                                 Cr.NS_ERROR_INVALID_ARG);
-
-    new AsyncObjectCaller(this.providers, "getAddonByID", {
-      nextObject: function getAddonByID_nextObject(aCaller, aProvider) {
-        callProviderAsync(aProvider, "getAddonByID", aID,
-                          function getAddonByID_safeCall(aAddon) {
-          if (aAddon)
-            safeCall(aCallback, aAddon);
-          else
-            aCaller.callNext();
-        });
-      },
-
-      noMoreObjects: function getAddonByID_noMoreObjects(aCaller) {
-        safeCall(aCallback, null);
-      }
+    let promises = [for (p of this.providers) promiseCallProvider(p, "getAddonByID", aID)];
+    return Promise.all(promises).then(aAddons => {
+      return aAddons.find(a => !!a) || null;
     });
   },
 
@@ -2180,11 +2199,12 @@
    *
    * @param  aIDs
    *         The array of IDs to retrieve
-   * @param  aCallback
-   *         The callback to pass an array of Addons to
-   * @throws if the aID or aCallback arguments are not specified
+   * @return {Promise}
+   * @resolves The array of found add-ons.
+   * @rejects  Never
+   * @throws if the aIDs argument is not specified
    */
-  getAddonsByIDs: function AMI_getAddonsByIDs(aIDs, aCallback) {
+  getAddonsByIDs: function AMI_getAddonsByIDs(aIDs) {
     if (!gStarted)
       throw Components.Exception("AddonManager is not initialized",
                                  Cr.NS_ERROR_NOT_INITIALIZED);
@@ -2193,25 +2213,8 @@
       throw Components.Exception("aIDs must be an array",
                                  Cr.NS_ERROR_INVALID_ARG);
 
-    if (typeof aCallback != "function")
-      throw Components.Exception("aCallback must be a function",
-                                 Cr.NS_ERROR_INVALID_ARG);
-
-    let addons = [];
-
-    new AsyncObjectCaller(aIDs, null, {
-      nextObject: function getAddonsByIDs_nextObject(aCaller, aID) {
-        AddonManagerInternal.getAddonByID(aID,
-                             function getAddonsByIDs_getAddonByID(aAddon) {
-          addons.push(aAddon);
-          aCaller.callNext();
-        });
-      },
-
-      noMoreObjects: function getAddonsByIDs_noMoreObjects(aCaller) {
-        safeCall(aCallback, addons);
-      }
-    });
+    let promises = [AddonManagerInternal.getAddonByID(i) for (i of aIDs)];
+    return Promise.all(promises);
   },
 
   /**
@@ -2876,7 +2879,13 @@
   },
 
   getAddonByID: function AM_getAddonByID(aID, aCallback) {
-    AddonManagerInternal.getAddonByID(aID, aCallback);
+    if (typeof aCallback != "function")
+      throw Components.Exception("aCallback must be a function",
+                                 Cr.NS_ERROR_INVALID_ARG);
+
+    AddonManagerInternal.getAddonByID(aID)
+                        .then(makeSafe(aCallback))
+                        .catch(logger.error);
   },
 
   getAddonBySyncGUID: function AM_getAddonBySyncGUID(aGUID, aCallback) {
@@ -2884,7 +2893,13 @@
   },
 
   getAddonsByIDs: function AM_getAddonsByIDs(aIDs, aCallback) {
-    AddonManagerInternal.getAddonsByIDs(aIDs, aCallback);
+    if (typeof aCallback != "function")
+      throw Components.Exception("aCallback must be a function",
+                                 Cr.NS_ERROR_INVALID_ARG);
+
+    AddonManagerInternal.getAddonsByIDs(aIDs)
+                        .then(makeSafe(aCallback))
+                        .catch(logger.error);
   },
 
   getAddonsWithOperationsByTypes:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm	2015-05-25 20:43:58.000000000 +0000
@@ -455,6 +455,7 @@
       CertUtils.checkCert(request.channel, !requireBuiltIn);
     }
     catch (e) {
+      logger.warn("Request failed: " + this.url + " - " + e);
       this.notifyError(AddonUpdateChecker.ERROR_DOWNLOAD_ERROR);
       return;
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/internal/GMPProvider.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/internal/GMPProvider.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/internal/GMPProvider.jsm	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/internal/GMPProvider.jsm	2015-05-25 20:43:58.000000000 +0000
@@ -18,6 +18,7 @@
 Cu.import("resource://gre/modules/Log.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
 Cu.import("resource://gre/modules/GMPUtils.jsm");
+Cu.import("resource://gre/modules/AppConstants.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(
   this, "GMPInstallManager", "resource://gre/modules/GMPInstallManager.jsm");
@@ -48,7 +49,8 @@
     // localisation.
     licenseURL:      "chrome://mozapps/content/extensions/OpenH264-license.txt",
     homepageURL:     "http://www.openh264.org/",
-    optionsURL:      "chrome://mozapps/content/extensions/gmpPrefs.xul"
+    optionsURL:      "chrome://mozapps/content/extensions/gmpPrefs.xul",
+    missingKey:      "VIDEO_OPENH264_GMP_DISAPPEARED",
   },
   {
     id:              EME_ADOBE_ID,
@@ -62,7 +64,8 @@
     licenseURL:      "http://help.adobe.com/en_US/primetime/drm/HTML5_CDM_EULA/index.html",
     homepageURL:     "http://help.adobe.com/en_US/primetime/drm/HTML5_CDM",
     optionsURL:      "chrome://mozapps/content/extensions/gmpPrefs.xul",
-    isEME:           true
+    isEME:           true,
+    missingKey:      "VIDEO_ADOBE_GMP_DISAPPEARED",
   }];
 
 XPCOMUtils.defineLazyGetter(this, "pluginsBundle",
@@ -70,6 +73,8 @@
 XPCOMUtils.defineLazyGetter(this, "gmpService",
   () => Cc["@mozilla.org/gecko-media-plugin-service;1"].getService(Ci.mozIGeckoMediaPluginChromeService));
 
+XPCOMUtils.defineLazyGetter(this, "telemetryService", () => Services.telemetry);
+
 let messageManager = Cc["@mozilla.org/globalmessagemanager;1"]
                        .getService(Ci.nsIMessageListenerManager);
 
@@ -140,6 +145,10 @@
     return this._gmpPath;
   },
 
+  get missingKey() {
+    return this._plugin.missingKey;
+  },
+
   get id() { return this._plugin.id; },
   get type() { return "plugin"; },
   get isGMPlugin() { return true; },
@@ -447,6 +456,26 @@
     }
     return this._updateTask;
   },
+
+  _arePluginFilesOnDisk: function () {
+    let fileExists = function(aGmpPath, aFileName) {
+      let f = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
+      let path = OS.Path.join(aGmpPath, aFileName);
+      f.initWithPath(path);
+      return f.exists();
+    };
+
+    let id = this._plugin.id.substring(4);
+    let libName = AppConstants.DLL_PREFIX + id + AppConstants.DLL_SUFFIX;
+
+    return fileExists(this.gmpPath, libName) &&
+           fileExists(this.gmpPath, id + ".info");
+  },
+
+  validate: function() {
+    return !this.isInstalled ||
+           this._arePluginFilesOnDisk();
+  },
 };
 
 let GMPProvider = {
@@ -472,6 +501,13 @@
                       gmpPath);
 
       if (gmpPath && isEnabled) {
+        if (!wrapper.validate()) {
+          this._log.info("startup - gmp " + plugin.id +
+                         " missing lib and/or info files, uninstalling");
+          telemetryService.getHistogramById(wrapper.missingKey).add(true);
+          wrapper.uninstallPlugin();
+          continue;
+        }
         this._log.info("startup - adding gmp directory " + gmpPath);
         try {
           gmpService.addPluginDirectory(gmpPath);
@@ -587,6 +623,7 @@
         optionsURL: aPlugin.optionsURL,
         wrapper: null,
         isEME: aPlugin.isEME,
+        missingKey: aPlugin.missingKey,
       };
       plugin.fullDescription = this.generateFullDescription(aPlugin);
       plugin.wrapper = new GMPWrapper(plugin);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm	2015-05-25 20:43:58.000000000 +0000
@@ -116,21 +116,18 @@
 
 let ImageFile = {
   read: function ImageFile_read(aURI, aCallback) {
-    this._netUtil.asyncFetch2(
-      aURI,
-      function read_asyncFetch(aInputStream, aStatus, aRequest) {
+    this._netUtil.asyncFetch({
+      uri: aURI,
+      loadUsingSystemPrincipal: true,
+      contentPolicyType: Ci.nsIContentPolicy.TYPE_IMAGE
+    }, function read_asyncFetch(aInputStream, aStatus, aRequest) {
         if (Components.isSuccessCode(aStatus) && aRequest instanceof Ci.nsIChannel) {
           let channel = aRequest.QueryInterface(Ci.nsIChannel);
           aCallback(aInputStream, channel.contentType);
         } else {
           aCallback();
         }
-      },
-      null,      // aLoadingNode
-      Services.scriptSecurityManager.getSystemPrincipal(),
-      null,      // aTriggeringPrincipal
-      Ci.nsILoadInfo.SEC_NORMAL,
-      Ci.nsIContentPolicy.TYPE_IMAGE);
+      });
   },
 
   write: function ImageFile_write(aFile, aInputStream, aCallback) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/internal/moz.build firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/internal/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/internal/moz.build	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/internal/moz.build	2015-05-25 20:43:58.000000000 +0000
@@ -34,6 +34,8 @@
 if CONFIG['MOZ_EM_DEBUG']:
     DEFINES['MOZ_EM_DEBUG'] = 1
 
-# Add-on signing cannot be preffed off in official beta, release or esr builds
-if CONFIG['MOZ_UPDATE_CHANNEL'] in ('beta', 'release', 'esr') and CONFIG['MOZ_OFFICIAL_BRANDING']:
+if CONFIG['MOZ_ADDON_SIGNING']:
+    DEFINES['MOZ_ADDON_SIGNING'] = 1
+
+if CONFIG['MOZ_REQUIRE_SIGNING']:
     DEFINES['MOZ_REQUIRE_SIGNING'] = 1
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/internal/XPIProvider.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/internal/XPIProvider.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/internal/XPIProvider.jsm	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/internal/XPIProvider.jsm	2015-05-25 20:43:58.000000000 +0000
@@ -1348,7 +1348,7 @@
  * @return a Promise that resolves to an AddonManager.SIGNEDSTATE_* constant.
  */
 function verifyZipSignedState(aFile, aAddon) {
-  if (!SIGNED_TYPES.has(aAddon.type))
+  if (!ADDON_SIGNING || !SIGNED_TYPES.has(aAddon.type))
     return Promise.resolve(undefined);
 
   let certDB = Cc["@mozilla.org/security/x509certdb;1"]
@@ -1378,7 +1378,7 @@
  * @return a Promise that resolves to an AddonManager.SIGNEDSTATE_* constant.
  */
 function verifyDirSignedState(aDir, aAddon) {
-  if (!SIGNED_TYPES.has(aAddon.type))
+  if (!ADDON_SIGNING || !SIGNED_TYPES.has(aAddon.type))
     return Promise.resolve(undefined);
 
   let certDB = Cc["@mozilla.org/security/x509certdb;1"]
@@ -3202,7 +3202,8 @@
 
         // If updating from a version of the app that didn't support signedState
         // then fetch that property now
-        if (aOldAddon.signedState === undefined && SIGNED_TYPES.has(aOldAddon.type)) {
+        if (aOldAddon.signedState === undefined && ADDON_SIGNING &&
+            SIGNED_TYPES.has(aOldAddon.type)) {
           let file = aInstallLocation.getLocationForID(aOldAddon.id);
           let manifest = syncLoadManifestFromFile(file);
           aOldAddon.signedState = manifest.signedState;
@@ -5571,14 +5572,9 @@
       let requireBuiltIn = Preferences.get(PREF_INSTALL_REQUIREBUILTINCERTS, true);
       this.badCertHandler = new CertUtils.BadCertHandler(!requireBuiltIn);
 
-      this.channel = NetUtil.newChannel2(this.sourceURI,
-                                         null,
-                                         null,
-                                         null,      // aLoadingNode
-                                         Services.scriptSecurityManager.getSystemPrincipal(),
-                                         null,      // aTriggeringPrincipal
-                                         Ci.nsILoadInfo.SEC_NORMAL,
-                                         Ci.nsIContentPolicy.TYPE_OTHER);
+      this.channel = NetUtil.newChannel({
+        uri: this.sourceURI,
+        loadUsingSystemPrincipal: true});
       this.channel.notificationCallbacks = this;
       if (this.channel instanceof Ci.nsIHttpChannel) {
         this.channel.setRequestHeader("Moz-XPI-Update", "1", true);
@@ -7874,8 +7870,19 @@
 };
 #endif
 
-// Make this a non-changable property so it can't be manipulated from other
+// Make these non-changable properties so they can't be manipulated from other
 // code in the app.
+Object.defineProperty(this, "ADDON_SIGNING", {
+  configurable: false,
+  enumerable: false,
+  writable: false,
+#ifdef MOZ_ADDON_SIGNING
+  value: true,
+#else
+  value: false,
+#endif
+});
+
 Object.defineProperty(this, "REQUIRE_SIGNING", {
   configurable: false,
   enumerable: false,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/LightweightThemeManager.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/LightweightThemeManager.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/LightweightThemeManager.jsm	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/LightweightThemeManager.jsm	2015-05-25 20:43:58.000000000 +0000
@@ -302,7 +302,7 @@
     if (aData)
       _prefs.setCharPref("selectedThemeID", aData.id);
     else
-      _prefs.deleteBranch("selectedThemeID");
+      _prefs.setCharPref("selectedThemeID", "");
 
     _notifyWindows(aData);
     Services.obs.notifyObservers(null, "lightweight-theme-changed", null);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist_AllOS.xml firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist_AllOS.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist_AllOS.xml	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist_AllOS.xml	2015-05-25 20:43:59.000000000 +0000
@@ -2,9 +2,11 @@
 
 <blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist">
   <gfxItems>
+
     <gfxBlacklistEntry>
       <os>All</os>
       <vendor>0xabcd</vendor>
+      <versionRange minVersion="15.0" maxVersion="15.0"/>
       <devices>
         <device>0x2783</device>
         <device>0x1234</device>
@@ -12,12 +14,12 @@
       </devices>
       <feature> DIRECT2D </feature>
       <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-      <driverVersion> 8.52.322.2202 </driverVersion>
-      <driverVersionComparator> LESS_THAN </driverVersionComparator>
     </gfxBlacklistEntry>
+
     <gfxBlacklistEntry>
-      <os>WINNT 6.0</os>
-      <vendor>0xdcba</vendor>
+      <os>All</os>
+      <vendor>0xabcd</vendor>
+      <versionRange minVersion="15.0" maxVersion="22.0a1"/>
       <devices>
         <device>0x2783</device>
         <device>0x1234</device>
@@ -25,8 +27,149 @@
       </devices>
       <feature> DIRECT3D_9_LAYERS </feature>
       <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-      <driverVersion> 8.52.322.2202 </driverVersion>
-      <driverVersionComparator> LESS_THAN </driverVersionComparator>
     </gfxBlacklistEntry>
+
+    <gfxBlacklistEntry>
+      <os>All</os>
+      <vendor>0xabcd</vendor>
+      <versionRange minVersion="16.0a1"/>
+      <devices>
+        <device>0x2783</device>
+        <device>0x1234</device>
+        <device>0x2782</device>
+      </devices>
+      <feature> DIRECT3D_10_LAYERS</feature>
+      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
+    </gfxBlacklistEntry>
+
+    <gfxBlacklistEntry>
+      <os>All</os>
+      <vendor>0xabcd</vendor>
+      <versionRange minVersion="16.0a1" maxVersion="22.0"/>
+      <devices>
+        <device>0x2783</device>
+        <device>0x1234</device>
+        <device>0x2782</device>
+      </devices>
+      <feature> DIRECT3D_10_1_LAYERS </feature>
+      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
+    </gfxBlacklistEntry>
+
+    <gfxBlacklistEntry>
+      <os>All</os>
+      <vendor>0xabcd</vendor>
+      <versionRange minVersion="12.0" maxVersion="16.0"/>
+      <devices>
+        <device>0x2783</device>
+        <device>0x1234</device>
+        <device>0x2782</device>
+      </devices>
+      <feature> OPENGL_LAYERS </feature>
+      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
+    </gfxBlacklistEntry>
+
+    <gfxBlacklistEntry>
+      <os>All</os>
+      <vendor>0xabcd</vendor>
+      <versionRange minVersion="14.0b2" maxVersion="15.0"/>
+      <devices>
+        <device>0x2783</device>
+        <device>0x1234</device>
+        <device>0x2782</device>
+      </devices>
+      <feature> WEBGL_OPENGL </feature>
+      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
+    </gfxBlacklistEntry>
+
+    <gfxBlacklistEntry>
+      <os>All</os>
+      <vendor>0xabcd</vendor>
+      <devices>
+        <device>0x2783</device>
+        <device>0x1234</device>
+        <device>0x2782</device>
+      </devices>
+      <feature> WEBGL_ANGLE </feature>
+      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
+    </gfxBlacklistEntry>
+
+    <gfxBlacklistEntry>
+      <os>All</os>
+      <vendor>0xabcd</vendor>
+      <versionRange minVersion="12.0" maxVersion="16.0"/>
+      <devices>
+        <device>0x2783</device>
+        <device>0x1234</device>
+        <device>0x2782</device>
+      </devices>
+      <feature> WEBGL_MSAA </feature>
+      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
+    </gfxBlacklistEntry>
+
+    <gfxBlacklistEntry>
+      <os>All</os>
+      <vendor>0xabcd</vendor>
+      <versionRange maxVersion="13.0"/>
+      <devices>
+        <device>0x2783</device>
+        <device>0x1234</device>
+        <device>0x2782</device>
+      </devices>
+      <feature> STAGEFRIGHT </feature>
+      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
+    </gfxBlacklistEntry>
+
+    <gfxBlacklistEntry>
+      <os>All</os>
+      <vendor>0xabcd</vendor>
+      <versionRange minVersion="42.0" maxVersion="13.0b2"/>
+      <devices>
+        <device>0x2783</device>
+        <device>0x1234</device>
+        <device>0x2782</device>
+      </devices>
+      <feature> WEBRTC_HW_ACCELERATION </feature>
+      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
+    </gfxBlacklistEntry>
+
+    <gfxBlacklistEntry>
+      <os>All</os>
+      <vendor>0xabcd</vendor>
+      <versionRange minVersion="17.2a2" maxVersion="15.0"/>
+      <devices>
+        <device>0x2783</device>
+        <device>0x1234</device>
+        <device>0x2782</device>
+      </devices>
+      <feature> DIRECT3D_11_LAYERS </feature>
+      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
+    </gfxBlacklistEntry>
+
+    <gfxBlacklistEntry>
+      <os>All</os>
+      <vendor>0xabcd</vendor>
+      <versionRange minVersion="15.0" maxVersion="13.2"/>
+      <devices>
+        <device>0x2783</device>
+        <device>0x1234</device>
+        <device>0x2782</device>
+      </devices>
+      <feature> HARDWARE_VIDEO_DECODING </feature>
+      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
+    </gfxBlacklistEntry>
+
+    <gfxBlacklistEntry>
+      <os>All</os>
+      <vendor>0xabcd</vendor>
+      <versionRange minVersion="10.5" maxVersion="13.0"/>
+      <devices>
+        <device>0x2783</device>
+        <device>0x1234</device>
+        <device>0x2782</device>
+      </devices>
+      <feature> DIRECT3D_11_ANGLE </feature>
+      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
+    </gfxBlacklistEntry>
+
   </gfxItems>
 </blocklist>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist.xml firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist.xml
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist.xml	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist.xml	2015-05-25 20:43:59.000000000 +0000
@@ -55,7 +55,7 @@
       <driverVersionComparator> EQUAL </driverVersionComparator>
     </gfxBlacklistEntry>
     <gfxBlacklistEntry>
-      <os>Darwin 9</os>
+      <os>Darwin 10</os>
       <vendor>0xabcd</vendor>
       <devices>
         <device>0x2783</device>
@@ -124,7 +124,7 @@
       <featureStatus> BLOCKED_DEVICE </featureStatus>
     </gfxBlacklistEntry>
     <gfxBlacklistEntry>
-      <os>Darwin 9</os>
+      <os>Darwin 10</os>
       <vendor>0xabcd</vendor>
       <devices>
         <device>0x6666</device>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OK.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OK.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OK.js	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OK.js	2015-05-25 20:44:00.000000000 +0000
@@ -2,11 +2,14 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
+// This should eventually be moved to head_addons.js
+const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
+
 // Test whether a machine which exactly matches the blacklist entry is
 // successfully blocked.
 // Uses test_gfxBlacklist.xml
 
-Components.utils.import("resource://testing-common/httpd.js");
+Cu.import("resource://testing-common/httpd.js");
 
 var gTestserver = new HttpServer();
 gTestserver.start(-1);
@@ -14,8 +17,8 @@
 mapFile("/data/test_gfxBlacklist.xml", gTestserver);
 
 function get_platform() {
-  var xulRuntime = Components.classes["@mozilla.org/xre/app-info;1"]
-                             .getService(Components.interfaces.nsIXULRuntime);
+  var xulRuntime = Cc["@mozilla.org/xre/app-info;1"]
+                             .getService(Ci.nsIXULRuntime);
   return xulRuntime.OS;
 }
 
@@ -29,12 +32,7 @@
 
 // Performs the initial setup
 function run_test() {
-  try {
-    var gfxInfo = Cc["@mozilla.org/gfx/info;1"].getService(Ci.nsIGfxInfo);
-  } catch (e) {
-    do_test_finished();
-    return;
-  }
+  var gfxInfo = Cc["@mozilla.org/gfx/info;1"].getService(Ci.nsIGfxInfo);
 
   // We can't do anything if we can't spoof the stuff we need.
   if (!(gfxInfo instanceof Ci.nsIGfxInfoDebug)) {
@@ -60,7 +58,7 @@
     case "Darwin":
       gfxInfo.spoofVendorID("0xabcd");
       gfxInfo.spoofDeviceID("0x1234");
-      gfxInfo.spoofOSVersion(0x1050);
+      gfxInfo.spoofOSVersion(0x1060);
       break;
     case "Android":
       gfxInfo.spoofVendorID("abcd");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Version.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Version.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Version.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Version.js	2015-05-25 20:44:00.000000000 +0000
@@ -0,0 +1,129 @@
+/* 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;
+
+// Test whether a machine which exactly matches the blacklist entry is
+// successfully blocked.
+// Uses test_gfxBlacklist_AllOS.xml
+
+Cu.import("resource://testing-common/httpd.js");
+
+var gTestserver = new HttpServer();
+gTestserver.start(-1);
+gPort = gTestserver.identity.primaryPort;
+mapFile("/data/test_gfxBlacklist_AllOS.xml", gTestserver);
+
+function get_platform() {
+  var xulRuntime = Cc["@mozilla.org/xre/app-info;1"]
+                             .getService(Ci.nsIXULRuntime);
+  return xulRuntime.OS;
+}
+
+function load_blocklist(file) {
+  Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:" +
+                             gPort + "/data/" + file);
+  var blocklist = Cc["@mozilla.org/extensions/blocklist;1"].
+                  getService(Ci.nsITimerCallback);
+  blocklist.notify(null);
+}
+
+// Performs the initial setup
+function run_test() {
+  var gfxInfo = Cc["@mozilla.org/gfx/info;1"].getService(Ci.nsIGfxInfo);
+
+  // We can't do anything if we can't spoof the stuff we need.
+  if (!(gfxInfo instanceof Ci.nsIGfxInfoDebug)) {
+    do_test_finished();
+    return;
+  }
+
+  gfxInfo.QueryInterface(Ci.nsIGfxInfoDebug);
+
+  // Set the vendor/device ID, etc, to match the test file.
+  switch (get_platform()) {
+    case "WINNT":
+      gfxInfo.spoofVendorID("0xabcd");
+      gfxInfo.spoofDeviceID("0x1234");
+      gfxInfo.spoofDriverVersion("8.52.322.2201");
+      // Windows 7
+      gfxInfo.spoofOSVersion(0x60001);
+      break;
+    case "Linux":
+      gfxInfo.spoofVendorID("0xabcd");
+      gfxInfo.spoofDeviceID("0x1234");
+      break;
+    case "Darwin":
+      gfxInfo.spoofVendorID("0xabcd");
+      gfxInfo.spoofDeviceID("0x1234");
+      gfxInfo.spoofOSVersion(0x1060);
+      break;
+    case "Android":
+      gfxInfo.spoofVendorID("abcd");
+      gfxInfo.spoofDeviceID("asdf");
+      gfxInfo.spoofDriverVersion("5");
+      break;
+  }
+
+  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "15.0", "8");
+  startupManager();
+
+  do_test_pending();
+
+  function checkBlacklist()
+  {
+    var status;
+
+    status = gfxInfo.getFeatureStatus(Ci.nsIGfxInfo.FEATURE_DIRECT2D);
+    do_check_eq(status, Ci.nsIGfxInfo.FEATURE_BLOCKED_DRIVER_VERSION);
+
+    status = gfxInfo.getFeatureStatus(Ci.nsIGfxInfo.FEATURE_DIRECT3D_9_LAYERS);
+    do_check_eq(status, Ci.nsIGfxInfo.FEATURE_BLOCKED_DRIVER_VERSION);
+
+    status = gfxInfo.getFeatureStatus(Ci.nsIGfxInfo.FEATURE_DIRECT3D_10_LAYERS);
+    do_check_eq(status, Ci.nsIGfxInfo.FEATURE_STATUS_OK);
+
+    status = gfxInfo.getFeatureStatus(Ci.nsIGfxInfo.FEATURE_DIRECT3D_10_1_LAYERS);
+    do_check_eq(status, Ci.nsIGfxInfo.FEATURE_STATUS_OK);
+
+    // These four pass on Linux independent of the blocklist XML file as the
+    // try machines don't have support.
+    status = gfxInfo.getFeatureStatus(Ci.nsIGfxInfo.FEATURE_OPENGL_LAYERS);
+    do_check_eq(status, Ci.nsIGfxInfo.FEATURE_BLOCKED_DRIVER_VERSION);
+
+    status = gfxInfo.getFeatureStatus(Ci.nsIGfxInfo.FEATURE_WEBGL_OPENGL);
+    do_check_eq(status, Ci.nsIGfxInfo.FEATURE_BLOCKED_DRIVER_VERSION);
+
+    status = gfxInfo.getFeatureStatus(Ci.nsIGfxInfo.FEATURE_WEBGL_ANGLE);
+    do_check_eq(status, Ci.nsIGfxInfo.FEATURE_BLOCKED_DRIVER_VERSION);
+
+    status = gfxInfo.getFeatureStatus(Ci.nsIGfxInfo.FEATURE_WEBGL_MSAA);
+    do_check_eq(status, Ci.nsIGfxInfo.FEATURE_BLOCKED_DRIVER_VERSION);
+
+    status = gfxInfo.getFeatureStatus(Ci.nsIGfxInfo.FEATURE_STAGEFRIGHT);
+    do_check_eq(status, Ci.nsIGfxInfo.FEATURE_STATUS_OK);
+
+    status = gfxInfo.getFeatureStatus(Ci.nsIGfxInfo.FEATURE_WEBRTC_HW_ACCELERATION);
+    do_check_eq(status, Ci.nsIGfxInfo.FEATURE_STATUS_OK);
+
+    status = gfxInfo.getFeatureStatus(Ci.nsIGfxInfo.FEATURE_DIRECT3D_11_LAYERS);
+    do_check_eq(status, Ci.nsIGfxInfo.FEATURE_STATUS_OK);
+
+    status = gfxInfo.getFeatureStatus(Ci.nsIGfxInfo.FEATURE_HARDWARE_VIDEO_DECODING);
+    do_check_eq(status, Ci.nsIGfxInfo.FEATURE_STATUS_OK);
+
+    status = gfxInfo.getFeatureStatus(Ci.nsIGfxInfo.FEATURE_DIRECT3D_11_ANGLE);
+    do_check_eq(status, Ci.nsIGfxInfo.FEATURE_STATUS_OK);
+
+    gTestserver.stop(do_test_finished);
+  }
+
+  Services.obs.addObserver(function(aSubject, aTopic, aData) {
+    // If we wait until after we go through the event loop, gfxInfo is sure to
+    // have processed the gfxItems event.
+    do_execute_soon(checkBlacklist);
+  }, "blocklist-data-gfxItems", false);
+
+  load_blocklist("test_gfxBlacklist_AllOS.xml");
+}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/test/xpcshell/test_gmpProvider.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/test/xpcshell/test_gmpProvider.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/test/xpcshell/test_gmpProvider.js	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/test/xpcshell/test_gmpProvider.js	2015-05-25 20:44:00.000000000 +0000
@@ -5,10 +5,14 @@
 
 const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 let GMPScope = Cu.import("resource://gre/modules/addons/GMPProvider.jsm");
+Cu.import("resource://gre/modules/AppConstants.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "pluginsBundle",
   () => Services.strings.createBundle("chrome://global/locale/plugins.properties"));
 
+XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
+                                  "resource://gre/modules/FileUtils.jsm");
+
 let gMockAddons = new Map();
 let gMockEmeAddons = new Map();
 
@@ -19,6 +23,7 @@
       isInstalled: false,
       nameId: plugin.name,
       descriptionId: plugin.description,
+      missingKey: plugin.missingKey,
   });
   gMockAddons.set(mockAddon.id, mockAddon);
   if (mockAddon.id.indexOf("gmp-eme-") == 0) {
@@ -216,11 +221,36 @@
   }
 });
 
+function createMockPluginFilesIfNeeded(aFile, aPluginId) {
+  function createFile(aFileName) {
+    let f = aFile.clone();
+    f.append(aFileName);
+    if (!f.exists()) {
+      f.create(Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
+    }
+  };
+
+  let id = aPluginId.substring(4);
+  let libName = AppConstants.DLL_PREFIX + id + AppConstants.DLL_SUFFIX;
+
+  createFile(libName);
+  createFile(id + ".info");
+}
+
+// Array.includes() is only in Nightly channel, so polyfill so we don't fail
+// on other branches.
+if (![].includes) {
+  Array.prototype.includes = function(element) {
+    return Object(this).indexOf(element) != -1;
+  }
+}
+
 add_task(function* test_pluginRegistration() {
   const TEST_VERSION = "1.2.3.4";
 
+  let profD = do_get_profile();
   for (let addon of gMockAddons.values()) {
-    let file = Services.dirsvc.get("ProfD", Ci.nsIFile);
+    let file = profD.clone();
     file.append(addon.id);
     file.append(TEST_VERSION);
 
@@ -229,17 +259,58 @@
     let clearPaths = () => { addedPaths = []; removedPaths = []; }
 
     let MockGMPService = {
-      addPluginDirectory: path => addedPaths.push(path),
-      removePluginDirectory: path => removedPaths.push(path),
-      removeAndDeletePluginDirectory: path => removedPaths.push(path),
+      addPluginDirectory: path => {
+        if (!addedPaths.includes(path)) {
+          addedPaths.push(path);
+        }
+      },
+      removePluginDirectory: path => {
+        if (!removedPaths.includes(path)) {
+          removedPaths.push(path);
+        }
+      },
+      removeAndDeletePluginDirectory: path => {
+        if (!removedPaths.includes(path)) {
+          removedPaths.push(path);
+        }
+      },
+    };
+
+    let reportedKeys = [];
+
+    let MockTelemetry = {
+      getHistogramById: key => {
+        return {
+          add: value => {
+            reportedKeys.push(key);
+          }
+        }
+      }
     };
 
     GMPScope.gmpService = MockGMPService;
+    GMPScope.telemetryService = MockTelemetry;
     gPrefs.setBoolPref(gGetKey(GMPScope.GMPPrefs.KEY_PLUGIN_ENABLED, addon.id), true);
 
-    // Check that the plugin gets registered after startup.
+    // Test that plugin registration fails if the plugin dynamic library and
+    // info files are not present.
     gPrefs.setCharPref(gGetKey(GMPScope.GMPPrefs.KEY_PLUGIN_VERSION, addon.id),
-                      TEST_VERSION);
+                       TEST_VERSION);
+    clearPaths();
+    yield promiseRestartManager();
+    Assert.equal(addedPaths.indexOf(file.path), -1);
+    Assert.deepEqual(removedPaths, [file.path]);
+
+    // Test that the GMPProvider tried to report via telemetry that the
+    // addon's lib file is missing.
+    Assert.deepEqual(reportedKeys, [addon.missingKey]);
+
+    // Create dummy GMP library/info files, and test that plugin registration
+    // succeeds during startup, now that we've added GMP info/lib files.
+    createMockPluginFilesIfNeeded(file, addon.id);
+
+    gPrefs.setCharPref(gGetKey(GMPScope.GMPPrefs.KEY_PLUGIN_VERSION, addon.id),
+                       TEST_VERSION);
     clearPaths();
     yield promiseRestartManager();
     Assert.notEqual(addedPaths.indexOf(file.path), -1);
@@ -259,7 +330,7 @@
 
     // Changing the pref mid-session should cause unregistration and registration.
     gPrefs.setCharPref(gGetKey(GMPScope.GMPPrefs.KEY_PLUGIN_VERSION, addon.id),
-                      TEST_VERSION);
+                       TEST_VERSION);
     clearPaths();
     const TEST_VERSION_2 = "5.6.7.8";
     let file2 = Services.dirsvc.get("ProfD", Ci.nsIFile);
@@ -272,7 +343,7 @@
 
     // Disabling the plugin should cause unregistration.
     gPrefs.setCharPref(gGetKey(GMPScope.GMPPrefs.KEY_PLUGIN_VERSION, addon.id),
-                      TEST_VERSION);
+                       TEST_VERSION);
     clearPaths();
     gPrefs.setBoolPref(gGetKey(GMPScope.GMPPrefs.KEY_PLUGIN_ENABLED, addon.id), false);
     Assert.deepEqual(addedPaths, []);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/test/xpcshell/test_shutdown.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/test/xpcshell/test_shutdown.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/test/xpcshell/test_shutdown.js	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/test/xpcshell/test_shutdown.js	2015-05-25 20:44:00.000000000 +0000
@@ -27,9 +27,25 @@
     if (typeof AddonManager[prop] != "function")
       continue;
 
+    let args = [];
+
+    // Getter functions need a callback and in some cases not having one will
+    // throw before checking if the add-ons manager is initialized so pass in
+    // an empty one.
+    if (prop.startsWith("get")) {
+      // For now all getter functions with more than one argument take the
+      // callback in the second argument.
+      if (AddonManager[prop].length > 1) {
+        args.push(undefined, () => {});
+      }
+      else {
+        args.push(() => {});
+      }
+    }
+
     try {
       do_print("AddonManager." + prop);
-      AddonManager[prop]();
+      AddonManager[prop](...args);
       do_throw(prop + " did not throw an exception");
     }
     catch (e) {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/test/xpcshell/test_signed_inject.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/test/xpcshell/test_signed_inject.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/test/xpcshell/test_signed_inject.js	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/test/xpcshell/test_signed_inject.js	2015-05-25 20:44:00.000000000 +0000
@@ -49,6 +49,13 @@
   Services.prefs.setIntPref("bootstraptest.uninstall_newversion", -1);
 }
 
+function clearCache(file) {
+  if (TEST_UNPACKED)
+    return;
+
+  Services.obs.notifyObservers(file, "flush-cache-entry", null);
+}
+
 function getActiveVersion() {
   return Services.prefs.getIntPref("bootstraptest.active_version");
 }
@@ -67,7 +74,7 @@
 
 // Injecting into profile (bootstrap)
 add_task(function*() {
-  manuallyInstall(do_get_file(DATA + ADDONS.bootstrap.unsigned), profileDir, ID);
+  let file = manuallyInstall(do_get_file(DATA + ADDONS.bootstrap.unsigned), profileDir, ID);
 
   startupManager();
 
@@ -83,12 +90,13 @@
   yield promiseShutdownManager();
   resetPrefs();
 
-  do_check_false(getFileForAddon(profileDir, ID).exists());
+  do_check_false(file.exists());
+  clearCache(file);
 });
 
 add_task(function*() {
-  manuallyInstall(do_get_file(DATA + ADDONS.bootstrap.signed), profileDir, ID);
-  breakAddon(getFileForAddon(profileDir, ID));
+  let file = manuallyInstall(do_get_file(DATA + ADDONS.bootstrap.signed), profileDir, ID);
+  breakAddon(file);
 
   startupManager();
 
@@ -104,11 +112,12 @@
   yield promiseShutdownManager();
   resetPrefs();
 
-  do_check_false(getFileForAddon(profileDir, ID).exists());
+  do_check_false(file.exists());
+  clearCache(file);
 });
 
 add_task(function*() {
-  manuallyInstall(do_get_file(DATA + ADDONS.bootstrap.badid), profileDir, ID);
+  let file = manuallyInstall(do_get_file(DATA + ADDONS.bootstrap.badid), profileDir, ID);
 
   startupManager();
 
@@ -124,17 +133,18 @@
   yield promiseShutdownManager();
   resetPrefs();
 
-  do_check_false(getFileForAddon(profileDir, ID).exists());
+  do_check_false(file.exists());
+  clearCache(file);
 });
 
 // Installs a signed add-on then modifies it in place breaking its signing
 add_task(function*() {
-  manuallyInstall(do_get_file(DATA + ADDONS.bootstrap.signed), profileDir, ID);
+  let file = manuallyInstall(do_get_file(DATA + ADDONS.bootstrap.signed), profileDir, ID);
 
   // Make it appear to come from the past so when we modify it later it is
   // detected during startup. Obviously malware can bypass this method of
   // detection but the periodic scan will catch that
-  yield promiseSetExtensionModifiedTime(getFileForAddon(profileDir, ID).path, Date.now() - 600000);
+  yield promiseSetExtensionModifiedTime(file.path, Date.now() - 600000);
 
   startupManager();
   let addon = yield promiseAddonByID(ID);
@@ -147,7 +157,8 @@
   yield promiseShutdownManager();
   do_check_eq(getActiveVersion(), 0);
 
-  breakAddon(getFileForAddon(profileDir, ID));
+  clearCache(file);
+  breakAddon(file);
   resetPrefs();
 
   startupManager();
@@ -167,12 +178,13 @@
   yield promiseShutdownManager();
   resetPrefs();
 
-  do_check_false(getFileForAddon(profileDir, ID).exists());
+  do_check_false(file.exists());
+  clearCache(file);
 });
 
 // Injecting into profile (non-bootstrap)
 add_task(function*() {
-  manuallyInstall(do_get_file(DATA + ADDONS.nonbootstrap.unsigned), profileDir, ID);
+  let file = manuallyInstall(do_get_file(DATA + ADDONS.nonbootstrap.unsigned), profileDir, ID);
 
   startupManager();
 
@@ -188,12 +200,13 @@
   yield promiseRestartManager();
   yield promiseShutdownManager();
 
-  do_check_false(getFileForAddon(profileDir, ID).exists());
+  do_check_false(file.exists());
+  clearCache(file);
 });
 
 add_task(function*() {
-  manuallyInstall(do_get_file(DATA + ADDONS.nonbootstrap.signed), profileDir, ID);
-  breakAddon(getFileForAddon(profileDir, ID));
+  let file = manuallyInstall(do_get_file(DATA + ADDONS.nonbootstrap.signed), profileDir, ID);
+  breakAddon(file);
 
   startupManager();
 
@@ -209,11 +222,12 @@
   yield promiseRestartManager();
   yield promiseShutdownManager();
 
-  do_check_false(getFileForAddon(profileDir, ID).exists());
+  do_check_false(file.exists());
+  clearCache(file);
 });
 
 add_task(function*() {
-  manuallyInstall(do_get_file(DATA + ADDONS.nonbootstrap.badid), profileDir, ID);
+  let file = manuallyInstall(do_get_file(DATA + ADDONS.nonbootstrap.badid), profileDir, ID);
 
   startupManager();
 
@@ -229,17 +243,18 @@
   yield promiseRestartManager();
   yield promiseShutdownManager();
 
-  do_check_false(getFileForAddon(profileDir, ID).exists());
+  do_check_false(file.exists());
+  clearCache(file);
 });
 
 // Installs a signed add-on then modifies it in place breaking its signing
 add_task(function*() {
-  manuallyInstall(do_get_file(DATA + ADDONS.nonbootstrap.signed), profileDir, ID);
+  let file = manuallyInstall(do_get_file(DATA + ADDONS.nonbootstrap.signed), profileDir, ID);
 
   // Make it appear to come from the past so when we modify it later it is
   // detected during startup. Obviously malware can bypass this method of
   // detection but the periodic scan will catch that
-  yield promiseSetExtensionModifiedTime(getFileForAddon(profileDir, ID).path, Date.now() - 60000);
+  yield promiseSetExtensionModifiedTime(file.path, Date.now() - 60000);
 
   startupManager();
   let addon = yield promiseAddonByID(ID);
@@ -251,7 +266,8 @@
 
   yield promiseShutdownManager();
 
-  breakAddon(getFileForAddon(profileDir, ID));
+  clearCache(file);
+  breakAddon(file);
 
   startupManager();
 
@@ -270,7 +286,8 @@
   yield promiseRestartManager();
   yield promiseShutdownManager();
 
-  do_check_false(getFileForAddon(profileDir, ID).exists());
+  do_check_false(file.exists());
+  clearCache(file);
 });
 
 // Stage install then modify before startup (non-bootstrap)
@@ -291,8 +308,7 @@
   let addon = yield promiseAddonByID(ID);
   do_check_eq(addon, null);
 
-  let install = getFileForAddon(profileDir, ID);
-  do_check_false(install.exists());
+  clearCache(staged);
 
   yield promiseShutdownManager();
 });
@@ -312,8 +328,8 @@
   do_check_eq(addon, null);
   do_check_eq(getActiveVersion(), -1);
 
-  let install = getFileForAddon(profileDir, ID);
-  do_check_false(install.exists());
+  do_check_false(file.exists());
+  clearCache(file);
 
   yield promiseShutdownManager();
   resetPrefs();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini	2015-05-13 18:06:13.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini	2015-05-25 20:44:00.000000000 +0000
@@ -191,6 +191,7 @@
 [test_gfxBlacklist_OSVersion_mismatch_OSVersion.js]
 [test_gfxBlacklist_OSVersion_mismatch_DriverVersion.js]
 [test_gfxBlacklist_Vendor.js]
+[test_gfxBlacklist_Version.js]
 [test_gfxBlacklist_prefs.js]
 [test_hasbinarycomponents.js]
 [test_hotfix.js]
@@ -238,7 +239,6 @@
 [test_safemode.js]
 [test_signed_verify.js]
 [test_signed_inject.js]
-skip-if = true
 [test_signed_install.js]
 run-sequentially = Uses hardcoded ports in xpi files.
 [test_signed_migrate.js]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/installer/dozip.py firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/installer/dozip.py
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/installer/dozip.py	2015-05-13 18:06:14.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/installer/dozip.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# This script creates a zip file, but will also strip any binaries
-# it finds before adding them to the zip.
-
-from mozpack.files import FileFinder
-from mozpack.copier import Jarrer
-from mozpack.errors import errors
-
-import argparse
-import buildconfig
-import mozpack.path as mozpath
-import os
-import sys
-import tempfile
-
-def main(args):
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--base-dir",
-                        default=os.path.join(buildconfig.topobjdir,
-                                             "dist", "bin"),
-                        help="Store paths relative to this directory")
-    parser.add_argument("zip", help="Path to zip file to write")
-    parser.add_argument("input", nargs="+",
-                        help="Path to files to add to zip")
-    args = parser.parse_args(args)
-
-    jarrer = Jarrer(optimize=False)
-
-    with errors.accumulate():
-        finder = FileFinder(args.base_dir)
-        for i in args.input:
-            path = mozpath.relpath(i, args.base_dir)
-            for p, f in finder.find(path):
-                jarrer.add(p, f)
-        jarrer.copy(args.zip)
-
-
-if __name__ == '__main__':
-    main(sys.argv[1:])
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/installer/package-name.mk firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/installer/package-name.mk
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/installer/package-name.mk	2015-05-13 18:06:14.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/installer/package-name.mk	2015-05-25 20:44:00.000000000 +0000
@@ -155,8 +155,10 @@
 MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt
 MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json
 MOZ_MOZINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).mozinfo.json
+MOZ_TEST_PACKAGES_FILE = $(DIST)/$(PKG_PATH)/test_packages.json
 
 # JavaScript Shell
-PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip
+JSSHELL_NAME = jsshell-$(MOZ_PKG_PLATFORM).zip
+PKG_JSSHELL = $(DIST)/$(JSSHELL_NAME)
 
 endif # PACKAGE_NAME_MK_INCLUDED
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/installer/packager.mk firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/installer/packager.mk
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/installer/packager.mk	2015-05-13 18:06:14.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/installer/packager.mk	2015-05-25 20:44:00.000000000 +0000
@@ -29,11 +29,17 @@
 	$(call MAKE_SIGN_EME_VOUCHER,$(DEPTH)/installer-stage/core)
 	@(cd $(DEPTH)/installer-stage/core && $(CREATE_PRECOMPLETE_CMD))
 
+ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
+ELF_HACK_FLAGS = --fill
+endif
+export USE_ELF_HACK ELF_HACK_FLAGS
+
 # Override the value of OMNIJAR_NAME from config.status with the value
 # set earlier in this file.
 
 stage-package: $(MOZ_PKG_MANIFEST)
 	OMNIJAR_NAME=$(OMNIJAR_NAME) \
+	NO_PKG_FILES="$(NO_PKG_FILES)" \
 	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/packager.py $(DEFINES) \
 		--format $(MOZ_PACKAGER_FORMAT) \
 		$(addprefix --removals ,$(MOZ_PKG_REMOVALS)) \
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/installer/upload-files.mk firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/installer/upload-files.mk
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/installer/upload-files.mk	2015-05-13 18:06:14.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/installer/upload-files.mk	2015-05-25 20:44:00.000000000 +0000
@@ -66,56 +66,56 @@
 # JavaScript Shell packaging
 ifndef LIBXUL_SDK
 JSSHELL_BINS  = \
-  $(DIST)/bin/js$(BIN_SUFFIX) \
-  $(DIST)/bin/$(DLL_PREFIX)mozglue$(DLL_SUFFIX) \
+  js$(BIN_SUFFIX) \
+  $(DLL_PREFIX)mozglue$(DLL_SUFFIX) \
   $(NULL)
 ifndef MOZ_NATIVE_NSPR
 ifdef MSVC_C_RUNTIME_DLL
-JSSHELL_BINS += $(DIST)/bin/$(MSVC_C_RUNTIME_DLL)
+JSSHELL_BINS += $(MSVC_C_RUNTIME_DLL)
 endif
 ifdef MSVC_CXX_RUNTIME_DLL
-JSSHELL_BINS += $(DIST)/bin/$(MSVC_CXX_RUNTIME_DLL)
+JSSHELL_BINS += $(MSVC_CXX_RUNTIME_DLL)
 endif
 ifdef MSVC_APPCRT_DLL
-JSSHELL_BINS += $(DIST)/bin/$(MSVC_APPCRT_DLL)
+JSSHELL_BINS += $(MSVC_APPCRT_DLL)
 endif
 ifdef MSVC_DESKTOPCRT_DLL
-JSSHELL_BINS += $(DIST)/bin/$(MSVC_DESKTOPCRT_DLL)
+JSSHELL_BINS += $(MSVC_DESKTOPCRT_DLL)
 endif
 ifdef MOZ_FOLD_LIBS
-JSSHELL_BINS += $(DIST)/bin/$(DLL_PREFIX)nss3$(DLL_SUFFIX)
+JSSHELL_BINS += $(DLL_PREFIX)nss3$(DLL_SUFFIX)
 else
 JSSHELL_BINS += \
-  $(DIST)/bin/$(DLL_PREFIX)nspr4$(DLL_SUFFIX) \
-  $(DIST)/bin/$(DLL_PREFIX)plds4$(DLL_SUFFIX) \
-  $(DIST)/bin/$(DLL_PREFIX)plc4$(DLL_SUFFIX) \
+  $(DLL_PREFIX)nspr4$(DLL_SUFFIX) \
+  $(DLL_PREFIX)plds4$(DLL_SUFFIX) \
+  $(DLL_PREFIX)plc4$(DLL_SUFFIX) \
   $(NULL)
 endif # MOZ_FOLD_LIBS
 endif # MOZ_NATIVE_NSPR
 ifdef MOZ_SHARED_ICU
 ifeq ($(OS_TARGET), WINNT)
 JSSHELL_BINS += \
-  $(DIST)/bin/icudt$(MOZ_ICU_DBG_SUFFIX)$(MOZ_ICU_VERSION).dll \
-  $(DIST)/bin/icuin$(MOZ_ICU_DBG_SUFFIX)$(MOZ_ICU_VERSION).dll \
-  $(DIST)/bin/icuuc$(MOZ_ICU_DBG_SUFFIX)$(MOZ_ICU_VERSION).dll \
+  icudt$(MOZ_ICU_DBG_SUFFIX)$(MOZ_ICU_VERSION).dll \
+  icuin$(MOZ_ICU_DBG_SUFFIX)$(MOZ_ICU_VERSION).dll \
+  icuuc$(MOZ_ICU_DBG_SUFFIX)$(MOZ_ICU_VERSION).dll \
   $(NULL)
 else
 ifeq ($(OS_TARGET), Darwin)
 JSSHELL_BINS += \
-  $(DIST)/bin/libicudata.$(MOZ_ICU_VERSION).dylib \
-  $(DIST)/bin/libicui18n.$(MOZ_ICU_VERSION).dylib \
-  $(DIST)/bin/libicuuc.$(MOZ_ICU_VERSION).dylib \
+  libicudata.$(MOZ_ICU_VERSION).dylib \
+  libicui18n.$(MOZ_ICU_VERSION).dylib \
+  libicuuc.$(MOZ_ICU_VERSION).dylib \
   $(NULL)
 else
 JSSHELL_BINS += \
-  $(DIST)/bin/libicudata.so.$(MOZ_ICU_VERSION) \
-  $(DIST)/bin/libicui18n.so.$(MOZ_ICU_VERSION) \
-  $(DIST)/bin/libicuuc.so.$(MOZ_ICU_VERSION) \
+  libicudata.so.$(MOZ_ICU_VERSION) \
+  libicui18n.so.$(MOZ_ICU_VERSION) \
+  libicuuc.so.$(MOZ_ICU_VERSION) \
   $(NULL)
 endif # Darwin
 endif # WINNT
 endif # MOZ_STATIC_JS
-MAKE_JSSHELL  = $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/dozip.py $(PKG_JSSHELL) $(abspath $(JSSHELL_BINS))
+MAKE_JSSHELL  = $(call py_action,zip,-C $(DIST)/bin $(abspath $(PKG_JSSHELL)) $(JSSHELL_BINS))
 endif # LIBXUL_SDK
 
 _ABS_DIST = $(abspath $(DIST))
@@ -158,7 +158,7 @@
 INNER_MAKE_PACKAGE	= $(ZIP) -r9D $(PACKAGE) $(MOZ_PKG_DIR) \
   -x \*/.mkdir.done
 INNER_UNMAKE_PACKAGE	= $(UNZIP) $(UNPACKAGE)
-MAKE_SDK = $(ZIP) -r9D $(SDK) $(MOZ_APP_NAME)-sdk
+MAKE_SDK = $(call py_action,zip,$(SDK) $(MOZ_APP_NAME)-sdk)
 endif
 ifeq ($(MOZ_PKG_FORMAT),SFX7Z)
 PKG_SUFFIX	= .exe
@@ -303,6 +303,7 @@
   extensions \
   application.ini \
   package-name.txt \
+  ua-update.json \
   platform.ini \
   greprefs.js \
   browserconfig.properties \
@@ -647,10 +648,6 @@
 
 PKG_ARG = , '$(pkg)'
 
-ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
-ELF_HACK_FLAGS = --fill
-endif
-
 # MOZ_PKG_MANIFEST is the canonical way to define the package manifest (which
 # the packager will preprocess), but for a smooth transition, we derive it
 # from the now deprecated MOZ_PKG_MANIFEST_P when MOZ_PKG_MANIFEST is not
@@ -679,8 +676,6 @@
 OPTIMIZEJARS = 1
 endif
 
-export NO_PKG_FILES USE_ELF_HACK ELF_HACK_FLAGS
-
 # A js binary is needed to perform verification of JavaScript minification.
 # We can only use the built binary when not cross-compiling. Environments
 # (such as release automation) can provide their own js binary to enable
@@ -732,6 +727,7 @@
   $(call QUOTED_WILDCARD,$(MOZ_SOURCESTAMP_FILE)) \
   $(call QUOTED_WILDCARD,$(MOZ_BUILDINFO_FILE)) \
   $(call QUOTED_WILDCARD,$(MOZ_MOZINFO_FILE)) \
+  $(call QUOTED_WILDCARD,$(MOZ_TEST_PACKAGES_FILE)) \
   $(call QUOTED_WILDCARD,$(PKG_JSSHELL)) \
   $(if $(UPLOAD_EXTRA_FILES), $(foreach f, $(UPLOAD_EXTRA_FILES), $(wildcard $(DIST)/$(f))))
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/preferences/fontbuilder.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/preferences/fontbuilder.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/preferences/fontbuilder.js	2015-05-13 18:06:15.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/preferences/fontbuilder.js	2015-05-25 20:44:00.000000000 +0000
@@ -85,5 +85,37 @@
       }
     }
     aMenuList.appendChild(popup);    
+  },
+
+  readFontSelection(aElement)
+  {
+    // Determine the appropriate value to select, for the following cases:
+    // - there is no setting
+    // - the font selected by the user is no longer present (e.g. deleted from
+    //   fonts folder)
+    let preference = document.getElementById(aElement.getAttribute("preference"));
+    if (preference.value) {
+      let fontItems = aElement.getElementsByAttribute("value", preference.value);
+
+      // There is a setting that actually is in the list. Respect it.
+      if (fontItems.length)
+        return undefined;
+    }
+
+    let defaultValue = aElement.firstChild.firstChild.getAttribute("value");
+    let fontNameList = preference.name.replace(".name.", ".name-list.");
+    let prefFontNameList = document.getElementById(fontNameList);
+    if (!prefFontNameList || !prefFontNameList.value)
+      return defaultValue;
+
+    let fontNames = prefFontNameList.value.split(",");
+
+    for (let i = 0; i < fontNames.length; ++i) {
+      let fontName = this.enumerator.getStandardFamilyName(fontNames[i].trim());
+      let fontItems = aElement.getElementsByAttribute("value", fontName);
+      if (fontItems.length)
+        return fontItems[0].getAttribute("value");
+    }
+    return defaultValue;
   }
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/update/nsUpdateService.js firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/update/nsUpdateService.js
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/update/nsUpdateService.js	2015-05-13 18:06:19.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/update/nsUpdateService.js	2015-05-25 20:44:01.000000000 +0000
@@ -3498,7 +3498,7 @@
       let buildType = sysLibs.libcutils.property_get("ro.build.type");
       url = url.replace(/%PRODUCT_MODEL%/g,
                         sysLibs.libcutils.property_get("ro.product.model"));
-      if (buildType == "user") {
+      if (buildType == "user" || buildType == "userdebug") {
         url = url.replace(/%PRODUCT_DEVICE%/g, productDevice);
       } else {
         url = url.replace(/%PRODUCT_DEVICE%/g, productDevice + "-" + buildType);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/update/tests/chrome/chrome.ini firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/update/tests/chrome/chrome.ini
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/mozapps/update/tests/chrome/chrome.ini	2015-05-13 18:06:20.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/mozapps/update/tests/chrome/chrome.ini	2015-05-25 20:44:01.000000000 +0000
@@ -18,8 +18,8 @@
 [test_0015_check_incompat_basic_addons.xul]
 [test_0016_check_incompat_basic_license_addons.xul]
 [test_0017_check_staging_basic.xul]
-skip-if = os == 'linux'
-reason = Bug 918029 - timeout caused by copying too many files.
+skip-if = os != 'win'
+reason = Bug 918029 and bug 1164560 - timeout caused by copying too many files.
 [test_0021_check_billboard.xul]
 [test_0022_check_billboard_license.xul]
 [test_0023_check_incompat_billboard.xul]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/linux/global/icons/autocomplete-search.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/linux/global/icons/autocomplete-search.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/linux/global/icons/autocomplete-search.svg	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/linux/global/icons/autocomplete-search.svg	2015-05-25 20:44:02.000000000 +0000
@@ -2,32 +2,21 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg 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">
-<style>
-  use:not(:target) {
-    display: none;
-  }
-
-  use {
-    fill: GrayText;
-  }
-
-  use[id$="-inverted"] {
-    fill: highlighttext;
-  }
-</style>
-<defs style="display:none">
-  <path id="search" fill-rule="evenodd" clip-rule="evenodd" d="M9.356,1.178c-3.014,0-5.458,2.45-5.458,5.472c0,1.086,0.32,2.096,0.864,2.947
-    l-3.279,3.287c-0.396,0.397-0.396,1.041,0,1.438l0.202,0.202c0.396,0.397,1.039,0.397,1.435,0l3.275-3.283
-    c0.854,0.554,1.869,0.88,2.962,0.88c3.014,0,5.458-2.45,5.458-5.471C14.814,3.627,12.371,1.178,9.356,1.178z M9.356,10.001
-    c-1.847,0-3.344-1.501-3.344-3.352c0-1.851,1.497-3.352,3.344-3.352c1.846,0,3.344,1.501,3.344,3.352
-    C12.7,8.501,11.203,10.001,9.356,10.001z"/>
-</defs>
-<use id="search-icon"             xlink:href="#search"/>
-<use id="search-icon-inverted"    xlink:href="#search"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" >
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: GrayText;
+    }
+    use[id$="-inverted"] {
+      fill: highlighttext;
+    }
+  </style>
+  <defs>
+    <path id="search" fill-rule="evenodd" d="M9.356,1.178c-3.014,0-5.458,2.45-5.458,5.472c0,1.086,0.32,2.096,0.864,2.947 l-3.279,3.287c-0.396,0.397-0.396,1.041,0,1.438l0.202,0.202c0.396,0.397,1.039,0.397,1.435,0l3.275-3.283 c0.854,0.554,1.869,0.88,2.962,0.88c3.014,0,5.458-2.45,5.458-5.471C14.814,3.627,12.371,1.178,9.356,1.178z M9.356,10.001 c-1.847,0-3.344-1.501-3.344-3.352c0-1.851,1.497-3.352,3.344-3.352c1.846,0,3.344,1.501,3.344,3.352 C12.7,8.501,11.203,10.001,9.356,10.001z"/>
+  </defs>
+  <use id="search-icon" xlink:href="#search"/>
+  <use id="search-icon-inverted" xlink:href="#search"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/linux/global/icons/close.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/linux/global/icons/close.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/linux/global/icons/close.svg	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/linux/global/icons/close.svg	2015-05-25 20:44:02.000000000 +0000
@@ -1,104 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<svg version="1.1"
-     id="icon-close"
-     xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     x="0px"
-     y="0px"
-     width="96px"
-     height="16px"
-     viewBox="0 0 96 16">
-
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="96px" height="16px" viewBox="0 0 96 16">
   <defs>
-    <style type="text/css"><![CDATA[
+    <style>
       /* X Glyph Styles */
-
       .glyphShape-style-foreground {
         fill: ButtonText;
         fill-opacity: .8;
       }
-
       .glyphShape-style-background {
         fill: -moz-MenuBarText;
         fill-opacity: .8;
       }
-
       .glyphShape-style-hover {
         fill: #fff;
       }
-
       .glyphShape-style-hover-shadow {
         fill: #b32c12;
       }
-
       .glyphShape-style-hover-active {
         fill: #fff;
         fill-opacity: .8;
       }
-
       .glyphShape-style-hover-active-shadow {
         fill: #99260f;
       }
-
       .glyphShape-style-LWT-bright {
         fill: #fff;
         fill-opacity: .8;
       }
-
       .glyphShape-style-LWT-dark {
         fill: #000;
         fill-opacity: .8;
       }
-
-
       /* Close Button Background Styles */
-
       .icon-background-hover {
         fill: #d93616;
       }
-
       .icon-background-hover-active {
         fill: #b32c12;
       }
-      ]]></style>
-
+    </style>
     <polygon id="glyphShape-close" points="4,5.5 5.5,4 8,6.5 10.5,4 12,5.5 9.5,8 12,10.5 10.5,12 8,9.5 5.5,12 4,10.5 6.5,8"/>
     <polygon id="glyphShape-close-topHighlight" points="4,5.5 5.5,4 8,6.5 10.5,4 12,5.5 9.5,8 11.5,6 10.5,5 8,7.5 5.5,5 4.5,6"/>
-    <rect    id="glyphShape-background" x="2" y="2" rx="2" width="12" height="12"/>
-
+    <rect id="glyphShape-background" x="2" y="2" rx="2" width="12" height="12"/>
   </defs>
-
   <g id="icon-closeForeground-default">
     <use xlink:href="#glyphShape-close" class="glyphShape-style-foreground" />
     <use xlink:href="#glyphShape-close-topHighlight" class="glyphShape-style-foreground" />
   </g>
-
   <g id="icon-close-hover" transform="translate(16)">
     <use xlink:href="#glyphShape-background" class="icon-background-hover" />
     <use xlink:href="#glyphShape-close" class="glyphShape-style-hover-shadow" transform="translate(0,1)" />
     <use xlink:href="#glyphShape-close" class="glyphShape-style-hover" />
   </g>
-
   <g id="icon-close-hover-active" transform="translate(32)">
     <use xlink:href="#glyphShape-background" class="icon-background-hover-active" />
     <use xlink:href="#glyphShape-close" class="glyphShape-style-hover-active-shadow" transform="translate(0,1)" />
     <use xlink:href="#glyphShape-close" class="glyphShape-style-hover-active" />
   </g>
-
   <g id="icon-closeBackground-default" transform="translate(48)">
     <use xlink:href="#glyphShape-close" class="glyphShape-style-background" />
     <use xlink:href="#glyphShape-close-topHighlight" class="glyphShape-style-background" />
   </g>
-
   <g id="icon-close-LWT-bright" transform="translate(64)">
     <use xlink:href="#glyphShape-close" class="glyphShape-style-LWT-bright" />
     <use xlink:href="#glyphShape-close-topHighlight" class="glyphShape-style-LWT-bright" />
   </g>
-
   <g id="icon-close-LWT-dark" transform="translate(80)">
     <use xlink:href="#glyphShape-close" class="glyphShape-style-LWT-dark" />
     <use xlink:href="#glyphShape-close-topHighlight" class="glyphShape-style-LWT-dark" />
   </g>
-
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/linux/global/icons/panelarrow-horizontal.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/linux/global/icons/panelarrow-horizontal.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/linux/global/icons/panelarrow-horizontal.svg	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/linux/global/icons/panelarrow-horizontal.svg	2015-05-25 20:44:02.000000000 +0000
@@ -2,12 +2,7 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="10"
-     height="20">
-  <path d="M 10,-0.2 L -0.2,10 10,20.2 z"
-        fill="ThreeDShadow"/>
-  <path d="M 10,1.2 L 1.2,10 10,18.8 z"
-        fill="-moz-Dialog"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="20">
+  <path d="M 10,-0.2 L -0.2,10 10,20.2 z" fill="ThreeDShadow"/>
+  <path d="M 10,1.2 L 1.2,10 10,18.8 z" fill="-moz-Dialog"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/linux/global/icons/panelarrow-vertical.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/linux/global/icons/panelarrow-vertical.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/linux/global/icons/panelarrow-vertical.svg	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/linux/global/icons/panelarrow-vertical.svg	2015-05-25 20:44:02.000000000 +0000
@@ -2,12 +2,7 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="20"
-     height="10">
-  <path d="M -0.2,10 L 10,-0.2 20.2,10 z"
-        fill="ThreeDShadow"/>
-  <path d="M 1.2,10 L 10,1.2 18.8,10 z"
-        fill="-moz-Dialog"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="10">
+  <path d="M -0.2,10 L 10,-0.2 20.2,10 z" fill="ThreeDShadow"/>
+  <path d="M 1.2,10 L 10,1.2 18.8,10 z" fill="-moz-Dialog"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/linux/global/inContentUI.css firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/linux/global/inContentUI.css
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/linux/global/inContentUI.css	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/linux/global/inContentUI.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * The default namespace for this file is XUL. Be sure to prefix rules that
- * are applicable to both XUL and HTML with '*|'.
- */
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-/* Page background */
-*|*:root {
-  -moz-appearance: none;
-  padding: 18px;
-  background-color: Window;
-  background-image: /* Texture */
-                    url("chrome://global/skin/inContentUI/background-texture.png");
-  color: WindowText;
-}
-
-/* Use the new in-content colors for #contentAreaDownloadsView. After landing
-   of bug 989469 the colors can be moved to *|*:root */
-*|*#contentAreaDownloadsView {
-  background: #f1f1f1;
-  color: #424e5a;
-}
-
-html|html {
-  font: message-box;
-}
-
-/* Content */
-*|*.main-content {
-  /* Needed to allow the radius to clip the inner content, see bug 595656 */
-  overflow: hidden;
-  background-color: -moz-Field;
-  color: -moz-FieldText;
-  border: 1px solid ThreeDShadow;
-  border-radius: 5px;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/linux/global/jar.mn firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/linux/global/jar.mn
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/linux/global/jar.mn	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/linux/global/jar.mn	2015-05-25 20:44:02.000000000 +0000
@@ -15,7 +15,6 @@
 +  skin/classic/global/findBar.css
 +  skin/classic/global/global.css
 +  skin/classic/global/groupbox.css
-+  skin/classic/global/inContentUI.css
 +  skin/classic/global/listbox.css
 +  skin/classic/global/menu.css
 +  skin/classic/global/menulist.css
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/linux/global/notification.css firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/linux/global/notification.css
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/linux/global/notification.css	2015-05-13 18:06:25.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/linux/global/notification.css	2015-05-25 20:44:02.000000000 +0000
@@ -63,16 +63,16 @@
 
 /* Popup notification */
 
-.popup-notification-description {
-  max-width: 24em;
+.popup-notification-body {
+  max-width: 25em;
 }
 
-.popup-notification-originHost:not([value]),
+.popup-notification-origin:not([value]),
 .popup-notification-learnmore-link:not([href]) {
   display: none;
 }
 
-.popup-notification-originHost {
+.popup-notification-origin {
   margin-bottom: .3em !important;
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/osx/global/icons/autocomplete-search.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/osx/global/icons/autocomplete-search.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/osx/global/icons/autocomplete-search.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/osx/global/icons/autocomplete-search.svg	2015-05-25 20:44:02.000000000 +0000
@@ -2,32 +2,21 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg 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">
-<style>
-  use:not(:target) {
-    display: none;
-  }
-
-  use {
-    fill: GrayText;
-  }
-
-  use[id$="-inverted"] {
-    fill: highlighttext;
-  }
-</style>
-<defs style="display:none">
-  <path id="search" fill-rule="evenodd" clip-rule="evenodd" d="M14.517,12.884l-3.279-3.287c0.545-0.851,0.864-1.861,0.864-2.947
-    c0-3.022-2.444-5.472-5.458-5.472c-3.014,0-5.458,2.45-5.458,5.472c0,3.022,2.444,5.471,5.458,5.471
-    c1.093,0,2.108-0.325,2.962-0.88l3.275,3.283c0.396,0.397,1.039,0.397,1.435,0l0.202-0.202
-    C14.913,13.925,14.913,13.281,14.517,12.884z M6.644,10.001c-1.846,0-3.344-1.501-3.344-3.352c0-1.851,1.497-3.352,3.344-3.352
-    c1.847,0,3.344,1.501,3.344,3.352C9.987,8.501,8.49,10.001,6.644,10.001z"/>
-</defs>
-<use id="search-icon"             xlink:href="#search"/>
-<use id="search-icon-inverted"    xlink:href="#search"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: GrayText;
+    }
+    use[id$="-inverted"] {
+      fill: highlighttext;
+    }
+  </style>
+  <defs>
+    <path id="search" fill-rule="evenodd" d="M14.517,12.884l-3.279-3.287c0.545-0.851,0.864-1.861,0.864-2.947 c0-3.022-2.444-5.472-5.458-5.472c-3.014,0-5.458,2.45-5.458,5.472c0,3.022,2.444,5.471,5.458,5.471 c1.093,0,2.108-0.325,2.962-0.88l3.275,3.283c0.396,0.397,1.039,0.397,1.435,0l0.202-0.202 C14.913,13.925,14.913,13.281,14.517,12.884z M6.644,10.001c-1.846,0-3.344-1.501-3.344-3.352c0-1.851,1.497-3.352,3.344-3.352 c1.847,0,3.344,1.501,3.344,3.352C9.987,8.501,8.49,10.001,6.644,10.001z"/>
+  </defs>
+  <use id="search-icon" xlink:href="#search"/>
+  <use id="search-icon-inverted" xlink:href="#search"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/osx/global/in-content/common.css firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/osx/global/in-content/common.css
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/osx/global/in-content/common.css	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/osx/global/in-content/common.css	2015-05-25 20:44:03.000000000 +0000
@@ -78,7 +78,7 @@
 
 xul|*.text-link:-moz-focusring,
 xul|*.inline-link:-moz-focusring {
-  color: #ff9500;
+  color: var(--in-content-link-highlight);
   text-decoration: underline;
   box-shadow: none;
 }
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/osx/global/inContentUI/background-texture.png and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/osx/global/inContentUI/background-texture.png differ
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/osx/global/inContentUI.css firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/osx/global/inContentUI.css
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/osx/global/inContentUI.css	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/osx/global/inContentUI.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,144 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-%include shared.inc
-
-/*
- * The default namespace for this file is XUL. Be sure to prefix rules that
- * are applicable to both XUL and HTML with '*|'.
- */
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-/* Page background */
-*|*:root {
-  -moz-appearance: none;
-  padding: 18px;
-  background-image: /* Texture */
-                    url("chrome://global/skin/inContentUI/background-texture.png"),
-                    /* Gradient */
-                    linear-gradient(#ADB5C2, #BFC6D1);
-}
-
-/* Use the new in-content colors for #contentAreaDownloadsView. After landing
-   of bug 989469 the colors can be moved to *|*:root */
-*|*#contentAreaDownloadsView {
-  background: #f1f1f1;
-  color: #424e5a;
-}
-
-html|html {
-  font: message-box;
-}
-
-/* Content */
-*|*.main-content {
-  /* Needed to allow the radius to clip the inner content, see bug 595656 */
-  overflow: hidden;
-  background-image: linear-gradient(rgba(255, 255, 255, 0.4), rgba(255, 255, 255, 0.25) 50%, rgba(255, 255, 255, 0.05));
-  border: 1px solid rgba(50, 65, 92, 0.4);
-  border-radius: 5px;
-}
-
-/* Buttons */
-*|button,
-menulist,
-colorpicker[type="button"] {
-  -moz-appearance: none;
-  padding: 1px 4px;
-  min-width: 60px;
-  border-radius: 3px;
-  border: 1px solid rgba(60,73,97,0.5);
-  box-shadow: inset 0 1px rgba(255,255,255,0.25), 0 1px rgba(255,255,255,0.25);
-  background-color: transparent;
-  background-image: linear-gradient(rgba(255,255,255,0.45), rgba(255,255,255,0.2));
-  background-clip: padding-box;
-  color: #252F3B;
-  text-shadow: @loweredShadow@;
-}
-
-button:-moz-focusring > .button-box,
-menulist:-moz-focusring:not([open="true"]) > .menulist-label-box,
-colorpicker[type="button"]:-moz-focusring:not([open="true"]) > .colorpicker-button-colorbox {
-  outline: 1px dotted #252F3B;
-}
-
-html|button[disabled],
-button[disabled="true"],
-menulist[disabled="true"],
-colorpicker[type="button"][disabled="true"] {
-  opacity: 0.8;
-  color: #505050;
-}
-
-html|button:not([disabled]):active:hover,
-button:not([disabled="true"]):active:hover,
-menulist[open="true"]:not([disabled="true"]),
-colorpicker[type="button"][open="true"]:not([disabled="true"]) {
-  box-shadow: inset 0 1px 3px rgba(0,0,0,.2), 0 1px rgba(255,255,255,0.25);
-  background-image: linear-gradient(rgba(45,54,71,0.3), rgba(45,54,71,0.1));
-  border-color: rgba(60,73,97,0.7);
-}
-
-menulist {
-  -moz-padding-end: 0;
-  margin-left: 5px;
-  margin-right: 5px;
-}
-
-/* Tweak margins so the focus ring is in the right place. */
-menulist > .menulist-label-box {
-  -moz-margin-end: 3px;
-  margin-top: 1px;
-}
-
-menulist > .menulist-label-box > .menulist-label {
-  margin-top: 0px !important;
-  margin-bottom: 0px !important;
-}
-
-menulist > .menulist-dropmarker {
-  -moz-appearance: none;
-  display: -moz-box;
-  background: transparent;
-  border: none;
-  -moz-border-start: 1px solid rgba(60,73,97,0.5);
-  margin-top: -1px;
-  margin-bottom: -1px;
-}
-
-colorpicker[type="button"] {
-  margin: 1px 5px 2px 5px;
-  padding: 3px;
-  height: 25px;
-}
-
-spinbuttons {
-  -moz-appearance: none;
-}
-
-spinbuttons > .spinbuttons-box > .spinbuttons-button {
-  min-width: 12px;
-}
-
-.spinbuttons-button > .button-box > .button-text {
-  display: none;
-}
-
-.spinbuttons-button[disabled="true"] > .button-box > .button-icon {
-  opacity: 0.5;
-}
-
-spinbuttons > .spinbuttons-box > .spinbuttons-up {
-  list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
-  border-bottom-width: 0;
-  border-bottom-left-radius: 0;
-  border-bottom-right-radius: 0;
-}
-
-spinbuttons > .spinbuttons-box > .spinbuttons-down {
-  list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/osx/global/jar.mn firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/osx/global/jar.mn
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/osx/global/jar.mn	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/osx/global/jar.mn	2015-05-25 20:44:03.000000000 +0000
@@ -31,7 +31,6 @@
 * skin/classic/global/findBar.css
 * skin/classic/global/global.css
   skin/classic/global/groupbox.css
-* skin/classic/global/inContentUI.css
   skin/classic/global/linkTree.css
   skin/classic/global/listbox.css
   skin/classic/global/menu.css
@@ -145,7 +144,6 @@
   skin/classic/global/icons/webapps-16.png                           (icons/webapps-16.png)
   skin/classic/global/icons/webapps-16@2x.png                        (icons/webapps-16@2x.png)
   skin/classic/global/icons/webapps-64.png                           (icons/webapps-64.png)
-  skin/classic/global/inContentUI/background-texture.png             (inContentUI/background-texture.png)
   skin/classic/global/notification/close.png                         (notification/close.png)
   skin/classic/global/notification/critical-bar-background.png       (notification/critical-bar-background.png)
   skin/classic/global/notification/error-icon.png                    (notification/error-icon.png)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/osx/global/media/videoClickToPlayButton.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/osx/global/media/videoClickToPlayButton.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/osx/global/media/videoClickToPlayButton.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/osx/global/media/videoClickToPlayButton.svg	2015-05-25 20:44:03.000000000 +0000
@@ -1,79 +1,30 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   id="videoPlayButtonOverlay"
-   preserveAspectRatio="xMinYMin meet"
-   viewBox="0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMinYMin meet" viewBox="0 0 64 64">
   <defs>
     <linearGradient id="whiteGradientStops">
-      <stop id="whiteGradientStop01" style="stop-color:#ffffff;stop-opacity:.95" offset="0" />
-      <stop id="whiteGradientStop02" style="stop-color:#ffffff;stop-opacity:.75" offset=".45" />
-      <stop id="whiteGradientStop03" style="stop-color:#ffffff;stop-opacity:.72" offset=".55" />
-      <stop id="whiteGradientStop04" style="stop-color:#ffffff;stop-opacity:.65" offset="1" />
+      <stop style="stop-color:#fff;stop-opacity:.95" offset="0"/>
+      <stop style="stop-color:#fff;stop-opacity:.75" offset=".45"/>
+      <stop style="stop-color:#fff;stop-opacity:.72" offset=".55"/>
+      <stop style="stop-color:#fff;stop-opacity:.65" offset="1"/>
     </linearGradient>
-    <linearGradient
-       x1="32"
-       y1="0"
-       x2="32"
-       y2="62"
-       id="whiteGradient"
-       xlink:href="#whiteGradientStops"
-       gradientUnits="userSpaceOnUse" />
+    <linearGradient x1="32" y1="0" x2="32" y2="62" id="whiteGradient" xlink:href="#whiteGradientStops" gradientUnits="userSpaceOnUse"/>
     <linearGradient id="arrowGradientStops">
-      <stop id="arrowGradientStop01" style="stop-color:#333333;stop-opacity:.5" offset="0" />
-      <stop id="arrowGradientStop02" style="stop-color:#666666;stop-opacity:.5" offset="1" />
+      <stop style="stop-color:#333;stop-opacity:.5" offset="0"/>
+      <stop style="stop-color:#666;stop-opacity:.5" offset="1"/>
     </linearGradient>
-    <linearGradient
-       x1="32"
-       y1="16"
-       x2="32"
-       y2="48"
-       id="arrowGradient"
-       xlink:href="#arrowGradientStops"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       x="-0.15"
-       y="-0.15"
-       width="1.25"
-       height="1.25"
-       color-interpolation-filters="sRGB"
-       id="dropShadow">
+    <linearGradient x1="32" y1="16" x2="32" y2="48" id="arrowGradient" xlink:href="#arrowGradientStops" gradientUnits="userSpaceOnUse"/>
+    <filter x="-0.15" y="-0.15" width="1.25" height="1.25" color-interpolation-filters="sRGB" id="dropShadow">
       <feDropShadow dx="0" dy="1" flood-opacity="0.5"/>
     </filter>
     <mask id="dropShadowMask">
-      <path
-         d="M47.285,30.991L23.75,17.24c-0.357-0.208-0.692-0.278-0.969-0.221 C22.32,17.115,22,17.555,22,18.252v27.499c0,1.112,0.797,1.568,1.75,1.011l23.535-13.748C48.238,32.458,48.238,31.547,47.285,30.991 z M0,0v64h64V0H0z M32,60C16.536,60,4,47.464,4,32S16.536,4,32,4s28,12.536,28,28S47.464,60,32,60z"
-         id="dropShadowMaskPath"
-         style="fill:#ffffff;" />
-    </mask>       
+      <path style="fill:#fff;" d="M47.285,30.991L23.75,17.24c-0.357-0.208-0.692-0.278-0.969-0.221 C22.32,17.115,22,17.555,22,18.252v27.499c0,1.112,0.797,1.568,1.75,1.011l23.535-13.748C48.238,32.458,48.238,31.547,47.285,30.991 z M0,0v64h64V0H0z M32,60C16.536,60,4,47.464,4,32S16.536,4,32,4s28,12.536,28,28S47.464,60,32,60z"/>
+    </mask>
   </defs>
-  <path 
-     d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M47.285,33.014 L23.75,46.762C22.797,47.319,22,46.863,22,45.751v-27.5c0-0.697,0.32-1.137,0.781-1.232c0.277-0.058,0.612,0.012,0.969,0.221 l23.535,13.751C48.238,31.546,48.238,32.458,47.285,33.014z"
-     mask="url(#dropShadowMask)"
-     id="playButtonShadow"
-     style="filter:url(#dropShadow);" />
-  <path
-     d="M22.781,17.019C22.32,17.114,22,17.555,22,18.251v27.5c0,1.112,0.797,1.568,1.75,1.011 l23.535-13.748c0.953-0.556,0.953-1.467,0-2.023L23.75,17.24C23.393,17.031,23.058,16.961,22.781,17.019z"
-     id="playButtonArrow"
-     style="fill:url(#arrowGradient);" />
-  <path 
-     d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M47.285,33.014 L23.75,46.762C22.797,47.319,22,46.863,22,45.751v-27.5c0-0.697,0.32-1.137,0.781-1.232c0.277-0.058,0.612,0.012,0.969,0.221 l23.535,13.751C48.238,31.546,48.238,32.458,47.285,33.014z"
-     id="playButton"
-     style="fill:url(#whiteGradient);" />
-  <path
-     d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M32,59C17.112,59,5,46.888,5,32S17.112,5,32,5s27,12.112,27,27S46.888,59,32,59z M47.789,30.127l-23.534-13.75 C23.826,16.126,23.396,16,22.976,16c-0.135,0-0.27,0.014-0.398,0.041C21.62,16.238,21,17.106,21,18.251v27.5 C21,47.075,21.812,48,22.977,48c0.423,0,0.854-0.126,1.279-0.375L47.79,33.877c0.769-0.449,1.21-1.132,1.21-1.875 S48.559,30.576,47.789,30.127z M47.285,33.014L23.75,46.762C23.474,46.924,23.211,47,22.977,47C22.402,47,22,46.541,22,45.751v-27.5 c0-0.697,0.32-1.137,0.781-1.232L22.976,17c0.233,0,0.498,0.079,0.775,0.24l23.535,13.751 C48.238,31.546,48.238,32.458,47.285,33.014z"
-     id="playButtonEdgeHighlights"
-     style="fill:white;fill-opacity:.3;" />
-  <path
-     d="M32,4C16.536,4,4,16.536,4,32c0,0.167,0.01,0.333,0.013,0.5 C4.28,17.268,16.704,5,32,5c15.296,0,27.72,12.268,27.987,27.5C59.99,32.333,60,32.167,60,32C60,16.536,47.464,4,32,4z M47.285,33.014L23.75,46.762C22.797,47.319,22,46.863,22,45.751v1c0,1.112,0.797,1.568,1.75,1.011l23.535-13.748 c0.697-0.406,0.879-1.003,0.556-1.512C47.723,32.688,47.541,32.864,47.285,33.014z"
-     id="playButtonTopEdgeHighlights"
-     style="fill:white;fill-opacity:.8;" />
+  <path mask="url(#dropShadowMask)" id="playButtonShadow" style="filter:url(#dropShadow);" d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M47.285,33.014 L23.75,46.762C22.797,47.319,22,46.863,22,45.751v-27.5c0-0.697,0.32-1.137,0.781-1.232c0.277-0.058,0.612,0.012,0.969,0.221 l23.535,13.751C48.238,31.546,48.238,32.458,47.285,33.014z"/>
+  <path id="playButtonArrow" style="fill:url(#arrowGradient);" d="M22.781,17.019C22.32,17.114,22,17.555,22,18.251v27.5c0,1.112,0.797,1.568,1.75,1.011 l23.535-13.748c0.953-0.556,0.953-1.467,0-2.023L23.75,17.24C23.393,17.031,23.058,16.961,22.781,17.019z"/>
+  <path id="playButton" style="fill:url(#whiteGradient);" d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M47.285,33.014 L23.75,46.762C22.797,47.319,22,46.863,22,45.751v-27.5c0-0.697,0.32-1.137,0.781-1.232c0.277-0.058,0.612,0.012,0.969,0.221 l23.535,13.751C48.238,31.546,48.238,32.458,47.285,33.014z"/>
+  <path id="playButtonEdgeHighlights" style="fill:white;fill-opacity:.3;" d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M32,59C17.112,59,5,46.888,5,32S17.112,5,32,5s27,12.112,27,27S46.888,59,32,59z M47.789,30.127l-23.534-13.75 C23.826,16.126,23.396,16,22.976,16c-0.135,0-0.27,0.014-0.398,0.041C21.62,16.238,21,17.106,21,18.251v27.5 C21,47.075,21.812,48,22.977,48c0.423,0,0.854-0.126,1.279-0.375L47.79,33.877c0.769-0.449,1.21-1.132,1.21-1.875 S48.559,30.576,47.789,30.127z M47.285,33.014L23.75,46.762C23.474,46.924,23.211,47,22.977,47C22.402,47,22,46.541,22,45.751v-27.5 c0-0.697,0.32-1.137,0.781-1.232L22.976,17c0.233,0,0.498,0.079,0.775,0.24l23.535,13.751 C48.238,31.546,48.238,32.458,47.285,33.014z"/>
+  <path id="playButtonTopEdgeHighlights" style="fill:white;fill-opacity:.8;" d="M32,4C16.536,4,4,16.536,4,32c0,0.167,0.01,0.333,0.013,0.5 C4.28,17.268,16.704,5,32,5c15.296,0,27.72,12.268,27.987,27.5C59.99,32.333,60,32.167,60,32C60,16.536,47.464,4,32,4z M47.285,33.014L23.75,46.762C22.797,47.319,22,46.863,22,45.751v1c0,1.112,0.797,1.568,1.75,1.011l23.535-13.748 c0.697-0.406,0.879-1.003,0.556-1.512C47.723,32.688,47.541,32.864,47.285,33.014z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/osx/global/notification.css firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/osx/global/notification.css
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/osx/global/notification.css	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/osx/global/notification.css	2015-05-25 20:44:03.000000000 +0000
@@ -101,16 +101,16 @@
 
 /* Popup notification */
 
-.popup-notification-description {
-  max-width: 24em;
+.popup-notification-body {
+  max-width: 25em;
 }
 
-.popup-notification-originHost:not([value]),
+.popup-notification-origin:not([value]),
 .popup-notification-learnmore-link:not([href]) {
   display: none;
 }
 
-.popup-notification-originHost {
+.popup-notification-origin {
   margin-bottom: .3em !important;
   -moz-margin-start: 0 !important; /* override default label margin to match description margin */
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/aboutSupport.css firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/aboutSupport.css
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/aboutSupport.css	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/aboutSupport.css	2015-05-25 20:44:03.000000000 +0000
@@ -3,15 +3,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 html {
-  background-color: -moz-Field;
-  color: -moz-FieldText;
-  font: message-box;
+  --aboutSupport-table-background: #ebebeb;
+  background-color: var(--in-content-page-background);
 }
 
 body {
-  width: 90%;
-  margin-left: 5%;
-  margin-right: 5%;
+  margin: 40px 48px;
 }
 
 .page-subtitle {
@@ -26,19 +23,24 @@
   font-weight: bold;
 }
 
+button {
+  -moz-margin-start: 0;
+  -moz-margin-end: 8px;
+}
+
 table {
-  background-color: -moz-Dialog;
-  color: -moz-DialogText;
+  background-color: var(--aboutSupport-table-background);
+  color: var(--in-content-text-color);
   font: message-box;
   text-align: start;
   width: 100%;
-  border: 1px solid ThreeDShadow;
+  border: 1px solid var(--in-content-table-border-color);
   border-spacing: 0px;
 }
 
 th, td {
-  border: 1px dotted ThreeDShadow;
-  padding: 3px;
+  border: 1px solid var(--in-content-table-border-color);
+  padding: 4px;
 }
 
 thead th {
@@ -47,8 +49,8 @@
 
 th {
   text-align: start;
-  background-color: Highlight;
-  color: HighlightText;
+  background-color: var(--in-content-table-header-background);
+  color: var(--in-content-selected-text);
 }
 
 th.column {
@@ -58,7 +60,7 @@
 
 td {
   text-align: start;
-  border-top: 1px dotted ThreeDShadow;
+  border-color: var(--in-content-table-border-dark-color);
 }
 
 .prefs-table {
@@ -79,9 +81,9 @@
 }
 
 #action-box {
-  background-color: -moz-Dialog;
-  border: 1px solid ThreeDShadow;
-  color: -moz-DialogText;
+  background-color: var(--aboutSupport-table-background);
+  border: 1px solid var(--in-content-table-border-color);
+  color: var(--in-content-text-color);
   float: right;
   margin-top: 2em;
   margin-bottom: 20px;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/extensions/utilities.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/extensions/utilities.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/extensions/utilities.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/extensions/utilities.svg	2015-05-25 20:44:03.000000000 +0000
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     x="0"
-     y="0"
-     width="16"
-     height="16"
-     viewBox="0 0 16 16">
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
   <style>
     use:not(:target) {
       display: none;
@@ -17,7 +14,7 @@
       fill: GrayText;
     }
   </style>
-  <defs style="display: none;">
+  <defs>
     <path id="utilities-shape" d="m11.5,13.9l-.6-1.5c.3-.2 .5-.4 .8-.6 .2-.2 .4-.5 .6-.7l1.5,.6c.3,.1 .6,0 .7-.3l.4-1c.1-.3 0-.6-.3-.7l-1.5-.6c.1-.6 .1-1.3 0-2l1.5-.6c.3-.1 .4-.4 .3-.7l-.4-1c-.1-.3-.4-.4-.7-.3l-1.5,.6c-.2-.3-.4-.5-.6-.8-.2-.1-.5-.3-.7-.5l.6-1.5c.1-.3 0-.6-.3-.7l-.9-.4c-.3-.1-.6,0-.7,.3l-.6,1.5c-.6-.1-1.3-.1-2,0l-.6-1.5c-.1-.3-.4-.4-.7-.3l-1,.4c-.2,.1-.3,.4-.2,.6l.6,1.5c-.3,.3-.5,.5-.8,.7-.2,.3-.4,.5-.6,.8l-1.5-.7c-.3-.1-.6,0-.7,.3l-.4,.9c-.1,.3 0,.6 .3,.7l1.5,.7c-.1,.6-.1,1.3 0,1.9l-1.5,.6c-.3,.1-.4,.4-.3,.7l.4,1c.1,.3 .4,.4 .7,.3l1.5-.6c.2,.3 .4,.5 .6,.8 .2,.2 .5,.4 .7,.6l-.6,1.5c-.1,.3 0,.6 .3,.7l1,.4c.3,.1 .6,0 .7-.3l.6-1.5c.6,.1 1.3,.1 2,0l.6,1.5c.1,.3 .4,.4 .7,.3l1-.4c.1-.1 .3-.4 .1-.7zm-5.1-4.2c-.9-.9-.9-2.4 0-3.3 .9-.9 2.4-.9 3.3,0 .9,.9 .9,2.4 0,3.3-.9,.9-2.4,.9-3.3,0z"/>
   </defs>
   <use id="utilities" xlink:href="#utilities-shape"/>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/in-content/check-partial.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/in-content/check-partial.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/in-content/check-partial.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/in-content/check-partial.svg	2015-05-25 20:44:03.000000000 +0000
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     x="0"
-     y="0"
-     width="21"
-     height="21"
-     viewBox="0 0 21 21">
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="21" height="21" viewBox="0 0 21 21">
   <style>
     use:not(:target) {
       display: none;
@@ -22,10 +19,10 @@
       fill: -moz-dialogText;
     }
   </style>
-  <defs style="display: none;">
+  <defs>
     <rect id="check-shape" x="3" y="9" width="15" height="3"/>
   </defs>
   <use id="check-partial" xlink:href="#check-shape"/>
   <use id="check-partial-inverted" xlink:href="#check-shape"/>
   <use id="check-partial-native" xlink:href="#check-shape"/>
-</svg>
\ No newline at end of file
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/in-content/check.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/in-content/check.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/in-content/check.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/in-content/check.svg	2015-05-25 20:44:03.000000000 +0000
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     x="0"
-     y="0"
-     width="21"
-     height="21"
-     viewBox="0 0 21 21">
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="21" height="21" viewBox="0 0 21 21">
   <style>
     use:not(:target) {
       display: none;
@@ -22,10 +19,10 @@
       fill: -moz-dialogText;
     }
   </style>
-  <defs style="display: none;">
+  <defs>
     <path id="check-shape" d="M 9.39,16.5 16.28,6 14.77,4.5 9.37,12.7 6.28,9.2 4.7,10.7 z"/>
   </defs>
   <use id="check" xlink:href="#check-shape"/>
   <use id="check-inverted" xlink:href="#check-shape"/>
   <use id="check-native" xlink:href="#check-shape"/>
-</svg>
\ No newline at end of file
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/in-content/common.inc.css firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/in-content/common.inc.css
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/in-content/common.inc.css	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/in-content/common.inc.css	2015-05-25 20:44:03.000000000 +0000
@@ -6,13 +6,49 @@
 @namespace html "http://www.w3.org/1999/xhtml";
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
+*|*:root {
+  --in-content-page-color: #424e5a;
+  --in-content-page-background: #fbfbfb;
+  --in-content-text-color: #333;
+  --in-content-selected-text: #fff;
+  --in-content-header-border-color: #c8c8c8;
+  --in-content-box-background: #fff;
+  --in-content-box-background-hover: #ebebeb;
+  --in-content-box-background-active: #dadada;
+  --in-content-box-border-color: #c1c1c1;
+  --in-content-item-hover: rgba(0,149,221,0.25);
+  --in-content-item-selected: #0095dd;
+  --in-content-border-highlight: #ff9500;
+  --in-content-border-focus: #0095dd;
+  --in-content-category-text: #c1c1c1;
+  --in-content-category-border-focus: 1px dotted #fff;
+  --in-content-category-text-selected: #f2f2f2;
+  --in-content-category-background: #424f5a;
+  --in-content-category-background-hover: #5e6972;
+  --in-content-category-background-active: #343f48;
+  --in-content-tab-color: #424f5a;
+  --in-content-link-color: #0095dd;
+  --in-content-link-color-hover: #178ce5;
+  --in-content-link-color-active: #ff9500;
+  --in-content-link-color-visited: #551a8b;
+  --in-content-primary-button-background: #0095dd;
+  --in-content-primary-button-background-hover: #008acb;
+  --in-content-primary-button-background-active: #006b9d;
+  --in-content-table-border-color: #c1c1c1;
+  --in-content-table-border-dark-color: #d1d1d1;
+  --in-content-table-header-background: #0095dd;
+  --in-content-help-button-background: #ffcb00;
+  --in-content-help-button-background-hover: #f4c200;
+  --in-content-help-button-background-active: #eaba00;
+}
+
 html|body,
 xul|page,
 xul|window {
   font: message-box;
   -moz-appearance: none;
-  background-color: #fbfbfb;
-  color: #424e5a;
+  background-color: var(--in-content-page-background);
+  color: var(--in-content-page-color);
 }
 
 html|body {
@@ -25,14 +61,14 @@
   font-size: 2.5em;
   font-weight: lighter;
   line-height: 1.2;
-  color: #333;
+  color: var(--in-content-text-color);
   margin: 0;
   margin-bottom: .5em;
 }
 
 html|hr {
   border-style: solid none none none;
-  border-color: #c1c1c1;
+  border-color: var(--in-content-table-border-color);
 }
 
 xul|caption {
@@ -92,9 +128,9 @@
 
 xul|tabs {
   margin-bottom: 15px;
-  border-top: 1px solid #c1c1c1;
-  border-bottom: 1px solid #c1c1c1;
-  background-color: #fbfbfb;
+  border-top: 1px solid var(--in-content-box-border-color);
+  border-bottom: 1px solid var(--in-content-box-border-color);
+  background-color: var(--in-content-page-background);
 }
 
 xul|*.tabs-left,
@@ -107,20 +143,20 @@
   margin-top: 0;
   padding: 4px 20px;
   min-height: 44px;
-  color: #424f5a;
-  background-color: #fbfbfb;
+  color: var(--in-content-tab-color);
+  background-color: var(--in-content-page-background);
   border-width: 0;
   transition: background-color 50ms ease 0s;
 }
 
 xul|tab:hover {
-  background-color: #ebebeb;
+  background-color: var(--in-content-box-background-hover);
 }
 
 xul|tab[selected] {
-  background-color: #ebebeb;
+  background-color: var(--in-content-box-background-hover);
   padding-bottom: 0; /* compensate the 4px border */
-  border-bottom: 4px solid #ff9500;
+  border-bottom: 4px solid var(--in-content-border-highlight);
 }
 
 xul|*.tab-text {
@@ -143,29 +179,29 @@
 xul|menulist {
   -moz-appearance: none;
   height: 30px;
-  color: #333;
+  color: var(--in-content-text-color);
   line-height: 20px;
-  border: 1px solid #c1c1c1;
+  border: 1px solid var(--in-content-box-border-color);
   -moz-border-top-colors: none !important;
   -moz-border-right-colors: none !important;
   -moz-border-bottom-colors: none !important;
   -moz-border-left-colors: none !important;
   border-radius: 2px;
-  background-color: #fbfbfb;
+  background-color: var(--in-content-page-background);
 }
 
 html|button:enabled:hover,
 xul|button:not([disabled="true"]):hover,
 xul|colorpicker[type="button"]:not([disabled="true"]):hover,
 xul|menulist:not([disabled="true"]):hover {
-  background-color: #ebebeb;
+  background-color: var(--in-content-box-background-hover);
 }
 
 html|button:enabled:hover:active,
 xul|button:not([disabled="true"]):hover:active,
 xul|colorpicker[type="button"]:not([disabled="true"]):hover:active,
 xul|menulist[open="true"]:not([disabled="true"]) {
-  background-color: #dadada;
+  background-color: var(--in-content-box-background-active);
 }
 
 html|button:disabled,
@@ -177,19 +213,19 @@
 }
 
 *|button.primary {
-  background-color: #0095dd;
+  background-color: var(--in-content-primary-button-background);
   border-color: transparent;
-  color: #fff;
+  color: var(--in-content-selected-text);
 }
 
 html|button.primary:enabled:hover,
 xul|button.primary:not([disabled="true"]):hover {
-  background-color: #008acb;
+  background-color: var(--in-content-primary-button-background-hover);
 }
 
 html|button.primary:enabled:hover:active,
 xul|button.primary:not([disabled="true"]):hover:active {
-  background-color: #006b9d;
+  background-color: var(--in-content-primary-button-background-active);
 }
 
 xul|colorpicker[type="button"] {
@@ -223,19 +259,19 @@
   min-width: 30px;
   border-radius: 2px;
   border-width: 0;
-  background-color: #ffcb00;
+  background-color: var(--in-content-help-button-background);
   background-image: none;
   box-shadow: none;
   list-style-image: url("chrome://global/skin/in-content/help-glyph.svg");
 }
 
 xul|*.help-button:not([disabled="true"]):hover {
-  background-color: #f4c200;
+  background-color: var(--in-content-help-button-background-hover);
   background-image: none;
 }
 
 xul|*.help-button:not([disabled="true"]):hover:active {
-  background-color: #eaba00;
+  background-color: var(--in-content-help-button-background-active);
   background-image: none;
 }
 
@@ -312,9 +348,9 @@
 xul|menulist > xul|menupopup,
 xul|button[type="menu"] > xul|menupopup {
   -moz-appearance: none;
-  border: 1px solid #c1c1c1;
+  border: 1px solid var(--in-content-box-border-color);
   border-radius: 2px;
-  background-color: #fff;
+  background-color: var(--in-content-box-background);
 }
 
 xul|menulist > xul|menupopup xul|menu,
@@ -323,7 +359,7 @@
 xul|button[type="menu"] > xul|menupopup xul|menuitem {
   -moz-appearance: none;
   font-size: 1em;
-  color: #333;
+  color: var(--in-content-text-color);
   padding-top: 0.2em;
   padding-bottom: 0.2em;
   -moz-padding-start: 10px;
@@ -334,16 +370,16 @@
 xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[_moz-menuactive="true"],
 xul|button[type="menu"] > xul|menupopup > xul|menu:not([disabled="true"])[_moz-menuactive="true"],
 xul|button[type="menu"] > xul|menupopup > xul|menuitem:not([disabled="true"])[_moz-menuactive="true"] {
-  color: #333;
-  background-color: rgba(0,149,221,0.25);
+  color: var(--in-content-text-color);
+  background-color: var(--in-content-item-hover);
 }
 
 xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[selected="true"],
 xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[selected="true"],
 xul|button[type="menu"] > xul|menupopup > xul|menu:not([disabled="true"])[selected="true"],
 xul|button[type="menu"] > xul|menupopup > xul|menuitem:not([disabled="true"])[selected="true"] {
-  color: #fff;
-  background-color: #0095dd;
+  color: var(--in-content-selected-text);
+  background-color: var(--in-content-item-selected);
 }
 
 xul|menulist > xul|menupopup > xul|menu[disabled="true"],
@@ -361,7 +397,7 @@
   -moz-appearance: none;
   margin: 0;
   padding: 0;
-  border-top: 1px solid #c1c1c1;
+  border-top: 1px solid var(--in-content-box-border-color);
   border-bottom: none;
 }
 
@@ -370,22 +406,22 @@
 *|textbox {
   -moz-appearance: none;
   height: 30px;
-  color: #333;
+  color: var(--in-content-text-color);
   line-height: 20px;
   padding-right: 10px;
   padding-left: 10px;
-  border: 1px solid #c1c1c1;
+  border: 1px solid var(--in-content-box-border-color);
   -moz-border-top-colors: none !important;
   -moz-border-right-colors: none !important;
   -moz-border-bottom-colors: none !important;
   -moz-border-left-colors: none !important;
   border-radius: 2px;
-  background-color: #fff;
+  background-color: var(--in-content-box-background);
 }
 
 html|textbox:focus,
 xul|textbox[focused] {
-  border-color: #0095dd;
+  border-color: var(--in-content-border-focus);
 }
 
 html|textbox:disabled,
@@ -398,25 +434,25 @@
 html|a,
 .text-link,
 .inline-link {
-  color: #0095dd;
+  color: var(--in-content-link-color);
   text-decoration: none;
 }
 
 html|a:hover,
 .text-link:hover,
 .inline-link:hover {
-  color: #178ce5;
+  color: var(--in-content-link-color-hover);
   text-decoration: underline;
 }
 
 html|a:visited {
-  color: #551a8b;
+  color: var(--in-content-link-color-visited);
 }
 
 html|a:hover:active,
 .text-link:hover:active,
 .inline-link:hover:active {
-  color: #ff9500;
+  color: var(--in-content-link-color-active);
   text-decoration: none;
 }
 
@@ -449,7 +485,7 @@
   width: 23px;
   height: 23px;
   border-radius: 2px;
-  border: 1px solid #c1c1c1;
+  border: 1px solid var(--in-content-box-border-color);
   -moz-margin-end: 10px;
   background-color: #f1f1f1;
   /* !important needed to override toolkit checked !important rule */
@@ -461,7 +497,7 @@
 
 xul|checkbox:not([disabled="true"]):hover > xul|*.checkbox-check,
 html|input[type="checkbox"]:not(:disabled) + html|label:hover:before {
-  border-color: #0095dd;
+  border-color: var(--in-content-border-focus);
 }
 
 xul|*.checkbox-check[checked] {
@@ -494,7 +530,7 @@
   -moz-appearance: none;
   width: 23px;
   height: 23px;
-  border: 1px solid #c1c1c1;
+  border: 1px solid var(--in-content-box-border-color);
   border-radius: 50%;
   -moz-margin-end: 10px;
   background-color: #f1f1f1;
@@ -503,7 +539,7 @@
 }
 
 xul|radio:not([disabled="true"]):hover > xul|*.radio-check {
-  border-color: #0095dd;
+  border-color: var(--in-content-border-focus);
 }
 
 xul|*.radio-check[selected] {
@@ -524,7 +560,7 @@
 
 xul|*#categories {
   -moz-appearance: none;
-  background-color: #424f5a;
+  background-color: var(--in-content-category-background);
   padding-top: 39px;
   margin: 0;
   border-width: 0;
@@ -532,7 +568,7 @@
 
 xul|*.category {
   -moz-appearance: none;
-  color: #c1c1c1;
+  color: var(--in-content-category-text);
   -moz-border-end-width: 0;
   -moz-padding-start: 15px;
   -moz-padding-end: 21px;
@@ -541,19 +577,19 @@
 }
 
 xul|*.category:hover {
-  background-color: #5e6972;
+  background-color: var(--in-content-category-background-hover);
 }
 
 xul|*.category[selected] {
-  background-color: #343f48;
-  color: #f2f2f2;
+  background-color: var(--in-content-category-background-active);
+  color: var(--in-content-category-text-selected);
   -moz-padding-start: 11px; /* compensate the 4px border */
-  -moz-border-start: solid 4px #ff9500;
+  -moz-border-start: solid 4px var(--in-content-border-highlight);
 }
 
 xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[current] {
-  border-top: 1px #ffffff dotted;
-  border-bottom: 1px #ffffff dotted;
+  border-top: var(--in-content-category-border-focus);
+  border-bottom: var(--in-content-category-border-focus);
 }
 
 *|*.category-name {
@@ -573,7 +609,7 @@
 /* header */
 
 *|*.header {
-  border-bottom: 1px solid #c8c8c8;
+  border-bottom: 1px solid var(--in-content-header-border-color);
   -moz-margin-end: 4px; /* add the 4px end-margin of other elements */
   margin-bottom: 15px;
   padding-bottom: 15px;
@@ -637,9 +673,9 @@
 xul|listbox {
   -moz-appearance: none;
   -moz-margin-start: 0;
-  background-color: #fff;
-  border: 1px solid #c1c1c1;
-  color: #333;
+  background-color: var(--in-content-box-background);
+  border: 1px solid var(--in-content-box-border-color);
+  color: var(--in-content-text-color);
 }
 
 xul|treechildren::-moz-tree-row,
@@ -653,13 +689,13 @@
 
 xul|treechildren::-moz-tree-row(hover),
 xul|listbox xul|listitem:hover {
-  background-color: rgba(0,149,221,0.25);
+  background-color: var(--in-content-item-hover);
 }
 
 xul|treechildren::-moz-tree-row(selected),
 xul|listbox xul|listitem[selected="true"] {
-  background-color: #0095dd;
-  color: #fff;
+  background-color: var(--in-content-item-selected);
+  color: var(--in-content-selected-text);
 }
 
 /* Trees */
@@ -667,19 +703,19 @@
 xul|tree {
   -moz-appearance: none;
   font-size: 1em;
-  border: 1px solid #c1c1c1;
+  border: 1px solid var(--in-content-box-border-color);
 }
 
 xul|tree:-moz-focusring,
 xul|richlistbox:-moz-focusring {
-  border: 1px dotted #0095dd;
+  border: 1px dotted var(--in-content-border-focus);
 }
 
 xul|listheader,
 xul|treecols {
   -moz-appearance: none;
   border: none;
-  border-bottom: 1px solid #c1c1c1;
+  border-bottom: 1px solid var(--in-content-table-border-color);
   padding: 0;
 }
 
@@ -687,22 +723,22 @@
 xul|treecolpicker {
   -moz-appearance: none;
   border: none;
-  background-color: #ebebeb;
+  background-color: var(--in-content-box-background-hover);
   color: #808080;
   padding: 5px 10px;
 }
 
 xul|treecol:not([hideheader="true"]):not([sortable="false"]):hover,
 xul|treecolpicker:hover {
-  background-color: #dadada;
-  color: #333;
+  background-color: var(--in-content-box-background-active);
+  color: var(--in-content-text-color);
 }
 
 xul|treecol:not([hideheader="true"]):not(:first-child),
 xul|treecolpicker {
   -moz-border-start-width: 1px;
   -moz-border-start-style: solid;
-  border-image: linear-gradient(transparent 0%, transparent 20%, #c1c1c1 20%, #c1c1c1 80%, transparent 80%, transparent 100%) 1 1;
+  border-image: linear-gradient(transparent 0%, transparent 20%, var(--in-content-table-border-color) 20%, var(--in-content-table-border-color) 80%, transparent 80%, transparent 100%) 1 1;
 }
 
 xul|treecol:not([hideheader="true"]) > xul|*.treecol-sortdirection[sortDirection] {
@@ -722,9 +758,9 @@
 
 /* Color needs to be set on tree cell in order to be applied */
 xul|treechildren::-moz-tree-cell-text {
-  color: #333;
+  color: var(--in-content-text-color);
 }
 
 xul|treechildren::-moz-tree-cell-text(selected) {
-  color: #fff;
+  color: var(--in-content-selected-text);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/in-content/dropdown.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/in-content/dropdown.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/in-content/dropdown.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/in-content/dropdown.svg	2015-05-25 20:44:03.000000000 +0000
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg 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">
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16">
   <style>
     use:not(:target) {
       display: none;
@@ -12,8 +14,8 @@
       fill: GrayText;
     }
   </style>
-  <defs style="display: none;">
-    <path id="dropdown-shape" fill-rule="evenodd" clip-rule="evenodd" d="M12,6l-4.016,4L4,6H12z"/>
+  <defs>
+    <path id="dropdown-shape" fill-rule="evenodd" d="M12,6l-4.016,4L4,6H12z"/>
   </defs>
   <use id="dropdown" xlink:href="#dropdown-shape"/>
   <use id="dropdown-disabled" xlink:href="#dropdown-shape"/>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/in-content/help-glyph.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/in-content/help-glyph.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/in-content/help-glyph.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/in-content/help-glyph.svg	2015-05-25 20:44:03.000000000 +0000
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.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">
-	<path d="M11.625,4.854c0,2.593-2.881,2.417-2.881,4.21v0.399H6.439V8.968c0-2.769,2.545-2.577,2.545-3.89
-		c0-0.576-0.416-0.912-1.121-0.912c-0.656,0-1.296,0.32-1.873,0.977L4.375,3.894C5.287,2.821,6.471,2.182,8.12,2.182
-		C10.457,2.182,11.625,3.43,11.625,4.854z M9.064,12.361c0,0.801-0.64,1.457-1.44,1.457c-0.801,0-1.441-0.656-1.441-1.457
-		c0-0.784,0.64-1.44,1.441-1.44C8.424,10.921,9.064,11.577,9.064,12.361z" fill="-moz-dialogText"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16">
+  <path fill="-moz-dialogText" d="M11.625,4.854c0,2.593-2.881,2.417-2.881,4.21v0.399H6.439V8.968c0-2.769,2.545-2.577,2.545-3.89 c0-0.576-0.416-0.912-1.121-0.912c-0.656,0-1.296,0.32-1.873,0.977L4.375,3.894C5.287,2.821,6.471,2.182,8.12,2.182 C10.457,2.182,11.625,3.43,11.625,4.854z M9.064,12.361c0,0.801-0.64,1.457-1.44,1.457c-0.801,0-1.441-0.656-1.441-1.457 c0-0.784,0.64-1.44,1.441-1.44C8.424,10.921,9.064,11.577,9.064,12.361z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/in-content/radio.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/in-content/radio.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/in-content/radio.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/in-content/radio.svg	2015-05-25 20:44:03.000000000 +0000
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 21 21" enable-background="new 0 0 21 21" xml:space="preserve">
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 21 21">
   <style>
     use:not(:target) {
       display: none;
@@ -12,7 +14,7 @@
       fill: -moz-dialogText;
     }
   </style>
-  <defs style="display: none;">
+  <defs>
     <circle id="radio-shape" cx="10.5" cy="10.5" r="6"/>
   </defs>
   <use id="radio" xlink:href="#radio-shape"/>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/incontent-icons/warning.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/incontent-icons/warning.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/incontent-icons/warning.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/incontent-icons/warning.svg	2015-05-25 20:44:03.000000000 +0000
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" viewBox="0 0 60 60" enable-background="new 0 0 60 60">
-  <linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="30" y1="10" x2="30" y2="50">
-    <stop offset="0" style="stop-color: #fedb00"/>
-    <stop offset="1" style="stop-color: #fcce00"/>
-  </linearGradient>
-  <path fill="url(#gradient)" d="M49.316,42.867L33.829,12.7c-0.879-1.715-2.274-2.7-3.828-2.7c-1.554,0-2.949,0.985-3.829,2.702
-    L10.685,42.864c-0.869,1.69-0.913,3.482-0.121,4.909C11.35,49.187,12.817,50,14.591,50h30.82c1.772,0,3.24-0.81,4.023-2.224
-    C50.227,46.349,50.185,44.56,49.316,42.867z M32.176,22.304l-0.48,14.304h-3.424L27.76,22.304H32.176z M30,44.896
-    c-1.44,0-2.592-1.184-2.592-2.592c0-1.44,1.152-2.592,2.592-2.592c1.472,0,2.592,1.152,2.592,2.592
-    C32.592,43.712,31.472,44.896,30,44.896z"/>
-</svg>
\ 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 60 60">
+  <defs>
+    <linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="30" y1="10" x2="30" y2="50">
+      <stop offset="0" style="stop-color: #fedb00"/>
+      <stop offset="1" style="stop-color: #fcce00"/>
+    </linearGradient>
+  </defs>
+  <path fill="url(#gradient)" d="M49.316,42.867L33.829,12.7c-0.879-1.715-2.274-2.7-3.828-2.7c-1.554,0-2.949,0.985-3.829,2.702 L10.685,42.864c-0.869,1.69-0.913,3.482-0.121,4.909C11.35,49.187,12.817,50,14.591,50h30.82c1.772,0,3.24-0.81,4.023-2.224 C50.227,46.349,50.185,44.56,49.316,42.867z M32.176,22.304l-0.48,14.304h-3.424L27.76,22.304H32.176z M30,44.896 c-1.44,0-2.592-1.184-2.592-2.592c0-1.44,1.152-2.592,2.592-2.592c1.472,0,2.592,1.152,2.592,2.592 C32.592,43.712,31.472,44.896,30,44.896z"/>
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/menu-check-active.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/menu-check-active.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/menu-check-active.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/menu-check-active.svg	2015-05-25 20:44:03.000000000 +0000
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 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">
-<polygon fill="#4A90E2" points="7.1,15.5 0.5,10.8 2.2,8.3 6.3,11.2 13,0.5 15.5,2.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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <polygon fill="#4a90e2" points="7.1,15.5 0.5,10.8 2.2,8.3 6.3,11.2 13,0.5 15.5,2.2 "/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/menu-check-black.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/menu-check-black.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/menu-check-black.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/menu-check-black.svg	2015-05-25 20:44:03.000000000 +0000
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 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 9 9" enable-background="new 0 0 9 9" xml:space="preserve">
-<polygon points="4,9 0,6.2 1,4.7 3.5,6.4 7.5,0 9,1 "/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 9 9">
+  <polygon points="4,9 0,6.2 1,4.7 3.5,6.4 7.5,0 9,1 "/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/menu-check-hover.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/menu-check-hover.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/menu-check-hover.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/menu-check-hover.svg	2015-05-25 20:44:03.000000000 +0000
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 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 9 9" enable-background="new 0 0 9 9" xml:space="preserve">
-<polygon fill="#CCCCCC" points="4,9 0,6.2 1,4.7 3.5,6.4 7.5,0 9,1 "/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 9 9">
+  <polygon fill="#ccc" points="4,9 0,6.2 1,4.7 3.5,6.4 7.5,0 9,1 "/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/reader/pocket.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/reader/pocket.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/reader/pocket.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/reader/pocket.svg	2015-05-25 20:44:03.000000000 +0000
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     viewBox="0 0 24 24">
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24">
   <style>
     use:not(:target) {
       display: none;
@@ -10,18 +11,11 @@
       fill: #808080;
     }
     use[id$="-added"] {
-      fill: #EE4056;
+      fill: #ee4056;
     }
   </style>
-  <defs style="display: none;">
-    <path id="pocket-mark-shape" d="M21.901,4.204C21.642,3.484,20.956,3,20.196,3h-0.01h-1.721H3.814C3.067,3,2.385,3.474,2.119,4.179
-      C2.04,4.388,2,4.606,2,4.828v6.082l0.069,1.21c0.29,2.751,1.707,5.155,3.899,6.832c0.039,0.03,0.079,0.06,0.119,0.089l0.025,0.018
-      c1.175,0.866,2.491,1.452,3.91,1.741C10.677,20.932,11.347,21,12.013,21c0.615,0,1.232-0.057,1.839-0.171
-      c0.073-0.014,0.145-0.028,0.219-0.044c0.02-0.004,0.042-0.012,0.064-0.023c1.359-0.299,2.621-0.87,3.753-1.704l0.025-0.018
-      c0.04-0.029,0.08-0.059,0.119-0.089c2.192-1.677,3.609-4.08,3.898-6.832L22,10.91V4.828C22,4.618,21.975,4.409,21.901,4.204z
-      M17.667,10.539l-4.704,4.547c-0.266,0.256-0.608,0.385-0.949,0.385c-0.342,0-0.684-0.129-0.949-0.385l-4.705-4.547
-      c-0.547-0.528-0.565-1.403-0.04-1.954c0.524-0.551,1.392-0.569,1.939-0.041l3.756,3.63l3.755-3.63
-      c0.547-0.528,1.415-0.51,1.939,0.04C18.231,9.136,18.213,10.011,17.667,10.539z"/>
+  <defs>
+    <path id="pocket-mark-shape" d="M21.901,4.204C21.642,3.484,20.956,3,20.196,3h-0.01h-1.721H3.814C3.067,3,2.385,3.474,2.119,4.179 C2.04,4.388,2,4.606,2,4.828v6.082l0.069,1.21c0.29,2.751,1.707,5.155,3.899,6.832c0.039,0.03,0.079,0.06,0.119,0.089l0.025,0.018 c1.175,0.866,2.491,1.452,3.91,1.741C10.677,20.932,11.347,21,12.013,21c0.615,0,1.232-0.057,1.839-0.171 c0.073-0.014,0.145-0.028,0.219-0.044c0.02-0.004,0.042-0.012,0.064-0.023c1.359-0.299,2.621-0.87,3.753-1.704l0.025-0.018 c0.04-0.029,0.08-0.059,0.119-0.089c2.192-1.677,3.609-4.08,3.898-6.832L22,10.91V4.828C22,4.618,21.975,4.409,21.901,4.204z M17.667,10.539l-4.704,4.547c-0.266,0.256-0.608,0.385-0.949,0.385c-0.342,0-0.684-0.129-0.949-0.385l-4.705-4.547 c-0.547-0.528-0.565-1.403-0.04-1.954c0.524-0.551,1.392-0.569,1.939-0.041l3.756,3.63l3.755-3.63 c0.547-0.528,1.415-0.51,1.939,0.04C18.231,9.136,18.213,10.011,17.667,10.539z"/>
   </defs>
   <use id="pocket-mark" xlink:href="#pocket-mark-shape"/>
   <use id="pocket-mark-added" xlink:href="#pocket-mark-shape"/>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/reader/RM-Add-24x24.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/reader/RM-Add-24x24.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/reader/RM-Add-24x24.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/reader/RM-Add-24x24.svg	2015-05-25 20:44:03.000000000 +0000
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#808080" d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10s10-4.477,10-10
-    C22,6.477,17.523,2,12,2z M17.714,12.714h-5v5h-1.429v-5h-5v-1.429h5v-5h1.429v5h5V12.714z"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <path fill-rule="evenodd" fill="#808080" d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10s10-4.477,10-10 C22,6.477,17.523,2,12,2z M17.714,12.714h-5v5h-1.429v-5h-5v-1.429h5v-5h1.429v5h5V12.714z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/reader/RM-Close-24x24.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/reader/RM-Close-24x24.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/reader/RM-Close-24x24.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/reader/RM-Close-24x24.svg	2015-05-25 20:44:03.000000000 +0000
@@ -2,30 +2,24 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg viewBox="0 0 24 24"
-  xmlns="http://www.w3.org/2000/svg"
-  xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <defs>
-    <style type="text/css">
+    <style>
       use:not(:target) {
         display: none;
       }
-
       #close {
         fill: #808080;
       }
       #close-hover {
-        fill: #FFFFFF;
+        fill: #fff;
       }
     </style>
-
     <g id="close-shape">
       <polygon points="20.477,6.551 20.477,17.449 11.992,17.449 11.992,20 23,20 23,4 11.992,4 11.992,6.551"/>
       <polygon points="1,11.981 9.698,19.95 9.698,15.13 18.184,15.13 18.184,8.87 9.698,8.87 9.698,4.011"/>
     </g>
   </defs>
-
-  <use id="close"       xlink:href="#close-shape"/>
+  <use id="close" xlink:href="#close-shape"/>
   <use id="close-hover" xlink:href="#close-shape"/>
-
-</svg>
\ No newline at end of file
+</svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/reader/RM-Delete-24x24.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/reader/RM-Delete-24x24.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/reader/RM-Delete-24x24.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/reader/RM-Delete-24x24.svg	2015-05-25 20:44:03.000000000 +0000
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#808080" d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10s10-4.477,10-10
-    C22,6.477,17.523,2,12,2z M11.286,6.286 M6.286,12.714v-1.429h11.429v1.429H6.286z"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <path fill-rule="evenodd" fill="#808080" d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10s10-4.477,10-10 C22,6.477,17.523,2,12,2z M11.286,6.286 M6.286,12.714v-1.429h11.429v1.429H6.286z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/reader/RM-Minus-24x24.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/reader/RM-Minus-24x24.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/reader/RM-Minus-24x24.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/reader/RM-Minus-24x24.svg	2015-05-25 20:44:03.000000000 +0000
@@ -1,39 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#808080" d="M0,13.5v-3h24v3H0z"/>
-<g enable-background="new    ">
-    <g>
-        <defs>
-            <rect id="SVGID_2_" x="-269.917" y="-1054" width="22" height="34"/>
-        </defs>
-        <clipPath id="SVGID_1_">
-            <use xlink:href="#SVGID_2_"  overflow="visible"/>
-        </clipPath>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_6_" x="-365.917" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_3_">
-                <use xlink:href="#SVGID_6_"  overflow="visible"/>
-            </clipPath>
-        </g>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_10_" x="-365.917" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_5_">
-                <use xlink:href="#SVGID_10_"  overflow="visible"/>
-            </clipPath>
-        </g>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_16_" x="-365.917" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_7_">
-                <use xlink:href="#SVGID_16_"  overflow="visible"/>
-            </clipPath>
-        </g>
-    </g>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <path fill-rule="evenodd" fill="#808080" d="M0,13.5v-3h24v3H0z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/reader/RM-Plus-24x24.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/reader/RM-Plus-24x24.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/reader/RM-Plus-24x24.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/reader/RM-Plus-24x24.svg	2015-05-25 20:44:03.000000000 +0000
@@ -1,39 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#808080" d="M24,13.5H13.5V24h-3V13.5H0v-3h10.5V0h3v10.5H24V13.5z"/>
-<g enable-background="new    ">
-    <g>
-        <defs>
-            <rect id="SVGID_2_" x="-233.667" y="-1054" width="22" height="34"/>
-        </defs>
-        <clipPath id="SVGID_1_">
-            <use xlink:href="#SVGID_2_"  overflow="visible"/>
-        </clipPath>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_6_" x="-329.667" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_3_">
-                <use xlink:href="#SVGID_6_"  overflow="visible"/>
-            </clipPath>
-        </g>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_10_" x="-329.667" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_5_">
-                <use xlink:href="#SVGID_10_"  overflow="visible"/>
-            </clipPath>
-        </g>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_16_" x="-329.667" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_7_">
-                <use xlink:href="#SVGID_16_"  overflow="visible"/>
-            </clipPath>
-        </g>
-    </g>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <path fill-rule="evenodd" fill="#808080" d="M24,13.5H13.5V24h-3V13.5H0v-3h10.5V0h3v10.5H24V13.5z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/reader/RM-Reading-List-24x24.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/reader/RM-Reading-List-24x24.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/reader/RM-Reading-List-24x24.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/reader/RM-Reading-List-24x24.svg	2015-05-25 20:44:03.000000000 +0000
@@ -1,46 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g>
-    <rect x="8" y="10" fill-rule="evenodd" clip-rule="evenodd" fill="#808080" width="14" height="4"/>
-    <rect x="8" y="16" fill-rule="evenodd" clip-rule="evenodd" fill="#808080" width="14" height="4"/>
-    <rect x="8" y="4" fill-rule="evenodd" clip-rule="evenodd" fill="#808080" width="14" height="4"/>
-    <circle fill-rule="evenodd" clip-rule="evenodd" fill="#808080" cx="4" cy="6" r="2"/>
-    <circle fill-rule="evenodd" clip-rule="evenodd" fill="#808080" cx="4" cy="12" r="2"/>
-    <circle fill-rule="evenodd" clip-rule="evenodd" fill="#808080" cx="4" cy="18" r="2"/>
-</g>
-<g enable-background="new    ">
-    <g>
-        <defs>
-            <rect id="SVGID_2_" x="-197" y="-1054" width="22" height="34"/>
-        </defs>
-        <clipPath id="SVGID_1_">
-            <use xlink:href="#SVGID_2_"  overflow="visible"/>
-        </clipPath>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_6_" x="-293" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_3_">
-                <use xlink:href="#SVGID_6_"  overflow="visible"/>
-            </clipPath>
-        </g>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_10_" x="-293" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_5_">
-                <use xlink:href="#SVGID_10_"  overflow="visible"/>
-            </clipPath>
-        </g>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_16_" x="-293" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_7_">
-                <use xlink:href="#SVGID_16_"  overflow="visible"/>
-            </clipPath>
-        </g>
-    </g>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <rect x="8" y="10" fill="#808080" width="14" height="4"/>
+  <rect x="8" y="16" fill="#808080" width="14" height="4"/>
+  <rect x="8" y="4" fill="#808080" width="14" height="4"/>
+  <circle fill="#808080" cx="4" cy="6" r="2"/>
+  <circle fill="#808080" cx="4" cy="12" r="2"/>
+  <circle fill="#808080" cx="4" cy="18" r="2"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/reader/RM-Type-Controls-24x24.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/reader/RM-Type-Controls-24x24.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/reader/RM-Type-Controls-24x24.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/reader/RM-Type-Controls-24x24.svg	2015-05-25 20:44:03.000000000 +0000
@@ -1,23 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g>
-    <path fill="#808080" d="M8.23,18.748v-1.016l1.182-0.146c0.065-0.013,0.12-0.055,0.166-0.127s0.052-0.143,0.02-0.215L8.513,14.07
-        H4.236l-1.104,3.096c-0.039,0.104-0.02,0.199,0.059,0.283s0.153,0.13,0.225,0.137l1.123,0.146v1.016H0.232v-1.016l1.123-0.166
-        L5.837,5.008h2.275l4.443,12.197c0.052,0.124,0.103,0.21,0.151,0.259s0.145,0.089,0.288,0.122l0.762,0.146v1.016H8.23z
-         M6.296,8.084l-1.68,4.805h3.398L6.296,8.084z"/>
-    <path fill="#808080" d="M20.05,18.748l-0.264-0.996c-0.345,0.234-0.706,0.443-1.083,0.625c-0.331,0.156-0.702,0.298-1.112,0.425
-        c-0.409,0.127-0.835,0.19-1.277,0.19c-0.364,0-0.704-0.06-1.02-0.181s-0.592-0.293-0.829-0.518s-0.424-0.497-0.561-0.815
-        S13.7,16.801,13.7,16.404c0-0.299,0.024-0.576,0.073-0.83s0.146-0.49,0.293-0.708s0.356-0.426,0.63-0.625s0.637-0.392,1.089-0.581
-        s1.008-0.377,1.665-0.566s1.445-0.384,2.363-0.586v-0.244c0-0.098,0.003-0.186,0.01-0.264c0-0.091,0.003-0.182,0.01-0.273
-        c0.007-0.189-0.013-0.392-0.059-0.61s-0.137-0.42-0.273-0.605s-0.329-0.338-0.576-0.459s-0.569-0.181-0.967-0.181
-        c-0.137,0-0.259,0.003-0.366,0.01s-0.197,0.016-0.269,0.029c-0.085,0.013-0.159,0.026-0.225,0.039v1.895h-2.061
-        c-0.169,0.013-0.319-0.003-0.449-0.049c-0.11-0.039-0.213-0.107-0.308-0.205s-0.142-0.25-0.142-0.459
-        c0-0.371,0.132-0.703,0.396-0.996c0.263-0.293,0.607-0.542,1.033-0.747s0.904-0.363,1.435-0.474
-        c0.529-0.111,1.058-0.166,1.585-0.166c0.572,0,1.096,0.042,1.57,0.127s0.883,0.249,1.224,0.493c0.342,0.244,0.604,0.587,0.79,1.03
-        s0.278,1.025,0.278,1.748v5.137c0,0.124,0.042,0.229,0.127,0.317s0.188,0.138,0.312,0.151l0.879,0.059v0.938H20.05z M19.793,13.592
-        c-0.645,0.13-1.177,0.264-1.597,0.4s-0.754,0.293-1.001,0.469s-0.42,0.376-0.518,0.601s-0.146,0.487-0.146,0.786
-        c0,0.208,0.034,0.402,0.103,0.581s0.166,0.335,0.293,0.469s0.278,0.239,0.454,0.317s0.368,0.117,0.576,0.117
-        c0.215,0,0.432-0.023,0.649-0.068s0.415-0.094,0.591-0.146c0.208-0.065,0.407-0.14,0.596-0.225V13.592z"/>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+    <path fill="#808080" d="M8.23,18.748v-1.016l1.182-0.146c0.065-0.013,0.12-0.055,0.166-0.127s0.052-0.143,0.02-0.215L8.513,14.07 H4.236l-1.104,3.096c-0.039,0.104-0.02,0.199,0.059,0.283s0.153,0.13,0.225,0.137l1.123,0.146v1.016H0.232v-1.016l1.123-0.166 L5.837,5.008h2.275l4.443,12.197c0.052,0.124,0.103,0.21,0.151,0.259s0.145,0.089,0.288,0.122l0.762,0.146v1.016H8.23z M6.296,8.084l-1.68,4.805h3.398L6.296,8.084z"/>
+    <path fill="#808080" d="M20.05,18.748l-0.264-0.996c-0.345,0.234-0.706,0.443-1.083,0.625c-0.331,0.156-0.702,0.298-1.112,0.425 c-0.409,0.127-0.835,0.19-1.277,0.19c-0.364,0-0.704-0.06-1.02-0.181s-0.592-0.293-0.829-0.518s-0.424-0.497-0.561-0.815 S13.7,16.801,13.7,16.404c0-0.299,0.024-0.576,0.073-0.83s0.146-0.49,0.293-0.708s0.356-0.426,0.63-0.625s0.637-0.392,1.089-0.581 s1.008-0.377,1.665-0.566s1.445-0.384,2.363-0.586v-0.244c0-0.098,0.003-0.186,0.01-0.264c0-0.091,0.003-0.182,0.01-0.273 c0.007-0.189-0.013-0.392-0.059-0.61s-0.137-0.42-0.273-0.605s-0.329-0.338-0.576-0.459s-0.569-0.181-0.967-0.181 c-0.137,0-0.259,0.003-0.366,0.01s-0.197,0.016-0.269,0.029c-0.085,0.013-0.159,0.026-0.225,0.039v1.895h-2.061 c-0.169,0.013-0.319-0.003-0.449-0.049c-0.11-0.039-0.213-0.107-0.308-0.205s-0.142-0.25-0.142-0.459 c0-0.371,0.132-0.703,0.396-0.996c0.263-0.293,0.607-0.542,1.033-0.747s0.904-0.363,1.435-0.474 c0.529-0.111,1.058-0.166,1.585-0.166c0.572,0,1.096,0.042,1.57,0.127s0.883,0.249,1.224,0.493c0.342,0.244,0.604,0.587,0.79,1.03 s0.278,1.025,0.278,1.748v5.137c0,0.124,0.042,0.229,0.127,0.317s0.188,0.138,0.312,0.151l0.879,0.059v0.938H20.05z M19.793,13.592 c-0.645,0.13-1.177,0.264-1.597,0.4s-0.754,0.293-1.001,0.469s-0.42,0.376-0.518,0.601s-0.146,0.487-0.146,0.786 c0,0.208,0.034,0.402,0.103,0.581s0.166,0.335,0.293,0.469s0.278,0.239,0.454,0.317s0.368,0.117,0.576,0.117 c0.215,0,0.432-0.023,0.649-0.068s0.415-0.094,0.591-0.146c0.208-0.065,0.407-0.14,0.596-0.225V13.592z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/reader/RM-Type-Controls-Arrow.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/reader/RM-Type-Controls-Arrow.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/shared/reader/RM-Type-Controls-Arrow.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/shared/reader/RM-Type-Controls-Arrow.svg	2015-05-25 20:44:03.000000000 +0000
@@ -1,42 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<polygon opacity="0.15" fill-rule="evenodd" clip-rule="evenodd" points="16.583,0.015 16.569,0 4.583,12 16.569,24 16.583,23.985
-    "/>
-<g enable-background="new    ">
-    <g>
-        <defs>
-            <rect id="SVGID_2_" x="-125" y="-1086.667" width="22" height="34"/>
-        </defs>
-        <clipPath id="SVGID_1_">
-            <use xlink:href="#SVGID_2_"  overflow="visible"/>
-        </clipPath>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_6_" x="-221" y="-1491.667" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_3_">
-                <use xlink:href="#SVGID_6_"  overflow="visible"/>
-            </clipPath>
-        </g>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_10_" x="-221" y="-1491.667" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_5_">
-                <use xlink:href="#SVGID_10_"  overflow="visible"/>
-            </clipPath>
-        </g>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_16_" x="-221" y="-1491.667" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_7_">
-                <use xlink:href="#SVGID_16_"  overflow="visible"/>
-            </clipPath>
-        </g>
-    </g>
-</g>
-<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FBFBFB" points="16.575,1.021 16.561,1.008 5.583,12 16.577,23.008
-    16.591,22.994 "/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <polygon opacity="0.15"  points="16.583,0.015 16.569,0 4.583,12 16.569,24 16.583,23.985"/>
+  <polygon fill="#fbfbfb" points="16.575,1.021 16.561,1.008 5.583,12 16.577,23.008 16.591,22.994 "/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/windows/global/arrow/panelarrow-horizontal.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/windows/global/arrow/panelarrow-horizontal.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/windows/global/arrow/panelarrow-horizontal.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/windows/global/arrow/panelarrow-horizontal.svg	2015-05-25 20:44:03.000000000 +0000
@@ -2,12 +2,7 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="10"
-     height="20">
-  <path d="M 10,0 L 0,10 10,20 z"
-        fill="hsla(210,4%,10%,.2)"/>
-  <path d="M 10,1 L 1,10 10,19 z"
-        fill="-moz-field"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="20">
+  <path d="M 10,0 L 0,10 10,20 z" fill="hsla(210,4%,10%,.2)"/>
+  <path d="M 10,1 L 1,10 10,19 z" fill="-moz-field"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/windows/global/arrow/panelarrow-horizontal-themed.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/windows/global/arrow/panelarrow-horizontal-themed.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/windows/global/arrow/panelarrow-horizontal-themed.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/windows/global/arrow/panelarrow-horizontal-themed.svg	2015-05-25 20:44:03.000000000 +0000
@@ -2,12 +2,7 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="10"
-     height="20">
-  <path d="M 10,0 L 0,10 10,20 z"
-        fill="ThreeDShadow"/>
-  <path d="M 10,1 L 1,10 10,19 z"
-        fill="-moz-field"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="20">
+  <path d="M 10,0 L 0,10 10,20 z" fill="ThreeDShadow"/>
+  <path d="M 10,1 L 1,10 10,19 z" fill="-moz-field"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/windows/global/arrow/panelarrow-vertical.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/windows/global/arrow/panelarrow-vertical.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/windows/global/arrow/panelarrow-vertical.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/windows/global/arrow/panelarrow-vertical.svg	2015-05-25 20:44:03.000000000 +0000
@@ -2,12 +2,7 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="20"
-     height="10">
-  <path d="M 0,10 L 10,0 20,10 z"
-        fill="hsla(210,4%,10%,.2)"/>
-  <path d="M 1,10 L 10,1 19,10 z"
-        fill="-moz-field"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="10">
+  <path d="M 0,10 L 10,0 20,10 z" fill="hsla(210,4%,10%,.2)"/>
+  <path d="M 1,10 L 10,1 19,10 z" fill="-moz-field"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/windows/global/arrow/panelarrow-vertical-themed.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/windows/global/arrow/panelarrow-vertical-themed.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/windows/global/arrow/panelarrow-vertical-themed.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/windows/global/arrow/panelarrow-vertical-themed.svg	2015-05-25 20:44:03.000000000 +0000
@@ -2,12 +2,7 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="20"
-     height="10">
-  <path d="M 0,10 L 10,0 20,10 z"
-        fill="ThreeDShadow"/>
-  <path d="M 1,10 L 10,1 19,10 z"
-        fill="-moz-field"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="10">
+  <path d="M 0,10 L 10,0 20,10 z" fill="ThreeDShadow"/>
+  <path d="M 1,10 L 10,1 19,10 z" fill="-moz-field"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/windows/global/icons/autocomplete-search.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/windows/global/icons/autocomplete-search.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/windows/global/icons/autocomplete-search.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/windows/global/icons/autocomplete-search.svg	2015-05-25 20:44:03.000000000 +0000
@@ -2,32 +2,21 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg 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">
-<style>
-  use:not(:target) {
-    display: none;
-  }
-
-  use {
-    fill: GrayText;
-  }
-
-  use[id$="-inverted"] {
-    fill: highlighttext;
-  }
-</style>
-<defs style="display:none">
-  <path id="search" fill-rule="evenodd" clip-rule="evenodd" d="M9.356,1.178c-3.014,0-5.458,2.45-5.458,5.472c0,1.086,0.32,2.096,0.864,2.947
-    l-3.279,3.287c-0.396,0.397-0.396,1.041,0,1.438l0.202,0.202c0.396,0.397,1.039,0.397,1.435,0l3.275-3.283
-    c0.854,0.554,1.869,0.88,2.962,0.88c3.014,0,5.458-2.45,5.458-5.471C14.814,3.627,12.371,1.178,9.356,1.178z M9.356,10.001
-    c-1.847,0-3.344-1.501-3.344-3.352c0-1.851,1.497-3.352,3.344-3.352c1.846,0,3.344,1.501,3.344,3.352
-    C12.7,8.501,11.203,10.001,9.356,10.001z"/>
-</defs>
-<use id="search-icon"             xlink:href="#search"/>
-<use id="search-icon-inverted"    xlink:href="#search"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: GrayText;
+    }
+    use[id$="-inverted"] {
+      fill: highlighttext;
+    }
+  </style>
+  <defs>
+    <path id="search" fill-rule="evenodd" d="M9.356,1.178c-3.014,0-5.458,2.45-5.458,5.472c0,1.086,0.32,2.096,0.864,2.947 l-3.279,3.287c-0.396,0.397-0.396,1.041,0,1.438l0.202,0.202c0.396,0.397,1.039,0.397,1.435,0l3.275-3.283 c0.854,0.554,1.869,0.88,2.962,0.88c3.014,0,5.458-2.45,5.458-5.471C14.814,3.627,12.371,1.178,9.356,1.178z M9.356,10.001 c-1.847,0-3.344-1.501-3.344-3.352c0-1.851,1.497-3.352,3.344-3.352c1.846,0,3.344,1.501,3.344,3.352 C12.7,8.501,11.203,10.001,9.356,10.001z"/>
+  </defs>
+  <use id="search-icon" xlink:href="#search"/>
+  <use id="search-icon-inverted" xlink:href="#search"/>
 </svg>
Binary files /tmp/eW8igynxG9/firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/windows/global/inContentUI/background-texture.png and /tmp/Cl2MQoCVg4/firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/windows/global/inContentUI/background-texture.png differ
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/windows/global/inContentUI.css firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/windows/global/inContentUI.css
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/windows/global/inContentUI.css	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/windows/global/inContentUI.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,160 +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/. */
-
-/*
- * The default namespace for this file is XUL. Be sure to prefix rules that
- * are applicable to both XUL and HTML with '*|'.
- */
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-/* Page background */
-*|*:root {
-  -moz-appearance: none;
-  padding: 18px;
-  background-repeat: repeat;
-  color: -moz-dialogText;
-  background-color: -moz-dialog;
-  background-image: /* Texture */
-                    url("chrome://global/skin/inContentUI/background-texture.png");
-}
-
-html|html {
-  font: message-box;
-}
-
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
-       (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
-  *|*:root {
-    color: #000;
-    background-color: #CCD9EA;
-  }
-}
-
-@media (-moz-windows-glass) {
-  *|*:root {
-    /* Blame shorlander for this monstrosity. */
-    background-image: /* Side gradients */
-                      linear-gradient(to right,
-                                      rgba(255,255,255,0.2), transparent 40%,
-                                      transparent 60%, rgba(255,255,255,0.2)),
-                      /* Aero-style light beams */
-                      -moz-linear-gradient(left 32deg,
-                                           /* First light beam */
-                                           transparent 19.5%, rgba(255,255,255,0.1) 20%,
-                                           rgba(255,255,255,0.1) 21.5%, rgba(255,255,255,0.2) 22%,
-                                           rgba(255,255,255,0.2) 25.5%, rgba(255,255,255,0.1) 26%,
-                                           rgba(255,255,255,0.1) 27.5%, transparent 28%,
-                                           /* Second light beam */
-                                           transparent 49.5%, rgba(255,255,255,0.1) 50%,
-                                           rgba(255,255,255,0.1) 52.5%, rgba(255,255,255,0.2) 53%,
-                                           rgba(255,255,255,0.2) 54.5%, rgba(255,255,255,0.1) 55%,
-                                           rgba(255,255,255,0.1) 57.5%, transparent 58%,
-                                           /* Third light beam */
-                                           transparent 87%, rgba(255,255,255,0.2) 90%),
-                      /* Texture */
-                      url("chrome://global/skin/inContentUI/background-texture.png");
-  }
-}
-
-/* Use the new in-content colors for #contentAreaDownloadsView. After landing
-   of bug 989469 the colors can be moved to *|*:root */
-*|*#contentAreaDownloadsView {
-  background: #f1f1f1;
-  color: #424e5a;
-}
-
-/* Content */
-*|*.main-content {
-  /* Needed to allow the radius to clip the inner content, see bug 595656 */
-  overflow: hidden;
-  background-color: rgba(255, 255, 255, 0.35);
-  background-image: linear-gradient(rgba(255, 255, 255, 0),
-                                    rgba(255, 255, 255, 0.75));
-  border: 1px solid #C3CEDF;
-}
-
-%ifdef XP_WIN
-@media (-moz-os-version: windows-xp),
-       (-moz-os-version: windows-vista),
-       (-moz-os-version: windows-win7) {
-%endif
-  *|*.main-content {
-    border-radius: 5px;
-  }
-%ifdef XP_WIN
-}
-%endif
-
-@media (-moz-windows-glass) {
-  /* Buttons */
-  *|button,
-  menulist,
-  colorpicker[type="button"] {
-    -moz-appearance: none;
-    color: black;
-    padding: 0 5px;
-    background: linear-gradient(rgba(251, 252, 253, 0.95), transparent 49%, 
-                                rgba(211, 212, 213, 0.45) 51%, rgba(225, 226, 229, 0.3));
-    background-clip: padding-box;
-    border-radius: 3px;
-    border: 1px solid rgba(31, 64, 100, 0.4);
-    border-top-color: rgba(31, 64, 100, 0.3);
-    box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.25) inset,
-                0 0 2px 1px rgba(255, 255, 255, 0.25) inset;
-  }
-
-  menulist {
-    -moz-padding-end: 0;
-  }
-
-  colorpicker[type="button"]:-moz-focusring:not([open="true"]) > .colorpicker-button-colorbox {
-    outline: 1px dotted ThreeDDarkShadow;
-  }
-
-  html|button[disabled],
-  button[disabled="true"],
-  menulist[disabled="true"],
-  colorpicker[type="button"][disabled="true"] {
-    -moz-border-top-colors: rgba(31, 64, 100, 0.3) !important;
-    -moz-border-right-colors: rgba(31, 64, 100, 0.4) !important;
-    -moz-border-bottom-colors: rgba(31, 64, 100, 0.4) !important;
-    -moz-border-left-colors: rgba(31, 64, 100, 0.4) !important;
-    opacity: 0.8;
-    color: #505050;
-  }
-
-  html|button:not([disabled]):active:hover,
-  button:not([disabled="true"]):active:hover,
-  menulist[open="true"]:not([disabled="true"]),
-  colorpicker[type="button"][open="true"]:not([disabled="true"]) {
-    background-color: rgba(61, 76, 92, 0.2);
-    border-color: rgba(39, 53, 68, 0.5);
-    box-shadow: 0 0 3px 1px rgba(39, 53, 68, 0.2) inset;
-  }
-
-  button > .button-box {
-    padding: 1px !important;
-  }
-
-  spinbuttons > .spinbuttons-box > .spinbuttons-button {
-    border-radius: 0;
-    padding: 0 4px;
-  }
-
-  spinbuttons > .spinbuttons-box > .spinbuttons-up {
-    list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
-    border-bottom-width: 0;
-  }
-
-  spinbuttons > .spinbuttons-box > .spinbuttons-down {
-    list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
-  }
-}
-
-colorpicker[type="button"] {
-  margin: 1px 5px 2px 5px;
-  padding: 3px;
-  height: 25px;
-}
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/windows/global/jar.mn firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/windows/global/jar.mn
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/windows/global/jar.mn	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/windows/global/jar.mn	2015-05-25 20:44:03.000000000 +0000
@@ -31,7 +31,6 @@
 *       skin/classic/global/global.css
         skin/classic/global/globalBindings.xml
         skin/classic/global/groupbox.css
-*       skin/classic/global/inContentUI.css
         skin/classic/global/linkTree.css
 *       skin/classic/global/listbox.css
 *       skin/classic/global/menu.css
@@ -138,7 +137,6 @@
         skin/classic/global/icons/windowControls.png             (icons/windowControls.png)
         skin/classic/global/icons/webapps-16.png                 (icons/webapps-16.png)
         skin/classic/global/icons/webapps-64.png                 (icons/webapps-64.png)
-        skin/classic/global/inContentUI/background-texture.png   (inContentUI/background-texture.png)
         skin/classic/global/media/TopLevelImageDocument.css      (media/TopLevelImageDocument.css)
         skin/classic/global/media/TopLevelVideoDocument.css      (media/TopLevelVideoDocument.css)
         skin/classic/global/media/imagedoc-lightnoise.png        (media/imagedoc-lightnoise.png)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/windows/global/media/videoClickToPlayButton.svg firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/windows/global/media/videoClickToPlayButton.svg
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/windows/global/media/videoClickToPlayButton.svg	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/windows/global/media/videoClickToPlayButton.svg	2015-05-25 20:44:03.000000000 +0000
@@ -1,79 +1,30 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   id="videoPlayButtonOverlay"
-   preserveAspectRatio="xMinYMin meet"
-   viewBox="0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMinYMin meet" viewBox="0 0 64 64">
   <defs>
     <linearGradient id="whiteGradientStops">
-      <stop id="whiteGradientStop01" style="stop-color:#ffffff;stop-opacity:.95" offset="0" />
-      <stop id="whiteGradientStop02" style="stop-color:#ffffff;stop-opacity:.75" offset=".45" />
-      <stop id="whiteGradientStop03" style="stop-color:#ffffff;stop-opacity:.72" offset=".55" />
-      <stop id="whiteGradientStop04" style="stop-color:#ffffff;stop-opacity:.65" offset="1" />
+      <stop style="stop-color:#fff;stop-opacity:.95" offset="0"/>
+      <stop style="stop-color:#fff;stop-opacity:.75" offset=".45"/>
+      <stop style="stop-color:#fff;stop-opacity:.72" offset=".55"/>
+      <stop style="stop-color:#fff;stop-opacity:.65" offset="1"/>
     </linearGradient>
-    <linearGradient
-       x1="32"
-       y1="0"
-       x2="32"
-       y2="62"
-       id="whiteGradient"
-       xlink:href="#whiteGradientStops"
-       gradientUnits="userSpaceOnUse" />
+    <linearGradient x1="32" y1="0" x2="32" y2="62" id="whiteGradient" xlink:href="#whiteGradientStops" gradientUnits="userSpaceOnUse"/>
     <linearGradient id="arrowGradientStops">
-      <stop id="arrowGradientStop01" style="stop-color:#333333;stop-opacity:.5" offset="0" />
-      <stop id="arrowGradientStop02" style="stop-color:#666666;stop-opacity:.5" offset="1" />
+      <stop style="stop-color:#333;stop-opacity:.5" offset="0"/>
+      <stop style="stop-color:#666;stop-opacity:.5" offset="1"/>
     </linearGradient>
-    <linearGradient
-       x1="32"
-       y1="16"
-       x2="32"
-       y2="48"
-       id="arrowGradient"
-       xlink:href="#arrowGradientStops"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       x="-0.15"
-       y="-0.15"
-       width="1.25"
-       height="1.25"
-       color-interpolation-filters="sRGB"
-       id="dropShadow">
+    <linearGradient x1="32" y1="16" x2="32" y2="48" id="arrowGradient" xlink:href="#arrowGradientStops" gradientUnits="userSpaceOnUse"/>
+    <filter x="-0.15" y="-0.15" width="1.25" height="1.25" color-interpolation-filters="sRGB" id="dropShadow">
       <feDropShadow dx="0" dy="1" flood-opacity="0.5"/>
     </filter>
     <mask id="dropShadowMask">
-      <path
-         d="M47.285,30.991L23.75,17.24c-0.357-0.208-0.692-0.278-0.969-0.221 C22.32,17.115,22,17.555,22,18.252v27.499c0,1.112,0.797,1.568,1.75,1.011l23.535-13.748C48.238,32.458,48.238,31.547,47.285,30.991 z M0,0v64h64V0H0z M32,60C16.536,60,4,47.464,4,32S16.536,4,32,4s28,12.536,28,28S47.464,60,32,60z"
-         id="dropShadowMaskPath"
-         style="fill:#ffffff;" />
-    </mask>       
+      <path style="fill:#fff;" d="M47.285,30.991L23.75,17.24c-0.357-0.208-0.692-0.278-0.969-0.221 C22.32,17.115,22,17.555,22,18.252v27.499c0,1.112,0.797,1.568,1.75,1.011l23.535-13.748C48.238,32.458,48.238,31.547,47.285,30.991 z M0,0v64h64V0H0z M32,60C16.536,60,4,47.464,4,32S16.536,4,32,4s28,12.536,28,28S47.464,60,32,60z"/>
+    </mask>
   </defs>
-  <path 
-     d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M47.285,33.014 L23.75,46.762C22.797,47.319,22,46.863,22,45.751v-27.5c0-0.697,0.32-1.137,0.781-1.232c0.277-0.058,0.612,0.012,0.969,0.221 l23.535,13.751C48.238,31.546,48.238,32.458,47.285,33.014z"
-     mask="url(#dropShadowMask)"
-     id="playButtonShadow"
-     style="filter:url(#dropShadow);" />
-  <path
-     d="M22.781,17.019C22.32,17.114,22,17.555,22,18.251v27.5c0,1.112,0.797,1.568,1.75,1.011 l23.535-13.748c0.953-0.556,0.953-1.467,0-2.023L23.75,17.24C23.393,17.031,23.058,16.961,22.781,17.019z"
-     id="playButtonArrow"
-     style="fill:url(#arrowGradient);" />
-  <path 
-     d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M47.285,33.014 L23.75,46.762C22.797,47.319,22,46.863,22,45.751v-27.5c0-0.697,0.32-1.137,0.781-1.232c0.277-0.058,0.612,0.012,0.969,0.221 l23.535,13.751C48.238,31.546,48.238,32.458,47.285,33.014z"
-     id="playButton"
-     style="fill:url(#whiteGradient);" />
-  <path
-     d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M32,59C17.112,59,5,46.888,5,32S17.112,5,32,5s27,12.112,27,27S46.888,59,32,59z M47.789,30.127l-23.534-13.75 C23.826,16.126,23.396,16,22.976,16c-0.135,0-0.27,0.014-0.398,0.041C21.62,16.238,21,17.106,21,18.251v27.5 C21,47.075,21.812,48,22.977,48c0.423,0,0.854-0.126,1.279-0.375L47.79,33.877c0.769-0.449,1.21-1.132,1.21-1.875 S48.559,30.576,47.789,30.127z M47.285,33.014L23.75,46.762C23.474,46.924,23.211,47,22.977,47C22.402,47,22,46.541,22,45.751v-27.5 c0-0.697,0.32-1.137,0.781-1.232L22.976,17c0.233,0,0.498,0.079,0.775,0.24l23.535,13.751 C48.238,31.546,48.238,32.458,47.285,33.014z"
-     id="playButtonEdgeHighlights"
-     style="fill:white;fill-opacity:.3;" />
-  <path
-     d="M32,4C16.536,4,4,16.536,4,32c0,0.167,0.01,0.333,0.013,0.5 C4.28,17.268,16.704,5,32,5c15.296,0,27.72,12.268,27.987,27.5C59.99,32.333,60,32.167,60,32C60,16.536,47.464,4,32,4z M47.285,33.014L23.75,46.762C22.797,47.319,22,46.863,22,45.751v1c0,1.112,0.797,1.568,1.75,1.011l23.535-13.748 c0.697-0.406,0.879-1.003,0.556-1.512C47.723,32.688,47.541,32.864,47.285,33.014z"
-     id="playButtonTopEdgeHighlights"
-     style="fill:white;fill-opacity:.8;" />
+  <path mask="url(#dropShadowMask)" id="playButtonShadow" style="filter:url(#dropShadow);" d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M47.285,33.014 L23.75,46.762C22.797,47.319,22,46.863,22,45.751v-27.5c0-0.697,0.32-1.137,0.781-1.232c0.277-0.058,0.612,0.012,0.969,0.221 l23.535,13.751C48.238,31.546,48.238,32.458,47.285,33.014z"/>
+  <path id="playButtonArrow" style="fill:url(#arrowGradient);" d="M22.781,17.019C22.32,17.114,22,17.555,22,18.251v27.5c0,1.112,0.797,1.568,1.75,1.011 l23.535-13.748c0.953-0.556,0.953-1.467,0-2.023L23.75,17.24C23.393,17.031,23.058,16.961,22.781,17.019z"/>
+  <path id="playButton" style="fill:url(#whiteGradient);" d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M47.285,33.014 L23.75,46.762C22.797,47.319,22,46.863,22,45.751v-27.5c0-0.697,0.32-1.137,0.781-1.232c0.277-0.058,0.612,0.012,0.969,0.221 l23.535,13.751C48.238,31.546,48.238,32.458,47.285,33.014z"/>
+  <path id="playButtonEdgeHighlights" style="fill:white;fill-opacity:.3;" d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M32,59C17.112,59,5,46.888,5,32S17.112,5,32,5s27,12.112,27,27S46.888,59,32,59z M47.789,30.127l-23.534-13.75 C23.826,16.126,23.396,16,22.976,16c-0.135,0-0.27,0.014-0.398,0.041C21.62,16.238,21,17.106,21,18.251v27.5 C21,47.075,21.812,48,22.977,48c0.423,0,0.854-0.126,1.279-0.375L47.79,33.877c0.769-0.449,1.21-1.132,1.21-1.875 S48.559,30.576,47.789,30.127z M47.285,33.014L23.75,46.762C23.474,46.924,23.211,47,22.977,47C22.402,47,22,46.541,22,45.751v-27.5 c0-0.697,0.32-1.137,0.781-1.232L22.976,17c0.233,0,0.498,0.079,0.775,0.24l23.535,13.751 C48.238,31.546,48.238,32.458,47.285,33.014z"/>
+  <path id="playButtonTopEdgeHighlights" style="fill:white;fill-opacity:.8;" d="M32,4C16.536,4,4,16.536,4,32c0,0.167,0.01,0.333,0.013,0.5 C4.28,17.268,16.704,5,32,5c15.296,0,27.72,12.268,27.987,27.5C59.99,32.333,60,32.167,60,32C60,16.536,47.464,4,32,4z M47.285,33.014L23.75,46.762C22.797,47.319,22,46.863,22,45.751v1c0,1.112,0.797,1.568,1.75,1.011l23.535-13.748 c0.697-0.406,0.879-1.003,0.556-1.512C47.723,32.688,47.541,32.864,47.285,33.014z"/>
 </svg>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/windows/global/notification.css firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/windows/global/notification.css
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/themes/windows/global/notification.css	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/themes/windows/global/notification.css	2015-05-25 20:44:03.000000000 +0000
@@ -58,16 +58,16 @@
 
 /* Popup notification */
 
-.popup-notification-description {
-  max-width: 24em;
+.popup-notification-body {
+  max-width: 25em;
 }
 
-.popup-notification-originHost:not([value]),
+.popup-notification-origin:not([value]),
 .popup-notification-learnmore-link:not([href]) {
   display: none;
 }
 
-.popup-notification-originHost {
+.popup-notification-origin {
   margin-bottom: .3em !important;
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/webapps/NativeApp.jsm firefox-trunk-41.0~a1~hg20150524r245419/toolkit/webapps/NativeApp.jsm
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/webapps/NativeApp.jsm	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/webapps/NativeApp.jsm	2015-05-25 20:44:04.000000000 +0000
@@ -456,14 +456,10 @@
                                   : Services.scriptSecurityManager
                                             .getNoAppCodebasePrincipal(aIconURI);
 
-    let channel = NetUtil.newChannel2(aIconURI,
-                                      null,
-                                      null,
-                                      null,      // aLoadingNode
-                                      principal,
-                                      null,      // aTriggeringPrincipal
-                                      Ci.nsILoadInfo.SEC_NORMAL,
-                                      Ci.nsIContentPolicy.TYPE_IMAGE);
+    let channel = NetUtil.newChannel({
+      uri: aIconURI,
+      loadingPrincipal: principal,
+      contentPolicyType: Ci.nsIContentPolicy.TYPE_IMAGE});
     let { BadCertHandler } = Cu.import("resource://gre/modules/CertUtils.jsm", {});
     // Pass true to avoid optional redirect-cert-checking behavior.
     channel.notificationCallbacks = new BadCertHandler(true);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/xre/nsAppRunner.cpp firefox-trunk-41.0~a1~hg20150524r245419/toolkit/xre/nsAppRunner.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/xre/nsAppRunner.cpp	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/xre/nsAppRunner.cpp	2015-05-25 20:44:04.000000000 +0000
@@ -103,6 +103,10 @@
 #ifndef PROCESS_DEP_ENABLE
 #define PROCESS_DEP_ENABLE 0x1
 #endif
+
+#if defined(MOZ_CONTENT_SANDBOX)
+#include "nsIUUIDGenerator.h"
+#endif
 #endif
 
 #ifdef ACCESSIBILITY
@@ -172,7 +176,7 @@
 #endif
 
 #ifdef DEBUG
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #endif
 
 #ifdef MOZ_JPROF
@@ -583,6 +587,157 @@
   return true;
 }
 
+#if defined(XP_WIN) && defined(MOZ_CONTENT_SANDBOX)
+static already_AddRefed<nsIFile>
+GetAndCleanLowIntegrityTemp(const nsAString& aTempDirSuffix)
+{
+  // Get the base low integrity Mozilla temp directory.
+  nsCOMPtr<nsIFile> lowIntegrityTemp;
+  nsresult rv = NS_GetSpecialDirectory(NS_WIN_LOW_INTEGRITY_TEMP_BASE,
+                                       getter_AddRefs(lowIntegrityTemp));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return nullptr;
+  }
+
+  // Append our profile specific temp name.
+  rv = lowIntegrityTemp->Append(NS_LITERAL_STRING("Temp-") + aTempDirSuffix);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return nullptr;
+  }
+
+  rv = lowIntegrityTemp->Remove(/* aRecursive */ true);
+  if (NS_FAILED(rv) && rv != NS_ERROR_FILE_NOT_FOUND) {
+    NS_WARNING("Failed to delete low integrity temp directory.");
+    return nullptr;
+  }
+
+  return lowIntegrityTemp.forget();
+}
+
+static void
+SetUpSandboxEnvironment()
+{
+  // A low integrity temp only currently makes sense for Vista and later, e10s
+  // and sandbox pref level 1.
+  if (!IsVistaOrLater() || !BrowserTabsRemoteAutostart() ||
+      Preferences::GetInt("security.sandbox.content.level") != 1) {
+    return;
+  }
+
+  // Get (and create if blank) temp directory suffix pref.
+  nsresult rv;
+  nsAdoptingString tempDirSuffix =
+    Preferences::GetString("security.sandbox.content.tempDirSuffix");
+  if (tempDirSuffix.IsEmpty()) {
+    nsCOMPtr<nsIUUIDGenerator> uuidgen =
+      do_GetService("@mozilla.org/uuid-generator;1", &rv);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return;
+    }
+
+    nsID uuid;
+    rv = uuidgen->GenerateUUIDInPlace(&uuid);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return;
+    }
+
+    char uuidChars[NSID_LENGTH];
+    uuid.ToProvidedString(uuidChars);
+    tempDirSuffix.AssignASCII(uuidChars);
+
+    // Save the pref to be picked up later.
+    rv = Preferences::SetCString("security.sandbox.content.tempDirSuffix",
+                                 uuidChars);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      // If we fail to save the pref we don't want to create the temp dir,
+      // because we won't be able to clean it up later.
+      return;
+    }
+
+    nsCOMPtr<nsIPrefService> prefsvc = Preferences::GetService();
+    if (!prefsvc || NS_FAILED(prefsvc->SavePrefFile(nullptr))) {
+      // Again, if we fail to save the pref file we might not be able to clean
+      // up the temp directory, so don't create one.
+      NS_WARNING("Failed to save pref file, cannot create temp dir.");
+      return;
+    }
+  }
+
+  // Get (and clean up if still there) the low integrity Mozilla temp directory.
+  nsCOMPtr<nsIFile> lowIntegrityTemp = GetAndCleanLowIntegrityTemp(tempDirSuffix);
+  if (!lowIntegrityTemp) {
+    NS_WARNING("Failed to get or clean low integrity Mozilla temp directory.");
+    return;
+  }
+
+  rv = lowIntegrityTemp->Create(nsIFile::DIRECTORY_TYPE, 0700);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return;
+  }
+}
+
+static void
+CleanUpSandboxEnvironment()
+{
+  // We can't have created a low integrity temp before Vista.
+  if (!IsVistaOrLater()) {
+    return;
+  }
+
+  // Get temp directory suffix pref.
+  nsAdoptingString tempDirSuffix =
+    Preferences::GetString("security.sandbox.content.tempDirSuffix");
+  if (tempDirSuffix.IsEmpty()) {
+    return;
+  }
+
+  // Get and remove the low integrity Mozilla temp directory.
+  // This function already warns if the deletion fails.
+  unused << GetAndCleanLowIntegrityTemp(tempDirSuffix);
+
+#if defined(NIGHTLY_BUILD)
+  // Temporary code to clean up the old low integrity temp directories.
+  // The removal of this is tracked by bug 1165818.
+  nsCOMPtr<nsIFile> lowIntegrityMozilla;
+  nsresult rv = NS_GetSpecialDirectory(NS_WIN_LOW_INTEGRITY_TEMP_BASE,
+                              getter_AddRefs(lowIntegrityMozilla));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return;
+  }
+
+  nsCOMPtr<nsISimpleEnumerator> iter;
+  rv = lowIntegrityMozilla->GetDirectoryEntries(getter_AddRefs(iter));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return;
+  }
+
+  bool more;
+  nsCOMPtr<nsISupports> elem;
+  while (NS_SUCCEEDED(iter->HasMoreElements(&more)) && more) {
+    rv = iter->GetNext(getter_AddRefs(elem));
+    if (NS_FAILED(rv)) {
+      break;
+    }
+
+    nsCOMPtr<nsIFile> file = do_QueryInterface(elem);
+    if (!file) {
+      continue;
+    }
+
+    nsAutoString leafName;
+    rv = file->GetLeafName(leafName);
+    if (NS_FAILED(rv)) {
+      continue;
+    }
+
+    if (leafName.Find(NS_LITERAL_STRING("MozTemp-{")) == 0) {
+      file->Remove(/* aRecursive */ true);
+    }
+  }
+#endif
+}
+#endif
+
 bool gSafeMode = false;
 
 /**
@@ -2730,18 +2885,24 @@
 #if CLEANUP_MEMORY
   // XXX wallpaper for bug 417163: don't close the Display if we're using the
   // Qt theme because we crash (in Qt code) when using jemalloc.
-  bool theme_is_qt = false;
+  bool skip_display_close = false;
   GtkSettings* settings =
     gtk_settings_get_for_screen(gdk_display_get_default_screen(display));
   gchar *theme_name;
   g_object_get(settings, "gtk-theme-name", &theme_name, nullptr);
   if (theme_name) {
-    theme_is_qt = strcmp(theme_name, "Qt") == 0;
-    if (theme_is_qt)
+    skip_display_close = strcmp(theme_name, "Qt") == 0;
+    if (skip_display_close)
       NS_WARNING("wallpaper bug 417163 for Qt theme");
     g_free(theme_name);
   }
 
+#if (MOZ_WIDGET_GTK == 3)
+  // A workaround for https://bugzilla.gnome.org/show_bug.cgi?id=703257
+  if (gtk_check_version(3,9,8) != NULL)
+    skip_display_close = true;
+#endif
+
   // Get a (new) Pango context that holds a reference to the fontmap that
   // GTK has been using.  gdk_pango_context_get() must be called while GTK
   // has a default display.
@@ -2754,7 +2915,7 @@
     // like Pango and cairo. But if cairo shutdown is buggy, we should
     // shut down cairo first otherwise it may crash because of dangling
     // references to Display objects (see bug 469831).
-    if (!theme_is_qt)
+    if (!skip_display_close)
       gdk_display_close(display);
   }
 
@@ -2791,7 +2952,7 @@
   FcFini();
 
   if (buggyCairoShutdown) {
-    if (!theme_is_qt)
+    if (!skip_display_close)
       gdk_display_close(display);
   }
 #else // not CLEANUP_MEMORY
@@ -4075,6 +4236,10 @@
   }
 #endif /* MOZ_INSTRUMENT_EVENT_LOOP */
 
+#if defined(XP_WIN) && defined(MOZ_CONTENT_SANDBOX)
+  SetUpSandboxEnvironment();
+#endif
+
   {
     rv = appStartup->Run();
     if (NS_FAILED(rv)) {
@@ -4083,6 +4248,10 @@
     }
   }
 
+#if defined(XP_WIN) && defined(MOZ_CONTENT_SANDBOX)
+  CleanUpSandboxEnvironment();
+#endif
+
   return rv;
 }
 
@@ -4400,7 +4569,7 @@
 #else
   // Nightly builds, update gBrowserTabsRemoteAutostart based on all the
   // e10s remote relayed prefs we watch.
-  bool disabledForA11y = Preferences::GetBool("browser.tabs.remote.autostart.disabled-because-using-a11y", false);
+  bool disabledForA11y = Preferences::GetBool("browser.tabs.remote.disabled-for-a11y", false);
   // Disable for VR
   bool disabledForVR = Preferences::GetBool("dom.vr.enabled", false);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/toolkit/xre/nsUpdateDriver.cpp firefox-trunk-41.0~a1~hg20150524r245419/toolkit/xre/nsUpdateDriver.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/toolkit/xre/nsUpdateDriver.cpp	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/toolkit/xre/nsUpdateDriver.cpp	2015-05-25 20:44:04.000000000 +0000
@@ -15,7 +15,7 @@
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "prproces.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prenv.h"
 #include "nsVersionComparator.h"
 #include "nsXREDirProvider.h"
@@ -71,7 +71,6 @@
 #define USE_EXECV
 #endif
 
-#ifdef PR_LOGGING
 static PRLogModuleInfo *
 GetUpdateLog()
 {
@@ -80,20 +79,19 @@
     sUpdateLog = PR_NewLogModule("updatedriver");
   return sUpdateLog;
 }
-#endif
-#define LOG(args) PR_LOG(GetUpdateLog(), PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(GetUpdateLog(), PR_LOG_DEBUG, args)
 
 #ifdef XP_WIN
-static const char kUpdaterBin[] = "updater.exe";
+#define UPDATER_BIN "updater.exe"
 #else
-static const char kUpdaterBin[] = "updater";
+#define UPDATER_BIN "updater"
 #endif
-static const char kUpdaterINI[] = "updater.ini";
+#define UPDATER_INI "updater.ini"
 #ifdef XP_MACOSX
-static const char kUpdaterApp[] = "updater.app";
+#define UPDATER_APP "updater.app"
 #endif
 #if defined(XP_UNIX) && !defined(XP_MACOSX)
-static const char kUpdaterPNG[] = "updater.png";
+#define UPDATER_PNG "updater.png"
 #endif
 
 #if defined(MOZ_WIDGET_GONK)
@@ -332,9 +330,8 @@
 }
 
 static bool
-CopyFileIntoUpdateDir(nsIFile *parentDir, const char *leafName, nsIFile *updateDir)
+CopyFileIntoUpdateDir(nsIFile *parentDir, const nsACString& leaf, nsIFile *updateDir)
 {
-  nsDependentCString leaf(leafName);
   nsCOMPtr<nsIFile> file;
 
   // Make sure there is not an existing file in the target location.
@@ -366,19 +363,19 @@
 {
   // Copy the updater application from the GRE and the updater ini from the app
 #if defined(XP_MACOSX)
-  if (!CopyFileIntoUpdateDir(appDir, kUpdaterApp, updateDir))
+  if (!CopyFileIntoUpdateDir(appDir, NS_LITERAL_CSTRING(UPDATER_APP), updateDir))
     return false;
-  CopyFileIntoUpdateDir(greDir, kUpdaterINI, updateDir);
+  CopyFileIntoUpdateDir(greDir, NS_LITERAL_CSTRING(UPDATER_INI), updateDir);
 #else
-  if (!CopyFileIntoUpdateDir(greDir, kUpdaterBin, updateDir))
+  if (!CopyFileIntoUpdateDir(greDir, NS_LITERAL_CSTRING(UPDATER_BIN), updateDir))
     return false;
-  CopyFileIntoUpdateDir(appDir, kUpdaterINI, updateDir);
+  CopyFileIntoUpdateDir(appDir, NS_LITERAL_CSTRING(UPDATER_INI), updateDir);
 #endif
 #if defined(XP_UNIX) && !defined(XP_MACOSX) && !defined(ANDROID)
   nsCOMPtr<nsIFile> iconDir;
   appDir->Clone(getter_AddRefs(iconDir));
   iconDir->AppendNative(NS_LITERAL_CSTRING("icons"));
-  if (!CopyFileIntoUpdateDir(iconDir, kUpdaterPNG, updateDir))
+  if (!CopyFileIntoUpdateDir(iconDir, NS_LITERAL_CSTRING(UPDATER_PNG), updateDir))
     return false;
 #endif
   // Finally, return the location of the updater binary.
@@ -386,7 +383,7 @@
   if (NS_FAILED(rv))
     return false;
 #if defined(XP_MACOSX)
-  rv  = updater->AppendNative(NS_LITERAL_CSTRING(kUpdaterApp));
+  rv  = updater->AppendNative(NS_LITERAL_CSTRING(UPDATER_APP));
   nsresult tmp = updater->AppendNative(NS_LITERAL_CSTRING("Contents"));
   if (NS_FAILED(tmp)) {
     rv = tmp;
@@ -395,7 +392,7 @@
   if (NS_FAILED(tmp) || NS_FAILED(rv))
     return false;
 #endif
-  rv = updater->AppendNative(NS_LITERAL_CSTRING(kUpdaterBin));
+  rv = updater->AppendNative(NS_LITERAL_CSTRING(UPDATER_BIN));
   return NS_SUCCEEDED(rv); 
 }
 
@@ -503,8 +500,7 @@
     return;
   }
 
-  nsDependentCString leaf(kUpdaterBin);
-  rv = updater->AppendNative(leaf);
+  rv = updater->AppendNative(NS_LITERAL_CSTRING(UPDATER_BIN));
   if (NS_FAILED(rv)) {
     return;
   }
@@ -772,8 +768,7 @@
     return;
   }
 
-  nsDependentCString leaf(kUpdaterBin);
-  rv = updater->AppendNative(leaf);
+  rv = updater->AppendNative(NS_LITERAL_CSTRING(UPDATER_BIN));
   if (NS_FAILED(rv)) {
     return;
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/tools/mercurial/hgsetup/config.py firefox-trunk-41.0~a1~hg20150524r245419/tools/mercurial/hgsetup/config.py
--- firefox-trunk-41.0~a1~hg20150513r243603/tools/mercurial/hgsetup/config.py	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/tools/mercurial/hgsetup/config.py	2015-05-25 20:44:05.000000000 +0000
@@ -11,7 +11,7 @@
 
 
 HOST_FINGERPRINTS = {
-    'bitbucket.org': '45:ad:ae:1a:cf:0e:73:47:06:07:e0:88:f5:cc:10:e5:fa:1c:f7:99',
+    'bitbucket.org': '46:de:34:e7:9b:18:cd:7f:ae:fd:8b:e3:bc:f4:1a:5e:38:d7:ac:24',
     'bugzilla.mozilla.org': '47:13:a2:14:0c:46:45:53:12:0d:e5:36:16:a5:60:26:3e:da:3a:60',
     'hg.mozilla.org': 'af:27:b9:34:47:4e:e5:98:01:f6:83:2b:51:c9:aa:d8:df:fb:1a:27',
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/tools/mercurial/hgsetup/update.py firefox-trunk-41.0~a1~hg20150524r245419/tools/mercurial/hgsetup/update.py
--- firefox-trunk-41.0~a1~hg20150513r243603/tools/mercurial/hgsetup/update.py	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/tools/mercurial/hgsetup/update.py	2015-05-25 20:44:05.000000000 +0000
@@ -8,13 +8,9 @@
 import os
 import which
 
-from configobj import ConfigObjError
-
 from mozversioncontrol.repoupdate import update_mercurial_repo
 
 from .config import (
-    HgIncludeException,
-    MercurialConfig,
     HOST_FINGERPRINTS,
 )
 
@@ -45,27 +41,6 @@
                 '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,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/tools/mercurial/hgsetup/wizard.py firefox-trunk-41.0~a1~hg20150524r245419/tools/mercurial/hgsetup/wizard.py
--- firefox-trunk-41.0~a1~hg20150513r243603/tools/mercurial/hgsetup/wizard.py	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/tools/mercurial/hgsetup/wizard.py	2015-05-25 20:44:05.000000000 +0000
@@ -79,9 +79,9 @@
 '''.strip()
 
 MQEXT_INFO = '''
-The mqext extension (https://bitbucket.org/sfink/mqext) provides a number of
-useful abilities to Mercurial, including automatically committing changes to
-your mq patch queue.
+The mqext extension adds a number of features, including automatically committing
+changes to your mq patch queue. More info is available at
+https://hg.mozilla.org/hgcustom/version-control-tools/file/default/hgext/mqext/README.txt
 
 Would you like to activate mqext
 '''.strip()
@@ -159,6 +159,7 @@
 Would you like to activate firefoxtree
 '''.strip()
 
+
 class MercurialSetupWizard(object):
     """Command-line wizard to help users configure Mercurial."""
 
@@ -284,16 +285,7 @@
             self.prompt_external_extension(c, 'firefoxtree', FIREFOXTREE_INFO)
 
         if 'mq' in c.extensions:
-            self.prompt_external_extension(c, 'mqext', MQEXT_INFO,
-                                           os.path.join(self.ext_dir, 'mqext'))
-
-            if 'mqext' in c.extensions:
-                self.updater.update_mercurial_repo(
-                    hg,
-                    'https://bitbucket.org/sfink/mqext',
-                    os.path.join(self.ext_dir, 'mqext'),
-                    'default',
-                    'Ensuring mqext extension is up to date...')
+            self.prompt_external_extension(c, 'mqext', MQEXT_INFO)
 
             if 'mqext' in c.extensions and not c.have_mqext_autocommit_mq():
                 if self._prompt_yn('Would you like to configure mqext to '
@@ -337,7 +329,7 @@
                 'Ensuring version-control-tools is up to date...')
 
         # Look for and clean up old extensions.
-        for ext in {'bzexport', 'qimportbz'}:
+        for ext in {'bzexport', 'qimportbz', 'mqext'}:
             path = os.path.join(self.ext_dir, ext)
             if os.path.exists(path):
                 if self._prompt_yn('Would you like to remove the old and no '
@@ -414,11 +406,11 @@
             if not self._prompt_yn(prompt_text):
                 print('')
                 return
-            print('Activated %s extension.\n' % name)
         if not path:
             path = os.path.join(self.vcs_tools_dir, 'hgext', name)
-            self.update_vcs_tools = True
+        self.update_vcs_tools = True
         c.activate_extension(name, path)
+        print('Activated %s extension.\n' % name)
 
     def _prompt(self, msg, allow_empty=False):
         print(msg)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/tools/profiler/GeckoProfilerImpl.h firefox-trunk-41.0~a1~hg20150524r245419/tools/profiler/GeckoProfilerImpl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/tools/profiler/GeckoProfilerImpl.h	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/tools/profiler/GeckoProfilerImpl.h	2015-05-25 20:44:05.000000000 +0000
@@ -272,6 +272,10 @@
   mozilla_sampler_tracing(aCategory, aInfo, aMetaData);
 }
 
+#define SAMPLER_APPEND_LINE_NUMBER_PASTE(id, line) id ## line
+#define SAMPLER_APPEND_LINE_NUMBER_EXPAND(id, line) SAMPLER_APPEND_LINE_NUMBER_PASTE(id, line)
+#define SAMPLER_APPEND_LINE_NUMBER(id) SAMPLER_APPEND_LINE_NUMBER_EXPAND(id, __LINE__)
+
 // Uncomment this to turn on systrace or build with
 // ac_add_options --enable-systace
 //#define MOZ_USE_SYSTRACE
@@ -293,7 +297,7 @@
 // atrace_end with defined HAVE_ANDROID_OS again. Then there is no build-break.
 # undef _LIBS_CUTILS_TRACE_H
 # include <utils/Trace.h>
-# define MOZ_PLATFORM_TRACING(name) ATRACE_NAME(name);
+# define MOZ_PLATFORM_TRACING(name) android::ScopedTrace SAMPLER_APPEND_LINE_NUMBER(scopedTrace)(ATRACE_TAG, name);
 # ifdef REMOVE_HAVE_ANDROID_OS
 #  undef HAVE_ANDROID_OS
 #  undef REMOVE_HAVE_ANDROID_OS
@@ -305,10 +309,6 @@
 // we want the class and function name but can't easily get that using preprocessor macros
 // __func__ doesn't have the class name and __PRETTY_FUNCTION__ has the parameters
 
-#define SAMPLER_APPEND_LINE_NUMBER_PASTE(id, line) id ## line
-#define SAMPLER_APPEND_LINE_NUMBER_EXPAND(id, line) SAMPLER_APPEND_LINE_NUMBER_PASTE(id, line)
-#define SAMPLER_APPEND_LINE_NUMBER(id) SAMPLER_APPEND_LINE_NUMBER_EXPAND(id, __LINE__)
-
 #define PROFILER_LABEL(name_space, info, category) MOZ_PLATFORM_TRACING(name_space "::" info) mozilla::SamplerStackFrameRAII SAMPLER_APPEND_LINE_NUMBER(sampler_raii)(name_space "::" info, category, __LINE__)
 #define PROFILER_LABEL_FUNC(category) MOZ_PLATFORM_TRACING(SAMPLE_FUNCTION_NAME) mozilla::SamplerStackFrameRAII SAMPLER_APPEND_LINE_NUMBER(sampler_raii)(SAMPLE_FUNCTION_NAME, category, __LINE__)
 #define PROFILER_LABEL_PRINTF(name_space, info, category, ...) MOZ_PLATFORM_TRACING(name_space "::" info) mozilla::SamplerStackFramePrintfRAII SAMPLER_APPEND_LINE_NUMBER(sampler_raii)(name_space "::" info, category, __LINE__, __VA_ARGS__)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/tools/profiler/platform-linux.cc firefox-trunk-41.0~a1~hg20150524r245419/tools/profiler/platform-linux.cc
--- firefox-trunk-41.0~a1~hg20150513r243603/tools/profiler/platform-linux.cc	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/tools/profiler/platform-linux.cc	2015-05-25 20:44:05.000000000 +0000
@@ -646,11 +646,7 @@
   }
 }
 
-
-static void StartSignalHandler(int signal, siginfo_t* info, void* context) {
-  // XXX: Everything we do here is NOT async signal safe. We risk nasty things
-  // like deadlocks but we typically only do this once so it tends to be ok.
-  // See bug 909403
+static void DoStartTask() {
   uint32_t featureCount = 0;
   uint32_t threadCount = 0;
 
@@ -674,6 +670,20 @@
   freeArray(features, featureCount);
 }
 
+static void StartSignalHandler(int signal, siginfo_t* info, void* context) {
+  class StartTask : public nsRunnable {
+  public:
+    NS_IMETHOD Run() {
+      DoStartTask();
+      return NS_OK;
+    }
+  };
+  // XXX: technically NS_DispatchToMainThread is NOT async signal safe. We risk
+  // nasty things like deadlocks, but the probability is very low and we
+  // typically only do this once so it tends to be ok. See bug 909403.
+  NS_DispatchToMainThread(new StartTask());
+}
+
 void OS::Startup()
 {
   LOG("Registering start signal");
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/tools/profiler/ProfileEntry.cpp firefox-trunk-41.0~a1~hg20150524r245419/tools/profiler/ProfileEntry.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/tools/profiler/ProfileEntry.cpp	2015-05-13 18:06:26.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/tools/profiler/ProfileEntry.cpp	2015-05-25 20:44:05.000000000 +0000
@@ -159,7 +159,7 @@
   mReadPos = mWritePos = 0;
 }
 
-#define DYNAMIC_MAX_STRING 512
+#define DYNAMIC_MAX_STRING 8192
 
 char* ProfileBuffer::processDynamicTag(int readPos,
                                        int* tagsConsumed, char* tagBuff)
@@ -681,6 +681,7 @@
   int readPos = mReadPos;
   int currentThreadID = -1;
   Maybe<float> currentTime;
+  UniquePtr<char[]> tagBuff = MakeUnique<char[]>(DYNAMIC_MAX_STRING);
 
   while (readPos != mWritePos) {
     ProfileEntry entry = mEntries[readPos];
@@ -749,13 +750,12 @@
             // Read ahead to the next tag, if it's a 'd' tag process it now
             const char* tagStringData = frame.mTagData;
             int readAheadPos = (framePos + 1) % mEntrySize;
-            char tagBuff[DYNAMIC_MAX_STRING];
             // Make sure the string is always null terminated if it fills up
             // DYNAMIC_MAX_STRING-2
             tagBuff[DYNAMIC_MAX_STRING-1] = '\0';
 
             if (readAheadPos != mWritePos && mEntries[readAheadPos].mTagName == 'd') {
-              tagStringData = processDynamicTag(framePos, &incBy, tagBuff);
+              tagStringData = processDynamicTag(framePos, &incBy, tagBuff.get());
             }
 
             // Write one frame. It can have either
@@ -768,8 +768,8 @@
               // We need a double cast here to tell GCC that we don't want to sign
               // extend 32-bit addresses starting with 0xFXXXXXX.
               unsigned long long pc = (unsigned long long)(uintptr_t)frame.mTagPtr;
-              snprintf(tagBuff, DYNAMIC_MAX_STRING, "%#llx", pc);
-              stack.AppendFrame(UniqueStacks::OnStackFrameKey(tagBuff));
+              snprintf(tagBuff.get(), DYNAMIC_MAX_STRING, "%#llx", pc);
+              stack.AppendFrame(UniqueStacks::OnStackFrameKey(tagBuff.get()));
             } else if (frame.mTagName == 'c') {
               UniqueStacks::OnStackFrameKey frameKey(tagStringData);
               readAheadPos = (framePos + incBy) % mEntrySize;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/uriloader/base/nsDocLoader.cpp firefox-trunk-41.0~a1~hg20150524r245419/uriloader/base/nsDocLoader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/uriloader/base/nsDocLoader.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/uriloader/base/nsDocLoader.cpp	2015-05-25 20:44:05.000000000 +0000
@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nspr.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "nsDocLoader.h"
 #include "nsCURILoader.h"
@@ -91,12 +91,22 @@
     }
 };
 
+/* static */ const PLDHashTableOps nsDocLoader::sRequestInfoHashOps =
+{
+  PL_DHashVoidPtrKeyStub,
+  PL_DHashMatchEntryStub,
+  PL_DHashMoveEntryStub,
+  nsDocLoader::RequestInfoHashClearEntry,
+  nsDocLoader::RequestInfoHashInitEntry
+};
+
 nsDocLoader::nsDocLoader()
   : mParent(nullptr),
     mCurrentSelfProgress(0),
     mMaxSelfProgress(0),
     mCurrentTotalProgress(0),
     mMaxTotalProgress(0),
+    mRequestInfoHash(&sRequestInfoHashOps, sizeof(nsRequestInfo)),
     mCompletedTotalProgress(0),
     mIsLoadingDocument(false),
     mIsRestoringDocument(false),
@@ -107,20 +117,9 @@
       gDocLoaderLog = PR_NewLogModule("DocLoader");
   }
 
-  static const PLDHashTableOps hash_table_ops =
-  {
-    PL_DHashVoidPtrKeyStub,
-    PL_DHashMatchEntryStub,
-    PL_DHashMoveEntryStub,
-    RequestInfoHashClearEntry,
-    RequestInfoHashInitEntry
-  };
-
-  PL_DHashTableInit(&mRequestInfoHash, &hash_table_ops, sizeof(nsRequestInfo));
-
   ClearInternalProgress();
 
-  PR_LOG(gDocLoaderLog, PR_LOG_DEBUG,
+  MOZ_LOG(gDocLoaderLog, PR_LOG_DEBUG,
          ("DocLoader:%p: created.\n", this));
 }
 
@@ -134,14 +133,10 @@
 nsresult
 nsDocLoader::Init()
 {
-  if (!mRequestInfoHash.IsInitialized()) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
   nsresult rv = NS_NewLoadGroup(getter_AddRefs(mLoadGroup), this);
   if (NS_FAILED(rv)) return rv;
 
-  PR_LOG(gDocLoaderLog, PR_LOG_DEBUG,
+  MOZ_LOG(gDocLoaderLog, PR_LOG_DEBUG,
          ("DocLoader:%p: load group %x.\n", this, mLoadGroup.get()));
 
   return NS_OK;
@@ -164,12 +159,8 @@
 
   Destroy();
 
-  PR_LOG(gDocLoaderLog, PR_LOG_DEBUG,
+  MOZ_LOG(gDocLoaderLog, PR_LOG_DEBUG,
          ("DocLoader:%p: deleted.\n", this));
-
-  if (mRequestInfoHash.IsInitialized()) {
-    PL_DHashTableFinish(&mRequestInfoHash);
-  }
 }
 
 
@@ -244,7 +235,7 @@
 {
   nsresult rv = NS_OK;
 
-  PR_LOG(gDocLoaderLog, PR_LOG_DEBUG,
+  MOZ_LOG(gDocLoaderLog, PR_LOG_DEBUG,
          ("DocLoader:%p: Stop() called\n", this));
 
   NS_OBSERVER_ARRAY_NOTIFY_XPCOM_OBSERVERS(mChildList, nsDocLoader, Stop, ());
@@ -406,7 +397,7 @@
     if (mLoadGroup)
       mLoadGroup->GetActiveCount(&count);
 
-    PR_LOG(gDocLoaderLog, PR_LOG_DEBUG,
+    MOZ_LOG(gDocLoaderLog, PR_LOG_DEBUG,
            ("DocLoader:%p: OnStartRequest[%p](%s) mIsLoadingDocument=%s, %u active URLs",
             this, request, name.get(),
             (mIsLoadingDocument ? "true" : "false"),
@@ -486,7 +477,7 @@
     if (mLoadGroup)
       mLoadGroup->GetActiveCount(&count);
 
-    PR_LOG(gDocLoaderLog, PR_LOG_DEBUG,
+    MOZ_LOG(gDocLoaderLog, PR_LOG_DEBUG,
            ("DocLoader:%p: OnStopRequest[%p](%s) status=%x mIsLoadingDocument=%s, %u active URLs",
            this, aRequest, name.get(),
            aStatus, (mIsLoadingDocument ? "true" : "false"),
@@ -691,7 +682,7 @@
       // we don't need it anymore to CalculateMaxProgress().
       ClearInternalProgress();
 
-      PR_LOG(gDocLoaderLog, PR_LOG_DEBUG,
+      MOZ_LOG(gDocLoaderLog, PR_LOG_DEBUG,
              ("DocLoader:%p: Is now idle...\n", this));
 
       nsCOMPtr<nsIRequest> docRequest = mDocumentRequest;
@@ -742,7 +733,7 @@
   nsAutoCString buffer;
 
   GetURIStringFromRequest(mDocumentRequest, buffer);
-  PR_LOG(gDocLoaderLog, PR_LOG_DEBUG,
+  MOZ_LOG(gDocLoaderLog, PR_LOG_DEBUG,
          ("DocLoader:%p: ++ Firing OnStateChange for start document load (...)."
           "\tURI: %s \n",
           this, buffer.get()));
@@ -767,7 +758,7 @@
   nsAutoCString buffer;
 
   GetURIStringFromRequest(request, buffer);
-    PR_LOG(gDocLoaderLog, PR_LOG_DEBUG,
+    MOZ_LOG(gDocLoaderLog, PR_LOG_DEBUG,
           ("DocLoader:%p: ++ Firing OnStateChange start url load (...)."
            "\tURI: %s\n",
             this, buffer.get()));
@@ -786,7 +777,7 @@
   nsAutoCString buffer;
 
   GetURIStringFromRequest(request, buffer);
-    PR_LOG(gDocLoaderLog, PR_LOG_DEBUG,
+    MOZ_LOG(gDocLoaderLog, PR_LOG_DEBUG,
           ("DocLoader:%p: ++ Firing OnStateChange for end url load (...)."
            "\tURI: %s status=%x\n",
             this, buffer.get(), aStatus));
@@ -815,7 +806,7 @@
   nsAutoCString buffer;
 
   GetURIStringFromRequest(request, buffer);
-  PR_LOG(gDocLoaderLog, PR_LOG_DEBUG,
+  MOZ_LOG(gDocLoaderLog, PR_LOG_DEBUG,
          ("DocLoader:%p: ++ Firing OnStateChange for end document load (...)."
          "\tURI: %s Status=%x\n",
           this, buffer.get(), aStatus));
@@ -1002,7 +993,7 @@
       nsLoadFlags lf = 0;
       aRequest->GetLoadFlags(&lf);
       if ((lf & nsIChannel::LOAD_DOCUMENT_URI) && !(lf & nsIChannel::LOAD_TARGETED)) {
-        PR_LOG(gDocLoaderLog, PR_LOG_DEBUG,
+        MOZ_LOG(gDocLoaderLog, PR_LOG_DEBUG,
             ("DocLoader:%p Ignoring OnProgress while load is not targeted\n", this));
         return NS_OK;
       }
@@ -1051,7 +1042,7 @@
     nsAutoCString buffer;
 
     GetURIStringFromRequest(aRequest, buffer);
-    PR_LOG(gDocLoaderLog, PR_LOG_DEBUG,
+    MOZ_LOG(gDocLoaderLog, PR_LOG_DEBUG,
            ("DocLoader:%p OOPS - No Request Info for: %s\n",
             this, buffer.get()));
 #endif /* DEBUG */
@@ -1181,7 +1172,7 @@
   nsAutoCString buffer;
 
   GetURIStringFromRequest(request, buffer);
-  PR_LOG(gDocLoaderLog, PR_LOG_DEBUG,
+  MOZ_LOG(gDocLoaderLog, PR_LOG_DEBUG,
          ("DocLoader:%p: Progress (%s): curSelf: %d maxSelf: %d curTotal: %d maxTotal %d\n",
           this, buffer.get(), aProgress, aProgressMax, aTotalProgress, aMaxTotalProgress));
 #endif /* DEBUG */
@@ -1247,7 +1238,7 @@
   nsAutoCString buffer;
 
   GetURIStringFromRequest(aRequest, buffer);
-  PR_LOG(gDocLoaderLog, PR_LOG_DEBUG,
+  MOZ_LOG(gDocLoaderLog, PR_LOG_DEBUG,
          ("DocLoader:%p: Status (%s): code: %x\n",
          this, buffer.get(), aStateFlags));
 #endif /* DEBUG */
@@ -1268,7 +1259,7 @@
                                   uint32_t aFlags)
 {
   NOTIFY_LISTENERS(nsIWebProgress::NOTIFY_LOCATION,
-    PR_LOG(gDocLoaderLog, PR_LOG_DEBUG, ("DocLoader [%p] calling %p->OnLocationChange", this, listener.get()));
+    MOZ_LOG(gDocLoaderLog, PR_LOG_DEBUG, ("DocLoader [%p] calling %p->OnLocationChange", this, listener.get()));
     listener->OnLocationChange(aWebProgress, aRequest, aUri, aFlags);
   );
 
@@ -1361,12 +1352,6 @@
 
 void nsDocLoader::ClearRequestInfoHash(void)
 {
-  if (!mRequestInfoHash.IsInitialized() || !mRequestInfoHash.EntryCount()) {
-    // No hash, or the hash is empty, nothing to do here then...
-
-    return;
-  }
-
   PL_DHashTableEnumerate(&mRequestInfoHash, RemoveInfoCallback, nullptr);
 }
 
@@ -1474,7 +1459,7 @@
 
 NS_IMETHODIMP nsDocLoader::SetPriority(int32_t aPriority)
 {
-  PR_LOG(gDocLoaderLog, PR_LOG_DEBUG,
+  MOZ_LOG(gDocLoaderLog, PR_LOG_DEBUG,
          ("DocLoader:%p: SetPriority(%d) called\n", this, aPriority));
 
   nsCOMPtr<nsISupportsPriority> p = do_QueryInterface(mLoadGroup);
@@ -1489,7 +1474,7 @@
 
 NS_IMETHODIMP nsDocLoader::AdjustPriority(int32_t aDelta)
 {
-  PR_LOG(gDocLoaderLog, PR_LOG_DEBUG,
+  MOZ_LOG(gDocLoaderLog, PR_LOG_DEBUG,
          ("DocLoader:%p: AdjustPriority(%d) called\n", this, aDelta));
 
   nsCOMPtr<nsISupportsPriority> p = do_QueryInterface(mLoadGroup);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/uriloader/base/nsDocLoader.h firefox-trunk-41.0~a1~hg20150524r245419/uriloader/base/nsDocLoader.h
--- firefox-trunk-41.0~a1~hg20150513r243603/uriloader/base/nsDocLoader.h	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/uriloader/base/nsDocLoader.h	2015-05-25 20:44:05.000000000 +0000
@@ -276,7 +276,7 @@
     int64_t mCurrentTotalProgress;
     int64_t mMaxTotalProgress;
 
-    PLDHashTable mRequestInfoHash;
+    PLDHashTable2 mRequestInfoHash;
     int64_t mCompletedTotalProgress;
 
     mozilla::LinkedList<nsStatusInfo> mStatusInfoList;
@@ -302,6 +302,8 @@
     bool mIsFlushingLayout;
 
 private:
+    static const PLDHashTableOps sRequestInfoHashOps;
+
     // A list of kids that are in the middle of their onload calls and will let
     // us know once they're done.  We don't want to fire onload for "normal"
     // DocLoaderIsEmpty calls (those coming from requests finishing in our
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/uriloader/base/nsURILoader.cpp firefox-trunk-41.0~a1~hg20150524r245419/uriloader/base/nsURILoader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/uriloader/base/nsURILoader.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/uriloader/base/nsURILoader.cpp	2015-05-25 20:44:05.000000000 +0000
@@ -53,8 +53,8 @@
 
 PRLogModuleInfo* nsURILoader::mLog = nullptr;
 
-#define LOG(args) PR_LOG(nsURILoader::mLog, PR_LOG_DEBUG, args)
-#define LOG_ERROR(args) PR_LOG(nsURILoader::mLog, PR_LOG_ERROR, args)
+#define LOG(args) MOZ_LOG(nsURILoader::mLog, PR_LOG_DEBUG, args)
+#define LOG_ERROR(args) MOZ_LOG(nsURILoader::mLog, PR_LOG_ERROR, args)
 #define LOG_ENABLED() PR_LOG_TEST(nsURILoader::mLog, PR_LOG_DEBUG)
 
 #define NS_PREF_DISABLE_BACKGROUND_HANDLING \
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/uriloader/base/nsURILoader.h firefox-trunk-41.0~a1~hg20150524r245419/uriloader/base/nsURILoader.h
--- firefox-trunk-41.0~a1~hg20150513r243603/uriloader/base/nsURILoader.h	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/uriloader/base/nsURILoader.h	2015-05-25 20:44:05.000000000 +0000
@@ -16,7 +16,7 @@
 #include "nsIWeakReference.h"
 #include "mozilla/Attributes.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 class nsDocumentOpenInfo;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/uriloader/exthandler/mac/nsOSHelperAppService.mm firefox-trunk-41.0~a1~hg20150524r245419/uriloader/exthandler/mac/nsOSHelperAppService.mm
--- firefox-trunk-41.0~a1~hg20150513r243603/uriloader/exthandler/mac/nsOSHelperAppService.mm	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/uriloader/exthandler/mac/nsOSHelperAppService.mm	2015-05-25 20:44:05.000000000 +0000
@@ -306,7 +306,7 @@
   const nsCString& flatType = PromiseFlatCString(aMIMEType);
   const nsCString& flatExt = PromiseFlatCString(aFileExt);
 
-  PR_LOG(mLog, PR_LOG_DEBUG, ("Mac: HelperAppService lookup for type '%s' ext '%s'\n",
+  MOZ_LOG(mLog, PR_LOG_DEBUG, ("Mac: HelperAppService lookup for type '%s' ext '%s'\n",
                               flatType.get(), flatExt.get()));
 
   // Create a Mac-specific MIME info so we can use Mac-specific members.
@@ -336,7 +336,7 @@
       err = ::LSCopyApplicationForMIMEType(cfMIMEType, kLSRolesAll, &appURL);
       if ((err == noErr) && appURL && ::CFURLGetFSRef(appURL, &typeAppFSRef)) {
         haveAppForType = true;
-        PR_LOG(mLog, PR_LOG_DEBUG, ("LSCopyApplicationForMIMEType found a default application\n"));
+        MOZ_LOG(mLog, PR_LOG_DEBUG, ("LSCopyApplicationForMIMEType found a default application\n"));
       }
       if (appURL) {
         ::CFRelease(appURL);
@@ -354,7 +354,7 @@
                                       kLSRolesAll, &extAppFSRef, nullptr);
       if (err == noErr) {
         haveAppForExt = true;
-        PR_LOG(mLog, PR_LOG_DEBUG, ("LSGetApplicationForInfo found a default application\n"));
+        MOZ_LOG(mLog, PR_LOG_DEBUG, ("LSGetApplicationForInfo found a default application\n"));
       }
       ::CFRelease(cfExt);
     }
@@ -526,7 +526,7 @@
     }
   }
 
-  PR_LOG(mLog, PR_LOG_DEBUG, ("OS gave us: type '%s' found '%i'\n", mimeType.get(), *aFound));
+  MOZ_LOG(mLog, PR_LOG_DEBUG, ("OS gave us: type '%s' found '%i'\n", mimeType.get(), *aFound));
 
   [localPool release];
   return mimeInfoMac.forget();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/uriloader/exthandler/nsExternalHelperAppService.cpp firefox-trunk-41.0~a1~hg20150524r245419/uriloader/exthandler/nsExternalHelperAppService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/uriloader/exthandler/nsExternalHelperAppService.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/uriloader/exthandler/nsExternalHelperAppService.cpp	2015-05-25 20:44:05.000000000 +0000
@@ -128,7 +128,7 @@
 // of PR_LOG_DEBUG (4), and we want less detailed output here
 // Using 3 instead of PR_LOG_WARN because we don't output warnings
 #undef LOG
-#define LOG(args) PR_LOG(nsExternalHelperAppService::mLog, 3, args)
+#define LOG(args) MOZ_LOG(nsExternalHelperAppService::mLog, 3, args)
 #define LOG_ENABLED() PR_LOG_TEST(nsExternalHelperAppService::mLog, 3)
 
 static const char NEVER_ASK_FOR_SAVE_TO_DISK_PREF[] =
@@ -1816,10 +1816,10 @@
         }
         break;
     }
-    PR_LOG(nsExternalHelperAppService::mLog, PR_LOG_ERROR,
+    MOZ_LOG(nsExternalHelperAppService::mLog, PR_LOG_ERROR,
         ("Error: %s, type=%i, listener=0x%p, transfer=0x%p, rv=0x%08X\n",
          NS_LossyConvertUTF16toASCII(msgId).get(), type, mDialogProgressListener.get(), mTransfer.get(), rv));
-    PR_LOG(nsExternalHelperAppService::mLog, PR_LOG_ERROR,
+    MOZ_LOG(nsExternalHelperAppService::mLog, PR_LOG_ERROR,
         ("       path='%s'\n", NS_ConvertUTF16toUTF8(path).get()));
 
     // Get properties file bundle and extract status string.
@@ -1848,7 +1848,7 @@
                                              1,
                                              getter_Copies(title));
 
-                PR_LOG(nsExternalHelperAppService::mLog, PR_LOG_DEBUG,
+                MOZ_LOG(nsExternalHelperAppService::mLog, PR_LOG_DEBUG,
                        ("mContentContext=0x%p, prompter=0x%p, qi rv=0x%08X, title='%s', msg='%s'",
                        mContentContext.get(),
                        prompter.get(),
@@ -1866,7 +1866,7 @@
 
                   prompter = do_GetInterface(window->GetDocShell(), &qiRv);
 
-                  PR_LOG(nsExternalHelperAppService::mLog, PR_LOG_DEBUG,
+                  MOZ_LOG(nsExternalHelperAppService::mLog, PR_LOG_DEBUG,
                          ("No prompter from mContentContext, using DocShell, " \
                           "window=0x%p, docShell=0x%p, " \
                           "prompter=0x%p, qi rv=0x%08X",
@@ -1878,7 +1878,7 @@
                   // If we still don't have a prompter, there's nothing else we
                   // can do so just return.
                   if (!prompter) {
-                    PR_LOG(nsExternalHelperAppService::mLog, PR_LOG_ERROR,
+                    MOZ_LOG(nsExternalHelperAppService::mLog, PR_LOG_ERROR,
                            ("No prompter from DocShell, no way to alert user"));
                     return;
                   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/uriloader/exthandler/nsExternalHelperAppService.h firefox-trunk-41.0~a1~hg20150524r245419/uriloader/exthandler/nsExternalHelperAppService.h
--- firefox-trunk-41.0~a1~hg20150513r243603/uriloader/exthandler/nsExternalHelperAppService.h	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/uriloader/exthandler/nsExternalHelperAppService.h	2015-05-25 20:44:06.000000000 +0000
@@ -6,7 +6,7 @@
 #ifndef nsExternalHelperAppService_h__
 #define nsExternalHelperAppService_h__
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prtime.h"
 
 #include "nsIExternalHelperAppService.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/uriloader/exthandler/unix/nsOSHelperAppService.cpp firefox-trunk-41.0~a1~hg20150524r245419/uriloader/exthandler/unix/nsOSHelperAppService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/uriloader/exthandler/unix/nsOSHelperAppService.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/uriloader/exthandler/unix/nsOSHelperAppService.cpp	2015-05-25 20:44:06.000000000 +0000
@@ -39,7 +39,7 @@
 
 using namespace mozilla;
 
-#define LOG(args) PR_LOG(mLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(mLog, PR_LOG_DEBUG, args)
 #define LOG_ENABLED() PR_LOG_TEST(mLog, PR_LOG_DEBUG)
 
 static nsresult
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/uriloader/exthandler/win/nsOSHelperAppService.cpp firefox-trunk-41.0~a1~hg20150524r245419/uriloader/exthandler/win/nsOSHelperAppService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/uriloader/exthandler/win/nsOSHelperAppService.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/uriloader/exthandler/win/nsOSHelperAppService.cpp	2015-05-25 20:44:06.000000000 +0000
@@ -23,7 +23,7 @@
 // shellapi.h is needed to build with WIN32_LEAN_AND_MEAN
 #include <shellapi.h>
 
-#define LOG(args) PR_LOG(mLog, PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(mLog, PR_LOG_DEBUG, args)
 
 // helper methods: forward declarations...
 static nsresult GetExtensionFrom4xRegistryInfo(const nsACString& aMimeType, 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/uriloader/prefetch/nsOfflineCacheUpdate.cpp firefox-trunk-41.0~a1~hg20150524r245419/uriloader/prefetch/nsOfflineCacheUpdate.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/uriloader/prefetch/nsOfflineCacheUpdate.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/uriloader/prefetch/nsOfflineCacheUpdate.cpp	2015-05-25 20:44:06.000000000 +0000
@@ -32,7 +32,7 @@
 #include "nsThreadUtils.h"
 #include "nsProxyRelease.h"
 #include "nsIConsoleService.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsIAsyncVerifyRedirectCallback.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Attributes.h"
@@ -63,7 +63,7 @@
 extern PRLogModuleInfo *gOfflineCacheUpdateLog;
 
 #undef LOG
-#define LOG(args) PR_LOG(gOfflineCacheUpdateLog, 4, args)
+#define LOG(args) MOZ_LOG(gOfflineCacheUpdateLog, 4, args)
 
 #undef LOG_ENABLED
 #define LOG_ENABLED() PR_LOG_TEST(gOfflineCacheUpdateLog, 4)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/uriloader/prefetch/nsOfflineCacheUpdateService.cpp firefox-trunk-41.0~a1~hg20150524r245419/uriloader/prefetch/nsOfflineCacheUpdateService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/uriloader/prefetch/nsOfflineCacheUpdateService.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/uriloader/prefetch/nsOfflineCacheUpdateService.cpp	2015-05-25 20:44:06.000000000 +0000
@@ -36,7 +36,7 @@
 #include "nsStreamUtils.h"
 #include "nsThreadUtils.h"
 #include "nsProxyRelease.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsIAsyncVerifyRedirectCallback.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Attributes.h"
@@ -82,7 +82,7 @@
 PRLogModuleInfo *gOfflineCacheUpdateLog;
 
 #undef LOG
-#define LOG(args) PR_LOG(gOfflineCacheUpdateLog, 4, args)
+#define LOG(args) MOZ_LOG(gOfflineCacheUpdateLog, 4, args)
 
 #undef LOG_ENABLED
 #define LOG_ENABLED() PR_LOG_TEST(gOfflineCacheUpdateLog, 4)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/uriloader/prefetch/nsPrefetchService.cpp firefox-trunk-41.0~a1~hg20150524r245419/uriloader/prefetch/nsPrefetchService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/uriloader/prefetch/nsPrefetchService.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/uriloader/prefetch/nsPrefetchService.cpp	2015-05-25 20:44:06.000000000 +0000
@@ -20,7 +20,7 @@
 #include "nsStreamUtils.h"
 #include "nsAutoPtr.h"
 #include "prtime.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "plstr.h"
 #include "nsIAsyncVerifyRedirectCallback.h"
 #include "mozilla/Preferences.h"
@@ -44,7 +44,7 @@
 static PRLogModuleInfo *gPrefetchLog;
 
 #undef LOG
-#define LOG(args) PR_LOG(gPrefetchLog, 4, args)
+#define LOG(args) MOZ_LOG(gPrefetchLog, 4, args)
 
 #undef LOG_ENABLED
 #define LOG_ENABLED() PR_LOG_TEST(gPrefetchLog, 4)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/uriloader/prefetch/OfflineCacheUpdateChild.cpp firefox-trunk-41.0~a1~hg20150524r245419/uriloader/prefetch/OfflineCacheUpdateChild.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/uriloader/prefetch/OfflineCacheUpdateChild.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/uriloader/prefetch/OfflineCacheUpdateChild.cpp	2015-05-25 20:44:06.000000000 +0000
@@ -28,7 +28,7 @@
 #include "nsStreamUtils.h"
 #include "nsThreadUtils.h"
 #include "nsProxyRelease.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsIAsyncVerifyRedirectCallback.h"
 
 using namespace mozilla::ipc;
@@ -48,7 +48,7 @@
 extern PRLogModuleInfo *gOfflineCacheUpdateLog;
 
 #undef LOG
-#define LOG(args) PR_LOG(gOfflineCacheUpdateLog, 4, args)
+#define LOG(args) MOZ_LOG(gOfflineCacheUpdateLog, 4, args)
 
 #undef LOG_ENABLED
 #define LOG_ENABLED() PR_LOG_TEST(gOfflineCacheUpdateLog, 4)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/uriloader/prefetch/OfflineCacheUpdateGlue.cpp firefox-trunk-41.0~a1~hg20150524r245419/uriloader/prefetch/OfflineCacheUpdateGlue.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/uriloader/prefetch/OfflineCacheUpdateGlue.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/uriloader/prefetch/OfflineCacheUpdateGlue.cpp	2015-05-25 20:44:06.000000000 +0000
@@ -12,7 +12,7 @@
 #include "nsIApplicationCacheContainer.h"
 #include "nsIChannel.h"
 #include "nsIDocument.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 //
 // To enable logging (see prlog.h for full details):
@@ -26,7 +26,7 @@
 extern PRLogModuleInfo *gOfflineCacheUpdateLog;
 
 #undef LOG
-#define LOG(args) PR_LOG(gOfflineCacheUpdateLog, 4, args)
+#define LOG(args) MOZ_LOG(gOfflineCacheUpdateLog, 4, args)
 
 #undef LOG_ENABLED
 #define LOG_ENABLED() PR_LOG_TEST(gOfflineCacheUpdateLog, 4)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/uriloader/prefetch/OfflineCacheUpdateParent.cpp firefox-trunk-41.0~a1~hg20150524r245419/uriloader/prefetch/OfflineCacheUpdateParent.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/uriloader/prefetch/OfflineCacheUpdateParent.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/uriloader/prefetch/OfflineCacheUpdateParent.cpp	2015-05-25 20:44:06.000000000 +0000
@@ -29,7 +29,7 @@
 extern PRLogModuleInfo *gOfflineCacheUpdateLog;
 
 #undef LOG
-#define LOG(args) PR_LOG(gOfflineCacheUpdateLog, 4, args)
+#define LOG(args) MOZ_LOG(gOfflineCacheUpdateLog, 4, args)
 
 #undef LOG_ENABLED
 #define LOG_ENABLED() PR_LOG_TEST(gOfflineCacheUpdateLog, 4)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/webapprt/content/downloads/downloads.js firefox-trunk-41.0~a1~hg20150524r245419/webapprt/content/downloads/downloads.js
--- firefox-trunk-41.0~a1~hg20150513r243603/webapprt/content/downloads/downloads.js	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/webapprt/content/downloads/downloads.js	2015-05-25 20:44:06.000000000 +0000
@@ -570,7 +570,7 @@
       case "cmd_copyLocation":
         let clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].
                         getService(Ci.nsIClipboardHelper);
-        clipboard.copyString(this.uri, document);
+        clipboard.copyString(this.uri);
         break;
     }
   },
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/webapprt/locales/en-US/webapprt/overrides/dom.properties firefox-trunk-41.0~a1~hg20150524r245419/webapprt/locales/en-US/webapprt/overrides/dom.properties
--- firefox-trunk-41.0~a1~hg20150513r243603/webapprt/locales/en-US/webapprt/overrides/dom.properties	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/webapprt/locales/en-US/webapprt/overrides/dom.properties	2015-05-25 20:44:06.000000000 +0000
@@ -79,7 +79,6 @@
 FullScreenDeniedSubDocFullScreen=Request for full-screen was denied because a subdocument of the document requesting full-screen is already full-screen.
 FullScreenDeniedNotDescendant=Request for full-screen was denied because requesting element is not a descendant of the current full-screen element.
 FullScreenDeniedNotFocusedTab=Request for full-screen was denied because requesting element is not in the currently focused tab.
-FullScreenDeniedContentOnly=Request for full-screen was denied because requesting element is in the chrome document and the fullscreen API is configured for content only.
 RemovedFullScreenElement=Exited full-screen because full-screen element was removed from document.
 FocusedWindowedPluginWhileFullScreen=Exited full-screen because windowed plugin was focused.
 HTMLSyncXHRWarning=HTML parsing in XMLHttpRequest is not supported in the synchronous mode.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/android/NativeJSContainer.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/android/NativeJSContainer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/android/NativeJSContainer.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/android/NativeJSContainer.cpp	2015-05-25 20:44:07.000000000 +0000
@@ -1000,7 +1000,7 @@
 
     if (!object ||
         !CheckJSCall(env,
-            JS_Stringify(cx, &value, JS::NullPtr(), JS::NullHandleValue, AppendJSON, &json))) {
+            JS_Stringify(cx, &value, nullptr, JS::NullHandleValue, AppendJSON, &json))) {
         return nullptr;
     }
     jstring ret = env->NewString(reinterpret_cast<const jchar*>(json.get()), json.Length());
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/android/nsAppShell.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/android/nsAppShell.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/android/nsAppShell.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/android/nsAppShell.cpp	2015-05-25 20:44:07.000000000 +0000
@@ -52,7 +52,7 @@
 #endif
 
 #ifdef MOZ_LOGGING
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #endif
 
 #ifdef DEBUG_ANDROID_EVENTS
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/cocoa/NativeKeyBindings.mm firefox-trunk-41.0~a1~hg20150524r245419/widget/cocoa/NativeKeyBindings.mm
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/cocoa/NativeKeyBindings.mm	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/cocoa/NativeKeyBindings.mm	2015-05-25 20:44:07.000000000 +0000
@@ -7,7 +7,7 @@
 
 #include "nsTArray.h"
 #include "nsCocoaUtils.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "mozilla/TextEvents.h"
 
 namespace mozilla {
@@ -67,7 +67,7 @@
     gNativeKeyBindingsLog = PR_NewLogModule("NativeKeyBindings");
   }
 
-  PR_LOG(gNativeKeyBindingsLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gNativeKeyBindingsLog, PR_LOG_ALWAYS,
     ("%p NativeKeyBindings::Init", this));
 
   // Many selectors have a one-to-one mapping to a Gecko command. Those mappings
@@ -203,7 +203,7 @@
                            DoCommandCallback aCallback,
                            void* aCallbackData)
 {
-  PR_LOG(gNativeKeyBindingsLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gNativeKeyBindingsLog, PR_LOG_ALWAYS,
     ("%p NativeKeyBindings::KeyPress", this));
 
   // Recover the current event, which should always be the key down we are
@@ -212,19 +212,19 @@
   NSEvent* cocoaEvent = reinterpret_cast<NSEvent*>(aEvent.mNativeKeyEvent);
 
   if (!cocoaEvent || [cocoaEvent type] != NSKeyDown) {
-    PR_LOG(gNativeKeyBindingsLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gNativeKeyBindingsLog, PR_LOG_ALWAYS,
       ("%p NativeKeyBindings::KeyPress, no Cocoa key down event", this));
 
     return false;
   }
 
-  PR_LOG(gNativeKeyBindingsLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gNativeKeyBindingsLog, PR_LOG_ALWAYS,
     ("%p NativeKeyBindings::KeyPress, interpreting", this));
 
   nsAutoTArray<KeyBindingsCommand, 2> bindingCommands;
   nsCocoaUtils::GetCommandsFromKeyEvent(cocoaEvent, bindingCommands);
 
-  PR_LOG(gNativeKeyBindingsLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gNativeKeyBindingsLog, PR_LOG_ALWAYS,
     ("%p NativeKeyBindings::KeyPress, bindingCommands=%u",
      this, bindingCommands.Length()));
 
@@ -238,7 +238,7 @@
       nsAutoString nsSelectorString;
       nsCocoaUtils::GetStringForNSString(selectorString, nsSelectorString);
 
-      PR_LOG(gNativeKeyBindingsLog, PR_LOG_ALWAYS,
+      MOZ_LOG(gNativeKeyBindingsLog, PR_LOG_ALWAYS,
         ("%p NativeKeyBindings::KeyPress, selector=%s",
          this, NS_LossyConvertUTF16toASCII(nsSelectorString).get()));
     }
@@ -265,7 +265,7 @@
   }
 
   if (geckoCommands.IsEmpty()) {
-    PR_LOG(gNativeKeyBindingsLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gNativeKeyBindingsLog, PR_LOG_ALWAYS,
       ("%p NativeKeyBindings::KeyPress, handled=false", this));
 
     return false;
@@ -274,7 +274,7 @@
   for (uint32_t i = 0; i < geckoCommands.Length(); i++) {
     Command geckoCommand = geckoCommands[i];
 
-    PR_LOG(gNativeKeyBindingsLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gNativeKeyBindingsLog, PR_LOG_ALWAYS,
       ("%p NativeKeyBindings::KeyPress, command=%s",
        this, WidgetKeyboardEvent::GetCommandStr(geckoCommand)));
 
@@ -282,7 +282,7 @@
     aCallback(geckoCommand, aCallbackData);
   }
 
-  PR_LOG(gNativeKeyBindingsLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gNativeKeyBindingsLog, PR_LOG_ALWAYS,
     ("%p NativeKeyBindings::KeyPress, handled=true", this));
 
   return true;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/cocoa/nsChildView.mm firefox-trunk-41.0~a1~hg20150524r245419/widget/cocoa/nsChildView.mm
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/cocoa/nsChildView.mm	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/cocoa/nsChildView.mm	2015-05-25 20:44:07.000000000 +0000
@@ -5,7 +5,7 @@
 
 #include "mozilla/ArrayUtils.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include <unistd.h>
 #include <math.h>
@@ -2601,7 +2601,7 @@
     return nullptr;
   }
 
-  return drawTarget;
+  return drawTarget.forget();
 }
 
 void
@@ -2718,7 +2718,7 @@
   mInUpdate = true;
 
   RefPtr<gfx::DrawTarget> drawTarget = mUpdateDrawTarget;
-  return drawTarget;
+  return drawTarget.forget();
 }
 
 #define NSFoundationVersionWithProperStrideSupportForSubtextureUpload NSFoundationVersionNumber10_6_3
@@ -5618,7 +5618,7 @@
   if (!mGeckoChild)
     return NSDragOperationNone;
 
-  PR_LOG(sCocoaLog, PR_LOG_ALWAYS, ("ChildView doDragAction: entered\n"));
+  MOZ_LOG(sCocoaLog, PR_LOG_ALWAYS, ("ChildView doDragAction: entered\n"));
 
   if (!mDragService) {
     CallGetService(kDragServiceContractID, &mDragService);
@@ -5712,7 +5712,7 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
-  PR_LOG(sCocoaLog, PR_LOG_ALWAYS, ("ChildView draggingEntered: entered\n"));
+  MOZ_LOG(sCocoaLog, PR_LOG_ALWAYS, ("ChildView draggingEntered: entered\n"));
 
   // there should never be a globalDragPboard when "draggingEntered:" is
   // called, but just in case we'll take care of it here.
@@ -5730,14 +5730,14 @@
 
 - (NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender
 {
-  PR_LOG(sCocoaLog, PR_LOG_ALWAYS, ("ChildView draggingUpdated: entered\n"));
+  MOZ_LOG(sCocoaLog, PR_LOG_ALWAYS, ("ChildView draggingUpdated: entered\n"));
 
   return [self doDragAction:NS_DRAGDROP_OVER sender:sender];
 }
 
 - (void)draggingExited:(id <NSDraggingInfo>)sender
 {
-  PR_LOG(sCocoaLog, PR_LOG_ALWAYS, ("ChildView draggingExited: entered\n"));
+  MOZ_LOG(sCocoaLog, PR_LOG_ALWAYS, ("ChildView draggingExited: entered\n"));
 
   nsAutoRetainCocoaObject kungFuDeathGrip(self);
   [self doDragAction:NS_DRAGDROP_EXIT sender:sender];
@@ -5836,7 +5836,7 @@
 
   nsresult rv;
 
-  PR_LOG(sCocoaLog, PR_LOG_ALWAYS, ("ChildView namesOfPromisedFilesDroppedAtDestination: entering callback for promised files\n"));
+  MOZ_LOG(sCocoaLog, PR_LOG_ALWAYS, ("ChildView namesOfPromisedFilesDroppedAtDestination: entering callback for promised files\n"));
 
   nsCOMPtr<nsIFile> targFile;
   NS_NewLocalFile(EmptyString(), true, getter_AddRefs(targFile));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/cocoa/nsClipboard.mm firefox-trunk-41.0~a1~hg20150524r245419/widget/cocoa/nsClipboard.mm
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/cocoa/nsClipboard.mm	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/cocoa/nsClipboard.mm	2015-05-25 20:44:07.000000000 +0000
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "mozilla/unused.h"
 
@@ -418,7 +418,7 @@
     nsXPIDLCString flavorStr;
     currentFlavor->ToString(getter_Copies(flavorStr));
 
-    PR_LOG(sCocoaLog, PR_LOG_ALWAYS, ("writing out clipboard data of type %s (%d)\n", flavorStr.get(), i));
+    MOZ_LOG(sCocoaLog, PR_LOG_ALWAYS, ("writing out clipboard data of type %s (%d)\n", flavorStr.get(), i));
 
     NSString *pboardType = nil;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/cocoa/nsCocoaWindow.mm firefox-trunk-41.0~a1~hg20150524r245419/widget/cocoa/nsCocoaWindow.mm
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/cocoa/nsCocoaWindow.mm	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/cocoa/nsCocoaWindow.mm	2015-05-25 20:44:07.000000000 +0000
@@ -3279,10 +3279,12 @@
 
   mUnifiedToolbarHeight = aHeight;
 
-  // Redraw the title bar. If we're inside painting, we'll do it right now,
-  // otherwise we'll just invalidate it.
-  BOOL needSyncRedraw = ([NSView focusView] != nil);
-  [self setTitlebarNeedsDisplayInRect:[self titlebarRect] sync:needSyncRedraw];
+  if (![self drawsContentsIntoWindowFrame]) {
+    // Redraw the title bar. If we're inside painting, we'll do it right now,
+    // otherwise we'll just invalidate it.
+    BOOL needSyncRedraw = ([NSView focusView] != nil);
+    [self setTitlebarNeedsDisplayInRect:[self titlebarRect] sync:needSyncRedraw];
+  }
 }
 
 // Extending the content area into the title bar works by resizing the
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/cocoa/nsDragService.mm firefox-trunk-41.0~a1~hg20150524r245419/widget/cocoa/nsDragService.mm
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/cocoa/nsDragService.mm	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/cocoa/nsDragService.mm	2015-05-25 20:44:07.000000000 +0000
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "nsDragService.h"
 #include "nsObjCExceptions.h"
@@ -366,7 +366,7 @@
     nsXPIDLCString flavorStr;
     currentFlavor->ToString(getter_Copies(flavorStr));
 
-    PR_LOG(sCocoaLog, PR_LOG_ALWAYS, ("nsDragService::GetData: looking for clipboard data of type %s\n", flavorStr.get()));
+    MOZ_LOG(sCocoaLog, PR_LOG_ALWAYS, ("nsDragService::GetData: looking for clipboard data of type %s\n", flavorStr.get()));
 
     if (flavorStr.EqualsLiteral(kFileMime)) {
       NSArray* pFiles = [globalDragPboard propertyListForType:NSFilenamesPboardType];
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/cocoa/TextInputHandler.mm firefox-trunk-41.0~a1~hg20150524r245419/widget/cocoa/TextInputHandler.mm
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/cocoa/TextInputHandler.mm	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/cocoa/TextInputHandler.mm	2015-05-25 20:44:07.000000000 +0000
@@ -8,7 +8,7 @@
 
 #include "TextInputHandler.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "mozilla/MiscEvents.h"
 #include "mozilla/MouseEvents.h"
@@ -364,7 +364,7 @@
 
   const UCKeyboardLayout* UCKey = GetUCKeyboardLayout();
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p TISInputSourceWrapper::TranslateToString, aKeyCode=0x%X, "
      "aModifiers=0x%X, aKbType=0x%X UCKey=%p\n    "
      "Shift: %s, Ctrl: %s, Opt: %s, Cmd: %s, CapsLock: %s, NumLock: %s",
@@ -384,7 +384,7 @@
                                   aKbType, kUCKeyTranslateNoDeadKeysMask,
                                   &deadKeyState, 5, &len, chars);
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p TISInputSourceWrapper::TranslateToString, err=0x%X, len=%llu",
      this, err, len));
 
@@ -397,7 +397,7 @@
                "size of char16_t and size of UniChar are different");
   memcpy(aStr.BeginWriting(), chars, len * sizeof(char16_t));
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p TISInputSourceWrapper::TranslateToString, aStr=\"%s\"",
      this, NS_ConvertUTF16toUTF8(aStr).get()));
 
@@ -759,7 +759,7 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p TISInputSourceWrapper::InitKeyEvent, aNativeKeyEvent=%p, "
      "aKeyEvent.message=%s, aInsertString=%p, IsOpenedIMEMode()=%s",
      this, aNativeKeyEvent, GetGeckoKeyEventType(aKeyEvent), aInsertString,
@@ -942,7 +942,7 @@
   aKeyEvent.mIsRepeat =
     ([aNativeKeyEvent type] == NSKeyDown) ? [aNativeKeyEvent isARepeat] : false;
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p TISInputSourceWrapper::InitKeyEvent, "
      "shift=%s, ctrl=%s, alt=%s, meta=%s",
      this, OnOrOff(aKeyEvent.IsShift()), OnOrOff(aKeyEvent.IsControl()),
@@ -959,7 +959,7 @@
     aKeyEvent.charCode = 0;
     aKeyEvent.isChar = false; // XXX not used in XP level
 
-    PR_LOG(gLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gLog, PR_LOG_ALWAYS,
       ("%p TISInputSourceWrapper::InitKeyEvent, keyCode=0x%X charCode=0x0",
        this, aKeyEvent.keyCode));
   }
@@ -1047,7 +1047,7 @@
     NS_ConvertUTF16toUTF8 utf8Chars(chars);
     char16_t expectedChar = static_cast<char16_t>(aInsertChar);
     NS_ConvertUTF16toUTF8 utf8ExpectedChar(&expectedChar, 1);
-    PR_LOG(gLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gLog, PR_LOG_ALWAYS,
       ("%p TISInputSourceWrapper::InitKeyPressEvent, aNativeKeyEvent=%p, "
        "[aNativeKeyEvent characters]=\"%s\", aInsertChar=0x%X(%s), "
        "aKeyEvent.message=%s, aKbType=0x%X, IsOpenedIMEMode()=%s",
@@ -1062,7 +1062,7 @@
     aKeyEvent.keyCode = 0;
   }
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p TISInputSourceWrapper::InitKeyPressEvent, "
      "aKeyEvent.keyCode=0x%X, aKeyEvent.charCode=0x%X",
      this, aKeyEvent.keyCode, aKeyEvent.charCode));
@@ -1085,7 +1085,7 @@
     lockState |= kEventKeyModifierNumLockMask;
   }
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p TISInputSourceWrapper::InitKeyPressEvent, "
      "isRomanKeyboardLayout=%s, key=0x%X",
      this, TrueOrFalse(isRomanKeyboardLayout), aKbType, key));
@@ -1127,7 +1127,7 @@
     AlternativeCharCode altCharCodes(unshiftedChar, shiftedChar);
     aKeyEvent.alternativeCharCodes.AppendElement(altCharCodes);
   }
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p TISInputSourceWrapper::InitKeyPressEvent, "
      "aKeyEvent.isMeta=%s, isDvorakQWERTY=%s, "
      "unshiftedChar=U+%X, shiftedChar=U+%X",
@@ -1189,7 +1189,7 @@
     AlternativeCharCode altCharCodes(cmdedChar, cmdedShiftChar);
     aKeyEvent.alternativeCharCodes.AppendElement(altCharCodes);
   }
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p TISInputSourceWrapper::InitKeyPressEvent, "
      "hasCmdShiftOnlyChar=%s, isCmdSwitchLayout=%s, isDvorakQWERTY=%s, "
      "cmdedChar=U+%X, cmdedShiftChar=U+%X",
@@ -1201,7 +1201,7 @@
     AlternativeCharCode altCharCodes(0, originalCmdedShiftChar);
     aKeyEvent.alternativeCharCodes.AppendElement(altCharCodes);
   }
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p TISInputSourceWrapper::InitKeyPressEvent, "
      "hasCmdShiftOnlyChar=%s, originalCmdedShiftChar=U+%X",
      this, TrueOrFalse(hasCmdShiftOnlyChar), originalCmdedShiftChar));
@@ -1214,7 +1214,7 @@
                                            UInt32 aKbType,
                                            bool aCmdIsPressed)
 {
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p TISInputSourceWrapper::ComputeGeckoKeyCode, aNativeKeyCode=0x%X, "
      "aKbType=0x%X, aCmdIsPressed=%s, IsOpenedIMEMode()=%s, "
      "IsASCIICapable()=%s",
@@ -1445,7 +1445,7 @@
 {
   if (PR_LOG_TEST(gLog, PR_LOG_ALWAYS)) {
     CFArrayRef list = CreateAllKeyboardLayoutList();
-    PR_LOG(gLog, PR_LOG_ALWAYS, ("Keyboard layout configuration:"));
+    MOZ_LOG(gLog, PR_LOG_ALWAYS, ("Keyboard layout configuration:"));
     CFIndex idx = ::CFArrayGetCount(list);
     TISInputSourceWrapper tis;
     for (CFIndex i = 0; i < idx; ++i) {
@@ -1455,7 +1455,7 @@
       nsAutoString name, isid;
       tis.GetLocalizedName(name);
       tis.GetInputSourceID(isid);
-      PR_LOG(gLog, PR_LOG_ALWAYS,
+      MOZ_LOG(gLog, PR_LOG_ALWAYS,
              ("  %s\t<%s>%s%s\n",
               NS_ConvertUTF16toUTF8(name).get(),
               NS_ConvertUTF16toUTF8(isid).get(),
@@ -1496,13 +1496,13 @@
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
   if (Destroyed()) {
-    PR_LOG(gLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gLog, PR_LOG_ALWAYS,
       ("%p TextInputHandler::HandleKeyDownEvent, "
        "widget has been already destroyed", this));
     return false;
   }
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p TextInputHandler::HandleKeyDownEvent, aNativeEvent=%p, "
      "type=%s, keyCode=%lld (0x%X), modifierFlags=0x%X, characters=\"%s\", "
      "charactersIgnoringModifiers=\"%s\"",
@@ -1537,7 +1537,7 @@
 
     currentKeyEvent->mKeyDownHandled = DispatchEvent(keydownEvent);
     if (Destroyed()) {
-      PR_LOG(gLog, PR_LOG_ALWAYS,
+      MOZ_LOG(gLog, PR_LOG_ALWAYS,
         ("%p TextInputHandler::HandleKeyDownEvent, "
          "widget was destroyed by keydown event", this));
       return currentKeyEvent->IsDefaultPrevented();
@@ -1547,14 +1547,14 @@
     // case we should not fire the key press.
     // XXX This is a special code only on Cocoa widget, why is this needed?
     if (firstResponder != [[mView window] firstResponder]) {
-      PR_LOG(gLog, PR_LOG_ALWAYS,
+      MOZ_LOG(gLog, PR_LOG_ALWAYS,
         ("%p TextInputHandler::HandleKeyDownEvent, "
          "view lost focus by keydown event", this));
       return currentKeyEvent->IsDefaultPrevented();
     }
 
     if (currentKeyEvent->IsDefaultPrevented()) {
-      PR_LOG(gLog, PR_LOG_ALWAYS,
+      MOZ_LOG(gLog, PR_LOG_ALWAYS,
         ("%p TextInputHandler::HandleKeyDownEvent, "
          "keydown event's default is prevented", this));
       return true;
@@ -1573,24 +1573,24 @@
   bool wasComposing = IsIMEComposing();
   bool interpretKeyEventsCalled = false;
   if (IsIMEEnabled() || IsASCIICapableOnly()) {
-    PR_LOG(gLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gLog, PR_LOG_ALWAYS,
       ("%p TextInputHandler::HandleKeyDownEvent, calling interpretKeyEvents",
        this));
     [mView interpretKeyEvents:[NSArray arrayWithObject:aNativeEvent]];
     interpretKeyEventsCalled = true;
-    PR_LOG(gLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gLog, PR_LOG_ALWAYS,
       ("%p TextInputHandler::HandleKeyDownEvent, called interpretKeyEvents",
        this));
   }
 
   if (Destroyed()) {
-    PR_LOG(gLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gLog, PR_LOG_ALWAYS,
       ("%p TextInputHandler::HandleKeyDownEvent, widget was destroyed",
        this));
     return currentKeyEvent->IsDefaultPrevented();
   }
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p TextInputHandler::HandleKeyDownEvent, wasComposing=%s, "
      "IsIMEComposing()=%s",
      this, TrueOrFalse(wasComposing), TrueOrFalse(IsIMEComposing())));
@@ -1615,7 +1615,7 @@
           IsNormalCharInputtingEvent(keypressEvent))) {
       currentKeyEvent->mKeyPressHandled = DispatchEvent(keypressEvent);
       currentKeyEvent->mKeyPressDispatched = true;
-      PR_LOG(gLog, PR_LOG_ALWAYS,
+      MOZ_LOG(gLog, PR_LOG_ALWAYS,
         ("%p TextInputHandler::HandleKeyDownEvent, keypress event dispatched",
          this));
     }
@@ -1623,7 +1623,7 @@
 
   // Note: mWidget might have become null here. Don't count on it from here on.
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p TextInputHandler::HandleKeyDownEvent, "
      "keydown handled=%s, keypress handled=%s, causedOtherKeyEvents=%s",
      this, TrueOrFalse(currentKeyEvent->mKeyDownHandled),
@@ -1639,7 +1639,7 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p TextInputHandler::HandleKeyUpEvent, aNativeEvent=%p, "
      "type=%s, keyCode=%lld (0x%X), modifierFlags=0x%X, characters=\"%s\", "
      "charactersIgnoringModifiers=\"%s\", "
@@ -1651,7 +1651,7 @@
      TrueOrFalse(IsIMEComposing())));
 
   if (Destroyed()) {
-    PR_LOG(gLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gLog, PR_LOG_ALWAYS,
       ("%p TextInputHandler::HandleKeyUpEvent, "
        "widget has been already destroyed", this));
     return;
@@ -1676,7 +1676,7 @@
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
   if (Destroyed()) {
-    PR_LOG(gLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gLog, PR_LOG_ALWAYS,
       ("%p TextInputHandler::HandleFlagsChanged, "
        "widget has been already destroyed", this));
     return;
@@ -1684,7 +1684,7 @@
 
   nsRefPtr<nsChildView> kungFuDeathGrip(mWidget);
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p TextInputHandler::HandleFlagsChanged, aNativeEvent=%p, "
      "type=%s, keyCode=%s (0x%X), modifierFlags=0x%08X, "
      "sLastModifierState=0x%08X, IsIMEComposing()=%s",
@@ -1995,7 +1995,7 @@
     return;
   }
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p TextInputHandler::DispatchKeyEventForFlagsChanged, aNativeEvent=%p, "
      "type=%s, keyCode=%s (0x%X), aDispatchKeyDown=%s, IsIMEComposing()=%s",
      this, aNativeEvent, GetNativeKeyEventType(aNativeEvent),
@@ -2039,7 +2039,7 @@
 
   KeyEventState* currentKeyEvent = GetCurrentKeyEvent();
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p TextInputHandler::InsertText, aAttrString=\"%s\", "
      "aReplacementRange=%p { location=%llu, length=%llu }, "
      "IsIMEComposing()=%s, IgnoreIMEComposition()=%s, "
@@ -2180,7 +2180,7 @@
 
   KeyEventState* currentKeyEvent = GetCurrentKeyEvent();
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p TextInputHandler::DoCommandBySelector, aSelector=\"%s\", "
      "Destroyed()=%s, keydownHandled=%s, keypressHandled=%s, "
      "causedOtherKeyEvents=%s",
@@ -2197,7 +2197,7 @@
     InitKeyEvent(currentKeyEvent->mKeyEvent, keypressEvent);
     currentKeyEvent->mKeyPressHandled = DispatchEvent(keypressEvent);
     currentKeyEvent->mKeyPressDispatched = true;
-    PR_LOG(gLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gLog, PR_LOG_ALWAYS,
       ("%p TextInputHandler::DoCommandBySelector, keypress event "
        "dispatched, Destroyed()=%s, keypressHandled=%s",
        this, TrueOrFalse(Destroyed()),
@@ -2285,7 +2285,7 @@
       tis.GetPrimaryLanguage(lang0);
       tis.GetBundleID(bundleID0);
 
-      PR_LOG(gLog, PR_LOG_ALWAYS,
+      MOZ_LOG(gLog, PR_LOG_ALWAYS,
         ("IMEInputHandler::OnCurrentTextInputSourceChange,\n"
          "  Current Input Source is changed to:\n"
          "    currentInputContext=%p\n"
@@ -2350,7 +2350,7 @@
 {
   if (PR_LOG_TEST(gLog, PR_LOG_ALWAYS)) {
     CFArrayRef list = CreateAllIMEModeList();
-    PR_LOG(gLog, PR_LOG_ALWAYS, ("IME mode configuration:"));
+    MOZ_LOG(gLog, PR_LOG_ALWAYS, ("IME mode configuration:"));
     CFIndex idx = ::CFArrayGetCount(list);
     TISInputSourceWrapper tis;
     for (CFIndex i = 0; i < idx; ++i) {
@@ -2360,7 +2360,7 @@
       nsAutoString name, isid;
       tis.GetLocalizedName(name);
       tis.GetInputSourceID(isid);
-      PR_LOG(gLog, PR_LOG_ALWAYS,
+      MOZ_LOG(gLog, PR_LOG_ALWAYS,
              ("  %s\t<%s>%s%s\n",
               NS_ConvertUTF16toUTF8(name).get(),
               NS_ConvertUTF16toUTF8(isid).get(),
@@ -2404,7 +2404,7 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::NotifyIMEOfFocusChangeInGecko, "
      "Destroyed()=%s, IsFocused()=%s, inputContext=%p",
      this, TrueOrFalse(Destroyed()), TrueOrFalse(IsFocused()),
@@ -2443,7 +2443,7 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::DiscardIMEComposition, "
      "Destroyed()=%s, IsFocused()=%s, mView=%p, inputContext=%p",
      this, TrueOrFalse(Destroyed()), TrueOrFalse(IsFocused()),
@@ -2474,7 +2474,7 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::SyncASCIICapableOnly, "
      "Destroyed()=%s, IsFocused()=%s, mIsASCIICapableOnly=%s, "
      "GetCurrentTSMDocumentID()=%p",
@@ -2577,7 +2577,7 @@
 IMEInputHandler::ConvertToTextRangeType(uint32_t aUnderlineStyle,
                                         NSRange& aSelectedRange)
 {
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::ConvertToTextRangeType, "
      "aUnderlineStyle=%llu, aSelectedRange.length=%llu,",
      this, aUnderlineStyle, aSelectedRange.length));
@@ -2630,7 +2630,7 @@
     count++;
   }
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::GetRangeCount, aAttrString=\"%s\", count=%llu",
      this, GetCharacters([aAttrString string]), count));
 
@@ -2667,7 +2667,7 @@
       ConvertToTextRangeType([attributeValue intValue], aSelectedRange);
     textRangeArray->AppendElement(range);
 
-    PR_LOG(gLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gLog, PR_LOG_ALWAYS,
       ("%p IMEInputHandler::CreateTextRangeArray, "
        "range={ mStartOffset=%llu, mEndOffset=%llu, mRangeType=%s }",
        this, range.mStartOffset, range.mEndOffset,
@@ -2685,7 +2685,7 @@
   range.mRangeType = NS_TEXTRANGE_CARETPOSITION;
   textRangeArray->AppendElement(range);
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::CreateTextRangeArray, "
      "range={ mStartOffset=%llu, mEndOffset=%llu, mRangeType=%s }",
      this, range.mStartOffset, range.mEndOffset,
@@ -2701,7 +2701,7 @@
                                                 NSAttributedString* aAttrString,
                                                 NSRange& aSelectedRange)
 {
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::DispatchCompositionChangeEvent, "
      "aText=\"%s\", aAttrString=\"%s\", "
      "aSelectedRange={ location=%llu, length=%llu }, "
@@ -2727,7 +2727,7 @@
 bool
 IMEInputHandler::DispatchCompositionCommitEvent(const nsAString* aCommitString)
 {
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::DispatchCompositionCommitEvent, "
      "aCommitString=0x%p (\"%s\"), Destroyed()=%s",
      this, aCommitString,
@@ -2763,7 +2763,7 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::InsertTextAsCommittingComposition, "
      "aAttrString=\"%s\", aReplacementRange=%p { location=%llu, length=%llu }, "
      "Destroyed()=%s, IsIMEComposing()=%s, "
@@ -2790,7 +2790,7 @@
       !NSEqualRanges(MarkedRange(), *aReplacementRange)) {
     DispatchCompositionCommitEvent();
     if (Destroyed()) {
-      PR_LOG(gLog, PR_LOG_ALWAYS,
+      MOZ_LOG(gLog, PR_LOG_ALWAYS,
         ("%p IMEInputHandler::InsertTextAsCommittingComposition, "
          "destroyed by commiting composition for setting replacement range",
          this));
@@ -2819,7 +2819,7 @@
 
     DispatchEvent(compStart);
     if (Destroyed()) {
-      PR_LOG(gLog, PR_LOG_ALWAYS,
+      MOZ_LOG(gLog, PR_LOG_ALWAYS,
         ("%p IMEInputHandler::InsertTextAsCommittingComposition, "
          "destroyed by compositionstart event", this));
       return;
@@ -2830,7 +2830,7 @@
 
   DispatchCompositionCommitEvent(&str);
   if (Destroyed()) {
-    PR_LOG(gLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gLog, PR_LOG_ALWAYS,
       ("%p IMEInputHandler::InsertTextAsCommittingComposition, "
        "destroyed by compositioncommit event", this));
     return;
@@ -2850,7 +2850,7 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::SetMarkedText, "
      "aAttrString=\"%s\", aSelectedRange={ location=%llu, length=%llu }, "
      "aReplacementRange=%p { location=%llu, length=%llu }, "
@@ -2880,7 +2880,7 @@
     DispatchCompositionCommitEvent();
     mIgnoreIMECommit = ignoreIMECommit;
     if (Destroyed()) {
-      PR_LOG(gLog, PR_LOG_ALWAYS,
+      MOZ_LOG(gLog, PR_LOG_ALWAYS,
         ("%p IMEInputHandler::SetMarkedText, "
          "destroyed by commiting composition for setting replacement range",
          this));
@@ -2909,7 +2909,7 @@
 
     DispatchEvent(compStart);
     if (Destroyed()) {
-      PR_LOG(gLog, PR_LOG_ALWAYS,
+      MOZ_LOG(gLog, PR_LOG_ALWAYS,
         ("%p IMEInputHandler::SetMarkedText, "
          "destroyed by compositionstart event", this));
       return;
@@ -2927,7 +2927,7 @@
 
     DispatchCompositionChangeEvent(str, aAttrString, aSelectedRange);
     if (Destroyed()) {
-      PR_LOG(gLog, PR_LOG_ALWAYS,
+      MOZ_LOG(gLog, PR_LOG_ALWAYS,
         ("%p IMEInputHandler::SetMarkedText, "
          "destroyed by compositionchange event", this));
     }
@@ -2938,7 +2938,7 @@
   // current composition.
   DispatchCompositionCommitEvent(&EmptyString());
   if (Destroyed()) {
-    PR_LOG(gLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gLog, PR_LOG_ALWAYS,
       ("%p IMEInputHandler::SetMarkedText, "
        "destroyed by compositioncommit event", this));
     return;
@@ -2951,7 +2951,7 @@
 NSInteger
 IMEInputHandler::ConversationIdentifier()
 {
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::ConversationIdentifier, Destroyed()=%s",
      this, TrueOrFalse(Destroyed())));
 
@@ -2966,7 +2966,7 @@
   textContent.InitForQueryTextContent(0, 0);
   DispatchEvent(textContent);
   if (!textContent.mSucceeded) {
-    PR_LOG(gLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gLog, PR_LOG_ALWAYS,
       ("%p IMEInputHandler::ConversationIdentifier, Failed", this));
     return reinterpret_cast<NSInteger>(mView);
   }
@@ -2981,7 +2981,7 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::GetAttributedSubstringFromRange, "
      "aRange={ location=%llu, length=%llu }, aActualRange=%p, Destroyed()=%s",
      this, aRange.location, aRange.length, aActualRange,
@@ -3003,7 +3003,7 @@
   textContent.RequestFontRanges();
   DispatchEvent(textContent);
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::GetAttributedSubstringFromRange, "
      "textContent={ mSucceeded=%s, mReply={ mString=\"%s\", mOffset=%llu } }",
      this, TrueOrFalse(textContent.mSucceeded),
@@ -3047,7 +3047,7 @@
 bool
 IMEInputHandler::HasMarkedText()
 {
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::HasMarkedText, "
      "mMarkedRange={ location=%llu, length=%llu }",
      this, mMarkedRange.location, mMarkedRange.length));
@@ -3058,7 +3058,7 @@
 NSRange
 IMEInputHandler::MarkedRange()
 {
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::MarkedRange, "
      "mMarkedRange={ location=%llu, length=%llu }",
      this, mMarkedRange.location, mMarkedRange.length));
@@ -3074,7 +3074,7 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::SelectedRange, Destroyed()=%s, mSelectedRange={ "
      "location=%llu, length=%llu }",
      this, TrueOrFalse(Destroyed()), mSelectedRange.location,
@@ -3094,7 +3094,7 @@
   WidgetQueryContentEvent selection(true, NS_QUERY_SELECTED_TEXT, mWidget);
   DispatchEvent(selection);
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::SelectedRange, selection={ mSucceeded=%s, "
      "mReply={ mOffset=%llu, mString.Length()=%llu } }",
      this, TrueOrFalse(selection.mSucceeded), selection.mReply.mOffset,
@@ -3156,7 +3156,7 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::FirstRectForCharacterRange, Destroyed()=%s, "
      "aRange={ location=%llu, length=%llu }, aActualRange=%p }",
      this, TrueOrFalse(Destroyed()), aRange.location, aRange.length,
@@ -3224,7 +3224,7 @@
     *aActualRange = actualRange;
   }
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::FirstRectForCharacterRange, "
      "useCaretRect=%s rect={ x=%f, y=%f, width=%f, height=%f }, "
      "actualRange={ location=%llu, length=%llu }",
@@ -3242,7 +3242,7 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::CharacterIndexForPoint, aPoint={ x=%f, y=%f }",
      this, aPoint.x, aPoint.y));
 
@@ -3275,7 +3275,7 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::GetValidAttributesForMarkedText", this));
 
   //nsRefPtr<IMEInputHandler> kungFuDeathGrip(this);
@@ -3330,7 +3330,7 @@
 void
 IMEInputHandler::OnFocusChangeInGecko(bool aFocus)
 {
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::OnFocusChangeInGecko, aFocus=%s, Destroyed()=%s, "
      "sFocusedIMEHandler=%p",
      this, TrueOrFalse(aFocus), TrueOrFalse(Destroyed()), sFocusedIMEHandler));
@@ -3358,7 +3358,7 @@
 bool
 IMEInputHandler::OnDestroyWidget(nsChildView* aDestroyingWidget)
 {
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::OnDestroyWidget, aDestroyingWidget=%p, "
      "sFocusedIMEHandler=%p, IsIMEComposing()=%s",
      this, aDestroyingWidget, sFocusedIMEHandler,
@@ -3391,7 +3391,7 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::OnStartIMEComposition, mView=%p, mWidget=%p"
      "inputContext=%p, mIsIMEComposing=%s",
      this, mView, mWidget, mView ? [mView inputContext] : nullptr,
@@ -3408,7 +3408,7 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::OnUpdateIMEComposition, mView=%p, mWidget=%p, "
      "inputContext=%p, mIsIMEComposing=%s, aIMECompositionString=\"%s\"",
      this, mView, mWidget, mView ? [mView inputContext] : nullptr,
@@ -3428,7 +3428,7 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::OnEndIMEComposition, mView=%p, mWidget=%p, "
      "inputContext=%p, mIsIMEComposing=%s",
      this, mView, mWidget, mView ? [mView inputContext] : nullptr,
@@ -3451,7 +3451,7 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::SendCommittedText, mView=%p, mWidget=%p, "
      "inputContext=%p, mIsIMEComposing=%s",
      this, mView, mWidget, mView ? [mView inputContext] : nullptr,
@@ -3476,7 +3476,7 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::KillIMEComposition, mView=%p, mWidget=%p, "
      "inputContext=%p, mIsIMEComposing=%s, "
      "Destroyed()=%s, IsFocused()=%s",
@@ -3496,7 +3496,7 @@
     return;
   }
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::KillIMEComposition, Pending...", this));
 
   // Commit the composition internally.
@@ -3516,7 +3516,7 @@
   if (!IsIMEComposing())
     return;
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::CommitIMEComposition, mIMECompositionString=%s",
      this, GetCharacters(mIMECompositionString)));
 
@@ -3540,7 +3540,7 @@
   if (!IsIMEComposing())
     return;
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::CancelIMEComposition, mIMECompositionString=%s",
      this, GetCharacters(mIMECompositionString)));
 
@@ -3654,12 +3654,12 @@
 void
 IMEInputHandler::OpenSystemPreferredLanguageIME()
 {
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::OpenSystemPreferredLanguageIME", this));
 
   CFArrayRef langList = ::CFLocaleCopyPreferredLanguages();
   if (!langList) {
-    PR_LOG(gLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gLog, PR_LOG_ALWAYS,
       ("%p IMEInputHandler::OpenSystemPreferredLanguageIME, langList is NULL",
        this));
     return;
@@ -3684,7 +3684,7 @@
         if (PR_LOG_TEST(gLog, PR_LOG_ALWAYS)) {
           CFStringRef foundTIS;
           tis.GetInputSourceID(foundTIS);
-          PR_LOG(gLog, PR_LOG_ALWAYS,
+          MOZ_LOG(gLog, PR_LOG_ALWAYS,
             ("%p IMEInputHandler::OpenSystemPreferredLanguageIME, "
              "foundTIS=%s, lang=%s",
              this, GetCharacters(foundTIS), GetCharacters(lang)));
@@ -3732,7 +3732,7 @@
 bool
 TextInputHandlerBase::OnDestroyWidget(nsChildView* aDestroyingWidget)
 {
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p TextInputHandlerBase::OnDestroyWidget, "
      "aDestroyingWidget=%p, mWidget=%p",
      this, aDestroyingWidget, mWidget));
@@ -3751,7 +3751,7 @@
   if (aEvent.message == NS_KEY_PRESS) {
     WidgetInputEvent& inputEvent = *aEvent.AsInputEvent();
     if (!inputEvent.IsMeta()) {
-      PR_LOG(gLog, PR_LOG_ALWAYS,
+      MOZ_LOG(gLog, PR_LOG_ALWAYS,
         ("%p TextInputHandlerBase::DispatchEvent, hiding mouse cursor", this));
       [NSCursor setHiddenUntilMouseMoves:YES];
     }
@@ -3849,7 +3849,7 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p TextInputHandlerBase::GetWindowLevel, Destryoed()=%s",
      this, TrueOrFalse(Destroyed())));
 
@@ -3864,7 +3864,7 @@
   NS_ENSURE_TRUE(editorView, NSNormalWindowLevel);
   NSInteger windowLevel = [[editorView window] level];
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p TextInputHandlerBase::GetWindowLevel, windowLevel=%s (%X)",
      this, GetWindowLevelName(windowLevel), windowLevel));
 
@@ -3884,7 +3884,7 @@
     return NS_OK;
   }
 
-  PR_LOG(gLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gLog, PR_LOG_ALWAYS,
     ("%p TextInputHandlerBase::AttachNativeKeyEvent, key=0x%X, char=0x%X, "
      "mod=0x%X", this, aKeyEvent.keyCode, aKeyEvent.charCode,
      aKeyEvent.modifiers));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/EventForwards.h firefox-trunk-41.0~a1~hg20150524r245419/widget/EventForwards.h
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/EventForwards.h	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/EventForwards.h	2015-05-25 20:44:06.000000000 +0000
@@ -23,7 +23,9 @@
   // The event is consumed, don't do default processing
   nsEventStatus_eConsumeNoDefault,
   // The event is consumed, but do default processing
-  nsEventStatus_eConsumeDoDefault
+  nsEventStatus_eConsumeDoDefault,
+  // Value is not for use, only for serialization
+  nsEventStatus_eSentinel
 };
 
 namespace mozilla {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/GfxInfoBase.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/GfxInfoBase.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/GfxInfoBase.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/GfxInfoBase.cpp	2015-05-25 20:44:06.000000000 +0000
@@ -16,6 +16,7 @@
 #include "nsAutoPtr.h"
 #include "nsString.h"
 #include "nsUnicharUtils.h"
+#include "nsVersionComparator.h"
 #include "mozilla/Services.h"
 #include "mozilla/Observer.h"
 #include "nsIObserver.h"
@@ -26,6 +27,7 @@
 #include "nsIDOMNodeList.h"
 #include "nsTArray.h"
 #include "nsXULAppAPI.h"
+#include "nsIXULAppInfo.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/gfx/2D.h"
@@ -144,6 +146,9 @@
     case nsIGfxInfo::FEATURE_STAGEFRIGHT:
       name = BLACKLIST_PREF_BRANCH "stagefright";
       break;
+    case nsIGfxInfo::FEATURE_WEBRTC_HW_ACCELERATION:
+      name = BLACKLIST_PREF_BRANCH "webrtc.hw.acceleration";
+      break;
     default:
       break;
   };
@@ -217,6 +222,29 @@
   return true;
 }
 
+// <foo attr=Hello/> finds "Hello" if the aAttrName is "attr".
+static bool
+BlacklistAttrToTextValue(nsIDOMNode *aBlacklistNode,
+                         const nsAString& aAttrName,
+                         nsAString& aValue)
+{
+  nsCOMPtr<nsIDOMElement> element = do_QueryInterface(aBlacklistNode);
+  if (!element) {
+    return false;
+  }
+
+  nsAutoString value;
+  if (NS_FAILED(element->GetAttribute(aAttrName, value))) {
+    return false;
+  }
+
+  value.Trim(" \t\r\n");
+  aValue = value;
+
+  return true;
+}
+
+
 static OperatingSystem
 BlacklistOSToOperatingSystem(const nsAString& os)
 {
@@ -283,6 +311,7 @@
 static int32_t
 BlacklistFeatureToGfxFeature(const nsAString& aFeature)
 {
+  MOZ_ASSERT(!aFeature.IsEmpty());
   if (aFeature.EqualsLiteral("DIRECT2D"))
     return nsIGfxInfo::FEATURE_DIRECT2D;
   else if (aFeature.EqualsLiteral("DIRECT3D_9_LAYERS"))
@@ -307,7 +336,15 @@
     return nsIGfxInfo::FEATURE_WEBGL_MSAA;
   else if (aFeature.EqualsLiteral("STAGEFRIGHT"))
     return nsIGfxInfo::FEATURE_STAGEFRIGHT;
-  return 0;
+  else if (aFeature.EqualsLiteral("WEBRTC_HW_ACCELERATION"))
+    return nsIGfxInfo::FEATURE_WEBRTC_HW_ACCELERATION;
+
+  // If we don't recognize the feature, it may be new, and something
+  // this version doesn't understand.  So, nothing to do.  This is
+  // different from feature not being specified at all, in which case
+  // this method should not get called and we should continue with the
+  // "all features" blocklisting.
+  return -1;
 }
 
 static int32_t
@@ -408,6 +445,42 @@
   nsCOMPtr<nsIDOMNode> dataNode;
   nsAutoString dataValue;
 
+  // If we get an application version to be zero, something is not working
+  // and we are not going to bother checking the blocklist versions.
+  // See TestGfxWidgets.cpp for how version comparison works.
+  // <versionRange minVersion="42.0a1" maxVersion="45.0"></versionRange>
+  static mozilla::Version zeroV("0");
+  static mozilla::Version appV(GfxInfoBase::GetApplicationVersion().get());
+  if (appV <= zeroV) {
+      gfxCriticalErrorOnce(gfxCriticalError::DefaultOptions(false)) << "Invalid application version " << GfxInfoBase::GetApplicationVersion().get();
+  } else if (BlacklistNodeGetChildByName(element,
+                                         NS_LITERAL_STRING("versionRange"),
+                                         getter_AddRefs(dataNode))) {
+    if (BlacklistAttrToTextValue(dataNode,
+                                 NS_LITERAL_STRING("minVersion"),
+                                 dataValue)) {
+      mozilla::Version minV(NS_ConvertUTF16toUTF8(dataValue).get());
+      if (minV > zeroV && appV < minV) {
+        // The version of the application is less than the minimal version
+        // this blocklist entry applies to, so we can just ignore it by
+        // returning false and letting the caller deal with it.
+        return false;
+      }
+    }
+
+    if (BlacklistAttrToTextValue(dataNode,
+                                 NS_LITERAL_STRING("maxVersion"),
+                                 dataValue)) {
+      mozilla::Version maxV(NS_ConvertUTF16toUTF8(dataValue).get());
+      if (maxV > zeroV && appV > maxV) {
+        // The version of the application is more than the maximal version
+        // this blocklist entry applies to, so we can just ignore it by
+        // returning false and letting the caller deal with it.
+        return false;
+      }
+    }
+  }
+
   // <os>WINNT 6.0</os>
   if (BlacklistNodeGetChildByName(element, NS_LITERAL_STRING("os"),
                                   getter_AddRefs(dataNode))) {
@@ -459,6 +532,11 @@
                                   getter_AddRefs(dataNode))) {
     BlacklistNodeToTextValue(dataNode, dataValue);
     aDriverInfo.mFeature = BlacklistFeatureToGfxFeature(dataValue);
+    if (aDriverInfo.mFeature < 0) {
+      // If we don't recognize the feature, we do not want to proceed.
+      gfxWarning() << "Unrecognized feature " << NS_ConvertUTF16toUTF8(dataValue).get();
+      return false;
+    }
   }
 
   // <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
@@ -532,9 +610,9 @@
       GfxDriverInfo di;
       if (BlacklistEntryToDriverInfo(blacklistEntry, di)) {
         aDriverInfo[i] = di;
+        // Prevent di falling out of scope from destroying the devices.
+        di.mDeleteDevices = false;
       }
-      // Prevent di falling out of scope from destroying the devices.
-      di.mDeleteDevices = false;
     }
   }
 }
@@ -613,6 +691,21 @@
 
   uint32_t i = 0;
   for (; i < info.Length(); i++) {
+    // Do the operating system check first, no point in getting the driver
+    // info if we won't need to use it. Note we also catch and skips the
+    // application version mismatches that would leave operating system
+    // set to unknown.
+    if (info[i].mOperatingSystem == DRIVER_OS_UNKNOWN ||
+        (info[i].mOperatingSystem != DRIVER_OS_ALL &&
+         info[i].mOperatingSystem != os))
+    {
+      continue;
+    }
+
+    if (info[i].mOperatingSystemVersion && info[i].mOperatingSystemVersion != OperatingSystemVersion()) {
+        continue;
+    }
+
     // XXX: it would be better not to do this everytime round the loop
     nsAutoString adapterVendorID;
     nsAutoString adapterDeviceID;
@@ -638,17 +731,6 @@
     ParseDriverVersion(adapterDriverVersionString, &driverVersion);
 #endif
 
-
-    if (info[i].mOperatingSystem != DRIVER_OS_ALL &&
-        info[i].mOperatingSystem != os)
-    {
-      continue;
-    }
-
-    if (info[i].mOperatingSystemVersion && info[i].mOperatingSystemVersion != OperatingSystemVersion()) {
-        continue;
-    }
-
     if (!info[i].mAdapterVendor.Equals(GfxDriverInfo::GetDeviceVendor(VendorAll), nsCaseInsensitiveStringComparator()) &&
         !info[i].mAdapterVendor.Equals(adapterVendorID, nsCaseInsensitiveStringComparator())) {
       continue;
@@ -785,6 +867,11 @@
                                   const nsTArray<GfxDriverInfo>& aDriverInfo,
                                   OperatingSystem* aOS /* = nullptr */)
 {
+  if (aFeature <= 0) {
+    gfxWarning() << "Invalid feature <= 0";
+    return NS_OK;
+  }
+
   if (*aStatus != nsIGfxInfo::FEATURE_STATUS_UNKNOWN) {
     // Terminate now with the status determined by the derived type (OS-specific
     // code).
@@ -870,6 +957,7 @@
     nsIGfxInfo::FEATURE_WEBGL_ANGLE,
     nsIGfxInfo::FEATURE_WEBGL_MSAA,
     nsIGfxInfo::FEATURE_STAGEFRIGHT,
+    nsIGfxInfo::FEATURE_WEBRTC_HW_ACCELERATION,
     0
   };
 
@@ -927,8 +1015,8 @@
 /* void getFailures (out unsigned long failureCount, [optional, array, size_is (failureCount)] out long indices, [array, size_is (failureCount), retval] out string failures); */
 /* XPConnect method of returning arrays is very ugly. Would not recommend. */
 NS_IMETHODIMP GfxInfoBase::GetFailures(uint32_t* failureCount,
-				       int32_t** indices,
-				       char ***failures)
+                                       int32_t** indices,
+                                       char ***failures)
 {
   MutexAutoLock lock(mMutex);
 
@@ -979,7 +1067,7 @@
       if (!(*failures)[i]) {
         /* <sarcasm> I'm too afraid to use an inline function... </sarcasm> */
         NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(i, (*failures));
-	*failureCount = i;
+        *failureCount = i;
         return NS_ERROR_OUT_OF_MEMORY;
       }
     }
@@ -1019,6 +1107,24 @@
   return NS_OK;
 }
 
+const nsCString&
+GfxInfoBase::GetApplicationVersion()
+{
+  static nsAutoCString version;
+  static bool versionInitialized = false;
+  if (!versionInitialized) {
+    // If we fail to get the version, we will not try again.
+    versionInitialized = true;
+
+    // Get the version from xpcom/system/nsIXULAppInfo.idl
+    nsCOMPtr<nsIXULAppInfo> app = do_GetService("@mozilla.org/xre/app-info;1");
+    if (app) {
+      app->GetVersion(version);
+    }
+  }
+  return version;
+}
+
 void
 GfxInfoBase::AddCollector(GfxInfoCollectorBase* collector)
 {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/GfxInfoBase.h firefox-trunk-41.0~a1~hg20150524r245419/widget/GfxInfoBase.h
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/GfxInfoBase.h	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/GfxInfoBase.h	2015-05-25 20:44:06.000000000 +0000
@@ -82,6 +82,9 @@
   virtual nsString Manufacturer() { return EmptyString(); }
   virtual uint32_t OperatingSystemVersion() { return 0; }
 
+  // Convenience to get the application version
+  static const nsCString& GetApplicationVersion();
+
 protected:
 
   virtual ~GfxInfoBase();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/GonkMemoryPressureMonitoring.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/GonkMemoryPressureMonitoring.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/GonkMemoryPressureMonitoring.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/GonkMemoryPressureMonitoring.cpp	2015-05-25 20:44:08.000000000 +0000
@@ -127,8 +127,6 @@
     }
 #endif
 
-    NS_SetIgnoreStatusOfCurrentThread();
-
     int lowMemFd = open("/sys/kernel/mm/lowmemkiller/notify_trigger_active",
                         O_RDONLY | O_CLOEXEC);
     NS_ENSURE_STATE(lowMemFd != -1);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/GonkPermission.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/GonkPermission.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/GonkPermission.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/GonkPermission.cpp	2015-05-25 20:44:08.000000000 +0000
@@ -120,7 +120,7 @@
   String8 perm8(permission);
 
   // Some ril implementations need android.permission.MODIFY_AUDIO_SETTINGS
-  if ((uid == AID_RADIO || uid == AID_BLUETOOTH) &&
+  if ((uid == AID_SYSTEM || uid == AID_RADIO || uid == AID_BLUETOOTH) &&
       perm8 == "android.permission.MODIFY_AUDIO_SETTINGS") {
     return true;
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/HwcComposer2D.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/HwcComposer2D.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/HwcComposer2D.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/HwcComposer2D.cpp	2015-05-25 20:44:08.000000000 +0000
@@ -117,10 +117,6 @@
     , mMaxLayerCount(0)
     , mColorFill(false)
     , mRBSwapSupport(false)
-#if ANDROID_VERSION >= 17
-    , mPrevRetireFence(Fence::NO_FENCE)
-    , mPrevDisplayFence(Fence::NO_FENCE)
-#endif
     , mPrepared(false)
     , mHasHWVsync(false)
     , mLock("mozilla.HwcComposer2D.mLock")
@@ -181,7 +177,9 @@
 bool
 HwcComposer2D::EnableVsync(bool aEnable)
 {
-#if ANDROID_VERSION >= 17
+    // Only support hardware vsync on kitkat, L and up due to inaccurate timings
+    // with JellyBean.
+#if (ANDROID_VERSION == 19 || ANDROID_VERSION >= 21)
     MOZ_ASSERT(NS_IsMainThread());
     if (!mHasHWVsync) {
       return false;
@@ -212,9 +210,9 @@
     device->eventControl(device, HWC_DISPLAY_PRIMARY, HWC_EVENT_VSYNC, false);
     device->registerProcs(device, &sHWCProcs);
 
-// Only support actual hardware vsync on kitkat due to innaccurate timings
-// with JellyBean, and HwcComposer bugs with L. Reenable for L later
-#if ANDROID_VERSION == 19
+    // Only support hardware vsync on kitkat, L and up due to inaccurate timings
+    // with JellyBean.
+#if (ANDROID_VERSION == 19 || ANDROID_VERSION >= 21)
     mHasHWVsync = gfxPrefs::HardwareVsyncEnabled();
 #else
     mHasHWVsync = false;
@@ -225,8 +223,15 @@
 void
 HwcComposer2D::Vsync(int aDisplay, nsecs_t aVsyncTimestamp)
 {
+    // Only support hardware vsync on kitkat, L and up due to inaccurate timings
+    // with JellyBean.
+#if (ANDROID_VERSION == 19 || ANDROID_VERSION >= 21)
     TimeStamp vsyncTime = mozilla::TimeStamp::FromSystemTime(aVsyncTimestamp);
     gfxPlatform::GetPlatform()->GetHardwareVsync()->GetGlobalDisplay().NotifyVsync(vsyncTime);
+#else
+    // If this device doesn't support vsync, this function should not be used.
+    MOZ_ASSERT(false);
+#endif
 }
 
 // Called on the "invalidator" thread (run from HAL).
@@ -857,22 +862,23 @@
         if (!texture) {
             continue;
         }
-        sp<Fence> fence = texture->GetAndResetAcquireFence();
-        if (fence.get() && fence->isValid()) {
-            mList->hwLayers[j].acquireFenceFd = fence->dup();
+        FenceHandle fence = texture->GetAndResetAcquireFence();
+        if (fence.IsValid()) {
+            nsRefPtr<FenceHandle::FdObj> fdObj = fence.GetAndResetFdObj();
+            mList->hwLayers[j].acquireFenceFd = fdObj->GetAndResetFd();
         }
     }
 
     int err = mHwc->set(mHwc, HWC_NUM_DISPLAY_TYPES, displays);
 
-    mPrevDisplayFence = mPrevRetireFence;
-    mPrevRetireFence = Fence::NO_FENCE;
+    mPrevRetireFence.TransferToAnotherFenceHandle(mPrevDisplayFence);
 
     for (uint32_t j=0; j < (mList->numHwLayers - 1); j++) {
         if (mList->hwLayers[j].releaseFenceFd >= 0) {
             int fd = mList->hwLayers[j].releaseFenceFd;
             mList->hwLayers[j].releaseFenceFd = -1;
-            sp<Fence> fence = new Fence(fd);
+            nsRefPtr<FenceHandle::FdObj> fdObj = new FenceHandle::FdObj(fd);
+            FenceHandle fence(fdObj);
 
             LayerRenderState state = mHwcLayerMap[j]->GetLayer()->GetRenderState();
             if (!state.mTexture) {
@@ -883,11 +889,11 @@
                 continue;
             }
             texture->SetReleaseFence(fence);
-       }
-   }
+        }
+    }
 
     if (mList->retireFenceFd >= 0) {
-        mPrevRetireFence = new Fence(mList->retireFenceFd);
+        mPrevRetireFence = FenceHandle(new FenceHandle::FdObj(mList->retireFenceFd));
     }
 
     mPrepared = false;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/HwcComposer2D.h firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/HwcComposer2D.h
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/HwcComposer2D.h	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/HwcComposer2D.h	2015-05-25 20:44:08.000000000 +0000
@@ -20,6 +20,7 @@
 #include "Composer2D.h"
 #include "Layers.h"
 #include "mozilla/Mutex.h"
+#include "mozilla/layers/FenceUtils.h"  // for FenceHandle
 
 #include <vector>
 #include <list>
@@ -124,10 +125,8 @@
     //Holds all the dynamically allocated RectVectors needed
     //to render the current frame
     std::list<RectVector>   mVisibleRegions;
-#if ANDROID_VERSION >= 17
-    android::sp<android::Fence> mPrevRetireFence;
-    android::sp<android::Fence> mPrevDisplayFence;
-#endif
+    layers::FenceHandle mPrevRetireFence;
+    layers::FenceHandle mPrevDisplayFence;
     nsTArray<layers::LayerComposite*> mHwcLayerMap;
     bool                    mPrepared;
     bool                    mHasHWVsync;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/libdisplay/BootAnimation.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/libdisplay/BootAnimation.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/libdisplay/BootAnimation.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/libdisplay/BootAnimation.cpp	2015-05-25 20:44:08.000000000 +0000
@@ -286,6 +286,31 @@
     }
 }
 
+static uint16_t
+GetFormatBPP(int aFormat)
+{
+    uint16_t bpp = 0;
+
+    switch (aFormat) {
+    case HAL_PIXEL_FORMAT_BGRA_8888:
+    case HAL_PIXEL_FORMAT_RGBA_8888:
+    case HAL_PIXEL_FORMAT_RGBX_8888:
+        bpp = 4;
+        break;
+    case HAL_PIXEL_FORMAT_RGB_888:
+        bpp = 3;
+        break;
+    default:
+        LOGW("Unknown pixel format %d. Assuming RGB 565.", aFormat);
+        // FALL THROUGH
+    case HAL_PIXEL_FORMAT_RGB_565:
+        bpp = 2;
+        break;
+    }
+
+    return bpp;
+}
+
 void
 AnimationFrame::ReadPngFrame(int outputFormat)
 {
@@ -358,24 +383,23 @@
         path, width, height, has_bgcolor ? "yes" : "no",
         bgcolor.red, bgcolor.green, bgcolor.blue, bgcolor.gray);
 
+    bytepp = GetFormatBPP(outputFormat);
+
     switch (outputFormat) {
     case HAL_PIXEL_FORMAT_BGRA_8888:
         png_set_bgr(pngread);
         // FALL THROUGH
     case HAL_PIXEL_FORMAT_RGBA_8888:
     case HAL_PIXEL_FORMAT_RGBX_8888:
-        bytepp = 4;
         png_set_filler(pngread, 0xFF, PNG_FILLER_AFTER);
         break;
     case HAL_PIXEL_FORMAT_RGB_888:
-        bytepp = 3;
         png_set_strip_alpha(pngread);
         break;
     default:
         LOGW("Unknown pixel format %d. Assuming RGB 565.", outputFormat);
         // FALL THROUGH
     case HAL_PIXEL_FORMAT_RGB_565:
-        bytepp = 2;
         png_set_strip_alpha(pngread);
         png_set_read_user_transform_fn(pngread, TransformTo565);
         break;
@@ -446,12 +470,52 @@
     }
 }
 
+void
+ShowSolidColorFrame(GonkDisplay *aDisplay,
+                    const gralloc_module_t *grallocModule,
+                    int32_t aFormat)
+{
+    LOGW("Show solid color frame for bootAnim");
+
+    ANativeWindowBuffer *buffer = aDisplay->DequeueBuffer();
+    void *mappedAddress = nullptr;
+
+    if (!buffer) {
+        LOGW("Failed to get an ANativeWindowBuffer");
+        return;
+    }
+
+    if (!grallocModule->lock(grallocModule, buffer->handle,
+                             GRALLOC_USAGE_SW_READ_NEVER |
+                             GRALLOC_USAGE_SW_WRITE_OFTEN |
+                             GRALLOC_USAGE_HW_FB,
+                             0, 0, buffer->width, buffer->height, &mappedAddress)) {
+        // Just show a black solid color frame.
+        memset(mappedAddress, 0, buffer->height * buffer->stride * GetFormatBPP(aFormat));
+        grallocModule->unlock(grallocModule, buffer->handle);
+    }
+
+    aDisplay->QueueBuffer(buffer);
+}
+
 static void *
 AnimationThread(void *)
 {
+    GonkDisplay *display = GetGonkDisplay();
+    int32_t format = display->surfaceformat;
+
+    const hw_module_t *module = nullptr;
+    if (hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &module)) {
+        LOGW("Could not get gralloc module");
+        return nullptr;
+    }
+    const gralloc_module_t *grmodule =
+        reinterpret_cast<gralloc_module_t const*>(module);
+
     ZipReader reader;
     if (!reader.OpenArchive("/system/media/bootanimation.zip")) {
         LOGW("Could not open boot animation");
+        ShowSolidColorFrame(display, grmodule, format);
         return nullptr;
     }
 
@@ -467,20 +531,10 @@
 
     if (!file) {
         LOGW("Could not find desc.txt in boot animation");
+        ShowSolidColorFrame(display, grmodule, format);
         return nullptr;
     }
 
-    GonkDisplay *display = GetGonkDisplay();
-    int format = display->surfaceformat;
-
-    hw_module_t const *module;
-    if (hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &module)) {
-        LOGW("Could not get gralloc module");
-        return nullptr;
-    }
-    gralloc_module_t const *grmodule =
-        reinterpret_cast<gralloc_module_t const*>(module);
-
     string descCopy;
     descCopy.append(file->GetData(), entry->GetDataSize());
     int32_t width, height, fps;
@@ -488,6 +542,7 @@
     const char *end;
     bool headerRead = true;
     vector<AnimationPart> parts;
+    bool animPlayed = false;
 
     /*
      * bootanimation.zip
@@ -618,6 +673,7 @@
                          frameDelayUs, tv2.tv_usec);
                 }
 
+                animPlayed = true;
                 display->QueueBuffer(buf);
 
                 if (part.count && j >= part.count) {
@@ -629,6 +685,10 @@
         }
     }
 
+    if (!animPlayed) {
+        ShowSolidColorFrame(display, grmodule, format);
+    }
+
     return nullptr;
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/libdisplay/GonkDisplayJB.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/libdisplay/GonkDisplayJB.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/libdisplay/GonkDisplayJB.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/libdisplay/GonkDisplayJB.cpp	2015-05-25 20:44:08.000000000 +0000
@@ -106,29 +106,8 @@
 
     mAlloc = new GraphicBufferAlloc();
 
-#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> consumer = new BufferQueue(true, mAlloc);
-#endif
-
-    mDispSurface = new FramebufferSurface(0, mWidth, mHeight, surfaceformat, consumer);
+    CreateSurface(mSTClient, mDispSurface);
 
-#if ANDROID_VERSION == 17
-    sp<SurfaceTextureClient> stc = new SurfaceTextureClient(
-        static_cast<sp<ISurfaceTexture> >(mDispSurface->getBufferQueue()));
-#else
-    sp<Surface> stc = new Surface(producer);
-#endif
-    mSTClient = stc;
     mList = (hwc_display_contents_1_t *)malloc(sizeof(*mList) + (sizeof(hwc_layer_1_t)*2));
 
     uint32_t usage = GRALLOC_USAGE_HW_FB | GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_COMPOSER;
@@ -148,7 +127,7 @@
 #endif
         // For devices w/ hwc v1.0 or no hwc, this buffer can not be created,
         // only create this buffer for devices w/ hwc version > 1.0.
-        mBootAnimBuffer = mAlloc->createGraphicBuffer(mWidth, mHeight, surfaceformat, usage, &err);
+        CreateSurface(mBootAnimSTClient, mBootAnimDispSurface);
     }
 
     ALOGI("Starting bootanimation with (%d) format framebuffer", surfaceformat);
@@ -164,6 +143,34 @@
     free(mList);
 }
 
+void
+GonkDisplayJB::CreateSurface(android::sp<ANativeWindow>& aNativeWindow,
+                             android::sp<android::DisplaySurface>& aDisplaySurface)
+{
+#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> consumer = new BufferQueue(true, mAlloc);
+#endif
+
+    aDisplaySurface = new FramebufferSurface(0, mWidth, mHeight, surfaceformat, consumer);
+
+#if ANDROID_VERSION == 17
+    aNativeWindow = new SurfaceTextureClient(
+        static_cast<sp<ISurfaceTexture>>(aDisplaySurface->getBufferQueue()));
+#else
+    aNativeWindow = new Surface(producer);
+#endif
+}
+
 ANativeWindow*
 GonkDisplayJB::GetNativeWindow()
 {
@@ -311,22 +318,38 @@
 ANativeWindowBuffer*
 GonkDisplayJB::DequeueBuffer()
 {
-    if (mBootAnimBuffer.get()) {
-        return static_cast<ANativeWindowBuffer*>(mBootAnimBuffer.get());
-    }
+    // Check for bootAnim or normal display flow.
+    sp<ANativeWindow> nativeWindow =
+        !mBootAnimSTClient.get() ? mSTClient : mBootAnimSTClient;
+
     ANativeWindowBuffer *buf;
-    mSTClient->dequeueBuffer(mSTClient.get(), &buf, &mFence);
+    int fenceFd = -1;
+    nativeWindow->dequeueBuffer(nativeWindow.get(), &buf, &fenceFd);
+    sp<Fence> fence(new Fence(fenceFd));
+#if ANDROID_VERSION == 17
+    fence->waitForever(1000, "GonkDisplayJB_DequeueBuffer");
+    // 1000 is what Android uses. It is a warning timeout in ms.
+    // This timeout was removed in ANDROID_VERSION 18.
+#else
+    fence->waitForever("GonkDisplayJB_DequeueBuffer");
+#endif
     return buf;
 }
 
 bool
 GonkDisplayJB::QueueBuffer(ANativeWindowBuffer* buf)
 {
-    bool success = Post(buf->handle, -1);
     int error = 0;
-    if (!mBootAnimBuffer.get()) {
-        error = mSTClient->queueBuffer(mSTClient.get(), buf, mFence);
+    bool success = false;
+    // Check for bootAnim or normal display flow.
+    if (!mBootAnimSTClient.get()) {
+        error = mSTClient->queueBuffer(mSTClient.get(), buf, -1);
+        success = Post(mDispSurface->lastHandle, mDispSurface->GetPrevDispAcquireFd());
+    } else {
+        error = mBootAnimSTClient->queueBuffer(mBootAnimSTClient.get(), buf, -1);
+        success = Post(mBootAnimDispSurface->lastHandle, mBootAnimDispSurface->GetPrevDispAcquireFd());
     }
+
     return error == 0 && success;
 }
 
@@ -354,8 +377,9 @@
 GonkDisplayJB::StopBootAnim()
 {
     StopBootAnimation();
-    if (mBootAnimBuffer.get()) {
-        mBootAnimBuffer = nullptr;
+    if (mBootAnimSTClient.get()) {
+        mBootAnimSTClient = nullptr;
+        mBootAnimDispSurface = nullptr;
     }
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/libdisplay/GonkDisplayJB.h firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/libdisplay/GonkDisplayJB.h
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/libdisplay/GonkDisplayJB.h	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/libdisplay/GonkDisplayJB.h	2015-05-25 20:44:08.000000000 +0000
@@ -56,6 +56,8 @@
 
 private:
     void StopBootAnim();
+    void CreateSurface(android::sp<ANativeWindow>& aNativeWindow,
+                       android::sp<android::DisplaySurface>& aDisplaySurface);
 
     hw_module_t const*        mModule;
     hw_module_t const*        mFBModule;
@@ -64,9 +66,9 @@
     power_module_t*           mPowerModule;
     android::sp<android::DisplaySurface> mDispSurface;
     android::sp<ANativeWindow> mSTClient;
+    android::sp<android::DisplaySurface> mBootAnimDispSurface;
+    android::sp<ANativeWindow> mBootAnimSTClient;
     android::sp<android::IGraphicBufferAlloc> mAlloc;
-    android::sp<android::GraphicBuffer> mBootAnimBuffer;
-    int mFence;
     hwc_display_contents_1_t* mList;
     uint32_t mWidth;
     uint32_t mHeight;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/nativewindow/GonkBufferQueueJB.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/nativewindow/GonkBufferQueueJB.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/nativewindow/GonkBufferQueueJB.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/nativewindow/GonkBufferQueueJB.cpp	2015-05-25 20:44:08.000000000 +0000
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * Copyright (C) 2012 The Android Open Source Project
  * Copyright (C) 2013 Mozilla Foundation
@@ -136,7 +137,8 @@
 
     for (int i = 0; i < NUM_BUFFER_SLOTS; i++) {
         if (mSlots[i].mGraphicBuffer != NULL && mSlots[i].mGraphicBuffer->handle == buffer->handle) {
-            return mSlots[i].mTextureClient;
+            RefPtr<TextureClient> client(mSlots[i].mTextureClient);
+            return client.forget();
         }
     }
     ST_LOGE("getSlotFromBufferLocked: unknown buffer: %p", buffer->handle);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/nativewindow/GonkBufferQueueKK.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/nativewindow/GonkBufferQueueKK.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/nativewindow/GonkBufferQueueKK.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/nativewindow/GonkBufferQueueKK.cpp	2015-05-25 20:44:08.000000000 +0000
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * Copyright (C) 2012 The Android Open Source Project
  * Copyright (C) 2013 Mozilla Foundation
@@ -128,7 +129,8 @@
 
     for (int i = 0; i < NUM_BUFFER_SLOTS; i++) {
         if (mSlots[i].mGraphicBuffer != NULL && mSlots[i].mGraphicBuffer->handle == buffer->handle) {
-            return mSlots[i].mTextureClient;
+             RefPtr<TextureClient> client(mSlots[i].mTextureClient);
+             return client.forget();
         }
     }
     ALOGE("getSlotFromBufferLocked: unknown buffer: %p", buffer->handle);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueConsumer.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueConsumer.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueConsumer.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueConsumer.cpp	2015-05-25 20:44:08.000000000 +0000
@@ -531,7 +531,8 @@
 
     for (int i = 0; i < GonkBufferQueueDefs::NUM_BUFFER_SLOTS; i++) {
         if (mSlots[i].mGraphicBuffer != NULL && mSlots[i].mGraphicBuffer->handle == buffer->handle) {
-            return mSlots[i].mTextureClient;
+            RefPtr<TextureClient> client(mSlots[i].mTextureClient);
+            return client.forget();
         }
     }
     ALOGE("getSlotFromBufferLocked: unknown buffer: %p", buffer->handle);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/nativewindow/GonkNativeWindowICS.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/nativewindow/GonkNativeWindowICS.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/nativewindow/GonkNativeWindowICS.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/nativewindow/GonkNativeWindowICS.cpp	2015-05-25 20:44:08.000000000 +0000
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  * Copyright (C) 2010 The Android Open Source Project
  * Copyright (C) 2012-2013 Mozilla Foundation
@@ -409,7 +410,8 @@
     return nullptr;
   }
 
-  return mSlots[buf].mTextureClient;
+  RefPtr<TextureClient> client(mSlots[buf].mTextureClient);
+  return client.forget();
 }
 
 status_t GonkNativeWindow::queueBuffer(int buf, int64_t timestamp,
@@ -487,7 +489,8 @@
   mDequeueCondition.signal();
 
   mSlots[buf].mTextureClient->SetRecycleCallback(GonkNativeWindow::RecycleCallback, this);
-  return mSlots[buf].mTextureClient;
+  RefPtr<TextureClient> client(mSlots[buf].mTextureClient);
+  return client.forget();
 }
 
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/nativewindow/GonkNativeWindowJB.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/nativewindow/GonkNativeWindowJB.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/nativewindow/GonkNativeWindowJB.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/nativewindow/GonkNativeWindowJB.cpp	2015-05-25 20:44:08.000000000 +0000
@@ -125,8 +125,8 @@
     if (!textureClient) {
         return NULL;
     }
-  textureClient->SetRecycleCallback(GonkNativeWindow::RecycleCallback, this);
-  return textureClient;
+    textureClient->SetRecycleCallback(GonkNativeWindow::RecycleCallback, this);
+    return textureClient.forget();
 }
 
 /* static */ void
@@ -146,10 +146,9 @@
     if (index < 0) {
     }
 
-    sp<Fence> fence = client->GetReleaseFenceHandle().mFence;
-    if (!fence.get()) {
-      fence = Fence::NO_FENCE;
-    }
+    FenceHandle handle = client->GetAndResetReleaseFenceHandle();
+    nsRefPtr<FenceHandle::FdObj> fdObj = handle.GetAndResetFdObj();
+    sp<Fence> fence = new Fence(fdObj->GetAndResetFd());
 
     addReleaseFenceLocked(index, fence);
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/nativewindow/GonkNativeWindowKK.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/nativewindow/GonkNativeWindowKK.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/nativewindow/GonkNativeWindowKK.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/nativewindow/GonkNativeWindowKK.cpp	2015-05-25 20:44:08.000000000 +0000
@@ -125,8 +125,8 @@
     if (!textureClient) {
         return NULL;
     }
-  textureClient->SetRecycleCallback(GonkNativeWindow::RecycleCallback, this);
-  return textureClient;
+    textureClient->SetRecycleCallback(GonkNativeWindow::RecycleCallback, this);
+    return textureClient.forget();
 }
 
 /* static */ void
@@ -146,10 +146,9 @@
     if (index < 0) {
     }
 
-    sp<Fence> fence = client->GetReleaseFenceHandle().mFence;
-    if (!fence.get()) {
-      fence = Fence::NO_FENCE;
-    }
+    FenceHandle handle = client->GetAndResetReleaseFenceHandle();
+    nsRefPtr<FenceHandle::FdObj> fdObj = handle.GetAndResetFdObj();
+    sp<Fence> fence = new Fence(fdObj->GetAndResetFd());
 
     addReleaseFenceLocked(index,
                           mSlots[index].mGraphicBuffer,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/nativewindow/GonkNativeWindowLL.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/nativewindow/GonkNativeWindowLL.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/nativewindow/GonkNativeWindowLL.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/nativewindow/GonkNativeWindowLL.cpp	2015-05-25 20:44:08.000000000 +0000
@@ -137,7 +137,7 @@
         return NULL;
     }
     textureClient->SetRecycleCallback(GonkNativeWindow::RecycleCallback, this);
-    return textureClient;
+    return textureClient.forget();
 }
 
 /* static */ void
@@ -158,10 +158,9 @@
         return;
     }
 
-    sp<Fence> fence = client->GetReleaseFenceHandle().mFence;
-    if (!fence.get()) {
-        fence = Fence::NO_FENCE;
-    }
+    FenceHandle handle = client->GetAndResetReleaseFenceHandle();
+    nsRefPtr<FenceHandle::FdObj> fdObj = handle.GetAndResetFdObj();
+    sp<Fence> fence = new Fence(fdObj->GetAndResetFd());
 
     status_t err;
     err = addReleaseFenceLocked(index,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/nsWindow.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/nsWindow.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gonk/nsWindow.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gonk/nsWindow.cpp	2015-05-25 20:44:08.000000000 +0000
@@ -83,11 +83,13 @@
     {}
 
     NS_IMETHOD Run() {
-        // When the screen is off prevent priority changes.
-        if (mIsOn) {
-          ProcessPriorityManager::Unfreeze();
-        } else {
-          ProcessPriorityManager::Freeze();
+        // Notify observers that the screen state has just changed.
+        nsCOMPtr<nsIObserverService> observerService = mozilla::services::GetObserverService();
+        if (observerService) {
+          observerService->NotifyObservers(
+            nullptr, "screen-state-changed",
+            mIsOn ? MOZ_UTF16("on") : MOZ_UTF16("off")
+          );
         }
 
         nsRefPtr<nsScreenGonk> screen = nsScreenManagerGonk::GetPrimaryScreen();
@@ -101,15 +103,6 @@
             }
         }
 
-        // Notify observers that the screen state has just changed.
-        nsCOMPtr<nsIObserverService> observerService = mozilla::services::GetObserverService();
-        if (observerService) {
-          observerService->NotifyObservers(
-            nullptr, "screen-state-changed",
-            mIsOn ? MOZ_UTF16("on") : MOZ_UTF16("off")
-          );
-        }
-
         return NS_OK;
     }
 
@@ -735,7 +728,8 @@
         mBackBuffer = mFramebufferTarget->CreateSimilarDrawTarget(
             mFramebufferTarget->GetSize(), mFramebufferTarget->GetFormat());
     }
-    return mBackBuffer;
+    RefPtr<DrawTarget> buffer(mBackBuffer);
+    return buffer.forget();
 }
 
 void
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gtk/moz.build firefox-trunk-41.0~a1~hg20150524r245419/widget/gtk/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gtk/moz.build	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gtk/moz.build	2015-05-25 20:44:08.000000000 +0000
@@ -97,7 +97,17 @@
 DEFINES['MOZ_APP_NAME'] = '"%s"' % CONFIG['MOZ_APP_NAME']
 
 CFLAGS += CONFIG['MOZ_STARTUP_NOTIFICATION_CFLAGS']
-CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
+
+# When building with GTK3, the widget code always needs to use
+# system Cairo headers, regardless of whether we are also linked
+# against and using in-tree Cairo. By not using in-tree Cairo
+# headers, we avoid picking up our renamed symbols, and instead
+# use only system Cairo symbols that GTK3 uses. This allows that
+# any Cairo objects created can be freely passed back and forth
+# between the widget code and GTK3.
+if not (CONFIG['MOZ_ENABLE_GTK3'] and CONFIG['MOZ_TREE_CAIRO']):
+    CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
+
 CXXFLAGS += CONFIG['MOZ_STARTUP_NOTIFICATION_CFLAGS']
 
 CFLAGS += CONFIG['TK_CFLAGS']
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gtk/nsAppShell.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/gtk/nsAppShell.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gtk/nsAppShell.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gtk/nsAppShell.cpp	2015-05-25 20:44:08.000000000 +0000
@@ -12,7 +12,7 @@
 #include <gdk/gdk.h>
 #include "nsAppShell.h"
 #include "nsWindow.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prenv.h"
 #include "mozilla/HangMonitor.h"
 #include "mozilla/unused.h"
@@ -73,6 +73,12 @@
 nsresult
 nsAppShell::Init()
 {
+    // For any versions of Glib before 2.36, g_type_init must be explicitly called
+    // to safely use the library. Failure to do so may cause various failures/crashes
+    // in any code that uses Glib, Gdk, or Gtk. In later versions of Glib, this call
+    // is a no-op.
+    g_type_init();
+
     if (!gWidgetLog)
         gWidgetLog = PR_NewLogModule("Widget");
     if (!gWidgetFocusLog)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gtk/nsDeviceContextSpecG.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/gtk/nsDeviceContextSpecG.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gtk/nsDeviceContextSpecG.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gtk/nsDeviceContextSpecG.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "plstr.h"
 
@@ -42,7 +42,7 @@
   return sLog;
 }
 /* Macro to make lines shorter */
-#define DO_PR_DEBUG_LOG(x) PR_LOG(GetDeviceContextSpecGTKLog(), PR_LOG_DEBUG, x)
+#define DO_PR_DEBUG_LOG(x) MOZ_LOG(GetDeviceContextSpecGTKLog(), PR_LOG_DEBUG, x)
 
 //----------------------------------------------------------------------------------
 // The printer data is shared between the PrinterEnumerator and the nsDeviceContextSpecGTK
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gtk/nsDragService.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/gtk/nsDragService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gtk/nsDragService.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gtk/nsDragService.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -14,7 +14,7 @@
 #include "nsIIOService.h"
 #include "nsIFileURL.h"
 #include "nsNetUtil.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsTArray.h"
 #include "nsPrimitiveHelpers.h"
 #include "prtime.h"
@@ -127,7 +127,7 @@
     // set up our logging module
     if (!sDragLm)
         sDragLm = PR_NewLogModule("nsDragService");
-    PR_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::nsDragService"));
+    MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::nsDragService"));
     mCanDrop = false;
     mTargetDragDataReceived = false;
     mTargetDragData = 0;
@@ -136,7 +136,7 @@
 
 nsDragService::~nsDragService()
 {
-    PR_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::~nsDragService"));
+    MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::~nsDragService"));
     if (mTaskSource)
         g_source_remove(mTaskSource);
 
@@ -160,7 +160,7 @@
                        const char16_t *aData)
 {
   if (!nsCRT::strcmp(aTopic, "quit-application")) {
-    PR_LOG(sDragLm, PR_LOG_DEBUG,
+    MOZ_LOG(sDragLm, PR_LOG_DEBUG,
            ("nsDragService::Observe(\"quit-application\")"));
     if (mHiddenWidget) {
       gtk_widget_destroy(mHiddenWidget);
@@ -296,7 +296,7 @@
                                  nsIScriptableRegion * aRegion,
                                  uint32_t aActionType)
 {
-    PR_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::InvokeDragSession"));
+    MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::InvokeDragSession"));
 
     // If the previous source drag has not yet completed, signal handlers need
     // to be removed from sGrabWidget and dragend needs to be dispatched to
@@ -457,14 +457,14 @@
 NS_IMETHODIMP
 nsDragService::StartDragSession()
 {
-    PR_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::StartDragSession"));
+    MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::StartDragSession"));
     return nsBaseDragService::StartDragSession();
 }
  
 NS_IMETHODIMP
 nsDragService::EndDragSession(bool aDoneDrag)
 {
-    PR_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::EndDragSession %d",
+    MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::EndDragSession %d",
                                    aDoneDrag));
 
     if (sGrabWidget) {
@@ -496,7 +496,7 @@
 NS_IMETHODIMP
 nsDragService::SetCanDrop(bool aCanDrop)
 {
-    PR_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::SetCanDrop %d",
+    MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::SetCanDrop %d",
                                    aCanDrop));
     mCanDrop = aCanDrop;
     return NS_OK;
@@ -505,7 +505,7 @@
 NS_IMETHODIMP
 nsDragService::GetCanDrop(bool *aCanDrop)
 {
-    PR_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::GetCanDrop"));
+    MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::GetCanDrop"));
     *aCanDrop = mCanDrop;
     return NS_OK;
 }
@@ -580,10 +580,10 @@
 NS_IMETHODIMP
 nsDragService::GetNumDropItems(uint32_t * aNumItems)
 {
-    PR_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::GetNumDropItems"));
+    MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::GetNumDropItems"));
 
     if (!mTargetWidget) {
-        PR_LOG(sDragLm, PR_LOG_DEBUG,
+        MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                ("*** warning: GetNumDropItems \
                called without a valid target widget!\n"));
         *aNumItems = 0;
@@ -602,7 +602,7 @@
         } else
             *aNumItems = 1;
     }
-    PR_LOG(sDragLm, PR_LOG_DEBUG, ("%d items", *aNumItems));
+    MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("%d items", *aNumItems));
     return NS_OK;
 }
 
@@ -611,14 +611,14 @@
 nsDragService::GetData(nsITransferable * aTransferable,
                        uint32_t aItemIndex)
 {
-    PR_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::GetData %d", aItemIndex));
+    MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::GetData %d", aItemIndex));
 
     // make sure that we have a transferable
     if (!aTransferable)
         return NS_ERROR_INVALID_ARG;
 
     if (!mTargetWidget) {
-        PR_LOG(sDragLm, PR_LOG_DEBUG,
+        MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                ("*** warning: GetData \
                called without a valid target widget!\n"));
         return NS_ERROR_FAILURE;
@@ -642,7 +642,7 @@
     bool isList = IsTargetContextList();
 
     if (isList) {
-        PR_LOG(sDragLm, PR_LOG_DEBUG, ("it's a list..."));
+        MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("it's a list..."));
         // find a matching flavor
         for (i = 0; i < cnt; ++i) {
             nsCOMPtr<nsISupports> genericWrapper;
@@ -654,7 +654,7 @@
 
             nsXPIDLCString flavorStr;
             currentFlavor->ToString(getter_Copies(flavorStr));
-            PR_LOG(sDragLm,
+            MOZ_LOG(sDragLm,
                    PR_LOG_DEBUG,
                    ("flavor is %s\n", (const char *)flavorStr));
             // get the item with the right index
@@ -667,20 +667,20 @@
 
             nsCOMPtr<nsISupports> data;
             uint32_t tmpDataLen = 0;
-            PR_LOG(sDragLm, PR_LOG_DEBUG,
+            MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                    ("trying to get transfer data for %s\n",
                    (const char *)flavorStr));
             rv = item->GetTransferData(flavorStr,
                                        getter_AddRefs(data),
                                        &tmpDataLen);
             if (NS_FAILED(rv)) {
-                PR_LOG(sDragLm, PR_LOG_DEBUG, ("failed.\n"));
+                MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("failed.\n"));
                 continue;
             }
-            PR_LOG(sDragLm, PR_LOG_DEBUG, ("succeeded.\n"));
+            MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("succeeded.\n"));
             rv = aTransferable->SetTransferData(flavorStr,data,tmpDataLen);
             if (NS_FAILED(rv)) {
-                PR_LOG(sDragLm,
+                MOZ_LOG(sDragLm,
                        PR_LOG_DEBUG,
                        ("fail to set transfer data into transferable!\n"));
                 continue;
@@ -705,7 +705,7 @@
             nsXPIDLCString flavorStr;
             currentFlavor->ToString(getter_Copies(flavorStr));
             GdkAtom gdkFlavor = gdk_atom_intern(flavorStr, FALSE);
-            PR_LOG(sDragLm, PR_LOG_DEBUG,
+            MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                    ("looking for data in type %s, gdk flavor %ld\n",
                    static_cast<const char*>(flavorStr), gdkFlavor));
             bool dataFound = false;
@@ -713,11 +713,11 @@
                 GetTargetDragData(gdkFlavor);
             }
             if (mTargetDragData) {
-                PR_LOG(sDragLm, PR_LOG_DEBUG, ("dataFound = true\n"));
+                MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("dataFound = true\n"));
                 dataFound = true;
             }
             else {
-                PR_LOG(sDragLm, PR_LOG_DEBUG, ("dataFound = false\n"));
+                MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("dataFound = false\n"));
 
                 // Dragging and dropping from the file manager would cause us 
                 // to parse the source text as a nsIFile URL.
@@ -769,13 +769,13 @@
                 // on the clipboard first, try again with text/plain. If that
                 // is present, convert it to unicode.
                 if ( strcmp(flavorStr, kUnicodeMime) == 0 ) {
-                    PR_LOG(sDragLm, PR_LOG_DEBUG,
+                    MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                            ("we were looking for text/unicode... \
                            trying with text/plain;charset=utf-8\n"));
                     gdkFlavor = gdk_atom_intern(gTextPlainUTF8Type, FALSE);
                     GetTargetDragData(gdkFlavor);
                     if (mTargetDragData) {
-                        PR_LOG(sDragLm, PR_LOG_DEBUG, ("Got textplain data\n"));
+                        MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("Got textplain data\n"));
                         const char* castedText =
                                     reinterpret_cast<char*>(mTargetDragData);
                         char16_t* convertedText = nullptr;
@@ -783,7 +783,7 @@
                                                          mTargetDragDataLen);
                         convertedText = ToNewUnicode(ucs2string);
                         if ( convertedText ) {
-                            PR_LOG(sDragLm, PR_LOG_DEBUG,
+                            MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                                    ("successfully converted plain text \
                                    to unicode.\n"));
                             // out with the old, in with the new
@@ -793,13 +793,13 @@
                             dataFound = true;
                         } // if plain text data on clipboard
                     } else {
-                        PR_LOG(sDragLm, PR_LOG_DEBUG,
+                        MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                                ("we were looking for text/unicode... \
                                trying again with text/plain\n"));
                         gdkFlavor = gdk_atom_intern(kTextMime, FALSE);
                         GetTargetDragData(gdkFlavor);
                         if (mTargetDragData) {
-                            PR_LOG(sDragLm, PR_LOG_DEBUG, ("Got textplain data\n"));
+                            MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("Got textplain data\n"));
                             const char* castedText =
                                         reinterpret_cast<char*>(mTargetDragData);
                             char16_t* convertedText = nullptr;
@@ -808,7 +808,7 @@
                                                 castedText, mTargetDragDataLen,
                                                 &convertedText, &convertedTextLen);
                             if ( convertedText ) {
-                                PR_LOG(sDragLm, PR_LOG_DEBUG,
+                                MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                                        ("successfully converted plain text \
                                        to unicode.\n"));
                                 // out with the old, in with the new
@@ -825,13 +825,13 @@
                 // it on the clipboard, try again with text/uri-list, and then
                 // _NETSCAPE_URL
                 if (strcmp(flavorStr, kURLMime) == 0) {
-                    PR_LOG(sDragLm, PR_LOG_DEBUG,
+                    MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                            ("we were looking for text/x-moz-url...\
                            trying again with text/uri-list\n"));
                     gdkFlavor = gdk_atom_intern(gTextUriListType, FALSE);
                     GetTargetDragData(gdkFlavor);
                     if (mTargetDragData) {
-                        PR_LOG(sDragLm, PR_LOG_DEBUG,
+                        MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                                ("Got text/uri-list data\n"));
                         const char *data =
                                    reinterpret_cast<char*>(mTargetDragData);
@@ -842,7 +842,7 @@
                                            &convertedText, &convertedTextLen);
 
                         if ( convertedText ) {
-                            PR_LOG(sDragLm, PR_LOG_DEBUG,
+                            MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                                    ("successfully converted \
                                    _NETSCAPE_URL to unicode.\n"));
                             // out with the old, in with the new
@@ -853,17 +853,17 @@
                         }
                     }
                     else {
-                        PR_LOG(sDragLm, PR_LOG_DEBUG,
+                        MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                                ("failed to get text/uri-list data\n"));
                     }
                     if (!dataFound) {
-                        PR_LOG(sDragLm, PR_LOG_DEBUG,
+                        MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                                ("we were looking for text/x-moz-url...\
                                trying again with _NETSCAP_URL\n"));
                         gdkFlavor = gdk_atom_intern(gMozUrlType, FALSE);
                         GetTargetDragData(gdkFlavor);
                         if (mTargetDragData) {
-                            PR_LOG(sDragLm, PR_LOG_DEBUG,
+                            MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                                    ("Got _NETSCAPE_URL data\n"));
                             const char* castedText =
                                   reinterpret_cast<char*>(mTargetDragData);
@@ -871,7 +871,7 @@
                             int32_t convertedTextLen = 0;
                             nsPrimitiveHelpers::ConvertPlatformPlainTextToUnicode(castedText, mTargetDragDataLen, &convertedText, &convertedTextLen);
                             if ( convertedText ) {
-                                PR_LOG(sDragLm,
+                                MOZ_LOG(sDragLm,
                                        PR_LOG_DEBUG,
                                        ("successfully converted _NETSCAPE_URL \
                                        to unicode.\n"));
@@ -883,7 +883,7 @@
                             }
                         }
                         else {
-                            PR_LOG(sDragLm, PR_LOG_DEBUG,
+                            MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                                    ("failed to get _NETSCAPE_URL data\n"));
                         }
                     }
@@ -908,7 +908,7 @@
                                                genericDataWrapper,
                                                mTargetDragDataLen);
                 // we found one, get out of this loop!
-                PR_LOG(sDragLm, PR_LOG_DEBUG, ("dataFound and converted!\n"));
+                MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("dataFound and converted!\n"));
                 break;
             }
         } // if (currentFlavor)
@@ -922,7 +922,7 @@
 nsDragService::IsDataFlavorSupported(const char *aDataFlavor,
                                      bool *_retval)
 {
-    PR_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::IsDataFlavorSupported %s",
+    MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::IsDataFlavorSupported %s",
                                    aDataFlavor));
     if (!_retval)
         return NS_ERROR_INVALID_ARG;
@@ -932,7 +932,7 @@
 
     // check to make sure that we have a drag object set, here
     if (!mTargetWidget) {
-        PR_LOG(sDragLm, PR_LOG_DEBUG,
+        MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                ("*** warning: IsDataFlavorSupported \
                called without a valid target widget!\n"));
         return NS_OK;
@@ -943,7 +943,7 @@
     // if it is, just look in the internal data since we are the source
     // for it.
     if (isList) {
-        PR_LOG(sDragLm, PR_LOG_DEBUG, ("It's a list.."));
+        MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("It's a list.."));
         uint32_t numDragItems = 0;
         // if we don't have mDataItems we didn't start this drag so it's
         // an external client trying to fool us.
@@ -973,11 +973,11 @@
                         if (currentFlavor) {
                             nsXPIDLCString flavorStr;
                             currentFlavor->ToString(getter_Copies(flavorStr));
-                            PR_LOG(sDragLm, PR_LOG_DEBUG,
+                            MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                                    ("checking %s against %s\n",
                                    (const char *)flavorStr, aDataFlavor));
                             if (strcmp(flavorStr, aDataFlavor) == 0) {
-                                PR_LOG(sDragLm, PR_LOG_DEBUG,
+                                MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                                        ("boioioioiooioioioing!\n"));
                                 *_retval = true;
                             }
@@ -997,10 +997,10 @@
         GdkAtom atom = GDK_POINTER_TO_ATOM(tmp->data);
         gchar *name = nullptr;
         name = gdk_atom_name(atom);
-        PR_LOG(sDragLm, PR_LOG_DEBUG,
+        MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                ("checking %s against %s\n", name, aDataFlavor));
         if (name && (strcmp(name, aDataFlavor) == 0)) {
-            PR_LOG(sDragLm, PR_LOG_DEBUG, ("good!\n"));
+            MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("good!\n"));
             *_retval = true;
         }
         // check for automatic text/uri-list -> text/x-moz-url mapping
@@ -1009,7 +1009,7 @@
             (strcmp(name, gTextUriListType) == 0) &&
             (strcmp(aDataFlavor, kURLMime) == 0 ||
              strcmp(aDataFlavor, kFileMime) == 0)) {
-            PR_LOG(sDragLm, PR_LOG_DEBUG,
+            MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                    ("good! ( it's text/uri-list and \
                    we're checking against text/x-moz-url )\n"));
             *_retval = true;
@@ -1019,7 +1019,7 @@
             name &&
             (strcmp(name, gMozUrlType) == 0) &&
             (strcmp(aDataFlavor, kURLMime) == 0)) {
-            PR_LOG(sDragLm, PR_LOG_DEBUG,
+            MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                    ("good! ( it's _NETSCAPE_URL and \
                    we're checking against text/x-moz-url )\n"));
             *_retval = true;
@@ -1030,7 +1030,7 @@
             (strcmp(name, kTextMime) == 0) &&
             ((strcmp(aDataFlavor, kUnicodeMime) == 0) ||
              (strcmp(aDataFlavor, kFileMime) == 0))) {
-            PR_LOG(sDragLm, PR_LOG_DEBUG,
+            MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                    ("good! ( it's text plain and we're checking \
                    against text/unicode or application/x-moz-file)\n"));
             *_retval = true;
@@ -1043,7 +1043,7 @@
 void
 nsDragService::ReplyToDragMotion(GdkDragContext* aDragContext)
 {
-    PR_LOG(sDragLm, PR_LOG_DEBUG,
+    MOZ_LOG(sDragLm, PR_LOG_DEBUG,
            ("nsDragService::ReplyToDragMotion %d", mCanDrop));
 
     GdkDragAction action = (GdkDragAction)0;
@@ -1077,7 +1077,7 @@
                                   guint              aInfo,
                                   guint32            aTime)
 {
-    PR_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::TargetDataReceived"));
+    MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::TargetDataReceived"));
     TargetResetData();
     mTargetDragDataReceived = true;
     gint len = gtk_selection_data_get_length(aSelectionData);
@@ -1088,7 +1088,7 @@
         memcpy(mTargetDragData, data, mTargetDragDataLen);
     }
     else {
-        PR_LOG(sDragLm, PR_LOG_DEBUG,
+        MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                ("Failed to get data.  selection data len was %d\n",
                 mTargetDragDataLen));
     }
@@ -1131,24 +1131,24 @@
 void
 nsDragService::GetTargetDragData(GdkAtom aFlavor)
 {
-    PR_LOG(sDragLm, PR_LOG_DEBUG, ("getting data flavor %d\n", aFlavor));
-    PR_LOG(sDragLm, PR_LOG_DEBUG, ("mLastWidget is %p and mLastContext is %p\n",
+    MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("getting data flavor %d\n", aFlavor));
+    MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("mLastWidget is %p and mLastContext is %p\n",
                                    mTargetWidget.get(),
                                    mTargetDragContext.get()));
     // reset our target data areas
     TargetResetData();
     gtk_drag_get_data(mTargetWidget, mTargetDragContext, aFlavor, mTargetTime);
     
-    PR_LOG(sDragLm, PR_LOG_DEBUG, ("about to start inner iteration."));
+    MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("about to start inner iteration."));
     PRTime entryTime = PR_Now();
     while (!mTargetDragDataReceived && mDoingDrag) {
         // check the number of iterations
-        PR_LOG(sDragLm, PR_LOG_DEBUG, ("doing iteration...\n"));
+        MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("doing iteration...\n"));
         PR_Sleep(20*PR_TicksPerSecond()/1000);  /* sleep for 20 ms/iteration */
         if (PR_Now()-entryTime > NS_DND_TIMEOUT) break;
         gtk_main_iteration();
     }
-    PR_LOG(sDragLm, PR_LOG_DEBUG, ("finished inner iteration\n"));
+    MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("finished inner iteration\n"));
 }
 
 void
@@ -1186,7 +1186,7 @@
             (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
         listTarget->target = g_strdup(gMimeListType);
         listTarget->flags = 0;
-        PR_LOG(sDragLm, PR_LOG_DEBUG,
+        MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                ("automatically adding target %s\n", listTarget->target));
         targetArray.AppendElement(listTarget);
 
@@ -1222,7 +1222,7 @@
                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
                             listTarget->target = g_strdup(gTextUriListType);
                             listTarget->flags = 0;
-                            PR_LOG(sDragLm, PR_LOG_DEBUG,
+                            MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                                    ("automatically adding target %s\n",
                                     listTarget->target));
                             targetArray.AppendElement(listTarget);
@@ -1256,7 +1256,7 @@
                           (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
                         target->target = g_strdup(flavorStr);
                         target->flags = 0;
-                        PR_LOG(sDragLm, PR_LOG_DEBUG,
+                        MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                                ("adding target %s\n", target->target));
                         targetArray.AppendElement(target);
                         // Check to see if this is text/unicode.
@@ -1268,7 +1268,7 @@
                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
                             plainUTF8Target->target = g_strdup(gTextPlainUTF8Type);
                             plainUTF8Target->flags = 0;
-                            PR_LOG(sDragLm, PR_LOG_DEBUG,
+                            MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                                    ("automatically adding target %s\n",
                                     plainUTF8Target->target));
                             targetArray.AppendElement(plainUTF8Target);
@@ -1277,7 +1277,7 @@
                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
                             plainTarget->target = g_strdup(kTextMime);
                             plainTarget->flags = 0;
-                            PR_LOG(sDragLm, PR_LOG_DEBUG,
+                            MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                                    ("automatically adding target %s\n",
                                     plainTarget->target));
                             targetArray.AppendElement(plainTarget);
@@ -1290,7 +1290,7 @@
                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
                             urlTarget->target = g_strdup(gMozUrlType);
                             urlTarget->flags = 0;
-                            PR_LOG(sDragLm, PR_LOG_DEBUG,
+                            MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                                    ("automatically adding target %s\n",
                                     urlTarget->target));
                             targetArray.AppendElement(urlTarget);
@@ -1467,23 +1467,23 @@
                              GtkSelectionData *aSelectionData,
                              guint32           aTime)
 {
-    PR_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::SourceDataGet"));
+    MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::SourceDataGet"));
     GdkAtom target = gtk_selection_data_get_target(aSelectionData);
     nsXPIDLCString mimeFlavor;
     gchar *typeName = 0;
     typeName = gdk_atom_name(target);
     if (!typeName) {
-        PR_LOG(sDragLm, PR_LOG_DEBUG, ("failed to get atom name.\n"));
+        MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("failed to get atom name.\n"));
         return;
     }
 
-    PR_LOG(sDragLm, PR_LOG_DEBUG, ("Type is %s\n", typeName));
+    MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("Type is %s\n", typeName));
     // make a copy since |nsXPIDLCString| won't use |g_free|...
     mimeFlavor.Adopt(strdup(typeName));
     g_free(typeName);
     // check to make sure that we have data items to return.
     if (!mSourceDataItems) {
-        PR_LOG(sDragLm, PR_LOG_DEBUG, ("Failed to get our data items\n"));
+        MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("Failed to get our data items\n"));
         return;
     }
 
@@ -1628,7 +1628,7 @@
                          GdkDragContext   *aContext,
                          gpointer          aData)
 {
-    PR_LOG(sDragLm, PR_LOG_DEBUG, ("invisibleSourceDragBegin"));
+    MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("invisibleSourceDragBegin"));
     nsDragService *dragService = (nsDragService *)aData;
 
     dragService->SetDragIcon(aContext);
@@ -1642,7 +1642,7 @@
                            guint32           aTime,
                            gpointer          aData)
 {
-    PR_LOG(sDragLm, PR_LOG_DEBUG, ("invisibleSourceDragDataGet"));
+    MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("invisibleSourceDragDataGet"));
     nsDragService *dragService = (nsDragService *)aData;
     dragService->SourceDataGet(aWidget, aContext,
                                aSelectionData, aTime);
@@ -1654,7 +1654,7 @@
                           gint              aResult,
                           gpointer          aData)
 {
-    PR_LOG(sDragLm, PR_LOG_DEBUG, ("invisibleSourceDragFailed %i", aResult));
+    MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("invisibleSourceDragFailed %i", aResult));
     nsDragService *dragService = (nsDragService *)aData;
     // End the drag session now (rather than waiting for the drag-end signal)
     // so that operations performed on dropEffect == none can start immediately
@@ -1672,7 +1672,7 @@
                        GdkDragContext   *aContext,
                        gpointer          aData)
 {
-    PR_LOG(sDragLm, PR_LOG_DEBUG, ("invisibleSourceDragEnd"));
+    MOZ_LOG(sDragLm, PR_LOG_DEBUG, ("invisibleSourceDragEnd"));
     nsDragService *dragService = (nsDragService *)aData;
 
     // The drag has ended.  Release the hostages!
@@ -1816,7 +1816,7 @@
 nsDragService::RunScheduledTask()
 {
     if (mTargetWindow && mTargetWindow != mPendingWindow) {
-        PR_LOG(sDragLm, PR_LOG_DEBUG,
+        MOZ_LOG(sDragLm, PR_LOG_DEBUG,
                ("nsDragService: dispatch drag leave (%p)\n",
                 mTargetWindow.get()));
         mTargetWindow->
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gtk/nsGtkIMModule.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/gtk/nsGtkIMModule.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gtk/nsGtkIMModule.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gtk/nsGtkIMModule.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prtime.h"
 
 #include "nsGtkIMModule.h"
@@ -111,7 +111,7 @@
 void
 nsGtkIMModule::Init()
 {
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): Init, mOwnerWindow=%p",
          this, mOwnerWindow));
 
@@ -178,14 +178,14 @@
     if (this == sLastFocusedModule) {
         sLastFocusedModule = nullptr;
     }
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p) was gone", this));
 }
 
 void
 nsGtkIMModule::OnDestroyWindow(nsWindow* aWindow)
 {
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): OnDestroyWindow, aWindow=%p, mLastFocusedWindow=%p, mOwnerWindow=%p, mLastFocusedModule=%p",
          this, aWindow, mLastFocusedWindow, mOwnerWindow, sLastFocusedModule));
 
@@ -245,7 +245,7 @@
     mLastFocusedWindow = nullptr;
     mInputContext.mIMEState.mEnabled = IMEState::DISABLED;
 
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("    SUCCEEDED, Completely destroyed"));
 }
 
@@ -298,7 +298,7 @@
         return;
     }
 
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): OnFocusWindow, aWindow=%p, mLastFocusedWindow=%p",
          this, aWindow, mLastFocusedWindow));
     mLastFocusedWindow = aWindow;
@@ -312,7 +312,7 @@
         return;
     }
 
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): OnBlurWindow, aWindow=%p, mLastFocusedWindow=%p, "
          "mIsIMFocused=%s",
          this, aWindow, mLastFocusedWindow, GetBoolName(mIsIMFocused)));
@@ -335,7 +335,7 @@
         return false;
     }
 
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): OnKeyEvent, aCaller=%p, aKeyDownEventWasSent=%s, "
          "mCompositionState=%s, current context=%p, active context=%p, "
          "aEvent(%p): { type=%s, keyval=%s, unicode=0x%X }",
@@ -345,7 +345,7 @@
          gdk_keyval_to_unicode(aEvent->keyval)));
 
     if (aCaller != mLastFocusedWindow) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, the caller isn't focused window, mLastFocusedWindow=%p",
              mLastFocusedWindow));
         return false;
@@ -355,7 +355,7 @@
     // current context since the user expects so.
     GtkIMContext* currentContext = GetCurrentContext();
     if (MOZ_UNLIKELY(!currentContext)) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, there are no context"));
         return false;
     }
@@ -398,7 +398,7 @@
         }
     }
 
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("    filterThisEvent=%s (isFiltered=%s, mFilterKeyEvent=%s), "
          "mCompositionState=%s",
          GetBoolName(filterThisEvent), GetBoolName(isFiltered),
@@ -410,7 +410,7 @@
 void
 nsGtkIMModule::OnFocusChangeInGecko(bool aFocus)
 {
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): OnFocusChangeInGecko, aFocus=%s, "
          "mCompositionState=%s, mIsIMFocused=%s",
          this, GetBoolName(aFocus), GetCompositionStateName(),
@@ -423,13 +423,13 @@
 void
 nsGtkIMModule::ResetIME()
 {
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): ResetIME, mCompositionState=%s, mIsIMFocused=%s",
          this, GetCompositionStateName(), GetBoolName(mIsIMFocused)));
 
     GtkIMContext* activeContext = GetActiveContext();
     if (MOZ_UNLIKELY(!activeContext)) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, there are no context"));
         return;
     }
@@ -450,7 +450,7 @@
     nsAutoString compositionString;
     GetCompositionString(activeContext, compositionString);
 
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): ResetIME() called gtk_im_context_reset(), "
          "activeContext=%p, mCompositionState=%s, compositionString=%s, "
          "mIsIMFocused=%s",
@@ -476,13 +476,13 @@
         return NS_OK;
     }
 
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): EndIMEComposition, aCaller=%p, "
          "mCompositionState=%s",
          this, aCaller, GetCompositionStateName()));
 
     if (aCaller != mLastFocusedWindow) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    WARNING: the caller isn't focused window, mLastFocusedWindow=%p",
              mLastFocusedWindow));
         return NS_OK;
@@ -524,20 +524,20 @@
         return;
     }
 
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): SetInputContext, aCaller=%p, aState=%s mHTMLInputType=%s",
          this, aCaller, GetEnabledStateName(aContext->mIMEState.mEnabled),
          NS_ConvertUTF16toUTF8(aContext->mHTMLInputType).get()));
 
     if (aCaller != mLastFocusedWindow) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, the caller isn't focused window, mLastFocusedWindow=%p",
              mLastFocusedWindow));
         return;
     }
 
     if (!mContext) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, there are no context"));
         return;
     }
@@ -545,7 +545,7 @@
 
     if (sLastFocusedModule != this) {
         mInputContext = *aContext;
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    SUCCEEDED, but we're not active"));
         return;
     }
@@ -658,7 +658,7 @@
 void
 nsGtkIMModule::Focus()
 {
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): Focus, sLastFocusedModule=%p",
          this, sLastFocusedModule));
 
@@ -670,7 +670,7 @@
 
     GtkIMContext* currentContext = GetCurrentContext();
     if (!currentContext) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, there are no context"));
         return;
     }
@@ -694,7 +694,7 @@
 void
 nsGtkIMModule::Blur()
 {
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): Blur, mIsIMFocused=%s",
          this, GetBoolName(mIsIMFocused)));
 
@@ -704,7 +704,7 @@
 
     GtkIMContext* currentContext = GetCurrentContext();
     if (!currentContext) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, there are no context"));
         return;
     }
@@ -720,14 +720,14 @@
         return;
     }
 
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): OnSelectionChange(aCaller=0x%p), "
          "mCompositionState=%s, mIsDeletingSurrounding=%s",
          this, aCaller, GetCompositionStateName(),
          mIsDeletingSurrounding ? "true" : "false"));
 
     if (aCaller != mLastFocusedWindow) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    WARNING: the caller isn't focused window, "
              "mLastFocusedWindow=%p",
              mLastFocusedWindow));
@@ -748,26 +748,26 @@
 
         bool cannotContinueComposition = false;
         if (MOZ_UNLIKELY(IsDestroyed())) {
-            PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+            MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
                 ("    ERROR: nsGtkIMModule instance is destroyed during "
                  "querying selection offset"));
             return;
         } else if (NS_WARN_IF(!selection.mSucceeded)) {
             cannotContinueComposition = true;
-            PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+            MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
                 ("    ERROR: failed to retrieve new caret offset"));
         } else if (selection.mReply.mOffset == UINT32_MAX) {
             cannotContinueComposition = true;
-            PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+            MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
                 ("    ERROR: new offset is too large, cannot keep composing"));
         } else if (!mLastFocusedWindow || focusedWindow != mLastFocusedWindow) {
             cannotContinueComposition = true;
-            PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+            MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
                 ("    ERROR: focus is changed during querying selection "
                  "offset"));
         } else if (focusedWindow->Destroyed()) {
             cannotContinueComposition = true;
-            PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+            MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
                 ("    ERROR: focused window started to be being destroyed "
                  "during querying selection offset"));
         }
@@ -775,7 +775,7 @@
         if (!cannotContinueComposition) {
             // Modify the selection start offset with new offset.
             mCompositionStart = selection.mReply.mOffset;
-            PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+            MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
                 ("    NOTE: mCompositionStart is updated to %u, "
                  "the selection change doesn't cause resetting IM context",
                  mCompositionStart));
@@ -805,14 +805,14 @@
 void
 nsGtkIMModule::OnStartCompositionNative(GtkIMContext *aContext)
 {
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): OnStartCompositionNative, aContext=%p, "
          "current context=%p",
          this, aContext, GetCurrentContext()));
 
     // See bug 472635, we should do nothing if IM context doesn't match.
     if (GetCurrentContext() != aContext) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, given context doesn't match"));
         return;
     }
@@ -836,7 +836,7 @@
 void
 nsGtkIMModule::OnEndCompositionNative(GtkIMContext *aContext)
 {
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): OnEndCompositionNative, aContext=%p",
          this, aContext));
 
@@ -844,7 +844,7 @@
     // Note that if this is called after focus move, the context may different
     // from any our owning context.
     if (!IsValidContext(aContext)) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, given context doesn't match with any context"));
         return;
     }
@@ -872,7 +872,7 @@
 void
 nsGtkIMModule::OnChangeCompositionNative(GtkIMContext *aContext)
 {
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): OnChangeCompositionNative, aContext=%p",
          this, aContext));
 
@@ -880,7 +880,7 @@
     // Note that if this is called after focus move, the context may different
     // from any our owning context.
     if (!IsValidContext(aContext)) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, given context doesn't match with any context"));
         return;
     }
@@ -907,14 +907,14 @@
 gboolean
 nsGtkIMModule::OnRetrieveSurroundingNative(GtkIMContext *aContext)
 {
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): OnRetrieveSurroundingNative, aContext=%p, "
          "current context=%p",
          this, aContext, GetCurrentContext()));
 
     // See bug 472635, we should do nothing if IM context doesn't match.
     if (GetCurrentContext() != aContext) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, given context doesn't match"));
         return FALSE;
     }
@@ -948,14 +948,14 @@
                                          gint           aOffset,
                                          gint           aNChars)
 {
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): OnDeleteSurroundingNative, aContext=%p, "
          "current context=%p",
          this, aContext, GetCurrentContext()));
 
     // See bug 472635, we should do nothing if IM context doesn't match.
     if (GetCurrentContext() != aContext) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, given context doesn't match"));
         return FALSE;
     }
@@ -967,7 +967,7 @@
     }
 
     // failed
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("    FAILED, cannot delete text"));
     return FALSE;
 }
@@ -988,7 +988,7 @@
     const gchar emptyStr = 0;
     const gchar *commitString = aUTF8Char ? aUTF8Char : &emptyStr;
 
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): OnCommitCompositionNative, aContext=%p, "
          "current context=%p, active context=%p, commitString=\"%s\", "
          "mProcessingKeyEvent=%p, IsComposingOn(aContext)=%s",
@@ -997,7 +997,7 @@
 
     // See bug 472635, we should do nothing if IM context doesn't match.
     if (!IsValidContext(aContext)) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, given context doesn't match"));
         return;
     }
@@ -1027,7 +1027,7 @@
         keyval_utf8[keyval_utf8_len] = '\0';
 
         if (!strcmp(commitString, keyval_utf8)) {
-            PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+            MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
                 ("GtkIMModule(%p): OnCommitCompositionNative, we'll send normal key event",
                  this));
             mFilterKeyEvent = false;
@@ -1055,7 +1055,7 @@
         aCompositionString.Truncate();
     }
 
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): GetCompositionString, result=\"%s\"",
          this, preedit_string));
 
@@ -1066,18 +1066,18 @@
 bool
 nsGtkIMModule::DispatchCompositionStart(GtkIMContext* aContext)
 {
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): DispatchCompositionStart, aContext=%p",
          this, aContext));
 
     if (IsComposing()) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    WARNING, we're already in composition"));
         return true;
     }
 
     if (!mLastFocusedWindow) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, there are no focused window in this module"));
         return false;
     }
@@ -1089,7 +1089,7 @@
     mLastFocusedWindow->DispatchEvent(&selection, status);
 
     if (!selection.mSucceeded || selection.mReply.mOffset == UINT32_MAX) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, cannot query the selection offset"));
         return false;
     }
@@ -1109,17 +1109,17 @@
         bool isCancelled;
         mLastFocusedWindow->DispatchKeyDownEvent(mProcessingKeyEvent,
                                                  &isCancelled);
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    keydown event is dispatched"));
         if (static_cast<nsWindow*>(kungFuDeathGrip.get())->IsDestroyed() ||
             kungFuDeathGrip != mLastFocusedWindow) {
-            PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+            MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
                 ("    NOTE, the focused widget was destroyed/changed by keydown event"));
             return false;
         }
     }
 
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("    mCompositionStart=%u", mCompositionStart));
     mCompositionState = eCompositionState_CompositionStartDispatched;
     WidgetCompositionEvent compEvent(true, NS_COMPOSITION_START,
@@ -1129,7 +1129,7 @@
     mLastFocusedWindow->DispatchEvent(&compEvent, status);
     if (static_cast<nsWindow*>(kungFuDeathGrip.get())->IsDestroyed() ||
         kungFuDeathGrip != mLastFocusedWindow) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    NOTE, the focused widget was destroyed/changed by compositionstart event"));
         return false;
     }
@@ -1142,18 +1142,18 @@
                    GtkIMContext* aContext,
                    const nsAString& aCompositionString)
 {
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): DispatchCompositionChangeEvent, aContext=%p",
          this, aContext));
 
     if (!mLastFocusedWindow) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, there are no focused window in this module"));
         return false;
     }
 
     if (!IsComposing()) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    The composition wasn't started, force starting..."));
         nsCOMPtr<nsIWidget> kungFuDeathGrip = mLastFocusedWindow;
         if (!DispatchCompositionStart(aContext)) {
@@ -1197,7 +1197,7 @@
     mLastFocusedWindow->DispatchEvent(&compositionChangeEvent, status);
     if (lastFocusedWindow->IsDestroyed() ||
         lastFocusedWindow != mLastFocusedWindow) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    NOTE, the focused widget was destroyed/changed by "
              "compositionchange event"));
         return false;
@@ -1216,26 +1216,26 @@
                    GtkIMContext* aContext,
                    const nsAString* aCommitString)
 {
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): DispatchCompositionCommitEvent, aContext=%p, "
          "aCommitString=%p, (\"%s\")",
          this, aContext, aCommitString,
          aCommitString ? NS_ConvertUTF16toUTF8(*aCommitString).get() : ""));
 
     if (!mLastFocusedWindow) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, there are no focused window in this module"));
         return false;
     }
 
     if (!IsComposing()) {
         if (!aCommitString || aCommitString->IsEmpty()) {
-            PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+            MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
                 ("    FAILED, there is no composition and empty commit "
                  "string"));
             return true;
         }
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    The composition wasn't started, force starting..."));
         nsCOMPtr<nsIWidget> kungFuDeathGrip(mLastFocusedWindow);
         if (!DispatchCompositionStart(aContext)) {
@@ -1264,7 +1264,7 @@
 
     if (lastFocusedWindow->IsDestroyed() ||
         lastFocusedWindow != mLastFocusedWindow) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    NOTE, the focused widget was destroyed/changed by "
              "compositioncommit event"));
         return false;
@@ -1277,7 +1277,7 @@
 nsGtkIMModule::CreateTextRangeArray(GtkIMContext* aContext,
                                     const nsAString& aLastDispatchedData)
 {
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): CreateTextRangeArray, aContext=%p, "
          "aLastDispatchedData=\"%s\" (length=%u)",
          this, aContext, NS_ConvertUTF16toUTF8(aLastDispatchedData).get(),
@@ -1291,7 +1291,7 @@
     gtk_im_context_get_preedit_string(aContext, &preedit_string,
                                       &feedback_list, &cursor_pos);
     if (!preedit_string || !*preedit_string) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    preedit_string is null"));
         pango_attr_list_unref(feedback_list);
         g_free(preedit_string);
@@ -1301,7 +1301,7 @@
     PangoAttrIterator* iter;
     iter = pango_attr_list_get_iterator(feedback_list);
     if (!iter) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, iterator couldn't be allocated"));
         pango_attr_list_unref(feedback_list);
         g_free(preedit_string);
@@ -1373,7 +1373,7 @@
 
         textRangeArray->AppendElement(range);
 
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    mStartOffset=%u, mEndOffset=%u, mRangeType=%s",
              range.mStartOffset, range.mEndOffset,
              GetRangeTypeName(range.mRangeType)));
@@ -1391,7 +1391,7 @@
     range.mRangeType = NS_TEXTRANGE_CARETPOSITION;
     textRangeArray->AppendElement(range);
 
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("    mStartOffset=%u, mEndOffset=%u, mRangeType=%s",
          range.mStartOffset, range.mEndOffset,
          GetRangeTypeName(range.mRangeType)));
@@ -1407,24 +1407,24 @@
 nsGtkIMModule::SetCursorPosition(GtkIMContext* aContext,
                                  uint32_t aTargetOffset)
 {
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): SetCursorPosition, aContext=%p, aTargetOffset=%u",
          this, aContext, aTargetOffset));
 
     if (aTargetOffset == UINT32_MAX) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, aTargetOffset is wrong offset"));
         return;
     }
 
     if (!mLastFocusedWindow) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, there are no focused window"));
         return;
     }
 
     if (MOZ_UNLIKELY(!aContext)) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, there are no context"));
         return;
     }
@@ -1436,7 +1436,7 @@
     nsEventStatus status;
     mLastFocusedWindow->DispatchEvent(&charRect, status);
     if (!charRect.mSucceeded) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, NS_QUERY_TEXT_RECT was failed"));
         return;
     }
@@ -1464,12 +1464,12 @@
 nsresult
 nsGtkIMModule::GetCurrentParagraph(nsAString& aText, uint32_t& aCursorPos)
 {
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): GetCurrentParagraph, mCompositionState=%s",
          this, GetCompositionStateName()));
 
     if (!mLastFocusedWindow) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, there are no focused window in this module"));
         return NS_ERROR_NULL_POINTER;
     }
@@ -1493,7 +1493,7 @@
         selLength = querySelectedTextEvent.mReply.mString.Length();
     }
 
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("        selOffset=%u, selLength=%u",
          selOffset, selLength));
 
@@ -1502,7 +1502,7 @@
     //     than INT32_MAX.
     if (selOffset > INT32_MAX || selLength > INT32_MAX ||
         selOffset + selLength > INT32_MAX) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, The selection is out of range"));
         return NS_ERROR_FAILURE;
     }
@@ -1517,7 +1517,7 @@
 
     nsAutoString textContent(queryTextContentEvent.mReply.mString);
     if (selOffset + selLength > textContent.Length()) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, The selection is invalid, textContent.Length()=%u",
              textContent.Length()));
         return NS_ERROR_FAILURE;
@@ -1542,7 +1542,7 @@
     aText = nsDependentSubstring(textContent, parStart, parEnd - parStart);
     aCursorPos = selOffset - uint32_t(parStart);
 
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("    aText=%s, aText.Length()=%u, aCursorPos=%u",
          NS_ConvertUTF16toUTF8(aText).get(),
          aText.Length(), aCursorPos));
@@ -1555,19 +1555,19 @@
                           int32_t aOffset,
                           uint32_t aNChars)
 {
-    PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("GtkIMModule(%p): DeleteText, aContext=%p, aOffset=%d, aNChars=%d, "
          "mCompositionState=%s",
          this, aContext, aOffset, aNChars, GetCompositionStateName()));
 
     if (!mLastFocusedWindow) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, there are no focused window in this module"));
         return NS_ERROR_NULL_POINTER;
     }
 
     if (!aNChars) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, aNChars must not be zero"));
         return NS_ERROR_INVALID_ARG;
     }
@@ -1583,7 +1583,7 @@
     if (wasComposing) {
         selOffset = mCompositionStart;
         if (!DispatchCompositionCommitEvent(aContext, &mSelectedString)) {
-            PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+            MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
                 ("    FAILED, quitting from DeletText"));
             return NS_ERROR_FAILURE;
         }
@@ -1606,7 +1606,7 @@
     mLastFocusedWindow->DispatchEvent(&queryTextContentEvent, status);
     NS_ENSURE_TRUE(queryTextContentEvent.mSucceeded, NS_ERROR_FAILURE);
     if (queryTextContentEvent.mReply.mString.IsEmpty()) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, there is no contents"));
         return NS_ERROR_FAILURE;
     }
@@ -1617,7 +1617,7 @@
     glong offsetInUTF8Characters =
         g_utf8_strlen(utf8Str.get(), utf8Str.Length()) + aOffset;
     if (offsetInUTF8Characters < 0) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, aOffset is too small for current cursor pos "
              "(computed offset: %d)",
              offsetInUTF8Characters));
@@ -1632,7 +1632,7 @@
     glong endInUTF8Characters =
         offsetInUTF8Characters + aNChars;
     if (countOfCharactersInUTF8 < endInUTF8Characters) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, aNChars is too large for current contents "
              "(content length: %d, computed end offset: %d)",
              countOfCharactersInUTF8, endInUTF8Characters));
@@ -1666,7 +1666,7 @@
     if (!selectionEvent.mSucceeded ||
         lastFocusedWindow != mLastFocusedWindow ||
         lastFocusedWindow->Destroyed()) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, setting selection caused focus change "
              "or window destroyed"));
         return NS_ERROR_FAILURE;
@@ -1681,7 +1681,7 @@
     if (!contentCommandEvent.mSucceeded ||
         lastFocusedWindow != mLastFocusedWindow ||
         lastFocusedWindow->Destroyed()) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, deleting the selection caused focus change "
              "or window destroyed"));
         return NS_ERROR_FAILURE;
@@ -1693,7 +1693,7 @@
 
     // Restore the composition at new caret position.
     if (!DispatchCompositionStart(aContext)) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, resterting composition start"));
         return NS_ERROR_FAILURE;
     }
@@ -1705,7 +1705,7 @@
     nsAutoString compositionString;
     GetCompositionString(aContext, compositionString);
     if (!DispatchCompositionChangeEvent(aContext, compositionString)) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    FAILED, restoring composition string"));
         return NS_ERROR_FAILURE;
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gtk/nsGtkKeyUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/gtk/nsGtkKeyUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gtk/nsGtkKeyUtils.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gtk/nsGtkKeyUtils.cpp	2015-05-25 20:44:09.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 "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "nsGtkKeyUtils.h"
 
@@ -156,7 +156,7 @@
     if (!gKeymapWrapperLog) {
         gKeymapWrapperLog = PR_NewLogModule("KeymapWrapperWidgets");
     }
-    PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
         ("KeymapWrapper(%p): Constructor, mGdkKeymap=%p",
          this, mGdkKeymap));
 
@@ -181,7 +181,7 @@
     }
     mInitialized = true;
 
-    PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
         ("KeymapWrapper(%p): Init, mGdkKeymap=%p",
          this, mGdkKeymap));
 
@@ -193,7 +193,7 @@
 
     gdk_window_add_filter(nullptr, FilterEvents, this);
 
-    PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
         ("KeymapWrapper(%p): Init, CapsLock=0x%X, NumLock=0x%X, "
          "ScrollLock=0x%X, Level3=0x%X, Level5=0x%X, "
          "Shift=0x%X, Ctrl=0x%X, Alt=0x%X, Meta=0x%X, Super=0x%X, Hyper=0x%X",
@@ -214,7 +214,7 @@
     int xkbMajorVer = XkbMajorVersion;
     int xkbMinorVer = XkbMinorVersion;
     if (!XkbLibraryVersion(&xkbMajorVer, &xkbMinorVer)) {
-        PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
                ("KeymapWrapper(%p): InitXKBExtension failed due to failure of "
                 "XkbLibraryVersion()", this));
         return;
@@ -232,7 +232,7 @@
     int opcode, baseErrorCode;
     if (!XkbQueryExtension(display, &opcode, &mXKBBaseEventCode, &baseErrorCode,
                            &xkbMajorVer, &xkbMinorVer)) {
-        PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
                ("KeymapWrapper(%p): InitXKBExtension failed due to failure of "
                 "XkbQueryExtension(), display=0x%p", this, display));
         return;
@@ -240,7 +240,7 @@
 
     if (!XkbSelectEventDetails(display, XkbUseCoreKbd, XkbStateNotify,
                                XkbModifierStateMask, XkbModifierStateMask)) {
-        PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
                ("KeymapWrapper(%p): InitXKBExtension failed due to failure of "
                 "XkbSelectEventDetails() for XModifierStateMask, display=0x%p",
                 this, display));
@@ -249,7 +249,7 @@
 
     if (!XkbSelectEventDetails(display, XkbUseCoreKbd, XkbControlsNotify,
                                XkbPerKeyRepeatMask, XkbPerKeyRepeatMask)) {
-        PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
                ("KeymapWrapper(%p): InitXKBExtension failed due to failure of "
                 "XkbSelectEventDetails() for XkbControlsNotify, display=0x%p",
                 this, display));
@@ -257,21 +257,21 @@
     }
 
     if (!XGetKeyboardControl(display, &mKeyboardState)) {
-        PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
                ("KeymapWrapper(%p): InitXKBExtension failed due to failure of "
                 "XGetKeyboardControl(), display=0x%p",
                 this, display));
         return;
     }
 
-    PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
            ("KeymapWrapper(%p): InitXKBExtension, Succeeded", this));
 }
 
 void
 KeymapWrapper::InitBySystemSettings()
 {
-    PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
       ("KeymapWrapper(%p): InitBySystemSettings, mGdkKeymap=%p",
        this, mGdkKeymap));
 
@@ -287,7 +287,7 @@
                                           max_keycode - min_keycode + 1,
                                           &keysyms_per_keycode);
     if (!xkeymap) {
-        PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
             ("KeymapWrapper(%p): InitBySystemSettings, "
              "Failed due to null xkeymap", this));
         return;
@@ -295,13 +295,13 @@
 
     XModifierKeymap* xmodmap = XGetModifierMapping(display);
     if (!xmodmap) {
-        PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
             ("KeymapWrapper(%p): InitBySystemSettings, "
              "Failed due to null xmodmap", this));
         XFree(xkeymap);
         return;
     }
-    PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
         ("KeymapWrapper(%p): InitBySystemSettings, min_keycode=%d, "
          "max_keycode=%d, keysyms_per_keycode=%d, max_keypermod=%d",
          this, min_keycode, max_keycode, keysyms_per_keycode,
@@ -328,7 +328,7 @@
     const uint32_t map_size = 8 * xmodmap->max_keypermod;
     for (uint32_t i = 0; i < map_size; i++) {
         KeyCode keycode = xmodmap->modifiermap[i];
-        PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
             ("KeymapWrapper(%p): InitBySystemSettings, "
              "  i=%d, keycode=0x%08X",
              this, i, keycode));
@@ -355,7 +355,7 @@
         const int32_t modIndex = bit - 3;
         for (int32_t j = 0; j < keysyms_per_keycode; j++) {
             Modifier modifier = GetModifierForGDKKeyval(syms[j]);
-            PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+            MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
                 ("KeymapWrapper(%p): InitBySystemSettings, "
                  "    Mod%d, j=%d, syms[j]=%s(0x%X), modifier=%s",
                  this, modIndex + 1, j, gdk_keyval_name(syms[j]), syms[j],
@@ -437,7 +437,7 @@
 {
     gdk_window_remove_filter(nullptr, FilterEvents, this);
     NS_IF_RELEASE(sBidiKeyboard);
-    PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
         ("KeymapWrapper(%p): Destructor", this));
 }
 
@@ -500,7 +500,7 @@
             }
             if (!XGetKeyboardControl(xkbEvent->any.display,
                                      &self->mKeyboardState)) {
-                PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+                MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
                        ("KeymapWrapper(%p): FilterEvents failed due to failure "
                         "of XGetKeyboardControl(), display=0x%p",
                         self, xkbEvent->any.display));
@@ -516,7 +516,7 @@
 KeymapWrapper::OnDestroyKeymap(KeymapWrapper* aKeymapWrapper,
                                GdkKeymap *aGdkKeymap)
 {
-    PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
         ("KeymapWrapper: OnDestroyKeymap, aGdkKeymap=%p, aKeymapWrapper=%p",
          aGdkKeymap, aKeymapWrapper));
     MOZ_ASSERT(aKeymapWrapper == sInstance,
@@ -529,7 +529,7 @@
 KeymapWrapper::OnKeysChanged(GdkKeymap *aGdkKeymap,
                              KeymapWrapper* aKeymapWrapper)
 {
-    PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
         ("KeymapWrapper: OnKeysChanged, aGdkKeymap=%p, aKeymapWrapper=%p",
          aGdkKeymap, aKeymapWrapper));
 
@@ -624,7 +624,7 @@
         aInputEvent.modifiers |= MODIFIER_SCROLLLOCK;
     }
 
-    PR_LOG(gKeymapWrapperLog, PR_LOG_DEBUG,
+    MOZ_LOG(gKeymapWrapperLog, PR_LOG_DEBUG,
         ("KeymapWrapper(%p): InitInputEvent, aModifierState=0x%08X, "
          "aInputEvent.modifiers=0x%04X (Shift: %s, Control: %s, Alt: %s, "
          "Meta: %s, OS: %s, AltGr: %s, "
@@ -663,7 +663,7 @@
         mouseEvent.buttons |= WidgetMouseEvent::eMiddleButtonFlag;
     }
 
-    PR_LOG(gKeymapWrapperLog, PR_LOG_DEBUG,
+    MOZ_LOG(gKeymapWrapperLog, PR_LOG_DEBUG,
         ("KeymapWrapper(%p): InitInputEvent, aInputEvent has buttons, "
          "aInputEvent.buttons=0x%04X (Left: %s, Right: %s, Middle: %s, "
          "4th (BACK): %s, 5th (FORWARD): %s)",
@@ -973,7 +973,7 @@
             break;
     }
 
-    PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
         ("KeymapWrapper(%p): InitKeyEvent, modifierState=0x%08X "
          "aGdkKeyEvent={ type=%s, keyval=%s(0x%X), state=0x%08X, "
          "hardware_keycode=0x%08X, is_modifier=%s } "
@@ -1330,7 +1330,7 @@
 
     aKeyEvent.charCode = GetCharCodeFor(aGdkKeyEvent);
     if (!aKeyEvent.charCode) {
-        PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
             ("KeymapWrapper(%p): InitKeypressEvent, "
              "keyCode=0x%02X, charCode=0x%08X",
              this, aKeyEvent.keyCode, aKeyEvent.charCode));
@@ -1345,7 +1345,7 @@
     // work.
     if (!aKeyEvent.IsControl() && !aKeyEvent.IsAlt() &&
         !aKeyEvent.IsMeta() && !aKeyEvent.IsOS()) {
-        PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
             ("KeymapWrapper(%p): InitKeypressEvent, "
              "keyCode=0x%02X, charCode=0x%08X",
              this, aKeyEvent.keyCode, aKeyEvent.charCode));
@@ -1354,7 +1354,7 @@
 
     gint level = GetKeyLevel(aGdkKeyEvent);
     if (level != 0 && level != 1) {
-        PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
             ("KeymapWrapper(%p): InitKeypressEvent, "
              "keyCode=0x%02X, charCode=0x%08X, level=%d",
              this, aKeyEvent.keyCode, aKeyEvent.charCode, level));
@@ -1394,7 +1394,7 @@
     // If current keyboard layout can input Latin characters, we don't need
     // more information.
     if (!needLatinKeyCodes) {
-        PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
             ("KeymapWrapper(%p): InitKeypressEvent, keyCode=0x%02X, "
              "charCode=0x%08X, level=%d, altCharCodes={ "
              "mUnshiftedCharCode=0x%08X, mShiftedCharCode=0x%08X }",
@@ -1406,7 +1406,7 @@
     // Next, find Latin inputtable keyboard layout.
     gint minGroup = GetFirstLatinGroup();
     if (minGroup < 0) {
-        PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
             ("KeymapWrapper(%p): InitKeypressEvent, "
              "Latin keyboard layout isn't found: "
              "keyCode=0x%02X, charCode=0x%08X, level=%d, "
@@ -1447,7 +1447,7 @@
         aKeyEvent.charCode = ch;
     }
 
-    PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
         ("KeymapWrapper(%p): InitKeypressEvent, "
          "keyCode=0x%02X, charCode=0x%08X, level=%d, minGroup=%d, "
          "altCharCodes={ mUnshiftedCharCode=0x%08X, "
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gtk/nsIdleServiceGTK.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/gtk/nsIdleServiceGTK.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gtk/nsIdleServiceGTK.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gtk/nsIdleServiceGTK.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -11,7 +11,7 @@
 #include "nsIServiceManager.h"
 #include "nsDebug.h"
 #include "prlink.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 static PRLogModuleInfo* sIdleLog = nullptr;
 
@@ -39,7 +39,7 @@
     PRLibrary* xsslib = PR_LoadLibrary("libXss.so.1");
     if (!xsslib) // ouch.
     {
-        PR_LOG(sIdleLog, PR_LOG_WARNING, ("Failed to find libXss.so!\n"));
+        MOZ_LOG(sIdleLog, PR_LOG_WARNING, ("Failed to find libXss.so!\n"));
         return;
     }
 
@@ -51,11 +51,11 @@
         PR_FindFunctionSymbol(xsslib, "XScreenSaverQueryInfo");
 
     if (!_XSSQueryExtension)
-        PR_LOG(sIdleLog, PR_LOG_WARNING, ("Failed to get XSSQueryExtension!\n"));
+        MOZ_LOG(sIdleLog, PR_LOG_WARNING, ("Failed to get XSSQueryExtension!\n"));
     if (!_XSSAllocInfo)
-        PR_LOG(sIdleLog, PR_LOG_WARNING, ("Failed to get XSSAllocInfo!\n"));
+        MOZ_LOG(sIdleLog, PR_LOG_WARNING, ("Failed to get XSSAllocInfo!\n"));
     if (!_XSSQueryInfo)
-        PR_LOG(sIdleLog, PR_LOG_WARNING, ("Failed to get XSSQueryInfo!\n"));
+        MOZ_LOG(sIdleLog, PR_LOG_WARNING, ("Failed to get XSSQueryInfo!\n"));
 
     sInitialized = true;
 }
@@ -99,7 +99,7 @@
     // We might not have a display (cf. in xpcshell)
     Display *dplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
     if (!dplay) {
-        PR_LOG(sIdleLog, PR_LOG_WARNING, ("No display found!\n"));
+        MOZ_LOG(sIdleLog, PR_LOG_WARNING, ("No display found!\n"));
         return false;
     }
 
@@ -119,7 +119,7 @@
         return true;
     }
     // If we get here, we couldn't get to XScreenSaver:
-    PR_LOG(sIdleLog, PR_LOG_WARNING, ("XSSQueryExtension returned false!\n"));
+    MOZ_LOG(sIdleLog, PR_LOG_WARNING, ("XSSQueryExtension returned false!\n"));
     return false;
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gtk/nsNativeThemeGTK.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/gtk/nsNativeThemeGTK.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gtk/nsNativeThemeGTK.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gtk/nsNativeThemeGTK.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -33,6 +33,18 @@
 #include "gfxContext.h"
 #include "gfxPlatformGtk.h"
 #include "gfxGdkNativeRenderer.h"
+#include "mozilla/gfx/BorrowedContext.h"
+#include "mozilla/gfx/HelpersCairo.h"
+
+#ifdef MOZ_X11
+#  ifdef CAIRO_HAS_XLIB_SURFACE
+#    include "cairo-xlib.h"
+#  endif
+#  ifdef CAIRO_HAS_XLIB_XRENDER_SURFACE
+#    include "cairo-xlib-xrender.h"
+#  endif
+#endif
+
 #include <algorithm>
 #include <dlfcn.h>
 
@@ -702,6 +714,159 @@
 
   return NS_OK;
 }
+#else
+static void
+DrawThemeWithCairo(gfxContext* aContext, DrawTarget* aDrawTarget,
+                   GtkWidgetState aState, GtkThemeWidgetType aGTKWidgetType,
+                   gint aFlags, GtkTextDirection aDirection, gint aScaleFactor,
+                   bool aSnapped, const Point& aDrawOrigin, const nsIntSize& aDrawSize,
+                   GdkRectangle& aGDKRect, nsITheme::Transparency aTransparency)
+{
+#ifndef MOZ_TREE_CAIRO
+  // Directly use the Cairo draw target to render the widget if using system Cairo everywhere.
+  BorrowedCairoContext borrow(aDrawTarget);
+  if (borrow.mCairo) {
+    if (aSnapped) {
+      cairo_identity_matrix(borrow.mCairo);
+    }
+    if (aDrawOrigin != Point(0, 0)) {
+      cairo_translate(borrow.mCairo, aDrawOrigin.x, aDrawOrigin.y);
+    }
+    if (aScaleFactor != 1) {
+      cairo_scale(borrow.mCairo, aScaleFactor, aScaleFactor);
+    }
+
+    moz_gtk_widget_paint(aGTKWidgetType, borrow.mCairo, &aGDKRect, &aState, aFlags, aDirection);
+
+    borrow.Finish();
+    return;
+  }
+#endif
+
+  // A direct Cairo draw target is not available, so we need to create a temporary one.
+  bool needClip = !aSnapped || aContext->HasComplexClip();
+#if defined(MOZ_X11) && defined(CAIRO_HAS_XLIB_SURFACE)
+  if (!needClip) {
+    // If using a Cairo xlib surface, then try to reuse it.
+    BorrowedXlibDrawable borrow(aDrawTarget);
+    if (borrow.GetDrawable()) {
+      nsIntSize size = aDrawTarget->GetSize();
+      cairo_surface_t* surf = nullptr;
+      // Check if the surface is using XRender.
+#ifdef CAIRO_HAS_XLIB_XRENDER_SURFACE
+      if (borrow.GetXRenderFormat()) {
+        surf = cairo_xlib_surface_create_with_xrender_format(
+          borrow.GetDisplay(), borrow.GetDrawable(), borrow.GetScreen(),
+          borrow.GetXRenderFormat(), size.width, size.height);
+      } else {
+#else
+      if (! borrow.GetXRenderFormat()) {
+#endif
+        surf = cairo_xlib_surface_create(
+          borrow.GetDisplay(), borrow.GetDrawable(), borrow.GetVisual(),
+          size.width, size.height);
+      }
+      if (!NS_WARN_IF(!surf)) {
+        cairo_t* cr = cairo_create(surf);
+        if (!NS_WARN_IF(!cr)) {
+          cairo_new_path(cr);
+          cairo_rectangle(cr, aDrawOrigin.x, aDrawOrigin.y, aDrawSize.width, aDrawSize.height);
+          cairo_clip(cr);
+          if (aDrawOrigin != Point(0, 0)) {
+            cairo_translate(cr, aDrawOrigin.x, aDrawOrigin.y);
+          }
+          if (aScaleFactor != 1) {
+            cairo_scale(cr, aScaleFactor, aScaleFactor);
+          }
+
+          moz_gtk_widget_paint(aGTKWidgetType, cr, &aGDKRect, &aState, aFlags, aDirection);
+
+          cairo_destroy(cr);
+        }
+        cairo_surface_destroy(surf);
+      }
+      borrow.Finish();
+      return;
+    }
+  }
+#endif
+
+  // Check if the widget requires complex masking that must be composited.
+  // Try to directly write to the draw target's pixels if possible.
+  uint8_t* data;
+  nsIntSize size;
+  int32_t stride;
+  SurfaceFormat format;
+  if (!needClip && aDrawTarget->LockBits(&data, &size, &stride, &format)) {
+    // Create a Cairo image surface context the device rectangle.
+    cairo_surface_t* surf =
+      cairo_image_surface_create_for_data(
+        data + int32_t(aDrawOrigin.y) * stride + int32_t(aDrawOrigin.x) * BytesPerPixel(format),
+        GfxFormatToCairoFormat(format), aDrawSize.width, aDrawSize.height, stride);
+    if (!NS_WARN_IF(!surf)) {
+      cairo_t* cr = cairo_create(surf);
+      if (!NS_WARN_IF(!cr)) {
+        if (aScaleFactor != 1) {
+          cairo_scale(cr, aScaleFactor, aScaleFactor);
+        }
+
+        moz_gtk_widget_paint(aGTKWidgetType, cr, &aGDKRect, &aState, aFlags, aDirection);
+
+        cairo_destroy(cr);
+      }
+      cairo_surface_destroy(surf);
+    }
+    aDrawTarget->ReleaseBits(data);
+  } else {
+    // If the widget has any transparency, make sure to choose an alpha format.
+    format = aTransparency != nsITheme::eOpaque ? SurfaceFormat::B8G8R8A8 : aDrawTarget->GetFormat();
+    // Create a temporary data surface to render the widget into.
+    RefPtr<DataSourceSurface> dataSurface =
+      Factory::CreateDataSourceSurface(aDrawSize, format, aTransparency != nsITheme::eOpaque);
+    DataSourceSurface::MappedSurface map;
+    if (!NS_WARN_IF(!(dataSurface && dataSurface->Map(DataSourceSurface::MapType::WRITE, &map)))) {
+      // Create a Cairo image surface wrapping the data surface.
+      cairo_surface_t* surf =
+        cairo_image_surface_create_for_data(map.mData, GfxFormatToCairoFormat(format),
+                                            aDrawSize.width, aDrawSize.height, map.mStride);
+      cairo_t* cr = nullptr;
+      if (!NS_WARN_IF(!surf)) {
+        cr = cairo_create(surf);
+        if (!NS_WARN_IF(!cr)) {
+          if (aScaleFactor != 1) {
+            cairo_scale(cr, aScaleFactor, aScaleFactor);
+          }
+
+          moz_gtk_widget_paint(aGTKWidgetType, cr, &aGDKRect, &aState, aFlags, aDirection);
+        }
+      }
+
+      // Unmap the surface before using it as a source
+      dataSurface->Unmap();
+
+      if (cr) {
+        if (needClip || aTransparency != nsITheme::eOpaque) {
+          // The widget either needs to be masked or has transparency, so use the slower drawing path.
+          aDrawTarget->DrawSurface(dataSurface,
+                                   Rect(aSnapped ? aDrawOrigin - aDrawTarget->GetTransform().GetTranslation() : aDrawOrigin,
+                                        Size(aDrawSize)),
+                                   Rect(0, 0, aDrawSize.width, aDrawSize.height));
+        } else {
+          // The widget is a simple opaque rectangle, so just copy it out.
+          aDrawTarget->CopySurface(dataSurface,
+                                   IntRect(0, 0, aDrawSize.width, aDrawSize.height),
+                                   TruncatedToInt(aDrawOrigin));
+        }
+
+        cairo_destroy(cr);
+      }
+
+      if (surf) {
+        cairo_surface_destroy(surf);
+      }
+    }
+  }
+}
 #endif
 
 bool
@@ -796,10 +961,6 @@
                                        const nsRect& aRect,
                                        const nsRect& aDirtyRect)
 {
-#if (MOZ_WIDGET_GTK != 2)
-  DrawTarget& aDrawTarget = *aContext->GetDrawTarget();
-#endif
-
   GtkWidgetState state;
   GtkThemeWidgetType gtkWidgetType;
   GtkTextDirection direction = GetTextDirection(aFrame);
@@ -819,8 +980,8 @@
   // to provide crisper and faster drawing.
   // Don't snap if it's a non-unit scale factor. We're going to have to take
   // slow paths then in any case.
-  bool snapXY = ctx->UserToDevicePixelSnapped(rect);
-  if (snapXY) {
+  bool snapped = ctx->UserToDevicePixelSnapped(rect);
+  if (snapped) {
     // Leave rect in device coords but make dirtyRect consistent.
     dirtyRect = ctx->UserToDevice(dirtyRect);
   }
@@ -849,23 +1010,6 @@
       || !drawingRect.IntersectRect(overflowRect, drawingRect))
     return NS_OK;
 
-  // gdk rectangles are wrt the drawing rect.
-
-  GdkRectangle gdk_rect = {-drawingRect.x/scaleFactor,
-                           -drawingRect.y/scaleFactor,
-                           widgetRect.width/scaleFactor,
-                           widgetRect.height/scaleFactor};
-
-  // translate everything so (0,0) is the top left of the drawingRect
-  gfxContextAutoSaveRestore autoSR(ctx);
-  gfxMatrix tm;
-  if (!snapXY) { // else rects are in device coords
-    tm = ctx->CurrentMatrix();
-  }
-  tm.Translate(rect.TopLeft() + gfxPoint(drawingRect.x, drawingRect.y));
-  tm.Scale(scaleFactor, scaleFactor); // Draw in GDK coords
-  ctx->SetMatrix(tm);
-
   NS_ASSERTION(!IsWidgetTypeDisabled(mDisabledWidgetTypes, aWidgetType),
                "Trying to render an unsafe widget!");
 
@@ -875,7 +1019,27 @@
     gdk_error_trap_push ();
   }
 
+  Transparency transparency = GetWidgetTransparency(aFrame, aWidgetType);
+
+  // gdk rectangles are wrt the drawing rect.
+  GdkRectangle gdk_rect = {-drawingRect.x/scaleFactor,
+                           -drawingRect.y/scaleFactor,
+                           widgetRect.width/scaleFactor,
+                           widgetRect.height/scaleFactor};
+
+  // translate everything so (0,0) is the top left of the drawingRect
+  gfxPoint origin = rect.TopLeft() + drawingRect.TopLeft();
+
 #if (MOZ_WIDGET_GTK == 2)
+  gfxContextAutoSaveRestore autoSR(ctx);
+  gfxMatrix matrix;
+  if (!snapped) { // else rects are in device coords
+    matrix = ctx->CurrentMatrix();
+  }
+  matrix.Translate(origin);
+  matrix.Scale(scaleFactor, scaleFactor); // Draw in GDK coords
+  ctx->SetMatrix(matrix);
+
   // The gdk_clip is just advisory here, meaning "you don't
   // need to draw outside this rect if you don't feel like it!"
   GdkRectangle gdk_clip = {0, 0, drawingRect.width, drawingRect.height};
@@ -887,7 +1051,7 @@
   // clip rect we provide, so we cannot advertise support for clipping within
   // the widget bounds.
   uint32_t rendererFlags = 0;
-  if (GetWidgetTransparency(aFrame, aWidgetType) == eOpaque) {
+  if (transparency == eOpaque) {
     rendererFlags |= gfxGdkNativeRenderer::DRAW_IS_OPAQUE;
   }
 
@@ -897,11 +1061,10 @@
 
   renderer.Draw(ctx, drawingRect.Size(), rendererFlags, colormap);
 #else 
-  cairo_t *cairo_ctx =
-    (cairo_t*)aDrawTarget.GetNativeSurface(NativeSurfaceType::CAIRO_CONTEXT); 
-  MOZ_ASSERT(cairo_ctx);
-  moz_gtk_widget_paint(gtkWidgetType, cairo_ctx, &gdk_rect, 
-                       &state, flags, direction);
+  DrawThemeWithCairo(ctx, aContext->GetDrawTarget(),
+                     state, gtkWidgetType, flags, direction, scaleFactor,
+                     snapped, ToPoint(origin), drawingRect.Size(),
+                     gdk_rect, transparency);
 #endif
 
   if (!safeState) {
@@ -997,6 +1160,12 @@
       }
     }
   }
+
+  gint scale = nsScreenGtk::GetGtkMonitorScaleFactor();
+  aResult->top *= scale;
+  aResult->right *= scale;
+  aResult->bottom *= scale;
+  aResult->left *= scale;
   return NS_OK;
 }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gtk/nsScreenGtk.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/gtk/nsScreenGtk.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gtk/nsScreenGtk.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gtk/nsScreenGtk.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -12,6 +12,7 @@
 #endif
 #include <gtk/gtk.h>
 #include <dlfcn.h>
+#include "gfxPlatformGtk.h"
 
 static uint32_t sScreenId = 0;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gtk/nsWindow.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/gtk/nsWindow.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gtk/nsWindow.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gtk/nsWindow.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -102,10 +102,6 @@
 #include "nsAutoPtr.h"
 #include "ClientLayerManager.h"
 
-extern "C" {
-#define PIXMAN_DONT_DEFINE_STDINT
-#include "pixman.h"
-}
 #include "gfxPlatformGtk.h"
 #include "gfxContext.h"
 #include "gfxImageSurface.h"
@@ -117,7 +113,6 @@
 
 #ifdef MOZ_X11
 #include "gfxXlibSurface.h"
-#include "cairo-xlib.h"
 #endif
   
 #include "nsShmImage.h"
@@ -295,25 +290,6 @@
 // only the button state bits are used.
 static guint gButtonState;
 
-// nsAutoRef<pixman_region32> uses nsSimpleRef<> to know how to automatically
-// destroy regions.
-template <>
-class nsSimpleRef<pixman_region32> : public pixman_region32 {
-protected:
-    typedef pixman_region32 RawRef;
-
-    nsSimpleRef() { data = nullptr; }
-    explicit nsSimpleRef(const RawRef &aRawRef) : pixman_region32(aRawRef) { }
-
-    static void Release(pixman_region32& region) {
-        pixman_region32_fini(&region);
-    }
-    // Whether this needs to be released:
-    bool HaveResource() const { return data != nullptr; }
-
-    pixman_region32& get() { return *this; }
-};
-
 static inline int32_t
 GetBitmapStride(int32_t width)
 {
@@ -2050,71 +2026,52 @@
 #endif // DEBUG
 #endif
 
-struct ExposeRegion
-{
-    nsIntRegion mRegion;
-
 #if (MOZ_WIDGET_GTK == 2)
-    GdkRectangle *mRects;
-    GdkRectangle *mRectsEnd;
-
-    ExposeRegion() : mRects(nullptr)
-    {
-    }
-    ~ExposeRegion()
-    {
-        g_free(mRects);
-    }
-    bool Init(GdkEventExpose *aEvent)
-    {
-        gint nrects;
-        gdk_region_get_rectangles(aEvent->region, &mRects, &nrects);
-
-        if (nrects > MAX_RECTS_IN_REGION) {
-            // Just use the bounding box
-            mRects[0] = aEvent->area;
-            nrects = 1;
-        }
+static bool
+ExtractExposeRegion(nsIntRegion& aRegion, GdkEventExpose* aEvent)
+{
+  GdkRectangle* rects;
+  gint nrects;
+  gdk_region_get_rectangles(aEvent->region, &rects, &nrects);
+
+  if (nrects > MAX_RECTS_IN_REGION) {
+      // Just use the bounding box
+      rects[0] = aEvent->area;
+      nrects = 1;
+  }
 
-        mRectsEnd = mRects + nrects;
+  for (GdkRectangle* r = rects; r < rects + nrects; r++) {
+      aRegion.Or(aRegion, nsIntRect(r->x, r->y, r->width, r->height));
+      LOGDRAW(("\t%d %d %d %d\n", r->x, r->y, r->width, r->height));
+  }
 
-        for (GdkRectangle *r = mRects; r < mRectsEnd; r++) {
-            mRegion.Or(mRegion, nsIntRect(r->x, r->y, r->width, r->height));
-            LOGDRAW(("\t%d %d %d %d\n", r->x, r->y, r->width, r->height));
-        }
-        return true;
-    }
+  g_free(rects);
+  return true;
+}
 
 #else
 # ifdef cairo_copy_clip_rectangle_list
 #  error "Looks like we're including Mozilla's cairo instead of system cairo"
 # endif
-    cairo_rectangle_list_t *mRects;
+static bool
+ExtractExposeRegion(nsIntRegion& aRegion, cairo_t* cr)
+{
+  cairo_rectangle_list_t* rects = cairo_copy_clip_rectangle_list(cr);
+  if (rects->status != CAIRO_STATUS_SUCCESS) {
+      NS_WARNING("Failed to obtain cairo rectangle list.");
+      return false;
+  }
 
-    ExposeRegion() : mRects(nullptr)
-    {
-    }
-    ~ExposeRegion()
-    {
-        cairo_rectangle_list_destroy(mRects);
-    }
-    bool Init(cairo_t* cr)
-    {
-        mRects = cairo_copy_clip_rectangle_list(cr);
-        if (mRects->status != CAIRO_STATUS_SUCCESS) {
-            NS_WARNING("Failed to obtain cairo rectangle list.");
-            return false;
-        }
+  for (int i = 0; i < rects->num_rectangles; i++)  {
+      const cairo_rectangle_t& r = rects->rectangles[i];
+      aRegion.Or(aRegion, nsIntRect(r.x, r.y, r.width, r.height));
+      LOGDRAW(("\t%d %d %d %d\n", r.x, r.y, r.width, r.height));
+  }
 
-        for (int i = 0; i < mRects->num_rectangles; i++)  {
-            const cairo_rectangle_t& r = mRects->rectangles[i];
-            mRegion.Or(mRegion, nsIntRect(r.x, r.y, r.width, r.height));
-            LOGDRAW(("\t%d %d %d %d\n", r.x, r.y, r.width, r.height));
-        }
-        return true;
-    }
+  cairo_rectangle_list_destroy(rects);
+  return true;
+}
 #endif
-};
 
 #if (MOZ_WIDGET_GTK == 2)
 gboolean
@@ -2137,17 +2094,17 @@
     if (!listener)
         return FALSE;
 
-    ExposeRegion exposeRegion;
+    nsIntRegion exposeRegion;
 #if (MOZ_WIDGET_GTK == 2)
-    if (!exposeRegion.Init(aEvent)) {
+    if (!ExtractExposeRegion(exposeRegion, aEvent)) {
 #else
-    if (!exposeRegion.Init(cr)) {
+    if (!ExtractExposeRegion(exposeRegion, cr)) {
 #endif
         return FALSE;
     }
 
     gint scale = GdkScaleFactor();
-    nsIntRegion& region = exposeRegion.mRegion;
+    nsIntRegion region = exposeRegion;
     region.ScaleRoundOut(scale, scale);
 
     ClientLayerManager *clientLayers =
@@ -2240,33 +2197,11 @@
         return TRUE;
     }
 
-    gfxASurface* surf;
-#if (MOZ_WIDGET_GTK == 2)
-    surf = GetThebesSurface();
-#else
-    surf = GetThebesSurface(cr);
-#endif
-
-    nsRefPtr<gfxContext> ctx;
-    if (gfxPlatform::GetPlatform()->
-            SupportsAzureContentForType(BackendType::CAIRO)) {
-        IntSize intSize(surf->GetSize().width, surf->GetSize().height);
-        RefPtr<DrawTarget> dt =
-          gfxPlatform::GetPlatform()->CreateDrawTargetForSurface(surf, intSize);
-        ctx = new gfxContext(dt);
-    } else if (gfxPlatform::GetPlatform()->
-                   SupportsAzureContentForType(BackendType::SKIA) &&
-               surf->GetType() == gfxSurfaceType::Image) {
-       gfxImageSurface* imgSurf = static_cast<gfxImageSurface*>(surf);
-       SurfaceFormat format = ImageFormatToSurfaceFormat(imgSurf->Format());
-       IntSize intSize(surf->GetSize().width, surf->GetSize().height);
-       RefPtr<DrawTarget> dt =
-         gfxPlatform::GetPlatform()->CreateDrawTargetForData(
-                        imgSurf->Data(), intSize, imgSurf->Stride(), format);
-       ctx = new gfxContext(dt);
-    } else {
-        MOZ_CRASH("Unexpected content type");
+    RefPtr<DrawTarget> dt = StartRemoteDrawing();
+    if(!dt) {
+        return FALSE;
     }
+    nsRefPtr<gfxContext> ctx = new gfxContext(dt);
 
 #ifdef MOZ_X11
     nsIntRect boundsRect; // for shaped only
@@ -2341,11 +2276,7 @@
     }
 #  ifdef MOZ_HAVE_SHMIMAGE
     if (mShmImage && MOZ_LIKELY(!mIsDestroyed)) {
-#if (MOZ_WIDGET_GTK == 2)
-        mShmImage->Put(mGdkWindow, exposeRegion.mRects, exposeRegion.mRectsEnd);
-#else
-        mShmImage->Put(mGdkWindow, exposeRegion.mRects);
-#endif
+        mShmImage->Put(mGdkWindow, exposeRegion);
     }
 #  endif  // MOZ_HAVE_SHMIMAGE
 #endif // MOZ_X11
@@ -4214,55 +4145,6 @@
     return NS_OK;
 }
 
-static pixman_box32
-ToPixmanBox(const nsIntRect& aRect)
-{
-    pixman_box32_t result;
-    result.x1 = aRect.x;
-    result.y1 = aRect.y;
-    result.x2 = aRect.XMost();
-    result.y2 = aRect.YMost();
-    return result;
-}
-
-static nsIntRect
-ToIntRect(const pixman_box32& aBox)
-{
-    nsIntRect result;
-    result.x = aBox.x1;
-    result.y = aBox.y1;
-    result.width = aBox.x2 - aBox.x1;
-    result.height = aBox.y2 - aBox.y1;
-    return result;
-}
-
-static void
-InitRegion(pixman_region32* aRegion,
-           const nsTArray<nsIntRect>& aRects)
-{
-    nsAutoTArray<pixman_box32,10> rects;
-    rects.SetCapacity(aRects.Length());
-    for (uint32_t i = 0; i < aRects.Length (); ++i) {
-        if (!aRects[i].IsEmpty()) {
-            rects.AppendElement(ToPixmanBox(aRects[i]));
-        }
-    }
-
-    pixman_region32_init_rects(aRegion,
-                               rects.Elements(), rects.Length());
-}
-
-static void
-GetIntRects(pixman_region32& aRegion, nsTArray<nsIntRect>* aRects)
-{
-    int nRects;
-    pixman_box32* boxes = pixman_region32_rectangles(&aRegion, &nRects);
-    aRects->SetCapacity(aRects->Length() + nRects);
-    for (int i = 0; i < nRects; ++i) {
-        aRects->AppendElement(ToIntRect(boxes[i]));
-    }
-}
-
 nsresult
 nsWindow::SetWindowClipRegion(const nsTArray<nsIntRect>& aRects,
                               bool aIntersectWithExisting)
@@ -4274,24 +4156,19 @@
         nsAutoTArray<nsIntRect,1> existingRects;
         GetWindowClipRegion(&existingRects);
 
-        nsAutoRef<pixman_region32> existingRegion;
-        InitRegion(&existingRegion, existingRects);
-        nsAutoRef<pixman_region32> newRegion;
-        InitRegion(&newRegion, aRects);
-        nsAutoRef<pixman_region32> intersectRegion;
-        pixman_region32_init(&intersectRegion);
-        pixman_region32_intersect(&intersectRegion,
-                                  &newRegion, &existingRegion);
+        nsIntRegion existingRegion = RegionFromArray(existingRects);
+        nsIntRegion newRegion = RegionFromArray(aRects);
+        nsIntRegion intersectRegion;
+        intersectRegion.And(newRegion, existingRegion);
 
         // If mClipRects is null we haven't set a clip rect yet, so we
         // need to set the clip even if it is equal.
-        if (mClipRects &&
-            pixman_region32_equal(&intersectRegion, &existingRegion)) {
+        if (mClipRects && intersectRegion.IsEqual(existingRegion)) {
             return NS_OK;
         }
 
-        if (!pixman_region32_equal(&intersectRegion, &newRegion)) {
-            GetIntRects(intersectRegion, &intersectRects);
+        if (!intersectRegion.IsEqual(newRegion)) {
+            ArrayFromRegion(intersectRegion, intersectRects);
             newRects = &intersectRects;
         }
     }
@@ -6262,24 +6139,49 @@
     return nullptr;
   }
 
-  IntSize size(surf->GetSize().width, surf->GetSize().height);
+  nsIntSize size = surf->GetSize();
   if (size.width <= 0 || size.height <= 0) {
     return nullptr;
   }
 
-  return gfxPlatform::GetPlatform()->CreateDrawTargetForSurface(surf, size);
+  gfxPlatform *platform = gfxPlatform::GetPlatform();
+  if (platform->SupportsAzureContentForType(BackendType::CAIRO) ||
+      surf->GetType() == gfxSurfaceType::Xlib) {
+    return platform->CreateDrawTargetForSurface(surf, size);
+  } else if (platform->SupportsAzureContentForType(BackendType::SKIA) &&
+             surf->GetType() == gfxSurfaceType::Image) {
+    gfxImageSurface* imgSurf = static_cast<gfxImageSurface*>(surf);
+    SurfaceFormat format = ImageFormatToSurfaceFormat(imgSurf->Format());
+    return platform->CreateDrawTargetForData(
+                     imgSurf->Data(), size, imgSurf->Stride(), format);
+  } else {
+    return nullptr;
+  }
 }
 
-// return the gfxASurface for rendering to this widget
-gfxASurface*
-nsWindow::GetThebesSurface()
-#if (MOZ_WIDGET_GTK == 3)
+void
+nsWindow::EndRemoteDrawingInRegion(DrawTarget* aDrawTarget, nsIntRegion& aInvalidRegion)
 {
-    return GetThebesSurface(nullptr);
+#ifdef MOZ_X11
+#  ifdef MOZ_HAVE_SHMIMAGE
+  if (!mGdkWindow || mIsFullyObscured || !mHasMappedToplevel || mIsDestroyed ||
+      !mShmImage)
+    return;
+
+  gint scale = GdkScaleFactor();
+  if (scale != 1) {
+    aInvalidRegion.ScaleInverseRoundOut(scale, scale);
+  }
+
+  mShmImage->Put(mGdkWindow, aInvalidRegion);
+
+#  endif // MOZ_HAVE_SHMIMAGE
+#endif // MOZ_X11
 }
+
+// return the gfxASurface for rendering to this widget
 gfxASurface*
-nsWindow::GetThebesSurface(cairo_t *cr)
-#endif
+nsWindow::GetThebesSurface()
 {
     if (!mGdkWindow)
         return nullptr;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/gtk/nsWindow.h firefox-trunk-41.0~a1~hg20150524r245419/widget/gtk/nsWindow.h
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/gtk/nsWindow.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/gtk/nsWindow.h	2015-05-25 20:44:09.000000000 +0000
@@ -36,7 +36,7 @@
 #undef LOG
 #ifdef MOZ_LOGGING
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsTArray.h"
 #include "Units.h"
 
@@ -45,10 +45,10 @@
 extern PRLogModuleInfo *gWidgetDragLog;
 extern PRLogModuleInfo *gWidgetDrawLog;
 
-#define LOG(args) PR_LOG(gWidgetLog, 4, args)
-#define LOGFOCUS(args) PR_LOG(gWidgetFocusLog, 4, args)
-#define LOGDRAG(args) PR_LOG(gWidgetDragLog, 4, args)
-#define LOGDRAW(args) PR_LOG(gWidgetDrawLog, 4, args)
+#define LOG(args) MOZ_LOG(gWidgetLog, 4, args)
+#define LOGFOCUS(args) MOZ_LOG(gWidgetFocusLog, 4, args)
+#define LOGDRAG(args) MOZ_LOG(gWidgetDragLog, 4, args)
+#define LOGDRAW(args) MOZ_LOG(gWidgetDrawLog, 4, args)
 
 #else
 
@@ -194,7 +194,10 @@
                                                guint            aTime,
                                                gpointer         aData);
 
-  mozilla::TemporaryRef<mozilla::gfx::DrawTarget> StartRemoteDrawing() override;
+    virtual mozilla::TemporaryRef<mozilla::gfx::DrawTarget>
+                       StartRemoteDrawing() override;
+    virtual void       EndRemoteDrawingInRegion(mozilla::gfx::DrawTarget* aDrawTarget,
+                                                nsIntRegion& aInvalidRegion) override;
 
 private:
     void               UpdateAlpha(gfxPattern* aPattern, nsIntRect aBoundsRect);
@@ -476,9 +479,6 @@
                                           LayersBackend aBackendHint = mozilla::layers::LayersBackend::LAYERS_NONE,
                                           LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
                                           bool* aAllowRetaining = nullptr) override;
-#if (MOZ_WIDGET_GTK == 3)
-    gfxASurface* GetThebesSurface(cairo_t *cr);
-#endif
 
     void CleanLayerManagerRecursive();
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/nsBaseFilePicker.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/nsBaseFilePicker.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/nsBaseFilePicker.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/nsBaseFilePicker.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -96,7 +96,7 @@
       return NS_ERROR_FAILURE;
     }
 
-    nsCOMPtr<nsIDOMFile> domFile = File::CreateFromFile(mParent, localFile);
+    nsCOMPtr<nsIDOMBlob> domFile = File::CreateFromFile(mParent, localFile);
     domFile.forget(aResult);
     return NS_OK;
   }
@@ -311,7 +311,7 @@
 }
 
 NS_IMETHODIMP
-nsBaseFilePicker::GetDomfile(nsIDOMFile** aDomfile)
+nsBaseFilePicker::GetDomfile(nsISupports** aDomfile)
 {
   nsCOMPtr<nsIFile> localFile;
   nsresult rv = GetFile(getter_AddRefs(localFile));
@@ -322,7 +322,7 @@
     return NS_OK;
   }
 
-  nsRefPtr<File> domFile = File::CreateFromFile(mParent, localFile);
+  nsCOMPtr<nsIDOMBlob> domFile = File::CreateFromFile(mParent, localFile);
   domFile.forget(aDomfile);
   return NS_OK;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/nsBaseFilePicker.h firefox-trunk-41.0~a1~hg20150524r245419/widget/nsBaseFilePicker.h
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/nsBaseFilePicker.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/nsBaseFilePicker.h	2015-05-25 20:44:09.000000000 +0000
@@ -37,7 +37,7 @@
   NS_IMETHOD SetAddToRecentDocs(bool aFlag);
   NS_IMETHOD GetMode(int16_t *aMode);
 
-  NS_IMETHOD GetDomfile(nsIDOMFile** aDomfile);
+  NS_IMETHOD GetDomfile(nsISupports** aDomfile);
   NS_IMETHOD GetDomfiles(nsISimpleEnumerator** aDomfiles);
 
 protected:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/nsBaseWidget.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/nsBaseWidget.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/nsBaseWidget.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/nsBaseWidget.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -54,6 +54,7 @@
 #include "mozilla/dom/TabParent.h"
 #include "nsRefPtrHashtable.h"
 #include "TouchEvents.h"
+#include "WritingModes.h"
 #ifdef ACCESSIBILITY
 #include "nsAccessibilityService.h"
 #endif
@@ -98,6 +99,25 @@
 /*static*/ uint64_t AutoObserverNotifier::sObserverId = 0;
 /*static*/ nsDataHashtable<nsUint64HashKey, nsCOMPtr<nsIObserver>> AutoObserverNotifier::sSavedObservers;
 
+namespace mozilla {
+namespace widget {
+
+void
+IMENotification::SelectionChangeData::SetWritingMode(
+                                        const WritingMode& aWritingMode)
+{
+  mWritingMode = aWritingMode.mWritingMode;
+}
+
+WritingMode
+IMENotification::SelectionChangeData::GetWritingMode() const
+{
+  return WritingMode(mWritingMode);
+}
+
+} // namespace widget
+} // namespace mozilla
+
 nsAutoRollup::nsAutoRollup()
 {
   // remember if mLastRollup was null, and only clear it upon destruction
@@ -124,6 +144,7 @@
 nsBaseWidget::nsBaseWidget()
 : mWidgetListener(nullptr)
 , mAttachedWidgetListener(nullptr)
+, mLayerManager(nullptr)
 , mCompositorVsyncDispatcher(nullptr)
 , mCursor(eCursor_standard)
 , mUpdateCursor(true)
@@ -994,7 +1015,7 @@
                                            nsEventStatus aApzResponse)
 {
   MOZ_ASSERT(NS_IsMainThread());
-  InputAPZContext context(aGuid, aInputBlockId);
+  InputAPZContext context(aGuid, aInputBlockId, aApzResponse);
 
   // If this is a touch event and APZ has targeted it to an APZC in the root
   // process, apply that APZC's callback-transform before dispatching the
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/nsClipboardHelper.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/nsClipboardHelper.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/nsClipboardHelper.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/nsClipboardHelper.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -40,8 +40,7 @@
 
 NS_IMETHODIMP
 nsClipboardHelper::CopyStringToClipboard(const nsAString& aString,
-                                         int32_t aClipboardID,
-                                         nsIDOMDocument* aDocument)
+                                         int32_t aClipboardID)
 {
   nsresult rv;
 
@@ -76,9 +75,7 @@
   NS_ENSURE_SUCCESS(rv, rv);
   NS_ENSURE_TRUE(trans, NS_ERROR_FAILURE);
 
-  nsCOMPtr<nsIDocument> doc = do_QueryInterface(aDocument);
-  nsILoadContext* loadContext = doc ? doc->GetLoadContext() : nullptr;
-  trans->Init(loadContext);
+  trans->Init(nullptr);
 
   // Add the text data flavor to the transferable
   rv = trans->AddDataFlavor(kUnicodeMime);
@@ -113,12 +110,12 @@
 }
 
 NS_IMETHODIMP
-nsClipboardHelper::CopyString(const nsAString& aString, nsIDOMDocument* aDocument)
+nsClipboardHelper::CopyString(const nsAString& aString)
 {
   nsresult rv;
 
   // copy to the global clipboard. it's bad if this fails in any way.
-  rv = CopyStringToClipboard(aString, nsIClipboard::kGlobalClipboard, aDocument);
+  rv = CopyStringToClipboard(aString, nsIClipboard::kGlobalClipboard);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // unix also needs us to copy to the selection clipboard. this will
@@ -130,7 +127,7 @@
   // if this fails in any way other than "not being unix", we'll get
   // the assertion we need in CopyStringToClipboard, and we needn't
   // assert again here.
-  CopyStringToClipboard(aString, nsIClipboard::kSelectionClipboard, aDocument);
+  CopyStringToClipboard(aString, nsIClipboard::kSelectionClipboard);
 
   return NS_OK;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/nsFilePickerProxy.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/nsFilePickerProxy.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/nsFilePickerProxy.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/nsFilePickerProxy.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -165,7 +165,7 @@
       nsRefPtr<File> file = File::Create(mParent, blobImpl);
       MOZ_ASSERT(file);
 
-      mDomfiles.AppendObject(file);
+      mDomfiles.AppendElement(file);
     }
   }
 
@@ -178,7 +178,7 @@
 }
 
 NS_IMETHODIMP
-nsFilePickerProxy::GetDomfile(nsIDOMFile** aDomfile)
+nsFilePickerProxy::GetDomfile(nsISupports** aDomfile)
 {
   *aDomfile = nullptr;
   if (mDomfiles.IsEmpty()) {
@@ -186,13 +186,57 @@
   }
 
   MOZ_ASSERT(mDomfiles.Length() == 1);
-  nsCOMPtr<nsIDOMFile> domfile = mDomfiles[0];
-  domfile.forget(aDomfile);
+  nsCOMPtr<nsIDOMBlob> blob = mDomfiles[0].get();
+  blob.forget(aDomfile);
   return NS_OK;
 }
 
+namespace {
+
+class SimpleEnumerator final : public nsISimpleEnumerator
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  explicit SimpleEnumerator(const nsTArray<nsRefPtr<File>>& aFiles)
+    : mFiles(aFiles)
+    , mIndex(0)
+  {}
+
+  NS_IMETHOD
+  HasMoreElements(bool* aRetvalue) override
+  {
+    MOZ_ASSERT(aRetvalue);
+    *aRetvalue = mIndex < mFiles.Length();
+    return NS_OK;
+  }
+
+  NS_IMETHOD
+  GetNext(nsISupports** aSupports) override
+  {
+    NS_ENSURE_TRUE(mIndex < mFiles.Length(), NS_ERROR_FAILURE);
+
+    nsCOMPtr<nsIDOMBlob> blob = mFiles[mIndex++].get();
+    blob.forget(aSupports);
+    return NS_OK;
+  }
+
+private:
+  ~SimpleEnumerator()
+  {}
+
+  nsTArray<nsRefPtr<File>> mFiles;
+  uint32_t mIndex;
+};
+
+NS_IMPL_ISUPPORTS(SimpleEnumerator, nsISimpleEnumerator)
+
+} // anonymous namespace
+
 NS_IMETHODIMP
 nsFilePickerProxy::GetDomfiles(nsISimpleEnumerator** aDomfiles)
 {
-  return NS_NewArrayEnumerator(aDomfiles, mDomfiles);
+  nsRefPtr<SimpleEnumerator> enumerator = new SimpleEnumerator(mDomfiles);
+  enumerator.forget(aDomfiles);
+  return NS_OK;
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/nsFilePickerProxy.h firefox-trunk-41.0~a1~hg20150524r245419/widget/nsFilePickerProxy.h
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/nsFilePickerProxy.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/nsFilePickerProxy.h	2015-05-25 20:44:09.000000000 +0000
@@ -18,6 +18,12 @@
 class nsIFile;
 class nsPIDOMWindow;
 
+namespace mozilla {
+namespace dom {
+class File;
+}
+}
+
 /**
   This class creates a proxy file picker to be used in content processes.
   The file picker just collects the initialization data and when Show() is
@@ -45,7 +51,7 @@
     NS_IMETHODIMP GetFileURL(nsIURI** aFileURL) override;
     NS_IMETHODIMP GetFiles(nsISimpleEnumerator** aFiles) override;
 
-    NS_IMETHODIMP GetDomfile(nsIDOMFile** aFile) override;
+    NS_IMETHODIMP GetDomfile(nsISupports** aFile) override;
     NS_IMETHODIMP GetDomfiles(nsISimpleEnumerator** aFiles) override;
 
     NS_IMETHODIMP Show(int16_t* aReturn) override;
@@ -59,7 +65,7 @@
     ~nsFilePickerProxy();
     void InitNative(nsIWidget*, const nsAString&) override;
 
-    nsCOMArray<nsIDOMFile> mDomfiles;
+    nsTArray<nsRefPtr<mozilla::dom::File>> mDomfiles;
     nsCOMPtr<nsIFilePickerShownCallback> mCallback;
 
     int16_t   mSelectedType;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/nsGUIEventIPC.h firefox-trunk-41.0~a1~hg20150524r245419/widget/nsGUIEventIPC.h
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/nsGUIEventIPC.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/nsGUIEventIPC.h	2015-05-25 20:44:09.000000000 +0000
@@ -675,6 +675,10 @@
       static_cast<mozilla::widget::IMEMessageType>(aParam.mMessage));
     switch (aParam.mMessage) {
       case mozilla::widget::NOTIFY_IME_OF_SELECTION_CHANGE:
+        WriteParam(aMsg, aParam.mSelectionChangeData.mOffset);
+        WriteParam(aMsg, aParam.mSelectionChangeData.mLength);
+        WriteParam(aMsg, aParam.mSelectionChangeData.mWritingMode);
+        WriteParam(aMsg, aParam.mSelectionChangeData.mReversed);
         WriteParam(aMsg, aParam.mSelectionChangeData.mCausedByComposition);
         return;
       case mozilla::widget::NOTIFY_IME_OF_TEXT_CHANGE:
@@ -711,6 +715,14 @@
     switch (aResult->mMessage) {
       case mozilla::widget::NOTIFY_IME_OF_SELECTION_CHANGE:
         return ReadParam(aMsg, aIter,
+                         &aResult->mSelectionChangeData.mOffset) &&
+               ReadParam(aMsg, aIter,
+                         &aResult->mSelectionChangeData.mLength) &&
+               ReadParam(aMsg, aIter,
+                         &aResult->mSelectionChangeData.mWritingMode) &&
+               ReadParam(aMsg, aIter,
+                         &aResult->mSelectionChangeData.mReversed) &&
+               ReadParam(aMsg, aIter,
                          &aResult->mSelectionChangeData.mCausedByComposition);
       case mozilla::widget::NOTIFY_IME_OF_TEXT_CHANGE:
         return ReadParam(aMsg, aIter,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/nsIClipboardHelper.idl firefox-trunk-41.0~a1~hg20150524r245419/widget/nsIClipboardHelper.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/nsIClipboardHelper.idl	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/nsIClipboardHelper.idl	2015-05-25 20:44:09.000000000 +0000
@@ -17,26 +17,22 @@
  * helper service for common uses of nsIClipboard.
  */
 
-[scriptable, uuid(c9d5a750-c3a8-11e1-9b21-0800200c9a66)]
+[scriptable, uuid(438307fd-0c68-4d79-922a-f6cc9550cd02)]
 interface nsIClipboardHelper : nsISupports
 {
-
   /**
    * copy string to given clipboard
    *
    * @param aString, the string to copy to the clipboard
-   * @param aDoc, the source document for the string, if available
    * @param aClipboardID, the ID of the clipboard to copy to
    *        (eg. kSelectionClipboard -- see nsIClipboard.idl)
    */
-  void copyStringToClipboard(in AString aString, in long aClipboardID, [optional] in nsIDOMDocument aDoc);
+  void copyStringToClipboard(in AString aString, in long aClipboardID);
 
   /**
    * copy string to (default) clipboard
    *
    * @param aString, the string to copy to the clipboard
-   * @param aDoc, the source document for the string, if available
    */
-  void copyString(in AString aString, [optional] in nsIDOMDocument aDoc);
-
+  void copyString(in AString aString);
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/nsIdleService.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/nsIdleService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/nsIdleService.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/nsIdleService.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -13,7 +13,7 @@
 #include "nsCOMArray.h"
 #include "nsXULAppAPI.h"
 #include "prinrval.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prtime.h"
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/Services.h"
@@ -72,7 +72,7 @@
                             const char *aTopic,
                             const char16_t *)
 {
-  PR_LOG(sLog, PR_LOG_DEBUG,
+  MOZ_LOG(sLog, PR_LOG_DEBUG,
          ("nsIdleServiceDaily: Observe '%s' (%d)",
           aTopic, mShutdownInProgress));
 
@@ -92,7 +92,7 @@
   }
   MOZ_ASSERT(strcmp(aTopic, OBSERVER_TOPIC_IDLE) == 0);
 
-  PR_LOG(sLog, PR_LOG_DEBUG,
+  MOZ_LOG(sLog, PR_LOG_DEBUG,
          ("nsIdleServiceDaily: Notifying idle-daily observers"));
 #ifdef MOZ_WIDGET_ANDROID
   __android_log_print(LOG_LEVEL, LOG_TAG,
@@ -128,7 +128,7 @@
     prefs->SavePrefFile(nullptr);
   }
 
-  PR_LOG(sLog, PR_LOG_DEBUG,
+  MOZ_LOG(sLog, PR_LOG_DEBUG,
          ("nsIdleServiceDaily: Storing last idle time as %d sec.", nowSec));
 #ifdef MOZ_WIDGET_ANDROID
   __android_log_print(LOG_LEVEL, LOG_TAG,
@@ -139,7 +139,7 @@
   mExpectedTriggerTime  = PR_Now() + ((PRTime)SECONDS_PER_DAY *
                                       (PRTime)PR_USEC_PER_SEC);
 
-  PR_LOG(sLog, PR_LOG_DEBUG,
+  MOZ_LOG(sLog, PR_LOG_DEBUG,
          ("nsIdleServiceDaily: Restarting daily timer"));
 
   // Start timer for the next check in one day.
@@ -177,7 +177,7 @@
   }
   int32_t secondsSinceLastDaily = nowSec - lastDaily;
 
-  PR_LOG(sLog, PR_LOG_DEBUG,
+  MOZ_LOG(sLog, PR_LOG_DEBUG,
          ("nsIdleServiceDaily: Init: seconds since last daily: %d",
           secondsSinceLastDaily));
 
@@ -188,7 +188,7 @@
     bool hasBeenLongWait = (lastDaily &&
                             (secondsSinceLastDaily > (SECONDS_PER_DAY * 2)));
 
-    PR_LOG(sLog, PR_LOG_DEBUG,
+    MOZ_LOG(sLog, PR_LOG_DEBUG,
            ("nsIdleServiceDaily: has been long wait? %d",
             hasBeenLongWait));
 
@@ -196,7 +196,7 @@
     // sends the idle-daily event.
     StageIdleDaily(hasBeenLongWait);
   } else {
-    PR_LOG(sLog, PR_LOG_DEBUG,
+    MOZ_LOG(sLog, PR_LOG_DEBUG,
            ("nsIdleServiceDaily: Setting timer a day from now"));
 #ifdef MOZ_WIDGET_ANDROID
     __android_log_print(LOG_LEVEL, LOG_TAG,
@@ -208,7 +208,7 @@
     int32_t milliSecLeftUntilDaily = (SECONDS_PER_DAY - secondsSinceLastDaily)
       * PR_MSEC_PER_SEC;
 
-    PR_LOG(sLog, PR_LOG_DEBUG,
+    MOZ_LOG(sLog, PR_LOG_DEBUG,
            ("nsIdleServiceDaily: Seconds till next timeout: %d",
             (SECONDS_PER_DAY - secondsSinceLastDaily)));
 
@@ -227,7 +227,7 @@
   // Register for when we should terminate/pause
   nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
   if (obs) {
-    PR_LOG(sLog, PR_LOG_DEBUG,
+    MOZ_LOG(sLog, PR_LOG_DEBUG,
            ("nsIdleServiceDaily: Registering for system event observers."));
     obs->AddObserver(this, "xpcom-will-shutdown", true);
     obs->AddObserver(this, "profile-change-teardown", true);
@@ -248,7 +248,7 @@
 nsIdleServiceDaily::StageIdleDaily(bool aHasBeenLongWait)
 {
   NS_ASSERTION(mIdleService, "No idle service available?");
-  PR_LOG(sLog, PR_LOG_DEBUG,
+  MOZ_LOG(sLog, PR_LOG_DEBUG,
           ("nsIdleServiceDaily: Registering Idle observer callback "
            "(short wait requested? %d)", aHasBeenLongWait));
 #ifdef MOZ_WIDGET_ANDROID
@@ -265,7 +265,7 @@
 void
 nsIdleServiceDaily::DailyCallback(nsITimer* aTimer, void* aClosure)
 {
-  PR_LOG(sLog, PR_LOG_DEBUG,
+  MOZ_LOG(sLog, PR_LOG_DEBUG,
           ("nsIdleServiceDaily: DailyCallback running"));
 #ifdef MOZ_WIDGET_ANDROID
   __android_log_print(LOG_LEVEL, LOG_TAG,
@@ -284,7 +284,7 @@
     // Add 10 ms to ensure we don't undershoot, and never get a "0" timer.
     delayTime += 10 * PR_USEC_PER_MSEC;
 
-    PR_LOG(sLog, PR_LOG_DEBUG, ("nsIdleServiceDaily: DailyCallback resetting timer to %lld msec",
+    MOZ_LOG(sLog, PR_LOG_DEBUG, ("nsIdleServiceDaily: DailyCallback resetting timer to %lld msec",
                         delayTime / PR_USEC_PER_MSEC));
 #ifdef MOZ_WIDGET_ANDROID
     __android_log_print(LOG_LEVEL, LOG_TAG,
@@ -431,7 +431,7 @@
     return NS_OK;
   }
 
-  PR_LOG(sLog, PR_LOG_DEBUG,
+  MOZ_LOG(sLog, PR_LOG_DEBUG,
        ("idleService: Register idle observer %p for %d seconds",
         aObserver, aIdleTimeInS));
 #ifdef MOZ_WIDGET_ANDROID
@@ -459,7 +459,7 @@
   if (mDeltaToNextIdleSwitchInS > aIdleTimeInS) {
     // If it is, then this is the next to move to idle (at this point we
     // don't care if it should have switched already).
-    PR_LOG(sLog, PR_LOG_DEBUG,
+    MOZ_LOG(sLog, PR_LOG_DEBUG,
           ("idleService: Register: adjusting next switch from %d to %d seconds",
            mDeltaToNextIdleSwitchInS, aIdleTimeInS));
 #ifdef MOZ_WIDGET_ANDROID
@@ -501,7 +501,7 @@
     if (mArrayListeners.ElementAt(listenerIndex).isIdle)
       mIdleObserverCount--;
     mArrayListeners.RemoveElementAt(listenerIndex);
-    PR_LOG(sLog, PR_LOG_DEBUG,
+    MOZ_LOG(sLog, PR_LOG_DEBUG,
            ("idleService: Remove observer %p (%d seconds), %d remain idle",
             aObserver, aTimeInS, mIdleObserverCount));
 #ifdef MOZ_WIDGET_ANDROID
@@ -513,7 +513,7 @@
   }
 
   // If we get here, we haven't removed anything:
-  PR_LOG(sLog, PR_LOG_WARNING, 
+  MOZ_LOG(sLog, PR_LOG_WARNING, 
          ("idleService: Failed to remove idle observer %p (%d seconds)",
           aObserver, aTimeInS));
 #ifdef MOZ_WIDGET_ANDROID
@@ -527,7 +527,7 @@
 NS_IMETHODIMP
 nsIdleService::ResetIdleTimeOut(uint32_t idleDeltaInMS)
 {
-  PR_LOG(sLog, PR_LOG_DEBUG,
+  MOZ_LOG(sLog, PR_LOG_DEBUG,
          ("idleService: Reset idle timeout (last interaction %u msec)",
           idleDeltaInMS));
 
@@ -537,7 +537,7 @@
 
   // If no one is idle, then we are done, any existing timers can keep running.
   if (mIdleObserverCount == 0) {
-    PR_LOG(sLog, PR_LOG_DEBUG,
+    MOZ_LOG(sLog, PR_LOG_DEBUG,
            ("idleService: Reset idle timeout: no idle observers"));
     return NS_OK;
   }
@@ -587,7 +587,7 @@
 
   // Send the "non-idle" events.
   while (numberOfPendingNotifications--) {
-    PR_LOG(sLog, PR_LOG_DEBUG,
+    MOZ_LOG(sLog, PR_LOG_DEBUG,
            ("idleService: Reset idle timeout: tell observer %p user is back",
             notifyList[numberOfPendingNotifications]));
 #ifdef MOZ_WIDGET_ANDROID
@@ -615,7 +615,7 @@
 
   bool polledIdleTimeIsValid = PollIdleTime(&polledIdleTimeMS);
 
-  PR_LOG(sLog, PR_LOG_DEBUG,
+  MOZ_LOG(sLog, PR_LOG_DEBUG,
          ("idleService: Get idle time: polled %u msec, valid = %d",
           polledIdleTimeMS, polledIdleTimeIsValid));
   
@@ -623,7 +623,7 @@
   TimeDuration timeSinceReset = TimeStamp::Now() - mLastUserInteraction;
   uint32_t timeSinceResetInMS = timeSinceReset.ToMilliseconds();
 
-  PR_LOG(sLog, PR_LOG_DEBUG,
+  MOZ_LOG(sLog, PR_LOG_DEBUG,
          ("idleService: Get idle time: time since reset %u msec",
           timeSinceResetInMS));
 #ifdef MOZ_WIDGET_ANDROID
@@ -679,7 +679,7 @@
   uint32_t currentIdleTimeInMS;
 
   if (NS_FAILED(GetIdleTime(&currentIdleTimeInMS))) {
-    PR_LOG(sLog, PR_LOG_ALWAYS,
+    MOZ_LOG(sLog, PR_LOG_ALWAYS,
            ("idleService: Idle timer callback: failed to get idle time"));
 #ifdef MOZ_WIDGET_ANDROID
     __android_log_print(LOG_LEVEL, LOG_TAG,
@@ -688,7 +688,7 @@
     return;
   }
 
-  PR_LOG(sLog, PR_LOG_DEBUG,
+  MOZ_LOG(sLog, PR_LOG_DEBUG,
          ("idleService: Idle timer callback: current idle time %u msec",
           currentIdleTimeInMS));
 #ifdef MOZ_WIDGET_ANDROID
@@ -760,7 +760,7 @@
 
   // Bail if nothing to do.
   if (!numberOfPendingNotifications) {
-    PR_LOG(sLog, PR_LOG_DEBUG,
+    MOZ_LOG(sLog, PR_LOG_DEBUG,
            ("idleService: **** Idle timer callback: no observers to message."));
     return;
   }
@@ -771,7 +771,7 @@
 
   // Notify all listeners that just timed out.
   while (numberOfPendingNotifications--) {
-    PR_LOG(sLog, PR_LOG_DEBUG,
+    MOZ_LOG(sLog, PR_LOG_DEBUG,
            ("idleService: **** Idle timer callback: tell observer %p user is idle",
             notifyList[numberOfPendingNotifications]));
 #ifdef MOZ_WIDGET_ANDROID
@@ -790,7 +790,7 @@
 {
   TimeDuration nextTimeoutDuration = aNextTimeout - TimeStamp::Now();
 
-  PR_LOG(sLog, PR_LOG_DEBUG,
+  MOZ_LOG(sLog, PR_LOG_DEBUG,
          ("idleService: SetTimerExpiryIfBefore: next timeout %0.f msec from now",
           nextTimeoutDuration.ToMilliseconds()));
 
@@ -825,7 +825,7 @@
     mCurrentlySetToTimeoutAt += TimeDuration::FromMilliseconds(10);
 
     TimeDuration deltaTime = mCurrentlySetToTimeoutAt - currentTime;
-    PR_LOG(sLog, PR_LOG_DEBUG,
+    MOZ_LOG(sLog, PR_LOG_DEBUG,
            ("idleService: IdleService reset timer expiry to %0.f msec from now",
             deltaTime.ToMilliseconds()));
 #ifdef MOZ_WIDGET_ANDROID
@@ -850,7 +850,7 @@
   if ((mIdleObserverCount == 0) && UINT32_MAX == mDeltaToNextIdleSwitchInS) {
     // If not, just let any existing timers run to completion
     // And bail out.
-    PR_LOG(sLog, PR_LOG_DEBUG,
+    MOZ_LOG(sLog, PR_LOG_DEBUG,
            ("idleService: ReconfigureTimer: no idle or waiting observers"));
 #ifdef MOZ_WIDGET_ANDROID
   __android_log_print(LOG_LEVEL, LOG_TAG,
@@ -870,7 +870,7 @@
 
   TimeDuration nextTimeoutDuration = nextTimeoutAt - curTime;
 
-  PR_LOG(sLog, PR_LOG_DEBUG,
+  MOZ_LOG(sLog, PR_LOG_DEBUG,
          ("idleService: next timeout %0.f msec from now",
           nextTimeoutDuration.ToMilliseconds()));
 
@@ -886,7 +886,7 @@
         curTime + TimeDuration::FromMilliseconds(MIN_IDLE_POLL_INTERVAL_MSEC);
 
     if (nextTimeoutAt > pollTimeout) {
-      PR_LOG(sLog, PR_LOG_DEBUG,
+      MOZ_LOG(sLog, PR_LOG_DEBUG,
            ("idleService: idle observers, reducing timeout to %lu msec from now",
             MIN_IDLE_POLL_INTERVAL_MSEC));
 #ifdef MOZ_WIDGET_ANDROID
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/nsIFilePicker.idl firefox-trunk-41.0~a1~hg20150524r245419/widget/nsIFilePicker.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/nsIFilePicker.idl	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/nsIFilePicker.idl	2015-05-25 20:44:09.000000000 +0000
@@ -8,7 +8,6 @@
 
 interface nsIFile;
 interface nsIURI;
-interface nsIDOMFile;
 interface nsIDOMWindow;
 interface nsISimpleEnumerator;
 
@@ -24,7 +23,7 @@
   void done(in short aResult);
 };
 
-[scriptable, uuid(f93509a0-0434-11e3-8ffd-0800200c9a66)]
+[scriptable, uuid(9840d564-42c8-4d78-9a4d-71002343c918)]
 interface nsIFilePicker : nsISupports
 {
   const short modeOpen        = 0;              // Load a file or directory
@@ -143,11 +142,11 @@
   readonly attribute nsISimpleEnumerator files;
 
  /**
-  * Get the nsIDOMFile for the file.
+  * Get the DOM File for the file.
   *
   * @return Returns the file currently selected as File
   */
-  readonly attribute nsIDOMFile domfile;
+  readonly attribute nsISupports domfile;
 
  /**
   * Get the enumerator for the selected files
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/nsIGfxInfo.idl firefox-trunk-41.0~a1~hg20150524r245419/widget/nsIGfxInfo.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/nsIGfxInfo.idl	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/nsIGfxInfo.idl	2015-05-25 20:44:09.000000000 +0000
@@ -64,7 +64,7 @@
    * A set of constants for features that we can ask this GfxInfo object
    * about via GetFeatureStatus
    */
-  /* Don't assign 0 or -1 */
+  /* Don't assign any value <= 0 */
   /* Whether Direct2D is supported for content rendering. */
   const long FEATURE_DIRECT2D = 1;
   /* Whether Direct3D 9 is supported for layers. */
@@ -81,15 +81,15 @@
   const long FEATURE_WEBGL_ANGLE = 7;
   /* Whether WebGL antialiasing is supported. */
   const long FEATURE_WEBGL_MSAA = 8;
-  /* Whether Stagefright is supported */
+  /* Whether Stagefright is supported, starting in 17. */
   const long FEATURE_STAGEFRIGHT = 9;
-  /* Whether Webrtc Hardware acceleration is supported */
+  /* Whether Webrtc Hardware acceleration is supported, starting in 31. */
   const long FEATURE_WEBRTC_HW_ACCELERATION = 10;
-  /* Whether Direct3D 11 is supported for layers. */
+  /* Whether Direct3D 11 is supported for layers, starting in 32. */
   const long FEATURE_DIRECT3D_11_LAYERS = 11;
-  /* Whether hardware accelerated video decoding is supported. */
+  /* Whether hardware accelerated video decoding is supported, starting in 36. */
   const long FEATURE_HARDWARE_VIDEO_DECODING = 12;
-  /* Whether Direct3D 11 is supported for ANGLE. */
+  /* Whether Direct3D 11 is supported for ANGLE, starting in 38. */
   const long FEATURE_DIRECT3D_11_ANGLE = 13;
 
   /*
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/nsIWidget.h firefox-trunk-41.0~a1~hg20150524r245419/widget/nsIWidget.h
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/nsIWidget.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/nsIWidget.h	2015-05-25 20:44:09.000000000 +0000
@@ -38,6 +38,7 @@
 
 namespace mozilla {
 class CompositorVsyncDispatcher;
+class WritingMode;
 namespace dom {
 class TabChild;
 }
@@ -595,6 +596,10 @@
   {
     switch (aMessage) {
       case NOTIFY_IME_OF_SELECTION_CHANGE:
+        mSelectionChangeData.mOffset = UINT32_MAX;
+        mSelectionChangeData.mLength = 0;
+        mSelectionChangeData.mWritingMode = 0;
+        mSelectionChangeData.mReversed = false;
         mSelectionChangeData.mCausedByComposition = false;
         break;
       case NOTIFY_IME_OF_TEXT_CHANGE:
@@ -618,13 +623,40 @@
 
   IMEMessage mMessage;
 
+  // NOTIFY_IME_OF_SELECTION_CHANGE specific data
+  struct SelectionChangeData
+  {
+    // Selection range.
+    uint32_t mOffset;
+    uint32_t mLength;
+
+    // Writing mode at the selection.
+    uint8_t mWritingMode;
+
+    bool mReversed;
+    bool mCausedByComposition;
+
+    void SetWritingMode(const WritingMode& aWritingMode);
+    WritingMode GetWritingMode() const;
+
+    uint32_t StartOffset() const
+    {
+      return mOffset + (mReversed ? mLength : 0);
+    }
+    uint32_t EndOffset() const
+    {
+      return mOffset + (mReversed ? 0 : mLength);
+    }
+    bool IsInInt32Range() const
+    {
+      return mOffset + mLength <= INT32_MAX;
+    }
+  };
+
   union
   {
     // NOTIFY_IME_OF_SELECTION_CHANGE specific data
-    struct
-    {
-      bool mCausedByComposition;
-    } mSelectionChangeData;
+    SelectionChangeData mSelectionChangeData;
 
     // NOTIFY_IME_OF_TEXT_CHANGE specific data
     struct
@@ -1656,6 +1688,9 @@
      * after each composition.
      */
     virtual void EndRemoteDrawing() = 0;
+    virtual void EndRemoteDrawingInRegion(mozilla::gfx::DrawTarget* aDrawTarget, nsIntRegion& aInvalidRegion) {
+      EndRemoteDrawing();
+    }
 
     /**
      * Clean up any resources used by Start/EndRemoteDrawing.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/nsShmImage.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/nsShmImage.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/nsShmImage.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/nsShmImage.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -121,7 +121,7 @@
 
 #if (MOZ_WIDGET_GTK == 2)
 void
-nsShmImage::Put(GdkWindow* aWindow, GdkRectangle* aRects, GdkRectangle* aEnd)
+nsShmImage::Put(GdkWindow* aWindow, const nsIntRegion& aRegion)
 {
     GdkDrawable* gd;
     gint dx, dy;
@@ -131,7 +131,8 @@
     Drawable d = GDK_DRAWABLE_XID(gd);
 
     GC gc = XCreateGC(dpy, d, 0, nullptr);
-    for (GdkRectangle* r = aRects; r < aEnd; r++) {
+    nsIntRegionRectIterator iter(aRegion);
+    for (const nsIntRect *r = iter.Next(); r; r = iter.Next()) {
         XShmPutImage(dpy, d, gc, mImage,
                      r->x, r->y,
                      r->x - dx, r->y - dy,
@@ -151,20 +152,19 @@
 
 #elif (MOZ_WIDGET_GTK == 3)
 void
-nsShmImage::Put(GdkWindow* aWindow, cairo_rectangle_list_t* aRects)
+nsShmImage::Put(GdkWindow* aWindow, const nsIntRegion& aRegion)
 {
     Display* dpy = gdk_x11_get_default_xdisplay();
     Drawable d = GDK_WINDOW_XID(aWindow);
     int dx = 0, dy = 0;
 
     GC gc = XCreateGC(dpy, d, 0, nullptr);
-    cairo_rectangle_t r;
-    for (int i = 0; i < aRects->num_rectangles; i++) {
-        r = aRects->rectangles[i];
+    nsIntRegionRectIterator iter(aRegion);
+    for (const nsIntRect *r = iter.Next(); r; r = iter.Next()) {
         XShmPutImage(dpy, d, gc, mImage,
-                     r.x, r.y,
-                     r.x - dx, r.y - dy,
-                     r.width, r.height,
+                     r->x, r->y,
+                     r->x - dx, r->y - dy,
+                     r->width, r->height,
                      False);
     }
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/nsShmImage.h firefox-trunk-41.0~a1~hg20150524r245419/widget/nsShmImage.h
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/nsShmImage.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/nsShmImage.h	2015-05-25 20:44:09.000000000 +0000
@@ -63,10 +63,8 @@
 public:
     already_AddRefed<gfxASurface> AsSurface();
 
-#if (MOZ_WIDGET_GTK == 2)
-    void Put(GdkWindow* aWindow, GdkRectangle* aRects, GdkRectangle* aEnd);
-#elif (MOZ_WIDGET_GTK == 3)
-    void Put(GdkWindow* aWindow, cairo_rectangle_list_t* aRects);
+#ifdef MOZ_WIDGET_GTK
+    void Put(GdkWindow* aWindow, const nsIntRegion& aRegion);
 #elif defined(MOZ_WIDGET_QT)
     void Put(QWindow* aWindow, QRect& aRect);
 #endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/PuppetWidget.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/PuppetWidget.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/PuppetWidget.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/PuppetWidget.cpp	2015-05-25 20:44:06.000000000 +0000
@@ -75,9 +75,12 @@
 
 PuppetWidget::PuppetWidget(TabChild* aTabChild)
   : mTabChild(aTabChild)
+  , mMemoryPressureObserver(nullptr)
   , mDPI(-1)
   , mDefaultScale(-1)
   , mNativeKeyCommandsValid(false)
+  , mCursorHotspotX(0)
+  , mCursorHotspotY(0)
 {
   MOZ_COUNT_CTOR(PuppetWidget);
 
@@ -89,6 +92,8 @@
 PuppetWidget::~PuppetWidget()
 {
   MOZ_COUNT_DTOR(PuppetWidget);
+
+  Destroy();
 }
 
 NS_IMETHODIMP
@@ -118,6 +123,11 @@
   else {
     Resize(mBounds.x, mBounds.y, mBounds.width, mBounds.height, false);
   }
+  nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
+  if (obs) {
+    mMemoryPressureObserver = new MemoryPressureObserver(this);
+    obs->AddObserver(mMemoryPressureObserver, "memory-pressure", false);
+  }
 
   return NS_OK;
 }
@@ -153,6 +163,10 @@
   Base::OnDestroy();
   Base::Destroy();
   mPaintTask.Revoke();
+  if (mMemoryPressureObserver) {
+    mMemoryPressureObserver->Remove();
+  }
+  mMemoryPressureObserver = nullptr;
   mChild = nullptr;
   if (mLayerManager) {
     mLayerManager->Destroy();
@@ -175,10 +189,6 @@
     mChild->mVisible = aState;
   }
 
-  if (!mVisible && mLayerManager) {
-    mLayerManager->ClearCachedResources();
-  }
-
   if (!wasVisible && mVisible) {
     Resize(mBounds.width, mBounds.height, false);
     Invalidate(mBounds);
@@ -886,19 +896,12 @@
   if (!mTabChild)
     return NS_ERROR_FAILURE;
 
-  nsEventStatus status;
-  WidgetQueryContentEvent queryEvent(true, NS_QUERY_SELECTED_TEXT, this);
-  InitEvent(queryEvent, nullptr);
-  DispatchEvent(&queryEvent, status);
-
-  if (queryEvent.mSucceeded) {
-    mTabChild->SendNotifyIMESelection(
-      mIMELastReceivedSeqno,
-      queryEvent.GetSelectionStart(),
-      queryEvent.GetSelectionEnd(),
-      queryEvent.GetWritingMode(),
-      aIMENotification.mSelectionChangeData.mCausedByComposition);
-  }
+  mTabChild->SendNotifyIMESelection(
+    mIMELastReceivedSeqno,
+    aIMENotification.mSelectionChangeData.StartOffset(),
+    aIMENotification.mSelectionChangeData.EndOffset(),
+    aIMENotification.mSelectionChangeData.GetWritingMode(),
+    aIMENotification.mSelectionChangeData.mCausedByComposition);
   return NS_OK;
 }
 
@@ -956,10 +959,12 @@
 NS_IMETHODIMP
 PuppetWidget::SetCursor(nsCursor aCursor)
 {
-  if (mCursor == aCursor && !mUpdateCursor) {
+  if (mCursor == aCursor && !mCustomCursor && !mUpdateCursor) {
     return NS_OK;
   }
 
+  mCustomCursor = nullptr;
+
   if (mTabChild &&
       !mTabChild->SendSetCursor(aCursor, mUpdateCursor)) {
     return NS_ERROR_FAILURE;
@@ -971,6 +976,59 @@
   return NS_OK;
 }
 
+NS_IMETHODIMP
+PuppetWidget::SetCursor(imgIContainer* aCursor,
+                        uint32_t aHotspotX, uint32_t aHotspotY)
+{
+  if (!aCursor || !mTabChild) {
+    return NS_OK;
+  }
+
+  if (mCustomCursor == aCursor &&
+      mCursorHotspotX == aHotspotX &&
+      mCursorHotspotY == aHotspotY &&
+      !mUpdateCursor) {
+    return NS_OK;
+  }
+
+  RefPtr<mozilla::gfx::SourceSurface> surface =
+    aCursor->GetFrame(imgIContainer::FRAME_CURRENT,
+                      imgIContainer::FLAG_SYNC_DECODE);
+  if (!surface) {
+    return NS_ERROR_FAILURE;
+  }
+
+  mozilla::RefPtr<mozilla::gfx::DataSourceSurface> dataSurface =
+    surface->GetDataSurface();
+  size_t length;
+  int32_t stride;
+  mozilla::UniquePtr<char[]> surfaceData =
+    nsContentUtils::GetSurfaceData(dataSurface, &length, &stride);
+
+  nsCString cursorData = nsCString(surfaceData.get(), length);
+  mozilla::gfx::IntSize size = dataSurface->GetSize();
+  if (!mTabChild->SendSetCustomCursor(cursorData, size.width, size.height, stride,
+                                      static_cast<uint8_t>(dataSurface->GetFormat()),
+                                      aHotspotX, aHotspotY, mUpdateCursor)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  mCursor = nsCursor(-1);
+  mCustomCursor = aCursor;
+  mCursorHotspotX = aHotspotX;
+  mCursorHotspotY = aHotspotY;
+  mUpdateCursor = false;
+
+  return NS_OK;
+}
+
+void
+PuppetWidget::ClearCachedCursor()
+{
+  nsBaseWidget::ClearCachedCursor();
+  mCustomCursor = nullptr;
+}
+
 nsresult
 PuppetWidget::Paint()
 {
@@ -1037,6 +1095,36 @@
   return NS_OK;
 }
 
+NS_IMPL_ISUPPORTS(PuppetWidget::MemoryPressureObserver, nsIObserver)
+
+NS_IMETHODIMP
+PuppetWidget::MemoryPressureObserver::Observe(nsISupports* aSubject,
+                                              const char* aTopic,
+                                              const char16_t* aData)
+{
+  if (!mWidget) {
+    return NS_OK;
+  }
+
+  if (strcmp("memory-pressure", aTopic) == 0) {
+    if (!mWidget->mVisible && mWidget->mLayerManager &&
+        XRE_GetProcessType() == GeckoProcessType_Content) {
+      mWidget->mLayerManager->ClearCachedResources();
+    }
+  }
+  return NS_OK;
+}
+
+void
+PuppetWidget::MemoryPressureObserver::Remove()
+{
+  nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
+  if (obs) {
+    obs->RemoveObserver(this, "memory-pressure");
+  }
+  mWidget = nullptr;
+}
+
 bool
 PuppetWidget::NeedsPaint()
 {
@@ -1135,6 +1223,20 @@
   return NS_OK;
 }
 
+uint32_t PuppetWidget::GetMaxTouchPoints() const
+{
+  static uint32_t sTouchPoints = 0;
+  static bool sIsInitialized = false;
+  if (sIsInitialized) {
+    return sTouchPoints;
+  }
+  if (mTabChild) {
+    mTabChild->GetMaxTouchPoints(&sTouchPoints);
+    sIsInitialized = true;
+  }
+  return sTouchPoints;
+}
+
 PuppetScreen::PuppetScreen(void *nativeScreen)
 {
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/PuppetWidget.h firefox-trunk-41.0~a1~hg20150524r245419/widget/PuppetWidget.h
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/PuppetWidget.h	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/PuppetWidget.h	2015-05-25 20:44:06.000000000 +0000
@@ -174,10 +174,9 @@
 
   NS_IMETHOD SetCursor(nsCursor aCursor) override;
   NS_IMETHOD SetCursor(imgIContainer* aCursor,
-                       uint32_t aHotspotX, uint32_t aHotspotY) override
-  {
-    return nsBaseWidget::SetCursor(aCursor, aHotspotX, aHotspotY);
-  }
+                       uint32_t aHotspotX, uint32_t aHotspotY) override;
+
+  virtual void ClearCachedCursor() override;
 
   // Gets the DPI of the screen corresponding to this widget.
   // Contacts the parent process which gets the DPI from the
@@ -241,6 +240,7 @@
                                             bool aLongTap,
                                             nsIObserver* aObserver) override;
   virtual nsresult ClearNativeTouchSequence(nsIObserver* aObserver) override;
+  virtual uint32_t GetMaxTouchPoints() const override;
 
 protected:
   bool mEnabled;
@@ -279,6 +279,18 @@
     PuppetWidget* mWidget;
   };
 
+  class MemoryPressureObserver : public nsIObserver {
+  public:
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSIOBSERVER
+    explicit MemoryPressureObserver(PuppetWidget* aWidget) : mWidget(aWidget) {}
+    void Remove();
+  private:
+    virtual ~MemoryPressureObserver() {}
+    PuppetWidget* mWidget;
+  };
+  friend class MemoryPressureObserver;
+
   // TabChild normally holds a strong reference to this PuppetWidget
   // or its root ancestor, but each PuppetWidget also needs a
   // reference back to TabChild (e.g. to delegate nsIWidget IME calls
@@ -291,6 +303,7 @@
   nsRefPtr<PuppetWidget> mChild;
   nsIntRegion mDirtyRegion;
   nsRevocableEventPtr<PaintTask> mPaintTask;
+  nsRefPtr<MemoryPressureObserver> mMemoryPressureObserver;
   // XXX/cjones: keeping this around until we teach LayerManager to do
   // retained-content-only transactions
   mozilla::RefPtr<DrawTarget> mDrawTarget;
@@ -314,6 +327,9 @@
   InfallibleTArray<mozilla::CommandInt> mSingleLineCommands;
   InfallibleTArray<mozilla::CommandInt> mMultiLineCommands;
   InfallibleTArray<mozilla::CommandInt> mRichTextCommands;
+
+  nsCOMPtr<imgIContainer> mCustomCursor;
+  uint32_t mCursorHotspotX, mCursorHotspotY;
 };
 
 struct AutoCacheNativeKeyCommands
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/qt/GfxInfo.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/qt/GfxInfo.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/qt/GfxInfo.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/qt/GfxInfo.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -0,0 +1,216 @@
+/* -*- 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 "GfxInfo.h"
+
+using namespace mozilla::widget;
+
+/* GetD2DEnabled and GetDwriteEnabled shouldn't be called until after gfxPlatform initialization
+ * has occurred because they depend on it for information. (See bug 591561) */
+nsresult
+GfxInfo::GetD2DEnabled(bool *aEnabled)
+{
+  return NS_ERROR_FAILURE;
+}
+
+nsresult
+GfxInfo::GetDWriteEnabled(bool *aEnabled)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute DOMString DWriteVersion; */
+NS_IMETHODIMP
+GfxInfo::GetDWriteVersion(nsAString & aDwriteVersion)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute DOMString cleartypeParameters; */
+NS_IMETHODIMP
+GfxInfo::GetCleartypeParameters(nsAString & aCleartypeParams)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute DOMString adapterDescription; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDescription(nsAString & aAdapterDescription)
+{
+  aAdapterDescription.Truncate();
+  return NS_OK;
+}
+
+/* readonly attribute DOMString adapterDescription2; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDescription2(nsAString & aAdapterDescription)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute DOMString adapterRAM; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterRAM(nsAString & aAdapterRAM)
+{
+  aAdapterRAM.Truncate();
+  return NS_OK;
+}
+
+/* readonly attribute DOMString adapterRAM2; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterRAM2(nsAString & aAdapterRAM)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute DOMString adapterDriver; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDriver(nsAString & aAdapterDriver)
+{
+  aAdapterDriver.Truncate();
+  return NS_OK;
+}
+
+/* readonly attribute DOMString adapterDriver2; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDriver2(nsAString & aAdapterDriver)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute DOMString adapterDriverVersion; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDriverVersion(nsAString & aAdapterDriverVersion)
+{
+  aAdapterDriverVersion.Truncate();
+  return NS_OK;
+}
+
+/* readonly attribute DOMString adapterDriverVersion2; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDriverVersion2(nsAString & aAdapterDriverVersion)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute DOMString adapterDriverDate; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDriverDate(nsAString & aAdapterDriverDate)
+{
+  aAdapterDriverDate.Truncate();
+  return NS_OK;
+}
+
+/* readonly attribute DOMString adapterDriverDate2; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDriverDate2(nsAString & aAdapterDriverDate)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute DOMString adapterVendorID; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterVendorID(nsAString & aAdapterVendorID)
+{
+  aAdapterVendorID.Truncate();
+  return NS_OK;
+}
+
+/* readonly attribute DOMString adapterVendorID2; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterVendorID2(nsAString & aAdapterVendorID)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute DOMString adapterDeviceID; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDeviceID(nsAString & aAdapterDeviceID)
+{
+  aAdapterDeviceID.Truncate();
+  return NS_OK;
+}
+
+/* readonly attribute DOMString adapterDeviceID2; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDeviceID2(nsAString & aAdapterDeviceID)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute DOMString adapterSubsysID; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterSubsysID(nsAString & aAdapterSubsysID)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute DOMString adapterSubsysID2; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterSubsysID2(nsAString & aAdapterSubsysID)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute boolean isGPU2Active; */
+NS_IMETHODIMP
+GfxInfo::GetIsGPU2Active(bool* aIsGPU2Active)
+{
+  return NS_ERROR_FAILURE;
+}
+
+const nsTArray<GfxDriverInfo>&
+GfxInfo::GetGfxDriverInfo()
+{
+  return *mDriverInfo;
+}
+
+uint32_t GfxInfo::OperatingSystemVersion()
+{
+  return 0;
+}
+
+nsresult
+GfxInfo::GetFeatureStatusImpl(int32_t /*aFeature*/, 
+                              int32_t *aStatus, 
+                              nsAString & /*aSuggestedDriverVersion*/,
+                              const nsTArray<GfxDriverInfo>& /*aDriverInfo*/, 
+                              OperatingSystem* /*aOS*/ /* = nullptr */)
+{
+  NS_ENSURE_ARG_POINTER(aStatus);
+  *aStatus = nsIGfxInfo::FEATURE_STATUS_OK;
+
+  return NS_OK;
+}
+
+#ifdef DEBUG
+
+// Implement nsIGfxInfoDebug
+
+/* void spoofVendorID (in DOMString aVendorID); */
+NS_IMETHODIMP GfxInfo::SpoofVendorID(const nsAString &)
+{
+  return NS_OK;
+}
+
+/* void spoofDeviceID (in unsigned long aDeviceID); */
+NS_IMETHODIMP GfxInfo::SpoofDeviceID(const nsAString &)
+{
+  return NS_OK;
+}
+
+/* void spoofDriverVersion (in DOMString aDriverVersion); */
+NS_IMETHODIMP GfxInfo::SpoofDriverVersion(const nsAString &)
+{
+  return NS_OK;
+}
+
+/* void spoofOSVersion (in unsigned long aVersion); */
+NS_IMETHODIMP GfxInfo::SpoofOSVersion(uint32_t)
+{
+  return NS_OK;
+}
+
+#endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/qt/GfxInfo.h firefox-trunk-41.0~a1~hg20150524r245419/widget/qt/GfxInfo.h
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/qt/GfxInfo.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/qt/GfxInfo.h	2015-05-25 20:44:09.000000000 +0000
@@ -0,0 +1,68 @@
+/* vim: se cin sw=2 ts=2 et : */
+/* -*- 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_widget_GfxInfo_h__
+#define __mozilla_widget_GfxInfo_h__
+
+#include "GfxInfoBase.h"
+#include "GfxDriverInfo.h"
+
+#include "nsString.h"
+
+namespace mozilla {
+namespace widget {
+
+class GfxInfo : public GfxInfoBase
+{
+public:
+  // We only declare the subset of nsIGfxInfo that we actually implement. The
+  // rest is brought forward from GfxInfoBase.
+  NS_IMETHOD GetD2DEnabled(bool *aD2DEnabled);
+  NS_IMETHOD GetDWriteEnabled(bool *aDWriteEnabled);
+  NS_IMETHOD GetDWriteVersion(nsAString & aDwriteVersion);
+  NS_IMETHOD GetCleartypeParameters(nsAString & aCleartypeParams);
+  NS_IMETHOD GetAdapterDescription(nsAString & aAdapterDescription);
+  NS_IMETHOD GetAdapterDriver(nsAString & aAdapterDriver);
+  NS_IMETHOD GetAdapterVendorID(nsAString & aAdapterVendorID);
+  NS_IMETHOD GetAdapterDeviceID(nsAString & aAdapterDeviceID);
+  NS_IMETHOD GetAdapterSubsysID(nsAString & aAdapterSubsysID);
+  NS_IMETHOD GetAdapterRAM(nsAString & aAdapterRAM);
+  NS_IMETHOD GetAdapterDriverVersion(nsAString & aAdapterDriverVersion);
+  NS_IMETHOD GetAdapterDriverDate(nsAString & aAdapterDriverDate);
+  NS_IMETHOD GetAdapterDescription2(nsAString & aAdapterDescription);
+  NS_IMETHOD GetAdapterDriver2(nsAString & aAdapterDriver);
+  NS_IMETHOD GetAdapterVendorID2(nsAString & aAdapterVendorID);
+  NS_IMETHOD GetAdapterDeviceID2(nsAString & aAdapterDeviceID);
+  NS_IMETHOD GetAdapterSubsysID2(nsAString & aAdapterSubsysID);
+  NS_IMETHOD GetAdapterRAM2(nsAString & aAdapterRAM);
+  NS_IMETHOD GetAdapterDriverVersion2(nsAString & aAdapterDriverVersion);
+  NS_IMETHOD GetAdapterDriverDate2(nsAString & aAdapterDriverDate);
+  NS_IMETHOD GetIsGPU2Active(bool *aIsGPU2Active);
+  using GfxInfoBase::GetFeatureStatus;
+  using GfxInfoBase::GetFeatureSuggestedDriverVersion;
+  using GfxInfoBase::GetWebGLParameter;
+
+  virtual uint32_t OperatingSystemVersion() override;
+
+#ifdef DEBUG
+  NS_DECL_NSIGFXINFODEBUG
+#endif
+
+protected:
+
+  virtual nsresult GetFeatureStatusImpl(int32_t aFeature,
+                                        int32_t *aStatus,
+                                        nsAString & aSuggestedDriverVersion,
+                                        const nsTArray<GfxDriverInfo>& aDriverInfo,
+                                        OperatingSystem* aOS = nullptr);
+  virtual const nsTArray<GfxDriverInfo>& GetGfxDriverInfo();
+};
+
+} // namespace widget
+} // namespace mozilla
+
+#endif /* __mozilla_widget_GfxInfo_h__ */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/qt/moz.build firefox-trunk-41.0~a1~hg20150524r245419/widget/qt/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/qt/moz.build	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/qt/moz.build	2015-05-25 20:44:09.000000000 +0000
@@ -44,6 +44,11 @@
     LOCAL_INCLUDES += [
         '../x11',
     ]
+else:
+    SOURCES += [
+        'GfxInfo.cpp',
+    ]
+
 
 #DEFINES['DEBUG_WIDGETS'] = True
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/qt/nsAppShell.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/qt/nsAppShell.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/qt/nsAppShell.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/qt/nsAppShell.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -18,7 +18,7 @@
 #include "nsQAppInstance.h"
 
 #ifdef MOZ_LOGGING
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #endif
 
 PRLogModuleInfo *gWidgetLog = nullptr;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/qt/nsDeviceContextSpecQt.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/qt/nsDeviceContextSpecQt.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/qt/nsDeviceContextSpecQt.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/qt/nsDeviceContextSpecQt.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -10,7 +10,7 @@
 #define SET_PRINTER_FEATURES_VIA_PREFS 1
 #define PRINTERFEATURES_PREF "print.tmp.printerfeatures"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "plstr.h"
 
@@ -35,7 +35,7 @@
 static PRLogModuleInfo* DeviceContextSpecQtLM =
     PR_NewLogModule("DeviceContextSpecQt");
 /* Macro to make lines shorter */
-#define DO_PR_DEBUG_LOG(x) PR_LOG(DeviceContextSpecQtLM, PR_LOG_DEBUG, x)
+#define DO_PR_DEBUG_LOG(x) MOZ_LOG(DeviceContextSpecQtLM, PR_LOG_DEBUG, x)
 
 nsDeviceContextSpecQt::nsDeviceContextSpecQt()
 {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/qt/nsQtKeyUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/qt/nsQtKeyUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/qt/nsQtKeyUtils.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/qt/nsQtKeyUtils.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -445,7 +445,6 @@
         case Qt::Key_TouchpadOff:
         case Qt::Key_unknown:
         case Qt::Key_Call:
-        case Qt::Key_CameraFocus:
         case Qt::Key_Context1:
         case Qt::Key_Context2:
         case Qt::Key_Context3:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/qt/nsWidgetFactory.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/qt/nsWidgetFactory.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/qt/nsWidgetFactory.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/qt/nsWidgetFactory.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -46,6 +46,8 @@
 
 #if defined(MOZ_X11)
 #include "GfxInfoX11.h"
+#else
+#include "GfxInfo.h"
 #endif
 
 using namespace mozilla::widget;
@@ -66,14 +68,12 @@
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintDialogServiceQt, Init)
 #endif
 
-#if defined(MOZ_X11)
 namespace mozilla {
 namespace widget {
 // This constructor should really be shared with all platforms.
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(GfxInfo, Init)
 }
 }
-#endif
 
 
 NS_DEFINE_NAMED_CID(NS_APPSHELL_CID);
@@ -86,9 +86,7 @@
 NS_DEFINE_NAMED_CID(NS_TRANSFERABLE_CID);
 NS_DEFINE_NAMED_CID(NS_CLIPBOARD_CID);
 NS_DEFINE_NAMED_CID(NS_CLIPBOARDHELPER_CID);
-#if defined(MOZ_X11)
 NS_DEFINE_NAMED_CID(NS_GFXINFO_CID);
-#endif
 #ifdef NS_PRINTING
 NS_DEFINE_NAMED_CID(NS_PRINTSETTINGSSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_PRINTER_ENUMERATOR_CID);
@@ -108,9 +106,7 @@
     { &kNS_SCREENMANAGER_CID, false, nullptr, nsScreenManagerQtConstructor },
     { &kNS_TRANSFERABLE_CID, false, nullptr, nsTransferableConstructor },
     { &kNS_WINDOW_CID, false, nullptr, nsWindowConstructor },
-#if defined(MOZ_X11)
     { &kNS_GFXINFO_CID, false, nullptr, mozilla::widget::GfxInfoConstructor },
-#endif
 #ifdef NS_PRINTING
     { &kNS_DEVICE_CONTEXT_SPEC_CID, false, nullptr, nsDeviceContextSpecQtConstructor },
     { &kNS_PRINTDIALOGSERVICE_CID, false, nullptr, nsPrintDialogServiceQtConstructor },
@@ -132,9 +128,7 @@
     { "@mozilla.org/widgets/child_window/qt;1", &kNS_CHILD_CID },
     { "@mozilla.org/widgets/window/qt;1", &kNS_WINDOW_CID },
     { "@mozilla.org/widget/transferable;1", &kNS_TRANSFERABLE_CID },
-#if defined(MOZ_X11)
     { "@mozilla.org/gfx/info;1", &kNS_GFXINFO_CID },
-#endif
 #ifdef NS_PRINTING
     { "@mozilla.org/gfx/devicecontextspec;1", &kNS_DEVICE_CONTEXT_SPEC_CID },
     { "@mozilla.org/gfx/printerenumerator;1", &kNS_PRINTER_ENUMERATOR_CID },
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/qt/nsWindow.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/qt/nsWindow.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/qt/nsWindow.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/qt/nsWindow.cpp	2015-05-25 20:44:09.000000000 +0000
@@ -630,7 +630,7 @@
 LayoutDeviceIntPoint
 nsWindow::WidgetToScreenOffset()
 {
-    NS_ENSURE_TRUE(mWidget, nsIntPoint(0,0));
+    NS_ENSURE_TRUE(mWidget, LayoutDeviceIntPoint(0,0));
 
     QPoint origin(0, 0);
     origin = mWidget->mapToGlobal(origin);
@@ -1505,7 +1505,7 @@
         aRect.MoveTo(pos.x(), pos.y());
     }
     else {
-        aRect.MoveTo(WidgetToScreenOffset());
+        aRect.MoveTo(WidgetToScreenOffsetUntyped());
     }
     LOG(("GetScreenBounds %d %d | %d %d | %d %d\n",
          aRect.x, aRect.y,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/qt/nsWindow.h firefox-trunk-41.0~a1~hg20150524r245419/widget/qt/nsWindow.h
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/qt/nsWindow.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/qt/nsWindow.h	2015-05-25 20:44:09.000000000 +0000
@@ -21,7 +21,7 @@
 
 #ifdef MOZ_LOGGING
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsTArray.h"
 
 extern PRLogModuleInfo *gWidgetLog;
@@ -29,10 +29,10 @@
 extern PRLogModuleInfo *gWidgetIMLog;
 extern PRLogModuleInfo *gWidgetDrawLog;
 
-#define LOG(args) PR_LOG(gWidgetLog, 4, args)
-#define LOGFOCUS(args) PR_LOG(gWidgetFocusLog, 4, args)
-#define LOGIM(args) PR_LOG(gWidgetIMLog, 4, args)
-#define LOGDRAW(args) PR_LOG(gWidgetDrawLog, 4, args)
+#define LOG(args) MOZ_LOG(gWidgetLog, 4, args)
+#define LOGFOCUS(args) MOZ_LOG(gWidgetFocusLog, 4, args)
+#define LOGIM(args) MOZ_LOG(gWidgetIMLog, 4, args)
+#define LOGDRAW(args) MOZ_LOG(gWidgetDrawLog, 4, args)
 
 #else
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/tests/test_clipboard.xul firefox-trunk-41.0~a1~hg20150524r245419/widget/tests/test_clipboard.xul
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/tests/test_clipboard.xul	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/tests/test_clipboard.xul	2015-05-25 20:44:09.000000000 +0000
@@ -65,7 +65,7 @@
     const data = "random number: " + Math.random();
     let helper = Cc['@mozilla.org/widget/clipboardhelper;1']
                  .getService(Ci.nsIClipboardHelper);
-    helper.copyString(data, document);
+    helper.copyString(data);
     is(paste(clipboard), data, 'Data was successfully copied.');
 
     // Test emptyClipboard, disabled for OSX because bug 666254
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/TextEvents.h firefox-trunk-41.0~a1~hg20150524r245419/widget/TextEvents.h
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/TextEvents.h	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/TextEvents.h	2015-05-25 20:44:06.000000000 +0000
@@ -536,6 +536,7 @@
   mozilla::WritingMode GetWritingMode(void) const
   {
     NS_ASSERTION(message == NS_QUERY_SELECTED_TEXT ||
+                 message == NS_QUERY_CARET_RECT ||
                  message == NS_QUERY_TEXT_RECT,
                  "not querying selection or text rect");
     return mReply.mWritingMode;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/WidgetUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/WidgetUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/WidgetUtils.cpp	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/WidgetUtils.cpp	2015-05-25 20:44:06.000000000 +0000
@@ -6,6 +6,9 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/WidgetUtils.h"
+#ifdef XP_WIN
+#include "WinUtils.h"
+#endif
 
 namespace mozilla {
 
@@ -89,4 +92,15 @@
       return aRect;
   }
 }
+
+uint32_t
+WidgetUtils::IsTouchDeviceSupportPresent()
+{
+#ifdef XP_WIN
+  return WinUtils::IsTouchDeviceSupportPresent();
+#else
+  return 0;
+#endif
+}
+
 } // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/WidgetUtils.h firefox-trunk-41.0~a1~hg20150524r245419/widget/WidgetUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/WidgetUtils.h	2015-05-13 18:06:27.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/WidgetUtils.h	2015-05-25 20:44:06.000000000 +0000
@@ -81,6 +81,11 @@
                                          bool aIsCapsLock,
                                          uint32_t* aUnshiftedCharCode,
                                          uint32_t* aShiftedCharCode);
+
+  /**
+  * Does device have touch support
+  */
+  static uint32_t IsTouchDeviceSupportPresent();
 };
 
 } // namespace widget
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/KeyboardLayout.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/KeyboardLayout.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/KeyboardLayout.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/KeyboardLayout.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/DebugOnly.h"
@@ -2544,7 +2544,7 @@
     static const UINT kExtendedScanCode[] = { 0x0000, 0xE000 };
     static const UINT kMapType =
       IsVistaOrLater() ? MAPVK_VSC_TO_VK_EX : MAPVK_VSC_TO_VK;
-    PR_LOG(sKeyboardLayoutLogger, PR_LOG_DEBUG,
+    MOZ_LOG(sKeyboardLayoutLogger, PR_LOG_DEBUG,
            ("Logging virtual keycode values for scancode (0x%p)...",
             mKeyboardLayout));
     for (uint32_t i = 0; i < ArrayLength(kExtendedScanCode); i++) {
@@ -2552,7 +2552,7 @@
         UINT scanCode = kExtendedScanCode[i] + j;
         UINT virtualKeyCode =
           ::MapVirtualKeyEx(scanCode, kMapType, mKeyboardLayout);
-        PR_LOG(sKeyboardLayoutLogger, PR_LOG_DEBUG,
+        MOZ_LOG(sKeyboardLayoutLogger, PR_LOG_DEBUG,
                ("0x%04X, %s", scanCode, kVirtualKeyName[virtualKeyCode]));
       }
       // XP and Server 2003 don't support 0xE0 prefix of the scancode.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsClipboard.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsClipboard.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsClipboard.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsClipboard.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -336,39 +336,39 @@
 {
 #if defined(DEBUG_rods) || defined(DEBUG_pinkerton)
   if (hres == E_INVALIDARG) {
-    PR_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, ("E_INVALIDARG\n"));
+    MOZ_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, ("E_INVALIDARG\n"));
   } else
   if (hres == E_UNEXPECTED) {
-    PR_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, ("E_UNEXPECTED\n"));
+    MOZ_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, ("E_UNEXPECTED\n"));
   } else
   if (hres == E_OUTOFMEMORY) {
-    PR_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, ("E_OUTOFMEMORY\n"));
+    MOZ_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, ("E_OUTOFMEMORY\n"));
   } else
   if (hres == DV_E_LINDEX ) {
-    PR_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, ("DV_E_LINDEX\n"));
+    MOZ_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, ("DV_E_LINDEX\n"));
   } else
   if (hres == DV_E_FORMATETC) {
-    PR_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, ("DV_E_FORMATETC\n"));
+    MOZ_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, ("DV_E_FORMATETC\n"));
   }  else
   if (hres == DV_E_TYMED) {
-    PR_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, ("DV_E_TYMED\n"));
+    MOZ_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, ("DV_E_TYMED\n"));
   }  else
   if (hres == DV_E_DVASPECT) {
-    PR_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, ("DV_E_DVASPECT\n"));
+    MOZ_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, ("DV_E_DVASPECT\n"));
   }  else
   if (hres == OLE_E_NOTRUNNING) {
-    PR_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, ("OLE_E_NOTRUNNING\n"));
+    MOZ_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, ("OLE_E_NOTRUNNING\n"));
   }  else
   if (hres == STG_E_MEDIUMFULL) {
-    PR_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, ("STG_E_MEDIUMFULL\n"));
+    MOZ_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, ("STG_E_MEDIUMFULL\n"));
   }  else
   if (hres == DV_E_CLIPFORMAT) {
-    PR_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, ("DV_E_CLIPFORMAT\n"));
+    MOZ_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, ("DV_E_CLIPFORMAT\n"));
   }  else
   if (hres == S_OK) {
-    PR_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, ("S_OK\n"));
+    MOZ_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, ("S_OK\n"));
   } else {
-    PR_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, 
+    MOZ_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, 
            ("****** DisplayErrCode 0x%X\n", hres));
   }
 #endif
@@ -546,7 +546,7 @@
       case TYMED_GDI: 
         {
 #ifdef DEBUG
-          PR_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, 
+          MOZ_LOG(gWin32ClipboardLog, PR_LOG_ALWAYS, 
                  ("*********************** TYMED_GDI\n"));
 #endif
         } break;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsDataObj.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsDataObj.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsDataObj.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsDataObj.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -546,7 +546,7 @@
           return GetFileContents ( *aFormat, *pSTM );
         if ( format == PreferredDropEffect )
           return GetPreferredDropEffect( *aFormat, *pSTM );
-        //PR_LOG(gWindowsLog, PR_LOG_ALWAYS, 
+        //MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, 
         //       ("***** nsDataObj::GetData - Unknown format %u\n", format));
         return GetText(df, *aFormat, *pSTM);
       } //switch
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsDeviceContextSpecWin.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsDeviceContextSpecWin.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsDeviceContextSpecWin.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsDeviceContextSpecWin.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -41,9 +41,9 @@
 #include "nsIStringBundle.h"
 #define NS_ERROR_GFX_PRINTER_BUNDLE_URL "chrome://global/locale/printing.properties"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 PRLogModuleInfo * kWidgetPrintingLogMod = PR_NewLogModule("printing-widget");
-#define PR_PL(_p1)  PR_LOG(kWidgetPrintingLogMod, PR_LOG_DEBUG, _p1)
+#define PR_PL(_p1)  MOZ_LOG(kWidgetPrintingLogMod, PR_LOG_DEBUG, _p1)
 
 using namespace mozilla;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsIMM32Handler.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsIMM32Handler.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsIMM32Handler.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsIMM32Handler.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "nsIMM32Handler.h"
 #include "nsWindow.h"
@@ -16,6 +16,10 @@
 #include "mozilla/MiscEvents.h"
 #include "mozilla/TextEvents.h"
 
+#ifndef IME_PROP_ACCEPT_WIDE_VKEY
+#define IME_PROP_ACCEPT_WIDE_VKEY 0x20
+#endif
+
 using namespace mozilla;
 using namespace mozilla::widget;
 
@@ -23,6 +27,92 @@
 
 PRLogModuleInfo* gIMM32Log = nullptr;
 
+static void
+HandleSeparator(nsACString& aDesc)
+{
+  if (!aDesc.IsEmpty()) {
+    aDesc.AppendLiteral(" | ");
+  }
+}
+
+class GetIMEGeneralPropertyName : public nsAutoCString
+{
+public:
+  GetIMEGeneralPropertyName(DWORD aFlags)
+  {
+    if (!aFlags) {
+      AppendLiteral("no flags");
+      return;
+    }
+    if (aFlags & IME_PROP_AT_CARET) {
+      AppendLiteral("IME_PROP_AT_CARET");
+    }
+    if (aFlags & IME_PROP_SPECIAL_UI) {
+      HandleSeparator(*this);
+      AppendLiteral("IME_PROP_SPECIAL_UI");
+    }
+    if (aFlags & IME_PROP_CANDLIST_START_FROM_1) {
+      HandleSeparator(*this);
+      AppendLiteral("IME_PROP_CANDLIST_START_FROM_1");
+    }
+    if (aFlags & IME_PROP_UNICODE) {
+      HandleSeparator(*this);
+      AppendLiteral("IME_PROP_UNICODE");
+    }
+    if (aFlags & IME_PROP_COMPLETE_ON_UNSELECT) {
+      HandleSeparator(*this);
+      AppendLiteral("IME_PROP_COMPLETE_ON_UNSELECT");
+    }
+    if (aFlags & IME_PROP_ACCEPT_WIDE_VKEY) {
+      HandleSeparator(*this);
+      AppendLiteral("IME_PROP_ACCEPT_WIDE_VKEY");
+    }
+  }
+  virtual ~GetIMEGeneralPropertyName() {}
+};
+
+class GetIMEUIPropertyName : public nsAutoCString
+{
+public:
+  GetIMEUIPropertyName(DWORD aFlags)
+  {
+    if (!aFlags) {
+      AppendLiteral("no flags");
+      return;
+    }
+    if (aFlags & UI_CAP_2700) {
+      AppendLiteral("UI_CAP_2700");
+    }
+    if (aFlags & UI_CAP_ROT90) {
+      HandleSeparator(*this);
+      AppendLiteral("UI_CAP_ROT90");
+    }
+    if (aFlags & UI_CAP_ROTANY) {
+      HandleSeparator(*this);
+      AppendLiteral("UI_CAP_ROTANY");
+    }
+  }
+  virtual ~GetIMEUIPropertyName() {}
+};
+
+class GetWritingModeName : public nsAutoCString
+{
+public:
+  GetWritingModeName(const WritingMode& aWritingMode)
+  {
+    if (!aWritingMode.IsVertical()) {
+      Assign("Horizontal");
+      return;
+    }
+    if (aWritingMode.IsVerticalLR()) {
+      Assign("Vertical (LR)");
+      return;
+    }
+    Assign("Vertical (RL)");
+  }
+  virtual ~GetWritingModeName() {}
+};
+
 static UINT sWM_MSIME_MOUSE = 0; // mouse message for MSIME 98/2000
 
 //-------------------------------------------------------------------------
@@ -41,8 +131,12 @@
 #define IMEMOUSE_WUP        0x10    // wheel up
 #define IMEMOUSE_WDOWN      0x20    // wheel down
 
+WritingMode nsIMM32Handler::sWritingModeOfCompositionFont;
+nsString nsIMM32Handler::sIMEName;
 UINT nsIMM32Handler::sCodePage = 0;
 DWORD nsIMM32Handler::sIMEProperty = 0;
+DWORD nsIMM32Handler::sIMEUIProperty = 0;
+bool nsIMM32Handler::sAssumeVerticalWritingModeNotSupported = false;
 
 /* static */ void
 nsIMM32Handler::EnsureHandlerInstance()
@@ -61,7 +155,10 @@
   if (!sWM_MSIME_MOUSE) {
     sWM_MSIME_MOUSE = ::RegisterWindowMessage(RWM_MOUSE);
   }
-  InitKeyboardLayout(::GetKeyboardLayout(0));
+  sAssumeVerticalWritingModeNotSupported =
+    Preferences::GetBool(
+      "intl.imm.vertical_writing.always_assume_not_supported", false);
+  InitKeyboardLayout(nullptr, ::GetKeyboardLayout(0));
 }
 
 /* static */ void
@@ -101,6 +198,22 @@
   return WinUtils::GetTopLevelHWND(wnd, true) == aWindow->GetWindowHandle();
 }
 
+/* static */
+bool
+nsIMM32Handler::IsJapanist2003Active()
+{
+  return sIMEName.EqualsLiteral("Japanist 2003");
+}
+
+/* static */ bool
+nsIMM32Handler::IsGoogleJapaneseInputActive()
+{
+  // NOTE: Even on Windows for en-US, the name of Google Japanese Input is
+  //       written in Japanese.
+  return sIMEName.Equals(L"Google \x65E5\x672C\x8A9E\x5165\x529B "
+                         L"IMM32 \x30E2\x30B8\x30E5\x30FC\x30EB");
+}
+
 /* static */ bool
 nsIMM32Handler::ShouldDrawCompositionStringOurselves()
 {
@@ -111,18 +224,67 @@
           (sIMEProperty & IME_PROP_AT_CARET);
 }
 
+/* static */ bool
+nsIMM32Handler::IsVerticalWritingSupported()
+{
+  // Even if IME claims that they support vertical writing mode but it may not
+  // support vertical writing mode for its candidate window.
+  if (sAssumeVerticalWritingModeNotSupported) {
+    return false;
+  }
+  // Google Japanese Input doesn't support vertical writing mode.  We should
+  // return false if it's active IME.
+  if (IsGoogleJapaneseInputActive()) {
+    return false;
+  }
+  return !!(sIMEUIProperty & (UI_CAP_2700 | UI_CAP_ROT90 | UI_CAP_ROTANY));
+}
+
 /* static */ void
-nsIMM32Handler::InitKeyboardLayout(HKL aKeyboardLayout)
+nsIMM32Handler::InitKeyboardLayout(nsWindow* aWindow,
+                                   HKL aKeyboardLayout)
 {
+  UINT IMENameLength = ::ImmGetDescriptionW(aKeyboardLayout, nullptr, 0);
+  if (IMENameLength) {
+    // Add room for the terminating null character
+    sIMEName.SetLength(++IMENameLength);
+    IMENameLength =
+      ::ImmGetDescriptionW(aKeyboardLayout, wwc(sIMEName.BeginWriting()),
+                           IMENameLength);
+    // Adjust the length to ignore the terminating null character
+    sIMEName.SetLength(IMENameLength);
+  } else {
+    sIMEName.Truncate();
+  }
+
   WORD langID = LOWORD(aKeyboardLayout);
   ::GetLocaleInfoW(MAKELCID(langID, SORT_DEFAULT),
                    LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER,
                    (PWSTR)&sCodePage, sizeof(sCodePage) / sizeof(WCHAR));
   sIMEProperty = ::ImmGetProperty(aKeyboardLayout, IGP_PROPERTY);
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
-    ("IMM32: InitKeyboardLayout, aKeyboardLayout=%08x, sCodePage=%lu, "
-     "sIMEProperty=%08x",
-     aKeyboardLayout, sCodePage, sIMEProperty));
+  sIMEUIProperty = ::ImmGetProperty(aKeyboardLayout, IGP_UI);
+
+  // If active IME is a TIP of TSF, we cannot retrieve the name with IMM32 API.
+  // For hacking some bugs of some TIP, we should set an IME name from the
+  // pref.
+  if (sCodePage == 932 && sIMEName.IsEmpty()) {
+    sIMEName =
+      Preferences::GetString("intl.imm.japanese.assume_active_tip_name_as");
+  }
+
+  // Whether the IME supports vertical writing mode might be changed or
+  // some IMEs may need specific font for their UI.  Therefore, we should
+  // update composition font forcibly here.
+  if (aWindow) {
+    MaybeAdjustCompositionFont(aWindow, sWritingModeOfCompositionFont, true);
+  }
+
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    ("IMM32: InitKeyboardLayout, aKeyboardLayout=%08x (\"%s\"), sCodePage=%lu, "
+     "sIMEProperty=%s, sIMEUIProperty=%s",
+     aKeyboardLayout, NS_ConvertUTF16toUTF8(sIMEName).get(),
+     sCodePage, GetIMEGeneralPropertyName(sIMEProperty).get(),
+     GetIMEUIPropertyName(sIMEUIProperty).get()));
 }
 
 /* static */ UINT
@@ -137,6 +299,7 @@
 {
   return nsIMEUpdatePreference(
     nsIMEUpdatePreference::NOTIFY_POSITION_CHANGE |
+    nsIMEUpdatePreference::NOTIFY_SELECTION_CHANGE |
     nsIMEUpdatePreference::NOTIFY_MOUSE_BUTTON_EVENT_ON_CHAR);
 }
 
@@ -153,16 +316,16 @@
   mIsComposing(false), mIsComposingOnPlugin(false),
   mNativeCaretIsCreated(false)
 {
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS, ("IMM32: nsIMM32Handler is created\n"));
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS, ("IMM32: nsIMM32Handler is created\n"));
 }
 
 nsIMM32Handler::~nsIMM32Handler()
 {
   if (mIsComposing) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: ~nsIMM32Handler, ERROR, the instance is still composing\n"));
   }
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS, ("IMM32: nsIMM32Handler is destroyed\n"));
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS, ("IMM32: nsIMM32Handler is destroyed\n"));
 }
 
 nsresult
@@ -184,7 +347,7 @@
 /* static */ void
 nsIMM32Handler::CommitComposition(nsWindow* aWindow, bool aForce)
 {
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: CommitComposition, aForce=%s, aWindow=%p, hWnd=%08x, mComposingWindow=%p%s\n",
      aForce ? "TRUE" : "FALSE",
      aWindow, aWindow->GetWindowHandle(),
@@ -198,7 +361,7 @@
 
   nsIMEContext IMEContext(aWindow->GetWindowHandle());
   bool associated = IMEContext.AssociateDefaultContext();
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: CommitComposition, associated=%s\n",
      associated ? "YES" : "NO"));
 
@@ -215,7 +378,7 @@
 /* static */ void
 nsIMM32Handler::CancelComposition(nsWindow* aWindow, bool aForce)
 {
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: CancelComposition, aForce=%s, aWindow=%p, hWnd=%08x, mComposingWindow=%p%s\n",
      aForce ? "TRUE" : "FALSE",
      aWindow, aWindow->GetWindowHandle(),
@@ -229,7 +392,7 @@
 
   nsIMEContext IMEContext(aWindow->GetWindowHandle());
   bool associated = IMEContext.AssociateDefaultContext();
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: CancelComposition, associated=%s\n",
      associated ? "YES" : "NO"));
 
@@ -258,6 +421,43 @@
   gIMM32Handler->SetIMERelatedWindowsPos(aWindow, IMEContext);
 }
 
+// static
+void
+nsIMM32Handler::OnSelectionChange(nsWindow* aWindow,
+                                  const IMENotification& aIMENotification)
+{
+  if (aIMENotification.mSelectionChangeData.mCausedByComposition) {
+    return;
+  }
+  MaybeAdjustCompositionFont(aWindow,
+    aIMENotification.mSelectionChangeData.GetWritingMode());
+}
+
+// static
+void
+nsIMM32Handler::MaybeAdjustCompositionFont(nsWindow* aWindow,
+                                           const WritingMode& aWritingMode,
+                                           bool aForceUpdate)
+{
+  switch (sCodePage) {
+    case 932: // Japanese Shift-JIS
+    case 936: // Simlified Chinese GBK
+    case 949: // Korean
+    case 950: // Traditional Chinese Big5
+      EnsureHandlerInstance();
+      break;
+    default:
+      // If there is no instance of nsIMM32Hander, we shouldn't waste footprint.
+      if (!gIMM32Handler) {
+        return;
+      }
+  }
+
+  // Like Navi-Bar of ATOK, some IMEs may require proper composition font even
+  // before sending WM_IME_STARTCOMPOSITION.
+  nsIMEContext IMEContext(aWindow->GetWindowHandle());
+  gIMM32Handler->AdjustCompositionFont(IMEContext, aWritingMode, aForceUpdate);
+}
 
 /* static */ bool
 nsIMM32Handler::ProcessInputLangChangeMessage(nsWindow* aWindow,
@@ -271,7 +471,7 @@
   if (gIMM32Handler) {
     gIMM32Handler->OnInputLangChange(aWindow, wParam, lParam, aResult);
   }
-  InitKeyboardLayout(reinterpret_cast<HKL>(lParam));
+  InitKeyboardLayout(aWindow, reinterpret_cast<HKL>(lParam));
   // We can release the instance here, because the instance may be never
   // used. E.g., the new keyboard layout may not use IME, or it may use TSF.
   Terminate();
@@ -389,7 +589,7 @@
                                   LPARAM lParam,
                                   MSGResult& aResult)
 {
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: OnInputLangChange, hWnd=%08x, wParam=%08x, lParam=%08x\n",
      aWindow->GetWindowHandle(), wParam, lParam));
 
@@ -407,7 +607,7 @@
 nsIMM32Handler::OnIMEStartComposition(nsWindow* aWindow,
                                       MSGResult& aResult)
 {
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: OnIMEStartComposition, hWnd=%08x, mIsComposing=%s\n",
      aWindow->GetWindowHandle(), mIsComposing ? "TRUE" : "FALSE"));
   aResult.mConsumed = ShouldDrawCompositionStringOurselves();
@@ -427,10 +627,10 @@
                                  LPARAM lParam,
                                  MSGResult& aResult)
 {
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: OnIMEComposition, hWnd=%08x, lParam=%08x, mIsComposing=%s\n",
      aWindow->GetWindowHandle(), lParam, mIsComposing ? "TRUE" : "FALSE"));
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: OnIMEComposition, GCS_RESULTSTR=%s, GCS_COMPSTR=%s, GCS_COMPATTR=%s, GCS_COMPCLAUSE=%s, GCS_CURSORPOS=%s\n",
      lParam & GCS_RESULTSTR  ? "YES" : "no",
      lParam & GCS_COMPSTR    ? "YES" : "no",
@@ -450,7 +650,7 @@
 nsIMM32Handler::OnIMEEndComposition(nsWindow* aWindow,
                                     MSGResult& aResult)
 {
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: OnIMEEndComposition, hWnd=%08x, mIsComposing=%s\n",
      aWindow->GetWindowHandle(), mIsComposing ? "TRUE" : "FALSE"));
 
@@ -468,7 +668,7 @@
                             PM_NOREMOVE) &&
       compositionMsg.message == WM_IME_COMPOSITION &&
       IS_COMMITTING_LPARAM(compositionMsg.lParam)) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: OnIMEEndComposition, WM_IME_ENDCOMPOSITION is followed by "
        "WM_IME_COMPOSITION, ignoring the message..."));
     return true;
@@ -480,7 +680,7 @@
   // event and a compositionend event.
   // XXX Shouldn't we dispatch the compositionchange event with actual or
   //     latest composition string?
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: OnIMEEndComposition, mCompositionString=\"%s\"%s",
      NS_ConvertUTF16toUTF8(mCompositionString).get(),
      mCompositionString.IsEmpty() ? "" : ", but canceling it..."));
@@ -496,7 +696,7 @@
                           LPARAM lParam,
                           MSGResult& aResult)
 {
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: OnIMEChar, hWnd=%08x, char=%08x\n",
      aWindow->GetWindowHandle(), wParam));
 
@@ -514,7 +714,7 @@
 nsIMM32Handler::OnIMECompositionFull(nsWindow* aWindow,
                                      MSGResult& aResult)
 {
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: OnIMECompositionFull, hWnd=%08x\n",
      aWindow->GetWindowHandle()));
 
@@ -531,72 +731,72 @@
 {
   switch (wParam) {
     case IMN_CHANGECANDIDATE:
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: OnIMENotify, hWnd=%08x, IMN_CHANGECANDIDATE, lParam=%08x\n",
          aWindow->GetWindowHandle(), lParam));
       break;
     case IMN_CLOSECANDIDATE:
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: OnIMENotify, hWnd=%08x, IMN_CLOSECANDIDATE, lParam=%08x\n",
          aWindow->GetWindowHandle(), lParam));
       break;
     case IMN_CLOSESTATUSWINDOW:
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: OnIMENotify, hWnd=%08x, IMN_CLOSESTATUSWINDOW\n",
          aWindow->GetWindowHandle()));
       break;
     case IMN_GUIDELINE:
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: OnIMENotify, hWnd=%08x, IMN_GUIDELINE\n",
          aWindow->GetWindowHandle()));
       break;
     case IMN_OPENCANDIDATE:
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: OnIMENotify, hWnd=%08x, IMN_OPENCANDIDATE, lParam=%08x\n",
          aWindow->GetWindowHandle(), lParam));
       break;
     case IMN_OPENSTATUSWINDOW:
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: OnIMENotify, hWnd=%08x, IMN_OPENSTATUSWINDOW\n",
          aWindow->GetWindowHandle()));
       break;
     case IMN_SETCANDIDATEPOS:
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: OnIMENotify, hWnd=%08x, IMN_SETCANDIDATEPOS, lParam=%08x\n",
          aWindow->GetWindowHandle(), lParam));
       break;
     case IMN_SETCOMPOSITIONFONT:
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: OnIMENotify, hWnd=%08x, IMN_SETCOMPOSITIONFONT\n",
          aWindow->GetWindowHandle()));
       break;
     case IMN_SETCOMPOSITIONWINDOW:
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: OnIMENotify, hWnd=%08x, IMN_SETCOMPOSITIONWINDOW\n",
          aWindow->GetWindowHandle()));
       break;
     case IMN_SETCONVERSIONMODE:
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: OnIMENotify, hWnd=%08x, IMN_SETCONVERSIONMODE\n",
          aWindow->GetWindowHandle()));
       break;
     case IMN_SETOPENSTATUS:
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: OnIMENotify, hWnd=%08x, IMN_SETOPENSTATUS\n",
          aWindow->GetWindowHandle()));
       break;
     case IMN_SETSENTENCEMODE:
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: OnIMENotify, hWnd=%08x, IMN_SETSENTENCEMODE\n",
          aWindow->GetWindowHandle()));
       break;
     case IMN_SETSTATUSWINDOWPOS:
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: OnIMENotify, hWnd=%08x, IMN_SETSTATUSWINDOWPOS\n",
          aWindow->GetWindowHandle()));
       break;
     case IMN_PRIVATE:
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: OnIMENotify, hWnd=%08x, IMN_PRIVATE\n",
          aWindow->GetWindowHandle()));
       break;
@@ -615,26 +815,26 @@
 {
   switch (wParam) {
     case IMR_RECONVERTSTRING:
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: OnIMERequest, hWnd=%08x, IMR_RECONVERTSTRING\n",
          aWindow->GetWindowHandle()));
       aResult.mConsumed = HandleReconvert(aWindow, lParam, &aResult.mResult);
       return true;
     case IMR_QUERYCHARPOSITION:
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: OnIMERequest, hWnd=%08x, IMR_QUERYCHARPOSITION\n",
          aWindow->GetWindowHandle()));
       aResult.mConsumed =
         HandleQueryCharPosition(aWindow, lParam, &aResult.mResult);
       return true;
     case IMR_DOCUMENTFEED:
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: OnIMERequest, hWnd=%08x, IMR_DOCUMENTFEED\n",
          aWindow->GetWindowHandle()));
       aResult.mConsumed = HandleDocumentFeed(aWindow, lParam, &aResult.mResult);
       return true;
     default:
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: OnIMERequest, hWnd=%08x, wParam=%08x\n",
          aWindow->GetWindowHandle(), wParam));
       aResult.mConsumed = false;
@@ -648,7 +848,7 @@
                             LPARAM lParam,
                             MSGResult& aResult)
 {
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: OnIMESelect, hWnd=%08x, wParam=%08x, lParam=%08x\n",
      aWindow->GetWindowHandle(), wParam, lParam));
 
@@ -663,7 +863,7 @@
                                 LPARAM lParam,
                                 MSGResult& aResult)
 {
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: OnIMESetContext, hWnd=%08x, %s, lParam=%08x\n",
      aWindow->GetWindowHandle(), wParam ? "Active" : "Deactive", lParam));
 
@@ -677,7 +877,7 @@
   // The top level window never becomes composing window, so, we can ignore
   // the WM_IME_SETCONTEXT on the top level window.
   if (IsTopLevelWindowOfComposition(aWindow)) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: OnIMESetContext, hWnd=%08x is top level window\n"));
     return true;
   }
@@ -692,7 +892,7 @@
 
   if (wParam && (lParam & ISC_SHOWUICOMPOSITIONWINDOW) &&
       ShouldDrawCompositionStringOurselves()) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: OnIMESetContext, ISC_SHOWUICOMPOSITIONWINDOW is removed\n"));
     lParam &= ~ISC_SHOWUICOMPOSITIONWINDOW;
   }
@@ -729,10 +929,10 @@
   WPARAM recWParam;
   LPARAM recLParam;
   DequeueIMECharRecords(recWParam, recLParam);
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: OnChar, aWindow=%p, wParam=%08x, lParam=%08x,\n",
      aWindow->GetWindowHandle(), wParam, lParam));
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("               recorded: wParam=%08x, lParam=%08x\n",
      recWParam, recLParam));
   // If an unexpected char message comes, we should reset the records,
@@ -758,13 +958,16 @@
                                               LPARAM lParam,
                                               MSGResult& aResult)
 {
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: OnIMEStartCompositionOnPlugin, hWnd=%08x, mIsComposingOnPlugin=%s\n",
      aWindow->GetWindowHandle(), mIsComposingOnPlugin ? "TRUE" : "FALSE"));
   mIsComposingOnPlugin = true;
   mComposingWindow = aWindow;
   nsIMEContext IMEContext(aWindow->GetWindowHandle());
   SetIMERelatedWindowsPosOnPlugin(aWindow, IMEContext);
+  // On widnowless plugin, we should assume that the focused editor is always
+  // in horizontal writing mode.
+  AdjustCompositionFont(IMEContext, WritingMode());
   aResult.mConsumed =
     aWindow->DispatchPluginEvent(WM_IME_STARTCOMPOSITION, wParam, lParam,
                                  false);
@@ -777,11 +980,11 @@
                                          LPARAM lParam,
                                          MSGResult& aResult)
 {
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: OnIMECompositionOnPlugin, hWnd=%08x, lParam=%08x, mIsComposingOnPlugin=%s\n",
      aWindow->GetWindowHandle(), lParam,
      mIsComposingOnPlugin ? "TRUE" : "FALSE"));
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: OnIMECompositionOnPlugin, GCS_RESULTSTR=%s, GCS_COMPSTR=%s, GCS_COMPATTR=%s, GCS_COMPCLAUSE=%s, GCS_CURSORPOS=%s\n",
      lParam & GCS_RESULTSTR  ? "YES" : "no",
      lParam & GCS_COMPSTR    ? "YES" : "no",
@@ -811,7 +1014,7 @@
                                             LPARAM lParam,
                                             MSGResult& aResult)
 {
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: OnIMEEndCompositionOnPlugin, hWnd=%08x, mIsComposingOnPlugin=%s\n",
      aWindow->GetWindowHandle(), mIsComposingOnPlugin ? "TRUE" : "FALSE"));
 
@@ -835,7 +1038,7 @@
                                   LPARAM lParam,
                                   MSGResult& aResult)
 {
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: OnIMECharOnPlugin, hWnd=%08x, char=%08x, scancode=%08x\n",
      aWindow->GetWindowHandle(), wParam, lParam));
 
@@ -856,7 +1059,7 @@
                                         LPARAM lParam,
                                         MSGResult& aResult)
 {
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: OnIMESetContextOnPlugin, hWnd=%08x, %s, lParam=%08x\n",
      aWindow->GetWindowHandle(), wParam ? "Active" : "Deactive", lParam));
 
@@ -903,10 +1106,10 @@
   WPARAM recWParam;
   LPARAM recLParam;
   DequeueIMECharRecords(recWParam, recLParam);
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: OnCharOnPlugin, aWindow=%p, wParam=%08x, lParam=%08x,\n",
      aWindow->GetWindowHandle(), wParam, lParam));
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("                       recorded: wParam=%08x, lParam=%08x\n",
      recWParam, recLParam));
   // If an unexpected char message comes, we should reset the records,
@@ -936,11 +1139,13 @@
   aWindow->InitEvent(selection, &point);
   aWindow->DispatchWindowEvent(&selection);
   if (!selection.mSucceeded) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: HandleStartComposition, FAILED (NS_QUERY_SELECTED_TEXT)\n"));
     return;
   }
 
+  AdjustCompositionFont(aIMEContext, selection.GetWritingMode());
+
   mCompositionStart = selection.mReply.mOffset;
 
   WidgetCompositionEvent event(true, NS_COMPOSITION_START, aWindow);
@@ -950,7 +1155,7 @@
   mIsComposing = true;
   mComposingWindow = aWindow;
 
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: HandleStartComposition, START composition, mCompositionStart=%ld\n",
      mCompositionStart));
 }
@@ -984,7 +1189,7 @@
         WinUtils::PeekMessage(&msg2, wnd, WM_IME_ENDCOMPOSITION,
                               WM_IME_COMPOSITION, PM_NOREMOVE) &&
         msg2.message == WM_IME_COMPOSITION) {
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: HandleComposition, Ignores due to find a WM_IME_STARTCOMPOSITION\n"));
       return ShouldDrawCompositionStringOurselves();
     }
@@ -1002,7 +1207,7 @@
 
     GetCompositionString(aIMEContext, GCS_RESULTSTR, mCompositionString);
 
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: HandleComposition, GCS_RESULTSTR\n"));
 
     HandleEndComposition(aWindow, &mCompositionString);
@@ -1023,14 +1228,14 @@
   //--------------------------------------------------------
   // 1. Get GCS_COMPSTR
   //--------------------------------------------------------
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: HandleComposition, GCS_COMPSTR\n"));
 
   nsAutoString previousCompositionString(mCompositionString);
   GetCompositionString(aIMEContext, GCS_COMPSTR, mCompositionString);
 
   if (!IS_COMPOSING_LPARAM(lParam)) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: HandleComposition, lParam doesn't indicate composing, "
        "mCompositionString=\"%s\", previousCompositionString=\"%s\"",
        NS_ConvertUTF16toUTF8(mCompositionString).get(),
@@ -1069,7 +1274,7 @@
     // string is null (it indicates the composition transaction ended),
     // WM_IME_ENDCOMPOSITION may not be sent. If so, we cannot run
     // HandleEndComposition() in other place.
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: HandleComposition, Aborting GCS_COMPSTR\n"));
     HandleEndComposition(aWindow);
     return IS_COMMITTING_LPARAM(lParam);
@@ -1092,7 +1297,7 @@
     // API for it, however, we should not kill Unicode support on all IMEs.
     bool useA_API = !(sIMEProperty & IME_PROP_UNICODE);
 
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: HandleComposition, GCS_COMPCLAUSE, useA_API=%s\n",
        useA_API ? "TRUE" : "FALSE"));
 
@@ -1107,7 +1312,7 @@
     clauseArrayLength2 /= sizeof(uint32_t);
 
     if (clauseArrayLength != clauseArrayLength2) {
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: HandleComposition, GCS_COMPCLAUSE, clauseArrayLength=%ld but clauseArrayLength2=%ld\n",
          clauseArrayLength, clauseArrayLength2));
       if (clauseArrayLength > clauseArrayLength2)
@@ -1136,7 +1341,7 @@
   // may return an error code.
   mClauseArray.SetLength(std::max<long>(0, clauseArrayLength));
 
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: HandleComposition, GCS_COMPCLAUSE, mClauseLength=%ld\n",
      mClauseArray.Length()));
 
@@ -1162,7 +1367,7 @@
   // error code.
   mAttributeArray.SetLength(std::max<long>(0, attrArrayLength));
 
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: HandleComposition, GCS_COMPATTR, mAttributeLength=%ld\n",
      mAttributeArray.Length()));
 
@@ -1183,7 +1388,7 @@
   NS_ASSERTION(mCursorPosition <= (long)mCompositionString.Length(),
                "illegal pos");
 
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: HandleComposition, GCS_CURSORPOS, mCursorPosition=%d\n",
      mCursorPosition));
 
@@ -1204,7 +1409,7 @@
   NS_PRECONDITION(!aWindow->PluginHasFocus(),
     "HandleComposition should not be called when a plug-in has focus");
 
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: HandleEndComposition(aWindow=0x%p, aCommitString=0x%p (\"%s\"))",
      aWindow, aCommitString,
      aCommitString ? NS_ConvertUTF16toUTF8(*aCommitString).get() : ""));
@@ -1230,15 +1435,15 @@
 static void
 DumpReconvertString(RECONVERTSTRING* aReconv)
 {
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("  dwSize=%ld, dwVersion=%ld, dwStrLen=%ld, dwStrOffset=%ld\n",
      aReconv->dwSize, aReconv->dwVersion,
      aReconv->dwStrLen, aReconv->dwStrOffset));
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("  dwCompStrLen=%ld, dwCompStrOffset=%ld, dwTargetStrLen=%ld, dwTargetStrOffset=%ld\n",
      aReconv->dwCompStrLen, aReconv->dwCompStrOffset,
      aReconv->dwTargetStrLen, aReconv->dwTargetStrOffset));
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("  result str=\"%s\"\n",
      NS_ConvertUTF16toUTF8(
        nsAutoString((char16_t*)((char*)(aReconv) + aReconv->dwStrOffset),
@@ -1258,7 +1463,7 @@
   aWindow->InitEvent(selection, &point);
   aWindow->DispatchWindowEvent(&selection);
   if (!selection.mSucceeded) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: HandleReconvert, FAILED (NS_QUERY_SELECTED_TEXT)\n"));
     return false;
   }
@@ -1269,19 +1474,19 @@
   if (!pReconv) {
     // Return need size to reconvert.
     if (len == 0) {
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: HandleReconvert, There are not selected text\n"));
       return false;
     }
     *oResult = needSize;
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: HandleReconvert, SUCCEEDED result=%ld\n",
        *oResult));
     return true;
   }
 
   if (pReconv->dwSize < needSize) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: HandleReconvert, FAILED pReconv->dwSize=%ld, needSize=%ld\n",
        pReconv->dwSize, needSize));
     return false;
@@ -1301,7 +1506,7 @@
   ::CopyMemory(reinterpret_cast<LPVOID>(lParam + sizeof(RECONVERTSTRING)),
                selection.mReply.mString.get(), len * sizeof(WCHAR));
 
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: HandleReconvert, SUCCEEDED result=%ld\n",
      *oResult));
   DumpReconvertString(pReconv);
@@ -1318,24 +1523,24 @@
   *oResult = false;
   IMECHARPOSITION* pCharPosition = reinterpret_cast<IMECHARPOSITION*>(lParam);
   if (!pCharPosition) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: HandleQueryCharPosition, FAILED (pCharPosition is null)\n"));
     return false;
   }
   if (pCharPosition->dwSize < sizeof(IMECHARPOSITION)) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: HandleReconvert, FAILED, pCharPosition->dwSize=%ld, sizeof(IMECHARPOSITION)=%ld\n",
        pCharPosition->dwSize, sizeof(IMECHARPOSITION)));
     return false;
   }
   if (::GetFocus() != aWindow->GetWindowHandle()) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: HandleReconvert, FAILED, ::GetFocus()=%08x, OurWindowHandle=%08x\n",
        ::GetFocus(), aWindow->GetWindowHandle()));
     return false;
   }
   if (pCharPosition->dwCharPos > len) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: HandleQueryCharPosition, FAILED, pCharPosition->dwCharPos=%ld, len=%ld\n",
       pCharPosition->dwCharPos, len));
     return false;
@@ -1351,18 +1556,46 @@
   // even if the content of the popup window has focus.
   ResolveIMECaretPos(aWindow->GetTopLevelWindow(false),
                      r, nullptr, screenRect);
+
+  // XXX This might need to check writing mode.  However, MSDN doesn't explain
+  //     how to set the values in vertical writing mode. Additionally, IME
+  //     doesn't work well with top-left of the character (this is explicitly
+  //     documented) and its horizontal width.  So, it might be better to set
+  //     top-right corner of the character and horizontal width, but we're not
+  //     sure if it doesn't cause any problems with a lot of IMEs...
   pCharPosition->pt.x = screenRect.x;
   pCharPosition->pt.y = screenRect.y;
 
   pCharPosition->cLineHeight = r.height;
 
-  // XXX we should use NS_QUERY_EDITOR_RECT event here.
-  ::GetWindowRect(aWindow->GetWindowHandle(), &pCharPosition->rcDocument);
+  WidgetQueryContentEvent editorRect(true, NS_QUERY_EDITOR_RECT, aWindow);
+  aWindow->InitEvent(editorRect);
+  aWindow->DispatchWindowEvent(&editorRect);
+  if (NS_WARN_IF(!editorRect.mSucceeded)) {
+    MOZ_LOG(gIMM32Log, PR_LOG_ERROR,
+      ("IMM32: HandleQueryCharPosition, NS_QUERY_EDITOR_RECT failed"));
+    ::GetWindowRect(aWindow->GetWindowHandle(), &pCharPosition->rcDocument);
+  } else {
+    nsIntRect editorRectInWindow =
+      LayoutDevicePixel::ToUntyped(editorRect.mReply.mRect);
+    nsWindow* window = editorRect.mReply.mFocusedWidget ?
+      static_cast<nsWindow*>(editorRect.mReply.mFocusedWidget) : aWindow;
+    nsIntRect editorRectInScreen;
+    ResolveIMECaretPos(window, editorRectInWindow, nullptr, editorRectInScreen);
+    ::SetRect(&pCharPosition->rcDocument,
+              editorRectInScreen.x, editorRectInScreen.y,
+              editorRectInScreen.XMost(), editorRectInScreen.YMost());
+  }
 
   *oResult = TRUE;
 
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
-    ("IMM32: HandleQueryCharPosition, SUCCEEDED\n"));
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    ("IMM32: HandleQueryCharPosition, SUCCEEDED, pCharPosition={ pt={ x=%d, "
+     "y=%d }, cLineHeight=%d, rcDocument={ left=%d, top=%d, right=%d, "
+     "bottom=%d } }",
+     pCharPosition->pt.x, pCharPosition->pt.y, pCharPosition->cLineHeight,
+     pCharPosition->rcDocument.left, pCharPosition->rcDocument.top,
+     pCharPosition->rcDocument.right, pCharPosition->rcDocument.bottom));
   return true;
 }
 
@@ -1385,7 +1618,7 @@
     aWindow->InitEvent(selection, &point);
     aWindow->DispatchWindowEvent(&selection);
     if (!selection.mSucceeded) {
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: HandleDocumentFeed, FAILED (NS_QUERY_SELECTED_TEXT)\n"));
       return false;
     }
@@ -1401,7 +1634,7 @@
   //     INT32_MAX.
   if (targetOffset < 0 || targetLength < 0 ||
       targetOffset + targetLength < 0) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: HandleDocumentFeed, FAILED (The selection is out of range)\n"));
     return false;
   }
@@ -1412,14 +1645,14 @@
   aWindow->InitEvent(textContent, &point);
   aWindow->DispatchWindowEvent(&textContent);
   if (!textContent.mSucceeded) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: HandleDocumentFeed, FAILED (NS_QUERY_TEXT_CONTENT)\n"));
     return false;
   }
 
   nsAutoString str(textContent.mReply.mString);
   if (targetOffset > int32_t(str.Length())) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: HandleDocumentFeed, FAILED (The caret offset is invalid)\n"));
     return false;
   }
@@ -1440,14 +1673,14 @@
 
   if (!pReconv) {
     *oResult = needSize;
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: HandleDocumentFeed, SUCCEEDED result=%ld\n",
        *oResult));
     return true;
   }
 
   if (pReconv->dwSize < needSize) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: HandleDocumentFeed, FAILED pReconv->dwSize=%ld, needSize=%ld\n",
        pReconv->dwSize, needSize));
     return false;
@@ -1464,7 +1697,7 @@
     // Set composition target clause information
     uint32_t offset, length;
     if (!GetTargetClauseRange(&offset, &length)) {
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: HandleDocumentFeed, FAILED, by GetTargetClauseRange\n"));
       return false;
     }
@@ -1484,7 +1717,7 @@
   ::CopyMemory(reinterpret_cast<LPVOID>(lParam + sizeof(RECONVERTSTRING)),
                paragraph.BeginReading(), len * sizeof(WCHAR));
 
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: HandleDocumentFeed, SUCCEEDED result=%ld\n",
      *oResult));
   DumpReconvertString(pReconv);
@@ -1499,7 +1732,7 @@
     return false;
   }
 
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: CommitCompositionOnPreviousWindow, mIsComposing=%s, mIsComposingOnPlugin=%s\n",
      mIsComposing ? "TRUE" : "FALSE", mIsComposingOnPlugin ? "TRUE" : "FALSE"));
 
@@ -1562,7 +1795,7 @@
                                                const nsIMEContext& aIMEContext)
 {
   NS_ASSERTION(mIsComposing, "conflict state");
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: DispatchCompositionChangeEvent"));
 
   // If we don't need to draw composition string ourselves, we don't need to
@@ -1615,7 +1848,7 @@
     range.mRangeType = NS_TEXTRANGE_RAWINPUT;
     textRangeArray->AppendElement(range);
 
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: CreateTextRangeArray, mClauseLength=0\n"));
   } else {
     // iterate over the attributes
@@ -1623,7 +1856,7 @@
     for (uint32_t i = 0; i < mClauseArray.Length() - 1; i++) {
       uint32_t current = mClauseArray[i + 1];
       if (current > mCompositionString.Length()) {
-        PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+        MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
           ("IMM32: CreateTextRangeArray, mClauseArray[%ld]=%lu. "
            "This is larger than mCompositionString.Length()=%lu\n",
            i + 1, current, mCompositionString.Length()));
@@ -1637,7 +1870,7 @@
 
       lastOffset = current;
 
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: CreateTextRangeArray, index=%ld, rangeType=%s, range=[%lu-%lu]\n",
          i, GetRangeTypeName(range.mRangeType), range.mStartOffset,
          range.mEndOffset));
@@ -1645,14 +1878,14 @@
   }
 
   if (mCursorPosition == NO_IME_CARET) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: CreateTextRangeArray, no caret\n"));
     return textRangeArray.forget();
   }
 
   int32_t cursor = mCursorPosition;
   if (uint32_t(cursor) > mCompositionString.Length()) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: CreateTextRangeArray, mCursorPosition=%ld. "
        "This is larger than mCompositionString.Length()=%lu\n",
        mCursorPosition, mCompositionString.Length()));
@@ -1663,7 +1896,7 @@
   range.mRangeType = NS_TEXTRANGE_CARETPOSITION;
   textRangeArray->AppendElement(range);
 
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: CreateTextRangeArray, caret position=%ld\n",
      range.mStartOffset));
 
@@ -1682,7 +1915,7 @@
   if (lRtn < 0 ||
       !aCompositionString.SetLength((lRtn / sizeof(WCHAR)) + 1,
                                     mozilla::fallible)) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: GetCompositionString, FAILED by OOM\n"));
     return; // Error or out of memory.
   }
@@ -1693,7 +1926,7 @@
                                     lRtn + sizeof(WCHAR));
   aCompositionString.SetLength(lRtn / sizeof(WCHAR));
 
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: GetCompositionString, SUCCEEDED aCompositionString=\"%s\"\n",
      NS_ConvertUTF16toUTF8(aCompositionString).get()));
 }
@@ -1749,7 +1982,7 @@
   NS_ENSURE_TRUE(len >= 0, false);
 
   if (!aANSIStr.SetLength(len, mozilla::fallible)) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: ConvertToANSIString, FAILED by OOM\n"));
     return false;
   }
@@ -1761,7 +1994,8 @@
 bool
 nsIMM32Handler::GetCharacterRectOfSelectedTextAt(nsWindow* aWindow,
                                                  uint32_t aOffset,
-                                                 nsIntRect &aCharRect)
+                                                 nsIntRect& aCharRect,
+                                                 WritingMode* aWritingMode)
 {
   nsIntPoint point(0, 0);
 
@@ -1769,7 +2003,7 @@
   aWindow->InitEvent(selection, &point);
   aWindow->DispatchWindowEvent(&selection);
   if (!selection.mSucceeded) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: GetCharacterRectOfSelectedTextAt, aOffset=%lu, FAILED (NS_QUERY_SELECTED_TEXT)\n",
        aOffset));
     return false;
@@ -1798,21 +2032,29 @@
     aWindow->DispatchWindowEvent(&charRect);
     if (charRect.mSucceeded) {
       aCharRect = LayoutDevicePixel::ToUntyped(charRect.mReply.mRect);
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      if (aWritingMode) {
+        *aWritingMode = charRect.GetWritingMode();
+      }
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
         ("IMM32: GetCharacterRectOfSelectedTextAt, aOffset=%lu, SUCCEEDED\n",
          aOffset));
-      PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
-        ("IMM32: GetCharacterRectOfSelectedTextAt, aCharRect={ x: %ld, y: %ld, width: %ld, height: %ld }\n",
-         aCharRect.x, aCharRect.y, aCharRect.width, aCharRect.height));
+      MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
+        ("IMM32: GetCharacterRectOfSelectedTextAt, "
+         "aCharRect={ x: %ld, y: %ld, width: %ld, height: %ld }, "
+         "charRect.GetWritingMode()=%s",
+         aCharRect.x, aCharRect.y, aCharRect.width, aCharRect.height,
+         GetWritingModeName(charRect.GetWritingMode()).get()));
       return true;
     }
   }
 
-  return GetCaretRect(aWindow, aCharRect);
+  return GetCaretRect(aWindow, aCharRect, aWritingMode);
 }
 
 bool
-nsIMM32Handler::GetCaretRect(nsWindow* aWindow, nsIntRect &aCaretRect)
+nsIMM32Handler::GetCaretRect(nsWindow* aWindow,
+                             nsIntRect& aCaretRect,
+                             WritingMode* aWritingMode)
 {
   nsIntPoint point(0, 0);
 
@@ -1820,7 +2062,7 @@
   aWindow->InitEvent(selection, &point);
   aWindow->DispatchWindowEvent(&selection);
   if (!selection.mSucceeded) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: GetCaretRect,  FAILED (NS_QUERY_SELECTED_TEXT)\n"));
     return false;
   }
@@ -1832,14 +2074,20 @@
   aWindow->InitEvent(caretRect, &point);
   aWindow->DispatchWindowEvent(&caretRect);
   if (!caretRect.mSucceeded) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: GetCaretRect,  FAILED (NS_QUERY_CARET_RECT)\n"));
     return false;
   }
   aCaretRect = LayoutDevicePixel::ToUntyped(caretRect.mReply.mRect);
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
-    ("IMM32: GetCaretRect, SUCCEEDED, aCaretRect={ x: %ld, y: %ld, width: %ld, height: %ld }\n",
-     aCaretRect.x, aCaretRect.y, aCaretRect.width, aCaretRect.height));
+  if (aWritingMode) {
+    *aWritingMode = caretRect.GetWritingMode();
+  }
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    ("IMM32: GetCaretRect, SUCCEEDED, "
+     "aCaretRect={ x: %ld, y: %ld, width: %ld, height: %ld }, "
+     "caretRect.GetWritingMode()=%s",
+     aCaretRect.x, aCaretRect.y, aCaretRect.width, aCaretRect.height,
+     GetWritingModeName(caretRect.GetWritingMode()).get()));
   return true;
 }
 
@@ -1850,7 +2098,8 @@
   nsIntRect r;
   // Get first character rect of current a normal selected text or a composing
   // string.
-  bool ret = GetCharacterRectOfSelectedTextAt(aWindow, 0, r);
+  WritingMode writingMode;
+  bool ret = GetCharacterRectOfSelectedTextAt(aWindow, 0, r, &writingMode);
   NS_ENSURE_TRUE(ret, false);
   nsWindow* toplevelWindow = aWindow->GetTopLevelWindow(false);
   nsIntRect firstSelectedCharRect;
@@ -1869,7 +2118,7 @@
   if (!mNativeCaretIsCreated) {
     mNativeCaretIsCreated = ::CreateCaret(aWindow->GetWindowHandle(), nullptr,
                                           caretRect.width, caretRect.height);
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: SetIMERelatedWindowsPos, mNativeCaretIsCreated=%s, width=%ld height=%ld\n",
        mNativeCaretIsCreated ? "TRUE" : "FALSE",
        caretRect.width, caretRect.height));
@@ -1877,44 +2126,100 @@
   ::SetCaretPos(caretRect.x, caretRect.y);
 
   if (ShouldDrawCompositionStringOurselves()) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: SetIMERelatedWindowsPos, Set candidate window\n"));
 
     // Get a rect of first character in current target in composition string.
+    nsIntRect firstTargetCharRect, lastTargetCharRect;
     if (mIsComposing && !mCompositionString.IsEmpty()) {
       // If there are no targetted selection, we should use it's first character
       // rect instead.
-      uint32_t offset;
-      if (!GetTargetClauseRange(&offset)) {
-        PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      uint32_t offset, length;
+      if (!GetTargetClauseRange(&offset, &length)) {
+        MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
           ("IMM32: SetIMERelatedWindowsPos, FAILED, by GetTargetClauseRange\n"));
         return false;
       }
       ret = GetCharacterRectOfSelectedTextAt(aWindow,
-                                             offset - mCompositionStart, r);
+                                             offset - mCompositionStart,
+                                             firstTargetCharRect, &writingMode);
       NS_ENSURE_TRUE(ret, false);
+      if (length) {
+        ret = GetCharacterRectOfSelectedTextAt(aWindow,
+                offset + length - 1 - mCompositionStart, lastTargetCharRect);
+        NS_ENSURE_TRUE(ret, false);
+      } else {
+        lastTargetCharRect = firstTargetCharRect;
+      }
     } else {
       // If there are no composition string, we should use a first character
       // rect.
-      ret = GetCharacterRectOfSelectedTextAt(aWindow, 0, r);
+      ret = GetCharacterRectOfSelectedTextAt(aWindow, 0,
+                                             firstTargetCharRect, &writingMode);
       NS_ENSURE_TRUE(ret, false);
+      lastTargetCharRect = firstTargetCharRect;
     }
-    nsIntRect firstTargetCharRect;
-    ResolveIMECaretPos(toplevelWindow, r, aWindow, firstTargetCharRect);
+    ResolveIMECaretPos(toplevelWindow, firstTargetCharRect,
+                       aWindow, firstTargetCharRect);
+    ResolveIMECaretPos(toplevelWindow, lastTargetCharRect,
+                       aWindow, lastTargetCharRect);
+    nsIntRect targetClauseRect;
+    targetClauseRect.UnionRect(firstTargetCharRect, lastTargetCharRect);
 
-    // Move the candidate window to first character position of the target.
+    // Move the candidate window to proper position from the target clause as
+    // far as possible.
     CANDIDATEFORM candForm;
     candForm.dwIndex = 0;
-    candForm.dwStyle = CFS_EXCLUDE;
-    candForm.ptCurrentPos.x = firstTargetCharRect.x;
-    candForm.ptCurrentPos.y = firstTargetCharRect.y;
-    candForm.rcArea.right = candForm.rcArea.left = candForm.ptCurrentPos.x;
-    candForm.rcArea.top = candForm.ptCurrentPos.y;
-    candForm.rcArea.bottom = candForm.ptCurrentPos.y +
-                               firstTargetCharRect.height;
+    if (!writingMode.IsVertical() || IsVerticalWritingSupported()) {
+      candForm.dwStyle = CFS_EXCLUDE;
+      // Candidate window shouldn't overlap the target clause in any writing
+      // mode.
+      candForm.rcArea.left = targetClauseRect.x;
+      candForm.rcArea.right = targetClauseRect.XMost();
+      candForm.rcArea.top = targetClauseRect.y;
+      candForm.rcArea.bottom = targetClauseRect.YMost();
+      if (!writingMode.IsVertical()) {
+        // In horizontal layout, current point of interest should be top-left
+        // of the first character.
+        candForm.ptCurrentPos.x = firstTargetCharRect.x;
+        candForm.ptCurrentPos.y = firstTargetCharRect.y;
+      } else if (writingMode.IsVerticalRL()) {
+        // In vertical layout (RL), candidate window should be positioned right
+        // side of target clause.  However, we don't set vertical writing font
+        // to the IME.  Therefore, the candidate window may be positioned
+        // bottom-left of target clause rect with these information.
+        candForm.ptCurrentPos.x = targetClauseRect.x;
+        candForm.ptCurrentPos.y = targetClauseRect.y;
+      } else {
+        MOZ_ASSERT(writingMode.IsVerticalLR(), "Did we miss some causes?");
+        // In vertical layout (LR), candidate window should be poisitioned left
+        // side of target clause.  Although, we don't set vertical writing font
+        // to the IME, the candidate window may be positioned bottom-right of
+        // the target clause rect with these information.
+        candForm.ptCurrentPos.x = targetClauseRect.XMost();
+        candForm.ptCurrentPos.y = targetClauseRect.y;
+      }
+    } else {
+      // If vertical writing is not supported by IME, let's set candidate
+      // window position to the bottom-left of the target clause because
+      // the position must be the safest position to prevent the candidate
+      // window to overlap with the target clause.
+      candForm.dwStyle = CFS_CANDIDATEPOS;
+      candForm.ptCurrentPos.x = targetClauseRect.x;
+      candForm.ptCurrentPos.y = targetClauseRect.YMost();
+    }
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      ("IMM32: SetIMERelatedWindowsPos, Calling ImmSetCandidateWindow()... "
+       "ptCurrentPos={ x=%d, y=%d }, "
+       "rcArea={ left=%d, top=%d, right=%d, bottom=%d }, "
+       "writingMode=%s",
+       candForm.ptCurrentPos.x, candForm.ptCurrentPos.y,
+       candForm.rcArea.left, candForm.rcArea.top,
+       candForm.rcArea.right, candForm.rcArea.bottom,
+       GetWritingModeName(writingMode).get()));
     ::ImmSetCandidateWindow(aIMEContext.get(), &candForm);
   } else {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: SetIMERelatedWindowsPos, Set composition window\n"));
 
     // Move the composition window to caret position (if selected some
@@ -1923,7 +2228,9 @@
     // automatically. So, we don't need to set it.
     COMPOSITIONFORM compForm;
     compForm.dwStyle = CFS_POINT;
-    compForm.ptCurrentPos.x = firstSelectedCharRect.x;
+    compForm.ptCurrentPos.x =
+      !writingMode.IsVerticalLR() ? firstSelectedCharRect.x :
+                                    firstSelectedCharRect.XMost();
     compForm.ptCurrentPos.y = firstSelectedCharRect.y;
     ::ImmSetCompositionWindow(aIMEContext.get(), &compForm);
   }
@@ -1939,7 +2246,7 @@
   aWindow->InitEvent(editorRectEvent);
   aWindow->DispatchWindowEvent(&editorRectEvent);
   if (!editorRectEvent.mSucceeded) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: SetIMERelatedWindowsPosOnPlugin, "
        "FAILED (NS_QUERY_EDITOR_RECT)"));
     return;
@@ -1986,7 +2293,7 @@
   compForm.ptCurrentPos.x = clippedPluginRect.BottomLeft().x;
   compForm.ptCurrentPos.y = clippedPluginRect.BottomLeft().y;
   if (!::ImmSetCompositionWindow(aIMEContext.get(), &compForm)) {
-    PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: SetIMERelatedWindowsPosOnPlugin, "
        "FAILED to set composition window"));
     return;
@@ -2011,6 +2318,138 @@
     aOutRect.MoveBy(-aNewOriginWidget->WidgetToScreenOffsetUntyped());
 }
 
+static void
+SetHorizontalFontToLogFont(const nsAString& aFontFace,
+                           LOGFONTW& aLogFont)
+{
+  aLogFont.lfEscapement = aLogFont.lfOrientation = 0;
+  if (NS_WARN_IF(aFontFace.Length() > LF_FACESIZE - 1)) {
+    memcpy(aLogFont.lfFaceName, L"System", sizeof(L"System"));
+    return;
+  }
+  memcpy(aLogFont.lfFaceName, aFontFace.BeginReading(),
+         aFontFace.Length() * sizeof(wchar_t));
+  aLogFont.lfFaceName[aFontFace.Length()] = 0;
+}
+
+static void
+SetVerticalFontToLogFont(const nsAString& aFontFace,
+                         LOGFONTW& aLogFont)
+{
+  aLogFont.lfEscapement = aLogFont.lfOrientation = 2700;
+  if (NS_WARN_IF(aFontFace.Length() > LF_FACESIZE - 2)) {
+    memcpy(aLogFont.lfFaceName, L"@System", sizeof(L"@System"));
+    return;
+  }
+  aLogFont.lfFaceName[0] = '@';
+  memcpy(&aLogFont.lfFaceName[1], aFontFace.BeginReading(),
+         aFontFace.Length() * sizeof(wchar_t));
+  aLogFont.lfFaceName[aFontFace.Length() + 1] = 0;
+}
+
+void
+nsIMM32Handler::AdjustCompositionFont(const nsIMEContext& aIMEContext,
+                                      const WritingMode& aWritingMode,
+                                      bool aForceUpdate)
+{
+  // An instance of nsIMM32Handler is destroyed when active IME is changed.
+  // Therefore, we need to store the information which are set to the IM
+  // context to static variables since IM context is never recreated.
+  static bool sCompositionFontsInitialized = false;
+  static nsString sCompositionFont =
+    Preferences::GetString("intl.imm.composition_font");
+
+  // If composition font is customized by pref, we need to modify the
+  // composition font of the IME context at first time even if the writing mode
+  // is horizontal.
+  bool setCompositionFontForcibly = aForceUpdate ||
+    (!sCompositionFontsInitialized && !sCompositionFont.IsEmpty());
+
+  static WritingMode sCurrentWritingMode;
+  static nsString sCurrentIMEName;
+  if (!setCompositionFontForcibly &&
+      sWritingModeOfCompositionFont == aWritingMode &&
+      sCurrentIMEName == sIMEName) {
+    // Nothing to do if writing mode isn't being changed.
+    return;
+  }
+
+  // Decide composition fonts for both horizontal writing mode and vertical
+  // writing mode.  If the font isn't specified by the pref, use default
+  // font which is already set to the IM context.  And also in vertical writing
+  // mode, insert '@' to the start of the font.
+  if (!sCompositionFontsInitialized) {
+    sCompositionFontsInitialized = true;
+    // sCompositionFontH must not start with '@' and its length is less than
+    // LF_FACESIZE since it needs to end with null terminating character.
+    if (sCompositionFont.IsEmpty() ||
+        sCompositionFont.Length() > LF_FACESIZE - 1 ||
+        sCompositionFont[0] == '@') {
+      LOGFONTW defaultLogFont;
+      if (NS_WARN_IF(!::ImmGetCompositionFont(aIMEContext.get(),
+                                              &defaultLogFont))) {
+        MOZ_LOG(gIMM32Log, PR_LOG_ERROR,
+          ("IMM32: AdjustCompositionFont, ::ImmGetCompositionFont() failed"));
+        sCompositionFont.AssignLiteral("System");
+      } else {
+        // The font face is typically, "System".
+        sCompositionFont.Assign(defaultLogFont.lfFaceName);
+      }
+    }
+
+    MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
+      ("IMM32: AdjustCompositionFont, sCompositionFont=\"%s\" is initialized",
+       NS_ConvertUTF16toUTF8(sCompositionFont).get()));
+  }
+
+  static nsString sCompositionFontForJapanist2003;
+  if (IsJapanist2003Active() && sCompositionFontForJapanist2003.IsEmpty()) {
+    const char* kCompositionFontForJapanist2003 =
+      "intl.imm.composition_font.japanist_2003";
+    sCompositionFontForJapanist2003 =
+      Preferences::GetString(kCompositionFontForJapanist2003);
+    // If the font name is not specified properly, let's use
+    // "MS PGothic" instead.
+    if (sCompositionFontForJapanist2003.IsEmpty() ||
+        sCompositionFontForJapanist2003.Length() > LF_FACESIZE - 2 ||
+        sCompositionFontForJapanist2003[0] == '@') {
+      sCompositionFontForJapanist2003.AssignLiteral("MS PGothic");
+    }
+  }
+
+  sWritingModeOfCompositionFont = aWritingMode;
+  sCurrentIMEName = sIMEName;
+
+  LOGFONTW logFont;
+  memset(&logFont, 0, sizeof(logFont));
+  if (!::ImmGetCompositionFont(aIMEContext.get(), &logFont)) {
+    MOZ_LOG(gIMM32Log, PR_LOG_ERROR,
+      ("IMM32: AdjustCompositionFont, ::ImmGetCompositionFont() failed"));
+    logFont.lfFaceName[0] = 0;
+  }
+  // Need to reset some information which should be recomputed with new font.
+  logFont.lfWidth = 0;
+  logFont.lfWeight = FW_DONTCARE;
+  logFont.lfOutPrecision = OUT_DEFAULT_PRECIS;
+  logFont.lfClipPrecision = CLIP_DEFAULT_PRECIS;
+  logFont.lfPitchAndFamily = DEFAULT_PITCH;
+
+  if (!mIsComposingOnPlugin &&
+      aWritingMode.IsVertical() && IsVerticalWritingSupported()) {
+    SetVerticalFontToLogFont(
+      IsJapanist2003Active() ? sCompositionFontForJapanist2003 :
+                               sCompositionFont, logFont);
+  } else {
+    SetHorizontalFontToLogFont(
+      IsJapanist2003Active() ? sCompositionFontForJapanist2003 :
+                               sCompositionFont, logFont);
+  }
+  MOZ_LOG(gIMM32Log, PR_LOG_WARNING,
+    ("IMM32: AdjustCompositionFont, calling ::ImmSetCompositionFont(\"%s\")",
+     NS_ConvertUTF16toUTF8(nsDependentString(logFont.lfFaceName)).get()));
+  ::ImmSetCompositionFontW(aIMEContext.get(), &logFont);
+}
+
 /* static */ nsresult
 nsIMM32Handler::OnMouseButtonEvent(nsWindow* aWindow,
                                    const IMENotification& aIMENotification)
@@ -2084,7 +2523,7 @@
     offset++;
   }
 
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: OnMouseButtonEvent, x,y=%ld,%ld, offset=%ld, positioning=%ld\n",
      cursorPos.x, cursorPos.y, offset, positioning));
 
@@ -2103,7 +2542,7 @@
 nsIMM32Handler::OnKeyDownEvent(nsWindow* aWindow, WPARAM wParam, LPARAM lParam,
                                MSGResult& aResult)
 {
-  PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
+  MOZ_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: OnKeyDownEvent, hWnd=%08x, wParam=%08x, lParam=%08x\n",
      aWindow->GetWindowHandle(), wParam, lParam));
   aResult.mConsumed = false;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsIMM32Handler.h firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsIMM32Handler.h
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsIMM32Handler.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsIMM32Handler.h	2015-05-25 20:44:10.000000000 +0000
@@ -14,6 +14,7 @@
 #include "nsIWidget.h"
 #include "mozilla/EventForwards.h"
 #include "nsRect.h"
+#include "WritingModes.h"
 
 class nsWindow;
 
@@ -143,6 +144,8 @@
   static void CommitComposition(nsWindow* aWindow, bool aForce = false);
   static void CancelComposition(nsWindow* aWindow, bool aForce = false);
   static void OnUpdateComposition(nsWindow* aWindow);
+  static void OnSelectionChange(nsWindow* aWindow,
+                                const IMENotification& aIMENotification);
 
   static nsIMEUpdatePreference GetIMEUpdatePreference();
 
@@ -158,8 +161,13 @@
   static bool IsComposingOnPlugin();
   static bool IsComposingWindow(nsWindow* aWindow);
 
+  static bool IsJapanist2003Active();
+  static bool IsGoogleJapaneseInputActive();
+
   static bool ShouldDrawCompositionStringOurselves();
-  static void InitKeyboardLayout(HKL aKeyboardLayout);
+  static bool IsVerticalWritingSupported();
+  // aWindow can be nullptr if it's called without receiving WM_INPUTLANGCHANGE.
+  static void InitKeyboardLayout(nsWindow* aWindow, HKL aKeyboardLayout);
   static UINT GetKeyboardCodePage();
 
   /**
@@ -275,13 +283,37 @@
                                const nsIMEContext& aIMEContext);
   void SetIMERelatedWindowsPosOnPlugin(nsWindow* aWindow,
                                        const nsIMEContext& aIMEContext);
-  bool GetCharacterRectOfSelectedTextAt(nsWindow* aWindow,
-                                          uint32_t aOffset,
-                                          nsIntRect &aCharRect);
-  bool GetCaretRect(nsWindow* aWindow, nsIntRect &aCaretRect);
+  bool GetCharacterRectOfSelectedTextAt(
+         nsWindow* aWindow,
+         uint32_t aOffset,
+         nsIntRect& aCharRect,
+         mozilla::WritingMode* aWritingMode = nullptr);
+  bool GetCaretRect(nsWindow* aWindow,
+                    nsIntRect& aCaretRect,
+                    mozilla::WritingMode* aWritingMode = nullptr);
   void GetCompositionString(const nsIMEContext &aIMEContext,
                             DWORD aIndex,
                             nsAString& aCompositionString) const;
+
+  /**
+   * AdjustCompositionFont() makes IME vertical writing mode if it's supported.
+   * If aForceUpdate is true, it will update composition font even if writing
+   * mode isn't being changed.
+   */
+  void AdjustCompositionFont(const nsIMEContext& aIMEContext,
+                             const mozilla::WritingMode& aWritingMode,
+                             bool aForceUpdate = false);
+
+  /**
+   * MaybeAdjustCompositionFont() calls AdjustCompositionFont() when the
+   * locale of active IME is CJK.  Note that this creates an instance even
+   * when there is no composition but the locale is CJK.
+   */
+  static void MaybeAdjustCompositionFont(
+                nsWindow* aWindow,
+                const mozilla::WritingMode& aWritingMode,
+                bool aForceUpdate = false);
+
   /**
    *  Get the current target clause of composition string.
    *  If there are one or more characters whose attribute is ATTR_TARGET_*,
@@ -359,8 +391,12 @@
   bool mIsComposingOnPlugin;
   bool mNativeCaretIsCreated;
 
+  static mozilla::WritingMode sWritingModeOfCompositionFont;
+  static nsString sIMEName;
   static UINT sCodePage;
   static DWORD sIMEProperty;
+  static DWORD sIMEUIProperty;
+  static bool sAssumeVerticalWritingModeNotSupported;
 };
 
 #endif // nsIMM32Handler_h__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsLookAndFeel.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsLookAndFeel.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsLookAndFeel.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsLookAndFeel.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -63,22 +63,10 @@
     return ::SystemParametersInfo(flag, 0, &value, 0) ? value : def;
 }
 
-namespace mozilla {
-namespace widget {
-// This is in use here and in dom/events/TouchEvent.cpp
-int32_t IsTouchDeviceSupportPresent()
-{
-  int32_t touchCapabilities;
-  touchCapabilities = ::GetSystemMetrics(SM_DIGITIZER);
-  return ((touchCapabilities & NID_READY) && 
-          (touchCapabilities & (NID_EXTERNAL_TOUCH | NID_INTEGRATED_TOUCH)));
-}
-} }
-
 nsLookAndFeel::nsLookAndFeel() : nsXPLookAndFeel()
 {
   mozilla::Telemetry::Accumulate(mozilla::Telemetry::TOUCH_ENABLED_DEVICE,
-                                 IsTouchDeviceSupportPresent());
+                                 WinUtils::IsTouchDeviceSupportPresent());
 }
 
 nsLookAndFeel::~nsLookAndFeel()
@@ -396,7 +384,7 @@
         aResult = !IsAppThemed();
         break;
     case eIntID_TouchEnabled:
-        aResult = IsTouchDeviceSupportPresent();
+        aResult = WinUtils::IsTouchDeviceSupportPresent();
         break;
     case eIntID_WindowsDefaultTheme:
         aResult = nsUXThemeData::IsDefaultWindowTheme();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsNativeThemeWin.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsNativeThemeWin.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsNativeThemeWin.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsNativeThemeWin.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -1623,10 +1623,10 @@
 
 #if 0
   {
-    PR_LOG(gWindowsLog, PR_LOG_ERROR,
+    MOZ_LOG(gWindowsLog, PR_LOG_ERROR,
            (stderr, "xform: %f %f %f %f [%f %f]\n", m._11, m._21, m._12, m._22,
             m._31, m._32));
-    PR_LOG(gWindowsLog, PR_LOG_ERROR,
+    MOZ_LOG(gWindowsLog, PR_LOG_ERROR,
            (stderr, "tr: [%d %d %d %d]\ndr: [%d %d %d %d]\noff: [%f %f]\n",
             tr.x, tr.y, tr.width, tr.height, dr.x, dr.y, dr.width, dr.height,
             offset.x, offset.y));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsSound.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsSound.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsSound.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsSound.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -19,7 +19,7 @@
 #include "nsContentUtils.h"
 #include "nsCRT.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prtime.h"
 #include "prprf.h"
 #include "prmem.h"
@@ -167,7 +167,7 @@
         if (uri) {
           nsAutoCString uriSpec;
           uri->GetSpec(uriSpec);
-          PR_LOG(gWin32SoundLog, PR_LOG_ALWAYS,
+          MOZ_LOG(gWin32SoundLog, PR_LOG_ALWAYS,
                  ("Failed to load %s\n", uriSpec.get()));
         }
       }
@@ -201,7 +201,7 @@
 #ifdef DEBUG_SOUND
   char *url;
   aURL->GetSpec(&url);
-  PR_LOG(gWin32SoundLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gWin32SoundLog, PR_LOG_ALWAYS,
          ("%s\n", url));
 #endif
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsTextStore.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsTextStore.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsTextStore.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsTextStore.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -6,7 +6,7 @@
 #include <olectl.h>
 #include <algorithm>
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "nscore.h"
 #include "nsWindow.h"
@@ -669,7 +669,7 @@
   InputScopeImpl(const nsTArray<InputScope>& aList)
     : mInputScopes(aList)
   {
-    PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
       ("TSF: 0x%p InputScopeImpl()", this));
   }
 
@@ -880,7 +880,7 @@
   HRESULT hr =
     mThreadMgr->QueryInterface(IID_ITfSource, getter_AddRefs(source));
   if (FAILED(hr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF: 0x%p TSFStaticSink::Init() FAILED to get ITfSource "
        "instance (0x%08X)", this, hr));
     return false;
@@ -895,7 +895,7 @@
                    static_cast<ITfInputProcessorProfileActivationSink*>(this),
                    &mIPProfileCookie);
     if (FAILED(hr) || mIPProfileCookie == TF_INVALID_COOKIE) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
         ("TSF: 0x%p TSFStaticSink::Init() FAILED to install "
          "ITfInputProcessorProfileActivationSink (0x%08X)", this, hr));
       return false;
@@ -905,14 +905,14 @@
                    static_cast<ITfActiveLanguageProfileNotifySink*>(this),
                    &mLangProfileCookie);
     if (FAILED(hr) || mLangProfileCookie == TF_INVALID_COOKIE) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
         ("TSF: 0x%p TSFStaticSink::Init() FAILED to install "
          "ITfActiveLanguageProfileNotifySink (0x%08X)", this, hr));
       return false;
     }
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
     ("TSF: 0x%p TSFStaticSink::Init(), "
      "mIPProfileCookie=0x%08X, mLangProfileCookie=0x%08X",
      this, mIPProfileCookie, mLangProfileCookie));
@@ -922,7 +922,7 @@
 void
 TSFStaticSink::Destroy()
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
     ("TSF: 0x%p TSFStaticSink::Shutdown() "
      "mIPProfileCookie=0x%08X, mLangProfileCookie=0x%08X",
      this, mIPProfileCookie, mLangProfileCookie));
@@ -932,13 +932,13 @@
     HRESULT hr =
       mThreadMgr->QueryInterface(IID_ITfSource, getter_AddRefs(source));
     if (FAILED(hr)) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
         ("TSF: 0x%p   TSFStaticSink::Shutdown() FAILED to get "
          "ITfSource instance (0x%08X)", this, hr));
     } else {
       hr = source->UnadviseSink(mIPProfileCookie);
       if (FAILED(hr)) {
-        PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+        MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
           ("TSF: 0x%p   nsTextStore::Shutdown() FAILED to uninstall "
            "ITfInputProcessorProfileActivationSink (0x%08X)",
            this, hr));
@@ -951,13 +951,13 @@
     HRESULT hr =
       mThreadMgr->QueryInterface(IID_ITfSource, getter_AddRefs(source));
     if (FAILED(hr)) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
         ("TSF: 0x%p   TSFStaticSink::Shutdown() FAILED to get "
          "ITfSource instance (0x%08X)", this, hr));
     } else {
       hr = source->UnadviseSink(mLangProfileCookie);
       if (FAILED(hr)) {
-        PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+        MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
           ("TSF: 0x%p   TSFStaticSink::Shutdown() FAILED to uninstall "
            "ITfActiveLanguageProfileNotifySink (0x%08X)",
            this, hr));
@@ -982,7 +982,7 @@
     LANGID langID;
     HRESULT hr = mInputProcessorProfiles->GetCurrentLanguage(&langID);
     if (FAILED(hr)) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
              ("TSF: TSFStaticSink::OnActivated() FAILED due to "
               "GetCurrentLanguage() failure, hr=0x%08X", hr));
     } else if (IsTIPCategoryKeyboard(clsid, langID, guidProfile)) {
@@ -994,7 +994,7 @@
     }
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p TSFStaticSink::OnActivated(rclsid=%s, guidProfile=%s, "
           "fActivated=%s), mIsIMM_IME=%s, mActiveTIPDescription=\"%s\"",
           this, GetCLSIDNameStr(clsid).get(),
@@ -1024,7 +1024,7 @@
     GetTIPDescription(rclsid, langid, guidProfile,
                       mActiveTIPKeyboardDescription);
   }
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p TSFStaticSink::OnActivated(dwProfileType=%s (0x%08X), "
           "langid=0x%08X, rclsid=%s, catid=%s, guidProfile=%s, hkl=0x%08X, "
           "dwFlags=0x%08X (TF_IPSINK_FLAG_ACTIVE: %s)), mIsIMM_IME=%s, "
@@ -1054,7 +1054,7 @@
       mInputProcessorProfiles->QueryInterface(IID_ITfInputProcessorProfileMgr,
                                               getter_AddRefs(profileMgr));
     if (FAILED(hr) || !profileMgr) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
         ("TSF: 0x%p   TSFStaticSink::EnsureInitActiveLanguageProfile(), FAILED "
          "to get input processor profile manager, hr=0x%08X", this, hr));
       return false;
@@ -1063,7 +1063,7 @@
     TF_INPUTPROCESSORPROFILE profile;
     hr = profileMgr->GetActiveProfile(GUID_TFCAT_TIP_KEYBOARD, &profile);
     if (hr == S_FALSE) {
-      PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
         ("TSF: 0x%p   TSFStaticSink::EnsureInitActiveLanguageProfile(), FAILED "
          "to get active keyboard layout profile due to no active profile, "
          "hr=0x%08X", this, hr));
@@ -1072,13 +1072,13 @@
       return false;
     }
     if (FAILED(hr)) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
         ("TSF: 0x%p   TSFStaticSink::EnsureInitActiveLanguageProfile(), FAILED "
          "to get active TIP keyboard, hr=0x%08X", this, hr));
       return false;
     }
 
-    PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
       ("TSF: 0x%p   TSFStaticSink::EnsureInitActiveLanguageProfile(), "
        "calling OnActivated() manually...", this));
     OnActivated(profile.dwProfileType, profile.langid, profile.clsid,
@@ -1090,7 +1090,7 @@
   LANGID langID;
   HRESULT hr = mInputProcessorProfiles->GetCurrentLanguage(&langID);
   if (FAILED(hr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF: 0x%p   TSFStaticSink::EnsureInitActiveLanguageProfile(), FAILED "
        "to get current language ID, hr=0x%08X", this, hr));
     return false;
@@ -1100,7 +1100,7 @@
   hr = mInputProcessorProfiles->EnumLanguageProfiles(langID,
                                   getter_AddRefs(enumLangProfiles));
   if (FAILED(hr) || !enumLangProfiles) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF: 0x%p   TSFStaticSink::EnsureInitActiveLanguageProfile(), FAILED "
        "to get language profiles enumerator, hr=0x%08X", this, hr));
     return false;
@@ -1112,7 +1112,7 @@
     if (!profile.fActive || profile.catid != GUID_TFCAT_TIP_KEYBOARD) {
       continue;
     }
-    PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
       ("TSF: 0x%p   TSFStaticSink::EnsureInitActiveLanguageProfile(), "
        "calling OnActivated() manually...", this));
     bool isTIP = profile.guidProfile != GUID_NULL;
@@ -1124,7 +1124,7 @@
     return true;
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
     ("TSF: 0x%p   TSFStaticSink::EnsureInitActiveLanguageProfile(), "
      "calling OnActivated() without active TIP manually...", this));
   OnActivated(TF_PROFILETYPE_KEYBOARDLAYOUT,
@@ -1151,7 +1151,7 @@
                                                            aProfile,
                                                            &description);
   if (FAILED(hr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   TSFStaticSink::InitActiveTIPDescription() FAILED "
             "due to GetLanguageProfileDescription() failure, hr=0x%08X",
             this, hr));
@@ -1177,7 +1177,7 @@
     mInputProcessorProfiles->EnumLanguageProfiles(aLangID,
                                getter_AddRefs(enumLangProfiles));
   if (FAILED(hr) || !enumLangProfiles) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF: 0x%p   TSFStaticSink::IsTIPCategoryKeyboard(), FAILED "
        "to get language profiles enumerator, hr=0x%08X", this, hr));
     return false;
@@ -1239,27 +1239,27 @@
   // We hope that 5 or more actions don't occur at once.
   mPendingActions.SetCapacity(5);
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
     ("TSF: 0x%p nsTextStore::nsTestStore() SUCCEEDED", this));
 }
 
 nsTextStore::~nsTextStore()
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
     ("TSF: 0x%p nsTextStore instance is destroyed", this));
 }
 
 bool
 nsTextStore::Init(nsWindowBase* aWidget)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
     ("TSF: 0x%p nsTextStore::Init(aWidget=0x%p)",
      this, aWidget));
 
   TSFStaticSink::GetInstance()->EnsureInitActiveTIPKeyboard();
 
   if (mDocumentMgr) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF: 0x%p   nsTextStore::Init() FAILED due to already initialized",
        this));
     return false;
@@ -1268,7 +1268,7 @@
   // Create document manager
   HRESULT hr = sThreadMgr->CreateDocumentMgr(getter_AddRefs(mDocumentMgr));
   if (FAILED(hr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF: 0x%p   nsTextStore::Init() FAILED to create DocumentMgr "
        "(0x%08X)", this, hr));
     return false;
@@ -1280,7 +1280,7 @@
                                    static_cast<ITextStoreACP*>(this),
                                    getter_AddRefs(mContext), &mEditCookie);
   if (FAILED(hr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF: 0x%p   nsTextStore::Init() FAILED to create the context "
        "(0x%08X)", this, hr));
     mDocumentMgr = nullptr;
@@ -1289,7 +1289,7 @@
 
   hr = mDocumentMgr->Push(mContext);
   if (FAILED(hr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF: 0x%p   nsTextStore::Init() FAILED to push the context (0x%08X)",
        this, hr));
     // XXX Why don't we use NS_IF_RELEASE() here??
@@ -1298,7 +1298,7 @@
     return false;
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
     ("TSF: 0x%p   nsTextStore::Init() succeeded: "
      "mDocumentMgr=0x%p, mContext=0x%p, mEditCookie=0x%08X",
      this, mDocumentMgr.get(), mContext.get(), mEditCookie));
@@ -1309,7 +1309,7 @@
 bool
 nsTextStore::Destroy()
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
     ("TSF: 0x%p nsTextStore::Destroy(), mLock=%s, "
      "mComposition.IsComposing()=%s",
      this, GetLockFlagNameStr(mLock).get(),
@@ -1339,13 +1339,13 @@
   mWidget = nullptr;
 
   if (!mMouseTrackers.IsEmpty()) {
-    PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+    MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
       ("TSF: 0x%p   nsTextStore::Destroy(), removing a mouse tracker...",
        this));
     mMouseTrackers.Clear();
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
     ("TSF: 0x%p   nsTextStore::Destroy() succeeded", this));
   return true;
 }
@@ -1367,7 +1367,7 @@
     return S_OK;
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
     ("TSF: 0x%p nsTextStore::QueryInterface() FAILED, riid=%s",
      this, GetRIIDNameStr(riid).get()));
   return E_NOINTERFACE;
@@ -1378,21 +1378,21 @@
                         IUnknown *punk,
                         DWORD dwMask)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
     ("TSF: 0x%p nsTextStore::AdviseSink(riid=%s, punk=0x%p, dwMask=%s), "
      "mSink=0x%p, mSinkMask=%s",
      this, GetRIIDNameStr(riid).get(), punk, GetSinkMaskNameStr(dwMask).get(),
      mSink.get(), GetSinkMaskNameStr(mSinkMask).get()));
 
   if (!punk) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF: 0x%p   nsTextStore::AdviseSink() FAILED due to the null punk",
        this));
     return E_UNEXPECTED;
   }
 
   if (IID_ITextStoreACPSink != riid) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF: 0x%p   nsTextStore::AdviseSink() FAILED due to "
        "unsupported interface", this));
     return E_INVALIDARG; // means unsupported interface.
@@ -1402,7 +1402,7 @@
     // Install sink
     punk->QueryInterface(IID_ITextStoreACPSink, getter_AddRefs(mSink));
     if (!mSink) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
         ("TSF: 0x%p   nsTextStore::AdviseSink() FAILED due to "
          "punk not having the interface", this));
       return E_UNEXPECTED;
@@ -1414,7 +1414,7 @@
     punk->QueryInterface(IID_IUnknown, getter_AddRefs(comparison1));
     mSink->QueryInterface(IID_IUnknown, getter_AddRefs(comparison2));
     if (comparison1 != comparison2) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
         ("TSF: 0x%p   nsTextStore::AdviseSink() FAILED due to "
          "the sink being different from the stored sink", this));
       return CONNECT_E_ADVISELIMIT;
@@ -1428,18 +1428,18 @@
 STDMETHODIMP
 nsTextStore::UnadviseSink(IUnknown *punk)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
     ("TSF: 0x%p nsTextStore::UnadviseSink(punk=0x%p), mSink=0x%p",
      this, punk, mSink.get()));
 
   if (!punk) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF: 0x%p   nsTextStore::UnadviseSink() FAILED due to the null punk",
        this));
     return E_INVALIDARG;
   }
   if (!mSink) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF: 0x%p   nsTextStore::UnadviseSink() FAILED due to "
        "any sink not stored", this));
     return CONNECT_E_NOCONNECTION;
@@ -1450,7 +1450,7 @@
   mSink->QueryInterface(IID_IUnknown, getter_AddRefs(comparison2));
   // Unadvise only if sinks are the same
   if (comparison1 != comparison2) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF: 0x%p   nsTextStore::UnadviseSink() FAILED due to "
        "the sink being different from the stored sink", this));
     return CONNECT_E_NOCONNECTION;
@@ -1464,19 +1464,19 @@
 nsTextStore::RequestLock(DWORD dwLockFlags,
                          HRESULT *phrSession)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
     ("TSF: 0x%p nsTextStore::RequestLock(dwLockFlags=%s, phrSession=0x%p), "
      "mLock=%s", this, GetLockFlagNameStr(dwLockFlags).get(), phrSession,
      GetLockFlagNameStr(mLock).get()));
 
   if (!mSink) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF: 0x%p   nsTextStore::RequestLock() FAILED due to "
        "any sink not stored", this));
     return E_FAIL;
   }
   if (!phrSession) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF: 0x%p   nsTextStore::RequestLock() FAILED due to "
        "null phrSession", this));
     return E_INVALIDARG;
@@ -1485,7 +1485,7 @@
   if (!mLock) {
     // put on lock
     mLock = dwLockFlags & (~TS_LF_SYNC);
-    PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
       ("TSF: 0x%p   Locking (%s) >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
        ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
        this, GetLockFlagNameStr(mLock).get()));
@@ -1493,7 +1493,7 @@
     // TSF but they don't grab us during this call.
     nsRefPtr<nsTextStore> kungFuDeathGrip(this);
     *phrSession = mSink->OnLockGranted(mLock);
-    PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
       ("TSF: 0x%p   Unlocked (%s) <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
        "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",
        this, GetLockFlagNameStr(mLock).get()));
@@ -1501,12 +1501,12 @@
     while (mLockQueued) {
       mLock = mLockQueued;
       mLockQueued = 0;
-      PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
         ("TSF: 0x%p   Locking for the request in the queue (%s) >>>>>>>>>>>>>>"
          ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
          this, GetLockFlagNameStr(mLock).get()));
       mSink->OnLockGranted(mLock);
-      PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
         ("TSF: 0x%p   Unlocked (%s) <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
          "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",
          this, GetLockFlagNameStr(mLock).get()));
@@ -1519,7 +1519,7 @@
     if (!mPendingDestroy && mPendingOnLayoutChange) {
       mPendingOnLayoutChange = false;
       if (mSink) {
-        PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+        MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
                ("TSF: 0x%p   nsTextStore::RequestLock(), "
                 "calling ITextStoreACPSink::OnLayoutChange()...", this));
         mSink->OnLayoutChange(TS_LC_CHANGE, TEXTSTORE_DEFAULT_VIEW);
@@ -1531,7 +1531,7 @@
         mContext->QueryInterface(IID_ITfContextOwnerServices,
                                  getter_AddRefs(service));
         if (service) {
-          PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+          MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
                  ("TSF: 0x%p   nsTextStore::RequestLock(), "
                   "calling ITfContextOwnerServices::OnLayoutChange()...",
                   this));
@@ -1543,7 +1543,7 @@
     if (!mPendingDestroy && mPendingOnSelectionChange) {
       mPendingOnSelectionChange = false;
       if (mSink) {
-        PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+        MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
                ("TSF: 0x%p   nsTextStore::RequestLock(), "
                 "calling ITextStoreACPSink::OnSelectionChange()...", this));
         mSink->OnSelectionChange();
@@ -1554,7 +1554,7 @@
       Destroy();
     }
 
-    PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
       ("TSF: 0x%p   nsTextStore::RequestLock() succeeded: *phrSession=%s",
        this, GetTextStoreReturnValueName(*phrSession)));
     return S_OK;
@@ -1567,14 +1567,14 @@
     *phrSession = TS_S_ASYNC;
     mLockQueued = dwLockFlags & (~TS_LF_SYNC);
 
-    PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
       ("TSF: 0x%p   nsTextStore::RequestLock() stores the request in the "
        "queue, *phrSession=TS_S_ASYNC", this));
     return S_OK;
   }
 
   // no more locks allowed
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
     ("TSF: 0x%p   nsTextStore::RequestLock() didn't allow to lock, "
      "*phrSession=TS_E_SYNCHRONOUS", this));
   *phrSession = TS_E_SYNCHRONOUS;
@@ -1624,7 +1624,7 @@
     PendingAction& action = mPendingActions[i];
     switch (action.mType) {
       case PendingAction::COMPOSITION_START: {
-        PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+        MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
                ("TSF: 0x%p   nsTextStore::FlushPendingActions() "
                 "flushing COMPOSITION_START={ mSelectionStart=%d, "
                 "mSelectionLength=%d }",
@@ -1639,13 +1639,13 @@
           selectionSet.mReversed = false;
           mWidget->DispatchWindowEvent(&selectionSet);
           if (!selectionSet.mSucceeded) {
-            PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+            MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
                    ("TSF: 0x%p   nsTextStore::FlushPendingActions() "
                     "FAILED due to NS_SELECTION_SET failure", this));
             break;
           }
         }
-        PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+        MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
                ("TSF: 0x%p   nsTextStore::FlushPendingActions() "
                 "dispatching compositionstart event...", this));
         WidgetCompositionEvent compositionStart(true, NS_COMPOSITION_START,
@@ -1658,7 +1658,7 @@
         break;
       }
       case PendingAction::COMPOSITION_UPDATE: {
-        PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+        MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
                ("TSF: 0x%p   nsTextStore::FlushPendingActions() "
                 "flushing COMPOSITION_UPDATE={ mData=\"%s\", "
                 "mRanges=0x%p, mRanges->Length()=%d }",
@@ -1699,7 +1699,7 @@
         action.mData.ReplaceSubstring(NS_LITERAL_STRING("\r\n"),
                                       NS_LITERAL_STRING("\n"));
 
-        PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+        MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
                ("TSF: 0x%p   nsTextStore::FlushPendingActions(), "
                 "dispatching compositionchange event...", this));
         WidgetCompositionEvent compositionChange(true, NS_COMPOSITION_CHANGE,
@@ -1719,7 +1719,7 @@
         break;
       }
       case PendingAction::COMPOSITION_END: {
-        PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+        MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
                ("TSF: 0x%p   nsTextStore::FlushPendingActions() "
                 "flushing COMPOSITION_END={ mData=\"%s\" }",
                 this, NS_ConvertUTF16toUTF8(action.mData).get()));
@@ -1727,7 +1727,7 @@
         action.mData.ReplaceSubstring(NS_LITERAL_STRING("\r\n"),
                                       NS_LITERAL_STRING("\n"));
 
-        PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+        MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
                ("TSF: 0x%p   nsTextStore::FlushPendingActions(), "
                 "dispatching compositioncommit event...", this));
         WidgetCompositionEvent compositionCommit(true, NS_COMPOSITION_COMMIT,
@@ -1741,7 +1741,7 @@
         break;
       }
       case PendingAction::SELECTION_SET: {
-        PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+        MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
                ("TSF: 0x%p   nsTextStore::FlushPendingActions() "
                 "flushing SELECTION_SET={ mSelectionStart=%d, "
                 "mSelectionLength=%d, mSelectionReversed=%s }",
@@ -1764,7 +1764,7 @@
       continue;
     }
 
-    PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
            ("TSF: 0x%p   nsTextStore::FlushPendingActions(), "
             "qutting since the mWidget has gone", this));
     break;
@@ -1775,11 +1775,11 @@
 STDMETHODIMP
 nsTextStore::GetStatus(TS_STATUS *pdcs)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
     ("TSF: 0x%p nsTextStore::GetStatus(pdcs=0x%p)", this, pdcs));
 
   if (!pdcs) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF: 0x%p   nsTextStore::GetStatus() FAILED due to null pdcs", this));
     return E_INVALIDARG;
   }
@@ -1796,20 +1796,20 @@
                          LONG *pacpResultStart,
                          LONG *pacpResultEnd)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::QueryInsert(acpTestStart=%ld, "
           "acpTestEnd=%ld, cch=%lu, pacpResultStart=0x%p, pacpResultEnd=0x%p)",
           this, acpTestStart, acpTestEnd, cch, acpTestStart, acpTestEnd));
 
   if (!pacpResultStart || !pacpResultEnd) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::QueryInsert() FAILED due to "
             "the null argument", this));
     return E_INVALIDARG;
   }
 
   if (acpTestStart < 0 || acpTestStart > acpTestEnd) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::QueryInsert() FAILED due to "
             "wrong argument", this));
     return E_INVALIDARG;
@@ -1820,7 +1820,7 @@
   *pacpResultStart = acpTestStart;
   *pacpResultEnd = acpTestStart + cch;
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p  nsTextStore::QueryInsert() succeeded: "
           "*pacpResultStart=%ld, *pacpResultEnd=%ld)",
           this, *pacpResultStart, *pacpResultEnd));
@@ -1833,19 +1833,19 @@
                           TS_SELECTION_ACP *pSelection,
                           ULONG *pcFetched)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::GetSelection(ulIndex=%lu, ulCount=%lu, "
           "pSelection=0x%p, pcFetched=0x%p)",
           this, ulIndex, ulCount, pSelection, pcFetched));
 
   if (!IsReadLocked()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetSelection() FAILED due to not locked",
             this));
     return TS_E_NOLOCK;
   }
   if (!ulCount || !pSelection || !pcFetched) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetSelection() FAILED due to "
             "null argument", this));
     return E_INVALIDARG;
@@ -1855,7 +1855,7 @@
 
   if (ulIndex != static_cast<ULONG>(TS_DEFAULT_SELECTION) &&
       ulIndex != 0) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetSelection() FAILED due to "
             "unsupported selection", this));
     return TS_E_NOSELECTION;
@@ -1863,14 +1863,14 @@
 
   Selection& currentSel = CurrentSelection();
   if (currentSel.IsDirty()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetSelection() FAILED due to "
             "CurrentSelection() failure", this));
     return E_FAIL;
   }
   *pSelection = currentSel.ACP();
   *pcFetched = 1;
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p   nsTextStore::GetSelection() succeeded", this));
   return S_OK;
 }
@@ -1901,7 +1901,7 @@
     mLockedContent.Init(text);
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::LockedContent(): "
           "mLockedContent={ mText.Length()=%d }",
           this, mLockedContent.Text().Length()));
@@ -1954,7 +1954,7 @@
                             querySelection.GetWritingMode());
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::CurrentSelection(): "
           "acpStart=%d, acpEnd=%d (length=%d), reverted=%s",
           this, mSelection.StartOffset(), mSelection.EndOffset(),
@@ -2008,7 +2008,7 @@
   if (PR_LOG_TEST(sTextStoreLog, PR_LOG_DEBUG)) {
     LONG start = 0, length = 0;
     hr = GetRangeExtent(aRange, &start, &length);
-    PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+    MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
            ("TSF: 0x%p   nsTextStore::GetDisplayAttribute(): "
             "GetDisplayAttribute range=%ld-%ld (hr=%s)",
             this, start - mComposition.mStart,
@@ -2020,13 +2020,13 @@
   ::VariantInit(&propValue);
   hr = aAttrProperty->GetValue(TfEditCookie(mEditCookie), aRange, &propValue);
   if (FAILED(hr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetDisplayAttribute() FAILED due to "
             "ITfProperty::GetValue() failed", this));
     return hr;
   }
   if (VT_I4 != propValue.vt) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetDisplayAttribute() FAILED due to "
             "ITfProperty::GetValue() returns non-VT_I4 value", this));
     ::VariantClear(&propValue);
@@ -2038,7 +2038,7 @@
   hr = sCategoryMgr->GetGUID(DWORD(propValue.lVal), &guid);
   ::VariantClear(&propValue);
   if (FAILED(hr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetDisplayAttribute() FAILED due to "
             "ITfCategoryMgr::GetGUID() failed", this));
     return hr;
@@ -2049,7 +2049,7 @@
   hr = sDisplayAttrMgr->GetDisplayAttributeInfo(guid, getter_AddRefs(info),
                                                 nullptr);
   if (FAILED(hr) || !info) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetDisplayAttribute() FAILED due to "
             "ITfDisplayAttributeMgr::GetDisplayAttributeInfo() failed", this));
     return hr;
@@ -2057,13 +2057,13 @@
 
   hr = info->GetAttributeInfo(aResult);
   if (FAILED(hr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetDisplayAttribute() FAILED due to "
             "ITfDisplayAttributeInfo::GetAttributeInfo() failed", this));
     return hr;
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::GetDisplayAttribute() succeeded: "
           "Result={ %s }", this, GetDisplayAttrStr(*aResult).get()));
   return S_OK;
@@ -2072,13 +2072,13 @@
 HRESULT
 nsTextStore::RestartCompositionIfNecessary(ITfRange* aRangeNew)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::RestartCompositionIfNecessary("
           "aRangeNew=0x%p), mComposition.mView=0x%p",
           this, aRangeNew, mComposition.mView.get()));
 
   if (!mComposition.IsComposing()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::RestartCompositionIfNecessary() FAILED "
             "due to no composition view", this));
     return E_FAIL;
@@ -2090,7 +2090,7 @@
   if (!composingRange) {
     hr = pComposition->GetRange(getter_AddRefs(composingRange));
     if (FAILED(hr)) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
              ("TSF: 0x%p   nsTextStore::RestartCompositionIfNecessary() FAILED "
               "due to pComposition->GetRange() failure", this));
       return hr;
@@ -2101,13 +2101,13 @@
   LONG compStart = 0, compLength = 0;
   hr = GetRangeExtent(composingRange, &compStart, &compLength);
   if (FAILED(hr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::RestartCompositionIfNecessary() FAILED "
             "due to GetRangeExtent() failure", this));
     return hr;
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::RestartCompositionIfNecessary(), "
           "range=%ld-%ld, mComposition={ mStart=%ld, mString.Length()=%lu }",
           this, compStart, compStart + compLength, mComposition.mStart,
@@ -2120,14 +2120,14 @@
     // because a part of the original composition was committed.
     hr = RestartComposition(pComposition, composingRange);
     if (FAILED(hr)) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
              ("TSF: 0x%p   nsTextStore::RestartCompositionIfNecessary() FAILED "
               "due to RestartComposition() failure", this));
       return hr;
     }
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::RestartCompositionIfNecessary() succeeded",
           this));
   return S_OK;
@@ -2143,7 +2143,7 @@
   HRESULT hr = GetRangeExtent(aNewRange, &newStart, &newLength);
   LONG newEnd = newStart + newLength;
 
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::RestartComposition(aCompositionView=0x%p, "
           "aNewRange=0x%p { newStart=%d, newLength=%d }), "
           "mComposition={ mStart=%d, mCompositionString.Length()=%d }, "
@@ -2154,14 +2154,14 @@
           currentSelection.StartOffset(), currentSelection.Length()));
 
   if (currentSelection.IsDirty()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::RestartComposition() FAILED "
             "due to CurrentSelection() failure", this));
     return E_FAIL;
   }
 
   if (FAILED(hr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::RestartComposition() FAILED "
             "due to GetRangeExtent() failure", this));
     return hr;
@@ -2198,7 +2198,7 @@
   // Update the composition string.
   Content& lockedContent = LockedContent();
   if (!lockedContent.IsInitialized()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::RestartComposition() FAILED "
             "due to LockedContent() failure", this));
     return E_FAIL;
@@ -2231,7 +2231,7 @@
                          keepComposingLength));
   currentSelection = oldSelection;
 
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::RestartComposition() succeeded, "
           "mComposition={ mStart=%d, mCompositionString.Length()=%d }, "
           "currentSelection={ IsDirty()=%s, StartOffset()=%d, Length()=%d }",
@@ -2289,7 +2289,7 @@
 HRESULT
 nsTextStore::RecordCompositionUpdateAction()
 {
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::RecordCompositionUpdateAction(), "
           "mComposition={ mView=0x%p, mStart=%d, mString=\"%s\" "
           "(Length()=%d) }",
@@ -2298,7 +2298,7 @@
           mComposition.mString.Length()));
 
   if (!mComposition.IsComposing()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::RecordCompositionUpdateAction() FAILED "
             "due to no composition view", this));
     return E_FAIL;
@@ -2316,7 +2316,7 @@
   HRESULT hr = mContext->GetProperty(GUID_PROP_ATTRIBUTE,
                                      getter_AddRefs(attrPropetry));
   if (FAILED(hr) || !attrPropetry) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::RecordCompositionUpdateAction() FAILED "
             "due to mContext->GetProperty() failure", this));
     return FAILED(hr) ? hr : E_FAIL;
@@ -2325,7 +2325,7 @@
   nsRefPtr<ITfRange> composingRange;
   hr = mComposition.mView->GetRange(getter_AddRefs(composingRange));
   if (FAILED(hr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::RecordCompositionUpdateAction() "
             "FAILED due to mComposition.mView->GetRange() failure", this));
     return hr;
@@ -2335,7 +2335,7 @@
   hr = attrPropetry->EnumRanges(TfEditCookie(mEditCookie),
                                 getter_AddRefs(enumRanges), composingRange);
   if (FAILED(hr) || !enumRanges) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::RecordCompositionUpdateAction() FAILED "
             "due to attrPropetry->EnumRanges() failure", this));
     return FAILED(hr) ? hr : E_FAIL;
@@ -2344,7 +2344,7 @@
   // First, put the log of content and selection here.
   Selection& currentSel = CurrentSelection();
   if (currentSel.IsDirty()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::RecordCompositionUpdateAction() FAILED "
             "due to CurrentSelection() failure", this));
     return E_FAIL;
@@ -2381,7 +2381,7 @@
                         mComposition.mStart);
     LONG length = end - start;
     if (length < 0) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
              ("TSF: 0x%p   nsTextStore::RecordCompositionUpdateAction() "
               "ignores invalid range (%d-%d)",
               this, rangeStart - mComposition.mStart,
@@ -2389,7 +2389,7 @@
       continue;
     }
     if (!length) {
-      PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+      MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
              ("TSF: 0x%p   nsTextStore::RecordCompositionUpdateAction() "
               "ignores a range due to outside of the composition or empty "
               "(%d-%d)",
@@ -2471,7 +2471,7 @@
 
   action->mIncomplete = false;
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p   nsTextStore::RecordCompositionUpdateAction() "
           "succeeded", this));
 
@@ -2482,7 +2482,7 @@
 nsTextStore::SetSelectionInternal(const TS_SELECTION_ACP* pSelection,
                                   bool aDispatchCompositionChangeEvent)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::SetSelectionInternal(pSelection={ "
           "acpStart=%ld, acpEnd=%ld, style={ ase=%s, fInterimChar=%s} }, "
           "aDispatchCompositionChangeEvent=%s), mComposition.IsComposing()=%s",
@@ -2496,7 +2496,7 @@
 
   Selection& currentSel = CurrentSelection();
   if (currentSel.IsDirty()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
        ("TSF: 0x%p   nsTextStore::SetSelectionInternal() FAILED due to "
         "CurrentSelection() failure", this));
     return E_FAIL;
@@ -2506,7 +2506,7 @@
     if (aDispatchCompositionChangeEvent) {
       HRESULT hr = RestartCompositionIfNecessary();
       if (FAILED(hr)) {
-        PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+        MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::SetSelectionInternal() FAILED due to "
             "RestartCompositionIfNecessary() failure", this));
         return hr;
@@ -2514,7 +2514,7 @@
     }
     if (pSelection->acpStart < mComposition.mStart ||
         pSelection->acpEnd > mComposition.EndOffset()) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
          ("TSF: 0x%p   nsTextStore::SetSelectionInternal() FAILED due to "
           "the selection being out of the composition string", this));
       return TS_E_INVALIDPOS;
@@ -2524,7 +2524,7 @@
     if (aDispatchCompositionChangeEvent) {
       HRESULT hr = RecordCompositionUpdateAction();
       if (FAILED(hr)) {
-        PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+        MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::SetSelectionInternal() FAILED due to "
             "RecordCompositionUpdateAction() failure", this));
         return hr;
@@ -2549,7 +2549,7 @@
 nsTextStore::SetSelection(ULONG ulCount,
                           const TS_SELECTION_ACP *pSelection)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::SetSelection(ulCount=%lu, pSelection=%p { "
           "acpStart=%ld, acpEnd=%ld, style={ ase=%s, fInterimChar=%s } }), "
           "mComposition.IsComposing()=%s",
@@ -2561,19 +2561,19 @@
           GetBoolName(mComposition.IsComposing())));
 
   if (!IsReadWriteLocked()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::SetSelection() FAILED due to "
             "not locked (read-write)", this));
     return TS_E_NOLOCK;
   }
   if (ulCount != 1) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::SetSelection() FAILED due to "
             "trying setting multiple selection", this));
     return E_INVALIDARG;
   }
   if (!pSelection) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::SetSelection() FAILED due to "
             "null argument", this));
     return E_INVALIDARG;
@@ -2581,11 +2581,11 @@
 
   HRESULT hr = SetSelectionInternal(pSelection, true);
   if (FAILED(hr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::SetSelection() FAILED due to "
             "SetSelectionInternal() failure", this));
   } else {
-    PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
            ("TSF: 0x%p   nsTextStore::SetSelection() succeeded", this));
   }
   return hr;
@@ -2602,7 +2602,7 @@
                      ULONG *pulRunInfoOut,
                      LONG *pacpNext)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
     ("TSF: 0x%p nsTextStore::GetText(acpStart=%ld, acpEnd=%ld, pchPlain=0x%p, "
      "cchPlainReq=%lu, pcchPlainOut=0x%p, prgRunInfo=0x%p, ulRunInfoReq=%lu, "
      "pulRunInfoOut=0x%p, pacpNext=0x%p), mComposition={ mStart=%ld, "
@@ -2613,7 +2613,7 @@
      GetBoolName(mComposition.IsComposing())));
 
   if (!IsReadLocked()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetText() FAILED due to "
             "not locked (read)", this));
     return TS_E_NOLOCK;
@@ -2621,14 +2621,14 @@
 
   if (!pcchPlainOut || (!pchPlain && !prgRunInfo) ||
       !cchPlainReq != !pchPlain || !ulRunInfoReq != !prgRunInfo) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetText() FAILED due to "
             "invalid argument", this));
     return E_INVALIDARG;
   }
 
   if (acpStart < 0 || acpEnd < -1 || (acpEnd != -1 && acpStart > acpEnd)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetText() FAILED due to "
             "invalid position", this));
     return TS_E_INVALIDPOS;
@@ -2646,20 +2646,20 @@
 
   Content& lockedContent = LockedContent();
   if (!lockedContent.IsInitialized()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetText() FAILED due to "
             "LockedContent() failure", this));
     return E_FAIL;
   }
   if (lockedContent.Text().Length() < static_cast<uint32_t>(acpStart)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetText() FAILED due to "
             "acpStart is larger offset than the actual text length", this));
     return TS_E_INVALIDPOS;
   }
   if (acpEnd != -1 &&
       lockedContent.Text().Length() < static_cast<uint32_t>(acpEnd)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetText() FAILED due to "
             "acpEnd is larger offset than the actual text length", this));
     return TS_E_INVALIDPOS;
@@ -2686,7 +2686,7 @@
     if (pacpNext) *pacpNext = acpStart + length;
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p   nsTextStore::GetText() succeeded: pcchPlainOut=0x%p, "
           "*prgRunInfo={ uCount=%lu, type=%s }, *pulRunInfoOut=%lu, "
           "*pacpNext=%ld)",
@@ -2704,7 +2704,7 @@
                      ULONG cch,
                      TS_TEXTCHANGE *pChange)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::SetText(dwFlags=%s, acpStart=%ld, "
           "acpEnd=%ld, pchText=0x%p \"%s\", cch=%lu, pChange=0x%p), "
           "mComposition.IsComposing()=%s",
@@ -2719,7 +2719,7 @@
   // ways to do this, this method acts as a helper to
   // call SetSelection followed by InsertTextAtSelection
   if (!IsReadWriteLocked()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::SetText() FAILED due to "
             "not locked (read)", this));
     return TS_E_NOLOCK;
@@ -2733,7 +2733,7 @@
   // Set selection to desired range
   HRESULT hr = SetSelectionInternal(&selection);
   if (FAILED(hr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::SetText() FAILED due to "
             "SetSelectionInternal() failure", this));
     return hr;
@@ -2741,13 +2741,13 @@
   // Replace just selected text
   if (!InsertTextAtSelectionInternal(nsDependentSubstring(pchText, cch),
                                      pChange)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::SetText() FAILED due to "
             "InsertTextAtSelectionInternal() failure", this));
     return E_FAIL;
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p   nsTextStore::SetText() succeeded: pChange={ "
           "acpStart=%ld, acpOldEnd=%ld, acpNewEnd=%ld }",
           this, pChange ? pChange->acpStart  : 0,
@@ -2760,7 +2760,7 @@
                               LONG acpEnd,
                               IDataObject **ppDataObject)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::GetFormattedText() called "
           "but not supported (E_NOTIMPL)", this));
 
@@ -2774,7 +2774,7 @@
                          REFIID riid,
                          IUnknown **ppunk)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::GetEmbedded() called "
           "but not supported (E_NOTIMPL)", this));
 
@@ -2787,7 +2787,7 @@
                                  const FORMATETC *pFormatEtc,
                                  BOOL *pfInsertable)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::QueryInsertEmbedded() called "
           "but not supported, *pfInsertable=FALSE (S_OK)", this));
 
@@ -2803,7 +2803,7 @@
                             IDataObject *pDataObject,
                             TS_TEXTCHANGE *pChange)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::InsertEmbedded() called "
           "but not supported (E_NOTIMPL)", this));
 
@@ -2882,7 +2882,7 @@
                                 ULONG aFilterCount,
                                 const TS_ATTRID* aFilterAttrs)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::HandleRequestAttrs(aFlags=%s, "
           "aFilterCount=%u)",
           this, GetFindFlagName(aFlags).get(), aFilterCount));
@@ -2899,7 +2899,7 @@
   mRequestedAttrValues = !!(aFlags & TS_ATTR_FIND_WANT_VALUE);
 
   for (uint32_t i = 0; i < aFilterCount; i++) {
-    PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
            ("TSF: 0x%p   nsTextStore::HandleRequestAttrs(), "
             "requested attr=%s",
             this, GetGUIDNameStrWithTable(aFilterAttrs[i]).get()));
@@ -2916,7 +2916,7 @@
                                    ULONG cFilterAttrs,
                                    const TS_ATTRID *paFilterAttrs)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::RequestSupportedAttrs(dwFlags=%s, "
           "cFilterAttrs=%lu)",
           this, GetFindFlagName(dwFlags).get(), cFilterAttrs));
@@ -2930,7 +2930,7 @@
                                     const TS_ATTRID *paFilterAttrs,
                                     DWORD dwFlags)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::RequestAttrsAtPosition(acpPos=%ld, "
           "cFilterAttrs=%lu, dwFlags=%s)",
           this, acpPos, cFilterAttrs, GetFindFlagName(dwFlags).get()));
@@ -2945,7 +2945,7 @@
                                                  const TS_ATTRID *paFilterAttr,
                                                  DWORD dwFlags)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::RequestAttrsTransitioningAtPosition("
           "acpPos=%ld, cFilterAttrs=%lu, dwFlags=%s) called but not supported "
           "(S_OK)",
@@ -2966,13 +2966,13 @@
                                     LONG *plFoundOffset)
 {
   if (!pacpNext || !pfFound || !plFoundOffset) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF:   0x%p nsTextStore::FindNextAttrTransition() FAILED due to "
             "null argument", this));
     return E_INVALIDARG;
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p   nsTextStore::FindNextAttrTransition() called "
           "but not supported (S_OK)", this));
 
@@ -2988,7 +2988,7 @@
                                     ULONG *pcFetched)
 {
   if (!pcFetched || !paAttrVals) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p nsTextStore::RetrieveRequestedAttrs() FAILED due to "
             "null argument", this));
     return E_INVALIDARG;
@@ -3001,14 +3001,14 @@
     }
   }
   if (ulCount < expectedCount) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p nsTextStore::RetrieveRequestedAttrs() FAILED due to "
             "not enough count ulCount=%u, expectedCount=%u",
             this, ulCount, expectedCount));
     return E_INVALIDARG;
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::RetrieveRequestedAttrs() called "
           "ulCount=%d, mRequestedAttrValues=%s",
           this, ulCount, GetBoolName(mRequestedAttrValues)));
@@ -3022,7 +3022,7 @@
 
     TS_ATTRID attrID = GetAttrID(i);
 
-    PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
            ("TSF: 0x%p   nsTextStore::RetrieveRequestedAttrs() for %s",
             this, GetGUIDNameStrWithTable(attrID).get()));
 
@@ -3069,7 +3069,7 @@
     return S_OK;
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p   nsTextStore::RetrieveRequestedAttrs() called "
           "for unknown TS_ATTRVAL, *pcFetched=0 (S_OK)", this));
 
@@ -3082,18 +3082,18 @@
 STDMETHODIMP
 nsTextStore::GetEndACP(LONG *pacp)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::GetEndACP(pacp=0x%p)", this, pacp));
 
   if (!IsReadLocked()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetEndACP() FAILED due to "
             "not locked (read)", this));
     return TS_E_NOLOCK;
   }
 
   if (!pacp) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetEndACP() FAILED due to "
             "null argument", this));
     return E_INVALIDARG;
@@ -3101,7 +3101,7 @@
 
   Content& lockedContent = LockedContent();
   if (!lockedContent.IsInitialized()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetEndACP() FAILED due to "
             "LockedContent() failure", this));
     return E_FAIL;
@@ -3113,11 +3113,11 @@
 STDMETHODIMP
 nsTextStore::GetActiveView(TsViewCookie *pvcView)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::GetActiveView(pvcView=0x%p)", this, pvcView));
 
   if (!pvcView) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetActiveView() FAILED due to "
             "null argument", this));
     return E_INVALIDARG;
@@ -3125,7 +3125,7 @@
 
   *pvcView = TEXTSTORE_DEFAULT_VIEW;
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p   nsTextStore::GetActiveView() succeeded: *pvcView=%ld",
           this, *pvcView));
   return S_OK;
@@ -3137,42 +3137,42 @@
                              DWORD dwFlags,
                              LONG *pacp)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::GetACPFromPoint(pvcView=%d, pt=%p (x=%d, "
           "y=%d), dwFlags=%s, pacp=%p",
           this, vcView, pt, pt ? pt->x : 0, pt ? pt->y : 0,
           GetACPFromPointFlagName(dwFlags).get(), pacp));
 
   if (!IsReadLocked()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetACPFromPoint() FAILED due to "
             "not locked (read)", this));
     return TS_E_NOLOCK;
   }
 
   if (vcView != TEXTSTORE_DEFAULT_VIEW) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetACPFromPoint() FAILED due to "
             "called with invalid view", this));
     return E_INVALIDARG;
   }
 
   if (!pt) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetACPFromPoint() FAILED due to "
             "null pt", this));
     return E_INVALIDARG;
   }
 
   if (!pacp) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetACPFromPoint() FAILED due to "
             "null pacp", this));
     return E_INVALIDARG;
   }
 
   if (mLockedContent.IsLayoutChanged()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetACPFromPoint() FAILED due to "
             "layout not recomputed", this));
     mPendingOnLayoutChange = true;
@@ -3194,20 +3194,20 @@
   nsRefPtr<nsTextStore> kungFuDeathGrip(this);
   mWidget->DispatchWindowEvent(&charAtPt);
   if (!mWidget || mWidget->Destroyed()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetACPFromPoint() FAILED due to "
             "mWidget was destroyed during NS_QUERY_CHARACTER_AT_POINT", this));
     return E_FAIL;
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::GetACPFromPoint(), charAtPt={ "
           "mSucceeded=%s, mReply={ mOffset=%u, mTentativeCaretOffset=%u }}",
           this, GetBoolName(charAtPt.mSucceeded), charAtPt.mReply.mOffset,
           charAtPt.mReply.mTentativeCaretOffset));
 
   if (NS_WARN_IF(!charAtPt.mSucceeded)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetACPFromPoint() FAILED due to "
             "NS_QUERY_CHARACTER_AT_POINT failure", this));
     return E_FAIL;
@@ -3217,7 +3217,7 @@
   // we should return TS_E_INVALIDPOINT.
   if (!(dwFlags & GXFPF_NEAREST) &&
       charAtPt.mReply.mOffset == WidgetQueryContentEvent::NOT_FOUND) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetACPFromPoint() FAILED due to the "
             "point contained by no bounding box", this));
     return TS_E_INVALIDPOINT;
@@ -3255,7 +3255,7 @@
     // offset.
     Content& lockedContent = LockedContent();
     if (!lockedContent.IsInitialized()) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
              ("TSF: 0x%p   nsTextStore::GetACPFromPoint() FAILED due to "
               "LockedContent() failure", this));
       return E_FAIL;
@@ -3268,14 +3268,14 @@
   }
 
   if (NS_WARN_IF(offset > LONG_MAX)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetACPFromPoint() FAILED due to out of "
             "range of the result", this));
     return TS_E_INVALIDPOINT;
   }
 
   *pacp = static_cast<LONG>(offset);
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p   nsTextStore::GetACPFromPoint() succeeded: *pacp=%d",
           this, *pacp));
   return S_OK;
@@ -3288,34 +3288,34 @@
                         RECT *prc,
                         BOOL *pfClipped)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::GetTextExt(vcView=%ld, "
           "acpStart=%ld, acpEnd=%ld, prc=0x%p, pfClipped=0x%p)",
           this, vcView, acpStart, acpEnd, prc, pfClipped));
 
   if (!IsReadLocked()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetTextExt() FAILED due to "
             "not locked (read)", this));
     return TS_E_NOLOCK;
   }
 
   if (vcView != TEXTSTORE_DEFAULT_VIEW) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetTextExt() FAILED due to "
             "called with invalid view", this));
     return E_INVALIDARG;
   }
 
   if (!prc || !pfClipped) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetTextExt() FAILED due to "
             "null argument", this));
     return E_INVALIDARG;
   }
 
   if (acpStart < 0 || acpEnd < acpStart) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetTextExt() FAILED due to "
             "invalid position", this));
     return TS_E_INVALIDPOS;
@@ -3342,7 +3342,7 @@
           sDoNotReturnNoLayoutErrorToGoogleJaInputAtFirstChar &&
           kSink->IsGoogleJapaneseInputActive()) {
         acpEnd = acpStart;
-        PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+        MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
                ("TSF: 0x%p   nsTextStore::GetTextExt() hacked the offsets of "
                 "the first character of changing range of the composition "
                 "string for TIP acpStart=%d, acpEnd=%d",
@@ -3358,7 +3358,7 @@
                sDoNotReturnNoLayoutErrorToGoogleJaInputAtCaret &&
                kSink->IsGoogleJapaneseInputActive()) {
         acpEnd = acpStart = mLockedContent.MinOffsetOfLayoutChanged();
-        PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+        MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
                ("TSF: 0x%p   nsTextStore::GetTextExt() hacked the offsets of "
                 "the caret of the composition string for TIP acpStart=%d, "
                 "acpEnd=%d", this, acpStart, acpEnd));
@@ -3374,14 +3374,14 @@
               kSink->IsEasyChangjeiActive())) {
       acpEnd = mComposition.mStart;
       acpStart = std::min(acpStart, acpEnd);
-      PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+      MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
              ("TSF: 0x%p   nsTextStore::GetTextExt() hacked the offsets for "
               "TIP acpStart=%d, acpEnd=%d", this, acpStart, acpEnd));
     }
   }
 
   if (mLockedContent.IsLayoutChangedAfter(acpEnd)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetTextExt() FAILED due to "
             "layout not recomputed at %d", this, acpEnd));
     mPendingOnLayoutChange = true;
@@ -3394,7 +3394,7 @@
   event.InitForQueryTextRect(acpStart, acpEnd - acpStart);
   mWidget->DispatchWindowEvent(&event);
   if (!event.mSucceeded) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetTextExt() FAILED due to "
             "NS_QUERY_TEXT_RECT failure", this));
     return TS_E_INVALIDPOS; // but unexpected failure, maybe.
@@ -3411,7 +3411,7 @@
   // Result rect is in top level widget coordinates
   refWindow = refWindow->GetTopLevelWindow(false);
   if (!refWindow) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetTextExt() FAILED due to "
             "no top level window", this));
     return E_FAIL;
@@ -3421,7 +3421,7 @@
 
   // get bounding screen rect to test for clipping
   if (!GetScreenExtInternal(*prc)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetTextExt() FAILED due to "
             "GetScreenExtInternal() failure", this));
     return E_FAIL;
@@ -3452,7 +3452,7 @@
     CreateNativeCaret();
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p   nsTextStore::GetTextExt() succeeded: "
           "*prc={ left=%ld, top=%ld, right=%ld, bottom=%ld }, *pfClipped=%s",
           this, prc->left, prc->top, prc->right, prc->bottom,
@@ -3465,32 +3465,32 @@
 nsTextStore::GetScreenExt(TsViewCookie vcView,
                           RECT *prc)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::GetScreenExt(vcView=%ld, prc=0x%p)",
           this, vcView, prc));
 
   if (vcView != TEXTSTORE_DEFAULT_VIEW) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetScreenExt() FAILED due to "
             "called with invalid view", this));
     return E_INVALIDARG;
   }
 
   if (!prc) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetScreenExt() FAILED due to "
             "null argument", this));
     return E_INVALIDARG;
   }
 
   if (!GetScreenExtInternal(*prc)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetScreenExt() FAILED due to "
             "GetScreenExtInternal() failure", this));
     return E_FAIL;
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p   nsTextStore::GetScreenExt() succeeded: "
           "*prc={ left=%ld, top=%ld, right=%ld, bottom=%ld }",
           this, prc->left, prc->top, prc->right, prc->bottom));
@@ -3500,7 +3500,7 @@
 bool
 nsTextStore::GetScreenExtInternal(RECT &aScreenExt)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::GetScreenExtInternal()", this));
 
   // use NS_QUERY_EDITOR_RECT to get rect in system, screen coordinates
@@ -3508,7 +3508,7 @@
   mWidget->InitEvent(event);
   mWidget->DispatchWindowEvent(&event);
   if (!event.mSucceeded) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetScreenExtInternal() FAILED due to "
             "NS_QUERY_EDITOR_RECT failure", this));
     return false;
@@ -3520,7 +3520,7 @@
   // Result rect is in top level widget coordinates
   refWindow = refWindow->GetTopLevelWindow(false);
   if (!refWindow) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetScreenExtInternal() FAILED due to "
             "no top level window", this));
     return false;
@@ -3528,7 +3528,7 @@
 
   nsIntRect boundRect;
   if (NS_FAILED(refWindow->GetClientBounds(boundRect))) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetScreenExtInternal() FAILED due to "
             "failed to get the client bounds", this));
     return false;
@@ -3546,7 +3546,7 @@
     ::SetRectEmpty(&aScreenExt);
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::GetScreenExtInternal() succeeded: "
           "aScreenExt={ left=%ld, top=%ld, right=%ld, bottom=%ld }",
           this, aScreenExt.left, aScreenExt.top,
@@ -3558,20 +3558,20 @@
 nsTextStore::GetWnd(TsViewCookie vcView,
                     HWND *phwnd)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::GetWnd(vcView=%ld, phwnd=0x%p), "
           "mWidget=0x%p",
           this, vcView, phwnd, mWidget.get()));
 
   if (vcView != TEXTSTORE_DEFAULT_VIEW) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetWnd() FAILED due to "
             "called with invalid view", this));
     return E_INVALIDARG;
   }
 
   if (!phwnd) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::GetScreenExt() FAILED due to "
             "null argument", this));
     return E_INVALIDARG;
@@ -3579,7 +3579,7 @@
 
   *phwnd = mWidget->GetWindowHandle();
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p   nsTextStore::GetWnd() succeeded: *phwnd=0x%p",
           this, static_cast<void*>(*phwnd)));
   return S_OK;
@@ -3593,7 +3593,7 @@
                                    LONG *pacpEnd,
                                    TS_TEXTCHANGE *pChange)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::InsertTextAtSelection(dwFlags=%s, "
           "pchText=0x%p \"%s\", cch=%lu, pacpStart=0x%p, pacpEnd=0x%p, "
           "pChange=0x%p), IsComposing()=%s",
@@ -3606,7 +3606,7 @@
           GetBoolName(mComposition.IsComposing())));
 
   if (cch && !pchText) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::InsertTextAtSelection() FAILED due to "
             "null pchText", this));
     return E_INVALIDARG;
@@ -3614,14 +3614,14 @@
 
   if (TS_IAS_QUERYONLY == dwFlags) {
     if (!IsReadLocked()) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
              ("TSF: 0x%p   nsTextStore::InsertTextAtSelection() FAILED due to "
               "not locked (read)", this));
       return TS_E_NOLOCK;
     }
 
     if (!pacpStart || !pacpEnd) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
              ("TSF: 0x%p   nsTextStore::InsertTextAtSelection() FAILED due to "
               "null argument", this));
       return E_INVALIDARG;
@@ -3630,7 +3630,7 @@
     // Get selection first
     Selection& currentSel = CurrentSelection();
     if (currentSel.IsDirty()) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
              ("TSF: 0x%p   nsTextStore::InsertTextAtSelection() FAILED due to "
               "CurrentSelection() failure", this));
       return E_FAIL;
@@ -3646,21 +3646,21 @@
     }
   } else {
     if (!IsReadWriteLocked()) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
              ("TSF: 0x%p   nsTextStore::InsertTextAtSelection() FAILED due to "
               "not locked (read-write)", this));
       return TS_E_NOLOCK;
     }
 
     if (!pChange) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
              ("TSF: 0x%p   nsTextStore::InsertTextAtSelection() FAILED due to "
               "null pChange", this));
       return E_INVALIDARG;
     }
 
     if (TS_IAS_NOQUERY != dwFlags && (!pacpStart || !pacpEnd)) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
              ("TSF: 0x%p   nsTextStore::InsertTextAtSelection() FAILED due to "
               "null argument", this));
       return E_INVALIDARG;
@@ -3668,7 +3668,7 @@
 
     if (!InsertTextAtSelectionInternal(nsDependentSubstring(pchText, cch),
                                        pChange)) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
              ("TSF: 0x%p   nsTextStore::InsertTextAtSelection() FAILED due to "
               "InsertTextAtSelectionInternal() failure", this));
       return E_FAIL;
@@ -3679,7 +3679,7 @@
       *pacpEnd = pChange->acpNewEnd;
     }
   }
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p   nsTextStore::InsertTextAtSelection() succeeded: "
           "*pacpStart=%ld, *pacpEnd=%ld, "
           "*pChange={ acpStart=%ld, acpOldEnd=%ld, acpNewEnd=%ld })",
@@ -3693,7 +3693,7 @@
 nsTextStore::InsertTextAtSelectionInternal(const nsAString &aInsertStr,
                                            TS_TEXTCHANGE* aTextChange)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::InsertTextAtSelectionInternal("
           "aInsertStr=\"%s\", aTextChange=0x%p), IsComposing=%s",
           this, NS_ConvertUTF16toUTF8(aInsertStr).get(), aTextChange,
@@ -3701,7 +3701,7 @@
 
   Content& lockedContent = LockedContent();
   if (!lockedContent.IsInitialized()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::InsertTextAtSelectionInternal() failed "
             "due to LockedContent() failure()", this));
     return false;
@@ -3729,7 +3729,7 @@
     aTextChange->acpNewEnd = lockedContent.Selection().EndOffset();
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::InsertTextAtSelectionInternal() succeeded: "
           "mWidget=0x%p, mWidget->Destroyed()=%s, aTextChange={ acpStart=%ld, "
           "acpOldEnd=%ld, acpNewEnd=%ld }",
@@ -3748,7 +3748,7 @@
                                        LONG *pacpEnd,
                                        TS_TEXTCHANGE *pChange)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::InsertEmbeddedAtSelection() called "
           "but not supported (E_NOTIMPL)", this));
 
@@ -3761,7 +3761,7 @@
                                           ITfRange* aRange,
                                           bool aPreserveSelection)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::RecordCompositionStartAction("
           "aComposition=0x%p, aRange=0x%p, aPreserveSelection=%s), "
           "mComposition.mView=0x%p",
@@ -3771,7 +3771,7 @@
   LONG start = 0, length = 0;
   HRESULT hr = GetRangeExtent(aRange, &start, &length);
   if (FAILED(hr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::RecordCompositionStartAction() FAILED "
             "due to GetRangeExtent() failure", this));
     return hr;
@@ -3787,7 +3787,7 @@
                                           LONG aLength,
                                           bool aPreserveSelection)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::RecordCompositionStartAction("
           "aComposition=0x%p, aStart=%d, aLength=%d, aPreserveSelection=%s), "
           "mComposition.mView=0x%p",
@@ -3796,7 +3796,7 @@
 
   Content& lockedContent = LockedContent();
   if (!lockedContent.IsInitialized()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::RecordCompositionStartAction() FAILED "
             "due to LockedContent() failure", this));
     return E_FAIL;
@@ -3810,7 +3810,7 @@
 
   Selection& currentSel = CurrentSelection();
   if (currentSel.IsDirty()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::RecordCompositionStartAction() FAILED "
             "due to CurrentSelection() failure", this));
     action->mAdjustSelection = true;
@@ -3829,7 +3829,7 @@
 
   lockedContent.StartComposition(aComposition, *action, aPreserveSelection);
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p   nsTextStore::RecordCompositionStartAction() succeeded: "
           "mComposition={ mStart=%ld, mString.Length()=%ld, "
           "mSelection={ acpStart=%ld, acpEnd=%ld, style.ase=%s, "
@@ -3844,7 +3844,7 @@
 HRESULT
 nsTextStore::RecordCompositionEndAction()
 {
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::RecordCompositionEndAction(), "
           "mComposition={ mView=0x%p, mString=\"%s\" }",
           this, mComposition.mView.get(),
@@ -3859,14 +3859,14 @@
 
   Content& lockedContent = LockedContent();
   if (!lockedContent.IsInitialized()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::RecordCompositionEndAction() FAILED due "
             "to LockedContent() failure", this));
     return E_FAIL;
   }
   lockedContent.EndComposition(*action);
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p   nsTextStore::RecordCompositionEndAction(), succeeded",
           this));
   return S_OK;
@@ -3876,7 +3876,7 @@
 nsTextStore::OnStartComposition(ITfCompositionView* pComposition,
                                 BOOL* pfOk)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::OnStartComposition(pComposition=0x%p, "
           "pfOk=0x%p), mComposition.mView=0x%p",
           this, pComposition, pfOk, mComposition.mView.get()));
@@ -3887,7 +3887,7 @@
 
   // Only one composition at a time
   if (mComposition.IsComposing()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::OnStartComposition() FAILED due to "
             "there is another composition already (but returns S_OK)", this));
     return S_OK;
@@ -3896,21 +3896,21 @@
   nsRefPtr<ITfRange> range;
   HRESULT hr = pComposition->GetRange(getter_AddRefs(range));
   if (FAILED(hr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::OnStartComposition() FAILED due to "
             "pComposition->GetRange() failure", this));
     return hr;
   }
   hr = RecordCompositionStartAction(pComposition, range, false);
   if (FAILED(hr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::OnStartComposition() FAILED due to "
             "RecordCompositionStartAction() failure", this));
     return hr;
   }
 
   *pfOk = TRUE;
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p   nsTextStore::OnStartComposition() succeeded", this));
   return S_OK;
 }
@@ -3919,7 +3919,7 @@
 nsTextStore::OnUpdateComposition(ITfCompositionView* pComposition,
                                  ITfRange* pRangeNew)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::OnUpdateComposition(pComposition=0x%p, "
           "pRangeNew=0x%p), mComposition.mView=0x%p",
           this, pComposition, pRangeNew, mComposition.mView.get()));
@@ -3927,19 +3927,19 @@
   AutoPendingActionAndContentFlusher flusher(this);
 
   if (!mDocumentMgr || !mContext) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::OnUpdateComposition() FAILED due to "
             "not ready for the composition", this));
     return E_UNEXPECTED;
   }
   if (!mComposition.IsComposing()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::OnUpdateComposition() FAILED due to "
             "no active composition", this));
     return E_UNEXPECTED;
   }
   if (mComposition.mView != pComposition) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::OnUpdateComposition() FAILED due to "
             "different composition view specified", this));
     return E_UNEXPECTED;
@@ -3949,7 +3949,7 @@
   if (!pRangeNew) {
     PendingAction* action = LastOrNewPendingCompositionUpdate();
     action->mIncomplete = true;
-    PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
            ("TSF: 0x%p   nsTextStore::OnUpdateComposition() succeeded but "
             "not complete", this));
     return S_OK;
@@ -3957,7 +3957,7 @@
 
   HRESULT hr = RestartCompositionIfNecessary(pRangeNew);
   if (FAILED(hr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::OnUpdateComposition() FAILED due to "
             "RestartCompositionIfNecessary() failure", this));
     return hr;
@@ -3965,7 +3965,7 @@
 
   hr = RecordCompositionUpdateAction();
   if (FAILED(hr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::OnUpdateComposition() FAILED due to "
             "RecordCompositionUpdateAction() failure", this));
     return hr;
@@ -3974,12 +3974,12 @@
   if (PR_LOG_TEST(sTextStoreLog, PR_LOG_ALWAYS)) {
     Selection& currentSel = CurrentSelection();
     if (currentSel.IsDirty()) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
              ("TSF: 0x%p   nsTextStore::OnUpdateComposition() FAILED due to "
               "CurrentSelection() failure", this));
       return E_FAIL;
     }
-    PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
            ("TSF: 0x%p   nsTextStore::OnUpdateComposition() succeeded: "
             "mComposition={ mStart=%ld, mString=\"%s\" }, "
             "CurrentSelection()={ acpStart=%ld, acpEnd=%ld, style.ase=%s }",
@@ -3994,7 +3994,7 @@
 STDMETHODIMP
 nsTextStore::OnEndComposition(ITfCompositionView* pComposition)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::OnEndComposition(pComposition=0x%p), "
           "mComposition={ mView=0x%p, mString=\"%s\" }",
           this, pComposition, mComposition.mView.get(),
@@ -4003,14 +4003,14 @@
   AutoPendingActionAndContentFlusher flusher(this);
 
   if (!mComposition.IsComposing()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::OnEndComposition() FAILED due to "
             "no active composition", this));
     return E_UNEXPECTED;
   }
 
   if (mComposition.mView != pComposition) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::OnEndComposition() FAILED due to "
             "different composition view specified", this));
     return E_UNEXPECTED;
@@ -4018,13 +4018,13 @@
 
   HRESULT hr = RecordCompositionEndAction();
   if (FAILED(hr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::OnEndComposition() FAILED due to "
             "RecordCompositionEndAction() failure", this));
     return hr;
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p   nsTextStore::OnEndComposition(), succeeded", this));
   return S_OK;
 }
@@ -4034,12 +4034,12 @@
                              ITfMouseSink* pSink,
                              DWORD* pdwCookie)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::AdviseMouseSink(range=0x%p, pSink=0x%p, "
           "pdwCookie=0x%p)", this, range, pSink, pdwCookie));
 
   if (!pdwCookie) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::AdviseMouseSink() FAILED due to the "
             "pdwCookie is null", this));
     return E_INVALIDARG;
@@ -4048,13 +4048,13 @@
   *pdwCookie = MouseTracker::kInvalidCookie;
 
   if (!range) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::AdviseMouseSink() FAILED due to the "
             "range is null", this));
     return E_INVALIDARG;
   }
   if (!pSink) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::AdviseMouseSink() FAILED due to the "
             "pSink is null", this));
     return E_INVALIDARG;
@@ -4074,7 +4074,7 @@
     tracker = mMouseTrackers.AppendElement();
     HRESULT hr = tracker->Init(this);
     if (FAILED(hr)) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
              ("TSF: 0x%p   nsTextStore::AdviseMouseSink() FAILED due to "
               "failure of MouseTracker::Init()", this));
       return hr;
@@ -4082,13 +4082,13 @@
   }
   HRESULT hr = tracker->AdviseSink(this, range, pSink);
   if (FAILED(hr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::AdviseMouseSink() FAILED due to failure "
             "of MouseTracker::Init()", this));
     return hr;
   }
   *pdwCookie = tracker->Cookie();
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p   nsTextStore::AdviseMouseSink(), succeeded, "
           "*pdwCookie=%d", this, *pdwCookie));
   return S_OK;
@@ -4097,11 +4097,11 @@
 STDMETHODIMP
 nsTextStore::UnadviseMouseSink(DWORD dwCookie)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p nsTextStore::UnadviseMouseSink(dwCookie=%d)",
           this, dwCookie));
   if (dwCookie == MouseTracker::kInvalidCookie) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::UnadviseMouseSink() FAILED due to "
             "the cookie is invalid value", this));
     return E_INVALIDARG;
@@ -4109,20 +4109,20 @@
   // The cookie value must be an index of mMouseTrackers.
   // We can use this shortcut for now.
   if (static_cast<size_t>(dwCookie) >= mMouseTrackers.Length()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::UnadviseMouseSink() FAILED due to "
             "the cookie is too large value", this));
     return E_INVALIDARG;
   }
   MouseTracker& tracker = mMouseTrackers[dwCookie];
   if (!tracker.IsUsing()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::UnadviseMouseSink() FAILED due to "
             "the found tracker uninstalled already", this));
     return E_INVALIDARG;
   }
   tracker.UnadviseSink();
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p   nsTextStore::UnadviseMouseSink(), succeeded", this));
   return S_OK;
 }
@@ -4133,7 +4133,7 @@
                            nsWindowBase* aFocusedWidget,
                            const InputContext& aContext)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF:   nsTextStore::OnFocusChange(aGotFocus=%s, "
           "aFocusedWidget=0x%p, aContext={ mIMEState={ mEnabled=%s }, "
           "mHTMLInputType=\"%s\" }), "
@@ -4171,7 +4171,7 @@
   if (!aGotFocus || !aContext.mIMEState.IsEditable()) {
     HRESULT hr = sThreadMgr->SetFocus(sDisabledDocumentMgr);
     if (NS_WARN_IF(FAILED(hr))) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
              ("TSF:   nsTextStore::OnFocusChange() FAILED due to "
               "ITfThreadMgr::SetFocus() failure"));
       return NS_ERROR_FAILURE;
@@ -4181,7 +4181,7 @@
 
   // If an editor is getting focus, create new TextStore and set focus.
   if (NS_WARN_IF(!CreateAndSetFocus(aFocusedWidget, aContext))) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF:   nsTextStore::OnFocusChange() FAILED due to "
             "ITfThreadMgr::CreateAndSetFocus() failure"));
     // If setting focus, we should destroy the TextStore completely because
@@ -4205,13 +4205,13 @@
   // So, we should set sEnabledTextStore directly.
   sEnabledTextStore = new nsTextStore();
   if (NS_WARN_IF(!sEnabledTextStore->Init(aFocusedWidget))) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF:   nsTextStore::CreateAndSetFocus() FAILED due to "
             "nsTextStore::Init() failure"));
     return false;
   }
   if (NS_WARN_IF(!sEnabledTextStore->mDocumentMgr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF:   nsTextStore::CreateAndSetFocus() FAILED due to "
             "invalid nsTextStore::mDocumentMgr"));
     return false;
@@ -4226,7 +4226,7 @@
   }
   HRESULT hr = sThreadMgr->SetFocus(sEnabledTextStore->mDocumentMgr);
   if (NS_WARN_IF(FAILED(hr))) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF:   nsTextStore::CreateAndSetFocus() FAILED due to "
             "ITfTheadMgr::SetFocus() failure"));
     return false;
@@ -4238,7 +4238,7 @@
                                   sEnabledTextStore->mDocumentMgr,
                                   getter_AddRefs(prevFocusedDocumentMgr));
   if (NS_WARN_IF(FAILED(hr))) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF:   nsTextStore::CreateAndSetFocus() FAILED due to "
             "ITfTheadMgr::AssociateFocus() failure"));
     return false;
@@ -4273,7 +4273,7 @@
 nsresult
 nsTextStore::OnTextChangeInternal(const IMENotification& aIMENotification)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::OnTextChangeInternal(aIMENotification={ "
           "mMessage=0x%08X, mTextChangeData={ mStartOffset=%lu, "
           "mOldEndOffset=%lu, mNewEndOffset=%lu}), mSink=0x%p, mSinkMask=%s, "
@@ -4296,7 +4296,7 @@
   }
 
   if (!aIMENotification.mTextChangeData.IsInInt32Range()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::OnTextChangeInternal() FAILED due to "
             "offset is too big for calling mSink->OnTextChange()...",
             this));
@@ -4307,7 +4307,7 @@
   // Especially, some of them stop working for composition in our process.
   // For preventing it, let's commit the composition.
   if (mComposition.IsComposing()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
            ("TSF: 0x%p   nsTextStore::OnTextChangeInternal(), "
             "committing the composition for avoiding making TIP confused...",
             this));
@@ -4323,7 +4323,7 @@
   textChange.acpNewEnd =
     static_cast<LONG>(aIMENotification.mTextChangeData.mNewEndOffset);
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p   nsTextStore::OnTextChangeInternal(), calling "
           "mSink->OnTextChange(0, { acpStart=%ld, acpOldEnd=%ld, "
           "acpNewEnd=%ld })...", this, textChange.acpStart,
@@ -4336,7 +4336,7 @@
 nsresult
 nsTextStore::OnSelectionChangeInternal(void)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::OnSelectionChangeInternal(), "
           "mSink=0x%p, mSinkMask=%s, mIsRecordingActionsWithoutLock=%s, "
           "mComposition.IsComposing()=%s",
@@ -4358,7 +4358,7 @@
   // Especially, some of them stop working for composition in our process.
   // For preventing it, let's commit the composition.
   if (mComposition.IsComposing()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
            ("TSF: 0x%p   nsTextStore::OnSelectionChangeInternal(), "
             "committing the composition for avoiding making TIP confused...",
             this));
@@ -4367,12 +4367,12 @@
   }
 
   if (!mIsRecordingActionsWithoutLock) {
-    PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
            ("TSF: 0x%p   nsTextStore::OnSelectionChangeInternal(), calling "
             "mSink->OnSelectionChange()...", this));
     mSink->OnSelectionChange();
   } else {
-    PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
            ("TSF: 0x%p   nsTextStore::OnSelectionChangeInternal(), pending "
             "a call of mSink->OnSelectionChange()...", this));
     mPendingOnSelectionChange = true;
@@ -4386,7 +4386,7 @@
   NS_ENSURE_TRUE(mContext, NS_ERROR_FAILURE);
   NS_ENSURE_TRUE(mSink, NS_ERROR_FAILURE);
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
          ("TSF: 0x%p   nsTextStore::OnLayoutChangeInternal(), calling "
           "mSink->OnLayoutChange()...", this));
   HRESULT hr = mSink->OnLayoutChange(TS_LC_CHANGE, TEXTSTORE_DEFAULT_VIEW);
@@ -4402,7 +4402,7 @@
     return NS_OK;
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::OnMouseButtonEventInternal("
           "aIMENotification={ mEventMessage=%s, mOffset=%u, mCursorPos={ "
           "mX=%d, mY=%d }, mCharRect={ mX=%d, mY=%d, mWidth=%d, mHeight=%d }, "
@@ -4472,14 +4472,14 @@
 void
 nsTextStore::CreateNativeCaret()
 {
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::CreateNativeCaret(), "
           "mComposition.IsComposing()=%s",
           this, GetBoolName(mComposition.IsComposing())));
 
   Selection& currentSel = CurrentSelection();
   if (currentSel.IsDirty()) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::CreateNativeCaret() FAILED due to "
             "CurrentSelection() failure", this));
     return;
@@ -4494,7 +4494,7 @@
   mWidget->InitEvent(queryCaretRect);
   mWidget->DispatchWindowEvent(&queryCaretRect);
   if (!queryCaretRect.mSucceeded) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::CreateNativeCaret() FAILED due to "
             "NS_QUERY_CARET_RECT failure (offset=%d)", this, caretOffset));
     return;
@@ -4504,7 +4504,7 @@
   mNativeCaretIsCreated = ::CreateCaret(mWidget->GetWindowHandle(), nullptr,
                                         caretRect.width, caretRect.height);
   if (!mNativeCaretIsCreated) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::CreateNativeCaret() FAILED due to "
             "CreateCaret() failure", this));
     return;
@@ -4513,7 +4513,7 @@
   nsWindow* window = static_cast<nsWindow*>(mWidget.get());
   nsWindow* toplevelWindow = window->GetTopLevelWindow(false);
   if (!toplevelWindow) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::CreateNativeCaret() FAILED due to "
             "no top level window", this));
     return;
@@ -4530,7 +4530,7 @@
 void
 nsTextStore::CommitCompositionInternal(bool aDiscard)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::CommitCompositionInternal(aDiscard=%s), "
           "mSink=0x%p, mContext=0x%p, mComposition.mView=0x%p, "
           "mComposition.mString=\"%s\"",
@@ -4546,7 +4546,7 @@
       textChange.acpStart = mComposition.mStart;
       textChange.acpOldEnd = endOffset;
       textChange.acpNewEnd = mComposition.mStart;
-      PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
              ("TSF: 0x%p   nsTextStore::CommitCompositionInternal(), calling"
               "mSink->OnTextChange(0, { acpStart=%ld, acpOldEnd=%ld, "
               "acpNewEnd=%ld })...", this, textChange.acpStart,
@@ -4563,7 +4563,7 @@
       context->QueryInterface(IID_ITfContextOwnerCompositionServices,
                               getter_AddRefs(services));
       if (services) {
-        PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+        MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
                ("TSF: 0x%p   nsTextStore::CommitCompositionInternal(), "
                 "requesting TerminateComposition() for the context 0x%p...",
                 this, context.get()));
@@ -4597,14 +4597,14 @@
 void
 nsTextStore::SetIMEOpenState(bool aState)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: nsTextStore::SetIMEOpenState(aState=%s)", GetBoolName(aState)));
 
   nsRefPtr<ITfCompartment> comp;
   if (!GetCompartment(sThreadMgr,
                       GUID_COMPARTMENT_KEYBOARD_OPENCLOSE,
                       getter_AddRefs(comp))) {
-    PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+    MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
            ("TSF:   nsTextStore::SetIMEOpenState() FAILED due to"
             "no compartment available"));
     return;
@@ -4613,7 +4613,7 @@
   VARIANT variant;
   variant.vt = VT_I4;
   variant.lVal = aState;
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF:   nsTextStore::SetIMEOpenState(), setting "
           "0x%04X to GUID_COMPARTMENT_KEYBOARD_OPENCLOSE...",
           variant.lVal));
@@ -4645,7 +4645,7 @@
                              const InputContext& aContext,
                              const InputContextAction& aAction)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: nsTextStore::SetInputContext(aWidget=%p, "
           "aContext.mIMEState.mEnabled=%s, aAction.mFocusChange=%s), "
           "sEnabledTextStore=0x%p, ThinksHavingFocus()=%s",
@@ -4683,13 +4683,13 @@
   if (!GetCompartment(aContext,
                       GUID_COMPARTMENT_KEYBOARD_DISABLED,
                       getter_AddRefs(comp))) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: nsTextStore::MarkContextAsKeyboardDisabled() failed"
             "aContext=0x%p...", aContext));
     return;
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: nsTextStore::MarkContextAsKeyboardDisabled(), setting "
           "to disable context 0x%p...",
           aContext));
@@ -4708,13 +4708,13 @@
   if (!GetCompartment(aContext,
                       GUID_COMPARTMENT_EMPTYCONTEXT,
                       getter_AddRefs(comp))) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: nsTextStore::MarkContextAsEmpty() failed"
             "aContext=0x%p...", aContext));
     return;
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: nsTextStore::MarkContextAsEmpty(), setting "
           "to mark empty context 0x%p...", aContext));
   comp->SetValue(sClientId, &variant_int4_value1);
@@ -4728,11 +4728,11 @@
     sTextStoreLog = PR_NewLogModule("nsTextStoreWidgets");
   }
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
     ("TSF: nsTextStore::Initialize() is called..."));
 
   if (sThreadMgr) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF:   nsTextStore::Initialize() FAILED due to already initialized"));
     return;
   }
@@ -4741,7 +4741,7 @@
     Preferences::GetBool(kPrefNameForceEnableTSF, false) ||
     (IsVistaOrLater() && Preferences::GetBool(kPrefNameEnableTSF, false) &&
      !BrowserTabsRemoteAutostart());
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
     ("TSF:   nsTextStore::Initialize(), TSF is %s",
      enableTsf ? "enabled" : "disabled"));
   if (!enableTsf) {
@@ -4759,7 +4759,7 @@
                        IID_ITfInputProcessorProfiles,
                        getter_AddRefs(inputProcessorProfiles));
   if (FAILED(hr) || !inputProcessorProfiles) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF:   nsTextStore::Initialize() FAILED to create input processor "
        "profiles, hr=0x%08X", hr));
     return;
@@ -4770,7 +4770,7 @@
                           CLSCTX_INPROC_SERVER, IID_ITfThreadMgr,
                           getter_AddRefs(threadMgr));
   if (FAILED(hr) || !threadMgr) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF:   nsTextStore::Initialize() FAILED to "
        "create the thread manager, hr=0x%08X", hr));
     return;
@@ -4780,7 +4780,7 @@
   hr = threadMgr->QueryInterface(IID_ITfMessagePump,
                                  getter_AddRefs(messagePump));
   if (FAILED(hr) || !messagePump) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF:   nsTextStore::Initialize() FAILED to "
        "QI message pump from the thread manager, hr=0x%08X", hr));
     return;
@@ -4790,7 +4790,7 @@
   hr = threadMgr->QueryInterface(IID_ITfKeystrokeMgr,
                                  getter_AddRefs(keystrokeMgr));
   if (FAILED(hr) || !keystrokeMgr) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF:   nsTextStore::Initialize() FAILED to "
        "QI keystroke manager from the thread manager, hr=0x%08X", hr));
     return;
@@ -4798,7 +4798,7 @@
 
   hr = threadMgr->Activate(&sClientId);
   if (FAILED(hr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF:   nsTextStore::Initialize() FAILED to activate, hr=0x%08X", hr));
     return;
   }
@@ -4808,7 +4808,7 @@
                           CLSCTX_INPROC_SERVER, IID_ITfDisplayAttributeMgr,
                           getter_AddRefs(displayAttributeMgr));
   if (FAILED(hr) || !displayAttributeMgr) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF:   nsTextStore::Initialize() FAILED to create "
        "a display attribute manager instance, hr=0x%08X", hr));
     return;
@@ -4819,7 +4819,7 @@
                           CLSCTX_INPROC_SERVER, IID_ITfCategoryMgr,
                           getter_AddRefs(categoryMgr));
   if (FAILED(hr) || !categoryMgr) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF:   nsTextStore::Initialize() FAILED to create "
        "a category manager instance, hr=0x%08X", hr));
     return;
@@ -4828,7 +4828,7 @@
   nsRefPtr<ITfDocumentMgr> disabledDocumentMgr;
   hr = threadMgr->CreateDocumentMgr(getter_AddRefs(disabledDocumentMgr));
   if (FAILED(hr) || !disabledDocumentMgr) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF:   nsTextStore::Initialize() FAILED to create "
        "a document manager for disabled mode, hr=0x%08X", hr));
     return;
@@ -4840,7 +4840,7 @@
                                           getter_AddRefs(disabledContext),
                                           &editCookie);
   if (FAILED(hr) || !disabledContext) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF:   nsTextStore::Initialize() FAILED to create "
        "a context for disabled mode, hr=0x%08X", hr));
     return;
@@ -4849,13 +4849,13 @@
   MarkContextAsKeyboardDisabled(disabledContext);
   MarkContextAsEmpty(disabledContext);
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
     ("TSF:   nsTextStore::Initialize() is creating "
      "a TSFStaticSink instance..."));
   TSFStaticSink* staticSink = TSFStaticSink::GetInstance();
   if (!staticSink->Init(threadMgr, inputProcessorProfiles)) {
     TSFStaticSink::Shutdown();
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF:   nsTextStore::Initialize() FAILED to initialize TSFStaticSink "
        "instance"));
     return;
@@ -4887,7 +4887,7 @@
       "intl.tsf.hack.google_ja_input.do_not_return_no_layout_error_at_caret",
       true);
 
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS,
     ("TSF:   nsTextStore::Initialize(), sThreadMgr=0x%p, "
      "sClientId=0x%08X, sDisplayAttrMgr=0x%p, "
      "sCategoryMgr=0x%p, sDisabledDocumentMgr=0x%p, sDisabledContext=%p, "
@@ -4909,7 +4909,7 @@
 void
 nsTextStore::Terminate(void)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_ALWAYS, ("TSF: nsTextStore::Terminate()"));
+  MOZ_LOG(sTextStoreLog, PR_LOG_ALWAYS, ("TSF: nsTextStore::Terminate()"));
 
   TSFStaticSink::Shutdown();
 
@@ -5142,19 +5142,19 @@
 HRESULT
 nsTextStore::MouseTracker::Init(nsTextStore* aTextStore)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::MouseTracker::Init(aTextStore=0x%p), "
           "aTextStore->mMouseTrackers.Length()=%d",
           this, aTextStore->mMouseTrackers.Length()));
 
   if (&aTextStore->mMouseTrackers.LastElement() != this) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::MouseTracker::Init() FAILED due to "
             "this is not the last element of mMouseTrackers", this));
     return E_FAIL;
   }
   if (aTextStore->mMouseTrackers.Length() > kInvalidCookie) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::MouseTracker::Init() FAILED due to "
             "no new cookie available", this));
     return E_FAIL;
@@ -5170,14 +5170,14 @@
                                       ITfRangeACP* aTextRange,
                                       ITfMouseSink* aMouseSink)
 {
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::MouseTracker::AdviseSink(aTextStore=0x%p, "
           "aTextRange=0x%p, aMouseSink=0x%p), mCookie=%d, mSink=0x%p",
           this, aTextStore, aTextRange, aMouseSink, mCookie, mSink.get()));
   MOZ_ASSERT(mCookie != kInvalidCookie, "This hasn't been initalized?");
 
   if (mSink) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::MouseTracker::AdviseMouseSink() FAILED "
             "due to already being used", this));
     return E_FAIL;
@@ -5185,14 +5185,14 @@
 
   HRESULT hr = aTextRange->GetExtent(&mStart, &mLength);
   if (FAILED(hr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::MouseTracker::AdviseMouseSink() FAILED "
             "due to failure of ITfRangeACP::GetExtent()", this));
     return hr;
   }
 
   if (mStart < 0 || mLength <= 0) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::MouseTracker::AdviseMouseSink() FAILED "
             "due to odd result of ITfRangeACP::GetExtent(), "
             "mStart=%d, mLength=%d", this, mStart, mLength));
@@ -5201,7 +5201,7 @@
 
   nsAutoString textContent;
   if (NS_WARN_IF(!aTextStore->GetCurrentText(textContent))) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::MouseTracker::AdviseMouseSink() FAILED "
             "due to failure of nsTextStore::GetCurrentText()", this));
     return E_FAIL;
@@ -5209,7 +5209,7 @@
 
   if (textContent.Length() <= static_cast<uint32_t>(mStart) ||
       textContent.Length() < static_cast<uint32_t>(mStart + mLength)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF: 0x%p   nsTextStore::MouseTracker::AdviseMouseSink() FAILED "
             "due to out of range, mStart=%d, mLength=%d, "
             "textContent.Length()=%d",
@@ -5219,7 +5219,7 @@
 
   mSink = aMouseSink;
 
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::MouseTracker::AdviseMouseSink(), "
           "succeeded, mStart=%d, mLength=%d, textContent.Length()=%d",
           this, mStart, mLength, textContent.Length()));
@@ -5229,7 +5229,7 @@
 void
 nsTextStore::MouseTracker::UnadviseSink()
 {
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::MouseTracker::UnadviseSink(), "
           "mCookie=%d, mSink=0x%p, mStart=%d, mLength=%d",
           this, mCookie, mSink.get(), mStart, mLength));
@@ -5247,7 +5247,7 @@
   BOOL eaten = FALSE;
   HRESULT hr = mSink->OnMouseEvent(aEdge, aQuadrant, aButtonStatus, &eaten);
 
-  PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
+  MOZ_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: 0x%p   nsTextStore::MouseTracker::OnMouseEvent(aEdge=%d, "
           "aQuadrant=%d, aButtonStatus=0x%08X), hr=0x%08X, eaten=%s",
           this, aEdge, aQuadrant, aButtonStatus, hr, GetBoolName(!!eaten)));
@@ -5261,7 +5261,7 @@
 nsTextStore::CurrentKeyboardLayoutHasIME()
 {
   if (!sInputProcessorProfiles) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF: nsTextStore::CurrentKeyboardLayoutHasIME() FAILED due to there is "
        "no input processor profiles instance"));
     return false;
@@ -5275,7 +5275,7 @@
     // If we failed to obtain the profile manager, we cannot know if current
     // keyboard layout has IME.
     if (IsVistaOrLater()) {
-      PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+      MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
         ("TSF:   nsTextStore::CurrentKeyboardLayoutHasIME() FAILED to query "
          "ITfInputProcessorProfileMgr"));
       return false;
@@ -5292,7 +5292,7 @@
     return false; // not found or not active
   }
   if (FAILED(hr)) {
-    PR_LOG(sTextStoreLog, PR_LOG_ERROR,
+    MOZ_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF:   nsTextStore::CurrentKeyboardLayoutHasIME() FAILED to retreive "
        "active profile"));
     return false;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsWindow.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsWindow.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsWindow.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsWindow.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -75,7 +75,7 @@
 #include <unknwn.h>
 #include <psapi.h>
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prtime.h"
 #include "prprf.h"
 #include "prmem.h"
@@ -191,12 +191,6 @@
 using namespace mozilla::layers;
 using namespace mozilla::widget;
 
-namespace mozilla {
-namespace widget {
-  extern int32_t IsTouchDeviceSupportPresent();
-}
-}
-
 /**************************************************************
  **************************************************************
  **
@@ -404,6 +398,8 @@
 
   mIdleService = nullptr;
 
+  ::InitializeCriticalSection(&mPresentLock);
+
   sInstanceCount++;
 }
 
@@ -439,6 +435,7 @@
       sIsOleInitialized = FALSE;
     }
   }
+  ::DeleteCriticalSection(&mPresentLock);
 
   NS_IF_RELEASE(mNativeDragTarget);
 }
@@ -1394,7 +1391,7 @@
           ::SystemParametersInfo(SPI_GETWORKAREA, 0, &workArea, 0);
           // no annoying assertions. just mention the issue.
           if (x < 0 || x >= workArea.right || y < 0 || y >= workArea.bottom) {
-            PR_LOG(gWindowsLog, PR_LOG_ALWAYS,
+            MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS,
                    ("window moved to offscreen position\n"));
           }
         }
@@ -1807,10 +1804,10 @@
   if (mWnd) {
 #ifdef WINSTATE_DEBUG_OUTPUT
     if (mWnd == WinUtils::GetTopLevelHWND(mWnd)) {
-      PR_LOG(gWindowsLog, PR_LOG_ALWAYS,
+      MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS,
              ("*** SetFocus: [  top] raise=%d\n", aRaise));
     } else {
-      PR_LOG(gWindowsLog, PR_LOG_ALWAYS,
+      MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS,
              ("*** SetFocus: [child] raise=%d\n", aRaise));
     }
 #endif
@@ -2716,7 +2713,7 @@
     break;
   }
 
-  PR_LOG(gWindowsLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS,
          ("glass margins: left:%d top:%d right:%d bottom:%d\n",
           margins.cxLeftWidth, margins.cyTopHeight,
           margins.cxRightWidth, margins.cyBottomHeight));
@@ -3047,7 +3044,7 @@
 #ifdef DEBUG_SetIcon
   else {
     NS_LossyConvertUTF16toASCII cPath(iconPath);
-    PR_LOG(gWindowsLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS,
            ("\nIcon load error; icon=%s, rc=0x%08X\n\n", 
             cPath.get(), ::GetLastError()));
   }
@@ -3061,7 +3058,7 @@
 #ifdef DEBUG_SetIcon
   else {
     NS_LossyConvertUTF16toASCII cPath(iconPath);
-    PR_LOG(gWindowsLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS,
            ("\nSmall icon load error; icon=%s, rc=0x%08X\n\n", 
             cPath.get(), ::GetLastError()));
   }
@@ -3559,10 +3556,7 @@
 uint32_t
 nsWindow::GetMaxTouchPoints() const
 {
-  if (IsWin7OrLater() && IsTouchDeviceSupportPresent()) {
-    return GetSystemMetrics(SM_MAXIMUMTOUCHES);
-  }
-  return 0;
+  return WinUtils::GetMaxTouchPoints();
 }
 
 /**************************************************************
@@ -3778,7 +3772,7 @@
     return result;
   }
 
-  if (WinUtils::GetIsMouseFromTouch(aEventType) && mTouchWindow) {
+  if (mTouchWindow && WinUtils::GetIsMouseFromTouch(aEventType)) {
     // If mTouchWindow is true, then we must have APZ enabled and be
     // feeding it raw touch events. In that case we don't need to
     // send touch-generated mouse events to content.
@@ -3786,17 +3780,13 @@
     return result;
   }
 
-  // Checking for NS_MOUSE_MOVE prevents a largest waterfall of unused initializations.
-  if (NS_MOUSE_MOVE != aEventType
-      // Since it is unclear whether a user will use the digitizer,
-      // Postpone initialization until first PEN message will be found.
-      && nsIDOMMouseEvent::MOZ_SOURCE_PEN == aInputSource
+  // Since it is unclear whether a user will use the digitizer,
+  // Postpone initialization until first PEN message will be found.
+  if (nsIDOMMouseEvent::MOZ_SOURCE_PEN == aInputSource
       // Messages should be only at topLevel window.
       && nsWindowType::eWindowType_toplevel == mWindowType
       // Currently this scheme is used only when pointer events is enabled.
-      && gfxPrefs::PointerEventsEnabled()
-      // NS_MOUSE_EXIT_WIDGET is received, when InkCollector has been already initialized.
-      && NS_MOUSE_EXIT_WIDGET != aEventType) {
+      && gfxPrefs::PointerEventsEnabled()) {
     InkCollector::sInkCollector->SetTarget(mWnd);
   }
 
@@ -3909,7 +3899,7 @@
   event.clickCount = sLastClickCount;
 
 #ifdef NS_DEBUG_XX
-  PR_LOG(gWindowsLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS,
          ("Msg Time: %d Click Count: %d\n", curMsgTime, event.clickCount));
 #endif
 
@@ -4701,12 +4691,19 @@
       {
         // From msdn, the way around this is to disable the visible state
         // temporarily. We need the text to be set but we don't want the
-        // redraw to occur.
+        // redraw to occur. However, we need to make sure that we don't
+        // do this at the same time that a Present is happening.
+        //
+        // To do this we take mPresentLock in nsWindow::PreRender and
+        // if that lock is taken we wait before doing WM_SETTEXT
+        EnterCriticalSection(&mPresentLock);
         DWORD style = GetWindowLong(mWnd, GWL_STYLE);
         SetWindowLong(mWnd, GWL_STYLE, style & ~WS_VISIBLE);
         *aRetValue = CallWindowProcW(GetPrevWindowProc(), mWnd,
                                      msg, wParam, lParam);
         SetWindowLong(mWnd, GWL_STYLE, style);
+        LeaveCriticalSection(&mPresentLock);
+
         return true;
       }
 
@@ -5882,30 +5879,30 @@
 
 #ifdef WINSTATE_DEBUG_OUTPUT
   if (mWnd == WinUtils::GetTopLevelHWND(mWnd)) {
-    PR_LOG(gWindowsLog, PR_LOG_ALWAYS, ("*** OnWindowPosChanged: [  top] "));
+    MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, ("*** OnWindowPosChanged: [  top] "));
   } else {
-    PR_LOG(gWindowsLog, PR_LOG_ALWAYS, ("*** OnWindowPosChanged: [child] "));
+    MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, ("*** OnWindowPosChanged: [child] "));
   }
-  PR_LOG(gWindowsLog, PR_LOG_ALWAYS, ("WINDOWPOS flags:"));
+  MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, ("WINDOWPOS flags:"));
   if (wp->flags & SWP_FRAMECHANGED) {
-    PR_LOG(gWindowsLog, PR_LOG_ALWAYS, ("SWP_FRAMECHANGED "));
+    MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, ("SWP_FRAMECHANGED "));
   }
   if (wp->flags & SWP_SHOWWINDOW) {
-    PR_LOG(gWindowsLog, PR_LOG_ALWAYS, ("SWP_SHOWWINDOW "));
+    MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, ("SWP_SHOWWINDOW "));
   }
   if (wp->flags & SWP_NOSIZE) {
-    PR_LOG(gWindowsLog, PR_LOG_ALWAYS, ("SWP_NOSIZE "));
+    MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, ("SWP_NOSIZE "));
   }
   if (wp->flags & SWP_HIDEWINDOW) {
-    PR_LOG(gWindowsLog, PR_LOG_ALWAYS, ("SWP_HIDEWINDOW "));
+    MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, ("SWP_HIDEWINDOW "));
   }
   if (wp->flags & SWP_NOZORDER) {
-    PR_LOG(gWindowsLog, PR_LOG_ALWAYS, ("SWP_NOZORDER "));
+    MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, ("SWP_NOZORDER "));
   }
   if (wp->flags & SWP_NOACTIVATE) {
-    PR_LOG(gWindowsLog, PR_LOG_ALWAYS, ("SWP_NOACTIVATE "));
+    MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, ("SWP_NOACTIVATE "));
   }
-  PR_LOG(gWindowsLog, PR_LOG_ALWAYS, ("\n"));
+  MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, ("\n"));
 #endif
 
   // Handle window size mode changes
@@ -5949,19 +5946,19 @@
 #ifdef WINSTATE_DEBUG_OUTPUT
     switch (mSizeMode) {
       case nsSizeMode_Normal:
-          PR_LOG(gWindowsLog, PR_LOG_ALWAYS, 
+          MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, 
                  ("*** mSizeMode: nsSizeMode_Normal\n"));
         break;
       case nsSizeMode_Minimized:
-        PR_LOG(gWindowsLog, PR_LOG_ALWAYS, 
+        MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, 
                ("*** mSizeMode: nsSizeMode_Minimized\n"));
         break;
       case nsSizeMode_Maximized:
-          PR_LOG(gWindowsLog, PR_LOG_ALWAYS, 
+          MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, 
                  ("*** mSizeMode: nsSizeMode_Maximized\n"));
         break;
       default:
-          PR_LOG(gWindowsLog, PR_LOG_ALWAYS, ("*** mSizeMode: ??????\n"));
+          MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, ("*** mSizeMode: ??????\n"));
         break;
     };
 #endif
@@ -6045,7 +6042,7 @@
     mLastSize.height = newHeight;
 
 #ifdef WINSTATE_DEBUG_OUTPUT
-    PR_LOG(gWindowsLog, PR_LOG_ALWAYS, 
+    MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, 
            ("*** Resize window: %d x %d x %d x %d\n", wp->x, wp->y, 
             newWidth, newHeight));
 #endif
@@ -6731,7 +6728,7 @@
 nsWindow::GetToggledKeyState(uint32_t aKeyCode, bool* aLEDState)
 {
 #ifdef DEBUG_KBSTATE
-  PR_LOG(gWindowsLog, PR_LOG_ALWAYS, ("GetToggledKeyState\n"));
+  MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, ("GetToggledKeyState\n"));
 #endif 
   NS_ENSURE_ARG_POINTER(aLEDState);
   *aLEDState = (::GetKeyState(aKeyCode) & 1) != 0;
@@ -6971,13 +6968,13 @@
     if (code != gLastMsgCode) {
       if (gMSGFEvents[inx].mId == code) {
 #ifdef DEBUG
-        PR_LOG(gWindowsLog, PR_LOG_ALWAYS, 
+        MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, 
                ("MozSpecialMessageProc - code: 0x%X  - %s  hw: %p\n", 
                 code, gMSGFEvents[inx].mStr, pMsg->hwnd));
 #endif
       } else {
 #ifdef DEBUG
-        PR_LOG(gWindowsLog, PR_LOG_ALWAYS, 
+        MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, 
                ("MozSpecialMessageProc - code: 0x%X  - %d  hw: %p\n", 
                 code, gMSGFEvents[inx].mId, pMsg->hwnd));
 #endif
@@ -7063,7 +7060,7 @@
                                       nullptr, GetCurrentThreadId());
 #ifdef POPUP_ROLLUP_DEBUG_OUTPUT
     if (!sMsgFilterHook) {
-      PR_LOG(gWindowsLog, PR_LOG_ALWAYS, 
+      MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, 
              ("***** SetWindowsHookEx is NOT installed for WH_MSGFILTER!\n"));
     }
 #endif
@@ -7076,7 +7073,7 @@
                                       nullptr, GetCurrentThreadId());
 #ifdef POPUP_ROLLUP_DEBUG_OUTPUT
     if (!sCallProcHook) {
-      PR_LOG(gWindowsLog, PR_LOG_ALWAYS, 
+      MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, 
              ("***** SetWindowsHookEx is NOT installed for WH_CALLWNDPROC!\n"));
     }
 #endif
@@ -7089,7 +7086,7 @@
                                        nullptr, GetCurrentThreadId());
 #ifdef POPUP_ROLLUP_DEBUG_OUTPUT
     if (!sCallMouseHook) {
-      PR_LOG(gWindowsLog, PR_LOG_ALWAYS, 
+      MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, 
              ("***** SetWindowsHookEx is NOT installed for WH_MOUSE!\n"));
     }
 #endif
@@ -7556,6 +7553,21 @@
   }
 }
 
+bool nsWindow::PreRender(LayerManagerComposite*)
+{
+  // This can block waiting for WM_SETTEXT to finish
+  // Using PreRender is unnecessarily pessimistic because
+  // we technically only need to block during the present call
+  // not all of compositor rendering
+  EnterCriticalSection(&mPresentLock);
+  return true;
+}
+
+void nsWindow::PostRender(LayerManagerComposite*)
+{
+  LeaveCriticalSection(&mPresentLock);
+}
+
 /**************************************************************
  **************************************************************
  **
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsWindowDbg.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsWindowDbg.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsWindowDbg.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsWindowDbg.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -37,7 +37,7 @@
   }
   if (aShowAllEvents || (!aShowAllEvents && gLastEventMsg != (long)msg)) {
     if (aShowMouseMoves || (!aShowMouseMoves && msg != 0x0020 && msg != 0x0200 && msg != 0x0084)) {
-      PR_LOG(gWindowsLog, PR_LOG_ALWAYS, 
+      MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, 
              ("%6d - 0x%04X %s\n", gEventCounter++, msg, 
               gAllEvents[inx].mStr ? gAllEvents[inx].mStr : "Unknown"));
       gLastEventMsg = msg;
@@ -49,7 +49,7 @@
 void DDError(const char *msg, HRESULT hr)
 {
   /*XXX make nicer */
-  PR_LOG(gWindowsLog, PR_LOG_ERROR,
+  MOZ_LOG(gWindowsLog, PR_LOG_ERROR,
          ("direct draw error %s: 0x%08lx\n", msg, hr));
 }
 #endif
@@ -59,7 +59,7 @@
 {
    SHORT st = GetKeyState(vk);
 #ifdef DEBUG
-   PR_LOG(gWindowsLog, PR_LOG_ALWAYS, ("is_vk_down vk=%x st=%x\n",vk, st));
+   MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, ("is_vk_down vk=%x st=%x\n",vk, st));
 #endif
    return (st < 0);
 }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsWindowDbg.h firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsWindowDbg.h
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsWindowDbg.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsWindowDbg.h	2015-05-25 20:44:10.000000000 +0000
@@ -42,7 +42,7 @@
   int    mId;
 } MSGFEventMsgInfo;
 
-#define DISPLAY_NMM_PRT(_arg) PR_LOG(gWindowsLog, PR_LOG_ALWAYS, ((_arg)));
+#define DISPLAY_NMM_PRT(_arg) MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, ((_arg)));
 #else
 #define DISPLAY_NMM_PRT(_arg)
 #endif // defined(POPUP_ROLLUP_DEBUG_OUTPUT)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsWindowGfx.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsWindowGfx.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsWindowGfx.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsWindowGfx.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -47,11 +47,6 @@
 #include "nsUXThemeData.h"
 #include "nsUXThemeConstants.h"
 
-extern "C" {
-#define PIXMAN_DONT_DEFINE_STDINT
-#include "pixman.h"
-}
-
 using namespace mozilla;
 using namespace mozilla::gfx;
 using namespace mozilla::layers;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsWindowGfx.h firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsWindowGfx.h
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsWindowGfx.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsWindowGfx.h	2015-05-25 20:44:10.000000000 +0000
@@ -13,11 +13,6 @@
 #include "nsWindow.h"
 #include <imgIContainer.h>
 
-// This isn't ideal, we should figure out how to export
-// the #defines here; need this to figure out if we have
-// the DirectDraw surface or not.
-#include "cairo-features.h"
-
 class nsWindowGfx {
 public:
   enum IconSizeType {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsWindow.h firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsWindow.h
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsWindow.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsWindow.h	2015-05-25 20:44:10.000000000 +0000
@@ -451,6 +451,8 @@
   void                    ClearCachedResources();
   nsIWidgetListener*      GetPaintListener();
   static bool             IsRenderMode(gfxWindowsPlatform::RenderMode aMode);
+  virtual bool            PreRender(LayerManagerComposite*) override;
+  virtual void            PostRender(LayerManagerComposite*) override;
 
 protected:
   nsCOMPtr<nsIWidget>   mParent;
@@ -587,6 +589,8 @@
 
   static bool sNeedsToInitMouseWheelSettings;
   static void InitMouseWheelScrollData();
+
+  CRITICAL_SECTION mPresentLock;
 };
 
 /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsWinGesture.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsWinGesture.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/nsWinGesture.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/nsWinGesture.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -455,7 +455,7 @@
 #ifdef DBG_jimm
         int32_t deltaX = mPanIntermediate.x - coord.x;
         int32_t deltaY = mPanIntermediate.y - coord.y;
-        PR_LOG(gWindowsLog, PR_LOG_ALWAYS, 
+        MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, 
                ("coordX=%d coordY=%d deltaX=%d deltaY=%d x:%d y:%d\n", coord.x,
                 coord.y, deltaX, deltaY, mXAxisFeedback, mYAxisFeedback));
 #endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/WinIMEHandler.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/WinIMEHandler.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/WinIMEHandler.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/WinIMEHandler.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -180,6 +180,7 @@
         // composition window position.
         if (IsIMMActive()) {
           nsIMM32Handler::OnUpdateComposition(aWindow);
+          nsIMM32Handler::OnSelectionChange(aWindow, aIMENotification);
         }
         return rv;
       }
@@ -238,6 +239,9 @@
     case NOTIFY_IME_OF_COMPOSITION_UPDATE:
       nsIMM32Handler::OnUpdateComposition(aWindow);
       return NS_OK;
+    case NOTIFY_IME_OF_SELECTION_CHANGE:
+      nsIMM32Handler::OnSelectionChange(aWindow, aIMENotification);
+      return NS_OK;
     case NOTIFY_IME_OF_MOUSE_BUTTON_EVENT:
       return nsIMM32Handler::OnMouseButtonEvent(aWindow, aIMENotification);
 #ifdef NS_ENABLE_TSF
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/WinMouseScrollHandler.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/WinMouseScrollHandler.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/WinMouseScrollHandler.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/WinMouseScrollHandler.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -6,7 +6,7 @@
 
 #include "mozilla/DebugOnly.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "WinMouseScrollHandler.h"
 #include "nsWindow.h"
@@ -43,7 +43,7 @@
   if (::GetKeyboardState(keyboardState)) {
     for (size_t i = 0; i < ArrayLength(keyboardState); i++) {
       if (keyboardState[i]) {
-        PR_LOG(gMouseScrollLog, PR_LOG_DEBUG,
+        MOZ_LOG(gMouseScrollLog, PR_LOG_DEBUG,
           ("    Current key state: keyboardState[0x%02X]=0x%02X (%s)",
            i, keyboardState[i],
            ((keyboardState[i] & 0x81) == 0x81) ? "Pressed and Toggled" :
@@ -52,7 +52,7 @@
       }
     }
   } else {
-    PR_LOG(gMouseScrollLog, PR_LOG_DEBUG,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_DEBUG,
       ("MouseScroll::Device::Elantech::HandleKeyMessage(): Failed to print "
        "current keyboard state"));
   }
@@ -127,14 +127,14 @@
   mIsWaitingInternalMessage(false),
   mSynthesizingEvent(nullptr)
 {
-  PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
     ("MouseScroll: Creating an instance, this=%p, sInstance=%p",
      this, sInstance));
 }
 
 MouseScrollHandler::~MouseScrollHandler()
 {
-  PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
     ("MouseScroll: Destroying an instance, this=%p, sInstance=%p",
      this, sInstance));
 
@@ -221,7 +221,7 @@
 
     case WM_KEYDOWN:
     case WM_KEYUP:
-      PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+      MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
         ("MouseScroll::ProcessMessage(): aWidget=%p, "
          "msg=%s(0x%04X), wParam=0x%02X, ::GetMessageTime()=%d",
          aWidget, msg == WM_KEYDOWN ? "WM_KEYDOWN" :
@@ -360,7 +360,7 @@
   POINT point;
   if (Device::SetPoint::IsGetMessagePosResponseValid(aMessage,
                                                      aWParam, aLParam)) {
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::ComputeMessagePos: Using ::GetCursorPos()"));
     ::GetCursorPos(&point);
   } else {
@@ -384,7 +384,7 @@
 
   POINT point = ComputeMessagePos(aMessage, aWParam, aLParam);
 
-  PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
     ("MouseScroll::ProcessNativeMouseWheelMessage: aWidget=%p, "
      "aMessage=%s, wParam=0x%08X, lParam=0x%08X, point: { x=%d, y=%d }",
      aWidget, aMessage == WM_MOUSEWHEEL ? "WM_MOUSEWHEEL" :
@@ -395,7 +395,7 @@
 
   HWND underCursorWnd = ::WindowFromPoint(point);
   if (!underCursorWnd) {
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::ProcessNativeMouseWheelMessage: "
        "No window is not found under the cursor"));
     return;
@@ -409,7 +409,7 @@
     // be beneath the cursor if that window wasn't there.
     underCursorWnd = WinUtils::FindOurWindowAtPoint(point);
     if (!underCursorWnd) {
-      PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+      MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
         ("MouseScroll::ProcessNativeMouseWheelMessage: "
          "Our window is not found under the Elantech helper window"));
       return;
@@ -422,7 +422,7 @@
   if (WinUtils::IsOurProcessWindow(underCursorWnd)) {
     nsWindowBase* destWindow = WinUtils::GetNSWindowBasePtr(underCursorWnd);
     if (!destWindow) {
-      PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+      MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
         ("MouseScroll::ProcessNativeMouseWheelMessage: "
          "Found window under the cursor isn't managed by nsWindow..."));
       HWND wnd = ::GetParent(underCursorWnd);
@@ -433,7 +433,7 @@
         }
       }
       if (!wnd) {
-        PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
           ("MouseScroll::ProcessNativeMouseWheelMessage: Our window which is "
            "managed by nsWindow is not found under the cursor"));
         return;
@@ -450,13 +450,13 @@
     if (destWindow->IsPlugin()) {
       destWindow = destWindow->GetParentWindowBase(false);
       if (!destWindow) {
-        PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+        MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
           ("MouseScroll::ProcessNativeMouseWheelMessage: "
            "Our window which is a parent of a plugin window is not found"));
         return;
       }
     }
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::ProcessNativeMouseWheelMessage: Succeeded, "
        "Posting internal message to an nsWindow (%p)...",
        destWindow));
@@ -475,7 +475,7 @@
     // If there is no plugin window in ancestors of the window under cursor,
     // the window is for another applications (case 2).
     // We don't need to handle this message.
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::ProcessNativeMouseWheelMessage: "
        "Our window is not found under the cursor"));
     return;
@@ -490,12 +490,12 @@
       aWidget->GetWindowHandle() == pluginWnd) {
     nsWindowBase* destWindow = aWidget->GetParentWindowBase(false);
     if (!destWindow) {
-      PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+      MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
         ("MouseScroll::ProcessNativeMouseWheelMessage: Our normal window which "
          "is a parent of this plugin window is not found"));
       return;
     }
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::ProcessNativeMouseWheelMessage: Succeeded, "
        "Posting internal message to an nsWindow (%p) which is parent of this "
        "plugin window...",
@@ -508,7 +508,7 @@
   }
 
   // If the window is a part of plugin, we should post the message to it.
-  PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
     ("MouseScroll::ProcessNativeMouseWheelMessage: Succeeded, "
      "Redirecting the message to a window which is a plugin child window"));
   ::PostMessage(underCursorWnd, aMessage, aWParam, aLParam);
@@ -534,7 +534,7 @@
                                               aWParam, aLParam);
   }
 
-  PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
     ("MouseScroll::ProcessNativeScrollMessage: aWidget=%p, "
      "aMessage=%s, wParam=0x%08X, lParam=0x%08X",
      aWidget, aMessage == WM_VSCROLL ? "WM_VSCROLL" : "WM_HSCROLL",
@@ -597,7 +597,7 @@
     "HandleMouseWheelMessage must be called with "
     "MOZ_WM_MOUSEVWHEEL or MOZ_WM_MOUSEHWHEEL");
 
-  PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
     ("MouseScroll::HandleMouseWheelMessage: aWidget=%p, "
      "aMessage=MOZ_WM_MOUSE%sWHEEL, aWParam=0x%08X, aLParam=0x%08X",
      aWidget, aMessage == MOZ_WM_MOUSEVWHEEL ? "V" : "H",
@@ -608,7 +608,7 @@
   EventInfo eventInfo(aWidget, WinUtils::GetNativeMessage(aMessage),
                       aWParam, aLParam);
   if (!eventInfo.CanDispatchWheelEvent()) {
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::HandleMouseWheelMessage: Cannot dispatch the events"));
     mLastEventInfo.ResetTransaction();
     return;
@@ -630,12 +630,12 @@
 
   WidgetWheelEvent wheelEvent(true, NS_WHEEL_WHEEL, aWidget);
   if (mLastEventInfo.InitWheelEvent(aWidget, wheelEvent, modKeyState)) {
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::HandleMouseWheelMessage: dispatching "
        "NS_WHEEL_WHEEL event"));
     aWidget->DispatchWheelEvent(&wheelEvent);
     if (aWidget->Destroyed()) {
-      PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+      MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
         ("MouseScroll::HandleMouseWheelMessage: The window was destroyed "
          "by NS_WHEEL_WHEEL event"));
       mLastEventInfo.ResetTransaction();
@@ -643,7 +643,7 @@
     }
   }
   else {
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::HandleMouseWheelMessage: NS_WHEEL_WHEEL event is not "
        "dispatched"));
   }
@@ -698,7 +698,7 @@
   //     the original message was received.
   InitEvent(aWidget, wheelEvent);
 
-  PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
     ("MouseScroll::HandleScrollMessageAsMouseWheelMessage: aWidget=%p, "
      "aMessage=MOZ_WM_%sSCROLL, aWParam=0x%08X, aLParam=0x%08X, "
      "wheelEvent { refPoint: { x: %d, y: %d }, deltaX: %f, deltaY: %f, "
@@ -791,7 +791,7 @@
     return;
   }
 
-  PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
     ("MouseScroll::LastEventInfo::ResetTransaction()"));
 
   mWnd = nullptr;
@@ -853,7 +853,7 @@
   mAccumulatedDelta -=
     lineOrPageDelta * orienter * RoundDelta(nativeDeltaPerUnit);
 
-  PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
     ("MouseScroll::LastEventInfo::InitWheelEvent: aWidget=%p, "
      "aWheelEvent { refPoint: { x: %d, y: %d }, deltaX: %f, deltaY: %f, "
      "lineOrPageDeltaX: %d, lineOrPageDeltaY: %d, "
@@ -891,20 +891,20 @@
   mScrollLines = userPrefs.GetOverriddenVerticalScrollAmout();
   if (mScrollLines >= 0) {
     // overridden by the pref.
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::SystemSettings::Init(): mScrollLines is overridden by "
        "the pref: %d",
        mScrollLines));
   } else if (!::SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0,
                                      &mScrollLines, 0)) {
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::SystemSettings::Init(): ::SystemParametersInfo("
          "SPI_GETWHEELSCROLLLINES) failed"));
     mScrollLines = 3;
   }
 
   if (mScrollLines > WHEEL_DELTA) {
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::SystemSettings::Init(): the result of "
          "::SystemParametersInfo(SPI_GETWHEELSCROLLLINES) is too large: %d",
        mScrollLines));
@@ -920,13 +920,13 @@
   mScrollChars = userPrefs.GetOverriddenHorizontalScrollAmout();
   if (mScrollChars >= 0) {
     // overridden by the pref.
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::SystemSettings::Init(): mScrollChars is overridden by "
        "the pref: %d",
        mScrollChars));
   } else if (!::SystemParametersInfo(SPI_GETWHEELSCROLLCHARS, 0,
                                      &mScrollChars, 0)) {
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::SystemSettings::Init(): ::SystemParametersInfo("
          "SPI_GETWHEELSCROLLCHARS) failed, %s",
        IsVistaOrLater() ?
@@ -936,7 +936,7 @@
   }
 
   if (mScrollChars > WHEEL_DELTA) {
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::SystemSettings::Init(): the result of "
          "::SystemParametersInfo(SPI_GETWHEELSCROLLCHARS) is too large: %d",
        mScrollChars));
@@ -944,7 +944,7 @@
     mScrollChars = WHEEL_PAGESCROLL;
   }
 
-  PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
     ("MouseScroll::SystemSettings::Init(): initialized, "
        "mScrollLines=%d, mScrollChars=%d",
      mScrollLines, mScrollChars));
@@ -953,7 +953,7 @@
 void
 MouseScrollHandler::SystemSettings::MarkDirty()
 {
-  PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
     ("MouseScrollHandler::SystemSettings::MarkDirty(): "
        "Marking SystemSettings dirty"));
   mInitialized = false;
@@ -1007,7 +1007,7 @@
     Preferences::GetInt("mousewheel.windows.transaction.timeout",
                         DEFAULT_TIMEOUT_DURATION);
 
-  PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
     ("MouseScroll::UserPrefs::Init(): initialized, "
        "mScrollMessageHandledAsWheelMessage=%s, "
        "mOverriddenVerticalScrollAmount=%d, "
@@ -1021,7 +1021,7 @@
 void
 MouseScrollHandler::UserPrefs::MarkDirty()
 {
-  PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
     ("MouseScrollHandler::UserPrefs::MarkDirty(): Marking UserPrefs dirty"));
   mInitialized = false;
   // Some prefs might override system settings, so, we should mark them dirty.
@@ -1045,21 +1045,21 @@
                                               bool aValueIfAutomatic)
 {
   if (!aPrefName) {
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::Device::GetWorkaroundPref(): Failed, aPrefName is NULL"));
     return aValueIfAutomatic;
   }
 
   int32_t lHackValue = 0;
   if (NS_FAILED(Preferences::GetInt(aPrefName, &lHackValue))) {
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::Device::GetWorkaroundPref(): Preferences::GetInt() failed,"
        " aPrefName=\"%s\", aValueIfAutomatic=%s",
        aPrefName, GetBoolName(aValueIfAutomatic)));
     return aValueIfAutomatic;
   }
 
-  PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
     ("MouseScroll::Device::GetWorkaroundPref(): Succeeded, "
      "aPrefName=\"%s\", aValueIfAutomatic=%s, lHackValue=%d",
      aPrefName, GetBoolName(aValueIfAutomatic), lHackValue));
@@ -1083,7 +1083,7 @@
                       (TrackPoint::IsDriverInstalled() ||
                        UltraNav::IsObsoleteDriverInstalled()));
 
-  PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
     ("MouseScroll::Device::Init(): sFakeScrollableWindowNeeded=%s",
      GetBoolName(sFakeScrollableWindowNeeded)));
 
@@ -1107,7 +1107,7 @@
   sUseSwipeHack = needsHack && version <= 7;
   sUsePinchHack = needsHack && version <= 8;
 
-  PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
     ("MouseScroll::Device::Elantech::Init(): version=%d, sUseSwipeHack=%s, "
      "sUsePinchHack=%s",
      version, GetBoolName(sUseSwipeHack), GetBoolName(sUsePinchHack)));
@@ -1211,7 +1211,7 @@
       (aWParam == VK_NEXT || aWParam == VK_PRIOR) &&
       (IS_VK_DOWN(0xFF) || IS_VK_DOWN(0xCC))) {
     if (aMsg == WM_KEYDOWN) {
-      PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+      MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
         ("MouseScroll::Device::Elantech::HandleKeyMessage(): Dispatching "
          "%s command event",
          aWParam == VK_NEXT ? "Forward" : "Back"));
@@ -1222,7 +1222,7 @@
       aWidget->DispatchWindowEvent(&commandEvent);
     }
     else {
-      PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+      MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
         ("MouseScroll::Device::Elantech::HandleKeyMessage(): Consumed"));
     }
     return true; // consume the message (doesn't need to dispatch key events)
@@ -1250,7 +1250,7 @@
     // that are more easily comparable.
     sZoomUntil = ::GetTickCount() & 0x7FFFFFFF;
 
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::Device::Elantech::HandleKeyMessage(): sZoomUntil=%d",
        sZoomUntil));
   }
@@ -1281,7 +1281,7 @@
       (sZoomUntil < DWORD(msgTime))) {
     sZoomUntil = 0;
 
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::Device::Elantech::UpdateZoomUntil(): "
        "sZoomUntil was reset"));
   }
@@ -1309,7 +1309,7 @@
 {
   if (WinUtils::HasRegistryKey(HKEY_CURRENT_USER,
                                L"Software\\Lenovo\\TrackPoint")) {
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::Device::TrackPoint::IsDriverInstalled(): "
        "Lenovo's TrackPoint driver is found"));
     return true;
@@ -1317,7 +1317,7 @@
 
   if (WinUtils::HasRegistryKey(HKEY_CURRENT_USER,
                                L"Software\\Alps\\Apoint\\TrackPoint")) {
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::Device::TrackPoint::IsDriverInstalled(): "
        "Alps's TrackPoint driver is found"));
   }
@@ -1337,7 +1337,7 @@
 {
   if (WinUtils::HasRegistryKey(HKEY_CURRENT_USER,
                                L"Software\\Lenovo\\UltraNav")) {
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::Device::UltraNav::IsObsoleteDriverInstalled(): "
        "Lenovo's UltraNav driver is found"));
     return true;
@@ -1346,13 +1346,13 @@
   bool installed = false;
   if (WinUtils::HasRegistryKey(HKEY_CURRENT_USER,
         L"Software\\Synaptics\\SynTPEnh\\UltraNavUSB")) {
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::Device::UltraNav::IsObsoleteDriverInstalled(): "
        "Synaptics's UltraNav (USB) driver is found"));
     installed = true;
   } else if (WinUtils::HasRegistryKey(HKEY_CURRENT_USER,
                L"Software\\Synaptics\\SynTPEnh\\UltraNavPS2")) {
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::Device::UltraNav::IsObsoleteDriverInstalled(): "
        "Synaptics's UltraNav (PS/2) driver is found"));
     installed = true;
@@ -1369,7 +1369,7 @@
                              L"DriverVersion",
                              buf, sizeof buf);
   if (!foundKey) {
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::Device::UltraNav::IsObsoleteDriverInstalled(): "
        "Failed to get UltraNav driver version"));
     return false;
@@ -1381,7 +1381,7 @@
   if (p) {
     minorVersion = wcstol(p + 1, nullptr, 10);
   }
-  PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
     ("MouseScroll::Device::UltraNav::IsObsoleteDriverInstalled(): "
      "found driver version = %d.%d",
      majorVersion, minorVersion));
@@ -1421,14 +1421,14 @@
   if (!sMightBeUsing && !aLParam && aLParam != messagePos &&
       ::InSendMessage()) {
     sMightBeUsing = true;
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::Device::SetPoint::IsGetMessagePosResponseValid(): "
        "Might using SetPoint"));
   } else if (sMightBeUsing && aLParam != 0 && ::InSendMessage()) {
     // The user has changed the mouse from Logitech's to another one (e.g.,
     // the user has changed to the touchpad of the notebook.
     sMightBeUsing = false;
-    PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+    MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
       ("MouseScroll::Device::SetPoint::IsGetMessagePosResponseValid(): "
        "Might stop using SetPoint"));
   }
@@ -1459,7 +1459,7 @@
                                                   LPARAM aLParam,
                                                   const BYTE (&aKeyStates)[256])
 {
-  PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
     ("MouseScrollHandler::SynthesizingEvent::Synthesize(): aCursorPoint: { "
      "x: %d, y: %d }, aWnd=0x%X, aMessage=0x%04X, aWParam=0x%08X, "
      "aLParam=0x%08X, IsSynthesized()=%s, mStatus=%s",
@@ -1515,7 +1515,7 @@
     // Otherwise, the message may not be sent by us.
   }
 
-  PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
     ("MouseScrollHandler::SynthesizingEvent::NativeMessageReceived(): "
      "aWidget=%p, aWidget->GetWindowHandle()=0x%X, mWnd=0x%X, "
      "aMessage=0x%04X, aWParam=0x%08X, aLParam=0x%08X, mStatus=%s",
@@ -1535,7 +1535,7 @@
     return;
   }
 
-  PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
     ("MouseScrollHandler::SynthesizingEvent::"
      "NotifyNativeMessageHandlingFinished(): IsWaitingInternalMessage=%s",
      GetBoolName(MouseScrollHandler::IsWaitingInternalMessage())));
@@ -1558,7 +1558,7 @@
     return;
   }
 
-  PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
     ("MouseScrollHandler::SynthesizingEvent::"
      "NotifyInternalMessageHandlingFinished()"));
 
@@ -1572,7 +1572,7 @@
     return;
   }
 
-  PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
+  MOZ_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
     ("MouseScrollHandler::SynthesizingEvent::Finish()"));
 
   // Restore the original key state.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/WinUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/WinUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/WinUtils.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/WinUtils.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -20,7 +20,7 @@
 #include "nsIContentPolicy.h"
 #include "nsContentUtils.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "nsString.h"
 #include "nsDirectoryServiceUtils.h"
@@ -40,6 +40,7 @@
 #include "nsIThread.h"
 #include "MainThreadUtils.h"
 #include "gfxColor.h"
+#include "nsLookAndFeel.h"
 
 #ifdef NS_ENABLE_TSF
 #include <textstor.h>
@@ -483,7 +484,7 @@
       printf("%s\n", utf8);
       NS_ASSERTION(gWindowsLog, "Called WinUtils Log() but Widget "
                                    "log module doesn't exist!");
-      PR_LOG(gWindowsLog, PR_LOG_ALWAYS, (utf8));
+      MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, (utf8));
     }
     delete[] utf8;
   }
@@ -517,7 +518,7 @@
 
   NS_ASSERTION(gWindowsLog, "Called WinUtils Log() but Widget "
                                "log module doesn't exist!");
-  PR_LOG(gWindowsLog, PR_LOG_ALWAYS, (buffer));
+  MOZ_LOG(gWindowsLog, PR_LOG_ALWAYS, (buffer));
   delete[] buffer;
 }
 
@@ -1670,5 +1671,25 @@
   return false;
 }
 
+// This is in use here and in dom/events/TouchEvent.cpp
+/* static */
+uint32_t
+WinUtils::IsTouchDeviceSupportPresent()
+{
+  int32_t touchCapabilities = ::GetSystemMetrics(SM_DIGITIZER);
+  return (touchCapabilities & NID_READY) &&
+         (touchCapabilities & (NID_EXTERNAL_TOUCH | NID_INTEGRATED_TOUCH));
+}
+
+/* static */
+uint32_t
+WinUtils::GetMaxTouchPoints()
+{
+  if (IsWin7OrLater() && IsTouchDeviceSupportPresent()) {
+    return GetSystemMetrics(SM_MAXIMUMTOUCHES);
+  }
+  return 0;
+}
+
 } // namespace widget
 } // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/WinUtils.h firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/WinUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/windows/WinUtils.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/windows/WinUtils.h	2015-05-25 20:44:10.000000000 +0000
@@ -123,7 +123,8 @@
 };
 #endif
 
-class WinUtils {
+class WinUtils
+{
 public:
   /**
    * Functions to convert between logical pixels as used by most Windows APIs
@@ -370,7 +371,22 @@
   static void SetupKeyModifiersSequence(nsTArray<KeyPair>* aArray,
                                         uint32_t aModifiers);
 
-  // dwmapi.dll function typedefs and declarations
+  /**
+  * Does device have touch support
+  */
+  static uint32_t IsTouchDeviceSupportPresent();
+
+  /**
+  * The maximum number of simultaneous touch contacts supported by the device.
+  * In the case of devices with multiple digitizers (e.g. multiple touch screens),
+  * the value will be the maximum of the set of maximum supported contacts by
+  * each individual digitizer.
+  */
+  static uint32_t GetMaxTouchPoints();
+
+  /**
+  * dwmapi.dll function typedefs and declarations
+  */
   typedef HRESULT (WINAPI*DwmExtendFrameIntoClientAreaProc)(HWND hWnd, const MARGINS *pMarInset);
   typedef HRESULT (WINAPI*DwmIsCompositionEnabledProc)(BOOL *pfEnabled);
   typedef HRESULT (WINAPI*DwmSetIconicThumbnailProc)(HWND hWnd, HBITMAP hBitmap, DWORD dwSITFlags);
@@ -515,8 +531,6 @@
   static int32_t GetICOCacheSecondsTimeout();
 };
 
-
-
 } // namespace widget
 } // namespace mozilla
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/widget/xremoteclient/XRemoteClient.cpp firefox-trunk-41.0~a1~hg20150524r245419/widget/xremoteclient/XRemoteClient.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/widget/xremoteclient/XRemoteClient.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/widget/xremoteclient/XRemoteClient.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -12,7 +12,7 @@
 #include "prprf.h"
 #include "plstr.h"
 #include "prsystem.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prenv.h"
 #include "prdtoa.h"
 #include <stdlib.h>
@@ -66,12 +66,12 @@
   mLockData = 0;
   if (!sRemoteLm)
     sRemoteLm = PR_NewLogModule("XRemoteClient");
-  PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("XRemoteClient::XRemoteClient"));
+  MOZ_LOG(sRemoteLm, PR_LOG_DEBUG, ("XRemoteClient::XRemoteClient"));
 }
 
 XRemoteClient::~XRemoteClient()
 {
-  PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("XRemoteClient::~XRemoteClient"));
+  MOZ_LOG(sRemoteLm, PR_LOG_DEBUG, ("XRemoteClient::~XRemoteClient"));
   if (mInitialized)
     Shutdown();
 }
@@ -92,7 +92,7 @@
 nsresult
 XRemoteClient::Init()
 {
-  PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("XRemoteClient::Init"));
+  MOZ_LOG(sRemoteLm, PR_LOG_DEBUG, ("XRemoteClient::Init"));
 
   if (mInitialized)
     return NS_OK;
@@ -124,7 +124,7 @@
 void
 XRemoteClient::Shutdown (void)
 {
-  PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("XRemoteClient::Shutdown"));
+  MOZ_LOG(sRemoteLm, PR_LOG_DEBUG, ("XRemoteClient::Shutdown"));
 
   if (!mInitialized)
     return;
@@ -158,7 +158,7 @@
                                 const char* aDesktopStartupID,
                                 char **aResponse, bool *aWindowFound)
 {
-  PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("XRemoteClient::SendCommandLine"));
+  MOZ_LOG(sRemoteLm, PR_LOG_DEBUG, ("XRemoteClient::SendCommandLine"));
 
   *aWindowFound = false;
 
@@ -203,7 +203,7 @@
 
   XSetErrorHandler(sOldHandler);
 
-  PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("SendCommandInternal returning 0x%x\n", rv));
+  MOZ_LOG(sRemoteLm, PR_LOG_DEBUG, ("SendCommandInternal returning 0x%x\n", rv));
 
   return rv;
 }
@@ -348,7 +348,7 @@
       /* We tried to grab the lock this time, and failed because someone
 	 else is holding it already.  So, wait for a PropertyDelete event
 	 to come in, and try again. */
-      PR_LOG(sRemoteLm, PR_LOG_DEBUG, 
+      MOZ_LOG(sRemoteLm, PR_LOG_DEBUG, 
 	     ("window 0x%x is locked by %s; waiting...\n",
 	      (unsigned int) aWindow, data));
       waited = True;
@@ -367,11 +367,11 @@
 			       &select_set, nullptr, nullptr, &delay);
 	// did we time out?
 	if (select_retval == 0) {
-	  PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("timed out waiting for window\n"));
+	  MOZ_LOG(sRemoteLm, PR_LOG_DEBUG, ("timed out waiting for window\n"));
           rv = NS_ERROR_FAILURE;
           break;
 	}
-	PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("xevent...\n"));
+	MOZ_LOG(sRemoteLm, PR_LOG_DEBUG, ("xevent...\n"));
 	XNextEvent (mDisplay, &event);
 	if (event.xany.type == DestroyNotify &&
 	    event.xdestroywindow.window == aWindow) {
@@ -385,7 +385,7 @@
 		 event.xproperty.atom == mMozLockAtom) {
 	  /* Ok!  Someone deleted their lock, so now we can try
 	     again. */
-	  PR_LOG(sRemoteLm, PR_LOG_DEBUG,
+	  MOZ_LOG(sRemoteLm, PR_LOG_DEBUG,
 		 ("(0x%x unlocked, trying again...)\n",
 		  (unsigned int) aWindow));
 		  break;
@@ -397,9 +397,9 @@
   } while (!locked && !NS_FAILED(rv));
 
   if (waited && locked) {
-    PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("obtained lock.\n"));
+    MOZ_LOG(sRemoteLm, PR_LOG_DEBUG, ("obtained lock.\n"));
   } else if (*aDestroyed) {
-    PR_LOG(sRemoteLm, PR_LOG_DEBUG,
+    MOZ_LOG(sRemoteLm, PR_LOG_DEBUG,
            ("window 0x%x unexpectedly destroyed.\n",
             (unsigned int) aWindow));
   }
@@ -419,13 +419,13 @@
   // Get a list of the children of the root window, walk the list
   // looking for the best window that fits the criteria.
   if (!XQueryTree(mDisplay, root, &root2, &parent, &kids, &nkids)) {
-    PR_LOG(sRemoteLm, PR_LOG_DEBUG,
+    MOZ_LOG(sRemoteLm, PR_LOG_DEBUG,
            ("XQueryTree failed in XRemoteClient::FindBestWindow"));
     return 0;
   }
 
   if (!(kids && nkids)) {
-    PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("root window has no children"));
+    MOZ_LOG(sRemoteLm, PR_LOG_DEBUG, ("root window has no children"));
     return 0;
   }
 
@@ -574,20 +574,20 @@
                               &nitems, &bytes_after,
                               &data);
   if (result != Success) {
-      PR_LOG(sRemoteLm, PR_LOG_DEBUG,
+      MOZ_LOG(sRemoteLm, PR_LOG_DEBUG,
              ("unable to read and delete " MOZILLA_LOCK_PROP
               " property\n"));
       return NS_ERROR_FAILURE;
   }
   else if (!data || !*data){
-      PR_LOG(sRemoteLm, PR_LOG_DEBUG,
+      MOZ_LOG(sRemoteLm, PR_LOG_DEBUG,
              ("invalid data on " MOZILLA_LOCK_PROP
               " of window 0x%x.\n",
               (unsigned int) aWindow));
       return NS_ERROR_FAILURE;
   }
   else if (strcmp((char *)data, mLockData)) {
-      PR_LOG(sRemoteLm, PR_LOG_DEBUG,
+      MOZ_LOG(sRemoteLm, PR_LOG_DEBUG,
              (MOZILLA_LOCK_PROP " was stolen!  Expected \"%s\", saw \"%s\"!\n",
               mLockData, data));
       return NS_ERROR_FAILURE;
@@ -697,7 +697,7 @@
     if (event.xany.type == DestroyNotify &&
         event.xdestroywindow.window == aWindow) {
       /* Print to warn user...*/
-      PR_LOG(sRemoteLm, PR_LOG_DEBUG,
+      MOZ_LOG(sRemoteLm, PR_LOG_DEBUG,
              ("window 0x%x was destroyed.\n",
               (unsigned int) aWindow));
       *aResponse = strdup("Window was destroyed while reading response.");
@@ -721,7 +721,7 @@
                                    &nitems, &bytes_after,
                                    &data);
       if (result != Success) {
-        PR_LOG(sRemoteLm, PR_LOG_DEBUG,
+        MOZ_LOG(sRemoteLm, PR_LOG_DEBUG,
                ("failed reading " MOZILLA_RESPONSE_PROP
                 " from window 0x%0x.\n",
                 (unsigned int) aWindow));
@@ -729,7 +729,7 @@
         done = true;
       }
       else if (!data || strlen((char *) data) < 5) {
-        PR_LOG(sRemoteLm, PR_LOG_DEBUG,
+        MOZ_LOG(sRemoteLm, PR_LOG_DEBUG,
                ("invalid data on " MOZILLA_RESPONSE_PROP
                 " property of window 0x%0x.\n",
                 (unsigned int) aWindow));
@@ -737,7 +737,7 @@
         done = true;
       }
       else if (*data == '1') {  /* positive preliminary reply */
-        PR_LOG(sRemoteLm, PR_LOG_DEBUG,  ("%s\n", data + 4));
+        MOZ_LOG(sRemoteLm, PR_LOG_DEBUG,  ("%s\n", data + 4));
         /* keep going */
         done = false;
       }
@@ -749,14 +749,14 @@
       }
 
       else if (*data == '2') {  /* positive completion */
-        PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("%s\n", data + 4));
+        MOZ_LOG(sRemoteLm, PR_LOG_DEBUG, ("%s\n", data + 4));
         *aResponse = strdup((char *)data);
         accepted = true;
         done = true;
       }
 
       else if (*data == '3') {  /* positive intermediate reply */
-        PR_LOG(sRemoteLm, PR_LOG_DEBUG,
+        MOZ_LOG(sRemoteLm, PR_LOG_DEBUG,
                ("internal error: "
                 "server wants more information?  (%s)\n",
                 data));
@@ -766,13 +766,13 @@
 
       else if (*data == '4' ||  /* transient negative completion */
                *data == '5') {  /* permanent negative completion */
-        PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("%s\n", data + 4));
+        MOZ_LOG(sRemoteLm, PR_LOG_DEBUG, ("%s\n", data + 4));
         *aResponse = strdup((char *)data);
         done = true;
       }
 
       else {
-        PR_LOG(sRemoteLm, PR_LOG_DEBUG,
+        MOZ_LOG(sRemoteLm, PR_LOG_DEBUG,
                ("unrecognised " MOZILLA_RESPONSE_PROP
                 " from window 0x%x: %s\n",
                 (unsigned int) aWindow, data));
@@ -788,7 +788,7 @@
              event.xproperty.window == aWindow &&
              event.xproperty.state == PropertyDelete &&
              event.xproperty.atom == aCommandAtom) {
-      PR_LOG(sRemoteLm, PR_LOG_DEBUG,
+      MOZ_LOG(sRemoteLm, PR_LOG_DEBUG,
              ("(server 0x%x has accepted "
               MOZILLA_COMMANDLINE_PROP ".)\n",
               (unsigned int) aWindow));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/base/CycleCollectedJSRuntime.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/base/CycleCollectedJSRuntime.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/base/CycleCollectedJSRuntime.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/base/CycleCollectedJSRuntime.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -121,14 +121,14 @@
 
 static void
 TraceWeakMappingChild(JS::CallbackTracer* aTrc, void** aThingp,
-                      JSGCTraceKind aKind);
+                      JS::TraceKind aKind);
 
 struct NoteWeakMapChildrenTracer : public JS::CallbackTracer
 {
   NoteWeakMapChildrenTracer(JSRuntime* aRt,
                             nsCycleCollectionNoteRootCallback& aCb)
     : JS::CallbackTracer(aRt, TraceWeakMappingChild), mCb(aCb),
-      mTracedAny(false), mMap(nullptr), mKey(JS::GCCellPtr::NullPtr()),
+      mTracedAny(false), mMap(nullptr), mKey(nullptr),
       mKeyDelegate(nullptr)
   {
   }
@@ -141,7 +141,7 @@
 
 static void
 TraceWeakMappingChild(JS::CallbackTracer* aTrc, void** aThingp,
-                      JSGCTraceKind aKind)
+                      JS::TraceKind aKind)
 {
   MOZ_ASSERT(aTrc->hasCallback(TraceWeakMappingChild));
   NoteWeakMapChildrenTracer* tracer =
@@ -202,7 +202,7 @@
   // can cause leaks, but is preferable to ignoring the binding, which could
   // cause the cycle collector to free live objects.
   if (!AddToCCKind(aKey.kind())) {
-    aKey = JS::GCCellPtr::NullPtr();
+    aKey = nullptr;
   }
 
   JSObject* kdelegate = nullptr;
@@ -226,8 +226,7 @@
     // if we haven't already.
     if (!tracer->mChildTracer.mTracedAny &&
         aKey && JS::GCThingIsMarkedGray(aKey) && kdelegate) {
-      tracer->mCb.NoteWeakMapping(aMap, aKey, kdelegate,
-                                  JS::GCCellPtr::NullPtr());
+      tracer->mCb.NoteWeakMapping(aMap, aKey, kdelegate, nullptr);
     }
   }
 }
@@ -261,13 +260,13 @@
     // If nothing that could be held alive by this entry is marked gray, return.
     bool delegateMightNeedMarking = aKey && JS::GCThingIsMarkedGray(aKey);
     bool valueMightNeedMarking = aValue && JS::GCThingIsMarkedGray(aValue) &&
-                                 aValue.kind() != JSTRACE_STRING;
+                                 aValue.kind() != JS::TraceKind::String;
     if (!delegateMightNeedMarking && !valueMightNeedMarking) {
       return;
     }
 
     if (!AddToCCKind(aKey.kind())) {
-      aKey = JS::GCCellPtr::NullPtr();
+      aKey = nullptr;
     }
 
     if (delegateMightNeedMarking && aKey.isObject()) {
@@ -282,7 +281,7 @@
     if (aValue && JS::GCThingIsMarkedGray(aValue) &&
         (!aKey || !JS::GCThingIsMarkedGray(aKey)) &&
         (!aMap || !JS::ObjectIsMarkedGray(aMap)) &&
-        aValue.kind() != JSTRACE_SHAPE) {
+        aValue.kind() != JS::TraceKind::Shape) {
       if (JS::UnmarkGrayGCThingRecursively(aValue)) {
         tracer->mAnyMarked = true;
       }
@@ -374,7 +373,7 @@
 
 static void
 NoteJSChildTracerShim(JS::CallbackTracer* aTrc, void** aThingp,
-                      JSGCTraceKind aTraceKind);
+                      JS::TraceKind aTraceKind);
 
 struct TraversalTracer : public JS::CallbackTracer
 {
@@ -430,7 +429,7 @@
 
 static void
 NoteJSChildTracerShim(JS::CallbackTracer* aTrc, void** aThingp,
-                      JSGCTraceKind aTraceKind)
+                      JS::TraceKind aTraceKind)
 {
   JS::GCCellPtr thing(*aThingp, aTraceKind);
   NoteJSChild(aTrc, thing);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/base/CycleCollectedJSRuntime.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/base/CycleCollectedJSRuntime.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/base/CycleCollectedJSRuntime.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/base/CycleCollectedJSRuntime.h	2015-05-25 20:44:10.000000000 +0000
@@ -102,6 +102,7 @@
   {
     mForcedGC = false;
     mMergedZones = false;
+    mAnyManual = false;
     mVisitedRefCounted = 0;
     mVisitedGCed = 0;
     mFreedRefCounted = 0;
@@ -114,6 +115,7 @@
 
   bool mForcedGC;
   bool mMergedZones;
+  bool mAnyManual; // true if any slice of the CC was manually triggered, or at shutdown.
   uint32_t mVisitedRefCounted;
   uint32_t mVisitedGCed;
   uint32_t mFreedRefCounted;
@@ -206,6 +208,7 @@
   virtual void TraceNativeBlackRoots(JSTracer* aTracer) { };
   void TraceNativeGrayRoots(JSTracer* aTracer);
 
+public:
   enum DeferredFinalizeType {
     FinalizeIncrementally,
     FinalizeNow,
@@ -213,7 +216,6 @@
 
   void FinalizeDeferredThings(DeferredFinalizeType aType);
 
-public:
   // Two conditions, JSOutOfMemory and JSLargeAllocationFailure, are noted in
   // crash reports. Here are the values that can appear in the reports:
   enum class OOMState : uint32_t {
@@ -221,7 +223,7 @@
     OK,
 
     // We are currently reporting the given condition.
-    // 
+    //
     // Suppose a crash report contains "JSLargeAllocationFailure:
     // Reporting". This means we crashed while executing memory-pressure
     // observers, trying to shake loose some memory. The large allocation in
@@ -332,10 +334,10 @@
 
 void TraceScriptHolder(nsISupports* aHolder, JSTracer* aTracer);
 
-// Returns true if the JSGCTraceKind is one the cycle collector cares about.
-inline bool AddToCCKind(JSGCTraceKind aKind)
+// Returns true if the JS::TraceKind is one the cycle collector cares about.
+inline bool AddToCCKind(JS::TraceKind aKind)
 {
-  return aKind == JSTRACE_OBJECT || aKind == JSTRACE_SCRIPT;
+  return aKind == JS::TraceKind::Object || aKind == JS::TraceKind::Script;
 }
 
 } // namespace mozilla
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/base/moz.build firefox-trunk-41.0~a1~hg20150524r245419/xpcom/base/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/base/moz.build	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/base/moz.build	2015-05-25 20:44:10.000000000 +0000
@@ -9,7 +9,6 @@
     'nsIConsoleMessage.idl',
     'nsIConsoleService.idl',
     'nsICycleCollectorListener.idl',
-    'nsIDebug.idl',
     'nsIDebug2.idl',
     'nsIErrorService.idl',
     'nsIException.idl',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/base/nsCycleCollector.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/base/nsCycleCollector.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/base/nsCycleCollector.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/base/nsCycleCollector.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -1325,7 +1325,9 @@
   void CheckThreadSafety();
   void ShutdownCollect();
 
-  void FixGrayBits(bool aForceGC);
+  void FixGrayBits(bool aForceGC, TimeLog& aTimeLog);
+  bool IsIncrementalGCInProgress();
+  void FinishAnyIncrementalGCInProgress();
   bool ShouldMergeZones(ccType aCCType);
 
   void BeginCollection(ccType aCCType, nsICycleCollectorListener* aManualListener);
@@ -1396,24 +1398,6 @@
 // Utility functions
 ////////////////////////////////////////////////////////////////////////
 
-MOZ_NEVER_INLINE static void
-Fault(const char* aMsg, const void* aPtr = nullptr)
-{
-  if (aPtr) {
-    printf("Fault in cycle collector: %s (ptr: %p)\n", aMsg, aPtr);
-  } else {
-    printf("Fault in cycle collector: %s\n", aMsg);
-  }
-
-  NS_RUNTIMEABORT("cycle collector fault");
-}
-
-static void
-Fault(const char* aMsg, PtrInfo* aPi)
-{
-  Fault(aMsg, aPi->mPointer);
-}
-
 static inline void
 ToParticipant(nsISupports* aPtr, nsXPCOMCycleCollectionParticipant** aCp)
 {
@@ -2023,7 +2007,7 @@
 static bool
 ValueIsGrayCCThing(const JS::Value& value)
 {
-    return AddToCCKind(value.gcKind()) &&
+    return AddToCCKind(value.traceKind()) &&
            JS::GCThingIsMarkedGray(value.toGCCellPtr());
 }
 
@@ -2165,19 +2149,16 @@
     mJSZoneParticipant = aJSRuntime->ZoneParticipant();
   }
 
-  uint32_t flags = 0;
-  if (!flags && mListener) {
-    flags = nsCycleCollectionTraversalCallback::WANT_DEBUG_INFO;
+  if (mListener) {
+    mFlags |= nsCycleCollectionTraversalCallback::WANT_DEBUG_INFO;
     bool all = false;
     mListener->GetWantAllTraces(&all);
     if (all) {
-      flags |= nsCycleCollectionTraversalCallback::WANT_ALL_TRACES;
+      mFlags |= nsCycleCollectionTraversalCallback::WANT_ALL_TRACES;
       mWantAllTraces = true; // for nsCycleCollectionNoteRootCallback
     }
   }
 
-  mFlags |= flags;
-
   mMergeZones = mMergeZones && MOZ_LIKELY(!WantAllTraces());
 
   MOZ_ASSERT(nsCycleCollectionNoteRootCallback::WantAllTraces() ==
@@ -2256,9 +2237,7 @@
 
     if (pi->mParticipant) {
       nsresult rv = pi->mParticipant->Traverse(pi->mPointer, *this);
-      if (NS_FAILED(rv)) {
-        Fault("script pointer traversal failed", pi);
-      }
+      MOZ_RELEASE_ASSERT(!NS_FAILED(rv), "Cycle collector Traverse method failed");
     }
 
     if (mCurrNode->AtBlockEnd()) {
@@ -2314,12 +2293,9 @@
 NS_IMETHODIMP_(void)
 CCGraphBuilder::DescribeRefCountedNode(nsrefcnt aRefCount, const char* aObjName)
 {
-  if (aRefCount == 0) {
-    Fault("zero refcount", mCurrPi);
-  }
-  if (aRefCount == UINT32_MAX) {
-    Fault("overflowing refcount", mCurrPi);
-  }
+  MOZ_RELEASE_ASSERT(aRefCount != 0, "CCed refcounted object has zero refcount");
+  MOZ_RELEASE_ASSERT(aRefCount != UINT32_MAX, "CCed refcounted object has overflowing refcount");
+
   mResults.mVisitedRefCounted++;
 
   if (mListener) {
@@ -3133,12 +3109,10 @@
       continue;
     }
 
-    if (MOZ_LIKELY(pi->mInternalRefs < pi->mRefCount)) {
-      // This node will get marked black in the next pass.
-      continue;
-    }
+    MOZ_RELEASE_ASSERT(pi->mInternalRefs < pi->mRefCount,
+                       "Cycle collector found more references to an object than its refcount");
 
-    Fault("Traversed refs exceed refcount", pi);
+    // This node will get marked black in the next pass.
   }
 }
 
@@ -3404,10 +3378,7 @@
 void
 nsCycleCollector::RegisterJSRuntime(CycleCollectedJSRuntime* aJSRuntime)
 {
-  if (mJSRuntime) {
-    Fault("multiple registrations of cycle collector JS runtime", aJSRuntime);
-  }
-
+  MOZ_RELEASE_ASSERT(!mJSRuntime, "Multiple registrations of JS runtime in cycle collector");
   mJSRuntime = aJSRuntime;
 
   // We can't register as a reporter in nsCycleCollector() because that runs
@@ -3423,10 +3394,7 @@
 void
 nsCycleCollector::ForgetJSRuntime()
 {
-  if (!mJSRuntime) {
-    Fault("forgetting non-registered cycle collector JS runtime");
-  }
-
+  MOZ_RELEASE_ASSERT(mJSRuntime, "Forgetting JS runtime in cycle collector before a JS runtime was registered");
   mJSRuntime = nullptr;
 }
 
@@ -3450,9 +3418,9 @@
 {
   CheckThreadSafety();
 
-  // Re-entering ::Suspect during collection used to be a fault, but
-  // we are canonicalizing nsISupports pointers using QI, so we will
-  // see some spurious refcount traffic here.
+  // Re-entering ::Suspect during collection used to be a fatal error,
+  // but we are canonicalizing nsISupports pointers using QI, so we
+  // will see some spurious refcount traffic here.
 
   if (MOZ_UNLIKELY(mScanInProgress)) {
     return;
@@ -3484,7 +3452,7 @@
 // and also when UnmarkGray has run out of stack.  We also force GCs on shut
 // down to collect cycles involving both DOM and JS.
 void
-nsCycleCollector::FixGrayBits(bool aForceGC)
+nsCycleCollector::FixGrayBits(bool aForceGC, TimeLog& aTimeLog)
 {
   CheckThreadSafety();
 
@@ -3494,6 +3462,7 @@
 
   if (!aForceGC) {
     mJSRuntime->FixWeakMappingGrayBits();
+    aTimeLog.Checkpoint("FixWeakMappingGrayBits");
 
     bool needGC = !mJSRuntime->AreGCGrayBitsValid();
     // Only do a telemetry ping for non-shutdown CCs.
@@ -3504,10 +3473,25 @@
     mResults.mForcedGC = true;
   }
 
-  TimeLog timeLog;
   mJSRuntime->GarbageCollect(aForceGC ? JS::gcreason::SHUTDOWN_CC :
                                         JS::gcreason::CC_FORCED);
-  timeLog.Checkpoint("GC()");
+  aTimeLog.Checkpoint("FixGrayBits GC");
+}
+
+bool
+nsCycleCollector::IsIncrementalGCInProgress()
+{
+  return mJSRuntime && JS::IsIncrementalGCInProgress(mJSRuntime->Runtime());
+}
+
+void
+nsCycleCollector::FinishAnyIncrementalGCInProgress()
+{
+  if (IsIncrementalGCInProgress()) {
+    NS_WARNING("Finishing incremental GC in progress during CC");
+    JS::PrepareForIncrementalGC(mJSRuntime->Runtime());
+    JS::FinishIncrementalGC(mJSRuntime->Runtime(), JS::gcreason::CC_FORCED);
+  }
 }
 
 void
@@ -3541,6 +3525,9 @@
   timeLog.Checkpoint("CleanupAfterCollection::telemetry");
 
   if (mJSRuntime) {
+    mJSRuntime->FinalizeDeferredThings(mResults.mAnyManual
+                                       ? CycleCollectedJSRuntime::FinalizeNow
+                                       : CycleCollectedJSRuntime::FinalizeIncrementally);
     mJSRuntime->EndCycleCollectionCallback(mResults);
     timeLog.Checkpoint("CleanupAfterCollection::EndCycleCollectionCallback()");
   }
@@ -3550,6 +3537,8 @@
 void
 nsCycleCollector::ShutdownCollect()
 {
+  FinishAnyIncrementalGCInProgress();
+
   SliceBudget unlimitedBudget;
   uint32_t i;
   for (i = 0; i < DEFAULT_SHUTDOWN_COLLECTIONS; ++i) {
@@ -3583,6 +3572,8 @@
   }
   mActivelyCollecting = true;
 
+  MOZ_ASSERT(!IsIncrementalGCInProgress());
+
   bool startedIdle = (mIncrementalPhase == IdlePhase);
   bool collectedAny = false;
 
@@ -3594,6 +3585,10 @@
     timeLog.Checkpoint("Collect::FreeSnowWhite");
   }
 
+  if (aCCType != SliceCC) {
+    mResults.mAnyManual = true;
+  }
+
   ++mResults.mNumSlices;
 
   bool continueSlice = aBudget.isUnlimited() || !aPreferShorterSlices;
@@ -3768,23 +3763,37 @@
     // hijinks from ForgetSkippable and compartmental GCs.
     mListener->GetWantAllTraces(&forceGC);
   }
-  FixGrayBits(forceGC);
+
+  // BeginCycleCollectionCallback() might have started an IGC, and we need
+  // to finish it before we run FixGrayBits.
+  FinishAnyIncrementalGCInProgress();
+  timeLog.Checkpoint("Pre-FixGrayBits finish IGC");
+
+  FixGrayBits(forceGC, timeLog);
 
   FreeSnowWhite(true);
+  timeLog.Checkpoint("BeginCollection FreeSnowWhite");
 
   if (mListener && NS_FAILED(mListener->Begin())) {
     mListener = nullptr;
   }
 
+  // FreeSnowWhite could potentially have started an IGC, which we need
+  // to finish before we look at any JS roots.
+  FinishAnyIncrementalGCInProgress();
+  timeLog.Checkpoint("Post-FreeSnowWhite finish IGC");
+
   // Set up the data structures for building the graph.
   mGraph.Init();
   mResults.Init();
+  mResults.mAnyManual = (aCCType != SliceCC);
   bool mergeZones = ShouldMergeZones(aCCType);
   mResults.mMergedZones = mergeZones;
 
   MOZ_ASSERT(!mBuilder, "Forgot to clear mBuilder");
   mBuilder = new CCGraphBuilder(mGraph, mResults, mJSRuntime, mListener,
                                 mergeZones);
+  timeLog.Checkpoint("BeginCollection prepare graph builder");
 
   if (mJSRuntime) {
     mJSRuntime->TraverseRoots(*mBuilder);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/base/nsDebugImpl.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/base/nsDebugImpl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/base/nsDebugImpl.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/base/nsDebugImpl.cpp	2015-05-25 20:44:10.000000000 +0000
@@ -17,7 +17,7 @@
 #include "nsString.h"
 #include "nsXULAppAPI.h"
 #include "prprf.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsError.h"
 #include "prerror.h"
 #include "prerr.h"
@@ -105,7 +105,7 @@
 
 static Atomic<int32_t> gAssertionCount;
 
-NS_IMPL_QUERY_INTERFACE(nsDebugImpl, nsIDebug, nsIDebug2)
+NS_IMPL_QUERY_INTERFACE(nsDebugImpl, nsIDebug2)
 
 NS_IMETHODIMP_(MozExternalRefCountType)
 nsDebugImpl::AddRef()
@@ -372,7 +372,7 @@
 #  undef PrintToBuffer
 
   // Write out the message to the debug log
-  PR_LOG(gDebugLog, ll, ("%s", buf.buffer));
+  MOZ_LOG(gDebugLog, ll, ("%s", buf.buffer));
   PR_LogFlush();
 
   // errors on platforms without a debugdlg ring a bell on stderr
@@ -579,16 +579,20 @@
 #endif
 }
 
-static const nsDebugImpl kImpl;
-
 nsresult
 nsDebugImpl::Create(nsISupports* aOuter, const nsIID& aIID, void** aInstancePtr)
 {
+  static const nsDebugImpl* sImpl;
+
   if (NS_WARN_IF(aOuter)) {
     return NS_ERROR_NO_AGGREGATION;
   }
 
-  return const_cast<nsDebugImpl*>(&kImpl)->QueryInterface(aIID, aInstancePtr);
+  if (!sImpl) {
+    sImpl = new nsDebugImpl();
+  }
+
+  return const_cast<nsDebugImpl*>(sImpl)->QueryInterface(aIID, aInstancePtr);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/base/nsDebugImpl.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/base/nsDebugImpl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/base/nsDebugImpl.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/base/nsDebugImpl.h	2015-05-25 20:44:10.000000000 +0000
@@ -7,17 +7,13 @@
 #ifndef nsDebugImpl_h
 #define nsDebugImpl_h
 
-#include "nsIDebug.h"
 #include "nsIDebug2.h"
 
 class nsDebugImpl : public nsIDebug2
 {
 public:
-  nsDebugImpl()
-  {
-  }
+  nsDebugImpl() = default;
   NS_DECL_ISUPPORTS
-  NS_DECL_NSIDEBUG
   NS_DECL_NSIDEBUG2
 
   static nsresult Create(nsISupports* aOuter, const nsIID& aIID,
@@ -35,11 +31,11 @@
 
 #define NS_DEBUG_CONTRACTID "@mozilla.org/xpcom/debug;1"
 #define NS_DEBUG_CID                                 \
-{ /* a80b1fb3-aaf6-4852-b678-c27eb7a518af */         \
-  0xa80b1fb3,                                        \
-    0xaaf6,                                          \
-    0x4852,                                          \
-    {0xb6, 0x78, 0xc2, 0x7e, 0xb7, 0xa5, 0x18, 0xaf} \
+{ /* cb6cdb94-e417-4601-b4a5-f991bf41453d */         \
+  0xcb6cdb94,                                        \
+    0xe417,                                          \
+    0x4601,                                          \
+    {0xb4, 0xa5, 0xf9, 0x91, 0xbf, 0x41, 0x45, 0x3d} \
 }
 
 #endif // nsDebugImpl_h
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/base/nsIDebug2.idl firefox-trunk-41.0~a1~hg20150524r245419/xpcom/base/nsIDebug2.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/base/nsIDebug2.idl	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/base/nsIDebug2.idl	2015-05-25 20:44:10.000000000 +0000
@@ -5,10 +5,20 @@
 
 /* interface to expose information about calls to NS_DebugBreak */
 
-#include "nsIDebug.idl"
+#include "nsISupports.idl"
 
-[scriptable, uuid(6cb17fec-cdf7-4f7c-b267-37a0acaa9cf1)]
-interface nsIDebug2 : nsIDebug
+/**
+ *   For use by consumers in scripted languages (JavaScript, Java, Python,
+ *   Perl, ...).
+ *
+ *   @note C/C++ consumers who are planning to use the nsIDebug2 interface with
+ *   the "@mozilla.org/xpcom;1" contract should use NS_DebugBreak from xpcom
+ *   glue instead.
+ *
+ */
+
+[scriptable, uuid(9641dc15-10fb-42e3-a285-18be90a5c10b)]
+interface nsIDebug2 : nsISupports
 {
     /**
      * Whether XPCOM was compiled with DEBUG defined.  This often
@@ -27,4 +37,46 @@
      * Supports Windows + Mac
      */
     readonly attribute bool isDebuggerAttached;
+
+    /**
+     * Show an assertion and trigger nsIDebug2.break().
+     *
+     * @param aStr assertion message
+     * @param aExpr expression that failed
+     * @param aFile file containing assertion
+     * @param aLine line number of assertion
+     */
+    void assertion(in string aStr,
+                   in string aExpr,
+                   in string aFile, 
+                   in long aLine);
+
+    /**
+     * Show a warning.
+     *
+     * @param aStr warning message
+     * @param aFile file containing assertion
+     * @param aLine line number of assertion
+     */
+    void warning(in string aStr,
+                 in string aFile,
+                 in long aLine);
+
+    /**
+     * Request to break into a debugger.
+     *
+     * @param aFile file containing break request
+     * @param aLine line number of break request
+     */
+    void break(in string aFile, 
+               in long aLine);
+
+    /**
+     * Request the process to trigger a fatal abort.
+     *
+     * @param aFile file containing abort request
+     * @param aLine line number of abort request
+     */
+    void abort(in string aFile, 
+               in long aLine);
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/base/nsIDebug.idl firefox-trunk-41.0~a1~hg20150524r245419/xpcom/base/nsIDebug.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/base/nsIDebug.idl	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/base/nsIDebug.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-#include "nsISupports.idl"
-
-/**
- *   For use by consumers in scripted languages (JavaScript, Java, Python,
- *   Perl, ...).
- *
- * @note C/C++ consumers who are planning to use the nsIDebug interface with
- *   the "@mozilla.org/xpcom;1" contract should use NS_DebugBreak from xpcom
- *   glue instead.
- *
- */
-
-[scriptable, uuid(3bf0c3d7-3bd9-4cf2-a971-33572c503e1e)]
-interface nsIDebug : nsISupports
-{
-  /**
-   * Show an assertion and trigger nsIDebug.break().
-   *
-   * @param aStr assertion message
-   * @param aExpr expression that failed
-   * @param aFile file containing assertion
-   * @param aLine line number of assertion
-   *
-   */
-  void assertion(in string aStr,
-                 in string aExpr,
-                 in string aFile, 
-                 in long aLine);
-
-  /**
-   * Show a warning.
-   *
-   * @param aStr warning message
-   * @param aFile file containing assertion
-   * @param aLine line number of assertion
-   */
-  void warning(in string aStr,
-               in string aFile,
-               in long aLine);
-
-  /**
-   * Request to break into a debugger.
-   *
-   * @param aFile file containing break request
-   * @param aLine line number of break request
-   */
-  void break(in string aFile, 
-             in long aLine);
-
-  /**
-   * Request the process to trigger a fatal abort.
-   *
-   * @param aFile file containing abort request
-   * @param aLine line number of abort request
-   */
-  void abort(in string aFile, 
-             in long aLine);
-};
-
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/base/nsTraceRefcnt.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/base/nsTraceRefcnt.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/base/nsTraceRefcnt.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/base/nsTraceRefcnt.cpp	2015-05-25 20:44:11.000000000 +0000
@@ -1022,7 +1022,7 @@
     }
 
     if (gRefcntsLog && loggingThisType && loggingThisObject) {
-      // Can't use PR_LOG(), b/c it truncates the line
+      // Can't use MOZ_LOG(), b/c it truncates the line
       fprintf(gRefcntsLog, "\n<%s> %p %" PRIuPTR " AddRef %" PRIuPTR "\n",
               aClass, aPtr, serialno, aRefcnt);
       nsTraceRefcnt::WalkTheStackCached(gRefcntsLog);
@@ -1069,7 +1069,7 @@
 
     bool loggingThisObject = (!gObjectsToLog || LogThisObj(serialno));
     if (gRefcntsLog && loggingThisType && loggingThisObject) {
-      // Can't use PR_LOG(), b/c it truncates the line
+      // Can't use MOZ_LOG(), b/c it truncates the line
       fprintf(gRefcntsLog,
               "\n<%s> %p %" PRIuPTR " Release %" PRIuPTR "\n",
               aClass, aPtr, serialno, aRefcnt);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/build/nsXPCOM.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/build/nsXPCOM.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/build/nsXPCOM.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/build/nsXPCOM.h	2015-05-25 20:44:11.000000000 +0000
@@ -30,7 +30,7 @@
 DECL_CLASS(nsILocalFile);
 DECL_CLASS(nsIDirectoryServiceProvider);
 DECL_CLASS(nsIMemory);
-DECL_CLASS(nsIDebug);
+DECL_CLASS(nsIDebug2);
 
 #ifdef __cplusplus
 namespace mozilla {
@@ -400,6 +400,6 @@
  */
 #define NS_XPCOM_CATEGORY_CLEARED_OBSERVER_ID "xpcom-category-cleared"
 
-XPCOM_API(nsresult) NS_GetDebug(nsIDebug** aResult);
+XPCOM_API(nsresult) NS_GetDebug(nsIDebug2** aResult);
 
 #endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/build/nsXPCOMPrivate.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/build/nsXPCOMPrivate.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/build/nsXPCOMPrivate.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/build/nsXPCOMPrivate.h	2015-05-25 20:44:11.000000000 +0000
@@ -43,7 +43,7 @@
                                              bool aFollowLinks,
                                              nsIFile** aResult);
 
-typedef nsresult   (*GetDebugFunc)(nsIDebug** aResult);
+typedef nsresult   (*GetDebugFunc)(nsIDebug2** aResult);
 
 typedef nsresult   (*StringContainerInitFunc)(nsStringContainer&);
 typedef nsresult   (*StringContainerInit2Func)(nsStringContainer&,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/build/nsXULAppAPI.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/build/nsXULAppAPI.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/build/nsXULAppAPI.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/build/nsXULAppAPI.h	2015-05-25 20:44:11.000000000 +0000
@@ -11,7 +11,7 @@
 #include "xrecore.h"
 #include "nsXPCOM.h"
 #include "nsISupports.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsXREAppData.h"
 #include "js/TypeDecls.h"
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/build/perfprobe.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/build/perfprobe.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/build/perfprobe.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/build/perfprobe.cpp	2015-05-25 20:44:11.000000000 +0000
@@ -27,7 +27,7 @@
   }
   return sLog;
 }
-#define LOG(x)  PR_LOG(GetProbeLog(), PR_LOG_DEBUG, x)
+#define LOG(x)  MOZ_LOG(GetProbeLog(), PR_LOG_DEBUG, x)
 #else
 #define LOG(x)
 #endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/build/perfprobe.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/build/perfprobe.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/build/perfprobe.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/build/perfprobe.h	2015-05-25 20:44:11.000000000 +0000
@@ -18,7 +18,7 @@
 
 #include "nsError.h"
 #include "nsString.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsTArray.h"
 #include "nsAutoPtr.h"
 #include <windows.h>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/build/XPCOM.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/build/XPCOM.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/build/XPCOM.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/build/XPCOM.h	2015-05-25 20:44:11.000000000 +0000
@@ -68,7 +68,7 @@
 #include "nsIConsoleListener.h"
 #include "nsIConsoleMessage.h"
 #include "nsIConsoleService.h"
-#include "nsIDebug.h"
+#include "nsIDebug2.h"
 #include "nsIDirectoryEnumerator.h"
 #include "nsIEnvironment.h"
 #include "nsIErrorService.h"
@@ -120,7 +120,6 @@
 #include "nsIBinaryOutputStream.h"
 #include "nsIConverterInputStream.h"
 #include "nsIConverterOutputStream.h"
-#include "nsIDebug2.h"
 #include "nsIInputStreamTee.h"
 #include "nsIMultiplexInputStream.h"
 #include "nsIMutableArray.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/build/XPCOMInit.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/build/XPCOMInit.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/build/XPCOMInit.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/build/XPCOMInit.cpp	2015-05-25 20:44:11.000000000 +0000
@@ -347,12 +347,12 @@
 };
 
 // gDebug will be freed during shutdown.
-static nsIDebug* gDebug = nullptr;
+static nsIDebug2* gDebug = nullptr;
 
 EXPORT_XPCOM_API(nsresult)
-NS_GetDebug(nsIDebug** aResult)
+NS_GetDebug(nsIDebug2** aResult)
 {
-  return nsDebugImpl::Create(nullptr,  NS_GET_IID(nsIDebug), (void**)aResult);
+  return nsDebugImpl::Create(nullptr,  NS_GET_IID(nsIDebug2), (void**)aResult);
 }
 
 EXPORT_XPCOM_API(nsresult)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/components/ManifestParser.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/components/ManifestParser.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/components/ManifestParser.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/components/ManifestParser.cpp	2015-05-25 20:44:11.000000000 +0000
@@ -657,11 +657,13 @@
       continue;
     }
 
+#ifndef MOZ_BINARY_EXTENSIONS
     if (directive->apponly && NS_APP_LOCATION != aType) {
       LogMessageWithContext(aFile, line,
                             "Only application manifests may use the '%s' directive.", token);
       continue;
     }
+#endif
 
     if (directive->componentonly && NS_SKIN_LOCATION == aType) {
       LogMessageWithContext(aFile, line,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/components/nsComponentManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/components/nsComponentManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/components/nsComponentManager.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/components/nsComponentManager.cpp	2015-05-25 20:44:11.000000000 +0000
@@ -77,7 +77,7 @@
 
 #include "mozilla/Omnijar.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 using namespace mozilla;
 
@@ -459,7 +459,7 @@
   // point.  So we wait until now.
   nsCategoryManager::GetSingleton()->InitMemoryReporter();
 
-  PR_LOG(nsComponentManagerLog, PR_LOG_DEBUG,
+  MOZ_LOG(nsComponentManagerLog, PR_LOG_DEBUG,
          ("nsComponentManager: Initialized."));
 
   mStatus = NORMAL;
@@ -913,7 +913,7 @@
   mStatus = SHUTDOWN_IN_PROGRESS;
 
   // Shutdown the component manager
-  PR_LOG(nsComponentManagerLog, PR_LOG_DEBUG,
+  MOZ_LOG(nsComponentManagerLog, PR_LOG_DEBUG,
          ("nsComponentManager: Beginning Shutdown."));
 
 #if !defined(MOZILLA_XPCOMRT_API)
@@ -944,7 +944,7 @@
 
   mStatus = SHUTDOWN_COMPLETE;
 
-  PR_LOG(nsComponentManagerLog, PR_LOG_DEBUG,
+  MOZ_LOG(nsComponentManagerLog, PR_LOG_DEBUG,
          ("nsComponentManager: Shutdown complete."));
 
   return NS_OK;
@@ -952,14 +952,14 @@
 
 nsComponentManagerImpl::~nsComponentManagerImpl()
 {
-  PR_LOG(nsComponentManagerLog, PR_LOG_DEBUG,
+  MOZ_LOG(nsComponentManagerLog, PR_LOG_DEBUG,
          ("nsComponentManager: Beginning destruction."));
 
   if (SHUTDOWN_COMPLETE != mStatus) {
     Shutdown();
   }
 
-  PR_LOG(nsComponentManagerLog, PR_LOG_DEBUG,
+  MOZ_LOG(nsComponentManagerLog, PR_LOG_DEBUG,
          ("nsComponentManager: Destroyed."));
 }
 
@@ -1048,7 +1048,7 @@
 
   rv = factory->QueryInterface(aIID, aResult);
 
-  PR_LOG(nsComponentManagerLog, PR_LOG_WARNING,
+  MOZ_LOG(nsComponentManagerLog, PR_LOG_WARNING,
          ("\t\tGetClassObject() %s", NS_SUCCEEDED(rv) ? "succeeded" : "FAILED"));
 
   return rv;
@@ -1067,7 +1067,7 @@
 
   nsresult rv;
 
-  PR_LOG(nsComponentManagerLog, PR_LOG_DEBUG,
+  MOZ_LOG(nsComponentManagerLog, PR_LOG_DEBUG,
          ("nsComponentManager: GetClassObject(%s)", aContractID));
 
   nsCOMPtr<nsIFactory> factory = FindFactory(aContractID, strlen(aContractID));
@@ -1077,7 +1077,7 @@
 
   rv = factory->QueryInterface(aIID, aResult);
 
-  PR_LOG(nsComponentManagerLog, PR_LOG_WARNING,
+  MOZ_LOG(nsComponentManagerLog, PR_LOG_WARNING,
          ("\t\tGetClassObject() %s", NS_SUCCEEDED(rv) ? "succeeded" : "FAILED"));
 
   return rv;
@@ -1149,7 +1149,7 @@
 
   if (PR_LOG_TEST(nsComponentManagerLog, PR_LOG_WARNING)) {
     char* buf = aClass.ToString();
-    PR_LOG(nsComponentManagerLog, PR_LOG_WARNING,
+    MOZ_LOG(nsComponentManagerLog, PR_LOG_WARNING,
            ("nsComponentManager: CreateInstance(%s) %s", buf,
             NS_SUCCEEDED(rv) ? "succeeded" : "FAILED"));
     if (buf) {
@@ -1230,7 +1230,7 @@
     rv = NS_ERROR_FACTORY_NOT_REGISTERED;
   }
 
-  PR_LOG(nsComponentManagerLog, PR_LOG_WARNING,
+  MOZ_LOG(nsComponentManagerLog, PR_LOG_WARNING,
          ("nsComponentManager: CreateInstanceByContractID(%s) %s", aContractID,
           NS_SUCCEEDED(rv) ? "succeeded" : "FAILED"));
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/components/nsNativeModuleLoader.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/components/nsNativeModuleLoader.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/components/nsNativeModuleLoader.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/components/nsNativeModuleLoader.cpp	2015-05-25 20:44:11.000000000 +0000
@@ -17,7 +17,7 @@
 
 #include "nsNativeModuleLoader.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prinit.h"
 #include "prerror.h"
 
@@ -59,7 +59,7 @@
   return sLog;
 }
 
-#define LOG(level, args) PR_LOG(GetNativeModuleLoaderLog(), level, args)
+#define LOG(level, args) MOZ_LOG(GetNativeModuleLoaderLog(), level, args)
 
 nsresult
 nsNativeModuleLoader::Init()
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/ds/nsAtomTable.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/ds/nsAtomTable.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/ds/nsAtomTable.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/ds/nsAtomTable.cpp	2015-05-25 20:44:11.000000000 +0000
@@ -41,7 +41,7 @@
  * sure it's only manipulated from the main thread.  Probably the latter
  * is better, since the former would hurt performance.
  */
-static PLDHashTable gAtomTable;
+static PLDHashTable2* gAtomTable;
 
 class StaticAtomEntry : public PLDHashEntryHdr
 {
@@ -336,19 +336,21 @@
 NS_PurgeAtomTable()
 {
   delete gStaticAtomTable;
+  gStaticAtomTable = nullptr;
 
-  if (gAtomTable.IsInitialized()) {
+  if (gAtomTable) {
 #ifdef DEBUG
     const char* dumpAtomLeaks = PR_GetEnv("MOZ_DUMP_ATOM_LEAKS");
     if (dumpAtomLeaks && *dumpAtomLeaks) {
       uint32_t leaked = 0;
       printf("*** %d atoms still exist (including permanent):\n",
-             gAtomTable.EntryCount());
-      PL_DHashTableEnumerate(&gAtomTable, DumpAtomLeaks, &leaked);
+             gAtomTable->EntryCount());
+      PL_DHashTableEnumerate(gAtomTable, DumpAtomLeaks, &leaked);
       printf("*** %u non-permanent atoms leaked\n", leaked);
     }
 #endif
-    PL_DHashTableFinish(&gAtomTable);
+    delete gAtomTable;
+    gAtomTable = nullptr;
   }
 }
 
@@ -397,17 +399,16 @@
 
 AtomImpl::~AtomImpl()
 {
-  NS_PRECONDITION(gAtomTable.IsInitialized(), "uninitialized atom hashtable");
+  MOZ_ASSERT(gAtomTable, "uninitialized atom hashtable");
   // Permanent atoms are removed from the hashtable at shutdown, and we
   // don't want to remove them twice.  See comment above in
   // |AtomTableClearEntry|.
   if (!IsPermanentInDestructor()) {
     AtomTableKey key(mString, mLength, mHash);
-    PL_DHashTableRemove(&gAtomTable, &key);
-    if (gAtomTable.IsInitialized() && gAtomTable.EntryCount() == 0) {
-      PL_DHashTableFinish(&gAtomTable);
-      NS_ASSERTION(gAtomTable.EntryCount() == 0,
-                   "PL_DHashTableFinish changed the entry count");
+    PL_DHashTableRemove(gAtomTable, &key);
+    if (gAtomTable->EntryCount() == 0) {
+      delete gAtomTable;
+      gAtomTable = nullptr;
     }
   }
 
@@ -523,8 +524,8 @@
 NS_SizeOfAtomTablesIncludingThis(MallocSizeOf aMallocSizeOf,
                                  size_t* aMain, size_t* aStatic)
 {
-  *aMain = gAtomTable.IsInitialized()
-         ? PL_DHashTableSizeOfExcludingThis(&gAtomTable,
+  *aMain = gAtomTable
+         ? PL_DHashTableSizeOfExcludingThis(gAtomTable,
                                             SizeOfAtomTableEntryExcludingThis,
                                             aMallocSizeOf)
          : 0;
@@ -541,9 +542,9 @@
 static inline void
 EnsureTableExists()
 {
-  if (!gAtomTable.IsInitialized()) {
-    PL_DHashTableInit(&gAtomTable, &AtomTableOps,
-                      sizeof(AtomTableEntry), ATOM_HASHTABLE_INITIAL_LENGTH);
+  if (!gAtomTable) {
+    gAtomTable = new PLDHashTable2(&AtomTableOps, sizeof(AtomTableEntry),
+                                   ATOM_HASHTABLE_INITIAL_LENGTH);
   }
 }
 
@@ -554,7 +555,7 @@
   EnsureTableExists();
   AtomTableKey key(aString, aLength, aHashOut);
   // This is an infallible add.
-  return static_cast<AtomTableEntry*>(PL_DHashTableAdd(&gAtomTable, &key));
+  return static_cast<AtomTableEntry*>(PL_DHashTableAdd(gAtomTable, &key));
 }
 
 static inline AtomTableEntry*
@@ -564,7 +565,7 @@
   EnsureTableExists();
   AtomTableKey key(aString, aLength, aHashOut);
   // This is an infallible add.
-  return static_cast<AtomTableEntry*>(PL_DHashTableAdd(&gAtomTable, &key));
+  return static_cast<AtomTableEntry*>(PL_DHashTableAdd(gAtomTable, &key));
 }
 
 class CheckStaticAtomSizes
@@ -709,7 +710,8 @@
 nsrefcnt
 NS_GetNumberOfAtoms(void)
 {
-  return gAtomTable.EntryCount();
+  MOZ_ASSERT(gAtomTable);
+  return gAtomTable->EntryCount();
 }
 
 nsIAtom*
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/ds/nsExpirationTracker.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/ds/nsExpirationTracker.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/ds/nsExpirationTracker.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/ds/nsExpirationTracker.h	2015-05-25 20:44:11.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef NSEXPIRATIONTRACKER_H_
 #define NSEXPIRATIONTRACKER_H_
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsTArray.h"
 #include "nsITimer.h"
 #include "nsCOMPtr.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/ds/nsObserverService.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/ds/nsObserverService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/ds/nsObserverService.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/ds/nsObserverService.cpp	2015-05-25 20:44:11.000000000 +0000
@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsAutoPtr.h"
 #include "nsIObserverService.h"
 #include "nsIObserver.h"
@@ -36,7 +36,7 @@
   }
   return sLog;
 }
-#define LOG(x)  PR_LOG(GetObserverServiceLog(), PR_LOG_DEBUG, x)
+#define LOG(x)  MOZ_LOG(GetObserverServiceLog(), PR_LOG_DEBUG, x)
 
 namespace mozilla {
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/ds/nsPersistentProperties.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/ds/nsPersistentProperties.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/ds/nsPersistentProperties.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/ds/nsPersistentProperties.cpp	2015-05-25 20:44:11.000000000 +0000
@@ -460,19 +460,14 @@
 
 nsPersistentProperties::nsPersistentProperties()
   : mIn(nullptr)
+  , mTable(&property_HashTableOps, sizeof(PropertyTableEntry), 16)
 {
-  PL_DHashTableInit(&mTable, &property_HashTableOps,
-                    sizeof(PropertyTableEntry), 16);
-
   PL_INIT_ARENA_POOL(&mArena, "PersistentPropertyArena", 2048);
 }
 
 nsPersistentProperties::~nsPersistentProperties()
 {
   PL_FinishArenaPool(&mArena);
-  if (mTable.IsInitialized()) {
-    PL_DHashTableFinish(&mTable);
-  }
 }
 
 nsresult
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/ds/nsPersistentProperties.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/ds/nsPersistentProperties.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/ds/nsPersistentProperties.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/ds/nsPersistentProperties.h	2015-05-25 20:44:11.000000000 +0000
@@ -33,7 +33,7 @@
 protected:
   nsCOMPtr<nsIUnicharInputStream> mIn;
 
-  PLDHashTable mTable;
+  PLDHashTable2 mTable;
   PLArenaPool mArena;
 };
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/ds/nsStaticAtom.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/ds/nsStaticAtom.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/ds/nsStaticAtom.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/ds/nsStaticAtom.h	2015-05-25 20:44:11.000000000 +0000
@@ -9,7 +9,7 @@
 
 #include "nsIAtom.h"
 #include "nsStringBuffer.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 typedef char16_t nsStaticAtomStringType;
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/ds/TimeStamp_windows.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/ds/TimeStamp_windows.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/ds/TimeStamp_windows.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/ds/TimeStamp_windows.cpp	2015-05-25 20:44:11.000000000 +0000
@@ -14,7 +14,7 @@
 #include <windows.h>
 
 #include "nsCRT.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prprf.h"
 #include <stdio.h>
 
@@ -38,7 +38,7 @@
   }
   return sLog;
 }
-#define LOG(x)  PR_LOG(GetTimeStampLog(), PR_LOG_DEBUG, x)
+#define LOG(x)  MOZ_LOG(GetTimeStampLog(), PR_LOG_DEBUG, x)
 
 // Estimate of the smallest duration of time we can measure.
 static volatile ULONGLONG sResolution;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/BlockingResourceBase.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/BlockingResourceBase.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/BlockingResourceBase.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/BlockingResourceBase.h	2015-05-25 20:44:11.000000000 +0000
@@ -8,7 +8,7 @@
 #ifndef mozilla_BlockingResourceBase_h
 #define mozilla_BlockingResourceBase_h
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "nscore.h"
 #include "nsDebug.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/Logging.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/Logging.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/Logging.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/Logging.h	2015-05-25 20:44:11.000000000 +0000
@@ -0,0 +1,20 @@
+/* -*- 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_logging_h
+#define mozilla_logging_h
+
+#include "prlog.h"
+
+// This file is a placeholder for a replacement to the NSPR logging framework
+// that is defined in prlog.h. Currently it is just a pass through, but as
+// work progresses more functionality will be swapped out in favor of
+// mozilla logging implementations.
+
+#define MOZ_LOG PR_LOG
+
+#endif // mozilla_logging_h
+
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/moz.build firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/moz.build	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/moz.build	2015-05-25 20:44:11.000000000 +0000
@@ -75,6 +75,7 @@
     'FileUtils.h',
     'GenericFactory.h',
     'IntentionalCrash.h',
+    'Logging.h',
     'Monitor.h',
     'Mutex.h',
     'Observer.h',
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/nsCycleCollectionParticipant.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/nsCycleCollectionParticipant.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/nsCycleCollectionParticipant.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/nsCycleCollectionParticipant.h	2015-05-25 20:44:11.000000000 +0000
@@ -825,6 +825,10 @@
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(__VA_ARGS__)                               \
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
+// If you are looking for NS_IMPL_CYCLE_COLLECTION_INHERITED_0(_class, _base)
+// you should instead not declare any cycle collected stuff in _class, so it
+// will just inherit the CC declarations from _base.
+
 #define NS_IMPL_CYCLE_COLLECTION_INHERITED(_class, _base, ...)                 \
   NS_IMPL_CYCLE_COLLECTION_CLASS(_class)                                       \
   NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(_class, _base)               \
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/nsISupportsImpl.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/nsISupportsImpl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/nsISupportsImpl.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/nsISupportsImpl.h	2015-05-25 20:44:12.000000000 +0000
@@ -29,6 +29,7 @@
 #include "mozilla/Likely.h"
 #include "mozilla/MacroArgs.h"
 #include "mozilla/MacroForEach.h"
+#include "mozilla/TypeTraits.h"
 
 namespace mozilla {
 template <typename T>
@@ -62,9 +63,7 @@
   namespace mozilla {
     struct IsDestructibleFallbackImpl
     {
-      template<typename T> static T&& Declval();
-
-      template<typename T, typename = decltype(Declval<T>().~T())>
+      template<typename T, typename = decltype(DeclVal<T>().~T())>
       static TrueType Test(int);
 
       template<typename>
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/nsStringAPI.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/nsStringAPI.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/nsStringAPI.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/nsStringAPI.h	2015-05-25 20:44:12.000000000 +0000
@@ -21,7 +21,7 @@
 
 #include "nsXPCOMStrings.h"
 #include "nsISupportsImpl.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsTArray.h"
 
 /**
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/nsTArray.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/nsTArray.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/nsTArray.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/nsTArray.h	2015-05-25 20:44:12.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/Alignment.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/BinarySearch.h"
+#include "mozilla/fallible.h"
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Move.h"
@@ -380,12 +381,14 @@
   // @param aCapacity The requested number of array elements.
   // @param aElemSize The size of an array element.
   // @return False if insufficient memory is available; true otherwise.
-  typename Alloc::ResultTypeProxy EnsureCapacity(size_type aCapacity,
-                                                 size_type aElemSize);
+  template<typename ActualAlloc>
+  typename ActualAlloc::ResultTypeProxy EnsureCapacity(size_type aCapacity,
+                                                       size_type aElemSize);
 
   // Resize the storage to the minimum required amount.
   // @param aElemSize  The size of an array element.
   // @param aElemAlign The alignment in bytes of an array element.
+  template<typename ActualAlloc>
   void ShrinkCapacity(size_type aElemSize, size_t aElemAlign);
 
   // This method may be called to resize a "gap" in the array by shifting
@@ -396,6 +399,7 @@
   // @param aNewLen    The desired length of the gap.
   // @param aElemSize  The size of an array element.
   // @param aElemAlign The alignment in bytes of an array element.
+  template<typename ActualAlloc>
   void ShiftData(index_type aStart, size_type aOldLen, size_type aNewLen,
                  size_type aElemSize, size_t aElemAlign);
 
@@ -421,12 +425,12 @@
   // @param aCount the number of slots to insert
   // @param aElementSize the size of an array element.
   // @param aElemAlign the alignment in bytes of an array element.
+  template<typename ActualAlloc>
   bool InsertSlotsAt(index_type aIndex, size_type aCount,
                      size_type aElementSize, size_t aElemAlign);
 
-protected:
-  template<class Allocator>
-  typename Alloc::ResultTypeProxy
+  template<typename ActualAlloc, class Allocator>
+  typename ActualAlloc::ResultTypeProxy
   SwapArrayElements(nsTArray_base<Allocator, Copy>& aOther,
                     size_type aElemSize,
                     size_t aElemAlign);
@@ -446,6 +450,7 @@
 
   // Helper function for SwapArrayElements. Ensures that if the array
   // is an nsAutoTArray that it doesn't use the built-in buffer.
+  template<typename ActualAlloc>
   bool EnsureNotUsingAutoArrayBuffer(size_type aElemSize);
 
   // Returns true if this nsTArray is an nsAutoTArray with a built-in buffer.
@@ -789,6 +794,9 @@
   : public nsTArray_base<Alloc, typename nsTArray_CopyChooser<E>::Type>
   , public nsTArray_TypedBase<E, nsTArray_Impl<E, Alloc>>
 {
+private:
+  typedef nsTArrayFallibleAllocator FallibleAlloc;
+
 public:
   typedef typename nsTArray_CopyChooser<E>::Type     copy_type;
   typedef nsTArray_base<Alloc, copy_type>            base_type;
@@ -1214,36 +1222,66 @@
   // @param aArrayLen The number of values to copy into this array.
   // @return          A pointer to the new elements in the array, or null if
   //                  the operation failed due to insufficient memory.
-  template<class Item>
+  template<class Item, typename ActualAlloc = Alloc>
   elem_type* ReplaceElementsAt(index_type aStart, size_type aCount,
                                const Item* aArray, size_type aArrayLen)
   {
     // Adjust memory allocation up-front to catch errors.
-    if (!Alloc::Successful(this->EnsureCapacity(Length() + aArrayLen - aCount,
-                                                sizeof(elem_type)))) {
+    if (!ActualAlloc::Successful(this->template EnsureCapacity<ActualAlloc>(
+          Length() + aArrayLen - aCount, sizeof(elem_type)))) {
       return nullptr;
     }
     DestructRange(aStart, aCount);
-    this->ShiftData(aStart, aCount, aArrayLen,
-                    sizeof(elem_type), MOZ_ALIGNOF(elem_type));
+    this->template ShiftData<ActualAlloc>(aStart, aCount, aArrayLen,
+                                          sizeof(elem_type),
+                                          MOZ_ALIGNOF(elem_type));
     AssignRange(aStart, aArrayLen, aArray);
     return Elements() + aStart;
   }
 
-  // A variation on the ReplaceElementsAt method defined above.
+
   template<class Item>
+  /* MOZ_WARN_UNUSED_RESULT */
   elem_type* ReplaceElementsAt(index_type aStart, size_type aCount,
-                               const nsTArray<Item>& aArray)
+                               const Item* aArray, size_type aArrayLen,
+                               const mozilla::fallible_t&)
   {
-    return ReplaceElementsAt(aStart, aCount, aArray.Elements(), aArray.Length());
+    return ReplaceElementsAt<Item, FallibleAlloc>(aStart, aCount,
+                                                  aArray, aArrayLen);
   }
 
   // A variation on the ReplaceElementsAt method defined above.
+  template<class Item, typename ActualAlloc = Alloc>
+  elem_type* ReplaceElementsAt(index_type aStart, size_type aCount,
+                               const nsTArray<Item>& aArray)
+  {
+    return ReplaceElementsAt<Item, ActualAlloc>(
+      aStart, aCount, aArray.Elements(), aArray.Length());
+  }
+
   template<class Item>
+  /* MOZ_WARN_UNUSED_RESULT */
+  elem_type* ReplaceElementsAt(index_type aStart, size_type aCount,
+                               const nsTArray<Item>& aArray,
+                               const mozilla::fallible_t&)
+  {
+    return ReplaceElementsAt<Item, FallibleAlloc>(aStart, aCount, aArray);
+  }
+
+  // A variation on the ReplaceElementsAt method defined above.
+  template<class Item, typename ActualAlloc = Alloc>
   elem_type* ReplaceElementsAt(index_type aStart, size_type aCount,
                                const Item& aItem)
   {
-    return ReplaceElementsAt(aStart, aCount, &aItem, 1);
+    return ReplaceElementsAt<Item, ActualAlloc>(aStart, aCount, &aItem, 1);
+  }
+
+  template<class Item>
+  /* MOZ_WARN_UNUSED_RESULT */
+  elem_type* ReplaceElementsAt(index_type aStart, size_type aCount,
+                               const Item& aItem, const mozilla::fallible_t&)
+  {
+    return ReplaceElementsAt<Item, FallibleAlloc>(aStart, aCount, aItem);
   }
 
   // A variation on the ReplaceElementsAt method defined above.
@@ -1272,32 +1310,50 @@
   // Insert a new element without copy-constructing. This is useful to avoid
   // temporaries.
   // @return A pointer to the newly inserted element, or null on OOM.
+  template<typename ActualAlloc = Alloc>
   elem_type* InsertElementAt(index_type aIndex)
   {
-    if (!Alloc::Successful(this->EnsureCapacity(Length() + 1,
-                                                sizeof(elem_type)))) {
+    if (!ActualAlloc::Successful(this->template EnsureCapacity<ActualAlloc>(
+          Length() + 1, sizeof(elem_type)))) {
       return nullptr;
     }
-    this->ShiftData(aIndex, 0, 1, sizeof(elem_type), MOZ_ALIGNOF(elem_type));
+    this->template ShiftData<ActualAlloc>(aIndex, 0, 1, sizeof(elem_type),
+                                          MOZ_ALIGNOF(elem_type));
     elem_type* elem = Elements() + aIndex;
     elem_traits::Construct(elem);
     return elem;
   }
 
+  /* MOZ_WARN_UNUSED_RESULT */
+  elem_type* InsertElementAt(index_type aIndex, const mozilla::fallible_t&)
+  {
+    return InsertElementAt<FallibleAlloc>(aIndex);
+  }
+
   // Insert a new element, move constructing if possible.
-  template<class Item>
+  template<class Item, typename ActualAlloc = Alloc>
   elem_type* InsertElementAt(index_type aIndex, Item&& aItem)
   {
-    if (!Alloc::Successful(this->EnsureCapacity(Length() + 1,
-                                                sizeof(elem_type)))) {
+    if (!ActualAlloc::Successful(this->template EnsureCapacity<ActualAlloc>(
+          Length() + 1, sizeof(elem_type)))) {
       return nullptr;
     }
-    this->ShiftData(aIndex, 0, 1, sizeof(elem_type), MOZ_ALIGNOF(elem_type));
+    this->template ShiftData<ActualAlloc>(aIndex, 0, 1, sizeof(elem_type),
+                                          MOZ_ALIGNOF(elem_type));
     elem_type* elem = Elements() + aIndex;
     elem_traits::Construct(elem, mozilla::Forward<Item>(aItem));
     return elem;
   }
 
+  template<class Item>
+  /* MOZ_WARN_UNUSED_RESULT */
+  elem_type* InsertElementAt(index_type aIndex, Item&& aItem,
+                             const mozilla::fallible_t&)
+  {
+    return InsertElementAt<Item, FallibleAlloc>(aIndex,
+                                                mozilla::Forward<Item>(aItem));
+  }
+
   // This method searches for the smallest index of an element that is strictly
   // greater than |aItem|. If |aItem| is inserted at this index, the array will
   // remain sorted and |aItem| would come after all elements that are equal to
@@ -1355,11 +1411,11 @@
   // @param aArrayLen The number of elements to append to this array.
   // @return          A pointer to the new elements in the array, or null if
   //                  the operation failed due to insufficient memory.
-  template<class Item>
+  template<class Item, typename ActualAlloc = Alloc>
   elem_type* AppendElements(const Item* aArray, size_type aArrayLen)
   {
-    if (!Alloc::Successful(this->EnsureCapacity(Length() + aArrayLen,
-                                                sizeof(elem_type)))) {
+    if (!ActualAlloc::Successful(this->template EnsureCapacity<ActualAlloc>(
+          Length() + aArrayLen, sizeof(elem_type)))) {
       return nullptr;
     }
     index_type len = Length();
@@ -1368,19 +1424,35 @@
     return Elements() + len;
   }
 
+  template<class Item>
+  /* MOZ_WARN_UNUSED_RESULT */
+  elem_type* AppendElements(const Item* aArray, size_type aArrayLen,
+                            const mozilla::fallible_t&)
+  {
+    return AppendElements<Item, FallibleAlloc>(aArray, aArrayLen);
+  }
+
   // A variation on the AppendElements method defined above.
-  template<class Item, class Allocator>
+  template<class Item, class Allocator, typename ActualAlloc = Alloc>
   elem_type* AppendElements(const nsTArray_Impl<Item, Allocator>& aArray)
   {
-    return AppendElements(aArray.Elements(), aArray.Length());
+    return AppendElements<Item, ActualAlloc>(aArray.Elements(), aArray.Length());
+  }
+
+  template<class Item, class Allocator>
+  /* MOZ_WARN_UNUSED_RESULT */
+  elem_type* AppendElements(const nsTArray_Impl<Item, Allocator>& aArray,
+                            const mozilla::fallible_t&)
+  {
+    return AppendElements<Item, Allocator, FallibleAlloc>(aArray);
   }
 
   // Append a new element, move constructing if possible.
-  template<class Item>
+  template<class Item, typename ActualAlloc = Alloc>
   elem_type* AppendElement(Item&& aItem)
   {
-    if (!Alloc::Successful(this->EnsureCapacity(Length() + 1,
-                                                sizeof(elem_type)))) {
+    if (!ActualAlloc::Successful(this->template EnsureCapacity<ActualAlloc>(
+          Length() + 1, sizeof(elem_type)))) {
       return nullptr;
     }
     elem_type* elem = Elements() + Length();
@@ -1389,13 +1461,21 @@
     return elem;
   }
 
+  template<class Item>
+  /* MOZ_WARN_UNUSED_RESULT */
+  elem_type* AppendElement(Item&& aItem,
+                           const mozilla::fallible_t&)
+  {
+    return AppendElement<Item, FallibleAlloc>(mozilla::Forward<Item>(aItem));
+  }
+
   // Append new elements without copy-constructing. This is useful to avoid
   // temporaries.
   // @return A pointer to the newly appended elements, or null on OOM.
-  elem_type* AppendElements(size_type aCount)
-  {
-    if (!Alloc::Successful(this->EnsureCapacity(Length() + aCount,
-                                                sizeof(elem_type)))) {
+  template<typename ActualAlloc = Alloc>
+  elem_type* AppendElements(size_type aCount) {
+    if (!ActualAlloc::Successful(this->template EnsureCapacity<ActualAlloc>(
+          Length() + aCount, sizeof(elem_type)))) {
       return nullptr;
     }
     elem_type* elems = Elements() + Length();
@@ -1407,10 +1487,28 @@
     return elems;
   }
 
+  /* MOZ_WARN_UNUSED_RESULT */
+  elem_type* AppendElements(size_type aCount,
+                            const mozilla::fallible_t&)
+  {
+    return AppendElements<FallibleAlloc>(aCount);
+  }
+
   // Append a new element without copy-constructing. This is useful to avoid
   // temporaries.
   // @return A pointer to the newly appended element, or null on OOM.
-  elem_type* AppendElement() { return AppendElements(1); }
+  template<typename ActualAlloc = Alloc>
+  elem_type* AppendElement()
+  {
+    return AppendElements<ActualAlloc>(1);
+  }
+
+  template<class Item>
+  /* MOZ_WARN_UNUSED_RESULT */
+  elem_type* AppendElement(const mozilla::fallible_t&)
+  {
+    return AppendElement<FallibleAlloc>();
+  }
 
   // Move all elements from another array to the end of this array without
   // calling copy constructors or destructors.
@@ -1421,14 +1519,15 @@
     MOZ_ASSERT(&aArray != this, "argument must be different aArray");
     index_type len = Length();
     index_type otherLen = aArray.Length();
-    if (!Alloc::Successful(this->EnsureCapacity(len + otherLen,
-                                                sizeof(elem_type)))) {
+    if (!Alloc::Successful(this->template EnsureCapacity<Alloc>(
+          len + otherLen, sizeof(elem_type)))) {
       return nullptr;
     }
     copy_type::CopyElements(Elements() + len, aArray.Elements(), otherLen,
                             sizeof(elem_type));
     this->IncrementLength(otherLen);
-    aArray.ShiftData(0, otherLen, 0, sizeof(elem_type), MOZ_ALIGNOF(elem_type));
+    aArray.template ShiftData<Alloc>(0, otherLen, 0, sizeof(elem_type),
+                                     MOZ_ALIGNOF(elem_type));
     return Elements() + len;
   }
   template<class Item, class Allocator>
@@ -1447,8 +1546,8 @@
     // Check that the previous assert didn't overflow
     MOZ_ASSERT(aStart <= aStart + aCount, "Start index plus length overflows");
     DestructRange(aStart, aCount);
-    this->ShiftData(aStart, aCount, 0,
-                    sizeof(elem_type), MOZ_ALIGNOF(elem_type));
+    this->template ShiftData<Alloc>(aStart, aCount, 0,
+                                    sizeof(elem_type), MOZ_ALIGNOF(elem_type));
   }
 
   // A variation on the RemoveElementsAt method defined above.
@@ -1511,8 +1610,8 @@
   template<class Allocator>
   typename Alloc::ResultType SwapElements(nsTArray_Impl<E, Allocator>& aOther)
   {
-    return Alloc::Result(this->SwapArrayElements(aOther, sizeof(elem_type),
-                                                 MOZ_ALIGNOF(elem_type)));
+    return Alloc::Result(this->template SwapArrayElements<Alloc>(
+      aOther, sizeof(elem_type), MOZ_ALIGNOF(elem_type)));
   }
 
   //
@@ -1525,9 +1624,17 @@
   // will not reduce the number of elements in this array.
   // @param aCapacity The desired capacity of this array.
   // @return True if the operation succeeded; false if we ran out of memory
-  typename Alloc::ResultType SetCapacity(size_type aCapacity)
+  template<typename ActualAlloc = Alloc>
+  typename ActualAlloc::ResultType SetCapacity(size_type aCapacity)
   {
-    return Alloc::Result(this->EnsureCapacity(aCapacity, sizeof(elem_type)));
+    return ActualAlloc::Result(this->template EnsureCapacity<ActualAlloc>(
+      aCapacity, sizeof(elem_type)));
+  }
+
+  /* MOZ_WARN_UNUSED_RESULT */
+  bool SetCapacity(size_type aCapacity, const mozilla::fallible_t&)
+  {
+    return SetCapacity<FallibleAlloc>(aCapacity);
   }
 
   // This method modifies the length of the array.  If the new length is
@@ -1538,16 +1645,23 @@
   // @return True if the operation succeeded; false otherwise.
   // See also TruncateLength if the new length is guaranteed to be smaller than
   // the old.
-  typename Alloc::ResultType SetLength(size_type aNewLen)
+  template<typename ActualAlloc = Alloc>
+  typename ActualAlloc::ResultType SetLength(size_type aNewLen)
   {
     size_type oldLen = Length();
     if (aNewLen > oldLen) {
-      return Alloc::ConvertBoolToResultType(
-        InsertElementsAt(oldLen, aNewLen - oldLen) != nullptr);
+      return ActualAlloc::ConvertBoolToResultType(
+        InsertElementsAt<ActualAlloc>(oldLen, aNewLen - oldLen) != nullptr);
     }
 
     TruncateLength(aNewLen);
-    return Alloc::ConvertBoolToResultType(true);
+    return ActualAlloc::ConvertBoolToResultType(true);
+  }
+
+  /* MOZ_WARN_UNUSED_RESULT */
+  bool SetLength(size_type aNewLen, const mozilla::fallible_t&)
+  {
+    return SetLength<FallibleAlloc>(aNewLen);
   }
 
   // This method modifies the length of the array, but may only be
@@ -1570,14 +1684,21 @@
   // constructor.
   // @param aMinLen The desired minimum length of this array.
   // @return True if the operation succeeded; false otherwise.
-  typename Alloc::ResultType EnsureLengthAtLeast(size_type aMinLen)
+  template<typename ActualAlloc = Alloc>
+  typename ActualAlloc::ResultType EnsureLengthAtLeast(size_type aMinLen)
   {
     size_type oldLen = Length();
     if (aMinLen > oldLen) {
-      return Alloc::ConvertBoolToResultType(!!InsertElementsAt(oldLen,
-                                                               aMinLen - oldLen));
+      return ActualAlloc::ConvertBoolToResultType(
+        !!InsertElementsAt<ActualAlloc>(oldLen, aMinLen - oldLen));
     }
-    return Alloc::ConvertBoolToResultType(true);
+    return ActualAlloc::ConvertBoolToResultType(true);
+  }
+
+  /* MOZ_WARN_UNUSED_RESULT */
+  bool EnsureLengthAtLeast(size_type aMinLen, const mozilla::fallible_t&)
+  {
+    return EnsureLengthAtLeast<FallibleAlloc>(aMinLen);
   }
 
   // This method inserts elements into the array, constructing
@@ -1585,10 +1706,12 @@
   // @param aIndex the place to insert the new elements. This must be no
   //               greater than the current length of the array.
   // @param aCount the number of elements to insert
+  template<typename ActualAlloc = Alloc>
   elem_type* InsertElementsAt(index_type aIndex, size_type aCount)
   {
-    if (!base_type::InsertSlotsAt(aIndex, aCount, sizeof(elem_type),
-                                  MOZ_ALIGNOF(elem_type))) {
+    if (!base_type::template InsertSlotsAt<ActualAlloc>(aIndex, aCount,
+                                                        sizeof(elem_type),
+                                                        MOZ_ALIGNOF(elem_type))) {
       return nullptr;
     }
 
@@ -1602,6 +1725,13 @@
     return Elements() + aIndex;
   }
 
+  /* MOZ_WARN_UNUSED_RESULT */
+  elem_type* InsertElementsAt(index_type aIndex, size_type aCount,
+                              const mozilla::fallible_t&)
+  {
+    return InsertElementsAt<FallibleAlloc>(aIndex, aCount);
+  }
+
   // This method inserts elements into the array, constructing them
   // elem_type's copy constructor (or whatever one-arg constructor
   // happens to match the Item type).
@@ -1609,12 +1739,13 @@
   //               greater than the current length of the array.
   // @param aCount the number of elements to insert.
   // @param aItem the value to use when constructing the new elements.
-  template<class Item>
+  template<class Item, typename ActualAlloc = Alloc>
   elem_type* InsertElementsAt(index_type aIndex, size_type aCount,
                               const Item& aItem)
   {
-    if (!base_type::InsertSlotsAt(aIndex, aCount, sizeof(elem_type),
-                                  MOZ_ALIGNOF(elem_type))) {
+    if (!base_type::template InsertSlotsAt<ActualAlloc>(aIndex, aCount,
+                                                        sizeof(elem_type),
+                                                        MOZ_ALIGNOF(elem_type))) {
       return nullptr;
     }
 
@@ -1628,10 +1759,19 @@
     return Elements() + aIndex;
   }
 
+  template<class Item>
+  /* MOZ_WARN_UNUSED_RESULT */
+  elem_type* InsertElementsAt(index_type aIndex, size_type aCount,
+                              const Item& aItem, const mozilla::fallible_t&)
+  {
+    return InsertElementsAt<Item, FallibleAlloc>(aIndex, aCount, aItem);
+  }
+
   // This method may be called to minimize the memory used by this array.
   void Compact()
   {
-    ShrinkCapacity(sizeof(elem_type), MOZ_ALIGNOF(elem_type));
+    this->template ShrinkCapacity<Alloc>(sizeof(elem_type),
+                                         MOZ_ALIGNOF(elem_type));
   }
 
   //
@@ -1694,8 +1834,8 @@
   template<class Item, class Comparator>
   elem_type* PushHeap(const Item& aItem, const Comparator& aComp)
   {
-    if (!base_type::InsertSlotsAt(Length(), 1, sizeof(elem_type),
-                                  MOZ_ALIGNOF(elem_type))) {
+    if (!base_type::template InsertSlotsAt<Alloc>(Length(), 1, sizeof(elem_type),
+                                                  MOZ_ALIGNOF(elem_type))) {
       return nullptr;
     }
     // Sift up the new node
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/nsTArray-inl.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/nsTArray-inl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/nsTArray-inl.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/nsTArray-inl.h	2015-05-25 20:44:12.000000000 +0000
@@ -109,13 +109,14 @@
                                                   size_t aElemSize);
 
 template<class Alloc, class Copy>
-typename Alloc::ResultTypeProxy
+template<typename ActualAlloc>
+typename ActualAlloc::ResultTypeProxy
 nsTArray_base<Alloc, Copy>::EnsureCapacity(size_type aCapacity,
                                            size_type aElemSize)
 {
   // This should be the most common case so test this first
   if (aCapacity <= mHdr->mCapacity) {
-    return Alloc::SuccessResult();
+    return ActualAlloc::SuccessResult();
   }
 
   // If the requested memory allocation exceeds size_type(-1)/2, then
@@ -124,24 +125,24 @@
   // Header::mCapacity member. Just bail out in cases like that.  We don't want
   // to be allocating 2 GB+ arrays anyway.
   if (!IsTwiceTheRequiredBytesRepresentableAsUint32(aCapacity, aElemSize)) {
-    Alloc::SizeTooBig((size_t)aCapacity * aElemSize);
-    return Alloc::FailureResult();
+    ActualAlloc::SizeTooBig((size_t)aCapacity * aElemSize);
+    return ActualAlloc::FailureResult();
   }
 
   size_t reqSize = sizeof(Header) + aCapacity * aElemSize;
 
   if (mHdr == EmptyHdr()) {
     // Malloc() new data
-    Header* header = static_cast<Header*>(Alloc::Malloc(reqSize));
+    Header* header = static_cast<Header*>(ActualAlloc::Malloc(reqSize));
     if (!header) {
-      return Alloc::FailureResult();
+      return ActualAlloc::FailureResult();
     }
     header->mLength = 0;
     header->mCapacity = aCapacity;
     header->mIsAutoArray = 0;
     mHdr = header;
 
-    return Alloc::SuccessResult();
+    return ActualAlloc::SuccessResult();
   }
 
   // We increase our capacity so that the allocated buffer grows exponentially,
@@ -167,21 +168,21 @@
   Header* header;
   if (UsesAutoArrayBuffer() || !Copy::allowRealloc) {
     // Malloc() and copy
-    header = static_cast<Header*>(Alloc::Malloc(bytesToAlloc));
+    header = static_cast<Header*>(ActualAlloc::Malloc(bytesToAlloc));
     if (!header) {
-      return Alloc::FailureResult();
+      return ActualAlloc::FailureResult();
     }
 
     Copy::CopyHeaderAndElements(header, mHdr, Length(), aElemSize);
 
     if (!UsesAutoArrayBuffer()) {
-      Alloc::Free(mHdr);
+      ActualAlloc::Free(mHdr);
     }
   } else {
     // Realloc() existing data
-    header = static_cast<Header*>(Alloc::Realloc(mHdr, bytesToAlloc));
+    header = static_cast<Header*>(ActualAlloc::Realloc(mHdr, bytesToAlloc));
     if (!header) {
-      return Alloc::FailureResult();
+      return ActualAlloc::FailureResult();
     }
   }
 
@@ -192,10 +193,11 @@
 
   mHdr = header;
 
-  return Alloc::SuccessResult();
+  return ActualAlloc::SuccessResult();
 }
 
 template<class Alloc, class Copy>
+template<typename ActualAlloc>
 void
 nsTArray_base<Alloc, Copy>::ShrinkCapacity(size_type aElemSize,
                                            size_t aElemAlign)
@@ -217,20 +219,20 @@
     header->mLength = length;
     Copy::CopyElements(header + 1, mHdr + 1, length, aElemSize);
 
-    Alloc::Free(mHdr);
+    ActualAlloc::Free(mHdr);
     mHdr = header;
     return;
   }
 
   if (length == 0) {
     MOZ_ASSERT(!IsAutoArray(), "autoarray should have fit 0 elements");
-    Alloc::Free(mHdr);
+    ActualAlloc::Free(mHdr);
     mHdr = EmptyHdr();
     return;
   }
 
   size_type size = sizeof(Header) + length * aElemSize;
-  void* ptr = Alloc::Realloc(mHdr, size);
+  void* ptr = ActualAlloc::Realloc(mHdr, size);
   if (!ptr) {
     return;
   }
@@ -239,6 +241,7 @@
 }
 
 template<class Alloc, class Copy>
+template<typename ActualAlloc>
 void
 nsTArray_base<Alloc, Copy>::ShiftData(index_type aStart,
                                       size_type aOldLen, size_type aNewLen,
@@ -254,7 +257,7 @@
   // Compute the resulting length of the array
   mHdr->mLength += aNewLen - aOldLen;
   if (mHdr->mLength == 0) {
-    ShrinkCapacity(aElemSize, aElemAlign);
+    ShrinkCapacity<ActualAlloc>(aElemSize, aElemAlign);
   } else {
     // Maybe nothing needs to be shifted
     if (num == 0) {
@@ -270,6 +273,7 @@
 }
 
 template<class Alloc, class Copy>
+template<typename ActualAlloc>
 bool
 nsTArray_base<Alloc, Copy>::InsertSlotsAt(index_type aIndex, size_type aCount,
                                           size_type aElemSize,
@@ -278,7 +282,7 @@
   MOZ_ASSERT(aIndex <= Length(), "Bogus insertion index");
   size_type newLen = Length() + aCount;
 
-  EnsureCapacity(newLen, aElemSize);
+  EnsureCapacity<ActualAlloc>(newLen, aElemSize);
 
   // Check for out of memory conditions
   if (Capacity() < newLen) {
@@ -287,7 +291,7 @@
 
   // Move the existing elements as needed.  Note that this will
   // change our mLength, so no need to call IncrementLength.
-  ShiftData(aIndex, 0, aCount, aElemSize, aElemAlign);
+  ShiftData<ActualAlloc>(aIndex, 0, aCount, aElemSize, aElemAlign);
 
   return true;
 }
@@ -325,8 +329,8 @@
 }
 
 template<class Alloc, class Copy>
-template<class Allocator>
-typename Alloc::ResultTypeProxy
+template<typename ActualAlloc, class Allocator>
+typename ActualAlloc::ResultTypeProxy
 nsTArray_base<Alloc, Copy>::SwapArrayElements(nsTArray_base<Allocator,
                                                             Copy>& aOther,
                                               size_type aElemSize,
@@ -348,16 +352,16 @@
   if ((!UsesAutoArrayBuffer() || Capacity() < aOther.Length()) &&
       (!aOther.UsesAutoArrayBuffer() || aOther.Capacity() < Length())) {
 
-    if (!EnsureNotUsingAutoArrayBuffer(aElemSize) ||
-        !aOther.EnsureNotUsingAutoArrayBuffer(aElemSize)) {
-      return Alloc::FailureResult();
+    if (!EnsureNotUsingAutoArrayBuffer<ActualAlloc>(aElemSize) ||
+        !aOther.template EnsureNotUsingAutoArrayBuffer<ActualAlloc>(aElemSize)) {
+      return ActualAlloc::FailureResult();
     }
 
     Header* temp = mHdr;
     mHdr = aOther.mHdr;
     aOther.mHdr = temp;
 
-    return Alloc::SuccessResult();
+    return ActualAlloc::SuccessResult();
   }
 
   // Swap the two arrays by copying, since at least one is using an auto
@@ -371,9 +375,9 @@
   // write Y straight into X's auto buffer, write X's malloc'ed buffer on top
   // of Y, and then switch X to using its auto buffer.)
 
-  if (!Alloc::Successful(EnsureCapacity(aOther.Length(), aElemSize)) ||
-      !Allocator::Successful(aOther.EnsureCapacity(Length(), aElemSize))) {
-    return Alloc::FailureResult();
+  if (!ActualAlloc::Successful(EnsureCapacity<ActualAlloc>(aOther.Length(), aElemSize)) ||
+      !Allocator::Successful(aOther.template EnsureCapacity<Allocator>(Length(), aElemSize))) {
+    return ActualAlloc::FailureResult();
   }
 
   // The EnsureCapacity calls above shouldn't have caused *both* arrays to
@@ -398,9 +402,10 @@
   // job for AutoTArray!  (One of the two arrays we're swapping is using an
   // auto buffer, so we're likely not allocating a lot of space here.  But one
   // could, in theory, allocate a huge AutoTArray on the heap.)
-  nsAutoArrayBase<nsTArray_Impl<uint8_t, Alloc>, 64> temp;
-  if (!Alloc::Successful(temp.EnsureCapacity(smallerLength, aElemSize))) {
-    return Alloc::FailureResult();
+  nsAutoArrayBase<nsTArray_Impl<uint8_t, ActualAlloc>, 64> temp;
+  if (!ActualAlloc::Successful(temp.template EnsureCapacity<ActualAlloc>(smallerLength,
+                                                                         aElemSize))) {
+    return ActualAlloc::FailureResult();
   }
 
   Copy::CopyElements(temp.Elements(), smallerElements, smallerLength, aElemSize);
@@ -422,10 +427,11 @@
     aOther.mHdr->mLength = tempLength;
   }
 
-  return Alloc::SuccessResult();
+  return ActualAlloc::SuccessResult();
 }
 
 template<class Alloc, class Copy>
+template<typename ActualAlloc>
 bool
 nsTArray_base<Alloc, Copy>::EnsureNotUsingAutoArrayBuffer(size_type aElemSize)
 {
@@ -442,7 +448,7 @@
 
     size_type size = sizeof(Header) + Length() * aElemSize;
 
-    Header* header = static_cast<Header*>(Alloc::Malloc(size));
+    Header* header = static_cast<Header*>(ActualAlloc::Malloc(size));
     if (!header) {
       return false;
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/nsTextFormatter.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/nsTextFormatter.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/nsTextFormatter.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/nsTextFormatter.cpp	2015-05-25 20:44:12.000000000 +0000
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "prdtoa.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "prprf.h"
 #include "prmem.h"
 #include "nsCRTGlue.h"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/nsThreadUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/nsThreadUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/nsThreadUtils.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/nsThreadUtils.cpp	2015-05-25 20:44:12.000000000 +0000
@@ -375,11 +375,3 @@
 #endif
 }
 
-#ifdef MOZ_NUWA_PROCESS
-#ifdef MOZILLA_INTERNAL_API
-void
-NS_SetIgnoreStatusOfCurrentThread() {
-  nsThreadManager::get()->SetIgnoreThreadStatus();
-}
-#endif // MOZILLA_INTERNAL_API
-#endif // MOZ_NUWA_PROCESS
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/nsThreadUtils.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/nsThreadUtils.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/nsThreadUtils.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/nsThreadUtils.h	2015-05-25 20:44:12.000000000 +0000
@@ -521,9 +521,24 @@
                          StorePtrPassByPtr<TWithoutPointer>>
 {};
 
+template<typename>
+struct SFINAE1True : mozilla::TrueType
+{};
+
+template<class T>
+static auto HasRefCountMethodsTest(int)
+    -> SFINAE1True<decltype(mozilla::DeclVal<T>().AddRef(),
+                            mozilla::DeclVal<T>().Release())>;
+template<class>
+static auto HasRefCountMethodsTest(long) -> mozilla::FalseType;
+
+template<class T>
+struct HasRefCountMethods : decltype(HasRefCountMethodsTest<T>(0))
+{};
+
 template<typename TWithoutPointer>
 struct PointerStorageClass
-  : mozilla::Conditional<mozilla::IsBaseOf<nsISupports, TWithoutPointer>::value,
+  : mozilla::Conditional<HasRefCountMethods<TWithoutPointer>::value,
                          StorensRefPtrPassByPtr<TWithoutPointer>,
                          typename NonnsISupportsPointerStorageClass<
                            TWithoutPointer
@@ -566,7 +581,8 @@
 
 // Choose storage&passing strategy based on preferred storage type:
 // - If IsParameterStorageClass<T>::value is true, use as-is.
-// - nsISupports* -> StorensRefPtrPassByPtr<T>   : Store nsRefPtr<T>, pass T*
+// - RC*       -> StorensRefPtrPassByPtr<RC>     : Store nsRefPtr<RC>, pass RC*
+//   ^^ RC quacks like a ref-counted type (i.e., has AddRef and Release methods)
 // - const T*  -> StoreConstPtrPassByConstPtr<T> : Store const T*, pass const T*
 // - T*        -> StorePtrPassByPtr<T>           : Store T*, pass T*.
 // - const T&  -> StoreConstRefPassByConstLRef<T>: Store const T&, pass const T&.
@@ -1003,19 +1019,4 @@
 void
 NS_SetMainThread();
 
-/**
- * Helpers for thread to report their status when compiled with Nuwa.
- */
-#ifdef MOZILLA_INTERNAL_API
-#ifdef MOZ_NUWA_PROCESS
-extern void
-NS_SetIgnoreStatusOfCurrentThread();
-#else // MOZ_NUWA_PROCESS
-inline void
-NS_SetIgnoreStatusOfCurrentThread()
-{
-}
-#endif // MOZ_NUWA_PROCESS
-#endif // MOZILLA_INTERNAL_API
-
 #endif  // nsThreadUtils_h__
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/pldhash.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/pldhash.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/pldhash.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/pldhash.cpp	2015-05-25 20:44:12.000000000 +0000
@@ -169,6 +169,22 @@
   return uint64_t(*aNbytes) == nbytes64;   // returns false on overflow
 }
 
+PLDHashTable*
+PL_NewDHashTable(const PLDHashTableOps* aOps, uint32_t aEntrySize,
+                 uint32_t aLength)
+{
+  PLDHashTable* table = new PLDHashTable();
+  PL_DHashTableInit(table, aOps, aEntrySize, aLength);
+  return table;
+}
+
+void
+PL_DHashTableDestroy(PLDHashTable* aTable)
+{
+  PL_DHashTableFinish(aTable);
+  delete aTable;
+}
+
 /*
  * Compute max and min load numbers (entry counts).  We have a secondary max
  * that allows us to overload a table reasonably if it cannot be grown further
@@ -202,7 +218,6 @@
 PLDHashTable::Init(const PLDHashTableOps* aOps,
                    uint32_t aEntrySize, uint32_t aLength)
 {
-  MOZ_ASSERT(!mAutoFinish);
   MOZ_ASSERT(!IsInitialized());
 
   // Check that the important fields have been set by the constructor.
@@ -251,17 +266,18 @@
   aTable->Init(aOps, aEntrySize, aLength);
 }
 
-PLDHashTable::PLDHashTable(const PLDHashTableOps* aOps, uint32_t aEntrySize,
-                           uint32_t aLength)
-  : mOps(nullptr)
-  , mAutoFinish(0)
-  , mEntryStore(nullptr)
-#ifdef DEBUG
-  , mRecursionLevel()
-#endif
+void
+PL_DHashTableInit(PLDHashTable2* aTable, const PLDHashTableOps* aOps,
+                  uint32_t aEntrySize, uint32_t aLength)
 {
-  Init(aOps, aEntrySize, aLength);
-  mAutoFinish = 1;
+  aTable->Init(aOps, aEntrySize, aLength);
+}
+
+PLDHashTable2::PLDHashTable2(const PLDHashTableOps* aOps, uint32_t aEntrySize,
+                             uint32_t aLength)
+  : PLDHashTable()
+{
+  PLDHashTable::Init(aOps, aEntrySize, aLength);
 }
 
 PLDHashTable& PLDHashTable::operator=(PLDHashTable&& aOther)
@@ -271,7 +287,6 @@
   }
 
   // Destruct |this|.
-  mAutoFinish = 0;
   Finish();
 
   // Move pieces over.
@@ -280,9 +295,7 @@
   mEntrySize = Move(aOther.mEntrySize);
   mEntryCount = Move(aOther.mEntryCount);
   mRemovedCount = Move(aOther.mRemovedCount);
-  // We can't use Move() on bitfields. Fortunately, '=' suffices.
-  mGeneration = aOther.mGeneration;
-  mAutoFinish = aOther.mAutoFinish;
+  mGeneration = Move(aOther.mGeneration);
   mEntryStore = Move(aOther.mEntryStore);
 #ifdef PL_DHASHMETER
   mStats = Move(aOther.mStats);
@@ -341,8 +354,6 @@
 MOZ_ALWAYS_INLINE void
 PLDHashTable::Finish()
 {
-  MOZ_ASSERT(!mAutoFinish);
-
   if (!IsInitialized()) {
     MOZ_ASSERT(!mEntryStore);
     return;
@@ -378,18 +389,15 @@
   aTable->Finish();
 }
 
-PLDHashTable::~PLDHashTable()
+void
+PL_DHashTableFinish(PLDHashTable2* aTable)
+{
+  aTable->Finish();
+}
+
+PLDHashTable2::~PLDHashTable2()
 {
-  // If we used automatic initialization, then finalize the table here.
-  // Otherwise, Finish() should have already been called manually.
-  if (mAutoFinish) {
-    mAutoFinish = 0;
-    Finish();
-  } else {
-    // XXX: actually, we can't assert this here because some tables never get
-    // finalized.
-    //MOZ_ASSERT(!IsInitialized());
-  }
+  PLDHashTable::Finish();
 }
 
 // If |IsAdd| is true, the return value is always non-null and it may be a
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/pldhash.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/pldhash.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/pldhash.h	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/pldhash.h	2015-05-25 20:44:12.000000000 +0000
@@ -150,17 +150,6 @@
  * means that empty hash tables are cheap, which is good because they are
  * common.
  *
- * Due to historical reasons, there are two ways to manage the initialization
- * and finalization of a PLDHashTable. There are assertions that will trigger
- * if the two styles are mixed for a single table.
- *
- * - Automatic, C++ style: via the multi-arg constructor and the destructor.
- *   This is the preferred style.
- *
- * - Manual, C style: via the Init() and Finish() methods. If Init() is
- *   called on a table, then the Finish() must be called to finalize the
- *   table, and the destructor will be a no-op.
- *
  * There used to be a long, math-heavy comment here about the merits of
  * double hashing vs. chaining; it was removed in bug 1058335. In short, double
  * hashing is more space-efficient unless the element size gets large (in which
@@ -178,8 +167,7 @@
   uint32_t            mEntrySize;     /* number of bytes in an entry */
   uint32_t            mEntryCount;    /* number of entries in table */
   uint32_t            mRemovedCount;  /* removed entry sentinels in table */
-  uint32_t            mGeneration:31; /* entry storage generation number */
-  uint32_t            mAutoFinish:1;  /* should the destructor call Finish()? */
+  uint32_t            mGeneration;    /* entry storage generation number */
   char*               mEntryStore;    /* entry storage; allocated lazily */
 #ifdef PL_DHASHMETER
   struct PLDHashStats
@@ -224,7 +212,6 @@
     , mEntryCount(0)
     , mRemovedCount(0)
     , mGeneration(0)
-    , mAutoFinish(0)
     , mEntryStore(nullptr)
 #ifdef PL_DHASHMETER
     , mStats()
@@ -234,21 +221,8 @@
 #endif
   {}
 
-  // Initialize the table with aOps and aEntrySize. The table's initial
-  // capacity will be chosen such that |aLength| elements can be inserted
-  // without rehashing; if |aLength| is a power-of-two, this capacity will be
-  // |2*length|. However, because entry storage is allocated lazily, this
-  // initial capacity won't be relevant until the first element is added; prior
-  // to that the capacity will be zero.
-  //
-  // This function will crash if |aEntrySize| and/or |aLength| are too large.
-  //
-  PLDHashTable(const PLDHashTableOps* aOps, uint32_t aEntrySize,
-               uint32_t aLength = PL_DHASH_DEFAULT_INITIAL_LENGTH);
-
   PLDHashTable(PLDHashTable&& aOther)
     : mOps(nullptr)
-    , mAutoFinish(0)
     , mEntryStore(nullptr)
 #ifdef DEBUG
     , mRecursionLevel(0)
@@ -259,13 +233,10 @@
 
   PLDHashTable& operator=(PLDHashTable&& aOther);
 
-  ~PLDHashTable();
-
   bool IsInitialized() const { return !!mOps; }
 
-  // These should be used rarely.
+  // This should be used rarely.
   const PLDHashTableOps* const Ops() { return mOps; }
-  void SetOps(const PLDHashTableOps* aOps) { mOps = aOps; }
 
   /*
    * Size in entries (gross, not net of free and removed sentinels) for table.
@@ -363,6 +334,47 @@
   PLDHashTable& operator=(const PLDHashTable& aOther) = delete;
 };
 
+// PLDHashTable uses C style, manual initialization and finalization, via the
+// Init() and Finish() methods. PLDHashTable2 is a slight extension of
+// PLDHashTable that provides C++-style, automatic initialization and
+// finalization via an initializing constructor and a destructor. It also
+// overrides the Init() and Finish() methods with versions that will crash
+// immediately if called.
+//
+// XXX: We're using a subclass here so that instances of PLDHashTable can be
+// converted incrementally to PLDHashTable2. Once all instances have been
+// converted, we can merge the two and call the merged class PLDHashTable
+// again.
+class PLDHashTable2 : public PLDHashTable
+{
+public:
+  PLDHashTable2(const PLDHashTableOps* aOps, uint32_t aEntrySize,
+                uint32_t aLength = PL_DHASH_DEFAULT_INITIAL_LENGTH);
+
+  PLDHashTable2(PLDHashTable2&& aOther)
+    : PLDHashTable(mozilla::Move(aOther))
+  {}
+
+  PLDHashTable2& operator=(PLDHashTable2&& aOther)
+  {
+    return static_cast<PLDHashTable2&>(
+      PLDHashTable::operator=(mozilla::Move(aOther)));
+  }
+
+  ~PLDHashTable2();
+
+  void Init(const PLDHashTableOps* aOps, uint32_t aEntrySize, uint32_t aLength)
+  {
+    MOZ_CRASH("PLDHashTable2::Init()");
+  }
+
+  void Finish() { MOZ_CRASH("PLDHashTable2::Finish()"); }
+
+private:
+  PLDHashTable2(const PLDHashTable2& aOther) = delete;
+  PLDHashTable2& operator=(const PLDHashTable2& aOther) = delete;
+};
+
 /*
  * Compute the hash code for a given key to be looked up, added, or removed
  * from aTable.  A hash code may have any PLDHashNumber value.
@@ -477,22 +489,44 @@
 const PLDHashTableOps* PL_DHashGetStubOps(void);
 
 /*
- * This function works similarly to the multi-arg constructor.
+ * Dynamically allocate a new PLDHashTable, initialize it using
+ * PL_DHashTableInit, and return its address. Never returns null.
+ */
+PLDHashTable* PL_NewDHashTable(
+  const PLDHashTableOps* aOps, uint32_t aEntrySize,
+  uint32_t aLength = PL_DHASH_DEFAULT_INITIAL_LENGTH);
+
+/*
+ * Free |aTable|'s entry storage and |aTable| itself (both via
+ * aTable->mOps->freeTable). Use this function to destroy a PLDHashTable that
+ * was allocated on the heap via PL_NewDHashTable().
+ */
+void PL_DHashTableDestroy(PLDHashTable* aTable);
+
+/*
+ * Initialize aTable with aOps and aEntrySize. The table's initial capacity
+ * will be chosen such that |aLength| elements can be inserted without
+ * rehashing; if |aLength| is a power-of-two, this capacity will be |2*length|.
+ * However, because entry storage is allocated lazily, this initial capacity
+ * won't be relevant until the first element is added; prior to that the
+ * capacity will be zero.
  *
- * Any table initialized with this function must be finalized via
- * PL_DHashTableFinish(). The alternative (and preferred) way to
- * initialize a PLDHashTable is via the multi-arg constructor; any such table
- * will be auto-finalized by the destructor.
+ * This function will crash if |aEntrySize| and/or |aLength| are too large.
  */
 void PL_DHashTableInit(
   PLDHashTable* aTable, const PLDHashTableOps* aOps,
   uint32_t aEntrySize, uint32_t aLength = PL_DHASH_DEFAULT_INITIAL_LENGTH);
+void PL_DHashTableInit(
+  PLDHashTable2* aTable, const PLDHashTableOps* aOps,
+  uint32_t aEntrySize, uint32_t aLength = PL_DHASH_DEFAULT_INITIAL_LENGTH);
 
 /*
- * Free |aTable|'s entry storage. Use this function to finalize a PLDHashTable
- * that was initialized with PL_DHashTableInit().
+ * Free |aTable|'s entry storage (via aTable->mOps->freeTable). Use this
+ * function to destroy a PLDHashTable that is allocated on the stack or in
+ * static memory and was created via PL_DHashTableInit().
  */
 void PL_DHashTableFinish(PLDHashTable* aTable);
+void PL_DHashTableFinish(PLDHashTable2* aTable);
 
 /*
  * To search for a key in |table|, call:
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/standalone/nsXPCOMGlue.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/standalone/nsXPCOMGlue.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/standalone/nsXPCOMGlue.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/standalone/nsXPCOMGlue.cpp	2015-05-25 20:44:12.000000000 +0000
@@ -526,7 +526,7 @@
 }
 
 XPCOM_API(nsresult)
-NS_GetDebug(nsIDebug** aResult)
+NS_GetDebug(nsIDebug2** aResult)
 {
   if (!xpcomFunctions.getDebug) {
     return NS_ERROR_NOT_INITIALIZED;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/tests/gtest/TestThreadUtils.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/tests/gtest/TestThreadUtils.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/glue/tests/gtest/TestThreadUtils.cpp	2015-05-13 18:06:28.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/glue/tests/gtest/TestThreadUtils.cpp	2015-05-25 20:44:12.000000000 +0000
@@ -219,6 +219,39 @@
 
 NS_IMPL_ISUPPORTS(ThreadUtilsObject, IThreadUtilsObject)
 
+class ThreadUtilsRefCountedFinal final
+{
+public:
+  ThreadUtilsRefCountedFinal() : m_refCount(0) {}
+  ~ThreadUtilsRefCountedFinal() {}
+  // 'AddRef' and 'Release' methods with different return types, to verify
+  // that the return type doesn't influence storage selection.
+  long AddRef(void) { return ++m_refCount; }
+  void Release(void) { --m_refCount; }
+private:
+  long m_refCount;
+};
+
+class ThreadUtilsRefCountedBase
+{
+public:
+  ThreadUtilsRefCountedBase() : m_refCount(0) {}
+  virtual ~ThreadUtilsRefCountedBase() {}
+  // 'AddRef' and 'Release' methods with different return types, to verify
+  // that the return type doesn't influence storage selection.
+  virtual void AddRef(void) { ++m_refCount; }
+  virtual MozExternalRefCountType Release(void) { return --m_refCount; }
+private:
+  MozExternalRefCountType m_refCount;
+};
+
+class ThreadUtilsRefCountedDerived
+  : public ThreadUtilsRefCountedBase
+{};
+
+class ThreadUtilsNonRefCounted
+{};
+
 } // namespace TestThreadUtils;
 
 TEST(ThreadUtils, main)
@@ -275,11 +308,11 @@
   static_assert(
       mozilla::IsSame< ::detail::ParameterStorage<int>::Type,
                       StoreCopyPassByValue<int>>::value,
-      "ns::detail::ParameterStorage<int>::Type should be StoreCopyPassByValue<int>");
+      "detail::ParameterStorage<int>::Type should be StoreCopyPassByValue<int>");
   static_assert(
       mozilla::IsSame< ::detail::ParameterStorage<StoreCopyPassByValue<int>>::Type,
                       StoreCopyPassByValue<int>>::value,
-      "ns::detail::ParameterStorage<StoreCopyPassByValue<int>>::Type should be StoreCopyPassByValue<int>");
+      "detail::ParameterStorage<StoreCopyPassByValue<int>>::Type should be StoreCopyPassByValue<int>");
 
   r = NS_NewRunnableMethodWithArgs<int>(rpt, &ThreadUtilsObject::Test1i, 12);
   r->Run();
@@ -322,22 +355,22 @@
   // Raw pointer, possible cv-qualified.
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<int*>::Type,
                                 StorePtrPassByPtr<int>>::value,
-                "ns::detail::ParameterStorage<int*>::Type should be StorePtrPassByPtr<int>");
+                "detail::ParameterStorage<int*>::Type should be StorePtrPassByPtr<int>");
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<int* const>::Type,
                                 StorePtrPassByPtr<int>>::value,
-                "ns::detail::ParameterStorage<int* const>::Type should be StorePtrPassByPtr<int>");
+                "detail::ParameterStorage<int* const>::Type should be StorePtrPassByPtr<int>");
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<int* volatile>::Type,
                                 StorePtrPassByPtr<int>>::value,
-                "ns::detail::ParameterStorage<int* volatile>::Type should be StorePtrPassByPtr<int>");
+                "detail::ParameterStorage<int* volatile>::Type should be StorePtrPassByPtr<int>");
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<int* const volatile>::Type,
                                 StorePtrPassByPtr<int>>::value,
-                "ns::detail::ParameterStorage<int* const volatile>::Type should be StorePtrPassByPtr<int>");
+                "detail::ParameterStorage<int* const volatile>::Type should be StorePtrPassByPtr<int>");
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<int*>::Type::stored_type,
                                 int*>::value,
-                "ns::detail::ParameterStorage<int*>::Type::stored_type should be int*");
+                "detail::ParameterStorage<int*>::Type::stored_type should be int*");
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<int*>::Type::passed_type,
                                 int*>::value,
-                "ns::detail::ParameterStorage<int*>::Type::passed_type should be int*");
+                "detail::ParameterStorage<int*>::Type::passed_type should be int*");
   {
     int i = 12;
     r = NS_NewRunnableMethodWithArgs<int*>(rpt, &ThreadUtilsObject::Test1pi, &i);
@@ -349,22 +382,22 @@
   // Raw pointer to const.
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<const int*>::Type,
                                 StoreConstPtrPassByConstPtr<int>>::value,
-                "ns::detail::ParameterStorage<const int*>::Type should be StoreConstPtrPassByConstPtr<int>");
+                "detail::ParameterStorage<const int*>::Type should be StoreConstPtrPassByConstPtr<int>");
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<const int* const>::Type,
                                 StoreConstPtrPassByConstPtr<int>>::value,
-                "ns::detail::ParameterStorage<const int* const>::Type should be StoreConstPtrPassByConstPtr<int>");
+                "detail::ParameterStorage<const int* const>::Type should be StoreConstPtrPassByConstPtr<int>");
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<const int* volatile>::Type,
                                 StoreConstPtrPassByConstPtr<int>>::value,
-                "ns::detail::ParameterStorage<const int* volatile>::Type should be StoreConstPtrPassByConstPtr<int>");
+                "detail::ParameterStorage<const int* volatile>::Type should be StoreConstPtrPassByConstPtr<int>");
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<const int* const volatile>::Type,
                                 StoreConstPtrPassByConstPtr<int>>::value,
-                "ns::detail::ParameterStorage<const int* const volatile>::Type should be StoreConstPtrPassByConstPtr<int>");
+                "detail::ParameterStorage<const int* const volatile>::Type should be StoreConstPtrPassByConstPtr<int>");
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<const int*>::Type::stored_type,
                                 const int*>::value,
-                "ns::detail::ParameterStorage<const int*>::Type::stored_type should be const int*");
+                "detail::ParameterStorage<const int*>::Type::stored_type should be const int*");
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<const int*>::Type::passed_type,
                                 const int*>::value,
-                "ns::detail::ParameterStorage<const int*>::Type::passed_type should be const int*");
+                "detail::ParameterStorage<const int*>::Type::passed_type should be const int*");
   {
     int i = 1201;
     r = NS_NewRunnableMethodWithArgs<const int*>(rpt, &ThreadUtilsObject::Test1pci, &i);
@@ -408,10 +441,10 @@
   // nsRefPtr to pointer.
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<StorensRefPtrPassByPtr<SpyWithISupports>>::Type,
                                 StorensRefPtrPassByPtr<SpyWithISupports>>::value,
-                "ns::detail::ParameterStorage<StorensRefPtrPassByPtr<SpyWithISupports>>::Type should be StorensRefPtrPassByPtr<SpyWithISupports>");
+                "ParameterStorage<StorensRefPtrPassByPtr<SpyWithISupports>>::Type should be StorensRefPtrPassByPtr<SpyWithISupports>");
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<SpyWithISupports*>::Type,
                                 StorensRefPtrPassByPtr<SpyWithISupports>>::value,
-                "ns::detail::ParameterStorage<SpyWithISupports*>::Type should be StorensRefPtrPassByPtr<SpyWithISupports>");
+                "ParameterStorage<SpyWithISupports*>::Type should be StorensRefPtrPassByPtr<SpyWithISupports>");
   static_assert(mozilla::IsSame<StorensRefPtrPassByPtr<SpyWithISupports>::stored_type,
                                 nsRefPtr<SpyWithISupports>>::value,
                 "StorensRefPtrPassByPtr<SpyWithISupports>::stored_type should be nsRefPtr<SpyWithISupports>");
@@ -420,19 +453,42 @@
                 "StorensRefPtrPassByPtr<SpyWithISupports>::passed_type should be SpyWithISupports*");
   // (more nsRefPtr tests below)
 
+  // nsRefPtr for ref-countable classes that do not derive from ISupports.
+  static_assert(::detail::HasRefCountMethods<ThreadUtilsRefCountedFinal>::value,
+                "ThreadUtilsRefCountedFinal has AddRef() and Release()");
+  static_assert(mozilla::IsSame< ::detail::ParameterStorage<ThreadUtilsRefCountedFinal*>::Type,
+                                StorensRefPtrPassByPtr<ThreadUtilsRefCountedFinal>>::value,
+                "ParameterStorage<ThreadUtilsRefCountedFinal*>::Type should be StorensRefPtrPassByPtr<ThreadUtilsRefCountedFinal>");
+  static_assert(::detail::HasRefCountMethods<ThreadUtilsRefCountedBase>::value,
+                "ThreadUtilsRefCountedBase has AddRef() and Release()");
+  static_assert(mozilla::IsSame< ::detail::ParameterStorage<ThreadUtilsRefCountedBase*>::Type,
+                                StorensRefPtrPassByPtr<ThreadUtilsRefCountedBase>>::value,
+                "ParameterStorage<ThreadUtilsRefCountedBase*>::Type should be StorensRefPtrPassByPtr<ThreadUtilsRefCountedBase>");
+  static_assert(::detail::HasRefCountMethods<ThreadUtilsRefCountedDerived>::value,
+                "ThreadUtilsRefCountedDerived has AddRef() and Release()");
+  static_assert(mozilla::IsSame< ::detail::ParameterStorage<ThreadUtilsRefCountedDerived*>::Type,
+                                StorensRefPtrPassByPtr<ThreadUtilsRefCountedDerived>>::value,
+                "ParameterStorage<ThreadUtilsRefCountedDerived*>::Type should be StorensRefPtrPassByPtr<ThreadUtilsRefCountedDerived>");
+
+  static_assert(!::detail::HasRefCountMethods<ThreadUtilsNonRefCounted>::value,
+                "ThreadUtilsNonRefCounted doesn't have AddRef() and Release()");
+  static_assert(!mozilla::IsSame< ::detail::ParameterStorage<ThreadUtilsNonRefCounted*>::Type,
+                                 StorensRefPtrPassByPtr<ThreadUtilsNonRefCounted>>::value,
+                "ParameterStorage<ThreadUtilsNonRefCounted*>::Type should NOT be StorensRefPtrPassByPtr<ThreadUtilsNonRefCounted>");
+
   // Lvalue reference.
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<int&>::Type,
                                 StoreRefPassByLRef<int>>::value,
-                "ns::detail::ParameterStorage<int&>::Type should be StoreRefPassByLRef<int>");
+                "ParameterStorage<int&>::Type should be StoreRefPassByLRef<int>");
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<int&>::Type::stored_type,
                                 StoreRefPassByLRef<int>::stored_type>::value,
-                "ns::detail::ParameterStorage<int&>::Type::stored_type should be StoreRefPassByLRef<int>::stored_type");
+                "ParameterStorage<int&>::Type::stored_type should be StoreRefPassByLRef<int>::stored_type");
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<int&>::Type::stored_type,
                                 int&>::value,
-                "ns::detail::ParameterStorage<int&>::Type::stored_type should be int&");
+                "ParameterStorage<int&>::Type::stored_type should be int&");
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<int&>::Type::passed_type,
                                 int&>::value,
-                "ns::detail::ParameterStorage<int&>::Type::passed_type should be int&");
+                "ParameterStorage<int&>::Type::passed_type should be int&");
   {
     int i = 13;
     r = NS_NewRunnableMethodWithArgs<int&>(rpt, &ThreadUtilsObject::Test1ri, i);
@@ -444,16 +500,16 @@
   // Rvalue reference -- Actually storing a copy and then moving it.
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<int&&>::Type,
                                 StoreCopyPassByRRef<int>>::value,
-                "ns::detail::ParameterStorage<int&&>::Type should be StoreCopyPassByRRef<int>");
+                "ParameterStorage<int&&>::Type should be StoreCopyPassByRRef<int>");
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<int&&>::Type::stored_type,
                                 StoreCopyPassByRRef<int>::stored_type>::value,
-                "ns::detail::ParameterStorage<int&&>::Type::stored_type should be StoreCopyPassByRRef<int>::stored_type");
+                "ParameterStorage<int&&>::Type::stored_type should be StoreCopyPassByRRef<int>::stored_type");
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<int&&>::Type::stored_type,
                                 int>::value,
-                "ns::detail::ParameterStorage<int&&>::Type::stored_type should be int");
+                "ParameterStorage<int&&>::Type::stored_type should be int");
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<int&&>::Type::passed_type,
                                 int&&>::value,
-                "ns::detail::ParameterStorage<int&&>::Type::passed_type should be int&&");
+                "ParameterStorage<int&&>::Type::passed_type should be int&&");
   {
     int i = 14;
     r = NS_NewRunnableMethodWithArgs<int&&>(
@@ -466,16 +522,16 @@
   // Null unique pointer, by semi-implicit store&move with "T&&" syntax.
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<mozilla::UniquePtr<int>&&>::Type,
                                 StoreCopyPassByRRef<mozilla::UniquePtr<int>>>::value,
-                "ns::detail::ParameterStorage<UniquePtr<int>&&>::Type should be StoreCopyPassByRRef<UniquePtr<int>>");
+                "ParameterStorage<UniquePtr<int>&&>::Type should be StoreCopyPassByRRef<UniquePtr<int>>");
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<mozilla::UniquePtr<int>&&>::Type::stored_type,
                                 StoreCopyPassByRRef<mozilla::UniquePtr<int>>::stored_type>::value,
-                "ns::detail::ParameterStorage<UniquePtr<int>&&>::Type::stored_type should be StoreCopyPassByRRef<UniquePtr<int>>::stored_type");
+                "ParameterStorage<UniquePtr<int>&&>::Type::stored_type should be StoreCopyPassByRRef<UniquePtr<int>>::stored_type");
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<mozilla::UniquePtr<int>&&>::Type::stored_type,
                                 mozilla::UniquePtr<int>>::value,
-                "ns::detail::ParameterStorage<UniquePtr<int>&&>::Type::stored_type should be UniquePtr<int>");
+                "ParameterStorage<UniquePtr<int>&&>::Type::stored_type should be UniquePtr<int>");
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<mozilla::UniquePtr<int>&&>::Type::passed_type,
                                 mozilla::UniquePtr<int>&&>::value,
-                "ns::detail::ParameterStorage<UniquePtr<int>&&>::Type::passed_type should be UniquePtr<int>&&");
+                "ParameterStorage<UniquePtr<int>&&>::Type::passed_type should be UniquePtr<int>&&");
   {
     mozilla::UniquePtr<int> upi;
     r = NS_NewRunnableMethodWithArgs<mozilla::UniquePtr<int>&&>(
@@ -489,16 +545,16 @@
   // Null unique pointer, by explicit store&move with "StoreCopyPassByRRef<T>" syntax.
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<StoreCopyPassByRRef<mozilla::UniquePtr<int>>>::Type::stored_type,
                                 StoreCopyPassByRRef<mozilla::UniquePtr<int>>::stored_type>::value,
-                "ns::detail::ParameterStorage<StoreCopyPassByRRef<UniquePtr<int>>>::Type::stored_type should be StoreCopyPassByRRef<UniquePtr<int>>::stored_type");
+                "ParameterStorage<StoreCopyPassByRRef<UniquePtr<int>>>::Type::stored_type should be StoreCopyPassByRRef<UniquePtr<int>>::stored_type");
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<StoreCopyPassByRRef<mozilla::UniquePtr<int>>>::Type::stored_type,
                                 StoreCopyPassByRRef<mozilla::UniquePtr<int>>::stored_type>::value,
-                "ns::detail::ParameterStorage<StoreCopyPassByRRef<UniquePtr<int>>>::Type::stored_type should be StoreCopyPassByRRef<UniquePtr<int>>::stored_type");
+                "ParameterStorage<StoreCopyPassByRRef<UniquePtr<int>>>::Type::stored_type should be StoreCopyPassByRRef<UniquePtr<int>>::stored_type");
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<StoreCopyPassByRRef<mozilla::UniquePtr<int>>>::Type::stored_type,
                                 mozilla::UniquePtr<int>>::value,
-                "ns::detail::ParameterStorage<StoreCopyPassByRRef<UniquePtr<int>>>::Type::stored_type should be UniquePtr<int>");
+                "ParameterStorage<StoreCopyPassByRRef<UniquePtr<int>>>::Type::stored_type should be UniquePtr<int>");
   static_assert(mozilla::IsSame< ::detail::ParameterStorage<StoreCopyPassByRRef<mozilla::UniquePtr<int>>>::Type::passed_type,
                                 mozilla::UniquePtr<int>&&>::value,
-                "ns::detail::ParameterStorage<StoreCopyPassByRRef<UniquePtr<int>>>::Type::passed_type should be UniquePtr<int>&&");
+                "ParameterStorage<StoreCopyPassByRRef<UniquePtr<int>>>::Type::passed_type should be UniquePtr<int>&&");
   {
     mozilla::UniquePtr<int> upi;
     r = NS_NewRunnableMethodWithArgs
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/io/nsDirectoryServiceAtomList.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/io/nsDirectoryServiceAtomList.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/io/nsDirectoryServiceAtomList.h	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/io/nsDirectoryServiceAtomList.h	2015-05-25 20:44:12.000000000 +0000
@@ -74,7 +74,7 @@
 DIR_ATOM(sLocalAppdata, NS_WIN_LOCAL_APPDATA_DIR)
 #if defined(MOZ_CONTENT_SANDBOX)
 DIR_ATOM(sLocalAppdataLow, NS_WIN_LOCAL_APPDATA_LOW_DIR)
-DIR_ATOM(sLowIntegrityTemp, NS_WIN_LOW_INTEGRITY_TEMP)
+DIR_ATOM(sLowIntegrityTempBase, NS_WIN_LOW_INTEGRITY_TEMP_BASE)
 #endif
 DIR_ATOM(sPrinthood, NS_WIN_PRINTHOOD)
 DIR_ATOM(sWinCookiesDirectory, NS_WIN_COOKIES_DIR)
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/io/nsDirectoryService.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/io/nsDirectoryService.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/io/nsDirectoryService.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/io/nsDirectoryService.cpp	2015-05-25 20:44:12.000000000 +0000
@@ -24,10 +24,6 @@
 #include <shlobj.h>
 #include <stdlib.h>
 #include <stdio.h>
-
-#if defined(MOZ_CONTENT_SANDBOX)
-#include "nsIUUIDGenerator.h"
-#endif
 #elif defined(XP_UNIX)
 #include <unistd.h>
 #include <stdlib.h>
@@ -502,7 +498,7 @@
 
 #if defined(MOZ_CONTENT_SANDBOX) && defined(XP_WIN)
 static nsresult
-GetLowIntegrityTemp(nsIFile** aLowIntegrityTemp)
+GetLowIntegrityTempBase(nsIFile** aLowIntegrityTempBase)
 {
   nsCOMPtr<nsIFile> localFile;
   nsresult rv = GetSpecialSystemDirectory(Win_LocalAppdataLow,
@@ -511,37 +507,12 @@
     return rv;
   }
 
-  nsCOMPtr<nsIUUIDGenerator> uuidgen =
-    do_GetService("@mozilla.org/uuid-generator;1", &rv);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  nsID uuid;
-  rv = uuidgen->GenerateUUIDInPlace(&uuid);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  char uuidChars[NSID_LENGTH];
-  uuid.ToProvidedString(uuidChars);
-  rv = localFile->AppendNative(NS_LITERAL_CSTRING(MOZ_USER_DIR));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  rv = localFile->AppendNative(NS_LITERAL_CSTRING("MozTemp-")
-                               + nsDependentCString(uuidChars));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  rv = localFile->Create(nsIFile::DIRECTORY_TYPE, 0700);
+  rv = localFile->Append(NS_LITERAL_STRING(MOZ_USER_DIR));
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
 
-  localFile.forget(aLowIntegrityTemp);
+  localFile.forget(aLowIntegrityTempBase);
   return rv;
 }
 #endif
@@ -722,8 +693,8 @@
 #if defined(MOZ_CONTENT_SANDBOX)
   } else if (inAtom == nsDirectoryService::sLocalAppdataLow) {
     rv = GetSpecialSystemDirectory(Win_LocalAppdataLow, getter_AddRefs(localFile));
-  } else if (inAtom == nsDirectoryService::sLowIntegrityTemp) {
-    rv = GetLowIntegrityTemp(getter_AddRefs(localFile));
+  } else if (inAtom == nsDirectoryService::sLowIntegrityTempBase) {
+    rv = GetLowIntegrityTempBase(getter_AddRefs(localFile));
 #endif
   } else if (inAtom == nsDirectoryService::sPrinthood) {
     rv = GetSpecialSystemDirectory(Win_Printhood, getter_AddRefs(localFile));
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/io/nsDirectoryServiceDefs.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/io/nsDirectoryServiceDefs.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/io/nsDirectoryServiceDefs.h	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/io/nsDirectoryServiceDefs.h	2015-05-25 20:44:12.000000000 +0000
@@ -131,7 +131,7 @@
   #define NS_WIN_LOCAL_APPDATA_DIR            "LocalAppData"
 #if defined(MOZ_CONTENT_SANDBOX)
   #define NS_WIN_LOCAL_APPDATA_LOW_DIR        "LocalAppDataLow"
-  #define NS_WIN_LOW_INTEGRITY_TEMP           "LowTmpD"
+  #define NS_WIN_LOW_INTEGRITY_TEMP_BASE      "LowTmpDBase"
 #endif
   #define NS_WIN_PRINTHOOD                    "PrntHd"
   #define NS_WIN_COOKIES_DIR                  "CookD"
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/io/nsIFile.idl firefox-trunk-41.0~a1~hg20150524r245419/xpcom/io/nsIFile.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/io/nsIFile.idl	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/io/nsIFile.idl	2015-05-25 20:44:12.000000000 +0000
@@ -42,7 +42,7 @@
  * be safely passed to javascript via xpconnect.  Therefore, the "native
  * methods" are not scriptable.
  */
-[scriptable, main_process_scriptable_only, uuid(7441fb13-4d9f-42fd-836f-a165692938af), builtinclass]
+[scriptable, main_process_scriptable_only, uuid(890b802d-3522-4887-a892-3dab31df30d9), builtinclass]
 interface nsIFile : nsISupports
 {
     /**
@@ -189,6 +189,7 @@
      *  This object will still point to the old location after renaming.
      */
     void renameTo(in nsIFile newParentDir, in AString newName);
+    [noscript] void renameToNative(in nsIFile newParentDir, in ACString newName);
 
     /**
      *  This will try to delete this file.  The 'recursive' flag
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/io/nsInputStreamTee.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/io/nsInputStreamTee.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/io/nsInputStreamTee.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/io/nsInputStreamTee.cpp	2015-05-25 20:44:12.000000000 +0000
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include <stdlib.h>
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 #include "mozilla/Mutex.h"
 #include "mozilla/Attributes.h"
@@ -31,7 +31,7 @@
   }
   return sLog;
 }
-#define LOG(args) PR_LOG(GetTeeLog(), PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(GetTeeLog(), PR_LOG_DEBUG, args)
 
 class nsInputStreamTee final : public nsIInputStreamTee
 {
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/io/nsLocalFileUnix.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/io/nsLocalFileUnix.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/io/nsLocalFileUnix.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/io/nsLocalFileUnix.cpp	2015-05-25 20:44:12.000000000 +0000
@@ -28,6 +28,9 @@
 #define USE_LINUX_QUOTACTL
 #include <sys/mount.h>
 #include <sys/quota.h>
+#ifndef BLOCK_SIZE
+#define BLOCK_SIZE 1024 /* kernel block size */
+#endif
 #endif
 
 #include "xpcom-private.h"
@@ -2154,6 +2157,12 @@
 NS_IMETHODIMP
 nsLocalFile::RenameTo(nsIFile* aNewParentDir, const nsAString& aNewName)
 {
+  SET_UCS_2ARGS_2(RenameToNative, aNewParentDir, aNewName);
+}
+
+NS_IMETHODIMP
+nsLocalFile::RenameToNative(nsIFile* aNewParentDir, const nsACString& aNewName)
+{
   nsresult rv;
 
   // check to make sure that this has been initialized properly
@@ -2161,12 +2170,7 @@
 
   // check to make sure that we have a new parent
   nsAutoCString newPathName;
-  nsAutoCString newNativeName;
-  rv = NS_CopyUnicodeToNative(aNewName, newNativeName);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-  rv = GetNativeTargetPathName(aNewParentDir, newNativeName, newPathName);
+  rv = GetNativeTargetPathName(aNewParentDir, aNewName, newPathName);
   if (NS_FAILED(rv)) {
     return rv;
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/io/nsLocalFileWin.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/io/nsLocalFileWin.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/io/nsLocalFileWin.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/io/nsLocalFileWin.cpp	2015-05-25 20:44:12.000000000 +0000
@@ -2269,6 +2269,18 @@
 }
 
 NS_IMETHODIMP
+nsLocalFile::RenameToNative(nsIFile* aNewParentDir, const nsACString& aNewName)
+{
+  nsAutoString tmp;
+  nsresult rv = NS_CopyNativeToUnicode(aNewName, tmp);
+  if (NS_SUCCEEDED(rv)) {
+    return RenameTo(aNewParentDir, tmp);
+  }
+
+  return rv;
+}
+
+NS_IMETHODIMP
 nsLocalFile::Load(PRLibrary** aResult)
 {
   // Check we are correctly initialized.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/io/nsMultiplexInputStream.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/io/nsMultiplexInputStream.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/io/nsMultiplexInputStream.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/io/nsMultiplexInputStream.cpp	2015-05-25 20:44:12.000000000 +0000
@@ -59,6 +59,7 @@
                              const char* aFromRawSegment, uint32_t aToOffset,
                              uint32_t aCount, uint32_t* aWriteCount);
 
+  Mutex mLock; // Protects access to all data members.
   nsTArray<nsCOMPtr<nsIInputStream>> mStreams;
   uint32_t mCurrentStream;
   bool mStartedReadingCurrent;
@@ -119,7 +120,8 @@
 }
 
 nsMultiplexInputStream::nsMultiplexInputStream()
-  : mCurrentStream(0),
+  : mLock("nsMultiplexInputStream lock"),
+    mCurrentStream(0),
     mStartedReadingCurrent(false),
     mStatus(NS_OK)
 {
@@ -129,6 +131,7 @@
 NS_IMETHODIMP
 nsMultiplexInputStream::GetCount(uint32_t* aCount)
 {
+  MutexAutoLock lock(mLock);
   *aCount = mStreams.Length();
   return NS_OK;
 }
@@ -150,6 +153,7 @@
 NS_IMETHODIMP
 nsMultiplexInputStream::AppendStream(nsIInputStream* aStream)
 {
+  MutexAutoLock lock(mLock);
   NS_ASSERTION(SeekableStreamAtBeginning(aStream),
                "Appended stream not at beginning.");
   return mStreams.AppendElement(aStream) ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
@@ -159,6 +163,7 @@
 NS_IMETHODIMP
 nsMultiplexInputStream::InsertStream(nsIInputStream* aStream, uint32_t aIndex)
 {
+  MutexAutoLock lock(mLock);
   NS_ASSERTION(SeekableStreamAtBeginning(aStream),
                "Inserted stream not at beginning.");
   mStreams.InsertElementAt(aIndex, aStream);
@@ -173,6 +178,7 @@
 NS_IMETHODIMP
 nsMultiplexInputStream::RemoveStream(uint32_t aIndex)
 {
+  MutexAutoLock lock(mLock);
   mStreams.RemoveElementAt(aIndex);
   if (mCurrentStream > aIndex) {
     --mCurrentStream;
@@ -187,6 +193,7 @@
 NS_IMETHODIMP
 nsMultiplexInputStream::GetStream(uint32_t aIndex, nsIInputStream** aResult)
 {
+  MutexAutoLock lock(mLock);
   *aResult = mStreams.SafeElementAt(aIndex, nullptr);
   if (NS_WARN_IF(!*aResult)) {
     return NS_ERROR_NOT_AVAILABLE;
@@ -200,6 +207,7 @@
 NS_IMETHODIMP
 nsMultiplexInputStream::Close()
 {
+  MutexAutoLock lock(mLock);
   mStatus = NS_BASE_STREAM_CLOSED;
 
   nsresult rv = NS_OK;
@@ -219,6 +227,7 @@
 NS_IMETHODIMP
 nsMultiplexInputStream::Available(uint64_t* aResult)
 {
+  MutexAutoLock lock(mLock);
   if (NS_FAILED(mStatus)) {
     return mStatus;
   }
@@ -243,6 +252,7 @@
 NS_IMETHODIMP
 nsMultiplexInputStream::Read(char* aBuf, uint32_t aCount, uint32_t* aResult)
 {
+  MutexAutoLock lock(mLock);
   // It is tempting to implement this method in terms of ReadSegments, but
   // that would prevent this class from being used with streams that only
   // implement Read (e.g., file streams).
@@ -294,6 +304,8 @@
 nsMultiplexInputStream::ReadSegments(nsWriteSegmentFun aWriter, void* aClosure,
                                      uint32_t aCount, uint32_t* aResult)
 {
+  MutexAutoLock lock(mLock);
+
   if (mStatus == NS_BASE_STREAM_CLOSED) {
     *aResult = 0;
     return NS_OK;
@@ -371,6 +383,8 @@
 NS_IMETHODIMP
 nsMultiplexInputStream::IsNonBlocking(bool* aNonBlocking)
 {
+  MutexAutoLock lock(mLock);
+
   uint32_t len = mStreams.Length();
   if (len == 0) {
     // Claim to be non-blocking, since we won't block the caller.
@@ -399,6 +413,8 @@
 NS_IMETHODIMP
 nsMultiplexInputStream::Seek(int32_t aWhence, int64_t aOffset)
 {
+  MutexAutoLock lock(mLock);
+
   if (NS_FAILED(mStatus)) {
     return mStatus;
   }
@@ -640,6 +656,8 @@
 NS_IMETHODIMP
 nsMultiplexInputStream::Tell(int64_t* aResult)
 {
+  MutexAutoLock lock(mLock);
+
   if (NS_FAILED(mStatus)) {
     return mStatus;
   }
@@ -697,6 +715,8 @@
 nsMultiplexInputStream::Serialize(InputStreamParams& aParams,
                                   FileDescriptorArray& aFileDescriptors)
 {
+  MutexAutoLock lock(mLock);
+
   MultiplexInputStreamParams params;
 
   uint32_t streamCount = mStreams.Length();
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/io/nsPipe3.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/io/nsPipe3.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/io/nsPipe3.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/io/nsPipe3.cpp	2015-05-25 20:44:12.000000000 +0000
@@ -16,7 +16,7 @@
 #include "nsStreamUtils.h"
 #include "nsCOMPtr.h"
 #include "nsCRT.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsIClassInfoImpl.h"
 #include "nsAlgorithm.h"
 #include "nsMemory.h"
@@ -40,7 +40,7 @@
   }
   return sLog;
 }
-#define LOG(args) PR_LOG(GetPipeLog(), PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(GetPipeLog(), PR_LOG_DEBUG, args)
 
 #define DEFAULT_SEGMENT_SIZE  4096
 #define DEFAULT_SEGMENT_COUNT 16
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/io/nsStorageStream.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/io/nsStorageStream.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/io/nsStorageStream.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/io/nsStorageStream.cpp	2015-05-25 20:44:13.000000000 +0000
@@ -21,7 +21,7 @@
 #include "nsIInputStream.h"
 #include "nsIIPCSerializableInputStream.h"
 #include "nsISeekableStream.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/Likely.h"
 #include "mozilla/MathAlgorithms.h"
@@ -53,7 +53,7 @@
 #ifdef LOG
 #undef LOG
 #endif
-#define LOG(args) PR_LOG(GetStorageStreamLog(), PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(GetStorageStreamLog(), PR_LOG_DEBUG, args)
 
 nsStorageStream::nsStorageStream()
   : mSegmentedBuffer(0), mSegmentSize(0), mWriteInProgress(false),
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/io/nsUnicharInputStream.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/io/nsUnicharInputStream.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/io/nsUnicharInputStream.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/io/nsUnicharInputStream.cpp	2015-05-25 20:44:13.000000000 +0000
@@ -162,8 +162,8 @@
 nsresult
 UTF8InputStream::Init(nsIInputStream* aStream)
 {
-  if (!mByteData.SetCapacity(STRING_BUFFER_SIZE) ||
-      !mUnicharData.SetCapacity(STRING_BUFFER_SIZE)) {
+  if (!mByteData.SetCapacity(STRING_BUFFER_SIZE, mozilla::fallible) ||
+      !mUnicharData.SetCapacity(STRING_BUFFER_SIZE, mozilla::fallible)) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
   mInput = aStream;
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/io/SnappyUncompressInputStream.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/io/SnappyUncompressInputStream.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/io/SnappyUncompressInputStream.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/io/SnappyUncompressInputStream.cpp	2015-05-25 20:44:12.000000000 +0000
@@ -16,8 +16,16 @@
 NS_IMPL_ISUPPORTS(SnappyUncompressInputStream,
                   nsIInputStream);
 
-static size_t kCompressedBufferLength =
-  detail::SnappyFrameUtils::MaxCompressedBufferLength(snappy::kBlockSize);
+// Putting kCompressedBufferLength inside a function avoids a static
+// constructor.
+static size_t CompressedBufferLength()
+{
+  static size_t kCompressedBufferLength =
+      detail::SnappyFrameUtils::MaxCompressedBufferLength(snappy::kBlockSize);
+
+  MOZ_ASSERT(kCompressedBufferLength > 0);
+  return kCompressedBufferLength;
+}
 
 SnappyUncompressInputStream::SnappyUncompressInputStream(nsIInputStream* aBaseStream)
   : mBaseStream(aBaseStream)
@@ -195,7 +203,7 @@
   }
 
   if (!mCompressedBuffer) {
-    mCompressedBuffer.reset(new (fallible) char[kCompressedBufferLength]);
+    mCompressedBuffer.reset(new (fallible) char[CompressedBufferLength()]);
     if (NS_WARN_IF(!mCompressedBuffer)) {
       return NS_ERROR_OUT_OF_MEMORY;
     }
@@ -208,7 +216,7 @@
     const uint32_t firstReadLength = kHeaderLength +
                                      kStreamIdentifierDataLength +
                                      kHeaderLength;
-    MOZ_ASSERT(firstReadLength <= kCompressedBufferLength);
+    MOZ_ASSERT(firstReadLength <= CompressedBufferLength());
 
     rv = ReadAll(mCompressedBuffer.get(), firstReadLength, firstReadLength,
                  aBytesReadOut);
@@ -261,7 +269,7 @@
   // We have no decompressed data, but we do know the size of the next chunk.
   // Read at least that much from the base stream.
   uint32_t readLength = mNextChunkDataLength;
-  MOZ_ASSERT(readLength <= kCompressedBufferLength);
+  MOZ_ASSERT(readLength <= CompressedBufferLength());
 
   // However, if there is enough data in the base stream, also read the next
   // chunk header.  This helps optimize the stream by avoiding many small reads.
@@ -270,7 +278,7 @@
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
   if (avail >= (readLength + kHeaderLength)) {
     readLength += kHeaderLength;
-    MOZ_ASSERT(readLength <= kCompressedBufferLength);
+    MOZ_ASSERT(readLength <= CompressedBufferLength());
   }
 
   rv = ReadAll(mCompressedBuffer.get(), readLength, mNextChunkDataLength,
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/string/nsLiteralString.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/string/nsLiteralString.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/string/nsLiteralString.h	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/string/nsLiteralString.h	2015-05-25 20:44:13.000000000 +0000
@@ -30,8 +30,8 @@
 #define NS_LITERAL_STRING_INIT(n,s)               n(MOZ_UTF16(s))
 #define NS_NAMED_LITERAL_STRING(n,s)              const nsLiteralString n(MOZ_UTF16(s))
 
-#define NS_LITERAL_CSTRING(s)                     static_cast<const nsLiteralCString&>(nsLiteralCString(s))
-#define NS_LITERAL_CSTRING_INIT(n,s)              n(s)
-#define NS_NAMED_LITERAL_CSTRING(n,s)             const nsLiteralCString n(s)
+#define NS_LITERAL_CSTRING(s)                     static_cast<const nsLiteralCString&>(nsLiteralCString("" s))
+#define NS_LITERAL_CSTRING_INIT(n,s)              n("" s)
+#define NS_NAMED_LITERAL_CSTRING(n,s)             const nsLiteralCString n("" s)
 
 #endif /* !defined(nsLiteralString_h___) */
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/string/nsSubstring.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/string/nsSubstring.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/string/nsSubstring.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/string/nsSubstring.cpp	2015-05-25 20:44:13.000000000 +0000
@@ -355,7 +355,7 @@
 // Check that internal and external strings have the same size.
 // See https://bugzilla.mozilla.org/show_bug.cgi?id=430581
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsXPCOMStrings.h"
 
 static_assert(sizeof(nsStringContainer_base) == sizeof(nsSubstring),
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/system/nsICrashReporter.idl firefox-trunk-41.0~a1~hg20150524r245419/xpcom/system/nsICrashReporter.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/system/nsICrashReporter.idl	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/system/nsICrashReporter.idl	2015-05-25 20:44:13.000000000 +0000
@@ -14,7 +14,7 @@
  *                    future releases.
  */
 
-[scriptable, uuid(ee431adc-21dd-42d9-968b-e19b4c62960a)]
+[scriptable, uuid(4b74c39a-cf69-4a8a-8e63-169d81ad1ecf)]
 interface nsICrashReporter : nsISupports
 {
   /**
@@ -61,7 +61,7 @@
    *                             Invalid characters for key are '=' and
    *                             '\n'.  Invalid character for data is '\0'.
    */
-  void annotateCrashReport(in ACString key, in ACString data);
+  void annotateCrashReport(in AUTF8String key, in AUTF8String data);
 
   /**
    * Append some data to the "Notes" field, to be submitted with a crash report.
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/tests/Makefile.in firefox-trunk-41.0~a1~hg20150524r245419/xpcom/tests/Makefile.in
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/tests/Makefile.in	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/tests/Makefile.in	2015-05-25 20:44:13.000000000 +0000
@@ -5,9 +5,6 @@
 # Make sure we have symbols in case we need to debug these.
 MOZ_DEBUG_SYMBOLS = 1
 
-# Don't add our test-only .xpt files to the normal manifests
-NO_INTERFACES_MANIFEST = 1
-
 include $(topsrcdir)/config/rules.mk
 
 ifneq (,$(SIMPLE_PROGRAMS))
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/tests/moz.build firefox-trunk-41.0~a1~hg20150524r245419/xpcom/tests/moz.build
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/tests/moz.build	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/tests/moz.build	2015-05-25 20:44:14.000000000 +0000
@@ -101,6 +101,9 @@
     'NotXPCOMTest.idl',
 ]
 
+# Don't add our test-only .xpt files to the normal manifests
+XPIDL_NO_MANIFEST = True
+
 LOCAL_INCLUDES += [
     '../ds',
 ]
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/tests/TestPLDHash.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/tests/TestPLDHash.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/tests/TestPLDHash.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/tests/TestPLDHash.cpp	2015-05-25 20:44:13.000000000 +0000
@@ -53,8 +53,7 @@
 
 static bool test_pldhash_lazy_storage()
 {
-  PLDHashTable t;
-  PL_DHashTableInit(&t, PL_DHashGetStubOps(), sizeof(PLDHashEntryStub));
+  PLDHashTable2 t(PL_DHashGetStubOps(), sizeof(PLDHashEntryStub));
 
   // PLDHashTable allocates entry storage lazily. Check that all the non-add
   // operations work appropriately when the table is empty and the storage
@@ -107,8 +106,6 @@
     return false;   // size is non-zero?
   }
 
-  PL_DHashTableFinish(&t);
-
   return true;
 }
 
@@ -131,19 +128,15 @@
     nullptr
   };
 
-  PLDHashTable t1, t2;
-  PL_DHashTableInit(&t1, &ops, sizeof(PLDHashEntryStub));
+  PLDHashTable2 t1(&ops, sizeof(PLDHashEntryStub));
   PL_DHashTableAdd(&t1, (const void*)88);
-  PL_DHashTableInit(&t2, &ops, sizeof(PLDHashEntryStub));
+  PLDHashTable2 t2(&ops, sizeof(PLDHashEntryStub));
   PL_DHashTableAdd(&t2, (const void*)99);
 
   t1 = mozilla::Move(t1);   // self-move
 
   t1 = mozilla::Move(t2);   // inited overwritten with inited
 
-  PL_DHashTableFinish(&t1);
-  PL_DHashTableFinish(&t2);
-
   PLDHashTable t3, t4;
   PL_DHashTableInit(&t3, &ops, sizeof(PLDHashEntryStub));
   PL_DHashTableAdd(&t3, (const void*)88);
@@ -165,8 +158,7 @@
   PLDHashTable t7;
   PLDHashTable t8(mozilla::Move(t7));   // new table constructed with uninited
 
-  PLDHashTable t9;
-  PL_DHashTableInit(&t9, &ops, sizeof(PLDHashEntryStub));
+  PLDHashTable2 t9(&ops, sizeof(PLDHashEntryStub));
   PL_DHashTableAdd(&t9, (const void*)88);
   PLDHashTable t10(mozilla::Move(t9));  // new table constructed with inited
 
@@ -186,7 +178,7 @@
   };
 
   // This is infallible.
-  PLDHashTable* t = new PLDHashTable(&ops, sizeof(PLDHashEntryStub), 128);
+  PLDHashTable2* t = new PLDHashTable2(&ops, sizeof(PLDHashEntryStub), 128);
 
   // Check that New() sets |t->ops|.
   if (!t->IsInitialized()) {
@@ -206,11 +198,11 @@
   // We stop when the element count is 96.875% of PL_DHASH_MAX_SIZE (see
   // MaxLoadOnGrowthFailure()).
   if (numInserted != PL_DHASH_MAX_CAPACITY - (PL_DHASH_MAX_CAPACITY >> 5)) {
+    delete t;
     return false;
   }
 
   delete t;
-
   return true;
 }
 #endif
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/threads/nsEventQueue.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/threads/nsEventQueue.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/threads/nsEventQueue.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/threads/nsEventQueue.cpp	2015-05-25 20:44:14.000000000 +0000
@@ -6,7 +6,7 @@
 
 #include "nsEventQueue.h"
 #include "nsAutoPtr.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsThreadUtils.h"
 #include "prthread.h"
 #include "mozilla/ChaosMode.h"
@@ -25,7 +25,7 @@
 #ifdef LOG
 #undef LOG
 #endif
-#define LOG(args) PR_LOG(GetLog(), PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(GetLog(), PR_LOG_DEBUG, args)
 
 nsEventQueue::nsEventQueue()
   : mReentrantMonitor("nsEventQueue.mReentrantMonitor")
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/threads/nsIThreadManager.idl firefox-trunk-41.0~a1~hg20150524r245419/xpcom/threads/nsIThreadManager.idl
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/threads/nsIThreadManager.idl	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/threads/nsIThreadManager.idl	2015-05-25 20:44:14.000000000 +0000
@@ -13,7 +13,7 @@
 /**
  * An interface for creating and locating nsIThread instances.
  */
-[scriptable, uuid(04092259-4498-4c82-ac52-f9225eb114d0)]
+[scriptable, uuid(1be89eca-e2f7-453b-8d38-c11ba247f6f3)]
 interface nsIThreadManager : nsISupports
 {
   /**
@@ -65,11 +65,4 @@
    * application process.
    */
   readonly attribute boolean isMainThread;
-
-  /**
-   * Informs the thread manager to not monitor the status of the current thread.
-   * This method only works on platforms with Nuwa enabled; on other platforms,
-   * it throws an error.
-   */
-  [noscript] void setIgnoreThreadStatus();
 };
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/threads/nsThread.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/threads/nsThread.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/threads/nsThread.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/threads/nsThread.cpp	2015-05-25 20:44:14.000000000 +0000
@@ -15,13 +15,14 @@
 #undef LOG
 #endif
 
+#include "mozilla/ReentrantMonitor.h"
 #include "nsMemoryPressure.h"
 #include "nsThreadManager.h"
 #include "nsIClassInfoImpl.h"
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "pratom.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "nsIObserverService.h"
 #if !defined(MOZILLA_XPCOMRT_API)
 #include "mozilla/HangMonitor.h"
@@ -88,7 +89,7 @@
 #ifdef LOG
 #undef LOG
 #endif
-#define LOG(args) PR_LOG(GetThreadLog(), PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(GetThreadLog(), PR_LOG_DEBUG, args)
 
 NS_DECL_CI_INTERFACE_GETTER(nsThread)
 
@@ -330,10 +331,6 @@
 
   // Inform the ThreadManager
   nsThreadManager::get()->RegisterCurrentThread(self);
-#ifdef MOZ_NUWA_PROCESS
-  self->mThreadStatusInfo =
-    static_cast<void*>(nsThreadManager::get()->GetCurrentThreadStatusInfo());
-#endif
 
 #if !defined(MOZILLA_XPCOMRT_API)
   mozilla::IOInterposer::RegisterCurrentThread();
@@ -451,10 +448,6 @@
   , mShutdownRequired(false)
   , mEventsAreDoomed(false)
   , mIsMainThread(aMainThread)
-#ifdef MOZ_NUWA_PROCESS
-  , mThreadStatusMonitor("nsThread.mThreadStatusLock")
-  , mThreadStatusInfo(nullptr)
-#endif
 {
 }
 
@@ -502,11 +495,6 @@
   SetupCurrentThreadForChaosMode();
 
   nsThreadManager::get()->RegisterCurrentThread(this);
-#ifdef MOZ_NUWA_PROCESS
-  mThreadStatusInfo =
-    static_cast<void*>(nsThreadManager::get()->GetCurrentThreadStatusInfo());
-#endif
-
   return NS_OK;
 }
 
@@ -522,15 +510,7 @@
       NS_WARNING("An event was posted to a thread that will never run it (rejected)");
       return NS_ERROR_UNEXPECTED;
     }
-#ifdef MOZ_NUWA_PROCESS
-    {
-      ReentrantMonitorAutoEnter mon(mThreadStatusMonitor);
-      SetWorking();
-#endif // MOZ_NUWA_PROCESS
-      queue->PutEvent(aEvent);
-#ifdef MOZ_NUWA_PROCESS
-    }
-#endif // MOZ_NUWA_PROCESS
+    queue->PutEvent(aEvent);
 
     // Make sure to grab the observer before dropping the lock, otherwise the
     // event that we just placed into the queue could run and eventually delete
@@ -873,27 +853,6 @@
 
   --mNestedEventLoopDepth;
 
-#ifdef MOZ_NUWA_PROCESS
-  nsCOMPtr<nsIRunnable> notifyAllIdleRunnable;
-  {
-    ReentrantMonitorAutoEnter mon(mThreadStatusMonitor);
-    if ((!mEvents->GetEvent(false, nullptr)) && (mNestedEventLoopDepth == 0)) {
-      nsThreadManager::get()->SetThreadIsWorking(
-        static_cast<nsThreadManager::ThreadStatusInfo*>(mThreadStatusInfo),
-        false, getter_AddRefs(notifyAllIdleRunnable));
-    }
-  }
-  if (notifyAllIdleRunnable) {
-    // Dispatching a task leads us to acquire |mLock| of the thread. If we
-    // dispatch to main thread while holding main thread's
-    // |mThreadStatusMonitor|, deadlock could happen if other thread is
-    // blocked by main thread's |mThreadStatusMonitor| and is holding
-    // main thread's |mLock|.
-    Dispatch(notifyAllIdleRunnable, NS_DISPATCH_NORMAL);
-    nsThreadManager::get()->ResetIsDispatchingToMainThread();
-  }
-#endif // MOZ_NUWA_PROCESS
-
   NOTIFY_EVENT_OBSERVERS(AfterProcessNextEvent,
                          (this, mNestedEventLoopDepth, *aResult));
 
@@ -1104,24 +1063,6 @@
   return NS_OK;
 }
 
-#ifdef MOZ_NUWA_PROCESS
-void
-nsThread::SetWorking()
-{
-  nsThreadManager::get()->SetThreadIsWorking(
-    static_cast<nsThreadManager::ThreadStatusInfo*>(mThreadStatusInfo),
-    true, nullptr);
-}
-
-void
-nsThread::SetIdle()
-{
-  nsThreadManager::get()->SetThreadIsWorking(
-    static_cast<nsThreadManager::ThreadStatusInfo*>(mThreadStatusInfo),
-    false, nullptr);
-}
-#endif
-
 //-----------------------------------------------------------------------------
 
 NS_IMETHODIMP
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/threads/nsThread.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/threads/nsThread.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/threads/nsThread.h	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/threads/nsThread.h	2015-05-25 20:44:14.000000000 +0000
@@ -16,7 +16,6 @@
 #include "nsTObserverArray.h"
 #include "mozilla/Attributes.h"
 #include "nsAutoPtr.h"
-#include "mozilla/ReentrantMonitor.h"
 
 // A native thread
 class nsThread
@@ -66,14 +65,6 @@
   static nsresult
   SetMainThreadObserver(nsIThreadObserver* aObserver);
 
-#ifdef MOZ_NUWA_PROCESS
-  void SetWorking();
-  void SetIdle();
-  mozilla::ReentrantMonitor& ThreadStatusMonitor() {
-    return mThreadStatusMonitor;
-  }
-#endif
-
 protected:
   static nsIThreadObserver* sMainThreadObserver;
 
@@ -191,12 +182,6 @@
   // Set to true when events posted to this thread will never run.
   bool mEventsAreDoomed;
   MainThreadFlag mIsMainThread;
-#ifdef MOZ_NUWA_PROCESS
-  mozilla::ReentrantMonitor mThreadStatusMonitor;
-  // The actual type is defined in nsThreadManager.h which is not exposed to
-  // file out of thread module.
-  void* mThreadStatusInfo;
-#endif
 };
 
 //-----------------------------------------------------------------------------
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/threads/nsThreadManager.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/threads/nsThreadManager.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/threads/nsThreadManager.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/threads/nsThreadManager.cpp	2015-05-25 20:44:14.000000000 +0000
@@ -11,7 +11,6 @@
 #include "nsTArray.h"
 #include "nsAutoPtr.h"
 #include "mozilla/ThreadLocal.h"
-#include "mozilla/ReentrantMonitor.h"
 #ifdef MOZ_CANARY
 #include <fcntl.h>
 #include <unistd.h>
@@ -41,45 +40,6 @@
 
 typedef nsTArray<nsRefPtr<nsThread>> nsThreadArray;
 
-#ifdef MOZ_NUWA_PROCESS
-class NotifyAllThreadsWereIdle: public nsRunnable
-{
-public:
-
-  NotifyAllThreadsWereIdle(
-    nsTArray<nsRefPtr<nsThreadManager::AllThreadsWereIdleListener>>* aListeners)
-    : mListeners(aListeners)
-  {
-  }
-
-  virtual NS_IMETHODIMP
-  Run() {
-    // Copy listener array, which may be modified during call back.
-    nsTArray<nsRefPtr<nsThreadManager::AllThreadsWereIdleListener>> arr(*mListeners);
-    for (size_t i = 0; i < arr.Length(); i++) {
-      arr[i]->OnAllThreadsWereIdle();
-    }
-    return NS_OK;
-  }
-
-private:
-  // Raw pointer, since it's pointing to a  member of thread manager.
-  nsTArray<nsRefPtr<nsThreadManager::AllThreadsWereIdleListener>>* mListeners;
-};
-
-struct nsThreadManager::ThreadStatusInfo {
-  Atomic<bool> mWorking;
-  Atomic<bool> mWillBeWorking;
-  bool mIgnored;
-  ThreadStatusInfo()
-    : mWorking(false)
-    , mWillBeWorking(false)
-    , mIgnored(false)
-  {
-  }
-};
-#endif // MOZ_NUWA_PROCESS
-
 //-----------------------------------------------------------------------------
 
 static void
@@ -88,24 +48,6 @@
   static_cast<nsISupports*>(aData)->Release();
 }
 
-#ifdef MOZ_NUWA_PROCESS
-void
-nsThreadManager::DeleteThreadStatusInfo(void* aData)
-{
-  nsThreadManager* mgr = nsThreadManager::get();
-  nsThreadManager::ThreadStatusInfo* thrInfo =
-    static_cast<nsThreadManager::ThreadStatusInfo*>(aData);
-  {
-    ReentrantMonitorAutoEnter mon(*(mgr->mMonitor));
-    mgr->mThreadStatusInfos.RemoveElement(thrInfo);
-    if (NS_IsMainThread()) {
-      mgr->mMainThreadStatusInfo = nullptr;
-    }
-  }
-  delete thrInfo;
-}
-#endif
-
 static PLDHashOperator
 AppendAndRemoveThread(PRThread* aKey, nsRefPtr<nsThread>& aThread, void* aArg)
 {
@@ -147,17 +89,6 @@
     return NS_ERROR_FAILURE;
   }
 
-#ifdef MOZ_NUWA_PROCESS
-  if (PR_NewThreadPrivateIndex(
-      &mThreadStatusInfoIndex,
-      nsThreadManager::DeleteThreadStatusInfo) == PR_FAILURE) {
-    return NS_ERROR_FAILURE;
-  }
-#endif // MOZ_NUWA_PROCESS
-
-#ifdef MOZ_NUWA_PROCESS
-  mMonitor = MakeUnique<ReentrantMonitor>("nsThreadManager.mMonitor");
-#endif // MOZ_NUWA_PROCESS
 
 #ifdef MOZ_CANARY
   const int flags = O_WRONLY | O_APPEND | O_CREAT | O_NONBLOCK;
@@ -250,9 +181,6 @@
 
   // Remove the TLS entry for the main thread.
   PR_SetThreadPrivate(mCurThreadIndex, nullptr);
-#ifdef MOZ_NUWA_PROCESS
-  PR_SetThreadPrivate(mThreadStatusInfoIndex, nullptr);
-#endif
 }
 
 void
@@ -285,9 +213,6 @@
 
   PR_SetThreadPrivate(mCurThreadIndex, nullptr);
   // Ref-count balanced via ReleaseObject
-#ifdef MOZ_NUWA_PROCESS
-  PR_SetThreadPrivate(mThreadStatusInfoIndex, nullptr);
-#endif
 }
 
 nsThread*
@@ -312,27 +237,6 @@
   return thread.get();  // reference held in TLS
 }
 
-#ifdef MOZ_NUWA_PROCESS
-nsThreadManager::ThreadStatusInfo*
-nsThreadManager::GetCurrentThreadStatusInfo()
-{
-  void* data = PR_GetThreadPrivate(mThreadStatusInfoIndex);
-  if (!data) {
-    ThreadStatusInfo *thrInfo = new ThreadStatusInfo();
-    PR_SetThreadPrivate(mThreadStatusInfoIndex, thrInfo);
-    data = thrInfo;
-
-    ReentrantMonitorAutoEnter mon(*mMonitor);
-    mThreadStatusInfos.AppendElement(thrInfo);
-    if (NS_IsMainThread()) {
-      mMainThreadStatusInfo = thrInfo;
-    }
-  }
-
-  return static_cast<ThreadStatusInfo*>(data);
-}
-#endif
-
 NS_IMETHODIMP
 nsThreadManager::NewThread(uint32_t aCreationFlags,
                            uint32_t aStackSize,
@@ -429,162 +333,3 @@
   OffTheBooksMutexAutoLock lock(mLock);
   return mHighestNumberOfThreads;
 }
-
-NS_IMETHODIMP
-nsThreadManager::SetIgnoreThreadStatus()
-{
-#ifdef MOZ_NUWA_PROCESS
-  GetCurrentThreadStatusInfo()->mIgnored = true;
-  return NS_OK;
-#else
-  return NS_ERROR_NOT_IMPLEMENTED;
-#endif
-}
-
-#ifdef MOZ_NUWA_PROCESS
-void
-nsThreadManager::SetThreadIdle(nsIRunnable **aReturnRunnable)
-{
-  SetThreadIsWorking(GetCurrentThreadStatusInfo(), false, aReturnRunnable);
-}
-
-void
-nsThreadManager::SetThreadWorking()
-{
-  SetThreadIsWorking(GetCurrentThreadStatusInfo(), true, nullptr);
-}
-
-void
-nsThreadManager::SetThreadIsWorking(ThreadStatusInfo* aInfo,
-                                    bool aIsWorking,
-                                    nsIRunnable **aReturnRunnable)
-{
-  aInfo->mWillBeWorking = aIsWorking;
-  if (mThreadsIdledListeners.Length() > 0) {
-
-    // A race condition occurs since we don't want threads to try to enter the
-    // monitor (nsThreadManager::mMonitor) when no one cares about their status.
-    // And thus the race can happen when we put the first listener into
-    // |mThreadsIdledListeners|:
-    //
-    // (1) Thread A wants to dispatch a task to Thread B.
-    // (2) Thread A checks |mThreadsIdledListeners|, and nothing is in the
-    //     list. So Thread A decides not to enter |mMonitor| when updating B's
-    //     status.
-    // (3) Thread A is suspended just before it changed status of B.
-    // (4) A listener is added to |mThreadsIdledListeners|
-    // (5) Now is Thread C's turn to run. Thread C finds there's something in
-    //     |mThreadsIdledListeners|, so it enters |mMonitor| and check all
-    //     thread info structs in |mThreadStatusInfos| while A is in the middle
-    //     of changing B's status.
-    //
-    // Then C may find Thread B is an idle thread (which is not correct, because
-    // A attempted to change B's status prior to C starting to walk throught
-    // |mThreadStatusInfo|), but the fact that thread A is working (thread A
-    // hasn't finished dispatching a task to thread B) can prevent thread C from
-    // firing a bogus notification.
-    //
-    // If the state transition that happens outside the monitor is in the other
-    // direction, the race condition could be:
-    //
-    // (1) Thread D has just finished its jobs and wants to set its status to idle.
-    // (2) Thread D checks |mThreadsIdledListeners|, and nothing is in the list.
-    //     So Thread D decides not to enter |mMonitor|.
-    // (3) Thread D is is suspended before it updates its own status.
-    // (4) A listener is put into |mThreadsIdledListeners|.
-    // (5) Thread C wants to changes status of itself. It checks
-    //     |mThreadsIdledListeners| and finds something inside the list. Thread C
-    //     then enters |mMonitor|, updates its status and checks thread info in
-    //     |mThreadStatusInfos| while D is changing status of itself out of monitor.
-    //
-    // Thread C will find that thread D is working (D actually wants to change its
-    // status to idle before C starting to check), then C returns without firing
-    // any notification. Finding that thread D is working can make our checking
-    // mechanism miss a chance to fire a notification: because thread D thought
-    // there's nothing in |mThreadsIdledListeners| and thus won't check the
-    // |mThreadStatusInfos| after changing the status of itself.
-    //
-    // |mWillBeWorking| can be used to address this problem. We require each
-    // thread to put the value that is going to be set to |mWorking| to
-    // |mWillBeWorking| before the thread decide whether it should enter
-    // |mMonitor| to change status or not. Thus C finds that D is working while
-    // D's |mWillBeWorking| is false, and C realizes that D is just updating and
-    // can treat D as an idle thread.
-    //
-    // It doesn't matter whether D will check thread status after changing its
-    // own status or not. If D checks, which means D will enter the monitor
-    // before updating status, thus D must be blocked until C has finished
-    // dispatching the notification task to main thread, and D will find that main
-    // thread is working and will not fire an additional event. On the other hand,
-    // if D doesn't check |mThreadStatusInfos|, it's still ok, because C has
-    // treated D as an idle thread already.
-
-    bool hasWorkingThread = false;
-    nsRefPtr<NotifyAllThreadsWereIdle> runnable;
-    {
-      ReentrantMonitorAutoEnter mon(*mMonitor);
-      // Get data structure of thread info.
-      aInfo->mWorking = aIsWorking;
-      if (aIsWorking) {
-        // We are working, so there's no need to check futher.
-        return;
-      }
-
-      for (size_t i = 0; i < mThreadStatusInfos.Length(); i++) {
-        ThreadStatusInfo *info = mThreadStatusInfos[i];
-        if (!info->mIgnored) {
-          if (info->mWorking) {
-            if (info->mWillBeWorking) {
-              hasWorkingThread = true;
-              break;
-            }
-          }
-        }
-      }
-      if (!hasWorkingThread && !mDispatchingToMainThread) {
-        runnable = new NotifyAllThreadsWereIdle(&mThreadsIdledListeners);
-        mDispatchingToMainThread = true;
-      }
-    }
-
-    if (runnable) {
-      if (NS_IsMainThread()) {
-        // We are holding the main thread's |nsThread::mThreadStatusMonitor|.
-        // If we dispatch a task to ourself, then we are in danger of causing
-        // deadlock. Instead, return the task, and let the caller dispatch it
-        // for us.
-        MOZ_ASSERT(aReturnRunnable,
-                   "aReturnRunnable must be provided on main thread");
-        runnable.forget(aReturnRunnable);
-      } else {
-        NS_DispatchToMainThread(runnable);
-        ResetIsDispatchingToMainThread();
-      }
-    }
-  } else {
-    // Update thread info without holding any lock.
-    aInfo->mWorking = aIsWorking;
-  }
-}
-
-void
-nsThreadManager::ResetIsDispatchingToMainThread()
-{
-  ReentrantMonitorAutoEnter mon(*mMonitor);
-  mDispatchingToMainThread = false;
-}
-
-void
-nsThreadManager::AddAllThreadsWereIdleListener(AllThreadsWereIdleListener *listener)
-{
-  MOZ_ASSERT(GetCurrentThreadStatusInfo()->mWorking);
-  mThreadsIdledListeners.AppendElement(listener);
-}
-
-void
-nsThreadManager::RemoveAllThreadsWereIdleListener(AllThreadsWereIdleListener *listener)
-{
-  mThreadsIdledListeners.RemoveElement(listener);
-}
-
-#endif // MOZ_NUWA_PROCESS
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/threads/nsThreadManager.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/threads/nsThreadManager.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/threads/nsThreadManager.h	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/threads/nsThreadManager.h	2015-05-25 20:44:14.000000000 +0000
@@ -14,26 +14,9 @@
 
 class nsIRunnable;
 
-namespace mozilla {
-class ReentrantMonitor;
-}
-
 class nsThreadManager : public nsIThreadManager
 {
 public:
-#ifdef MOZ_NUWA_PROCESS
-  struct ThreadStatusInfo;
-  class AllThreadsWereIdleListener {
-  public:
-    NS_INLINE_DECL_REFCOUNTING(AllThreadsWereIdleListener);
-    virtual void OnAllThreadsWereIdle() = 0;
-  protected:
-    virtual ~AllThreadsWereIdleListener()
-    {
-    }
-  };
-#endif // MOZ_NUWA_PROCESS
-
   NS_DECL_ISUPPORTS
   NS_DECL_NSITHREADMANAGER
 
@@ -71,29 +54,6 @@
   {
   }
 
-#ifdef MOZ_NUWA_PROCESS
-  // |SetThreadWorking| and |SetThreadIdle| set status of thread that is
-  // currently running. They get thread status information from TLS and pass
-  // the information to |SetThreadIsWorking|.
-  void SetThreadIdle(nsIRunnable** aReturnRunnable);
-  void SetThreadWorking();
-
-  // |SetThreadIsWorking| is where is status actually changed. Thread status
-  // information is passed as a argument so caller must obtain the structure
-  // by itself. If this method is invoked on main thread, |aReturnRunnable|
-  // should be provided to receive the runnable of notifying listeners.
-  // |ResetIsDispatchingToMainThread| should be invoked after caller on main
-  // thread dispatched the task to main thread's queue.
-  void SetThreadIsWorking(ThreadStatusInfo* aInfo,
-                          bool aIsWorking,
-                          nsIRunnable** aReturnRunnable);
-  void ResetIsDispatchingToMainThread();
-
-  void AddAllThreadsWereIdleListener(AllThreadsWereIdleListener *listener);
-  void RemoveAllThreadsWereIdleListener(AllThreadsWereIdleListener *listener);
-  ThreadStatusInfo* GetCurrentThreadStatusInfo();
-#endif // MOZ_NUWA_PROCESS
-
 private:
   nsThreadManager()
     : mCurThreadIndex(0)
@@ -102,11 +62,6 @@
     , mInitialized(false)
     , mCurrentNumberOfThreads(1)
     , mHighestNumberOfThreads(1)
-#ifdef MOZ_NUWA_PROCESS
-    , mMonitor(nullptr)
-    , mMainThreadStatusInfo(nullptr)
-    , mDispatchingToMainThread(nullptr)
-#endif
   {
   }
 
@@ -121,19 +76,6 @@
   uint32_t            mCurrentNumberOfThreads;
   // The highest number of threads encountered so far during the session
   uint32_t            mHighestNumberOfThreads;
-
-#ifdef MOZ_NUWA_PROCESS
-  static void DeleteThreadStatusInfo(void *aData);
-  unsigned mThreadStatusInfoIndex;
-  nsTArray<nsRefPtr<AllThreadsWereIdleListener>> mThreadsIdledListeners;
-  nsTArray<ThreadStatusInfo*> mThreadStatusInfos;
-  mozilla::UniquePtr<mozilla::ReentrantMonitor> mMonitor;
-  ThreadStatusInfo* mMainThreadStatusInfo;
-  // |mDispatchingToMainThread| is set when all thread are found to be idle
-  // before task of notifying all listeners are dispatched to main thread.
-  // The flag is protected by |mMonitor|.
-  bool mDispatchingToMainThread;
-#endif // MOZ_NUWA_PROCESS
 };
 
 #define NS_THREADMANAGER_CID                       \
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/threads/nsThreadPool.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/threads/nsThreadPool.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/threads/nsThreadPool.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/threads/nsThreadPool.cpp	2015-05-25 20:44:14.000000000 +0000
@@ -11,7 +11,7 @@
 #include "nsMemory.h"
 #include "nsAutoPtr.h"
 #include "prinrval.h"
-#include "prlog.h"
+#include "mozilla/Logging.h"
 
 using namespace mozilla;
 
@@ -27,7 +27,7 @@
 #ifdef LOG
 #undef LOG
 #endif
-#define LOG(args) PR_LOG(GetThreadPoolLog(), PR_LOG_DEBUG, args)
+#define LOG(args) MOZ_LOG(GetThreadPoolLog(), PR_LOG_DEBUG, args)
 
 // DESIGN:
 //  o  Allocate anonymous threads.
@@ -151,6 +151,7 @@
 nsThreadPool::Run()
 {
   LOG(("THRD-P(%p) enter\n", this));
+
   mThreadNaming.SetThreadPoolName(mName);
 
   nsCOMPtr<nsIThread> current;
@@ -208,9 +209,6 @@
         } else {
           PRIntervalTime delta = timeout - (now - idleSince);
           LOG(("THRD-P(%p) waiting [%d]\n", this, delta));
-#ifdef MOZ_NUWA_PROCESS
-          nsThreadManager::get()->SetThreadIdle(nullptr);
-#endif // MOZ_NUWA_PROCESS
           mon.Wait(delta);
         }
       } else if (wasIdle) {
@@ -220,9 +218,6 @@
     }
     if (event) {
       LOG(("THRD-P(%p) running [%p]\n", this, event.get()));
-#ifdef MOZ_NUWA_PROCESS
-      nsThreadManager::get()->SetThreadWorking();
-#endif // MOZ_NUWA_PROCESS
       event->Run();
     }
   } while (!exitThread);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/threads/nsTimerImpl.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/threads/nsTimerImpl.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/threads/nsTimerImpl.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/threads/nsTimerImpl.cpp	2015-05-25 20:44:14.000000000 +0000
@@ -317,10 +317,10 @@
     double mean = 0, stddev = 0;
     myNS_MeanAndStdDev(sDeltaNum, sDeltaSum, sDeltaSumSquared, &mean, &stddev);
 
-    PR_LOG(GetTimerLog(), PR_LOG_DEBUG,
+    MOZ_LOG(GetTimerLog(), PR_LOG_DEBUG,
            ("sDeltaNum = %f, sDeltaSum = %f, sDeltaSumSquared = %f\n",
             sDeltaNum, sDeltaSum, sDeltaSumSquared));
-    PR_LOG(GetTimerLog(), PR_LOG_DEBUG,
+    MOZ_LOG(GetTimerLog(), PR_LOG_DEBUG,
            ("mean: %fms, stddev: %fms\n", mean, stddev));
   }
 
@@ -549,13 +549,6 @@
     return;
   }
 
-#ifdef MOZ_NUWA_PROCESS
-  if (IsNuwaProcess() && IsNuwaReady()) {
-    // A timer event fired after Nuwa frozen can freeze main thread.
-    return;
-  }
-#endif
-
 #if !defined(MOZILLA_XPCOMRT_API)
   PROFILER_LABEL("Timer", "Fire",
                  js::ProfileEntry::Category::OTHER);
@@ -578,14 +571,14 @@
     sDeltaSumSquared += double(d) * double(d);
     sDeltaNum++;
 
-    PR_LOG(GetTimerLog(), PR_LOG_DEBUG,
+    MOZ_LOG(GetTimerLog(), PR_LOG_DEBUG,
            ("[this=%p] expected delay time %4ums\n", this, mDelay));
-    PR_LOG(GetTimerLog(), PR_LOG_DEBUG,
+    MOZ_LOG(GetTimerLog(), PR_LOG_DEBUG,
            ("[this=%p] actual delay time   %fms\n", this,
             a.ToMilliseconds()));
-    PR_LOG(GetTimerLog(), PR_LOG_DEBUG,
+    MOZ_LOG(GetTimerLog(), PR_LOG_DEBUG,
            ("[this=%p] (mType is %d)       -------\n", this, mType));
-    PR_LOG(GetTimerLog(), PR_LOG_DEBUG,
+    MOZ_LOG(GetTimerLog(), PR_LOG_DEBUG,
            ("[this=%p]     delta           %4dms\n",
             this, (a > b) ? (int32_t)d : -(int32_t)d));
 
@@ -650,7 +643,7 @@
   mFiring = false;
   mTimerCallbackWhileFiring = nullptr;
 
-  PR_LOG(GetTimerLog(), PR_LOG_DEBUG,
+  MOZ_LOG(GetTimerLog(), PR_LOG_DEBUG,
          ("[this=%p] Took %fms to fire timer callback\n",
           this, (TimeStamp::Now() - now).ToMilliseconds()));
 
@@ -700,7 +693,7 @@
 
   if (PR_LOG_TEST(GetTimerLog(), PR_LOG_DEBUG)) {
     TimeStamp now = TimeStamp::Now();
-    PR_LOG(GetTimerLog(), PR_LOG_DEBUG,
+    MOZ_LOG(GetTimerLog(), PR_LOG_DEBUG,
            ("[this=%p] time between PostTimerEvent() and Fire(): %fms\n",
             this, (now - mInitTime).ToMilliseconds()));
   }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/threads/nsTimerImpl.h firefox-trunk-41.0~a1~hg20150524r245419/xpcom/threads/nsTimerImpl.h
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/threads/nsTimerImpl.h	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/threads/nsTimerImpl.h	2015-05-25 20:44:14.000000000 +0000
@@ -13,7 +13,7 @@
 
 #include "nsCOMPtr.h"
 
-#include "prlog.h"
+#include "mozilla/Logging.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/Attributes.h"
 
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/threads/ThreadStackHelper.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/threads/ThreadStackHelper.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/threads/ThreadStackHelper.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/threads/ThreadStackHelper.cpp	2015-05-25 20:44:14.000000000 +0000
@@ -611,6 +611,11 @@
       // Only keep the file base name for paths outside the above formats.
       basename = strrchr(filename, '/');
       basename = basename ? basename + 1 : filename;
+      // Look for Windows path separator as well.
+      filename = strrchr(basename, '\\');
+      if (filename) {
+        basename = filename + 1;
+      }
     }
 
     size_t len = PR_snprintf(buffer, sizeof(buffer), "%s:%u", basename, lineno);
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpcom/threads/TimerThread.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpcom/threads/TimerThread.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpcom/threads/TimerThread.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpcom/threads/TimerThread.cpp	2015-05-25 20:44:14.000000000 +0000
@@ -82,7 +82,7 @@
 nsresult
 TimerThread::Init()
 {
-  PR_LOG(GetTimerLog(), PR_LOG_DEBUG,
+  MOZ_LOG(GetTimerLog(), PR_LOG_DEBUG,
          ("TimerThread::Init [%d]\n", mInitialized));
 
   if (mInitialized) {
@@ -129,7 +129,7 @@
 nsresult
 TimerThread::Shutdown()
 {
-  PR_LOG(GetTimerLog(), PR_LOG_DEBUG, ("TimerThread::Shutdown begin\n"));
+  MOZ_LOG(GetTimerLog(), PR_LOG_DEBUG, ("TimerThread::Shutdown begin\n"));
 
   if (!mThread) {
     return NS_ERROR_NOT_INITIALIZED;
@@ -167,7 +167,7 @@
 
   mThread->Shutdown();    // wait for the thread to die
 
-  PR_LOG(GetTimerLog(), PR_LOG_DEBUG, ("TimerThread::Shutdown end\n"));
+  MOZ_LOG(GetTimerLog(), PR_LOG_DEBUG, ("TimerThread::Shutdown end\n"));
   return NS_OK;
 }
 
@@ -205,7 +205,6 @@
   }
 #endif
 
-  NS_SetIgnoreStatusOfCurrentThread();
   MonitorAutoLock lock(mMonitor);
 
   // We need to know how many microseconds give a positive PRIntervalTime. This
@@ -260,7 +259,7 @@
           RemoveTimerInternal(timer);
           timer = nullptr;
 
-          PR_LOG(GetTimerLog(), PR_LOG_DEBUG,
+          MOZ_LOG(GetTimerLog(), PR_LOG_DEBUG,
                  ("Timer thread woke up %fms from when it was supposed to\n",
                   fabs((now - timerRef->mTimeout).ToMilliseconds())));
 
@@ -344,10 +343,10 @@
 
       if (PR_LOG_TEST(GetTimerLog(), PR_LOG_DEBUG)) {
         if (waitFor == PR_INTERVAL_NO_TIMEOUT)
-          PR_LOG(GetTimerLog(), PR_LOG_DEBUG,
+          MOZ_LOG(GetTimerLog(), PR_LOG_DEBUG,
                  ("waiting for PR_INTERVAL_NO_TIMEOUT\n"));
         else
-          PR_LOG(GetTimerLog(), PR_LOG_DEBUG,
+          MOZ_LOG(GetTimerLog(), PR_LOG_DEBUG,
                  ("waiting for %u\n", PR_IntervalToMilliseconds(waitFor)));
       }
     }
diff -Nru firefox-trunk-41.0~a1~hg20150513r243603/xpfe/components/windowds/nsWindowDataSource.cpp firefox-trunk-41.0~a1~hg20150524r245419/xpfe/components/windowds/nsWindowDataSource.cpp
--- firefox-trunk-41.0~a1~hg20150513r243603/xpfe/components/windowds/nsWindowDataSource.cpp	2015-05-13 18:06:29.000000000 +0000
+++ firefox-trunk-41.0~a1~hg20150524r245419/xpfe/components/windowds/nsWindowDataSource.cpp	2015-05-25 20:44:14.000000000 +0000
@@ -29,10 +29,9 @@
 
 uint32_t nsWindowDataSource::gRefCnt = 0;
 
-static const char kURINC_WindowRoot[] = "NC:WindowMediatorRoot";
-
-DEFINE_RDF_VOCAB(NC_NAMESPACE_URI, NC, Name);
-DEFINE_RDF_VOCAB(NC_NAMESPACE_URI, NC, KeyIndex);
+#define URINC_WINDOWROOT "NC:WindowMediatorRoot"
+#define URINC_NAME       NC_NAMESPACE_URI "Name"
+#define URINC_KEYINDEX   NC_NAMESPACE_URI "KeyIndex"
 
 nsresult
 nsWindowDataSource::Init()
@@ -43,9 +42,9 @@
         rv = CallGetService("@mozilla.org/rdf/rdf-service;1", &gRDFService);
         if (NS_FAILED(rv)) return rv;
 
-        gRDFService->GetResource(NS_LITERAL_CSTRING(kURINC_WindowRoot), &kNC_WindowRoot);
-        gRDFService->GetResource(NS_LITERAL_CSTRING(kURINC_Name),       &kNC_Name);
-        gRDFService->GetResource(NS_LITERAL_CSTRING(kURINC_KeyIndex),   &kNC_KeyIndex);
+        gRDFService->GetResource(NS_LITERAL_CSTRING(URINC_WINDOWROOT), &kNC_WindowRoot);
+        gRDFService->GetResource(NS_LITERAL_CSTRING(URINC_NAME),       &kNC_Name);
+        gRDFService->GetResource(NS_LITERAL_CSTRING(URINC_KEYINDEX),   &kNC_KeyIndex);
     }
 
     mInner = do_CreateInstance("@mozilla.org/rdf/datasource;1?name=in-memory-datasource", &rv);